diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000000000..18b16e0de006b
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,297 @@
+---
+BasedOnStyle: WebKit
+###################################
+#
+# OpenSSL Customizations start here.
+#
+# Customizing whitespace config should be avoided, but WebKit C style
+# does specify this for C. (with C++ being the other way around) Due
+# to limitations in clang-format it's not possible for it to default
+# to C today, it defaults to C++. Therefore we force this to the
+# WebKit C style value. If we ever have C++ code we will have to
+# consider how to deal with this.
+PointerAlignment: Right
+#
+# we add matches for /** and /*- at the top
+# of a comment block to protect comments as
+# per STYLE.md
+CommentPragmas:  '(^ IWYU pragma:|^\*$|^-$)'
+# OpenSSL uses macros extensively. Tell clang-format about them.
+TypenameMacros: ['LHASH_OF', 'STACK_OF']
+StatementMacros:
+  - "DECLARE_AES_EVP"
+  - "DECLARE_ASN1_ALLOC_FUNCTIONS"
+  - "DECLARE_ASN1_ALLOC_FUNCTIONS_attr"
+  - "DECLARE_ASN1_ALLOC_FUNCTIONS_name"
+  - "DECLARE_ASN1_ALLOC_FUNCTIONS_name_attr"
+  - "DECLARE_ASN1_DUP_FUNCTION"
+  - "DECLARE_ASN1_DUP_FUNCTION_attr"
+  - "DECLARE_ASN1_DUP_FUNCTION_name"
+  - "DECLARE_ASN1_DUP_FUNCTION_name_attr"
+  - "DECLARE_ASN1_ENCODE_FUNCTIONS"
+  - "DECLARE_ASN1_ENCODE_FUNCTIONS_attr"
+  - "DECLARE_ASN1_ENCODE_FUNCTIONS_const"
+  - "DECLARE_ASN1_ENCODE_FUNCTIONS_name"
+  - "DECLARE_ASN1_ENCODE_FUNCTIONS_name_attr"
+  - "DECLARE_ASN1_ENCODE_FUNCTIONS_only"
+  - "DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr"
+  - "DECLARE_ASN1_FUNCTIONS"
+  - "DECLARE_ASN1_FUNCTIONS_attr"
+  - "DECLARE_ASN1_FUNCTIONS_const"
+  - "DECLARE_ASN1_FUNCTIONS_fname"
+  - "DECLARE_ASN1_FUNCTIONS_name"
+  - "DECLARE_ASN1_FUNCTIONS_name_attr"
+  - "DECLARE_ASN1_ITEM"
+  - "DECLARE_ASN1_ITEM_attr"
+  - "DECLARE_ASN1_NDEF_FUNCTION"
+  - "DECLARE_ASN1_NDEF_FUNCTION_attr"
+  - "DECLARE_ASN1_PRINT_FUNCTION"
+  - "DECLARE_ASN1_PRINT_FUNCTION_attr"
+  - "DECLARE_ASN1_PRINT_FUNCTION_fname"
+  - "DECLARE_ASN1_PRINT_FUNCTION_fname_attr"
+  - "DECLARE_COMPARISON"
+  - "DECLARE_COMPARISONS"
+  - "DECLARE_DISPATCH"
+  - "DECLARE_HT_VALUE_TYPE_FNS"
+  - "DECLARE_LHASH_COMP_FN"
+  - "DECLARE_LHASH_DOALL_ARG_FN"
+  - "DECLARE_LHASH_HASH_FN"
+  - "DECLARE_LIST_OF"
+  - "DECLARE_ML_KEM_PRVKEYDATA"
+  - "DECLARE_ML_KEM_PUBKEYDATA"
+  - "DECLARE_ML_KEM_VARIANT_KEYDATA"
+  - "DECLARE_OBJ_BSEARCH_CMP_FN"
+  - "DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN"
+  - "DECLARE_PEM_read"
+  - "DECLARE_PEM_read_attr"
+  - "DECLARE_PEM_read_bio"
+  - "DECLARE_PEM_read_bio_attr"
+  - "DECLARE_PEM_read_bio_ex"
+  - "DECLARE_PEM_read_bio_ex_attr"
+  - "DECLARE_PEM_read_ex"
+  - "DECLARE_PEM_read_ex_attr"
+  - "DECLARE_PEM_read_fp"
+  - "DECLARE_PEM_read_fp_attr"
+  - "DECLARE_PEM_read_fp_ex_attr"
+  - "DECLARE_PEM_rw"
+  - "DECLARE_PEM_rw_attr"
+  - "DECLARE_PEM_rw_cb"
+  - "DECLARE_PEM_rw_cb_attr"
+  - "DECLARE_PEM_rw_cb_ex"
+  - "DECLARE_PEM_rw_cb_ex_attr"
+  - "DECLARE_PEM_rw_const"
+  - "DECLARE_PEM_rw_const_attr"
+  - "DECLARE_PEM_rw_ex"
+  - "DECLARE_PEM_rw_ex_attr"
+  - "DECLARE_PEM_write"
+  - "DECLARE_PEM_write_attr"
+  - "DECLARE_PEM_write_bio"
+  - "DECLARE_PEM_write_bio_attr"
+  - "DECLARE_PEM_write_bio_const"
+  - "DECLARE_PEM_write_bio_const_attr"
+  - "DECLARE_PEM_write_bio_ex"
+  - "DECLARE_PEM_write_bio_ex_attr"
+  - "DECLARE_PEM_write_cb"
+  - "DECLARE_PEM_write_cb_attr"
+  - "DECLARE_PEM_write_cb_bio"
+  - "DECLARE_PEM_write_cb_bio_attr"
+  - "DECLARE_PEM_write_cb_bio_ex_attr"
+  - "DECLARE_PEM_write_cb_ex"
+  - "DECLARE_PEM_write_cb_ex_attr"
+  - "DECLARE_PEM_write_cb_ex_bio"
+  - "DECLARE_PEM_write_cb_fp"
+  - "DECLARE_PEM_write_cb_fp_attr"
+  - "DECLARE_PEM_write_cb_fp_ex_attr"
+  - "DECLARE_PEM_write_const"
+  - "DECLARE_PEM_write_const_attr"
+  - "DECLARE_PEM_write_ex"
+  - "DECLARE_PEM_write_ex_attr"
+  - "DECLARE_PEM_write_fp"
+  - "DECLARE_PEM_write_fp_attr"
+  - "DECLARE_PEM_write_fp_const"
+  - "DECLARE_PEM_write_fp_const_attr"
+  - "DECLARE_PEM_write_fp_ex_attr"
+  - "DECLARE_RUN_ONCE"
+  - "DECLARE_VARIANT"
+  - "IMPLEMENT_aead_cipher"
+  - "IMPLEMENT_aead_cipher_pipeline"
+  - "IMPLEMENT_ARIA_CFBR"
+  - "IMPLEMENT_ASN1_ALLOC_FUNCTIONS"
+  - "IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname"
+  - "IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname"
+  - "IMPLEMENT_ASN1_DUP_FUNCTION"
+  - "IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname"
+  - "IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname"
+  - "IMPLEMENT_ASN1_FUNCTIONS"
+  - "IMPLEMENT_ASN1_FUNCTIONS_const"
+  - "IMPLEMENT_ASN1_FUNCTIONS_ENCODE_name"
+  - "IMPLEMENT_ASN1_FUNCTIONS_fname"
+  - "IMPLEMENT_ASN1_FUNCTIONS_name"
+  - "IMPLEMENT_ASN1_MSTRING"
+  - "IMPLEMENT_ASN1_NDEF_FUNCTION"
+  - "IMPLEMENT_ASN1_PRINT_FUNCTION"
+  - "IMPLEMENT_ASN1_PRINT_FUNCTION_fname"
+  - "IMPLEMENT_ASN1_STRING_FUNCTIONS"
+  - "IMPLEMENT_ASN1_TYPE"
+  - "IMPLEMENT_ASN1_TYPE_ex"
+  - "IMPLEMENT_BLAKE_functions"
+  - "IMPLEMENT_BLOCK_CIPHER"
+  - "IMPLEMENT_CFBR"
+  - "IMPLEMENT_cipher"
+  - "IMPLEMENT_CIPHER"
+  - "IMPLEMENT_CIPHER_HW_CBC"
+  - "IMPLEMENT_CIPHER_HW_CFB"
+  - "IMPLEMENT_CIPHER_HW_COPYCTX"
+  - "IMPLEMENT_CIPHER_HW_ECB"
+  - "IMPLEMENT_CIPHER_HW_OFB"
+  - "IMPLEMENT_CRMF_CTRL_FUNC"
+  - "IMPLEMENT_cts_cipher"
+  - "IMPLEMENT_des_cipher"
+  - "IMPLEMENT_DIGEST"
+  - "IMPLEMENT_digest_functions"
+  - "IMPLEMENT_digest_functions_with_settable_ctx"
+  - "IMPLEMENT_dtls1_meth_func"
+  - "IMPLEMENT_DYNAMIC_BIND_FN"
+  - "IMPLEMENT_DYNAMIC_CHECK_FN"
+  - "IMPLEMENT_ECX_VARIANT"
+  - "IMPLEMENT_EXTERN_ASN1"
+  - "IMPLEMENT_generic_cipher"
+  - "IMPLEMENT_generic_cipher_func"
+  - "IMPLEMENT_generic_cipher_genfn"
+  - "IMPLEMENT_HT_VALUE_TYPE_FNS"
+  - "IMPLEMENT_KECCAK_functions"
+  - "IMPLEMENT_KMAC_functions"
+  - "IMPLEMENT_KMAC_TABLE"
+  - "IMPLEMENT_LEGACY_ERR_LOAD"
+  - "IMPLEMENT_LEGACY_EVP_MD_METH"
+  - "IMPLEMENT_LEGACY_EVP_MD_METH_LC"
+  - "IMPLEMENT_LEGACY_EVP_MD_METH_SHA3"
+  - "IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE"
+  - "IMPLEMENT_LHASH_COMP_FN"
+  - "IMPLEMENT_LHASH_DOALL_ARG"
+  - "IMPLEMENT_LHASH_DOALL_ARG_CONST"
+  - "IMPLEMENT_LHASH_DOALL_ARG_FN"
+  - "IMPLEMENT_LHASH_HASH_FN"
+  - "IMPLEMENT_MS"
+  - "IMPLEMENT_MSBLOB"
+  - "IMPLEMENT_OBJ_BSEARCH_CMP_FN"
+  - "IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN"
+  - "IMPLEMENT_PEM_provided_rw"
+  - "IMPLEMENT_PEM_provided_rw_cb"
+  - "IMPLEMENT_PEM_provided_write"
+  - "IMPLEMENT_PEM_provided_write_bio"
+  - "IMPLEMENT_PEM_provided_write_body_fallback"
+  - "IMPLEMENT_PEM_provided_write_body_fallback_cb"
+  - "IMPLEMENT_PEM_provided_write_body_main"
+  - "IMPLEMENT_PEM_provided_write_body_pass"
+  - "IMPLEMENT_PEM_provided_write_body_vars"
+  - "IMPLEMENT_PEM_provided_write_cb"
+  - "IMPLEMENT_PEM_provided_write_cb_bio"
+  - "IMPLEMENT_PEM_provided_write_cb_fp"
+  - "IMPLEMENT_PEM_provided_write_cb_to"
+  - "IMPLEMENT_PEM_provided_write_fp"
+  - "IMPLEMENT_PEM_provided_write_to"
+  - "IMPLEMENT_PEM_read"
+  - "IMPLEMENT_PEM_read_bio"
+  - "IMPLEMENT_PEM_read_fp"
+  - "IMPLEMENT_PEM_rw"
+  - "IMPLEMENT_PEM_rw_cb"
+  - "IMPLEMENT_PEM_rw_const"
+  - "IMPLEMENT_PEM_write"
+  - "IMPLEMENT_PEM_write_bio"
+  - "IMPLEMENT_PEM_write_bio_const"
+  - "IMPLEMENT_PEM_write_cb"
+  - "IMPLEMENT_PEM_write_cb_bio"
+  - "IMPLEMENT_PEM_write_cb_bio_const"
+  - "IMPLEMENT_PEM_write_cb_const"
+  - "IMPLEMENT_PEM_write_cb_fp"
+  - "IMPLEMENT_PEM_write_cb_fp_const"
+  - "IMPLEMENT_PEM_write_const"
+  - "IMPLEMENT_PEM_write_fp"
+  - "IMPLEMENT_PEM_write_fp_const"
+  - "IMPLEMENT_quic_meth_func"
+  - "IMPLEMENT_SHA3_functions"
+  - "IMPLEMENT_SHAKE_functions"
+  - "IMPLEMENT_SSL_TEST_BOOL_OPTION"
+  - "IMPLEMENT_SSL_TEST_INT_OPTION"
+  - "IMPLEMENT_SSL_TEST_STRING_OPTION"
+  - "IMPLEMENT_ssl3_meth_func"
+  - "IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS"
+  - "IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS"
+  - "IMPLEMENT_tdes_cipher"
+  - "IMPLEMENT_TEST_SUITE"
+  - "IMPLEMENT_TEST_SUITE_LEGACY"
+  - "IMPLEMENT_TEST_SUITE_MSBLOB"
+  - "IMPLEMENT_TEST_SUITE_PARAMS"
+  - "IMPLEMENT_TEST_SUITE_PROTECTED_PVK"
+  - "IMPLEMENT_TEST_SUITE_UNPROTECTED_PVK"
+  - "IMPLEMENT_tls_meth_func"
+  - "IMPLEMENT_var_keylen_cipher"
+  - "IMPLEMENT_var_keylen_cipher_func"
+  - "IMPLEMENT_WRAP_CIPHER"
+  - "ASN1_ADB_END"
+  - "ASN1_CHOICE_END"
+  - "ASN1_CHOICE_END_cb"
+  - "ASN1_CHOICE_END_name"
+  - "ASN1_CHOICE_END_selector"
+  - "ASN1_F_ASN1_FIND_END                             0"
+  - "ASN1_ITEM_TEMPLATE_END"
+  - "ASN1_NDEF_SEQUENCE_END"
+  - "ASN1_NDEF_SEQUENCE_END_cb"
+  - "ASN1_SEQUENCE_END"
+  - "ASN1_SEQUENCE_END_cb"
+  - "ASN1_SEQUENCE_END_enc"
+  - "ASN1_SEQUENCE_END_name"
+  - "ASN1_SEQUENCE_END_ref"
+  - "static_ASN1_SEQUENCE_END"
+  # This isn't quite right, but it causes clang-format to do a slightly better
+  # job formatting this macro.
+  - "ASN1_EX_TEMPLATE_TYPE"
+  - "LAZY"
+#
+# Include sorting should be disabled until post 4.0
+#
+#SortIncludes:
+#  Enabled:         false
+#  IgnoreCase:      false
+#  IgnoreExtension: false
+SortIncludes:    Never
+IncludeBlocks:   Preserve
+IncludeCategories:
+#  # deprecated must always be first
+#  - Regex:           '^"internal/deprecated.h"'
+#    Priority:        -10
+#    SortPriority:    0
+#    CaseSensitive:   false
+#  # bio_local is special
+#  - Regex:           '^"bio_local.h"'
+#    Priority:        -1
+#    SortPriority:    0
+#    CaseSensitive:   false
+#  - Regex:           '^"crypto/.*\.h"'
+#    Priority:        5
+#    SortPriority:    0
+#    CaseSensitive:   false
+#  - Regex:           '^"internal/.*\.h"'
+#    Priority:        4
+#    SortPriority:    0
+#    CaseSensitive:   false
+#  - Regex:           '^<openssl/.*\.h>'
+#    Priority:        3
+#    SortPriority:    0
+#    CaseSensitive:   false
+#  - Regex:           '^<.*\.h>'
+#    Priority:        1
+#    SortPriority:    0
+#    CaseSensitive:   false
+#  # we do not currently include C++ style files, in case we ever do?
+#  - Regex:           '^<.*'
+#    Priority:        2
+#    SortPriority:    0
+#    CaseSensitive:   false
+#  - Regex:           '.*'
+#    Priority:        6
+#    SortPriority:    0
+#    CaseSensitive:   false
+...
+
diff --git a/.codespellrc b/.codespellrc
new file mode 100644
index 0000000000000..8b10d35f8f5a0
--- /dev/null
+++ b/.codespellrc
@@ -0,0 +1,454 @@
+[codespell]
+ignore-regex = \b[a-zA-Z][a-zA-Z]\b
+
+uri-ignore-words-list =
+    standarts
+
+ignore-words-list =
+    aas,
+    Aas,
+    AAS,
+    abd,
+    ABD,
+    accreting,
+    ADDAD,
+    addin,
+    adin,
+    AFAIR,
+    afile,
+    afterAll,
+    AfterAll,
+    Ake,
+    ALine,
+    allEdges,
+    alloced,
+    alloco,
+    allws,
+    alo,
+    Alo,
+    alow,
+    ALS,
+    alsptd,
+    ang,
+    ans,
+    anS,
+    ANS,
+    aNULL,
+    archType,
+    arithmetics,
+    assertIn,
+    ategory,
+    atLeast,
+    AtLeast,
+    atMost,
+    biom,
+    bion,
+    bootup,
+    BRE,
+    Buda,
+    buildd,
+    bve,
+    CAF,
+    cann,
+    CANN,
+    cant,
+    Chang,
+    checkin,
+    childs,
+    ciph,
+    circularly,
+    Circularly,
+    claus,
+    Claus,
+    clen,
+    CLOS,
+    co-ordinate,
+    co-ordinates,
+    Collet,
+    Collison,
+    compilability,
+    compileTime,
+    CompileTime,
+    complies,
+    COMPLIES,
+    configury,
+    consumation,
+    couldn,
+    crasher,
+    crashers,
+    crate,
+    Crate,
+    CRATE,
+    creat,
+    CREAT,
+    CrOS,
+    crypted,
+    CRYPTED,
+    currentY,
+    DAA,
+    datas,
+    debbugs,
+    Debbugs,
+    DELET,
+    dependancies,
+    dependancy,
+    dependant,
+    deque,
+    Deque,
+    dota,
+    doubleclick,
+    doubleClick,
+    DoubleClick,
+    dout,
+    Dout,
+    DOUT,
+    dum,
+    dur,
+    Dur,
+    Durin,
+    ect,
+    ECT,
+    ede,
+    EDE,
+    endianess,
+    endin,
+    engineerr,
+    ENGINEerr,
+    equest,
+    equests,
+    FileTest,
+    FILETEST,
+    filetests,
+    flate,
+    Flate,
+    FLATE,
+    fpr,
+    FPR,
+    FPT,
+    gord,
+    gost,
+    Gost,
+    GOST,
+    Hart,
+    hasTable,
+    hel,
+    hist,
+    HIST,
+    HSI,
+    htmp,
+    ifset,
+    igest,
+    iif,
+    IIF,
+    implementor,
+    Implementor,
+    implementors,
+    Implementors,
+    inactivate,
+    inbrace,
+    indention,
+    indx,
+    ine,
+    informat,
+    inh,
+    inout,
+    inOut,
+    InOut,
+    INOUT,
+    ISCONNECTION,
+    isnt,
+    ist,
+    IST,
+    keep-alives,
+    keypair,
+    keyPair,
+    Keypair,
+    KeyPair,
+    KEYPAIR,
+    keypairs,
+    keyPairs,
+    Keypairs,
+    KeyPairs,
+    keyserver,
+    LAMDA,
+    larg,
+    leapYear,
+    LOd,
+    LOD,
+    Maked,
+    Manger,
+    Manuel,
+    ment,
+    Merget,
+    minimise,
+    mis,
+    Mis,
+    MIS,
+    mitre,
+    Mitre,
+    MITRE,
+    mmaped,
+    msdos,
+    MSDOS,
+    nam,
+    Nam,
+    NAM,
+    nclusion,
+    Ned,
+    nin,
+    Nin,
+    nmake,
+    NMake,
+    NMAKE,
+    NOo,
+    notin,
+    Notin,
+    NotIn,
+    numer,
+    OCE,
+    offsetp,
+    ois,
+    onText,
+    OnText,
+    openin,
+    OptIn,
+    OPTIO,
+    origN,
+    outin,
+    paeth,
+    Paeth,
+    PAETH,
+    parm,
+    pARM,
+    Parm,
+    PARM,
+    parms,
+    pARMS,
+    Parms,
+    PARMs,
+    PARMS,
+    pass-thru,
+    passin,
+    poping,
+    pres,
+    Pres,
+    prevEnd,
+    pris,
+    PullRequest,
+    que,
+    re-usable,
+    Re-usable,
+    re-use,
+    Re-use,
+    re-used,
+    Re-used,
+    re-uses,
+    Re-uses,
+    re-using,
+    Re-using,
+    readd,
+    Readd,
+    readded,
+    Readded,
+    regArg,
+    regArgs,
+    requestor,
+    Requestor,
+    requestors,
+    rewinded,
+    roperties,
+    sav,
+    SEH,
+    ser,
+    Ser,
+    SER,
+    servent,
+    sHolder,
+    shouldBe,
+    shouldnot,
+    SHS,
+    siz,
+    SIZ,
+    SME,
+    SOM,
+    Sorce,
+    sover,
+    splitted,
+    statics,
+    Statics,
+    strRange,
+    succes,
+    technics,
+    testss,
+    therefor,
+    Therefor,
+    therefrom,
+    Thi,
+    thirdparty,
+    thirdParty,
+    Thirdparty,
+    ThirdParty,
+    THIRDPARTY,
+    thru,
+    Thur,
+    THUR,
+    tmplate,
+    tne,
+    tolen,
+    tthe,
+    ture,
+    uis,
+    UIs,
+    upto,
+    upTo,
+    uptodate,
+    upToDate,
+    UpToDate,
+    useable,
+    Useable,
+    userA,
+    UserA,
+    usign,
+    varN,
+    vertexes,
+    vew,
+    vor,
+    WAN,
+    wasn,
+    Widgits,
+    Wirth,
+    wont,
+    WRONLY,
+    WTH
+
+skip =
+    [cC]hange.[lL]og*,
+    [cC]hange[lL]og*,
+    [cC]hanges,
+    [cC]hanges[._-]*,
+    *__*__*.html,
+    *_8h_source.html,
+    *_8h.html,
+    *.asc,
+    *.bin,
+    *.crt,
+    *.csr,
+    *.css.map,
+    *.eps,
+    *.fr.utf-8,
+    *.git,
+    *.html.de,
+    *.html.es,
+    *.html.fr,
+    *.html.ko.euc-kr,
+    *.html.pt-br,
+    *.info_[0-9],
+    *.ipynb,
+    *.ja.utf8,
+    *.js.map,
+    *.min.js,
+    *.pdf,
+    *.pem,
+    *.po,
+    *.ppm,
+    *.ps,
+    *.rtf,
+    *.sum,
+    *.svg,
+    *.svn,
+    *.tr.utf8,
+    *.xpm,
+    *.zh-cn.utf8,
+    *.zlib,
+    *[._-][cC]hanges,
+    *[._-]CHANGES,
+    */.mailmap,
+    */.versions/*,
+    */[eE]ncode/*,
+    */[eE]ncodings/*,
+    */[lL]ang/*,
+    */[lL]anguage/*,
+    */[lL]anguages/*,
+    */[lL]ocale,
+    */[mM]ath[jJ]ax/*,
+    */[tT]hird*[pP]arty/*,
+    */[tT]ranslation/*,
+    */[tT]ranslations/*,
+    */*.desktop,
+    */*.desktop.in,
+    */*[^a/]test/*,
+    */*[^a/]tests/*,
+    */*[lL]ocal[ei]*/*,
+    */3rd*[pP]arty/*,
+    */aspell/*,
+    */AUTHORS*,
+    */charsets/*,
+    */chrtrans/*,
+    */codepage/*,
+    */data/*,
+    */deps/*,
+    */dict/*,
+    */dictionaries/*,
+    */doc*/[a-df-z][a-z]/*,
+    */doc*/[a-z][a-z][_-][a-zA-Z][a-zA-Z]/*,
+    */doc*/e[a-mo-z]/*,
+    */extern/*,
+    */external/*,
+    */externals/*,
+    */help/[a-df-z][a-z]/*,
+    */help/[a-z][a-z]_[A-Z][A-Z]/*,
+    */help/es/*,
+    */i18n/*,
+    */icu/*,
+    */info/[a-df-z][a-z]/*,
+    */info/[a-z][a-z]_[A-Z][A-Z]/*,
+    */info/es/*,
+    */intl/*,
+    */l10n/*,
+    */langmap/*,
+    */langs/*,
+    */LICENSE,
+    */man*/[a-df-z][a-z]/*,
+    */man*/[a-z][a-z][_-][a-zA-Z][a-zA-Z]/*,
+    */man*/e[a-mo-z]/*,
+    */messages[_./][a-df-z][a-z][_./]*,
+    */messages[_./][a-z][a-z]_[A-Z][A-Z][_./]*,
+    */messages[_./]es[_./]*,
+    */rfc[1-9]*.txt,
+    */runtime/*,
+    */searchindex.js,
+    */test*/*,
+    */test/danetest.in,
+    */test/data2.bin,
+    */test/recipes/30-test_evp_data/evppkey_kas.txt,
+    */test/recipes/30-test_evp_data/evppkey.txt,
+    */unicode/*,
+    */Unicode/*,
+    */unicore/*,
+    */vendor/*,
+    */vendors/*,
+    */yarn.lock,
+    *codespell-check.sh,
+    *lorem-ipsum*,
+    *man[12345657]/*
+    /fonts/*,
+    ABOUT-NLS,
+    authors.xml,
+    CHANGE.log*,
+    CHANGELOG*,
+    CHANGES,
+    CHANGES[._-]*,
+    CONTRIBUTORS*,
+    CREDITS,
+    CREDITS.TXT,
+    DONATIONS,
+    external/*,
+    jquery.js,
+    jquery.min.map,
+    localization*-[a-z][a-z]_[a-zA-Z][a-zA-Z].*,
+    localization*-[a-z][a-z].*,
+    MAINTAINERS,
+    NormalizationTest.txt,
+    package-lock.json,
+    THANKS*,
+    UnicodeData.txt
diff --git a/.ctags.d/exclude.ctags b/.ctags.d/exclude.ctags
index c932464e6dbdc..310a7ada24e07 100644
--- a/.ctags.d/exclude.ctags
+++ b/.ctags.d/exclude.ctags
@@ -1,5 +1,5 @@
 #
-# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2023-2026 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -10,4 +10,3 @@
 # List file names or patterns you want ctags to ignore.
 --exclude=.ctags.d
 --exclude=test
---exclude=check-format-test-positives.c
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index a94e041c41ad5..fb0fe4bda08d9 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,2 +1,4 @@
 # Run util/openssl-format-source -v -c .
 0f113f3ee4d629ef9a4a30911b22b224772085e5
+# 3.5-POST-CLANG-FORMAT-WEBKIT 
+65310e7e8949c94ca67c2e84e932aea22000aefc
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000000..bba4770703ecc
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+/.github/workflows/ @quarckster
diff --git a/.github/workflows/build_quic_interop_container.yml b/.github/workflows/build_quic_interop_container.yml
index 28dc52743b839..962dcc73d6a15 100644
--- a/.github/workflows/build_quic_interop_container.yml
+++ b/.github/workflows/build_quic_interop_container.yml
@@ -9,7 +9,7 @@ jobs:
   update_quay_container:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
          fetch-depth: 0
       - name: "log in to quay.io"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6e81d8e086b65..9c82d213e62dd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,8 +31,8 @@ jobs:
     - name: install unifdef
       run: |
         sudo apt-get update
-        sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install unifdef
-    - uses: actions/checkout@v4
+        sudo apt-get -yq --no-install-suggests --no-install-recommends --allow-unauthenticated --allow-downgrades --allow-remove-essential --allow-change-held-packages install unifdef
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
     - name: config
@@ -47,7 +47,9 @@ jobs:
   check_docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: config
       run: ./config --banner=Configured --strict-warnings enable-fips && perl configdata.pm --dump
     - name: make build_generated
@@ -67,7 +69,9 @@ jobs:
   check-ansi:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: config
       run: CPPFLAGS='-ansi -D_XOPEN_SOURCE=1 -D_POSIX_C_SOURCE=200809L' ./config --banner=Configured enable-sslkeylog no-asm no-secure-memory no-makedepend enable-buildtest-c++ enable-fips --strict-warnings && perl configdata.pm --dump
     - name: make
@@ -76,7 +80,9 @@ jobs:
   basic_gcc:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: localegen
@@ -99,7 +105,8 @@ jobs:
       run: |
         util/wrap.pl -fips apps/openssl list -providers | grep 'name: CI FIPS Provider for OpenSSL$'
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@basic-gcc"
         path: artifacts.tar.gz
@@ -107,7 +114,9 @@ jobs:
   basic_clang:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -121,7 +130,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@basic-clang"
         path: artifacts.tar.gz
@@ -129,7 +139,9 @@ jobs:
   linux-arm64:
     runs-on: ${{ github.repository == 'openssl/openssl' && 'linux-arm64' || 'ubuntu-24.04-arm' }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: config
       run: ./config enable-demos enable-fips enable-ec_nistp_64_gcc_128 enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-trace
     - name: config dump
@@ -143,7 +155,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@linux-arm64"
         path: artifacts.tar.gz
@@ -151,9 +164,11 @@ jobs:
   freebsd-x86_64:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: config
-      uses: cross-platform-actions/action@v0.26.0
+      uses: cross-platform-actions/action@46e8d7fb25520a8d6c64fd2b7a1192611da98eda #v0.30.0
       with:
         operating_system: freebsd
         version: "13.4"
@@ -162,21 +177,21 @@ jobs:
           sudo pkg install -y gcc perl5
           ./config enable-fips enable-ec_nistp_64_gcc_128 enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-trace
     - name: config dump
-      uses: cross-platform-actions/action@v0.26.0
+      uses: cross-platform-actions/action@46e8d7fb25520a8d6c64fd2b7a1192611da98eda #v0.30.0
       with:
         operating_system: freebsd
         version: "13.4"
         shutdown_vm: false
         run: ./configdata.pm --dump
     - name: make
-      uses: cross-platform-actions/action@v0.26.0
+      uses: cross-platform-actions/action@46e8d7fb25520a8d6c64fd2b7a1192611da98eda #v0.30.0
       with:
         operating_system: freebsd
         version: "13.4"
         shutdown_vm: false
         run: make -j4
     - name: make test
-      uses: cross-platform-actions/action@v0.26.0
+      uses: cross-platform-actions/action@46e8d7fb25520a8d6c64fd2b7a1192611da98eda #v0.30.0
       with:
         operating_system: freebsd
         version: "13.4"
@@ -184,7 +199,8 @@ jobs:
           ./util/opensslwrap.sh version -c
           .github/workflows/make-test
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@BSD-x86_64"
         path: artifacts.tar.gz
@@ -192,7 +208,9 @@ jobs:
   minimal:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -206,7 +224,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@minimal"
         path: artifacts.tar.gz
@@ -214,7 +233,9 @@ jobs:
   no-deprecated:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -228,7 +249,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@no-deprecated"
         path: artifacts.tar.gz
@@ -236,7 +258,9 @@ jobs:
   no-shared-ubuntu:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -250,19 +274,18 @@ jobs:
     - name: make test
       run: .github/workflows/make-test
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@no-shared-ubuntu"
         path: artifacts.tar.gz
 
   no-shared-macos:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-13, macos-14]
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-14
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -276,15 +299,18 @@ jobs:
     - name: make test
       run: .github/workflows/make-test
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
-        name: "ci@no-shared-${{ matrix.os }}"
+        name: "ci@no-shared-macos-14"
         path: artifacts.tar.gz
 
   non-caching:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: Adjust ASLR for sanitizer
@@ -302,7 +328,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test OPENSSL_TEST_RAND_ORDER=0 TESTS="-test_fuzz* -test_ssl_* -test_sslapi -test_evp -test_cmp_http -test_verify -test_cms -test_store -test_enc -[01][0-9]"
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@non-caching"
         path: artifacts.tar.gz
@@ -310,7 +337,9 @@ jobs:
   address_ub_sanitizer:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: Adjust ASLR for sanitizer
@@ -328,7 +357,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test OPENSSL_TEST_RAND_ORDER=0
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@address_ub_sanitizer"
         path: artifacts.tar.gz
@@ -336,7 +366,9 @@ jobs:
   fuzz_tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: Adjust ASLR for sanitizer
@@ -354,7 +386,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test OPENSSL_TEST_RAND_ORDER=0 TESTS="test_fuzz*"
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@fuzz_tests"
         path: artifacts.tar.gz
@@ -363,7 +396,9 @@ jobs:
   memory_sanitizer:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: Adjust ASLR for sanitizer
@@ -382,7 +417,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test OPENSSL_TEST_RAND_ORDER=0
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@memory_sanitizer"
         path: artifacts.tar.gz
@@ -390,7 +426,9 @@ jobs:
   threads_sanitizer:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: Adjust ASLR for sanitizer
@@ -408,7 +446,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test V=1 TESTS="test_lhash test_threads test_internal_provider test_provfetch test_provider test_pbe test_evp_kdf test_pkcs12 test_store test_evp test_quic*"
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@threads_sanitizer"
         path: artifacts.tar.gz
@@ -416,7 +455,9 @@ jobs:
   enable_non-default_options:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: modprobe tls
@@ -432,7 +473,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@enable_non-default_options"
         path: artifacts.tar.gz
@@ -440,7 +482,9 @@ jobs:
   full_featured:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: modprobe tls
@@ -462,7 +506,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@full_featured"
         path: artifacts.tar.gz
@@ -470,7 +515,9 @@ jobs:
   no-legacy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -484,7 +531,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@no-legacy"
         path: artifacts.tar.gz
@@ -492,7 +540,9 @@ jobs:
   legacy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -506,7 +556,8 @@ jobs:
     - name: make test
       run: .github/workflows/make-test
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@legacy"
         path: artifacts.tar.gz
@@ -519,9 +570,10 @@ jobs:
   out-of-readonly-source-and-install-ubuntu:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         path: ./source
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
       working-directory: ./source
@@ -548,7 +600,8 @@ jobs:
       run: ../source/.github/workflows/make-test
       working-directory: ./build
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "ci@out-of-readonly-source-and-install-ubuntu"
         path: build/artifacts.tar.gz
@@ -557,15 +610,12 @@ jobs:
       working-directory: ./build
 
   out-of-readonly-source-and-install-macos:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-13, macos-14]
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-15
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         path: ./source
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
       working-directory: ./source
@@ -592,9 +642,10 @@ jobs:
       run: ../source/.github/workflows/make-test
       working-directory: ./build
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
-        name: "ci@out-of-readonly-source-and-install-${{ matrix.os }}"
+        name: "ci@out-of-readonly-source-and-install-macos-15"
         path: build/artifacts.tar.gz
     - name: make install
       run: make install
@@ -603,15 +654,16 @@ jobs:
   external-tests-misc:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: recursive
+        persist-credentials: false
     - name: package installs
       run: |
         sudo apt-get update
         sudo apt-get -yq install bison gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python3 python3-paste python3-pyrad slapd tcsh python3-virtualenv virtualenv python3-kdcproxy gdb
     - name: install cpanm and Test2::V0 for gost_engine testing
-      uses: perl-actions/install-with-cpanm@stable
+      uses: perl-actions/install-with-cpanm@10d60f00b4073f484fc29d45bfbe2f776397ab3d # v1.7
       with:
         install: Test2::V0
     - name: setup hostname workaround
@@ -620,7 +672,9 @@ jobs:
       run: ./config --banner=Configured --strict-warnings --debug no-afalgeng enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 enable-external-tests no-fips && perl configdata.pm --dump
     - name: make
       run: make -s -j4
-    - uses: dtolnay/rust-toolchain@stable
+    - uses: dtolnay/rust-toolchain@0f44b27771c32bda9f458f75a1e241b09791b331
+      with:
+        toolchain: stable
     - name: get cpu info
       run: |
         cat /proc/cpuinfo
@@ -642,9 +696,10 @@ jobs:
   external-tests-providers:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: recursive
+        persist-credentials: false
     - name: package installs
       run: |
         sudo apt-get update
@@ -672,18 +727,19 @@ jobs:
         PYTHON:
           - 3.9
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: recursive
+        persist-credentials: false
     - name: Configure OpenSSL
       run: ./config --banner=Configured --strict-warnings --debug enable-external-tests && perl configdata.pm --dump
     - name: make
       run: make -s -j4
     - name: Setup Python
-      uses: actions/setup-python@v5.3.0
+      uses: actions/setup-python@v6.0.0
       with:
         python-version: ${{ matrix.PYTHON }}
-    - uses: dtolnay/rust-toolchain@master
+    - uses: dtolnay/rust-toolchain@0f44b27771c32bda9f458f75a1e241b09791b331
       with:
         toolchain: ${{ matrix.RUST }}
     - name: get cpu info
diff --git a/.github/workflows/compiler-zoo.yml b/.github/workflows/compiler-zoo.yml
index c255eede68dc2..6422733a4363d 100644
--- a/.github/workflows/compiler-zoo.yml
+++ b/.github/workflows/compiler-zoo.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2025 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2026 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -13,99 +13,63 @@ permissions:
   contents: read
 
 jobs:
-  compiler:
+  gcc:
     strategy:
       fail-fast: false
       matrix:
-        zoo: [
-          {
-            cc: gcc-9,
-            distro: ubuntu-22.04
-          }, {
-            cc: gcc-10,
-            distro: ubuntu-22.04
-          }, {
-            cc: gcc-11,
-            distro: ubuntu-22.04
-          }, {
-            cc: gcc-12,
-            distro: ubuntu-22.04
-          }, {
-            cc: gcc-13,
-            distro: ubuntu-22.04,
-            gcc-ppa-name: ubuntu-toolchain-r/test
-          }, {
-            cc: clang-11,
-            distro: ubuntu-22.04
-          }, {
-            cc: clang-12,
-            distro: ubuntu-22.04
-          }, {
-            cc: clang-13,
-            distro: ubuntu-22.04
-          }, {
-            cc: clang-14,
-            distro: ubuntu-22.04
-          }, {
-            cc: clang-15,
-            distro: ubuntu-22.04,
-            llvm-ppa-name: jammy
-          }, {
-            cc: clang-16,
-            distro: ubuntu-22.04,
-            llvm-ppa-name: jammy
-          }, {
-            cc: clang-17,
-            distro: ubuntu-22.04,
-            llvm-ppa-name: jammy
-          }
-        ]
-    # We set per-compiler now to allow testing with both older and newer sets
-    # Often, the full range of oldest->newest compilers we want aren't available
-    # in a single version of Ubuntu.
-    runs-on: ${{ matrix.zoo.distro }}
+        gcc: [gcc-9, gcc-10, gcc-11, gcc-12, gcc-13, gcc-14]
+    runs-on: ubuntu-24.04
     steps:
     - name: install packages
       run: |
-        gcc_ppa_name="${{ matrix.zoo.gcc-ppa-name }}"
-        llvm_ppa_name="${{ matrix.zoo.llvm-ppa-name }}"
-
-        # In the Matrix above:
-        # - we set gcc-ppc-name if the GCC version isn't part of the Ubuntu version we're using (see https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test).
-        # - we set llvm-ppa-name if an LLVM version isn't part of the Ubuntu version we're using (see https://apt.llvm.org/).
-        # This is especially needed because even new Ubuntu LTSes aren't available
-        # until a while after release on Github Actions.
-        if [[ -n ${gcc_ppa_name} ]] ; then
-          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-          sudo apt-get update
-        elif [[ -n ${llvm_ppa_name} ]] ; then
-            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key |\
-                gpg --dearmor |\
-                sudo tee /usr/share/keyrings/llvm-snapshot.gpg.key > /dev/null
-
-            clang_version="${{ matrix.zoo.cc }}"
-            clang_version="${clang_version/clang-}"
-
-            echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg.key] http://apt.llvm.org/${{ matrix.zoo.llvm-ppa-name }}/ llvm-toolchain-${{ matrix.zoo.llvm-ppa-name }}-${clang_version} main" \
-                | sudo tee /etc/apt/sources.list.d/llvm.list
-            echo "deb-src [signed-by=/usr/share/keyrings/llvm-snapshot.gpg.key] http://apt.llvm.org/${{ matrix.zoo.llvm-ppa-name }}/ llvm-toolchain-${{ matrix.zoo.llvm-ppa-name }}-${clang_version} main" \
-                | sudo tee -a /etc/apt/sources.list.d/llvm.list
-
-            cat /etc/apt/sources.list.d/llvm.list
-        fi
-
         sudo apt-get update
-        sudo apt-get -y install ${{ matrix.zoo.cc }}
-
-    - uses: actions/checkout@v4
+        sudo apt-get -y install ${{ matrix.gcc }}
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
-
     - name: config
+      env:
+        CC: ${{ matrix.gcc }}
       run: |
-        CC=${{ matrix.zoo.cc }} ./config --banner=Configured no-shared \
-            -Wall -Werror enable-fips --strict-warnings
+        ./config --strict-warnings --banner=Configured no-shared enable-fips
+    - name: config dump
+      run: ./configdata.pm --dump
+    - name: make
+      run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
+    - name: make test
+      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
+  clang:
+    strategy:
+      fail-fast: false
+      matrix:
+        clang: [clang-11, clang-12, clang-13, clang-14, clang-15, clang-16, clang-17, clang-18, clang-19, clang-20, clang-21]
+    runs-on: ubuntu-22.04
+    steps:
+    - name: install packages
+      run: |
+        set -euo pipefail
+        VERSION=$(awk -F- '{print $NF}' <<< ${{ matrix.clang }})
+        wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+        echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-$VERSION main" | sudo tee -a /etc/apt/sources.list
+        sudo apt-get update || true
+        sudo apt-get -y install ${{ matrix.clang }}
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
+    - name: checkout fuzz/corpora submodule
+      run: git submodule update --init --depth 1 fuzz/corpora
+    - name: config
+      env:
+        CC: ${{ matrix.clang }}
+      run: |
+        ./config --strict-warnings --banner=Configured no-shared enable-fips
     - name: config dump
       run: ./configdata.pm --dump
     - name: make
diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
index 0916007ebeb03..52319fa0f3851 100644
--- a/.github/workflows/coveralls.yml
+++ b/.github/workflows/coveralls.yml
@@ -31,18 +31,24 @@ jobs:
     steps:
       - name: Define branches
         id: branches
+        env:
+          GITHUB_EVENT_INPUTS_BRANCH: ${{ github.event.inputs.branch }}
+          GITHUB_EVENT_INPUTS_EXTRA_CONFIG: ${{ github.event.inputs.extra_config }}
         run: |
           if [ "${{ github.event_name}}" = "workflow_dispatch" ]; then
           MATRIX=$(cat << EOF
           [{
-            "branch": "${{ github.event.inputs.branch }}",
-            "extra_config": "${{ github.event.inputs.extra_config }}"
+            "branch": "${GITHUB_EVENT_INPUTS_BRANCH}",
+            "extra_config": "${GITHUB_EVENT_INPUTS_EXTRA_CONFIG}"
           }]
           EOF
           )
           else
           MATRIX=$(cat << EOF
           [{
+              "branch": "openssl-3.5",
+              "extra_config": "no-afalgeng enable-fips enable-tfo"
+            },{
               "branch": "openssl-3.4",
               "extra_config": "no-afalgeng enable-fips enable-tfo"
             }, {
@@ -59,7 +65,7 @@ jobs:
               "extra_config": "no-afalgeng enable-fips"
             }, {
               "branch": "master",
-              "extra_config": "no-afalgeng enable-fips enable-tfo"
+              "extra_config": "no-afalgeng enable-fips enable-tfo enable-lms"
           }]
           EOF
           )
@@ -77,7 +83,7 @@ jobs:
         branches: ${{ fromJSON(needs.define-matrix.outputs.branches) }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: recursive
         ref: ${{ matrix.branches.branch }}
@@ -90,7 +96,7 @@ jobs:
         sudo apt-get -yq install lcov
         sudo apt-get -yq install bison gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python3 python3-paste python3-pyrad slapd tcsh python3-virtualenv virtualenv python3-kdcproxy
     - name: install Test2::V0 for gost_engine testing
-      uses: perl-actions/install-with-cpanm@stable
+      uses: perl-actions/install-with-cpanm@10d60f00b4073f484fc29d45bfbe2f776397ab3d # v1.7
       with:
         install: Test2::V0
     - name: setup hostname workaround
@@ -115,7 +121,7 @@ jobs:
              --ignore-errors mismatch
               -o ./lcov.info
     - name: Coveralls upload
-      uses: coverallsapp/github-action@v2.3.2
+      uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b #v2.3.6
       with:
         github-token: ${{ secrets.github_token }}
         git-branch: ${{ matrix.branches.branch }}
diff --git a/.github/workflows/cross-compiles.yml b/.github/workflows/cross-compiles.yml
index 2232e50a88444..2ceb45003c406 100644
--- a/.github/workflows/cross-compiles.yml
+++ b/.github/workflows/cross-compiles.yml
@@ -103,10 +103,7 @@ jobs:
           }, {
             arch: powerpc64le-linux-gnu,
             libs: libc6-dev-ppc64el-cross,
-            # The default compiler for this platform on Ubuntu 20.04 seems
-            # buggy and causes test failures. Dropping the optimisation level
-            # resolves it.
-            target: -O2 linux-ppc64le,
+            target: linux-ppc64le,
             fips: no
           }, {
             arch: riscv64-linux-gnu,
@@ -171,7 +168,9 @@ jobs:
         sudo apt-get -yq --force-yes install \
             gcc-${{ matrix.platform.arch }} \
             ${{ matrix.platform.libs }}
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
 
@@ -207,8 +206,10 @@ jobs:
                  ${{ matrix.platform.opensslcaps }}" >> $GITHUB_ENV
 
     - name: get cpu info
-      run: cat /proc/cpuinfo
-
+      if: matrix.platform.tests != 'none'
+      run: |
+         cat /proc/cpuinfo
+         QEMU_LD_PREFIX=/usr/${{ matrix.platform.arch }} ./util/opensslwrap.sh version -c
     - name: make all tests
       if: github.event_name == 'push' && matrix.platform.tests == ''
       run: |
@@ -228,7 +229,8 @@ jobs:
                   TESTS="test_evp*" \
                   QEMU_LD_PREFIX=/usr/${{ matrix.platform.arch }}
     - name: save artifacts
-      uses: actions/upload-artifact@v4
+      if: success() || failure()
+      uses: actions/upload-artifact@v5
       with:
         name: "cross-compiles@${{ matrix.platform.arch }}"
         path: artifacts.tar.gz
diff --git a/.github/workflows/deploy-docs-openssl-org.yml b/.github/workflows/deploy-docs-openssl-org.yml
index 7b8e6838a7ead..fec8ca8b50030 100644
--- a/.github/workflows/deploy-docs-openssl-org.yml
+++ b/.github/workflows/deploy-docs-openssl-org.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: "Trigger deployment workflow"
         run: |
-          gh workflow run -f branch=${{ github.ref_name }} deploy-site.yaml
+          gh workflow run -f branch=${GITHUB_REF_NAME} deploy-site.yaml
           sleep 3
           RUN_ID=$(gh run list -w deploy-site.yaml -L 1 --json databaseId -q ".[0].databaseId")
           gh run watch ${RUN_ID} --exit-status
diff --git a/.github/workflows/fips-checksums.yml b/.github/workflows/fips-checksums.yml
index d286d78cb9fdf..0849f6a4579f9 100644
--- a/.github/workflows/fips-checksums.yml
+++ b/.github/workflows/fips-checksums.yml
@@ -26,7 +26,7 @@ jobs:
           mkdir ./build
           mkdir ./source
           mkdir ./artifact
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           repository: ${{ github.event.pull_request.base.repo.full_name }}
           ref: ${{ github.event.pull_request.base.ref }}
@@ -43,7 +43,7 @@ jobs:
       - name: make fips-checksums pristine
         run: make fips-checksums
         working-directory: ./build-pristine
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           path: source
       - name: config
@@ -88,7 +88,7 @@ jobs:
           mkdir ./artifact
       - name: install extra config support
         run: sudo apt-get -y install libsctp-dev abigail-tools libzstd-dev zstd
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           repository: ${{ github.event.pull_request.base.repo.full_name }}
           ref: ${{ github.event.pull_request.base.ref }}
@@ -99,7 +99,7 @@ jobs:
       - name: make pristine
         run: make -s -j4
         working-directory: ./build-pristine
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           path: source
       - name: config
diff --git a/.github/workflows/fuzz-checker.yml b/.github/workflows/fuzz-checker.yml
index a280b410e5d6d..8af8b91b85cc1 100644
--- a/.github/workflows/fuzz-checker.yml
+++ b/.github/workflows/fuzz-checker.yml
@@ -52,7 +52,9 @@ jobs:
       run: |
         sudo cat /proc/sys/vm/mmap_rnd_bits
         sudo sysctl -w vm.mmap_rnd_bits=28
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
 
     - name: config
       run: |
diff --git a/.github/workflows/interop-tests.yml b/.github/workflows/interop-tests.yml
index 147bd25d36193..40009394ee9ed 100644
--- a/.github/workflows/interop-tests.yml
+++ b/.github/workflows/interop-tests.yml
@@ -23,7 +23,9 @@ jobs:
     env:
       COMPONENT: ${{ matrix.COMPONENT }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
+        with:
+          persist-credentials: false
       - name: Display environment
         run: export
       - name : Install needed tools
@@ -43,7 +45,7 @@ jobs:
           sed -i 's/^Release: .*$/Release: dev/' openssl.spec
           yum-builddep -y /build/SPECS/openssl.spec # just for sure nothing is missing
           mkdir -p /build/SOURCES
-          tar --transform "s/^__w\/openssl\/openssl/openssl-$MAJOR.$MINOR.$PATCH/" -czf /build/SOURCES/openssl-$MAJOR.$MINOR.$PATCH.tar.gz /__w/openssl/openssl/
+          tar --transform "s/^__w\/openssl\/openssl/openssl-$MAJOR.$MINOR.$PATCH/" -czf /build/SOURCES/openssl-$MAJOR.$MINOR.$PATCH.tar.gz "$GITHUB_WORKSPACE"
           rpmbuild -bb /build/SPECS/openssl.spec
           dnf install -y /build/RPMS/x86_64/openssl-*
           cp ${GITHUB_WORKSPACE}/interop/openssl/openssl.cnf /etc/pki/tls/openssl.cnf
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 06686a9f48011..92776529e69e7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,6 +14,11 @@ jobs:
   Fuzzing:
     runs-on: ubuntu-latest
     steps:
+    - name: Clear unnecessary files
+      run: |
+        df
+        sudo rm -rf /usr/share/dotnet /usr/share/swift /usr/local/.ghcup /usr/local/share/powershell /usr/local/share/chromium /usr/local/lib/android /usr/local/lib/node_modules
+        df
     - name: Build Fuzzers
       uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
       with:
@@ -26,7 +31,7 @@ jobs:
         fuzz-seconds: 600
         dry-run: false
     - name: Upload Crash
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       if: failure()
       with:
         name: artifacts
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index ab0255d405df2..3ce47a12f16d4 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: "releaser"
     steps:
     - name: "Checkout"
-      uses: "actions/checkout@v4"
+      uses: "actions/checkout@v6"
       with:
         fetch-depth: 1
         ref: ${{ github.ref_name }}
@@ -26,16 +26,20 @@ jobs:
         token: ${{ secrets.GHE_TOKEN }}
         path: ${{ github.ref_name }}
     - name: "Prepare assets"
+      env:
+        SIGNING_KEY_UID: ${{ vars.signing_key_uid }}
       run: |
-        cd ${{ github.ref_name }}
+        cd "$GITHUB_REF_NAME"
         ./util/mktar.sh
-        mkdir assets && mv ${{ github.ref_name }}.tar.gz assets/ && cd assets
-        openssl sha1 -r ${{ github.ref_name }}.tar.gz > ${{ github.ref_name }}.tar.gz.sha1
-        openssl sha256 -r ${{ github.ref_name }}.tar.gz > ${{ github.ref_name }}.tar.gz.sha256
-        gpg -u ${{ vars.signing_key_uid }} -o ${{ github.ref_name }}.tar.gz.asc -sba ${{ github.ref_name }}.tar.gz
+        mkdir -p assets && mv "$GITHUB_REF_NAME.tar.gz" assets/ && cd assets
+        openssl sha1 -r "$GITHUB_REF_NAME.tar.gz" > "$GITHUB_REF_NAME.tar.gz.sha1"
+        openssl sha256 -r "$GITHUB_REF_NAME.tar.gz" > "$GITHUB_REF_NAME.tar.gz.sha256"
+        gpg -u "$SIGNING_KEY_UID" -o "$GITHUB_REF_NAME.tar.gz.asc" -sba "$GITHUB_REF_NAME.tar.gz"
     - name: "Create release"
       env:
         GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
       run: |
-        VERSION=$(echo ${{ github.ref_name }} | cut -d "-" -f 2-)
-        gh release create ${{ github.ref_name }} -t "OpenSSL $VERSION" -d --notes " " -R ${{ github.repository }} ${{ github.ref_name }}/assets/*
+        VERSION=$(echo "$GITHUB_REF_NAME" | cut -d "-" -f 2-)
+        PRE_RELEASE=$([[ "$GITHUB_REF_NAME" =~ alpha|beta ]] && echo "-p" || echo "")
+        NOTES=$(curl -s "https://api.openssl.org/release-metadata/news/?version=$VERSION&capture_title=False")
+        gh release create "$GITHUB_REF_NAME" $PRE_RELEASE -t "OpenSSL $VERSION" -d --notes "$NOTES" -R "$GITHUB_REPOSITORY" "$GITHUB_REF_NAME/assets/"*
diff --git a/.github/workflows/make-test b/.github/workflows/make-test
index 239fcfb4ae418..c38d0de3439b9 100755
--- a/.github/workflows/make-test
+++ b/.github/workflows/make-test
@@ -19,7 +19,7 @@ export OSSL_CI_ARTIFACTS_PATH="$(cd "$OSSL_CI_ARTIFACTS_PATH"; pwd)"
 
 # Run the tests. This might fail, but we need to capture artifacts anyway.
 set +e
-make test HARNESS_JOBS=${HARNESS_JOBS:-4} "$@"
+make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16} "$@"
 RESULT=$?
 set -e
 
diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml
index 4aa38913f0a7e..2b6108050cb90 100644
--- a/.github/workflows/os-zoo.yml
+++ b/.github/workflows/os-zoo.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2025 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2026 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -35,7 +35,9 @@ jobs:
     steps:
     - name: install packages
       run: apk --no-cache add build-base perl linux-headers ${{ matrix.cc }}
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: config
       run: |
         ./config --banner=Configured no-shared -Wall -Werror enable-fips --strict-warnings \
@@ -49,26 +51,28 @@ jobs:
         cat /proc/cpuinfo
         ./util/opensslwrap.sh version -c
     - name: make test
-      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
+      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16}
 
   linux:
     strategy:
       fail-fast: false
       matrix:
         zoo:
-          - image: docker.io/library/debian:10
-            install: apt-get update && apt-get install -y gcc make perl
           - image: docker.io/library/debian:11
             install: apt-get update && apt-get install -y gcc make perl
           - image: docker.io/library/debian:12
             install: apt-get update && apt-get install -y gcc make perl
+          - image: docker.io/library/debian:trixie
+            install: apt-get update && apt-get install -y gcc make perl
           - image: docker.io/library/ubuntu:20.04
             install: apt-get update && apt-get install -y gcc make perl
           - image: docker.io/library/ubuntu:22.04
             install: apt-get update && apt-get install -y gcc make perl
-          - image: docker.io/library/fedora:38
+          - image: docker.io/library/ubuntu:24.04
+            install: apt-get update && apt-get install -y gcc make perl
+          - image: docker.io/library/fedora:41
             install: dnf install -y gcc make perl-core
-          - image: docker.io/library/fedora:39
+          - image: docker.io/library/fedora:42
             install: dnf install -y gcc make perl-core
           - image: docker.io/library/centos:8
             install: |
@@ -82,7 +86,9 @@ jobs:
     runs-on: ubuntu-latest
     container: ${{ matrix.zoo.image }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: install packages
       run: ${{ matrix.zoo.install }}
     - name: config
@@ -96,7 +102,7 @@ jobs:
         cat /proc/cpuinfo
         ./util/opensslwrap.sh version -c
     - name: make test
-      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
+      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16}
 
   macos:
     strategy:
@@ -105,7 +111,9 @@ jobs:
         os: [macos-13, macos-14, macos-15]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -119,20 +127,25 @@ jobs:
         sysctl machdep.cpu
         ./util/opensslwrap.sh version -c
     - name: make test
-      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
+      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16}
 
   windows:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019, windows-2022]
+        os: [windows-2022, windows-2025]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
-    - uses: ilammy/msvc-dev-cmd@v1
-    - uses: ilammy/setup-nasm@v1
+    - name: install nasm
+      run: |
+        choco install nasm
+        "C:\Program Files\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append
+    - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 #v1.13.0
     - name: prepare the build directory
       run: mkdir _build
     - name: config
@@ -145,7 +158,7 @@ jobs:
       working-directory: _build
       run: nmake /S
     - name: download coreinfo
-      uses: suisei-cn/actions-download-file@v1.6.0
+      uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 #v1.6.0
       with:
         url: "https://download.sysinternals.com/files/Coreinfo.zip"
         target: _build/coreinfo/
@@ -157,12 +170,14 @@ jobs:
         apps/openssl.exe version -c
     - name: test
       working-directory: _build
-      run: nmake test VERBOSE_FAILURE=yes HARNESS_JOBS=4
+      run: nmake test VERBOSE_FAILURE=yes HARNESS_JOBS=4 LHASH_WORKERS=16
 
   linux-arm64:
     runs-on: linux-arm64
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: config
       run: ./config enable-fips enable-ec_nistp_64_gcc_128 enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-trace
     - name: config dump
@@ -172,12 +187,14 @@ jobs:
     - name: get cpu info
       run: ./util/opensslwrap.sh version -c
     - name: make test
-      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
+      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16}
 
   linux-ppc64le:
     runs-on: linux-ppc64le
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: config
       run: ./config enable-fips enable-ec_nistp_64_gcc_128 enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-trace
     - name: config dump
@@ -189,12 +206,14 @@ jobs:
         cat /proc/cpuinfo
         ./util/opensslwrap.sh version -c
     - name: make test
-      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
+      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16}
 
   linux-s390x:
     runs-on: linux-s390x
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: config
       run: ./config enable-fips enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-trace
     - name: config dump
@@ -206,14 +225,16 @@ jobs:
         cat /proc/cpuinfo
         ./util/opensslwrap.sh version -c
     - name: make test
-      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
+      run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} LHASH_WORKERS=${LHASH_WORKERS:-16}
 
   freebsd-x86_64:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: config
-      uses: cross-platform-actions/action@v0.26.0
+      uses: cross-platform-actions/action@46e8d7fb25520a8d6c64fd2b7a1192611da98eda #v0.30.0
       with:
         operating_system: freebsd
         version: "13.4"
@@ -222,21 +243,21 @@ jobs:
           sudo pkg install -y gcc perl5
           ./config enable-fips enable-ec_nistp_64_gcc_128 enable-md2 enable-rc5 enable-ssl3 enable-ssl3-method enable-trace
     - name: config dump
-      uses: cross-platform-actions/action@v0.26.0
+      uses: cross-platform-actions/action@46e8d7fb25520a8d6c64fd2b7a1192611da98eda #v0.30.0
       with:
         operating_system: freebsd
         version: "13.4"
         shutdown_vm: false
         run: ./configdata.pm --dump
     - name: make
-      uses: cross-platform-actions/action@v0.26.0
+      uses: cross-platform-actions/action@46e8d7fb25520a8d6c64fd2b7a1192611da98eda #v0.30.0
       with:
         operating_system: freebsd
         version: "13.4"
         shutdown_vm: false
         run: make -j4
     - name: make test
-      uses: cross-platform-actions/action@v0.26.0
+      uses: cross-platform-actions/action@46e8d7fb25520a8d6c64fd2b7a1192611da98eda #v0.30.0
       with:
         operating_system: freebsd
         version: "13.4"
diff --git a/.github/workflows/prov-compat-label.yml b/.github/workflows/prov-compat-label.yml
index d3e011f1f3225..f904c791576ad 100644
--- a/.github/workflows/prov-compat-label.yml
+++ b/.github/workflows/prov-compat-label.yml
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
+# 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
@@ -89,7 +89,7 @@ jobs:
                                                  -providers
         working-directory: ${{ matrix.release.dir }}
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.release.tgz }}
           path: ${{ matrix.release.tgz }}
@@ -113,14 +113,6 @@ jobs:
             name: openssl-3.0,
             dir: branch-3.0,
             tgz: branch-3.0.tar.gz,
-          }, {
-            name: openssl-3.1,
-            dir: branch-3.1,
-            tgz: branch-3.1.tar.gz,
-          }, {
-            name: openssl-3.2,
-            dir: branch-3.2,
-            tgz: branch-3.2.tar.gz,
           }, {
             name: openssl-3.3,
             dir: branch-3.3,
@@ -129,6 +121,14 @@ jobs:
             name: openssl-3.4,
             dir: branch-3.4,
             tgz: branch-3.4.tar.gz,
+          }, {
+            name: openssl-3.5,
+            dir: branch-3.5,
+            tgz: branch-3.5.tar.gz,
+          }, {
+            name: openssl-3.6,
+            dir: branch-3.6,
+            tgz: branch-3.6.tar.gz,
           }, {
             name: master,
             dir: branch-master,
@@ -138,7 +138,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           path: ${{ matrix.branch.dir }}
           repository: openssl/openssl
@@ -178,7 +178,7 @@ jobs:
           ./util/opensslwrap.sh version -c
         working-directory: ${{ matrix.branch.dir }}
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.branch.tgz }}
           path: ${{ matrix.branch.tgz }}
@@ -197,58 +197,63 @@ jobs:
         # Note that releases are not used as a test environment for
         # later providers.  Problems in these situations ought to be
         # caught by cross branch testing before the release.
-        tree_a: [ branch-3.4, branch-3.3, branch-3.2, branch-3.1, branch-3.0,
+        tree_a: [ branch-3.6, branch-3.5, branch-3.4, branch-3.3, branch-3.0,
                   openssl-3.0.0, openssl-3.0.8, openssl-3.0.9, openssl-3.1.2 ]
         tree_b: [ PR ]
         include:
           - tree_a: PR
             tree_b: branch-master
           - tree_a: PR
-            tree_b: branch-3.4
+            tree_b: branch-3.6
           - tree_a: PR
-            tree_b: branch-3.3
+            tree_b: branch-3.5
           - tree_a: PR
-            tree_b: branch-3.2
+            tree_b: branch-3.4
           - tree_a: PR
-            tree_b: branch-3.1
+            tree_b: branch-3.3
           - tree_a: PR
             tree_b: branch-3.0
     steps:
       - name: early exit checks
         id: early_exit
+        env:
+          B_BRANCH: ${{ matrix.tree_b }}
+          PR_LABELS: ${{ toJson(github.event.pull_request.labels.*.name) }}
         run: |
-          if [ "${{ matrix.tree_a }}" = "${{ matrix.tree_b }}" ];           \
-          then                                                              \
-            echo "Skipping because both are the same version";              \
-            exit 1;                                                         \
+          b_ver=${B_BRANCH#branch-}
+          b_label="branch: $b_ver"
+          if [[ "$PR_LABELS" == *"$b_label"* ]]; then
+            echo "Skipping branches modified by the PR"
+            echo "skip=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "skip=false" >> "$GITHUB_OUTPUT"
           fi
-        continue-on-error: true
 
-      - uses: actions/download-artifact@v4.1.8
-        if: steps.early_exit.outcome == 'success'
+      - uses: actions/download-artifact@v6.0.0
+        if: steps.early_exit.outputs.skip != 'true'
         with:
           name: ${{ matrix.tree_a }}.tar.gz
       - name: unpack first build
-        if: steps.early_exit.outcome == 'success'
+        if: steps.early_exit.outputs.skip != 'true'
         run: tar xzf "${{ matrix.tree_a }}.tar.gz"
 
-      - uses: actions/download-artifact@v4.1.8
-        if: steps.early_exit.outcome == 'success'
+      - uses: actions/download-artifact@v6.0.0
+        if: steps.early_exit.outputs.skip != 'true'
         with:
           name: ${{ matrix.tree_b }}.tar.gz
       - name: unpack second build
-        if: steps.early_exit.outcome == 'success'
+        if: steps.early_exit.outputs.skip != 'true'
         run: tar xzf "${{ matrix.tree_b }}.tar.gz"
 
       - name: set up cross validation of FIPS from A with tree from B
-        if: steps.early_exit.outcome == 'success'
+        if: steps.early_exit.outputs.skip != 'true'
         run: |
           cp providers/fips.so ../${{ matrix.tree_b }}/providers/
           cp providers/fipsmodule.cnf ../${{ matrix.tree_b }}/providers/
         working-directory: ${{ matrix.tree_a }}
 
       - name: show module versions from cross validation
-        if: steps.early_exit.outcome == 'success'
+        if: steps.early_exit.outputs.skip != 'true'
         run: |
           ./util/wrap.pl -fips apps/openssl list -provider-path providers   \
                                                  -provider base             \
@@ -259,14 +264,14 @@ jobs:
         working-directory: ${{ matrix.tree_b }}
 
       - name: get cpu info
-        if: steps.early_exit.outcome == 'success'
+        if: steps.early_exit.outputs.skip != 'true'
         run: |
           cat /proc/cpuinfo
           ./util/opensslwrap.sh version -c
         working-directory: ${{ matrix.tree_b }}
 
       - name: run cross validation tests of FIPS from A with tree from B
-        if: steps.early_exit.outcome == 'success'
+        if: steps.early_exit.outputs.skip != 'true'
         run: |
           make test HARNESS_JOBS=${HARNESS_JOBS:-4}
         working-directory: ${{ matrix.tree_b }}
diff --git a/.github/workflows/provider-compatibility.yml b/.github/workflows/provider-compatibility.yml
index 7ed080083f2b9..aa9d3caf22779 100644
--- a/.github/workflows/provider-compatibility.yml
+++ b/.github/workflows/provider-compatibility.yml
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
+# 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
@@ -96,7 +96,7 @@ jobs:
                                                  -providers
         working-directory: ${{ matrix.release.dir }}
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.release.tgz }}
           path: ${{ matrix.release.tgz }}
@@ -111,36 +111,38 @@ jobs:
           #     `dir' directory that will be used to build and test in.
           #     `tgz' is the name of the tarball use to keep the artifacts of
           #         the build.
+          #     `extra_config` adds extra config build option for the branch.
           {
             name: openssl-3.0,
             dir: branch-3.0,
             tgz: branch-3.0.tar.gz,
-          }, {
-            name: openssl-3.1,
-            dir: branch-3.1,
-            tgz: branch-3.1.tar.gz,
-          }, {
-            name: openssl-3.2,
-            dir: branch-3.2,
-            tgz: branch-3.2.tar.gz,
+            extra_config: "",
           }, {
             name: openssl-3.3,
             dir: branch-3.3,
             tgz: branch-3.3.tar.gz,
+            extra_config: "",
           }, {
             name: openssl-3.4,
             dir: branch-3.4,
             tgz: branch-3.4.tar.gz,
+            extra_config: "",
+          }, {
+            name: openssl-3.5,
+            dir: branch-3.5,
+            tgz: branch-3.5.tar.gz,
+            extra_config: "",
           }, {
             name: master,
             dir: branch-master,
             tgz: branch-master.tar.gz,
+            extra_config: "enable-lms",
           },
         ]
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           path: ${{ matrix.branch.dir }}
           repository: openssl/openssl
@@ -150,7 +152,7 @@ jobs:
 
       - name: config branch
         run: |
-          ./config --banner=Configured enable-shared enable-fips ${{ env.opts }}
+          ./config --banner=Configured enable-shared enable-fips ${{ env.opts }} ${{ matrix.branch.extra_config }}
         working-directory: ${{ matrix.branch.dir }}
       - name: config dump current
         run: ./configdata.pm --dump
@@ -184,7 +186,7 @@ jobs:
         run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
         working-directory: ${{ matrix.branch.dir }}
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.branch.tgz }}
           path: ${{ matrix.branch.tgz }}
@@ -202,47 +204,47 @@ jobs:
         # Note that releases are not used as a test environment for
         # later providers.  Problems in these situations ought to be
         # caught by cross branch testing before the release.
-        tree_a: [ branch-master, branch-3.4, branch-3.3,
-                  branch-3.2, branch-3.1, branch-3.0,
+        tree_a: [ branch-master, branch-3.6, branch-3.5, branch-3.4, branch-3.3,
+                  branch-3.0,
                   openssl-3.0.0, openssl-3.0.8, openssl-3.0.9, openssl-3.1.2 ]
-        tree_b: [ branch-master, branch-3.4, branch-3.3,
-                  branch-3.2, branch-3.1, branch-3.0  ]
+        tree_b: [ branch-master, branch-3.6, branch-3.5, branch-3.4, branch-3.3,
+                  branch-3.0  ]
     steps:
       - name: early exit checks
         id: early_exit
         run: |
-          if [ "${{ matrix.tree_a }}" = "${{ matrix.tree_b }}" ];           \
-          then                                                              \
-            echo "Skipping because both are the same version";              \
-            exit 1;                                                         \
+          if [ "${{ matrix.tree_a }}" = "${{ matrix.tree_b }}" ]; then
+            echo "Skipping because both are the same version"
+            echo "skip=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "skip=false" >> "$GITHUB_OUTPUT"
           fi
-        continue-on-error: true
 
-      - uses: actions/download-artifact@v4.1.8
-        if: steps.early_exit.outcome == 'success'
+      - uses: actions/download-artifact@v6.0.0
+        if: steps.early_exit.outputs.skip != 'true'
         with:
           name: ${{ matrix.tree_a }}.tar.gz
       - name: unpack first build
-        if: steps.early_exit.outcome == 'success'
+        if: steps.early_exit.outputs.skip != 'true'
         run: tar xzf "${{ matrix.tree_a }}.tar.gz"
 
-      - uses: actions/download-artifact@v4.1.8
-        if: steps.early_exit.outcome == 'success'
+      - uses: actions/download-artifact@v6.0.0
+        if: steps.early_exit.outputs.skip != 'true'
         with:
           name: ${{ matrix.tree_b }}.tar.gz
       - name: unpack second build
-        if: steps.early_exit.outcome == 'success'
+        if: steps.early_exit.outputs.skip != 'true'
         run: tar xzf "${{ matrix.tree_b }}.tar.gz"
 
       - name: set up cross validation of FIPS from A with tree from B
-        if: steps.early_exit.outcome == 'success'
+        if: steps.early_exit.outputs.skip != 'true'
         run: |
           cp providers/fips.so ../${{ matrix.tree_b }}/providers/
           cp providers/fipsmodule.cnf ../${{ matrix.tree_b }}/providers/
         working-directory: ${{ matrix.tree_a }}
 
       - name: show module versions from cross validation
-        if: steps.early_exit.outcome == 'success'
+        if: steps.early_exit.outputs.skip != 'true'
         run: |
           ./util/wrap.pl -fips apps/openssl list -provider-path providers   \
                                                  -provider base             \
@@ -253,14 +255,14 @@ jobs:
         working-directory: ${{ matrix.tree_b }}
 
       - name: get cpu info
-        if: steps.early_exit.outcome == 'success'
+        if: steps.early_exit.outputs.skip != 'true'
         run: |
           cat /proc/cpuinfo
           ./util/opensslwrap.sh version -c
         working-directory: ${{ matrix.tree_b }}
 
       - name: run cross validation tests of FIPS from A with tree from B
-        if: steps.early_exit.outcome == 'success'
+        if: steps.early_exit.outputs.skip != 'true'
         run: |
           make test HARNESS_JOBS=${HARNESS_JOBS:-4}
         working-directory: ${{ matrix.tree_b }}
diff --git a/.github/workflows/run-checker-ci.yml b/.github/workflows/run-checker-ci.yml
index 2690e0d1b5af8..925b301b9d483 100644
--- a/.github/workflows/run-checker-ci.yml
+++ b/.github/workflows/run-checker-ci.yml
@@ -46,7 +46,9 @@ jobs:
         ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
diff --git a/.github/workflows/run-checker-daily.yml b/.github/workflows/run-checker-daily.yml
index 3bdcc9fd83178..3922cc775c921 100644
--- a/.github/workflows/run-checker-daily.yml
+++ b/.github/workflows/run-checker-daily.yml
@@ -135,7 +135,9 @@ jobs:
         ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -154,7 +156,9 @@ jobs:
   run-checker-sctp:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: Install Dependencies for sctp option
@@ -198,7 +202,9 @@ jobs:
         sudo apt-get update
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install brotli libbrotli1 libbrotli-dev
     - name: checkout openssl
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -220,7 +226,9 @@ jobs:
         sudo apt-get update
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install zstd libzstd1 libzstd-dev
     - name: checkout openssl
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -243,7 +251,9 @@ jobs:
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install brotli libbrotli1 libbrotli-dev
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install zstd libzstd1 libzstd-dev
     - name: checkout openssl
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -265,7 +275,9 @@ jobs:
         sudo apt-get update
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install brotli libbrotli1 libbrotli-dev
     - name: checkout openssl
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: Adjust ASLR for sanitizer
@@ -291,7 +303,9 @@ jobs:
         sudo apt-get update
         sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install zstd libzstd1 libzstd-dev
     - name: checkout openssl
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: Adjust ASLR for sanitizer
@@ -315,7 +329,9 @@ jobs:
         os: [ ubuntu-latest, macos-13, macos-14 ]
     runs-on: ${{matrix.os}}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -330,7 +346,9 @@ jobs:
   enable_buildtest:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -347,7 +365,9 @@ jobs:
   memory_sanitizer_slh_dsa:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: Adjust ASLR for sanitizer
diff --git a/.github/workflows/run-checker-merge.yml b/.github/workflows/run-checker-merge.yml
index 249e31c3efacd..8ff9a806efd5f 100644
--- a/.github/workflows/run-checker-merge.yml
+++ b/.github/workflows/run-checker-merge.yml
@@ -43,7 +43,9 @@ jobs:
       run: |
         sudo cat /proc/sys/vm/mmap_rnd_bits
         sudo sysctl -w vm.mmap_rnd_bits=28
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
@@ -63,13 +65,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout openssl
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout jitter
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         repository: smuellerDD/jitterentropy-library
         ref: v3.5.0
         path: jitter
+        persist-credentials: false
     - name: build jitter
       run: make -C jitter/
     - name: checkout fuzz/corpora submodule
@@ -88,7 +93,9 @@ jobs:
   threads_sanitizer_atomic_fallback:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: Adjust ASLR for sanitizer
diff --git a/.github/workflows/run_quic_interop.yml b/.github/workflows/run_quic_interop.yml
index 1f04ec4b863fc..709588e9e0535 100644
--- a/.github/workflows/run_quic_interop.yml
+++ b/.github/workflows/run_quic_interop.yml
@@ -12,13 +12,17 @@ jobs:
       matrix:
         tests: [http3, transfer, handshake, retry, chacha20, resumption, multiplexing, ipv6]
         servers: [quic-go, ngtcp2, mvfst, quiche, nginx, msquic, haproxy]
+        exclude:
+          - servers: msquic
+            tests: retry
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
-         repository: 'quic-interop/quic-interop-runner'
-         fetch-depth: 0
+          repository: 'quic-interop/quic-interop-runner'
+          fetch-depth: 0
+          persist-credentials: false
       - name: Install dependencies
         run: |
           pip install -r requirements.txt
@@ -39,17 +43,18 @@ jobs:
     strategy:
       matrix:
         tests: [http3, transfer, handshake, retry, chacha20, resumption, amplificationlimit, ipv6]
-        clients: [quic-go, ngtcp2, mvfst, quiche, msquic, openssl]
+        clients: [quic-go, ngtcp2, mvfst, quiche, msquic, openssl, chrome]
         exclude:
           - clients: mvfst
             tests: amplificationlimit
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
-         repository: 'quic-interop/quic-interop-runner'
-         fetch-depth: 0
+          repository: 'quic-interop/quic-interop-runner'
+          fetch-depth: 0
+          persist-credentials: false
       - name: Install dependencies
         run: |
           pip install -r requirements.txt
diff --git a/.github/workflows/static-analysis-on-prem.yml b/.github/workflows/static-analysis-on-prem.yml
index 75c0d2aacc329..142e45735aede 100644
--- a/.github/workflows/static-analysis-on-prem.yml
+++ b/.github/workflows/static-analysis-on-prem.yml
@@ -26,7 +26,9 @@ jobs:
       run: |
         echo ${{ secrets.COVERITY_AUTH_KEY }} | base64 -d > /auth_key_file.txt
         chmod 0600 /auth_key_file.txt
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: Config
       run: CC=gcc ./config --banner=Configured --debug enable-fips enable-rc5 enable-md2 enable-ssl3 enable-nextprotoneg enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 no-shared enable-buildtest-c++ enable-external-tests -DPEDANTIC
     - name: Config dump
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 8e3e748389350..7de65e0d6a331 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -20,7 +20,9 @@ jobs:
   coverity:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: tool download
       run: |
         wget https://scan.coverity.com/download/linux64 \
diff --git a/.github/workflows/style-checks.yml b/.github/workflows/style-checks.yml
index 69c9ca6c8ef62..d4caf17741775 100644
--- a/.github/workflows/style-checks.yml
+++ b/.github/workflows/style-checks.yml
@@ -9,44 +9,22 @@ name: Coding style validation
 
 on: [pull_request]
 
-env:
-  PR_NUMBER: ${{ github.event.number }}
-  GH_TOKEN: ${{ github.token }}
-
-permissions:
-  contents: read
-
 jobs:
   check-style:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        path: openssl
-    - name: check style for each commit 
-      working-directory: openssl
-      shell: bash
-      run: |
-        ERRORS_FOUND=0
-        git fetch origin $GITHUB_BASE_REF:$GITHUB_BASE_REF
-        REFSTART=$(git rev-parse $GITHUB_BASE_REF)
-        REFEND=$(git rev-parse HEAD)
-        echo "Checking from $REFSTART to $REFEND"
-        echo "::group::Style report for commits $REFSTART..$REFEND"
-        set +e
-        ./util/check-format-commit.sh $REFSTART..$REFEND
-        if [ $? -ne 0 ]
-        then
-          ERRORS_FOUND=1
-        fi
-        set -e
-        echo "::endgroup::"
-        SKIP_TEST=$(gh pr view $PR_NUMBER --json labels --jq '.labels[] | select(.name == "style: waived") | .name')
-        if [ -z "$SKIP_TEST" ]
-        then
-          exit $ERRORS_FOUND
-        else
-          echo "PR $PR_NUMBER is marked with style: waived, waiving style check errors"
-          exit 0
-        fi
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+      - name: "Get changed files"
+        env:
+          NUMBER: ${{ github.event.pull_request.number }}
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          {
+            echo 'CHANGED_FILES<<EOF'
+            gh pr view $NUMBER --json files --jq '.files.[].path'
+            echo EOF
+          } >> "$GITHUB_ENV"
+      - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd #v3.0.1
+        with:
+          extra_args: "--files $CHANGED_FILES"
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0e0eb814f7f33..f086d7f3a87b8 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-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
@@ -19,25 +19,28 @@ jobs:
       matrix:
         platform:
           - arch: win64
-            os: windows-2019
+            os: windows-2022
             config: enable-fips
           - arch: win64
-            os: windows-2022
+            os: windows-2025
             config: enable-fips no-thread-pool no-quic
           - arch: win32
-            os: windows-2022
+            os: windows-2025
             config: --strict-warnings no-fips
     runs-on: ${{ matrix.platform.os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
-    - uses: ilammy/msvc-dev-cmd@v1
+    - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 #v1.13.0
       with:
         arch: ${{ matrix.platform.arch }}
-    - uses: ilammy/setup-nasm@v1
-      with:
-        platform: ${{ matrix.platform.arch }}
+    - name: install nasm
+      run: |
+        choco install nasm ${{ matrix.platform.arch == 'win32' && '--x86' || '' }}
+        "C:\Program Files${{ matrix.platform.arch == 'win32' && ' (x86)' || '' }}\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append
     - name: prepare the build directory
       run: mkdir _build
     - name: config
@@ -49,7 +52,7 @@ jobs:
       working-directory: _build
       run: nmake /S
     - name: download coreinfo
-      uses: suisei-cn/actions-download-file@v1.6.0
+      uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 #v1.6.0
       with:
         url: "https://download.sysinternals.com/files/Coreinfo.zip"
         target: _build/coreinfo/
@@ -57,8 +60,8 @@ jobs:
       working-directory: _build
       run: |
         apps/openssl.exe version -v
-        apps/openssl.exe version -v | %{($_ -split '\s+')[1]} 
-        apps/openssl.exe version -v | %{($_ -split '\s+')[1] -replace '([0-9]+\.[0-9]+)(\..*)','$1'} 
+        apps/openssl.exe version -v | %{($_ -split '\s+')[1]}
+        apps/openssl.exe version -v | %{($_ -split '\s+')[1] -replace '([0-9]+\.[0-9]+)(\..*)','$1'}
         echo "OSSL_VERSION=$(apps/openssl.exe version -v | %{($_ -split '\s+')[1] -replace '([0-9]+\.[0-9]+)(\..*)','$1'})" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
     - name: Set registry keys
       working-directory: _build
@@ -92,14 +95,15 @@ jobs:
     strategy:
       matrix:
         os:
-# Reducing CI footprint  - windows-2019
           - windows-2022
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
-    - uses: ilammy/msvc-dev-cmd@v1
+    - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 #v1.13.0
     - name: prepare the build directory
       run: mkdir _build
     - name: config
@@ -111,7 +115,7 @@ jobs:
       working-directory: _build
       run: nmake /S
     - name: download coreinfo
-      uses: suisei-cn/actions-download-file@v1.6.0
+      uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 #v1.6.0
       with:
         url: "https://download.sysinternals.com/files/Coreinfo.zip"
         target: _build/coreinfo/
@@ -129,14 +133,15 @@ jobs:
     strategy:
       matrix:
         os:
-          - windows-2019
-# Reducing CI footprint  - windows-2022
+          - windows-2022
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
-    - uses: ilammy/msvc-dev-cmd@v1
+    - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 #v1.13.0
     - name: prepare the build directory
       run: mkdir _build
     - name: config
@@ -148,7 +153,7 @@ jobs:
       working-directory: _build
       run: nmake # verbose, so no /S here
     - name: download coreinfo
-      uses: suisei-cn/actions-download-file@v1.6.0
+      uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 #v1.6.0
       with:
         url: "https://download.sysinternals.com/files/Coreinfo.zip"
         target: _build/coreinfo/
@@ -167,9 +172,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - windows-2019
-# really worth while running, too? cygwin should mask this
-#          - windows-2022
+          - windows-2022
         platform:
           - arch: win64
             config: -DCMAKE_C_COMPILER=gcc --strict-warnings enable-demos no-fips
@@ -184,8 +187,10 @@ jobs:
       MAKE_PARAMS: -j 4
     steps:
 # Checkout before cygwin can mess with PATH...
-    - uses: actions/checkout@v4
-    - uses: cygwin/cygwin-install-action@master
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
+    - uses: cygwin/cygwin-install-action@f2009323764960f80959895c7bc3bb30210afe4d #v6
       with:
          packages: perl git make gcc-core
     - name: Check repo
diff --git a/.github/workflows/windows_comp.yml b/.github/workflows/windows_comp.yml
index 34c5c3208b1ae..568e543b4cc54 100644
--- a/.github/workflows/windows_comp.yml
+++ b/.github/workflows/windows_comp.yml
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
+# 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
@@ -23,11 +23,16 @@ jobs:
   zstd:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
-    - uses: ilammy/msvc-dev-cmd@v1
-    - uses: ilammy/setup-nasm@v1
+    - name: install nasm
+      run: |
+        choco install nasm
+        "C:\Program Files\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append
+    - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 #v1.13.0
     - name: prepare the build directory
       run: mkdir _build
     - name: Get zstd
@@ -59,7 +64,7 @@ jobs:
         reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v MODULESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32
         reg.exe query HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v OPENSSLDIR /reg:32
     - name: download coreinfo
-      uses: suisei-cn/actions-download-file@v1.6.0
+      uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 #v1.6.0
       with:
         url: "https://download.sysinternals.com/files/Coreinfo.zip"
         target: _build/coreinfo/
@@ -82,11 +87,16 @@ jobs:
   brotli:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
+      with:
+        persist-credentials: false
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
-    - uses: ilammy/msvc-dev-cmd@v1
-    - uses: ilammy/setup-nasm@v1
+    - name: install nasm
+      run: |
+        choco install nasm
+        "C:\Program Files\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append
+    - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 #v1.13.0
     - name: prepare the build directory
       run: mkdir _build
     - name: Get brotli
@@ -118,7 +128,7 @@ jobs:
         reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v MODULESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32
         reg.exe query HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v OPENSSLDIR /reg:32
     - name: download coreinfo
-      uses: suisei-cn/actions-download-file@v1.6.0
+      uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 #v1.6.0
       with:
         url: "https://download.sysinternals.com/files/Coreinfo.zip"
         target: _build/coreinfo/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000000000..2565246b2a949
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,13 @@
+repos:
+  - repo: "https://github.com/codespell-project/codespell"
+    rev: "v2.4.1"
+    hooks:
+      - id: "codespell"
+        args: ["--config=.codespellrc"]
+  - repo: "https://github.com/pre-commit/mirrors-clang-format"
+    rev: "v21.1.6"
+    hooks:
+      - id: "clang-format"
+        types_or: []
+        files: '\.c\.in$|\.h\.in$|\.c$|\.h$'
+        args: ["--style=file"]
diff --git a/CHANGES.md b/CHANGES.md
index e2484046d845b..6266e019225ed 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,12 +28,416 @@ OpenSSL Releases
 OpenSSL 3.5
 -----------
 
-### Changes between 3.4 and 3.5 [xx XXX xxxx]
+### Changes between 3.5.5 and 3.5.6 [xx XXX xxxx]
 
-* Added server side support for QUIC
+ * none yet
+
+### Changes between 3.5.4 and 3.5.5 [27 Jan 2026]
+
+ * Fixed Improper validation of PBMAC1 parameters in PKCS#12 MAC verification.
+
+   Severity: Moderate
+
+   Issue summary: PBMAC1 parameters in PKCS#12 files are missing validation
+   which can trigger a stack-based buffer overflow, invalid pointer or NULL
+   pointer dereference during MAC verification.
+
+   Impact summary: The stack buffer overflow or NULL pointer dereference may
+   cause a crash leading to Denial of Service for an application that parses
+   untrusted PKCS#12 files. The buffer overflow may also potentially enable
+   code execution depending on platform mitigations.
+
+   Reported by: Stanislav Fort (Aisle Research) and Petr Šimeček (Aisle
+   Research) and Hamza (Metadust)
+
+   ([CVE-2025-11187])
+
+   *Tomáš Mráz*
+
+ * Fixed Stack buffer overflow in CMS `AuthEnvelopedData` parsing.
+
+   Severity: High
+
+   Issue summary: Parsing CMS `AuthEnvelopedData` message with maliciously
+   crafted AEAD parameters can trigger a stack buffer overflow.
+
+   Impact summary: A stack buffer overflow may lead to a crash, causing Denial
+   of Service, or potentially remote code execution.
+
+   Reported by: Stanislav Fort (Aisle Research)
+
+   ([CVE-2025-15467])
+
+   *Igor Ustinov*
+
+ * Fixed NULL dereference in `SSL_CIPHER_find()` function on unknown cipher ID.
+
+   Severity: Low
+
+   Issue summary: If an application using the `SSL_CIPHER_find()` function
+   in a QUIC protocol client or server receives an unknown cipher suite from
+   the peer, a NULL dereference occurs.
+
+   Impact summary: A NULL pointer dereference leads to abnormal termination
+   of the running process causing Denial of Service.
+
+   Reported by: Stanislav Fort (Aisle Research)
+
+   ([CVE-2025-15468])
+
+   *Stanislav Fort*
+
+ * Fixed `openssl dgst` one-shot codepath silently truncates inputs >16 MiB.
+
+   Severity: Low
+
+   Issue summary: The `openssl dgst` command-line tool silently truncates input
+   data to 16 MiB when using one-shot signing algorithms and reports success
+   instead of an error.
+
+   Impact summary: A user signing or verifying files larger than 16 MiB with
+   one-shot algorithms (such as Ed25519, Ed448, or ML-DSA) may believe the
+   entire file is authenticated while trailing data beyond 16 MiB remains
+   unauthenticated.
+
+   Reported by: Stanislav Fort (Aisle Research)
+
+   ([CVE-2025-15469])
+
+   *Viktor Dukhovni*
+
+ * Fixed TLS 1.3 `CompressedCertificate` excessive memory allocation.
+
+   Severity: Low
+
+   Issue summary: A TLS 1.3 connection using certificate compression can be
+   forced to allocate a large buffer before decompression without checking
+   against the configured certificate size limit.
+
+   Impact summary: An attacker can cause per-connection memory allocations
+   of up to approximately 22 MiB and extra CPU work, potentially leading
+   to service degradation or resource exhaustion (Denial of Service).
+
+   Reported by: Tomas Dulka (Aisle Research) and Stanislav Fort (Aisle
+   Research)
+
+   ([CVE-2025-66199])
+
+   *Tomas Dulka and Stanislav Fort*
+
+ * Fixed Heap out-of-bounds write in `BIO_f_linebuffer` on short writes.
+
+   Severity: Low
+
+   Issue summary: Writing large, newline-free data into a BIO chain using the
+   line-buffering filter where the next BIO performs short writes can trigger
+   a heap-based out-of-bounds write.
+
+   Impact summary: This out-of-bounds write can cause memory corruption
+   which typically results in a crash, leading to Denial of Service for
+   an application.
+
+   Reported by: Petr Simecek (Aisle Research) and Stanislav Fort (Aisle
+   Research)
+
+   ([CVE-2025-68160])
+
+   *Stanislav Fort and Neil Horman*
+
+ * Fixed Unauthenticated/unencrypted trailing bytes with low-level OCB
+   function calls.
+
+   Severity: Low
+
+   Issue summary: When using the low-level OCB API directly with AES-NI or
+   other hardware-accelerated code paths, inputs whose length is not a multiple
+   of 16 bytes can leave the final partial block unencrypted and
+   unauthenticated.
+
+   Impact summary: The trailing 1-15 bytes of a message may be exposed in
+   cleartext on encryption and are not covered by the authentication tag,
+   allowing an attacker to read or tamper with those bytes without detection.
+
+   Reported by: Stanislav Fort (Aisle Research)
+
+   ([CVE-2025-69418])
+
+   *Stanislav Fort*
+
+ * Fixed Out of bounds write in `PKCS12_get_friendlyname()` UTF-8 conversion.
+
+   Severity: Low
+
+   Issue summary: Calling `PKCS12_get_friendlyname()` function on a maliciously
+   crafted PKCS#12 file with a `BMPString` (UTF-16BE) friendly name containing
+   non-ASCII BMP code point can trigger a one byte write before the allocated
+   buffer.
+
+   Impact summary: The out-of-bounds write can cause a memory corruption
+   which can have various consequences including a Denial of Service.
+
+   Reported by: Stanislav Fort (Aisle Research)
+
+   ([CVE-2025-69419])
+
+   *Norbert Pócs*
+
+ * Fixed Missing `ASN1_TYPE` validation in `TS_RESP_verify_response()` function.
+
+   Severity: Low
+
+   Issue summary: A type confusion vulnerability exists in the TimeStamp
+   Response verification code where an `ASN1_TYPE` union member is accessed
+   without first validating the type, causing an invalid or NULL pointer
+   dereference when processing a malformed `TimeStamp` Response file.
+
+   Impact summary: An application calling `TS_RESP_verify_response()`
+   with a malformed TimeStamp Response can be caused to dereference an invalid
+   or NULL pointer when reading, resulting in a Denial of Service.
+
+   Reported by: Luigino Camastra (Aisle Research)
+
+   ([CVE-2025-69420])
+
+   *Bob Beck*
+
+ * Fixed NULL Pointer Dereference in `PKCS12_item_decrypt_d2i_ex()` function.
+
+   Severity: Low
+
+   Issue summary: Processing a malformed PKCS#12 file can trigger a NULL
+   pointer dereference in the `PKCS12_item_decrypt_d2i_ex()` function.
+
+   Impact summary: A NULL pointer dereference can trigger a crash which leads
+   to Denial of Service for an application processing PKCS#12 files.
+
+   Reported by: Luigino Camastra (Aisle Research)
+
+   ([CVE-2025-69421])
+
+   *Luigino Camastra*
+
+ * Fixed Missing `ASN1_TYPE` validation in PKCS#12 parsing.
+
+   Severity: Low
+
+   Issue summary: An invalid or NULL pointer dereference can happen in
+   an application processing a malformed PKCS#12 file.
+
+   Impact summary: An application processing a malformed PKCS#12 file can be
+   caused to dereference an invalid or NULL pointer on memory read, resulting
+   in a Denial of Service.
+
+   Reported by: Luigino Camastra (Aisle Research)
+
+   ([CVE-2026-22795])
+
+   *Bob Beck*
+
+ * Fixed `ASN1_TYPE` Type Confusion in the `PKCS7_digest_from_attributes()`
+   function.
+
+   Severity: Low
+
+   Issue summary: A type confusion vulnerability exists in the signature
+   verification of signed PKCS#7 data where an `ASN1_TYPE` union member
+   is accessed without first validating the type, causing an invalid or NULL
+   pointer dereference when processing malformed PKCS#7 data.
+
+   Impact summary: An application performing signature verification of PKCS#7
+   data or calling directly the `PKCS7_digest_from_attributes()` function can be
+   caused to dereference an invalid or NULL pointer when reading, resulting in
+   a Denial of Service.
+
+   Reported by: Luigino Camastra (Aisle Research)
+
+   ([CVE-2026-22796])
+
+   *Bob Beck*
+
+ * RISC-V capabilities string format has changed to include the base
+   architecture and the vector length for the V extension.
+   <!-- https://github.com/openssl/openssl/pull/28760 -->
+
+   *Bernd Edlinger*
+
+ * Fixed incorrect acceptance of some malformed ECDSA signatures on s390x.
+   <!-- https://github.com/openssl/openssl/pull/29214 -->
+
+   *Holger Dengler*
+
+ * Source code has been reformatted with `clang-format`.
+   <!-- https://github.com/openssl/openssl/pull/29262 -->
+
+   *Bob Beck*
+
+### Changes between 3.5.3 and 3.5.4 [30 Sep 2025]
+
+ * Fix Out-of-bounds read & write in RFC 3211 KEK Unwrap
+
+   Issue summary: An application trying to decrypt CMS messages encrypted using
+   password based encryption can trigger an out-of-bounds read and write.
+
+   Impact summary: This out-of-bounds read may trigger a crash which leads to
+   Denial of Service for an application. The out-of-bounds write can cause
+   a memory corruption which can have various consequences including
+   a Denial of Service or Execution of attacker-supplied code.
+
+   The issue was reported by Stanislav Fort (Aisle Research).
+
+   ([CVE-2025-9230])
+
+   *Viktor Dukhovni*
+
+ * Fix Timing side-channel in SM2 algorithm on 64 bit ARM
+
+   Issue summary: A timing side-channel which could potentially allow remote
+   recovery of the private key exists in the SM2 algorithm implementation on
+   64 bit ARM platforms.
+
+   Impact summary: A timing side-channel in SM2 signature computations on
+   64 bit ARM platforms could allow recovering the private key by an attacker.
+
+   The issue was reported by Stanislav Fort (Aisle Research).
+
+   ([CVE-2025-9231])
+
+   *Stanislav Fort and Tomáš Mráz*
+
+ * Fix Out-of-bounds read in HTTP client no_proxy handling
+
+   Issue summary: An application using the OpenSSL HTTP client API functions
+   may trigger an out-of-bounds read if the "no_proxy" environment variable is
+   set and the host portion of the authority component of the HTTP URL is an
+   IPv6 address.
+
+   Impact summary: An out-of-bounds read can trigger a crash which leads to
+   Denial of Service for an application.
+
+   The issue was reported by Stanislav Fort (Aisle Research).
+
+   ([CVE-2025-9232])
+
+   *Stanislav Fort*
+
+ * The FIPS provider no longer performs a PCT on key import for ECX keys
+   (that was introduced in 3.5.2), following the latest update
+   on that requirement in FIPS 140-3 IG 10.3.A additional comment 1.
+
+   *Eugene Syromiatnikov*
+
+ * Fixed the length of the ASN.1 sequence for the SM3 digests of RSA-encrypted
+   signatures.
+
+   *Xiao Lou Dong Feng*
+
+ * Reverted the synthesised `OPENSSL_VERSION_NUMBER` change for the release
+   builds, as it broke some exiting applications that relied on the previous
+   3.x semantics, as documented in `OpenSSL_version(3)`.
+
+   *Richard Levitte*
+
+### Changes between 3.5.2 and 3.5.3 [16 Sep 2025]
+
+ * Avoided a potential race condition introduced in 3.5.1, where
+   `OSSL_STORE_CTX` kept open during lookup while potentially being used
+   by multiple threads simultaneously, that could lead to potential crashes
+   when multiple concurrent TLS connections are served.
+
+   *Matt Caswell*
+
+ * The FIPS provider no longer performs a PCT on key import for RSA, DH,
+   and EC keys (that was introduced in 3.5.2), following the latest update
+   on that requirement in FIPS 140-3 IG 10.3.A additional comment 1.
+
+   *Dr Paul Dale*
+
+ * Secure memory allocation calls are no longer used for HMAC keys.
+
+   *Dr Paul Dale*
+
+ * `openssl req` no longer generates certificates with an empty extension list
+   when SKID/AKID are set to `none` during generation.
+
+   *David Benjamin*
+
+ * The man page date is now derived from the release date provided
+   in `VERSION.dat` and not the current date for the released builds.
+
+   *Enji Cooper*
+
+ * Hardened the provider implementation of the RSA public key "encrypt"
+   operation to add a missing check that the caller-indicated output buffer
+   size is at least as large as the byte count of the RSA modulus.  The issue
+   was reported by Arash Ale Ebrahim from SYSPWN.
+
+   This operation is typically invoked via `EVP_PKEY_encrypt(3)`.  Callers that
+   in fact provide a sufficiently large buffer, but fail to correctly indicate
+   its size may now encounter unexpected errors.  In applications that attempt
+   RSA public encryption into a buffer that is too small, an out-of-bounds
+   write is now avoided and an error is reported instead.
+
+   *Viktor Dukhovni*
+
+ * Added FIPS 140-3 PCT on DH key generation.
+
+   *Nikola Pajkovsky*
+
+ * Fixed the synthesised `OPENSSL_VERSION_NUMBER`.
+
+   *Richard Levitte*
+
+### Changes between 3.5.1 and 3.5.2 [5 Aug 2025]
+
+ * The FIPS provider now performs a PCT on key import for RSA, EC and ECX.
+   This is mandated by FIPS 140-3 IG 10.3.A additional comment 1.
+
+   *Dr Paul Dale*
+
+### Changes between 3.5.0 and 3.5.1 [1 Jul 2025]
+
+ * Fix x509 application adds trusted use instead of rejected use.
+
+   Issue summary: Use of -addreject option with the openssl x509 application adds
+   a trusted use instead of a rejected use for a certificate.
+
+   Impact summary: If a user intends to make a trusted certificate rejected for
+   a particular use it will be instead marked as trusted for that use.
+
+   ([CVE-2025-4575])
+
+   *Tomas Mraz*
+
+ * Aligned the behaviour of TLS and DTLS in the event of a no_renegotiation
+   alert being received. Older versions of OpenSSL failed with DTLS if a
+   no_renegotiation alert was received. All versions of OpenSSL do this for TLS.
+   From 3.2 a bug was exposed that meant that DTLS ignored no_rengotiation. We
+   have now restored the original behaviour and brought DTLS back into line with
+   TLS.
+
+   *Matt Caswell*
+
+### Changes between 3.4 and 3.5.0 [8 Apr 2025]
+
+ * Added server side support for QUIC
 
    *Hugo Landau, Matt Caswell, Tomáš Mráz, Neil Horman, Sasha Nedvedicky, Andrew Dinh*
 
+ * Tolerate PKCS#8 version 2 with optional public keys. The public key data
+   is currently ignored.
+
+   *Viktor Dukhovni*
+
+ * Signature schemes without an explicit signing digest in CMS are now supported.
+   Examples of such schemes are ED25519 or ML-DSA.
+
+   *Michael Schroeder*
+
+ * The TLS Signature algorithms defaults now include all three ML-DSA variants as
+   first algorithms.
+
+   *Viktor Dukhovni*
+
  * Added a `no-tls-deprecated-ec` configuration option.
 
    The `no-tls-deprecated-ec` option disables support for TLS elliptic curve
@@ -93,18 +497,11 @@ OpenSSL 3.5
 
    *Simo Sorce*
 
- * Initial support for opaque symmetric keys objects.  These replace the ad-hoc byte
-   arrays that are pervasive throughout the library.
+ * Initial support for opaque symmetric keys objects (EVP_SKEY). These
+   replace the ad-hoc byte arrays that are pervasive throughout the library.
 
    *Dmitry Belyavskiy and Simo Sorce*
 
- * For TLSv1.3: Add capability for a client to send multiple key shares. Extend the scope of
-   `SSL_OP_CIPHER_SERVER_PREFERENCE` to cover server-side key exchange group selection.
-   Extend the server-side key exchange group selection algorithm and related group list syntax
-   to support multiple group priorities, e.g. to prioritize (hybrid-)KEMs.
-
-   *David Kelsey*, *Martin Schmatz*
-
  * The default TLS group list setting is now set to:
    `?*X25519MLKEM768 / ?*X25519:?secp256r1 / ?X448:?secp384r1:?secp521r1 / ?ffdhe2048:?ffdhe3072`
 
@@ -112,8 +509,20 @@ OpenSSL 3.5
    default by the TLS client. GOST groups and FFDHE groups larger than 3072
    bits are no longer enabled by default.
 
+   The group names in the group list setting are now also case insensitive.
+
    *Viktor Dukhovni*
 
+ * For TLSv1.3: Add capability for a client to send multiple key shares.
+   Extend the scope of `SSL_OP_CIPHER_SERVER_PREFERENCE` to cover
+   server-side key exchange group selection.
+
+   Extend the server-side key exchange group selection algorithm and related
+   group list syntax to support multiple group priorities, e.g. to prioritize
+   (hybrid-)KEMs.
+
+   *David Kelsey*, *Martin Schmatz*
+
  * A new random generation API has been introduced which modifies all
    of the L<RAND_bytes(3)> family of calls so they are routed through a
    specific named provider instead of being resolved via the normal DRBG
@@ -236,22 +645,52 @@ OpenSSL 3.5
 
    *Pablo De Lara Guarch, Dan Pittman*
 
- * Fix EVP_DecodeUpdate(): do not write padding zeros to the decoded output.
+ * Fixed EVP_DecodeUpdate() to not write padding zeros to the decoded output.
 
-   According to the documentation,
-   for every 4 valid base64 bytes processed (ignoring whitespace, carriage returns and line feeds),
-   EVP_DecodeUpdate() produces 3 bytes of binary output data
-   (except at the end of data terminated with one or two padding characters).
-   However, the function behaved like an EVP_DecodeBlock():
-   produces exactly 3 output bytes for every 4 input bytes.
-   Such behaviour could cause writes to a non-allocated output buffer
-   if a user allocates its size based on the documentation and knowing the padding size.
+   According to the documentation, for every 4 valid base64 bytes processed
+   (ignoring whitespace, carriage returns and line feeds), EVP_DecodeUpdate()
+   produces 3 bytes of binary output data (except at the end of data
+   terminated with one or two padding characters). However, the function
+   behaved like an EVP_DecodeBlock(). It produced exactly 3 output bytes for
+   every 4 input bytes. Such behaviour could cause writes to a non-allocated
+   output buffer if a user allocates its size based on the documentation and
+   knowing the padding size.
 
-   The fix makes EVP_DecodeUpdate() produce
-   exactly as many output bytes as in the initial non-encoded message.
+   The fix makes EVP_DecodeUpdate() produce exactly as many output bytes as
+   in the initial non-encoded message.
 
    *Valerii Krygin*
 
+ * Added support for aAissuingDistributionPoint, allowedAttributeAssignments,
+   timeSpecification, attributeDescriptor, roleSpecCertIdentifier,
+   authorityAttributeIdentifier and attributeMappings X.509v3 extensions.
+
+   *Jonathan M. Wilbur*
+
+ * Added a new CLI option `-provparam` and API functions for setting of
+   provider configuration parameters.
+
+   *Viktor Dukhovni*
+
+ * Added a new trace category for PROVIDER calls and added new tracing calls
+   in provider and algorithm fetching API functions.
+
+   *Neil Horman*
+
+ * Fixed benchmarking for AEAD ciphers in the `openssl speed` utility.
+
+   *Mohammed Alhabib*
+
+ * Added a build configuration option `enable-sslkeylog` for enabling support
+   for SSLKEYLOGFILE environment variable to log TLS connection secrets.
+
+   *Neil Horman*
+
+ * Added EVP_get_default_properties() function to retrieve the current default
+   property query string.
+
+   *Dmitry Belyavskiy*
+
 OpenSSL 3.4
 -----------
 
@@ -2144,6 +2583,24 @@ breaking changes, and mappings for the large list of deprecated functions.
 
 ### Changes between 3.0.0 and 3.0.1 [14 Dec 2021]
 
+ * Fixed carry bug in BN_mod_exp which may produce incorrect results on MIPS
+   squaring procedure. Many EC algorithms are affected, including some of the
+   TLS 1.3 default curves. Impact was not analyzed in detail, because the
+   pre-requisites for attack are considered unlikely and include reusing
+   private keys. Analysis suggests that attacks against RSA and DSA as a result
+   of this defect would be very difficult to perform and are not believed
+   likely. Attacks against DH are considered just feasible (although very
+   difficult) because most of the work necessary to deduce information about
+   a private key may be performed offline.
+   The amount of resources required for such an attack would be significant.
+   However, for an attack on TLS to be meaningful, the server would have
+   to share the DH private key among multiple clients, which is no longer
+   an option since CVE-2016-0701.
+   The issue only affects OpenSSL on MIPS platforms.
+   ([CVE-2021-4160])
+
+   *Bernd Edlinger*
+
  * Fixed invalid handling of X509_verify_cert() internal errors in libssl
    Internally libssl in OpenSSL calls X509_verify_cert() on the client side to
    verify a certificate supplied by a server. That function may return a
@@ -3008,7 +3465,7 @@ breaking changes, and mappings for the large list of deprecated functions.
 
    *Richard Levitte*
 
- * Fixed an overflow bug in the x64_64 Montgomery squaring procedure
+ * Fixed an overflow bug in the x86_64 Montgomery squaring procedure
    used in exponentiation with 512-bit moduli. No EC algorithms are
    affected. Analysis suggests that attacks against 2-prime RSA1024,
    3-prime RSA1536, and DSA1024 as a result of this defect would be very
@@ -4469,7 +4926,7 @@ OpenSSL 1.1.1
  * Support for TLSv1.3 added. Note that users upgrading from an earlier
    version of OpenSSL should review their configuration settings to ensure
    that they are still appropriate for TLSv1.3. For further information see:
-   <https://wiki.openssl.org/index.php/TLS1.3>
+   <https://github.com/openssl/openssl/wiki/TLS1.3>
 
    *Matt Caswell*
 
@@ -5757,7 +6214,7 @@ OpenSSL 1.1.0
 
  * The GOST engine was out of date and therefore it has been removed. An up
    to date GOST engine is now being maintained in an external repository.
-   See: <https://wiki.openssl.org/index.php/Binaries>. Libssl still retains
+   See: <https://github.com/openssl/openssl/wiki/Binaries>. Libssl still retains
    support for GOST ciphersuites (these are only activated if a GOST engine
    is present).
 
@@ -6536,6 +6993,11 @@ OpenSSL 1.1.0
 
    *Rob Percival <robpercival@google.com>*
 
+ * SSLv3 is by default disabled at build-time. Builds that are not
+   configured with "enable-ssl3" will not support SSLv3.
+
+   *Kurt Roeckx*
+
 OpenSSL 1.0.2
 -------------
 
@@ -21149,6 +21611,22 @@ ndif
 
 <!-- Links -->
 
+[CVE-2026-22796]: https://www.openssl.org/news/vulnerabilities.html#CVE-2026-22796
+[CVE-2026-22795]: https://www.openssl.org/news/vulnerabilities.html#CVE-2026-22795
+[CVE-2025-69421]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-69421
+[CVE-2025-69420]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-69420
+[CVE-2025-69419]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-69419
+[CVE-2025-69418]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-69418
+[CVE-2025-68160]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-68160
+[CVE-2025-66199]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-66199
+[CVE-2025-15469]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-15469
+[CVE-2025-15468]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-15468
+[CVE-2025-15467]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-15467
+[CVE-2025-11187]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-11187
+[CVE-2025-9232]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9232
+[CVE-2025-9231]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9231
+[CVE-2025-9230]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9230
+[CVE-2025-4575]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-4575
 [CVE-2024-13176]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-13176
 [CVE-2024-9143]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-9143
 [CVE-2024-6119]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-6119
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 35c45a319fb94..09416095e64d0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,6 +19,14 @@ open an issue for it before starting work, to get comments from the community.
 Someone may be already working on the same thing,
 or there may be special reasons why a feature is not implemented.
 
+Similarly, if you plan to submit many pull requests, please start with
+a representative sample (no more than 3 or 4) and open an issue
+explaining your process. The OpenSSL project has limited resources,
+especially when it comes to reviewers, so we appreciate advanced
+communication before submitting many pull requests. In addition,
+contributors should personally evaluate potential patches generated by
+automated tools.
+
 To make it easier to review and accept your pull request, please follow these
 guidelines:
 
diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf
index a68f200856233..24ab6009fcf28 100644
--- a/Configurations/50-nonstop.conf
+++ b/Configurations/50-nonstop.conf
@@ -168,6 +168,7 @@
     # Build models
     'nonstop-model-put' => {
         template         => 1,
+        disable          => ['secure-memory'],
         defines          => ['_PUT_MODEL_',
                              '_REENTRANT', '_THREAD_SUPPORT_FUNCTIONS'],
         ex_libs          => '-lput',
@@ -177,6 +178,7 @@
     # Build models
     'nonstop-model-klt' => {
         template         => 1,
+        disable          => ['secure-memory'],
         defines          => ['_KLT_MODEL_',
                              '_REENTRANT', '_THREAD_SUPPORT_FUNCTIONS'],
         ex_libs          => '-lklt',
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index e85763ccf8351..78be4a319964c 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -3,6 +3,8 @@
 ##
 ## {- join("\n## ", @autowarntext) -}
 {-
+     use Time::Piece;
+
      use OpenSSL::Util;
 
      our $makedep_scheme = $config{makedep_scheme};
@@ -74,6 +76,15 @@ FIPSKEY={- $config{FIPSKEY} -}
 
 VERSION={- "$config{full_version}" -}
 VERSION_NUMBER={- "$config{version}" -}
+RELEASE_DATE={- my $t = localtime;
+		if ($config{"release_date"}) {
+			# Provide the user with a more meaningful error message
+			# than the default internal parsing error from
+			# `Time::Piece->strptime(..)`.
+			eval { $t = Time::Piece->strptime($config{"release_date"}, "%d %b %Y"); } ||
+				die "Parsing \$config{release_date} ('$config{release_date}') failed: $@";
+		}
+		$t->strftime("%Y-%m-%d") -}
 MAJOR={- $config{major} -}
 MINOR={- $config{minor} -}
 SHLIB_VERSION_NUMBER={- $config{shlib_version} -}
@@ -135,7 +146,7 @@ GENERATED_PODS={- # common0.tmpl provides @generated
                        fill_lines(" ", $COLUMNS - 15,
                                   map { my $x = $_;
                                         (
-                                          grep { 
+                                          grep {
                                                  $unified_info{attributes}->{depends}
                                                  ->{$x}->{$_}->{pod} // 0
                                                }
@@ -809,12 +820,12 @@ install_dev: install_runtime_libs
 		cp $$e "$(DESTDIR)$(PKGCONFIGDIR)/$$fn"; \
 		chmod 644 "$(DESTDIR)$(PKGCONFIGDIR)/$$fn"; \
 	done
-	@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(CMAKECONFIGDIR)
+	@$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(CMAKECONFIGDIR)"
 	@for e in $(INSTALL_EXPORTERS_CMAKE); do \
 		fn=`basename $$e`; \
 		$(ECHO) "install $$e -> $(DESTDIR)$(CMAKECONFIGDIR)/$$fn"; \
-		cp $$e $(DESTDIR)$(CMAKECONFIGDIR)/$$fn; \
-		chmod 644 $(DESTDIR)$(CMAKECONFIGDIR)/$$fn; \
+		cp $$e "$(DESTDIR)$(CMAKECONFIGDIR)/$$fn"; \
+		chmod 644 "$(DESTDIR)$(CMAKECONFIGDIR)/$$fn"; \
 	done
 
 uninstall_dev: uninstall_runtime_libs
@@ -869,6 +880,7 @@ uninstall_dev: uninstall_runtime_libs
 	done
 	-$(RMDIR) "$(DESTDIR)$(PKGCONFIGDIR)"
 	-$(RMDIR) "$(DESTDIR)$(CMAKECONFIGDIR)"
+	-$(RMDIR) "$(DESTDIR)$(libdir)/cmake"
 	-$(RMDIR) "$(DESTDIR)$(libdir)"
 
 _install_modules_deps: install_runtime_libs build_modules
@@ -1194,10 +1206,18 @@ lint: ## Evaluate C code via "splint"
            echo splint -DLINT -posixlib -preproc -D__gnuc_va_list=void \
 	   -I. -Iinclude -Iapps/include $(CRYPTOHEADERS) $(SSLHEADERS) $(SRCS) )
 
-.PHONY: check-format
-check-format: ## Evaluate C code according to OpenSSL coding standards
-	( cd $(SRCDIR); $(PERL) util/check-format.pl \
-			$(SRCS) \$(CRYPTOHEADERS) $(SSLHEADERS) )
+CLANG_FORMAT_DIFF = clang-format-diff
+
+.PHONY: check-format check-clang-format-diff-cmd
+check-clang-format-diff-cmd:
+	@if ! command -v "$(CLANG_FORMAT_DIFF)" >/dev/null; then \
+		echo "Unable to find ${CLANG_FORMAT_DIFF}";\
+		echo "Please set the CLANG_FORMAT_DIFF variable to your clang-format-diff command";\
+		exit 1;\
+	fi
+
+check-format: check-clang-format-diff-cmd ## Evaluate C code according to OpenSSL coding standards
+	( cd $(SRCDIR); git diff -U0 --no-prefix --no-color | $(CLANG_FORMAT_DIFF) )
 
 generate_apps:
 	( cd $(SRCDIR); $(PERL) VMS/VMSify-conf.pl \
@@ -1565,7 +1585,8 @@ EOF
           return <<"EOF";
 $args{src}: $pod
 	pod2man --name=$name --section=$section\$(MANSUFFIX) --center=OpenSSL \\
-		--release=\$(VERSION) $pod >\$\@
+		--date=\$(RELEASE_DATE) --release=\$(VERSION) \\
+		$pod >\$\@
 EOF
       } elsif (platform->isdef($args{src})) {
           #
diff --git a/Configure b/Configure
index 15054f94034a3..499585438a162 100755
--- a/Configure
+++ b/Configure
@@ -171,6 +171,7 @@ my @gcc_devteam_warn = qw(
     -Wextra
     -Wno-unused-parameter
     -Wno-missing-field-initializers
+    -Wno-unterminated-string-initialization
     -Wswitch
     -Wsign-compare
     -Wshadow
diff --git a/HACKING.md b/HACKING.md
index 9a1f7b9f5036e..b58f08a2dc9ac 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -1,33 +1,80 @@
 MODIFYING OPENSSL SOURCE
 ========================
 
-This document describes the way to add custom modifications to OpenSSL sources.
+This document describes the way to add custom modifications to OpenSSL
+sources.
 
- If you are adding new public functions to the custom library build, you need to
- either add a prototype in one of the existing OpenSSL header files;
- or provide a new header file and edit
- [Configurations/unix-Makefile.tmpl](Configurations/unix-Makefile.tmpl)
- to pick up that file.
+If you are adding new C source files
+------------------------------------
 
- After that, perform the following steps:
+Please update the `build.info` files in the directories where you placed the
+C source files, to include a line like this for each new C source file:
+
+-   In `crypto/` or any of its subdirectories (intended for `libcrypto`):
+
+        SOURCE[../libcrypto]={name-of-C-source-file}
+
+-   In `ssl/` or any of its subdirectories (intended for `libssl`):
+
+        SOURCE[../libssl]={name-of-C-source-file}
+
+Do note that the path given as the `SOURCE` attribute must be adapted
+appropriately for the location of the `build.info` file, as it's a relative
+path to where the library itself is built, for example:
+
+-   For `crypto/build.info`, the library path should be `../libcrypto`
+-   For `crypto/evp/build.info`, the library path should be
+    `../../libcrypto`
+-   For `ssl/build.info`, the library path should be `../libssl`
+-   For `ssl/quic/build.info`, the library path should be `../../libssl`
+
+To know more about `build.info` files, please read [doc/internal/man7/build.info.pod].
+For better viewing, consider converting it to HTML or PDF using `pod2html`
+or `pod2pdf`.
+
+Adding new public functions
+---------------------------
+
+If you are adding new public functions to the custom library build, you need to
+either add a prototype in one of the existing OpenSSL header files, or
+provide a new header file and edit.
+
+Only headers in the `include/openssl` subdirectory are considered for public
+functions.  If you're creating a new header file, it must be located in that
+directory.
+
+Functions declared in `include/openssl` header files are assumed to be part
+of the `libcrypto` library unless specified otherwise.  *If your new
+functions are meant for the `libssl` library*, you will need to edit
+[Configurations/unix-Makefile.tmpl] and add the header file name in the
+array `my @sslheaders_tmpl`.
+
+Updating OpenSSL's bookkeeping files
+------------------------------------
+
+OpenSSL has a few bookkeeping files to keep track of exposed functions, most
+importantly `util/libcrypto.num` and `util/libssl.num`.  Any time a new
+public function - as defined above - is added, these files must be updated.
+
+To make such an update, please do the following:
 
     ./Configure -Werror --strict-warnings [your-options]
     make update
-    make
-    make test
 
- `make update` ensures that your functions declarations are added to
- `util/libcrypto.num` or `util/libssl.num`.
- If you plan to submit the changes you made to OpenSSL
- (see [CONTRIBUTING.md](CONTRIBUTING.md)), it's worth running:
+If you plan to submit the changes you made to OpenSSL (see
+[CONTRIBUTING.md]), it's also worth running the following after running
+`make update`, to ensure that documentation has correct format.
 
     make doc-nits
 
- after running `make update` to ensure that documentation has correct format.
+Do note that `make update` also generates files related to OIDs (in the
+`crypto/objects/`  folder) and errors messages.
+
+If a git merge error occurs in one of these generated files, then the
+generated files need to be removed and regenerated using `make update`.
+To aid in this process, the generated files can be committed separately
+so they can be removed easily by reverting that commit.
 
- `make update` also generates files related to OIDs (in the `crypto/objects/`
- folder) and errors.
- If a merge error occurs in one of these generated files, then the
- generated files need to be removed and regenerated using `make update`.
- To aid in this process, the generated files can be committed separately
- so they can be removed easily.
+[doc/internal/man7/build.info.pod]: ./doc/internal/man7/build.info.pod
+[Configurations/unix-Makefile.tmpl]: ./Configurations/unix-Makefile.tmpl
+[CONTRIBUTING.md]: ./CONTRIBUTING.md
diff --git a/NEWS.md b/NEWS.md
index 0bbfec0c0a1c6..eb1a4487bfb58 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -23,7 +23,108 @@ OpenSSL Releases
 OpenSSL 3.5
 -----------
 
-### Major changes between OpenSSL 3.4 and OpenSSL 3.5 [under development]
+### Major changes between OpenSSL 3.5.5 and OpenSSL 3.5.6 [under development]
+
+  * none
+
+### Major changes between OpenSSL 3.5.4 and OpenSSL 3.5.5 [27 Jan 2026]
+
+OpenSSL 3.5.5 is a security patch release. The most severe CVE fixed in this
+release is High.
+
+This release incorporates the following bug fixes and mitigations:
+
+  * Fixed Improper validation of PBMAC1 parameters in PKCS#12 MAC verification.
+    ([CVE-2025-11187])
+
+  * Fixed Stack buffer overflow in CMS `AuthEnvelopedData` parsing.
+    ([CVE-2025-15467])
+
+  * Fixed NULL dereference in `SSL_CIPHER_find()` function on unknown cipher ID.
+    ([CVE-2025-15468])
+
+  * Fixed `openssl dgst` one-shot codepath silently truncates inputs >16 MiB.
+    ([CVE-2025-15469])
+
+  * Fixed TLS 1.3 `CompressedCertificate` excessive memory allocation.
+    ([CVE-2025-66199])
+
+  * Fixed Heap out-of-bounds write in `BIO_f_linebuffer` on short writes.
+    ([CVE-2025-68160])
+
+  * Fixed Unauthenticated/unencrypted trailing bytes with low-level OCB
+    function calls.
+    ([CVE-2025-69418])
+
+  * Fixed Out of bounds write in `PKCS12_get_friendlyname()` UTF-8 conversion.
+    ([CVE-2025-69419])
+
+  * Fixed Missing `ASN1_TYPE` validation in `TS_RESP_verify_response()`
+    function.
+    ([CVE-2025-69420])
+
+  * Fixed NULL Pointer Dereference in `PKCS12_item_decrypt_d2i_ex()` function.
+    ([CVE-2025-69421])
+
+  * Fixed Missing `ASN1_TYPE` validation in PKCS#12 parsing.
+    ([CVE-2026-22795])
+
+  * Fixed `ASN1_TYPE` Type Confusion in the `PKCS7_digest_from_attributes()`
+    function.
+    ([CVE-2026-22796])
+
+### Major changes between OpenSSL 3.5.3 and OpenSSL 3.5.4 [30 Sep 2025]
+
+OpenSSL 3.5.4 is a security patch release. The most severe CVE fixed in this
+release is Moderate.
+
+This release incorporates the following bug fixes and mitigations:
+
+  * Fix Out-of-bounds read & write in RFC 3211 KEK Unwrap.
+    ([CVE-2025-9230])
+
+  * Fix Timing side-channel in SM2 algorithm on 64 bit ARM.
+    ([CVE-2025-9231])
+
+  * Fix Out-of-bounds read in HTTP client no_proxy handling.
+    ([CVE-2025-9232])
+
+  * Reverted the synthesised `OPENSSL_VERSION_NUMBER` change for the release
+    builds, as it broke some exiting applications that relied on the previous
+    3.x semantics, as documented in `OpenSSL_version(3)`.
+
+### Major changes between OpenSSL 3.5.2 and OpenSSL 3.5.3 [16 Sep 2025]
+
+OpenSSL 3.5.3 is a bug fix release.
+
+This release incorporates the following bug fixes and mitigations:
+
+  * Added FIPS 140-3 PCT on DH key generation.
+
+  * Fixed the synthesised `OPENSSL_VERSION_NUMBER`.
+
+  * Removed PCT on key import in the FIPS provider as it is not required by
+    the standard.
+
+### Major changes between OpenSSL 3.5.1 and OpenSSL 3.5.2 [5 Aug 2025]
+
+OpenSSL 3.5.2 is a bug fix release.
+
+This release incorporates the following bug fixes and mitigations:
+
+  * The FIPS provider now performs a PCT on key import for RSA, EC and ECX.
+
+### Major changes between OpenSSL 3.5.0 and OpenSSL 3.5.1 [1 Jul 2025]
+
+OpenSSL 3.5.1 is a security patch release. The most severe CVE fixed in this
+release is Low.
+
+This release incorporates the following bug fixes and mitigations:
+
+  * Fix x509 application adds trusted use instead of rejected use.
+    ([CVE-2025-4575])
+
+### Major changes between OpenSSL 3.4 and OpenSSL 3.5.0 [8 Apr 2025]
 
 OpenSSL 3.5.0 is a feature release adding significant new functionality to
 OpenSSL.
@@ -34,32 +135,46 @@ changes:
   * Default encryption cipher for the `req`, `cms`, and `smime` applications
     changed from `des-ede3-cbc` to `aes-256-cbc`.
 
-  * The TLS supported groups list has been changed in favor of PQC support.
+  * The default TLS supported groups list has been changed to include and
+    prefer hybrid PQC KEM groups. Some practically unused groups were removed
+    from the default list.
 
   * The default TLS keyshares have been changed to offer X25519MLKEM768 and
     and X25519.
 
+  * All `BIO_meth_get_*()` functions were deprecated.
+
 This release adds the following new features:
 
   * Support for server side QUIC (RFC 9000)
 
-  * Support for 3rd party QUIC stacks
+  * Support for 3rd party QUIC stacks including 0-RTT support
+
+  * Support for PQC algorithms (ML-KEM, ML-DSA and SLH-DSA)
 
-  * Support for PQC algorithms (ML-KEM, ML-DSA, SLH-DSA)
+  * A new configuration option `no-tls-deprecated-ec` to disable support for
+    TLS groups deprecated in RFC8422
 
-  * Allow the FIPS provider to optionally use the `JITTER` seed source.
-    Because this seed source is not part of the OpenSSL FIPS validations,
-    it should only be enabled after the [jitterentropy-library] has been
-    assessed for entropy quality.  Moreover, the FIPS provider including
-    this entropy source will need to obtain an [ESV] from the [CMVP] before
-    FIPS compliance can be claimed.  Enable this using the configuration
-    option `enable-fips-jitter`.
+  * A new configuration option `enable-fips-jitter` to make the FIPS provider
+    to use the `JITTER` seed source
 
   * Support for central key generation in CMP
 
-  * Support added for opaque symmetric key objects (EVP_SKEY).
+  * Support added for opaque symmetric key objects (EVP_SKEY)
+
+  * Support for multiple TLS keyshares and improved TLS key establishment group
+    configurability
 
-  * Support for multiple TLS keyshares.
+  * API support for pipelining in provided cipher algorithms
+
+Known issues in 3.5.0
+
+  * <https://github.com/openssl/openssl/issues/27282>
+    Calling SSL_accept on objects returned from SSL_accept_connection
+    results in error.  It is expected that making this call will advance
+    the SSL handshake for the passed connection, but currently it does not.
+    This can be handled by calling SSL_do_handshake instead.  A fix is planned
+    for OpenSSL 3.5.1
 
 OpenSSL 3.4
 -----------
@@ -242,7 +357,7 @@ This release adds the following new features:
   * Added X509_STORE_get1_objects to avoid issues with the existing
     X509_STORE_get0_objects API in multi-threaded applications.
 
-  * Support for using certificate profiles and extened delayed delivery in CMP
+  * Support for using certificate profiles and extended delayed delivery in CMP
 
 This release incorporates the following potentially significant or incompatible
 changes:
@@ -518,6 +633,8 @@ OpenSSL 3.0
 
 ### Major changes between OpenSSL 3.0.0 and OpenSSL 3.0.1 [14 Dec 2021]
 
+  * Fixed carry bug in BN_mod_exp which may produce incorrect results on MIPS
+    ([CVE-2021-4160])
   * Fixed invalid handling of X509_verify_cert() internal errors in libssl
     ([CVE-2021-4044])
   * Allow fetching an operation from the provider that owns an unexportable key
@@ -645,7 +762,7 @@ OpenSSL 1.1.1
 
 ### Major changes between OpenSSL 1.1.1d and OpenSSL 1.1.1e [17 Mar 2020]
 
-  * Fixed an overflow bug in the x64_64 Montgomery squaring procedure
+  * Fixed an overflow bug in the x86_64 Montgomery squaring procedure
     used in exponentiation with 512-bit moduli ([CVE-2019-1551])
 
 ### Major changes between OpenSSL 1.1.1c and OpenSSL 1.1.1d [10 Sep 2019]
@@ -696,7 +813,7 @@ OpenSSL 1.1.1
     * Rewrite of the packet construction code for "safer" packet handling
     * Rewrite of the extension handling code
     For further important information, see the [TLS1.3 page](
-    https://wiki.openssl.org/index.php/TLS1.3) in the OpenSSL Wiki.
+    https://github.com/openssl/openssl/wiki/TLS1.3) in the OpenSSL Wiki.
 
   * Complete rewrite of the OpenSSL random number generator to introduce the
     following capabilities
@@ -1875,7 +1992,22 @@ OpenSSL 0.9.x
   * Support for various new platforms
 
 <!-- Links -->
-
+[CVE-2026-22796]: https://www.openssl.org/news/vulnerabilities.html#CVE-2026-22796
+[CVE-2026-22795]: https://www.openssl.org/news/vulnerabilities.html#CVE-2026-22795
+[CVE-2025-69421]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-69421
+[CVE-2025-69420]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-69420
+[CVE-2025-69419]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-69419
+[CVE-2025-69418]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-69418
+[CVE-2025-68160]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-68160
+[CVE-2025-66199]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-66199
+[CVE-2025-15469]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-15469
+[CVE-2025-15468]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-15468
+[CVE-2025-15467]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-15467
+[CVE-2025-11187]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-11187
+[CVE-2025-9232]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9232
+[CVE-2025-9231]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9231
+[CVE-2025-9230]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-9230
+[CVE-2025-4575]: https://www.openssl.org/news/vulnerabilities.html#CVE-2025-4575
 [CVE-2024-13176]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-13176
 [CVE-2024-9143]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-9143
 [CVE-2024-6119]: https://www.openssl.org/news/vulnerabilities.html#CVE-2024-6119
diff --git a/NOTES-NONSTOP.md b/NOTES-NONSTOP.md
index 30deed20b8ebf..a2d485132da68 100644
--- a/NOTES-NONSTOP.md
+++ b/NOTES-NONSTOP.md
@@ -37,8 +37,7 @@ for each on the TNS/X (L-Series) platform:
 The KLT threading model is a newly released model on NonStop. It implements
 kernel-level threading. KLT provides much closer threading to what OpenSSL
 uses for Linux-like threading models. KLT continues to use the pthread library
-API. There is no supported 32-bit or Guardian builds for KLT. Note: KLT is
-not currently available but is planned for post-2024.
+API. There is no supported 32-bit or Guardian builds for KLT.
 
 The SPT threading model is no longer supported as of OpenSSL 3.2.
 
@@ -53,6 +52,9 @@ instead of `nsx` in the set above.
 You cannot build for TNS/E for FIPS, so you must specify the `no-fips`
 option to `./Configure`.
 
+TNS/E has moved to a limited support state, so fixes for this platform will not
+be guaranteed in future.
+
 Linking and Loading Considerations
 ----------------------------------
 
@@ -73,6 +75,12 @@ for NonStop builds. If you need to have `atexit()` functionality, set
 register `OPENSSL_cleanup()` automatically. Preferably, you can explicitly call
 `OPENSSL_cleanup()` from your application.
 
+Secure Memory
+-------------
+
+The mechanism used by OpenSSL for secure memory is not supported on NonStop.
+Use the `no-secure-memory` option when running `Configure`.
+
 About Prefix and OpenSSLDir
 ---------------------------
 
diff --git a/NOTES-WINDOWS.md b/NOTES-WINDOWS.md
index 9beeb79be758c..5d6287a8e8fdc 100644
--- a/NOTES-WINDOWS.md
+++ b/NOTES-WINDOWS.md
@@ -87,6 +87,11 @@ Quick start
        on the Universal CRT or
     - `perl Configure`              to let Configure figure out the platform
 
+    a. If you don't plan to develop OpenSSL yourself and don't need to rebuild,
+       in other words, if you always do a new build, turning off the build
+       dependency feature can speed up build times by up to 50%:
+       `perl Configure no-makedepend`
+
  6. `nmake`
 
  7. `nmake test`
@@ -120,7 +125,7 @@ format:
 `\\HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432node\OpenSSL-<version>-<ctx>`
 
 Where `<version>` is the major.minor version of the library being
-built, and `<ctx>` is the value specified by `-DOPENSSL_WINCTX`.  This allows
+built, and `<ctx>` is the value specified by `-DOSSL_WINCTX`.  This allows
 for multiple openssl builds to be created and installed on a single system, in
 which each library can use its own set of registry keys.
 
diff --git a/README-FIPS.md b/README-FIPS.md
index c15cbad67c6de..b31f8c65304b2 100644
--- a/README-FIPS.md
+++ b/README-FIPS.md
@@ -34,7 +34,9 @@ Installing the FIPS provider
 In order to be FIPS compliant you must only use FIPS validated source code.
 Refer to <https://www.openssl.org/source/> for information related to
 which versions are FIPS validated. The instructions given below build OpenSSL
-just using the FIPS validated source code.
+just using the FIPS validated source code.  Any FIPS validated version may be
+used with any other openssl library.  Please see <https://www.openssl.org/source/>
+To determine which FIPS validated library version may be appropriate for you.
 
 If you want to use a validated FIPS provider, but also want to use the latest
 OpenSSL release to build everything else, then refer to the next section.
@@ -71,11 +73,11 @@ the installation by doing the following two things:
 
 - Runs the FIPS module self tests
 - Generates the so-called FIPS module configuration file containing information
-  about the module such as the module checksum (and for OpenSSL 3.0 the
+  about the module such as the module checksum (and for OpenSSL 3.1.2 the
   self test status).
 
 The FIPS module must have the self tests run, and the FIPS module config file
-output generated on every machine that it is to be used on. For OpenSSL 3.0,
+output generated on every machine that it is to be used on. For OpenSSL 3.1.2
 you must not copy the FIPS module config file output data from one machine to another.
 
 On Unix, the `openssl fipsinstall` command will be invoked as follows by default:
@@ -95,11 +97,11 @@ Download and build a validated FIPS provider
 --------------------------------------------
 
 Refer to <https://www.openssl.org/source/> for information related to
-which versions are FIPS validated. For this example we use OpenSSL 3.0.0.
+which versions are FIPS validated. For this example we use OpenSSL 3.1.2.
 
-    $ wget https://www.openssl.org/source/openssl-3.0.0.tar.gz
-    $ tar -xf openssl-3.0.0.tar.gz
-    $ cd openssl-3.0.0
+    $ wget https://www.openssl.org/source/openssl-3.1.2.tar.gz
+    $ tar -xf openssl-3.1.2.tar.gz
+    $ cd openssl-3.1.2
     $ ./Configure enable-fips
     $ make
     $ cd ..
@@ -107,44 +109,45 @@ which versions are FIPS validated. For this example we use OpenSSL 3.0.0.
 Download and build the latest release of OpenSSL
 ------------------------------------------------
 
-We use OpenSSL 3.1.0 here, (but you could also use the latest 3.0.X)
+We use OpenSSL 3.5.0 here, (but you could also use the latest 3.5.X)
 
-    $ wget https://www.openssl.org/source/openssl-3.1.0.tar.gz
-    $ tar -xf openssl-3.1.0.tar.gz
-    $ cd openssl-3.1.0
+    $ wget https://www.openssl.org/source/openssl-3.5.0.tar.gz
+    $ tar -xf openssl-3.5.0.tar.gz
+    $ cd openssl-3.5.0
     $ ./Configure enable-fips
     $ make
 
 Use the OpenSSL FIPS provider for testing
 -----------------------------------------
 
-We do this by replacing the artifact for the OpenSSL 3.1.0 FIPS provider.
-Note that the OpenSSL 3.1.0 FIPS provider has not been validated
+We do this by replacing the artifact for the OpenSSL 3.5.0 FIPS provider.
+Note that the OpenSSL 3.5.0 FIPS provider has not been validated
 so it must not be used for FIPS purposes.
 
-    $ cp ../openssl-3.0.0/providers/fips.so providers/.
-    $ cp ../openssl-3.0.0/providers/fipsmodule.cnf providers/.
-    // Note that for OpenSSL 3.0 that the `fipsmodule.cnf` file should not
+    $ cp ../openssl-3.1.2/providers/fips.so providers/.
+    $ cp ../openssl-3.1.2/providers/fipsmodule.cnf providers/.
+    // Note that for OpenSSL 3.1.2 that the `fipsmodule.cnf` file should not
     // be copied across multiple machines if it contains an entry for
     // `install-status`. (Otherwise the self tests would be skipped).
 
     // Validate the output of the following to make sure we are using the
-    // OpenSSL 3.0.0 FIPS provider
+    // OpenSSL 3.1.2 FIPS provider
     $ ./util/wrap.pl -fips apps/openssl list -provider-path providers \
     -provider fips -providers
 
-    // Now run the current tests using the OpenSSL 3.0 FIPS provider.
+    // Now run the current tests using the OpenSSL 3.1.2 FIPS provider.
     $ make tests
 
 Copy the FIPS provider artifacts (`fips.so` & `fipsmodule.cnf`) to known locations
 -------------------------------------------------------------------------------------
 
-    $ cd ../openssl-3.0.0
+    $ cd ../openssl-3.1.2
     $ sudo make install_fips
 
 Check that the correct FIPS provider is being used
 --------------------------------------------------
 
+    $ cd ../openssl-3.5.0
     $./util/wrap.pl -fips apps/openssl list -provider-path providers \
     -provider fips -providers
 
@@ -152,11 +155,11 @@ Check that the correct FIPS provider is being used
     Providers:
       base
         name: OpenSSL Base Provider
-        version: 3.1.0
+        version: 3.5.0
         status: active
       fips
         name: OpenSSL FIPS Provider
-        version: 3.0.0
+        version: 3.1.2
         status: active
 
 Using the FIPS Module in applications
diff --git a/README-QUIC.md b/README-QUIC.md
index 554fe9bc2b8a3..5b70464e5db12 100644
--- a/README-QUIC.md
+++ b/README-QUIC.md
@@ -2,7 +2,7 @@ Using OpenSSL with QUIC
 =======================
 
 From OpenSSL 3.2, OpenSSL features support for making QUIC connections as a
-client.
+client. Starting with OpenSSL 3.5, server-side QUIC support has also been added.
 
 Users interested in using the new QUIC functionality are encouraged to look at
 some of the following resources:
@@ -70,6 +70,34 @@ using simple TCP/TLS-like usage. Note that OpenSSL has no direct support for
 HTTP/3 so connecting to an HTTP/3 server should be possible but sending an
 HTTP/3 request or receiving any response data is not.
 
+### How can I create a QUIC server with OpenSSL?
+
+Starting with OpenSSL 3.5, you can create a QUIC server. OpenSSL provides a server
+implementation example that you can use as a reference:
+
+The example QUIC server implementation can be found in the source tree under
+[`demos/quic/server`](./demos/quic/server/). This demonstrates how to implement a
+basic QUIC server using the OpenSSL API.
+
+To run the example QUIC server:
+
+```shell
+$ ./demos/quic/server/server <port-number> <certificate-file> <key-file>
+```
+
+For example:
+
+```shell
+$ ./demos/quic/server/server 4433 server.pem server.key
+```
+
+Replace `server.pem` and `server.key` with your certificate and private key files.
+Note that the standard `openssl s_server` command does NOT support QUIC - you must
+use this dedicated server example instead.
+
+For more information about implementing QUIC servers with OpenSSL, refer to the
+[OpenSSL Guide] and the [openssl-quic(7) manual page].
+
 [openssl-quic(7) manual page]: https://www.openssl.org/docs/manmaster/man7/openssl-quic.html
 [OpenSSL Guide]: https://www.openssl.org/docs/manmaster/man7/ossl-guide-introduction.html
 [DDD]: https://github.com/openssl/openssl/tree/master/doc/designs/ddd
diff --git a/README.md b/README.md
index 17f449fda3b84..d3f79363d50aa 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,7 @@ Welcome to the OpenSSL Project
 ![Daily checks](https://github.com/openssl/openssl/actions/workflows/run-checker-daily.yml/badge.svg)
 
 OpenSSL is a robust, commercial-grade, full-featured Open Source Toolkit
-for the TLS (formerly SSL), DTLS and QUIC (currently client side only)
-protocols.
+for the TLS (formerly SSL), DTLS and QUIC protocols.
 
 The protocol implementations are based on a full-strength general purpose
 cryptographic library, which can also be used stand-alone. Also included is a
@@ -42,7 +41,7 @@ The OpenSSL toolkit includes:
 - **libssl**
   an implementation of all TLS protocol versions up to TLSv1.3 ([RFC 8446]),
   DTLS protocol versions up to DTLSv1.2 ([RFC 6347]) and
-  the QUIC (currently client side only) version 1 protocol ([RFC 9000]).
+  the QUIC version 1 protocol ([RFC 9000]).
 
 - **libcrypto**
   a full-strength general purpose cryptographic library. It constitutes the
@@ -164,8 +163,7 @@ There are numerous source code demos for using various OpenSSL capabilities in t
 Wiki
 ----
 
-There is a Wiki at [wiki.openssl.org] which is currently not very active.
-It contains a lot of useful information, not all of which is up-to-date.
+There is a [GitHub Wiki] which is currently not very active.
 
 License
 =======
@@ -198,7 +196,7 @@ attempting to develop or distribute cryptographic code.
 Copyright
 =========
 
-Copyright (c) 1998-2025 The OpenSSL Project Authors
+Copyright (c) 1998-2026 The OpenSSL Project Authors
 
 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
 
@@ -214,8 +212,8 @@ All rights reserved.
     <https://github.com/openssl/openssl>
     "OpenSSL GitHub Mirror"
 
-[wiki.openssl.org]:
-    <https://wiki.openssl.org>
+[GitHub Wiki]:
+    <https://github.com/openssl/openssl/wiki>
     "OpenSSL Wiki"
 
 [ossl-guide-migration(7ossl)]:
@@ -232,7 +230,7 @@ All rights reserved.
      <https://tools.ietf.org/html/rfc9000>
 
 [Binaries]:
-    <https://wiki.openssl.org/index.php/Binaries>
+    <https://github.com/openssl/openssl/wiki/Binaries>
     "List of third party OpenSSL binaries"
 
 [OpenSSL Guide]:
diff --git a/VERSION.dat b/VERSION.dat
index 281d284b7fbd5..0a3182805ab95 100644
--- a/VERSION.dat
+++ b/VERSION.dat
@@ -1,6 +1,6 @@
 MAJOR=3
 MINOR=5
-PATCH=0
+PATCH=6
 PRE_RELEASE_TAG=dev
 BUILD_METADATA=
 RELEASE_DATE=""
diff --git a/apps/CA.pl.in b/apps/CA.pl.in
index 2c31ee6c8de13..0bad37d469555 100644
--- a/apps/CA.pl.in
+++ b/apps/CA.pl.in
@@ -1,5 +1,5 @@
 #!{- $config{HASHBANGPERL} -}
-# Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2000-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
@@ -19,14 +19,17 @@ my @OPENSSL_CMDS = ("req", "ca", "pkcs12", "x509", "verify");
 
 my $openssl = $ENV{'OPENSSL'} // "openssl";
 $ENV{'OPENSSL'} = $openssl;
+my @openssl = split_val($openssl);
+
 my $OPENSSL_CONFIG = $ENV{"OPENSSL_CONFIG"} // "";
+my @OPENSSL_CONFIG = split_val($OPENSSL_CONFIG);
 
 # Command invocations.
-my $REQ = "$openssl req $OPENSSL_CONFIG";
-my $CA = "$openssl ca $OPENSSL_CONFIG";
-my $VERIFY = "$openssl verify";
-my $X509 = "$openssl x509";
-my $PKCS12 = "$openssl pkcs12";
+my @REQ = (@openssl, "req", @OPENSSL_CONFIG);
+my @CA = (@openssl, "ca", @OPENSSL_CONFIG);
+my @VERIFY = (@openssl, "verify");
+my @X509 = (@openssl, "x509");
+my @PKCS12 = (@openssl, "pkcs12");
 
 # Default values for various configuration settings.
 my $CATOP = "./demoCA";
@@ -34,10 +37,10 @@ my $CAKEY = "cakey.pem";
 my $CAREQ = "careq.pem";
 my $CACERT = "cacert.pem";
 my $CACRL = "crl.pem";
-my $DAYS = "-days 365";
-my $CADAYS = "-days 1095";	# 3 years
-my $EXTENSIONS = "-extensions v3_ca";
-my $POLICY = "-policy policy_anything";
+my @DAYS = qw(-days 365);
+my @CADAYS = qw(-days 1095);	# 3 years
+my @EXTENSIONS = qw(-extensions v3_ca);
+my @POLICY = qw(-policy policy_anything);
 my $NEWKEY = "newkey.pem";
 my $NEWREQ = "newreq.pem";
 my $NEWCERT = "newcert.pem";
@@ -45,31 +48,177 @@ my $NEWP12 = "newcert.p12";
 
 # Commandline parsing
 my %EXTRA;
-my $WHAT = shift @ARGV || "";
+my $WHAT = shift @ARGV // "";
 @ARGV = parse_extra(@ARGV);
 my $RET = 0;
 
+sub split_val {
+    return split_val_win32(@_) if ($^O eq 'MSWin32');
+    my ($val) = @_;
+    my (@ret, @frag);
+
+    # Skip leading whitespace
+    $val =~ m{\A[ \t]*}ogc;
+
+    # Unix shell-compatible split
+    #
+    # Handles backslash escapes outside quotes and
+    # in double-quoted strings.  Parameter and
+    # command-substitution is silently ignored.
+    # Bare newlines outside quotes and (trailing) backslashes are disallowed.
+
+    while (1) {
+        last if (pos($val) == length($val));
+
+        # The first char is never a SPACE or TAB.  Possible matches are:
+        # 1. Ordinary string fragment
+        # 2. Single-quoted string
+        # 3. Double-quoted string
+        # 4. Backslash escape
+        # 5. Bare backlash or newline (rejected)
+        #
+        if ($val =~ m{\G([^'" \t\n\\]+)}ogc) {
+            # Ordinary string
+            push @frag, $1;
+        } elsif ($val =~ m{\G'([^']*)'}ogc) {
+            # Single-quoted string
+            push @frag, $1;
+        } elsif ($val =~ m{\G"}ogc) {
+            # Double-quoted string
+            push @frag, "";
+            while (1) {
+                last if ($val =~ m{\G"}ogc);
+                if ($val =~ m{\G([^"\\]+)}ogcs) {
+                    # literals
+                    push @frag, $1;
+                } elsif ($val =~ m{\G.(["\`\$\\])}ogc) {
+                    # backslash-escaped special
+                    push @frag, $1;
+                } elsif ($val =~ m{\G.(.)}ogcs) {
+                    # backslashed non-special
+                    push @frag, "\\$1" unless $1 eq "\n";
+                } else {
+                    die sprintf("Malformed quoted string: %s\n", $val);
+                }
+            }
+        } elsif ($val =~ m{\G\\(.)}ogc) {
+            # Backslash is unconditional escape outside quoted strings
+            push @frag, $1 unless $1 eq "\n";
+        } else {
+            die sprintf("Bare backslash or newline in: '%s'\n", $val);
+        }
+        # Done if at SPACE, TAB or end, otherwise continue current fragment
+        #
+        next unless ($val =~ m{\G(?:[ \t]+|\z)}ogcs);
+        push @ret, join("", splice(@frag)) if (@frag > 0);
+    }
+    # Handle final fragment
+    push @ret, join("", splice(@frag)) if (@frag > 0);
+    return @ret;
+}
+
+sub split_val_win32 {
+    my ($val) = @_;
+    my (@ret, @frag);
+
+    # Skip leading whitespace
+    $val =~ m{\A[ \t]*}ogc;
+
+    # Windows-compatible split
+    # See: "Parsing C++ command-line arguments" in:
+    # https://learn.microsoft.com/en-us/cpp/cpp/main-function-command-line-args?view=msvc-170
+    #
+    # Backslashes are special only when followed by a double-quote
+    # Pairs of double-quotes make a single double-quote.
+    # Closing double-quotes may be omitted.
+
+    while (1) {
+        last if (pos($val) == length($val));
+
+        # The first char is never a SPACE or TAB.
+        # 1. Ordinary string fragment
+        # 2. Double-quoted string
+        # 3. Backslashes preceding a double-quote
+        # 4. Literal backslashes
+        # 5. Bare newline (rejected)
+        #
+        if ($val =~ m{\G([^" \t\n\\]+)}ogc) {
+            # Ordinary string
+            push @frag, $1;
+        } elsif ($val =~ m{\G"}ogc) {
+            # Double-quoted string
+            push @frag, "";
+            while (1) {
+                if ($val =~ m{\G("+)}ogc) {
+                    # Two double-quotes make one literal double-quote
+                    my $l = length($1);
+                    push @frag, q{"} x int($l/2) if ($l > 1);
+                    next if ($l % 2 == 0);
+                    last;
+                }
+                if ($val =~ m{\G([^"\\]+)}ogc) {
+                    push @frag, $1;
+                } elsif ($val =~ m{\G((?>[\\]+))(?=")}ogc) {
+                    # Backslashes before a double-quote are escapes
+                    my $l = length($1);
+                    push @frag, q{\\} x int($l / 2);
+                    if ($l % 2 == 1) {
+                        ++pos($val);
+                        push @frag, q{"};
+                    }
+                } elsif ($val =~ m{\G((?:(?>[\\]+)[^"\\]+)+)}ogc) {
+                    # Backslashes not before a double-quote are not special
+                    push @frag, $1;
+                } else {
+                    # Tolerate missing closing double-quote
+                    last;
+                }
+            }
+        } elsif ($val =~ m{\G((?>[\\]+))(?=")}ogc) {
+            my $l = length($1);
+            push @frag, q{\\} x int($l / 2);
+            if ($l % 2 == 1) {
+                ++pos($val);
+                push @frag, q{"};
+            }
+        } elsif ($val =~ m{\G([\\]+)}ogc) {
+            # Backslashes not before a double-quote are not special
+            push @frag, $1;
+        } else {
+            die sprintf("Bare newline in: '%s'\n", $val);
+        }
+        # Done if at SPACE, TAB or end, otherwise continue current fragment
+        #
+        next unless ($val =~ m{\G(?:[ \t]+|\z)}ogcs);
+        push @ret, join("", splice(@frag)) if (@frag > 0);
+    }
+    # Handle final fragment
+    push @ret, join("", splice(@frag)) if (@frag);
+    return @ret;
+}
+
 # Split out "-extra-CMD value", and return new |@ARGV|. Fill in
 # |EXTRA{CMD}| with list of values.
 sub parse_extra
 {
+    my @args;
     foreach ( @OPENSSL_CMDS ) {
-        $EXTRA{$_} = '';
+        $EXTRA{$_} = [];
     }
-
-    my @result;
-    while ( scalar(@_) > 0 ) {
-        my $arg = shift;
-        if ( $arg !~ m/-extra-([a-z0-9]+)/ ) {
-            push @result, $arg;
+    while (@_) {
+        my $arg = shift(@_);
+        if ( $arg !~ m{^-extra-(\w+)$} ) {
+            push @args, split_val($arg);
             next;
         }
-        $arg =~ s/-extra-//;
-        die("Unknown \"-${arg}-extra\" option, exiting")
-            unless scalar grep { $arg eq $_ } @OPENSSL_CMDS;
-        $EXTRA{$arg} .= " " . shift;
+        $arg = $1;
+        die "Unknown \"-extra-${arg}\" option, exiting\n"
+            unless grep { $arg eq $_ } @OPENSSL_CMDS;
+        die "Missing \"-extra-${arg}\" option value, exiting\n"
+            unless (@_ > 0);
+        push @{$EXTRA{$arg}}, split_val(shift(@_));
     }
-    return @result;
+    return @args;
 }
 
 
@@ -112,9 +261,9 @@ sub copy_pemfile
 # Wrapper around system; useful for debugging.  Returns just the exit status
 sub run
 {
-    my $cmd = shift;
-    print "====\n$cmd\n" if $verbose;
-    my $status = system($cmd);
+    my ($cmd, @args) = @_;
+    print "====\n$cmd @args\n" if $verbose;
+    my $status = system {$cmd} $cmd, @args;
     print "==> $status\n====\n" if $verbose;
     return $status >> 8;
 }
@@ -133,17 +282,15 @@ EOF
 
 if ($WHAT eq '-newcert' ) {
     # create a certificate
-    $RET = run("$REQ -new -x509 -keyout $NEWKEY -out $NEWCERT $DAYS"
-            . " $EXTRA{req}");
+    $RET = run(@REQ, qw(-new -x509 -keyout), $NEWKEY, "-out", $NEWCERT, @DAYS, @{$EXTRA{req}});
     print "Cert is in $NEWCERT, private key is in $NEWKEY\n" if $RET == 0;
 } elsif ($WHAT eq '-precert' ) {
     # create a pre-certificate
-    $RET = run("$REQ -x509 -precert -keyout $NEWKEY -out $NEWCERT $DAYS"
-            . " $EXTRA{req}");
+    $RET = run(@REQ, qw(-x509 -precert -keyout), $NEWKEY, "-out", $NEWCERT, @DAYS, @{$EXTRA{req}});
     print "Pre-cert is in $NEWCERT, private key is in $NEWKEY\n" if $RET == 0;
 } elsif ($WHAT =~ /^\-newreq(\-nodes)?$/ ) {
     # create a certificate request
-    $RET = run("$REQ -new $1 -keyout $NEWKEY -out $NEWREQ $DAYS $EXTRA{req}");
+    $RET = run(@REQ, "-new", (defined $1 ? ($1,) : ()), "-keyout", $NEWKEY, "-out", $NEWREQ, @{$EXTRA{req}});
     print "Request is in $NEWREQ, private key is in $NEWKEY\n" if $RET == 0;
 } elsif ($WHAT eq '-newca' ) {
     # create the directory hierarchy
@@ -176,48 +323,45 @@ if ($WHAT eq '-newcert' ) {
         copy_pemfile($FILE,"${CATOP}/$CACERT", "CERTIFICATE");
     } else {
         print "Making CA certificate ...\n";
-        $RET = run("$REQ -new -keyout ${CATOP}/private/$CAKEY"
-                . " -out ${CATOP}/$CAREQ $EXTRA{req}");
-        $RET = run("$CA -create_serial"
-                . " -out ${CATOP}/$CACERT $CADAYS -batch"
-                . " -keyfile ${CATOP}/private/$CAKEY -selfsign"
-                . " $EXTENSIONS"
-                . " -infiles ${CATOP}/$CAREQ $EXTRA{ca}") if $RET == 0;
+        $RET = run(@REQ, qw(-new -keyout), "${CATOP}/private/$CAKEY",
+                   "-out", "${CATOP}/$CAREQ", @{$EXTRA{req}});
+        $RET = run(@CA, qw(-create_serial -out), "${CATOP}/$CACERT", @CADAYS,
+                   qw(-batch -keyfile), "${CATOP}/private/$CAKEY", "-selfsign",
+                   @EXTENSIONS, "-infiles", "${CATOP}/$CAREQ", @{$EXTRA{ca}})
+            if $RET == 0;
         print "CA certificate is in ${CATOP}/$CACERT\n" if $RET == 0;
     }
 } elsif ($WHAT eq '-pkcs12' ) {
     my $cname = $ARGV[0];
     $cname = "My Certificate" unless defined $cname;
-    $RET = run("$PKCS12 -in $NEWCERT -inkey $NEWKEY"
-            . " -certfile ${CATOP}/$CACERT -out $NEWP12"
-            . " -export -name \"$cname\" $EXTRA{pkcs12}");
-    print "PKCS #12 file is in $NEWP12\n" if $RET == 0;
+    $RET = run(@PKCS12, "-in", $NEWCERT, "-inkey", $NEWKEY,
+               "-certfile", "${CATOP}/$CACERT", "-out", $NEWP12,
+               qw(-export -name), $cname, @{$EXTRA{pkcs12}});
+    print "PKCS#12 file is in $NEWP12\n" if $RET == 0;
 } elsif ($WHAT eq '-xsign' ) {
-    $RET = run("$CA $POLICY -infiles $NEWREQ $EXTRA{ca}");
+    $RET = run(@CA, @POLICY, "-infiles", $NEWREQ, @{$EXTRA{ca}});
 } elsif ($WHAT eq '-sign' ) {
-    $RET = run("$CA $POLICY -out $NEWCERT"
-            . " -infiles $NEWREQ $EXTRA{ca}");
+    $RET = run(@CA, @POLICY, "-out", $NEWCERT,
+               "-infiles", $NEWREQ, @{$EXTRA{ca}});
     print "Signed certificate is in $NEWCERT\n" if $RET == 0;
 } elsif ($WHAT eq '-signCA' ) {
-    $RET = run("$CA $POLICY -out $NEWCERT"
-            . " $EXTENSIONS -infiles $NEWREQ $EXTRA{ca}");
+    $RET = run(@CA, @POLICY, "-out", $NEWCERT, @EXTENSIONS,
+               "-infiles", $NEWREQ, @{$EXTRA{ca}});
     print "Signed CA certificate is in $NEWCERT\n" if $RET == 0;
 } elsif ($WHAT eq '-signcert' ) {
-    $RET = run("$X509 -x509toreq -in $NEWREQ -signkey $NEWREQ"
-            . " -out tmp.pem $EXTRA{x509}");
-    $RET = run("$CA $POLICY -out $NEWCERT"
-            .  "-infiles tmp.pem $EXTRA{ca}") if $RET == 0;
+    $RET = run(@X509, qw(-x509toreq -in), $NEWREQ, "-signkey", $NEWREQ,
+               qw(-out tmp.pem), @{$EXTRA{x509}});
+    $RET = run(@CA, @POLICY, "-out", $NEWCERT,
+               qw(-infiles tmp.pem), @{$EXTRA{ca}}) if $RET == 0;
     print "Signed certificate is in $NEWCERT\n" if $RET == 0;
 } elsif ($WHAT eq '-verify' ) {
     my @files = @ARGV ? @ARGV : ( $NEWCERT );
     foreach my $file (@files) {
-        # -CAfile quoted for VMS, since the C RTL downcases all unquoted
-        # arguments to C programs
-        my $status = run("$VERIFY \"-CAfile\" ${CATOP}/$CACERT $file $EXTRA{verify}");
+        my $status = run(@VERIFY, "-CAfile", "${CATOP}/$CACERT", $file, @{$EXTRA{verify}});
         $RET = $status if $status != 0;
     }
 } elsif ($WHAT eq '-crl' ) {
-    $RET = run("$CA -gencrl -out ${CATOP}/crl/$CACRL $EXTRA{ca}");
+    $RET = run(@CA, qw(-gencrl -out), "${CATOP}/crl/$CACRL", @{$EXTRA{ca}});
     print "Generated CRL is in ${CATOP}/crl/$CACRL\n" if $RET == 0;
 } elsif ($WHAT eq '-revoke' ) {
     my $cname = $ARGV[0];
@@ -225,10 +369,10 @@ if ($WHAT eq '-newcert' ) {
         print "Certificate filename is required; reason optional.\n";
         exit 1;
     }
-    my $reason = $ARGV[1];
-    $reason = " -crl_reason $reason"
-        if defined $reason && crl_reason_ok($reason);
-    $RET = run("$CA -revoke \"$cname\"" . $reason . $EXTRA{ca});
+    my @reason;
+    @reason = ("-crl_reason", $ARGV[1])
+        if defined $ARGV[1] && crl_reason_ok($ARGV[1]);
+    $RET = run(@CA, "-revoke", $cname, @reason, @{$EXTRA{ca}});
 } else {
     print STDERR "Unknown arg \"$WHAT\"\n";
     print STDERR "Use -help for help.\n";
diff --git a/apps/asn1parse.c b/apps/asn1parse.c
index 4f882396d03d7..fbd9d7c3349de 100644
--- a/apps/asn1parse.c
+++ b/apps/asn1parse.c
@@ -20,40 +20,51 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_IN, OPT_OUT, OPT_INDENT, OPT_NOOUT,
-    OPT_OID, OPT_OFFSET, OPT_LENGTH, OPT_DUMP, OPT_DLIMIT,
-    OPT_STRPARSE, OPT_GENSTR, OPT_GENCONF, OPT_STRICTPEM,
+    OPT_INFORM,
+    OPT_IN,
+    OPT_OUT,
+    OPT_INDENT,
+    OPT_NOOUT,
+    OPT_OID,
+    OPT_OFFSET,
+    OPT_LENGTH,
+    OPT_DUMP,
+    OPT_DLIMIT,
+    OPT_STRPARSE,
+    OPT_GENSTR,
+    OPT_GENCONF,
+    OPT_STRICTPEM,
     OPT_ITEM
 } OPTION_CHOICE;
 
 const OPTIONS asn1parse_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"oid", OPT_OID, '<', "file of extra oid definitions"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "oid", OPT_OID, '<', "file of extra oid definitions" },
 
     OPT_SECTION("I/O"),
-    {"inform", OPT_INFORM, 'A', "input format - one of DER PEM B64"},
-    {"in", OPT_IN, '<', "input file"},
-    {"out", OPT_OUT, '>', "output file (output format is always DER)"},
-    {"noout", OPT_NOOUT, 0, "do not produce any output"},
-    {"offset", OPT_OFFSET, 'p', "offset into file"},
-    {"length", OPT_LENGTH, 'p', "length of section in file"},
-    {"strparse", OPT_STRPARSE, 'p',
-     "offset; a series of these can be used to 'dig'"},
-    {"genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from"},
-    {OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings"},
-    {"genconf", OPT_GENCONF, 's', "file to generate ASN1 structure from"},
-    {"strictpem", OPT_STRICTPEM, 0,
-     "equivalent to '-inform pem' (obsolete)"},
-    {"item", OPT_ITEM, 's', "item to parse and print"},
-    {OPT_MORE_STR, 0, 0, "(-inform  will be ignored)"},
+    { "inform", OPT_INFORM, 'A', "input format - one of DER PEM B64" },
+    { "in", OPT_IN, '<', "input file" },
+    { "out", OPT_OUT, '>', "output file (output format is always DER)" },
+    { "noout", OPT_NOOUT, 0, "do not produce any output" },
+    { "offset", OPT_OFFSET, 'p', "offset into file" },
+    { "length", OPT_LENGTH, 'p', "length of section in file" },
+    { "strparse", OPT_STRPARSE, 'p',
+        "offset; a series of these can be used to 'dig'" },
+    { OPT_MORE_STR, 0, 0, "into multiple ASN1 blob wrappings" },
+    { "genstr", OPT_GENSTR, 's', "string to generate ASN1 structure from" },
+    { "genconf", OPT_GENCONF, 's', "file to generate ASN1 structure from" },
+    { "strictpem", OPT_STRICTPEM, 0,
+        "equivalent to '-inform pem' (obsolete)" },
+    { "item", OPT_ITEM, 's', "item to parse and print" },
+    { OPT_MORE_STR, 0, 0, "(-inform  will be ignored)" },
 
     OPT_SECTION("Formatting"),
-    {"i", OPT_INDENT, 0, "indents the output"},
-    {"dump", OPT_DUMP, 0, "unknown data in hex form"},
-    {"dlimit", OPT_DLIMIT, 'p',
-     "dump the first arg bytes of unknown data in hex form"},
-    {NULL}
+    { "i", OPT_INDENT, 0, "indents the output" },
+    { "dump", OPT_DUMP, 0, "unknown data in hex form" },
+    { "dlimit", OPT_DLIMIT, 'p',
+        "dump the first arg bytes of unknown data in hex form" },
+    { NULL }
 };
 
 static int do_generate(char *genstr, const char *genconf, BUF_MEM *buf);
@@ -88,7 +99,7 @@ int asn1parse_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -189,7 +200,7 @@ int asn1parse_main(int argc, char **argv)
         buf->length = buf->max = num;
     } else {
         if (!BUF_MEM_grow(buf, BUFSIZ * 8))
-            goto end;           /* Pre-allocate :-) */
+            goto end; /* Pre-allocate :-) */
 
         if (genstr || genconf) {
             num = do_generate(genstr, genconf, buf);
@@ -224,7 +235,6 @@ int asn1parse_main(int argc, char **argv)
             }
         }
         str = (unsigned char *)buf->data;
-
     }
 
     /* If any structs to parse go through in sequence */
@@ -238,7 +248,7 @@ int asn1parse_main(int argc, char **argv)
             j = strtol(sk_OPENSSL_STRING_value(osk, i), NULL, 0);
             if (j <= 0 || j >= tmplen) {
                 BIO_printf(bio_err, "'%s' is out of range\n",
-                           sk_OPENSSL_STRING_value(osk, i));
+                    sk_OPENSSL_STRING_value(osk, i));
                 continue;
             }
             tmpbuf += j;
@@ -304,7 +314,7 @@ int asn1parse_main(int argc, char **argv)
         }
     }
     ret = 0;
- end:
+end:
     BIO_free(derout);
     BIO_free(in);
     BIO_free(b64);
@@ -358,7 +368,7 @@ static int do_generate(char *genstr, const char *genconf, BUF_MEM *buf)
     ASN1_TYPE_free(atyp);
     return len;
 
- err:
+err:
     NCONF_free(cnf);
     ASN1_TYPE_free(atyp);
     return -1;
diff --git a/apps/ca.c b/apps/ca.c
index 6d1d1c0a6ea03..02b00c7c03ecc 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -26,114 +26,114 @@
 #include <openssl/pem.h>
 
 #ifndef W_OK
-# ifdef OPENSSL_SYS_VMS
-#  include <unistd.h>
-# elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_TANDEM)
-#  include <sys/file.h>
-# endif
+#ifdef OPENSSL_SYS_VMS
+#include <unistd.h>
+#elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_TANDEM)
+#include <sys/file.h>
+#endif
 #endif
 
 #include "apps.h"
 #include "progs.h"
 
 #ifndef W_OK
-# define F_OK 0
-# define W_OK 2
-# define R_OK 4
+#define F_OK 0
+#define W_OK 2
+#define R_OK 4
 #endif
 
 #ifndef PATH_MAX
-# define PATH_MAX 4096
+#define PATH_MAX 4096
 #endif
 
-#define BASE_SECTION            "ca"
-
-#define ENV_DEFAULT_CA          "default_ca"
-
-#define STRING_MASK             "string_mask"
-#define UTF8_IN                 "utf8"
-
-#define ENV_NEW_CERTS_DIR       "new_certs_dir"
-#define ENV_CERTIFICATE         "certificate"
-#define ENV_SERIAL              "serial"
-#define ENV_RAND_SERIAL         "rand_serial"
-#define ENV_CRLNUMBER           "crlnumber"
-#define ENV_PRIVATE_KEY         "private_key"
-#define ENV_DEFAULT_DAYS        "default_days"
-#define ENV_DEFAULT_STARTDATE   "default_startdate"
-#define ENV_DEFAULT_ENDDATE     "default_enddate"
-#define ENV_DEFAULT_CRL_DAYS    "default_crl_days"
-#define ENV_DEFAULT_CRL_HOURS   "default_crl_hours"
-#define ENV_DEFAULT_MD          "default_md"
-#define ENV_DEFAULT_EMAIL_DN    "email_in_dn"
-#define ENV_PRESERVE            "preserve"
-#define ENV_POLICY              "policy"
-#define ENV_EXTENSIONS          "x509_extensions"
-#define ENV_CRLEXT              "crl_extensions"
-#define ENV_MSIE_HACK           "msie_hack"
-#define ENV_NAMEOPT             "name_opt"
-#define ENV_CERTOPT             "cert_opt"
-#define ENV_EXTCOPY             "copy_extensions"
-#define ENV_UNIQUE_SUBJECT      "unique_subject"
-
-#define ENV_DATABASE            "database"
+#define BASE_SECTION "ca"
+
+#define ENV_DEFAULT_CA "default_ca"
+
+#define STRING_MASK "string_mask"
+#define UTF8_IN "utf8"
+
+#define ENV_NEW_CERTS_DIR "new_certs_dir"
+#define ENV_CERTIFICATE "certificate"
+#define ENV_SERIAL "serial"
+#define ENV_RAND_SERIAL "rand_serial"
+#define ENV_CRLNUMBER "crlnumber"
+#define ENV_PRIVATE_KEY "private_key"
+#define ENV_DEFAULT_DAYS "default_days"
+#define ENV_DEFAULT_STARTDATE "default_startdate"
+#define ENV_DEFAULT_ENDDATE "default_enddate"
+#define ENV_DEFAULT_CRL_DAYS "default_crl_days"
+#define ENV_DEFAULT_CRL_HOURS "default_crl_hours"
+#define ENV_DEFAULT_MD "default_md"
+#define ENV_DEFAULT_EMAIL_DN "email_in_dn"
+#define ENV_PRESERVE "preserve"
+#define ENV_POLICY "policy"
+#define ENV_EXTENSIONS "x509_extensions"
+#define ENV_CRLEXT "crl_extensions"
+#define ENV_MSIE_HACK "msie_hack"
+#define ENV_NAMEOPT "name_opt"
+#define ENV_CERTOPT "cert_opt"
+#define ENV_EXTCOPY "copy_extensions"
+#define ENV_UNIQUE_SUBJECT "unique_subject"
+
+#define ENV_DATABASE "database"
 
 /* Additional revocation information types */
 typedef enum {
-    REV_VALID             = -1, /* Valid (not-revoked) status */
-    REV_NONE              = 0, /* No additional information */
-    REV_CRL_REASON        = 1, /* Value is CRL reason code */
-    REV_HOLD              = 2, /* Value is hold instruction */
-    REV_KEY_COMPROMISE    = 3, /* Value is cert key compromise time */
-    REV_CA_COMPROMISE     = 4  /* Value is CA key compromise time */
+    REV_VALID = -1, /* Valid (not-revoked) status */
+    REV_NONE = 0, /* No additional information */
+    REV_CRL_REASON = 1, /* Value is CRL reason code */
+    REV_HOLD = 2, /* Value is hold instruction */
+    REV_KEY_COMPROMISE = 3, /* Value is cert key compromise time */
+    REV_CA_COMPROMISE = 4 /* Value is CA key compromise time */
 } REVINFO_TYPE;
 
 static char *lookup_conf(const CONF *conf, const char *group, const char *tag);
 
 static int certify(X509 **xret, const char *infile, int informat,
-                   EVP_PKEY *pkey, X509 *x509,
-                   const char *dgst,
-                   STACK_OF(OPENSSL_STRING) *sigopts,
-                   STACK_OF(OPENSSL_STRING) *vfyopts,
-                   STACK_OF(CONF_VALUE) *policy, CA_DB *db,
-                   BIGNUM *serial, const char *subj, unsigned long chtype,
-                   int multirdn, int email_dn, const char *startdate,
-                   const char *enddate,
-                   long days, int batch, const char *ext_sect, CONF *conf,
-                   int verbose, unsigned long certopt, unsigned long nameopt,
-                   int default_op, int ext_copy, int selfsign, unsigned long dateopt);
+    EVP_PKEY *pkey, X509 *x509,
+    const char *dgst,
+    STACK_OF(OPENSSL_STRING) *sigopts,
+    STACK_OF(OPENSSL_STRING) *vfyopts,
+    STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+    BIGNUM *serial, const char *subj, unsigned long chtype,
+    int multirdn, int email_dn, const char *startdate,
+    const char *enddate,
+    long days, int batch, const char *ext_sect, CONF *conf,
+    int verbose, unsigned long certopt, unsigned long nameopt,
+    int default_op, int ext_copy, int selfsign, unsigned long dateopt);
 static int certify_cert(X509 **xret, const char *infile, int certformat,
-                        const char *passin, EVP_PKEY *pkey, X509 *x509,
-                        const char *dgst,
-                        STACK_OF(OPENSSL_STRING) *sigopts,
-                        STACK_OF(OPENSSL_STRING) *vfyopts,
-                        STACK_OF(CONF_VALUE) *policy, CA_DB *db,
-                        BIGNUM *serial, const char *subj, unsigned long chtype,
-                        int multirdn, int email_dn, const char *startdate,
-                        const char *enddate, long days, int batch, const char *ext_sect,
-                        CONF *conf, int verbose, unsigned long certopt,
-                        unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt);
+    const char *passin, EVP_PKEY *pkey, X509 *x509,
+    const char *dgst,
+    STACK_OF(OPENSSL_STRING) *sigopts,
+    STACK_OF(OPENSSL_STRING) *vfyopts,
+    STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+    BIGNUM *serial, const char *subj, unsigned long chtype,
+    int multirdn, int email_dn, const char *startdate,
+    const char *enddate, long days, int batch, const char *ext_sect,
+    CONF *conf, int verbose, unsigned long certopt,
+    unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt);
 static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
-                         X509 *x509, const char *dgst,
-                         STACK_OF(OPENSSL_STRING) *sigopts,
-                         STACK_OF(CONF_VALUE) *policy, CA_DB *db,
-                         BIGNUM *serial, const char *subj, unsigned long chtype,
-                         int multirdn, int email_dn, const char *startdate,
-                         const char *enddate, long days, const char *ext_sect, CONF *conf,
-                         int verbose, unsigned long certopt,
-                         unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt);
+    X509 *x509, const char *dgst,
+    STACK_OF(OPENSSL_STRING) *sigopts,
+    STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+    BIGNUM *serial, const char *subj, unsigned long chtype,
+    int multirdn, int email_dn, const char *startdate,
+    const char *enddate, long days, const char *ext_sect, CONF *conf,
+    int verbose, unsigned long certopt,
+    unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt);
 static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
-                   const char *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
-                   STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,
-                   const char *subj, unsigned long chtype, int multirdn,
-                   int email_dn, const char *startdate, const char *enddate, long days,
-                   int batch, int verbose, X509_REQ *req, const char *ext_sect,
-                   CONF *conf, unsigned long certopt, unsigned long nameopt,
-                   int default_op, int ext_copy, int selfsign, unsigned long dateopt);
+    const char *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
+    STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,
+    const char *subj, unsigned long chtype, int multirdn,
+    int email_dn, const char *startdate, const char *enddate, long days,
+    int batch, int verbose, X509_REQ *req, const char *ext_sect,
+    CONF *conf, unsigned long certopt, unsigned long nameopt,
+    int default_op, int ext_copy, int selfsign, unsigned long dateopt);
 static int get_certificate_status(const char *ser_status, CA_DB *db);
 static int check_time_format(const char *str);
 static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
-                     const char *extval);
+    const char *extval);
 static char *make_revocation_str(REVINFO_TYPE rev_type, const char *rev_arg);
 static int make_revoked(X509_REVOKED *rev, const char *str);
 static int old_entry_print(const ASN1_OBJECT *obj, const ASN1_STRING *str);
@@ -145,122 +145,167 @@ static int msie_hack = 0;
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_ENGINE, OPT_VERBOSE, OPT_CONFIG, OPT_NAME, OPT_SUBJ, OPT_UTF8,
-    OPT_CREATE_SERIAL, OPT_MULTIVALUE_RDN, OPT_STARTDATE, OPT_ENDDATE,
-    OPT_DAYS, OPT_MD, OPT_POLICY, OPT_KEYFILE, OPT_KEYFORM, OPT_PASSIN,
-    OPT_KEY, OPT_CERT, OPT_CERTFORM, OPT_SELFSIGN,
-    OPT_IN, OPT_INFORM, OPT_OUT, OPT_DATEOPT, OPT_OUTDIR, OPT_VFYOPT,
-    OPT_SIGOPT, OPT_NOTEXT, OPT_BATCH, OPT_PRESERVEDN, OPT_NOEMAILDN,
-    OPT_GENCRL, OPT_MSIE_HACK, OPT_CRL_LASTUPDATE, OPT_CRL_NEXTUPDATE,
-    OPT_CRLDAYS, OPT_CRLHOURS, OPT_CRLSEC, OPT_NOT_BEFORE, OPT_NOT_AFTER,
-    OPT_INFILES, OPT_SS_CERT, OPT_SPKAC, OPT_REVOKE, OPT_VALID,
-    OPT_EXTENSIONS, OPT_EXTFILE, OPT_STATUS, OPT_UPDATEDB, OPT_CRLEXTS,
-    OPT_RAND_SERIAL, OPT_QUIET,
-    OPT_R_ENUM, OPT_PROV_ENUM,
+    OPT_ENGINE,
+    OPT_VERBOSE,
+    OPT_CONFIG,
+    OPT_NAME,
+    OPT_SUBJ,
+    OPT_UTF8,
+    OPT_CREATE_SERIAL,
+    OPT_MULTIVALUE_RDN,
+    OPT_STARTDATE,
+    OPT_ENDDATE,
+    OPT_DAYS,
+    OPT_MD,
+    OPT_POLICY,
+    OPT_KEYFILE,
+    OPT_KEYFORM,
+    OPT_PASSIN,
+    OPT_KEY,
+    OPT_CERT,
+    OPT_CERTFORM,
+    OPT_SELFSIGN,
+    OPT_IN,
+    OPT_INFORM,
+    OPT_OUT,
+    OPT_DATEOPT,
+    OPT_OUTDIR,
+    OPT_VFYOPT,
+    OPT_SIGOPT,
+    OPT_NOTEXT,
+    OPT_BATCH,
+    OPT_PRESERVEDN,
+    OPT_NOEMAILDN,
+    OPT_GENCRL,
+    OPT_MSIE_HACK,
+    OPT_CRL_LASTUPDATE,
+    OPT_CRL_NEXTUPDATE,
+    OPT_CRLDAYS,
+    OPT_CRLHOURS,
+    OPT_CRLSEC,
+    OPT_NOT_BEFORE,
+    OPT_NOT_AFTER,
+    OPT_INFILES,
+    OPT_SS_CERT,
+    OPT_SPKAC,
+    OPT_REVOKE,
+    OPT_VALID,
+    OPT_EXTENSIONS,
+    OPT_EXTFILE,
+    OPT_STATUS,
+    OPT_UPDATEDB,
+    OPT_CRLEXTS,
+    OPT_RAND_SERIAL,
+    OPT_QUIET,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM,
     /* Do not change the order here; see related case statements below */
-    OPT_CRL_REASON, OPT_CRL_HOLD, OPT_CRL_COMPROMISE, OPT_CRL_CA_COMPROMISE
+    OPT_CRL_REASON,
+    OPT_CRL_HOLD,
+    OPT_CRL_COMPROMISE,
+    OPT_CRL_CA_COMPROMISE
 } OPTION_CHOICE;
 
 const OPTIONS ca_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [certreq...]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [certreq...]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"verbose", OPT_VERBOSE, '-', "Verbose output during processing"},
-    {"quiet", OPT_QUIET, '-', "Terse output during processing"},
-    {"outdir", OPT_OUTDIR, '/', "Where to put output cert"},
-    {"in", OPT_IN, '<', "The input cert request(s)"},
-    {"inform", OPT_INFORM, 'F',
-     "CSR input format to use (PEM or DER; by default try PEM first)"},
-    {"infiles", OPT_INFILES, '-', "The last argument, requests to process"},
-    {"out", OPT_OUT, '>', "Where to put the output file(s)"},
-    {"dateopt", OPT_DATEOPT, 's', "Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822."},
-    {"notext", OPT_NOTEXT, '-', "Do not print the generated certificate"},
-    {"batch", OPT_BATCH, '-', "Don't ask questions"},
-    {"msie_hack", OPT_MSIE_HACK, '-',
-     "msie modifications to handle all Universal Strings"},
-    {"ss_cert", OPT_SS_CERT, '<', "File contains a self signed cert to sign"},
-    {"spkac", OPT_SPKAC, '<',
-     "File contains DN and signed public key and challenge"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "verbose", OPT_VERBOSE, '-', "Verbose output during processing" },
+    { "quiet", OPT_QUIET, '-', "Terse output during processing" },
+    { "outdir", OPT_OUTDIR, '/', "Where to put output cert" },
+    { "in", OPT_IN, '<', "The input cert request(s)" },
+    { "inform", OPT_INFORM, 'F',
+        "CSR input format to use (PEM or DER; by default try PEM first)" },
+    { "infiles", OPT_INFILES, '-', "The last argument, requests to process" },
+    { "out", OPT_OUT, '>', "Where to put the output file(s)" },
+    { "dateopt", OPT_DATEOPT, 's', "Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822." },
+    { "notext", OPT_NOTEXT, '-', "Do not print the generated certificate" },
+    { "batch", OPT_BATCH, '-', "Don't ask questions" },
+    { "msie_hack", OPT_MSIE_HACK, '-',
+        "msie modifications to handle all Universal Strings" },
+    { "ss_cert", OPT_SS_CERT, '<', "File contains a self signed cert to sign" },
+    { "spkac", OPT_SPKAC, '<',
+        "File contains DN and signed public key and challenge" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Configuration"),
-    {"config", OPT_CONFIG, 's', "A config file"},
-    {"name", OPT_NAME, 's', "The particular CA definition to use"},
-    {"section", OPT_NAME, 's', "An alias for -name"},
-    {"policy", OPT_POLICY, 's', "The CA 'policy' to support"},
+    { "config", OPT_CONFIG, 's', "A config file" },
+    { "name", OPT_NAME, 's', "The particular CA definition to use" },
+    { "section", OPT_NAME, 's', "An alias for -name" },
+    { "policy", OPT_POLICY, 's', "The CA 'policy' to support" },
 
     OPT_SECTION("Certificate"),
-    {"subj", OPT_SUBJ, 's', "Use arg instead of request's subject"},
-    {"utf8", OPT_UTF8, '-', "Input characters are UTF8; default ASCII"},
-    {"create_serial", OPT_CREATE_SERIAL, '-',
-     "If reading serial fails, create a new random serial"},
-    {"rand_serial", OPT_RAND_SERIAL, '-',
-     "Always create a random serial; do not store it"},
-    {"multivalue-rdn", OPT_MULTIVALUE_RDN, '-',
-     "Deprecated; multi-valued RDNs support is always on."},
-    {"startdate", OPT_STARTDATE, 's',
-     "[CC]YYMMDDHHMMSSZ value for notBefore certificate field"},
-    {"not_before", OPT_NOT_BEFORE, 's', "An alias for -startdate"},
-    {"enddate", OPT_ENDDATE, 's',
-     "[CC]YYMMDDHHMMSSZ value for notAfter certificate field, overrides -days"},
-    {"not_after", OPT_NOT_AFTER, 's', "An alias for -enddate"},
-    {"days", OPT_DAYS, 'p', "Number of days from today to certify the cert for"},
-    {"extensions", OPT_EXTENSIONS, 's',
-     "Extension section (override value in config file)"},
-    {"extfile", OPT_EXTFILE, '<',
-     "Configuration file with X509v3 extensions to add"},
-    {"preserveDN", OPT_PRESERVEDN, '-', "Don't re-order the DN"},
-    {"noemailDN", OPT_NOEMAILDN, '-', "Don't add the EMAIL field to the DN"},
+    { "subj", OPT_SUBJ, 's', "Use arg instead of request's subject" },
+    { "utf8", OPT_UTF8, '-', "Input characters are UTF8; default ASCII" },
+    { "create_serial", OPT_CREATE_SERIAL, '-',
+        "If reading serial fails, create a new random serial" },
+    { "rand_serial", OPT_RAND_SERIAL, '-',
+        "Always create a random serial; do not store it" },
+    { "multivalue-rdn", OPT_MULTIVALUE_RDN, '-',
+        "Deprecated; multi-valued RDNs support is always on." },
+    { "startdate", OPT_STARTDATE, 's',
+        "[CC]YYMMDDHHMMSSZ value for notBefore certificate field" },
+    { "not_before", OPT_NOT_BEFORE, 's', "An alias for -startdate" },
+    { "enddate", OPT_ENDDATE, 's',
+        "[CC]YYMMDDHHMMSSZ value for notAfter certificate field, overrides -days" },
+    { "not_after", OPT_NOT_AFTER, 's', "An alias for -enddate" },
+    { "days", OPT_DAYS, 'p', "Number of days from today to certify the cert for" },
+    { "extensions", OPT_EXTENSIONS, 's',
+        "Extension section (override value in config file)" },
+    { "extfile", OPT_EXTFILE, '<',
+        "Configuration file with X509v3 extensions to add" },
+    { "preserveDN", OPT_PRESERVEDN, '-', "Don't re-order the DN" },
+    { "noemailDN", OPT_NOEMAILDN, '-', "Don't add the EMAIL field to the DN" },
 
     OPT_SECTION("Signing"),
-    {"md", OPT_MD, 's', "Digest to use, such as sha256"},
-    {"keyfile", OPT_KEYFILE, 's', "The CA private key"},
-    {"keyform", OPT_KEYFORM, 'f',
-     "Private key file format (ENGINE, other values ignored)"},
-    {"passin", OPT_PASSIN, 's', "Key and cert input file pass phrase source"},
-    {"key", OPT_KEY, 's',
-     "Key to decrypt the private key or cert files if encrypted. Better use -passin"},
-    {"cert", OPT_CERT, '<', "The CA cert"},
-    {"certform", OPT_CERTFORM, 'F',
-     "Certificate input format (DER/PEM/P12); has no effect"},
-    {"selfsign", OPT_SELFSIGN, '-',
-     "Sign a cert with the key associated with it"},
-    {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
-    {"vfyopt", OPT_VFYOPT, 's', "Verification parameter in n:v form"},
+    { "md", OPT_MD, 's', "Digest to use, such as sha256" },
+    { "keyfile", OPT_KEYFILE, 's', "The CA private key" },
+    { "keyform", OPT_KEYFORM, 'f',
+        "Private key file format (ENGINE, other values ignored)" },
+    { "passin", OPT_PASSIN, 's', "Key and cert input file pass phrase source" },
+    { "key", OPT_KEY, 's',
+        "Key to decrypt the private key or cert files if encrypted. Better use -passin" },
+    { "cert", OPT_CERT, '<', "The CA cert" },
+    { "certform", OPT_CERTFORM, 'F',
+        "Certificate input format (DER/PEM/P12); has no effect" },
+    { "selfsign", OPT_SELFSIGN, '-',
+        "Sign a cert with the key associated with it" },
+    { "sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form" },
+    { "vfyopt", OPT_VFYOPT, 's', "Verification parameter in n:v form" },
 
     OPT_SECTION("Revocation"),
-    {"gencrl", OPT_GENCRL, '-', "Generate a new CRL"},
-    {"valid", OPT_VALID, 's',
-     "Add a Valid(not-revoked) DB entry about a cert (given in file)"},
-    {"status", OPT_STATUS, 's', "Shows cert status given the serial number"},
-    {"updatedb", OPT_UPDATEDB, '-', "Updates db for expired cert"},
-    {"crlexts", OPT_CRLEXTS, 's',
-     "CRL extension section (override value in config file)"},
-    {"crl_reason", OPT_CRL_REASON, 's', "revocation reason"},
-    {"crl_hold", OPT_CRL_HOLD, 's',
-     "the hold instruction, an OID. Sets revocation reason to certificateHold"},
-    {"crl_compromise", OPT_CRL_COMPROMISE, 's',
-     "sets compromise time to val and the revocation reason to keyCompromise"},
-    {"crl_CA_compromise", OPT_CRL_CA_COMPROMISE, 's',
-     "sets compromise time to val and the revocation reason to CACompromise"},
-    {"crl_lastupdate", OPT_CRL_LASTUPDATE, 's',
-     "Sets the CRL lastUpdate time to val (YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ)"},
-    {"crl_nextupdate", OPT_CRL_NEXTUPDATE, 's',
-     "Sets the CRL nextUpdate time to val (YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ)"},
-    {"crldays", OPT_CRLDAYS, 'p', "Days until the next CRL is due"},
-    {"crlhours", OPT_CRLHOURS, 'p', "Hours until the next CRL is due"},
-    {"crlsec", OPT_CRLSEC, 'p', "Seconds until the next CRL is due"},
-    {"revoke", OPT_REVOKE, '<', "Revoke a cert (given in file)"},
+    { "gencrl", OPT_GENCRL, '-', "Generate a new CRL" },
+    { "valid", OPT_VALID, 's',
+        "Add a Valid(not-revoked) DB entry about a cert (given in file)" },
+    { "status", OPT_STATUS, 's', "Shows cert status given the serial number" },
+    { "updatedb", OPT_UPDATEDB, '-', "Updates db for expired cert" },
+    { "crlexts", OPT_CRLEXTS, 's',
+        "CRL extension section (override value in config file)" },
+    { "crl_reason", OPT_CRL_REASON, 's', "revocation reason" },
+    { "crl_hold", OPT_CRL_HOLD, 's',
+        "the hold instruction, an OID. Sets revocation reason to certificateHold" },
+    { "crl_compromise", OPT_CRL_COMPROMISE, 's',
+        "sets compromise time to val and the revocation reason to keyCompromise" },
+    { "crl_CA_compromise", OPT_CRL_CA_COMPROMISE, 's',
+        "sets compromise time to val and the revocation reason to CACompromise" },
+    { "crl_lastupdate", OPT_CRL_LASTUPDATE, 's',
+        "Sets the CRL lastUpdate time to val (YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ)" },
+    { "crl_nextupdate", OPT_CRL_NEXTUPDATE, 's',
+        "Sets the CRL nextUpdate time to val (YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ)" },
+    { "crldays", OPT_CRLDAYS, 'p', "Days until the next CRL is due" },
+    { "crlhours", OPT_CRLHOURS, 'p', "Hours until the next CRL is due" },
+    { "crlsec", OPT_CRLSEC, 'p', "Seconds until the next CRL is due" },
+    { "revoke", OPT_REVOKE, '<', "Revoke a cert (given in file)" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"certreq", 0, 0, "Certificate requests to be signed (optional)"},
-    {NULL}
+    { "certreq", 0, 0, "Certificate requests to be signed (optional)" },
+    { NULL }
 };
 
 int ca_main(int argc, char **argv)
@@ -313,7 +358,7 @@ int ca_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
-opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -493,7 +538,7 @@ int ca_main(int argc, char **argv)
         case OPT_CRLEXTS:
             crl_ext = opt_arg();
             break;
-        case OPT_CRL_REASON:   /* := REV_CRL_REASON */
+        case OPT_CRL_REASON: /* := REV_CRL_REASON */
         case OPT_CRL_HOLD:
         case OPT_CRL_COMPROMISE:
         case OPT_CRL_CA_COMPROMISE:
@@ -610,7 +655,7 @@ int ca_main(int argc, char **argv)
 
         if (!X509_check_private_key(x509, pkey)) {
             BIO_printf(bio_err,
-                       "CA certificate and CA private key do not match\n");
+                "CA certificate and CA private key do not match\n");
             goto end;
         }
     }
@@ -657,7 +702,7 @@ int ca_main(int argc, char **argv)
         outdir = NCONF_get_string(conf, section, ENV_NEW_CERTS_DIR);
         if (outdir == NULL) {
             BIO_printf(bio_err,
-                       "there needs to be defined a directory for new certificate to be placed in\n");
+                "there needs to be defined a directory for new certificate to be placed in\n");
             goto end;
         }
 #ifndef OPENSSL_SYS_VMS
@@ -693,12 +738,11 @@ int ca_main(int argc, char **argv)
         pp = sk_OPENSSL_PSTRING_value(db->db->data, i);
         if ((pp[DB_type][0] != DB_TYPE_REV) && (pp[DB_rev_date][0] != '\0')) {
             BIO_printf(bio_err,
-                       "entry %d: not revoked yet, but has a revocation date\n",
-                       i + 1);
+                "entry %d: not revoked yet, but has a revocation date\n",
+                i + 1);
             goto end;
         }
-        if ((pp[DB_type][0] == DB_TYPE_REV) &&
-            !make_revoked(NULL, pp[DB_rev_date])) {
+        if ((pp[DB_type][0] == DB_TYPE_REV) && !make_revoked(NULL, pp[DB_rev_date])) {
             BIO_printf(bio_err, " in entry %d\n", i + 1);
             goto end;
         }
@@ -714,14 +758,14 @@ int ca_main(int argc, char **argv)
         }
         if ((j & 1) || (j < 2)) {
             BIO_printf(bio_err, "entry %d: bad serial number length (%d)\n",
-                       i + 1, j);
+                i + 1, j);
             goto end;
         }
-        for ( ; *p; p++) {
+        for (; *p; p++) {
             if (!isxdigit(_UC(*p))) {
                 BIO_printf(bio_err,
-                           "entry %d: bad char 0%o '%c' in serial number\n",
-                           i + 1, *p, *p);
+                    "entry %d: bad char 0%o '%c' in serial number\n",
+                    i + 1, *p, *p);
                 goto end;
             }
         }
@@ -729,7 +773,7 @@ int ca_main(int argc, char **argv)
     if (verbose) {
         TXT_DB_write(bio_out, db->db);
         BIO_printf(bio_err, "%d entries loaded from the database\n",
-                   sk_OPENSSL_PSTRING_num(db->db->data));
+            sk_OPENSSL_PSTRING_num(db->db->data));
         BIO_printf(bio_err, "generating index\n");
     }
 
@@ -771,12 +815,11 @@ int ca_main(int argc, char **argv)
 
         if (verbose)
             BIO_printf(bio_err, "Successfully loaded extensions file %s\n",
-                       extfile);
+                extfile);
 
         /* We can have sections in the ext file */
         if (extensions == NULL) {
-            extensions =
-                app_conf_try_string(extfile_conf, "default", "extensions");
+            extensions = app_conf_try_string(extfile_conf, "default", "extensions");
             if (extensions == NULL)
                 extensions = "default";
         }
@@ -803,8 +846,8 @@ int ca_main(int argc, char **argv)
     if (def_ret == 2 && strcmp(def_dgst, "UNDEF") == 0) {
         dgst = NULL;
     } else if (dgst == NULL
-               && (dgst = lookup_conf(conf, section, ENV_DEFAULT_MD)) == NULL
-               && strcmp(def_dgst, "UNDEF") != 0) {
+        && (dgst = lookup_conf(conf, section, ENV_DEFAULT_MD)) == NULL
+        && strcmp(def_dgst, "UNDEF") != 0) {
         goto end;
     } else {
         if (strcmp(dgst, "default") == 0 || strcmp(def_dgst, "UNDEF") == 0) {
@@ -820,8 +863,7 @@ int ca_main(int argc, char **argv)
         if (email_dn == 1) {
             char *tmp_email_dn = NULL;
 
-            tmp_email_dn =
-                app_conf_try_string(conf, section, ENV_DEFAULT_EMAIL_DN);
+            tmp_email_dn = app_conf_try_string(conf, section, ENV_DEFAULT_EMAIL_DN);
             if (tmp_email_dn != NULL && strcmp(tmp_email_dn, "no") == 0)
                 email_dn = 0;
         }
@@ -850,8 +892,8 @@ int ca_main(int argc, char **argv)
             X509V3_set_nconf(&ctx, extfile_conf);
             if (!X509V3_EXT_add_nconf(extfile_conf, &ctx, extensions, NULL)) {
                 BIO_printf(bio_err,
-                           "Error checking certificate extensions from extfile section %s\n",
-                           extensions);
+                    "Error checking certificate extensions from extfile section %s\n",
+                    extensions);
                 ret = 1;
                 goto end;
             }
@@ -870,8 +912,8 @@ int ca_main(int argc, char **argv)
                 X509V3_set_nconf(&ctx, conf);
                 if (!X509V3_EXT_add_nconf(conf, &ctx, extensions, NULL)) {
                     BIO_printf(bio_err,
-                               "Error checking certificate extension config section %s\n",
-                               extensions);
+                        "Error checking certificate extension config section %s\n",
+                        extensions);
                     ret = 1;
                     goto end;
                 }
@@ -879,8 +921,7 @@ int ca_main(int argc, char **argv)
         }
 
         if (startdate == NULL)
-            startdate =
-                app_conf_try_string(conf, section, ENV_DEFAULT_STARTDATE);
+            startdate = app_conf_try_string(conf, section, ENV_DEFAULT_STARTDATE);
         if (enddate == NULL)
             enddate = app_conf_try_string(conf, section, ENV_DEFAULT_ENDDATE);
         if (days == 0) {
@@ -893,7 +934,7 @@ int ca_main(int argc, char **argv)
         }
         if (days != 0 && enddate != NULL)
             BIO_printf(bio_err,
-                       "Warning: -enddate or -not_after option overriding -days option\n");
+                "Warning: -enddate or -not_after option overriding -days option\n");
 
         if (rand_ser) {
             if ((serial = BN_new()) == NULL || !rand_serial(serial, NULL)) {
@@ -930,10 +971,10 @@ int ca_main(int argc, char **argv)
         if (spkac_file != NULL) {
             total++;
             j = certify_spkac(&x, spkac_file, pkey, x509, dgst, sigopts,
-                              attribs, db, serial, subj, chtype, multirdn,
-                              email_dn, startdate, enddate, days, extensions,
-                              conf, verbose, certopt, get_nameopt(), default_op,
-                              ext_copy, dateopt);
+                attribs, db, serial, subj, chtype, multirdn,
+                email_dn, startdate, enddate, days, extensions,
+                conf, verbose, certopt, get_nameopt(), default_op,
+                ext_copy, dateopt);
             if (j < 0)
                 goto end;
             if (j > 0) {
@@ -950,11 +991,11 @@ int ca_main(int argc, char **argv)
         if (ss_cert_file != NULL) {
             total++;
             j = certify_cert(&x, ss_cert_file, certformat, passin, pkey,
-                             x509, dgst, sigopts, vfyopts, attribs,
-                             db, serial, subj, chtype, multirdn, email_dn,
-                             startdate, enddate, days, batch, extensions,
-                             conf, verbose, certopt, get_nameopt(), default_op,
-                             ext_copy, dateopt);
+                x509, dgst, sigopts, vfyopts, attribs,
+                db, serial, subj, chtype, multirdn, email_dn,
+                startdate, enddate, days, batch, extensions,
+                conf, verbose, certopt, get_nameopt(), default_op,
+                ext_copy, dateopt);
             if (j < 0)
                 goto end;
             if (j > 0) {
@@ -971,10 +1012,10 @@ int ca_main(int argc, char **argv)
         if (infile != NULL) {
             total++;
             j = certify(&x, infile, informat, pkey, x509p, dgst,
-                        sigopts, vfyopts, attribs, db,
-                        serial, subj, chtype, multirdn, email_dn, startdate,
-                        enddate, days, batch, extensions, conf, verbose,
-                        certopt, get_nameopt(), default_op, ext_copy, selfsign, dateopt);
+                sigopts, vfyopts, attribs, db,
+                serial, subj, chtype, multirdn, email_dn, startdate,
+                enddate, days, batch, extensions, conf, verbose,
+                certopt, get_nameopt(), default_op, ext_copy, selfsign, dateopt);
             if (j < 0)
                 goto end;
             if (j > 0) {
@@ -991,11 +1032,11 @@ int ca_main(int argc, char **argv)
         for (i = 0; i < argc; i++) {
             total++;
             j = certify(&x, argv[i], informat, pkey, x509p, dgst,
-                        sigopts, vfyopts,
-                        attribs, db,
-                        serial, subj, chtype, multirdn, email_dn, startdate,
-                        enddate, days, batch, extensions, conf, verbose,
-                        certopt, get_nameopt(), default_op, ext_copy, selfsign, dateopt);
+                sigopts, vfyopts,
+                attribs, db,
+                serial, subj, chtype, multirdn, email_dn, startdate,
+                enddate, days, batch, extensions, conf, verbose,
+                certopt, get_nameopt(), default_op, ext_copy, selfsign, dateopt);
             if (j < 0)
                 goto end;
             if (j > 0) {
@@ -1020,8 +1061,8 @@ int ca_main(int argc, char **argv)
         if (sk_X509_num(cert_sk) > 0) {
             if (!batch) {
                 BIO_printf(bio_err,
-                           "\n%d out of %d certificate requests certified, commit? [y/n]",
-                           total_done, total);
+                    "\n%d out of %d certificate requests certified, commit? [y/n]",
+                    total_done, total);
                 (void)BIO_flush(bio_err);
                 tmp[0] = '\0';
                 if (fgets(tmp, sizeof(tmp), stdin) == NULL) {
@@ -1037,10 +1078,10 @@ int ca_main(int argc, char **argv)
             }
 
             BIO_printf(bio_err, "Write out database with %d new entries\n",
-                       sk_X509_num(cert_sk));
+                sk_X509_num(cert_sk));
 
             if (serialfile != NULL
-                    && !save_serial(serialfile, "new", serial, NULL))
+                && !save_serial(serialfile, "new", serial, NULL))
                 goto end;
 
             if (!save_index(dbfile, "new", db))
@@ -1084,12 +1125,12 @@ int ca_main(int argc, char **argv)
             *(n++) = 'p';
             *(n++) = 'e';
             *(n++) = 'm';
-            *n = '\0';          /* closing new_cert */
+            *n = '\0'; /* closing new_cert */
             if (verbose)
                 BIO_printf(bio_err, "writing %s\n", new_cert);
 
             Sout = bio_open_default(outfile, 'w',
-                                    output_der ? FORMAT_ASN1 : FORMAT_TEXT);
+                output_der ? FORMAT_ASN1 : FORMAT_TEXT);
             if (Sout == NULL)
                 goto end;
 
@@ -1108,7 +1149,7 @@ int ca_main(int argc, char **argv)
         if (sk_X509_num(cert_sk)) {
             /* Rename the database and the serial file */
             if (serialfile != NULL
-                    && !rotate_serial(serialfile, "new", "old"))
+                && !rotate_serial(serialfile, "new", "old"))
                 goto end;
 
             if (!rotate_index(dbfile, "new", "old"))
@@ -1132,7 +1173,7 @@ int ca_main(int argc, char **argv)
             X509V3_set_nconf(&ctx, conf);
             if (!X509V3_EXT_add_nconf(conf, &ctx, crl_ext, NULL)) {
                 BIO_printf(bio_err,
-                           "Error checking CRL extension section %s\n", crl_ext);
+                    "Error checking CRL extension section %s\n", crl_ext);
                 ret = 1;
                 goto end;
             }
@@ -1149,16 +1190,15 @@ int ca_main(int argc, char **argv)
 
         if (!crldays && !crlhours && !crlsec) {
             if (!app_conf_try_number(conf, section,
-                                  ENV_DEFAULT_CRL_DAYS, &crldays))
+                    ENV_DEFAULT_CRL_DAYS, &crldays))
                 crldays = 0;
             if (!app_conf_try_number(conf, section,
-                                  ENV_DEFAULT_CRL_HOURS, &crlhours))
+                    ENV_DEFAULT_CRL_HOURS, &crlhours))
                 crlhours = 0;
         }
-        if ((crl_nextupdate == NULL) &&
-                (crldays == 0) && (crlhours == 0) && (crlsec == 0)) {
+        if ((crl_nextupdate == NULL) && (crldays == 0) && (crlhours == 0) && (crlsec == 0)) {
             BIO_printf(bio_err,
-                       "cannot lookup how long until the next CRL is issued\n");
+                "cannot lookup how long until the next CRL is issued\n");
             goto end;
         }
 
@@ -1176,7 +1216,7 @@ int ca_main(int argc, char **argv)
         }
 
         if (!set_crl_nextupdate(crl, crl_nextupdate,
-                                crldays, crlhours, crlsec)) {
+                crldays, crlhours, crlsec)) {
             BIO_puts(bio_err, "error setting CRL nextUpdate\n");
             ret = 1;
             goto end;
@@ -1225,7 +1265,7 @@ int ca_main(int argc, char **argv)
             if (crl_ext != NULL)
                 if (!X509V3_EXT_CRL_add_nconf(conf, &crlctx, crl_ext, crl)) {
                     BIO_printf(bio_err,
-                               "Error adding CRL extensions from section %s\n", crl_ext);
+                        "Error adding CRL extensions from section %s\n", crl_ext);
                     goto end;
                 }
             if (crlnumberfile != NULL) {
@@ -1246,7 +1286,7 @@ int ca_main(int argc, char **argv)
 
         /* we have a CRL number that need updating */
         if (crlnumberfile != NULL
-                && !save_serial(crlnumberfile, "new", crlnumber, NULL))
+            && !save_serial(crlnumberfile, "new", crlnumber, NULL))
             goto end;
 
         BN_free(crlnumber);
@@ -1256,7 +1296,7 @@ int ca_main(int argc, char **argv)
             goto end;
 
         Sout = bio_open_default(outfile, 'w',
-                                output_der ? FORMAT_ASN1 : FORMAT_TEXT);
+            output_der ? FORMAT_ASN1 : FORMAT_TEXT);
         if (Sout == NULL)
             goto end;
 
@@ -1264,9 +1304,8 @@ int ca_main(int argc, char **argv)
 
         /* Rename the crlnumber file */
         if (crlnumberfile != NULL
-                && !rotate_serial(crlnumberfile, "new", "old"))
+            && !rotate_serial(crlnumberfile, "new", "old"))
             goto end;
-
     }
     /*****************************************************************/
     if (dorevoke) {
@@ -1277,7 +1316,7 @@ int ca_main(int argc, char **argv)
             X509 *revcert;
 
             revcert = load_cert_pass(infile, informat, 1, passin,
-                                     "certificate to be revoked");
+                "certificate to be revoked");
             if (revcert == NULL)
                 goto end;
             if (dorevoke == 2)
@@ -1298,7 +1337,7 @@ int ca_main(int argc, char **argv)
     }
     ret = 0;
 
- end:
+end:
     if (ret)
         ERR_print_errors(bio_err);
     BIO_free_all(Sout);
@@ -1332,17 +1371,17 @@ static char *lookup_conf(const CONF *conf, const char *section, const char *tag)
 }
 
 static int certify(X509 **xret, const char *infile, int informat,
-                   EVP_PKEY *pkey, X509 *x509,
-                   const char *dgst,
-                   STACK_OF(OPENSSL_STRING) *sigopts,
-                   STACK_OF(OPENSSL_STRING) *vfyopts,
-                   STACK_OF(CONF_VALUE) *policy, CA_DB *db,
-                   BIGNUM *serial, const char *subj, unsigned long chtype,
-                   int multirdn, int email_dn, const char *startdate,
-                   const char *enddate,
-                   long days, int batch, const char *ext_sect, CONF *lconf,
-                   int verbose, unsigned long certopt, unsigned long nameopt,
-                   int default_op, int ext_copy, int selfsign, unsigned long dateopt)
+    EVP_PKEY *pkey, X509 *x509,
+    const char *dgst,
+    STACK_OF(OPENSSL_STRING) *sigopts,
+    STACK_OF(OPENSSL_STRING) *vfyopts,
+    STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+    BIGNUM *serial, const char *subj, unsigned long chtype,
+    int multirdn, int email_dn, const char *startdate,
+    const char *enddate,
+    long days, int batch, const char *ext_sect, CONF *lconf,
+    int verbose, unsigned long certopt, unsigned long nameopt,
+    int default_op, int ext_copy, int selfsign, unsigned long dateopt)
 {
     X509_REQ *req = NULL;
     EVP_PKEY *pktmp = NULL;
@@ -1363,7 +1402,7 @@ static int certify(X509 **xret, const char *infile, int informat,
 
     if (selfsign && !X509_REQ_check_private_key(req, pkey)) {
         BIO_printf(bio_err,
-                   "Certificate request and CA private key do not match\n");
+            "Certificate request and CA private key do not match\n");
         goto end;
     }
     i = do_X509_REQ_verify(req, pktmp, vfyopts);
@@ -1373,33 +1412,33 @@ static int certify(X509 **xret, const char *infile, int informat,
     }
     if (i == 0) {
         BIO_printf(bio_err,
-                   "Signature did not match the certificate request\n");
+            "Signature did not match the certificate request\n");
         goto end;
     }
     BIO_printf(bio_err, "Signature ok\n");
 
     ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial, subj,
-                 chtype, multirdn, email_dn, startdate, enddate, days, batch,
-                 verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
-                 ext_copy, selfsign, dateopt);
+        chtype, multirdn, email_dn, startdate, enddate, days, batch,
+        verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
+        ext_copy, selfsign, dateopt);
 
- end:
+end:
     ERR_print_errors(bio_err);
     X509_REQ_free(req);
     return ok;
 }
 
 static int certify_cert(X509 **xret, const char *infile, int certformat,
-                        const char *passin, EVP_PKEY *pkey, X509 *x509,
-                        const char *dgst,
-                        STACK_OF(OPENSSL_STRING) *sigopts,
-                        STACK_OF(OPENSSL_STRING) *vfyopts,
-                        STACK_OF(CONF_VALUE) *policy, CA_DB *db,
-                        BIGNUM *serial, const char *subj, unsigned long chtype,
-                        int multirdn, int email_dn, const char *startdate,
-                        const char *enddate, long days, int batch, const char *ext_sect,
-                        CONF *lconf, int verbose, unsigned long certopt,
-                        unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt)
+    const char *passin, EVP_PKEY *pkey, X509 *x509,
+    const char *dgst,
+    STACK_OF(OPENSSL_STRING) *sigopts,
+    STACK_OF(OPENSSL_STRING) *vfyopts,
+    STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+    BIGNUM *serial, const char *subj, unsigned long chtype,
+    int multirdn, int email_dn, const char *startdate,
+    const char *enddate, long days, int batch, const char *ext_sect,
+    CONF *lconf, int verbose, unsigned long certopt,
+    unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt)
 {
     X509 *template_cert = NULL;
     X509_REQ *rreq = NULL;
@@ -1407,7 +1446,8 @@ static int certify_cert(X509 **xret, const char *infile, int certformat,
     int ok = -1, i;
 
     if ((template_cert = load_cert_pass(infile, certformat, 1, passin,
-                                        "template certificate")) == NULL)
+             "template certificate"))
+        == NULL)
         goto end;
     if (verbose)
         X509_print(bio_err, template_cert);
@@ -1436,24 +1476,24 @@ static int certify_cert(X509 **xret, const char *infile, int certformat,
         goto end;
 
     ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial, subj,
-                 chtype, multirdn, email_dn, startdate, enddate, days, batch,
-                 verbose, rreq, ext_sect, lconf, certopt, nameopt, default_op,
-                 ext_copy, 0, dateopt);
+        chtype, multirdn, email_dn, startdate, enddate, days, batch,
+        verbose, rreq, ext_sect, lconf, certopt, nameopt, default_op,
+        ext_copy, 0, dateopt);
 
- end:
+end:
     X509_REQ_free(rreq);
     X509_free(template_cert);
     return ok;
 }
 
 static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
-                   const char *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
-                   STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,
-                   const char *subj, unsigned long chtype, int multirdn,
-                   int email_dn, const char *startdate, const char *enddate, long days,
-                   int batch, int verbose, X509_REQ *req, const char *ext_sect,
-                   CONF *lconf, unsigned long certopt, unsigned long nameopt,
-                   int default_op, int ext_copy, int selfsign, unsigned long dateopt)
+    const char *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
+    STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,
+    const char *subj, unsigned long chtype, int multirdn,
+    int email_dn, const char *startdate, const char *enddate, long days,
+    int batch, int verbose, X509_REQ *req, const char *ext_sect,
+    CONF *lconf, unsigned long certopt, unsigned long nameopt,
+    int default_op, int ext_copy, int selfsign, unsigned long dateopt)
 {
     const X509_NAME *name = NULL;
     X509_NAME *CAname = NULL, *subject = NULL;
@@ -1515,16 +1555,14 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
         /* check some things */
         if (nid == NID_pkcs9_emailAddress && str->type != V_ASN1_IA5STRING) {
             BIO_printf(bio_err,
-                       "\nemailAddress type needs to be of type IA5STRING\n");
+                "\nemailAddress type needs to be of type IA5STRING\n");
             goto end;
         }
         if (str->type != V_ASN1_BMPSTRING && str->type != V_ASN1_UTF8STRING) {
             j = ASN1_PRINTABLE_type(str->data, str->length);
-            if ((j == V_ASN1_T61STRING && str->type != V_ASN1_T61STRING) ||
-                (j == V_ASN1_IA5STRING && str->type == V_ASN1_PRINTABLESTRING))
-            {
+            if ((j == V_ASN1_T61STRING && str->type != V_ASN1_T61STRING) || (j == V_ASN1_IA5STRING && str->type == V_ASN1_PRINTABLESTRING)) {
                 BIO_printf(bio_err,
-                           "\nThe string contains characters that are illegal for the ASN.1 type\n");
+                    "\nThe string contains characters that are illegal for the ASN.1 type\n");
                 goto end;
             }
         }
@@ -1552,8 +1590,8 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
         cv = sk_CONF_VALUE_value(policy, i); /* get the object id */
         if ((j = OBJ_txt2nid(cv->name)) == NID_undef) {
             BIO_printf(bio_err,
-                       "%s:unknown object type in 'policy' configuration\n",
-                       cv->name);
+                "%s:unknown object type in 'policy' configuration\n",
+                cv->name);
             goto end;
         }
         obj = OBJ_nid2obj(j);
@@ -1580,8 +1618,8 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
             } else if (strcmp(cv->value, "supplied") == 0) {
                 if (tne == NULL) {
                     BIO_printf(bio_err,
-                               "The %s field needed to be supplied and was missing\n",
-                               cv->name);
+                        "The %s field needed to be supplied and was missing\n",
+                        cv->name);
                     goto end;
                 } else {
                     push = tne;
@@ -1591,19 +1629,20 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
 
                 if (tne == NULL) {
                     BIO_printf(bio_err,
-                               "The mandatory %s field was missing\n",
-                               cv->name);
+                        "The mandatory %s field was missing\n",
+                        cv->name);
                     goto end;
                 }
 
                 last2 = -1;
 
- again2:
+            again2:
                 j = X509_NAME_get_index_by_OBJ(CAname, obj, last2);
                 if ((j < 0) && (last2 == -1)) {
                     BIO_printf(bio_err,
-                               "The %s field does not exist in the CA certificate,\n"
-                               "the 'policy' is misconfigured\n", cv->name);
+                        "The %s field does not exist in the CA certificate,\n"
+                        "the 'policy' is misconfigured\n",
+                        cv->name);
                     goto end;
                 }
                 if (j >= 0) {
@@ -1616,17 +1655,17 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
                 }
                 if (j < 0) {
                     BIO_printf(bio_err,
-                               "The %s field is different between\n"
-                               "CA certificate (%s) and the request (%s)\n",
-                               cv->name,
-                               ((str2 == NULL) ? "NULL" : (char *)str2->data),
-                               ((str == NULL) ? "NULL" : (char *)str->data));
+                        "The %s field is different between\n"
+                        "CA certificate (%s) and the request (%s)\n",
+                        cv->name,
+                        ((str2 == NULL) ? "NULL" : (char *)str2->data),
+                        ((str == NULL) ? "NULL" : (char *)str->data));
                     goto end;
                 }
             } else {
                 BIO_printf(bio_err,
-                           "%s:invalid type in 'policy' configuration\n",
-                           cv->value);
+                    "%s:invalid type in 'policy' configuration\n",
+                    cv->value);
                 goto end;
             }
 
@@ -1652,7 +1691,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
     /* We are now totally happy, lets make and sign the certificate */
     if (verbose)
         BIO_printf(bio_err,
-                   "Everything appears to be ok, creating and signing the certificate\n");
+            "Everything appears to be ok, creating and signing the certificate\n");
 
     if ((ret = X509_new_ex(app_get0_libctx(), app_get0_propq())) == NULL)
         goto end;
@@ -1688,15 +1727,15 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
 
     /* Initialize the context structure */
     X509V3_set_ctx(&ext_ctx, selfsign ? ret : x509,
-                   ret, NULL /* no need to give req, needed info is in ret */,
-                   NULL, X509V3_CTX_REPLACE);
+        ret, NULL /* no need to give req, needed info is in ret */,
+        NULL, X509V3_CTX_REPLACE);
     /* prepare fallback for AKID, but only if issuer cert equals subject cert */
     if (selfsign) {
         if (!X509V3_set_issuer_pkey(&ext_ctx, pkey))
             goto end;
         if (!cert_matches_key(ret, pkey))
             BIO_printf(bio_err,
-                       "Warning: Signature key and public key of cert do not match\n");
+                "Warning: Signature key and public key of cert do not match\n");
     }
 
     /* Lets add the extensions, if there are any */
@@ -1711,27 +1750,27 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
             /* Adds exts contained in the configuration file */
             if (!X509V3_EXT_add_nconf(extfile_conf, &ext_ctx, ext_sect, ret)) {
                 BIO_printf(bio_err,
-                           "Error adding certificate extensions from extfile section %s\n",
-                           ext_sect);
+                    "Error adding certificate extensions from extfile section %s\n",
+                    ext_sect);
                 goto end;
             }
             if (verbose)
                 BIO_printf(bio_err,
-                           "Successfully added extensions from file.\n");
+                    "Successfully added extensions from file.\n");
         } else if (ext_sect) {
             /* We found extensions to be set from config file */
             X509V3_set_nconf(&ext_ctx, lconf);
 
             if (!X509V3_EXT_add_nconf(lconf, &ext_ctx, ext_sect, ret)) {
                 BIO_printf(bio_err,
-                           "Error adding certificate extensions from config section %s\n",
-                           ext_sect);
+                    "Error adding certificate extensions from config section %s\n",
+                    ext_sect);
                 goto end;
             }
 
             if (verbose)
                 BIO_printf(bio_err,
-                           "Successfully added extensions from config\n");
+                    "Successfully added extensions from config\n");
         }
     }
 
@@ -1744,7 +1783,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
 
     if (verbose)
         BIO_printf(bio_err,
-                   "The subject name appears to be ok, checking database for clashes\n");
+            "The subject name appears to be ok, checking database for clashes\n");
 
     /* Build the correct Subject if no e-mail is wanted in the subject. */
     if (!email_dn) {
@@ -1761,8 +1800,9 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
         }
         i = -1;
         while ((i = X509_NAME_get_index_by_NID(dn_subject,
-                                               NID_pkcs9_emailAddress,
-                                               i)) >= 0) {
+                    NID_pkcs9_emailAddress,
+                    i))
+            >= 0) {
             tmpne = X509_NAME_delete_entry(dn_subject, i--);
             X509_NAME_ENTRY_free(tmpne);
         }
@@ -1809,18 +1849,18 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
         rrow = TXT_DB_get_by_index(db->db, DB_name, crow);
         if (rrow != NULL) {
             BIO_printf(bio_err,
-                       "ERROR:There is already a certificate for %s\n",
-                       row[DB_name]);
+                "ERROR:There is already a certificate for %s\n",
+                row[DB_name]);
         }
     }
     if (rrow == NULL) {
         rrow = TXT_DB_get_by_index(db->db, DB_serial, row);
         if (rrow != NULL) {
             BIO_printf(bio_err,
-                       "ERROR:Serial number %s has already been issued,\n",
-                       row[DB_serial]);
+                "ERROR:Serial number %s has already been issued,\n",
+                row[DB_serial]);
             BIO_printf(bio_err,
-                       "      check the database/serial_file for corruption\n");
+                "      check the database/serial_file for corruption\n");
         }
     }
 
@@ -1857,7 +1897,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
         if (p == NULL)
             p = "undef";
         BIO_printf(bio_err, "Subject Name  :%s\n", p);
-        ok = -1;                /* This is now a 'bad' error. */
+        ok = -1; /* This is now a 'bad' error. */
         goto end;
     }
 
@@ -1883,7 +1923,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
         buf[0] = '\0';
         if (fgets(buf, sizeof(buf), stdin) == NULL) {
             BIO_printf(bio_err,
-                       "CERTIFICATE WILL NOT BE CERTIFIED: I/O error\n");
+                "CERTIFICATE WILL NOT BE CERTIFIED: I/O error\n");
             ok = 0;
             goto end;
         }
@@ -1895,8 +1935,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
     }
 
     pktmp = X509_get0_pubkey(ret);
-    if (EVP_PKEY_missing_parameters(pktmp) &&
-        !EVP_PKEY_missing_parameters(pkey))
+    if (EVP_PKEY_missing_parameters(pktmp) && !EVP_PKEY_missing_parameters(pkey))
         EVP_PKEY_copy_parameters(pktmp, pkey);
 
     if (!do_X509_sign(ret, 0, pkey, dgst, sigopts, &ext_ctx))
@@ -1928,7 +1967,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
     }
     irow = NULL;
     ok = 1;
- end:
+end:
     if (ok != 1) {
         for (i = 0; i < DB_NUMBER; i++)
             OPENSSL_free(row[i]);
@@ -1957,14 +1996,14 @@ static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext)
 }
 
 static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
-                         X509 *x509, const char *dgst,
-                         STACK_OF(OPENSSL_STRING) *sigopts,
-                         STACK_OF(CONF_VALUE) *policy, CA_DB *db,
-                         BIGNUM *serial, const char *subj, unsigned long chtype,
-                         int multirdn, int email_dn, const char *startdate,
-                         const char *enddate, long days, const char *ext_sect,
-                         CONF *lconf, int verbose, unsigned long certopt,
-                         unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt)
+    X509 *x509, const char *dgst,
+    STACK_OF(OPENSSL_STRING) *sigopts,
+    STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+    BIGNUM *serial, const char *subj, unsigned long chtype,
+    int multirdn, int email_dn, const char *startdate,
+    const char *enddate, long days, const char *ext_sect,
+    CONF *lconf, int verbose, unsigned long certopt,
+    unsigned long nameopt, int default_op, int ext_copy, unsigned long dateopt)
 {
     STACK_OF(CONF_VALUE) *sk = NULL;
     LHASH_OF(CONF_VALUE) *parms = NULL;
@@ -2035,7 +2074,7 @@ static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
                 spki = NETSCAPE_SPKI_b64_decode(cv->value, -1);
                 if (spki == NULL) {
                     BIO_printf(bio_err,
-                               "unable to load Netscape SPKAC structure\n");
+                        "unable to load Netscape SPKAC structure\n");
                     goto end;
                 }
             }
@@ -2043,12 +2082,12 @@ static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
         }
 
         if (!X509_NAME_add_entry_by_NID(n, nid, chtype,
-                                        (unsigned char *)buf, -1, -1, 0))
+                (unsigned char *)buf, -1, -1, 0))
             goto end;
     }
     if (spki == NULL) {
         BIO_printf(bio_err, "Netscape SPKAC structure not found in %s\n",
-                   infile);
+            infile);
         goto end;
     }
 
@@ -2067,7 +2106,7 @@ static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
     if (j <= 0) {
         EVP_PKEY_free(pktmp);
         BIO_printf(bio_err,
-                   "signature verification failed on SPKAC public key\n");
+            "signature verification failed on SPKAC public key\n");
         goto end;
     }
     BIO_printf(bio_err, "Signature ok\n");
@@ -2075,10 +2114,10 @@ static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
     X509_REQ_set_pubkey(req, pktmp);
     EVP_PKEY_free(pktmp);
     ok = do_body(xret, pkey, x509, dgst, sigopts, policy, db, serial, subj,
-                 chtype, multirdn, email_dn, startdate, enddate, days, 1,
-                 verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
-                 ext_copy, 0, dateopt);
- end:
+        chtype, multirdn, email_dn, startdate, enddate, days, 1,
+        verbose, req, ext_sect, lconf, certopt, nameopt, default_op,
+        ext_copy, 0, dateopt);
+end:
     X509_REQ_free(req);
     CONF_free(parms);
     NETSCAPE_SPKI_free(spki);
@@ -2093,7 +2132,7 @@ static int check_time_format(const char *str)
 }
 
 static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
-                     const char *value)
+    const char *value)
 {
     const ASN1_TIME *tm = NULL;
     char *row[DB_NUMBER], **rrow, **irow;
@@ -2128,8 +2167,8 @@ static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
     rrow = TXT_DB_get_by_index(db->db, DB_serial, row);
     if (rrow == NULL) {
         BIO_printf(bio_err,
-                   "Adding Entry with serial number %s to DB for %s\n",
-                   row[DB_serial], row[DB_name]);
+            "Adding Entry with serial number %s to DB for %s\n",
+            row[DB_serial], row[DB_name]);
 
         /* We now just add it to the database as DB_TYPE_REV('V') */
         row[DB_type] = OPENSSL_strdup("V");
@@ -2174,11 +2213,11 @@ static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
         goto end;
     } else if (rev_type == REV_VALID) {
         BIO_printf(bio_err, "ERROR:Already present, serial number %s\n",
-                   row[DB_serial]);
+            row[DB_serial]);
         goto end;
     } else if (rrow[DB_type][0] == DB_TYPE_REV) {
         BIO_printf(bio_err, "ERROR:Already revoked, serial number %s\n",
-                   row[DB_serial]);
+            row[DB_serial]);
         goto end;
     } else {
         BIO_printf(bio_err, "Revoking Certificate %s.\n", rrow[DB_serial]);
@@ -2192,7 +2231,7 @@ static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
         rrow[DB_rev_date] = rev_str;
     }
     ok = 1;
- end:
+end:
     for (i = 0; i < DB_NUMBER; i++)
         OPENSSL_free(row[i]);
     return ok;
@@ -2239,26 +2278,26 @@ static int get_certificate_status(const char *serial, CA_DB *db)
         goto end;
     } else if (rrow[DB_type][0] == DB_TYPE_VAL) {
         BIO_printf(bio_err, "%s=Valid (%c)\n",
-                   row[DB_serial], rrow[DB_type][0]);
+            row[DB_serial], rrow[DB_type][0]);
         goto end;
     } else if (rrow[DB_type][0] == DB_TYPE_REV) {
         BIO_printf(bio_err, "%s=Revoked (%c)\n",
-                   row[DB_serial], rrow[DB_type][0]);
+            row[DB_serial], rrow[DB_type][0]);
         goto end;
     } else if (rrow[DB_type][0] == DB_TYPE_EXP) {
         BIO_printf(bio_err, "%s=Expired (%c)\n",
-                   row[DB_serial], rrow[DB_type][0]);
+            row[DB_serial], rrow[DB_type][0]);
         goto end;
     } else if (rrow[DB_type][0] == DB_TYPE_SUSP) {
         BIO_printf(bio_err, "%s=Suspended (%c)\n",
-                   row[DB_serial], rrow[DB_type][0]);
+            row[DB_serial], rrow[DB_type][0]);
         goto end;
     } else {
         BIO_printf(bio_err, "%s=Unknown (%c).\n",
-                   row[DB_serial], rrow[DB_type][0]);
+            row[DB_serial], rrow[DB_type][0]);
         ok = -1;
     }
- end:
+end:
     for (i = 0; i < DB_NUMBER; i++) {
         OPENSSL_free(row[i]);
     }
@@ -2385,8 +2424,8 @@ static char *make_revocation_str(REVINFO_TYPE rev_type, const char *rev_arg)
         /* Argument is the key compromise time  */
         if (!ASN1_GENERALIZEDTIME_set_string(NULL, rev_arg)) {
             BIO_printf(bio_err,
-                       "Invalid time format %s. Need YYYYMMDDHHMMSSZ\n",
-                       rev_arg);
+                "Invalid time format %s. Need YYYYMMDDHHMMSSZ\n",
+                rev_arg);
             return NULL;
         }
         other = rev_arg;
@@ -2460,13 +2499,11 @@ static int make_revoked(X509_REVOKED *rev, const char *str)
     }
 
     if (rev && comp_time) {
-        if (X509_REVOKED_add1_ext_i2d
-            (rev, NID_invalidity_date, comp_time, 0, 0) <= 0)
+        if (X509_REVOKED_add1_ext_i2d(rev, NID_invalidity_date, comp_time, 0, 0) <= 0)
             goto end;
     }
     if (rev && hold) {
-        if (X509_REVOKED_add1_ext_i2d
-            (rev, NID_hold_instruction_code, hold, 0, 0) <= 0)
+        if (X509_REVOKED_add1_ext_i2d(rev, NID_hold_instruction_code, hold, 0, 0) <= 0)
             goto end;
     }
 
@@ -2475,7 +2512,7 @@ static int make_revoked(X509_REVOKED *rev, const char *str)
     else
         ret = 1;
 
- end:
+end:
 
     OPENSSL_free(tmp);
     ASN1_OBJECT_free(hold);
@@ -2528,7 +2565,7 @@ static int old_entry_print(const ASN1_OBJECT *obj, const ASN1_STRING *str)
 }
 
 int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
-                   ASN1_GENERALIZEDTIME **pinvtm, const char *str)
+    ASN1_GENERALIZEDTIME **pinvtm, const char *str)
 {
     char *tmp;
     char *rtime_str, *reason_str = NULL, *arg_str = NULL, *p;
@@ -2630,7 +2667,7 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
 
     ret = 1;
 
- end:
+end:
 
     OPENSSL_free(tmp);
     ASN1_GENERALIZEDTIME_free(comp_time);
diff --git a/apps/ciphers.c b/apps/ciphers.c
index c33685d8ced6d..dc52b9f912ab9 100644
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -28,58 +28,61 @@ typedef enum OPTION_choice {
     OPT_PSK,
     OPT_SRP,
     OPT_CIPHERSUITES,
-    OPT_V, OPT_UPPER_V, OPT_S, OPT_PROV_ENUM
+    OPT_V,
+    OPT_UPPER_V,
+    OPT_S,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS ciphers_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cipher]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [cipher]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 
     OPT_SECTION("Output"),
-    {"v", OPT_V, '-', "Verbose listing of the SSL/TLS ciphers"},
-    {"V", OPT_UPPER_V, '-', "Even more verbose"},
-    {"stdname", OPT_STDNAME, '-', "Show standard cipher names"},
-    {"convert", OPT_CONVERT, 's', "Convert standard name into OpenSSL name"},
+    { "v", OPT_V, '-', "Verbose listing of the SSL/TLS ciphers" },
+    { "V", OPT_UPPER_V, '-', "Even more verbose" },
+    { "stdname", OPT_STDNAME, '-', "Show standard cipher names" },
+    { "convert", OPT_CONVERT, 's', "Convert standard name into OpenSSL name" },
 
     OPT_SECTION("Cipher specification"),
-    {"s", OPT_S, '-', "Only supported ciphers"},
+    { "s", OPT_S, '-', "Only supported ciphers" },
 #ifndef OPENSSL_NO_SSL3
-    {"ssl3", OPT_SSL3, '-', "Ciphers compatible with SSL3"},
+    { "ssl3", OPT_SSL3, '-', "Ciphers compatible with SSL3" },
 #endif
 #ifndef OPENSSL_NO_TLS1
-    {"tls1", OPT_TLS1, '-', "Ciphers compatible with TLS1"},
+    { "tls1", OPT_TLS1, '-', "Ciphers compatible with TLS1" },
 #endif
 #ifndef OPENSSL_NO_TLS1_1
-    {"tls1_1", OPT_TLS1_1, '-', "Ciphers compatible with TLS1.1"},
+    { "tls1_1", OPT_TLS1_1, '-', "Ciphers compatible with TLS1.1" },
 #endif
 #ifndef OPENSSL_NO_TLS1_2
-    {"tls1_2", OPT_TLS1_2, '-', "Ciphers compatible with TLS1.2"},
+    { "tls1_2", OPT_TLS1_2, '-', "Ciphers compatible with TLS1.2" },
 #endif
 #ifndef OPENSSL_NO_TLS1_3
-    {"tls1_3", OPT_TLS1_3, '-', "Ciphers compatible with TLS1.3"},
+    { "tls1_3", OPT_TLS1_3, '-', "Ciphers compatible with TLS1.3" },
 #endif
 #ifndef OPENSSL_NO_PSK
-    {"psk", OPT_PSK, '-', "Include ciphersuites requiring PSK"},
+    { "psk", OPT_PSK, '-', "Include ciphersuites requiring PSK" },
 #endif
 #ifndef OPENSSL_NO_SRP
-    {"srp", OPT_SRP, '-', "(deprecated) Include ciphersuites requiring SRP"},
+    { "srp", OPT_SRP, '-', "(deprecated) Include ciphersuites requiring SRP" },
 #endif
-    {"ciphersuites", OPT_CIPHERSUITES, 's',
-     "Configure the TLSv1.3 ciphersuites to use"},
+    { "ciphersuites", OPT_CIPHERSUITES, 's',
+        "Configure the TLSv1.3 ciphersuites to use" },
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"cipher", 0, 0, "Cipher string to decode (optional)"},
-    {NULL}
+    { "cipher", 0, 0, "Cipher string to decode (optional)" },
+    { NULL }
 };
 
 #ifndef OPENSSL_NO_PSK
 static unsigned int dummy_psk(SSL *ssl, const char *hint, char *identity,
-                              unsigned int max_identity_len,
-                              unsigned char *psk,
-                              unsigned int max_psk_len)
+    unsigned int max_identity_len,
+    unsigned char *psk,
+    unsigned int max_psk_len)
 {
     return 0;
 }
@@ -110,7 +113,7 @@ int ciphers_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -181,7 +184,7 @@ int ciphers_main(int argc, char **argv)
 
     if (convert != NULL) {
         BIO_printf(bio_out, "OpenSSL cipher name: %s\n",
-                   OPENSSL_cipher_name(convert));
+            OPENSSL_cipher_name(convert));
         ret = 0;
         goto end;
     }
@@ -273,9 +276,9 @@ int ciphers_main(int argc, char **argv)
 
     ret = 0;
     goto end;
- err:
+err:
     ERR_print_errors(bio_err);
- end:
+end:
     if (use_supported)
         sk_SSL_CIPHER_free(sk);
     SSL_CTX_free(ctx);
diff --git a/apps/cmp.c b/apps/cmp.c
index 291d62bfcb80b..f1af0b6c2b42e 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -24,10 +24,10 @@
 
 /* tweaks needed due to missing unistd.h on Windows */
 #if defined(_WIN32) && !defined(__BORLANDC__)
-# define access _access
+#define access _access
 #endif
 #ifndef F_OK
-# define F_OK 0
+#define F_OK 0
 #endif
 
 #include <openssl/ui.h>
@@ -151,7 +151,7 @@ static int opt_revreason = CRL_REASON_NONE;
 /* credentials format */
 static char *opt_certform_s = "PEM";
 static int opt_certform = FORMAT_PEM;
-/* 
+/*
  * DER format is the preferred choice for saving a CRL because it allows for
  * more efficient storage, especially when dealing with large CRLs.
  */
@@ -229,40 +229,85 @@ static X509_VERIFY_PARAM *vpm = NULL;
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_CONFIG, OPT_SECTION, OPT_VERBOSITY,
-
-    OPT_CMD, OPT_INFOTYPE, OPT_PROFILE, OPT_GENINFO,
-    OPT_TEMPLATE, OPT_KEYSPEC,
-
-    OPT_NEWKEY, OPT_NEWKEYPASS, OPT_CENTRALKEYGEN,
-    OPT_NEWKEYOUT, OPT_SUBJECT,
-    OPT_DAYS, OPT_REQEXTS,
-    OPT_SANS, OPT_SAN_NODEFAULT,
-    OPT_POLICIES, OPT_POLICY_OIDS, OPT_POLICY_OIDS_CRITICAL,
-    OPT_POPO, OPT_CSR,
-    OPT_OUT_TRUSTED, OPT_IMPLICIT_CONFIRM, OPT_DISABLE_CONFIRM,
-    OPT_CERTOUT, OPT_CHAINOUT,
-
-    OPT_OLDCERT, OPT_ISSUER, OPT_SERIAL, OPT_REVREASON,
+    OPT_CONFIG,
+    OPT_SECTION,
+    OPT_VERBOSITY,
+
+    OPT_CMD,
+    OPT_INFOTYPE,
+    OPT_PROFILE,
+    OPT_GENINFO,
+    OPT_TEMPLATE,
+    OPT_KEYSPEC,
+
+    OPT_NEWKEY,
+    OPT_NEWKEYPASS,
+    OPT_CENTRALKEYGEN,
+    OPT_NEWKEYOUT,
+    OPT_SUBJECT,
+    OPT_DAYS,
+    OPT_REQEXTS,
+    OPT_SANS,
+    OPT_SAN_NODEFAULT,
+    OPT_POLICIES,
+    OPT_POLICY_OIDS,
+    OPT_POLICY_OIDS_CRITICAL,
+    OPT_POPO,
+    OPT_CSR,
+    OPT_OUT_TRUSTED,
+    OPT_IMPLICIT_CONFIRM,
+    OPT_DISABLE_CONFIRM,
+    OPT_CERTOUT,
+    OPT_CHAINOUT,
+
+    OPT_OLDCERT,
+    OPT_ISSUER,
+    OPT_SERIAL,
+    OPT_REVREASON,
 
 #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
-    OPT_SERVER, OPT_PROXY, OPT_NO_PROXY,
+    OPT_SERVER,
+    OPT_PROXY,
+    OPT_NO_PROXY,
 #endif
-    OPT_RECIPIENT, OPT_PATH,
-    OPT_KEEP_ALIVE, OPT_MSG_TIMEOUT, OPT_TOTAL_TIMEOUT,
-
-    OPT_TRUSTED, OPT_UNTRUSTED, OPT_SRVCERT,
+    OPT_RECIPIENT,
+    OPT_PATH,
+    OPT_KEEP_ALIVE,
+    OPT_MSG_TIMEOUT,
+    OPT_TOTAL_TIMEOUT,
+
+    OPT_TRUSTED,
+    OPT_UNTRUSTED,
+    OPT_SRVCERT,
     OPT_EXPECT_SENDER,
-    OPT_IGNORE_KEYUSAGE, OPT_UNPROTECTED_ERRORS, OPT_NO_CACHE_EXTRACERTS,
-    OPT_SRVCERTOUT, OPT_EXTRACERTSOUT, OPT_CACERTSOUT,
-    OPT_OLDWITHOLD, OPT_NEWWITHNEW, OPT_NEWWITHOLD, OPT_OLDWITHNEW,
-    OPT_CRLCERT, OPT_OLDCRL, OPT_CRLOUT,
-
-    OPT_REF, OPT_SECRET, OPT_CERT, OPT_OWN_TRUSTED, OPT_KEY, OPT_KEYPASS,
-    OPT_DIGEST, OPT_MAC, OPT_EXTRACERTS,
+    OPT_IGNORE_KEYUSAGE,
+    OPT_UNPROTECTED_ERRORS,
+    OPT_NO_CACHE_EXTRACERTS,
+    OPT_SRVCERTOUT,
+    OPT_EXTRACERTSOUT,
+    OPT_CACERTSOUT,
+    OPT_OLDWITHOLD,
+    OPT_NEWWITHNEW,
+    OPT_NEWWITHOLD,
+    OPT_OLDWITHNEW,
+    OPT_CRLCERT,
+    OPT_OLDCRL,
+    OPT_CRLOUT,
+
+    OPT_REF,
+    OPT_SECRET,
+    OPT_CERT,
+    OPT_OWN_TRUSTED,
+    OPT_KEY,
+    OPT_KEYPASS,
+    OPT_DIGEST,
+    OPT_MAC,
+    OPT_EXTRACERTS,
     OPT_UNPROTECTED_REQUESTS,
 
-    OPT_CERTFORM, OPT_CRLFORM, OPT_KEYFORM,
+    OPT_CERTFORM,
+    OPT_CRLFORM,
+    OPT_KEYFORM,
     OPT_OTHERPASS,
 #ifndef OPENSSL_NO_ENGINE
     OPT_ENGINE,
@@ -271,368 +316,395 @@ typedef enum OPTION_choice {
     OPT_R_ENUM,
 
 #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
-    OPT_TLS_USED, OPT_TLS_CERT, OPT_TLS_KEY,
+    OPT_TLS_USED,
+    OPT_TLS_CERT,
+    OPT_TLS_KEY,
     OPT_TLS_KEYPASS,
-    OPT_TLS_EXTRA, OPT_TLS_TRUSTED, OPT_TLS_HOST,
+    OPT_TLS_EXTRA,
+    OPT_TLS_TRUSTED,
+    OPT_TLS_HOST,
 #endif
 
-    OPT_BATCH, OPT_REPEAT,
-    OPT_REQIN, OPT_REQIN_NEW_TID, OPT_REQOUT, OPT_REQOUT_ONLY,
-    OPT_RSPIN, OPT_RSPOUT,
+    OPT_BATCH,
+    OPT_REPEAT,
+    OPT_REQIN,
+    OPT_REQIN_NEW_TID,
+    OPT_REQOUT,
+    OPT_REQOUT_ONLY,
+    OPT_RSPIN,
+    OPT_RSPOUT,
     OPT_USE_MOCK_SRV,
 
 #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
-    OPT_PORT, OPT_MAX_MSGS,
+    OPT_PORT,
+    OPT_MAX_MSGS,
 #endif
-    OPT_SRV_REF, OPT_SRV_SECRET,
-    OPT_SRV_CERT, OPT_SRV_KEY, OPT_SRV_KEYPASS,
-    OPT_SRV_TRUSTED, OPT_SRV_UNTRUSTED,
-    OPT_REF_CERT, OPT_RSP_CERT, OPT_RSP_KEY, OPT_RSP_KEYPASS,
-    OPT_RSP_CRL, OPT_RSP_EXTRACERTS, OPT_RSP_CAPUBS,
-    OPT_RSP_NEWWITHNEW, OPT_RSP_NEWWITHOLD, OPT_RSP_OLDWITHNEW,
-    OPT_POLL_COUNT, OPT_CHECK_AFTER,
+    OPT_SRV_REF,
+    OPT_SRV_SECRET,
+    OPT_SRV_CERT,
+    OPT_SRV_KEY,
+    OPT_SRV_KEYPASS,
+    OPT_SRV_TRUSTED,
+    OPT_SRV_UNTRUSTED,
+    OPT_REF_CERT,
+    OPT_RSP_CERT,
+    OPT_RSP_KEY,
+    OPT_RSP_KEYPASS,
+    OPT_RSP_CRL,
+    OPT_RSP_EXTRACERTS,
+    OPT_RSP_CAPUBS,
+    OPT_RSP_NEWWITHNEW,
+    OPT_RSP_NEWWITHOLD,
+    OPT_RSP_OLDWITHNEW,
+    OPT_POLL_COUNT,
+    OPT_CHECK_AFTER,
     OPT_GRANT_IMPLICITCONF,
-    OPT_PKISTATUS, OPT_FAILURE,
-    OPT_FAILUREBITS, OPT_STATUSSTRING,
-    OPT_SEND_ERROR, OPT_SEND_UNPROTECTED,
-    OPT_SEND_UNPROT_ERR, OPT_ACCEPT_UNPROTECTED,
-    OPT_ACCEPT_UNPROT_ERR, OPT_ACCEPT_RAVERIFIED,
+    OPT_PKISTATUS,
+    OPT_FAILURE,
+    OPT_FAILUREBITS,
+    OPT_STATUSSTRING,
+    OPT_SEND_ERROR,
+    OPT_SEND_UNPROTECTED,
+    OPT_SEND_UNPROT_ERR,
+    OPT_ACCEPT_UNPROTECTED,
+    OPT_ACCEPT_UNPROT_ERR,
+    OPT_ACCEPT_RAVERIFIED,
 
     OPT_V_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS cmp_options[] = {
     /* entries must be in the same order as enumerated above!! */
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"config", OPT_CONFIG, 's',
-     "Configuration file to use. \"\" = none. Default from env variable OPENSSL_CONF"},
-    {"section", OPT_SECTION, 's',
-     "Section(s) in config file to get options from. \"\" = 'default'. Default 'cmp'"},
-    {"verbosity", OPT_VERBOSITY, 'N',
-     "Log level; 3=ERR, 4=WARN, 6=INFO, 7=DEBUG, 8=TRACE. Default 6 = INFO"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "config", OPT_CONFIG, 's',
+        "Configuration file to use. \"\" = none. Default from env variable OPENSSL_CONF" },
+    { "section", OPT_SECTION, 's',
+        "Section(s) in config file to get options from. \"\" = 'default'. Default 'cmp'" },
+    { "verbosity", OPT_VERBOSITY, 'N',
+        "Log level; 3=ERR, 4=WARN, 6=INFO, 7=DEBUG, 8=TRACE. Default 6 = INFO" },
 
     OPT_SECTION("Generic message"),
-    {"cmd", OPT_CMD, 's', "CMP request to send: ir/cr/kur/p10cr/rr/genm"},
-    {"infotype", OPT_INFOTYPE, 's',
-     "InfoType name for requesting specific info in genm, with specific support"},
-    {OPT_MORE_STR, 0, 0,
-     "for 'caCerts' and 'rootCaCert'"},
-    {"profile", OPT_PROFILE, 's',
-     "Certificate profile name to place in generalInfo field of request PKIHeader"},
-    {"geninfo", OPT_GENINFO, 's',
-     "Comma-separated list of OID and value to place in generalInfo PKIHeader"},
-    {OPT_MORE_STR, 0, 0,
-     "of form <OID>:int:<n> or <OID>:str:<s>, e.g. \'1.2.3.4:int:56789, id-kp:str:name'"},
+    { "cmd", OPT_CMD, 's', "CMP request to send: ir/cr/kur/p10cr/rr/genm" },
+    { "infotype", OPT_INFOTYPE, 's',
+        "InfoType name for requesting specific info in genm, with specific support" },
+    { OPT_MORE_STR, 0, 0,
+        "for 'caCerts' and 'rootCaCert'" },
+    { "profile", OPT_PROFILE, 's',
+        "Certificate profile name to place in generalInfo field of request PKIHeader" },
+    { "geninfo", OPT_GENINFO, 's',
+        "Comma-separated list of OID and value to place in generalInfo PKIHeader" },
+    { OPT_MORE_STR, 0, 0,
+        "of form <OID>:int:<n> or <OID>:str:<s>, e.g. \'1.2.3.4:int:56789, id-kp:str:name'" },
     { "template", OPT_TEMPLATE, 's',
-      "File to save certTemplate received in genp of type certReqTemplate"},
+        "File to save certTemplate received in genp of type certReqTemplate" },
     { "keyspec", OPT_KEYSPEC, 's',
-      "Optional file to save Key specification received in genp of type certReqTemplate"},
+        "Optional file to save Key specification received in genp of type certReqTemplate" },
 
     OPT_SECTION("Certificate enrollment"),
-    {"newkey", OPT_NEWKEY, 's',
-     "Private or public key for the requested cert. Default: CSR key or client key"},
-    {"newkeypass", OPT_NEWKEYPASS, 's', "New private key pass phrase source"},
-    {"centralkeygen", OPT_CENTRALKEYGEN, '-',
-     "Request central (server-side) key generation. Default is local generation"},
-    {"newkeyout", OPT_NEWKEYOUT, 's',
-     "File to save centrally generated key, in PEM format"},
-    {"subject", OPT_SUBJECT, 's',
-     "Distinguished Name (DN) of subject to use in the requested cert template"},
-    {OPT_MORE_STR, 0, 0,
-     "For kur, default is subject of -csr arg or reference cert (see -oldcert)"},
-    {OPT_MORE_STR, 0, 0,
-     "this default is used for ir and cr only if no Subject Alt Names are set"},
-    {"days", OPT_DAYS, 'N',
-     "Requested validity time of the new certificate in number of days"},
-    {"reqexts", OPT_REQEXTS, 's',
-     "Name of config file section defining certificate request extensions."},
-    {OPT_MORE_STR, 0, 0,
-     "Augments or replaces any extensions contained CSR given with -csr"},
-    {"sans", OPT_SANS, 's',
-     "Subject Alt Names (IPADDR/DNS/URI) to add as (critical) cert req extension"},
-    {"san_nodefault", OPT_SAN_NODEFAULT, '-',
-     "Do not take default SANs from reference certificate (see -oldcert)"},
-    {"policies", OPT_POLICIES, 's',
-     "Name of config file section defining policies certificate request extension"},
-    {"policy_oids", OPT_POLICY_OIDS, 's',
-     "Policy OID(s) to add as policies certificate request extension"},
-    {"policy_oids_critical", OPT_POLICY_OIDS_CRITICAL, '-',
-     "Flag the policy OID(s) given with -policy_oids as critical"},
-    {"popo", OPT_POPO, 'n',
-     "Proof-of-Possession (POPO) method to use for ir/cr/kur where"},
-    {OPT_MORE_STR, 0, 0,
-     "-1 = NONE, 0 = RAVERIFIED, 1 = SIGNATURE (default), 2 = KEYENC"},
-    {"csr", OPT_CSR, 's',
-     "PKCS#10 CSR file in PEM or DER format to convert or to use in p10cr"},
-    {"out_trusted", OPT_OUT_TRUSTED, 's',
-     "Certificates to trust when verifying newly enrolled certificates"},
-    {"implicit_confirm", OPT_IMPLICIT_CONFIRM, '-',
-     "Request implicit confirmation of newly enrolled certificates"},
-    {"disable_confirm", OPT_DISABLE_CONFIRM, '-',
-     "Do not confirm newly enrolled certificate w/o requesting implicit"},
-    {OPT_MORE_STR, 0, 0,
-     "confirmation. WARNING: This leads to behavior violating RFC 4210"},
-    {"certout", OPT_CERTOUT, 's',
-     "File to save newly enrolled certificate"},
-    {"chainout", OPT_CHAINOUT, 's',
-     "File to save the chain of newly enrolled certificate"},
+    { "newkey", OPT_NEWKEY, 's',
+        "Private or public key for the requested cert. Default: CSR key or client key" },
+    { "newkeypass", OPT_NEWKEYPASS, 's', "New private key pass phrase source" },
+    { "centralkeygen", OPT_CENTRALKEYGEN, '-',
+        "Request central (server-side) key generation. Default is local generation" },
+    { "newkeyout", OPT_NEWKEYOUT, 's',
+        "File to save centrally generated key, in PEM format" },
+    { "subject", OPT_SUBJECT, 's',
+        "Distinguished Name (DN) of subject to use in the requested cert template" },
+    { OPT_MORE_STR, 0, 0,
+        "For kur, default is subject of -csr arg or reference cert (see -oldcert)" },
+    { OPT_MORE_STR, 0, 0,
+        "this default is used for ir and cr only if no Subject Alt Names are set" },
+    { "days", OPT_DAYS, 'N',
+        "Requested validity time of the new certificate in number of days" },
+    { "reqexts", OPT_REQEXTS, 's',
+        "Name of config file section defining certificate request extensions." },
+    { OPT_MORE_STR, 0, 0,
+        "Augments or replaces any extensions contained CSR given with -csr" },
+    { "sans", OPT_SANS, 's',
+        "Subject Alt Names (IPADDR/DNS/URI) to add as (critical) cert req extension" },
+    { "san_nodefault", OPT_SAN_NODEFAULT, '-',
+        "Do not take default SANs from reference certificate (see -oldcert)" },
+    { "policies", OPT_POLICIES, 's',
+        "Name of config file section defining policies certificate request extension" },
+    { "policy_oids", OPT_POLICY_OIDS, 's',
+        "Policy OID(s) to add as policies certificate request extension" },
+    { "policy_oids_critical", OPT_POLICY_OIDS_CRITICAL, '-',
+        "Flag the policy OID(s) given with -policy_oids as critical" },
+    { "popo", OPT_POPO, 'n',
+        "Proof-of-Possession (POPO) method to use for ir/cr/kur where" },
+    { OPT_MORE_STR, 0, 0,
+        "-1 = NONE, 0 = RAVERIFIED, 1 = SIGNATURE (default), 2 = KEYENC" },
+    { "csr", OPT_CSR, 's',
+        "PKCS#10 CSR file in PEM or DER format to convert or to use in p10cr" },
+    { "out_trusted", OPT_OUT_TRUSTED, 's',
+        "Certificates to trust when verifying newly enrolled certificates" },
+    { "implicit_confirm", OPT_IMPLICIT_CONFIRM, '-',
+        "Request implicit confirmation of newly enrolled certificates" },
+    { "disable_confirm", OPT_DISABLE_CONFIRM, '-',
+        "Do not confirm newly enrolled certificate w/o requesting implicit" },
+    { OPT_MORE_STR, 0, 0,
+        "confirmation. WARNING: This leads to behavior violating RFC 9810" },
+    { "certout", OPT_CERTOUT, 's',
+        "File to save newly enrolled certificate" },
+    { "chainout", OPT_CHAINOUT, 's',
+        "File to save the chain of newly enrolled certificate" },
 
     OPT_SECTION("Certificate enrollment and revocation"),
 
-    {"oldcert", OPT_OLDCERT, 's',
-     "Certificate to be updated (defaulting to -cert) or to be revoked in rr;"},
-    {OPT_MORE_STR, 0, 0,
-     "also used as reference (defaulting to -cert) for subject DN and SANs."},
-    {OPT_MORE_STR, 0, 0,
-     "Issuer is used as recipient unless -recipient, -srvcert, or -issuer given"},
-    {"issuer", OPT_ISSUER, 's',
-     "DN of the issuer to place in the certificate template of ir/cr/kur/rr;"},
-    {OPT_MORE_STR, 0, 0,
-     "also used as recipient if neither -recipient nor -srvcert are given"},
-    {"serial", OPT_SERIAL, 's',
-     "Serial number of certificate to be revoked in revocation request (rr)"},
-    {"revreason", OPT_REVREASON, 'n',
-     "Reason code to include in revocation request (rr); possible values:"},
-    {OPT_MORE_STR, 0, 0,
-     "0..6, 8..10 (see RFC5280, 5.3.1) or -1. Default -1 = none included"},
+    { "oldcert", OPT_OLDCERT, 's',
+        "Certificate to be updated (defaulting to -cert) or to be revoked in rr;" },
+    { OPT_MORE_STR, 0, 0,
+        "also used as reference (defaulting to -cert) for subject DN and SANs." },
+    { OPT_MORE_STR, 0, 0,
+        "Issuer is used as recipient unless -recipient, -srvcert, or -issuer given" },
+    { "issuer", OPT_ISSUER, 's',
+        "DN of the issuer to place in the certificate template of ir/cr/kur/rr;" },
+    { OPT_MORE_STR, 0, 0,
+        "also used as recipient if neither -recipient nor -srvcert are given" },
+    { "serial", OPT_SERIAL, 's',
+        "Serial number of certificate to be revoked in revocation request (rr)" },
+    { "revreason", OPT_REVREASON, 'n',
+        "Reason code to include in revocation request (rr); possible values:" },
+    { OPT_MORE_STR, 0, 0,
+        "0..6, 8..10 (see RFC5280, 5.3.1) or -1. Default -1 = none included" },
 
     OPT_SECTION("Message transfer"),
 #if defined(OPENSSL_NO_SOCK) || defined(OPENSSL_NO_HTTP)
-    {OPT_MORE_STR, 0, 0,
-     "NOTE: -server, -proxy, and -no_proxy not supported due to no-sock/no-http build"},
+    { OPT_MORE_STR, 0, 0,
+        "NOTE: -server, -proxy, and -no_proxy not supported due to no-sock/no-http build" },
 #else
-    {"server", OPT_SERVER, 's',
-     "[http[s]://]address[:port][/path] of CMP server. Default port 80 or 443."},
-    {OPT_MORE_STR, 0, 0,
-     "address may be a DNS name or an IP address; path can be overridden by -path"},
-    {"proxy", OPT_PROXY, 's',
-     "[http[s]://]address[:port][/path] of HTTP(S) proxy to use; path is ignored"},
-    {"no_proxy", OPT_NO_PROXY, 's',
-     "List of addresses of servers not to use HTTP(S) proxy for"},
-    {OPT_MORE_STR, 0, 0,
-     "Default from environment variable 'no_proxy', else 'NO_PROXY', else none"},
+    { "server", OPT_SERVER, 's',
+        "[http[s]://]address[:port][/path] of CMP server. Default port 80 or 443." },
+    { OPT_MORE_STR, 0, 0,
+        "address may be a DNS name or an IP address; path can be overridden by -path" },
+    { "proxy", OPT_PROXY, 's',
+        "[http[s]://]address[:port][/path] of HTTP(S) proxy to use; path is ignored" },
+    { "no_proxy", OPT_NO_PROXY, 's',
+        "List of addresses of servers not to use HTTP(S) proxy for" },
+    { OPT_MORE_STR, 0, 0,
+        "Default from environment variable 'no_proxy', else 'NO_PROXY', else none" },
 #endif
-    {"recipient", OPT_RECIPIENT, 's',
-     "DN of CA. Default: subject of -srvcert, -issuer, issuer of -oldcert or -cert"},
-    {"path", OPT_PATH, 's',
-     "HTTP path (aka CMP alias) at the CMP server. Default from -server, else \"/\""},
-    {"keep_alive", OPT_KEEP_ALIVE, 'N',
-     "Persistent HTTP connections. 0: no, 1 (the default): request, 2: require"},
-    {"msg_timeout", OPT_MSG_TIMEOUT, 'N',
-     "Number of seconds allowed per CMP message round trip, or 0 for infinite"},
-    {"total_timeout", OPT_TOTAL_TIMEOUT, 'N',
-     "Overall time an enrollment incl. polling may take. Default 0 = infinite"},
+    { "recipient", OPT_RECIPIENT, 's',
+        "DN of CA. Default: subject of -srvcert, -issuer, issuer of -oldcert or -cert" },
+    { "path", OPT_PATH, 's',
+        "HTTP path (aka CMP alias) at the CMP server. Default from -server, else \"/\"" },
+    { "keep_alive", OPT_KEEP_ALIVE, 'N',
+        "Persistent HTTP connections. 0: no, 1 (the default): request, 2: require" },
+    { "msg_timeout", OPT_MSG_TIMEOUT, 'N',
+        "Number of seconds allowed per CMP message round trip, or 0 for infinite" },
+    { "total_timeout", OPT_TOTAL_TIMEOUT, 'N',
+        "Overall time an enrollment incl. polling may take. Default 0 = infinite" },
 
     OPT_SECTION("Server authentication"),
-    {"trusted", OPT_TRUSTED, 's',
-     "Certificates to use as trust anchors when verifying signed CMP responses"},
-    {OPT_MORE_STR, 0, 0, "unless -srvcert is given"},
-    {"untrusted", OPT_UNTRUSTED, 's',
-     "Intermediate CA certs for chain construction for CMP/TLS/enrolled certs"},
-    {"srvcert", OPT_SRVCERT, 's',
-     "Server cert to pin and trust directly when verifying signed CMP responses"},
-    {"expect_sender", OPT_EXPECT_SENDER, 's',
-     "DN of expected sender of responses. Defaults to subject of -srvcert, if any"},
-    {"ignore_keyusage", OPT_IGNORE_KEYUSAGE, '-',
-     "Ignore CMP signer cert key usage, else 'digitalSignature' must be allowed"},
-    {"unprotected_errors", OPT_UNPROTECTED_ERRORS, '-',
-     "Accept missing or invalid protection of regular error messages and negative"},
-    {OPT_MORE_STR, 0, 0,
-     "certificate responses (ip/cp/kup), revocation responses (rp), and PKIConf"},
-    {OPT_MORE_STR, 0, 0,
-     "WARNING: This setting leads to behavior allowing violation of RFC 4210"},
-    {"no_cache_extracerts", OPT_NO_CACHE_EXTRACERTS, '-',
-     "Do not keep certificates received in the extraCerts CMP message field"},
+    { "trusted", OPT_TRUSTED, 's',
+        "Certificates to use as trust anchors when verifying signed CMP responses" },
+    { OPT_MORE_STR, 0, 0, "unless -srvcert is given" },
+    { "untrusted", OPT_UNTRUSTED, 's',
+        "Intermediate CA certs for chain construction for CMP/TLS/enrolled certs" },
+    { "srvcert", OPT_SRVCERT, 's',
+        "Server cert to pin and trust directly when verifying signed CMP responses" },
+    { "expect_sender", OPT_EXPECT_SENDER, 's',
+        "DN of expected sender of responses. Defaults to subject of -srvcert, if any" },
+    { "ignore_keyusage", OPT_IGNORE_KEYUSAGE, '-',
+        "Ignore CMP signer cert key usage, else 'digitalSignature' must be allowed" },
+    { "unprotected_errors", OPT_UNPROTECTED_ERRORS, '-',
+        "Accept missing or invalid protection of regular error messages and negative" },
+    { OPT_MORE_STR, 0, 0,
+        "certificate responses (ip/cp/kup), revocation responses (rp), and PKIConf" },
+    { OPT_MORE_STR, 0, 0,
+        "WARNING: This setting leads to behavior allowing violation of RFC 9810" },
+    { "no_cache_extracerts", OPT_NO_CACHE_EXTRACERTS, '-',
+        "Do not keep certificates received in the extraCerts CMP message field" },
     { "srvcertout", OPT_SRVCERTOUT, 's',
-      "File to save the server cert used and validated for CMP response protection"},
-    {"extracertsout", OPT_EXTRACERTSOUT, 's',
-     "File to save extra certificates received in the extraCerts field"},
-    {"cacertsout", OPT_CACERTSOUT, 's',
-     "File to save CA certs received in caPubs field or genp with id-it-caCerts"},
+        "File to save the server cert used and validated for CMP response protection" },
+    { "extracertsout", OPT_EXTRACERTSOUT, 's',
+        "File to save extra certificates received in the extraCerts field" },
+    { "cacertsout", OPT_CACERTSOUT, 's',
+        "File to save CA certs received in caPubs field or genp with id-it-caCerts" },
     { "oldwithold", OPT_OLDWITHOLD, 's',
-      "Root CA certificate to request update for in genm of type rootCaCert"},
+        "Root CA certificate to request update for in genm of type rootCaCert" },
     { "newwithnew", OPT_NEWWITHNEW, 's',
-      "File to save NewWithNew cert received in genp of type rootCaKeyUpdate"},
+        "File to save NewWithNew cert received in genp of type rootCaKeyUpdate" },
     { "newwithold", OPT_NEWWITHOLD, 's',
-      "File to save NewWithOld cert received in genp of type rootCaKeyUpdate"},
+        "File to save NewWithOld cert received in genp of type rootCaKeyUpdate" },
     { "oldwithnew", OPT_OLDWITHNEW, 's',
-      "File to save OldWithNew cert received in genp of type rootCaKeyUpdate"},
+        "File to save OldWithNew cert received in genp of type rootCaKeyUpdate" },
     { "crlcert", OPT_CRLCERT, 's',
-      "certificate to request a CRL for in genm of type crlStatusList"},
+        "certificate to request a CRL for in genm of type crlStatusList" },
     { "oldcrl", OPT_OLDCRL, 's',
-      "CRL to request update for in genm of type crlStatusList"},
+        "CRL to request update for in genm of type crlStatusList" },
     { "crlout", OPT_CRLOUT, 's',
-      "File to save new CRL received in genp of type 'crls'"},
+        "File to save new CRL received in genp of type 'crls'" },
 
     OPT_SECTION("Client authentication"),
-    {"ref", OPT_REF, 's',
-     "Reference value to use as senderKID in case no -cert is given"},
-    {"secret", OPT_SECRET, 's',
-     "Prefer PBM (over signatures) for protecting msgs with given password source"},
-    {"cert", OPT_CERT, 's',
-     "Client's CMP signer certificate; its public key must match the -key argument"},
-    {OPT_MORE_STR, 0, 0,
-     "This also used as default reference for subject DN and SANs."},
-    {OPT_MORE_STR, 0, 0,
-     "Any further certs included are appended to the untrusted certs"},
-    {"own_trusted", OPT_OWN_TRUSTED, 's',
-     "Optional certs to verify chain building for own CMP signer cert"},
-    {"key", OPT_KEY, 's', "CMP signer private key, not used when -secret given"},
-    {"keypass", OPT_KEYPASS, 's',
-     "Client private key (and cert and old cert) pass phrase source"},
-    {"digest", OPT_DIGEST, 's',
-     "Digest to use in message protection and POPO signatures. Default \"sha256\""},
-    {"mac", OPT_MAC, 's',
-     "MAC algorithm to use in PBM-based message protection. Default \"hmac-sha1\""},
-    {"extracerts", OPT_EXTRACERTS, 's',
-     "Certificates to append in extraCerts field of outgoing messages."},
-    {OPT_MORE_STR, 0, 0,
-     "This can be used as the default CMP signer cert chain to include"},
-    {"unprotected_requests", OPT_UNPROTECTED_REQUESTS, '-',
-     "Send request messages without CMP-level protection"},
+    { "ref", OPT_REF, 's',
+        "Reference value to use as senderKID in case no -cert is given" },
+    { "secret", OPT_SECRET, 's',
+        "Prefer PBM (over signatures) for protecting msgs with given password source" },
+    { "cert", OPT_CERT, 's',
+        "Client's CMP signer certificate; its public key must match the -key argument" },
+    { OPT_MORE_STR, 0, 0,
+        "This also used as default reference for subject DN and SANs." },
+    { OPT_MORE_STR, 0, 0,
+        "Any further certs included are appended to the untrusted certs" },
+    { "own_trusted", OPT_OWN_TRUSTED, 's',
+        "Optional certs to verify chain building for own CMP signer cert" },
+    { "key", OPT_KEY, 's', "CMP signer private key, not used when -secret given" },
+    { "keypass", OPT_KEYPASS, 's',
+        "Client private key (and cert and old cert) pass phrase source" },
+    { "digest", OPT_DIGEST, 's',
+        "Digest to use in message protection and POPO signatures. Default \"sha256\"" },
+    { "mac", OPT_MAC, 's',
+        "MAC algorithm to use in PBM-based message protection. Default \"hmac-sha1\"" },
+    { "extracerts", OPT_EXTRACERTS, 's',
+        "Certificates to append in extraCerts field of outgoing messages." },
+    { OPT_MORE_STR, 0, 0,
+        "This can be used as the default CMP signer cert chain to include" },
+    { "unprotected_requests", OPT_UNPROTECTED_REQUESTS, '-',
+        "Send request messages without CMP-level protection" },
 
     OPT_SECTION("Credentials format"),
-    {"certform", OPT_CERTFORM, 's',
-     "Format (PEM or DER) to use when saving a certificate to a file. Default PEM"},
-    {"crlform", OPT_CRLFORM, 's',
-     "Format (PEM or DER) to use when saving a CRL to a file. Default DER"},
-    {"keyform", OPT_KEYFORM, 's',
-     "Format of the key input (ENGINE, other values ignored)"},
-    {"otherpass", OPT_OTHERPASS, 's',
-     "Pass phrase source potentially needed for loading certificates of others"},
+    { "certform", OPT_CERTFORM, 's',
+        "Format (PEM or DER) to use when saving a certificate to a file. Default PEM" },
+    { "crlform", OPT_CRLFORM, 's',
+        "Format (PEM or DER) to use when saving a CRL to a file. Default DER" },
+    { "keyform", OPT_KEYFORM, 's',
+        "Format of the key input (ENGINE, other values ignored)" },
+    { "otherpass", OPT_OTHERPASS, 's',
+        "Pass phrase source potentially needed for loading certificates of others" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's',
-     "Use crypto engine with given identifier, possibly a hardware device."},
-    {OPT_MORE_STR, 0, 0,
-     "Engines may also be defined in OpenSSL config file engine section."},
+    { "engine", OPT_ENGINE, 's',
+        "Use crypto engine with given identifier, possibly a hardware device." },
+    { OPT_MORE_STR, 0, 0,
+        "Engines may also be defined in OpenSSL config file engine section." },
 #endif
     OPT_PROV_OPTIONS,
     OPT_R_OPTIONS,
 
     OPT_SECTION("TLS connection"),
 #if defined(OPENSSL_NO_SOCK) || defined(OPENSSL_NO_HTTP)
-    {OPT_MORE_STR, 0, 0,
-     "NOTE: -tls_used and all other TLS options not supported due to no-sock/no-http build"},
+    { OPT_MORE_STR, 0, 0,
+        "NOTE: -tls_used and all other TLS options not supported due to no-sock/no-http build" },
 #else
-    {"tls_used", OPT_TLS_USED, '-',
-     "Enable using TLS (also when other TLS options are not set)"},
-    {"tls_cert", OPT_TLS_CERT, 's',
-     "Client's TLS certificate. May include chain to be provided to TLS server"},
-    {"tls_key", OPT_TLS_KEY, 's',
-     "Private key for the client's TLS certificate"},
-    {"tls_keypass", OPT_TLS_KEYPASS, 's',
-     "Pass phrase source for the client's private TLS key (and TLS cert)"},
-    {"tls_extra", OPT_TLS_EXTRA, 's',
-     "Extra certificates to provide to TLS server during TLS handshake"},
-    {"tls_trusted", OPT_TLS_TRUSTED, 's',
-     "Trusted certificates to use for verifying the TLS server certificate;"},
-    {OPT_MORE_STR, 0, 0, "this implies hostname validation"},
-    {"tls_host", OPT_TLS_HOST, 's',
-     "Address to be checked (rather than -server) during TLS hostname validation"},
+    { "tls_used", OPT_TLS_USED, '-',
+        "Enable using TLS (also when other TLS options are not set)" },
+    { "tls_cert", OPT_TLS_CERT, 's',
+        "Client's TLS certificate. May include chain to be provided to TLS server" },
+    { "tls_key", OPT_TLS_KEY, 's',
+        "Private key for the client's TLS certificate" },
+    { "tls_keypass", OPT_TLS_KEYPASS, 's',
+        "Pass phrase source for the client's private TLS key (and TLS cert)" },
+    { "tls_extra", OPT_TLS_EXTRA, 's',
+        "Extra certificates to provide to TLS server during TLS handshake" },
+    { "tls_trusted", OPT_TLS_TRUSTED, 's',
+        "Trusted certificates to use for verifying the TLS server certificate;" },
+    { OPT_MORE_STR, 0, 0, "this implies hostname validation" },
+    { "tls_host", OPT_TLS_HOST, 's',
+        "Address to be checked (rather than -server) during TLS hostname validation" },
 #endif
 
     OPT_SECTION("Client-side debugging"),
-    {"batch", OPT_BATCH, '-',
-     "Do not interactively prompt for input when a password is required etc."},
-    {"repeat", OPT_REPEAT, 'p',
-     "Invoke the transaction the given positive number of times. Default 1"},
-    {"reqin", OPT_REQIN, 's',
-     "Take sequence of CMP requests to send to server from file(s)"},
-    {"reqin_new_tid", OPT_REQIN_NEW_TID, '-',
-     "Use fresh transactionID for CMP requests read from -reqin"},
-    {"reqout", OPT_REQOUT, 's',
-     "Save sequence of CMP requests created by the client to file(s)"},
-    {"reqout_only", OPT_REQOUT_ONLY, 's',
-     "Save first CMP request created by the client to file and exit"},
-    {"rspin", OPT_RSPIN, 's',
-     "Process sequence of CMP responses provided in file(s), skipping server"},
-    {"rspout", OPT_RSPOUT, 's',
-     "Save sequence of actually used CMP responses to file(s)"},
-
-    {"use_mock_srv", OPT_USE_MOCK_SRV, '-',
-     "Use internal mock server at API level, bypassing socket-based HTTP"},
+    { "batch", OPT_BATCH, '-',
+        "Do not interactively prompt for input when a password is required etc." },
+    { "repeat", OPT_REPEAT, 'p',
+        "Invoke the transaction the given positive number of times. Default 1" },
+    { "reqin", OPT_REQIN, 's',
+        "Take sequence of CMP requests to send to server from file(s)" },
+    { "reqin_new_tid", OPT_REQIN_NEW_TID, '-',
+        "Use fresh transactionID for CMP requests read from -reqin" },
+    { "reqout", OPT_REQOUT, 's',
+        "Save sequence of CMP requests created by the client to file(s)" },
+    { "reqout_only", OPT_REQOUT_ONLY, 's',
+        "Save first CMP request created by the client to file and exit" },
+    { "rspin", OPT_RSPIN, 's',
+        "Process sequence of CMP responses provided in file(s), skipping server" },
+    { "rspout", OPT_RSPOUT, 's',
+        "Save sequence of actually used CMP responses to file(s)" },
+
+    { "use_mock_srv", OPT_USE_MOCK_SRV, '-',
+        "Use internal mock server at API level, bypassing socket-based HTTP" },
 
     OPT_SECTION("Mock server"),
 #if defined(OPENSSL_NO_SOCK) || defined(OPENSSL_NO_HTTP)
-    {OPT_MORE_STR, 0, 0,
-     "NOTE: -port and -max_msgs not supported due to no-sock/no-http build"},
+    { OPT_MORE_STR, 0, 0,
+        "NOTE: -port and -max_msgs not supported due to no-sock/no-http build" },
 #else
-    {"port", OPT_PORT, 's',
-     "Act as HTTP-based mock server listening on given port"},
-    {"max_msgs", OPT_MAX_MSGS, 'N',
-     "max number of messages handled by HTTP mock server. Default: 0 = unlimited"},
+    { "port", OPT_PORT, 's',
+        "Act as HTTP-based mock server listening on given port" },
+    { "max_msgs", OPT_MAX_MSGS, 'N',
+        "max number of messages handled by HTTP mock server. Default: 0 = unlimited" },
 #endif
 
-    {"srv_ref", OPT_SRV_REF, 's',
-     "Reference value to use as senderKID of server in case no -srv_cert is given"},
-    {"srv_secret", OPT_SRV_SECRET, 's',
-     "Password source for server authentication with a pre-shared key (secret)"},
-    {"srv_cert", OPT_SRV_CERT, 's', "Certificate of the server"},
-    {"srv_key", OPT_SRV_KEY, 's',
-     "Private key used by the server for signing messages"},
-    {"srv_keypass", OPT_SRV_KEYPASS, 's',
-     "Server private key (and cert) pass phrase source"},
-
-    {"srv_trusted", OPT_SRV_TRUSTED, 's',
-     "Trusted certificates for client authentication"},
-    {"srv_untrusted", OPT_SRV_UNTRUSTED, 's',
-     "Intermediate certs that may be useful for verifying CMP protection"},
-    {"ref_cert", OPT_RSP_CERT, 's',
-     "Certificate to be expected for rr and any oldCertID in kur messages"},
-    {"rsp_cert", OPT_RSP_CERT, 's',
-     "Certificate to be returned as mock enrollment result"},
-    {"rsp_key", OPT_RSP_KEY, 's',
-     "Private key for the certificate to be returned as mock enrollment result"},
-    {OPT_MORE_STR, 0, 0,
-     "Key to be returned for central key pair generation"},
-    {"rsp_keypass", OPT_RSP_KEYPASS, 's',
-     "Response private key (and cert) pass phrase source"},
-    {"rsp_crl", OPT_RSP_CRL, 's',
-     "CRL to be returned in genp of type crls"},
-    {"rsp_extracerts", OPT_RSP_EXTRACERTS, 's',
-     "Extra certificates to be included in mock certification responses"},
-    {"rsp_capubs", OPT_RSP_CAPUBS, 's',
-     "CA certificates to be included in mock ip response"},
-    {"rsp_newwithnew", OPT_RSP_NEWWITHNEW, 's',
-     "New root CA certificate to include in genp of type rootCaKeyUpdate"},
-    {"rsp_newwithold", OPT_RSP_NEWWITHOLD, 's',
-     "NewWithOld transition cert to include in genp of type rootCaKeyUpdate"},
-    {"rsp_oldwithnew", OPT_RSP_OLDWITHNEW, 's',
-     "OldWithNew transition cert to include in genp of type rootCaKeyUpdate"},
-    {"poll_count", OPT_POLL_COUNT, 'N',
-     "Number of times the client must poll before receiving a certificate"},
-    {"check_after", OPT_CHECK_AFTER, 'N',
-     "The check_after value (time to wait) to include in poll response"},
-    {"grant_implicitconf", OPT_GRANT_IMPLICITCONF, '-',
-     "Grant implicit confirmation of newly enrolled certificate"},
-
-    {"pkistatus", OPT_PKISTATUS, 'N',
-     "PKIStatus to be included in server response. Possible values: 0..6"},
-    {"failure", OPT_FAILURE, 'N',
-     "A single failure info bit number to include in server response, 0..26"},
-    {"failurebits", OPT_FAILUREBITS, 'N',
-     "Number representing failure bits to include in server response, 0..2^27 - 1"},
-    {"statusstring", OPT_STATUSSTRING, 's',
-     "Status string to be included in server response"},
-    {"send_error", OPT_SEND_ERROR, '-',
-     "Force server to reply with error message"},
-    {"send_unprotected", OPT_SEND_UNPROTECTED, '-',
-     "Send response messages without CMP-level protection"},
-    {"send_unprot_err", OPT_SEND_UNPROT_ERR, '-',
-     "In case of negative responses, server shall send unprotected error messages,"},
-    {OPT_MORE_STR, 0, 0,
-     "certificate responses (ip/cp/kup), and revocation responses (rp)."},
-    {OPT_MORE_STR, 0, 0,
-     "WARNING: This setting leads to behavior violating RFC 4210"},
-    {"accept_unprotected", OPT_ACCEPT_UNPROTECTED, '-',
-     "Accept missing or invalid protection of requests"},
-    {"accept_unprot_err", OPT_ACCEPT_UNPROT_ERR, '-',
-     "Accept unprotected error messages from client"},
-    {"accept_raverified", OPT_ACCEPT_RAVERIFIED, '-',
-     "Accept RAVERIFIED as proof-of-possession (POPO)"},
+    { "srv_ref", OPT_SRV_REF, 's',
+        "Reference value to use as senderKID of server in case no -srv_cert is given" },
+    { "srv_secret", OPT_SRV_SECRET, 's',
+        "Password source for server authentication with a pre-shared key (secret)" },
+    { "srv_cert", OPT_SRV_CERT, 's', "Certificate of the server" },
+    { "srv_key", OPT_SRV_KEY, 's',
+        "Private key used by the server for signing messages" },
+    { "srv_keypass", OPT_SRV_KEYPASS, 's',
+        "Server private key (and cert) pass phrase source" },
+
+    { "srv_trusted", OPT_SRV_TRUSTED, 's',
+        "Trusted certificates for client authentication" },
+    { "srv_untrusted", OPT_SRV_UNTRUSTED, 's',
+        "Intermediate certs that may be useful for verifying CMP protection" },
+    { "ref_cert", OPT_RSP_CERT, 's',
+        "Certificate to be expected for rr and any oldCertID in kur messages" },
+    { "rsp_cert", OPT_RSP_CERT, 's',
+        "Certificate to be returned as mock enrollment result" },
+    { "rsp_key", OPT_RSP_KEY, 's',
+        "Private key for the certificate to be returned as mock enrollment result" },
+    { OPT_MORE_STR, 0, 0,
+        "Key to be returned for central key pair generation" },
+    { "rsp_keypass", OPT_RSP_KEYPASS, 's',
+        "Response private key (and cert) pass phrase source" },
+    { "rsp_crl", OPT_RSP_CRL, 's',
+        "CRL to be returned in genp of type crls" },
+    { "rsp_extracerts", OPT_RSP_EXTRACERTS, 's',
+        "Extra certificates to be included in mock certification responses" },
+    { "rsp_capubs", OPT_RSP_CAPUBS, 's',
+        "CA certificates to be included in mock ip response" },
+    { "rsp_newwithnew", OPT_RSP_NEWWITHNEW, 's',
+        "New root CA certificate to include in genp of type rootCaKeyUpdate" },
+    { "rsp_newwithold", OPT_RSP_NEWWITHOLD, 's',
+        "NewWithOld transition cert to include in genp of type rootCaKeyUpdate" },
+    { "rsp_oldwithnew", OPT_RSP_OLDWITHNEW, 's',
+        "OldWithNew transition cert to include in genp of type rootCaKeyUpdate" },
+    { "poll_count", OPT_POLL_COUNT, 'N',
+        "Number of times the client must poll before receiving a certificate" },
+    { "check_after", OPT_CHECK_AFTER, 'N',
+        "The check_after value (time to wait) to include in poll response" },
+    { "grant_implicitconf", OPT_GRANT_IMPLICITCONF, '-',
+        "Grant implicit confirmation of newly enrolled certificate" },
+
+    { "pkistatus", OPT_PKISTATUS, 'N',
+        "PKIStatus to be included in server response. Possible values: 0..6" },
+    { "failure", OPT_FAILURE, 'N',
+        "A single failure info bit number to include in server response, 0..26" },
+    { "failurebits", OPT_FAILUREBITS, 'N',
+        "Number representing failure bits to include in server response, 0..2^27 - 1" },
+    { "statusstring", OPT_STATUSSTRING, 's',
+        "Status string to be included in server response" },
+    { "send_error", OPT_SEND_ERROR, '-',
+        "Force server to reply with error message" },
+    { "send_unprotected", OPT_SEND_UNPROTECTED, '-',
+        "Send response messages without CMP-level protection" },
+    { "send_unprot_err", OPT_SEND_UNPROT_ERR, '-',
+        "In case of negative responses, server shall send unprotected error messages," },
+    { OPT_MORE_STR, 0, 0,
+        "certificate responses (ip/cp/kup), and revocation responses (rp)." },
+    { OPT_MORE_STR, 0, 0,
+        "WARNING: This setting leads to behavior violating RFC 9810" },
+    { "accept_unprotected", OPT_ACCEPT_UNPROTECTED, '-',
+        "Accept missing or invalid protection of requests" },
+    { "accept_unprot_err", OPT_ACCEPT_UNPROT_ERR, '-',
+        "Accept unprotected error messages from client" },
+    { "accept_raverified", OPT_ACCEPT_RAVERIFIED, '-',
+        "Accept RAVERIFIED as proof-of-possession (POPO)" },
 
     OPT_V_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 typedef union {
@@ -641,118 +713,117 @@ typedef union {
     long *num_long;
 } varref;
 static varref cmp_vars[] = { /* must be in same order as enumerated above! */
-    {&opt_config}, {&opt_section}, {(char **)&opt_verbosity},
+    { &opt_config }, { &opt_section }, { (char **)&opt_verbosity },
 
-    {&opt_cmd_s}, {&opt_infotype_s}, {&opt_profile}, {&opt_geninfo},
-    {&opt_template}, {&opt_keyspec},
+    { &opt_cmd_s }, { &opt_infotype_s }, { &opt_profile }, { &opt_geninfo },
+    { &opt_template }, { &opt_keyspec },
 
-    {&opt_newkey}, {&opt_newkeypass}, {(char **)&opt_centralkeygen},
-    {&opt_newkeyout}, {&opt_subject}, {(char **)&opt_days}, {&opt_reqexts},
-    {&opt_sans}, {(char **)&opt_san_nodefault},
-    {&opt_policies}, {&opt_policy_oids}, {(char **)&opt_policy_oids_critical},
-    {(char **)&opt_popo}, {&opt_csr},
-    {&opt_out_trusted},
-    {(char **)&opt_implicit_confirm}, {(char **)&opt_disable_confirm},
-    {&opt_certout}, {&opt_chainout},
+    { &opt_newkey }, { &opt_newkeypass }, { (char **)&opt_centralkeygen },
+    { &opt_newkeyout }, { &opt_subject }, { (char **)&opt_days }, { &opt_reqexts },
+    { &opt_sans }, { (char **)&opt_san_nodefault },
+    { &opt_policies }, { &opt_policy_oids }, { (char **)&opt_policy_oids_critical },
+    { (char **)&opt_popo }, { &opt_csr },
+    { &opt_out_trusted },
+    { (char **)&opt_implicit_confirm }, { (char **)&opt_disable_confirm },
+    { &opt_certout }, { &opt_chainout },
 
-    {&opt_oldcert}, {&opt_issuer}, {&opt_serial}, {(char **)&opt_revreason},
+    { &opt_oldcert }, { &opt_issuer }, { &opt_serial }, { (char **)&opt_revreason },
 
 #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
-    {&opt_server}, {&opt_proxy}, {&opt_no_proxy},
+    { &opt_server }, { &opt_proxy }, { &opt_no_proxy },
 #endif
-    {&opt_recipient}, {&opt_path}, {(char **)&opt_keep_alive},
-    {(char **)&opt_msg_timeout}, {(char **)&opt_total_timeout},
-
-    {&opt_trusted}, {&opt_untrusted}, {&opt_srvcert},
-    {&opt_expect_sender},
-    {(char **)&opt_ignore_keyusage}, {(char **)&opt_unprotected_errors},
-    {(char **)&opt_no_cache_extracerts},
-    {&opt_srvcertout}, {&opt_extracertsout}, {&opt_cacertsout},
-    {&opt_oldwithold}, {&opt_newwithnew}, {&opt_newwithold}, {&opt_oldwithnew},
-    {&opt_crlcert}, {&opt_oldcrl}, {&opt_crlout},
-
-    {&opt_ref}, {&opt_secret},
-    {&opt_cert}, {&opt_own_trusted}, {&opt_key}, {&opt_keypass},
-    {&opt_digest}, {&opt_mac}, {&opt_extracerts},
-    {(char **)&opt_unprotected_requests},
-
-    {&opt_certform_s}, {&opt_crlform_s}, {&opt_keyform_s},
-    {&opt_otherpass},
+    { &opt_recipient }, { &opt_path }, { (char **)&opt_keep_alive },
+    { (char **)&opt_msg_timeout }, { (char **)&opt_total_timeout },
+
+    { &opt_trusted }, { &opt_untrusted }, { &opt_srvcert },
+    { &opt_expect_sender },
+    { (char **)&opt_ignore_keyusage }, { (char **)&opt_unprotected_errors },
+    { (char **)&opt_no_cache_extracerts },
+    { &opt_srvcertout }, { &opt_extracertsout }, { &opt_cacertsout },
+    { &opt_oldwithold }, { &opt_newwithnew }, { &opt_newwithold }, { &opt_oldwithnew },
+    { &opt_crlcert }, { &opt_oldcrl }, { &opt_crlout },
+
+    { &opt_ref }, { &opt_secret },
+    { &opt_cert }, { &opt_own_trusted }, { &opt_key }, { &opt_keypass },
+    { &opt_digest }, { &opt_mac }, { &opt_extracerts },
+    { (char **)&opt_unprotected_requests },
+
+    { &opt_certform_s }, { &opt_crlform_s }, { &opt_keyform_s },
+    { &opt_otherpass },
 #ifndef OPENSSL_NO_ENGINE
-    {&opt_engine},
+    { &opt_engine },
 #endif
 
 #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
-    {(char **)&opt_tls_used}, {&opt_tls_cert}, {&opt_tls_key},
-    {&opt_tls_keypass},
-    {&opt_tls_extra}, {&opt_tls_trusted}, {&opt_tls_host},
+    { (char **)&opt_tls_used }, { &opt_tls_cert }, { &opt_tls_key },
+    { &opt_tls_keypass },
+    { &opt_tls_extra }, { &opt_tls_trusted }, { &opt_tls_host },
 #endif
 
-    {(char **)&opt_batch}, {(char **)&opt_repeat},
-    {&opt_reqin}, {(char **)&opt_reqin_new_tid},
-    {&opt_reqout}, {&opt_reqout_only}, {&opt_rspin}, {&opt_rspout},
+    { (char **)&opt_batch }, { (char **)&opt_repeat },
+    { &opt_reqin }, { (char **)&opt_reqin_new_tid },
+    { &opt_reqout }, { &opt_reqout_only }, { &opt_rspin }, { &opt_rspout },
 
-    {(char **)&opt_use_mock_srv},
+    { (char **)&opt_use_mock_srv },
 #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
-    {&opt_port}, {(char **)&opt_max_msgs},
+    { &opt_port }, { (char **)&opt_max_msgs },
 #endif
-    {&opt_srv_ref}, {&opt_srv_secret},
-    {&opt_srv_cert}, {&opt_srv_key}, {&opt_srv_keypass},
-    {&opt_srv_trusted}, {&opt_srv_untrusted},
-    {&opt_ref_cert}, {&opt_rsp_cert}, {&opt_rsp_key}, {&opt_rsp_keypass},
-    {&opt_rsp_crl}, {&opt_rsp_extracerts}, {&opt_rsp_capubs},
-    {&opt_rsp_newwithnew}, {&opt_rsp_newwithold}, {&opt_rsp_oldwithnew},
-
-    {(char **)&opt_poll_count}, {(char **)&opt_check_after},
-    {(char **)&opt_grant_implicitconf},
-    {(char **)&opt_pkistatus}, {(char **)&opt_failure},
-    {(char **)&opt_failurebits}, {&opt_statusstring},
-    {(char **)&opt_send_error}, {(char **)&opt_send_unprotected},
-    {(char **)&opt_send_unprot_err}, {(char **)&opt_accept_unprotected},
-    {(char **)&opt_accept_unprot_err}, {(char **)&opt_accept_raverified},
-
-    {NULL}
+    { &opt_srv_ref }, { &opt_srv_secret },
+    { &opt_srv_cert }, { &opt_srv_key }, { &opt_srv_keypass },
+    { &opt_srv_trusted }, { &opt_srv_untrusted },
+    { &opt_ref_cert }, { &opt_rsp_cert }, { &opt_rsp_key }, { &opt_rsp_keypass },
+    { &opt_rsp_crl }, { &opt_rsp_extracerts }, { &opt_rsp_capubs },
+    { &opt_rsp_newwithnew }, { &opt_rsp_newwithold }, { &opt_rsp_oldwithnew },
+
+    { (char **)&opt_poll_count }, { (char **)&opt_check_after },
+    { (char **)&opt_grant_implicitconf },
+    { (char **)&opt_pkistatus }, { (char **)&opt_failure },
+    { (char **)&opt_failurebits }, { &opt_statusstring },
+    { (char **)&opt_send_error }, { (char **)&opt_send_unprotected },
+    { (char **)&opt_send_unprot_err }, { (char **)&opt_accept_unprotected },
+    { (char **)&opt_accept_unprot_err }, { (char **)&opt_accept_raverified },
+
+    { NULL }
 };
 
-#define FUNC (strcmp(OPENSSL_FUNC, "(unknown function)") == 0   \
-              ? "CMP" : OPENSSL_FUNC)
+#define FUNC (strcmp(OPENSSL_FUNC, "(unknown function)") == 0 \
+        ? "CMP"                                               \
+        : OPENSSL_FUNC)
 #define CMP_print(bio, level, prefix, msg, a1, a2, a3) \
-    ((void)(level > opt_verbosity ? 0 : \
-            (BIO_printf(bio, "%s:%s:%d:CMP %s: " msg "\n", \
-                        FUNC, OPENSSL_FILE, OPENSSL_LINE, prefix, a1, a2, a3))))
+    ((void)(level > opt_verbosity ? 0 : (BIO_printf(bio, "%s:%s:%d:CMP %s: " msg "\n", FUNC, OPENSSL_FILE, OPENSSL_LINE, prefix, a1, a2, a3))))
 #define CMP_DEBUG(m, a1, a2, a3) \
     CMP_print(bio_out, OSSL_CMP_LOG_DEBUG, "debug", m, a1, a2, a3)
-#define CMP_debug(msg)             CMP_DEBUG(msg"%s%s%s", "", "", "")
-#define CMP_debug1(msg, a1)        CMP_DEBUG(msg"%s%s",   a1, "", "")
-#define CMP_debug2(msg, a1, a2)    CMP_DEBUG(msg"%s",     a1, a2, "")
-#define CMP_debug3(msg, a1, a2, a3) CMP_DEBUG(msg,        a1, a2, a3)
+#define CMP_debug(msg) CMP_DEBUG(msg "%s%s%s", "", "", "")
+#define CMP_debug1(msg, a1) CMP_DEBUG(msg "%s%s", a1, "", "")
+#define CMP_debug2(msg, a1, a2) CMP_DEBUG(msg "%s", a1, a2, "")
+#define CMP_debug3(msg, a1, a2, a3) CMP_DEBUG(msg, a1, a2, a3)
 #define CMP_INFO(msg, a1, a2, a3) \
     CMP_print(bio_out, OSSL_CMP_LOG_INFO, "info", msg, a1, a2, a3)
-#define CMP_info(msg)              CMP_INFO(msg"%s%s%s", "", "", "")
-#define CMP_info1(msg, a1)         CMP_INFO(msg"%s%s",   a1, "", "")
-#define CMP_info2(msg, a1, a2)     CMP_INFO(msg"%s",     a1, a2, "")
-#define CMP_info3(msg, a1, a2, a3) CMP_INFO(msg,         a1, a2, a3)
+#define CMP_info(msg) CMP_INFO(msg "%s%s%s", "", "", "")
+#define CMP_info1(msg, a1) CMP_INFO(msg "%s%s", a1, "", "")
+#define CMP_info2(msg, a1, a2) CMP_INFO(msg "%s", a1, a2, "")
+#define CMP_info3(msg, a1, a2, a3) CMP_INFO(msg, a1, a2, a3)
 #define CMP_WARN(m, a1, a2, a3) \
     CMP_print(bio_out, OSSL_CMP_LOG_WARNING, "warning", m, a1, a2, a3)
-#define CMP_warn(msg)              CMP_WARN(msg"%s%s%s", "", "", "")
-#define CMP_warn1(msg, a1)         CMP_WARN(msg"%s%s",   a1, "", "")
-#define CMP_warn2(msg, a1, a2)     CMP_WARN(msg"%s",     a1, a2, "")
-#define CMP_warn3(msg, a1, a2, a3) CMP_WARN(msg,         a1, a2, a3)
+#define CMP_warn(msg) CMP_WARN(msg "%s%s%s", "", "", "")
+#define CMP_warn1(msg, a1) CMP_WARN(msg "%s%s", a1, "", "")
+#define CMP_warn2(msg, a1, a2) CMP_WARN(msg "%s", a1, a2, "")
+#define CMP_warn3(msg, a1, a2, a3) CMP_WARN(msg, a1, a2, a3)
 #define CMP_ERR(msg, a1, a2, a3) \
     CMP_print(bio_err, OSSL_CMP_LOG_ERR, "error", msg, a1, a2, a3)
-#define CMP_err(msg)               CMP_ERR(msg"%s%s%s", "", "", "")
-#define CMP_err1(msg, a1)          CMP_ERR(msg"%s%s",   a1, "", "")
-#define CMP_err2(msg, a1, a2)      CMP_ERR(msg"%s",     a1, a2, "")
-#define CMP_err3(msg, a1, a2, a3)  CMP_ERR(msg,         a1, a2, a3)
+#define CMP_err(msg) CMP_ERR(msg "%s%s%s", "", "", "")
+#define CMP_err1(msg, a1) CMP_ERR(msg "%s%s", a1, "", "")
+#define CMP_err2(msg, a1, a2) CMP_ERR(msg "%s", a1, a2, "")
+#define CMP_err3(msg, a1, a2, a3) CMP_ERR(msg, a1, a2, a3)
 
 static int print_to_bio_out(const char *func, const char *file, int line,
-                            OSSL_CMP_severity level, const char *msg)
+    OSSL_CMP_severity level, const char *msg)
 {
     return OSSL_CMP_print_to_bio(bio_out, func, file, line, level, msg);
 }
 
 static int print_to_bio_err(const char *func, const char *file, int line,
-                            OSSL_CMP_severity level, const char *msg)
+    OSSL_CMP_severity level, const char *msg)
 {
     return OSSL_CMP_print_to_bio(bio_err, func, file, line, level, msg);
 }
@@ -768,7 +839,7 @@ static int set_verbosity(int level)
 }
 
 static EVP_PKEY *load_key_pwd(const char *uri, int format,
-                              const char *pass, ENGINE *eng, const char *desc)
+    const char *pass, ENGINE *eng, const char *desc)
 {
     char *pass_string = get_passwd(pass, desc);
     EVP_PKEY *pkey = load_key(uri, format, 0, pass_string, eng, desc);
@@ -794,12 +865,11 @@ static int truststore_set_host_etc(X509_STORE *ts, const char *host)
 
     /* first clear any hostnames, IP, and email addresses */
     if (!X509_VERIFY_PARAM_set1_host(ts_vpm, NULL, 0)
-            || !X509_VERIFY_PARAM_set1_ip(ts_vpm, NULL, 0)
-            || !X509_VERIFY_PARAM_set1_email(ts_vpm, NULL, 0))
+        || !X509_VERIFY_PARAM_set1_ip(ts_vpm, NULL, 0)
+        || !X509_VERIFY_PARAM_set1_email(ts_vpm, NULL, 0))
         return 0;
     X509_VERIFY_PARAM_set_hostflags(ts_vpm,
-                                    X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT |
-                                    X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+        X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT | X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
     return (host != NULL && X509_VERIFY_PARAM_set1_ip_asc(ts_vpm, host))
         || X509_VERIFY_PARAM_set1_host(ts_vpm, host, 0);
 }
@@ -860,7 +930,7 @@ static OSSL_CMP_MSG *read_PKIMESSAGE(const char *desc, char **filenames)
  * to take the sequence of requests and responses from files.
  */
 static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
-                                         const OSSL_CMP_MSG *req)
+    const OSSL_CMP_MSG *req)
 {
     OSSL_CMP_MSG *req_new = NULL;
     OSSL_CMP_MSG *res = NULL;
@@ -870,7 +940,7 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
     if (opt_reqout_only != NULL) {
         if (OSSL_CMP_MSG_write(opt_reqout_only, req) < 0)
             CMP_err1("cannot write request PKIMessage to file '%s'",
-                     opt_reqout_only);
+                opt_reqout_only);
         else
             reqout_only_done = 1;
         return NULL; /* stop at this point, not contacting any server */
@@ -886,7 +956,7 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
          * The following workaround unfortunately requires re-protection.
          */
         if (opt_reqin_new_tid
-                && !OSSL_CMP_MSG_update_transactionID(ctx, req_new))
+            && !OSSL_CMP_MSG_update_transactionID(ctx, req_new))
             goto err;
 
         /*
@@ -933,7 +1003,7 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
         nonce = OSSL_CMP_HDR_get0_recipNonce(hdr);
         tid = OSSL_CMP_HDR_get0_transactionID(hdr);
         if (!OSSL_CMP_CTX_set1_senderNonce(ctx, nonce)
-                || !OSSL_CMP_CTX_set1_transactionID(ctx, tid)) {
+            || !OSSL_CMP_CTX_set1_transactionID(ctx, tid)) {
             OSSL_CMP_MSG_free(res);
             res = NULL;
             goto err;
@@ -945,21 +1015,21 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
         res = NULL;
     }
 
- err:
+err:
     OSSL_CMP_MSG_free(req_new);
     return res;
 }
 
 static int set_name(const char *str,
-                    int (*set_fn) (OSSL_CMP_CTX *ctx, const X509_NAME *name),
-                    OSSL_CMP_CTX *ctx, const char *desc)
+    int (*set_fn)(OSSL_CMP_CTX *ctx, const X509_NAME *name),
+    OSSL_CMP_CTX *ctx, const char *desc)
 {
     if (str != NULL) {
-        X509_NAME *n = parse_name(str, MBSTRING_ASC, 1, desc);
+        X509_NAME *n = parse_name(str, MBSTRING_UTF8, 1, desc);
 
         if (n == NULL)
             return 0;
-        if (!(*set_fn) (ctx, n)) {
+        if (!(*set_fn)(ctx, n)) {
             X509_NAME_free(n);
             CMP_err("out of memory");
             return 0;
@@ -979,8 +1049,8 @@ static int set_gennames(OSSL_CMP_CTX *ctx, char *names, const char *desc)
         next = next_item(names);
         if (strcmp(names, "critical") == 0) {
             (void)OSSL_CMP_CTX_set_option(ctx,
-                                          OSSL_CMP_OPT_SUBJECTALTNAME_CRITICAL,
-                                          1);
+                OSSL_CMP_OPT_SUBJECTALTNAME_CRITICAL,
+                1);
             continue;
         }
 
@@ -989,9 +1059,9 @@ static int set_gennames(OSSL_CMP_CTX *ctx, char *names, const char *desc)
         n = a2i_GENERAL_NAME(NULL, NULL, NULL, GEN_IPADD, names, 0);
         if (n == NULL)
             n = a2i_GENERAL_NAME(NULL, NULL, NULL,
-                                 strchr(names, '@') != NULL ? GEN_EMAIL :
-                                 strchr(names, ':') != NULL ? GEN_URI : GEN_DNS,
-                                 names, 0);
+                strchr(names, '@') != NULL ? GEN_EMAIL : strchr(names, ':') != NULL ? GEN_URI
+                                                                                    : GEN_DNS,
+                names, 0);
         (void)ERR_pop_to_mark();
 
         if (n == NULL) {
@@ -1018,7 +1088,7 @@ static X509_STORE *load_trusted(char *input, int for_new_cert, const char *desc)
 
     /* copy vpm to store */
     if (X509_STORE_set1_param(ts, vpm /* may be NULL */)
-            && (for_new_cert || truststore_set_host_etc(ts, NULL)))
+        && (for_new_cert || truststore_set_host_etc(ts, NULL)))
         return ts;
     BIO_printf(bio_err, "error setting verification parameters for %s\n", desc);
     OSSL_CMP_CTX_print_errors(cmp_ctx);
@@ -1028,7 +1098,7 @@ static X509_STORE *load_trusted(char *input, int for_new_cert, const char *desc)
 
 typedef int (*add_X509_fn_t)(void *ctx, const X509 *cert);
 static int setup_cert(void *ctx, const char *file, const char *pass,
-                      const char *desc, add_X509_fn_t set1_fn)
+    const char *desc, add_X509_fn_t set1_fn)
 {
     X509 *cert;
     int ok;
@@ -1044,7 +1114,7 @@ static int setup_cert(void *ctx, const char *file, const char *pass,
 
 typedef int (*add_X509_stack_fn_t)(void *ctx, const STACK_OF(X509) *certs);
 static int setup_certs(char *files, const char *desc, void *ctx,
-                       add_X509_stack_fn_t set1_fn)
+    add_X509_stack_fn_t set1_fn)
 {
     STACK_OF(X509) *certs;
     int ok;
@@ -1100,13 +1170,13 @@ static int transform_opts(void)
     }
 
 #ifndef OPENSSL_NO_ENGINE
-# define FORMAT_OPTIONS (OPT_FMT_PEMDER | OPT_FMT_PKCS12 | OPT_FMT_ENGINE)
+#define FORMAT_OPTIONS (OPT_FMT_PEMDER | OPT_FMT_PKCS12 | OPT_FMT_ENGINE)
 #else
-# define FORMAT_OPTIONS (OPT_FMT_PEMDER | OPT_FMT_PKCS12)
+#define FORMAT_OPTIONS (OPT_FMT_PEMDER | OPT_FMT_PKCS12)
 #endif
 
     if (opt_keyform_s != NULL
-            && !opt_format(opt_keyform_s, FORMAT_OPTIONS, &opt_keyform)) {
+        && !opt_format(opt_keyform_s, FORMAT_OPTIONS, &opt_keyform)) {
         CMP_err("unknown option given for key loading format");
         return 0;
     }
@@ -1114,12 +1184,12 @@ static int transform_opts(void)
 #undef FORMAT_OPTIONS
 
     if (opt_certform_s != NULL
-            && !opt_format(opt_certform_s, OPT_FMT_PEMDER, &opt_certform)) {
+        && !opt_format(opt_certform_s, OPT_FMT_PEMDER, &opt_certform)) {
         CMP_err("unknown option given for certificate storing format");
         return 0;
     }
     if (opt_crlform_s != NULL
-            && !opt_format(opt_crlform_s, OPT_FMT_PEMDER, &opt_crlform)) {
+        && !opt_format(opt_crlform_s, OPT_FMT_PEMDER, &opt_crlform)) {
         CMP_err("unknown option given for CRL storing format");
         return 0;
     }
@@ -1131,7 +1201,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(ENGINE *engine)
 {
     OSSL_CMP_CTX *ctx; /* extra CMP (client) ctx partly used by server */
     OSSL_CMP_SRV_CTX *srv_ctx = ossl_cmp_mock_srv_new(app_get0_libctx(),
-                                                      app_get0_propq());
+        app_get0_propq());
 
     if (srv_ctx == NULL)
         return NULL;
@@ -1145,7 +1215,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(ENGINE *engine)
         }
     } else {
         if (!OSSL_CMP_CTX_set1_referenceValue(ctx, (unsigned char *)opt_srv_ref,
-                                              strlen(opt_srv_ref)))
+                strlen(opt_srv_ref)))
             goto err;
     }
 
@@ -1156,7 +1226,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(ENGINE *engine)
         if (pass_str != NULL) {
             cleanse(opt_srv_secret);
             res = OSSL_CMP_CTX_set1_secretValue(ctx, (unsigned char *)pass_str,
-                                                strlen(pass_str));
+                strlen(pass_str));
             clear_free(pass_str);
             if (res == 0)
                 goto err;
@@ -1169,18 +1239,18 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(ENGINE *engine)
     }
 
     if (opt_srv_secret == NULL
-            && ((opt_srv_cert == NULL) != (opt_srv_key == NULL))) {
+        && ((opt_srv_cert == NULL) != (opt_srv_key == NULL))) {
         CMP_err("must give both -srv_cert and -srv_key options or neither");
         goto err;
     }
     if (!setup_cert(ctx, opt_srv_cert, opt_srv_keypass,
-                    "signer certificate of the mock server",
-                    (add_X509_fn_t)OSSL_CMP_CTX_set1_cert))
+            "signer certificate of the mock server",
+            (add_X509_fn_t)OSSL_CMP_CTX_set1_cert))
         goto err;
     if (opt_srv_key != NULL) {
         EVP_PKEY *pkey = load_key_pwd(opt_srv_key, opt_keyform,
-                                      opt_srv_keypass,
-                                      engine, "private key for mock server cert");
+            opt_srv_keypass,
+            engine, "private key for mock server cert");
 
         if (pkey == NULL || !OSSL_CMP_CTX_set1_pkey(ctx, pkey)) {
             EVP_PKEY_free(pkey);
@@ -1191,8 +1261,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(ENGINE *engine)
     cleanse(opt_srv_keypass);
 
     if (opt_srv_trusted != NULL) {
-        X509_STORE *ts =
-            load_trusted(opt_srv_trusted, 0, "certs trusted by mock server");
+        X509_STORE *ts = load_trusted(opt_srv_trusted, 0, "certs trusted by mock server");
 
         if (ts == NULL || !OSSL_CMP_CTX_set0_trusted(ctx, ts)) {
             X509_STORE_free(ts);
@@ -1202,26 +1271,26 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(ENGINE *engine)
         CMP_warn("mock server will not be able to handle signature-protected requests since -srv_trusted is not given");
     }
     if (!setup_certs(opt_srv_untrusted,
-                     "untrusted certificates for mock server", ctx,
-                     (add_X509_stack_fn_t)OSSL_CMP_CTX_set1_untrusted))
+            "untrusted certificates for mock server", ctx,
+            (add_X509_stack_fn_t)OSSL_CMP_CTX_set1_untrusted))
         goto err;
 
     if (!setup_cert(srv_ctx, opt_ref_cert, opt_otherpass,
-                    "reference cert to be expected by the mock server",
-                    (add_X509_fn_t)ossl_cmp_mock_srv_set1_refCert))
+            "reference cert to be expected by the mock server",
+            (add_X509_fn_t)ossl_cmp_mock_srv_set1_refCert))
         goto err;
     if (opt_rsp_cert == NULL) {
         CMP_warn("no -rsp_cert given for mock server");
     } else {
         if (!setup_cert(srv_ctx, opt_rsp_cert, opt_rsp_keypass,
-                        "cert the mock server returns on certificate requests",
-                        (add_X509_fn_t)ossl_cmp_mock_srv_set1_certOut))
+                "cert the mock server returns on certificate requests",
+                (add_X509_fn_t)ossl_cmp_mock_srv_set1_certOut))
             goto err;
     }
     if (opt_rsp_key != NULL) {
         EVP_PKEY *pkey = load_key_pwd(opt_rsp_key, opt_keyform,
-                                      opt_rsp_keypass, engine,
-                                      "private key for enrollment cert");
+            opt_rsp_keypass, engine,
+            "private key for enrollment cert");
 
         if (pkey == NULL
             || !ossl_cmp_mock_srv_set1_keyOut(srv_ctx, pkey)) {
@@ -1233,24 +1302,24 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(ENGINE *engine)
     cleanse(opt_rsp_keypass);
 
     if (!setup_mock_crlout(srv_ctx, opt_rsp_crl,
-                           "CRL to be returned by the mock server"))
+            "CRL to be returned by the mock server"))
         goto err;
     if (!setup_certs(opt_rsp_extracerts,
-                     "CMP extra certificates for mock server", srv_ctx,
-                     (add_X509_stack_fn_t)ossl_cmp_mock_srv_set1_chainOut))
+            "CMP extra certificates for mock server", srv_ctx,
+            (add_X509_stack_fn_t)ossl_cmp_mock_srv_set1_chainOut))
         goto err;
     if (!setup_certs(opt_rsp_capubs, "caPubs for mock server", srv_ctx,
-                     (add_X509_stack_fn_t)ossl_cmp_mock_srv_set1_caPubsOut))
+            (add_X509_stack_fn_t)ossl_cmp_mock_srv_set1_caPubsOut))
         goto err;
     if (!setup_cert(srv_ctx, opt_rsp_newwithnew, opt_otherpass,
-                    "NewWithNew cert the mock server returns in rootCaKeyUpdate",
-                    (add_X509_fn_t)ossl_cmp_mock_srv_set1_newWithNew)
+            "NewWithNew cert the mock server returns in rootCaKeyUpdate",
+            (add_X509_fn_t)ossl_cmp_mock_srv_set1_newWithNew)
         || !setup_cert(srv_ctx, opt_rsp_newwithold, opt_otherpass,
-                       "NewWithOld cert the mock server returns in rootCaKeyUpdate",
-                       (add_X509_fn_t)ossl_cmp_mock_srv_set1_newWithOld)
+            "NewWithOld cert the mock server returns in rootCaKeyUpdate",
+            (add_X509_fn_t)ossl_cmp_mock_srv_set1_newWithOld)
         || !setup_cert(srv_ctx, opt_rsp_oldwithnew, opt_otherpass,
-                       "OldWithNew cert the mock server returns in rootCaKeyUpdate",
-                       (add_X509_fn_t)ossl_cmp_mock_srv_set1_oldWithNew))
+            "OldWithNew cert the mock server returns in rootCaKeyUpdate",
+            (add_X509_fn_t)ossl_cmp_mock_srv_set1_oldWithNew))
         goto err;
     (void)ossl_cmp_mock_srv_set_pollCount(srv_ctx, opt_poll_count);
     (void)ossl_cmp_mock_srv_set_checkAfterTime(srv_ctx, opt_check_after);
@@ -1260,7 +1329,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(ENGINE *engine)
     if (opt_failure != INT_MIN) { /* option has been set explicitly */
         if (opt_failure < 0 || OSSL_CMP_PKIFAILUREINFO_MAX < opt_failure) {
             CMP_err1("-failure out of range, should be >= 0 and <= %d",
-                     OSSL_CMP_PKIFAILUREINFO_MAX);
+                OSSL_CMP_PKIFAILUREINFO_MAX);
             goto err;
         }
         if (opt_failurebits != 0)
@@ -1273,7 +1342,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(ENGINE *engine)
         goto err;
     }
     if (!ossl_cmp_mock_srv_set_statusInfo(srv_ctx, opt_pkistatus,
-                                          opt_failurebits, opt_statusstring))
+            opt_failurebits, opt_statusstring))
         goto err;
 
     if (opt_send_error)
@@ -1292,7 +1361,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(ENGINE *engine)
 
     return srv_ctx;
 
- err:
+err:
     ossl_cmp_mock_srv_free(srv_ctx);
     return NULL;
 }
@@ -1304,7 +1373,7 @@ static OSSL_CMP_SRV_CTX *setup_srv_ctx(ENGINE *engine)
 static int setup_verification_ctx(OSSL_CMP_CTX *ctx)
 {
     if (!setup_certs(opt_untrusted, "untrusted certificates", ctx,
-                     (add_X509_stack_fn_t)OSSL_CMP_CTX_set1_untrusted))
+            (add_X509_stack_fn_t)OSSL_CMP_CTX_set1_untrusted))
         return 0;
 
     if (opt_srvcert != NULL || opt_trusted != NULL) {
@@ -1318,8 +1387,8 @@ static int setup_verification_ctx(OSSL_CMP_CTX *ctx)
                 opt_recipient = NULL;
             }
             if (!setup_cert(ctx, opt_srvcert, opt_otherpass,
-                            "directly trusted CMP server certificate",
-                            (add_X509_fn_t)OSSL_CMP_CTX_set1_srvCert))
+                    "directly trusted CMP server certificate",
+                    (add_X509_fn_t)OSSL_CMP_CTX_set1_srvCert))
                 return 0;
         }
         if (opt_trusted != NULL) {
@@ -1343,9 +1412,8 @@ static int setup_verification_ctx(OSSL_CMP_CTX *ctx)
 
     if (opt_out_trusted != NULL) { /* for use in OSSL_CMP_certConf_cb() */
         X509_VERIFY_PARAM *out_vpm = NULL;
-        X509_STORE *out_trusted =
-            load_trusted(opt_out_trusted, 1,
-                         "trusted certs for verifying newly enrolled cert");
+        X509_STORE *out_trusted = load_trusted(opt_out_trusted, 1,
+            "trusted certs for verifying newly enrolled cert");
 
         if (out_trusted == NULL)
             return 0;
@@ -1371,7 +1439,7 @@ static int setup_verification_ctx(OSSL_CMP_CTX *ctx)
  * Returns pointer on success, NULL on error
  */
 static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host,
-                              ENGINE *engine)
+    ENGINE *engine)
 {
     STACK_OF(X509) *untrusted = OSSL_CMP_CTX_get0_untrusted(ctx);
     EVP_PKEY *pkey = NULL;
@@ -1399,8 +1467,8 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host,
         int ok;
 
         if (!load_cert_certs(opt_tls_cert, &cert, &certs, 0, opt_tls_keypass,
-                             "TLS client certificate (optionally with chain)",
-                             vpm))
+                "TLS client certificate (optionally with chain)",
+                vpm))
             /* need opt_tls_keypass if opt_tls_cert is encrypted PKCS#12 file */
             goto err;
 
@@ -1413,7 +1481,7 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host,
          */
         if (!ok || !SSL_CTX_set0_chain(ssl_ctx, certs)) {
             CMP_err1("unable to use client TLS certificate file '%s'",
-                     opt_tls_cert);
+                opt_tls_cert);
             OSSL_STACK_OF_X509_free(certs);
             goto err;
         }
@@ -1434,15 +1502,14 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host,
                 bak_flags = X509_VERIFY_PARAM_get_flags(tls_vpm);
                 /* disable any cert status/revocation checking etc. */
                 X509_VERIFY_PARAM_clear_flags(tls_vpm,
-                                              ~(X509_V_FLAG_USE_CHECK_TIME
-                                                | X509_V_FLAG_NO_CHECK_TIME
-                                                | X509_V_FLAG_PARTIAL_CHAIN
-                                                | X509_V_FLAG_POLICY_CHECK));
+                    ~(X509_V_FLAG_USE_CHECK_TIME
+                        | X509_V_FLAG_NO_CHECK_TIME
+                        | X509_V_FLAG_PARTIAL_CHAIN
+                        | X509_V_FLAG_POLICY_CHECK));
             }
             CMP_debug("trying to build cert chain for own TLS cert");
             if (SSL_CTX_build_cert_chain(ssl_ctx,
-                                         SSL_BUILD_CHAIN_FLAG_UNTRUSTED |
-                                         SSL_BUILD_CHAIN_FLAG_NO_ROOT)) {
+                    SSL_BUILD_CHAIN_FLAG_UNTRUSTED | SSL_BUILD_CHAIN_FLAG_NO_ROOT)) {
                 CMP_debug("success building cert chain for own TLS cert");
             } else {
                 OSSL_CMP_CTX_print_errors(ctx);
@@ -1455,9 +1522,9 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host,
         /* If present we append to the list also the certs from opt_tls_extra */
         if (opt_tls_extra != NULL) {
             STACK_OF(X509) *tls_extra = load_certs_multifile(opt_tls_extra,
-                                                             opt_otherpass,
-                                                             "extra certificates for TLS",
-                                                             vpm);
+                opt_otherpass,
+                "extra certificates for TLS",
+                vpm);
             int res = 1;
 
             if (tls_extra == NULL)
@@ -1477,7 +1544,7 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host,
         }
 
         pkey = load_key_pwd(opt_tls_key, opt_keyform, opt_tls_keypass,
-                            engine, "TLS client private key");
+            engine, "TLS client private key");
         cleanse(opt_tls_keypass);
         if (pkey == NULL)
             goto err;
@@ -1487,9 +1554,9 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host,
          * because it gives poor and sometimes misleading diagnostics
          */
         if (!X509_check_private_key(SSL_CTX_get0_certificate(ssl_ctx),
-                                    pkey)) {
+                pkey)) {
             CMP_err2("TLS private key '%s' does not match the TLS certificate '%s'\n",
-                     opt_tls_key, opt_tls_cert);
+                opt_tls_key, opt_tls_cert);
             EVP_PKEY_free(pkey);
             pkey = NULL; /* otherwise, for some reason double free! */
             goto err;
@@ -1511,11 +1578,11 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, const char *host,
          * the expected hostname would mislead the check.
          */
         if (!truststore_set_host_etc(trust_store,
-                                     opt_tls_host != NULL ? opt_tls_host : host))
+                opt_tls_host != NULL ? opt_tls_host : host))
             goto err;
     }
     return ssl_ctx;
- err:
+err:
     SSL_CTX_free(ssl_ctx);
     return NULL;
 }
@@ -1549,8 +1616,8 @@ static int setup_protection_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
         if (pass_string != NULL) {
             cleanse(opt_secret);
             res = OSSL_CMP_CTX_set1_secretValue(ctx,
-                                                (unsigned char *)pass_string,
-                                                strlen(pass_string));
+                (unsigned char *)pass_string,
+                strlen(pass_string));
             clear_free(pass_string);
             if (res == 0)
                 return 0;
@@ -1559,13 +1626,13 @@ static int setup_protection_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
             CMP_warn("-cert and -key not used for protection since -secret is given");
     }
     if (opt_ref != NULL
-            && !OSSL_CMP_CTX_set1_referenceValue(ctx, (unsigned char *)opt_ref,
-                                                 strlen(opt_ref)))
+        && !OSSL_CMP_CTX_set1_referenceValue(ctx, (unsigned char *)opt_ref,
+            strlen(opt_ref)))
         return 0;
 
     if (opt_key != NULL) {
         EVP_PKEY *pkey = load_key_pwd(opt_key, opt_keyform, opt_keypass, engine,
-                                      "private key for CMP client certificate");
+            "private key for CMP client certificate");
 
         if (pkey == NULL || !OSSL_CMP_CTX_set1_pkey(ctx, pkey)) {
             EVP_PKEY_free(pkey);
@@ -1583,8 +1650,8 @@ static int setup_protection_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
         int ok;
 
         if (!load_cert_certs(opt_cert, &cert, &certs, 0, opt_keypass,
-                             "CMP client certificate (optionally with chain)",
-                             vpm))
+                "CMP client certificate (optionally with chain)",
+                vpm))
             /* opt_keypass is needed if opt_cert is an encrypted PKCS#12 file */
             return 0;
         ok = OSSL_CMP_CTX_set1_cert(ctx, cert);
@@ -1594,7 +1661,7 @@ static int setup_protection_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
         } else {
             if (opt_own_trusted != NULL) {
                 own_trusted = load_trusted(opt_own_trusted, 0,
-                                           "trusted certs for verifying own CMP signer cert");
+                    "trusted certs for verifying own CMP signer cert");
                 ok = own_trusted != NULL;
             }
             ok = ok && OSSL_CMP_CTX_build_cert_chain(ctx, own_trusted, certs);
@@ -1608,7 +1675,7 @@ static int setup_protection_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
     }
 
     if (!setup_certs(opt_extracerts, "extra certificates for CMP", ctx,
-                     (add_X509_stack_fn_t)OSSL_CMP_CTX_set1_extraCertsOut))
+            (add_X509_stack_fn_t)OSSL_CMP_CTX_set1_extraCertsOut))
         return 0;
     cleanse(opt_otherpass);
 
@@ -1660,25 +1727,25 @@ static int set_fallback_pubkey(OSSL_CMP_CTX *ctx)
 
     if (req == NULL) {
         CMP_err1("failed to load ir/cr/kur file '%s' attempting to get fallback public key",
-                 file);
+            file);
         return 0;
     }
     if ((pubkey = OSSL_CMP_MSG_get0_certreq_publickey(req)) == NULL
         || (pkey = X509_PUBKEY_get0(pubkey)) == NULL) {
         CMP_err1("failed to get fallback public key from ir/cr/kur file '%s'",
-                 file);
+            file);
         goto err;
     }
     pkey1 = EVP_PKEY_dup(pkey);
     if (pkey == NULL || !OSSL_CMP_CTX_set0_newPkey(ctx, 0 /* priv */, pkey1)) {
         EVP_PKEY_free(pkey1);
         CMP_err1("failed to get fallback public key obtained from ir/cr/kur file '%s'",
-                 file);
+            file);
         goto err;
     }
     res = 1;
 
- err:
+err:
     OSSL_CMP_MSG_free(req);
     return res;
 }
@@ -1695,8 +1762,8 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
     X509V3_CTX ext_ctx;
 
     if (opt_subject == NULL
-            && opt_csr == NULL && opt_oldcert == NULL && opt_cert == NULL
-            && opt_cmd != CMP_RR && opt_cmd != CMP_GENM)
+        && opt_csr == NULL && opt_oldcert == NULL && opt_cert == NULL
+        && opt_cmd != CMP_RR && opt_cmd != CMP_GENM)
         CMP_warn("no -subject given; no -csr or -oldcert or -cert available for fallback");
 
     if (!set_name(opt_issuer, OSSL_CMP_CTX_set1_issuer, ctx, "issuer"))
@@ -1728,8 +1795,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
             && opt_popo != OSSL_CRMF_POPO_RAVERIFIED) {
             if (opt_csr != NULL) {
                 CMP_err1("no -newkey option given with private key for POPO, -csr option provides just public key%s",
-                         opt_key == NULL ? "" :
-                         ", and -key option superseded by -csr");
+                    opt_key == NULL ? "" : ", and -key option superseded by -csr");
                 if (opt_reqin != NULL)
                     CMP_info("since -reqin is used, may use -popo -1 or -popo 0 to disable the needless generation of a POPO");
                 return 0;
@@ -1755,7 +1821,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
                     return 0;
             } else {
                 CMP_warn1("-subject %s since sender is taken from -ref or -cert",
-                          msg);
+                    msg);
             }
         }
         if (opt_issuer != NULL && opt_cmd != CMP_RR)
@@ -1796,7 +1862,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
         }
         if (opt_subject != NULL)
             CMP_warn2("given -subject '%s' overrides the subject of '%s' for KUR",
-                      opt_subject, ref_cert != NULL ? ref_cert : opt_csr);
+                opt_subject, ref_cert != NULL ? ref_cert : opt_csr);
     }
     if (opt_cmd == CMP_RR) {
         if (opt_issuer == NULL && opt_serial == NULL) {
@@ -1833,7 +1899,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
         }
         if (opt_revreason > CRL_REASON_NONE)
             (void)OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_REVOCATION_REASON,
-                                          opt_revreason);
+                opt_revreason);
     } else {
         if (opt_serial != NULL)
             CMP_warn("Ignoring -serial for command other than 'rr'");
@@ -1844,7 +1910,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
     }
 
     if (opt_recipient == NULL && opt_srvcert == NULL && opt_issuer == NULL
-            && opt_oldcert == NULL && opt_cert == NULL)
+        && opt_oldcert == NULL && opt_cert == NULL)
         CMP_warn("missing -recipient, -srvcert, -issuer, -oldcert or -cert; recipient for any requests not covered by -reqin will be set to \"NULL-DN\"");
 
     if (opt_cmd == CMP_P10CR || opt_cmd == CMP_RR || opt_cmd == CMP_GENM) {
@@ -1886,15 +1952,15 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
             return 0;
         }
     } else if (opt_reqin != NULL
-               && opt_key == NULL && opt_csr == NULL && opt_oldcert == NULL
-               && !opt_centralkeygen) {
+        && opt_key == NULL && opt_csr == NULL && opt_oldcert == NULL
+        && !opt_centralkeygen) {
         if (!set_fallback_pubkey(ctx))
             return 0;
     }
 
     if (opt_days > 0
-            && !OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_VALIDITY_DAYS,
-                                        opt_days)) {
+        && !OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_VALIDITY_DAYS,
+            opt_days)) {
         CMP_err("could not set requested cert validity period");
         return 0;
     }
@@ -1923,13 +1989,13 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
         if (opt_reqexts != NULL
             && !X509V3_EXT_add_nconf_sk(conf, &ext_ctx, opt_reqexts, &exts)) {
             CMP_err1("cannot load certificate request extension section '%s'",
-                     opt_reqexts);
+                opt_reqexts);
             goto exts_err;
         }
         if (opt_policies != NULL
             && !X509V3_EXT_add_nconf_sk(conf, &ext_ctx, opt_policies, &exts)) {
             CMP_err1("cannot load policy cert request extension section '%s'",
-                     opt_policies);
+                opt_policies);
             goto exts_err;
         }
         OSSL_CMP_CTX_set0_reqExtensions(ctx, exts);
@@ -1948,7 +2014,7 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
         if (opt_sans != NULL)
             CMP_warn("-opt_san_nodefault has no effect when -sans is used");
         (void)OSSL_CMP_CTX_set_option(ctx,
-                                      OSSL_CMP_OPT_SUBJECTALTNAME_NODEFAULT, 1);
+            OSSL_CMP_OPT_SUBJECTALTNAME_NODEFAULT, 1);
     }
 
     if (opt_policy_oids_critical) {
@@ -1990,11 +2056,10 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
             CMP_warn("-oldcert option is ignored for 'genm' command");
         } else {
             if (!setup_cert(ctx, opt_oldcert, opt_keypass,
-                            /* needed if opt_oldcert is encrypted PKCS12 file */
-                            opt_cmd == CMP_KUR ? "certificate to be updated" :
-                            opt_cmd == CMP_RR ? "certificate to be revoked" :
-                            "reference certificate (oldcert)",
-                            (add_X509_fn_t)OSSL_CMP_CTX_set1_oldCert))
+                    /* needed if opt_oldcert is encrypted PKCS12 file */
+                    opt_cmd == CMP_KUR ? "certificate to be updated" : opt_cmd == CMP_RR ? "certificate to be revoked"
+                                                                                         : "reference certificate (oldcert)",
+                    (add_X509_fn_t)OSSL_CMP_CTX_set1_oldCert))
                 return 0;
         }
     }
@@ -2002,9 +2067,9 @@ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
 
     return 1;
 
- oom:
+oom:
     CMP_err("out of memory");
- exts_err:
+exts_err:
     sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
     X509_REQ_free(csr);
     return 0;
@@ -2036,7 +2101,7 @@ static int add_certProfile(OSSL_CMP_CTX *ctx, const char *name)
     OSSL_CMP_ITAV_free(itav);
     return 0;
 
- err:
+err:
     sk_ASN1_UTF8STRING_pop_free(sk, ASN1_UTF8STRING_free);
     return 0;
 }
@@ -2079,14 +2144,14 @@ static int handle_opt_geninfo(OSSL_CMP_CTX *ctx)
             if (*ptr != '\0') {
                 if (*ptr != ',') {
                     CMP_err1("Missing ',' or end of -geninfo arg after int at %.40s",
-                             ptr);
+                        ptr);
                     goto err;
                 }
                 ptr++;
             }
 
             if ((aint = ASN1_INTEGER_new()) == NULL
-                    || !ASN1_INTEGER_set(aint, value))
+                || !ASN1_INTEGER_set(aint, value))
                 goto oom;
             ASN1_TYPE_set(type, V_ASN1_INTEGER, aint);
             aint = NULL;
@@ -2098,7 +2163,7 @@ static int handle_opt_geninfo(OSSL_CMP_CTX *ctx)
             else
                 *end++ = '\0';
             if ((text = ASN1_UTF8STRING_new()) == NULL
-                    || !ASN1_STRING_set(text, ptr, -1))
+                || !ASN1_STRING_set(text, ptr, -1))
                 goto oom;
             ptr = end;
             ASN1_TYPE_set(type, V_ASN1_UTF8STRING, text);
@@ -2124,9 +2189,9 @@ static int handle_opt_geninfo(OSSL_CMP_CTX *ctx)
     } while (*ptr != '\0');
     return 1;
 
- oom:
+oom:
     CMP_err("out of memory");
- err:
+err:
     ASN1_OBJECT_free(obj);
     ASN1_TYPE_free(type);
     ASN1_INTEGER_free(aint);
@@ -2174,8 +2239,8 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
         goto set_path;
     }
     if (!OSSL_HTTP_parse_url(opt_server, &use_ssl, NULL /* user */,
-                             &host, &port, &portnum,
-                             &path, NULL /* q */, NULL /* frag */)) {
+            &host, &port, &portnum,
+            &path, NULL /* q */, NULL /* frag */)) {
         CMP_err1("cannot parse -server URL: %s", opt_server);
         goto err;
     }
@@ -2190,21 +2255,21 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
     if (opt_path == NULL)
         used_path = path;
     if (!OSSL_CMP_CTX_set1_server(ctx, host)
-            || !OSSL_CMP_CTX_set_serverPort(ctx, portnum))
+        || !OSSL_CMP_CTX_set_serverPort(ctx, portnum))
         goto oom;
     if (opt_proxy != NULL && !OSSL_CMP_CTX_set1_proxy(ctx, opt_proxy))
         goto oom;
     if (opt_no_proxy != NULL && !OSSL_CMP_CTX_set1_no_proxy(ctx, opt_no_proxy))
         goto oom;
     (void)BIO_snprintf(server_buf, sizeof(server_buf), "http%s://%s:%s/%s",
-                       opt_tls_used ? "s" : "", host, port,
-                       *used_path == '/' ? used_path + 1 : used_path);
+        opt_tls_used ? "s" : "", host, port,
+        *used_path == '/' ? used_path + 1 : used_path);
 
     proxy_host = OSSL_HTTP_adapt_proxy(opt_proxy, opt_no_proxy, host, use_ssl);
     if (proxy_host != NULL)
         (void)BIO_snprintf(proxy_buf, sizeof(proxy_buf), " via %s", proxy_host);
 
- set_path:
+set_path:
 #endif
 
     if (!OSSL_CMP_CTX_set1_serverPath(ctx, used_path))
@@ -2255,19 +2320,19 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
 
     if (opt_keep_alive != 1)
         (void)OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_KEEP_ALIVE,
-                                      opt_keep_alive);
+            opt_keep_alive);
     if (opt_total_timeout > 0 && opt_msg_timeout > 0
-            && opt_total_timeout < opt_msg_timeout) {
+        && opt_total_timeout < opt_msg_timeout) {
         CMP_err2("-total_timeout argument = %d must not be < %d (-msg_timeout)",
-                 opt_total_timeout, opt_msg_timeout);
+            opt_total_timeout, opt_msg_timeout);
         goto err;
     }
     if (opt_msg_timeout >= 0) /* must do this before setup_ssl_ctx() */
         (void)OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_MSG_TIMEOUT,
-                                      opt_msg_timeout);
+            opt_msg_timeout);
     if (opt_total_timeout >= 0)
         (void)OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_TOTAL_TIMEOUT,
-                                      opt_total_timeout);
+            opt_total_timeout);
 
     if (opt_rspin != NULL) {
         rspin_in_use = 1;
@@ -2277,7 +2342,7 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
     if (opt_reqin_new_tid && opt_reqin == NULL)
         CMP_warn("-reqin_new_tid is ignored since -reqin is not present");
     if (opt_reqin != NULL || opt_reqout != NULL
-            || opt_rspin != NULL || opt_rspout != NULL || opt_use_mock_srv)
+        || opt_rspin != NULL || opt_rspout != NULL || opt_use_mock_srv)
         (void)OSSL_CMP_CTX_set_transfer_cb(ctx, read_write_req_resp);
 
 #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
@@ -2321,8 +2386,8 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
         goto err;
 
     if (!set_name(opt_recipient, OSSL_CMP_CTX_set1_recipient, ctx, "recipient")
-            || !set_name(opt_expect_sender, OSSL_CMP_CTX_set1_expected_sender,
-                         ctx, "expected sender"))
+        || !set_name(opt_expect_sender, OSSL_CMP_CTX_set1_expected_sender,
+            ctx, "expected sender"))
         goto err;
 
     if (opt_geninfo != NULL && !handle_opt_geninfo(ctx))
@@ -2333,17 +2398,16 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
     /* not printing earlier, to minimize confusion in case setup fails before */
     if (opt_reqout_only == NULL)
         CMP_info3("will contact %s%s%s ", server_buf, proxy_buf,
-                  opt_rspin == NULL ? "" :
-                  " only if -rspin argument gives too few filenames");
+            opt_rspin == NULL ? "" : " only if -rspin argument gives too few filenames");
 
     ret = 1;
 
- err:
+err:
     OPENSSL_free(host);
     OPENSSL_free(port);
     OPENSSL_free(path);
     return ret;
- oom:
+oom:
     CMP_err("out of memory");
     goto err;
 }
@@ -2356,12 +2420,12 @@ static int setup_client_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
 static int write_cert(BIO *bio, X509 *cert)
 {
     if ((opt_certform == FORMAT_PEM && PEM_write_bio_X509(bio, cert))
-            || (opt_certform == FORMAT_ASN1 && i2d_X509_bio(bio, cert)))
+        || (opt_certform == FORMAT_ASN1 && i2d_X509_bio(bio, cert)))
         return 1;
     if (opt_certform != FORMAT_PEM && opt_certform != FORMAT_ASN1)
         BIO_printf(bio_err,
-                   "error: unsupported type '%s' for writing certificates\n",
-                   opt_certform_s);
+            "error: unsupported type '%s' for writing certificates\n",
+            opt_certform_s);
     return 0;
 }
 
@@ -2369,12 +2433,12 @@ static int write_crl(BIO *bio, X509_CRL *crl)
 {
     if (opt_crlform != FORMAT_PEM && opt_crlform != FORMAT_ASN1) {
         BIO_printf(bio_err, "error: unsupported type '%s' for writing CRLs\n",
-                   opt_crlform_s);
+            opt_crlform_s);
         return 0;
     }
 
     return opt_crlform == FORMAT_PEM ? PEM_write_bio_X509_CRL(bio, crl)
-                                      : i2d_X509_CRL_bio(bio, crl);
+                                     : i2d_X509_CRL_bio(bio, crl);
 }
 
 /*
@@ -2386,7 +2450,7 @@ static int write_crl(BIO *bio, X509_CRL *crl)
  * Returns number of written certificates on success, -1 on error.
  */
 static int save_free_certs(STACK_OF(X509) *certs,
-                           const char *file, const char *desc)
+    const char *file, const char *desc)
 {
     BIO *bio = NULL;
     int i;
@@ -2398,14 +2462,14 @@ static int save_free_certs(STACK_OF(X509) *certs,
         goto end;
     if (certs != NULL)
         CMP_info3("received %d %s certificate(s), saving to file '%s'",
-                  n, desc, file);
+            n, desc, file);
     if (n > 1 && opt_certform != FORMAT_PEM)
         CMP_warn("saving more than one certificate in non-PEM format");
 
     if ((bio = BIO_new(BIO_s_file())) == NULL
-            || !BIO_write_filename(bio, (char *)file)) {
+        || !BIO_write_filename(bio, (char *)file)) {
         CMP_err3("could not open file '%s' for %s %s certificate(s)",
-                 file, certs == NULL ? "deleting" : "writing", desc);
+            file, certs == NULL ? "deleting" : "writing", desc);
         n = -1;
         goto end;
     }
@@ -2418,14 +2482,14 @@ static int save_free_certs(STACK_OF(X509) *certs,
         }
     }
 
- end:
+end:
     BIO_free(bio);
     OSSL_STACK_OF_X509_free(certs);
     return n;
 }
 
 static int save_crl(X509_CRL *crl,
-                    const char *file, const char *desc)
+    const char *file, const char *desc)
 {
     BIO *bio = NULL;
     int res = 0;
@@ -2436,9 +2500,9 @@ static int save_crl(X509_CRL *crl,
         CMP_info2("received %s, saving to file '%s'", desc, file);
 
     if ((bio = BIO_new(BIO_s_file())) == NULL
-            || !BIO_write_filename(bio, (char *)file)) {
+        || !BIO_write_filename(bio, (char *)file)) {
         CMP_err2("could not open file '%s' for writing %s",
-                 file, desc);
+            file, desc);
         goto end;
     }
 
@@ -2448,7 +2512,7 @@ static int save_crl(X509_CRL *crl,
     }
     res = 1;
 
- end:
+end:
     BIO_free(bio);
     return res;
 }
@@ -2460,7 +2524,7 @@ static int delete_file(const char *file, const char *desc)
 
     if (unlink(file) != 0 && errno != ENOENT) {
         CMP_err2("Failed to delete %s, which should be done to indicate there is no %s",
-                 file, desc);
+            file, desc);
         return 0;
     }
     return 1;
@@ -2499,13 +2563,14 @@ static int save_template(const char *file, const OSSL_CRMF_CERTTEMPLATE *tmpl)
 
     if (bio == NULL) {
         CMP_err1("error saving certTemplate from genp: cannot open file %s",
-                 file);
+            file);
         return 0;
     }
     if (!ASN1_i2d_bio_of(OSSL_CRMF_CERTTEMPLATE, i2d_OSSL_CRMF_CERTTEMPLATE,
-                         bio, tmpl)) {
+            bio, tmpl)) {
         CMP_err1("error saving certTemplate from genp: cannot write file %s",
-                 file);
+            file);
+        BIO_free(bio);
         return 0;
     } else {
         CMP_info1("stored certTemplate from genp to file '%s'", file);
@@ -2525,6 +2590,7 @@ static int save_keyspec(const char *file, const OSSL_CMP_ATAVS *keyspec)
 
     if (!ASN1_i2d_bio_of(OSSL_CMP_ATAVS, i2d_OSSL_CMP_ATAVS, bio, keyspec)) {
         CMP_err1("error saving keySpec from genp: cannot write file %s", file);
+        BIO_free(bio);
         return 0;
     } else {
         CMP_info1("stored keySpec from genp to file '%s'", file);
@@ -2594,7 +2660,7 @@ static const char *prev_item(const char *opt, const char *end)
     len = end - beg;
     if (len > SECTION_NAME_MAX) {
         CMP_warn3("using only first %d characters of section name starting with \"%.*s\"",
-                  SECTION_NAME_MAX, SECTION_NAME_MAX, beg);
+            SECTION_NAME_MAX, SECTION_NAME_MAX, beg);
         len = SECTION_NAME_MAX;
     }
     memcpy(opt_item, beg, len);
@@ -2611,7 +2677,7 @@ static const char *prev_item(const char *opt, const char *end)
 
 /* get str value for name from a comma-separated hierarchy of config sections */
 static char *conf_get_string(const CONF *src_conf, const char *groups,
-                             const char *name)
+    const char *name)
 {
     char *res = NULL;
     const char *end = groups + strlen(groups);
@@ -2625,7 +2691,7 @@ static char *conf_get_string(const CONF *src_conf, const char *groups,
 
 /* get long val for name from a comma-separated hierarchy of config sections */
 static int conf_get_number_e(const CONF *conf_, const char *groups,
-                             const char *name, long *result)
+    const char *name, long *result)
 {
     char *str = conf_get_string(conf_, groups, name);
     char *tailptr;
@@ -2662,25 +2728,22 @@ static int read_config(void)
     int n_options = OSSL_NELEM(cmp_options) - 1;
 
     for (opt = &cmp_options[start_opt], i = start_idx;
-         opt->name != NULL; i++, opt++)
+        opt->name != NULL; i++, opt++)
         if (!strcmp(opt->name, OPT_SECTION_STR)
-                || !strcmp(opt->name, OPT_MORE_STR))
+            || !strcmp(opt->name, OPT_MORE_STR))
             n_options--;
-    OPENSSL_assert(OSSL_NELEM(cmp_vars) == n_options
-                   + OPT_PROV__FIRST + 1 - OPT_PROV__LAST
-                   + OPT_R__FIRST + 1 - OPT_R__LAST
-                   + OPT_V__FIRST + 1 - OPT_V__LAST);
+    OPENSSL_assert(OSSL_NELEM(cmp_vars) == n_options + OPT_PROV__FIRST + 1 - OPT_PROV__LAST + OPT_R__FIRST + 1 - OPT_R__LAST + OPT_V__FIRST + 1 - OPT_V__LAST);
     for (opt = &cmp_options[start_opt], i = start_idx;
-         opt->name != NULL; i++, opt++) {
+        opt->name != NULL; i++, opt++) {
         int provider_option = (OPT_PROV__FIRST <= opt->retval
-                               && opt->retval < OPT_PROV__LAST);
+            && opt->retval < OPT_PROV__LAST);
         int rand_state_option = (OPT_R__FIRST <= opt->retval
-                                 && opt->retval < OPT_R__LAST);
+            && opt->retval < OPT_R__LAST);
         int verification_option = (OPT_V__FIRST <= opt->retval
-                                   && opt->retval < OPT_V__LAST);
+            && opt->retval < OPT_V__LAST);
 
         if (strcmp(opt->name, OPT_SECTION_STR) == 0
-                || strcmp(opt->name, OPT_MORE_STR) == 0) {
+            || strcmp(opt->name, OPT_MORE_STR) == 0) {
             i--;
             continue;
         }
@@ -2698,12 +2761,12 @@ static int read_config(void)
             }
             if (opt->valtype == 'p' && num <= 0) {
                 opt_printf_stderr("Non-positive number \"%ld\" for config option -%s\n",
-                                  num, opt->name);
+                    num, opt->name);
                 return -1;
             }
             if (opt->valtype == 'N' && num < 0) {
                 opt_printf_stderr("Negative number \"%ld\" for config option -%s\n",
-                                  num, opt->name);
+                    num, opt->name);
                 return -1;
             }
             break;
@@ -2718,7 +2781,7 @@ static int read_config(void)
             break;
         default:
             CMP_err2("internal: unsupported type '%c' for option '%s'",
-                     opt->valtype, opt->name);
+                opt->valtype, opt->name);
             return 0;
             break;
         }
@@ -2742,10 +2805,10 @@ static int read_config(void)
                 (void)opt_init(conf_argc, conf_argv, cmp_options);
 
                 if (provider_option
-                    ? !opt_provider(opt_next())
-                    : !opt_verify(opt_next(), vpm)) {
+                        ? !opt_provider(opt_next())
+                        : !opt_verify(opt_next(), vpm)) {
                     CMP_err2("for option '%s' in config file section '%s'",
-                             opt->name, opt_section);
+                        opt->name, opt_section);
                     return 0;
                 }
             }
@@ -2757,8 +2820,8 @@ static int read_config(void)
             case 'N':
                 if (num < INT_MIN || INT_MAX < num) {
                     BIO_printf(bio_err,
-                               "integer value out of range for option '%s'\n",
-                               opt->name);
+                        "integer value out of range for option '%s'\n",
+                        opt->name);
                     return 0;
                 }
                 *cmp_vars[i].num = (int)num;
@@ -2784,7 +2847,7 @@ static char *opt_str(void)
 
     if (arg[0] == '\0') {
         CMP_warn1("%s option argument is empty string, resetting option",
-                  opt_flag());
+            opt_flag());
         arg = NULL;
     } else if (arg[0] == '-') {
         CMP_warn1("%s option argument starts with hyphen", opt_flag());
@@ -2803,7 +2866,7 @@ static int get_opts(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             return 0;
         case OPT_HELP:
@@ -3014,7 +3077,7 @@ static int get_opts(int argc, char **argv)
         case OPT_POPO:
             opt_popo = opt_int_arg();
             if (opt_popo < OSSL_CRMF_POPO_NONE
-                    || opt_popo > OSSL_CRMF_POPO_KEYENC) {
+                || opt_popo > OSSL_CRMF_POPO_KEYENC) {
                 CMP_err("invalid popo spec. Valid values are -1 .. 2");
                 goto opthelp;
             }
@@ -3043,8 +3106,8 @@ static int get_opts(int argc, char **argv)
         case OPT_REVREASON:
             opt_revreason = opt_int_arg();
             if (opt_revreason < CRL_REASON_NONE
-                    || opt_revreason > CRL_REASON_AA_COMPROMISE
-                    || opt_revreason == 7) {
+                || opt_revreason > CRL_REASON_AA_COMPROMISE
+                || opt_revreason == 7) {
                 CMP_err("invalid revreason. Valid values are -1 .. 6, 8 .. 10");
                 goto opthelp;
             }
@@ -3234,9 +3297,9 @@ static int cmp_server(OSSL_CMP_CTX *srv_cmp_ctx)
         OSSL_CMP_MSG *resp = NULL;
 
         ret = http_server_get_asn1_req(ASN1_ITEM_rptr(OSSL_CMP_MSG),
-                                       (ASN1_VALUE **)&req, &path,
-                                       &cbio, acbio, &keep_alive,
-                                       prog, 0, 0);
+            (ASN1_VALUE **)&req, &path,
+            &cbio, acbio, &keep_alive,
+            prog, 0, 0);
         if (ret == 0) { /* no request yet */
             if (retry) {
                 OSSL_sleep(1000);
@@ -3255,23 +3318,23 @@ static int cmp_server(OSSL_CMP_CTX *srv_cmp_ctx)
             if (strcmp(path, "") != 0 && strcmp(path, "pkix/") != 0) {
                 (void)http_server_send_status(prog, cbio, 404, "Not Found");
                 CMP_err1("expecting empty path or 'pkix/' but got '%s'",
-                         path);
+                    path);
                 OPENSSL_free(path);
                 OSSL_CMP_MSG_free(req);
                 goto next;
             }
             OPENSSL_free(path);
-            resp = OSSL_CMP_CTX_server_perform(cmp_ctx, req);
+            resp = OSSL_CMP_CTX_server_perform(cmp_ctx /* of client */, req);
             OSSL_CMP_MSG_free(req);
             if (resp == NULL) {
                 (void)http_server_send_status(prog, cbio,
-                                              500, "Internal Server Error");
+                    500, "Internal Server Error");
                 break; /* treated as fatal error */
             }
             ret = http_server_send_asn1_resp(prog, cbio, keep_alive,
-                                             "application/pkixcmp",
-                                             ASN1_ITEM_rptr(OSSL_CMP_MSG),
-                                             (const ASN1_VALUE *)resp);
+                "application/pkixcmp",
+                ASN1_ITEM_rptr(OSSL_CMP_MSG),
+                (const ASN1_VALUE *)resp);
             OSSL_CMP_MSG_free(resp);
             if (!ret)
                 break; /* treated as fatal error */
@@ -3321,28 +3384,26 @@ static void print_keyspec(OSSL_CMP_ATAVS *keySpec)
         int nid = OBJ_obj2nid(type);
 
         switch (nid) {
-        case NID_id_regCtrl_algId:
-            {
-                X509_ALGOR *alg = OSSL_CMP_ATAV_get0_algId(atav);
-                const ASN1_OBJECT *oid;
-                int paramtype;
-                const void *param;
-
-                X509_ALGOR_get0(&oid, &paramtype, &param, alg);
-                BIO_printf(mem, "Key algorithm: ");
-                i2a_ASN1_OBJECT(mem, oid);
-                if (paramtype == V_ASN1_UNDEF || alg->parameter == NULL) {
-                    BIO_printf(mem, "\n");
-                } else {
-                    BIO_printf(mem, " - ");
-                    ASN1_item_print(mem, (ASN1_VALUE *)alg,
-                                    0, ASN1_ITEM_rptr(X509_ALGOR), NULL);
-                }
+        case NID_id_regCtrl_algId: {
+            X509_ALGOR *alg = OSSL_CMP_ATAV_get0_algId(atav);
+            const ASN1_OBJECT *oid;
+            int paramtype;
+            const void *param;
+
+            X509_ALGOR_get0(&oid, &paramtype, &param, alg);
+            BIO_printf(mem, "Key algorithm: ");
+            i2a_ASN1_OBJECT(mem, oid);
+            if (paramtype == V_ASN1_UNDEF || alg->parameter == NULL) {
+                BIO_printf(mem, "\n");
+            } else {
+                BIO_printf(mem, " - ");
+                ASN1_item_print(mem, (ASN1_VALUE *)alg,
+                    0, ASN1_ITEM_rptr(X509_ALGOR), NULL);
             }
-            break;
+        } break;
         case NID_id_regCtrl_rsaKeyLen:
             BIO_printf(mem, "Key algorithm: RSA %d\n",
-                       OSSL_CMP_ATAV_get_rsaKeyLen(atav));
+                OSSL_CMP_ATAV_get_rsaKeyLen(atav));
             break;
         default:
             BIO_printf(mem, "Invalid key spec: %s\n", nid_name(nid));
@@ -3365,8 +3426,7 @@ static void print_status(void)
     /* print PKIStatusInfo */
     int status = OSSL_CMP_CTX_get_status(cmp_ctx);
     char *buf = app_malloc(OSSL_CMP_PKISI_BUFLEN, "PKIStatusInfo buf");
-    const char *string =
-        OSSL_CMP_CTX_snprint_PKIStatus(cmp_ctx, buf, OSSL_CMP_PKISI_BUFLEN);
+    const char *string = OSSL_CMP_CTX_snprint_PKIStatus(cmp_ctx, buf, OSSL_CMP_PKISI_BUFLEN);
     const char *from = "", *server = "";
 
 #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
@@ -3376,16 +3436,17 @@ static void print_status(void)
     }
 #endif
     CMP_print(bio_err,
-              status == OSSL_CMP_PKISTATUS_accepted
-              ? OSSL_CMP_LOG_INFO :
-              status == OSSL_CMP_PKISTATUS_rejection
-              || status == OSSL_CMP_PKISTATUS_waiting
-              ? OSSL_CMP_LOG_ERR : OSSL_CMP_LOG_WARNING,
-              status == OSSL_CMP_PKISTATUS_accepted ? "info" :
-              status == OSSL_CMP_PKISTATUS_rejection ? "server error" :
-              status == OSSL_CMP_PKISTATUS_waiting ? "internal error"
-              : "warning", "received%s%s %s", from, server,
-              string != NULL ? string : "<unknown PKIStatus>");
+        status == OSSL_CMP_PKISTATUS_accepted
+            ? OSSL_CMP_LOG_INFO
+            : status == OSSL_CMP_PKISTATUS_rejection
+                || status == OSSL_CMP_PKISTATUS_waiting
+            ? OSSL_CMP_LOG_ERR
+            : OSSL_CMP_LOG_WARNING,
+        status == OSSL_CMP_PKISTATUS_accepted ? "info" : status == OSSL_CMP_PKISTATUS_rejection ? "server error"
+            : status == OSSL_CMP_PKISTATUS_waiting                                              ? "internal error"
+                                                                                                : "warning",
+        "received%s%s %s", from, server,
+        string != NULL ? string : "<unknown PKIStatus>");
     OPENSSL_free(buf);
 }
 
@@ -3407,7 +3468,7 @@ static int do_genm(OSSL_CMP_CTX *ctx)
             CMP_warn("no CA certificates provided by server");
         } else if (save_free_certs(cacerts, opt_cacertsout, "CA") < 0) {
             CMP_err1("Failed to store CA certificates from genp in %s",
-                     opt_cacertsout);
+                opt_cacertsout);
             return 0;
         }
         return 1;
@@ -3426,12 +3487,12 @@ static int do_genm(OSSL_CMP_CTX *ctx)
             CMP_warn("No -oldwithold given, will use all certs given with -trusted as trust anchors for verifying the newWithNew cert");
         } else {
             oldwithold = load_cert_pwd(opt_oldwithold, opt_otherpass,
-                                       "OldWithOld cert for genm with -infotype rootCaCert");
+                "OldWithOld cert for genm with -infotype rootCaCert");
             if (oldwithold == NULL)
                 goto end_upd;
         }
         if (!OSSL_CMP_get1_rootCaKeyUpdate(ctx, oldwithold, &newwithnew,
-                                           &newwithold, &oldwithnew))
+                &newwithold, &oldwithnew))
             goto end_upd;
         /* At this point might check authorization of response sender/origin */
 
@@ -3441,11 +3502,11 @@ static int do_genm(OSSL_CMP_CTX *ctx)
             CMP_warn("oldWithNew certificate received in genp for verifying oldWithOld, but oldWithOld was not provided");
 
         if (save_cert_or_delete(newwithnew, opt_newwithnew,
-                                "NewWithNew cert from genp")
+                "NewWithNew cert from genp")
             && save_cert_or_delete(newwithold, opt_newwithold,
-                                   "NewWithOld cert from genp")
+                "NewWithOld cert from genp")
             && save_cert_or_delete(oldwithnew, opt_oldwithnew,
-                                   "OldWithNew cert from genp"))
+                "OldWithNew cert from genp"))
             res = 1;
 
         X509_free(newwithnew);
@@ -3471,21 +3532,21 @@ static int do_genm(OSSL_CMP_CTX *ctx)
 
         if (opt_crlcert != NULL) {
             crlcert = load_cert_pwd(opt_crlcert, opt_otherpass,
-                                    "Cert for genm with -infotype crlStatusList");
+                "Cert for genm with -infotype crlStatusList");
             if (crlcert == NULL)
                 goto end_crlupd;
         }
 
         if (opt_oldcrl != NULL) {
             oldcrl = load_crl(opt_oldcrl, FORMAT_UNDEF, 0,
-                              "CRL for genm with -infotype crlStatusList");
+                "CRL for genm with -infotype crlStatusList");
             if (oldcrl == NULL)
                 goto end_crlupd;
         }
 
         if (opt_oldcrl != NULL && opt_crlcert != NULL) {
             if (X509_NAME_cmp(X509_CRL_get_issuer(oldcrl),
-                              X509_get_issuer_name(crlcert))
+                    X509_get_issuer_name(crlcert))
                 != 0)
                 CMP_warn("-oldcrl and -crlcert have different issuer");
         }
@@ -3548,12 +3609,12 @@ static int do_genm(OSSL_CMP_CTX *ctx)
 
         if (opt_infotype != NID_undef) {
             CMP_warn1("No specific support for -infotype %s available",
-                      opt_infotype_s);
+                opt_infotype_s);
 
             req = OSSL_CMP_ITAV_create(OBJ_nid2obj(opt_infotype), NULL);
             if (req == NULL || !OSSL_CMP_CTX_push0_genm_ITAV(ctx, req)) {
                 CMP_err1("Failed to create genm for -infotype %s",
-                         opt_infotype_s);
+                    opt_infotype_s);
                 return 0;
             }
         }
@@ -3586,11 +3647,12 @@ static int handle_opts_upfront(int argc, char **argv)
             if (!strcmp(argv[i] + 1, cmp_options[OPT_CONFIG - OPT_HELP].name))
                 opt_config = argv[++i];
             else if (!strcmp(argv[i] + 1,
-                             cmp_options[OPT_SECTION - OPT_HELP].name))
+                         cmp_options[OPT_SECTION - OPT_HELP].name))
                 opt_section = argv[++i];
             else if (strcmp(argv[i] + 1,
-                            cmp_options[OPT_VERBOSITY - OPT_HELP].name) == 0
-                     && !set_verbosity(atoi(argv[++i])))
+                         cmp_options[OPT_VERBOSITY - OPT_HELP].name)
+                    == 0
+                && !set_verbosity(atoi(argv[++i])))
                 return 0;
         }
     }
@@ -3605,7 +3667,6 @@ int cmp_main(int argc, char **argv)
     int i;
     X509 *newcert = NULL;
     ENGINE *engine = NULL;
-    OSSL_CMP_CTX *srv_cmp_ctx = NULL;
     int ret = 0; /* default: failure */
 
     if (!handle_opts_upfront(argc, argv))
@@ -3620,10 +3681,10 @@ int cmp_main(int argc, char **argv)
     /* read default values for options from config file */
     configfile = opt_config != NULL ? opt_config : default_config_file;
     if (configfile != NULL && configfile[0] != '\0' /* non-empty string */
-            && (configfile != default_config_file
-                || access(configfile, F_OK) != -1)) {
+        && (configfile != default_config_file
+            || access(configfile, F_OK) != -1)) {
         CMP_info2("using section(s) '%s' of OpenSSL configuration file '%s'",
-                  opt_section, configfile);
+            opt_section, configfile);
         conf = app_load_config(configfile);
         if (conf == NULL) {
             goto err;
@@ -3632,14 +3693,14 @@ int cmp_main(int argc, char **argv)
                 if (!NCONF_get_section(conf, opt_section))
                     CMP_info2("no [%s] section found in config file '%s';"
                               " will thus use just [default] and unnamed section if present",
-                              opt_section, configfile);
+                        opt_section, configfile);
             } else {
                 const char *end = opt_section + strlen(opt_section);
 
                 while ((end = prev_item(opt_section, end)) != NULL) {
                     if (!NCONF_get_section(conf, opt_item)) {
                         CMP_err2("no [%s] section found in config file '%s'",
-                                 opt_item, configfile);
+                            opt_item, configfile);
                         goto err;
                     }
                 }
@@ -3673,7 +3734,7 @@ int cmp_main(int argc, char **argv)
 
     if (opt_engine != NULL) {
         engine = setup_engine_methods(opt_engine,
-                                      0 /* not: ENGINE_METHOD_ALL */, 0);
+            0 /* not: ENGINE_METHOD_ALL */, 0);
         if (engine == NULL) {
             CMP_err1("cannot load engine %s", opt_engine);
             goto err;
@@ -3688,8 +3749,8 @@ int cmp_main(int argc, char **argv)
 
 #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
     if (opt_tls_cert == NULL && opt_tls_key == NULL && opt_tls_keypass == NULL
-            && opt_tls_extra == NULL && opt_tls_trusted == NULL
-            && opt_tls_host == NULL) {
+        && opt_tls_extra == NULL && opt_tls_trusted == NULL
+        && opt_tls_host == NULL) {
         if (opt_tls_used)
             CMP_warn("-tls_used given without any other TLS options");
     } else if (!opt_tls_used) {
@@ -3713,45 +3774,49 @@ int cmp_main(int argc, char **argv)
             goto err;
         }
     }
+
     if (opt_server != NULL && opt_use_mock_srv) {
         CMP_err("cannot use both -server and -use_mock_srv options");
         goto err;
     }
+    if ((opt_server == NULL || opt_use_mock_srv) && opt_tls_used) {
+        CMP_warn("ignoring -tls_used option since -server is not given or -use_mock_srv is given");
+        opt_tls_used = 0;
+    }
+
 #endif
 
     if (opt_ignore_keyusage)
         (void)OSSL_CMP_CTX_set_option(cmp_ctx, OSSL_CMP_OPT_IGNORE_KEYUSAGE, 1);
     if (opt_no_cache_extracerts)
         (void)OSSL_CMP_CTX_set_option(cmp_ctx, OSSL_CMP_OPT_NO_CACHE_EXTRACERTS,
-                                      1);
+            1);
 
     if (opt_reqout_only == NULL && (opt_use_mock_srv
 #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
-                                    || opt_port != NULL
+            || opt_port != NULL
 #endif
-                                    )) {
+            )) {
         OSSL_CMP_SRV_CTX *srv_ctx;
+        OSSL_CMP_CTX *srv_cmp_ctx;
 
         if ((srv_ctx = setup_srv_ctx(engine)) == NULL)
             goto err;
+        OSSL_CMP_CTX_set_transfer_cb_arg(cmp_ctx /* of client */, srv_ctx);
+
         srv_cmp_ctx = OSSL_CMP_SRV_CTX_get0_cmp_ctx(srv_ctx);
-        OSSL_CMP_CTX_set_transfer_cb_arg(cmp_ctx, srv_ctx);
         if (!OSSL_CMP_CTX_set_log_cb(srv_cmp_ctx, print_to_bio_err)) {
             CMP_err1("cannot set up error reporting and logging for %s", prog);
             goto err;
         }
         OSSL_CMP_CTX_set_log_verbosity(srv_cmp_ctx, opt_verbosity);
-    }
 
 #if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
-    if (opt_tls_used && (opt_use_mock_srv || opt_server == NULL)) {
-        CMP_warn("ignoring -tls_used option since -use_mock_srv is given or -server is not given");
-        opt_tls_used = 0;
-    }
-
-    if (opt_port != NULL) { /* act as very basic CMP HTTP server */
-        ret = cmp_server(srv_cmp_ctx);
-        goto err;
+        if (opt_port != NULL) { /* act as very basic CMP HTTP server only */
+            ret = cmp_server(srv_cmp_ctx);
+            goto err;
+        }
+#endif
     }
 
     /* act as CMP client, possibly using internal mock server */
@@ -3759,10 +3824,14 @@ int cmp_main(int argc, char **argv)
     if (opt_reqout_only != NULL) {
         const char *msg = "option is ignored since -reqout_only option is given";
 
-# if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
+#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
+        if (opt_port != NULL) {
+            CMP_err("the -reqout_only client option does not combine with -port implying server behavior");
+            goto err;
+        }
         if (opt_server != NULL)
             CMP_warn1("-server %s", msg);
-# endif
+#endif
         if (opt_use_mock_srv)
             CMP_warn1("-use_mock_srv %s", msg);
         if (opt_reqout != NULL)
@@ -3774,12 +3843,13 @@ int cmp_main(int argc, char **argv)
         opt_reqout = opt_reqout_only;
     }
     if (opt_rspin != NULL) {
+#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
         if (opt_server != NULL)
             CMP_warn("-server option is not used if enough filenames given for -rspin");
+#endif
         if (opt_use_mock_srv)
             CMP_warn("-use_mock_srv option is not used if enough filenames given for -rspin");
     }
-#endif
 
     if (!setup_client_ctx(cmp_ctx, engine)) {
         CMP_err("cannot set up CMP context");
@@ -3827,23 +3897,22 @@ int cmp_main(int argc, char **argv)
         }
         print_status();
         if (!save_cert_or_delete(OSSL_CMP_CTX_get0_validatedSrvCert(cmp_ctx),
-                                 opt_srvcertout, "validated server"))
+                opt_srvcertout, "validated server"))
             ret = 0;
         if (!ret)
             goto err;
         ret = 0;
         if (save_free_certs(OSSL_CMP_CTX_get1_extraCertsIn(cmp_ctx),
-                            opt_extracertsout, "extra") < 0)
+                opt_extracertsout, "extra")
+            < 0)
             goto err;
-        if (newcert != NULL && (opt_cmd == CMP_IR || opt_cmd == CMP_CR
-                                || opt_cmd == CMP_KUR || opt_cmd == CMP_P10CR)) {
+        if (newcert != NULL && (opt_cmd == CMP_IR || opt_cmd == CMP_CR || opt_cmd == CMP_KUR || opt_cmd == CMP_P10CR)) {
             STACK_OF(X509) *newchain = OSSL_CMP_CTX_get1_newChain(cmp_ctx);
 
             if (newcert != NULL && newchain != NULL /* NULL is on error only */
                 && opt_certout != NULL && opt_chainout != NULL
                 && strcmp(opt_certout, opt_chainout) == 0) {
-                if (!X509_add_cert(newchain, newcert, X509_ADD_FLAG_PREPEND
-                                   | X509_ADD_FLAG_UP_REF)) {
+                if (!X509_add_cert(newchain, newcert, X509_ADD_FLAG_PREPEND | X509_ADD_FLAG_UP_REF)) {
                     sk_X509_pop_free(newchain, X509_free);
                     goto err;
                 }
@@ -3855,7 +3924,8 @@ int cmp_main(int argc, char **argv)
                     goto err;
             }
             if (save_free_certs(OSSL_CMP_CTX_get1_caPubs(cmp_ctx),
-                                opt_cacertsout, "CA") < 0)
+                    opt_cacertsout, "CA")
+                < 0)
                 goto err;
             if (opt_centralkeygen) {
                 EVP_CIPHER *cipher = NULL;
@@ -3870,13 +3940,14 @@ int cmp_main(int argc, char **argv)
                     goto err;
                 if (opt_newkeypass != NULL) {
                     pass_string = get_passwd(opt_newkeypass,
-                                             "Centrally generated private key password");
+                        "Centrally generated private key password");
                     cipher = EVP_CIPHER_fetch(app_get0_libctx(), SN_aes_256_cbc, app_get0_propq());
                 }
 
                 CMP_info1("saving centrally generated key to file '%s'", opt_newkeyout);
                 if (PEM_write_bio_PrivateKey(out, new_key, cipher, NULL, 0, NULL,
-                                             (void *)pass_string) <= 0)
+                        (void *)pass_string)
+                    <= 0)
                     result = 0;
 
                 BIO_free(out);
@@ -3891,7 +3962,7 @@ int cmp_main(int argc, char **argv)
     }
     ret = 1;
 
- err:
+err:
     /* in case we ended up here on error without proper cleaning */
     cleanse(opt_keypass);
     cleanse(opt_newkeypass);
diff --git a/apps/cms.c b/apps/cms.c
index 5227ec2357fc8..214eea5bcb0ac 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -24,31 +24,30 @@
 static int save_certs(char *signerfile, STACK_OF(X509) *signers);
 static int cms_cb(int ok, X509_STORE_CTX *ctx);
 static void receipt_request_print(CMS_ContentInfo *cms);
-static CMS_ReceiptRequest
-*make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to, int rr_allorfirst,
-                      STACK_OF(OPENSSL_STRING) *rr_from);
+static CMS_ReceiptRequest *make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to, int rr_allorfirst,
+    STACK_OF(OPENSSL_STRING) *rr_from);
 static int cms_set_pkey_param(EVP_PKEY_CTX *pctx,
-                              STACK_OF(OPENSSL_STRING) *param);
-
-#define SMIME_OP                0x100
-#define SMIME_IP                0x200
-#define SMIME_SIGNERS           0x400
-#define SMIME_ENCRYPT           (1 | SMIME_OP)
-#define SMIME_DECRYPT           (2 | SMIME_IP)
-#define SMIME_SIGN              (3 | SMIME_OP | SMIME_SIGNERS)
-#define SMIME_VERIFY            (4 | SMIME_IP)
-#define SMIME_RESIGN            (5 | SMIME_IP | SMIME_OP | SMIME_SIGNERS)
-#define SMIME_SIGN_RECEIPT      (6 | SMIME_IP | SMIME_OP)
-#define SMIME_VERIFY_RECEIPT    (7 | SMIME_IP)
-#define SMIME_DIGEST_CREATE     (8 | SMIME_OP)
-#define SMIME_DIGEST_VERIFY     (9 | SMIME_IP)
-#define SMIME_COMPRESS          (10 | SMIME_OP)
-#define SMIME_UNCOMPRESS        (11 | SMIME_IP)
+    STACK_OF(OPENSSL_STRING) *param);
+
+#define SMIME_OP 0x100
+#define SMIME_IP 0x200
+#define SMIME_SIGNERS 0x400
+#define SMIME_ENCRYPT (1 | SMIME_OP)
+#define SMIME_DECRYPT (2 | SMIME_IP)
+#define SMIME_SIGN (3 | SMIME_OP | SMIME_SIGNERS)
+#define SMIME_VERIFY (4 | SMIME_IP)
+#define SMIME_RESIGN (5 | SMIME_IP | SMIME_OP | SMIME_SIGNERS)
+#define SMIME_SIGN_RECEIPT (6 | SMIME_IP | SMIME_OP)
+#define SMIME_VERIFY_RECEIPT (7 | SMIME_IP)
+#define SMIME_DIGEST_CREATE (8 | SMIME_OP)
+#define SMIME_DIGEST_VERIFY (9 | SMIME_IP)
+#define SMIME_COMPRESS (10 | SMIME_OP)
+#define SMIME_UNCOMPRESS (11 | SMIME_IP)
 #define SMIME_ENCRYPTED_ENCRYPT (12 | SMIME_OP)
 #define SMIME_ENCRYPTED_DECRYPT (13 | SMIME_IP)
-#define SMIME_DATA_CREATE       (14 | SMIME_OP)
-#define SMIME_DATA_OUT          (15 | SMIME_IP)
-#define SMIME_CMSOUT            (16 | SMIME_IP | SMIME_OP)
+#define SMIME_DATA_CREATE (14 | SMIME_OP)
+#define SMIME_DATA_OUT (15 | SMIME_IP)
+#define SMIME_CMSOUT (16 | SMIME_IP | SMIME_OP)
 
 static int verify_err = 0;
 
@@ -62,191 +61,252 @@ struct cms_key_param_st {
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_ENCRYPT,
-    OPT_DECRYPT, OPT_SIGN, OPT_CADES, OPT_SIGN_RECEIPT, OPT_RESIGN,
-    OPT_VERIFY, OPT_VERIFY_RETCODE, OPT_VERIFY_RECEIPT,
-    OPT_CMSOUT, OPT_DATA_OUT, OPT_DATA_CREATE, OPT_DIGEST_VERIFY,
-    OPT_DIGEST, OPT_DIGEST_CREATE, OPT_COMPRESS, OPT_UNCOMPRESS,
-    OPT_ED_DECRYPT, OPT_ED_ENCRYPT, OPT_DEBUG_DECRYPT, OPT_TEXT,
-    OPT_ASCIICRLF, OPT_NOINTERN, OPT_NOVERIFY, OPT_NOCERTS,
-    OPT_NOATTR, OPT_NODETACH, OPT_NOSMIMECAP, OPT_NO_SIGNING_TIME,
-    OPT_BINARY, OPT_KEYID,
-    OPT_NOSIGS, OPT_NO_CONTENT_VERIFY, OPT_NO_ATTR_VERIFY, OPT_INDEF,
-    OPT_NOINDEF, OPT_CRLFEOL, OPT_NOOUT, OPT_RR_PRINT,
-    OPT_RR_ALL, OPT_RR_FIRST, OPT_RCTFORM, OPT_CERTFILE, OPT_CAFILE,
-    OPT_CAPATH, OPT_CASTORE, OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE,
-    OPT_CONTENT, OPT_PRINT, OPT_NAMEOPT,
-    OPT_SECRETKEY, OPT_SECRETKEYID, OPT_PWRI_PASSWORD, OPT_ECONTENT_TYPE,
-    OPT_PASSIN, OPT_TO, OPT_FROM, OPT_SUBJECT, OPT_SIGNER, OPT_RECIP,
-    OPT_CERTSOUT, OPT_MD, OPT_INKEY, OPT_KEYFORM, OPT_KEYOPT, OPT_RR_FROM,
-    OPT_RR_TO, OPT_AES128_WRAP, OPT_AES192_WRAP, OPT_AES256_WRAP,
-    OPT_3DES_WRAP, OPT_WRAP, OPT_ENGINE,
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_IN,
+    OPT_OUT,
+    OPT_ENCRYPT,
+    OPT_DECRYPT,
+    OPT_SIGN,
+    OPT_CADES,
+    OPT_SIGN_RECEIPT,
+    OPT_RESIGN,
+    OPT_VERIFY,
+    OPT_VERIFY_RETCODE,
+    OPT_VERIFY_RECEIPT,
+    OPT_CMSOUT,
+    OPT_DATA_OUT,
+    OPT_DATA_CREATE,
+    OPT_DIGEST_VERIFY,
+    OPT_DIGEST,
+    OPT_DIGEST_CREATE,
+    OPT_COMPRESS,
+    OPT_UNCOMPRESS,
+    OPT_ED_DECRYPT,
+    OPT_ED_ENCRYPT,
+    OPT_DEBUG_DECRYPT,
+    OPT_TEXT,
+    OPT_ASCIICRLF,
+    OPT_NOINTERN,
+    OPT_NOVERIFY,
+    OPT_NOCERTS,
+    OPT_NOATTR,
+    OPT_NODETACH,
+    OPT_NOSMIMECAP,
+    OPT_NO_SIGNING_TIME,
+    OPT_BINARY,
+    OPT_KEYID,
+    OPT_NOSIGS,
+    OPT_NO_CONTENT_VERIFY,
+    OPT_NO_ATTR_VERIFY,
+    OPT_INDEF,
+    OPT_NOINDEF,
+    OPT_CRLFEOL,
+    OPT_NOOUT,
+    OPT_RR_PRINT,
+    OPT_RR_ALL,
+    OPT_RR_FIRST,
+    OPT_RCTFORM,
+    OPT_CERTFILE,
+    OPT_CAFILE,
+    OPT_CAPATH,
+    OPT_CASTORE,
+    OPT_NOCAPATH,
+    OPT_NOCAFILE,
+    OPT_NOCASTORE,
+    OPT_CONTENT,
+    OPT_PRINT,
+    OPT_NAMEOPT,
+    OPT_SECRETKEY,
+    OPT_SECRETKEYID,
+    OPT_PWRI_PASSWORD,
+    OPT_ECONTENT_TYPE,
+    OPT_PASSIN,
+    OPT_TO,
+    OPT_FROM,
+    OPT_SUBJECT,
+    OPT_SIGNER,
+    OPT_RECIP,
+    OPT_CERTSOUT,
+    OPT_MD,
+    OPT_INKEY,
+    OPT_KEYFORM,
+    OPT_KEYOPT,
+    OPT_RR_FROM,
+    OPT_RR_TO,
+    OPT_AES128_WRAP,
+    OPT_AES192_WRAP,
+    OPT_AES256_WRAP,
+    OPT_3DES_WRAP,
+    OPT_WRAP,
+    OPT_ENGINE,
     OPT_R_ENUM,
-    OPT_PROV_ENUM, OPT_CONFIG,
+    OPT_PROV_ENUM,
+    OPT_CONFIG,
     OPT_V_ENUM,
     OPT_CIPHER,
     OPT_ORIGINATOR
 } OPTION_CHOICE;
 
 const OPTIONS cms_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert...]\n"},
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert...]\n" },
+    { "help", OPT_HELP, '-', "Display this summary" },
 
     OPT_SECTION("General"),
-    {"in", OPT_IN, '<', "Input file"},
-    {"out", OPT_OUT, '>', "Output file"},
+    { "in", OPT_IN, '<', "Input file" },
+    { "out", OPT_OUT, '>', "Output file" },
     OPT_CONFIG_OPTION,
 
     OPT_SECTION("Operation"),
-    {"encrypt", OPT_ENCRYPT, '-', "Encrypt message"},
-    {"decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message"},
-    {"sign", OPT_SIGN, '-', "Sign message"},
-    {"verify", OPT_VERIFY, '-', "Verify signed message"},
-    {"resign", OPT_RESIGN, '-', "Resign a signed message"},
-    {"sign_receipt", OPT_SIGN_RECEIPT, '-',
-     "Generate a signed receipt for a message"},
-    {"verify_receipt", OPT_VERIFY_RECEIPT, '<',
-     "Verify receipts; exit if receipt signatures do not verify"},
-    {"digest", OPT_DIGEST, 's', "Sign a pre-computed digest in hex notation"},
-    {"digest_create", OPT_DIGEST_CREATE, '-',
-     "Create a CMS \"DigestedData\" object"},
-    {"digest_verify", OPT_DIGEST_VERIFY, '-',
-     "Verify a CMS \"DigestedData\" object and output it"},
-    {"compress", OPT_COMPRESS, '-', "Create a CMS \"CompressedData\" object"},
-    {"uncompress", OPT_UNCOMPRESS, '-',
-     "Uncompress a CMS \"CompressedData\" object"},
-    {"EncryptedData_encrypt", OPT_ED_ENCRYPT, '-',
-     "Create CMS \"EncryptedData\" object using symmetric key"},
-    {"EncryptedData_decrypt", OPT_ED_DECRYPT, '-',
-     "Decrypt CMS \"EncryptedData\" object using symmetric key"},
-    {"data_create", OPT_DATA_CREATE, '-', "Create a CMS \"Data\" object"},
-    {"data_out", OPT_DATA_OUT, '-', "Copy CMS \"Data\" object to output"},
-    {"cmsout", OPT_CMSOUT, '-', "Output CMS structure"},
+    { "encrypt", OPT_ENCRYPT, '-', "Encrypt message" },
+    { "decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message" },
+    { "sign", OPT_SIGN, '-', "Sign message" },
+    { "verify", OPT_VERIFY, '-', "Verify signed message" },
+    { "resign", OPT_RESIGN, '-', "Resign a signed message" },
+    { "sign_receipt", OPT_SIGN_RECEIPT, '-',
+        "Generate a signed receipt for a message" },
+    { "verify_receipt", OPT_VERIFY_RECEIPT, '<',
+        "Verify receipts; exit if receipt signatures do not verify" },
+    { "digest", OPT_DIGEST, 's', "Sign a pre-computed digest in hex notation" },
+    { "digest_create", OPT_DIGEST_CREATE, '-',
+        "Create a CMS \"DigestedData\" object" },
+    { "digest_verify", OPT_DIGEST_VERIFY, '-',
+        "Verify a CMS \"DigestedData\" object and output it" },
+    { "compress", OPT_COMPRESS, '-', "Create a CMS \"CompressedData\" object" },
+    { "uncompress", OPT_UNCOMPRESS, '-',
+        "Uncompress a CMS \"CompressedData\" object" },
+    { "EncryptedData_encrypt", OPT_ED_ENCRYPT, '-',
+        "Create CMS \"EncryptedData\" object using symmetric key" },
+    { "EncryptedData_decrypt", OPT_ED_DECRYPT, '-',
+        "Decrypt CMS \"EncryptedData\" object using symmetric key" },
+    { "data_create", OPT_DATA_CREATE, '-', "Create a CMS \"Data\" object" },
+    { "data_out", OPT_DATA_OUT, '-', "Copy CMS \"Data\" object to output" },
+    { "cmsout", OPT_CMSOUT, '-', "Output CMS structure" },
 
     OPT_SECTION("File format"),
-    {"inform", OPT_INFORM, 'c', "Input format SMIME (default), PEM or DER"},
-    {"outform", OPT_OUTFORM, 'c',
-     "Output format SMIME (default), PEM or DER"},
-    {"rctform", OPT_RCTFORM, 'F', "Receipt file format"},
-    {"stream", OPT_INDEF, '-', "Enable CMS streaming"},
-    {"indef", OPT_INDEF, '-', "Same as -stream"},
-    {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"},
-    {"binary", OPT_BINARY, '-',
-     "Treat input as binary: do not translate to canonical form"},
-    {"crlfeol", OPT_CRLFEOL, '-',
-     "Use CRLF as EOL termination instead of LF only" },
-    {"asciicrlf", OPT_ASCIICRLF, '-',
-     "Perform CRLF canonicalisation when signing"},
+    { "inform", OPT_INFORM, 'c', "Input format SMIME (default), PEM or DER" },
+    { "outform", OPT_OUTFORM, 'c',
+        "Output format SMIME (default), PEM or DER" },
+    { "rctform", OPT_RCTFORM, 'F', "Receipt file format" },
+    { "stream", OPT_INDEF, '-', "Enable CMS streaming" },
+    { "indef", OPT_INDEF, '-', "Same as -stream" },
+    { "noindef", OPT_NOINDEF, '-', "Disable CMS streaming" },
+    { "binary", OPT_BINARY, '-',
+        "Treat input as binary: do not translate to canonical form" },
+    { "crlfeol", OPT_CRLFEOL, '-',
+        "Use CRLF as EOL termination instead of LF only" },
+    { "asciicrlf", OPT_ASCIICRLF, '-',
+        "Perform CRLF canonicalisation when signing" },
 
     OPT_SECTION("Keys and passwords"),
-    {"pwri_password", OPT_PWRI_PASSWORD, 's',
-     "Specific password for recipient"},
-    {"secretkey", OPT_SECRETKEY, 's',
-     "Use specified hex-encoded key to decrypt/encrypt recipients or content"},
-    {"secretkeyid", OPT_SECRETKEYID, 's',
-     "Identity of the -secretkey for CMS \"KEKRecipientInfo\" object"},
-    {"inkey", OPT_INKEY, 's',
-     "Input private key (if not signer or recipient)"},
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
-    {"keyopt", OPT_KEYOPT, 's', "Set public key parameters as n:v pairs"},
-    {"keyform", OPT_KEYFORM, 'f',
-     "Input private key format (ENGINE, other values ignored)"},
+    { "pwri_password", OPT_PWRI_PASSWORD, 's',
+        "Specific password for recipient" },
+    { "secretkey", OPT_SECRETKEY, 's',
+        "Use specified hex-encoded key to decrypt/encrypt recipients or content" },
+    { "secretkeyid", OPT_SECRETKEYID, 's',
+        "Identity of the -secretkey for CMS \"KEKRecipientInfo\" object" },
+    { "inkey", OPT_INKEY, 's',
+        "Input private key (if not signer or recipient)" },
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+    { "keyopt", OPT_KEYOPT, 's', "Set public key parameters as n:v pairs" },
+    { "keyform", OPT_KEYFORM, 'f',
+        "Input private key format (ENGINE, other values ignored)" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device" },
 #endif
     OPT_PROV_OPTIONS,
     OPT_R_OPTIONS,
 
     OPT_SECTION("Encryption and decryption"),
-    {"originator", OPT_ORIGINATOR, 's', "Originator certificate file"},
-    {"recip", OPT_RECIP, '<', "Recipient cert file"},
-    {"cert...", OPT_PARAM, '.',
-     "Recipient certs (optional; used only when encrypting)"},
-    {"", OPT_CIPHER, '-',
-     "The encryption algorithm to use (any supported cipher)"},
-    {"wrap", OPT_WRAP, 's',
-     "Key wrap algorithm to use when encrypting with key agreement"},
-    {"aes128-wrap", OPT_AES128_WRAP, '-', "Use AES128 to wrap key"},
-    {"aes192-wrap", OPT_AES192_WRAP, '-', "Use AES192 to wrap key"},
-    {"aes256-wrap", OPT_AES256_WRAP, '-', "Use AES256 to wrap key"},
-    {"des3-wrap", OPT_3DES_WRAP, '-', "Use 3DES-EDE to wrap key"},
-    {"debug_decrypt", OPT_DEBUG_DECRYPT, '-',
-     "Disable MMA protection, return error if no recipient found (see doc)"},
+    { "originator", OPT_ORIGINATOR, 's', "Originator certificate file" },
+    { "recip", OPT_RECIP, '<', "Recipient cert file" },
+    { "cert...", OPT_PARAM, '.',
+        "Recipient certs (optional; used only when encrypting)" },
+    { "", OPT_CIPHER, '-',
+        "The encryption algorithm to use (any supported cipher)" },
+    { "wrap", OPT_WRAP, 's',
+        "Key wrap algorithm to use when encrypting with key agreement" },
+    { "aes128-wrap", OPT_AES128_WRAP, '-', "Use AES128 to wrap key" },
+    { "aes192-wrap", OPT_AES192_WRAP, '-', "Use AES192 to wrap key" },
+    { "aes256-wrap", OPT_AES256_WRAP, '-', "Use AES256 to wrap key" },
+    { "des3-wrap", OPT_3DES_WRAP, '-', "Use 3DES-EDE to wrap key" },
+    { "debug_decrypt", OPT_DEBUG_DECRYPT, '-',
+        "Disable MMA protection, return error if no recipient found (see doc)" },
 
     OPT_SECTION("Signing"),
-    {"md", OPT_MD, 's', "Digest algorithm to use"},
-    {"signer", OPT_SIGNER, 's', "Signer certificate input file"},
-    {"certfile", OPT_CERTFILE, '<',
-     "Extra signer and intermediate CA certificates to include when signing"},
-    {OPT_MORE_STR, 0, 0,
-     "or to use as preferred signer certs and for chain building when verifying"},
-    {"cades", OPT_CADES, '-',
-     "Include signingCertificate attribute (CAdES-BES)"},
-    {"nodetach", OPT_NODETACH, '-', "Use opaque signing"},
-    {"nocerts", OPT_NOCERTS, '-',
-     "Don't include signer's certificate when signing"},
-    {"noattr", OPT_NOATTR, '-', "Don't include any signed attributes"},
-    {"nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute"},
-    {"no_signing_time", OPT_NO_SIGNING_TIME, '-',
-     "Omit the signing time attribute"},
-    {"receipt_request_all", OPT_RR_ALL, '-',
-     "When signing, create a receipt request for all recipients"},
-    {"receipt_request_first", OPT_RR_FIRST, '-',
-     "When signing, create a receipt request for first recipient"},
-    {"receipt_request_from", OPT_RR_FROM, 's',
-     "Create signed receipt request with specified email address"},
-    {"receipt_request_to", OPT_RR_TO, 's',
-     "Create signed receipt targeted to specified address"},
+    { "md", OPT_MD, 's', "Digest algorithm to use" },
+    { "signer", OPT_SIGNER, 's', "Signer certificate input file" },
+    { "certfile", OPT_CERTFILE, '<',
+        "Extra signer and intermediate CA certificates to include when signing" },
+    { OPT_MORE_STR, 0, 0,
+        "or to use as preferred signer certs and for chain building when verifying" },
+    { "cades", OPT_CADES, '-',
+        "Include signingCertificate attribute (CAdES-BES)" },
+    { "nodetach", OPT_NODETACH, '-', "Use opaque signing" },
+    { "nocerts", OPT_NOCERTS, '-',
+        "Don't include signer's certificate when signing" },
+    { "noattr", OPT_NOATTR, '-', "Don't include any signed attributes" },
+    { "nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute" },
+    { "no_signing_time", OPT_NO_SIGNING_TIME, '-',
+        "Omit the signing time attribute" },
+    { "receipt_request_all", OPT_RR_ALL, '-',
+        "When signing, create a receipt request for all recipients" },
+    { "receipt_request_first", OPT_RR_FIRST, '-',
+        "When signing, create a receipt request for first recipient" },
+    { "receipt_request_from", OPT_RR_FROM, 's',
+        "Create signed receipt request with specified email address" },
+    { "receipt_request_to", OPT_RR_TO, 's',
+        "Create signed receipt targeted to specified address" },
 
     OPT_SECTION("Verification"),
-    {"signer", OPT_DUP, 's', "Signer certificate(s) output file"},
-    {"content", OPT_CONTENT, '<',
-     "Supply or override content for detached signature"},
-    {"no_content_verify", OPT_NO_CONTENT_VERIFY, '-',
-     "Do not verify signed content signatures"},
-    {"no_attr_verify", OPT_NO_ATTR_VERIFY, '-',
-     "Do not verify signed attribute signatures"},
-    {"nosigs", OPT_NOSIGS, '-', "Don't verify message signature"},
-    {"noverify", OPT_NOVERIFY, '-', "Don't verify signers certificate"},
-    {"nointern", OPT_NOINTERN, '-',
-     "Don't search certificates in message for signer"},
-    {"cades", OPT_DUP, '-', "Check signingCertificate (CAdES-BES)"},
-    {"verify_retcode", OPT_VERIFY_RETCODE, '-',
-     "Exit non-zero on verification failure"},
-    {"CAfile", OPT_CAFILE, '<', "Trusted certificates file"},
-    {"CApath", OPT_CAPATH, '/', "Trusted certificates directory"},
-    {"CAstore", OPT_CASTORE, ':', "Trusted certificates store URI"},
-    {"no-CAfile", OPT_NOCAFILE, '-',
-     "Do not load the default certificates file"},
-    {"no-CApath", OPT_NOCAPATH, '-',
-     "Do not load certificates from the default certificates directory"},
-    {"no-CAstore", OPT_NOCASTORE, '-',
-     "Do not load certificates from the default certificates store"},
+    { "signer", OPT_DUP, 's', "Signer certificate(s) output file" },
+    { "content", OPT_CONTENT, '<',
+        "Supply or override content for detached signature" },
+    { "no_content_verify", OPT_NO_CONTENT_VERIFY, '-',
+        "Do not verify signed content signatures" },
+    { "no_attr_verify", OPT_NO_ATTR_VERIFY, '-',
+        "Do not verify signed attribute signatures" },
+    { "nosigs", OPT_NOSIGS, '-', "Don't verify message signature" },
+    { "noverify", OPT_NOVERIFY, '-', "Don't verify signers certificate" },
+    { "nointern", OPT_NOINTERN, '-',
+        "Don't search certificates in message for signer" },
+    { "cades", OPT_DUP, '-', "Check signingCertificate (CAdES-BES)" },
+    { "verify_retcode", OPT_VERIFY_RETCODE, '-',
+        "Exit non-zero on verification failure" },
+    { "CAfile", OPT_CAFILE, '<', "Trusted certificates file" },
+    { "CApath", OPT_CAPATH, '/', "Trusted certificates directory" },
+    { "CAstore", OPT_CASTORE, ':', "Trusted certificates store URI" },
+    { "no-CAfile", OPT_NOCAFILE, '-',
+        "Do not load the default certificates file" },
+    { "no-CApath", OPT_NOCAPATH, '-',
+        "Do not load certificates from the default certificates directory" },
+    { "no-CAstore", OPT_NOCASTORE, '-',
+        "Do not load certificates from the default certificates store" },
 
     OPT_SECTION("Output"),
-    {"keyid", OPT_KEYID, '-', "Use subject key identifier"},
-    {"econtent_type", OPT_ECONTENT_TYPE, 's', "OID for external content"},
-    {"text", OPT_TEXT, '-', "Include or delete text MIME headers"},
-    {"certsout", OPT_CERTSOUT, '>', "Certificate output file"},
-    {"to", OPT_TO, 's', "To address"},
-    {"from", OPT_FROM, 's', "From address"},
-    {"subject", OPT_SUBJECT, 's', "Subject"},
+    { "keyid", OPT_KEYID, '-', "Use subject key identifier" },
+    { "econtent_type", OPT_ECONTENT_TYPE, 's', "OID for external content" },
+    { "text", OPT_TEXT, '-', "Include or delete text MIME headers" },
+    { "certsout", OPT_CERTSOUT, '>', "Certificate output file" },
+    { "to", OPT_TO, 's', "To address" },
+    { "from", OPT_FROM, 's', "From address" },
+    { "subject", OPT_SUBJECT, 's', "Subject" },
 
     OPT_SECTION("Printing"),
-    {"noout", OPT_NOOUT, '-',
-     "For the -cmsout operation do not output the parsed CMS structure"},
-    {"print", OPT_PRINT, '-',
-     "For the -cmsout operation print out all fields of the CMS structure"},
-    {"nameopt", OPT_NAMEOPT, 's',
-     "For the -print option specifies various strings printing options"},
-    {"receipt_request_print", OPT_RR_PRINT, '-', "Print CMS Receipt Request" },
+    { "noout", OPT_NOOUT, '-',
+        "For the -cmsout operation do not output the parsed CMS structure" },
+    { "print", OPT_PRINT, '-',
+        "For the -cmsout operation print out all fields of the CMS structure" },
+    { "nameopt", OPT_NAMEOPT, 's',
+        "For the -print option specifies various strings printing options" },
+    { "receipt_request_print", OPT_RR_PRINT, '-', "Print CMS Receipt Request" },
 
     OPT_V_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 static CMS_ContentInfo *load_content_info(int informat, BIO *in, int flags,
-                                          BIO **indata, const char *name)
+    BIO **indata, const char *name)
 {
     CMS_ContentInfo *ret, *ci;
 
@@ -274,7 +334,7 @@ static CMS_ContentInfo *load_content_info(int informat, BIO *in, int flags,
         goto err;
     }
     return ret;
- err:
+err:
     CMS_ContentInfo_free(ret);
     return NULL;
 }
@@ -330,7 +390,7 @@ int cms_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -477,7 +537,7 @@ int cms_main(int argc, char **argv)
             break;
         case OPT_RCTFORM:
             if (!opt_format(opt_arg(),
-                            OPT_FMT_PEMDER | OPT_FMT_SMIME, &rctformat))
+                    OPT_FMT_PEMDER | OPT_FMT_SMIME, &rctformat))
                 goto opthelp;
             break;
         case OPT_CERTFILE:
@@ -531,7 +591,7 @@ int cms_main(int argc, char **argv)
         case OPT_SECRETKEY:
             if (secret_key != NULL) {
                 BIO_printf(bio_err, "Invalid key (supplied twice) %s\n",
-                           opt_arg());
+                    opt_arg());
                 goto opthelp;
             }
             secret_key = OPENSSL_hexstr2buf(opt_arg(), &ltmp);
@@ -544,7 +604,7 @@ int cms_main(int argc, char **argv)
         case OPT_SECRETKEYID:
             if (secret_keyid != NULL) {
                 BIO_printf(bio_err, "Invalid id (supplied twice) %s\n",
-                           opt_arg());
+                    opt_arg());
                 goto opthelp;
             }
             secret_keyid = OPENSSL_hexstr2buf(opt_arg(), &ltmp);
@@ -560,7 +620,7 @@ int cms_main(int argc, char **argv)
         case OPT_ECONTENT_TYPE:
             if (econtent_type != NULL) {
                 BIO_printf(bio_err, "Invalid OID (supplied twice) %s\n",
-                           opt_arg());
+                    opt_arg());
                 goto opthelp;
             }
             econtent_type = OBJ_txt2obj(opt_arg(), 0);
@@ -640,7 +700,7 @@ int cms_main(int argc, char **argv)
         case OPT_RECIP:
             if (operation == SMIME_ENCRYPT) {
                 cert = load_cert(opt_arg(), FORMAT_UNDEF,
-                                 "recipient certificate file");
+                    "recipient certificate file");
                 if (cert == NULL)
                     goto end;
                 if (!sk_X509_push(encerts, cert))
@@ -749,13 +809,13 @@ int cms_main(int argc, char **argv)
     if ((flags & CMS_CADES) != 0) {
         if ((flags & CMS_NOATTR) != 0) {
             BIO_puts(bio_err, "Incompatible options: "
-                     "CAdES requires signed attributes\n");
+                              "CAdES requires signed attributes\n");
             goto opthelp;
         }
         if (operation == SMIME_VERIFY
-                && (flags & (CMS_NO_SIGNER_CERT_VERIFY | CMS_NO_ATTR_VERIFY)) != 0) {
+            && (flags & (CMS_NO_SIGNER_CERT_VERIFY | CMS_NO_ATTR_VERIFY)) != 0) {
             BIO_puts(bio_err, "Incompatible options: CAdES validation requires"
-                     " certs and signed attributes validations\n");
+                              " certs and signed attributes validations\n");
             goto opthelp;
         }
     }
@@ -789,7 +849,7 @@ int cms_main(int argc, char **argv)
         if (recipfile == NULL && keyfile == NULL
             && secret_key == NULL && pwri_pass == NULL) {
             BIO_printf(bio_err,
-                       "No recipient certificate or key specified\n");
+                "No recipient certificate or key specified\n");
             goto opthelp;
         }
     } else if (operation == SMIME_ENCRYPT) {
@@ -813,16 +873,16 @@ int cms_main(int argc, char **argv)
     if ((operation & SMIME_SIGNERS) == 0) {
         if ((flags & CMS_DETACHED) == 0)
             BIO_printf(bio_err,
-                       "Warning: -nodetach option is ignored for non-signing operation\n");
+                "Warning: -nodetach option is ignored for non-signing operation\n");
 
         flags &= ~CMS_DETACHED;
     }
     if ((operation & SMIME_IP) == 0 && contfile != NULL)
         BIO_printf(bio_err,
-                   "Warning: -contfile option is ignored for the given operation\n");
+            "Warning: -contfile option is ignored for the given operation\n");
     if (operation != SMIME_ENCRYPT && *argv != NULL)
         BIO_printf(bio_err,
-                   "Warning: recipient certificate file parameters ignored for operation other than -encrypt\n");
+            "Warning: recipient certificate file parameters ignored for operation other than -encrypt\n");
 
     if ((flags & CMS_BINARY) != 0) {
         if (!(operation & SMIME_OP))
@@ -845,7 +905,7 @@ int cms_main(int argc, char **argv)
 
         for (; *argv != NULL; argv++) {
             cert = load_cert(*argv, FORMAT_UNDEF,
-                             "recipient certificate file");
+                "recipient certificate file");
             if (cert == NULL)
                 goto end;
             if (!sk_X509_push(encerts, cert))
@@ -863,7 +923,8 @@ int cms_main(int argc, char **argv)
 
     if (recipfile != NULL && (operation == SMIME_DECRYPT)) {
         if ((recip = load_cert(recipfile, FORMAT_UNDEF,
-                               "recipient certificate file")) == NULL) {
+                 "recipient certificate file"))
+            == NULL) {
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -871,7 +932,8 @@ int cms_main(int argc, char **argv)
 
     if (originatorfile != NULL) {
         if ((originator = load_cert(originatorfile, FORMAT_UNDEF,
-                                    "originator certificate file")) == NULL) {
+                 "originator certificate file"))
+            == NULL) {
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -879,7 +941,8 @@ int cms_main(int argc, char **argv)
 
     if (operation == SMIME_SIGN_RECEIPT) {
         if ((signer = load_cert(signerfile, FORMAT_UNDEF,
-                                "receipt signer certificate file")) == NULL) {
+                 "receipt signer certificate file"))
+            == NULL) {
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -904,25 +967,25 @@ int cms_main(int argc, char **argv)
     if (digesthex != NULL) {
         if (operation != SMIME_SIGN) {
             BIO_printf(bio_err,
-                       "Cannot use -digest for non-signing operation\n");
+                "Cannot use -digest for non-signing operation\n");
             goto end;
         }
         if (infile != NULL
             || (flags & CMS_DETACHED) == 0
             || (flags & CMS_STREAM) != 0) {
             BIO_printf(bio_err,
-                       "Cannot use -digest when -in, -nodetach or streaming is used\n");
+                "Cannot use -digest when -in, -nodetach or streaming is used\n");
             goto end;
         }
         digestbin = OPENSSL_hexstr2buf(digesthex, &digestlen);
         if (digestbin == NULL) {
             BIO_printf(bio_err,
-                       "Invalid hex value after -digest\n");
+                "Invalid hex value after -digest\n");
             goto end;
         }
     } else {
         in = bio_open_default(infile, 'r',
-                              binary_files ? FORMAT_BINARY : informat);
+            binary_files ? FORMAT_BINARY : informat);
         if (in == NULL)
             goto end;
     }
@@ -943,7 +1006,7 @@ int cms_main(int argc, char **argv)
             allcerts = CMS_get1_certs(cms);
             if (!save_certs(certsoutfile, allcerts)) {
                 BIO_printf(bio_err,
-                           "Error writing certs to %s\n", certsoutfile);
+                    "Error writing certs to %s\n", certsoutfile);
                 ret = 5;
                 goto end;
             }
@@ -965,13 +1028,14 @@ int cms_main(int argc, char **argv)
     }
 
     out = bio_open_default(outfile, 'w',
-                           binary_files ? FORMAT_BINARY : outformat);
+        binary_files ? FORMAT_BINARY : outformat);
     if (out == NULL)
         goto end;
 
     if ((operation == SMIME_VERIFY) || (operation == SMIME_VERIFY_RECEIPT)) {
         if ((store = setup_verify(CAfile, noCAfile, CApath, noCApath,
-                                  CAstore, noCAstore)) == NULL)
+                 CAstore, noCAstore))
+            == NULL)
             goto end;
         X509_STORE_set_verify_cb(store, cms_cb);
         if (vpmtouched)
@@ -1011,19 +1075,19 @@ int cms_main(int argc, char **argv)
                 goto end;
 
             pctx = CMS_RecipientInfo_get0_pkey_ctx(ri);
-            if (kparam != NULL) {
+            if (pctx != NULL && kparam != NULL) {
                 if (!cms_set_pkey_param(pctx, kparam->param))
                     goto end;
             }
 
             res = EVP_PKEY_CTX_ctrl(pctx, -1, -1,
-                                    EVP_PKEY_CTRL_CIPHER,
-                                    EVP_CIPHER_get_nid(cipher), NULL);
+                EVP_PKEY_CTRL_CIPHER,
+                EVP_CIPHER_get_nid(cipher), NULL);
             if (res <= 0 && res != -2)
                 goto end;
 
             if (CMS_RecipientInfo_type(ri) == CMS_RECIPINFO_AGREE
-                    && wrap_cipher != NULL) {
+                && wrap_cipher != NULL) {
                 EVP_CIPHER_CTX *wctx;
                 wctx = CMS_RecipientInfo_kari_get0_ctx(ri);
                 if (EVP_EncryptInit_ex(wctx, wrap_cipher, NULL, NULL, NULL) != 1)
@@ -1033,9 +1097,9 @@ int cms_main(int argc, char **argv)
 
         if (secret_key != NULL) {
             if (!CMS_add0_recipient_key(cms, NID_undef,
-                                        secret_key, secret_keylen,
-                                        secret_keyid, secret_keyidlen,
-                                        NULL, NULL, NULL))
+                    secret_key, secret_keylen,
+                    secret_keyid, secret_keyidlen,
+                    NULL, NULL, NULL))
                 goto end;
             /* NULL these because call absorbs them */
             secret_key = NULL;
@@ -1046,8 +1110,9 @@ int cms_main(int argc, char **argv)
             if (pwri_tmp == NULL)
                 goto end;
             if (CMS_add0_recipient_password(cms,
-                                            -1, NID_undef, NID_undef,
-                                            pwri_tmp, -1, NULL) == NULL)
+                    -1, NID_undef, NID_undef,
+                    pwri_tmp, -1, NULL)
+                == NULL)
                 goto end;
             pwri_tmp = NULL;
         }
@@ -1055,7 +1120,7 @@ int cms_main(int argc, char **argv)
             if (!CMS_final(cms, in, NULL, flags)) {
                 if (originator != NULL
                     && ERR_GET_REASON(ERR_peek_error())
-                    == CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT) {
+                        == CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT) {
                     BIO_printf(bio_err, "Cannot use originator for encryption\n");
                     goto end;
                 }
@@ -1064,7 +1129,7 @@ int cms_main(int argc, char **argv)
         }
     } else if (operation == SMIME_ENCRYPTED_ENCRYPT) {
         cms = CMS_EncryptedData_encrypt_ex(in, cipher, secret_key,
-                                           secret_keylen, flags, libctx, app_get0_propq());
+            secret_keylen, flags, libctx, app_get0_propq());
 
     } else if (operation == SMIME_SIGN_RECEIPT) {
         CMS_ContentInfo *srcms = NULL;
@@ -1171,8 +1236,8 @@ int cms_main(int argc, char **argv)
 
         if (secret_key != NULL) {
             if (!CMS_decrypt_set1_key(cms,
-                                      secret_key, secret_keylen,
-                                      secret_keyid, secret_keyidlen)) {
+                    secret_key, secret_keylen,
+                    secret_keyid, secret_keyidlen)) {
                 BIO_puts(bio_err, "Error decrypting CMS using secret key\n");
                 goto end;
             }
@@ -1211,15 +1276,15 @@ int cms_main(int argc, char **argv)
         }
     } else if (operation == SMIME_ENCRYPTED_DECRYPT) {
         if (!CMS_EncryptedData_decrypt(cms, secret_key, secret_keylen,
-                                       indata, out, flags))
+                indata, out, flags))
             goto end;
     } else if (operation == SMIME_VERIFY) {
         if (CMS_verify(cms, other, store, indata, out, flags) > 0) {
             BIO_printf(bio_err, "%s Verification successful\n",
-                       (flags & CMS_CADES) != 0 ? "CAdES" : "CMS");
+                (flags & CMS_CADES) != 0 ? "CAdES" : "CMS");
         } else {
             BIO_printf(bio_err, "%s Verification failure\n",
-                       (flags & CMS_CADES) != 0 ? "CAdES" : "CMS");
+                (flags & CMS_CADES) != 0 ? "CAdES" : "CMS");
             if (verify_retcode)
                 ret = verify_err + 32;
             goto end;
@@ -1229,7 +1294,7 @@ int cms_main(int argc, char **argv)
 
             if (!save_certs(signerfile, signers)) {
                 BIO_printf(bio_err,
-                           "Error writing signers to %s\n", signerfile);
+                    "Error writing signers to %s\n", signerfile);
                 ret = 5;
                 goto end;
             }
@@ -1280,12 +1345,13 @@ int cms_main(int argc, char **argv)
             goto end;
         }
         if (ret <= 0) {
+            BIO_printf(bio_err, "Error writing CMS output\n");
             ret = 6;
             goto end;
         }
     }
     ret = 0;
- end:
+end:
     if (ret)
         ERR_print_errors(bio_err);
     OSSL_STACK_OF_X509_free(encerts);
@@ -1361,7 +1427,6 @@ static int cms_cb(int ok, X509_STORE_CTX *ctx)
     policies_print(ctx);
 
     return ok;
-
 }
 
 static void gnames_stack_print(STACK_OF(GENERAL_NAMES) *gns)
@@ -1405,7 +1470,7 @@ static void receipt_request_print(CMS_ContentInfo *cms)
             const char *id;
             int idlen;
             CMS_ReceiptRequest_get0_values(rr, &scid, &allorfirst,
-                                           &rlist, &rto);
+                &rlist, &rto);
             BIO_puts(bio_err, "  Signed Content ID:\n");
             idlen = ASN1_STRING_length(scid);
             id = (const char *)ASN1_STRING_get0_data(scid);
@@ -1455,16 +1520,15 @@ static STACK_OF(GENERAL_NAMES) *make_names_stack(STACK_OF(OPENSSL_STRING) *ns)
 
     return ret;
 
- err:
+err:
     sk_GENERAL_NAMES_pop_free(ret, GENERAL_NAMES_free);
     GENERAL_NAMES_free(gens);
     GENERAL_NAME_free(gen);
     return NULL;
 }
 
-static CMS_ReceiptRequest
-*make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to, int rr_allorfirst,
-                      STACK_OF(OPENSSL_STRING) *rr_from)
+static CMS_ReceiptRequest *make_receipt_request(STACK_OF(OPENSSL_STRING) *rr_to, int rr_allorfirst,
+    STACK_OF(OPENSSL_STRING) *rr_from)
 {
     STACK_OF(GENERAL_NAMES) *rct_to = NULL, *rct_from = NULL;
     CMS_ReceiptRequest *rr;
@@ -1480,18 +1544,18 @@ static CMS_ReceiptRequest
         rct_from = NULL;
     }
     rr = CMS_ReceiptRequest_create0_ex(NULL, -1, rr_allorfirst, rct_from,
-                                       rct_to, app_get0_libctx());
+        rct_to, app_get0_libctx());
     if (rr == NULL)
         goto err;
     return rr;
- err:
+err:
     sk_GENERAL_NAMES_pop_free(rct_to, GENERAL_NAMES_free);
     sk_GENERAL_NAMES_pop_free(rct_from, GENERAL_NAMES_free);
     return NULL;
 }
 
 static int cms_set_pkey_param(EVP_PKEY_CTX *pctx,
-                              STACK_OF(OPENSSL_STRING) *param)
+    STACK_OF(OPENSSL_STRING) *param)
 {
     char *keyopt;
     int i;
diff --git a/apps/crl.c b/apps/crl.c
index afb59178fda69..cba5883dd6db0 100644
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -20,58 +20,81 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_IN, OPT_OUTFORM, OPT_OUT, OPT_KEYFORM, OPT_KEY,
-    OPT_ISSUER, OPT_LASTUPDATE, OPT_NEXTUPDATE, OPT_FINGERPRINT,
-    OPT_CRLNUMBER, OPT_BADSIG, OPT_GENDELTA, OPT_CAPATH, OPT_CAFILE, OPT_CASTORE,
-    OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE, OPT_VERIFY, OPT_DATEOPT, OPT_TEXT, OPT_HASH,
-    OPT_HASH_OLD, OPT_NOOUT, OPT_NAMEOPT, OPT_MD, OPT_PROV_ENUM
+    OPT_INFORM,
+    OPT_IN,
+    OPT_OUTFORM,
+    OPT_OUT,
+    OPT_KEYFORM,
+    OPT_KEY,
+    OPT_ISSUER,
+    OPT_LASTUPDATE,
+    OPT_NEXTUPDATE,
+    OPT_FINGERPRINT,
+    OPT_CRLNUMBER,
+    OPT_BADSIG,
+    OPT_GENDELTA,
+    OPT_CAPATH,
+    OPT_CAFILE,
+    OPT_CASTORE,
+    OPT_NOCAPATH,
+    OPT_NOCAFILE,
+    OPT_NOCASTORE,
+    OPT_VERIFY,
+    OPT_DATEOPT,
+    OPT_TEXT,
+    OPT_HASH,
+    OPT_HASH_OLD,
+    OPT_NOOUT,
+    OPT_NAMEOPT,
+    OPT_MD,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS crl_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"verify", OPT_VERIFY, '-', "Verify CRL signature"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "verify", OPT_VERIFY, '-', "Verify CRL signature" },
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file - default stdin"},
-    {"inform", OPT_INFORM, 'F', "CRL input format (DER or PEM); has no effect"},
-    {"key", OPT_KEY, '<', "CRL signing Private key to use"},
-    {"keyform", OPT_KEYFORM, 'F', "Private key file format (DER/PEM/P12); has no effect"},
+    { "in", OPT_IN, '<', "Input file - default stdin" },
+    { "inform", OPT_INFORM, 'F', "CRL input format (DER or PEM); has no effect" },
+    { "key", OPT_KEY, '<', "CRL signing Private key to use" },
+    { "keyform", OPT_KEYFORM, 'F', "Private key file format (DER/PEM/P12); has no effect" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "output file - default stdout"},
-    {"outform", OPT_OUTFORM, 'F', "Output format - default PEM"},
-    {"dateopt", OPT_DATEOPT, 's', "Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822."},
-    {"text", OPT_TEXT, '-', "Print out a text format version"},
-    {"hash", OPT_HASH, '-', "Print hash value"},
+    { "out", OPT_OUT, '>', "output file - default stdout" },
+    { "outform", OPT_OUTFORM, 'F', "Output format - default PEM" },
+    { "dateopt", OPT_DATEOPT, 's', "Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822." },
+    { "text", OPT_TEXT, '-', "Print out a text format version" },
+    { "hash", OPT_HASH, '-', "Print hash value" },
 #ifndef OPENSSL_NO_MD5
-    {"hash_old", OPT_HASH_OLD, '-', "Print old-style (MD5) hash value"},
+    { "hash_old", OPT_HASH_OLD, '-', "Print old-style (MD5) hash value" },
 #endif
-    {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"},
-    {"", OPT_MD, '-', "Any supported digest"},
+    { "nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options" },
+    { "", OPT_MD, '-', "Any supported digest" },
 
     OPT_SECTION("CRL"),
-    {"issuer", OPT_ISSUER, '-', "Print issuer DN"},
-    {"lastupdate", OPT_LASTUPDATE, '-', "Set lastUpdate field"},
-    {"nextupdate", OPT_NEXTUPDATE, '-', "Set nextUpdate field"},
-    {"noout", OPT_NOOUT, '-', "No CRL output"},
-    {"fingerprint", OPT_FINGERPRINT, '-', "Print the crl fingerprint"},
-    {"crlnumber", OPT_CRLNUMBER, '-', "Print CRL number"},
-    {"badsig", OPT_BADSIG, '-', "Corrupt last byte of loaded CRL signature (for test)" },
-    {"gendelta", OPT_GENDELTA, '<', "Other CRL to compare/diff to the Input one"},
+    { "issuer", OPT_ISSUER, '-', "Print issuer DN" },
+    { "lastupdate", OPT_LASTUPDATE, '-', "Set lastUpdate field" },
+    { "nextupdate", OPT_NEXTUPDATE, '-', "Set nextUpdate field" },
+    { "noout", OPT_NOOUT, '-', "No CRL output" },
+    { "fingerprint", OPT_FINGERPRINT, '-', "Print the crl fingerprint" },
+    { "crlnumber", OPT_CRLNUMBER, '-', "Print CRL number" },
+    { "badsig", OPT_BADSIG, '-', "Corrupt last byte of loaded CRL signature (for test)" },
+    { "gendelta", OPT_GENDELTA, '<', "Other CRL to compare/diff to the Input one" },
 
     OPT_SECTION("Certificate"),
-    {"CApath", OPT_CAPATH, '/', "Verify CRL using certificates in dir"},
-    {"CAfile", OPT_CAFILE, '<', "Verify CRL using certificates in file name"},
-    {"CAstore", OPT_CASTORE, ':', "Verify CRL using certificates in store URI"},
-    {"no-CAfile", OPT_NOCAFILE, '-',
-     "Do not load the default certificates file"},
-    {"no-CApath", OPT_NOCAPATH, '-',
-     "Do not load certificates from the default certificates directory"},
-    {"no-CAstore", OPT_NOCASTORE, '-',
-     "Do not load certificates from the default certificates store"},
+    { "CApath", OPT_CAPATH, '/', "Verify CRL using certificates in dir" },
+    { "CAfile", OPT_CAFILE, '<', "Verify CRL using certificates in file name" },
+    { "CAstore", OPT_CASTORE, ':', "Verify CRL using certificates in store URI" },
+    { "no-CAfile", OPT_NOCAFILE, '-',
+        "Do not load the default certificates file" },
+    { "no-CApath", OPT_NOCAPATH, '-',
+        "Do not load certificates from the default certificates directory" },
+    { "no-CAstore", OPT_NOCASTORE, '-',
+        "Do not load certificates from the default certificates store" },
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int crl_main(int argc, char **argv)
@@ -104,7 +127,7 @@ int crl_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -148,13 +171,13 @@ int crl_main(int argc, char **argv)
             do_ver = 1;
             break;
         case OPT_NOCAPATH:
-            noCApath =  1;
+            noCApath = 1;
             break;
         case OPT_NOCAFILE:
-            noCAfile =  1;
+            noCAfile = 1;
             break;
         case OPT_NOCASTORE:
-            noCAstore =  1;
+            noCAstore = 1;
             break;
         case OPT_HASH_OLD:
 #ifndef OPENSSL_NO_MD5
@@ -221,7 +244,8 @@ int crl_main(int argc, char **argv)
 
     if (do_ver) {
         if ((store = setup_verify(CAfile, noCAfile, CApath, noCApath,
-                                  CAstore, noCAstore)) == NULL)
+                 CAstore, noCAstore))
+            == NULL)
             goto end;
         lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
         if (lookup == NULL)
@@ -233,7 +257,7 @@ int crl_main(int argc, char **argv)
         }
 
         xobj = X509_STORE_CTX_get_obj_by_subject(ctx, X509_LU_X509,
-                                                 X509_CRL_get_issuer(x));
+            X509_CRL_get_issuer(x));
         if (xobj == NULL) {
             BIO_printf(bio_err, "Error getting CRL issuer certificate\n");
             goto end;
@@ -250,7 +274,7 @@ int crl_main(int argc, char **argv)
             goto end;
         if (i == 0) {
             BIO_printf(bio_err, "verify failure\n");
-	    goto end;
+            goto end;
         } else
             BIO_printf(bio_err, "verify OK\n");
     }
@@ -309,9 +333,8 @@ int crl_main(int argc, char **argv)
             }
             if (hash == i) {
                 int ok;
-                unsigned long hash_value =
-                    X509_NAME_hash_ex(X509_CRL_get_issuer(x), app_get0_libctx(),
-                                      app_get0_propq(), &ok);
+                unsigned long hash_value = X509_NAME_hash_ex(X509_CRL_get_issuer(x), app_get0_libctx(),
+                    app_get0_propq(), &ok);
 
                 if (num > 1)
                     BIO_printf(bio_out, "issuer name hash=");
@@ -327,7 +350,7 @@ int crl_main(int argc, char **argv)
                 if (num > 1)
                     BIO_printf(bio_out, "issuer name old hash=");
                 BIO_printf(bio_out, "%08lx\n",
-                           X509_NAME_hash_old(X509_CRL_get_issuer(x)));
+                    X509_NAME_hash_old(X509_CRL_get_issuer(x)));
             }
 #endif
             if (lastupdate == i) {
@@ -353,10 +376,9 @@ int crl_main(int argc, char **argv)
                     goto end;
                 }
                 BIO_printf(bio_out, "%s Fingerprint=",
-                           EVP_MD_get0_name(digest));
+                    EVP_MD_get0_name(digest));
                 for (j = 0; j < (int)n; j++) {
-                    BIO_printf(bio_out, "%02X%c", md[j], (j + 1 == (int)n)
-                               ? '\n' : ':');
+                    BIO_printf(bio_out, "%02X%c", md[j], (j + 1 == (int)n) ? '\n' : ':');
                 }
             }
         }
@@ -383,7 +405,7 @@ int crl_main(int argc, char **argv)
     }
     ret = 0;
 
- end:
+end:
     if (ret != 0)
         ERR_print_errors(bio_err);
     BIO_free_all(out);
diff --git a/apps/crl2pkcs7.c b/apps/crl2pkcs7.c
index f661393907e71..72d385250ac46 100644
--- a/apps/crl2pkcs7.c
+++ b/apps/crl2pkcs7.c
@@ -23,27 +23,32 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile);
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_NOCRL, OPT_CERTFILE,
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_IN,
+    OPT_OUT,
+    OPT_NOCRL,
+    OPT_CERTFILE,
     OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS crl2pkcs7_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file"},
-    {"inform", OPT_INFORM, 'F', "Input format - DER or PEM"},
-    {"nocrl", OPT_NOCRL, '-', "No crl to load, just certs from '-certfile'"},
-    {"certfile", OPT_CERTFILE, '<',
-     "File of chain of certs to a trusted CA; can be repeated"},
+    { "in", OPT_IN, '<', "Input file" },
+    { "inform", OPT_INFORM, 'F', "Input format - DER or PEM" },
+    { "nocrl", OPT_NOCRL, '-', "No crl to load, just certs from '-certfile'" },
+    { "certfile", OPT_CERTFILE, '<',
+        "File of chain of certs to a trusted CA; can be repeated" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file"},
-    {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
+    { "out", OPT_OUT, '>', "Output file" },
+    { "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
 
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int crl2pkcs7_main(int argc, char **argv)
@@ -56,8 +61,7 @@ int crl2pkcs7_main(int argc, char **argv)
     STACK_OF(X509_CRL) *crl_stack = NULL;
     X509_CRL *crl = NULL;
     char *infile = NULL, *outfile = NULL, *prog, *certfile;
-    int i = 0, informat = FORMAT_PEM, outformat = FORMAT_PEM, ret = 1, nocrl =
-        0;
+    int i = 0, informat = FORMAT_PEM, outformat = FORMAT_PEM, ret = 1, nocrl = 0;
     OPTION_CHOICE o;
 
     prog = opt_init(argc, argv, crl2pkcs7_options);
@@ -65,7 +69,7 @@ int crl2pkcs7_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -141,7 +145,7 @@ int crl2pkcs7_main(int argc, char **argv)
 
         if (!sk_X509_CRL_push(crl_stack, crl))
             goto end;
-        crl = NULL;             /* now part of p7 for OPENSSL_freeing */
+        crl = NULL; /* now part of p7 for OPENSSL_freeing */
     }
 
     if (certflst != NULL) {
@@ -173,7 +177,7 @@ int crl2pkcs7_main(int argc, char **argv)
         goto end;
     }
     ret = 0;
- end:
+end:
     sk_OPENSSL_STRING_free(certflst);
     BIO_free(in);
     BIO_free_all(out);
@@ -229,7 +233,7 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
     }
 
     ret = count;
- end:
+end:
     /* never need to OPENSSL_free x */
     BIO_free(in);
     sk_X509_INFO_free(sk);
diff --git a/apps/dgst.c b/apps/dgst.c
index 0fb1f45200a0e..623564e56106e 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -22,15 +22,15 @@
 #include <ctype.h>
 
 #undef BUFSIZE
-#define BUFSIZE 1024*8
+#define BUFSIZE 1024 * 8
 
 static int do_fp_oneshot_sign(BIO *out, EVP_MD_CTX *ctx, BIO *in, int sep, int binout,
-                              EVP_PKEY *key, unsigned char *sigin, int siglen,
-                              const char *sig_name, const char *file);
+    EVP_PKEY *key, unsigned char *sigin, int siglen,
+    const char *sig_name, const char *file);
 int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, int xoflen,
-          EVP_PKEY *key, unsigned char *sigin, int siglen,
-          const char *sig_name, const char *md_name,
-          const char *file);
+    EVP_PKEY *key, unsigned char *sigin, int siglen,
+    const char *sig_name, const char *md_name,
+    const char *file);
 static void show_digests(const OBJ_NAME *name, void *bio_);
 
 struct doall_dgst_digests {
@@ -41,57 +41,74 @@ struct doall_dgst_digests {
 typedef enum OPTION_choice {
     OPT_COMMON,
     OPT_LIST,
-    OPT_C, OPT_R, OPT_OUT, OPT_SIGN, OPT_PASSIN, OPT_VERIFY,
-    OPT_PRVERIFY, OPT_SIGNATURE, OPT_KEYFORM, OPT_ENGINE, OPT_ENGINE_IMPL,
-    OPT_HEX, OPT_BINARY, OPT_DEBUG, OPT_FIPS_FINGERPRINT,
-    OPT_HMAC, OPT_MAC, OPT_SIGOPT, OPT_MACOPT, OPT_XOFLEN,
+    OPT_C,
+    OPT_R,
+    OPT_OUT,
+    OPT_SIGN,
+    OPT_PASSIN,
+    OPT_VERIFY,
+    OPT_PRVERIFY,
+    OPT_SIGNATURE,
+    OPT_KEYFORM,
+    OPT_ENGINE,
+    OPT_ENGINE_IMPL,
+    OPT_HEX,
+    OPT_BINARY,
+    OPT_DEBUG,
+    OPT_FIPS_FINGERPRINT,
+    OPT_HMAC,
+    OPT_MAC,
+    OPT_SIGOPT,
+    OPT_MACOPT,
+    OPT_XOFLEN,
     OPT_DIGEST,
-    OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS dgst_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [file...]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [file...]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"list", OPT_LIST, '-', "List digests"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "list", OPT_LIST, '-', "List digests" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device"},
-    {"engine_impl", OPT_ENGINE_IMPL, '-',
-     "Also use engine given by -engine for digest operations"},
+    { "engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device" },
+    { "engine_impl", OPT_ENGINE_IMPL, '-',
+        "Also use engine given by -engine for digest operations" },
 #endif
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
 
     OPT_SECTION("Output"),
-    {"c", OPT_C, '-', "Print the digest with separating colons"},
-    {"r", OPT_R, '-', "Print the digest in coreutils format"},
-    {"out", OPT_OUT, '>', "Output to filename rather than stdout"},
-    {"keyform", OPT_KEYFORM, 'f', "Key file format (ENGINE, other values ignored)"},
-    {"hex", OPT_HEX, '-', "Print as hex dump"},
-    {"binary", OPT_BINARY, '-', "Print in binary form"},
-    {"xoflen", OPT_XOFLEN, 'p', "Output length for XOF algorithms. To obtain the maximum security strength set this to 32 (or greater) for SHAKE128, and 64 (or greater) for SHAKE256"},
-    {"d", OPT_DEBUG, '-', "Print debug info"},
-    {"debug", OPT_DEBUG, '-', "Print debug info"},
+    { "c", OPT_C, '-', "Print the digest with separating colons" },
+    { "r", OPT_R, '-', "Print the digest in coreutils format" },
+    { "out", OPT_OUT, '>', "Output to filename rather than stdout" },
+    { "keyform", OPT_KEYFORM, 'f', "Key file format (ENGINE, other values ignored)" },
+    { "hex", OPT_HEX, '-', "Print as hex dump" },
+    { "binary", OPT_BINARY, '-', "Print in binary form" },
+    { "xoflen", OPT_XOFLEN, 'p', "Output length for XOF algorithms. To obtain the maximum security strength set this to 32 (or greater) for SHAKE128, and 64 (or greater) for SHAKE256" },
+    { "d", OPT_DEBUG, '-', "Print debug info" },
+    { "debug", OPT_DEBUG, '-', "Print debug info" },
 
     OPT_SECTION("Signing"),
-    {"sign", OPT_SIGN, 's', "Sign digest using private key"},
-    {"verify", OPT_VERIFY, 's', "Verify a signature using public key"},
-    {"prverify", OPT_PRVERIFY, 's', "Verify a signature using private key"},
-    {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
-    {"signature", OPT_SIGNATURE, '<', "File with signature to verify"},
-    {"hmac", OPT_HMAC, 's', "Create hashed MAC with key"},
-    {"mac", OPT_MAC, 's', "Create MAC (not necessarily HMAC)"},
-    {"macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form or key"},
-    {"", OPT_DIGEST, '-', "Any supported digest"},
-    {"fips-fingerprint", OPT_FIPS_FINGERPRINT, '-',
-     "Compute HMAC with the key used in OpenSSL-FIPS fingerprint"},
+    { "sign", OPT_SIGN, 's', "Sign digest using private key" },
+    { "verify", OPT_VERIFY, 's', "Verify a signature using public key" },
+    { "prverify", OPT_PRVERIFY, 's', "Verify a signature using private key" },
+    { "sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form" },
+    { "signature", OPT_SIGNATURE, '<', "File with signature to verify" },
+    { "hmac", OPT_HMAC, 's', "Create hashed MAC with key" },
+    { "mac", OPT_MAC, 's', "Create MAC (not necessarily HMAC)" },
+    { "macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form or key" },
+    { "", OPT_DIGEST, '-', "Any supported digest" },
+    { "fips-fingerprint", OPT_FIPS_FINGERPRINT, '-',
+        "Compute HMAC with the key used in OpenSSL-FIPS fingerprint" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"file", 0, 0, "Files to digest (optional; default is stdin)"},
-    {NULL}
+    { "file", 0, 0, "Files to digest (optional; default is stdin)" },
+    { NULL }
 };
 
 int dgst_main(int argc, char **argv)
@@ -128,7 +145,7 @@ int dgst_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -140,7 +157,7 @@ int dgst_main(int argc, char **argv)
             dec.bio = bio_out;
             dec.n = 0;
             OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH,
-                                   show_digests, &dec);
+                show_digests, &dec);
             BIO_printf(bio_out, "\n");
             ret = EXIT_SUCCESS;
             goto end;
@@ -244,7 +261,7 @@ int dgst_main(int argc, char **argv)
 
     if (do_verify && sigfile == NULL) {
         BIO_printf(bio_err,
-                   "No signature to verify: use the -signature option\n");
+            "No signature to verify: use the -signature option\n");
         goto end;
     }
     if (engine_impl)
@@ -297,8 +314,9 @@ int dgst_main(int argc, char **argv)
             char def_md[80];
 
             if (EVP_PKEY_get_default_digest_name(sigkey, def_md,
-                                                 sizeof(def_md)) == 2
-                    && strcmp(def_md, "UNDEF") == 0)
+                    sizeof(def_md))
+                    == 2
+                && strcmp(def_md, "UNDEF") == 0)
                 oneshot_sign = 1;
             signctx = EVP_MD_CTX_new();
             if (signctx == NULL)
@@ -336,8 +354,8 @@ int dgst_main(int argc, char **argv)
             digestname = SN_sha256;
         }
         sigkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, impl,
-                                              (unsigned char *)hmac_key,
-                                              strlen(hmac_key));
+            (unsigned char *)hmac_key,
+            strlen(hmac_key));
         if (sigkey == NULL)
             goto end;
     }
@@ -356,17 +374,16 @@ int dgst_main(int argc, char **argv)
         if (do_verify)
             if (impl == NULL)
                 res = EVP_DigestVerifyInit_ex(mctx, &pctx, digestname,
-                                              app_get0_libctx(),
-                                              app_get0_propq(), sigkey, NULL);
+                    app_get0_libctx(),
+                    app_get0_propq(), sigkey, NULL);
             else
                 res = EVP_DigestVerifyInit(mctx, &pctx, md, impl, sigkey);
+        else if (impl == NULL)
+            res = EVP_DigestSignInit_ex(mctx, &pctx, digestname,
+                app_get0_libctx(),
+                app_get0_propq(), sigkey, NULL);
         else
-            if (impl == NULL)
-                res = EVP_DigestSignInit_ex(mctx, &pctx, digestname,
-                                            app_get0_libctx(),
-                                            app_get0_propq(), sigkey, NULL);
-            else
-                res = EVP_DigestSignInit(mctx, &pctx, md, impl, sigkey);
+            res = EVP_DigestSignInit(mctx, &pctx, md, impl, sigkey);
         if (res == 0) {
             BIO_printf(bio_err, "Error setting context\n");
             goto end;
@@ -377,7 +394,7 @@ int dgst_main(int argc, char **argv)
 
                 if (pkey_ctrl_string(pctx, sigopt) <= 0) {
                     BIO_printf(bio_err, "Signature parameter error \"%s\"\n",
-                               sigopt);
+                        sigopt);
                     goto end;
                 }
             }
@@ -451,10 +468,10 @@ int dgst_main(int argc, char **argv)
         BIO_set_fp(in, stdin, BIO_NOCLOSE);
         if (oneshot_sign)
             ret = do_fp_oneshot_sign(out, signctx, in, separator, out_bin,
-                                     sigkey, sigbuf, siglen, NULL, "stdin");
+                sigkey, sigbuf, siglen, NULL, "stdin");
         else
             ret = do_fp(out, buf, inp, separator, out_bin, xoflen,
-                        sigkey, sigbuf, siglen, NULL, md_name, "stdin");
+                sigkey, sigbuf, siglen, NULL, md_name, "stdin");
     } else {
         const char *sig_name = NULL;
 
@@ -471,19 +488,19 @@ int dgst_main(int argc, char **argv)
             } else {
                 if (oneshot_sign) {
                     if (do_fp_oneshot_sign(out, signctx, in, separator, out_bin,
-                                           sigkey, sigbuf, siglen, sig_name,
-                                           argv[i]))
+                            sigkey, sigbuf, siglen, sig_name,
+                            argv[i]))
                         ret = EXIT_FAILURE;
                 } else {
                     if (do_fp(out, buf, inp, separator, out_bin, xoflen,
-                              sigkey, sigbuf, siglen, sig_name, md_name, argv[i]))
+                            sigkey, sigbuf, siglen, sig_name, md_name, argv[i]))
                         ret = EXIT_FAILURE;
                 }
             }
             (void)BIO_reset(bmd);
         }
     }
- end:
+end:
     if (ret != EXIT_SUCCESS)
         ERR_print_errors(bio_err);
     OPENSSL_clear_free(buf, BUFSIZE);
@@ -566,12 +583,12 @@ static const char *newline_escape_filename(const char *file, int *backslash)
         e++;
     }
     file_cpy[i] = '\0';
-    return (const char*)file_cpy;
+    return (const char *)file_cpy;
 }
 
 static void print_out(BIO *out, unsigned char *buf, size_t len,
-                      int sep, int binout,
-                      const char *sig_name, const char *md_name, const char *file)
+    int sep, int binout,
+    const char *sig_name, const char *md_name, const char *file)
 {
     int i, backslash = 0;
 
@@ -619,9 +636,9 @@ static void print_verify_result(BIO *out, int i)
 }
 
 int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, int xoflen,
-          EVP_PKEY *key, unsigned char *sigin, int siglen,
-          const char *sig_name, const char *md_name,
-          const char *file)
+    EVP_PKEY *key, unsigned char *sigin, int siglen,
+    const char *sig_name, const char *md_name,
+    const char *file)
 {
     size_t len = BUFSIZE;
     int i, ret = EXIT_FAILURE;
@@ -685,7 +702,7 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, int xoflen
     }
     print_out(out, buf, len, sep, binout, sig_name, md_name, file);
     ret = EXIT_SUCCESS;
- end:
+end:
     if (allocated_buf != NULL)
         OPENSSL_clear_free(allocated_buf, len);
 
@@ -699,17 +716,16 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout, int xoflen
  * then used inside EVP_DigestVerify() and EVP_DigestSign().
  */
 static int do_fp_oneshot_sign(BIO *out, EVP_MD_CTX *ctx, BIO *in, int sep, int binout,
-                              EVP_PKEY *key, unsigned char *sigin, int siglen,
-                              const char *sig_name, const char *file)
+    EVP_PKEY *key, unsigned char *sigin, int siglen,
+    const char *sig_name, const char *file)
 {
     int res, ret = EXIT_FAILURE;
     size_t len = 0;
-    int buflen = 0;
-    int maxlen = 16 * 1024 * 1024;
+    size_t buflen = 0;
+    size_t maxlen = 16 * 1024 * 1024;
     uint8_t *buf = NULL, *sig = NULL;
 
-    buflen = bio_to_mem(&buf, maxlen, in);
-    if (buflen <= 0) {
+    if (!bio_to_mem(&buf, &buflen, maxlen, in)) {
         BIO_printf(bio_err, "Read error in %s\n", file);
         return ret;
     }
@@ -737,7 +753,7 @@ static int do_fp_oneshot_sign(BIO *out, EVP_MD_CTX *ctx, BIO *in, int sep, int b
         goto end;
     }
 
- end:
+end:
     OPENSSL_free(sig);
     OPENSSL_clear_free(buf, buflen);
 
diff --git a/apps/dhparam.c b/apps/dhparam.c
index 600b7ed2b5bc3..f8838abe63d0e 100644
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -36,47 +36,59 @@ static int verbose = 1;
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
-    OPT_ENGINE, OPT_CHECK, OPT_TEXT, OPT_NOOUT,
-    OPT_DSAPARAM, OPT_2, OPT_3, OPT_5, OPT_VERBOSE, OPT_QUIET,
-    OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_IN,
+    OPT_OUT,
+    OPT_ENGINE,
+    OPT_CHECK,
+    OPT_TEXT,
+    OPT_NOOUT,
+    OPT_DSAPARAM,
+    OPT_2,
+    OPT_3,
+    OPT_5,
+    OPT_VERBOSE,
+    OPT_QUIET,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS dhparam_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [numbits]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [numbits]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"check", OPT_CHECK, '-', "Check the DH parameters"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "check", OPT_CHECK, '-', "Check the DH parameters" },
 #if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_DEPRECATED_3_0)
-    {"dsaparam", OPT_DSAPARAM, '-',
-     "Read or generate DSA parameters, convert to DH"},
+    { "dsaparam", OPT_DSAPARAM, '-',
+        "Read or generate DSA parameters, convert to DH" },
 #endif
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file"},
-    {"inform", OPT_INFORM, 'F', "Input format, DER or PEM"},
+    { "in", OPT_IN, '<', "Input file" },
+    { "inform", OPT_INFORM, 'F', "Input format, DER or PEM" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file"},
-    {"outform", OPT_OUTFORM, 'F', "Output format, DER or PEM"},
-    {"text", OPT_TEXT, '-', "Print a text form of the DH parameters"},
-    {"noout", OPT_NOOUT, '-', "Don't output any DH parameters"},
-    {"2", OPT_2, '-', "Generate parameters using 2 as the generator value"},
-    {"3", OPT_3, '-', "Generate parameters using 3 as the generator value"},
-    {"5", OPT_5, '-', "Generate parameters using 5 as the generator value"},
-    {"verbose", OPT_VERBOSE, '-', "Verbose output"},
-    {"quiet", OPT_QUIET, '-', "Terse output"},
+    { "out", OPT_OUT, '>', "Output file" },
+    { "outform", OPT_OUTFORM, 'F', "Output format, DER or PEM" },
+    { "text", OPT_TEXT, '-', "Print a text form of the DH parameters" },
+    { "noout", OPT_NOOUT, '-', "Don't output any DH parameters" },
+    { "2", OPT_2, '-', "Generate parameters using 2 as the generator value" },
+    { "3", OPT_3, '-', "Generate parameters using 3 as the generator value" },
+    { "5", OPT_5, '-', "Generate parameters using 5 as the generator value" },
+    { "verbose", OPT_VERBOSE, '-', "Verbose output" },
+    { "quiet", OPT_QUIET, '-', "Terse output" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"numbits", 0, 0, "Number of bits if generating parameters (optional)"},
-    {NULL}
+    { "numbits", 0, 0, "Number of bits if generating parameters (optional)" },
+    { NULL }
 };
 
 int dhparam_main(int argc, char **argv)
@@ -96,7 +108,7 @@ int dhparam_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -175,7 +187,7 @@ int dhparam_main(int argc, char **argv)
 
     if (dsaparam && g) {
         BIO_printf(bio_err,
-                   "Error, generator may not be chosen for DSA parameters\n");
+            "Error, generator may not be chosen for DSA parameters\n");
         goto end;
     }
 
@@ -193,22 +205,22 @@ int dhparam_main(int argc, char **argv)
         ctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(), alg, app_get0_propq());
         if (ctx == NULL) {
             BIO_printf(bio_err,
-                        "Error, %s param generation context allocation failed\n",
-                        alg);
+                "Error, %s param generation context allocation failed\n",
+                alg);
             goto end;
         }
         EVP_PKEY_CTX_set_app_data(ctx, bio_err);
         if (verbose) {
             EVP_PKEY_CTX_set_cb(ctx, progress_cb);
             BIO_printf(bio_err,
-                        "Generating %s parameters, %d bit long %sprime\n",
-                        alg, num, dsaparam ? "" : "safe ");
+                "Generating %s parameters, %d bit long %sprime\n",
+                alg, num, dsaparam ? "" : "safe ");
         }
 
         if (EVP_PKEY_paramgen_init(ctx) <= 0) {
             BIO_printf(bio_err,
-                        "Error, unable to initialise %s parameters\n",
-                        alg);
+                "Error, unable to initialise %s parameters\n",
+                alg);
             goto end;
         }
 
@@ -258,32 +270,34 @@ int dhparam_main(int argc, char **argv)
              */
             done = 1;
             /*
-            * We set NULL for the keytype to allow any key type. We don't know
-            * if we're going to get DH or DHX (or DSA in the event of dsaparam).
-            * We check that we got one of those key types afterwards.
-            */
+             * We set NULL for the keytype to allow any key type. We don't know
+             * if we're going to get DH or DHX (or DSA in the event of dsaparam).
+             * We check that we got one of those key types afterwards.
+             */
             decoderctx
                 = OSSL_DECODER_CTX_new_for_pkey(&tmppkey,
-                                                (informat == FORMAT_ASN1)
-                                                    ? "DER" : "PEM",
-                                                NULL,
-                                                (informat == FORMAT_ASN1)
-                                                    ? keytype : NULL,
-                                                OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                                                NULL, NULL);
+                    (informat == FORMAT_ASN1)
+                        ? "DER"
+                        : "PEM",
+                    NULL,
+                    (informat == FORMAT_ASN1)
+                        ? keytype
+                        : NULL,
+                    OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+                    NULL, NULL);
 
             if (decoderctx != NULL
-                    && !OSSL_DECODER_from_bio(decoderctx, in)
-                    && informat == FORMAT_ASN1
-                    && strcmp(keytype, "DH") == 0) {
+                && !OSSL_DECODER_from_bio(decoderctx, in)
+                && informat == FORMAT_ASN1
+                && strcmp(keytype, "DH") == 0) {
                 /*
-                * When reading DER we explicitly state the expected keytype
-                * because, unlike PEM, there is no header to declare what
-                * the contents of the DER file are. The decoders just try
-                * and guess. Unfortunately with DHX key types they may guess
-                * wrong and think we have a DSA keytype. Therefore, we try
-                * both DH and DHX sequentially.
-                */
+                 * When reading DER we explicitly state the expected keytype
+                 * because, unlike PEM, there is no header to declare what
+                 * the contents of the DER file are. The decoders just try
+                 * and guess. Unfortunately with DHX key types they may guess
+                 * wrong and think we have a DSA keytype. Therefore, we try
+                 * both DH and DHX sequentially.
+                 */
                 keytype = "DHX";
                 /*
                  * BIO_reset() returns 0 for success for file BIOs only!!!
@@ -309,7 +323,7 @@ int dhparam_main(int argc, char **argv)
                 goto end;
         } else {
             if (!EVP_PKEY_is_a(tmppkey, "DH")
-                    && !EVP_PKEY_is_a(tmppkey, "DHX")) {
+                && !EVP_PKEY_is_a(tmppkey, "DHX")) {
                 BIO_printf(bio_err, "Error, unable to load DH parameters\n");
                 goto end;
             }
@@ -339,12 +353,12 @@ int dhparam_main(int argc, char **argv)
     }
 
     if (!noout) {
-        OSSL_ENCODER_CTX *ectx =
-            OSSL_ENCODER_CTX_new_for_pkey(pkey,
-                                          OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                                          outformat == FORMAT_ASN1
-                                              ? "DER" : "PEM",
-                                          NULL, NULL);
+        OSSL_ENCODER_CTX *ectx = OSSL_ENCODER_CTX_new_for_pkey(pkey,
+            OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+            outformat == FORMAT_ASN1
+                ? "DER"
+                : "PEM",
+            NULL, NULL);
 
         if (ectx == NULL || !OSSL_ENCODER_to_bio(ectx, out)) {
             OSSL_ENCODER_CTX_free(ectx);
@@ -354,7 +368,7 @@ int dhparam_main(int argc, char **argv)
         OSSL_ENCODER_CTX_free(ectx);
     }
     ret = 0;
- end:
+end:
     if (ret != 0)
         ERR_print_errors(bio_err);
     BIO_free(in);
@@ -380,33 +394,33 @@ static EVP_PKEY *dsa_to_dh(EVP_PKEY *dh)
     EVP_PKEY *pkey = NULL;
 
     if (!EVP_PKEY_get_bn_param(dh, OSSL_PKEY_PARAM_FFC_P, &bn_p)
-            || !EVP_PKEY_get_bn_param(dh, OSSL_PKEY_PARAM_FFC_Q, &bn_q)
-            || !EVP_PKEY_get_bn_param(dh, OSSL_PKEY_PARAM_FFC_G, &bn_g)) {
+        || !EVP_PKEY_get_bn_param(dh, OSSL_PKEY_PARAM_FFC_Q, &bn_q)
+        || !EVP_PKEY_get_bn_param(dh, OSSL_PKEY_PARAM_FFC_G, &bn_g)) {
         BIO_printf(bio_err, "Error, failed to set DH parameters\n");
         goto err;
     }
 
     if ((tmpl = OSSL_PARAM_BLD_new()) == NULL
-            || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P,
-                                        bn_p)
-            || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_Q,
-                                        bn_q)
-            || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_G,
-                                        bn_g)
-            || (params = OSSL_PARAM_BLD_to_param(tmpl)) == NULL) {
+        || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P,
+            bn_p)
+        || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_Q,
+            bn_q)
+        || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_G,
+            bn_g)
+        || (params = OSSL_PARAM_BLD_to_param(tmpl)) == NULL) {
         BIO_printf(bio_err, "Error, failed to set DH parameters\n");
         goto err;
     }
 
     ctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(), "DHX", app_get0_propq());
     if (ctx == NULL
-            || EVP_PKEY_fromdata_init(ctx) <= 0
-            || EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEY_PARAMETERS, params) <= 0) {
+        || EVP_PKEY_fromdata_init(ctx) <= 0
+        || EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEY_PARAMETERS, params) <= 0) {
         BIO_printf(bio_err, "Error, failed to set DH parameters\n");
         goto err;
     }
 
- err:
+err:
     EVP_PKEY_CTX_free(ctx);
     OSSL_PARAM_free(params);
     OSSL_PARAM_BLD_free(tmpl);
@@ -415,4 +429,3 @@ static EVP_PKEY *dsa_to_dh(EVP_PKEY *dh)
     BN_free(bn_g);
     return pkey;
 }
-
diff --git a/apps/dsa.c b/apps/dsa.c
index 9ba8c252dafe6..fc2ef99adb3ea 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -27,51 +27,63 @@
 #include <openssl/core_dispatch.h>
 
 #ifndef OPENSSL_NO_RC4
-# define DEFAULT_PVK_ENCR_STRENGTH      2
+#define DEFAULT_PVK_ENCR_STRENGTH 2
 #else
-# define DEFAULT_PVK_ENCR_STRENGTH      0
+#define DEFAULT_PVK_ENCR_STRENGTH 0
 #endif
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_ENGINE,
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_IN,
+    OPT_OUT,
+    OPT_ENGINE,
     /* Do not change the order here; see case statements below */
-    OPT_PVK_NONE, OPT_PVK_WEAK, OPT_PVK_STRONG,
-    OPT_NOOUT, OPT_TEXT, OPT_MODULUS, OPT_PUBIN,
-    OPT_PUBOUT, OPT_CIPHER, OPT_PASSIN, OPT_PASSOUT,
+    OPT_PVK_NONE,
+    OPT_PVK_WEAK,
+    OPT_PVK_STRONG,
+    OPT_NOOUT,
+    OPT_TEXT,
+    OPT_MODULUS,
+    OPT_PUBIN,
+    OPT_PUBOUT,
+    OPT_CIPHER,
+    OPT_PASSIN,
+    OPT_PASSOUT,
     OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS dsa_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"", OPT_CIPHER, '-', "Any supported cipher"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "", OPT_CIPHER, '-', "Any supported cipher" },
 #ifndef OPENSSL_NO_RC4
-    {"pvk-strong", OPT_PVK_STRONG, '-', "Enable 'Strong' PVK encoding level (default)"},
-    {"pvk-weak", OPT_PVK_WEAK, '-', "Enable 'Weak' PVK encoding level"},
-    {"pvk-none", OPT_PVK_NONE, '-', "Don't enforce PVK encoding"},
+    { "pvk-strong", OPT_PVK_STRONG, '-', "Enable 'Strong' PVK encoding level (default)" },
+    { "pvk-weak", OPT_PVK_WEAK, '-', "Enable 'Weak' PVK encoding level" },
+    { "pvk-none", OPT_PVK_NONE, '-', "Don't enforce PVK encoding" },
 #endif
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, 's', "Input key"},
-    {"inform", OPT_INFORM, 'f', "Input format (DER/PEM/PVK); has no effect"},
-    {"pubin", OPT_PUBIN, '-', "Expect a public key in input file"},
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
+    { "in", OPT_IN, 's', "Input key" },
+    { "inform", OPT_INFORM, 'f', "Input format (DER/PEM/PVK); has no effect" },
+    { "pubin", OPT_PUBIN, '-', "Expect a public key in input file" },
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file"},
-    {"outform", OPT_OUTFORM, 'f', "Output format, DER PEM PVK"},
-    {"noout", OPT_NOOUT, '-', "Don't print key out"},
-    {"text", OPT_TEXT, '-', "Print the key in text"},
-    {"modulus", OPT_MODULUS, '-', "Print the DSA public value"},
-    {"pubout", OPT_PUBOUT, '-', "Output public key, not private"},
-    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
+    { "out", OPT_OUT, '>', "Output file" },
+    { "outform", OPT_OUTFORM, 'f', "Output format, DER PEM PVK" },
+    { "noout", OPT_NOOUT, '-', "Don't print key out" },
+    { "text", OPT_TEXT, '-', "Print the key in text" },
+    { "modulus", OPT_MODULUS, '-', "Print the DSA public value" },
+    { "pubout", OPT_PUBOUT, '-', "Output public key, not private" },
+    { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
 
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int dsa_main(int argc, char **argv)
@@ -98,7 +110,7 @@ int dsa_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             ret = 0;
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
@@ -129,9 +141,9 @@ int dsa_main(int argc, char **argv)
         case OPT_PASSOUT:
             passoutarg = opt_arg();
             break;
-        case OPT_PVK_STRONG:    /* pvk_encr:= 2 */
-        case OPT_PVK_WEAK:      /* pvk_encr:= 1 */
-        case OPT_PVK_NONE:      /* pvk_encr:= 0 */
+        case OPT_PVK_STRONG: /* pvk_encr:= 2 */
+        case OPT_PVK_WEAK: /* pvk_encr:= 1 */
+        case OPT_PVK_NONE: /* pvk_encr:= 0 */
 #ifndef OPENSSL_NO_RC4
             pvk_encr = (o - OPT_PVK_NONE);
 #endif
@@ -252,12 +264,12 @@ int dsa_main(int argc, char **argv)
     } else {
         assert(private);
         selection = (OSSL_KEYMGMT_SELECT_KEYPAIR
-                     | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS);
+            | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS);
     }
 
     /* Perform the encoding */
     ectx = OSSL_ENCODER_CTX_new_for_pkey(pkey, selection, output_type,
-                                         output_structure, NULL);
+        output_structure, NULL);
     if (OSSL_ENCODER_CTX_get_num_encoders(ectx) == 0) {
         BIO_printf(bio_err, "%s format not supported\n", output_type);
         goto end;
@@ -273,8 +285,8 @@ int dsa_main(int argc, char **argv)
         if (passout != NULL)
             /* When passout given, override the passphrase prompter */
             OSSL_ENCODER_CTX_set_passphrase(ectx,
-                                            (const unsigned char *)passout,
-                                            strlen(passout));
+                (const unsigned char *)passout,
+                strlen(passout));
     }
 
     /* PVK requires a bit more */
@@ -293,7 +305,7 @@ int dsa_main(int argc, char **argv)
         goto end;
     }
     ret = 0;
- end:
+end:
     if (ret != 0)
         ERR_print_errors(bio_err);
     OSSL_ENCODER_CTX_free(ectx);
diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 99fc3ee7b8046..24e0f2c0fdb9f 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -26,40 +26,49 @@ static int verbose = 0;
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_TEXT,
-    OPT_NOOUT, OPT_GENKEY, OPT_ENGINE, OPT_VERBOSE, OPT_QUIET,
-    OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_IN,
+    OPT_OUT,
+    OPT_TEXT,
+    OPT_NOOUT,
+    OPT_GENKEY,
+    OPT_ENGINE,
+    OPT_VERBOSE,
+    OPT_QUIET,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS dsaparam_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [numbits] [numqbits]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [numbits] [numqbits]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine e, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file"},
-    {"inform", OPT_INFORM, 'F', "Input format - DER or PEM"},
+    { "in", OPT_IN, '<', "Input file" },
+    { "inform", OPT_INFORM, 'F', "Input format - DER or PEM" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file"},
-    {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
-    {"text", OPT_TEXT, '-', "Print as text"},
-    {"noout", OPT_NOOUT, '-', "No output"},
-    {"verbose", OPT_VERBOSE, '-', "Verbose output"},
-    {"quiet", OPT_QUIET, '-', "Terse output"},
-    {"genkey", OPT_GENKEY, '-', "Generate a DSA key"},
+    { "out", OPT_OUT, '>', "Output file" },
+    { "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
+    { "text", OPT_TEXT, '-', "Print as text" },
+    { "noout", OPT_NOOUT, '-', "No output" },
+    { "verbose", OPT_VERBOSE, '-', "Verbose output" },
+    { "quiet", OPT_QUIET, '-', "Terse output" },
+    { "genkey", OPT_GENKEY, '-', "Generate a DSA key" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"numbits", 0, 0, "Number of bits if generating parameters or key (optional)"},
-    {"numqbits", 0, 0, "Number of bits in the subprime parameter q if generating parameters or key (optional)"},
-    {NULL}
+    { "numbits", 0, 0, "Number of bits if generating parameters or key (optional)" },
+    { "numqbits", 0, 0, "Number of bits in the subprime parameter q if generating parameters or key (optional)" },
+    { NULL }
 };
 
 int dsaparam_main(int argc, char **argv)
@@ -79,7 +88,7 @@ int dsaparam_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -153,37 +162,37 @@ int dsaparam_main(int argc, char **argv)
     ctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(), "DSA", app_get0_propq());
     if (ctx == NULL) {
         BIO_printf(bio_err,
-                   "Error, DSA parameter generation context allocation failed\n");
+            "Error, DSA parameter generation context allocation failed\n");
         goto end;
     }
     if (numbits > 0) {
         if (numbits > OPENSSL_DSA_MAX_MODULUS_BITS)
             BIO_printf(bio_err,
-                       "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
-                       "         Your key size is %d! Larger key size may behave not as expected.\n",
-                       OPENSSL_DSA_MAX_MODULUS_BITS, numbits);
+                "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
+                "         Your key size is %d! Larger key size may behave not as expected.\n",
+                OPENSSL_DSA_MAX_MODULUS_BITS, numbits);
 
         EVP_PKEY_CTX_set_app_data(ctx, bio_err);
         if (verbose) {
             EVP_PKEY_CTX_set_cb(ctx, progress_cb);
             BIO_printf(bio_err, "Generating DSA parameters, %d bit long prime\n",
-                       num);
+                num);
             BIO_printf(bio_err, "This could take some time\n");
         }
         if (EVP_PKEY_paramgen_init(ctx) <= 0) {
             BIO_printf(bio_err,
-                       "Error, DSA key generation paramgen init failed\n");
+                "Error, DSA key generation paramgen init failed\n");
             goto end;
         }
         if (EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, num) <= 0) {
             BIO_printf(bio_err,
-                       "Error, DSA key generation setting bit length failed\n");
+                "Error, DSA key generation setting bit length failed\n");
             goto end;
         }
         if (numqbits > 0) {
             if (EVP_PKEY_CTX_set_dsa_paramgen_q_bits(ctx, numqbits) <= 0) {
                 BIO_printf(bio_err,
-                        "Error, DSA key generation setting subprime bit length failed\n");
+                    "Error, DSA key generation setting subprime bit length failed\n");
                 goto end;
             }
         }
@@ -220,15 +229,15 @@ int dsaparam_main(int argc, char **argv)
     if (genkey) {
         EVP_PKEY_CTX_free(ctx);
         ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(), params,
-                app_get0_propq());
+            app_get0_propq());
         if (ctx == NULL) {
             BIO_printf(bio_err,
-                       "Error, DSA key generation context allocation failed\n");
+                "Error, DSA key generation context allocation failed\n");
             goto end;
         }
         if (EVP_PKEY_keygen_init(ctx) <= 0) {
             BIO_printf(bio_err,
-                       "Error, unable to initialise for key generation\n");
+                "Error, unable to initialise for key generation\n");
             goto end;
         }
         pkey = app_keygen(ctx, "DSA", numbits, verbose);
@@ -241,7 +250,7 @@ int dsaparam_main(int argc, char **argv)
             i = PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, NULL);
     }
     ret = 0;
- end:
+end:
     if (ret != 0)
         ERR_print_errors(bio_err);
     BIO_free_all(out);
diff --git a/apps/ec.c b/apps/ec.c
index 677876ccc90e3..dee1ef48e7e06 100644
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -23,42 +23,56 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_IN, OPT_OUT,
-    OPT_NOOUT, OPT_TEXT, OPT_PARAM_OUT, OPT_PUBIN, OPT_PUBOUT,
-    OPT_PASSIN, OPT_PASSOUT, OPT_PARAM_ENC, OPT_CONV_FORM, OPT_CIPHER,
-    OPT_NO_PUBLIC, OPT_CHECK, OPT_PROV_ENUM
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_ENGINE,
+    OPT_IN,
+    OPT_OUT,
+    OPT_NOOUT,
+    OPT_TEXT,
+    OPT_PARAM_OUT,
+    OPT_PUBIN,
+    OPT_PUBOUT,
+    OPT_PASSIN,
+    OPT_PASSOUT,
+    OPT_PARAM_ENC,
+    OPT_CONV_FORM,
+    OPT_CIPHER,
+    OPT_NO_PUBLIC,
+    OPT_CHECK,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS ec_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, 's', "Input file"},
-    {"inform", OPT_INFORM, 'f', "Input format (DER/PEM/P12/ENGINE)"},
-    {"pubin", OPT_PUBIN, '-', "Expect a public key in input file"},
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
-    {"check", OPT_CHECK, '-', "check key consistency"},
-    {"", OPT_CIPHER, '-', "Any supported cipher"},
-    {"param_enc", OPT_PARAM_ENC, 's',
-     "Specifies the way the ec parameters are encoded"},
-    {"conv_form", OPT_CONV_FORM, 's', "Specifies the point conversion form "},
+    { "in", OPT_IN, 's', "Input file" },
+    { "inform", OPT_INFORM, 'f', "Input format (DER/PEM/P12/ENGINE)" },
+    { "pubin", OPT_PUBIN, '-', "Expect a public key in input file" },
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+    { "check", OPT_CHECK, '-', "check key consistency" },
+    { "", OPT_CIPHER, '-', "Any supported cipher" },
+    { "param_enc", OPT_PARAM_ENC, 's',
+        "Specifies the way the ec parameters are encoded" },
+    { "conv_form", OPT_CONV_FORM, 's', "Specifies the point conversion form " },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file"},
-    {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
-    {"noout", OPT_NOOUT, '-', "Don't print key out"},
-    {"text", OPT_TEXT, '-', "Print the key"},
-    {"param_out", OPT_PARAM_OUT, '-', "Print the elliptic curve parameters"},
-    {"pubout", OPT_PUBOUT, '-', "Output public key, not private"},
-    {"no_public", OPT_NO_PUBLIC, '-', "exclude public key from private key"},
-    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
+    { "out", OPT_OUT, '>', "Output file" },
+    { "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
+    { "noout", OPT_NOOUT, '-', "Don't print key out" },
+    { "text", OPT_TEXT, '-', "Print the key" },
+    { "param_out", OPT_PARAM_OUT, '-', "Print the elliptic curve parameters" },
+    { "pubout", OPT_PUBOUT, '-', "Output public key, not private" },
+    { "no_public", OPT_NO_PUBLIC, '-', "exclude public key from private key" },
+    { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
 
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int ec_main(int argc, char **argv)
@@ -86,7 +100,7 @@ int ec_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -188,15 +202,15 @@ int ec_main(int argc, char **argv)
 
     if (point_format
         && !EVP_PKEY_set_utf8_string_param(
-                eckey, OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
-                point_format)) {
+            eckey, OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+            point_format)) {
         BIO_printf(bio_err, "unable to set point conversion format\n");
         goto end;
     }
 
     if (asn1_encoding != NULL
         && !EVP_PKEY_set_utf8_string_param(
-                eckey, OSSL_PKEY_PARAM_EC_ENCODING, asn1_encoding)) {
+            eckey, OSSL_PKEY_PARAM_EC_ENCODING, asn1_encoding)) {
         BIO_printf(bio_err, "unable to set asn1 encoding format\n");
         goto end;
     }
@@ -253,8 +267,8 @@ int ec_main(int argc, char **argv)
         }
 
         ectx = OSSL_ENCODER_CTX_new_for_pkey(eckey, selection,
-                                             output_type, output_structure,
-                                             NULL);
+            output_type, output_structure,
+            NULL);
         if (enc != NULL) {
             OSSL_ENCODER_CTX_set_cipher(ectx, EVP_CIPHER_get0_name(enc), NULL);
             /* Default passphrase prompter */
@@ -262,8 +276,8 @@ int ec_main(int argc, char **argv)
             if (passout != NULL)
                 /* When passout given, override the passphrase prompter */
                 OSSL_ENCODER_CTX_set_passphrase(ectx,
-                                                (const unsigned char *)passout,
-                                                strlen(passout));
+                    (const unsigned char *)passout,
+                    strlen(passout));
         }
         if (!OSSL_ENCODER_to_bio(ectx, out)) {
             BIO_printf(bio_err, "unable to write EC key\n");
diff --git a/apps/ecparam.c b/apps/ecparam.c
index f0879dfb11a9f..017dc7568d8e8 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -23,46 +23,59 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_TEXT,
-    OPT_CHECK, OPT_LIST_CURVES, OPT_NO_SEED, OPT_NOOUT, OPT_NAME,
-    OPT_CONV_FORM, OPT_PARAM_ENC, OPT_GENKEY, OPT_ENGINE, OPT_CHECK_NAMED,
-    OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_IN,
+    OPT_OUT,
+    OPT_TEXT,
+    OPT_CHECK,
+    OPT_LIST_CURVES,
+    OPT_NO_SEED,
+    OPT_NOOUT,
+    OPT_NAME,
+    OPT_CONV_FORM,
+    OPT_PARAM_ENC,
+    OPT_GENKEY,
+    OPT_ENGINE,
+    OPT_CHECK_NAMED,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS ecparam_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"list_curves", OPT_LIST_CURVES, '-',
-     "Prints a list of all curve 'short names'"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "list_curves", OPT_LIST_CURVES, '-',
+        "Prints a list of all curve 'short names'" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
-    {"genkey", OPT_GENKEY, '-', "Generate ec key"},
-    {"in", OPT_IN, '<', "Input file  - default stdin"},
-    {"inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)"},
-    {"out", OPT_OUT, '>', "Output file - default stdout"},
-    {"outform", OPT_OUTFORM, 'F', "Output format - default PEM"},
+    { "genkey", OPT_GENKEY, '-', "Generate ec key" },
+    { "in", OPT_IN, '<', "Input file  - default stdin" },
+    { "inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)" },
+    { "out", OPT_OUT, '>', "Output file - default stdout" },
+    { "outform", OPT_OUTFORM, 'F', "Output format - default PEM" },
 
     OPT_SECTION("Output"),
-    {"text", OPT_TEXT, '-', "Print the ec parameters in text form"},
-    {"noout", OPT_NOOUT, '-', "Do not print the ec parameter"},
-    {"param_enc", OPT_PARAM_ENC, 's',
-     "Specifies the way the ec parameters are encoded"},
+    { "text", OPT_TEXT, '-', "Print the ec parameters in text form" },
+    { "noout", OPT_NOOUT, '-', "Do not print the ec parameter" },
+    { "param_enc", OPT_PARAM_ENC, 's',
+        "Specifies the way the ec parameters are encoded" },
 
     OPT_SECTION("Parameter"),
-    {"check", OPT_CHECK, '-', "Validate the ec parameters"},
-    {"check_named", OPT_CHECK_NAMED, '-',
-     "Check that named EC curve parameters have not been modified"},
-    {"no_seed", OPT_NO_SEED, '-',
-     "If 'explicit' parameters are chosen do not use the seed"},
-    {"name", OPT_NAME, 's',
-     "Use the ec parameters with specified 'short name'"},
-    {"conv_form", OPT_CONV_FORM, 's', "Specifies the point conversion form "},
+    { "check", OPT_CHECK, '-', "Validate the ec parameters" },
+    { "check_named", OPT_CHECK_NAMED, '-',
+        "Check that named EC curve parameters have not been modified" },
+    { "no_seed", OPT_NO_SEED, '-',
+        "If 'explicit' parameters are chosen do not use the seed" },
+    { "name", OPT_NAME, 's',
+        "Use the ec parameters with specified 'short name'" },
+    { "conv_form", OPT_CONV_FORM, 's', "Specifies the point conversion form " },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 static int list_builtin_curves(BIO *out)
@@ -112,7 +125,7 @@ int ecparam_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -206,30 +219,30 @@ int ecparam_main(int argc, char **argv)
 
         if (strcmp(curve_name, "secp192r1") == 0) {
             BIO_printf(bio_err,
-                       "using curve name prime192v1 instead of secp192r1\n");
+                "using curve name prime192v1 instead of secp192r1\n");
             curve_name = SN_X9_62_prime192v1;
         } else if (strcmp(curve_name, "secp256r1") == 0) {
             BIO_printf(bio_err,
-                       "using curve name prime256v1 instead of secp256r1\n");
+                "using curve name prime256v1 instead of secp256r1\n");
             curve_name = SN_X9_62_prime256v1;
         }
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                curve_name, 0);
+            curve_name, 0);
         if (asn1_encoding != NULL)
             *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_EC_ENCODING,
-                                                    asn1_encoding, 0);
+                asn1_encoding, 0);
         if (point_format != NULL)
             *p++ = OSSL_PARAM_construct_utf8_string(
-                       OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
-                       point_format, 0);
+                OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+                point_format, 0);
         *p = OSSL_PARAM_construct_end();
 
         if (OPENSSL_strcasecmp(curve_name, "SM2") == 0)
             gctx_params = EVP_PKEY_CTX_new_from_name(app_get0_libctx(), "sm2",
-                                                     app_get0_propq());
+                app_get0_propq());
         else
             gctx_params = EVP_PKEY_CTX_new_from_name(app_get0_libctx(), "ec",
-                                                     app_get0_propq());
+                app_get0_propq());
         if (gctx_params == NULL
             || EVP_PKEY_keygen_init(gctx_params) <= 0
             || EVP_PKEY_CTX_set_params(gctx_params, params) <= 0
@@ -239,10 +252,10 @@ int ecparam_main(int argc, char **argv)
         }
     } else {
         params_key = load_keyparams_suppress(infile, informat, 1, "EC",
-                                             "EC parameters", 1);
+            "EC parameters", 1);
         if (params_key == NULL)
             params_key = load_keyparams_suppress(infile, informat, 1, "SM2",
-                                                 "SM2 parameters", 1);
+                "SM2 parameters", 1);
 
         if (params_key == NULL) {
             BIO_printf(bio_err, "Unable to load parameters from %s\n", infile);
@@ -251,15 +264,15 @@ int ecparam_main(int argc, char **argv)
 
         if (point_format
             && !EVP_PKEY_set_utf8_string_param(
-                    params_key, OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
-                    point_format)) {
+                params_key, OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+                point_format)) {
             BIO_printf(bio_err, "unable to set point conversion format\n");
             goto end;
         }
 
         if (asn1_encoding != NULL
             && !EVP_PKEY_set_utf8_string_param(
-                    params_key, OSSL_PKEY_PARAM_EC_ENCODING, asn1_encoding)) {
+                params_key, OSSL_PKEY_PARAM_EC_ENCODING, asn1_encoding)) {
             BIO_printf(bio_err, "unable to set asn1 encoding format\n");
             goto end;
         }
@@ -267,7 +280,7 @@ int ecparam_main(int argc, char **argv)
 
     if (no_seed
         && !EVP_PKEY_set_octet_string_param(params_key, OSSL_PKEY_PARAM_EC_SEED,
-                                            NULL, 0)) {
+            NULL, 0)) {
         BIO_printf(bio_err, "unable to clear seed\n");
         goto end;
     }
@@ -287,13 +300,13 @@ int ecparam_main(int argc, char **argv)
 
         if (check_named
             && !EVP_PKEY_set_utf8_string_param(params_key,
-                                           OSSL_PKEY_PARAM_EC_GROUP_CHECK_TYPE,
-                                           OSSL_PKEY_EC_GROUP_CHECK_NAMED)) {
-                BIO_printf(bio_err, "unable to set check_type\n");
-                goto end;
+                OSSL_PKEY_PARAM_EC_GROUP_CHECK_TYPE,
+                OSSL_PKEY_EC_GROUP_CHECK_NAMED)) {
+            BIO_printf(bio_err, "unable to set check_type\n");
+            goto end;
         }
         pctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(), params_key,
-                                          app_get0_propq());
+            app_get0_propq());
         if (pctx == NULL || EVP_PKEY_param_check(pctx) <= 0) {
             BIO_printf(bio_err, "failed\n");
             goto end;
@@ -306,8 +319,8 @@ int ecparam_main(int argc, char **argv)
 
     if (!noout) {
         ectx_params = OSSL_ENCODER_CTX_new_for_pkey(
-                          params_key, OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                          outformat == FORMAT_ASN1 ? "DER" : "PEM", NULL, NULL);
+            params_key, OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+            outformat == FORMAT_ASN1 ? "DER" : "PEM", NULL, NULL);
         if (!OSSL_ENCODER_to_bio(ectx_params, out)) {
             BIO_printf(bio_err, "unable to write elliptic curve parameters\n");
             goto end;
@@ -324,7 +337,7 @@ int ecparam_main(int argc, char **argv)
          *    EVP_PKEY_keygen(gctx, &key) <= 0)
          */
         gctx_key = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(), params_key,
-                                              app_get0_propq());
+            app_get0_propq());
         if (EVP_PKEY_keygen_init(gctx_key) <= 0
             || EVP_PKEY_keygen(gctx_key, &key) <= 0) {
             BIO_printf(bio_err, "unable to generate key\n");
@@ -332,11 +345,11 @@ int ecparam_main(int argc, char **argv)
         }
         assert(private);
         ectx_key = OSSL_ENCODER_CTX_new_for_pkey(
-                       key, OSSL_KEYMGMT_SELECT_ALL,
-                       outformat == FORMAT_ASN1 ? "DER" : "PEM", NULL, NULL);
+            key, OSSL_KEYMGMT_SELECT_ALL,
+            outformat == FORMAT_ASN1 ? "DER" : "PEM", NULL, NULL);
         if (!OSSL_ENCODER_to_bio(ectx_key, out)) {
             BIO_printf(bio_err, "unable to write elliptic "
-                       "curve parameters\n");
+                                "curve parameters\n");
             goto end;
         }
     }
diff --git a/apps/enc.c b/apps/enc.c
index 3f45ba15e576d..2dd8393582315 100644
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -21,16 +21,16 @@
 #include <openssl/rand.h>
 #include <openssl/pem.h>
 #ifndef OPENSSL_NO_COMP
-# include <openssl/comp.h>
+#include <openssl/comp.h>
 #endif
 #include <ctype.h>
 
 #undef SIZE
 #undef BSIZE
-#define SIZE    (512)
-#define BSIZE   (8*1024)
+#define SIZE (512)
+#define BSIZE (8 * 1024)
 
-#define PBKDF2_ITER_DEFAULT     10000
+#define PBKDF2_ITER_DEFAULT 10000
 #define STR(a) XSTR(a)
 #define XSTR(a) #a
 
@@ -45,74 +45,100 @@ struct doall_enc_ciphers {
 typedef enum OPTION_choice {
     OPT_COMMON,
     OPT_LIST,
-    OPT_E, OPT_IN, OPT_OUT, OPT_PASS, OPT_ENGINE, OPT_D, OPT_P, OPT_V,
-    OPT_NOPAD, OPT_SALT, OPT_NOSALT, OPT_DEBUG, OPT_UPPER_P, OPT_UPPER_A,
-    OPT_A, OPT_Z, OPT_BUFSIZE, OPT_K, OPT_KFILE, OPT_UPPER_K, OPT_NONE,
-    OPT_UPPER_S, OPT_IV, OPT_MD, OPT_ITER, OPT_PBKDF2, OPT_CIPHER,
-    OPT_SALTLEN, OPT_R_ENUM, OPT_PROV_ENUM,
-    OPT_SKEYOPT, OPT_SKEYMGMT
+    OPT_E,
+    OPT_IN,
+    OPT_OUT,
+    OPT_PASS,
+    OPT_ENGINE,
+    OPT_D,
+    OPT_P,
+    OPT_V,
+    OPT_NOPAD,
+    OPT_SALT,
+    OPT_NOSALT,
+    OPT_DEBUG,
+    OPT_UPPER_P,
+    OPT_UPPER_A,
+    OPT_A,
+    OPT_Z,
+    OPT_BUFSIZE,
+    OPT_K,
+    OPT_KFILE,
+    OPT_UPPER_K,
+    OPT_NONE,
+    OPT_UPPER_S,
+    OPT_IV,
+    OPT_MD,
+    OPT_ITER,
+    OPT_PBKDF2,
+    OPT_CIPHER,
+    OPT_SALTLEN,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM,
+    OPT_SKEYOPT,
+    OPT_SKEYMGMT
 } OPTION_CHOICE;
 
 const OPTIONS enc_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"list", OPT_LIST, '-', "List ciphers"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "list", OPT_LIST, '-', "List ciphers" },
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-    {"ciphers", OPT_LIST, '-', "Alias for -list"},
+    { "ciphers", OPT_LIST, '-', "Alias for -list" },
 #endif
-    {"e", OPT_E, '-', "Encrypt"},
-    {"d", OPT_D, '-', "Decrypt"},
-    {"p", OPT_P, '-', "Print the iv/key"},
-    {"P", OPT_UPPER_P, '-', "Print the iv/key and exit"},
+    { "e", OPT_E, '-', "Encrypt" },
+    { "d", OPT_D, '-', "Decrypt" },
+    { "p", OPT_P, '-', "Print the iv/key" },
+    { "P", OPT_UPPER_P, '-', "Print the iv/key and exit" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file"},
-    {"k", OPT_K, 's', "Passphrase"},
-    {"kfile", OPT_KFILE, '<', "Read passphrase from file"},
+    { "in", OPT_IN, '<', "Input file" },
+    { "k", OPT_K, 's', "Passphrase" },
+    { "kfile", OPT_KFILE, '<', "Read passphrase from file" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file"},
-    {"pass", OPT_PASS, 's', "Passphrase source"},
-    {"v", OPT_V, '-', "Verbose output"},
-    {"a", OPT_A, '-', "Base64 encode/decode, depending on encryption flag"},
-    {"base64", OPT_A, '-', "Same as option -a"},
-    {"A", OPT_UPPER_A, '-',
-     "Used with -[base64|a] to specify base64 buffer as a single line"},
+    { "out", OPT_OUT, '>', "Output file" },
+    { "pass", OPT_PASS, 's', "Passphrase source" },
+    { "v", OPT_V, '-', "Verbose output" },
+    { "a", OPT_A, '-', "Base64 encode/decode, depending on encryption flag" },
+    { "base64", OPT_A, '-', "Same as option -a" },
+    { "A", OPT_UPPER_A, '-',
+        "Used with -[base64|a] to specify base64 buffer as a single line" },
 
     OPT_SECTION("Encryption"),
-    {"nopad", OPT_NOPAD, '-', "Disable standard block padding"},
-    {"salt", OPT_SALT, '-', "Use salt in the KDF (default)"},
-    {"nosalt", OPT_NOSALT, '-', "Do not use salt in the KDF"},
-    {"debug", OPT_DEBUG, '-', "Print debug info"},
-
-    {"bufsize", OPT_BUFSIZE, 's', "Buffer size"},
-    {"K", OPT_UPPER_K, 's', "Raw key, in hex"},
-    {"S", OPT_UPPER_S, 's', "Salt, in hex"},
-    {"iv", OPT_IV, 's', "IV in hex"},
-    {"md", OPT_MD, 's', "Use specified digest to create a key from the passphrase"},
-    {"iter", OPT_ITER, 'p',
-     "Specify the iteration count and force the use of PBKDF2"},
-    {OPT_MORE_STR, 0, 0, "Default: " STR(PBKDF2_ITER_DEFAULT)},
-    {"pbkdf2", OPT_PBKDF2, '-',
-     "Use password-based key derivation function 2 (PBKDF2)"},
-    {OPT_MORE_STR, 0, 0,
-     "Use -iter to change the iteration count from " STR(PBKDF2_ITER_DEFAULT)},
-    {"none", OPT_NONE, '-', "Don't encrypt"},
-    {"saltlen", OPT_SALTLEN, 'p', "Specify the PBKDF2 salt length (in bytes)"},
-    {OPT_MORE_STR, 0, 0, "Default: 16"},
+    { "nopad", OPT_NOPAD, '-', "Disable standard block padding" },
+    { "salt", OPT_SALT, '-', "Use salt in the KDF (default)" },
+    { "nosalt", OPT_NOSALT, '-', "Do not use salt in the KDF" },
+    { "debug", OPT_DEBUG, '-', "Print debug info" },
+
+    { "bufsize", OPT_BUFSIZE, 's', "Buffer size" },
+    { "K", OPT_UPPER_K, 's', "Raw key, in hex" },
+    { "S", OPT_UPPER_S, 's', "Salt, in hex" },
+    { "iv", OPT_IV, 's', "IV in hex" },
+    { "md", OPT_MD, 's', "Use specified digest to create a key from the passphrase" },
+    { "iter", OPT_ITER, 'p',
+        "Specify the iteration count and force the use of PBKDF2" },
+    { OPT_MORE_STR, 0, 0, "Default: " STR(PBKDF2_ITER_DEFAULT) },
+    { "pbkdf2", OPT_PBKDF2, '-',
+        "Use password-based key derivation function 2 (PBKDF2)" },
+    { OPT_MORE_STR, 0, 0,
+        "Use -iter to change the iteration count from " STR(PBKDF2_ITER_DEFAULT) },
+    { "none", OPT_NONE, '-', "Don't encrypt" },
+    { "saltlen", OPT_SALTLEN, 'p', "Specify the PBKDF2 salt length (in bytes)" },
+    { OPT_MORE_STR, 0, 0, "Default: 16" },
 #ifndef OPENSSL_NO_ZLIB
-    {"z", OPT_Z, '-', "Compress or decompress encrypted data using zlib"},
+    { "z", OPT_Z, '-', "Compress or decompress encrypted data using zlib" },
 #endif
-    {"skeyopt", OPT_SKEYOPT, 's', "Key options as opt:value for opaque symmetric key handling"},
-    {"skeymgmt", OPT_SKEYMGMT, 's', "Symmetric key management name for opaque symmetric key handling"},
-    {"", OPT_CIPHER, '-', "Any supported cipher"},
+    { "skeyopt", OPT_SKEYOPT, 's', "Key options as opt:value for opaque symmetric key handling" },
+    { "skeymgmt", OPT_SKEYMGMT, 's', "Symmetric key management name for opaque symmetric key handling" },
+    { "", OPT_CIPHER, '-', "Any supported cipher" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int enc_main(int argc, char **argv)
@@ -120,8 +146,7 @@ int enc_main(int argc, char **argv)
     static char buf[128];
     static const char magic[] = "Salted__";
     ENGINE *e = NULL;
-    BIO *in = NULL, *out = NULL, *b64 = NULL, *benc = NULL, *rbio =
-        NULL, *wbio = NULL;
+    BIO *in = NULL, *out = NULL, *b64 = NULL, *benc = NULL, *rbio = NULL, *wbio = NULL;
     EVP_CIPHER_CTX *ctx = NULL;
     EVP_CIPHER *cipher = NULL;
     EVP_MD *dgst = NULL;
@@ -183,7 +208,7 @@ int enc_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -195,7 +220,7 @@ int enc_main(int argc, char **argv)
             dec.bio = bio_out;
             dec.n = 0;
             OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
-                                   show_ciphers, &dec);
+                show_ciphers, &dec);
             BIO_printf(bio_out, "\n");
             ret = 0;
             goto end;
@@ -256,10 +281,12 @@ int enc_main(int argc, char **argv)
             if (k)
                 p[i] = '\0';
             if (!opt_long(opt_arg(), &n)
-                    || n < 0 || (k && n >= LONG_MAX / 1024))
+                || n < 0 || (k && n >= LONG_MAX / 1024))
                 goto opthelp;
             if (k)
                 n *= 1024;
+            if (n > INT_MAX)
+                goto opthelp;
             bsize = (int)n;
             break;
         case OPT_K:
@@ -274,7 +301,7 @@ int enc_main(int argc, char **argv)
             in = NULL;
             if (i <= 0) {
                 BIO_printf(bio_err,
-                           "%s Can't read key from %s\n", prog, opt_arg());
+                    "%s Can't read key from %s\n", prog, opt_arg());
                 goto opthelp;
             }
             while (--i > 0 && (buf[i] == '\r' || buf[i] == '\n'))
@@ -312,16 +339,14 @@ int enc_main(int argc, char **argv)
             break;
         case OPT_PBKDF2:
             pbkdf2 = 1;
-            if (iter == 0)    /* do not overwrite a chosen value */
+            if (iter == 0) /* do not overwrite a chosen value */
                 iter = PBKDF2_ITER_DEFAULT;
             break;
         case OPT_NONE:
             cipher = NULL;
             break;
         case OPT_SKEYOPT:
-            if ((skeyopts == NULL &&
-                 (skeyopts = sk_OPENSSL_STRING_new_null()) == NULL) ||
-                sk_OPENSSL_STRING_push(skeyopts, opt_arg()) == 0) {
+            if ((skeyopts == NULL && (skeyopts = sk_OPENSSL_STRING_new_null()) == NULL) || sk_OPENSSL_STRING_push(skeyopts, opt_arg()) == 0) {
                 BIO_printf(bio_err, "%s: out of memory\n", prog);
                 goto end;
             }
@@ -391,7 +416,7 @@ int enc_main(int argc, char **argv)
     buff = app_malloc(EVP_ENCODE_LENGTH(bsize), "evp buffer");
 
     if (infile == NULL) {
-        if (!streamable && printkey != 2) {  /* if just print key and exit, it's ok */
+        if (!streamable && printkey != 2) { /* if just print key and exit, it's ok */
             BIO_printf(bio_err, "Unstreamable cipher mode\n");
             goto end;
         }
@@ -417,8 +442,8 @@ int enc_main(int argc, char **argv)
                 char prompt[200];
 
                 BIO_snprintf(prompt, sizeof(prompt), "enter %s %s password:",
-                        EVP_CIPHER_get0_name(cipher),
-                        (enc) ? "encryption" : "decryption");
+                    EVP_CIPHER_get0_name(cipher),
+                    (enc) ? "encryption" : "decryption");
                 strbuf[0] = '\0';
                 i = EVP_read_pw_string((char *)strbuf, SIZE, prompt, enc);
                 if (i == 0) {
@@ -456,7 +481,7 @@ int enc_main(int argc, char **argv)
     wbio = out;
 
 #ifndef OPENSSL_NO_COMP
-# ifndef OPENSSL_NO_ZLIB
+#ifndef OPENSSL_NO_ZLIB
     if (do_zlib) {
         if ((bzl = BIO_new(BIO_f_zlib())) == NULL)
             goto end;
@@ -469,7 +494,7 @@ int enc_main(int argc, char **argv)
         else
             rbio = BIO_push(bzl, rbio);
     }
-# endif
+#endif
 
     if (do_brotli) {
         if ((bbrot = BIO_new(BIO_f_brotli())) == NULL)
@@ -530,7 +555,7 @@ int enc_main(int argc, char **argv)
                     BIO_printf(bio_err, "invalid hex salt value\n");
                     goto end;
                 }
-                if (enc) {  /* encryption */
+                if (enc) { /* encryption */
                     if (hsalt == NULL) {
                         if (RAND_bytes(salt, saltlen) <= 0) {
                             BIO_printf(bio_err, "RAND_bytes failed\n");
@@ -542,15 +567,17 @@ int enc_main(int argc, char **argv)
                          */
                         if ((printkey != 2)
                             && (BIO_write(wbio, magic,
-                                          sizeof(magic) - 1) != sizeof(magic) - 1
+                                    sizeof(magic) - 1)
+                                    != sizeof(magic) - 1
                                 || BIO_write(wbio,
-                                             (char *)salt,
-                                             saltlen) != saltlen)) {
+                                       (char *)salt,
+                                       saltlen)
+                                    != saltlen)) {
                             BIO_printf(bio_err, "error writing output file\n");
                             goto end;
                         }
                     }
-                } else {    /* decryption */
+                } else { /* decryption */
                     if (hsalt == NULL) {
                         if (BIO_read(rbio, mbuf, sizeof(mbuf)) != sizeof(mbuf)) {
                             BIO_printf(bio_err, "error reading input file\n");
@@ -558,7 +585,8 @@ int enc_main(int argc, char **argv)
                         }
                         if (memcmp(mbuf, magic, sizeof(mbuf)) == 0) { /* file IS salted */
                             if (BIO_read(rbio, salt,
-                                         saltlen) != saltlen) {
+                                    saltlen)
+                                != saltlen) {
                                 BIO_printf(bio_err, "error reading input file\n");
                                 goto end;
                             }
@@ -573,9 +601,9 @@ int enc_main(int argc, char **argv)
 
             if (pbkdf2 == 1) {
                 /*
-                * derive key and default iv
-                * concatenated into a temporary buffer
-                */
+                 * derive key and default iv
+                 * concatenated into a temporary buffer
+                 */
                 unsigned char tmpkeyiv[EVP_MAX_KEY_LENGTH + EVP_MAX_IV_LENGTH];
                 int iklen = EVP_CIPHER_get_key_length(cipher);
                 int ivlen = EVP_CIPHER_get_iv_length(cipher);
@@ -583,21 +611,21 @@ int enc_main(int argc, char **argv)
                 int islen = (sptr != NULL ? saltlen : 0);
 
                 if (!PKCS5_PBKDF2_HMAC(str, str_len, sptr, islen,
-                                       iter, dgst, iklen+ivlen, tmpkeyiv)) {
+                        iter, dgst, iklen + ivlen, tmpkeyiv)) {
                     BIO_printf(bio_err, "PKCS5_PBKDF2_HMAC failed\n");
                     goto end;
                 }
                 /* split and move data back to global buffer */
                 memcpy(key, tmpkeyiv, iklen);
-                memcpy(iv, tmpkeyiv+iklen, ivlen);
+                memcpy(iv, tmpkeyiv + iklen, ivlen);
                 rawkey_set = 1;
             } else {
                 BIO_printf(bio_err, "*** WARNING : "
                                     "deprecated key derivation used.\n"
                                     "Using -iter or -pbkdf2 would be better.\n");
                 if (!EVP_BytesToKey(cipher, dgst, sptr,
-                                    (unsigned char *)str, str_len,
-                                    1, key, iv)) {
+                        (unsigned char *)str, str_len,
+                        1, key, iv)) {
                     BIO_printf(bio_err, "EVP_BytesToKey failed\n");
                     goto end;
                 }
@@ -666,9 +694,9 @@ int enc_main(int argc, char **argv)
 
         if (rawkey_set) {
             if (!EVP_CipherInit_ex(ctx, cipher, e, key,
-                                   (hiv == NULL && wrap == 1 ? NULL : iv), enc)) {
+                    (hiv == NULL && wrap == 1 ? NULL : iv), enc)) {
                 BIO_printf(bio_err, "Error setting cipher %s\n",
-                           EVP_CIPHER_get0_name(cipher));
+                    EVP_CIPHER_get0_name(cipher));
                 ERR_print_errors(bio_err);
                 goto end;
             }
@@ -676,31 +704,31 @@ int enc_main(int argc, char **argv)
             OSSL_PARAM *params = NULL;
 
             mgmt = EVP_SKEYMGMT_fetch(app_get0_libctx(),
-                                      skeymgmt != NULL ? skeymgmt : EVP_CIPHER_name(cipher),
-                                      app_get0_propq());
+                skeymgmt != NULL ? skeymgmt : EVP_CIPHER_name(cipher),
+                app_get0_propq());
             if (mgmt == NULL)
                 goto end;
 
             params = app_params_new_from_opts(skeyopts,
-                                              EVP_SKEYMGMT_get0_imp_settable_params(mgmt));
+                EVP_SKEYMGMT_get0_imp_settable_params(mgmt));
             if (params == NULL)
                 goto end;
 
             skey = EVP_SKEY_import(app_get0_libctx(), EVP_SKEYMGMT_get0_name(mgmt),
-                                   app_get0_propq(), OSSL_SKEYMGMT_SELECT_ALL, params);
+                app_get0_propq(), OSSL_SKEYMGMT_SELECT_ALL, params);
             OSSL_PARAM_free(params);
             if (skey == NULL) {
                 BIO_printf(bio_err, "Error creating opaque key object for skeymgmt %s\n",
-                           skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher));
+                    skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher));
                 ERR_print_errors(bio_err);
                 goto end;
             }
 
             if (!EVP_CipherInit_SKEY(ctx, cipher, skey,
-                                     (hiv == NULL && wrap == 1 ? NULL : iv),
-                                     EVP_CIPHER_get_iv_length(cipher), enc, NULL)) {
+                    (hiv == NULL && wrap == 1 ? NULL : iv),
+                    EVP_CIPHER_get_iv_length(cipher), enc, NULL)) {
                 BIO_printf(bio_err, "Error setting an opaque key for cipher %s\n",
-                           EVP_CIPHER_get0_name(cipher));
+                    EVP_CIPHER_get0_name(cipher));
                 ERR_print_errors(bio_err);
                 goto end;
             }
@@ -748,7 +776,7 @@ int enc_main(int argc, char **argv)
         inl = BIO_read(rbio, (char *)buff, bsize);
         if (inl <= 0)
             break;
-        if (!streamable && !BIO_eof(rbio)) {    /* do not output data */
+        if (!streamable && !BIO_eof(rbio)) { /* do not output data */
             BIO_printf(bio_err, "Unstreamable cipher mode\n");
             goto end;
         }
@@ -772,7 +800,7 @@ int enc_main(int argc, char **argv)
         BIO_printf(bio_err, "bytes read   : %8ju\n", BIO_number_read(in));
         BIO_printf(bio_err, "bytes written: %8ju\n", BIO_number_written(out));
     }
- end:
+end:
     ERR_print_errors(bio_err);
     sk_OPENSSL_STRING_free(skeyopts);
     EVP_SKEYMGMT_free(mgmt);
@@ -806,8 +834,8 @@ static void show_ciphers(const OBJ_NAME *name, void *arg)
     /* Filter out ciphers that we cannot use */
     cipher = EVP_get_cipherbyname(name->name);
     if (cipher == NULL
-            || (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0
-            || EVP_CIPHER_get_mode(cipher) == EVP_CIPH_XTS_MODE)
+        || (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0
+        || EVP_CIPHER_get_mode(cipher) == EVP_CIPH_XTS_MODE)
         return;
 
     BIO_printf(dec->bio, "-%-25s", name->name);
diff --git a/apps/engine.c b/apps/engine.c
index edd7875148821..1b8eac4dc8b6a 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -24,32 +24,39 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_C, OPT_T, OPT_TT, OPT_PRE, OPT_POST,
-    OPT_V = 100, OPT_VV, OPT_VVV, OPT_VVVV
+    OPT_C,
+    OPT_T,
+    OPT_TT,
+    OPT_PRE,
+    OPT_POST,
+    OPT_V = 100,
+    OPT_VV,
+    OPT_VVV,
+    OPT_VVVV
 } OPTION_CHOICE;
 
 const OPTIONS engine_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] engine...\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] engine...\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"t", OPT_T, '-', "Check that specified engine is available"},
-    {"pre", OPT_PRE, 's', "Run command against the ENGINE before loading it"},
-    {"post", OPT_POST, 's', "Run command against the ENGINE after loading it"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "t", OPT_T, '-', "Check that specified engine is available" },
+    { "pre", OPT_PRE, 's', "Run command against the ENGINE before loading it" },
+    { "post", OPT_POST, 's', "Run command against the ENGINE after loading it" },
 
     OPT_SECTION("Output"),
-    {"v", OPT_V, '-', "List 'control commands' For each specified engine"},
-    {"vv", OPT_VV, '-', "Also display each command's description"},
-    {"vvv", OPT_VVV, '-', "Also add the input flags for each command"},
-    {"vvvv", OPT_VVVV, '-', "Also show internal input flags"},
-    {"c", OPT_C, '-', "List the capabilities of specified engine"},
-    {"tt", OPT_TT, '-', "Display error trace for unavailable engines"},
-    {OPT_MORE_STR, OPT_EOF, 1,
-     "Commands are like \"SO_PATH:/lib/libdriver.so\""},
+    { "v", OPT_V, '-', "List 'control commands' For each specified engine" },
+    { "vv", OPT_VV, '-', "Also display each command's description" },
+    { "vvv", OPT_VVV, '-', "Also add the input flags for each command" },
+    { "vvvv", OPT_VVVV, '-', "Also show internal input flags" },
+    { "c", OPT_C, '-', "List the capabilities of specified engine" },
+    { "tt", OPT_TT, '-', "Display error trace for unavailable engines" },
+    { OPT_MORE_STR, OPT_EOF, 1,
+        "Commands are like \"SO_PATH:/lib/libdriver.so\"" },
 
     OPT_PARAMETERS(),
-    {"engine", 0, 0, "ID of engine(s) to load"},
-    {NULL}
+    { "engine", 0, 0, "ID of engine(s) to load" },
+    { NULL }
 };
 
 static int append_buf(char **buf, int *size, const char *s)
@@ -133,9 +140,7 @@ static int util_flags(BIO *out, unsigned int flags, const char *indent)
         started = 1;
     }
     /* Check for unknown flags */
-    flags = flags & ~ENGINE_CMD_FLAG_NUMERIC &
-        ~ENGINE_CMD_FLAG_STRING &
-        ~ENGINE_CMD_FLAG_NO_INPUT & ~ENGINE_CMD_FLAG_INTERNAL;
+    flags = flags & ~ENGINE_CMD_FLAG_NUMERIC & ~ENGINE_CMD_FLAG_STRING & ~ENGINE_CMD_FLAG_NO_INPUT & ~ENGINE_CMD_FLAG_INTERNAL;
     if (flags) {
         if (started)
             BIO_printf(out, "|");
@@ -157,9 +162,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *out, const char *indent)
     int flags;
     int xpos = 0;
     STACK_OF(OPENSSL_STRING) *cmds = NULL;
-    if (!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
-        ((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
-                            0, NULL, NULL)) <= 0)) {
+    if (!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) || ((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE, 0, NULL, NULL)) <= 0)) {
         return 1;
     }
 
@@ -171,25 +174,30 @@ static int util_verbose(ENGINE *e, int verbose, BIO *out, const char *indent)
         int len;
         /* Get the command input flags */
         if ((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num,
-                                 NULL, NULL)) < 0)
+                 NULL, NULL))
+            < 0)
             goto err;
         if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4) {
             /* Get the command name */
             if ((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num,
-                                   NULL, NULL)) <= 0)
+                     NULL, NULL))
+                <= 0)
                 goto err;
             name = app_malloc(len + 1, "name buffer");
             if (ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_FROM_CMD, num, name,
-                            NULL) <= 0)
+                    NULL)
+                <= 0)
                 goto err;
             /* Get the command description */
             if ((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_LEN_FROM_CMD, num,
-                                   NULL, NULL)) < 0)
+                     NULL, NULL))
+                < 0)
                 goto err;
             if (len > 0) {
                 desc = app_malloc(len + 1, "description buffer");
                 if (ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
-                                NULL) <= 0)
+                        NULL)
+                    <= 0)
                     goto err;
             }
             /* Now decide on the output */
@@ -203,8 +211,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *out, const char *indent)
                 /*
                  * We're just listing names, comma-delimited
                  */
-                if ((xpos > (int)strlen(indent)) &&
-                    (xpos + (int)strlen(name) > line_wrap)) {
+                if ((xpos > (int)strlen(indent)) && (xpos + (int)strlen(name) > line_wrap)) {
                     BIO_printf(out, "\n");
                     xpos = BIO_puts(out, indent);
                 }
@@ -212,7 +219,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *out, const char *indent)
             } else {
                 /* We're listing names plus descriptions */
                 BIO_printf(out, "%s: %s\n", name,
-                           (desc == NULL) ? "<no description>" : desc);
+                    (desc == NULL) ? "<no description>" : desc);
                 /* ... and sometimes input flags */
                 if ((verbose >= 3) && !util_flags(out, flags, indent))
                     goto err;
@@ -229,7 +236,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *out, const char *indent)
     if (xpos > 0)
         BIO_printf(out, "\n");
     ret = 1;
- err:
+err:
     sk_OPENSSL_STRING_free(cmds);
     OPENSSL_free(name);
     OPENSSL_free(desc);
@@ -237,7 +244,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *out, const char *indent)
 }
 
 static void util_do_cmds(ENGINE *e, STACK_OF(OPENSSL_STRING) *cmds,
-                         BIO *out, const char *indent)
+    BIO *out, const char *indent)
 {
     int loop, res, num = sk_OPENSSL_STRING_num(cmds);
 
@@ -249,7 +256,7 @@ static void util_do_cmds(ENGINE *e, STACK_OF(OPENSSL_STRING) *cmds,
         char buf[256];
         const char *cmd, *arg;
         cmd = sk_OPENSSL_STRING_value(cmds, loop);
-        res = 1;                /* assume success */
+        res = 1; /* assume success */
         /* Check if this command has no ":arg" */
         if ((arg = strchr(cmd, ':')) == NULL) {
             if (!ENGINE_ctrl_cmd_string(e, cmd, NULL, 0))
@@ -261,7 +268,7 @@ static void util_do_cmds(ENGINE *e, STACK_OF(OPENSSL_STRING) *cmds,
             }
             memcpy(buf, cmd, (int)(arg - cmd));
             buf[arg - cmd] = '\0';
-            arg++;              /* Move past the ":" */
+            arg++; /* Move past the ":" */
             /* Call the command with the argument */
             if (!ENGINE_ctrl_cmd_string(e, buf, arg, 0))
                 res = 0;
@@ -288,7 +295,7 @@ static void util_store_cap(const OSSL_STORE_LOADER *loader, void *arg)
     if (OSSL_STORE_LOADER_get0_engine(loader) == ctx->engine) {
         char buf[256];
         BIO_snprintf(buf, sizeof(buf), "STORE(%s)",
-                     OSSL_STORE_LOADER_get0_scheme(loader));
+            OSSL_STORE_LOADER_get0_scheme(loader));
         if (!append_buf(ctx->cap_buf, ctx->cap_size, buf))
             ctx->ok = 0;
     }
@@ -366,10 +373,10 @@ int engine_main(int argc, char **argv)
     /* Any remaining arguments are engine names. */
     argc = opt_num_rest();
     argv = opt_rest();
-    for ( ; *argv; argv++) {
+    for (; *argv; argv++) {
         if (**argv == '-') {
             BIO_printf(bio_err, "%s: Cannot mix flags and engine names.\n",
-                       prog);
+                prog);
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         }
@@ -396,7 +403,7 @@ int engine_main(int argc, char **argv)
             util_do_cmds(e, pre_cmds, out, indent);
             if (strcmp(ENGINE_get_id(e), id) != 0) {
                 BIO_printf(out, "Loaded: (%s) %s\n",
-                           ENGINE_get_id(e), ENGINE_get_name(e));
+                    ENGINE_get_id(e), ENGINE_get_name(e));
             }
             if (list_cap) {
                 int cap_size = 256;
@@ -431,7 +438,7 @@ int engine_main(int argc, char **argv)
                     if (!append_buf(&cap_buf, &cap_size, OBJ_nid2sn(nids[k])))
                         goto end;
 
- skip_ciphers:
+            skip_ciphers:
                 fn_d = ENGINE_get_digests(e);
                 if (fn_d == NULL)
                     goto skip_digests;
@@ -440,7 +447,7 @@ int engine_main(int argc, char **argv)
                     if (!append_buf(&cap_buf, &cap_size, OBJ_nid2sn(nids[k])))
                         goto end;
 
- skip_digests:
+            skip_digests:
                 fn_pk = ENGINE_get_pkey_meths(e);
                 if (fn_pk == NULL)
                     goto skip_pmeths;
@@ -448,19 +455,18 @@ int engine_main(int argc, char **argv)
                 for (k = 0; k < n; ++k)
                     if (!append_buf(&cap_buf, &cap_size, OBJ_nid2sn(nids[k])))
                         goto end;
- skip_pmeths:
-                {
-                    struct util_store_cap_data store_ctx;
+            skip_pmeths: {
+                struct util_store_cap_data store_ctx;
 
-                    store_ctx.engine = e;
-                    store_ctx.cap_buf = &cap_buf;
-                    store_ctx.cap_size = &cap_size;
-                    store_ctx.ok = 1;
+                store_ctx.engine = e;
+                store_ctx.cap_buf = &cap_buf;
+                store_ctx.cap_size = &cap_size;
+                store_ctx.ok = 1;
 
-                    OSSL_STORE_do_all_loaders(util_store_cap, &store_ctx);
-                    if (!store_ctx.ok)
-                        goto end;
-                }
+                OSSL_STORE_do_all_loaders(util_store_cap, &store_ctx);
+                if (!store_ctx.ok)
+                    goto end;
+            }
                 if (cap_buf != NULL && (*cap_buf != '\0'))
                     BIO_printf(out, " [%s]\n", cap_buf);
 
@@ -490,7 +496,7 @@ int engine_main(int argc, char **argv)
         }
     }
 
- end:
+end:
 
     ERR_print_errors(bio_err);
     sk_OPENSSL_CSTRING_free(engines);
diff --git a/apps/errstr.c b/apps/errstr.c
index 21349d21cb420..d4146da49b9b0 100644
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -17,18 +17,20 @@
 #include <openssl/ssl.h>
 
 typedef enum OPTION_choice {
-    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP
+    OPT_ERR = -1,
+    OPT_EOF = 0,
+    OPT_HELP
 } OPTION_CHOICE;
 
 const OPTIONS errstr_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] errnum...\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] errnum...\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 
     OPT_PARAMETERS(),
-    {"errnum", 0, 0, "Error number(s) to decode"},
-    {NULL}
+    { "errnum", 0, 0, "Error number(s) to decode" },
+    { NULL }
 };
 
 int errstr_main(int argc, char **argv)
@@ -57,7 +59,8 @@ int errstr_main(int argc, char **argv)
      * we're still interested in SSL error strings
      */
     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS
-                    | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
+            | OPENSSL_INIT_LOAD_CRYPTO_STRINGS,
+        NULL);
 
     /* All remaining arg are error code. */
     ret = 0;
@@ -69,6 +72,6 @@ int errstr_main(int argc, char **argv)
             BIO_printf(bio_out, "%s\n", buf);
         }
     }
- end:
+end:
     return ret;
 }
diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c
index 0daa55a1b8aef..dcc09a5ed7f75 100644
--- a/apps/fipsinstall.c
+++ b/apps/fipsinstall.c
@@ -21,8 +21,8 @@
 #define BUFSIZE 4096
 
 /* Configuration file values */
-#define VERSION_KEY  "version"
-#define VERSION_VAL  "1"
+#define VERSION_KEY "version"
+#define VERSION_VAL "1"
 #define INSTALL_STATUS_VAL "INSTALL_SELF_TEST_KATS_RUN"
 
 static OSSL_CALLBACK self_test_events;
@@ -33,15 +33,29 @@ static int quiet = 0;
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_IN, OPT_OUT, OPT_MODULE, OPT_PEDANTIC,
-    OPT_PROV_NAME, OPT_SECTION_NAME, OPT_MAC_NAME, OPT_MACOPT, OPT_VERIFY,
-    OPT_NO_LOG, OPT_CORRUPT_DESC, OPT_CORRUPT_TYPE, OPT_QUIET, OPT_CONFIG,
+    OPT_IN,
+    OPT_OUT,
+    OPT_MODULE,
+    OPT_PEDANTIC,
+    OPT_PROV_NAME,
+    OPT_SECTION_NAME,
+    OPT_MAC_NAME,
+    OPT_MACOPT,
+    OPT_VERIFY,
+    OPT_NO_LOG,
+    OPT_CORRUPT_DESC,
+    OPT_CORRUPT_TYPE,
+    OPT_QUIET,
+    OPT_CONFIG,
     OPT_NO_CONDITIONAL_ERRORS,
     OPT_NO_SECURITY_CHECKS,
-    OPT_TLS_PRF_EMS_CHECK, OPT_NO_SHORT_MAC,
-    OPT_DISALLOW_PKCS15_PADDING, OPT_RSA_PSS_SALTLEN_CHECK,
+    OPT_TLS_PRF_EMS_CHECK,
+    OPT_NO_SHORT_MAC,
+    OPT_DISALLOW_PKCS15_PADDING,
+    OPT_RSA_PSS_SALTLEN_CHECK,
     OPT_DISALLOW_SIGNATURE_X931_PADDING,
-    OPT_HMAC_KEY_CHECK, OPT_KMAC_KEY_CHECK,
+    OPT_HMAC_KEY_CHECK,
+    OPT_KMAC_KEY_CHECK,
     OPT_DISALLOW_DRGB_TRUNC_DIGEST,
     OPT_SIGNATURE_DIGEST_CHECK,
     OPT_HKDF_DIGEST_CHECK,
@@ -62,93 +76,94 @@ typedef enum OPTION_choice {
     OPT_X942KDF_KEY_CHECK,
     OPT_NO_PBKDF2_LOWER_BOUND_CHECK,
     OPT_ECDH_COFACTOR_CHECK,
-    OPT_SELF_TEST_ONLOAD, OPT_SELF_TEST_ONINSTALL
+    OPT_SELF_TEST_ONLOAD,
+    OPT_SELF_TEST_ONINSTALL
 } OPTION_CHOICE;
 
 const OPTIONS fipsinstall_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"pedantic", OPT_PEDANTIC, '-', "Set options for strict FIPS compliance"},
-    {"verify", OPT_VERIFY, '-',
-     "Verify a config file instead of generating one"},
-    {"module", OPT_MODULE, '<', "File name of the provider module"},
-    {"provider_name", OPT_PROV_NAME, 's', "FIPS provider name"},
-    {"section_name", OPT_SECTION_NAME, 's',
-     "FIPS Provider config section name (optional)"},
-    {"no_conditional_errors", OPT_NO_CONDITIONAL_ERRORS, '-',
-     "Disable the ability of the fips module to enter an error state if"
-     " any conditional self tests fail"},
-    {"no_security_checks", OPT_NO_SECURITY_CHECKS, '-',
-     "Disable the run-time FIPS security checks in the module"},
-    {"self_test_onload", OPT_SELF_TEST_ONLOAD, '-',
-     "Forces self tests to always run on module load"},
-    {"self_test_oninstall", OPT_SELF_TEST_ONINSTALL, '-',
-     "Forces self tests to run once on module installation"},
-    {"ems_check", OPT_TLS_PRF_EMS_CHECK, '-',
-     "Enable the run-time FIPS check for EMS during TLS1_PRF"},
-    {"no_short_mac", OPT_NO_SHORT_MAC, '-', "Disallow short MAC output"},
-    {"no_drbg_truncated_digests", OPT_DISALLOW_DRGB_TRUNC_DIGEST, '-',
-     "Disallow truncated digests with Hash and HMAC DRBGs"},
-    {"signature_digest_check", OPT_SIGNATURE_DIGEST_CHECK, '-',
-     "Enable checking for approved digests for signatures"},
-    {"hmac_key_check", OPT_HMAC_KEY_CHECK, '-', "Enable key check for HMAC"},
-    {"kmac_key_check", OPT_KMAC_KEY_CHECK, '-', "Enable key check for KMAC"},
-    {"hkdf_digest_check", OPT_HKDF_DIGEST_CHECK, '-',
-     "Enable digest check for HKDF"},
-    {"tls13_kdf_digest_check", OPT_TLS13_KDF_DIGEST_CHECK, '-',
-     "Enable digest check for TLS13-KDF"},
-    {"tls1_prf_digest_check", OPT_TLS1_PRF_DIGEST_CHECK, '-',
-     "Enable digest check for TLS1-PRF"},
-    {"sshkdf_digest_check", OPT_SSHKDF_DIGEST_CHECK, '-',
-     "Enable digest check for SSHKDF"},
-    {"sskdf_digest_check", OPT_SSKDF_DIGEST_CHECK, '-',
-     "Enable digest check for SSKDF"},
-    {"x963kdf_digest_check", OPT_X963KDF_DIGEST_CHECK, '-',
-     "Enable digest check for X963KDF"},
-    {"dsa_sign_disabled", OPT_DISALLOW_DSA_SIGN, '-',
-     "Disallow DSA signing"},
-    {"tdes_encrypt_disabled", OPT_DISALLOW_TDES_ENCRYPT, '-',
-     "Disallow Triple-DES encryption"},
-    {"rsa_pkcs15_padding_disabled", OPT_DISALLOW_PKCS15_PADDING, '-',
-     "Disallow PKCS#1 version 1.5 padding for RSA encryption"},
-    {"rsa_pss_saltlen_check", OPT_RSA_PSS_SALTLEN_CHECK, '-',
-     "Enable salt length check for RSA-PSS signature operations"},
-    {"rsa_sign_x931_disabled", OPT_DISALLOW_SIGNATURE_X931_PADDING, '-',
-     "Disallow X931 Padding for RSA signing"},
-    {"hkdf_key_check", OPT_HKDF_KEY_CHECK, '-',
-     "Enable key check for HKDF"},
-    {"kbkdf_key_check", OPT_KBKDF_KEY_CHECK, '-',
-     "Enable key check for KBKDF"},
-    {"tls13_kdf_key_check", OPT_TLS13_KDF_KEY_CHECK, '-',
-     "Enable key check for TLS13-KDF"},
-    {"tls1_prf_key_check", OPT_TLS1_PRF_KEY_CHECK, '-',
-     "Enable key check for TLS1-PRF"},
-    {"sshkdf_key_check", OPT_SSHKDF_KEY_CHECK, '-',
-     "Enable key check for SSHKDF"},
-    {"sskdf_key_check", OPT_SSKDF_KEY_CHECK, '-',
-     "Enable key check for SSKDF"},
-    {"x963kdf_key_check", OPT_X963KDF_KEY_CHECK, '-',
-     "Enable key check for X963KDF"},
-    {"x942kdf_key_check", OPT_X942KDF_KEY_CHECK, '-',
-     "Enable key check for X942KDF"},
-    {"no_pbkdf2_lower_bound_check", OPT_NO_PBKDF2_LOWER_BOUND_CHECK, '-',
-     "Disable lower bound check for PBKDF2"},
-    {"ecdh_cofactor_check", OPT_ECDH_COFACTOR_CHECK, '-',
-     "Enable Cofactor check for ECDH"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "pedantic", OPT_PEDANTIC, '-', "Set options for strict FIPS compliance" },
+    { "verify", OPT_VERIFY, '-',
+        "Verify a config file instead of generating one" },
+    { "module", OPT_MODULE, '<', "File name of the provider module" },
+    { "provider_name", OPT_PROV_NAME, 's', "FIPS provider name" },
+    { "section_name", OPT_SECTION_NAME, 's',
+        "FIPS Provider config section name (optional)" },
+    { "no_conditional_errors", OPT_NO_CONDITIONAL_ERRORS, '-',
+        "Disable the ability of the fips module to enter an error state if"
+        " any conditional self tests fail" },
+    { "no_security_checks", OPT_NO_SECURITY_CHECKS, '-',
+        "Disable the run-time FIPS security checks in the module" },
+    { "self_test_onload", OPT_SELF_TEST_ONLOAD, '-',
+        "Forces self tests to always run on module load" },
+    { "self_test_oninstall", OPT_SELF_TEST_ONINSTALL, '-',
+        "Forces self tests to run once on module installation" },
+    { "ems_check", OPT_TLS_PRF_EMS_CHECK, '-',
+        "Enable the run-time FIPS check for EMS during TLS1_PRF" },
+    { "no_short_mac", OPT_NO_SHORT_MAC, '-', "Disallow short MAC output" },
+    { "no_drbg_truncated_digests", OPT_DISALLOW_DRGB_TRUNC_DIGEST, '-',
+        "Disallow truncated digests with Hash and HMAC DRBGs" },
+    { "signature_digest_check", OPT_SIGNATURE_DIGEST_CHECK, '-',
+        "Enable checking for approved digests for signatures" },
+    { "hmac_key_check", OPT_HMAC_KEY_CHECK, '-', "Enable key check for HMAC" },
+    { "kmac_key_check", OPT_KMAC_KEY_CHECK, '-', "Enable key check for KMAC" },
+    { "hkdf_digest_check", OPT_HKDF_DIGEST_CHECK, '-',
+        "Enable digest check for HKDF" },
+    { "tls13_kdf_digest_check", OPT_TLS13_KDF_DIGEST_CHECK, '-',
+        "Enable digest check for TLS13-KDF" },
+    { "tls1_prf_digest_check", OPT_TLS1_PRF_DIGEST_CHECK, '-',
+        "Enable digest check for TLS1-PRF" },
+    { "sshkdf_digest_check", OPT_SSHKDF_DIGEST_CHECK, '-',
+        "Enable digest check for SSHKDF" },
+    { "sskdf_digest_check", OPT_SSKDF_DIGEST_CHECK, '-',
+        "Enable digest check for SSKDF" },
+    { "x963kdf_digest_check", OPT_X963KDF_DIGEST_CHECK, '-',
+        "Enable digest check for X963KDF" },
+    { "dsa_sign_disabled", OPT_DISALLOW_DSA_SIGN, '-',
+        "Disallow DSA signing" },
+    { "tdes_encrypt_disabled", OPT_DISALLOW_TDES_ENCRYPT, '-',
+        "Disallow Triple-DES encryption" },
+    { "rsa_pkcs15_padding_disabled", OPT_DISALLOW_PKCS15_PADDING, '-',
+        "Disallow PKCS#1 version 1.5 padding for RSA encryption" },
+    { "rsa_pss_saltlen_check", OPT_RSA_PSS_SALTLEN_CHECK, '-',
+        "Enable salt length check for RSA-PSS signature operations" },
+    { "rsa_sign_x931_disabled", OPT_DISALLOW_SIGNATURE_X931_PADDING, '-',
+        "Disallow X931 Padding for RSA signing" },
+    { "hkdf_key_check", OPT_HKDF_KEY_CHECK, '-',
+        "Enable key check for HKDF" },
+    { "kbkdf_key_check", OPT_KBKDF_KEY_CHECK, '-',
+        "Enable key check for KBKDF" },
+    { "tls13_kdf_key_check", OPT_TLS13_KDF_KEY_CHECK, '-',
+        "Enable key check for TLS13-KDF" },
+    { "tls1_prf_key_check", OPT_TLS1_PRF_KEY_CHECK, '-',
+        "Enable key check for TLS1-PRF" },
+    { "sshkdf_key_check", OPT_SSHKDF_KEY_CHECK, '-',
+        "Enable key check for SSHKDF" },
+    { "sskdf_key_check", OPT_SSKDF_KEY_CHECK, '-',
+        "Enable key check for SSKDF" },
+    { "x963kdf_key_check", OPT_X963KDF_KEY_CHECK, '-',
+        "Enable key check for X963KDF" },
+    { "x942kdf_key_check", OPT_X942KDF_KEY_CHECK, '-',
+        "Enable key check for X942KDF" },
+    { "no_pbkdf2_lower_bound_check", OPT_NO_PBKDF2_LOWER_BOUND_CHECK, '-',
+        "Disable lower bound check for PBKDF2" },
+    { "ecdh_cofactor_check", OPT_ECDH_COFACTOR_CHECK, '-',
+        "Enable Cofactor check for ECDH" },
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input config file, used when verifying"},
+    { "in", OPT_IN, '<', "Input config file, used when verifying" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output config file, used when generating"},
-    {"mac_name", OPT_MAC_NAME, 's', "MAC name"},
-    {"macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form."},
-    {OPT_MORE_STR, 0, 0, "See 'PARAMETER NAMES' in the EVP_MAC_ docs"},
-    {"noout", OPT_NO_LOG, '-', "Disable logging of self test events"},
-    {"corrupt_desc", OPT_CORRUPT_DESC, 's', "Corrupt a self test by description"},
-    {"corrupt_type", OPT_CORRUPT_TYPE, 's', "Corrupt a self test by type"},
-    {"config", OPT_CONFIG, '<', "The parent config to verify"},
-    {"quiet", OPT_QUIET, '-', "No messages, just exit status"},
-    {NULL}
+    { "out", OPT_OUT, '>', "Output config file, used when generating" },
+    { "mac_name", OPT_MAC_NAME, 's', "MAC name" },
+    { "macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form." },
+    { OPT_MORE_STR, 0, 0, "See 'PARAMETER NAMES' in the EVP_MAC_ docs" },
+    { "noout", OPT_NO_LOG, '-', "Disable logging of self test events" },
+    { "corrupt_desc", OPT_CORRUPT_DESC, 's', "Corrupt a self test by description" },
+    { "corrupt_type", OPT_CORRUPT_TYPE, 's', "Corrupt a self test by type" },
+    { "config", OPT_CONFIG, '<', "The parent config to verify" },
+    { "quiet", OPT_QUIET, '-', "No messages, just exit status" },
+    { NULL }
 };
 
 typedef struct {
@@ -186,70 +201,70 @@ typedef struct {
 
 /* Pedantic FIPS compliance */
 static const FIPS_OPTS pedantic_opts = {
-    1,      /* self_test_onload */
-    1,      /* conditional_errors */
-    1,      /* security_checks */
-    1,      /* hmac_key_check */
-    1,      /* kmac_key_check */
-    1,      /* tls_prf_ems_check */
-    1,      /* no_short_mac */
-    1,      /* drgb_no_trunc_dgst */
-    1,      /* signature_digest_check */
-    1,      /* hkdf_digest_check */
-    1,      /* tls13_kdf_digest_check */
-    1,      /* tls1_prf_digest_check */
-    1,      /* sshkdf_digest_check */
-    1,      /* sskdf_digest_check */
-    1,      /* x963kdf_digest_check */
-    1,      /* dsa_sign_disabled */
-    1,      /* tdes_encrypt_disabled */
-    1,      /* rsa_pkcs15_padding_disabled */
-    1,      /* rsa_pss_saltlen_check */
-    1,      /* sign_x931_padding_disabled */
-    1,      /* hkdf_key_check */
-    1,      /* kbkdf_key_check */
-    1,      /* tls13_kdf_key_check */
-    1,      /* tls1_prf_key_check */
-    1,      /* sshkdf_key_check */
-    1,      /* sskdf_key_check */
-    1,      /* x963kdf_key_check */
-    1,      /* x942kdf_key_check */
-    1,      /* pbkdf2_lower_bound_check */
-    1,      /* ecdh_cofactor_check */
+    1, /* self_test_onload */
+    1, /* conditional_errors */
+    1, /* security_checks */
+    1, /* hmac_key_check */
+    1, /* kmac_key_check */
+    1, /* tls_prf_ems_check */
+    1, /* no_short_mac */
+    1, /* drgb_no_trunc_dgst */
+    1, /* signature_digest_check */
+    1, /* hkdf_digest_check */
+    1, /* tls13_kdf_digest_check */
+    1, /* tls1_prf_digest_check */
+    1, /* sshkdf_digest_check */
+    1, /* sskdf_digest_check */
+    1, /* x963kdf_digest_check */
+    1, /* dsa_sign_disabled */
+    1, /* tdes_encrypt_disabled */
+    1, /* rsa_pkcs15_padding_disabled */
+    1, /* rsa_pss_saltlen_check */
+    1, /* sign_x931_padding_disabled */
+    1, /* hkdf_key_check */
+    1, /* kbkdf_key_check */
+    1, /* tls13_kdf_key_check */
+    1, /* tls1_prf_key_check */
+    1, /* sshkdf_key_check */
+    1, /* sskdf_key_check */
+    1, /* x963kdf_key_check */
+    1, /* x942kdf_key_check */
+    1, /* pbkdf2_lower_bound_check */
+    1, /* ecdh_cofactor_check */
 };
 
 /* Default FIPS settings for backward compatibility */
 static FIPS_OPTS fips_opts = {
-    1,      /* self_test_onload */
-    1,      /* conditional_errors */
-    1,      /* security_checks */
-    0,      /* hmac_key_check */
-    0,      /* kmac_key_check */
-    0,      /* tls_prf_ems_check */
-    0,      /* no_short_mac */
-    0,      /* drgb_no_trunc_dgst */
-    0,      /* signature_digest_check */
-    0,      /* hkdf_digest_check */
-    0,      /* tls13_kdf_digest_check */
-    0,      /* tls1_prf_digest_check */
-    0,      /* sshkdf_digest_check */
-    0,      /* sskdf_digest_check */
-    0,      /* x963kdf_digest_check */
-    0,      /* dsa_sign_disabled */
-    0,      /* tdes_encrypt_disabled */
-    0,      /* rsa_pkcs15_padding_disabled */
-    0,      /* rsa_pss_saltlen_check */
-    0,      /* sign_x931_padding_disabled */
-    0,      /* hkdf_key_check */
-    0,      /* kbkdf_key_check */
-    0,      /* tls13_kdf_key_check */
-    0,      /* tls1_prf_key_check */
-    0,      /* sshkdf_key_check */
-    0,      /* sskdf_key_check */
-    0,      /* x963kdf_key_check */
-    0,      /* x942kdf_key_check */
-    1,      /* pbkdf2_lower_bound_check */
-    0,      /* ecdh_cofactor_check */
+    1, /* self_test_onload */
+    1, /* conditional_errors */
+    1, /* security_checks */
+    0, /* hmac_key_check */
+    0, /* kmac_key_check */
+    0, /* tls_prf_ems_check */
+    0, /* no_short_mac */
+    0, /* drgb_no_trunc_dgst */
+    0, /* signature_digest_check */
+    0, /* hkdf_digest_check */
+    0, /* tls13_kdf_digest_check */
+    0, /* tls1_prf_digest_check */
+    0, /* sshkdf_digest_check */
+    0, /* sskdf_digest_check */
+    0, /* x963kdf_digest_check */
+    0, /* dsa_sign_disabled */
+    0, /* tdes_encrypt_disabled */
+    0, /* rsa_pkcs15_padding_disabled */
+    0, /* rsa_pss_saltlen_check */
+    0, /* sign_x931_padding_disabled */
+    0, /* hkdf_key_check */
+    0, /* kbkdf_key_check */
+    0, /* tls13_kdf_key_check */
+    0, /* tls1_prf_key_check */
+    0, /* sshkdf_key_check */
+    0, /* sskdf_key_check */
+    0, /* x963kdf_key_check */
+    0, /* x942kdf_key_check */
+    1, /* pbkdf2_lower_bound_check */
+    0, /* ecdh_cofactor_check */
 };
 
 static int check_non_pedantic_fips(int pedantic, const char *name)
@@ -262,7 +277,7 @@ static int check_non_pedantic_fips(int pedantic, const char *name)
 }
 
 static int do_mac(EVP_MAC_CTX *ctx, unsigned char *tmp, BIO *in,
-                  unsigned char *out, size_t *out_len)
+    unsigned char *out, size_t *out_len)
 {
     int ret = 0;
     int i;
@@ -285,7 +300,7 @@ static int do_mac(EVP_MAC_CTX *ctx, unsigned char *tmp, BIO *in,
 }
 
 static int load_fips_prov_and_run_self_test(const char *prov_name,
-                                            int *is_fips_140_2_prov)
+    int *is_fips_140_2_prov)
 {
     int ret = 0;
     OSSL_PROVIDER *prov = NULL;
@@ -299,11 +314,11 @@ static int load_fips_prov_and_run_self_test(const char *prov_name,
     }
     if (!quiet) {
         *p++ = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_NAME,
-                                             &name, sizeof(name));
+            &name, sizeof(name));
         *p++ = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_VERSION,
-                                             &vers, sizeof(vers));
+            &vers, sizeof(vers));
         *p++ = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_BUILDINFO,
-                                             &build, sizeof(build));
+            &build, sizeof(build));
         *p = OSSL_PARAM_construct_end();
         if (!OSSL_PROVIDER_get_params(prov, params)) {
             BIO_printf(bio_err, "Failed to query FIPS module parameters\n");
@@ -317,7 +332,7 @@ static int load_fips_prov_and_run_self_test(const char *prov_name,
             BIO_printf(bio_err, "\t%-10s\t%s\n", "build:", build);
     } else {
         *p++ = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_VERSION,
-                                             &vers, sizeof(vers));
+            &vers, sizeof(vers));
         *p = OSSL_PARAM_construct_end();
         if (!OSSL_PROVIDER_get_params(prov, params)) {
             BIO_printf(bio_err, "Failed to query FIPS module parameters\n");
@@ -332,7 +347,7 @@ static int load_fips_prov_and_run_self_test(const char *prov_name,
 }
 
 static int print_mac(BIO *bio, const char *label, const unsigned char *mac,
-                     size_t len)
+    size_t len)
 {
     int ret;
     char *hexstr = NULL;
@@ -346,13 +361,13 @@ static int print_mac(BIO *bio, const char *label, const unsigned char *mac,
 }
 
 static int write_config_header(BIO *out, const char *prov_name,
-                               const char *section)
+    const char *section)
 {
     return BIO_printf(out, "openssl_conf = openssl_init\n\n")
-           && BIO_printf(out, "[openssl_init]\n")
-           && BIO_printf(out, "providers = provider_section\n\n")
-           && BIO_printf(out, "[provider_section]\n")
-           && BIO_printf(out, "%s = %s\n\n", prov_name, section);
+        && BIO_printf(out, "[openssl_init]\n")
+        && BIO_printf(out, "providers = provider_section\n\n")
+        && BIO_printf(out, "[provider_section]\n")
+        && BIO_printf(out, "%s = %s\n\n", prov_name, section);
 }
 
 /*
@@ -363,96 +378,127 @@ static int write_config_header(BIO *out, const char *prov_name,
  * Returns 1 if the config file is written otherwise it returns 0 on error.
  */
 static int write_config_fips_section(BIO *out, const char *section,
-                                     unsigned char *module_mac,
-                                     size_t module_mac_len,
-                                     const FIPS_OPTS *opts,
-                                     unsigned char *install_mac,
-                                     size_t install_mac_len)
+    unsigned char *module_mac,
+    size_t module_mac_len,
+    const FIPS_OPTS *opts,
+    unsigned char *install_mac,
+    size_t install_mac_len)
 {
     int ret = 0;
 
     if (BIO_printf(out, "[%s]\n", section) <= 0
         || BIO_printf(out, "activate = 1\n") <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_FIPS_PARAM_INSTALL_VERSION,
-                      VERSION_VAL) <= 0
+               VERSION_VAL)
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_FIPS_PARAM_CONDITIONAL_ERRORS,
-                      opts->conditional_errors ? "1" : "0") <= 0
+               opts->conditional_errors ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_SECURITY_CHECKS,
-                      opts->security_checks ? "1" : "0") <= 0
+               opts->security_checks ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_HMAC_KEY_CHECK,
-                      opts->hmac_key_check ? "1": "0") <= 0
+               opts->hmac_key_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_KMAC_KEY_CHECK,
-                      opts->kmac_key_check ? "1": "0") <= 0
+               opts->kmac_key_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_TLS1_PRF_EMS_CHECK,
-                      opts->tls_prf_ems_check ? "1" : "0") <= 0
+               opts->tls_prf_ems_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_NO_SHORT_MAC,
-                      opts->no_short_mac ? "1" : "0") <= 0
+               opts->no_short_mac ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_DRBG_TRUNC_DIGEST,
-                      opts->drgb_no_trunc_dgst ? "1" : "0") <= 0
+               opts->drgb_no_trunc_dgst ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_SIGNATURE_DIGEST_CHECK,
-                      opts->signature_digest_check ? "1" : "0") <= 0
+               opts->signature_digest_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_HKDF_DIGEST_CHECK,
-                      opts->hkdf_digest_check ? "1": "0") <= 0
+               opts->hkdf_digest_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n",
-                      OSSL_PROV_PARAM_TLS13_KDF_DIGEST_CHECK,
-                      opts->tls13_kdf_digest_check ? "1": "0") <= 0
+               OSSL_PROV_PARAM_TLS13_KDF_DIGEST_CHECK,
+               opts->tls13_kdf_digest_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n",
-                      OSSL_PROV_PARAM_TLS1_PRF_DIGEST_CHECK,
-                      opts->tls1_prf_digest_check ? "1": "0") <= 0
+               OSSL_PROV_PARAM_TLS1_PRF_DIGEST_CHECK,
+               opts->tls1_prf_digest_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n",
-                      OSSL_PROV_PARAM_SSHKDF_DIGEST_CHECK,
-                      opts->sshkdf_digest_check ? "1": "0") <= 0
+               OSSL_PROV_PARAM_SSHKDF_DIGEST_CHECK,
+               opts->sshkdf_digest_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_SSKDF_DIGEST_CHECK,
-                      opts->sskdf_digest_check ? "1": "0") <= 0
+               opts->sskdf_digest_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n",
-                      OSSL_PROV_PARAM_X963KDF_DIGEST_CHECK,
-                      opts->x963kdf_digest_check ? "1": "0") <= 0
+               OSSL_PROV_PARAM_X963KDF_DIGEST_CHECK,
+               opts->x963kdf_digest_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_DSA_SIGN_DISABLED,
-                      opts->dsa_sign_disabled ? "1" : "0") <= 0
+               opts->dsa_sign_disabled ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_TDES_ENCRYPT_DISABLED,
-                      opts->tdes_encrypt_disabled ? "1" : "0") <= 0
+               opts->tdes_encrypt_disabled ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n",
-                      OSSL_PROV_PARAM_RSA_PKCS15_PAD_DISABLED,
-                      opts->rsa_pkcs15_padding_disabled ? "1" : "0") <= 0
+               OSSL_PROV_PARAM_RSA_PKCS15_PAD_DISABLED,
+               opts->rsa_pkcs15_padding_disabled ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n",
-                      OSSL_PROV_PARAM_RSA_PSS_SALTLEN_CHECK,
-                      opts->rsa_pss_saltlen_check ? "1" : "0") <= 0
+               OSSL_PROV_PARAM_RSA_PSS_SALTLEN_CHECK,
+               opts->rsa_pss_saltlen_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n",
-                      OSSL_PROV_PARAM_RSA_SIGN_X931_PAD_DISABLED,
-                      opts->sign_x931_padding_disabled ? "1" : "0") <= 0
+               OSSL_PROV_PARAM_RSA_SIGN_X931_PAD_DISABLED,
+               opts->sign_x931_padding_disabled ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_HKDF_KEY_CHECK,
-                      opts->hkdf_key_check ? "1": "0") <= 0
+               opts->hkdf_key_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_KBKDF_KEY_CHECK,
-                      opts->kbkdf_key_check ? "1": "0") <= 0
+               opts->kbkdf_key_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n",
-                      OSSL_PROV_PARAM_TLS13_KDF_KEY_CHECK,
-                      opts->tls13_kdf_key_check ? "1": "0") <= 0
+               OSSL_PROV_PARAM_TLS13_KDF_KEY_CHECK,
+               opts->tls13_kdf_key_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_TLS1_PRF_KEY_CHECK,
-                      opts->tls1_prf_key_check ? "1": "0") <= 0
+               opts->tls1_prf_key_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_SSHKDF_KEY_CHECK,
-                      opts->sshkdf_key_check ? "1": "0") <= 0
+               opts->sshkdf_key_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_SSKDF_KEY_CHECK,
-                      opts->sskdf_key_check ? "1": "0") <= 0
+               opts->sskdf_key_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_X963KDF_KEY_CHECK,
-                      opts->x963kdf_key_check ? "1": "0") <= 0
+               opts->x963kdf_key_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_X942KDF_KEY_CHECK,
-                      opts->x942kdf_key_check ? "1": "0") <= 0
+               opts->x942kdf_key_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n",
-                      OSSL_PROV_PARAM_PBKDF2_LOWER_BOUND_CHECK,
-                      opts->pbkdf2_lower_bound_check ? "1" : "0") <= 0
+               OSSL_PROV_PARAM_PBKDF2_LOWER_BOUND_CHECK,
+               opts->pbkdf2_lower_bound_check ? "1" : "0")
+            <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_ECDH_COFACTOR_CHECK,
-                      opts->ecdh_cofactor_check ? "1": "0") <= 0
+               opts->ecdh_cofactor_check ? "1" : "0")
+            <= 0
         || !print_mac(out, OSSL_PROV_FIPS_PARAM_MODULE_MAC, module_mac,
-                      module_mac_len))
+            module_mac_len))
         goto end;
 
     if (install_mac != NULL
-            && install_mac_len > 0
-            && opts->self_test_onload == 0) {
+        && install_mac_len > 0
+        && opts->self_test_onload == 0) {
         if (!print_mac(out, OSSL_PROV_FIPS_PARAM_INSTALL_MAC, install_mac,
-                       install_mac_len)
+                install_mac_len)
             || BIO_printf(out, "%s = %s\n", OSSL_PROV_FIPS_PARAM_INSTALL_STATUS,
-                          INSTALL_STATUS_VAL) <= 0)
+                   INSTALL_STATUS_VAL)
+                <= 0)
             goto end;
     }
     ret = 1;
@@ -461,10 +507,10 @@ static int write_config_fips_section(BIO *out, const char *section,
 }
 
 static CONF *generate_config_and_load(const char *prov_name,
-                                      const char *section,
-                                      unsigned char *module_mac,
-                                      size_t module_mac_len,
-                                      const FIPS_OPTS *opts)
+    const char *section,
+    unsigned char *module_mac,
+    size_t module_mac_len,
+    const FIPS_OPTS *opts)
 {
     BIO *mem_bio = NULL;
     CONF *conf = NULL;
@@ -474,8 +520,8 @@ static CONF *generate_config_and_load(const char *prov_name,
         return 0;
     if (!write_config_header(mem_bio, prov_name, section)
         || !write_config_fips_section(mem_bio, section,
-                                      module_mac, module_mac_len,
-                                      opts, NULL, 0))
+            module_mac, module_mac_len,
+            opts, NULL, 0))
         goto end;
 
     conf = app_load_config_bio(mem_bio, NULL);
@@ -510,8 +556,8 @@ static int verify_module_load(const char *parent_config_file)
  * install_mac values, otherwise it returns 0.
  */
 static int verify_config(const char *infile, const char *section,
-                         unsigned char *module_mac, size_t module_mac_len,
-                         unsigned char *install_mac, size_t install_mac_len)
+    unsigned char *module_mac, size_t module_mac_len,
+    unsigned char *install_mac, size_t install_mac_len)
 {
     int ret = 0;
     char *s = NULL;
@@ -536,8 +582,8 @@ static int verify_config(const char *infile, const char *section,
     }
     buf1 = OPENSSL_hexstr2buf(s, &len);
     if (buf1 == NULL
-            || (size_t)len != module_mac_len
-            || memcmp(module_mac, buf1, module_mac_len) != 0) {
+        || (size_t)len != module_mac_len
+        || memcmp(module_mac, buf1, module_mac_len) != 0) {
         BIO_printf(bio_err, "Module integrity mismatch\n");
         goto end;
     }
@@ -554,8 +600,8 @@ static int verify_config(const char *infile, const char *section,
         }
         buf2 = OPENSSL_hexstr2buf(s, &len);
         if (buf2 == NULL
-                || (size_t)len != install_mac_len
-                || memcmp(install_mac, buf2, install_mac_len) != 0) {
+            || (size_t)len != install_mac_len
+            || memcmp(install_mac, buf2, install_mac_len) != 0) {
             BIO_printf(bio_err, "Install indicator status mismatch\n");
             goto end;
         }
@@ -598,7 +644,7 @@ int fipsinstall_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto cleanup;
         case OPT_HELP:
@@ -773,7 +819,7 @@ int fipsinstall_main(int argc, char **argv)
             ret = OSSL_PROVIDER_available(NULL, prov_name) ? 0 : 1;
             if (!quiet) {
                 BIO_printf(bio_err, "FIPS provider is %s\n",
-                           ret == 0 ? "available" : "not available");
+                    ret == 0 ? "available" : "not available");
             }
         }
         goto end;
@@ -792,8 +838,8 @@ int fipsinstall_main(int argc, char **argv)
     }
 
     if (self_test_log
-            || self_test_corrupt_desc != NULL
-            || self_test_corrupt_type != NULL)
+        || self_test_corrupt_desc != NULL
+        || self_test_corrupt_type != NULL)
         OSSL_SELF_TEST_set_callback(NULL, self_test_events, NULL);
 
     /* Use the default FIPS HMAC digest and key if not specified. */
@@ -826,8 +872,7 @@ int fipsinstall_main(int argc, char **argv)
 
     if (opts != NULL) {
         int ok = 1;
-        OSSL_PARAM *params =
-            app_params_new_from_opts(opts, EVP_MAC_settable_ctx_params(mac));
+        OSSL_PARAM *params = app_params_new_from_opts(opts, EVP_MAC_settable_ctx_params(mac));
 
         if (params == NULL)
             goto end;
@@ -853,7 +898,7 @@ int fipsinstall_main(int argc, char **argv)
 
     /* Calculate the MAC for the indicator status - it may not be used */
     mem_bio = BIO_new_mem_buf((const void *)INSTALL_STATUS_VAL,
-                              strlen(INSTALL_STATUS_VAL));
+        strlen(INSTALL_STATUS_VAL));
     if (mem_bio == NULL) {
         BIO_printf(bio_err, "Unable to create memory BIO\n");
         goto end;
@@ -865,13 +910,13 @@ int fipsinstall_main(int argc, char **argv)
         if (fips_opts.self_test_onload == 1)
             install_mac_len = 0;
         if (!verify_config(in_fname, section_name, module_mac, module_mac_len,
-                           install_mac, install_mac_len))
+                install_mac, install_mac_len))
             goto end;
         if (!quiet)
             BIO_printf(bio_err, "VERIFY PASSED\n");
     } else {
         conf = generate_config_and_load(prov_name, section_name, module_mac,
-                                        module_mac_len, &fips_opts);
+            module_mac_len, &fips_opts);
         if (conf == NULL)
             goto end;
         if (!load_fips_prov_and_run_self_test(prov_name, &is_fips_140_2_prov))
@@ -888,17 +933,16 @@ int fipsinstall_main(int argc, char **argv)
         if (set_selftest_onload_option == 0 && is_fips_140_2_prov)
             fips_opts.self_test_onload = 0;
 
-        fout =
-            out_fname == NULL ? dup_bio_out(FORMAT_TEXT)
-                              : bio_open_default(out_fname, 'w', FORMAT_TEXT);
+        fout = out_fname == NULL ? dup_bio_out(FORMAT_TEXT)
+                                 : bio_open_default(out_fname, 'w', FORMAT_TEXT);
         if (fout == NULL) {
             BIO_printf(bio_err, "Failed to open file\n");
             goto end;
         }
 
         if (!write_config_fips_section(fout, section_name,
-                                       module_mac, module_mac_len, &fips_opts,
-                                       install_mac, install_mac_len))
+                module_mac, module_mac_len, &fips_opts,
+                install_mac, install_mac_len))
             goto end;
         if (!quiet)
             BIO_printf(bio_err, "INSTALL PASSED\n");
@@ -951,7 +995,7 @@ static int self_test_events(const OSSL_PARAM params[], void *arg)
         if (strcmp(phase, OSSL_SELF_TEST_PHASE_START) == 0)
             BIO_printf(bio_err, "%s : (%s) : ", desc, type);
         else if (strcmp(phase, OSSL_SELF_TEST_PHASE_PASS) == 0
-                 || strcmp(phase, OSSL_SELF_TEST_PHASE_FAIL) == 0)
+            || strcmp(phase, OSSL_SELF_TEST_PHASE_FAIL) == 0)
             BIO_printf(bio_err, "%s\n", phase);
     }
     /*
@@ -959,13 +1003,13 @@ static int self_test_events(const OSSL_PARAM params[], void *arg)
      * error is returned during the corrupt phase.
      */
     if (strcmp(phase, OSSL_SELF_TEST_PHASE_CORRUPT) == 0
-            && (self_test_corrupt_desc != NULL
-                || self_test_corrupt_type != NULL)) {
+        && (self_test_corrupt_desc != NULL
+            || self_test_corrupt_type != NULL)) {
         if (self_test_corrupt_desc != NULL
-                && strcmp(self_test_corrupt_desc, desc) != 0)
+            && strcmp(self_test_corrupt_desc, desc) != 0)
             goto end;
         if (self_test_corrupt_type != NULL
-                && strcmp(self_test_corrupt_type, type) != 0)
+            && strcmp(self_test_corrupt_type, type) != 0)
             goto end;
         BIO_printf(bio_err, "%s ", phase);
         goto err;
diff --git a/apps/gendsa.c b/apps/gendsa.c
index a655c6ea02b2c..f0f8c383dc3ec 100644
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -24,31 +24,37 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_OUT, OPT_PASSOUT, OPT_ENGINE, OPT_CIPHER, OPT_VERBOSE, OPT_QUIET,
-    OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_OUT,
+    OPT_PASSOUT,
+    OPT_ENGINE,
+    OPT_CIPHER,
+    OPT_VERBOSE,
+    OPT_QUIET,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS gendsa_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] dsaparam-file\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] dsaparam-file\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output the key to the specified file"},
-    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
+    { "out", OPT_OUT, '>', "Output the key to the specified file" },
+    { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
-    {"", OPT_CIPHER, '-', "Encrypt the output with any supported cipher"},
-    {"verbose", OPT_VERBOSE, '-', "Verbose output"},
-    {"quiet", OPT_QUIET, '-', "Terse output"},
+    { "", OPT_CIPHER, '-', "Encrypt the output with any supported cipher" },
+    { "verbose", OPT_VERBOSE, '-', "Verbose output" },
+    { "quiet", OPT_QUIET, '-', "Terse output" },
 
     OPT_PARAMETERS(),
-    {"dsaparam-file", 0, 0, "File containing DSA parameters"},
-    {NULL}
+    { "dsaparam-file", 0, 0, "File containing DSA parameters" },
+    { NULL }
 };
 
 int gendsa_main(int argc, char **argv)
@@ -69,7 +75,7 @@ int gendsa_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -132,9 +138,9 @@ int gendsa_main(int argc, char **argv)
     nbits = EVP_PKEY_get_bits(pkey);
     if (nbits > OPENSSL_DSA_MAX_MODULUS_BITS)
         BIO_printf(bio_err,
-                   "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
-                   "         Your key size is %d! Larger key size may behave not as expected.\n",
-                   OPENSSL_DSA_MAX_MODULUS_BITS, EVP_PKEY_get_bits(pkey));
+            "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
+            "         Your key size is %d! Larger key size may behave not as expected.\n",
+            OPENSSL_DSA_MAX_MODULUS_BITS, EVP_PKEY_get_bits(pkey));
 
     ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(), pkey, app_get0_propq());
     if (ctx == NULL) {
@@ -157,10 +163,10 @@ int gendsa_main(int argc, char **argv)
         goto end;
     }
     ret = 0;
- end:
+end:
     if (ret != 0)
         ERR_print_errors(bio_err);
- end2:
+end2:
     BIO_free(in);
     BIO_free_all(out);
     EVP_PKEY_free(pkey);
diff --git a/apps/genpkey.c b/apps/genpkey.c
index eaca1e0dea637..50d088126f389 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -18,45 +18,57 @@
 static int verbose = 1;
 
 static int init_keygen_file(EVP_PKEY_CTX **pctx, const char *file, ENGINE *e,
-                            OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_ENGINE, OPT_OUTFORM, OPT_OUT, OPT_PASS, OPT_PARAMFILE,
-    OPT_ALGORITHM, OPT_PKEYOPT, OPT_GENPARAM, OPT_TEXT, OPT_CIPHER,
-    OPT_VERBOSE, OPT_QUIET, OPT_CONFIG, OPT_OUTPUBKEY,
-    OPT_PROV_ENUM, OPT_R_ENUM
+    OPT_ENGINE,
+    OPT_OUTFORM,
+    OPT_OUT,
+    OPT_PASS,
+    OPT_PARAMFILE,
+    OPT_ALGORITHM,
+    OPT_PKEYOPT,
+    OPT_GENPARAM,
+    OPT_TEXT,
+    OPT_CIPHER,
+    OPT_VERBOSE,
+    OPT_QUIET,
+    OPT_CONFIG,
+    OPT_OUTPUBKEY,
+    OPT_PROV_ENUM,
+    OPT_R_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS genpkey_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
-    {"paramfile", OPT_PARAMFILE, '<', "Parameters file"},
-    {"algorithm", OPT_ALGORITHM, 's', "The public key algorithm"},
-    {"verbose", OPT_VERBOSE, '-', "Output status while generating keys"},
-    {"quiet", OPT_QUIET, '-', "Do not output status while generating keys"},
-    {"pkeyopt", OPT_PKEYOPT, 's',
-     "Set the public key algorithm option as opt:value"},
-     OPT_CONFIG_OPTION,
+    { "paramfile", OPT_PARAMFILE, '<', "Parameters file" },
+    { "algorithm", OPT_ALGORITHM, 's', "The public key algorithm" },
+    { "verbose", OPT_VERBOSE, '-', "Output status while generating keys" },
+    { "quiet", OPT_QUIET, '-', "Do not output status while generating keys" },
+    { "pkeyopt", OPT_PKEYOPT, 's',
+        "Set the public key algorithm option as opt:value" },
+    OPT_CONFIG_OPTION,
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output (private key) file"},
-    {"outpubkey", OPT_OUTPUBKEY, '>', "Output public key file"},
-    {"outform", OPT_OUTFORM, 'F', "output format (DER or PEM)"},
-    {"pass", OPT_PASS, 's', "Output file pass phrase source"},
-    {"genparam", OPT_GENPARAM, '-', "Generate parameters, not key"},
-    {"text", OPT_TEXT, '-', "Print the private key in text"},
-    {"", OPT_CIPHER, '-', "Cipher to use to encrypt the key"},
+    { "out", OPT_OUT, '>', "Output (private key) file" },
+    { "outpubkey", OPT_OUTPUBKEY, '>', "Output public key file" },
+    { "outform", OPT_OUTFORM, 'F', "output format (DER or PEM)" },
+    { "pass", OPT_PASS, 's', "Output file pass phrase source" },
+    { "genparam", OPT_GENPARAM, '-', "Generate parameters, not key" },
+    { "text", OPT_TEXT, '-', "Print the private key in text" },
+    { "", OPT_CIPHER, '-', "Cipher to use to encrypt the key" },
 
     OPT_PROV_OPTIONS,
     OPT_R_OPTIONS,
 
     /* This is deliberately last. */
-    {OPT_HELP_STR, 1, 1,
-     "Order of options may be important!  See the documentation.\n"},
-    {NULL}
+    { OPT_HELP_STR, 1, 1,
+        "Order of options may be important!  See the documentation.\n" },
+    { NULL }
 };
 
 static const char *param_datatype_2name(unsigned int type, int *ishex)
@@ -64,11 +76,17 @@ static const char *param_datatype_2name(unsigned int type, int *ishex)
     *ishex = 0;
 
     switch (type) {
-    case OSSL_PARAM_INTEGER: return "int";
-    case OSSL_PARAM_UNSIGNED_INTEGER: return "uint";
-    case OSSL_PARAM_REAL: return "float";
-    case OSSL_PARAM_OCTET_STRING: *ishex = 1; return "string";
-    case OSSL_PARAM_UTF8_STRING: return "string";
+    case OSSL_PARAM_INTEGER:
+        return "int";
+    case OSSL_PARAM_UNSIGNED_INTEGER:
+        return "uint";
+    case OSSL_PARAM_REAL:
+        return "float";
+    case OSSL_PARAM_OCTET_STRING:
+        *ishex = 1;
+        return "string";
+    case OSSL_PARAM_UTF8_STRING:
+        return "string";
     default:
         return NULL;
     }
@@ -129,7 +147,7 @@ int genpkey_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -294,7 +312,7 @@ int genpkey_main(int argc, char **argv)
         }
     }
 
- end:
+end:
     sk_OPENSSL_STRING_free(keyopt);
     if (ret != 0) {
         ERR_print_errors(bio_err);
@@ -302,12 +320,14 @@ int genpkey_main(int argc, char **argv)
         if (mem_outpubkey != NULL) {
             rv = mem_bio_to_file(mem_outpubkey, outpubkeyfile, outformat, private);
             if (!rv)
-                BIO_printf(bio_err, "Error writing to outpubkey: '%s'. Error: %s\n", outpubkeyfile, strerror(errno));
+                BIO_printf(bio_err, "Error writing to outpubkey: '%s'. Error: %s\n",
+                    outpubkeyfile, strerror(errno));
         }
         if (mem_out != NULL) {
             rv = mem_bio_to_file(mem_out, outfile, outformat, private);
             if (!rv)
-                BIO_printf(bio_err, "Error writing to outfile: '%s'. Error: %s\n", outpubkeyfile, strerror(errno));
+                BIO_printf(bio_err, "Error writing to outfile: '%s'. Error: %s\n",
+                    outfile, strerror(errno));
         }
     }
     EVP_PKEY_free(pkey);
@@ -322,7 +342,7 @@ int genpkey_main(int argc, char **argv)
 }
 
 static int init_keygen_file(EVP_PKEY_CTX **pctx, const char *file, ENGINE *e,
-                            OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     BIO *pbio;
     EVP_PKEY *pkey = NULL;
@@ -358,18 +378,17 @@ static int init_keygen_file(EVP_PKEY_CTX **pctx, const char *file, ENGINE *e,
     *pctx = ctx;
     return 1;
 
- err:
+err:
     BIO_puts(bio_err, "Error initializing context\n");
     ERR_print_errors(bio_err);
     EVP_PKEY_CTX_free(ctx);
     EVP_PKEY_free(pkey);
     return 0;
-
 }
 
 int init_gen_str(EVP_PKEY_CTX **pctx,
-                 const char *algname, ENGINE *e, int do_param,
-                 OSSL_LIB_CTX *libctx, const char *propq)
+    const char *algname, ENGINE *e, int do_param,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     EVP_PKEY_CTX *ctx = NULL;
     int pkey_id;
@@ -398,11 +417,9 @@ int init_gen_str(EVP_PKEY_CTX **pctx,
     *pctx = ctx;
     return 1;
 
- err:
+err:
     BIO_printf(bio_err, "Error initializing %s context\n", algname);
     ERR_print_errors(bio_err);
     EVP_PKEY_CTX_free(ctx);
     return 0;
-
 }
-
diff --git a/apps/genrsa.c b/apps/genrsa.c
index 54d025e24c2cd..3dce82beca159 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -34,43 +34,51 @@ typedef enum OPTION_choice {
 #ifndef OPENSSL_NO_DEPRECATED_3_0
     OPT_3,
 #endif
-    OPT_F4, OPT_ENGINE,
-    OPT_OUT, OPT_PASSOUT, OPT_CIPHER, OPT_PRIMES, OPT_VERBOSE, OPT_QUIET,
-    OPT_R_ENUM, OPT_PROV_ENUM, OPT_TRADITIONAL
+    OPT_F4,
+    OPT_ENGINE,
+    OPT_OUT,
+    OPT_PASSOUT,
+    OPT_CIPHER,
+    OPT_PRIMES,
+    OPT_VERBOSE,
+    OPT_QUIET,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM,
+    OPT_TRADITIONAL
 } OPTION_CHOICE;
 
 const OPTIONS genrsa_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] numbits\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] numbits\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Input"),
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-    {"3", OPT_3, '-', "(deprecated) Use 3 for the E value"},
+    { "3", OPT_3, '-', "(deprecated) Use 3 for the E value" },
 #endif
-    {"F4", OPT_F4, '-', "Use the Fermat number F4 (0x10001) for the E value"},
-    {"f4", OPT_F4, '-', "Use the Fermat number F4 (0x10001) for the E value"},
+    { "F4", OPT_F4, '-', "Use the Fermat number F4 (0x10001) for the E value" },
+    { "f4", OPT_F4, '-', "Use the Fermat number F4 (0x10001) for the E value" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output the key to specified file"},
-    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
-    {"primes", OPT_PRIMES, 'p', "Specify number of primes"},
-    {"verbose", OPT_VERBOSE, '-', "Verbose output"},
-    {"quiet", OPT_QUIET, '-', "Terse output"},
-    {"traditional", OPT_TRADITIONAL, '-',
-     "Use traditional format for private keys"},
-    {"", OPT_CIPHER, '-', "Encrypt the output with any supported cipher"},
+    { "out", OPT_OUT, '>', "Output the key to specified file" },
+    { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
+    { "primes", OPT_PRIMES, 'p', "Specify number of primes" },
+    { "verbose", OPT_VERBOSE, '-', "Verbose output" },
+    { "quiet", OPT_QUIET, '-', "Terse output" },
+    { "traditional", OPT_TRADITIONAL, '-',
+        "Use traditional format for private keys" },
+    { "", OPT_CIPHER, '-', "Encrypt the output with any supported cipher" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"numbits", 0, 0, "Size of key in bits"},
-    {NULL}
+    { "numbits", 0, 0, "Size of key in bits" },
+    { NULL }
 };
 
 int genrsa_main(int argc, char **argv)
@@ -98,7 +106,7 @@ int genrsa_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
-opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -157,9 +165,9 @@ int genrsa_main(int argc, char **argv)
             goto end;
         if (num > OPENSSL_RSA_MAX_MODULUS_BITS)
             BIO_printf(bio_err,
-                       "Warning: It is not recommended to use more than %d bit for RSA keys.\n"
-                       "         Your key size is %d! Larger key size may behave not as expected.\n",
-                       OPENSSL_RSA_MAX_MODULUS_BITS, num);
+                "Warning: It is not recommended to use more than %d bit for RSA keys.\n"
+                "         Your key size is %d! Larger key size may behave not as expected.\n",
+                OPENSSL_RSA_MAX_MODULUS_BITS, num);
     } else if (!opt_check_rest_arg(NULL)) {
         goto opthelp;
     }
@@ -180,7 +188,7 @@ int genrsa_main(int argc, char **argv)
         goto end;
 
     if (!init_gen_str(&ctx, "RSA", eng, 0, app_get0_libctx(),
-                      app_get0_propq()))
+            app_get0_propq()))
         goto end;
 
     if (verbose)
@@ -227,7 +235,7 @@ int genrsa_main(int argc, char **argv)
     }
     if (traditional) {
         if (!PEM_write_bio_PrivateKey_traditional(out, pkey, enc, NULL, 0,
-                                                  NULL, passout))
+                NULL, passout))
             goto end;
     } else {
         if (!PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, passout))
@@ -235,7 +243,7 @@ int genrsa_main(int argc, char **argv)
     }
 
     ret = 0;
- end:
+end:
     BN_free(bn);
     BN_GENCB_free(cb);
     EVP_PKEY_CTX_free(ctx);
@@ -248,4 +256,3 @@ int genrsa_main(int argc, char **argv)
         ERR_print_errors(bio_err);
     return ret;
 }
-
diff --git a/apps/include/app_libctx.h b/apps/include/app_libctx.h
index 17c0afc713d2c..b7157cec40584 100644
--- a/apps/include/app_libctx.h
+++ b/apps/include/app_libctx.h
@@ -8,9 +8,9 @@
  */
 
 #ifndef OSSL_APPS_LIBCTX_H
-# define OSSL_APPS_LIBCTX_H
+#define OSSL_APPS_LIBCTX_H
 
-# include <openssl/types.h>
+#include <openssl/types.h>
 
 OSSL_LIB_CTX *app_create_libctx(void);
 OSSL_LIB_CTX *app_get0_libctx(void);
diff --git a/apps/include/app_params.h b/apps/include/app_params.h
index 79f8f58b3122f..20caf737d4dab 100644
--- a/apps/include/app_params.h
+++ b/apps/include/app_params.h
@@ -11,4 +11,3 @@
 
 int print_param_types(const char *thing, const OSSL_PARAM *pdefs, int indent);
 void print_param_value(const OSSL_PARAM *p, int indent);
-
diff --git a/apps/include/apps.h b/apps/include/apps.h
index ceebfde727861..06ba38a5851ef 100644
--- a/apps/include/apps.h
+++ b/apps/include/apps.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -8,42 +8,42 @@
  */
 
 #ifndef OSSL_APPS_H
-# define OSSL_APPS_H
-
-# include "internal/common.h" /* for HAS_PREFIX */
-# include "internal/nelem.h"
-# include <assert.h>
-
-# include <stdarg.h>
-# include <sys/types.h>
-# ifndef OPENSSL_NO_POSIX_IO
-#  include <sys/stat.h>
-#  include <fcntl.h>
-# endif
-
-# include <openssl/e_os2.h>
-# include <openssl/types.h>
-# include <openssl/bio.h>
-# include <openssl/x509.h>
-# include <openssl/conf.h>
-# include <openssl/txt_db.h>
-# include <openssl/engine.h>
-# include <openssl/ocsp.h>
-# include <openssl/http.h>
-# include <signal.h>
-# include "apps_ui.h"
-# include "opt.h"
-# include "fmt.h"
-# include "platform.h"
-# include "engine_loader.h"
-# include "app_libctx.h"
+#define OSSL_APPS_H
+
+#include "internal/common.h" /* for HAS_PREFIX */
+#include "internal/nelem.h"
+#include <assert.h>
+
+#include <stdarg.h>
+#include <sys/types.h>
+#ifndef OPENSSL_NO_POSIX_IO
+#include <sys/stat.h>
+#include <fcntl.h>
+#endif
+
+#include <openssl/e_os2.h>
+#include <openssl/types.h>
+#include <openssl/bio.h>
+#include <openssl/x509.h>
+#include <openssl/conf.h>
+#include <openssl/txt_db.h>
+#include <openssl/engine.h>
+#include <openssl/ocsp.h>
+#include <openssl/http.h>
+#include <signal.h>
+#include "apps_ui.h"
+#include "opt.h"
+#include "fmt.h"
+#include "platform.h"
+#include "engine_loader.h"
+#include "app_libctx.h"
 
 /*
  * quick macro when you need to pass an unsigned char instead of a char.
  * this is true for some implementations of the is*() functions, for
  * example.
  */
-# define _UC(c) ((unsigned char)(c))
+#define _UC(c) ((unsigned char)(c))
 
 void app_RAND_load_conf(CONF *c, const char *section);
 int app_RAND_write(void);
@@ -66,30 +66,30 @@ BIO *bio_open_default_quiet(const char *filename, char mode, int format);
 int mem_bio_to_file(BIO *in, const char *filename, int format, int private);
 char *app_conf_try_string(const CONF *cnf, const char *group, const char *name);
 int app_conf_try_number(const CONF *conf, const char *group, const char *name,
-                        long *result);
+    long *result);
 CONF *app_load_config_bio(BIO *in, const char *filename);
-# define app_load_config(filename) app_load_config_internal(filename, 0)
-# define app_load_config_quiet(filename) app_load_config_internal(filename, 1)
+#define app_load_config(filename) app_load_config_internal(filename, 0)
+#define app_load_config_quiet(filename) app_load_config_internal(filename, 1)
 CONF *app_load_config_internal(const char *filename, int quiet);
 CONF *app_load_config_verbose(const char *filename, int verbose);
 int app_load_modules(const CONF *config);
 CONF *app_load_config_modules(const char *configfile);
 void unbuffer(FILE *fp);
 void wait_for_async(SSL *s);
-# if defined(OPENSSL_SYS_MSDOS)
+#if defined(OPENSSL_SYS_MSDOS)
 int has_stdin_waiting(void);
-# endif
+#endif
 
 void corrupt_signature(const ASN1_STRING *signature);
 
 /* Helpers for setting X509v3 certificate fields notBefore and notAfter */
 int check_cert_time_string(const char *time, const char *desc);
 int set_cert_times(X509 *x, const char *startdate, const char *enddate,
-                   int days, int strict_compare_times);
+    int days, int strict_compare_times);
 
 int set_crl_lastupdate(X509_CRL *crl, const char *lastupdate);
 int set_crl_nextupdate(X509_CRL *crl, const char *nextupdate,
-                       long days, long hours, long secs);
+    long days, long hours, long secs);
 
 typedef struct args_st {
     int size;
@@ -103,11 +103,10 @@ int wrap_password_callback(char *buf, int bufsiz, int verify, void *cb_data);
 /* progress callback for dsaparam, dhparam, req, genpkey, etc. */
 int progress_cb(EVP_PKEY_CTX *ctx);
 
-int chopup_args(ARGS *arg, char *buf);
 void dump_cert_text(BIO *out, X509 *x);
 void print_name(BIO *out, const char *title, const X509_NAME *nm);
 void print_bignum_var(BIO *, const BIGNUM *, const char *,
-                      int, unsigned char *);
+    int, unsigned char *);
 void print_array(BIO *, const char *, int, const unsigned char *);
 int set_nameopt(const char *arg);
 unsigned long get_nameopt(void);
@@ -121,52 +120,52 @@ int app_passwd(const char *arg1, const char *arg2, char **pass1, char **pass2);
 int add_oid_section(CONF *conf);
 X509_REQ *load_csr(const char *file, int format, const char *desc);
 X509_REQ *load_csr_autofmt(const char *infile, int format,
-                           STACK_OF(OPENSSL_STRING) *vfyopts, const char *desc);
+    STACK_OF(OPENSSL_STRING) *vfyopts, const char *desc);
 X509 *load_cert_pass(const char *uri, int format, int maybe_stdin,
-                     const char *pass, const char *desc);
-# define load_cert(uri, format, desc) load_cert_pass(uri, format, 1, NULL, desc)
+    const char *pass, const char *desc);
+#define load_cert(uri, format, desc) load_cert_pass(uri, format, 1, NULL, desc)
 X509_CRL *load_crl(const char *uri, int format, int maybe_stdin,
-                   const char *desc);
+    const char *desc);
 void cleanse(char *str);
 void clear_free(char *str);
 EVP_PKEY *load_key(const char *uri, int format, int maybe_stdin,
-                   const char *pass, ENGINE *e, const char *desc);
+    const char *pass, ENGINE *e, const char *desc);
 /* first try reading public key, on failure resort to loading private key */
 EVP_PKEY *load_pubkey(const char *uri, int format, int maybe_stdin,
-                      const char *pass, ENGINE *e, const char *desc);
+    const char *pass, ENGINE *e, const char *desc);
 EVP_PKEY *load_keyparams(const char *uri, int format, int maybe_stdin,
-                         const char *keytype, const char *desc);
+    const char *keytype, const char *desc);
 EVP_PKEY *load_keyparams_suppress(const char *uri, int format, int maybe_stdin,
-                                  const char *keytype, const char *desc,
-                                  int suppress_decode_errors);
+    const char *keytype, const char *desc,
+    int suppress_decode_errors);
 char *next_item(char *opt); /* in list separated by comma and/or space */
 int load_cert_certs(const char *uri,
-                    X509 **pcert, STACK_OF(X509) **pcerts,
-                    int exclude_http, const char *pass, const char *desc,
-                    X509_VERIFY_PARAM *vpm);
+    X509 **pcert, STACK_OF(X509) **pcerts,
+    int exclude_http, const char *pass, const char *desc,
+    X509_VERIFY_PARAM *vpm);
 STACK_OF(X509) *load_certs_multifile(char *files, const char *pass,
-                                     const char *desc, X509_VERIFY_PARAM *vpm);
+    const char *desc, X509_VERIFY_PARAM *vpm);
 X509_STORE *load_certstore(char *input, const char *pass, const char *desc,
-                           X509_VERIFY_PARAM *vpm);
+    X509_VERIFY_PARAM *vpm);
 int load_certs(const char *uri, int maybe_stdin, STACK_OF(X509) **certs,
-               const char *pass, const char *desc);
+    const char *pass, const char *desc);
 int load_crls(const char *uri, STACK_OF(X509_CRL) **crls,
-              const char *pass, const char *desc);
+    const char *pass, const char *desc);
 int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
-                        const char *pass, const char *desc, int quiet,
-                        EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
-                        EVP_PKEY **pparams,
-                        X509 **pcert, STACK_OF(X509) **pcerts,
-                        X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls);
+    const char *pass, const char *desc, int quiet,
+    EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
+    EVP_PKEY **pparams,
+    X509 **pcert, STACK_OF(X509) **pcerts,
+    X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls);
 X509_STORE *setup_verify(const char *CAfile, int noCAfile,
-                         const char *CApath, int noCApath,
-                         const char *CAstore, int noCAstore);
+    const char *CApath, int noCApath,
+    const char *CAstore, int noCAstore);
 __owur int ctx_set_verify_locations(SSL_CTX *ctx,
-                                    const char *CAfile, int noCAfile,
-                                    const char *CApath, int noCApath,
-                                    const char *CAstore, int noCAstore);
+    const char *CAfile, int noCAfile,
+    const char *CApath, int noCApath,
+    const char *CAstore, int noCAstore);
 
-# ifndef OPENSSL_NO_CT
+#ifndef OPENSSL_NO_CT
 
 /*
  * Sets the file to load the Certificate Transparency log list from.
@@ -175,10 +174,10 @@ __owur int ctx_set_verify_locations(SSL_CTX *ctx,
  */
 __owur int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path);
 
-# endif
+#endif
 
 ENGINE *setup_engine_methods(const char *id, unsigned int methods, int debug);
-# define setup_engine(e, debug) setup_engine_methods(e, (unsigned int)-1, debug)
+#define setup_engine(e, debug) setup_engine_methods(e, (unsigned int)-1, debug)
 void release_engine(ENGINE *e);
 int init_engine(ENGINE *e);
 int finish_engine(ENGINE *e);
@@ -188,30 +187,30 @@ int get_legacy_pkey_id(OSSL_LIB_CTX *libctx, const char *algname, ENGINE *e);
 const EVP_MD *get_digest_from_engine(const char *name);
 const EVP_CIPHER *get_cipher_from_engine(const char *name);
 
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
 OCSP_RESPONSE *process_responder(OCSP_REQUEST *req, const char *host,
-                                 const char *port, const char *path,
-                                 const char *proxy, const char *no_proxy,
-                                 int use_ssl, STACK_OF(CONF_VALUE) *headers,
-                                 int req_timeout);
-# endif
+    const char *port, const char *path,
+    const char *proxy, const char *no_proxy,
+    int use_ssl, STACK_OF(CONF_VALUE) *headers,
+    int req_timeout);
+#endif
 
 /* Functions defined in ca.c and also used in ocsp.c */
 int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
-                   ASN1_GENERALIZEDTIME **pinvtm, const char *str);
+    ASN1_GENERALIZEDTIME **pinvtm, const char *str);
 
-# define DB_type         0
-# define DB_exp_date     1
-# define DB_rev_date     2
-# define DB_serial       3 /* index - unique */
-# define DB_file         4
-# define DB_name         5 /* index - unique when active and not disabled */
-# define DB_NUMBER       6
+#define DB_type 0
+#define DB_exp_date 1
+#define DB_rev_date 2
+#define DB_serial 3 /* index - unique */
+#define DB_file 4
+#define DB_name 5 /* index - unique when active and not disabled */
+#define DB_NUMBER 6
 
-# define DB_TYPE_REV     'R'    /* Revoked  */
-# define DB_TYPE_EXP     'E'    /* Expired  */
-# define DB_TYPE_VAL     'V'    /* Valid ; inserted with: ca ... -valid */
-# define DB_TYPE_SUSP    'S'    /* Suspended  */
+#define DB_TYPE_REV 'R' /* Revoked  */
+#define DB_TYPE_EXP 'E' /* Expired  */
+#define DB_TYPE_VAL 'V' /* Valid ; inserted with: ca ... -valid */
+#define DB_TYPE_SUSP 'S' /* Suspended  */
 
 typedef struct db_attr_st {
     int unique_subject;
@@ -220,9 +219,9 @@ typedef struct ca_db_st {
     DB_ATTR attributes;
     TXT_DB *db;
     char *dbfname;
-# ifndef OPENSSL_NO_POSIX_IO
+#ifndef OPENSSL_NO_POSIX_IO
     struct stat dbst;
-# endif
+#endif
 } CA_DB;
 
 extern int do_updatedb(CA_DB *db, time_t *now);
@@ -232,53 +231,53 @@ void *app_malloc(size_t sz, const char *what);
 
 /* load_serial, save_serial, and rotate_serial are also used for CRL numbers */
 BIGNUM *load_serial(const char *serialfile, int *exists, int create,
-                    ASN1_INTEGER **retai);
+    ASN1_INTEGER **retai);
 int save_serial(const char *serialfile, const char *suffix,
-                const BIGNUM *serial, ASN1_INTEGER **retai);
+    const BIGNUM *serial, ASN1_INTEGER **retai);
 int rotate_serial(const char *serialfile, const char *new_suffix,
-                  const char *old_suffix);
+    const char *old_suffix);
 int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);
 
 CA_DB *load_index(const char *dbfile, DB_ATTR *dbattr);
 int index_index(CA_DB *db);
 int save_index(const char *dbfile, const char *suffix, CA_DB *db);
 int rotate_index(const char *dbfile, const char *new_suffix,
-                 const char *old_suffix);
+    const char *old_suffix);
 void free_index(CA_DB *db);
-# define index_name_cmp_noconst(a, b) \
+#define index_name_cmp_noconst(a, b)                                           \
     index_name_cmp((const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, a), \
-                   (const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b))
+        (const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b))
 int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b);
 int parse_yesno(const char *str, int def);
 
 X509_NAME *parse_name(const char *str, int chtype, int multirdn,
-                      const char *desc);
+    const char *desc);
 void policies_print(X509_STORE_CTX *ctx);
-int bio_to_mem(unsigned char **out, int maxlen, BIO *in);
+int bio_to_mem(unsigned char **out, size_t *outlen, size_t maxlen, BIO *in);
 int pkey_ctrl_string(EVP_PKEY_CTX *ctx, const char *value);
 int x509_ctrl_string(X509 *x, const char *value);
 int x509_req_ctrl_string(X509_REQ *x, const char *value);
 int init_gen_str(EVP_PKEY_CTX **pctx,
-                 const char *algname, ENGINE *e, int do_param,
-                 OSSL_LIB_CTX *libctx, const char *propq);
+    const char *algname, ENGINE *e, int do_param,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int cert_matches_key(const X509 *cert, const EVP_PKEY *pkey);
 int do_X509_sign(X509 *x, int force_v1, EVP_PKEY *pkey, const char *md,
-                 STACK_OF(OPENSSL_STRING) *sigopts, X509V3_CTX *ext_ctx);
+    STACK_OF(OPENSSL_STRING) *sigopts, X509V3_CTX *ext_ctx);
 int do_X509_verify(X509 *x, EVP_PKEY *pkey, STACK_OF(OPENSSL_STRING) *vfyopts);
 int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const char *md,
-                     STACK_OF(OPENSSL_STRING) *sigopts);
+    STACK_OF(OPENSSL_STRING) *sigopts);
 int do_X509_REQ_verify(X509_REQ *x, EVP_PKEY *pkey,
-                       STACK_OF(OPENSSL_STRING) *vfyopts);
+    STACK_OF(OPENSSL_STRING) *vfyopts);
 int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const char *md,
-                     STACK_OF(OPENSSL_STRING) *sigopts);
+    STACK_OF(OPENSSL_STRING) *sigopts);
 
 extern char *psk_key;
 
 unsigned char *next_protos_parse(size_t *outlen, const char *in);
 
 int check_cert_attributes(BIO *bio, X509 *x,
-                          const char *checkhost, const char *checkemail,
-                          const char *checkip, int print);
+    const char *checkhost, const char *checkemail,
+    const char *checkip, int print);
 
 void store_setup_crl_download(X509_STORE *st);
 
@@ -290,38 +289,38 @@ typedef struct app_http_tls_info_st {
     SSL_CTX *ssl_ctx;
 } APP_HTTP_TLS_INFO;
 BIO *app_http_tls_cb(BIO *hbio, /* APP_HTTP_TLS_INFO */ void *arg,
-                     int connect, int detail);
+    int connect, int detail);
 void APP_HTTP_TLS_INFO_free(APP_HTTP_TLS_INFO *info);
-# ifndef OPENSSL_NO_SOCK
+#ifndef OPENSSL_NO_SOCK
 ASN1_VALUE *app_http_get_asn1(const char *url, const char *proxy,
-                              const char *no_proxy, SSL_CTX *ssl_ctx,
-                              const STACK_OF(CONF_VALUE) *headers,
-                              long timeout, const char *expected_content_type,
-                              const ASN1_ITEM *it);
+    const char *no_proxy, SSL_CTX *ssl_ctx,
+    const STACK_OF(CONF_VALUE) *headers,
+    long timeout, const char *expected_content_type,
+    const ASN1_ITEM *it);
 ASN1_VALUE *app_http_post_asn1(const char *host, const char *port,
-                               const char *path, const char *proxy,
-                               const char *no_proxy, SSL_CTX *ctx,
-                               const STACK_OF(CONF_VALUE) *headers,
-                               const char *content_type,
-                               ASN1_VALUE *req, const ASN1_ITEM *req_it,
-                               const char *expected_content_type,
-                               long timeout, const ASN1_ITEM *rsp_it);
-# endif
+    const char *path, const char *proxy,
+    const char *no_proxy, SSL_CTX *ctx,
+    const STACK_OF(CONF_VALUE) *headers,
+    const char *content_type,
+    ASN1_VALUE *req, const ASN1_ITEM *req_it,
+    const char *expected_content_type,
+    long timeout, const ASN1_ITEM *rsp_it);
+#endif
 
-# define EXT_COPY_NONE   0
-# define EXT_COPY_ADD    1
-# define EXT_COPY_ALL    2
+#define EXT_COPY_NONE 0
+#define EXT_COPY_ADD 1
+#define EXT_COPY_ALL 2
 
-# define NETSCAPE_CERT_HDR "certificate"
+#define NETSCAPE_CERT_HDR "certificate"
 
-# define APP_PASS_LEN 1024
+#define APP_PASS_LEN 1024
 
 /*
  * IETF RFC 5280 says serial number must be <= 20 bytes. Use 159 bits
  * so that the first bit will never be one, so that the DER encoding
  * rules won't force a leading octet.
  */
-# define SERIAL_RAND_BITS 159
+#define SERIAL_RAND_BITS 159
 
 int app_isdir(const char *);
 int app_access(const char *, int flag);
@@ -330,8 +329,8 @@ int fileno_stdout(void);
 int raw_read_stdin(void *, int);
 int raw_write_stdout(const void *, int);
 
-# define TM_START        0
-# define TM_STOP         1
+#define TM_START 0
+#define TM_STOP 1
 double app_tminterval(int stop, int usertime);
 
 void make_uppercase(char *string);
@@ -346,7 +345,7 @@ typedef struct verify_options_st {
 extern VERIFY_CB_ARGS verify_args;
 
 OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
-                                     const OSSL_PARAM *paramdefs);
+    const OSSL_PARAM *paramdefs);
 void app_params_free(OSSL_PARAM *params);
 int app_provider_load(OSSL_LIB_CTX *libctx, const char *provider_name);
 void app_providers_cleanup(void);
diff --git a/apps/include/apps_ui.h b/apps/include/apps_ui.h
index 6875b7c372d93..ea41c092f4da8 100644
--- a/apps/include/apps_ui.h
+++ b/apps/include/apps_ui.h
@@ -8,10 +8,9 @@
  */
 
 #ifndef OSSL_APPS_UI_H
-# define OSSL_APPS_UI_H
+#define OSSL_APPS_UI_H
 
-
-# define PW_MIN_LENGTH 4
+#define PW_MIN_LENGTH 4
 typedef struct pw_cb_data {
     const void *password;
     const char *prompt_info;
diff --git a/apps/include/cmp_mock_srv.h b/apps/include/cmp_mock_srv.h
index 00f3b8f1cbca5..215b95b744aa7 100644
--- a/apps/include/cmp_mock_srv.h
+++ b/apps/include/cmp_mock_srv.h
@@ -9,15 +9,15 @@
  */
 
 #ifndef OSSL_APPS_CMP_MOCK_SRV_H
-# define OSSL_APPS_CMP_MOCK_SRV_H
+#define OSSL_APPS_CMP_MOCK_SRV_H
 
-# include <openssl/opensslconf.h>
-# ifndef OPENSSL_NO_CMP
+#include <openssl/opensslconf.h>
+#ifndef OPENSSL_NO_CMP
 
-#  include <openssl/cmp.h>
+#include <openssl/cmp.h>
 
 OSSL_CMP_SRV_CTX *ossl_cmp_mock_srv_new(OSSL_LIB_CTX *libctx,
-                                        const char *propq);
+    const char *propq);
 void ossl_cmp_mock_srv_free(OSSL_CMP_SRV_CTX *srv_ctx);
 
 int ossl_cmp_mock_srv_set1_refCert(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert);
@@ -25,17 +25,17 @@ int ossl_cmp_mock_srv_set1_certOut(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert);
 int ossl_cmp_mock_srv_set1_keyOut(OSSL_CMP_SRV_CTX *srv_ctx, EVP_PKEY *pkey);
 int ossl_cmp_mock_srv_set1_crlOut(OSSL_CMP_SRV_CTX *srv_ctx, X509_CRL *crl);
 int ossl_cmp_mock_srv_set1_chainOut(OSSL_CMP_SRV_CTX *srv_ctx,
-                                    STACK_OF(X509) *chain);
+    STACK_OF(X509) *chain);
 int ossl_cmp_mock_srv_set1_caPubsOut(OSSL_CMP_SRV_CTX *srv_ctx,
-                                     STACK_OF(X509) *caPubs);
+    STACK_OF(X509) *caPubs);
 int ossl_cmp_mock_srv_set1_newWithNew(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert);
 int ossl_cmp_mock_srv_set1_newWithOld(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert);
 int ossl_cmp_mock_srv_set1_oldWithNew(OSSL_CMP_SRV_CTX *srv_ctx, X509 *cert);
 int ossl_cmp_mock_srv_set_statusInfo(OSSL_CMP_SRV_CTX *srv_ctx, int status,
-                                     int fail_info, const char *text);
+    int fail_info, const char *text);
 int ossl_cmp_mock_srv_set_sendError(OSSL_CMP_SRV_CTX *srv_ctx, int bodytype);
 int ossl_cmp_mock_srv_set_pollCount(OSSL_CMP_SRV_CTX *srv_ctx, int count);
 int ossl_cmp_mock_srv_set_checkAfterTime(OSSL_CMP_SRV_CTX *srv_ctx, int sec);
 
-# endif /* !defined(OPENSSL_NO_CMP) */
+#endif /* !defined(OPENSSL_NO_CMP) */
 #endif /* !defined(OSSL_APPS_CMP_MOCK_SRV_H) */
diff --git a/apps/include/engine_loader.h b/apps/include/engine_loader.h
index 30fdb9e551209..759d94ef597f7 100644
--- a/apps/include/engine_loader.h
+++ b/apps/include/engine_loader.h
@@ -7,13 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef HEADER_ENGINE_LOADER_H
-# define HEADER_ENGINE_LOADER_H
+#define HEADER_ENGINE_LOADER_H
 
-# include <openssl/store.h>
+#include <openssl/store.h>
 
 /* this is a private URI scheme */
-# define ENGINE_SCHEME          "org.openssl.engine"
-# define ENGINE_SCHEME_COLON    ENGINE_SCHEME ":"
+#define ENGINE_SCHEME "org.openssl.engine"
+#define ENGINE_SCHEME_COLON ENGINE_SCHEME ":"
 
 int setup_engine_loader(void);
 void destroy_engine_loader(void);
diff --git a/apps/include/fmt.h b/apps/include/fmt.h
index 98dfed7dc0a2d..3cb2dc8082378 100644
--- a/apps/include/fmt.h
+++ b/apps/include/fmt.h
@@ -23,22 +23,22 @@
  * contents.  The FORMAT_xxx macros are meant to express an intent with the
  * file being read or created.
  */
-# define B_FORMAT_TEXT   0x8000
-# define FORMAT_UNDEF    0
-# define FORMAT_TEXT    (1 | B_FORMAT_TEXT)     /* Generic text */
-# define FORMAT_BINARY   2                      /* Generic binary */
-# define FORMAT_BASE64  (3 | B_FORMAT_TEXT)     /* Base64 */
-# define FORMAT_ASN1     4                      /* ASN.1/DER */
-# define FORMAT_PEM     (5 | B_FORMAT_TEXT)
-# define FORMAT_PKCS12   6
-# define FORMAT_SMIME   (7 | B_FORMAT_TEXT)
-# define FORMAT_ENGINE   8                      /* Not really a file format */
-# define FORMAT_PEMRSA  (9 | B_FORMAT_TEXT)     /* PEM RSAPublicKey format */
-# define FORMAT_ASN1RSA  10                     /* DER RSAPublicKey format */
-# define FORMAT_MSBLOB   11                     /* MS Key blob format */
-# define FORMAT_PVK      12                     /* MS PVK file format */
-# define FORMAT_HTTP     13                     /* Download using HTTP */
-# define FORMAT_NSS      14                     /* NSS keylog format */
+#define B_FORMAT_TEXT 0x8000
+#define FORMAT_UNDEF 0
+#define FORMAT_TEXT (1 | B_FORMAT_TEXT) /* Generic text */
+#define FORMAT_BINARY 2 /* Generic binary */
+#define FORMAT_BASE64 (3 | B_FORMAT_TEXT) /* Base64 */
+#define FORMAT_ASN1 4 /* ASN.1/DER */
+#define FORMAT_PEM (5 | B_FORMAT_TEXT)
+#define FORMAT_PKCS12 6
+#define FORMAT_SMIME (7 | B_FORMAT_TEXT)
+#define FORMAT_ENGINE 8 /* Not really a file format */
+#define FORMAT_PEMRSA (9 | B_FORMAT_TEXT) /* PEM RSAPublicKey format */
+#define FORMAT_ASN1RSA 10 /* DER RSAPublicKey format */
+#define FORMAT_MSBLOB 11 /* MS Key blob format */
+#define FORMAT_PVK 12 /* MS PVK file format */
+#define FORMAT_HTTP 13 /* Download using HTTP */
+#define FORMAT_NSS 14 /* NSS keylog format */
 
 int FMT_istext(int format);
 
diff --git a/apps/include/function.h b/apps/include/function.h
index e796ff4045adc..ee08282e2fffe 100644
--- a/apps/include/function.h
+++ b/apps/include/function.h
@@ -8,16 +8,21 @@
  */
 
 #ifndef OSSL_APPS_FUNCTION_H
-# define OSSL_APPS_FUNCTION_H
+#define OSSL_APPS_FUNCTION_H
 
-# include <openssl/lhash.h>
-# include "opt.h"
+#include <openssl/lhash.h>
+#include "opt.h"
 
-#define DEPRECATED_NO_ALTERNATIVE   "unknown"
+#define DEPRECATED_NO_ALTERNATIVE "unknown"
 
 typedef enum FUNC_TYPE {
-    FT_none, FT_general, FT_md, FT_cipher, FT_pkey,
-    FT_md_alg, FT_cipher_alg
+    FT_none,
+    FT_general,
+    FT_md,
+    FT_cipher,
+    FT_pkey,
+    FT_md_alg,
+    FT_cipher_alg
 } FUNC_TYPE;
 
 typedef struct function_st {
diff --git a/apps/include/http_server.h b/apps/include/http_server.h
index 4811e6be40137..ddc7545fa36aa 100644
--- a/apps/include/http_server.h
+++ b/apps/include/http_server.h
@@ -8,35 +8,35 @@
  */
 
 #ifndef OSSL_HTTP_SERVER_H
-# define OSSL_HTTP_SERVER_H
+#define OSSL_HTTP_SERVER_H
 
-# include "apps.h"
-# include "log.h"
+#include "apps.h"
+#include "log.h"
 
-# ifndef HAVE_FORK
-#  if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS)
-#   define HAVE_FORK 0
-#  else
-#   define HAVE_FORK 1
-#  endif
-# endif
+#ifndef HAVE_FORK
+#if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS)
+#define HAVE_FORK 0
+#else
+#define HAVE_FORK 1
+#endif
+#endif
 
-# if HAVE_FORK
-#  undef NO_FORK
-# else
-#  define NO_FORK
-# endif
+#if HAVE_FORK
+#undef NO_FORK
+#else
+#define NO_FORK
+#endif
 
-# if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \
+#if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \
     && !defined(OPENSSL_NO_POSIX_IO)
-#  define HTTP_DAEMON
-#  include <sys/types.h>
-#  include <sys/wait.h>
-#  include <signal.h>
-#  define MAXERRLEN 1000 /* limit error text sent to syslog to 1000 bytes */
-# endif
+#define HTTP_DAEMON
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#define MAXERRLEN 1000 /* limit error text sent to syslog to 1000 bytes */
+#endif
 
-# ifndef OPENSSL_NO_SOCK
+#ifndef OPENSSL_NO_SOCK
 /*-
  * Initialize an HTTP server, setting up its listening BIO
  * prog: the name of the current app
@@ -66,9 +66,9 @@ BIO *http_server_init(const char *prog, const char *port, int verbosity);
  * The caller must free any non-NULL *preq, *ppath, and *pcbio pointers.
  */
 int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
-                             char **ppath, BIO **pcbio, BIO *acbio,
-                             int *found_keep_alive,
-                             const char *prog, int accept_get, int timeout);
+    char **ppath, BIO **pcbio, BIO *acbio,
+    int *found_keep_alive,
+    const char *prog, int accept_get, int timeout);
 
 /*-
  * Send an ASN.1-formatted HTTP response
@@ -82,8 +82,8 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
  * returns 1 on success, 0 on failure
  */
 int http_server_send_asn1_resp(const char *prog, BIO *cbio, int keep_alive,
-                               const char *content_type,
-                               const ASN1_ITEM *it, const ASN1_VALUE *resp);
+    const char *content_type,
+    const ASN1_ITEM *it, const ASN1_VALUE *resp);
 
 /*-
  * Send a trivial HTTP response, typically to report an error or OK
@@ -94,16 +94,16 @@ int http_server_send_asn1_resp(const char *prog, BIO *cbio, int keep_alive,
  * returns 1 on success, 0 on failure
  */
 int http_server_send_status(const char *prog, BIO *cbio,
-                            int status, const char *reason);
+    int status, const char *reason);
 
-# endif
+#endif
 
-# ifdef HTTP_DAEMON
+#ifdef HTTP_DAEMON
 extern int n_responders;
 extern int acfd;
 
 void socket_timeout(int signum);
 void spawn_loop(const char *prog);
-# endif
+#endif
 
 #endif
diff --git a/apps/include/log.h b/apps/include/log.h
index 1b8b58d41acf6..d866b90c54bf1 100644
--- a/apps/include/log.h
+++ b/apps/include/log.h
@@ -8,25 +8,25 @@
  */
 
 #ifndef OSSL_APPS_LOG_H
-# define OSSL_APPS_LOG_H
+#define OSSL_APPS_LOG_H
 
-# include <openssl/bio.h>
-# if !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WINDOWS) \
+#include <openssl/bio.h>
+#if !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WINDOWS) \
     && !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_POSIX_IO)
-#  include <syslog.h>
-# else
-#  define LOG_EMERG   0
-#  define LOG_ALERT   1
-#  define LOG_CRIT    2
-#  define LOG_ERR     3
-#  define LOG_WARNING 4
-#  define LOG_NOTICE  5
-#  define LOG_INFO    6
-#  define LOG_DEBUG   7
-# endif
+#include <syslog.h>
+#else
+#define LOG_EMERG 0
+#define LOG_ALERT 1
+#define LOG_CRIT 2
+#define LOG_ERR 3
+#define LOG_WARNING 4
+#define LOG_NOTICE 5
+#define LOG_INFO 6
+#define LOG_DEBUG 7
+#endif
 
-# undef LOG_TRACE
-# define LOG_TRACE (LOG_DEBUG + 1)
+#undef LOG_TRACE
+#define LOG_TRACE (LOG_DEBUG + 1)
 
 int log_set_verbosity(const char *prog, int level);
 int log_get_verbosity(void);
@@ -45,6 +45,6 @@ int log_get_verbosity(void);
  * returns nothing
  */
 void trace_log_message(int category,
-                       const char *prog, int level, const char *fmt, ...);
+    const char *prog, int level, const char *fmt, ...);
 
 #endif /* OSSL_APPS_LOG_H */
diff --git a/apps/include/names.h b/apps/include/names.h
index f4d6f6a9a333d..bf47459ade522 100644
--- a/apps/include/names.h
+++ b/apps/include/names.h
@@ -10,7 +10,7 @@
 #include <openssl/safestack.h>
 
 /* Standard comparing function for names */
-int name_cmp(const char * const *a, const char * const *b);
+int name_cmp(const char *const *a, const char *const *b);
 /* collect_names is meant to be used with EVP_{type}_doall_names */
 void collect_names(const char *name, void *vdata);
 /* Sorts and prints a stack of names to |out| */
diff --git a/apps/include/opt.h b/apps/include/opt.h
index d8d75182802d7..3b467c0d47ae1 100644
--- a/apps/include/opt.h
+++ b/apps/include/opt.h
@@ -19,301 +19,312 @@
 /*
  * Common verification options.
  */
-# define OPT_V_ENUM \
-        OPT_V__FIRST=2000, \
-        OPT_V_POLICY, OPT_V_PURPOSE, OPT_V_VERIFY_NAME, OPT_V_VERIFY_DEPTH, \
-        OPT_V_ATTIME, OPT_V_VERIFY_HOSTNAME, OPT_V_VERIFY_EMAIL, \
-        OPT_V_VERIFY_IP, OPT_V_IGNORE_CRITICAL, OPT_V_ISSUER_CHECKS, \
-        OPT_V_CRL_CHECK, OPT_V_CRL_CHECK_ALL, OPT_V_POLICY_CHECK, \
-        OPT_V_EXPLICIT_POLICY, OPT_V_INHIBIT_ANY, OPT_V_INHIBIT_MAP, \
-        OPT_V_X509_STRICT, OPT_V_EXTENDED_CRL, OPT_V_USE_DELTAS, \
-        OPT_V_POLICY_PRINT, OPT_V_CHECK_SS_SIG, OPT_V_TRUSTED_FIRST, \
-        OPT_V_SUITEB_128_ONLY, OPT_V_SUITEB_128, OPT_V_SUITEB_192, \
-        OPT_V_PARTIAL_CHAIN, OPT_V_NO_ALT_CHAINS, OPT_V_NO_CHECK_TIME, \
-        OPT_V_VERIFY_AUTH_LEVEL, OPT_V_ALLOW_PROXY_CERTS, \
-        OPT_V__LAST
-
-# define OPT_V_OPTIONS \
-        OPT_SECTION("Validation"), \
-        { "policy", OPT_V_POLICY, 's', "adds policy to the acceptable policy set"}, \
-        { "purpose", OPT_V_PURPOSE, 's', \
-            "certificate chain purpose"}, \
-        { "verify_name", OPT_V_VERIFY_NAME, 's', "verification policy name"}, \
-        { "verify_depth", OPT_V_VERIFY_DEPTH, 'n', \
-            "chain depth limit" }, \
-        { "auth_level", OPT_V_VERIFY_AUTH_LEVEL, 'n', \
-            "chain authentication security level" }, \
-        { "attime", OPT_V_ATTIME, 'M', "verification epoch time" }, \
-        { "verify_hostname", OPT_V_VERIFY_HOSTNAME, 's', \
-            "expected peer hostname" }, \
-        { "verify_email", OPT_V_VERIFY_EMAIL, 's', \
-            "expected peer email" }, \
-        { "verify_ip", OPT_V_VERIFY_IP, 's', \
-            "expected peer IP address" }, \
-        { "ignore_critical", OPT_V_IGNORE_CRITICAL, '-', \
-            "permit unhandled critical extensions"}, \
-        { "issuer_checks", OPT_V_ISSUER_CHECKS, '-', "(deprecated)"}, \
-        { "crl_check", OPT_V_CRL_CHECK, '-', "check leaf certificate revocation" }, \
-        { "crl_check_all", OPT_V_CRL_CHECK_ALL, '-', "check full chain revocation" }, \
-        { "policy_check", OPT_V_POLICY_CHECK, '-', "perform rfc5280 policy checks"}, \
-        { "explicit_policy", OPT_V_EXPLICIT_POLICY, '-', \
-            "set policy variable require-explicit-policy"}, \
-        { "inhibit_any", OPT_V_INHIBIT_ANY, '-', \
-            "set policy variable inhibit-any-policy"}, \
-        { "inhibit_map", OPT_V_INHIBIT_MAP, '-', \
-            "set policy variable inhibit-policy-mapping"}, \
-        { "x509_strict", OPT_V_X509_STRICT, '-', \
-            "disable certificate compatibility work-arounds"}, \
-        { "extended_crl", OPT_V_EXTENDED_CRL, '-', \
-            "enable extended CRL features"}, \
-        { "use_deltas", OPT_V_USE_DELTAS, '-', \
-            "use delta CRLs"}, \
-        { "policy_print", OPT_V_POLICY_PRINT, '-', \
-            "print policy processing diagnostics"}, \
-        { "check_ss_sig", OPT_V_CHECK_SS_SIG, '-', \
-            "check root CA self-signatures"}, \
-        { "trusted_first", OPT_V_TRUSTED_FIRST, '-', \
-            "search trust store first (default)" }, \
-        { "suiteB_128_only", OPT_V_SUITEB_128_ONLY, '-', "Suite B 128-bit-only mode"}, \
-        { "suiteB_128", OPT_V_SUITEB_128, '-', \
-            "Suite B 128-bit mode allowing 192-bit algorithms"}, \
-        { "suiteB_192", OPT_V_SUITEB_192, '-', "Suite B 192-bit-only mode" }, \
-        { "partial_chain", OPT_V_PARTIAL_CHAIN, '-', \
-            "accept chains anchored by intermediate trust-store CAs"}, \
-        { "no_alt_chains", OPT_V_NO_ALT_CHAINS, '-', "(deprecated)" }, \
+#define OPT_V_ENUM                                                      \
+    OPT_V__FIRST = 2000,                                                \
+    OPT_V_POLICY, OPT_V_PURPOSE, OPT_V_VERIFY_NAME, OPT_V_VERIFY_DEPTH, \
+    OPT_V_ATTIME, OPT_V_VERIFY_HOSTNAME, OPT_V_VERIFY_EMAIL,            \
+    OPT_V_VERIFY_IP, OPT_V_IGNORE_CRITICAL, OPT_V_ISSUER_CHECKS,        \
+    OPT_V_CRL_CHECK, OPT_V_CRL_CHECK_ALL, OPT_V_POLICY_CHECK,           \
+    OPT_V_EXPLICIT_POLICY, OPT_V_INHIBIT_ANY, OPT_V_INHIBIT_MAP,        \
+    OPT_V_X509_STRICT, OPT_V_EXTENDED_CRL, OPT_V_USE_DELTAS,            \
+    OPT_V_POLICY_PRINT, OPT_V_CHECK_SS_SIG, OPT_V_TRUSTED_FIRST,        \
+    OPT_V_SUITEB_128_ONLY, OPT_V_SUITEB_128, OPT_V_SUITEB_192,          \
+    OPT_V_PARTIAL_CHAIN, OPT_V_NO_ALT_CHAINS, OPT_V_NO_CHECK_TIME,      \
+    OPT_V_VERIFY_AUTH_LEVEL, OPT_V_ALLOW_PROXY_CERTS,                   \
+    OPT_V__LAST
+
+#define OPT_V_OPTIONS                                                                      \
+    OPT_SECTION("Validation"),                                                             \
+        { "policy", OPT_V_POLICY, 's', "adds policy to the acceptable policy set" },       \
+        { "purpose", OPT_V_PURPOSE, 's',                                                   \
+            "certificate chain purpose" },                                                 \
+        { "verify_name", OPT_V_VERIFY_NAME, 's', "verification policy name" },             \
+        { "verify_depth", OPT_V_VERIFY_DEPTH, 'n',                                         \
+            "chain depth limit" },                                                         \
+        { "auth_level", OPT_V_VERIFY_AUTH_LEVEL, 'n',                                      \
+            "chain authentication security level" },                                       \
+        { "attime", OPT_V_ATTIME, 'M', "verification epoch time" },                        \
+        { "verify_hostname", OPT_V_VERIFY_HOSTNAME, 's',                                   \
+            "expected peer hostname" },                                                    \
+        { "verify_email", OPT_V_VERIFY_EMAIL, 's',                                         \
+            "expected peer email" },                                                       \
+        { "verify_ip", OPT_V_VERIFY_IP, 's',                                               \
+            "expected peer IP address" },                                                  \
+        { "ignore_critical", OPT_V_IGNORE_CRITICAL, '-',                                   \
+            "permit unhandled critical extensions" },                                      \
+        { "issuer_checks", OPT_V_ISSUER_CHECKS, '-', "(deprecated)" },                     \
+        { "crl_check", OPT_V_CRL_CHECK, '-', "check leaf certificate revocation" },        \
+        { "crl_check_all", OPT_V_CRL_CHECK_ALL, '-', "check full chain revocation" },      \
+        { "policy_check", OPT_V_POLICY_CHECK, '-', "perform rfc5280 policy checks" },      \
+        { "explicit_policy", OPT_V_EXPLICIT_POLICY, '-',                                   \
+            "set policy variable require-explicit-policy" },                               \
+        { "inhibit_any", OPT_V_INHIBIT_ANY, '-',                                           \
+            "set policy variable inhibit-any-policy" },                                    \
+        { "inhibit_map", OPT_V_INHIBIT_MAP, '-',                                           \
+            "set policy variable inhibit-policy-mapping" },                                \
+        { "x509_strict", OPT_V_X509_STRICT, '-',                                           \
+            "disable certificate compatibility work-arounds" },                            \
+        { "extended_crl", OPT_V_EXTENDED_CRL, '-',                                         \
+            "enable extended CRL features" },                                              \
+        { "use_deltas", OPT_V_USE_DELTAS, '-',                                             \
+            "use delta CRLs" },                                                            \
+        { "policy_print", OPT_V_POLICY_PRINT, '-',                                         \
+            "print policy processing diagnostics" },                                       \
+        { "check_ss_sig", OPT_V_CHECK_SS_SIG, '-',                                         \
+            "check root CA self-signatures" },                                             \
+        { "trusted_first", OPT_V_TRUSTED_FIRST, '-',                                       \
+            "search trust store first (default)" },                                        \
+        { "suiteB_128_only", OPT_V_SUITEB_128_ONLY, '-', "Suite B 128-bit-only mode" },    \
+        { "suiteB_128", OPT_V_SUITEB_128, '-',                                             \
+            "Suite B 128-bit mode allowing 192-bit algorithms" },                          \
+        { "suiteB_192", OPT_V_SUITEB_192, '-', "Suite B 192-bit-only mode" },              \
+        { "partial_chain", OPT_V_PARTIAL_CHAIN, '-',                                       \
+            "accept chains anchored by intermediate trust-store CAs" },                    \
+        { "no_alt_chains", OPT_V_NO_ALT_CHAINS, '-', "(deprecated)" },                     \
         { "no_check_time", OPT_V_NO_CHECK_TIME, '-', "ignore certificate validity time" }, \
         { "allow_proxy_certs", OPT_V_ALLOW_PROXY_CERTS, '-', "allow the use of proxy certificates" }
 
-# define OPT_V_CASES \
-        OPT_V__FIRST: case OPT_V__LAST: break; \
-        case OPT_V_POLICY: \
-        case OPT_V_PURPOSE: \
-        case OPT_V_VERIFY_NAME: \
-        case OPT_V_VERIFY_DEPTH: \
-        case OPT_V_VERIFY_AUTH_LEVEL: \
-        case OPT_V_ATTIME: \
-        case OPT_V_VERIFY_HOSTNAME: \
-        case OPT_V_VERIFY_EMAIL: \
-        case OPT_V_VERIFY_IP: \
-        case OPT_V_IGNORE_CRITICAL: \
-        case OPT_V_ISSUER_CHECKS: \
-        case OPT_V_CRL_CHECK: \
-        case OPT_V_CRL_CHECK_ALL: \
-        case OPT_V_POLICY_CHECK: \
-        case OPT_V_EXPLICIT_POLICY: \
-        case OPT_V_INHIBIT_ANY: \
-        case OPT_V_INHIBIT_MAP: \
-        case OPT_V_X509_STRICT: \
-        case OPT_V_EXTENDED_CRL: \
-        case OPT_V_USE_DELTAS: \
-        case OPT_V_POLICY_PRINT: \
-        case OPT_V_CHECK_SS_SIG: \
-        case OPT_V_TRUSTED_FIRST: \
-        case OPT_V_SUITEB_128_ONLY: \
-        case OPT_V_SUITEB_128: \
-        case OPT_V_SUITEB_192: \
-        case OPT_V_PARTIAL_CHAIN: \
-        case OPT_V_NO_ALT_CHAINS: \
-        case OPT_V_NO_CHECK_TIME: \
-        case OPT_V_ALLOW_PROXY_CERTS
+#define OPT_V_CASES               \
+    OPT_V__FIRST:                 \
+    case OPT_V__LAST:             \
+    break;                        \
+    case OPT_V_POLICY:            \
+    case OPT_V_PURPOSE:           \
+    case OPT_V_VERIFY_NAME:       \
+    case OPT_V_VERIFY_DEPTH:      \
+    case OPT_V_VERIFY_AUTH_LEVEL: \
+    case OPT_V_ATTIME:            \
+    case OPT_V_VERIFY_HOSTNAME:   \
+    case OPT_V_VERIFY_EMAIL:      \
+    case OPT_V_VERIFY_IP:         \
+    case OPT_V_IGNORE_CRITICAL:   \
+    case OPT_V_ISSUER_CHECKS:     \
+    case OPT_V_CRL_CHECK:         \
+    case OPT_V_CRL_CHECK_ALL:     \
+    case OPT_V_POLICY_CHECK:      \
+    case OPT_V_EXPLICIT_POLICY:   \
+    case OPT_V_INHIBIT_ANY:       \
+    case OPT_V_INHIBIT_MAP:       \
+    case OPT_V_X509_STRICT:       \
+    case OPT_V_EXTENDED_CRL:      \
+    case OPT_V_USE_DELTAS:        \
+    case OPT_V_POLICY_PRINT:      \
+    case OPT_V_CHECK_SS_SIG:      \
+    case OPT_V_TRUSTED_FIRST:     \
+    case OPT_V_SUITEB_128_ONLY:   \
+    case OPT_V_SUITEB_128:        \
+    case OPT_V_SUITEB_192:        \
+    case OPT_V_PARTIAL_CHAIN:     \
+    case OPT_V_NO_ALT_CHAINS:     \
+    case OPT_V_NO_CHECK_TIME:     \
+    case OPT_V_ALLOW_PROXY_CERTS
 
 /*
  * Common "extended validation" options.
  */
-# define OPT_X_ENUM \
-        OPT_X__FIRST=1000, \
-        OPT_X_KEY, OPT_X_CERT, OPT_X_CHAIN, OPT_X_CHAIN_BUILD, \
-        OPT_X_CERTFORM, OPT_X_KEYFORM, \
-        OPT_X__LAST
-
-# define OPT_X_OPTIONS \
-        OPT_SECTION("Extended certificate"), \
-        { "xkey", OPT_X_KEY, '<', "key for Extended certificates"}, \
-        { "xcert", OPT_X_CERT, '<', "cert for Extended certificates"}, \
-        { "xchain", OPT_X_CHAIN, '<', "chain for Extended certificates"}, \
-        { "xchain_build", OPT_X_CHAIN_BUILD, '-', \
-            "build certificate chain for the extended certificates"}, \
-        { "xcertform", OPT_X_CERTFORM, 'F', \
+#define OPT_X_ENUM                                         \
+    OPT_X__FIRST = 1000,                                   \
+    OPT_X_KEY, OPT_X_CERT, OPT_X_CHAIN, OPT_X_CHAIN_BUILD, \
+    OPT_X_CERTFORM, OPT_X_KEYFORM,                         \
+    OPT_X__LAST
+
+#define OPT_X_OPTIONS                                                        \
+    OPT_SECTION("Extended certificate"),                                     \
+        { "xkey", OPT_X_KEY, '<', "key for Extended certificates" },         \
+        { "xcert", OPT_X_CERT, '<', "cert for Extended certificates" },      \
+        { "xchain", OPT_X_CHAIN, '<', "chain for Extended certificates" },   \
+        { "xchain_build", OPT_X_CHAIN_BUILD, '-',                            \
+            "build certificate chain for the extended certificates" },       \
+        { "xcertform", OPT_X_CERTFORM, 'F',                                  \
             "format of Extended certificate (PEM/DER/P12); has no effect" }, \
-        { "xkeyform", OPT_X_KEYFORM, 'F', \
-            "format of Extended certificate's key (DER/PEM/P12); has no effect"}
-
-# define OPT_X_CASES \
-        OPT_X__FIRST: case OPT_X__LAST: break; \
-        case OPT_X_KEY: \
-        case OPT_X_CERT: \
-        case OPT_X_CHAIN: \
-        case OPT_X_CHAIN_BUILD: \
-        case OPT_X_CERTFORM: \
-        case OPT_X_KEYFORM
+        { "xkeyform", OPT_X_KEYFORM, 'F',                                    \
+            "format of Extended certificate's key (DER/PEM/P12); has no effect" }
+
+#define OPT_X_CASES         \
+    OPT_X__FIRST:           \
+    case OPT_X__LAST:       \
+    break;                  \
+    case OPT_X_KEY:         \
+    case OPT_X_CERT:        \
+    case OPT_X_CHAIN:       \
+    case OPT_X_CHAIN_BUILD: \
+    case OPT_X_CERTFORM:    \
+    case OPT_X_KEYFORM
 
 /*
  * Common SSL options.
  * Any changes here must be coordinated with ../ssl/ssl_conf.c
  */
-# define OPT_S_ENUM \
-        OPT_S__FIRST=3000, \
-        OPT_S_NOSSL3, OPT_S_NOTLS1, OPT_S_NOTLS1_1, OPT_S_NOTLS1_2, \
-        OPT_S_NOTLS1_3, OPT_S_BUGS, OPT_S_NO_COMP, OPT_S_NOTICKET, \
-        OPT_S_SERVERPREF, OPT_S_LEGACYRENEG, OPT_S_CLIENTRENEG, \
-        OPT_S_LEGACYCONN, \
-        OPT_S_ONRESUMP, OPT_S_NOLEGACYCONN, \
-        OPT_S_ALLOW_NO_DHE_KEX, OPT_S_PREFER_NO_DHE_KEX, \
-        OPT_S_PRIORITIZE_CHACHA, \
-        OPT_S_STRICT, OPT_S_SIGALGS, OPT_S_CLIENTSIGALGS, OPT_S_GROUPS, \
-        OPT_S_CURVES, OPT_S_NAMEDCURVE, OPT_S_CIPHER, OPT_S_CIPHERSUITES, \
-        OPT_S_RECORD_PADDING, OPT_S_DEBUGBROKE, OPT_S_COMP, \
-        OPT_S_MINPROTO, OPT_S_MAXPROTO, \
-        OPT_S_NO_RENEGOTIATION, OPT_S_NO_MIDDLEBOX, OPT_S_NO_ETM, \
-        OPT_S_NO_EMS, \
-        OPT_S_NO_TX_CERT_COMP, \
-        OPT_S_NO_RX_CERT_COMP, \
-        OPT_S__LAST
-
-# define OPT_S_OPTIONS \
-        OPT_SECTION("TLS/SSL"), \
-        {"no_ssl3", OPT_S_NOSSL3, '-',"Just disable SSLv3" }, \
-        {"no_tls1", OPT_S_NOTLS1, '-', "Just disable TLSv1"}, \
-        {"no_tls1_1", OPT_S_NOTLS1_1, '-', "Just disable TLSv1.1" }, \
-        {"no_tls1_2", OPT_S_NOTLS1_2, '-', "Just disable TLSv1.2"}, \
-        {"no_tls1_3", OPT_S_NOTLS1_3, '-', "Just disable TLSv1.3"}, \
-        {"bugs", OPT_S_BUGS, '-', "Turn on SSL bug compatibility"}, \
-        {"no_comp", OPT_S_NO_COMP, '-', "Disable SSL/TLS compression (default)" }, \
-        {"comp", OPT_S_COMP, '-', "Use SSL/TLS-level compression" }, \
-        {"no_tx_cert_comp", OPT_S_NO_TX_CERT_COMP, '-', "Disable sending TLSv1.3 compressed certificates" }, \
-        {"no_rx_cert_comp", OPT_S_NO_RX_CERT_COMP, '-', "Disable receiving TLSv1.3 compressed certificates" }, \
-        {"no_ticket", OPT_S_NOTICKET, '-', \
-            "Disable use of TLS session tickets"}, \
-        {"serverpref", OPT_S_SERVERPREF, '-', "Use server's cipher preferences"}, \
-        {"legacy_renegotiation", OPT_S_LEGACYRENEG, '-', \
-            "Enable use of legacy renegotiation (dangerous)"}, \
-        {"client_renegotiation", OPT_S_CLIENTRENEG, '-', \
-            "Allow client-initiated renegotiation" }, \
-        {"no_renegotiation", OPT_S_NO_RENEGOTIATION, '-', \
-            "Disable all renegotiation."}, \
-        {"legacy_server_connect", OPT_S_LEGACYCONN, '-', \
-            "Allow initial connection to servers that don't support RI"}, \
-        {"no_resumption_on_reneg", OPT_S_ONRESUMP, '-', \
-            "Disallow session resumption on renegotiation"}, \
-        {"no_legacy_server_connect", OPT_S_NOLEGACYCONN, '-', \
-            "Disallow initial connection to servers that don't support RI"}, \
-        {"allow_no_dhe_kex", OPT_S_ALLOW_NO_DHE_KEX, '-', \
-            "In TLSv1.3 allow non-(ec)dhe based key exchange on resumption"}, \
-        {"prefer_no_dhe_kex", OPT_S_PREFER_NO_DHE_KEX, '-', \
-            "In TLSv1.3 prefer non-(ec)dhe over (ec)dhe-based key exchange on resumption"}, \
-        {"prioritize_chacha", OPT_S_PRIORITIZE_CHACHA, '-', \
-            "Prioritize ChaCha ciphers when preferred by clients"}, \
-        {"strict", OPT_S_STRICT, '-', \
-            "Enforce strict certificate checks as per TLS standard"}, \
-        {"sigalgs", OPT_S_SIGALGS, 's', \
-            "Signature algorithms to support (colon-separated list)" }, \
-        {"client_sigalgs", OPT_S_CLIENTSIGALGS, 's', \
-            "Signature algorithms to support for client certificate" \
-            " authentication (colon-separated list)" }, \
-        {"groups", OPT_S_GROUPS, 's', \
-            "Groups to advertise (colon-separated list)" }, \
-        {"curves", OPT_S_CURVES, 's', \
-            "Groups to advertise (colon-separated list)" }, \
-        {"named_curve", OPT_S_NAMEDCURVE, 's', \
-            "Elliptic curve used for ECDHE (server-side only)" }, \
-        {"cipher", OPT_S_CIPHER, 's', "Specify TLSv1.2 and below cipher list to be used"}, \
-        {"ciphersuites", OPT_S_CIPHERSUITES, 's', "Specify TLSv1.3 ciphersuites to be used"}, \
-        {"min_protocol", OPT_S_MINPROTO, 's', "Specify the minimum protocol version to be used"}, \
-        {"max_protocol", OPT_S_MAXPROTO, 's', "Specify the maximum protocol version to be used"}, \
-        {"record_padding", OPT_S_RECORD_PADDING, 's', \
-            "Block size to pad TLS 1.3 records to."}, \
-        {"debug_broken_protocol", OPT_S_DEBUGBROKE, '-', \
-            "Perform all sorts of protocol violations for testing purposes"}, \
-        {"no_middlebox", OPT_S_NO_MIDDLEBOX, '-', \
-            "Disable TLSv1.3 middlebox compat mode" }, \
-        {"no_etm", OPT_S_NO_ETM, '-', \
-            "Disable Encrypt-then-Mac extension"}, \
-        {"no_ems", OPT_S_NO_EMS, '-', \
-            "Disable Extended master secret extension"}
-
-# define OPT_S_CASES \
-        OPT_S__FIRST: case OPT_S__LAST: break; \
-        case OPT_S_NOSSL3: \
-        case OPT_S_NOTLS1: \
-        case OPT_S_NOTLS1_1: \
-        case OPT_S_NOTLS1_2: \
-        case OPT_S_NOTLS1_3: \
-        case OPT_S_BUGS: \
-        case OPT_S_NO_COMP: \
-        case OPT_S_COMP: \
-        case OPT_S_NO_TX_CERT_COMP: \
-        case OPT_S_NO_RX_CERT_COMP: \
-        case OPT_S_NOTICKET: \
-        case OPT_S_SERVERPREF: \
-        case OPT_S_LEGACYRENEG: \
-        case OPT_S_CLIENTRENEG: \
-        case OPT_S_LEGACYCONN: \
-        case OPT_S_ONRESUMP: \
-        case OPT_S_NOLEGACYCONN: \
-        case OPT_S_ALLOW_NO_DHE_KEX: \
-        case OPT_S_PREFER_NO_DHE_KEX: \
-        case OPT_S_PRIORITIZE_CHACHA: \
-        case OPT_S_STRICT: \
-        case OPT_S_SIGALGS: \
-        case OPT_S_CLIENTSIGALGS: \
-        case OPT_S_GROUPS: \
-        case OPT_S_CURVES: \
-        case OPT_S_NAMEDCURVE: \
-        case OPT_S_CIPHER: \
-        case OPT_S_CIPHERSUITES: \
-        case OPT_S_RECORD_PADDING: \
-        case OPT_S_NO_RENEGOTIATION: \
-        case OPT_S_MINPROTO: \
-        case OPT_S_MAXPROTO: \
-        case OPT_S_DEBUGBROKE: \
-        case OPT_S_NO_MIDDLEBOX: \
-        case OPT_S_NO_ETM: \
-        case OPT_S_NO_EMS
-
-#define IS_NO_PROT_FLAG(o) \
- (o == OPT_S_NOSSL3 || o == OPT_S_NOTLS1 || o == OPT_S_NOTLS1_1 \
-  || o == OPT_S_NOTLS1_2 || o == OPT_S_NOTLS1_3)
+#define OPT_S_ENUM                                                    \
+    OPT_S__FIRST = 3000,                                              \
+    OPT_S_NOSSL3, OPT_S_NOTLS1, OPT_S_NOTLS1_1, OPT_S_NOTLS1_2,       \
+    OPT_S_NOTLS1_3, OPT_S_BUGS, OPT_S_NO_COMP, OPT_S_NOTICKET,        \
+    OPT_S_SERVERPREF, OPT_S_LEGACYRENEG, OPT_S_CLIENTRENEG,           \
+    OPT_S_LEGACYCONN,                                                 \
+    OPT_S_ONRESUMP, OPT_S_NOLEGACYCONN,                               \
+    OPT_S_ALLOW_NO_DHE_KEX, OPT_S_PREFER_NO_DHE_KEX,                  \
+    OPT_S_PRIORITIZE_CHACHA,                                          \
+    OPT_S_STRICT, OPT_S_SIGALGS, OPT_S_CLIENTSIGALGS, OPT_S_GROUPS,   \
+    OPT_S_CURVES, OPT_S_NAMEDCURVE, OPT_S_CIPHER, OPT_S_CIPHERSUITES, \
+    OPT_S_RECORD_PADDING, OPT_S_DEBUGBROKE, OPT_S_COMP,               \
+    OPT_S_MINPROTO, OPT_S_MAXPROTO,                                   \
+    OPT_S_NO_RENEGOTIATION, OPT_S_NO_MIDDLEBOX, OPT_S_NO_ETM,         \
+    OPT_S_NO_EMS,                                                     \
+    OPT_S_NO_TX_CERT_COMP,                                            \
+    OPT_S_NO_RX_CERT_COMP,                                            \
+    OPT_S__LAST
+
+#define OPT_S_OPTIONS                                                                                           \
+    OPT_SECTION("TLS/SSL"),                                                                                     \
+        { "no_ssl3", OPT_S_NOSSL3, '-', "Just disable SSLv3" },                                                 \
+        { "no_tls1", OPT_S_NOTLS1, '-', "Just disable TLSv1" },                                                 \
+        { "no_tls1_1", OPT_S_NOTLS1_1, '-', "Just disable TLSv1.1" },                                           \
+        { "no_tls1_2", OPT_S_NOTLS1_2, '-', "Just disable TLSv1.2" },                                           \
+        { "no_tls1_3", OPT_S_NOTLS1_3, '-', "Just disable TLSv1.3" },                                           \
+        { "bugs", OPT_S_BUGS, '-', "Turn on SSL bug compatibility" },                                           \
+        { "no_comp", OPT_S_NO_COMP, '-', "Disable SSL/TLS compression (default)" },                             \
+        { "comp", OPT_S_COMP, '-', "Use SSL/TLS-level compression" },                                           \
+        { "no_tx_cert_comp", OPT_S_NO_TX_CERT_COMP, '-', "Disable sending TLSv1.3 compressed certificates" },   \
+        { "no_rx_cert_comp", OPT_S_NO_RX_CERT_COMP, '-', "Disable receiving TLSv1.3 compressed certificates" }, \
+        { "no_ticket", OPT_S_NOTICKET, '-',                                                                     \
+            "Disable use of TLS session tickets" },                                                             \
+        { "serverpref", OPT_S_SERVERPREF, '-', "Use server's cipher preferences" },                             \
+        { "legacy_renegotiation", OPT_S_LEGACYRENEG, '-',                                                       \
+            "Enable use of legacy renegotiation (dangerous)" },                                                 \
+        { "client_renegotiation", OPT_S_CLIENTRENEG, '-',                                                       \
+            "Allow client-initiated renegotiation" },                                                           \
+        { "no_renegotiation", OPT_S_NO_RENEGOTIATION, '-',                                                      \
+            "Disable all renegotiation." },                                                                     \
+        { "legacy_server_connect", OPT_S_LEGACYCONN, '-',                                                       \
+            "Allow initial connection to servers that don't support RI" },                                      \
+        { "no_resumption_on_reneg", OPT_S_ONRESUMP, '-',                                                        \
+            "Disallow session resumption on renegotiation" },                                                   \
+        { "no_legacy_server_connect", OPT_S_NOLEGACYCONN, '-',                                                  \
+            "Disallow initial connection to servers that don't support RI" },                                   \
+        { "allow_no_dhe_kex", OPT_S_ALLOW_NO_DHE_KEX, '-',                                                      \
+            "In TLSv1.3 allow non-(ec)dhe based key exchange on resumption" },                                  \
+        { "prefer_no_dhe_kex", OPT_S_PREFER_NO_DHE_KEX, '-',                                                    \
+            "In TLSv1.3 prefer non-(ec)dhe over (ec)dhe-based key exchange on resumption" },                    \
+        { "prioritize_chacha", OPT_S_PRIORITIZE_CHACHA, '-',                                                    \
+            "Prioritize ChaCha ciphers when preferred by clients" },                                            \
+        { "strict", OPT_S_STRICT, '-',                                                                          \
+            "Enforce strict certificate checks as per TLS standard" },                                          \
+        { "sigalgs", OPT_S_SIGALGS, 's',                                                                        \
+            "Signature algorithms to support (colon-separated list)" },                                         \
+        { "client_sigalgs", OPT_S_CLIENTSIGALGS, 's',                                                           \
+            "Signature algorithms to support for client certificate"                                            \
+            " authentication (colon-separated list)" },                                                         \
+        { "groups", OPT_S_GROUPS, 's',                                                                          \
+            "Groups to advertise (colon-separated list)" },                                                     \
+        { "curves", OPT_S_CURVES, 's',                                                                          \
+            "Groups to advertise (colon-separated list)" },                                                     \
+        { "named_curve", OPT_S_NAMEDCURVE, 's',                                                                 \
+            "Elliptic curve used for ECDHE (server-side only)" },                                               \
+        { "cipher", OPT_S_CIPHER, 's', "Specify TLSv1.2 and below cipher list to be used" },                    \
+        { "ciphersuites", OPT_S_CIPHERSUITES, 's', "Specify TLSv1.3 ciphersuites to be used" },                 \
+        { "min_protocol", OPT_S_MINPROTO, 's', "Specify the minimum protocol version to be used" },             \
+        { "max_protocol", OPT_S_MAXPROTO, 's', "Specify the maximum protocol version to be used" },             \
+        { "record_padding", OPT_S_RECORD_PADDING, 's',                                                          \
+            "Block size to pad TLS 1.3 records to." },                                                          \
+        { "debug_broken_protocol", OPT_S_DEBUGBROKE, '-',                                                       \
+            "Perform all sorts of protocol violations for testing purposes" },                                  \
+        { "no_middlebox", OPT_S_NO_MIDDLEBOX, '-',                                                              \
+            "Disable TLSv1.3 middlebox compat mode" },                                                          \
+        { "no_etm", OPT_S_NO_ETM, '-',                                                                          \
+            "Disable Encrypt-then-Mac extension" },                                                             \
+        { "no_ems", OPT_S_NO_EMS, '-',                                                                          \
+            "Disable Extended master secret extension" }
+
+#define OPT_S_CASES               \
+    OPT_S__FIRST:                 \
+    case OPT_S__LAST:             \
+    break;                        \
+    case OPT_S_NOSSL3:            \
+    case OPT_S_NOTLS1:            \
+    case OPT_S_NOTLS1_1:          \
+    case OPT_S_NOTLS1_2:          \
+    case OPT_S_NOTLS1_3:          \
+    case OPT_S_BUGS:              \
+    case OPT_S_NO_COMP:           \
+    case OPT_S_COMP:              \
+    case OPT_S_NO_TX_CERT_COMP:   \
+    case OPT_S_NO_RX_CERT_COMP:   \
+    case OPT_S_NOTICKET:          \
+    case OPT_S_SERVERPREF:        \
+    case OPT_S_LEGACYRENEG:       \
+    case OPT_S_CLIENTRENEG:       \
+    case OPT_S_LEGACYCONN:        \
+    case OPT_S_ONRESUMP:          \
+    case OPT_S_NOLEGACYCONN:      \
+    case OPT_S_ALLOW_NO_DHE_KEX:  \
+    case OPT_S_PREFER_NO_DHE_KEX: \
+    case OPT_S_PRIORITIZE_CHACHA: \
+    case OPT_S_STRICT:            \
+    case OPT_S_SIGALGS:           \
+    case OPT_S_CLIENTSIGALGS:     \
+    case OPT_S_GROUPS:            \
+    case OPT_S_CURVES:            \
+    case OPT_S_NAMEDCURVE:        \
+    case OPT_S_CIPHER:            \
+    case OPT_S_CIPHERSUITES:      \
+    case OPT_S_RECORD_PADDING:    \
+    case OPT_S_NO_RENEGOTIATION:  \
+    case OPT_S_MINPROTO:          \
+    case OPT_S_MAXPROTO:          \
+    case OPT_S_DEBUGBROKE:        \
+    case OPT_S_NO_MIDDLEBOX:      \
+    case OPT_S_NO_ETM:            \
+    case OPT_S_NO_EMS
+
+#define IS_NO_PROT_FLAG(o)                                         \
+    (o == OPT_S_NOSSL3 || o == OPT_S_NOTLS1 || o == OPT_S_NOTLS1_1 \
+        || o == OPT_S_NOTLS1_2 || o == OPT_S_NOTLS1_3)
 
 /*
  * Random state options.
  */
-# define OPT_R_ENUM \
-        OPT_R__FIRST=1500, OPT_R_RAND, OPT_R_WRITERAND, OPT_R__LAST
+#define OPT_R_ENUM \
+    OPT_R__FIRST = 1500, OPT_R_RAND, OPT_R_WRITERAND, OPT_R__LAST
 
-# define OPT_R_OPTIONS \
-    OPT_SECTION("Random state"), \
-    {"rand", OPT_R_RAND, 's', "Load the given file(s) into the random number generator"}, \
-    {"writerand", OPT_R_WRITERAND, '>', "Write random data to the specified file"}
+#define OPT_R_OPTIONS                                                                           \
+    OPT_SECTION("Random state"),                                                                \
+        { "rand", OPT_R_RAND, 's', "Load the given file(s) into the random number generator" }, \
+        { "writerand", OPT_R_WRITERAND, '>', "Write random data to the specified file" }
 
-# define OPT_R_CASES \
-        OPT_R__FIRST: case OPT_R__LAST: break; \
-        case OPT_R_RAND: case OPT_R_WRITERAND
+#define OPT_R_CASES   \
+    OPT_R__FIRST:     \
+    case OPT_R__LAST: \
+    break;            \
+    case OPT_R_RAND:  \
+    case OPT_R_WRITERAND
 
 /*
  * Provider options.
  */
-# define OPT_PROV_ENUM \
-        OPT_PROV__FIRST=1600, \
-        OPT_PROV_PROVIDER, OPT_PROV_PROVIDER_PATH, OPT_PROV_PROPQUERY, \
-        OPT_PROV_PARAM, \
-        OPT_PROV__LAST
+#define OPT_PROV_ENUM                                              \
+    OPT_PROV__FIRST = 1600,                                        \
+    OPT_PROV_PROVIDER, OPT_PROV_PROVIDER_PATH, OPT_PROV_PROPQUERY, \
+    OPT_PROV_PARAM,                                                \
+    OPT_PROV__LAST
 
-# define OPT_CONFIG_OPTION \
-        { "config", OPT_CONFIG, '<', "Load a configuration file (this may load modules)" }
+#define OPT_CONFIG_OPTION \
+    { "config", OPT_CONFIG, '<', "Load a configuration file (this may load modules)" }
 
-# define OPT_PROV_OPTIONS \
-        OPT_SECTION("Provider"), \
+#define OPT_PROV_OPTIONS                                                                                                         \
+    OPT_SECTION("Provider"),                                                                                                     \
         { "provider-path", OPT_PROV_PROVIDER_PATH, 's', "Provider load path (must be before 'provider' argument if required)" }, \
-        { "provider", OPT_PROV_PROVIDER, 's', "Provider to load (can be specified multiple times)" }, \
-        { "provparam", OPT_PROV_PARAM, 's', "Set a provider key-value parameter" }, \
+        { "provider", OPT_PROV_PROVIDER, 's', "Provider to load (can be specified multiple times)" },                            \
+        { "provparam", OPT_PROV_PARAM, 's', "Set a provider key-value parameter" },                                              \
         { "propquery", OPT_PROV_PROPQUERY, 's', "Property query used when fetching algorithms" }
 
-# define OPT_PROV_CASES \
-        OPT_PROV__FIRST: case OPT_PROV__LAST: break; \
-        case OPT_PROV_PROVIDER: \
-        case OPT_PROV_PROVIDER_PATH: \
-        case OPT_PROV_PARAM: \
-        case OPT_PROV_PROPQUERY
+#define OPT_PROV_CASES           \
+    OPT_PROV__FIRST:             \
+    case OPT_PROV__LAST:         \
+    break;                       \
+    case OPT_PROV_PROVIDER:      \
+    case OPT_PROV_PROVIDER_PATH: \
+    case OPT_PROV_PARAM:         \
+    case OPT_PROV_PROPQUERY
 
 /*
  * Option parsing.
@@ -367,27 +378,24 @@ typedef struct string_int_pair_st {
 } OPT_PAIR, STRINT_PAIR;
 
 /* Flags to pass into opt_format; see FORMAT_xxx, below. */
-# define OPT_FMT_PEM             (1L <<  1)
-# define OPT_FMT_DER             (1L <<  2)
-# define OPT_FMT_B64             (1L <<  3)
-# define OPT_FMT_PKCS12          (1L <<  4)
-# define OPT_FMT_SMIME           (1L <<  5)
-# define OPT_FMT_ENGINE          (1L <<  6)
-# define OPT_FMT_MSBLOB          (1L <<  7)
-# define OPT_FMT_NSS             (1L <<  8)
-# define OPT_FMT_TEXT            (1L <<  9)
-# define OPT_FMT_HTTP            (1L << 10)
-# define OPT_FMT_PVK             (1L << 11)
-
-# define OPT_FMT_PEMDER  (OPT_FMT_PEM | OPT_FMT_DER)
-# define OPT_FMT_ASN1    (OPT_FMT_PEM | OPT_FMT_DER | OPT_FMT_B64)
-# define OPT_FMT_PDE     (OPT_FMT_PEMDER | OPT_FMT_ENGINE)
-# define OPT_FMT_PDS     (OPT_FMT_PEMDER | OPT_FMT_SMIME)
-# define OPT_FMT_ANY     ( \
-        OPT_FMT_PEM | OPT_FMT_DER | OPT_FMT_B64 | \
-        OPT_FMT_PKCS12 | OPT_FMT_SMIME |                     \
-        OPT_FMT_ENGINE | OPT_FMT_MSBLOB | OPT_FMT_NSS | \
-        OPT_FMT_TEXT | OPT_FMT_HTTP | OPT_FMT_PVK)
+#define OPT_FMT_PEM (1L << 1)
+#define OPT_FMT_DER (1L << 2)
+#define OPT_FMT_B64 (1L << 3)
+#define OPT_FMT_PKCS12 (1L << 4)
+#define OPT_FMT_SMIME (1L << 5)
+#define OPT_FMT_ENGINE (1L << 6)
+#define OPT_FMT_MSBLOB (1L << 7)
+#define OPT_FMT_NSS (1L << 8)
+#define OPT_FMT_TEXT (1L << 9)
+#define OPT_FMT_HTTP (1L << 10)
+#define OPT_FMT_PVK (1L << 11)
+
+#define OPT_FMT_PEMDER (OPT_FMT_PEM | OPT_FMT_DER)
+#define OPT_FMT_ASN1 (OPT_FMT_PEM | OPT_FMT_DER | OPT_FMT_B64)
+#define OPT_FMT_PDE (OPT_FMT_PEMDER | OPT_FMT_ENGINE)
+#define OPT_FMT_PDS (OPT_FMT_PEMDER | OPT_FMT_SMIME)
+#define OPT_FMT_ANY ( \
+    OPT_FMT_PEM | OPT_FMT_DER | OPT_FMT_B64 | OPT_FMT_PKCS12 | OPT_FMT_SMIME | OPT_FMT_ENGINE | OPT_FMT_MSBLOB | OPT_FMT_NSS | OPT_FMT_TEXT | OPT_FMT_HTTP | OPT_FMT_PVK)
 
 /* Divide options into sections when displaying usage */
 #define OPT_SECTION(sec) { OPT_SECTION_STR, 1, '-', sec " options:\n" }
@@ -440,5 +448,4 @@ int opt_check_rest_arg(const char *expected);
 /* Returns non-zero if legacy paths are still available */
 int opt_legacy_okay(void);
 
-
 #endif /* OSSL_APPS_OPT_H */
diff --git a/apps/include/platform.h b/apps/include/platform.h
index 62fc99c5fd7a3..ec12a41af7c73 100644
--- a/apps/include/platform.h
+++ b/apps/include/platform.h
@@ -8,25 +8,25 @@
  */
 
 #ifndef OSSL_APPS_PLATFORM_H
-# define OSSL_APPS_PLATFORM_H
+#define OSSL_APPS_PLATFORM_H
 
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
 
-# if defined(OPENSSL_SYS_VMS) && defined(__DECC)
+#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
 /*
  * VMS C only for now, implemented in vms_decc_init.c
  * If other C compilers forget to terminate argv with NULL, this function
  * can be reused.
  */
 char **copy_argv(int *argc, char *argv[]);
-# endif
+#endif
 
-# ifdef _WIN32
+#ifdef _WIN32
 /*
  * Win32-specific argv initialization that splits OS-supplied UNICODE
  * command line string to array of UTF8-encoded strings.
  */
 void win32_utf8argv(int *argc, char **argv[]);
-# endif
+#endif
 
 #endif
diff --git a/apps/include/s_apps.h b/apps/include/s_apps.h
index 33c3b6278c823..c6a9a890c21d3 100644
--- a/apps/include/s_apps.h
+++ b/apps/include/s_apps.h
@@ -12,8 +12,8 @@
 #include <openssl/ssl.h>
 #include <openssl/srp.h>
 
-#define PORT            "4433"
-#define PROTOCOL        "tcp"
+#define PORT "4433"
+#define PROTOCOL "tcp"
 
 #define SSL_VERSION_ALLOWS_RENEGOTIATION(s) \
     (SSL_is_dtls(s) || (SSL_version(s) < TLS1_3_VERSION))
@@ -22,48 +22,48 @@ typedef int (*do_server_cb)(int s, int stype, int prot, unsigned char *context);
 void get_sock_info_address(int asock, char **hostname, char **service);
 int report_server_accept(BIO *out, int asock, int with_address, int with_pid);
 int do_server(int *accept_sock, const char *host, const char *port,
-              int family, int type, int protocol, do_server_cb cb,
-              unsigned char *context, int naccept, BIO *bio_s_out,
-              int tfo);
+    int family, int type, int protocol, do_server_cb cb,
+    unsigned char *context, int naccept, BIO *bio_s_out,
+    int tfo);
 int verify_callback(int ok, X509_STORE_CTX *ctx);
 
 int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
 int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key,
-                       STACK_OF(X509) *chain, int build_chain);
+    STACK_OF(X509) *chain, int build_chain);
 int ssl_print_sigalgs(BIO *out, SSL *s);
 int ssl_print_point_formats(BIO *out, SSL *s);
 int ssl_print_groups(BIO *out, SSL *s, int noshared);
 int ssl_print_tmp_key(BIO *out, SSL *s);
 int init_client(int *sock, const char *host, const char *port,
-                const char *bindhost, const char *bindport,
-                int family, int type, int protocol, int tfo, int doconn,
-                BIO_ADDR **ba_ret);
+    const char *bindhost, const char *bindport,
+    int family, int type, int protocol, int tfo, int doconn,
+    BIO_ADDR **ba_ret);
 int should_retry(int i);
 void do_ssl_shutdown(SSL *ssl);
 
 long bio_dump_callback(BIO *bio, int cmd, const char *argp, size_t len,
-                       int argi, long argl, int ret, size_t *processed);
+    int argi, long argl, int ret, size_t *processed);
 
 void apps_ssl_info_callback(const SSL *s, int where, int ret);
 void msg_cb(int write_p, int version, int content_type, const void *buf,
-            size_t len, SSL *ssl, void *arg);
+    size_t len, SSL *ssl, void *arg);
 void tlsext_cb(SSL *s, int client_server, int type, const unsigned char *data,
-               int len, void *arg);
+    int len, void *arg);
 
 int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
-                             unsigned int *cookie_len);
+    unsigned int *cookie_len);
 int verify_cookie_callback(SSL *ssl, const unsigned char *cookie,
-                           unsigned int cookie_len);
+    unsigned int cookie_len);
 
-#ifdef __VMS                     /* 31 char symbol name limit */
-# define generate_stateless_cookie_callback      generate_stateless_cookie_cb
-# define verify_stateless_cookie_callback        verify_stateless_cookie_cb
+#ifdef __VMS /* 31 char symbol name limit */
+#define generate_stateless_cookie_callback generate_stateless_cookie_cb
+#define verify_stateless_cookie_callback verify_stateless_cookie_cb
 #endif
 
 int generate_stateless_cookie_callback(SSL *ssl, unsigned char *cookie,
-                                       size_t *cookie_len);
+    size_t *cookie_len);
 int verify_stateless_cookie_callback(SSL *ssl, const unsigned char *cookie,
-                                     size_t cookie_len);
+    size_t cookie_len);
 
 typedef struct ssl_excert_st SSL_EXCERT;
 
@@ -75,12 +75,12 @@ void print_verify_detail(SSL *s, BIO *bio);
 void print_ssl_summary(SSL *s);
 int config_ctx(SSL_CONF_CTX *cctx, STACK_OF(OPENSSL_STRING) *str, SSL_CTX *ctx);
 int ssl_ctx_add_crls(SSL_CTX *ctx, STACK_OF(X509_CRL) *crls,
-                     int crl_download);
+    int crl_download);
 int ssl_load_stores(SSL_CTX *ctx, const char *vfyCApath,
-                    const char *vfyCAfile, const char *vfyCAstore,
-                    const char *chCApath, const char *chCAfile,
-                    const char *chCAstore, STACK_OF(X509_CRL) *crls,
-                    int crl_download);
+    const char *vfyCAfile, const char *vfyCAstore,
+    const char *chCApath, const char *chCAfile,
+    const char *chCAstore, STACK_OF(X509_CRL) *crls,
+    int crl_download);
 void ssl_ctx_security_debug(SSL_CTX *ctx, int verbose);
 int set_keylog_file(SSL_CTX *ctx, const char *keylog_file);
 void print_ca_names(BIO *bio, SSL *s);
@@ -91,14 +91,14 @@ void ssl_print_secure_renegotiation_notes(BIO *bio, SSL *s);
 typedef struct srp_arg_st {
     char *srppassin;
     char *srplogin;
-    int msg;                    /* copy from c_msg */
-    int debug;                  /* copy from c_debug */
-    int amp;                    /* allow more groups */
-    int strength;               /* minimal size for N */
+    int msg; /* copy from c_msg */
+    int debug; /* copy from c_debug */
+    int amp; /* allow more groups */
+    int strength; /* minimal size for N */
 } SRP_ARG;
 
 int set_up_srp_arg(SSL_CTX *ctx, SRP_ARG *srp_arg, int srp_lateuser, int c_msg,
-                   int c_debug);
+    int c_debug);
 void set_up_dummy_srp(SSL_CTX *ctx);
 
 /* The server side SRP context that we pass to all SRP related callbacks */
@@ -109,6 +109,6 @@ typedef struct srpsrvparm_st {
 } srpsrvparm;
 
 int set_up_srp_verifier_file(SSL_CTX *ctx, srpsrvparm *srp_callback_parm,
-                             char *srpuserseed, char *srp_verifier_file);
+    char *srpuserseed, char *srp_verifier_file);
 void lookup_srp_user(srpsrvparm *srp_callback_parm, BIO *bio_s_out);
 #endif /* OPENSSL_NO_SRP */
diff --git a/apps/include/vms_term_sock.h b/apps/include/vms_term_sock.h
index eae37b1af931f..6e0cda9a30013 100644
--- a/apps/include/vms_term_sock.h
+++ b/apps/include/vms_term_sock.h
@@ -9,23 +9,23 @@
  */
 
 #ifndef OSSL_APPS_VMS_TERM_SOCK_H
-# define OSSL_APPS_VMS_TERM_SOCK_H
+#define OSSL_APPS_VMS_TERM_SOCK_H
 
 /*
 ** Terminal Socket Function Codes
 */
-# define TERM_SOCK_CREATE       1
-# define TERM_SOCK_DELETE       2
+#define TERM_SOCK_CREATE 1
+#define TERM_SOCK_DELETE 2
 
 /*
 ** Terminal Socket Status Codes
 */
-# define TERM_SOCK_FAILURE      0
-# define TERM_SOCK_SUCCESS      1
+#define TERM_SOCK_FAILURE 0
+#define TERM_SOCK_SUCCESS 1
 
 /*
 ** Terminal Socket Prototype
 */
-int TerminalSocket (int FunctionCode, int *ReturnSocket);
+int TerminalSocket(int FunctionCode, int *ReturnSocket);
 
 #endif
diff --git a/apps/info.c b/apps/info.c
index 5a469eed9695d..779a02937d9ab 100644
--- a/apps/info.c
+++ b/apps/info.c
@@ -13,27 +13,34 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_CONFIGDIR, OPT_ENGINESDIR, OPT_MODULESDIR, OPT_DSOEXT, OPT_DIRNAMESEP,
-    OPT_LISTSEP, OPT_SEEDS, OPT_CPUSETTINGS, OPT_WINDOWSCONTEXT
+    OPT_CONFIGDIR,
+    OPT_ENGINESDIR,
+    OPT_MODULESDIR,
+    OPT_DSOEXT,
+    OPT_DIRNAMESEP,
+    OPT_LISTSEP,
+    OPT_SEEDS,
+    OPT_CPUSETTINGS,
+    OPT_WINDOWSCONTEXT
 } OPTION_CHOICE;
 
 const OPTIONS info_options[] = {
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 
     OPT_SECTION("Output"),
-    {"configdir", OPT_CONFIGDIR, '-', "Default configuration file directory"},
-    {"enginesdir", OPT_ENGINESDIR, '-', "Default engine module directory"},
-    {"modulesdir", OPT_MODULESDIR, '-',
-     "Default module directory (other than engine modules)"},
-    {"dsoext", OPT_DSOEXT, '-', "Configured extension for modules"},
-    {"dirnamesep", OPT_DIRNAMESEP, '-', "Directory-filename separator"},
-    {"listsep", OPT_LISTSEP, '-', "List separator character"},
-    {"seeds", OPT_SEEDS, '-', "Seed sources"},
-    {"cpusettings", OPT_CPUSETTINGS, '-', "CPU settings info"},
-    {"windowscontext", OPT_WINDOWSCONTEXT, '-', "Windows install context"},
-    {NULL}
+    { "configdir", OPT_CONFIGDIR, '-', "Default configuration file directory" },
+    { "enginesdir", OPT_ENGINESDIR, '-', "Default engine module directory" },
+    { "modulesdir", OPT_MODULESDIR, '-',
+        "Default module directory (other than engine modules)" },
+    { "dsoext", OPT_DSOEXT, '-', "Configured extension for modules" },
+    { "dirnamesep", OPT_DIRNAMESEP, '-', "Directory-filename separator" },
+    { "listsep", OPT_LISTSEP, '-', "List separator character" },
+    { "seeds", OPT_SEEDS, '-', "Seed sources" },
+    { "cpusettings", OPT_CPUSETTINGS, '-', "CPU settings info" },
+    { "windowscontext", OPT_WINDOWSCONTEXT, '-', "Windows install context" },
+    { NULL }
 };
 
 int info_main(int argc, char **argv)
@@ -47,7 +54,7 @@ int info_main(int argc, char **argv)
     while ((o = opt_next()) != OPT_EOF) {
         switch (o) {
         default:
-opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -106,6 +113,6 @@ int info_main(int argc, char **argv)
     typedata = OPENSSL_info(type);
     BIO_printf(bio_out, "%s\n", typedata == NULL ? "Undefined" : typedata);
     ret = 0;
- end:
+end:
     return ret;
 }
diff --git a/apps/kdf.c b/apps/kdf.c
index 89ee1f69c7669..222979f7a97f9 100644
--- a/apps/kdf.c
+++ b/apps/kdf.c
@@ -19,37 +19,42 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_KDFOPT, OPT_BIN, OPT_KEYLEN, OPT_OUT,
-    OPT_CIPHER, OPT_DIGEST, OPT_MAC,
+    OPT_KDFOPT,
+    OPT_BIN,
+    OPT_KEYLEN,
+    OPT_OUT,
+    OPT_CIPHER,
+    OPT_DIGEST,
+    OPT_MAC,
     OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS kdf_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] kdf_name\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] kdf_name\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"kdfopt", OPT_KDFOPT, 's', "KDF algorithm control parameters in n:v form"},
-    {"cipher", OPT_CIPHER, 's', "Cipher"},
-    {"digest", OPT_DIGEST, 's', "Digest"},
-    {"mac", OPT_MAC, 's', "MAC"},
-    {OPT_MORE_STR, 1, '-', "See 'Supported Controls' in the EVP_KDF_ docs\n"},
-    {"keylen", OPT_KEYLEN, 's', "The size of the output derived key"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "kdfopt", OPT_KDFOPT, 's', "KDF algorithm control parameters in n:v form" },
+    { "cipher", OPT_CIPHER, 's', "Cipher" },
+    { "digest", OPT_DIGEST, 's', "Digest" },
+    { "mac", OPT_MAC, 's', "MAC" },
+    { OPT_MORE_STR, 1, '-', "See 'Supported Controls' in the EVP_KDF_ docs\n" },
+    { "keylen", OPT_KEYLEN, 's', "The size of the output derived key" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output to filename rather than stdout"},
-    {"binary", OPT_BIN, '-',
-        "Output in binary format (default is hexadecimal)"},
+    { "out", OPT_OUT, '>', "Output to filename rather than stdout" },
+    { "binary", OPT_BIN, '-',
+        "Output in binary format (default is hexadecimal)" },
 
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"kdf_name", 0, 0, "Name of the KDF algorithm"},
-    {NULL}
+    { "kdf_name", 0, 0, "Name of the KDF algorithm" },
+    { NULL }
 };
 
 static char *alloc_kdf_algorithm_name(STACK_OF(OPENSSL_STRING) **optp,
-                                      const char *name, const char *arg)
+    const char *name, const char *arg)
 {
     size_t len = strlen(name) + strlen(arg) + 2;
     char *res;
@@ -85,7 +90,7 @@ int kdf_main(int argc, char **argv)
     while ((o = opt_next()) != OPT_EOF) {
         switch (o) {
         default:
-opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto err;
         case OPT_HELP:
@@ -139,7 +144,8 @@ int kdf_main(int argc, char **argv)
         goto opthelp;
 
     if ((kdf = EVP_KDF_fetch(app_get0_libctx(), argv[0],
-                             app_get0_propq())) == NULL) {
+             app_get0_propq()))
+        == NULL) {
         BIO_printf(bio_err, "Invalid KDF name %s\n", argv[0]);
         goto opthelp;
     }
@@ -150,8 +156,7 @@ int kdf_main(int argc, char **argv)
 
     if (opts != NULL) {
         int ok = 1;
-        OSSL_PARAM *params =
-            app_params_new_from_opts(opts, EVP_KDF_settable_ctx_params(kdf));
+        OSSL_PARAM *params = app_params_new_from_opts(opts, EVP_KDF_settable_ctx_params(kdf));
 
         if (params == NULL)
             goto err;
diff --git a/apps/lib/app_libctx.c b/apps/lib/app_libctx.c
index 2f68cb0a75ea2..fb26e8e4874e1 100644
--- a/apps/lib/app_libctx.c
+++ b/apps/lib/app_libctx.c
@@ -45,4 +45,3 @@ OSSL_LIB_CTX *app_create_libctx(void)
         opt_printf_stderr("Failed to create library context\n");
     return app_libctx;
 }
-
diff --git a/apps/lib/app_params.c b/apps/lib/app_params.c
index 95e1298ee9269..a428afe8f38ff 100644
--- a/apps/lib/app_params.c
+++ b/apps/lib/app_params.c
@@ -63,7 +63,7 @@ static int describe_param_type(char *buf, size_t bufsz, const OSSL_PARAM *param)
         printed_len = BIO_snprintf(buf, bufsz, " (arbitrary size)");
     else
         printed_len = BIO_snprintf(buf, bufsz, " (max %zu bytes large)",
-                                   param->data_size);
+            param->data_size);
     if (printed_len > 0) {
         buf += printed_len;
         bufsz -= printed_len;
@@ -85,7 +85,7 @@ int print_param_types(const char *thing, const OSSL_PARAM *pdefs, int indent)
     } else {
         BIO_printf(bio_out, "%*s%s:\n", indent, "", thing);
         for (; pdefs->key != NULL; pdefs++) {
-            char buf[200];       /* This should be ample space */
+            char buf[200]; /* This should be ample space */
 
             describe_param_type(buf, sizeof(buf), pdefs);
             BIO_printf(bio_out, "%*s  %s\n", indent, "", buf);
@@ -125,8 +125,7 @@ void print_param_value(const OSSL_PARAM *p, int indent)
         break;
     default:
         BIO_printf(bio_out, "unknown type (%u) of %zu bytes\n",
-                   p->data_type, p->data_size);
+            p->data_type, p->data_size);
         break;
     }
 }
-
diff --git a/apps/lib/app_provider.c b/apps/lib/app_provider.c
index 52fa4d618c408..6986ab4c10735 100644
--- a/apps/lib/app_provider.c
+++ b/apps/lib/app_provider.c
@@ -39,7 +39,7 @@ int app_provider_load(OSSL_LIB_CTX *libctx, const char *provider_name)
     if (prov == NULL) {
         opt_printf_stderr("%s: unable to load provider %s\n"
                           "Hint: use -provider-path option or OPENSSL_MODULES environment variable.\n",
-                          opt_getprog(), provider_name);
+            opt_getprog(), provider_name);
         ERR_print_errors(bio_err);
         return 0;
     }
@@ -92,7 +92,7 @@ static int opt_provider_param(const char *arg)
     if ((copy = OPENSSL_strdup(arg)) == NULL
         || (p.val = strchr(copy, '=')) == NULL) {
         opt_printf_stderr("%s: malformed '-provparam' option value: '%s'\n",
-                          opt_getprog(), arg);
+            opt_getprog(), arg);
         goto end;
     }
 
@@ -118,7 +118,7 @@ static int opt_provider_param(const char *arg)
     /* The key must not be empty */
     if (*p.key == '\0') {
         opt_printf_stderr("%s: malformed '-provparam' option value: '%s'\n",
-                          opt_getprog(), arg);
+            opt_getprog(), arg);
         goto end;
     }
 
@@ -126,14 +126,14 @@ static int opt_provider_param(const char *arg)
     ret = OSSL_PROVIDER_do_all(app_get0_libctx(), set_prov_param, (void *)&p);
     if (ret == 0) {
         opt_printf_stderr("%s: Error setting provider '%s' parameter '%s'\n",
-                          opt_getprog(), p.name, p.key);
+            opt_getprog(), p.name, p.key);
     } else if (p.found == 0) {
         opt_printf_stderr("%s: No provider named '%s' is loaded\n",
-                          opt_getprog(), p.name);
+            opt_getprog(), p.name);
         ret = 0;
     }
 
-  end:
+end:
     OPENSSL_free(copy);
     return ret;
 }
diff --git a/apps/lib/app_rand.c b/apps/lib/app_rand.c
index 64d0f9b309101..061211a0b64e8 100644
--- a/apps/lib/app_rand.c
+++ b/apps/lib/app_rand.c
@@ -89,11 +89,10 @@ int app_RAND_write(void)
         ret = 0;
     }
     OPENSSL_free(save_rand_file);
-    save_rand_file =  NULL;
+    save_rand_file = NULL;
     return ret;
 }
 
-
 /*
  * See comments in opt_verify for explanation of this.
  */
@@ -107,7 +106,7 @@ int opt_rand(int opt)
         break;
     case OPT_R_RAND:
         if (randfiles == NULL
-                && (randfiles = sk_OPENSSL_STRING_new_null()) == NULL)
+            && (randfiles = sk_OPENSSL_STRING_new_null()) == NULL)
             return 0;
         if (!sk_OPENSSL_STRING_push(randfiles, opt_arg()))
             return 0;
diff --git a/apps/lib/app_x509.c b/apps/lib/app_x509.c
index f2c22948f2016..11cb3fa342dc0 100644
--- a/apps/lib/app_x509.c
+++ b/apps/lib/app_x509.c
@@ -38,53 +38,51 @@ static int x509_ctrl(void *object, int cmd, void *value, size_t value_n)
 {
     switch (cmd) {
 #ifdef EVP_PKEY_CTRL_SET1_ID
-    case EVP_PKEY_CTRL_SET1_ID:
-        {
-            ASN1_OCTET_STRING *v = mk_octet_string(value, value_n);
-
-            if (v == NULL) {
-                BIO_printf(bio_err,
-                           "error: setting distinguishing ID in certificate failed\n");
-                return 0;
-            }
-
-            X509_set0_distinguishing_id(object, v);
-            return 1;
+    case EVP_PKEY_CTRL_SET1_ID: {
+        ASN1_OCTET_STRING *v = mk_octet_string(value, value_n);
+
+        if (v == NULL) {
+            BIO_printf(bio_err,
+                "error: setting distinguishing ID in certificate failed\n");
+            return 0;
         }
+
+        X509_set0_distinguishing_id(object, v);
+        return 1;
+    }
 #endif
     default:
         break;
     }
-    return -2;     /* typical EVP_PKEY return for "unsupported" */
+    return -2; /* typical EVP_PKEY return for "unsupported" */
 }
 
 static int x509_req_ctrl(void *object, int cmd, void *value, size_t value_n)
 {
     switch (cmd) {
 #ifdef EVP_PKEY_CTRL_SET1_ID
-    case EVP_PKEY_CTRL_SET1_ID:
-        {
-            ASN1_OCTET_STRING *v = mk_octet_string(value, value_n);
-
-            if (v == NULL) {
-                BIO_printf(bio_err,
-                           "error: setting distinguishing ID in certificate signing request failed\n");
-                return 0;
-            }
-
-            X509_REQ_set0_distinguishing_id(object, v);
-            return 1;
+    case EVP_PKEY_CTRL_SET1_ID: {
+        ASN1_OCTET_STRING *v = mk_octet_string(value, value_n);
+
+        if (v == NULL) {
+            BIO_printf(bio_err,
+                "error: setting distinguishing ID in certificate signing request failed\n");
+            return 0;
         }
+
+        X509_REQ_set0_distinguishing_id(object, v);
+        return 1;
+    }
 #endif
     default:
         break;
     }
-    return -2;     /* typical EVP_PKEY return for "unsupported" */
+    return -2; /* typical EVP_PKEY return for "unsupported" */
 }
 
 static int do_x509_ctrl_string(int (*ctrl)(void *object, int cmd,
-                                           void *value, size_t value_n),
-                               void *object, const char *value)
+                                   void *value, size_t value_n),
+    void *object, const char *value)
 {
     int rv = 0;
     char *stmp, *vtmp = NULL;
diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 9b2986c78b80e..74644157e5cae 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,13 +12,13 @@
  * On VMS, you need to define this to get the declaration of fileno().  The
  * value 2 is to make sure no function defined in POSIX-2 is left undefined.
  */
-# define _POSIX_C_SOURCE 2
+#define _POSIX_C_SOURCE 2
 #endif
 
 #ifndef OPENSSL_NO_ENGINE
 /* We need to use some deprecated APIs */
-# define OPENSSL_SUPPRESS_DEPRECATED
-# include <openssl/engine.h>
+#define OPENSSL_SUPPRESS_DEPRECATED
+#include <openssl/engine.h>
 #endif
 
 #include <stdio.h>
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <sys/types.h>
 #ifndef OPENSSL_NO_POSIX_IO
-# include <sys/stat.h>
-# include <fcntl.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #endif
 #include <ctype.h>
 #include <errno.h>
@@ -49,23 +49,24 @@
 #include "apps.h"
 
 #include "internal/sockets.h" /* for openssl_fdset() */
+#include "internal/numbers.h" /* for LONG_MAX */
 #include "internal/e_os.h"
 
 #ifdef _WIN32
 static int WIN32_rename(const char *from, const char *to);
-# define rename(from, to) WIN32_rename((from), (to))
+#define rename(from, to) WIN32_rename((from), (to))
 #endif
 
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
-# include <conio.h>
+#include <conio.h>
 #endif
 
 #if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32) || defined(__BORLANDC__)
-# define _kbhit kbhit
+#define _kbhit kbhit
 #endif
 
 static BIO *bio_open_default_(const char *filename, char mode, int format,
-                              int quiet);
+    int quiet);
 
 #define PASS_SOURCE_SIZE_MAX 4
 
@@ -78,60 +79,11 @@ typedef struct {
 } NAME_EX_TBL;
 
 static int set_table_opts(unsigned long *flags, const char *arg,
-                          const NAME_EX_TBL *in_tbl);
+    const NAME_EX_TBL *in_tbl);
 static int set_multi_opts(unsigned long *flags, const char *arg,
-                          const NAME_EX_TBL *in_tbl);
+    const NAME_EX_TBL *in_tbl);
 int app_init(long mesgwin);
 
-int chopup_args(ARGS *arg, char *buf)
-{
-    int quoted;
-    char c = '\0', *p = NULL;
-
-    arg->argc = 0;
-    if (arg->size == 0) {
-        arg->size = 20;
-        arg->argv = app_malloc(sizeof(*arg->argv) * arg->size, "argv space");
-    }
-
-    for (p = buf;;) {
-        /* Skip whitespace. */
-        while (*p && isspace(_UC(*p)))
-            p++;
-        if (*p == '\0')
-            break;
-
-        /* The start of something good :-) */
-        if (arg->argc >= arg->size) {
-            char **tmp;
-
-            arg->size += 20;
-            tmp = OPENSSL_realloc(arg->argv, sizeof(*arg->argv) * arg->size);
-            if (tmp == NULL)
-                return 0;
-            arg->argv = tmp;
-        }
-        quoted = *p == '\'' || *p == '"';
-        if (quoted)
-            c = *p++;
-        arg->argv[arg->argc++] = p;
-
-        /* now look for the end of this */
-        if (quoted) {
-            while (*p && *p != c)
-                p++;
-            *p++ = '\0';
-        } else {
-            while (*p && !isspace(_UC(*p)))
-                p++;
-            if (*p)
-                *p++ = '\0';
-        }
-    }
-    arg->argv[arg->argc] = NULL;
-    return 1;
-}
-
 #ifndef APP_INIT
 int app_init(long mesgwin)
 {
@@ -140,9 +92,9 @@ int app_init(long mesgwin)
 #endif
 
 int ctx_set_verify_locations(SSL_CTX *ctx,
-                             const char *CAfile, int noCAfile,
-                             const char *CApath, int noCApath,
-                             const char *CAstore, int noCAstore)
+    const char *CAfile, int noCAfile,
+    const char *CApath, int noCApath,
+    const char *CAstore, int noCAstore)
 {
     if (CAfile == NULL && CApath == NULL && CAstore == NULL) {
         if (!noCAfile && SSL_CTX_set_default_verify_file(ctx) <= 0)
@@ -191,12 +143,7 @@ int set_nameopt(const char *arg)
 
 unsigned long get_nameopt(void)
 {
-    return
-        nmflag_set ? nmflag : XN_FLAG_SEP_CPLUS_SPC | XN_FLAG_FN_SN
-                              | ASN1_STRFLGS_ESC_CTRL
-                              | ASN1_STRFLGS_UTF8_CONVERT
-                              | ASN1_STRFLGS_DUMP_UNKNOWN
-                              | ASN1_STRFLGS_DUMP_DER;
+    return nmflag_set ? nmflag : XN_FLAG_SEP_CPLUS_SPC | XN_FLAG_FN_SN | ASN1_STRFLGS_ESC_CTRL | ASN1_STRFLGS_UTF8_CONVERT | ASN1_STRFLGS_DUMP_UNKNOWN | ASN1_STRFLGS_DUMP_DER;
 }
 
 void dump_cert_text(BIO *out, X509 *x)
@@ -222,11 +169,11 @@ char *get_passwd(const char *pass, const char *desc)
         BIO_printf(bio_err, "Error getting password for %s\n", desc);
     if (pass != NULL && result == NULL) {
         BIO_printf(bio_err,
-                   "Trying plain input string (better precede with 'pass:')\n");
+            "Trying plain input string (better precede with 'pass:')\n");
         result = OPENSSL_strdup(pass);
         if (result == NULL)
             BIO_printf(bio_err,
-                       "Out of memory getting password for %s\n", desc);
+                "Out of memory getting password for %s\n", desc);
     }
     return result;
 }
@@ -319,12 +266,12 @@ static char *app_get_pass(const char *arg, int keepbio)
             tmp = strchr(arg, ':');
             if (tmp == NULL || tmp - arg > PASS_SOURCE_SIZE_MAX)
                 BIO_printf(bio_err,
-                           "Invalid password argument, missing ':' within the first %d chars\n",
-                           PASS_SOURCE_SIZE_MAX + 1);
+                    "Invalid password argument, missing ':' within the first %d chars\n",
+                    PASS_SOURCE_SIZE_MAX + 1);
             else
                 BIO_printf(bio_err,
-                           "Invalid password argument, starting with \"%.*s\"\n",
-                           (int)(tmp - arg + 1), arg);
+                    "Invalid password argument, starting with \"%.*s\"\n",
+                    (int)(tmp - arg + 1), arg);
             return NULL;
         }
     }
@@ -357,7 +304,7 @@ char *app_conf_try_string(const CONF *conf, const char *group, const char *name)
 }
 
 int app_conf_try_number(const CONF *conf, const char *group, const char *name,
-                        long *result)
+    long *result)
 {
     int ok;
 
@@ -385,7 +332,7 @@ CONF *app_load_config_bio(BIO *in, const char *filename)
         BIO_printf(bio_err, "%s: Can't load ", opt_getprog());
     } else {
         BIO_printf(bio_err, "%s: Error on line %ld of ", opt_getprog(),
-                   errorline);
+            errorline);
     }
     if (filename != NULL)
         BIO_printf(bio_err, "config file \"%s\"\n", filename);
@@ -460,7 +407,7 @@ int add_oid_section(CONF *conf)
         cnf = sk_CONF_VALUE_value(sktmp, i);
         if (OBJ_create(cnf->value, cnf->name, cnf->name) == NID_undef) {
             BIO_printf(bio_err, "problem creating object %s=%s\n",
-                       cnf->name, cnf->value);
+                cnf->name, cnf->value);
             return 0;
         }
     }
@@ -482,11 +429,11 @@ CONF *app_load_config_modules(const char *configfile)
     return conf;
 }
 
-#define IS_HTTP(uri) ((uri) != NULL  && HAS_PREFIX(uri, OSSL_HTTP_PREFIX))
+#define IS_HTTP(uri) ((uri) != NULL && HAS_PREFIX(uri, OSSL_HTTP_PREFIX))
 #define IS_HTTPS(uri) ((uri) != NULL && HAS_PREFIX(uri, OSSL_HTTPS_PREFIX))
 
 X509 *load_cert_pass(const char *uri, int format, int maybe_stdin,
-                     const char *pass, const char *desc)
+    const char *pass, const char *desc)
 {
     X509 *cert = NULL;
 
@@ -502,13 +449,13 @@ X509 *load_cert_pass(const char *uri, int format, int maybe_stdin,
         }
     } else {
         (void)load_key_certs_crls(uri, format, maybe_stdin, pass, desc, 0,
-                                  NULL, NULL, NULL, &cert, NULL, NULL, NULL);
+            NULL, NULL, NULL, &cert, NULL, NULL, NULL);
     }
     return cert;
 }
 
 X509_CRL *load_crl(const char *uri, int format, int maybe_stdin,
-                   const char *desc)
+    const char *desc)
 {
     X509_CRL *crl = NULL;
 
@@ -524,7 +471,7 @@ X509_CRL *load_crl(const char *uri, int format, int maybe_stdin,
         }
     } else {
         (void)load_key_certs_crls(uri, format, maybe_stdin, NULL, desc, 0,
-                                  NULL, NULL,  NULL, NULL, NULL, &crl, NULL);
+            NULL, NULL, NULL, NULL, NULL, &crl, NULL);
     }
     return crl;
 }
@@ -548,7 +495,7 @@ X509_REQ *load_csr(const char *file, int format, const char *desc)
     else
         print_format_error(format, OPT_FMT_PEMDER);
 
- end:
+end:
     if (req == NULL) {
         ERR_print_errors(bio_err);
         if (desc != NULL)
@@ -560,7 +507,7 @@ X509_REQ *load_csr(const char *file, int format, const char *desc)
 
 /* Better extend OSSL_STORE to support CSRs, see FR #15725 */
 X509_REQ *load_csr_autofmt(const char *infile, int format,
-                           STACK_OF(OPENSSL_STRING) *vfyopts, const char *desc)
+    STACK_OF(OPENSSL_STRING) *vfyopts, const char *desc)
 {
     X509_REQ *csr;
 
@@ -578,7 +525,7 @@ X509_REQ *load_csr_autofmt(const char *infile, int format,
         }
         if (csr == NULL) {
             BIO_printf(bio_err, "error: unable to load %s from file '%s'\n",
-                       desc, infile);
+                desc, infile);
         }
     }
     if (csr != NULL) {
@@ -607,7 +554,7 @@ void clear_free(char *str)
 }
 
 EVP_PKEY *load_key(const char *uri, int format, int may_stdin,
-                   const char *pass, ENGINE *e, const char *desc)
+    const char *pass, ENGINE *e, const char *desc)
 {
     EVP_PKEY *pkey = NULL;
     char *allocated_uri = NULL;
@@ -618,7 +565,7 @@ EVP_PKEY *load_key(const char *uri, int format, int may_stdin,
     if (format == FORMAT_ENGINE)
         uri = allocated_uri = make_engine_uri(e, uri, desc);
     (void)load_key_certs_crls(uri, format, may_stdin, pass, desc, 0,
-                              &pkey, NULL, NULL, NULL, NULL, NULL, NULL);
+        &pkey, NULL, NULL, NULL, NULL, NULL, NULL);
 
     OPENSSL_free(allocated_uri);
     return pkey;
@@ -626,7 +573,7 @@ EVP_PKEY *load_key(const char *uri, int format, int may_stdin,
 
 /* first try reading public key, on failure resort to loading private key */
 EVP_PKEY *load_pubkey(const char *uri, int format, int maybe_stdin,
-                      const char *pass, ENGINE *e, const char *desc)
+    const char *pass, ENGINE *e, const char *desc)
 {
     EVP_PKEY *pkey = NULL;
     char *allocated_uri = NULL;
@@ -637,30 +584,30 @@ EVP_PKEY *load_pubkey(const char *uri, int format, int maybe_stdin,
     if (format == FORMAT_ENGINE)
         uri = allocated_uri = make_engine_uri(e, uri, desc);
     (void)load_key_certs_crls(uri, format, maybe_stdin, pass, desc, 1,
-                              NULL, &pkey, NULL, NULL, NULL, NULL, NULL);
+        NULL, &pkey, NULL, NULL, NULL, NULL, NULL);
     if (pkey == NULL)
         (void)load_key_certs_crls(uri, format, maybe_stdin, pass, desc, 0,
-                                  &pkey, NULL, NULL, NULL, NULL, NULL, NULL);
+            &pkey, NULL, NULL, NULL, NULL, NULL, NULL);
     OPENSSL_free(allocated_uri);
     return pkey;
 }
 
 EVP_PKEY *load_keyparams_suppress(const char *uri, int format, int maybe_stdin,
-                                  const char *keytype, const char *desc,
-                                  int suppress_decode_errors)
+    const char *keytype, const char *desc,
+    int suppress_decode_errors)
 {
     EVP_PKEY *params = NULL;
 
     if (desc == NULL)
         desc = "key parameters";
     (void)load_key_certs_crls(uri, format, maybe_stdin, NULL, desc,
-                              suppress_decode_errors,
-                              NULL, NULL, &params, NULL, NULL, NULL, NULL);
+        suppress_decode_errors,
+        NULL, NULL, &params, NULL, NULL, NULL, NULL);
     if (params != NULL && keytype != NULL && !EVP_PKEY_is_a(params, keytype)) {
         ERR_print_errors(bio_err);
         BIO_printf(bio_err,
-                   "Unable to load %s from %s (unexpected parameters type)\n",
-                   desc, uri);
+            "Unable to load %s from %s (unexpected parameters type)\n",
+            desc, uri);
         EVP_PKEY_free(params);
         params = NULL;
     }
@@ -668,7 +615,7 @@ EVP_PKEY *load_keyparams_suppress(const char *uri, int format, int maybe_stdin,
 }
 
 EVP_PKEY *load_keyparams(const char *uri, int format, int maybe_stdin,
-                         const char *keytype, const char *desc)
+    const char *keytype, const char *desc)
 {
     return load_keyparams_suppress(uri, format, maybe_stdin, keytype, desc, 0);
 }
@@ -690,7 +637,7 @@ void *app_malloc(size_t sz, const char *what)
 
     if (vp == NULL)
         app_bail_out("%s: Could not allocate %zu bytes for %s\n",
-                     opt_getprog(), sz, what);
+            opt_getprog(), sz, what);
     return vp;
 }
 
@@ -714,16 +661,16 @@ static void warn_cert_msg(const char *uri, X509 *cert, const char *msg)
     char *subj = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0);
 
     BIO_printf(bio_err, "Warning: certificate from '%s' with subject '%s' %s\n",
-               uri, subj, msg);
+        uri, subj, msg);
     OPENSSL_free(subj);
 }
 
 static void warn_cert(const char *uri, X509 *cert, int warn_EE,
-                      X509_VERIFY_PARAM *vpm)
+    X509_VERIFY_PARAM *vpm)
 {
     uint32_t ex_flags = X509_get_extension_flags(cert);
     int res = X509_cmp_timeframe(vpm, X509_get0_notBefore(cert),
-                                 X509_get0_notAfter(cert));
+        X509_get0_notAfter(cert));
 
     if (res != 0)
         warn_cert_msg(uri, cert, res > 0 ? "has expired" : "not yet valid");
@@ -732,7 +679,7 @@ static void warn_cert(const char *uri, X509 *cert, int warn_EE,
 }
 
 static void warn_certs(const char *uri, STACK_OF(X509) *certs, int warn_EE,
-                       X509_VERIFY_PARAM *vpm)
+    X509_VERIFY_PARAM *vpm)
 {
     int i;
 
@@ -741,23 +688,22 @@ static void warn_certs(const char *uri, STACK_OF(X509) *certs, int warn_EE,
 }
 
 int load_cert_certs(const char *uri,
-                    X509 **pcert, STACK_OF(X509) **pcerts,
-                    int exclude_http, const char *pass, const char *desc,
-                    X509_VERIFY_PARAM *vpm)
+    X509 **pcert, STACK_OF(X509) **pcerts,
+    int exclude_http, const char *pass, const char *desc,
+    X509_VERIFY_PARAM *vpm)
 {
     int ret = 0;
     char *pass_string;
 
     if (desc == NULL)
         desc = pcerts == NULL ? "certificate" : "certificates";
-    if (exclude_http && (HAS_CASE_PREFIX(uri, "http://")
-                         || HAS_CASE_PREFIX(uri, "https://"))) {
+    if (exclude_http && (HAS_CASE_PREFIX(uri, "http://") || HAS_CASE_PREFIX(uri, "https://"))) {
         BIO_printf(bio_err, "error: HTTP retrieval not allowed for %s\n", desc);
         return ret;
     }
     pass_string = get_passwd(pass, desc);
     ret = load_key_certs_crls(uri, FORMAT_UNDEF, 0, pass_string, desc, 0,
-                              NULL, NULL, NULL, pcert, pcerts, NULL, NULL);
+        NULL, NULL, NULL, pcert, pcerts, NULL, NULL);
     clear_free(pass_string);
 
     if (ret) {
@@ -775,7 +721,7 @@ int load_cert_certs(const char *uri,
 }
 
 STACK_OF(X509) *load_certs_multifile(char *files, const char *pass,
-                                     const char *desc, X509_VERIFY_PARAM *vpm)
+    const char *desc, X509_VERIFY_PARAM *vpm)
 {
     STACK_OF(X509) *certs = NULL;
     STACK_OF(X509) *result = sk_X509_new_null();
@@ -791,7 +737,7 @@ STACK_OF(X509) *load_certs_multifile(char *files, const char *pass,
         if (!load_cert_certs(files, NULL, &certs, 0, pass, desc, vpm))
             goto err;
         if (!X509_add_certs(result, certs,
-                            X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
+                X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
             goto oom;
         OSSL_STACK_OF_X509_free(certs);
         certs = NULL;
@@ -799,16 +745,16 @@ STACK_OF(X509) *load_certs_multifile(char *files, const char *pass,
     }
     return result;
 
- oom:
+oom:
     BIO_printf(bio_err, "out of memory\n");
- err:
+err:
     OSSL_STACK_OF_X509_free(certs);
     OSSL_STACK_OF_X509_free(result);
     return NULL;
 }
 
 static X509_STORE *sk_X509_to_store(X509_STORE *store /* may be NULL */,
-                                    const STACK_OF(X509) *certs /* may NULL */)
+    const STACK_OF(X509) *certs /* may NULL */)
 {
     int i;
 
@@ -830,7 +776,7 @@ static X509_STORE *sk_X509_to_store(X509_STORE *store /* may be NULL */,
  * Returns pointer to created X509_STORE on success, NULL on error.
  */
 X509_STORE *load_certstore(char *input, const char *pass, const char *desc,
-                           X509_VERIFY_PARAM *vpm)
+    X509_VERIFY_PARAM *vpm)
 {
     X509_STORE *store = NULL;
     STACK_OF(X509) *certs = NULL;
@@ -858,14 +804,14 @@ X509_STORE *load_certstore(char *input, const char *pass, const char *desc,
  * The caller is responsible for freeing *certs if its value is left not NULL.
  */
 int load_certs(const char *uri, int maybe_stdin, STACK_OF(X509) **certs,
-               const char *pass, const char *desc)
+    const char *pass, const char *desc)
 {
     int ret, was_NULL = *certs == NULL;
 
     if (desc == NULL)
         desc = "certificates";
     ret = load_key_certs_crls(uri, FORMAT_UNDEF, maybe_stdin, pass, desc, 0,
-                              NULL, NULL, NULL, NULL, certs, NULL, NULL);
+        NULL, NULL, NULL, NULL, certs, NULL, NULL);
 
     if (!ret && was_NULL) {
         OSSL_STACK_OF_X509_free(*certs);
@@ -879,14 +825,14 @@ int load_certs(const char *uri, int maybe_stdin, STACK_OF(X509) **certs,
  * The caller is responsible for freeing *crls if its value is left not NULL.
  */
 int load_crls(const char *uri, STACK_OF(X509_CRL) **crls,
-              const char *pass, const char *desc)
+    const char *pass, const char *desc)
 {
     int ret, was_NULL = *crls == NULL;
 
     if (desc == NULL)
         desc = "CRLs";
     ret = load_key_certs_crls(uri, FORMAT_UNDEF, 0, pass, desc, 0,
-                              NULL, NULL, NULL, NULL, NULL, NULL, crls);
+        NULL, NULL, NULL, NULL, NULL, NULL, crls);
 
     if (!ret && was_NULL) {
         sk_X509_CRL_pop_free(*crls, X509_CRL_free);
@@ -914,16 +860,19 @@ static const char *format2string(int format)
 #define SET_EXPECT(val) \
     (expect = expect < 0 ? (val) : (expect == (val) ? (val) : 0))
 #define SET_EXPECT1(pvar, val) \
-    if ((pvar) != NULL) { \
-        *(pvar) = NULL; \
-        SET_EXPECT(val); \
+    if ((pvar) != NULL) {      \
+        *(pvar) = NULL;        \
+        SET_EXPECT(val);       \
     }
 /* Provide (error msg) text for some of the credential types to be loaded. */
-#define FAIL_NAME \
-    (ppkey != NULL ? "private key" : ppubkey != NULL ? "public key" :  \
-     pparams != NULL ? "key parameters" :                              \
-     pcert != NULL ? "certificate" : pcerts != NULL ? "certificates" : \
-     pcrl != NULL ? "CRL" : pcrls != NULL ? "CRLs" : NULL)
+#define FAIL_NAME                                                       \
+    (ppkey != NULL ? "private key" : ppubkey != NULL ? "public key"     \
+            : pparams != NULL                        ? "key parameters" \
+            : pcert != NULL                          ? "certificate"    \
+            : pcerts != NULL                         ? "certificates"   \
+            : pcrl != NULL                           ? "CRL"            \
+            : pcrls != NULL                          ? "CRLs"           \
+                                                     : NULL)
 /*
  * Load those types of credentials for which the result pointer is not NULL.
  * Reads from stdin if 'uri' is NULL and 'maybe_stdin' is nonzero.
@@ -940,11 +889,11 @@ static const char *format2string(int format)
  * of *pcerts and *pcrls (as far as they are not NULL).
  */
 int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
-                        const char *pass, const char *desc, int quiet,
-                        EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
-                        EVP_PKEY **pparams,
-                        X509 **pcert, STACK_OF(X509) **pcerts,
-                        X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls)
+    const char *pass, const char *desc, int quiet,
+    EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
+    EVP_PKEY **pparams,
+    X509 **pcert, STACK_OF(X509) **pcerts,
+    X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls)
 {
     PW_CB_DATA uidata;
     OSSL_STORE_CTX *ctx = NULL;
@@ -960,7 +909,7 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
     if (failed == NULL) {
         if (!quiet)
             BIO_printf(bio_err, "Internal error: nothing was requested to load from %s\n",
-                       uri != NULL ? uri : "<stdin>");
+                uri != NULL ? uri : "<stdin>");
         return 0;
     }
     /* suppress any extraneous errors left over from failed parse attempts */
@@ -971,7 +920,7 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
     SET_EXPECT1(pparams, OSSL_STORE_INFO_PARAMS);
     SET_EXPECT1(pcert, OSSL_STORE_INFO_CERT);
     /*
-     * Up to here, the follwing holds.
+     * Up to here, the following holds.
      * If just one of the ppkey, ppubkey, pparams, and pcert function parameters
      * is nonzero, expect > 0 indicates which type of credential is expected.
      * If expect == 0, more than one of them is nonzero (multiple types expected).
@@ -1010,7 +959,7 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
 
     if ((input_type = format2string(format)) != NULL) {
         itp[0] = OSSL_PARAM_construct_utf8_string(OSSL_STORE_PARAM_INPUT_TYPE,
-                                                  (char *)input_type, 0);
+            (char *)input_type, 0);
         itp[1] = OSSL_PARAM_construct_end();
         params = itp;
     }
@@ -1028,13 +977,13 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
         bio = BIO_new_fp(stdin, 0);
         if (bio != NULL) {
             ctx = OSSL_STORE_attach(bio, "file", libctx, propq,
-                                    get_ui_method(), &uidata, params,
-                                    NULL, NULL);
+                get_ui_method(), &uidata, params,
+                NULL, NULL);
             BIO_free(bio);
         }
     } else {
         ctx = OSSL_STORE_open_ex(uri, libctx, propq, get_ui_method(), &uidata,
-                                 params, NULL, NULL);
+            params, NULL, NULL);
     }
     if (ctx == NULL) {
         if (!quiet)
@@ -1052,8 +1001,8 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
     /* from here, failed != NULL only if actually an error has been detected */
 
     while ((ppkey != NULL || ppubkey != NULL || pparams != NULL
-            || pcert != NULL || pcerts != NULL || pcrl != NULL || pcrls != NULL)
-           && !OSSL_STORE_eof(ctx)) {
+               || pcert != NULL || pcerts != NULL || pcrl != NULL || pcrls != NULL)
+        && !OSSL_STORE_eof(ctx)) {
         OSSL_STORE_INFO *info = OSSL_STORE_load(ctx);
         int type, ok = 1;
 
@@ -1104,8 +1053,8 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
                     pcert = NULL;
             } else if (pcerts != NULL) {
                 ok = X509_add_cert(*pcerts,
-                                   OSSL_STORE_INFO_get1_CERT(info),
-                                   X509_ADD_FLAG_DEFAULT);
+                    OSSL_STORE_INFO_get1_CERT(info),
+                    X509_ADD_FLAG_DEFAULT);
             }
             ncerts += ok;
             break;
@@ -1132,7 +1081,7 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
         }
     }
 
- end:
+end:
     OSSL_STORE_close(ctx);
 
     /* see if any of the requested types of credentials was not found */
@@ -1176,37 +1125,36 @@ int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
     return failed == NULL;
 }
 
-#define X509V3_EXT_UNKNOWN_MASK  (0xfL << 16)
-#define X509V3_EXT_DEFAULT       0          /* Return error for unknown exts */
+#define X509V3_EXT_UNKNOWN_MASK (0xfL << 16)
+#define X509V3_EXT_DEFAULT 0 /* Return error for unknown exts */
 #define X509V3_EXT_ERROR_UNKNOWN (1L << 16) /* Print error for unknown exts */
 #define X509V3_EXT_PARSE_UNKNOWN (2L << 16) /* ASN1 parse unknown extensions */
-#define X509V3_EXT_DUMP_UNKNOWN  (3L << 16) /* BIO_dump unknown extensions */
+#define X509V3_EXT_DUMP_UNKNOWN (3L << 16) /* BIO_dump unknown extensions */
 
-#define X509_FLAG_CA (X509_FLAG_NO_ISSUER | X509_FLAG_NO_PUBKEY | \
-                      X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION)
+#define X509_FLAG_CA (X509_FLAG_NO_ISSUER | X509_FLAG_NO_PUBKEY | X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION)
 
 int set_cert_ex(unsigned long *flags, const char *arg)
 {
     static const NAME_EX_TBL cert_tbl[] = {
-        {"compatible", X509_FLAG_COMPAT, 0xffffffffl},
-        {"ca_default", X509_FLAG_CA, 0xffffffffl},
-        {"no_header", X509_FLAG_NO_HEADER, 0},
-        {"no_version", X509_FLAG_NO_VERSION, 0},
-        {"no_serial", X509_FLAG_NO_SERIAL, 0},
-        {"no_signame", X509_FLAG_NO_SIGNAME, 0},
-        {"no_validity", X509_FLAG_NO_VALIDITY, 0},
-        {"no_subject", X509_FLAG_NO_SUBJECT, 0},
-        {"no_issuer", X509_FLAG_NO_ISSUER, 0},
-        {"no_pubkey", X509_FLAG_NO_PUBKEY, 0},
-        {"no_extensions", X509_FLAG_NO_EXTENSIONS, 0},
-        {"no_sigdump", X509_FLAG_NO_SIGDUMP, 0},
-        {"no_aux", X509_FLAG_NO_AUX, 0},
-        {"no_attributes", X509_FLAG_NO_ATTRIBUTES, 0},
-        {"ext_default", X509V3_EXT_DEFAULT, X509V3_EXT_UNKNOWN_MASK},
-        {"ext_error", X509V3_EXT_ERROR_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
-        {"ext_parse", X509V3_EXT_PARSE_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
-        {"ext_dump", X509V3_EXT_DUMP_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
-        {NULL, 0, 0}
+        { "compatible", X509_FLAG_COMPAT, 0xffffffffl },
+        { "ca_default", X509_FLAG_CA, 0xffffffffl },
+        { "no_header", X509_FLAG_NO_HEADER, 0 },
+        { "no_version", X509_FLAG_NO_VERSION, 0 },
+        { "no_serial", X509_FLAG_NO_SERIAL, 0 },
+        { "no_signame", X509_FLAG_NO_SIGNAME, 0 },
+        { "no_validity", X509_FLAG_NO_VALIDITY, 0 },
+        { "no_subject", X509_FLAG_NO_SUBJECT, 0 },
+        { "no_issuer", X509_FLAG_NO_ISSUER, 0 },
+        { "no_pubkey", X509_FLAG_NO_PUBKEY, 0 },
+        { "no_extensions", X509_FLAG_NO_EXTENSIONS, 0 },
+        { "no_sigdump", X509_FLAG_NO_SIGDUMP, 0 },
+        { "no_aux", X509_FLAG_NO_AUX, 0 },
+        { "no_attributes", X509_FLAG_NO_ATTRIBUTES, 0 },
+        { "ext_default", X509V3_EXT_DEFAULT, X509V3_EXT_UNKNOWN_MASK },
+        { "ext_error", X509V3_EXT_ERROR_UNKNOWN, X509V3_EXT_UNKNOWN_MASK },
+        { "ext_parse", X509V3_EXT_PARSE_UNKNOWN, X509V3_EXT_UNKNOWN_MASK },
+        { "ext_dump", X509V3_EXT_DUMP_UNKNOWN, X509V3_EXT_UNKNOWN_MASK },
+        { NULL, 0, 0 }
     };
     return set_multi_opts(flags, arg, cert_tbl);
 }
@@ -1214,35 +1162,35 @@ int set_cert_ex(unsigned long *flags, const char *arg)
 int set_name_ex(unsigned long *flags, const char *arg)
 {
     static const NAME_EX_TBL ex_tbl[] = {
-        {"esc_2253", ASN1_STRFLGS_ESC_2253, 0},
-        {"esc_2254", ASN1_STRFLGS_ESC_2254, 0},
-        {"esc_ctrl", ASN1_STRFLGS_ESC_CTRL, 0},
-        {"esc_msb", ASN1_STRFLGS_ESC_MSB, 0},
-        {"use_quote", ASN1_STRFLGS_ESC_QUOTE, 0},
-        {"utf8", ASN1_STRFLGS_UTF8_CONVERT, 0},
-        {"ignore_type", ASN1_STRFLGS_IGNORE_TYPE, 0},
-        {"show_type", ASN1_STRFLGS_SHOW_TYPE, 0},
-        {"dump_all", ASN1_STRFLGS_DUMP_ALL, 0},
-        {"dump_nostr", ASN1_STRFLGS_DUMP_UNKNOWN, 0},
-        {"dump_der", ASN1_STRFLGS_DUMP_DER, 0},
-        {"compat", XN_FLAG_COMPAT, 0xffffffffL},
-        {"sep_comma_plus", XN_FLAG_SEP_COMMA_PLUS, XN_FLAG_SEP_MASK},
-        {"sep_comma_plus_space", XN_FLAG_SEP_CPLUS_SPC, XN_FLAG_SEP_MASK},
-        {"sep_semi_plus_space", XN_FLAG_SEP_SPLUS_SPC, XN_FLAG_SEP_MASK},
-        {"sep_multiline", XN_FLAG_SEP_MULTILINE, XN_FLAG_SEP_MASK},
-        {"dn_rev", XN_FLAG_DN_REV, 0},
-        {"nofname", XN_FLAG_FN_NONE, XN_FLAG_FN_MASK},
-        {"sname", XN_FLAG_FN_SN, XN_FLAG_FN_MASK},
-        {"lname", XN_FLAG_FN_LN, XN_FLAG_FN_MASK},
-        {"align", XN_FLAG_FN_ALIGN, 0},
-        {"oid", XN_FLAG_FN_OID, XN_FLAG_FN_MASK},
-        {"space_eq", XN_FLAG_SPC_EQ, 0},
-        {"dump_unknown", XN_FLAG_DUMP_UNKNOWN_FIELDS, 0},
-        {"RFC2253", XN_FLAG_RFC2253, 0xffffffffL},
-        {"oneline", XN_FLAG_ONELINE, 0xffffffffL},
-        {"multiline", XN_FLAG_MULTILINE, 0xffffffffL},
-        {"ca_default", XN_FLAG_MULTILINE, 0xffffffffL},
-        {NULL, 0, 0}
+        { "esc_2253", ASN1_STRFLGS_ESC_2253, 0 },
+        { "esc_2254", ASN1_STRFLGS_ESC_2254, 0 },
+        { "esc_ctrl", ASN1_STRFLGS_ESC_CTRL, 0 },
+        { "esc_msb", ASN1_STRFLGS_ESC_MSB, 0 },
+        { "use_quote", ASN1_STRFLGS_ESC_QUOTE, 0 },
+        { "utf8", ASN1_STRFLGS_UTF8_CONVERT, 0 },
+        { "ignore_type", ASN1_STRFLGS_IGNORE_TYPE, 0 },
+        { "show_type", ASN1_STRFLGS_SHOW_TYPE, 0 },
+        { "dump_all", ASN1_STRFLGS_DUMP_ALL, 0 },
+        { "dump_nostr", ASN1_STRFLGS_DUMP_UNKNOWN, 0 },
+        { "dump_der", ASN1_STRFLGS_DUMP_DER, 0 },
+        { "compat", XN_FLAG_COMPAT, 0xffffffffL },
+        { "sep_comma_plus", XN_FLAG_SEP_COMMA_PLUS, XN_FLAG_SEP_MASK },
+        { "sep_comma_plus_space", XN_FLAG_SEP_CPLUS_SPC, XN_FLAG_SEP_MASK },
+        { "sep_semi_plus_space", XN_FLAG_SEP_SPLUS_SPC, XN_FLAG_SEP_MASK },
+        { "sep_multiline", XN_FLAG_SEP_MULTILINE, XN_FLAG_SEP_MASK },
+        { "dn_rev", XN_FLAG_DN_REV, 0 },
+        { "nofname", XN_FLAG_FN_NONE, XN_FLAG_FN_MASK },
+        { "sname", XN_FLAG_FN_SN, XN_FLAG_FN_MASK },
+        { "lname", XN_FLAG_FN_LN, XN_FLAG_FN_MASK },
+        { "align", XN_FLAG_FN_ALIGN, 0 },
+        { "oid", XN_FLAG_FN_OID, XN_FLAG_FN_MASK },
+        { "space_eq", XN_FLAG_SPC_EQ, 0 },
+        { "dump_unknown", XN_FLAG_DUMP_UNKNOWN_FIELDS, 0 },
+        { "RFC2253", XN_FLAG_RFC2253, 0xffffffffL },
+        { "oneline", XN_FLAG_ONELINE, 0xffffffffL },
+        { "multiline", XN_FLAG_MULTILINE, 0xffffffffL },
+        { "ca_default", XN_FLAG_MULTILINE, 0xffffffffL },
+        { NULL, 0, 0 }
     };
     if (set_multi_opts(flags, arg, ex_tbl) == 0)
         return 0;
@@ -1308,13 +1256,13 @@ int copy_extensions(X509 *x, X509_REQ *req, int copy_type)
     }
     ret = 1;
 
- end:
+end:
     sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
     return ret;
 }
 
 static int set_multi_opts(unsigned long *flags, const char *arg,
-                          const NAME_EX_TBL *in_tbl)
+    const NAME_EX_TBL *in_tbl)
 {
     STACK_OF(CONF_VALUE) *vals;
     CONF_VALUE *val;
@@ -1333,7 +1281,7 @@ static int set_multi_opts(unsigned long *flags, const char *arg,
 }
 
 static int set_table_opts(unsigned long *flags, const char *arg,
-                          const NAME_EX_TBL *in_tbl)
+    const NAME_EX_TBL *in_tbl)
 {
     char c;
     const NAME_EX_TBL *ptbl;
@@ -1391,7 +1339,7 @@ void print_name(BIO *out, const char *title, const X509_NAME *nm)
 }
 
 void print_bignum_var(BIO *out, const BIGNUM *in, const char *var,
-                      int len, unsigned char *buffer)
+    int len, unsigned char *buffer)
 {
     BIO_printf(out, "    static unsigned char %s_%d[] = {", var, len);
     if (BN_is_zero(in)) {
@@ -1428,8 +1376,8 @@ void print_array(BIO *out, const char *title, int len, const unsigned char *d)
 }
 
 X509_STORE *setup_verify(const char *CAfile, int noCAfile,
-                         const char *CApath, int noCApath,
-                         const char *CAstore, int noCAstore)
+    const char *CApath, int noCApath,
+    const char *CAstore, int noCAstore)
 {
     X509_STORE *store = X509_STORE_new();
     X509_LOOKUP *lookup;
@@ -1445,17 +1393,19 @@ X509_STORE *setup_verify(const char *CAfile, int noCAfile,
             goto end;
         if (CAfile != NULL) {
             if (X509_LOOKUP_load_file_ex(lookup, CAfile, X509_FILETYPE_PEM,
-                                         libctx, propq) <= 0) {
+                    libctx, propq)
+                <= 0) {
                 ERR_clear_error();
                 if (X509_LOOKUP_load_file_ex(lookup, CAfile, X509_FILETYPE_ASN1,
-                                             libctx, propq) <= 0) {
+                        libctx, propq)
+                    <= 0) {
                     BIO_printf(bio_err, "Error loading file %s\n", CAfile);
                     goto end;
                 }
             }
         } else {
             X509_LOOKUP_load_file_ex(lookup, NULL, X509_FILETYPE_DEFAULT,
-                                     libctx, propq);
+                libctx, propq);
         }
     }
 
@@ -1486,7 +1436,7 @@ X509_STORE *setup_verify(const char *CAfile, int noCAfile,
 
     ERR_clear_error();
     return store;
- end:
+end:
     ERR_print_errors(bio_err);
     X509_STORE_free(store);
     return NULL;
@@ -1503,12 +1453,14 @@ static unsigned long index_serial_hash(const OPENSSL_CSTRING *a)
 }
 
 static int index_serial_cmp(const OPENSSL_CSTRING *a,
-                            const OPENSSL_CSTRING *b)
+    const OPENSSL_CSTRING *b)
 {
     const char *aa, *bb;
 
-    for (aa = a[DB_serial]; *aa == '0'; aa++) ;
-    for (bb = b[DB_serial]; *bb == '0'; bb++) ;
+    for (aa = a[DB_serial]; *aa == '0'; aa++)
+        ;
+    for (bb = b[DB_serial]; *bb == '0'; bb++)
+        ;
     return strcmp(aa, bb);
 }
 
@@ -1534,7 +1486,7 @@ static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING)
 #undef BSIZE
 #define BSIZE 256
 BIGNUM *load_serial(const char *serialfile, int *exists, int create,
-                    ASN1_INTEGER **retai)
+    ASN1_INTEGER **retai)
 {
     BIO *in = NULL;
     BIGNUM *ret = NULL;
@@ -1559,14 +1511,14 @@ BIGNUM *load_serial(const char *serialfile, int *exists, int create,
             BIO_printf(bio_err, "Out of memory\n");
         } else if (!rand_serial(ret, ai)) {
             BIO_printf(bio_err, "Error creating random number to store in %s\n",
-                       serialfile);
+                serialfile);
             BN_free(ret);
             ret = NULL;
         }
     } else {
         if (!a2i_ASN1_INTEGER(in, ai, buf, 1024)) {
             BIO_printf(bio_err, "Unable to load number from %s\n",
-                       serialfile);
+                serialfile);
             goto err;
         }
         ret = ASN1_INTEGER_to_BN(ai, NULL);
@@ -1580,7 +1532,7 @@ BIGNUM *load_serial(const char *serialfile, int *exists, int create,
         *retai = ai;
         ai = NULL;
     }
- err:
+err:
     if (ret == NULL)
         ERR_print_errors(bio_err);
     BIO_free(in);
@@ -1589,7 +1541,7 @@ BIGNUM *load_serial(const char *serialfile, int *exists, int create,
 }
 
 int save_serial(const char *serialfile, const char *suffix,
-                const BIGNUM *serial, ASN1_INTEGER **retai)
+    const BIGNUM *serial, ASN1_INTEGER **retai)
 {
     char buf[1][BSIZE];
     BIO *out = NULL;
@@ -1631,7 +1583,7 @@ int save_serial(const char *serialfile, const char *suffix,
         *retai = ai;
         ai = NULL;
     }
- err:
+err:
     if (!ret)
         ERR_print_errors(bio_err);
     BIO_free_all(out);
@@ -1640,7 +1592,7 @@ int save_serial(const char *serialfile, const char *suffix,
 }
 
 int rotate_serial(const char *serialfile, const char *new_suffix,
-                  const char *old_suffix)
+    const char *old_suffix)
 {
     char buf[2][BSIZE];
     int i, j;
@@ -1664,21 +1616,21 @@ int rotate_serial(const char *serialfile, const char *new_suffix,
 #ifdef ENOTDIR
         && errno != ENOTDIR
 #endif
-        ) {
+    ) {
         BIO_printf(bio_err,
-                   "Unable to rename %s to %s\n", serialfile, buf[1]);
+            "Unable to rename %s to %s\n", serialfile, buf[1]);
         perror("reason");
         goto err;
     }
     if (rename(buf[0], serialfile) < 0) {
         BIO_printf(bio_err,
-                   "Unable to rename %s to %s\n", buf[0], serialfile);
+            "Unable to rename %s to %s\n", buf[0], serialfile);
         perror("reason");
         rename(buf[1], serialfile);
         goto err;
     }
     return 1;
- err:
+err:
     ERR_print_errors(bio_err);
     return 0;
 }
@@ -1699,7 +1651,7 @@ int rand_serial(BIGNUM *b, ASN1_INTEGER *ai)
 
     ret = 1;
 
- error:
+error:
 
     if (btmp != b)
         BN_free(btmp);
@@ -1727,7 +1679,7 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr)
     BIO_get_fp(in, &dbfp);
     if (fstat(fileno(dbfp), &dbst) == -1) {
         ERR_raise_data(ERR_LIB_SYS, errno,
-                       "calling fstat(%s)", dbfile);
+            "calling fstat(%s)", dbfile);
         goto err;
     }
 #endif
@@ -1758,11 +1710,14 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr)
     }
 
     retdb->dbfname = OPENSSL_strdup(dbfile);
+    if (retdb->dbfname == NULL)
+        goto err;
+
 #ifndef OPENSSL_NO_POSIX_IO
     retdb->dbst = dbst;
 #endif
 
- err:
+err:
     ERR_print_errors(bio_err);
     NCONF_free(dbattr_conf);
     TXT_DB_free(tmpdb);
@@ -1776,24 +1731,24 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr)
 int index_index(CA_DB *db)
 {
     if (!TXT_DB_create_index(db->db, DB_serial, NULL,
-                             LHASH_HASH_FN(index_serial),
-                             LHASH_COMP_FN(index_serial))) {
+            LHASH_HASH_FN(index_serial),
+            LHASH_COMP_FN(index_serial))) {
         BIO_printf(bio_err,
-                   "Error creating serial number index:(%ld,%ld,%ld)\n",
-                   db->db->error, db->db->arg1, db->db->arg2);
+            "Error creating serial number index:(%ld,%ld,%ld)\n",
+            db->db->error, db->db->arg1, db->db->arg2);
         goto err;
     }
 
     if (db->attributes.unique_subject
         && !TXT_DB_create_index(db->db, DB_name, index_name_qual,
-                                LHASH_HASH_FN(index_name),
-                                LHASH_COMP_FN(index_name))) {
+            LHASH_HASH_FN(index_name),
+            LHASH_COMP_FN(index_name))) {
         BIO_printf(bio_err, "Error creating name index:(%ld,%ld,%ld)\n",
-                   db->db->error, db->db->arg1, db->db->arg2);
+            db->db->error, db->db->arg1, db->db->arg2);
         goto err;
     }
     return 1;
- err:
+err:
     ERR_print_errors(bio_err);
     return 0;
 }
@@ -1836,17 +1791,17 @@ int save_index(const char *dbfile, const char *suffix, CA_DB *db)
         goto err;
     }
     BIO_printf(out, "unique_subject = %s\n",
-               db->attributes.unique_subject ? "yes" : "no");
+        db->attributes.unique_subject ? "yes" : "no");
     BIO_free(out);
 
     return 1;
- err:
+err:
     ERR_print_errors(bio_err);
     return 0;
 }
 
 int rotate_index(const char *dbfile, const char *new_suffix,
-                 const char *old_suffix)
+    const char *old_suffix)
 {
     char buf[5][BSIZE];
     int i, j;
@@ -1876,7 +1831,7 @@ int rotate_index(const char *dbfile, const char *new_suffix,
 #ifdef ENOTDIR
         && errno != ENOTDIR
 #endif
-        ) {
+    ) {
         BIO_printf(bio_err, "Unable to rename %s to %s\n", dbfile, buf[1]);
         perror("reason");
         goto err;
@@ -1891,7 +1846,7 @@ int rotate_index(const char *dbfile, const char *new_suffix,
 #ifdef ENOTDIR
         && errno != ENOTDIR
 #endif
-        ) {
+    ) {
         BIO_printf(bio_err, "Unable to rename %s to %s\n", buf[4], buf[3]);
         perror("reason");
         rename(dbfile, buf[0]);
@@ -1907,7 +1862,7 @@ int rotate_index(const char *dbfile, const char *new_suffix,
         goto err;
     }
     return 1;
- err:
+err:
     ERR_print_errors(bio_err);
     return 0;
 }
@@ -1925,17 +1880,17 @@ int parse_yesno(const char *str, int def)
 {
     if (str) {
         switch (*str) {
-        case 'f':              /* false */
-        case 'F':              /* FALSE */
-        case 'n':              /* no */
-        case 'N':              /* NO */
-        case '0':              /* 0 */
+        case 'f': /* false */
+        case 'F': /* FALSE */
+        case 'n': /* no */
+        case 'N': /* NO */
+        case '0': /* 0 */
             return 0;
-        case 't':              /* true */
-        case 'T':              /* TRUE */
-        case 'y':              /* yes */
-        case 'Y':              /* YES */
-        case '1':              /* 1 */
+        case 't': /* true */
+        case 'T': /* TRUE */
+        case 'y': /* yes */
+        case 'Y': /* YES */
+        case '1': /* 1 */
             return 1;
         }
     }
@@ -1948,7 +1903,7 @@ int parse_yesno(const char *str, int def)
  * and characters may be escaped by \
  */
 X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
-                      const char *desc)
+    const char *desc)
 {
     int nextismulti = 0;
     char *work;
@@ -1956,10 +1911,10 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
 
     if (*cp++ != '/') {
         BIO_printf(bio_err,
-                   "%s: %s name is expected to be in the format "
-                   "/type0=value0/type1=value1/type2=... where characters may "
-                   "be escaped by \\. This name is not in that format: '%s'\n",
-                   opt_getprog(), desc, --cp);
+            "%s: %s name is expected to be in the format "
+            "/type0=value0/type1=value1/type2=... where characters may "
+            "be escaped by \\. This name is not in that format: '%s'\n",
+            opt_getprog(), desc, --cp);
         return NULL;
     }
 
@@ -1971,7 +1926,7 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
     work = OPENSSL_strdup(cp);
     if (work == NULL) {
         BIO_printf(bio_err, "%s: Error copying %s name input\n",
-                   opt_getprog(), desc);
+            opt_getprog(), desc);
         goto err;
     }
 
@@ -1990,8 +1945,8 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
         *bp++ = '\0';
         if (*cp == '\0') {
             BIO_printf(bio_err,
-                       "%s: Missing '=' after RDN type string '%s' in %s name string\n",
-                       opt_getprog(), typestr, desc);
+                "%s: Missing '=' after RDN type string '%s' in %s name string\n",
+                opt_getprog(), typestr, desc);
             goto err;
         }
         ++cp;
@@ -2006,8 +1961,8 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
             }
             if (*cp == '\\' && *++cp == '\0') {
                 BIO_printf(bio_err,
-                           "%s: Escape character at end of %s name string\n",
-                           opt_getprog(), desc);
+                    "%s: Escape character at end of %s name string\n",
+                    opt_getprog(), desc);
                 goto err;
             }
         }
@@ -2021,27 +1976,27 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
         nid = OBJ_txt2nid(typestr);
         if (nid == NID_undef) {
             BIO_printf(bio_err,
-                       "%s warning: Skipping unknown %s name attribute \"%s\"\n",
-                       opt_getprog(), desc, typestr);
+                "%s warning: Skipping unknown %s name attribute \"%s\"\n",
+                opt_getprog(), desc, typestr);
             if (ismulti)
                 BIO_printf(bio_err,
-                           "%s hint: a '+' in a value string needs be escaped using '\\' else a new member of a multi-valued RDN is expected\n",
-                           opt_getprog());
+                    "%s hint: a '+' in a value string needs be escaped using '\\' else a new member of a multi-valued RDN is expected\n",
+                    opt_getprog());
             continue;
         }
         if (*valstr == '\0') {
             BIO_printf(bio_err,
-                       "%s warning: No value provided for %s name attribute \"%s\", skipped\n",
-                       opt_getprog(), desc, typestr);
+                "%s warning: No value provided for %s name attribute \"%s\", skipped\n",
+                opt_getprog(), desc, typestr);
             continue;
         }
         if (!X509_NAME_add_entry_by_NID(n, nid, chtype,
-                                        valstr, strlen((char *)valstr),
-                                        -1, ismulti ? -1 : 0)) {
+                valstr, strlen((char *)valstr),
+                -1, ismulti ? -1 : 0)) {
             ERR_print_errors(bio_err);
             BIO_printf(bio_err,
-                       "%s: Error adding %s name attribute \"/%s=%s\"\n",
-                       opt_getprog(), desc, typestr, valstr);
+                "%s: Error adding %s name attribute \"/%s=%s\"\n",
+                opt_getprog(), desc, typestr, valstr);
             goto err;
         }
     }
@@ -2049,52 +2004,52 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
     OPENSSL_free(work);
     return n;
 
- err:
+err:
     X509_NAME_free(n);
     OPENSSL_free(work);
     return NULL;
 }
 
 /*
- * Read whole contents of a BIO into an allocated memory buffer and return
- * it.
+ * Read whole contents of a BIO into an allocated memory buffer.
+ * The return value is one on success, zero on error.
+ * If `maxlen` is non-zero, at most `maxlen` bytes are returned, or else, if
+ * the input is longer than `maxlen`, an error is returned.
+ * If `maxlen` is zero, the limit is effectively `SIZE_MAX`.
  */
-
-int bio_to_mem(unsigned char **out, int maxlen, BIO *in)
+int bio_to_mem(unsigned char **out, size_t *outlen, size_t maxlen, BIO *in)
 {
+    unsigned char tbuf[4096];
     BIO *mem;
-    int len, ret;
-    unsigned char tbuf[1024];
+    BUF_MEM *bufm;
+    size_t sz = 0;
+    int len;
 
     mem = BIO_new(BIO_s_mem());
     if (mem == NULL)
-        return -1;
+        return 0;
     for (;;) {
-        if ((maxlen != -1) && maxlen < 1024)
-            len = maxlen;
-        else
-            len = 1024;
-        len = BIO_read(in, tbuf, len);
-        if (len < 0) {
-            BIO_free(mem);
-            return -1;
-        }
-        if (len == 0)
+        if ((len = BIO_read(in, tbuf, 4096)) == 0)
             break;
-        if (BIO_write(mem, tbuf, len) != len) {
+        if (len < 0
+            || BIO_write(mem, tbuf, len) != len
+            || sz > SIZE_MAX - len
+            || ((sz += len) > maxlen && maxlen != 0)) {
             BIO_free(mem);
-            return -1;
+            return 0;
         }
-        if (maxlen != -1)
-            maxlen -= len;
-
-        if (maxlen == 0)
-            break;
     }
-    ret = BIO_get_mem_data(mem, (char **)out);
-    BIO_set_flags(mem, BIO_FLAGS_MEM_RDONLY);
+
+    /* So BIO_free orphans BUF_MEM */
+    (void)BIO_set_close(mem, BIO_NOCLOSE);
+    BIO_get_mem_ptr(mem, &bufm);
     BIO_free(mem);
-    return ret;
+    *out = (unsigned char *)bufm->data;
+    *outlen = bufm->length;
+    /* Tell BUF_MEM to orphan data */
+    bufm->data = NULL;
+    BUF_MEM_free(bufm);
+    return 1;
 }
 
 int pkey_ctrl_string(EVP_PKEY_CTX *ctx, const char *value)
@@ -2113,7 +2068,7 @@ int pkey_ctrl_string(EVP_PKEY_CTX *ctx, const char *value)
     vtmp++;
     rv = EVP_PKEY_CTX_ctrl_str(ctx, stmp, vtmp);
 
- err:
+err:
     OPENSSL_free(stmp);
     return rv;
 }
@@ -2144,7 +2099,7 @@ void policies_print(X509_STORE_CTX *ctx)
     explicit_policy = X509_STORE_CTX_get_explicit_policy(ctx);
 
     BIO_printf(bio_err, "Require explicit Policy: %s\n",
-               explicit_policy ? "True" : "False");
+        explicit_policy ? "True" : "False");
 
     nodes_print("Authority", X509_policy_tree_get0_policies(tree));
     nodes_print("User", X509_policy_tree_get0_user_policies(tree));
@@ -2208,8 +2163,8 @@ unsigned char *next_protos_parse(size_t *outlen, const char *in)
 }
 
 int check_cert_attributes(BIO *bio, X509 *x, const char *checkhost,
-                          const char *checkemail, const char *checkip,
-                          int print)
+    const char *checkemail, const char *checkip,
+    int print)
 {
     int valid_host = 0;
     int valid_mail = 0;
@@ -2223,7 +2178,7 @@ int check_cert_attributes(BIO *bio, X509 *x, const char *checkhost,
         valid_host = X509_check_host(x, checkhost, 0, 0, NULL);
         if (print)
             BIO_printf(bio, "Hostname %s does%s match certificate\n",
-                       checkhost, valid_host == 1 ? "" : " NOT");
+                checkhost, valid_host == 1 ? "" : " NOT");
         ret = ret && valid_host > 0;
     }
 
@@ -2231,7 +2186,7 @@ int check_cert_attributes(BIO *bio, X509 *x, const char *checkhost,
         valid_mail = X509_check_email(x, checkemail, 0, 0);
         if (print)
             BIO_printf(bio, "Email %s does%s match certificate\n",
-                       checkemail, valid_mail ? "" : " NOT");
+                checkemail, valid_mail ? "" : " NOT");
         ret = ret && valid_mail > 0;
     }
 
@@ -2239,7 +2194,7 @@ int check_cert_attributes(BIO *bio, X509 *x, const char *checkhost,
         valid_ip = X509_check_ip_asc(x, checkip, 0);
         if (print)
             BIO_printf(bio, "IP %s does%s match certificate\n",
-                       checkip, valid_ip ? "" : " NOT");
+                checkip, valid_ip ? "" : " NOT");
         ret = ret && valid_ip > 0;
     }
 
@@ -2307,7 +2262,7 @@ static int do_x509_req_init(X509_REQ *x, STACK_OF(OPENSSL_STRING) *opts)
 }
 
 static int do_sign_init(EVP_MD_CTX *ctx, EVP_PKEY *pkey,
-                        const char *md, STACK_OF(OPENSSL_STRING) *sigopts)
+    const char *md, STACK_OF(OPENSSL_STRING) *sigopts)
 {
     EVP_PKEY_CTX *pkctx = NULL;
     char def_md[80];
@@ -2319,18 +2274,18 @@ static int do_sign_init(EVP_MD_CTX *ctx, EVP_PKEY *pkey,
      * for this algorithm.
      */
     if (EVP_PKEY_get_default_digest_name(pkey, def_md, sizeof(def_md)) == 2
-            && strcmp(def_md, "UNDEF") == 0) {
+        && strcmp(def_md, "UNDEF") == 0) {
         /* The signing algorithm requires there to be no digest */
         md = NULL;
     }
 
     return EVP_DigestSignInit_ex(ctx, &pkctx, md, app_get0_libctx(),
-                                 app_get0_propq(), pkey, NULL)
+               app_get0_propq(), pkey, NULL)
         && do_pkey_ctx_init(pkctx, sigopts);
 }
 
 static int adapt_keyid_ext(X509 *cert, X509V3_CTX *ext_ctx,
-                           const char *name, const char *value, int add_default)
+    const char *name, const char *value, int add_default)
 {
     const STACK_OF(X509_EXTENSION) *exts = X509_get0_extensions(cert);
     X509_EXTENSION *new_ext = X509V3_EXT_nconf(NULL, ext_ctx, name, value);
@@ -2369,7 +2324,7 @@ int cert_matches_key(const X509 *cert, const EVP_PKEY *pkey)
 
 /* Ensure RFC 5280 compliance, adapt keyIDs as needed, and sign the cert info */
 int do_X509_sign(X509 *cert, int force_v1, EVP_PKEY *pkey, const char *md,
-                 STACK_OF(OPENSSL_STRING) *sigopts, X509V3_CTX *ext_ctx)
+    STACK_OF(OPENSSL_STRING) *sigopts, X509V3_CTX *ext_ctx)
 {
     EVP_MD_CTX *mctx = EVP_MD_CTX_new();
     int self_sign;
@@ -2389,21 +2344,21 @@ int do_X509_sign(X509 *cert, int force_v1, EVP_PKEY *pkey, const char *md,
         /* Prevent X509_V_ERR_MISSING_AUTHORITY_KEY_IDENTIFIER */
         self_sign = cert_matches_key(cert, pkey);
         if (!adapt_keyid_ext(cert, ext_ctx, "authorityKeyIdentifier",
-                             "keyid, issuer", !self_sign))
+                "keyid, issuer", !self_sign))
             goto end;
     }
     /* May add further measures for ensuring RFC 5280 compliance, see #19805 */
 
     if (mctx != NULL && do_sign_init(mctx, pkey, md, sigopts) > 0)
         rv = (X509_sign_ctx(cert, mctx) > 0);
- end:
+end:
     EVP_MD_CTX_free(mctx);
     return rv;
 }
 
 /* Sign the certificate request info */
 int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const char *md,
-                     STACK_OF(OPENSSL_STRING) *sigopts)
+    STACK_OF(OPENSSL_STRING) *sigopts)
 {
     int rv = 0;
     EVP_MD_CTX *mctx = EVP_MD_CTX_new();
@@ -2416,7 +2371,7 @@ int do_X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const char *md,
 
 /* Sign the CRL info */
 int do_X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const char *md,
-                     STACK_OF(OPENSSL_STRING) *sigopts)
+    STACK_OF(OPENSSL_STRING) *sigopts)
 {
     int rv = 0;
     EVP_MD_CTX *mctx = EVP_MD_CTX_new();
@@ -2447,7 +2402,7 @@ int do_X509_verify(X509 *x, EVP_PKEY *pkey, STACK_OF(OPENSSL_STRING) *vfyopts)
  * 0 if the signature check fails, or -1 if error occurs.
  */
 int do_X509_REQ_verify(X509_REQ *x, EVP_PKEY *pkey,
-                       STACK_OF(OPENSSL_STRING) *vfyopts)
+    STACK_OF(OPENSSL_STRING) *vfyopts)
 {
     int rv = 0;
 
@@ -2509,7 +2464,7 @@ static X509_CRL *load_crl_crldp(STACK_OF(DIST_POINT) *crldp)
  */
 
 static STACK_OF(X509_CRL) *crls_http_cb(const X509_STORE_CTX *ctx,
-                                        const X509_NAME *nm)
+    const X509_NAME *nm)
 {
     X509 *x;
     STACK_OF(X509_CRL) *crls = NULL;
@@ -2605,15 +2560,14 @@ BIO *app_http_tls_cb(BIO *bio, void *arg, int connect, int detail)
         BIO *sbio = NULL;
         X509_STORE *ts = SSL_CTX_get_cert_store(ssl_ctx);
         X509_VERIFY_PARAM *vpm = X509_STORE_get0_param(ts);
-        const char *host = vpm == NULL ? NULL :
-            X509_VERIFY_PARAM_get0_host(vpm, 0 /* first hostname */);
+        const char *host = vpm == NULL ? NULL : X509_VERIFY_PARAM_get0_host(vpm, 0 /* first hostname */);
 
         /* adapt after fixing callback design flaw, see #17088 */
         if ((info->use_proxy
-             && !OSSL_HTTP_proxy_connect(bio, info->server, info->port,
-                                         NULL, NULL, /* no proxy credentials */
-                                         info->timeout, bio_err, opt_getprog()))
-                || (sbio = BIO_new(BIO_f_ssl())) == NULL) {
+                && !OSSL_HTTP_proxy_connect(bio, info->server, info->port,
+                    NULL, NULL, /* no proxy credentials */
+                    info->timeout, bio_err, opt_getprog()))
+            || (sbio = BIO_new(BIO_f_ssl())) == NULL) {
             return NULL;
         }
         if ((ssl = SSL_new(ssl_ctx)) == NULL) {
@@ -2643,10 +2597,10 @@ void APP_HTTP_TLS_INFO_free(APP_HTTP_TLS_INFO *info)
 }
 
 ASN1_VALUE *app_http_get_asn1(const char *url, const char *proxy,
-                              const char *no_proxy, SSL_CTX *ssl_ctx,
-                              const STACK_OF(CONF_VALUE) *headers,
-                              long timeout, const char *expected_content_type,
-                              const ASN1_ITEM *it)
+    const char *no_proxy, SSL_CTX *ssl_ctx,
+    const STACK_OF(CONF_VALUE) *headers,
+    long timeout, const char *expected_content_type,
+    const ASN1_ITEM *it)
 {
     APP_HTTP_TLS_INFO info;
     char *server;
@@ -2661,16 +2615,16 @@ ASN1_VALUE *app_http_get_asn1(const char *url, const char *proxy,
     }
 
     if (!OSSL_HTTP_parse_url(url, &use_ssl, NULL /* userinfo */, &server, &port,
-                             NULL /* port_num, */, NULL, NULL, NULL))
+            NULL /* port_num, */, NULL, NULL, NULL))
         return NULL;
     if (use_ssl && ssl_ctx == NULL) {
         ERR_raise_data(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER,
-                       "missing SSL_CTX");
+            "missing SSL_CTX");
         goto end;
     }
     if (!use_ssl && ssl_ctx != NULL) {
         ERR_raise_data(ERR_LIB_HTTP, ERR_R_PASSED_INVALID_ARGUMENT,
-                       "SSL_CTX given but use_ssl == 0");
+            "SSL_CTX given but use_ssl == 0");
         goto end;
     }
 
@@ -2681,27 +2635,26 @@ ASN1_VALUE *app_http_get_asn1(const char *url, const char *proxy,
     info.timeout = timeout;
     info.ssl_ctx = ssl_ctx;
     mem = OSSL_HTTP_get(url, proxy, no_proxy, NULL /* bio */, NULL /* rbio */,
-                        app_http_tls_cb, &info, 0 /* buf_size */, headers,
-                        expected_content_type, 1 /* expect_asn1 */,
-                        OSSL_HTTP_DEFAULT_MAX_RESP_LEN, timeout);
+        app_http_tls_cb, &info, 0 /* buf_size */, headers,
+        expected_content_type, 1 /* expect_asn1 */,
+        OSSL_HTTP_DEFAULT_MAX_RESP_LEN, timeout);
     resp = ASN1_item_d2i_bio(it, mem, NULL);
     BIO_free(mem);
 
- end:
+end:
     OPENSSL_free(server);
     OPENSSL_free(port);
     return resp;
-
 }
 
 ASN1_VALUE *app_http_post_asn1(const char *host, const char *port,
-                               const char *path, const char *proxy,
-                               const char *no_proxy, SSL_CTX *ssl_ctx,
-                               const STACK_OF(CONF_VALUE) *headers,
-                               const char *content_type,
-                               ASN1_VALUE *req, const ASN1_ITEM *req_it,
-                               const char *expected_content_type,
-                               long timeout, const ASN1_ITEM *rsp_it)
+    const char *path, const char *proxy,
+    const char *no_proxy, SSL_CTX *ssl_ctx,
+    const STACK_OF(CONF_VALUE) *headers,
+    const char *content_type,
+    ASN1_VALUE *req, const ASN1_ITEM *req_it,
+    const char *expected_content_type,
+    long timeout, const ASN1_ITEM *rsp_it)
 {
     int use_ssl = ssl_ctx != NULL;
     APP_HTTP_TLS_INFO info;
@@ -2718,12 +2671,12 @@ ASN1_VALUE *app_http_post_asn1(const char *host, const char *port,
     info.timeout = timeout;
     info.ssl_ctx = ssl_ctx;
     rsp = OSSL_HTTP_transfer(NULL, host, port, path, use_ssl,
-                             proxy, no_proxy, NULL /* bio */, NULL /* rbio */,
-                             app_http_tls_cb, &info,
-                             0 /* buf_size */, headers, content_type, req_mem,
-                             expected_content_type, 1 /* expect_asn1 */,
-                             OSSL_HTTP_DEFAULT_MAX_RESP_LEN, timeout,
-                             0 /* keep_alive */);
+        proxy, no_proxy, NULL /* bio */, NULL /* rbio */,
+        app_http_tls_cb, &info,
+        0 /* buf_size */, headers, content_type, req_mem,
+        expected_content_type, 1 /* expect_asn1 */,
+        OSSL_HTTP_DEFAULT_MAX_RESP_LEN, timeout,
+        0 /* keep_alive */);
     BIO_free(req_mem);
     res = ASN1_item_d2i_bio(rsp_it, rsp, NULL);
     BIO_free(rsp);
@@ -2736,13 +2689,13 @@ ASN1_VALUE *app_http_post_asn1(const char *host, const char *port,
  * Platform-specific sections
  */
 #if defined(_WIN32)
-# ifdef fileno
-#  undef fileno
-#  define fileno(a) (int)_fileno(a)
-# endif
+#ifdef fileno
+#undef fileno
+#define fileno(a) (int)_fileno(a)
+#endif
 
-# include <windows.h>
-# include <tchar.h>
+#include <windows.h>
+#include <tchar.h>
 
 static int WIN32_rename(const char *from, const char *to)
 {
@@ -2753,21 +2706,21 @@ static int WIN32_rename(const char *from, const char *to)
     if (sizeof(TCHAR) == 1) {
         tfrom = (TCHAR *)from;
         tto = (TCHAR *)to;
-    } else {                    /* UNICODE path */
+    } else { /* UNICODE path */
         size_t i, flen = strlen(from) + 1, tlen = strlen(to) + 1;
 
         tfrom = malloc(sizeof(*tfrom) * (flen + tlen));
         if (tfrom == NULL)
             goto err;
         tto = tfrom + flen;
-# if !defined(_WIN32_WCE) || _WIN32_WCE >= 101
+#if !defined(_WIN32_WCE) || _WIN32_WCE >= 101
         if (!MultiByteToWideChar(CP_ACP, 0, from, flen, (WCHAR *)tfrom, flen))
-# endif
+#endif
             for (i = 0; i < flen; i++)
                 tfrom[i] = (TCHAR)from[i];
-# if !defined(_WIN32_WCE) || _WIN32_WCE >= 101
+#if !defined(_WIN32_WCE) || _WIN32_WCE >= 101
         if (!MultiByteToWideChar(CP_ACP, 0, to, tlen, (WCHAR *)tto, tlen))
-# endif
+#endif
             for (i = 0; i < tlen; i++)
                 tto[i] = (TCHAR)to[i];
     }
@@ -2785,10 +2738,10 @@ static int WIN32_rename(const char *from, const char *to)
     else if (err == ERROR_ACCESS_DENIED)
         errno = EACCES;
     else
-        errno = EINVAL;         /* we could map more codes... */
- err:
+        errno = EINVAL; /* we could map more codes... */
+err:
     ret = -1;
- ok:
+ok:
     if (tfrom != NULL && tfrom != (TCHAR *)from)
         free(tfrom);
     return ret;
@@ -2804,30 +2757,30 @@ double app_tminterval(int stop, int usertime)
     static ULARGE_INTEGER tmstart;
     static int warning = 1;
     int use_GetSystemTime = 1;
-# ifdef _WIN32_WINNT
+#ifdef _WIN32_WINNT
     static HANDLE proc = NULL;
 
     if (proc == NULL) {
         if (check_winnt())
             proc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE,
-                               GetCurrentProcessId());
+                GetCurrentProcessId());
         if (proc == NULL)
-            proc = (HANDLE) - 1;
+            proc = (HANDLE)-1;
     }
 
-    if (usertime && proc != (HANDLE) - 1) {
+    if (usertime && proc != (HANDLE)-1) {
         FILETIME junk;
 
         GetProcessTimes(proc, &junk, &junk, &junk, &now);
         use_GetSystemTime = 0;
     }
-# endif
+#endif
     if (use_GetSystemTime) {
         SYSTEMTIME systime;
 
         if (usertime && warning) {
             BIO_printf(bio_err, "To get meaningful results, run "
-                       "this program on idle system.\n");
+                                "this program on idle system.\n");
             warning = 0;
         }
         GetSystemTime(&systime);
@@ -2849,44 +2802,44 @@ double app_tminterval(int stop, int usertime)
     return ret;
 }
 #elif defined(OPENSSL_SYS_VXWORKS)
-# include <time.h>
+#include <time.h>
 
 double app_tminterval(int stop, int usertime)
 {
     double ret = 0;
-# ifdef CLOCK_REALTIME
+#ifdef CLOCK_REALTIME
     static struct timespec tmstart;
     struct timespec now;
-# else
+#else
     static unsigned long tmstart;
     unsigned long now;
-# endif
+#endif
     static int warning = 1;
 
     if (usertime && warning) {
         BIO_printf(bio_err, "To get meaningful results, run "
-                   "this program on idle system.\n");
+                            "this program on idle system.\n");
         warning = 0;
     }
-# ifdef CLOCK_REALTIME
+#ifdef CLOCK_REALTIME
     clock_gettime(CLOCK_REALTIME, &now);
     if (stop == TM_START)
         tmstart = now;
     else
         ret = ((now.tv_sec + now.tv_nsec * 1e-9)
-               - (tmstart.tv_sec + tmstart.tv_nsec * 1e-9));
-# else
+            - (tmstart.tv_sec + tmstart.tv_nsec * 1e-9));
+#else
     now = tickGet();
     if (stop == TM_START)
         tmstart = now;
     else
         ret = (now - tmstart) / (double)sysClkRateGet();
-# endif
+#endif
     return ret;
 }
 
-#elif defined(_SC_CLK_TCK)      /* by means of unistd.h */
-# include <sys/times.h>
+#elif defined(_SC_CLK_TCK) /* by means of unistd.h */
+#include <sys/times.h>
 
 double app_tminterval(int stop, int usertime)
 {
@@ -2910,8 +2863,8 @@ double app_tminterval(int stop, int usertime)
 }
 
 #else
-# include <sys/time.h>
-# include <sys/resource.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 
 double app_tminterval(int stop, int usertime)
 {
@@ -2929,7 +2882,7 @@ double app_tminterval(int stop, int usertime)
         tmstart = now;
     else
         ret = ((now.tv_sec + now.tv_usec * 1e-6)
-               - (tmstart.tv_sec + tmstart.tv_usec * 1e-6));
+            - (tmstart.tv_sec + tmstart.tv_usec * 1e-6));
 
     return ret;
 }
@@ -2951,7 +2904,7 @@ int app_isdir(const char *name)
 
 /* raw_read|write section */
 #if defined(__VMS)
-# include "vms_term_sock.h"
+#include "vms_term_sock.h"
 static int stdin_sock = -1;
 
 static void close_stdin_sock(void)
@@ -2991,7 +2944,7 @@ int raw_read_stdin(void *buf, int siz)
         return -1;
 }
 #elif defined(__VMS)
-# include <sys/socket.h>
+#include <sys/socket.h>
 
 int raw_read_stdin(void *buf, int siz)
 {
@@ -3037,13 +2990,13 @@ int raw_write_stdout(const void *buf, int siz)
 BIO *dup_bio_in(int format)
 {
     return BIO_new_fp(stdin,
-                      BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
+        BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
 }
 
 BIO *dup_bio_out(int format)
 {
     BIO *b = BIO_new_fp(stdout,
-                        BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
+        BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
     void *prefix = NULL;
 
     if (b == NULL)
@@ -3066,7 +3019,7 @@ BIO *dup_bio_out(int format)
 BIO *dup_bio_err(int format)
 {
     BIO *b = BIO_new_fp(stderr,
-                        BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
+        BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
 
 #ifdef OPENSSL_SYS_VMS
     if (b != NULL && FMT_istext(format))
@@ -3085,12 +3038,12 @@ void unbuffer(FILE *fp)
  * temporarily.
  */
 #if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma environment save
-# pragma message disable maylosedata2
+#pragma environment save
+#pragma message disable maylosedata2
 #endif
     setbuf(fp, NULL);
 #if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma environment restore
+#pragma environment restore
 #endif
 }
 
@@ -3141,21 +3094,21 @@ BIO *bio_open_owner(const char *filename, int format, int private)
     textmode = FMT_istext(format);
 #ifndef OPENSSL_NO_POSIX_IO
     mode = O_WRONLY;
-# ifdef O_CREAT
+#ifdef O_CREAT
     mode |= O_CREAT;
-# endif
-# ifdef O_TRUNC
+#endif
+#ifdef O_TRUNC
     mode |= O_TRUNC;
-# endif
+#endif
     if (!textmode) {
-# ifdef O_BINARY
+#ifdef O_BINARY
         mode |= O_BINARY;
-# elif defined(_O_BINARY)
+#elif defined(_O_BINARY)
         mode |= _O_BINARY;
-# endif
+#endif
     }
 
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
     /*
      * VMS doesn't have O_BINARY, it just doesn't make sense.  But,
      * it still needs to know that we're going binary, or fdopen()
@@ -3165,15 +3118,15 @@ BIO *bio_open_owner(const char *filename, int format, int private)
     if (!textmode)
         fd = open(filename, mode, 0600, "ctx=bin");
     else
-# endif
+#endif
         fd = open(filename, mode, 0600);
     if (fd < 0)
         goto err;
     fp = fdopen(fd, modestr('w', format));
-#else   /* OPENSSL_NO_POSIX_IO */
+#else /* OPENSSL_NO_POSIX_IO */
     /* Have stdio but not Posix IO, do the best we can */
     fp = fopen(filename, modestr('w', format));
-#endif  /* OPENSSL_NO_POSIX_IO */
+#endif /* OPENSSL_NO_POSIX_IO */
     if (fp == NULL)
         goto err;
     bflags = BIO_CLOSE;
@@ -3183,9 +3136,9 @@ BIO *bio_open_owner(const char *filename, int format, int private)
     if (b != NULL)
         return b;
 
- err:
+err:
     BIO_printf(bio_err, "%s: Can't open \"%s\" for writing, %s\n",
-               opt_getprog(), filename, strerror(errno));
+        opt_getprog(), filename, strerror(errno));
     ERR_print_errors(bio_err);
     /* If we have fp, then fdopen took over fd, so don't close both. */
     if (fp != NULL)
@@ -3198,7 +3151,7 @@ BIO *bio_open_owner(const char *filename, int format, int private)
 }
 
 static BIO *bio_open_default_(const char *filename, char mode, int format,
-                              int quiet)
+    int quiet)
 {
     BIO *ret;
 
@@ -3211,8 +3164,8 @@ static BIO *bio_open_default_(const char *filename, char mode, int format,
         if (ret != NULL)
             return ret;
         BIO_printf(bio_err,
-                   "Can't open %s, %s\n",
-                   mode == 'r' ? "stdin" : "stdout", strerror(errno));
+            "Can't open %s, %s\n",
+            mode == 'r' ? "stdin" : "stdout", strerror(errno));
     } else {
         ret = BIO_new_file(filename, modestr(mode, format));
         if (quiet) {
@@ -3222,8 +3175,8 @@ static BIO *bio_open_default_(const char *filename, char mode, int format,
         if (ret != NULL)
             return ret;
         BIO_printf(bio_err,
-                   "Can't open \"%s\" for %s, %s\n",
-                   filename, modeverb(mode), strerror(errno));
+            "Can't open \"%s\" for %s, %s\n",
+            filename, modeverb(mode), strerror(errno));
     }
     ERR_print_errors(bio_err);
     return NULL;
@@ -3300,7 +3253,7 @@ void wait_for_async(SSL *s)
 #if defined(OPENSSL_SYS_MSDOS)
 int has_stdin_waiting(void)
 {
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
     HANDLE inhand = GetStdHandle(STD_INPUT_HANDLE);
     DWORD events = 0;
     INPUT_RECORD inputrec;
@@ -3319,7 +3272,7 @@ int has_stdin_waiting(void)
         }
         return 0;
     }
-# endif
+#endif
     return _kbhit();
 }
 #endif
@@ -3335,16 +3288,16 @@ void corrupt_signature(const ASN1_STRING *signature)
 int check_cert_time_string(const char *time, const char *desc)
 {
     if (time == NULL || strcmp(time, "today") == 0
-            || ASN1_TIME_set_string_X509(NULL, time))
+        || ASN1_TIME_set_string_X509(NULL, time))
         return 1;
     BIO_printf(bio_err,
-               "%s is invalid, it should be \"today\" or have format [CC]YYMMDDHHMMSSZ\n",
-               desc);
+        "%s is invalid, it should be \"today\" or have format [CC]YYMMDDHHMMSSZ\n",
+        desc);
     return 0;
 }
 
 int set_cert_times(X509 *x, const char *startdate, const char *enddate,
-                   int days, int strict_compare_times)
+    int days, int strict_compare_times)
 {
     if (!check_cert_time_string(startdate, "start date"))
         return 0;
@@ -3376,7 +3329,7 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate,
     }
     if (ASN1_TIME_compare(X509_get0_notAfter(x), X509_get0_notBefore(x)) < 0) {
         BIO_printf(bio_err, "%s: end date before start date\n",
-                   strict_compare_times ? "Error" : "Warning");
+            strict_compare_times ? "Error" : "Warning");
         if (strict_compare_times)
             return 0;
     }
@@ -3409,7 +3362,7 @@ int set_crl_lastupdate(X509_CRL *crl, const char *lastupdate)
 }
 
 int set_crl_nextupdate(X509_CRL *crl, const char *nextupdate,
-                       long days, long hours, long secs)
+    long days, long hours, long secs)
 {
     int ret = 0;
     ASN1_TIME *tm = ASN1_TIME_new();
@@ -3443,7 +3396,7 @@ void make_uppercase(char *string)
 }
 
 OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
-                                     const OSSL_PARAM *paramdefs)
+    const OSSL_PARAM *paramdefs)
 {
     OSSL_PARAM *params = NULL;
     size_t sz = (size_t)sk_OPENSSL_STRING_num(opts);
@@ -3468,7 +3421,7 @@ OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
         /* Skip over the separator so that vmtp points to the value */
         vtmp++;
         if (!OSSL_PARAM_allocate_from_text(&params[params_n], paramdefs,
-                                           stmp, vtmp, strlen(vtmp), &found))
+                stmp, vtmp, strlen(vtmp), &found))
             goto err;
         OPENSSL_free(stmp);
     }
@@ -3477,7 +3430,7 @@ OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
 err:
     OPENSSL_free(stmp);
     BIO_printf(bio_err, "Parameter %s '%s'\n", found ? "error" : "unknown",
-               opt);
+        opt);
     ERR_print_errors(bio_err);
     app_params_free(params);
     return NULL;
@@ -3507,10 +3460,10 @@ EVP_PKEY *app_keygen(EVP_PKEY_CTX *ctx, const char *alg, int bits, int verbose)
     }
     if (!RAND_status())
         BIO_printf(bio_err, "Warning: generating random key material may take a long time\n"
-                   "if the system has a poor entropy source\n");
+                            "if the system has a poor entropy source\n");
     if (EVP_PKEY_keygen(ctx, &res) <= 0)
         BIO_printf(bio_err, "%s: Error generating %s key\n", opt_getprog(),
-                   alg != NULL ? alg : "asymmetric");
+            alg != NULL ? alg : "asymmetric");
     return res;
 }
 
@@ -3520,10 +3473,10 @@ EVP_PKEY *app_paramgen(EVP_PKEY_CTX *ctx, const char *alg)
 
     if (!RAND_status())
         BIO_printf(bio_err, "Warning: generating random key parameters may take a long time\n"
-                   "if the system has a poor entropy source\n");
+                            "if the system has a poor entropy source\n");
     if (EVP_PKEY_paramgen(ctx, &res) <= 0)
         BIO_printf(bio_err, "%s: Generating %s key parameters failed\n",
-                   opt_getprog(), alg != NULL ? alg : "asymmetric");
+            opt_getprog(), alg != NULL ? alg : "asymmetric");
     return res;
 }
 
diff --git a/apps/lib/apps_opt_printf.c b/apps/lib/apps_opt_printf.c
index e15f4b795e602..7816cb201b330 100644
--- a/apps/lib/apps_opt_printf.c
+++ b/apps/lib/apps_opt_printf.c
@@ -22,4 +22,3 @@ int opt_printf_stderr(const char *fmt, ...)
     va_end(ap);
     return ret;
 }
-
diff --git a/apps/lib/apps_ui.c b/apps/lib/apps_ui.c
index 00e0ba5d99969..aa2230381f3ab 100644
--- a/apps/lib/apps_ui.c
+++ b/apps/lib/apps_ui.c
@@ -32,17 +32,14 @@ static int ui_read(UI *ui, UI_STRING *uis)
         && UI_get0_user_data(ui)) {
         switch (UI_get_string_type(uis)) {
         case UIT_PROMPT:
-        case UIT_VERIFY:
-            {
-                const char *password =
-                    ((PW_CB_DATA *)UI_get0_user_data(ui))->password;
-
-                if (password != NULL) {
-                    UI_set_result(ui, uis, password);
-                    return 1;
-                }
+        case UIT_VERIFY: {
+            const char *password = ((PW_CB_DATA *)UI_get0_user_data(ui))->password;
+
+            if (password != NULL) {
+                UI_set_result(ui, uis, password);
+                return 1;
             }
-            break;
+        } break;
         case UIT_NONE:
         case UIT_BOOLEAN:
         case UIT_INFO:
@@ -67,15 +64,12 @@ static int ui_write(UI *ui, UI_STRING *uis)
         && UI_get0_user_data(ui)) {
         switch (UI_get_string_type(uis)) {
         case UIT_PROMPT:
-        case UIT_VERIFY:
-            {
-                const char *password =
-                    ((PW_CB_DATA *)UI_get0_user_data(ui))->password;
+        case UIT_VERIFY: {
+            const char *password = ((PW_CB_DATA *)UI_get0_user_data(ui))->password;
 
-                if (password != NULL)
-                    return 1;
-            }
-            break;
+            if (password != NULL)
+                return 1;
+        } break;
         case UIT_NONE:
         case UIT_BOOLEAN:
         case UIT_INFO:
@@ -101,7 +95,7 @@ static int ui_close(UI *ui)
 
 /* object_name defaults to prompt_info from ui user data if present */
 static char *ui_prompt_construct(UI *ui, const char *phrase_desc,
-                                 const char *object_name)
+    const char *object_name)
 {
     PW_CB_DATA *cb_data = (PW_CB_DATA *)UI_get0_user_data(ui);
 
@@ -132,8 +126,7 @@ int setup_ui_method(void)
         && 0 == UI_method_set_reader(ui_method, ui_read)
         && 0 == UI_method_set_writer(ui_method, ui_write)
         && 0 == UI_method_set_closer(ui_method, ui_close)
-        && 0 == UI_method_set_prompt_constructor(ui_method,
-                                                 ui_prompt_construct);
+        && 0 == UI_method_set_prompt_constructor(ui_method, ui_prompt_construct);
 }
 
 void destroy_ui_method(void)
@@ -190,12 +183,12 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_data)
     (void)UI_add_user_data(ui, cb_data);
 
     ok = UI_add_input_string(ui, prompt, ui_flags, buf,
-                             PW_MIN_LENGTH, bufsiz - 1);
+        PW_MIN_LENGTH, bufsiz - 1);
 
     if (ok >= 0 && verify) {
         buff = ui_malloc(bufsiz, "password buffer");
         ok = UI_add_verify_string(ui, prompt, ui_flags, buff,
-                                  PW_MIN_LENGTH, bufsiz - 1, buf);
+            PW_MIN_LENGTH, bufsiz - 1, buf);
     }
     if (ok >= 0)
         do {
diff --git a/apps/lib/cmp_mock_srv.c b/apps/lib/cmp_mock_srv.c
index 73ab1eb5600ea..bf8b06c390bd7 100644
--- a/apps/lib/cmp_mock_srv.c
+++ b/apps/lib/cmp_mock_srv.c
@@ -17,21 +17,21 @@
 
 /* the context for the CMP mock server */
 typedef struct {
-    X509 *refCert;             /* cert to expect for oldCertID in kur/rr msg */
-    X509 *certOut;             /* certificate to be returned in cp/ip/kup msg */
-    EVP_PKEY *keyOut;          /* Private key to be returned for central keygen */
-    X509_CRL *crlOut;          /* CRL to be returned in genp for crls */
-    STACK_OF(X509) *chainOut;  /* chain of certOut to add to extraCerts field */
+    X509 *refCert; /* cert to expect for oldCertID in kur/rr msg */
+    X509 *certOut; /* certificate to be returned in cp/ip/kup msg */
+    EVP_PKEY *keyOut; /* Private key to be returned for central keygen */
+    X509_CRL *crlOut; /* CRL to be returned in genp for crls */
+    STACK_OF(X509) *chainOut; /* chain of certOut to add to extraCerts field */
     STACK_OF(X509) *caPubsOut; /* used in caPubs of ip and in caCerts of genp */
-    X509 *newWithNew;          /* to return in newWithNew of rootKeyUpdate */
-    X509 *newWithOld;          /* to return in newWithOld of rootKeyUpdate */
-    X509 *oldWithNew;          /* to return in oldWithNew of rootKeyUpdate */
+    X509 *newWithNew; /* to return in newWithNew of rootKeyUpdate */
+    X509 *newWithOld; /* to return in newWithOld of rootKeyUpdate */
+    X509 *oldWithNew; /* to return in oldWithNew of rootKeyUpdate */
     OSSL_CMP_PKISI *statusOut; /* status for ip/cp/kup/rp msg unless polling */
-    int sendError;             /* send error response on given request type */
-    OSSL_CMP_MSG *req;         /* original request message during polling */
-    int pollCount;             /* number of polls before actual cert response */
-    int curr_pollCount;        /* number of polls so far for current request */
-    int checkAfterTime;        /* time the client should wait between polling */
+    int sendError; /* send error response on given request type */
+    OSSL_CMP_MSG *req; /* original request message during polling */
+    int pollCount; /* number of polls before actual cert response */
+    int curr_pollCount; /* number of polls so far for current request */
+    int checkAfterTime; /* time the client should wait between polling */
 } mock_srv_ctx;
 
 static void mock_srv_ctx_free(mock_srv_ctx *ctx)
@@ -62,27 +62,27 @@ static mock_srv_ctx *mock_srv_ctx_new(void)
 
     /* all other elements are initialized to 0 or NULL, respectively */
     return ctx;
- err:
+err:
     mock_srv_ctx_free(ctx);
     return NULL;
 }
 
-#define DEFINE_OSSL_SET1_CERT(FIELD) \
-    int ossl_cmp_mock_srv_set1_##FIELD(OSSL_CMP_SRV_CTX *srv_ctx, \
-                                       X509 *cert) \
-    { \
+#define DEFINE_OSSL_SET1_CERT(FIELD)                                   \
+    int ossl_cmp_mock_srv_set1_##FIELD(OSSL_CMP_SRV_CTX *srv_ctx,      \
+        X509 *cert)                                                    \
+    {                                                                  \
         mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx); \
- \
-        if (ctx == NULL) { \
-            ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
-            return 0; \
-        } \
-        if (cert == NULL || X509_up_ref(cert)) { \
-            X509_free(ctx->FIELD); \
-            ctx->FIELD = cert; \
-            return 1; \
-        } \
-        return 0; \
+                                                                       \
+        if (ctx == NULL) {                                             \
+            ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);               \
+            return 0;                                                  \
+        }                                                              \
+        if (cert == NULL || X509_up_ref(cert)) {                       \
+            X509_free(ctx->FIELD);                                     \
+            ctx->FIELD = cert;                                         \
+            return 1;                                                  \
+        }                                                              \
+        return 0;                                                      \
     }
 
 DEFINE_OSSL_SET1_CERT(refCert)
@@ -104,7 +104,7 @@ int ossl_cmp_mock_srv_set1_keyOut(OSSL_CMP_SRV_CTX *srv_ctx, EVP_PKEY *pkey)
 }
 
 int ossl_cmp_mock_srv_set1_crlOut(OSSL_CMP_SRV_CTX *srv_ctx,
-                                  X509_CRL *crl)
+    X509_CRL *crl)
 {
     mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
 
@@ -120,7 +120,7 @@ int ossl_cmp_mock_srv_set1_crlOut(OSSL_CMP_SRV_CTX *srv_ctx,
 }
 
 int ossl_cmp_mock_srv_set1_chainOut(OSSL_CMP_SRV_CTX *srv_ctx,
-                                    STACK_OF(X509) *chain)
+    STACK_OF(X509) *chain)
 {
     mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
     STACK_OF(X509) *chain_copy = NULL;
@@ -137,7 +137,7 @@ int ossl_cmp_mock_srv_set1_chainOut(OSSL_CMP_SRV_CTX *srv_ctx,
 }
 
 int ossl_cmp_mock_srv_set1_caPubsOut(OSSL_CMP_SRV_CTX *srv_ctx,
-                                     STACK_OF(X509) *caPubs)
+    STACK_OF(X509) *caPubs)
 {
     mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
     STACK_OF(X509) *caPubs_copy = NULL;
@@ -158,7 +158,7 @@ DEFINE_OSSL_SET1_CERT(newWithOld)
 DEFINE_OSSL_SET1_CERT(oldWithNew)
 
 int ossl_cmp_mock_srv_set_statusInfo(OSSL_CMP_SRV_CTX *srv_ctx, int status,
-                                     int fail_info, const char *text)
+    int fail_info, const char *text)
 {
     mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
     OSSL_CMP_PKISI *si;
@@ -249,7 +249,7 @@ static int delayed_delivery(OSSL_CMP_SRV_CTX *srv_ctx, const OSSL_CMP_MSG *req)
 
 /* check for matching reference cert components, as far as given */
 static int refcert_cmp(const X509 *refcert,
-                       const X509_NAME *issuer, const ASN1_INTEGER *serial)
+    const X509_NAME *issuer, const ASN1_INTEGER *serial)
 {
     const X509_NAME *ref_issuer;
     const ASN1_INTEGER *ref_serial;
@@ -264,7 +264,7 @@ static int refcert_cmp(const X509 *refcert,
 
 /* reset the state that belongs to a transaction */
 static int clean_transaction(OSSL_CMP_SRV_CTX *srv_ctx,
-                             ossl_unused const ASN1_OCTET_STRING *id)
+    ossl_unused const ASN1_OCTET_STRING *id)
 {
     mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
 
@@ -280,13 +280,13 @@ static int clean_transaction(OSSL_CMP_SRV_CTX *srv_ctx,
 }
 
 static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
-                                            const OSSL_CMP_MSG *cert_req,
-                                            ossl_unused int certReqId,
-                                            const OSSL_CRMF_MSG *crm,
-                                            const X509_REQ *p10cr,
-                                            X509 **certOut,
-                                            STACK_OF(X509) **chainOut,
-                                            STACK_OF(X509) **caPubs)
+    const OSSL_CMP_MSG *cert_req,
+    ossl_unused int certReqId,
+    const OSSL_CRMF_MSG *crm,
+    const X509_REQ *p10cr,
+    X509 **certOut,
+    STACK_OF(X509) **chainOut,
+    STACK_OF(X509) **caPubs)
 {
     mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
     int bodytype, central_keygen;
@@ -294,7 +294,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
     EVP_PKEY *keyOut = NULL;
 
     if (ctx == NULL || cert_req == NULL
-            || certOut == NULL || chainOut == NULL || caPubs == NULL) {
+        || certOut == NULL || chainOut == NULL || caPubs == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
         return NULL;
     }
@@ -320,8 +320,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
 
     /* accept cert profile for cr messages only with the configured name */
     if (OSSL_CMP_MSG_get_bodytype(cert_req) == OSSL_CMP_CR) {
-        STACK_OF(OSSL_CMP_ITAV) *itavs =
-            OSSL_CMP_HDR_get0_geninfo_ITAVs(OSSL_CMP_MSG_get0_header(cert_req));
+        STACK_OF(OSSL_CMP_ITAV) *itavs = OSSL_CMP_HDR_get0_geninfo_ITAVs(OSSL_CMP_MSG_get0_header(cert_req));
         int i;
 
         for (i = 0; i < sk_OSSL_CMP_ITAV_num(itavs); i++) {
@@ -340,8 +339,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
                 }
                 str = sk_ASN1_UTF8STRING_value(strs, 0);
                 if (str == NULL
-                    || (data =
-                        (const char *)ASN1_STRING_get0_data(str)) == NULL) {
+                    || (data = (const char *)ASN1_STRING_get0_data(str)) == NULL) {
                     ERR_raise(ERR_LIB_CMP, ERR_R_PASSED_INVALID_ARGUMENT);
                     return NULL;
                 }
@@ -356,7 +354,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
 
     /* accept cert update request only for the reference cert, if given */
     if (bodytype == OSSL_CMP_KUR
-            && crm != NULL /* thus not p10cr */ && ctx->refCert != NULL) {
+        && crm != NULL /* thus not p10cr */ && ctx->refCert != NULL) {
         const OSSL_CRMF_CERTID *cid = OSSL_CRMF_MSG_get0_regCtrl_oldCertID(crm);
 
         if (cid == NULL) {
@@ -364,15 +362,15 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
             return NULL;
         }
         if (!refcert_cmp(ctx->refCert,
-                         OSSL_CRMF_CERTID_get0_issuer(cid),
-                         OSSL_CRMF_CERTID_get0_serialNumber(cid))) {
+                OSSL_CRMF_CERTID_get0_issuer(cid),
+                OSSL_CRMF_CERTID_get0_serialNumber(cid))) {
             ERR_raise(ERR_LIB_CMP, CMP_R_WRONG_CERTID);
             return NULL;
         }
     }
 
     if (ctx->certOut != NULL
-            && (*certOut = X509_dup(ctx->certOut)) == NULL)
+        && (*certOut = X509_dup(ctx->certOut)) == NULL)
         /* Should return a cert produced from request template, see FR #16054 */
         goto err;
 
@@ -383,7 +381,7 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
         && (ctx->keyOut == NULL
             || (keyOut = EVP_PKEY_dup(ctx->keyOut)) == NULL
             || !OSSL_CMP_CTX_set0_newPkey(OSSL_CMP_SRV_CTX_get0_cmp_ctx(srv_ctx),
-                                          1 /* priv */, keyOut))) {
+                1 /* priv */, keyOut))) {
         EVP_PKEY_free(keyOut);
         goto err;
     }
@@ -393,17 +391,17 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
      */
 
     if (ctx->chainOut != NULL
-            && (*chainOut = X509_chain_up_ref(ctx->chainOut)) == NULL)
+        && (*chainOut = X509_chain_up_ref(ctx->chainOut)) == NULL)
         goto err;
     if (ctx->caPubsOut != NULL /* OSSL_CMP_PKIBODY_IP not visible here */
-            && (*caPubs = X509_chain_up_ref(ctx->caPubsOut)) == NULL)
+        && (*caPubs = X509_chain_up_ref(ctx->caPubsOut)) == NULL)
         goto err;
     if (ctx->statusOut != NULL
-            && (si = OSSL_CMP_PKISI_dup(ctx->statusOut)) == NULL)
+        && (si = OSSL_CMP_PKISI_dup(ctx->statusOut)) == NULL)
         goto err;
     return si;
 
- err:
+err:
     X509_free(*certOut);
     *certOut = NULL;
     OSSL_STACK_OF_X509_free(*chainOut);
@@ -414,9 +412,9 @@ static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
 }
 
 static OSSL_CMP_PKISI *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
-                                  const OSSL_CMP_MSG *rr,
-                                  const X509_NAME *issuer,
-                                  const ASN1_INTEGER *serial)
+    const OSSL_CMP_MSG *rr,
+    const X509_NAME *issuer,
+    const ASN1_INTEGER *serial)
 {
     mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
 
@@ -425,7 +423,7 @@ static OSSL_CMP_PKISI *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
         return NULL;
     }
     if (ctx->sendError == 1
-            || ctx->sendError == OSSL_CMP_MSG_get_bodytype(rr)) {
+        || ctx->sendError == OSSL_CMP_MSG_get_bodytype(rr)) {
         ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
         return NULL;
     }
@@ -433,9 +431,9 @@ static OSSL_CMP_PKISI *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
     /* allow any RR derived from CSR which does not include issuer and serial */
     if ((issuer != NULL || serial != NULL)
         /* accept revocation only for the reference cert, if given */
-            && !refcert_cmp(ctx->refCert, issuer, serial)) {
+        && !refcert_cmp(ctx->refCert, issuer, serial)) {
         ERR_raise_data(ERR_LIB_CMP, CMP_R_REQUEST_NOT_ACCEPTED,
-                       "wrong certificate to revoke");
+            "wrong certificate to revoke");
         return NULL;
     }
     return OSSL_CMP_PKISI_dup(ctx->statusOut);
@@ -443,7 +441,7 @@ static OSSL_CMP_PKISI *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
 
 /* return -1 for error, 0 for no update available */
 static int check_client_crl(const STACK_OF(OSSL_CMP_CRLSTATUS) *crlStatusList,
-                            const X509_CRL *crl)
+    const X509_CRL *crl)
 {
     OSSL_CMP_CRLSTATUS *crlstatus;
     DIST_POINT_NAME *dpn = NULL;
@@ -471,9 +469,9 @@ static int check_client_crl(const STACK_OF(OSSL_CMP_CRLSTATUS) *crlStatusList,
                 ERR_raise(ERR_LIB_CMP, CMP_R_UNKNOWN_CRL_ISSUER);
                 return -1;
             }
-        } else {  
-            ERR_raise(ERR_LIB_CMP, CMP_R_SENDER_GENERALNAME_TYPE_NOT_SUPPORTED);  
-            return -1; /* error according to RFC 9483 section 4.3.4 */  
+        } else {
+            ERR_raise(ERR_LIB_CMP, CMP_R_SENDER_GENERALNAME_TYPE_NOT_SUPPORTED);
+            return -1; /* error according to RFC 9483 section 4.3.4 */
         }
     }
 
@@ -482,7 +480,7 @@ static int check_client_crl(const STACK_OF(OSSL_CMP_CRLSTATUS) *crlStatusList,
 }
 
 static OSSL_CMP_ITAV *process_genm_itav(mock_srv_ctx *ctx, int req_nid,
-                                        const OSSL_CMP_ITAV *req)
+    const OSSL_CMP_ITAV *req)
 {
     OSSL_CMP_ITAV *rsp = NULL;
 
@@ -490,81 +488,76 @@ static OSSL_CMP_ITAV *process_genm_itav(mock_srv_ctx *ctx, int req_nid,
     case NID_id_it_caCerts:
         rsp = OSSL_CMP_ITAV_new_caCerts(ctx->caPubsOut);
         break;
-    case NID_id_it_rootCaCert:
-        {
-            X509 *rootcacert = NULL;
-
-            if (!OSSL_CMP_ITAV_get0_rootCaCert(req, &rootcacert))
-                return NULL;
-
-            if (rootcacert != NULL
-                && X509_NAME_cmp(X509_get_subject_name(rootcacert),
-                                 X509_get_subject_name(ctx->newWithNew)) != 0)
-                /* The subjects do not match */
-                rsp = OSSL_CMP_ITAV_new_rootCaKeyUpdate(NULL, NULL, NULL);
-            else
-                rsp = OSSL_CMP_ITAV_new_rootCaKeyUpdate(ctx->newWithNew,
-                                                        ctx->newWithOld,
-                                                        ctx->oldWithNew);
-        }
-        break;
-    case NID_id_it_crlStatusList:
-        {
-            STACK_OF(OSSL_CMP_CRLSTATUS) *crlstatuslist = NULL;
-            int res = 0;
-
-            if (!OSSL_CMP_ITAV_get0_crlStatusList(req, &crlstatuslist))
-                return NULL;
-
-            res = check_client_crl(crlstatuslist, ctx->crlOut);
-            if (res < 0)
-                rsp = NULL;
-            else
-                rsp = OSSL_CMP_ITAV_new_crls(res == 0 ? NULL : ctx->crlOut);
-        }
-        break;
-    case NID_id_it_certReqTemplate:
-        {
-            OSSL_CRMF_CERTTEMPLATE *reqtemp;
-            OSSL_CMP_ATAVS *keyspec = NULL;
-            X509_ALGOR *keyalg = NULL;
-            OSSL_CMP_ATAV *rsakeylen, *eckeyalg;
-            int ok = 0;
-
-            if ((reqtemp = OSSL_CRMF_CERTTEMPLATE_new()) == NULL)
-                return NULL;
-
-            if (!OSSL_CRMF_CERTTEMPLATE_fill(reqtemp, NULL, NULL,
-                                             X509_get_issuer_name(ctx->refCert),
-                                             NULL))
-                goto crt_err;
-
-            if ((keyalg = X509_ALGOR_new()) == NULL)
-                goto crt_err;
-
-            (void)X509_ALGOR_set0(keyalg, OBJ_nid2obj(NID_X9_62_id_ecPublicKey),
-                                  V_ASN1_UNDEF, NULL); /* cannot fail */
-
-            eckeyalg = OSSL_CMP_ATAV_new_algId(keyalg);
-            rsakeylen = OSSL_CMP_ATAV_new_rsaKeyLen(4096);
-            ok = OSSL_CMP_ATAV_push1(&keyspec, eckeyalg)
-                 && OSSL_CMP_ATAV_push1(&keyspec, rsakeylen);
-            OSSL_CMP_ATAV_free(eckeyalg);
-            OSSL_CMP_ATAV_free(rsakeylen);
-            X509_ALGOR_free(keyalg);
-
-            if (!ok)
-                goto crt_err;
-
-            rsp = OSSL_CMP_ITAV_new0_certReqTemplate(reqtemp, keyspec);
-            return rsp;
-
-        crt_err:
-            OSSL_CRMF_CERTTEMPLATE_free(reqtemp);
-            OSSL_CMP_ATAVS_free(keyspec);
+    case NID_id_it_rootCaCert: {
+        X509 *rootcacert = NULL;
+
+        if (!OSSL_CMP_ITAV_get0_rootCaCert(req, &rootcacert))
             return NULL;
-        }
-        break;
+
+        if (rootcacert != NULL
+            && X509_NAME_cmp(X509_get_subject_name(rootcacert),
+                   X509_get_subject_name(ctx->newWithNew))
+                != 0)
+            /* The subjects do not match */
+            rsp = OSSL_CMP_ITAV_new_rootCaKeyUpdate(NULL, NULL, NULL);
+        else
+            rsp = OSSL_CMP_ITAV_new_rootCaKeyUpdate(ctx->newWithNew,
+                ctx->newWithOld,
+                ctx->oldWithNew);
+    } break;
+    case NID_id_it_crlStatusList: {
+        STACK_OF(OSSL_CMP_CRLSTATUS) *crlstatuslist = NULL;
+        int res = 0;
+
+        if (!OSSL_CMP_ITAV_get0_crlStatusList(req, &crlstatuslist))
+            return NULL;
+
+        res = check_client_crl(crlstatuslist, ctx->crlOut);
+        if (res < 0)
+            rsp = NULL;
+        else
+            rsp = OSSL_CMP_ITAV_new_crls(res == 0 ? NULL : ctx->crlOut);
+    } break;
+    case NID_id_it_certReqTemplate: {
+        OSSL_CRMF_CERTTEMPLATE *reqtemp;
+        OSSL_CMP_ATAVS *keyspec = NULL;
+        X509_ALGOR *keyalg = NULL;
+        OSSL_CMP_ATAV *rsakeylen, *eckeyalg;
+        int ok = 0;
+
+        if ((reqtemp = OSSL_CRMF_CERTTEMPLATE_new()) == NULL)
+            return NULL;
+
+        if (!OSSL_CRMF_CERTTEMPLATE_fill(reqtemp, NULL, NULL,
+                X509_get_issuer_name(ctx->refCert),
+                NULL))
+            goto crt_err;
+
+        if ((keyalg = X509_ALGOR_new()) == NULL)
+            goto crt_err;
+
+        (void)X509_ALGOR_set0(keyalg, OBJ_nid2obj(NID_X9_62_id_ecPublicKey),
+            V_ASN1_UNDEF, NULL); /* cannot fail */
+
+        eckeyalg = OSSL_CMP_ATAV_new_algId(keyalg);
+        rsakeylen = OSSL_CMP_ATAV_new_rsaKeyLen(4096);
+        ok = OSSL_CMP_ATAV_push1(&keyspec, eckeyalg)
+            && OSSL_CMP_ATAV_push1(&keyspec, rsakeylen);
+        OSSL_CMP_ATAV_free(eckeyalg);
+        OSSL_CMP_ATAV_free(rsakeylen);
+        X509_ALGOR_free(keyalg);
+
+        if (!ok)
+            goto crt_err;
+
+        rsp = OSSL_CMP_ITAV_new0_certReqTemplate(reqtemp, keyspec);
+        return rsp;
+
+    crt_err:
+        OSSL_CRMF_CERTTEMPLATE_free(reqtemp);
+        OSSL_CMP_ATAVS_free(keyspec);
+        return NULL;
+    } break;
     default:
         rsp = OSSL_CMP_ITAV_dup(req);
     }
@@ -572,9 +565,9 @@ static OSSL_CMP_ITAV *process_genm_itav(mock_srv_ctx *ctx, int req_nid,
 }
 
 static int process_genm(OSSL_CMP_SRV_CTX *srv_ctx,
-                        const OSSL_CMP_MSG *genm,
-                        const STACK_OF(OSSL_CMP_ITAV) *in,
-                        STACK_OF(OSSL_CMP_ITAV) **out)
+    const OSSL_CMP_MSG *genm,
+    const STACK_OF(OSSL_CMP_ITAV) *in,
+    STACK_OF(OSSL_CMP_ITAV) **out)
 {
     mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
 
@@ -583,8 +576,8 @@ static int process_genm(OSSL_CMP_SRV_CTX *srv_ctx,
         return 0;
     }
     if (ctx->sendError == 1
-            || ctx->sendError == OSSL_CMP_MSG_get_bodytype(genm)
-            || sk_OSSL_CMP_ITAV_num(in) > 1) {
+        || ctx->sendError == OSSL_CMP_MSG_get_bodytype(genm)
+        || sk_OSSL_CMP_ITAV_num(in) > 1) {
         ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
         return 0;
     }
@@ -602,14 +595,14 @@ static int process_genm(OSSL_CMP_SRV_CTX *srv_ctx,
     }
 
     *out = sk_OSSL_CMP_ITAV_deep_copy(in, OSSL_CMP_ITAV_dup,
-                                      OSSL_CMP_ITAV_free);
+        OSSL_CMP_ITAV_free);
     return *out != NULL;
 }
 
 static void process_error(OSSL_CMP_SRV_CTX *srv_ctx, const OSSL_CMP_MSG *error,
-                          const OSSL_CMP_PKISI *statusInfo,
-                          const ASN1_INTEGER *errorCode,
-                          const OSSL_CMP_PKIFREETEXT *errorDetails)
+    const OSSL_CMP_PKISI *statusInfo,
+    const ASN1_INTEGER *errorCode,
+    const OSSL_CMP_PKIFREETEXT *errorDetails)
 {
     mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
     char buf[OSSL_CMP_PKISI_BUFLEN];
@@ -628,7 +621,7 @@ static void process_error(OSSL_CMP_SRV_CTX *srv_ctx, const OSSL_CMP_MSG *error,
     } else {
         sibuf = OSSL_CMP_snprint_PKIStatusInfo(statusInfo, buf, sizeof(buf));
         BIO_printf(bio_err, "pkiStatusInfo: %s\n",
-                   sibuf != NULL ? sibuf: "<invalid>");
+            sibuf != NULL ? sibuf : "<invalid>");
     }
 
     if (errorCode == NULL)
@@ -644,18 +637,18 @@ static void process_error(OSSL_CMP_SRV_CTX *srv_ctx, const OSSL_CMP_MSG *error,
             if (i > 0)
                 BIO_printf(bio_err, ", ");
             ASN1_STRING_print_ex(bio_err,
-                                 sk_ASN1_UTF8STRING_value(errorDetails, i),
-                                 ASN1_STRFLGS_ESC_QUOTE);
+                sk_ASN1_UTF8STRING_value(errorDetails, i),
+                ASN1_STRFLGS_ESC_QUOTE);
         }
         BIO_printf(bio_err, "\n");
     }
 }
 
 static int process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
-                            const OSSL_CMP_MSG *certConf,
-                            ossl_unused int certReqId,
-                            const ASN1_OCTET_STRING *certHash,
-                            const OSSL_CMP_PKISI *si)
+    const OSSL_CMP_MSG *certConf,
+    ossl_unused int certReqId,
+    const ASN1_OCTET_STRING *certHash,
+    const OSSL_CMP_PKISI *si)
 {
     mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
     ASN1_OCTET_STRING *digest;
@@ -665,8 +658,8 @@ static int process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
         return 0;
     }
     if (ctx->sendError == 1
-            || ctx->sendError == OSSL_CMP_MSG_get_bodytype(certConf)
-            || ctx->certOut == NULL) {
+        || ctx->sendError == OSSL_CMP_MSG_get_bodytype(certConf)
+        || ctx->certOut == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
         return 0;
     }
@@ -684,22 +677,22 @@ static int process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
 
 /* return 0 on failure, 1 on success, setting *req or otherwise *check_after */
 static int process_pollReq(OSSL_CMP_SRV_CTX *srv_ctx,
-                           const OSSL_CMP_MSG *pollReq,
-                           ossl_unused int certReqId,
-                           OSSL_CMP_MSG **req, int64_t *check_after)
+    const OSSL_CMP_MSG *pollReq,
+    ossl_unused int certReqId,
+    OSSL_CMP_MSG **req, int64_t *check_after)
 {
     mock_srv_ctx *ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(srv_ctx);
 
     if (req != NULL)
         *req = NULL;
     if (ctx == NULL || pollReq == NULL
-            || req == NULL || check_after == NULL) {
+        || req == NULL || check_after == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
         return 0;
     }
 
     if (ctx->sendError == 1
-            || ctx->sendError == OSSL_CMP_MSG_get_bodytype(pollReq)) {
+        || ctx->sendError == OSSL_CMP_MSG_get_bodytype(pollReq)) {
         ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
         return 0;
     }
@@ -725,11 +718,11 @@ OSSL_CMP_SRV_CTX *ossl_cmp_mock_srv_new(OSSL_LIB_CTX *libctx, const char *propq)
     mock_srv_ctx *ctx = mock_srv_ctx_new();
 
     if (srv_ctx != NULL && ctx != NULL
-            && OSSL_CMP_SRV_CTX_init(srv_ctx, ctx, process_cert_request,
-                                     process_rr, process_genm, process_error,
-                                     process_certConf, process_pollReq)
-            && OSSL_CMP_SRV_CTX_init_trans(srv_ctx,
-                                           delayed_delivery, clean_transaction))
+        && OSSL_CMP_SRV_CTX_init(srv_ctx, ctx, process_cert_request,
+            process_rr, process_genm, process_error,
+            process_certConf, process_pollReq)
+        && OSSL_CMP_SRV_CTX_init_trans(srv_ctx,
+            delayed_delivery, clean_transaction))
         return srv_ctx;
 
     mock_srv_ctx_free(ctx);
diff --git a/apps/lib/columns.c b/apps/lib/columns.c
index aa58fe1781f5f..3dd86600e701c 100644
--- a/apps/lib/columns.c
+++ b/apps/lib/columns.c
@@ -24,4 +24,3 @@ void calculate_columns(FUNCTION *functions, DISPLAY_COLUMNS *dc)
     dc->width = maxlen + 2;
     dc->columns = (80 - 1) / dc->width;
 }
-
diff --git a/apps/lib/engine.c b/apps/lib/engine.c
index 209c4b6b03c26..c486a10513e3e 100644
--- a/apps/lib/engine.c
+++ b/apps/lib/engine.c
@@ -19,7 +19,7 @@
 #include <openssl/types.h> /* Ensure we have the ENGINE type, regardless */
 #include <openssl/err.h>
 #ifndef OPENSSL_NO_ENGINE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include "apps.h"
 
@@ -60,8 +60,8 @@ ENGINE *setup_engine_methods(const char *id, unsigned int methods, int debug)
         if (debug)
             (void)ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM, 0, bio_err, 0);
         if (!ENGINE_ctrl_cmd(e, "SET_USER_INTERFACE", 0,
-                             (void *)get_ui_method(), 0, 1)
-                || !ENGINE_set_default(e, methods)) {
+                (void *)get_ui_method(), 0, 1)
+            || !ENGINE_set_default(e, methods)) {
             BIO_printf(bio_err, "Cannot use engine \"%s\"\n", ENGINE_get_id(e));
             ERR_print_errors(bio_err);
             ENGINE_free(e);
@@ -113,8 +113,7 @@ char *make_engine_uri(ENGINE *e, const char *key_id, const char *desc)
         BIO_printf(bio_err, "No engine key id specified for loading %s\n", desc);
     } else {
         const char *engineid = ENGINE_get_id(e);
-        size_t uri_sz =
-            sizeof(ENGINE_SCHEME_COLON) - 1
+        size_t uri_sz = sizeof(ENGINE_SCHEME_COLON) - 1
             + strlen(engineid)
             + 1 /* : */
             + strlen(key_id)
@@ -151,9 +150,9 @@ int get_legacy_pkey_id(OSSL_LIB_CTX *libctx, const char *algname, ENGINE *e)
         ameth = ENGINE_get_pkey_asn1_meth_str(e, algname, -1);
     else
 #endif
-    /* We're only interested if it comes from an ENGINE */
-    if (tmpeng == NULL)
-        ameth = NULL;
+        /* We're only interested if it comes from an ENGINE */
+        if (tmpeng == NULL)
+            ameth = NULL;
 
     ERR_pop_to_mark();
     if (ameth == NULL)
diff --git a/apps/lib/engine_loader.c b/apps/lib/engine_loader.c
index e0f26f614afe2..dd391bafe4fad 100644
--- a/apps/lib/engine_loader.c
+++ b/apps/lib/engine_loader.c
@@ -19,10 +19,10 @@
 
 #ifndef OPENSSL_NO_ENGINE
 
-# include <stdarg.h>
-# include <string.h>
-# include <openssl/engine.h>
-# include <openssl/store.h>
+#include <stdarg.h>
+#include <string.h>
+#include <openssl/engine.h>
+#include <openssl/store.h>
 
 /*
  * Support for legacy private engine keys via the 'org.openssl.engine:' scheme
@@ -36,10 +36,10 @@
 
 /* Local definition of OSSL_STORE_LOADER_CTX */
 struct ossl_store_loader_ctx_st {
-    ENGINE *e;                   /* Structural reference */
+    ENGINE *e; /* Structural reference */
     char *keyid;
     int expected;
-    int loaded;                  /* 0 = key not loaded yet, 1 = key loaded */
+    int loaded; /* 0 = key not loaded yet, 1 = key loaded */
 };
 
 static OSSL_STORE_LOADER_CTX *OSSL_STORE_LOADER_CTX_new(ENGINE *e, char *keyid)
@@ -63,9 +63,9 @@ static void OSSL_STORE_LOADER_CTX_free(OSSL_STORE_LOADER_CTX *ctx)
 }
 
 static OSSL_STORE_LOADER_CTX *engine_open(const OSSL_STORE_LOADER *loader,
-                                          const char *uri,
-                                          const UI_METHOD *ui_method,
-                                          void *ui_data)
+    const char *uri,
+    const UI_METHOD *ui_method,
+    void *ui_data)
 {
     const char *p = uri, *q;
     ENGINE *e = NULL;
@@ -77,9 +77,9 @@ static OSSL_STORE_LOADER_CTX *engine_open(const OSSL_STORE_LOADER *loader,
 
     /* Look for engine ID */
     q = strchr(p, ':');
-    if (q != NULL                /* There is both an engine ID and a key ID */
-        && p[0] != ':'           /* The engine ID is at least one character */
-        && q[1] != '\0') {       /* The key ID is at least one character */
+    if (q != NULL /* There is both an engine ID and a key ID */
+        && p[0] != ':' /* The engine ID is at least one character */
+        && q[1] != '\0') { /* The key ID is at least one character */
         char engineid[256];
         size_t engineid_l = q - p;
 
@@ -113,7 +113,7 @@ static int engine_expect(OSSL_STORE_LOADER_CTX *ctx, int expected)
 }
 
 static OSSL_STORE_INFO *engine_load(OSSL_STORE_LOADER_CTX *ctx,
-                                    const UI_METHOD *ui_method, void *ui_data)
+    const UI_METHOD *ui_method, void *ui_data)
 {
     EVP_PKEY *pkey = NULL, *pubkey = NULL;
     OSSL_STORE_INFO *info = NULL;
@@ -122,14 +122,12 @@ static OSSL_STORE_INFO *engine_load(OSSL_STORE_LOADER_CTX *ctx,
         if (ENGINE_init(ctx->e)) {
             if (ctx->expected == 0
                 || ctx->expected == OSSL_STORE_INFO_PKEY)
-                pkey =
-                    ENGINE_load_private_key(ctx->e, ctx->keyid,
-                                            (UI_METHOD *)ui_method, ui_data);
+                pkey = ENGINE_load_private_key(ctx->e, ctx->keyid,
+                    (UI_METHOD *)ui_method, ui_data);
             if ((pkey == NULL && ctx->expected == 0)
                 || ctx->expected == OSSL_STORE_INFO_PUBKEY)
-                pubkey =
-                    ENGINE_load_public_key(ctx->e, ctx->keyid,
-                                           (UI_METHOD *)ui_method, ui_data);
+                pubkey = ENGINE_load_public_key(ctx->e, ctx->keyid,
+                    (UI_METHOD *)ui_method, ui_data);
             ENGINE_finish(ctx->e);
         }
     }
@@ -188,7 +186,7 @@ void destroy_engine_loader(void)
     OSSL_STORE_LOADER_free(loader);
 }
 
-#else  /* !OPENSSL_NO_ENGINE */
+#else /* !OPENSSL_NO_ENGINE */
 
 int setup_engine_loader(void)
 {
diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c
index 8136228b32d0f..9b2c45a8645a8 100644
--- a/apps/lib/http_server.c
+++ b/apps/lib/http_server.c
@@ -14,7 +14,7 @@
  * On VMS, you need to define this to get the declaration of fileno().  The
  * value 2 is to make sure no function defined in POSIX-2 is left undefined.
  */
-# define _POSIX_C_SOURCE 2
+#define _POSIX_C_SOURCE 2
 #endif
 
 #include <ctype.h>
@@ -30,9 +30,9 @@
 
 #define HTTP_PREFIX "HTTP/"
 #define HTTP_VERSION_PATT "1." /* allow 1.x */
-#define HTTP_PREFIX_VERSION HTTP_PREFIX""HTTP_VERSION_PATT
-#define HTTP_1_0 HTTP_PREFIX_VERSION"0" /* "HTTP/1.0" */
-#define HTTP_VERSION_STR " "HTTP_PREFIX_VERSION
+#define HTTP_PREFIX_VERSION HTTP_PREFIX "" HTTP_VERSION_PATT
+#define HTTP_1_0 HTTP_PREFIX_VERSION "0" /* "HTTP/1.0" */
+#define HTTP_VERSION_STR " " HTTP_PREFIX_VERSION
 
 #define log_HTTP(prog, level, text) \
     trace_log_message(OSSL_TRACE_CATEGORY_HTTP, prog, level, "%s", text)
@@ -40,7 +40,7 @@
     trace_log_message(OSSL_TRACE_CATEGORY_HTTP, prog, level, fmt, arg)
 #define log_HTTP2(prog, level, fmt, arg1, arg2) \
     trace_log_message(OSSL_TRACE_CATEGORY_HTTP, prog, level, fmt, arg1, arg2)
-#define log_HTTP3(prog, level, fmt, a1, a2, a3)                        \
+#define log_HTTP3(prog, level, fmt, a1, a2, a3) \
     trace_log_message(OSSL_TRACE_CATEGORY_HTTP, prog, level, fmt, a1, a2, a3)
 
 #ifdef HTTP_DAEMON
@@ -88,8 +88,8 @@ void spawn_loop(const char *prog)
 
     if (setpgid(0, 0)) {
         log_HTTP1(prog, LOG_CRIT,
-                  "error detaching from parent process group: %s",
-                  strerror(errno));
+            "error detaching from parent process group: %s",
+            strerror(errno));
         exit(1);
     }
     kidpids = app_malloc(n_responders * sizeof(*kidpids), "child PID array");
@@ -117,32 +117,32 @@ void spawn_loop(const char *prog)
                 }
                 if (i >= n_responders) {
                     log_HTTP1(prog, LOG_CRIT,
-                              "internal error: no matching child slot for pid: %ld",
-                              (long)fpid);
+                        "internal error: no matching child slot for pid: %ld",
+                        (long)fpid);
                     killall(1, kidpids);
                 }
                 if (status != 0) {
                     if (WIFEXITED(status)) {
                         log_HTTP2(prog, LOG_WARNING,
-                                  "child process: %ld, exit status: %d",
-                                  (long)fpid, WEXITSTATUS(status));
+                            "child process: %ld, exit status: %d",
+                            (long)fpid, WEXITSTATUS(status));
                     } else if (WIFSIGNALED(status)) {
                         char *dumped = "";
 
-# ifdef WCOREDUMP
+#ifdef WCOREDUMP
                         if (WCOREDUMP(status))
                             dumped = " (core dumped)";
-# endif
+#endif
                         log_HTTP3(prog, LOG_WARNING,
-                                  "child process: %ld, term signal %d%s",
-                                  (long)fpid, WTERMSIG(status), dumped);
+                            "child process: %ld, term signal %d%s",
+                            (long)fpid, WTERMSIG(status), dumped);
                     }
                     OSSL_sleep(1000);
                 }
                 break;
             } else if (errno != EINTR) {
                 log_HTTP1(prog, LOG_CRIT,
-                          "waitpid() failed: %s", strerror(errno));
+                    "waitpid() failed: %s", strerror(errno));
                 killall(1, kidpids);
             }
         }
@@ -165,7 +165,7 @@ void spawn_loop(const char *prog)
                 _exit(1);
             }
             return;
-        default:            /* parent */
+        default: /* parent */
             for (i = 0; i < n_responders; ++i) {
                 if (kidpids[i] == 0) {
                     kidpids[i] = fpid;
@@ -175,7 +175,7 @@ void spawn_loop(const char *prog)
             }
             if (i >= n_responders) {
                 log_HTTP(prog, LOG_CRIT,
-                         "internal error: no free child slots");
+                    "internal error: no free child slots");
                 killall(1, kidpids);
             }
             break;
@@ -228,7 +228,7 @@ BIO *http_server_init(const char *prog, const char *port, int verb)
 
     return acbio;
 
- err:
+err:
     ERR_print_errors(bio_err);
     BIO_free_all(acbio);
     BIO_free(bufbio);
@@ -262,9 +262,9 @@ static int urldecode(char *p)
 /* if *pcbio != NULL, continue given connected session, else accept new */
 /* if found_keep_alive != NULL, return this way connection persistence state */
 int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
-                             char **ppath, BIO **pcbio, BIO *acbio,
-                             int *found_keep_alive,
-                             const char *prog, int accept_get, int timeout)
+    char **ppath, BIO **pcbio, BIO *acbio,
+    int *found_keep_alive,
+    const char *prog, int accept_get, int timeout)
 {
     BIO *cbio = *pcbio, *getbio = NULL, *b64 = NULL;
     int len;
@@ -286,7 +286,7 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
             goto fatal;
         }
         log_HTTP1(prog, LOG_DEBUG,
-                  "awaiting new connection on port %s ...", port);
+            "awaiting new connection on port %s ...", port);
         OPENSSL_free(port);
 
         if (BIO_do_accept(acbio) <= 0)
@@ -303,12 +303,12 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
         goto out;
     }
 
-# ifdef HTTP_DAEMON
+#ifdef HTTP_DAEMON
     if (timeout > 0) {
         (void)BIO_get_fd(cbio, &acfd);
         alarm(timeout);
     }
-# endif
+#endif
 
     /* Read the request line. */
     len = BIO_gets(cbio, reqbuf, sizeof(reqbuf));
@@ -322,23 +322,23 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
     }
 
     if (((end = strchr(reqbuf, '\r')) != NULL && end[1] == '\n')
-            || (end = strchr(reqbuf, '\n')) != NULL)
+        || (end = strchr(reqbuf, '\n')) != NULL)
         *end = '\0';
     if (log_get_verbosity() < LOG_TRACE)
         trace_log_message(-1, prog, LOG_INFO,
-                          "received request, 1st line: %s", reqbuf);
+            "received request, 1st line: %s", reqbuf);
     log_HTTP(prog, LOG_TRACE, "received request header:");
     log_HTTP1(prog, LOG_TRACE, "%s", reqbuf);
     if (end == NULL) {
         log_HTTP(prog, LOG_WARNING,
-                 "cannot parse HTTP header: missing end of line");
+            "cannot parse HTTP header: missing end of line");
         (void)http_server_send_status(prog, cbio, 400, "Bad Request");
         goto out;
     }
 
     url = meth = reqbuf;
     if ((accept_get && CHECK_AND_SKIP_PREFIX(url, "GET "))
-            || CHECK_AND_SKIP_PREFIX(url, "POST ")) {
+        || CHECK_AND_SKIP_PREFIX(url, "POST ")) {
 
         /* Expecting (GET|POST) {sp} /URL {sp} HTTP/1.x */
         url[-1] = '\0';
@@ -346,8 +346,8 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
             url++;
         if (*url != '/') {
             log_HTTP2(prog, LOG_WARNING,
-                      "invalid %s -- URL does not begin with '/': %s",
-                      meth, url);
+                "invalid %s -- URL does not begin with '/': %s",
+                meth, url);
             (void)http_server_send_status(prog, cbio, 400, "Bad Request");
             goto out;
         }
@@ -359,8 +359,8 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
                 break;
         if (!HAS_PREFIX(end, HTTP_VERSION_STR)) {
             log_HTTP2(prog, LOG_WARNING,
-                      "invalid %s -- bad HTTP/version string: %s",
-                      meth, end + 1);
+                "invalid %s -- bad HTTP/version string: %s",
+                meth, end + 1);
             (void)http_server_send_status(prog, cbio, 400, "Bad Request");
             goto out;
         }
@@ -382,7 +382,7 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
         len = urldecode(url);
         if (len < 0) {
             log_HTTP2(prog, LOG_WARNING,
-                      "invalid %s request -- bad URL encoding: %s", meth, url);
+                "invalid %s request -- bad URL encoding: %s", meth, url);
             (void)http_server_send_status(prog, cbio, 400, "Bad Request");
             goto out;
         }
@@ -390,7 +390,7 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
             if ((getbio = BIO_new_mem_buf(url, len)) == NULL
                 || (b64 = BIO_new(BIO_f_base64())) == NULL) {
                 log_HTTP1(prog, LOG_ERR,
-                          "could not allocate base64 bio with size = %d", len);
+                    "could not allocate base64 bio with size = %d", len);
                 goto fatal;
             }
             BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
@@ -398,8 +398,8 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
         }
     } else {
         log_HTTP2(prog, LOG_WARNING,
-                  "HTTP request does not begin with %sPOST: %s",
-                  accept_get ? "GET or " : "", reqbuf);
+            "HTTP request does not begin with %sPOST: %s",
+            accept_get ? "GET or " : "", reqbuf);
         (void)http_server_send_status(prog, cbio, 400, "Bad Request");
         goto out;
     }
@@ -425,11 +425,10 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
         if (((end = strchr(inbuf, '\r')) != NULL && end[1] == '\n')
             || (end = strchr(inbuf, '\n')) != NULL)
             *end = '\0';
-        log_HTTP1(prog, LOG_TRACE, "%s", *inbuf == '\0' ?
-                  " " /* workaround for "" getting ignored */ : inbuf);
+        log_HTTP1(prog, LOG_TRACE, "%s", *inbuf == '\0' ? " " /* workaround for "" getting ignored */ : inbuf);
         if (end == NULL) {
             log_HTTP(prog, LOG_WARNING,
-                     "error parsing HTTP header: missing end of line");
+                "error parsing HTTP header: missing end of line");
             (void)http_server_send_status(prog, cbio, 400, "Bad Request");
             goto out;
         }
@@ -441,7 +440,7 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
         value = strchr(key, ':');
         if (value == NULL) {
             log_HTTP(prog, LOG_WARNING,
-                     "error parsing HTTP header: missing ':'");
+                "error parsing HTTP header: missing ':'");
             (void)http_server_send_status(prog, cbio, 400, "Bad Request");
             goto out;
         }
@@ -458,37 +457,37 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
         }
     }
 
-# ifdef HTTP_DAEMON
+#ifdef HTTP_DAEMON
     /* Clear alarm before we close the client socket */
     alarm(0);
     timeout = 0;
-# endif
+#endif
 
     /* Try to read and parse request */
     req = ASN1_item_d2i_bio(it, getbio != NULL ? getbio : cbio, NULL);
     if (req == NULL) {
         log_HTTP(prog, LOG_WARNING,
-                 "error parsing DER-encoded request content");
+            "error parsing DER-encoded request content");
         (void)http_server_send_status(prog, cbio, 400, "Bad Request");
     } else if (ppath != NULL && (*ppath = OPENSSL_strdup(url)) == NULL) {
         log_HTTP1(prog, LOG_ERR,
-                  "out of memory allocating %zu bytes", strlen(url) + 1);
+            "out of memory allocating %zu bytes", strlen(url) + 1);
         ASN1_item_free(req, it);
         goto fatal;
     }
 
     *preq = req;
 
- out:
+out:
     BIO_free_all(getbio);
-# ifdef HTTP_DAEMON
+#ifdef HTTP_DAEMON
     if (timeout > 0)
         alarm(0);
     acfd = (int)INVALID_SOCKET;
-# endif
+#endif
     return ret;
 
- fatal:
+fatal:
     (void)http_server_send_status(prog, cbio, 500, "Internal Server Error");
     if (ppath != NULL) {
         OPENSSL_free(*ppath);
@@ -502,23 +501,23 @@ int http_server_get_asn1_req(const ASN1_ITEM *it, ASN1_VALUE **preq,
 
 /* assumes that cbio does not do an encoding that changes the output length */
 int http_server_send_asn1_resp(const char *prog, BIO *cbio, int keep_alive,
-                               const char *content_type,
-                               const ASN1_ITEM *it, const ASN1_VALUE *resp)
+    const char *content_type,
+    const ASN1_ITEM *it, const ASN1_VALUE *resp)
 {
     char buf[200], *p;
-    int ret = BIO_snprintf(buf, sizeof(buf), HTTP_1_0" 200 OK\r\n%s"
-                           "Content-type: %s\r\n"
-                           "Content-Length: %d\r\n",
-                           keep_alive ? "Connection: keep-alive\r\n" : "",
-                           content_type,
-                           ASN1_item_i2d(resp, NULL, it));
+    int ret = BIO_snprintf(buf, sizeof(buf), HTTP_1_0 " 200 OK\r\n%s"
+                                                      "Content-type: %s\r\n"
+                                                      "Content-Length: %d\r\n",
+        keep_alive ? "Connection: keep-alive\r\n" : "",
+        content_type,
+        ASN1_item_i2d(resp, NULL, it));
 
     if (ret < 0 || (size_t)ret >= sizeof(buf))
         return 0;
     if (log_get_verbosity() < LOG_TRACE && (p = strchr(buf, '\r')) != NULL)
         trace_log_message(-1, prog, LOG_INFO,
-                          "sending response, 1st line: %.*s", (int)(p - buf),
-                          buf);
+            "sending response, 1st line: %.*s", (int)(p - buf),
+            buf);
     log_HTTP1(prog, LOG_TRACE, "sending response header:\n%s", buf);
 
     ret = BIO_printf(cbio, "%s\r\n", buf) > 0
@@ -529,12 +528,12 @@ int http_server_send_asn1_resp(const char *prog, BIO *cbio, int keep_alive,
 }
 
 int http_server_send_status(const char *prog, BIO *cbio,
-                            int status, const char *reason)
+    int status, const char *reason)
 {
     char buf[200];
-    int ret = BIO_snprintf(buf, sizeof(buf), HTTP_1_0" %d %s\r\n\r\n",
-                           /* This implicitly cancels keep-alive */
-                           status, reason);
+    int ret = BIO_snprintf(buf, sizeof(buf), HTTP_1_0 " %d %s\r\n\r\n",
+        /* This implicitly cancels keep-alive */
+        status, reason);
 
     if (ret < 0 || (size_t)ret >= sizeof(buf))
         return 0;
diff --git a/apps/lib/log.c b/apps/lib/log.c
index a5e2f5507afdf..e2a531883b5e1 100644
--- a/apps/lib/log.c
+++ b/apps/lib/log.c
@@ -17,7 +17,7 @@ int log_set_verbosity(const char *prog, int level)
 {
     if (level < LOG_EMERG || level > LOG_TRACE) {
         trace_log_message(-1, prog, LOG_ERR,
-                          "Invalid verbosity level %d", level);
+            "Invalid verbosity level %d", level);
         return 0;
     }
     verbosity = level;
@@ -65,11 +65,11 @@ static void log_with_prefix(const char *prog, const char *fmt, va_list ap)
  */
 #undef OSSL_NO_C99
 #if !defined(__STDC_VERSION__) || __STDC_VERSION__ + 0 < 199900L
-# define OSSL_NO_C99
+#define OSSL_NO_C99
 #endif
 
 void trace_log_message(int category,
-                       const char *prog, int level, const char *fmt, ...)
+    const char *prog, int level, const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
@@ -103,6 +103,6 @@ void trace_log_message(int category,
             ERR_print_errors_cb(print_syslog, &level);
     } else
 #endif
-    log_with_prefix(prog, fmt, ap);
+        log_with_prefix(prog, fmt, ap);
     va_end(ap);
 }
diff --git a/apps/lib/names.c b/apps/lib/names.c
index 8825dfa3d895e..24a146819b072 100644
--- a/apps/lib/names.c
+++ b/apps/lib/names.c
@@ -13,7 +13,7 @@
 #include "names.h"
 #include "internal/e_os.h"
 
-int name_cmp(const char * const *a, const char * const *b)
+int name_cmp(const char *const *a, const char *const *b)
 {
     return OPENSSL_strcasecmp(*a, *b);
 }
diff --git a/apps/lib/opt.c b/apps/lib/opt.c
index 0018c268c0b44..f9135f4549be7 100644
--- a/apps/lib/opt.c
+++ b/apps/lib/opt.c
@@ -17,7 +17,7 @@
 #include "internal/numbers.h"
 #include <string.h>
 #if !defined(OPENSSL_SYS_MSDOS)
-# include <unistd.h>
+#include <unistd.h>
 #endif
 
 #include <stdlib.h>
@@ -56,7 +56,7 @@ const char *opt_path_end(const char *filename)
     const char *p;
 
     /* find the last '/', '\' or ':' */
-    for (p = filename + strlen(filename); --p > filename; )
+    for (p = filename + strlen(filename); --p > filename;)
         if (*p == '/' || *p == '\\' || *p == ':') {
             p++;
             break;
@@ -74,8 +74,7 @@ char *opt_progname(const char *argv0)
 
     /* Strip off trailing nonsense. */
     n = strlen(p);
-    if (n > 4 &&
-        (strcmp(&p[n - 4], ".exe") == 0 || strcmp(&p[n - 4], ".EXE") == 0))
+    if (n > 4 && (strcmp(&p[n - 4], ".exe") == 0 || strcmp(&p[n - 4], ".EXE") == 0))
         n -= 4;
 
     /* Copy over the name, in lowercase. */
@@ -178,8 +177,8 @@ char *opt_init(int ac, char **av, const OPTIONS *o)
 #endif
 
         if (o->name == OPT_HELP_STR
-                || o->name == OPT_MORE_STR
-                || o->name == OPT_SECTION_STR)
+            || o->name == OPT_MORE_STR
+            || o->name == OPT_SECTION_STR)
             continue;
 #ifndef NDEBUG
         i = o->valtype;
@@ -191,10 +190,26 @@ char *opt_init(int ac, char **av, const OPTIONS *o)
         else
             OPENSSL_assert(o->retval == OPT_DUP || o->retval > OPT_PARAM);
         switch (i) {
-        case   0: case '-': case '.':
-        case '/': case '<': case '>': case 'E': case 'F':
-        case 'M': case 'U': case 'f': case 'l': case 'n': case 'p': case 's':
-        case 'u': case 'c': case ':': case 'N': case 'A':
+        case 0:
+        case '-':
+        case '.':
+        case '/':
+        case '<':
+        case '>':
+        case 'E':
+        case 'F':
+        case 'M':
+        case 'U':
+        case 'f':
+        case 'l':
+        case 'n':
+        case 'p':
+        case 's':
+        case 'u':
+        case 'c':
+        case ':':
+        case 'N':
+        case 'A':
             break;
         default:
             OPENSSL_assert(0);
@@ -209,7 +224,7 @@ char *opt_init(int ac, char **av, const OPTIONS *o)
                 && strcmp(o->name, next->name) == 0;
             if (duplicated) {
                 opt_printf_stderr("%s: Internal error: duplicate option %s\n",
-                                  prog, o->name);
+                    prog, o->name);
                 OPENSSL_assert(!duplicated);
             }
         }
@@ -225,18 +240,18 @@ char *opt_init(int ac, char **av, const OPTIONS *o)
 }
 
 static OPT_PAIR formats[] = {
-    {"pem", OPT_FMT_PEM},
-    {"der", OPT_FMT_DER},
-    {"b64", OPT_FMT_B64},
-    {"pkcs12", OPT_FMT_PKCS12},
-    {"smime", OPT_FMT_SMIME},
-    {"engine", OPT_FMT_ENGINE},
-    {"msblob", OPT_FMT_MSBLOB},
-    {"nss", OPT_FMT_NSS},
-    {"text", OPT_FMT_TEXT},
-    {"http", OPT_FMT_HTTP},
-    {"pvk", OPT_FMT_PVK},
-    {NULL}
+    { "pem", OPT_FMT_PEM },
+    { "der", OPT_FMT_DER },
+    { "b64", OPT_FMT_B64 },
+    { "pkcs12", OPT_FMT_PKCS12 },
+    { "smime", OPT_FMT_SMIME },
+    { "engine", OPT_FMT_ENGINE },
+    { "msblob", OPT_FMT_MSBLOB },
+    { "nss", OPT_FMT_NSS },
+    { "text", OPT_FMT_TEXT },
+    { "http", OPT_FMT_HTTP },
+    { "pvk", OPT_FMT_PVK },
+    { NULL }
 };
 
 void opt_set_unknown_name(const char *name)
@@ -269,7 +284,7 @@ int opt_format(const char *s, unsigned long flags, int *result)
     case 'b':
         if (s[1] == '\0'
             || strcmp(s, "B64") == 0 || strcmp(s, "b64") == 0
-            || strcmp(s, "BASE64") == 0 || strcmp(s, "base64") == 0 ) {
+            || strcmp(s, "BASE64") == 0 || strcmp(s, "base64") == 0) {
             if ((flags & OPT_FMT_B64) == 0)
                 return opt_format_error(s, flags);
             *result = FORMAT_BASE64;
@@ -337,7 +352,7 @@ int opt_format(const char *s, unsigned long flags, int *result)
                 return opt_format_error(s, flags);
             *result = FORMAT_PVK;
         } else if (strcmp(s, "P12") == 0 || strcmp(s, "p12") == 0
-                   || strcmp(s, "PKCS12") == 0 || strcmp(s, "pkcs12") == 0) {
+            || strcmp(s, "PKCS12") == 0 || strcmp(s, "pkcs12") == 0) {
             if ((flags & OPT_FMT_PKCS12) == 0)
                 return opt_format_error(s, flags);
             *result = FORMAT_PKCS12;
@@ -395,7 +410,8 @@ int opt_cipher_silent(const char *name, EVP_CIPHER **cipherp)
 
     ERR_set_mark();
     if ((c = EVP_CIPHER_fetch(app_get0_libctx(), name,
-                              app_get0_propq())) != NULL
+             app_get0_propq()))
+            != NULL
         || (opt_legacy_okay()
             && (c = (EVP_CIPHER *)EVP_get_cipherbyname(name)) != NULL)) {
         ERR_pop_to_mark();
@@ -416,7 +432,7 @@ int opt_cipher_any(const char *name, EVP_CIPHER **cipherp)
     int ret;
 
     if (name == NULL)
-         return 1;
+        return 1;
     if ((ret = opt_cipher_silent(name, cipherp)) == 0)
         opt_printf_stderr("%s: Unknown option or cipher: %s\n", prog, name);
     return ret;
@@ -424,13 +440,13 @@ int opt_cipher_any(const char *name, EVP_CIPHER **cipherp)
 
 int opt_cipher(const char *name, EVP_CIPHER **cipherp)
 {
-     int mode, ret = 0;
-     unsigned long int flags;
-     EVP_CIPHER *c = NULL;
+    int mode, ret = 0;
+    unsigned long int flags;
+    EVP_CIPHER *c = NULL;
 
     if (name == NULL)
-         return 1;
-     if (opt_cipher_any(name, &c)) {
+        return 1;
+    if (opt_cipher_any(name, &c)) {
         mode = EVP_CIPHER_get_mode(c);
         flags = EVP_CIPHER_get_flags(c);
         if (mode == EVP_CIPH_XTS_MODE) {
@@ -478,7 +494,7 @@ int opt_md(const char *name, EVP_MD **mdp)
         return 1;
     if ((ret = opt_md_silent(name, mdp)) == 0)
         opt_printf_stderr("%s: Unknown option or message digest: %s\n",
-                          prog, name);
+            prog, name);
     return ret;
 }
 
@@ -491,7 +507,7 @@ int opt_check_md(const char *name)
 }
 
 /* Look through a list of name/value pairs. */
-int opt_pair(const char *name, const OPT_PAIR* pairs, int *result)
+int opt_pair(const char *name, const OPT_PAIR *pairs, int *result)
 {
     const OPT_PAIR *pp;
 
@@ -530,7 +546,7 @@ int opt_int(const char *value, int *result)
     *result = (int)l;
     if (*result != l) {
         opt_printf_stderr("%s: Value \"%s\" outside integer range\n",
-                          prog, value);
+            prog, value);
         return 0;
     }
     return 1;
@@ -552,15 +568,15 @@ static void opt_number_error(const char *v)
         char *prefix;
         char *name;
     } b[] = {
-        {"0x", "a hexadecimal"},
-        {"0X", "a hexadecimal"},
-        {"0", "an octal"}
+        { "0x", "a hexadecimal" },
+        { "0X", "a hexadecimal" },
+        { "0", "an octal" }
     };
 
     for (i = 0; i < OSSL_NELEM(b); i++) {
         if (strncmp(v, b[i].prefix, strlen(b[i].prefix)) == 0) {
             opt_printf_stderr("%s: Can't parse \"%s\" as %s number\n",
-                              prog, v, b[i].name);
+                prog, v, b[i].name);
             return;
         }
     }
@@ -578,9 +594,9 @@ int opt_long(const char *value, long *result)
     errno = 0;
     l = strtol(value, &endp, 0);
     if (*endp
-            || endp == value
-            || ((l == LONG_MAX || l == LONG_MIN) && errno == ERANGE)
-            || (l == 0 && errno != 0)) {
+        || endp == value
+        || ((l == LONG_MAX || l == LONG_MIN) && errno == ERANGE)
+        || (l == 0 && errno != 0)) {
         opt_number_error(value);
         errno = oerrno;
         return 0;
@@ -590,9 +606,7 @@ int opt_long(const char *value, long *result)
     return 1;
 }
 
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
-    defined(INTMAX_MAX) && defined(UINTMAX_MAX) && \
-    !defined(OPENSSL_NO_INTTYPES_H)
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && defined(INTMAX_MAX) && defined(UINTMAX_MAX) && !defined(OPENSSL_NO_INTTYPES_H)
 
 /* Parse an intmax_t, put it into *result; return 0 on failure, else 1. */
 int opt_intmax(const char *value, ossl_intmax_t *result)
@@ -604,10 +618,10 @@ int opt_intmax(const char *value, ossl_intmax_t *result)
     errno = 0;
     m = strtoimax(value, &endp, 0);
     if (*endp
-            || endp == value
-            || ((m == INTMAX_MAX || m == INTMAX_MIN)
-                && errno == ERANGE)
-            || (m == 0 && errno != 0)) {
+        || endp == value
+        || ((m == INTMAX_MAX || m == INTMAX_MIN)
+            && errno == ERANGE)
+        || (m == 0 && errno != 0)) {
         opt_number_error(value);
         errno = oerrno;
         return 0;
@@ -633,9 +647,9 @@ int opt_uintmax(const char *value, ossl_uintmax_t *result)
     errno = 0;
     m = strtoumax(value, &endp, 0);
     if (*endp
-            || endp == value
-            || (m == UINTMAX_MAX && errno == ERANGE)
-            || (m == 0 && errno != 0)) {
+        || endp == value
+        || (m == UINTMAX_MAX && errno == ERANGE)
+        || (m == 0 && errno != 0)) {
         opt_number_error(value);
         errno = oerrno;
         return 0;
@@ -685,9 +699,9 @@ int opt_ulong(const char *value, unsigned long *result)
     errno = 0;
     l = strtoul(value, &endptr, 0);
     if (*endptr
-            || endptr == value
-            || ((l == ULONG_MAX) && errno == ERANGE)
-            || (l == 0 && errno != 0)) {
+        || endptr == value
+        || ((l == ULONG_MAX) && errno == ERANGE)
+        || (l == 0 && errno != 0)) {
         opt_number_error(value);
         errno = oerrno;
         return 0;
@@ -729,7 +743,7 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
         if (!X509_VERIFY_PARAM_add0_policy(vpm, otmp)) {
             ASN1_OBJECT_free(otmp);
             opt_printf_stderr("%s: Internal error adding Policy %s\n",
-                              prog, opt_arg());
+                prog, opt_arg());
             return 0;
         }
         break;
@@ -749,7 +763,7 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
 
         if (!X509_VERIFY_PARAM_set_purpose(vpm, i)) {
             opt_printf_stderr("%s: Internal error setting purpose %s\n",
-                              prog, opt_arg());
+                prog, opt_arg());
             return 0;
         }
         break;
@@ -757,7 +771,7 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
         vtmp = X509_VERIFY_PARAM_lookup(opt_arg());
         if (vtmp == NULL) {
             opt_printf_stderr("%s: Invalid verify name %s\n",
-                              prog, opt_arg());
+                prog, opt_arg());
             return 0;
         }
         X509_VERIFY_PARAM_set1(vpm, vtmp);
@@ -777,7 +791,7 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
             return 0;
         if (t != (time_t)t) {
             opt_printf_stderr("%s: epoch time out of range %s\n",
-                              prog, opt_arg());
+                prog, opt_arg());
             return 0;
         }
         X509_VERIFY_PARAM_set_time(vpm, (time_t)t);
@@ -805,8 +819,7 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
         break;
     case OPT_V_CRL_CHECK_ALL:
         X509_VERIFY_PARAM_set_flags(vpm,
-                                    X509_V_FLAG_CRL_CHECK |
-                                    X509_V_FLAG_CRL_CHECK_ALL);
+            X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
         break;
     case OPT_V_POLICY_CHECK:
         X509_VERIFY_PARAM_set_flags(vpm, X509_V_FLAG_POLICY_CHECK);
@@ -861,7 +874,6 @@ int opt_verify(int opt, X509_VERIFY_PARAM *vpm)
         break;
     }
     return 1;
-
 }
 
 void opt_begin(void)
@@ -911,14 +923,14 @@ int opt_next(void)
     for (o = opts; o->name; ++o) {
         /* If not this option, move on to the next one. */
         if (!(strcmp(p, "h") == 0 && strcmp(o->name, "help") == 0)
-                && strcmp(p, o->name) != 0)
+            && strcmp(p, o->name) != 0)
             continue;
 
         /* If it doesn't take a value, make sure none was given. */
         if (o->valtype == 0 || o->valtype == '-') {
             if (arg) {
                 opt_printf_stderr("%s: Option -%s does not take a value\n",
-                                  prog, p);
+                    prog, p);
                 return -1;
             }
             return o->retval;
@@ -928,7 +940,7 @@ int opt_next(void)
         if (arg == NULL) {
             if (argv[opt_index] == NULL) {
                 opt_printf_stderr("%s: Option -%s needs a value\n",
-                                  prog, o->name);
+                    prog, o->name);
                 return -1;
             }
             arg = argv[opt_index++];
@@ -962,12 +974,12 @@ int opt_next(void)
                 return -1;
             if (o->valtype == 'p' && ival <= 0) {
                 opt_printf_stderr("%s: Non-positive number \"%s\" for option -%s\n",
-                                  prog, arg, o->name);
+                    prog, arg, o->name);
                 return -1;
             }
             if (o->valtype == 'N' && ival < 0) {
                 opt_printf_stderr("%s: Negative number \"%s\" for option -%s\n",
-                                  prog, arg, o->name);
+                    prog, arg, o->name);
                 return -1;
             }
             break;
@@ -994,14 +1006,14 @@ int opt_next(void)
         case 'A':
         case 'a':
             if (opt_format(arg,
-                           o->valtype == 'c' ? OPT_FMT_PDS :
-                           o->valtype == 'E' ? OPT_FMT_PDE :
-                           o->valtype == 'F' ? OPT_FMT_PEMDER :
-                           o->valtype == 'A' ? OPT_FMT_ASN1 :
-                           OPT_FMT_ANY, &ival))
+                    o->valtype == 'c' ? OPT_FMT_PDS : o->valtype == 'E' ? OPT_FMT_PDE
+                        : o->valtype == 'F'                             ? OPT_FMT_PEMDER
+                        : o->valtype == 'A'                             ? OPT_FMT_ASN1
+                                                                        : OPT_FMT_ANY,
+                    &ival))
                 break;
             opt_printf_stderr("%s: Invalid format \"%s\" for option -%s\n",
-                              prog, arg, o->name);
+                prog, arg, o->name);
             return -1;
         }
 
@@ -1011,7 +1023,7 @@ int opt_next(void)
     if (unknown != NULL) {
         if (dunno != NULL) {
             opt_printf_stderr("%s: Multiple %s or unknown options: -%s and -%s\n",
-                              prog, unknown_name, dunno, p);
+                prog, unknown_name, dunno, p);
             return -1;
         }
         dunno = p;
@@ -1083,7 +1095,7 @@ int opt_check_rest_arg(const char *expected)
         opt_printf_stderr("%s: Extra option: \"%s\"\n", prog, opt);
     else
         opt_printf_stderr("%s: Extra (unknown) options: \"%s\" \"%s\"\n",
-                          prog, opt_unknown(), opt);
+            prog, opt_unknown(), opt);
     return 0;
 }
 
@@ -1130,7 +1142,7 @@ static const char *valtype2param(const OPTIONS *o)
 
 static void opt_print(const OPTIONS *o, int doingparams, int width)
 {
-    const char* help;
+    const char *help;
     char start[80 + 1];
     int linelen, printlen;
 
@@ -1168,11 +1180,11 @@ static void opt_print(const OPTIONS *o, int doingparams, int width)
     printlen = opt_printf_stderr(" %s", !doingparams ? "-" : "");
     linelen += (printlen > 0) ? printlen : MAX_OPT_HELP_WIDTH;
 
-    printlen = opt_printf_stderr("%s" , o->name[0] ? o->name : "*");
+    printlen = opt_printf_stderr("%s", o->name[0] ? o->name : "*");
     linelen += (printlen > 0) ? printlen : MAX_OPT_HELP_WIDTH;
 
     if (o->valtype != '-') {
-        printlen = opt_printf_stderr(" %s" , valtype2param(o));
+        printlen = opt_printf_stderr(" %s", valtype2param(o));
         linelen += (printlen > 0) ? printlen : MAX_OPT_HELP_WIDTH;
     }
 
@@ -1229,52 +1241,52 @@ void opt_help(const OPTIONS *list)
 
 /* opt_isdir section */
 #ifdef _WIN32
-# include <windows.h>
+#include <windows.h>
 int opt_isdir(const char *name)
 {
     DWORD attr;
-# if defined(UNICODE) || defined(_UNICODE)
+#if defined(UNICODE) || defined(_UNICODE)
     size_t i, len_0 = strlen(name) + 1;
     WCHAR tempname[MAX_PATH];
 
     if (len_0 > MAX_PATH)
         return -1;
 
-#  if !defined(_WIN32_WCE) || _WIN32_WCE>=101
+#if !defined(_WIN32_WCE) || _WIN32_WCE >= 101
     if (!MultiByteToWideChar(CP_ACP, 0, name, len_0, tempname, MAX_PATH))
-#  endif
+#endif
         for (i = 0; i < len_0; i++)
             tempname[i] = (WCHAR)name[i];
 
     attr = GetFileAttributes(tempname);
-# else
+#else
     attr = GetFileAttributes(name);
-# endif
+#endif
     if (attr == INVALID_FILE_ATTRIBUTES)
         return -1;
     return ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0);
 }
 #else
-# include <sys/stat.h>
-# ifndef S_ISDIR
-#  if defined(_S_IFMT) && defined(_S_IFDIR)
-#   define S_ISDIR(a)   (((a) & _S_IFMT) == _S_IFDIR)
-#  else
-#   define S_ISDIR(a)   (((a) & S_IFMT) == S_IFDIR)
-#  endif
-# endif
+#include <sys/stat.h>
+#ifndef S_ISDIR
+#if defined(_S_IFMT) && defined(_S_IFDIR)
+#define S_ISDIR(a) (((a) & _S_IFMT) == _S_IFDIR)
+#else
+#define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
+#endif
+#endif
 
 int opt_isdir(const char *name)
 {
-# if defined(S_ISDIR)
+#if defined(S_ISDIR)
     struct stat st;
 
     if (stat(name, &st) == 0)
         return S_ISDIR(st.st_mode);
     else
         return -1;
-# else
+#else
     return -1;
-# endif
+#endif
 }
 #endif
diff --git a/apps/lib/s_cb.c b/apps/lib/s_cb.c
index 5aa57ea5fd431..80b5c65554246 100644
--- a/apps/lib/s_cb.c
+++ b/apps/lib/s_cb.c
@@ -23,11 +23,11 @@
 #include <openssl/ssl.h>
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
+#include <openssl/dh.h>
 #endif
 #include "s_apps.h"
 
-#define COOKIE_SECRET_LENGTH    16
+#define COOKIE_SECRET_LENGTH 16
 
 VERIFY_CB_ARGS verify_args = { -1, 0, X509_V_OK, 0 };
 
@@ -37,9 +37,9 @@ static int cookie_initialized = 0;
 #endif
 static BIO *bio_keylog = NULL;
 
-static const char *lookup(int val, const STRINT_PAIR* list, const char* def)
+static const char *lookup(int val, const STRINT_PAIR *list, const char *def)
 {
-    for ( ; list->name; ++list)
+    for (; list->name; ++list)
         if (list->retval == val)
             return list->name;
     return def;
@@ -58,8 +58,8 @@ int verify_callback(int ok, X509_STORE_CTX *ctx)
         BIO_printf(bio_err, "depth=%d ", depth);
         if (err_cert != NULL) {
             X509_NAME_print_ex(bio_err,
-                               X509_get_subject_name(err_cert),
-                               0, get_nameopt());
+                X509_get_subject_name(err_cert),
+                0, get_nameopt());
             BIO_puts(bio_err, "\n");
         } else {
             BIO_puts(bio_err, "<no cert>\n");
@@ -67,7 +67,7 @@ int verify_callback(int ok, X509_STORE_CTX *ctx)
     }
     if (!ok) {
         BIO_printf(bio_err, "verify error:num=%d:%s\n", err,
-                   X509_verify_cert_error_string(err));
+            X509_verify_cert_error_string(err));
         if (verify_args.depth < 0 || verify_args.depth >= depth) {
             if (!verify_args.return_error)
                 ok = 1;
@@ -82,7 +82,7 @@ int verify_callback(int ok, X509_STORE_CTX *ctx)
         if (err_cert != NULL) {
             BIO_puts(bio_err, "issuer= ");
             X509_NAME_print_ex(bio_err, X509_get_issuer_name(err_cert),
-                               0, get_nameopt());
+                0, get_nameopt());
             BIO_puts(bio_err, "\n");
         }
         break;
@@ -118,9 +118,10 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
 {
     if (cert_file != NULL) {
         if (SSL_CTX_use_certificate_file(ctx, cert_file,
-                                         SSL_FILETYPE_PEM) <= 0) {
+                SSL_FILETYPE_PEM)
+            <= 0) {
             BIO_printf(bio_err, "unable to get certificate from '%s'\n",
-                       cert_file);
+                cert_file);
             ERR_print_errors(bio_err);
             return 0;
         }
@@ -128,7 +129,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
             key_file = cert_file;
         if (SSL_CTX_use_PrivateKey_file(ctx, key_file, SSL_FILETYPE_PEM) <= 0) {
             BIO_printf(bio_err, "unable to get private key from '%s'\n",
-                       key_file);
+                key_file);
             ERR_print_errors(bio_err);
             return 0;
         }
@@ -144,7 +145,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
          */
         if (!SSL_CTX_check_private_key(ctx)) {
             BIO_printf(bio_err,
-                       "Private key does not match the certificate public key\n");
+                "Private key does not match the certificate public key\n");
             return 0;
         }
     }
@@ -152,7 +153,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
 }
 
 int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key,
-                       STACK_OF(X509) *chain, int build_chain)
+    STACK_OF(X509) *chain, int build_chain)
 {
     int chflags = chain ? SSL_BUILD_CHAIN_FLAG_CHECK : 0;
 
@@ -175,7 +176,7 @@ int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key,
      */
     if (!SSL_CTX_check_private_key(ctx)) {
         BIO_printf(bio_err,
-                   "Private key does not match the certificate public key\n");
+            "Private key does not match the certificate public key\n");
         return 0;
     }
     if (chain && !SSL_CTX_set1_chain(ctx, chain)) {
@@ -192,16 +193,16 @@ int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key,
 }
 
 static STRINT_PAIR cert_type_list[] = {
-    {"RSA sign", TLS_CT_RSA_SIGN},
-    {"DSA sign", TLS_CT_DSS_SIGN},
-    {"RSA fixed DH", TLS_CT_RSA_FIXED_DH},
-    {"DSS fixed DH", TLS_CT_DSS_FIXED_DH},
-    {"ECDSA sign", TLS_CT_ECDSA_SIGN},
-    {"RSA fixed ECDH", TLS_CT_RSA_FIXED_ECDH},
-    {"ECDSA fixed ECDH", TLS_CT_ECDSA_FIXED_ECDH},
-    {"GOST01 Sign", TLS_CT_GOST01_SIGN},
-    {"GOST12 Sign", TLS_CT_GOST12_IANA_SIGN},
-    {NULL}
+    { "RSA sign", TLS_CT_RSA_SIGN },
+    { "DSA sign", TLS_CT_DSS_SIGN },
+    { "RSA fixed DH", TLS_CT_RSA_FIXED_DH },
+    { "DSS fixed DH", TLS_CT_DSS_FIXED_DH },
+    { "ECDSA sign", TLS_CT_ECDSA_SIGN },
+    { "RSA fixed ECDH", TLS_CT_RSA_FIXED_ECDH },
+    { "ECDSA fixed ECDH", TLS_CT_ECDSA_FIXED_ECDH },
+    { "GOST01 Sign", TLS_CT_GOST01_SIGN },
+    { "GOST12 Sign", TLS_CT_GOST12_IANA_SIGN },
+    { NULL }
 };
 
 static void ssl_print_client_cert_types(BIO *bio, SSL *s)
@@ -287,7 +288,7 @@ static int do_print_sigalgs(BIO *out, SSL *s, int shared)
         const char *sstr = NULL;
         if (shared)
             SSL_get_shared_sigalgs(s, i, &sign_nid, &hash_nid, NULL,
-                                   &rsign, &rhash);
+                &rsign, &rhash);
         else
             SSL_get_sigalgs(s, i, &sign_nid, &hash_nid, NULL, &rsign, &rhash);
         if (i)
@@ -328,6 +329,7 @@ static int do_print_sigalgs(BIO *out, SSL *s, int shared)
 
 int ssl_print_sigalgs(BIO *out, SSL *s)
 {
+    const char *name;
     int nid;
 
     if (!SSL_is_server(s))
@@ -336,7 +338,9 @@ int ssl_print_sigalgs(BIO *out, SSL *s)
     do_print_sigalgs(out, s, 1);
     if (SSL_get_peer_signature_nid(s, &nid) && nid != NID_undef)
         BIO_printf(out, "Peer signing digest: %s\n", OBJ_nid2sn(nid));
-    if (SSL_get_peer_signature_type_nid(s, &nid))
+    if (SSL_get0_peer_signature_name(s, &name))
+        BIO_printf(out, "Peer signature type: %s\n", name);
+    else if (SSL_get_peer_signature_type_nid(s, &nid))
         BIO_printf(out, "Peer signature type: %s\n", get_sigtype(nid));
     return 1;
 }
@@ -370,7 +374,6 @@ int ssl_print_point_formats(BIO *out, SSL *s)
         default:
             BIO_printf(out, "unknown(%d)", (int)*pformats);
             break;
-
         }
     }
     BIO_puts(out, "\n");
@@ -422,7 +425,7 @@ int ssl_print_tmp_key(BIO *out, SSL *s)
     if (!SSL_get_peer_tmp_key(s, &key)) {
         if (SSL_version(s) == TLS1_3_VERSION)
             BIO_printf(out, "Negotiated TLS1.3 group: %s\n",
-                       SSL_group_to_name(s, SSL_get_negotiated_group(s)));
+                SSL_group_to_name(s, SSL_get_negotiated_group(s)));
         return 1;
     }
 
@@ -442,28 +445,26 @@ int ssl_print_tmp_key(BIO *out, SSL *s)
         BIO_printf(out, "DH, %d bits\n", EVP_PKEY_get_bits(key));
         break;
 #ifndef OPENSSL_NO_EC
-    case EVP_PKEY_EC:
-        {
-            char name[80];
-            size_t name_len;
-
-            if (!EVP_PKEY_get_utf8_string_param(key, OSSL_PKEY_PARAM_GROUP_NAME,
-                                                name, sizeof(name), &name_len))
-                strcpy(name, "?");
-            BIO_printf(out, "ECDH, %s, %d bits\n", name, EVP_PKEY_get_bits(key));
-        }
-    break;
+    case EVP_PKEY_EC: {
+        char name[80];
+        size_t name_len;
+
+        if (!EVP_PKEY_get_utf8_string_param(key, OSSL_PKEY_PARAM_GROUP_NAME,
+                name, sizeof(name), &name_len))
+            strcpy(name, "?");
+        BIO_printf(out, "ECDH, %s, %d bits\n", name, EVP_PKEY_get_bits(key));
+    } break;
 #endif
     default:
         BIO_printf(out, "%s, %d bits\n", OBJ_nid2sn(EVP_PKEY_get_id(key)),
-                   EVP_PKEY_get_bits(key));
+            EVP_PKEY_get_bits(key));
     }
     EVP_PKEY_free(key);
     return 1;
 }
 
 long bio_dump_callback(BIO *bio, int cmd, const char *argp, size_t len,
-                       int argi, long argl, int ret, size_t *processed)
+    int argi, long argl, int ret, size_t *processed)
 {
     BIO *out;
     BIO_MMSG_CB_ARGS *mmsgargs;
@@ -477,22 +478,22 @@ long bio_dump_callback(BIO *bio, int cmd, const char *argp, size_t len,
     case (BIO_CB_READ | BIO_CB_RETURN):
         if (ret > 0 && processed != NULL) {
             BIO_printf(out, "read from %p [%p] (%zu bytes => %zu (0x%zX))\n",
-                       (void *)bio, (void *)argp, len, *processed, *processed);
+                (void *)bio, (void *)argp, len, *processed, *processed);
             BIO_dump(out, argp, (int)*processed);
         } else {
             BIO_printf(out, "read from %p [%p] (%zu bytes => %d)\n",
-                       (void *)bio, (void *)argp, len, ret);
+                (void *)bio, (void *)argp, len, ret);
         }
         break;
 
     case (BIO_CB_WRITE | BIO_CB_RETURN):
         if (ret > 0 && processed != NULL) {
             BIO_printf(out, "write to %p [%p] (%zu bytes => %zu (0x%zX))\n",
-                       (void *)bio, (void *)argp, len, *processed, *processed);
+                (void *)bio, (void *)argp, len, *processed, *processed);
             BIO_dump(out, argp, (int)*processed);
         } else {
             BIO_printf(out, "write to %p [%p] (%zu bytes => %d)\n",
-                       (void *)bio, (void *)argp, len, ret);
+                (void *)bio, (void *)argp, len, ret);
         }
         break;
 
@@ -501,18 +502,18 @@ long bio_dump_callback(BIO *bio, int cmd, const char *argp, size_t len,
         if (ret > 0) {
             for (i = 0; i < *(mmsgargs->msgs_processed); i++) {
                 BIO_MSG *msg = (BIO_MSG *)((char *)mmsgargs->msg
-                                           + (i * mmsgargs->stride));
+                    + (i * mmsgargs->stride));
 
                 BIO_printf(out, "read from %p [%p] (%zu bytes => %zu (0x%zX))\n",
-                           (void *)bio, (void *)msg->data, msg->data_len,
-                           msg->data_len, msg->data_len);
+                    (void *)bio, (void *)msg->data, msg->data_len,
+                    msg->data_len, msg->data_len);
                 BIO_dump(out, msg->data, msg->data_len);
             }
         } else if (mmsgargs->num_msg > 0) {
             BIO_MSG *msg = mmsgargs->msg;
 
             BIO_printf(out, "read from %p [%p] (%zu bytes => %d)\n",
-                       (void *)bio, (void *)msg->data, msg->data_len, ret);
+                (void *)bio, (void *)msg->data, msg->data_len, ret);
         }
         break;
 
@@ -521,18 +522,18 @@ long bio_dump_callback(BIO *bio, int cmd, const char *argp, size_t len,
         if (ret > 0) {
             for (i = 0; i < *(mmsgargs->msgs_processed); i++) {
                 BIO_MSG *msg = (BIO_MSG *)((char *)mmsgargs->msg
-                                           + (i * mmsgargs->stride));
+                    + (i * mmsgargs->stride));
 
                 BIO_printf(out, "write to %p [%p] (%zu bytes => %zu (0x%zX))\n",
-                           (void *)bio, (void *)msg->data, msg->data_len,
-                           msg->data_len, msg->data_len);
+                    (void *)bio, (void *)msg->data, msg->data_len,
+                    msg->data_len, msg->data_len);
                 BIO_dump(out, msg->data, msg->data_len);
             }
         } else if (mmsgargs->num_msg > 0) {
             BIO_MSG *msg = mmsgargs->msg;
 
             BIO_printf(out, "write to %p [%p] (%zu bytes => %d)\n",
-                       (void *)bio, (void *)msg->data, msg->data_len, ret);
+                (void *)bio, (void *)msg->data, msg->data_len, ret);
         }
         break;
 
@@ -562,109 +563,104 @@ void apps_ssl_info_callback(const SSL *s, int where, int ret)
     } else if (where & SSL_CB_ALERT) {
         str = (where & SSL_CB_READ) ? "read" : "write";
         BIO_printf(bio_err, "SSL3 alert %s:%s:%s\n",
-                   str,
-                   SSL_alert_type_string_long(ret),
-                   SSL_alert_desc_string_long(ret));
+            str,
+            SSL_alert_type_string_long(ret),
+            SSL_alert_desc_string_long(ret));
     } else if (where & SSL_CB_EXIT) {
         if (ret == 0)
             BIO_printf(bio_err, "%s:failed in %s\n",
-                       str, SSL_state_string_long(s));
+                str, SSL_state_string_long(s));
         else if (ret < 0)
             BIO_printf(bio_err, "%s:error in %s\n",
-                       str, SSL_state_string_long(s));
+                str, SSL_state_string_long(s));
     }
 }
 
 static STRINT_PAIR ssl_versions[] = {
-    {"SSL 3.0", SSL3_VERSION},
-    {"TLS 1.0", TLS1_VERSION},
-    {"TLS 1.1", TLS1_1_VERSION},
-    {"TLS 1.2", TLS1_2_VERSION},
-    {"TLS 1.3", TLS1_3_VERSION},
-    {"DTLS 1.0", DTLS1_VERSION},
-    {"DTLS 1.0 (bad)", DTLS1_BAD_VER},
-    {NULL}
+    { "SSL 3.0", SSL3_VERSION },
+    { "TLS 1.0", TLS1_VERSION },
+    { "TLS 1.1", TLS1_1_VERSION },
+    { "TLS 1.2", TLS1_2_VERSION },
+    { "TLS 1.3", TLS1_3_VERSION },
+    { "DTLS 1.0", DTLS1_VERSION },
+    { "DTLS 1.0 (bad)", DTLS1_BAD_VER },
+    { NULL }
 };
 
 static STRINT_PAIR alert_types[] = {
-    {" close_notify", 0},
-    {" end_of_early_data", 1},
-    {" unexpected_message", 10},
-    {" bad_record_mac", 20},
-    {" decryption_failed", 21},
-    {" record_overflow", 22},
-    {" decompression_failure", 30},
-    {" handshake_failure", 40},
-    {" bad_certificate", 42},
-    {" unsupported_certificate", 43},
-    {" certificate_revoked", 44},
-    {" certificate_expired", 45},
-    {" certificate_unknown", 46},
-    {" illegal_parameter", 47},
-    {" unknown_ca", 48},
-    {" access_denied", 49},
-    {" decode_error", 50},
-    {" decrypt_error", 51},
-    {" export_restriction", 60},
-    {" protocol_version", 70},
-    {" insufficient_security", 71},
-    {" internal_error", 80},
-    {" inappropriate_fallback", 86},
-    {" user_canceled", 90},
-    {" no_renegotiation", 100},
-    {" missing_extension", 109},
-    {" unsupported_extension", 110},
-    {" certificate_unobtainable", 111},
-    {" unrecognized_name", 112},
-    {" bad_certificate_status_response", 113},
-    {" bad_certificate_hash_value", 114},
-    {" unknown_psk_identity", 115},
-    {" certificate_required", 116},
-    {NULL}
+    { " close_notify", 0 },
+    { " end_of_early_data", 1 },
+    { " unexpected_message", 10 },
+    { " bad_record_mac", 20 },
+    { " decryption_failed", 21 },
+    { " record_overflow", 22 },
+    { " decompression_failure", 30 },
+    { " handshake_failure", 40 },
+    { " bad_certificate", 42 },
+    { " unsupported_certificate", 43 },
+    { " certificate_revoked", 44 },
+    { " certificate_expired", 45 },
+    { " certificate_unknown", 46 },
+    { " illegal_parameter", 47 },
+    { " unknown_ca", 48 },
+    { " access_denied", 49 },
+    { " decode_error", 50 },
+    { " decrypt_error", 51 },
+    { " export_restriction", 60 },
+    { " protocol_version", 70 },
+    { " insufficient_security", 71 },
+    { " internal_error", 80 },
+    { " inappropriate_fallback", 86 },
+    { " user_canceled", 90 },
+    { " no_renegotiation", 100 },
+    { " missing_extension", 109 },
+    { " unsupported_extension", 110 },
+    { " certificate_unobtainable", 111 },
+    { " unrecognized_name", 112 },
+    { " bad_certificate_status_response", 113 },
+    { " bad_certificate_hash_value", 114 },
+    { " unknown_psk_identity", 115 },
+    { " certificate_required", 116 },
+    { NULL }
 };
 
 static STRINT_PAIR handshakes[] = {
-    {", HelloRequest", SSL3_MT_HELLO_REQUEST},
-    {", ClientHello", SSL3_MT_CLIENT_HELLO},
-    {", ServerHello", SSL3_MT_SERVER_HELLO},
-    {", HelloVerifyRequest", DTLS1_MT_HELLO_VERIFY_REQUEST},
-    {", NewSessionTicket", SSL3_MT_NEWSESSION_TICKET},
-    {", EndOfEarlyData", SSL3_MT_END_OF_EARLY_DATA},
-    {", EncryptedExtensions", SSL3_MT_ENCRYPTED_EXTENSIONS},
-    {", Certificate", SSL3_MT_CERTIFICATE},
-    {", ServerKeyExchange", SSL3_MT_SERVER_KEY_EXCHANGE},
-    {", CertificateRequest", SSL3_MT_CERTIFICATE_REQUEST},
-    {", ServerHelloDone", SSL3_MT_SERVER_DONE},
-    {", CertificateVerify", SSL3_MT_CERTIFICATE_VERIFY},
-    {", ClientKeyExchange", SSL3_MT_CLIENT_KEY_EXCHANGE},
-    {", Finished", SSL3_MT_FINISHED},
-    {", CertificateUrl", SSL3_MT_CERTIFICATE_URL},
-    {", CertificateStatus", SSL3_MT_CERTIFICATE_STATUS},
-    {", SupplementalData", SSL3_MT_SUPPLEMENTAL_DATA},
-    {", KeyUpdate", SSL3_MT_KEY_UPDATE},
-    {", CompressedCertificate", SSL3_MT_COMPRESSED_CERTIFICATE},
+    { ", HelloRequest", SSL3_MT_HELLO_REQUEST },
+    { ", ClientHello", SSL3_MT_CLIENT_HELLO },
+    { ", ServerHello", SSL3_MT_SERVER_HELLO },
+    { ", HelloVerifyRequest", DTLS1_MT_HELLO_VERIFY_REQUEST },
+    { ", NewSessionTicket", SSL3_MT_NEWSESSION_TICKET },
+    { ", EndOfEarlyData", SSL3_MT_END_OF_EARLY_DATA },
+    { ", EncryptedExtensions", SSL3_MT_ENCRYPTED_EXTENSIONS },
+    { ", Certificate", SSL3_MT_CERTIFICATE },
+    { ", ServerKeyExchange", SSL3_MT_SERVER_KEY_EXCHANGE },
+    { ", CertificateRequest", SSL3_MT_CERTIFICATE_REQUEST },
+    { ", ServerHelloDone", SSL3_MT_SERVER_DONE },
+    { ", CertificateVerify", SSL3_MT_CERTIFICATE_VERIFY },
+    { ", ClientKeyExchange", SSL3_MT_CLIENT_KEY_EXCHANGE },
+    { ", Finished", SSL3_MT_FINISHED },
+    { ", CertificateUrl", SSL3_MT_CERTIFICATE_URL },
+    { ", CertificateStatus", SSL3_MT_CERTIFICATE_STATUS },
+    { ", SupplementalData", SSL3_MT_SUPPLEMENTAL_DATA },
+    { ", KeyUpdate", SSL3_MT_KEY_UPDATE },
+    { ", CompressedCertificate", SSL3_MT_COMPRESSED_CERTIFICATE },
 #ifndef OPENSSL_NO_NEXTPROTONEG
-    {", NextProto", SSL3_MT_NEXT_PROTO},
+    { ", NextProto", SSL3_MT_NEXT_PROTO },
 #endif
-    {", MessageHash", SSL3_MT_MESSAGE_HASH},
-    {NULL}
+    { ", MessageHash", SSL3_MT_MESSAGE_HASH },
+    { NULL }
 };
 
 void msg_cb(int write_p, int version, int content_type, const void *buf,
-            size_t len, SSL *ssl, void *arg)
+    size_t len, SSL *ssl, void *arg)
 {
     BIO *bio = arg;
     const char *str_write_p = write_p ? ">>>" : "<<<";
     char tmpbuf[128];
     const char *str_version, *str_content_type = "", *str_details1 = "", *str_details2 = "";
-    const unsigned char* bp = buf;
-
-    if (version == SSL3_VERSION ||
-        version == TLS1_VERSION ||
-        version == TLS1_1_VERSION ||
-        version == TLS1_2_VERSION ||
-        version == TLS1_3_VERSION ||
-        version == DTLS1_VERSION || version == DTLS1_BAD_VER) {
+    const unsigned char *bp = buf;
+
+    if (version == SSL3_VERSION || version == TLS1_VERSION || version == TLS1_1_VERSION || version == TLS1_2_VERSION || version == TLS1_3_VERSION || version == DTLS1_VERSION || version == DTLS1_BAD_VER) {
         str_version = lookup(version, ssl_versions, "???");
         switch (content_type) {
         case SSL3_RT_CHANGE_CIPHER_SPEC:
@@ -707,17 +703,17 @@ void msg_cb(int write_p, int version, int content_type, const void *buf,
             str_content_type = ", InnerContent";
             break;
         default:
-            BIO_snprintf(tmpbuf, sizeof(tmpbuf)-1, ", Unknown (content_type=%d)", content_type);
+            BIO_snprintf(tmpbuf, sizeof(tmpbuf) - 1, ", Unknown (content_type=%d)", content_type);
             str_content_type = tmpbuf;
         }
     } else {
-        BIO_snprintf(tmpbuf, sizeof(tmpbuf)-1, "Not TLS data or unknown version (version=%d, content_type=%d)", version, content_type);
+        BIO_snprintf(tmpbuf, sizeof(tmpbuf) - 1, "Not TLS data or unknown version (version=%d, content_type=%d)", version, content_type);
         str_version = tmpbuf;
     }
 
     BIO_printf(bio, "%s %s%s [length %04lx]%s%s\n", str_write_p, str_version,
-               str_content_type, (unsigned long)len, str_details1,
-               str_details2);
+        str_content_type, (unsigned long)len, str_details1,
+        str_details2);
 
     if (len > 0) {
         size_t num, i;
@@ -737,113 +733,113 @@ void msg_cb(int write_p, int version, int content_type, const void *buf,
 }
 
 static const STRINT_PAIR tlsext_types[] = {
-    {"server name", TLSEXT_TYPE_server_name},
-    {"max fragment length", TLSEXT_TYPE_max_fragment_length},
-    {"client certificate URL", TLSEXT_TYPE_client_certificate_url},
-    {"trusted CA keys", TLSEXT_TYPE_trusted_ca_keys},
-    {"truncated HMAC", TLSEXT_TYPE_truncated_hmac},
-    {"status request", TLSEXT_TYPE_status_request},
-    {"user mapping", TLSEXT_TYPE_user_mapping},
-    {"client authz", TLSEXT_TYPE_client_authz},
-    {"server authz", TLSEXT_TYPE_server_authz},
-    {"cert type", TLSEXT_TYPE_cert_type},
-    {"supported_groups", TLSEXT_TYPE_supported_groups},
-    {"EC point formats", TLSEXT_TYPE_ec_point_formats},
-    {"SRP", TLSEXT_TYPE_srp},
-    {"signature algorithms", TLSEXT_TYPE_signature_algorithms},
-    {"use SRTP", TLSEXT_TYPE_use_srtp},
-    {"session ticket", TLSEXT_TYPE_session_ticket},
-    {"renegotiation info", TLSEXT_TYPE_renegotiate},
-    {"signed certificate timestamps", TLSEXT_TYPE_signed_certificate_timestamp},
-    {"client cert type", TLSEXT_TYPE_client_cert_type},
-    {"server cert type", TLSEXT_TYPE_server_cert_type},
-    {"TLS padding", TLSEXT_TYPE_padding},
+    { "server name", TLSEXT_TYPE_server_name },
+    { "max fragment length", TLSEXT_TYPE_max_fragment_length },
+    { "client certificate URL", TLSEXT_TYPE_client_certificate_url },
+    { "trusted CA keys", TLSEXT_TYPE_trusted_ca_keys },
+    { "truncated HMAC", TLSEXT_TYPE_truncated_hmac },
+    { "status request", TLSEXT_TYPE_status_request },
+    { "user mapping", TLSEXT_TYPE_user_mapping },
+    { "client authz", TLSEXT_TYPE_client_authz },
+    { "server authz", TLSEXT_TYPE_server_authz },
+    { "cert type", TLSEXT_TYPE_cert_type },
+    { "supported_groups", TLSEXT_TYPE_supported_groups },
+    { "EC point formats", TLSEXT_TYPE_ec_point_formats },
+    { "SRP", TLSEXT_TYPE_srp },
+    { "signature algorithms", TLSEXT_TYPE_signature_algorithms },
+    { "use SRTP", TLSEXT_TYPE_use_srtp },
+    { "session ticket", TLSEXT_TYPE_session_ticket },
+    { "renegotiation info", TLSEXT_TYPE_renegotiate },
+    { "signed certificate timestamps", TLSEXT_TYPE_signed_certificate_timestamp },
+    { "client cert type", TLSEXT_TYPE_client_cert_type },
+    { "server cert type", TLSEXT_TYPE_server_cert_type },
+    { "TLS padding", TLSEXT_TYPE_padding },
 #ifdef TLSEXT_TYPE_next_proto_neg
-    {"next protocol", TLSEXT_TYPE_next_proto_neg},
+    { "next protocol", TLSEXT_TYPE_next_proto_neg },
 #endif
 #ifdef TLSEXT_TYPE_encrypt_then_mac
-    {"encrypt-then-mac", TLSEXT_TYPE_encrypt_then_mac},
+    { "encrypt-then-mac", TLSEXT_TYPE_encrypt_then_mac },
 #endif
 #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
-    {"application layer protocol negotiation",
-     TLSEXT_TYPE_application_layer_protocol_negotiation},
+    { "application layer protocol negotiation",
+        TLSEXT_TYPE_application_layer_protocol_negotiation },
 #endif
 #ifdef TLSEXT_TYPE_extended_master_secret
-    {"extended master secret", TLSEXT_TYPE_extended_master_secret},
+    { "extended master secret", TLSEXT_TYPE_extended_master_secret },
 #endif
-    {"compress certificate", TLSEXT_TYPE_compress_certificate},
-    {"key share", TLSEXT_TYPE_key_share},
-    {"supported versions", TLSEXT_TYPE_supported_versions},
-    {"psk", TLSEXT_TYPE_psk},
-    {"psk kex modes", TLSEXT_TYPE_psk_kex_modes},
-    {"certificate authorities", TLSEXT_TYPE_certificate_authorities},
-    {"post handshake auth", TLSEXT_TYPE_post_handshake_auth},
-    {"early_data", TLSEXT_TYPE_early_data},
-    {NULL}
+    { "compress certificate", TLSEXT_TYPE_compress_certificate },
+    { "key share", TLSEXT_TYPE_key_share },
+    { "supported versions", TLSEXT_TYPE_supported_versions },
+    { "psk", TLSEXT_TYPE_psk },
+    { "psk kex modes", TLSEXT_TYPE_psk_kex_modes },
+    { "certificate authorities", TLSEXT_TYPE_certificate_authorities },
+    { "post handshake auth", TLSEXT_TYPE_post_handshake_auth },
+    { "early_data", TLSEXT_TYPE_early_data },
+    { NULL }
 };
 
 /* from rfc8446 4.2.3. + gost (https://tools.ietf.org/id/draft-smyshlyaev-tls12-gost-suites-04.html) */
 static STRINT_PAIR signature_tls13_scheme_list[] = {
-    {"rsa_pkcs1_sha1",         0x0201 /* TLSEXT_SIGALG_rsa_pkcs1_sha1 */},
-    {"ecdsa_sha1",             0x0203 /* TLSEXT_SIGALG_ecdsa_sha1 */},
-/*  {"rsa_pkcs1_sha224",       0x0301    TLSEXT_SIGALG_rsa_pkcs1_sha224}, not in rfc8446 */
-/*  {"ecdsa_sha224",           0x0303    TLSEXT_SIGALG_ecdsa_sha224}      not in rfc8446 */
-    {"rsa_pkcs1_sha256",       0x0401 /* TLSEXT_SIGALG_rsa_pkcs1_sha256 */},
-    {"ecdsa_secp256r1_sha256", 0x0403 /* TLSEXT_SIGALG_ecdsa_secp256r1_sha256 */},
-    {"rsa_pkcs1_sha384",       0x0501 /* TLSEXT_SIGALG_rsa_pkcs1_sha384 */},
-    {"ecdsa_secp384r1_sha384", 0x0503 /* TLSEXT_SIGALG_ecdsa_secp384r1_sha384 */},
-    {"rsa_pkcs1_sha512",       0x0601 /* TLSEXT_SIGALG_rsa_pkcs1_sha512 */},
-    {"ecdsa_secp521r1_sha512", 0x0603 /* TLSEXT_SIGALG_ecdsa_secp521r1_sha512 */},
-    {"rsa_pss_rsae_sha256",    0x0804 /* TLSEXT_SIGALG_rsa_pss_rsae_sha256 */},
-    {"rsa_pss_rsae_sha384",    0x0805 /* TLSEXT_SIGALG_rsa_pss_rsae_sha384 */},
-    {"rsa_pss_rsae_sha512",    0x0806 /* TLSEXT_SIGALG_rsa_pss_rsae_sha512 */},
-    {"ed25519",                0x0807 /* TLSEXT_SIGALG_ed25519 */},
-    {"ed448",                  0x0808 /* TLSEXT_SIGALG_ed448 */},
-    {"rsa_pss_pss_sha256",     0x0809 /* TLSEXT_SIGALG_rsa_pss_pss_sha256 */},
-    {"rsa_pss_pss_sha384",     0x080a /* TLSEXT_SIGALG_rsa_pss_pss_sha384 */},
-    {"rsa_pss_pss_sha512",     0x080b /* TLSEXT_SIGALG_rsa_pss_pss_sha512 */},
-    {"gostr34102001",          0xeded /* TLSEXT_SIGALG_gostr34102001_gostr3411 */},
-    {"gostr34102012_256",      0xeeee /* TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256 */},
-    {"gostr34102012_512",      0xefef /* TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512 */},
-    {NULL}
+    { "rsa_pkcs1_sha1", 0x0201 /* TLSEXT_SIGALG_rsa_pkcs1_sha1 */ },
+    { "ecdsa_sha1", 0x0203 /* TLSEXT_SIGALG_ecdsa_sha1 */ },
+    /*  {"rsa_pkcs1_sha224",       0x0301    TLSEXT_SIGALG_rsa_pkcs1_sha224}, not in rfc8446 */
+    /*  {"ecdsa_sha224",           0x0303    TLSEXT_SIGALG_ecdsa_sha224}      not in rfc8446 */
+    { "rsa_pkcs1_sha256", 0x0401 /* TLSEXT_SIGALG_rsa_pkcs1_sha256 */ },
+    { "ecdsa_secp256r1_sha256", 0x0403 /* TLSEXT_SIGALG_ecdsa_secp256r1_sha256 */ },
+    { "rsa_pkcs1_sha384", 0x0501 /* TLSEXT_SIGALG_rsa_pkcs1_sha384 */ },
+    { "ecdsa_secp384r1_sha384", 0x0503 /* TLSEXT_SIGALG_ecdsa_secp384r1_sha384 */ },
+    { "rsa_pkcs1_sha512", 0x0601 /* TLSEXT_SIGALG_rsa_pkcs1_sha512 */ },
+    { "ecdsa_secp521r1_sha512", 0x0603 /* TLSEXT_SIGALG_ecdsa_secp521r1_sha512 */ },
+    { "rsa_pss_rsae_sha256", 0x0804 /* TLSEXT_SIGALG_rsa_pss_rsae_sha256 */ },
+    { "rsa_pss_rsae_sha384", 0x0805 /* TLSEXT_SIGALG_rsa_pss_rsae_sha384 */ },
+    { "rsa_pss_rsae_sha512", 0x0806 /* TLSEXT_SIGALG_rsa_pss_rsae_sha512 */ },
+    { "ed25519", 0x0807 /* TLSEXT_SIGALG_ed25519 */ },
+    { "ed448", 0x0808 /* TLSEXT_SIGALG_ed448 */ },
+    { "rsa_pss_pss_sha256", 0x0809 /* TLSEXT_SIGALG_rsa_pss_pss_sha256 */ },
+    { "rsa_pss_pss_sha384", 0x080a /* TLSEXT_SIGALG_rsa_pss_pss_sha384 */ },
+    { "rsa_pss_pss_sha512", 0x080b /* TLSEXT_SIGALG_rsa_pss_pss_sha512 */ },
+    { "gostr34102001", 0xeded /* TLSEXT_SIGALG_gostr34102001_gostr3411 */ },
+    { "gostr34102012_256", 0xeeee /* TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256 */ },
+    { "gostr34102012_512", 0xefef /* TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512 */ },
+    { NULL }
 };
 
 /* from rfc5246 7.4.1.4.1. */
 static STRINT_PAIR signature_tls12_alg_list[] = {
-    {"anonymous", TLSEXT_signature_anonymous /* 0 */},
-    {"RSA",       TLSEXT_signature_rsa       /* 1 */},
-    {"DSA",       TLSEXT_signature_dsa       /* 2 */},
-    {"ECDSA",     TLSEXT_signature_ecdsa     /* 3 */},
-    {NULL}
+    { "anonymous", TLSEXT_signature_anonymous /* 0 */ },
+    { "RSA", TLSEXT_signature_rsa /* 1 */ },
+    { "DSA", TLSEXT_signature_dsa /* 2 */ },
+    { "ECDSA", TLSEXT_signature_ecdsa /* 3 */ },
+    { NULL }
 };
 
 /* from rfc5246 7.4.1.4.1. */
 static STRINT_PAIR signature_tls12_hash_list[] = {
-    {"none",   TLSEXT_hash_none   /* 0 */},
-    {"MD5",    TLSEXT_hash_md5    /* 1 */},
-    {"SHA1",   TLSEXT_hash_sha1   /* 2 */},
-    {"SHA224", TLSEXT_hash_sha224 /* 3 */},
-    {"SHA256", TLSEXT_hash_sha256 /* 4 */},
-    {"SHA384", TLSEXT_hash_sha384 /* 5 */},
-    {"SHA512", TLSEXT_hash_sha512 /* 6 */},
-    {NULL}
+    { "none", TLSEXT_hash_none /* 0 */ },
+    { "MD5", TLSEXT_hash_md5 /* 1 */ },
+    { "SHA1", TLSEXT_hash_sha1 /* 2 */ },
+    { "SHA224", TLSEXT_hash_sha224 /* 3 */ },
+    { "SHA256", TLSEXT_hash_sha256 /* 4 */ },
+    { "SHA384", TLSEXT_hash_sha384 /* 5 */ },
+    { "SHA512", TLSEXT_hash_sha512 /* 6 */ },
+    { NULL }
 };
 
 void tlsext_cb(SSL *s, int client_server, int type,
-               const unsigned char *data, int len, void *arg)
+    const unsigned char *data, int len, void *arg)
 {
     BIO *bio = arg;
     const char *extname = lookup(type, tlsext_types, "unknown");
 
     BIO_printf(bio, "TLS %s extension \"%s\" (id=%d), len=%d\n",
-               client_server ? "server" : "client", extname, type, len);
+        client_server ? "server" : "client", extname, type, len);
     BIO_dump(bio, (const char *)data, len);
     (void)BIO_flush(bio);
 }
 
 #ifndef OPENSSL_NO_SOCK
 int generate_stateless_cookie_callback(SSL *ssl, unsigned char *cookie,
-                                       size_t *cookie_len)
+    size_t *cookie_len)
 {
     unsigned char *buffer = NULL;
     size_t length = 0;
@@ -885,13 +881,15 @@ int generate_stateless_cookie_callback(SSL *ssl, unsigned char *cookie,
     buffer = app_malloc(length, "cookie generate buffer");
 
     memcpy(buffer, &port, sizeof(port));
-    BIO_ADDR_rawaddress(peer, buffer + sizeof(port), NULL);
+    if (!BIO_ADDR_rawaddress(peer, buffer + sizeof(port), NULL))
+        goto end;
 
     if (EVP_Q_mac(NULL, "HMAC", NULL, "SHA1", NULL,
-                  cookie_secret, COOKIE_SECRET_LENGTH, buffer, length,
-                  cookie, DTLS1_COOKIE_LENGTH, cookie_len) == NULL) {
+            cookie_secret, COOKIE_SECRET_LENGTH, buffer, length,
+            cookie, DTLS1_COOKIE_LENGTH, cookie_len)
+        == NULL) {
         BIO_printf(bio_err,
-                   "Error calculating HMAC-SHA1 of buffer with secret\n");
+            "Error calculating HMAC-SHA1 of buffer with secret\n");
         goto end;
     }
     res = 1;
@@ -903,7 +901,7 @@ int generate_stateless_cookie_callback(SSL *ssl, unsigned char *cookie,
 }
 
 int verify_stateless_cookie_callback(SSL *ssl, const unsigned char *cookie,
-                                     size_t cookie_len)
+    size_t cookie_len)
 {
     unsigned char result[EVP_MAX_MD_SIZE];
     size_t resultlength;
@@ -920,7 +918,7 @@ int verify_stateless_cookie_callback(SSL *ssl, const unsigned char *cookie,
 }
 
 int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
-                             unsigned int *cookie_len)
+    unsigned int *cookie_len)
 {
     size_t temp = 0;
     int res = generate_stateless_cookie_callback(ssl, cookie, &temp);
@@ -931,7 +929,7 @@ int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
 }
 
 int verify_cookie_callback(SSL *ssl, const unsigned char *cookie,
-                           unsigned int cookie_len)
+    unsigned int cookie_len)
 {
     return verify_stateless_cookie_callback(ssl, cookie, cookie_len);
 }
@@ -960,16 +958,16 @@ struct ssl_excert_st {
 };
 
 static STRINT_PAIR chain_flags[] = {
-    {"Overall Validity", CERT_PKEY_VALID},
-    {"Sign with EE key", CERT_PKEY_SIGN},
-    {"EE signature", CERT_PKEY_EE_SIGNATURE},
-    {"CA signature", CERT_PKEY_CA_SIGNATURE},
-    {"EE key parameters", CERT_PKEY_EE_PARAM},
-    {"CA key parameters", CERT_PKEY_CA_PARAM},
-    {"Explicitly sign with EE key", CERT_PKEY_EXPLICIT_SIGN},
-    {"Issuer Name", CERT_PKEY_ISSUER_NAME},
-    {"Certificate Type", CERT_PKEY_CERT_TYPE},
-    {NULL}
+    { "Overall Validity", CERT_PKEY_VALID },
+    { "Sign with EE key", CERT_PKEY_SIGN },
+    { "EE signature", CERT_PKEY_EE_SIGNATURE },
+    { "CA signature", CERT_PKEY_CA_SIGNATURE },
+    { "EE key parameters", CERT_PKEY_EE_PARAM },
+    { "CA key parameters", CERT_PKEY_CA_PARAM },
+    { "Explicitly sign with EE key", CERT_PKEY_EXPLICIT_SIGN },
+    { "Issuer Name", CERT_PKEY_ISSUER_NAME },
+    { "Certificate Type", CERT_PKEY_CERT_TYPE },
+    { NULL }
 };
 
 static void print_chain_flags(SSL *s, int flags)
@@ -978,8 +976,8 @@ static void print_chain_flags(SSL *s, int flags)
 
     for (pp = chain_flags; pp->name; ++pp)
         BIO_printf(bio_err, "\t%s: %s\n",
-                   pp->name,
-                   (flags & pp->retval) ? "OK" : "NOT OK");
+            pp->name,
+            (flags & pp->retval) ? "OK" : "NOT OK");
     BIO_printf(bio_err, "\tSuite B: ");
     if (SSL_set_cert_flags(s, 0) & SSL_CERT_FLAG_SUITEB_128_LOS)
         BIO_puts(bio_err, flags & CERT_PKEY_SUITEB ? "OK\n" : "NOT OK\n");
@@ -1001,8 +999,8 @@ static int set_cert_cb(SSL *ssl, void *arg)
     if (retry_cnt < 5) {
         retry_cnt++;
         BIO_printf(bio_err,
-                   "Certificate callback retry test: count %d\n",
-                   retry_cnt);
+            "Certificate callback retry test: count %d\n",
+            retry_cnt);
         return -1;
     }
 #endif
@@ -1025,12 +1023,12 @@ static int set_cert_cb(SSL *ssl, void *arg)
         rv = SSL_check_chain(ssl, exc->cert, exc->key, exc->chain);
         BIO_printf(bio_err, "Checking cert chain %d:\nSubject: ", i);
         X509_NAME_print_ex(bio_err, X509_get_subject_name(exc->cert), 0,
-                           get_nameopt());
+            get_nameopt());
         BIO_puts(bio_err, "\n");
         print_chain_flags(ssl, rv);
         if (rv & CERT_PKEY_VALID) {
             if (!SSL_use_certificate(ssl, exc->cert)
-                    || !SSL_use_PrivateKey(ssl, exc->key)) {
+                || !SSL_use_PrivateKey(ssl, exc->key)) {
                 return 0;
             }
             /*
@@ -1074,7 +1072,6 @@ static int ssl_excert_prepend(SSL_EXCERT **pexc)
         exc->keyform = FORMAT_PEM;
     }
     return 1;
-
 }
 
 void ssl_excert_free(SSL_EXCERT *exc)
@@ -1111,15 +1108,15 @@ int load_excert(SSL_EXCERT **pexc)
             return 0;
         }
         exc->cert = load_cert(exc->certfile, exc->certform,
-                              "Server Certificate");
+            "Server Certificate");
         if (exc->cert == NULL)
             return 0;
         if (exc->keyfile != NULL) {
             exc->key = load_key(exc->keyfile, exc->keyform,
-                                0, NULL, NULL, "server key");
+                0, NULL, NULL, "server key");
         } else {
             exc->key = load_key(exc->certfile, exc->certform,
-                                0, NULL, NULL, "server key");
+                0, NULL, NULL, "server key");
         }
         if (exc->key == NULL)
             return 0;
@@ -1143,7 +1140,7 @@ int args_excert(int opt, SSL_EXCERT **pexc)
     if (exc == NULL) {
         if (!ssl_excert_prepend(&exc)) {
             BIO_printf(bio_err, " %s: Error initialising xcert\n",
-                       opt_getprog());
+                opt_getprog());
             goto err;
         }
         *pexc = exc;
@@ -1171,7 +1168,7 @@ int args_excert(int opt, SSL_EXCERT **pexc)
     case OPT_X_CHAIN:
         if (exc->chainfile != NULL) {
             BIO_printf(bio_err, "%s: Chain already specified\n",
-                       opt_getprog());
+                opt_getprog());
             goto err;
         }
         exc->chainfile = opt_arg();
@@ -1190,7 +1187,7 @@ int args_excert(int opt, SSL_EXCERT **pexc)
     }
     return 1;
 
- err:
+err:
     ERR_print_errors(bio_err);
     ssl_excert_free(exc);
     *pexc = NULL;
@@ -1236,11 +1233,11 @@ static char *hexencode(const unsigned char *data, size_t len)
     char *out;
     char *cp;
     size_t outlen = 2 * len + 1;
-    int ilen = (int) outlen;
+    int ilen = (int)outlen;
 
     if (outlen < len || ilen < 0 || outlen != (size_t)ilen) {
         BIO_printf(bio_err, "%s: %zu-byte buffer too large to hexencode\n",
-                   opt_getprog(), len);
+            opt_getprog(), len);
         exit(1);
     }
     cp = out = app_malloc(ilen, "TLSA hex data buffer");
@@ -1292,12 +1289,13 @@ void print_verify_detail(SSL *s, BIO *bio)
         else
             hexdata = hexencode(data, dlen);
         BIO_printf(bio, "DANE TLSA %d %d %d %s%s ",
-                   usage, selector, mtype,
-                   (dlen > TLSA_TAIL_SIZE) ? "..." : "", hexdata);
+            usage, selector, mtype,
+            (dlen > TLSA_TAIL_SIZE) ? "..." : "", hexdata);
         if (SSL_get0_peer_rpk(s) == NULL)
             BIO_printf(bio, "%s certificate at depth %d\n",
-                       (mspki != NULL) ? "signed the peer" :
-                       mdpth ? "matched the TA" : "matched the EE", mdpth);
+                (mspki != NULL) ? "signed the peer" : mdpth ? "matched the TA"
+                                                            : "matched the EE",
+                mdpth);
         else
             BIO_printf(bio, "matched the peer raw public key\n");
         OPENSSL_free(hexdata);
@@ -1320,7 +1318,7 @@ void print_ssl_summary(SSL *s)
     if (peer != NULL) {
         BIO_puts(bio_err, "Peer certificate: ");
         X509_NAME_print_ex(bio_err, X509_get_subject_name(peer),
-                           0, get_nameopt());
+            0, get_nameopt());
         BIO_puts(bio_err, "\n");
         if (SSL_get_peer_signature_nid(s, &nid))
             BIO_printf(bio_err, "Hash used: %s\n", OBJ_nid2sn(nid));
@@ -1344,7 +1342,7 @@ void print_ssl_summary(SSL *s)
 }
 
 int config_ctx(SSL_CONF_CTX *cctx, STACK_OF(OPENSSL_STRING) *str,
-               SSL_CTX *ctx)
+    SSL_CTX *ctx)
 {
     int i;
 
@@ -1355,7 +1353,7 @@ int config_ctx(SSL_CONF_CTX *cctx, STACK_OF(OPENSSL_STRING) *str,
 
         if (SSL_CONF_cmd(cctx, flag, arg) <= 0) {
             BIO_printf(bio_err, "Call to SSL_CONF_cmd(%s, %s) failed\n",
-                       flag, arg == NULL ? "<NULL>" : arg);
+                flag, arg == NULL ? "<NULL>" : arg);
             ERR_print_errors(bio_err);
             return 0;
         }
@@ -1393,11 +1391,11 @@ int ssl_ctx_add_crls(SSL_CTX *ctx, STACK_OF(X509_CRL) *crls, int crl_download)
 }
 
 int ssl_load_stores(SSL_CTX *ctx,
-                    const char *vfyCApath, const char *vfyCAfile,
-                    const char *vfyCAstore,
-                    const char *chCApath, const char *chCAfile,
-                    const char *chCAstore,
-                    STACK_OF(X509_CRL) *crls, int crl_download)
+    const char *vfyCApath, const char *vfyCAfile,
+    const char *vfyCAstore,
+    const char *chCApath, const char *chCAfile,
+    const char *chCAstore,
+    STACK_OF(X509_CRL) *crls, int crl_download)
 {
     X509_STORE *vfy = NULL, *ch = NULL;
     int rv = 0;
@@ -1432,7 +1430,7 @@ int ssl_load_stores(SSL_CTX *ctx,
             goto err;
     }
     rv = 1;
- err:
+err:
     X509_STORE_free(vfy);
     X509_STORE_free(ch);
     return rv;
@@ -1443,38 +1441,38 @@ int ssl_load_stores(SSL_CTX *ctx,
 typedef struct {
     BIO *out;
     int verbose;
-    int (*old_cb) (const SSL *s, const SSL_CTX *ctx, int op, int bits, int nid,
-                   void *other, void *ex);
+    int (*old_cb)(const SSL *s, const SSL_CTX *ctx, int op, int bits, int nid,
+        void *other, void *ex);
 } security_debug_ex;
 
 static STRINT_PAIR callback_types[] = {
-    {"Supported Ciphersuite", SSL_SECOP_CIPHER_SUPPORTED},
-    {"Shared Ciphersuite", SSL_SECOP_CIPHER_SHARED},
-    {"Check Ciphersuite", SSL_SECOP_CIPHER_CHECK},
+    { "Supported Ciphersuite", SSL_SECOP_CIPHER_SUPPORTED },
+    { "Shared Ciphersuite", SSL_SECOP_CIPHER_SHARED },
+    { "Check Ciphersuite", SSL_SECOP_CIPHER_CHECK },
 #ifndef OPENSSL_NO_DH
-    {"Temp DH key bits", SSL_SECOP_TMP_DH},
+    { "Temp DH key bits", SSL_SECOP_TMP_DH },
 #endif
-    {"Supported Curve", SSL_SECOP_CURVE_SUPPORTED},
-    {"Shared Curve", SSL_SECOP_CURVE_SHARED},
-    {"Check Curve", SSL_SECOP_CURVE_CHECK},
-    {"Supported Signature Algorithm", SSL_SECOP_SIGALG_SUPPORTED},
-    {"Shared Signature Algorithm", SSL_SECOP_SIGALG_SHARED},
-    {"Check Signature Algorithm", SSL_SECOP_SIGALG_CHECK},
-    {"Signature Algorithm mask", SSL_SECOP_SIGALG_MASK},
-    {"Certificate chain EE key", SSL_SECOP_EE_KEY},
-    {"Certificate chain CA key", SSL_SECOP_CA_KEY},
-    {"Peer Chain EE key", SSL_SECOP_PEER_EE_KEY},
-    {"Peer Chain CA key", SSL_SECOP_PEER_CA_KEY},
-    {"Certificate chain CA digest", SSL_SECOP_CA_MD},
-    {"Peer chain CA digest", SSL_SECOP_PEER_CA_MD},
-    {"SSL compression", SSL_SECOP_COMPRESSION},
-    {"Session ticket", SSL_SECOP_TICKET},
-    {NULL}
+    { "Supported Curve", SSL_SECOP_CURVE_SUPPORTED },
+    { "Shared Curve", SSL_SECOP_CURVE_SHARED },
+    { "Check Curve", SSL_SECOP_CURVE_CHECK },
+    { "Supported Signature Algorithm", SSL_SECOP_SIGALG_SUPPORTED },
+    { "Shared Signature Algorithm", SSL_SECOP_SIGALG_SHARED },
+    { "Check Signature Algorithm", SSL_SECOP_SIGALG_CHECK },
+    { "Signature Algorithm mask", SSL_SECOP_SIGALG_MASK },
+    { "Certificate chain EE key", SSL_SECOP_EE_KEY },
+    { "Certificate chain CA key", SSL_SECOP_CA_KEY },
+    { "Peer Chain EE key", SSL_SECOP_PEER_EE_KEY },
+    { "Peer Chain CA key", SSL_SECOP_PEER_CA_KEY },
+    { "Certificate chain CA digest", SSL_SECOP_CA_MD },
+    { "Peer chain CA digest", SSL_SECOP_PEER_CA_MD },
+    { "SSL compression", SSL_SECOP_COMPRESSION },
+    { "Session ticket", SSL_SECOP_TICKET },
+    { NULL }
 };
 
 static int security_callback_debug(const SSL *s, const SSL_CTX *ctx,
-                                   int op, int bits, int nid,
-                                   void *other, void *ex)
+    int op, int bits, int nid,
+    void *other, void *ex)
 {
     security_debug_ex *sdb = ex;
     int rv, show_bits = 1, cert_md = 0;
@@ -1520,66 +1518,61 @@ static int security_callback_debug(const SSL *s, const SSL_CTX *ctx,
         break;
 
 #ifndef OPENSSL_NO_EC
-    case SSL_SECOP_OTHER_CURVE:
-        {
-            const char *cname;
-            cname = EC_curve_nid2nist(nid);
-            if (cname == NULL)
-                cname = OBJ_nid2sn(nid);
-            BIO_puts(sdb->out, cname);
-        }
-        break;
+    case SSL_SECOP_OTHER_CURVE: {
+        const char *cname;
+        cname = EC_curve_nid2nist(nid);
+        if (cname == NULL)
+            cname = OBJ_nid2sn(nid);
+        BIO_puts(sdb->out, cname);
+    } break;
 #endif
-    case SSL_SECOP_OTHER_CERT:
-        {
-            if (cert_md) {
-                int sig_nid = X509_get_signature_nid(other);
+    case SSL_SECOP_OTHER_CERT: {
+        if (cert_md) {
+            int sig_nid = X509_get_signature_nid(other);
 
-                BIO_puts(sdb->out, OBJ_nid2sn(sig_nid));
-            } else {
-                EVP_PKEY *pkey = X509_get0_pubkey(other);
+            BIO_puts(sdb->out, OBJ_nid2sn(sig_nid));
+        } else {
+            EVP_PKEY *pkey = X509_get0_pubkey(other);
 
-                if (pkey == NULL) {
-                    BIO_printf(sdb->out, "Public key missing");
-                } else {
-                    const char *algname = "";
+            if (pkey == NULL) {
+                BIO_printf(sdb->out, "Public key missing");
+            } else {
+                const char *algname = "";
 
-                    EVP_PKEY_asn1_get0_info(NULL, NULL, NULL, NULL,
-                                            &algname, EVP_PKEY_get0_asn1(pkey));
-                    BIO_printf(sdb->out, "%s, bits=%d",
-                            algname, EVP_PKEY_get_bits(pkey));
-                }
+                EVP_PKEY_asn1_get0_info(NULL, NULL, NULL, NULL,
+                    &algname, EVP_PKEY_get0_asn1(pkey));
+                BIO_printf(sdb->out, "%s, bits=%d",
+                    algname, EVP_PKEY_get_bits(pkey));
             }
-            break;
         }
-    case SSL_SECOP_OTHER_SIGALG:
-        {
-            const unsigned char *salg = other;
-            const char *sname = NULL;
-            int raw_sig_code = (salg[0] << 8) + salg[1]; /* always big endian (msb, lsb) */
-                /* raw_sig_code: signature_scheme from tls1.3, or signature_and_hash from tls1.2 */
-
-            if (nm != NULL)
-                BIO_printf(sdb->out, "%s", nm);
-            else
-                BIO_printf(sdb->out, "s_cb.c:security_callback_debug op=0x%x", op);
+        break;
+    }
+    case SSL_SECOP_OTHER_SIGALG: {
+        const unsigned char *salg = other;
+        const char *sname = NULL;
+        int raw_sig_code = (salg[0] << 8) + salg[1]; /* always big endian (msb, lsb) */
+        /* raw_sig_code: signature_scheme from tls1.3, or signature_and_hash from tls1.2 */
+
+        if (nm != NULL)
+            BIO_printf(sdb->out, "%s", nm);
+        else
+            BIO_printf(sdb->out, "s_cb.c:security_callback_debug op=0x%x", op);
 
-            sname = lookup(raw_sig_code, signature_tls13_scheme_list, NULL);
-            if (sname != NULL) {
-                BIO_printf(sdb->out, " scheme=%s", sname);
-            } else {
-                int alg_code = salg[1];
-                int hash_code = salg[0];
-                const char *alg_str = lookup(alg_code, signature_tls12_alg_list, NULL);
-                const char *hash_str = lookup(hash_code, signature_tls12_hash_list, NULL);
-
-                if (alg_str != NULL && hash_str != NULL)
-                    BIO_printf(sdb->out, " digest=%s, algorithm=%s", hash_str, alg_str);
-                else
-                    BIO_printf(sdb->out, " scheme=unknown(0x%04x)", raw_sig_code);
-            }
-        }
+        sname = lookup(raw_sig_code, signature_tls13_scheme_list, NULL);
+        if (sname != NULL) {
+            BIO_printf(sdb->out, " scheme=%s", sname);
+        } else {
+            int alg_code = salg[1];
+            int hash_code = salg[0];
+            const char *alg_str = lookup(alg_code, signature_tls12_alg_list, NULL);
+            const char *hash_str = lookup(hash_code, signature_tls12_hash_list, NULL);
 
+            if (alg_str != NULL && hash_str != NULL)
+                BIO_printf(sdb->out, " digest=%s, algorithm=%s", hash_str, alg_str);
+            else
+                BIO_printf(sdb->out, " scheme=unknown(0x%04x)", raw_sig_code);
+        }
+    }
     }
 
     if (show_bits)
@@ -1639,7 +1632,7 @@ int set_keylog_file(SSL_CTX *ctx, const char *keylog_file)
     /* Write a header for seekable, empty files (this excludes pipes). */
     if (BIO_tell(bio_keylog) == 0) {
         BIO_puts(bio_keylog,
-                 "# SSL/TLS secrets log file, generated by OpenSSL\n");
+            "# SSL/TLS secrets log file, generated by OpenSSL\n");
         (void)BIO_flush(bio_keylog);
     }
     SSL_CTX_set_keylog_callback(ctx, keylog_callback);
@@ -1669,7 +1662,7 @@ void ssl_print_secure_renegotiation_notes(BIO *bio, SSL *s)
 {
     if (SSL_VERSION_ALLOWS_RENEGOTIATION(s)) {
         BIO_printf(bio, "Secure Renegotiation IS%s supported\n",
-                   SSL_get_secure_renegotiation_support(s) ? "" : " NOT");
+            SSL_get_secure_renegotiation_support(s) ? "" : " NOT");
     } else {
         BIO_printf(bio, "This TLS version forbids renegotiation.\n");
     }
diff --git a/apps/lib/s_socket.c b/apps/lib/s_socket.c
index f61b1b5c82689..6f9cf23f5e57c 100644
--- a/apps/lib/s_socket.c
+++ b/apps/lib/s_socket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -22,28 +22,28 @@
  * needed to have fileno() declared correctly...  So let's define u_int
  */
 #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
-# define __U_INT
+#define __U_INT
 typedef unsigned int u_int;
 #endif
 
 #ifdef _WIN32
-# include <process.h>
+#include <process.h>
 
 /* MSVC renamed some POSIX functions to have an underscore prefix. */
-# ifdef _MSC_VER
-#  define getpid _getpid
-# endif
+#ifdef _MSC_VER
+#define getpid _getpid
+#endif
 #endif
 
 #ifndef OPENSSL_NO_SOCK
 
-# include "internal/e_os.h"
-# include "apps.h"
-# include "s_apps.h"
-# include "internal/sockets.h" /* for openssl_fdset() */
+#include "internal/e_os.h"
+#include "apps.h"
+#include "s_apps.h"
+#include "internal/sockets.h" /* for openssl_fdset() */
 
-# include <openssl/bio.h>
-# include <openssl/err.h>
+#include <openssl/bio.h>
+#include <openssl/err.h>
 
 /* Keep track of our peer's address for the cookie callback */
 BIO_ADDR *ourpeer = NULL;
@@ -73,9 +73,9 @@ BIO_ADDR *ourpeer = NULL;
  * Returns 1 on success, 0 on failure.
  */
 int init_client(int *sock, const char *host, const char *port,
-                const char *bindhost, const char *bindport,
-                int family, int type, int protocol, int tfo, int doconn,
-                BIO_ADDR **ba_ret)
+    const char *bindhost, const char *bindport,
+    int family, int type, int protocol, int tfo, int doconn,
+    BIO_ADDR **ba_ret)
 {
     BIO_ADDRINFO *res = NULL;
     BIO_ADDRINFO *bindaddr = NULL;
@@ -89,7 +89,7 @@ int init_client(int *sock, const char *host, const char *port,
         return 0;
 
     ret = BIO_lookup_ex(host, port, BIO_LOOKUP_CLIENT, family, type, protocol,
-                        &res);
+        &res);
     if (ret == 0) {
         ERR_print_errors(bio_err);
         return 0;
@@ -97,9 +97,9 @@ int init_client(int *sock, const char *host, const char *port,
 
     if (bindhost != NULL || bindport != NULL) {
         ret = BIO_lookup_ex(bindhost, bindport, BIO_LOOKUP_CLIENT,
-                            family, type, protocol, &bindaddr);
+            family, type, protocol, &bindaddr);
         if (ret == 0) {
-            ERR_print_errors (bio_err);
+            ERR_print_errors(bio_err);
             goto out;
         }
     }
@@ -110,10 +110,10 @@ int init_client(int *sock, const char *host, const char *port,
          * anything in the BIO_ADDRINFO chain that we haven't
          * asked for. */
         OPENSSL_assert((family == AF_UNSPEC
-                        || family == BIO_ADDRINFO_family(ai))
-                       && (type == 0 || type == BIO_ADDRINFO_socktype(ai))
-                       && (protocol == 0
-                           || protocol == BIO_ADDRINFO_protocol(ai)));
+                           || family == BIO_ADDRINFO_family(ai))
+            && (type == 0 || type == BIO_ADDRINFO_socktype(ai))
+            && (protocol == 0
+                || protocol == BIO_ADDRINFO_protocol(ai)));
 
         if (bindaddr != NULL) {
             for (bi = bindaddr; bi != NULL; bi = BIO_ADDRINFO_next(bi)) {
@@ -126,7 +126,7 @@ int init_client(int *sock, const char *host, const char *port,
         }
 
         *sock = BIO_socket(BIO_ADDRINFO_family(ai), BIO_ADDRINFO_socktype(ai),
-                           BIO_ADDRINFO_protocol(ai), 0);
+            BIO_ADDRINFO_protocol(ai), 0);
         if (*sock == INVALID_SOCKET) {
             /* Maybe the kernel doesn't support the socket family, even if
              * BIO_lookup() added it in the returned result...
@@ -136,7 +136,7 @@ int init_client(int *sock, const char *host, const char *port,
 
         if (bi != NULL) {
             if (!BIO_bind(*sock, BIO_ADDRINFO_address(bi),
-                          BIO_SOCK_REUSEADDR)) {
+                    BIO_SOCK_REUSEADDR)) {
                 BIO_closesocket(*sock);
                 *sock = INVALID_SOCKET;
                 break;
@@ -154,8 +154,9 @@ int init_client(int *sock, const char *host, const char *port,
             BIO *tmpbio = BIO_new_dgram_sctp(*sock, BIO_NOCLOSE);
 
             if (tmpbio == NULL) {
-                ERR_print_errors(bio_err);
-                return 0;
+                BIO_closesocket(*sock);
+                *sock = INVALID_SOCKET;
+                continue;
             }
             BIO_free(tmpbio);
         }
@@ -173,8 +174,16 @@ int init_client(int *sock, const char *host, const char *port,
         }
 
         /* Save the address */
-        if (tfo || !doconn)
+        if (tfo || !doconn) {
+            if (ba_ret == NULL) {
+                BIO_printf(bio_err, "Internal error\n");
+                BIO_closesocket(*sock);
+                *sock = INVALID_SOCKET;
+                goto out;
+            }
+
             *ba_ret = BIO_ADDR_dup(BIO_ADDRINFO_address(ai));
+        }
 
         /* Success, don't try any more addresses */
         break;
@@ -184,13 +193,14 @@ int init_client(int *sock, const char *host, const char *port,
         if (bindaddr != NULL && !found) {
             BIO_printf(bio_err, "Can't bind %saddress for %s%s%s\n",
 #ifdef AF_INET6
-                       BIO_ADDRINFO_family(res) == AF_INET6 ? "IPv6 " :
+                BIO_ADDRINFO_family(res) == AF_INET6 ? "IPv6 " :
 #endif
-                       BIO_ADDRINFO_family(res) == AF_INET ? "IPv4 " :
-                       BIO_ADDRINFO_family(res) == AF_UNIX ? "unix " : "",
-                       bindhost != NULL ? bindhost : "",
-                       bindport != NULL ? ":" : "",
-                       bindport != NULL ? bindport : "");
+                    BIO_ADDRINFO_family(res) == AF_INET   ? "IPv4 "
+                    : BIO_ADDRINFO_family(res) == AF_UNIX ? "unix "
+                                                          : "",
+                bindhost != NULL ? bindhost : "",
+                bindport != NULL ? ":" : "",
+                bindport != NULL ? bindport : "");
             ERR_clear_error();
             ret = 0;
         }
@@ -209,7 +219,7 @@ int init_client(int *sock, const char *host, const char *port,
     }
 out:
     if (bindaddr != NULL) {
-        BIO_ADDRINFO_free (bindaddr);
+        BIO_ADDRINFO_free(bindaddr);
     }
     BIO_ADDRINFO_free(res);
     return ret;
@@ -225,7 +235,7 @@ void get_sock_info_address(int asock, char **hostname, char **service)
         *service = NULL;
 
     if ((info.addr = BIO_ADDR_new()) != NULL
-            && BIO_sock_info(asock, BIO_SOCK_INFO_ADDRESS, &info)) {
+        && BIO_sock_info(asock, BIO_SOCK_INFO_ADDRESS, &info)) {
         if (hostname != NULL)
             *hostname = BIO_ADDR_hostname_string(info.addr, 1);
         if (service != NULL)
@@ -247,10 +257,11 @@ int report_server_accept(BIO *out, int asock, int with_address, int with_pid)
         success = hostname != NULL && service != NULL;
         if (success)
             success = BIO_printf(out,
-                                 strchr(hostname, ':') == NULL
-                                 ? /* IPv4 */ " %s:%s"
-                                 : /* IPv6 */ " [%s]:%s",
-                                 hostname, service) > 0;
+                          strchr(hostname, ':') == NULL
+                              ? /* IPv4 */ " %s:%s"
+                              : /* IPv6 */ " [%s]:%s",
+                          hostname, service)
+                > 0;
         else
             (void)BIO_printf(out, "unknown:error\n");
         OPENSSL_free(hostname);
@@ -285,9 +296,9 @@ int report_server_accept(BIO *out, int asock, int with_address, int with_pid)
  * 0 on failure, something other on success.
  */
 int do_server(int *accept_sock, const char *host, const char *port,
-              int family, int type, int protocol, do_server_cb cb,
-              unsigned char *context, int naccept, BIO *bio_s_out,
-              int tfo)
+    int family, int type, int protocol, do_server_cb cb,
+    unsigned char *context, int naccept, BIO *bio_s_out,
+    int tfo)
 {
     int asock = 0;
     int sock;
@@ -305,7 +316,7 @@ int do_server(int *accept_sock, const char *host, const char *port,
         return 0;
 
     if (!BIO_lookup_ex(host, port, BIO_LOOKUP_SERVER, family, type, protocol,
-                       &res)) {
+            &res)) {
         ERR_print_errors(bio_err);
         return 0;
     }
@@ -313,8 +324,8 @@ int do_server(int *accept_sock, const char *host, const char *port,
     /* Admittedly, these checks are quite paranoid, we should not get
      * anything in the BIO_ADDRINFO chain that we haven't asked for */
     OPENSSL_assert((family == AF_UNSPEC || family == BIO_ADDRINFO_family(res))
-                   && (type == 0 || type == BIO_ADDRINFO_socktype(res))
-                   && (protocol == 0 || protocol == BIO_ADDRINFO_protocol(res)));
+        && (type == 0 || type == BIO_ADDRINFO_socktype(res))
+        && (protocol == 0 || protocol == BIO_ADDRINFO_protocol(res)));
 
     sock_family = BIO_ADDRINFO_family(res);
     sock_type = BIO_ADDRINFO_socktype(res);
@@ -327,10 +338,10 @@ int do_server(int *accept_sock, const char *host, const char *port,
     if (sock_family == AF_INET6)
         sock_options |= BIO_SOCK_V6_ONLY;
     if (next != NULL
-            && BIO_ADDRINFO_socktype(next) == sock_type
-            && BIO_ADDRINFO_protocol(next) == sock_protocol) {
+        && BIO_ADDRINFO_socktype(next) == sock_type
+        && BIO_ADDRINFO_protocol(next) == sock_protocol) {
         if (sock_family == AF_INET
-                && BIO_ADDRINFO_family(next) == AF_INET6) {
+            && BIO_ADDRINFO_family(next) == AF_INET6) {
             /* In case AF_INET6 is returned but not supported by the
              * kernel, retry with the first detected address family */
             sock_family_fallback = sock_family;
@@ -338,7 +349,7 @@ int do_server(int *accept_sock, const char *host, const char *port,
             sock_family = AF_INET6;
             sock_address = BIO_ADDRINFO_address(next);
         } else if (sock_family == AF_INET6
-                   && BIO_ADDRINFO_family(next) == AF_INET) {
+            && BIO_ADDRINFO_family(next) == AF_INET) {
             sock_options &= ~BIO_SOCK_V6_ONLY;
         }
     }
@@ -369,6 +380,7 @@ int do_server(int *accept_sock, const char *host, const char *port,
         BIO *tmpbio = BIO_new_dgram_sctp(asock, BIO_NOCLOSE);
 
         if (tmpbio == NULL) {
+            BIO_ADDRINFO_free(res);
             BIO_closesocket(asock);
             ERR_print_errors(bio_err);
             goto end;
@@ -414,8 +426,6 @@ int do_server(int *accept_sock, const char *host, const char *port,
 
             if (naccept != -1)
                 naccept--;
-            if (naccept == 0)
-                BIO_closesocket(asock);
 
             BIO_set_tcp_ndelay(sock, 1);
             i = (*cb)(sock, type, protocol, context);
@@ -438,12 +448,12 @@ int do_server(int *accept_sock, const char *host, const char *port,
              * alerts are passed on...]
              */
             timeout.tv_sec = 0;
-            timeout.tv_usec = 500000;  /* some extreme round-trip */
+            timeout.tv_usec = 500000; /* some extreme round-trip */
             do {
                 FD_ZERO(&readfds);
                 openssl_fdset(sock, &readfds);
             } while (select(sock + 1, &readfds, NULL, NULL, &timeout) > 0
-                     && readsocket(sock, sink, sizeof(sink)) > 0);
+                && readsocket(sock, sink, sizeof(sink)) > 0);
 
             BIO_closesocket(sock);
         } else {
@@ -455,15 +465,16 @@ int do_server(int *accept_sock, const char *host, const char *port,
 
         if (i < 0 || naccept == 0) {
             BIO_closesocket(asock);
+            asock = INVALID_SOCKET;
             ret = i;
             break;
         }
     }
- end:
-# ifdef AF_UNIX
+end:
+#ifdef AF_UNIX
     if (family == AF_UNIX)
         unlink(host);
-# endif
+#endif
     BIO_ADDR_free(ourpeer);
     ourpeer = NULL;
     return ret;
@@ -490,4 +501,4 @@ void do_ssl_shutdown(SSL *ssl)
     } while (ret < 0);
 }
 
-#endif  /* OPENSSL_NO_SOCK */
+#endif /* OPENSSL_NO_SOCK */
diff --git a/apps/lib/tlssrp_depr.c b/apps/lib/tlssrp_depr.c
index 413f1f3538ce0..058f47b90f187 100644
--- a/apps/lib/tlssrp_depr.c
+++ b/apps/lib/tlssrp_depr.c
@@ -29,16 +29,11 @@ static int srp_Verify_N_and_g(const BIGNUM *N, const BIGNUM *g)
     BN_CTX *bn_ctx = BN_CTX_new();
     BIGNUM *p = BN_new();
     BIGNUM *r = BN_new();
-    int ret =
-        g != NULL && N != NULL && bn_ctx != NULL && BN_is_odd(N) &&
-        BN_check_prime(N, bn_ctx, NULL) == 1 &&
-        p != NULL && BN_rshift1(p, N) &&
+    int ret = g != NULL && N != NULL && bn_ctx != NULL && BN_is_odd(N) && BN_check_prime(N, bn_ctx, NULL) == 1 && p != NULL && BN_rshift1(p, N) &&
         /* p = (N-1)/2 */
-        BN_check_prime(p, bn_ctx, NULL) == 1 &&
-        r != NULL &&
+        BN_check_prime(p, bn_ctx, NULL) == 1 && r != NULL &&
         /* verify g^((N-1)/2) == -1 (mod N) */
-        BN_mod_exp(r, g, p, N, bn_ctx) &&
-        BN_add_word(r, 1) && BN_cmp(r, N) == 0;
+        BN_mod_exp(r, g, p, N, bn_ctx) && BN_add_word(r, 1) && BN_cmp(r, N) == 0;
 
     BN_free(r);
     BN_free(p);
@@ -84,7 +79,7 @@ static int ssl_srp_verify_param_cb(SSL *s, void *arg)
     if (srp_arg->amp == 1) {
         if (srp_arg->debug)
             BIO_printf(bio_err,
-                       "SRP param N and g are not known params, going to check deeper.\n");
+                "SRP param N and g are not known params, going to check deeper.\n");
 
         /*
          * The srp_moregroups is a real debugging feature. Implementers
@@ -120,7 +115,7 @@ static char *ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
 }
 
 int set_up_srp_arg(SSL_CTX *ctx, SRP_ARG *srp_arg, int srp_lateuser, int c_msg,
-                   int c_debug)
+    int c_debug)
 {
     if (!srp_lateuser && !SSL_CTX_set_srp_username(ctx, srp_arg->srplogin)) {
         BIO_printf(bio_err, "Unable to set SRP username\n");
@@ -144,7 +139,7 @@ static char *dummy_srp(SSL *ssl, void *arg)
 
 void set_up_dummy_srp(SSL_CTX *ctx)
 {
-        SSL_CTX_set_srp_client_pwd_callback(ctx, dummy_srp);
+    SSL_CTX_set_srp_client_pwd_callback(ctx, dummy_srp);
 }
 
 /*
@@ -157,7 +152,7 @@ void set_up_dummy_srp(SSL_CTX *ctx)
  */
 static int ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
 {
-    srpsrvparm *p = (srpsrvparm *) arg;
+    srpsrvparm *p = (srpsrvparm *)arg;
     int ret = SSL3_AL_FATAL;
 
     if (p->login == NULL && p->user == NULL) {
@@ -171,18 +166,18 @@ static int ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
         goto err;
     }
 
-    if (SSL_set_srp_server_param
-        (s, p->user->N, p->user->g, p->user->s, p->user->v,
-         p->user->info) < 0) {
+    if (SSL_set_srp_server_param(s, p->user->N, p->user->g, p->user->s, p->user->v,
+            p->user->info)
+        < 0) {
         *ad = SSL_AD_INTERNAL_ERROR;
         goto err;
     }
     BIO_printf(bio_err,
-               "SRP parameters set: username = \"%s\" info=\"%s\"\n",
-               p->login, p->user->info);
+        "SRP parameters set: username = \"%s\" info=\"%s\"\n",
+        p->login, p->user->info);
     ret = SSL_ERROR_NONE;
 
- err:
+err:
     SRP_user_pwd_free(p->user);
     p->user = NULL;
     p->login = NULL;
@@ -190,7 +185,7 @@ static int ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
 }
 
 int set_up_srp_verifier_file(SSL_CTX *ctx, srpsrvparm *srp_callback_parm,
-                             char *srpuserseed, char *srp_verifier_file)
+    char *srpuserseed, char *srp_verifier_file)
 {
     int ret;
 
@@ -202,12 +197,12 @@ int set_up_srp_verifier_file(SSL_CTX *ctx, srpsrvparm *srp_callback_parm,
         BIO_printf(bio_err, "Failed to initialize SRP verifier file\n");
         return 0;
     }
-    if ((ret =
-            SRP_VBASE_init(srp_callback_parm->vb,
-                           srp_verifier_file)) != SRP_NO_ERROR) {
+    if ((ret = SRP_VBASE_init(srp_callback_parm->vb,
+             srp_verifier_file))
+        != SRP_NO_ERROR) {
         BIO_printf(bio_err,
-                    "Cannot initialize SRP verifier file \"%s\":ret=%d\n",
-                    srp_verifier_file, ret);
+            "Cannot initialize SRP verifier file \"%s\":ret=%d\n",
+            srp_verifier_file, ret);
         return 0;
     }
     SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, verify_callback);
@@ -221,11 +216,11 @@ void lookup_srp_user(srpsrvparm *srp_callback_parm, BIO *bio_s_out)
 {
     SRP_user_pwd_free(srp_callback_parm->user);
     srp_callback_parm->user = SRP_VBASE_get1_by_user(srp_callback_parm->vb,
-                                                     srp_callback_parm->login);
+        srp_callback_parm->login);
 
     if (srp_callback_parm->user != NULL)
         BIO_printf(bio_s_out, "LOOKUP done %s\n",
-                    srp_callback_parm->user->info);
+            srp_callback_parm->user->info);
     else
         BIO_printf(bio_s_out, "LOOKUP not successful\n");
 }
diff --git a/apps/lib/vms_decc_argv.c b/apps/lib/vms_decc_argv.c
index 031e5afdeca0b..5976bcc9e4e01 100644
--- a/apps/lib/vms_decc_argv.c
+++ b/apps/lib/vms_decc_argv.c
@@ -9,7 +9,7 @@
 
 #include <stdlib.h>
 #include <openssl/crypto.h>
-#include "platform.h"            /* for copy_argv() */
+#include "platform.h" /* for copy_argv() */
 
 char **newargv = NULL;
 
diff --git a/apps/lib/vms_term_sock.c b/apps/lib/vms_term_sock.c
index 219a978966c76..faceb05d01451 100644
--- a/apps/lib/vms_term_sock.c
+++ b/apps/lib/vms_term_sock.c
@@ -9,107 +9,122 @@
  */
 
 #ifdef __VMS
-# define OPENSSL_SYS_VMS
-# pragma message disable DOLLARID
+#define OPENSSL_SYS_VMS
+#pragma message disable DOLLARID
 
+#include <openssl/opensslconf.h>
 
-# include <openssl/opensslconf.h>
-
-# if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
+#if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
 /*
  * On VMS, you need to define this to get the declaration of fileno().  The
  * value 2 is to make sure no function defined in POSIX-2 is left undefined.
  */
-#  define _POSIX_C_SOURCE 2
-# endif
-
-# include <stdio.h>
-
-# undef _POSIX_C_SOURCE
-
-# include <sys/types.h>
-# include <sys/socket.h>
-# include <netinet/in.h>
-# include <inet.h>
-# include <unistd.h>
-# include <string.h>
-# include <errno.h>
-# include <starlet.h>
-# include <iodef.h>
-# ifdef __alpha
-#  include <iosbdef.h>
-# else
-typedef struct _iosb {           /* Copied from IOSBDEF.H for Alpha  */
-#  pragma __nomember_alignment
-    __union  {
-        __struct  {
+#define _POSIX_C_SOURCE 2
+#endif
+
+#include <stdio.h>
+
+#undef _POSIX_C_SOURCE
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <inet.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <starlet.h>
+#include <iodef.h>
+#ifdef __alpha
+#include <iosbdef.h>
+#else
+typedef struct _iosb { /* Copied from IOSBDEF.H for Alpha  */
+#pragma __nomember_alignment
+    __union
+    {
+        __struct
+        {
             unsigned short int iosb$w_status; /* Final I/O status           */
-            __union  {
-                __struct  {             /* 16-bit byte count variant        */
+            __union
+            {
+                __struct
+                { /* 16-bit byte count variant        */
                     unsigned short int iosb$w_bcnt; /* 16-bit byte count    */
-                    __union  {
+                    __union
+                    {
                         unsigned int iosb$l_dev_depend; /* 32-bit device dependent info */
                         unsigned int iosb$l_pid; /* 32-bit pid              */
-                    } iosb$r_l;
-                } iosb$r_bcnt_16;
-                __struct  {             /* 32-bit byte count variant        */
+                    }
+                    iosb$r_l;
+                }
+                iosb$r_bcnt_16;
+                __struct
+                { /* 32-bit byte count variant        */
                     unsigned int iosb$l_bcnt; /* 32-bit byte count (unaligned) */
                     unsigned short int iosb$w_dev_depend_high; /* 16-bit device dependent info */
-                } iosb$r_bcnt_32;
-            } iosb$r_devdepend;
-        } iosb$r_io_64;
-        __struct  {
-            __union  {
+                }
+                iosb$r_bcnt_32;
+            }
+            iosb$r_devdepend;
+        }
+        iosb$r_io_64;
+        __struct
+        {
+            __union
+            {
                 unsigned int iosb$l_getxxi_status; /* Final GETxxI status   */
                 unsigned int iosb$l_reg_status; /* Final $Registry status   */
-            } iosb$r_l_status;
+            }
+            iosb$r_l_status;
             unsigned int iosb$l_reserved; /* Reserved field                 */
-        } iosb$r_get_64;
-    } iosb$r_io_get;
+        }
+        iosb$r_get_64;
+    }
+    iosb$r_io_get;
 } IOSB;
 
-#  if !defined(__VAXC)
-#   define iosb$w_status iosb$r_io_get.iosb$r_io_64.iosb$w_status
-#   define iosb$w_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$w_bcnt
-#   define iosb$r_l        iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$r_l
-#   define iosb$l_dev_depend iosb$r_l.iosb$l_dev_depend
-#   define iosb$l_pid iosb$r_l.iosb$l_pid
-#   define iosb$l_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$l_bcnt
-#   define iosb$w_dev_depend_high iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$w_dev_depend_high
-#   define iosb$l_getxxi_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_getxxi_status
-#   define iosb$l_reg_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_reg_status
-#  endif          /* #if !defined(__VAXC) */
-
-# endif  /* End of IOSBDEF */
-
-# include <efndef.h>
-# include <stdlib.h>
-# include <ssdef.h>
-# include <time.h>
-# include <stdarg.h>
-# include <descrip.h>
-
-# include "vms_term_sock.h"
-
-# ifdef __alpha
+#if !defined(__VAXC)
+#define iosb$w_status iosb$r_io_get.iosb$r_io_64.iosb$w_status
+#define iosb$w_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$w_bcnt
+#define iosb$r_l iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$r_l
+#define iosb$l_dev_depend iosb$r_l.iosb$l_dev_depend
+#define iosb$l_pid iosb$r_l.iosb$l_pid
+#define iosb$l_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$l_bcnt
+#define iosb$w_dev_depend_high iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$w_dev_depend_high
+#define iosb$l_getxxi_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_getxxi_status
+#define iosb$l_reg_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_reg_status
+#endif /* #if !defined(__VAXC) */
+
+#endif /* End of IOSBDEF */
+
+#include <efndef.h>
+#include <stdlib.h>
+#include <ssdef.h>
+#include <time.h>
+#include <stdarg.h>
+#include <descrip.h>
+
+#include "vms_term_sock.h"
+
+#ifdef __alpha
 static struct _iosb TerminalDeviceIosb;
-# else
+#else
 IOSB TerminalDeviceIosb;
-# endif
+#endif
 
 static char TerminalDeviceBuff[255 + 2];
-static int TerminalSocketPair[2] = {0, 0};
+static int TerminalSocketPair[2] = { 0, 0 };
 static unsigned short TerminalDeviceChan = 0;
 
-static int CreateSocketPair (int, int, int, int *);
-static void SocketPairTimeoutAst (int);
-static int TerminalDeviceAst (int);
-static void LogMessage (char *, ...);
+static int CreateSocketPair(int, int, int, int *);
+static void SocketPairTimeoutAst(int);
+static int TerminalDeviceAst(int);
+static void LogMessage(char *, ...);
 
 /*
 ** Socket Pair Timeout Value (must be 0-59 seconds)
 */
-# define SOCKET_PAIR_TIMEOUT_VALUE 20
+#define SOCKET_PAIR_TIMEOUT_VALUE 20
 
 /*
 ** Socket Pair Timeout Block which is passed to timeout AST
@@ -119,55 +134,54 @@ typedef struct _SocketPairTimeoutBlock {
     unsigned short SockChan2;
 } SPTB;
 
-# ifdef TERM_SOCK_TEST
+#ifdef TERM_SOCK_TEST
 
 /*----------------------------------------------------------------------------*/
 /*                                                                            */
 /*----------------------------------------------------------------------------*/
-int main (int argc, char *argv[], char *envp[])
+int main(int argc, char *argv[], char *envp[])
 {
     char TermBuff[80];
     int TermSock,
         status,
         len;
 
-    LogMessage ("Enter 'q' or 'Q' to quit ...");
-    while (OPENSSL_strcasecmp (TermBuff, "Q")) {
+    LogMessage("Enter 'q' or 'Q' to quit ...");
+    while (OPENSSL_strcasecmp(TermBuff, "Q")) {
         /*
         ** Create the terminal socket
         */
-        status = TerminalSocket (TERM_SOCK_CREATE, &TermSock);
+        status = TerminalSocket(TERM_SOCK_CREATE, &TermSock);
         if (status != TERM_SOCK_SUCCESS)
-            exit (1);
+            exit(1);
 
         /*
         ** Process the terminal input
         */
-        LogMessage ("Waiting on terminal I/O ...\n");
-        len = recv (TermSock, TermBuff, sizeof(TermBuff), 0) ;
+        LogMessage("Waiting on terminal I/O ...\n");
+        len = recv(TermSock, TermBuff, sizeof(TermBuff), 0);
         TermBuff[len] = '\0';
-        LogMessage ("Received terminal I/O [%s]", TermBuff);
+        LogMessage("Received terminal I/O [%s]", TermBuff);
 
         /*
         ** Delete the terminal socket
         */
-        status = TerminalSocket (TERM_SOCK_DELETE, &TermSock);
+        status = TerminalSocket(TERM_SOCK_DELETE, &TermSock);
         if (status != TERM_SOCK_SUCCESS)
-            exit (1);
+            exit(1);
     }
 
     return 1;
-
 }
-# endif
+#endif
 
 /*----------------------------------------------------------------------------*/
 /*                                                                            */
 /*----------------------------------------------------------------------------*/
-int TerminalSocket (int FunctionCode, int *ReturnSocket)
+int TerminalSocket(int FunctionCode, int *ReturnSocket)
 {
     int status;
-    $DESCRIPTOR (TerminalDeviceDesc, "SYS$COMMAND");
+    $DESCRIPTOR(TerminalDeviceDesc, "SYS$COMMAND");
 
     /*
     ** Process the requested function code
@@ -177,45 +191,45 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
         /*
         ** Create a socket pair
         */
-        status = CreateSocketPair (AF_INET, SOCK_STREAM, 0, TerminalSocketPair);
+        status = CreateSocketPair(AF_INET, SOCK_STREAM, 0, TerminalSocketPair);
         if (status == -1) {
-            LogMessage ("TerminalSocket: CreateSocketPair () - %08X", status);
+            LogMessage("TerminalSocket: CreateSocketPair () - %08X", status);
             if (TerminalSocketPair[0])
-                close (TerminalSocketPair[0]);
+                close(TerminalSocketPair[0]);
             if (TerminalSocketPair[1])
-                close (TerminalSocketPair[1]);
+                close(TerminalSocketPair[1]);
             return TERM_SOCK_FAILURE;
         }
 
         /*
         ** Assign a channel to the terminal device
         */
-        status = sys$assign (&TerminalDeviceDesc,
-                             &TerminalDeviceChan,
-                             0, 0, 0);
-        if (! (status & 1)) {
-            LogMessage ("TerminalSocket: SYS$ASSIGN () - %08X", status);
-            close (TerminalSocketPair[0]);
-            close (TerminalSocketPair[1]);
+        status = sys$assign(&TerminalDeviceDesc,
+            &TerminalDeviceChan,
+            0, 0, 0);
+        if (!(status & 1)) {
+            LogMessage("TerminalSocket: SYS$ASSIGN () - %08X", status);
+            close(TerminalSocketPair[0]);
+            close(TerminalSocketPair[1]);
             return TERM_SOCK_FAILURE;
         }
 
         /*
         ** Queue an async IO to the terminal device
         */
-        status = sys$qio (EFN$C_ENF,
-                          TerminalDeviceChan,
-                          IO$_READVBLK,
-                          &TerminalDeviceIosb,
-                          TerminalDeviceAst,
-                          0,
-                          TerminalDeviceBuff,
-                          sizeof(TerminalDeviceBuff) - 2,
-                          0, 0, 0, 0);
-        if (! (status & 1)) {
-            LogMessage ("TerminalSocket: SYS$QIO () - %08X", status);
-            close (TerminalSocketPair[0]);
-            close (TerminalSocketPair[1]);
+        status = sys$qio(EFN$C_ENF,
+            TerminalDeviceChan,
+            IO$_READVBLK,
+            &TerminalDeviceIosb,
+            TerminalDeviceAst,
+            0,
+            TerminalDeviceBuff,
+            sizeof(TerminalDeviceBuff) - 2,
+            0, 0, 0, 0);
+        if (!(status & 1)) {
+            LogMessage("TerminalSocket: SYS$QIO () - %08X", status);
+            close(TerminalSocketPair[0]);
+            close(TerminalSocketPair[1]);
             return TERM_SOCK_FAILURE;
         }
 
@@ -229,30 +243,30 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
         /*
         ** Cancel any pending IO on the terminal channel
         */
-        status = sys$cancel (TerminalDeviceChan);
-        if (! (status & 1)) {
-            LogMessage ("TerminalSocket: SYS$CANCEL () - %08X", status);
-            close (TerminalSocketPair[0]);
-            close (TerminalSocketPair[1]);
+        status = sys$cancel(TerminalDeviceChan);
+        if (!(status & 1)) {
+            LogMessage("TerminalSocket: SYS$CANCEL () - %08X", status);
+            close(TerminalSocketPair[0]);
+            close(TerminalSocketPair[1]);
             return TERM_SOCK_FAILURE;
         }
 
         /*
         ** Deassign the terminal channel
         */
-        status = sys$dassgn (TerminalDeviceChan);
-        if (! (status & 1)) {
-            LogMessage ("TerminalSocket: SYS$DASSGN () - %08X", status);
-            close (TerminalSocketPair[0]);
-            close (TerminalSocketPair[1]);
+        status = sys$dassgn(TerminalDeviceChan);
+        if (!(status & 1)) {
+            LogMessage("TerminalSocket: SYS$DASSGN () - %08X", status);
+            close(TerminalSocketPair[0]);
+            close(TerminalSocketPair[1]);
             return TERM_SOCK_FAILURE;
         }
 
         /*
         ** Close the terminal socket pair
         */
-        close (TerminalSocketPair[0]);
-        close (TerminalSocketPair[1]);
+        close(TerminalSocketPair[0]);
+        close(TerminalSocketPair[1]);
 
         /*
         ** Return the initialized socket
@@ -264,7 +278,7 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
         /*
         ** Invalid function code
         */
-        LogMessage ("TerminalSocket: Invalid Function Code - %d", FunctionCode);
+        LogMessage("TerminalSocket: Invalid Function Code - %d", FunctionCode);
         return TERM_SOCK_FAILURE;
         break;
     }
@@ -273,21 +287,20 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
     ** Return success
     */
     return TERM_SOCK_SUCCESS;
-
 }
 
 /*----------------------------------------------------------------------------*/
 /*                                                                            */
 /*----------------------------------------------------------------------------*/
-static int CreateSocketPair (int SocketFamily,
-                             int SocketType,
-                             int SocketProtocol,
-                             int *SocketPair)
+static int CreateSocketPair(int SocketFamily,
+    int SocketType,
+    int SocketProtocol,
+    int *SocketPair)
 {
-    struct dsc$descriptor AscTimeDesc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, NULL};
-    static const char* LocalHostAddr = {"127.0.0.1"};
+    struct dsc$descriptor AscTimeDesc = { 0, DSC$K_DTYPE_T, DSC$K_CLASS_S, NULL };
+    static const char *LocalHostAddr = { "127.0.0.1" };
     unsigned short TcpAcceptChan = 0,
-        TcpDeviceChan = 0;
+                   TcpDeviceChan = 0;
     unsigned long BinTimeBuff[2];
     struct sockaddr_in sin;
     char AscTimeBuff[32];
@@ -295,23 +308,23 @@ static int CreateSocketPair (int SocketFamily,
     int status;
     unsigned int slen;
 
-# ifdef __alpha
+#ifdef __alpha
     struct _iosb iosb;
-# else
+#else
     IOSB iosb;
-# endif
+#endif
 
     int SockDesc1 = 0,
         SockDesc2 = 0;
     SPTB sptb;
-    $DESCRIPTOR (TcpDeviceDesc, "TCPIP$DEVICE");
+    $DESCRIPTOR(TcpDeviceDesc, "TCPIP$DEVICE");
 
     /*
     ** Create a socket
     */
-    SockDesc1 = socket (SocketFamily, SocketType, 0);
+    SockDesc1 = socket(SocketFamily, SocketType, 0);
     if (SockDesc1 < 0) {
-        LogMessage ("CreateSocketPair: socket () - %d", errno);
+        LogMessage("CreateSocketPair: socket () - %d", errno);
         return -1;
     }
 
@@ -319,28 +332,28 @@ static int CreateSocketPair (int SocketFamily,
     ** Initialize the socket information
     */
     slen = sizeof(sin);
-    memset ((char *) &sin, 0, slen);
+    memset((char *)&sin, 0, slen);
     sin.sin_family = SocketFamily;
-    sin.sin_addr.s_addr = inet_addr (LocalHostAddr);
+    sin.sin_addr.s_addr = inet_addr(LocalHostAddr);
     sin.sin_port = 0;
 
     /*
     ** Bind the socket to the local IP
     */
-    status = bind (SockDesc1, (struct sockaddr *) &sin, slen);
+    status = bind(SockDesc1, (struct sockaddr *)&sin, slen);
     if (status < 0) {
-        LogMessage ("CreateSocketPair: bind () - %d", errno);
-        close (SockDesc1);
+        LogMessage("CreateSocketPair: bind () - %d", errno);
+        close(SockDesc1);
         return -1;
     }
 
     /*
     ** Get the socket name so we can save the port number
     */
-    status = getsockname (SockDesc1, (struct sockaddr *) &sin, &slen);
+    status = getsockname(SockDesc1, (struct sockaddr *)&sin, &slen);
     if (status < 0) {
-        LogMessage ("CreateSocketPair: getsockname () - %d", errno);
-        close (SockDesc1);
+        LogMessage("CreateSocketPair: getsockname () - %d", errno);
+        close(SockDesc1);
         return -1;
     } else
         LocalHostPort = sin.sin_port;
@@ -348,18 +361,18 @@ static int CreateSocketPair (int SocketFamily,
     /*
     ** Setup a listen for the socket
     */
-    listen (SockDesc1, 5);
+    listen(SockDesc1, 5);
 
     /*
     ** Get the binary (64-bit) time of the specified timeout value
     */
     BIO_snprintf(AscTimeBuff, sizeof(AscTimeBuff), "0 0:0:%02d.00", SOCKET_PAIR_TIMEOUT_VALUE);
-    AscTimeDesc.dsc$w_length = strlen (AscTimeBuff);
+    AscTimeDesc.dsc$w_length = strlen(AscTimeBuff);
     AscTimeDesc.dsc$a_pointer = AscTimeBuff;
-    status = sys$bintim (&AscTimeDesc, BinTimeBuff);
-    if (! (status & 1)) {
-        LogMessage ("CreateSocketPair: SYS$BINTIM () - %08X", status);
-        close (SockDesc1);
+    status = sys$bintim(&AscTimeDesc, BinTimeBuff);
+    if (!(status & 1)) {
+        LogMessage("CreateSocketPair: SYS$BINTIM () - %08X", status);
+        close(SockDesc1);
         return -1;
     }
 
@@ -367,87 +380,87 @@ static int CreateSocketPair (int SocketFamily,
     ** Assign another channel to the TCP/IP device for the accept.
     ** This is the channel that ends up being connected to.
     */
-    status = sys$assign (&TcpDeviceDesc, &TcpDeviceChan, 0, 0, 0);
-    if (! (status & 1)) {
-        LogMessage ("CreateSocketPair: SYS$ASSIGN () - %08X", status);
-        close (SockDesc1);
+    status = sys$assign(&TcpDeviceDesc, &TcpDeviceChan, 0, 0, 0);
+    if (!(status & 1)) {
+        LogMessage("CreateSocketPair: SYS$ASSIGN () - %08X", status);
+        close(SockDesc1);
         return -1;
     }
 
     /*
     ** Get the channel of the first socket for the accept
     */
-    TcpAcceptChan = decc$get_sdc (SockDesc1);
+    TcpAcceptChan = decc$get_sdc(SockDesc1);
 
     /*
     ** Perform the accept using $QIO so we can do this asynchronously
     */
-    status = sys$qio (EFN$C_ENF,
-                      TcpAcceptChan,
-                      IO$_ACCESS | IO$M_ACCEPT,
-                      &iosb,
-                      0, 0, 0, 0, 0,
-                      &TcpDeviceChan,
-                      0, 0);
-    if (! (status & 1)) {
-        LogMessage ("CreateSocketPair: SYS$QIO () - %08X", status);
-        close (SockDesc1);
-        sys$dassgn (TcpDeviceChan);
+    status = sys$qio(EFN$C_ENF,
+        TcpAcceptChan,
+        IO$_ACCESS | IO$M_ACCEPT,
+        &iosb,
+        0, 0, 0, 0, 0,
+        &TcpDeviceChan,
+        0, 0);
+    if (!(status & 1)) {
+        LogMessage("CreateSocketPair: SYS$QIO () - %08X", status);
+        close(SockDesc1);
+        sys$dassgn(TcpDeviceChan);
         return -1;
     }
 
     /*
     ** Create the second socket to do the connect
     */
-    SockDesc2 = socket (SocketFamily, SocketType, 0);
+    SockDesc2 = socket(SocketFamily, SocketType, 0);
     if (SockDesc2 < 0) {
-        LogMessage ("CreateSocketPair: socket () - %d", errno);
-        sys$cancel (TcpAcceptChan);
-        close (SockDesc1);
-        sys$dassgn (TcpDeviceChan);
-        return (-1) ;
+        LogMessage("CreateSocketPair: socket () - %d", errno);
+        sys$cancel(TcpAcceptChan);
+        close(SockDesc1);
+        sys$dassgn(TcpDeviceChan);
+        return (-1);
     }
 
     /*
     ** Setup the Socket Pair Timeout Block
     */
     sptb.SockChan1 = TcpAcceptChan;
-    sptb.SockChan2 = decc$get_sdc (SockDesc2);
+    sptb.SockChan2 = decc$get_sdc(SockDesc2);
 
     /*
     ** Before we block on the connect, set a timer that can cancel I/O on our
     ** two sockets if it never connects.
     */
-    status = sys$setimr (EFN$C_ENF,
-                         BinTimeBuff,
-                         SocketPairTimeoutAst,
-                         &sptb,
-                         0);
-    if (! (status & 1)) {
-        LogMessage ("CreateSocketPair: SYS$SETIMR () - %08X", status);
-        sys$cancel (TcpAcceptChan);
-        close (SockDesc1);
-        close (SockDesc2);
-        sys$dassgn (TcpDeviceChan);
+    status = sys$setimr(EFN$C_ENF,
+        BinTimeBuff,
+        SocketPairTimeoutAst,
+        &sptb,
+        0);
+    if (!(status & 1)) {
+        LogMessage("CreateSocketPair: SYS$SETIMR () - %08X", status);
+        sys$cancel(TcpAcceptChan);
+        close(SockDesc1);
+        close(SockDesc2);
+        sys$dassgn(TcpDeviceChan);
         return -1;
     }
 
     /*
     ** Now issue the connect
     */
-    memset ((char *) &sin, 0, sizeof(sin)) ;
+    memset((char *)&sin, 0, sizeof(sin));
     sin.sin_family = SocketFamily;
-    sin.sin_addr.s_addr = inet_addr (LocalHostAddr) ;
-    sin.sin_port = LocalHostPort ;
+    sin.sin_addr.s_addr = inet_addr(LocalHostAddr);
+    sin.sin_port = LocalHostPort;
 
-    status = connect (SockDesc2, (struct sockaddr *) &sin, sizeof(sin));
+    status = connect(SockDesc2, (struct sockaddr *)&sin, sizeof(sin));
     if (status < 0) {
-        LogMessage ("CreateSocketPair: connect () - %d", errno);
-        sys$cantim (&sptb, 0);
-        sys$cancel (TcpAcceptChan);
-        close (SockDesc1);
-        close (SockDesc2);
-        sys$dassgn (TcpDeviceChan);
+        LogMessage("CreateSocketPair: connect () - %d", errno);
+        sys$cantim(&sptb, 0);
+        sys$cancel(TcpAcceptChan);
+        close(SockDesc1);
+        close(SockDesc2);
+        sys$dassgn(TcpDeviceChan);
         return -1;
     }
 
@@ -456,18 +469,18 @@ static int CreateSocketPair (int SocketFamily,
     ** (SS$_ABORT), then we probably canceled it from the AST routine - so log
     ** a timeout.
     */
-    status = sys$synch (EFN$C_ENF, &iosb);
-    if (! (iosb.iosb$w_status & 1)) {
+    status = sys$synch(EFN$C_ENF, &iosb);
+    if (!(iosb.iosb$w_status & 1)) {
         if (iosb.iosb$w_status == SS$_ABORT)
-            LogMessage ("CreateSocketPair: SYS$QIO(iosb) timeout");
+            LogMessage("CreateSocketPair: SYS$QIO(iosb) timeout");
         else {
-            LogMessage ("CreateSocketPair: SYS$QIO(iosb) - %d",
-                        iosb.iosb$w_status);
-            sys$cantim (&sptb, 0);
+            LogMessage("CreateSocketPair: SYS$QIO(iosb) - %d",
+                iosb.iosb$w_status);
+            sys$cantim(&sptb, 0);
         }
-        close (SockDesc1);
-        close (SockDesc2);
-        sys$dassgn (TcpDeviceChan);
+        close(SockDesc1);
+        close(SockDesc2);
+        sys$dassgn(TcpDeviceChan);
         return -1;
     }
 
@@ -476,34 +489,32 @@ static int CreateSocketPair (int SocketFamily,
     ** I/O channel to a socket fd, close the listener socket and return the
     ** connected pair.
     */
-    sys$cantim (&sptb, 0);
-
-    close (SockDesc1) ;
-    SocketPair[0] = SockDesc2 ;
-    SocketPair[1] = socket_fd (TcpDeviceChan);
+    sys$cantim(&sptb, 0);
 
-    return (0) ;
+    close(SockDesc1);
+    SocketPair[0] = SockDesc2;
+    SocketPair[1] = socket_fd(TcpDeviceChan);
 
+    return (0);
 }
 
 /*----------------------------------------------------------------------------*/
 /*                                                                            */
 /*----------------------------------------------------------------------------*/
-static void SocketPairTimeoutAst (int astparm)
+static void SocketPairTimeoutAst(int astparm)
 {
-    SPTB *sptb = (SPTB *) astparm;
+    SPTB *sptb = (SPTB *)astparm;
 
-    sys$cancel (sptb->SockChan2); /* Cancel the connect() */
-    sys$cancel (sptb->SockChan1); /* Cancel the accept() */
+    sys$cancel(sptb->SockChan2); /* Cancel the connect() */
+    sys$cancel(sptb->SockChan1); /* Cancel the accept() */
 
     return;
-
 }
 
 /*----------------------------------------------------------------------------*/
 /*                                                                            */
 /*----------------------------------------------------------------------------*/
-static int TerminalDeviceAst (int astparm)
+static int TerminalDeviceAst(int astparm)
 {
     int status;
 
@@ -511,41 +522,40 @@ static int TerminalDeviceAst (int astparm)
     ** Terminate the terminal buffer
     */
     TerminalDeviceBuff[TerminalDeviceIosb.iosb$w_bcnt] = '\0';
-    strcat (TerminalDeviceBuff, "\n");
+    strcat(TerminalDeviceBuff, "\n");
 
     /*
     ** Send the data read from the terminal device through the socket pair
     */
-    send (TerminalSocketPair[0], TerminalDeviceBuff,
-          TerminalDeviceIosb.iosb$w_bcnt + 1, 0);
+    send(TerminalSocketPair[0], TerminalDeviceBuff,
+        TerminalDeviceIosb.iosb$w_bcnt + 1, 0);
 
     /*
     ** Queue another async IO to the terminal device
     */
-    status = sys$qio (EFN$C_ENF,
-                      TerminalDeviceChan,
-                      IO$_READVBLK,
-                      &TerminalDeviceIosb,
-                      TerminalDeviceAst,
-                      0,
-                      TerminalDeviceBuff,
-                      sizeof(TerminalDeviceBuff) - 1,
-                      0, 0, 0, 0);
+    status = sys$qio(EFN$C_ENF,
+        TerminalDeviceChan,
+        IO$_READVBLK,
+        &TerminalDeviceIosb,
+        TerminalDeviceAst,
+        0,
+        TerminalDeviceBuff,
+        sizeof(TerminalDeviceBuff) - 2,
+        0, 0, 0, 0);
 
     /*
     ** Return status
     */
     return status;
-
 }
 
 /*----------------------------------------------------------------------------*/
 /*                                                                            */
 /*----------------------------------------------------------------------------*/
-static void LogMessage (char *msg, ...)
+static void LogMessage(char *msg, ...)
 {
-    char *Month[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-                     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+    char *Month[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+        "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
     static unsigned int pid = 0;
     va_list args;
     time_t CurTime;
@@ -556,36 +566,35 @@ static void LogMessage (char *msg, ...)
     ** Get the process pid
     */
     if (pid == 0)
-        pid = getpid ();
+        pid = getpid();
 
     /*
     ** Convert the current time into local time
     */
-    CurTime = time (NULL);
-    LocTime = localtime (&CurTime);
+    CurTime = time(NULL);
+    LocTime = localtime(&CurTime);
 
     /*
     ** Format the message buffer
     */
     BIO_snprintf(MsgBuff, sizeof(MsgBuff), "%02d-%s-%04d %02d:%02d:%02d [%08X] %s\n",
-                 LocTime->tm_mday, Month[LocTime->tm_mon],
-                 (LocTime->tm_year + 1900), LocTime->tm_hour, LocTime->tm_min,
-                 LocTime->tm_sec, pid, msg);
+        LocTime->tm_mday, Month[LocTime->tm_mon],
+        (LocTime->tm_year + 1900), LocTime->tm_hour, LocTime->tm_min,
+        LocTime->tm_sec, pid, msg);
 
     /*
     ** Get any variable arguments and add them to the print of the message
     ** buffer
     */
-    va_start (args, msg);
-    vfprintf (stderr, MsgBuff, args);
-    va_end (args);
+    va_start(args, msg);
+    vfprintf(stderr, MsgBuff, args);
+    va_end(args);
 
     /*
     ** Flush standard error output
     */
-    fsync (fileno (stderr));
+    fsync(fileno(stderr));
 
     return;
-
 }
 #endif
diff --git a/apps/lib/win32_init.c b/apps/lib/win32_init.c
index 6d2be0c629421..93d158cfdabd6 100644
--- a/apps/lib/win32_init.c
+++ b/apps/lib/win32_init.c
@@ -10,7 +10,6 @@
 #include <windows.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
 
 #if defined(CP_UTF8)
 
@@ -81,18 +80,18 @@ static int process_glob(WCHAR *wstr, int wlen)
             break;
 
     if (i == wlen)
-        return 0;   /* definitely not a glob */
+        return 0; /* definitely not a glob */
 
     saved_char = wstr[wlen];
     wstr[wlen] = L'\0';
     h = FindFirstFileW(wstr, &data);
     wstr[wlen] = saved_char;
     if (h == INVALID_HANDLE_VALUE)
-        return 0;   /* not a valid glob, just pass... */
+        return 0; /* not a valid glob, just pass... */
 
     if (slash)
         udlen = WideCharToMultiByte(CP_UTF8, 0, wstr, slash,
-                                    NULL, 0, NULL, NULL);
+            NULL, 0, NULL, NULL);
     else
         udlen = 0;
 
@@ -104,8 +103,7 @@ static int process_glob(WCHAR *wstr, int wlen)
          * skip over . and ..
          */
         if (data.cFileName[0] == L'.') {
-            if ((data.cFileName[1] == L'\0') ||
-                (data.cFileName[1] == L'.' && data.cFileName[2] == L'\0'))
+            if ((data.cFileName[1] == L'\0') || (data.cFileName[1] == L'.' && data.cFileName[2] == L'\0'))
                 continue;
         }
 
@@ -117,7 +115,7 @@ static int process_glob(WCHAR *wstr, int wlen)
          * so that |uflen| covers even trailing '\0'.
          */
         uflen = WideCharToMultiByte(CP_UTF8, 0, data.cFileName, -1,
-                                    NULL, 0, NULL, NULL);
+            NULL, 0, NULL, NULL);
 
         arg = malloc(udlen + uflen);
         if (arg == NULL)
@@ -125,10 +123,10 @@ static int process_glob(WCHAR *wstr, int wlen)
 
         if (udlen)
             WideCharToMultiByte(CP_UTF8, 0, wstr, slash,
-                                arg, udlen, NULL, NULL);
+                arg, udlen, NULL, NULL);
 
         WideCharToMultiByte(CP_UTF8, 0, data.cFileName, -1,
-                            arg + udlen, uflen, NULL, NULL);
+            arg + udlen, uflen, NULL, NULL);
 
         newargv[newargc++] = arg;
     } while (FindNextFileW(h, &data));
@@ -154,7 +152,8 @@ void win32_utf8argv(int *argc, char **argv[])
         return;
 
     wcmdline = GetCommandLineW();
-    if (wcmdline == NULL) return;
+    if (wcmdline == NULL)
+        return;
 
     /*
      * make a copy of the command line, since we might have to modify it...
@@ -178,7 +177,7 @@ void win32_utf8argv(int *argc, char **argv[])
          */
         warg = wend = p;
         while (*p != L'\0'
-               && (in_quote || (*p != L' ' && *p != L'\t'))) {
+            && (in_quote || (*p != L' ' && *p != L'\t'))) {
             switch (*p) {
             case L'\\':
                 /*
@@ -259,7 +258,7 @@ void win32_utf8argv(int *argc, char **argv[])
             ulen = 0;
             if (wlen > 0) {
                 ulen = WideCharToMultiByte(CP_UTF8, 0, warg, wlen,
-                                           NULL, 0, NULL, NULL);
+                    NULL, 0, NULL, NULL);
                 if (ulen <= 0)
                     continue;
             }
@@ -272,7 +271,7 @@ void win32_utf8argv(int *argc, char **argv[])
 
             if (wlen > 0)
                 WideCharToMultiByte(CP_UTF8, 0, warg, wlen,
-                                    arg, ulen, NULL, NULL);
+                    arg, ulen, NULL, NULL);
             arg[ulen] = '\0';
 
             newargv[newargc++] = arg;
@@ -303,5 +302,7 @@ void win32_utf8argv(int *argc, char **argv[])
 }
 #else
 void win32_utf8argv(int *argc, char **argv[])
-{   return;   }
+{
+    return;
+}
 #endif
diff --git a/apps/list.c b/apps/list.c
index 6e8444fcf72b9..757400b362159 100644
--- a/apps/list.c
+++ b/apps/list.c
@@ -36,21 +36,21 @@ static int verbose = 0;
 static const char *select_name = NULL;
 
 /* Checks to see if algorithms are fetchable */
-#define IS_FETCHABLE(type, TYPE)                                \
-    static int is_ ## type ## _fetchable(const TYPE *alg)       \
-    {                                                           \
-        TYPE *impl;                                             \
-        const char *propq = app_get0_propq();                   \
-        OSSL_LIB_CTX *libctx = app_get0_libctx();               \
-        const char *name = TYPE ## _get0_name(alg);             \
-                                                                \
-        ERR_set_mark();                                         \
-        impl = TYPE ## _fetch(libctx, name, propq);             \
-        ERR_pop_to_mark();                                      \
-        if (impl == NULL)                                       \
-            return 0;                                           \
-        TYPE ## _free(impl);                                    \
-        return 1;                                               \
+#define IS_FETCHABLE(type, TYPE)                      \
+    static int is_##type##_fetchable(const TYPE *alg) \
+    {                                                 \
+        TYPE *impl;                                   \
+        const char *propq = app_get0_propq();         \
+        OSSL_LIB_CTX *libctx = app_get0_libctx();     \
+        const char *name = TYPE##_get0_name(alg);     \
+                                                      \
+        ERR_set_mark();                               \
+        impl = TYPE##_fetch(libctx, name, propq);     \
+        ERR_pop_to_mark();                            \
+        if (impl == NULL)                             \
+            return 0;                                 \
+        TYPE##_free(impl);                            \
+        return 1;                                     \
     }
 IS_FETCHABLE(cipher, EVP_CIPHER)
 IS_FETCHABLE(digest, EVP_MD)
@@ -73,7 +73,7 @@ static int include_legacy(void)
 }
 
 static void legacy_cipher_fn(const EVP_CIPHER *c,
-                             const char *from, const char *to, void *arg)
+    const char *from, const char *to, void *arg)
 {
     if (select_name != NULL
         && (c == NULL
@@ -92,11 +92,11 @@ static void legacy_cipher_fn(const EVP_CIPHER *c,
 #endif
 
 DEFINE_STACK_OF(EVP_CIPHER)
-static int cipher_cmp(const EVP_CIPHER * const *a,
-                      const EVP_CIPHER * const *b)
+static int cipher_cmp(const EVP_CIPHER *const *a,
+    const EVP_CIPHER *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(*b)));
 }
 
 static void collect_ciphers(EVP_CIPHER *cipher, void *stack)
@@ -104,8 +104,8 @@ static void collect_ciphers(EVP_CIPHER *cipher, void *stack)
     STACK_OF(EVP_CIPHER) *cipher_stack = stack;
 
     if (is_cipher_fetchable(cipher)
-            && EVP_CIPHER_up_ref(cipher)
-            && sk_EVP_CIPHER_push(cipher_stack, cipher) <= 0)
+        && EVP_CIPHER_up_ref(cipher)
+        && sk_EVP_CIPHER_push(cipher_stack, cipher) <= 0)
         EVP_CIPHER_free(cipher); /* up-ref successful but push to stack failed */
 }
 
@@ -141,7 +141,7 @@ static void list_ciphers(const char *prefix)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(c)));
+                OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(c)));
 
             if (verbose) {
                 const char *desc = EVP_CIPHER_get0_description(c);
@@ -149,11 +149,11 @@ static void list_ciphers(const char *prefix)
                 if (desc != NULL)
                     BIO_printf(bio_out, "    description: %s\n", desc);
                 print_param_types("retrievable algorithm parameters",
-                                  EVP_CIPHER_gettable_params(c), 4);
+                    EVP_CIPHER_gettable_params(c), 4);
                 print_param_types("retrievable operation parameters",
-                                  EVP_CIPHER_gettable_ctx_params(c), 4);
+                    EVP_CIPHER_gettable_ctx_params(c), 4);
                 print_param_types("settable operation parameters",
-                                  EVP_CIPHER_settable_ctx_params(c), 4);
+                    EVP_CIPHER_settable_ctx_params(c), 4);
             }
         }
         sk_OPENSSL_CSTRING_free(names);
@@ -163,7 +163,7 @@ static void list_ciphers(const char *prefix)
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 static void legacy_md_fn(const EVP_MD *m,
-                       const char *from, const char *to, void *arg)
+    const char *from, const char *to, void *arg)
 {
     if (m != NULL) {
         BIO_printf(arg, "  %s\n", EVP_MD_get0_name(m));
@@ -178,10 +178,10 @@ static void legacy_md_fn(const EVP_MD *m,
 #endif
 
 DEFINE_STACK_OF(EVP_MD)
-static int md_cmp(const EVP_MD * const *a, const EVP_MD * const *b)
+static int md_cmp(const EVP_MD *const *a, const EVP_MD *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(*b)));
 }
 
 static void collect_digests(EVP_MD *digest, void *stack)
@@ -189,8 +189,8 @@ static void collect_digests(EVP_MD *digest, void *stack)
     STACK_OF(EVP_MD) *digest_stack = stack;
 
     if (is_digest_fetchable(digest)
-            && EVP_MD_up_ref(digest)
-            && sk_EVP_MD_push(digest_stack, digest) <= 0)
+        && EVP_MD_up_ref(digest)
+        && sk_EVP_MD_push(digest_stack, digest) <= 0)
         EVP_MD_free(digest); /* up-ref successful but push to stack failed */
 }
 
@@ -226,7 +226,7 @@ static void list_digests(const char *prefix)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(m)));
+                OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(m)));
 
             if (verbose) {
                 const char *desc = EVP_MD_get0_description(m);
@@ -234,11 +234,11 @@ static void list_digests(const char *prefix)
                 if (desc != NULL)
                     BIO_printf(bio_out, "    description: %s\n", desc);
                 print_param_types("retrievable algorithm parameters",
-                                EVP_MD_gettable_params(m), 4);
+                    EVP_MD_gettable_params(m), 4);
                 print_param_types("retrievable operation parameters",
-                                EVP_MD_gettable_ctx_params(m), 4);
+                    EVP_MD_gettable_ctx_params(m), 4);
                 print_param_types("settable operation parameters",
-                                EVP_MD_settable_ctx_params(m), 4);
+                    EVP_MD_settable_ctx_params(m), 4);
             }
         }
         sk_OPENSSL_CSTRING_free(names);
@@ -247,10 +247,10 @@ static void list_digests(const char *prefix)
 }
 
 DEFINE_STACK_OF(EVP_MAC)
-static int mac_cmp(const EVP_MAC * const *a, const EVP_MAC * const *b)
+static int mac_cmp(const EVP_MAC *const *a, const EVP_MAC *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(*b)));
 }
 
 static void collect_macs(EVP_MAC *mac, void *stack)
@@ -258,7 +258,7 @@ static void collect_macs(EVP_MAC *mac, void *stack)
     STACK_OF(EVP_MAC) *mac_stack = stack;
 
     if (is_mac_fetchable(mac)
-            && sk_EVP_MAC_push(mac_stack, mac) > 0)
+        && sk_EVP_MAC_push(mac_stack, mac) > 0)
         EVP_MAC_up_ref(mac);
 }
 
@@ -287,7 +287,7 @@ static void list_macs(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(m)));
+                OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(m)));
 
             if (verbose) {
                 const char *desc = EVP_MAC_get0_description(m);
@@ -295,11 +295,11 @@ static void list_macs(void)
                 if (desc != NULL)
                     BIO_printf(bio_out, "    description: %s\n", desc);
                 print_param_types("retrievable algorithm parameters",
-                                EVP_MAC_gettable_params(m), 4);
+                    EVP_MAC_gettable_params(m), 4);
                 print_param_types("retrievable operation parameters",
-                                EVP_MAC_gettable_ctx_params(m), 4);
+                    EVP_MAC_gettable_ctx_params(m), 4);
                 print_param_types("settable operation parameters",
-                                EVP_MAC_settable_ctx_params(m), 4);
+                    EVP_MAC_settable_ctx_params(m), 4);
             }
         }
         sk_OPENSSL_CSTRING_free(names);
@@ -311,10 +311,10 @@ static void list_macs(void)
  * KDFs and PRFs
  */
 DEFINE_STACK_OF(EVP_KDF)
-static int kdf_cmp(const EVP_KDF * const *a, const EVP_KDF * const *b)
+static int kdf_cmp(const EVP_KDF *const *a, const EVP_KDF *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(*b)));
 }
 
 static void collect_kdfs(EVP_KDF *kdf, void *stack)
@@ -322,8 +322,8 @@ static void collect_kdfs(EVP_KDF *kdf, void *stack)
     STACK_OF(EVP_KDF) *kdf_stack = stack;
 
     if (is_kdf_fetchable(kdf)
-            && EVP_KDF_up_ref(kdf)
-            && sk_EVP_KDF_push(kdf_stack, kdf) <= 0)
+        && EVP_KDF_up_ref(kdf)
+        && sk_EVP_KDF_push(kdf_stack, kdf) <= 0)
         EVP_KDF_free(kdf); /* up-ref successful but push to stack failed */
 }
 
@@ -352,7 +352,7 @@ static void list_kdfs(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(k)));
+                OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(k)));
 
             if (verbose) {
                 const char *desc = EVP_KDF_get0_description(k);
@@ -360,11 +360,11 @@ static void list_kdfs(void)
                 if (desc != NULL)
                     BIO_printf(bio_out, "    description: %s\n", desc);
                 print_param_types("retrievable algorithm parameters",
-                                EVP_KDF_gettable_params(k), 4);
+                    EVP_KDF_gettable_params(k), 4);
                 print_param_types("retrievable operation parameters",
-                                EVP_KDF_gettable_ctx_params(k), 4);
+                    EVP_KDF_gettable_ctx_params(k), 4);
                 print_param_types("settable operation parameters",
-                                EVP_KDF_settable_ctx_params(k), 4);
+                    EVP_KDF_settable_ctx_params(k), 4);
             }
         }
         sk_OPENSSL_CSTRING_free(names);
@@ -377,13 +377,13 @@ static void list_kdfs(void)
  */
 DEFINE_STACK_OF(EVP_RAND)
 
-static int rand_cmp(const EVP_RAND * const *a, const EVP_RAND * const *b)
+static int rand_cmp(const EVP_RAND *const *a, const EVP_RAND *const *b)
 {
     int ret = OPENSSL_strcasecmp(EVP_RAND_get0_name(*a), EVP_RAND_get0_name(*b));
 
     if (ret == 0)
         ret = strcmp(OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(*a)),
-                     OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(*b)));
+            OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(*b)));
 
     return ret;
 }
@@ -393,8 +393,8 @@ static void collect_rands(EVP_RAND *rand, void *stack)
     STACK_OF(EVP_RAND) *rand_stack = stack;
 
     if (is_rand_fetchable(rand)
-            && EVP_RAND_up_ref(rand)
-            && sk_EVP_RAND_push(rand_stack, rand) <= 0)
+        && EVP_RAND_up_ref(rand)
+        && sk_EVP_RAND_push(rand_stack, rand) <= 0)
         EVP_RAND_free(rand); /* up-ref successful but push to stack failed */
 }
 
@@ -418,7 +418,7 @@ static void list_random_generators(void)
             continue;
         BIO_printf(bio_out, "  %s", EVP_RAND_get0_name(m));
         BIO_printf(bio_out, " @ %s\n",
-                   OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(m)));
+            OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(m)));
 
         if (verbose) {
             const char *desc = EVP_RAND_get0_description(m);
@@ -426,11 +426,11 @@ static void list_random_generators(void)
             if (desc != NULL)
                 BIO_printf(bio_out, "    description: %s\n", desc);
             print_param_types("retrievable algorithm parameters",
-                              EVP_RAND_gettable_params(m), 4);
+                EVP_RAND_gettable_params(m), 4);
             print_param_types("retrievable operation parameters",
-                              EVP_RAND_gettable_ctx_params(m), 4);
+                EVP_RAND_gettable_ctx_params(m), 4);
             print_param_types("settable operation parameters",
-                              EVP_RAND_settable_ctx_params(m), 4);
+                EVP_RAND_settable_ctx_params(m), 4);
         }
     }
     sk_EVP_RAND_pop_free(rands, EVP_RAND_free);
@@ -451,7 +451,7 @@ static void display_random(const char *name, EVP_RAND_CTX *drbg)
 
         BIO_printf(bio_out, "  %s", EVP_RAND_get0_name(rand));
         BIO_printf(bio_out, " @ %s\n",
-                   OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(rand)));
+            OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(rand)));
 
         switch (EVP_RAND_get_state(drbg)) {
         case EVP_RAND_STATE_UNINITIALISED:
@@ -477,13 +477,13 @@ static void display_random(const char *name, EVP_RAND_CTX *drbg)
                     continue;
                 /* Outside of verbose mode, we skip non-string values */
                 if (gettables->data_type != OSSL_PARAM_UTF8_STRING
-                        && gettables->data_type != OSSL_PARAM_UTF8_PTR
-                        && !verbose)
+                    && gettables->data_type != OSSL_PARAM_UTF8_PTR
+                    && !verbose)
                     continue;
                 params->key = gettables->key;
                 params->data_type = gettables->data_type;
                 if (gettables->data_type == OSSL_PARAM_UNSIGNED_INTEGER
-                        || gettables->data_type == OSSL_PARAM_INTEGER) {
+                    || gettables->data_type == OSSL_PARAM_INTEGER) {
                     params->data = &u;
                     params->data_size = sizeof(u);
                 } else {
@@ -508,11 +508,11 @@ static void list_random_instances(void)
  * Encoders
  */
 DEFINE_STACK_OF(OSSL_ENCODER)
-static int encoder_cmp(const OSSL_ENCODER * const *a,
-                       const OSSL_ENCODER * const *b)
+static int encoder_cmp(const OSSL_ENCODER *const *a,
+    const OSSL_ENCODER *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(*b)));
 }
 
 static void collect_encoders(OSSL_ENCODER *encoder, void *stack)
@@ -520,8 +520,8 @@ static void collect_encoders(OSSL_ENCODER *encoder, void *stack)
     STACK_OF(OSSL_ENCODER) *encoder_stack = stack;
 
     if (is_encoder_fetchable(encoder)
-            && OSSL_ENCODER_up_ref(encoder)
-            && sk_OSSL_ENCODER_push(encoder_stack, encoder) <= 0)
+        && OSSL_ENCODER_up_ref(encoder)
+        && sk_OSSL_ENCODER_push(encoder_stack, encoder) <= 0)
         OSSL_ENCODER_free(encoder); /* up-ref successful but push to stack failed */
 }
 
@@ -537,7 +537,7 @@ static void list_encoders(void)
     }
     BIO_printf(bio_out, "Provided ENCODERs:\n");
     OSSL_ENCODER_do_all_provided(app_get0_libctx(), collect_encoders,
-                                 encoders);
+        encoders);
     sk_OSSL_ENCODER_sort(encoders);
 
     for (i = 0; i < sk_OSSL_ENCODER_num(encoders); i++) {
@@ -553,8 +553,8 @@ static void list_encoders(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s (%s)\n",
-                    OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(k)),
-                    OSSL_ENCODER_get0_properties(k));
+                OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(k)),
+                OSSL_ENCODER_get0_properties(k));
 
             if (verbose) {
                 const char *desc = OSSL_ENCODER_get0_description(k);
@@ -562,7 +562,7 @@ static void list_encoders(void)
                 if (desc != NULL)
                     BIO_printf(bio_out, "    description: %s\n", desc);
                 print_param_types("settable operation parameters",
-                                OSSL_ENCODER_settable_ctx_params(k), 4);
+                    OSSL_ENCODER_settable_ctx_params(k), 4);
             }
         }
         sk_OPENSSL_CSTRING_free(names);
@@ -574,11 +574,11 @@ static void list_encoders(void)
  * Decoders
  */
 DEFINE_STACK_OF(OSSL_DECODER)
-static int decoder_cmp(const OSSL_DECODER * const *a,
-                       const OSSL_DECODER * const *b)
+static int decoder_cmp(const OSSL_DECODER *const *a,
+    const OSSL_DECODER *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(*b)));
 }
 
 static void collect_decoders(OSSL_DECODER *decoder, void *stack)
@@ -586,8 +586,8 @@ static void collect_decoders(OSSL_DECODER *decoder, void *stack)
     STACK_OF(OSSL_DECODER) *decoder_stack = stack;
 
     if (is_decoder_fetchable(decoder)
-            && OSSL_DECODER_up_ref(decoder)
-            && sk_OSSL_DECODER_push(decoder_stack, decoder) <= 0)
+        && OSSL_DECODER_up_ref(decoder)
+        && sk_OSSL_DECODER_push(decoder_stack, decoder) <= 0)
         OSSL_DECODER_free(decoder); /* up-ref successful but push to stack failed */
 }
 
@@ -603,7 +603,7 @@ static void list_decoders(void)
     }
     BIO_printf(bio_out, "Provided DECODERs:\n");
     OSSL_DECODER_do_all_provided(app_get0_libctx(), collect_decoders,
-                                 decoders);
+        decoders);
     sk_OSSL_DECODER_sort(decoders);
 
     for (i = 0; i < sk_OSSL_DECODER_num(decoders); i++) {
@@ -619,8 +619,8 @@ static void list_decoders(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s (%s)\n",
-                       OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(k)),
-                       OSSL_DECODER_get0_properties(k));
+                OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(k)),
+                OSSL_DECODER_get0_properties(k));
 
             if (verbose) {
                 const char *desc = OSSL_DECODER_get0_description(k);
@@ -628,7 +628,7 @@ static void list_decoders(void)
                 if (desc != NULL)
                     BIO_printf(bio_out, "    description: %s\n", desc);
                 print_param_types("settable operation parameters",
-                                OSSL_DECODER_settable_ctx_params(k), 4);
+                    OSSL_DECODER_settable_ctx_params(k), 4);
             }
         }
         sk_OPENSSL_CSTRING_free(names);
@@ -637,11 +637,11 @@ static void list_decoders(void)
 }
 
 DEFINE_STACK_OF(EVP_KEYMGMT)
-static int keymanager_cmp(const EVP_KEYMGMT * const *a,
-                          const EVP_KEYMGMT * const *b)
+static int keymanager_cmp(const EVP_KEYMGMT *const *a,
+    const EVP_KEYMGMT *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(*b)));
 }
 
 static void collect_keymanagers(EVP_KEYMGMT *km, void *stack)
@@ -649,8 +649,8 @@ static void collect_keymanagers(EVP_KEYMGMT *km, void *stack)
     STACK_OF(EVP_KEYMGMT) *km_stack = stack;
 
     if (is_keymgmt_fetchable(km)
-            && EVP_KEYMGMT_up_ref(km)
-            && sk_EVP_KEYMGMT_push(km_stack, km) <= 0)
+        && EVP_KEYMGMT_up_ref(km)
+        && sk_EVP_KEYMGMT_push(km_stack, km) <= 0)
         EVP_KEYMGMT_free(km); /* up-ref successful but push to stack failed */
 }
 
@@ -660,7 +660,7 @@ static void list_keymanagers(void)
     STACK_OF(EVP_KEYMGMT) *km_stack = sk_EVP_KEYMGMT_new(keymanager_cmp);
 
     EVP_KEYMGMT_do_all_provided(app_get0_libctx(), collect_keymanagers,
-                                km_stack);
+        km_stack);
     sk_EVP_KEYMGMT_sort(km_stack);
 
     for (i = 0; i < sk_EVP_KEYMGMT_num(km_stack); i++) {
@@ -684,15 +684,15 @@ static void list_keymanagers(void)
             BIO_printf(bio_out, "    IDs: ");
             print_names(bio_out, names);
             BIO_printf(bio_out, " @ %s\n",
-                    OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(k)));
+                OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(k)));
 
             if (verbose) {
                 print_param_types("settable key generation parameters",
-                                EVP_KEYMGMT_gen_settable_params(k), 4);
+                    EVP_KEYMGMT_gen_settable_params(k), 4);
                 print_param_types("settable operation parameters",
-                                EVP_KEYMGMT_settable_params(k), 4);
+                    EVP_KEYMGMT_settable_params(k), 4);
                 print_param_types("retrievable operation parameters",
-                                EVP_KEYMGMT_gettable_params(k), 4);
+                    EVP_KEYMGMT_gettable_params(k), 4);
             }
         }
         sk_OPENSSL_CSTRING_free(names);
@@ -701,11 +701,11 @@ static void list_keymanagers(void)
 }
 
 DEFINE_STACK_OF(EVP_SKEYMGMT)
-static int skeymanager_cmp(const EVP_SKEYMGMT * const *a,
-                           const EVP_SKEYMGMT * const *b)
+static int skeymanager_cmp(const EVP_SKEYMGMT *const *a,
+    const EVP_SKEYMGMT *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(EVP_SKEYMGMT_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(EVP_SKEYMGMT_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(EVP_SKEYMGMT_get0_provider(*b)));
 }
 
 static void collect_skeymanagers(EVP_SKEYMGMT *km, void *stack)
@@ -713,7 +713,7 @@ static void collect_skeymanagers(EVP_SKEYMGMT *km, void *stack)
     STACK_OF(EVP_SKEYMGMT) *km_stack = stack;
 
     if (is_skeymgmt_fetchable(km)
-            && sk_EVP_SKEYMGMT_push(km_stack, km) > 0)
+        && sk_EVP_SKEYMGMT_push(km_stack, km) > 0)
         EVP_SKEYMGMT_up_ref(km);
 }
 
@@ -723,7 +723,7 @@ static void list_skeymanagers(void)
     STACK_OF(EVP_SKEYMGMT) *km_stack = sk_EVP_SKEYMGMT_new(skeymanager_cmp);
 
     EVP_SKEYMGMT_do_all_provided(app_get0_libctx(), collect_skeymanagers,
-                                 km_stack);
+        km_stack);
     sk_EVP_SKEYMGMT_sort(km_stack);
 
     for (i = 0; i < sk_EVP_SKEYMGMT_num(km_stack); i++) {
@@ -747,8 +747,7 @@ static void list_skeymanagers(void)
             BIO_printf(bio_out, "    IDs: ");
             print_names(bio_out, names);
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_get0_name(EVP_SKEYMGMT_get0_provider(k)));
-
+                OSSL_PROVIDER_get0_name(EVP_SKEYMGMT_get0_provider(k)));
         }
         sk_OPENSSL_CSTRING_free(names);
     }
@@ -756,11 +755,11 @@ static void list_skeymanagers(void)
 }
 
 DEFINE_STACK_OF(EVP_SIGNATURE)
-static int signature_cmp(const EVP_SIGNATURE * const *a,
-                         const EVP_SIGNATURE * const *b)
+static int signature_cmp(const EVP_SIGNATURE *const *a,
+    const EVP_SIGNATURE *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*b)));
 }
 
 static void collect_signatures(EVP_SIGNATURE *sig, void *stack)
@@ -768,8 +767,8 @@ static void collect_signatures(EVP_SIGNATURE *sig, void *stack)
     STACK_OF(EVP_SIGNATURE) *sig_stack = stack;
 
     if (is_signature_fetchable(sig)
-            && EVP_SIGNATURE_up_ref(sig)
-            && sk_EVP_SIGNATURE_push(sig_stack, sig) <= 0)
+        && EVP_SIGNATURE_up_ref(sig)
+        && sk_EVP_SIGNATURE_push(sig_stack, sig) <= 0)
         EVP_SIGNATURE_free(sig); /* up-ref successful but push to stack failed */
 }
 
@@ -779,7 +778,7 @@ static void list_signatures(void)
     STACK_OF(EVP_SIGNATURE) *sig_stack = sk_EVP_SIGNATURE_new(signature_cmp);
 
     EVP_SIGNATURE_do_all_provided(app_get0_libctx(), collect_signatures,
-                                  sig_stack);
+        sig_stack);
     sk_EVP_SIGNATURE_sort(sig_stack);
 
     for (i = 0; i < sk_EVP_SIGNATURE_num(sig_stack); i++) {
@@ -796,7 +795,7 @@ static void list_signatures(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                    OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(k)));
+                OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(k)));
 
             if (verbose) {
                 const char *desc = EVP_SIGNATURE_get0_description(k);
@@ -804,9 +803,9 @@ static void list_signatures(void)
                 if (desc != NULL)
                     BIO_printf(bio_out, "    description: %s\n", desc);
                 print_param_types("settable operation parameters",
-                                EVP_SIGNATURE_settable_ctx_params(k), 4);
+                    EVP_SIGNATURE_settable_ctx_params(k), 4);
                 print_param_types("retrievable operation parameters",
-                                EVP_SIGNATURE_gettable_ctx_params(k), 4);
+                    EVP_SIGNATURE_gettable_ctx_params(k), 4);
             }
         }
         sk_OPENSSL_CSTRING_free(names);
@@ -836,8 +835,8 @@ static int list_provider_tls_sigalgs(const OSSL_PARAM params[], void *data)
 static int list_tls_sigalg_caps(OSSL_PROVIDER *provider, void *cbdata)
 {
     OSSL_PROVIDER_get_capabilities(provider, "TLS-SIGALG",
-                                   list_provider_tls_sigalgs,
-                                   cbdata);
+        list_provider_tls_sigalgs,
+        cbdata);
     /* As built-in providers don't have this capability, never error */
     return 1;
 }
@@ -869,9 +868,9 @@ static void list_tls_groups(int version, int all)
     num = sk_OPENSSL_CSTRING_num(groups);
     for (i = 0; i < num; ++i) {
         BIO_printf(bio_out, "%s%c", sk_OPENSSL_CSTRING_value(groups, i),
-                   (i < num - 1) ? ':' : '\n');
+            (i < num - 1) ? ':' : '\n');
     }
-  err:
+err:
     SSL_CTX_free(ctx);
     sk_OPENSSL_CSTRING_free(groups);
     return;
@@ -893,19 +892,19 @@ static void list_tls_signatures(void)
 
     if (!OSSL_PROVIDER_do_all(NULL, list_tls_sigalg_caps, &tls_sigalg_listed))
         BIO_printf(bio_err,
-                   "ERROR: could not list all provider signature algorithms\n");
+            "ERROR: could not list all provider signature algorithms\n");
     if (tls_sigalg_listed < 2)
         BIO_printf(bio_out,
-                   "\nNo TLS sig algs registered by currently active providers");
+            "\nNo TLS sig algs registered by currently active providers");
     BIO_printf(bio_out, "\n");
 }
 
 DEFINE_STACK_OF(EVP_KEM)
-static int kem_cmp(const EVP_KEM * const *a,
-                   const EVP_KEM * const *b)
+static int kem_cmp(const EVP_KEM *const *a,
+    const EVP_KEM *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*b)));
 }
 
 static void collect_kem(EVP_KEM *kem, void *stack)
@@ -913,8 +912,8 @@ static void collect_kem(EVP_KEM *kem, void *stack)
     STACK_OF(EVP_KEM) *kem_stack = stack;
 
     if (is_kem_fetchable(kem)
-            && EVP_KEM_up_ref(kem)
-            && sk_EVP_KEM_push(kem_stack, kem) <= 0)
+        && EVP_KEM_up_ref(kem)
+        && sk_EVP_KEM_push(kem_stack, kem) <= 0)
         EVP_KEM_free(kem); /* up-ref successful but push to stack failed */
 }
 
@@ -940,7 +939,7 @@ static void list_kems(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(k)));
+                OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(k)));
 
             if (verbose) {
                 const char *desc = EVP_KEM_get0_description(k);
@@ -948,9 +947,9 @@ static void list_kems(void)
                 if (desc != NULL)
                     BIO_printf(bio_out, "    description: %s\n", desc);
                 print_param_types("settable operation parameters",
-                                EVP_KEM_settable_ctx_params(k), 4);
+                    EVP_KEM_settable_ctx_params(k), 4);
                 print_param_types("retrievable operation parameters",
-                                EVP_KEM_gettable_ctx_params(k), 4);
+                    EVP_KEM_gettable_ctx_params(k), 4);
             }
         }
         sk_OPENSSL_CSTRING_free(names);
@@ -961,11 +960,11 @@ static void list_kems(void)
 }
 
 DEFINE_STACK_OF(EVP_ASYM_CIPHER)
-static int asymcipher_cmp(const EVP_ASYM_CIPHER * const *a,
-                          const EVP_ASYM_CIPHER * const *b)
+static int asymcipher_cmp(const EVP_ASYM_CIPHER *const *a,
+    const EVP_ASYM_CIPHER *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(*b)));
 }
 
 static void collect_asymciph(EVP_ASYM_CIPHER *asym_cipher, void *stack)
@@ -973,19 +972,18 @@ static void collect_asymciph(EVP_ASYM_CIPHER *asym_cipher, void *stack)
     STACK_OF(EVP_ASYM_CIPHER) *asym_cipher_stack = stack;
 
     if (is_asym_cipher_fetchable(asym_cipher)
-            && EVP_ASYM_CIPHER_up_ref(asym_cipher)
-            && sk_EVP_ASYM_CIPHER_push(asym_cipher_stack, asym_cipher) <= 0)
+        && EVP_ASYM_CIPHER_up_ref(asym_cipher)
+        && sk_EVP_ASYM_CIPHER_push(asym_cipher_stack, asym_cipher) <= 0)
         EVP_ASYM_CIPHER_free(asym_cipher); /* up-ref successful but push to stack failed */
 }
 
 static void list_asymciphers(void)
 {
     int i, count = 0;
-    STACK_OF(EVP_ASYM_CIPHER) *asymciph_stack =
-        sk_EVP_ASYM_CIPHER_new(asymcipher_cmp);
+    STACK_OF(EVP_ASYM_CIPHER) *asymciph_stack = sk_EVP_ASYM_CIPHER_new(asymcipher_cmp);
 
     EVP_ASYM_CIPHER_do_all_provided(app_get0_libctx(), collect_asymciph,
-                                    asymciph_stack);
+        asymciph_stack);
     sk_EVP_ASYM_CIPHER_sort(asymciph_stack);
 
     for (i = 0; i < sk_EVP_ASYM_CIPHER_num(asymciph_stack); i++) {
@@ -997,13 +995,13 @@ static void list_asymciphers(void)
 
         names = sk_OPENSSL_CSTRING_new(name_cmp);
         if (names != NULL
-                && EVP_ASYM_CIPHER_names_do_all(k, collect_names, names)) {
+            && EVP_ASYM_CIPHER_names_do_all(k, collect_names, names)) {
             count++;
             BIO_printf(bio_out, "  ");
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                    OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(k)));
+                OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(k)));
 
             if (verbose) {
                 const char *desc = EVP_ASYM_CIPHER_get0_description(k);
@@ -1011,9 +1009,9 @@ static void list_asymciphers(void)
                 if (desc != NULL)
                     BIO_printf(bio_out, "    description: %s\n", desc);
                 print_param_types("settable operation parameters",
-                                EVP_ASYM_CIPHER_settable_ctx_params(k), 4);
+                    EVP_ASYM_CIPHER_settable_ctx_params(k), 4);
                 print_param_types("retrievable operation parameters",
-                                EVP_ASYM_CIPHER_gettable_ctx_params(k), 4);
+                    EVP_ASYM_CIPHER_gettable_ctx_params(k), 4);
             }
         }
         sk_OPENSSL_CSTRING_free(names);
@@ -1024,11 +1022,11 @@ static void list_asymciphers(void)
 }
 
 DEFINE_STACK_OF(EVP_KEYEXCH)
-static int kex_cmp(const EVP_KEYEXCH * const *a,
-                   const EVP_KEYEXCH * const *b)
+static int kex_cmp(const EVP_KEYEXCH *const *a,
+    const EVP_KEYEXCH *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(*b)));
 }
 
 static void collect_kex(EVP_KEYEXCH *kex, void *stack)
@@ -1036,8 +1034,8 @@ static void collect_kex(EVP_KEYEXCH *kex, void *stack)
     STACK_OF(EVP_KEYEXCH) *kex_stack = stack;
 
     if (is_keyexch_fetchable(kex)
-            && EVP_KEYEXCH_up_ref(kex)
-            && sk_EVP_KEYEXCH_push(kex_stack, kex) <= 0)
+        && EVP_KEYEXCH_up_ref(kex)
+        && sk_EVP_KEYEXCH_push(kex_stack, kex) <= 0)
         EVP_KEYEXCH_free(kex); /* up-ref successful but push to stack failed */
 }
 
@@ -1063,7 +1061,7 @@ static void list_keyexchanges(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                    OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(k)));
+                OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(k)));
 
             if (verbose) {
                 const char *desc = EVP_KEYEXCH_get0_description(k);
@@ -1071,9 +1069,9 @@ static void list_keyexchanges(void)
                 if (desc != NULL)
                     BIO_printf(bio_out, "    description: %s\n", desc);
                 print_param_types("settable operation parameters",
-                                EVP_KEYEXCH_settable_ctx_params(k), 4);
+                    EVP_KEYEXCH_settable_ctx_params(k), 4);
                 print_param_types("retrievable operation parameters",
-                                EVP_KEYEXCH_gettable_ctx_params(k), 4);
+                    EVP_KEYEXCH_gettable_ctx_params(k), 4);
             }
         }
         sk_OPENSSL_CSTRING_free(names);
@@ -1112,18 +1110,18 @@ static void list_objects(void)
             continue;
         }
         if (n < 0)
-            break;               /* Error */
+            break; /* Error */
 
         if (n > oid_size) {
             oid_buf = OPENSSL_realloc(oid_buf, n + 1);
             if (oid_buf == NULL) {
                 BIO_printf(bio_err, "ERROR: Memory allocation\n");
-                break;           /* Error */
+                break; /* Error */
             }
             oid_size = n + 1;
         }
         if (OBJ_obj2txt(oid_buf, oid_size, obj, 1) < 0)
-            break;               /* Error */
+            break; /* Error */
         if (ln == NULL || strcmp(sn, ln) == 0)
             BIO_printf(bio_out, "%s = %s\n", sn, oid_buf);
         else
@@ -1143,23 +1141,23 @@ static void list_options_for_command(const char *command)
             break;
     if (fp->name == NULL) {
         BIO_printf(bio_err, "Invalid command '%s'; type \"help\" for a list.\n",
-                   command);
+            command);
         return;
     }
 
     if ((o = fp->help) == NULL)
         return;
 
-    for ( ; o->name != NULL; o++) {
+    for (; o->name != NULL; o++) {
         char c = o->valtype;
 
         if (o->name == OPT_PARAM_STR)
             break;
 
         if (o->name == OPT_HELP_STR
-                || o->name == OPT_MORE_STR
-                || o->name == OPT_SECTION_STR
-                || o->name[0] == '\0')
+            || o->name == OPT_MORE_STR
+            || o->name == OPT_SECTION_STR
+            || o->name[0] == '\0')
             continue;
         BIO_printf(bio_out, "%s %c\n", o->name, c == '\0' ? '-' : c);
     }
@@ -1252,16 +1250,15 @@ static void list_pkey(void)
             const char *pinfo, *pem_str;
             ameth = EVP_PKEY_asn1_get0(i);
             EVP_PKEY_asn1_get0_info(&pkey_id, &pkey_base_id, &pkey_flags,
-                                    &pinfo, &pem_str, ameth);
+                &pinfo, &pem_str, ameth);
             if (pkey_flags & ASN1_PKEY_ALIAS) {
                 BIO_printf(bio_out, " Name: %s\n", OBJ_nid2ln(pkey_id));
                 BIO_printf(bio_out, "\tAlias for: %s\n",
-                           OBJ_nid2ln(pkey_base_id));
+                    OBJ_nid2ln(pkey_base_id));
             } else {
                 BIO_printf(bio_out, " Name: %s\n", pinfo);
                 BIO_printf(bio_out, "\tType: %s Algorithm\n",
-                           pkey_flags & ASN1_PKEY_DYNAMIC ?
-                           "External" : "Builtin");
+                    pkey_flags & ASN1_PKEY_DYNAMIC ? "External" : "Builtin");
                 BIO_printf(bio_out, "\tOID: %s\n", OBJ_nid2ln(pkey_id));
                 if (pem_str == NULL)
                     pem_str = "(none)";
@@ -1290,7 +1287,7 @@ static void list_pkey_meth(void)
             EVP_PKEY_meth_get0_info(&pkey_id, &pkey_flags, pmeth);
             BIO_printf(bio_out, " %s\n", OBJ_nid2ln(pkey_id));
             BIO_printf(bio_out, "\tType: %s Algorithm\n",
-                       pkey_flags & ASN1_PKEY_DYNAMIC ?  "External" : "Builtin");
+                pkey_flags & ASN1_PKEY_DYNAMIC ? "External" : "Builtin");
         }
     }
 #endif
@@ -1306,11 +1303,11 @@ static void list_pkey_meth(void)
 }
 
 DEFINE_STACK_OF(OSSL_STORE_LOADER)
-static int store_cmp(const OSSL_STORE_LOADER * const *a,
-                     const OSSL_STORE_LOADER * const *b)
+static int store_cmp(const OSSL_STORE_LOADER *const *a,
+    const OSSL_STORE_LOADER *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(*b)));
 }
 
 static void collect_store_loaders(OSSL_STORE_LOADER *store, void *stack)
@@ -1318,7 +1315,7 @@ static void collect_store_loaders(OSSL_STORE_LOADER *store, void *stack)
     STACK_OF(OSSL_STORE_LOADER) *store_stack = stack;
 
     if (OSSL_STORE_LOADER_up_ref(store)
-            && sk_OSSL_STORE_LOADER_push(store_stack, store) <= 0)
+        && sk_OSSL_STORE_LOADER_push(store_stack, store) <= 0)
         OSSL_STORE_LOADER_free(store); /* up-ref successful but push to stack failed */
 }
 
@@ -1333,7 +1330,7 @@ static void list_store_loaders(void)
     }
     BIO_printf(bio_out, "Provided STORE LOADERs:\n");
     OSSL_STORE_LOADER_do_all_provided(app_get0_libctx(), collect_store_loaders,
-                                      stores);
+        stores);
     sk_OSSL_STORE_LOADER_sort(stores);
     for (i = 0; i < sk_OSSL_STORE_LOADER_num(stores); i++) {
         const OSSL_STORE_LOADER *m = sk_OSSL_STORE_LOADER_value(stores, i);
@@ -1343,13 +1340,12 @@ static void list_store_loaders(void)
             continue;
 
         names = sk_OPENSSL_CSTRING_new(name_cmp);
-        if (names != NULL && OSSL_STORE_LOADER_names_do_all(m, collect_names,
-                                                            names)) {
+        if (names != NULL && OSSL_STORE_LOADER_names_do_all(m, collect_names, names)) {
             BIO_printf(bio_out, "  ");
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(m)));
+                OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(m)));
         }
         sk_OPENSSL_CSTRING_free(names);
     }
@@ -1357,8 +1353,8 @@ static void list_store_loaders(void)
 }
 
 DEFINE_STACK_OF(OSSL_PROVIDER)
-static int provider_cmp(const OSSL_PROVIDER * const *a,
-                        const OSSL_PROVIDER * const *b)
+static int provider_cmp(const OSSL_PROVIDER *const *a,
+    const OSSL_PROVIDER *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(*a), OSSL_PROVIDER_get0_name(*b));
 }
@@ -1403,18 +1399,18 @@ static void list_provider_info(void)
 
         /* Query the "known" information parameters, the order matches below */
         params[0] = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_NAME,
-                                                  &name, 0);
+            &name, 0);
         params[1] = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_VERSION,
-                                                  &version, 0);
+            &version, 0);
         params[2] = OSSL_PARAM_construct_int(OSSL_PROV_PARAM_STATUS, &status);
         params[3] = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_BUILDINFO,
-                                                  &buildinfo, 0);
+            &buildinfo, 0);
         params[4] = OSSL_PARAM_construct_end();
         OSSL_PARAM_set_all_unmodified(params);
         if (!OSSL_PROVIDER_get_params(prov, params)) {
             BIO_printf(bio_err,
-                       "WARNING: Unable to query provider parameters for %s\n",
-                       provname);
+                "WARNING: Unable to query provider parameters for %s\n",
+                provname);
         } else {
             /* Print out the provider information, the params order matches above */
             if (OSSL_PARAM_modified(params))
@@ -1427,7 +1423,7 @@ static void list_provider_info(void)
                 if (OSSL_PARAM_modified(params + 3))
                     BIO_printf(bio_out, "    build info: %s\n", buildinfo);
                 print_param_types("gettable provider parameters",
-                                  OSSL_PROVIDER_gettable_params(prov), 4);
+                    OSSL_PROVIDER_gettable_params(prov), 4);
             }
         }
     }
@@ -1437,7 +1433,7 @@ static void list_provider_info(void)
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 static void list_engines(void)
 {
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
     ENGINE *e;
 
     BIO_puts(bio_out, "Engines:\n");
@@ -1446,9 +1442,9 @@ static void list_engines(void)
         BIO_printf(bio_out, "%s\n", ENGINE_get_id(e));
         e = ENGINE_get_next(e);
     }
-# else
+#else
     BIO_puts(bio_out, "Engine support is disabled.\n");
-# endif
+#endif
 }
 #endif
 
@@ -1610,26 +1606,44 @@ static void list_disabled(void)
 /* Unified enum for help and list commands. */
 typedef enum HELPLIST_CHOICE {
     OPT_COMMON,
-    OPT_ONE, OPT_VERBOSE,
+    OPT_ONE,
+    OPT_VERBOSE,
     OPT_ALL_ARGORITHMS,
-    OPT_COMMANDS, OPT_DIGEST_COMMANDS, OPT_MAC_ALGORITHMS, OPT_OPTIONS,
-    OPT_DIGEST_ALGORITHMS, OPT_CIPHER_COMMANDS, OPT_CIPHER_ALGORITHMS,
-    OPT_PK_ALGORITHMS, OPT_PK_METHOD, OPT_DISABLED,
-    OPT_KDF_ALGORITHMS, OPT_RANDOM_INSTANCES, OPT_RANDOM_GENERATORS,
-    OPT_ENCODERS, OPT_DECODERS, OPT_KEYMANAGERS, OPT_KEYEXCHANGE_ALGORITHMS,
+    OPT_COMMANDS,
+    OPT_DIGEST_COMMANDS,
+    OPT_MAC_ALGORITHMS,
+    OPT_OPTIONS,
+    OPT_DIGEST_ALGORITHMS,
+    OPT_CIPHER_COMMANDS,
+    OPT_CIPHER_ALGORITHMS,
+    OPT_PK_ALGORITHMS,
+    OPT_PK_METHOD,
+    OPT_DISABLED,
+    OPT_KDF_ALGORITHMS,
+    OPT_RANDOM_INSTANCES,
+    OPT_RANDOM_GENERATORS,
+    OPT_ENCODERS,
+    OPT_DECODERS,
+    OPT_KEYMANAGERS,
+    OPT_KEYEXCHANGE_ALGORITHMS,
     OPT_SKEYMANAGERS,
-    OPT_KEM_ALGORITHMS, OPT_SIGNATURE_ALGORITHMS,
-    OPT_TLS_SIGNATURE_ALGORITHMS, OPT_ASYM_CIPHER_ALGORITHMS,
-    OPT_STORE_LOADERS, OPT_PROVIDER_INFO, OPT_OBJECTS,
+    OPT_KEM_ALGORITHMS,
+    OPT_SIGNATURE_ALGORITHMS,
+    OPT_TLS_SIGNATURE_ALGORITHMS,
+    OPT_ASYM_CIPHER_ALGORITHMS,
+    OPT_STORE_LOADERS,
+    OPT_PROVIDER_INFO,
+    OPT_OBJECTS,
     OPT_SELECT_NAME,
 #if !defined(OPENSSL_NO_TLS1_3) || !defined(OPENSSL_NO_TLS1_2)
-    OPT_ALL_TLS_GROUPS, OPT_TLS_GROUPS,
-# if !defined(OPENSSL_NO_TLS1_2)
+    OPT_ALL_TLS_GROUPS,
+    OPT_TLS_GROUPS,
+#if !defined(OPENSSL_NO_TLS1_2)
     OPT_TLS1_2,
-# endif
-# if !defined(OPENSSL_NO_TLS1_3)
+#endif
+#if !defined(OPENSSL_NO_TLS1_3)
     OPT_TLS1_3,
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_DEPRECATED_3_0
     OPT_ENGINES,
@@ -1640,83 +1654,83 @@ typedef enum HELPLIST_CHOICE {
 const OPTIONS list_options[] = {
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 
     OPT_SECTION("Output"),
-    {"1", OPT_ONE, '-', "List in one column"},
-    {"verbose", OPT_VERBOSE, '-', "Verbose listing"},
-    {"select", OPT_SELECT_NAME, 's', "Select a single algorithm"},
-    {"commands", OPT_COMMANDS, '-', "List of standard commands"},
-    {"standard-commands", OPT_COMMANDS, '-', "List of standard commands"},
-    {"all-algorithms", OPT_ALL_ARGORITHMS, '-', "List of all algorithms"},
+    { "1", OPT_ONE, '-', "List in one column" },
+    { "verbose", OPT_VERBOSE, '-', "Verbose listing" },
+    { "select", OPT_SELECT_NAME, 's', "Select a single algorithm" },
+    { "commands", OPT_COMMANDS, '-', "List of standard commands" },
+    { "standard-commands", OPT_COMMANDS, '-', "List of standard commands" },
+    { "all-algorithms", OPT_ALL_ARGORITHMS, '-', "List of all algorithms" },
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-    {"digest-commands", OPT_DIGEST_COMMANDS, '-',
-     "List of message digest commands (deprecated)"},
-#endif
-    {"digest-algorithms", OPT_DIGEST_ALGORITHMS, '-',
-     "List of message digest algorithms"},
-    {"kdf-algorithms", OPT_KDF_ALGORITHMS, '-',
-     "List of key derivation and pseudo random function algorithms"},
-    {"random-instances", OPT_RANDOM_INSTANCES, '-',
-     "List the primary, public and private random number generator details"},
-    {"random-generators", OPT_RANDOM_GENERATORS, '-',
-     "List of random number generators"},
-    {"mac-algorithms", OPT_MAC_ALGORITHMS, '-',
-     "List of message authentication code algorithms"},
+    { "digest-commands", OPT_DIGEST_COMMANDS, '-',
+        "List of message digest commands (deprecated)" },
+#endif
+    { "digest-algorithms", OPT_DIGEST_ALGORITHMS, '-',
+        "List of message digest algorithms" },
+    { "kdf-algorithms", OPT_KDF_ALGORITHMS, '-',
+        "List of key derivation and pseudo random function algorithms" },
+    { "random-instances", OPT_RANDOM_INSTANCES, '-',
+        "List the primary, public and private random number generator details" },
+    { "random-generators", OPT_RANDOM_GENERATORS, '-',
+        "List of random number generators" },
+    { "mac-algorithms", OPT_MAC_ALGORITHMS, '-',
+        "List of message authentication code algorithms" },
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-    {"cipher-commands", OPT_CIPHER_COMMANDS, '-',
-     "List of cipher commands (deprecated)"},
-#endif
-    {"cipher-algorithms", OPT_CIPHER_ALGORITHMS, '-',
-     "List of symmetric cipher algorithms"},
-    {"encoders", OPT_ENCODERS, '-', "List of encoding methods" },
-    {"decoders", OPT_DECODERS, '-', "List of decoding methods" },
-    {"key-managers", OPT_KEYMANAGERS, '-', "List of key managers" },
-    {"skey-managers", OPT_SKEYMANAGERS, '-', "List of symmetric key managers" },
-    {"key-exchange-algorithms", OPT_KEYEXCHANGE_ALGORITHMS, '-',
-     "List of key exchange algorithms" },
-    {"kem-algorithms", OPT_KEM_ALGORITHMS, '-',
-     "List of key encapsulation mechanism algorithms" },
-    {"signature-algorithms", OPT_SIGNATURE_ALGORITHMS, '-',
-     "List of signature algorithms" },
-    {"tls-signature-algorithms", OPT_TLS_SIGNATURE_ALGORITHMS, '-',
-     "List of TLS signature algorithms" },
-    {"asymcipher-algorithms", OPT_ASYM_CIPHER_ALGORITHMS, '-',
-      "List of asymmetric cipher algorithms" },
-    {"public-key-algorithms", OPT_PK_ALGORITHMS, '-',
-     "List of public key algorithms"},
-    {"public-key-methods", OPT_PK_METHOD, '-',
-     "List of public key methods"},
-    {"store-loaders", OPT_STORE_LOADERS, '-',
-     "List of store loaders"},
+    { "cipher-commands", OPT_CIPHER_COMMANDS, '-',
+        "List of cipher commands (deprecated)" },
+#endif
+    { "cipher-algorithms", OPT_CIPHER_ALGORITHMS, '-',
+        "List of symmetric cipher algorithms" },
+    { "encoders", OPT_ENCODERS, '-', "List of encoding methods" },
+    { "decoders", OPT_DECODERS, '-', "List of decoding methods" },
+    { "key-managers", OPT_KEYMANAGERS, '-', "List of key managers" },
+    { "skey-managers", OPT_SKEYMANAGERS, '-', "List of symmetric key managers" },
+    { "key-exchange-algorithms", OPT_KEYEXCHANGE_ALGORITHMS, '-',
+        "List of key exchange algorithms" },
+    { "kem-algorithms", OPT_KEM_ALGORITHMS, '-',
+        "List of key encapsulation mechanism algorithms" },
+    { "signature-algorithms", OPT_SIGNATURE_ALGORITHMS, '-',
+        "List of signature algorithms" },
+    { "tls-signature-algorithms", OPT_TLS_SIGNATURE_ALGORITHMS, '-',
+        "List of TLS signature algorithms" },
+    { "asymcipher-algorithms", OPT_ASYM_CIPHER_ALGORITHMS, '-',
+        "List of asymmetric cipher algorithms" },
+    { "public-key-algorithms", OPT_PK_ALGORITHMS, '-',
+        "List of public key algorithms" },
+    { "public-key-methods", OPT_PK_METHOD, '-',
+        "List of public key methods" },
+    { "store-loaders", OPT_STORE_LOADERS, '-',
+        "List of store loaders" },
 #if !defined(OPENSSL_NO_TLS1_2) || !defined(OPENSSL_NO_TLS1_3)
-    {"tls-groups", OPT_TLS_GROUPS, '-',
-     "List implemented TLS key exchange 'groups'" },
-    {"all-tls-groups", OPT_ALL_TLS_GROUPS, '-',
-     "List implemented TLS key exchange 'groups' and all aliases" },
-# ifndef OPENSSL_NO_TLS1_2
-    {"tls1_2", OPT_TLS1_2, '-',
-     "When listing 'groups', list those compatible with TLS1.2"},
-# endif
-# ifndef OPENSSL_NO_TLS1_3
-    {"tls1_3", OPT_TLS1_3, '-',
-     "When listing 'groups', list those compatible with TLS1.3"},
-# endif
-#endif
-    {"providers", OPT_PROVIDER_INFO, '-',
-     "List of provider information"},
+    { "tls-groups", OPT_TLS_GROUPS, '-',
+        "List implemented TLS key exchange 'groups'" },
+    { "all-tls-groups", OPT_ALL_TLS_GROUPS, '-',
+        "List implemented TLS key exchange 'groups' and all aliases" },
+#ifndef OPENSSL_NO_TLS1_2
+    { "tls1_2", OPT_TLS1_2, '-',
+        "When listing 'groups', list those compatible with TLS1.2" },
+#endif
+#ifndef OPENSSL_NO_TLS1_3
+    { "tls1_3", OPT_TLS1_3, '-',
+        "When listing 'groups', list those compatible with TLS1.3" },
+#endif
+#endif
+    { "providers", OPT_PROVIDER_INFO, '-',
+        "List of provider information" },
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-    {"engines", OPT_ENGINES, '-',
-     "List of loaded engines"},
+    { "engines", OPT_ENGINES, '-',
+        "List of loaded engines" },
 #endif
-    {"disabled", OPT_DISABLED, '-', "List of disabled features"},
-    {"options", OPT_OPTIONS, 's',
-     "List options for specified command"},
-    {"objects", OPT_OBJECTS, '-',
-     "List built in objects (OID<->name mappings)"},
+    { "disabled", OPT_DISABLED, '-', "List of disabled features" },
+    { "options", OPT_OPTIONS, 's',
+        "List options for specified command" },
+    { "objects", OPT_OBJECTS, '-',
+        "List built in objects (OID<->name mappings)" },
 
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int list_main(int argc, char **argv)
@@ -1727,53 +1741,55 @@ int list_main(int argc, char **argv)
     int print_newline = 0;
 #if !defined(OPENSSL_NO_TLS1_3) || !defined(OPENSSL_NO_TLS1_2)
     int all_tls_groups = 0;
-# if !defined(OPENSSL_NO_TLS1_3)
+#if !defined(OPENSSL_NO_TLS1_3)
     unsigned int tls_version = TLS1_3_VERSION;
-# else
+#else
     unsigned int tls_version = TLS1_2_VERSION;
-# endif
+#endif
 #endif
     struct {
-        unsigned int commands:1;
-        unsigned int all_algorithms:1;
-        unsigned int random_instances:1;
-        unsigned int random_generators:1;
-        unsigned int digest_commands:1;
-        unsigned int digest_algorithms:1;
-        unsigned int kdf_algorithms:1;
-        unsigned int mac_algorithms:1;
-        unsigned int cipher_commands:1;
-        unsigned int cipher_algorithms:1;
-        unsigned int encoder_algorithms:1;
-        unsigned int decoder_algorithms:1;
-        unsigned int keymanager_algorithms:1;
-        unsigned int skeymanager_algorithms:1;
-        unsigned int signature_algorithms:1;
-        unsigned int tls_signature_algorithms:1;
-        unsigned int keyexchange_algorithms:1;
-        unsigned int kem_algorithms:1;
-        unsigned int tls_groups:1;
-        unsigned int asym_cipher_algorithms:1;
-        unsigned int pk_algorithms:1;
-        unsigned int pk_method:1;
-        unsigned int store_loaders:1;
-        unsigned int provider_info:1;
+        unsigned int commands : 1;
+        unsigned int all_algorithms : 1;
+        unsigned int random_instances : 1;
+        unsigned int random_generators : 1;
+        unsigned int digest_commands : 1;
+        unsigned int digest_algorithms : 1;
+        unsigned int kdf_algorithms : 1;
+        unsigned int mac_algorithms : 1;
+        unsigned int cipher_commands : 1;
+        unsigned int cipher_algorithms : 1;
+        unsigned int encoder_algorithms : 1;
+        unsigned int decoder_algorithms : 1;
+        unsigned int keymanager_algorithms : 1;
+        unsigned int skeymanager_algorithms : 1;
+        unsigned int signature_algorithms : 1;
+        unsigned int tls_signature_algorithms : 1;
+        unsigned int keyexchange_algorithms : 1;
+        unsigned int kem_algorithms : 1;
+        unsigned int tls_groups : 1;
+        unsigned int asym_cipher_algorithms : 1;
+        unsigned int pk_algorithms : 1;
+        unsigned int pk_method : 1;
+        unsigned int store_loaders : 1;
+        unsigned int provider_info : 1;
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-        unsigned int engines:1;
+        unsigned int engines : 1;
 #endif
-        unsigned int disabled:1;
-        unsigned int objects:1;
-        unsigned int options:1;
-    } todo = { 0, };
+        unsigned int disabled : 1;
+        unsigned int objects : 1;
+        unsigned int options : 1;
+    } todo = {
+        0,
+    };
 
-    verbose = 0;                 /* Clear a possible previous call */
+    verbose = 0; /* Clear a possible previous call */
 
     prog = opt_init(argc, argv, list_options);
     while ((o = opt_next()) != OPT_EOF) {
         switch (o) {
-        case OPT_EOF:  /* Never hit, but suppresses warning */
+        case OPT_EOF: /* Never hit, but suppresses warning */
         case OPT_ERR:
-opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             return 1;
         case OPT_HELP:
@@ -1844,16 +1860,16 @@ int list_main(int argc, char **argv)
             all_tls_groups = 1;
             todo.tls_groups = 1;
             break;
-# if !defined(OPENSSL_NO_TLS1_2)
+#if !defined(OPENSSL_NO_TLS1_2)
         case OPT_TLS1_2:
             tls_version = TLS1_2_VERSION;
             break;
-# endif
-# if !defined(OPENSSL_NO_TLS1_3)
+#endif
+#if !defined(OPENSSL_NO_TLS1_3)
         case OPT_TLS1_3:
             tls_version = TLS1_3_VERSION;
             break;
-# endif
+#endif
 #endif
         case OPT_ASYM_CIPHER_ALGORITHMS:
             todo.asym_cipher_algorithms = 1;
@@ -1902,12 +1918,12 @@ int list_main(int argc, char **argv)
     if (!opt_check_rest_arg(NULL))
         goto opthelp;
 
-#define MAYBE_ADD_NL(cmd) \
-    do { \
-        if (print_newline++) { \
+#define MAYBE_ADD_NL(cmd)              \
+    do {                               \
+        if (print_newline++) {         \
             BIO_printf(bio_out, "\n"); \
-        } \
-        cmd; \
+        }                              \
+        cmd;                           \
     } while (0)
 
     if (todo.commands)
diff --git a/apps/mac.c b/apps/mac.c
index 0a07b2ea43329..9e0f4d8ede55c 100644
--- a/apps/mac.c
+++ b/apps/mac.c
@@ -18,42 +18,46 @@
 #include <openssl/core_names.h>
 
 #undef BUFSIZE
-#define BUFSIZE 1024*8
+#define BUFSIZE 1024 * 8
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_MACOPT, OPT_BIN, OPT_IN, OPT_OUT,
-    OPT_CIPHER, OPT_DIGEST,
+    OPT_MACOPT,
+    OPT_BIN,
+    OPT_IN,
+    OPT_OUT,
+    OPT_CIPHER,
+    OPT_DIGEST,
     OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS mac_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] mac_name\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] mac_name\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form"},
-    {"cipher", OPT_CIPHER, 's', "Cipher"},
-    {"digest", OPT_DIGEST, 's', "Digest"},
-    {OPT_MORE_STR, 1, '-', "See 'PARAMETER NAMES' in the EVP_MAC_ docs"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "macopt", OPT_MACOPT, 's', "MAC algorithm parameters in n:v form" },
+    { "cipher", OPT_CIPHER, 's', "Cipher" },
+    { "digest", OPT_DIGEST, 's', "Digest" },
+    { OPT_MORE_STR, 1, '-', "See 'PARAMETER NAMES' in the EVP_MAC_ docs" },
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file to MAC (default is stdin)"},
+    { "in", OPT_IN, '<', "Input file to MAC (default is stdin)" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output to filename rather than stdout"},
-    {"binary", OPT_BIN, '-',
-        "Output in binary format (default is hexadecimal)"},
+    { "out", OPT_OUT, '>', "Output to filename rather than stdout" },
+    { "binary", OPT_BIN, '-',
+        "Output in binary format (default is hexadecimal)" },
 
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"mac_name", 0, 0, "MAC algorithm"},
-    {NULL}
+    { "mac_name", 0, 0, "MAC algorithm" },
+    { NULL }
 };
 
 static char *alloc_mac_algorithm_name(STACK_OF(OPENSSL_STRING) **optp,
-                                      const char *name, const char *arg)
+    const char *name, const char *arg)
 {
     size_t len = strlen(name) + strlen(arg) + 2;
     char *res;
@@ -95,7 +99,7 @@ int mac_main(int argc, char **argv)
     while ((o = opt_next()) != OPT_EOF) {
         switch (o) {
         default:
-opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto err;
         case OPT_HELP:
@@ -155,7 +159,7 @@ int mac_main(int argc, char **argv)
         int ok = 1;
 
         params = app_params_new_from_opts(opts,
-                                          EVP_MAC_settable_ctx_params(mac));
+            EVP_MAC_settable_ctx_params(mac));
         if (params == NULL)
             goto err;
 
diff --git a/apps/nseq.c b/apps/nseq.c
index e66b58d95705b..58b830b031595 100644
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -16,23 +16,25 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_TOSEQ, OPT_IN, OPT_OUT,
+    OPT_TOSEQ,
+    OPT_IN,
+    OPT_OUT,
     OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS nseq_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file"},
+    { "in", OPT_IN, '<', "Input file" },
 
     OPT_SECTION("Output"),
-    {"toseq", OPT_TOSEQ, '-', "Output NS Sequence file"},
-    {"out", OPT_OUT, '>', "Output file"},
+    { "toseq", OPT_TOSEQ, '-', "Output NS Sequence file" },
+    { "out", OPT_OUT, '>', "Output file" },
 
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int nseq_main(int argc, char **argv)
@@ -49,7 +51,7 @@ int nseq_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -97,7 +99,7 @@ int nseq_main(int argc, char **argv)
 
         if (!sk_X509_num(seq->certs)) {
             BIO_printf(bio_err, "%s: Error reading certs file %s\n",
-                       prog, infile);
+                prog, infile);
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -109,7 +111,7 @@ int nseq_main(int argc, char **argv)
     seq = PEM_read_bio_NETSCAPE_CERT_SEQUENCE(in, NULL, NULL, NULL);
     if (seq == NULL) {
         BIO_printf(bio_err, "%s: Error reading sequence file %s\n",
-                   prog, infile);
+            prog, infile);
         ERR_print_errors(bio_err);
         goto end;
     }
@@ -120,7 +122,7 @@ int nseq_main(int argc, char **argv)
         PEM_write_bio_X509(out, x509);
     }
     ret = 0;
- end:
+end:
     BIO_free(in);
     BIO_free_all(out);
     NETSCAPE_CERT_SEQUENCE_free(seq);
diff --git a/apps/ocsp.c b/apps/ocsp.c
index bd01cf127dfbc..a9b248d3a1982 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -10,8 +10,8 @@
 #include <openssl/opensslconf.h>
 
 #ifdef OPENSSL_SYS_VMS
-  /* So fd_set and friends get properly defined on OpenVMS */
-# define _XOPEN_SOURCE_EXTENDED
+/* So fd_set and friends get properly defined on OpenVMS */
+#define _XOPEN_SOURCE_EXTENDED
 #endif
 
 #include <stdio.h>
@@ -44,33 +44,33 @@ int setpgid(pid_t pid, pid_t pgid)
 pid_t fork(void)
 {
     errno = ENOSYS;
-    return (pid_t) -1;
+    return (pid_t)-1;
 }
 #endif
 /* Maximum leeway in validity period: default 5 minutes */
-#define MAX_VALIDITY_PERIOD    (5 * 60)
+#define MAX_VALIDITY_PERIOD (5 * 60)
 
 static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert,
-                         const EVP_MD *cert_id_md, X509 *issuer,
-                         STACK_OF(OCSP_CERTID) *ids);
+    const EVP_MD *cert_id_md, X509 *issuer,
+    STACK_OF(OCSP_CERTID) *ids);
 static int add_ocsp_serial(OCSP_REQUEST **req, char *serial,
-                           const EVP_MD *cert_id_md, X509 *issuer,
-                           STACK_OF(OCSP_CERTID) *ids);
+    const EVP_MD *cert_id_md, X509 *issuer,
+    STACK_OF(OCSP_CERTID) *ids);
 static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
-                              STACK_OF(OPENSSL_STRING) *names,
-                              STACK_OF(OCSP_CERTID) *ids, long nsec,
-                              long maxage);
+    STACK_OF(OPENSSL_STRING) *names,
+    STACK_OF(OCSP_CERTID) *ids, long nsec,
+    long maxage);
 static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req,
-                              CA_DB *db, STACK_OF(X509) *ca, X509 *rcert,
-                              EVP_PKEY *rkey, const EVP_MD *md,
-                              STACK_OF(OPENSSL_STRING) *sigopts,
-                              STACK_OF(X509) *rother, unsigned long flags,
-                              int nmin, int ndays, int badsig,
-                              const EVP_MD *resp_md);
+    CA_DB *db, STACK_OF(X509) *ca, X509 *rcert,
+    EVP_PKEY *rkey, const EVP_MD *md,
+    STACK_OF(OPENSSL_STRING) *sigopts,
+    STACK_OF(X509) *rother, unsigned long flags,
+    int nmin, int ndays, int badsig,
+    const EVP_MD *resp_md);
 
 static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser);
 static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio,
-                        int timeout);
+    int timeout);
 static int send_ocsp_response(BIO *cbio, const OCSP_RESPONSE *resp);
 static char *prog;
 
@@ -80,131 +80,175 @@ static int index_changed(CA_DB *);
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_OUTFILE, OPT_TIMEOUT, OPT_URL, OPT_HOST, OPT_PORT,
+    OPT_OUTFILE,
+    OPT_TIMEOUT,
+    OPT_URL,
+    OPT_HOST,
+    OPT_PORT,
 #ifndef OPENSSL_NO_SOCK
-    OPT_PROXY, OPT_NO_PROXY,
+    OPT_PROXY,
+    OPT_NO_PROXY,
 #endif
-    OPT_IGNORE_ERR, OPT_NOVERIFY, OPT_NONCE, OPT_NO_NONCE,
-    OPT_RESP_NO_CERTS, OPT_RESP_KEY_ID, OPT_NO_CERTS,
-    OPT_NO_SIGNATURE_VERIFY, OPT_NO_CERT_VERIFY, OPT_NO_CHAIN,
-    OPT_NO_CERT_CHECKS, OPT_NO_EXPLICIT, OPT_TRUST_OTHER,
-    OPT_NO_INTERN, OPT_BADSIG, OPT_TEXT, OPT_REQ_TEXT, OPT_RESP_TEXT,
-    OPT_REQIN, OPT_RESPIN, OPT_SIGNER, OPT_VAFILE, OPT_SIGN_OTHER,
-    OPT_VERIFY_OTHER, OPT_CAFILE, OPT_CAPATH, OPT_CASTORE, OPT_NOCAFILE,
-    OPT_NOCAPATH, OPT_NOCASTORE,
-    OPT_VALIDITY_PERIOD, OPT_STATUS_AGE, OPT_SIGNKEY, OPT_REQOUT,
-    OPT_RESPOUT, OPT_PATH, OPT_ISSUER, OPT_CERT, OPT_SERIAL,
-    OPT_INDEX, OPT_CA, OPT_NMIN, OPT_REQUEST, OPT_NDAYS, OPT_RSIGNER,
-    OPT_RKEY, OPT_ROTHER, OPT_RMD, OPT_RSIGOPT, OPT_HEADER,
+    OPT_IGNORE_ERR,
+    OPT_NOVERIFY,
+    OPT_NONCE,
+    OPT_NO_NONCE,
+    OPT_RESP_NO_CERTS,
+    OPT_RESP_KEY_ID,
+    OPT_NO_CERTS,
+    OPT_NO_SIGNATURE_VERIFY,
+    OPT_NO_CERT_VERIFY,
+    OPT_NO_CHAIN,
+    OPT_NO_CERT_CHECKS,
+    OPT_NO_EXPLICIT,
+    OPT_TRUST_OTHER,
+    OPT_NO_INTERN,
+    OPT_BADSIG,
+    OPT_TEXT,
+    OPT_REQ_TEXT,
+    OPT_RESP_TEXT,
+    OPT_REQIN,
+    OPT_RESPIN,
+    OPT_SIGNER,
+    OPT_VAFILE,
+    OPT_SIGN_OTHER,
+    OPT_VERIFY_OTHER,
+    OPT_CAFILE,
+    OPT_CAPATH,
+    OPT_CASTORE,
+    OPT_NOCAFILE,
+    OPT_NOCAPATH,
+    OPT_NOCASTORE,
+    OPT_VALIDITY_PERIOD,
+    OPT_STATUS_AGE,
+    OPT_SIGNKEY,
+    OPT_REQOUT,
+    OPT_RESPOUT,
+    OPT_PATH,
+    OPT_ISSUER,
+    OPT_CERT,
+    OPT_SERIAL,
+    OPT_INDEX,
+    OPT_CA,
+    OPT_NMIN,
+    OPT_REQUEST,
+    OPT_NDAYS,
+    OPT_RSIGNER,
+    OPT_RKEY,
+    OPT_ROTHER,
+    OPT_RMD,
+    OPT_RSIGOPT,
+    OPT_HEADER,
     OPT_PASSIN,
     OPT_RCID,
     OPT_V_ENUM,
     OPT_MD,
-    OPT_MULTI, OPT_PROV_ENUM
+    OPT_MULTI,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS ocsp_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"ignore_err", OPT_IGNORE_ERR, '-',
-     "Ignore error on OCSP request or response and continue running"},
-    {"CAfile", OPT_CAFILE, '<', "Trusted certificates file"},
-    {"CApath", OPT_CAPATH, '<', "Trusted certificates directory"},
-    {"CAstore", OPT_CASTORE, ':', "Trusted certificates store URI"},
-    {"no-CAfile", OPT_NOCAFILE, '-',
-     "Do not load the default certificates file"},
-    {"no-CApath", OPT_NOCAPATH, '-',
-     "Do not load certificates from the default certificates directory"},
-    {"no-CAstore", OPT_NOCASTORE, '-',
-     "Do not load certificates from the default certificates store"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "ignore_err", OPT_IGNORE_ERR, '-',
+        "Ignore error on OCSP request or response and continue running" },
+    { "CAfile", OPT_CAFILE, '<', "Trusted certificates file" },
+    { "CApath", OPT_CAPATH, '<', "Trusted certificates directory" },
+    { "CAstore", OPT_CASTORE, ':', "Trusted certificates store URI" },
+    { "no-CAfile", OPT_NOCAFILE, '-',
+        "Do not load the default certificates file" },
+    { "no-CApath", OPT_NOCAPATH, '-',
+        "Do not load certificates from the default certificates directory" },
+    { "no-CAstore", OPT_NOCASTORE, '-',
+        "Do not load certificates from the default certificates store" },
 
     OPT_SECTION("Responder"),
-    {"timeout", OPT_TIMEOUT, 'p',
-     "Connection timeout (in seconds) to the OCSP responder"},
-    {"resp_no_certs", OPT_RESP_NO_CERTS, '-',
-     "Don't include any certificates in response"},
+    { "timeout", OPT_TIMEOUT, 'p',
+        "Connection timeout (in seconds) to the OCSP responder" },
+    { "resp_no_certs", OPT_RESP_NO_CERTS, '-',
+        "Don't include any certificates in response" },
 #ifdef HTTP_DAEMON
-    {"multi", OPT_MULTI, 'p', "run multiple responder processes"},
+    { "multi", OPT_MULTI, 'p', "run multiple responder processes" },
 #endif
-    {"no_certs", OPT_NO_CERTS, '-',
-     "Don't include any certificates in signed request"},
-    {"badsig", OPT_BADSIG, '-',
-        "Corrupt last byte of loaded OCSP response signature (for test)"},
-    {"CA", OPT_CA, '<', "CA certificates"},
-    {"nmin", OPT_NMIN, 'p', "Number of minutes before next update"},
-    {"nrequest", OPT_REQUEST, 'p',
-     "Number of requests to accept (default unlimited)"},
-    {"reqin", OPT_REQIN, 's', "File with the DER-encoded request"},
-    {"signer", OPT_SIGNER, '<', "Certificate to sign OCSP request with"},
-    {"sign_other", OPT_SIGN_OTHER, '<',
-     "Additional certificates to include in signed request"},
-    {"index", OPT_INDEX, '<', "Certificate status index file"},
-    {"ndays", OPT_NDAYS, 'p', "Number of days before next update"},
-    {"rsigner", OPT_RSIGNER, '<',
-     "Responder certificate to sign responses with"},
-    {"rkey", OPT_RKEY, '<', "Responder key to sign responses with"},
-    {"passin", OPT_PASSIN, 's', "Responder key pass phrase source"},
-    {"rother", OPT_ROTHER, '<', "Other certificates to include in response"},
-    {"rmd", OPT_RMD, 's', "Digest Algorithm to use in signature of OCSP response"},
-    {"rsigopt", OPT_RSIGOPT, 's', "OCSP response signature parameter in n:v form"},
-    {"header", OPT_HEADER, 's', "key=value header to add"},
-    {"rcid", OPT_RCID, 's', "Use specified algorithm for cert id in response"},
-    {"", OPT_MD, '-', "Any supported digest algorithm (sha1,sha256, ... )"},
+    { "no_certs", OPT_NO_CERTS, '-',
+        "Don't include any certificates in signed request" },
+    { "badsig", OPT_BADSIG, '-',
+        "Corrupt last byte of loaded OCSP response signature (for test)" },
+    { "CA", OPT_CA, '<', "CA certificates" },
+    { "nmin", OPT_NMIN, 'p', "Number of minutes before next update" },
+    { "nrequest", OPT_REQUEST, 'p',
+        "Number of requests to accept (default unlimited)" },
+    { "reqin", OPT_REQIN, 's', "File with the DER-encoded request" },
+    { "signer", OPT_SIGNER, '<', "Certificate to sign OCSP request with" },
+    { "sign_other", OPT_SIGN_OTHER, '<',
+        "Additional certificates to include in signed request" },
+    { "index", OPT_INDEX, '<', "Certificate status index file" },
+    { "ndays", OPT_NDAYS, 'p', "Number of days before next update" },
+    { "rsigner", OPT_RSIGNER, '<',
+        "Responder certificate to sign responses with" },
+    { "rkey", OPT_RKEY, '<', "Responder key to sign responses with" },
+    { "passin", OPT_PASSIN, 's', "Responder key pass phrase source" },
+    { "rother", OPT_ROTHER, '<', "Other certificates to include in response" },
+    { "rmd", OPT_RMD, 's', "Digest Algorithm to use in signature of OCSP response" },
+    { "rsigopt", OPT_RSIGOPT, 's', "OCSP response signature parameter in n:v form" },
+    { "header", OPT_HEADER, 's', "key=value header to add" },
+    { "rcid", OPT_RCID, 's', "Use specified algorithm for cert id in response" },
+    { "", OPT_MD, '-', "Any supported digest algorithm (sha1,sha256, ... )" },
 
     OPT_SECTION("Client"),
-    {"url", OPT_URL, 's', "Responder URL"},
-    {"host", OPT_HOST, 's', "TCP/IP hostname:port to connect to"},
-    {"port", OPT_PORT, 'N', "Port to run responder on"},
-    {"path", OPT_PATH, 's', "Path to use in OCSP request"},
+    { "url", OPT_URL, 's', "Responder URL" },
+    { "host", OPT_HOST, 's', "TCP/IP hostname:port to connect to" },
+    { "port", OPT_PORT, 'N', "Port to run responder on" },
+    { "path", OPT_PATH, 's', "Path to use in OCSP request" },
 #ifndef OPENSSL_NO_SOCK
-    {"proxy", OPT_PROXY, 's',
-     "[http[s]://]host[:port][/path] of HTTP(S) proxy to use; path is ignored"},
-    {"no_proxy", OPT_NO_PROXY, 's',
-     "List of addresses of servers not to use HTTP(S) proxy for"},
-    {OPT_MORE_STR, 0, 0,
-     "Default from environment variable 'no_proxy', else 'NO_PROXY', else none"},
+    { "proxy", OPT_PROXY, 's',
+        "[http[s]://]host[:port][/path] of HTTP(S) proxy to use; path is ignored" },
+    { "no_proxy", OPT_NO_PROXY, 's',
+        "List of addresses of servers not to use HTTP(S) proxy for" },
+    { OPT_MORE_STR, 0, 0,
+        "Default from environment variable 'no_proxy', else 'NO_PROXY', else none" },
 #endif
-    {"out", OPT_OUTFILE, '>', "Output filename"},
-    {"noverify", OPT_NOVERIFY, '-', "Don't verify response at all"},
-    {"nonce", OPT_NONCE, '-', "Add OCSP nonce to request"},
-    {"no_nonce", OPT_NO_NONCE, '-', "Don't add OCSP nonce to request"},
-    {"no_signature_verify", OPT_NO_SIGNATURE_VERIFY, '-',
-     "Don't check signature on response"},
-    {"resp_key_id", OPT_RESP_KEY_ID, '-',
-     "Identify response by signing certificate key ID"},
-    {"no_cert_verify", OPT_NO_CERT_VERIFY, '-',
-     "Don't check signing certificate"},
-    {"text", OPT_TEXT, '-', "Print text form of request and response"},
-    {"req_text", OPT_REQ_TEXT, '-', "Print text form of request"},
-    {"resp_text", OPT_RESP_TEXT, '-', "Print text form of response"},
-    {"no_chain", OPT_NO_CHAIN, '-', "Don't chain verify response"},
-    {"no_cert_checks", OPT_NO_CERT_CHECKS, '-',
-     "Don't do additional checks on signing certificate"},
-    {"no_explicit", OPT_NO_EXPLICIT, '-',
-     "Do not explicitly check the chain, just verify the root"},
-    {"trust_other", OPT_TRUST_OTHER, '-',
-     "Don't verify additional certificates"},
-    {"no_intern", OPT_NO_INTERN, '-',
-     "Don't search certificates contained in response for signer"},
-    {"respin", OPT_RESPIN, 's', "File with the DER-encoded response"},
-    {"VAfile", OPT_VAFILE, '<', "Validator certificates file"},
-    {"verify_other", OPT_VERIFY_OTHER, '<',
-     "Additional certificates to search for signer"},
-    {"cert", OPT_CERT, '<',
-     "Certificate to check; may be given multiple times"},
-    {"serial", OPT_SERIAL, 's',
-     "Serial number to check; may be given multiple times"},
-    {"validity_period", OPT_VALIDITY_PERIOD, 'u',
-     "Maximum validity discrepancy in seconds"},
-    {"signkey", OPT_SIGNKEY, 's', "Private key to sign OCSP request with"},
-    {"reqout", OPT_REQOUT, 's', "Output file for the DER-encoded request"},
-    {"respout", OPT_RESPOUT, 's', "Output file for the DER-encoded response"},
-    {"issuer", OPT_ISSUER, '<', "Issuer certificate"},
-    {"status_age", OPT_STATUS_AGE, 'p', "Maximum status age in seconds"},
+    { "out", OPT_OUTFILE, '>', "Output filename" },
+    { "noverify", OPT_NOVERIFY, '-', "Don't verify response at all" },
+    { "nonce", OPT_NONCE, '-', "Add OCSP nonce to request" },
+    { "no_nonce", OPT_NO_NONCE, '-', "Don't add OCSP nonce to request" },
+    { "no_signature_verify", OPT_NO_SIGNATURE_VERIFY, '-',
+        "Don't check signature on response" },
+    { "resp_key_id", OPT_RESP_KEY_ID, '-',
+        "Identify response by signing certificate key ID" },
+    { "no_cert_verify", OPT_NO_CERT_VERIFY, '-',
+        "Don't check signing certificate" },
+    { "text", OPT_TEXT, '-', "Print text form of request and response" },
+    { "req_text", OPT_REQ_TEXT, '-', "Print text form of request" },
+    { "resp_text", OPT_RESP_TEXT, '-', "Print text form of response" },
+    { "no_chain", OPT_NO_CHAIN, '-', "Don't chain verify response" },
+    { "no_cert_checks", OPT_NO_CERT_CHECKS, '-',
+        "Don't do additional checks on signing certificate" },
+    { "no_explicit", OPT_NO_EXPLICIT, '-',
+        "Do not explicitly check the chain, just verify the root" },
+    { "trust_other", OPT_TRUST_OTHER, '-',
+        "Don't verify additional certificates" },
+    { "no_intern", OPT_NO_INTERN, '-',
+        "Don't search certificates contained in response for signer" },
+    { "respin", OPT_RESPIN, 's', "File with the DER-encoded response" },
+    { "VAfile", OPT_VAFILE, '<', "Validator certificates file" },
+    { "verify_other", OPT_VERIFY_OTHER, '<',
+        "Additional certificates to search for signer" },
+    { "cert", OPT_CERT, '<',
+        "Certificate to check; may be given multiple times" },
+    { "serial", OPT_SERIAL, 's',
+        "Serial number to check; may be given multiple times" },
+    { "validity_period", OPT_VALIDITY_PERIOD, 'u',
+        "Maximum validity discrepancy in seconds" },
+    { "signkey", OPT_SIGNKEY, 's', "Private key to sign OCSP request with" },
+    { "reqout", OPT_REQOUT, 's', "Output file for the DER-encoded request" },
+    { "respout", OPT_RESPOUT, 's', "Output file for the DER-encoded response" },
+    { "issuer", OPT_ISSUER, '<', "Issuer certificate" },
+    { "status_age", OPT_STATUS_AGE, 'p', "Maximum status age in seconds" },
 
     OPT_V_OPTIONS,
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int ocsp_main(int argc, char **argv)
@@ -253,8 +297,8 @@ int ocsp_main(int argc, char **argv)
     OPTION_CHOICE o;
 
     if ((reqnames = sk_OPENSSL_STRING_new_null()) == NULL
-            || (ids = sk_OCSP_CERTID_new_null()) == NULL
-            || (vpm = X509_VERIFY_PARAM_new()) == NULL)
+        || (ids = sk_OCSP_CERTID_new_null()) == NULL
+        || (vpm = X509_VERIFY_PARAM_new()) == NULL)
         goto end;
 
     opt_set_unknown_name("digest");
@@ -263,7 +307,7 @@ int ocsp_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -284,8 +328,8 @@ int ocsp_main(int argc, char **argv)
             OPENSSL_free(tpath);
             thost = tport = tpath = NULL;
             if (!OSSL_HTTP_parse_url(opt_arg(), &use_ssl, NULL /* userinfo */,
-                                     &host, &port, NULL /* port_num */,
-                                     &path, NULL /* qry */, NULL /* frag */)) {
+                    &host, &port, NULL /* port_num */,
+                    &path, NULL /* qry */, NULL /* frag */)) {
                 BIO_printf(bio_err, "%s Error parsing -url argument\n", prog);
                 goto end;
             }
@@ -485,7 +529,7 @@ int ocsp_main(int argc, char **argv)
         case OPT_ROTHER:
             rcertfile = opt_arg();
             break;
-        case OPT_RMD:   /* Response MessageDigest */
+        case OPT_RMD: /* Response MessageDigest */
             respdigname = opt_arg();
             break;
         case OPT_RSIGOPT:
@@ -513,8 +557,8 @@ int ocsp_main(int argc, char **argv)
         case OPT_MD:
             if (trailing_md) {
                 BIO_printf(bio_err,
-                           "%s: Digest must be before -cert or -serial\n",
-                           prog);
+                    "%s: Digest must be before -cert or -serial\n",
+                    prog);
                 goto opthelp;
             }
             if (!opt_md(opt_unknown(), &cert_id_md))
@@ -539,7 +583,7 @@ int ocsp_main(int argc, char **argv)
 
     if (trailing_md) {
         BIO_printf(bio_err, "%s: Digest must be before -cert or -serial\n",
-                   prog);
+            prog);
         goto opthelp;
     }
 
@@ -591,7 +635,7 @@ int ocsp_main(int argc, char **argv)
             goto end;
         if (rcertfile != NULL) {
             if (!load_certs(rcertfile, 0, &rother, NULL,
-                            "responder other certificates"))
+                    "responder other certificates"))
                 goto end;
         }
         if (!app_passwd(passinarg, NULL, &passin, NULL)) {
@@ -599,7 +643,7 @@ int ocsp_main(int argc, char **argv)
             goto end;
         }
         rkey = load_key(rkeyfile, FORMAT_UNDEF, 0, passin, NULL,
-                        "responder private key");
+            "responder private key");
         if (rkey == NULL)
             goto end;
     }
@@ -607,7 +651,7 @@ int ocsp_main(int argc, char **argv)
     if (ridx_filename != NULL
         && (rkey == NULL || rsigner == NULL || rca_certs == NULL)) {
         BIO_printf(bio_err,
-                   "Responder mode requires certificate, key, and CA.\n");
+            "Responder mode requires certificate, key, and CA.\n");
         goto end;
     }
 
@@ -631,7 +675,7 @@ int ocsp_main(int argc, char **argv)
 
     if (acbio != NULL)
         trace_log_message(-1, prog,
-                          LOG_INFO, "waiting for OCSP client connections...");
+            LOG_INFO, "waiting for OCSP client connections...");
 
 redo_accept:
 
@@ -646,8 +690,8 @@ int ocsp_main(int argc, char **argv)
             } else {
                 free_index(newrdb);
                 trace_log_message(-1, prog,
-                                  LOG_ERR, "error reloading updated index: %s",
-                                  ridx_filename);
+                    LOG_ERR, "error reloading updated index: %s",
+                    ridx_filename);
             }
         }
 #endif
@@ -659,10 +703,10 @@ int ocsp_main(int argc, char **argv)
 
         if (req == NULL) {
             if (res == 1) {
-                resp =
-                    OCSP_response_create(OCSP_RESPONSE_STATUS_MALFORMEDREQUEST,
-                                         NULL);
-                send_ocsp_response(cbio, resp);
+                resp = OCSP_response_create(OCSP_RESPONSE_STATUS_MALFORMEDREQUEST,
+                    NULL);
+                if (resp != NULL)
+                    send_ocsp_response(cbio, resp);
             }
             goto done_resp;
         }
@@ -690,16 +734,16 @@ int ocsp_main(int argc, char **argv)
         }
         if (sign_certfile != NULL) {
             if (!load_certs(sign_certfile, 0, &sign_other, NULL,
-                            "signer certificates"))
+                    "signer certificates"))
                 goto end;
         }
         key = load_key(keyfile, FORMAT_UNDEF, 0, NULL, NULL,
-                       "signer private key");
+            "signer private key");
         if (key == NULL)
             goto end;
 
         if (!OCSP_request_sign(req, signer, key, NULL,
-                               sign_other, sign_flags)) {
+                sign_other, sign_flags)) {
             BIO_printf(bio_err, "Error signing OCSP request\n");
             goto end;
         }
@@ -722,8 +766,8 @@ int ocsp_main(int argc, char **argv)
 
     if (rdb != NULL) {
         make_ocsp_response(bio_err, &resp, req, rdb, rca_certs, rsigner, rkey,
-                           rsign_md, rsign_sigopts, rother, rflags, nmin, ndays,
-                           badsig, resp_certid_md);
+            rsign_md, rsign_sigopts, rother, rflags, nmin, ndays,
+            badsig, resp_certid_md);
         if (resp == NULL)
             goto end;
         if (cbio != NULL)
@@ -731,12 +775,12 @@ int ocsp_main(int argc, char **argv)
     } else if (host != NULL) {
 #ifndef OPENSSL_NO_SOCK
         resp = process_responder(req, host, port, path, opt_proxy, opt_no_proxy,
-                                 use_ssl, headers, req_timeout);
+            use_ssl, headers, req_timeout);
         if (resp == NULL)
             goto end;
 #else
         BIO_printf(bio_err,
-                   "Error creating connect BIO - sockets not supported\n");
+            "Error creating connect BIO - sockets not supported\n");
         goto end;
 #endif
     } else if (respin != NULL) {
@@ -754,7 +798,7 @@ int ocsp_main(int argc, char **argv)
         goto end;
     }
 
- done_resp:
+done_resp:
 
     if (respout != NULL) {
         derbio = bio_open_default(respout, 'w', FORMAT_ASN1);
@@ -764,16 +808,18 @@ int ocsp_main(int argc, char **argv)
         BIO_free(derbio);
     }
 
-    i = OCSP_response_status(resp);
-    if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
-        BIO_printf(out, "Responder Error: %s (%d)\n",
-                   OCSP_response_status_str(i), i);
-        if (!ignore_err)
+    if (resp != NULL) {
+        i = OCSP_response_status(resp);
+        if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
+            BIO_printf(out, "Responder Error: %s (%d)\n",
+                OCSP_response_status_str(i), i);
+            if (!ignore_err)
                 goto end;
-    }
+        }
 
-    if (resp_text)
-        OCSP_RESPONSE_print(out, resp, 0);
+        if (resp_text)
+            OCSP_RESPONSE_print(out, resp, 0);
+    }
 
     /* If running as responder don't verify our own response */
     if (cbio != NULL) {
@@ -797,7 +843,7 @@ int ocsp_main(int argc, char **argv)
 
     if (store == NULL) {
         store = setup_verify(CAfile, noCAfile, CApath, noCApath,
-                             CAstore, noCAstore);
+            CAstore, noCAstore);
         if (!store)
             goto end;
     }
@@ -805,7 +851,7 @@ int ocsp_main(int argc, char **argv)
         X509_STORE_set1_param(store, vpm);
     if (verify_certfile != NULL) {
         if (!load_certs(verify_certfile, 0, &verify_other, NULL,
-                        "validator certificates"))
+                "validator certificates"))
             goto end;
     }
 
@@ -846,7 +892,7 @@ int ocsp_main(int argc, char **argv)
     if (!print_ocsp_summary(out, bs, req, reqnames, ids, nsec, maxage))
         ret = 1;
 
- end:
+end:
     ERR_print_errors(bio_err);
     X509_free(signer);
     X509_STORE_free(store);
@@ -901,8 +947,8 @@ static int index_changed(CA_DB *rdb)
 #endif
 
 static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert,
-                         const EVP_MD *cert_id_md, X509 *issuer,
-                         STACK_OF(OCSP_CERTID) *ids)
+    const EVP_MD *cert_id_md, X509 *issuer,
+    STACK_OF(OCSP_CERTID) *ids)
 {
     OCSP_CERTID *id;
 
@@ -921,14 +967,14 @@ static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert,
         goto err;
     return 1;
 
- err:
+err:
     BIO_printf(bio_err, "Error Creating OCSP request\n");
     return 0;
 }
 
 static int add_ocsp_serial(OCSP_REQUEST **req, char *serial,
-                           const EVP_MD *cert_id_md, X509 *issuer,
-                           STACK_OF(OCSP_CERTID) *ids)
+    const EVP_MD *cert_id_md, X509 *issuer,
+    STACK_OF(OCSP_CERTID) *ids)
 {
     OCSP_CERTID *id;
     const X509_NAME *iname;
@@ -958,15 +1004,15 @@ static int add_ocsp_serial(OCSP_REQUEST **req, char *serial,
         goto err;
     return 1;
 
- err:
+err:
     BIO_printf(bio_err, "Error Creating OCSP request\n");
     return 0;
 }
 
 static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
-                              STACK_OF(OPENSSL_STRING) *names,
-                              STACK_OF(OCSP_CERTID) *ids, long nsec,
-                              long maxage)
+    STACK_OF(OPENSSL_STRING) *names,
+    STACK_OF(OCSP_CERTID) *ids, long nsec,
+    long maxage)
 {
     OCSP_CERTID *id;
     const char *name;
@@ -986,7 +1032,7 @@ static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
         BIO_printf(out, "%s: ", name);
 
         if (!OCSP_resp_find_status(bs, id, &status, &reason,
-                                   &rev, &thisupd, &nextupd)) {
+                &rev, &thisupd, &nextupd)) {
             BIO_puts(out, "ERROR: No Status found.\n");
             ret = 0;
             continue;
@@ -1026,12 +1072,12 @@ static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
 }
 
 static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req,
-                              CA_DB *db, STACK_OF(X509) *ca, X509 *rcert,
-                              EVP_PKEY *rkey, const EVP_MD *rmd,
-                              STACK_OF(OPENSSL_STRING) *sigopts,
-                              STACK_OF(X509) *rother, unsigned long flags,
-                              int nmin, int ndays, int badsig,
-                              const EVP_MD *resp_md)
+    CA_DB *db, STACK_OF(X509) *ca, X509 *rcert,
+    EVP_PKEY *rkey, const EVP_MD *rmd,
+    STACK_OF(OPENSSL_STRING) *sigopts,
+    STACK_OF(X509) *rother, unsigned long flags,
+    int nmin, int ndays, int badsig,
+    const EVP_MD *resp_md)
 {
     ASN1_TIME *thisupd = NULL, *nextupd = NULL;
     OCSP_CERTID *cid;
@@ -1043,12 +1089,15 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
     id_count = OCSP_request_onereq_count(req);
 
     if (id_count <= 0) {
-        *resp =
-            OCSP_response_create(OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, NULL);
+        *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, NULL);
         goto end;
     }
 
     bs = OCSP_BASICRESP_new();
+    if (bs == NULL) {
+        *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR, bs);
+        goto end;
+    }
     thisupd = X509_gmtime_adj(NULL, 0);
     if (ndays != -1)
         nextupd = X509_time_adj_ex(NULL, ndays, nmin * 60, NULL);
@@ -1072,13 +1121,19 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
         cert_id_md = EVP_get_digestbyobj(cert_id_md_oid);
         if (cert_id_md == NULL) {
             *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR,
-                                         NULL);
+                NULL);
             goto end;
         }
         for (jj = 0; jj < sk_X509_num(ca) && !found; jj++) {
             X509 *ca_cert = sk_X509_value(ca, jj);
             OCSP_CERTID *ca_id = OCSP_cert_to_id(cert_id_md, NULL, ca_cert);
 
+            if (ca_id == NULL) {
+                *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR,
+                    NULL);
+                goto end;
+            }
+
             if (OCSP_id_issuer_cmp(ca_id, cid) == 0) {
                 found = 1;
                 if (resp_md != NULL)
@@ -1094,18 +1149,18 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
 
         if (!found) {
             OCSP_basic_add1_status(bs, cid,
-                                   V_OCSP_CERTSTATUS_UNKNOWN,
-                                   0, NULL, thisupd, nextupd);
+                V_OCSP_CERTSTATUS_UNKNOWN,
+                0, NULL, thisupd, nextupd);
             continue;
         }
         if (inf == NULL) {
             OCSP_basic_add1_status(bs, cid,
-                                   V_OCSP_CERTSTATUS_UNKNOWN,
-                                   0, NULL, thisupd, nextupd);
+                V_OCSP_CERTSTATUS_UNKNOWN,
+                0, NULL, thisupd, nextupd);
         } else if (inf[DB_type][0] == DB_TYPE_VAL) {
             OCSP_basic_add1_status(bs, cid,
-                                   V_OCSP_CERTSTATUS_GOOD,
-                                   0, NULL, thisupd, nextupd);
+                V_OCSP_CERTSTATUS_GOOD,
+                0, NULL, thisupd, nextupd);
         } else if (inf[DB_type][0] == DB_TYPE_REV) {
             ASN1_OBJECT *inst = NULL;
             ASN1_TIME *revtm = NULL;
@@ -1115,20 +1170,20 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
 
             unpack_revinfo(&revtm, &reason, &inst, &invtm, inf[DB_rev_date]);
             single = OCSP_basic_add1_status(bs, cid,
-                                            V_OCSP_CERTSTATUS_REVOKED,
-                                            reason, revtm, thisupd, nextupd);
+                V_OCSP_CERTSTATUS_REVOKED,
+                reason, revtm, thisupd, nextupd);
             if (single == NULL) {
                 *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR,
-                                             NULL);
+                    NULL);
                 goto end;
             }
             if (invtm != NULL)
                 OCSP_SINGLERESP_add1_ext_i2d(single, NID_invalidity_date,
-                                             invtm, 0, 0);
+                    invtm, 0, 0);
             else if (inst != NULL)
                 OCSP_SINGLERESP_add1_ext_i2d(single,
-                                             NID_hold_instruction_code, inst,
-                                             0, 0);
+                    NID_hold_instruction_code, inst,
+                    0, 0);
             ASN1_OBJECT_free(inst);
             ASN1_TIME_free(revtm);
             ASN1_GENERALIZEDTIME_free(invtm);
@@ -1150,7 +1205,7 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
             BIO_printf(err, "parameter error \"%s\"\n", sigopt);
             ERR_print_errors(bio_err);
             *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_INTERNALERROR,
-                                         NULL);
+                NULL);
             goto end;
         }
     }
@@ -1166,7 +1221,7 @@ static void make_ocsp_response(BIO *err, OCSP_RESPONSE **resp, OCSP_REQUEST *req
 
     *resp = OCSP_response_create(OCSP_RESPONSE_STATUS_SUCCESSFUL, bs);
 
- end:
+end:
     EVP_MD_CTX_free(mctx);
     ASN1_TIME_free(thisupd);
     ASN1_TIME_free(nextupd);
@@ -1181,8 +1236,8 @@ static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser)
     for (i = 0; i < DB_NUMBER; i++)
         row[i] = NULL;
     bn = ASN1_INTEGER_to_BN(ser, NULL);
-    OPENSSL_assert(bn);         /* FIXME: should report an error at this
-                                 * point and abort */
+    OPENSSL_assert(bn); /* FIXME: should report an error at this
+                         * point and abort */
     if (BN_is_zero(bn)) {
         itmp = OPENSSL_strdup("00");
         OPENSSL_assert(itmp);
@@ -1197,16 +1252,16 @@ static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser)
 }
 
 static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio,
-                        int timeout)
+    int timeout)
 {
 #ifndef OPENSSL_NO_SOCK
     return http_server_get_asn1_req(ASN1_ITEM_rptr(OCSP_REQUEST),
-                                    (ASN1_VALUE **)preq, NULL, pcbio, acbio,
-                                    NULL /* found_keep_alive */,
-                                    prog, 1 /* accept_get */, timeout);
+        (ASN1_VALUE **)preq, NULL, pcbio, acbio,
+        NULL /* found_keep_alive */,
+        prog, 1 /* accept_get */, timeout);
 #else
     BIO_printf(bio_err,
-               "Error getting OCSP request - sockets not supported\n");
+        "Error getting OCSP request - sockets not supported\n");
     *preq = NULL;
     return 0;
 #endif
@@ -1216,23 +1271,23 @@ static int send_ocsp_response(BIO *cbio, const OCSP_RESPONSE *resp)
 {
 #ifndef OPENSSL_NO_SOCK
     return http_server_send_asn1_resp(prog, cbio,
-                                      0 /* no keep-alive */,
-                                      "application/ocsp-response",
-                                      ASN1_ITEM_rptr(OCSP_RESPONSE),
-                                      (const ASN1_VALUE *)resp);
+        0 /* no keep-alive */,
+        "application/ocsp-response",
+        ASN1_ITEM_rptr(OCSP_RESPONSE),
+        (const ASN1_VALUE *)resp);
 #else
     BIO_printf(bio_err,
-               "Error sending OCSP response - sockets not supported\n");
+        "Error sending OCSP response - sockets not supported\n");
     return 0;
 #endif
 }
 
 #ifndef OPENSSL_NO_SOCK
 OCSP_RESPONSE *process_responder(OCSP_REQUEST *req, const char *host,
-                                 const char *port, const char *path,
-                                 const char *proxy, const char *no_proxy,
-                                 int use_ssl, STACK_OF(CONF_VALUE) *headers,
-                                 int req_timeout)
+    const char *port, const char *path,
+    const char *proxy, const char *no_proxy,
+    int use_ssl, STACK_OF(CONF_VALUE) *headers,
+    int req_timeout)
 {
     SSL_CTX *ctx = NULL;
     OCSP_RESPONSE *resp = NULL;
@@ -1247,15 +1302,15 @@ OCSP_RESPONSE *process_responder(OCSP_REQUEST *req, const char *host,
 
     resp = (OCSP_RESPONSE *)
         app_http_post_asn1(host, port, path, proxy, no_proxy,
-                           ctx, headers, "application/ocsp-request",
-                           (ASN1_VALUE *)req, ASN1_ITEM_rptr(OCSP_REQUEST),
-                           "application/ocsp-response",
-                           req_timeout, ASN1_ITEM_rptr(OCSP_RESPONSE));
+            ctx, headers, "application/ocsp-request",
+            (ASN1_VALUE *)req, ASN1_ITEM_rptr(OCSP_REQUEST),
+            "application/ocsp-response",
+            req_timeout, ASN1_ITEM_rptr(OCSP_RESPONSE));
 
     if (resp == NULL)
         BIO_printf(bio_err, "Error querying OCSP responder\n");
 
- end:
+end:
     SSL_CTX_free(ctx);
     return resp;
 }
diff --git a/apps/openssl.c b/apps/openssl.c
index cbd3476b32b66..01ff8e2497200 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -21,12 +21,12 @@
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #ifndef OPENSSL_NO_ENGINE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include <openssl/err.h>
 /* Needed to get the other O_xxx flags. */
 #ifdef OPENSSL_SYS_VMS
-# include <unixio.h>
+#include <unixio.h>
 #endif
 #include "apps.h"
 #include "progs.h"
@@ -49,7 +49,7 @@ static void warn_deprecated(const FUNCTION *fp)
 {
     if (fp->deprecated_version != NULL)
         BIO_printf(bio_err, "The command %s was deprecated in version %s.",
-                   fp->name, fp->deprecated_version);
+            fp->name, fp->deprecated_version);
     else
         BIO_printf(bio_err, "The command %s is deprecated.", fp->name);
     if (strcmp(fp->deprecated_alternative, DEPRECATED_NO_ALTERNATIVE) != 0)
@@ -66,7 +66,8 @@ static int apps_startup(void)
 
     /* Set non-default library initialisation settings */
     if (!OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN
-                          | OPENSSL_INIT_LOAD_CONFIG, NULL))
+                | OPENSSL_INIT_LOAD_CONFIG,
+            NULL))
         return 0;
 
     (void)setup_ui_method();
@@ -96,15 +97,14 @@ static void apps_shutdown(void)
     destroy_ui_method();
 }
 
-
 #ifndef OPENSSL_NO_TRACE
 typedef struct tracedata_st {
     BIO *bio;
-    unsigned int ingroup:1;
+    unsigned int ingroup : 1;
 } tracedata;
 
 static size_t internal_trace_cb(const char *buf, size_t cnt,
-                                int category, int cmd, void *vdata)
+    int category, int cmd, void *vdata)
 {
     int ret = 0;
     tracedata *trace_data = vdata;
@@ -122,8 +122,8 @@ static size_t internal_trace_cb(const char *buf, size_t cnt,
         tid = CRYPTO_THREAD_get_current_id();
         hex = OPENSSL_buf2hexstr((const unsigned char *)&tid, sizeof(tid));
         BIO_snprintf(buffer, sizeof(buffer), "TRACE[%s]:%s: ",
-                     hex == NULL ? "<null>" : hex,
-                     OSSL_trace_get_category_name(category));
+            hex == NULL ? "<null>" : hex,
+            OSSL_trace_get_category_name(category));
         OPENSSL_free(hex);
         BIO_set_prefix(trace_data->bio, buffer);
         break;
@@ -181,12 +181,13 @@ static void setup_trace_category(int category)
         || bio == NULL
         || (trace_data->bio = channel) == NULL
         || OSSL_trace_set_callback(category, internal_trace_cb,
-                                   trace_data) == 0
+               trace_data)
+            == 0
         || sk_tracedata_push(trace_data_stack, trace_data) == 0) {
 
         fprintf(stderr,
-                "warning: unable to setup trace callback for category '%s'.\n",
-                OSSL_trace_get_category_name(category));
+            "warning: unable to setup trace callback for category '%s'.\n",
+            OSSL_trace_get_category_name(category));
 
         OSSL_trace_set_callback(category, NULL, NULL);
         BIO_free_all(channel);
@@ -222,7 +223,7 @@ static void setup_trace(const char *str)
                 setup_trace_category(category);
             } else {
                 fprintf(stderr,
-                        "warning: unknown trace category: '%s'.\n", item);
+                    "warning: unknown trace category: '%s'.\n", item);
             }
         }
     }
@@ -265,10 +266,10 @@ int main(int argc, char *argv[])
 #endif
 
     if ((fname = "apps_startup", !apps_startup())
-            || (fname = "prog_init", (prog = prog_init()) == NULL)) {
+        || (fname = "prog_init", (prog = prog_init()) == NULL)) {
         BIO_printf(bio_err,
-                   "FATAL: Startup failure (dev note: %s()) for %s\n",
-                   fname, argv[0]);
+            "FATAL: Startup failure (dev note: %s()) for %s\n",
+            fname, argv[0]);
         ERR_print_errors(bio_err);
         ret = 1;
         goto end;
@@ -293,7 +294,8 @@ int main(int argc, char *argv[])
 
         argc--;
         argv++;
-        opt_appname(argc == 1 || global_help ? "help" : global_version ? "version" : argv[0]);
+        opt_appname(argc == 1 || global_help ? "help" : global_version ? "version"
+                                                                       : argv[0]);
     } else {
         argv[0] = pname;
     }
@@ -302,13 +304,13 @@ int main(int argc, char *argv[])
      * If there's no command, assume "help". If there's an override for help
      * or version run those, otherwise run the command given.
      */
-    ret =  (argc == 0) || global_help
-            ? do_cmd(prog, 1, help_argv)
-            : global_version
-                ? do_cmd(prog, 1, version_argv)
-                : do_cmd(prog, argc, argv);
+    ret = (argc == 0) || global_help
+        ? do_cmd(prog, 1, help_argv)
+        : global_version
+        ? do_cmd(prog, 1, version_argv)
+        : do_cmd(prog, argc, argv);
 
- end:
+end:
     OPENSSL_free(default_config_file);
     lh_FUNCTION_free(prog);
     OPENSSL_free(arg.argv);
@@ -323,18 +325,20 @@ int main(int argc, char *argv[])
 }
 
 typedef enum HELP_CHOICE {
-    OPT_hERR = -1, OPT_hEOF = 0, OPT_hHELP
+    OPT_hERR = -1,
+    OPT_hEOF = 0,
+    OPT_hHELP
 } HELP_CHOICE;
 
 const OPTIONS help_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: help [options] [command]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: help [options] [command]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_hHELP, '-', "Display this summary"},
+    { "help", OPT_hHELP, '-', "Display this summary" },
 
     OPT_PARAMETERS(),
-    {"command", 0, 0, "Name of command to display help (optional)"},
-    {NULL}
+    { "command", 0, 0, "Name of command to display help (optional)" },
+    { NULL }
 };
 
 int help_main(int argc, char **argv)
@@ -389,11 +393,11 @@ int help_main(int argc, char **argv)
             if (tp == FT_md) {
                 i = 1;
                 BIO_printf(bio_err,
-                           "\nMessage Digest commands (see the `dgst' command for more details)\n");
+                    "\nMessage Digest commands (see the `dgst' command for more details)\n");
             } else if (tp == FT_cipher) {
                 i = 1;
                 BIO_printf(bio_err,
-                           "\nCipher commands (see the `enc' command for more details)\n");
+                    "\nCipher commands (see the `enc' command for more details)\n");
             }
         }
         BIO_printf(bio_err, "%-*s", dc.width, fp->name);
@@ -442,7 +446,7 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
     }
 
     BIO_printf(bio_err, "Invalid command '%s'; type \"help\" for a list.\n",
-               argv[0]);
+        argv[0]);
     return 1;
 }
 
diff --git a/apps/passwd.c b/apps/passwd.c
index 8b233538d87b4..fd4725b2a4304 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -17,7 +17,7 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_DEPRECATED_3_0)
-# include <openssl/des.h>
+#include <openssl/des.h>
 #endif
 #include <openssl/md5.h>
 #include <openssl/sha.h>
@@ -46,48 +46,58 @@ typedef enum {
 } passwd_modes;
 
 static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
-                     char *passwd, BIO *out, int quiet, int table,
-                     int reverse, size_t pw_maxlen, passwd_modes mode);
+    char *passwd, BIO *out, int quiet, int table,
+    int reverse, size_t pw_maxlen, passwd_modes mode);
 
 typedef enum OPTION_choice {
     OPT_COMMON,
     OPT_IN,
-    OPT_NOVERIFY, OPT_QUIET, OPT_TABLE, OPT_REVERSE, OPT_APR1,
-    OPT_1, OPT_5, OPT_6, OPT_AIXMD5, OPT_SALT, OPT_STDIN,
-    OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_NOVERIFY,
+    OPT_QUIET,
+    OPT_TABLE,
+    OPT_REVERSE,
+    OPT_APR1,
+    OPT_1,
+    OPT_5,
+    OPT_6,
+    OPT_AIXMD5,
+    OPT_SALT,
+    OPT_STDIN,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS passwd_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [password]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [password]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Read passwords from file"},
-    {"noverify", OPT_NOVERIFY, '-',
-     "Never verify when reading password from terminal"},
-    {"stdin", OPT_STDIN, '-', "Read passwords from stdin"},
+    { "in", OPT_IN, '<', "Read passwords from file" },
+    { "noverify", OPT_NOVERIFY, '-',
+        "Never verify when reading password from terminal" },
+    { "stdin", OPT_STDIN, '-', "Read passwords from stdin" },
 
     OPT_SECTION("Output"),
-    {"quiet", OPT_QUIET, '-', "No warnings"},
-    {"table", OPT_TABLE, '-', "Format output as table"},
-    {"reverse", OPT_REVERSE, '-', "Switch table columns"},
+    { "quiet", OPT_QUIET, '-', "No warnings" },
+    { "table", OPT_TABLE, '-', "Format output as table" },
+    { "reverse", OPT_REVERSE, '-', "Switch table columns" },
 
     OPT_SECTION("Cryptographic"),
-    {"salt", OPT_SALT, 's', "Use provided salt"},
-    {"6", OPT_6, '-', "SHA512-based password algorithm"},
-    {"5", OPT_5, '-', "SHA256-based password algorithm"},
-    {"apr1", OPT_APR1, '-', "MD5-based password algorithm, Apache variant"},
-    {"1", OPT_1, '-', "MD5-based password algorithm"},
-    {"aixmd5", OPT_AIXMD5, '-', "AIX MD5-based password algorithm"},
+    { "salt", OPT_SALT, 's', "Use provided salt" },
+    { "6", OPT_6, '-', "SHA512-based password algorithm" },
+    { "5", OPT_5, '-', "SHA256-based password algorithm" },
+    { "apr1", OPT_APR1, '-', "MD5-based password algorithm, Apache variant" },
+    { "1", OPT_1, '-', "MD5-based password algorithm" },
+    { "aixmd5", OPT_AIXMD5, '-', "AIX MD5-based password algorithm" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"password", 0, 0, "Password text to digest (optional)"},
-    {NULL}
+    { "password", 0, 0, "Password text to digest (optional)" },
+    { NULL }
 };
 
 int passwd_main(int argc, char **argv)
@@ -112,7 +122,7 @@ int passwd_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -223,8 +233,7 @@ int passwd_main(int argc, char **argv)
 
         passwd_malloc_size = pw_maxlen + 2;
         /* longer than necessary so that we can warn about truncation */
-        passwd = passwd_malloc =
-            app_malloc(passwd_malloc_size, "password buffer");
+        passwd = passwd_malloc = app_malloc(passwd_malloc_size, "password buffer");
     }
 
     if ((in == NULL) && (passwds == NULL)) {
@@ -240,9 +249,9 @@ int passwd_main(int argc, char **argv)
 
             passwds = passwds_static;
             if (in == NULL) {
-                if (EVP_read_pw_string
-                    (passwd_malloc, passwd_malloc_size, "Password: ",
-                     !(passed_salt || in_noverify)) != 0)
+                if (EVP_read_pw_string(passwd_malloc, passwd_malloc_size, "Password: ",
+                        !(passed_salt || in_noverify))
+                    != 0)
                     goto end;
             }
             passwds[0] = passwd_malloc;
@@ -257,10 +266,10 @@ int passwd_main(int argc, char **argv)
         assert(passwds != NULL);
         assert(*passwds != NULL);
 
-        do {                    /* loop over list of passwords */
+        do { /* loop over list of passwords */
             passwd = *passwds++;
             if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, bio_out,
-                           quiet, table, reverse, pw_maxlen, mode))
+                    quiet, table, reverse, pw_maxlen, mode))
                 goto end;
         } while (*passwds != NULL);
     } else {
@@ -273,7 +282,7 @@ int passwd_main(int argc, char **argv)
             if (r > 0) {
                 char *c = (strchr(passwd, '\n'));
                 if (c != NULL) {
-                    *c = 0;     /* truncate at newline */
+                    *c = 0; /* truncate at newline */
                 } else {
                     /* ignore rest of line */
                     char trash[BUFSIZ];
@@ -282,9 +291,8 @@ int passwd_main(int argc, char **argv)
                     while ((r > 0) && (!strchr(trash, '\n')));
                 }
 
-                if (!do_passwd
-                    (passed_salt, &salt, &salt_malloc, passwd, bio_out, quiet,
-                     table, reverse, pw_maxlen, mode))
+                if (!do_passwd(passed_salt, &salt, &salt_malloc, passwd, bio_out, quiet,
+                        table, reverse, pw_maxlen, mode))
                     goto end;
             }
             done = (r <= 0);
@@ -292,7 +300,7 @@ int passwd_main(int argc, char **argv)
     }
     ret = 0;
 
- end:
+end:
 #if 0
     ERR_print_errors(bio_err);
 #endif
@@ -316,8 +324,8 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
     /* "$apr1$..salt..$.......md5hash..........\0" */
     static char out_buf[6 + 9 + 24 + 2];
     unsigned char buf[MD5_DIGEST_LENGTH];
-    char ascii_magic[5];         /* "apr1" plus '\0' */
-    char ascii_salt[9];          /* Max 8 chars plus '\0' */
+    char ascii_magic[5]; /* "apr1" plus '\0' */
+    char ascii_salt[9]; /* Max 8 chars plus '\0' */
     char *ascii_passwd = NULL;
     char *salt_out;
     int n;
@@ -331,7 +339,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
     magic_len = strlen(magic);
     OPENSSL_strlcpy(ascii_magic, magic, sizeof(ascii_magic));
 #ifdef CHARSET_EBCDIC
-    if ((magic[0] & 0x80) != 0)    /* High bit is 1 in EBCDIC alnums */
+    if ((magic[0] & 0x80) != 0) /* High bit is 1 in EBCDIC alnums */
         ebcdic2ascii(ascii_magic, ascii_magic, magic_len);
 #endif
 
@@ -353,7 +361,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
     if (magic_len > 0) {
         OPENSSL_strlcat(out_buf, ascii_dollar, sizeof(out_buf));
 
-        if (magic_len > 4)    /* assert it's  "1" or "apr1" */
+        if (magic_len > 4) /* assert it's  "1" or "apr1" */
             goto err;
 
         OPENSSL_strlcat(out_buf, ascii_magic, sizeof(out_buf));
@@ -381,7 +389,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
         if (!EVP_DigestUpdate(md, ascii_dollar, 1)
             || !EVP_DigestUpdate(md, ascii_magic, magic_len)
             || !EVP_DigestUpdate(md, ascii_dollar, 1))
-          goto err;
+            goto err;
 
     if (!EVP_DigestUpdate(md, ascii_salt, salt_len))
         goto err;
@@ -415,8 +423,8 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
         if (!EVP_DigestInit_ex(md2, EVP_md5(), NULL))
             goto err;
         if (!EVP_DigestUpdate(md2,
-                              (i & 1) ? (const unsigned char *)passwd : buf,
-                              (i & 1) ? passwd_len : sizeof(buf)))
+                (i & 1) ? (const unsigned char *)passwd : buf,
+                (i & 1) ? passwd_len : sizeof(buf)))
             goto err;
         if (i % 3) {
             if (!EVP_DigestUpdate(md2, ascii_salt, salt_len))
@@ -427,11 +435,11 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
                 goto err;
         }
         if (!EVP_DigestUpdate(md2,
-                              (i & 1) ? buf : (const unsigned char *)passwd,
-                              (i & 1) ? sizeof(buf) : passwd_len))
-                goto err;
+                (i & 1) ? buf : (const unsigned char *)passwd,
+                (i & 1) ? sizeof(buf) : passwd_len))
+            goto err;
         if (!EVP_DigestFinal_ex(md2, buf, NULL))
-                goto err;
+            goto err;
     }
     EVP_MD_CTX_free(md2);
     EVP_MD_CTX_free(md);
@@ -446,14 +454,14 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 
         /* silly output permutation */
         for (dest = 0, source = 0; dest < 14;
-             dest++, source = (source + 6) % 17)
+            dest++, source = (source + 6) % 17)
             buf_perm[dest] = buf[source];
         buf_perm[14] = buf[5];
         buf_perm[15] = buf[11];
-# ifndef PEDANTIC              /* Unfortunately, this generates a "no
-                                 * effect" warning */
+#ifndef PEDANTIC /* Unfortunately, this generates a "no \
+                  * effect" warning */
         assert(16 == sizeof(buf_perm));
-# endif
+#endif
 
         output = salt_out + salt_len;
         assert(output == out_buf + strlen(out_buf));
@@ -462,10 +470,8 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 
         for (i = 0; i < 15; i += 3) {
             *output++ = cov_2char[buf_perm[i + 2] & 0x3f];
-            *output++ = cov_2char[((buf_perm[i + 1] & 0xf) << 2) |
-                                  (buf_perm[i + 2] >> 6)];
-            *output++ = cov_2char[((buf_perm[i] & 3) << 4) |
-                                  (buf_perm[i + 1] >> 4)];
+            *output++ = cov_2char[((buf_perm[i + 1] & 0xf) << 2) | (buf_perm[i + 2] >> 6)];
+            *output++ = cov_2char[((buf_perm[i] & 3) << 4) | (buf_perm[i + 1] >> 4)];
             *output++ = cov_2char[buf_perm[i] >> 2];
         }
         assert(i == 15);
@@ -480,7 +486,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 
     return out_buf;
 
- err:
+err:
     OPENSSL_free(ascii_passwd);
     EVP_MD_CTX_free(md2);
     EVP_MD_CTX_free(md);
@@ -497,13 +503,13 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
     /* Prefix for optional rounds specification.  */
     static const char rounds_prefix[] = "rounds=";
     /* Maximum salt string length.  */
-# define SALT_LEN_MAX 16
+#define SALT_LEN_MAX 16
     /* Default number of rounds if not explicitly specified.  */
-# define ROUNDS_DEFAULT 5000
+#define ROUNDS_DEFAULT 5000
     /* Minimum number of rounds.  */
-# define ROUNDS_MIN 1000
+#define ROUNDS_MIN 1000
     /* Maximum number of rounds.  */
-# define ROUNDS_MAX 999999999
+#define ROUNDS_MAX 999999999
 
     /* "$6$rounds=<N>$......salt......$...shahash(up to 86 chars)...\0" */
     static char out_buf[3 + 17 + 17 + 86 + 1];
@@ -511,13 +517,13 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
     unsigned char temp_buf[SHA512_DIGEST_LENGTH];
     size_t buf_size = 0;
     char ascii_magic[2];
-    char ascii_salt[17];          /* Max 16 chars plus '\0' */
+    char ascii_salt[17]; /* Max 16 chars plus '\0' */
     char *ascii_passwd = NULL;
     size_t n;
     EVP_MD_CTX *md = NULL, *md2 = NULL;
     const EVP_MD *sha = NULL;
     size_t passwd_len, salt_len, magic_len;
-    unsigned int rounds = ROUNDS_DEFAULT;        /* Default */
+    unsigned int rounds = ROUNDS_DEFAULT; /* Default */
     char rounds_custom = 0;
     char *p_bytes = NULL;
     char *s_bytes = NULL;
@@ -546,7 +552,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
     if (strncmp(salt, rounds_prefix, sizeof(rounds_prefix) - 1) == 0) {
         const char *num = salt + sizeof(rounds_prefix) - 1;
         char *endp;
-        unsigned long int srounds = strtoul (num, &endp, 10);
+        unsigned long int srounds = strtoul(num, &endp, 10);
         if (*endp == '$') {
             salt = endp + 1;
             if (srounds > ROUNDS_MAX)
@@ -563,7 +569,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
 
     OPENSSL_strlcpy(ascii_magic, magic, sizeof(ascii_magic));
 #ifdef CHARSET_EBCDIC
-    if ((magic[0] & 0x80) != 0)    /* High bit is 1 in EBCDIC alnums */
+    if ((magic[0] & 0x80) != 0) /* High bit is 1 in EBCDIC alnums */
         ebcdic2ascii(ascii_magic, ascii_magic, magic_len);
 #endif
 
@@ -592,7 +598,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
         BIO_snprintf(tmp_buf, sizeof(tmp_buf), "rounds=%u", rounds);
 #ifdef CHARSET_EBCDIC
         /* In case we're really on a ASCII based platform and just pretend */
-        if (tmp_buf[0] != 0x72)  /* ASCII 'r' */
+        if (tmp_buf[0] != 0x72) /* ASCII 'r' */
             ebcdic2ascii(tmp_buf, tmp_buf, strlen(tmp_buf));
 #endif
         OPENSSL_strlcat(out_buf, tmp_buf, sizeof(out_buf));
@@ -630,8 +636,8 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
     n = passwd_len;
     while (n) {
         if (!EVP_DigestUpdate(md,
-                              (n & 1) ? buf : (const unsigned char *)passwd,
-                              (n & 1) ? buf_size : passwd_len))
+                (n & 1) ? buf : (const unsigned char *)passwd,
+                (n & 1) ? buf_size : passwd_len))
             goto err;
         n >>= 1;
     }
@@ -676,8 +682,8 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
         if (!EVP_DigestInit_ex(md2, sha, NULL))
             goto err;
         if (!EVP_DigestUpdate(md2,
-                              (n & 1) ? (const unsigned char *)p_bytes : buf,
-                              (n & 1) ? passwd_len : buf_size))
+                (n & 1) ? (const unsigned char *)p_bytes : buf,
+                (n & 1) ? passwd_len : buf_size))
             goto err;
         if (n % 3) {
             if (!EVP_DigestUpdate(md2, s_bytes, salt_len))
@@ -688,11 +694,11 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
                 goto err;
         }
         if (!EVP_DigestUpdate(md2,
-                              (n & 1) ? buf : (const unsigned char *)p_bytes,
-                              (n & 1) ? buf_size : passwd_len))
-                goto err;
+                (n & 1) ? buf : (const unsigned char *)p_bytes,
+                (n & 1) ? buf_size : passwd_len))
+            goto err;
         if (!EVP_DigestFinal_ex(md2, buf, NULL))
-                goto err;
+            goto err;
     }
     EVP_MD_CTX_free(md2);
     EVP_MD_CTX_free(md);
@@ -706,53 +712,53 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
     cp = out_buf + strlen(out_buf);
     *cp++ = ascii_dollar[0];
 
-# define b64_from_24bit(B2, B1, B0, N)                                  \
-    do {                                                                \
-        unsigned int w = ((B2) << 16) | ((B1) << 8) | (B0);             \
-        int i = (N);                                                    \
-        while (i-- > 0) {                                               \
-            *cp++ = cov_2char[w & 0x3f];                                \
-            w >>= 6;                                                    \
-        }                                                               \
+#define b64_from_24bit(B2, B1, B0, N)                       \
+    do {                                                    \
+        unsigned int w = ((B2) << 16) | ((B1) << 8) | (B0); \
+        int i = (N);                                        \
+        while (i-- > 0) {                                   \
+            *cp++ = cov_2char[w & 0x3f];                    \
+            w >>= 6;                                        \
+        }                                                   \
     } while (0)
 
     switch (magic[0]) {
     case '5':
-        b64_from_24bit (buf[0], buf[10], buf[20], 4);
-        b64_from_24bit (buf[21], buf[1], buf[11], 4);
-        b64_from_24bit (buf[12], buf[22], buf[2], 4);
-        b64_from_24bit (buf[3], buf[13], buf[23], 4);
-        b64_from_24bit (buf[24], buf[4], buf[14], 4);
-        b64_from_24bit (buf[15], buf[25], buf[5], 4);
-        b64_from_24bit (buf[6], buf[16], buf[26], 4);
-        b64_from_24bit (buf[27], buf[7], buf[17], 4);
-        b64_from_24bit (buf[18], buf[28], buf[8], 4);
-        b64_from_24bit (buf[9], buf[19], buf[29], 4);
-        b64_from_24bit (0, buf[31], buf[30], 3);
+        b64_from_24bit(buf[0], buf[10], buf[20], 4);
+        b64_from_24bit(buf[21], buf[1], buf[11], 4);
+        b64_from_24bit(buf[12], buf[22], buf[2], 4);
+        b64_from_24bit(buf[3], buf[13], buf[23], 4);
+        b64_from_24bit(buf[24], buf[4], buf[14], 4);
+        b64_from_24bit(buf[15], buf[25], buf[5], 4);
+        b64_from_24bit(buf[6], buf[16], buf[26], 4);
+        b64_from_24bit(buf[27], buf[7], buf[17], 4);
+        b64_from_24bit(buf[18], buf[28], buf[8], 4);
+        b64_from_24bit(buf[9], buf[19], buf[29], 4);
+        b64_from_24bit(0, buf[31], buf[30], 3);
         break;
     case '6':
-        b64_from_24bit (buf[0], buf[21], buf[42], 4);
-        b64_from_24bit (buf[22], buf[43], buf[1], 4);
-        b64_from_24bit (buf[44], buf[2], buf[23], 4);
-        b64_from_24bit (buf[3], buf[24], buf[45], 4);
-        b64_from_24bit (buf[25], buf[46], buf[4], 4);
-        b64_from_24bit (buf[47], buf[5], buf[26], 4);
-        b64_from_24bit (buf[6], buf[27], buf[48], 4);
-        b64_from_24bit (buf[28], buf[49], buf[7], 4);
-        b64_from_24bit (buf[50], buf[8], buf[29], 4);
-        b64_from_24bit (buf[9], buf[30], buf[51], 4);
-        b64_from_24bit (buf[31], buf[52], buf[10], 4);
-        b64_from_24bit (buf[53], buf[11], buf[32], 4);
-        b64_from_24bit (buf[12], buf[33], buf[54], 4);
-        b64_from_24bit (buf[34], buf[55], buf[13], 4);
-        b64_from_24bit (buf[56], buf[14], buf[35], 4);
-        b64_from_24bit (buf[15], buf[36], buf[57], 4);
-        b64_from_24bit (buf[37], buf[58], buf[16], 4);
-        b64_from_24bit (buf[59], buf[17], buf[38], 4);
-        b64_from_24bit (buf[18], buf[39], buf[60], 4);
-        b64_from_24bit (buf[40], buf[61], buf[19], 4);
-        b64_from_24bit (buf[62], buf[20], buf[41], 4);
-        b64_from_24bit (0, 0, buf[63], 2);
+        b64_from_24bit(buf[0], buf[21], buf[42], 4);
+        b64_from_24bit(buf[22], buf[43], buf[1], 4);
+        b64_from_24bit(buf[44], buf[2], buf[23], 4);
+        b64_from_24bit(buf[3], buf[24], buf[45], 4);
+        b64_from_24bit(buf[25], buf[46], buf[4], 4);
+        b64_from_24bit(buf[47], buf[5], buf[26], 4);
+        b64_from_24bit(buf[6], buf[27], buf[48], 4);
+        b64_from_24bit(buf[28], buf[49], buf[7], 4);
+        b64_from_24bit(buf[50], buf[8], buf[29], 4);
+        b64_from_24bit(buf[9], buf[30], buf[51], 4);
+        b64_from_24bit(buf[31], buf[52], buf[10], 4);
+        b64_from_24bit(buf[53], buf[11], buf[32], 4);
+        b64_from_24bit(buf[12], buf[33], buf[54], 4);
+        b64_from_24bit(buf[34], buf[55], buf[13], 4);
+        b64_from_24bit(buf[56], buf[14], buf[35], 4);
+        b64_from_24bit(buf[15], buf[36], buf[57], 4);
+        b64_from_24bit(buf[37], buf[58], buf[16], 4);
+        b64_from_24bit(buf[59], buf[17], buf[38], 4);
+        b64_from_24bit(buf[18], buf[39], buf[60], 4);
+        b64_from_24bit(buf[40], buf[61], buf[19], 4);
+        b64_from_24bit(buf[62], buf[20], buf[41], 4);
+        b64_from_24bit(0, 0, buf[63], 2);
         break;
     default:
         goto err;
@@ -764,7 +770,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
 
     return out_buf;
 
- err:
+err:
     EVP_MD_CTX_free(md2);
     EVP_MD_CTX_free(md);
     OPENSSL_free(p_bytes);
@@ -774,8 +780,8 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
 }
 
 static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
-                     char *passwd, BIO *out, int quiet, int table,
-                     int reverse, size_t pw_maxlen, passwd_modes mode)
+    char *passwd, BIO *out, int quiet, int table,
+    int reverse, size_t pw_maxlen, passwd_modes mode)
 {
     char *hash = NULL;
 
@@ -803,10 +809,10 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
         for (i = 0; i < saltlen; i++)
             (*salt_p)[i] = cov_2char[(*salt_p)[i] & 0x3f]; /* 6 bits */
         (*salt_p)[i] = 0;
-# ifdef CHARSET_EBCDIC
+#ifdef CHARSET_EBCDIC
         /* The password encryption function will convert back to ASCII */
         ascii2ebcdic(*salt_p, *salt_p, saltlen);
-# endif
+#endif
     }
 
     assert(*salt_p != NULL);
@@ -818,8 +824,8 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
              * XXX: really we should know how to print a size_t, not cast it
              */
             BIO_printf(bio_err,
-                       "Warning: truncating password to %u characters\n",
-                       (unsigned)pw_maxlen);
+                "Warning: truncating password to %u characters\n",
+                (unsigned)pw_maxlen);
         passwd[pw_maxlen] = 0;
     }
     assert(strlen(passwd) <= pw_maxlen);
@@ -841,6 +847,6 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
         BIO_printf(out, "%s\n", hash);
     return 1;
 
- end:
+end:
     return 0;
 }
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 9964faf21aae6..2c83e43845d2b 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -23,11 +23,11 @@
 #include <openssl/kdf.h>
 #include <openssl/rand.h>
 
-#define NOKEYS          0x1
-#define NOCERTS         0x2
-#define INFO            0x4
-#define CLCERTS         0x8
-#define CACERTS         0x10
+#define NOKEYS 0x1
+#define NOCERTS 0x2
+#define INFO 0x4
+#define CLCERTS 0x8
+#define CACERTS 0x10
 
 #define PASSWD_BUF_SIZE 2048
 
@@ -37,20 +37,20 @@
     BIO_printf(bio_err, "Warning: -%s option ignored without -export\n", opt);
 
 static int get_cert_chain(X509 *cert, X509_STORE *store,
-                          STACK_OF(X509) *untrusted_certs,
-                          STACK_OF(X509) **chain);
+    STACK_OF(X509) *untrusted_certs,
+    STACK_OF(X509) **chain);
 int dump_certs_keys_p12(BIO *out, const PKCS12 *p12,
-                        const char *pass, int passlen, int options,
-                        char *pempass, const EVP_CIPHER *enc);
+    const char *pass, int passlen, int options,
+    char *pempass, const EVP_CIPHER *enc);
 int dump_certs_pkeys_bags(BIO *out, const STACK_OF(PKCS12_SAFEBAG) *bags,
-                          const char *pass, int passlen, int options,
-                          char *pempass, const EVP_CIPHER *enc);
+    const char *pass, int passlen, int options,
+    char *pempass, const EVP_CIPHER *enc);
 int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bags,
-                         const char *pass, int passlen,
-                         int options, char *pempass, const EVP_CIPHER *enc);
+    const char *pass, int passlen,
+    int options, char *pempass, const EVP_CIPHER *enc);
 void print_attribute(BIO *out, const ASN1_TYPE *av);
 int print_attribs(BIO *out, const STACK_OF(X509_ATTRIBUTE) *attrlst,
-                  const char *name);
+    const char *name);
 void hex_prin(BIO *out, unsigned char *buf, int len);
 static int alg_print(const X509_ALGOR *alg);
 int cert_load(BIO *in, STACK_OF(X509) *sk);
@@ -59,18 +59,58 @@ static int jdk_trust(PKCS12_SAFEBAG *bag, void *cbarg);
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_CIPHER, OPT_NOKEYS, OPT_KEYEX, OPT_KEYSIG, OPT_NOCERTS, OPT_CLCERTS,
-    OPT_CACERTS, OPT_NOOUT, OPT_INFO, OPT_CHAIN, OPT_TWOPASS, OPT_NOMACVER,
+    OPT_CIPHER,
+    OPT_NOKEYS,
+    OPT_KEYEX,
+    OPT_KEYSIG,
+    OPT_NOCERTS,
+    OPT_CLCERTS,
+    OPT_CACERTS,
+    OPT_NOOUT,
+    OPT_INFO,
+    OPT_CHAIN,
+    OPT_TWOPASS,
+    OPT_NOMACVER,
 #ifndef OPENSSL_NO_DES
     OPT_DESCERT,
 #endif
-    OPT_EXPORT, OPT_ITER, OPT_NOITER, OPT_MACITER, OPT_NOMACITER, OPT_MACSALTLEN,
-    OPT_NOMAC, OPT_LMK, OPT_NODES, OPT_NOENC, OPT_MACALG, OPT_CERTPBE, OPT_KEYPBE,
-    OPT_INKEY, OPT_CERTFILE, OPT_UNTRUSTED, OPT_PASSCERTS,
-    OPT_NAME, OPT_CSP, OPT_CANAME,
-    OPT_IN, OPT_OUT, OPT_PASSIN, OPT_PASSOUT, OPT_PASSWORD, OPT_CAPATH,
-    OPT_CAFILE, OPT_CASTORE, OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE, OPT_ENGINE,
-    OPT_R_ENUM, OPT_PROV_ENUM, OPT_JDKTRUST, OPT_PBMAC1_PBKDF2, OPT_PBMAC1_PBKDF2_MD,
+    OPT_EXPORT,
+    OPT_ITER,
+    OPT_NOITER,
+    OPT_MACITER,
+    OPT_NOMACITER,
+    OPT_MACSALTLEN,
+    OPT_NOMAC,
+    OPT_LMK,
+    OPT_NODES,
+    OPT_NOENC,
+    OPT_MACALG,
+    OPT_CERTPBE,
+    OPT_KEYPBE,
+    OPT_INKEY,
+    OPT_CERTFILE,
+    OPT_UNTRUSTED,
+    OPT_PASSCERTS,
+    OPT_NAME,
+    OPT_CSP,
+    OPT_CANAME,
+    OPT_IN,
+    OPT_OUT,
+    OPT_PASSIN,
+    OPT_PASSOUT,
+    OPT_PASSWORD,
+    OPT_CAPATH,
+    OPT_CAFILE,
+    OPT_CASTORE,
+    OPT_NOCAPATH,
+    OPT_NOCAFILE,
+    OPT_NOCASTORE,
+    OPT_ENGINE,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM,
+    OPT_JDKTRUST,
+    OPT_PBMAC1_PBKDF2,
+    OPT_PBMAC1_PBKDF2_MD,
 #ifndef OPENSSL_NO_DES
     OPT_LEGACY_ALG
 #endif
@@ -78,85 +118,85 @@ typedef enum OPTION_choice {
 
 const OPTIONS pkcs12_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"in", OPT_IN, '<', "Input file"},
-    {"out", OPT_OUT, '>', "Output file"},
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
-    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
-    {"password", OPT_PASSWORD, 's', "Set PKCS#12 import/export password source"},
-    {"twopass", OPT_TWOPASS, '-', "Separate MAC, encryption passwords"},
-    {"nokeys", OPT_NOKEYS, '-', "Don't output private keys"},
-    {"nocerts", OPT_NOCERTS, '-', "Don't output certificates"},
-    {"noout", OPT_NOOUT, '-', "Don't output anything, just verify PKCS#12 input"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "in", OPT_IN, '<', "Input file" },
+    { "out", OPT_OUT, '>', "Output file" },
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+    { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
+    { "password", OPT_PASSWORD, 's', "Set PKCS#12 import/export password source" },
+    { "twopass", OPT_TWOPASS, '-', "Separate MAC, encryption passwords" },
+    { "nokeys", OPT_NOKEYS, '-', "Don't output private keys" },
+    { "nocerts", OPT_NOCERTS, '-', "Don't output certificates" },
+    { "noout", OPT_NOOUT, '-', "Don't output anything, just verify PKCS#12 input" },
 #ifndef OPENSSL_NO_DES
-    {"legacy", OPT_LEGACY_ALG, '-',
-# ifdef OPENSSL_NO_RC2
-     "Use legacy encryption algorithm 3DES_CBC for keys and certs"
-# else
-     "Use legacy encryption: 3DES_CBC for keys, RC2_CBC for certs"
-# endif
+    { "legacy", OPT_LEGACY_ALG, '-',
+#ifdef OPENSSL_NO_RC2
+        "Use legacy encryption algorithm 3DES_CBC for keys and certs"
+#else
+        "Use legacy encryption: 3DES_CBC for keys, RC2_CBC for certs"
+#endif
     },
 #endif
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
     OPT_PROV_OPTIONS,
     OPT_R_OPTIONS,
 
     OPT_SECTION("PKCS#12 import (parsing PKCS#12)"),
-    {"info", OPT_INFO, '-', "Print info about PKCS#12 structure"},
-    {"nomacver", OPT_NOMACVER, '-', "Don't verify integrity MAC"},
-    {"clcerts", OPT_CLCERTS, '-', "Only output client certificates"},
-    {"cacerts", OPT_CACERTS, '-', "Only output CA certificates"},
-    {"", OPT_CIPHER, '-', "Any supported cipher for output encryption"},
-    {"noenc", OPT_NOENC, '-', "Don't encrypt private keys"},
-    {"nodes", OPT_NODES, '-', "Don't encrypt private keys; deprecated"},
+    { "info", OPT_INFO, '-', "Print info about PKCS#12 structure" },
+    { "nomacver", OPT_NOMACVER, '-', "Don't verify integrity MAC" },
+    { "clcerts", OPT_CLCERTS, '-', "Only output client certificates" },
+    { "cacerts", OPT_CACERTS, '-', "Only output CA certificates" },
+    { "", OPT_CIPHER, '-', "Any supported cipher for output encryption" },
+    { "noenc", OPT_NOENC, '-', "Don't encrypt private keys" },
+    { "nodes", OPT_NODES, '-', "Don't encrypt private keys; deprecated" },
 
     OPT_SECTION("PKCS#12 output (export)"),
-    {"export", OPT_EXPORT, '-', "Create PKCS12 file"},
-    {"inkey", OPT_INKEY, 's', "Private key, else read from -in input file"},
-    {"certfile", OPT_CERTFILE, '<', "Extra certificates for PKCS12 output"},
-    {"passcerts", OPT_PASSCERTS, 's', "Certificate file pass phrase source"},
-    {"chain", OPT_CHAIN, '-', "Build and add certificate chain for EE cert,"},
-    {OPT_MORE_STR, 0, 0,
-     "which is the 1st cert from -in matching the private key (if given)"},
-    {"untrusted", OPT_UNTRUSTED, '<', "Untrusted certificates for chain building"},
-    {"CAfile", OPT_CAFILE, '<', "PEM-format file of CA's"},
-    {"CApath", OPT_CAPATH, '/', "PEM-format directory of CA's"},
-    {"CAstore", OPT_CASTORE, ':', "URI to store of CA's"},
-    {"no-CAfile", OPT_NOCAFILE, '-',
-     "Do not load the default certificates file"},
-    {"no-CApath", OPT_NOCAPATH, '-',
-     "Do not load certificates from the default certificates directory"},
-    {"no-CAstore", OPT_NOCASTORE, '-',
-     "Do not load certificates from the default certificates store"},
-    {"name", OPT_NAME, 's', "Use name as friendly name"},
-    {"caname", OPT_CANAME, 's',
-     "Use name as CA friendly name (can be repeated)"},
-    {"CSP", OPT_CSP, 's', "Microsoft CSP name"},
-    {"LMK", OPT_LMK, '-',
-     "Add local machine keyset attribute to private key"},
-    {"keyex", OPT_KEYEX, '-', "Set key type to MS key exchange"},
-    {"keysig", OPT_KEYSIG, '-', "Set key type to MS key signature"},
-    {"keypbe", OPT_KEYPBE, 's', "Private key PBE algorithm (default AES-256 CBC)"},
-    {"certpbe", OPT_CERTPBE, 's',
-     "Certificate PBE algorithm (default PBES2 with PBKDF2 and AES-256 CBC)"},
+    { "export", OPT_EXPORT, '-', "Create PKCS12 file" },
+    { "inkey", OPT_INKEY, 's', "Private key, else read from -in input file" },
+    { "certfile", OPT_CERTFILE, '<', "Extra certificates for PKCS12 output" },
+    { "passcerts", OPT_PASSCERTS, 's', "Certificate file pass phrase source" },
+    { "chain", OPT_CHAIN, '-', "Build and add certificate chain for EE cert," },
+    { OPT_MORE_STR, 0, 0,
+        "which is the 1st cert from -in matching the private key (if given)" },
+    { "untrusted", OPT_UNTRUSTED, '<', "Untrusted certificates for chain building" },
+    { "CAfile", OPT_CAFILE, '<', "PEM-format file of CA's" },
+    { "CApath", OPT_CAPATH, '/', "PEM-format directory of CA's" },
+    { "CAstore", OPT_CASTORE, ':', "URI to store of CA's" },
+    { "no-CAfile", OPT_NOCAFILE, '-',
+        "Do not load the default certificates file" },
+    { "no-CApath", OPT_NOCAPATH, '-',
+        "Do not load certificates from the default certificates directory" },
+    { "no-CAstore", OPT_NOCASTORE, '-',
+        "Do not load certificates from the default certificates store" },
+    { "name", OPT_NAME, 's', "Use name as friendly name" },
+    { "caname", OPT_CANAME, 's',
+        "Use name as CA friendly name (can be repeated)" },
+    { "CSP", OPT_CSP, 's', "Microsoft CSP name" },
+    { "LMK", OPT_LMK, '-',
+        "Add local machine keyset attribute to private key" },
+    { "keyex", OPT_KEYEX, '-', "Set key type to MS key exchange" },
+    { "keysig", OPT_KEYSIG, '-', "Set key type to MS key signature" },
+    { "keypbe", OPT_KEYPBE, 's', "Private key PBE algorithm (default AES-256 CBC)" },
+    { "certpbe", OPT_CERTPBE, 's',
+        "Certificate PBE algorithm (default PBES2 with PBKDF2 and AES-256 CBC)" },
 #ifndef OPENSSL_NO_DES
-    {"descert", OPT_DESCERT, '-',
-     "Encrypt output with 3DES (default PBES2 with PBKDF2 and AES-256 CBC)"},
+    { "descert", OPT_DESCERT, '-',
+        "Encrypt output with 3DES (default PBES2 with PBKDF2 and AES-256 CBC)" },
 #endif
-    {"macalg", OPT_MACALG, 's',
-     "Digest algorithm to use in MAC (default SHA256)"},
-    {"pbmac1_pbkdf2", OPT_PBMAC1_PBKDF2, '-', "Use PBMAC1 with PBKDF2 instead of MAC"},
-    {"pbmac1_pbkdf2_md", OPT_PBMAC1_PBKDF2_MD, 's', "Digest to use for PBMAC1 KDF (default SHA256)"},
-    {"iter", OPT_ITER, 'p', "Specify the iteration count for encryption and MAC"},
-    {"noiter", OPT_NOITER, '-', "Don't use encryption iteration"},
-    {"nomaciter", OPT_NOMACITER, '-', "Don't use MAC iteration)"},
-    {"maciter", OPT_MACITER, '-', "Unused, kept for backwards compatibility"},
-    {"macsaltlen", OPT_MACSALTLEN, 'p', "Specify the salt len for MAC"},
-    {"nomac", OPT_NOMAC, '-', "Don't generate MAC"},
-    {"jdktrust", OPT_JDKTRUST, 's', "Mark certificate in PKCS#12 store as trusted for JDK compatibility"},
-    {NULL}
+    { "macalg", OPT_MACALG, 's',
+        "Digest algorithm to use in MAC (default SHA256)" },
+    { "pbmac1_pbkdf2", OPT_PBMAC1_PBKDF2, '-', "Use PBMAC1 with PBKDF2 instead of MAC" },
+    { "pbmac1_pbkdf2_md", OPT_PBMAC1_PBKDF2_MD, 's', "Digest to use for PBMAC1 KDF (default SHA256)" },
+    { "iter", OPT_ITER, 'p', "Specify the iteration count for encryption and MAC" },
+    { "noiter", OPT_NOITER, '-', "Don't use encryption iteration" },
+    { "nomaciter", OPT_NOMACITER, '-', "Don't use MAC iteration)" },
+    { "maciter", OPT_MACITER, '-', "Unused, kept for backwards compatibility" },
+    { "macsaltlen", OPT_MACSALTLEN, 'p', "Specify the salt len for MAC" },
+    { "nomac", OPT_NOMAC, '-', "Don't generate MAC" },
+    { "jdktrust", OPT_JDKTRUST, 's', "Mark certificate in PKCS#12 store as trusted for JDK compatibility" },
+    { NULL }
 };
 
 int pkcs12_main(int argc, char **argv)
@@ -197,7 +237,7 @@ int pkcs12_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -399,7 +439,7 @@ int pkcs12_main(int argc, char **argv)
             WARN_EXPORT("cacerts");
         if (enc != default_enc)
             BIO_printf(bio_err,
-                       "Warning: output encryption option -%s ignored with -export\n", enc_name);
+                "Warning: output encryption option -%s ignored with -export\n", enc_name);
     } else {
         if (keyname != NULL)
             WARN_NO_EXPORT("inkey");
@@ -462,11 +502,11 @@ int pkcs12_main(int argc, char **argv)
         }
         if (cert_pbe == NID_undef) {
             /* Adapt default algorithm */
-# ifndef OPENSSL_NO_RC2
+#ifndef OPENSSL_NO_RC2
             cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
-# else
+#else
             cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
-# endif
+#endif
         }
 
         if (key_pbe == NID_undef)
@@ -524,7 +564,7 @@ int pkcs12_main(int argc, char **argv)
         if (1) {
 #ifndef OPENSSL_NO_UI_CONSOLE
             if (EVP_read_pw_string(
-                macpass, sizeof(macpass), "Enter MAC Password:", export_pkcs12)) {
+                    macpass, sizeof(macpass), "Enter MAC Password:", export_pkcs12)) {
                 BIO_printf(bio_err, "Can't read Password\n");
                 goto end;
             }
@@ -557,10 +597,8 @@ int pkcs12_main(int argc, char **argv)
 
         if (!(options & NOKEYS)) {
             key = load_key(keyname ? keyname : infile,
-                           FORMAT_PEM, 1, passin, e,
-                           keyname ?
-                           "private key from -inkey file" :
-                           "private key from -in file");
+                FORMAT_PEM, 1, passin, e,
+                keyname ? "private key from -inkey file" : "private key from -in file");
             if (key == NULL)
                 goto export_end;
         }
@@ -568,7 +606,7 @@ int pkcs12_main(int argc, char **argv)
         /* Load all certs in input file */
         if (!(options & NOCERTS)) {
             if (!load_certs(infile, 1, &certs, passin,
-                            "certificates from -in file"))
+                    "certificates from -in file"))
                 goto export_end;
             if (sk_X509_num(certs) < 1) {
                 BIO_printf(bio_err, "No certificate in -in file %s\n", infile);
@@ -591,8 +629,8 @@ int pkcs12_main(int argc, char **argv)
                 }
                 if (ee_cert == NULL) {
                     BIO_printf(bio_err,
-                               "No cert in -in file '%s' matches private key\n",
-                               infile);
+                        "No cert in -in file '%s' matches private key\n",
+                        infile);
                     goto export_end;
                 }
             }
@@ -601,7 +639,7 @@ int pkcs12_main(int argc, char **argv)
         /* Load any untrusted certificates for chain building */
         if (untrusted != NULL) {
             if (!load_certs(untrusted, 0, &untrusted_certs, passcerts,
-                            "untrusted certificates"))
+                    "untrusted certificates"))
                 goto export_end;
         }
 
@@ -618,13 +656,13 @@ int pkcs12_main(int argc, char **argv)
 
             if (ee_cert_tmp == NULL) {
                 BIO_printf(bio_err,
-                           "No end entity certificate to check with -chain\n");
+                    "No end entity certificate to check with -chain\n");
                 goto export_end;
             }
 
             if ((store = setup_verify(CAfile, noCAfile, CApath, noCApath,
-                                      CAstore, noCAstore))
-                    == NULL)
+                     CAstore, noCAstore))
+                == NULL)
                 goto export_end;
 
             vret = get_cert_chain(ee_cert_tmp, store, untrusted_certs, &chain2);
@@ -635,15 +673,14 @@ int pkcs12_main(int argc, char **argv)
                 /* Remove from chain2 the first (end entity) certificate */
                 X509_free(sk_X509_shift(chain2));
                 /* Add the remaining certs (except for duplicates) */
-                add_certs = X509_add_certs(certs, chain2, X509_ADD_FLAG_UP_REF
-                                           | X509_ADD_FLAG_NO_DUP);
+                add_certs = X509_add_certs(certs, chain2, X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP);
                 OSSL_STACK_OF_X509_free(chain2);
                 if (!add_certs)
                     goto export_end;
             } else {
                 if (vret != X509_V_ERR_UNSPECIFIED)
                     BIO_printf(bio_err, "Error getting chain: %s\n",
-                               X509_verify_cert_error_string(vret));
+                        X509_verify_cert_error_string(vret));
                 goto export_end;
             }
         }
@@ -651,7 +688,7 @@ int pkcs12_main(int argc, char **argv)
         /* Add any extra certificates asked for */
         if (certfile != NULL) {
             if (!load_certs(certfile, 0, &certs, passcerts,
-                            "extra certificates from -certfile"))
+                    "extra certificates from -certfile"))
                 goto export_end;
         }
 
@@ -663,8 +700,8 @@ int pkcs12_main(int argc, char **argv)
 
         if (csp_name != NULL && key != NULL)
             EVP_PKEY_add1_attr_by_NID(key, NID_ms_csp_name,
-                                      MBSTRING_ASC, (unsigned char *)csp_name,
-                                      -1);
+                MBSTRING_ASC, (unsigned char *)csp_name,
+                -1);
 
         if (add_lmk && key != NULL)
             EVP_PKEY_add1_attr_by_NID(key, NID_LocalKeySet, 0, NULL, -1);
@@ -674,7 +711,7 @@ int pkcs12_main(int argc, char **argv)
             if (1) {
 #ifndef OPENSSL_NO_UI_CONSOLE
                 if (EVP_read_pw_string(pass, sizeof(pass),
-                                       "Enter Export Password:", 1)) {
+                        "Enter Export Password:", 1)) {
                     BIO_printf(bio_err, "Can't read Password\n");
                     goto export_end;
                 }
@@ -693,13 +730,13 @@ int pkcs12_main(int argc, char **argv)
         }
 
         p12 = PKCS12_create_ex2(cpass, name, key, ee_cert, certs,
-                                key_pbe, cert_pbe, iter, -1, keytype,
-                                app_get0_libctx(), app_get0_propq(),
-                                jdk_trust, (void*)obj);
+            key_pbe, cert_pbe, iter, -1, keytype,
+            app_get0_libctx(), app_get0_propq(),
+            jdk_trust, (void *)obj);
 
         if (p12 == NULL) {
             BIO_printf(bio_err, "Error creating PKCS12 structure for %s\n",
-                       outfile);
+                outfile);
             goto export_end;
         }
 
@@ -711,8 +748,8 @@ int pkcs12_main(int argc, char **argv)
         if (maciter != -1) {
             if (pbmac1_pbkdf2 == 1) {
                 if (!PKCS12_set_pbmac1_pbkdf2(p12, mpass, -1, NULL,
-                                              macsaltlen, maciter,
-                                              macmd, pbmac1_pbkdf2_md)) {
+                        macsaltlen, maciter,
+                        macmd, pbmac1_pbkdf2_md)) {
                     BIO_printf(bio_err, "Error creating PBMAC1\n");
                     goto export_end;
                 }
@@ -720,7 +757,7 @@ int pkcs12_main(int argc, char **argv)
                 if (!PKCS12_set_mac(p12, mpass, -1, NULL, macsaltlen, maciter, macmd)) {
                     BIO_printf(bio_err, "Error creating PKCS12 MAC; no PKCS12KDF support?\n");
                     BIO_printf(bio_err,
-                               "Use -nomac or -pbmac1_pbkdf2 if PKCS12KDF support not available\n");
+                        "Use -nomac or -pbmac1_pbkdf2 if PKCS12KDF support not available\n");
                     goto export_end;
                 }
             }
@@ -735,7 +772,7 @@ int pkcs12_main(int argc, char **argv)
 
         ret = 0;
 
- export_end:
+    export_end:
 
         EVP_PKEY_free(key);
         EVP_MD_free(macmd);
@@ -745,7 +782,6 @@ int pkcs12_main(int argc, char **argv)
         ASN1_OBJECT_free(obj);
         ERR_print_errors(bio_err);
         goto end;
-
     }
 
     in = bio_open_default(infile, 'r', FORMAT_PKCS12);
@@ -766,7 +802,7 @@ int pkcs12_main(int argc, char **argv)
         if (1) {
 #ifndef OPENSSL_NO_UI_CONSOLE
             if (EVP_read_pw_string(pass, sizeof(pass), "Enter Import Password:",
-                                   0)) {
+                    0)) {
                 BIO_printf(bio_err, "Can't read Password\n");
                 goto end;
             }
@@ -803,10 +839,10 @@ int pkcs12_main(int argc, char **argv)
                 int prfnid;
 
                 BIO_printf(bio_err, " using PBKDF2, Iteration %ld\n",
-                           ASN1_INTEGER_get(pbkdf2_param->iter));
+                    ASN1_INTEGER_get(pbkdf2_param->iter));
                 BIO_printf(bio_err, "Key length: %ld, Salt length: %d\n",
-                           ASN1_INTEGER_get(pbkdf2_param->keylength),
-                           ASN1_STRING_length(pbkdf2_param->salt->value.octet_string));
+                    ASN1_INTEGER_get(pbkdf2_param->keylength),
+                    ASN1_STRING_length(pbkdf2_param->salt->value.octet_string));
                 if (pbkdf2_param->prf == NULL) {
                     prfnid = NID_hmacWithSHA1;
                 } else {
@@ -818,10 +854,10 @@ int pkcs12_main(int argc, char **argv)
             PBKDF2PARAM_free(pbkdf2_param);
         } else {
             BIO_printf(bio_err, ", Iteration %ld\n",
-                       tmaciter != NULL ? ASN1_INTEGER_get(tmaciter) : 1L);
+                tmaciter != NULL ? ASN1_INTEGER_get(tmaciter) : 1L);
             BIO_printf(bio_err, "MAC length: %ld, salt length: %ld\n",
-                       tmac != NULL ? ASN1_STRING_length(tmac) : 0L,
-                       tsalt != NULL ? ASN1_STRING_length(tsalt) : 0L);
+                tmac != NULL ? ASN1_STRING_length(tmac) : 0L,
+                tsalt != NULL ? ASN1_STRING_length(tsalt) : 0L);
         }
     }
 
@@ -842,7 +878,7 @@ int pkcs12_main(int argc, char **argv)
             EVP_KDF *pkcs12kdf;
 
             pkcs12kdf = EVP_KDF_fetch(app_get0_libctx(), "PKCS12KDF",
-                                      app_get0_propq());
+                app_get0_propq());
             if (pkcs12kdf == NULL) {
                 BIO_printf(bio_err, "Error verifying PKCS12 MAC; no PKCS12KDF support.\n");
                 BIO_printf(bio_err, "Use -nomacver if MAC verification is not required.\n");
@@ -876,6 +912,12 @@ int pkcs12_main(int argc, char **argv)
             if (utmp == NULL)
                 goto end;
             badpass = OPENSSL_uni2utf8(utmp, utmplen);
+            if (badpass == NULL) {
+                BIO_printf(bio_err, "Verbatim password did not match, and fallback conversion to UTF-8 failed\n"
+                                    "The password entered or the input encoding may be wrong\n");
+                OPENSSL_free(utmp);
+                goto end;
+            }
             OPENSSL_free(utmp);
             if (!PKCS12_verify_mac(p12, badpass, -1)) {
                 BIO_printf(bio_err, "Mac verify error: invalid password?\n");
@@ -889,7 +931,7 @@ int pkcs12_main(int argc, char **argv)
         }
     }
 
- dump:
+dump:
     assert(private);
 
     out = bio_open_owner(outfile, FORMAT_PEM, private);
@@ -902,7 +944,7 @@ int pkcs12_main(int argc, char **argv)
         goto end;
     }
     ret = 0;
- end:
+end:
     PKCS12_free(p12);
     release_engine(e);
     BIO_free(in);
@@ -925,10 +967,10 @@ static int jdk_trust(PKCS12_SAFEBAG *bag, void *cbarg)
         return 1;
 
     /* Get the current attrs */
-    attrs = (STACK_OF(X509_ATTRIBUTE)*)PKCS12_SAFEBAG_get0_attrs(bag);
+    attrs = (STACK_OF(X509_ATTRIBUTE) *)PKCS12_SAFEBAG_get0_attrs(bag);
 
     /* Create a new attr for the JDK Trusted Usage and add it */
-    attr = X509_ATTRIBUTE_create(NID_oracle_jdk_trustedkeyusage, V_ASN1_OBJECT, (ASN1_OBJECT*)cbarg);
+    attr = X509_ATTRIBUTE_create(NID_oracle_jdk_trustedkeyusage, V_ASN1_OBJECT, (ASN1_OBJECT *)cbarg);
 
     /* Add the new attr, if attrs is NULL, it'll be initialised */
     X509at_add1_attr(&attrs, attr);
@@ -941,8 +983,8 @@ static int jdk_trust(PKCS12_SAFEBAG *bag, void *cbarg)
 }
 
 int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass,
-                        int passlen, int options, char *pempass,
-                        const EVP_CIPHER *enc)
+    int passlen, int options, char *pempass,
+    const EVP_CIPHER *enc)
 {
     STACK_OF(PKCS7) *asafes = NULL;
     int i, bagnid;
@@ -976,7 +1018,7 @@ int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass,
         if (bags == NULL)
             goto err;
         if (!dump_certs_pkeys_bags(out, bags, pass, passlen,
-                                   options, pempass, enc)) {
+                options, pempass, enc)) {
             sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
             goto err;
         }
@@ -984,28 +1026,28 @@ int dump_certs_keys_p12(BIO *out, const PKCS12 *p12, const char *pass,
     }
     ret = 1;
 
- err:
+err:
     sk_PKCS7_pop_free(asafes, PKCS7_free);
     return ret;
 }
 
 int dump_certs_pkeys_bags(BIO *out, const STACK_OF(PKCS12_SAFEBAG) *bags,
-                          const char *pass, int passlen, int options,
-                          char *pempass, const EVP_CIPHER *enc)
+    const char *pass, int passlen, int options,
+    char *pempass, const EVP_CIPHER *enc)
 {
     int i;
     for (i = 0; i < sk_PKCS12_SAFEBAG_num(bags); i++) {
         if (!dump_certs_pkeys_bag(out,
-                                  sk_PKCS12_SAFEBAG_value(bags, i),
-                                  pass, passlen, options, pempass, enc))
+                sk_PKCS12_SAFEBAG_value(bags, i),
+                pass, passlen, options, pempass, enc))
             return 0;
     }
     return 1;
 }
 
 int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bag,
-                         const char *pass, int passlen, int options,
-                         char *pempass, const EVP_CIPHER *enc)
+    const char *pass, int passlen, int options,
+    char *pempass, const EVP_CIPHER *enc)
 {
     EVP_PKEY *pkey;
     PKCS8_PRIV_KEY_INFO *p8;
@@ -1091,7 +1133,7 @@ int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bag,
             BIO_printf(bio_err, "Safe Contents bag\n");
         print_attribs(out, attrs, "Bag Attributes");
         return dump_certs_pkeys_bags(out, PKCS12_SAFEBAG_get0_safes(bag),
-                                     pass, passlen, options, pempass, enc);
+            pass, passlen, options, pempass, enc);
 
     default:
         BIO_printf(bio_err, "Warning unsupported bag type: ");
@@ -1105,8 +1147,8 @@ int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bag,
 /* Given a single certificate return a verified chain or NULL if error */
 
 static int get_cert_chain(X509 *cert, X509_STORE *store,
-                          STACK_OF(X509) *untrusted_certs,
-                          STACK_OF(X509) **chain)
+    STACK_OF(X509) *untrusted_certs,
+    STACK_OF(X509) **chain)
 {
     X509_STORE_CTX *store_ctx = NULL;
     STACK_OF(X509) *chn = NULL;
@@ -1114,15 +1156,14 @@ static int get_cert_chain(X509 *cert, X509_STORE *store,
 
     store_ctx = X509_STORE_CTX_new_ex(app_get0_libctx(), app_get0_propq());
     if (store_ctx == NULL) {
-        i =  X509_V_ERR_UNSPECIFIED;
+        i = X509_V_ERR_UNSPECIFIED;
         goto end;
     }
     if (!X509_STORE_CTX_init(store_ctx, store, cert, untrusted_certs)) {
-        i =  X509_V_ERR_UNSPECIFIED;
+        i = X509_V_ERR_UNSPECIFIED;
         goto end;
     }
 
-
     if (X509_verify_cert(store_ctx) > 0)
         chn = X509_STORE_CTX_get1_chain(store_ctx);
     else if ((i = X509_STORE_CTX_get_error(store_ctx)) == 0)
@@ -1165,7 +1206,7 @@ static int alg_print(const X509_ALGOR *alg)
         X509_ALGOR_get0(&aoid, NULL, NULL, pbe2->encryption);
         encnid = OBJ_obj2nid(aoid);
         BIO_printf(bio_err, ", %s, %s", OBJ_nid2ln(pbenid),
-                   OBJ_nid2sn(encnid));
+            OBJ_nid2sn(encnid));
         /* If KDF is PBKDF2 decode parameters */
         if (pbenid == NID_id_pbkdf2) {
             PBKDF2PARAM *kdf = NULL;
@@ -1184,7 +1225,7 @@ static int alg_print(const X509_ALGOR *alg)
                 prfnid = OBJ_obj2nid(aoid);
             }
             BIO_printf(bio_err, ", Iteration %ld, PRF %s",
-                       ASN1_INTEGER_get(kdf->iter), OBJ_nid2sn(prfnid));
+                ASN1_INTEGER_get(kdf->iter), OBJ_nid2sn(prfnid));
             PBKDF2PARAM_free(kdf);
 #ifndef OPENSSL_NO_SCRYPT
         } else if (pbenid == NID_id_scrypt) {
@@ -1197,11 +1238,11 @@ static int alg_print(const X509_ALGOR *alg)
                 goto done;
             }
             BIO_printf(bio_err, ", Salt length: %d, Cost(N): %ld, "
-                       "Block size(r): %ld, Parallelism(p): %ld",
-                       ASN1_STRING_length(kdf->salt),
-                       ASN1_INTEGER_get(kdf->costParameter),
-                       ASN1_INTEGER_get(kdf->blockSize),
-                       ASN1_INTEGER_get(kdf->parallelizationParameter));
+                                "Block size(r): %ld, Parallelism(p): %ld",
+                ASN1_STRING_length(kdf->salt),
+                ASN1_INTEGER_get(kdf->costParameter),
+                ASN1_INTEGER_get(kdf->blockSize),
+                ASN1_INTEGER_get(kdf->parallelizationParameter));
             SCRYPT_PARAMS_free(kdf);
 #endif
         }
@@ -1216,7 +1257,7 @@ static int alg_print(const X509_ALGOR *alg)
         BIO_printf(bio_err, ", Iteration %ld", ASN1_INTEGER_get(pbe->iter));
         PBEPARAM_free(pbe);
     }
- done:
+done:
     BIO_puts(bio_err, "\n");
     return 1;
 }
@@ -1249,25 +1290,25 @@ void print_attribute(BIO *out, const ASN1_TYPE *av)
     switch (av->type) {
     case V_ASN1_BMPSTRING:
         value = OPENSSL_uni2asc(av->value.bmpstring->data,
-                                av->value.bmpstring->length);
+            av->value.bmpstring->length);
         BIO_printf(out, "%s\n", value);
         OPENSSL_free(value);
         break;
 
     case V_ASN1_UTF8STRING:
         BIO_printf(out, "%.*s\n", av->value.utf8string->length,
-                   av->value.utf8string->data);
+            av->value.utf8string->data);
         break;
 
     case V_ASN1_OCTET_STRING:
         hex_prin(out, av->value.octet_string->data,
-                 av->value.octet_string->length);
+            av->value.octet_string->length);
         BIO_printf(out, "\n");
         break;
 
     case V_ASN1_BIT_STRING:
         hex_prin(out, av->value.bit_string->data,
-                 av->value.bit_string->length);
+            av->value.bit_string->length);
         BIO_printf(out, "\n");
         break;
 
@@ -1289,7 +1330,7 @@ void print_attribute(BIO *out, const ASN1_TYPE *av)
 /* Generalised attribute print: handle PKCS#8 and bag attributes */
 
 int print_attribs(BIO *out, const STACK_OF(X509_ATTRIBUTE) *attrlst,
-                  const char *name)
+    const char *name)
 {
     X509_ATTRIBUTE *attr;
     ASN1_TYPE *av;
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 57cb517b178f8..26f8d48fc242c 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -22,35 +22,43 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_NOOUT,
-    OPT_TEXT, OPT_PRINT, OPT_PRINT_CERTS, OPT_QUIET,
-    OPT_ENGINE, OPT_PROV_ENUM
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_IN,
+    OPT_OUT,
+    OPT_NOOUT,
+    OPT_TEXT,
+    OPT_PRINT,
+    OPT_PRINT_CERTS,
+    OPT_QUIET,
+    OPT_ENGINE,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS pkcs7_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file"},
-    {"inform", OPT_INFORM, 'F', "Input format - DER or PEM"},
+    { "in", OPT_IN, '<', "Input file" },
+    { "inform", OPT_INFORM, 'F', "Input format - DER or PEM" },
 
     OPT_SECTION("Output"),
-    {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
-    {"out", OPT_OUT, '>', "Output file"},
-    {"noout", OPT_NOOUT, '-', "Don't output encoded data"},
-    {"text", OPT_TEXT, '-', "Print full details of certificates"},
-    {"print", OPT_PRINT, '-', "Print out all fields of the PKCS7 structure"},
-    {"print_certs", OPT_PRINT_CERTS, '-',
-     "Print_certs  print any certs or crl in the input"},
-    {"quiet", OPT_QUIET, '-',
-     "When used with -print_certs, it produces a cleaner output"},
+    { "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
+    { "out", OPT_OUT, '>', "Output file" },
+    { "noout", OPT_NOOUT, '-', "Don't output encoded data" },
+    { "text", OPT_TEXT, '-', "Print full details of certificates" },
+    { "print", OPT_PRINT, '-', "Print out all fields of the PKCS7 structure" },
+    { "print_certs", OPT_PRINT_CERTS, '-',
+        "Print_certs  print any certs or crl in the input" },
+    { "quiet", OPT_QUIET, '-',
+        "When used with -print_certs, it produces a cleaner output" },
 
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int pkcs7_main(int argc, char **argv)
@@ -69,7 +77,7 @@ int pkcs7_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -215,7 +223,7 @@ int pkcs7_main(int argc, char **argv)
         }
     }
     ret = 0;
- end:
+end:
     PKCS7_free(p7);
     release_engine(e);
     BIO_free(in);
diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 22978afb9093e..a47f05de58f6d 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -22,54 +22,69 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_IN, OPT_OUT,
-    OPT_TOPK8, OPT_NOITER, OPT_NOCRYPT,
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_ENGINE,
+    OPT_IN,
+    OPT_OUT,
+    OPT_TOPK8,
+    OPT_NOITER,
+    OPT_NOCRYPT,
 #ifndef OPENSSL_NO_SCRYPT
-    OPT_SCRYPT, OPT_SCRYPT_N, OPT_SCRYPT_R, OPT_SCRYPT_P,
+    OPT_SCRYPT,
+    OPT_SCRYPT_N,
+    OPT_SCRYPT_R,
+    OPT_SCRYPT_P,
 #endif
-    OPT_V2, OPT_V1, OPT_V2PRF, OPT_ITER, OPT_PASSIN, OPT_PASSOUT,
+    OPT_V2,
+    OPT_V1,
+    OPT_V2PRF,
+    OPT_ITER,
+    OPT_PASSIN,
+    OPT_PASSOUT,
     OPT_TRADITIONAL,
     OPT_SALTLEN,
-    OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS pkcs8_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
-    {"v1", OPT_V1, 's', "Use PKCS#5 v1.5 and cipher"},
-    {"v2", OPT_V2, 's', "Use PKCS#5 v2.0 and cipher"},
-    {"v2prf", OPT_V2PRF, 's', "Set the PRF algorithm to use with PKCS#5 v2.0"},
+    { "v1", OPT_V1, 's', "Use PKCS#5 v1.5 and cipher" },
+    { "v2", OPT_V2, 's', "Use PKCS#5 v2.0 and cipher" },
+    { "v2prf", OPT_V2PRF, 's', "Set the PRF algorithm to use with PKCS#5 v2.0" },
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file"},
-    {"inform", OPT_INFORM, 'F', "Input format (DER or PEM)"},
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
-    {"nocrypt", OPT_NOCRYPT, '-', "Use or expect unencrypted private key"},
+    { "in", OPT_IN, '<', "Input file" },
+    { "inform", OPT_INFORM, 'F', "Input format (DER or PEM)" },
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+    { "nocrypt", OPT_NOCRYPT, '-', "Use or expect unencrypted private key" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file"},
-    {"outform", OPT_OUTFORM, 'F', "Output format (DER or PEM)"},
-    {"topk8", OPT_TOPK8, '-', "Output PKCS8 file"},
-    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
-    {"traditional", OPT_TRADITIONAL, '-', "use traditional format private key"},
-    {"iter", OPT_ITER, 'p', "Specify the iteration count"},
-    {"noiter", OPT_NOITER, '-', "Use 1 as iteration count"},
-    {"saltlen", OPT_SALTLEN, 'p', "Specify the salt length (in bytes)"},
-    {OPT_MORE_STR, 0, 0, "Default: 8 (For PBE1) or 16 (for PBE2)"},
+    { "out", OPT_OUT, '>', "Output file" },
+    { "outform", OPT_OUTFORM, 'F', "Output format (DER or PEM)" },
+    { "topk8", OPT_TOPK8, '-', "Output PKCS8 file" },
+    { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
+    { "traditional", OPT_TRADITIONAL, '-', "use traditional format private key" },
+    { "iter", OPT_ITER, 'p', "Specify the iteration count" },
+    { "noiter", OPT_NOITER, '-', "Use 1 as iteration count" },
+    { "saltlen", OPT_SALTLEN, 'p', "Specify the salt length (in bytes)" },
+    { OPT_MORE_STR, 0, 0, "Default: 8 (For PBE1) or 16 (for PBE2)" },
 #ifndef OPENSSL_NO_SCRYPT
     OPT_SECTION("Scrypt"),
-    {"scrypt", OPT_SCRYPT, '-', "Use scrypt algorithm"},
-    {"scrypt_N", OPT_SCRYPT_N, 's', "Set scrypt N parameter"},
-    {"scrypt_r", OPT_SCRYPT_R, 's', "Set scrypt r parameter"},
-    {"scrypt_p", OPT_SCRYPT_P, 's', "Set scrypt p parameter"},
+    { "scrypt", OPT_SCRYPT, '-', "Use scrypt algorithm" },
+    { "scrypt_N", OPT_SCRYPT_N, 's', "Set scrypt N parameter" },
+    { "scrypt_r", OPT_SCRYPT_R, 's', "Set scrypt r parameter" },
+    { "scrypt_p", OPT_SCRYPT_P, 's', "Set scrypt p parameter" },
 #endif
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int pkcs8_main(int argc, char **argv)
@@ -100,7 +115,7 @@ int pkcs8_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -148,7 +163,7 @@ int pkcs8_main(int argc, char **argv)
             pbe_nid = OBJ_txt2nid(opt_arg());
             if (pbe_nid == NID_undef) {
                 BIO_printf(bio_err,
-                           "%s: Unknown PBE algorithm %s\n", prog, opt_arg());
+                    "%s: Unknown PBE algorithm %s\n", prog, opt_arg());
                 goto opthelp;
             }
             break;
@@ -156,14 +171,14 @@ int pkcs8_main(int argc, char **argv)
             pbe_nid = OBJ_txt2nid(opt_arg());
             if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, pbe_nid, NULL, NULL, 0)) {
                 BIO_printf(bio_err,
-                           "%s: Unknown PRF algorithm %s\n", prog, opt_arg());
+                    "%s: Unknown PRF algorithm %s\n", prog, opt_arg());
                 goto opthelp;
             }
             if (cipher == NULL)
                 cipher = (EVP_CIPHER *)EVP_aes_256_cbc();
             break;
         case OPT_ITER:
-            iter =  opt_int_arg();
+            iter = opt_int_arg();
             break;
         case OPT_PASSIN:
             passinarg = opt_arg();
@@ -224,7 +239,7 @@ int pkcs8_main(int argc, char **argv)
         cipher = (EVP_CIPHER *)EVP_aes_256_cbc();
 
     in = bio_open_default(infile, 'r',
-                          informat == FORMAT_UNDEF ? FORMAT_PEM : informat);
+        informat == FORMAT_UNDEF ? FORMAT_PEM : informat);
     if (in == NULL)
         goto end;
 
@@ -255,11 +270,11 @@ int pkcs8_main(int argc, char **argv)
 #ifndef OPENSSL_NO_SCRYPT
                 if (scrypt_N && scrypt_r && scrypt_p)
                     pbe = PKCS5_pbe2_set_scrypt(cipher, NULL, saltlen, NULL,
-                                                scrypt_N, scrypt_r, scrypt_p);
+                        scrypt_N, scrypt_r, scrypt_p);
                 else
 #endif
                     pbe = PKCS5_pbe2_set_iv(cipher, iter, NULL, saltlen, NULL,
-                                            pbe_nid);
+                        pbe_nid);
             } else {
                 pbe = PKCS5_pbe_set(pbe_nid, iter, NULL, saltlen);
             }
@@ -274,8 +289,7 @@ int pkcs8_main(int argc, char **argv)
                 /* To avoid bit rot */
 #ifndef OPENSSL_NO_UI_CONSOLE
                 p8pass = pass;
-                if (EVP_read_pw_string
-                    (pass, sizeof(pass), "Enter Encryption Password:", 1)) {
+                if (EVP_read_pw_string(pass, sizeof(pass), "Enter Encryption Password:", 1)) {
                     X509_ALGOR_free(pbe);
                     goto end;
                 }
@@ -366,7 +380,7 @@ int pkcs8_main(int argc, char **argv)
     if (outformat == FORMAT_PEM) {
         if (traditional)
             PEM_write_bio_PrivateKey_traditional(out, pkey, NULL, NULL, 0,
-                                                 NULL, passout);
+                NULL, passout);
         else
             PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout);
     } else if (outformat == FORMAT_ASN1) {
@@ -377,7 +391,7 @@ int pkcs8_main(int argc, char **argv)
     }
     ret = 0;
 
- end:
+end:
     X509_SIG_free(p8);
     PKCS8_PRIV_KEY_INFO_free(p8inf);
     EVP_PKEY_free(pkey);
diff --git a/apps/pkey.c b/apps/pkey.c
index ab0c95c2acd68..9c7b776f780f2 100644
--- a/apps/pkey.c
+++ b/apps/pkey.c
@@ -19,50 +19,64 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_PASSIN, OPT_PASSOUT, OPT_ENGINE,
-    OPT_IN, OPT_OUT, OPT_PUBIN, OPT_PUBOUT, OPT_TEXT_PUB,
-    OPT_TEXT, OPT_NOOUT, OPT_CIPHER, OPT_TRADITIONAL, OPT_CHECK, OPT_PUB_CHECK,
-    OPT_EC_PARAM_ENC, OPT_EC_CONV_FORM,
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_PASSIN,
+    OPT_PASSOUT,
+    OPT_ENGINE,
+    OPT_IN,
+    OPT_OUT,
+    OPT_PUBIN,
+    OPT_PUBOUT,
+    OPT_TEXT_PUB,
+    OPT_TEXT,
+    OPT_NOOUT,
+    OPT_CIPHER,
+    OPT_TRADITIONAL,
+    OPT_CHECK,
+    OPT_PUB_CHECK,
+    OPT_EC_PARAM_ENC,
+    OPT_EC_CONV_FORM,
     OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS pkey_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
     OPT_PROV_OPTIONS,
 
-    {"check", OPT_CHECK, '-', "Check key consistency"},
-    {"pubcheck", OPT_PUB_CHECK, '-', "Check public key consistency"},
+    { "check", OPT_CHECK, '-', "Check key consistency" },
+    { "pubcheck", OPT_PUB_CHECK, '-', "Check public key consistency" },
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, 's', "Input key"},
-    {"inform", OPT_INFORM, 'f',
-     "Key input format (ENGINE, other values ignored)"},
-    {"passin", OPT_PASSIN, 's', "Key input pass phrase source"},
-    {"pubin", OPT_PUBIN, '-',
-     "Read only public components from key input"},
+    { "in", OPT_IN, 's', "Input key" },
+    { "inform", OPT_INFORM, 'f',
+        "Key input format (ENGINE, other values ignored)" },
+    { "passin", OPT_PASSIN, 's', "Key input pass phrase source" },
+    { "pubin", OPT_PUBIN, '-',
+        "Read only public components from key input" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file for encoded and/or text output"},
-    {"outform", OPT_OUTFORM, 'F', "Output encoding format (DER or PEM)"},
-    {"", OPT_CIPHER, '-', "Any supported cipher to be used for encryption"},
-    {"passout", OPT_PASSOUT, 's', "Output PEM file pass phrase source"},
-    {"traditional", OPT_TRADITIONAL, '-',
-     "Use traditional format for private key PEM output"},
-    {"pubout", OPT_PUBOUT, '-', "Restrict encoded output to public components"},
-    {"noout", OPT_NOOUT, '-', "Do not output the key in encoded form"},
-    {"text", OPT_TEXT, '-', "Output key components in plaintext"},
-    {"text_pub", OPT_TEXT_PUB, '-',
-     "Output only public key components in text form"},
-    {"ec_conv_form", OPT_EC_CONV_FORM, 's',
-     "Specifies the EC point conversion form in the encoding"},
-    {"ec_param_enc", OPT_EC_PARAM_ENC, 's',
-     "Specifies the way the EC parameters are encoded"},
+    { "out", OPT_OUT, '>', "Output file for encoded and/or text output" },
+    { "outform", OPT_OUTFORM, 'F', "Output encoding format (DER or PEM)" },
+    { "", OPT_CIPHER, '-', "Any supported cipher to be used for encryption" },
+    { "passout", OPT_PASSOUT, 's', "Output PEM file pass phrase source" },
+    { "traditional", OPT_TRADITIONAL, '-',
+        "Use traditional format for private key PEM output" },
+    { "pubout", OPT_PUBOUT, '-', "Restrict encoded output to public components" },
+    { "noout", OPT_NOOUT, '-', "Do not output the key in encoded form" },
+    { "text", OPT_TEXT, '-', "Output key components in plaintext" },
+    { "text_pub", OPT_TEXT_PUB, '-',
+        "Output only public key components in text form" },
+    { "ec_conv_form", OPT_EC_CONV_FORM, 's',
+        "Specifies the EC point conversion form in the encoding" },
+    { "ec_param_enc", OPT_EC_PARAM_ENC, 's',
+        "Specifies the way the EC parameters are encoded" },
 
-    {NULL}
+    { NULL }
 };
 
 int pkey_main(int argc, char **argv)
@@ -89,7 +103,7 @@ int pkey_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -177,10 +191,10 @@ int pkey_main(int argc, char **argv)
 
     if (text && text_pub)
         BIO_printf(bio_err,
-                   "Warning: The -text option is ignored with -text_pub\n");
+            "Warning: The -text option is ignored with -text_pub\n");
     if (traditional && (noout || outformat != FORMAT_PEM))
         BIO_printf(bio_err,
-                   "Warning: The -traditional is ignored since there is no PEM output\n");
+            "Warning: The -traditional is ignored since there is no PEM output\n");
 
     /* -pubout and -text is the same as -text_pub */
     if (!text_pub && pubout && text) {
@@ -195,11 +209,11 @@ int pkey_main(int argc, char **argv)
     if (cipher == NULL) {
         if (passoutarg != NULL)
             BIO_printf(bio_err,
-                       "Warning: The -passout option is ignored without a cipher option\n");
+                "Warning: The -passout option is ignored without a cipher option\n");
     } else {
         if (noout || outformat != FORMAT_PEM) {
             BIO_printf(bio_err,
-                       "Error: Cipher options are supported only for PEM output\n");
+                "Error: Cipher options are supported only for PEM output\n");
             goto end;
         }
     }
@@ -228,11 +242,11 @@ int pkey_main(int argc, char **argv)
 
         if (asn1_encoding != NULL)
             *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_EC_ENCODING,
-                                                    asn1_encoding, 0);
+                asn1_encoding, 0);
         if (point_format != NULL)
             *p++ = OSSL_PARAM_construct_utf8_string(
-                       OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
-                       point_format, 0);
+                OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+                point_format, 0);
         *p = OSSL_PARAM_construct_end();
         if (EVP_PKEY_set_params(pkey, params) <= 0)
             goto end;
@@ -275,19 +289,19 @@ int pkey_main(int argc, char **argv)
                 assert(private);
                 if (traditional) {
                     if (!PEM_write_bio_PrivateKey_traditional(out, pkey, cipher,
-                                                              NULL, 0, NULL,
-                                                              passout))
+                            NULL, 0, NULL,
+                            passout))
                         goto end;
                 } else {
                     if (!PEM_write_bio_PrivateKey(out, pkey, cipher,
-                                                  NULL, 0, NULL, passout))
+                            NULL, 0, NULL, passout))
                         goto end;
                 }
             }
         } else if (outformat == FORMAT_ASN1) {
             if (text || text_pub) {
                 BIO_printf(bio_err,
-                           "Error: Text output cannot be combined with DER output\n");
+                    "Error: Text output cannot be combined with DER output\n");
                 goto end;
             }
             if (pubout) {
@@ -315,7 +329,7 @@ int pkey_main(int argc, char **argv)
 
     ret = 0;
 
- end:
+end:
     if (ret != 0)
         ERR_print_errors(bio_err);
     EVP_PKEY_CTX_free(ctx);
diff --git a/apps/pkeyparam.c b/apps/pkeyparam.c
index fd8de0e02fe91..3c8fc740863c9 100644
--- a/apps/pkeyparam.c
+++ b/apps/pkeyparam.c
@@ -18,29 +18,33 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_IN, OPT_OUT, OPT_TEXT, OPT_NOOUT,
-    OPT_ENGINE, OPT_CHECK,
+    OPT_IN,
+    OPT_OUT,
+    OPT_TEXT,
+    OPT_NOOUT,
+    OPT_ENGINE,
+    OPT_CHECK,
     OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS pkeyparam_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
-    {"check", OPT_CHECK, '-', "Check key param consistency"},
+    { "check", OPT_CHECK, '-', "Check key param consistency" },
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file"},
+    { "in", OPT_IN, '<', "Input file" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file"},
-    {"text", OPT_TEXT, '-', "Print parameters as text"},
-    {"noout", OPT_NOOUT, '-', "Don't output encoded parameters"},
+    { "out", OPT_OUT, '>', "Output file" },
+    { "text", OPT_TEXT, '-', "Print parameters as text" },
+    { "noout", OPT_NOOUT, '-', "Don't output encoded parameters" },
 
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int pkeyparam_main(int argc, char **argv)
@@ -58,7 +62,7 @@ int pkeyparam_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -98,7 +102,7 @@ int pkeyparam_main(int argc, char **argv)
     if (in == NULL)
         goto end;
     pkey = PEM_read_bio_Parameters_ex(in, NULL, app_get0_libctx(),
-                                      app_get0_propq());
+        app_get0_propq());
     if (pkey == NULL) {
         BIO_printf(bio_err, "Error reading parameters\n");
         ERR_print_errors(bio_err);
@@ -111,7 +115,7 @@ int pkeyparam_main(int argc, char **argv)
     if (check) {
         if (e == NULL)
             ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(), pkey,
-                                             app_get0_propq());
+                app_get0_propq());
         else
             ctx = EVP_PKEY_CTX_new(pkey, e);
         if (ctx == NULL) {
@@ -142,7 +146,7 @@ int pkeyparam_main(int argc, char **argv)
 
     ret = EXIT_SUCCESS;
 
- end:
+end:
     EVP_PKEY_CTX_free(ctx);
     EVP_PKEY_free(pkey);
     release_engine(e);
diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index d72b82fd0b3c7..6b6a5d625ee7e 100644
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -15,33 +15,33 @@
 #include <openssl/evp.h>
 #include <sys/stat.h>
 
-#define KEY_NONE        0
-#define KEY_PRIVKEY     1
-#define KEY_PUBKEY      2
-#define KEY_CERT        3
+#define KEY_NONE 0
+#define KEY_PRIVKEY 1
+#define KEY_PUBKEY 2
+#define KEY_CERT 3
 
 static EVP_PKEY *get_pkey(const char *kdfalg,
-                          const char *keyfile, int keyform, int key_type,
-                          char *passinarg, int pkey_op, ENGINE *e);
+    const char *keyfile, int keyform, int key_type,
+    char *passinarg, int pkey_op, ENGINE *e);
 static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
-                              int pkey_op, ENGINE *e,
-                              const int engine_impl, int rawin,
-                              EVP_PKEY *pkey /* ownership is passed to ctx */,
-                              EVP_MD_CTX *mctx, const char *digestname,
-                              const char *kemop, OSSL_LIB_CTX *libctx, const char *propq);
+    int pkey_op, ENGINE *e,
+    const int engine_impl, int rawin,
+    EVP_PKEY *pkey /* ownership is passed to ctx */,
+    EVP_MD_CTX *mctx, const char *digestname,
+    const char *kemop, OSSL_LIB_CTX *libctx, const char *propq);
 
 static int setup_peer(EVP_PKEY_CTX *ctx, int peerform, const char *file,
-                      ENGINE *e);
+    ENGINE *e);
 
 static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
-                    unsigned char *out, size_t *poutlen,
-                    const unsigned char *in, size_t inlen,
-                    unsigned char *secret, size_t *psecretlen);
+    unsigned char *out, size_t *poutlen,
+    const unsigned char *in, size_t inlen,
+    unsigned char *secret, size_t *psecretlen);
 
 static int do_raw_keyop(int pkey_op, EVP_MD_CTX *mctx,
-                        EVP_PKEY *pkey, BIO *in,
-                        int filesize, unsigned char *sig, int siglen,
-                        unsigned char **out, size_t *poutlen);
+    EVP_PKEY *pkey, BIO *in,
+    int filesize, unsigned char *sig, size_t siglen,
+    unsigned char **out, size_t *poutlen);
 
 static int only_nomd(EVP_PKEY *pkey)
 {
@@ -56,70 +56,95 @@ static int only_nomd(EVP_PKEY *pkey)
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_ENGINE, OPT_ENGINE_IMPL, OPT_IN, OPT_OUT,
-    OPT_PUBIN, OPT_CERTIN, OPT_ASN1PARSE, OPT_HEXDUMP, OPT_SIGN,
-    OPT_VERIFY, OPT_VERIFYRECOVER, OPT_REV, OPT_ENCRYPT, OPT_DECRYPT,
-    OPT_DERIVE, OPT_SIGFILE, OPT_INKEY, OPT_PEERKEY, OPT_PASSIN,
-    OPT_PEERFORM, OPT_KEYFORM, OPT_PKEYOPT, OPT_PKEYOPT_PASSIN, OPT_KDF,
-    OPT_KDFLEN, OPT_R_ENUM, OPT_PROV_ENUM,
-    OPT_DECAP, OPT_ENCAP, OPT_SECOUT, OPT_KEMOP,
+    OPT_ENGINE,
+    OPT_ENGINE_IMPL,
+    OPT_IN,
+    OPT_OUT,
+    OPT_PUBIN,
+    OPT_CERTIN,
+    OPT_ASN1PARSE,
+    OPT_HEXDUMP,
+    OPT_SIGN,
+    OPT_VERIFY,
+    OPT_VERIFYRECOVER,
+    OPT_REV,
+    OPT_ENCRYPT,
+    OPT_DECRYPT,
+    OPT_DERIVE,
+    OPT_SIGFILE,
+    OPT_INKEY,
+    OPT_PEERKEY,
+    OPT_PASSIN,
+    OPT_PEERFORM,
+    OPT_KEYFORM,
+    OPT_PKEYOPT,
+    OPT_PKEYOPT_PASSIN,
+    OPT_KDF,
+    OPT_KDFLEN,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM,
+    OPT_DECAP,
+    OPT_ENCAP,
+    OPT_SECOUT,
+    OPT_KEMOP,
     OPT_CONFIG,
-    OPT_RAWIN, OPT_DIGEST
+    OPT_RAWIN,
+    OPT_DIGEST
 } OPTION_CHOICE;
 
 const OPTIONS pkeyutl_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
-    {"engine_impl", OPT_ENGINE_IMPL, '-',
-     "Also use engine given by -engine for crypto operations"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
+    { "engine_impl", OPT_ENGINE_IMPL, '-',
+        "Also use engine given by -engine for crypto operations" },
 #endif
-    {"sign", OPT_SIGN, '-', "Sign input data with private key"},
-    {"verify", OPT_VERIFY, '-', "Verify with public key"},
-    {"encrypt", OPT_ENCRYPT, '-', "Encrypt input data with public key"},
-    {"decrypt", OPT_DECRYPT, '-', "Decrypt input data with private key"},
-    {"derive", OPT_DERIVE, '-', "Derive shared secret from own and peer (EC)DH keys"},
-    {"decap", OPT_DECAP, '-', "Decapsulate shared secret"},
-    {"encap", OPT_ENCAP, '-', "Encapsulate shared secret"},
+    { "sign", OPT_SIGN, '-', "Sign input data with private key" },
+    { "verify", OPT_VERIFY, '-', "Verify with public key" },
+    { "encrypt", OPT_ENCRYPT, '-', "Encrypt input data with public key" },
+    { "decrypt", OPT_DECRYPT, '-', "Decrypt input data with private key" },
+    { "derive", OPT_DERIVE, '-', "Derive shared secret from own and peer (EC)DH keys" },
+    { "decap", OPT_DECAP, '-', "Decapsulate shared secret" },
+    { "encap", OPT_ENCAP, '-', "Encapsulate shared secret" },
     OPT_CONFIG_OPTION,
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file - default stdin"},
-    {"inkey", OPT_INKEY, 's', "Input key, by default private key"},
-    {"pubin", OPT_PUBIN, '-', "Input key is a public key"},
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
-    {"peerkey", OPT_PEERKEY, 's', "Peer key file used in key derivation"},
-    {"peerform", OPT_PEERFORM, 'E', "Peer key format (DER/PEM/P12/ENGINE)"},
-    {"certin", OPT_CERTIN, '-', "Input is a cert with a public key"},
-    {"rev", OPT_REV, '-', "Reverse the order of the input buffer"},
-    {"sigfile", OPT_SIGFILE, '<', "Signature file (verify operation only)"},
-    {"keyform", OPT_KEYFORM, 'E', "Private key format (ENGINE, other values ignored)"},
+    { "in", OPT_IN, '<', "Input file - default stdin" },
+    { "inkey", OPT_INKEY, 's', "Input key, by default private key" },
+    { "pubin", OPT_PUBIN, '-', "Input key is a public key" },
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+    { "peerkey", OPT_PEERKEY, 's', "Peer key file used in key derivation" },
+    { "peerform", OPT_PEERFORM, 'E', "Peer key format (DER/PEM/P12/ENGINE)" },
+    { "certin", OPT_CERTIN, '-', "Input is a cert with a public key" },
+    { "rev", OPT_REV, '-', "Reverse the order of the input buffer" },
+    { "sigfile", OPT_SIGFILE, '<', "Signature file (verify operation only)" },
+    { "keyform", OPT_KEYFORM, 'E', "Private key format (ENGINE, other values ignored)" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file - default stdout"},
-    {"secret", OPT_SECOUT, '>', "File to store secret on encapsulation"},
-    {"asn1parse", OPT_ASN1PARSE, '-',
-     "parse the output as ASN.1 data to check its DER encoding and print errors"},
-    {"hexdump", OPT_HEXDUMP, '-', "Hex dump output"},
-    {"verifyrecover", OPT_VERIFYRECOVER, '-',
-     "Verify RSA signature, recovering original signature input data"},
+    { "out", OPT_OUT, '>', "Output file - default stdout" },
+    { "secret", OPT_SECOUT, '>', "File to store secret on encapsulation" },
+    { "asn1parse", OPT_ASN1PARSE, '-',
+        "parse the output as ASN.1 data to check its DER encoding and print errors" },
+    { "hexdump", OPT_HEXDUMP, '-', "Hex dump output" },
+    { "verifyrecover", OPT_VERIFYRECOVER, '-',
+        "Verify RSA signature, recovering original signature input data" },
 
     OPT_SECTION("Signing/Derivation/Encapsulation"),
-    {"rawin", OPT_RAWIN, '-',
-     "Indicate that the signature/verification input data is not yet hashed"},
-    {"digest", OPT_DIGEST, 's',
-     "The digest algorithm to use for signing/verifying raw input data. Implies -rawin"},
-    {"pkeyopt", OPT_PKEYOPT, 's', "Public key options as opt:value"},
-    {"pkeyopt_passin", OPT_PKEYOPT_PASSIN, 's',
-     "Public key option that is read as a passphrase argument opt:passphrase"},
-    {"kdf", OPT_KDF, 's', "Use KDF algorithm"},
-    {"kdflen", OPT_KDFLEN, 'p', "KDF algorithm output length"},
-    {"kemop", OPT_KEMOP, 's', "KEM operation specific to the key algorithm"},
+    { "rawin", OPT_RAWIN, '-',
+        "Indicate that the signature/verification input data is not yet hashed" },
+    { "digest", OPT_DIGEST, 's',
+        "The digest algorithm to use for signing/verifying raw input data. Implies -rawin" },
+    { "pkeyopt", OPT_PKEYOPT, 's', "Public key options as opt:value" },
+    { "pkeyopt_passin", OPT_PKEYOPT_PASSIN, 's',
+        "Public key option that is read as a passphrase argument opt:passphrase" },
+    { "kdf", OPT_KDF, 's', "Use KDF algorithm" },
+    { "kdflen", OPT_KDFLEN, 'p', "KDF algorithm output length" },
+    { "kemop", OPT_KEMOP, 's', "KEM operation specific to the key algorithm" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int pkeyutl_main(int argc, char **argv)
@@ -133,7 +158,7 @@ int pkeyutl_main(int argc, char **argv)
     char hexdump = 0, asn1parse = 0, rev = 0, *prog;
     unsigned char *buf_in = NULL, *buf_out = NULL, *sig = NULL, *secret = NULL;
     OPTION_CHOICE o;
-    int buf_inlen = 0, siglen = -1;
+    size_t buf_inlen = 0, siglen = 0;
     int keyform = FORMAT_UNDEF, peerform = FORMAT_UNDEF;
     int keysize = -1, pkey_op = EVP_PKEY_OP_SIGN, key_type = KEY_PRIVKEY;
     int engine_impl = 0;
@@ -156,7 +181,7 @@ int pkeyutl_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -263,17 +288,13 @@ int pkeyutl_main(int argc, char **argv)
             rev = 1;
             break;
         case OPT_PKEYOPT:
-            if ((pkeyopts == NULL &&
-                 (pkeyopts = sk_OPENSSL_STRING_new_null()) == NULL) ||
-                sk_OPENSSL_STRING_push(pkeyopts, opt_arg()) == 0) {
+            if ((pkeyopts == NULL && (pkeyopts = sk_OPENSSL_STRING_new_null()) == NULL) || sk_OPENSSL_STRING_push(pkeyopts, opt_arg()) == 0) {
                 BIO_puts(bio_err, "out of memory\n");
                 goto end;
             }
             break;
         case OPT_PKEYOPT_PASSIN:
-            if ((pkeyopts_passin == NULL &&
-                 (pkeyopts_passin = sk_OPENSSL_STRING_new_null()) == NULL) ||
-                sk_OPENSSL_STRING_push(pkeyopts_passin, opt_arg()) == 0) {
+            if ((pkeyopts_passin == NULL && (pkeyopts_passin = sk_OPENSSL_STRING_new_null()) == NULL) || sk_OPENSSL_STRING_push(pkeyopts_passin, opt_arg()) == 0) {
                 BIO_puts(bio_err, "out of memory\n");
                 goto end;
             }
@@ -300,24 +321,28 @@ int pkeyutl_main(int argc, char **argv)
     if (kdfalg != NULL) {
         if (kdflen == 0) {
             BIO_printf(bio_err,
-                       "%s: no KDF length given (-kdflen parameter).\n", prog);
+                "%s: no KDF length given (-kdflen parameter).\n", prog);
             goto opthelp;
         }
     } else if (inkey == NULL) {
         BIO_printf(bio_err,
-                   "%s: no private key given (-inkey parameter).\n", prog);
+            "%s: no private key given (-inkey parameter).\n", prog);
         goto opthelp;
     } else if (peerkey != NULL && pkey_op != EVP_PKEY_OP_DERIVE) {
         BIO_printf(bio_err,
-                   "%s: -peerkey option not allowed without -derive.\n", prog);
+            "%s: -peerkey option not allowed without -derive.\n", prog);
         goto opthelp;
     } else if (peerkey == NULL && pkey_op == EVP_PKEY_OP_DERIVE) {
         BIO_printf(bio_err,
-                   "%s: missing -peerkey option for -derive operation.\n", prog);
+            "%s: missing -peerkey option for -derive operation.\n", prog);
         goto opthelp;
     }
 
     pkey = get_pkey(kdfalg, inkey, keyform, key_type, passinarg, pkey_op, e);
+    if (key_type != KEY_NONE && pkey == NULL) {
+        BIO_printf(bio_err, "%s: Error loading key\n", prog);
+        goto end;
+    }
 
     if (pkey_op == EVP_PKEY_OP_VERIFYRECOVER && !EVP_PKEY_is_a(pkey, "RSA")) {
         BIO_printf(bio_err, "%s: -verifyrecover can be used only with RSA\n", prog);
@@ -330,15 +355,15 @@ int pkeyutl_main(int argc, char **argv)
                 const char *alg = EVP_PKEY_get0_type_name(pkey);
 
                 BIO_printf(bio_err,
-                           "%s: -digest (prehash) is not supported with %s\n",
-                           prog, alg != NULL ? alg : "(unknown key type)");
+                    "%s: -digest (prehash) is not supported with %s\n",
+                    prog, alg != NULL ? alg : "(unknown key type)");
                 goto end;
             }
             rawin = 1;
         }
     } else if (digestname != NULL || rawin) {
         BIO_printf(bio_err,
-                   "%s: -digest and -rawin can only be used with -sign or -verify\n", prog);
+            "%s: -digest and -rawin can only be used with -sign or -verify\n", prog);
         goto opthelp;
     }
 
@@ -354,7 +379,7 @@ int pkeyutl_main(int argc, char **argv)
         }
     }
     ctx = init_ctx(kdfalg, &keysize, pkey_op, e, engine_impl, rawin, pkey,
-                   mctx, digestname, kemop, libctx, app_get0_propq());
+        mctx, digestname, kemop, libctx, app_get0_propq());
     if (ctx == NULL) {
         BIO_printf(bio_err, "%s: Error initializing context\n", prog);
         goto end;
@@ -372,7 +397,7 @@ int pkeyutl_main(int argc, char **argv)
 
             if (pkey_ctrl_string(ctx, opt) <= 0) {
                 BIO_printf(bio_err, "%s: Can't set parameter \"%s\":\n",
-                           prog, opt);
+                    prog, opt);
                 goto end;
             }
         }
@@ -393,7 +418,7 @@ int pkeyutl_main(int argc, char **argv)
 
                 BIO_snprintf(passwd_buf, sizeof(passwd_buf), "Enter %s: ", opt);
                 r = EVP_read_pw_string(passwd_buf, sizeof(passwd_buf) - 1,
-                                       passwd_buf, 0);
+                    passwd_buf, 0);
                 if (r < 0) {
                     if (r == -2)
                         BIO_puts(bio_err, "user abort\n");
@@ -421,7 +446,8 @@ int pkeyutl_main(int argc, char **argv)
 
             if (EVP_PKEY_CTX_ctrl_str(ctx, opt, passwd) <= 0) {
                 BIO_printf(bio_err, "%s: Can't set parameter \"%s\":\n",
-                           prog, opt);
+                    prog, opt);
+                OPENSSL_free(passwd);
                 goto end;
             }
             OPENSSL_free(passwd);
@@ -430,13 +456,13 @@ int pkeyutl_main(int argc, char **argv)
 
     if (sigfile != NULL && (pkey_op != EVP_PKEY_OP_VERIFY)) {
         BIO_printf(bio_err,
-                   "%s: Signature file specified for non verify\n", prog);
+            "%s: Signature file specified for non verify\n", prog);
         goto end;
     }
 
     if (sigfile == NULL && (pkey_op == EVP_PKEY_OP_VERIFY)) {
         BIO_printf(bio_err,
-                   "%s: No signature file specified for verify\n", prog);
+            "%s: No signature file specified for verify\n", prog);
         goto end;
     }
 
@@ -455,7 +481,8 @@ int pkeyutl_main(int argc, char **argv)
         if (secoutfile != NULL) {
             BIO_printf(bio_err, "%s: Decapsulation produces only a shared "
                                 "secret and no output. The '-out' option "
-                                "is not applicable.\n", prog);
+                                "is not applicable.\n",
+                prog);
             goto end;
         }
         if ((out = bio_open_owner(outfile, 'w', FORMAT_BINARY)) == NULL)
@@ -481,31 +508,31 @@ int pkeyutl_main(int argc, char **argv)
 
     if (sigfile != NULL) {
         BIO *sigbio = BIO_new_file(sigfile, "rb");
+        size_t maxsiglen = 16 * 1024 * 1024;
 
         if (sigbio == NULL) {
             BIO_printf(bio_err, "Can't open signature file %s\n", sigfile);
             goto end;
         }
-        siglen = bio_to_mem(&sig, keysize * 10, sigbio);
-        BIO_free(sigbio);
-        if (siglen < 0) {
+        if (!bio_to_mem(&sig, &siglen, maxsiglen, sigbio)) {
+            BIO_free(sigbio);
             BIO_printf(bio_err, "Error reading signature data\n");
             goto end;
         }
+        BIO_free(sigbio);
     }
 
     /* Raw input data is handled elsewhere */
     if (in != NULL && !rawin) {
         /* Read the input data */
-        buf_inlen = bio_to_mem(&buf_in, -1, in);
-        if (buf_inlen < 0) {
+        if (!bio_to_mem(&buf_in, &buf_inlen, 0, in)) {
             BIO_printf(bio_err, "Error reading input Data\n");
             goto end;
         }
         if (rev) {
             size_t i;
             unsigned char ctmp;
-            size_t l = (size_t)buf_inlen;
+            size_t l = buf_inlen;
 
             for (i = 0; i < l / 2; i++) {
                 ctmp = buf_in[i];
@@ -520,8 +547,9 @@ int pkeyutl_main(int argc, char **argv)
         && (pkey_op == EVP_PKEY_OP_SIGN || pkey_op == EVP_PKEY_OP_VERIFY)) {
         if (buf_inlen > EVP_MAX_MD_SIZE) {
             BIO_printf(bio_err,
-                       "Error: The non-raw input data length %d is too long - max supported hashed size is %d\n",
-                       buf_inlen, EVP_MAX_MD_SIZE);
+                "Error: The non-raw input data length %zd is too long - "
+                "max supported hashed size is %d\n",
+                buf_inlen, EVP_MAX_MD_SIZE);
             goto end;
         }
     }
@@ -529,10 +557,9 @@ int pkeyutl_main(int argc, char **argv)
     if (pkey_op == EVP_PKEY_OP_VERIFY) {
         if (rawin) {
             rv = do_raw_keyop(pkey_op, mctx, pkey, in, filesize, sig, siglen,
-                              NULL, 0);
+                NULL, 0);
         } else {
-            rv = EVP_PKEY_verify(ctx, sig, (size_t)siglen,
-                                 buf_in, (size_t)buf_inlen);
+            rv = EVP_PKEY_verify(ctx, sig, siglen, buf_in, buf_inlen);
         }
         if (rv == 1) {
             BIO_puts(out, "Signature Verified Successfully\n");
@@ -545,26 +572,25 @@ int pkeyutl_main(int argc, char **argv)
     if (rawin) {
         /* rawin allocates the buffer in do_raw_keyop() */
         rv = do_raw_keyop(pkey_op, mctx, pkey, in, filesize, NULL, 0,
-                          &buf_out, (size_t *)&buf_outlen);
+            &buf_out, (size_t *)&buf_outlen);
     } else {
         if (kdflen != 0) {
             buf_outlen = kdflen;
             rv = 1;
         } else {
-            rv = do_keyop(ctx, pkey_op, NULL, (size_t *)&buf_outlen,
-                          buf_in, (size_t)buf_inlen, NULL, (size_t *)&secretlen);
+            rv = do_keyop(ctx, pkey_op, NULL, &buf_outlen,
+                buf_in, buf_inlen, NULL, &secretlen);
         }
         if (rv > 0
-            && (secretlen > 0 || (pkey_op != EVP_PKEY_OP_ENCAPSULATE
-                                  && pkey_op != EVP_PKEY_OP_DECAPSULATE))
+            && (secretlen > 0 || (pkey_op != EVP_PKEY_OP_ENCAPSULATE && pkey_op != EVP_PKEY_OP_DECAPSULATE))
             && (buf_outlen > 0 || pkey_op == EVP_PKEY_OP_DECAPSULATE)) {
             if (buf_outlen > 0)
                 buf_out = app_malloc(buf_outlen, "buffer output");
             if (secretlen > 0)
                 secret = app_malloc(secretlen, "secret output");
             rv = do_keyop(ctx, pkey_op,
-                          buf_out, (size_t *)&buf_outlen,
-                          buf_in, (size_t)buf_inlen, secret, (size_t *)&secretlen);
+                buf_out, &buf_outlen,
+                buf_in, buf_inlen, secret, &secretlen);
         }
     }
     if (rv <= 0) {
@@ -589,7 +615,7 @@ int pkeyutl_main(int argc, char **argv)
     if (secretlen > 0)
         BIO_write(secout ? secout : out, secret, secretlen);
 
- end:
+end:
     if (ret != 0)
         ERR_print_errors(bio_err);
     EVP_MD_CTX_free(mctx);
@@ -611,15 +637,15 @@ int pkeyutl_main(int argc, char **argv)
 }
 
 static EVP_PKEY *get_pkey(const char *kdfalg,
-                          const char *keyfile, int keyform, int key_type,
-                          char *passinarg, int pkey_op, ENGINE *e)
+    const char *keyfile, int keyform, int key_type,
+    char *passinarg, int pkey_op, ENGINE *e)
 {
     EVP_PKEY *pkey = NULL;
     char *passin = NULL;
     X509 *x;
 
     if (((pkey_op == EVP_PKEY_OP_SIGN) || (pkey_op == EVP_PKEY_OP_DECRYPT)
-         || (pkey_op == EVP_PKEY_OP_DERIVE))
+            || (pkey_op == EVP_PKEY_OP_DERIVE))
         && (key_type != KEY_PRIVKEY && kdfalg == NULL)) {
         BIO_printf(bio_err, "A private key is needed for this operation\n");
         return NULL;
@@ -647,18 +673,17 @@ static EVP_PKEY *get_pkey(const char *kdfalg,
 
     case KEY_NONE:
         break;
-
     }
     OPENSSL_free(passin);
     return pkey;
 }
 
 static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
-                              int pkey_op, ENGINE *e,
-                              const int engine_impl, int rawin,
-                              EVP_PKEY *pkey /* ownership is passed to ctx */,
-                              EVP_MD_CTX *mctx, const char *digestname,
-                              const char *kemop, OSSL_LIB_CTX *libctx, const char *propq)
+    int pkey_op, ENGINE *e,
+    const int engine_impl, int rawin,
+    EVP_PKEY *pkey /* ownership is passed to ctx */,
+    EVP_MD_CTX *mctx, const char *digestname,
+    const char *kemop, OSSL_LIB_CTX *libctx, const char *propq)
 {
     EVP_PKEY_CTX *ctx = NULL;
     ENGINE *impl = NULL;
@@ -676,7 +701,7 @@ static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
             kdfnid = OBJ_ln2nid(kdfalg);
             if (kdfnid == NID_undef) {
                 BIO_printf(bio_err, "The given KDF \"%s\" is unknown.\n",
-                           kdfalg);
+                    kdfalg);
                 return NULL;
             }
         }
@@ -704,12 +729,12 @@ static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
         switch (pkey_op) {
         case EVP_PKEY_OP_SIGN:
             rv = EVP_DigestSignInit_ex(mctx, NULL, digestname, libctx, propq,
-                                       pkey, NULL);
+                pkey, NULL);
             break;
 
         case EVP_PKEY_OP_VERIFY:
             rv = EVP_DigestVerifyInit_ex(mctx, NULL, digestname, libctx, propq,
-                                         pkey, NULL);
+                pkey, NULL);
             break;
         }
 
@@ -762,7 +787,7 @@ static EVP_PKEY_CTX *init_ctx(const char *kdfalg, int *pkeysize,
 }
 
 static int setup_peer(EVP_PKEY_CTX *ctx, int peerform, const char *file,
-                      ENGINE *e)
+    ENGINE *e)
 {
     EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(ctx);
     EVP_PKEY *peer = NULL;
@@ -778,8 +803,8 @@ static int setup_peer(EVP_PKEY_CTX *ctx, int peerform, const char *file,
     }
     if (strcmp(EVP_PKEY_get0_type_name(peer), EVP_PKEY_get0_type_name(pkey)) != 0) {
         BIO_printf(bio_err,
-                   "Type of peer public key: %s does not match type of private key: %s\n",
-                   EVP_PKEY_get0_type_name(peer), EVP_PKEY_get0_type_name(pkey));
+            "Type of peer public key: %s does not match type of private key: %s\n",
+            EVP_PKEY_get0_type_name(peer), EVP_PKEY_get0_type_name(pkey));
         ret = 0;
     } else {
         ret = EVP_PKEY_derive_set_peer(ctx, peer) > 0;
@@ -790,9 +815,9 @@ static int setup_peer(EVP_PKEY_CTX *ctx, int peerform, const char *file,
 }
 
 static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
-                    unsigned char *out, size_t *poutlen,
-                    const unsigned char *in, size_t inlen,
-                    unsigned char *secret, size_t *pseclen)
+    unsigned char *out, size_t *poutlen,
+    const unsigned char *in, size_t inlen,
+    unsigned char *secret, size_t *pseclen)
 {
     int rv = 0;
 
@@ -824,7 +849,6 @@ static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
     case EVP_PKEY_OP_DECAPSULATE:
         rv = EVP_PKEY_decapsulate(ctx, secret, pseclen, in, inlen);
         break;
-
     }
     return rv;
 }
@@ -832,9 +856,9 @@ static int do_keyop(EVP_PKEY_CTX *ctx, int pkey_op,
 #define TBUF_MAXSIZE 2048
 
 static int do_raw_keyop(int pkey_op, EVP_MD_CTX *mctx,
-                        EVP_PKEY *pkey, BIO *in,
-                        int filesize, unsigned char *sig, int siglen,
-                        unsigned char **out, size_t *poutlen)
+    EVP_PKEY *pkey, BIO *in,
+    int filesize, unsigned char *sig, size_t siglen,
+    unsigned char **out, size_t *poutlen)
 {
     int rv = 0;
     unsigned char tbuf[TBUF_MAXSIZE];
@@ -845,7 +869,7 @@ static int do_raw_keyop(int pkey_op, EVP_MD_CTX *mctx,
     if (only_nomd(pkey)) {
         if (filesize < 0) {
             BIO_printf(bio_err,
-                       "Error: unable to determine file size for oneshot operation\n");
+                "Error: unable to determine file size for oneshot operation\n");
             goto end;
         }
         mbuf = app_malloc(filesize, "oneshot sign/verify buffer");
@@ -856,7 +880,7 @@ static int do_raw_keyop(int pkey_op, EVP_MD_CTX *mctx,
                 BIO_printf(bio_err, "Error reading raw input data\n");
                 goto end;
             }
-            rv = EVP_DigestVerify(mctx, sig, (size_t)siglen, mbuf, buf_len);
+            rv = EVP_DigestVerify(mctx, sig, siglen, mbuf, buf_len);
             break;
         case EVP_PKEY_OP_SIGN:
             buf_len = BIO_read(in, mbuf, filesize);
@@ -890,7 +914,7 @@ static int do_raw_keyop(int pkey_op, EVP_MD_CTX *mctx,
                 goto end;
             }
         }
-        rv = EVP_DigestVerifyFinal(mctx, sig, (size_t)siglen);
+        rv = EVP_DigestVerifyFinal(mctx, sig, siglen);
         break;
     case EVP_PKEY_OP_SIGN:
         for (;;) {
@@ -915,7 +939,7 @@ static int do_raw_keyop(int pkey_op, EVP_MD_CTX *mctx,
         break;
     }
 
- end:
+end:
     OPENSSL_free(mbuf);
     return rv;
 }
diff --git a/apps/prime.c b/apps/prime.c
index 23b7e462fc20d..8f373c5e79d80 100644
--- a/apps/prime.c
+++ b/apps/prime.c
@@ -15,7 +15,11 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_HEX, OPT_GENERATE, OPT_BITS, OPT_SAFE, OPT_CHECKS,
+    OPT_HEX,
+    OPT_GENERATE,
+    OPT_BITS,
+    OPT_SAFE,
+    OPT_CHECKS,
     OPT_PROV_ENUM
 } OPTION_CHOICE;
 
@@ -28,33 +32,36 @@ static int check_num(const char *s, const int is_hex)
      */
     if (is_hex) {
         for (i = 0; ('0' <= s[i] && s[i] <= '9')
-                    || ('A' <= s[i] && s[i] <= 'F')
-                    || ('a' <= s[i] && s[i] <= 'f'); i++);
+            || ('A' <= s[i] && s[i] <= 'F')
+            || ('a' <= s[i] && s[i] <= 'f');
+            i++)
+            ;
     } else {
-        for (i = 0;  '0' <= s[i] && s[i] <= '9'; i++);
+        for (i = 0; '0' <= s[i] && s[i] <= '9'; i++)
+            ;
     }
     return s[i] == 0;
 }
 
 const OPTIONS prime_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [number...]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [number...]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"bits", OPT_BITS, 'p', "Size of number in bits"},
-    {"checks", OPT_CHECKS, 'p', "Number of checks"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "bits", OPT_BITS, 'p', "Size of number in bits" },
+    { "checks", OPT_CHECKS, 'p', "Number of checks" },
 
     OPT_SECTION("Output"),
-    {"hex", OPT_HEX, '-', "Hex output"},
-    {"generate", OPT_GENERATE, '-', "Generate a prime"},
-    {"safe", OPT_SAFE, '-',
-     "When used with -generate, generate a safe prime"},
+    { "hex", OPT_HEX, '-', "Hex output" },
+    { "generate", OPT_GENERATE, '-', "Generate a prime" },
+    { "safe", OPT_SAFE, '-',
+        "When used with -generate, generate a safe prime" },
 
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"number", 0, 0, "Number(s) to check for primality if not generating"},
-    {NULL}
+    { "number", 0, 0, "Number(s) to check for primality if not generating" },
+    { NULL }
 };
 
 int prime_main(int argc, char **argv)
@@ -69,7 +76,7 @@ int prime_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
-opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -133,7 +140,7 @@ int prime_main(int argc, char **argv)
         BIO_printf(bio_out, "%s\n", s);
         OPENSSL_free(s);
     } else {
-        for ( ; *argv; argv++) {
+        for (; *argv; argv++) {
             int r = check_num(argv[0], hex);
 
             if (r)
@@ -151,13 +158,13 @@ int prime_main(int argc, char **argv)
                 goto end;
             }
             BIO_printf(bio_out, " (%s) %s prime\n",
-                       argv[0],
-                       r == 1 ? "is" : "is not");
+                argv[0],
+                r == 1 ? "is" : "is not");
         }
     }
 
     ret = 0;
- end:
+end:
     BN_free(bn);
     return ret;
 }
diff --git a/apps/progs.pl b/apps/progs.pl
index 4a1e4be47c692..b0ad006c07ec0 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -19,7 +19,10 @@
     unless ($opt eq '-H' || $opt eq '-C');
 
 my %commands     = ();
-my $cmdre        = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/;
+# I think it is best reconsidered in favour of just a table
+# of commands instead of this fragile regex. There really are not that
+# many commands.
+my $cmdre        = qr/^\s*(int\s+|)\s*([a-z_][a-z0-9_]*)_main\s*\(\s*int\s+argc\s*,/;
 my $apps_openssl = shift @ARGV;
 my $YEAR         = [gmtime($ENV{SOURCE_DATE_EPOCH} || time())]->[5] + 1900;
 
@@ -36,7 +39,7 @@
     open F, $filename or die "Couldn't open $filename: $!\n";
     foreach ( grep /$cmdre/, <F> ) {
         my @foo = /$cmdre/;
-        $commands{$1} = 1;
+        $commands{$2} = 1;
     }
     close F;
 }
diff --git a/apps/rand.c b/apps/rand.c
index b123a151ea74c..fa2dd2401d09b 100644
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-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
@@ -20,30 +20,34 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_OUT, OPT_ENGINE, OPT_BASE64, OPT_HEX,
-    OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_OUT,
+    OPT_ENGINE,
+    OPT_BASE64,
+    OPT_HEX,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS rand_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] num[K|M|G|T]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] num[K|M|G|T]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file"},
-    {"base64", OPT_BASE64, '-', "Base64 encode output"},
-    {"hex", OPT_HEX, '-', "Hex encode output"},
+    { "out", OPT_OUT, '>', "Output file" },
+    { "base64", OPT_BASE64, '-', "Base64 encode output" },
+    { "hex", OPT_HEX, '-', "Hex encode output" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"num", 0, 0, "Number of bytes to generate"},
-    {NULL}
+    { "num", 0, 0, "Number of bytes to generate" },
+    { NULL }
 };
 
 int rand_main(int argc, char **argv)
@@ -63,7 +67,7 @@ int rand_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -124,7 +128,7 @@ int rand_main(int argc, char **argv)
              */
             while (argv[0][factoridx]) {
                 if (!isdigit((int)(argv[0][factoridx]))) {
-                    switch(argv[0][factoridx]) {
+                    switch (argv[0][factoridx]) {
                     case 'K':
                         shift = 10;
                         break;
@@ -139,7 +143,7 @@ int rand_main(int argc, char **argv)
                         break;
                     default:
                         BIO_printf(bio_err, "Invalid size suffix %s\n",
-                                   &argv[0][factoridx]);
+                            &argv[0][factoridx]);
                         goto opthelp;
                     }
                     break;
@@ -149,7 +153,7 @@ int rand_main(int argc, char **argv)
 
             if (shift != 0 && strlen(&argv[0][factoridx]) != 1) {
                 BIO_printf(bio_err, "Invalid size suffix %s\n",
-                           &argv[0][factoridx]);
+                    &argv[0][factoridx]);
                 goto opthelp;
             }
         }
@@ -164,7 +168,7 @@ int rand_main(int argc, char **argv)
             /* check for overflow */
             if ((UINT64_MAX >> shift) < (size_t)num) {
                 BIO_printf(bio_err, "%lu bytes with suffix overflows\n",
-                           num);
+                    num);
                 goto opthelp;
             }
             scaled_num = num << shift;
@@ -199,7 +203,7 @@ int rand_main(int argc, char **argv)
         int chunk;
 
         chunk = scaled_num > buflen ? (int)buflen : (int)scaled_num;
-        r = RAND_bytes(buf, chunk);
+        r = RAND_bytes_ex(app_get0_libctx(), buf, chunk, 0);
         if (r <= 0)
             goto end;
         if (format != FORMAT_TEXT) {
@@ -219,7 +223,7 @@ int rand_main(int argc, char **argv)
 
     ret = 0;
 
- end:
+end:
     if (ret != 0)
         ERR_print_errors(bio_err);
     OPENSSL_free(buf);
diff --git a/apps/rehash.c b/apps/rehash.c
index e6b12d36fb6f7..e2083fa76bf1c 100644
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -12,15 +12,14 @@
 #include "apps.h"
 #include "progs.h"
 
-#if defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) || \
-    (defined(__VMS) && defined(__DECC) && __CRTL_VER >= 80300000)
-# include <unistd.h>
-# include <stdio.h>
-# include <limits.h>
-# include <errno.h>
-# include <string.h>
-# include <ctype.h>
-# include <sys/stat.h>
+#if defined(OPENSSL_SYS_UNIX) || defined(__APPLE__) || (defined(__VMS) && defined(__DECC) && __CRTL_VER >= 80300000)
+#include <unistd.h>
+#include <stdio.h>
+#include <limits.h>
+#include <errno.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/stat.h>
 
 /*
  * Make sure that the processing of symbol names is treated the same as when
@@ -28,32 +27,32 @@
  * include/openssl/__DECC_INCLUDE_PROLOGUE.H and __DECC_INCLUDE_EPILOGUE.H),
  * but not for internal headers.
  */
-# ifdef __VMS
-#  pragma names save
-#  pragma names as_is,shortened
-# endif
+#ifdef __VMS
+#pragma names save
+#pragma names as_is, shortened
+#endif
 
-# include "internal/o_dir.h"
+#include "internal/o_dir.h"
 
-# ifdef __VMS
-#  pragma names restore
-# endif
+#ifdef __VMS
+#pragma names restore
+#endif
 
-# include <openssl/evp.h>
-# include <openssl/pem.h>
-# include <openssl/x509.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
 
-# ifndef PATH_MAX
-#  define PATH_MAX 4096
-# endif
-# define MAX_COLLISIONS  256
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+#define MAX_COLLISIONS 256
 
-# if defined(OPENSSL_SYS_VXWORKS)
+#if defined(OPENSSL_SYS_VXWORKS)
 /*
  * VxWorks has no symbolic links
  */
 
-#  define lstat(path, buf) stat(path, buf)
+#define lstat(path, buf) stat(path, buf)
 
 int symlink(const char *target, const char *linkpath)
 {
@@ -66,7 +65,7 @@ ssize_t readlink(const char *pathname, char *buf, size_t bufsiz)
     errno = ENOSYS;
     return -1;
 }
-# endif
+#endif
 
 typedef struct hentry_st {
     struct hentry_st *next;
@@ -86,14 +85,16 @@ typedef struct bucket_st {
 
 enum Type {
     /* Keep in sync with |suffixes|, below. */
-    TYPE_CERT=0, TYPE_CRL=1
+    TYPE_CERT = 0,
+    TYPE_CRL = 1
 };
 
 enum Hash {
-    HASH_OLD, HASH_NEW, HASH_BOTH
+    HASH_OLD,
+    HASH_NEW,
+    HASH_BOTH
 };
 
-
 static int evpmdsize;
 static const EVP_MD *evpmd;
 static int remove_links = 1;
@@ -103,7 +104,6 @@ static BUCKET *hash_table[257];
 static const char *suffixes[] = { "", "r" };
 static const char *extensions[] = { "pem", "crt", "cer", "crl" };
 
-
 static void bit_set(unsigned char *set, unsigned int bit)
 {
     set[bit >> 3] |= 1 << (bit & 0x7);
@@ -114,13 +114,12 @@ static int bit_isset(unsigned char *set, unsigned int bit)
     return set[bit >> 3] & (1 << (bit & 0x7));
 }
 
-
 /*
  * Process an entry; return number of errors.
  */
 static int add_entry(enum Type type, unsigned int hash, const char *filename,
-                      const unsigned char *digest, int need_symlink,
-                      unsigned short old_id)
+    const unsigned char *digest, int need_symlink,
+    unsigned short old_id)
 {
     static BUCKET nilbucket;
     static HENTRY nilhentry;
@@ -143,9 +142,9 @@ static int add_entry(enum Type type, unsigned int hash, const char *filename,
     for (ep = bp->first_entry; ep; ep = ep->next) {
         if (digest && memcmp(digest, ep->digest, (size_t)evpmdsize) == 0) {
             BIO_printf(bio_err,
-                       "%s: warning: skipping duplicate %s in %s\n",
-                       opt_getprog(),
-                       type == TYPE_CERT ? "certificate" : "CRL", filename);
+                "%s: warning: skipping duplicate %s in %s\n",
+                opt_getprog(),
+                type == TYPE_CERT ? "certificate" : "CRL", filename);
             return 0;
         }
         if (strcmp(filename, ep->filename) == 0) {
@@ -158,8 +157,8 @@ static int add_entry(enum Type type, unsigned int hash, const char *filename,
     if (ep == NULL) {
         if (bp->num_needed >= MAX_COLLISIONS) {
             BIO_printf(bio_err,
-                       "%s: error: hash table overflow for %s\n",
-                       opt_getprog(), filename);
+                "%s: error: hash table overflow for %s\n",
+                opt_getprog(), filename);
             return 1;
         }
         ep = app_malloc(sizeof(*ep), "collision bucket");
@@ -212,7 +211,8 @@ static int handle_symlink(const char *filename, const char *fullpath)
         return -1;
     for (type = OSSL_NELEM(suffixes) - 1; type > 0; type--)
         if (OPENSSL_strncasecmp(&filename[i],
-                                suffixes[type], strlen(suffixes[type])) == 0)
+                suffixes[type], strlen(suffixes[type]))
+            == 0)
             break;
 
     i += strlen(suffixes[type]);
@@ -234,7 +234,7 @@ static int handle_symlink(const char *filename, const char *fullpath)
  */
 static int do_file(const char *filename, const char *fullpath, enum Hash h)
 {
-    STACK_OF (X509_INFO) *inf = NULL;
+    STACK_OF(X509_INFO) *inf = NULL;
     X509_INFO *x;
     const X509_NAME *name = NULL;
     BIO *b;
@@ -256,7 +256,7 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h)
     /* Does it have X.509 data in it? */
     if ((b = BIO_new_file(fullpath, "r")) == NULL) {
         BIO_printf(bio_err, "%s: error: skipping %s, cannot open file\n",
-                   opt_getprog(), filename);
+            opt_getprog(), filename);
         errs++;
         goto end;
     }
@@ -267,9 +267,9 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h)
 
     if (sk_X509_INFO_num(inf) != 1) {
         BIO_printf(bio_err,
-                   "%s: warning: skipping %s, "
-                   "it does not contain exactly one certificate or CRL\n",
-                   opt_getprog(), filename);
+            "%s: warning: skipping %s, "
+            "it does not contain exactly one certificate or CRL\n",
+            opt_getprog(), filename);
         /* This is not an error. */
         goto end;
     }
@@ -297,21 +297,20 @@ static int do_file(const char *filename, const char *fullpath, enum Hash h)
     if (name != NULL) {
         if (h == HASH_NEW || h == HASH_BOTH) {
             int ok;
-            unsigned long hash_value =
-                X509_NAME_hash_ex(name,
-                                  app_get0_libctx(), app_get0_propq(), &ok);
+            unsigned long hash_value = X509_NAME_hash_ex(name,
+                app_get0_libctx(), app_get0_propq(), &ok);
 
             if (ok) {
                 errs += add_entry(type, hash_value, filename, digest, 1, ~0);
             } else {
                 BIO_printf(bio_err, "%s: error calculating SHA1 hash value\n",
-                           opt_getprog());
+                    opt_getprog());
                 errs++;
             }
         }
         if ((h == HASH_OLD) || (h == HASH_BOTH))
             errs += add_entry(type, X509_NAME_hash_old(name),
-                              filename, digest, 1, ~0);
+                filename, digest, 1, ~0);
     }
 
 end:
@@ -328,17 +327,17 @@ static int ends_with_dirsep(const char *path)
 {
     if (*path != '\0')
         path += strlen(path) - 1;
-# if defined __VMS
+#if defined __VMS
     if (*path == ']' || *path == '>' || *path == ':')
         return 1;
-# elif defined _WIN32
+#elif defined _WIN32
     if (*path == '\\')
         return 1;
-# endif
+#endif
     return *path == '/';
 }
 
-static int sk_strcmp(const char * const *a, const char * const *b)
+static int sk_strcmp(const char *const *a, const char *const *b)
 {
     return strcmp(*a, *b);
 }
@@ -382,7 +381,7 @@ static int do_dir(const char *dirname, enum Hash h)
         size_t fname_len = strlen(filename);
 
         if ((copy = OPENSSL_strdup(filename)) == NULL
-                || sk_OPENSSL_STRING_push(files, copy) == 0) {
+            || sk_OPENSSL_STRING_push(files, copy) == 0) {
             OPENSSL_free(copy);
             OPENSSL_DIR_end(&d);
             BIO_puts(bio_err, "out of memory\n");
@@ -402,7 +401,8 @@ static int do_dir(const char *dirname, enum Hash h)
     for (n = 0; n < numfiles; ++n) {
         filename = sk_OPENSSL_STRING_value(files, n);
         if (BIO_snprintf(buf, buflen, "%s%s%s",
-                         dirname, pathsep, filename) >= buflen)
+                dirname, pathsep, filename)
+            >= buflen)
             continue;
         if (lstat(buf, &st) < 0)
             continue;
@@ -425,47 +425,47 @@ static int do_dir(const char *dirname, enum Hash h)
                 if (ep->old_id < bp->num_needed) {
                     /* Link exists, and is used as-is */
                     BIO_snprintf(buf, buflen, "%08x.%s%d", bp->hash,
-                                 suffixes[bp->type], ep->old_id);
+                        suffixes[bp->type], ep->old_id);
                     if (verbose)
                         BIO_printf(bio_out, "link %s -> %s\n",
-                                   ep->filename, buf);
+                            ep->filename, buf);
                 } else if (ep->need_symlink) {
                     /* New link needed (it may replace something) */
                     while (bit_isset(idmask, nextid))
                         nextid++;
 
                     BIO_snprintf(buf, buflen, "%s%s%08x.%s%d",
-                                 dirname, pathsep, bp->hash,
-                                 suffixes[bp->type], nextid);
+                        dirname, pathsep, bp->hash,
+                        suffixes[bp->type], nextid);
                     if (verbose)
                         BIO_printf(bio_out, "link %s -> %s\n",
-                                   ep->filename, &buf[dirlen]);
+                            ep->filename, &buf[dirlen]);
                     if (unlink(buf) < 0 && errno != ENOENT) {
                         BIO_printf(bio_err,
-                                   "%s: Can't unlink %s, %s\n",
-                                   opt_getprog(), buf, strerror(errno));
+                            "%s: Can't unlink %s, %s\n",
+                            opt_getprog(), buf, strerror(errno));
                         errs++;
                     }
                     if (symlink(ep->filename, buf) < 0) {
                         BIO_printf(bio_err,
-                                   "%s: Can't symlink %s, %s\n",
-                                   opt_getprog(), ep->filename,
-                                   strerror(errno));
+                            "%s: Can't symlink %s, %s\n",
+                            opt_getprog(), ep->filename,
+                            strerror(errno));
                         errs++;
                     }
                     bit_set(idmask, nextid);
                 } else if (remove_links) {
                     /* Link to be deleted */
                     BIO_snprintf(buf, buflen, "%s%s%08x.%s%d",
-                                 dirname, pathsep, bp->hash,
-                                 suffixes[bp->type], ep->old_id);
+                        dirname, pathsep, bp->hash,
+                        suffixes[bp->type], ep->old_id);
                     if (verbose)
                         BIO_printf(bio_out, "unlink %s\n",
-                                   &buf[dirlen]);
+                            &buf[dirlen]);
                     if (unlink(buf) < 0 && errno != ENOENT) {
                         BIO_printf(bio_err,
-                                   "%s: Can't unlink %s, %s\n",
-                                   opt_getprog(), buf, strerror(errno));
+                            "%s: Can't unlink %s, %s\n",
+                            opt_getprog(), buf, strerror(errno));
                         errs++;
                     }
                 }
@@ -477,7 +477,7 @@ static int do_dir(const char *dirname, enum Hash h)
         hash_table[i] = NULL;
     }
 
- err:
+err:
     sk_OPENSSL_STRING_pop_free(files, str_free);
     OPENSSL_free(buf);
     return errs;
@@ -485,31 +485,33 @@ static int do_dir(const char *dirname, enum Hash h)
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_COMPAT, OPT_OLD, OPT_N, OPT_VERBOSE,
+    OPT_COMPAT,
+    OPT_OLD,
+    OPT_N,
+    OPT_VERBOSE,
     OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS rehash_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [directory...]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [directory...]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"h", OPT_HELP, '-', "Display this summary"},
-    {"compat", OPT_COMPAT, '-', "Create both new- and old-style hash links"},
-    {"old", OPT_OLD, '-', "Use old-style hash to generate links"},
-    {"n", OPT_N, '-', "Do not remove existing links"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "h", OPT_HELP, '-', "Display this summary" },
+    { "compat", OPT_COMPAT, '-', "Create both new- and old-style hash links" },
+    { "old", OPT_OLD, '-', "Use old-style hash to generate links" },
+    { "n", OPT_N, '-', "Do not remove existing links" },
 
     OPT_SECTION("Output"),
-    {"v", OPT_VERBOSE, '-', "Verbose output"},
+    { "v", OPT_VERBOSE, '-', "Verbose output" },
 
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"directory", 0, 0, "One or more directories to process (optional)"},
-    {NULL}
+    { "directory", 0, 0, "One or more directories to process (optional)" },
+    { NULL }
 };
 
-
 int rehash_main(int argc, char **argv)
 {
     const char *env, *prog;
@@ -575,13 +577,13 @@ int rehash_main(int argc, char **argv)
         errs += do_dir(X509_get_default_cert_dir(), h);
     }
 
- end:
+end:
     return errs;
 }
 
 #else
 const OPTIONS rehash_options[] = {
-    {NULL}
+    { NULL }
 };
 
 int rehash_main(int argc, char **argv)
diff --git a/apps/req.c b/apps/req.c
index c5627ffda5427..1dad6abcc7504 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -28,51 +28,51 @@
 #include <openssl/lhash.h>
 #include <openssl/rsa.h>
 #ifndef OPENSSL_NO_DSA
-# include <openssl/dsa.h>
+#include <openssl/dsa.h>
 #endif
-#include "internal/e_os.h"    /* For isatty() */
+#include "internal/e_os.h" /* For isatty() */
 
-#define BITS               "default_bits"
-#define KEYFILE            "default_keyfile"
-#define PROMPT             "prompt"
+#define BITS "default_bits"
+#define KEYFILE "default_keyfile"
+#define PROMPT "prompt"
 #define DISTINGUISHED_NAME "distinguished_name"
-#define ATTRIBUTES         "attributes"
-#define V3_EXTENSIONS      "x509_extensions"
-#define REQ_EXTENSIONS     "req_extensions"
-#define STRING_MASK        "string_mask"
-#define UTF8_IN            "utf8"
+#define ATTRIBUTES "attributes"
+#define V3_EXTENSIONS "x509_extensions"
+#define REQ_EXTENSIONS "req_extensions"
+#define STRING_MASK "string_mask"
+#define UTF8_IN "utf8"
 
 #define DEFAULT_KEY_LENGTH 2048
-#define MIN_KEY_LENGTH     512
-#define DEFAULT_DAYS       30 /* default certificate validity period in days */
-#define UNSET_DAYS         -2 /* -1 may be used for testing expiration checks */
-#define EXT_COPY_UNSET     -1
+#define MIN_KEY_LENGTH 512
+#define DEFAULT_DAYS 30 /* default certificate validity period in days */
+#define UNSET_DAYS -2 /* -1 may be used for testing expiration checks */
+#define EXT_COPY_UNSET -1
 
 static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, X509_NAME *fsubj,
-                    int mutlirdn, int attribs, unsigned long chtype);
+    int mutlirdn, int attribs, unsigned long chtype);
 static int prompt_info(X509_REQ *req,
-                       STACK_OF(CONF_VALUE) *dn_sk, const char *dn_sect,
-                       STACK_OF(CONF_VALUE) *attr_sk, const char *attr_sect,
-                       int attribs, unsigned long chtype);
+    STACK_OF(CONF_VALUE) *dn_sk, const char *dn_sect,
+    STACK_OF(CONF_VALUE) *attr_sk, const char *attr_sect,
+    int attribs, unsigned long chtype);
 static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *sk,
-                     STACK_OF(CONF_VALUE) *attr, int attribs,
-                     unsigned long chtype);
+    STACK_OF(CONF_VALUE) *attr, int attribs,
+    unsigned long chtype);
 static int add_attribute_object(X509_REQ *req, char *text, const char *def,
-                                char *value, int nid, int n_min, int n_max,
-                                unsigned long chtype);
+    char *value, int nid, int n_min, int n_max,
+    unsigned long chtype);
 static int add_DN_object(X509_NAME *n, char *text, const char *def,
-                         char *value, int nid, int n_min, int n_max,
-                         unsigned long chtype, int mval);
+    char *value, int nid, int n_min, int n_max,
+    unsigned long chtype, int mval);
 static int build_data(char *text, const char *def, char *value,
-                      int n_min, int n_max, char *buf, const int buf_size,
-                      const char *desc1, const char *desc2);
+    int n_min, int n_max, char *buf, const int buf_size,
+    const char *desc1, const char *desc2);
 static int req_check_len(int len, int n_min, int n_max);
 static int check_end(const char *str, const char *end);
 static int join(char buf[], size_t buf_size, const char *name,
-                const char *tail, const char *desc);
+    const char *tail, const char *desc);
 static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
-                                    char **pkeytype, long *pkeylen,
-                                    ENGINE *keygen_engine);
+    char **pkeytype, long *pkeylen,
+    ENGINE *keygen_engine);
 
 static const char *section = "req";
 static CONF *req_conf = NULL;
@@ -82,99 +82,138 @@ static int batch = 0;
 typedef enum OPTION_choice {
     OPT_COMMON,
     OPT_CIPHER,
-    OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_KEYGEN_ENGINE, OPT_KEY,
-    OPT_PUBKEY, OPT_NEW, OPT_CONFIG, OPT_KEYFORM, OPT_IN, OPT_OUT,
-    OPT_KEYOUT, OPT_PASSIN, OPT_PASSOUT, OPT_NEWKEY,
-    OPT_PKEYOPT, OPT_SIGOPT, OPT_VFYOPT, OPT_BATCH, OPT_NEWHDR, OPT_MODULUS,
-    OPT_VERIFY, OPT_NOENC, OPT_NODES, OPT_NOOUT, OPT_VERBOSE, OPT_UTF8,
-    OPT_NAMEOPT, OPT_REQOPT, OPT_SUBJ, OPT_SUBJECT, OPT_TEXT,
-    OPT_X509, OPT_X509V1, OPT_CA, OPT_CAKEY,
-    OPT_MULTIVALUE_RDN, OPT_NOT_BEFORE, OPT_NOT_AFTER, OPT_DAYS, OPT_SET_SERIAL,
-    OPT_COPY_EXTENSIONS, OPT_EXTENSIONS, OPT_REQEXTS, OPT_ADDEXT,
-    OPT_PRECERT, OPT_MD,
-    OPT_SECTION, OPT_QUIET,
-    OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_ENGINE,
+    OPT_KEYGEN_ENGINE,
+    OPT_KEY,
+    OPT_PUBKEY,
+    OPT_NEW,
+    OPT_CONFIG,
+    OPT_KEYFORM,
+    OPT_IN,
+    OPT_OUT,
+    OPT_KEYOUT,
+    OPT_PASSIN,
+    OPT_PASSOUT,
+    OPT_NEWKEY,
+    OPT_PKEYOPT,
+    OPT_SIGOPT,
+    OPT_VFYOPT,
+    OPT_BATCH,
+    OPT_NEWHDR,
+    OPT_MODULUS,
+    OPT_VERIFY,
+    OPT_NOENC,
+    OPT_NODES,
+    OPT_NOOUT,
+    OPT_VERBOSE,
+    OPT_UTF8,
+    OPT_NAMEOPT,
+    OPT_REQOPT,
+    OPT_SUBJ,
+    OPT_SUBJECT,
+    OPT_TEXT,
+    OPT_X509,
+    OPT_X509V1,
+    OPT_CA,
+    OPT_CAKEY,
+    OPT_MULTIVALUE_RDN,
+    OPT_NOT_BEFORE,
+    OPT_NOT_AFTER,
+    OPT_DAYS,
+    OPT_SET_SERIAL,
+    OPT_COPY_EXTENSIONS,
+    OPT_EXTENSIONS,
+    OPT_REQEXTS,
+    OPT_ADDEXT,
+    OPT_PRECERT,
+    OPT_MD,
+    OPT_SECTION,
+    OPT_QUIET,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS req_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"cipher", OPT_CIPHER, 's', "Specify the cipher for private key encryption"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "cipher", OPT_CIPHER, 's', "Specify the cipher for private key encryption" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
-    {"keygen_engine", OPT_KEYGEN_ENGINE, 's',
-     "Specify engine to be used for key generation operations"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
+    { "keygen_engine", OPT_KEYGEN_ENGINE, 's',
+        "Specify engine to be used for key generation operations" },
 #endif
-    {"in", OPT_IN, '<', "X.509 request input file (default stdin)"},
-    {"inform", OPT_INFORM, 'F',
-     "CSR input format to use (PEM or DER; by default try PEM first)"},
-    {"verify", OPT_VERIFY, '-', "Verify self-signature on the request"},
+    { "in", OPT_IN, '<', "X.509 request input file (default stdin)" },
+    { "inform", OPT_INFORM, 'F',
+        "CSR input format to use (PEM or DER; by default try PEM first)" },
+    { "verify", OPT_VERIFY, '-', "Verify self-signature on the request" },
 
     OPT_SECTION("Certificate"),
-    {"new", OPT_NEW, '-', "New request"},
-    {"config", OPT_CONFIG, '<', "Request template file"},
-    {"section", OPT_SECTION, 's', "Config section to use (default \"req\")"},
-    {"utf8", OPT_UTF8, '-', "Input characters are UTF8 (default ASCII)"},
-    {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"},
-    {"reqopt", OPT_REQOPT, 's', "Various request text options"},
-    {"text", OPT_TEXT, '-', "Text form of request"},
-    {"x509", OPT_X509, '-',
-     "Output an X.509 certificate structure instead of a cert request"},
-    {"x509v1", OPT_X509V1, '-', "Request cert generation with X.509 version 1"},
-    {"CA", OPT_CA, '<', "Issuer cert to use for signing a cert, implies -x509"},
-    {"CAkey", OPT_CAKEY, 's',
-     "Issuer private key to use with -CA; default is -CA arg"},
-    {OPT_MORE_STR, 1, 1, "(Required by some CA's)"},
-    {"subj", OPT_SUBJ, 's', "Set or modify subject of request or cert"},
-    {"subject", OPT_SUBJECT, '-',
-     "Print the subject of the output request or cert"},
-    {"multivalue-rdn", OPT_MULTIVALUE_RDN, '-',
-     "Deprecated; multi-valued RDNs support is always on."},
-    {"not_before", OPT_NOT_BEFORE, 's',
-     "[CC]YYMMDDHHMMSSZ value for notBefore certificate field"},
-    {"not_after", OPT_NOT_AFTER, 's',
-     "[CC]YYMMDDHHMMSSZ value for notAfter certificate field, overrides -days"},
-    {"days", OPT_DAYS, 'p', "Number of days certificate is valid for"},
-    {"set_serial", OPT_SET_SERIAL, 's', "Serial number to use"},
-    {"copy_extensions", OPT_COPY_EXTENSIONS, 's',
-     "copy extensions from request when using -x509"},
-    {"extensions", OPT_EXTENSIONS, 's',
-     "Cert or request extension section (override value in config file)"},
-    {"reqexts", OPT_REQEXTS, 's', "An alias for -extensions"},
-    {"addext", OPT_ADDEXT, 's',
-     "Additional cert extension key=value pair (may be given more than once)"},
-    {"precert", OPT_PRECERT, '-', "Add a poison extension to generated cert (implies -new)"},
+    { "new", OPT_NEW, '-', "New request" },
+    { "config", OPT_CONFIG, '<', "Request template file" },
+    { "section", OPT_SECTION, 's', "Config section to use (default \"req\")" },
+    { "utf8", OPT_UTF8, '-', "Input characters are UTF8 (default ASCII)" },
+    { "nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options" },
+    { "reqopt", OPT_REQOPT, 's', "Various request text options" },
+    { "text", OPT_TEXT, '-', "Text form of request" },
+    { "x509", OPT_X509, '-',
+        "Output an X.509 certificate structure instead of a cert request" },
+    { "x509v1", OPT_X509V1, '-', "Request cert generation with X.509 version 1" },
+    { "CA", OPT_CA, '<', "Issuer cert to use for signing a cert, implies -x509" },
+    { "CAkey", OPT_CAKEY, 's',
+        "Issuer private key to use with -CA; default is -CA arg" },
+    { OPT_MORE_STR, 1, 1, "(Required by some CA's)" },
+    { "subj", OPT_SUBJ, 's', "Set or modify subject of request or cert" },
+    { "subject", OPT_SUBJECT, '-',
+        "Print the subject of the output request or cert" },
+    { "multivalue-rdn", OPT_MULTIVALUE_RDN, '-',
+        "Deprecated; multi-valued RDNs support is always on." },
+    { "not_before", OPT_NOT_BEFORE, 's',
+        "[CC]YYMMDDHHMMSSZ value for notBefore certificate field" },
+    { "not_after", OPT_NOT_AFTER, 's',
+        "[CC]YYMMDDHHMMSSZ value for notAfter certificate field, overrides -days" },
+    { "days", OPT_DAYS, 'p', "Number of days certificate is valid for" },
+    { "set_serial", OPT_SET_SERIAL, 's', "Serial number to use" },
+    { "copy_extensions", OPT_COPY_EXTENSIONS, 's',
+        "copy extensions from request when using -x509" },
+    { "extensions", OPT_EXTENSIONS, 's',
+        "Cert or request extension section (override value in config file)" },
+    { "reqexts", OPT_REQEXTS, 's', "An alias for -extensions" },
+    { "addext", OPT_ADDEXT, 's',
+        "Additional cert extension key=value pair (may be given more than once)" },
+    { "precert", OPT_PRECERT, '-', "Add a poison extension to generated cert (implies -new)" },
 
     OPT_SECTION("Keys and Signing"),
-    {"key", OPT_KEY, 's', "Key for signing, and to include unless -in given"},
-    {"keyform", OPT_KEYFORM, 'f', "Key file format (ENGINE, other values ignored)"},
-    {"pubkey", OPT_PUBKEY, '-', "Output public key"},
-    {"keyout", OPT_KEYOUT, '>', "File to write private key to"},
-    {"passin", OPT_PASSIN, 's', "Private key and certificate password source"},
-    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
-    {"newkey", OPT_NEWKEY, 's',
-     "Generate new key with [<alg>:]<nbits> or <alg>[:<file>] or param:<file>"},
-    {"pkeyopt", OPT_PKEYOPT, 's', "Public key options as opt:value"},
-    {"sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form"},
-    {"vfyopt", OPT_VFYOPT, 's', "Verification parameter in n:v form"},
-    {"", OPT_MD, '-', "Any supported digest"},
+    { "key", OPT_KEY, 's', "Key for signing, and to include unless -in given" },
+    { "keyform", OPT_KEYFORM, 'f', "Key file format (ENGINE, other values ignored)" },
+    { "pubkey", OPT_PUBKEY, '-', "Output public key" },
+    { "keyout", OPT_KEYOUT, '>', "File to write private key to" },
+    { "passin", OPT_PASSIN, 's', "Private key and certificate password source" },
+    { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
+    { "newkey", OPT_NEWKEY, 's',
+        "Generate new key with [<alg>:]<nbits> or <alg>[:<file>] or param:<file>" },
+    { "pkeyopt", OPT_PKEYOPT, 's', "Public key options as opt:value" },
+    { "sigopt", OPT_SIGOPT, 's', "Signature parameter in n:v form" },
+    { "vfyopt", OPT_VFYOPT, 's', "Verification parameter in n:v form" },
+    { "", OPT_MD, '-', "Any supported digest" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file"},
-    {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
-    {"batch", OPT_BATCH, '-',
-     "Do not ask anything during request generation"},
-    {"verbose", OPT_VERBOSE, '-', "Verbose output"},
-    {"quiet", OPT_QUIET, '-', "Terse output"},
-    {"noenc", OPT_NOENC, '-', "Don't encrypt private keys"},
-    {"nodes", OPT_NODES, '-', "Don't encrypt private keys; deprecated"},
-    {"noout", OPT_NOOUT, '-', "Do not output REQ"},
-    {"newhdr", OPT_NEWHDR, '-', "Output \"NEW\" in the header lines"},
-    {"modulus", OPT_MODULUS, '-', "RSA modulus"},
+    { "out", OPT_OUT, '>', "Output file" },
+    { "outform", OPT_OUTFORM, 'F', "Output format - DER or PEM" },
+    { "batch", OPT_BATCH, '-',
+        "Do not ask anything during request generation" },
+    { "verbose", OPT_VERBOSE, '-', "Verbose output" },
+    { "quiet", OPT_QUIET, '-', "Terse output" },
+    { "noenc", OPT_NOENC, '-', "Don't encrypt private keys" },
+    { "nodes", OPT_NODES, '-', "Don't encrypt private keys; deprecated" },
+    { "noout", OPT_NOOUT, '-', "Do not output REQ" },
+    { "newhdr", OPT_NEWHDR, '-', "Output \"NEW\" in the header lines" },
+    { "modulus", OPT_MODULUS, '-', "RSA modulus" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 /*
@@ -283,7 +322,7 @@ int req_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -360,7 +399,7 @@ int req_main(int argc, char **argv)
             if (pkeyopts == NULL)
                 pkeyopts = sk_OPENSSL_STRING_new_null();
             if (pkeyopts == NULL
-                    || !sk_OPENSSL_STRING_push(pkeyopts, opt_arg()))
+                || !sk_OPENSSL_STRING_push(pkeyopts, opt_arg()))
                 goto opthelp;
             break;
         case OPT_SIGOPT:
@@ -439,7 +478,7 @@ int req_main(int argc, char **argv)
             days = atoi(opt_arg());
             if (days <= UNSET_DAYS) {
                 BIO_printf(bio_err, "%s: -days parameter arg must be >= -1\n",
-                           prog);
+                    prog);
                 goto end;
             }
             break;
@@ -464,7 +503,7 @@ int req_main(int argc, char **argv)
         case OPT_COPY_EXTENSIONS:
             if (!set_ext_copy(&ext_copy, opt_arg())) {
                 BIO_printf(bio_err, "Invalid extension copy option: \"%s\"\n",
-                           opt_arg());
+                    opt_arg());
                 goto end;
             }
             break;
@@ -526,7 +565,7 @@ int req_main(int argc, char **argv)
             newreq = 1;
         else if (!newreq && isatty(fileno_stdin()))
             BIO_printf(bio_err,
-                       "Warning: Will read cert request from stdin since no -in option is given\n");
+                "Warning: Will read cert request from stdin since no -in option is given\n");
     }
 
     if (!app_passwd(passargin, passargout, &passin, &passout)) {
@@ -539,7 +578,7 @@ int req_main(int argc, char **argv)
     if (addext_bio != NULL) {
         if (verbose)
             BIO_printf(bio_err,
-                       "Using additional configuration from -addext options\n");
+                "Using additional configuration from -addext options\n");
         if ((addext_conf = app_load_config_bio(addext_bio, NULL)) == NULL)
             goto end;
     }
@@ -554,7 +593,7 @@ int req_main(int argc, char **argv)
             if (oid_bio == NULL) {
                 if (verbose)
                     BIO_printf(bio_err,
-                               "Problems opening '%s' for extra OIDs\n", p);
+                        "Problems opening '%s' for extra OIDs\n", p);
             } else {
                 OBJ_create_objects(oid_bio);
                 BIO_free(oid_bio);
@@ -577,7 +616,7 @@ int req_main(int argc, char **argv)
 
     if (extsect == NULL)
         extsect = app_conf_try_string(req_conf, section,
-                                   gen_x509 ? V3_EXTENSIONS : REQ_EXTENSIONS);
+            gen_x509 ? V3_EXTENSIONS : REQ_EXTENSIONS);
     if (extsect != NULL) {
         /* Check syntax of extension section in config file */
         X509V3_CTX ctx;
@@ -586,8 +625,8 @@ int req_main(int argc, char **argv)
         X509V3_set_nconf(&ctx, req_conf);
         if (!X509V3_EXT_add_nconf(req_conf, &ctx, extsect, NULL)) {
             BIO_printf(bio_err,
-                       "Error checking %s extension section %s\n",
-                       gen_x509 ? "x509" : "request", extsect);
+                "Error checking %s extension section %s\n",
+                gen_x509 ? "x509" : "request", extsect);
             goto end;
         }
     }
@@ -604,12 +643,10 @@ int req_main(int argc, char **argv)
     }
 
     if (passin == NULL)
-        passin = nofree_passin =
-            app_conf_try_string(req_conf, section, "input_password");
+        passin = nofree_passin = app_conf_try_string(req_conf, section, "input_password");
 
     if (passout == NULL)
-        passout = nofree_passout =
-            app_conf_try_string(req_conf, section, "output_password");
+        passout = nofree_passout = app_conf_try_string(req_conf, section, "output_password");
 
     p = app_conf_try_string(req_conf, section, STRING_MASK);
     if (p != NULL && !ASN1_STRING_set_default_mask_asc(p)) {
@@ -631,7 +668,7 @@ int req_main(int argc, char **argv)
     }
     if (keyalg != NULL && pkey != NULL) {
         BIO_printf(bio_err,
-                   "Warning: Not generating key via given -newkey option since -key is given\n");
+            "Warning: Not generating key via given -newkey option since -key is given\n");
         /* Better throw an error in this case */
     }
     if (newreq && pkey == NULL) {
@@ -649,7 +686,7 @@ int req_main(int argc, char **argv)
                 || EVP_PKEY_CTX_is_a(genctx, "RSA-PSS")
                 || EVP_PKEY_CTX_is_a(genctx, "DSA"))) {
             BIO_printf(bio_err, "Private key length too short, needs to be at least %d bits, not %ld.\n",
-                       MIN_KEY_LENGTH, newkey_len);
+                MIN_KEY_LENGTH, newkey_len);
             goto end;
         }
 
@@ -657,17 +694,17 @@ int req_main(int argc, char **argv)
             && (EVP_PKEY_CTX_is_a(genctx, "RSA")
                 || EVP_PKEY_CTX_is_a(genctx, "RSA-PSS")))
             BIO_printf(bio_err,
-                       "Warning: It is not recommended to use more than %d bit for RSA keys.\n"
-                       "         Your key size is %ld! Larger key size may behave not as expected.\n",
-                       OPENSSL_RSA_MAX_MODULUS_BITS, newkey_len);
+                "Warning: It is not recommended to use more than %d bit for RSA keys.\n"
+                "         Your key size is %ld! Larger key size may behave not as expected.\n",
+                OPENSSL_RSA_MAX_MODULUS_BITS, newkey_len);
 
 #ifndef OPENSSL_NO_DSA
         if (EVP_PKEY_CTX_is_a(genctx, "DSA")
-                && newkey_len > OPENSSL_DSA_MAX_MODULUS_BITS)
+            && newkey_len > OPENSSL_DSA_MAX_MODULUS_BITS)
             BIO_printf(bio_err,
-                       "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
-                       "         Your key size is %ld! Larger key size may behave not as expected.\n",
-                       OPENSSL_DSA_MAX_MODULUS_BITS, newkey_len);
+                "Warning: It is not recommended to use more than %d bit for DSA keys.\n"
+                "         Your key size is %ld! Larger key size may behave not as expected.\n",
+                OPENSSL_DSA_MAX_MODULUS_BITS, newkey_len);
 #endif
 
         if (pkeyopts != NULL) {
@@ -703,7 +740,7 @@ int req_main(int argc, char **argv)
             else
                 BIO_printf(bio_err, "'%s'\n", keyout);
         }
-        out = bio_open_owner(keyout, outformat, newreq);
+        out = bio_open_owner(keyout, outformat, 1);
         if (out == NULL)
             goto end;
 
@@ -716,11 +753,10 @@ int req_main(int argc, char **argv)
             cipher = NULL;
 
         i = 0;
- loop:
+    loop:
         if (!PEM_write_bio_PrivateKey(out, pkey, cipher,
-                                      NULL, 0, NULL, passout)) {
-            if ((ERR_GET_REASON(ERR_peek_error()) ==
-                 PEM_R_PROBLEMS_GETTING_PASSWORD) && (i < 3)) {
+                NULL, 0, NULL, passout)) {
+            if ((ERR_GET_REASON(ERR_peek_error()) == PEM_R_PROBLEMS_GETTING_PASSWORD) && (i < 3)) {
                 ERR_clear_error();
                 i++;
                 goto loop;
@@ -737,20 +773,20 @@ int req_main(int argc, char **argv)
      * where characters may be escaped by \
      */
     if (subj != NULL
-            && (fsubj = parse_name(subj, chtype, multirdn, "subject")) == NULL)
+        && (fsubj = parse_name(subj, chtype, multirdn, "subject")) == NULL)
         goto end;
 
     if (!newreq) {
         if (keyfile != NULL)
             BIO_printf(bio_err,
-                       "Warning: Not placing -key in cert or request since request is used\n");
+                "Warning: Not placing -key in cert or request since request is used\n");
         req = load_csr_autofmt(infile /* if NULL, reads from stdin */,
-                               informat, vfyopts, "X509 request");
+            informat, vfyopts, "X509 request");
         if (req == NULL)
             goto end;
     } else if (infile != NULL) {
         BIO_printf(bio_err,
-                   "Warning: Ignoring -in option since -new or -newkey or -precert is given\n");
+            "Warning: Ignoring -in option since -new or -newkey or -precert is given\n");
         /* Better throw an error in this case, as done in the x509 app */
     }
 
@@ -759,30 +795,32 @@ int req_main(int argc, char **argv)
     if (CAkeyfile != NULL) {
         if (CAfile == NULL) {
             BIO_printf(bio_err,
-                       "Warning: Ignoring -CAkey option since no -CA option is given\n");
+                "Warning: Ignoring -CAkey option since no -CA option is given\n");
         } else {
             if ((CAkey = load_key(CAkeyfile, FORMAT_UNDEF,
-                                  0, passin, e,
-                                  CAkeyfile != CAfile
-                                  ? "issuer private key from -CAkey arg"
-                                  : "issuer private key from -CA arg")) == NULL)
+                     0, passin, e,
+                     CAkeyfile != CAfile
+                         ? "issuer private key from -CAkey arg"
+                         : "issuer private key from -CA arg"))
+                == NULL)
                 goto end;
         }
     }
     if (CAfile != NULL) {
         if ((CAcert = load_cert_pass(CAfile, FORMAT_UNDEF, 1, passin,
-                                     "issuer cert from -CA arg")) == NULL)
+                 "issuer cert from -CA arg"))
+            == NULL)
             goto end;
         if (!X509_check_private_key(CAcert, CAkey)) {
             BIO_printf(bio_err,
-                       "Issuer CA certificate and key do not match\n");
+                "Issuer CA certificate and key do not match\n");
             goto end;
         }
     }
     if (newreq || gen_x509) {
         if (CAcert == NULL && pkey == NULL) {
             BIO_printf(bio_err, "Must provide a signature key using -key or"
-                " provide -CA / -CAkey\n");
+                                " provide -CA / -CAkey\n");
             goto end;
         }
 
@@ -802,17 +840,16 @@ int req_main(int argc, char **argv)
             EVP_PKEY *pub_key = X509_REQ_get0_pubkey(req);
             EVP_PKEY *issuer_key = CAcert != NULL ? CAkey : pkey;
             X509V3_CTX ext_ctx;
-            X509_NAME *issuer = CAcert != NULL ? X509_get_subject_name(CAcert) :
-                X509_REQ_get_subject_name(req);
-            X509_NAME *n_subj = fsubj != NULL ? fsubj :
-                X509_REQ_get_subject_name(req);
+            X509_NAME *issuer = CAcert != NULL ? X509_get_subject_name(CAcert) : X509_REQ_get_subject_name(req);
+            X509_NAME *n_subj = fsubj != NULL ? fsubj : X509_REQ_get_subject_name(req);
 
             if (CAcert != NULL && keyfile != NULL)
                 BIO_printf(bio_err,
-                           "Warning: Not using -key or -newkey for signing since -CA option is given\n");
+                    "Warning: Not using -key or -newkey for signing since -CA option is given\n");
 
             if ((new_x509 = X509_new_ex(app_get0_libctx(),
-                                        app_get0_propq())) == NULL)
+                     app_get0_propq()))
+                == NULL)
                 goto end;
 
             if (serial != NULL) {
@@ -828,7 +865,7 @@ int req_main(int argc, char **argv)
             if (days == UNSET_DAYS)
                 days = DEFAULT_DAYS;
             else if (not_after != NULL)
-                BIO_printf(bio_err,"Warning: -not_after option overriding -days option\n");
+                BIO_printf(bio_err, "Warning: -not_after option overriding -days option\n");
             if (!set_cert_times(new_x509, not_before, not_after, days, 1))
                 goto end;
             if (!X509_set_subject_name(new_x509, n_subj))
@@ -845,14 +882,14 @@ int req_main(int argc, char **argv)
 
             /* Set up V3 context struct */
             X509V3_set_ctx(&ext_ctx, CAcert != NULL ? CAcert : new_x509,
-                           new_x509, NULL, NULL, X509V3_CTX_REPLACE);
+                new_x509, NULL, NULL, X509V3_CTX_REPLACE);
             /* prepare fallback for AKID, but only if issuer cert == new_x509 */
             if (CAcert == NULL) {
                 if (!X509V3_set_issuer_pkey(&ext_ctx, issuer_key))
                     goto end;
                 if (!cert_matches_key(new_x509, issuer_key))
                     BIO_printf(bio_err,
-                               "Warning: Signature key and public key of cert do not match\n");
+                        "Warning: Signature key and public key of cert do not match\n");
             }
             X509V3_set_nconf(&ext_ctx, req_conf);
 
@@ -860,12 +897,12 @@ int req_main(int argc, char **argv)
             if (extsect != NULL
                 && !X509V3_EXT_add_nconf(req_conf, &ext_ctx, extsect, new_x509)) {
                 BIO_printf(bio_err, "Error adding x509 extensions from section %s\n",
-                           extsect);
+                    extsect);
                 goto end;
             }
             if (addext_conf != NULL
                 && !X509V3_EXT_add_nconf(addext_conf, &ext_ctx, "default",
-                                         new_x509)) {
+                    new_x509)) {
                 BIO_printf(bio_err, "Error adding x509 extensions defined via -addext\n");
                 goto end;
             }
@@ -873,14 +910,15 @@ int req_main(int argc, char **argv)
             /* If a pre-cert was requested, we need to add a poison extension */
             if (precert) {
                 if (X509_add1_ext_i2d(new_x509, NID_ct_precert_poison,
-                                      NULL, 1, 0) != 1) {
+                        NULL, 1, 0)
+                    != 1) {
                     BIO_printf(bio_err, "Error adding poison extension\n");
                     goto end;
                 }
             }
 
             i = do_X509_sign(new_x509, x509v1, issuer_key, digest, sigopts,
-                             &ext_ctx);
+                &ext_ctx);
             if (!i)
                 goto end;
         } else {
@@ -888,7 +926,7 @@ int req_main(int argc, char **argv)
 
             if (precert) {
                 BIO_printf(bio_err,
-                           "Warning: Ignoring -precert flag since no cert is produced\n");
+                    "Warning: Ignoring -precert flag since no cert is produced\n");
             }
             /* Set up V3 context struct */
             X509V3_set_ctx(&ext_ctx, NULL, NULL, req, NULL, X509V3_CTX_REPLACE);
@@ -898,12 +936,12 @@ int req_main(int argc, char **argv)
             if (extsect != NULL
                 && !X509V3_EXT_REQ_add_nconf(req_conf, &ext_ctx, extsect, req)) {
                 BIO_printf(bio_err, "Error adding request extensions from section %s\n",
-                           extsect);
+                    extsect);
                 goto end;
             }
             if (addext_conf != NULL
                 && !X509V3_EXT_REQ_add_nconf(addext_conf, &ext_ctx, "default",
-                                             req)) {
+                    req)) {
                 BIO_printf(bio_err, "Error adding request extensions defined via -addext\n");
                 goto end;
             }
@@ -944,7 +982,7 @@ int req_main(int argc, char **argv)
             goto end;
         if (i == 0) {
             BIO_printf(bio_err, "Certificate request self-signature verify failure\n");
-	    goto end;
+            goto end;
         } else /* i > 0 */
             BIO_printf(bio_out, "Certificate request self-signature verify OK\n");
     }
@@ -955,9 +993,8 @@ int req_main(int argc, char **argv)
     }
 
     out = bio_open_default(outfile,
-                           keyout != NULL && outfile != NULL &&
-                           strcmp(keyout, outfile) == 0 ? 'a' : 'w',
-                           outformat);
+        keyout != NULL && outfile != NULL && strcmp(keyout, outfile) == 0 ? 'a' : 'w',
+        outformat);
     if (out == NULL)
         goto end;
 
@@ -987,9 +1024,7 @@ int req_main(int argc, char **argv)
     }
 
     if (subject) {
-        print_name(out, "subject=", gen_x509
-                   ? X509_get_subject_name(new_x509)
-                   : X509_REQ_get_subject_name(req));
+        print_name(out, "subject=", gen_x509 ? X509_get_subject_name(new_x509) : X509_REQ_get_subject_name(req));
     }
 
     if (modulus) {
@@ -1040,7 +1075,7 @@ int req_main(int argc, char **argv)
         }
     }
     ret = 0;
- end:
+end:
     if (ret) {
         ERR_print_errors(bio_err);
     }
@@ -1074,7 +1109,7 @@ int req_main(int argc, char **argv)
 }
 
 static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, X509_NAME *fsubj,
-                    int multirdn, int attribs, unsigned long chtype)
+    int multirdn, int attribs, unsigned long chtype)
 {
     int ret = 0, i;
     char no_prompt = 0;
@@ -1113,7 +1148,7 @@ static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, X509_NAME *fsubj,
         i = auto_info(req, dn_sk, attr_sk, attribs, chtype);
     else
         i = prompt_info(req, dn_sk, dn_sect, attr_sk, attr_sect, attribs,
-                        chtype);
+            chtype);
     if (!i)
         goto err;
 
@@ -1121,14 +1156,14 @@ static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, X509_NAME *fsubj,
         goto err;
 
     ret = 1;
- err:
+err:
     return ret;
 }
 
 static int prompt_info(X509_REQ *req,
-                       STACK_OF(CONF_VALUE) *dn_sk, const char *dn_sect,
-                       STACK_OF(CONF_VALUE) *attr_sk, const char *attr_sect,
-                       int attribs, unsigned long chtype)
+    STACK_OF(CONF_VALUE) *dn_sk, const char *dn_sect,
+    STACK_OF(CONF_VALUE) *attr_sk, const char *attr_sect,
+    int attribs, unsigned long chtype)
 {
     int i;
     char *p, *q;
@@ -1142,22 +1177,22 @@ static int prompt_info(X509_REQ *req,
 
     if (!batch) {
         BIO_printf(bio_err,
-                   "You are about to be asked to enter information that will be incorporated\n");
+            "You are about to be asked to enter information that will be incorporated\n");
         BIO_printf(bio_err, "into your certificate request.\n");
         BIO_printf(bio_err,
-                   "What you are about to enter is what is called a Distinguished Name or a DN.\n");
+            "What you are about to enter is what is called a Distinguished Name or a DN.\n");
         BIO_printf(bio_err,
-                   "There are quite a few fields but you can leave some blank\n");
+            "There are quite a few fields but you can leave some blank\n");
         BIO_printf(bio_err,
-                   "For some fields there will be a default value,\n");
+            "For some fields there will be a default value,\n");
         BIO_printf(bio_err,
-                   "If you enter '.', the field will be left blank.\n");
+            "If you enter '.', the field will be left blank.\n");
         BIO_printf(bio_err, "-----\n");
     }
 
     if (sk_CONF_VALUE_num(dn_sk)) {
         i = -1;
- start:
+    start:
         for (;;) {
             i++;
             if (sk_CONF_VALUE_num(dn_sk) <= i)
@@ -1166,8 +1201,7 @@ static int prompt_info(X509_REQ *req,
             v = sk_CONF_VALUE_value(dn_sk, i);
             p = q = NULL;
             type = v->name;
-            if (!check_end(type, "_min") || !check_end(type, "_max") ||
-                !check_end(type, "_default") || !check_end(type, "_value"))
+            if (!check_end(type, "_min") || !check_end(type, "_max") || !check_end(type, "_default") || !check_end(type, "_value"))
                 continue;
             /*
              * Skip past any leading X. X: X, etc to allow for multiple
@@ -1210,7 +1244,7 @@ static int prompt_info(X509_REQ *req,
                 n_max = -1;
 
             if (!add_DN_object(subj, v->value, def, value, nid,
-                               n_min, n_max, chtype, mval))
+                    n_min, n_max, chtype, mval))
                 return 0;
         }
         if (X509_NAME_entry_count(subj) == 0) {
@@ -1222,13 +1256,13 @@ static int prompt_info(X509_REQ *req,
             if ((attr_sk != NULL) && (sk_CONF_VALUE_num(attr_sk) > 0)
                 && (!batch)) {
                 BIO_printf(bio_err,
-                           "\nPlease enter the following 'extra' attributes\n");
+                    "\nPlease enter the following 'extra' attributes\n");
                 BIO_printf(bio_err,
-                           "to be sent with your certificate request\n");
+                    "to be sent with your certificate request\n");
             }
 
             i = -1;
- start2:
+        start2:
             for (;;) {
                 i++;
                 if ((attr_sk == NULL) || (sk_CONF_VALUE_num(attr_sk) <= i))
@@ -1260,8 +1294,8 @@ static int prompt_info(X509_REQ *req,
                     n_max = -1;
 
                 if (!add_attribute_object(req,
-                                          v->value, def, value, nid, n_min,
-                                          n_max, chtype))
+                        v->value, def, value, nid, n_min,
+                        n_max, chtype))
                     return 0;
             }
         }
@@ -1271,12 +1305,11 @@ static int prompt_info(X509_REQ *req,
     }
 
     return 1;
-
 }
 
 static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
-                     STACK_OF(CONF_VALUE) *attr_sk, int attribs,
-                     unsigned long chtype)
+    STACK_OF(CONF_VALUE) *attr_sk, int attribs,
+    unsigned long chtype)
 {
     int i, spec_char, plus_char;
     char *p, *q;
@@ -1299,7 +1332,7 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
             spec_char = (*p == ':' || *p == ',' || *p == '.');
 #else
             spec_char = (*p == os_toascii[':'] || *p == os_toascii[',']
-                         || *p == os_toascii['.']);
+                || *p == os_toascii['.']);
 #endif
             if (spec_char) {
                 p++;
@@ -1320,10 +1353,9 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
             mval = 0;
         }
         if (!X509_NAME_add_entry_by_txt(subj, type, chtype,
-                                        (unsigned char *)v->value, -1, -1,
-                                        mval))
+                (unsigned char *)v->value, -1, -1,
+                mval))
             return 0;
-
     }
 
     if (!X509_NAME_entry_count(subj)) {
@@ -1334,7 +1366,7 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
         for (i = 0; i < sk_CONF_VALUE_num(attr_sk); i++) {
             v = sk_CONF_VALUE_value(attr_sk, i);
             if (!X509_REQ_add1_attr_by_txt(req, v->name, chtype,
-                                           (unsigned char *)v->value, -1))
+                    (unsigned char *)v->value, -1))
                 return 0;
         }
     }
@@ -1342,40 +1374,40 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
 }
 
 static int add_DN_object(X509_NAME *n, char *text, const char *def,
-                         char *value, int nid, int n_min, int n_max,
-                         unsigned long chtype, int mval)
+    char *value, int nid, int n_min, int n_max,
+    unsigned long chtype, int mval)
 {
     int ret = 0;
     char buf[1024];
 
     ret = build_data(text, def, value, n_min, n_max, buf, sizeof(buf),
-                     "DN value", "DN default");
+        "DN value", "DN default");
     if ((ret == 0) || (ret == 1))
         return ret;
     ret = 1;
 
     if (!X509_NAME_add_entry_by_NID(n, nid, chtype,
-                                    (unsigned char *)buf, -1, -1, mval))
+            (unsigned char *)buf, -1, -1, mval))
         ret = 0;
 
     return ret;
 }
 
 static int add_attribute_object(X509_REQ *req, char *text, const char *def,
-                                char *value, int nid, int n_min,
-                                int n_max, unsigned long chtype)
+    char *value, int nid, int n_min,
+    int n_max, unsigned long chtype)
 {
     int ret = 0;
     char buf[1024];
 
     ret = build_data(text, def, value, n_min, n_max, buf, sizeof(buf),
-                     "Attribute value", "Attribute default");
+        "Attribute value", "Attribute default");
     if ((ret == 0) || (ret == 1))
         return ret;
     ret = 1;
 
     if (!X509_REQ_add1_attr_by_NID(req, nid, chtype,
-                                   (unsigned char *)buf, -1)) {
+            (unsigned char *)buf, -1)) {
         BIO_printf(bio_err, "Error adding attribute\n");
         ret = 0;
     }
@@ -1384,11 +1416,11 @@ static int add_attribute_object(X509_REQ *req, char *text, const char *def,
 }
 
 static int build_data(char *text, const char *def, char *value,
-                      int n_min, int n_max, char *buf, const int buf_size,
-                      const char *desc1, const char *desc2)
+    int n_min, int n_max, char *buf, const int buf_size,
+    const char *desc1, const char *desc2)
 {
     int i;
- start:
+start:
     if (!batch)
         BIO_printf(bio_err, "%s [%s]:", text, def);
     (void)BIO_flush(bio_err);
@@ -1439,12 +1471,12 @@ static int req_check_len(int len, int n_min, int n_max)
 {
     if (n_min > 0 && len < n_min) {
         BIO_printf(bio_err,
-                   "String too short, must be at least %d bytes long\n", n_min);
+            "String too short, must be at least %d bytes long\n", n_min);
         return 0;
     }
     if (n_max >= 0 && len > n_max) {
         BIO_printf(bio_err,
-                   "String too long, must be at most %d bytes long\n", n_max);
+            "String too long, must be at most %d bytes long\n", n_max);
         return 0;
     }
     return 1;
@@ -1469,7 +1501,7 @@ static int check_end(const char *str, const char *end)
  * overflow and producing an error message if there is.
  */
 static int join(char buf[], size_t buf_size, const char *name,
-                const char *tail, const char *desc)
+    const char *tail, const char *desc)
 {
     const size_t name_len = strlen(name), tail_len = strlen(tail);
 
@@ -1483,8 +1515,8 @@ static int join(char buf[], size_t buf_size, const char *name,
 }
 
 static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
-                                    char **pkeytype, long *pkeylen,
-                                    ENGINE *keygen_engine)
+    char **pkeytype, long *pkeylen,
+    ENGINE *keygen_engine)
 {
     EVP_PKEY_CTX *gctx = NULL;
     EVP_PKEY *param = NULL;
@@ -1520,8 +1552,8 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
             expect_paramfile = 1;
             if (p == NULL) {
                 BIO_printf(bio_err,
-                           "Parameter file requested but no path given: %s\n",
-                           gstr);
+                    "Parameter file requested but no path given: %s\n",
+                    gstr);
                 return NULL;
             }
         } else {
@@ -1604,19 +1636,19 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
             gctx = EVP_PKEY_CTX_new(param, keygen_engine);
         else
             gctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(),
-                                              param, app_get0_propq());
+                param, app_get0_propq());
         *pkeylen = EVP_PKEY_get_bits(param);
         EVP_PKEY_free(param);
     } else {
         if (keygen_engine != NULL) {
             int pkey_id = get_legacy_pkey_id(app_get0_libctx(), *pkeytype,
-                                             keygen_engine);
+                keygen_engine);
 
             if (pkey_id != NID_undef)
                 gctx = EVP_PKEY_CTX_new_id(pkey_id, keygen_engine);
         } else {
             gctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(),
-                                              *pkeytype, app_get0_propq());
+                *pkeytype, app_get0_propq());
         }
     }
 
@@ -1630,16 +1662,14 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
         EVP_PKEY_CTX_free(gctx);
         return NULL;
     }
-    if (keylen == -1 && (EVP_PKEY_CTX_is_a(gctx, "RSA")
-        || EVP_PKEY_CTX_is_a(gctx, "RSA-PSS")))
+    if (keylen == -1 && (EVP_PKEY_CTX_is_a(gctx, "RSA") || EVP_PKEY_CTX_is_a(gctx, "RSA-PSS")))
         keylen = *pkeylen;
 
     if (keylen != -1) {
         OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END };
         size_t bits = keylen;
 
-        params[0] =
-            OSSL_PARAM_construct_size_t(OSSL_PKEY_PARAM_BITS, &bits);
+        params[0] = OSSL_PARAM_construct_size_t(OSSL_PKEY_PARAM_BITS, &bits);
         if (EVP_PKEY_CTX_set_params(gctx, params) <= 0) {
             BIO_puts(bio_err, "Error setting keysize\n");
             EVP_PKEY_CTX_free(gctx);
@@ -1649,4 +1679,3 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
 
     return gctx;
 }
-
diff --git a/apps/rsa.c b/apps/rsa.c
index 9a4d16cbb01c8..780f990ab5d3f 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -34,63 +34,78 @@
 #include <openssl/core_dispatch.h>
 
 #ifndef OPENSSL_NO_RC4
-# define DEFAULT_PVK_ENCR_STRENGTH      2
+#define DEFAULT_PVK_ENCR_STRENGTH 2
 #else
-# define DEFAULT_PVK_ENCR_STRENGTH      0
+#define DEFAULT_PVK_ENCR_STRENGTH 0
 #endif
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_IN, OPT_OUT,
-    OPT_PUBIN, OPT_PUBOUT, OPT_PASSOUT, OPT_PASSIN,
-    OPT_RSAPUBKEY_IN, OPT_RSAPUBKEY_OUT,
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_ENGINE,
+    OPT_IN,
+    OPT_OUT,
+    OPT_PUBIN,
+    OPT_PUBOUT,
+    OPT_PASSOUT,
+    OPT_PASSIN,
+    OPT_RSAPUBKEY_IN,
+    OPT_RSAPUBKEY_OUT,
     /* Do not change the order here; see case statements below */
-    OPT_PVK_NONE, OPT_PVK_WEAK, OPT_PVK_STRONG,
-    OPT_NOOUT, OPT_TEXT, OPT_MODULUS, OPT_CHECK, OPT_CIPHER,
-    OPT_PROV_ENUM, OPT_TRADITIONAL
+    OPT_PVK_NONE,
+    OPT_PVK_WEAK,
+    OPT_PVK_STRONG,
+    OPT_NOOUT,
+    OPT_TEXT,
+    OPT_MODULUS,
+    OPT_CHECK,
+    OPT_CIPHER,
+    OPT_PROV_ENUM,
+    OPT_TRADITIONAL
 } OPTION_CHOICE;
 
 const OPTIONS rsa_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"check", OPT_CHECK, '-', "Verify key consistency"},
-    {"", OPT_CIPHER, '-', "Any supported cipher"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "check", OPT_CHECK, '-', "Verify key consistency" },
+    { "", OPT_CIPHER, '-', "Any supported cipher" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, 's', "Input file"},
-    {"inform", OPT_INFORM, 'f', "Input format (DER/PEM/P12/ENGINE)"},
-    {"pubin", OPT_PUBIN, '-', "Expect a public key in input file"},
-    {"RSAPublicKey_in", OPT_RSAPUBKEY_IN, '-', "Input is an RSAPublicKey"},
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
+    { "in", OPT_IN, 's', "Input file" },
+    { "inform", OPT_INFORM, 'f', "Input format (DER/PEM/P12/ENGINE)" },
+    { "pubin", OPT_PUBIN, '-', "Expect a public key in input file" },
+    { "RSAPublicKey_in", OPT_RSAPUBKEY_IN, '-', "Input is an RSAPublicKey" },
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file"},
-    {"outform", OPT_OUTFORM, 'f', "Output format, one of DER PEM PVK"},
-    {"pubout", OPT_PUBOUT, '-', "Output a public key"},
-    {"RSAPublicKey_out", OPT_RSAPUBKEY_OUT, '-', "Output is an RSAPublicKey"},
-    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
-    {"noout", OPT_NOOUT, '-', "Don't print key out"},
-    {"text", OPT_TEXT, '-', "Print the key in text"},
-    {"modulus", OPT_MODULUS, '-', "Print the RSA key modulus"},
-    {"traditional", OPT_TRADITIONAL, '-',
-     "Use traditional format for private keys"},
+    { "out", OPT_OUT, '>', "Output file" },
+    { "outform", OPT_OUTFORM, 'f', "Output format, one of DER PEM PVK" },
+    { "pubout", OPT_PUBOUT, '-', "Output a public key" },
+    { "RSAPublicKey_out", OPT_RSAPUBKEY_OUT, '-', "Output is an RSAPublicKey" },
+    { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
+    { "noout", OPT_NOOUT, '-', "Don't print key out" },
+    { "text", OPT_TEXT, '-', "Print the key in text" },
+    { "modulus", OPT_MODULUS, '-', "Print the RSA key modulus" },
+    { "traditional", OPT_TRADITIONAL, '-',
+        "Use traditional format for private keys" },
 
 #ifndef OPENSSL_NO_RC4
     OPT_SECTION("PVK"),
-    {"pvk-strong", OPT_PVK_STRONG, '-', "Enable 'Strong' PVK encoding level (default)"},
-    {"pvk-weak", OPT_PVK_WEAK, '-', "Enable 'Weak' PVK encoding level"},
-    {"pvk-none", OPT_PVK_NONE, '-', "Don't enforce PVK encoding"},
+    { "pvk-strong", OPT_PVK_STRONG, '-', "Enable 'Strong' PVK encoding level (default)" },
+    { "pvk-weak", OPT_PVK_WEAK, '-', "Enable 'Weak' PVK encoding level" },
+    { "pvk-none", OPT_PVK_NONE, '-', "Don't enforce PVK encoding" },
 #endif
 
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 static int try_legacy_encoding(EVP_PKEY *pkey, int outformat, int pubout,
-                               BIO *out)
+    BIO *out)
 {
     int ret = 0;
 #ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -109,10 +124,10 @@ static int try_legacy_encoding(EVP_PKEY *pkey, int outformat, int pubout,
             ret = PEM_write_bio_RSAPublicKey(out, rsa) > 0;
         else
             ret = PEM_write_bio_RSA_PUBKEY(out, rsa) > 0;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
     } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {
         ret = i2b_PublicKey_bio(out, pkey) > 0;
-# endif
+#endif
     }
 #endif
 
@@ -145,7 +160,7 @@ int rsa_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -187,9 +202,9 @@ int rsa_main(int argc, char **argv)
         case OPT_RSAPUBKEY_OUT:
             pubout = 2;
             break;
-        case OPT_PVK_STRONG:    /* pvk_encr:= 2 */
-        case OPT_PVK_WEAK:      /* pvk_encr:= 1 */
-        case OPT_PVK_NONE:      /* pvk_encr:= 0 */
+        case OPT_PVK_STRONG: /* pvk_encr:= 2 */
+        case OPT_PVK_WEAK: /* pvk_encr:= 1 */
+        case OPT_PVK_NONE: /* pvk_encr:= 0 */
             pvk_encr = (o - OPT_PVK_NONE);
             break;
         case OPT_NOOUT:
@@ -338,7 +353,7 @@ int rsa_main(int argc, char **argv)
     } else {
         assert(private);
         selection = (OSSL_KEYMGMT_SELECT_KEYPAIR
-                     | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS);
+            | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS);
     }
 
     /* For DER based output, select the desired output structure */
@@ -359,8 +374,8 @@ int rsa_main(int argc, char **argv)
 
     /* Now, perform the encoding */
     ectx = OSSL_ENCODER_CTX_new_for_pkey(pkey, selection,
-                                         output_type, output_structure,
-                                         NULL);
+        output_type, output_structure,
+        NULL);
     if (OSSL_ENCODER_CTX_get_num_encoders(ectx) == 0) {
         if ((!pubout && !pubin)
             || !try_legacy_encoding(pkey, outformat, pubout, out))
@@ -380,8 +395,8 @@ int rsa_main(int argc, char **argv)
         if (passout != NULL)
             /* When passout given, override the passphrase prompter */
             OSSL_ENCODER_CTX_set_passphrase(ectx,
-                                            (const unsigned char *)passout,
-                                            strlen(passout));
+                (const unsigned char *)passout,
+                strlen(passout));
     }
 
     /* PVK is a bit special... */
@@ -401,7 +416,7 @@ int rsa_main(int argc, char **argv)
         goto end;
     }
     ret = 0;
- end:
+end:
     OSSL_ENCODER_CTX_free(ectx);
     release_engine(e);
     BIO_free_all(out);
diff --git a/apps/rsautl.c b/apps/rsautl.c
index 3ee8224f48d87..3c1194c1a5862 100644
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -16,57 +16,73 @@
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 
-#define RSA_SIGN        1
-#define RSA_VERIFY      2
-#define RSA_ENCRYPT     3
-#define RSA_DECRYPT     4
+#define RSA_SIGN 1
+#define RSA_VERIFY 2
+#define RSA_ENCRYPT 3
+#define RSA_DECRYPT 4
 
-#define KEY_PRIVKEY     1
-#define KEY_PUBKEY      2
-#define KEY_CERT        3
+#define KEY_PRIVKEY 1
+#define KEY_PUBKEY 2
+#define KEY_CERT 3
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_ENGINE, OPT_IN, OPT_OUT, OPT_ASN1PARSE, OPT_HEXDUMP,
-    OPT_RSA_RAW, OPT_OAEP, OPT_PKCS, OPT_X931,
-    OPT_SIGN, OPT_VERIFY, OPT_REV, OPT_ENCRYPT, OPT_DECRYPT,
-    OPT_PUBIN, OPT_CERTIN, OPT_INKEY, OPT_PASSIN, OPT_KEYFORM,
-    OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_ENGINE,
+    OPT_IN,
+    OPT_OUT,
+    OPT_ASN1PARSE,
+    OPT_HEXDUMP,
+    OPT_RSA_RAW,
+    OPT_OAEP,
+    OPT_PKCS,
+    OPT_X931,
+    OPT_SIGN,
+    OPT_VERIFY,
+    OPT_REV,
+    OPT_ENCRYPT,
+    OPT_DECRYPT,
+    OPT_PUBIN,
+    OPT_CERTIN,
+    OPT_INKEY,
+    OPT_PASSIN,
+    OPT_KEYFORM,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS rsautl_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"sign", OPT_SIGN, '-', "Sign with private key"},
-    {"verify", OPT_VERIFY, '-', "Verify with public key"},
-    {"encrypt", OPT_ENCRYPT, '-', "Encrypt with public key"},
-    {"decrypt", OPT_DECRYPT, '-', "Decrypt with private key"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "sign", OPT_SIGN, '-', "Sign with private key" },
+    { "verify", OPT_VERIFY, '-', "Verify with public key" },
+    { "encrypt", OPT_ENCRYPT, '-', "Encrypt with public key" },
+    { "decrypt", OPT_DECRYPT, '-', "Decrypt with private key" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file"},
-    {"inkey", OPT_INKEY, 's', "Input key, by default an RSA private key"},
-    {"keyform", OPT_KEYFORM, 'E', "Private key format (ENGINE, other values ignored)"},
-    {"pubin", OPT_PUBIN, '-', "Input key is an RSA public pkey"},
-    {"certin", OPT_CERTIN, '-', "Input is a cert carrying an RSA public key"},
-    {"rev", OPT_REV, '-', "Reverse the order of the input buffer"},
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
+    { "in", OPT_IN, '<', "Input file" },
+    { "inkey", OPT_INKEY, 's', "Input key, by default an RSA private key" },
+    { "keyform", OPT_KEYFORM, 'E', "Private key format (ENGINE, other values ignored)" },
+    { "pubin", OPT_PUBIN, '-', "Input key is an RSA public pkey" },
+    { "certin", OPT_CERTIN, '-', "Input is a cert carrying an RSA public key" },
+    { "rev", OPT_REV, '-', "Reverse the order of the input buffer" },
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file"},
-    {"raw", OPT_RSA_RAW, '-', "Use no padding"},
-    {"pkcs", OPT_PKCS, '-', "Use PKCS#1 v1.5 padding (default)"},
-    {"x931", OPT_X931, '-', "Use ANSI X9.31 padding"},
-    {"oaep", OPT_OAEP, '-', "Use PKCS#1 OAEP"},
-    {"asn1parse", OPT_ASN1PARSE, '-',
-     "Run output through asn1parse; useful with -verify"},
-    {"hexdump", OPT_HEXDUMP, '-', "Hex dump output"},
+    { "out", OPT_OUT, '>', "Output file" },
+    { "raw", OPT_RSA_RAW, '-', "Use no padding" },
+    { "pkcs", OPT_PKCS, '-', "Use PKCS#1 v1.5 padding (default)" },
+    { "x931", OPT_X931, '-', "Use ANSI X9.31 padding" },
+    { "oaep", OPT_OAEP, '-', "Use PKCS#1 OAEP" },
+    { "asn1parse", OPT_ASN1PARSE, '-',
+        "Run output through asn1parse; useful with -verify" },
+    { "hexdump", OPT_HEXDUMP, '-', "Hex dump output" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int rsautl_main(int argc, char **argv)
@@ -90,7 +106,7 @@ int rsautl_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -245,7 +261,8 @@ int rsautl_main(int argc, char **argv)
         rv = EVP_PKEY_verify_recover_init(ctx) > 0
             && EVP_PKEY_CTX_set_rsa_padding(ctx, pad) > 0
             && EVP_PKEY_verify_recover(ctx, rsa_out, &rsa_outlen,
-                                       rsa_in, rsa_inlen) > 0;
+                   rsa_in, rsa_inlen)
+                > 0;
         break;
     case RSA_SIGN:
         rv = EVP_PKEY_sign_init(ctx) > 0
@@ -279,7 +296,7 @@ int rsautl_main(int argc, char **argv)
     } else {
         BIO_write(out, rsa_out, rsa_outlen);
     }
- end:
+end:
     EVP_PKEY_CTX_free(ctx);
     EVP_PKEY_free(pkey);
     release_engine(e);
diff --git a/apps/s_client.c b/apps/s_client.c
index d05976ff5bd72..3625f8fcdc99d 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2005 Nokia. All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -27,7 +27,7 @@
  * needed to have fileno() declared correctly...  So let's define u_int
  */
 #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
-# define __U_INT
+#define __U_INT
 typedef unsigned int u_int;
 #endif
 
@@ -43,31 +43,31 @@ typedef unsigned int u_int;
 #include <openssl/trace.h>
 #include <openssl/async.h>
 #ifndef OPENSSL_NO_CT
-# include <openssl/ct.h>
+#include <openssl/ct.h>
 #endif
 #include "s_apps.h"
 #include "timeouts.h"
 #include "internal/sockets.h"
 
 #if defined(__has_feature)
-# if __has_feature(memory_sanitizer)
-#  include <sanitizer/msan_interface.h>
-# endif
+#if __has_feature(memory_sanitizer)
+#include <sanitizer/msan_interface.h>
+#endif
 #endif
 
 #undef BUFSIZZ
-#define BUFSIZZ 1024*16
+#define BUFSIZZ 1024 * 16
 #define S_CLIENT_IRC_READ_TIMEOUT 8
 
-#define USER_DATA_MODE_NONE     0
-#define USER_DATA_MODE_BASIC    1
+#define USER_DATA_MODE_NONE 0
+#define USER_DATA_MODE_BASIC 1
 #define USER_DATA_MODE_ADVANCED 2
 
 #define USER_DATA_PROCESS_BAD_ARGUMENT 0
-#define USER_DATA_PROCESS_SHUT         1
-#define USER_DATA_PROCESS_RESTART      2
-#define USER_DATA_PROCESS_NO_DATA      3
-#define USER_DATA_PROCESS_CONTINUE     4
+#define USER_DATA_PROCESS_SHUT 1
+#define USER_DATA_PROCESS_RESTART 2
+#define USER_DATA_PROCESS_NO_DATA 3
+#define USER_DATA_PROCESS_CONTINUE 4
 
 struct user_data_st {
     /* SSL connection we are processing commands for */
@@ -93,10 +93,10 @@ struct user_data_st {
 };
 
 static void user_data_init(struct user_data_st *user_data, SSL *con, char *buf,
-                           size_t bufmax, int mode);
+    size_t bufmax, int mode);
 static int user_data_add(struct user_data_st *user_data, size_t i);
 static int user_data_process(struct user_data_st *user_data, size_t *len,
-                             size_t *off);
+    size_t *off);
 static int user_data_has_data(struct user_data_st *user_data);
 
 static char *prog;
@@ -139,9 +139,9 @@ static char *psk_identity = "Client_identity";
 
 #ifndef OPENSSL_NO_PSK
 static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
-                                  unsigned int max_identity_len,
-                                  unsigned char *psk,
-                                  unsigned int max_psk_len)
+    unsigned int max_identity_len,
+    unsigned char *psk,
+    unsigned int max_psk_len)
 {
     int ret;
     long key_len;
@@ -153,7 +153,7 @@ static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
         /* no ServerKeyExchange message */
         if (c_debug)
             BIO_printf(bio_c_out,
-                       "NULL received PSK identity hint, continuing anyway\n");
+                "NULL received PSK identity hint, continuing anyway\n");
     } else if (c_debug) {
         BIO_printf(bio_c_out, "Received PSK identity hint '%s'\n", hint);
     }
@@ -166,19 +166,19 @@ static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
         goto out_err;
     if (c_debug)
         BIO_printf(bio_c_out, "created identity '%s' len=%d\n", identity,
-                   ret);
+            ret);
 
     /* convert the PSK key to binary */
     key = OPENSSL_hexstr2buf(psk_key, &key_len);
     if (key == NULL) {
         BIO_printf(bio_err, "Could not convert PSK key '%s' to buffer\n",
-                   psk_key);
+            psk_key);
         return 0;
     }
     if (max_psk_len > INT_MAX || key_len > (long)max_psk_len) {
         BIO_printf(bio_err,
-                   "psk buffer of callback is too small (%d) for key (%ld)\n",
-                   max_psk_len, key_len);
+            "psk buffer of callback is too small (%d) for key (%ld)\n",
+            max_psk_len, key_len);
         OPENSSL_free(key);
         return 0;
     }
@@ -190,7 +190,7 @@ static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
         BIO_printf(bio_c_out, "created PSK len=%ld\n", key_len);
 
     return key_len;
- out_err:
+out_err:
     if (c_debug)
         BIO_printf(bio_err, "Error in PSK client callback\n");
     return 0;
@@ -201,8 +201,8 @@ const unsigned char tls13_aes128gcmsha256_id[] = { 0x13, 0x01 };
 const unsigned char tls13_aes256gcmsha384_id[] = { 0x13, 0x02 };
 
 static int psk_use_session_cb(SSL *s, const EVP_MD *md,
-                              const unsigned char **id, size_t *idlen,
-                              SSL_SESSION **sess)
+    const unsigned char **id, size_t *idlen,
+    SSL_SESSION **sess)
 {
     SSL_SESSION *usesess = NULL;
     const SSL_CIPHER *cipher = NULL;
@@ -217,7 +217,7 @@ static int psk_use_session_cb(SSL *s, const EVP_MD *md,
 
         if (key == NULL) {
             BIO_printf(bio_err, "Could not convert PSK key '%s' to buffer\n",
-                       psk_key);
+                psk_key);
             return 0;
         }
 
@@ -231,9 +231,9 @@ static int psk_use_session_cb(SSL *s, const EVP_MD *md,
 
         usesess = SSL_SESSION_new();
         if (usesess == NULL
-                || !SSL_SESSION_set1_master_key(usesess, key, key_len)
-                || !SSL_SESSION_set_cipher(usesess, cipher)
-                || !SSL_SESSION_set_protocol_version(usesess, TLS1_3_VERSION)) {
+            || !SSL_SESSION_set1_master_key(usesess, key, key_len)
+            || !SSL_SESSION_set_cipher(usesess, cipher)
+            || !SSL_SESSION_set_protocol_version(usesess, TLS1_3_VERSION)) {
             OPENSSL_free(key);
             goto err;
         }
@@ -258,7 +258,7 @@ static int psk_use_session_cb(SSL *s, const EVP_MD *md,
 
     return 1;
 
- err:
+err:
     SSL_SESSION_free(usesess);
     return 0;
 }
@@ -271,7 +271,7 @@ typedef struct tlsextctx_st {
 
 static int ssl_servername_cb(SSL *s, int *ad, void *arg)
 {
-    tlsextctx *p = (tlsextctx *) arg;
+    tlsextctx *p = (tlsextctx *)arg;
     const char *hn = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
     if (SSL_get_servername_type(s) != -1)
         p->ack = !SSL_session_reused(s) && hn != NULL;
@@ -292,8 +292,8 @@ typedef struct tlsextnextprotoctx_st {
 static tlsextnextprotoctx next_proto;
 
 static int next_proto_cb(SSL *s, unsigned char **out, unsigned char *outlen,
-                         const unsigned char *in, unsigned int inlen,
-                         void *arg)
+    const unsigned char *in, unsigned int inlen,
+    void *arg)
 {
     tlsextnextprotoctx *ctx = arg;
 
@@ -310,15 +310,14 @@ static int next_proto_cb(SSL *s, unsigned char **out, unsigned char *outlen,
         BIO_write(bio_c_out, "\n", 1);
     }
 
-    ctx->status =
-        SSL_select_next_proto(out, outlen, in, inlen, ctx->data, ctx->len);
+    ctx->status = SSL_select_next_proto(out, outlen, in, inlen, ctx->data, ctx->len);
     return SSL_TLSEXT_ERR_OK;
 }
-#endif                         /* ndef OPENSSL_NO_NEXTPROTONEG */
+#endif /* ndef OPENSSL_NO_NEXTPROTONEG */
 
 static int serverinfo_cli_parse_cb(SSL *s, unsigned int ext_type,
-                                   const unsigned char *in, size_t inlen,
-                                   int *al, void *arg)
+    const unsigned char *in, size_t inlen,
+    int *al, void *arg)
 {
     char pem_name[100];
     unsigned char ext_buf[4 + 65536];
@@ -332,7 +331,7 @@ static int serverinfo_cli_parse_cb(SSL *s, unsigned int ext_type,
     memcpy(ext_buf + 4, in, inlen);
 
     BIO_snprintf(pem_name, sizeof(pem_name), "SERVERINFO FOR EXTENSION %d",
-                 ext_type);
+        ext_type);
     PEM_write_bio(bio_c_out, pem_name, "", ext_buf, 4 + inlen);
     return 1;
 }
@@ -396,9 +395,7 @@ static ossl_ssize_t checked_uint8(const char **inptr, void *out)
     v = strtol(in, &endp, 10);
     e = restore_errno();
 
-    if (((v == LONG_MIN || v == LONG_MAX) && e == ERANGE) ||
-        endp == in || !isspace(_UC(*endp)) ||
-        v != (*result = (uint8_t) v)) {
+    if (((v == LONG_MIN || v == LONG_MAX) && e == ERANGE) || endp == in || !isspace(_UC(*endp)) || v != (*result = (uint8_t)v)) {
         return -1;
     }
     for (in = endp; isspace(_UC(*in)); ++in)
@@ -426,7 +423,9 @@ static int tlsa_import_rr(SSL *con, const char *rrdata)
         { &selector, "selector", checked_uint8 },
         { &mtype, "mtype", checked_uint8 },
         { &data, "data", hexdecode },
-        { NULL, }
+        {
+            NULL,
+        }
     };
     struct tlsa_field *f;
     int ret;
@@ -437,7 +436,7 @@ static int tlsa_import_rr(SSL *con, const char *rrdata)
         /* Returns number of bytes produced, advances cp to next field */
         if ((len = f->parser(&cp, f->var)) <= 0) {
             BIO_printf(bio_err, "%s: warning: bad TLSA %s field in: %s\n",
-                       prog, f->name, rrdata);
+                prog, f->name, rrdata);
             return 0;
         }
     }
@@ -448,13 +447,13 @@ static int tlsa_import_rr(SSL *con, const char *rrdata)
     if (ret == 0) {
         ERR_print_errors(bio_err);
         BIO_printf(bio_err, "%s: warning: unusable TLSA rrdata: %s\n",
-                   prog, rrdata);
+            prog, rrdata);
         return 0;
     }
     if (ret < 0) {
         ERR_print_errors(bio_err);
         BIO_printf(bio_err, "%s: warning: error loading TLSA rrdata: %s\n",
-                   prog, rrdata);
+            prog, rrdata);
         return 0;
     }
     return ret;
@@ -476,284 +475,369 @@ static int tlsa_import_rrset(SSL *con, STACK_OF(OPENSSL_STRING) *rrset)
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_4, OPT_6, OPT_HOST, OPT_PORT, OPT_CONNECT, OPT_BIND, OPT_UNIX,
-    OPT_XMPPHOST, OPT_VERIFY, OPT_NAMEOPT,
-    OPT_CERT, OPT_CRL, OPT_CRL_DOWNLOAD, OPT_SESS_OUT, OPT_SESS_IN,
-    OPT_CERTFORM, OPT_CRLFORM, OPT_VERIFY_RET_ERROR, OPT_VERIFY_QUIET,
-    OPT_BRIEF, OPT_PREXIT, OPT_NO_INTERACTIVE, OPT_CRLF, OPT_QUIET, OPT_NBIO,
-    OPT_SSL_CLIENT_ENGINE, OPT_IGN_EOF, OPT_NO_IGN_EOF,
-    OPT_DEBUG, OPT_TLSEXTDEBUG, OPT_STATUS, OPT_WDEBUG,
-    OPT_MSG, OPT_MSGFILE, OPT_ENGINE, OPT_TRACE, OPT_SECURITY_DEBUG,
-    OPT_SECURITY_DEBUG_VERBOSE, OPT_SHOWCERTS, OPT_NBIO_TEST, OPT_STATE,
-    OPT_PSK_IDENTITY, OPT_PSK, OPT_PSK_SESS,
+    OPT_4,
+    OPT_6,
+    OPT_HOST,
+    OPT_PORT,
+    OPT_CONNECT,
+    OPT_BIND,
+    OPT_UNIX,
+    OPT_XMPPHOST,
+    OPT_VERIFY,
+    OPT_NAMEOPT,
+    OPT_CERT,
+    OPT_CRL,
+    OPT_CRL_DOWNLOAD,
+    OPT_SESS_OUT,
+    OPT_SESS_IN,
+    OPT_CERTFORM,
+    OPT_CRLFORM,
+    OPT_VERIFY_RET_ERROR,
+    OPT_VERIFY_QUIET,
+    OPT_BRIEF,
+    OPT_PREXIT,
+    OPT_NO_INTERACTIVE,
+    OPT_CRLF,
+    OPT_QUIET,
+    OPT_NBIO,
+    OPT_SSL_CLIENT_ENGINE,
+    OPT_IGN_EOF,
+    OPT_NO_IGN_EOF,
+    OPT_DEBUG,
+    OPT_TLSEXTDEBUG,
+    OPT_STATUS,
+    OPT_WDEBUG,
+    OPT_MSG,
+    OPT_MSGFILE,
+    OPT_ENGINE,
+    OPT_TRACE,
+    OPT_SECURITY_DEBUG,
+    OPT_SECURITY_DEBUG_VERBOSE,
+    OPT_SHOWCERTS,
+    OPT_NBIO_TEST,
+    OPT_STATE,
+    OPT_PSK_IDENTITY,
+    OPT_PSK,
+    OPT_PSK_SESS,
 #ifndef OPENSSL_NO_SRP
-    OPT_SRPUSER, OPT_SRPPASS, OPT_SRP_STRENGTH, OPT_SRP_LATEUSER,
+    OPT_SRPUSER,
+    OPT_SRPPASS,
+    OPT_SRP_STRENGTH,
+    OPT_SRP_LATEUSER,
     OPT_SRP_MOREGROUPS,
 #endif
-    OPT_SSL3, OPT_SSL_CONFIG,
-    OPT_TLS1_3, OPT_TLS1_2, OPT_TLS1_1, OPT_TLS1, OPT_DTLS, OPT_DTLS1,
-    OPT_DTLS1_2, OPT_QUIC, OPT_SCTP, OPT_TIMEOUT, OPT_MTU, OPT_KEYFORM,
-    OPT_PASS, OPT_CERT_CHAIN, OPT_KEY, OPT_RECONNECT, OPT_BUILD_CHAIN,
-    OPT_NEXTPROTONEG, OPT_ALPN,
-    OPT_CAPATH, OPT_NOCAPATH, OPT_CHAINCAPATH, OPT_VERIFYCAPATH,
-    OPT_CAFILE, OPT_NOCAFILE, OPT_CHAINCAFILE, OPT_VERIFYCAFILE,
-    OPT_CASTORE, OPT_NOCASTORE, OPT_CHAINCASTORE, OPT_VERIFYCASTORE,
-    OPT_SERVERINFO, OPT_STARTTLS, OPT_SERVERNAME, OPT_NOSERVERNAME, OPT_ASYNC,
-    OPT_USE_SRTP, OPT_KEYMATEXPORT, OPT_KEYMATEXPORTLEN, OPT_PROTOHOST,
-    OPT_MAXFRAGLEN, OPT_MAX_SEND_FRAG, OPT_SPLIT_SEND_FRAG, OPT_MAX_PIPELINES,
-    OPT_READ_BUF, OPT_KEYLOG_FILE, OPT_EARLY_DATA, OPT_REQCAFILE,
+    OPT_SSL3,
+    OPT_SSL_CONFIG,
+    OPT_TLS1_3,
+    OPT_TLS1_2,
+    OPT_TLS1_1,
+    OPT_TLS1,
+    OPT_DTLS,
+    OPT_DTLS1,
+    OPT_DTLS1_2,
+    OPT_QUIC,
+    OPT_SCTP,
+    OPT_TIMEOUT,
+    OPT_MTU,
+    OPT_KEYFORM,
+    OPT_PASS,
+    OPT_CERT_CHAIN,
+    OPT_KEY,
+    OPT_RECONNECT,
+    OPT_BUILD_CHAIN,
+    OPT_NEXTPROTONEG,
+    OPT_ALPN,
+    OPT_CAPATH,
+    OPT_NOCAPATH,
+    OPT_CHAINCAPATH,
+    OPT_VERIFYCAPATH,
+    OPT_CAFILE,
+    OPT_NOCAFILE,
+    OPT_CHAINCAFILE,
+    OPT_VERIFYCAFILE,
+    OPT_CASTORE,
+    OPT_NOCASTORE,
+    OPT_CHAINCASTORE,
+    OPT_VERIFYCASTORE,
+    OPT_SERVERINFO,
+    OPT_STARTTLS,
+    OPT_SERVERNAME,
+    OPT_NOSERVERNAME,
+    OPT_ASYNC,
+    OPT_USE_SRTP,
+    OPT_KEYMATEXPORT,
+    OPT_KEYMATEXPORTLEN,
+    OPT_PROTOHOST,
+    OPT_MAXFRAGLEN,
+    OPT_MAX_SEND_FRAG,
+    OPT_SPLIT_SEND_FRAG,
+    OPT_MAX_PIPELINES,
+    OPT_READ_BUF,
+    OPT_KEYLOG_FILE,
+    OPT_EARLY_DATA,
+    OPT_REQCAFILE,
     OPT_TFO,
     OPT_V_ENUM,
     OPT_X_ENUM,
-    OPT_S_ENUM, OPT_IGNORE_UNEXPECTED_EOF,
-    OPT_FALLBACKSCSV, OPT_NOCMDS, OPT_ADV, OPT_PROXY, OPT_PROXY_USER,
-    OPT_PROXY_PASS, OPT_DANE_TLSA_DOMAIN,
+    OPT_S_ENUM,
+    OPT_IGNORE_UNEXPECTED_EOF,
+    OPT_FALLBACKSCSV,
+    OPT_NOCMDS,
+    OPT_ADV,
+    OPT_PROXY,
+    OPT_PROXY_USER,
+    OPT_PROXY_PASS,
+    OPT_DANE_TLSA_DOMAIN,
 #ifndef OPENSSL_NO_CT
-    OPT_CT, OPT_NOCT, OPT_CTLOG_FILE,
+    OPT_CT,
+    OPT_NOCT,
+    OPT_CTLOG_FILE,
 #endif
-    OPT_DANE_TLSA_RRDATA, OPT_DANE_EE_NO_NAME,
+    OPT_DANE_TLSA_RRDATA,
+    OPT_DANE_EE_NO_NAME,
     OPT_ENABLE_PHA,
     OPT_ENABLE_SERVER_RPK,
     OPT_ENABLE_CLIENT_RPK,
     OPT_SCTP_LABEL_BUG,
     OPT_KTLS,
-    OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS s_client_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [host:port]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [host:port]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
-    {"ssl_client_engine", OPT_SSL_CLIENT_ENGINE, 's',
-     "Specify engine to be used for client certificate operations"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
+    { "ssl_client_engine", OPT_SSL_CLIENT_ENGINE, 's',
+        "Specify engine to be used for client certificate operations" },
 #endif
-    {"ssl_config", OPT_SSL_CONFIG, 's', "Use specified section for SSL_CTX configuration"},
+    { "ssl_config", OPT_SSL_CONFIG, 's', "Use specified section for SSL_CTX configuration" },
 #ifndef OPENSSL_NO_CT
-    {"ct", OPT_CT, '-', "Request and parse SCTs (also enables OCSP stapling)"},
-    {"noct", OPT_NOCT, '-', "Do not request or parse SCTs (default)"},
-    {"ctlogfile", OPT_CTLOG_FILE, '<', "CT log list CONF file"},
+    { "ct", OPT_CT, '-', "Request and parse SCTs (also enables OCSP stapling)" },
+    { "noct", OPT_NOCT, '-', "Do not request or parse SCTs (default)" },
+    { "ctlogfile", OPT_CTLOG_FILE, '<', "CT log list CONF file" },
 #endif
 
     OPT_SECTION("Network"),
-    {"host", OPT_HOST, 's', "Use -connect instead"},
-    {"port", OPT_PORT, 'p', "Use -connect instead"},
-    {"connect", OPT_CONNECT, 's',
-     "TCP/IP where to connect; default: " PORT ")"},
-    {"bind", OPT_BIND, 's', "bind local address for connection"},
-    {"proxy", OPT_PROXY, 's',
-     "Connect to via specified proxy to the real server"},
-    {"proxy_user", OPT_PROXY_USER, 's', "UserID for proxy authentication"},
-    {"proxy_pass", OPT_PROXY_PASS, 's', "Proxy authentication password source"},
+    { "host", OPT_HOST, 's', "Use -connect instead" },
+    { "port", OPT_PORT, 'p', "Use -connect instead" },
+    { "connect", OPT_CONNECT, 's',
+        "TCP/IP where to connect; default: " PORT ")" },
+    { "bind", OPT_BIND, 's', "bind local address for connection" },
+    { "proxy", OPT_PROXY, 's',
+        "Connect to via specified proxy to the real server" },
+    { "proxy_user", OPT_PROXY_USER, 's', "UserID for proxy authentication" },
+    { "proxy_pass", OPT_PROXY_PASS, 's', "Proxy authentication password source" },
 #ifdef AF_UNIX
-    {"unix", OPT_UNIX, 's', "Connect over the specified Unix-domain socket"},
+    { "unix", OPT_UNIX, 's', "Connect over the specified Unix-domain socket" },
 #endif
-    {"4", OPT_4, '-', "Use IPv4 only"},
+    { "4", OPT_4, '-', "Use IPv4 only" },
 #ifdef AF_INET6
-    {"6", OPT_6, '-', "Use IPv6 only"},
-#endif
-    {"maxfraglen", OPT_MAXFRAGLEN, 'p',
-     "Enable Maximum Fragment Length Negotiation (len values: 512, 1024, 2048 and 4096)"},
-    {"max_send_frag", OPT_MAX_SEND_FRAG, 'p', "Maximum Size of send frames "},
-    {"split_send_frag", OPT_SPLIT_SEND_FRAG, 'p',
-     "Size used to split data for encrypt pipelines"},
-    {"max_pipelines", OPT_MAX_PIPELINES, 'p',
-     "Maximum number of encrypt/decrypt pipelines to be used"},
-    {"read_buf", OPT_READ_BUF, 'p',
-     "Default read buffer size to be used for connections"},
-    {"fallback_scsv", OPT_FALLBACKSCSV, '-', "Send the fallback SCSV"},
+    { "6", OPT_6, '-', "Use IPv6 only" },
+#endif
+    { "maxfraglen", OPT_MAXFRAGLEN, 'p',
+        "Enable Maximum Fragment Length Negotiation (len values: 512, 1024, 2048 and 4096)" },
+    { "max_send_frag", OPT_MAX_SEND_FRAG, 'p', "Maximum Size of send frames " },
+    { "split_send_frag", OPT_SPLIT_SEND_FRAG, 'p',
+        "Size used to split data for encrypt pipelines" },
+    { "max_pipelines", OPT_MAX_PIPELINES, 'p',
+        "Maximum number of encrypt/decrypt pipelines to be used" },
+    { "read_buf", OPT_READ_BUF, 'p',
+        "Default read buffer size to be used for connections" },
+    { "fallback_scsv", OPT_FALLBACKSCSV, '-', "Send the fallback SCSV" },
 
     OPT_SECTION("Identity"),
-    {"cert", OPT_CERT, '<', "Client certificate file to use"},
-    {"certform", OPT_CERTFORM, 'F',
-     "Client certificate file format (PEM/DER/P12); has no effect"},
-    {"cert_chain", OPT_CERT_CHAIN, '<',
-     "Client certificate chain file (in PEM format)"},
-    {"build_chain", OPT_BUILD_CHAIN, '-', "Build client certificate chain"},
-    {"key", OPT_KEY, 's', "Private key file to use; default: -cert file"},
-    {"keyform", OPT_KEYFORM, 'E', "Key format (ENGINE, other values ignored)"},
-    {"pass", OPT_PASS, 's', "Private key and cert file pass phrase source"},
-    {"verify", OPT_VERIFY, 'p', "Turn on peer certificate verification"},
-    {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"},
-    {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"},
-    {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"},
-    {"CAstore", OPT_CASTORE, ':', "URI to store of CA's"},
-    {"no-CAfile", OPT_NOCAFILE, '-',
-     "Do not load the default certificates file"},
-    {"no-CApath", OPT_NOCAPATH, '-',
-     "Do not load certificates from the default certificates directory"},
-    {"no-CAstore", OPT_NOCASTORE, '-',
-     "Do not load certificates from the default certificates store"},
-    {"requestCAfile", OPT_REQCAFILE, '<',
-      "PEM format file of CA names to send to the server"},
+    { "cert", OPT_CERT, '<', "Client certificate file to use" },
+    { "certform", OPT_CERTFORM, 'F',
+        "Client certificate file format (PEM/DER/P12); has no effect" },
+    { "cert_chain", OPT_CERT_CHAIN, '<',
+        "Client certificate chain file (in PEM format)" },
+    { "build_chain", OPT_BUILD_CHAIN, '-', "Build client certificate chain" },
+    { "key", OPT_KEY, 's', "Private key file to use; default: -cert file" },
+    { "keyform", OPT_KEYFORM, 'E', "Key format (ENGINE, other values ignored)" },
+    { "pass", OPT_PASS, 's', "Private key and cert file pass phrase source" },
+    { "verify", OPT_VERIFY, 'p', "Turn on peer certificate verification" },
+    { "nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options" },
+    { "CApath", OPT_CAPATH, '/', "PEM format directory of CA's" },
+    { "CAfile", OPT_CAFILE, '<', "PEM format file of CA's" },
+    { "CAstore", OPT_CASTORE, ':', "URI to store of CA's" },
+    { "no-CAfile", OPT_NOCAFILE, '-',
+        "Do not load the default certificates file" },
+    { "no-CApath", OPT_NOCAPATH, '-',
+        "Do not load certificates from the default certificates directory" },
+    { "no-CAstore", OPT_NOCASTORE, '-',
+        "Do not load certificates from the default certificates store" },
+    { "requestCAfile", OPT_REQCAFILE, '<',
+        "PEM format file of CA names to send to the server" },
 #if defined(TCP_FASTOPEN) && !defined(OPENSSL_NO_TFO)
-    {"tfo", OPT_TFO, '-', "Connect using TCP Fast Open"},
-#endif
-    {"dane_tlsa_domain", OPT_DANE_TLSA_DOMAIN, 's', "DANE TLSA base domain"},
-    {"dane_tlsa_rrdata", OPT_DANE_TLSA_RRDATA, 's',
-     "DANE TLSA rrdata presentation form"},
-    {"dane_ee_no_namechecks", OPT_DANE_EE_NO_NAME, '-',
-     "Disable name checks when matching DANE-EE(3) TLSA records"},
-    {"psk_identity", OPT_PSK_IDENTITY, 's', "PSK identity"},
-    {"psk", OPT_PSK, 's', "PSK in hex (without 0x)"},
-    {"psk_session", OPT_PSK_SESS, '<', "File to read PSK SSL session from"},
-    {"name", OPT_PROTOHOST, 's',
-     "Hostname to use for \"-starttls lmtp\", \"-starttls smtp\" or \"-starttls xmpp[-server]\""},
+    { "tfo", OPT_TFO, '-', "Connect using TCP Fast Open" },
+#endif
+    { "dane_tlsa_domain", OPT_DANE_TLSA_DOMAIN, 's', "DANE TLSA base domain" },
+    { "dane_tlsa_rrdata", OPT_DANE_TLSA_RRDATA, 's',
+        "DANE TLSA rrdata presentation form" },
+    { "dane_ee_no_namechecks", OPT_DANE_EE_NO_NAME, '-',
+        "Disable name checks when matching DANE-EE(3) TLSA records" },
+    { "psk_identity", OPT_PSK_IDENTITY, 's', "PSK identity" },
+    { "psk", OPT_PSK, 's', "PSK in hex (without 0x)" },
+    { "psk_session", OPT_PSK_SESS, '<', "File to read PSK SSL session from" },
+    { "name", OPT_PROTOHOST, 's',
+        "Hostname to use for \"-starttls lmtp\", \"-starttls smtp\" or \"-starttls xmpp[-server]\"" },
 
     OPT_SECTION("Session"),
-    {"reconnect", OPT_RECONNECT, '-',
-     "Drop and re-make the connection with the same Session-ID"},
-    {"sess_out", OPT_SESS_OUT, '>', "File to write SSL session to"},
-    {"sess_in", OPT_SESS_IN, '<', "File to read SSL session from"},
+    { "reconnect", OPT_RECONNECT, '-',
+        "Drop and re-make the connection with the same Session-ID" },
+    { "sess_out", OPT_SESS_OUT, '>', "File to write SSL session to" },
+    { "sess_in", OPT_SESS_IN, '<', "File to read SSL session from" },
 
     OPT_SECTION("Input/Output"),
-    {"crlf", OPT_CRLF, '-', "Convert LF from terminal into CRLF"},
-    {"quiet", OPT_QUIET, '-', "No s_client output"},
-    {"ign_eof", OPT_IGN_EOF, '-', "Ignore input eof (default when -quiet)"},
-    {"no_ign_eof", OPT_NO_IGN_EOF, '-', "Don't ignore input eof"},
-    {"starttls", OPT_STARTTLS, 's',
-     "Use the appropriate STARTTLS command before starting TLS"},
-    {"xmpphost", OPT_XMPPHOST, 's',
-     "Alias of -name option for \"-starttls xmpp[-server]\""},
-    {"brief", OPT_BRIEF, '-',
-     "Restrict output to brief summary of connection parameters"},
-    {"prexit", OPT_PREXIT, '-',
-     "Print session information when the program exits"},
-    {"no-interactive", OPT_NO_INTERACTIVE, '-',
-     "Don't run the client in the interactive mode"},
+    { "crlf", OPT_CRLF, '-', "Convert LF from terminal into CRLF" },
+    { "quiet", OPT_QUIET, '-', "No s_client output" },
+    { "ign_eof", OPT_IGN_EOF, '-', "Ignore input eof (default when -quiet)" },
+    { "no_ign_eof", OPT_NO_IGN_EOF, '-', "Don't ignore input eof" },
+    { "starttls", OPT_STARTTLS, 's',
+        "Use the appropriate STARTTLS command before starting TLS" },
+    { "xmpphost", OPT_XMPPHOST, 's',
+        "Alias of -name option for \"-starttls xmpp[-server]\"" },
+    { "brief", OPT_BRIEF, '-',
+        "Restrict output to brief summary of connection parameters" },
+    { "prexit", OPT_PREXIT, '-',
+        "Print session information when the program exits" },
+    { "no-interactive", OPT_NO_INTERACTIVE, '-',
+        "Don't run the client in the interactive mode" },
 
     OPT_SECTION("Debug"),
-    {"showcerts", OPT_SHOWCERTS, '-',
-     "Show all certificates sent by the server"},
-    {"debug", OPT_DEBUG, '-', "Extra output"},
-    {"msg", OPT_MSG, '-', "Show protocol messages"},
-    {"msgfile", OPT_MSGFILE, '>',
-     "File to send output of -msg or -trace, instead of stdout"},
-    {"nbio_test", OPT_NBIO_TEST, '-', "More ssl protocol testing"},
-    {"state", OPT_STATE, '-', "Print the ssl states"},
-    {"keymatexport", OPT_KEYMATEXPORT, 's',
-     "Export keying material using label"},
-    {"keymatexportlen", OPT_KEYMATEXPORTLEN, 'p',
-     "Export len bytes of keying material; default 20"},
-    {"security_debug", OPT_SECURITY_DEBUG, '-',
-     "Enable security debug messages"},
-    {"security_debug_verbose", OPT_SECURITY_DEBUG_VERBOSE, '-',
-     "Output more security debug output"},
+    { "showcerts", OPT_SHOWCERTS, '-',
+        "Show all certificates sent by the server" },
+    { "debug", OPT_DEBUG, '-', "Extra output" },
+    { "msg", OPT_MSG, '-', "Show protocol messages" },
+    { "msgfile", OPT_MSGFILE, '>',
+        "File to send output of -msg or -trace, instead of stdout" },
+    { "nbio_test", OPT_NBIO_TEST, '-', "More ssl protocol testing" },
+    { "state", OPT_STATE, '-', "Print the ssl states" },
+    { "keymatexport", OPT_KEYMATEXPORT, 's',
+        "Export keying material using label" },
+    { "keymatexportlen", OPT_KEYMATEXPORTLEN, 'p',
+        "Export len bytes of keying material; default 20" },
+    { "security_debug", OPT_SECURITY_DEBUG, '-',
+        "Enable security debug messages" },
+    { "security_debug_verbose", OPT_SECURITY_DEBUG_VERBOSE, '-',
+        "Output more security debug output" },
 #ifndef OPENSSL_NO_SSL_TRACE
-    {"trace", OPT_TRACE, '-', "Show trace output of protocol messages"},
+    { "trace", OPT_TRACE, '-', "Show trace output of protocol messages" },
 #endif
 #ifdef WATT32
-    {"wdebug", OPT_WDEBUG, '-', "WATT-32 tcp debugging"},
-#endif
-    {"keylogfile", OPT_KEYLOG_FILE, '>', "Write TLS secrets to file"},
-    {"nocommands", OPT_NOCMDS, '-', "Do not use interactive command letters"},
-    {"adv", OPT_ADV, '-', "Advanced command mode"},
-    {"servername", OPT_SERVERNAME, 's',
-     "Set TLS extension servername (SNI) in ClientHello (default)"},
-    {"noservername", OPT_NOSERVERNAME, '-',
-     "Do not send the server name (SNI) extension in the ClientHello"},
-    {"tlsextdebug", OPT_TLSEXTDEBUG, '-',
-     "Hex dump of all TLS extensions received"},
-    {"ignore_unexpected_eof", OPT_IGNORE_UNEXPECTED_EOF, '-',
-     "Do not treat lack of close_notify from a peer as an error"},
+    { "wdebug", OPT_WDEBUG, '-', "WATT-32 tcp debugging" },
+#endif
+    { "keylogfile", OPT_KEYLOG_FILE, '>', "Write TLS secrets to file" },
+    { "nocommands", OPT_NOCMDS, '-', "Do not use interactive command letters" },
+    { "adv", OPT_ADV, '-', "Advanced command mode" },
+    { "servername", OPT_SERVERNAME, 's',
+        "Set TLS extension servername (SNI) in ClientHello (default)" },
+    { "noservername", OPT_NOSERVERNAME, '-',
+        "Do not send the server name (SNI) extension in the ClientHello" },
+    { "tlsextdebug", OPT_TLSEXTDEBUG, '-',
+        "Hex dump of all TLS extensions received" },
+    { "ignore_unexpected_eof", OPT_IGNORE_UNEXPECTED_EOF, '-',
+        "Do not treat lack of close_notify from a peer as an error" },
 #ifndef OPENSSL_NO_OCSP
-    {"status", OPT_STATUS, '-', "Request certificate status from server"},
+    { "status", OPT_STATUS, '-', "Request certificate status from server" },
 #endif
-    {"serverinfo", OPT_SERVERINFO, 's',
-     "types  Send empty ClientHello extensions (comma-separated numbers)"},
-    {"alpn", OPT_ALPN, 's',
-     "Enable ALPN extension, considering named protocols supported (comma-separated list)"},
-    {"async", OPT_ASYNC, '-', "Support asynchronous operation"},
-    {"nbio", OPT_NBIO, '-', "Use non-blocking IO"},
+    { "serverinfo", OPT_SERVERINFO, 's',
+        "types  Send empty ClientHello extensions (comma-separated numbers)" },
+    { "alpn", OPT_ALPN, 's',
+        "Enable ALPN extension, considering named protocols supported (comma-separated list)" },
+    { "async", OPT_ASYNC, '-', "Support asynchronous operation" },
+    { "nbio", OPT_NBIO, '-', "Use non-blocking IO" },
 
     OPT_SECTION("Protocol and version"),
 #ifndef OPENSSL_NO_SSL3
-    {"ssl3", OPT_SSL3, '-', "Just use SSLv3"},
+    { "ssl3", OPT_SSL3, '-', "Just use SSLv3" },
 #endif
 #ifndef OPENSSL_NO_TLS1
-    {"tls1", OPT_TLS1, '-', "Just use TLSv1"},
+    { "tls1", OPT_TLS1, '-', "Just use TLSv1" },
 #endif
 #ifndef OPENSSL_NO_TLS1_1
-    {"tls1_1", OPT_TLS1_1, '-', "Just use TLSv1.1"},
+    { "tls1_1", OPT_TLS1_1, '-', "Just use TLSv1.1" },
 #endif
 #ifndef OPENSSL_NO_TLS1_2
-    {"tls1_2", OPT_TLS1_2, '-', "Just use TLSv1.2"},
+    { "tls1_2", OPT_TLS1_2, '-', "Just use TLSv1.2" },
 #endif
 #ifndef OPENSSL_NO_TLS1_3
-    {"tls1_3", OPT_TLS1_3, '-', "Just use TLSv1.3"},
+    { "tls1_3", OPT_TLS1_3, '-', "Just use TLSv1.3" },
 #endif
 #ifndef OPENSSL_NO_DTLS
-    {"dtls", OPT_DTLS, '-', "Use any version of DTLS"},
-    {"quic", OPT_QUIC, '-', "Use QUIC"},
-    {"timeout", OPT_TIMEOUT, '-',
-     "Enable send/receive timeout on DTLS connections"},
-    {"mtu", OPT_MTU, 'p', "Set the link layer MTU"},
+    { "dtls", OPT_DTLS, '-', "Use any version of DTLS" },
+    { "quic", OPT_QUIC, '-', "Use QUIC" },
+    { "timeout", OPT_TIMEOUT, '-',
+        "Enable send/receive timeout on DTLS connections" },
+    { "mtu", OPT_MTU, 'p', "Set the link layer MTU" },
 #endif
 #ifndef OPENSSL_NO_DTLS1
-    {"dtls1", OPT_DTLS1, '-', "Just use DTLSv1"},
+    { "dtls1", OPT_DTLS1, '-', "Just use DTLSv1" },
 #endif
 #ifndef OPENSSL_NO_DTLS1_2
-    {"dtls1_2", OPT_DTLS1_2, '-', "Just use DTLSv1.2"},
+    { "dtls1_2", OPT_DTLS1_2, '-', "Just use DTLSv1.2" },
 #endif
 #ifndef OPENSSL_NO_SCTP
-    {"sctp", OPT_SCTP, '-', "Use SCTP"},
-    {"sctp_label_bug", OPT_SCTP_LABEL_BUG, '-', "Enable SCTP label length bug"},
+    { "sctp", OPT_SCTP, '-', "Use SCTP" },
+    { "sctp_label_bug", OPT_SCTP_LABEL_BUG, '-', "Enable SCTP label length bug" },
 #endif
 #ifndef OPENSSL_NO_NEXTPROTONEG
-    {"nextprotoneg", OPT_NEXTPROTONEG, 's',
-     "Enable NPN extension, considering named protocols supported (comma-separated list)"},
+    { "nextprotoneg", OPT_NEXTPROTONEG, 's',
+        "Enable NPN extension, considering named protocols supported (comma-separated list)" },
 #endif
-    {"early_data", OPT_EARLY_DATA, '<', "File to send as early data"},
-    {"enable_pha", OPT_ENABLE_PHA, '-', "Enable post-handshake-authentication"},
-    {"enable_server_rpk", OPT_ENABLE_SERVER_RPK, '-', "Enable raw public keys (RFC7250) from the server"},
-    {"enable_client_rpk", OPT_ENABLE_CLIENT_RPK, '-', "Enable raw public keys (RFC7250) from the client"},
+    { "early_data", OPT_EARLY_DATA, '<', "File to send as early data" },
+    { "enable_pha", OPT_ENABLE_PHA, '-', "Enable post-handshake-authentication" },
+    { "enable_server_rpk", OPT_ENABLE_SERVER_RPK, '-', "Enable raw public keys (RFC7250) from the server" },
+    { "enable_client_rpk", OPT_ENABLE_CLIENT_RPK, '-', "Enable raw public keys (RFC7250) from the client" },
 #ifndef OPENSSL_NO_SRTP
-    {"use_srtp", OPT_USE_SRTP, 's',
-     "Offer SRTP key management with a colon-separated profile list"},
+    { "use_srtp", OPT_USE_SRTP, 's',
+        "Offer SRTP key management with a colon-separated profile list" },
 #endif
 #ifndef OPENSSL_NO_SRP
-    {"srpuser", OPT_SRPUSER, 's', "(deprecated) SRP authentication for 'user'"},
-    {"srppass", OPT_SRPPASS, 's', "(deprecated) Password for 'user'"},
-    {"srp_lateuser", OPT_SRP_LATEUSER, '-',
-     "(deprecated) SRP username into second ClientHello message"},
-    {"srp_moregroups", OPT_SRP_MOREGROUPS, '-',
-     "(deprecated) Tolerate other than the known g N values."},
-    {"srp_strength", OPT_SRP_STRENGTH, 'p',
-     "(deprecated) Minimal length in bits for N"},
+    { "srpuser", OPT_SRPUSER, 's', "(deprecated) SRP authentication for 'user'" },
+    { "srppass", OPT_SRPPASS, 's', "(deprecated) Password for 'user'" },
+    { "srp_lateuser", OPT_SRP_LATEUSER, '-',
+        "(deprecated) SRP username into second ClientHello message" },
+    { "srp_moregroups", OPT_SRP_MOREGROUPS, '-',
+        "(deprecated) Tolerate other than the known g N values." },
+    { "srp_strength", OPT_SRP_STRENGTH, 'p',
+        "(deprecated) Minimal length in bits for N" },
 #endif
 #ifndef OPENSSL_NO_KTLS
-    {"ktls", OPT_KTLS, '-', "Enable Kernel TLS for sending and receiving"},
+    { "ktls", OPT_KTLS, '-', "Enable Kernel TLS for sending and receiving" },
 #endif
 
     OPT_R_OPTIONS,
     OPT_S_OPTIONS,
     OPT_V_OPTIONS,
-    {"CRL", OPT_CRL, '<', "CRL file to use"},
-    {"crl_download", OPT_CRL_DOWNLOAD, '-', "Download CRL from distribution points"},
-    {"CRLform", OPT_CRLFORM, 'F', "CRL format (PEM or DER); default PEM"},
-    {"verify_return_error", OPT_VERIFY_RET_ERROR, '-',
-     "Close connection on verification error"},
-    {"verify_quiet", OPT_VERIFY_QUIET, '-', "Restrict verify output to errors"},
-    {"chainCAfile", OPT_CHAINCAFILE, '<',
-     "CA file for certificate chain (PEM format)"},
-    {"chainCApath", OPT_CHAINCAPATH, '/',
-     "Use dir as certificate store path to build CA certificate chain"},
-    {"chainCAstore", OPT_CHAINCASTORE, ':',
-     "CA store URI for certificate chain"},
-    {"verifyCAfile", OPT_VERIFYCAFILE, '<',
-     "CA file for certificate verification (PEM format)"},
-    {"verifyCApath", OPT_VERIFYCAPATH, '/',
-     "Use dir as certificate store path to verify CA certificate"},
-    {"verifyCAstore", OPT_VERIFYCASTORE, ':',
-     "CA store URI for certificate verification"},
+    { "CRL", OPT_CRL, '<', "CRL file to use" },
+    { "crl_download", OPT_CRL_DOWNLOAD, '-', "Download CRL from distribution points" },
+    { "CRLform", OPT_CRLFORM, 'F', "CRL format (PEM or DER); default PEM" },
+    { "verify_return_error", OPT_VERIFY_RET_ERROR, '-',
+        "Close connection on verification error" },
+    { "verify_quiet", OPT_VERIFY_QUIET, '-', "Restrict verify output to errors" },
+    { "chainCAfile", OPT_CHAINCAFILE, '<',
+        "CA file for certificate chain (PEM format)" },
+    { "chainCApath", OPT_CHAINCAPATH, '/',
+        "Use dir as certificate store path to build CA certificate chain" },
+    { "chainCAstore", OPT_CHAINCASTORE, ':',
+        "CA store URI for certificate chain" },
+    { "verifyCAfile", OPT_VERIFYCAFILE, '<',
+        "CA file for certificate verification (PEM format)" },
+    { "verifyCApath", OPT_VERIFYCAPATH, '/',
+        "Use dir as certificate store path to verify CA certificate" },
+    { "verifyCAstore", OPT_VERIFYCASTORE, ':',
+        "CA store URI for certificate verification" },
     OPT_X_OPTIONS,
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"host:port", 0, 0, "Where to connect; same as -connect option"},
-    {NULL}
+    { "host:port", 0, 0, "Where to connect; same as -connect option" },
+    { NULL }
 };
 
 typedef enum PROTOCOL_choice {
@@ -775,31 +859,31 @@ typedef enum PROTOCOL_choice {
 } PROTOCOL_CHOICE;
 
 static const OPT_PAIR services[] = {
-    {"smtp", PROTO_SMTP},
-    {"pop3", PROTO_POP3},
-    {"imap", PROTO_IMAP},
-    {"ftp", PROTO_FTP},
-    {"xmpp", PROTO_XMPP},
-    {"xmpp-server", PROTO_XMPP_SERVER},
-    {"telnet", PROTO_TELNET},
-    {"irc", PROTO_IRC},
-    {"mysql", PROTO_MYSQL},
-    {"postgres", PROTO_POSTGRES},
-    {"lmtp", PROTO_LMTP},
-    {"nntp", PROTO_NNTP},
-    {"sieve", PROTO_SIEVE},
-    {"ldap", PROTO_LDAP},
-    {NULL, 0}
+    { "smtp", PROTO_SMTP },
+    { "pop3", PROTO_POP3 },
+    { "imap", PROTO_IMAP },
+    { "ftp", PROTO_FTP },
+    { "xmpp", PROTO_XMPP },
+    { "xmpp-server", PROTO_XMPP_SERVER },
+    { "telnet", PROTO_TELNET },
+    { "irc", PROTO_IRC },
+    { "mysql", PROTO_MYSQL },
+    { "postgres", PROTO_POSTGRES },
+    { "lmtp", PROTO_LMTP },
+    { "nntp", PROTO_NNTP },
+    { "sieve", PROTO_SIEVE },
+    { "ldap", PROTO_LDAP },
+    { NULL, 0 }
 };
 
 #define IS_INET_FLAG(o) \
- (o == OPT_4 || o == OPT_6 || o == OPT_HOST || o == OPT_PORT || o == OPT_CONNECT)
+    (o == OPT_4 || o == OPT_6 || o == OPT_HOST || o == OPT_PORT || o == OPT_CONNECT)
 #define IS_UNIX_FLAG(o) (o == OPT_UNIX)
 
-#define IS_PROT_FLAG(o) \
- (o == OPT_SSL3 || o == OPT_TLS1 || o == OPT_TLS1_1 || o == OPT_TLS1_2 \
-  || o == OPT_TLS1_3 || o == OPT_DTLS || o == OPT_DTLS1 || o == OPT_DTLS1_2 \
-  || o == OPT_QUIC)
+#define IS_PROT_FLAG(o)                                                           \
+    (o == OPT_SSL3 || o == OPT_TLS1 || o == OPT_TLS1_1 || o == OPT_TLS1_2         \
+        || o == OPT_TLS1_3 || o == OPT_DTLS || o == OPT_DTLS1 || o == OPT_DTLS1_2 \
+        || o == OPT_QUIC)
 
 /* Free |*dest| and optionally set it to a copy of |source|. */
 static void freeandcopy(char **dest, const char *source)
@@ -830,7 +914,7 @@ static int new_session_cb(SSL *s, SSL_SESSION *sess)
      */
     if (SSL_version(s) == TLS1_3_VERSION) {
         BIO_printf(bio_c_out,
-                   "---\nPost-Handshake New Session Ticket arrived:\n");
+            "---\nPost-Handshake New Session Ticket arrived:\n");
         SSL_SESSION_print(bio_c_out, sess);
         BIO_printf(bio_c_out, "---\n");
     }
@@ -935,7 +1019,10 @@ int s_client_main(int argc, char **argv)
     int async = 0;
     unsigned int max_send_fragment = 0;
     unsigned int split_send_fragment = 0, max_pipelines = 0;
-    enum { use_inet, use_unix, use_unknown } connect_type = use_unknown;
+    enum { use_inet,
+        use_unix,
+        use_unknown } connect_type
+        = use_unknown;
     int count4or6 = 0;
     uint8_t maxfraglen = 0;
     int c_nbio = 0, c_msg = 0, c_ign_eof = 0, c_brief = 0;
@@ -965,10 +1052,10 @@ int s_client_main(int argc, char **argv)
     FD_ZERO(&writefds);
 /* Known false-positive of MemorySanitizer. */
 #if defined(__has_feature)
-# if __has_feature(memory_sanitizer)
+#if __has_feature(memory_sanitizer)
     __msan_unpoison(&readfds, sizeof(readfds));
     __msan_unpoison(&writefds, sizeof(writefds));
-# endif
+#endif
 #endif
 
     c_quiet = 0;
@@ -995,14 +1082,14 @@ int s_client_main(int argc, char **argv)
         /* Check for intermixing flags. */
         if (connect_type == use_unix && IS_INET_FLAG(o)) {
             BIO_printf(bio_err,
-                       "%s: Intermixed protocol flags (unix and internet domains)\n",
-                       prog);
+                "%s: Intermixed protocol flags (unix and internet domains)\n",
+                prog);
             goto end;
         }
         if (connect_type == use_inet && IS_UNIX_FLAG(o)) {
             BIO_printf(bio_err,
-                       "%s: Intermixed protocol flags (internet and unix domains)\n",
-                       prog);
+                "%s: Intermixed protocol flags (internet and unix domains)\n",
+                prog);
             goto end;
         }
 
@@ -1014,14 +1101,14 @@ int s_client_main(int argc, char **argv)
             no_prot_opt++;
         if (prot_opt == 1 && no_prot_opt) {
             BIO_printf(bio_err,
-                       "Cannot supply both a protocol flag and '-no_<prot>'\n");
+                "Cannot supply both a protocol flag and '-no_<prot>'\n");
             goto end;
         }
 
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -1262,7 +1349,7 @@ int s_client_main(int argc, char **argv)
         case OPT_SRP_STRENGTH:
             srp_arg.strength = atoi(opt_arg());
             BIO_printf(bio_err, "SRP minimal length for N is %d\n",
-                       srp_arg.strength);
+                srp_arg.strength);
             if (min_version < TLS1_VERSION)
                 min_version = TLS1_VERSION;
             break;
@@ -1359,9 +1446,9 @@ int s_client_main(int argc, char **argv)
             min_version = 0;
             max_version = 0;
             socket_type = SOCK_DGRAM;
-# ifndef OPENSSL_NO_DTLS
+#ifndef OPENSSL_NO_DTLS
             isdtls = 0;
-# endif
+#endif
             isquic = 1;
 #endif
             break;
@@ -1463,8 +1550,7 @@ int s_client_main(int argc, char **argv)
         case OPT_DANE_TLSA_RRDATA:
             if (dane_tlsa_rrset == NULL)
                 dane_tlsa_rrset = sk_OPENSSL_STRING_new_null();
-            if (dane_tlsa_rrset == NULL ||
-                !sk_OPENSSL_STRING_push(dane_tlsa_rrset, opt_arg())) {
+            if (dane_tlsa_rrset == NULL || !sk_OPENSSL_STRING_push(dane_tlsa_rrset, opt_arg())) {
                 BIO_printf(bio_err, "%s: Memory allocation failure\n", prog);
                 goto end;
             }
@@ -1536,8 +1622,8 @@ int s_client_main(int argc, char **argv)
                 break;
             default:
                 BIO_printf(bio_err,
-                           "%s: Max Fragment Len %u is out of permitted values",
-                           prog, len);
+                    "%s: Max Fragment Len %u is out of permitted values",
+                    prog, len);
                 goto opthelp;
             }
             break;
@@ -1581,8 +1667,8 @@ int s_client_main(int argc, char **argv)
         /* Don't allow -connect and a separate argument. */
         if (connectstr != NULL) {
             BIO_printf(bio_err,
-                       "%s: cannot provide both -connect option and target parameter\n",
-                       prog);
+                "%s: cannot provide both -connect option and target parameter\n",
+                prog);
             goto opthelp;
         }
         connect_type = use_inet;
@@ -1603,14 +1689,14 @@ int s_client_main(int argc, char **argv)
     if (noservername) {
         if (servername != NULL) {
             BIO_printf(bio_err,
-                       "%s: Can't use -servername and -noservername together\n",
-                       prog);
+                "%s: Can't use -servername and -noservername together\n",
+                prog);
             goto opthelp;
         }
         if (dane_tlsa_domain != NULL) {
             BIO_printf(bio_err,
-               "%s: Can't use -dane_tlsa_domain and -noservername together\n",
-               prog);
+                "%s: Can't use -dane_tlsa_domain and -noservername together\n",
+                prog);
             goto opthelp;
         }
     }
@@ -1633,8 +1719,8 @@ int s_client_main(int argc, char **argv)
             OPENSSL_free(tmp_port);
         if (!res) {
             BIO_printf(bio_err,
-                       "%s: -connect argument or target parameter malformed or ambiguous\n",
-                       prog);
+                "%s: -connect argument or target parameter malformed or ambiguous\n",
+                prog);
             goto end;
         }
     }
@@ -1672,25 +1758,24 @@ int s_client_main(int argc, char **argv)
             OPENSSL_free(tmp_port);
         if (!res) {
             BIO_printf(bio_err,
-                       "%s: -proxy argument malformed or ambiguous\n", prog);
+                "%s: -proxy argument malformed or ambiguous\n", prog);
             goto end;
         }
 #else
         BIO_printf(bio_err,
-                   "%s: -proxy not supported in no-http build\n", prog);
-	goto end;
+            "%s: -proxy not supported in no-http build\n", prog);
+        goto end;
 #endif
     }
 
-
     if (bindstr != NULL) {
         int res;
         res = BIO_parse_hostserv(bindstr, &bindhost, &bindport,
-                                 BIO_PARSE_PRIO_HOST);
+            BIO_PARSE_PRIO_HOST);
         if (!res) {
             BIO_printf(bio_err,
-                       "%s: -bind argument parameter malformed or ambiguous\n",
-                       prog);
+                "%s: -bind argument parameter malformed or ambiguous\n",
+                prog);
             goto end;
         }
     }
@@ -1698,7 +1783,7 @@ int s_client_main(int argc, char **argv)
 #ifdef AF_UNIX
     if (socket_family == AF_UNIX && socket_type != SOCK_STREAM) {
         BIO_printf(bio_err,
-                   "Can't use unix sockets and datagrams together\n");
+            "Can't use unix sockets and datagrams together\n");
         goto end;
     }
 #endif
@@ -1717,8 +1802,7 @@ int s_client_main(int argc, char **argv)
 #if !defined(OPENSSL_NO_NEXTPROTONEG)
     next_proto.status = -1;
     if (next_proto_neg_in) {
-        next_proto.data =
-            next_protos_parse(&next_proto.len, next_proto_neg_in);
+        next_proto.data = next_protos_parse(&next_proto.len, next_proto_neg_in);
         if (next_proto.data == NULL) {
             BIO_printf(bio_err, "Error parsing -nextprotoneg argument\n");
             goto end;
@@ -1747,14 +1831,14 @@ int s_client_main(int argc, char **argv)
 
     if (key_file != NULL) {
         key = load_key(key_file, key_format, 0, pass, e,
-                       "client certificate private key");
+            "client certificate private key");
         if (key == NULL)
             goto end;
     }
 
     if (cert_file != NULL) {
         cert = load_cert_pass(cert_file, cert_format, 1, pass,
-                              "client certificate");
+            "client certificate");
         if (cert == NULL)
             goto end;
     }
@@ -1824,7 +1908,7 @@ int s_client_main(int argc, char **argv)
     if (ssl_config != NULL) {
         if (SSL_CTX_config(ctx, ssl_config) == 0) {
             BIO_printf(bio_err, "Error using configuration \"%s\"\n",
-                       ssl_config);
+                ssl_config);
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -1862,21 +1946,21 @@ int s_client_main(int argc, char **argv)
     if (max_send_fragment > 0
         && !SSL_CTX_set_max_send_fragment(ctx, max_send_fragment)) {
         BIO_printf(bio_err, "%s: Max send fragment size %u is out of permitted range\n",
-                   prog, max_send_fragment);
+            prog, max_send_fragment);
         goto end;
     }
 
     if (split_send_fragment > 0
         && !SSL_CTX_set_split_send_fragment(ctx, split_send_fragment)) {
         BIO_printf(bio_err, "%s: Split send fragment size %u is out of permitted range\n",
-                   prog, split_send_fragment);
+            prog, split_send_fragment);
         goto end;
     }
 
     if (max_pipelines > 0
         && !SSL_CTX_set_max_pipelines(ctx, max_pipelines)) {
         BIO_printf(bio_err, "%s: Max pipelines %u is out of permitted range\n",
-                   prog, max_pipelines);
+            prog, max_pipelines);
         goto end;
     }
 
@@ -1885,17 +1969,18 @@ int s_client_main(int argc, char **argv)
     }
 
     if (maxfraglen > 0
-            && !SSL_CTX_set_tlsext_max_fragment_length(ctx, maxfraglen)) {
+        && !SSL_CTX_set_tlsext_max_fragment_length(ctx, maxfraglen)) {
         BIO_printf(bio_err,
-                   "%s: Max Fragment Length code %u is out of permitted values"
-                   "\n", prog, maxfraglen);
+            "%s: Max Fragment Length code %u is out of permitted values"
+            "\n",
+            prog, maxfraglen);
         goto end;
     }
 
     if (!ssl_load_stores(ctx,
-                         vfyCApath, vfyCAfile, vfyCAstore,
-                         chCApath, chCAfile, chCAstore,
-                         crls, crl_download)) {
+            vfyCApath, vfyCAfile, vfyCAstore,
+            chCApath, chCAfile, chCAstore,
+            crls, crl_download)) {
         BIO_printf(bio_err, "Error loading store locations\n");
         ERR_print_errors(bio_err);
         goto end;
@@ -1985,12 +2070,12 @@ int s_client_main(int argc, char **argv)
 
     for (i = 0; i < serverinfo_count; i++) {
         if (!SSL_CTX_add_client_custom_ext(ctx,
-                                           serverinfo_types[i],
-                                           NULL, NULL, NULL,
-                                           serverinfo_cli_parse_cb, NULL)) {
+                serverinfo_types[i],
+                NULL, NULL, NULL,
+                serverinfo_cli_parse_cb, NULL)) {
             BIO_printf(bio_err,
-                       "Warning: Unable to add custom extension %u, skipping\n",
-                       serverinfo_types[i]);
+                "Warning: Unable to add custom extension %u, skipping\n",
+                serverinfo_types[i]);
         }
     }
 
@@ -1999,8 +2084,7 @@ int s_client_main(int argc, char **argv)
 
 #ifndef OPENSSL_NO_CT
     /* Enable SCT processing, without early connection termination */
-    if (ct_validation &&
-        !SSL_CTX_enable_ct(ctx, SSL_CT_VALIDATION_PERMISSIVE)) {
+    if (ct_validation && !SSL_CTX_enable_ct(ctx, SSL_CT_VALIDATION_PERMISSIVE)) {
         ERR_print_errors(bio_err);
         goto end;
     }
@@ -2024,7 +2108,7 @@ int s_client_main(int argc, char **argv)
     SSL_CTX_set_verify(ctx, verify, verify_callback);
 
     if (!ctx_set_verify_locations(ctx, CAfile, noCAfile, CApath, noCApath,
-                                  CAstore, noCAstore)) {
+            CAstore, noCAstore)) {
         ERR_print_errors(bio_err);
         goto end;
     }
@@ -2041,15 +2125,15 @@ int s_client_main(int argc, char **argv)
     }
 #ifndef OPENSSL_NO_SRP
     if (srp_arg.srplogin != NULL
-            && !set_up_srp_arg(ctx, &srp_arg, srp_lateuser, c_msg, c_debug))
+        && !set_up_srp_arg(ctx, &srp_arg, srp_lateuser, c_msg, c_debug))
         goto end;
-# endif
+#endif
 
     if (dane_tlsa_domain != NULL) {
         if (SSL_CTX_dane_enable(ctx) <= 0) {
             BIO_printf(bio_err,
-                       "%s: Error enabling DANE TLSA authentication.\n",
-                       prog);
+                "%s: Error enabling DANE TLSA authentication.\n",
+                prog);
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -2060,8 +2144,7 @@ int s_client_main(int argc, char **argv)
      * come at any time. Therefore, we use a callback to write out the session
      * when we know about it. This approach works for < TLSv1.3 as well.
      */
-    SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_CLIENT
-                                        | SSL_SESS_CACHE_NO_INTERNAL_STORE);
+    SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_CLIENT | SSL_SESS_CACHE_NO_INTERNAL_STORE);
     SSL_CTX_sess_set_new_cb(ctx, new_session_cb);
 
     if (set_keylog_file(ctx, keylog_file))
@@ -2128,25 +2211,29 @@ int s_client_main(int argc, char **argv)
     if (dane_tlsa_domain != NULL) {
         if (SSL_dane_enable(con, dane_tlsa_domain) <= 0) {
             BIO_printf(bio_err, "%s: Error enabling DANE TLSA "
-                       "authentication.\n", prog);
+                                "authentication.\n",
+                prog);
             ERR_print_errors(bio_err);
             goto end;
         }
         if (dane_tlsa_rrset == NULL) {
             BIO_printf(bio_err, "%s: DANE TLSA authentication requires at "
-                       "least one -dane_tlsa_rrdata option.\n", prog);
+                                "least one -dane_tlsa_rrdata option.\n",
+                prog);
             goto end;
         }
         if (tlsa_import_rrset(con, dane_tlsa_rrset) <= 0) {
             BIO_printf(bio_err, "%s: Failed to import any TLSA "
-                       "records.\n", prog);
+                                "records.\n",
+                prog);
             goto end;
         }
         if (dane_ee_no_name)
             SSL_dane_set_flags(con, DANE_FLAG_NO_DANE_EE_NAMECHECKS);
     } else if (dane_tlsa_rrset != NULL) {
         BIO_printf(bio_err, "%s: DANE TLSA authentication requires the "
-                   "-dane_tlsa_domain option.\n", prog);
+                            "-dane_tlsa_domain option.\n",
+            prog);
         goto end;
     }
 #ifndef OPENSSL_NO_DTLS
@@ -2168,12 +2255,13 @@ int s_client_main(int argc, char **argv)
 
     if (tfo)
         BIO_printf(bio_c_out, "Connecting via TFO\n");
- re_start:
+re_start:
     /* peer_addr might be set from previous connections */
     BIO_ADDR_free(peer_addr);
     peer_addr = NULL;
     if (init_client(&sock, host, port, bindhost, bindport, socket_family,
-                    socket_type, protocol, tfo, !isquic, &peer_addr) == 0) {
+            socket_type, protocol, tfo, !isquic, &peer_addr)
+        == 0) {
         BIO_printf(bio_err, "connect:errno=%d\n", get_last_socket_error());
         BIO_closesocket(sock);
         goto end;
@@ -2214,7 +2302,7 @@ int s_client_main(int argc, char **argv)
         }
         if (!BIO_sock_info(sock, BIO_SOCK_INFO_ADDRESS, &peer_info)) {
             BIO_printf(bio_err, "getsockname:errno=%d\n",
-                       get_last_socket_error());
+                get_last_socket_error());
             BIO_free(sbio);
             BIO_ADDR_free(peer_info.addr);
             BIO_closesocket(sock);
@@ -2238,7 +2326,7 @@ int s_client_main(int argc, char **argv)
         if (socket_mtu) {
             if (socket_mtu < DTLS_get_link_min_mtu(con)) {
                 BIO_printf(bio_err, "MTU too small. Must be at least %ld\n",
-                           DTLS_get_link_min_mtu(con));
+                    DTLS_get_link_min_mtu(con));
                 BIO_free(sbio);
                 goto shut;
             }
@@ -2255,7 +2343,7 @@ int s_client_main(int argc, char **argv)
     } else
 #endif /* OPENSSL_NO_DTLS */
 #ifndef OPENSSL_NO_QUIC
-    if (isquic) {
+        if (isquic) {
         sbio = BIO_new_dgram(sock, BIO_NOCLOSE);
         if (!SSL_set1_initial_peer_addr(con, peer_addr)) {
             BIO_printf(bio_err, "Failed to set the initial peer address\n");
@@ -2341,536 +2429,508 @@ int s_client_main(int argc, char **argv)
     if (proxystr != NULL) {
         /* Here we must use the connect string target host & port */
         if (!OSSL_HTTP_proxy_connect(sbio, thost, tport, proxyuser, proxypass,
-                                     0 /* no timeout */, bio_err, prog))
+                0 /* no timeout */, bio_err, prog))
             goto shut;
     }
 #endif
 
-    switch ((PROTOCOL_CHOICE) starttls_proto) {
+    switch ((PROTOCOL_CHOICE)starttls_proto) {
     case PROTO_OFF:
         break;
     case PROTO_LMTP:
-    case PROTO_SMTP:
-        {
-            /*
-             * This is an ugly hack that does a lot of assumptions. We do
-             * have to handle multi-line responses which may come in a single
-             * packet or not. We therefore have to use BIO_gets() which does
-             * need a buffering BIO. So during the initial chitchat we do
-             * push a buffering BIO into the chain that is removed again
-             * later on to not disturb the rest of the s_client operation.
-             */
-            int foundit = 0;
-            BIO *fbio = BIO_new(BIO_f_buffer());
+    case PROTO_SMTP: {
+        /*
+         * This is an ugly hack that does a lot of assumptions. We do
+         * have to handle multi-line responses which may come in a single
+         * packet or not. We therefore have to use BIO_gets() which does
+         * need a buffering BIO. So during the initial chitchat we do
+         * push a buffering BIO into the chain that is removed again
+         * later on to not disturb the rest of the s_client operation.
+         */
+        int foundit = 0;
+        BIO *fbio = BIO_new(BIO_f_buffer());
 
-            if (fbio == NULL) {
-                BIO_printf(bio_err, "Unable to create BIO\n");
-                goto shut;
-            }
-            BIO_push(fbio, sbio);
-            /* Wait for multi-line response to end from LMTP or SMTP */
-            do {
-                mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
-            } while (mbuf_len > 3 && mbuf[3] == '-');
-            if (protohost == NULL)
-                protohost = "mail.example.com";
-            if (starttls_proto == (int)PROTO_LMTP)
-                BIO_printf(fbio, "LHLO %s\r\n", protohost);
-            else
-                BIO_printf(fbio, "EHLO %s\r\n", protohost);
-            (void)BIO_flush(fbio);
-            /*
-             * Wait for multi-line response to end LHLO LMTP or EHLO SMTP
-             * response.
-             */
-            do {
-                mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
-                if (strstr(mbuf, "STARTTLS"))
-                    foundit = 1;
-            } while (mbuf_len > 3 && mbuf[3] == '-');
-            (void)BIO_flush(fbio);
-            BIO_pop(fbio);
-            BIO_free(fbio);
-            if (!foundit)
-                BIO_printf(bio_err,
-                           "Didn't find STARTTLS in server response,"
-                           " trying anyway...\n");
-            BIO_printf(sbio, "STARTTLS\r\n");
-            BIO_read(sbio, sbuf, BUFSIZZ);
+        if (fbio == NULL) {
+            BIO_printf(bio_err, "Unable to create BIO\n");
+            goto shut;
         }
-        break;
-    case PROTO_POP3:
-        {
-            BIO_read(sbio, mbuf, BUFSIZZ);
-            BIO_printf(sbio, "STLS\r\n");
-            mbuf_len = BIO_read(sbio, sbuf, BUFSIZZ);
-            if (mbuf_len < 0) {
-                BIO_printf(bio_err, "BIO_read failed\n");
-                goto end;
-            }
+        BIO_push(fbio, sbio);
+        /* Wait for multi-line response to end from LMTP or SMTP */
+        do {
+            mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
+        } while (mbuf_len > 3 && mbuf[3] == '-');
+        if (protohost == NULL)
+            protohost = "mail.example.com";
+        if (starttls_proto == (int)PROTO_LMTP)
+            BIO_printf(fbio, "LHLO %s\r\n", protohost);
+        else
+            BIO_printf(fbio, "EHLO %s\r\n", protohost);
+        (void)BIO_flush(fbio);
+        /*
+         * Wait for multi-line response to end LHLO LMTP or EHLO SMTP
+         * response.
+         */
+        do {
+            mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
+            if (strstr(mbuf, "STARTTLS"))
+                foundit = 1;
+        } while (mbuf_len > 3 && mbuf[3] == '-');
+        (void)BIO_flush(fbio);
+        BIO_pop(fbio);
+        BIO_free(fbio);
+        if (!foundit)
+            BIO_printf(bio_err,
+                "Didn't find STARTTLS in server response,"
+                " trying anyway...\n");
+        BIO_printf(sbio, "STARTTLS\r\n");
+        BIO_read(sbio, sbuf, BUFSIZZ);
+    } break;
+    case PROTO_POP3: {
+        BIO_read(sbio, mbuf, BUFSIZZ);
+        BIO_printf(sbio, "STLS\r\n");
+        mbuf_len = BIO_read(sbio, sbuf, BUFSIZZ);
+        if (mbuf_len < 0) {
+            BIO_printf(bio_err, "BIO_read failed\n");
+            goto end;
         }
-        break;
-    case PROTO_IMAP:
-        {
-            int foundit = 0;
-            BIO *fbio = BIO_new(BIO_f_buffer());
+    } break;
+    case PROTO_IMAP: {
+        int foundit = 0;
+        BIO *fbio = BIO_new(BIO_f_buffer());
 
-            if (fbio == NULL) {
-                BIO_printf(bio_err, "Unable to create BIO\n");
-                goto shut;
-            }
-            BIO_push(fbio, sbio);
-            BIO_gets(fbio, mbuf, BUFSIZZ);
-            /* STARTTLS command requires CAPABILITY... */
-            BIO_printf(fbio, ". CAPABILITY\r\n");
-            (void)BIO_flush(fbio);
-            /* wait for multi-line CAPABILITY response */
-            do {
-                mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
-                if (strstr(mbuf, "STARTTLS"))
-                    foundit = 1;
-            }
-            while (mbuf_len > 3 && mbuf[0] != '.');
-            (void)BIO_flush(fbio);
-            BIO_pop(fbio);
-            BIO_free(fbio);
-            if (!foundit)
-                BIO_printf(bio_err,
-                           "Didn't find STARTTLS in server response,"
-                           " trying anyway...\n");
-            BIO_printf(sbio, ". STARTTLS\r\n");
-            BIO_read(sbio, sbuf, BUFSIZZ);
+        if (fbio == NULL) {
+            BIO_printf(bio_err, "Unable to create BIO\n");
+            goto shut;
         }
-        break;
-    case PROTO_FTP:
-        {
-            BIO *fbio = BIO_new(BIO_f_buffer());
-
-            if (fbio == NULL) {
-                BIO_printf(bio_err, "Unable to create BIO\n");
-                goto shut;
-            }
-            BIO_push(fbio, sbio);
-            /* wait for multi-line response to end from FTP */
-            do {
-                mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
-            }
-            while (mbuf_len > 3 && (!isdigit((unsigned char)mbuf[0]) || !isdigit((unsigned char)mbuf[1]) || !isdigit((unsigned char)mbuf[2]) || mbuf[3] != ' '));
-            (void)BIO_flush(fbio);
-            BIO_pop(fbio);
-            BIO_free(fbio);
-            BIO_printf(sbio, "AUTH TLS\r\n");
-            BIO_read(sbio, sbuf, BUFSIZZ);
+        BIO_push(fbio, sbio);
+        BIO_gets(fbio, mbuf, BUFSIZZ);
+        /* STARTTLS command requires CAPABILITY... */
+        BIO_printf(fbio, ". CAPABILITY\r\n");
+        (void)BIO_flush(fbio);
+        /* wait for multi-line CAPABILITY response */
+        do {
+            mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
+            if (strstr(mbuf, "STARTTLS"))
+                foundit = 1;
+        } while (mbuf_len > 3 && mbuf[0] != '.');
+        (void)BIO_flush(fbio);
+        BIO_pop(fbio);
+        BIO_free(fbio);
+        if (!foundit)
+            BIO_printf(bio_err,
+                "Didn't find STARTTLS in server response,"
+                " trying anyway...\n");
+        BIO_printf(sbio, ". STARTTLS\r\n");
+        BIO_read(sbio, sbuf, BUFSIZZ);
+    } break;
+    case PROTO_FTP: {
+        BIO *fbio = BIO_new(BIO_f_buffer());
+
+        if (fbio == NULL) {
+            BIO_printf(bio_err, "Unable to create BIO\n");
+            goto shut;
         }
-        break;
+        BIO_push(fbio, sbio);
+        /* wait for multi-line response to end from FTP */
+        do {
+            mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
+        } while (mbuf_len > 3 && (!isdigit((unsigned char)mbuf[0]) || !isdigit((unsigned char)mbuf[1]) || !isdigit((unsigned char)mbuf[2]) || mbuf[3] != ' '));
+        (void)BIO_flush(fbio);
+        BIO_pop(fbio);
+        BIO_free(fbio);
+        BIO_printf(sbio, "AUTH TLS\r\n");
+        BIO_read(sbio, sbuf, BUFSIZZ);
+    } break;
     case PROTO_XMPP:
-    case PROTO_XMPP_SERVER:
-        {
-            int seen = 0;
-            BIO_printf(sbio, "<stream:stream "
-                       "xmlns:stream='http://etherx.jabber.org/streams' "
-                       "xmlns='jabber:%s' to='%s' version='1.0'>",
-                       starttls_proto == PROTO_XMPP ? "client" : "server",
-                       protohost ? protohost : host);
+    case PROTO_XMPP_SERVER: {
+        int seen = 0;
+        BIO_printf(sbio, "<stream:stream "
+                         "xmlns:stream='http://etherx.jabber.org/streams' "
+                         "xmlns='jabber:%s' to='%s' version='1.0'>",
+            starttls_proto == PROTO_XMPP ? "client" : "server",
+            protohost ? protohost : host);
+        seen = BIO_read(sbio, mbuf, BUFSIZZ);
+        if (seen < 0) {
+            BIO_printf(bio_err, "BIO_read failed\n");
+            goto end;
+        }
+        mbuf[seen] = '\0';
+        while (!strstr(mbuf, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'")
+            && !strstr(mbuf,
+                "<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\"")) {
             seen = BIO_read(sbio, mbuf, BUFSIZZ);
-            if (seen < 0) {
-                BIO_printf(bio_err, "BIO_read failed\n");
-                goto end;
-            }
-            mbuf[seen] = '\0';
-            while (!strstr
-                   (mbuf, "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'")
-                   && !strstr(mbuf,
-                              "<starttls xmlns=\"urn:ietf:params:xml:ns:xmpp-tls\""))
-            {
-                seen = BIO_read(sbio, mbuf, BUFSIZZ);
 
-                if (seen <= 0)
-                    goto shut;
-
-                mbuf[seen] = '\0';
-            }
-            BIO_printf(sbio,
-                       "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
-            seen = BIO_read(sbio, sbuf, BUFSIZZ);
-            if (seen < 0) {
-                BIO_printf(bio_err, "BIO_read failed\n");
+            if (seen <= 0)
                 goto shut;
-            }
-            sbuf[seen] = '\0';
-            if (!strstr(sbuf, "<proceed"))
-                goto shut;
-            mbuf[0] = '\0';
+
+            mbuf[seen] = '\0';
         }
-        break;
-    case PROTO_TELNET:
-        {
-            static const unsigned char tls_do[] = {
-                /* IAC    DO   START_TLS */
-                   255,   253, 46
-            };
-            static const unsigned char tls_will[] = {
-                /* IAC  WILL START_TLS */
-                   255, 251, 46
-            };
-            static const unsigned char tls_follows[] = {
-                /* IAC  SB   START_TLS FOLLOWS IAC  SE */
-                   255, 250, 46,       1,      255, 240
-            };
-            int bytes;
-
-            /* Telnet server should demand we issue START_TLS */
-            bytes = BIO_read(sbio, mbuf, BUFSIZZ);
-            if (bytes != 3 || memcmp(mbuf, tls_do, 3) != 0)
-                goto shut;
-            /* Agree to issue START_TLS and send the FOLLOWS sub-command */
-            BIO_write(sbio, tls_will, 3);
-            BIO_write(sbio, tls_follows, 6);
-            (void)BIO_flush(sbio);
-            /* Telnet server also sent the FOLLOWS sub-command */
-            bytes = BIO_read(sbio, mbuf, BUFSIZZ);
-            if (bytes != 6 || memcmp(mbuf, tls_follows, 6) != 0)
-                goto shut;
+        BIO_printf(sbio,
+            "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>");
+        seen = BIO_read(sbio, sbuf, BUFSIZZ);
+        if (seen < 0) {
+            BIO_printf(bio_err, "BIO_read failed\n");
+            goto shut;
         }
-        break;
-    case PROTO_IRC:
-        {
-            int numeric;
-            BIO *fbio = BIO_new(BIO_f_buffer());
-
-            if (fbio == NULL) {
-                BIO_printf(bio_err, "Unable to create BIO\n");
-                goto end;
-            }
-            BIO_push(fbio, sbio);
-            BIO_printf(fbio, "STARTTLS\r\n");
-            (void)BIO_flush(fbio);
-            width = SSL_get_fd(con) + 1;
-
-            do {
-                numeric = 0;
-
-                FD_ZERO(&readfds);
-                openssl_fdset(SSL_get_fd(con), &readfds);
-                timeout.tv_sec = S_CLIENT_IRC_READ_TIMEOUT;
-                timeout.tv_usec = 0;
-                /*
-                 * If the IRCd doesn't respond within
-                 * S_CLIENT_IRC_READ_TIMEOUT seconds, assume
-                 * it doesn't support STARTTLS. Many IRCds
-                 * will not give _any_ sort of response to a
-                 * STARTTLS command when it's not supported.
-                 */
-                if (!BIO_get_buffer_num_lines(fbio)
-                    && !BIO_pending(fbio)
-                    && !BIO_pending(sbio)
-                    && select(width, (void *)&readfds, NULL, NULL,
-                              &timeout) < 1) {
-                    BIO_printf(bio_err,
-                               "Timeout waiting for response (%d seconds).\n",
-                               S_CLIENT_IRC_READ_TIMEOUT);
-                    break;
-                }
+        sbuf[seen] = '\0';
+        if (!strstr(sbuf, "<proceed"))
+            goto shut;
+        mbuf[0] = '\0';
+    } break;
+    case PROTO_TELNET: {
+        static const unsigned char tls_do[] = {
+            /* IAC    DO   START_TLS */
+            255, 253, 46
+        };
+        static const unsigned char tls_will[] = {
+            /* IAC  WILL START_TLS */
+            255, 251, 46
+        };
+        static const unsigned char tls_follows[] = {
+            /* IAC  SB   START_TLS FOLLOWS IAC  SE */
+            255, 250, 46, 1, 255, 240
+        };
+        int bytes;
+
+        /* Telnet server should demand we issue START_TLS */
+        bytes = BIO_read(sbio, mbuf, BUFSIZZ);
+        if (bytes != 3 || memcmp(mbuf, tls_do, 3) != 0)
+            goto shut;
+        /* Agree to issue START_TLS and send the FOLLOWS sub-command */
+        BIO_write(sbio, tls_will, 3);
+        BIO_write(sbio, tls_follows, 6);
+        (void)BIO_flush(sbio);
+        /* Telnet server also sent the FOLLOWS sub-command */
+        bytes = BIO_read(sbio, mbuf, BUFSIZZ);
+        if (bytes != 6 || memcmp(mbuf, tls_follows, 6) != 0)
+            goto shut;
+    } break;
+    case PROTO_IRC: {
+        int numeric;
+        BIO *fbio = BIO_new(BIO_f_buffer());
 
-                mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
-                if (mbuf_len < 1 || sscanf(mbuf, "%*s %d", &numeric) != 1)
-                    break;
-                /* :example.net 451 STARTTLS :You have not registered */
-                /* :example.net 421 STARTTLS :Unknown command */
-                if ((numeric == 451 || numeric == 421)
-                    && strstr(mbuf, "STARTTLS") != NULL) {
-                    BIO_printf(bio_err, "STARTTLS not supported: %s", mbuf);
-                    break;
-                }
-                if (numeric == 691) {
-                    BIO_printf(bio_err, "STARTTLS negotiation failed: ");
-                    ERR_print_errors(bio_err);
-                    break;
-                }
-            } while (numeric != 670);
-
-            (void)BIO_flush(fbio);
-            BIO_pop(fbio);
-            BIO_free(fbio);
-            if (numeric != 670) {
-                BIO_printf(bio_err, "Server does not support STARTTLS.\n");
-                ret = 1;
-                goto shut;
-            }
+        if (fbio == NULL) {
+            BIO_printf(bio_err, "Unable to create BIO\n");
+            goto end;
         }
-        break;
-    case PROTO_MYSQL:
-        {
-            /* SSL request packet */
-            static const unsigned char ssl_req[] = {
-                /* payload_length,   sequence_id */
-                   0x20, 0x00, 0x00, 0x01,
-                /* payload */
-                /* capability flags, CLIENT_SSL always set */
-                   0x85, 0xae, 0x7f, 0x00,
-                /* max-packet size */
-                   0x00, 0x00, 0x00, 0x01,
-                /* character set */
-                   0x21,
-                /* string[23] reserved (all [0]) */
-                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            };
-            int bytes = 0;
-            int ssl_flg = 0x800;
-            int pos;
-            const unsigned char *packet = (const unsigned char *)sbuf;
-
-            /* Receiving Initial Handshake packet. */
-            bytes = BIO_read(sbio, (void *)packet, BUFSIZZ);
-            if (bytes < 0) {
-                BIO_printf(bio_err, "BIO_read failed\n");
-                goto shut;
-            /* Packet length[3], Packet number[1] + minimum payload[17] */
-            } else if (bytes < 21) {
-                BIO_printf(bio_err, "MySQL packet too short.\n");
-                goto shut;
-            } else if (bytes != (4 + packet[0] +
-                                 (packet[1] << 8) +
-                                 (packet[2] << 16))) {
-                BIO_printf(bio_err, "MySQL packet length does not match.\n");
-                goto shut;
-            /* protocol version[1] */
-            } else if (packet[4] != 0xA) {
-                BIO_printf(bio_err,
-                           "Only MySQL protocol version 10 is supported.\n");
-                goto shut;
-            }
+        BIO_push(fbio, sbio);
+        BIO_printf(fbio, "STARTTLS\r\n");
+        (void)BIO_flush(fbio);
+        width = SSL_get_fd(con) + 1;
 
-            pos = 5;
-            /* server version[string+NULL] */
-            for (;;) {
-                if (pos >= bytes) {
-                    BIO_printf(bio_err, "Cannot confirm server version. ");
-                    goto shut;
-                } else if (packet[pos++] == '\0') {
-                    break;
-                }
-            }
+        do {
+            numeric = 0;
 
-            /* make sure we have at least 15 bytes left in the packet */
-            if (pos + 15 > bytes) {
+            FD_ZERO(&readfds);
+            openssl_fdset(SSL_get_fd(con), &readfds);
+            timeout.tv_sec = S_CLIENT_IRC_READ_TIMEOUT;
+            timeout.tv_usec = 0;
+            /*
+             * If the IRCd doesn't respond within
+             * S_CLIENT_IRC_READ_TIMEOUT seconds, assume
+             * it doesn't support STARTTLS. Many IRCds
+             * will not give _any_ sort of response to a
+             * STARTTLS command when it's not supported.
+             */
+            if (!BIO_get_buffer_num_lines(fbio)
+                && !BIO_pending(fbio)
+                && !BIO_pending(sbio)
+                && select(width, (void *)&readfds, NULL, NULL,
+                       &timeout)
+                    < 1) {
                 BIO_printf(bio_err,
-                           "MySQL server handshake packet is broken.\n");
-                goto shut;
+                    "Timeout waiting for response (%d seconds).\n",
+                    S_CLIENT_IRC_READ_TIMEOUT);
+                break;
             }
 
-            pos += 12; /* skip over conn id[4] + SALT[8] */
-            if (packet[pos++] != '\0') { /* verify filler */
-                BIO_printf(bio_err,
-                           "MySQL packet is broken.\n");
-                goto shut;
+            mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
+            if (mbuf_len < 1 || sscanf(mbuf, "%*s %d", &numeric) != 1)
+                break;
+            /* :example.net 451 STARTTLS :You have not registered */
+            /* :example.net 421 STARTTLS :Unknown command */
+            if ((numeric == 451 || numeric == 421)
+                && strstr(mbuf, "STARTTLS") != NULL) {
+                BIO_printf(bio_err, "STARTTLS not supported: %s", mbuf);
+                break;
             }
+            if (numeric == 691) {
+                BIO_printf(bio_err, "STARTTLS negotiation failed: ");
+                ERR_print_errors(bio_err);
+                break;
+            }
+        } while (numeric != 670);
+
+        (void)BIO_flush(fbio);
+        BIO_pop(fbio);
+        BIO_free(fbio);
+        if (numeric != 670) {
+            BIO_printf(bio_err, "Server does not support STARTTLS.\n");
+            ret = 1;
+            goto shut;
+        }
+    } break;
+    case PROTO_MYSQL: {
+        /* SSL request packet */
+        static const unsigned char ssl_req[] = {
+            /* payload_length,   sequence_id */
+            0x20, 0x00, 0x00, 0x01,
+            /* payload */
+            /* capability flags, CLIENT_SSL always set */
+            0x85, 0xae, 0x7f, 0x00,
+            /* max-packet size */
+            0x00, 0x00, 0x00, 0x01,
+            /* character set */
+            0x21,
+            /* string[23] reserved (all [0]) */
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        };
+        int bytes = 0;
+        int ssl_flg = 0x800;
+        int pos;
+        const unsigned char *packet = (const unsigned char *)sbuf;
+
+        /* Receiving Initial Handshake packet. */
+        bytes = BIO_read(sbio, (void *)packet, BUFSIZZ);
+        if (bytes < 0) {
+            BIO_printf(bio_err, "BIO_read failed\n");
+            goto shut;
+            /* Packet length[3], Packet number[1] + minimum payload[17] */
+        } else if (bytes < 21) {
+            BIO_printf(bio_err, "MySQL packet too short.\n");
+            goto shut;
+        } else if (bytes != (4 + packet[0] + (packet[1] << 8) + (packet[2] << 16))) {
+            BIO_printf(bio_err, "MySQL packet length does not match.\n");
+            goto shut;
+            /* protocol version[1] */
+        } else if (packet[4] != 0xA) {
+            BIO_printf(bio_err,
+                "Only MySQL protocol version 10 is supported.\n");
+            goto shut;
+        }
 
-            /* capability flags[2] */
-            if (!((packet[pos] + (packet[pos + 1] << 8)) & ssl_flg)) {
-                BIO_printf(bio_err, "MySQL server does not support SSL.\n");
+        pos = 5;
+        /* server version[string+NULL] */
+        for (;;) {
+            if (pos >= bytes) {
+                BIO_printf(bio_err, "Cannot confirm server version. ");
                 goto shut;
+            } else if (packet[pos++] == '\0') {
+                break;
             }
+        }
 
-            /* Sending SSL Handshake packet. */
-            BIO_write(sbio, ssl_req, sizeof(ssl_req));
-            (void)BIO_flush(sbio);
+        /* make sure we have at least 15 bytes left in the packet */
+        if (pos + 15 > bytes) {
+            BIO_printf(bio_err,
+                "MySQL server handshake packet is broken.\n");
+            goto shut;
         }
-        break;
-    case PROTO_POSTGRES:
-        {
-            static const unsigned char ssl_request[] = {
-                /* Length        SSLRequest */
-                   0, 0, 0, 8,   4, 210, 22, 47
-            };
-            int bytes;
-
-            /* Send SSLRequest packet */
-            BIO_write(sbio, ssl_request, 8);
-            (void)BIO_flush(sbio);
-
-            /* Reply will be a single S if SSL is enabled */
-            bytes = BIO_read(sbio, sbuf, BUFSIZZ);
-            if (bytes != 1 || sbuf[0] != 'S')
-                goto shut;
+
+        pos += 12; /* skip over conn id[4] + SALT[8] */
+        if (packet[pos++] != '\0') { /* verify filler */
+            BIO_printf(bio_err,
+                "MySQL packet is broken.\n");
+            goto shut;
         }
-        break;
-    case PROTO_NNTP:
-        {
-            int foundit = 0;
-            BIO *fbio = BIO_new(BIO_f_buffer());
 
-            if (fbio == NULL) {
-                BIO_printf(bio_err, "Unable to create BIO\n");
-                goto end;
-            }
-            BIO_push(fbio, sbio);
-            BIO_gets(fbio, mbuf, BUFSIZZ);
-            /* STARTTLS command requires CAPABILITIES... */
-            BIO_printf(fbio, "CAPABILITIES\r\n");
-            (void)BIO_flush(fbio);
-            BIO_gets(fbio, mbuf, BUFSIZZ);
-            /* no point in trying to parse the CAPABILITIES response if there is none */
-            if (strstr(mbuf, "101") != NULL) {
-                /* wait for multi-line CAPABILITIES response */
-                do {
-                    mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
-                    if (strstr(mbuf, "STARTTLS"))
-                        foundit = 1;
-                } while (mbuf_len > 1 && mbuf[0] != '.');
-            }
-            (void)BIO_flush(fbio);
-            BIO_pop(fbio);
-            BIO_free(fbio);
-            if (!foundit)
-                BIO_printf(bio_err,
-                           "Didn't find STARTTLS in server response,"
-                           " trying anyway...\n");
-            BIO_printf(sbio, "STARTTLS\r\n");
-            mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
-            if (mbuf_len < 0) {
-                BIO_printf(bio_err, "BIO_read failed\n");
-                goto end;
-            }
-            mbuf[mbuf_len] = '\0';
-            if (strstr(mbuf, "382") == NULL) {
-                BIO_printf(bio_err, "STARTTLS failed: %s", mbuf);
-                goto shut;
-            }
+        /* capability flags[2] */
+        if (!((packet[pos] + (packet[pos + 1] << 8)) & ssl_flg)) {
+            BIO_printf(bio_err, "MySQL server does not support SSL.\n");
+            goto shut;
         }
-        break;
-    case PROTO_SIEVE:
-        {
-            int foundit = 0;
-            BIO *fbio = BIO_new(BIO_f_buffer());
 
-            if (fbio == NULL) {
-                BIO_printf(bio_err, "Unable to create BIO\n");
-                goto end;
-            }
-            BIO_push(fbio, sbio);
-            /* wait for multi-line response to end from Sieve */
+        /* Sending SSL Handshake packet. */
+        BIO_write(sbio, ssl_req, sizeof(ssl_req));
+        (void)BIO_flush(sbio);
+    } break;
+    case PROTO_POSTGRES: {
+        static const unsigned char ssl_request[] = {
+            /* Length        SSLRequest */
+            0, 0, 0, 8, 4, 210, 22, 47
+        };
+        int bytes;
+
+        /* Send SSLRequest packet */
+        BIO_write(sbio, ssl_request, 8);
+        (void)BIO_flush(sbio);
+
+        /* Reply will be a single S if SSL is enabled */
+        bytes = BIO_read(sbio, sbuf, BUFSIZZ);
+        if (bytes != 1 || sbuf[0] != 'S')
+            goto shut;
+    } break;
+    case PROTO_NNTP: {
+        int foundit = 0;
+        BIO *fbio = BIO_new(BIO_f_buffer());
+
+        if (fbio == NULL) {
+            BIO_printf(bio_err, "Unable to create BIO\n");
+            goto end;
+        }
+        BIO_push(fbio, sbio);
+        BIO_gets(fbio, mbuf, BUFSIZZ);
+        /* STARTTLS command requires CAPABILITIES... */
+        BIO_printf(fbio, "CAPABILITIES\r\n");
+        (void)BIO_flush(fbio);
+        BIO_gets(fbio, mbuf, BUFSIZZ);
+        /* no point in trying to parse the CAPABILITIES response if there is none */
+        if (strstr(mbuf, "101") != NULL) {
+            /* wait for multi-line CAPABILITIES response */
             do {
                 mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
-                /*
-                 * According to RFC 5804 § 1.7, capability
-                 * is case-insensitive, make it uppercase
-                 */
-                if (mbuf_len > 1 && mbuf[0] == '"') {
-                    make_uppercase(mbuf);
-                    if (HAS_PREFIX(mbuf, "\"STARTTLS\""))
-                        foundit = 1;
-                }
-            } while (mbuf_len > 1 && mbuf[0] == '"');
-            (void)BIO_flush(fbio);
-            BIO_pop(fbio);
-            BIO_free(fbio);
-            if (!foundit)
-                BIO_printf(bio_err,
-                           "Didn't find STARTTLS in server response,"
-                           " trying anyway...\n");
-            BIO_printf(sbio, "STARTTLS\r\n");
-            mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
-            if (mbuf_len < 0) {
-                BIO_printf(bio_err, "BIO_read failed\n");
-                goto end;
-            }
-            mbuf[mbuf_len] = '\0';
-            if (mbuf_len < 2) {
-                BIO_printf(bio_err, "STARTTLS failed: %s", mbuf);
-                goto shut;
-            }
+                if (strstr(mbuf, "STARTTLS"))
+                    foundit = 1;
+            } while (mbuf_len > 1 && mbuf[0] != '.');
+        }
+        (void)BIO_flush(fbio);
+        BIO_pop(fbio);
+        BIO_free(fbio);
+        if (!foundit)
+            BIO_printf(bio_err,
+                "Didn't find STARTTLS in server response,"
+                " trying anyway...\n");
+        BIO_printf(sbio, "STARTTLS\r\n");
+        mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
+        if (mbuf_len < 0) {
+            BIO_printf(bio_err, "BIO_read failed\n");
+            goto end;
+        }
+        mbuf[mbuf_len] = '\0';
+        if (strstr(mbuf, "382") == NULL) {
+            BIO_printf(bio_err, "STARTTLS failed: %s", mbuf);
+            goto shut;
+        }
+    } break;
+    case PROTO_SIEVE: {
+        int foundit = 0;
+        BIO *fbio = BIO_new(BIO_f_buffer());
+
+        if (fbio == NULL) {
+            BIO_printf(bio_err, "Unable to create BIO\n");
+            goto end;
+        }
+        BIO_push(fbio, sbio);
+        /* wait for multi-line response to end from Sieve */
+        do {
+            mbuf_len = BIO_gets(fbio, mbuf, BUFSIZZ);
             /*
-             * According to RFC 5804 § 2.2, response codes are case-
-             * insensitive, make it uppercase but preserve the response.
+             * According to RFC 5804 § 1.7, capability
+             * is case-insensitive, make it uppercase
              */
-            strncpy(sbuf, mbuf, 2);
-            make_uppercase(sbuf);
-            if (!HAS_PREFIX(sbuf, "OK")) {
-                BIO_printf(bio_err, "STARTTLS not supported: %s", mbuf);
-                goto shut;
+            if (mbuf_len > 1 && mbuf[0] == '"') {
+                make_uppercase(mbuf);
+                if (HAS_PREFIX(mbuf, "\"STARTTLS\""))
+                    foundit = 1;
             }
+        } while (mbuf_len > 1 && mbuf[0] == '"');
+        (void)BIO_flush(fbio);
+        BIO_pop(fbio);
+        BIO_free(fbio);
+        if (!foundit)
+            BIO_printf(bio_err,
+                "Didn't find STARTTLS in server response,"
+                " trying anyway...\n");
+        BIO_printf(sbio, "STARTTLS\r\n");
+        mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
+        if (mbuf_len < 0) {
+            BIO_printf(bio_err, "BIO_read failed\n");
+            goto end;
         }
-        break;
-    case PROTO_LDAP:
-        {
-            /* StartTLS Operation according to RFC 4511 */
-            static char ldap_tls_genconf[] = "asn1=SEQUENCE:LDAPMessage\n"
-                "[LDAPMessage]\n"
-                "messageID=INTEGER:1\n"
-                "extendedReq=EXPLICIT:23A,IMPLICIT:0C,"
-                "FORMAT:ASCII,OCT:1.3.6.1.4.1.1466.20037\n";
-            long errline = -1;
-            char *genstr = NULL;
-            int result = -1;
-            ASN1_TYPE *atyp = NULL;
-            BIO *ldapbio = BIO_new(BIO_s_mem());
-            CONF *cnf = NCONF_new(NULL);
-
-            if (ldapbio == NULL || cnf == NULL) {
-                BIO_free(ldapbio);
-                NCONF_free(cnf);
-                goto end;
-            }
-            BIO_puts(ldapbio, ldap_tls_genconf);
-            if (NCONF_load_bio(cnf, ldapbio, &errline) <= 0) {
-                BIO_free(ldapbio);
-                NCONF_free(cnf);
-                if (errline <= 0) {
-                    BIO_printf(bio_err, "NCONF_load_bio failed\n");
-                    goto end;
-                } else {
-                    BIO_printf(bio_err, "Error on line %ld\n", errline);
-                    goto end;
-                }
-            }
+        mbuf[mbuf_len] = '\0';
+        if (mbuf_len < 2) {
+            BIO_printf(bio_err, "STARTTLS failed: %s", mbuf);
+            goto shut;
+        }
+        /*
+         * According to RFC 5804 § 2.2, response codes are case-
+         * insensitive, make it uppercase but preserve the response.
+         */
+        strncpy(sbuf, mbuf, 2);
+        make_uppercase(sbuf);
+        if (!HAS_PREFIX(sbuf, "OK")) {
+            BIO_printf(bio_err, "STARTTLS not supported: %s", mbuf);
+            goto shut;
+        }
+    } break;
+    case PROTO_LDAP: {
+        /* StartTLS Operation according to RFC 4511 */
+        static char ldap_tls_genconf[] = "asn1=SEQUENCE:LDAPMessage\n"
+                                         "[LDAPMessage]\n"
+                                         "messageID=INTEGER:1\n"
+                                         "extendedReq=EXPLICIT:23A,IMPLICIT:0C,"
+                                         "FORMAT:ASCII,OCT:1.3.6.1.4.1.1466.20037\n";
+        long errline = -1;
+        char *genstr = NULL;
+        int result = -1;
+        ASN1_TYPE *atyp = NULL;
+        BIO *ldapbio = BIO_new(BIO_s_mem());
+        CONF *cnf = NCONF_new(NULL);
+
+        if (ldapbio == NULL || cnf == NULL) {
+            BIO_free(ldapbio);
+            NCONF_free(cnf);
+            goto end;
+        }
+        BIO_puts(ldapbio, ldap_tls_genconf);
+        if (NCONF_load_bio(cnf, ldapbio, &errline) <= 0) {
             BIO_free(ldapbio);
-            genstr = NCONF_get_string(cnf, "default", "asn1");
-            if (genstr == NULL) {
-                NCONF_free(cnf);
-                BIO_printf(bio_err, "NCONF_get_string failed\n");
+            NCONF_free(cnf);
+            if (errline <= 0) {
+                BIO_printf(bio_err, "NCONF_load_bio failed\n");
                 goto end;
-            }
-            atyp = ASN1_generate_nconf(genstr, cnf);
-            if (atyp == NULL) {
-                NCONF_free(cnf);
-                BIO_printf(bio_err, "ASN1_generate_nconf failed\n");
+            } else {
+                BIO_printf(bio_err, "Error on line %ld\n", errline);
                 goto end;
             }
+        }
+        BIO_free(ldapbio);
+        genstr = NCONF_get_string(cnf, "default", "asn1");
+        if (genstr == NULL) {
+            NCONF_free(cnf);
+            BIO_printf(bio_err, "NCONF_get_string failed\n");
+            goto end;
+        }
+        atyp = ASN1_generate_nconf(genstr, cnf);
+        if (atyp == NULL || atyp->type != V_ASN1_SEQUENCE) {
             NCONF_free(cnf);
-
-            /* Send SSLRequest packet */
-            BIO_write(sbio, atyp->value.sequence->data,
-                      atyp->value.sequence->length);
-            (void)BIO_flush(sbio);
             ASN1_TYPE_free(atyp);
+            BIO_printf(bio_err, "ASN1_generate_nconf failed\n");
+            goto end;
+        }
+        NCONF_free(cnf);
 
-            mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
-            if (mbuf_len < 0) {
-                BIO_printf(bio_err, "BIO_read failed\n");
-                goto end;
-            }
-            result = ldap_ExtendedResponse_parse(mbuf, mbuf_len);
-            if (result < 0) {
-                BIO_printf(bio_err, "ldap_ExtendedResponse_parse failed\n");
-                goto shut;
-            } else if (result > 0) {
-                BIO_printf(bio_err, "STARTTLS failed, LDAP Result Code: %i\n",
-                           result);
-                goto shut;
-            }
-            mbuf_len = 0;
+        /* Send SSLRequest packet */
+        BIO_write(sbio, atyp->value.sequence->data,
+            atyp->value.sequence->length);
+        (void)BIO_flush(sbio);
+        ASN1_TYPE_free(atyp);
+
+        mbuf_len = BIO_read(sbio, mbuf, BUFSIZZ);
+        if (mbuf_len < 0) {
+            BIO_printf(bio_err, "BIO_read failed\n");
+            goto end;
         }
-        break;
+        result = ldap_ExtendedResponse_parse(mbuf, mbuf_len);
+        if (result < 0) {
+            BIO_printf(bio_err, "ldap_ExtendedResponse_parse failed\n");
+            goto shut;
+        } else if (result > 0) {
+            BIO_printf(bio_err, "STARTTLS failed, LDAP Result Code: %i\n",
+                result);
+            goto shut;
+        }
+        mbuf_len = 0;
+    } break;
     }
 
     if (early_data_file != NULL
-            && ((SSL_get0_session(con) != NULL
-                 && SSL_SESSION_get_max_early_data(SSL_get0_session(con)) > 0)
-                || (psksess != NULL
-                    && SSL_SESSION_get_max_early_data(psksess) > 0))) {
+        && ((SSL_get0_session(con) != NULL
+                && SSL_SESSION_get_max_early_data(SSL_get0_session(con)) > 0)
+            || (psksess != NULL
+                && SSL_SESSION_get_max_early_data(psksess) > 0))) {
         BIO *edfile = BIO_new_file(early_data_file, "r");
         size_t readbytes, writtenbytes;
         int finish = 0;
@@ -2916,7 +2976,7 @@ int s_client_main(int argc, char **argv)
             timeoutp = NULL;
 
         if (!SSL_is_init_finished(con) && SSL_total_renegotiations(con) == 0
-                && SSL_get_key_update_type(con) == SSL_KEY_UPDATE_NONE) {
+            && SSL_get_key_update_type(con) == SSL_KEY_UPDATE_NONE) {
             in_init = 1;
             tty_on = 0;
         } else {
@@ -2942,7 +3002,7 @@ int s_client_main(int argc, char **argv)
                 if (reconnect) {
                     reconnect--;
                     BIO_printf(bio_c_out,
-                               "drop connection and then reconnect\n");
+                        "drop connection and then reconnect\n");
                     do_ssl_shutdown(con);
                     SSL_set_connect_state(con);
                     BIO_closesocket(SSL_get_fd(con));
@@ -2972,8 +3032,8 @@ int s_client_main(int argc, char **argv)
                     break;
                 }
             } while (!write_ssl
-                     && cbuf_len == 0
-                     && user_data_has_data(&user_data));
+                && cbuf_len == 0
+                && user_data_has_data(&user_data));
             if (cbuf_len > 0) {
                 read_tty = 0;
                 timeout.tv_sec = 0;
@@ -3008,18 +3068,18 @@ int s_client_main(int argc, char **argv)
              * the right thing.
              */
             if ((!isquic && read_ssl)
-                    || (isquic && SSL_net_read_desired(con)))
+                || (isquic && SSL_net_read_desired(con)))
                 openssl_fdset(SSL_get_fd(con), &readfds);
             if ((!isquic && write_ssl)
-                    || (isquic && (first_loop || SSL_net_write_desired(con))))
+                || (isquic && (first_loop || SSL_net_write_desired(con))))
                 openssl_fdset(SSL_get_fd(con), &writefds);
 #else
             if (!tty_on || !write_tty) {
                 if ((!isquic && read_ssl)
-                        || (isquic && SSL_net_read_desired(con)))
+                    || (isquic && SSL_net_read_desired(con)))
                     openssl_fdset(SSL_get_fd(con), &readfds);
                 if ((!isquic && write_ssl)
-                        || (isquic && (first_loop || SSL_net_write_desired(con))))
+                    || (isquic && (first_loop || SSL_net_write_desired(con))))
                     openssl_fdset(SSL_get_fd(con), &writefds);
             }
 #endif
@@ -3045,20 +3105,20 @@ int s_client_main(int argc, char **argv)
                     tv.tv_sec = 1;
                     tv.tv_usec = 0;
                     i = select(width, (void *)&readfds, (void *)&writefds,
-                               NULL, &tv);
+                        NULL, &tv);
                     if (!i && (!has_stdin_waiting() || !read_tty))
                         continue;
                 } else
                     i = select(width, (void *)&readfds, (void *)&writefds,
-                               NULL, timeoutp);
+                        NULL, timeoutp);
             }
 #else
             i = select(width, (void *)&readfds, (void *)&writefds,
-                       NULL, timeoutp);
+                NULL, timeoutp);
 #endif
             if (i < 0) {
                 BIO_printf(bio_err, "bad select %d\n",
-                           get_last_socket_error());
+                    get_last_socket_error());
                 goto shut;
             }
         }
@@ -3066,14 +3126,14 @@ int s_client_main(int argc, char **argv)
         if (timeoutp != NULL) {
             SSL_handle_events(con);
             if (isdtls
-                    && !FD_ISSET(SSL_get_fd(con), &readfds)
-                    && !FD_ISSET(SSL_get_fd(con), &writefds))
+                && !FD_ISSET(SSL_get_fd(con), &readfds)
+                && !FD_ISSET(SSL_get_fd(con), &writefds))
                 BIO_printf(bio_err, "TIMEOUT occurred\n");
         }
 
         if (!ssl_pending
-                && ((!isquic && FD_ISSET(SSL_get_fd(con), &writefds))
-                    || (isquic && (cbuf_len > 0 || first_loop)))) {
+            && ((!isquic && FD_ISSET(SSL_get_fd(con), &writefds))
+                || (isquic && (cbuf_len > 0 || first_loop)))) {
             k = SSL_write(con, &(cbuf[cbuf_off]), (unsigned int)cbuf_len);
             switch (SSL_get_error(con, k)) {
             case SSL_ERROR_NONE:
@@ -3085,7 +3145,7 @@ int s_client_main(int argc, char **argv)
                 if (cbuf_len == 0) {
                     read_tty = 1;
                     write_ssl = 0;
-                } else {        /* if (cbuf_len > 0) */
+                } else { /* if (cbuf_len > 0) */
 
                     read_tty = 0;
                     write_ssl = 1;
@@ -3167,7 +3227,7 @@ int s_client_main(int argc, char **argv)
                 write_tty = 0;
             }
         } else if (ssl_pending
-                   || (!isquic && FD_ISSET(SSL_get_fd(con), &readfds))) {
+            || (!isquic && FD_ISSET(SSL_get_fd(con), &readfds))) {
 #ifdef RENEG
             {
                 static int iiii;
@@ -3284,7 +3344,7 @@ int s_client_main(int argc, char **argv)
         first_loop = 0;
     }
 
- shut:
+shut:
     if (in_init)
         print_stuff(bio_c_out, con, full_log);
     do_ssl_shutdown(con);
@@ -3306,15 +3366,15 @@ int s_client_main(int argc, char **argv)
      * data. [In testing context this ensures that alerts are passed on...]
      */
     timeout.tv_sec = 0;
-    timeout.tv_usec = 500000;  /* some extreme round-trip */
+    timeout.tv_usec = 500000; /* some extreme round-trip */
     do {
         FD_ZERO(&readfds);
         openssl_fdset(sock, &readfds);
     } while (select(sock + 1, &readfds, NULL, NULL, &timeout) > 0
-             && BIO_read(sbio, sbuf, BUFSIZZ) > 0);
+        && BIO_read(sbio, sbuf, BUFSIZZ) > 0);
 
     BIO_closesocket(SSL_get_fd(con));
- end:
+end:
     if (con != NULL) {
         if (prexit != 0)
             print_stuff(bio_c_out, con, 1);
@@ -3361,12 +3421,50 @@ int s_client_main(int argc, char **argv)
     return ret;
 }
 
+static char *ec_curve_name(EVP_PKEY *pkey)
+{
+    char *curve = 0;
+    size_t namelen;
+
+    if (EVP_PKEY_get_group_name(pkey, NULL, 0, &namelen)) {
+        curve = OPENSSL_malloc(++namelen);
+        if (!EVP_PKEY_get_group_name(pkey, curve, namelen, 0)) {
+            OPENSSL_free(curve);
+            curve = NULL;
+        }
+    }
+    return (curve);
+}
+
+static void print_cert_key_info(BIO *bio, X509 *cert)
+{
+    EVP_PKEY *pkey = X509_get0_pubkey(cert);
+    char *curve = NULL;
+    const char *keyalg;
+
+    if (pkey == NULL)
+        return;
+    keyalg = EVP_PKEY_get0_type_name(pkey);
+    if (keyalg == NULL)
+        keyalg = OBJ_nid2ln(EVP_PKEY_get_base_id(pkey));
+    if (EVP_PKEY_id(pkey) == EVP_PKEY_EC)
+        curve = ec_curve_name(pkey);
+    if (curve != NULL)
+        BIO_printf(bio, "   a:PKEY: %s, (%s); sigalg: %s\n",
+            keyalg, curve,
+            OBJ_nid2ln(X509_get_signature_nid(cert)));
+    else
+        BIO_printf(bio, "   a:PKEY: %s, %d (bit); sigalg: %s\n",
+            keyalg, EVP_PKEY_get_bits(pkey),
+            OBJ_nid2ln(X509_get_signature_nid(cert)));
+    OPENSSL_free(curve);
+}
+
 static void print_stuff(BIO *bio, SSL *s, int full)
 {
     X509 *peer = NULL;
     STACK_OF(X509) *sk;
     const SSL_CIPHER *c;
-    EVP_PKEY *public_key;
     int i, istls13 = (SSL_version(s) == TLS1_3_VERSION);
     long verify_result;
 #ifndef OPENSSL_NO_COMP
@@ -3386,27 +3484,22 @@ static void print_stuff(BIO *bio, SSL *s, int full)
 
             BIO_printf(bio, "---\nCertificate chain\n");
             for (i = 0; i < sk_X509_num(sk); i++) {
+                X509 *chain_cert = sk_X509_value(sk, i);
+
                 BIO_printf(bio, "%2d s:", i);
-                X509_NAME_print_ex(bio, X509_get_subject_name(sk_X509_value(sk, i)), 0, get_nameopt());
+                X509_NAME_print_ex(bio, X509_get_subject_name(chain_cert), 0, get_nameopt());
                 BIO_puts(bio, "\n");
                 BIO_printf(bio, "   i:");
-                X509_NAME_print_ex(bio, X509_get_issuer_name(sk_X509_value(sk, i)), 0, get_nameopt());
+                X509_NAME_print_ex(bio, X509_get_issuer_name(chain_cert), 0, get_nameopt());
                 BIO_puts(bio, "\n");
-                public_key = X509_get_pubkey(sk_X509_value(sk, i));
-                if (public_key != NULL) {
-                    BIO_printf(bio, "   a:PKEY: %s, %d (bit); sigalg: %s\n",
-                               OBJ_nid2sn(EVP_PKEY_get_base_id(public_key)),
-                               EVP_PKEY_get_bits(public_key),
-                               OBJ_nid2sn(X509_get_signature_nid(sk_X509_value(sk, i))));
-                    EVP_PKEY_free(public_key);
-                }
+                print_cert_key_info(bio, chain_cert);
                 BIO_printf(bio, "   v:NotBefore: ");
-                ASN1_TIME_print(bio, X509_get0_notBefore(sk_X509_value(sk, i)));
+                ASN1_TIME_print(bio, X509_get0_notBefore(chain_cert));
                 BIO_printf(bio, "; NotAfter: ");
-                ASN1_TIME_print(bio, X509_get0_notAfter(sk_X509_value(sk, i)));
+                ASN1_TIME_print(bio, X509_get0_notAfter(chain_cert));
                 BIO_puts(bio, "\n");
                 if (c_showcerts)
-                    PEM_write_bio_X509(bio, sk_X509_value(sk, i));
+                    PEM_write_bio_X509(bio, chain_cert);
             }
         }
 
@@ -3467,7 +3560,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
                     SCT *sct = sk_SCT_value(scts, i);
 
                     BIO_printf(bio, "SCT validation status: %s\n",
-                               SCT_validation_status_string(sct));
+                        SCT_validation_status_string(sct));
                     SCT_print(sct, bio, 0, log_store);
                     if (i < sct_count - 1)
                         BIO_printf(bio, "\n---\n");
@@ -3478,23 +3571,23 @@ static void print_stuff(BIO *bio, SSL *s, int full)
 #endif
 
         BIO_printf(bio,
-                   "---\nSSL handshake has read %ju bytes "
-                   "and written %ju bytes\n",
-                   BIO_number_read(SSL_get_rbio(s)),
-                   BIO_number_written(SSL_get_wbio(s)));
+            "---\nSSL handshake has read %ju bytes "
+            "and written %ju bytes\n",
+            BIO_number_read(SSL_get_rbio(s)),
+            BIO_number_written(SSL_get_wbio(s)));
     }
     print_verify_detail(s, bio);
     BIO_printf(bio, (SSL_session_reused(s) ? "---\nReused, " : "---\nNew, "));
     c = SSL_get_current_cipher(s);
     BIO_printf(bio, "%s, Cipher is %s\n",
-               SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
+        SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
     BIO_printf(bio, "Protocol: %s\n", SSL_get_version(s));
     if (peer != NULL) {
         EVP_PKEY *pktmp;
 
         pktmp = X509_get0_pubkey(peer);
         BIO_printf(bio, "Server public key is %d bit\n",
-                   EVP_PKEY_get_bits(pktmp));
+            EVP_PKEY_get_bits(pktmp));
     }
 
     ssl_print_secure_renegotiation_notes(bio, s);
@@ -3503,9 +3596,9 @@ static void print_stuff(BIO *bio, SSL *s, int full)
     comp = SSL_get_current_compression(s);
     expansion = SSL_get_current_expansion(s);
     BIO_printf(bio, "Compression: %s\n",
-               comp ? SSL_COMP_get_name(comp) : "NONE");
+        comp ? SSL_COMP_get_name(comp) : "NONE");
     BIO_printf(bio, "Expansion: %s\n",
-               expansion ? SSL_COMP_get_name(expansion) : "NONE");
+        expansion ? SSL_COMP_get_name(expansion) : "NONE");
 #endif
 #ifndef OPENSSL_NO_KTLS
     if (BIO_get_ktls_send(SSL_get_wbio(s)))
@@ -3523,7 +3616,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
         if ((info.addr = BIO_ADDR_new()) != NULL
             && BIO_sock_info(sock, BIO_SOCK_INFO_ADDRESS, &info)) {
             BIO_printf(bio_c_out, "LOCAL PORT is %u\n",
-                       ntohs(BIO_ADDR_rawport(info.addr)));
+                ntohs(BIO_ADDR_rawport(info.addr)));
         }
         BIO_ADDR_free(info.addr);
     }
@@ -3552,12 +3645,11 @@ static void print_stuff(BIO *bio, SSL *s, int full)
 
 #ifndef OPENSSL_NO_SRTP
     {
-        SRTP_PROTECTION_PROFILE *srtp_profile =
-            SSL_get_selected_srtp_profile(s);
+        SRTP_PROTECTION_PROFILE *srtp_profile = SSL_get_selected_srtp_profile(s);
 
         if (srtp_profile)
             BIO_printf(bio, "SRTP Extension negotiated, profile=%s\n",
-                       srtp_profile->name);
+                srtp_profile->name);
     }
 #endif
 
@@ -3574,7 +3666,6 @@ static void print_stuff(BIO *bio, SSL *s, int full)
         case SSL_EARLY_DATA_ACCEPTED:
             BIO_printf(bio, "Early data was accepted\n");
             break;
-
         }
 
         /*
@@ -3584,7 +3675,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
          */
         verify_result = SSL_get_verify_result(s);
         BIO_printf(bio, "Verify return code: %ld (%s)\n", verify_result,
-                   X509_verify_cert_error_string(verify_result));
+            X509_verify_cert_error_string(verify_result));
     } else {
         /* In TLSv1.3 we do this on arrival of a NewSessionTicket */
         SSL_SESSION_print(bio, SSL_get_session(s));
@@ -3596,10 +3687,11 @@ static void print_stuff(BIO *bio, SSL *s, int full)
         BIO_printf(bio, "    Length: %i bytes\n", keymatexportlen);
         exportedkeymat = app_malloc(keymatexportlen, "export key");
         if (SSL_export_keying_material(s, exportedkeymat,
-                                        keymatexportlen,
-                                        keymatexportlabel,
-                                        strlen(keymatexportlabel),
-                                        NULL, 0, 0) <= 0) {
+                keymatexportlen,
+                keymatexportlabel,
+                strlen(keymatexportlabel),
+                NULL, 0, 0)
+            <= 0) {
             BIO_printf(bio, "    Error\n");
         } else {
             BIO_printf(bio, "    Keying material: ");
@@ -3614,7 +3706,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
     (void)BIO_flush(bio);
 }
 
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
 static int ocsp_resp_cb(SSL *s, void *arg)
 {
     const unsigned char *p;
@@ -3638,7 +3730,7 @@ static int ocsp_resp_cb(SSL *s, void *arg)
     OCSP_RESPONSE_free(rsp);
     return 1;
 }
-# endif
+#endif
 
 static int ldap_ExtendedResponse_parse(const char *buf, long rem)
 {
@@ -3678,18 +3770,16 @@ static int ldap_ExtendedResponse_parse(const char *buf, long rem)
 
     /* pull SEQUENCE */
     inf = ASN1_get_object(&cur, &len, &tag, &xclass, rem);
-    if (inf != V_ASN1_CONSTRUCTED || tag != V_ASN1_SEQUENCE ||
-        (rem = end - cur, len > rem)) {
+    if (inf != V_ASN1_CONSTRUCTED || tag != V_ASN1_SEQUENCE || (rem = end - cur, len > rem)) {
         BIO_printf(bio_err, "Unexpected LDAP response\n");
         goto end;
     }
 
-    rem = len;  /* ensure that we don't overstep the SEQUENCE */
+    rem = len; /* ensure that we don't overstep the SEQUENCE */
 
     /* pull MessageID */
     inf = ASN1_get_object(&cur, &len, &tag, &xclass, rem);
-    if (inf != V_ASN1_UNIVERSAL || tag != V_ASN1_INTEGER ||
-        (rem = end - cur, len > rem)) {
+    if (inf != V_ASN1_UNIVERSAL || tag != V_ASN1_INTEGER || (rem = end - cur, len > rem)) {
         BIO_printf(bio_err, "No MessageID\n");
         goto end;
     }
@@ -3699,8 +3789,7 @@ static int ldap_ExtendedResponse_parse(const char *buf, long rem)
     /* pull [APPLICATION 24] */
     rem = end - cur;
     inf = ASN1_get_object(&cur, &len, &tag, &xclass, rem);
-    if (inf != V_ASN1_CONSTRUCTED || xclass != V_ASN1_APPLICATION ||
-        tag != 24) {
+    if (inf != V_ASN1_CONSTRUCTED || xclass != V_ASN1_APPLICATION || tag != 24) {
         BIO_printf(bio_err, "Not ExtendedResponse\n");
         goto end;
     }
@@ -3708,8 +3797,7 @@ static int ldap_ExtendedResponse_parse(const char *buf, long rem)
     /* pull resultCode */
     rem = end - cur;
     inf = ASN1_get_object(&cur, &len, &tag, &xclass, rem);
-    if (inf != V_ASN1_UNIVERSAL || tag != V_ASN1_ENUMERATED || len == 0 ||
-        (rem = end - cur, len > rem)) {
+    if (inf != V_ASN1_UNIVERSAL || tag != V_ASN1_ENUMERATED || len == 0 || (rem = end - cur, len > rem)) {
         BIO_printf(bio_err, "Not LDAPResult\n");
         goto end;
     }
@@ -3720,7 +3808,7 @@ static int ldap_ExtendedResponse_parse(const char *buf, long rem)
         ret |= cur[inf];
     }
     /* There is more data, but we don't care... */
- end:
+end:
     return ret;
 }
 
@@ -3791,7 +3879,7 @@ static int is_dNS_name(const char *host)
 }
 
 static void user_data_init(struct user_data_st *user_data, SSL *con, char *buf,
-                           size_t bufmax, int mode)
+    size_t bufmax, int mode)
 {
     user_data->con = con;
     user_data->buf = buf;
@@ -3813,12 +3901,12 @@ static int user_data_add(struct user_data_st *user_data, size_t i)
     return 1;
 }
 
-#define USER_COMMAND_HELP        0
-#define USER_COMMAND_QUIT        1
-#define USER_COMMAND_RECONNECT   2
+#define USER_COMMAND_HELP 0
+#define USER_COMMAND_QUIT 1
+#define USER_COMMAND_RECONNECT 2
 #define USER_COMMAND_RENEGOTIATE 3
-#define USER_COMMAND_KEY_UPDATE  4
-#define USER_COMMAND_FIN         5
+#define USER_COMMAND_KEY_UPDATE 4
+#define USER_COMMAND_FIN 5
 
 static int user_data_execute(struct user_data_st *user_data, int cmd, char *arg)
 {
@@ -3834,7 +3922,7 @@ static int user_data_execute(struct user_data_st *user_data, int cmd, char *arg)
         BIO_printf(bio_err, "  {reconnect}: Reconnect to the peer\n");
         if (SSL_is_quic(user_data->con)) {
             BIO_printf(bio_err, "  {fin}: Send FIN on the stream. No further writing is possible\n");
-        } else if(SSL_version(user_data->con) == TLS1_3_VERSION) {
+        } else if (SSL_version(user_data->con) == TLS1_3_VERSION) {
             BIO_printf(bio_err, "  {keyup:req|noreq}: Send a Key Update message\n");
             BIO_printf(bio_err, "                     Arguments:\n");
             BIO_printf(bio_err, "                     req   = peer update requested (default)\n");
@@ -3863,19 +3951,19 @@ static int user_data_execute(struct user_data_st *user_data, int cmd, char *arg)
         return USER_DATA_PROCESS_CONTINUE;
 
     case USER_COMMAND_KEY_UPDATE: {
-            int updatetype;
-
-            if (OPENSSL_strcasecmp(arg, "req") == 0)
-                updatetype = SSL_KEY_UPDATE_REQUESTED;
-            else if (OPENSSL_strcasecmp(arg, "noreq") == 0)
-                updatetype = SSL_KEY_UPDATE_NOT_REQUESTED;
-            else
-                return USER_DATA_PROCESS_BAD_ARGUMENT;
-            BIO_printf(bio_err, "KEYUPDATE\n");
-            if (!SSL_key_update(user_data->con, updatetype))
-                break;
-            return USER_DATA_PROCESS_CONTINUE;
-        }
+        int updatetype;
+
+        if (OPENSSL_strcasecmp(arg, "req") == 0)
+            updatetype = SSL_KEY_UPDATE_REQUESTED;
+        else if (OPENSSL_strcasecmp(arg, "noreq") == 0)
+            updatetype = SSL_KEY_UPDATE_NOT_REQUESTED;
+        else
+            return USER_DATA_PROCESS_BAD_ARGUMENT;
+        BIO_printf(bio_err, "KEYUPDATE\n");
+        if (!SSL_key_update(user_data->con, updatetype))
+            break;
+        return USER_DATA_PROCESS_CONTINUE;
+    }
 
     case USER_COMMAND_FIN:
         if (!SSL_stream_conclude(user_data->con, 0))
@@ -3894,7 +3982,7 @@ static int user_data_execute(struct user_data_st *user_data, int cmd, char *arg)
 }
 
 static int user_data_process(struct user_data_st *user_data, size_t *len,
-                             size_t *off)
+    size_t *off)
 {
     char *buf_start = user_data->buf + user_data->bufoff;
     size_t outlen = user_data->buflen;
@@ -3923,7 +4011,7 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
         case 'k':
             user_data->buflen = user_data->bufoff = *len = *off = 0;
             return user_data_execute(user_data, USER_COMMAND_KEY_UPDATE,
-                                     buf_start[0] == 'K' ? "req" : "noreq");
+                buf_start[0] == 'K' ? "req" : "noreq");
         default:
             break;
         }
@@ -3956,8 +4044,8 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
                 /* Malformed command */
                 cmd_start[outlen - 1] = '\0';
                 BIO_printf(bio_err,
-                           "ERROR PROCESSING COMMAND. REST OF LINE IGNORED: %s\n",
-                           cmd_start);
+                    "ERROR PROCESSING COMMAND. REST OF LINE IGNORED: %s\n",
+                    cmd_start);
                 user_data->buflen = user_data->bufoff = *len = *off = 0;
                 return USER_DATA_PROCESS_NO_DATA;
             }
@@ -3980,10 +4068,11 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
                 cmd = USER_COMMAND_QUIT;
             } else if (OPENSSL_strcasecmp(cmd_start, "reconnect") == 0) {
                 cmd = USER_COMMAND_RECONNECT;
-            } else if(SSL_is_quic(user_data->con)) {
+            } else if (SSL_is_quic(user_data->con)) {
                 if (OPENSSL_strcasecmp(cmd_start, "fin") == 0)
                     cmd = USER_COMMAND_FIN;
-            } if (SSL_version(user_data->con) == TLS1_3_VERSION) {
+            }
+            if (SSL_version(user_data->con) == TLS1_3_VERSION) {
                 if (OPENSSL_strcasecmp(cmd_start, "keyup") == 0) {
                     cmd = USER_COMMAND_KEY_UPDATE;
                     if (arg_start == NULL)
@@ -3996,12 +4085,12 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
             }
             if (cmd == -1) {
                 BIO_printf(bio_err, "UNRECOGNISED COMMAND (IGNORED): %s\n",
-                           cmd_start);
+                    cmd_start);
             } else {
                 ret = user_data_execute(user_data, cmd, arg_start);
                 if (ret == USER_DATA_PROCESS_BAD_ARGUMENT) {
                     BIO_printf(bio_err, "BAD ARGUMENT (COMMAND IGNORED): %s\n",
-                               arg_start);
+                        arg_start);
                     ret = USER_DATA_PROCESS_NO_DATA;
                 }
             }
@@ -4009,8 +4098,8 @@ static int user_data_process(struct user_data_st *user_data, size_t *len,
             user_data->bufoff = (cmd_end - user_data->buf) + 1;
             user_data->buflen -= user_data->bufoff - oldoff;
             if (user_data->buf + 1 == cmd_start
-                    && user_data->buflen == 1
-                    && user_data->buf[user_data->bufoff] == '\n') {
+                && user_data->buflen == 1
+                && user_data->buf[user_data->bufoff] == '\n') {
                 /*
                  * This command was the only thing on the whole line. We
                  * suppress the final `\n`
@@ -4052,4 +4141,4 @@ static int user_data_has_data(struct user_data_st *user_data)
 {
     return user_data->buflen > 0;
 }
-#endif                          /* OPENSSL_NO_SOCK */
+#endif /* OPENSSL_NO_SOCK */
diff --git a/apps/s_server.c b/apps/s_server.c
index 8a36122a25bf5..da8d001bc4260 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #if defined(_WIN32)
 /* Included before async.h to avoid some warnings */
-# include <windows.h>
+#include <windows.h>
 #endif
 
 #include <openssl/e_os2.h>
@@ -35,7 +35,7 @@
  * needed to have fileno() declared correctly...  So let's define u_int
  */
 #if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
-# define __U_INT
+#define __U_INT
 typedef unsigned int u_int;
 #endif
 
@@ -48,7 +48,7 @@ typedef unsigned int u_int;
 #include <openssl/rand.h>
 #include <openssl/ocsp.h>
 #ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
+#include <openssl/dh.h>
 #endif
 #include <openssl/rsa.h>
 #include "s_apps.h"
@@ -66,7 +66,7 @@ static void close_accept_socket(void);
 static int init_ssl_connection(SSL *s);
 static void print_stats(BIO *bp, SSL_CTX *ctx);
 static int generate_session_id(SSL *ssl, unsigned char *id,
-                               unsigned int *id_len);
+    unsigned int *id_len);
 static void init_session_cache_ctx(SSL_CTX *sctx);
 static void free_sessions(void);
 static void print_connection_info(SSL *con);
@@ -74,8 +74,8 @@ static void print_connection_info(SSL *con);
 static const int bufsize = 16 * 1024;
 static int accept_socket = -1;
 
-#define TEST_CERT       "server.pem"
-#define TEST_CERT2      "server2.pem"
+#define TEST_CERT "server.pem"
+#define TEST_CERT2 "server2.pem"
 
 static int s_nbio = 0;
 static int s_nbio_test = 0;
@@ -122,14 +122,14 @@ static int early_data = 0;
 static SSL_SESSION *psksess = NULL;
 
 static char *psk_identity = "Client_identity";
-char *psk_key = NULL;           /* by default PSK is not used */
+char *psk_key = NULL; /* by default PSK is not used */
 
 static char http_server_binmode = 0; /* for now: 0/1 = default/binary */
 
 #ifndef OPENSSL_NO_PSK
 static unsigned int psk_server_cb(SSL *ssl, const char *identity,
-                                  unsigned char *psk,
-                                  unsigned int max_psk_len)
+    unsigned char *psk,
+    unsigned int max_psk_len)
 {
     long key_len = 0;
     unsigned char *key;
@@ -153,28 +153,29 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
     }
     if (s_debug)
         BIO_printf(bio_s_out, "identity_len=%d identity=%s\n",
-                   (int)strlen(identity), identity);
+            (int)strlen(identity), identity);
 
     /* here we could lookup the given identity e.g. from a database */
     if (strcmp(identity, psk_identity) != 0) {
         BIO_printf(bio_s_out, "PSK warning: client identity not what we expected"
-                   " (got '%s' expected '%s')\n", identity, psk_identity);
+                              " (got '%s' expected '%s')\n",
+            identity, psk_identity);
     } else {
-      if (s_debug)
-        BIO_printf(bio_s_out, "PSK client identity found\n");
+        if (s_debug)
+            BIO_printf(bio_s_out, "PSK client identity found\n");
     }
 
     /* convert the PSK key to binary */
     key = OPENSSL_hexstr2buf(psk_key, &key_len);
     if (key == NULL) {
         BIO_printf(bio_err, "Could not convert PSK key '%s' to buffer\n",
-                   psk_key);
+            psk_key);
         return 0;
     }
     if (key_len > (int)max_psk_len) {
         BIO_printf(bio_err,
-                   "psk buffer of callback is too small (%d) for key (%ld)\n",
-                   max_psk_len, key_len);
+            "psk buffer of callback is too small (%d) for key (%ld)\n",
+            max_psk_len, key_len);
         OPENSSL_free(key);
         return 0;
     }
@@ -185,7 +186,7 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
     if (s_debug)
         BIO_printf(bio_s_out, "fetched PSK len=%ld\n", key_len);
     return key_len;
- out_err:
+out_err:
     if (s_debug)
         BIO_printf(bio_err, "Error in PSK server callback\n");
     (void)BIO_flush(bio_err);
@@ -195,7 +196,7 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
 #endif
 
 static int psk_find_session_cb(SSL *ssl, const unsigned char *identity,
-                               size_t identity_len, SSL_SESSION **sess)
+    size_t identity_len, SSL_SESSION **sess)
 {
     SSL_SESSION *tmpsess = NULL;
     unsigned char *key;
@@ -203,7 +204,7 @@ static int psk_find_session_cb(SSL *ssl, const unsigned char *identity,
     const SSL_CIPHER *cipher = NULL;
 
     if (strlen(psk_identity) != identity_len
-            || memcmp(psk_identity, identity, identity_len) != 0) {
+        || memcmp(psk_identity, identity, identity_len) != 0) {
         *sess = NULL;
         return 1;
     }
@@ -219,7 +220,7 @@ static int psk_find_session_cb(SSL *ssl, const unsigned char *identity,
     key = OPENSSL_hexstr2buf(psk_key, &key_len);
     if (key == NULL) {
         BIO_printf(bio_err, "Could not convert PSK key '%s' to buffer\n",
-                   psk_key);
+            psk_key);
         return 0;
     }
 
@@ -233,9 +234,9 @@ static int psk_find_session_cb(SSL *ssl, const unsigned char *identity,
 
     tmpsess = SSL_SESSION_new();
     if (tmpsess == NULL
-            || !SSL_SESSION_set1_master_key(tmpsess, key, key_len)
-            || !SSL_SESSION_set_cipher(tmpsess, cipher)
-            || !SSL_SESSION_set_protocol_version(tmpsess, SSL_version(ssl))) {
+        || !SSL_SESSION_set1_master_key(tmpsess, key, key_len)
+        || !SSL_SESSION_set_cipher(tmpsess, cipher)
+        || !SSL_SESSION_set_protocol_version(tmpsess, SSL_version(ssl))) {
         OPENSSL_free(key);
         SSL_SESSION_free(tmpsess);
         return 0;
@@ -262,7 +263,7 @@ static long ebcdic_ctrl(BIO *b, int cmd, long num, void *ptr);
 static int ebcdic_gets(BIO *bp, char *buf, int size);
 static int ebcdic_puts(BIO *bp, const char *str);
 
-# define BIO_TYPE_EBCDIC_FILTER  (18|0x0200)
+#define BIO_TYPE_EBCDIC_FILTER (18 | 0x0200)
 static BIO_METHOD *methods_ebcdic = NULL;
 
 /* This struct is "unwarranted chumminess with the compiler." */
@@ -275,7 +276,7 @@ static const BIO_METHOD *BIO_f_ebcdic_filter(void)
 {
     if (methods_ebcdic == NULL) {
         methods_ebcdic = BIO_meth_new(BIO_TYPE_EBCDIC_FILTER,
-                                      "EBCDIC/ASCII filter");
+            "EBCDIC/ASCII filter");
         if (methods_ebcdic == NULL
             || !BIO_meth_set_write(methods_ebcdic, ebcdic_write)
             || !BIO_meth_set_read(methods_ebcdic, ebcdic_read)
@@ -344,10 +345,10 @@ static int ebcdic_write(BIO *b, const char *in, int inl)
     if (next == NULL)
         return 0;
 
-    wbuf = (EBCDIC_OUTBUFF *) BIO_get_data(b);
+    wbuf = (EBCDIC_OUTBUFF *)BIO_get_data(b);
 
     if (inl > (num = wbuf->alloced)) {
-        num = num + num;        /* double the size */
+        num = num + num; /* double the size */
         if (num < inl)
             num = inl;
         OPENSSL_free(wbuf);
@@ -391,7 +392,7 @@ static int ebcdic_gets(BIO *bp, char *buf, int size)
 
     if (next == NULL)
         return 0;
-/*      return(BIO_gets(bp->next_bio,buf,size));*/
+    /*      return(BIO_gets(bp->next_bio,buf,size));*/
     for (i = 0; i < size - 1; ++i) {
         ret = ebcdic_read(bp, &buf[i], 1);
         if (ret <= 0)
@@ -423,7 +424,7 @@ typedef struct tlsextctx_st {
 
 static int ssl_servername_cb(SSL *s, int *ad, void *arg)
 {
-    tlsextctx *p = (tlsextctx *) arg;
+    tlsextctx *p = (tlsextctx *)arg;
     const char *servername = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
 
     if (servername != NULL && p->biodebug != NULL) {
@@ -433,7 +434,7 @@ static int ssl_servername_cb(SSL *s, int *ad, void *arg)
         BIO_printf(p->biodebug, "Hostname in TLS extension: \"");
         while ((uc = *cp++) != 0)
             BIO_printf(p->biodebug,
-                       (((uc) & ~127) == 0) && isprint(uc) ? "%c" : "\\x%02x", uc);
+                (((uc) & ~127) == 0) && isprint(uc) ? "%c" : "\\x%02x", uc);
         BIO_printf(p->biodebug, "\"\n");
     }
 
@@ -475,7 +476,7 @@ static tlsextstatusctx tlscstatp = { -1 };
  * them until they were considered "expired".
  */
 static int get_ocsp_resp_from_responder(SSL *s, tlsextstatusctx *srctx,
-                                        OCSP_RESPONSE **resp)
+    OCSP_RESPONSE **resp)
 {
     char *host = NULL, *port = NULL, *path = NULL;
     char *proxy = NULL, *no_proxy = NULL;
@@ -499,17 +500,17 @@ static int get_ocsp_resp_from_responder(SSL *s, tlsextstatusctx *srctx,
     aia = X509_get1_ocsp(x);
     if (aia != NULL) {
         if (!OSSL_HTTP_parse_url(sk_OPENSSL_STRING_value(aia, 0), &use_ssl,
-                                 NULL, &host, &port, NULL, &path, NULL, NULL)) {
+                NULL, &host, &port, NULL, &path, NULL, NULL)) {
             BIO_puts(bio_err, "cert_status: can't parse AIA URL\n");
             goto err;
         }
         if (srctx->verbose)
             BIO_printf(bio_err, "cert_status: AIA URL: %s\n",
-                       sk_OPENSSL_STRING_value(aia, 0));
+                sk_OPENSSL_STRING_value(aia, 0));
     } else {
         if (srctx->host == NULL) {
             BIO_puts(bio_err,
-                     "cert_status: no AIA and no default responder URL\n");
+                "cert_status: no AIA and no default responder URL\n");
             goto done;
         }
         host = srctx->host;
@@ -537,7 +538,7 @@ static int get_ocsp_resp_from_responder(SSL *s, tlsextstatusctx *srctx,
         if (inctx == NULL)
             goto err;
         if (!X509_STORE_CTX_init(inctx, SSL_CTX_get_cert_store(ssl_ctx),
-                                 NULL, NULL))
+                NULL, NULL))
             goto err;
         obj = X509_STORE_CTX_get_obj_by_subject(inctx, X509_LU_X509, iname);
         if (obj == NULL) {
@@ -563,7 +564,7 @@ static int get_ocsp_resp_from_responder(SSL *s, tlsextstatusctx *srctx,
             goto err;
     }
     *resp = process_responder(req, host, port, path, proxy, no_proxy,
-                              use_ssl, NULL /* headers */, srctx->timeout);
+        use_ssl, NULL /* headers */, srctx->timeout);
     if (*resp == NULL) {
         BIO_puts(bio_err, "cert_status: error querying responder\n");
         goto done;
@@ -572,9 +573,9 @@ static int get_ocsp_resp_from_responder(SSL *s, tlsextstatusctx *srctx,
     ret = SSL_TLSEXT_ERR_OK;
     goto done;
 
- err:
+err:
     ret = SSL_TLSEXT_ERR_ALERT_FATAL;
- done:
+done:
     /*
      * If we parsed aia we need to free; otherwise they were copied and we
      * don't
@@ -637,7 +638,7 @@ static int cert_status_cb(SSL *s, void *arg)
 
     ret = SSL_TLSEXT_ERR_OK;
 
- err:
+err:
     if (ret != SSL_TLSEXT_ERR_OK)
         ERR_print_errors(bio_err);
 
@@ -655,7 +656,7 @@ typedef struct tlsextnextprotoctx_st {
 } tlsextnextprotoctx;
 
 static int next_proto_cb(SSL *s, const unsigned char **data,
-                         unsigned int *len, void *arg)
+    unsigned int *len, void *arg)
 {
     tlsextnextprotoctx *next_proto = arg;
 
@@ -664,7 +665,7 @@ static int next_proto_cb(SSL *s, const unsigned char **data,
 
     return SSL_TLSEXT_ERR_OK;
 }
-#endif                         /* ndef OPENSSL_NO_NEXTPROTONEG */
+#endif /* ndef OPENSSL_NO_NEXTPROTONEG */
 
 /* This the context that we pass to alpn_cb */
 typedef struct tlsextalpnctx_st {
@@ -673,7 +674,7 @@ typedef struct tlsextalpnctx_st {
 } tlsextalpnctx;
 
 static int alpn_cb(SSL *s, const unsigned char **out, unsigned char *outlen,
-                   const unsigned char *in, unsigned int inlen, void *arg)
+    const unsigned char *in, unsigned int inlen, void *arg)
 {
     tlsextalpnctx *alpn_ctx = arg;
 
@@ -690,9 +691,9 @@ static int alpn_cb(SSL *s, const unsigned char **out, unsigned char *outlen,
         BIO_write(bio_s_out, "\n", 1);
     }
 
-    if (SSL_select_next_proto
-        ((unsigned char **)out, outlen, alpn_ctx->data, alpn_ctx->len, in,
-         inlen) != OPENSSL_NPN_NEGOTIATED) {
+    if (SSL_select_next_proto((unsigned char **)out, outlen, alpn_ctx->data, alpn_ctx->len, in,
+            inlen)
+        != OPENSSL_NPN_NEGOTIATED) {
         return SSL_TLSEXT_ERR_ALERT_FATAL;
     }
 
@@ -714,36 +715,131 @@ static int not_resumable_sess_cb(SSL *s, int is_forward_secure)
 typedef enum OPTION_choice {
     OPT_COMMON,
     OPT_ENGINE,
-    OPT_4, OPT_6, OPT_ACCEPT, OPT_PORT, OPT_UNIX, OPT_UNLINK, OPT_NACCEPT,
-    OPT_VERIFY, OPT_NAMEOPT, OPT_UPPER_V_VERIFY, OPT_CONTEXT, OPT_CERT, OPT_CRL,
-    OPT_CRL_DOWNLOAD, OPT_SERVERINFO, OPT_CERTFORM, OPT_KEY, OPT_KEYFORM,
-    OPT_PASS, OPT_CERT_CHAIN, OPT_DHPARAM, OPT_DCERTFORM, OPT_DCERT,
-    OPT_DKEYFORM, OPT_DPASS, OPT_DKEY, OPT_DCERT_CHAIN, OPT_NOCERT,
-    OPT_CAPATH, OPT_NOCAPATH, OPT_CHAINCAPATH, OPT_VERIFYCAPATH, OPT_NO_CACHE,
-    OPT_EXT_CACHE, OPT_CRLFORM, OPT_VERIFY_RET_ERROR, OPT_VERIFY_QUIET,
-    OPT_BUILD_CHAIN, OPT_CAFILE, OPT_NOCAFILE, OPT_CHAINCAFILE,
+    OPT_4,
+    OPT_6,
+    OPT_ACCEPT,
+    OPT_PORT,
+    OPT_UNIX,
+    OPT_UNLINK,
+    OPT_NACCEPT,
+    OPT_VERIFY,
+    OPT_NAMEOPT,
+    OPT_UPPER_V_VERIFY,
+    OPT_CONTEXT,
+    OPT_CERT,
+    OPT_CRL,
+    OPT_CRL_DOWNLOAD,
+    OPT_SERVERINFO,
+    OPT_CERTFORM,
+    OPT_KEY,
+    OPT_KEYFORM,
+    OPT_PASS,
+    OPT_CERT_CHAIN,
+    OPT_DHPARAM,
+    OPT_DCERTFORM,
+    OPT_DCERT,
+    OPT_DKEYFORM,
+    OPT_DPASS,
+    OPT_DKEY,
+    OPT_DCERT_CHAIN,
+    OPT_NOCERT,
+    OPT_CAPATH,
+    OPT_NOCAPATH,
+    OPT_CHAINCAPATH,
+    OPT_VERIFYCAPATH,
+    OPT_NO_CACHE,
+    OPT_EXT_CACHE,
+    OPT_CRLFORM,
+    OPT_VERIFY_RET_ERROR,
+    OPT_VERIFY_QUIET,
+    OPT_BUILD_CHAIN,
+    OPT_CAFILE,
+    OPT_NOCAFILE,
+    OPT_CHAINCAFILE,
     OPT_VERIFYCAFILE,
-    OPT_CASTORE, OPT_NOCASTORE, OPT_CHAINCASTORE, OPT_VERIFYCASTORE,
-    OPT_NBIO, OPT_NBIO_TEST, OPT_IGN_EOF, OPT_NO_IGN_EOF,
-    OPT_DEBUG, OPT_TLSEXTDEBUG, OPT_STATUS, OPT_STATUS_VERBOSE,
-    OPT_STATUS_TIMEOUT, OPT_PROXY, OPT_NO_PROXY, OPT_STATUS_URL,
-    OPT_STATUS_FILE, OPT_MSG, OPT_MSGFILE,
-    OPT_TRACE, OPT_SECURITY_DEBUG, OPT_SECURITY_DEBUG_VERBOSE, OPT_STATE,
-    OPT_CRLF, OPT_QUIET, OPT_BRIEF, OPT_NO_DHE,
-    OPT_NO_RESUME_EPHEMERAL, OPT_PSK_IDENTITY, OPT_PSK_HINT, OPT_PSK,
-    OPT_PSK_SESS, OPT_SRPVFILE, OPT_SRPUSERSEED, OPT_REV, OPT_WWW,
-    OPT_UPPER_WWW, OPT_HTTP, OPT_ASYNC, OPT_SSL_CONFIG,
-    OPT_MAX_SEND_FRAG, OPT_SPLIT_SEND_FRAG, OPT_MAX_PIPELINES, OPT_READ_BUF,
-    OPT_SSL3, OPT_TLS1_3, OPT_TLS1_2, OPT_TLS1_1, OPT_TLS1, OPT_DTLS, OPT_DTLS1,
-    OPT_DTLS1_2, OPT_SCTP, OPT_TIMEOUT, OPT_MTU, OPT_LISTEN, OPT_STATELESS,
-    OPT_ID_PREFIX, OPT_SERVERNAME, OPT_SERVERNAME_FATAL,
-    OPT_CERT2, OPT_KEY2, OPT_NEXTPROTONEG, OPT_ALPN, OPT_SENDFILE,
-    OPT_SRTP_PROFILES, OPT_KEYMATEXPORT, OPT_KEYMATEXPORTLEN,
-    OPT_KEYLOG_FILE, OPT_MAX_EARLY, OPT_RECV_MAX_EARLY, OPT_EARLY_DATA,
-    OPT_S_NUM_TICKETS, OPT_ANTI_REPLAY, OPT_NO_ANTI_REPLAY, OPT_SCTP_LABEL_BUG,
-    OPT_HTTP_SERVER_BINMODE, OPT_NOCANAMES, OPT_IGNORE_UNEXPECTED_EOF, OPT_KTLS,
+    OPT_CASTORE,
+    OPT_NOCASTORE,
+    OPT_CHAINCASTORE,
+    OPT_VERIFYCASTORE,
+    OPT_NBIO,
+    OPT_NBIO_TEST,
+    OPT_IGN_EOF,
+    OPT_NO_IGN_EOF,
+    OPT_DEBUG,
+    OPT_TLSEXTDEBUG,
+    OPT_STATUS,
+    OPT_STATUS_VERBOSE,
+    OPT_STATUS_TIMEOUT,
+    OPT_PROXY,
+    OPT_NO_PROXY,
+    OPT_STATUS_URL,
+    OPT_STATUS_FILE,
+    OPT_MSG,
+    OPT_MSGFILE,
+    OPT_TRACE,
+    OPT_SECURITY_DEBUG,
+    OPT_SECURITY_DEBUG_VERBOSE,
+    OPT_STATE,
+    OPT_CRLF,
+    OPT_QUIET,
+    OPT_BRIEF,
+    OPT_NO_DHE,
+    OPT_NO_RESUME_EPHEMERAL,
+    OPT_PSK_IDENTITY,
+    OPT_PSK_HINT,
+    OPT_PSK,
+    OPT_PSK_SESS,
+    OPT_SRPVFILE,
+    OPT_SRPUSERSEED,
+    OPT_REV,
+    OPT_WWW,
+    OPT_UPPER_WWW,
+    OPT_HTTP,
+    OPT_ASYNC,
+    OPT_SSL_CONFIG,
+    OPT_MAX_SEND_FRAG,
+    OPT_SPLIT_SEND_FRAG,
+    OPT_MAX_PIPELINES,
+    OPT_READ_BUF,
+    OPT_SSL3,
+    OPT_TLS1_3,
+    OPT_TLS1_2,
+    OPT_TLS1_1,
+    OPT_TLS1,
+    OPT_DTLS,
+    OPT_DTLS1,
+    OPT_DTLS1_2,
+    OPT_SCTP,
+    OPT_TIMEOUT,
+    OPT_MTU,
+    OPT_LISTEN,
+    OPT_STATELESS,
+    OPT_ID_PREFIX,
+    OPT_SERVERNAME,
+    OPT_SERVERNAME_FATAL,
+    OPT_CERT2,
+    OPT_KEY2,
+    OPT_NEXTPROTONEG,
+    OPT_ALPN,
+    OPT_SENDFILE,
+    OPT_SRTP_PROFILES,
+    OPT_KEYMATEXPORT,
+    OPT_KEYMATEXPORTLEN,
+    OPT_KEYLOG_FILE,
+    OPT_MAX_EARLY,
+    OPT_RECV_MAX_EARLY,
+    OPT_EARLY_DATA,
+    OPT_S_NUM_TICKETS,
+    OPT_ANTI_REPLAY,
+    OPT_NO_ANTI_REPLAY,
+    OPT_SCTP_LABEL_BUG,
+    OPT_HTTP_SERVER_BINMODE,
+    OPT_NOCANAMES,
+    OPT_IGNORE_UNEXPECTED_EOF,
+    OPT_KTLS,
     OPT_USE_ZC_SENDFILE,
-    OPT_TFO, OPT_CERT_COMP,
+    OPT_TFO,
+    OPT_CERT_COMP,
     OPT_ENABLE_SERVER_RPK,
     OPT_ENABLE_CLIENT_RPK,
     OPT_R_ENUM,
@@ -755,261 +851,261 @@ typedef enum OPTION_choice {
 
 const OPTIONS s_server_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"ssl_config", OPT_SSL_CONFIG, 's',
-     "Configure SSL_CTX using the given configuration value"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "ssl_config", OPT_SSL_CONFIG, 's',
+        "Configure SSL_CTX using the given configuration value" },
 #ifndef OPENSSL_NO_SSL_TRACE
-    {"trace", OPT_TRACE, '-', "trace protocol messages"},
+    { "trace", OPT_TRACE, '-', "trace protocol messages" },
 #endif
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Network"),
-    {"port", OPT_PORT, 'p',
-     "TCP/IP port to listen on for connections (default is " PORT ")"},
-    {"accept", OPT_ACCEPT, 's',
-     "TCP/IP optional host and port to listen on for connections (default is *:" PORT ")"},
+    { "port", OPT_PORT, 'p',
+        "TCP/IP port to listen on for connections (default is " PORT ")" },
+    { "accept", OPT_ACCEPT, 's',
+        "TCP/IP optional host and port to listen on for connections (default is *:" PORT ")" },
 #ifdef AF_UNIX
-    {"unix", OPT_UNIX, 's', "Unix domain socket to accept on"},
-    {"unlink", OPT_UNLINK, '-', "For -unix, unlink existing socket first"},
+    { "unix", OPT_UNIX, 's', "Unix domain socket to accept on" },
+    { "unlink", OPT_UNLINK, '-', "For -unix, unlink existing socket first" },
 #endif
-    {"4", OPT_4, '-', "Use IPv4 only"},
-    {"6", OPT_6, '-', "Use IPv6 only"},
+    { "4", OPT_4, '-', "Use IPv4 only" },
+    { "6", OPT_6, '-', "Use IPv6 only" },
 #if defined(TCP_FASTOPEN) && !defined(OPENSSL_NO_TFO)
-    {"tfo", OPT_TFO, '-', "Listen for TCP Fast Open connections"},
+    { "tfo", OPT_TFO, '-', "Listen for TCP Fast Open connections" },
 #endif
 
     OPT_SECTION("Identity"),
-    {"context", OPT_CONTEXT, 's', "Set session ID context"},
-    {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"},
-    {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"},
-    {"CAstore", OPT_CASTORE, ':', "URI to store of CA's"},
-    {"no-CAfile", OPT_NOCAFILE, '-',
-     "Do not load the default certificates file"},
-    {"no-CApath", OPT_NOCAPATH, '-',
-     "Do not load certificates from the default certificates directory"},
-    {"no-CAstore", OPT_NOCASTORE, '-',
-     "Do not load certificates from the default certificates store URI"},
-    {"nocert", OPT_NOCERT, '-', "Don't use any certificates (Anon-DH)"},
-    {"verify", OPT_VERIFY, 'n', "Turn on peer certificate verification"},
-    {"Verify", OPT_UPPER_V_VERIFY, 'n',
-     "Turn on peer certificate verification, must have a cert"},
-    {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"},
-    {"cert", OPT_CERT, '<', "Server certificate file to use; default " TEST_CERT},
-    {"cert2", OPT_CERT2, '<',
-     "Certificate file to use for servername; default " TEST_CERT2},
-    {"certform", OPT_CERTFORM, 'F',
-     "Server certificate file format (PEM/DER/P12); has no effect"},
-    {"cert_chain", OPT_CERT_CHAIN, '<',
-     "Server certificate chain file in PEM format"},
-    {"build_chain", OPT_BUILD_CHAIN, '-', "Build server certificate chain"},
-    {"serverinfo", OPT_SERVERINFO, 's',
-     "PEM serverinfo file for certificate"},
-    {"key", OPT_KEY, 's',
-     "Private key file to use; default is -cert file or else" TEST_CERT},
-    {"key2", OPT_KEY2, '<',
-     "-Private Key file to use for servername if not in -cert2"},
-    {"keyform", OPT_KEYFORM, 'f', "Key format (ENGINE, other values ignored)"},
-    {"pass", OPT_PASS, 's', "Private key and cert file pass phrase source"},
-    {"dcert", OPT_DCERT, '<',
-     "Second server certificate file to use (usually for DSA)"},
-    {"dcertform", OPT_DCERTFORM, 'F',
-     "Second server certificate file format (PEM/DER/P12); has no effect"},
-    {"dcert_chain", OPT_DCERT_CHAIN, '<',
-     "second server certificate chain file in PEM format"},
-    {"dkey", OPT_DKEY, '<',
-     "Second private key file to use (usually for DSA)"},
-    {"dkeyform", OPT_DKEYFORM, 'f',
-     "Second key file format (ENGINE, other values ignored)"},
-    {"dpass", OPT_DPASS, 's',
-     "Second private key and cert file pass phrase source"},
-    {"dhparam", OPT_DHPARAM, '<', "DH parameters file to use"},
-    {"servername", OPT_SERVERNAME, 's',
-     "Servername for HostName TLS extension"},
-    {"servername_fatal", OPT_SERVERNAME_FATAL, '-',
-     "On servername mismatch send fatal alert (default warning alert)"},
-    {"nbio_test", OPT_NBIO_TEST, '-', "Test with the non-blocking test bio"},
-    {"crlf", OPT_CRLF, '-', "Convert LF from terminal into CRLF"},
-    {"quiet", OPT_QUIET, '-', "No server output"},
-    {"no_resume_ephemeral", OPT_NO_RESUME_EPHEMERAL, '-',
-     "Disable caching and tickets if ephemeral (EC)DH is used"},
-    {"www", OPT_WWW, '-', "Respond to a 'GET /' with a status page"},
-    {"WWW", OPT_UPPER_WWW, '-', "Respond to a 'GET with the file ./path"},
-    {"ignore_unexpected_eof", OPT_IGNORE_UNEXPECTED_EOF, '-',
-     "Do not treat lack of close_notify from a peer as an error"},
-    {"tlsextdebug", OPT_TLSEXTDEBUG, '-',
-     "Hex dump of all TLS extensions received"},
-    {"HTTP", OPT_HTTP, '-', "Like -WWW but ./path includes HTTP headers"},
-    {"id_prefix", OPT_ID_PREFIX, 's',
-     "Generate SSL/TLS session IDs prefixed by arg"},
-    {"keymatexport", OPT_KEYMATEXPORT, 's',
-     "Export keying material using label"},
-    {"keymatexportlen", OPT_KEYMATEXPORTLEN, 'p',
-     "Export len bytes of keying material; default 20"},
-    {"CRL", OPT_CRL, '<', "CRL file to use"},
-    {"CRLform", OPT_CRLFORM, 'F', "CRL file format (PEM or DER); default PEM"},
-    {"crl_download", OPT_CRL_DOWNLOAD, '-',
-     "Download CRLs from distribution points in certificate CDP entries"},
-    {"chainCAfile", OPT_CHAINCAFILE, '<',
-     "CA file for certificate chain (PEM format)"},
-    {"chainCApath", OPT_CHAINCAPATH, '/',
-     "use dir as certificate store path to build CA certificate chain"},
-    {"chainCAstore", OPT_CHAINCASTORE, ':',
-     "use URI as certificate store to build CA certificate chain"},
-    {"verifyCAfile", OPT_VERIFYCAFILE, '<',
-     "CA file for certificate verification (PEM format)"},
-    {"verifyCApath", OPT_VERIFYCAPATH, '/',
-     "use dir as certificate store path to verify CA certificate"},
-    {"verifyCAstore", OPT_VERIFYCASTORE, ':',
-     "use URI as certificate store to verify CA certificate"},
-    {"no_cache", OPT_NO_CACHE, '-', "Disable session cache"},
-    {"ext_cache", OPT_EXT_CACHE, '-',
-     "Disable internal cache, set up and use external cache"},
-    {"verify_return_error", OPT_VERIFY_RET_ERROR, '-',
-     "Close connection on verification error"},
-    {"verify_quiet", OPT_VERIFY_QUIET, '-',
-     "No verify output except verify errors"},
-    {"ign_eof", OPT_IGN_EOF, '-', "Ignore input EOF (default when -quiet)"},
-    {"no_ign_eof", OPT_NO_IGN_EOF, '-', "Do not ignore input EOF"},
+    { "context", OPT_CONTEXT, 's', "Set session ID context" },
+    { "CAfile", OPT_CAFILE, '<', "PEM format file of CA's" },
+    { "CApath", OPT_CAPATH, '/', "PEM format directory of CA's" },
+    { "CAstore", OPT_CASTORE, ':', "URI to store of CA's" },
+    { "no-CAfile", OPT_NOCAFILE, '-',
+        "Do not load the default certificates file" },
+    { "no-CApath", OPT_NOCAPATH, '-',
+        "Do not load certificates from the default certificates directory" },
+    { "no-CAstore", OPT_NOCASTORE, '-',
+        "Do not load certificates from the default certificates store URI" },
+    { "nocert", OPT_NOCERT, '-', "Don't use any certificates (Anon-DH)" },
+    { "verify", OPT_VERIFY, 'n', "Turn on peer certificate verification" },
+    { "Verify", OPT_UPPER_V_VERIFY, 'n',
+        "Turn on peer certificate verification, must have a cert" },
+    { "nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options" },
+    { "cert", OPT_CERT, '<', "Server certificate file to use; default " TEST_CERT },
+    { "cert2", OPT_CERT2, '<',
+        "Certificate file to use for servername; default " TEST_CERT2 },
+    { "certform", OPT_CERTFORM, 'F',
+        "Server certificate file format (PEM/DER/P12); has no effect" },
+    { "cert_chain", OPT_CERT_CHAIN, '<',
+        "Server certificate chain file in PEM format" },
+    { "build_chain", OPT_BUILD_CHAIN, '-', "Build server certificate chain" },
+    { "serverinfo", OPT_SERVERINFO, 's',
+        "PEM serverinfo file for certificate" },
+    { "key", OPT_KEY, 's',
+        "Private key file to use; default is -cert file or else" TEST_CERT },
+    { "key2", OPT_KEY2, '<',
+        "-Private Key file to use for servername if not in -cert2" },
+    { "keyform", OPT_KEYFORM, 'f', "Key format (ENGINE, other values ignored)" },
+    { "pass", OPT_PASS, 's', "Private key and cert file pass phrase source" },
+    { "dcert", OPT_DCERT, '<',
+        "Second server certificate file to use (usually for DSA)" },
+    { "dcertform", OPT_DCERTFORM, 'F',
+        "Second server certificate file format (PEM/DER/P12); has no effect" },
+    { "dcert_chain", OPT_DCERT_CHAIN, '<',
+        "second server certificate chain file in PEM format" },
+    { "dkey", OPT_DKEY, '<',
+        "Second private key file to use (usually for DSA)" },
+    { "dkeyform", OPT_DKEYFORM, 'f',
+        "Second key file format (ENGINE, other values ignored)" },
+    { "dpass", OPT_DPASS, 's',
+        "Second private key and cert file pass phrase source" },
+    { "dhparam", OPT_DHPARAM, '<', "DH parameters file to use" },
+    { "servername", OPT_SERVERNAME, 's',
+        "Servername for HostName TLS extension" },
+    { "servername_fatal", OPT_SERVERNAME_FATAL, '-',
+        "On servername mismatch send fatal alert (default warning alert)" },
+    { "nbio_test", OPT_NBIO_TEST, '-', "Test with the non-blocking test bio" },
+    { "crlf", OPT_CRLF, '-', "Convert LF from terminal into CRLF" },
+    { "quiet", OPT_QUIET, '-', "No server output" },
+    { "no_resume_ephemeral", OPT_NO_RESUME_EPHEMERAL, '-',
+        "Disable caching and tickets if ephemeral (EC)DH is used" },
+    { "www", OPT_WWW, '-', "Respond to a 'GET /' with a status page" },
+    { "WWW", OPT_UPPER_WWW, '-', "Respond to a 'GET with the file ./path" },
+    { "ignore_unexpected_eof", OPT_IGNORE_UNEXPECTED_EOF, '-',
+        "Do not treat lack of close_notify from a peer as an error" },
+    { "tlsextdebug", OPT_TLSEXTDEBUG, '-',
+        "Hex dump of all TLS extensions received" },
+    { "HTTP", OPT_HTTP, '-', "Like -WWW but ./path includes HTTP headers" },
+    { "id_prefix", OPT_ID_PREFIX, 's',
+        "Generate SSL/TLS session IDs prefixed by arg" },
+    { "keymatexport", OPT_KEYMATEXPORT, 's',
+        "Export keying material using label" },
+    { "keymatexportlen", OPT_KEYMATEXPORTLEN, 'p',
+        "Export len bytes of keying material; default 20" },
+    { "CRL", OPT_CRL, '<', "CRL file to use" },
+    { "CRLform", OPT_CRLFORM, 'F', "CRL file format (PEM or DER); default PEM" },
+    { "crl_download", OPT_CRL_DOWNLOAD, '-',
+        "Download CRLs from distribution points in certificate CDP entries" },
+    { "chainCAfile", OPT_CHAINCAFILE, '<',
+        "CA file for certificate chain (PEM format)" },
+    { "chainCApath", OPT_CHAINCAPATH, '/',
+        "use dir as certificate store path to build CA certificate chain" },
+    { "chainCAstore", OPT_CHAINCASTORE, ':',
+        "use URI as certificate store to build CA certificate chain" },
+    { "verifyCAfile", OPT_VERIFYCAFILE, '<',
+        "CA file for certificate verification (PEM format)" },
+    { "verifyCApath", OPT_VERIFYCAPATH, '/',
+        "use dir as certificate store path to verify CA certificate" },
+    { "verifyCAstore", OPT_VERIFYCASTORE, ':',
+        "use URI as certificate store to verify CA certificate" },
+    { "no_cache", OPT_NO_CACHE, '-', "Disable session cache" },
+    { "ext_cache", OPT_EXT_CACHE, '-',
+        "Disable internal cache, set up and use external cache" },
+    { "verify_return_error", OPT_VERIFY_RET_ERROR, '-',
+        "Close connection on verification error" },
+    { "verify_quiet", OPT_VERIFY_QUIET, '-',
+        "No verify output except verify errors" },
+    { "ign_eof", OPT_IGN_EOF, '-', "Ignore input EOF (default when -quiet)" },
+    { "no_ign_eof", OPT_NO_IGN_EOF, '-', "Do not ignore input EOF" },
 #ifndef OPENSSL_NO_COMP_ALG
-    {"cert_comp", OPT_CERT_COMP, '-', "Pre-compress server certificates"},
+    { "cert_comp", OPT_CERT_COMP, '-', "Pre-compress server certificates" },
 #endif
 
 #ifndef OPENSSL_NO_OCSP
     OPT_SECTION("OCSP"),
-    {"status", OPT_STATUS, '-', "Request certificate status from server"},
-    {"status_verbose", OPT_STATUS_VERBOSE, '-',
-     "Print more output in certificate status callback"},
-    {"status_timeout", OPT_STATUS_TIMEOUT, 'n',
-     "Status request responder timeout"},
-    {"status_url", OPT_STATUS_URL, 's', "Status request fallback URL"},
-    {"proxy", OPT_PROXY, 's',
-     "[http[s]://]host[:port][/path] of HTTP(S) proxy to use; path is ignored"},
-    {"no_proxy", OPT_NO_PROXY, 's',
-     "List of addresses of servers not to use HTTP(S) proxy for"},
-    {OPT_MORE_STR, 0, 0,
-     "Default from environment variable 'no_proxy', else 'NO_PROXY', else none"},
-    {"status_file", OPT_STATUS_FILE, '<',
-     "File containing DER encoded OCSP Response"},
+    { "status", OPT_STATUS, '-', "Request certificate status from server" },
+    { "status_verbose", OPT_STATUS_VERBOSE, '-',
+        "Print more output in certificate status callback" },
+    { "status_timeout", OPT_STATUS_TIMEOUT, 'n',
+        "Status request responder timeout" },
+    { "status_url", OPT_STATUS_URL, 's', "Status request fallback URL" },
+    { "proxy", OPT_PROXY, 's',
+        "[http[s]://]host[:port][/path] of HTTP(S) proxy to use; path is ignored" },
+    { "no_proxy", OPT_NO_PROXY, 's',
+        "List of addresses of servers not to use HTTP(S) proxy for" },
+    { OPT_MORE_STR, 0, 0,
+        "Default from environment variable 'no_proxy', else 'NO_PROXY', else none" },
+    { "status_file", OPT_STATUS_FILE, '<',
+        "File containing DER encoded OCSP Response" },
 #endif
 
     OPT_SECTION("Debug"),
-    {"security_debug", OPT_SECURITY_DEBUG, '-',
-     "Print output from SSL/TLS security framework"},
-    {"security_debug_verbose", OPT_SECURITY_DEBUG_VERBOSE, '-',
-     "Print more output from SSL/TLS security framework"},
-    {"brief", OPT_BRIEF, '-',
-     "Restrict output to brief summary of connection parameters"},
-    {"rev", OPT_REV, '-',
-     "act as an echo server that sends back received text reversed"},
-    {"debug", OPT_DEBUG, '-', "Print more output"},
-    {"msg", OPT_MSG, '-', "Show protocol messages"},
-    {"msgfile", OPT_MSGFILE, '>',
-     "File to send output of -msg or -trace, instead of stdout"},
-    {"state", OPT_STATE, '-', "Print the SSL states"},
-    {"async", OPT_ASYNC, '-', "Operate in asynchronous mode"},
-    {"max_pipelines", OPT_MAX_PIPELINES, 'p',
-     "Maximum number of encrypt/decrypt pipelines to be used"},
-    {"naccept", OPT_NACCEPT, 'p', "Terminate after #num connections"},
-    {"keylogfile", OPT_KEYLOG_FILE, '>', "Write TLS secrets to file"},
+    { "security_debug", OPT_SECURITY_DEBUG, '-',
+        "Print output from SSL/TLS security framework" },
+    { "security_debug_verbose", OPT_SECURITY_DEBUG_VERBOSE, '-',
+        "Print more output from SSL/TLS security framework" },
+    { "brief", OPT_BRIEF, '-',
+        "Restrict output to brief summary of connection parameters" },
+    { "rev", OPT_REV, '-',
+        "act as an echo server that sends back received text reversed" },
+    { "debug", OPT_DEBUG, '-', "Print more output" },
+    { "msg", OPT_MSG, '-', "Show protocol messages" },
+    { "msgfile", OPT_MSGFILE, '>',
+        "File to send output of -msg or -trace, instead of stdout" },
+    { "state", OPT_STATE, '-', "Print the SSL states" },
+    { "async", OPT_ASYNC, '-', "Operate in asynchronous mode" },
+    { "max_pipelines", OPT_MAX_PIPELINES, 'p',
+        "Maximum number of encrypt/decrypt pipelines to be used" },
+    { "naccept", OPT_NACCEPT, 'p', "Terminate after #num connections" },
+    { "keylogfile", OPT_KEYLOG_FILE, '>', "Write TLS secrets to file" },
 
     OPT_SECTION("Network"),
-    {"nbio", OPT_NBIO, '-', "Use non-blocking IO"},
-    {"timeout", OPT_TIMEOUT, '-', "Enable timeouts"},
-    {"mtu", OPT_MTU, 'p', "Set link-layer MTU"},
-    {"read_buf", OPT_READ_BUF, 'p',
-     "Default read buffer size to be used for connections"},
-    {"split_send_frag", OPT_SPLIT_SEND_FRAG, 'p',
-     "Size used to split data for encrypt pipelines"},
-    {"max_send_frag", OPT_MAX_SEND_FRAG, 'p', "Maximum Size of send frames "},
+    { "nbio", OPT_NBIO, '-', "Use non-blocking IO" },
+    { "timeout", OPT_TIMEOUT, '-', "Enable timeouts" },
+    { "mtu", OPT_MTU, 'p', "Set link-layer MTU" },
+    { "read_buf", OPT_READ_BUF, 'p',
+        "Default read buffer size to be used for connections" },
+    { "split_send_frag", OPT_SPLIT_SEND_FRAG, 'p',
+        "Size used to split data for encrypt pipelines" },
+    { "max_send_frag", OPT_MAX_SEND_FRAG, 'p', "Maximum Size of send frames " },
 
     OPT_SECTION("Server identity"),
-    {"psk_identity", OPT_PSK_IDENTITY, 's', "PSK identity to expect"},
+    { "psk_identity", OPT_PSK_IDENTITY, 's', "PSK identity to expect" },
 #ifndef OPENSSL_NO_PSK
-    {"psk_hint", OPT_PSK_HINT, 's', "PSK identity hint to use"},
+    { "psk_hint", OPT_PSK_HINT, 's', "PSK identity hint to use" },
 #endif
-    {"psk", OPT_PSK, 's', "PSK in hex (without 0x)"},
-    {"psk_session", OPT_PSK_SESS, '<', "File to read PSK SSL session from"},
+    { "psk", OPT_PSK, 's', "PSK in hex (without 0x)" },
+    { "psk_session", OPT_PSK_SESS, '<', "File to read PSK SSL session from" },
 #ifndef OPENSSL_NO_SRP
-    {"srpvfile", OPT_SRPVFILE, '<', "(deprecated) The verifier file for SRP"},
-    {"srpuserseed", OPT_SRPUSERSEED, 's',
-     "(deprecated) A seed string for a default user salt"},
+    { "srpvfile", OPT_SRPVFILE, '<', "(deprecated) The verifier file for SRP" },
+    { "srpuserseed", OPT_SRPUSERSEED, 's',
+        "(deprecated) A seed string for a default user salt" },
 #endif
 
     OPT_SECTION("Protocol and version"),
-    {"max_early_data", OPT_MAX_EARLY, 'n',
-     "The maximum number of bytes of early data as advertised in tickets"},
-    {"recv_max_early_data", OPT_RECV_MAX_EARLY, 'n',
-     "The maximum number of bytes of early data (hard limit)"},
-    {"early_data", OPT_EARLY_DATA, '-', "Attempt to read early data"},
-    {"num_tickets", OPT_S_NUM_TICKETS, 'n',
-     "The number of TLSv1.3 session tickets that a server will automatically issue" },
-    {"anti_replay", OPT_ANTI_REPLAY, '-', "Switch on anti-replay protection (default)"},
-    {"no_anti_replay", OPT_NO_ANTI_REPLAY, '-', "Switch off anti-replay protection"},
-    {"http_server_binmode", OPT_HTTP_SERVER_BINMODE, '-', "opening files in binary mode when acting as http server (-WWW and -HTTP)"},
-    {"no_ca_names", OPT_NOCANAMES, '-',
-     "Disable TLS Extension CA Names"},
-    {"stateless", OPT_STATELESS, '-', "Require TLSv1.3 cookies"},
+    { "max_early_data", OPT_MAX_EARLY, 'n',
+        "The maximum number of bytes of early data as advertised in tickets" },
+    { "recv_max_early_data", OPT_RECV_MAX_EARLY, 'n',
+        "The maximum number of bytes of early data (hard limit)" },
+    { "early_data", OPT_EARLY_DATA, '-', "Attempt to read early data" },
+    { "num_tickets", OPT_S_NUM_TICKETS, 'n',
+        "The number of TLSv1.3 session tickets that a server will automatically issue" },
+    { "anti_replay", OPT_ANTI_REPLAY, '-', "Switch on anti-replay protection (default)" },
+    { "no_anti_replay", OPT_NO_ANTI_REPLAY, '-', "Switch off anti-replay protection" },
+    { "http_server_binmode", OPT_HTTP_SERVER_BINMODE, '-', "opening files in binary mode when acting as http server (-WWW and -HTTP)" },
+    { "no_ca_names", OPT_NOCANAMES, '-',
+        "Disable TLS Extension CA Names" },
+    { "stateless", OPT_STATELESS, '-', "Require TLSv1.3 cookies" },
 #ifndef OPENSSL_NO_SSL3
-    {"ssl3", OPT_SSL3, '-', "Just talk SSLv3"},
+    { "ssl3", OPT_SSL3, '-', "Just talk SSLv3" },
 #endif
 #ifndef OPENSSL_NO_TLS1
-    {"tls1", OPT_TLS1, '-', "Just talk TLSv1"},
+    { "tls1", OPT_TLS1, '-', "Just talk TLSv1" },
 #endif
 #ifndef OPENSSL_NO_TLS1_1
-    {"tls1_1", OPT_TLS1_1, '-', "Just talk TLSv1.1"},
+    { "tls1_1", OPT_TLS1_1, '-', "Just talk TLSv1.1" },
 #endif
 #ifndef OPENSSL_NO_TLS1_2
-    {"tls1_2", OPT_TLS1_2, '-', "just talk TLSv1.2"},
+    { "tls1_2", OPT_TLS1_2, '-', "just talk TLSv1.2" },
 #endif
 #ifndef OPENSSL_NO_TLS1_3
-    {"tls1_3", OPT_TLS1_3, '-', "just talk TLSv1.3"},
+    { "tls1_3", OPT_TLS1_3, '-', "just talk TLSv1.3" },
 #endif
 #ifndef OPENSSL_NO_DTLS
-    {"dtls", OPT_DTLS, '-', "Use any DTLS version"},
-    {"listen", OPT_LISTEN, '-',
-     "Listen for a DTLS ClientHello with a cookie and then connect"},
+    { "dtls", OPT_DTLS, '-', "Use any DTLS version" },
+    { "listen", OPT_LISTEN, '-',
+        "Listen for a DTLS ClientHello with a cookie and then connect" },
 #endif
 #ifndef OPENSSL_NO_DTLS1
-    {"dtls1", OPT_DTLS1, '-', "Just talk DTLSv1"},
+    { "dtls1", OPT_DTLS1, '-', "Just talk DTLSv1" },
 #endif
 #ifndef OPENSSL_NO_DTLS1_2
-    {"dtls1_2", OPT_DTLS1_2, '-', "Just talk DTLSv1.2"},
+    { "dtls1_2", OPT_DTLS1_2, '-', "Just talk DTLSv1.2" },
 #endif
 #ifndef OPENSSL_NO_SCTP
-    {"sctp", OPT_SCTP, '-', "Use SCTP"},
-    {"sctp_label_bug", OPT_SCTP_LABEL_BUG, '-', "Enable SCTP label length bug"},
+    { "sctp", OPT_SCTP, '-', "Use SCTP" },
+    { "sctp_label_bug", OPT_SCTP_LABEL_BUG, '-', "Enable SCTP label length bug" },
 #endif
 #ifndef OPENSSL_NO_SRTP
-    {"use_srtp", OPT_SRTP_PROFILES, 's',
-     "Offer SRTP key management with a colon-separated profile list"},
+    { "use_srtp", OPT_SRTP_PROFILES, 's',
+        "Offer SRTP key management with a colon-separated profile list" },
 #endif
-    {"no_dhe", OPT_NO_DHE, '-', "Disable ephemeral DH"},
+    { "no_dhe", OPT_NO_DHE, '-', "Disable ephemeral DH" },
 #ifndef OPENSSL_NO_NEXTPROTONEG
-    {"nextprotoneg", OPT_NEXTPROTONEG, 's',
-     "Set the advertised protocols for the NPN extension (comma-separated list)"},
+    { "nextprotoneg", OPT_NEXTPROTONEG, 's',
+        "Set the advertised protocols for the NPN extension (comma-separated list)" },
 #endif
-    {"alpn", OPT_ALPN, 's',
-     "Set the advertised protocols for the ALPN extension (comma-separated list)"},
+    { "alpn", OPT_ALPN, 's',
+        "Set the advertised protocols for the ALPN extension (comma-separated list)" },
 #ifndef OPENSSL_NO_KTLS
-    {"ktls", OPT_KTLS, '-', "Enable Kernel TLS for sending and receiving"},
-    {"sendfile", OPT_SENDFILE, '-', "Use sendfile to response file with -WWW"},
-    {"zerocopy_sendfile", OPT_USE_ZC_SENDFILE, '-', "Use zerocopy mode of KTLS sendfile"},
+    { "ktls", OPT_KTLS, '-', "Enable Kernel TLS for sending and receiving" },
+    { "sendfile", OPT_SENDFILE, '-', "Use sendfile to response file with -WWW" },
+    { "zerocopy_sendfile", OPT_USE_ZC_SENDFILE, '-', "Use zerocopy mode of KTLS sendfile" },
 #endif
-    {"enable_server_rpk", OPT_ENABLE_SERVER_RPK, '-', "Enable raw public keys (RFC7250) from the server"},
-    {"enable_client_rpk", OPT_ENABLE_CLIENT_RPK, '-', "Enable raw public keys (RFC7250) from the client"},
+    { "enable_server_rpk", OPT_ENABLE_SERVER_RPK, '-', "Enable raw public keys (RFC7250) from the server" },
+    { "enable_client_rpk", OPT_ENABLE_CLIENT_RPK, '-', "Enable raw public keys (RFC7250) from the client" },
     OPT_R_OPTIONS,
     OPT_S_OPTIONS,
     OPT_V_OPTIONS,
     OPT_X_OPTIONS,
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
-#define IS_PROT_FLAG(o) \
- (o == OPT_SSL3 || o == OPT_TLS1 || o == OPT_TLS1_1 || o == OPT_TLS1_2 \
-  || o == OPT_TLS1_3 || o == OPT_DTLS || o == OPT_DTLS1 || o == OPT_DTLS1_2)
+#define IS_PROT_FLAG(o)                                                   \
+    (o == OPT_SSL3 || o == OPT_TLS1 || o == OPT_TLS1_1 || o == OPT_TLS1_2 \
+        || o == OPT_TLS1_3 || o == OPT_DTLS || o == OPT_DTLS1 || o == OPT_DTLS1_2)
 
 int s_server_main(int argc, char *argv[])
 {
@@ -1120,7 +1216,7 @@ int s_server_main(int argc, char *argv[])
     if (port == NULL || cctx == NULL || vpm == NULL)
         goto end;
     SSL_CONF_CTX_set_flags(cctx,
-                           SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CMDLINE);
+        SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CMDLINE);
 
     prog = opt_init(argc, argv, s_server_options);
     while ((o = opt_next()) != OPT_EOF) {
@@ -1132,13 +1228,13 @@ int s_server_main(int argc, char *argv[])
             no_prot_opt++;
         if (prot_opt == 1 && no_prot_opt) {
             BIO_printf(bio_err,
-                       "Cannot supply both a protocol flag and '-no_<prot>'\n");
+                "Cannot supply both a protocol flag and '-no_<prot>'\n");
             goto end;
         }
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -1149,8 +1245,10 @@ int s_server_main(int argc, char *argv[])
         case OPT_4:
 #ifdef AF_UNIX
             if (socket_family == AF_UNIX) {
-                OPENSSL_free(host); host = NULL;
-                OPENSSL_free(port); port = NULL;
+                OPENSSL_free(host);
+                host = NULL;
+                OPENSSL_free(port);
+                port = NULL;
             }
 #endif
             socket_family = AF_INET;
@@ -1160,8 +1258,10 @@ int s_server_main(int argc, char *argv[])
 #ifdef AF_INET6
 #ifdef AF_UNIX
                 if (socket_family == AF_UNIX) {
-                    OPENSSL_free(host); host = NULL;
-                    OPENSSL_free(port); port = NULL;
+                    OPENSSL_free(host);
+                    host = NULL;
+                    OPENSSL_free(port);
+                    port = NULL;
                 }
 #endif
                 socket_family = AF_INET6;
@@ -1177,12 +1277,14 @@ int s_server_main(int argc, char *argv[])
                 socket_family = AF_UNSPEC;
             }
 #endif
-            OPENSSL_free(port); port = NULL;
-            OPENSSL_free(host); host = NULL;
+            OPENSSL_free(port);
+            port = NULL;
+            OPENSSL_free(host);
+            host = NULL;
             if (BIO_parse_hostserv(opt_arg(), NULL, &port, BIO_PARSE_PRIO_SERV) < 1) {
                 BIO_printf(bio_err,
-                           "%s: -port argument malformed or ambiguous\n",
-                           port);
+                    "%s: -port argument malformed or ambiguous\n",
+                    prog);
                 goto end;
             }
             break;
@@ -1192,22 +1294,26 @@ int s_server_main(int argc, char *argv[])
                 socket_family = AF_UNSPEC;
             }
 #endif
-            OPENSSL_free(port); port = NULL;
-            OPENSSL_free(host); host = NULL;
+            OPENSSL_free(port);
+            port = NULL;
+            OPENSSL_free(host);
+            host = NULL;
             if (BIO_parse_hostserv(opt_arg(), &host, &port, BIO_PARSE_PRIO_SERV) < 1) {
                 BIO_printf(bio_err,
-                           "%s: -accept argument malformed or ambiguous\n",
-                           port);
+                    "%s: -accept argument malformed or ambiguous\n",
+                    prog);
                 goto end;
             }
             break;
 #ifdef AF_UNIX
         case OPT_UNIX:
             socket_family = AF_UNIX;
-            OPENSSL_free(host); host = OPENSSL_strdup(opt_arg());
+            OPENSSL_free(host);
+            host = OPENSSL_strdup(opt_arg());
             if (host == NULL)
                 goto end;
-            OPENSSL_free(port); port = NULL;
+            OPENSSL_free(port);
+            port = NULL;
             break;
         case OPT_UNLINK:
             unlink_unix_path = 1;
@@ -1223,14 +1329,12 @@ int s_server_main(int argc, char *argv[])
                 BIO_printf(bio_err, "verify depth is %d\n", verify_args.depth);
             break;
         case OPT_UPPER_V_VERIFY:
-            s_server_verify =
-                SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT |
-                SSL_VERIFY_CLIENT_ONCE;
+            s_server_verify = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE;
             verify_args.depth = atoi(opt_arg());
             if (!s_quiet)
                 BIO_printf(bio_err,
-                           "verify depth is %d, must return a certificate\n",
-                           verify_args.depth);
+                    "verify depth is %d, must return a certificate\n",
+                    verify_args.depth);
             break;
         case OPT_CONTEXT:
             context = (unsigned char *)opt_arg();
@@ -1419,8 +1523,8 @@ int s_server_main(int argc, char *argv[])
 #ifndef OPENSSL_NO_OCSP
             s_tlsextstatus = 1;
             if (!OSSL_HTTP_parse_url(opt_arg(), &tlscstatp.use_ssl, NULL,
-                                     &tlscstatp.host, &tlscstatp.port, NULL,
-                                     &tlscstatp.path, NULL, NULL)) {
+                    &tlscstatp.host, &tlscstatp.port, NULL,
+                    &tlscstatp.path, NULL, NULL)) {
                 BIO_printf(bio_err, "Error parsing -status_url argument\n");
                 goto end;
             }
@@ -1618,7 +1722,7 @@ int s_server_main(int argc, char *argv[])
             s_key_file2 = opt_arg();
             break;
         case OPT_NEXTPROTONEG:
-# ifndef OPENSSL_NO_NEXTPROTONEG
+#ifndef OPENSSL_NO_NEXTPROTONEG
             next_proto_neg_in = opt_arg();
 #endif
             break;
@@ -1755,13 +1859,13 @@ int s_server_main(int argc, char *argv[])
 #ifdef AF_UNIX
     if (socket_family == AF_UNIX && socket_type != SOCK_STREAM) {
         BIO_printf(bio_err,
-                   "Can't use unix sockets and datagrams together\n");
+            "Can't use unix sockets and datagrams together\n");
         goto end;
     }
 #endif
     if (early_data && rev) {
         BIO_printf(bio_err,
-                   "Can't use -early_data in combination with -rev\n");
+            "Can't use -early_data in combination with -rev\n");
         goto end;
     }
 
@@ -1809,29 +1913,29 @@ int s_server_main(int argc, char *argv[])
 
     if (nocert == 0) {
         s_key = load_key(s_key_file, s_key_format, 0, pass, engine,
-                         "server certificate private key");
+            "server certificate private key");
         if (s_key == NULL)
             goto end;
 
         s_cert = load_cert_pass(s_cert_file, s_cert_format, 1, pass,
-                                "server certificate");
+            "server certificate");
 
         if (s_cert == NULL)
             goto end;
         if (s_chain_file != NULL) {
             if (!load_certs(s_chain_file, 0, &s_chain, NULL,
-                            "server certificate chain"))
+                    "server certificate chain"))
                 goto end;
         }
 
         if (tlsextcbp.servername != NULL) {
             s_key2 = load_key(s_key_file2, s_key_format, 0, pass, engine,
-                              "second server certificate private key");
+                "second server certificate private key");
             if (s_key2 == NULL)
                 goto end;
 
             s_cert2 = load_cert_pass(s_cert_file2, s_cert_format, 1, pass,
-                                "second server certificate");
+                "second server certificate");
 
             if (s_cert2 == NULL)
                 goto end;
@@ -1871,12 +1975,12 @@ int s_server_main(int argc, char *argv[])
             s_dkey_file = s_dcert_file;
 
         s_dkey = load_key(s_dkey_file, s_dkey_format,
-                          0, dpass, engine, "second certificate private key");
+            0, dpass, engine, "second certificate private key");
         if (s_dkey == NULL)
             goto end;
 
         s_dcert = load_cert_pass(s_dcert_file, s_dcert_format, 1, dpass,
-                                 "second server certificate");
+            "second server certificate");
 
         if (s_dcert == NULL) {
             ERR_print_errors(bio_err);
@@ -1884,10 +1988,9 @@ int s_server_main(int argc, char *argv[])
         }
         if (s_dchain_file != NULL) {
             if (!load_certs(s_dchain_file, 0, &s_dchain, NULL,
-                            "second server certificate chain"))
+                    "second server certificate chain"))
                 goto end;
         }
-
     }
 
     if (bio_s_out == NULL) {
@@ -1934,7 +2037,7 @@ int s_server_main(int argc, char *argv[])
     if (ssl_config) {
         if (SSL_CTX_config(ctx, ssl_config) == 0) {
             BIO_printf(bio_err, "Error using configuration \"%s\"\n",
-                       ssl_config);
+                ssl_config);
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -1954,7 +2057,7 @@ int s_server_main(int argc, char *argv[])
     if (session_id_prefix) {
         if (strlen(session_id_prefix) >= 32)
             BIO_printf(bio_err,
-                       "warning: id_prefix is too long, only one new session will be possible\n");
+                "warning: id_prefix is too long, only one new session will be possible\n");
         if (!SSL_CTX_set_generate_session_id(ctx, generate_session_id)) {
             BIO_printf(bio_err, "error setting 'id_prefix'\n");
             ERR_print_errors(bio_err);
@@ -1994,20 +2097,20 @@ int s_server_main(int argc, char *argv[])
     if (max_send_fragment > 0
         && !SSL_CTX_set_max_send_fragment(ctx, max_send_fragment)) {
         BIO_printf(bio_err, "%s: Max send fragment size %u is out of permitted range\n",
-                   prog, max_send_fragment);
+            prog, max_send_fragment);
         goto end;
     }
 
     if (split_send_fragment > 0
         && !SSL_CTX_set_split_send_fragment(ctx, split_send_fragment)) {
         BIO_printf(bio_err, "%s: Split send fragment size %u is out of permitted range\n",
-                   prog, split_send_fragment);
+            prog, split_send_fragment);
         goto end;
     }
     if (max_pipelines > 0
         && !SSL_CTX_set_max_pipelines(ctx, max_pipelines)) {
         BIO_printf(bio_err, "%s: Max pipelines %u is out of permitted range\n",
-                   prog, max_pipelines);
+            prog, max_pipelines);
         goto end;
     }
 
@@ -2026,7 +2129,7 @@ int s_server_main(int argc, char *argv[])
 #endif
 
     if (!ctx_set_verify_locations(ctx, CAfile, noCAfile, CApath, noCApath,
-                                  CAstore, noCAstore)) {
+            CAstore, noCAstore)) {
         ERR_print_errors(bio_err);
         goto end;
     }
@@ -2039,9 +2142,9 @@ int s_server_main(int argc, char *argv[])
     ssl_ctx_add_crls(ctx, crls, 0);
 
     if (!ssl_load_stores(ctx,
-                         vfyCApath, vfyCAfile, vfyCAstore,
-                         chCApath, chCAfile, chCAstore,
-                         crls, crl_download)) {
+            vfyCApath, vfyCAfile, vfyCAstore,
+            chCApath, chCAfile, chCAstore,
+            crls, crl_download)) {
         BIO_printf(bio_err, "Error loading store locations\n");
         ERR_print_errors(bio_err);
         goto end;
@@ -2064,7 +2167,7 @@ int s_server_main(int argc, char *argv[])
         if (session_id_prefix) {
             if (strlen(session_id_prefix) >= 32)
                 BIO_printf(bio_err,
-                           "warning: id_prefix is too long, only one new session will be possible\n");
+                    "warning: id_prefix is too long, only one new session will be possible\n");
             if (!SSL_CTX_set_generate_session_id(ctx2, generate_session_id)) {
                 BIO_printf(bio_err, "error setting 'id_prefix'\n");
                 ERR_print_errors(bio_err);
@@ -2089,7 +2192,7 @@ int s_server_main(int argc, char *argv[])
             SSL_CTX_set_mode(ctx2, SSL_MODE_ASYNC);
 
         if (!ctx_set_verify_locations(ctx2, CAfile, noCAfile, CApath,
-                                      noCApath, CAstore, noCAstore)) {
+                noCApath, CAstore, noCAstore)) {
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -2106,7 +2209,7 @@ int s_server_main(int argc, char *argv[])
 #ifndef OPENSSL_NO_NEXTPROTONEG
     if (next_proto.data)
         SSL_CTX_set_next_protos_advertised_cb(ctx, next_proto_cb,
-                                              &next_proto);
+            &next_proto);
 #endif
     if (alpn_ctx.data)
         SSL_CTX_set_alpn_select_cb(ctx, alpn_cb, &alpn_ctx);
@@ -2118,7 +2221,7 @@ int s_server_main(int argc, char *argv[])
             dhpkey = load_keyparams(dhfile, FORMAT_UNDEF, 0, "DH", "DH parameters");
         else if (s_cert_file != NULL)
             dhpkey = load_keyparams_suppress(s_cert_file, FORMAT_UNDEF, 0, "DH",
-                                             "DH parameters", 1);
+                "DH parameters", 1);
 
         if (dhpkey != NULL) {
             BIO_printf(bio_s_out, "Setting temp DH parameters\n");
@@ -2151,9 +2254,9 @@ int s_server_main(int argc, char *argv[])
         if (ctx2 != NULL) {
             if (dhfile != NULL) {
                 EVP_PKEY *dhpkey2 = load_keyparams_suppress(s_cert_file2,
-                                                            FORMAT_UNDEF,
-                                                            0, "DH",
-                                                            "DH parameters", 1);
+                    FORMAT_UNDEF,
+                    0, "DH",
+                    "DH parameters", 1);
 
                 if (dhpkey2 != NULL) {
                     BIO_printf(bio_s_out, "Setting temp DH parameters\n");
@@ -2196,11 +2299,11 @@ int s_server_main(int argc, char *argv[])
 
     if (no_resume_ephemeral) {
         SSL_CTX_set_not_resumable_session_callback(ctx,
-                                                   not_resumable_sess_cb);
+            not_resumable_sess_cb);
 
         if (ctx2 != NULL)
             SSL_CTX_set_not_resumable_session_callback(ctx2,
-                                                       not_resumable_sess_cb);
+                not_resumable_sess_cb);
     }
 #ifndef OPENSSL_NO_PSK
     if (psk_key != NULL) {
@@ -2236,7 +2339,6 @@ int s_server_main(int argc, char *argv[])
             ERR_print_errors(bio_err);
             goto end;
         }
-
     }
 
     if (psk_key != NULL || psksess != NULL)
@@ -2244,8 +2346,8 @@ int s_server_main(int argc, char *argv[])
 
     SSL_CTX_set_verify(ctx, s_server_verify, verify_callback);
     if (!SSL_CTX_set_session_id_context(ctx,
-                                        (void *)&s_server_session_id_context,
-                                        sizeof(s_server_session_id_context))) {
+            (void *)&s_server_session_id_context,
+            sizeof(s_server_session_id_context))) {
         BIO_printf(bio_err, "error setting session id context\n");
         ERR_print_errors(bio_err);
         goto end;
@@ -2262,8 +2364,8 @@ int s_server_main(int argc, char *argv[])
     if (ctx2 != NULL) {
         SSL_CTX_set_verify(ctx2, s_server_verify, verify_callback);
         if (!SSL_CTX_set_session_id_context(ctx2,
-                    (void *)&s_server_session_id_context,
-                    sizeof(s_server_session_id_context))) {
+                (void *)&s_server_session_id_context,
+                sizeof(s_server_session_id_context))) {
             BIO_printf(bio_err, "error setting session id context\n");
             ERR_print_errors(bio_err);
             goto end;
@@ -2278,11 +2380,11 @@ int s_server_main(int argc, char *argv[])
 #ifndef OPENSSL_NO_SRP
     if (srp_verifier_file != NULL) {
         if (!set_up_srp_verifier_file(ctx, &srp_callback_parm, srpuserseed,
-                                      srp_verifier_file))
+                srp_verifier_file))
             goto end;
     } else
 #endif
-    if (CAfile != NULL) {
+        if (CAfile != NULL) {
         SSL_CTX_set_client_CA_list(ctx, SSL_load_client_CA_file(CAfile));
 
         if (ctx2)
@@ -2338,10 +2440,10 @@ int s_server_main(int argc, char *argv[])
     if (tfo)
         BIO_printf(bio_s_out, "Listening for TFO\n");
     do_server(&accept_socket, host, port, socket_family, socket_type, protocol,
-              server_cb, context, naccept, bio_s_out, tfo);
+        server_cb, context, naccept, bio_s_out, tfo);
     print_stats(bio_s_out, ctx);
     ret = 0;
- end:
+end:
     SSL_CTX_free(ctx);
     SSL_SESSION_free(psksess);
     set_keylog_file(NULL, NULL);
@@ -2385,38 +2487,38 @@ int s_server_main(int argc, char *argv[])
 static void print_stats(BIO *bio, SSL_CTX *ssl_ctx)
 {
     BIO_printf(bio, "%4ld items in the session cache\n",
-               SSL_CTX_sess_number(ssl_ctx));
+        SSL_CTX_sess_number(ssl_ctx));
     BIO_printf(bio, "%4ld client connects (SSL_connect())\n",
-               SSL_CTX_sess_connect(ssl_ctx));
+        SSL_CTX_sess_connect(ssl_ctx));
     BIO_printf(bio, "%4ld client renegotiates (SSL_connect())\n",
-               SSL_CTX_sess_connect_renegotiate(ssl_ctx));
+        SSL_CTX_sess_connect_renegotiate(ssl_ctx));
     BIO_printf(bio, "%4ld client connects that finished\n",
-               SSL_CTX_sess_connect_good(ssl_ctx));
+        SSL_CTX_sess_connect_good(ssl_ctx));
     BIO_printf(bio, "%4ld server accepts (SSL_accept())\n",
-               SSL_CTX_sess_accept(ssl_ctx));
+        SSL_CTX_sess_accept(ssl_ctx));
     BIO_printf(bio, "%4ld server renegotiates (SSL_accept())\n",
-               SSL_CTX_sess_accept_renegotiate(ssl_ctx));
+        SSL_CTX_sess_accept_renegotiate(ssl_ctx));
     BIO_printf(bio, "%4ld server accepts that finished\n",
-               SSL_CTX_sess_accept_good(ssl_ctx));
+        SSL_CTX_sess_accept_good(ssl_ctx));
     BIO_printf(bio, "%4ld session cache hits\n", SSL_CTX_sess_hits(ssl_ctx));
     BIO_printf(bio, "%4ld session cache misses\n",
-               SSL_CTX_sess_misses(ssl_ctx));
+        SSL_CTX_sess_misses(ssl_ctx));
     BIO_printf(bio, "%4ld session cache timeouts\n",
-               SSL_CTX_sess_timeouts(ssl_ctx));
+        SSL_CTX_sess_timeouts(ssl_ctx));
     BIO_printf(bio, "%4ld callback cache hits\n",
-               SSL_CTX_sess_cb_hits(ssl_ctx));
+        SSL_CTX_sess_cb_hits(ssl_ctx));
     BIO_printf(bio, "%4ld cache full overflows (%ld allowed)\n",
-               SSL_CTX_sess_cache_full(ssl_ctx),
-               SSL_CTX_sess_get_cache_size(ssl_ctx));
+        SSL_CTX_sess_cache_full(ssl_ctx),
+        SSL_CTX_sess_get_cache_size(ssl_ctx));
 }
 
 static long int count_reads_callback(BIO *bio, int cmd, const char *argp, size_t len,
-                                 int argi, long argl, int ret, size_t *processed)
+    int argi, long argl, int ret, size_t *processed)
 {
     unsigned int *p_counter = (unsigned int *)BIO_get_callback_arg(bio);
 
     switch (cmd) {
-    case BIO_CB_READ:  /* No break here */
+    case BIO_CB_READ: /* No break here */
     case BIO_CB_GETS:
         if (p_counter != NULL)
             ++*p_counter;
@@ -2448,11 +2550,11 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
     struct timeval *timeoutp;
 #endif
 #ifndef OPENSSL_NO_DTLS
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
     int isdtls = (stype == SOCK_DGRAM || prot == IPPROTO_SCTP);
-# else
+#else
     int isdtls = (stype == SOCK_DGRAM);
-# endif
+#endif
 #endif
 
     buf = app_malloc(bufsize, "server buffer");
@@ -2476,7 +2578,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
 
     if (context != NULL
         && !SSL_set_session_id_context(con, context,
-                                       strlen((char *)context))) {
+            strlen((char *)context))) {
         BIO_printf(bio_err, "Error setting session id context\n");
         ret = -1;
         goto err;
@@ -2489,11 +2591,11 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
     }
 #ifndef OPENSSL_NO_DTLS
     if (isdtls) {
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
         if (prot == IPPROTO_SCTP)
             sbio = BIO_new_dgram_sctp(s, BIO_NOCLOSE);
         else
-# endif
+#endif
             sbio = BIO_new_dgram(s, BIO_NOCLOSE);
         if (sbio == NULL) {
             BIO_printf(bio_err, "Unable to create BIO\n");
@@ -2514,7 +2616,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
         if (socket_mtu) {
             if (socket_mtu < DTLS_get_link_min_mtu(con)) {
                 BIO_printf(bio_err, "MTU too small. Must be at least %ld\n",
-                           DTLS_get_link_min_mtu(con));
+                    DTLS_get_link_min_mtu(con));
                 ret = -1;
                 BIO_free(sbio);
                 goto err;
@@ -2530,9 +2632,9 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
             /* want to do MTU discovery */
             BIO_ctrl(sbio, BIO_CTRL_DGRAM_MTU_DISCOVER, 0, NULL);
 
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
         if (prot != IPPROTO_SCTP)
-# endif
+#endif
             /* Turn on cookie exchange. Not necessary for SCTP */
             SSL_set_options(con, SSL_OP_COOKIE_EXCHANGE);
     } else
@@ -2632,7 +2734,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
 
         read_from_terminal = 0;
         read_from_sslcon = SSL_has_pending(con)
-                           || (async && SSL_waiting_for_async(con));
+            || (async && SSL_waiting_for_async(con));
 
         if (!read_from_sslcon) {
             FD_ZERO(&readfds);
@@ -2730,18 +2832,16 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
                 }
                 if ((buf[0] == 'R') && ((buf[1] == '\n') || (buf[1] == '\r'))) {
                     SSL_set_verify(con,
-                                   SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE,
-                                   NULL);
+                        SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE,
+                        NULL);
                     SSL_renegotiate(con);
                     i = SSL_do_handshake(con);
                     printf("SSL_do_handshake -> %d\n", i);
                     continue;
                 }
                 if ((buf[0] == 'K' || buf[0] == 'k')
-                        && ((buf[1] == '\n') || (buf[1] == '\r'))) {
-                    SSL_key_update(con, buf[0] == 'K' ?
-                                        SSL_KEY_UPDATE_REQUESTED
-                                        : SSL_KEY_UPDATE_NOT_REQUESTED);
+                    && ((buf[1] == '\n') || (buf[1] == '\r'))) {
+                    SSL_key_update(con, buf[0] == 'K' ? SSL_KEY_UPDATE_REQUESTED : SSL_KEY_UPDATE_NOT_REQUESTED);
                     i = SSL_do_handshake(con);
                     printf("SSL_do_handshake -> %d\n", i);
                     continue;
@@ -2760,7 +2860,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
                 }
                 if (buf[0] == 'P') {
                     static const char str[] = "Lets print some clear text\n";
-                    BIO_write(SSL_get_wbio(con), str, sizeof(str) -1);
+                    BIO_write(SSL_get_wbio(con), str, sizeof(str) - 1);
                 }
                 if (buf[0] == 'S') {
                     print_stats(bio_s_out, SSL_get_SSL_CTX(con));
@@ -2836,7 +2936,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
              * init_ssl_connection
              */
             if ((!async || !SSL_waiting_for_async(con))
-                    && !SSL_is_init_finished(con)) {
+                && !SSL_is_init_finished(con)) {
                 /*
                  * Count number of reads during init_ssl_connection.
                  * It helps us to distinguish configuration errors from errors
@@ -2864,7 +2964,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
                     goto err;
                 }
             } else {
- again:
+            again:
                 i = SSL_read(con, (char *)buf, bufsize);
 #ifndef OPENSSL_NO_SRP
                 while (SSL_get_error(con, i) == SSL_ERROR_WANT_X509_LOOKUP) {
@@ -2915,7 +3015,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
             }
         }
     }
- err:
+err:
     if (con != NULL) {
         BIO_printf(bio_s_out, "shutting down SSL\n");
         do_ssl_shutdown(con);
@@ -2940,8 +3040,8 @@ static int is_retryable(SSL *con, int i)
 
     /* If it's not a fatal error, it must be retryable */
     return (err != SSL_ERROR_SSL)
-           && (err != SSL_ERROR_SYSCALL)
-           && (err != SSL_ERROR_ZERO_RETURN);
+        && (err != SSL_ERROR_SYSCALL)
+        && (err != SSL_ERROR_ZERO_RETURN);
 }
 
 static int init_ssl_connection(SSL *con)
@@ -2997,10 +3097,10 @@ static int init_ssl_connection(SSL *con)
 #ifdef CERT_CB_TEST_RETRY
             {
                 while (i <= 0
-                        && SSL_get_error(con, i) == SSL_ERROR_WANT_X509_LOOKUP
-                        && SSL_get_state(con) == TLS_ST_SR_CLNT_HELLO) {
+                    && SSL_get_error(con, i) == SSL_ERROR_WANT_X509_LOOKUP
+                    && SSL_get_state(con) == TLS_ST_SR_CLNT_HELLO) {
                     BIO_printf(bio_err,
-                               "LOOKUP from certificate callback during accept\n");
+                        "LOOKUP from certificate callback during accept\n");
                     i = SSL_accept(con);
                     if (i <= 0)
                         retry = is_retryable(con, i);
@@ -3010,9 +3110,9 @@ static int init_ssl_connection(SSL *con)
 
 #ifndef OPENSSL_NO_SRP
             while (i <= 0
-                   && SSL_get_error(con, i) == SSL_ERROR_WANT_X509_LOOKUP) {
+                && SSL_get_error(con, i) == SSL_ERROR_WANT_X509_LOOKUP) {
                 BIO_printf(bio_s_out, "LOOKUP during accept %s\n",
-                           srp_callback_parm.login);
+                    srp_callback_parm.login);
 
                 lookup_srp_user(&srp_callback_parm, bio_s_out);
 
@@ -3026,7 +3126,7 @@ static int init_ssl_connection(SSL *con)
 
     if (i <= 0) {
         if (((dtlslisten || stateless) && i == 0)
-                || (!dtlslisten && !stateless && retry)) {
+            || (!dtlslisten && !stateless && retry)) {
             BIO_printf(bio_s_out, "DELAY\n");
             return 1;
         }
@@ -3036,7 +3136,7 @@ static int init_ssl_connection(SSL *con)
         verify_err = SSL_get_verify_result(con);
         if (verify_err != X509_V_OK) {
             BIO_printf(bio_err, "verify error:%s\n",
-                       X509_verify_cert_error_string(verify_err));
+                X509_verify_cert_error_string(verify_err));
         }
         /* Always print any error messages */
         ERR_print_errors(bio_err);
@@ -3111,7 +3211,7 @@ static void print_connection_info(SSL *con)
 
         if (srtp_profile)
             BIO_printf(bio_s_out, "SRTP Extension negotiated, profile=%s\n",
-                       srtp_profile->name);
+                srtp_profile->name);
     }
 #endif
     if (SSL_session_reused(con))
@@ -3128,10 +3228,11 @@ static void print_connection_info(SSL *con)
         BIO_printf(bio_s_out, "    Length: %i bytes\n", keymatexportlen);
         exportedkeymat = app_malloc(keymatexportlen, "export key");
         if (SSL_export_keying_material(con, exportedkeymat,
-                                        keymatexportlen,
-                                        keymatexportlabel,
-                                        strlen(keymatexportlabel),
-                                        NULL, 0, 0) <= 0) {
+                keymatexportlen,
+                keymatexportlabel,
+                strlen(keymatexportlabel),
+                NULL, 0, 0)
+            <= 0) {
             BIO_printf(bio_s_out, "    Error\n");
         } else {
             BIO_printf(bio_s_out, "    Keying material: ");
@@ -3205,7 +3306,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
 
     if (context != NULL
         && !SSL_set_session_id_context(con, context,
-                                       strlen((char *)context))) {
+            strlen((char *)context))) {
         SSL_free(con);
         goto err;
     }
@@ -3292,7 +3393,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
 
     for (;;) {
         i = BIO_gets(!BIO_eof(edio) ? edio : io, buf, bufsize + 1);
-        if (i < 0) {            /* error */
+        if (i < 0) { /* error */
             if (!BIO_should_retry(io) && !SSL_waiting_for_async(con)) {
                 if (!s_quiet)
                     ERR_print_errors(bio_err);
@@ -3312,14 +3413,14 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
                 OSSL_sleep(1000);
                 continue;
             }
-        } else if (i == 0) {    /* end of input */
+        } else if (i == 0) { /* end of input */
             ret = 1;
             goto end;
         }
 
         /* else we have data */
         if ((www == 1 && HAS_PREFIX(buf, "GET "))
-             || (www == 2 && HAS_PREFIX(buf, "GET /stats "))) {
+            || (www == 2 && HAS_PREFIX(buf, "GET /stats "))) {
             X509 *peer = NULL;
             STACK_OF(SSL_CIPHER) *sk;
             static const char *space = "                          ";
@@ -3327,15 +3428,15 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
             if (www == 1 && HAS_PREFIX(buf, "GET /reneg")) {
                 if (HAS_PREFIX(buf, "GET /renegcert"))
                     SSL_set_verify(con,
-                                   SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE,
-                                   NULL);
+                        SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE,
+                        NULL);
                 i = SSL_renegotiate(con);
                 BIO_printf(bio_s_out, "SSL_renegotiate -> %d\n", i);
                 /* Send the HelloRequest */
                 i = SSL_do_handshake(con);
                 if (i <= 0) {
                     BIO_printf(bio_s_out, "SSL_do_handshake() Retval %d\n",
-                               SSL_get_error(con, i));
+                        SSL_get_error(con, i));
                     ERR_print_errors(bio_err);
                     goto err;
                 }
@@ -3345,7 +3446,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
                 i = select(width, (void *)&readfds, NULL, NULL, NULL);
                 if (i <= 0 || !FD_ISSET(s, &readfds)) {
                     BIO_printf(bio_s_out,
-                               "Error waiting for client response\n");
+                        "Error waiting for client response\n");
                     ERR_print_errors(bio_err);
                     goto err;
                 }
@@ -3359,7 +3460,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
             }
 
             BIO_puts(io,
-                     "HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
+                "HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
             BIO_puts(io, "<HTML><BODY BGCOLOR=\"#ffffff\">\n");
             BIO_puts(io, "<pre>\n");
             /* BIO_puts(io, OpenSSL_version(OPENSSL_VERSION)); */
@@ -3397,7 +3498,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
             for (i = 0; i < j; i++) {
                 c = sk_SSL_CIPHER_value(sk, i);
                 BIO_printf(io, "%-11s:%-25s ",
-                           SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
+                    SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
                 if ((((i + 1) % 2) == 0) && (i + 1 != j))
                     BIO_puts(io, "\n");
             }
@@ -3405,7 +3506,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
             p = SSL_get_shared_ciphers(con, buf, bufsize);
             if (p != NULL) {
                 BIO_printf(io,
-                           "---\nCiphers common between both SSL end points:\n");
+                    "---\nCiphers common between both SSL end points:\n");
                 j = i = 0;
                 while (*p) {
                     if (*p == ':') {
@@ -3426,11 +3527,10 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
             ssl_print_groups(io, con, 0);
 #endif
             print_ca_names(io, con);
-            BIO_printf(io, (SSL_session_reused(con)
-                            ? "---\nReused, " : "---\nNew, "));
+            BIO_printf(io, (SSL_session_reused(con) ? "---\nReused, " : "---\nNew, "));
             c = SSL_get_current_cipher(con);
             BIO_printf(io, "%s, Cipher is %s\n",
-                       SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
+                SSL_CIPHER_get_version(c), SSL_CIPHER_get_name(c));
             SSL_SESSION_print(io, SSL_get_session(con));
             BIO_printf(io, "---\n");
             print_stats(io, SSL_get_SSL_CTX(con));
@@ -3449,8 +3549,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
         } else if ((www == 2 || www == 3) && CHECK_AND_SKIP_PREFIX(p, "GET /")) {
             BIO *file;
             char *e;
-            static const char *text =
-                "HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n";
+            static const char *text = "HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n";
 
             dot = 1;
             for (e = p; *e != '\0'; e++) {
@@ -3519,14 +3618,12 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
 
             if (www == 2) {
                 i = strlen(p);
-                if (((i > 5) && (strcmp(&(p[i - 5]), ".html") == 0)) ||
-                    ((i > 4) && (strcmp(&(p[i - 4]), ".php") == 0)) ||
-                    ((i > 4) && (strcmp(&(p[i - 4]), ".htm") == 0)))
+                if (((i > 5) && (strcmp(&(p[i - 5]), ".html") == 0)) || ((i > 4) && (strcmp(&(p[i - 4]), ".php") == 0)) || ((i > 4) && (strcmp(&(p[i - 4]), ".htm") == 0)))
                     BIO_puts(io,
-                             "HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
+                        "HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
                 else
                     BIO_puts(io,
-                             "HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n");
+                        "HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n");
             }
             /* send the file */
 #ifndef OPENSSL_NO_KTLS
@@ -3609,7 +3706,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
                     }
                 }
             }
- write_error:
+        write_error:
             BIO_free(file);
             break;
         }
@@ -3623,11 +3720,11 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
         } else
             break;
     }
- end:
+end:
     /* make sure we reuse sessions */
     do_ssl_shutdown(con);
 
- err:
+err:
     OPENSSL_free(buf);
     BIO_free(ssl_bio);
     BIO_free_all(io);
@@ -3667,7 +3764,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context)
     }
     if (context != NULL
         && !SSL_set_session_id_context(con, context,
-                                       strlen((char *)context))) {
+            strlen((char *)context))) {
         SSL_free(con);
         ERR_print_errors(bio_err);
         goto err;
@@ -3734,7 +3831,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context)
 
     for (;;) {
         i = BIO_gets(io, buf, bufsize + 1);
-        if (i < 0) {            /* error */
+        if (i < 0) { /* error */
             if (!BIO_should_retry(io)) {
                 if (!s_quiet)
                     ERR_print_errors(bio_err);
@@ -3754,7 +3851,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context)
                 OSSL_sleep(1000);
                 continue;
             }
-        } else if (i == 0) {    /* end of input */
+        } else if (i == 0) { /* end of input */
             ret = 1;
             BIO_printf(bio_err, "CONNECTION CLOSED\n");
             goto end;
@@ -3781,11 +3878,11 @@ static int rev_body(int s, int stype, int prot, unsigned char *context)
             }
         }
     }
- end:
+end:
     /* make sure we reuse sessions */
     do_ssl_shutdown(con);
 
- err:
+err:
 
     OPENSSL_free(buf);
     BIO_free(ssl_bio);
@@ -3795,7 +3892,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context)
 
 #define MAX_SESSION_ID_ATTEMPTS 10
 static int generate_session_id(SSL *ssl, unsigned char *id,
-                               unsigned int *id_len)
+    unsigned int *id_len)
 {
     unsigned int count = 0;
     unsigned int session_id_prefix_len = strlen(session_id_prefix);
@@ -3811,11 +3908,8 @@ static int generate_session_id(SSL *ssl, unsigned char *id,
          * conflicts.
          */
         memcpy(id, session_id_prefix,
-               (session_id_prefix_len < *id_len) ?
-                session_id_prefix_len : *id_len);
-    }
-    while (SSL_has_matching_session_id(ssl, id, *id_len) &&
-           (++count < MAX_SESSION_ID_ATTEMPTS));
+            (session_id_prefix_len < *id_len) ? session_id_prefix_len : *id_len);
+    } while (SSL_has_matching_session_id(ssl, id, *id_len) && (++count < MAX_SESSION_ID_ATTEMPTS));
     if (count >= MAX_SESSION_ID_ATTEMPTS)
         return 0;
     return 1;
@@ -3878,7 +3972,7 @@ static int add_session(SSL *ssl, SSL_SESSION *session)
 }
 
 static SSL_SESSION *get_session(SSL *ssl, const unsigned char *id, int idlen,
-                                int *do_copy)
+    int *do_copy)
 {
     simple_ssl_session *sess;
     *do_copy = 0;
@@ -3887,7 +3981,7 @@ static SSL_SESSION *get_session(SSL *ssl, const unsigned char *id, int idlen,
             const unsigned char *p = sess->der;
             BIO_printf(bio_err, "Lookup session: cache hit\n");
             return d2i_SSL_SESSION_ex(NULL, &p, sess->derlen, app_get0_libctx(),
-                                      app_get0_propq());
+                app_get0_propq());
         }
     }
     BIO_printf(bio_err, "Lookup session: cache miss\n");
@@ -3918,8 +4012,7 @@ static void del_session(SSL_CTX *sctx, SSL_SESSION *session)
 static void init_session_cache_ctx(SSL_CTX *sctx)
 {
     SSL_CTX_set_session_cache_mode(sctx,
-                                   SSL_SESS_CACHE_NO_INTERNAL |
-                                   SSL_SESS_CACHE_SERVER);
+        SSL_SESS_CACHE_NO_INTERNAL | SSL_SESS_CACHE_SERVER);
     SSL_CTX_sess_set_new_cb(sctx, add_session);
     SSL_CTX_sess_set_get_cb(sctx, get_session);
     SSL_CTX_sess_set_remove_cb(sctx, del_session);
@@ -3938,4 +4031,4 @@ static void free_sessions(void)
     first = NULL;
 }
 
-#endif                          /* OPENSSL_NO_SOCK */
+#endif /* OPENSSL_NO_SOCK */
diff --git a/apps/s_time.c b/apps/s_time.c
index 0d5bd12287292..6bdd9e23cee91 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -24,10 +24,10 @@
 #include <openssl/err.h>
 #include "internal/sockets.h"
 #if !defined(OPENSSL_SYS_MSDOS)
-# include <unistd.h>
+#include <unistd.h>
 #endif
 
-#define SSL_CONNECT_NAME        "localhost:4433"
+#define SSL_CONNECT_NAME "localhost:4433"
 
 #define SECONDS 30
 #define SECONDSSTR "30"
@@ -44,68 +44,86 @@ static const size_t fmt_http_get_cmd_size = sizeof(fmt_http_get_cmd) - 2;
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_CONNECT, OPT_CIPHER, OPT_CIPHERSUITES, OPT_CERT, OPT_NAMEOPT, OPT_KEY,
-    OPT_CAPATH, OPT_CAFILE, OPT_CASTORE,
-    OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE,
-    OPT_NEW, OPT_REUSE, OPT_BUGS, OPT_VERIFY, OPT_TIME, OPT_SSL3,
-    OPT_WWW, OPT_TLS1, OPT_TLS1_1, OPT_TLS1_2, OPT_TLS1_3,
+    OPT_CONNECT,
+    OPT_CIPHER,
+    OPT_CIPHERSUITES,
+    OPT_CERT,
+    OPT_NAMEOPT,
+    OPT_KEY,
+    OPT_CAPATH,
+    OPT_CAFILE,
+    OPT_CASTORE,
+    OPT_NOCAPATH,
+    OPT_NOCAFILE,
+    OPT_NOCASTORE,
+    OPT_NEW,
+    OPT_REUSE,
+    OPT_BUGS,
+    OPT_VERIFY,
+    OPT_TIME,
+    OPT_SSL3,
+    OPT_WWW,
+    OPT_TLS1,
+    OPT_TLS1_1,
+    OPT_TLS1_2,
+    OPT_TLS1_3,
     OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS s_time_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 
     OPT_SECTION("Connection"),
-    {"connect", OPT_CONNECT, 's',
-     "Where to connect as post:port (default is " SSL_CONNECT_NAME ")"},
-    {"new", OPT_NEW, '-', "Just time new connections"},
-    {"reuse", OPT_REUSE, '-', "Just time connection reuse"},
-    {"bugs", OPT_BUGS, '-', "Turn on SSL bug compatibility"},
-    {"cipher", OPT_CIPHER, 's', "TLSv1.2 and below cipher list to be used"},
-    {"ciphersuites", OPT_CIPHERSUITES, 's',
-     "Specify TLSv1.3 ciphersuites to be used"},
+    { "connect", OPT_CONNECT, 's',
+        "Where to connect as post:port (default is " SSL_CONNECT_NAME ")" },
+    { "new", OPT_NEW, '-', "Just time new connections" },
+    { "reuse", OPT_REUSE, '-', "Just time connection reuse" },
+    { "bugs", OPT_BUGS, '-', "Turn on SSL bug compatibility" },
+    { "cipher", OPT_CIPHER, 's', "TLSv1.2 and below cipher list to be used" },
+    { "ciphersuites", OPT_CIPHERSUITES, 's',
+        "Specify TLSv1.3 ciphersuites to be used" },
 #ifndef OPENSSL_NO_SSL3
-    {"ssl3", OPT_SSL3, '-', "Just use SSLv3"},
+    { "ssl3", OPT_SSL3, '-', "Just use SSLv3" },
 #endif
 #ifndef OPENSSL_NO_TLS1
-    {"tls1", OPT_TLS1, '-', "Just use TLSv1.0"},
+    { "tls1", OPT_TLS1, '-', "Just use TLSv1.0" },
 #endif
 #ifndef OPENSSL_NO_TLS1_1
-    {"tls1_1", OPT_TLS1_1, '-', "Just use TLSv1.1"},
+    { "tls1_1", OPT_TLS1_1, '-', "Just use TLSv1.1" },
 #endif
 #ifndef OPENSSL_NO_TLS1_2
-    {"tls1_2", OPT_TLS1_2, '-', "Just use TLSv1.2"},
+    { "tls1_2", OPT_TLS1_2, '-', "Just use TLSv1.2" },
 #endif
 #ifndef OPENSSL_NO_TLS1_3
-    {"tls1_3", OPT_TLS1_3, '-', "Just use TLSv1.3"},
+    { "tls1_3", OPT_TLS1_3, '-', "Just use TLSv1.3" },
 #endif
-    {"verify", OPT_VERIFY, 'p',
-     "Turn on peer certificate verification, set depth"},
-    {"time", OPT_TIME, 'p', "Seconds to collect data, default " SECONDSSTR},
-    {"www", OPT_WWW, 's', "Fetch specified page from the site"},
+    { "verify", OPT_VERIFY, 'p',
+        "Turn on peer certificate verification, set depth" },
+    { "time", OPT_TIME, 'p', "Seconds to collect data, default " SECONDSSTR },
+    { "www", OPT_WWW, 's', "Fetch specified page from the site" },
 
     OPT_SECTION("Certificate"),
-    {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"},
-    {"cert", OPT_CERT, '<', "Cert file to use, PEM format assumed"},
-    {"key", OPT_KEY, '<', "File with key, PEM; default is -cert file"},
-    {"cafile", OPT_CAFILE, '<', "PEM format file of CA's"},
-    {"CAfile", OPT_CAFILE, '<', "PEM format file of CA's"},
-    {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"},
-    {"CAstore", OPT_CASTORE, ':', "URI to store of CA's"},
-    {"no-CAfile", OPT_NOCAFILE, '-',
-     "Do not load the default certificates file"},
-    {"no-CApath", OPT_NOCAPATH, '-',
-     "Do not load certificates from the default certificates directory"},
-    {"no-CAstore", OPT_NOCASTORE, '-',
-     "Do not load certificates from the default certificates store URI"},
+    { "nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options" },
+    { "cert", OPT_CERT, '<', "Cert file to use, PEM format assumed" },
+    { "key", OPT_KEY, '<', "File with key, PEM; default is -cert file" },
+    { "cafile", OPT_CAFILE, '<', "PEM format file of CA's" },
+    { "CAfile", OPT_CAFILE, '<', "PEM format file of CA's" },
+    { "CApath", OPT_CAPATH, '/', "PEM format directory of CA's" },
+    { "CAstore", OPT_CASTORE, ':', "URI to store of CA's" },
+    { "no-CAfile", OPT_NOCAFILE, '-',
+        "Do not load the default certificates file" },
+    { "no-CApath", OPT_NOCAPATH, '-',
+        "Do not load certificates from the default certificates directory" },
+    { "no-CAstore", OPT_NOCASTORE, '-',
+        "Do not load certificates from the default certificates store URI" },
 
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
-#define START   0
-#define STOP    1
+#define START 0
+#define STOP 1
 
 static double tm_Time_F(int s)
 {
@@ -137,7 +155,7 @@ int s_time_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -156,7 +174,7 @@ int s_time_main(int argc, char **argv)
         case OPT_VERIFY:
             verify_args.depth = opt_int_arg();
             BIO_printf(bio_err, "%s: verify depth is %d\n",
-                       prog, verify_args.depth);
+                prog, verify_args.depth);
             break;
         case OPT_CERT:
             certfile = opt_arg();
@@ -259,7 +277,7 @@ int s_time_main(int argc, char **argv)
         goto end;
 
     if (!ctx_set_verify_locations(ctx, CAfile, noCAfile, CApath, noCApath,
-                                  CAstore, noCAstore)) {
+            CAstore, noCAstore)) {
         ERR_print_errors(bio_err);
         goto end;
     }
@@ -281,7 +299,7 @@ int s_time_main(int argc, char **argv)
 
         if (www_path != NULL) {
             buf_len = BIO_snprintf(buf, sizeof(buf), fmt_http_get_cmd,
-                                   www_path);
+                www_path);
             if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0)
                 goto end;
             while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
@@ -310,21 +328,21 @@ int s_time_main(int argc, char **argv)
     }
     totalTime += tm_Time_F(STOP); /* Add the time for this iteration */
 
-    printf
-        ("\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n",
-         nConn, totalTime, ((double)nConn / totalTime), bytes_read);
-    printf
-        ("%d connections in %ld real seconds, %ld bytes read per connection\n",
-         nConn, (long)time(NULL) - finishtime + maxtime,
-         nConn > 0 ? bytes_read / nConn : 0l);
+    printf("\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n",
+        nConn, totalTime, ((double)nConn / totalTime), bytes_read);
+    printf("%d connections in %ld real seconds, %ld bytes read per connection\n",
+        nConn, (long)time(NULL) - finishtime + maxtime,
+        nConn > 0 ? bytes_read / nConn : 0l);
 
     /*
      * Now loop and time connections using the same session id over and over
      */
 
- next:
-    if (!(perform & 2))
+next:
+    if (!(perform & 2)) {
+        ret = 0;
         goto end;
+    }
     printf("\n\nNow timing with session id reuse.\n");
 
     /* Get an SSL object so we can reuse the session id */
@@ -362,7 +380,7 @@ int s_time_main(int argc, char **argv)
 
         if (www_path != NULL) {
             buf_len = BIO_snprintf(buf, sizeof(buf), fmt_http_get_cmd,
-                                   www_path);
+                www_path);
             if (buf_len <= 0 || SSL_write(scon, buf, buf_len) <= 0)
                 goto end;
             while ((i = SSL_read(scon, buf, sizeof(buf))) > 0)
@@ -389,19 +407,17 @@ int s_time_main(int argc, char **argv)
     }
     totalTime += tm_Time_F(STOP); /* Add the time for this iteration */
 
-    printf
-        ("\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n",
-         nConn, totalTime, ((double)nConn / totalTime), bytes_read);
+    printf("\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n",
+        nConn, totalTime, ((double)nConn / totalTime), bytes_read);
     if (nConn > 0)
-        printf
-            ("%d connections in %ld real seconds, %ld bytes read per connection\n",
-             nConn, (long)time(NULL) - finishtime + maxtime, bytes_read / nConn);
+        printf("%d connections in %ld real seconds, %ld bytes read per connection\n",
+            nConn, (long)time(NULL) - finishtime + maxtime, bytes_read / nConn);
     else
         printf("0 connections in %ld real seconds\n",
-               (long)time(NULL) - finishtime + maxtime);
+            (long)time(NULL) - finishtime + maxtime);
     ret = 0;
 
- end:
+end:
     SSL_free(scon);
     SSL_CTX_free(ctx);
     return ret;
@@ -420,7 +436,7 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
         return NULL;
 
     if (BIO_set_conn_hostname(conn, host) <= 0
-            || BIO_set_conn_mode(conn, BIO_SOCK_NODELAY) <= 0) {
+        || BIO_set_conn_mode(conn, BIO_SOCK_NODELAY) <= 0) {
         BIO_free(conn);
         return NULL;
     }
@@ -433,6 +449,16 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
         }
     } else {
         serverCon = scon;
+        /*
+         * Reset the SSL object before reusing it for a new connection.
+         * This clears prior handshake and I/O state while keeping
+         * configuration inherited from the SSL_CTX.
+         */
+        if (!SSL_clear(serverCon)) {
+            ERR_print_errors(bio_err);
+            BIO_free(conn);
+            return NULL;
+        }
         SSL_set_connect_state(serverCon);
     }
 
@@ -444,7 +470,7 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
         BIO_printf(bio_err, "ERROR\n");
         if (verify_args.error != X509_V_OK)
             BIO_printf(bio_err, "verify error:%s\n",
-                       X509_verify_cert_error_string(verify_args.error));
+                X509_verify_cert_error_string(verify_args.error));
         else
             ERR_print_errors(bio_err);
         if (scon == NULL)
@@ -457,12 +483,12 @@ static SSL *doConnection(SSL *scon, const char *host, SSL_CTX *ctx)
         struct linger no_linger;
         int fd;
 
-        no_linger.l_onoff  = 1;
+        no_linger.l_onoff = 1;
         no_linger.l_linger = 0;
         fd = SSL_get_fd(serverCon);
         if (fd >= 0)
-            (void)setsockopt(fd, SOL_SOCKET, SO_LINGER, (char*)&no_linger,
-                             sizeof(no_linger));
+            (void)setsockopt(fd, SOL_SOCKET, SO_LINGER, (char *)&no_linger,
+                sizeof(no_linger));
     }
 #endif
 
diff --git a/apps/sess_id.c b/apps/sess_id.c
index 54b3d055634b0..715b65383387c 100644
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -20,27 +20,33 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
-    OPT_TEXT, OPT_CERT, OPT_NOOUT, OPT_CONTEXT
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_IN,
+    OPT_OUT,
+    OPT_TEXT,
+    OPT_CERT,
+    OPT_NOOUT,
+    OPT_CONTEXT
 } OPTION_CHOICE;
 
 const OPTIONS sess_id_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"context", OPT_CONTEXT, 's', "Set the session ID context"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "context", OPT_CONTEXT, 's', "Set the session ID context" },
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, 's', "Input file - default stdin"},
-    {"inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)"},
+    { "in", OPT_IN, 's', "Input file - default stdin" },
+    { "inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file - default stdout"},
-    {"outform", OPT_OUTFORM, 'f',
-     "Output format - default PEM (PEM, DER or NSS)"},
-    {"text", OPT_TEXT, '-', "Print ssl session id details"},
-    {"cert", OPT_CERT, '-', "Output certificate "},
-    {"noout", OPT_NOOUT, '-', "Don't output the encoded session info"},
-    {NULL}
+    { "out", OPT_OUT, '>', "Output file - default stdout" },
+    { "outform", OPT_OUTFORM, 'f',
+        "Output format - default PEM (PEM, DER or NSS)" },
+    { "text", OPT_TEXT, '-', "Print ssl session id details" },
+    { "cert", OPT_CERT, '-', "Output certificate " },
+    { "noout", OPT_NOOUT, '-', "Don't output the encoded session info" },
+    { NULL }
 };
 
 static SSL_SESSION *load_sess_id(char *file, int format);
@@ -60,7 +66,7 @@ int sess_id_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -73,7 +79,7 @@ int sess_id_main(int argc, char **argv)
             break;
         case OPT_OUTFORM:
             if (!opt_format(opt_arg(), OPT_FMT_PEMDER | OPT_FMT_NSS,
-                            &outformat))
+                    &outformat))
                 goto opthelp;
             break;
         case OPT_IN:
@@ -114,7 +120,7 @@ int sess_id_main(int argc, char **argv)
             goto end;
         }
         if (!SSL_SESSION_set1_id_context(x, (unsigned char *)context,
-                                         ctx_len)) {
+                ctx_len)) {
             BIO_printf(bio_err, "Error setting id context\n");
             goto end;
         }
@@ -167,7 +173,7 @@ int sess_id_main(int argc, char **argv)
         }
     }
     ret = 0;
- end:
+end:
     BIO_free_all(out);
     SSL_SESSION_free(x);
     return ret;
@@ -191,7 +197,7 @@ static SSL_SESSION *load_sess_id(char *infile, int format)
         goto end;
     }
 
- end:
+end:
     BIO_free(in);
     return x;
 }
diff --git a/apps/skeyutl.c b/apps/skeyutl.c
index bc744f785bc1e..2404a8e8aa28d 100644
--- a/apps/skeyutl.c
+++ b/apps/skeyutl.c
@@ -21,18 +21,20 @@ typedef enum OPTION_choice {
     OPT_COMMON,
     OPT_PROV_ENUM,
     OPT_CIPHER,
-    OPT_SKEYOPT, OPT_SKEYMGMT, OPT_GENKEY
+    OPT_SKEYOPT,
+    OPT_SKEYMGMT,
+    OPT_GENKEY
 } OPTION_CHOICE;
 
 const OPTIONS skeyutl_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"skeyopt", OPT_SKEYOPT, 's', "Key options as opt:value for opaque keys handling"},
-    {"skeymgmt", OPT_SKEYMGMT, 's', "Symmetric key management name for opaque keys handling"},
-    {"genkey", OPT_GENKEY, '-', "Generate an opaque symmetric key"},
-    {"cipher", OPT_CIPHER, 's', "The cipher to generate key for"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "skeyopt", OPT_SKEYOPT, 's', "Key options as opt:value for opaque keys handling" },
+    { "skeymgmt", OPT_SKEYMGMT, 's', "Symmetric key management name for opaque keys handling" },
+    { "genkey", OPT_GENKEY, '-', "Generate an opaque symmetric key" },
+    { "cipher", OPT_CIPHER, 's', "The cipher to generate key for" },
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int skeyutl_main(int argc, char **argv)
@@ -52,7 +54,7 @@ int skeyutl_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -66,9 +68,7 @@ int skeyutl_main(int argc, char **argv)
             ciphername = opt_arg();
             break;
         case OPT_SKEYOPT:
-            if ((skeyopts == NULL &&
-                 (skeyopts = sk_OPENSSL_STRING_new_null()) == NULL) ||
-                sk_OPENSSL_STRING_push(skeyopts, opt_arg()) == 0) {
+            if ((skeyopts == NULL && (skeyopts = sk_OPENSSL_STRING_new_null()) == NULL) || sk_OPENSSL_STRING_push(skeyopts, opt_arg()) == 0) {
                 BIO_printf(bio_err, "%s: out of memory\n", prog);
                 goto end;
             }
@@ -96,26 +96,26 @@ int skeyutl_main(int argc, char **argv)
         OSSL_PARAM *params = NULL;
 
         mgmt = EVP_SKEYMGMT_fetch(app_get0_libctx(),
-                                  skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher),
-                                  app_get0_propq());
+            skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher),
+            app_get0_propq());
         if (mgmt == NULL)
             goto end;
         params = app_params_new_from_opts(skeyopts,
-                                          EVP_SKEYMGMT_get0_gen_settable_params(mgmt));
+            EVP_SKEYMGMT_get0_gen_settable_params(mgmt));
 
         skey = EVP_SKEY_generate(app_get0_libctx(),
-                                 skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher),
-                                 app_get0_propq(), params);
+            skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher),
+            app_get0_propq(), params);
         OSSL_PARAM_free(params);
         if (skey == NULL) {
             BIO_printf(bio_err, "Error creating opaque key for skeymgmt %s\n",
-                       skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher));
+                skeymgmt ? skeymgmt : EVP_CIPHER_name(cipher));
             ERR_print_errors(bio_err);
         } else {
             const char *key_name = EVP_SKEY_get0_key_id(skey);
 
             BIO_printf(bio_out, "An opaque key identified by %s is created\n",
-                       key_name ? key_name : "<unknown>");
+                key_name ? key_name : "<unknown>");
             BIO_printf(bio_out, "Provider: %s\n", EVP_SKEY_get0_provider_name(skey));
             BIO_printf(bio_out, "Key management: %s\n", EVP_SKEY_get0_skeymgmt_name(skey));
             ret = 0;
@@ -125,7 +125,7 @@ int skeyutl_main(int argc, char **argv)
         BIO_printf(bio_err, "Key generation is the only supported operation as of now\n");
     }
 
- end:
+end:
     ERR_print_errors(bio_err);
     sk_OPENSSL_STRING_free(skeyopts);
     EVP_SKEYMGMT_free(mgmt);
diff --git a/apps/smime.c b/apps/smime.c
index 211ddce4ab378..328022ce9d0a4 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -22,114 +22,149 @@
 static int save_certs(char *signerfile, STACK_OF(X509) *signers);
 static int smime_cb(int ok, X509_STORE_CTX *ctx);
 
-#define SMIME_OP        0x10
-#define SMIME_IP        0x20
-#define SMIME_SIGNERS   0x40
-#define SMIME_ENCRYPT   (1 | SMIME_OP)
-#define SMIME_DECRYPT   (2 | SMIME_IP)
-#define SMIME_SIGN      (3 | SMIME_OP | SMIME_SIGNERS)
-#define SMIME_RESIGN    (6 | SMIME_IP | SMIME_OP | SMIME_SIGNERS)
-#define SMIME_VERIFY    (4 | SMIME_IP)
-#define SMIME_PK7OUT    (5 | SMIME_IP | SMIME_OP)
+#define SMIME_OP 0x10
+#define SMIME_IP 0x20
+#define SMIME_SIGNERS 0x40
+#define SMIME_ENCRYPT (1 | SMIME_OP)
+#define SMIME_DECRYPT (2 | SMIME_IP)
+#define SMIME_SIGN (3 | SMIME_OP | SMIME_SIGNERS)
+#define SMIME_RESIGN (6 | SMIME_IP | SMIME_OP | SMIME_SIGNERS)
+#define SMIME_VERIFY (4 | SMIME_IP)
+#define SMIME_PK7OUT (5 | SMIME_IP | SMIME_OP)
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_ENCRYPT, OPT_DECRYPT, OPT_SIGN, OPT_RESIGN, OPT_VERIFY,
-    OPT_PK7OUT, OPT_TEXT, OPT_NOINTERN, OPT_NOVERIFY, OPT_NOCHAIN,
-    OPT_NOCERTS, OPT_NOATTR, OPT_NODETACH, OPT_NOSMIMECAP,
-    OPT_BINARY, OPT_NOSIGS, OPT_STREAM, OPT_INDEF, OPT_NOINDEF,
-    OPT_CRLFEOL, OPT_ENGINE, OPT_PASSIN,
-    OPT_TO, OPT_FROM, OPT_SUBJECT, OPT_SIGNER, OPT_RECIP, OPT_MD,
-    OPT_CIPHER, OPT_INKEY, OPT_KEYFORM, OPT_CERTFILE, OPT_CAFILE,
-    OPT_CAPATH, OPT_CASTORE, OPT_NOCAFILE, OPT_NOCAPATH, OPT_NOCASTORE,
-    OPT_R_ENUM, OPT_PROV_ENUM, OPT_CONFIG,
+    OPT_ENCRYPT,
+    OPT_DECRYPT,
+    OPT_SIGN,
+    OPT_RESIGN,
+    OPT_VERIFY,
+    OPT_PK7OUT,
+    OPT_TEXT,
+    OPT_NOINTERN,
+    OPT_NOVERIFY,
+    OPT_NOCHAIN,
+    OPT_NOCERTS,
+    OPT_NOATTR,
+    OPT_NODETACH,
+    OPT_NOSMIMECAP,
+    OPT_BINARY,
+    OPT_NOSIGS,
+    OPT_STREAM,
+    OPT_INDEF,
+    OPT_NOINDEF,
+    OPT_CRLFEOL,
+    OPT_ENGINE,
+    OPT_PASSIN,
+    OPT_TO,
+    OPT_FROM,
+    OPT_SUBJECT,
+    OPT_SIGNER,
+    OPT_RECIP,
+    OPT_MD,
+    OPT_CIPHER,
+    OPT_INKEY,
+    OPT_KEYFORM,
+    OPT_CERTFILE,
+    OPT_CAFILE,
+    OPT_CAPATH,
+    OPT_CASTORE,
+    OPT_NOCAFILE,
+    OPT_NOCAPATH,
+    OPT_NOCASTORE,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM,
+    OPT_CONFIG,
     OPT_V_ENUM,
-    OPT_IN, OPT_INFORM, OPT_OUT,
-    OPT_OUTFORM, OPT_CONTENT
+    OPT_IN,
+    OPT_INFORM,
+    OPT_OUT,
+    OPT_OUTFORM,
+    OPT_CONTENT
 } OPTION_CHOICE;
 
 const OPTIONS smime_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert...]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert...]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"in", OPT_IN, '<', "Input file"},
-    {"inform", OPT_INFORM, 'c', "Input format SMIME (default), PEM or DER"},
-    {"out", OPT_OUT, '>', "Output file"},
-    {"outform", OPT_OUTFORM, 'c',
-     "Output format SMIME (default), PEM or DER"},
-    {"inkey", OPT_INKEY, 's',
-     "Input private key (if not signer or recipient)"},
-    {"keyform", OPT_KEYFORM, 'f', "Input private key format (ENGINE, other values ignored)"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "in", OPT_IN, '<', "Input file" },
+    { "inform", OPT_INFORM, 'c', "Input format SMIME (default), PEM or DER" },
+    { "out", OPT_OUT, '>', "Output file" },
+    { "outform", OPT_OUTFORM, 'c',
+        "Output format SMIME (default), PEM or DER" },
+    { "inkey", OPT_INKEY, 's',
+        "Input private key (if not signer or recipient)" },
+    { "keyform", OPT_KEYFORM, 'f', "Input private key format (ENGINE, other values ignored)" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
-    {"stream", OPT_STREAM, '-', "Enable CMS streaming" },
-    {"indef", OPT_INDEF, '-', "Same as -stream" },
-    {"noindef", OPT_NOINDEF, '-', "Disable CMS streaming"},
+    { "stream", OPT_STREAM, '-', "Enable CMS streaming" },
+    { "indef", OPT_INDEF, '-', "Same as -stream" },
+    { "noindef", OPT_NOINDEF, '-', "Disable CMS streaming" },
     OPT_CONFIG_OPTION,
 
     OPT_SECTION("Action"),
-    {"encrypt", OPT_ENCRYPT, '-', "Encrypt message"},
-    {"decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message"},
-    {"sign", OPT_SIGN, '-', "Sign message"},
-    {"resign", OPT_RESIGN, '-', "Resign a signed message"},
-    {"verify", OPT_VERIFY, '-', "Verify signed message"},
-    {"pk7out", OPT_PK7OUT, '-', "Output PKCS#7 structure"},
+    { "encrypt", OPT_ENCRYPT, '-', "Encrypt message" },
+    { "decrypt", OPT_DECRYPT, '-', "Decrypt encrypted message" },
+    { "sign", OPT_SIGN, '-', "Sign message" },
+    { "resign", OPT_RESIGN, '-', "Resign a signed message" },
+    { "verify", OPT_VERIFY, '-', "Verify signed message" },
+    { "pk7out", OPT_PK7OUT, '-', "Output PKCS#7 structure" },
 
     OPT_SECTION("Signing/Encryption"),
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
-    {"md", OPT_MD, 's', "Digest algorithm to use when signing or resigning"},
-    {"", OPT_CIPHER, '-', "Any supported cipher"},
-    {"nointern", OPT_NOINTERN, '-',
-     "Don't search certificates in message for signer"},
-    {"nodetach", OPT_NODETACH, '-', "Use opaque signing"},
-    {"noattr", OPT_NOATTR, '-', "Don't include any signed attributes"},
-    {"binary", OPT_BINARY, '-', "Don't translate message to text"},
-    {"signer", OPT_SIGNER, 's', "Signer certificate file"},
-    {"content", OPT_CONTENT, '<',
-     "Supply or override content for detached signature"},
-    {"nocerts", OPT_NOCERTS, '-',
-     "Don't include signers certificate when signing"},
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+    { "md", OPT_MD, 's', "Digest algorithm to use when signing or resigning" },
+    { "", OPT_CIPHER, '-', "Any supported cipher" },
+    { "nointern", OPT_NOINTERN, '-',
+        "Don't search certificates in message for signer" },
+    { "nodetach", OPT_NODETACH, '-', "Use opaque signing" },
+    { "noattr", OPT_NOATTR, '-', "Don't include any signed attributes" },
+    { "binary", OPT_BINARY, '-', "Don't translate message to text" },
+    { "signer", OPT_SIGNER, 's', "Signer certificate file" },
+    { "content", OPT_CONTENT, '<',
+        "Supply or override content for detached signature" },
+    { "nocerts", OPT_NOCERTS, '-',
+        "Don't include signers certificate when signing" },
 
     OPT_SECTION("Verification/Decryption"),
-    {"nosigs", OPT_NOSIGS, '-', "Don't verify message signature"},
-    {"noverify", OPT_NOVERIFY, '-', "Don't verify signers certificate"},
+    { "nosigs", OPT_NOSIGS, '-', "Don't verify message signature" },
+    { "noverify", OPT_NOVERIFY, '-', "Don't verify signers certificate" },
 
-    {"certfile", OPT_CERTFILE, '<',
-     "Extra signer and intermediate CA certificates to include when signing"},
-    {OPT_MORE_STR, 0, 0,
-     "or to use as preferred signer certs and for chain building when verifying"},
-    {"recip", OPT_RECIP, '<', "Recipient certificate file for decryption"},
+    { "certfile", OPT_CERTFILE, '<',
+        "Extra signer and intermediate CA certificates to include when signing" },
+    { OPT_MORE_STR, 0, 0,
+        "or to use as preferred signer certs and for chain building when verifying" },
+    { "recip", OPT_RECIP, '<', "Recipient certificate file for decryption" },
 
     OPT_SECTION("Email"),
-    {"to", OPT_TO, 's', "To address"},
-    {"from", OPT_FROM, 's', "From address"},
-    {"subject", OPT_SUBJECT, 's', "Subject"},
-    {"text", OPT_TEXT, '-', "Include or delete text MIME headers"},
-    {"nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute"},
+    { "to", OPT_TO, 's', "To address" },
+    { "from", OPT_FROM, 's', "From address" },
+    { "subject", OPT_SUBJECT, 's', "Subject" },
+    { "text", OPT_TEXT, '-', "Include or delete text MIME headers" },
+    { "nosmimecap", OPT_NOSMIMECAP, '-', "Omit the SMIMECapabilities attribute" },
 
     OPT_SECTION("Certificate chain"),
-    {"CApath", OPT_CAPATH, '/', "Trusted certificates directory"},
-    {"CAfile", OPT_CAFILE, '<', "Trusted certificates file"},
-    {"CAstore", OPT_CASTORE, ':', "Trusted certificates store URI"},
-    {"no-CAfile", OPT_NOCAFILE, '-',
-     "Do not load the default certificates file"},
-    {"no-CApath", OPT_NOCAPATH, '-',
-     "Do not load certificates from the default certificates directory"},
-    {"no-CAstore", OPT_NOCASTORE, '-',
-     "Do not load certificates from the default certificates store"},
-    {"nochain", OPT_NOCHAIN, '-',
-     "set PKCS7_NOCHAIN so certificates contained in the message are not used as untrusted CAs" },
-    {"crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of LF only"},
+    { "CApath", OPT_CAPATH, '/', "Trusted certificates directory" },
+    { "CAfile", OPT_CAFILE, '<', "Trusted certificates file" },
+    { "CAstore", OPT_CASTORE, ':', "Trusted certificates store URI" },
+    { "no-CAfile", OPT_NOCAFILE, '-',
+        "Do not load the default certificates file" },
+    { "no-CApath", OPT_NOCAPATH, '-',
+        "Do not load certificates from the default certificates directory" },
+    { "no-CAstore", OPT_NOCASTORE, '-',
+        "Do not load certificates from the default certificates store" },
+    { "nochain", OPT_NOCHAIN, '-',
+        "set PKCS7_NOCHAIN so certificates contained in the message are not used as untrusted CAs" },
+    { "crlfeol", OPT_CRLFEOL, '-', "Use CRLF as EOL termination instead of LF only" },
 
     OPT_R_OPTIONS,
     OPT_V_OPTIONS,
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"cert", 0, 0, "Recipient certs, used when encrypting"},
-    {NULL}
+    { "cert", 0, 0, "Recipient certs, used when encrypting" },
+    { NULL }
 };
 
 static const char *operation_name(int operation)
@@ -152,11 +187,10 @@ static const char *operation_name(int operation)
     }
 }
 
-#define SET_OPERATION(op) \
-    ((operation != 0 && (operation != (op))) \
-     ? 0 * BIO_printf(bio_err, "%s: Cannot use -%s together with -%s\n", \
-                      prog, operation_name(op), operation_name(operation)) \
-     : (operation = (op)))
+#define SET_OPERATION(op)                                                                                                            \
+    ((operation != 0 && (operation != (op)))                                                                                         \
+            ? 0 * BIO_printf(bio_err, "%s: Cannot use -%s together with -%s\n", prog, operation_name(op), operation_name(operation)) \
+            : (operation = (op)))
 
 int smime_main(int argc, char **argv)
 {
@@ -179,8 +213,7 @@ int smime_main(int argc, char **argv)
     OPTION_CHOICE o;
     int noCApath = 0, noCAfile = 0, noCAstore = 0;
     int flags = PKCS7_DETACHED, operation = 0, ret = 0, indef = 0;
-    int informat = FORMAT_SMIME, outformat = FORMAT_SMIME, keyform =
-        FORMAT_UNDEF;
+    int informat = FORMAT_SMIME, outformat = FORMAT_SMIME, keyform = FORMAT_UNDEF;
     int vpmtouched = 0, rv = 0;
     ENGINE *e = NULL;
     const char *mime_eol = "\n";
@@ -195,7 +228,7 @@ int smime_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -342,7 +375,7 @@ int smime_main(int argc, char **argv)
             if (keyfile != NULL) {
                 if (signerfile == NULL) {
                     BIO_printf(bio_err,
-                               "%s: Must have -signer before -inkey\n", prog);
+                        "%s: Must have -signer before -inkey\n", prog);
                     goto opthelp;
                 }
                 if (sksigners == NULL
@@ -407,14 +440,14 @@ int smime_main(int argc, char **argv)
             goto opthelp;
     }
     if (!opt_cipher_any(ciphername, &cipher))
-            goto opthelp;
+        goto opthelp;
     if (!(operation & SMIME_SIGNERS) && (skkeys != NULL || sksigners != NULL)) {
         BIO_puts(bio_err, "Multiple signers or keys not allowed\n");
         goto opthelp;
     }
     if (!operation) {
         BIO_puts(bio_err,
-                "No operation (-encrypt|-sign|...) specified\n");
+            "No operation (-encrypt|-sign|...) specified\n");
         goto opthelp;
     }
 
@@ -446,7 +479,7 @@ int smime_main(int argc, char **argv)
     } else if (operation == SMIME_DECRYPT) {
         if (recipfile == NULL && keyfile == NULL) {
             BIO_printf(bio_err,
-                       "No recipient certificate or key specified\n");
+                "No recipient certificate or key specified\n");
             goto opthelp;
         }
     } else if (operation == SMIME_ENCRYPT) {
@@ -484,7 +517,7 @@ int smime_main(int argc, char **argv)
             goto end;
         while (*argv != NULL) {
             cert = load_cert(*argv, FORMAT_UNDEF,
-                             "recipient certificate file");
+                "recipient certificate file");
             if (cert == NULL)
                 goto end;
             if (!sk_X509_push(encerts, cert))
@@ -503,7 +536,8 @@ int smime_main(int argc, char **argv)
 
     if (recipfile != NULL && (operation == SMIME_DECRYPT)) {
         if ((recip = load_cert(recipfile, FORMAT_UNDEF,
-                               "recipient certificate file")) == NULL) {
+                 "recipient certificate file"))
+            == NULL) {
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -567,7 +601,8 @@ int smime_main(int argc, char **argv)
 
     if (operation == SMIME_VERIFY) {
         if ((store = setup_verify(CAfile, noCAfile, CApath, noCApath,
-                                  CAstore, noCAstore)) == NULL)
+                 CAstore, noCAstore))
+            == NULL)
             goto end;
         X509_STORE_set_verify_cb(store, smime_cb);
         if (vpmtouched)
@@ -685,7 +720,7 @@ int smime_main(int argc, char **argv)
         }
     }
     ret = 0;
- end:
+end:
     if (ret)
         ERR_print_errors(bio_err);
     OSSL_STACK_OF_X509_free(encerts);
diff --git a/apps/speed.c b/apps/speed.c
index f52f2c839d0d9..a8d7cb14f5794 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -9,18 +9,18 @@
  */
 
 #undef SECONDS
-#define SECONDS          3
-#define PKEY_SECONDS    10
-
-#define RSA_SECONDS     PKEY_SECONDS
-#define DSA_SECONDS     PKEY_SECONDS
-#define ECDSA_SECONDS   PKEY_SECONDS
-#define ECDH_SECONDS    PKEY_SECONDS
-#define EdDSA_SECONDS   PKEY_SECONDS
-#define SM2_SECONDS     PKEY_SECONDS
-#define FFDH_SECONDS    PKEY_SECONDS
-#define KEM_SECONDS     PKEY_SECONDS
-#define SIG_SECONDS     PKEY_SECONDS
+#define SECONDS 3
+#define PKEY_SECONDS 10
+
+#define RSA_SECONDS PKEY_SECONDS
+#define DSA_SECONDS PKEY_SECONDS
+#define ECDSA_SECONDS PKEY_SECONDS
+#define ECDH_SECONDS PKEY_SECONDS
+#define EdDSA_SECONDS PKEY_SECONDS
+#define SM2_SECONDS PKEY_SECONDS
+#define FFDH_SECONDS PKEY_SECONDS
+#define KEM_SECONDS PKEY_SECONDS
+#define SIG_SECONDS PKEY_SECONDS
 
 #define MAX_ALGNAME_SUFFIX 100
 
@@ -45,33 +45,32 @@
 #include <openssl/async.h>
 #include <openssl/provider.h>
 #if !defined(OPENSSL_SYS_MSDOS)
-# include <unistd.h>
+#include <unistd.h>
 #endif
 
 #if defined(_WIN32)
-# include <windows.h>
+#include <windows.h>
 /*
  * While VirtualLock is available under the app partition (e.g. UWP),
  * the headers do not define the API. Define it ourselves instead.
  */
 WINBASEAPI
 BOOL
-WINAPI
-VirtualLock(
-    _In_ LPVOID lpAddress,
-    _In_ SIZE_T dwSize
-    );
+    WINAPI
+    VirtualLock(
+        _In_ LPVOID lpAddress,
+        _In_ SIZE_T dwSize);
 #endif
 
 #if defined(OPENSSL_SYS_LINUX)
-# include <sys/mman.h>
+#include <sys/mman.h>
 #endif
 
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include "./testrsa.h"
 #ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
+#include <openssl/dh.h>
 #endif
 #include <openssl/x509.h>
 #include <openssl/dsa.h>
@@ -79,27 +78,27 @@ VirtualLock(
 #include <openssl/modes.h>
 
 #ifndef HAVE_FORK
-# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VXWORKS)
-#  define HAVE_FORK 0
-# else
-#  define HAVE_FORK 1
-#  include <sys/wait.h>
-# endif
+#if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VXWORKS)
+#define HAVE_FORK 0
+#else
+#define HAVE_FORK 1
+#include <sys/wait.h>
+#endif
 #endif
 
 #if HAVE_FORK
-# undef NO_FORK
+#undef NO_FORK
 #else
-# define NO_FORK
+#define NO_FORK
 #endif
 
 #define MAX_MISALIGNMENT 63
-#define MAX_ECDH_SIZE   256
-#define MISALIGN        64
+#define MAX_ECDH_SIZE 256
+#define MISALIGN 64
 #define MAX_FFDH_SIZE 1024
 
 #ifndef RSA_DEFAULT_PRIME_NUM
-# define RSA_DEFAULT_PRIME_NUM 2
+#define RSA_DEFAULT_PRIME_NUM 2
 #endif
 
 typedef struct openssl_speed_sec_st {
@@ -117,13 +116,13 @@ typedef struct openssl_speed_sec_st {
 
 static volatile int run = 0;
 
-static int mr = 0;  /* machine-readeable output format to merge fork results */
+static int mr = 0; /* machine-readeable output format to merge fork results */
 static int usertime = 1;
 
 static double Time_F(int s);
 static void print_message(const char *s, int length, int tm);
 static void pkey_print_message(const char *str, const char *str2,
-                               unsigned int bits, int sec);
+    unsigned int bits, int sec);
 static void kskey_print_message(const char *str, const char *str2, int tm);
 static void print_result(int alg, int run_no, int count, double time_used);
 #ifndef NO_FORK
@@ -137,15 +136,15 @@ static int testmoderesult = 0;
 static const int lengths_list[] = {
     16, 64, 256, 1024, 8 * 1024, 16 * 1024
 };
-#define SIZE_NUM         OSSL_NELEM(lengths_list)
+#define SIZE_NUM OSSL_NELEM(lengths_list)
 static const int *lengths = lengths_list;
 
 static const int aead_lengths_list[] = {
     2, 31, 136, 1024, 8 * 1024, 16 * 1024
 };
 
-#define START   0
-#define STOP    1
+#define START 0
+#define STOP 1
 
 #ifdef SIGALRM
 
@@ -165,7 +164,7 @@ static double Time_F(int s)
 
 #elif defined(_WIN32)
 
-# define SIGALRM -1
+#define SIGALRM -1
 
 static unsigned int lapse;
 static volatile unsigned int schlock;
@@ -174,9 +173,9 @@ static void alarm_win32(unsigned int secs)
     lapse = secs * 1000;
 }
 
-# define alarm alarm_win32
+#define alarm alarm_win32
 
-static DWORD WINAPI sleepy(VOID * arg)
+static DWORD WINAPI sleepy(VOID *arg)
 {
     schlock = 1;
     Sleep(lapse);
@@ -198,7 +197,7 @@ static double Time_F(int s)
             ExitProcess(err);
         }
         while (!schlock)
-            Sleep(0);           /* scheduler spinlock */
+            Sleep(0); /* scheduler spinlock */
         ret = app_tminterval(s, usertime);
     } else {
         ret = app_tminterval(s, usertime);
@@ -210,14 +209,14 @@ static double Time_F(int s)
     return ret;
 }
 #else
-# error "SIGALRM not defined and the platform is not Windows"
+#error "SIGALRM not defined and the platform is not Windows"
 #endif
 
 static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
-                             const openssl_speed_sec_t *seconds);
+    const openssl_speed_sec_t *seconds);
 
 static int opt_found(const char *name, unsigned int *result,
-                     const OPT_PAIR pairs[], unsigned int nbelem)
+    const OPT_PAIR pairs[], unsigned int nbelem)
 {
     unsigned int idx;
 
@@ -228,83 +227,124 @@ static int opt_found(const char *name, unsigned int *result,
         }
     return 0;
 }
-#define opt_found(value, pairs, result)\
+#define opt_found(value, pairs, result) \
     opt_found(value, result, pairs, OSSL_NELEM(pairs))
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_ELAPSED, OPT_EVP, OPT_HMAC, OPT_DECRYPT, OPT_ENGINE, OPT_MULTI,
-    OPT_MR, OPT_MB, OPT_MISALIGN, OPT_ASYNCJOBS, OPT_R_ENUM, OPT_PROV_ENUM,
-    OPT_CONFIG, OPT_PRIMES, OPT_SECONDS, OPT_BYTES, OPT_AEAD, OPT_CMAC,
-    OPT_MLOCK, OPT_TESTMODE, OPT_KEM, OPT_SIG
+    OPT_ELAPSED,
+    OPT_EVP,
+    OPT_HMAC,
+    OPT_DECRYPT,
+    OPT_ENGINE,
+    OPT_MULTI,
+    OPT_MR,
+    OPT_MB,
+    OPT_MISALIGN,
+    OPT_ASYNCJOBS,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM,
+    OPT_CONFIG,
+    OPT_PRIMES,
+    OPT_SECONDS,
+    OPT_BYTES,
+    OPT_AEAD,
+    OPT_CMAC,
+    OPT_MLOCK,
+    OPT_TESTMODE,
+    OPT_KEM,
+    OPT_SIG
 } OPTION_CHOICE;
 
 const OPTIONS speed_options[] = {
-    {OPT_HELP_STR, 1, '-',
-     "Usage: %s [options] [algorithm...]\n"
-     "All +int options consider prefix '0' as base-8 input, "
-     "prefix '0x'/'0X' as base-16 input.\n"
-    },
+    { OPT_HELP_STR, 1, '-',
+        "Usage: %s [options] [algorithm...]\n"
+        "All +int options consider prefix '0' as base-8 input, "
+        "prefix '0x'/'0X' as base-16 input.\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"mb", OPT_MB, '-',
-     "Enable (tls1>=1) multi-block mode on EVP-named cipher"},
-    {"mr", OPT_MR, '-', "Produce machine readable output"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "mb", OPT_MB, '-',
+        "Enable (tls1>=1) multi-block mode on EVP-named cipher" },
+    { "mr", OPT_MR, '-', "Produce machine readable output" },
 #ifndef NO_FORK
-    {"multi", OPT_MULTI, 'p', "Run benchmarks in parallel"},
+    { "multi", OPT_MULTI, 'p', "Run benchmarks in parallel" },
 #endif
 #ifndef OPENSSL_NO_ASYNC
-    {"async_jobs", OPT_ASYNCJOBS, 'p',
-     "Enable async mode and start specified number of jobs"},
+    { "async_jobs", OPT_ASYNCJOBS, 'p',
+        "Enable async mode and start specified number of jobs" },
 #endif
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
-    {"primes", OPT_PRIMES, 'p', "Specify number of primes (for RSA only)"},
-    {"mlock", OPT_MLOCK, '-', "Lock memory for better result determinism"},
-    {"testmode", OPT_TESTMODE, '-', "Run the speed command in test mode"},
+    { "primes", OPT_PRIMES, 'p', "Specify number of primes (for RSA only)" },
+    { "mlock", OPT_MLOCK, '-', "Lock memory for better result determinism" },
+    { "testmode", OPT_TESTMODE, '-', "Run the speed command in test mode" },
     OPT_CONFIG_OPTION,
 
     OPT_SECTION("Selection"),
-    {"evp", OPT_EVP, 's', "Use EVP-named cipher or digest"},
-    {"hmac", OPT_HMAC, 's', "HMAC using EVP-named digest"},
-    {"cmac", OPT_CMAC, 's', "CMAC using EVP-named cipher"},
-    {"decrypt", OPT_DECRYPT, '-',
-     "Time decryption instead of encryption (only EVP)"},
-    {"aead", OPT_AEAD, '-',
-     "Benchmark EVP-named AEAD cipher in TLS-like sequence"},
-    {"kem-algorithms", OPT_KEM, '-',
-     "Benchmark KEM algorithms"},
-    {"signature-algorithms", OPT_SIG, '-',
-     "Benchmark signature algorithms"},
+    { "evp", OPT_EVP, 's', "Use EVP-named cipher or digest" },
+    { "hmac", OPT_HMAC, 's', "HMAC using EVP-named digest" },
+    { "cmac", OPT_CMAC, 's', "CMAC using EVP-named cipher" },
+    { "decrypt", OPT_DECRYPT, '-',
+        "Time decryption instead of encryption (only EVP)" },
+    { "aead", OPT_AEAD, '-',
+        "Benchmark EVP-named AEAD cipher in TLS-like sequence" },
+    { "kem-algorithms", OPT_KEM, '-',
+        "Benchmark KEM algorithms" },
+    { "signature-algorithms", OPT_SIG, '-',
+        "Benchmark signature algorithms" },
 
     OPT_SECTION("Timing"),
-    {"elapsed", OPT_ELAPSED, '-',
-     "Use wall-clock time instead of CPU user time as divisor"},
-    {"seconds", OPT_SECONDS, 'p',
-     "Run benchmarks for specified amount of seconds"},
-    {"bytes", OPT_BYTES, 'p',
-     "Run [non-PKI] benchmarks on custom-sized buffer"},
-    {"misalign", OPT_MISALIGN, 'p',
-     "Use specified offset to mis-align buffers"},
+    { "elapsed", OPT_ELAPSED, '-',
+        "Use wall-clock time instead of CPU user time as divisor" },
+    { "seconds", OPT_SECONDS, 'p',
+        "Run benchmarks for specified amount of seconds" },
+    { "bytes", OPT_BYTES, 'p',
+        "Run [non-PKI] benchmarks on custom-sized buffer" },
+    { "misalign", OPT_MISALIGN, 'p',
+        "Use specified offset to mis-align buffers" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"algorithm", 0, 0, "Algorithm(s) to test (optional; otherwise tests all)"},
-    {NULL}
+    { "algorithm", 0, 0, "Algorithm(s) to test (optional; otherwise tests all)" },
+    { NULL }
 };
 
 enum {
-    D_MD2, D_MDC2, D_MD4, D_MD5, D_SHA1, D_RMD160,
-    D_SHA256, D_SHA512, D_WHIRLPOOL, D_HMAC,
-    D_CBC_DES, D_EDE3_DES, D_RC4, D_CBC_IDEA, D_CBC_SEED,
-    D_CBC_RC2, D_CBC_RC5, D_CBC_BF, D_CBC_CAST,
-    D_CBC_128_AES, D_CBC_192_AES, D_CBC_256_AES,
-    D_CBC_128_CML, D_CBC_192_CML, D_CBC_256_CML,
-    D_EVP, D_GHASH, D_RAND, D_EVP_CMAC, D_KMAC128, D_KMAC256,
+    D_MD2,
+    D_MDC2,
+    D_MD4,
+    D_MD5,
+    D_SHA1,
+    D_RMD160,
+    D_SHA256,
+    D_SHA512,
+    D_WHIRLPOOL,
+    D_HMAC,
+    D_CBC_DES,
+    D_EDE3_DES,
+    D_RC4,
+    D_CBC_IDEA,
+    D_CBC_SEED,
+    D_CBC_RC2,
+    D_CBC_RC5,
+    D_CBC_BF,
+    D_CBC_CAST,
+    D_CBC_128_AES,
+    D_CBC_192_AES,
+    D_CBC_256_AES,
+    D_CBC_128_CML,
+    D_CBC_192_CML,
+    D_CBC_256_CML,
+    D_EVP,
+    D_GHASH,
+    D_RAND,
+    D_EVP_CMAC,
+    D_KMAC128,
+    D_KMAC256,
     ALGOR_NUM
 };
 /* name of algorithms to test. MUST BE KEEP IN SYNC with above enum ! */
@@ -320,197 +360,233 @@ static const char *names[ALGOR_NUM] = {
 
 /* list of configured algorithm (remaining), with some few alias */
 static const OPT_PAIR doit_choices[] = {
-    {"md2", D_MD2},
-    {"mdc2", D_MDC2},
-    {"md4", D_MD4},
-    {"md5", D_MD5},
-    {"hmac", D_HMAC},
-    {"sha1", D_SHA1},
-    {"sha256", D_SHA256},
-    {"sha512", D_SHA512},
-    {"whirlpool", D_WHIRLPOOL},
-    {"ripemd", D_RMD160},
-    {"rmd160", D_RMD160},
-    {"ripemd160", D_RMD160},
-    {"rc4", D_RC4},
-    {"des-cbc", D_CBC_DES},
-    {"des-ede3", D_EDE3_DES},
-    {"aes-128-cbc", D_CBC_128_AES},
-    {"aes-192-cbc", D_CBC_192_AES},
-    {"aes-256-cbc", D_CBC_256_AES},
-    {"camellia-128-cbc", D_CBC_128_CML},
-    {"camellia-192-cbc", D_CBC_192_CML},
-    {"camellia-256-cbc", D_CBC_256_CML},
-    {"rc2-cbc", D_CBC_RC2},
-    {"rc2", D_CBC_RC2},
-    {"rc5-cbc", D_CBC_RC5},
-    {"rc5", D_CBC_RC5},
-    {"idea-cbc", D_CBC_IDEA},
-    {"idea", D_CBC_IDEA},
-    {"seed-cbc", D_CBC_SEED},
-    {"seed", D_CBC_SEED},
-    {"bf-cbc", D_CBC_BF},
-    {"blowfish", D_CBC_BF},
-    {"bf", D_CBC_BF},
-    {"cast-cbc", D_CBC_CAST},
-    {"cast", D_CBC_CAST},
-    {"cast5", D_CBC_CAST},
-    {"ghash", D_GHASH},
-    {"rand", D_RAND},
-    {"kmac128", D_KMAC128},
-    {"kmac256", D_KMAC256},
+    { "md2", D_MD2 },
+    { "mdc2", D_MDC2 },
+    { "md4", D_MD4 },
+    { "md5", D_MD5 },
+    { "hmac", D_HMAC },
+    { "sha1", D_SHA1 },
+    { "sha256", D_SHA256 },
+    { "sha512", D_SHA512 },
+    { "whirlpool", D_WHIRLPOOL },
+    { "ripemd", D_RMD160 },
+    { "rmd160", D_RMD160 },
+    { "ripemd160", D_RMD160 },
+    { "rc4", D_RC4 },
+    { "des-cbc", D_CBC_DES },
+    { "des-ede3", D_EDE3_DES },
+    { "aes-128-cbc", D_CBC_128_AES },
+    { "aes-192-cbc", D_CBC_192_AES },
+    { "aes-256-cbc", D_CBC_256_AES },
+    { "camellia-128-cbc", D_CBC_128_CML },
+    { "camellia-192-cbc", D_CBC_192_CML },
+    { "camellia-256-cbc", D_CBC_256_CML },
+    { "rc2-cbc", D_CBC_RC2 },
+    { "rc2", D_CBC_RC2 },
+    { "rc5-cbc", D_CBC_RC5 },
+    { "rc5", D_CBC_RC5 },
+    { "idea-cbc", D_CBC_IDEA },
+    { "idea", D_CBC_IDEA },
+    { "seed-cbc", D_CBC_SEED },
+    { "seed", D_CBC_SEED },
+    { "bf-cbc", D_CBC_BF },
+    { "blowfish", D_CBC_BF },
+    { "bf", D_CBC_BF },
+    { "cast-cbc", D_CBC_CAST },
+    { "cast", D_CBC_CAST },
+    { "cast5", D_CBC_CAST },
+    { "ghash", D_GHASH },
+    { "rand", D_RAND },
+    { "kmac128", D_KMAC128 },
+    { "kmac256", D_KMAC256 },
 };
 
 static double results[ALGOR_NUM][SIZE_NUM];
 
 #ifndef OPENSSL_NO_DSA
-enum { R_DSA_1024, R_DSA_2048, DSA_NUM };
+enum { R_DSA_1024,
+    R_DSA_2048,
+    DSA_NUM };
 static const OPT_PAIR dsa_choices[DSA_NUM] = {
-    {"dsa1024", R_DSA_1024},
-    {"dsa2048", R_DSA_2048}
+    { "dsa1024", R_DSA_1024 },
+    { "dsa2048", R_DSA_2048 }
 };
-static double dsa_results[DSA_NUM][2];  /* 2 ops: sign then verify */
+static double dsa_results[DSA_NUM][2]; /* 2 ops: sign then verify */
 #endif /* OPENSSL_NO_DSA */
 
 enum {
-    R_RSA_512, R_RSA_1024, R_RSA_2048, R_RSA_3072, R_RSA_4096, R_RSA_7680,
-    R_RSA_15360, RSA_NUM
+    R_RSA_512,
+    R_RSA_1024,
+    R_RSA_2048,
+    R_RSA_3072,
+    R_RSA_4096,
+    R_RSA_7680,
+    R_RSA_15360,
+    RSA_NUM
 };
 static const OPT_PAIR rsa_choices[RSA_NUM] = {
-    {"rsa512", R_RSA_512},
-    {"rsa1024", R_RSA_1024},
-    {"rsa2048", R_RSA_2048},
-    {"rsa3072", R_RSA_3072},
-    {"rsa4096", R_RSA_4096},
-    {"rsa7680", R_RSA_7680},
-    {"rsa15360", R_RSA_15360}
+    { "rsa512", R_RSA_512 },
+    { "rsa1024", R_RSA_1024 },
+    { "rsa2048", R_RSA_2048 },
+    { "rsa3072", R_RSA_3072 },
+    { "rsa4096", R_RSA_4096 },
+    { "rsa7680", R_RSA_7680 },
+    { "rsa15360", R_RSA_15360 }
 };
 
-static double rsa_results[RSA_NUM][4];  /* 4 ops: sign, verify, encrypt, decrypt */
+static double rsa_results[RSA_NUM][4]; /* 4 ops: sign, verify, encrypt, decrypt */
 
 #ifndef OPENSSL_NO_DH
 enum ff_params_t {
-    R_FFDH_2048, R_FFDH_3072, R_FFDH_4096, R_FFDH_6144, R_FFDH_8192, FFDH_NUM
+    R_FFDH_2048,
+    R_FFDH_3072,
+    R_FFDH_4096,
+    R_FFDH_6144,
+    R_FFDH_8192,
+    FFDH_NUM
 };
 
 static const OPT_PAIR ffdh_choices[FFDH_NUM] = {
-    {"ffdh2048", R_FFDH_2048},
-    {"ffdh3072", R_FFDH_3072},
-    {"ffdh4096", R_FFDH_4096},
-    {"ffdh6144", R_FFDH_6144},
-    {"ffdh8192", R_FFDH_8192},
+    { "ffdh2048", R_FFDH_2048 },
+    { "ffdh3072", R_FFDH_3072 },
+    { "ffdh4096", R_FFDH_4096 },
+    { "ffdh6144", R_FFDH_6144 },
+    { "ffdh8192", R_FFDH_8192 },
 };
 
-static double ffdh_results[FFDH_NUM][1];  /* 1 op: derivation */
+static double ffdh_results[FFDH_NUM][1]; /* 1 op: derivation */
 #endif /* OPENSSL_NO_DH */
 
 enum ec_curves_t {
-    R_EC_P160, R_EC_P192, R_EC_P224, R_EC_P256, R_EC_P384, R_EC_P521,
+    R_EC_P160,
+    R_EC_P192,
+    R_EC_P224,
+    R_EC_P256,
+    R_EC_P384,
+    R_EC_P521,
 #ifndef OPENSSL_NO_EC2M
-    R_EC_K163, R_EC_K233, R_EC_K283, R_EC_K409, R_EC_K571,
-    R_EC_B163, R_EC_B233, R_EC_B283, R_EC_B409, R_EC_B571,
+    R_EC_K163,
+    R_EC_K233,
+    R_EC_K283,
+    R_EC_K409,
+    R_EC_K571,
+    R_EC_B163,
+    R_EC_B233,
+    R_EC_B283,
+    R_EC_B409,
+    R_EC_B571,
 #endif
-    R_EC_BRP256R1, R_EC_BRP256T1, R_EC_BRP384R1, R_EC_BRP384T1,
-    R_EC_BRP512R1, R_EC_BRP512T1, ECDSA_NUM
+    R_EC_BRP256R1,
+    R_EC_BRP256T1,
+    R_EC_BRP384R1,
+    R_EC_BRP384T1,
+    R_EC_BRP512R1,
+    R_EC_BRP512T1,
+    ECDSA_NUM
 };
 /* list of ecdsa curves */
 static const OPT_PAIR ecdsa_choices[ECDSA_NUM] = {
-    {"ecdsap160", R_EC_P160},
-    {"ecdsap192", R_EC_P192},
-    {"ecdsap224", R_EC_P224},
-    {"ecdsap256", R_EC_P256},
-    {"ecdsap384", R_EC_P384},
-    {"ecdsap521", R_EC_P521},
+    { "ecdsap160", R_EC_P160 },
+    { "ecdsap192", R_EC_P192 },
+    { "ecdsap224", R_EC_P224 },
+    { "ecdsap256", R_EC_P256 },
+    { "ecdsap384", R_EC_P384 },
+    { "ecdsap521", R_EC_P521 },
 #ifndef OPENSSL_NO_EC2M
-    {"ecdsak163", R_EC_K163},
-    {"ecdsak233", R_EC_K233},
-    {"ecdsak283", R_EC_K283},
-    {"ecdsak409", R_EC_K409},
-    {"ecdsak571", R_EC_K571},
-    {"ecdsab163", R_EC_B163},
-    {"ecdsab233", R_EC_B233},
-    {"ecdsab283", R_EC_B283},
-    {"ecdsab409", R_EC_B409},
-    {"ecdsab571", R_EC_B571},
+    { "ecdsak163", R_EC_K163 },
+    { "ecdsak233", R_EC_K233 },
+    { "ecdsak283", R_EC_K283 },
+    { "ecdsak409", R_EC_K409 },
+    { "ecdsak571", R_EC_K571 },
+    { "ecdsab163", R_EC_B163 },
+    { "ecdsab233", R_EC_B233 },
+    { "ecdsab283", R_EC_B283 },
+    { "ecdsab409", R_EC_B409 },
+    { "ecdsab571", R_EC_B571 },
 #endif
-    {"ecdsabrp256r1", R_EC_BRP256R1},
-    {"ecdsabrp256t1", R_EC_BRP256T1},
-    {"ecdsabrp384r1", R_EC_BRP384R1},
-    {"ecdsabrp384t1", R_EC_BRP384T1},
-    {"ecdsabrp512r1", R_EC_BRP512R1},
-    {"ecdsabrp512t1", R_EC_BRP512T1}
+    { "ecdsabrp256r1", R_EC_BRP256R1 },
+    { "ecdsabrp256t1", R_EC_BRP256T1 },
+    { "ecdsabrp384r1", R_EC_BRP384R1 },
+    { "ecdsabrp384t1", R_EC_BRP384T1 },
+    { "ecdsabrp512r1", R_EC_BRP512R1 },
+    { "ecdsabrp512t1", R_EC_BRP512T1 }
 };
 enum {
 #ifndef OPENSSL_NO_ECX
-    R_EC_X25519 = ECDSA_NUM, R_EC_X448, EC_NUM
+    R_EC_X25519 = ECDSA_NUM,
+    R_EC_X448,
+    EC_NUM
 #else
     EC_NUM = ECDSA_NUM
 #endif
 };
 /* list of ecdh curves, extension of |ecdsa_choices| list above */
 static const OPT_PAIR ecdh_choices[EC_NUM] = {
-    {"ecdhp160", R_EC_P160},
-    {"ecdhp192", R_EC_P192},
-    {"ecdhp224", R_EC_P224},
-    {"ecdhp256", R_EC_P256},
-    {"ecdhp384", R_EC_P384},
-    {"ecdhp521", R_EC_P521},
+    { "ecdhp160", R_EC_P160 },
+    { "ecdhp192", R_EC_P192 },
+    { "ecdhp224", R_EC_P224 },
+    { "ecdhp256", R_EC_P256 },
+    { "ecdhp384", R_EC_P384 },
+    { "ecdhp521", R_EC_P521 },
 #ifndef OPENSSL_NO_EC2M
-    {"ecdhk163", R_EC_K163},
-    {"ecdhk233", R_EC_K233},
-    {"ecdhk283", R_EC_K283},
-    {"ecdhk409", R_EC_K409},
-    {"ecdhk571", R_EC_K571},
-    {"ecdhb163", R_EC_B163},
-    {"ecdhb233", R_EC_B233},
-    {"ecdhb283", R_EC_B283},
-    {"ecdhb409", R_EC_B409},
-    {"ecdhb571", R_EC_B571},
+    { "ecdhk163", R_EC_K163 },
+    { "ecdhk233", R_EC_K233 },
+    { "ecdhk283", R_EC_K283 },
+    { "ecdhk409", R_EC_K409 },
+    { "ecdhk571", R_EC_K571 },
+    { "ecdhb163", R_EC_B163 },
+    { "ecdhb233", R_EC_B233 },
+    { "ecdhb283", R_EC_B283 },
+    { "ecdhb409", R_EC_B409 },
+    { "ecdhb571", R_EC_B571 },
 #endif
-    {"ecdhbrp256r1", R_EC_BRP256R1},
-    {"ecdhbrp256t1", R_EC_BRP256T1},
-    {"ecdhbrp384r1", R_EC_BRP384R1},
-    {"ecdhbrp384t1", R_EC_BRP384T1},
-    {"ecdhbrp512r1", R_EC_BRP512R1},
-    {"ecdhbrp512t1", R_EC_BRP512T1},
+    { "ecdhbrp256r1", R_EC_BRP256R1 },
+    { "ecdhbrp256t1", R_EC_BRP256T1 },
+    { "ecdhbrp384r1", R_EC_BRP384R1 },
+    { "ecdhbrp384t1", R_EC_BRP384T1 },
+    { "ecdhbrp512r1", R_EC_BRP512R1 },
+    { "ecdhbrp512t1", R_EC_BRP512T1 },
 #ifndef OPENSSL_NO_ECX
-    {"ecdhx25519", R_EC_X25519},
-    {"ecdhx448", R_EC_X448}
+    { "ecdhx25519", R_EC_X25519 },
+    { "ecdhx448", R_EC_X448 }
 #endif
 };
 
-static double ecdh_results[EC_NUM][1];      /* 1 op: derivation */
-static double ecdsa_results[ECDSA_NUM][2];  /* 2 ops: sign then verify */
+static double ecdh_results[EC_NUM][1]; /* 1 op: derivation */
+static double ecdsa_results[ECDSA_NUM][2]; /* 2 ops: sign then verify */
 
 #ifndef OPENSSL_NO_ECX
-enum { R_EC_Ed25519, R_EC_Ed448, EdDSA_NUM };
+enum { R_EC_Ed25519,
+    R_EC_Ed448,
+    EdDSA_NUM };
 static const OPT_PAIR eddsa_choices[EdDSA_NUM] = {
-    {"ed25519", R_EC_Ed25519},
-    {"ed448", R_EC_Ed448}
+    { "ed25519", R_EC_Ed25519 },
+    { "ed448", R_EC_Ed448 }
 
 };
-static double eddsa_results[EdDSA_NUM][2];    /* 2 ops: sign then verify */
+static double eddsa_results[EdDSA_NUM][2]; /* 2 ops: sign then verify */
 #endif /* OPENSSL_NO_ECX */
 
 #ifndef OPENSSL_NO_SM2
-enum { R_EC_CURVESM2, SM2_NUM };
+enum { R_EC_CURVESM2,
+    SM2_NUM };
 static const OPT_PAIR sm2_choices[SM2_NUM] = {
-    {"curveSM2", R_EC_CURVESM2}
+    { "curveSM2", R_EC_CURVESM2 }
 };
-# define SM2_ID        "TLSv1.3+GM+Cipher+Suite"
-# define SM2_ID_LEN    sizeof("TLSv1.3+GM+Cipher+Suite") - 1
-static double sm2_results[SM2_NUM][2];    /* 2 ops: sign then verify */
+#define SM2_ID "TLSv1.3+GM+Cipher+Suite"
+#define SM2_ID_LEN sizeof("TLSv1.3+GM+Cipher+Suite") - 1
+static double sm2_results[SM2_NUM][2]; /* 2 ops: sign then verify */
 #endif /* OPENSSL_NO_SM2 */
 
 #define MAX_KEM_NUM 111
 static size_t kems_algs_len = 0;
 static char *kems_algname[MAX_KEM_NUM] = { NULL };
-static double kems_results[MAX_KEM_NUM][3];  /* keygen, encaps, decaps */
+static double kems_results[MAX_KEM_NUM][3]; /* keygen, encaps, decaps */
 
-#define MAX_SIG_NUM 111
+#define MAX_SIG_NUM 256
 static size_t sigs_algs_len = 0;
 static char *sigs_algname[MAX_SIG_NUM] = { NULL };
-static double sigs_results[MAX_SIG_NUM][3];  /* keygen, sign, verify */
+static double sigs_results[MAX_SIG_NUM][3]; /* keygen, sign, verify */
 
 #define COND(unused_cond) (run && count < (testmode ? 1 : INT_MAX))
 #define COUNT(d) (count)
@@ -573,15 +649,15 @@ typedef struct loopargs_st {
     unsigned char *kem_out[MAX_KEM_NUM];
     unsigned char *kem_send_secret[MAX_KEM_NUM];
     unsigned char *kem_rcv_secret[MAX_KEM_NUM];
-    EVP_PKEY_CTX *sig_gen_ctx[MAX_KEM_NUM];
-    EVP_PKEY_CTX *sig_sign_ctx[MAX_KEM_NUM];
-    EVP_PKEY_CTX *sig_verify_ctx[MAX_KEM_NUM];
-    size_t sig_max_sig_len[MAX_KEM_NUM];
-    size_t sig_act_sig_len[MAX_KEM_NUM];
-    unsigned char *sig_sig[MAX_KEM_NUM];
+    EVP_PKEY_CTX *sig_gen_ctx[MAX_SIG_NUM];
+    EVP_PKEY_CTX *sig_sign_ctx[MAX_SIG_NUM];
+    EVP_PKEY_CTX *sig_verify_ctx[MAX_SIG_NUM];
+    size_t sig_max_sig_len[MAX_SIG_NUM];
+    size_t sig_act_sig_len[MAX_SIG_NUM];
+    unsigned char *sig_sig[MAX_SIG_NUM];
 } loopargs_t;
-static int run_benchmark(int async_jobs, int (*loop_function) (void *),
-                         loopargs_t *loopargs);
+static int run_benchmark(int async_jobs, int (*loop_function)(void *),
+    loopargs_t *loopargs);
 
 static unsigned int testnum;
 
@@ -632,7 +708,7 @@ static int have_cipher(const char *name)
 
 static int EVP_Digest_loop(const char *mdname, ossl_unused int algindex, void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     unsigned char digest[EVP_MAX_MD_SIZE];
     int count;
@@ -649,9 +725,9 @@ static int EVP_Digest_loop(const char *mdname, ossl_unused int algindex, void *a
         }
 
         for (count = 0; COND(c[algindex][testnum]); count++) {
-             if (!EVP_DigestInit_ex2(ctx, md, NULL)
-                 || !EVP_DigestUpdate(ctx, buf, (size_t)lengths[testnum])
-                 || !EVP_DigestFinalXOF(ctx, digest, sizeof(digest))) {
+            if (!EVP_DigestInit_ex2(ctx, md, NULL)
+                || !EVP_DigestUpdate(ctx, buf, (size_t)lengths[testnum])
+                || !EVP_DigestFinalXOF(ctx, digest, sizeof(digest))) {
                 count = -1;
                 break;
             }
@@ -659,7 +735,7 @@ static int EVP_Digest_loop(const char *mdname, ossl_unused int algindex, void *a
     } else {
         for (count = 0; COND(c[algindex][testnum]); count++) {
             if (!EVP_Digest(buf, (size_t)lengths[testnum], digest, NULL, md,
-                            NULL)) {
+                    NULL)) {
                 count = -1;
                 break;
             }
@@ -697,8 +773,8 @@ static int MD5_loop(void *args)
 }
 
 static int mac_setup(const char *name,
-                     EVP_MAC **mac, OSSL_PARAM params[],
-                     loopargs_t *loopargs, unsigned int loopargs_len)
+    EVP_MAC **mac, OSSL_PARAM params[],
+    loopargs_t *loopargs, unsigned int loopargs_len)
 {
     unsigned int i;
 
@@ -719,7 +795,7 @@ static int mac_setup(const char *name,
 }
 
 static void mac_teardown(EVP_MAC **mac,
-                         loopargs_t *loopargs, unsigned int loopargs_len)
+    loopargs_t *loopargs, unsigned int loopargs_len)
 {
     unsigned int i;
 
@@ -733,7 +809,7 @@ static void mac_teardown(EVP_MAC **mac,
 
 static int EVP_MAC_loop(ossl_unused int algindex, void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     EVP_MAC_CTX *mctx = tempargs->mctx;
     unsigned char mac[EVP_MAX_MD_SIZE];
@@ -799,7 +875,7 @@ static int algindex;
 
 static int EVP_Cipher_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     int count;
 
@@ -813,7 +889,7 @@ static int EVP_Cipher_loop(void *args)
 
 static int GHASH_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     EVP_MAC_CTX *mctx = tempargs->mctx;
     int count;
@@ -831,8 +907,8 @@ static int GHASH_loop(void *args)
 static unsigned char iv[2 * MAX_BLOCK_SIZE / 8];
 
 static EVP_CIPHER_CTX *init_evp_cipher_ctx(const char *ciphername,
-                                           const unsigned char *key,
-                                           int keylen)
+    const unsigned char *key,
+    int keylen)
 {
     EVP_CIPHER_CTX *ctx = NULL;
     EVP_CIPHER *cipher = NULL;
@@ -868,7 +944,7 @@ static EVP_CIPHER_CTX *init_evp_cipher_ctx(const char *ciphername,
 
 static int RAND_bytes_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     int count;
 
@@ -880,7 +956,7 @@ static int RAND_bytes_loop(void *args)
 static int decrypt = 0;
 static int EVP_Update_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     EVP_CIPHER_CTX *ctx = tempargs->ctx;
     int outl, count, rc;
@@ -922,7 +998,7 @@ static int EVP_Update_loop(void *args)
  */
 static int EVP_Update_loop_aead_enc(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     unsigned char *key = tempargs->key;
     EVP_CIPHER_CTX *ctx = tempargs->ctx;
@@ -932,7 +1008,7 @@ static int EVP_Update_loop_aead_enc(void *args)
         /* Set length of iv (Doesn't apply to SIV mode) */
         if (mode_op != EVP_CIPH_SIV_MODE) {
             if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN,
-                                     sizeof(aead_iv), NULL)) {
+                    sizeof(aead_iv), NULL)) {
                 BIO_printf(bio_err, "\nFailed to set iv length\n");
                 dofail();
                 exit(1);
@@ -943,7 +1019,7 @@ static int EVP_Update_loop_aead_enc(void *args)
             && mode_op != EVP_CIPH_SIV_MODE
             && mode_op != EVP_CIPH_GCM_SIV_MODE) {
             if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
-                                     TAG_LEN, NULL)) {
+                    TAG_LEN, NULL)) {
                 BIO_printf(bio_err, "\nFailed to set tag length\n");
                 dofail();
                 exit(1);
@@ -957,7 +1033,7 @@ static int EVP_Update_loop_aead_enc(void *args)
         /* Set total length of input. Only required for CCM */
         if (mode_op == EVP_CIPH_CCM_MODE) {
             if (!EVP_EncryptUpdate(ctx, NULL, &outl,
-                                   NULL, lengths[testnum])) {
+                    NULL, lengths[testnum])) {
                 BIO_printf(bio_err, "\nCouldn't set input text length\n");
                 dofail();
                 exit(1);
@@ -992,7 +1068,7 @@ static int EVP_Update_loop_aead_enc(void *args)
  */
 static int EVP_Update_loop_aead_dec(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     unsigned char *outbuf = tempargs->buf2;
     unsigned char *key = tempargs->key;
@@ -1004,7 +1080,7 @@ static int EVP_Update_loop_aead_dec(void *args)
         /* Set the length of iv (Doesn't apply to SIV mode) */
         if (mode_op != EVP_CIPH_SIV_MODE) {
             if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN,
-                                     sizeof(aead_iv), NULL)) {
+                    sizeof(aead_iv), NULL)) {
                 BIO_printf(bio_err, "\nFailed to set iv length\n");
                 dofail();
                 exit(1);
@@ -1016,7 +1092,7 @@ static int EVP_Update_loop_aead_dec(void *args)
             && mode_op != EVP_CIPH_GCM_MODE
             && mode_op != EVP_CIPH_GCM_SIV_MODE) {
             if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
-                                     TAG_LEN, NULL)) {
+                    TAG_LEN, NULL)) {
                 BIO_printf(bio_err, "\nFailed to set tag length\n");
                 dofail();
                 exit(1);
@@ -1038,7 +1114,7 @@ static int EVP_Update_loop_aead_dec(void *args)
         memcpy(tag, tempargs->tag, TAG_LEN);
 
         if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
-                                 TAG_LEN, tag)) {
+                TAG_LEN, tag)) {
             BIO_printf(bio_err, "\nFailed to set tag\n");
             dofail();
             exit(1);
@@ -1046,7 +1122,7 @@ static int EVP_Update_loop_aead_dec(void *args)
         /* Set the total length of cipher text. Only required for CCM */
         if (mode_op == EVP_CIPH_CCM_MODE) {
             if (!EVP_DecryptUpdate(ctx, NULL, &outl,
-                                   NULL, lengths[testnum])) {
+                    NULL, lengths[testnum])) {
                 BIO_printf(bio_err, "\nCouldn't set cipher text length\n");
                 dofail();
                 exit(1);
@@ -1072,7 +1148,7 @@ static int EVP_Update_loop_aead_dec(void *args)
 
 static int RSA_sign_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     unsigned char *buf2 = tempargs->buf2;
     size_t *rsa_num = &tempargs->sigsize;
@@ -1094,7 +1170,7 @@ static int RSA_sign_loop(void *args)
 
 static int RSA_verify_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     unsigned char *buf2 = tempargs->buf2;
     size_t rsa_num = tempargs->sigsize;
@@ -1115,7 +1191,7 @@ static int RSA_verify_loop(void *args)
 
 static int RSA_encrypt_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     unsigned char *buf2 = tempargs->buf2;
     size_t *rsa_num = &tempargs->encsize;
@@ -1137,7 +1213,7 @@ static int RSA_encrypt_loop(void *args)
 
 static int RSA_decrypt_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     unsigned char *buf2 = tempargs->buf2;
     size_t rsa_num;
@@ -1161,7 +1237,7 @@ static int RSA_decrypt_loop(void *args)
 
 static int FFDH_derive_key_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     EVP_PKEY_CTX *ffdh_ctx = tempargs->ffdh_ctx[testnum];
     unsigned char *derived_secret = tempargs->secret_ff_a;
     int count;
@@ -1179,7 +1255,7 @@ static int FFDH_derive_key_loop(void *args)
 #ifndef OPENSSL_NO_DSA
 static int DSA_sign_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     unsigned char *buf2 = tempargs->buf2;
     size_t *dsa_num = &tempargs->sigsize;
@@ -1201,7 +1277,7 @@ static int DSA_sign_loop(void *args)
 
 static int DSA_verify_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     unsigned char *buf2 = tempargs->buf2;
     size_t dsa_num = tempargs->sigsize;
@@ -1223,7 +1299,7 @@ static int DSA_verify_loop(void *args)
 
 static int ECDSA_sign_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     unsigned char *buf2 = tempargs->buf2;
     size_t *ecdsa_num = &tempargs->sigsize;
@@ -1245,7 +1321,7 @@ static int ECDSA_sign_loop(void *args)
 
 static int ECDSA_verify_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     unsigned char *buf2 = tempargs->buf2;
     size_t ecdsa_num = tempargs->sigsize;
@@ -1254,7 +1330,7 @@ static int ECDSA_verify_loop(void *args)
 
     for (count = 0; COND(ecdsa_c[testnum][1]); count++) {
         ret = EVP_PKEY_verify(ecdsa_verify_ctx[testnum], buf2, ecdsa_num,
-                              buf, 20);
+            buf, 20);
         if (ret <= 0) {
             BIO_printf(bio_err, "ECDSA verify failure\n");
             dofail();
@@ -1269,7 +1345,7 @@ static int ECDSA_verify_loop(void *args)
 
 static int ECDH_EVP_derive_key_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     EVP_PKEY_CTX *ctx = tempargs->ecdh_ctx[testnum];
     unsigned char *derived_secret = tempargs->secret_a;
     int count;
@@ -1284,7 +1360,7 @@ static int ECDH_EVP_derive_key_loop(void *args)
 #ifndef OPENSSL_NO_ECX
 static int EdDSA_sign_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     EVP_MD_CTX **edctx = tempargs->eddsa_ctx;
     unsigned char *eddsasig = tempargs->buf2;
@@ -1312,7 +1388,7 @@ static int EdDSA_sign_loop(void *args)
 
 static int EdDSA_verify_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     EVP_MD_CTX **edctx = tempargs->eddsa_ctx2;
     unsigned char *eddsasig = tempargs->buf2;
@@ -1342,7 +1418,7 @@ static int EdDSA_verify_loop(void *args)
 #ifndef OPENSSL_NO_SM2
 static int SM2_sign_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     EVP_MD_CTX **sm2ctx = tempargs->sm2_ctx;
     unsigned char *sm2sig = tempargs->buf2;
@@ -1355,14 +1431,14 @@ static int SM2_sign_loop(void *args)
         sm2sigsize = max_size;
 
         if (!EVP_DigestSignInit(sm2ctx[testnum], NULL, EVP_sm3(),
-                                NULL, sm2_pkey[testnum])) {
+                NULL, sm2_pkey[testnum])) {
             BIO_printf(bio_err, "SM2 init sign failure\n");
             dofail();
             count = -1;
             break;
         }
         ret = EVP_DigestSign(sm2ctx[testnum], sm2sig, &sm2sigsize,
-                             buf, 20);
+            buf, 20);
         if (ret == 0) {
             BIO_printf(bio_err, "SM2 sign failure\n");
             dofail();
@@ -1378,7 +1454,7 @@ static int SM2_sign_loop(void *args)
 
 static int SM2_verify_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     unsigned char *buf = tempargs->buf;
     EVP_MD_CTX **sm2ctx = tempargs->sm2_vfy_ctx;
     unsigned char *sm2sig = tempargs->buf2;
@@ -1388,14 +1464,14 @@ static int SM2_verify_loop(void *args)
 
     for (count = 0; COND(sm2_c[testnum][1]); count++) {
         if (!EVP_DigestVerifyInit(sm2ctx[testnum], NULL, EVP_sm3(),
-                                  NULL, sm2_pkey[testnum])) {
+                NULL, sm2_pkey[testnum])) {
             BIO_printf(bio_err, "SM2 verify init failure\n");
             dofail();
             count = -1;
             break;
         }
         ret = EVP_DigestVerify(sm2ctx[testnum], sm2sig, sm2sigsize,
-                               buf, 20);
+            buf, 20);
         if (ret != 1) {
             BIO_printf(bio_err, "SM2 verify failure\n");
             dofail();
@@ -1405,11 +1481,11 @@ static int SM2_verify_loop(void *args)
     }
     return count;
 }
-#endif                         /* OPENSSL_NO_SM2 */
+#endif /* OPENSSL_NO_SM2 */
 
 static int KEM_keygen_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     EVP_PKEY_CTX *ctx = tempargs->kem_gen_ctx[testnum];
     EVP_PKEY *pkey = NULL;
     int count;
@@ -1432,7 +1508,7 @@ static int KEM_keygen_loop(void *args)
 
 static int KEM_encaps_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     EVP_PKEY_CTX *ctx = tempargs->kem_encaps_ctx[testnum];
     size_t out_len = tempargs->kem_out_len[testnum];
     size_t secret_len = tempargs->kem_secret_len[testnum];
@@ -1449,7 +1525,7 @@ static int KEM_encaps_loop(void *args)
 
 static int KEM_decaps_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     EVP_PKEY_CTX *ctx = tempargs->kem_decaps_ctx[testnum];
     size_t out_len = tempargs->kem_out_len[testnum];
     size_t secret_len = tempargs->kem_secret_len[testnum];
@@ -1466,7 +1542,7 @@ static int KEM_decaps_loop(void *args)
 
 static int SIG_keygen_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     EVP_PKEY_CTX *ctx = tempargs->sig_gen_ctx[testnum];
     EVP_PKEY *pkey = NULL;
     int count;
@@ -1482,11 +1558,11 @@ static int SIG_keygen_loop(void *args)
 
 static int SIG_sign_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     EVP_PKEY_CTX *ctx = tempargs->sig_sign_ctx[testnum];
     /* be sure to not change stored sig: */
     unsigned char *sig = app_malloc(tempargs->sig_max_sig_len[testnum],
-                                    "sig sign loop");
+        "sig sign loop");
     unsigned char md[SHA256_DIGEST_LENGTH] = { 0 };
     size_t md_len = SHA256_DIGEST_LENGTH;
     int count;
@@ -1508,7 +1584,7 @@ static int SIG_sign_loop(void *args)
 
 static int SIG_verify_loop(void *args)
 {
-    loopargs_t *tempargs = *(loopargs_t **) args;
+    loopargs_t *tempargs = *(loopargs_t **)args;
     EVP_PKEY_CTX *ctx = tempargs->sig_verify_ctx[testnum];
     size_t sig_len = tempargs->sig_act_sig_len[testnum];
     unsigned char *sig = tempargs->sig_sig[testnum];
@@ -1525,7 +1601,6 @@ static int SIG_verify_loop(void *args)
             count = -1;
             break;
         }
-
     }
     return count;
 }
@@ -1541,15 +1616,15 @@ static int check_block_size(EVP_CIPHER_CTX *ctx, int length)
     }
     if (length % blocksize != 0) {
         BIO_printf(bio_err,
-                   "\nRequested encryption length not a multiple of block size for %s!\n",
-                   EVP_CIPHER_get0_name(ciph));
+            "\nRequested encryption length not a multiple of block size for %s!\n",
+            EVP_CIPHER_get0_name(ciph));
         return 0;
     }
     return 1;
 }
 
 static int run_benchmark(int async_jobs,
-                         int (*loop_function) (void *), loopargs_t *loopargs)
+    int (*loop_function)(void *), loopargs_t *loopargs)
 {
     int job_op_count = 0;
     int total_op_count = 0;
@@ -1567,8 +1642,8 @@ static int run_benchmark(int async_jobs,
 
         /* Copy pointer content (looparg_t item address) into async context */
         ret = ASYNC_start_job(&loopargs[i].inprogress_job, loopargs[i].wait_ctx,
-                              &job_op_count, loop_function,
-                              (void *)&looparg_item, sizeof(looparg_item));
+            &job_op_count, loop_function,
+            (void *)&looparg_item, sizeof(looparg_item));
         switch (ret) {
         case ASYNC_PAUSE:
             ++num_inprogress;
@@ -1603,8 +1678,7 @@ static int run_benchmark(int async_jobs,
             if (loopargs[i].inprogress_job == NULL)
                 continue;
 
-            if (!ASYNC_WAIT_CTX_get_all_fds
-                (loopargs[i].wait_ctx, NULL, &num_job_fds)
+            if (!ASYNC_WAIT_CTX_get_all_fds(loopargs[i].wait_ctx, NULL, &num_job_fds)
                 || num_job_fds > 1) {
                 BIO_printf(bio_err, "Too many fds in ASYNC_WAIT_CTX\n");
                 dofail();
@@ -1612,7 +1686,7 @@ static int run_benchmark(int async_jobs,
                 break;
             }
             ASYNC_WAIT_CTX_get_all_fds(loopargs[i].wait_ctx, &job_fd,
-                                       &num_job_fds);
+                &num_job_fds);
             FD_SET(job_fd, &waitfdset);
             if (job_fd > max_fd)
                 max_fd = job_fd;
@@ -1620,9 +1694,9 @@ static int run_benchmark(int async_jobs,
 
         if (max_fd >= (OSSL_ASYNC_FD)FD_SETSIZE) {
             BIO_printf(bio_err,
-                       "Error: max_fd (%d) must be smaller than FD_SETSIZE (%d). "
-                       "Decrease the value of async_jobs\n",
-                       max_fd, FD_SETSIZE);
+                "Error: max_fd (%d) must be smaller than FD_SETSIZE (%d). "
+                "Decrease the value of async_jobs\n",
+                max_fd, FD_SETSIZE);
             dofail();
             error = 1;
             break;
@@ -1647,8 +1721,7 @@ static int run_benchmark(int async_jobs,
             if (loopargs[i].inprogress_job == NULL)
                 continue;
 
-            if (!ASYNC_WAIT_CTX_get_all_fds
-                (loopargs[i].wait_ctx, NULL, &num_job_fds)
+            if (!ASYNC_WAIT_CTX_get_all_fds(loopargs[i].wait_ctx, NULL, &num_job_fds)
                 || num_job_fds > 1) {
                 BIO_printf(bio_err, "Too many fds in ASYNC_WAIT_CTX\n");
                 dofail();
@@ -1656,7 +1729,7 @@ static int run_benchmark(int async_jobs,
                 break;
             }
             ASYNC_WAIT_CTX_get_all_fds(loopargs[i].wait_ctx, &job_fd,
-                                       &num_job_fds);
+                &num_job_fds);
 
 #if defined(OPENSSL_SYS_UNIX)
             if (num_job_fds == 1 && !FD_ISSET(job_fd, &waitfdset))
@@ -1669,9 +1742,9 @@ static int run_benchmark(int async_jobs,
 #endif
 
             ret = ASYNC_start_job(&loopargs[i].inprogress_job,
-                                  loopargs[i].wait_ctx, &job_op_count,
-                                  loop_function, (void *)(loopargs + i),
-                                  sizeof(loopargs_t));
+                loopargs[i].wait_ctx, &job_op_count,
+                loop_function, (void *)(loopargs + i),
+                sizeof(loopargs_t));
             switch (ret) {
             case ASYNC_PAUSE:
                 break;
@@ -1714,7 +1787,7 @@ static EVP_PKEY *get_ecdsa(const EC_CURVE *curve)
     /* Ensure that the error queue is empty */
     if (ERR_peek_error()) {
         BIO_printf(bio_err,
-                   "WARNING: the error queue contains previous unhandled errors.\n");
+            "WARNING: the error queue contains previous unhandled errors.\n");
         dofail();
     }
 
@@ -1746,7 +1819,7 @@ static EVP_PKEY *get_ecdsa(const EC_CURVE *curve)
             ERR_get_error(); /* pop error from queue */
         if (ERR_peek_error()) {
             BIO_printf(bio_err,
-                       "Unhandled error in the error queue during EC key setup.\n");
+                "Unhandled error in the error queue during EC key setup.\n");
             dofail();
             return NULL;
         }
@@ -1755,7 +1828,8 @@ static EVP_PKEY *get_ecdsa(const EC_CURVE *curve)
         if ((pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL)) == NULL
             || EVP_PKEY_paramgen_init(pctx) <= 0
             || EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx,
-                                                      curve->nid) <= 0
+                   curve->nid)
+                <= 0
             || EVP_PKEY_paramgen(pctx, &params) <= 0) {
             BIO_printf(bio_err, "EC params init failure.\n");
             dofail();
@@ -1779,25 +1853,25 @@ static EVP_PKEY *get_ecdsa(const EC_CURVE *curve)
     return key;
 }
 
-#define stop_it(do_it, test_num)\
+#define stop_it(do_it, test_num) \
     memset(do_it + test_num, 0, OSSL_NELEM(do_it) - test_num);
 
 /* Checks to see if algorithms are fetchable */
-#define IS_FETCHABLE(type, TYPE)                                \
-    static int is_ ## type ## _fetchable(const TYPE *alg)       \
-    {                                                           \
-        TYPE *impl;                                             \
-        const char *propq = app_get0_propq();                   \
-        OSSL_LIB_CTX *libctx = app_get0_libctx();               \
-        const char *name = TYPE ## _get0_name(alg);             \
-                                                                \
-        ERR_set_mark();                                         \
-        impl = TYPE ## _fetch(libctx, name, propq);             \
-        ERR_pop_to_mark();                                      \
-        if (impl == NULL)                                       \
-            return 0;                                           \
-        TYPE ## _free(impl);                                    \
-        return 1;                                               \
+#define IS_FETCHABLE(type, TYPE)                      \
+    static int is_##type##_fetchable(const TYPE *alg) \
+    {                                                 \
+        TYPE *impl;                                   \
+        const char *propq = app_get0_propq();         \
+        OSSL_LIB_CTX *libctx = app_get0_libctx();     \
+        const char *name = TYPE##_get0_name(alg);     \
+                                                      \
+        ERR_set_mark();                               \
+        impl = TYPE##_fetch(libctx, name, propq);     \
+        ERR_pop_to_mark();                            \
+        if (impl == NULL)                             \
+            return 0;                                 \
+        TYPE##_free(impl);                            \
+        return 1;                                     \
     }
 
 IS_FETCHABLE(signature, EVP_SIGNATURE)
@@ -1805,11 +1879,11 @@ IS_FETCHABLE(kem, EVP_KEM)
 
 DEFINE_STACK_OF(EVP_KEM)
 
-static int kems_cmp(const EVP_KEM * const *a,
-                    const EVP_KEM * const *b)
+static int kems_cmp(const EVP_KEM *const *a,
+    const EVP_KEM *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*b)));
 }
 
 static void collect_kem(EVP_KEM *kem, void *stack)
@@ -1817,8 +1891,8 @@ static void collect_kem(EVP_KEM *kem, void *stack)
     STACK_OF(EVP_KEM) *kem_stack = stack;
 
     if (is_kem_fetchable(kem)
-            && EVP_KEM_up_ref(kem)
-            && sk_EVP_KEM_push(kem_stack, kem) <= 0)
+        && EVP_KEM_up_ref(kem)
+        && sk_EVP_KEM_push(kem_stack, kem) <= 0)
         EVP_KEM_free(kem); /* up-ref successful but push to stack failed */
 }
 
@@ -1837,11 +1911,11 @@ static int kem_locate(const char *algo, unsigned int *idx)
 
 DEFINE_STACK_OF(EVP_SIGNATURE)
 
-static int signatures_cmp(const EVP_SIGNATURE * const *a,
-                          const EVP_SIGNATURE * const *b)
+static int signatures_cmp(const EVP_SIGNATURE *const *a,
+    const EVP_SIGNATURE *const *b)
 {
     return strcmp(OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*a)),
-                  OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*b)));
+        OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*b)));
 }
 
 static void collect_signatures(EVP_SIGNATURE *sig, void *stack)
@@ -1849,8 +1923,8 @@ static void collect_signatures(EVP_SIGNATURE *sig, void *stack)
     STACK_OF(EVP_SIGNATURE) *sig_stack = stack;
 
     if (is_signature_fetchable(sig)
-            && EVP_SIGNATURE_up_ref(sig)
-            && sk_EVP_SIGNATURE_push(sig_stack, sig) <= 0)
+        && EVP_SIGNATURE_up_ref(sig)
+        && sk_EVP_SIGNATURE_push(sig_stack, sig) <= 0)
         EVP_SIGNATURE_free(sig); /* up-ref successful but push to stack failed */
 }
 
@@ -1867,12 +1941,14 @@ static int sig_locate(const char *algo, unsigned int *idx)
     return 0;
 }
 
-static int get_max(const uint8_t doit[], size_t algs_len) {
+static int get_max(const uint8_t doit[], size_t algs_len)
+{
     size_t i = 0;
     int maxcnt = 0;
 
     for (i = 0; i < algs_len; i++)
-        if (maxcnt < doit[i]) maxcnt = doit[i];
+        if (maxcnt < doit[i])
+            maxcnt = doit[i];
     return maxcnt;
 }
 
@@ -1906,10 +1982,10 @@ int speed_main(int argc, char **argv)
 #endif
     long op_count = 1;
     openssl_speed_sec_t seconds = { SECONDS, RSA_SECONDS, DSA_SECONDS,
-                                    ECDSA_SECONDS, ECDH_SECONDS,
-                                    EdDSA_SECONDS, SM2_SECONDS,
-                                    FFDH_SECONDS, KEM_SECONDS,
-                                    SIG_SECONDS };
+        ECDSA_SECONDS, ECDH_SECONDS,
+        EdDSA_SECONDS, SM2_SECONDS,
+        FFDH_SECONDS, KEM_SECONDS,
+        SIG_SECONDS };
 
     static const unsigned char key32[32] = {
         0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
@@ -1920,19 +1996,19 @@ int speed_main(int argc, char **argv)
     static const unsigned char deskey[] = {
         0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, /* key1 */
         0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, /* key2 */
-        0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34  /* key3 */
+        0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12, 0x34 /* key3 */
     };
     static const struct {
         const unsigned char *data;
         unsigned int length;
         unsigned int bits;
     } rsa_keys[] = {
-        {   test512,   sizeof(test512),   512 },
-        {  test1024,  sizeof(test1024),  1024 },
-        {  test2048,  sizeof(test2048),  2048 },
-        {  test3072,  sizeof(test3072),  3072 },
-        {  test4096,  sizeof(test4096),  4096 },
-        {  test7680,  sizeof(test7680),  7680 },
+        { test512, sizeof(test512), 512 },
+        { test1024, sizeof(test1024), 1024 },
+        { test2048, sizeof(test2048), 2048 },
+        { test3072, sizeof(test3072), 3072 },
+        { test4096, sizeof(test4096), 4096 },
+        { test7680, sizeof(test7680), 7680 },
         { test15360, sizeof(test15360), 15360 }
     };
     uint8_t rsa_doit[RSA_NUM] = { 0 };
@@ -1945,11 +2021,11 @@ int speed_main(int argc, char **argv)
     } FFDH_PARAMS;
 
     static const FFDH_PARAMS ffdh_params[FFDH_NUM] = {
-        {"ffdh2048", NID_ffdhe2048, 2048},
-        {"ffdh3072", NID_ffdhe3072, 3072},
-        {"ffdh4096", NID_ffdhe4096, 4096},
-        {"ffdh6144", NID_ffdhe6144, 6144},
-        {"ffdh8192", NID_ffdhe8192, 8192}
+        { "ffdh2048", NID_ffdhe2048, 2048 },
+        { "ffdh3072", NID_ffdhe3072, 3072 },
+        { "ffdh4096", NID_ffdhe4096, 4096 },
+        { "ffdh6144", NID_ffdhe6144, 6144 },
+        { "ffdh8192", NID_ffdhe8192, 8192 }
     };
     uint8_t ffdh_doit[FFDH_NUM] = { 0 };
 
@@ -1966,48 +2042,48 @@ int speed_main(int argc, char **argv)
      */
     static const EC_CURVE ec_curves[EC_NUM] = {
         /* Prime Curves */
-        {"secp160r1", NID_secp160r1, 160},
-        {"nistp192", NID_X9_62_prime192v1, 192},
-        {"nistp224", NID_secp224r1, 224},
-        {"nistp256", NID_X9_62_prime256v1, 256},
-        {"nistp384", NID_secp384r1, 384},
-        {"nistp521", NID_secp521r1, 521},
+        { "secp160r1", NID_secp160r1, 160 },
+        { "nistp192", NID_X9_62_prime192v1, 192 },
+        { "nistp224", NID_secp224r1, 224 },
+        { "nistp256", NID_X9_62_prime256v1, 256 },
+        { "nistp384", NID_secp384r1, 384 },
+        { "nistp521", NID_secp521r1, 521 },
 #ifndef OPENSSL_NO_EC2M
         /* Binary Curves */
-        {"nistk163", NID_sect163k1, 163},
-        {"nistk233", NID_sect233k1, 233},
-        {"nistk283", NID_sect283k1, 283},
-        {"nistk409", NID_sect409k1, 409},
-        {"nistk571", NID_sect571k1, 571},
-        {"nistb163", NID_sect163r2, 163},
-        {"nistb233", NID_sect233r1, 233},
-        {"nistb283", NID_sect283r1, 283},
-        {"nistb409", NID_sect409r1, 409},
-        {"nistb571", NID_sect571r1, 571},
+        { "nistk163", NID_sect163k1, 163 },
+        { "nistk233", NID_sect233k1, 233 },
+        { "nistk283", NID_sect283k1, 283 },
+        { "nistk409", NID_sect409k1, 409 },
+        { "nistk571", NID_sect571k1, 571 },
+        { "nistb163", NID_sect163r2, 163 },
+        { "nistb233", NID_sect233r1, 233 },
+        { "nistb283", NID_sect283r1, 283 },
+        { "nistb409", NID_sect409r1, 409 },
+        { "nistb571", NID_sect571r1, 571 },
 #endif
-        {"brainpoolP256r1", NID_brainpoolP256r1, 256},
-        {"brainpoolP256t1", NID_brainpoolP256t1, 256},
-        {"brainpoolP384r1", NID_brainpoolP384r1, 384},
-        {"brainpoolP384t1", NID_brainpoolP384t1, 384},
-        {"brainpoolP512r1", NID_brainpoolP512r1, 512},
-        {"brainpoolP512t1", NID_brainpoolP512t1, 512},
+        { "brainpoolP256r1", NID_brainpoolP256r1, 256 },
+        { "brainpoolP256t1", NID_brainpoolP256t1, 256 },
+        { "brainpoolP384r1", NID_brainpoolP384r1, 384 },
+        { "brainpoolP384t1", NID_brainpoolP384t1, 384 },
+        { "brainpoolP512r1", NID_brainpoolP512r1, 512 },
+        { "brainpoolP512t1", NID_brainpoolP512t1, 512 },
 #ifndef OPENSSL_NO_ECX
         /* Other and ECDH only ones */
-        {"X25519", NID_X25519, 253},
-        {"X448", NID_X448, 448}
+        { "X25519", NID_X25519, 253 },
+        { "X448", NID_X448, 448 }
 #endif
     };
 #ifndef OPENSSL_NO_ECX
     static const EC_CURVE ed_curves[EdDSA_NUM] = {
         /* EdDSA */
-        {"Ed25519", NID_ED25519, 253, 64},
-        {"Ed448", NID_ED448, 456, 114}
+        { "Ed25519", NID_ED25519, 253, 64 },
+        { "Ed448", NID_ED448, 456, 114 }
     };
 #endif /* OPENSSL_NO_ECX */
 #ifndef OPENSSL_NO_SM2
     static const EC_CURVE sm2_curves[SM2_NUM] = {
         /* SM2 */
-        {"CurveSM2", NID_sm2, 256}
+        { "CurveSM2", NID_sm2, 256 }
     };
     uint8_t sm2_doit[SM2_NUM] = { 0 };
 #endif
@@ -2045,7 +2121,7 @@ int speed_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opterr:
+        opterr:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -2068,8 +2144,8 @@ int speed_main(int argc, char **argv)
             if (evp_cipher == NULL && evp_md_name == NULL) {
                 ERR_clear_last_mark();
                 BIO_printf(bio_err,
-                           "%s: %s is an unknown cipher or digest\n",
-                           prog, opt_arg());
+                    "%s: %s is an unknown cipher or digest\n",
+                    prog, opt_arg());
                 goto end;
             }
             ERR_pop_to_mark();
@@ -2078,7 +2154,7 @@ int speed_main(int argc, char **argv)
         case OPT_HMAC:
             if (!have_md(opt_arg())) {
                 BIO_printf(bio_err, "%s: %s is an unknown digest\n",
-                           prog, opt_arg());
+                    prog, opt_arg());
                 goto end;
             }
             evp_mac_mdname = opt_arg();
@@ -2087,7 +2163,7 @@ int speed_main(int argc, char **argv)
         case OPT_CMAC:
             if (!have_cipher(opt_arg())) {
                 BIO_printf(bio_err, "%s: %s is an unknown cipher\n",
-                           prog, opt_arg());
+                    prog, opt_arg());
                 goto end;
             }
             evp_mac_ciphername = opt_arg();
@@ -2122,8 +2198,8 @@ int speed_main(int argc, char **argv)
             }
             if (!ASYNC_is_capable()) {
                 BIO_printf(bio_err,
-                           "%s: async_jobs specified but async not supported\n",
-                           prog);
+                    "%s: async_jobs specified but async not supported\n",
+                    prog);
                 if (testmode)
                     /* Return success in the testmode. */
                     return 0;
@@ -2135,7 +2211,7 @@ int speed_main(int argc, char **argv)
             misalign = opt_int_arg();
             if (misalign > MISALIGN) {
                 BIO_printf(bio_err,
-                           "%s: Maximum offset is %d\n", prog, MISALIGN);
+                    "%s: Maximum offset is %d\n", prog, MISALIGN);
                 goto opterr;
             }
             break;
@@ -2146,8 +2222,8 @@ int speed_main(int argc, char **argv)
             multiblock = 1;
 #ifdef OPENSSL_NO_MULTIBLOCK
             BIO_printf(bio_err,
-                       "%s: -mb specified but multi-block support is disabled\n",
-                       prog);
+                "%s: -mb specified but multi-block support is disabled\n",
+                prog);
             goto end;
 #endif
             break;
@@ -2169,9 +2245,9 @@ int speed_main(int argc, char **argv)
             break;
         case OPT_SECONDS:
             seconds.sym = seconds.rsa = seconds.dsa = seconds.ecdsa
-                        = seconds.ecdh = seconds.eddsa
-                        = seconds.sm2 = seconds.ffdh
-                        = seconds.kem = seconds.sig = opt_int_arg();
+                = seconds.ecdh = seconds.eddsa
+                = seconds.sm2 = seconds.ffdh
+                = seconds.kem = seconds.sig = opt_int_arg();
             break;
         case OPT_BYTES:
             lengths_single = opt_int_arg();
@@ -2191,8 +2267,8 @@ int speed_main(int argc, char **argv)
             domlock = 1;
 #if !defined(_WIN32) && !defined(OPENSSL_SYS_LINUX)
             BIO_printf(bio_err,
-                       "%s: -mlock not supported on this platform\n",
-                       prog);
+                "%s: -mlock not supported on this platform\n",
+                prog);
             goto end;
 #endif
             break;
@@ -2214,7 +2290,7 @@ int speed_main(int argc, char **argv)
         if (strcmp(EVP_KEM_get0_name(kem), "RSA") == 0) {
             if (kems_algs_len + OSSL_NELEM(rsa_choices) >= MAX_KEM_NUM) {
                 BIO_printf(bio_err,
-                           "Too many KEMs registered. Change MAX_KEM_NUM.\n");
+                    "Too many KEMs registered. Change MAX_KEM_NUM.\n");
                 goto end;
             }
             for (i = 0; i < OSSL_NELEM(rsa_choices); i++) {
@@ -2224,7 +2300,7 @@ int speed_main(int argc, char **argv)
         } else if (strcmp(EVP_KEM_get0_name(kem), "EC") == 0) {
             if (kems_algs_len + 3 >= MAX_KEM_NUM) {
                 BIO_printf(bio_err,
-                           "Too many KEMs registered. Change MAX_KEM_NUM.\n");
+                    "Too many KEMs registered. Change MAX_KEM_NUM.\n");
                 goto end;
             }
             kems_doit[kems_algs_len] = 1;
@@ -2236,7 +2312,7 @@ int speed_main(int argc, char **argv)
         } else {
             if (kems_algs_len + 1 >= MAX_KEM_NUM) {
                 BIO_printf(bio_err,
-                           "Too many KEMs registered. Change MAX_KEM_NUM.\n");
+                    "Too many KEMs registered. Change MAX_KEM_NUM.\n");
                 goto end;
             }
             kems_doit[kems_algs_len] = 1;
@@ -2259,7 +2335,7 @@ int speed_main(int argc, char **argv)
         if (strcmp(sig_name, "RSA") == 0) {
             if (sigs_algs_len + OSSL_NELEM(rsa_choices) >= MAX_SIG_NUM) {
                 BIO_printf(bio_err,
-                           "Too many signatures registered. Change MAX_SIG_NUM.\n");
+                    "Too many signatures registered. Change MAX_SIG_NUM.\n");
                 goto end;
             }
             for (i = 0; i < OSSL_NELEM(rsa_choices); i++) {
@@ -2271,7 +2347,7 @@ int speed_main(int argc, char **argv)
         else if (strcmp(sig_name, "DSA") == 0) {
             if (sigs_algs_len + DSA_NUM >= MAX_SIG_NUM) {
                 BIO_printf(bio_err,
-                           "Too many signatures registered. Change MAX_SIG_NUM.\n");
+                    "Too many signatures registered. Change MAX_SIG_NUM.\n");
                 goto end;
             }
             for (i = 0; i < DSA_NUM; i++) {
@@ -2281,17 +2357,10 @@ int speed_main(int argc, char **argv)
         }
 #endif /* OPENSSL_NO_DSA */
         /* skipping these algs as tested elsewhere - and b/o setup is a pain */
-        else if (strcmp(sig_name, "ED25519") &&
-                 strcmp(sig_name, "ED448") &&
-                 strcmp(sig_name, "ECDSA") &&
-                 strcmp(sig_name, "HMAC") &&
-                 strcmp(sig_name, "SIPHASH") &&
-                 strcmp(sig_name, "POLY1305") &&
-                 strcmp(sig_name, "CMAC") &&
-                 strcmp(sig_name, "SM2")) { /* skip alg */
+        else if (strncmp(sig_name, "RSA", 3) && strncmp(sig_name, "DSA", 3) && strncmp(sig_name, "ED25519", 7) && strncmp(sig_name, "ED448", 5) && strncmp(sig_name, "ECDSA", 5) && strcmp(sig_name, "HMAC") && strcmp(sig_name, "SIPHASH") && strcmp(sig_name, "POLY1305") && strcmp(sig_name, "CMAC") && strcmp(sig_name, "SM2")) { /* skip alg */
             if (sigs_algs_len + 1 >= MAX_SIG_NUM) {
                 BIO_printf(bio_err,
-                           "Too many signatures registered. Change MAX_SIG_NUM.\n");
+                    "Too many signatures registered. Change MAX_SIG_NUM.\n");
                 goto end;
             }
             /* activate this provider algorithm */
@@ -2441,10 +2510,9 @@ int speed_main(int argc, char **argv)
         if (evp_cipher == NULL) {
             BIO_printf(bio_err, "-aead can be used only with an AEAD cipher\n");
             goto end;
-        } else if (!(EVP_CIPHER_get_flags(evp_cipher) &
-                     EVP_CIPH_FLAG_AEAD_CIPHER)) {
+        } else if (!(EVP_CIPHER_get_flags(evp_cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)) {
             BIO_printf(bio_err, "%s is not an AEAD cipher\n",
-                       EVP_CIPHER_get0_name(evp_cipher));
+                EVP_CIPHER_get0_name(evp_cipher));
             goto end;
         }
     }
@@ -2475,10 +2543,9 @@ int speed_main(int argc, char **argv)
             BIO_printf(bio_err, "-mb can be used only with a multi-block"
                                 " capable cipher\n");
             goto end;
-        } else if (!(EVP_CIPHER_get_flags(evp_cipher) &
-                     EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
+        } else if (!(EVP_CIPHER_get_flags(evp_cipher) & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
             BIO_printf(bio_err, "%s is not a multi-block capable\n",
-                       EVP_CIPHER_get0_name(evp_cipher));
+                EVP_CIPHER_get0_name(evp_cipher));
             goto end;
         } else if (async_jobs > 0) {
             BIO_printf(bio_err, "Async mode is not supported with -mb");
@@ -2496,12 +2563,11 @@ int speed_main(int argc, char **argv)
     }
 
     loopargs_len = (async_jobs == 0 ? 1 : async_jobs);
-    loopargs =
-        app_malloc(loopargs_len * sizeof(loopargs_t), "array of loopargs");
+    loopargs = app_malloc(loopargs_len * sizeof(loopargs_t), "array of loopargs");
     memset(loopargs, 0, loopargs_len * sizeof(loopargs_t));
 
     buflen = lengths[size_num - 1];
-    if (buflen < 36)    /* size of random vector in RSA benchmark */
+    if (buflen < 36) /* size of random vector in RSA benchmark */
         buflen = 36;
     if (INT_MAX - (MAX_MISALIGNMENT + 1) < buflen) {
         BIO_printf(bio_err, "Error: buffer size too large\n");
@@ -2570,14 +2636,16 @@ int speed_main(int argc, char **argv)
                 doit[i] = 0;
         }
         if ((mac = EVP_MAC_fetch(app_get0_libctx(), "GMAC",
-                                 app_get0_propq())) != NULL) {
+                 app_get0_propq()))
+            != NULL) {
             EVP_MAC_free(mac);
             mac = NULL;
         } else {
             doit[D_GHASH] = 0;
         }
         if ((mac = EVP_MAC_fetch(app_get0_libctx(), "HMAC",
-                                 app_get0_propq())) != NULL) {
+                 app_get0_propq()))
+            != NULL) {
             EVP_MAC_free(mac);
             mac = NULL;
         } else {
@@ -2610,8 +2678,8 @@ int speed_main(int argc, char **argv)
 
     if (usertime == 0 && !mr)
         BIO_printf(bio_err,
-                   "You have chosen to measure elapsed time "
-                   "instead of user CPU time.\n");
+            "You have chosen to measure elapsed time "
+            "instead of user CPU time.\n");
 
 #if SIGALRM > 0
     signal(SIGALRM, alarmed);
@@ -2737,12 +2805,10 @@ int speed_main(int argc, char **argv)
         BIO_snprintf(evp_hmac_name, hmac_name_len, "hmac(%s)", evp_mac_mdname);
         names[D_HMAC] = evp_hmac_name;
 
-        params[0] =
-            OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
-                                             evp_mac_mdname, 0);
-        params[1] =
-            OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
-                                              (char *)hmac_key, len);
+        params[0] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
+            evp_mac_mdname, 0);
+        params[1] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
+            (char *)hmac_key, len);
         params[2] = OSSL_PARAM_construct_end();
 
         if (mac_setup("HMAC", &mac, params, loopargs, loopargs_len) < 1)
@@ -2764,7 +2830,7 @@ int speed_main(int argc, char **argv)
 
         for (i = 0; st && i < loopargs_len; i++) {
             loopargs[i].ctx = init_evp_cipher_ctx("des-cbc", deskey,
-                                                  sizeof(deskey) / 3);
+                sizeof(deskey) / 3);
             st = loopargs[i].ctx != NULL;
         }
         algindex = D_CBC_DES;
@@ -2786,7 +2852,7 @@ int speed_main(int argc, char **argv)
 
         for (i = 0; st && i < loopargs_len; i++) {
             loopargs[i].ctx = init_evp_cipher_ctx("des-ede3-cbc", deskey,
-                                                  sizeof(deskey));
+                sizeof(deskey));
             st = loopargs[i].ctx != NULL;
         }
         algindex = D_EDE3_DES;
@@ -2795,8 +2861,7 @@ int speed_main(int argc, char **argv)
                 break;
             print_message(names[D_EDE3_DES], lengths[testnum], seconds.sym);
             Time_F(START);
-            count =
-                run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
+            count = run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
             d = Time_F(STOP);
             print_result(D_EDE3_DES, testnum, count, d);
         }
@@ -2812,7 +2877,7 @@ int speed_main(int argc, char **argv)
             keylen = 16 + k * 8;
             for (i = 0; st && i < loopargs_len; i++) {
                 loopargs[i].ctx = init_evp_cipher_ctx(names[algindex],
-                                                      key32, keylen);
+                    key32, keylen);
                 st = loopargs[i].ctx != NULL;
             }
 
@@ -2821,8 +2886,7 @@ int speed_main(int argc, char **argv)
                     break;
                 print_message(names[algindex], lengths[testnum], seconds.sym);
                 Time_F(START);
-                count =
-                    run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
+                count = run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
                 d = Time_F(STOP);
                 print_result(algindex, testnum, count, d);
             }
@@ -2839,7 +2903,7 @@ int speed_main(int argc, char **argv)
             keylen = 16 + k * 8;
             for (i = 0; st && i < loopargs_len; i++) {
                 loopargs[i].ctx = init_evp_cipher_ctx(names[algindex],
-                                                      key32, keylen);
+                    key32, keylen);
                 st = loopargs[i].ctx != NULL;
             }
 
@@ -2848,8 +2912,7 @@ int speed_main(int argc, char **argv)
                     break;
                 print_message(names[algindex], lengths[testnum], seconds.sym);
                 Time_F(START);
-                count =
-                    run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
+                count = run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
                 d = Time_F(STOP);
                 print_result(algindex, testnum, count, d);
             }
@@ -2865,7 +2928,7 @@ int speed_main(int argc, char **argv)
             keylen = 16;
             for (i = 0; st && i < loopargs_len; i++) {
                 loopargs[i].ctx = init_evp_cipher_ctx(names[algindex],
-                                                      key32, keylen);
+                    key32, keylen);
                 st = loopargs[i].ctx != NULL;
             }
 
@@ -2874,8 +2937,7 @@ int speed_main(int argc, char **argv)
                     break;
                 print_message(names[algindex], lengths[testnum], seconds.sym);
                 Time_F(START);
-                count =
-                    run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
+                count = run_benchmark(async_jobs, EVP_Cipher_loop, loopargs);
                 d = Time_F(STOP);
                 print_result(algindex, testnum, count, d);
             }
@@ -2888,12 +2950,12 @@ int speed_main(int argc, char **argv)
         OSSL_PARAM params[4];
 
         params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_CIPHER,
-                                                     "aes-128-gcm", 0);
+            "aes-128-gcm", 0);
         params[1] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_IV,
-                                                      (char *)gmac_iv,
-                                                      sizeof(gmac_iv) - 1);
+            (char *)gmac_iv,
+            sizeof(gmac_iv) - 1);
         params[2] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
-                                                      (void *)key32, 16);
+            (void *)key32, 16);
         params[3] = OSSL_PARAM_construct_end();
 
         if (mac_setup("GMAC", &mac, params, loopargs, loopargs_len) < 1)
@@ -2933,12 +2995,11 @@ int speed_main(int argc, char **argv)
      */
     if (doit[D_EVP]) {
         if (evp_cipher != NULL) {
-            int (*loopfunc) (void *);
+            int (*loopfunc)(void *);
             int outlen = 0;
             unsigned int ae_mode = 0;
 
-            if (multiblock && (EVP_CIPHER_get_flags(evp_cipher)
-                               & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
+            if (multiblock && (EVP_CIPHER_get_flags(evp_cipher) & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) {
                 multiblock_speed(evp_cipher, lengths_single, &seconds);
                 ret = 0;
                 goto end;
@@ -2985,7 +3046,7 @@ int speed_main(int argc, char **argv)
                      * authenticity and hence decryption will fail.
                      */
                     if (!EVP_CipherInit_ex(loopargs[k].ctx, evp_cipher, NULL,
-                                           NULL, NULL, ae_mode ? 1 : !decrypt)) {
+                            NULL, NULL, ae_mode ? 1 : !decrypt)) {
                         BIO_printf(bio_err, "\nCouldn't init the context\n");
                         dofail();
                         exit(1);
@@ -3000,22 +3061,22 @@ int speed_main(int argc, char **argv)
 
                     if (!ae_mode) {
                         if (!EVP_CipherInit_ex(loopargs[k].ctx, NULL, NULL,
-                                               loopargs[k].key, iv, -1)) {
+                                loopargs[k].key, iv, -1)) {
                             BIO_printf(bio_err, "\nFailed to set the key\n");
                             dofail();
                             exit(1);
                         }
                     } else if (mode_op == EVP_CIPH_SIV_MODE
-                               || mode_op == EVP_CIPH_GCM_SIV_MODE) {
+                        || mode_op == EVP_CIPH_GCM_SIV_MODE) {
                         EVP_CIPHER_CTX_ctrl(loopargs[k].ctx,
-                                            EVP_CTRL_SET_SPEED, 1, NULL);
+                            EVP_CTRL_SET_SPEED, 1, NULL);
                     }
                     if (ae_mode && decrypt) {
                         /* Set length of iv (Doesn't apply to SIV mode) */
                         if (mode_op != EVP_CIPH_SIV_MODE) {
                             if (!EVP_CIPHER_CTX_ctrl(loopargs[k].ctx,
-                                                     EVP_CTRL_AEAD_SET_IVLEN,
-                                                     sizeof(aead_iv), NULL)) {
+                                    EVP_CTRL_AEAD_SET_IVLEN,
+                                    sizeof(aead_iv), NULL)) {
                                 BIO_printf(bio_err, "\nFailed to set iv length\n");
                                 dofail();
                                 exit(1);
@@ -3026,16 +3087,16 @@ int speed_main(int argc, char **argv)
                             && mode_op != EVP_CIPH_SIV_MODE
                             && mode_op != EVP_CIPH_GCM_SIV_MODE) {
                             if (!EVP_CIPHER_CTX_ctrl(loopargs[k].ctx,
-                                                     EVP_CTRL_AEAD_SET_TAG,
-                                                     TAG_LEN, NULL)) {
+                                    EVP_CTRL_AEAD_SET_TAG,
+                                    TAG_LEN, NULL)) {
                                 BIO_printf(bio_err,
-                                           "\nFailed to set tag length\n");
+                                    "\nFailed to set tag length\n");
                                 dofail();
                                 exit(1);
                             }
                         }
                         if (!EVP_CipherInit_ex(loopargs[k].ctx, NULL, NULL,
-                                               loopargs[k].key, aead_iv, -1)) {
+                                loopargs[k].key, aead_iv, -1)) {
                             BIO_printf(bio_err, "\nFailed to set the key\n");
                             dofail();
                             exit(1);
@@ -3043,42 +3104,42 @@ int speed_main(int argc, char **argv)
                         /* Set total length of input. Only required for CCM */
                         if (mode_op == EVP_CIPH_CCM_MODE) {
                             if (!EVP_EncryptUpdate(loopargs[k].ctx, NULL,
-                                                   &outlen, NULL,
-                                                   lengths[testnum])) {
+                                    &outlen, NULL,
+                                    lengths[testnum])) {
                                 BIO_printf(bio_err,
-                                           "\nCouldn't set input text length\n");
+                                    "\nCouldn't set input text length\n");
                                 dofail();
                                 exit(1);
                             }
                         }
                         if (aead) {
                             if (!EVP_EncryptUpdate(loopargs[k].ctx, NULL,
-                                                   &outlen, aad, sizeof(aad))) {
+                                    &outlen, aad, sizeof(aad))) {
                                 BIO_printf(bio_err,
-                                           "\nCouldn't insert AAD when encrypting\n");
+                                    "\nCouldn't insert AAD when encrypting\n");
                                 dofail();
                                 exit(1);
                             }
                         }
                         if (!EVP_EncryptUpdate(loopargs[k].ctx, loopargs[k].buf,
-                                               &outlen, loopargs[k].buf,
-                                               lengths[testnum])) {
+                                &outlen, loopargs[k].buf,
+                                lengths[testnum])) {
                             BIO_printf(bio_err,
-                                       "\nFailed to to encrypt the data\n");
+                                "\nFailed to to encrypt the data\n");
                             dofail();
                             exit(1);
                         }
 
                         if (!EVP_EncryptFinal_ex(loopargs[k].ctx,
-                                                 loopargs[k].buf, &outlen)) {
+                                loopargs[k].buf, &outlen)) {
                             BIO_printf(bio_err,
-                                       "\nFailed finalize the encryption\n");
+                                "\nFailed finalize the encryption\n");
                             dofail();
                             exit(1);
                         }
 
                         if (!EVP_CIPHER_CTX_ctrl(loopargs[k].ctx, EVP_CTRL_AEAD_GET_TAG,
-                                                 TAG_LEN, &loopargs[k].tag)) {
+                                TAG_LEN, &loopargs[k].tag)) {
                             BIO_printf(bio_err, "\nFailed to get the tag\n");
                             dofail();
                             exit(1);
@@ -3088,13 +3149,13 @@ int speed_main(int argc, char **argv)
                         loopargs[k].ctx = EVP_CIPHER_CTX_new();
                         if (loopargs[k].ctx == NULL) {
                             BIO_printf(bio_err,
-                                       "\nEVP_CIPHER_CTX_new failure\n");
+                                "\nEVP_CIPHER_CTX_new failure\n");
                             exit(1);
                         }
                         if (!EVP_CipherInit_ex(loopargs[k].ctx, evp_cipher,
-                                               NULL, NULL, NULL, 0)) {
+                                NULL, NULL, NULL, 0)) {
                             BIO_printf(bio_err,
-                                       "\nFailed initializing the context\n");
+                                "\nFailed initializing the context\n");
                             dofail();
                             exit(1);
                         }
@@ -3105,7 +3166,7 @@ int speed_main(int argc, char **argv)
                         if (mode_op == EVP_CIPH_SIV_MODE
                             || mode_op == EVP_CIPH_GCM_SIV_MODE)
                             EVP_CIPHER_CTX_ctrl(loopargs[k].ctx,
-                                                EVP_CTRL_SET_SPEED, 1, NULL);
+                                EVP_CTRL_SET_SPEED, 1, NULL);
                     }
                 }
 
@@ -3152,9 +3213,9 @@ int speed_main(int argc, char **argv)
         names[D_EVP_CMAC] = evp_cmac_name;
 
         params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_CIPHER,
-                                                     evp_mac_ciphername, 0);
+            evp_mac_ciphername, 0);
         params[1] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
-                                                      (char *)key32, keylen);
+            (char *)key32, keylen);
         params[2] = OSSL_PARAM_construct_end();
 
         if (mac_setup("CMAC", &mac, params, loopargs, loopargs_len) < 1)
@@ -3175,7 +3236,7 @@ int speed_main(int argc, char **argv)
         OSSL_PARAM params[2];
 
         params[0] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
-                                                      (void *)key32, 16);
+            (void *)key32, 16);
         params[1] = OSSL_PARAM_construct_end();
 
         if (mac_setup("KMAC-128", &mac, params, loopargs, loopargs_len) < 1)
@@ -3196,7 +3257,7 @@ int speed_main(int argc, char **argv)
         OSSL_PARAM params[2];
 
         params[0] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
-                                                      (void *)key32, 32);
+            (void *)key32, 32);
         params[1] = OSSL_PARAM_construct_end();
 
         if (mac_setup("KMAC-256", &mac, params, loopargs, loopargs_len) < 1)
@@ -3242,7 +3303,8 @@ int speed_main(int argc, char **argv)
             const unsigned char *p = rsa_keys[testnum].data;
 
             st = (rsa_key = d2i_PrivateKey(EVP_PKEY_RSA, NULL, &p,
-                                           rsa_keys[testnum].length)) != NULL;
+                      rsa_keys[testnum].length))
+                != NULL;
         }
 
         for (i = 0; st && i < loopargs_len; i++) {
@@ -3251,57 +3313,59 @@ int speed_main(int argc, char **argv)
             if (loopargs[i].rsa_sign_ctx[testnum] == NULL
                 || EVP_PKEY_sign_init(loopargs[i].rsa_sign_ctx[testnum]) <= 0
                 || EVP_PKEY_sign(loopargs[i].rsa_sign_ctx[testnum],
-                                 loopargs[i].buf2,
-                                 &loopargs[i].sigsize,
-                                 loopargs[i].buf, 36) <= 0)
+                       loopargs[i].buf2,
+                       &loopargs[i].sigsize,
+                       loopargs[i].buf, 36)
+                    <= 0)
                 st = 0;
         }
         if (!st) {
             BIO_printf(bio_err,
-                       "RSA sign setup failure.  No RSA sign will be done.\n");
+                "RSA sign setup failure.  No RSA sign will be done.\n");
             dofail();
             op_count = 1;
         } else {
             pkey_print_message("private", "rsa sign",
-                               rsa_keys[testnum].bits, seconds.rsa);
+                rsa_keys[testnum].bits, seconds.rsa);
             /* RSA_blinding_on(rsa_key[testnum],NULL); */
             Time_F(START);
             count = run_benchmark(async_jobs, RSA_sign_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R1:%ld:%d:%.2f\n"
-                       : "%ld %u bits private RSA sign ops in %.2fs\n",
-                       count, rsa_keys[testnum].bits, d);
+                mr ? "+R1:%ld:%d:%.2f\n"
+                   : "%ld %u bits private RSA sign ops in %.2fs\n",
+                count, rsa_keys[testnum].bits, d);
             rsa_results[testnum][0] = (double)count / d;
             op_count = count;
         }
 
         for (i = 0; st && i < loopargs_len; i++) {
             loopargs[i].rsa_verify_ctx[testnum] = EVP_PKEY_CTX_new(rsa_key,
-                                                                   NULL);
+                NULL);
             if (loopargs[i].rsa_verify_ctx[testnum] == NULL
                 || EVP_PKEY_verify_init(loopargs[i].rsa_verify_ctx[testnum]) <= 0
                 || EVP_PKEY_verify(loopargs[i].rsa_verify_ctx[testnum],
-                                   loopargs[i].buf2,
-                                   loopargs[i].sigsize,
-                                   loopargs[i].buf, 36) <= 0)
+                       loopargs[i].buf2,
+                       loopargs[i].sigsize,
+                       loopargs[i].buf, 36)
+                    <= 0)
                 st = 0;
         }
         if (!st) {
             BIO_printf(bio_err,
-                       "RSA verify setup failure.  No RSA verify will be done.\n");
+                "RSA verify setup failure.  No RSA verify will be done.\n");
             dofail();
             rsa_doit[testnum] = 0;
         } else {
             pkey_print_message("public", "rsa verify",
-                               rsa_keys[testnum].bits, seconds.rsa);
+                rsa_keys[testnum].bits, seconds.rsa);
             Time_F(START);
             count = run_benchmark(async_jobs, RSA_verify_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R2:%ld:%d:%.2f\n"
-                       : "%ld %u bits public RSA verify ops in %.2fs\n",
-                       count, rsa_keys[testnum].bits, d);
+                mr ? "+R2:%ld:%d:%.2f\n"
+                   : "%ld %u bits public RSA verify ops in %.2fs\n",
+                count, rsa_keys[testnum].bits, d);
             rsa_results[testnum][1] = (double)count / d;
         }
 
@@ -3311,27 +3375,28 @@ int speed_main(int argc, char **argv)
             if (loopargs[i].rsa_encrypt_ctx[testnum] == NULL
                 || EVP_PKEY_encrypt_init(loopargs[i].rsa_encrypt_ctx[testnum]) <= 0
                 || EVP_PKEY_encrypt(loopargs[i].rsa_encrypt_ctx[testnum],
-                                    loopargs[i].buf2,
-                                    &loopargs[i].encsize,
-                                    loopargs[i].buf, 36) <= 0)
+                       loopargs[i].buf2,
+                       &loopargs[i].encsize,
+                       loopargs[i].buf, 36)
+                    <= 0)
                 st = 0;
         }
         if (!st) {
             BIO_printf(bio_err,
-                       "RSA encrypt setup failure.  No RSA encrypt will be done.\n");
+                "RSA encrypt setup failure.  No RSA encrypt will be done.\n");
             dofail();
             op_count = 1;
         } else {
             pkey_print_message("public", "rsa encrypt",
-                               rsa_keys[testnum].bits, seconds.rsa);
+                rsa_keys[testnum].bits, seconds.rsa);
             /* RSA_blinding_on(rsa_key[testnum],NULL); */
             Time_F(START);
             count = run_benchmark(async_jobs, RSA_encrypt_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R3:%ld:%d:%.2f\n"
-                       : "%ld %u bits public RSA encrypt ops in %.2fs\n",
-                       count, rsa_keys[testnum].bits, d);
+                mr ? "+R3:%ld:%d:%.2f\n"
+                   : "%ld %u bits public RSA encrypt ops in %.2fs\n",
+                count, rsa_keys[testnum].bits, d);
             rsa_results[testnum][2] = (double)count / d;
             op_count = count;
         }
@@ -3342,28 +3407,29 @@ int speed_main(int argc, char **argv)
             if (loopargs[i].rsa_decrypt_ctx[testnum] == NULL
                 || EVP_PKEY_decrypt_init(loopargs[i].rsa_decrypt_ctx[testnum]) <= 0
                 || EVP_PKEY_decrypt(loopargs[i].rsa_decrypt_ctx[testnum],
-                                    loopargs[i].buf,
-                                    &declen,
-                                    loopargs[i].buf2,
-                                    loopargs[i].encsize) <= 0)
+                       loopargs[i].buf,
+                       &declen,
+                       loopargs[i].buf2,
+                       loopargs[i].encsize)
+                    <= 0)
                 st = 0;
         }
         if (!st) {
             BIO_printf(bio_err,
-                       "RSA decrypt setup failure.  No RSA decrypt will be done.\n");
+                "RSA decrypt setup failure.  No RSA decrypt will be done.\n");
             dofail();
             op_count = 1;
         } else {
             pkey_print_message("private", "rsa decrypt",
-                               rsa_keys[testnum].bits, seconds.rsa);
+                rsa_keys[testnum].bits, seconds.rsa);
             /* RSA_blinding_on(rsa_key[testnum],NULL); */
             Time_F(START);
             count = run_benchmark(async_jobs, RSA_decrypt_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R4:%ld:%d:%.2f\n"
-                       : "%ld %u bits private RSA decrypt ops in %.2fs\n",
-                       count, rsa_keys[testnum].bits, d);
+                mr ? "+R4:%ld:%d:%.2f\n"
+                   : "%ld %u bits private RSA decrypt ops in %.2fs\n",
+                count, rsa_keys[testnum].bits, d);
             rsa_results[testnum][3] = (double)count / d;
             op_count = count;
         }
@@ -3387,61 +3453,63 @@ int speed_main(int argc, char **argv)
 
         for (i = 0; st && i < loopargs_len; i++) {
             loopargs[i].dsa_sign_ctx[testnum] = EVP_PKEY_CTX_new(dsa_key,
-                                                                 NULL);
+                NULL);
             loopargs[i].sigsize = loopargs[i].buflen;
             if (loopargs[i].dsa_sign_ctx[testnum] == NULL
                 || EVP_PKEY_sign_init(loopargs[i].dsa_sign_ctx[testnum]) <= 0
                 || EVP_PKEY_sign(loopargs[i].dsa_sign_ctx[testnum],
-                                 loopargs[i].buf2,
-                                 &loopargs[i].sigsize,
-                                 loopargs[i].buf, 20) <= 0)
+                       loopargs[i].buf2,
+                       &loopargs[i].sigsize,
+                       loopargs[i].buf, 20)
+                    <= 0)
                 st = 0;
         }
         if (!st) {
             BIO_printf(bio_err,
-                       "DSA sign setup failure.  No DSA sign will be done.\n");
+                "DSA sign setup failure.  No DSA sign will be done.\n");
             dofail();
             op_count = 1;
         } else {
             pkey_print_message("sign", "dsa",
-                               dsa_bits[testnum], seconds.dsa);
+                dsa_bits[testnum], seconds.dsa);
             Time_F(START);
             count = run_benchmark(async_jobs, DSA_sign_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R5:%ld:%u:%.2f\n"
-                       : "%ld %u bits DSA sign ops in %.2fs\n",
-                       count, dsa_bits[testnum], d);
+                mr ? "+R5:%ld:%u:%.2f\n"
+                   : "%ld %u bits DSA sign ops in %.2fs\n",
+                count, dsa_bits[testnum], d);
             dsa_results[testnum][0] = (double)count / d;
             op_count = count;
         }
 
         for (i = 0; st && i < loopargs_len; i++) {
             loopargs[i].dsa_verify_ctx[testnum] = EVP_PKEY_CTX_new(dsa_key,
-                                                                   NULL);
+                NULL);
             if (loopargs[i].dsa_verify_ctx[testnum] == NULL
                 || EVP_PKEY_verify_init(loopargs[i].dsa_verify_ctx[testnum]) <= 0
                 || EVP_PKEY_verify(loopargs[i].dsa_verify_ctx[testnum],
-                                   loopargs[i].buf2,
-                                   loopargs[i].sigsize,
-                                   loopargs[i].buf, 36) <= 0)
+                       loopargs[i].buf2,
+                       loopargs[i].sigsize,
+                       loopargs[i].buf, 36)
+                    <= 0)
                 st = 0;
         }
         if (!st) {
             BIO_printf(bio_err,
-                       "DSA verify setup failure.  No DSA verify will be done.\n");
+                "DSA verify setup failure.  No DSA verify will be done.\n");
             dofail();
             dsa_doit[testnum] = 0;
         } else {
             pkey_print_message("verify", "dsa",
-                               dsa_bits[testnum], seconds.dsa);
+                dsa_bits[testnum], seconds.dsa);
             Time_F(START);
             count = run_benchmark(async_jobs, DSA_verify_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R6:%ld:%u:%.2f\n"
-                       : "%ld %u bits DSA verify ops in %.2fs\n",
-                       count, dsa_bits[testnum], d);
+                mr ? "+R6:%ld:%u:%.2f\n"
+                   : "%ld %u bits DSA verify ops in %.2fs\n",
+                count, dsa_bits[testnum], d);
             dsa_results[testnum][1] = (double)count / d;
         }
 
@@ -3464,61 +3532,63 @@ int speed_main(int argc, char **argv)
 
         for (i = 0; st && i < loopargs_len; i++) {
             loopargs[i].ecdsa_sign_ctx[testnum] = EVP_PKEY_CTX_new(ecdsa_key,
-                                                                   NULL);
+                NULL);
             loopargs[i].sigsize = loopargs[i].buflen;
             if (loopargs[i].ecdsa_sign_ctx[testnum] == NULL
                 || EVP_PKEY_sign_init(loopargs[i].ecdsa_sign_ctx[testnum]) <= 0
                 || EVP_PKEY_sign(loopargs[i].ecdsa_sign_ctx[testnum],
-                                 loopargs[i].buf2,
-                                 &loopargs[i].sigsize,
-                                 loopargs[i].buf, 20) <= 0)
+                       loopargs[i].buf2,
+                       &loopargs[i].sigsize,
+                       loopargs[i].buf, 20)
+                    <= 0)
                 st = 0;
         }
         if (!st) {
             BIO_printf(bio_err,
-                       "ECDSA sign setup failure.  No ECDSA sign will be done.\n");
+                "ECDSA sign setup failure.  No ECDSA sign will be done.\n");
             dofail();
             op_count = 1;
         } else {
             pkey_print_message("sign", "ecdsa",
-                               ec_curves[testnum].bits, seconds.ecdsa);
+                ec_curves[testnum].bits, seconds.ecdsa);
             Time_F(START);
             count = run_benchmark(async_jobs, ECDSA_sign_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R7:%ld:%u:%.2f\n"
-                       : "%ld %u bits ECDSA sign ops in %.2fs\n",
-                       count, ec_curves[testnum].bits, d);
+                mr ? "+R7:%ld:%u:%.2f\n"
+                   : "%ld %u bits ECDSA sign ops in %.2fs\n",
+                count, ec_curves[testnum].bits, d);
             ecdsa_results[testnum][0] = (double)count / d;
             op_count = count;
         }
 
         for (i = 0; st && i < loopargs_len; i++) {
             loopargs[i].ecdsa_verify_ctx[testnum] = EVP_PKEY_CTX_new(ecdsa_key,
-                                                                     NULL);
+                NULL);
             if (loopargs[i].ecdsa_verify_ctx[testnum] == NULL
                 || EVP_PKEY_verify_init(loopargs[i].ecdsa_verify_ctx[testnum]) <= 0
                 || EVP_PKEY_verify(loopargs[i].ecdsa_verify_ctx[testnum],
-                                   loopargs[i].buf2,
-                                   loopargs[i].sigsize,
-                                   loopargs[i].buf, 20) <= 0)
+                       loopargs[i].buf2,
+                       loopargs[i].sigsize,
+                       loopargs[i].buf, 20)
+                    <= 0)
                 st = 0;
         }
         if (!st) {
             BIO_printf(bio_err,
-                       "ECDSA verify setup failure.  No ECDSA verify will be done.\n");
+                "ECDSA verify setup failure.  No ECDSA verify will be done.\n");
             dofail();
             ecdsa_doit[testnum] = 0;
         } else {
             pkey_print_message("verify", "ecdsa",
-                               ec_curves[testnum].bits, seconds.ecdsa);
+                ec_curves[testnum].bits, seconds.ecdsa);
             Time_F(START);
             count = run_benchmark(async_jobs, ECDSA_verify_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R8:%ld:%u:%.2f\n"
-                       : "%ld %u bits ECDSA verify ops in %.2fs\n",
-                       count, ec_curves[testnum].bits, d);
+                mr ? "+R8:%ld:%u:%.2f\n"
+                   : "%ld %u bits ECDSA verify ops in %.2fs\n",
+                count, ec_curves[testnum].bits, d);
             ecdsa_results[testnum][1] = (double)count / d;
         }
 
@@ -3580,7 +3650,7 @@ int speed_main(int argc, char **argv)
 
             /* Compare the computation results: CRYPTO_memcmp() returns 0 if equal */
             if (CRYPTO_memcmp(loopargs[i].secret_a,
-                              loopargs[i].secret_b, outlen)) {
+                    loopargs[i].secret_b, outlen)) {
                 ecdh_checks = 0;
                 BIO_printf(bio_err, "ECDH computations don't match.\n");
                 dofail();
@@ -3598,15 +3668,13 @@ int speed_main(int argc, char **argv)
         }
         if (ecdh_checks != 0) {
             pkey_print_message("", "ecdh",
-                               ec_curves[testnum].bits, seconds.ecdh);
+                ec_curves[testnum].bits, seconds.ecdh);
             Time_F(START);
-            count =
-                run_benchmark(async_jobs, ECDH_EVP_derive_key_loop, loopargs);
+            count = run_benchmark(async_jobs, ECDH_EVP_derive_key_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R9:%ld:%d:%.2f\n" :
-                       "%ld %u-bits ECDH ops in %.2fs\n", count,
-                       ec_curves[testnum].bits, d);
+                mr ? "+R9:%ld:%d:%.2f\n" : "%ld %u-bits ECDH ops in %.2fs\n", count,
+                ec_curves[testnum].bits, d);
             ecdh_results[testnum][0] = (double)count / d;
             op_count = count;
         }
@@ -3624,7 +3692,7 @@ int speed_main(int argc, char **argv)
         EVP_PKEY_CTX *ed_pctx = NULL;
 
         if (!eddsa_doit[testnum])
-            continue;           /* Ignore Curve */
+            continue; /* Ignore Curve */
         for (i = 0; i < loopargs_len; i++) {
             loopargs[i].eddsa_ctx[testnum] = EVP_MD_CTX_new();
             if (loopargs[i].eddsa_ctx[testnum] == NULL) {
@@ -3638,7 +3706,8 @@ int speed_main(int argc, char **argv)
             }
 
             if ((ed_pctx = EVP_PKEY_CTX_new_id(ed_curves[testnum].nid,
-                                               NULL)) == NULL
+                     NULL))
+                    == NULL
                 || EVP_PKEY_keygen_init(ed_pctx) <= 0
                 || EVP_PKEY_keygen(ed_pctx, &ed_pkey) <= 0) {
                 st = 0;
@@ -3648,13 +3717,13 @@ int speed_main(int argc, char **argv)
             EVP_PKEY_CTX_free(ed_pctx);
 
             if (!EVP_DigestSignInit(loopargs[i].eddsa_ctx[testnum], NULL, NULL,
-                                    NULL, ed_pkey)) {
+                    NULL, ed_pkey)) {
                 st = 0;
                 EVP_PKEY_free(ed_pkey);
                 break;
             }
             if (!EVP_DigestVerifyInit(loopargs[i].eddsa_ctx2[testnum], NULL,
-                                      NULL, NULL, ed_pkey)) {
+                    NULL, NULL, ed_pkey)) {
                 st = 0;
                 EVP_PKEY_free(ed_pkey);
                 break;
@@ -3672,55 +3741,54 @@ int speed_main(int argc, char **argv)
                 /* Perform EdDSA signature test */
                 loopargs[i].sigsize = ed_curves[testnum].sigsize;
                 st = EVP_DigestSign(loopargs[i].eddsa_ctx[testnum],
-                                    loopargs[i].buf2, &loopargs[i].sigsize,
-                                    loopargs[i].buf, 20);
+                    loopargs[i].buf2, &loopargs[i].sigsize,
+                    loopargs[i].buf, 20);
                 if (st == 0)
                     break;
             }
             if (st == 0) {
                 BIO_printf(bio_err,
-                           "EdDSA sign failure.  No EdDSA sign will be done.\n");
+                    "EdDSA sign failure.  No EdDSA sign will be done.\n");
                 dofail();
                 op_count = 1;
             } else {
                 pkey_print_message("sign", ed_curves[testnum].name,
-                                   ed_curves[testnum].bits, seconds.eddsa);
+                    ed_curves[testnum].bits, seconds.eddsa);
                 Time_F(START);
                 count = run_benchmark(async_jobs, EdDSA_sign_loop, loopargs);
                 d = Time_F(STOP);
 
                 BIO_printf(bio_err,
-                           mr ? "+R10:%ld:%u:%s:%.2f\n" :
-                           "%ld %u bits %s sign ops in %.2fs \n",
-                           count, ed_curves[testnum].bits,
-                           ed_curves[testnum].name, d);
+                    mr ? "+R10:%ld:%u:%s:%.2f\n" : "%ld %u bits %s sign ops in %.2fs \n",
+                    count, ed_curves[testnum].bits,
+                    ed_curves[testnum].name, d);
                 eddsa_results[testnum][0] = (double)count / d;
                 op_count = count;
             }
             /* Perform EdDSA verification test */
             for (i = 0; i < loopargs_len; i++) {
                 st = EVP_DigestVerify(loopargs[i].eddsa_ctx2[testnum],
-                                      loopargs[i].buf2, loopargs[i].sigsize,
-                                      loopargs[i].buf, 20);
+                    loopargs[i].buf2, loopargs[i].sigsize,
+                    loopargs[i].buf, 20);
                 if (st != 1)
                     break;
             }
             if (st != 1) {
                 BIO_printf(bio_err,
-                           "EdDSA verify failure.  No EdDSA verify will be done.\n");
+                    "EdDSA verify failure.  No EdDSA verify will be done.\n");
                 dofail();
                 eddsa_doit[testnum] = 0;
             } else {
                 pkey_print_message("verify", ed_curves[testnum].name,
-                                   ed_curves[testnum].bits, seconds.eddsa);
+                    ed_curves[testnum].bits, seconds.eddsa);
                 Time_F(START);
                 count = run_benchmark(async_jobs, EdDSA_verify_loop, loopargs);
                 d = Time_F(STOP);
                 BIO_printf(bio_err,
-                           mr ? "+R11:%ld:%u:%s:%.2f\n"
-                           : "%ld %u bits %s verify ops in %.2fs\n",
-                           count, ed_curves[testnum].bits,
-                           ed_curves[testnum].name, d);
+                    mr ? "+R11:%ld:%u:%s:%.2f\n"
+                       : "%ld %u bits %s verify ops in %.2fs\n",
+                    count, ed_curves[testnum].bits,
+                    ed_curves[testnum].name, d);
                 eddsa_results[testnum][1] = (double)count / d;
             }
 
@@ -3738,7 +3806,7 @@ int speed_main(int argc, char **argv)
         EVP_PKEY *sm2_pkey = NULL;
 
         if (!sm2_doit[testnum])
-            continue;           /* Ignore Curve */
+            continue; /* Ignore Curve */
         /* Init signing and verification */
         for (i = 0; i < loopargs_len; i++) {
             EVP_PKEY_CTX *sm2_pctx = NULL;
@@ -3749,7 +3817,7 @@ int speed_main(int argc, char **argv)
             loopargs[i].sm2_ctx[testnum] = EVP_MD_CTX_new();
             loopargs[i].sm2_vfy_ctx[testnum] = EVP_MD_CTX_new();
             if (loopargs[i].sm2_ctx[testnum] == NULL
-                    || loopargs[i].sm2_vfy_ctx[testnum] == NULL)
+                || loopargs[i].sm2_vfy_ctx[testnum] == NULL)
                 break;
 
             sm2_pkey = NULL;
@@ -3757,7 +3825,8 @@ int speed_main(int argc, char **argv)
             st = !((pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_SM2, NULL)) == NULL
                 || EVP_PKEY_keygen_init(pctx) <= 0
                 || EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx,
-                    sm2_curves[testnum].nid) <= 0
+                       sm2_curves[testnum].nid)
+                    <= 0
                 || EVP_PKEY_keygen(pctx, &sm2_pkey) <= 0);
             EVP_PKEY_CTX_free(pctx);
             if (st == 0)
@@ -3788,12 +3857,12 @@ int speed_main(int argc, char **argv)
                 break;
 
             if (!EVP_DigestSignInit(loopargs[i].sm2_ctx[testnum], NULL,
-                                    EVP_sm3(), NULL, sm2_pkey))
+                    EVP_sm3(), NULL, sm2_pkey))
                 break;
             if (!EVP_DigestVerifyInit(loopargs[i].sm2_vfy_ctx[testnum], NULL,
-                                      EVP_sm3(), NULL, sm2_pkey))
+                    EVP_sm3(), NULL, sm2_pkey))
                 break;
-            st = 1;         /* mark loop as succeeded */
+            st = 1; /* mark loop as succeeded */
         }
         if (st == 0) {
             BIO_printf(bio_err, "SM2 init failure.\n");
@@ -3803,28 +3872,27 @@ int speed_main(int argc, char **argv)
             for (i = 0; i < loopargs_len; i++) {
                 /* Perform SM2 signature test */
                 st = EVP_DigestSign(loopargs[i].sm2_ctx[testnum],
-                                    loopargs[i].buf2, &loopargs[i].sigsize,
-                                    loopargs[i].buf, 20);
+                    loopargs[i].buf2, &loopargs[i].sigsize,
+                    loopargs[i].buf, 20);
                 if (st == 0)
                     break;
             }
             if (st == 0) {
                 BIO_printf(bio_err,
-                           "SM2 sign failure.  No SM2 sign will be done.\n");
+                    "SM2 sign failure.  No SM2 sign will be done.\n");
                 dofail();
                 op_count = 1;
             } else {
                 pkey_print_message("sign", sm2_curves[testnum].name,
-                                   sm2_curves[testnum].bits, seconds.sm2);
+                    sm2_curves[testnum].bits, seconds.sm2);
                 Time_F(START);
                 count = run_benchmark(async_jobs, SM2_sign_loop, loopargs);
                 d = Time_F(STOP);
 
                 BIO_printf(bio_err,
-                           mr ? "+R12:%ld:%u:%s:%.2f\n" :
-                           "%ld %u bits %s sign ops in %.2fs \n",
-                           count, sm2_curves[testnum].bits,
-                           sm2_curves[testnum].name, d);
+                    mr ? "+R12:%ld:%u:%s:%.2f\n" : "%ld %u bits %s sign ops in %.2fs \n",
+                    count, sm2_curves[testnum].bits,
+                    sm2_curves[testnum].name, d);
                 sm2_results[testnum][0] = (double)count / d;
                 op_count = count;
             }
@@ -3832,27 +3900,27 @@ int speed_main(int argc, char **argv)
             /* Perform SM2 verification test */
             for (i = 0; i < loopargs_len; i++) {
                 st = EVP_DigestVerify(loopargs[i].sm2_vfy_ctx[testnum],
-                                      loopargs[i].buf2, loopargs[i].sigsize,
-                                      loopargs[i].buf, 20);
+                    loopargs[i].buf2, loopargs[i].sigsize,
+                    loopargs[i].buf, 20);
                 if (st != 1)
                     break;
             }
             if (st != 1) {
                 BIO_printf(bio_err,
-                           "SM2 verify failure.  No SM2 verify will be done.\n");
+                    "SM2 verify failure.  No SM2 verify will be done.\n");
                 dofail();
                 sm2_doit[testnum] = 0;
             } else {
                 pkey_print_message("verify", sm2_curves[testnum].name,
-                                   sm2_curves[testnum].bits, seconds.sm2);
+                    sm2_curves[testnum].bits, seconds.sm2);
                 Time_F(START);
                 count = run_benchmark(async_jobs, SM2_verify_loop, loopargs);
                 d = Time_F(STOP);
                 BIO_printf(bio_err,
-                           mr ? "+R13:%ld:%u:%s:%.2f\n"
-                           : "%ld %u bits %s verify ops in %.2fs\n",
-                           count, sm2_curves[testnum].bits,
-                           sm2_curves[testnum].name, d);
+                    mr ? "+R13:%ld:%u:%s:%.2f\n"
+                       : "%ld %u bits %s verify ops in %.2fs\n",
+                    count, sm2_curves[testnum].bits,
+                    sm2_curves[testnum].name, d);
                 sm2_results[testnum][1] = (double)count / d;
             }
 
@@ -3863,7 +3931,7 @@ int speed_main(int argc, char **argv)
             }
         }
     }
-#endif                         /* OPENSSL_NO_SM2 */
+#endif /* OPENSSL_NO_SM2 */
 
 #ifndef OPENSSL_NO_DH
     for (testnum = 0; testnum < FFDH_NUM; testnum++) {
@@ -3883,7 +3951,7 @@ int speed_main(int argc, char **argv)
             /* Ensure that the error queue is empty */
             if (ERR_peek_error()) {
                 BIO_printf(bio_err,
-                           "WARNING: the error queue contains previous unhandled errors.\n");
+                    "WARNING: the error queue contains previous unhandled errors.\n");
                 dofail();
             }
 
@@ -3928,8 +3996,7 @@ int speed_main(int argc, char **argv)
                 break;
             }
 
-            if (EVP_PKEY_keygen(ffdh_ctx, &pkey_A) <= 0 ||
-                EVP_PKEY_keygen(ffdh_ctx, &pkey_B) <= 0) {
+            if (EVP_PKEY_keygen(ffdh_ctx, &pkey_A) <= 0 || EVP_PKEY_keygen(ffdh_ctx, &pkey_B) <= 0) {
                 BIO_printf(bio_err, "FFDH key generation failure.\n");
                 dofail();
                 op_count = 1;
@@ -3980,8 +4047,9 @@ int speed_main(int argc, char **argv)
                 break;
             }
             if (EVP_PKEY_derive(ffdh_ctx,
-                                loopargs[i].secret_ff_a,
-                                &secret_size) <= 0) {
+                    loopargs[i].secret_ff_a,
+                    &secret_size)
+                <= 0) {
                 BIO_printf(bio_err, "Shared secret derive failure.\n");
                 dofail();
                 op_count = 1;
@@ -3997,11 +4065,7 @@ int speed_main(int argc, char **argv)
                 ffdh_checks = 0;
                 break;
             }
-            if (EVP_PKEY_derive_init(test_ctx) <= 0 ||
-                EVP_PKEY_derive_set_peer(test_ctx, pkey_A) <= 0 ||
-                EVP_PKEY_derive(test_ctx, NULL, &test_out) <= 0 ||
-                EVP_PKEY_derive(test_ctx, loopargs[i].secret_ff_b, &test_out) <= 0 ||
-                test_out != secret_size) {
+            if (EVP_PKEY_derive_init(test_ctx) <= 0 || EVP_PKEY_derive_set_peer(test_ctx, pkey_A) <= 0 || EVP_PKEY_derive(test_ctx, NULL, &test_out) <= 0 || EVP_PKEY_derive(test_ctx, loopargs[i].secret_ff_b, &test_out) <= 0 || test_out != secret_size) {
                 BIO_printf(bio_err, "FFDH computation failure.\n");
                 op_count = 1;
                 ffdh_checks = 0;
@@ -4010,7 +4074,7 @@ int speed_main(int argc, char **argv)
 
             /* compare the computed secrets */
             if (CRYPTO_memcmp(loopargs[i].secret_ff_a,
-                              loopargs[i].secret_ff_b, secret_size)) {
+                    loopargs[i].secret_ff_b, secret_size)) {
                 BIO_printf(bio_err, "FFDH computations don't match.\n");
                 dofail();
                 op_count = 1;
@@ -4029,15 +4093,13 @@ int speed_main(int argc, char **argv)
         }
         if (ffdh_checks != 0) {
             pkey_print_message("", "ffdh",
-                               ffdh_params[testnum].bits, seconds.ffdh);
+                ffdh_params[testnum].bits, seconds.ffdh);
             Time_F(START);
-            count =
-                run_benchmark(async_jobs, FFDH_derive_key_loop, loopargs);
+            count = run_benchmark(async_jobs, FFDH_derive_key_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R14:%ld:%d:%.2f\n" :
-                       "%ld %u-bits FFDH ops in %.2fs\n", count,
-                       ffdh_params[testnum].bits, d);
+                mr ? "+R14:%ld:%d:%.2f\n" : "%ld %u-bits FFDH ops in %.2fs\n", count,
+                ffdh_params[testnum].bits, d);
             ffdh_results[testnum][0] = (double)count / d;
             op_count = count;
         }
@@ -4046,7 +4108,7 @@ int speed_main(int argc, char **argv)
             stop_it(ffdh_doit, testnum);
         }
     }
-#endif  /* OPENSSL_NO_DH */
+#endif /* OPENSSL_NO_DH */
 
     for (testnum = 0; testnum < kems_algs_len; testnum++) {
         int kem_checks = 1;
@@ -4068,7 +4130,10 @@ int speed_main(int argc, char **argv)
             char sfx[MAX_ALGNAME_SUFFIX];
             OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END };
             int use_params = 0;
-            enum kem_type_t { KEM_RSA = 1, KEM_EC, KEM_X25519, KEM_X448 } kem_type;
+            enum kem_type_t { KEM_RSA = 1,
+                KEM_EC,
+                KEM_X25519,
+                KEM_X448 } kem_type;
 
             /* no string after rsa<bitcnt> permitted: */
             if (strlen(kem_name) < MAX_ALGNAME_SUFFIX + 4 /* rsa+digit */
@@ -4080,36 +4145,36 @@ int speed_main(int argc, char **argv)
                 kem_type = KEM_X25519;
             else if (strcmp(kem_name, "X448") == 0)
                 kem_type = KEM_X448;
-            else kem_type = 0;
+            else
+                kem_type = 0;
 
             if (ERR_peek_error()) {
                 BIO_printf(bio_err,
-                           "WARNING: the error queue contains previous unhandled errors.\n");
+                    "WARNING: the error queue contains previous unhandled errors.\n");
                 dofail();
             }
 
             if (kem_type == KEM_RSA) {
                 params[0] = OSSL_PARAM_construct_uint(OSSL_PKEY_PARAM_RSA_BITS,
-                                                      &bits);
+                    &bits);
                 use_params = 1;
             } else if (kem_type == KEM_EC) {
                 name = (char *)(kem_name + 2);
                 params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                  name, 0);
+                    name, 0);
                 use_params = 1;
             }
 
             kem_gen_ctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(),
-                                               (kem_type == KEM_RSA) ? "RSA":
-                                                (kem_type == KEM_EC) ? "EC":
-                                                 kem_name,
-                                               app_get0_propq());
+                (kem_type == KEM_RSA) ? "RSA" : (kem_type == KEM_EC) ? "EC"
+                                                                     : kem_name,
+                app_get0_propq());
 
             if ((!kem_gen_ctx || EVP_PKEY_keygen_init(kem_gen_ctx) <= 0)
                 || (use_params
                     && EVP_PKEY_CTX_set_params(kem_gen_ctx, params) <= 0)) {
                 BIO_printf(bio_err, "Error initializing keygen ctx for %s.\n",
-                           kem_name);
+                    kem_name);
                 goto kem_err_break;
             }
             if (EVP_PKEY_keygen(kem_gen_ctx, &pkey) <= 0) {
@@ -4118,21 +4183,22 @@ int speed_main(int argc, char **argv)
             }
             /* Now prepare encaps data structs */
             kem_encaps_ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(),
-                                                        pkey,
-                                                        app_get0_propq());
+                pkey,
+                app_get0_propq());
             if (kem_encaps_ctx == NULL
                 || EVP_PKEY_encapsulate_init(kem_encaps_ctx, NULL) <= 0
                 || (kem_type == KEM_RSA
                     && EVP_PKEY_CTX_set_kem_op(kem_encaps_ctx, "RSASVE") <= 0)
                 || ((kem_type == KEM_EC
-                    || kem_type == KEM_X25519
-                    || kem_type == KEM_X448)
-                   && EVP_PKEY_CTX_set_kem_op(kem_encaps_ctx, "DHKEM") <= 0)
+                        || kem_type == KEM_X25519
+                        || kem_type == KEM_X448)
+                    && EVP_PKEY_CTX_set_kem_op(kem_encaps_ctx, "DHKEM") <= 0)
                 || EVP_PKEY_encapsulate(kem_encaps_ctx, NULL, &out_len,
-                                      NULL, &send_secret_len) <= 0) {
+                       NULL, &send_secret_len)
+                    <= 0) {
                 BIO_printf(bio_err,
-                           "Error while initializing encaps data structs for %s.\n",
-                           kem_name);
+                    "Error while initializing encaps data structs for %s.\n",
+                    kem_name);
                 goto kem_err_break;
             }
             out = app_malloc(out_len, "encaps result");
@@ -4142,37 +4208,40 @@ int speed_main(int argc, char **argv)
                 goto kem_err_break;
             }
             if (EVP_PKEY_encapsulate(kem_encaps_ctx, out, &out_len,
-                                     send_secret, &send_secret_len) <= 0) {
+                    send_secret, &send_secret_len)
+                <= 0) {
                 BIO_printf(bio_err, "Encaps error for %s.\n", kem_name);
                 goto kem_err_break;
             }
             /* Now prepare decaps data structs */
             kem_decaps_ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(),
-                                                        pkey,
-                                                        app_get0_propq());
+                pkey,
+                app_get0_propq());
             if (kem_decaps_ctx == NULL
                 || EVP_PKEY_decapsulate_init(kem_decaps_ctx, NULL) <= 0
                 || (kem_type == KEM_RSA
-                  && EVP_PKEY_CTX_set_kem_op(kem_decaps_ctx, "RSASVE") <= 0)
+                    && EVP_PKEY_CTX_set_kem_op(kem_decaps_ctx, "RSASVE") <= 0)
                 || ((kem_type == KEM_EC
-                     || kem_type == KEM_X25519
-                     || kem_type == KEM_X448)
-                  && EVP_PKEY_CTX_set_kem_op(kem_decaps_ctx, "DHKEM") <= 0)
+                        || kem_type == KEM_X25519
+                        || kem_type == KEM_X448)
+                    && EVP_PKEY_CTX_set_kem_op(kem_decaps_ctx, "DHKEM") <= 0)
                 || EVP_PKEY_decapsulate(kem_decaps_ctx, NULL, &rcv_secret_len,
-                                        out, out_len) <= 0) {
+                       out, out_len)
+                    <= 0) {
                 BIO_printf(bio_err,
-                           "Error while initializing decaps data structs for %s.\n",
-                           kem_name);
+                    "Error while initializing decaps data structs for %s.\n",
+                    kem_name);
                 goto kem_err_break;
             }
             rcv_secret = app_malloc(rcv_secret_len, "KEM decaps secret");
             if (rcv_secret == NULL) {
                 BIO_printf(bio_err, "MemAlloc failure in decaps for %s.\n",
-                           kem_name);
+                    kem_name);
                 goto kem_err_break;
             }
             if (EVP_PKEY_decapsulate(kem_decaps_ctx, rcv_secret,
-                                     &rcv_secret_len, out, out_len) <= 0
+                    &rcv_secret_len, out, out_len)
+                    <= 0
                 || rcv_secret_len != send_secret_len
                 || memcmp(send_secret, rcv_secret, send_secret_len)) {
                 BIO_printf(bio_err, "Decaps error for %s.\n", kem_name);
@@ -4200,35 +4269,29 @@ int speed_main(int argc, char **argv)
         if (kem_checks != 0) {
             kskey_print_message(kem_name, "keygen", seconds.kem);
             Time_F(START);
-            count =
-                run_benchmark(async_jobs, KEM_keygen_loop, loopargs);
+            count = run_benchmark(async_jobs, KEM_keygen_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R15:%ld:%s:%.2f\n" :
-                       "%ld %s KEM keygen ops in %.2fs\n", count,
-                       kem_name, d);
+                mr ? "+R15:%ld:%s:%.2f\n" : "%ld %s KEM keygen ops in %.2fs\n", count,
+                kem_name, d);
             kems_results[testnum][0] = (double)count / d;
             op_count = count;
             kskey_print_message(kem_name, "encaps", seconds.kem);
             Time_F(START);
-            count =
-                run_benchmark(async_jobs, KEM_encaps_loop, loopargs);
+            count = run_benchmark(async_jobs, KEM_encaps_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R16:%ld:%s:%.2f\n" :
-                       "%ld %s KEM encaps ops in %.2fs\n", count,
-                       kem_name, d);
+                mr ? "+R16:%ld:%s:%.2f\n" : "%ld %s KEM encaps ops in %.2fs\n", count,
+                kem_name, d);
             kems_results[testnum][1] = (double)count / d;
             op_count = count;
             kskey_print_message(kem_name, "decaps", seconds.kem);
             Time_F(START);
-            count =
-                run_benchmark(async_jobs, KEM_decaps_loop, loopargs);
+            count = run_benchmark(async_jobs, KEM_decaps_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R17:%ld:%s:%.2f\n" :
-                       "%ld %s KEM decaps ops in %.2fs\n", count,
-                       kem_name, d);
+                mr ? "+R17:%ld:%s:%.2f\n" : "%ld %s KEM decaps ops in %.2fs\n", count,
+                kem_name, d);
             kems_results[testnum][2] = (double)count / d;
             op_count = count;
         }
@@ -4248,10 +4311,11 @@ int speed_main(int argc, char **argv)
         for (i = 0; i < loopargs_len; i++) {
             EVP_PKEY *pkey = NULL;
             EVP_PKEY_CTX *ctx_params = NULL;
-            EVP_PKEY* pkey_params = NULL;
+            EVP_PKEY *pkey_params = NULL;
             EVP_PKEY_CTX *sig_gen_ctx = NULL;
             EVP_PKEY_CTX *sig_sign_ctx = NULL;
             EVP_PKEY_CTX *sig_verify_ctx = NULL;
+            EVP_SIGNATURE *alg = NULL;
             unsigned char md[SHA256_DIGEST_LENGTH];
             unsigned char *sig;
             char sfx[MAX_ALGNAME_SUFFIX];
@@ -4266,7 +4330,7 @@ int speed_main(int argc, char **argv)
 
             if (ERR_peek_error()) {
                 BIO_printf(bio_err,
-                           "WARNING: the error queue contains previous unhandled errors.\n");
+                    "WARNING: the error queue contains previous unhandled errors.\n");
                 dofail();
             }
 
@@ -4274,7 +4338,7 @@ int speed_main(int argc, char **argv)
             if (strlen(sig_name) < MAX_ALGNAME_SUFFIX + 4 /* rsa+digit */
                 && sscanf(sig_name, "rsa%u%s", &bits, sfx) == 1) {
                 params[0] = OSSL_PARAM_construct_uint(OSSL_PKEY_PARAM_RSA_BITS,
-                                                      &bits);
+                    &bits);
                 use_params = 1;
             }
 
@@ -4283,50 +4347,76 @@ int speed_main(int argc, char **argv)
                 if (ctx_params == NULL
                     || EVP_PKEY_paramgen_init(ctx_params) <= 0
                     || EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx_params,
-                                                        atoi(sig_name + 3)) <= 0
+                           atoi(sig_name + 3))
+                        <= 0
                     || EVP_PKEY_paramgen(ctx_params, &pkey_params) <= 0
                     || (sig_gen_ctx = EVP_PKEY_CTX_new(pkey_params, NULL)) == NULL
                     || EVP_PKEY_keygen_init(sig_gen_ctx) <= 0) {
                     BIO_printf(bio_err,
-                               "Error initializing classic keygen ctx for %s.\n",
-                               sig_name);
+                        "Error initializing classic keygen ctx for %s.\n",
+                        sig_name);
                     goto sig_err_break;
                 }
             }
 
             if (sig_gen_ctx == NULL)
                 sig_gen_ctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(),
-                                      use_params == 1 ? "RSA" : sig_name,
-                                      app_get0_propq());
+                    use_params == 1 ? "RSA" : sig_name,
+                    app_get0_propq());
 
             if (!sig_gen_ctx || EVP_PKEY_keygen_init(sig_gen_ctx) <= 0
-                || (use_params &&
-                    EVP_PKEY_CTX_set_params(sig_gen_ctx, params) <= 0)) {
+                || (use_params && EVP_PKEY_CTX_set_params(sig_gen_ctx, params) <= 0)) {
                 BIO_printf(bio_err, "Error initializing keygen ctx for %s.\n",
-                           sig_name);
+                    sig_name);
                 goto sig_err_break;
             }
             if (EVP_PKEY_keygen(sig_gen_ctx, &pkey) <= 0) {
                 BIO_printf(bio_err,
-                           "Error while generating signature EVP_PKEY for %s.\n",
-                           sig_name);
+                    "Error while generating signature EVP_PKEY for %s.\n",
+                    sig_name);
                 goto sig_err_break;
             }
+
+            /*
+             * Try explicitly fetching the signature algorithm implementation to
+             * use in case the algorithm does not support EVP_PKEY_sign_init
+             */
+            ERR_set_mark();
+            alg = EVP_SIGNATURE_fetch(app_get0_libctx(), sig_name, app_get0_propq());
+            ERR_pop_to_mark();
+
             /* Now prepare signature data structs */
             sig_sign_ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(),
-                                                      pkey,
-                                                      app_get0_propq());
-            if (sig_sign_ctx == NULL
-                || EVP_PKEY_sign_init(sig_sign_ctx) <= 0
-                || (use_params == 1
-                    && (EVP_PKEY_CTX_set_rsa_padding(sig_sign_ctx,
-                                                     RSA_PKCS1_PADDING) <= 0))
-                || EVP_PKEY_sign(sig_sign_ctx, NULL, &max_sig_len,
-                                 md, md_len) <= 0) {
-                    BIO_printf(bio_err,
-                               "Error while initializing signing data structs for %s.\n",
-                               sig_name);
-                    goto sig_err_break;
+                pkey,
+                app_get0_propq());
+            if (sig_sign_ctx == NULL) {
+                BIO_printf(bio_err,
+                    "Error while initializing signing ctx for %s.\n",
+                    sig_name);
+                goto sig_err_break;
+            }
+            ERR_set_mark();
+            if (EVP_PKEY_sign_init(sig_sign_ctx) <= 0
+                && (alg == NULL
+                    || EVP_PKEY_sign_message_init(sig_sign_ctx, alg, NULL) <= 0)) {
+                ERR_clear_last_mark();
+                BIO_printf(bio_err,
+                    "Error while initializing signing data structs for %s.\n",
+                    sig_name);
+                goto sig_err_break;
+            }
+            ERR_pop_to_mark();
+            if (use_params == 1 && EVP_PKEY_CTX_set_rsa_padding(sig_sign_ctx, RSA_PKCS1_PADDING) <= 0) {
+                BIO_printf(bio_err,
+                    "Error while initializing padding for %s.\n",
+                    sig_name);
+                goto sig_err_break;
+            }
+            if (EVP_PKEY_sign(sig_sign_ctx, NULL, &max_sig_len, md, md_len) <= 0) {
+                BIO_printf(bio_err,
+                    "Error while obtaining signature buffer length for %s.\n",
+                    sig_name);
+                goto sig_err_break;
             }
             sig = app_malloc(sig_len = max_sig_len, "signature buffer");
             if (sig == NULL) {
@@ -4340,18 +4430,25 @@ int speed_main(int argc, char **argv)
             /* Now prepare verify data structs */
             memset(md, 0, SHA256_DIGEST_LENGTH);
             sig_verify_ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(),
-                                                        pkey,
-                                                        app_get0_propq());
-            if (sig_verify_ctx == NULL
-                || EVP_PKEY_verify_init(sig_verify_ctx) <= 0
-                || (use_params == 1
-                  && (EVP_PKEY_CTX_set_rsa_padding(sig_verify_ctx,
-                                                   RSA_PKCS1_PADDING) <= 0))) {
+                pkey,
+                app_get0_propq());
+            if (sig_verify_ctx == NULL) {
                 BIO_printf(bio_err,
-                           "Error while initializing verify data structs for %s.\n",
-                           sig_name);
+                    "Error while initializing verify ctx for %s.\n",
+                    sig_name);
                 goto sig_err_break;
             }
+            ERR_set_mark();
+            if (EVP_PKEY_verify_init(sig_verify_ctx) <= 0
+                && (alg == NULL
+                    || EVP_PKEY_verify_message_init(sig_verify_ctx, alg, NULL) <= 0)) {
+                ERR_clear_last_mark();
+                BIO_printf(bio_err,
+                    "Error while initializing verify data structs for %s.\n",
+                    sig_name);
+                goto sig_err_break;
+            }
+            ERR_pop_to_mark();
             if (EVP_PKEY_verify(sig_verify_ctx, sig, sig_len, md, md_len) <= 0) {
                 BIO_printf(bio_err, "Verify error for %s.\n", sig_name);
                 goto sig_err_break;
@@ -4367,12 +4464,14 @@ int speed_main(int argc, char **argv)
             loopargs[i].sig_act_sig_len[testnum] = sig_len;
             loopargs[i].sig_sig[testnum] = sig;
             EVP_PKEY_free(pkey);
+            EVP_SIGNATURE_free(alg);
             pkey = NULL;
             continue;
 
         sig_err_break:
             dofail();
             EVP_PKEY_free(pkey);
+            EVP_SIGNATURE_free(alg);
             op_count = 1;
             sig_checks = 0;
             break;
@@ -4384,32 +4483,27 @@ int speed_main(int argc, char **argv)
             count = run_benchmark(async_jobs, SIG_keygen_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R18:%ld:%s:%.2f\n" :
-                       "%ld %s signature keygen ops in %.2fs\n", count,
-                       sig_name, d);
+                mr ? "+R18:%ld:%s:%.2f\n" : "%ld %s signature keygen ops in %.2fs\n", count,
+                sig_name, d);
             sigs_results[testnum][0] = (double)count / d;
             op_count = count;
             kskey_print_message(sig_name, "signs", seconds.sig);
             Time_F(START);
-            count =
-                run_benchmark(async_jobs, SIG_sign_loop, loopargs);
+            count = run_benchmark(async_jobs, SIG_sign_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R19:%ld:%s:%.2f\n" :
-                       "%ld %s signature sign ops in %.2fs\n", count,
-                       sig_name, d);
+                mr ? "+R19:%ld:%s:%.2f\n" : "%ld %s signature sign ops in %.2fs\n", count,
+                sig_name, d);
             sigs_results[testnum][1] = (double)count / d;
             op_count = count;
 
             kskey_print_message(sig_name, "verify", seconds.sig);
             Time_F(START);
-            count =
-                run_benchmark(async_jobs, SIG_verify_loop, loopargs);
+            count = run_benchmark(async_jobs, SIG_verify_loop, loopargs);
             d = Time_F(STOP);
             BIO_printf(bio_err,
-                       mr ? "+R20:%ld:%s:%.2f\n" :
-                       "%ld %s signature verify ops in %.2fs\n", count,
-                       sig_name, d);
+                mr ? "+R20:%ld:%s:%.2f\n" : "%ld %s signature verify ops in %.2fs\n", count,
+                sig_name, d);
             sigs_results[testnum][2] = (double)count / d;
             op_count = count;
         }
@@ -4418,7 +4512,7 @@ int speed_main(int argc, char **argv)
     }
 
 #ifndef NO_FORK
- show_res:
+show_res:
 #endif
     if (!mr) {
         printf("version: %s\n", OpenSSL_version(OPENSSL_FULL_VERSION_STRING));
@@ -4475,15 +4569,15 @@ int speed_main(int argc, char **argv)
         }
         if (mr)
             printf("+F2:%u:%u:%f:%f:%f:%f\n",
-                   k, rsa_keys[k].bits, rsa_results[k][0], rsa_results[k][1],
-                   rsa_results[k][2], rsa_results[k][3]);
+                k, rsa_keys[k].bits, rsa_results[k][0], rsa_results[k][1],
+                rsa_results[k][2], rsa_results[k][3]);
         else
             printf("rsa %5u bits %8.6fs %8.6fs %8.6fs %8.6fs %8.1f %8.1f %8.1f %8.1f\n",
-                   rsa_keys[k].bits, 1.0 / rsa_results[k][0],
-                   1.0 / rsa_results[k][1], 1.0 / rsa_results[k][2],
-                   1.0 / rsa_results[k][3],
-                   rsa_results[k][0], rsa_results[k][1],
-                   rsa_results[k][2], rsa_results[k][3]);
+                rsa_keys[k].bits, 1.0 / rsa_results[k][0],
+                1.0 / rsa_results[k][1], 1.0 / rsa_results[k][2],
+                1.0 / rsa_results[k][3],
+                rsa_results[k][0], rsa_results[k][1],
+                rsa_results[k][2], rsa_results[k][3]);
     }
     testnum = 1;
 #ifndef OPENSSL_NO_DSA
@@ -4496,11 +4590,11 @@ int speed_main(int argc, char **argv)
         }
         if (mr)
             printf("+F3:%u:%u:%f:%f\n",
-                   k, dsa_bits[k], dsa_results[k][0], dsa_results[k][1]);
+                k, dsa_bits[k], dsa_results[k][0], dsa_results[k][1]);
         else
             printf("dsa %4u bits %8.6fs %8.6fs %8.1f %8.1f\n",
-                   dsa_bits[k], 1.0 / dsa_results[k][0], 1.0 / dsa_results[k][1],
-                   dsa_results[k][0], dsa_results[k][1]);
+                dsa_bits[k], 1.0 / dsa_results[k][0], 1.0 / dsa_results[k][1],
+                dsa_results[k][0], dsa_results[k][1]);
     }
 #endif /* OPENSSL_NO_DSA */
     testnum = 1;
@@ -4514,13 +4608,13 @@ int speed_main(int argc, char **argv)
 
         if (mr)
             printf("+F4:%u:%u:%f:%f\n",
-                   k, ec_curves[k].bits,
-                   ecdsa_results[k][0], ecdsa_results[k][1]);
+                k, ec_curves[k].bits,
+                ecdsa_results[k][0], ecdsa_results[k][1]);
         else
             printf("%4u bits ecdsa (%s) %8.4fs %8.4fs %8.1f %8.1f\n",
-                   ec_curves[k].bits, ec_curves[k].name,
-                   1.0 / ecdsa_results[k][0], 1.0 / ecdsa_results[k][1],
-                   ecdsa_results[k][0], ecdsa_results[k][1]);
+                ec_curves[k].bits, ec_curves[k].name,
+                1.0 / ecdsa_results[k][0], 1.0 / ecdsa_results[k][1],
+                ecdsa_results[k][0], ecdsa_results[k][1]);
     }
 
     testnum = 1;
@@ -4533,13 +4627,13 @@ int speed_main(int argc, char **argv)
         }
         if (mr)
             printf("+F5:%u:%u:%f:%f\n",
-                   k, ec_curves[k].bits,
-                   ecdh_results[k][0], 1.0 / ecdh_results[k][0]);
+                k, ec_curves[k].bits,
+                ecdh_results[k][0], 1.0 / ecdh_results[k][0]);
 
         else
             printf("%4u bits ecdh (%s) %8.4fs %8.1f\n",
-                   ec_curves[k].bits, ec_curves[k].name,
-                   1.0 / ecdh_results[k][0], ecdh_results[k][0]);
+                ec_curves[k].bits, ec_curves[k].name,
+                1.0 / ecdh_results[k][0], ecdh_results[k][0]);
     }
 
 #ifndef OPENSSL_NO_ECX
@@ -4554,13 +4648,13 @@ int speed_main(int argc, char **argv)
 
         if (mr)
             printf("+F6:%u:%u:%s:%f:%f\n",
-                   k, ed_curves[k].bits, ed_curves[k].name,
-                   eddsa_results[k][0], eddsa_results[k][1]);
+                k, ed_curves[k].bits, ed_curves[k].name,
+                eddsa_results[k][0], eddsa_results[k][1]);
         else
             printf("%4u bits EdDSA (%s) %8.4fs %8.4fs %8.1f %8.1f\n",
-                   ed_curves[k].bits, ed_curves[k].name,
-                   1.0 / eddsa_results[k][0], 1.0 / eddsa_results[k][1],
-                   eddsa_results[k][0], eddsa_results[k][1]);
+                ed_curves[k].bits, ed_curves[k].name,
+                1.0 / eddsa_results[k][0], 1.0 / eddsa_results[k][1],
+                eddsa_results[k][0], eddsa_results[k][1]);
     }
 #endif /* OPENSSL_NO_ECX */
 
@@ -4576,13 +4670,13 @@ int speed_main(int argc, char **argv)
 
         if (mr)
             printf("+F7:%u:%u:%s:%f:%f\n",
-                   k, sm2_curves[k].bits, sm2_curves[k].name,
-                   sm2_results[k][0], sm2_results[k][1]);
+                k, sm2_curves[k].bits, sm2_curves[k].name,
+                sm2_results[k][0], sm2_results[k][1]);
         else
             printf("%4u bits SM2 (%s) %8.4fs %8.4fs %8.1f %8.1f\n",
-                   sm2_curves[k].bits, sm2_curves[k].name,
-                   1.0 / sm2_results[k][0], 1.0 / sm2_results[k][1],
-                   sm2_results[k][0], sm2_results[k][1]);
+                sm2_curves[k].bits, sm2_curves[k].name,
+                1.0 / sm2_results[k][0], 1.0 / sm2_results[k][1],
+                sm2_results[k][0], sm2_results[k][1]);
     }
 #endif
 #ifndef OPENSSL_NO_DH
@@ -4596,13 +4690,13 @@ int speed_main(int argc, char **argv)
         }
         if (mr)
             printf("+F8:%u:%u:%f:%f\n",
-                   k, ffdh_params[k].bits,
-                   ffdh_results[k][0], 1.0 / ffdh_results[k][0]);
+                k, ffdh_params[k].bits,
+                ffdh_results[k][0], 1.0 / ffdh_results[k][0]);
 
         else
             printf("%4u bits ffdh %8.4fs %8.1f\n",
-                   ffdh_params[k].bits,
-                   1.0 / ffdh_results[k][0], ffdh_results[k][0]);
+                ffdh_params[k].bits,
+                1.0 / ffdh_results[k][0], ffdh_results[k][0]);
     }
 #endif /* OPENSSL_NO_DH */
 
@@ -4618,13 +4712,13 @@ int speed_main(int argc, char **argv)
         }
         if (mr)
             printf("+F9:%u:%f:%f:%f\n",
-                   k, kems_results[k][0], kems_results[k][1],
-                   kems_results[k][2]);
+                k, kems_results[k][0], kems_results[k][1],
+                kems_results[k][2]);
         else
             printf("%27s %8.6fs %8.6fs %8.6fs %9.1f %9.1f %9.1f\n", kem_name,
-                   1.0 / kems_results[k][0],
-                   1.0 / kems_results[k][1], 1.0 / kems_results[k][2],
-                   kems_results[k][0], kems_results[k][1], kems_results[k][2]);
+                1.0 / kems_results[k][0],
+                1.0 / kems_results[k][1], 1.0 / kems_results[k][2],
+                kems_results[k][0], kems_results[k][1], kems_results[k][2]);
     }
     ret = 0;
 
@@ -4640,17 +4734,17 @@ int speed_main(int argc, char **argv)
         }
         if (mr)
             printf("+F10:%u:%f:%f:%f\n",
-                   k, sigs_results[k][0], sigs_results[k][1],
-                   sigs_results[k][2]);
+                k, sigs_results[k][0], sigs_results[k][1],
+                sigs_results[k][2]);
         else
             printf("%27s %8.6fs %8.6fs %8.6fs %9.1f %9.1f %9.1f\n", sig_name,
-                   1.0 / sigs_results[k][0], 1.0 / sigs_results[k][1],
-                   1.0 / sigs_results[k][2], sigs_results[k][0],
-                   sigs_results[k][1], sigs_results[k][2]);
+                1.0 / sigs_results[k][0], 1.0 / sigs_results[k][1],
+                1.0 / sigs_results[k][2], sigs_results[k][0],
+                sigs_results[k][1], sigs_results[k][2]);
     }
     ret = 0;
 
- end:
+end:
     if (ret == 0 && testmode)
         ret = testmoderesult;
     ERR_print_errors(bio_err);
@@ -4755,19 +4849,21 @@ int speed_main(int argc, char **argv)
 static void print_message(const char *s, int length, int tm)
 {
     BIO_printf(bio_err,
-               mr ? "+DT:%s:%d:%d\n"
-               : "Doing %s ops for %ds on %d size blocks: ", s, tm, length);
+        mr ? "+DT:%s:%d:%d\n"
+           : "Doing %s ops for %ds on %d size blocks: ",
+        s, tm, length);
     (void)BIO_flush(bio_err);
     run = 1;
     alarm(tm);
 }
 
 static void pkey_print_message(const char *str, const char *str2, unsigned int bits,
-                               int tm)
+    int tm)
 {
     BIO_printf(bio_err,
-               mr ? "+DTP:%d:%s:%s:%d\n"
-               : "Doing %u bits %s %s ops for %ds: ", bits, str, str2, tm);
+        mr ? "+DTP:%d:%s:%s:%d\n"
+           : "Doing %u bits %s %s ops for %ds: ",
+        bits, str, str2, tm);
     (void)BIO_flush(bio_err);
     run = 1;
     alarm(tm);
@@ -4776,8 +4872,9 @@ static void pkey_print_message(const char *str, const char *str2, unsigned int b
 static void kskey_print_message(const char *str, const char *str2, int tm)
 {
     BIO_printf(bio_err,
-               mr ? "+DTP:%s:%s:%d\n"
-               : "Doing %s %s ops for %ds: ", str, str2, tm);
+        mr ? "+DTP:%s:%s:%d\n"
+           : "Doing %s %s ops for %ds: ",
+        str, str2, tm);
     (void)BIO_flush(bio_err);
     run = 1;
     alarm(tm);
@@ -4791,8 +4888,9 @@ static void print_result(int alg, int run_no, int count, double time_used)
         return;
     }
     BIO_printf(bio_err,
-               mr ? "+R:%d:%s:%f\n"
-               : "%d %s ops in %.2fs\n", count, names[alg], time_used);
+        mr ? "+R:%d:%s:%f\n"
+           : "%d %s ops in %.2fs\n",
+        count, names[alg], time_used);
     results[alg][run_no] = ((double)count) / time_used * lengths[run_no];
 }
 
@@ -4822,7 +4920,7 @@ static char *sstrsep(char **string, const char *delim)
 }
 
 static int strtoint(const char *str, const int min_val, const int upper_val,
-                    int *res)
+    int *res)
 {
     char *end = NULL;
     long int val = 0;
@@ -4884,7 +4982,7 @@ static int do_multi(int multi, int size_num)
 
         if ((f = fdopen(fds[n], "r")) == NULL) {
             BIO_printf(bio_err, "fdopen failure with 0x%x\n",
-                       errno);
+                errno);
             OPENSSL_free(fds);
             return 1;
         }
@@ -4894,8 +4992,8 @@ static int do_multi(int multi, int size_num)
                 *p = '\0';
             if (buf[0] != '+') {
                 BIO_printf(bio_err,
-                           "Don't understand line '%s' from child %d\n", buf,
-                           n);
+                    "Don't understand line '%s' from child %d\n", buf,
+                    n);
                 continue;
             }
             printf("Got: %s from %d\n", buf, n);
@@ -4926,7 +5024,7 @@ static int do_multi(int multi, int size_num)
                     d = atof(sstrsep(&p, sep));
                     rsa_results[k][3] += d;
                 }
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
             } else if (CHECK_AND_SKIP_PREFIX(p, "+F3:")) {
                 tk = sstrsep(&p, sep);
                 if (strtoint(tk, 0, OSSL_NELEM(dsa_results), &k)) {
@@ -4938,7 +5036,7 @@ static int do_multi(int multi, int size_num)
                     d = atof(sstrsep(&p, sep));
                     dsa_results[k][1] += d;
                 }
-# endif /* OPENSSL_NO_DSA */
+#endif /* OPENSSL_NO_DSA */
             } else if (CHECK_AND_SKIP_PREFIX(p, "+F4:")) {
                 tk = sstrsep(&p, sep);
                 if (strtoint(tk, 0, OSSL_NELEM(ecdsa_results), &k)) {
@@ -4958,7 +5056,7 @@ static int do_multi(int multi, int size_num)
                     d = atof(sstrsep(&p, sep));
                     ecdh_results[k][0] += d;
                 }
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
             } else if (CHECK_AND_SKIP_PREFIX(p, "+F6:")) {
                 tk = sstrsep(&p, sep);
                 if (strtoint(tk, 0, OSSL_NELEM(eddsa_results), &k)) {
@@ -4971,8 +5069,8 @@ static int do_multi(int multi, int size_num)
                     d = atof(sstrsep(&p, sep));
                     eddsa_results[k][1] += d;
                 }
-# endif /* OPENSSL_NO_ECX */
-# ifndef OPENSSL_NO_SM2
+#endif /* OPENSSL_NO_ECX */
+#ifndef OPENSSL_NO_SM2
             } else if (CHECK_AND_SKIP_PREFIX(p, "+F7:")) {
                 tk = sstrsep(&p, sep);
                 if (strtoint(tk, 0, OSSL_NELEM(sm2_results), &k)) {
@@ -4985,8 +5083,8 @@ static int do_multi(int multi, int size_num)
                     d = atof(sstrsep(&p, sep));
                     sm2_results[k][1] += d;
                 }
-# endif /* OPENSSL_NO_SM2 */
-# ifndef OPENSSL_NO_DH
+#endif /* OPENSSL_NO_SM2 */
+#ifndef OPENSSL_NO_DH
             } else if (CHECK_AND_SKIP_PREFIX(p, "+F8:")) {
                 tk = sstrsep(&p, sep);
                 if (strtoint(tk, 0, OSSL_NELEM(ffdh_results), &k)) {
@@ -4995,7 +5093,7 @@ static int do_multi(int multi, int size_num)
                     d = atof(sstrsep(&p, sep));
                     ffdh_results[k][0] += d;
                 }
-# endif /* OPENSSL_NO_DH */
+#endif /* OPENSSL_NO_DH */
             } else if (CHECK_AND_SKIP_PREFIX(p, "+F9:")) {
                 tk = sstrsep(&p, sep);
                 if (strtoint(tk, 0, OSSL_NELEM(kems_results), &k)) {
@@ -5022,7 +5120,7 @@ static int do_multi(int multi, int size_num)
                 }
             } else if (!HAS_PREFIX(buf, "+H:")) {
                 BIO_printf(bio_err, "Unknown type '%s' from child %d\n", buf,
-                           n);
+                    n);
             }
         }
 
@@ -5033,14 +5131,14 @@ static int do_multi(int multi, int size_num)
         while (wait(&status) == -1)
             if (errno != EINTR) {
                 BIO_printf(bio_err, "Waitng for child failed with 0x%x\n",
-                           errno);
+                    errno);
                 return 1;
             }
         if (WIFEXITED(status) && WEXITSTATUS(status)) {
             BIO_printf(bio_err, "Child exited with %d\n", WEXITSTATUS(status));
         } else if (WIFSIGNALED(status)) {
             BIO_printf(bio_err, "Child terminated by signal %d\n",
-                       WTERMSIG(status));
+                WTERMSIG(status));
         }
     }
     return 1;
@@ -5048,7 +5146,7 @@ static int do_multi(int multi, int size_num)
 #endif
 
 static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
-                             const openssl_speed_sec_t *seconds)
+    const openssl_speed_sec_t *seconds)
 {
     static const int mblengths_list[] = {
         8 * 1024, 2 * 8 * 1024, 4 * 8 * 1024, 8 * 8 * 1024, 8 * 16 * 1024
@@ -5084,7 +5182,8 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
     OPENSSL_clear_free(key, keylen);
 
     if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_MAC_KEY,
-                             sizeof(no_key), no_key) <= 0)
+            sizeof(no_key), no_key)
+        <= 0)
         app_bail_out("failed to set AEAD key\n");
     if ((alg_name = EVP_CIPHER_get0_name(evp_cipher)) == NULL)
         app_bail_out("failed to get cipher name\n");
@@ -5097,11 +5196,11 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
             size_t len = mblengths[j];
             int packlen;
 
-            memset(aad, 0, 8);  /* avoid uninitialized values */
-            aad[8] = 23;        /* SSL3_RT_APPLICATION_DATA */
-            aad[9] = 3;         /* version */
+            memset(aad, 0, 8); /* avoid uninitialized values */
+            aad[8] = 23; /* SSL3_RT_APPLICATION_DATA */
+            aad[9] = 3; /* version */
             aad[10] = 2;
-            aad[11] = 0;        /* length */
+            aad[11] = 0; /* length */
             aad[12] = 0;
             mb_param.out = NULL;
             mb_param.inp = aad;
@@ -5109,15 +5208,15 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
             mb_param.interleave = 8;
 
             packlen = EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_TLS1_1_MULTIBLOCK_AAD,
-                                          sizeof(mb_param), &mb_param);
+                sizeof(mb_param), &mb_param);
 
             if (packlen > 0) {
                 mb_param.out = out;
                 mb_param.inp = inp;
                 mb_param.len = len;
                 (void)EVP_CIPHER_CTX_ctrl(ctx,
-                                          EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT,
-                                          sizeof(mb_param), &mb_param);
+                    EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT,
+                    sizeof(mb_param), &mb_param);
             } else {
                 int pad;
 
@@ -5127,13 +5226,12 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
                 aad[11] = (unsigned char)(len >> 8);
                 aad[12] = (unsigned char)(len);
                 pad = EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_TLS1_AAD,
-                                          EVP_AEAD_TLS1_AAD_LEN, aad);
+                    EVP_AEAD_TLS1_AAD_LEN, aad);
                 ciph_success = EVP_Cipher(ctx, out, inp, len + pad);
             }
         }
         d = Time_F(STOP);
-        BIO_printf(bio_err, mr ? "+R:%d:%s:%f\n"
-                   : "%d %s ops in %.2fs\n", count, "evp", d);
+        BIO_printf(bio_err, mr ? "+R:%d:%s:%f\n" : "%d %s ops in %.2fs\n", count, "evp", d);
         if ((ciph_success <= 0) && (mr == 0))
             BIO_printf(bio_err, "Error performing cipher op\n");
         results[D_EVP][j] = ((double)count) / d * mblengths[j];
@@ -5150,7 +5248,7 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
         fprintf(stdout, "\n");
     } else {
         fprintf(stdout,
-                "The 'numbers' are in 1000s of bytes per second processed.\n");
+            "The 'numbers' are in 1000s of bytes per second processed.\n");
         fprintf(stdout, "type                    ");
         for (j = 0; j < num; j++)
             fprintf(stdout, "%7d bytes", mblengths[j]);
@@ -5166,7 +5264,7 @@ static void multiblock_speed(const EVP_CIPHER *evp_cipher, int lengths_single,
         fprintf(stdout, "\n");
     }
 
- err:
+err:
     OPENSSL_free(inp);
     OPENSSL_free(out);
     EVP_CIPHER_CTX_free(ctx);
diff --git a/apps/spkac.c b/apps/spkac.c
index 5a129a7fa775a..473872194290a 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -22,38 +22,48 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_NOOUT, OPT_PUBKEY, OPT_VERIFY, OPT_IN, OPT_OUT,
-    OPT_ENGINE, OPT_KEY, OPT_CHALLENGE, OPT_PASSIN, OPT_SPKAC,
-    OPT_SPKSECT, OPT_KEYFORM, OPT_DIGEST,
+    OPT_NOOUT,
+    OPT_PUBKEY,
+    OPT_VERIFY,
+    OPT_IN,
+    OPT_OUT,
+    OPT_ENGINE,
+    OPT_KEY,
+    OPT_CHALLENGE,
+    OPT_PASSIN,
+    OPT_SPKAC,
+    OPT_SPKSECT,
+    OPT_KEYFORM,
+    OPT_DIGEST,
     OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS spkac_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"spksect", OPT_SPKSECT, 's',
-     "Specify the name of an SPKAC-dedicated section of configuration"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "spksect", OPT_SPKSECT, 's',
+        "Specify the name of an SPKAC-dedicated section of configuration" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Input"),
-    {"in", OPT_IN, '<', "Input file"},
-    {"key", OPT_KEY, '<', "Create SPKAC using private key"},
-    {"keyform", OPT_KEYFORM, 'f', "Private key file format (ENGINE, other values ignored)"},
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
-    {"challenge", OPT_CHALLENGE, 's', "Challenge string"},
-    {"spkac", OPT_SPKAC, 's', "Alternative SPKAC name"},
+    { "in", OPT_IN, '<', "Input file" },
+    { "key", OPT_KEY, '<', "Create SPKAC using private key" },
+    { "keyform", OPT_KEYFORM, 'f', "Private key file format (ENGINE, other values ignored)" },
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+    { "challenge", OPT_CHALLENGE, 's', "Challenge string" },
+    { "spkac", OPT_SPKAC, 's', "Alternative SPKAC name" },
 
     OPT_SECTION("Output"),
-    {"digest", OPT_DIGEST, 's', "Sign new SPKAC with the specified digest (default: MD5)" },
-    {"out", OPT_OUT, '>', "Output file"},
-    {"noout", OPT_NOOUT, '-', "Don't print SPKAC"},
-    {"pubkey", OPT_PUBKEY, '-', "Output public key"},
-    {"verify", OPT_VERIFY, '-', "Verify SPKAC signature"},
+    { "digest", OPT_DIGEST, 's', "Sign new SPKAC with the specified digest (default: MD5)" },
+    { "out", OPT_OUT, '>', "Output file" },
+    { "noout", OPT_NOOUT, '-', "Don't print SPKAC" },
+    { "pubkey", OPT_PUBKEY, '-', "Output public key" },
+    { "verify", OPT_VERIFY, '-', "Verify SPKAC signature" },
 
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 int spkac_main(int argc, char **argv)
@@ -78,7 +88,7 @@ int spkac_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -146,7 +156,7 @@ int spkac_main(int argc, char **argv)
             goto end;
 
         pkey = load_key(strcmp(keyfile, "-") ? keyfile : NULL,
-                        keyformat, 1, passin, e, "private key");
+            keyformat, 1, passin, e, "private key");
         if (pkey == NULL)
             goto end;
         spki = NETSCAPE_SPKI_new();
@@ -154,7 +164,7 @@ int spkac_main(int argc, char **argv)
             goto end;
         if (challenge != NULL
             && !ASN1_STRING_set(spki->spkac->challenge,
-                                challenge, (int)strlen(challenge)))
+                challenge, (int)strlen(challenge)))
             goto end;
         if (!NETSCAPE_SPKI_set_pubkey(spki, pkey)) {
             BIO_printf(bio_err, "Error setting public key\n");
@@ -221,7 +231,7 @@ int spkac_main(int argc, char **argv)
 
     ret = 0;
 
- end:
+end:
     EVP_MD_free(md);
     NCONF_free(conf);
     NETSCAPE_SPKI_free(spki);
diff --git a/apps/srp.c b/apps/srp.c
index a9466f830289b..ac0e15f49c0be 100644
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -28,12 +28,11 @@
 #include "apps.h"
 #include "progs.h"
 
-#define BASE_SECTION    "srp"
+#define BASE_SECTION "srp"
 #define CONFIG_FILE "openssl.cnf"
 
-
-#define ENV_DATABASE            "srpvfile"
-#define ENV_DEFAULT_SRP         "default_srp"
+#define ENV_DATABASE "srpvfile"
+#define ENV_DEFAULT_SRP "default_srp"
 
 static int get_index(CA_DB *db, char *id, char type)
 {
@@ -86,9 +85,8 @@ static void print_user(CA_DB *db, int userindex, int verbose)
         if (pp[DB_srptype][0] != 'I') {
             print_entry(db, userindex, verbose, "User entry");
             print_entry(db, get_index(db, pp[DB_srpgN], 'I'), verbose,
-                        "g N entry");
+                "g N entry");
         }
-
     }
 }
 
@@ -120,8 +118,8 @@ static char *lookup_conf(const CONF *conf, const char *section, const char *tag)
 }
 
 static char *srp_verify_user(const char *user, const char *srp_verifier,
-                             char *srp_usersalt, const char *g, const char *N,
-                             const char *passin, int verbose)
+    char *srp_usersalt, const char *g, const char *N,
+    const char *passin, int verbose)
 {
     char password[1025];
     PW_CB_DATA cb_tmp;
@@ -132,19 +130,20 @@ static char *srp_verify_user(const char *user, const char *srp_verifier,
     cb_tmp.prompt_info = user;
     cb_tmp.password = passin;
 
-    len = password_callback(password, sizeof(password)-1, 0, &cb_tmp);
+    len = password_callback(password, sizeof(password) - 1, 0, &cb_tmp);
     if (len > 0) {
         password[len] = 0;
         if (verbose)
             BIO_printf(bio_err,
-                       "Validating\n   user=\"%s\"\n srp_verifier=\"%s\"\n srp_usersalt=\"%s\"\n g=\"%s\"\n N=\"%s\"\n",
-                       user, srp_verifier, srp_usersalt, g, N);
+                "Validating\n   user=\"%s\"\n srp_verifier=\"%s\"\n srp_usersalt=\"%s\"\n g=\"%s\"\n N=\"%s\"\n",
+                user, srp_verifier, srp_usersalt, g, N);
         if (verbose > 1)
             BIO_printf(bio_err, "Pass %s\n", password);
 
         OPENSSL_assert(srp_usersalt != NULL);
         if ((gNid = SRP_create_verifier(user, password, &srp_usersalt,
-                                        &verifier, N, g)) == NULL) {
+                 &verifier, N, g))
+            == NULL) {
             BIO_printf(bio_err, "Internal error validating SRP verifier\n");
         } else {
             if (strcmp(verifier, srp_verifier))
@@ -157,8 +156,8 @@ static char *srp_verify_user(const char *user, const char *srp_verifier,
 }
 
 static char *srp_create_user(char *user, char **srp_verifier,
-                             char **srp_usersalt, char *g, char *N,
-                             char *passout, int verbose)
+    char **srp_usersalt, char *g, char *N,
+    char *passout, int verbose)
 {
     char password[1025];
     PW_CB_DATA cb_tmp;
@@ -168,14 +167,15 @@ static char *srp_create_user(char *user, char **srp_verifier,
     cb_tmp.prompt_info = user;
     cb_tmp.password = passout;
 
-    len = password_callback(password, sizeof(password)-1, 1, &cb_tmp);
+    len = password_callback(password, sizeof(password) - 1, 1, &cb_tmp);
     if (len > 0) {
         password[len] = 0;
         if (verbose)
             BIO_printf(bio_err, "Creating\n user=\"%s\"\n g=\"%s\"\n N=\"%s\"\n",
-                       user, g, N);
+                user, g, N);
         if ((gNid = SRP_create_verifier(user, password, &salt,
-                                        srp_verifier, N, g)) == NULL) {
+                 srp_verifier, N, g))
+            == NULL) {
             BIO_printf(bio_err, "Internal error creating SRP verifier\n");
         } else {
             *srp_usersalt = salt;
@@ -183,50 +183,61 @@ static char *srp_create_user(char *user, char **srp_verifier,
         OPENSSL_cleanse(password, len);
         if (verbose > 1)
             BIO_printf(bio_err, "gNid=%s salt =\"%s\"\n verifier =\"%s\"\n",
-                       gNid, salt, *srp_verifier);
-
+                gNid, salt, *srp_verifier);
     }
     return gNid;
 }
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_VERBOSE, OPT_CONFIG, OPT_NAME, OPT_SRPVFILE, OPT_ADD,
-    OPT_DELETE, OPT_MODIFY, OPT_LIST, OPT_GN, OPT_USERINFO,
-    OPT_PASSIN, OPT_PASSOUT, OPT_ENGINE, OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_VERBOSE,
+    OPT_CONFIG,
+    OPT_NAME,
+    OPT_SRPVFILE,
+    OPT_ADD,
+    OPT_DELETE,
+    OPT_MODIFY,
+    OPT_LIST,
+    OPT_GN,
+    OPT_USERINFO,
+    OPT_PASSIN,
+    OPT_PASSOUT,
+    OPT_ENGINE,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS srp_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [user...]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [user...]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"verbose", OPT_VERBOSE, '-', "Talk a lot while doing things"},
-    {"config", OPT_CONFIG, '<', "A config file"},
-    {"name", OPT_NAME, 's', "The particular srp definition to use"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "verbose", OPT_VERBOSE, '-', "Talk a lot while doing things" },
+    { "config", OPT_CONFIG, '<', "A config file" },
+    { "name", OPT_NAME, 's', "The particular srp definition to use" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Action"),
-    {"add", OPT_ADD, '-', "Add a user and SRP verifier"},
-    {"modify", OPT_MODIFY, '-', "Modify the SRP verifier of an existing user"},
-    {"delete", OPT_DELETE, '-', "Delete user from verifier file"},
-    {"list", OPT_LIST, '-', "List users"},
+    { "add", OPT_ADD, '-', "Add a user and SRP verifier" },
+    { "modify", OPT_MODIFY, '-', "Modify the SRP verifier of an existing user" },
+    { "delete", OPT_DELETE, '-', "Delete user from verifier file" },
+    { "list", OPT_LIST, '-', "List users" },
 
     OPT_SECTION("Configuration"),
-    {"srpvfile", OPT_SRPVFILE, '<', "The srp verifier file name"},
-    {"gn", OPT_GN, 's', "Set g and N values to be used for new verifier"},
-    {"userinfo", OPT_USERINFO, 's', "Additional info to be set for user"},
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
-    {"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
+    { "srpvfile", OPT_SRPVFILE, '<', "The srp verifier file name" },
+    { "gn", OPT_GN, 's', "Set g and N values to be used for new verifier" },
+    { "userinfo", OPT_USERINFO, 's', "Additional info to be set for user" },
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+    { "passout", OPT_PASSOUT, 's', "Output file pass phrase source" },
 
     OPT_R_OPTIONS,
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"user", 0, 0, "Username(s) to process (optional)"},
-    {NULL}
+    { "user", 0, 0, "Username(s) to process (optional)" },
+    { NULL }
 };
 
 int srp_main(int argc, char **argv)
@@ -248,7 +259,7 @@ int srp_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -273,8 +284,8 @@ int srp_main(int argc, char **argv)
         case OPT_LIST:
             if (mode != OPT_ERR) {
                 BIO_printf(bio_err,
-                           "%s: Only one of -add/-delete/-modify/-list\n",
-                           prog);
+                    "%s: Only one of -add/-delete/-modify/-list\n",
+                    prog);
                 goto opthelp;
             }
             mode = o;
@@ -314,12 +325,12 @@ int srp_main(int argc, char **argv)
 
     if (srpvfile != NULL && configfile != NULL) {
         BIO_printf(bio_err,
-                   "-srpvfile and -configfile cannot be specified together.\n");
+            "-srpvfile and -configfile cannot be specified together.\n");
         goto end;
     }
     if (mode == OPT_ERR) {
         BIO_printf(bio_err,
-                   "Exactly one of the options -add, -delete, -modify -list must be specified.\n");
+            "Exactly one of the options -add, -delete, -modify -list must be specified.\n");
         goto opthelp;
     }
     if (mode == OPT_DELETE || mode == OPT_MODIFY || mode == OPT_ADD) {
@@ -331,7 +342,7 @@ int srp_main(int argc, char **argv)
     }
     if ((passinarg != NULL || passoutarg != NULL) && argc != 1) {
         BIO_printf(bio_err,
-                   "-passin, -passout arguments only valid with one user.\n");
+            "-passin, -passout arguments only valid with one user.\n");
         goto opthelp;
     }
 
@@ -354,8 +365,8 @@ int srp_main(int argc, char **argv)
         if (section == NULL) {
             if (verbose)
                 BIO_printf(bio_err,
-                           "trying to read " ENV_DEFAULT_SRP
-                           " in " BASE_SECTION "\n");
+                    "trying to read " ENV_DEFAULT_SRP
+                    " in " BASE_SECTION "\n");
 
             section = lookup_conf(conf, BASE_SECTION, ENV_DEFAULT_SRP);
             if (section == NULL)
@@ -366,8 +377,8 @@ int srp_main(int argc, char **argv)
 
         if (verbose)
             BIO_printf(bio_err,
-                       "trying to read " ENV_DATABASE " in section \"%s\"\n",
-                       section);
+                "trying to read " ENV_DATABASE " in section \"%s\"\n",
+                section);
 
         srpvfile = lookup_conf(conf, section, ENV_DATABASE);
         if (srpvfile == NULL)
@@ -376,7 +387,7 @@ int srp_main(int argc, char **argv)
 
     if (verbose)
         BIO_printf(bio_err, "Trying to read SRP verifier file \"%s\"\n",
-                   srpvfile);
+            srpvfile);
 
     db = load_index(srpvfile, NULL);
     if (db == NULL) {
@@ -431,14 +442,13 @@ int srp_main(int argc, char **argv)
                     print_user(db, i, 1);
             } else if (userindex < 0) {
                 BIO_printf(bio_err,
-                           "user \"%s\" does not exist, ignored. t\n", user);
+                    "user \"%s\" does not exist, ignored. t\n", user);
                 errors++;
             }
         } else if (mode == OPT_ADD) {
             if (userindex >= 0) {
                 /* reactivation of a new user */
-                char **row =
-                    sk_OPENSSL_PSTRING_value(db->db->data, userindex);
+                char **row = sk_OPENSSL_PSTRING_value(db->db->data, userindex);
                 BIO_printf(bio_err, "user \"%s\" reactivated.\n", user);
                 row[DB_srptype][0] = 'V';
 
@@ -449,16 +459,14 @@ int srp_main(int argc, char **argv)
                 row[DB_srpverifier] = NULL;
                 row[DB_srpsalt] = NULL;
                 row[DB_srpinfo] = NULL;
-                if (!
-                    (gNid =
-                     srp_create_user(user, &(row[DB_srpverifier]),
-                                     &(row[DB_srpsalt]),
-                                     gNrow ? gNrow[DB_srpsalt] : gN,
-                                     gNrow ? gNrow[DB_srpverifier] : NULL,
-                                     passout, verbose))) {
+                if (!(gNid = srp_create_user(user, &(row[DB_srpverifier]),
+                          &(row[DB_srpsalt]),
+                          gNrow ? gNrow[DB_srpsalt] : gN,
+                          gNrow ? gNrow[DB_srpverifier] : NULL,
+                          passout, verbose))) {
                     BIO_printf(bio_err,
-                               "Cannot create srp verifier for user \"%s\", operation abandoned .\n",
-                               user);
+                        "Cannot create srp verifier for user \"%s\", operation abandoned .\n",
+                        user);
                     errors++;
                     goto end;
                 }
@@ -487,18 +495,17 @@ int srp_main(int argc, char **argv)
         } else if (mode == OPT_MODIFY) {
             if (userindex < 0) {
                 BIO_printf(bio_err,
-                           "user \"%s\" does not exist, operation ignored.\n",
-                           user);
+                    "user \"%s\" does not exist, operation ignored.\n",
+                    user);
                 errors++;
             } else {
 
-                char **row =
-                    sk_OPENSSL_PSTRING_value(db->db->data, userindex);
+                char **row = sk_OPENSSL_PSTRING_value(db->db->data, userindex);
                 char type = row[DB_srptype][0];
                 if (type == 'v') {
                     BIO_printf(bio_err,
-                               "user \"%s\" already updated, operation ignored.\n",
-                               user);
+                        "user \"%s\" already updated, operation ignored.\n",
+                        user);
                     errors++;
                 } else {
                     char *gNid;
@@ -508,40 +515,35 @@ int srp_main(int argc, char **argv)
                         char **irow = NULL;
                         if (verbose)
                             BIO_printf(bio_err,
-                                       "Verifying password for user \"%s\"\n",
-                                       user);
-                        if ((user_gN =
-                             get_index(db, row[DB_srpgN], DB_SRP_INDEX)) >= 0)
-                            irow =
-                                sk_OPENSSL_PSTRING_value(db->db->data,
-                                                         userindex);
-
-                        if (!srp_verify_user
-                            (user, row[DB_srpverifier], row[DB_srpsalt],
-                             irow ? irow[DB_srpsalt] : row[DB_srpgN],
-                             irow ? irow[DB_srpverifier] : NULL, passin,
-                             verbose)) {
+                                "Verifying password for user \"%s\"\n",
+                                user);
+                        if ((user_gN = get_index(db, row[DB_srpgN], DB_SRP_INDEX)) >= 0)
+                            irow = sk_OPENSSL_PSTRING_value(db->db->data,
+                                userindex);
+
+                        if (!srp_verify_user(user, row[DB_srpverifier], row[DB_srpsalt],
+                                irow ? irow[DB_srpsalt] : row[DB_srpgN],
+                                irow ? irow[DB_srpverifier] : NULL, passin,
+                                verbose)) {
                             BIO_printf(bio_err,
-                                       "Invalid password for user \"%s\", operation abandoned.\n",
-                                       user);
+                                "Invalid password for user \"%s\", operation abandoned.\n",
+                                user);
                             errors++;
                             goto end;
                         }
                     }
                     if (verbose)
                         BIO_printf(bio_err, "Password for user \"%s\" ok.\n",
-                                   user);
-
-                    if (!
-                        (gNid =
-                         srp_create_user(user, &(row[DB_srpverifier]),
-                                         &(row[DB_srpsalt]),
-                                         gNrow ? gNrow[DB_srpsalt] : NULL,
-                                         gNrow ? gNrow[DB_srpverifier] : NULL,
-                                         passout, verbose))) {
+                            user);
+
+                    if (!(gNid = srp_create_user(user, &(row[DB_srpverifier]),
+                              &(row[DB_srpsalt]),
+                              gNrow ? gNrow[DB_srpsalt] : NULL,
+                              gNrow ? gNrow[DB_srpverifier] : NULL,
+                              passout, verbose))) {
                         BIO_printf(bio_err,
-                                   "Cannot create srp verifier for user \"%s\", operation abandoned.\n",
-                                   user);
+                            "Cannot create srp verifier for user \"%s\", operation abandoned.\n",
+                            user);
                         errors++;
                         goto end;
                     }
@@ -565,8 +567,8 @@ int srp_main(int argc, char **argv)
         } else if (mode == OPT_DELETE) {
             if (userindex < 0) {
                 BIO_printf(bio_err,
-                           "user \"%s\" does not exist, operation ignored. t\n",
-                           user);
+                    "user \"%s\" does not exist, operation ignored. t\n",
+                    user);
                 errors++;
             } else {
                 char **xpp = sk_OPENSSL_PSTRING_value(db->db->data, userindex);
@@ -612,7 +614,7 @@ int srp_main(int argc, char **argv)
     }
 
     ret = (errors != 0);
- end:
+end:
     if (errors != 0)
         if (verbose)
             BIO_printf(bio_err, "User errors %d.\n", errors);
diff --git a/apps/storeutl.c b/apps/storeutl.c
index b131278a85929..27cbe69dbaad4 100644
--- a/apps/storeutl.c
+++ b/apps/storeutl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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
@@ -14,59 +14,69 @@
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/store.h>
-#include <openssl/x509v3.h>      /* s2i_ASN1_INTEGER */
+#include <openssl/x509v3.h> /* s2i_ASN1_INTEGER */
 
 static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
-                   int expected, int criterion, OSSL_STORE_SEARCH *search,
-                   int text, int noout, int recursive, int indent, const char *outfile,
-                   const char *prog, OSSL_LIB_CTX *libctx);
+    int expected, int criterion, OSSL_STORE_SEARCH *search,
+    int text, int noout, int recursive, int indent, const char *outfile,
+    const char *prog, OSSL_LIB_CTX *libctx);
 
 static BIO *out = NULL;
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_ENGINE, OPT_OUT, OPT_PASSIN,
-    OPT_NOOUT, OPT_TEXT, OPT_RECURSIVE,
-    OPT_SEARCHFOR_CERTS, OPT_SEARCHFOR_KEYS, OPT_SEARCHFOR_CRLS,
-    OPT_CRITERION_SUBJECT, OPT_CRITERION_ISSUER, OPT_CRITERION_SERIAL,
-    OPT_CRITERION_FINGERPRINT, OPT_CRITERION_ALIAS,
-    OPT_MD, OPT_PROV_ENUM
+    OPT_ENGINE,
+    OPT_OUT,
+    OPT_PASSIN,
+    OPT_NOOUT,
+    OPT_TEXT,
+    OPT_RECURSIVE,
+    OPT_SEARCHFOR_CERTS,
+    OPT_SEARCHFOR_KEYS,
+    OPT_SEARCHFOR_CRLS,
+    OPT_CRITERION_SUBJECT,
+    OPT_CRITERION_ISSUER,
+    OPT_CRITERION_SERIAL,
+    OPT_CRITERION_FINGERPRINT,
+    OPT_CRITERION_ALIAS,
+    OPT_MD,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS storeutl_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] uri\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] uri\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"", OPT_MD, '-', "Any supported digest"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "", OPT_MD, '-', "Any supported digest" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
 
     OPT_SECTION("Search"),
-    {"certs", OPT_SEARCHFOR_CERTS, '-', "Search for certificates only"},
-    {"keys", OPT_SEARCHFOR_KEYS, '-', "Search for keys only"},
-    {"crls", OPT_SEARCHFOR_CRLS, '-', "Search for CRLs only"},
-    {"subject", OPT_CRITERION_SUBJECT, 's', "Search by subject"},
-    {"issuer", OPT_CRITERION_ISSUER, 's', "Search by issuer and serial, issuer name"},
-    {"serial", OPT_CRITERION_SERIAL, 's', "Search by issuer and serial, serial number"},
-    {"fingerprint", OPT_CRITERION_FINGERPRINT, 's', "Search by public key fingerprint, given in hex"},
-    {"alias", OPT_CRITERION_ALIAS, 's', "Search by alias"},
-    {"r", OPT_RECURSIVE, '-', "Recurse through names"},
+    { "certs", OPT_SEARCHFOR_CERTS, '-', "Search for certificates only" },
+    { "keys", OPT_SEARCHFOR_KEYS, '-', "Search for keys only" },
+    { "crls", OPT_SEARCHFOR_CRLS, '-', "Search for CRLs only" },
+    { "subject", OPT_CRITERION_SUBJECT, 's', "Search by subject" },
+    { "issuer", OPT_CRITERION_ISSUER, 's', "Search by issuer and serial, issuer name" },
+    { "serial", OPT_CRITERION_SERIAL, 's', "Search by issuer and serial, serial number" },
+    { "fingerprint", OPT_CRITERION_FINGERPRINT, 's', "Search by public key fingerprint, given in hex" },
+    { "alias", OPT_CRITERION_ALIAS, 's', "Search by alias" },
+    { "r", OPT_RECURSIVE, '-', "Recurse through names" },
 
     OPT_SECTION("Input"),
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
 
     OPT_SECTION("Output"),
-    {"out", OPT_OUT, '>', "Output file - default stdout"},
-    {"text", OPT_TEXT, '-', "Print a text form of the objects"},
-    {"noout", OPT_NOOUT, '-', "No PEM output, just status"},
+    { "out", OPT_OUT, '>', "Output file - default stdout" },
+    { "text", OPT_TEXT, '-', "Print a text form of the objects" },
+    { "noout", OPT_NOOUT, '-', "No PEM output, just status" },
 
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"uri", 0, 0, "URI of the store object"},
-    {NULL}
+    { "uri", 0, 0, "URI of the store object" },
+    { NULL }
 };
 
 int storeutl_main(int argc, char *argv[])
@@ -94,7 +104,7 @@ int storeutl_main(int argc, char *argv[])
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -121,7 +131,7 @@ int storeutl_main(int argc, char *argv[])
         case OPT_SEARCHFOR_CRLS:
             if (expected != 0) {
                 BIO_printf(bio_err, "%s: only one search type can be given.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             {
@@ -129,9 +139,9 @@ int storeutl_main(int argc, char *argv[])
                     enum OPTION_choice choice;
                     int type;
                 } map[] = {
-                    {OPT_SEARCHFOR_CERTS, OSSL_STORE_INFO_CERT},
-                    {OPT_SEARCHFOR_KEYS, OSSL_STORE_INFO_PKEY},
-                    {OPT_SEARCHFOR_CRLS, OSSL_STORE_INFO_CRL},
+                    { OPT_SEARCHFOR_CERTS, OSSL_STORE_INFO_CERT },
+                    { OPT_SEARCHFOR_KEYS, OSSL_STORE_INFO_PKEY },
+                    { OPT_SEARCHFOR_CRLS, OSSL_STORE_INFO_CRL },
                 };
                 size_t i;
 
@@ -151,13 +161,13 @@ int storeutl_main(int argc, char *argv[])
         case OPT_CRITERION_SUBJECT:
             if (criterion != 0) {
                 BIO_printf(bio_err, "%s: criterion already given.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             criterion = OSSL_STORE_SEARCH_BY_NAME;
             if (subject != NULL) {
                 BIO_printf(bio_err, "%s: subject already given.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             subject = parse_name(opt_arg(), MBSTRING_UTF8, 1, "subject");
@@ -168,13 +178,13 @@ int storeutl_main(int argc, char *argv[])
             if (criterion != 0
                 && criterion != OSSL_STORE_SEARCH_BY_ISSUER_SERIAL) {
                 BIO_printf(bio_err, "%s: criterion already given.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             criterion = OSSL_STORE_SEARCH_BY_ISSUER_SERIAL;
             if (issuer != NULL) {
                 BIO_printf(bio_err, "%s: issuer already given.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             issuer = parse_name(opt_arg(), MBSTRING_UTF8, 1, "issuer");
@@ -185,33 +195,31 @@ int storeutl_main(int argc, char *argv[])
             if (criterion != 0
                 && criterion != OSSL_STORE_SEARCH_BY_ISSUER_SERIAL) {
                 BIO_printf(bio_err, "%s: criterion already given.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             criterion = OSSL_STORE_SEARCH_BY_ISSUER_SERIAL;
             if (serial != NULL) {
                 BIO_printf(bio_err, "%s: serial number already given.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             if ((serial = s2i_ASN1_INTEGER(NULL, opt_arg())) == NULL) {
                 BIO_printf(bio_err, "%s: can't parse serial number argument.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             break;
         case OPT_CRITERION_FINGERPRINT:
-            if (criterion != 0
-                || (criterion == OSSL_STORE_SEARCH_BY_KEY_FINGERPRINT
-                    && fingerprint != NULL)) {
+            if (criterion != 0) {
                 BIO_printf(bio_err, "%s: criterion already given.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             criterion = OSSL_STORE_SEARCH_BY_KEY_FINGERPRINT;
             if (fingerprint != NULL) {
                 BIO_printf(bio_err, "%s: fingerprint already given.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             {
@@ -220,8 +228,8 @@ int storeutl_main(int argc, char *argv[])
                 if ((fingerprint = OPENSSL_hexstr2buf(opt_arg(), &tmplen))
                     == NULL) {
                     BIO_printf(bio_err,
-                               "%s: can't parse fingerprint argument.\n",
-                               prog);
+                        "%s: can't parse fingerprint argument.\n",
+                        prog);
                     goto end;
                 }
                 fingerprintlen = (size_t)tmplen;
@@ -230,18 +238,18 @@ int storeutl_main(int argc, char *argv[])
         case OPT_CRITERION_ALIAS:
             if (criterion != 0) {
                 BIO_printf(bio_err, "%s: criterion already given.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             criterion = OSSL_STORE_SEARCH_BY_ALIAS;
             if (alias != NULL) {
                 BIO_printf(bio_err, "%s: alias already given.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             if ((alias = OPENSSL_strdup(opt_arg())) == NULL) {
                 BIO_printf(bio_err, "%s: can't parse alias argument.\n",
-                           prog);
+                    prog);
                 goto end;
             }
             break;
@@ -277,8 +285,8 @@ int storeutl_main(int argc, char *argv[])
         case OSSL_STORE_SEARCH_BY_ISSUER_SERIAL:
             if (issuer == NULL || serial == NULL) {
                 BIO_printf(bio_err,
-                           "%s: both -issuer and -serial must be given.\n",
-                           prog);
+                    "%s: both -issuer and -serial must be given.\n",
+                    prog);
                 goto end;
             }
             if ((search = OSSL_STORE_SEARCH_by_issuer_serial(issuer, serial))
@@ -289,8 +297,8 @@ int storeutl_main(int argc, char *argv[])
             break;
         case OSSL_STORE_SEARCH_BY_KEY_FINGERPRINT:
             if ((search = OSSL_STORE_SEARCH_by_key_fingerprint(digest,
-                                                               fingerprint,
-                                                               fingerprintlen))
+                     fingerprint,
+                     fingerprintlen))
                 == NULL) {
                 ERR_print_errors(bio_err);
                 goto end;
@@ -313,10 +321,10 @@ int storeutl_main(int argc, char *argv[])
     pw_cb_data.prompt_info = argv[0];
 
     ret = process(argv[0], get_ui_method(), &pw_cb_data,
-                  expected, criterion, search,
-                  text, noout, recursive, 0, outfile, prog, libctx);
+        expected, criterion, search,
+        text, noout, recursive, 0, outfile, prog, libctx);
 
- end:
+end:
     EVP_MD_free(digest);
     OPENSSL_free(fingerprint);
     OPENSSL_free(alias);
@@ -333,26 +341,34 @@ int storeutl_main(int argc, char *argv[])
 static int indent_printf(int indent, BIO *bio, const char *format, ...)
 {
     va_list args;
-    int ret;
+    int ret, vret;
+
+    ret = BIO_printf(bio, "%*s", indent, "");
+    if (ret < 0)
+        return ret;
 
     va_start(args, format);
+    vret = BIO_vprintf(bio, format, args);
+    va_end(args);
 
-    ret = BIO_printf(bio, "%*s", indent, "") + BIO_vprintf(bio, format, args);
+    if (vret < 0)
+        return vret;
+    if (vret > INT_MAX - ret)
+        return INT_MAX;
 
-    va_end(args);
-    return ret;
+    return ret + vret;
 }
 
 static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
-                   int expected, int criterion, OSSL_STORE_SEARCH *search,
-                   int text, int noout, int recursive, int indent, const char *outfile,
-                   const char *prog, OSSL_LIB_CTX *libctx)
+    int expected, int criterion, OSSL_STORE_SEARCH *search,
+    int text, int noout, int recursive, int indent, const char *outfile,
+    const char *prog, OSSL_LIB_CTX *libctx)
 {
     OSSL_STORE_CTX *store_ctx = NULL;
     int ret = 1, items = 0;
 
     if ((store_ctx = OSSL_STORE_open_ex(uri, libctx, app_get0_propq(), uimeth, uidata,
-                                        NULL, NULL, NULL))
+             NULL, NULL, NULL))
         == NULL) {
         BIO_printf(bio_err, "Couldn't open file or uri %s\n", uri);
         ERR_print_errors(bio_err);
@@ -369,8 +385,8 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
     if (criterion != 0) {
         if (!OSSL_STORE_supports_search(store_ctx, criterion)) {
             BIO_printf(bio_err,
-                       "%s: the store scheme doesn't support the given search criteria.\n",
-                       prog);
+                "%s: the store scheme doesn't support the given search criteria.\n",
+                prog);
             goto end2;
         }
 
@@ -386,8 +402,7 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
     for (;;) {
         OSSL_STORE_INFO *info = OSSL_STORE_load(store_ctx);
         int type = info == NULL ? 0 : OSSL_STORE_INFO_get_type(info);
-        const char *infostr =
-            info == NULL ? NULL : OSSL_STORE_INFO_type_string(type);
+        const char *infostr = info == NULL ? NULL : OSSL_STORE_INFO_type_string(type);
 
         if (info == NULL) {
             if (OSSL_STORE_error(store_ctx)) {
@@ -405,8 +420,8 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
                 break;
 
             BIO_printf(bio_err,
-                       "ERROR: OSSL_STORE_load() returned NULL without "
-                       "eof or error indications\n");
+                "ERROR: OSSL_STORE_load() returned NULL without "
+                "eof or error indications\n");
             BIO_printf(bio_err, "       This is an error in the loader\n");
             ERR_print_errors(bio_err);
             ret++;
@@ -417,7 +432,7 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
             const char *name = OSSL_STORE_INFO_get0_NAME(info);
             const char *desc = OSSL_STORE_INFO_get0_NAME_description(info);
             indent_printf(indent, bio_out, "%d: %s: %s\n", items, infostr,
-                          name);
+                name);
             if (desc != NULL)
                 indent_printf(indent, bio_out, "%s\n", desc);
         } else {
@@ -441,33 +456,33 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
             if (recursive) {
                 const char *suburi = OSSL_STORE_INFO_get0_NAME(info);
                 ret += process(suburi, uimeth, uidata,
-                               expected, criterion, search,
-                               text, noout, recursive, indent + 2, outfile, prog,
-                               libctx);
+                    expected, criterion, search,
+                    text, noout, recursive, indent + 2, outfile, prog,
+                    libctx);
             }
             break;
         case OSSL_STORE_INFO_PARAMS:
             if (text)
                 EVP_PKEY_print_params(out, OSSL_STORE_INFO_get0_PARAMS(info),
-                                      0, NULL);
+                    0, NULL);
             if (!noout)
                 PEM_write_bio_Parameters(out,
-                                         OSSL_STORE_INFO_get0_PARAMS(info));
+                    OSSL_STORE_INFO_get0_PARAMS(info));
             break;
         case OSSL_STORE_INFO_PUBKEY:
             if (text)
                 EVP_PKEY_print_public(out, OSSL_STORE_INFO_get0_PUBKEY(info),
-                                      0, NULL);
+                    0, NULL);
             if (!noout)
                 PEM_write_bio_PUBKEY(out, OSSL_STORE_INFO_get0_PUBKEY(info));
             break;
         case OSSL_STORE_INFO_PKEY:
             if (text)
                 EVP_PKEY_print_private(out, OSSL_STORE_INFO_get0_PKEY(info),
-                                       0, NULL);
+                    0, NULL);
             if (!noout)
                 PEM_write_bio_PrivateKey(out, OSSL_STORE_INFO_get0_PKEY(info),
-                                         NULL, NULL, 0, NULL, NULL);
+                    NULL, NULL, 0, NULL, NULL);
             break;
         case OSSL_STORE_INFO_CERT:
             if (text)
@@ -491,7 +506,7 @@ static int process(const char *uri, const UI_METHOD *uimeth, PW_CB_DATA *uidata,
     }
     indent_printf(indent, out, "Total found: %d\n", items);
 
- end2:
+end2:
     if (!OSSL_STORE_close(store_ctx)) {
         ERR_print_errors(bio_err);
         ret++;
diff --git a/apps/testdsa.h b/apps/testdsa.h
index d80d2cf7f2d2d..e8d04bb31e8ab 100644
--- a/apps/testdsa.h
+++ b/apps/testdsa.h
@@ -13,45 +13,274 @@
 EVP_PKEY *get_dsa(int);
 
 static unsigned char dsa512_priv[] = {
-    0x65, 0xe5, 0xc7, 0x38, 0x60, 0x24, 0xb5, 0x89, 0xd4, 0x9c, 0xeb, 0x4c,
-    0x9c, 0x1d, 0x7a, 0x22, 0xbd, 0xd1, 0xc2, 0xd2,
+    0x65,
+    0xe5,
+    0xc7,
+    0x38,
+    0x60,
+    0x24,
+    0xb5,
+    0x89,
+    0xd4,
+    0x9c,
+    0xeb,
+    0x4c,
+    0x9c,
+    0x1d,
+    0x7a,
+    0x22,
+    0xbd,
+    0xd1,
+    0xc2,
+    0xd2,
 };
 
 static unsigned char dsa512_pub[] = {
-    0x00, 0x95, 0xa7, 0x0d, 0xec, 0x93, 0x68, 0xba, 0x5f, 0xf7, 0x5f, 0x07,
-    0xf2, 0x3b, 0xad, 0x6b, 0x01, 0xdc, 0xbe, 0xec, 0xde, 0x04, 0x7a, 0x3a,
-    0x27, 0xb3, 0xec, 0x49, 0xfd, 0x08, 0x43, 0x3d, 0x7e, 0xa8, 0x2c, 0x5e,
-    0x7b, 0xbb, 0xfc, 0xf4, 0x6e, 0xeb, 0x6c, 0xb0, 0x6e, 0xf8, 0x02, 0x12,
-    0x8c, 0x38, 0x5d, 0x83, 0x56, 0x7d, 0xee, 0x53, 0x05, 0x3e, 0x24, 0x84,
-    0xbe, 0xba, 0x0a, 0x6b, 0xc8,
+    0x00,
+    0x95,
+    0xa7,
+    0x0d,
+    0xec,
+    0x93,
+    0x68,
+    0xba,
+    0x5f,
+    0xf7,
+    0x5f,
+    0x07,
+    0xf2,
+    0x3b,
+    0xad,
+    0x6b,
+    0x01,
+    0xdc,
+    0xbe,
+    0xec,
+    0xde,
+    0x04,
+    0x7a,
+    0x3a,
+    0x27,
+    0xb3,
+    0xec,
+    0x49,
+    0xfd,
+    0x08,
+    0x43,
+    0x3d,
+    0x7e,
+    0xa8,
+    0x2c,
+    0x5e,
+    0x7b,
+    0xbb,
+    0xfc,
+    0xf4,
+    0x6e,
+    0xeb,
+    0x6c,
+    0xb0,
+    0x6e,
+    0xf8,
+    0x02,
+    0x12,
+    0x8c,
+    0x38,
+    0x5d,
+    0x83,
+    0x56,
+    0x7d,
+    0xee,
+    0x53,
+    0x05,
+    0x3e,
+    0x24,
+    0x84,
+    0xbe,
+    0xba,
+    0x0a,
+    0x6b,
+    0xc8,
 };
 
 static unsigned char dsa512_p[] = {
-    0x9D, 0x1B, 0x69, 0x8E, 0x26, 0xDB, 0xF2, 0x2B, 0x11, 0x70, 0x19, 0x86,
-    0xF6, 0x19, 0xC8, 0xF8, 0x19, 0xF2, 0x18, 0x53, 0x94, 0x46, 0x06, 0xD0,
-    0x62, 0x50, 0x33, 0x4B, 0x02, 0x3C, 0x52, 0x30, 0x03, 0x8B, 0x3B, 0xF9,
-    0x5F, 0xD1, 0x24, 0x06, 0x4F, 0x7B, 0x4C, 0xBA, 0xAA, 0x40, 0x9B, 0xFD,
-    0x96, 0xE4, 0x37, 0x33, 0xBB, 0x2D, 0x5A, 0xD7, 0x5A, 0x11, 0x40, 0x66,
-    0xA2, 0x76, 0x7D, 0x31,
+    0x9D,
+    0x1B,
+    0x69,
+    0x8E,
+    0x26,
+    0xDB,
+    0xF2,
+    0x2B,
+    0x11,
+    0x70,
+    0x19,
+    0x86,
+    0xF6,
+    0x19,
+    0xC8,
+    0xF8,
+    0x19,
+    0xF2,
+    0x18,
+    0x53,
+    0x94,
+    0x46,
+    0x06,
+    0xD0,
+    0x62,
+    0x50,
+    0x33,
+    0x4B,
+    0x02,
+    0x3C,
+    0x52,
+    0x30,
+    0x03,
+    0x8B,
+    0x3B,
+    0xF9,
+    0x5F,
+    0xD1,
+    0x24,
+    0x06,
+    0x4F,
+    0x7B,
+    0x4C,
+    0xBA,
+    0xAA,
+    0x40,
+    0x9B,
+    0xFD,
+    0x96,
+    0xE4,
+    0x37,
+    0x33,
+    0xBB,
+    0x2D,
+    0x5A,
+    0xD7,
+    0x5A,
+    0x11,
+    0x40,
+    0x66,
+    0xA2,
+    0x76,
+    0x7D,
+    0x31,
 };
 
 static unsigned char dsa512_q[] = {
-    0xFB, 0x53, 0xEF, 0x50, 0xB4, 0x40, 0x92, 0x31, 0x56, 0x86, 0x53, 0x7A,
-    0xE8, 0x8B, 0x22, 0x9A, 0x49, 0xFB, 0x71, 0x8F,
+    0xFB,
+    0x53,
+    0xEF,
+    0x50,
+    0xB4,
+    0x40,
+    0x92,
+    0x31,
+    0x56,
+    0x86,
+    0x53,
+    0x7A,
+    0xE8,
+    0x8B,
+    0x22,
+    0x9A,
+    0x49,
+    0xFB,
+    0x71,
+    0x8F,
 };
 
 static unsigned char dsa512_g[] = {
-    0x83, 0x3E, 0x88, 0xE5, 0xC5, 0x89, 0x73, 0xCE, 0x3B, 0x6C, 0x01, 0x49,
-    0xBF, 0xB3, 0xC7, 0x9F, 0x0A, 0xEA, 0x44, 0x91, 0xE5, 0x30, 0xAA, 0xD9,
-    0xBE, 0x5B, 0x5F, 0xB7, 0x10, 0xD7, 0x89, 0xB7, 0x8E, 0x74, 0xFB, 0xCF,
-    0x29, 0x1E, 0xEB, 0xA8, 0x2C, 0x54, 0x51, 0xB8, 0x10, 0xDE, 0xA0, 0xCE,
-    0x2F, 0xCC, 0x24, 0x6B, 0x90, 0x77, 0xDE, 0xA2, 0x68, 0xA6, 0x52, 0x12,
-    0xA2, 0x03, 0x9D, 0x20,
+    0x83,
+    0x3E,
+    0x88,
+    0xE5,
+    0xC5,
+    0x89,
+    0x73,
+    0xCE,
+    0x3B,
+    0x6C,
+    0x01,
+    0x49,
+    0xBF,
+    0xB3,
+    0xC7,
+    0x9F,
+    0x0A,
+    0xEA,
+    0x44,
+    0x91,
+    0xE5,
+    0x30,
+    0xAA,
+    0xD9,
+    0xBE,
+    0x5B,
+    0x5F,
+    0xB7,
+    0x10,
+    0xD7,
+    0x89,
+    0xB7,
+    0x8E,
+    0x74,
+    0xFB,
+    0xCF,
+    0x29,
+    0x1E,
+    0xEB,
+    0xA8,
+    0x2C,
+    0x54,
+    0x51,
+    0xB8,
+    0x10,
+    0xDE,
+    0xA0,
+    0xCE,
+    0x2F,
+    0xCC,
+    0x24,
+    0x6B,
+    0x90,
+    0x77,
+    0xDE,
+    0xA2,
+    0x68,
+    0xA6,
+    0x52,
+    0x12,
+    0xA2,
+    0x03,
+    0x9D,
+    0x20,
 };
 
 static unsigned char dsa1024_priv[] = {
-    0x7d, 0x21, 0xda, 0xbb, 0x62, 0x15, 0x47, 0x36, 0x07, 0x67, 0x12, 0xe8,
-    0x8c, 0xaa, 0x1c, 0xcd, 0x38, 0x12, 0x61, 0x18,
+    0x7d,
+    0x21,
+    0xda,
+    0xbb,
+    0x62,
+    0x15,
+    0x47,
+    0x36,
+    0x07,
+    0x67,
+    0x12,
+    0xe8,
+    0x8c,
+    0xaa,
+    0x1c,
+    0xcd,
+    0x38,
+    0x12,
+    0x61,
+    0x18,
 };
 
 static unsigned char dsa1024_pub[] = {
@@ -69,121 +298,1111 @@ static unsigned char dsa1024_pub[] = {
 };
 
 static unsigned char dsa1024_p[] = {
-    0xA7, 0x3F, 0x6E, 0x85, 0xBF, 0x41, 0x6A, 0x29, 0x7D, 0xF0, 0x9F, 0x47,
-    0x19, 0x30, 0x90, 0x9A, 0x09, 0x1D, 0xDA, 0x6A, 0x33, 0x1E, 0xC5, 0x3D,
-    0x86, 0x96, 0xB3, 0x15, 0xE0, 0x53, 0x2E, 0x8F, 0xE0, 0x59, 0x82, 0x73,
-    0x90, 0x3E, 0x75, 0x31, 0x99, 0x47, 0x7A, 0x52, 0xFB, 0x85, 0xE4, 0xD9,
-    0xA6, 0x7B, 0x38, 0x9B, 0x68, 0x8A, 0x84, 0x9B, 0x87, 0xC6, 0x1E, 0xB5,
-    0x7E, 0x86, 0x4B, 0x53, 0x5B, 0x59, 0xCF, 0x71, 0x65, 0x19, 0x88, 0x6E,
-    0xCE, 0x66, 0xAE, 0x6B, 0x88, 0x36, 0xFB, 0xEC, 0x28, 0xDC, 0xC2, 0xD7,
-    0xA5, 0xBB, 0xE5, 0x2C, 0x39, 0x26, 0x4B, 0xDA, 0x9A, 0x70, 0x18, 0x95,
-    0x37, 0x95, 0x10, 0x56, 0x23, 0xF6, 0x15, 0xED, 0xBA, 0x04, 0x5E, 0xDE,
-    0x39, 0x4F, 0xFD, 0xB7, 0x43, 0x1F, 0xB5, 0xA4, 0x65, 0x6F, 0xCD, 0x80,
-    0x11, 0xE4, 0x70, 0x95, 0x5B, 0x50, 0xCD, 0x49,
+    0xA7,
+    0x3F,
+    0x6E,
+    0x85,
+    0xBF,
+    0x41,
+    0x6A,
+    0x29,
+    0x7D,
+    0xF0,
+    0x9F,
+    0x47,
+    0x19,
+    0x30,
+    0x90,
+    0x9A,
+    0x09,
+    0x1D,
+    0xDA,
+    0x6A,
+    0x33,
+    0x1E,
+    0xC5,
+    0x3D,
+    0x86,
+    0x96,
+    0xB3,
+    0x15,
+    0xE0,
+    0x53,
+    0x2E,
+    0x8F,
+    0xE0,
+    0x59,
+    0x82,
+    0x73,
+    0x90,
+    0x3E,
+    0x75,
+    0x31,
+    0x99,
+    0x47,
+    0x7A,
+    0x52,
+    0xFB,
+    0x85,
+    0xE4,
+    0xD9,
+    0xA6,
+    0x7B,
+    0x38,
+    0x9B,
+    0x68,
+    0x8A,
+    0x84,
+    0x9B,
+    0x87,
+    0xC6,
+    0x1E,
+    0xB5,
+    0x7E,
+    0x86,
+    0x4B,
+    0x53,
+    0x5B,
+    0x59,
+    0xCF,
+    0x71,
+    0x65,
+    0x19,
+    0x88,
+    0x6E,
+    0xCE,
+    0x66,
+    0xAE,
+    0x6B,
+    0x88,
+    0x36,
+    0xFB,
+    0xEC,
+    0x28,
+    0xDC,
+    0xC2,
+    0xD7,
+    0xA5,
+    0xBB,
+    0xE5,
+    0x2C,
+    0x39,
+    0x26,
+    0x4B,
+    0xDA,
+    0x9A,
+    0x70,
+    0x18,
+    0x95,
+    0x37,
+    0x95,
+    0x10,
+    0x56,
+    0x23,
+    0xF6,
+    0x15,
+    0xED,
+    0xBA,
+    0x04,
+    0x5E,
+    0xDE,
+    0x39,
+    0x4F,
+    0xFD,
+    0xB7,
+    0x43,
+    0x1F,
+    0xB5,
+    0xA4,
+    0x65,
+    0x6F,
+    0xCD,
+    0x80,
+    0x11,
+    0xE4,
+    0x70,
+    0x95,
+    0x5B,
+    0x50,
+    0xCD,
+    0x49,
 };
 
 static unsigned char dsa1024_q[] = {
-    0xF7, 0x07, 0x31, 0xED, 0xFA, 0x6C, 0x06, 0x03, 0xD5, 0x85, 0x8A, 0x1C,
-    0xAC, 0x9C, 0x65, 0xE7, 0x50, 0x66, 0x65, 0x6F,
+    0xF7,
+    0x07,
+    0x31,
+    0xED,
+    0xFA,
+    0x6C,
+    0x06,
+    0x03,
+    0xD5,
+    0x85,
+    0x8A,
+    0x1C,
+    0xAC,
+    0x9C,
+    0x65,
+    0xE7,
+    0x50,
+    0x66,
+    0x65,
+    0x6F,
 };
 
 static unsigned char dsa1024_g[] = {
-    0x4D, 0xDF, 0x4C, 0x03, 0xA6, 0x91, 0x8A, 0xF5, 0x19, 0x6F, 0x50, 0x46,
-    0x25, 0x99, 0xE5, 0x68, 0x6F, 0x30, 0xE3, 0x69, 0xE1, 0xE5, 0xB3, 0x5D,
-    0x98, 0xBB, 0x28, 0x86, 0x48, 0xFC, 0xDE, 0x99, 0x04, 0x3F, 0x5F, 0x88,
-    0x0C, 0x9C, 0x73, 0x24, 0x0D, 0x20, 0x5D, 0xB9, 0x2A, 0x9A, 0x3F, 0x18,
-    0x96, 0x27, 0xE4, 0x62, 0x87, 0xC1, 0x7B, 0x74, 0x62, 0x53, 0xFC, 0x61,
-    0x27, 0xA8, 0x7A, 0x91, 0x09, 0x9D, 0xB6, 0xF1, 0x4D, 0x9C, 0x54, 0x0F,
-    0x58, 0x06, 0xEE, 0x49, 0x74, 0x07, 0xCE, 0x55, 0x7E, 0x23, 0xCE, 0x16,
-    0xF6, 0xCA, 0xDC, 0x5A, 0x61, 0x01, 0x7E, 0xC9, 0x71, 0xB5, 0x4D, 0xF6,
-    0xDC, 0x34, 0x29, 0x87, 0x68, 0xF6, 0x5E, 0x20, 0x93, 0xB3, 0xDB, 0xF5,
-    0xE4, 0x09, 0x6C, 0x41, 0x17, 0x95, 0x92, 0xEB, 0x01, 0xB5, 0x73, 0xA5,
-    0x6A, 0x7E, 0xD8, 0x32, 0xED, 0x0E, 0x02, 0xB8,
+    0x4D,
+    0xDF,
+    0x4C,
+    0x03,
+    0xA6,
+    0x91,
+    0x8A,
+    0xF5,
+    0x19,
+    0x6F,
+    0x50,
+    0x46,
+    0x25,
+    0x99,
+    0xE5,
+    0x68,
+    0x6F,
+    0x30,
+    0xE3,
+    0x69,
+    0xE1,
+    0xE5,
+    0xB3,
+    0x5D,
+    0x98,
+    0xBB,
+    0x28,
+    0x86,
+    0x48,
+    0xFC,
+    0xDE,
+    0x99,
+    0x04,
+    0x3F,
+    0x5F,
+    0x88,
+    0x0C,
+    0x9C,
+    0x73,
+    0x24,
+    0x0D,
+    0x20,
+    0x5D,
+    0xB9,
+    0x2A,
+    0x9A,
+    0x3F,
+    0x18,
+    0x96,
+    0x27,
+    0xE4,
+    0x62,
+    0x87,
+    0xC1,
+    0x7B,
+    0x74,
+    0x62,
+    0x53,
+    0xFC,
+    0x61,
+    0x27,
+    0xA8,
+    0x7A,
+    0x91,
+    0x09,
+    0x9D,
+    0xB6,
+    0xF1,
+    0x4D,
+    0x9C,
+    0x54,
+    0x0F,
+    0x58,
+    0x06,
+    0xEE,
+    0x49,
+    0x74,
+    0x07,
+    0xCE,
+    0x55,
+    0x7E,
+    0x23,
+    0xCE,
+    0x16,
+    0xF6,
+    0xCA,
+    0xDC,
+    0x5A,
+    0x61,
+    0x01,
+    0x7E,
+    0xC9,
+    0x71,
+    0xB5,
+    0x4D,
+    0xF6,
+    0xDC,
+    0x34,
+    0x29,
+    0x87,
+    0x68,
+    0xF6,
+    0x5E,
+    0x20,
+    0x93,
+    0xB3,
+    0xDB,
+    0xF5,
+    0xE4,
+    0x09,
+    0x6C,
+    0x41,
+    0x17,
+    0x95,
+    0x92,
+    0xEB,
+    0x01,
+    0xB5,
+    0x73,
+    0xA5,
+    0x6A,
+    0x7E,
+    0xD8,
+    0x32,
+    0xED,
+    0x0E,
+    0x02,
+    0xB8,
 };
 
 static unsigned char dsa2048_priv[] = {
-    0x32, 0x67, 0x92, 0xf6, 0xc4, 0xe2, 0xe2, 0xe8, 0xa0, 0x8b, 0x6b, 0x45,
-    0x0c, 0x8a, 0x76, 0xb0, 0xee, 0xcf, 0x91, 0xa7,
+    0x32,
+    0x67,
+    0x92,
+    0xf6,
+    0xc4,
+    0xe2,
+    0xe2,
+    0xe8,
+    0xa0,
+    0x8b,
+    0x6b,
+    0x45,
+    0x0c,
+    0x8a,
+    0x76,
+    0xb0,
+    0xee,
+    0xcf,
+    0x91,
+    0xa7,
 };
 
 static unsigned char dsa2048_pub[] = {
-    0x17, 0x8f, 0xa8, 0x11, 0x84, 0x92, 0xec, 0x83, 0x47, 0xc7, 0x6a, 0xb0,
-    0x92, 0xaf, 0x5a, 0x20, 0x37, 0xa3, 0x64, 0x79, 0xd2, 0xd0, 0x3d, 0xcd,
-    0xe0, 0x61, 0x88, 0x88, 0x21, 0xcc, 0x74, 0x5d, 0xce, 0x4c, 0x51, 0x47,
-    0xf0, 0xc5, 0x5c, 0x4c, 0x82, 0x7a, 0xaf, 0x72, 0xad, 0xb9, 0xe0, 0x53,
-    0xf2, 0x78, 0xb7, 0xf0, 0xb5, 0x48, 0x7f, 0x8a, 0x3a, 0x18, 0xd1, 0x9f,
-    0x8b, 0x7d, 0xa5, 0x47, 0xb7, 0x95, 0xab, 0x98, 0xf8, 0x7b, 0x74, 0x50,
-    0x56, 0x8e, 0x57, 0xf0, 0xee, 0xf5, 0xb7, 0xba, 0xab, 0x85, 0x86, 0xf9,
-    0x2b, 0xef, 0x41, 0x56, 0xa0, 0xa4, 0x9f, 0xb7, 0x38, 0x00, 0x46, 0x0a,
-    0xa6, 0xf1, 0xfc, 0x1f, 0xd8, 0x4e, 0x85, 0x44, 0x92, 0x43, 0x21, 0x5d,
-    0x6e, 0xcc, 0xc2, 0xcb, 0x26, 0x31, 0x0d, 0x21, 0xc4, 0xbd, 0x8d, 0x24,
-    0xbc, 0xd9, 0x18, 0x19, 0xd7, 0xdc, 0xf1, 0xe7, 0x93, 0x50, 0x48, 0x03,
-    0x2c, 0xae, 0x2e, 0xe7, 0x49, 0x88, 0x5f, 0x93, 0x57, 0x27, 0x99, 0x36,
-    0xb4, 0x20, 0xab, 0xfc, 0xa7, 0x2b, 0xf2, 0xd9, 0x98, 0xd7, 0xd4, 0x34,
-    0x9d, 0x96, 0x50, 0x58, 0x9a, 0xea, 0x54, 0xf3, 0xee, 0xf5, 0x63, 0x14,
-    0xee, 0x85, 0x83, 0x74, 0x76, 0xe1, 0x52, 0x95, 0xc3, 0xf7, 0xeb, 0x04,
-    0x04, 0x7b, 0xa7, 0x28, 0x1b, 0xcc, 0xea, 0x4a, 0x4e, 0x84, 0xda, 0xd8,
-    0x9c, 0x79, 0xd8, 0x9b, 0x66, 0x89, 0x2f, 0xcf, 0xac, 0xd7, 0x79, 0xf9,
-    0xa9, 0xd8, 0x45, 0x13, 0x78, 0xb9, 0x00, 0x14, 0xc9, 0x7e, 0x22, 0x51,
-    0x86, 0x67, 0xb0, 0x9f, 0x26, 0x11, 0x23, 0xc8, 0x38, 0xd7, 0x70, 0x1d,
-    0x15, 0x8e, 0x4d, 0x4f, 0x95, 0x97, 0x40, 0xa1, 0xc2, 0x7e, 0x01, 0x18,
-    0x72, 0xf4, 0x10, 0xe6, 0x8d, 0x52, 0x16, 0x7f, 0xf2, 0xc9, 0xf8, 0x33,
-    0x8b, 0x33, 0xb7, 0xce,
+    0x17,
+    0x8f,
+    0xa8,
+    0x11,
+    0x84,
+    0x92,
+    0xec,
+    0x83,
+    0x47,
+    0xc7,
+    0x6a,
+    0xb0,
+    0x92,
+    0xaf,
+    0x5a,
+    0x20,
+    0x37,
+    0xa3,
+    0x64,
+    0x79,
+    0xd2,
+    0xd0,
+    0x3d,
+    0xcd,
+    0xe0,
+    0x61,
+    0x88,
+    0x88,
+    0x21,
+    0xcc,
+    0x74,
+    0x5d,
+    0xce,
+    0x4c,
+    0x51,
+    0x47,
+    0xf0,
+    0xc5,
+    0x5c,
+    0x4c,
+    0x82,
+    0x7a,
+    0xaf,
+    0x72,
+    0xad,
+    0xb9,
+    0xe0,
+    0x53,
+    0xf2,
+    0x78,
+    0xb7,
+    0xf0,
+    0xb5,
+    0x48,
+    0x7f,
+    0x8a,
+    0x3a,
+    0x18,
+    0xd1,
+    0x9f,
+    0x8b,
+    0x7d,
+    0xa5,
+    0x47,
+    0xb7,
+    0x95,
+    0xab,
+    0x98,
+    0xf8,
+    0x7b,
+    0x74,
+    0x50,
+    0x56,
+    0x8e,
+    0x57,
+    0xf0,
+    0xee,
+    0xf5,
+    0xb7,
+    0xba,
+    0xab,
+    0x85,
+    0x86,
+    0xf9,
+    0x2b,
+    0xef,
+    0x41,
+    0x56,
+    0xa0,
+    0xa4,
+    0x9f,
+    0xb7,
+    0x38,
+    0x00,
+    0x46,
+    0x0a,
+    0xa6,
+    0xf1,
+    0xfc,
+    0x1f,
+    0xd8,
+    0x4e,
+    0x85,
+    0x44,
+    0x92,
+    0x43,
+    0x21,
+    0x5d,
+    0x6e,
+    0xcc,
+    0xc2,
+    0xcb,
+    0x26,
+    0x31,
+    0x0d,
+    0x21,
+    0xc4,
+    0xbd,
+    0x8d,
+    0x24,
+    0xbc,
+    0xd9,
+    0x18,
+    0x19,
+    0xd7,
+    0xdc,
+    0xf1,
+    0xe7,
+    0x93,
+    0x50,
+    0x48,
+    0x03,
+    0x2c,
+    0xae,
+    0x2e,
+    0xe7,
+    0x49,
+    0x88,
+    0x5f,
+    0x93,
+    0x57,
+    0x27,
+    0x99,
+    0x36,
+    0xb4,
+    0x20,
+    0xab,
+    0xfc,
+    0xa7,
+    0x2b,
+    0xf2,
+    0xd9,
+    0x98,
+    0xd7,
+    0xd4,
+    0x34,
+    0x9d,
+    0x96,
+    0x50,
+    0x58,
+    0x9a,
+    0xea,
+    0x54,
+    0xf3,
+    0xee,
+    0xf5,
+    0x63,
+    0x14,
+    0xee,
+    0x85,
+    0x83,
+    0x74,
+    0x76,
+    0xe1,
+    0x52,
+    0x95,
+    0xc3,
+    0xf7,
+    0xeb,
+    0x04,
+    0x04,
+    0x7b,
+    0xa7,
+    0x28,
+    0x1b,
+    0xcc,
+    0xea,
+    0x4a,
+    0x4e,
+    0x84,
+    0xda,
+    0xd8,
+    0x9c,
+    0x79,
+    0xd8,
+    0x9b,
+    0x66,
+    0x89,
+    0x2f,
+    0xcf,
+    0xac,
+    0xd7,
+    0x79,
+    0xf9,
+    0xa9,
+    0xd8,
+    0x45,
+    0x13,
+    0x78,
+    0xb9,
+    0x00,
+    0x14,
+    0xc9,
+    0x7e,
+    0x22,
+    0x51,
+    0x86,
+    0x67,
+    0xb0,
+    0x9f,
+    0x26,
+    0x11,
+    0x23,
+    0xc8,
+    0x38,
+    0xd7,
+    0x70,
+    0x1d,
+    0x15,
+    0x8e,
+    0x4d,
+    0x4f,
+    0x95,
+    0x97,
+    0x40,
+    0xa1,
+    0xc2,
+    0x7e,
+    0x01,
+    0x18,
+    0x72,
+    0xf4,
+    0x10,
+    0xe6,
+    0x8d,
+    0x52,
+    0x16,
+    0x7f,
+    0xf2,
+    0xc9,
+    0xf8,
+    0x33,
+    0x8b,
+    0x33,
+    0xb7,
+    0xce,
 };
 
 static unsigned char dsa2048_p[] = {
-    0xA0, 0x25, 0xFA, 0xAD, 0xF4, 0x8E, 0xB9, 0xE5, 0x99, 0xF3, 0x5D, 0x6F,
-    0x4F, 0x83, 0x34, 0xE2, 0x7E, 0xCF, 0x6F, 0xBF, 0x30, 0xAF, 0x6F, 0x81,
-    0xEB, 0xF8, 0xC4, 0x13, 0xD9, 0xA0, 0x5D, 0x8B, 0x5C, 0x8E, 0xDC, 0xC2,
-    0x1D, 0x0B, 0x41, 0x32, 0xB0, 0x1F, 0xFE, 0xEF, 0x0C, 0xC2, 0xA2, 0x7E,
-    0x68, 0x5C, 0x28, 0x21, 0xE9, 0xF5, 0xB1, 0x58, 0x12, 0x63, 0x4C, 0x19,
-    0x4E, 0xFF, 0x02, 0x4B, 0x92, 0xED, 0xD2, 0x07, 0x11, 0x4D, 0x8C, 0x58,
-    0x16, 0x5C, 0x55, 0x8E, 0xAD, 0xA3, 0x67, 0x7D, 0xB9, 0x86, 0x6E, 0x0B,
-    0xE6, 0x54, 0x6F, 0x40, 0xAE, 0x0E, 0x67, 0x4C, 0xF9, 0x12, 0x5B, 0x3C,
-    0x08, 0x7A, 0xF7, 0xFC, 0x67, 0x86, 0x69, 0xE7, 0x0A, 0x94, 0x40, 0xBF,
-    0x8B, 0x76, 0xFE, 0x26, 0xD1, 0xF2, 0xA1, 0x1A, 0x84, 0xA1, 0x43, 0x56,
-    0x28, 0xBC, 0x9A, 0x5F, 0xD7, 0x3B, 0x69, 0x89, 0x8A, 0x36, 0x2C, 0x51,
-    0xDF, 0x12, 0x77, 0x2F, 0x57, 0x7B, 0xA0, 0xAA, 0xDD, 0x7F, 0xA1, 0x62,
-    0x3B, 0x40, 0x7B, 0x68, 0x1A, 0x8F, 0x0D, 0x38, 0xBB, 0x21, 0x5D, 0x18,
-    0xFC, 0x0F, 0x46, 0xF7, 0xA3, 0xB0, 0x1D, 0x23, 0xC3, 0xD2, 0xC7, 0x72,
-    0x51, 0x18, 0xDF, 0x46, 0x95, 0x79, 0xD9, 0xBD, 0xB5, 0x19, 0x02, 0x2C,
-    0x87, 0xDC, 0xE7, 0x57, 0x82, 0x7E, 0xF1, 0x8B, 0x06, 0x3D, 0x00, 0xA5,
-    0x7B, 0x6B, 0x26, 0x27, 0x91, 0x0F, 0x6A, 0x77, 0xE4, 0xD5, 0x04, 0xE4,
-    0x12, 0x2C, 0x42, 0xFF, 0xD2, 0x88, 0xBB, 0xD3, 0x92, 0xA0, 0xF9, 0xC8,
-    0x51, 0x64, 0x14, 0x5C, 0xD8, 0xF9, 0x6C, 0x47, 0x82, 0xB4, 0x1C, 0x7F,
-    0x09, 0xB8, 0xF0, 0x25, 0x83, 0x1D, 0x3F, 0x3F, 0x05, 0xB3, 0x21, 0x0A,
-    0x5D, 0xA7, 0xD8, 0x54, 0xC3, 0x65, 0x7D, 0xC3, 0xB0, 0x1D, 0xBF, 0xAE,
-    0xF8, 0x68, 0xCF, 0x9B,
+    0xA0,
+    0x25,
+    0xFA,
+    0xAD,
+    0xF4,
+    0x8E,
+    0xB9,
+    0xE5,
+    0x99,
+    0xF3,
+    0x5D,
+    0x6F,
+    0x4F,
+    0x83,
+    0x34,
+    0xE2,
+    0x7E,
+    0xCF,
+    0x6F,
+    0xBF,
+    0x30,
+    0xAF,
+    0x6F,
+    0x81,
+    0xEB,
+    0xF8,
+    0xC4,
+    0x13,
+    0xD9,
+    0xA0,
+    0x5D,
+    0x8B,
+    0x5C,
+    0x8E,
+    0xDC,
+    0xC2,
+    0x1D,
+    0x0B,
+    0x41,
+    0x32,
+    0xB0,
+    0x1F,
+    0xFE,
+    0xEF,
+    0x0C,
+    0xC2,
+    0xA2,
+    0x7E,
+    0x68,
+    0x5C,
+    0x28,
+    0x21,
+    0xE9,
+    0xF5,
+    0xB1,
+    0x58,
+    0x12,
+    0x63,
+    0x4C,
+    0x19,
+    0x4E,
+    0xFF,
+    0x02,
+    0x4B,
+    0x92,
+    0xED,
+    0xD2,
+    0x07,
+    0x11,
+    0x4D,
+    0x8C,
+    0x58,
+    0x16,
+    0x5C,
+    0x55,
+    0x8E,
+    0xAD,
+    0xA3,
+    0x67,
+    0x7D,
+    0xB9,
+    0x86,
+    0x6E,
+    0x0B,
+    0xE6,
+    0x54,
+    0x6F,
+    0x40,
+    0xAE,
+    0x0E,
+    0x67,
+    0x4C,
+    0xF9,
+    0x12,
+    0x5B,
+    0x3C,
+    0x08,
+    0x7A,
+    0xF7,
+    0xFC,
+    0x67,
+    0x86,
+    0x69,
+    0xE7,
+    0x0A,
+    0x94,
+    0x40,
+    0xBF,
+    0x8B,
+    0x76,
+    0xFE,
+    0x26,
+    0xD1,
+    0xF2,
+    0xA1,
+    0x1A,
+    0x84,
+    0xA1,
+    0x43,
+    0x56,
+    0x28,
+    0xBC,
+    0x9A,
+    0x5F,
+    0xD7,
+    0x3B,
+    0x69,
+    0x89,
+    0x8A,
+    0x36,
+    0x2C,
+    0x51,
+    0xDF,
+    0x12,
+    0x77,
+    0x2F,
+    0x57,
+    0x7B,
+    0xA0,
+    0xAA,
+    0xDD,
+    0x7F,
+    0xA1,
+    0x62,
+    0x3B,
+    0x40,
+    0x7B,
+    0x68,
+    0x1A,
+    0x8F,
+    0x0D,
+    0x38,
+    0xBB,
+    0x21,
+    0x5D,
+    0x18,
+    0xFC,
+    0x0F,
+    0x46,
+    0xF7,
+    0xA3,
+    0xB0,
+    0x1D,
+    0x23,
+    0xC3,
+    0xD2,
+    0xC7,
+    0x72,
+    0x51,
+    0x18,
+    0xDF,
+    0x46,
+    0x95,
+    0x79,
+    0xD9,
+    0xBD,
+    0xB5,
+    0x19,
+    0x02,
+    0x2C,
+    0x87,
+    0xDC,
+    0xE7,
+    0x57,
+    0x82,
+    0x7E,
+    0xF1,
+    0x8B,
+    0x06,
+    0x3D,
+    0x00,
+    0xA5,
+    0x7B,
+    0x6B,
+    0x26,
+    0x27,
+    0x91,
+    0x0F,
+    0x6A,
+    0x77,
+    0xE4,
+    0xD5,
+    0x04,
+    0xE4,
+    0x12,
+    0x2C,
+    0x42,
+    0xFF,
+    0xD2,
+    0x88,
+    0xBB,
+    0xD3,
+    0x92,
+    0xA0,
+    0xF9,
+    0xC8,
+    0x51,
+    0x64,
+    0x14,
+    0x5C,
+    0xD8,
+    0xF9,
+    0x6C,
+    0x47,
+    0x82,
+    0xB4,
+    0x1C,
+    0x7F,
+    0x09,
+    0xB8,
+    0xF0,
+    0x25,
+    0x83,
+    0x1D,
+    0x3F,
+    0x3F,
+    0x05,
+    0xB3,
+    0x21,
+    0x0A,
+    0x5D,
+    0xA7,
+    0xD8,
+    0x54,
+    0xC3,
+    0x65,
+    0x7D,
+    0xC3,
+    0xB0,
+    0x1D,
+    0xBF,
+    0xAE,
+    0xF8,
+    0x68,
+    0xCF,
+    0x9B,
 };
 
 static unsigned char dsa2048_q[] = {
-    0x97, 0xE7, 0x33, 0x4D, 0xD3, 0x94, 0x3E, 0x0B, 0xDB, 0x62, 0x74, 0xC6,
-    0xA1, 0x08, 0xDD, 0x19, 0xA3, 0x75, 0x17, 0x1B,
+    0x97,
+    0xE7,
+    0x33,
+    0x4D,
+    0xD3,
+    0x94,
+    0x3E,
+    0x0B,
+    0xDB,
+    0x62,
+    0x74,
+    0xC6,
+    0xA1,
+    0x08,
+    0xDD,
+    0x19,
+    0xA3,
+    0x75,
+    0x17,
+    0x1B,
 };
 
 static unsigned char dsa2048_g[] = {
-    0x2C, 0x78, 0x16, 0x59, 0x34, 0x63, 0xF4, 0xF3, 0x92, 0xFC, 0xB5, 0xA5,
-    0x4F, 0x13, 0xDE, 0x2F, 0x1C, 0xA4, 0x3C, 0xAE, 0xAD, 0x38, 0x3F, 0x7E,
-    0x90, 0xBF, 0x96, 0xA6, 0xAE, 0x25, 0x90, 0x72, 0xF5, 0x8E, 0x80, 0x0C,
-    0x39, 0x1C, 0xD9, 0xEC, 0xBA, 0x90, 0x5B, 0x3A, 0xE8, 0x58, 0x6C, 0x9E,
-    0x30, 0x42, 0x37, 0x02, 0x31, 0x82, 0xBC, 0x6A, 0xDF, 0x6A, 0x09, 0x29,
-    0xE3, 0xC0, 0x46, 0xD1, 0xCB, 0x85, 0xEC, 0x0C, 0x30, 0x5E, 0xEA, 0xC8,
-    0x39, 0x8E, 0x22, 0x9F, 0x22, 0x10, 0xD2, 0x34, 0x61, 0x68, 0x37, 0x3D,
-    0x2E, 0x4A, 0x5B, 0x9A, 0xF5, 0xC1, 0x48, 0xC6, 0xF6, 0xDC, 0x63, 0x1A,
-    0xD3, 0x96, 0x64, 0xBA, 0x34, 0xC9, 0xD1, 0xA0, 0xD1, 0xAE, 0x6C, 0x2F,
-    0x48, 0x17, 0x93, 0x14, 0x43, 0xED, 0xF0, 0x21, 0x30, 0x19, 0xC3, 0x1B,
-    0x5F, 0xDE, 0xA3, 0xF0, 0x70, 0x78, 0x18, 0xE1, 0xA8, 0xE4, 0xEE, 0x2E,
-    0x00, 0xA5, 0xE4, 0xB3, 0x17, 0xC8, 0x0C, 0x7D, 0x6E, 0x42, 0xDC, 0xB7,
-    0x46, 0x00, 0x36, 0x4D, 0xD4, 0x46, 0xAA, 0x3D, 0x3C, 0x46, 0x89, 0x40,
-    0xBF, 0x1D, 0x84, 0x77, 0x0A, 0x75, 0xF3, 0x87, 0x1D, 0x08, 0x4C, 0xA6,
-    0xD1, 0xA9, 0x1C, 0x1E, 0x12, 0x1E, 0xE1, 0xC7, 0x30, 0x28, 0x76, 0xA5,
-    0x7F, 0x6C, 0x85, 0x96, 0x2B, 0x6F, 0xDB, 0x80, 0x66, 0x26, 0xAE, 0xF5,
-    0x93, 0xC7, 0x8E, 0xAE, 0x9A, 0xED, 0xE4, 0xCA, 0x04, 0xEA, 0x3B, 0x72,
-    0xEF, 0xDC, 0x87, 0xED, 0x0D, 0xA5, 0x4C, 0x4A, 0xDD, 0x71, 0x22, 0x64,
-    0x59, 0x69, 0x4E, 0x8E, 0xBF, 0x43, 0xDC, 0xAB, 0x8E, 0x66, 0xBB, 0x01,
-    0xB6, 0xF4, 0xE7, 0xFD, 0xD2, 0xAD, 0x9F, 0x36, 0xC1, 0xA0, 0x29, 0x99,
-    0xD1, 0x96, 0x70, 0x59, 0x06, 0x78, 0x35, 0xBD, 0x65, 0x55, 0x52, 0x9E,
-    0xF8, 0xB2, 0xE5, 0x38,
+    0x2C,
+    0x78,
+    0x16,
+    0x59,
+    0x34,
+    0x63,
+    0xF4,
+    0xF3,
+    0x92,
+    0xFC,
+    0xB5,
+    0xA5,
+    0x4F,
+    0x13,
+    0xDE,
+    0x2F,
+    0x1C,
+    0xA4,
+    0x3C,
+    0xAE,
+    0xAD,
+    0x38,
+    0x3F,
+    0x7E,
+    0x90,
+    0xBF,
+    0x96,
+    0xA6,
+    0xAE,
+    0x25,
+    0x90,
+    0x72,
+    0xF5,
+    0x8E,
+    0x80,
+    0x0C,
+    0x39,
+    0x1C,
+    0xD9,
+    0xEC,
+    0xBA,
+    0x90,
+    0x5B,
+    0x3A,
+    0xE8,
+    0x58,
+    0x6C,
+    0x9E,
+    0x30,
+    0x42,
+    0x37,
+    0x02,
+    0x31,
+    0x82,
+    0xBC,
+    0x6A,
+    0xDF,
+    0x6A,
+    0x09,
+    0x29,
+    0xE3,
+    0xC0,
+    0x46,
+    0xD1,
+    0xCB,
+    0x85,
+    0xEC,
+    0x0C,
+    0x30,
+    0x5E,
+    0xEA,
+    0xC8,
+    0x39,
+    0x8E,
+    0x22,
+    0x9F,
+    0x22,
+    0x10,
+    0xD2,
+    0x34,
+    0x61,
+    0x68,
+    0x37,
+    0x3D,
+    0x2E,
+    0x4A,
+    0x5B,
+    0x9A,
+    0xF5,
+    0xC1,
+    0x48,
+    0xC6,
+    0xF6,
+    0xDC,
+    0x63,
+    0x1A,
+    0xD3,
+    0x96,
+    0x64,
+    0xBA,
+    0x34,
+    0xC9,
+    0xD1,
+    0xA0,
+    0xD1,
+    0xAE,
+    0x6C,
+    0x2F,
+    0x48,
+    0x17,
+    0x93,
+    0x14,
+    0x43,
+    0xED,
+    0xF0,
+    0x21,
+    0x30,
+    0x19,
+    0xC3,
+    0x1B,
+    0x5F,
+    0xDE,
+    0xA3,
+    0xF0,
+    0x70,
+    0x78,
+    0x18,
+    0xE1,
+    0xA8,
+    0xE4,
+    0xEE,
+    0x2E,
+    0x00,
+    0xA5,
+    0xE4,
+    0xB3,
+    0x17,
+    0xC8,
+    0x0C,
+    0x7D,
+    0x6E,
+    0x42,
+    0xDC,
+    0xB7,
+    0x46,
+    0x00,
+    0x36,
+    0x4D,
+    0xD4,
+    0x46,
+    0xAA,
+    0x3D,
+    0x3C,
+    0x46,
+    0x89,
+    0x40,
+    0xBF,
+    0x1D,
+    0x84,
+    0x77,
+    0x0A,
+    0x75,
+    0xF3,
+    0x87,
+    0x1D,
+    0x08,
+    0x4C,
+    0xA6,
+    0xD1,
+    0xA9,
+    0x1C,
+    0x1E,
+    0x12,
+    0x1E,
+    0xE1,
+    0xC7,
+    0x30,
+    0x28,
+    0x76,
+    0xA5,
+    0x7F,
+    0x6C,
+    0x85,
+    0x96,
+    0x2B,
+    0x6F,
+    0xDB,
+    0x80,
+    0x66,
+    0x26,
+    0xAE,
+    0xF5,
+    0x93,
+    0xC7,
+    0x8E,
+    0xAE,
+    0x9A,
+    0xED,
+    0xE4,
+    0xCA,
+    0x04,
+    0xEA,
+    0x3B,
+    0x72,
+    0xEF,
+    0xDC,
+    0x87,
+    0xED,
+    0x0D,
+    0xA5,
+    0x4C,
+    0x4A,
+    0xDD,
+    0x71,
+    0x22,
+    0x64,
+    0x59,
+    0x69,
+    0x4E,
+    0x8E,
+    0xBF,
+    0x43,
+    0xDC,
+    0xAB,
+    0x8E,
+    0x66,
+    0xBB,
+    0x01,
+    0xB6,
+    0xF4,
+    0xE7,
+    0xFD,
+    0xD2,
+    0xAD,
+    0x9F,
+    0x36,
+    0xC1,
+    0xA0,
+    0x29,
+    0x99,
+    0xD1,
+    0x96,
+    0x70,
+    0x59,
+    0x06,
+    0x78,
+    0x35,
+    0xBD,
+    0x65,
+    0x55,
+    0x52,
+    0x9E,
+    0xF8,
+    0xB2,
+    0xE5,
+    0x38,
 };
 
 typedef struct testdsa_st {
@@ -199,18 +1418,18 @@ typedef struct testdsa_st {
     int q_l;
 } testdsa;
 
-#define set_dsa_ptr(st, bits) \
-    do { \
-        st.priv = dsa##bits##_priv; \
-        st.pub = dsa##bits##_pub; \
-        st.p = dsa##bits##_p; \
-        st.g = dsa##bits##_g; \
-        st.q = dsa##bits##_q; \
+#define set_dsa_ptr(st, bits)                 \
+    do {                                      \
+        st.priv = dsa##bits##_priv;           \
+        st.pub = dsa##bits##_pub;             \
+        st.p = dsa##bits##_p;                 \
+        st.g = dsa##bits##_g;                 \
+        st.q = dsa##bits##_q;                 \
         st.priv_l = sizeof(dsa##bits##_priv); \
-        st.pub_l = sizeof(dsa##bits##_pub); \
-        st.p_l = sizeof(dsa##bits##_p); \
-        st.g_l = sizeof(dsa##bits##_g); \
-        st.q_l = sizeof(dsa##bits##_q); \
+        st.pub_l = sizeof(dsa##bits##_pub);   \
+        st.p_l = sizeof(dsa##bits##_p);       \
+        st.g_l = sizeof(dsa##bits##_g);       \
+        st.q_l = sizeof(dsa##bits##_q);       \
     } while (0)
 
 EVP_PKEY *get_dsa(int dsa_bits)
@@ -250,21 +1469,22 @@ EVP_PKEY *get_dsa(int dsa_bits)
     }
     if ((tmpl = OSSL_PARAM_BLD_new()) == NULL
         || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P,
-                                   p)
+            p)
         || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_Q,
-                                   q)
+            q)
         || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_G,
-                                   g)
+            g)
         || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PRIV_KEY,
-                                   priv_key)
+            priv_key)
         || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PUB_KEY,
-                                   pub_key)
+            pub_key)
         || (params = OSSL_PARAM_BLD_to_param(tmpl)) == NULL)
         goto err;
 
     if (EVP_PKEY_fromdata_init(pctx) <= 0
         || EVP_PKEY_fromdata(pctx, &pkey, EVP_PKEY_KEYPAIR,
-                             params) <= 0)
+               params)
+            <= 0)
         pkey = NULL;
 err:
     OSSL_PARAM_free(params);
diff --git a/apps/testrsa.h b/apps/testrsa.h
index 8c3a967414c6c..db9221e8aaa44 100644
--- a/apps/testrsa.h
+++ b/apps/testrsa.h
@@ -8,224 +8,2128 @@
  */
 
 static unsigned char test512[] = {
-    0x30, 0x82, 0x01, 0x3a, 0x02, 0x01, 0x00, 0x02, 0x41, 0x00,
-    0xd6, 0x33, 0xb9, 0xc8, 0xfb, 0x4f, 0x3c, 0x7d, 0xc0, 0x01,
-    0x86, 0xd0, 0xe7, 0xa0, 0x55, 0xf2, 0x95, 0x93, 0xcc, 0x4f,
-    0xb7, 0x5b, 0x67, 0x5b, 0x94, 0x68, 0xc9, 0x34, 0x15, 0xde,
-    0xa5, 0x2e, 0x1c, 0x33, 0xc2, 0x6e, 0xfc, 0x34, 0x5e, 0x71,
-    0x13, 0xb7, 0xd6, 0xee, 0xd8, 0xa5, 0x65, 0x05, 0x72, 0x87,
-    0xa8, 0xb0, 0x77, 0xfe, 0x57, 0xf5, 0xfc, 0x5f, 0x55, 0x83,
-    0x87, 0xdd, 0x57, 0x49, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
-    0x41, 0x00, 0xa7, 0xf7, 0x91, 0xc5, 0x0f, 0x84, 0x57, 0xdc,
-    0x07, 0xf7, 0x6a, 0x7f, 0x60, 0x52, 0xb3, 0x72, 0xf1, 0x66,
-    0x1f, 0x7d, 0x97, 0x3b, 0x9e, 0xb6, 0x0a, 0x8f, 0x8c, 0xcf,
-    0x42, 0x23, 0x00, 0x04, 0xd4, 0x28, 0x0e, 0x1c, 0x90, 0xc4,
-    0x11, 0x25, 0x25, 0xa5, 0x93, 0xa5, 0x2f, 0x70, 0x02, 0xdf,
-    0x81, 0x9c, 0x49, 0x03, 0xa0, 0xf8, 0x6d, 0x54, 0x2e, 0x26,
-    0xde, 0xaa, 0x85, 0x59, 0xa8, 0x31, 0x02, 0x21, 0x00, 0xeb,
-    0x47, 0xd7, 0x3b, 0xf6, 0xc3, 0xdd, 0x5a, 0x46, 0xc5, 0xb9,
-    0x2b, 0x9a, 0xa0, 0x09, 0x8f, 0xa6, 0xfb, 0xf3, 0x78, 0x7a,
-    0x33, 0x70, 0x9d, 0x0f, 0x42, 0x6b, 0x13, 0x68, 0x24, 0xd3,
-    0x15, 0x02, 0x21, 0x00, 0xe9, 0x10, 0xb0, 0xb3, 0x0d, 0xe2,
-    0x82, 0x68, 0x77, 0x8a, 0x6e, 0x7c, 0xda, 0xbc, 0x3e, 0x53,
-    0x83, 0xfb, 0xd6, 0x22, 0xe7, 0xb5, 0xae, 0x6e, 0x80, 0xda,
-    0x00, 0x55, 0x97, 0xc1, 0xd0, 0x65, 0x02, 0x20, 0x4c, 0xf8,
-    0x73, 0xb1, 0x6a, 0x49, 0x29, 0x61, 0x1f, 0x46, 0x10, 0x0d,
-    0xf3, 0xc7, 0xe7, 0x58, 0xd7, 0x88, 0x15, 0x5e, 0x94, 0x9b,
-    0xbf, 0x7b, 0xa2, 0x42, 0x58, 0x45, 0x41, 0x0c, 0xcb, 0x01,
-    0x02, 0x20, 0x12, 0x11, 0xba, 0x31, 0x57, 0x9d, 0x3d, 0x11,
-    0x0e, 0x5b, 0x8c, 0x2f, 0x5f, 0xe2, 0x02, 0x4f, 0x05, 0x47,
-    0x8c, 0x15, 0x8e, 0xb3, 0x56, 0x3f, 0xb8, 0xfb, 0xad, 0xd4,
-    0xf4, 0xfc, 0x10, 0xc5, 0x02, 0x20, 0x18, 0xa1, 0x29, 0x99,
-    0x5b, 0xd9, 0xc8, 0xd4, 0xfc, 0x49, 0x7a, 0x2a, 0x21, 0x2c,
-    0x49, 0xe4, 0x4f, 0xeb, 0xef, 0x51, 0xf1, 0xab, 0x6d, 0xfb,
-    0x4b, 0x14, 0xe9, 0x4b, 0x52, 0xb5, 0x82, 0x2c,
+    0x30,
+    0x82,
+    0x01,
+    0x3a,
+    0x02,
+    0x01,
+    0x00,
+    0x02,
+    0x41,
+    0x00,
+    0xd6,
+    0x33,
+    0xb9,
+    0xc8,
+    0xfb,
+    0x4f,
+    0x3c,
+    0x7d,
+    0xc0,
+    0x01,
+    0x86,
+    0xd0,
+    0xe7,
+    0xa0,
+    0x55,
+    0xf2,
+    0x95,
+    0x93,
+    0xcc,
+    0x4f,
+    0xb7,
+    0x5b,
+    0x67,
+    0x5b,
+    0x94,
+    0x68,
+    0xc9,
+    0x34,
+    0x15,
+    0xde,
+    0xa5,
+    0x2e,
+    0x1c,
+    0x33,
+    0xc2,
+    0x6e,
+    0xfc,
+    0x34,
+    0x5e,
+    0x71,
+    0x13,
+    0xb7,
+    0xd6,
+    0xee,
+    0xd8,
+    0xa5,
+    0x65,
+    0x05,
+    0x72,
+    0x87,
+    0xa8,
+    0xb0,
+    0x77,
+    0xfe,
+    0x57,
+    0xf5,
+    0xfc,
+    0x5f,
+    0x55,
+    0x83,
+    0x87,
+    0xdd,
+    0x57,
+    0x49,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0x02,
+    0x41,
+    0x00,
+    0xa7,
+    0xf7,
+    0x91,
+    0xc5,
+    0x0f,
+    0x84,
+    0x57,
+    0xdc,
+    0x07,
+    0xf7,
+    0x6a,
+    0x7f,
+    0x60,
+    0x52,
+    0xb3,
+    0x72,
+    0xf1,
+    0x66,
+    0x1f,
+    0x7d,
+    0x97,
+    0x3b,
+    0x9e,
+    0xb6,
+    0x0a,
+    0x8f,
+    0x8c,
+    0xcf,
+    0x42,
+    0x23,
+    0x00,
+    0x04,
+    0xd4,
+    0x28,
+    0x0e,
+    0x1c,
+    0x90,
+    0xc4,
+    0x11,
+    0x25,
+    0x25,
+    0xa5,
+    0x93,
+    0xa5,
+    0x2f,
+    0x70,
+    0x02,
+    0xdf,
+    0x81,
+    0x9c,
+    0x49,
+    0x03,
+    0xa0,
+    0xf8,
+    0x6d,
+    0x54,
+    0x2e,
+    0x26,
+    0xde,
+    0xaa,
+    0x85,
+    0x59,
+    0xa8,
+    0x31,
+    0x02,
+    0x21,
+    0x00,
+    0xeb,
+    0x47,
+    0xd7,
+    0x3b,
+    0xf6,
+    0xc3,
+    0xdd,
+    0x5a,
+    0x46,
+    0xc5,
+    0xb9,
+    0x2b,
+    0x9a,
+    0xa0,
+    0x09,
+    0x8f,
+    0xa6,
+    0xfb,
+    0xf3,
+    0x78,
+    0x7a,
+    0x33,
+    0x70,
+    0x9d,
+    0x0f,
+    0x42,
+    0x6b,
+    0x13,
+    0x68,
+    0x24,
+    0xd3,
+    0x15,
+    0x02,
+    0x21,
+    0x00,
+    0xe9,
+    0x10,
+    0xb0,
+    0xb3,
+    0x0d,
+    0xe2,
+    0x82,
+    0x68,
+    0x77,
+    0x8a,
+    0x6e,
+    0x7c,
+    0xda,
+    0xbc,
+    0x3e,
+    0x53,
+    0x83,
+    0xfb,
+    0xd6,
+    0x22,
+    0xe7,
+    0xb5,
+    0xae,
+    0x6e,
+    0x80,
+    0xda,
+    0x00,
+    0x55,
+    0x97,
+    0xc1,
+    0xd0,
+    0x65,
+    0x02,
+    0x20,
+    0x4c,
+    0xf8,
+    0x73,
+    0xb1,
+    0x6a,
+    0x49,
+    0x29,
+    0x61,
+    0x1f,
+    0x46,
+    0x10,
+    0x0d,
+    0xf3,
+    0xc7,
+    0xe7,
+    0x58,
+    0xd7,
+    0x88,
+    0x15,
+    0x5e,
+    0x94,
+    0x9b,
+    0xbf,
+    0x7b,
+    0xa2,
+    0x42,
+    0x58,
+    0x45,
+    0x41,
+    0x0c,
+    0xcb,
+    0x01,
+    0x02,
+    0x20,
+    0x12,
+    0x11,
+    0xba,
+    0x31,
+    0x57,
+    0x9d,
+    0x3d,
+    0x11,
+    0x0e,
+    0x5b,
+    0x8c,
+    0x2f,
+    0x5f,
+    0xe2,
+    0x02,
+    0x4f,
+    0x05,
+    0x47,
+    0x8c,
+    0x15,
+    0x8e,
+    0xb3,
+    0x56,
+    0x3f,
+    0xb8,
+    0xfb,
+    0xad,
+    0xd4,
+    0xf4,
+    0xfc,
+    0x10,
+    0xc5,
+    0x02,
+    0x20,
+    0x18,
+    0xa1,
+    0x29,
+    0x99,
+    0x5b,
+    0xd9,
+    0xc8,
+    0xd4,
+    0xfc,
+    0x49,
+    0x7a,
+    0x2a,
+    0x21,
+    0x2c,
+    0x49,
+    0xe4,
+    0x4f,
+    0xeb,
+    0xef,
+    0x51,
+    0xf1,
+    0xab,
+    0x6d,
+    0xfb,
+    0x4b,
+    0x14,
+    0xe9,
+    0x4b,
+    0x52,
+    0xb5,
+    0x82,
+    0x2c,
 };
 
 static unsigned char test1024[] = {
-    0x30, 0x82, 0x02, 0x5c, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81,
-    0x00, 0xdc, 0x98, 0x43, 0xe8, 0x3d, 0x43, 0x5b, 0xe4, 0x05,
-    0xcd, 0xd0, 0xa9, 0x3e, 0xcb, 0x83, 0x75, 0xf6, 0xb5, 0xa5,
-    0x9f, 0x6b, 0xe9, 0x34, 0x41, 0x29, 0x18, 0xfa, 0x6a, 0x55,
-    0x4d, 0x70, 0xfc, 0xec, 0xae, 0x87, 0x38, 0x0a, 0x20, 0xa9,
-    0xc0, 0x45, 0x77, 0x6e, 0x57, 0x60, 0x57, 0xf4, 0xed, 0x96,
-    0x22, 0xcb, 0x8f, 0xe1, 0x33, 0x3a, 0x17, 0x1f, 0xed, 0x37,
-    0xa5, 0x6f, 0xeb, 0xa6, 0xbc, 0x12, 0x80, 0x1d, 0x53, 0xbd,
-    0x70, 0xeb, 0x21, 0x76, 0x3e, 0xc9, 0x2f, 0x1a, 0x45, 0x24,
-    0x82, 0xff, 0xcd, 0x59, 0x32, 0x06, 0x2e, 0x12, 0x3b, 0x23,
-    0x78, 0xed, 0x12, 0x3d, 0xe0, 0x8d, 0xf9, 0x67, 0x4f, 0x37,
-    0x4e, 0x47, 0x02, 0x4c, 0x2d, 0xc0, 0x4f, 0x1f, 0xb3, 0x94,
-    0xe1, 0x41, 0x2e, 0x2d, 0x90, 0x10, 0xfc, 0x82, 0x91, 0x8b,
-    0x0f, 0x22, 0xd4, 0xf2, 0xfc, 0x2c, 0xab, 0x53, 0x55, 0x02,
-    0x03, 0x01, 0x00, 0x01, 0x02, 0x81, 0x80, 0x2b, 0xcc, 0x3f,
-    0x8f, 0x58, 0xba, 0x8b, 0x00, 0x16, 0xf6, 0xea, 0x3a, 0xf0,
-    0x30, 0xd0, 0x05, 0x17, 0xda, 0xb0, 0xeb, 0x9a, 0x2d, 0x4f,
-    0x26, 0xb0, 0xd6, 0x38, 0xc1, 0xeb, 0xf5, 0xd8, 0x3d, 0x1f,
-    0x70, 0xf7, 0x7f, 0xf4, 0xe2, 0xcf, 0x51, 0x51, 0x79, 0x88,
-    0xfa, 0xe8, 0x32, 0x0e, 0x7b, 0x2d, 0x97, 0xf2, 0xfa, 0xba,
-    0x27, 0xc5, 0x9c, 0xd9, 0xc5, 0xeb, 0x8a, 0x79, 0x52, 0x3c,
-    0x64, 0x34, 0x7d, 0xc2, 0xcf, 0x28, 0xc7, 0x4e, 0xd5, 0x43,
-    0x0b, 0xd1, 0xa6, 0xca, 0x6d, 0x03, 0x2d, 0x72, 0x23, 0xbc,
-    0x6d, 0x05, 0xfa, 0x16, 0x09, 0x2f, 0x2e, 0x5c, 0xb6, 0xee,
-    0x74, 0xdd, 0xd2, 0x48, 0x8e, 0x36, 0x0c, 0x06, 0x3d, 0x4d,
-    0xe5, 0x10, 0x82, 0xeb, 0x6a, 0xf3, 0x4b, 0x9f, 0xd6, 0xed,
-    0x11, 0xb1, 0x6e, 0xec, 0xf4, 0xfe, 0x8e, 0x75, 0x94, 0x20,
-    0x2f, 0xcb, 0xac, 0x46, 0xf1, 0x02, 0x41, 0x00, 0xf9, 0x8c,
-    0xa3, 0x85, 0xb1, 0xdd, 0x29, 0xaf, 0x65, 0xc1, 0x33, 0xf3,
-    0x95, 0xc5, 0x52, 0x68, 0x0b, 0xd4, 0xf1, 0xe5, 0x0e, 0x02,
-    0x9f, 0x4f, 0xfa, 0x77, 0xdc, 0x46, 0x9e, 0xc7, 0xa6, 0xe4,
-    0x16, 0x29, 0xda, 0xb0, 0x07, 0xcf, 0x5b, 0xa9, 0x12, 0x8a,
-    0xdd, 0x63, 0x0a, 0xde, 0x2e, 0x8c, 0x66, 0x8b, 0x8c, 0xdc,
-    0x19, 0xa3, 0x7e, 0xf4, 0x3b, 0xd0, 0x1a, 0x8c, 0xa4, 0xc2,
-    0xe1, 0xd3, 0x02, 0x41, 0x00, 0xe2, 0x4c, 0x05, 0xf2, 0x04,
-    0x86, 0x4e, 0x61, 0x43, 0xdb, 0xb0, 0xb9, 0x96, 0x86, 0x52,
-    0x2c, 0xca, 0x8d, 0x7b, 0xab, 0x0b, 0x13, 0x0d, 0x7e, 0x38,
-    0x5b, 0xe2, 0x2e, 0x7b, 0x0e, 0xe7, 0x19, 0x99, 0x38, 0xe7,
-    0xf2, 0x21, 0xbd, 0x85, 0x85, 0xe3, 0xfd, 0x28, 0x77, 0x20,
-    0x31, 0x71, 0x2c, 0xd0, 0xff, 0xfb, 0x2e, 0xaf, 0x85, 0xb4,
-    0x86, 0xca, 0xf3, 0xbb, 0xca, 0xaa, 0x0f, 0x95, 0x37, 0x02,
-    0x40, 0x0e, 0x41, 0x9a, 0x95, 0xe8, 0xb3, 0x59, 0xce, 0x4b,
-    0x61, 0xde, 0x35, 0xec, 0x38, 0x79, 0x9c, 0xb8, 0x10, 0x52,
-    0x41, 0x63, 0xab, 0x82, 0xae, 0x6f, 0x00, 0xa9, 0xf4, 0xde,
-    0xdd, 0x49, 0x0b, 0x7e, 0xb8, 0xa5, 0x65, 0xa9, 0x0c, 0x8f,
-    0x8f, 0xf9, 0x1f, 0x35, 0xc6, 0x92, 0xb8, 0x5e, 0xb0, 0x66,
-    0xab, 0x52, 0x40, 0xc0, 0xb6, 0x36, 0x6a, 0x7d, 0x80, 0x46,
-    0x04, 0x02, 0xe5, 0x9f, 0x41, 0x02, 0x41, 0x00, 0xc0, 0xad,
-    0xcc, 0x4e, 0x21, 0xee, 0x1d, 0x24, 0x91, 0xfb, 0xa7, 0x80,
-    0x8d, 0x9a, 0xb6, 0xb3, 0x2e, 0x8f, 0xc2, 0xe1, 0x82, 0xdf,
-    0x69, 0x18, 0xb4, 0x71, 0xff, 0xa6, 0x65, 0xde, 0xed, 0x84,
-    0x8d, 0x42, 0xb7, 0xb3, 0x21, 0x69, 0x56, 0x1c, 0x07, 0x60,
-    0x51, 0x29, 0x04, 0xff, 0x34, 0x06, 0xdd, 0xb9, 0x67, 0x2c,
-    0x7c, 0x04, 0x93, 0x0e, 0x46, 0x15, 0xbb, 0x2a, 0xb7, 0x1b,
-    0xe7, 0x87, 0x02, 0x40, 0x78, 0xda, 0x5d, 0x07, 0x51, 0x0c,
-    0x16, 0x7a, 0x9f, 0x29, 0x20, 0x84, 0x0d, 0x42, 0xfa, 0xd7,
-    0x00, 0xd8, 0x77, 0x7e, 0xb0, 0xb0, 0x6b, 0xd6, 0x5b, 0x53,
-    0xb8, 0x9b, 0x7a, 0xcd, 0xc7, 0x2b, 0xb8, 0x6a, 0x63, 0xa9,
-    0xfb, 0x6f, 0xa4, 0x72, 0xbf, 0x4c, 0x5d, 0x00, 0x14, 0xba,
-    0xfa, 0x59, 0x88, 0xed, 0xe4, 0xe0, 0x8c, 0xa2, 0xec, 0x14,
-    0x7e, 0x2d, 0xe2, 0xf0, 0x46, 0x49, 0x95, 0x45,
+    0x30,
+    0x82,
+    0x02,
+    0x5c,
+    0x02,
+    0x01,
+    0x00,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xdc,
+    0x98,
+    0x43,
+    0xe8,
+    0x3d,
+    0x43,
+    0x5b,
+    0xe4,
+    0x05,
+    0xcd,
+    0xd0,
+    0xa9,
+    0x3e,
+    0xcb,
+    0x83,
+    0x75,
+    0xf6,
+    0xb5,
+    0xa5,
+    0x9f,
+    0x6b,
+    0xe9,
+    0x34,
+    0x41,
+    0x29,
+    0x18,
+    0xfa,
+    0x6a,
+    0x55,
+    0x4d,
+    0x70,
+    0xfc,
+    0xec,
+    0xae,
+    0x87,
+    0x38,
+    0x0a,
+    0x20,
+    0xa9,
+    0xc0,
+    0x45,
+    0x77,
+    0x6e,
+    0x57,
+    0x60,
+    0x57,
+    0xf4,
+    0xed,
+    0x96,
+    0x22,
+    0xcb,
+    0x8f,
+    0xe1,
+    0x33,
+    0x3a,
+    0x17,
+    0x1f,
+    0xed,
+    0x37,
+    0xa5,
+    0x6f,
+    0xeb,
+    0xa6,
+    0xbc,
+    0x12,
+    0x80,
+    0x1d,
+    0x53,
+    0xbd,
+    0x70,
+    0xeb,
+    0x21,
+    0x76,
+    0x3e,
+    0xc9,
+    0x2f,
+    0x1a,
+    0x45,
+    0x24,
+    0x82,
+    0xff,
+    0xcd,
+    0x59,
+    0x32,
+    0x06,
+    0x2e,
+    0x12,
+    0x3b,
+    0x23,
+    0x78,
+    0xed,
+    0x12,
+    0x3d,
+    0xe0,
+    0x8d,
+    0xf9,
+    0x67,
+    0x4f,
+    0x37,
+    0x4e,
+    0x47,
+    0x02,
+    0x4c,
+    0x2d,
+    0xc0,
+    0x4f,
+    0x1f,
+    0xb3,
+    0x94,
+    0xe1,
+    0x41,
+    0x2e,
+    0x2d,
+    0x90,
+    0x10,
+    0xfc,
+    0x82,
+    0x91,
+    0x8b,
+    0x0f,
+    0x22,
+    0xd4,
+    0xf2,
+    0xfc,
+    0x2c,
+    0xab,
+    0x53,
+    0x55,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0x02,
+    0x81,
+    0x80,
+    0x2b,
+    0xcc,
+    0x3f,
+    0x8f,
+    0x58,
+    0xba,
+    0x8b,
+    0x00,
+    0x16,
+    0xf6,
+    0xea,
+    0x3a,
+    0xf0,
+    0x30,
+    0xd0,
+    0x05,
+    0x17,
+    0xda,
+    0xb0,
+    0xeb,
+    0x9a,
+    0x2d,
+    0x4f,
+    0x26,
+    0xb0,
+    0xd6,
+    0x38,
+    0xc1,
+    0xeb,
+    0xf5,
+    0xd8,
+    0x3d,
+    0x1f,
+    0x70,
+    0xf7,
+    0x7f,
+    0xf4,
+    0xe2,
+    0xcf,
+    0x51,
+    0x51,
+    0x79,
+    0x88,
+    0xfa,
+    0xe8,
+    0x32,
+    0x0e,
+    0x7b,
+    0x2d,
+    0x97,
+    0xf2,
+    0xfa,
+    0xba,
+    0x27,
+    0xc5,
+    0x9c,
+    0xd9,
+    0xc5,
+    0xeb,
+    0x8a,
+    0x79,
+    0x52,
+    0x3c,
+    0x64,
+    0x34,
+    0x7d,
+    0xc2,
+    0xcf,
+    0x28,
+    0xc7,
+    0x4e,
+    0xd5,
+    0x43,
+    0x0b,
+    0xd1,
+    0xa6,
+    0xca,
+    0x6d,
+    0x03,
+    0x2d,
+    0x72,
+    0x23,
+    0xbc,
+    0x6d,
+    0x05,
+    0xfa,
+    0x16,
+    0x09,
+    0x2f,
+    0x2e,
+    0x5c,
+    0xb6,
+    0xee,
+    0x74,
+    0xdd,
+    0xd2,
+    0x48,
+    0x8e,
+    0x36,
+    0x0c,
+    0x06,
+    0x3d,
+    0x4d,
+    0xe5,
+    0x10,
+    0x82,
+    0xeb,
+    0x6a,
+    0xf3,
+    0x4b,
+    0x9f,
+    0xd6,
+    0xed,
+    0x11,
+    0xb1,
+    0x6e,
+    0xec,
+    0xf4,
+    0xfe,
+    0x8e,
+    0x75,
+    0x94,
+    0x20,
+    0x2f,
+    0xcb,
+    0xac,
+    0x46,
+    0xf1,
+    0x02,
+    0x41,
+    0x00,
+    0xf9,
+    0x8c,
+    0xa3,
+    0x85,
+    0xb1,
+    0xdd,
+    0x29,
+    0xaf,
+    0x65,
+    0xc1,
+    0x33,
+    0xf3,
+    0x95,
+    0xc5,
+    0x52,
+    0x68,
+    0x0b,
+    0xd4,
+    0xf1,
+    0xe5,
+    0x0e,
+    0x02,
+    0x9f,
+    0x4f,
+    0xfa,
+    0x77,
+    0xdc,
+    0x46,
+    0x9e,
+    0xc7,
+    0xa6,
+    0xe4,
+    0x16,
+    0x29,
+    0xda,
+    0xb0,
+    0x07,
+    0xcf,
+    0x5b,
+    0xa9,
+    0x12,
+    0x8a,
+    0xdd,
+    0x63,
+    0x0a,
+    0xde,
+    0x2e,
+    0x8c,
+    0x66,
+    0x8b,
+    0x8c,
+    0xdc,
+    0x19,
+    0xa3,
+    0x7e,
+    0xf4,
+    0x3b,
+    0xd0,
+    0x1a,
+    0x8c,
+    0xa4,
+    0xc2,
+    0xe1,
+    0xd3,
+    0x02,
+    0x41,
+    0x00,
+    0xe2,
+    0x4c,
+    0x05,
+    0xf2,
+    0x04,
+    0x86,
+    0x4e,
+    0x61,
+    0x43,
+    0xdb,
+    0xb0,
+    0xb9,
+    0x96,
+    0x86,
+    0x52,
+    0x2c,
+    0xca,
+    0x8d,
+    0x7b,
+    0xab,
+    0x0b,
+    0x13,
+    0x0d,
+    0x7e,
+    0x38,
+    0x5b,
+    0xe2,
+    0x2e,
+    0x7b,
+    0x0e,
+    0xe7,
+    0x19,
+    0x99,
+    0x38,
+    0xe7,
+    0xf2,
+    0x21,
+    0xbd,
+    0x85,
+    0x85,
+    0xe3,
+    0xfd,
+    0x28,
+    0x77,
+    0x20,
+    0x31,
+    0x71,
+    0x2c,
+    0xd0,
+    0xff,
+    0xfb,
+    0x2e,
+    0xaf,
+    0x85,
+    0xb4,
+    0x86,
+    0xca,
+    0xf3,
+    0xbb,
+    0xca,
+    0xaa,
+    0x0f,
+    0x95,
+    0x37,
+    0x02,
+    0x40,
+    0x0e,
+    0x41,
+    0x9a,
+    0x95,
+    0xe8,
+    0xb3,
+    0x59,
+    0xce,
+    0x4b,
+    0x61,
+    0xde,
+    0x35,
+    0xec,
+    0x38,
+    0x79,
+    0x9c,
+    0xb8,
+    0x10,
+    0x52,
+    0x41,
+    0x63,
+    0xab,
+    0x82,
+    0xae,
+    0x6f,
+    0x00,
+    0xa9,
+    0xf4,
+    0xde,
+    0xdd,
+    0x49,
+    0x0b,
+    0x7e,
+    0xb8,
+    0xa5,
+    0x65,
+    0xa9,
+    0x0c,
+    0x8f,
+    0x8f,
+    0xf9,
+    0x1f,
+    0x35,
+    0xc6,
+    0x92,
+    0xb8,
+    0x5e,
+    0xb0,
+    0x66,
+    0xab,
+    0x52,
+    0x40,
+    0xc0,
+    0xb6,
+    0x36,
+    0x6a,
+    0x7d,
+    0x80,
+    0x46,
+    0x04,
+    0x02,
+    0xe5,
+    0x9f,
+    0x41,
+    0x02,
+    0x41,
+    0x00,
+    0xc0,
+    0xad,
+    0xcc,
+    0x4e,
+    0x21,
+    0xee,
+    0x1d,
+    0x24,
+    0x91,
+    0xfb,
+    0xa7,
+    0x80,
+    0x8d,
+    0x9a,
+    0xb6,
+    0xb3,
+    0x2e,
+    0x8f,
+    0xc2,
+    0xe1,
+    0x82,
+    0xdf,
+    0x69,
+    0x18,
+    0xb4,
+    0x71,
+    0xff,
+    0xa6,
+    0x65,
+    0xde,
+    0xed,
+    0x84,
+    0x8d,
+    0x42,
+    0xb7,
+    0xb3,
+    0x21,
+    0x69,
+    0x56,
+    0x1c,
+    0x07,
+    0x60,
+    0x51,
+    0x29,
+    0x04,
+    0xff,
+    0x34,
+    0x06,
+    0xdd,
+    0xb9,
+    0x67,
+    0x2c,
+    0x7c,
+    0x04,
+    0x93,
+    0x0e,
+    0x46,
+    0x15,
+    0xbb,
+    0x2a,
+    0xb7,
+    0x1b,
+    0xe7,
+    0x87,
+    0x02,
+    0x40,
+    0x78,
+    0xda,
+    0x5d,
+    0x07,
+    0x51,
+    0x0c,
+    0x16,
+    0x7a,
+    0x9f,
+    0x29,
+    0x20,
+    0x84,
+    0x0d,
+    0x42,
+    0xfa,
+    0xd7,
+    0x00,
+    0xd8,
+    0x77,
+    0x7e,
+    0xb0,
+    0xb0,
+    0x6b,
+    0xd6,
+    0x5b,
+    0x53,
+    0xb8,
+    0x9b,
+    0x7a,
+    0xcd,
+    0xc7,
+    0x2b,
+    0xb8,
+    0x6a,
+    0x63,
+    0xa9,
+    0xfb,
+    0x6f,
+    0xa4,
+    0x72,
+    0xbf,
+    0x4c,
+    0x5d,
+    0x00,
+    0x14,
+    0xba,
+    0xfa,
+    0x59,
+    0x88,
+    0xed,
+    0xe4,
+    0xe0,
+    0x8c,
+    0xa2,
+    0xec,
+    0x14,
+    0x7e,
+    0x2d,
+    0xe2,
+    0xf0,
+    0x46,
+    0x49,
+    0x95,
+    0x45,
 };
 
 static unsigned char test2048[] = {
-    0x30, 0x82, 0x04, 0xa3, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01,
-    0x01, 0x00, 0xc0, 0xc0, 0xce, 0x3e, 0x3c, 0x53, 0x67, 0x3f,
-    0x4f, 0xc5, 0x2f, 0xa4, 0xc2, 0x5a, 0x2f, 0x58, 0xfd, 0x27,
-    0x52, 0x6a, 0xe8, 0xcf, 0x4a, 0x73, 0x47, 0x8d, 0x25, 0x0f,
-    0x5f, 0x03, 0x26, 0x78, 0xef, 0xf0, 0x22, 0x12, 0xd3, 0xde,
-    0x47, 0xb2, 0x1c, 0x0b, 0x38, 0x63, 0x1a, 0x6c, 0x85, 0x7a,
-    0x80, 0xc6, 0x8f, 0xa0, 0x41, 0xaf, 0x62, 0xc4, 0x67, 0x32,
-    0x88, 0xf8, 0xa6, 0x9c, 0xf5, 0x23, 0x1d, 0xe4, 0xac, 0x3f,
-    0x29, 0xf9, 0xec, 0xe1, 0x8b, 0x26, 0x03, 0x2c, 0xb2, 0xab,
-    0xf3, 0x7d, 0xb5, 0xca, 0x49, 0xc0, 0x8f, 0x1c, 0xdf, 0x33,
-    0x3a, 0x60, 0xda, 0x3c, 0xb0, 0x16, 0xf8, 0xa9, 0x12, 0x8f,
-    0x64, 0xac, 0x23, 0x0c, 0x69, 0x64, 0x97, 0x5d, 0x99, 0xd4,
-    0x09, 0x83, 0x9b, 0x61, 0xd3, 0xac, 0xf0, 0xde, 0xdd, 0x5e,
-    0x9f, 0x44, 0x94, 0xdb, 0x3a, 0x4d, 0x97, 0xe8, 0x52, 0x29,
-    0xf7, 0xdb, 0x94, 0x07, 0x45, 0x90, 0x78, 0x1e, 0x31, 0x0b,
-    0x80, 0xf7, 0x57, 0xad, 0x1c, 0x79, 0xc5, 0xcb, 0x32, 0xb0,
-    0xce, 0xcd, 0x74, 0xb3, 0xe2, 0x94, 0xc5, 0x78, 0x2f, 0x34,
-    0x1a, 0x45, 0xf7, 0x8c, 0x52, 0xa5, 0xbc, 0x8d, 0xec, 0xd1,
-    0x2f, 0x31, 0x3b, 0xf0, 0x49, 0x59, 0x5e, 0x88, 0x9d, 0x15,
-    0x92, 0x35, 0x32, 0xc1, 0xe7, 0x61, 0xec, 0x50, 0x48, 0x7c,
-    0xba, 0x05, 0xf9, 0xf8, 0xf8, 0xa7, 0x8c, 0x83, 0xe8, 0x66,
-    0x5b, 0xeb, 0xfe, 0xd8, 0x4f, 0xdd, 0x6d, 0x36, 0xc0, 0xb2,
-    0x90, 0x0f, 0xb8, 0x52, 0xf9, 0x04, 0x9b, 0x40, 0x2c, 0x27,
-    0xd6, 0x36, 0x8e, 0xc2, 0x1b, 0x44, 0xf3, 0x92, 0xd5, 0x15,
-    0x9e, 0x9a, 0xbc, 0xf3, 0x7d, 0x03, 0xd7, 0x02, 0x14, 0x20,
-    0xe9, 0x10, 0x92, 0xfd, 0xf9, 0xfc, 0x8f, 0xe5, 0x18, 0xe1,
-    0x95, 0xcc, 0x9e, 0x60, 0xa6, 0xfa, 0x38, 0x4d, 0x02, 0x03,
-    0x01, 0x00, 0x01, 0x02, 0x82, 0x01, 0x00, 0x00, 0xc3, 0xc3,
-    0x0d, 0xb4, 0x27, 0x90, 0x8d, 0x4b, 0xbf, 0xb8, 0x84, 0xaa,
-    0xd0, 0xb8, 0xc7, 0x5d, 0x99, 0xbe, 0x55, 0xf6, 0x3e, 0x7c,
-    0x49, 0x20, 0xcb, 0x8a, 0x8e, 0x19, 0x0e, 0x66, 0x24, 0xac,
-    0xaf, 0x03, 0x33, 0x97, 0xeb, 0x95, 0xd5, 0x3b, 0x0f, 0x40,
-    0x56, 0x04, 0x50, 0xd1, 0xe6, 0xbe, 0x84, 0x0b, 0x25, 0xd3,
-    0x9c, 0xe2, 0x83, 0x6c, 0xf5, 0x62, 0x5d, 0xba, 0x2b, 0x7d,
-    0x3d, 0x7a, 0x6c, 0xe1, 0xd2, 0x0e, 0x54, 0x93, 0x80, 0x01,
-    0x91, 0x51, 0x09, 0xe8, 0x5b, 0x8e, 0x47, 0xbd, 0x64, 0xe4,
-    0x0e, 0x03, 0x83, 0x55, 0xcf, 0x5a, 0x37, 0xf0, 0x25, 0xb5,
-    0x7d, 0x21, 0xd7, 0x69, 0xdf, 0x6f, 0xc2, 0xcf, 0x10, 0xc9,
-    0x8a, 0x40, 0x9f, 0x7a, 0x70, 0xc0, 0xe8, 0xe8, 0xc0, 0xe6,
-    0x9a, 0x15, 0x0a, 0x8d, 0x4e, 0x46, 0xcb, 0x7a, 0xdb, 0xb3,
-    0xcb, 0x83, 0x02, 0xc4, 0xf0, 0xab, 0xeb, 0x02, 0x01, 0x0e,
-    0x23, 0xfc, 0x1d, 0xc4, 0xbd, 0xd4, 0xaa, 0x5d, 0x31, 0x46,
-    0x99, 0xce, 0x9e, 0xf8, 0x04, 0x75, 0x10, 0x67, 0xc4, 0x53,
-    0x47, 0x44, 0xfa, 0xc2, 0x25, 0x73, 0x7e, 0xd0, 0x8e, 0x59,
-    0xd1, 0xb2, 0x5a, 0xf4, 0xc7, 0x18, 0x92, 0x2f, 0x39, 0xab,
-    0xcd, 0xa3, 0xb5, 0xc2, 0xb9, 0xc7, 0xb9, 0x1b, 0x9f, 0x48,
-    0xfa, 0x13, 0xc6, 0x98, 0x4d, 0xca, 0x84, 0x9c, 0x06, 0xca,
-    0xe7, 0x89, 0x01, 0x04, 0xc4, 0x6c, 0xfd, 0x29, 0x59, 0x35,
-    0xe7, 0xf3, 0xdd, 0xce, 0x64, 0x59, 0xbf, 0x21, 0x13, 0xa9,
-    0x9f, 0x0e, 0xc5, 0xff, 0xbd, 0x33, 0x00, 0xec, 0xac, 0x6b,
-    0x11, 0xef, 0x51, 0x5e, 0xad, 0x07, 0x15, 0xde, 0xb8, 0x5f,
-    0xc6, 0xb9, 0xa3, 0x22, 0x65, 0x46, 0x83, 0x14, 0xdf, 0xd0,
-    0xf1, 0x44, 0x8a, 0xe1, 0x9c, 0x23, 0x33, 0xb4, 0x97, 0x33,
-    0xe6, 0x6b, 0x81, 0x02, 0x81, 0x81, 0x00, 0xec, 0x12, 0xa7,
-    0x59, 0x74, 0x6a, 0xde, 0x3e, 0xad, 0xd8, 0x36, 0x80, 0x50,
-    0xa2, 0xd5, 0x21, 0x81, 0x07, 0xf1, 0xd0, 0x91, 0xf2, 0x6c,
-    0x12, 0x2f, 0x9d, 0x1a, 0x26, 0xf8, 0x30, 0x65, 0xdf, 0xe8,
-    0xc0, 0x9b, 0x6a, 0x30, 0x98, 0x82, 0x87, 0xec, 0xa2, 0x56,
-    0x87, 0x62, 0x6f, 0xe7, 0x9f, 0xf6, 0x56, 0xe6, 0x71, 0x8f,
-    0x49, 0x86, 0x93, 0x5a, 0x4d, 0x34, 0x58, 0xfe, 0xd9, 0x04,
-    0x13, 0xaf, 0x79, 0xb7, 0xad, 0x11, 0xd1, 0x30, 0x9a, 0x14,
-    0x06, 0xa0, 0xfa, 0xb7, 0x55, 0xdc, 0x6c, 0x5a, 0x4c, 0x2c,
-    0x59, 0x56, 0xf6, 0xe8, 0x9d, 0xaf, 0x0a, 0x78, 0x99, 0x06,
-    0x06, 0x9e, 0xe7, 0x9c, 0x51, 0x55, 0x43, 0xfc, 0x3b, 0x6c,
-    0x0b, 0xbf, 0x2d, 0x41, 0xa7, 0xaf, 0xb7, 0xe0, 0xe8, 0x28,
-    0x18, 0xb4, 0x13, 0xd1, 0xe6, 0x97, 0xd0, 0x9f, 0x6a, 0x80,
-    0xca, 0xdd, 0x1a, 0x7e, 0x15, 0x02, 0x81, 0x81, 0x00, 0xd1,
-    0x06, 0x0c, 0x1f, 0xe3, 0xd0, 0xab, 0xd6, 0xca, 0x7c, 0xbc,
-    0x7d, 0x13, 0x35, 0xce, 0x27, 0xcd, 0xd8, 0x49, 0x51, 0x63,
-    0x64, 0x0f, 0xca, 0x06, 0x12, 0xfc, 0x07, 0x3e, 0xaf, 0x61,
-    0x6d, 0xe2, 0x53, 0x39, 0x27, 0xae, 0xc3, 0x11, 0x9e, 0x94,
-    0x01, 0x4f, 0xe3, 0xf3, 0x67, 0xf9, 0x77, 0xf9, 0xe7, 0x95,
-    0x3a, 0x6f, 0xe2, 0x20, 0x73, 0x3e, 0xa4, 0x7a, 0x28, 0xd4,
-    0x61, 0x97, 0xf6, 0x17, 0xa0, 0x23, 0x10, 0x2b, 0xce, 0x84,
-    0x57, 0x7e, 0x25, 0x1f, 0xf4, 0xa8, 0x54, 0xd2, 0x65, 0x94,
-    0xcc, 0x95, 0x0a, 0xab, 0x30, 0xc1, 0x59, 0x1f, 0x61, 0x8e,
-    0xb9, 0x6b, 0xd7, 0x4e, 0xb9, 0x83, 0x43, 0x79, 0x85, 0x11,
-    0xbc, 0x0f, 0xae, 0x25, 0x20, 0x05, 0xbc, 0xd2, 0x48, 0xa1,
-    0x68, 0x09, 0x84, 0xf6, 0x12, 0x9a, 0x66, 0xb9, 0x2b, 0xbb,
-    0x76, 0x03, 0x17, 0x46, 0x4e, 0x97, 0x59, 0x02, 0x81, 0x80,
-    0x09, 0x4c, 0xfa, 0xd6, 0xe5, 0x65, 0x48, 0x78, 0x43, 0xb5,
-    0x1f, 0x00, 0x93, 0x2c, 0xb7, 0x24, 0xe8, 0xc6, 0x7d, 0x5a,
-    0x70, 0x45, 0x92, 0xc8, 0x6c, 0xa3, 0xcd, 0xe1, 0xf7, 0x29,
-    0x40, 0xfa, 0x3f, 0x5b, 0x47, 0x44, 0x39, 0xc1, 0xe8, 0x72,
-    0x9e, 0x7a, 0x0e, 0xda, 0xaa, 0xa0, 0x2a, 0x09, 0xfd, 0x54,
-    0x93, 0x23, 0xaa, 0x37, 0x85, 0x5b, 0xcc, 0xd4, 0xf9, 0xd8,
-    0xff, 0xc1, 0x61, 0x0d, 0xbd, 0x7e, 0x18, 0x24, 0x73, 0x6d,
-    0x40, 0x72, 0xf1, 0x93, 0x09, 0x48, 0x97, 0x6c, 0x84, 0x90,
-    0xa8, 0x46, 0x14, 0x01, 0x39, 0x11, 0xe5, 0x3c, 0x41, 0x27,
-    0x32, 0x75, 0x24, 0xed, 0xa1, 0xd9, 0x12, 0x29, 0x8a, 0x28,
-    0x71, 0x89, 0x8d, 0xca, 0x30, 0xb0, 0x01, 0xc4, 0x2f, 0x82,
-    0x19, 0x14, 0x4c, 0x70, 0x1c, 0xb8, 0x23, 0x2e, 0xe8, 0x90,
-    0x49, 0x97, 0x92, 0x97, 0x6b, 0x7a, 0x9d, 0xb9, 0x02, 0x81,
-    0x80, 0x0f, 0x0e, 0xa1, 0x76, 0xf6, 0xa1, 0x44, 0x8f, 0xaf,
-    0x7c, 0x76, 0xd3, 0x87, 0xbb, 0xbb, 0x83, 0x10, 0x88, 0x01,
-    0x18, 0x14, 0xd1, 0xd3, 0x75, 0x59, 0x24, 0xaa, 0xf5, 0x16,
-    0xa5, 0xe9, 0x9d, 0xd1, 0xcc, 0xee, 0xf4, 0x15, 0xd9, 0xc5,
-    0x7e, 0x27, 0xe9, 0x44, 0x49, 0x06, 0x72, 0xb9, 0xfc, 0xd3,
-    0x8a, 0xc4, 0x2c, 0x36, 0x7d, 0x12, 0x9b, 0x5a, 0xaa, 0xdc,
-    0x85, 0xee, 0x6e, 0xad, 0x54, 0xb3, 0xf4, 0xfc, 0x31, 0xa1,
-    0x06, 0x3a, 0x70, 0x57, 0x0c, 0xf3, 0x95, 0x5b, 0x3e, 0xe8,
-    0xfd, 0x1a, 0x4f, 0xf6, 0x78, 0x93, 0x46, 0x6a, 0xd7, 0x31,
-    0xb4, 0x84, 0x64, 0x85, 0x09, 0x38, 0x89, 0x92, 0x94, 0x1c,
-    0xbf, 0xe2, 0x3c, 0x2a, 0xe0, 0xff, 0x99, 0xa3, 0xf0, 0x2b,
-    0x31, 0xc2, 0x36, 0xcd, 0x60, 0xbf, 0x9d, 0x2d, 0x74, 0x32,
-    0xe8, 0x9c, 0x93, 0x6e, 0xbb, 0x91, 0x7b, 0xfd, 0xd9, 0x02,
-    0x81, 0x81, 0x00, 0xa2, 0x71, 0x25, 0x38, 0xeb, 0x2a, 0xe9,
-    0x37, 0xcd, 0xfe, 0x44, 0xce, 0x90, 0x3f, 0x52, 0x87, 0x84,
-    0x52, 0x1b, 0xae, 0x8d, 0x22, 0x94, 0xce, 0x38, 0xe6, 0x04,
-    0x88, 0x76, 0x85, 0x9a, 0xd3, 0x14, 0x09, 0xe5, 0x69, 0x9a,
-    0xff, 0x58, 0x92, 0x02, 0x6a, 0x7d, 0x7c, 0x1e, 0x2c, 0xfd,
-    0xa8, 0xca, 0x32, 0x14, 0x4f, 0x0d, 0x84, 0x0d, 0x37, 0x43,
-    0xbf, 0xe4, 0x5d, 0x12, 0xc8, 0x24, 0x91, 0x27, 0x8d, 0x46,
-    0xd9, 0x54, 0x53, 0xe7, 0x62, 0x71, 0xa8, 0x2b, 0x71, 0x41,
-    0x8d, 0x75, 0xf8, 0x3a, 0xa0, 0x61, 0x29, 0x46, 0xa6, 0xe5,
-    0x82, 0xfa, 0x3a, 0xd9, 0x08, 0xfa, 0xfc, 0x63, 0xfd, 0x6b,
-    0x30, 0xbc, 0xf4, 0x4e, 0x9e, 0x8c, 0x25, 0x0c, 0xb6, 0x55,
-    0xe7, 0x3c, 0xd4, 0x4e, 0x0b, 0xfd, 0x8b, 0xc3, 0x0e, 0x1d,
-    0x9c, 0x44, 0x57, 0x8f, 0x1f, 0x86, 0xf7, 0xd5, 0x1b, 0xe4,
+    0x30,
+    0x82,
+    0x04,
+    0xa3,
+    0x02,
+    0x01,
+    0x00,
+    0x02,
+    0x82,
+    0x01,
+    0x01,
+    0x00,
+    0xc0,
+    0xc0,
+    0xce,
+    0x3e,
+    0x3c,
+    0x53,
+    0x67,
+    0x3f,
+    0x4f,
+    0xc5,
+    0x2f,
+    0xa4,
+    0xc2,
+    0x5a,
+    0x2f,
+    0x58,
+    0xfd,
+    0x27,
+    0x52,
+    0x6a,
+    0xe8,
+    0xcf,
+    0x4a,
+    0x73,
+    0x47,
+    0x8d,
+    0x25,
+    0x0f,
+    0x5f,
+    0x03,
+    0x26,
+    0x78,
+    0xef,
+    0xf0,
+    0x22,
+    0x12,
+    0xd3,
+    0xde,
+    0x47,
+    0xb2,
+    0x1c,
+    0x0b,
+    0x38,
+    0x63,
+    0x1a,
+    0x6c,
+    0x85,
+    0x7a,
+    0x80,
+    0xc6,
+    0x8f,
+    0xa0,
+    0x41,
+    0xaf,
+    0x62,
+    0xc4,
+    0x67,
+    0x32,
+    0x88,
+    0xf8,
+    0xa6,
+    0x9c,
+    0xf5,
+    0x23,
+    0x1d,
+    0xe4,
+    0xac,
+    0x3f,
+    0x29,
+    0xf9,
+    0xec,
+    0xe1,
+    0x8b,
+    0x26,
+    0x03,
+    0x2c,
+    0xb2,
+    0xab,
+    0xf3,
+    0x7d,
+    0xb5,
+    0xca,
+    0x49,
+    0xc0,
+    0x8f,
+    0x1c,
+    0xdf,
+    0x33,
+    0x3a,
+    0x60,
+    0xda,
+    0x3c,
+    0xb0,
+    0x16,
+    0xf8,
+    0xa9,
+    0x12,
+    0x8f,
+    0x64,
+    0xac,
+    0x23,
+    0x0c,
+    0x69,
+    0x64,
+    0x97,
+    0x5d,
+    0x99,
+    0xd4,
+    0x09,
+    0x83,
+    0x9b,
+    0x61,
+    0xd3,
+    0xac,
+    0xf0,
+    0xde,
+    0xdd,
+    0x5e,
+    0x9f,
+    0x44,
+    0x94,
+    0xdb,
+    0x3a,
+    0x4d,
+    0x97,
+    0xe8,
+    0x52,
+    0x29,
+    0xf7,
+    0xdb,
+    0x94,
+    0x07,
+    0x45,
+    0x90,
+    0x78,
+    0x1e,
+    0x31,
+    0x0b,
+    0x80,
+    0xf7,
+    0x57,
+    0xad,
+    0x1c,
+    0x79,
+    0xc5,
+    0xcb,
+    0x32,
+    0xb0,
+    0xce,
+    0xcd,
+    0x74,
+    0xb3,
+    0xe2,
+    0x94,
+    0xc5,
+    0x78,
+    0x2f,
+    0x34,
+    0x1a,
+    0x45,
+    0xf7,
+    0x8c,
+    0x52,
+    0xa5,
+    0xbc,
+    0x8d,
+    0xec,
+    0xd1,
+    0x2f,
+    0x31,
+    0x3b,
+    0xf0,
+    0x49,
+    0x59,
+    0x5e,
+    0x88,
+    0x9d,
+    0x15,
+    0x92,
+    0x35,
+    0x32,
+    0xc1,
+    0xe7,
+    0x61,
+    0xec,
+    0x50,
+    0x48,
+    0x7c,
+    0xba,
+    0x05,
+    0xf9,
+    0xf8,
+    0xf8,
+    0xa7,
+    0x8c,
+    0x83,
+    0xe8,
+    0x66,
+    0x5b,
+    0xeb,
+    0xfe,
+    0xd8,
+    0x4f,
+    0xdd,
+    0x6d,
+    0x36,
+    0xc0,
+    0xb2,
+    0x90,
+    0x0f,
+    0xb8,
+    0x52,
+    0xf9,
+    0x04,
+    0x9b,
+    0x40,
+    0x2c,
+    0x27,
+    0xd6,
+    0x36,
+    0x8e,
+    0xc2,
+    0x1b,
+    0x44,
+    0xf3,
+    0x92,
+    0xd5,
+    0x15,
+    0x9e,
+    0x9a,
+    0xbc,
+    0xf3,
+    0x7d,
+    0x03,
+    0xd7,
+    0x02,
+    0x14,
+    0x20,
+    0xe9,
+    0x10,
+    0x92,
+    0xfd,
+    0xf9,
+    0xfc,
+    0x8f,
+    0xe5,
+    0x18,
+    0xe1,
+    0x95,
+    0xcc,
+    0x9e,
+    0x60,
+    0xa6,
+    0xfa,
+    0x38,
+    0x4d,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0x02,
+    0x82,
+    0x01,
+    0x00,
+    0x00,
+    0xc3,
+    0xc3,
+    0x0d,
+    0xb4,
+    0x27,
+    0x90,
+    0x8d,
+    0x4b,
+    0xbf,
+    0xb8,
+    0x84,
+    0xaa,
+    0xd0,
+    0xb8,
+    0xc7,
+    0x5d,
+    0x99,
+    0xbe,
+    0x55,
+    0xf6,
+    0x3e,
+    0x7c,
+    0x49,
+    0x20,
+    0xcb,
+    0x8a,
+    0x8e,
+    0x19,
+    0x0e,
+    0x66,
+    0x24,
+    0xac,
+    0xaf,
+    0x03,
+    0x33,
+    0x97,
+    0xeb,
+    0x95,
+    0xd5,
+    0x3b,
+    0x0f,
+    0x40,
+    0x56,
+    0x04,
+    0x50,
+    0xd1,
+    0xe6,
+    0xbe,
+    0x84,
+    0x0b,
+    0x25,
+    0xd3,
+    0x9c,
+    0xe2,
+    0x83,
+    0x6c,
+    0xf5,
+    0x62,
+    0x5d,
+    0xba,
+    0x2b,
+    0x7d,
+    0x3d,
+    0x7a,
+    0x6c,
+    0xe1,
+    0xd2,
+    0x0e,
+    0x54,
+    0x93,
+    0x80,
+    0x01,
+    0x91,
+    0x51,
+    0x09,
+    0xe8,
+    0x5b,
+    0x8e,
+    0x47,
+    0xbd,
+    0x64,
+    0xe4,
+    0x0e,
+    0x03,
+    0x83,
+    0x55,
+    0xcf,
+    0x5a,
+    0x37,
+    0xf0,
+    0x25,
+    0xb5,
+    0x7d,
+    0x21,
+    0xd7,
+    0x69,
+    0xdf,
+    0x6f,
+    0xc2,
+    0xcf,
+    0x10,
+    0xc9,
+    0x8a,
+    0x40,
+    0x9f,
+    0x7a,
+    0x70,
+    0xc0,
+    0xe8,
+    0xe8,
+    0xc0,
+    0xe6,
+    0x9a,
+    0x15,
+    0x0a,
+    0x8d,
+    0x4e,
+    0x46,
+    0xcb,
+    0x7a,
+    0xdb,
+    0xb3,
+    0xcb,
+    0x83,
+    0x02,
+    0xc4,
+    0xf0,
+    0xab,
+    0xeb,
+    0x02,
+    0x01,
+    0x0e,
+    0x23,
+    0xfc,
+    0x1d,
+    0xc4,
+    0xbd,
+    0xd4,
+    0xaa,
+    0x5d,
+    0x31,
+    0x46,
+    0x99,
+    0xce,
+    0x9e,
+    0xf8,
+    0x04,
+    0x75,
+    0x10,
+    0x67,
+    0xc4,
+    0x53,
+    0x47,
+    0x44,
+    0xfa,
+    0xc2,
+    0x25,
+    0x73,
+    0x7e,
+    0xd0,
+    0x8e,
+    0x59,
+    0xd1,
+    0xb2,
+    0x5a,
+    0xf4,
+    0xc7,
+    0x18,
+    0x92,
+    0x2f,
+    0x39,
+    0xab,
+    0xcd,
+    0xa3,
+    0xb5,
+    0xc2,
+    0xb9,
+    0xc7,
+    0xb9,
+    0x1b,
+    0x9f,
+    0x48,
+    0xfa,
+    0x13,
+    0xc6,
+    0x98,
+    0x4d,
+    0xca,
+    0x84,
+    0x9c,
+    0x06,
+    0xca,
+    0xe7,
+    0x89,
+    0x01,
+    0x04,
+    0xc4,
+    0x6c,
+    0xfd,
+    0x29,
+    0x59,
+    0x35,
+    0xe7,
+    0xf3,
+    0xdd,
+    0xce,
+    0x64,
+    0x59,
+    0xbf,
+    0x21,
+    0x13,
+    0xa9,
+    0x9f,
+    0x0e,
+    0xc5,
+    0xff,
+    0xbd,
+    0x33,
+    0x00,
+    0xec,
+    0xac,
+    0x6b,
+    0x11,
+    0xef,
+    0x51,
+    0x5e,
+    0xad,
+    0x07,
+    0x15,
+    0xde,
+    0xb8,
+    0x5f,
+    0xc6,
+    0xb9,
+    0xa3,
+    0x22,
+    0x65,
+    0x46,
+    0x83,
+    0x14,
+    0xdf,
+    0xd0,
+    0xf1,
+    0x44,
+    0x8a,
+    0xe1,
+    0x9c,
+    0x23,
+    0x33,
+    0xb4,
+    0x97,
+    0x33,
+    0xe6,
+    0x6b,
+    0x81,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xec,
+    0x12,
+    0xa7,
+    0x59,
+    0x74,
+    0x6a,
+    0xde,
+    0x3e,
+    0xad,
+    0xd8,
+    0x36,
+    0x80,
+    0x50,
+    0xa2,
+    0xd5,
+    0x21,
+    0x81,
+    0x07,
+    0xf1,
+    0xd0,
+    0x91,
+    0xf2,
+    0x6c,
+    0x12,
+    0x2f,
+    0x9d,
+    0x1a,
+    0x26,
+    0xf8,
+    0x30,
+    0x65,
+    0xdf,
+    0xe8,
+    0xc0,
+    0x9b,
+    0x6a,
+    0x30,
+    0x98,
+    0x82,
+    0x87,
+    0xec,
+    0xa2,
+    0x56,
+    0x87,
+    0x62,
+    0x6f,
+    0xe7,
+    0x9f,
+    0xf6,
+    0x56,
+    0xe6,
+    0x71,
+    0x8f,
+    0x49,
+    0x86,
+    0x93,
+    0x5a,
+    0x4d,
+    0x34,
+    0x58,
+    0xfe,
+    0xd9,
+    0x04,
+    0x13,
+    0xaf,
+    0x79,
+    0xb7,
+    0xad,
+    0x11,
+    0xd1,
+    0x30,
+    0x9a,
+    0x14,
+    0x06,
+    0xa0,
+    0xfa,
+    0xb7,
+    0x55,
+    0xdc,
+    0x6c,
+    0x5a,
+    0x4c,
+    0x2c,
+    0x59,
+    0x56,
+    0xf6,
+    0xe8,
+    0x9d,
+    0xaf,
+    0x0a,
+    0x78,
+    0x99,
+    0x06,
+    0x06,
+    0x9e,
+    0xe7,
+    0x9c,
+    0x51,
+    0x55,
+    0x43,
+    0xfc,
+    0x3b,
+    0x6c,
+    0x0b,
+    0xbf,
+    0x2d,
+    0x41,
+    0xa7,
+    0xaf,
+    0xb7,
+    0xe0,
+    0xe8,
+    0x28,
+    0x18,
+    0xb4,
+    0x13,
+    0xd1,
+    0xe6,
+    0x97,
+    0xd0,
+    0x9f,
+    0x6a,
+    0x80,
+    0xca,
+    0xdd,
+    0x1a,
+    0x7e,
+    0x15,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xd1,
+    0x06,
+    0x0c,
+    0x1f,
+    0xe3,
+    0xd0,
+    0xab,
+    0xd6,
+    0xca,
+    0x7c,
+    0xbc,
+    0x7d,
+    0x13,
+    0x35,
+    0xce,
+    0x27,
+    0xcd,
+    0xd8,
+    0x49,
+    0x51,
+    0x63,
+    0x64,
+    0x0f,
+    0xca,
+    0x06,
+    0x12,
+    0xfc,
+    0x07,
+    0x3e,
+    0xaf,
+    0x61,
+    0x6d,
+    0xe2,
+    0x53,
+    0x39,
+    0x27,
+    0xae,
+    0xc3,
+    0x11,
+    0x9e,
+    0x94,
+    0x01,
+    0x4f,
+    0xe3,
+    0xf3,
+    0x67,
+    0xf9,
+    0x77,
+    0xf9,
+    0xe7,
+    0x95,
+    0x3a,
+    0x6f,
+    0xe2,
+    0x20,
+    0x73,
+    0x3e,
+    0xa4,
+    0x7a,
+    0x28,
+    0xd4,
+    0x61,
+    0x97,
+    0xf6,
+    0x17,
+    0xa0,
+    0x23,
+    0x10,
+    0x2b,
+    0xce,
+    0x84,
+    0x57,
+    0x7e,
+    0x25,
+    0x1f,
+    0xf4,
+    0xa8,
+    0x54,
+    0xd2,
+    0x65,
+    0x94,
+    0xcc,
+    0x95,
+    0x0a,
+    0xab,
+    0x30,
+    0xc1,
+    0x59,
+    0x1f,
+    0x61,
+    0x8e,
+    0xb9,
+    0x6b,
+    0xd7,
+    0x4e,
+    0xb9,
+    0x83,
+    0x43,
+    0x79,
+    0x85,
+    0x11,
+    0xbc,
+    0x0f,
+    0xae,
+    0x25,
+    0x20,
+    0x05,
+    0xbc,
+    0xd2,
+    0x48,
+    0xa1,
+    0x68,
+    0x09,
+    0x84,
+    0xf6,
+    0x12,
+    0x9a,
+    0x66,
+    0xb9,
+    0x2b,
+    0xbb,
+    0x76,
+    0x03,
+    0x17,
+    0x46,
+    0x4e,
+    0x97,
+    0x59,
+    0x02,
+    0x81,
+    0x80,
+    0x09,
+    0x4c,
+    0xfa,
+    0xd6,
+    0xe5,
+    0x65,
+    0x48,
+    0x78,
+    0x43,
+    0xb5,
+    0x1f,
+    0x00,
+    0x93,
+    0x2c,
+    0xb7,
+    0x24,
+    0xe8,
+    0xc6,
+    0x7d,
+    0x5a,
+    0x70,
+    0x45,
+    0x92,
+    0xc8,
+    0x6c,
+    0xa3,
+    0xcd,
+    0xe1,
+    0xf7,
+    0x29,
+    0x40,
+    0xfa,
+    0x3f,
+    0x5b,
+    0x47,
+    0x44,
+    0x39,
+    0xc1,
+    0xe8,
+    0x72,
+    0x9e,
+    0x7a,
+    0x0e,
+    0xda,
+    0xaa,
+    0xa0,
+    0x2a,
+    0x09,
+    0xfd,
+    0x54,
+    0x93,
+    0x23,
+    0xaa,
+    0x37,
+    0x85,
+    0x5b,
+    0xcc,
+    0xd4,
+    0xf9,
+    0xd8,
+    0xff,
+    0xc1,
+    0x61,
+    0x0d,
+    0xbd,
+    0x7e,
+    0x18,
+    0x24,
+    0x73,
+    0x6d,
+    0x40,
+    0x72,
+    0xf1,
+    0x93,
+    0x09,
+    0x48,
+    0x97,
+    0x6c,
+    0x84,
+    0x90,
+    0xa8,
+    0x46,
+    0x14,
+    0x01,
+    0x39,
+    0x11,
+    0xe5,
+    0x3c,
+    0x41,
+    0x27,
+    0x32,
+    0x75,
+    0x24,
+    0xed,
+    0xa1,
+    0xd9,
+    0x12,
+    0x29,
+    0x8a,
+    0x28,
+    0x71,
+    0x89,
+    0x8d,
+    0xca,
+    0x30,
+    0xb0,
+    0x01,
+    0xc4,
+    0x2f,
+    0x82,
+    0x19,
+    0x14,
+    0x4c,
+    0x70,
+    0x1c,
+    0xb8,
+    0x23,
+    0x2e,
+    0xe8,
+    0x90,
+    0x49,
+    0x97,
+    0x92,
+    0x97,
+    0x6b,
+    0x7a,
+    0x9d,
+    0xb9,
+    0x02,
+    0x81,
+    0x80,
+    0x0f,
+    0x0e,
+    0xa1,
+    0x76,
+    0xf6,
+    0xa1,
+    0x44,
+    0x8f,
+    0xaf,
+    0x7c,
+    0x76,
+    0xd3,
+    0x87,
+    0xbb,
+    0xbb,
+    0x83,
+    0x10,
+    0x88,
+    0x01,
+    0x18,
+    0x14,
+    0xd1,
+    0xd3,
+    0x75,
+    0x59,
+    0x24,
+    0xaa,
+    0xf5,
+    0x16,
+    0xa5,
+    0xe9,
+    0x9d,
+    0xd1,
+    0xcc,
+    0xee,
+    0xf4,
+    0x15,
+    0xd9,
+    0xc5,
+    0x7e,
+    0x27,
+    0xe9,
+    0x44,
+    0x49,
+    0x06,
+    0x72,
+    0xb9,
+    0xfc,
+    0xd3,
+    0x8a,
+    0xc4,
+    0x2c,
+    0x36,
+    0x7d,
+    0x12,
+    0x9b,
+    0x5a,
+    0xaa,
+    0xdc,
+    0x85,
+    0xee,
+    0x6e,
+    0xad,
+    0x54,
+    0xb3,
+    0xf4,
+    0xfc,
+    0x31,
+    0xa1,
+    0x06,
+    0x3a,
+    0x70,
+    0x57,
+    0x0c,
+    0xf3,
+    0x95,
+    0x5b,
+    0x3e,
+    0xe8,
+    0xfd,
+    0x1a,
+    0x4f,
+    0xf6,
+    0x78,
+    0x93,
+    0x46,
+    0x6a,
+    0xd7,
+    0x31,
+    0xb4,
+    0x84,
+    0x64,
+    0x85,
+    0x09,
+    0x38,
+    0x89,
+    0x92,
+    0x94,
+    0x1c,
+    0xbf,
+    0xe2,
+    0x3c,
+    0x2a,
+    0xe0,
+    0xff,
+    0x99,
+    0xa3,
+    0xf0,
+    0x2b,
+    0x31,
+    0xc2,
+    0x36,
+    0xcd,
+    0x60,
+    0xbf,
+    0x9d,
+    0x2d,
+    0x74,
+    0x32,
+    0xe8,
+    0x9c,
+    0x93,
+    0x6e,
+    0xbb,
+    0x91,
+    0x7b,
+    0xfd,
+    0xd9,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xa2,
+    0x71,
+    0x25,
+    0x38,
+    0xeb,
+    0x2a,
+    0xe9,
+    0x37,
+    0xcd,
+    0xfe,
+    0x44,
+    0xce,
+    0x90,
+    0x3f,
+    0x52,
+    0x87,
+    0x84,
+    0x52,
+    0x1b,
+    0xae,
+    0x8d,
+    0x22,
+    0x94,
+    0xce,
+    0x38,
+    0xe6,
+    0x04,
+    0x88,
+    0x76,
+    0x85,
+    0x9a,
+    0xd3,
+    0x14,
+    0x09,
+    0xe5,
+    0x69,
+    0x9a,
+    0xff,
+    0x58,
+    0x92,
+    0x02,
+    0x6a,
+    0x7d,
+    0x7c,
+    0x1e,
+    0x2c,
+    0xfd,
+    0xa8,
+    0xca,
+    0x32,
+    0x14,
+    0x4f,
+    0x0d,
+    0x84,
+    0x0d,
+    0x37,
+    0x43,
+    0xbf,
+    0xe4,
+    0x5d,
+    0x12,
+    0xc8,
+    0x24,
+    0x91,
+    0x27,
+    0x8d,
+    0x46,
+    0xd9,
+    0x54,
+    0x53,
+    0xe7,
+    0x62,
+    0x71,
+    0xa8,
+    0x2b,
+    0x71,
+    0x41,
+    0x8d,
+    0x75,
+    0xf8,
+    0x3a,
+    0xa0,
+    0x61,
+    0x29,
+    0x46,
+    0xa6,
+    0xe5,
+    0x82,
+    0xfa,
+    0x3a,
+    0xd9,
+    0x08,
+    0xfa,
+    0xfc,
+    0x63,
+    0xfd,
+    0x6b,
+    0x30,
+    0xbc,
+    0xf4,
+    0x4e,
+    0x9e,
+    0x8c,
+    0x25,
+    0x0c,
+    0xb6,
+    0x55,
+    0xe7,
+    0x3c,
+    0xd4,
+    0x4e,
+    0x0b,
+    0xfd,
+    0x8b,
+    0xc3,
+    0x0e,
+    0x1d,
+    0x9c,
+    0x44,
+    0x57,
+    0x8f,
+    0x1f,
+    0x86,
+    0xf7,
+    0xd5,
+    0x1b,
+    0xe4,
     0x95,
 };
 
@@ -410,241 +2314,2355 @@ static unsigned char test3072[] = {
 };
 
 static unsigned char test4096[] = {
-    0x30, 0x82, 0x09, 0x29, 0x02, 0x01, 0x00, 0x02, 0x82, 0x02,
-    0x01, 0x00, 0xc0, 0x71, 0xac, 0x1a, 0x13, 0x88, 0x82, 0x43,
-    0x3b, 0x51, 0x57, 0x71, 0x8d, 0xb6, 0x2b, 0x82, 0x65, 0x21,
-    0x53, 0x5f, 0x28, 0x29, 0x4f, 0x8d, 0x7c, 0x8a, 0xb9, 0x44,
-    0xb3, 0x28, 0x41, 0x4f, 0xd3, 0xfa, 0x6a, 0xf8, 0xb9, 0x28,
-    0x50, 0x39, 0x67, 0x53, 0x2c, 0x3c, 0xd7, 0xcb, 0x96, 0x41,
-    0x40, 0x32, 0xbb, 0xeb, 0x70, 0xae, 0x1f, 0xb0, 0x65, 0xf7,
-    0x3a, 0xd9, 0x22, 0xfd, 0x10, 0xae, 0xbd, 0x02, 0xe2, 0xdd,
-    0xf3, 0xc2, 0x79, 0x3c, 0xc6, 0xfc, 0x75, 0xbb, 0xaf, 0x4e,
-    0x3a, 0x36, 0xc2, 0x4f, 0xea, 0x25, 0xdf, 0x13, 0x16, 0x4b,
-    0x20, 0xfe, 0x4b, 0x69, 0x16, 0xc4, 0x7f, 0x1a, 0x43, 0xa6,
-    0x17, 0x1b, 0xb9, 0x0a, 0xf3, 0x09, 0x86, 0x28, 0x89, 0xcf,
-    0x2c, 0xd0, 0xd4, 0x81, 0xaf, 0xc6, 0x6d, 0xe6, 0x21, 0x8d,
-    0xee, 0xef, 0xea, 0xdc, 0xb7, 0xc6, 0x3b, 0x63, 0x9f, 0x0e,
-    0xad, 0x89, 0x78, 0x23, 0x18, 0xbf, 0x70, 0x7e, 0x84, 0xe0,
-    0x37, 0xec, 0xdb, 0x8e, 0x9c, 0x3e, 0x6a, 0x19, 0xcc, 0x99,
-    0x72, 0xe6, 0xb5, 0x7d, 0x6d, 0xfa, 0xe5, 0xd3, 0xe4, 0x90,
-    0xb5, 0xb2, 0xb2, 0x12, 0x70, 0x4e, 0xca, 0xf8, 0x10, 0xf8,
-    0xa3, 0x14, 0xc2, 0x48, 0x19, 0xeb, 0x60, 0x99, 0xbb, 0x2a,
-    0x1f, 0xb1, 0x7a, 0xb1, 0x3d, 0x24, 0xfb, 0xa0, 0x29, 0xda,
-    0xbd, 0x1b, 0xd7, 0xa4, 0xbf, 0xef, 0x60, 0x2d, 0x22, 0xca,
-    0x65, 0x98, 0xf1, 0xc4, 0xe1, 0xc9, 0x02, 0x6b, 0x16, 0x28,
-    0x2f, 0xa1, 0xaa, 0x79, 0x00, 0xda, 0xdc, 0x7c, 0x43, 0xf7,
-    0x42, 0x3c, 0xa0, 0xef, 0x68, 0xf7, 0xdf, 0xb9, 0x69, 0xfb,
-    0x8e, 0x01, 0xed, 0x01, 0x42, 0xb5, 0x4e, 0x57, 0xa6, 0x26,
-    0xb8, 0xd0, 0x7b, 0x56, 0x6d, 0x03, 0xc6, 0x40, 0x8c, 0x8c,
-    0x2a, 0x55, 0xd7, 0x9c, 0x35, 0x00, 0x94, 0x93, 0xec, 0x03,
-    0xeb, 0x22, 0xef, 0x77, 0xbb, 0x79, 0x13, 0x3f, 0x15, 0xa1,
-    0x8f, 0xca, 0xdf, 0xfd, 0xd3, 0xb8, 0xe1, 0xd4, 0xcc, 0x09,
-    0x3f, 0x3c, 0x2c, 0xdb, 0xd1, 0x49, 0x7f, 0x38, 0x07, 0x83,
-    0x6d, 0xeb, 0x08, 0x66, 0xe9, 0x06, 0x44, 0x12, 0xac, 0x95,
-    0x22, 0x90, 0x23, 0x67, 0xd4, 0x08, 0xcc, 0xf4, 0xb7, 0xdc,
-    0xcc, 0x87, 0xd4, 0xac, 0x69, 0x35, 0x4c, 0xb5, 0x39, 0x36,
-    0xcd, 0xa4, 0xd2, 0x95, 0xca, 0x0d, 0xc5, 0xda, 0xc2, 0xc5,
-    0x22, 0x32, 0x28, 0x08, 0xe3, 0xd2, 0x8b, 0x38, 0x30, 0xdc,
-    0x8c, 0x75, 0x4f, 0x6a, 0xec, 0x7a, 0xac, 0x16, 0x3e, 0xa8,
-    0xd4, 0x6a, 0x45, 0xe1, 0xa8, 0x4f, 0x2e, 0x80, 0x34, 0xaa,
-    0x54, 0x1b, 0x02, 0x95, 0x7d, 0x8a, 0x6d, 0xcc, 0x79, 0xca,
-    0xf2, 0xa4, 0x2e, 0x8d, 0xfb, 0xfe, 0x15, 0x51, 0x10, 0x0e,
-    0x4d, 0x88, 0xb1, 0xc7, 0xf4, 0x79, 0xdb, 0xf0, 0xb4, 0x56,
-    0x44, 0x37, 0xca, 0x5a, 0xc1, 0x8c, 0x48, 0xac, 0xae, 0x48,
-    0x80, 0x83, 0x01, 0x3f, 0xde, 0xd9, 0xd3, 0x2c, 0x51, 0x46,
-    0xb1, 0x41, 0xb6, 0xc6, 0x91, 0x72, 0xf9, 0x83, 0x55, 0x1b,
-    0x8c, 0xba, 0xf3, 0x73, 0xe5, 0x2c, 0x74, 0x50, 0x3a, 0xbe,
-    0xc5, 0x2f, 0xa7, 0xb2, 0x6d, 0x8c, 0x9e, 0x13, 0x77, 0xa3,
-    0x13, 0xcd, 0x6d, 0x8c, 0x45, 0xe1, 0xfc, 0x0b, 0xb7, 0x69,
-    0xe9, 0x27, 0xbc, 0x65, 0xc3, 0xfa, 0x9b, 0xd0, 0xef, 0xfe,
-    0xe8, 0x1f, 0xb3, 0x5e, 0x34, 0xf4, 0x8c, 0xea, 0xfc, 0xd3,
-    0x81, 0xbf, 0x3d, 0x30, 0xb2, 0xb4, 0x01, 0xe8, 0x43, 0x0f,
-    0xba, 0x02, 0x23, 0x42, 0x76, 0x82, 0x31, 0x73, 0x91, 0xed,
-    0x07, 0x46, 0x61, 0x0d, 0x39, 0x83, 0x40, 0xce, 0x7a, 0xd4,
-    0xdb, 0x80, 0x2c, 0x1f, 0x0d, 0xd1, 0x34, 0xd4, 0x92, 0xe3,
-    0xd4, 0xf1, 0xc2, 0x01, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02,
-    0x82, 0x02, 0x01, 0x00, 0x97, 0x6c, 0xda, 0x6e, 0xea, 0x4f,
-    0xcf, 0xaf, 0xf7, 0x4c, 0xd9, 0xf1, 0x90, 0x00, 0x77, 0xdb,
-    0xf2, 0x97, 0x76, 0x72, 0xb9, 0xb7, 0x47, 0xd1, 0x9c, 0xdd,
-    0xcb, 0x4a, 0x33, 0x6e, 0xc9, 0x75, 0x76, 0xe6, 0xe4, 0xa5,
-    0x31, 0x8c, 0x77, 0x13, 0xb4, 0x29, 0xcd, 0xf5, 0x52, 0x17,
-    0xef, 0xf3, 0x08, 0x00, 0xe3, 0xbd, 0x2e, 0xbc, 0xd4, 0x52,
-    0x88, 0xe9, 0x30, 0x75, 0x0b, 0x02, 0xf5, 0xcd, 0x89, 0x0c,
-    0x6c, 0x57, 0x19, 0x27, 0x3d, 0x1e, 0x85, 0xb4, 0xc1, 0x2f,
-    0x1d, 0x92, 0x00, 0x5c, 0x76, 0x29, 0x4b, 0xa4, 0xe1, 0x12,
-    0xb3, 0xc8, 0x09, 0xfe, 0x0e, 0x78, 0x72, 0x61, 0xcb, 0x61,
-    0x6f, 0x39, 0x91, 0x95, 0x4e, 0xd5, 0x3e, 0xc7, 0x8f, 0xb8,
-    0xf6, 0x36, 0xfe, 0x9c, 0x93, 0x9a, 0x38, 0x25, 0x7a, 0xf4,
-    0x4a, 0x12, 0xd4, 0xa0, 0x13, 0xbd, 0xf9, 0x1d, 0x12, 0x3e,
-    0x21, 0x39, 0xfb, 0x72, 0xe0, 0x05, 0x3d, 0xc3, 0xe5, 0x50,
-    0xa8, 0x5d, 0x85, 0xa3, 0xea, 0x5f, 0x1c, 0xb2, 0x3f, 0xea,
-    0x6d, 0x03, 0x91, 0x55, 0xd8, 0x19, 0x0a, 0x21, 0x12, 0x16,
-    0xd9, 0x12, 0xc4, 0xe6, 0x07, 0x18, 0x5b, 0x26, 0xa4, 0xae,
-    0xed, 0x2b, 0xb7, 0xa6, 0xed, 0xf8, 0xad, 0xec, 0x77, 0xe6,
-    0x7f, 0x4f, 0x76, 0x00, 0xc0, 0xfa, 0x15, 0x92, 0xb4, 0x2c,
-    0x22, 0xc2, 0xeb, 0x6a, 0xad, 0x14, 0x05, 0xb2, 0xe5, 0x8a,
-    0x9e, 0x85, 0x83, 0xcc, 0x04, 0xf1, 0x56, 0x78, 0x44, 0x5e,
-    0xde, 0xe0, 0x60, 0x1a, 0x65, 0x79, 0x31, 0x23, 0x05, 0xbb,
-    0x01, 0xff, 0xdd, 0x2e, 0xb7, 0xb3, 0xaa, 0x74, 0xe0, 0xa5,
-    0x94, 0xaf, 0x4b, 0xde, 0x58, 0x0f, 0x55, 0xde, 0x33, 0xf6,
-    0xe3, 0xd6, 0x34, 0x36, 0x57, 0xd6, 0x79, 0x91, 0x2e, 0xbe,
-    0x3b, 0xd9, 0x4e, 0xb6, 0x9d, 0x21, 0x5c, 0xd3, 0x48, 0x14,
-    0x7f, 0x4a, 0xc4, 0x60, 0xa9, 0x29, 0xf8, 0x53, 0x7f, 0x88,
-    0x11, 0x2d, 0xb5, 0xc5, 0x2d, 0x6f, 0xee, 0x85, 0x0b, 0xf7,
-    0x8d, 0x9a, 0xbe, 0xb0, 0x42, 0xf2, 0x2e, 0x71, 0xaf, 0x19,
-    0x31, 0x6d, 0xec, 0xcd, 0x6f, 0x2b, 0x23, 0xdf, 0xb4, 0x40,
-    0xaf, 0x2c, 0x0a, 0xc3, 0x1b, 0x7d, 0x7d, 0x03, 0x1d, 0x4b,
-    0xf3, 0xb5, 0xe0, 0x85, 0xd8, 0xdf, 0x91, 0x6b, 0x0a, 0x69,
-    0xf7, 0xf2, 0x69, 0x66, 0x5b, 0xf1, 0xcf, 0x46, 0x7d, 0xe9,
-    0x70, 0xfa, 0x6d, 0x7e, 0x75, 0x4e, 0xa9, 0x77, 0xe6, 0x8c,
-    0x02, 0xf7, 0x14, 0x4d, 0xa5, 0x41, 0x8f, 0x3f, 0xc1, 0x62,
-    0x1e, 0x71, 0x5e, 0x38, 0xb4, 0xd6, 0xe6, 0xe1, 0x4b, 0xc2,
-    0x2c, 0x30, 0x83, 0x81, 0x6f, 0x49, 0x2e, 0x96, 0xe6, 0xc9,
-    0x9a, 0xf7, 0x5d, 0x09, 0xa0, 0x55, 0x02, 0xa5, 0x3a, 0x25,
-    0x23, 0xd0, 0x92, 0xc3, 0xa3, 0xe3, 0x0e, 0x12, 0x2f, 0x4d,
-    0xef, 0xf3, 0x55, 0x5a, 0xbe, 0xe6, 0x19, 0x86, 0x31, 0xab,
-    0x75, 0x9a, 0xd3, 0xf0, 0x2c, 0xc5, 0x41, 0x92, 0xd9, 0x1f,
-    0x5f, 0x11, 0x8c, 0x75, 0x1c, 0x63, 0xd0, 0x02, 0x80, 0x2c,
-    0x68, 0xcb, 0x93, 0xfb, 0x51, 0x73, 0x49, 0xb4, 0x60, 0xda,
-    0xe2, 0x26, 0xaf, 0xa9, 0x46, 0x12, 0xb8, 0xec, 0x50, 0xdd,
-    0x12, 0x06, 0x5f, 0xce, 0x59, 0xe6, 0xf6, 0x1c, 0xe0, 0x54,
-    0x10, 0xad, 0xf6, 0xcd, 0x98, 0xcc, 0x0f, 0xfb, 0xcb, 0x41,
-    0x14, 0x9d, 0xed, 0xe4, 0xb4, 0x74, 0x5f, 0x09, 0x60, 0xc7,
-    0x12, 0xf6, 0x7b, 0x3c, 0x8f, 0xa7, 0x20, 0xbc, 0xe4, 0xb1,
-    0xef, 0xeb, 0xa4, 0x93, 0xc5, 0x06, 0xca, 0x9a, 0x27, 0x9d,
-    0x87, 0xf3, 0xde, 0xca, 0xe5, 0xe7, 0xf6, 0x1c, 0x01, 0x65,
-    0x5b, 0xfb, 0x19, 0x79, 0x6e, 0x08, 0x26, 0xc5, 0xc8, 0x28,
-    0x0e, 0xb6, 0x3b, 0x07, 0x08, 0xc1, 0x02, 0x82, 0x01, 0x01,
-    0x00, 0xe8, 0x1c, 0x73, 0xa6, 0xb8, 0xe0, 0x0e, 0x6d, 0x8d,
-    0x1b, 0xb9, 0x53, 0xed, 0x58, 0x94, 0xe6, 0x1d, 0x60, 0x14,
-    0x5c, 0x76, 0x43, 0xc4, 0x58, 0x19, 0xc4, 0x24, 0xe8, 0xbc,
-    0x1b, 0x3b, 0x0b, 0x13, 0x24, 0x45, 0x54, 0x0e, 0xcc, 0x37,
-    0xf0, 0xe0, 0x63, 0x7d, 0xc3, 0xf7, 0xfb, 0x81, 0x74, 0x81,
-    0xc4, 0x0f, 0x1a, 0x21, 0x48, 0xaf, 0xce, 0xc1, 0xc4, 0x94,
-    0x18, 0x06, 0x44, 0x8d, 0xd3, 0xd2, 0x22, 0x2d, 0x2d, 0x3e,
-    0x5a, 0x31, 0xdc, 0x95, 0x8e, 0xf4, 0x41, 0xfc, 0x58, 0xc9,
-    0x40, 0x92, 0x17, 0x5f, 0xe3, 0xda, 0xac, 0x9e, 0x3f, 0x1c,
-    0x2a, 0x6b, 0x58, 0x5f, 0x48, 0x78, 0x20, 0xb1, 0xaf, 0x24,
-    0x9b, 0x3c, 0x20, 0x8b, 0x93, 0x25, 0x9e, 0xe6, 0x6b, 0xbc,
-    0x13, 0x42, 0x14, 0x6c, 0x36, 0x31, 0xff, 0x7a, 0xd1, 0xc1,
-    0x1a, 0x26, 0x14, 0x7f, 0xa9, 0x76, 0xa7, 0x0c, 0xf8, 0xcc,
-    0xed, 0x07, 0x6a, 0xd2, 0xdf, 0x62, 0xee, 0x0a, 0x7c, 0x84,
-    0xcb, 0x49, 0x90, 0xb2, 0x03, 0x0d, 0xa2, 0x82, 0x06, 0x77,
-    0xf1, 0xcd, 0x67, 0xf2, 0x47, 0x21, 0x02, 0x3f, 0x43, 0x21,
-    0xf0, 0x46, 0x30, 0x62, 0x51, 0x72, 0xb1, 0xe7, 0x48, 0xc6,
-    0x67, 0x12, 0xcd, 0x9e, 0xd6, 0x15, 0xe5, 0x21, 0xed, 0xfa,
-    0x8f, 0x30, 0xa6, 0x41, 0xfe, 0xb6, 0xfa, 0x8f, 0x34, 0x14,
-    0x19, 0xe8, 0x11, 0xf7, 0xa5, 0x77, 0x3e, 0xb7, 0xf9, 0x39,
-    0x07, 0x8c, 0x67, 0x2a, 0xab, 0x7b, 0x08, 0xf8, 0xb0, 0x06,
-    0xa8, 0xea, 0x2f, 0x8f, 0xfa, 0xcc, 0xcc, 0x40, 0xce, 0xf3,
-    0x70, 0x4f, 0x3f, 0x7f, 0xe2, 0x0c, 0xea, 0x76, 0x4a, 0x35,
-    0x4e, 0x47, 0xad, 0x2b, 0xa7, 0x97, 0x5d, 0x74, 0x43, 0x97,
-    0x90, 0xd2, 0xfb, 0xd9, 0xf9, 0x96, 0x01, 0x33, 0x05, 0xed,
-    0x7b, 0x03, 0x05, 0xad, 0xf8, 0x49, 0x03, 0x02, 0x82, 0x01,
-    0x01, 0x00, 0xd4, 0x40, 0x17, 0x66, 0x10, 0x92, 0x95, 0xc8,
-    0xec, 0x62, 0xa9, 0x7a, 0xcb, 0x93, 0x8e, 0xe6, 0x53, 0xd4,
-    0x80, 0x48, 0x27, 0x4b, 0x41, 0xce, 0x61, 0xdf, 0xbf, 0x94,
-    0xa4, 0x3d, 0x71, 0x03, 0x0b, 0xed, 0x25, 0x71, 0x98, 0xa4,
-    0xd6, 0xd5, 0x4a, 0x57, 0xf5, 0x6c, 0x1b, 0xda, 0x21, 0x7d,
-    0x35, 0x45, 0xb3, 0xf3, 0x6a, 0xd9, 0xd3, 0x43, 0xe8, 0x5c,
-    0x54, 0x1c, 0x83, 0x1b, 0xb4, 0x5f, 0xf2, 0x97, 0x24, 0x2e,
-    0xdc, 0x40, 0xde, 0x92, 0x23, 0x59, 0x8e, 0xbc, 0xd2, 0xa1,
-    0xf2, 0xe0, 0x4c, 0xdd, 0x0b, 0xd1, 0xe7, 0xae, 0x65, 0xbc,
-    0xb5, 0xf5, 0x5b, 0x98, 0xe9, 0xd7, 0xc2, 0xb7, 0x0e, 0x55,
-    0x71, 0x0e, 0x3c, 0x0a, 0x24, 0x6b, 0xa6, 0xe6, 0x14, 0x61,
-    0x11, 0xfd, 0x33, 0x42, 0x99, 0x2b, 0x84, 0x77, 0x74, 0x92,
-    0x91, 0xf5, 0x79, 0x79, 0xcf, 0xad, 0x8e, 0x04, 0xef, 0x80,
-    0x1e, 0x57, 0xf4, 0x14, 0xf5, 0x35, 0x09, 0x74, 0xb2, 0x13,
-    0x71, 0x58, 0x6b, 0xea, 0x32, 0x5d, 0xf3, 0xd3, 0x76, 0x48,
-    0x39, 0x10, 0x23, 0x84, 0x9d, 0xbe, 0x92, 0x77, 0x4a, 0xed,
-    0x70, 0x3e, 0x1a, 0xa2, 0x6c, 0xb3, 0x81, 0x00, 0xc3, 0xc9,
-    0xe4, 0x52, 0xc8, 0x24, 0x88, 0x0c, 0x41, 0xad, 0x87, 0x5a,
-    0xea, 0xa3, 0x7a, 0x85, 0x1c, 0x5e, 0x31, 0x7f, 0xc3, 0x35,
-    0xc6, 0xfa, 0x10, 0xc8, 0x75, 0x10, 0xc4, 0x96, 0x99, 0xe7,
-    0xfe, 0x01, 0xb4, 0x74, 0xdb, 0xb4, 0x11, 0xc3, 0xc8, 0x8c,
-    0xf6, 0xf7, 0x3b, 0x66, 0x50, 0xfc, 0xdb, 0xeb, 0xca, 0x47,
-    0x85, 0x89, 0xe1, 0x65, 0xd9, 0x62, 0x34, 0x3c, 0x70, 0xd8,
-    0x2e, 0xb4, 0x2f, 0x65, 0x3c, 0x4a, 0xa6, 0x2a, 0xe7, 0xc7,
-    0xd8, 0x41, 0x8f, 0x8a, 0x43, 0xbf, 0x42, 0xf2, 0x4d, 0xbc,
-    0xfc, 0x9e, 0x27, 0x95, 0xfb, 0x75, 0xff, 0xab, 0x02, 0x82,
-    0x01, 0x00, 0x41, 0x2f, 0x44, 0x57, 0x6d, 0x12, 0x17, 0x5b,
-    0x32, 0xc6, 0xb7, 0x6c, 0x57, 0x7a, 0x8a, 0x0e, 0x79, 0xef,
-    0x72, 0xa8, 0x68, 0xda, 0x2d, 0x38, 0xe4, 0xbb, 0x8d, 0xf6,
-    0x02, 0x65, 0xcf, 0x56, 0x13, 0xe1, 0x1a, 0xcb, 0x39, 0x80,
-    0xa6, 0xb1, 0x32, 0x03, 0x1e, 0xdd, 0xbb, 0x35, 0xd9, 0xac,
-    0x43, 0x89, 0x31, 0x08, 0x90, 0x92, 0x5e, 0x35, 0x3d, 0x7b,
-    0x9c, 0x6f, 0x86, 0xcb, 0x17, 0xdd, 0x85, 0xe4, 0xed, 0x35,
-    0x08, 0x8e, 0xc1, 0xf4, 0x05, 0xd8, 0x68, 0xc6, 0x63, 0x3c,
-    0xf7, 0xff, 0xf7, 0x47, 0x33, 0x39, 0xc5, 0x3e, 0xb7, 0x0e,
-    0x58, 0x35, 0x9d, 0x81, 0xea, 0xf8, 0x6a, 0x2c, 0x1c, 0x5a,
-    0x68, 0x78, 0x64, 0x11, 0x6b, 0xc1, 0x3e, 0x4e, 0x7a, 0xbd,
-    0x84, 0xcb, 0x0f, 0xc2, 0xb6, 0x85, 0x1d, 0xd3, 0x76, 0xc5,
-    0x93, 0x6a, 0x69, 0x89, 0x56, 0x34, 0xdc, 0x4a, 0x9b, 0xbc,
-    0xff, 0xa8, 0x0d, 0x6e, 0x35, 0x9c, 0x60, 0xa7, 0x23, 0x30,
-    0xc7, 0x06, 0x64, 0x39, 0x8b, 0x94, 0x89, 0xee, 0xba, 0x7f,
-    0x60, 0x8d, 0xfa, 0xb6, 0x97, 0x76, 0xdc, 0x51, 0x4a, 0x3c,
-    0xeb, 0x3a, 0x14, 0x2c, 0x20, 0x60, 0x69, 0x4a, 0x86, 0xfe,
-    0x8c, 0x21, 0x84, 0x49, 0x54, 0xb3, 0x20, 0xe1, 0x01, 0x7f,
-    0x58, 0xdf, 0x7f, 0xb5, 0x21, 0x51, 0x8c, 0x47, 0x9f, 0x91,
-    0xeb, 0x97, 0x3e, 0xf2, 0x54, 0xcf, 0x16, 0x46, 0xf9, 0xd9,
-    0xb6, 0xe7, 0x64, 0xc9, 0xd0, 0x54, 0xea, 0x2f, 0xa1, 0xcf,
-    0xa5, 0x7f, 0x28, 0x8d, 0x84, 0xec, 0xd5, 0x39, 0x03, 0x76,
-    0x5b, 0x2d, 0x8e, 0x43, 0xf2, 0x01, 0x24, 0xc9, 0x6f, 0xc0,
-    0xf5, 0x69, 0x6f, 0x7d, 0xb5, 0x85, 0xd2, 0x5f, 0x7f, 0x78,
-    0x40, 0x07, 0x7f, 0x09, 0x15, 0xb5, 0x1f, 0x28, 0x65, 0x10,
-    0xe4, 0x19, 0xa8, 0xc6, 0x9e, 0x8d, 0xdc, 0xcb, 0x02, 0x82,
-    0x01, 0x00, 0x13, 0x01, 0xee, 0x56, 0x80, 0x93, 0x70, 0x00,
-    0x7f, 0x52, 0xd2, 0x94, 0xa1, 0x98, 0x84, 0x4a, 0x92, 0x25,
-    0x4c, 0x9b, 0xa9, 0x91, 0x2e, 0xc2, 0x79, 0xb7, 0x5c, 0xe3,
-    0xc5, 0xd5, 0x8e, 0xc2, 0x54, 0x16, 0x17, 0xad, 0x55, 0x9b,
-    0x25, 0x76, 0x12, 0x63, 0x50, 0x22, 0x2f, 0x58, 0x58, 0x79,
-    0x6b, 0x04, 0xe3, 0xf9, 0x9f, 0x8f, 0x04, 0x41, 0x67, 0x94,
-    0xa5, 0x1f, 0xac, 0x8a, 0x15, 0x9c, 0x26, 0x10, 0x6c, 0xf8,
-    0x19, 0x57, 0x61, 0xd7, 0x3a, 0x7d, 0x31, 0xb0, 0x2d, 0x38,
-    0xbd, 0x94, 0x62, 0xad, 0xc4, 0xfa, 0x36, 0x42, 0x42, 0xf0,
-    0x24, 0x67, 0x65, 0x9d, 0x8b, 0x0b, 0x7c, 0x6f, 0x82, 0x44,
-    0x1a, 0x8c, 0xc8, 0xc9, 0xab, 0xbb, 0x4c, 0x45, 0xfc, 0x7b,
-    0x38, 0xee, 0x30, 0xe1, 0xfc, 0xef, 0x8d, 0xbc, 0x58, 0xdf,
-    0x2b, 0x5d, 0x0d, 0x54, 0xe0, 0x49, 0x4d, 0x97, 0x99, 0x8f,
-    0x22, 0xa8, 0x83, 0xbe, 0x40, 0xbb, 0x50, 0x2e, 0x78, 0x28,
-    0x0f, 0x95, 0x78, 0x8c, 0x8f, 0x98, 0x24, 0x56, 0xc2, 0x97,
-    0xf3, 0x2c, 0x43, 0xd2, 0x03, 0x82, 0x66, 0x81, 0x72, 0x5f,
-    0x53, 0x16, 0xec, 0xb1, 0xb1, 0x04, 0x5e, 0x40, 0x20, 0x48,
-    0x7b, 0x3f, 0x02, 0x97, 0x6a, 0xeb, 0x96, 0x12, 0x21, 0x35,
-    0xfe, 0x1f, 0x47, 0xc0, 0x95, 0xea, 0xc5, 0x8a, 0x08, 0x84,
-    0x4f, 0x5e, 0x63, 0x94, 0x60, 0x0f, 0x71, 0x5b, 0x7f, 0x4a,
-    0xec, 0x4f, 0x60, 0xc6, 0xba, 0x4a, 0x24, 0xf1, 0x20, 0x8b,
-    0xa7, 0x2e, 0x3a, 0xce, 0x8d, 0xe0, 0x27, 0x1d, 0xb5, 0x8e,
-    0xb4, 0x21, 0xc5, 0xe2, 0xa6, 0x16, 0x0a, 0x51, 0x83, 0x55,
-    0x88, 0xd1, 0x30, 0x11, 0x63, 0xd5, 0xd7, 0x8d, 0xae, 0x16,
-    0x12, 0x82, 0xc4, 0x85, 0x00, 0x4e, 0x27, 0x83, 0xa5, 0x7c,
-    0x90, 0x2e, 0xe5, 0xa2, 0xa3, 0xd3, 0x4c, 0x63, 0x02, 0x82,
-    0x01, 0x01, 0x00, 0x86, 0x08, 0x98, 0x98, 0xa5, 0x00, 0x05,
-    0x39, 0x77, 0xd9, 0x66, 0xb3, 0xcf, 0xca, 0xa0, 0x71, 0xb3,
-    0x50, 0xce, 0x3d, 0xb1, 0x93, 0x95, 0x35, 0xc4, 0xd4, 0x2e,
-    0x90, 0xdf, 0x0f, 0xfc, 0x60, 0xc1, 0x94, 0x68, 0x61, 0x43,
-    0xca, 0x9a, 0x23, 0x4a, 0x1e, 0x45, 0x72, 0x99, 0xb5, 0x1e,
-    0x61, 0x8d, 0x77, 0x0f, 0xa0, 0xbb, 0xd7, 0x77, 0xb4, 0x2a,
-    0x15, 0x11, 0x88, 0x2d, 0xb3, 0x56, 0x61, 0x5e, 0x6a, 0xed,
-    0xa4, 0x46, 0x4a, 0x3f, 0x50, 0x11, 0xd6, 0xba, 0xb6, 0xd7,
-    0x95, 0x65, 0x53, 0xc3, 0xa1, 0x8f, 0xe0, 0xa3, 0xf5, 0x1c,
-    0xfd, 0xaf, 0x6e, 0x43, 0xd7, 0x17, 0xa7, 0xd3, 0x81, 0x1b,
-    0xa4, 0xdf, 0xe0, 0x97, 0x8a, 0x46, 0x03, 0xd3, 0x46, 0x0e,
-    0x83, 0x48, 0x4e, 0xd2, 0x02, 0xcb, 0xc0, 0xad, 0x79, 0x95,
-    0x8c, 0x96, 0xba, 0x40, 0x34, 0x11, 0x71, 0x5e, 0xe9, 0x11,
-    0xf9, 0xc5, 0x4a, 0x5e, 0x91, 0x9d, 0xf5, 0x92, 0x4f, 0xeb,
-    0xc6, 0x70, 0x02, 0x2d, 0x3d, 0x04, 0xaa, 0xe9, 0x3a, 0x8e,
-    0xd5, 0xa8, 0xad, 0xf7, 0xce, 0x0d, 0x16, 0xb2, 0xec, 0x0a,
-    0x9c, 0xf5, 0x94, 0x39, 0xb9, 0x8a, 0xfc, 0x1e, 0xf9, 0xcc,
-    0xf2, 0x5f, 0x21, 0x31, 0x74, 0x72, 0x6b, 0x64, 0xae, 0x35,
-    0x61, 0x8d, 0x0d, 0xcb, 0xe7, 0xda, 0x39, 0xca, 0xf3, 0x21,
-    0x66, 0x0b, 0x95, 0xd7, 0x0a, 0x7c, 0xca, 0xa1, 0xa9, 0x5a,
-    0xe8, 0xac, 0xe0, 0x71, 0x54, 0xaf, 0x28, 0xcf, 0xd5, 0x70,
-    0x89, 0xe0, 0xf3, 0x9e, 0x43, 0x6c, 0x8d, 0x7b, 0x99, 0x01,
-    0x68, 0x4d, 0xa1, 0x45, 0x46, 0x0c, 0x43, 0xbc, 0xcc, 0x2c,
-    0xdd, 0xc5, 0x46, 0xc8, 0x4e, 0x0e, 0xbe, 0xed, 0xb9, 0x26,
-    0xab, 0x2e, 0xdb, 0xeb, 0x8f, 0xff, 0xdb, 0xb0, 0xc6, 0x55,
-    0xaf, 0xf8, 0x2a, 0x91, 0x9d, 0x50, 0x44, 0x21, 0x17,
+    0x30,
+    0x82,
+    0x09,
+    0x29,
+    0x02,
+    0x01,
+    0x00,
+    0x02,
+    0x82,
+    0x02,
+    0x01,
+    0x00,
+    0xc0,
+    0x71,
+    0xac,
+    0x1a,
+    0x13,
+    0x88,
+    0x82,
+    0x43,
+    0x3b,
+    0x51,
+    0x57,
+    0x71,
+    0x8d,
+    0xb6,
+    0x2b,
+    0x82,
+    0x65,
+    0x21,
+    0x53,
+    0x5f,
+    0x28,
+    0x29,
+    0x4f,
+    0x8d,
+    0x7c,
+    0x8a,
+    0xb9,
+    0x44,
+    0xb3,
+    0x28,
+    0x41,
+    0x4f,
+    0xd3,
+    0xfa,
+    0x6a,
+    0xf8,
+    0xb9,
+    0x28,
+    0x50,
+    0x39,
+    0x67,
+    0x53,
+    0x2c,
+    0x3c,
+    0xd7,
+    0xcb,
+    0x96,
+    0x41,
+    0x40,
+    0x32,
+    0xbb,
+    0xeb,
+    0x70,
+    0xae,
+    0x1f,
+    0xb0,
+    0x65,
+    0xf7,
+    0x3a,
+    0xd9,
+    0x22,
+    0xfd,
+    0x10,
+    0xae,
+    0xbd,
+    0x02,
+    0xe2,
+    0xdd,
+    0xf3,
+    0xc2,
+    0x79,
+    0x3c,
+    0xc6,
+    0xfc,
+    0x75,
+    0xbb,
+    0xaf,
+    0x4e,
+    0x3a,
+    0x36,
+    0xc2,
+    0x4f,
+    0xea,
+    0x25,
+    0xdf,
+    0x13,
+    0x16,
+    0x4b,
+    0x20,
+    0xfe,
+    0x4b,
+    0x69,
+    0x16,
+    0xc4,
+    0x7f,
+    0x1a,
+    0x43,
+    0xa6,
+    0x17,
+    0x1b,
+    0xb9,
+    0x0a,
+    0xf3,
+    0x09,
+    0x86,
+    0x28,
+    0x89,
+    0xcf,
+    0x2c,
+    0xd0,
+    0xd4,
+    0x81,
+    0xaf,
+    0xc6,
+    0x6d,
+    0xe6,
+    0x21,
+    0x8d,
+    0xee,
+    0xef,
+    0xea,
+    0xdc,
+    0xb7,
+    0xc6,
+    0x3b,
+    0x63,
+    0x9f,
+    0x0e,
+    0xad,
+    0x89,
+    0x78,
+    0x23,
+    0x18,
+    0xbf,
+    0x70,
+    0x7e,
+    0x84,
+    0xe0,
+    0x37,
+    0xec,
+    0xdb,
+    0x8e,
+    0x9c,
+    0x3e,
+    0x6a,
+    0x19,
+    0xcc,
+    0x99,
+    0x72,
+    0xe6,
+    0xb5,
+    0x7d,
+    0x6d,
+    0xfa,
+    0xe5,
+    0xd3,
+    0xe4,
+    0x90,
+    0xb5,
+    0xb2,
+    0xb2,
+    0x12,
+    0x70,
+    0x4e,
+    0xca,
+    0xf8,
+    0x10,
+    0xf8,
+    0xa3,
+    0x14,
+    0xc2,
+    0x48,
+    0x19,
+    0xeb,
+    0x60,
+    0x99,
+    0xbb,
+    0x2a,
+    0x1f,
+    0xb1,
+    0x7a,
+    0xb1,
+    0x3d,
+    0x24,
+    0xfb,
+    0xa0,
+    0x29,
+    0xda,
+    0xbd,
+    0x1b,
+    0xd7,
+    0xa4,
+    0xbf,
+    0xef,
+    0x60,
+    0x2d,
+    0x22,
+    0xca,
+    0x65,
+    0x98,
+    0xf1,
+    0xc4,
+    0xe1,
+    0xc9,
+    0x02,
+    0x6b,
+    0x16,
+    0x28,
+    0x2f,
+    0xa1,
+    0xaa,
+    0x79,
+    0x00,
+    0xda,
+    0xdc,
+    0x7c,
+    0x43,
+    0xf7,
+    0x42,
+    0x3c,
+    0xa0,
+    0xef,
+    0x68,
+    0xf7,
+    0xdf,
+    0xb9,
+    0x69,
+    0xfb,
+    0x8e,
+    0x01,
+    0xed,
+    0x01,
+    0x42,
+    0xb5,
+    0x4e,
+    0x57,
+    0xa6,
+    0x26,
+    0xb8,
+    0xd0,
+    0x7b,
+    0x56,
+    0x6d,
+    0x03,
+    0xc6,
+    0x40,
+    0x8c,
+    0x8c,
+    0x2a,
+    0x55,
+    0xd7,
+    0x9c,
+    0x35,
+    0x00,
+    0x94,
+    0x93,
+    0xec,
+    0x03,
+    0xeb,
+    0x22,
+    0xef,
+    0x77,
+    0xbb,
+    0x79,
+    0x13,
+    0x3f,
+    0x15,
+    0xa1,
+    0x8f,
+    0xca,
+    0xdf,
+    0xfd,
+    0xd3,
+    0xb8,
+    0xe1,
+    0xd4,
+    0xcc,
+    0x09,
+    0x3f,
+    0x3c,
+    0x2c,
+    0xdb,
+    0xd1,
+    0x49,
+    0x7f,
+    0x38,
+    0x07,
+    0x83,
+    0x6d,
+    0xeb,
+    0x08,
+    0x66,
+    0xe9,
+    0x06,
+    0x44,
+    0x12,
+    0xac,
+    0x95,
+    0x22,
+    0x90,
+    0x23,
+    0x67,
+    0xd4,
+    0x08,
+    0xcc,
+    0xf4,
+    0xb7,
+    0xdc,
+    0xcc,
+    0x87,
+    0xd4,
+    0xac,
+    0x69,
+    0x35,
+    0x4c,
+    0xb5,
+    0x39,
+    0x36,
+    0xcd,
+    0xa4,
+    0xd2,
+    0x95,
+    0xca,
+    0x0d,
+    0xc5,
+    0xda,
+    0xc2,
+    0xc5,
+    0x22,
+    0x32,
+    0x28,
+    0x08,
+    0xe3,
+    0xd2,
+    0x8b,
+    0x38,
+    0x30,
+    0xdc,
+    0x8c,
+    0x75,
+    0x4f,
+    0x6a,
+    0xec,
+    0x7a,
+    0xac,
+    0x16,
+    0x3e,
+    0xa8,
+    0xd4,
+    0x6a,
+    0x45,
+    0xe1,
+    0xa8,
+    0x4f,
+    0x2e,
+    0x80,
+    0x34,
+    0xaa,
+    0x54,
+    0x1b,
+    0x02,
+    0x95,
+    0x7d,
+    0x8a,
+    0x6d,
+    0xcc,
+    0x79,
+    0xca,
+    0xf2,
+    0xa4,
+    0x2e,
+    0x8d,
+    0xfb,
+    0xfe,
+    0x15,
+    0x51,
+    0x10,
+    0x0e,
+    0x4d,
+    0x88,
+    0xb1,
+    0xc7,
+    0xf4,
+    0x79,
+    0xdb,
+    0xf0,
+    0xb4,
+    0x56,
+    0x44,
+    0x37,
+    0xca,
+    0x5a,
+    0xc1,
+    0x8c,
+    0x48,
+    0xac,
+    0xae,
+    0x48,
+    0x80,
+    0x83,
+    0x01,
+    0x3f,
+    0xde,
+    0xd9,
+    0xd3,
+    0x2c,
+    0x51,
+    0x46,
+    0xb1,
+    0x41,
+    0xb6,
+    0xc6,
+    0x91,
+    0x72,
+    0xf9,
+    0x83,
+    0x55,
+    0x1b,
+    0x8c,
+    0xba,
+    0xf3,
+    0x73,
+    0xe5,
+    0x2c,
+    0x74,
+    0x50,
+    0x3a,
+    0xbe,
+    0xc5,
+    0x2f,
+    0xa7,
+    0xb2,
+    0x6d,
+    0x8c,
+    0x9e,
+    0x13,
+    0x77,
+    0xa3,
+    0x13,
+    0xcd,
+    0x6d,
+    0x8c,
+    0x45,
+    0xe1,
+    0xfc,
+    0x0b,
+    0xb7,
+    0x69,
+    0xe9,
+    0x27,
+    0xbc,
+    0x65,
+    0xc3,
+    0xfa,
+    0x9b,
+    0xd0,
+    0xef,
+    0xfe,
+    0xe8,
+    0x1f,
+    0xb3,
+    0x5e,
+    0x34,
+    0xf4,
+    0x8c,
+    0xea,
+    0xfc,
+    0xd3,
+    0x81,
+    0xbf,
+    0x3d,
+    0x30,
+    0xb2,
+    0xb4,
+    0x01,
+    0xe8,
+    0x43,
+    0x0f,
+    0xba,
+    0x02,
+    0x23,
+    0x42,
+    0x76,
+    0x82,
+    0x31,
+    0x73,
+    0x91,
+    0xed,
+    0x07,
+    0x46,
+    0x61,
+    0x0d,
+    0x39,
+    0x83,
+    0x40,
+    0xce,
+    0x7a,
+    0xd4,
+    0xdb,
+    0x80,
+    0x2c,
+    0x1f,
+    0x0d,
+    0xd1,
+    0x34,
+    0xd4,
+    0x92,
+    0xe3,
+    0xd4,
+    0xf1,
+    0xc2,
+    0x01,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0x02,
+    0x82,
+    0x02,
+    0x01,
+    0x00,
+    0x97,
+    0x6c,
+    0xda,
+    0x6e,
+    0xea,
+    0x4f,
+    0xcf,
+    0xaf,
+    0xf7,
+    0x4c,
+    0xd9,
+    0xf1,
+    0x90,
+    0x00,
+    0x77,
+    0xdb,
+    0xf2,
+    0x97,
+    0x76,
+    0x72,
+    0xb9,
+    0xb7,
+    0x47,
+    0xd1,
+    0x9c,
+    0xdd,
+    0xcb,
+    0x4a,
+    0x33,
+    0x6e,
+    0xc9,
+    0x75,
+    0x76,
+    0xe6,
+    0xe4,
+    0xa5,
+    0x31,
+    0x8c,
+    0x77,
+    0x13,
+    0xb4,
+    0x29,
+    0xcd,
+    0xf5,
+    0x52,
+    0x17,
+    0xef,
+    0xf3,
+    0x08,
+    0x00,
+    0xe3,
+    0xbd,
+    0x2e,
+    0xbc,
+    0xd4,
+    0x52,
+    0x88,
+    0xe9,
+    0x30,
+    0x75,
+    0x0b,
+    0x02,
+    0xf5,
+    0xcd,
+    0x89,
+    0x0c,
+    0x6c,
+    0x57,
+    0x19,
+    0x27,
+    0x3d,
+    0x1e,
+    0x85,
+    0xb4,
+    0xc1,
+    0x2f,
+    0x1d,
+    0x92,
+    0x00,
+    0x5c,
+    0x76,
+    0x29,
+    0x4b,
+    0xa4,
+    0xe1,
+    0x12,
+    0xb3,
+    0xc8,
+    0x09,
+    0xfe,
+    0x0e,
+    0x78,
+    0x72,
+    0x61,
+    0xcb,
+    0x61,
+    0x6f,
+    0x39,
+    0x91,
+    0x95,
+    0x4e,
+    0xd5,
+    0x3e,
+    0xc7,
+    0x8f,
+    0xb8,
+    0xf6,
+    0x36,
+    0xfe,
+    0x9c,
+    0x93,
+    0x9a,
+    0x38,
+    0x25,
+    0x7a,
+    0xf4,
+    0x4a,
+    0x12,
+    0xd4,
+    0xa0,
+    0x13,
+    0xbd,
+    0xf9,
+    0x1d,
+    0x12,
+    0x3e,
+    0x21,
+    0x39,
+    0xfb,
+    0x72,
+    0xe0,
+    0x05,
+    0x3d,
+    0xc3,
+    0xe5,
+    0x50,
+    0xa8,
+    0x5d,
+    0x85,
+    0xa3,
+    0xea,
+    0x5f,
+    0x1c,
+    0xb2,
+    0x3f,
+    0xea,
+    0x6d,
+    0x03,
+    0x91,
+    0x55,
+    0xd8,
+    0x19,
+    0x0a,
+    0x21,
+    0x12,
+    0x16,
+    0xd9,
+    0x12,
+    0xc4,
+    0xe6,
+    0x07,
+    0x18,
+    0x5b,
+    0x26,
+    0xa4,
+    0xae,
+    0xed,
+    0x2b,
+    0xb7,
+    0xa6,
+    0xed,
+    0xf8,
+    0xad,
+    0xec,
+    0x77,
+    0xe6,
+    0x7f,
+    0x4f,
+    0x76,
+    0x00,
+    0xc0,
+    0xfa,
+    0x15,
+    0x92,
+    0xb4,
+    0x2c,
+    0x22,
+    0xc2,
+    0xeb,
+    0x6a,
+    0xad,
+    0x14,
+    0x05,
+    0xb2,
+    0xe5,
+    0x8a,
+    0x9e,
+    0x85,
+    0x83,
+    0xcc,
+    0x04,
+    0xf1,
+    0x56,
+    0x78,
+    0x44,
+    0x5e,
+    0xde,
+    0xe0,
+    0x60,
+    0x1a,
+    0x65,
+    0x79,
+    0x31,
+    0x23,
+    0x05,
+    0xbb,
+    0x01,
+    0xff,
+    0xdd,
+    0x2e,
+    0xb7,
+    0xb3,
+    0xaa,
+    0x74,
+    0xe0,
+    0xa5,
+    0x94,
+    0xaf,
+    0x4b,
+    0xde,
+    0x58,
+    0x0f,
+    0x55,
+    0xde,
+    0x33,
+    0xf6,
+    0xe3,
+    0xd6,
+    0x34,
+    0x36,
+    0x57,
+    0xd6,
+    0x79,
+    0x91,
+    0x2e,
+    0xbe,
+    0x3b,
+    0xd9,
+    0x4e,
+    0xb6,
+    0x9d,
+    0x21,
+    0x5c,
+    0xd3,
+    0x48,
+    0x14,
+    0x7f,
+    0x4a,
+    0xc4,
+    0x60,
+    0xa9,
+    0x29,
+    0xf8,
+    0x53,
+    0x7f,
+    0x88,
+    0x11,
+    0x2d,
+    0xb5,
+    0xc5,
+    0x2d,
+    0x6f,
+    0xee,
+    0x85,
+    0x0b,
+    0xf7,
+    0x8d,
+    0x9a,
+    0xbe,
+    0xb0,
+    0x42,
+    0xf2,
+    0x2e,
+    0x71,
+    0xaf,
+    0x19,
+    0x31,
+    0x6d,
+    0xec,
+    0xcd,
+    0x6f,
+    0x2b,
+    0x23,
+    0xdf,
+    0xb4,
+    0x40,
+    0xaf,
+    0x2c,
+    0x0a,
+    0xc3,
+    0x1b,
+    0x7d,
+    0x7d,
+    0x03,
+    0x1d,
+    0x4b,
+    0xf3,
+    0xb5,
+    0xe0,
+    0x85,
+    0xd8,
+    0xdf,
+    0x91,
+    0x6b,
+    0x0a,
+    0x69,
+    0xf7,
+    0xf2,
+    0x69,
+    0x66,
+    0x5b,
+    0xf1,
+    0xcf,
+    0x46,
+    0x7d,
+    0xe9,
+    0x70,
+    0xfa,
+    0x6d,
+    0x7e,
+    0x75,
+    0x4e,
+    0xa9,
+    0x77,
+    0xe6,
+    0x8c,
+    0x02,
+    0xf7,
+    0x14,
+    0x4d,
+    0xa5,
+    0x41,
+    0x8f,
+    0x3f,
+    0xc1,
+    0x62,
+    0x1e,
+    0x71,
+    0x5e,
+    0x38,
+    0xb4,
+    0xd6,
+    0xe6,
+    0xe1,
+    0x4b,
+    0xc2,
+    0x2c,
+    0x30,
+    0x83,
+    0x81,
+    0x6f,
+    0x49,
+    0x2e,
+    0x96,
+    0xe6,
+    0xc9,
+    0x9a,
+    0xf7,
+    0x5d,
+    0x09,
+    0xa0,
+    0x55,
+    0x02,
+    0xa5,
+    0x3a,
+    0x25,
+    0x23,
+    0xd0,
+    0x92,
+    0xc3,
+    0xa3,
+    0xe3,
+    0x0e,
+    0x12,
+    0x2f,
+    0x4d,
+    0xef,
+    0xf3,
+    0x55,
+    0x5a,
+    0xbe,
+    0xe6,
+    0x19,
+    0x86,
+    0x31,
+    0xab,
+    0x75,
+    0x9a,
+    0xd3,
+    0xf0,
+    0x2c,
+    0xc5,
+    0x41,
+    0x92,
+    0xd9,
+    0x1f,
+    0x5f,
+    0x11,
+    0x8c,
+    0x75,
+    0x1c,
+    0x63,
+    0xd0,
+    0x02,
+    0x80,
+    0x2c,
+    0x68,
+    0xcb,
+    0x93,
+    0xfb,
+    0x51,
+    0x73,
+    0x49,
+    0xb4,
+    0x60,
+    0xda,
+    0xe2,
+    0x26,
+    0xaf,
+    0xa9,
+    0x46,
+    0x12,
+    0xb8,
+    0xec,
+    0x50,
+    0xdd,
+    0x12,
+    0x06,
+    0x5f,
+    0xce,
+    0x59,
+    0xe6,
+    0xf6,
+    0x1c,
+    0xe0,
+    0x54,
+    0x10,
+    0xad,
+    0xf6,
+    0xcd,
+    0x98,
+    0xcc,
+    0x0f,
+    0xfb,
+    0xcb,
+    0x41,
+    0x14,
+    0x9d,
+    0xed,
+    0xe4,
+    0xb4,
+    0x74,
+    0x5f,
+    0x09,
+    0x60,
+    0xc7,
+    0x12,
+    0xf6,
+    0x7b,
+    0x3c,
+    0x8f,
+    0xa7,
+    0x20,
+    0xbc,
+    0xe4,
+    0xb1,
+    0xef,
+    0xeb,
+    0xa4,
+    0x93,
+    0xc5,
+    0x06,
+    0xca,
+    0x9a,
+    0x27,
+    0x9d,
+    0x87,
+    0xf3,
+    0xde,
+    0xca,
+    0xe5,
+    0xe7,
+    0xf6,
+    0x1c,
+    0x01,
+    0x65,
+    0x5b,
+    0xfb,
+    0x19,
+    0x79,
+    0x6e,
+    0x08,
+    0x26,
+    0xc5,
+    0xc8,
+    0x28,
+    0x0e,
+    0xb6,
+    0x3b,
+    0x07,
+    0x08,
+    0xc1,
+    0x02,
+    0x82,
+    0x01,
+    0x01,
+    0x00,
+    0xe8,
+    0x1c,
+    0x73,
+    0xa6,
+    0xb8,
+    0xe0,
+    0x0e,
+    0x6d,
+    0x8d,
+    0x1b,
+    0xb9,
+    0x53,
+    0xed,
+    0x58,
+    0x94,
+    0xe6,
+    0x1d,
+    0x60,
+    0x14,
+    0x5c,
+    0x76,
+    0x43,
+    0xc4,
+    0x58,
+    0x19,
+    0xc4,
+    0x24,
+    0xe8,
+    0xbc,
+    0x1b,
+    0x3b,
+    0x0b,
+    0x13,
+    0x24,
+    0x45,
+    0x54,
+    0x0e,
+    0xcc,
+    0x37,
+    0xf0,
+    0xe0,
+    0x63,
+    0x7d,
+    0xc3,
+    0xf7,
+    0xfb,
+    0x81,
+    0x74,
+    0x81,
+    0xc4,
+    0x0f,
+    0x1a,
+    0x21,
+    0x48,
+    0xaf,
+    0xce,
+    0xc1,
+    0xc4,
+    0x94,
+    0x18,
+    0x06,
+    0x44,
+    0x8d,
+    0xd3,
+    0xd2,
+    0x22,
+    0x2d,
+    0x2d,
+    0x3e,
+    0x5a,
+    0x31,
+    0xdc,
+    0x95,
+    0x8e,
+    0xf4,
+    0x41,
+    0xfc,
+    0x58,
+    0xc9,
+    0x40,
+    0x92,
+    0x17,
+    0x5f,
+    0xe3,
+    0xda,
+    0xac,
+    0x9e,
+    0x3f,
+    0x1c,
+    0x2a,
+    0x6b,
+    0x58,
+    0x5f,
+    0x48,
+    0x78,
+    0x20,
+    0xb1,
+    0xaf,
+    0x24,
+    0x9b,
+    0x3c,
+    0x20,
+    0x8b,
+    0x93,
+    0x25,
+    0x9e,
+    0xe6,
+    0x6b,
+    0xbc,
+    0x13,
+    0x42,
+    0x14,
+    0x6c,
+    0x36,
+    0x31,
+    0xff,
+    0x7a,
+    0xd1,
+    0xc1,
+    0x1a,
+    0x26,
+    0x14,
+    0x7f,
+    0xa9,
+    0x76,
+    0xa7,
+    0x0c,
+    0xf8,
+    0xcc,
+    0xed,
+    0x07,
+    0x6a,
+    0xd2,
+    0xdf,
+    0x62,
+    0xee,
+    0x0a,
+    0x7c,
+    0x84,
+    0xcb,
+    0x49,
+    0x90,
+    0xb2,
+    0x03,
+    0x0d,
+    0xa2,
+    0x82,
+    0x06,
+    0x77,
+    0xf1,
+    0xcd,
+    0x67,
+    0xf2,
+    0x47,
+    0x21,
+    0x02,
+    0x3f,
+    0x43,
+    0x21,
+    0xf0,
+    0x46,
+    0x30,
+    0x62,
+    0x51,
+    0x72,
+    0xb1,
+    0xe7,
+    0x48,
+    0xc6,
+    0x67,
+    0x12,
+    0xcd,
+    0x9e,
+    0xd6,
+    0x15,
+    0xe5,
+    0x21,
+    0xed,
+    0xfa,
+    0x8f,
+    0x30,
+    0xa6,
+    0x41,
+    0xfe,
+    0xb6,
+    0xfa,
+    0x8f,
+    0x34,
+    0x14,
+    0x19,
+    0xe8,
+    0x11,
+    0xf7,
+    0xa5,
+    0x77,
+    0x3e,
+    0xb7,
+    0xf9,
+    0x39,
+    0x07,
+    0x8c,
+    0x67,
+    0x2a,
+    0xab,
+    0x7b,
+    0x08,
+    0xf8,
+    0xb0,
+    0x06,
+    0xa8,
+    0xea,
+    0x2f,
+    0x8f,
+    0xfa,
+    0xcc,
+    0xcc,
+    0x40,
+    0xce,
+    0xf3,
+    0x70,
+    0x4f,
+    0x3f,
+    0x7f,
+    0xe2,
+    0x0c,
+    0xea,
+    0x76,
+    0x4a,
+    0x35,
+    0x4e,
+    0x47,
+    0xad,
+    0x2b,
+    0xa7,
+    0x97,
+    0x5d,
+    0x74,
+    0x43,
+    0x97,
+    0x90,
+    0xd2,
+    0xfb,
+    0xd9,
+    0xf9,
+    0x96,
+    0x01,
+    0x33,
+    0x05,
+    0xed,
+    0x7b,
+    0x03,
+    0x05,
+    0xad,
+    0xf8,
+    0x49,
+    0x03,
+    0x02,
+    0x82,
+    0x01,
+    0x01,
+    0x00,
+    0xd4,
+    0x40,
+    0x17,
+    0x66,
+    0x10,
+    0x92,
+    0x95,
+    0xc8,
+    0xec,
+    0x62,
+    0xa9,
+    0x7a,
+    0xcb,
+    0x93,
+    0x8e,
+    0xe6,
+    0x53,
+    0xd4,
+    0x80,
+    0x48,
+    0x27,
+    0x4b,
+    0x41,
+    0xce,
+    0x61,
+    0xdf,
+    0xbf,
+    0x94,
+    0xa4,
+    0x3d,
+    0x71,
+    0x03,
+    0x0b,
+    0xed,
+    0x25,
+    0x71,
+    0x98,
+    0xa4,
+    0xd6,
+    0xd5,
+    0x4a,
+    0x57,
+    0xf5,
+    0x6c,
+    0x1b,
+    0xda,
+    0x21,
+    0x7d,
+    0x35,
+    0x45,
+    0xb3,
+    0xf3,
+    0x6a,
+    0xd9,
+    0xd3,
+    0x43,
+    0xe8,
+    0x5c,
+    0x54,
+    0x1c,
+    0x83,
+    0x1b,
+    0xb4,
+    0x5f,
+    0xf2,
+    0x97,
+    0x24,
+    0x2e,
+    0xdc,
+    0x40,
+    0xde,
+    0x92,
+    0x23,
+    0x59,
+    0x8e,
+    0xbc,
+    0xd2,
+    0xa1,
+    0xf2,
+    0xe0,
+    0x4c,
+    0xdd,
+    0x0b,
+    0xd1,
+    0xe7,
+    0xae,
+    0x65,
+    0xbc,
+    0xb5,
+    0xf5,
+    0x5b,
+    0x98,
+    0xe9,
+    0xd7,
+    0xc2,
+    0xb7,
+    0x0e,
+    0x55,
+    0x71,
+    0x0e,
+    0x3c,
+    0x0a,
+    0x24,
+    0x6b,
+    0xa6,
+    0xe6,
+    0x14,
+    0x61,
+    0x11,
+    0xfd,
+    0x33,
+    0x42,
+    0x99,
+    0x2b,
+    0x84,
+    0x77,
+    0x74,
+    0x92,
+    0x91,
+    0xf5,
+    0x79,
+    0x79,
+    0xcf,
+    0xad,
+    0x8e,
+    0x04,
+    0xef,
+    0x80,
+    0x1e,
+    0x57,
+    0xf4,
+    0x14,
+    0xf5,
+    0x35,
+    0x09,
+    0x74,
+    0xb2,
+    0x13,
+    0x71,
+    0x58,
+    0x6b,
+    0xea,
+    0x32,
+    0x5d,
+    0xf3,
+    0xd3,
+    0x76,
+    0x48,
+    0x39,
+    0x10,
+    0x23,
+    0x84,
+    0x9d,
+    0xbe,
+    0x92,
+    0x77,
+    0x4a,
+    0xed,
+    0x70,
+    0x3e,
+    0x1a,
+    0xa2,
+    0x6c,
+    0xb3,
+    0x81,
+    0x00,
+    0xc3,
+    0xc9,
+    0xe4,
+    0x52,
+    0xc8,
+    0x24,
+    0x88,
+    0x0c,
+    0x41,
+    0xad,
+    0x87,
+    0x5a,
+    0xea,
+    0xa3,
+    0x7a,
+    0x85,
+    0x1c,
+    0x5e,
+    0x31,
+    0x7f,
+    0xc3,
+    0x35,
+    0xc6,
+    0xfa,
+    0x10,
+    0xc8,
+    0x75,
+    0x10,
+    0xc4,
+    0x96,
+    0x99,
+    0xe7,
+    0xfe,
+    0x01,
+    0xb4,
+    0x74,
+    0xdb,
+    0xb4,
+    0x11,
+    0xc3,
+    0xc8,
+    0x8c,
+    0xf6,
+    0xf7,
+    0x3b,
+    0x66,
+    0x50,
+    0xfc,
+    0xdb,
+    0xeb,
+    0xca,
+    0x47,
+    0x85,
+    0x89,
+    0xe1,
+    0x65,
+    0xd9,
+    0x62,
+    0x34,
+    0x3c,
+    0x70,
+    0xd8,
+    0x2e,
+    0xb4,
+    0x2f,
+    0x65,
+    0x3c,
+    0x4a,
+    0xa6,
+    0x2a,
+    0xe7,
+    0xc7,
+    0xd8,
+    0x41,
+    0x8f,
+    0x8a,
+    0x43,
+    0xbf,
+    0x42,
+    0xf2,
+    0x4d,
+    0xbc,
+    0xfc,
+    0x9e,
+    0x27,
+    0x95,
+    0xfb,
+    0x75,
+    0xff,
+    0xab,
+    0x02,
+    0x82,
+    0x01,
+    0x00,
+    0x41,
+    0x2f,
+    0x44,
+    0x57,
+    0x6d,
+    0x12,
+    0x17,
+    0x5b,
+    0x32,
+    0xc6,
+    0xb7,
+    0x6c,
+    0x57,
+    0x7a,
+    0x8a,
+    0x0e,
+    0x79,
+    0xef,
+    0x72,
+    0xa8,
+    0x68,
+    0xda,
+    0x2d,
+    0x38,
+    0xe4,
+    0xbb,
+    0x8d,
+    0xf6,
+    0x02,
+    0x65,
+    0xcf,
+    0x56,
+    0x13,
+    0xe1,
+    0x1a,
+    0xcb,
+    0x39,
+    0x80,
+    0xa6,
+    0xb1,
+    0x32,
+    0x03,
+    0x1e,
+    0xdd,
+    0xbb,
+    0x35,
+    0xd9,
+    0xac,
+    0x43,
+    0x89,
+    0x31,
+    0x08,
+    0x90,
+    0x92,
+    0x5e,
+    0x35,
+    0x3d,
+    0x7b,
+    0x9c,
+    0x6f,
+    0x86,
+    0xcb,
+    0x17,
+    0xdd,
+    0x85,
+    0xe4,
+    0xed,
+    0x35,
+    0x08,
+    0x8e,
+    0xc1,
+    0xf4,
+    0x05,
+    0xd8,
+    0x68,
+    0xc6,
+    0x63,
+    0x3c,
+    0xf7,
+    0xff,
+    0xf7,
+    0x47,
+    0x33,
+    0x39,
+    0xc5,
+    0x3e,
+    0xb7,
+    0x0e,
+    0x58,
+    0x35,
+    0x9d,
+    0x81,
+    0xea,
+    0xf8,
+    0x6a,
+    0x2c,
+    0x1c,
+    0x5a,
+    0x68,
+    0x78,
+    0x64,
+    0x11,
+    0x6b,
+    0xc1,
+    0x3e,
+    0x4e,
+    0x7a,
+    0xbd,
+    0x84,
+    0xcb,
+    0x0f,
+    0xc2,
+    0xb6,
+    0x85,
+    0x1d,
+    0xd3,
+    0x76,
+    0xc5,
+    0x93,
+    0x6a,
+    0x69,
+    0x89,
+    0x56,
+    0x34,
+    0xdc,
+    0x4a,
+    0x9b,
+    0xbc,
+    0xff,
+    0xa8,
+    0x0d,
+    0x6e,
+    0x35,
+    0x9c,
+    0x60,
+    0xa7,
+    0x23,
+    0x30,
+    0xc7,
+    0x06,
+    0x64,
+    0x39,
+    0x8b,
+    0x94,
+    0x89,
+    0xee,
+    0xba,
+    0x7f,
+    0x60,
+    0x8d,
+    0xfa,
+    0xb6,
+    0x97,
+    0x76,
+    0xdc,
+    0x51,
+    0x4a,
+    0x3c,
+    0xeb,
+    0x3a,
+    0x14,
+    0x2c,
+    0x20,
+    0x60,
+    0x69,
+    0x4a,
+    0x86,
+    0xfe,
+    0x8c,
+    0x21,
+    0x84,
+    0x49,
+    0x54,
+    0xb3,
+    0x20,
+    0xe1,
+    0x01,
+    0x7f,
+    0x58,
+    0xdf,
+    0x7f,
+    0xb5,
+    0x21,
+    0x51,
+    0x8c,
+    0x47,
+    0x9f,
+    0x91,
+    0xeb,
+    0x97,
+    0x3e,
+    0xf2,
+    0x54,
+    0xcf,
+    0x16,
+    0x46,
+    0xf9,
+    0xd9,
+    0xb6,
+    0xe7,
+    0x64,
+    0xc9,
+    0xd0,
+    0x54,
+    0xea,
+    0x2f,
+    0xa1,
+    0xcf,
+    0xa5,
+    0x7f,
+    0x28,
+    0x8d,
+    0x84,
+    0xec,
+    0xd5,
+    0x39,
+    0x03,
+    0x76,
+    0x5b,
+    0x2d,
+    0x8e,
+    0x43,
+    0xf2,
+    0x01,
+    0x24,
+    0xc9,
+    0x6f,
+    0xc0,
+    0xf5,
+    0x69,
+    0x6f,
+    0x7d,
+    0xb5,
+    0x85,
+    0xd2,
+    0x5f,
+    0x7f,
+    0x78,
+    0x40,
+    0x07,
+    0x7f,
+    0x09,
+    0x15,
+    0xb5,
+    0x1f,
+    0x28,
+    0x65,
+    0x10,
+    0xe4,
+    0x19,
+    0xa8,
+    0xc6,
+    0x9e,
+    0x8d,
+    0xdc,
+    0xcb,
+    0x02,
+    0x82,
+    0x01,
+    0x00,
+    0x13,
+    0x01,
+    0xee,
+    0x56,
+    0x80,
+    0x93,
+    0x70,
+    0x00,
+    0x7f,
+    0x52,
+    0xd2,
+    0x94,
+    0xa1,
+    0x98,
+    0x84,
+    0x4a,
+    0x92,
+    0x25,
+    0x4c,
+    0x9b,
+    0xa9,
+    0x91,
+    0x2e,
+    0xc2,
+    0x79,
+    0xb7,
+    0x5c,
+    0xe3,
+    0xc5,
+    0xd5,
+    0x8e,
+    0xc2,
+    0x54,
+    0x16,
+    0x17,
+    0xad,
+    0x55,
+    0x9b,
+    0x25,
+    0x76,
+    0x12,
+    0x63,
+    0x50,
+    0x22,
+    0x2f,
+    0x58,
+    0x58,
+    0x79,
+    0x6b,
+    0x04,
+    0xe3,
+    0xf9,
+    0x9f,
+    0x8f,
+    0x04,
+    0x41,
+    0x67,
+    0x94,
+    0xa5,
+    0x1f,
+    0xac,
+    0x8a,
+    0x15,
+    0x9c,
+    0x26,
+    0x10,
+    0x6c,
+    0xf8,
+    0x19,
+    0x57,
+    0x61,
+    0xd7,
+    0x3a,
+    0x7d,
+    0x31,
+    0xb0,
+    0x2d,
+    0x38,
+    0xbd,
+    0x94,
+    0x62,
+    0xad,
+    0xc4,
+    0xfa,
+    0x36,
+    0x42,
+    0x42,
+    0xf0,
+    0x24,
+    0x67,
+    0x65,
+    0x9d,
+    0x8b,
+    0x0b,
+    0x7c,
+    0x6f,
+    0x82,
+    0x44,
+    0x1a,
+    0x8c,
+    0xc8,
+    0xc9,
+    0xab,
+    0xbb,
+    0x4c,
+    0x45,
+    0xfc,
+    0x7b,
+    0x38,
+    0xee,
+    0x30,
+    0xe1,
+    0xfc,
+    0xef,
+    0x8d,
+    0xbc,
+    0x58,
+    0xdf,
+    0x2b,
+    0x5d,
+    0x0d,
+    0x54,
+    0xe0,
+    0x49,
+    0x4d,
+    0x97,
+    0x99,
+    0x8f,
+    0x22,
+    0xa8,
+    0x83,
+    0xbe,
+    0x40,
+    0xbb,
+    0x50,
+    0x2e,
+    0x78,
+    0x28,
+    0x0f,
+    0x95,
+    0x78,
+    0x8c,
+    0x8f,
+    0x98,
+    0x24,
+    0x56,
+    0xc2,
+    0x97,
+    0xf3,
+    0x2c,
+    0x43,
+    0xd2,
+    0x03,
+    0x82,
+    0x66,
+    0x81,
+    0x72,
+    0x5f,
+    0x53,
+    0x16,
+    0xec,
+    0xb1,
+    0xb1,
+    0x04,
+    0x5e,
+    0x40,
+    0x20,
+    0x48,
+    0x7b,
+    0x3f,
+    0x02,
+    0x97,
+    0x6a,
+    0xeb,
+    0x96,
+    0x12,
+    0x21,
+    0x35,
+    0xfe,
+    0x1f,
+    0x47,
+    0xc0,
+    0x95,
+    0xea,
+    0xc5,
+    0x8a,
+    0x08,
+    0x84,
+    0x4f,
+    0x5e,
+    0x63,
+    0x94,
+    0x60,
+    0x0f,
+    0x71,
+    0x5b,
+    0x7f,
+    0x4a,
+    0xec,
+    0x4f,
+    0x60,
+    0xc6,
+    0xba,
+    0x4a,
+    0x24,
+    0xf1,
+    0x20,
+    0x8b,
+    0xa7,
+    0x2e,
+    0x3a,
+    0xce,
+    0x8d,
+    0xe0,
+    0x27,
+    0x1d,
+    0xb5,
+    0x8e,
+    0xb4,
+    0x21,
+    0xc5,
+    0xe2,
+    0xa6,
+    0x16,
+    0x0a,
+    0x51,
+    0x83,
+    0x55,
+    0x88,
+    0xd1,
+    0x30,
+    0x11,
+    0x63,
+    0xd5,
+    0xd7,
+    0x8d,
+    0xae,
+    0x16,
+    0x12,
+    0x82,
+    0xc4,
+    0x85,
+    0x00,
+    0x4e,
+    0x27,
+    0x83,
+    0xa5,
+    0x7c,
+    0x90,
+    0x2e,
+    0xe5,
+    0xa2,
+    0xa3,
+    0xd3,
+    0x4c,
+    0x63,
+    0x02,
+    0x82,
+    0x01,
+    0x01,
+    0x00,
+    0x86,
+    0x08,
+    0x98,
+    0x98,
+    0xa5,
+    0x00,
+    0x05,
+    0x39,
+    0x77,
+    0xd9,
+    0x66,
+    0xb3,
+    0xcf,
+    0xca,
+    0xa0,
+    0x71,
+    0xb3,
+    0x50,
+    0xce,
+    0x3d,
+    0xb1,
+    0x93,
+    0x95,
+    0x35,
+    0xc4,
+    0xd4,
+    0x2e,
+    0x90,
+    0xdf,
+    0x0f,
+    0xfc,
+    0x60,
+    0xc1,
+    0x94,
+    0x68,
+    0x61,
+    0x43,
+    0xca,
+    0x9a,
+    0x23,
+    0x4a,
+    0x1e,
+    0x45,
+    0x72,
+    0x99,
+    0xb5,
+    0x1e,
+    0x61,
+    0x8d,
+    0x77,
+    0x0f,
+    0xa0,
+    0xbb,
+    0xd7,
+    0x77,
+    0xb4,
+    0x2a,
+    0x15,
+    0x11,
+    0x88,
+    0x2d,
+    0xb3,
+    0x56,
+    0x61,
+    0x5e,
+    0x6a,
+    0xed,
+    0xa4,
+    0x46,
+    0x4a,
+    0x3f,
+    0x50,
+    0x11,
+    0xd6,
+    0xba,
+    0xb6,
+    0xd7,
+    0x95,
+    0x65,
+    0x53,
+    0xc3,
+    0xa1,
+    0x8f,
+    0xe0,
+    0xa3,
+    0xf5,
+    0x1c,
+    0xfd,
+    0xaf,
+    0x6e,
+    0x43,
+    0xd7,
+    0x17,
+    0xa7,
+    0xd3,
+    0x81,
+    0x1b,
+    0xa4,
+    0xdf,
+    0xe0,
+    0x97,
+    0x8a,
+    0x46,
+    0x03,
+    0xd3,
+    0x46,
+    0x0e,
+    0x83,
+    0x48,
+    0x4e,
+    0xd2,
+    0x02,
+    0xcb,
+    0xc0,
+    0xad,
+    0x79,
+    0x95,
+    0x8c,
+    0x96,
+    0xba,
+    0x40,
+    0x34,
+    0x11,
+    0x71,
+    0x5e,
+    0xe9,
+    0x11,
+    0xf9,
+    0xc5,
+    0x4a,
+    0x5e,
+    0x91,
+    0x9d,
+    0xf5,
+    0x92,
+    0x4f,
+    0xeb,
+    0xc6,
+    0x70,
+    0x02,
+    0x2d,
+    0x3d,
+    0x04,
+    0xaa,
+    0xe9,
+    0x3a,
+    0x8e,
+    0xd5,
+    0xa8,
+    0xad,
+    0xf7,
+    0xce,
+    0x0d,
+    0x16,
+    0xb2,
+    0xec,
+    0x0a,
+    0x9c,
+    0xf5,
+    0x94,
+    0x39,
+    0xb9,
+    0x8a,
+    0xfc,
+    0x1e,
+    0xf9,
+    0xcc,
+    0xf2,
+    0x5f,
+    0x21,
+    0x31,
+    0x74,
+    0x72,
+    0x6b,
+    0x64,
+    0xae,
+    0x35,
+    0x61,
+    0x8d,
+    0x0d,
+    0xcb,
+    0xe7,
+    0xda,
+    0x39,
+    0xca,
+    0xf3,
+    0x21,
+    0x66,
+    0x0b,
+    0x95,
+    0xd7,
+    0x0a,
+    0x7c,
+    0xca,
+    0xa1,
+    0xa9,
+    0x5a,
+    0xe8,
+    0xac,
+    0xe0,
+    0x71,
+    0x54,
+    0xaf,
+    0x28,
+    0xcf,
+    0xd5,
+    0x70,
+    0x89,
+    0xe0,
+    0xf3,
+    0x9e,
+    0x43,
+    0x6c,
+    0x8d,
+    0x7b,
+    0x99,
+    0x01,
+    0x68,
+    0x4d,
+    0xa1,
+    0x45,
+    0x46,
+    0x0c,
+    0x43,
+    0xbc,
+    0xcc,
+    0x2c,
+    0xdd,
+    0xc5,
+    0x46,
+    0xc8,
+    0x4e,
+    0x0e,
+    0xbe,
+    0xed,
+    0xb9,
+    0x26,
+    0xab,
+    0x2e,
+    0xdb,
+    0xeb,
+    0x8f,
+    0xff,
+    0xdb,
+    0xb0,
+    0xc6,
+    0x55,
+    0xaf,
+    0xf8,
+    0x2a,
+    0x91,
+    0x9d,
+    0x50,
+    0x44,
+    0x21,
+    0x17,
 };
 
 static unsigned char test7680[] = {
diff --git a/apps/timeouts.h b/apps/timeouts.h
index 002852724763d..3f9b2b50c9b89 100644
--- a/apps/timeouts.h
+++ b/apps/timeouts.h
@@ -8,10 +8,10 @@
  */
 
 #ifndef OSSL_APPS_TIMEOUTS_H
-# define OSSL_APPS_TIMEOUTS_H
+#define OSSL_APPS_TIMEOUTS_H
 
 /* numbers in us */
-# define DGRAM_RCV_TIMEOUT         250000
-# define DGRAM_SND_TIMEOUT         250000
+#define DGRAM_RCV_TIMEOUT 250000
+#define DGRAM_SND_TIMEOUT 250000
 
-#endif                          /* ! OSSL_APPS_TIMEOUTS_H */
+#endif /* ! OSSL_APPS_TIMEOUTS_H */
diff --git a/apps/ts.c b/apps/ts.c
index e59bc3b4b4a22..bd800bfaa3227 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -21,117 +21,138 @@
 #include <openssl/bn.h>
 
 /* Request nonce length, in bits (must be a multiple of 8). */
-#define NONCE_LENGTH            64
+#define NONCE_LENGTH 64
 
 /* Name of config entry that defines the OID file. */
-#define ENV_OID_FILE            "oid_file"
+#define ENV_OID_FILE "oid_file"
 
 /* Is |EXACTLY_ONE| of three pointers set? */
 #define EXACTLY_ONE(a, b, c) \
-        (( a && !b && !c) || \
-         ( b && !a && !c) || \
-         ( c && !a && !b))
+    ((a && !b && !c) || (b && !a && !c) || (c && !a && !b))
 
 static ASN1_OBJECT *txt2obj(const char *oid);
 static CONF *load_config_file(const char *configfile);
 
 /* Query related functions. */
 static int query_command(const char *data, const char *digest,
-                         const EVP_MD *md, const char *policy, int no_nonce,
-                         int cert, const char *in, const char *out, int text);
+    const EVP_MD *md, const char *policy, int no_nonce,
+    int cert, const char *in, const char *out, int text);
 static TS_REQ *create_query(BIO *data_bio, const char *digest, const EVP_MD *md,
-                            const char *policy, int no_nonce, int cert);
+    const char *policy, int no_nonce, int cert);
 static int create_digest(BIO *input, const char *digest,
-                         const EVP_MD *md, unsigned char **md_value);
+    const EVP_MD *md, unsigned char **md_value);
 static ASN1_INTEGER *create_nonce(int bits);
 
 /* Reply related functions. */
 static int reply_command(CONF *conf, const char *section, const char *engine,
-                         const char *queryfile, const char *passin, const char *inkey,
-                         const EVP_MD *md, const char *signer, const char *chain,
-                         const char *policy, const char *in, int token_in,
-                         const char *out, int token_out, int text);
+    const char *queryfile, const char *passin, const char *inkey,
+    const EVP_MD *md, const char *signer, const char *chain,
+    const char *policy, const char *in, int token_in,
+    const char *out, int token_out, int text);
 static TS_RESP *read_PKCS7(BIO *in_bio);
 static TS_RESP *create_response(CONF *conf, const char *section, const char *engine,
-                                const char *queryfile, const char *passin,
-                                const char *inkey, const EVP_MD *md, const char *signer,
-                                const char *chain, const char *policy);
+    const char *queryfile, const char *passin,
+    const char *inkey, const EVP_MD *md, const char *signer,
+    const char *chain, const char *policy);
 static ASN1_INTEGER *serial_cb(TS_RESP_CTX *ctx, void *data);
 static ASN1_INTEGER *next_serial(const char *serialfile);
 static int save_ts_serial(const char *serialfile, ASN1_INTEGER *serial);
 
 /* Verify related functions. */
 static int verify_command(const char *data, const char *digest, const char *queryfile,
-                          const char *in, int token_in,
-                          const char *CApath, const char *CAfile,
-                          const char *CAstore,
-                          char *untrusted, X509_VERIFY_PARAM *vpm);
+    const char *in, int token_in,
+    const char *CApath, const char *CAfile,
+    const char *CAstore,
+    char *untrusted, X509_VERIFY_PARAM *vpm);
 static TS_VERIFY_CTX *create_verify_ctx(const char *data, const char *digest,
-                                        const char *queryfile,
-                                        const char *CApath, const char *CAfile,
-                                        const char *CAstore,
-                                        char *untrusted,
-                                        X509_VERIFY_PARAM *vpm);
+    const char *queryfile,
+    const char *CApath, const char *CAfile,
+    const char *CAstore,
+    char *untrusted,
+    X509_VERIFY_PARAM *vpm);
 static X509_STORE *create_cert_store(const char *CApath, const char *CAfile,
-                                     const char *CAstore, X509_VERIFY_PARAM *vpm);
+    const char *CAstore, X509_VERIFY_PARAM *vpm);
 static int verify_cb(int ok, X509_STORE_CTX *ctx);
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_ENGINE, OPT_CONFIG, OPT_SECTION, OPT_QUERY, OPT_DATA,
-    OPT_DIGEST, OPT_TSPOLICY, OPT_NO_NONCE, OPT_CERT,
-    OPT_IN, OPT_TOKEN_IN, OPT_OUT, OPT_TOKEN_OUT, OPT_TEXT,
-    OPT_REPLY, OPT_QUERYFILE, OPT_PASSIN, OPT_INKEY, OPT_SIGNER,
-    OPT_CHAIN, OPT_VERIFY, OPT_CAPATH, OPT_CAFILE, OPT_CASTORE, OPT_UNTRUSTED,
-    OPT_MD, OPT_V_ENUM, OPT_R_ENUM, OPT_PROV_ENUM
+    OPT_ENGINE,
+    OPT_CONFIG,
+    OPT_SECTION,
+    OPT_QUERY,
+    OPT_DATA,
+    OPT_DIGEST,
+    OPT_TSPOLICY,
+    OPT_NO_NONCE,
+    OPT_CERT,
+    OPT_IN,
+    OPT_TOKEN_IN,
+    OPT_OUT,
+    OPT_TOKEN_OUT,
+    OPT_TEXT,
+    OPT_REPLY,
+    OPT_QUERYFILE,
+    OPT_PASSIN,
+    OPT_INKEY,
+    OPT_SIGNER,
+    OPT_CHAIN,
+    OPT_VERIFY,
+    OPT_CAPATH,
+    OPT_CAFILE,
+    OPT_CASTORE,
+    OPT_UNTRUSTED,
+    OPT_MD,
+    OPT_V_ENUM,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS ts_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-    {"config", OPT_CONFIG, '<', "Configuration file"},
-    {"section", OPT_SECTION, 's', "Section to use within config file"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+    { "config", OPT_CONFIG, '<', "Configuration file" },
+    { "section", OPT_SECTION, 's', "Section to use within config file" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
-    {"inkey", OPT_INKEY, 's', "File with private key for reply"},
-    {"signer", OPT_SIGNER, 's', "Signer certificate file"},
-    {"chain", OPT_CHAIN, '<', "File with signer CA chain"},
-    {"CAfile", OPT_CAFILE, '<', "File with trusted CA certs"},
-    {"CApath", OPT_CAPATH, '/', "Path to trusted CA files"},
-    {"CAstore", OPT_CASTORE, ':', "URI to trusted CA store"},
-    {"untrusted", OPT_UNTRUSTED, '<', "Extra untrusted certs"},
-    {"token_in", OPT_TOKEN_IN, '-', "Input is a PKCS#7 file"},
-    {"token_out", OPT_TOKEN_OUT, '-', "Output is a PKCS#7 file"},
-    {"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
-    {"", OPT_MD, '-', "Any supported digest"},
+    { "inkey", OPT_INKEY, 's', "File with private key for reply" },
+    { "signer", OPT_SIGNER, 's', "Signer certificate file" },
+    { "chain", OPT_CHAIN, '<', "File with signer CA chain" },
+    { "CAfile", OPT_CAFILE, '<', "File with trusted CA certs" },
+    { "CApath", OPT_CAPATH, '/', "Path to trusted CA files" },
+    { "CAstore", OPT_CASTORE, ':', "URI to trusted CA store" },
+    { "untrusted", OPT_UNTRUSTED, '<', "Extra untrusted certs" },
+    { "token_in", OPT_TOKEN_IN, '-', "Input is a PKCS#7 file" },
+    { "token_out", OPT_TOKEN_OUT, '-', "Output is a PKCS#7 file" },
+    { "passin", OPT_PASSIN, 's', "Input file pass phrase source" },
+    { "", OPT_MD, '-', "Any supported digest" },
 
     OPT_SECTION("Query"),
-    {"query", OPT_QUERY, '-', "Generate a TS query"},
-    {"data", OPT_DATA, '<', "File to hash"},
-    {"digest", OPT_DIGEST, 's', "Digest (as a hex string)"},
-    {"queryfile", OPT_QUERYFILE, '<', "File containing a TS query"},
-    {"cert", OPT_CERT, '-', "Put cert request into query"},
-    {"in", OPT_IN, '<', "Input file"},
+    { "query", OPT_QUERY, '-', "Generate a TS query" },
+    { "data", OPT_DATA, '<', "File to hash" },
+    { "digest", OPT_DIGEST, 's', "Digest (as a hex string)" },
+    { "queryfile", OPT_QUERYFILE, '<', "File containing a TS query" },
+    { "cert", OPT_CERT, '-', "Put cert request into query" },
+    { "in", OPT_IN, '<', "Input file" },
 
     OPT_SECTION("Verify"),
-    {"verify", OPT_VERIFY, '-', "Verify a TS response"},
-    {"reply", OPT_REPLY, '-', "Generate a TS reply"},
-    {"tspolicy", OPT_TSPOLICY, 's', "Policy OID to use"},
-    {"no_nonce", OPT_NO_NONCE, '-', "Do not include a nonce"},
-    {"out", OPT_OUT, '>', "Output file"},
-    {"text", OPT_TEXT, '-', "Output text (not DER)"},
+    { "verify", OPT_VERIFY, '-', "Verify a TS response" },
+    { "reply", OPT_REPLY, '-', "Generate a TS reply" },
+    { "tspolicy", OPT_TSPOLICY, 's', "Policy OID to use" },
+    { "no_nonce", OPT_NO_NONCE, '-', "Do not include a nonce" },
+    { "out", OPT_OUT, '>', "Output file" },
+    { "text", OPT_TEXT, '-', "Output text (not DER)" },
 
     OPT_R_OPTIONS,
     OPT_V_OPTIONS,
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 /*
  * This command is so complex, special help is needed.
  */
-static char* opt_helplist[] = {
+static char *opt_helplist[] = {
     "",
     "Typical uses:",
     " openssl ts -query [-rand file...] [-config file] [-data file]",
@@ -187,7 +208,7 @@ int ts_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -303,8 +324,7 @@ int ts_main(int argc, char **argv)
 
     if (!opt_md(digestname, &md))
         goto opthelp;
-    if (mode == OPT_REPLY && passin &&
-        !app_passwd(passin, NULL, &password, NULL)) {
+    if (mode == OPT_REPLY && passin && !app_passwd(passin, NULL, &password, NULL)) {
         BIO_printf(bio_err, "Error getting password.\n");
         goto end;
     }
@@ -321,7 +341,7 @@ int ts_main(int argc, char **argv)
         if ((data != NULL) && (digest != NULL))
             goto opthelp;
         ret = !query_command(data, digest, md, policy, no_nonce, cert,
-                             in, out, text);
+            in, out, text);
     } else if (mode == OPT_REPLY) {
         if (vpmtouched)
             goto opthelp;
@@ -332,20 +352,20 @@ int ts_main(int argc, char **argv)
                 goto opthelp;
         }
         ret = !reply_command(conf, section, engine, queryfile,
-                             password, inkey, md, signer, chain, policy,
-                             in, token_in, out, token_out, text);
+            password, inkey, md, signer, chain, policy,
+            in, token_in, out, token_out, text);
 
     } else if (mode == OPT_VERIFY) {
         if ((in == NULL) || !EXACTLY_ONE(queryfile, data, digest))
             goto opthelp;
         ret = !verify_command(data, digest, queryfile, in, token_in,
-                              CApath, CAfile, CAstore, untrusted,
-                              vpmtouched ? vpm : NULL);
+            CApath, CAfile, CAstore, untrusted,
+            vpmtouched ? vpm : NULL);
     } else {
         goto opthelp;
     }
 
- end:
+end:
     X509_VERIFY_PARAM_free(vpm);
     EVP_MD_free(md);
     NCONF_free(conf);
@@ -395,8 +415,8 @@ static CONF *load_config_file(const char *configfile)
  * Query-related method definitions.
  */
 static int query_command(const char *data, const char *digest, const EVP_MD *md,
-                         const char *policy, int no_nonce,
-                         int cert, const char *in, const char *out, int text)
+    const char *policy, int no_nonce,
+    int cert, const char *in, const char *out, int text)
 {
     int ret = 0;
     TS_REQ *query = NULL;
@@ -432,7 +452,7 @@ static int query_command(const char *data, const char *digest, const EVP_MD *md,
 
     ret = 1;
 
- end:
+end:
     ERR_print_errors(bio_err);
     BIO_free_all(in_bio);
     BIO_free_all(data_bio);
@@ -442,7 +462,7 @@ static int query_command(const char *data, const char *digest, const EVP_MD *md,
 }
 
 static TS_REQ *create_query(BIO *data_bio, const char *digest, const EVP_MD *md,
-                            const char *policy, int no_nonce, int cert)
+    const char *policy, int no_nonce, int cert)
 {
     int ret = 0;
     TS_REQ *ts_req = NULL;
@@ -490,7 +510,7 @@ static TS_REQ *create_query(BIO *data_bio, const char *digest, const EVP_MD *md,
         goto err;
 
     ret = 1;
- err:
+err:
     if (!ret) {
         TS_REQ_free(ts_req);
         ts_req = NULL;
@@ -506,7 +526,7 @@ static TS_REQ *create_query(BIO *data_bio, const char *digest, const EVP_MD *md,
 }
 
 static int create_digest(BIO *input, const char *digest, const EVP_MD *md,
-                         unsigned char **md_value)
+    unsigned char **md_value)
 {
     int md_value_len;
     int rv = 0;
@@ -539,12 +559,13 @@ static int create_digest(BIO *input, const char *digest, const EVP_MD *md,
         *md_value = OPENSSL_hexstr2buf(digest, &digest_len);
         if (*md_value == NULL || md_value_len != digest_len) {
             BIO_printf(bio_err, "bad digest, %d bytes "
-                       "must be specified\n", md_value_len);
+                                "must be specified\n",
+                md_value_len);
             goto err;
         }
     }
     rv = md_value_len;
- err:
+err:
     if (rv <= 0) {
         OPENSSL_free(*md_value);
         *md_value = NULL;
@@ -577,7 +598,7 @@ static ASN1_INTEGER *create_nonce(int bits)
     memcpy(nonce->data, buf + i, nonce->length);
     return nonce;
 
- err:
+err:
     BIO_printf(bio_err, "could not create nonce\n");
     ASN1_INTEGER_free(nonce);
     return NULL;
@@ -588,10 +609,10 @@ static ASN1_INTEGER *create_nonce(int bits)
  */
 
 static int reply_command(CONF *conf, const char *section, const char *engine,
-                         const char *queryfile, const char *passin, const char *inkey,
-                         const EVP_MD *md, const char *signer, const char *chain,
-                         const char *policy, const char *in, int token_in,
-                         const char *out, int token_out, int text)
+    const char *queryfile, const char *passin, const char *inkey,
+    const EVP_MD *md, const char *signer, const char *chain,
+    const char *policy, const char *in, int token_in,
+    const char *out, int token_out, int text)
 {
     int ret = 0;
     TS_RESP *response = NULL;
@@ -611,7 +632,7 @@ static int reply_command(CONF *conf, const char *section, const char *engine,
         }
     } else {
         response = create_response(conf, section, engine, queryfile,
-                                   passin, inkey, md, signer, chain, policy);
+            passin, inkey, md, signer, chain, policy);
         if (response != NULL)
             BIO_printf(bio_err, "Response has been generated.\n");
         else
@@ -623,7 +644,7 @@ static int reply_command(CONF *conf, const char *section, const char *engine,
     /* Write response. */
     if (text) {
         if ((out_bio = bio_open_default(out, 'w', FORMAT_TEXT)) == NULL)
-        goto end;
+            goto end;
         if (token_out) {
             TS_TST_INFO *tst_info = TS_RESP_get_tst_info(response);
             if (!TS_TST_INFO_print_bio(out_bio, tst_info))
@@ -647,7 +668,7 @@ static int reply_command(CONF *conf, const char *section, const char *engine,
 
     ret = 1;
 
- end:
+end:
     ERR_print_errors(bio_err);
     BIO_free_all(in_bio);
     BIO_free_all(query_bio);
@@ -680,11 +701,11 @@ static TS_RESP *read_PKCS7(BIO *in_bio)
     if (!TS_RESP_set_status_info(resp, si))
         goto end;
     TS_RESP_set_tst_info(resp, token, tst_info);
-    token = NULL;               /* Ownership is lost. */
-    tst_info = NULL;            /* Ownership is lost. */
+    token = NULL; /* Ownership is lost. */
+    tst_info = NULL; /* Ownership is lost. */
     ret = 1;
 
- end:
+end:
     PKCS7_free(token);
     TS_TST_INFO_free(tst_info);
     if (!ret) {
@@ -696,9 +717,9 @@ static TS_RESP *read_PKCS7(BIO *in_bio)
 }
 
 static TS_RESP *create_response(CONF *conf, const char *section, const char *engine,
-                                const char *queryfile, const char *passin,
-                                const char *inkey, const EVP_MD *md, const char *signer,
-                                const char *chain, const char *policy)
+    const char *queryfile, const char *passin,
+    const char *inkey, const EVP_MD *md, const char *signer,
+    const char *chain, const char *policy)
 {
     int ret = 0;
     TS_RESP *response = NULL;
@@ -728,7 +749,7 @@ static TS_RESP *create_response(CONF *conf, const char *section, const char *eng
         if (!TS_RESP_CTX_set_signer_digest(resp_ctx, md))
             goto end;
     } else if (!TS_CONF_set_signer_digest(conf, section, NULL, resp_ctx)) {
-            goto end;
+        goto end;
     }
 
     if (!TS_CONF_set_ess_cert_id_digest(conf, section, resp_ctx))
@@ -753,7 +774,7 @@ static TS_RESP *create_response(CONF *conf, const char *section, const char *eng
         goto end;
     ret = 1;
 
- end:
+end:
     if (!ret) {
         TS_RESP_free(response);
         response = NULL;
@@ -770,8 +791,8 @@ static ASN1_INTEGER *serial_cb(TS_RESP_CTX *ctx, void *data)
 
     if (serial == NULL) {
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                    "Error during serial number "
-                                    "generation.");
+            "Error during serial number "
+            "generation.");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_ADD_INFO_NOT_AVAILABLE);
     } else {
         save_ts_serial(serial_file, serial);
@@ -793,14 +814,15 @@ static ASN1_INTEGER *next_serial(const char *serialfile)
     if ((in = BIO_new_file(serialfile, "r")) == NULL) {
         ERR_clear_error();
         BIO_printf(bio_err, "Warning: could not open file %s for "
-                   "reading, using serial number: 1\n", serialfile);
+                            "reading, using serial number: 1\n",
+            serialfile);
         if (!ASN1_INTEGER_set(serial, 1))
             goto err;
     } else {
         char buf[1024];
         if (!a2i_ASN1_INTEGER(in, serial, buf, sizeof(buf))) {
             BIO_printf(bio_err, "unable to load number from %s\n",
-                       serialfile);
+                serialfile);
             goto err;
         }
         if ((bn = ASN1_INTEGER_to_BN(serial, NULL)) == NULL)
@@ -814,7 +836,7 @@ static ASN1_INTEGER *next_serial(const char *serialfile)
     }
     ret = 1;
 
- err:
+err:
     if (!ret) {
         ASN1_INTEGER_free(serial);
         serial = NULL;
@@ -836,24 +858,23 @@ static int save_ts_serial(const char *serialfile, ASN1_INTEGER *serial)
     if (BIO_puts(out, "\n") <= 0)
         goto err;
     ret = 1;
- err:
+err:
     if (!ret)
         BIO_printf(bio_err, "could not save serial number to %s\n",
-                   serialfile);
+            serialfile);
     BIO_free_all(out);
     return ret;
 }
 
-
 /*
  * Verify-related method definitions.
  */
 
 static int verify_command(const char *data, const char *digest, const char *queryfile,
-                          const char *in, int token_in,
-                          const char *CApath, const char *CAfile,
-                          const char *CAstore, char *untrusted,
-                          X509_VERIFY_PARAM *vpm)
+    const char *in, int token_in,
+    const char *CApath, const char *CAfile,
+    const char *CAstore, char *untrusted,
+    X509_VERIFY_PARAM *vpm)
 {
     BIO *in_bio = NULL;
     PKCS7 *token = NULL;
@@ -872,15 +893,16 @@ static int verify_command(const char *data, const char *digest, const char *quer
     }
 
     if ((verify_ctx = create_verify_ctx(data, digest, queryfile,
-                                        CApath, CAfile, CAstore, untrusted,
-                                        vpm)) == NULL)
+             CApath, CAfile, CAstore, untrusted,
+             vpm))
+        == NULL)
         goto end;
 
     ret = token_in
         ? TS_RESP_verify_token(verify_ctx, token)
         : TS_RESP_verify_response(verify_ctx, response);
 
- end:
+end:
     printf("Verification: ");
     if (ret)
         printf("OK\n");
@@ -897,11 +919,11 @@ static int verify_command(const char *data, const char *digest, const char *quer
 }
 
 static TS_VERIFY_CTX *create_verify_ctx(const char *data, const char *digest,
-                                        const char *queryfile,
-                                        const char *CApath, const char *CAfile,
-                                        const char *CAstore,
-                                        char *untrusted,
-                                        X509_VERIFY_PARAM *vpm)
+    const char *queryfile,
+    const char *CApath, const char *CAfile,
+    const char *CAstore,
+    char *untrusted,
+    X509_VERIFY_PARAM *vpm)
 {
     TS_VERIFY_CTX *ctx = NULL;
     STACK_OF(X509) *certs;
@@ -949,20 +971,19 @@ static TS_VERIFY_CTX *create_verify_ctx(const char *data, const char *digest,
     TS_VERIFY_CTX_add_flags(ctx, f | TS_VFY_SIGNATURE);
 
     /* Initialising the X509_STORE object. */
-    if (!TS_VERIFY_CTX_set0_store(ctx, create_cert_store(CApath, CAfile,
-                                                            CAstore, vpm)))
+    if (!TS_VERIFY_CTX_set0_store(ctx, create_cert_store(CApath, CAfile, CAstore, vpm)))
         goto err;
 
     /* Loading any extra untrusted certificates. */
     if (untrusted != NULL) {
         certs = load_certs_multifile(untrusted, NULL, "extra untrusted certs",
-                                     vpm);
+            vpm);
         if (certs == NULL || !TS_VERIFY_CTX_set0_certs(ctx, certs))
             goto err;
     }
     ret = 1;
 
- err:
+err:
     if (!ret) {
         TS_VERIFY_CTX_free(ctx);
         ctx = NULL;
@@ -973,7 +994,7 @@ static TS_VERIFY_CTX *create_verify_ctx(const char *data, const char *digest,
 }
 
 static X509_STORE *create_cert_store(const char *CApath, const char *CAfile,
-                                     const char *CAstore, X509_VERIFY_PARAM *vpm)
+    const char *CAstore, X509_VERIFY_PARAM *vpm)
 {
     X509_STORE *cert_ctx = NULL;
     X509_LOOKUP *lookup = NULL;
@@ -1005,7 +1026,8 @@ static X509_STORE *create_cert_store(const char *CApath, const char *CAfile,
             goto err;
         }
         if (X509_LOOKUP_load_file_ex(lookup, CAfile, X509_FILETYPE_PEM, libctx,
-                                      propq) <= 0) {
+                propq)
+            <= 0) {
             BIO_printf(bio_err, "Error loading file %s\n", CAfile);
             goto err;
         }
@@ -1028,7 +1050,7 @@ static X509_STORE *create_cert_store(const char *CApath, const char *CAfile,
 
     return cert_ctx;
 
- err:
+err:
     X509_STORE_free(cert_ctx);
     return NULL;
 }
diff --git a/apps/verify.c b/apps/verify.c
index 93b214281ea58..13185e605d31c 100644
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -20,60 +20,71 @@
 
 static int cb(int ok, X509_STORE_CTX *ctx);
 static int check(X509_STORE *ctx, const char *file,
-                 STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
-                 STACK_OF(X509_CRL) *crls, int show_chain,
-                 STACK_OF(OPENSSL_STRING) *opts);
+    STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
+    STACK_OF(X509_CRL) *crls, int show_chain,
+    STACK_OF(OPENSSL_STRING) *opts);
 static int v_verbose = 0, vflags = 0;
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_ENGINE, OPT_CAPATH, OPT_CAFILE, OPT_CASTORE,
-    OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE,
-    OPT_UNTRUSTED, OPT_TRUSTED, OPT_CRLFILE, OPT_CRL_DOWNLOAD, OPT_SHOW_CHAIN,
-    OPT_V_ENUM, OPT_NAMEOPT, OPT_VFYOPT,
+    OPT_ENGINE,
+    OPT_CAPATH,
+    OPT_CAFILE,
+    OPT_CASTORE,
+    OPT_NOCAPATH,
+    OPT_NOCAFILE,
+    OPT_NOCASTORE,
+    OPT_UNTRUSTED,
+    OPT_TRUSTED,
+    OPT_CRLFILE,
+    OPT_CRL_DOWNLOAD,
+    OPT_SHOW_CHAIN,
+    OPT_V_ENUM,
+    OPT_NAMEOPT,
+    OPT_VFYOPT,
     OPT_VERBOSE,
     OPT_PROV_ENUM
 } OPTION_CHOICE;
 
 const OPTIONS verify_options[] = {
-    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert...]\n"},
+    { OPT_HELP_STR, 1, '-', "Usage: %s [options] [cert...]\n" },
 
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
-    {"verbose", OPT_VERBOSE, '-',
-        "Print extra information about the operations being performed."},
-    {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"},
+    { "verbose", OPT_VERBOSE, '-',
+        "Print extra information about the operations being performed." },
+    { "nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options" },
 
     OPT_SECTION("Certificate chain"),
-    {"trusted", OPT_TRUSTED, '<', "A file of trusted certificates"},
-    {"CAfile", OPT_CAFILE, '<', "A file of trusted certificates"},
-    {"CApath", OPT_CAPATH, '/', "A directory of files with trusted certificates"},
-    {"CAstore", OPT_CASTORE, ':', "URI to a store of trusted certificates"},
-    {"no-CAfile", OPT_NOCAFILE, '-',
-     "Do not load the default trusted certificates file"},
-    {"no-CApath", OPT_NOCAPATH, '-',
-     "Do not load trusted certificates from the default directory"},
-    {"no-CAstore", OPT_NOCASTORE, '-',
-     "Do not load trusted certificates from the default certificates store"},
-    {"untrusted", OPT_UNTRUSTED, '<', "A file of untrusted certificates"},
-    {"CRLfile", OPT_CRLFILE, '<',
-        "File containing one or more CRL's (in PEM format) to load"},
-    {"crl_download", OPT_CRL_DOWNLOAD, '-',
-        "Try downloading CRL information for certificates via their CDP entries"},
-    {"show_chain", OPT_SHOW_CHAIN, '-',
-        "Display information about the certificate chain"},
+    { "trusted", OPT_TRUSTED, '<', "A file of trusted certificates" },
+    { "CAfile", OPT_CAFILE, '<', "A file of trusted certificates" },
+    { "CApath", OPT_CAPATH, '/', "A directory of files with trusted certificates" },
+    { "CAstore", OPT_CASTORE, ':', "URI to a store of trusted certificates" },
+    { "no-CAfile", OPT_NOCAFILE, '-',
+        "Do not load the default trusted certificates file" },
+    { "no-CApath", OPT_NOCAPATH, '-',
+        "Do not load trusted certificates from the default directory" },
+    { "no-CAstore", OPT_NOCASTORE, '-',
+        "Do not load trusted certificates from the default certificates store" },
+    { "untrusted", OPT_UNTRUSTED, '<', "A file of untrusted certificates" },
+    { "CRLfile", OPT_CRLFILE, '<',
+        "File containing one or more CRL's (in PEM format) to load" },
+    { "crl_download", OPT_CRL_DOWNLOAD, '-',
+        "Try downloading CRL information for certificates via their CDP entries" },
+    { "show_chain", OPT_SHOW_CHAIN, '-',
+        "Display information about the certificate chain" },
 
     OPT_V_OPTIONS,
-    {"vfyopt", OPT_VFYOPT, 's', "Verification parameter in n:v form"},
+    { "vfyopt", OPT_VFYOPT, 's', "Verification parameter in n:v form" },
 
     OPT_PROV_OPTIONS,
 
     OPT_PARAMETERS(),
-    {"cert", 0, 0, "Certificate(s) to verify (optional; stdin used otherwise)"},
-    {NULL}
+    { "cert", 0, 0, "Certificate(s) to verify (optional; stdin used otherwise)" },
+    { NULL }
 };
 
 int verify_main(int argc, char **argv)
@@ -97,7 +108,7 @@ int verify_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -107,8 +118,8 @@ int verify_main(int argc, char **argv)
                 X509_PURPOSE *ptmp = X509_PURPOSE_get0(i);
 
                 BIO_printf(bio_err, "  %-15s  %s\n",
-                        X509_PURPOSE_get0_sname(ptmp),
-                        X509_PURPOSE_get0_name(ptmp));
+                    X509_PURPOSE_get0_sname(ptmp),
+                    X509_PURPOSE_get0_name(ptmp));
             }
 
             BIO_printf(bio_err, "Recognized certificate policy names:\n");
@@ -116,7 +127,7 @@ int verify_main(int argc, char **argv)
                 const X509_VERIFY_PARAM *vptmp = X509_VERIFY_PARAM_get0(i);
 
                 BIO_printf(bio_err, "  %s\n",
-                        X509_VERIFY_PARAM_get0_name(vptmp));
+                    X509_VERIFY_PARAM_get0_name(vptmp));
             }
             ret = 0;
             goto end;
@@ -146,7 +157,7 @@ int verify_main(int argc, char **argv)
         case OPT_UNTRUSTED:
             /* Zero or more times */
             if (!load_certs(opt_arg(), 0, &untrusted, NULL,
-                            "untrusted certificates"))
+                    "untrusted certificates"))
                 goto end;
             break;
         case OPT_TRUSTED:
@@ -201,13 +212,14 @@ int verify_main(int argc, char **argv)
     if (trusted != NULL
         && (CAfile != NULL || CApath != NULL || CAstore != NULL)) {
         BIO_printf(bio_err,
-                   "%s: Cannot use -trusted with -CAfile, -CApath or -CAstore\n",
-                   prog);
+            "%s: Cannot use -trusted with -CAfile, -CApath or -CAstore\n",
+            prog);
         goto end;
     }
 
     if ((store = setup_verify(CAfile, noCAfile, CApath, noCApath,
-                              CAstore, noCAstore)) == NULL)
+             CAstore, noCAstore))
+        == NULL)
         goto end;
     X509_STORE_set_verify_cb(store, cb);
 
@@ -222,16 +234,18 @@ int verify_main(int argc, char **argv)
     ret = 0;
     if (argc < 1) {
         if (check(store, NULL, untrusted, trusted, crls, show_chain,
-                  vfyopts) != 1)
+                vfyopts)
+            != 1)
             ret = -1;
     } else {
         for (i = 0; i < argc; i++)
             if (check(store, argv[i], untrusted, trusted, crls, show_chain,
-                      vfyopts) != 1)
+                    vfyopts)
+                != 1)
                 ret = -1;
     }
 
- end:
+end:
     X509_VERIFY_PARAM_free(vpm);
     X509_STORE_free(store);
     OSSL_STACK_OF_X509_free(untrusted);
@@ -243,9 +257,9 @@ int verify_main(int argc, char **argv)
 }
 
 static int check(X509_STORE *ctx, const char *file,
-                 STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
-                 STACK_OF(X509_CRL) *crls, int show_chain,
-                 STACK_OF(OPENSSL_STRING) *opts)
+    STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
+    STACK_OF(X509_CRL) *crls, int show_chain,
+    STACK_OF(OPENSSL_STRING) *opts)
 {
     X509 *x = NULL;
     int i = 0, ret = 0;
@@ -272,7 +286,7 @@ static int check(X509_STORE *ctx, const char *file,
     csc = X509_STORE_CTX_new();
     if (csc == NULL) {
         BIO_printf(bio_err, "error %s: X.509 store context allocation failed\n",
-                   (file == NULL) ? "stdin" : file);
+            (file == NULL) ? "stdin" : file);
         goto end;
     }
 
@@ -280,8 +294,8 @@ static int check(X509_STORE *ctx, const char *file,
     if (!X509_STORE_CTX_init(csc, ctx, x, uchain)) {
         X509_STORE_CTX_free(csc);
         BIO_printf(bio_err,
-                   "error %s: X.509 store context initialization failed\n",
-                   (file == NULL) ? "stdin" : file);
+            "error %s: X.509 store context initialization failed\n",
+            (file == NULL) ? "stdin" : file);
         goto end;
     }
     if (tchain != NULL)
@@ -302,8 +316,8 @@ static int check(X509_STORE *ctx, const char *file,
                 X509 *cert = sk_X509_value(chain, j);
                 BIO_printf(bio_out, "depth=%d: ", j);
                 X509_NAME_print_ex_fp(stdout,
-                                      X509_get_subject_name(cert),
-                                      0, get_nameopt());
+                    X509_get_subject_name(cert),
+                    0, get_nameopt());
                 if (j < num_untrusted)
                     BIO_printf(bio_out, " (untrusted)");
                 BIO_printf(bio_out, "\n");
@@ -312,12 +326,12 @@ static int check(X509_STORE *ctx, const char *file,
         }
     } else {
         BIO_printf(bio_err,
-                   "error %s: verification failed\n",
-                   (file == NULL) ? "stdin" : file);
+            "error %s: verification failed\n",
+            (file == NULL) ? "stdin" : file);
     }
     X509_STORE_CTX_free(csc);
 
- end:
+end:
     if (i <= 0)
         ERR_print_errors(bio_err);
     X509_free(x);
@@ -333,15 +347,15 @@ static int cb(int ok, X509_STORE_CTX *ctx)
     if (!ok) {
         if (current_cert != NULL) {
             X509_NAME_print_ex(bio_err,
-                            X509_get_subject_name(current_cert),
-                            0, get_nameopt());
+                X509_get_subject_name(current_cert),
+                0, get_nameopt());
             BIO_printf(bio_err, "\n");
         }
         BIO_printf(bio_err, "%serror %d at %d depth lookup: %s\n",
-               X509_STORE_CTX_get0_parent_ctx(ctx) ? "[CRL path] " : "",
-               cert_error,
-               X509_STORE_CTX_get_error_depth(ctx),
-               X509_verify_cert_error_string(cert_error));
+            X509_STORE_CTX_get0_parent_ctx(ctx) ? "[CRL path] " : "",
+            cert_error,
+            X509_STORE_CTX_get_error_depth(ctx),
+            X509_verify_cert_error_string(cert_error));
 
         /*
          * Pretend that some errors are ok, so they don't stop further
@@ -383,7 +397,6 @@ static int cb(int ok, X509_STORE_CTX *ctx)
             ok = 1;
         }
         return ok;
-
     }
     if (cert_error == X509_V_OK && ok == 2)
         policies_print(ctx);
diff --git a/apps/version.c b/apps/version.c
index 89fb64b70a4d0..4d876aef3f095 100644
--- a/apps/version.c
+++ b/apps/version.c
@@ -18,32 +18,43 @@
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_B, OPT_D, OPT_E, OPT_M, OPT_F, OPT_O, OPT_P, OPT_V, OPT_A, OPT_R, OPT_C
+    OPT_B,
+    OPT_D,
+    OPT_E,
+    OPT_M,
+    OPT_F,
+    OPT_O,
+    OPT_P,
+    OPT_V,
+    OPT_A,
+    OPT_R,
+    OPT_C
 #if defined(_WIN32)
-    ,OPT_W
+    ,
+    OPT_W
 #endif
 } OPTION_CHOICE;
 
 const OPTIONS version_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
+    { "help", OPT_HELP, '-', "Display this summary" },
 
     OPT_SECTION("Output"),
-    {"a", OPT_A, '-', "Show all data"},
-    {"b", OPT_B, '-', "Show build date"},
-    {"d", OPT_D, '-', "Show configuration directory"},
-    {"e", OPT_E, '-', "Show engines directory"},
-    {"m", OPT_M, '-', "Show modules directory"},
-    {"f", OPT_F, '-', "Show compiler flags used"},
-    {"o", OPT_O, '-', "Show some internal datatype options"},
-    {"p", OPT_P, '-', "Show target build platform"},
-    {"r", OPT_R, '-', "Show random seeding options"},
-    {"v", OPT_V, '-', "Show library version"},
-    {"c", OPT_C, '-', "Show CPU settings info"},
+    { "a", OPT_A, '-', "Show all data" },
+    { "b", OPT_B, '-', "Show build date" },
+    { "d", OPT_D, '-', "Show configuration directory" },
+    { "e", OPT_E, '-', "Show engines directory" },
+    { "m", OPT_M, '-', "Show modules directory" },
+    { "f", OPT_F, '-', "Show compiler flags used" },
+    { "o", OPT_O, '-', "Show some internal datatype options" },
+    { "p", OPT_P, '-', "Show target build platform" },
+    { "r", OPT_R, '-', "Show random seeding options" },
+    { "v", OPT_V, '-', "Show library version" },
+    { "c", OPT_C, '-', "Show CPU settings info" },
 #if defined(_WIN32)
-    {"w", OPT_W, '-', "Show Windows install context"},
+    { "w", OPT_W, '-', "Show Windows install context" },
 #endif
-    {NULL}
+    { NULL }
 };
 
 int version_main(int argc, char **argv)
@@ -62,7 +73,7 @@ int version_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
-opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto end;
         case OPT_HELP:
@@ -121,7 +132,7 @@ int version_main(int argc, char **argv)
 
     if (version)
         printf("%s (Library: %s)\n",
-               OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION));
+            OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION));
     if (date)
         printf("%s\n", OpenSSL_version(OPENSSL_BUILT_ON));
     if (platform)
@@ -150,19 +161,18 @@ int version_main(int argc, char **argv)
         printf("%s\n", OpenSSL_version(OPENSSL_WINCTX));
 #endif
     ret = 0;
- end:
+end:
     return ret;
 }
 
-
 #if defined(__TANDEM) && defined(OPENSSL_VPROC)
 /*
  * Define a VPROC function for the openssl program.
  * This is used by platform version identification tools.
  * Do not inline this procedure or make it static.
  */
-# define OPENSSL_VPROC_STRING_(x)    x##_OPENSSL
-# define OPENSSL_VPROC_STRING(x)     OPENSSL_VPROC_STRING_(x)
-# define OPENSSL_VPROC_FUNC          OPENSSL_VPROC_STRING(OPENSSL_VPROC)
-void OPENSSL_VPROC_FUNC(void) {}
+#define OPENSSL_VPROC_STRING_(x) x##_OPENSSL
+#define OPENSSL_VPROC_STRING(x) OPENSSL_VPROC_STRING_(x)
+#define OPENSSL_VPROC_FUNC OPENSSL_VPROC_STRING(OPENSSL_VPROC)
+void OPENSSL_VPROC_FUNC(void) { }
 #endif
diff --git a/apps/vms_decc_init.c b/apps/vms_decc_init.c
index 21481e27bf936..58b9b190a1201 100644
--- a/apps/vms_decc_init.c
+++ b/apps/vms_decc_init.c
@@ -7,9 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#if defined( __VMS) && !defined( OPENSSL_NO_DECC_INIT) && \
- defined( __DECC) && !defined( __VAX) && (__CRTL_VER >= 70301000)
-# define USE_DECC_INIT 1
+#if defined(__VMS) && !defined(OPENSSL_NO_DECC_INIT) && defined(__DECC) && !defined(__VAX) && (__CRTL_VER >= 70301000)
+#define USE_DECC_INIT 1
 #endif
 
 #ifdef USE_DECC_INIT
@@ -21,9 +20,9 @@
  * ----------------------------------------------------------------------
  */
 
-# include <stdio.h>
-# include <stdlib.h>
-# include <unixlib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unixlib.h>
 
 /* Global storage. */
 
@@ -45,22 +44,21 @@ typedef struct {
 
 decc_feat_t decc_feat_array[] = {
     /* Preserve command-line case with SET PROCESS/PARSE_STYLE=EXTENDED */
-    {"DECC$ARGV_PARSE_STYLE", 1},
+    { "DECC$ARGV_PARSE_STYLE", 1 },
 
     /* Preserve case for file names on ODS5 disks. */
-    {"DECC$EFS_CASE_PRESERVE", 1},
+    { "DECC$EFS_CASE_PRESERVE", 1 },
 
     /*
      * Enable multiple dots (and most characters) in ODS5 file names, while
      * preserving VMS-ness of ";version".
      */
-    {"DECC$EFS_CHARSET", 1},
+    { "DECC$EFS_CHARSET", 1 },
 
     /* List terminator. */
-    {(char *)NULL, 0}
+    { (char *)NULL, 0 }
 };
 
-
 /* LIB$INITIALIZE initialization function. */
 
 static void decc_init(void)
@@ -98,31 +96,30 @@ static void decc_init(void)
             feat_value_max = decc$feature_get_value(feat_index, 3);
 
             /* Check the validity of our desired value. */
-            if ((decc_feat_array[i].value >= feat_value_min) &&
-                (decc_feat_array[i].value <= feat_value_max)) {
+            if ((decc_feat_array[i].value >= feat_value_min) && (decc_feat_array[i].value <= feat_value_max)) {
                 /* Valid value.  Set it if necessary. */
                 if (feat_value != decc_feat_array[i].value) {
                     sts = decc$feature_set_value(feat_index,
-                                                 1, decc_feat_array[i].value);
+                        1, decc_feat_array[i].value);
 
                     if (verbose > 1) {
                         fprintf(stderr, " %s = %d, sts = %d.\n",
-                                decc_feat_array[i].name,
-                                decc_feat_array[i].value, sts);
+                            decc_feat_array[i].name,
+                            decc_feat_array[i].value, sts);
                     }
                 }
             } else {
                 /* Invalid DECC feature value. */
                 fprintf(stderr,
-                        " INVALID DECC$FEATURE VALUE, %d: %d <= %s <= %d.\n",
-                        feat_value,
-                        feat_value_min, decc_feat_array[i].name,
-                        feat_value_max);
+                    " INVALID DECC$FEATURE VALUE, %d: %d <= %s <= %d.\n",
+                    feat_value,
+                    feat_value_min, decc_feat_array[i].name,
+                    feat_value_max);
             }
         } else {
             /* Invalid DECC feature name. */
             fprintf(stderr,
-                    " UNKNOWN DECC$FEATURE: %s.\n", decc_feat_array[i].name);
+                " UNKNOWN DECC$FEATURE: %s.\n", decc_feat_array[i].name);
         }
     }
 
@@ -133,44 +130,44 @@ static void decc_init(void)
 
 /* Get "decc_init()" into a valid, loaded LIB$INITIALIZE PSECT. */
 
-# pragma nostandard
+#pragma nostandard
 
 /*
  * Establish the LIB$INITIALIZE PSECTs, with proper alignment and other
  * attributes.  Note that "nopic" is significant only on VAX.
  */
-# pragma extern_model save
+#pragma extern_model save
 
-# if __INITIAL_POINTER_SIZE == 64
-#  define PSECT_ALIGN 3
-# else
-#  define PSECT_ALIGN 2
-# endif
+#if __INITIAL_POINTER_SIZE == 64
+#define PSECT_ALIGN 3
+#else
+#define PSECT_ALIGN 2
+#endif
 
-# pragma extern_model strict_refdef "LIB$INITIALIZ" PSECT_ALIGN, nopic, nowrt
+#pragma extern_model strict_refdef "LIB$INITIALIZ" PSECT_ALIGN, nopic, nowrt
 const int spare[8] = { 0 };
 
-# pragma extern_model strict_refdef "LIB$INITIALIZE" PSECT_ALIGN, nopic, nowrt
-void (*const x_decc_init) () = decc_init;
+#pragma extern_model strict_refdef "LIB$INITIALIZE" PSECT_ALIGN, nopic, nowrt
+void (*const x_decc_init)() = decc_init;
 
-# pragma extern_model restore
+#pragma extern_model restore
 
 /* Fake reference to ensure loading the LIB$INITIALIZE PSECT. */
 
-# pragma extern_model save
+#pragma extern_model save
 
 int LIB$INITIALIZE(void);
 
-# pragma extern_model strict_refdef
+#pragma extern_model strict_refdef
 int dmy_lib$initialize = (int)LIB$INITIALIZE;
 
-# pragma extern_model restore
+#pragma extern_model restore
 
-# pragma standard
+#pragma standard
 
-#else                           /* def USE_DECC_INIT */
+#else /* def USE_DECC_INIT */
 
 /* Dummy code to avoid a %CC-W-EMPTYFILE complaint. */
 int decc_init_dummy(void);
 
-#endif                          /* def USE_DECC_INIT */
+#endif /* def USE_DECC_INIT */
diff --git a/apps/x509.c b/apps/x509.c
index fdae8f383a667..eb7737a1330fb 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -23,170 +23,227 @@
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #ifndef OPENSSL_NO_DSA
-# include <openssl/dsa.h>
+#include <openssl/dsa.h>
 #endif
-#include "internal/e_os.h"    /* For isatty() */
+#include "internal/e_os.h" /* For isatty() */
 
 #undef POSTFIX
 #define POSTFIX ".srl"
-#define DEFAULT_DAYS       30 /* default certificate validity period in days */
-#define UNSET_DAYS         -2 /* -1 may be used for testing expiration checks */
-#define EXT_COPY_UNSET     -1
+#define DEFAULT_DAYS 30 /* default certificate validity period in days */
+#define UNSET_DAYS -2 /* -1 may be used for testing expiration checks */
+#define EXT_COPY_UNSET -1
 
 static int callb(int ok, X509_STORE_CTX *ctx);
 static ASN1_INTEGER *x509_load_serial(const char *CAfile,
-                                      const char *serialfile, int create);
+    const char *serialfile, int create);
 static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt);
 static int print_x509v3_exts(BIO *bio, X509 *x, const char *ext_names);
 
 typedef enum OPTION_choice {
     OPT_COMMON,
-    OPT_INFORM, OPT_OUTFORM, OPT_KEYFORM, OPT_REQ, OPT_CAFORM,
-    OPT_CAKEYFORM, OPT_VFYOPT, OPT_SIGOPT, OPT_DAYS, OPT_PASSIN, OPT_EXTFILE,
-    OPT_EXTENSIONS, OPT_IN, OPT_OUT, OPT_KEY, OPT_SIGNKEY, OPT_CA, OPT_CAKEY,
-    OPT_CASERIAL, OPT_SET_SERIAL, OPT_NEW, OPT_FORCE_PUBKEY, OPT_ISSU, OPT_SUBJ,
-    OPT_ADDTRUST, OPT_ADDREJECT, OPT_SETALIAS, OPT_CERTOPT, OPT_DATEOPT, OPT_NAMEOPT,
-    OPT_EMAIL, OPT_OCSP_URI, OPT_SERIAL, OPT_NEXT_SERIAL,
-    OPT_MODULUS, OPT_PUBKEY, OPT_X509TOREQ, OPT_TEXT, OPT_HASH,
-    OPT_ISSUER_HASH, OPT_SUBJECT, OPT_ISSUER, OPT_FINGERPRINT, OPT_DATES,
-    OPT_PURPOSE, OPT_STARTDATE, OPT_ENDDATE, OPT_CHECKEND, OPT_CHECKHOST,
-    OPT_CHECKEMAIL, OPT_CHECKIP, OPT_NOOUT, OPT_TRUSTOUT, OPT_CLRTRUST,
-    OPT_CLRREJECT, OPT_ALIAS, OPT_CACREATESERIAL, OPT_CLREXT, OPT_OCSPID,
-    OPT_SUBJECT_HASH_OLD, OPT_ISSUER_HASH_OLD, OPT_COPY_EXTENSIONS,
-    OPT_BADSIG, OPT_MD, OPT_ENGINE, OPT_NOCERT, OPT_PRESERVE_DATES,
-    OPT_NOT_BEFORE, OPT_NOT_AFTER,
-    OPT_R_ENUM, OPT_PROV_ENUM, OPT_EXT
+    OPT_INFORM,
+    OPT_OUTFORM,
+    OPT_KEYFORM,
+    OPT_REQ,
+    OPT_CAFORM,
+    OPT_CAKEYFORM,
+    OPT_VFYOPT,
+    OPT_SIGOPT,
+    OPT_DAYS,
+    OPT_PASSIN,
+    OPT_EXTFILE,
+    OPT_EXTENSIONS,
+    OPT_IN,
+    OPT_OUT,
+    OPT_KEY,
+    OPT_SIGNKEY,
+    OPT_CA,
+    OPT_CAKEY,
+    OPT_CASERIAL,
+    OPT_SET_SERIAL,
+    OPT_NEW,
+    OPT_FORCE_PUBKEY,
+    OPT_ISSU,
+    OPT_SUBJ,
+    OPT_ADDTRUST,
+    OPT_ADDREJECT,
+    OPT_SETALIAS,
+    OPT_CERTOPT,
+    OPT_DATEOPT,
+    OPT_NAMEOPT,
+    OPT_EMAIL,
+    OPT_OCSP_URI,
+    OPT_SERIAL,
+    OPT_NEXT_SERIAL,
+    OPT_MODULUS,
+    OPT_PUBKEY,
+    OPT_X509TOREQ,
+    OPT_TEXT,
+    OPT_HASH,
+    OPT_ISSUER_HASH,
+    OPT_SUBJECT,
+    OPT_ISSUER,
+    OPT_FINGERPRINT,
+    OPT_DATES,
+    OPT_PURPOSE,
+    OPT_STARTDATE,
+    OPT_ENDDATE,
+    OPT_CHECKEND,
+    OPT_CHECKHOST,
+    OPT_CHECKEMAIL,
+    OPT_CHECKIP,
+    OPT_NOOUT,
+    OPT_TRUSTOUT,
+    OPT_CLRTRUST,
+    OPT_CLRREJECT,
+    OPT_ALIAS,
+    OPT_CACREATESERIAL,
+    OPT_CLREXT,
+    OPT_OCSPID,
+    OPT_SUBJECT_HASH_OLD,
+    OPT_ISSUER_HASH_OLD,
+    OPT_COPY_EXTENSIONS,
+    OPT_BADSIG,
+    OPT_MD,
+    OPT_ENGINE,
+    OPT_NOCERT,
+    OPT_PRESERVE_DATES,
+    OPT_NOT_BEFORE,
+    OPT_NOT_AFTER,
+    OPT_R_ENUM,
+    OPT_PROV_ENUM,
+    OPT_EXT
 } OPTION_CHOICE;
 
 const OPTIONS x509_options[] = {
     OPT_SECTION("General"),
-    {"help", OPT_HELP, '-', "Display this summary"},
-
-    {"in", OPT_IN, '<',
-     "Certificate input, or CSR input file with -req (default stdin)"},
-    {"passin", OPT_PASSIN, 's', "Private key and cert file pass-phrase source"},
-    {"new", OPT_NEW, '-', "Generate a certificate from scratch"},
-    {"x509toreq", OPT_X509TOREQ, '-',
-     "Output a certification request (rather than a certificate)"},
-    {"req", OPT_REQ, '-', "Input is a CSR file (rather than a certificate)"},
-    {"copy_extensions", OPT_COPY_EXTENSIONS, 's',
-     "copy extensions when converting from CSR to x509 or vice versa"},
-    {"inform", OPT_INFORM, 'f',
-     "CSR input format to use (PEM or DER; by default try PEM first)"},
-    {"vfyopt", OPT_VFYOPT, 's', "CSR verification parameter in n:v form"},
-    {"key", OPT_KEY, 's',
-     "Key for signing, and to include unless using -force_pubkey"},
-    {"signkey", OPT_SIGNKEY, 's',
-     "Same as -key"},
-    {"keyform", OPT_KEYFORM, 'E',
-     "Key input format (ENGINE, other values ignored)"},
-    {"out", OPT_OUT, '>', "Output file - default stdout"},
-    {"outform", OPT_OUTFORM, 'f',
-     "Output format (DER or PEM) - default PEM"},
-    {"nocert", OPT_NOCERT, '-',
-     "No cert output (except for requested printing)"},
-    {"noout", OPT_NOOUT, '-', "No output (except for requested printing)"},
+    { "help", OPT_HELP, '-', "Display this summary" },
+
+    { "in", OPT_IN, '<',
+        "Certificate input, or CSR input file with -req (default stdin)" },
+    { "passin", OPT_PASSIN, 's', "Private key and cert file pass-phrase source" },
+    { "new", OPT_NEW, '-', "Generate a certificate from scratch" },
+    { "x509toreq", OPT_X509TOREQ, '-',
+        "Output a certification request (rather than a certificate)" },
+    { "req", OPT_REQ, '-', "Input is a CSR file (rather than a certificate)" },
+    { "copy_extensions", OPT_COPY_EXTENSIONS, 's',
+        "copy extensions when converting from CSR to x509 or vice versa" },
+    { "inform", OPT_INFORM, 'f',
+        "CSR input format to use (PEM or DER; by default try PEM first)" },
+    { "vfyopt", OPT_VFYOPT, 's', "CSR verification parameter in n:v form" },
+    { "key", OPT_KEY, 's',
+        "Key for signing, and to include unless using -force_pubkey" },
+    { "signkey", OPT_SIGNKEY, 's',
+        "Same as -key" },
+    { "keyform", OPT_KEYFORM, 'E',
+        "Key input format (ENGINE, other values ignored)" },
+    { "out", OPT_OUT, '>', "Output file - default stdout" },
+    { "outform", OPT_OUTFORM, 'f',
+        "Output format (DER or PEM) - default PEM" },
+    { "nocert", OPT_NOCERT, '-',
+        "No cert output (except for requested printing)" },
+    { "noout", OPT_NOOUT, '-', "No output (except for requested printing)" },
 
     OPT_SECTION("Certificate printing"),
-    {"text", OPT_TEXT, '-', "Print the certificate in text form"},
-    {"dateopt", OPT_DATEOPT, 's',
-     "Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822."},
-    {"certopt", OPT_CERTOPT, 's', "Various certificate text printing options"},
-    {"fingerprint", OPT_FINGERPRINT, '-', "Print the certificate fingerprint"},
-    {"alias", OPT_ALIAS, '-', "Print certificate alias"},
-    {"serial", OPT_SERIAL, '-', "Print serial number value"},
-    {"startdate", OPT_STARTDATE, '-', "Print the notBefore field"},
-    {"enddate", OPT_ENDDATE, '-', "Print the notAfter field"},
-    {"dates", OPT_DATES, '-', "Print both notBefore and notAfter fields"},
-    {"subject", OPT_SUBJECT, '-', "Print subject DN"},
-    {"issuer", OPT_ISSUER, '-', "Print issuer DN"},
-    {"nameopt", OPT_NAMEOPT, 's',
-     "Certificate subject/issuer name printing options"},
-    {"email", OPT_EMAIL, '-', "Print email address(es)"},
-    {"hash", OPT_HASH, '-', "Synonym for -subject_hash (for backward compat)"},
-    {"subject_hash", OPT_HASH, '-', "Print subject hash value"},
+    { "text", OPT_TEXT, '-', "Print the certificate in text form" },
+    { "dateopt", OPT_DATEOPT, 's',
+        "Datetime format used for printing. (rfc_822/iso_8601). Default is rfc_822." },
+    { "certopt", OPT_CERTOPT, 's', "Various certificate text printing options" },
+    { "fingerprint", OPT_FINGERPRINT, '-', "Print the certificate fingerprint" },
+    { "alias", OPT_ALIAS, '-', "Print certificate alias" },
+    { "serial", OPT_SERIAL, '-', "Print serial number value" },
+    { "startdate", OPT_STARTDATE, '-', "Print the notBefore field" },
+    { "enddate", OPT_ENDDATE, '-', "Print the notAfter field" },
+    { "dates", OPT_DATES, '-', "Print both notBefore and notAfter fields" },
+    { "subject", OPT_SUBJECT, '-', "Print subject DN" },
+    { "issuer", OPT_ISSUER, '-', "Print issuer DN" },
+    { "nameopt", OPT_NAMEOPT, 's',
+        "Certificate subject/issuer name printing options" },
+    { "email", OPT_EMAIL, '-', "Print email address(es)" },
+    { "hash", OPT_HASH, '-', "Synonym for -subject_hash (for backward compat)" },
+    { "subject_hash", OPT_HASH, '-', "Print subject hash value" },
 #ifndef OPENSSL_NO_MD5
-    {"subject_hash_old", OPT_SUBJECT_HASH_OLD, '-',
-     "Print old-style (MD5) subject hash value"},
+    { "subject_hash_old", OPT_SUBJECT_HASH_OLD, '-',
+        "Print old-style (MD5) subject hash value" },
 #endif
-    {"issuer_hash", OPT_ISSUER_HASH, '-', "Print issuer hash value"},
+    { "issuer_hash", OPT_ISSUER_HASH, '-', "Print issuer hash value" },
 #ifndef OPENSSL_NO_MD5
-    {"issuer_hash_old", OPT_ISSUER_HASH_OLD, '-',
-     "Print old-style (MD5) issuer hash value"},
+    { "issuer_hash_old", OPT_ISSUER_HASH_OLD, '-',
+        "Print old-style (MD5) issuer hash value" },
 #endif
-    {"ext", OPT_EXT, 's',
-     "Restrict which X.509 extensions to print and/or copy"},
-    {"ocspid", OPT_OCSPID, '-',
-     "Print OCSP hash values for the subject name and public key"},
-    {"ocsp_uri", OPT_OCSP_URI, '-', "Print OCSP Responder URL(s)"},
-    {"purpose", OPT_PURPOSE, '-', "Print out certificate purposes"},
-    {"pubkey", OPT_PUBKEY, '-', "Print the public key in PEM format"},
-    {"modulus", OPT_MODULUS, '-', "Print the RSA key modulus"},
+    { "ext", OPT_EXT, 's',
+        "Restrict which X.509 extensions to print and/or copy" },
+    { "ocspid", OPT_OCSPID, '-',
+        "Print OCSP hash values for the subject name and public key" },
+    { "ocsp_uri", OPT_OCSP_URI, '-', "Print OCSP Responder URL(s)" },
+    { "purpose", OPT_PURPOSE, '-', "Print out certificate purposes" },
+    { "pubkey", OPT_PUBKEY, '-', "Print the public key in PEM format" },
+    { "modulus", OPT_MODULUS, '-', "Print the RSA key modulus" },
 
     OPT_SECTION("Certificate checking"),
-    {"checkend", OPT_CHECKEND, 'M',
-     "Check whether cert expires in the next arg seconds"},
-    {OPT_MORE_STR, 1, 1, "Exit 1 (failure) if so, 0 if not"},
-    {"checkhost", OPT_CHECKHOST, 's', "Check certificate matches host"},
-    {"checkemail", OPT_CHECKEMAIL, 's', "Check certificate matches email"},
-    {"checkip", OPT_CHECKIP, 's', "Check certificate matches ipaddr"},
+    { "checkend", OPT_CHECKEND, 'M',
+        "Check whether cert expires in the next arg seconds" },
+    { OPT_MORE_STR, 1, 1, "Exit 1 (failure) if so, 0 if not" },
+    { "checkhost", OPT_CHECKHOST, 's', "Check certificate matches host" },
+    { "checkemail", OPT_CHECKEMAIL, 's', "Check certificate matches email" },
+    { "checkip", OPT_CHECKIP, 's', "Check certificate matches ipaddr" },
 
     OPT_SECTION("Certificate output"),
-    {"set_serial", OPT_SET_SERIAL, 's',
-     "Serial number to use, overrides -CAserial"},
-    {"next_serial", OPT_NEXT_SERIAL, '-',
-     "Increment current certificate serial number"},
-    {"not_before", OPT_NOT_BEFORE, 's',
-     "[CC]YYMMDDHHMMSSZ value for notBefore certificate field"},
-    {"not_after", OPT_NOT_AFTER, 's',
-     "[CC]YYMMDDHHMMSSZ value for notAfter certificate field, overrides -days"},
-    {"days", OPT_DAYS, 'n',
-     "Number of days until newly generated certificate expires - default 30"},
-    {"preserve_dates", OPT_PRESERVE_DATES, '-',
-     "Preserve existing validity dates"},
-    {"set_issuer", OPT_ISSU, 's', "Set or override certificate issuer"},
-    {"set_subject", OPT_SUBJ, 's', "Set or override certificate subject (and issuer)"},
-    {"subj", OPT_SUBJ, 's', "Alias for -set_subject"},
-    {"force_pubkey", OPT_FORCE_PUBKEY, '<',
-     "Key to be placed in new certificate or certificate request"},
-    {"clrext", OPT_CLREXT, '-',
-     "Do not take over any extensions from the source certificate or request"},
-    {"extfile", OPT_EXTFILE, '<', "Config file with X509V3 extensions to add"},
-    {"extensions", OPT_EXTENSIONS, 's',
-     "Section of extfile to use - default: unnamed section"},
-    {"sigopt", OPT_SIGOPT, 's', "Signature parameter, in n:v form"},
-    {"badsig", OPT_BADSIG, '-',
-     "Corrupt last byte of certificate signature (for test)"},
-    {"", OPT_MD, '-', "Any supported digest, used for signing and printing"},
+    { "set_serial", OPT_SET_SERIAL, 's',
+        "Serial number to use, overrides -CAserial" },
+    { "next_serial", OPT_NEXT_SERIAL, '-',
+        "Increment current certificate serial number" },
+    { "not_before", OPT_NOT_BEFORE, 's',
+        "[CC]YYMMDDHHMMSSZ value for notBefore certificate field" },
+    { "not_after", OPT_NOT_AFTER, 's',
+        "[CC]YYMMDDHHMMSSZ value for notAfter certificate field, overrides -days" },
+    { "days", OPT_DAYS, 'n',
+        "Number of days until newly generated certificate expires - default 30" },
+    { "preserve_dates", OPT_PRESERVE_DATES, '-',
+        "Preserve existing validity dates" },
+    { "set_issuer", OPT_ISSU, 's', "Set or override certificate issuer" },
+    { "set_subject", OPT_SUBJ, 's', "Set or override certificate subject (and issuer)" },
+    { "subj", OPT_SUBJ, 's', "Alias for -set_subject" },
+    { "force_pubkey", OPT_FORCE_PUBKEY, '<',
+        "Key to be placed in new certificate or certificate request" },
+    { "clrext", OPT_CLREXT, '-',
+        "Do not take over any extensions from the source certificate or request" },
+    { "extfile", OPT_EXTFILE, '<', "Config file with X509V3 extensions to add" },
+    { "extensions", OPT_EXTENSIONS, 's',
+        "Section of extfile to use - default: unnamed section" },
+    { "sigopt", OPT_SIGOPT, 's', "Signature parameter, in n:v form" },
+    { "badsig", OPT_BADSIG, '-',
+        "Corrupt last byte of certificate signature (for test)" },
+    { "", OPT_MD, '-', "Any supported digest, used for signing and printing" },
 
     OPT_SECTION("Micro-CA"),
-    {"CA", OPT_CA, '<',
-     "Use the given CA certificate, conflicts with -key"},
-    {"CAform", OPT_CAFORM, 'F', "CA cert format (PEM/DER/P12); has no effect"},
-    {"CAkey", OPT_CAKEY, 's', "The corresponding CA key; default is -CA arg"},
-    {"CAkeyform", OPT_CAKEYFORM, 'E',
-     "CA key format (ENGINE, other values ignored)"},
-    {"CAserial", OPT_CASERIAL, 's',
-     "File that keeps track of CA-generated serial number"},
-    {"CAcreateserial", OPT_CACREATESERIAL, '-',
-     "Create CA serial number file if it does not exist"},
+    { "CA", OPT_CA, '<',
+        "Use the given CA certificate, conflicts with -key" },
+    { "CAform", OPT_CAFORM, 'F', "CA cert format (PEM/DER/P12); has no effect" },
+    { "CAkey", OPT_CAKEY, 's', "The corresponding CA key; default is -CA arg" },
+    { "CAkeyform", OPT_CAKEYFORM, 'E',
+        "CA key format (ENGINE, other values ignored)" },
+    { "CAserial", OPT_CASERIAL, 's',
+        "File that keeps track of CA-generated serial number" },
+    { "CAcreateserial", OPT_CACREATESERIAL, '-',
+        "Create CA serial number file if it does not exist" },
 
     OPT_SECTION("Certificate trust output"),
-    {"trustout", OPT_TRUSTOUT, '-', "Mark certificate PEM output as trusted"},
-    {"setalias", OPT_SETALIAS, 's', "Set certificate alias (nickname)"},
-    {"clrtrust", OPT_CLRTRUST, '-', "Clear all trusted purposes"},
-    {"addtrust", OPT_ADDTRUST, 's', "Trust certificate for a given purpose"},
-    {"clrreject", OPT_CLRREJECT, '-',
-     "Clears all the prohibited or rejected uses of the certificate"},
-    {"addreject", OPT_ADDREJECT, 's',
-     "Reject certificate for a given purpose"},
+    { "trustout", OPT_TRUSTOUT, '-', "Mark certificate PEM output as trusted" },
+    { "setalias", OPT_SETALIAS, 's', "Set certificate alias (nickname)" },
+    { "clrtrust", OPT_CLRTRUST, '-', "Clear all trusted purposes" },
+    { "addtrust", OPT_ADDTRUST, 's', "Trust certificate for a given purpose" },
+    { "clrreject", OPT_CLRREJECT, '-',
+        "Clears all the prohibited or rejected uses of the certificate" },
+    { "addreject", OPT_ADDREJECT, 's',
+        "Reject certificate for a given purpose" },
 
     OPT_R_OPTIONS,
 #ifndef OPENSSL_NO_ENGINE
-    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
+    { "engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device" },
 #endif
     OPT_PROV_OPTIONS,
-    {NULL}
+    { NULL }
 };
 
 static void warn_copying(ASN1_OBJECT *excluded, const char *names)
@@ -195,8 +252,8 @@ static void warn_copying(ASN1_OBJECT *excluded, const char *names)
 
     if (names != NULL && strstr(names, sn) != NULL)
         BIO_printf(bio_err,
-                   "Warning: -ext should not specify copying %s extension to CSR; ignoring this\n",
-                   sn);
+            "Warning: -ext should not specify copying %s extension to CSR; ignoring this\n",
+            sn);
 }
 
 static X509_REQ *x509_to_req(X509 *cert, int ext_copy, const char *names)
@@ -224,13 +281,13 @@ static X509_REQ *x509_to_req(X509 *cert, int ext_copy, const char *names)
         ASN1_OBJECT *obj = X509_EXTENSION_get_object(ex);
 
         if (OBJ_cmp(obj, skid) != 0 && OBJ_cmp(obj, akid) != 0
-                && !sk_X509_EXTENSION_push(exts, ex))
+            && !sk_X509_EXTENSION_push(exts, ex))
             goto err;
     }
 
     if (sk_X509_EXTENSION_num(exts) > 0) {
         if (ext_copy != EXT_COPY_UNSET && ext_copy != EXT_COPY_NONE
-                && !X509_REQ_add_extensions(req, exts)) {
+            && !X509_REQ_add_extensions(req, exts)) {
             BIO_printf(bio_err, "Error copying extensions from certificate\n");
             goto err;
         }
@@ -238,7 +295,7 @@ static X509_REQ *x509_to_req(X509 *cert, int ext_copy, const char *names)
     sk_X509_EXTENSION_free(exts);
     return req;
 
- err:
+err:
     sk_X509_EXTENSION_free(exts);
     X509_REQ_free(req);
     return NULL;
@@ -317,7 +374,7 @@ int x509_main(int argc, char **argv)
         switch (o) {
         case OPT_EOF:
         case OPT_ERR:
- opthelp:
+        opthelp:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             goto err;
         case OPT_HELP:
@@ -357,14 +414,14 @@ int x509_main(int argc, char **argv)
         case OPT_DATEOPT:
             if (!set_dateopt(&dateopt, opt_arg())) {
                 BIO_printf(bio_err,
-                           "Invalid date format: %s\n", opt_arg());
+                    "Invalid date format: %s\n", opt_arg());
                 goto err;
             }
             break;
         case OPT_COPY_EXTENSIONS:
             if (!set_ext_copy(&ext_copy, opt_arg())) {
                 BIO_printf(bio_err,
-                           "Invalid extension copy option: %s\n", opt_arg());
+                    "Invalid extension copy option: %s\n", opt_arg());
                 goto err;
             }
             break;
@@ -391,7 +448,7 @@ int x509_main(int argc, char **argv)
             days = atoi(opt_arg());
             if (days <= UNSET_DAYS) {
                 BIO_printf(bio_err, "%s: -days parameter arg must be >= -1\n",
-                           prog);
+                    prog);
                 goto err;
             }
             break;
@@ -447,26 +504,26 @@ int x509_main(int argc, char **argv)
             break;
         case OPT_ADDTRUST:
             if (trust == NULL && (trust = sk_ASN1_OBJECT_new_null()) == NULL)
-                goto end;
+                goto err;
             if ((objtmp = OBJ_txt2obj(opt_arg(), 0)) == NULL) {
                 BIO_printf(bio_err, "%s: Invalid trust object value %s\n",
-                           prog, opt_arg());
+                    prog, opt_arg());
                 goto opthelp;
             }
             if (!sk_ASN1_OBJECT_push(trust, objtmp))
-                goto end;
+                goto err;
             trustout = 1;
             break;
         case OPT_ADDREJECT:
             if (reject == NULL && (reject = sk_ASN1_OBJECT_new_null()) == NULL)
-                goto end;
+                goto err;
             if ((objtmp = OBJ_txt2obj(opt_arg(), 0)) == NULL) {
                 BIO_printf(bio_err, "%s: Invalid reject object value %s\n",
-                           prog, opt_arg());
+                    prog, opt_arg());
                 goto opthelp;
             }
-            if (!sk_ASN1_OBJECT_push(trust, objtmp))
-                goto end;
+            if (!sk_ASN1_OBJECT_push(reject, objtmp))
+                goto err;
             trustout = 1;
             break;
         case OPT_SETALIAS:
@@ -591,7 +648,7 @@ int x509_main(int argc, char **argv)
                 checkoffset = (time_t)temp;
                 if ((ossl_intmax_t)checkoffset != temp) {
                     BIO_printf(bio_err, "%s: Checkend time out of range %s\n",
-                               prog, opt_arg());
+                        prog, opt_arg());
                     goto opthelp;
                 }
             }
@@ -618,7 +675,7 @@ int x509_main(int argc, char **argv)
         goto opthelp;
 
     if (!app_RAND_load())
-        goto end;
+        goto err;
 
     if (!opt_check_md(digest))
         goto opthelp;
@@ -646,8 +703,8 @@ int x509_main(int argc, char **argv)
     }
 
     if (!X509_STORE_set_default_paths_ex(ctx, app_get0_libctx(),
-                                         app_get0_propq()))
-        goto end;
+            app_get0_propq()))
+        goto err;
 
     if (newcert && infile != NULL) {
         BIO_printf(bio_err, "The -in option cannot be used with -new\n");
@@ -660,32 +717,33 @@ int x509_main(int argc, char **argv)
     if (privkeyfile != NULL) {
         privkey = load_key(privkeyfile, keyformat, 0, passin, e, "private key");
         if (privkey == NULL)
-            goto end;
+            goto err;
     }
     if (pubkeyfile != NULL) {
         if ((pubkey = load_pubkey(pubkeyfile, keyformat, 0, NULL, e,
-                                  "explicitly set public key")) == NULL)
-            goto end;
+                 "explicitly set public key"))
+            == NULL)
+            goto err;
     }
 
     if (newcert) {
         if (subj == NULL) {
             BIO_printf(bio_err,
-                       "The -new option requires a subject to be set using -subj\n");
+                "The -new option requires a subject to be set using -subj\n");
             goto err;
         }
         if (privkeyfile == NULL && pubkeyfile == NULL) {
             BIO_printf(bio_err,
-                       "The -new option requires using the -key or -force_pubkey option\n");
+                "The -new option requires using the -key or -force_pubkey option\n");
             goto err;
         }
     }
     if (issu != NULL
-            && (fissu = parse_name(issu, chtype, multirdn, "issuer")) == NULL)
-        goto end;
+        && (fissu = parse_name(issu, chtype, multirdn, "issuer")) == NULL)
+        goto err;
     if (subj != NULL
-            && (fsubj = parse_name(subj, chtype, multirdn, "subject")) == NULL)
-        goto end;
+        && (fsubj = parse_name(subj, chtype, multirdn, "subject")) == NULL)
+        goto err;
 
     if (CAkeyfile == NULL)
         CAkeyfile = CAfile;
@@ -696,7 +754,7 @@ int x509_main(int argc, char **argv)
         }
     } else {
 #define WARN_NO_CA(opt) BIO_printf(bio_err, \
-        "Warning: ignoring " opt " option since -CA option is not given\n");
+    "Warning: ignoring " opt " option since -CA option is not given\n");
         if (CAkeyfile != NULL)
             WARN_NO_CA("-CAkey");
         if (CAkeyformat != FORMAT_UNDEF)
@@ -712,12 +770,12 @@ int x509_main(int argc, char **argv)
     if (extfile == NULL) {
         if (extsect != NULL)
             BIO_printf(bio_err,
-                       "Warning: ignoring -extensions option without -extfile\n");
+                "Warning: ignoring -extensions option without -extfile\n");
     } else {
         X509V3_CTX ctx2;
 
         if ((extconf = app_load_config(extfile)) == NULL)
-            goto end;
+            goto err;
         if (extsect == NULL) {
             extsect = app_conf_try_string(extconf, "default", "extensions");
             if (extsect == NULL)
@@ -727,7 +785,7 @@ int x509_main(int argc, char **argv)
         X509V3_set_nconf(&ctx2, extconf);
         if (!X509V3_EXT_add_nconf(extconf, &ctx2, extsect, NULL)) {
             BIO_printf(bio_err,
-                       "Error checking extension section %s\n", extsect);
+                "Error checking extension section %s\n", extsect);
             goto err;
         }
     }
@@ -735,11 +793,11 @@ int x509_main(int argc, char **argv)
     if (reqfile) {
         if (infile == NULL && isatty(fileno_stdin()))
             BIO_printf(bio_err,
-                       "Warning: Reading cert request from stdin since no -in option is given\n");
+                "Warning: Reading cert request from stdin since no -in option is given\n");
         req = load_csr_autofmt(infile, informat, vfyopts,
-                               "certificate request input");
+            "certificate request input");
         if (req == NULL)
-            goto end;
+            goto err;
 
         if ((pkey = X509_REQ_get0_pubkey(req)) == NULL) {
             BIO_printf(bio_err, "Error unpacking public key from CSR\n");
@@ -747,9 +805,7 @@ int x509_main(int argc, char **argv)
         }
         i = do_X509_REQ_verify(req, pkey, vfyopts);
         if (i <= 0) {
-            BIO_printf(bio_err, i < 0
-                       ? "Error while verifying certificate request self-signature\n"
-                       : "Certificate request self-signature did not match the contents\n");
+            BIO_printf(bio_err, i < 0 ? "Error while verifying certificate request self-signature\n" : "Certificate request self-signature did not match the contents\n");
             goto err;
         }
         BIO_printf(bio_err, "Certificate request self-signature ok\n");
@@ -762,19 +818,19 @@ int x509_main(int argc, char **argv)
     if (reqfile || newcert) {
         if (preserve_dates)
             BIO_printf(bio_err,
-                       "Warning: ignoring -preserve_dates option with -req or -new\n");
+                "Warning: ignoring -preserve_dates option with -req or -new\n");
         preserve_dates = 0;
         if (privkeyfile == NULL && CAkeyfile == NULL) {
             BIO_printf(bio_err,
-                       "We need a private key to sign with, use -key or -CAkey or -CA with private key\n");
+                "We need a private key to sign with, use -key or -CAkey or -CA with private key\n");
             goto err;
         }
         if ((x = X509_new_ex(app_get0_libctx(), app_get0_propq())) == NULL)
-            goto end;
+            goto err;
         if (CAfile == NULL && sno == NULL) {
             sno = ASN1_INTEGER_new();
             if (sno == NULL || !rand_serial(NULL, sno))
-                goto end;
+                goto err;
         }
         if (req != NULL && ext_copy != EXT_COPY_UNSET) {
             if (clrext && ext_copy != EXT_COPY_NONE) {
@@ -788,30 +844,28 @@ int x509_main(int argc, char **argv)
     } else {
         if (infile == NULL && isatty(fileno_stdin()))
             BIO_printf(bio_err,
-                       "Warning: Reading certificate from stdin since no -in or -new option is given\n");
+                "Warning: Reading certificate from stdin since no -in or -new option is given\n");
         x = load_cert_pass(infile, informat, 1, passin, "certificate");
         if (x == NULL)
-            goto end;
+            goto err;
     }
     if ((fsubj != NULL || req != NULL)
-        && !X509_set_subject_name(x, fsubj != NULL ? fsubj :
-                                  X509_REQ_get_subject_name(req)))
-        goto end;
+        && !X509_set_subject_name(x, fsubj != NULL ? fsubj : X509_REQ_get_subject_name(req)))
+        goto err;
     if ((pubkey != NULL || privkey != NULL || req != NULL)
-        && !X509_set_pubkey(x, pubkey != NULL ? pubkey :
-                            privkey != NULL ? privkey :
-                            X509_REQ_get0_pubkey(req)))
-        goto end;
+        && !X509_set_pubkey(x, pubkey != NULL ? pubkey : privkey != NULL ? privkey
+                                                                         : X509_REQ_get0_pubkey(req)))
+        goto err;
 
     if (CAfile != NULL) {
         xca = load_cert_pass(CAfile, CAformat, 1, passin, "CA certificate");
         if (xca == NULL)
-            goto end;
+            goto err;
     }
 
     out = bio_open_default(outfile, 'w', outformat);
     if (out == NULL)
-        goto end;
+        goto err;
 
     if (alias)
         X509_alias_set1(x, (unsigned char *)alias, -1);
@@ -847,27 +901,27 @@ int x509_main(int argc, char **argv)
         if (sno == NULL)
             sno = x509_load_serial(CAfile, CAserial, CA_createserial);
         if (sno == NULL)
-            goto end;
+            goto err;
         if (!x509toreq && !reqfile && !newcert && !self_signed(ctx, x))
-            goto end;
+            goto err;
     } else {
         if (privkey != NULL && !cert_matches_key(x, privkey))
             BIO_printf(bio_err,
-                       "Warning: Signature key and public key of cert do not match\n");
+                "Warning: Signature key and public key of cert do not match\n");
     }
 
     if (sno != NULL && !X509_set_serialNumber(x, sno))
-        goto end;
+        goto err;
 
     if (reqfile || newcert || privkey != NULL || CAfile != NULL) {
         if (!preserve_dates && !set_cert_times(x, not_before, not_after, days, 1))
-            goto end;
+            goto err;
         if (fissu != NULL) {
             if (!X509_set_issuer_name(x, fissu))
-                goto end;
+                goto err;
         } else {
             if (!X509_set_issuer_name(x, X509_get_subject_name(issuer_cert)))
-                goto end;
+                goto err;
         }
     }
 
@@ -875,13 +929,13 @@ int x509_main(int argc, char **argv)
     /* prepare fallback for AKID, but only if issuer cert equals subject cert */
     if (CAfile == NULL) {
         if (!X509V3_set_issuer_pkey(&ext_ctx, privkey))
-            goto end;
+            goto err;
     }
     if (extconf != NULL && !x509toreq) {
         X509V3_set_nconf(&ext_ctx, extconf);
         if (!X509V3_EXT_add_nconf(extconf, &ext_ctx, extsect, x)) {
             BIO_printf(bio_err,
-                       "Error adding extensions from section %s\n", extsect);
+                "Error adding extensions from section %s\n", extsect);
             goto err;
         }
     }
@@ -904,17 +958,17 @@ int x509_main(int argc, char **argv)
             goto err;
         }
         if ((rq = x509_to_req(x, ext_copy, ext_names)) == NULL)
-            goto end;
+            goto err;
         if (extconf != NULL) {
             X509V3_set_nconf(&ext_ctx, extconf);
             if (!X509V3_EXT_REQ_add_nconf(extconf, &ext_ctx, extsect, rq)) {
                 BIO_printf(bio_err,
-                           "Error adding request extensions from section %s\n", extsect);
+                    "Error adding request extensions from section %s\n", extsect);
                 goto err;
             }
         }
         if (!do_X509_REQ_sign(rq, privkey, digest, sigopts))
-            goto end;
+            goto err;
         if (!noout) {
             if (outformat == FORMAT_ASN1) {
                 X509_REQ_print_ex(out, rq, get_nameopt(), X509_FLAG_COMPAT);
@@ -924,26 +978,27 @@ int x509_main(int argc, char **argv)
             }
             if (!i) {
                 BIO_printf(bio_err,
-                           "Unable to write certificate request\n");
+                    "Unable to write certificate request\n");
                 goto err;
             }
         }
         noout = 1;
     } else if (CAfile != NULL) {
         if ((CAkey = load_key(CAkeyfile, CAkeyformat,
-                              0, passin, e, "CA private key")) == NULL)
-            goto end;
+                 0, passin, e, "CA private key"))
+            == NULL)
+            goto err;
         if (!X509_check_private_key(xca, CAkey)) {
             BIO_printf(bio_err,
-                       "CA certificate and CA private key do not match\n");
+                "CA certificate and CA private key do not match\n");
             goto err;
         }
 
         if (!do_X509_sign(x, 0, CAkey, digest, sigopts, &ext_ctx))
-            goto end;
+            goto err;
     } else if (privkey != NULL) {
         if (!do_X509_sign(x, 0, privkey, digest, sigopts, &ext_ctx))
-            goto end;
+            goto err;
     }
     if (badsig) {
         const ASN1_BIT_STRING *signature;
@@ -967,19 +1022,18 @@ int x509_main(int argc, char **argv)
             BIGNUM *bnser = ASN1_INTEGER_to_BN(X509_get0_serialNumber(x), NULL);
 
             if (bnser == NULL)
-                goto end;
+                goto err;
             if (!BN_add_word(bnser, 1)
-                    || (ser = BN_to_ASN1_INTEGER(bnser, NULL)) == NULL) {
+                || (ser = BN_to_ASN1_INTEGER(bnser, NULL)) == NULL) {
                 BN_free(bnser);
-                goto end;
+                goto err;
             }
             BN_free(bnser);
             i2a_ASN1_INTEGER(out, ser);
             ASN1_INTEGER_free(ser);
             BIO_puts(out, "\n");
         } else if (i == email || i == ocsp_uri) {
-            STACK_OF(OPENSSL_STRING) *emlst =
-                i == email ? X509_get1_email(x) : X509_get1_ocsp(x);
+            STACK_OF(OPENSSL_STRING) *emlst = i == email ? X509_get1_email(x) : X509_get1_ocsp(x);
 
             for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++)
                 BIO_printf(out, "%s\n", sk_OPENSSL_STRING_value(emlst, j));
@@ -1050,7 +1104,8 @@ int x509_main(int argc, char **argv)
                 fdigname = "SHA1";
 
             if ((fdig = EVP_MD_fetch(app_get0_libctx(), fdigname,
-                                     app_get0_propq())) == NULL) {
+                     app_get0_propq()))
+                == NULL) {
                 BIO_printf(bio_err, "Unknown digest\n");
                 goto err;
             }
@@ -1109,10 +1164,10 @@ int x509_main(int argc, char **argv)
     ret = 0;
     goto end;
 
- err:
+err:
     ERR_print_errors(bio_err);
 
- end:
+end:
     NCONF_free(extconf);
     BIO_free_all(out);
     X509_STORE_free(ctx);
@@ -1136,7 +1191,7 @@ int x509_main(int argc, char **argv)
 }
 
 static ASN1_INTEGER *x509_load_serial(const char *CAfile,
-                                      const char *serialfile, int create)
+    const char *serialfile, int create)
 {
     char *buf = NULL;
     ASN1_INTEGER *bs = NULL;
@@ -1168,7 +1223,7 @@ static ASN1_INTEGER *x509_load_serial(const char *CAfile,
     else
         bs = BN_to_ASN1_INTEGER(serial, NULL);
 
- end:
+end:
     OPENSSL_free(buf);
     BN_free(serial);
     return bs;
@@ -1191,9 +1246,9 @@ static int callb(int ok, X509_STORE_CTX *ctx)
         err_cert = X509_STORE_CTX_get_current_cert(ctx);
         print_name(bio_err, "subject=", X509_get_subject_name(err_cert));
         BIO_printf(bio_err,
-                   "Error with certificate - error %d at depth %d\n%s\n", err,
-                   X509_STORE_CTX_get_error_depth(ctx),
-                   X509_verify_cert_error_string(err));
+            "Error with certificate - error %d at depth %d\n%s\n", err,
+            X509_STORE_CTX_get_error_depth(ctx),
+            X509_verify_cert_error_string(err));
         return 1;
     }
 
@@ -1302,7 +1357,7 @@ static int print_x509v3_exts(BIO *bio, X509 *x, const char *ext_names)
     }
 
     ret = X509V3_extensions_print(bio, NULL, exts2, 0, 0);
- end:
+end:
     sk_X509_EXTENSION_free(exts2);
     OPENSSL_free(names);
     OPENSSL_free(tmp_ext_names);
diff --git a/crypto/LPdir_nyi.c b/crypto/LPdir_nyi.c
index a1540785f87d4..a56f2edd92a1f 100644
--- a/crypto/LPdir_nyi.c
+++ b/crypto/LPdir_nyi.c
@@ -37,7 +37,7 @@
  */
 
 #ifndef LPDIR_H
-# include "LPdir.h"
+#include "LPdir.h"
 #endif
 
 struct LP_dir_context_st {
diff --git a/crypto/LPdir_unix.c b/crypto/LPdir_unix.c
index b6dda7bce2eca..c3a321fe1bc41 100644
--- a/crypto/LPdir_unix.c
+++ b/crypto/LPdir_unix.c
@@ -44,10 +44,10 @@
 #include <dirent.h>
 #include <errno.h>
 #ifndef LPDIR_H
-# include "LPdir.h"
+#include "LPdir.h"
 #endif
 #ifdef __VMS
-# include <ctype.h>
+#include <ctype.h>
 #endif
 
 /*
@@ -57,9 +57,9 @@
  * if it doesn't exist, use NAME_MAX.
  */
 #if defined(PATH_MAX)
-# define LP_ENTRY_SIZE PATH_MAX
+#define LP_ENTRY_SIZE PATH_MAX
 #elif defined(NAME_MAX)
-# define LP_ENTRY_SIZE NAME_MAX
+#define LP_ENTRY_SIZE NAME_MAX
 #endif
 
 /*
@@ -68,9 +68,9 @@
  * small value (HP-UX offers 14), so we need to check if we got a result, and
  * if it meets a minimum standard, and create or change it if not.
  */
-#if !defined(LP_ENTRY_SIZE) || LP_ENTRY_SIZE<255
-# undef LP_ENTRY_SIZE
-# define LP_ENTRY_SIZE 255
+#if !defined(LP_ENTRY_SIZE) || LP_ENTRY_SIZE < 255
+#undef LP_ENTRY_SIZE
+#define LP_ENTRY_SIZE 255
 #endif
 
 struct LP_dir_context_st {
@@ -121,9 +121,9 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
 
 #ifdef __VMS
     strncpy((*ctx)->previous_entry_name, (*ctx)->entry_name,
-            sizeof((*ctx)->previous_entry_name));
+        sizeof((*ctx)->previous_entry_name));
 
- again:
+again:
 #endif
 
     direntry = readdir((*ctx)->dir);
@@ -132,7 +132,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
     }
 
     OPENSSL_strlcpy((*ctx)->entry_name, direntry->d_name,
-                    sizeof((*ctx)->entry_name));
+        sizeof((*ctx)->entry_name));
 #ifdef __VMS
     if ((*ctx)->expect_file_generations) {
         char *p = (*ctx)->entry_name + strlen((*ctx)->entry_name);
@@ -142,7 +142,8 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
         if (p > (*ctx)->entry_name && p[-1] == ';')
             p[-1] = '\0';
         if (OPENSSL_strcasecmp((*ctx)->entry_name,
-                               (*ctx)->previous_entry_name) == 0)
+                (*ctx)->previous_entry_name)
+            == 0)
             goto again;
     }
 #endif
diff --git a/crypto/LPdir_vms.c b/crypto/LPdir_vms.c
index 51043263ae670..4f89657179b6f 100644
--- a/crypto/LPdir_vms.c
+++ b/crypto/LPdir_vms.c
@@ -49,13 +49,13 @@
 #include <str$routines.h>
 #include <stsdef.h>
 #ifndef LPDIR_H
-# include "LPdir.h"
+#include "LPdir.h"
 #endif
 #include "vms_rms.h"
 
 /* Some compiler options hide EVMSERR. */
 #ifndef EVMSERR
-# define EVMSERR        65535   /* error for non-translatable VMS errors */
+#define EVMSERR 65535 /* error for non-translatable VMS errors */
 #endif
 
 struct LP_dir_context_st {
@@ -75,12 +75,12 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
 
 /* Arrange 32-bit pointer to (copied) string storage, if needed. */
 #if __INITIAL_POINTER_SIZE == 64
-# pragma pointer_size save
-# pragma pointer_size 32
+#pragma pointer_size save
+#pragma pointer_size 32
     char *ctx_filespec_32p;
-# pragma pointer_size restore
+#pragma pointer_size restore
     char ctx_filespec_32[NAMX_MAXRSS + 1];
-#endif                          /* __INITIAL_POINTER_SIZE == 64 */
+#endif /* __INITIAL_POINTER_SIZE == 64 */
 
 #ifdef NAML$C_MAXRSS
     flags |= LIB$M_FIL_LONG_NAMES;
@@ -109,7 +109,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
             return 0;
         }
 
-        filespeclen += 4;       /* "*.*;" */
+        filespeclen += 4; /* "*.*;" */
 
         if (filespeclen > NAMX_MAXRSS) {
             errno = ENAMETOOLONG;
@@ -128,13 +128,13 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
 
 /* Arrange 32-bit pointer to (copied) string storage, if needed. */
 #if __INITIAL_POINTER_SIZE == 64
-# define CTX_FILESPEC ctx_filespec_32p
+#define CTX_FILESPEC ctx_filespec_32p
         /* Copy the file name to storage with a 32-bit pointer. */
         ctx_filespec_32p = ctx_filespec_32;
         strcpy(ctx_filespec_32p, (*ctx)->filespec);
-#else                           /* __INITIAL_POINTER_SIZE == 64 */
-# define CTX_FILESPEC (*ctx)->filespec
-#endif                          /* __INITIAL_POINTER_SIZE == 64 [else] */
+#else /* __INITIAL_POINTER_SIZE == 64 */
+#define CTX_FILESPEC (*ctx)->filespec
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
 
         (*ctx)->filespec_dsc.dsc$w_length = filespeclen;
         (*ctx)->filespec_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
@@ -148,7 +148,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
     (*ctx)->result_dsc.dsc$a_pointer = 0;
 
     status = lib$find_file(&(*ctx)->filespec_dsc, &(*ctx)->result_dsc,
-                           &(*ctx)->VMS_context, 0, 0, 0, &flags);
+        &(*ctx)->VMS_context, 0, 0, 0, &flags);
 
     if (status == RMS$_NMF) {
         errno = 0;
diff --git a/crypto/LPdir_win.c b/crypto/LPdir_win.c
index 83cbe1fc09071..0b7504ce9de02 100644
--- a/crypto/LPdir_win.c
+++ b/crypto/LPdir_win.c
@@ -40,7 +40,7 @@
 #include <tchar.h>
 #include "internal/numbers.h"
 #ifndef LPDIR_H
-# include "LPdir.h"
+#include "LPdir.h"
 #endif
 
 /*
@@ -49,20 +49,20 @@
  * builds are compiled with -DUNICODE [as well as -D_UNICODE].
  */
 #if defined(LP_SYS_WINCE) && !defined(FindFirstFile)
-# define FindFirstFile FindFirstFileW
+#define FindFirstFile FindFirstFileW
 #endif
 #if defined(LP_SYS_WINCE) && !defined(FindNextFile)
-# define FindNextFile FindNextFileW
+#define FindNextFile FindNextFileW
 #endif
 
 #ifndef NAME_MAX
-# define NAME_MAX 255
+#define NAME_MAX 255
 #endif
 
 #ifdef CP_UTF8
-# define CP_DEFAULT CP_UTF8
+#define CP_DEFAULT CP_UTF8
 #else
-# define CP_DEFAULT CP_ACP
+#define CP_DEFAULT CP_ACP
 #endif
 
 struct LP_dir_context_st {
@@ -103,16 +103,17 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
             UINT cp;
 
             do {
-# ifdef CP_UTF8
+#ifdef CP_UTF8
                 if ((sz = MultiByteToWideChar((cp = CP_UTF8), 0,
-                                              directory, len_0,
-                                              NULL, 0)) > 0 ||
-                    GetLastError() != ERROR_NO_UNICODE_TRANSLATION)
+                         directory, len_0,
+                         NULL, 0))
+                        > 0
+                    || GetLastError() != ERROR_NO_UNICODE_TRANSLATION)
                     break;
-# endif
+#endif
                 sz = MultiByteToWideChar((cp = CP_ACP), 0,
-                                         directory, len_0,
-                                         NULL, 0);
+                    directory, len_0,
+                    NULL, 0);
             } while (0);
 
             if (sz > 0) {
@@ -122,7 +123,7 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
                  */
                 wdir = _alloca((sz + 2) * sizeof(TCHAR));
                 if (!MultiByteToWideChar(cp, 0, directory, len_0,
-                                         (WCHAR *)wdir, sz)) {
+                        (WCHAR *)wdir, sz)) {
                     free(*ctx);
                     *ctx = NULL;
                     errno = EINVAL;
@@ -187,14 +188,14 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
 
 #ifdef LP_MULTIBYTE_AVAILABLE
         if (!WideCharToMultiByte(CP_DEFAULT, 0, (WCHAR *)wdir, len_0,
-                                 (*ctx)->entry_name,
-                                 sizeof((*ctx)->entry_name), NULL, 0))
+                (*ctx)->entry_name,
+                sizeof((*ctx)->entry_name), NULL, 0))
 #endif
             for (index = 0; index < len_0; index++)
                 (*ctx)->entry_name[index] = (char)wdir[index];
     } else
         strncpy((*ctx)->entry_name, (const char *)(*ctx)->ctx.cFileName,
-                sizeof((*ctx)->entry_name) - 1);
+            sizeof((*ctx)->entry_name) - 1);
 
     (*ctx)->entry_name[sizeof((*ctx)->entry_name) - 1] = '\0';
 
diff --git a/crypto/LPdir_win32.c b/crypto/LPdir_win32.c
index b29e096ff30f9..33b8261774c4c 100644
--- a/crypto/LPdir_win32.c
+++ b/crypto/LPdir_win32.c
@@ -38,4 +38,6 @@
 
 #define LP_SYS_WIN32
 #define LP_MULTIBYTE_AVAILABLE
+/* clang-format off */
 #include "LPdir_win.c"
+/* clang-format on */
diff --git a/crypto/LPdir_wince.c b/crypto/LPdir_wince.c
index ebf89628272a5..e4c883dcefe46 100644
--- a/crypto/LPdir_wince.c
+++ b/crypto/LPdir_wince.c
@@ -41,4 +41,6 @@
  * We might want to define LP_MULTIBYTE_AVAILABLE here.  It's currently under
  * investigation what the exact conditions would be
  */
+/* clang-format off */
 #include "LPdir_win.c"
+/* clang-format on */
diff --git a/crypto/aes/aes_cbc.c b/crypto/aes/aes_cbc.c
index f2d5381b86d79..a933fc50e5dda 100644
--- a/crypto/aes/aes_cbc.c
+++ b/crypto/aes/aes_cbc.c
@@ -18,14 +18,14 @@
 #include <openssl/modes.h>
 
 void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t len, const AES_KEY *key,
-                     unsigned char *ivec, const int enc)
+    size_t len, const AES_KEY *key,
+    unsigned char *ivec, const int enc)
 {
 
     if (enc)
         CRYPTO_cbc128_encrypt(in, out, len, key, ivec,
-                              (block128_f) AES_encrypt);
+            (block128_f)AES_encrypt);
     else
         CRYPTO_cbc128_decrypt(in, out, len, key, ivec,
-                              (block128_f) AES_decrypt);
+            (block128_f)AES_decrypt);
 }
diff --git a/crypto/aes/aes_cfb.c b/crypto/aes/aes_cfb.c
index e5fcbb87f6090..e6a184a19f519 100644
--- a/crypto/aes/aes_cfb.c
+++ b/crypto/aes/aes_cfb.c
@@ -23,27 +23,27 @@
  */
 
 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)
 {
 
     CRYPTO_cfb128_encrypt(in, out, length, key, ivec, num, enc,
-                          (block128_f) AES_encrypt);
+        (block128_f)AES_encrypt);
 }
 
 /* N.B. This expects the input to be packed, MS bit first */
 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)
 {
     CRYPTO_cfb128_1_encrypt(in, out, length, key, ivec, num, enc,
-                            (block128_f) AES_encrypt);
+        (block128_f)AES_encrypt);
 }
 
 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)
 {
     CRYPTO_cfb128_8_encrypt(in, out, length, key, ivec, num, enc,
-                            (block128_f) AES_encrypt);
+        (block128_f)AES_encrypt);
 }
diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index 3413ce8f4378a..b376e7e47d59f 100644
--- a/crypto/aes/aes_core.c
+++ b/crypto/aes/aes_core.c
@@ -52,13 +52,13 @@
 
 #if defined(OPENSSL_AES_CONST_TIME) && !defined(AES_ASM)
 
-# if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#  define U64(C) C##UI64
-# elif defined(__arch64__)
-#  define U64(C) C##UL
-# else
-#  define U64(C) C##ULL
-# endif
+#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
+#define U64(C) C##UI64
+#elif defined(__arch64__)
+#define U64(C) C##UL
+#else
+#define U64(C) C##ULL
+#endif
 
 typedef union {
     unsigned char b[8];
@@ -430,14 +430,14 @@ static void ShiftRows(u64 *state)
 
     s0 = (unsigned char *)state;
     for (r = 0; r < 4; r++) {
-        s[0] = s0[0*4 + r];
-        s[1] = s0[1*4 + r];
-        s[2] = s0[2*4 + r];
-        s[3] = s0[3*4 + r];
-        s0[0*4 + r] = s[(r+0) % 4];
-        s0[1*4 + r] = s[(r+1) % 4];
-        s0[2*4 + r] = s[(r+2) % 4];
-        s0[3*4 + r] = s[(r+3) % 4];
+        s[0] = s0[0 * 4 + r];
+        s[1] = s0[1 * 4 + r];
+        s[2] = s0[2 * 4 + r];
+        s[3] = s0[3 * 4 + r];
+        s0[0 * 4 + r] = s[(r + 0) % 4];
+        s0[1 * 4 + r] = s[(r + 1) % 4];
+        s0[2 * 4 + r] = s[(r + 2) % 4];
+        s0[3 * 4 + r] = s[(r + 3) % 4];
     }
 }
 
@@ -449,14 +449,14 @@ static void InvShiftRows(u64 *state)
 
     s0 = (unsigned char *)state;
     for (r = 0; r < 4; r++) {
-        s[0] = s0[0*4 + r];
-        s[1] = s0[1*4 + r];
-        s[2] = s0[2*4 + r];
-        s[3] = s0[3*4 + r];
-        s0[0*4 + r] = s[(4-r) % 4];
-        s0[1*4 + r] = s[(5-r) % 4];
-        s0[2*4 + r] = s[(6-r) % 4];
-        s0[3*4 + r] = s[(7-r) % 4];
+        s[0] = s0[0 * 4 + r];
+        s[1] = s0[1 * 4 + r];
+        s[2] = s0[2 * 4 + r];
+        s[3] = s0[3 * 4 + r];
+        s0[0 * 4 + r] = s[(4 - r) % 4];
+        s0[1 * 4 + r] = s[(5 - r) % 4];
+        s0[2 * 4 + r] = s[(6 - r) % 4];
+        s0[3 * 4 + r] = s[(7 - r) % 4];
     }
 }
 
@@ -470,9 +470,9 @@ static void MixColumns(u64 *state)
         s1.d = state[c];
         s.d = s1.d;
         s.d ^= ((s.d & U64(0xFFFF0000FFFF0000)) >> 16)
-               | ((s.d & U64(0x0000FFFF0000FFFF)) << 16);
+            | ((s.d & U64(0x0000FFFF0000FFFF)) << 16);
         s.d ^= ((s.d & U64(0xFF00FF00FF00FF00)) >> 8)
-               | ((s.d & U64(0x00FF00FF00FF00FF)) << 8);
+            | ((s.d & U64(0x00FF00FF00FF00FF)) << 8);
         s.d ^= s1.d;
         XtimeLong(&s1.d);
         s.d ^= s1.d;
@@ -498,9 +498,9 @@ static void InvMixColumns(u64 *state)
         s1.d = state[c];
         s.d = s1.d;
         s.d ^= ((s.d & U64(0xFFFF0000FFFF0000)) >> 16)
-               | ((s.d & U64(0x0000FFFF0000FFFF)) << 16);
+            | ((s.d & U64(0x0000FFFF0000FFFF)) << 16);
         s.d ^= ((s.d & U64(0xFF00FF00FF00FF00)) >> 8)
-               | ((s.d & U64(0x00FF00FF00FF00FF)) << 8);
+            | ((s.d & U64(0x00FF00FF00FF00FF)) << 8);
         s.d ^= s1.d;
         XtimeLong(&s1.d);
         s.d ^= s1.d;
@@ -514,11 +514,11 @@ static void InvMixColumns(u64 *state)
         s.b[7] ^= s1.b[4];
         XtimeLong(&s1.d);
         s1.d ^= ((s1.d & U64(0xFFFF0000FFFF0000)) >> 16)
-                | ((s1.d & U64(0x0000FFFF0000FFFF)) << 16);
+            | ((s1.d & U64(0x0000FFFF0000FFFF)) << 16);
         s.d ^= s1.d;
         XtimeLong(&s1.d);
         s1.d ^= ((s1.d & U64(0xFF00FF00FF00FF00)) >> 8)
-                | ((s1.d & U64(0x00FF00FF00FF00FF)) << 8);
+            | ((s1.d & U64(0x00FF00FF00FF00FF)) << 8);
         s.d ^= s1.d;
         state[c] = s.d;
     }
@@ -531,7 +531,7 @@ static void AddRoundKey(u64 *state, const u64 *w)
 }
 
 static void Cipher(const unsigned char *in, unsigned char *out,
-                   const u64 *w, int nr)
+    const u64 *w, int nr)
 {
     u64 state[2];
     int i;
@@ -545,19 +545,19 @@ static void Cipher(const unsigned char *in, unsigned char *out,
         SubLong(&state[1]);
         ShiftRows(state);
         MixColumns(state);
-        AddRoundKey(state, w + i*2);
+        AddRoundKey(state, w + i * 2);
     }
 
     SubLong(&state[0]);
     SubLong(&state[1]);
     ShiftRows(state);
-    AddRoundKey(state, w + nr*2);
+    AddRoundKey(state, w + nr * 2);
 
     memcpy(out, state, 16);
 }
 
 static void InvCipher(const unsigned char *in, unsigned char *out,
-                      const u64 *w, int nr)
+    const u64 *w, int nr)
 
 {
     u64 state[2];
@@ -565,13 +565,13 @@ static void InvCipher(const unsigned char *in, unsigned char *out,
 
     memcpy(state, in, 16);
 
-    AddRoundKey(state, w + nr*2);
+    AddRoundKey(state, w + nr * 2);
 
     for (i = nr - 1; i > 0; i--) {
         InvShiftRows(state);
         InvSubLong(&state[0]);
         InvSubLong(&state[1]);
-        AddRoundKey(state, w + i*2);
+        AddRoundKey(state, w + i * 2);
         InvMixColumns(state);
     }
 
@@ -597,18 +597,18 @@ static void RotWord(u32 *x)
 }
 
 static void KeyExpansion(const unsigned char *key, u64 *w,
-                         int nr, int nk)
+    int nr, int nk)
 {
     u32 rcon;
     uni prev;
     u32 temp;
     int i, n;
 
-    memcpy(w, key, nk*4);
+    memcpy(w, key, nk * 4);
     memcpy(&rcon, "\1\0\0\0", 4);
-    n = nk/2;
-    prev.d = w[n-1];
-    for (i = n; i < (nr+1)*2; i++) {
+    n = nk / 2;
+    prev.d = w[n - 1];
+    for (i = n; i < (nr + 1) * 2; i++) {
         temp = prev.w[1];
         if (i % n == 0) {
             RotWord(&temp);
@@ -618,7 +618,7 @@ static void KeyExpansion(const unsigned char *key, u64 *w,
         } else if (nk > 6 && i % n == 2) {
             SubWord(&temp);
         }
-        prev.d = w[i-n];
+        prev.d = w[i - n];
         prev.w[0] ^= temp;
         prev.w[1] ^= prev.w[0];
         w[i] = prev.d;
@@ -629,7 +629,7 @@ static void KeyExpansion(const unsigned char *key, u64 *w,
  * Expand the cipher key into the encryption key schedule.
  */
 int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key)
+    AES_KEY *key)
 {
     u64 *rk;
 
@@ -638,7 +638,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
     if (bits != 128 && bits != 192 && bits != 256)
         return -2;
 
-    rk = (u64*)key->rd_key;
+    rk = (u64 *)key->rd_key;
 
     if (bits == 128)
         key->rounds = 10;
@@ -647,7 +647,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
     else
         key->rounds = 14;
 
-    KeyExpansion(userKey, rk, key->rounds, bits/32);
+    KeyExpansion(userKey, rk, key->rounds, bits / 32);
     return 0;
 }
 
@@ -655,7 +655,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
  * Expand the cipher key into the decryption key schedule.
  */
 int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key)
+    AES_KEY *key)
 {
     return AES_set_encrypt_key(userKey, bits, key);
 }
@@ -665,12 +665,12 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
  * in and out can overlap
  */
 void AES_encrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key)
+    const AES_KEY *key)
 {
     const u64 *rk;
 
     assert(in && out && key);
-    rk = (u64*)key->rd_key;
+    rk = (u64 *)key->rd_key;
 
     Cipher(in, out, rk, key->rounds);
 }
@@ -680,12 +680,12 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
  * in and out can overlap
  */
 void AES_decrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key)
+    const AES_KEY *key)
 {
     const u64 *rk;
 
     assert(in && out && key);
-    rk = (u64*)key->rd_key;
+    rk = (u64 *)key->rd_key;
 
     InvCipher(in, out, rk, key->rounds);
 }
@@ -704,579 +704,2346 @@ Td4[x] = Si[x].[01];
 */
 
 static const u32 Te0[256] = {
-    0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
-    0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
-    0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
-    0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
-    0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
-    0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
-    0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
-    0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
-    0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
-    0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
-    0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
-    0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
-    0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
-    0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
-    0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
-    0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
-    0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
-    0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
-    0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
-    0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
-    0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
-    0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
-    0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
-    0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
-    0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
-    0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
-    0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
-    0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
-    0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
-    0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
-    0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
-    0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
-    0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
-    0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
-    0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
-    0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
-    0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
-    0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
-    0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
-    0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
-    0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
-    0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
-    0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
-    0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
-    0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
-    0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
-    0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
-    0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
-    0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
-    0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
-    0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
-    0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
-    0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
-    0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
-    0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
-    0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
-    0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
-    0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
-    0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
-    0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
-    0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
-    0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
-    0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
-    0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
+    0xc66363a5U,
+    0xf87c7c84U,
+    0xee777799U,
+    0xf67b7b8dU,
+    0xfff2f20dU,
+    0xd66b6bbdU,
+    0xde6f6fb1U,
+    0x91c5c554U,
+    0x60303050U,
+    0x02010103U,
+    0xce6767a9U,
+    0x562b2b7dU,
+    0xe7fefe19U,
+    0xb5d7d762U,
+    0x4dababe6U,
+    0xec76769aU,
+    0x8fcaca45U,
+    0x1f82829dU,
+    0x89c9c940U,
+    0xfa7d7d87U,
+    0xeffafa15U,
+    0xb25959ebU,
+    0x8e4747c9U,
+    0xfbf0f00bU,
+    0x41adadecU,
+    0xb3d4d467U,
+    0x5fa2a2fdU,
+    0x45afafeaU,
+    0x239c9cbfU,
+    0x53a4a4f7U,
+    0xe4727296U,
+    0x9bc0c05bU,
+    0x75b7b7c2U,
+    0xe1fdfd1cU,
+    0x3d9393aeU,
+    0x4c26266aU,
+    0x6c36365aU,
+    0x7e3f3f41U,
+    0xf5f7f702U,
+    0x83cccc4fU,
+    0x6834345cU,
+    0x51a5a5f4U,
+    0xd1e5e534U,
+    0xf9f1f108U,
+    0xe2717193U,
+    0xabd8d873U,
+    0x62313153U,
+    0x2a15153fU,
+    0x0804040cU,
+    0x95c7c752U,
+    0x46232365U,
+    0x9dc3c35eU,
+    0x30181828U,
+    0x379696a1U,
+    0x0a05050fU,
+    0x2f9a9ab5U,
+    0x0e070709U,
+    0x24121236U,
+    0x1b80809bU,
+    0xdfe2e23dU,
+    0xcdebeb26U,
+    0x4e272769U,
+    0x7fb2b2cdU,
+    0xea75759fU,
+    0x1209091bU,
+    0x1d83839eU,
+    0x582c2c74U,
+    0x341a1a2eU,
+    0x361b1b2dU,
+    0xdc6e6eb2U,
+    0xb45a5aeeU,
+    0x5ba0a0fbU,
+    0xa45252f6U,
+    0x763b3b4dU,
+    0xb7d6d661U,
+    0x7db3b3ceU,
+    0x5229297bU,
+    0xdde3e33eU,
+    0x5e2f2f71U,
+    0x13848497U,
+    0xa65353f5U,
+    0xb9d1d168U,
+    0x00000000U,
+    0xc1eded2cU,
+    0x40202060U,
+    0xe3fcfc1fU,
+    0x79b1b1c8U,
+    0xb65b5bedU,
+    0xd46a6abeU,
+    0x8dcbcb46U,
+    0x67bebed9U,
+    0x7239394bU,
+    0x944a4adeU,
+    0x984c4cd4U,
+    0xb05858e8U,
+    0x85cfcf4aU,
+    0xbbd0d06bU,
+    0xc5efef2aU,
+    0x4faaaae5U,
+    0xedfbfb16U,
+    0x864343c5U,
+    0x9a4d4dd7U,
+    0x66333355U,
+    0x11858594U,
+    0x8a4545cfU,
+    0xe9f9f910U,
+    0x04020206U,
+    0xfe7f7f81U,
+    0xa05050f0U,
+    0x783c3c44U,
+    0x259f9fbaU,
+    0x4ba8a8e3U,
+    0xa25151f3U,
+    0x5da3a3feU,
+    0x804040c0U,
+    0x058f8f8aU,
+    0x3f9292adU,
+    0x219d9dbcU,
+    0x70383848U,
+    0xf1f5f504U,
+    0x63bcbcdfU,
+    0x77b6b6c1U,
+    0xafdada75U,
+    0x42212163U,
+    0x20101030U,
+    0xe5ffff1aU,
+    0xfdf3f30eU,
+    0xbfd2d26dU,
+    0x81cdcd4cU,
+    0x180c0c14U,
+    0x26131335U,
+    0xc3ecec2fU,
+    0xbe5f5fe1U,
+    0x359797a2U,
+    0x884444ccU,
+    0x2e171739U,
+    0x93c4c457U,
+    0x55a7a7f2U,
+    0xfc7e7e82U,
+    0x7a3d3d47U,
+    0xc86464acU,
+    0xba5d5de7U,
+    0x3219192bU,
+    0xe6737395U,
+    0xc06060a0U,
+    0x19818198U,
+    0x9e4f4fd1U,
+    0xa3dcdc7fU,
+    0x44222266U,
+    0x542a2a7eU,
+    0x3b9090abU,
+    0x0b888883U,
+    0x8c4646caU,
+    0xc7eeee29U,
+    0x6bb8b8d3U,
+    0x2814143cU,
+    0xa7dede79U,
+    0xbc5e5ee2U,
+    0x160b0b1dU,
+    0xaddbdb76U,
+    0xdbe0e03bU,
+    0x64323256U,
+    0x743a3a4eU,
+    0x140a0a1eU,
+    0x924949dbU,
+    0x0c06060aU,
+    0x4824246cU,
+    0xb85c5ce4U,
+    0x9fc2c25dU,
+    0xbdd3d36eU,
+    0x43acacefU,
+    0xc46262a6U,
+    0x399191a8U,
+    0x319595a4U,
+    0xd3e4e437U,
+    0xf279798bU,
+    0xd5e7e732U,
+    0x8bc8c843U,
+    0x6e373759U,
+    0xda6d6db7U,
+    0x018d8d8cU,
+    0xb1d5d564U,
+    0x9c4e4ed2U,
+    0x49a9a9e0U,
+    0xd86c6cb4U,
+    0xac5656faU,
+    0xf3f4f407U,
+    0xcfeaea25U,
+    0xca6565afU,
+    0xf47a7a8eU,
+    0x47aeaee9U,
+    0x10080818U,
+    0x6fbabad5U,
+    0xf0787888U,
+    0x4a25256fU,
+    0x5c2e2e72U,
+    0x381c1c24U,
+    0x57a6a6f1U,
+    0x73b4b4c7U,
+    0x97c6c651U,
+    0xcbe8e823U,
+    0xa1dddd7cU,
+    0xe874749cU,
+    0x3e1f1f21U,
+    0x964b4bddU,
+    0x61bdbddcU,
+    0x0d8b8b86U,
+    0x0f8a8a85U,
+    0xe0707090U,
+    0x7c3e3e42U,
+    0x71b5b5c4U,
+    0xcc6666aaU,
+    0x904848d8U,
+    0x06030305U,
+    0xf7f6f601U,
+    0x1c0e0e12U,
+    0xc26161a3U,
+    0x6a35355fU,
+    0xae5757f9U,
+    0x69b9b9d0U,
+    0x17868691U,
+    0x99c1c158U,
+    0x3a1d1d27U,
+    0x279e9eb9U,
+    0xd9e1e138U,
+    0xebf8f813U,
+    0x2b9898b3U,
+    0x22111133U,
+    0xd26969bbU,
+    0xa9d9d970U,
+    0x078e8e89U,
+    0x339494a7U,
+    0x2d9b9bb6U,
+    0x3c1e1e22U,
+    0x15878792U,
+    0xc9e9e920U,
+    0x87cece49U,
+    0xaa5555ffU,
+    0x50282878U,
+    0xa5dfdf7aU,
+    0x038c8c8fU,
+    0x59a1a1f8U,
+    0x09898980U,
+    0x1a0d0d17U,
+    0x65bfbfdaU,
+    0xd7e6e631U,
+    0x844242c6U,
+    0xd06868b8U,
+    0x824141c3U,
+    0x299999b0U,
+    0x5a2d2d77U,
+    0x1e0f0f11U,
+    0x7bb0b0cbU,
+    0xa85454fcU,
+    0x6dbbbbd6U,
+    0x2c16163aU,
 };
 static const u32 Te1[256] = {
-    0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
-    0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
-    0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
-    0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
-    0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
-    0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
-    0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
-    0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
-    0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
-    0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
-    0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
-    0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
-    0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
-    0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
-    0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
-    0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
-    0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
-    0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
-    0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
-    0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
-    0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
-    0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
-    0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
-    0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
-    0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
-    0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
-    0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
-    0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
-    0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
-    0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
-    0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
-    0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
-    0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
-    0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
-    0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
-    0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
-    0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
-    0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
-    0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
-    0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
-    0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
-    0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
-    0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
-    0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
-    0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
-    0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
-    0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
-    0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
-    0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
-    0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
-    0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
-    0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
-    0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
-    0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
-    0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
-    0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
-    0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
-    0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
-    0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
-    0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
-    0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
-    0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
-    0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
-    0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
+    0xa5c66363U,
+    0x84f87c7cU,
+    0x99ee7777U,
+    0x8df67b7bU,
+    0x0dfff2f2U,
+    0xbdd66b6bU,
+    0xb1de6f6fU,
+    0x5491c5c5U,
+    0x50603030U,
+    0x03020101U,
+    0xa9ce6767U,
+    0x7d562b2bU,
+    0x19e7fefeU,
+    0x62b5d7d7U,
+    0xe64dababU,
+    0x9aec7676U,
+    0x458fcacaU,
+    0x9d1f8282U,
+    0x4089c9c9U,
+    0x87fa7d7dU,
+    0x15effafaU,
+    0xebb25959U,
+    0xc98e4747U,
+    0x0bfbf0f0U,
+    0xec41adadU,
+    0x67b3d4d4U,
+    0xfd5fa2a2U,
+    0xea45afafU,
+    0xbf239c9cU,
+    0xf753a4a4U,
+    0x96e47272U,
+    0x5b9bc0c0U,
+    0xc275b7b7U,
+    0x1ce1fdfdU,
+    0xae3d9393U,
+    0x6a4c2626U,
+    0x5a6c3636U,
+    0x417e3f3fU,
+    0x02f5f7f7U,
+    0x4f83ccccU,
+    0x5c683434U,
+    0xf451a5a5U,
+    0x34d1e5e5U,
+    0x08f9f1f1U,
+    0x93e27171U,
+    0x73abd8d8U,
+    0x53623131U,
+    0x3f2a1515U,
+    0x0c080404U,
+    0x5295c7c7U,
+    0x65462323U,
+    0x5e9dc3c3U,
+    0x28301818U,
+    0xa1379696U,
+    0x0f0a0505U,
+    0xb52f9a9aU,
+    0x090e0707U,
+    0x36241212U,
+    0x9b1b8080U,
+    0x3ddfe2e2U,
+    0x26cdebebU,
+    0x694e2727U,
+    0xcd7fb2b2U,
+    0x9fea7575U,
+    0x1b120909U,
+    0x9e1d8383U,
+    0x74582c2cU,
+    0x2e341a1aU,
+    0x2d361b1bU,
+    0xb2dc6e6eU,
+    0xeeb45a5aU,
+    0xfb5ba0a0U,
+    0xf6a45252U,
+    0x4d763b3bU,
+    0x61b7d6d6U,
+    0xce7db3b3U,
+    0x7b522929U,
+    0x3edde3e3U,
+    0x715e2f2fU,
+    0x97138484U,
+    0xf5a65353U,
+    0x68b9d1d1U,
+    0x00000000U,
+    0x2cc1ededU,
+    0x60402020U,
+    0x1fe3fcfcU,
+    0xc879b1b1U,
+    0xedb65b5bU,
+    0xbed46a6aU,
+    0x468dcbcbU,
+    0xd967bebeU,
+    0x4b723939U,
+    0xde944a4aU,
+    0xd4984c4cU,
+    0xe8b05858U,
+    0x4a85cfcfU,
+    0x6bbbd0d0U,
+    0x2ac5efefU,
+    0xe54faaaaU,
+    0x16edfbfbU,
+    0xc5864343U,
+    0xd79a4d4dU,
+    0x55663333U,
+    0x94118585U,
+    0xcf8a4545U,
+    0x10e9f9f9U,
+    0x06040202U,
+    0x81fe7f7fU,
+    0xf0a05050U,
+    0x44783c3cU,
+    0xba259f9fU,
+    0xe34ba8a8U,
+    0xf3a25151U,
+    0xfe5da3a3U,
+    0xc0804040U,
+    0x8a058f8fU,
+    0xad3f9292U,
+    0xbc219d9dU,
+    0x48703838U,
+    0x04f1f5f5U,
+    0xdf63bcbcU,
+    0xc177b6b6U,
+    0x75afdadaU,
+    0x63422121U,
+    0x30201010U,
+    0x1ae5ffffU,
+    0x0efdf3f3U,
+    0x6dbfd2d2U,
+    0x4c81cdcdU,
+    0x14180c0cU,
+    0x35261313U,
+    0x2fc3ececU,
+    0xe1be5f5fU,
+    0xa2359797U,
+    0xcc884444U,
+    0x392e1717U,
+    0x5793c4c4U,
+    0xf255a7a7U,
+    0x82fc7e7eU,
+    0x477a3d3dU,
+    0xacc86464U,
+    0xe7ba5d5dU,
+    0x2b321919U,
+    0x95e67373U,
+    0xa0c06060U,
+    0x98198181U,
+    0xd19e4f4fU,
+    0x7fa3dcdcU,
+    0x66442222U,
+    0x7e542a2aU,
+    0xab3b9090U,
+    0x830b8888U,
+    0xca8c4646U,
+    0x29c7eeeeU,
+    0xd36bb8b8U,
+    0x3c281414U,
+    0x79a7dedeU,
+    0xe2bc5e5eU,
+    0x1d160b0bU,
+    0x76addbdbU,
+    0x3bdbe0e0U,
+    0x56643232U,
+    0x4e743a3aU,
+    0x1e140a0aU,
+    0xdb924949U,
+    0x0a0c0606U,
+    0x6c482424U,
+    0xe4b85c5cU,
+    0x5d9fc2c2U,
+    0x6ebdd3d3U,
+    0xef43acacU,
+    0xa6c46262U,
+    0xa8399191U,
+    0xa4319595U,
+    0x37d3e4e4U,
+    0x8bf27979U,
+    0x32d5e7e7U,
+    0x438bc8c8U,
+    0x596e3737U,
+    0xb7da6d6dU,
+    0x8c018d8dU,
+    0x64b1d5d5U,
+    0xd29c4e4eU,
+    0xe049a9a9U,
+    0xb4d86c6cU,
+    0xfaac5656U,
+    0x07f3f4f4U,
+    0x25cfeaeaU,
+    0xafca6565U,
+    0x8ef47a7aU,
+    0xe947aeaeU,
+    0x18100808U,
+    0xd56fbabaU,
+    0x88f07878U,
+    0x6f4a2525U,
+    0x725c2e2eU,
+    0x24381c1cU,
+    0xf157a6a6U,
+    0xc773b4b4U,
+    0x5197c6c6U,
+    0x23cbe8e8U,
+    0x7ca1ddddU,
+    0x9ce87474U,
+    0x213e1f1fU,
+    0xdd964b4bU,
+    0xdc61bdbdU,
+    0x860d8b8bU,
+    0x850f8a8aU,
+    0x90e07070U,
+    0x427c3e3eU,
+    0xc471b5b5U,
+    0xaacc6666U,
+    0xd8904848U,
+    0x05060303U,
+    0x01f7f6f6U,
+    0x121c0e0eU,
+    0xa3c26161U,
+    0x5f6a3535U,
+    0xf9ae5757U,
+    0xd069b9b9U,
+    0x91178686U,
+    0x5899c1c1U,
+    0x273a1d1dU,
+    0xb9279e9eU,
+    0x38d9e1e1U,
+    0x13ebf8f8U,
+    0xb32b9898U,
+    0x33221111U,
+    0xbbd26969U,
+    0x70a9d9d9U,
+    0x89078e8eU,
+    0xa7339494U,
+    0xb62d9b9bU,
+    0x223c1e1eU,
+    0x92158787U,
+    0x20c9e9e9U,
+    0x4987ceceU,
+    0xffaa5555U,
+    0x78502828U,
+    0x7aa5dfdfU,
+    0x8f038c8cU,
+    0xf859a1a1U,
+    0x80098989U,
+    0x171a0d0dU,
+    0xda65bfbfU,
+    0x31d7e6e6U,
+    0xc6844242U,
+    0xb8d06868U,
+    0xc3824141U,
+    0xb0299999U,
+    0x775a2d2dU,
+    0x111e0f0fU,
+    0xcb7bb0b0U,
+    0xfca85454U,
+    0xd66dbbbbU,
+    0x3a2c1616U,
 };
 static const u32 Te2[256] = {
-    0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
-    0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
-    0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
-    0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
-    0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
-    0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
-    0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
-    0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
-    0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
-    0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
-    0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
-    0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
-    0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
-    0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
-    0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
-    0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
-    0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
-    0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
-    0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
-    0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
-    0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
-    0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
-    0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
-    0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
-    0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
-    0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
-    0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
-    0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
-    0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
-    0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
-    0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
-    0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
-    0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
-    0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
-    0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
-    0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
-    0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
-    0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
-    0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
-    0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
-    0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
-    0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
-    0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
-    0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
-    0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
-    0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
-    0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
-    0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
-    0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
-    0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
-    0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
-    0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
-    0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
-    0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
-    0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
-    0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
-    0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
-    0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
-    0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
-    0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
-    0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
-    0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
-    0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
-    0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
+    0x63a5c663U,
+    0x7c84f87cU,
+    0x7799ee77U,
+    0x7b8df67bU,
+    0xf20dfff2U,
+    0x6bbdd66bU,
+    0x6fb1de6fU,
+    0xc55491c5U,
+    0x30506030U,
+    0x01030201U,
+    0x67a9ce67U,
+    0x2b7d562bU,
+    0xfe19e7feU,
+    0xd762b5d7U,
+    0xabe64dabU,
+    0x769aec76U,
+    0xca458fcaU,
+    0x829d1f82U,
+    0xc94089c9U,
+    0x7d87fa7dU,
+    0xfa15effaU,
+    0x59ebb259U,
+    0x47c98e47U,
+    0xf00bfbf0U,
+    0xadec41adU,
+    0xd467b3d4U,
+    0xa2fd5fa2U,
+    0xafea45afU,
+    0x9cbf239cU,
+    0xa4f753a4U,
+    0x7296e472U,
+    0xc05b9bc0U,
+    0xb7c275b7U,
+    0xfd1ce1fdU,
+    0x93ae3d93U,
+    0x266a4c26U,
+    0x365a6c36U,
+    0x3f417e3fU,
+    0xf702f5f7U,
+    0xcc4f83ccU,
+    0x345c6834U,
+    0xa5f451a5U,
+    0xe534d1e5U,
+    0xf108f9f1U,
+    0x7193e271U,
+    0xd873abd8U,
+    0x31536231U,
+    0x153f2a15U,
+    0x040c0804U,
+    0xc75295c7U,
+    0x23654623U,
+    0xc35e9dc3U,
+    0x18283018U,
+    0x96a13796U,
+    0x050f0a05U,
+    0x9ab52f9aU,
+    0x07090e07U,
+    0x12362412U,
+    0x809b1b80U,
+    0xe23ddfe2U,
+    0xeb26cdebU,
+    0x27694e27U,
+    0xb2cd7fb2U,
+    0x759fea75U,
+    0x091b1209U,
+    0x839e1d83U,
+    0x2c74582cU,
+    0x1a2e341aU,
+    0x1b2d361bU,
+    0x6eb2dc6eU,
+    0x5aeeb45aU,
+    0xa0fb5ba0U,
+    0x52f6a452U,
+    0x3b4d763bU,
+    0xd661b7d6U,
+    0xb3ce7db3U,
+    0x297b5229U,
+    0xe33edde3U,
+    0x2f715e2fU,
+    0x84971384U,
+    0x53f5a653U,
+    0xd168b9d1U,
+    0x00000000U,
+    0xed2cc1edU,
+    0x20604020U,
+    0xfc1fe3fcU,
+    0xb1c879b1U,
+    0x5bedb65bU,
+    0x6abed46aU,
+    0xcb468dcbU,
+    0xbed967beU,
+    0x394b7239U,
+    0x4ade944aU,
+    0x4cd4984cU,
+    0x58e8b058U,
+    0xcf4a85cfU,
+    0xd06bbbd0U,
+    0xef2ac5efU,
+    0xaae54faaU,
+    0xfb16edfbU,
+    0x43c58643U,
+    0x4dd79a4dU,
+    0x33556633U,
+    0x85941185U,
+    0x45cf8a45U,
+    0xf910e9f9U,
+    0x02060402U,
+    0x7f81fe7fU,
+    0x50f0a050U,
+    0x3c44783cU,
+    0x9fba259fU,
+    0xa8e34ba8U,
+    0x51f3a251U,
+    0xa3fe5da3U,
+    0x40c08040U,
+    0x8f8a058fU,
+    0x92ad3f92U,
+    0x9dbc219dU,
+    0x38487038U,
+    0xf504f1f5U,
+    0xbcdf63bcU,
+    0xb6c177b6U,
+    0xda75afdaU,
+    0x21634221U,
+    0x10302010U,
+    0xff1ae5ffU,
+    0xf30efdf3U,
+    0xd26dbfd2U,
+    0xcd4c81cdU,
+    0x0c14180cU,
+    0x13352613U,
+    0xec2fc3ecU,
+    0x5fe1be5fU,
+    0x97a23597U,
+    0x44cc8844U,
+    0x17392e17U,
+    0xc45793c4U,
+    0xa7f255a7U,
+    0x7e82fc7eU,
+    0x3d477a3dU,
+    0x64acc864U,
+    0x5de7ba5dU,
+    0x192b3219U,
+    0x7395e673U,
+    0x60a0c060U,
+    0x81981981U,
+    0x4fd19e4fU,
+    0xdc7fa3dcU,
+    0x22664422U,
+    0x2a7e542aU,
+    0x90ab3b90U,
+    0x88830b88U,
+    0x46ca8c46U,
+    0xee29c7eeU,
+    0xb8d36bb8U,
+    0x143c2814U,
+    0xde79a7deU,
+    0x5ee2bc5eU,
+    0x0b1d160bU,
+    0xdb76addbU,
+    0xe03bdbe0U,
+    0x32566432U,
+    0x3a4e743aU,
+    0x0a1e140aU,
+    0x49db9249U,
+    0x060a0c06U,
+    0x246c4824U,
+    0x5ce4b85cU,
+    0xc25d9fc2U,
+    0xd36ebdd3U,
+    0xacef43acU,
+    0x62a6c462U,
+    0x91a83991U,
+    0x95a43195U,
+    0xe437d3e4U,
+    0x798bf279U,
+    0xe732d5e7U,
+    0xc8438bc8U,
+    0x37596e37U,
+    0x6db7da6dU,
+    0x8d8c018dU,
+    0xd564b1d5U,
+    0x4ed29c4eU,
+    0xa9e049a9U,
+    0x6cb4d86cU,
+    0x56faac56U,
+    0xf407f3f4U,
+    0xea25cfeaU,
+    0x65afca65U,
+    0x7a8ef47aU,
+    0xaee947aeU,
+    0x08181008U,
+    0xbad56fbaU,
+    0x7888f078U,
+    0x256f4a25U,
+    0x2e725c2eU,
+    0x1c24381cU,
+    0xa6f157a6U,
+    0xb4c773b4U,
+    0xc65197c6U,
+    0xe823cbe8U,
+    0xdd7ca1ddU,
+    0x749ce874U,
+    0x1f213e1fU,
+    0x4bdd964bU,
+    0xbddc61bdU,
+    0x8b860d8bU,
+    0x8a850f8aU,
+    0x7090e070U,
+    0x3e427c3eU,
+    0xb5c471b5U,
+    0x66aacc66U,
+    0x48d89048U,
+    0x03050603U,
+    0xf601f7f6U,
+    0x0e121c0eU,
+    0x61a3c261U,
+    0x355f6a35U,
+    0x57f9ae57U,
+    0xb9d069b9U,
+    0x86911786U,
+    0xc15899c1U,
+    0x1d273a1dU,
+    0x9eb9279eU,
+    0xe138d9e1U,
+    0xf813ebf8U,
+    0x98b32b98U,
+    0x11332211U,
+    0x69bbd269U,
+    0xd970a9d9U,
+    0x8e89078eU,
+    0x94a73394U,
+    0x9bb62d9bU,
+    0x1e223c1eU,
+    0x87921587U,
+    0xe920c9e9U,
+    0xce4987ceU,
+    0x55ffaa55U,
+    0x28785028U,
+    0xdf7aa5dfU,
+    0x8c8f038cU,
+    0xa1f859a1U,
+    0x89800989U,
+    0x0d171a0dU,
+    0xbfda65bfU,
+    0xe631d7e6U,
+    0x42c68442U,
+    0x68b8d068U,
+    0x41c38241U,
+    0x99b02999U,
+    0x2d775a2dU,
+    0x0f111e0fU,
+    0xb0cb7bb0U,
+    0x54fca854U,
+    0xbbd66dbbU,
+    0x163a2c16U,
 };
 static const u32 Te3[256] = {
-    0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
-    0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
-    0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
-    0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
-    0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
-    0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
-    0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
-    0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
-    0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
-    0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
-    0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
-    0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
-    0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
-    0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
-    0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
-    0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
-    0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
-    0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
-    0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
-    0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
-    0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
-    0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
-    0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
-    0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
-    0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
-    0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
-    0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
-    0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
-    0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
-    0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
-    0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
-    0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
-    0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
-    0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
-    0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
-    0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
-    0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
-    0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
-    0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
-    0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
-    0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
-    0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
-    0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
-    0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
-    0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
-    0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
-    0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
-    0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
-    0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
-    0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
-    0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
-    0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
-    0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
-    0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
-    0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
-    0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
-    0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
-    0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
-    0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
-    0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
-    0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
-    0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
-    0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
-    0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
+    0x6363a5c6U,
+    0x7c7c84f8U,
+    0x777799eeU,
+    0x7b7b8df6U,
+    0xf2f20dffU,
+    0x6b6bbdd6U,
+    0x6f6fb1deU,
+    0xc5c55491U,
+    0x30305060U,
+    0x01010302U,
+    0x6767a9ceU,
+    0x2b2b7d56U,
+    0xfefe19e7U,
+    0xd7d762b5U,
+    0xababe64dU,
+    0x76769aecU,
+    0xcaca458fU,
+    0x82829d1fU,
+    0xc9c94089U,
+    0x7d7d87faU,
+    0xfafa15efU,
+    0x5959ebb2U,
+    0x4747c98eU,
+    0xf0f00bfbU,
+    0xadadec41U,
+    0xd4d467b3U,
+    0xa2a2fd5fU,
+    0xafafea45U,
+    0x9c9cbf23U,
+    0xa4a4f753U,
+    0x727296e4U,
+    0xc0c05b9bU,
+    0xb7b7c275U,
+    0xfdfd1ce1U,
+    0x9393ae3dU,
+    0x26266a4cU,
+    0x36365a6cU,
+    0x3f3f417eU,
+    0xf7f702f5U,
+    0xcccc4f83U,
+    0x34345c68U,
+    0xa5a5f451U,
+    0xe5e534d1U,
+    0xf1f108f9U,
+    0x717193e2U,
+    0xd8d873abU,
+    0x31315362U,
+    0x15153f2aU,
+    0x04040c08U,
+    0xc7c75295U,
+    0x23236546U,
+    0xc3c35e9dU,
+    0x18182830U,
+    0x9696a137U,
+    0x05050f0aU,
+    0x9a9ab52fU,
+    0x0707090eU,
+    0x12123624U,
+    0x80809b1bU,
+    0xe2e23ddfU,
+    0xebeb26cdU,
+    0x2727694eU,
+    0xb2b2cd7fU,
+    0x75759feaU,
+    0x09091b12U,
+    0x83839e1dU,
+    0x2c2c7458U,
+    0x1a1a2e34U,
+    0x1b1b2d36U,
+    0x6e6eb2dcU,
+    0x5a5aeeb4U,
+    0xa0a0fb5bU,
+    0x5252f6a4U,
+    0x3b3b4d76U,
+    0xd6d661b7U,
+    0xb3b3ce7dU,
+    0x29297b52U,
+    0xe3e33eddU,
+    0x2f2f715eU,
+    0x84849713U,
+    0x5353f5a6U,
+    0xd1d168b9U,
+    0x00000000U,
+    0xeded2cc1U,
+    0x20206040U,
+    0xfcfc1fe3U,
+    0xb1b1c879U,
+    0x5b5bedb6U,
+    0x6a6abed4U,
+    0xcbcb468dU,
+    0xbebed967U,
+    0x39394b72U,
+    0x4a4ade94U,
+    0x4c4cd498U,
+    0x5858e8b0U,
+    0xcfcf4a85U,
+    0xd0d06bbbU,
+    0xefef2ac5U,
+    0xaaaae54fU,
+    0xfbfb16edU,
+    0x4343c586U,
+    0x4d4dd79aU,
+    0x33335566U,
+    0x85859411U,
+    0x4545cf8aU,
+    0xf9f910e9U,
+    0x02020604U,
+    0x7f7f81feU,
+    0x5050f0a0U,
+    0x3c3c4478U,
+    0x9f9fba25U,
+    0xa8a8e34bU,
+    0x5151f3a2U,
+    0xa3a3fe5dU,
+    0x4040c080U,
+    0x8f8f8a05U,
+    0x9292ad3fU,
+    0x9d9dbc21U,
+    0x38384870U,
+    0xf5f504f1U,
+    0xbcbcdf63U,
+    0xb6b6c177U,
+    0xdada75afU,
+    0x21216342U,
+    0x10103020U,
+    0xffff1ae5U,
+    0xf3f30efdU,
+    0xd2d26dbfU,
+    0xcdcd4c81U,
+    0x0c0c1418U,
+    0x13133526U,
+    0xecec2fc3U,
+    0x5f5fe1beU,
+    0x9797a235U,
+    0x4444cc88U,
+    0x1717392eU,
+    0xc4c45793U,
+    0xa7a7f255U,
+    0x7e7e82fcU,
+    0x3d3d477aU,
+    0x6464acc8U,
+    0x5d5de7baU,
+    0x19192b32U,
+    0x737395e6U,
+    0x6060a0c0U,
+    0x81819819U,
+    0x4f4fd19eU,
+    0xdcdc7fa3U,
+    0x22226644U,
+    0x2a2a7e54U,
+    0x9090ab3bU,
+    0x8888830bU,
+    0x4646ca8cU,
+    0xeeee29c7U,
+    0xb8b8d36bU,
+    0x14143c28U,
+    0xdede79a7U,
+    0x5e5ee2bcU,
+    0x0b0b1d16U,
+    0xdbdb76adU,
+    0xe0e03bdbU,
+    0x32325664U,
+    0x3a3a4e74U,
+    0x0a0a1e14U,
+    0x4949db92U,
+    0x06060a0cU,
+    0x24246c48U,
+    0x5c5ce4b8U,
+    0xc2c25d9fU,
+    0xd3d36ebdU,
+    0xacacef43U,
+    0x6262a6c4U,
+    0x9191a839U,
+    0x9595a431U,
+    0xe4e437d3U,
+    0x79798bf2U,
+    0xe7e732d5U,
+    0xc8c8438bU,
+    0x3737596eU,
+    0x6d6db7daU,
+    0x8d8d8c01U,
+    0xd5d564b1U,
+    0x4e4ed29cU,
+    0xa9a9e049U,
+    0x6c6cb4d8U,
+    0x5656faacU,
+    0xf4f407f3U,
+    0xeaea25cfU,
+    0x6565afcaU,
+    0x7a7a8ef4U,
+    0xaeaee947U,
+    0x08081810U,
+    0xbabad56fU,
+    0x787888f0U,
+    0x25256f4aU,
+    0x2e2e725cU,
+    0x1c1c2438U,
+    0xa6a6f157U,
+    0xb4b4c773U,
+    0xc6c65197U,
+    0xe8e823cbU,
+    0xdddd7ca1U,
+    0x74749ce8U,
+    0x1f1f213eU,
+    0x4b4bdd96U,
+    0xbdbddc61U,
+    0x8b8b860dU,
+    0x8a8a850fU,
+    0x707090e0U,
+    0x3e3e427cU,
+    0xb5b5c471U,
+    0x6666aaccU,
+    0x4848d890U,
+    0x03030506U,
+    0xf6f601f7U,
+    0x0e0e121cU,
+    0x6161a3c2U,
+    0x35355f6aU,
+    0x5757f9aeU,
+    0xb9b9d069U,
+    0x86869117U,
+    0xc1c15899U,
+    0x1d1d273aU,
+    0x9e9eb927U,
+    0xe1e138d9U,
+    0xf8f813ebU,
+    0x9898b32bU,
+    0x11113322U,
+    0x6969bbd2U,
+    0xd9d970a9U,
+    0x8e8e8907U,
+    0x9494a733U,
+    0x9b9bb62dU,
+    0x1e1e223cU,
+    0x87879215U,
+    0xe9e920c9U,
+    0xcece4987U,
+    0x5555ffaaU,
+    0x28287850U,
+    0xdfdf7aa5U,
+    0x8c8c8f03U,
+    0xa1a1f859U,
+    0x89898009U,
+    0x0d0d171aU,
+    0xbfbfda65U,
+    0xe6e631d7U,
+    0x4242c684U,
+    0x6868b8d0U,
+    0x4141c382U,
+    0x9999b029U,
+    0x2d2d775aU,
+    0x0f0f111eU,
+    0xb0b0cb7bU,
+    0x5454fca8U,
+    0xbbbbd66dU,
+    0x16163a2cU,
 };
 
 static const u32 Td0[256] = {
-    0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
-    0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
-    0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
-    0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
-    0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
-    0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
-    0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
-    0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
-    0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
-    0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
-    0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
-    0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
-    0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
-    0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
-    0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
-    0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
-    0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
-    0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
-    0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
-    0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
-    0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
-    0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
-    0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
-    0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
-    0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
-    0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
-    0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
-    0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
-    0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
-    0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
-    0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
-    0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
-    0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
-    0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
-    0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
-    0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
-    0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
-    0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
-    0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
-    0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
-    0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
-    0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
-    0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
-    0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
-    0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
-    0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
-    0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
-    0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
-    0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
-    0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
-    0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
-    0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
-    0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
-    0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
-    0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
-    0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
-    0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
-    0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
-    0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
-    0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
-    0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
-    0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
-    0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
-    0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
+    0x51f4a750U,
+    0x7e416553U,
+    0x1a17a4c3U,
+    0x3a275e96U,
+    0x3bab6bcbU,
+    0x1f9d45f1U,
+    0xacfa58abU,
+    0x4be30393U,
+    0x2030fa55U,
+    0xad766df6U,
+    0x88cc7691U,
+    0xf5024c25U,
+    0x4fe5d7fcU,
+    0xc52acbd7U,
+    0x26354480U,
+    0xb562a38fU,
+    0xdeb15a49U,
+    0x25ba1b67U,
+    0x45ea0e98U,
+    0x5dfec0e1U,
+    0xc32f7502U,
+    0x814cf012U,
+    0x8d4697a3U,
+    0x6bd3f9c6U,
+    0x038f5fe7U,
+    0x15929c95U,
+    0xbf6d7aebU,
+    0x955259daU,
+    0xd4be832dU,
+    0x587421d3U,
+    0x49e06929U,
+    0x8ec9c844U,
+    0x75c2896aU,
+    0xf48e7978U,
+    0x99583e6bU,
+    0x27b971ddU,
+    0xbee14fb6U,
+    0xf088ad17U,
+    0xc920ac66U,
+    0x7dce3ab4U,
+    0x63df4a18U,
+    0xe51a3182U,
+    0x97513360U,
+    0x62537f45U,
+    0xb16477e0U,
+    0xbb6bae84U,
+    0xfe81a01cU,
+    0xf9082b94U,
+    0x70486858U,
+    0x8f45fd19U,
+    0x94de6c87U,
+    0x527bf8b7U,
+    0xab73d323U,
+    0x724b02e2U,
+    0xe31f8f57U,
+    0x6655ab2aU,
+    0xb2eb2807U,
+    0x2fb5c203U,
+    0x86c57b9aU,
+    0xd33708a5U,
+    0x302887f2U,
+    0x23bfa5b2U,
+    0x02036abaU,
+    0xed16825cU,
+    0x8acf1c2bU,
+    0xa779b492U,
+    0xf307f2f0U,
+    0x4e69e2a1U,
+    0x65daf4cdU,
+    0x0605bed5U,
+    0xd134621fU,
+    0xc4a6fe8aU,
+    0x342e539dU,
+    0xa2f355a0U,
+    0x058ae132U,
+    0xa4f6eb75U,
+    0x0b83ec39U,
+    0x4060efaaU,
+    0x5e719f06U,
+    0xbd6e1051U,
+    0x3e218af9U,
+    0x96dd063dU,
+    0xdd3e05aeU,
+    0x4de6bd46U,
+    0x91548db5U,
+    0x71c45d05U,
+    0x0406d46fU,
+    0x605015ffU,
+    0x1998fb24U,
+    0xd6bde997U,
+    0x894043ccU,
+    0x67d99e77U,
+    0xb0e842bdU,
+    0x07898b88U,
+    0xe7195b38U,
+    0x79c8eedbU,
+    0xa17c0a47U,
+    0x7c420fe9U,
+    0xf8841ec9U,
+    0x00000000U,
+    0x09808683U,
+    0x322bed48U,
+    0x1e1170acU,
+    0x6c5a724eU,
+    0xfd0efffbU,
+    0x0f853856U,
+    0x3daed51eU,
+    0x362d3927U,
+    0x0a0fd964U,
+    0x685ca621U,
+    0x9b5b54d1U,
+    0x24362e3aU,
+    0x0c0a67b1U,
+    0x9357e70fU,
+    0xb4ee96d2U,
+    0x1b9b919eU,
+    0x80c0c54fU,
+    0x61dc20a2U,
+    0x5a774b69U,
+    0x1c121a16U,
+    0xe293ba0aU,
+    0xc0a02ae5U,
+    0x3c22e043U,
+    0x121b171dU,
+    0x0e090d0bU,
+    0xf28bc7adU,
+    0x2db6a8b9U,
+    0x141ea9c8U,
+    0x57f11985U,
+    0xaf75074cU,
+    0xee99ddbbU,
+    0xa37f60fdU,
+    0xf701269fU,
+    0x5c72f5bcU,
+    0x44663bc5U,
+    0x5bfb7e34U,
+    0x8b432976U,
+    0xcb23c6dcU,
+    0xb6edfc68U,
+    0xb8e4f163U,
+    0xd731dccaU,
+    0x42638510U,
+    0x13972240U,
+    0x84c61120U,
+    0x854a247dU,
+    0xd2bb3df8U,
+    0xaef93211U,
+    0xc729a16dU,
+    0x1d9e2f4bU,
+    0xdcb230f3U,
+    0x0d8652ecU,
+    0x77c1e3d0U,
+    0x2bb3166cU,
+    0xa970b999U,
+    0x119448faU,
+    0x47e96422U,
+    0xa8fc8cc4U,
+    0xa0f03f1aU,
+    0x567d2cd8U,
+    0x223390efU,
+    0x87494ec7U,
+    0xd938d1c1U,
+    0x8ccaa2feU,
+    0x98d40b36U,
+    0xa6f581cfU,
+    0xa57ade28U,
+    0xdab78e26U,
+    0x3fadbfa4U,
+    0x2c3a9de4U,
+    0x5078920dU,
+    0x6a5fcc9bU,
+    0x547e4662U,
+    0xf68d13c2U,
+    0x90d8b8e8U,
+    0x2e39f75eU,
+    0x82c3aff5U,
+    0x9f5d80beU,
+    0x69d0937cU,
+    0x6fd52da9U,
+    0xcf2512b3U,
+    0xc8ac993bU,
+    0x10187da7U,
+    0xe89c636eU,
+    0xdb3bbb7bU,
+    0xcd267809U,
+    0x6e5918f4U,
+    0xec9ab701U,
+    0x834f9aa8U,
+    0xe6956e65U,
+    0xaaffe67eU,
+    0x21bccf08U,
+    0xef15e8e6U,
+    0xbae79bd9U,
+    0x4a6f36ceU,
+    0xea9f09d4U,
+    0x29b07cd6U,
+    0x31a4b2afU,
+    0x2a3f2331U,
+    0xc6a59430U,
+    0x35a266c0U,
+    0x744ebc37U,
+    0xfc82caa6U,
+    0xe090d0b0U,
+    0x33a7d815U,
+    0xf104984aU,
+    0x41ecdaf7U,
+    0x7fcd500eU,
+    0x1791f62fU,
+    0x764dd68dU,
+    0x43efb04dU,
+    0xccaa4d54U,
+    0xe49604dfU,
+    0x9ed1b5e3U,
+    0x4c6a881bU,
+    0xc12c1fb8U,
+    0x4665517fU,
+    0x9d5eea04U,
+    0x018c355dU,
+    0xfa877473U,
+    0xfb0b412eU,
+    0xb3671d5aU,
+    0x92dbd252U,
+    0xe9105633U,
+    0x6dd64713U,
+    0x9ad7618cU,
+    0x37a10c7aU,
+    0x59f8148eU,
+    0xeb133c89U,
+    0xcea927eeU,
+    0xb761c935U,
+    0xe11ce5edU,
+    0x7a47b13cU,
+    0x9cd2df59U,
+    0x55f2733fU,
+    0x1814ce79U,
+    0x73c737bfU,
+    0x53f7cdeaU,
+    0x5ffdaa5bU,
+    0xdf3d6f14U,
+    0x7844db86U,
+    0xcaaff381U,
+    0xb968c43eU,
+    0x3824342cU,
+    0xc2a3405fU,
+    0x161dc372U,
+    0xbce2250cU,
+    0x283c498bU,
+    0xff0d9541U,
+    0x39a80171U,
+    0x080cb3deU,
+    0xd8b4e49cU,
+    0x6456c190U,
+    0x7bcb8461U,
+    0xd532b670U,
+    0x486c5c74U,
+    0xd0b85742U,
 };
 static const u32 Td1[256] = {
-    0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
-    0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
-    0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
-    0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
-    0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
-    0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
-    0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
-    0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
-    0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
-    0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
-    0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
-    0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
-    0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
-    0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
-    0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
-    0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
-    0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
-    0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
-    0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
-    0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
-    0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
-    0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
-    0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
-    0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
-    0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
-    0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
-    0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
-    0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
-    0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
-    0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
-    0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
-    0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
-    0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
-    0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
-    0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
-    0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
-    0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
-    0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
-    0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
-    0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
-    0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
-    0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
-    0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
-    0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
-    0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
-    0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
-    0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
-    0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
-    0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
-    0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
-    0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
-    0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
-    0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
-    0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
-    0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
-    0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
-    0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
-    0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
-    0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
-    0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
-    0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
-    0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
-    0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
-    0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
+    0x5051f4a7U,
+    0x537e4165U,
+    0xc31a17a4U,
+    0x963a275eU,
+    0xcb3bab6bU,
+    0xf11f9d45U,
+    0xabacfa58U,
+    0x934be303U,
+    0x552030faU,
+    0xf6ad766dU,
+    0x9188cc76U,
+    0x25f5024cU,
+    0xfc4fe5d7U,
+    0xd7c52acbU,
+    0x80263544U,
+    0x8fb562a3U,
+    0x49deb15aU,
+    0x6725ba1bU,
+    0x9845ea0eU,
+    0xe15dfec0U,
+    0x02c32f75U,
+    0x12814cf0U,
+    0xa38d4697U,
+    0xc66bd3f9U,
+    0xe7038f5fU,
+    0x9515929cU,
+    0xebbf6d7aU,
+    0xda955259U,
+    0x2dd4be83U,
+    0xd3587421U,
+    0x2949e069U,
+    0x448ec9c8U,
+    0x6a75c289U,
+    0x78f48e79U,
+    0x6b99583eU,
+    0xdd27b971U,
+    0xb6bee14fU,
+    0x17f088adU,
+    0x66c920acU,
+    0xb47dce3aU,
+    0x1863df4aU,
+    0x82e51a31U,
+    0x60975133U,
+    0x4562537fU,
+    0xe0b16477U,
+    0x84bb6baeU,
+    0x1cfe81a0U,
+    0x94f9082bU,
+    0x58704868U,
+    0x198f45fdU,
+    0x8794de6cU,
+    0xb7527bf8U,
+    0x23ab73d3U,
+    0xe2724b02U,
+    0x57e31f8fU,
+    0x2a6655abU,
+    0x07b2eb28U,
+    0x032fb5c2U,
+    0x9a86c57bU,
+    0xa5d33708U,
+    0xf2302887U,
+    0xb223bfa5U,
+    0xba02036aU,
+    0x5ced1682U,
+    0x2b8acf1cU,
+    0x92a779b4U,
+    0xf0f307f2U,
+    0xa14e69e2U,
+    0xcd65daf4U,
+    0xd50605beU,
+    0x1fd13462U,
+    0x8ac4a6feU,
+    0x9d342e53U,
+    0xa0a2f355U,
+    0x32058ae1U,
+    0x75a4f6ebU,
+    0x390b83ecU,
+    0xaa4060efU,
+    0x065e719fU,
+    0x51bd6e10U,
+    0xf93e218aU,
+    0x3d96dd06U,
+    0xaedd3e05U,
+    0x464de6bdU,
+    0xb591548dU,
+    0x0571c45dU,
+    0x6f0406d4U,
+    0xff605015U,
+    0x241998fbU,
+    0x97d6bde9U,
+    0xcc894043U,
+    0x7767d99eU,
+    0xbdb0e842U,
+    0x8807898bU,
+    0x38e7195bU,
+    0xdb79c8eeU,
+    0x47a17c0aU,
+    0xe97c420fU,
+    0xc9f8841eU,
+    0x00000000U,
+    0x83098086U,
+    0x48322bedU,
+    0xac1e1170U,
+    0x4e6c5a72U,
+    0xfbfd0effU,
+    0x560f8538U,
+    0x1e3daed5U,
+    0x27362d39U,
+    0x640a0fd9U,
+    0x21685ca6U,
+    0xd19b5b54U,
+    0x3a24362eU,
+    0xb10c0a67U,
+    0x0f9357e7U,
+    0xd2b4ee96U,
+    0x9e1b9b91U,
+    0x4f80c0c5U,
+    0xa261dc20U,
+    0x695a774bU,
+    0x161c121aU,
+    0x0ae293baU,
+    0xe5c0a02aU,
+    0x433c22e0U,
+    0x1d121b17U,
+    0x0b0e090dU,
+    0xadf28bc7U,
+    0xb92db6a8U,
+    0xc8141ea9U,
+    0x8557f119U,
+    0x4caf7507U,
+    0xbbee99ddU,
+    0xfda37f60U,
+    0x9ff70126U,
+    0xbc5c72f5U,
+    0xc544663bU,
+    0x345bfb7eU,
+    0x768b4329U,
+    0xdccb23c6U,
+    0x68b6edfcU,
+    0x63b8e4f1U,
+    0xcad731dcU,
+    0x10426385U,
+    0x40139722U,
+    0x2084c611U,
+    0x7d854a24U,
+    0xf8d2bb3dU,
+    0x11aef932U,
+    0x6dc729a1U,
+    0x4b1d9e2fU,
+    0xf3dcb230U,
+    0xec0d8652U,
+    0xd077c1e3U,
+    0x6c2bb316U,
+    0x99a970b9U,
+    0xfa119448U,
+    0x2247e964U,
+    0xc4a8fc8cU,
+    0x1aa0f03fU,
+    0xd8567d2cU,
+    0xef223390U,
+    0xc787494eU,
+    0xc1d938d1U,
+    0xfe8ccaa2U,
+    0x3698d40bU,
+    0xcfa6f581U,
+    0x28a57adeU,
+    0x26dab78eU,
+    0xa43fadbfU,
+    0xe42c3a9dU,
+    0x0d507892U,
+    0x9b6a5fccU,
+    0x62547e46U,
+    0xc2f68d13U,
+    0xe890d8b8U,
+    0x5e2e39f7U,
+    0xf582c3afU,
+    0xbe9f5d80U,
+    0x7c69d093U,
+    0xa96fd52dU,
+    0xb3cf2512U,
+    0x3bc8ac99U,
+    0xa710187dU,
+    0x6ee89c63U,
+    0x7bdb3bbbU,
+    0x09cd2678U,
+    0xf46e5918U,
+    0x01ec9ab7U,
+    0xa8834f9aU,
+    0x65e6956eU,
+    0x7eaaffe6U,
+    0x0821bccfU,
+    0xe6ef15e8U,
+    0xd9bae79bU,
+    0xce4a6f36U,
+    0xd4ea9f09U,
+    0xd629b07cU,
+    0xaf31a4b2U,
+    0x312a3f23U,
+    0x30c6a594U,
+    0xc035a266U,
+    0x37744ebcU,
+    0xa6fc82caU,
+    0xb0e090d0U,
+    0x1533a7d8U,
+    0x4af10498U,
+    0xf741ecdaU,
+    0x0e7fcd50U,
+    0x2f1791f6U,
+    0x8d764dd6U,
+    0x4d43efb0U,
+    0x54ccaa4dU,
+    0xdfe49604U,
+    0xe39ed1b5U,
+    0x1b4c6a88U,
+    0xb8c12c1fU,
+    0x7f466551U,
+    0x049d5eeaU,
+    0x5d018c35U,
+    0x73fa8774U,
+    0x2efb0b41U,
+    0x5ab3671dU,
+    0x5292dbd2U,
+    0x33e91056U,
+    0x136dd647U,
+    0x8c9ad761U,
+    0x7a37a10cU,
+    0x8e59f814U,
+    0x89eb133cU,
+    0xeecea927U,
+    0x35b761c9U,
+    0xede11ce5U,
+    0x3c7a47b1U,
+    0x599cd2dfU,
+    0x3f55f273U,
+    0x791814ceU,
+    0xbf73c737U,
+    0xea53f7cdU,
+    0x5b5ffdaaU,
+    0x14df3d6fU,
+    0x867844dbU,
+    0x81caaff3U,
+    0x3eb968c4U,
+    0x2c382434U,
+    0x5fc2a340U,
+    0x72161dc3U,
+    0x0cbce225U,
+    0x8b283c49U,
+    0x41ff0d95U,
+    0x7139a801U,
+    0xde080cb3U,
+    0x9cd8b4e4U,
+    0x906456c1U,
+    0x617bcb84U,
+    0x70d532b6U,
+    0x74486c5cU,
+    0x42d0b857U,
 };
 static const u32 Td2[256] = {
-    0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
-    0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
-    0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
-    0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
-    0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
-    0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
-    0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
-    0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
-    0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
-    0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
-    0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
-    0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
-    0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
-    0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
-    0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
-    0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
-    0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
-    0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
-    0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
-    0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
-    0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
-    0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
-    0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
-    0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
-    0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
-    0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
-    0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
-    0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
-    0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
-    0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
-    0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
-    0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
-    0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
-    0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
-    0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
-    0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
-    0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
-    0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
-    0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
-    0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
-    0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
-    0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
-    0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
-    0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
-    0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
-    0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
-    0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
-    0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
-    0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
-    0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
-    0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
-    0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
-    0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
-    0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
-    0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
-    0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
-    0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
-    0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
-    0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
-    0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
-    0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
-    0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
-    0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
-    0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
+    0xa75051f4U,
+    0x65537e41U,
+    0xa4c31a17U,
+    0x5e963a27U,
+    0x6bcb3babU,
+    0x45f11f9dU,
+    0x58abacfaU,
+    0x03934be3U,
+    0xfa552030U,
+    0x6df6ad76U,
+    0x769188ccU,
+    0x4c25f502U,
+    0xd7fc4fe5U,
+    0xcbd7c52aU,
+    0x44802635U,
+    0xa38fb562U,
+    0x5a49deb1U,
+    0x1b6725baU,
+    0x0e9845eaU,
+    0xc0e15dfeU,
+    0x7502c32fU,
+    0xf012814cU,
+    0x97a38d46U,
+    0xf9c66bd3U,
+    0x5fe7038fU,
+    0x9c951592U,
+    0x7aebbf6dU,
+    0x59da9552U,
+    0x832dd4beU,
+    0x21d35874U,
+    0x692949e0U,
+    0xc8448ec9U,
+    0x896a75c2U,
+    0x7978f48eU,
+    0x3e6b9958U,
+    0x71dd27b9U,
+    0x4fb6bee1U,
+    0xad17f088U,
+    0xac66c920U,
+    0x3ab47dceU,
+    0x4a1863dfU,
+    0x3182e51aU,
+    0x33609751U,
+    0x7f456253U,
+    0x77e0b164U,
+    0xae84bb6bU,
+    0xa01cfe81U,
+    0x2b94f908U,
+    0x68587048U,
+    0xfd198f45U,
+    0x6c8794deU,
+    0xf8b7527bU,
+    0xd323ab73U,
+    0x02e2724bU,
+    0x8f57e31fU,
+    0xab2a6655U,
+    0x2807b2ebU,
+    0xc2032fb5U,
+    0x7b9a86c5U,
+    0x08a5d337U,
+    0x87f23028U,
+    0xa5b223bfU,
+    0x6aba0203U,
+    0x825ced16U,
+    0x1c2b8acfU,
+    0xb492a779U,
+    0xf2f0f307U,
+    0xe2a14e69U,
+    0xf4cd65daU,
+    0xbed50605U,
+    0x621fd134U,
+    0xfe8ac4a6U,
+    0x539d342eU,
+    0x55a0a2f3U,
+    0xe132058aU,
+    0xeb75a4f6U,
+    0xec390b83U,
+    0xefaa4060U,
+    0x9f065e71U,
+    0x1051bd6eU,
+    0x8af93e21U,
+    0x063d96ddU,
+    0x05aedd3eU,
+    0xbd464de6U,
+    0x8db59154U,
+    0x5d0571c4U,
+    0xd46f0406U,
+    0x15ff6050U,
+    0xfb241998U,
+    0xe997d6bdU,
+    0x43cc8940U,
+    0x9e7767d9U,
+    0x42bdb0e8U,
+    0x8b880789U,
+    0x5b38e719U,
+    0xeedb79c8U,
+    0x0a47a17cU,
+    0x0fe97c42U,
+    0x1ec9f884U,
+    0x00000000U,
+    0x86830980U,
+    0xed48322bU,
+    0x70ac1e11U,
+    0x724e6c5aU,
+    0xfffbfd0eU,
+    0x38560f85U,
+    0xd51e3daeU,
+    0x3927362dU,
+    0xd9640a0fU,
+    0xa621685cU,
+    0x54d19b5bU,
+    0x2e3a2436U,
+    0x67b10c0aU,
+    0xe70f9357U,
+    0x96d2b4eeU,
+    0x919e1b9bU,
+    0xc54f80c0U,
+    0x20a261dcU,
+    0x4b695a77U,
+    0x1a161c12U,
+    0xba0ae293U,
+    0x2ae5c0a0U,
+    0xe0433c22U,
+    0x171d121bU,
+    0x0d0b0e09U,
+    0xc7adf28bU,
+    0xa8b92db6U,
+    0xa9c8141eU,
+    0x198557f1U,
+    0x074caf75U,
+    0xddbbee99U,
+    0x60fda37fU,
+    0x269ff701U,
+    0xf5bc5c72U,
+    0x3bc54466U,
+    0x7e345bfbU,
+    0x29768b43U,
+    0xc6dccb23U,
+    0xfc68b6edU,
+    0xf163b8e4U,
+    0xdccad731U,
+    0x85104263U,
+    0x22401397U,
+    0x112084c6U,
+    0x247d854aU,
+    0x3df8d2bbU,
+    0x3211aef9U,
+    0xa16dc729U,
+    0x2f4b1d9eU,
+    0x30f3dcb2U,
+    0x52ec0d86U,
+    0xe3d077c1U,
+    0x166c2bb3U,
+    0xb999a970U,
+    0x48fa1194U,
+    0x642247e9U,
+    0x8cc4a8fcU,
+    0x3f1aa0f0U,
+    0x2cd8567dU,
+    0x90ef2233U,
+    0x4ec78749U,
+    0xd1c1d938U,
+    0xa2fe8ccaU,
+    0x0b3698d4U,
+    0x81cfa6f5U,
+    0xde28a57aU,
+    0x8e26dab7U,
+    0xbfa43fadU,
+    0x9de42c3aU,
+    0x920d5078U,
+    0xcc9b6a5fU,
+    0x4662547eU,
+    0x13c2f68dU,
+    0xb8e890d8U,
+    0xf75e2e39U,
+    0xaff582c3U,
+    0x80be9f5dU,
+    0x937c69d0U,
+    0x2da96fd5U,
+    0x12b3cf25U,
+    0x993bc8acU,
+    0x7da71018U,
+    0x636ee89cU,
+    0xbb7bdb3bU,
+    0x7809cd26U,
+    0x18f46e59U,
+    0xb701ec9aU,
+    0x9aa8834fU,
+    0x6e65e695U,
+    0xe67eaaffU,
+    0xcf0821bcU,
+    0xe8e6ef15U,
+    0x9bd9bae7U,
+    0x36ce4a6fU,
+    0x09d4ea9fU,
+    0x7cd629b0U,
+    0xb2af31a4U,
+    0x23312a3fU,
+    0x9430c6a5U,
+    0x66c035a2U,
+    0xbc37744eU,
+    0xcaa6fc82U,
+    0xd0b0e090U,
+    0xd81533a7U,
+    0x984af104U,
+    0xdaf741ecU,
+    0x500e7fcdU,
+    0xf62f1791U,
+    0xd68d764dU,
+    0xb04d43efU,
+    0x4d54ccaaU,
+    0x04dfe496U,
+    0xb5e39ed1U,
+    0x881b4c6aU,
+    0x1fb8c12cU,
+    0x517f4665U,
+    0xea049d5eU,
+    0x355d018cU,
+    0x7473fa87U,
+    0x412efb0bU,
+    0x1d5ab367U,
+    0xd25292dbU,
+    0x5633e910U,
+    0x47136dd6U,
+    0x618c9ad7U,
+    0x0c7a37a1U,
+    0x148e59f8U,
+    0x3c89eb13U,
+    0x27eecea9U,
+    0xc935b761U,
+    0xe5ede11cU,
+    0xb13c7a47U,
+    0xdf599cd2U,
+    0x733f55f2U,
+    0xce791814U,
+    0x37bf73c7U,
+    0xcdea53f7U,
+    0xaa5b5ffdU,
+    0x6f14df3dU,
+    0xdb867844U,
+    0xf381caafU,
+    0xc43eb968U,
+    0x342c3824U,
+    0x405fc2a3U,
+    0xc372161dU,
+    0x250cbce2U,
+    0x498b283cU,
+    0x9541ff0dU,
+    0x017139a8U,
+    0xb3de080cU,
+    0xe49cd8b4U,
+    0xc1906456U,
+    0x84617bcbU,
+    0xb670d532U,
+    0x5c74486cU,
+    0x5742d0b8U,
 };
 static const u32 Td3[256] = {
-    0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
-    0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
-    0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
-    0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
-    0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
-    0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
-    0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
-    0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
-    0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
-    0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
-    0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
-    0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
-    0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
-    0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
-    0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
-    0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
-    0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
-    0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
-    0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
-    0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
-    0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
-    0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
-    0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
-    0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
-    0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
-    0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
-    0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
-    0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
-    0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
-    0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
-    0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
-    0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
-    0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
-    0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
-    0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
-    0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
-    0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
-    0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
-    0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
-    0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
-    0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
-    0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
-    0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
-    0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
-    0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
-    0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
-    0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
-    0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
-    0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
-    0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
-    0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
-    0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
-    0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
-    0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
-    0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
-    0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
-    0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
-    0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
-    0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
-    0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
-    0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
-    0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
-    0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
-    0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
+    0xf4a75051U,
+    0x4165537eU,
+    0x17a4c31aU,
+    0x275e963aU,
+    0xab6bcb3bU,
+    0x9d45f11fU,
+    0xfa58abacU,
+    0xe303934bU,
+    0x30fa5520U,
+    0x766df6adU,
+    0xcc769188U,
+    0x024c25f5U,
+    0xe5d7fc4fU,
+    0x2acbd7c5U,
+    0x35448026U,
+    0x62a38fb5U,
+    0xb15a49deU,
+    0xba1b6725U,
+    0xea0e9845U,
+    0xfec0e15dU,
+    0x2f7502c3U,
+    0x4cf01281U,
+    0x4697a38dU,
+    0xd3f9c66bU,
+    0x8f5fe703U,
+    0x929c9515U,
+    0x6d7aebbfU,
+    0x5259da95U,
+    0xbe832dd4U,
+    0x7421d358U,
+    0xe0692949U,
+    0xc9c8448eU,
+    0xc2896a75U,
+    0x8e7978f4U,
+    0x583e6b99U,
+    0xb971dd27U,
+    0xe14fb6beU,
+    0x88ad17f0U,
+    0x20ac66c9U,
+    0xce3ab47dU,
+    0xdf4a1863U,
+    0x1a3182e5U,
+    0x51336097U,
+    0x537f4562U,
+    0x6477e0b1U,
+    0x6bae84bbU,
+    0x81a01cfeU,
+    0x082b94f9U,
+    0x48685870U,
+    0x45fd198fU,
+    0xde6c8794U,
+    0x7bf8b752U,
+    0x73d323abU,
+    0x4b02e272U,
+    0x1f8f57e3U,
+    0x55ab2a66U,
+    0xeb2807b2U,
+    0xb5c2032fU,
+    0xc57b9a86U,
+    0x3708a5d3U,
+    0x2887f230U,
+    0xbfa5b223U,
+    0x036aba02U,
+    0x16825cedU,
+    0xcf1c2b8aU,
+    0x79b492a7U,
+    0x07f2f0f3U,
+    0x69e2a14eU,
+    0xdaf4cd65U,
+    0x05bed506U,
+    0x34621fd1U,
+    0xa6fe8ac4U,
+    0x2e539d34U,
+    0xf355a0a2U,
+    0x8ae13205U,
+    0xf6eb75a4U,
+    0x83ec390bU,
+    0x60efaa40U,
+    0x719f065eU,
+    0x6e1051bdU,
+    0x218af93eU,
+    0xdd063d96U,
+    0x3e05aeddU,
+    0xe6bd464dU,
+    0x548db591U,
+    0xc45d0571U,
+    0x06d46f04U,
+    0x5015ff60U,
+    0x98fb2419U,
+    0xbde997d6U,
+    0x4043cc89U,
+    0xd99e7767U,
+    0xe842bdb0U,
+    0x898b8807U,
+    0x195b38e7U,
+    0xc8eedb79U,
+    0x7c0a47a1U,
+    0x420fe97cU,
+    0x841ec9f8U,
+    0x00000000U,
+    0x80868309U,
+    0x2bed4832U,
+    0x1170ac1eU,
+    0x5a724e6cU,
+    0x0efffbfdU,
+    0x8538560fU,
+    0xaed51e3dU,
+    0x2d392736U,
+    0x0fd9640aU,
+    0x5ca62168U,
+    0x5b54d19bU,
+    0x362e3a24U,
+    0x0a67b10cU,
+    0x57e70f93U,
+    0xee96d2b4U,
+    0x9b919e1bU,
+    0xc0c54f80U,
+    0xdc20a261U,
+    0x774b695aU,
+    0x121a161cU,
+    0x93ba0ae2U,
+    0xa02ae5c0U,
+    0x22e0433cU,
+    0x1b171d12U,
+    0x090d0b0eU,
+    0x8bc7adf2U,
+    0xb6a8b92dU,
+    0x1ea9c814U,
+    0xf1198557U,
+    0x75074cafU,
+    0x99ddbbeeU,
+    0x7f60fda3U,
+    0x01269ff7U,
+    0x72f5bc5cU,
+    0x663bc544U,
+    0xfb7e345bU,
+    0x4329768bU,
+    0x23c6dccbU,
+    0xedfc68b6U,
+    0xe4f163b8U,
+    0x31dccad7U,
+    0x63851042U,
+    0x97224013U,
+    0xc6112084U,
+    0x4a247d85U,
+    0xbb3df8d2U,
+    0xf93211aeU,
+    0x29a16dc7U,
+    0x9e2f4b1dU,
+    0xb230f3dcU,
+    0x8652ec0dU,
+    0xc1e3d077U,
+    0xb3166c2bU,
+    0x70b999a9U,
+    0x9448fa11U,
+    0xe9642247U,
+    0xfc8cc4a8U,
+    0xf03f1aa0U,
+    0x7d2cd856U,
+    0x3390ef22U,
+    0x494ec787U,
+    0x38d1c1d9U,
+    0xcaa2fe8cU,
+    0xd40b3698U,
+    0xf581cfa6U,
+    0x7ade28a5U,
+    0xb78e26daU,
+    0xadbfa43fU,
+    0x3a9de42cU,
+    0x78920d50U,
+    0x5fcc9b6aU,
+    0x7e466254U,
+    0x8d13c2f6U,
+    0xd8b8e890U,
+    0x39f75e2eU,
+    0xc3aff582U,
+    0x5d80be9fU,
+    0xd0937c69U,
+    0xd52da96fU,
+    0x2512b3cfU,
+    0xac993bc8U,
+    0x187da710U,
+    0x9c636ee8U,
+    0x3bbb7bdbU,
+    0x267809cdU,
+    0x5918f46eU,
+    0x9ab701ecU,
+    0x4f9aa883U,
+    0x956e65e6U,
+    0xffe67eaaU,
+    0xbccf0821U,
+    0x15e8e6efU,
+    0xe79bd9baU,
+    0x6f36ce4aU,
+    0x9f09d4eaU,
+    0xb07cd629U,
+    0xa4b2af31U,
+    0x3f23312aU,
+    0xa59430c6U,
+    0xa266c035U,
+    0x4ebc3774U,
+    0x82caa6fcU,
+    0x90d0b0e0U,
+    0xa7d81533U,
+    0x04984af1U,
+    0xecdaf741U,
+    0xcd500e7fU,
+    0x91f62f17U,
+    0x4dd68d76U,
+    0xefb04d43U,
+    0xaa4d54ccU,
+    0x9604dfe4U,
+    0xd1b5e39eU,
+    0x6a881b4cU,
+    0x2c1fb8c1U,
+    0x65517f46U,
+    0x5eea049dU,
+    0x8c355d01U,
+    0x877473faU,
+    0x0b412efbU,
+    0x671d5ab3U,
+    0xdbd25292U,
+    0x105633e9U,
+    0xd647136dU,
+    0xd7618c9aU,
+    0xa10c7a37U,
+    0xf8148e59U,
+    0x133c89ebU,
+    0xa927eeceU,
+    0x61c935b7U,
+    0x1ce5ede1U,
+    0x47b13c7aU,
+    0xd2df599cU,
+    0xf2733f55U,
+    0x14ce7918U,
+    0xc737bf73U,
+    0xf7cdea53U,
+    0xfdaa5b5fU,
+    0x3d6f14dfU,
+    0x44db8678U,
+    0xaff381caU,
+    0x68c43eb9U,
+    0x24342c38U,
+    0xa3405fc2U,
+    0x1dc37216U,
+    0xe2250cbcU,
+    0x3c498b28U,
+    0x0d9541ffU,
+    0xa8017139U,
+    0x0cb3de08U,
+    0xb4e49cd8U,
+    0x56c19064U,
+    0xcb84617bU,
+    0x32b670d5U,
+    0x6c5c7448U,
+    0xb85742d0U,
 };
 static const u8 Td4[256] = {
-    0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
-    0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
-    0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
-    0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
-    0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
-    0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
-    0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
-    0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
-    0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
-    0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
-    0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
-    0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
-    0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
-    0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
-    0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
-    0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
-    0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
-    0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
-    0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
-    0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
-    0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
-    0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
-    0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
-    0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
-    0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
-    0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
-    0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
-    0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
-    0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
-    0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
-    0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
-    0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
+    0x52U,
+    0x09U,
+    0x6aU,
+    0xd5U,
+    0x30U,
+    0x36U,
+    0xa5U,
+    0x38U,
+    0xbfU,
+    0x40U,
+    0xa3U,
+    0x9eU,
+    0x81U,
+    0xf3U,
+    0xd7U,
+    0xfbU,
+    0x7cU,
+    0xe3U,
+    0x39U,
+    0x82U,
+    0x9bU,
+    0x2fU,
+    0xffU,
+    0x87U,
+    0x34U,
+    0x8eU,
+    0x43U,
+    0x44U,
+    0xc4U,
+    0xdeU,
+    0xe9U,
+    0xcbU,
+    0x54U,
+    0x7bU,
+    0x94U,
+    0x32U,
+    0xa6U,
+    0xc2U,
+    0x23U,
+    0x3dU,
+    0xeeU,
+    0x4cU,
+    0x95U,
+    0x0bU,
+    0x42U,
+    0xfaU,
+    0xc3U,
+    0x4eU,
+    0x08U,
+    0x2eU,
+    0xa1U,
+    0x66U,
+    0x28U,
+    0xd9U,
+    0x24U,
+    0xb2U,
+    0x76U,
+    0x5bU,
+    0xa2U,
+    0x49U,
+    0x6dU,
+    0x8bU,
+    0xd1U,
+    0x25U,
+    0x72U,
+    0xf8U,
+    0xf6U,
+    0x64U,
+    0x86U,
+    0x68U,
+    0x98U,
+    0x16U,
+    0xd4U,
+    0xa4U,
+    0x5cU,
+    0xccU,
+    0x5dU,
+    0x65U,
+    0xb6U,
+    0x92U,
+    0x6cU,
+    0x70U,
+    0x48U,
+    0x50U,
+    0xfdU,
+    0xedU,
+    0xb9U,
+    0xdaU,
+    0x5eU,
+    0x15U,
+    0x46U,
+    0x57U,
+    0xa7U,
+    0x8dU,
+    0x9dU,
+    0x84U,
+    0x90U,
+    0xd8U,
+    0xabU,
+    0x00U,
+    0x8cU,
+    0xbcU,
+    0xd3U,
+    0x0aU,
+    0xf7U,
+    0xe4U,
+    0x58U,
+    0x05U,
+    0xb8U,
+    0xb3U,
+    0x45U,
+    0x06U,
+    0xd0U,
+    0x2cU,
+    0x1eU,
+    0x8fU,
+    0xcaU,
+    0x3fU,
+    0x0fU,
+    0x02U,
+    0xc1U,
+    0xafU,
+    0xbdU,
+    0x03U,
+    0x01U,
+    0x13U,
+    0x8aU,
+    0x6bU,
+    0x3aU,
+    0x91U,
+    0x11U,
+    0x41U,
+    0x4fU,
+    0x67U,
+    0xdcU,
+    0xeaU,
+    0x97U,
+    0xf2U,
+    0xcfU,
+    0xceU,
+    0xf0U,
+    0xb4U,
+    0xe6U,
+    0x73U,
+    0x96U,
+    0xacU,
+    0x74U,
+    0x22U,
+    0xe7U,
+    0xadU,
+    0x35U,
+    0x85U,
+    0xe2U,
+    0xf9U,
+    0x37U,
+    0xe8U,
+    0x1cU,
+    0x75U,
+    0xdfU,
+    0x6eU,
+    0x47U,
+    0xf1U,
+    0x1aU,
+    0x71U,
+    0x1dU,
+    0x29U,
+    0xc5U,
+    0x89U,
+    0x6fU,
+    0xb7U,
+    0x62U,
+    0x0eU,
+    0xaaU,
+    0x18U,
+    0xbeU,
+    0x1bU,
+    0xfcU,
+    0x56U,
+    0x3eU,
+    0x4bU,
+    0xc6U,
+    0xd2U,
+    0x79U,
+    0x20U,
+    0x9aU,
+    0xdbU,
+    0xc0U,
+    0xfeU,
+    0x78U,
+    0xcdU,
+    0x5aU,
+    0xf4U,
+    0x1fU,
+    0xddU,
+    0xa8U,
+    0x33U,
+    0x88U,
+    0x07U,
+    0xc7U,
+    0x31U,
+    0xb1U,
+    0x12U,
+    0x10U,
+    0x59U,
+    0x27U,
+    0x80U,
+    0xecU,
+    0x5fU,
+    0x60U,
+    0x51U,
+    0x7fU,
+    0xa9U,
+    0x19U,
+    0xb5U,
+    0x4aU,
+    0x0dU,
+    0x2dU,
+    0xe5U,
+    0x7aU,
+    0x9fU,
+    0x93U,
+    0xc9U,
+    0x9cU,
+    0xefU,
+    0xa0U,
+    0xe0U,
+    0x3bU,
+    0x4dU,
+    0xaeU,
+    0x2aU,
+    0xf5U,
+    0xb0U,
+    0xc8U,
+    0xebU,
+    0xbbU,
+    0x3cU,
+    0x83U,
+    0x53U,
+    0x99U,
+    0x61U,
+    0x17U,
+    0x2bU,
+    0x04U,
+    0x7eU,
+    0xbaU,
+    0x77U,
+    0xd6U,
+    0x26U,
+    0xe1U,
+    0x69U,
+    0x14U,
+    0x63U,
+    0x55U,
+    0x21U,
+    0x0cU,
+    0x7dU,
 };
 static const u32 rcon[] = {
-    0x01000000, 0x02000000, 0x04000000, 0x08000000,
-    0x10000000, 0x20000000, 0x40000000, 0x80000000,
-    0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+    0x01000000,
+    0x02000000,
+    0x04000000,
+    0x08000000,
+    0x10000000,
+    0x20000000,
+    0x40000000,
+    0x80000000,
+    0x1B000000,
+    0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
 };
 
 /**
  * Expand the cipher key into the encryption key schedule.
  */
 int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key)
+    AES_KEY *key)
 {
 
     u32 *rk;
@@ -1297,19 +3064,14 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
     else
         key->rounds = 14;
 
-    rk[0] = GETU32(userKey     );
-    rk[1] = GETU32(userKey +  4);
-    rk[2] = GETU32(userKey +  8);
+    rk[0] = GETU32(userKey);
+    rk[1] = GETU32(userKey + 4);
+    rk[2] = GETU32(userKey + 8);
     rk[3] = GETU32(userKey + 12);
     if (bits == 128) {
         while (1) {
-            temp  = rk[3];
-            rk[4] = rk[0] ^
-                (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-                (Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                (Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-                (Te1[(temp >> 24)       ] & 0x000000ff) ^
-                rcon[i];
+            temp = rk[3];
+            rk[4] = rk[0] ^ (Te2[(temp >> 16) & 0xff] & 0xff000000) ^ (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^ (Te0[(temp) & 0xff] & 0x0000ff00) ^ (Te1[(temp >> 24)] & 0x000000ff) ^ rcon[i];
             rk[5] = rk[1] ^ rk[4];
             rk[6] = rk[2] ^ rk[5];
             rk[7] = rk[3] ^ rk[6];
@@ -1323,21 +3085,16 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
     rk[5] = GETU32(userKey + 20);
     if (bits == 192) {
         while (1) {
-            temp = rk[ 5];
-            rk[ 6] = rk[ 0] ^
-                (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-                (Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                (Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-                (Te1[(temp >> 24)       ] & 0x000000ff) ^
-                rcon[i];
-            rk[ 7] = rk[ 1] ^ rk[ 6];
-            rk[ 8] = rk[ 2] ^ rk[ 7];
-            rk[ 9] = rk[ 3] ^ rk[ 8];
+            temp = rk[5];
+            rk[6] = rk[0] ^ (Te2[(temp >> 16) & 0xff] & 0xff000000) ^ (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^ (Te0[(temp) & 0xff] & 0x0000ff00) ^ (Te1[(temp >> 24)] & 0x000000ff) ^ rcon[i];
+            rk[7] = rk[1] ^ rk[6];
+            rk[8] = rk[2] ^ rk[7];
+            rk[9] = rk[3] ^ rk[8];
             if (++i == 8) {
                 return 0;
             }
-            rk[10] = rk[ 4] ^ rk[ 9];
-            rk[11] = rk[ 5] ^ rk[10];
+            rk[10] = rk[4] ^ rk[9];
+            rk[11] = rk[5] ^ rk[10];
             rk += 6;
         }
     }
@@ -1345,31 +3102,22 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
     rk[7] = GETU32(userKey + 28);
     if (bits == 256) {
         while (1) {
-            temp = rk[ 7];
-            rk[ 8] = rk[ 0] ^
-                (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-                (Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                (Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-                (Te1[(temp >> 24)       ] & 0x000000ff) ^
-                rcon[i];
-            rk[ 9] = rk[ 1] ^ rk[ 8];
-            rk[10] = rk[ 2] ^ rk[ 9];
-            rk[11] = rk[ 3] ^ rk[10];
+            temp = rk[7];
+            rk[8] = rk[0] ^ (Te2[(temp >> 16) & 0xff] & 0xff000000) ^ (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^ (Te0[(temp) & 0xff] & 0x0000ff00) ^ (Te1[(temp >> 24)] & 0x000000ff) ^ rcon[i];
+            rk[9] = rk[1] ^ rk[8];
+            rk[10] = rk[2] ^ rk[9];
+            rk[11] = rk[3] ^ rk[10];
             if (++i == 7) {
                 return 0;
             }
             temp = rk[11];
-            rk[12] = rk[ 4] ^
-                (Te2[(temp >> 24)       ] & 0xff000000) ^
-                (Te3[(temp >> 16) & 0xff] & 0x00ff0000) ^
-                (Te0[(temp >>  8) & 0xff] & 0x0000ff00) ^
-                (Te1[(temp      ) & 0xff] & 0x000000ff);
-            rk[13] = rk[ 5] ^ rk[12];
-            rk[14] = rk[ 6] ^ rk[13];
-            rk[15] = rk[ 7] ^ rk[14];
+            rk[12] = rk[4] ^ (Te2[(temp >> 24)] & 0xff000000) ^ (Te3[(temp >> 16) & 0xff] & 0x00ff0000) ^ (Te0[(temp >> 8) & 0xff] & 0x0000ff00) ^ (Te1[(temp) & 0xff] & 0x000000ff);
+            rk[13] = rk[5] ^ rk[12];
+            rk[14] = rk[6] ^ rk[13];
+            rk[15] = rk[7] ^ rk[14];
 
             rk += 8;
-            }
+        }
     }
     return 0;
 }
@@ -1378,7 +3126,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
  * Expand the cipher key into the decryption key schedule.
  */
 int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key)
+    AES_KEY *key)
 {
 
     u32 *rk;
@@ -1393,35 +3141,27 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
     rk = key->rd_key;
 
     /* invert the order of the round keys: */
-    for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-        temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-        temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-        temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-        temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+    for (i = 0, j = 4 * (key->rounds); i < j; i += 4, j -= 4) {
+        temp = rk[i];
+        rk[i] = rk[j];
+        rk[j] = temp;
+        temp = rk[i + 1];
+        rk[i + 1] = rk[j + 1];
+        rk[j + 1] = temp;
+        temp = rk[i + 2];
+        rk[i + 2] = rk[j + 2];
+        rk[j + 2] = temp;
+        temp = rk[i + 3];
+        rk[i + 3] = rk[j + 3];
+        rk[j + 3] = temp;
     }
     /* apply the inverse MixColumn transform to all round keys but the first and the last: */
     for (i = 1; i < (key->rounds); i++) {
         rk += 4;
-        rk[0] =
-            Td0[Te1[(rk[0] >> 24)       ] & 0xff] ^
-            Td1[Te1[(rk[0] >> 16) & 0xff] & 0xff] ^
-            Td2[Te1[(rk[0] >>  8) & 0xff] & 0xff] ^
-            Td3[Te1[(rk[0]      ) & 0xff] & 0xff];
-        rk[1] =
-            Td0[Te1[(rk[1] >> 24)       ] & 0xff] ^
-            Td1[Te1[(rk[1] >> 16) & 0xff] & 0xff] ^
-            Td2[Te1[(rk[1] >>  8) & 0xff] & 0xff] ^
-            Td3[Te1[(rk[1]      ) & 0xff] & 0xff];
-        rk[2] =
-            Td0[Te1[(rk[2] >> 24)       ] & 0xff] ^
-            Td1[Te1[(rk[2] >> 16) & 0xff] & 0xff] ^
-            Td2[Te1[(rk[2] >>  8) & 0xff] & 0xff] ^
-            Td3[Te1[(rk[2]      ) & 0xff] & 0xff];
-        rk[3] =
-            Td0[Te1[(rk[3] >> 24)       ] & 0xff] ^
-            Td1[Te1[(rk[3] >> 16) & 0xff] & 0xff] ^
-            Td2[Te1[(rk[3] >>  8) & 0xff] & 0xff] ^
-            Td3[Te1[(rk[3]      ) & 0xff] & 0xff];
+        rk[0] = Td0[Te1[(rk[0] >> 24)] & 0xff] ^ Td1[Te1[(rk[0] >> 16) & 0xff] & 0xff] ^ Td2[Te1[(rk[0] >> 8) & 0xff] & 0xff] ^ Td3[Te1[(rk[0]) & 0xff] & 0xff];
+        rk[1] = Td0[Te1[(rk[1] >> 24)] & 0xff] ^ Td1[Te1[(rk[1] >> 16) & 0xff] & 0xff] ^ Td2[Te1[(rk[1] >> 8) & 0xff] & 0xff] ^ Td3[Te1[(rk[1]) & 0xff] & 0xff];
+        rk[2] = Td0[Te1[(rk[2] >> 24)] & 0xff] ^ Td1[Te1[(rk[2] >> 16) & 0xff] & 0xff] ^ Td2[Te1[(rk[2] >> 8) & 0xff] & 0xff] ^ Td3[Te1[(rk[2]) & 0xff] & 0xff];
+        rk[3] = Td0[Te1[(rk[3] >> 24)] & 0xff] ^ Td1[Te1[(rk[3] >> 16) & 0xff] & 0xff] ^ Td2[Te1[(rk[3] >> 8) & 0xff] & 0xff] ^ Td3[Te1[(rk[3]) & 0xff] & 0xff];
     }
     return 0;
 }
@@ -1431,7 +3171,8 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
  * in and out can overlap
  */
 void AES_encrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key) {
+    const AES_KEY *key)
+{
 
     const u32 *rk;
     u32 s0, s1, s2, s3, t0, t1, t2, t3;
@@ -1446,174 +3187,114 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
      * map byte array block to cipher state
      * and add initial round key:
      */
-    s0 = GETU32(in     ) ^ rk[0];
-    s1 = GETU32(in +  4) ^ rk[1];
-    s2 = GETU32(in +  8) ^ rk[2];
+    s0 = GETU32(in) ^ rk[0];
+    s1 = GETU32(in + 4) ^ rk[1];
+    s2 = GETU32(in + 8) ^ rk[2];
     s3 = GETU32(in + 12) ^ rk[3];
 #ifdef FULL_UNROLL
     /* round 1: */
-    t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
-    t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
-    t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6];
-    t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7];
+    t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[4];
+    t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[5];
+    t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[6];
+    t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[7];
     /* round 2: */
-    s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8];
-    s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9];
-    s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
-    s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
+    s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[8];
+    s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[9];
+    s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
+    s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
     /* round 3: */
-    t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
-    t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
-    t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
-    t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
+    t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
+    t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
+    t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
+    t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
     /* round 4: */
-    s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
-    s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
-    s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
-    s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
+    s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
+    s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
+    s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
+    s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
     /* round 5: */
-    t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
-    t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
-    t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
-    t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
+    t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
+    t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
+    t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
+    t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
     /* round 6: */
-    s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
-    s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
-    s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
-    s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
+    s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
+    s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
+    s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
+    s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
     /* round 7: */
-    t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
-    t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
-    t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
-    t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
+    t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
+    t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
+    t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
+    t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
     /* round 8: */
-    s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
-    s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
-    s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
-    s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
+    s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
+    s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
+    s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
+    s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
     /* round 9: */
-    t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
-    t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
-    t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
-    t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
+    t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
+    t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
+    t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
+    t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
     if (key->rounds > 10) {
         /* round 10: */
-        s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
-        s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
-        s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
-        s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
+        s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
+        s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
+        s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
+        s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
         /* round 11: */
-        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
-        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
-        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
-        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
+        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
+        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
+        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
+        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
         if (key->rounds > 12) {
             /* round 12: */
-            s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
-            s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
-            s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
-            s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
+            s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
+            s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
+            s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
+            s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
             /* round 13: */
-            t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
-            t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
-            t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
-            t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
+            t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
+            t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
+            t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
+            t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
         }
     }
     rk += key->rounds << 2;
-#else  /* !FULL_UNROLL */
+#else /* !FULL_UNROLL */
     /*
      * Nr - 1 full rounds:
      */
     r = key->rounds >> 1;
     for (;;) {
-        t0 =
-            Te0[(s0 >> 24)       ] ^
-            Te1[(s1 >> 16) & 0xff] ^
-            Te2[(s2 >>  8) & 0xff] ^
-            Te3[(s3      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Te0[(s1 >> 24)       ] ^
-            Te1[(s2 >> 16) & 0xff] ^
-            Te2[(s3 >>  8) & 0xff] ^
-            Te3[(s0      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Te0[(s2 >> 24)       ] ^
-            Te1[(s3 >> 16) & 0xff] ^
-            Te2[(s0 >>  8) & 0xff] ^
-            Te3[(s1      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Te0[(s3 >> 24)       ] ^
-            Te1[(s0 >> 16) & 0xff] ^
-            Te2[(s1 >>  8) & 0xff] ^
-            Te3[(s2      ) & 0xff] ^
-            rk[7];
+        t0 = Te0[(s0 >> 24)] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >> 8) & 0xff] ^ Te3[(s3) & 0xff] ^ rk[4];
+        t1 = Te0[(s1 >> 24)] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >> 8) & 0xff] ^ Te3[(s0) & 0xff] ^ rk[5];
+        t2 = Te0[(s2 >> 24)] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >> 8) & 0xff] ^ Te3[(s1) & 0xff] ^ rk[6];
+        t3 = Te0[(s3 >> 24)] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >> 8) & 0xff] ^ Te3[(s2) & 0xff] ^ rk[7];
 
         rk += 8;
         if (--r == 0) {
             break;
         }
 
-        s0 =
-            Te0[(t0 >> 24)       ] ^
-            Te1[(t1 >> 16) & 0xff] ^
-            Te2[(t2 >>  8) & 0xff] ^
-            Te3[(t3      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Te0[(t1 >> 24)       ] ^
-            Te1[(t2 >> 16) & 0xff] ^
-            Te2[(t3 >>  8) & 0xff] ^
-            Te3[(t0      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Te0[(t2 >> 24)       ] ^
-            Te1[(t3 >> 16) & 0xff] ^
-            Te2[(t0 >>  8) & 0xff] ^
-            Te3[(t1      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Te0[(t3 >> 24)       ] ^
-            Te1[(t0 >> 16) & 0xff] ^
-            Te2[(t1 >>  8) & 0xff] ^
-            Te3[(t2      ) & 0xff] ^
-            rk[3];
+        s0 = Te0[(t0 >> 24)] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >> 8) & 0xff] ^ Te3[(t3) & 0xff] ^ rk[0];
+        s1 = Te0[(t1 >> 24)] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >> 8) & 0xff] ^ Te3[(t0) & 0xff] ^ rk[1];
+        s2 = Te0[(t2 >> 24)] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >> 8) & 0xff] ^ Te3[(t1) & 0xff] ^ rk[2];
+        s3 = Te0[(t3 >> 24)] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >> 8) & 0xff] ^ Te3[(t2) & 0xff] ^ rk[3];
     }
 #endif /* ?FULL_UNROLL */
     /*
      * apply last round and
      * map cipher state to byte array block:
      */
-    s0 =
-        (Te2[(t0 >> 24)       ] & 0xff000000) ^
-        (Te3[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-        (Te0[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-        (Te1[(t3      ) & 0xff] & 0x000000ff) ^
-        rk[0];
-    PUTU32(out     , s0);
-    s1 =
-        (Te2[(t1 >> 24)       ] & 0xff000000) ^
-        (Te3[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-        (Te0[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-        (Te1[(t0      ) & 0xff] & 0x000000ff) ^
-        rk[1];
-    PUTU32(out +  4, s1);
-    s2 =
-        (Te2[(t2 >> 24)       ] & 0xff000000) ^
-        (Te3[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-        (Te0[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-        (Te1[(t1      ) & 0xff] & 0x000000ff) ^
-        rk[2];
-    PUTU32(out +  8, s2);
-    s3 =
-        (Te2[(t3 >> 24)       ] & 0xff000000) ^
-        (Te3[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-        (Te0[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-        (Te1[(t2      ) & 0xff] & 0x000000ff) ^
-        rk[3];
+    s0 = (Te2[(t0 >> 24)] & 0xff000000) ^ (Te3[(t1 >> 16) & 0xff] & 0x00ff0000) ^ (Te0[(t2 >> 8) & 0xff] & 0x0000ff00) ^ (Te1[(t3) & 0xff] & 0x000000ff) ^ rk[0];
+    PUTU32(out, s0);
+    s1 = (Te2[(t1 >> 24)] & 0xff000000) ^ (Te3[(t2 >> 16) & 0xff] & 0x00ff0000) ^ (Te0[(t3 >> 8) & 0xff] & 0x0000ff00) ^ (Te1[(t0) & 0xff] & 0x000000ff) ^ rk[1];
+    PUTU32(out + 4, s1);
+    s2 = (Te2[(t2 >> 24)] & 0xff000000) ^ (Te3[(t3 >> 16) & 0xff] & 0x00ff0000) ^ (Te0[(t0 >> 8) & 0xff] & 0x0000ff00) ^ (Te1[(t1) & 0xff] & 0x000000ff) ^ rk[2];
+    PUTU32(out + 8, s2);
+    s3 = (Te2[(t3 >> 24)] & 0xff000000) ^ (Te3[(t0 >> 16) & 0xff] & 0x00ff0000) ^ (Te0[(t1 >> 8) & 0xff] & 0x0000ff00) ^ (Te1[(t2) & 0xff] & 0x000000ff) ^ rk[3];
     PUTU32(out + 12, s3);
 }
 
@@ -1622,7 +3303,7 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
  * in and out can overlap
  */
 void AES_decrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key)
+    const AES_KEY *key)
 {
 
     const u32 *rk;
@@ -1638,174 +3319,114 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
      * map byte array block to cipher state
      * and add initial round key:
      */
-    s0 = GETU32(in     ) ^ rk[0];
-    s1 = GETU32(in +  4) ^ rk[1];
-    s2 = GETU32(in +  8) ^ rk[2];
+    s0 = GETU32(in) ^ rk[0];
+    s1 = GETU32(in + 4) ^ rk[1];
+    s2 = GETU32(in + 8) ^ rk[2];
     s3 = GETU32(in + 12) ^ rk[3];
 #ifdef FULL_UNROLL
     /* round 1: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7];
+    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[4];
+    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[5];
+    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[6];
+    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[7];
     /* round 2: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
+    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[8];
+    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[9];
+    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
+    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
     /* round 3: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
+    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
+    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
+    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
+    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
     /* round 4: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
+    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
+    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
+    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
+    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
     /* round 5: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
+    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
+    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
+    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
+    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
     /* round 6: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
+    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
+    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
+    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
+    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
     /* round 7: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
+    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
+    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
+    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
+    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
     /* round 8: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
+    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
+    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
+    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
+    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
     /* round 9: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
+    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
+    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
+    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
+    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
     if (key->rounds > 10) {
         /* round 10: */
-        s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
-        s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
-        s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
-        s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
+        s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
+        s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
+        s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
+        s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
         /* round 11: */
-        t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
-        t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
-        t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
-        t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
+        t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
+        t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
+        t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
+        t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
         if (key->rounds > 12) {
             /* round 12: */
-            s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
-            s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
-            s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
-            s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
+            s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
+            s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
+            s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
+            s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
             /* round 13: */
-            t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
-            t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
-            t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
-            t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
+            t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
+            t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
+            t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
+            t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
         }
     }
     rk += key->rounds << 2;
-#else  /* !FULL_UNROLL */
+#else /* !FULL_UNROLL */
     /*
      * Nr - 1 full rounds:
      */
     r = key->rounds >> 1;
     for (;;) {
-        t0 =
-            Td0[(s0 >> 24)       ] ^
-            Td1[(s3 >> 16) & 0xff] ^
-            Td2[(s2 >>  8) & 0xff] ^
-            Td3[(s1      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Td0[(s1 >> 24)       ] ^
-            Td1[(s0 >> 16) & 0xff] ^
-            Td2[(s3 >>  8) & 0xff] ^
-            Td3[(s2      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Td0[(s2 >> 24)       ] ^
-            Td1[(s1 >> 16) & 0xff] ^
-            Td2[(s0 >>  8) & 0xff] ^
-            Td3[(s3      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Td0[(s3 >> 24)       ] ^
-            Td1[(s2 >> 16) & 0xff] ^
-            Td2[(s1 >>  8) & 0xff] ^
-            Td3[(s0      ) & 0xff] ^
-            rk[7];
+        t0 = Td0[(s0 >> 24)] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >> 8) & 0xff] ^ Td3[(s1) & 0xff] ^ rk[4];
+        t1 = Td0[(s1 >> 24)] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >> 8) & 0xff] ^ Td3[(s2) & 0xff] ^ rk[5];
+        t2 = Td0[(s2 >> 24)] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >> 8) & 0xff] ^ Td3[(s3) & 0xff] ^ rk[6];
+        t3 = Td0[(s3 >> 24)] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >> 8) & 0xff] ^ Td3[(s0) & 0xff] ^ rk[7];
 
         rk += 8;
         if (--r == 0) {
             break;
         }
 
-        s0 =
-            Td0[(t0 >> 24)       ] ^
-            Td1[(t3 >> 16) & 0xff] ^
-            Td2[(t2 >>  8) & 0xff] ^
-            Td3[(t1      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Td0[(t1 >> 24)       ] ^
-            Td1[(t0 >> 16) & 0xff] ^
-            Td2[(t3 >>  8) & 0xff] ^
-            Td3[(t2      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Td0[(t2 >> 24)       ] ^
-            Td1[(t1 >> 16) & 0xff] ^
-            Td2[(t0 >>  8) & 0xff] ^
-            Td3[(t3      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Td0[(t3 >> 24)       ] ^
-            Td1[(t2 >> 16) & 0xff] ^
-            Td2[(t1 >>  8) & 0xff] ^
-            Td3[(t0      ) & 0xff] ^
-            rk[3];
+        s0 = Td0[(t0 >> 24)] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >> 8) & 0xff] ^ Td3[(t1) & 0xff] ^ rk[0];
+        s1 = Td0[(t1 >> 24)] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >> 8) & 0xff] ^ Td3[(t2) & 0xff] ^ rk[1];
+        s2 = Td0[(t2 >> 24)] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >> 8) & 0xff] ^ Td3[(t3) & 0xff] ^ rk[2];
+        s3 = Td0[(t3 >> 24)] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >> 8) & 0xff] ^ Td3[(t0) & 0xff] ^ rk[3];
     }
 #endif /* ?FULL_UNROLL */
     /*
      * apply last round and
      * map cipher state to byte array block:
      */
-    s0 =
-        ((u32)Td4[(t0 >> 24)       ] << 24) ^
-        ((u32)Td4[(t3 >> 16) & 0xff] << 16) ^
-        ((u32)Td4[(t2 >>  8) & 0xff] <<  8) ^
-        ((u32)Td4[(t1      ) & 0xff])       ^
-        rk[0];
-    PUTU32(out     , s0);
-    s1 =
-        ((u32)Td4[(t1 >> 24)       ] << 24) ^
-        ((u32)Td4[(t0 >> 16) & 0xff] << 16) ^
-        ((u32)Td4[(t3 >>  8) & 0xff] <<  8) ^
-        ((u32)Td4[(t2      ) & 0xff])       ^
-        rk[1];
-    PUTU32(out +  4, s1);
-    s2 =
-        ((u32)Td4[(t2 >> 24)       ] << 24) ^
-        ((u32)Td4[(t1 >> 16) & 0xff] << 16) ^
-        ((u32)Td4[(t0 >>  8) & 0xff] <<  8) ^
-        ((u32)Td4[(t3      ) & 0xff])       ^
-        rk[2];
-    PUTU32(out +  8, s2);
-    s3 =
-        ((u32)Td4[(t3 >> 24)       ] << 24) ^
-        ((u32)Td4[(t2 >> 16) & 0xff] << 16) ^
-        ((u32)Td4[(t1 >>  8) & 0xff] <<  8) ^
-        ((u32)Td4[(t0      ) & 0xff])       ^
-        rk[3];
+    s0 = ((u32)Td4[(t0 >> 24)] << 24) ^ ((u32)Td4[(t3 >> 16) & 0xff] << 16) ^ ((u32)Td4[(t2 >> 8) & 0xff] << 8) ^ ((u32)Td4[(t1) & 0xff]) ^ rk[0];
+    PUTU32(out, s0);
+    s1 = ((u32)Td4[(t1 >> 24)] << 24) ^ ((u32)Td4[(t0 >> 16) & 0xff] << 16) ^ ((u32)Td4[(t3 >> 8) & 0xff] << 8) ^ ((u32)Td4[(t2) & 0xff]) ^ rk[1];
+    PUTU32(out + 4, s1);
+    s2 = ((u32)Td4[(t2 >> 24)] << 24) ^ ((u32)Td4[(t1 >> 16) & 0xff] << 16) ^ ((u32)Td4[(t0 >> 8) & 0xff] << 8) ^ ((u32)Td4[(t3) & 0xff]) ^ rk[2];
+    PUTU32(out + 8, s2);
+    s3 = ((u32)Td4[(t3 >> 24)] << 24) ^ ((u32)Td4[(t2 >> 16) & 0xff] << 16) ^ ((u32)Td4[(t1 >> 8) & 0xff] << 8) ^ ((u32)Td4[(t0) & 0xff]) ^ rk[3];
     PUTU32(out + 12, s3);
 }
 
@@ -1846,16 +3467,23 @@ static const u8 Te4[256] = {
     0x41U, 0x99U, 0x2dU, 0x0fU, 0xb0U, 0x54U, 0xbbU, 0x16U
 };
 static const u32 rcon[] = {
-    0x01000000, 0x02000000, 0x04000000, 0x08000000,
-    0x10000000, 0x20000000, 0x40000000, 0x80000000,
-    0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+    0x01000000,
+    0x02000000,
+    0x04000000,
+    0x08000000,
+    0x10000000,
+    0x20000000,
+    0x40000000,
+    0x80000000,
+    0x1B000000,
+    0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
 };
 
 /**
  * Expand the cipher key into the encryption key schedule.
  */
 int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key)
+    AES_KEY *key)
 {
     u32 *rk;
     int i = 0;
@@ -1875,19 +3503,14 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
     else
         key->rounds = 14;
 
-    rk[0] = GETU32(userKey     );
-    rk[1] = GETU32(userKey +  4);
-    rk[2] = GETU32(userKey +  8);
+    rk[0] = GETU32(userKey);
+    rk[1] = GETU32(userKey + 4);
+    rk[2] = GETU32(userKey + 8);
     rk[3] = GETU32(userKey + 12);
     if (bits == 128) {
         while (1) {
-            temp  = rk[3];
-            rk[4] = rk[0] ^
-                ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
-                ((u32)Te4[(temp >>  8) & 0xff] << 16) ^
-                ((u32)Te4[(temp      ) & 0xff] << 8) ^
-                ((u32)Te4[(temp >> 24)       ]) ^
-                rcon[i];
+            temp = rk[3];
+            rk[4] = rk[0] ^ ((u32)Te4[(temp >> 16) & 0xff] << 24) ^ ((u32)Te4[(temp >> 8) & 0xff] << 16) ^ ((u32)Te4[(temp) & 0xff] << 8) ^ ((u32)Te4[(temp >> 24)]) ^ rcon[i];
             rk[5] = rk[1] ^ rk[4];
             rk[6] = rk[2] ^ rk[5];
             rk[7] = rk[3] ^ rk[6];
@@ -1901,21 +3524,16 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
     rk[5] = GETU32(userKey + 20);
     if (bits == 192) {
         while (1) {
-            temp = rk[ 5];
-            rk[ 6] = rk[ 0] ^
-                ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
-                ((u32)Te4[(temp >>  8) & 0xff] << 16) ^
-                ((u32)Te4[(temp      ) & 0xff] << 8) ^
-                ((u32)Te4[(temp >> 24)       ]) ^
-                rcon[i];
-            rk[ 7] = rk[ 1] ^ rk[ 6];
-            rk[ 8] = rk[ 2] ^ rk[ 7];
-            rk[ 9] = rk[ 3] ^ rk[ 8];
+            temp = rk[5];
+            rk[6] = rk[0] ^ ((u32)Te4[(temp >> 16) & 0xff] << 24) ^ ((u32)Te4[(temp >> 8) & 0xff] << 16) ^ ((u32)Te4[(temp) & 0xff] << 8) ^ ((u32)Te4[(temp >> 24)]) ^ rcon[i];
+            rk[7] = rk[1] ^ rk[6];
+            rk[8] = rk[2] ^ rk[7];
+            rk[9] = rk[3] ^ rk[8];
             if (++i == 8) {
                 return 0;
             }
-            rk[10] = rk[ 4] ^ rk[ 9];
-            rk[11] = rk[ 5] ^ rk[10];
+            rk[10] = rk[4] ^ rk[9];
+            rk[11] = rk[5] ^ rk[10];
             rk += 6;
         }
     }
@@ -1923,28 +3541,19 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
     rk[7] = GETU32(userKey + 28);
     if (bits == 256) {
         while (1) {
-            temp = rk[ 7];
-            rk[ 8] = rk[ 0] ^
-                ((u32)Te4[(temp >> 16) & 0xff] << 24) ^
-                ((u32)Te4[(temp >>  8) & 0xff] << 16) ^
-                ((u32)Te4[(temp      ) & 0xff] << 8) ^
-                ((u32)Te4[(temp >> 24)       ]) ^
-                rcon[i];
-            rk[ 9] = rk[ 1] ^ rk[ 8];
-            rk[10] = rk[ 2] ^ rk[ 9];
-            rk[11] = rk[ 3] ^ rk[10];
+            temp = rk[7];
+            rk[8] = rk[0] ^ ((u32)Te4[(temp >> 16) & 0xff] << 24) ^ ((u32)Te4[(temp >> 8) & 0xff] << 16) ^ ((u32)Te4[(temp) & 0xff] << 8) ^ ((u32)Te4[(temp >> 24)]) ^ rcon[i];
+            rk[9] = rk[1] ^ rk[8];
+            rk[10] = rk[2] ^ rk[9];
+            rk[11] = rk[3] ^ rk[10];
             if (++i == 7) {
                 return 0;
             }
             temp = rk[11];
-            rk[12] = rk[ 4] ^
-                ((u32)Te4[(temp >> 24)       ] << 24) ^
-                ((u32)Te4[(temp >> 16) & 0xff] << 16) ^
-                ((u32)Te4[(temp >>  8) & 0xff] << 8) ^
-                ((u32)Te4[(temp      ) & 0xff]);
-            rk[13] = rk[ 5] ^ rk[12];
-            rk[14] = rk[ 6] ^ rk[13];
-            rk[15] = rk[ 7] ^ rk[14];
+            rk[12] = rk[4] ^ ((u32)Te4[(temp >> 24)] << 24) ^ ((u32)Te4[(temp >> 16) & 0xff] << 16) ^ ((u32)Te4[(temp >> 8) & 0xff] << 8) ^ ((u32)Te4[(temp) & 0xff]);
+            rk[13] = rk[5] ^ rk[12];
+            rk[14] = rk[6] ^ rk[13];
+            rk[15] = rk[7] ^ rk[14];
 
             rk += 8;
         }
@@ -1956,7 +3565,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
  * Expand the cipher key into the decryption key schedule.
  */
 int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key)
+    AES_KEY *key)
 {
 
     u32 *rk;
@@ -1971,11 +3580,19 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
     rk = key->rd_key;
 
     /* invert the order of the round keys: */
-    for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-        temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-        temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-        temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-        temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+    for (i = 0, j = 4 * (key->rounds); i < j; i += 4, j -= 4) {
+        temp = rk[i];
+        rk[i] = rk[j];
+        rk[j] = temp;
+        temp = rk[i + 1];
+        rk[i + 1] = rk[j + 1];
+        rk[j + 1] = temp;
+        temp = rk[i + 2];
+        rk[i + 2] = rk[j + 2];
+        rk[j + 2] = temp;
+        temp = rk[i + 3];
+        rk[i + 3] = rk[j + 3];
+        rk[j + 3] = temp;
     }
     /* apply the inverse MixColumn transform to all round keys but the first and the last: */
     for (i = 1; i < (key->rounds); i++) {
@@ -1985,25 +3602,19 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
 
             tp1 = rk[j];
             m = tp1 & 0x80808080;
-            tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-                ((m - (m >> 7)) & 0x1b1b1b1b);
+            tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
             m = tp2 & 0x80808080;
-            tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-                ((m - (m >> 7)) & 0x1b1b1b1b);
+            tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
             m = tp4 & 0x80808080;
-            tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-                ((m - (m >> 7)) & 0x1b1b1b1b);
+            tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
             tp9 = tp8 ^ tp1;
             tpb = tp9 ^ tp2;
             tpd = tp9 ^ tp4;
             tpe = tp8 ^ tp4 ^ tp2;
 #if defined(ROTATE)
-            rk[j] = tpe ^ ROTATE(tpd,16) ^
-                ROTATE(tp9,24) ^ ROTATE(tpb,8);
+            rk[j] = tpe ^ ROTATE(tpd, 16) ^ ROTATE(tp9, 24) ^ ROTATE(tpb, 8);
 #else
-            rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
-                (tp9 >> 8) ^ (tp9 << 24) ^
-                (tpb >> 24) ^ (tpb << 8);
+            rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ (tp9 >> 8) ^ (tp9 << 24) ^ (tpb >> 24) ^ (tpb << 8);
 #endif
         }
     }
diff --git a/crypto/aes/aes_ecb.c b/crypto/aes/aes_ecb.c
index e05afb0449ccf..d0e9747ccc3f6 100644
--- a/crypto/aes/aes_ecb.c
+++ b/crypto/aes/aes_ecb.c
@@ -19,7 +19,7 @@
 #include "aes_local.h"
 
 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)
 {
 
     assert(in && out && key);
diff --git a/crypto/aes/aes_ige.c b/crypto/aes/aes_ige.c
index 72fcba7a0cf15..0308f3f22567e 100644
--- a/crypto/aes/aes_ige.c
+++ b/crypto/aes/aes_ige.c
@@ -20,9 +20,9 @@
 
 /* XXX: probably some better way to do this */
 #if defined(__i386__) || defined(__x86_64__)
-# define UNALIGNED_MEMOPS_ARE_FAST 1
+#define UNALIGNED_MEMOPS_ARE_FAST 1
 #else
-# define UNALIGNED_MEMOPS_ARE_FAST 0
+#define UNALIGNED_MEMOPS_ARE_FAST 0
 #endif
 
 #define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long))
@@ -35,19 +35,19 @@ typedef struct {
 #endif
 
 #if UNALIGNED_MEMOPS_ARE_FAST
-# define load_block(d, s)        (d) = *(const aes_block_t *)(s)
-# define store_block(d, s)       *(aes_block_t *)(d) = (s)
+#define load_block(d, s) (d) = *(const aes_block_t *)(s)
+#define store_block(d, s) *(aes_block_t *)(d) = (s)
 #else
-# define load_block(d, s)        memcpy((d).data, (s), AES_BLOCK_SIZE)
-# define store_block(d, s)       memcpy((d), (s).data, AES_BLOCK_SIZE)
+#define load_block(d, s) memcpy((d).data, (s), AES_BLOCK_SIZE)
+#define store_block(d, s) memcpy((d), (s).data, AES_BLOCK_SIZE)
 #endif
 
 /* N.B. The IV for this mode is _twice_ the block size */
 
 /*  Use of this function is deprecated. */
 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)
 {
     size_t n;
     size_t len = length / AES_BLOCK_SIZE;
@@ -60,21 +60,18 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
     OPENSSL_assert((length % AES_BLOCK_SIZE) == 0);
 
     if (AES_ENCRYPT == enc) {
-        if (in != out &&
-            (UNALIGNED_MEMOPS_ARE_FAST
-             || ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(long) ==
-             0)) {
-            aes_block_t *ivp = (aes_block_t *) ivec;
-            aes_block_t *iv2p = (aes_block_t *) (ivec + AES_BLOCK_SIZE);
+        if (in != out && (UNALIGNED_MEMOPS_ARE_FAST || ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(long) == 0)) {
+            aes_block_t *ivp = (aes_block_t *)ivec;
+            aes_block_t *iv2p = (aes_block_t *)(ivec + AES_BLOCK_SIZE);
 
             while (len) {
-                aes_block_t *inp = (aes_block_t *) in;
-                aes_block_t *outp = (aes_block_t *) out;
+                aes_block_t *inp = (aes_block_t *)in;
+                aes_block_t *outp = (aes_block_t *)out;
 
                 for (n = 0; n < N_WORDS; ++n)
                     outp->data[n] = inp->data[n] ^ ivp->data[n];
                 AES_encrypt((unsigned char *)outp->data,
-                            (unsigned char *)outp->data, key);
+                    (unsigned char *)outp->data, key);
                 for (n = 0; n < N_WORDS; ++n)
                     outp->data[n] ^= iv2p->data[n];
                 ivp = outp;
@@ -98,7 +95,7 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
                 for (n = 0; n < N_WORDS; ++n)
                     tmp2.data[n] = tmp.data[n] ^ iv.data[n];
                 AES_encrypt((unsigned char *)tmp2.data,
-                            (unsigned char *)tmp2.data, key);
+                    (unsigned char *)tmp2.data, key);
                 for (n = 0; n < N_WORDS; ++n)
                     tmp2.data[n] ^= iv2.data[n];
                 store_block(out, tmp2);
@@ -112,22 +109,19 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
             memcpy(ivec + AES_BLOCK_SIZE, iv2.data, AES_BLOCK_SIZE);
         }
     } else {
-        if (in != out &&
-            (UNALIGNED_MEMOPS_ARE_FAST
-             || ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(long) ==
-             0)) {
-            aes_block_t *ivp = (aes_block_t *) ivec;
-            aes_block_t *iv2p = (aes_block_t *) (ivec + AES_BLOCK_SIZE);
+        if (in != out && (UNALIGNED_MEMOPS_ARE_FAST || ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(long) == 0)) {
+            aes_block_t *ivp = (aes_block_t *)ivec;
+            aes_block_t *iv2p = (aes_block_t *)(ivec + AES_BLOCK_SIZE);
 
             while (len) {
                 aes_block_t tmp;
-                aes_block_t *inp = (aes_block_t *) in;
-                aes_block_t *outp = (aes_block_t *) out;
+                aes_block_t *inp = (aes_block_t *)in;
+                aes_block_t *outp = (aes_block_t *)out;
 
                 for (n = 0; n < N_WORDS; ++n)
                     tmp.data[n] = inp->data[n] ^ iv2p->data[n];
                 AES_decrypt((unsigned char *)tmp.data,
-                            (unsigned char *)outp->data, key);
+                    (unsigned char *)outp->data, key);
                 for (n = 0; n < N_WORDS; ++n)
                     outp->data[n] ^= ivp->data[n];
                 ivp = inp;
@@ -152,7 +146,7 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
                 for (n = 0; n < N_WORDS; ++n)
                     tmp.data[n] ^= iv2.data[n];
                 AES_decrypt((unsigned char *)tmp.data,
-                            (unsigned char *)tmp.data, key);
+                    (unsigned char *)tmp.data, key);
                 for (n = 0; n < N_WORDS; ++n)
                     tmp.data[n] ^= iv.data[n];
                 store_block(out, tmp);
@@ -184,9 +178,9 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
 /* N.B. The IV for this mode is _four times_ the block size */
 
 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)
 {
     size_t n;
     size_t len = length;
diff --git a/crypto/aes/aes_local.h b/crypto/aes/aes_local.h
index 69d17d6cde7bc..71f9f5c648b99 100644
--- a/crypto/aes/aes_local.h
+++ b/crypto/aes/aes_local.h
@@ -8,36 +8,45 @@
  */
 
 #ifndef OSSL_CRYPTO_AES_LOCAL_H
-# define OSSL_CRYPTO_AES_LOCAL_H
+#define OSSL_CRYPTO_AES_LOCAL_H
 
-# include <openssl/e_os2.h>
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
+#include <openssl/e_os2.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-# if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
-#  define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
-#  define GETU32(p) SWAP(*((u32 *)(p)))
-#  define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); }
-# else
-#  define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] <<  8) ^ ((u32)(pt)[3]))
-#  define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >>  8); (ct)[3] = (u8)(st); }
-# endif
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
+#define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
+#define GETU32(p) SWAP(*((u32 *)(p)))
+#define PUTU32(ct, st)               \
+    {                                \
+        *((u32 *)(ct)) = SWAP((st)); \
+    }
+#else
+#define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] << 8) ^ ((u32)(pt)[3]))
+#define PUTU32(ct, st)              \
+    {                               \
+        (ct)[0] = (u8)((st) >> 24); \
+        (ct)[1] = (u8)((st) >> 16); \
+        (ct)[2] = (u8)((st) >> 8);  \
+        (ct)[3] = (u8)(st);         \
+    }
+#endif
 
 typedef uint64_t u64;
-# ifdef AES_LONG
+#ifdef AES_LONG
 typedef unsigned long u32;
-# else
+#else
 typedef unsigned int u32;
-# endif
+#endif
 typedef unsigned short u16;
 typedef unsigned char u8;
 
-# define MAXKC   (256/32)
-# define MAXKB   (256/8)
-# define MAXNR   14
+#define MAXKC (256 / 32)
+#define MAXKB (256 / 8)
+#define MAXNR 14
 
 /* This controls loop-unrolling in aes_core.c */
-# undef FULL_UNROLL
+#undef FULL_UNROLL
 
-#endif                          /* !OSSL_CRYPTO_AES_LOCAL_H */
+#endif /* !OSSL_CRYPTO_AES_LOCAL_H */
diff --git a/crypto/aes/aes_misc.c b/crypto/aes/aes_misc.c
index 7f39bcf2b35f3..e2729dd549608 100644
--- a/crypto/aes/aes_misc.c
+++ b/crypto/aes/aes_misc.c
@@ -14,10 +14,10 @@
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 const char *AES_options(void)
 {
-# ifdef FULL_UNROLL
+#ifdef FULL_UNROLL
     return "aes(full)";
-# else
+#else
     return "aes(partial)";
-# endif
+#endif
 }
 #endif
diff --git a/crypto/aes/aes_ofb.c b/crypto/aes/aes_ofb.c
index 58e47dc45e737..57b5a5496de91 100644
--- a/crypto/aes/aes_ofb.c
+++ b/crypto/aes/aes_ofb.c
@@ -17,9 +17,9 @@
 #include <openssl/modes.h>
 
 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)
 {
     CRYPTO_ofb128_encrypt(in, out, length, key, ivec, num,
-                          (block128_f) AES_encrypt);
+        (block128_f)AES_encrypt);
 }
diff --git a/crypto/aes/aes_wrap.c b/crypto/aes/aes_wrap.c
index 2187883aff917..6b372c67a85af 100644
--- a/crypto/aes/aes_wrap.c
+++ b/crypto/aes/aes_wrap.c
@@ -18,16 +18,16 @@
 #include <openssl/modes.h>
 
 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)
 {
-    return CRYPTO_128_wrap(key, iv, out, in, inlen, (block128_f) AES_encrypt);
+    return CRYPTO_128_wrap(key, iv, out, in, inlen, (block128_f)AES_encrypt);
 }
 
 int AES_unwrap_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)
 {
     return CRYPTO_128_unwrap(key, iv, out, in, inlen,
-                             (block128_f) AES_decrypt);
+        (block128_f)AES_decrypt);
 }
diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c
index 3e5b24ed193d8..0fa994871b279 100644
--- a/crypto/aes/aes_x86core.c
+++ b/crypto/aes/aes_x86core.c
@@ -41,7 +41,6 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include <assert.h>
 
 #include <stdlib.h>
@@ -53,11 +52,11 @@
  * referenced in outer and respectively inner rounds.
  */
 #define AES_COMPACT_IN_OUTER_ROUNDS
-#ifdef  AES_COMPACT_IN_OUTER_ROUNDS
+#ifdef AES_COMPACT_IN_OUTER_ROUNDS
 /* AES_COMPACT_IN_OUTER_ROUNDS costs ~30% in performance, while
  * adding AES_COMPACT_IN_INNER_ROUNDS reduces benchmark *further*
  * by factor of ~2. */
-# undef  AES_COMPACT_IN_INNER_ROUNDS
+#undef AES_COMPACT_IN_INNER_ROUNDS
 #endif
 
 #if 1
@@ -68,42 +67,43 @@ static void prefetch256(const void *table)
     int i;
 
     /* 32 is common least cache-line size */
-    for (sum = 0, i = 0; i < 256/sizeof(t[0]); i += 32/sizeof(t[0]))
+    for (sum = 0, i = 0; i < 256 / sizeof(t[0]); i += 32 / sizeof(t[0]))
         sum ^= t[i];
 
     ret = sum;
 }
 #else
-# define prefetch256(t)
+#define prefetch256(t)
 #endif
 
 #undef GETU32
-#define GETU32(p) (*((u32*)(p)))
+#define GETU32(p) (*((u32 *)(p)))
 
 #if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#define U64(C)  C##UI64
+#define U64(C) C##UI64
 #elif defined(__arch64__)
-#define U64(C)  C##UL
+#define U64(C) C##UL
 #else
-#define U64(C)  C##ULL
+#define U64(C) C##ULL
 #endif
 
 #undef ROTATE
 #if defined(_MSC_VER)
-# define ROTATE(a,n)    _lrotl(a,n)
+#define ROTATE(a, n) _lrotl(a, n)
 #elif defined(__ICC)
-# define ROTATE(a,n)    _rotl(a,n)
-#elif defined(__GNUC__) && __GNUC__>=2
-# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-#   define ROTATE(a,n)  ({ register unsigned int ret;   \
-                asm (           \
-                "roll %1,%0"        \
-                : "=r"(ret)     \
-                : "I"(n), "0"(a)    \
-                : "cc");        \
-               ret;             \
-            })
-# endif
+#define ROTATE(a, n) _rotl(a, n)
+#elif defined(__GNUC__) && __GNUC__ >= 2
+#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
+#define ROTATE(a, n) ({        \
+    register unsigned int ret; \
+    asm(                       \
+        "roll %1,%0"           \
+        : "=r"(ret)            \
+        : "I"(n), "0"(a)       \
+        : "cc");               \
+    ret;                       \
+})
+#endif
 #endif
 /*-
 Te [x] = S [x].[02, 01, 01, 03, 02, 01, 01, 03];
@@ -112,10 +112,10 @@ Te1[x] = S [x].[03, 02, 01, 01];
 Te2[x] = S [x].[01, 03, 02, 01];
 Te3[x] = S [x].[01, 01, 03, 02];
 */
-#define Te0 (u32)((u64*)((u8*)Te+0))
-#define Te1 (u32)((u64*)((u8*)Te+3))
-#define Te2 (u32)((u64*)((u8*)Te+2))
-#define Te3 (u32)((u64*)((u8*)Te+1))
+#define Te0 (u32)((u64 *)((u8 *)Te + 0))
+#define Te1 (u32)((u64 *)((u8 *)Te + 3))
+#define Te2 (u32)((u64 *)((u8 *)Te + 2))
+#define Te3 (u32)((u64 *)((u8 *)Te + 1))
 /*-
 Td [x] = Si[x].[0e, 09, 0d, 0b, 0e, 09, 0d, 0b];
 Td0[x] = Si[x].[0e, 09, 0d, 0b];
@@ -124,10 +124,10 @@ Td2[x] = Si[x].[0d, 0b, 0e, 09];
 Td3[x] = Si[x].[09, 0d, 0b, 0e];
 Td4[x] = Si[x].[01];
 */
-#define Td0 (u32)((u64*)((u8*)Td+0))
-#define Td1 (u32)((u64*)((u8*)Td+3))
-#define Td2 (u32)((u64*)((u8*)Td+2))
-#define Td3 (u32)((u64*)((u8*)Td+1))
+#define Td0 (u32)((u64 *)((u8 *)Td + 0))
+#define Td1 (u32)((u64 *)((u8 *)Td + 3))
+#define Td2 (u32)((u64 *)((u8 *)Td + 2))
+#define Td3 (u32)((u64 *)((u8 *)Td + 1))
 
 static const u64 Te[256] = {
     U64(0xa56363c6a56363c6), U64(0x847c7cf8847c7cf8),
@@ -461,16 +461,23 @@ static const u8 Td4[256] = {
 };
 
 static const u32 rcon[] = {
-    0x00000001U, 0x00000002U, 0x00000004U, 0x00000008U,
-    0x00000010U, 0x00000020U, 0x00000040U, 0x00000080U,
-    0x0000001bU, 0x00000036U, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+    0x00000001U,
+    0x00000002U,
+    0x00000004U,
+    0x00000008U,
+    0x00000010U,
+    0x00000020U,
+    0x00000040U,
+    0x00000080U,
+    0x0000001bU,
+    0x00000036U, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
 };
 
 /**
  * Expand the cipher key into the encryption key schedule.
  */
 int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key)
+    AES_KEY *key)
 {
 
     u32 *rk;
@@ -484,26 +491,21 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 
     rk = key->rd_key;
 
-    if (bits==128)
+    if (bits == 128)
         key->rounds = 10;
-    else if (bits==192)
+    else if (bits == 192)
         key->rounds = 12;
     else
         key->rounds = 14;
 
-    rk[0] = GETU32(userKey     );
-    rk[1] = GETU32(userKey +  4);
-    rk[2] = GETU32(userKey +  8);
+    rk[0] = GETU32(userKey);
+    rk[1] = GETU32(userKey + 4);
+    rk[2] = GETU32(userKey + 8);
     rk[3] = GETU32(userKey + 12);
     if (bits == 128) {
         while (1) {
-            temp  = rk[3];
-            rk[4] = rk[0] ^
-                ((u32)Te4[(temp >>  8) & 0xff]      ) ^
-                ((u32)Te4[(temp >> 16) & 0xff] <<  8) ^
-                ((u32)Te4[(temp >> 24)       ] << 16) ^
-                ((u32)Te4[(temp      ) & 0xff] << 24) ^
-                rcon[i];
+            temp = rk[3];
+            rk[4] = rk[0] ^ ((u32)Te4[(temp >> 8) & 0xff]) ^ ((u32)Te4[(temp >> 16) & 0xff] << 8) ^ ((u32)Te4[(temp >> 24)] << 16) ^ ((u32)Te4[(temp) & 0xff] << 24) ^ rcon[i];
             rk[5] = rk[1] ^ rk[4];
             rk[6] = rk[2] ^ rk[5];
             rk[7] = rk[3] ^ rk[6];
@@ -517,21 +519,16 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
     rk[5] = GETU32(userKey + 20);
     if (bits == 192) {
         while (1) {
-            temp = rk[ 5];
-            rk[ 6] = rk[ 0] ^
-                ((u32)Te4[(temp >>  8) & 0xff]      ) ^
-                ((u32)Te4[(temp >> 16) & 0xff] <<  8) ^
-                ((u32)Te4[(temp >> 24)       ] << 16) ^
-                ((u32)Te4[(temp      ) & 0xff] << 24) ^
-                rcon[i];
-            rk[ 7] = rk[ 1] ^ rk[ 6];
-            rk[ 8] = rk[ 2] ^ rk[ 7];
-            rk[ 9] = rk[ 3] ^ rk[ 8];
+            temp = rk[5];
+            rk[6] = rk[0] ^ ((u32)Te4[(temp >> 8) & 0xff]) ^ ((u32)Te4[(temp >> 16) & 0xff] << 8) ^ ((u32)Te4[(temp >> 24)] << 16) ^ ((u32)Te4[(temp) & 0xff] << 24) ^ rcon[i];
+            rk[7] = rk[1] ^ rk[6];
+            rk[8] = rk[2] ^ rk[7];
+            rk[9] = rk[3] ^ rk[8];
             if (++i == 8) {
                 return 0;
             }
-            rk[10] = rk[ 4] ^ rk[ 9];
-            rk[11] = rk[ 5] ^ rk[10];
+            rk[10] = rk[4] ^ rk[9];
+            rk[11] = rk[5] ^ rk[10];
             rk += 6;
         }
     }
@@ -539,31 +536,22 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
     rk[7] = GETU32(userKey + 28);
     if (bits == 256) {
         while (1) {
-            temp = rk[ 7];
-            rk[ 8] = rk[ 0] ^
-                ((u32)Te4[(temp >>  8) & 0xff]      ) ^
-                ((u32)Te4[(temp >> 16) & 0xff] <<  8) ^
-                ((u32)Te4[(temp >> 24)       ] << 16) ^
-                ((u32)Te4[(temp      ) & 0xff] << 24) ^
-                rcon[i];
-            rk[ 9] = rk[ 1] ^ rk[ 8];
-            rk[10] = rk[ 2] ^ rk[ 9];
-            rk[11] = rk[ 3] ^ rk[10];
+            temp = rk[7];
+            rk[8] = rk[0] ^ ((u32)Te4[(temp >> 8) & 0xff]) ^ ((u32)Te4[(temp >> 16) & 0xff] << 8) ^ ((u32)Te4[(temp >> 24)] << 16) ^ ((u32)Te4[(temp) & 0xff] << 24) ^ rcon[i];
+            rk[9] = rk[1] ^ rk[8];
+            rk[10] = rk[2] ^ rk[9];
+            rk[11] = rk[3] ^ rk[10];
             if (++i == 7) {
                 return 0;
             }
             temp = rk[11];
-            rk[12] = rk[ 4] ^
-                ((u32)Te4[(temp      ) & 0xff]      ) ^
-                ((u32)Te4[(temp >>  8) & 0xff] <<  8) ^
-                ((u32)Te4[(temp >> 16) & 0xff] << 16) ^
-                ((u32)Te4[(temp >> 24)       ] << 24);
-            rk[13] = rk[ 5] ^ rk[12];
-            rk[14] = rk[ 6] ^ rk[13];
-            rk[15] = rk[ 7] ^ rk[14];
+            rk[12] = rk[4] ^ ((u32)Te4[(temp) & 0xff]) ^ ((u32)Te4[(temp >> 8) & 0xff] << 8) ^ ((u32)Te4[(temp >> 16) & 0xff] << 16) ^ ((u32)Te4[(temp >> 24)] << 24);
+            rk[13] = rk[5] ^ rk[12];
+            rk[14] = rk[6] ^ rk[13];
+            rk[15] = rk[7] ^ rk[14];
 
             rk += 8;
-            }
+        }
     }
     return 0;
 }
@@ -572,7 +560,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
  * Expand the cipher key into the decryption key schedule.
  */
 int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key)
+    AES_KEY *key)
 {
 
     u32 *rk;
@@ -587,11 +575,19 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
     rk = key->rd_key;
 
     /* invert the order of the round keys: */
-    for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-        temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-        temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-        temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-        temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+    for (i = 0, j = 4 * (key->rounds); i < j; i += 4, j -= 4) {
+        temp = rk[i];
+        rk[i] = rk[j];
+        rk[j] = temp;
+        temp = rk[i + 1];
+        rk[i + 1] = rk[j + 1];
+        rk[j + 1] = temp;
+        temp = rk[i + 2];
+        rk[i + 2] = rk[j + 2];
+        rk[j + 2] = temp;
+        temp = rk[i + 3];
+        rk[i + 3] = rk[j + 3];
+        rk[j + 3] = temp;
     }
     /* apply the inverse MixColumn transform to all round keys but the first and the last: */
     for (i = 1; i < (key->rounds); i++) {
@@ -602,48 +598,26 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
 
             tp1 = rk[j];
             m = tp1 & 0x80808080;
-            tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-                ((m - (m >> 7)) & 0x1b1b1b1b);
+            tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
             m = tp2 & 0x80808080;
-            tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-                ((m - (m >> 7)) & 0x1b1b1b1b);
+            tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
             m = tp4 & 0x80808080;
-            tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-                ((m - (m >> 7)) & 0x1b1b1b1b);
+            tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
             tp9 = tp8 ^ tp1;
             tpb = tp9 ^ tp2;
             tpd = tp9 ^ tp4;
             tpe = tp8 ^ tp4 ^ tp2;
 #if defined(ROTATE)
-            rk[j] = tpe ^ ROTATE(tpd,16) ^
-                ROTATE(tp9,8) ^ ROTATE(tpb,24);
+            rk[j] = tpe ^ ROTATE(tpd, 16) ^ ROTATE(tp9, 8) ^ ROTATE(tpb, 24);
 #else
-            rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
-                (tp9 >> 24) ^ (tp9 << 8) ^
-                (tpb >> 8) ^ (tpb << 24);
+            rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ (tp9 >> 24) ^ (tp9 << 8) ^ (tpb >> 8) ^ (tpb << 24);
 #endif
         }
 #else
-        rk[0] =
-            Td0[Te2[(rk[0]      ) & 0xff] & 0xff] ^
-            Td1[Te2[(rk[0] >>  8) & 0xff] & 0xff] ^
-            Td2[Te2[(rk[0] >> 16) & 0xff] & 0xff] ^
-            Td3[Te2[(rk[0] >> 24)       ] & 0xff];
-        rk[1] =
-            Td0[Te2[(rk[1]      ) & 0xff] & 0xff] ^
-            Td1[Te2[(rk[1] >>  8) & 0xff] & 0xff] ^
-            Td2[Te2[(rk[1] >> 16) & 0xff] & 0xff] ^
-            Td3[Te2[(rk[1] >> 24)       ] & 0xff];
-        rk[2] =
-            Td0[Te2[(rk[2]      ) & 0xff] & 0xff] ^
-            Td1[Te2[(rk[2] >>  8) & 0xff] & 0xff] ^
-            Td2[Te2[(rk[2] >> 16) & 0xff] & 0xff] ^
-            Td3[Te2[(rk[2] >> 24)       ] & 0xff];
-        rk[3] =
-            Td0[Te2[(rk[3]      ) & 0xff] & 0xff] ^
-            Td1[Te2[(rk[3] >>  8) & 0xff] & 0xff] ^
-            Td2[Te2[(rk[3] >> 16) & 0xff] & 0xff] ^
-            Td3[Te2[(rk[3] >> 24)       ] & 0xff];
+        rk[0] = Td0[Te2[(rk[0]) & 0xff] & 0xff] ^ Td1[Te2[(rk[0] >> 8) & 0xff] & 0xff] ^ Td2[Te2[(rk[0] >> 16) & 0xff] & 0xff] ^ Td3[Te2[(rk[0] >> 24)] & 0xff];
+        rk[1] = Td0[Te2[(rk[1]) & 0xff] & 0xff] ^ Td1[Te2[(rk[1] >> 8) & 0xff] & 0xff] ^ Td2[Te2[(rk[1] >> 16) & 0xff] & 0xff] ^ Td3[Te2[(rk[1] >> 24)] & 0xff];
+        rk[2] = Td0[Te2[(rk[2]) & 0xff] & 0xff] ^ Td1[Te2[(rk[2] >> 8) & 0xff] & 0xff] ^ Td2[Te2[(rk[2] >> 16) & 0xff] & 0xff] ^ Td3[Te2[(rk[2] >> 24)] & 0xff];
+        rk[3] = Td0[Te2[(rk[3]) & 0xff] & 0xff] ^ Td1[Te2[(rk[3] >> 8) & 0xff] & 0xff] ^ Td2[Te2[(rk[3] >> 16) & 0xff] & 0xff] ^ Td3[Te2[(rk[3] >> 24)] & 0xff];
 #endif
     }
     return 0;
@@ -654,7 +628,7 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
  * in and out can overlap
  */
 void AES_encrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key)
+    const AES_KEY *key)
 {
 
     const u32 *rk;
@@ -668,96 +642,56 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
      * map byte array block to cipher state
      * and add initial round key:
      */
-    s0 = GETU32(in     ) ^ rk[0];
-    s1 = GETU32(in +  4) ^ rk[1];
-    s2 = GETU32(in +  8) ^ rk[2];
+    s0 = GETU32(in) ^ rk[0];
+    s1 = GETU32(in + 4) ^ rk[1];
+    s2 = GETU32(in + 8) ^ rk[2];
     s3 = GETU32(in + 12) ^ rk[3];
 
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
     prefetch256(Te4);
 
-    t[0] = (u32)Te4[(s0      ) & 0xff]       ^
-           (u32)Te4[(s1 >>  8) & 0xff] <<  8 ^
-           (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
-           (u32)Te4[(s3 >> 24)       ] << 24;
-    t[1] = (u32)Te4[(s1      ) & 0xff]       ^
-           (u32)Te4[(s2 >>  8) & 0xff] <<  8 ^
-           (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
-           (u32)Te4[(s0 >> 24)       ] << 24;
-    t[2] = (u32)Te4[(s2      ) & 0xff]       ^
-           (u32)Te4[(s3 >>  8) & 0xff] <<  8 ^
-           (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
-           (u32)Te4[(s1 >> 24)       ] << 24;
-    t[3] = (u32)Te4[(s3      ) & 0xff]       ^
-           (u32)Te4[(s0 >>  8) & 0xff] <<  8 ^
-           (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
-           (u32)Te4[(s2 >> 24)       ] << 24;
+    t[0] = (u32)Te4[(s0) & 0xff] ^ (u32)Te4[(s1 >> 8) & 0xff] << 8 ^ (u32)Te4[(s2 >> 16) & 0xff] << 16 ^ (u32)Te4[(s3 >> 24)] << 24;
+    t[1] = (u32)Te4[(s1) & 0xff] ^ (u32)Te4[(s2 >> 8) & 0xff] << 8 ^ (u32)Te4[(s3 >> 16) & 0xff] << 16 ^ (u32)Te4[(s0 >> 24)] << 24;
+    t[2] = (u32)Te4[(s2) & 0xff] ^ (u32)Te4[(s3 >> 8) & 0xff] << 8 ^ (u32)Te4[(s0 >> 16) & 0xff] << 16 ^ (u32)Te4[(s1 >> 24)] << 24;
+    t[3] = (u32)Te4[(s3) & 0xff] ^ (u32)Te4[(s0 >> 8) & 0xff] << 8 ^ (u32)Te4[(s1 >> 16) & 0xff] << 16 ^ (u32)Te4[(s2 >> 24)] << 24;
 
     /* now do the linear transform using words */
-    {   int i;
+    {
+        int i;
         u32 r0, r1, r2;
 
         for (i = 0; i < 4; i++) {
             r0 = t[i];
             r1 = r0 & 0x80808080;
-            r2 = ((r0 & 0x7f7f7f7f) << 1) ^
-                ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
+            r2 = ((r0 & 0x7f7f7f7f) << 1) ^ ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
 #if defined(ROTATE)
-            t[i] = r2 ^ ROTATE(r2,24) ^ ROTATE(r0,24) ^
-                ROTATE(r0,16) ^ ROTATE(r0,8);
+            t[i] = r2 ^ ROTATE(r2, 24) ^ ROTATE(r0, 24) ^ ROTATE(r0, 16) ^ ROTATE(r0, 8);
 #else
-            t[i] = r2 ^ ((r2 ^ r0) << 24) ^ ((r2 ^ r0) >> 8) ^
-                (r0 << 16) ^ (r0 >> 16) ^
-                (r0 << 8) ^ (r0 >> 24);
+            t[i] = r2 ^ ((r2 ^ r0) << 24) ^ ((r2 ^ r0) >> 8) ^ (r0 << 16) ^ (r0 >> 16) ^ (r0 << 8) ^ (r0 >> 24);
 #endif
-            t[i] ^= rk[4+i];
+            t[i] ^= rk[4 + i];
         }
     }
 #else
-    t[0] =  Te0[(s0      ) & 0xff] ^
-        Te1[(s1 >>  8) & 0xff] ^
-        Te2[(s2 >> 16) & 0xff] ^
-        Te3[(s3 >> 24)       ] ^
-        rk[4];
-    t[1] =  Te0[(s1      ) & 0xff] ^
-        Te1[(s2 >>  8) & 0xff] ^
-        Te2[(s3 >> 16) & 0xff] ^
-        Te3[(s0 >> 24)       ] ^
-        rk[5];
-    t[2] =  Te0[(s2      ) & 0xff] ^
-        Te1[(s3 >>  8) & 0xff] ^
-        Te2[(s0 >> 16) & 0xff] ^
-        Te3[(s1 >> 24)       ] ^
-        rk[6];
-    t[3] =  Te0[(s3      ) & 0xff] ^
-        Te1[(s0 >>  8) & 0xff] ^
-        Te2[(s1 >> 16) & 0xff] ^
-        Te3[(s2 >> 24)       ] ^
-        rk[7];
+    t[0] = Te0[(s0) & 0xff] ^ Te1[(s1 >> 8) & 0xff] ^ Te2[(s2 >> 16) & 0xff] ^ Te3[(s3 >> 24)] ^ rk[4];
+    t[1] = Te0[(s1) & 0xff] ^ Te1[(s2 >> 8) & 0xff] ^ Te2[(s3 >> 16) & 0xff] ^ Te3[(s0 >> 24)] ^ rk[5];
+    t[2] = Te0[(s2) & 0xff] ^ Te1[(s3 >> 8) & 0xff] ^ Te2[(s0 >> 16) & 0xff] ^ Te3[(s1 >> 24)] ^ rk[6];
+    t[3] = Te0[(s3) & 0xff] ^ Te1[(s0 >> 8) & 0xff] ^ Te2[(s1 >> 16) & 0xff] ^ Te3[(s2 >> 24)] ^ rk[7];
 #endif
-    s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
+    s0 = t[0];
+    s1 = t[1];
+    s2 = t[2];
+    s3 = t[3];
 
     /*
      * Nr - 2 full rounds:
      */
-    for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
+    for (rk += 8, r = key->rounds - 2; r > 0; rk += 4, r--) {
 #if defined(AES_COMPACT_IN_INNER_ROUNDS)
-        t[0] = (u32)Te4[(s0      ) & 0xff]       ^
-               (u32)Te4[(s1 >>  8) & 0xff] <<  8 ^
-               (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
-               (u32)Te4[(s3 >> 24)       ] << 24;
-        t[1] = (u32)Te4[(s1      ) & 0xff]       ^
-               (u32)Te4[(s2 >>  8) & 0xff] <<  8 ^
-               (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
-               (u32)Te4[(s0 >> 24)       ] << 24;
-        t[2] = (u32)Te4[(s2      ) & 0xff]       ^
-               (u32)Te4[(s3 >>  8) & 0xff] <<  8 ^
-               (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
-               (u32)Te4[(s1 >> 24)       ] << 24;
-        t[3] = (u32)Te4[(s3      ) & 0xff]       ^
-               (u32)Te4[(s0 >>  8) & 0xff] <<  8 ^
-               (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
-               (u32)Te4[(s2 >> 24)       ] << 24;
+        t[0] = (u32)Te4[(s0) & 0xff] ^ (u32)Te4[(s1 >> 8) & 0xff] << 8 ^ (u32)Te4[(s2 >> 16) & 0xff] << 16 ^ (u32)Te4[(s3 >> 24)] << 24;
+        t[1] = (u32)Te4[(s1) & 0xff] ^ (u32)Te4[(s2 >> 8) & 0xff] << 8 ^ (u32)Te4[(s3 >> 16) & 0xff] << 16 ^ (u32)Te4[(s0 >> 24)] << 24;
+        t[2] = (u32)Te4[(s2) & 0xff] ^ (u32)Te4[(s3 >> 8) & 0xff] << 8 ^ (u32)Te4[(s0 >> 16) & 0xff] << 16 ^ (u32)Te4[(s1 >> 24)] << 24;
+        t[3] = (u32)Te4[(s3) & 0xff] ^ (u32)Te4[(s0 >> 8) & 0xff] << 8 ^ (u32)Te4[(s1 >> 16) & 0xff] << 16 ^ (u32)Te4[(s2 >> 24)] << 24;
 
         /* now do the linear transform using words */
         {
@@ -767,42 +701,25 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
             for (i = 0; i < 4; i++) {
                 r0 = t[i];
                 r1 = r0 & 0x80808080;
-                r2 = ((r0 & 0x7f7f7f7f) << 1) ^
-                    ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
+                r2 = ((r0 & 0x7f7f7f7f) << 1) ^ ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
 #if defined(ROTATE)
-                t[i] = r2 ^ ROTATE(r2,24) ^ ROTATE(r0,24) ^
-                    ROTATE(r0,16) ^ ROTATE(r0,8);
+                t[i] = r2 ^ ROTATE(r2, 24) ^ ROTATE(r0, 24) ^ ROTATE(r0, 16) ^ ROTATE(r0, 8);
 #else
-                t[i] = r2 ^ ((r2 ^ r0) << 24) ^ ((r2 ^ r0) >> 8) ^
-                    (r0 << 16) ^ (r0 >> 16) ^
-                    (r0 << 8) ^ (r0 >> 24);
+                t[i] = r2 ^ ((r2 ^ r0) << 24) ^ ((r2 ^ r0) >> 8) ^ (r0 << 16) ^ (r0 >> 16) ^ (r0 << 8) ^ (r0 >> 24);
 #endif
                 t[i] ^= rk[i];
             }
         }
 #else
-        t[0] =  Te0[(s0      ) & 0xff] ^
-            Te1[(s1 >>  8) & 0xff] ^
-            Te2[(s2 >> 16) & 0xff] ^
-            Te3[(s3 >> 24)       ] ^
-            rk[0];
-        t[1] =  Te0[(s1      ) & 0xff] ^
-            Te1[(s2 >>  8) & 0xff] ^
-            Te2[(s3 >> 16) & 0xff] ^
-            Te3[(s0 >> 24)       ] ^
-            rk[1];
-        t[2] =  Te0[(s2      ) & 0xff] ^
-            Te1[(s3 >>  8) & 0xff] ^
-            Te2[(s0 >> 16) & 0xff] ^
-            Te3[(s1 >> 24)       ] ^
-            rk[2];
-        t[3] =  Te0[(s3      ) & 0xff] ^
-            Te1[(s0 >>  8) & 0xff] ^
-            Te2[(s1 >> 16) & 0xff] ^
-            Te3[(s2 >> 24)       ] ^
-            rk[3];
+        t[0] = Te0[(s0) & 0xff] ^ Te1[(s1 >> 8) & 0xff] ^ Te2[(s2 >> 16) & 0xff] ^ Te3[(s3 >> 24)] ^ rk[0];
+        t[1] = Te0[(s1) & 0xff] ^ Te1[(s2 >> 8) & 0xff] ^ Te2[(s3 >> 16) & 0xff] ^ Te3[(s0 >> 24)] ^ rk[1];
+        t[2] = Te0[(s2) & 0xff] ^ Te1[(s3 >> 8) & 0xff] ^ Te2[(s0 >> 16) & 0xff] ^ Te3[(s1 >> 24)] ^ rk[2];
+        t[3] = Te0[(s3) & 0xff] ^ Te1[(s0 >> 8) & 0xff] ^ Te2[(s1 >> 16) & 0xff] ^ Te3[(s2 >> 24)] ^ rk[3];
 #endif
-        s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
+        s0 = t[0];
+        s1 = t[1];
+        s2 = t[2];
+        s3 = t[3];
     }
     /*
      * apply last round and
@@ -811,55 +728,15 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
     prefetch256(Te4);
 
-    *(u32*)(out+0) =
-           (u32)Te4[(s0      ) & 0xff]       ^
-           (u32)Te4[(s1 >>  8) & 0xff] <<  8 ^
-           (u32)Te4[(s2 >> 16) & 0xff] << 16 ^
-           (u32)Te4[(s3 >> 24)       ] << 24 ^
-        rk[0];
-    *(u32*)(out+4) =
-           (u32)Te4[(s1      ) & 0xff]       ^
-           (u32)Te4[(s2 >>  8) & 0xff] <<  8 ^
-           (u32)Te4[(s3 >> 16) & 0xff] << 16 ^
-           (u32)Te4[(s0 >> 24)       ] << 24 ^
-        rk[1];
-    *(u32*)(out+8) =
-           (u32)Te4[(s2      ) & 0xff]       ^
-           (u32)Te4[(s3 >>  8) & 0xff] <<  8 ^
-           (u32)Te4[(s0 >> 16) & 0xff] << 16 ^
-           (u32)Te4[(s1 >> 24)       ] << 24 ^
-        rk[2];
-    *(u32*)(out+12) =
-           (u32)Te4[(s3      ) & 0xff]       ^
-           (u32)Te4[(s0 >>  8) & 0xff] <<  8 ^
-           (u32)Te4[(s1 >> 16) & 0xff] << 16 ^
-           (u32)Te4[(s2 >> 24)       ] << 24 ^
-        rk[3];
+    *(u32 *)(out + 0) = (u32)Te4[(s0) & 0xff] ^ (u32)Te4[(s1 >> 8) & 0xff] << 8 ^ (u32)Te4[(s2 >> 16) & 0xff] << 16 ^ (u32)Te4[(s3 >> 24)] << 24 ^ rk[0];
+    *(u32 *)(out + 4) = (u32)Te4[(s1) & 0xff] ^ (u32)Te4[(s2 >> 8) & 0xff] << 8 ^ (u32)Te4[(s3 >> 16) & 0xff] << 16 ^ (u32)Te4[(s0 >> 24)] << 24 ^ rk[1];
+    *(u32 *)(out + 8) = (u32)Te4[(s2) & 0xff] ^ (u32)Te4[(s3 >> 8) & 0xff] << 8 ^ (u32)Te4[(s0 >> 16) & 0xff] << 16 ^ (u32)Te4[(s1 >> 24)] << 24 ^ rk[2];
+    *(u32 *)(out + 12) = (u32)Te4[(s3) & 0xff] ^ (u32)Te4[(s0 >> 8) & 0xff] << 8 ^ (u32)Te4[(s1 >> 16) & 0xff] << 16 ^ (u32)Te4[(s2 >> 24)] << 24 ^ rk[3];
 #else
-    *(u32*)(out+0) =
-        (Te2[(s0      ) & 0xff] & 0x000000ffU) ^
-        (Te3[(s1 >>  8) & 0xff] & 0x0000ff00U) ^
-        (Te0[(s2 >> 16) & 0xff] & 0x00ff0000U) ^
-        (Te1[(s3 >> 24)       ] & 0xff000000U) ^
-        rk[0];
-    *(u32*)(out+4) =
-        (Te2[(s1      ) & 0xff] & 0x000000ffU) ^
-        (Te3[(s2 >>  8) & 0xff] & 0x0000ff00U) ^
-        (Te0[(s3 >> 16) & 0xff] & 0x00ff0000U) ^
-        (Te1[(s0 >> 24)       ] & 0xff000000U) ^
-        rk[1];
-    *(u32*)(out+8) =
-        (Te2[(s2      ) & 0xff] & 0x000000ffU) ^
-        (Te3[(s3 >>  8) & 0xff] & 0x0000ff00U) ^
-        (Te0[(s0 >> 16) & 0xff] & 0x00ff0000U) ^
-        (Te1[(s1 >> 24)       ] & 0xff000000U) ^
-        rk[2];
-    *(u32*)(out+12) =
-        (Te2[(s3      ) & 0xff] & 0x000000ffU) ^
-        (Te3[(s0 >>  8) & 0xff] & 0x0000ff00U) ^
-        (Te0[(s1 >> 16) & 0xff] & 0x00ff0000U) ^
-        (Te1[(s2 >> 24)       ] & 0xff000000U) ^
-        rk[3];
+    *(u32 *)(out + 0) = (Te2[(s0) & 0xff] & 0x000000ffU) ^ (Te3[(s1 >> 8) & 0xff] & 0x0000ff00U) ^ (Te0[(s2 >> 16) & 0xff] & 0x00ff0000U) ^ (Te1[(s3 >> 24)] & 0xff000000U) ^ rk[0];
+    *(u32 *)(out + 4) = (Te2[(s1) & 0xff] & 0x000000ffU) ^ (Te3[(s2 >> 8) & 0xff] & 0x0000ff00U) ^ (Te0[(s3 >> 16) & 0xff] & 0x00ff0000U) ^ (Te1[(s0 >> 24)] & 0xff000000U) ^ rk[1];
+    *(u32 *)(out + 8) = (Te2[(s2) & 0xff] & 0x000000ffU) ^ (Te3[(s3 >> 8) & 0xff] & 0x0000ff00U) ^ (Te0[(s0 >> 16) & 0xff] & 0x00ff0000U) ^ (Te1[(s1 >> 24)] & 0xff000000U) ^ rk[2];
+    *(u32 *)(out + 12) = (Te2[(s3) & 0xff] & 0x000000ffU) ^ (Te3[(s0 >> 8) & 0xff] & 0x0000ff00U) ^ (Te0[(s1 >> 16) & 0xff] & 0x00ff0000U) ^ (Te1[(s2 >> 24)] & 0xff000000U) ^ rk[3];
 #endif
 }
 
@@ -868,7 +745,7 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
  * in and out can overlap
  */
 void AES_decrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key)
+    const AES_KEY *key)
 {
 
     const u32 *rk;
@@ -882,30 +759,18 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
      * map byte array block to cipher state
      * and add initial round key:
      */
-    s0 = GETU32(in     ) ^ rk[0];
-    s1 = GETU32(in +  4) ^ rk[1];
-    s2 = GETU32(in +  8) ^ rk[2];
+    s0 = GETU32(in) ^ rk[0];
+    s1 = GETU32(in + 4) ^ rk[1];
+    s2 = GETU32(in + 8) ^ rk[2];
     s3 = GETU32(in + 12) ^ rk[3];
 
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
     prefetch256(Td4);
 
-    t[0] = (u32)Td4[(s0      ) & 0xff]       ^
-           (u32)Td4[(s3 >>  8) & 0xff] <<  8 ^
-           (u32)Td4[(s2 >> 16) & 0xff] << 16 ^
-           (u32)Td4[(s1 >> 24)       ] << 24;
-    t[1] = (u32)Td4[(s1      ) & 0xff]       ^
-           (u32)Td4[(s0 >>  8) & 0xff] <<  8 ^
-           (u32)Td4[(s3 >> 16) & 0xff] << 16 ^
-           (u32)Td4[(s2 >> 24)       ] << 24;
-    t[2] = (u32)Td4[(s2      ) & 0xff]       ^
-           (u32)Td4[(s1 >>  8) & 0xff] <<  8 ^
-           (u32)Td4[(s0 >> 16) & 0xff] << 16 ^
-           (u32)Td4[(s3 >> 24)       ] << 24;
-    t[3] = (u32)Td4[(s3      ) & 0xff]       ^
-           (u32)Td4[(s2 >>  8) & 0xff] <<  8 ^
-           (u32)Td4[(s1 >> 16) & 0xff] << 16 ^
-           (u32)Td4[(s0 >> 24)       ] << 24;
+    t[0] = (u32)Td4[(s0) & 0xff] ^ (u32)Td4[(s3 >> 8) & 0xff] << 8 ^ (u32)Td4[(s2 >> 16) & 0xff] << 16 ^ (u32)Td4[(s1 >> 24)] << 24;
+    t[1] = (u32)Td4[(s1) & 0xff] ^ (u32)Td4[(s0 >> 8) & 0xff] << 8 ^ (u32)Td4[(s3 >> 16) & 0xff] << 16 ^ (u32)Td4[(s2 >> 24)] << 24;
+    t[2] = (u32)Td4[(s2) & 0xff] ^ (u32)Td4[(s1 >> 8) & 0xff] << 8 ^ (u32)Td4[(s0 >> 16) & 0xff] << 16 ^ (u32)Td4[(s3 >> 24)] << 24;
+    t[3] = (u32)Td4[(s3) & 0xff] ^ (u32)Td4[(s2 >> 8) & 0xff] << 8 ^ (u32)Td4[(s1 >> 16) & 0xff] << 16 ^ (u32)Td4[(s0 >> 24)] << 24;
 
     /* now do the linear transform using words */
     {
@@ -915,129 +780,79 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
         for (i = 0; i < 4; i++) {
             tp1 = t[i];
             m = tp1 & 0x80808080;
-            tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-                ((m - (m >> 7)) & 0x1b1b1b1b);
+            tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
             m = tp2 & 0x80808080;
-            tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-                ((m - (m >> 7)) & 0x1b1b1b1b);
+            tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
             m = tp4 & 0x80808080;
-            tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-                ((m - (m >> 7)) & 0x1b1b1b1b);
+            tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
             tp9 = tp8 ^ tp1;
             tpb = tp9 ^ tp2;
             tpd = tp9 ^ tp4;
             tpe = tp8 ^ tp4 ^ tp2;
 #if defined(ROTATE)
-            t[i] = tpe ^ ROTATE(tpd,16) ^
-                ROTATE(tp9,8) ^ ROTATE(tpb,24);
+            t[i] = tpe ^ ROTATE(tpd, 16) ^ ROTATE(tp9, 8) ^ ROTATE(tpb, 24);
 #else
-            t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
-                (tp9 >> 24) ^ (tp9 << 8) ^
-                (tpb >> 8) ^ (tpb << 24);
+            t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ (tp9 >> 24) ^ (tp9 << 8) ^ (tpb >> 8) ^ (tpb << 24);
 #endif
-            t[i] ^= rk[4+i];
+            t[i] ^= rk[4 + i];
         }
     }
 #else
-    t[0] =  Td0[(s0      ) & 0xff] ^
-        Td1[(s3 >>  8) & 0xff] ^
-        Td2[(s2 >> 16) & 0xff] ^
-        Td3[(s1 >> 24)       ] ^
-        rk[4];
-    t[1] =  Td0[(s1      ) & 0xff] ^
-        Td1[(s0 >>  8) & 0xff] ^
-        Td2[(s3 >> 16) & 0xff] ^
-        Td3[(s2 >> 24)       ] ^
-        rk[5];
-    t[2] =  Td0[(s2      ) & 0xff] ^
-        Td1[(s1 >>  8) & 0xff] ^
-        Td2[(s0 >> 16) & 0xff] ^
-        Td3[(s3 >> 24)       ] ^
-        rk[6];
-    t[3] =  Td0[(s3      ) & 0xff] ^
-        Td1[(s2 >>  8) & 0xff] ^
-        Td2[(s1 >> 16) & 0xff] ^
-        Td3[(s0 >> 24)       ] ^
-        rk[7];
+    t[0] = Td0[(s0) & 0xff] ^ Td1[(s3 >> 8) & 0xff] ^ Td2[(s2 >> 16) & 0xff] ^ Td3[(s1 >> 24)] ^ rk[4];
+    t[1] = Td0[(s1) & 0xff] ^ Td1[(s0 >> 8) & 0xff] ^ Td2[(s3 >> 16) & 0xff] ^ Td3[(s2 >> 24)] ^ rk[5];
+    t[2] = Td0[(s2) & 0xff] ^ Td1[(s1 >> 8) & 0xff] ^ Td2[(s0 >> 16) & 0xff] ^ Td3[(s3 >> 24)] ^ rk[6];
+    t[3] = Td0[(s3) & 0xff] ^ Td1[(s2 >> 8) & 0xff] ^ Td2[(s1 >> 16) & 0xff] ^ Td3[(s0 >> 24)] ^ rk[7];
 #endif
-    s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
+    s0 = t[0];
+    s1 = t[1];
+    s2 = t[2];
+    s3 = t[3];
 
     /*
      * Nr - 2 full rounds:
      */
-    for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
+    for (rk += 8, r = key->rounds - 2; r > 0; rk += 4, r--) {
 #if defined(AES_COMPACT_IN_INNER_ROUNDS)
-        t[0] = (u32)Td4[(s0      ) & 0xff]       ^
-               (u32)Td4[(s3 >>  8) & 0xff] <<  8 ^
-               (u32)Td4[(s2 >> 16) & 0xff] << 16 ^
-               (u32)Td4[(s1 >> 24)       ] << 24;
-        t[1] = (u32)Td4[(s1      ) & 0xff]       ^
-               (u32)Td4[(s0 >>  8) & 0xff] <<  8 ^
-               (u32)Td4[(s3 >> 16) & 0xff] << 16 ^
-               (u32)Td4[(s2 >> 24)       ] << 24;
-        t[2] = (u32)Td4[(s2      ) & 0xff]       ^
-               (u32)Td4[(s1 >>  8) & 0xff] <<  8 ^
-               (u32)Td4[(s0 >> 16) & 0xff] << 16 ^
-               (u32)Td4[(s3 >> 24)       ] << 24;
-        t[3] = (u32)Td4[(s3      ) & 0xff]       ^
-               (u32)Td4[(s2 >>  8) & 0xff] <<  8 ^
-               (u32)Td4[(s1 >> 16) & 0xff] << 16 ^
-               (u32)Td4[(s0 >> 24)       ] << 24;
+        t[0] = (u32)Td4[(s0) & 0xff] ^ (u32)Td4[(s3 >> 8) & 0xff] << 8 ^ (u32)Td4[(s2 >> 16) & 0xff] << 16 ^ (u32)Td4[(s1 >> 24)] << 24;
+        t[1] = (u32)Td4[(s1) & 0xff] ^ (u32)Td4[(s0 >> 8) & 0xff] << 8 ^ (u32)Td4[(s3 >> 16) & 0xff] << 16 ^ (u32)Td4[(s2 >> 24)] << 24;
+        t[2] = (u32)Td4[(s2) & 0xff] ^ (u32)Td4[(s1 >> 8) & 0xff] << 8 ^ (u32)Td4[(s0 >> 16) & 0xff] << 16 ^ (u32)Td4[(s3 >> 24)] << 24;
+        t[3] = (u32)Td4[(s3) & 0xff] ^ (u32)Td4[(s2 >> 8) & 0xff] << 8 ^ (u32)Td4[(s1 >> 16) & 0xff] << 16 ^ (u32)Td4[(s0 >> 24)] << 24;
 
-    /* now do the linear transform using words */
-    {
-        int i;
-        u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
+        /* now do the linear transform using words */
+        {
+            int i;
+            u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
 
-        for (i = 0; i < 4; i++) {
-            tp1 = t[i];
-            m = tp1 & 0x80808080;
-            tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-                ((m - (m >> 7)) & 0x1b1b1b1b);
-            m = tp2 & 0x80808080;
-            tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-                ((m - (m >> 7)) & 0x1b1b1b1b);
-            m = tp4 & 0x80808080;
-            tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-                ((m - (m >> 7)) & 0x1b1b1b1b);
-            tp9 = tp8 ^ tp1;
-            tpb = tp9 ^ tp2;
-            tpd = tp9 ^ tp4;
-            tpe = tp8 ^ tp4 ^ tp2;
+            for (i = 0; i < 4; i++) {
+                tp1 = t[i];
+                m = tp1 & 0x80808080;
+                tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
+                m = tp2 & 0x80808080;
+                tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
+                m = tp4 & 0x80808080;
+                tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^ ((m - (m >> 7)) & 0x1b1b1b1b);
+                tp9 = tp8 ^ tp1;
+                tpb = tp9 ^ tp2;
+                tpd = tp9 ^ tp4;
+                tpe = tp8 ^ tp4 ^ tp2;
 #if defined(ROTATE)
-            t[i] = tpe ^ ROTATE(tpd,16) ^
-                ROTATE(tp9,8) ^ ROTATE(tpb,24);
+                t[i] = tpe ^ ROTATE(tpd, 16) ^ ROTATE(tp9, 8) ^ ROTATE(tpb, 24);
 #else
-            t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
-                (tp9 >> 24) ^ (tp9 << 8) ^
-                (tpb >> 8) ^ (tpb << 24);
+                t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ (tp9 >> 24) ^ (tp9 << 8) ^ (tpb >> 8) ^ (tpb << 24);
 #endif
-            t[i] ^= rk[i];
+                t[i] ^= rk[i];
+            }
         }
-    }
 #else
-    t[0] =  Td0[(s0      ) & 0xff] ^
-        Td1[(s3 >>  8) & 0xff] ^
-        Td2[(s2 >> 16) & 0xff] ^
-        Td3[(s1 >> 24)       ] ^
-        rk[0];
-    t[1] =  Td0[(s1      ) & 0xff] ^
-        Td1[(s0 >>  8) & 0xff] ^
-        Td2[(s3 >> 16) & 0xff] ^
-        Td3[(s2 >> 24)       ] ^
-        rk[1];
-    t[2] =  Td0[(s2      ) & 0xff] ^
-        Td1[(s1 >>  8) & 0xff] ^
-        Td2[(s0 >> 16) & 0xff] ^
-        Td3[(s3 >> 24)       ] ^
-        rk[2];
-    t[3] =  Td0[(s3      ) & 0xff] ^
-        Td1[(s2 >>  8) & 0xff] ^
-        Td2[(s1 >> 16) & 0xff] ^
-        Td3[(s0 >> 24)       ] ^
-        rk[3];
+        t[0] = Td0[(s0) & 0xff] ^ Td1[(s3 >> 8) & 0xff] ^ Td2[(s2 >> 16) & 0xff] ^ Td3[(s1 >> 24)] ^ rk[0];
+        t[1] = Td0[(s1) & 0xff] ^ Td1[(s0 >> 8) & 0xff] ^ Td2[(s3 >> 16) & 0xff] ^ Td3[(s2 >> 24)] ^ rk[1];
+        t[2] = Td0[(s2) & 0xff] ^ Td1[(s1 >> 8) & 0xff] ^ Td2[(s0 >> 16) & 0xff] ^ Td3[(s3 >> 24)] ^ rk[2];
+        t[3] = Td0[(s3) & 0xff] ^ Td1[(s2 >> 8) & 0xff] ^ Td2[(s1 >> 16) & 0xff] ^ Td3[(s0 >> 24)] ^ rk[3];
 #endif
-    s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
+        s0 = t[0];
+        s1 = t[1];
+        s2 = t[2];
+        s3 = t[3];
     }
     /*
      * apply last round and
@@ -1045,28 +860,8 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
      */
     prefetch256(Td4);
 
-    *(u32*)(out+0) =
-        ((u32)Td4[(s0      ) & 0xff])    ^
-        ((u32)Td4[(s3 >>  8) & 0xff] <<  8) ^
-        ((u32)Td4[(s2 >> 16) & 0xff] << 16) ^
-        ((u32)Td4[(s1 >> 24)       ] << 24) ^
-        rk[0];
-    *(u32*)(out+4) =
-        ((u32)Td4[(s1      ) & 0xff])     ^
-        ((u32)Td4[(s0 >>  8) & 0xff] <<  8) ^
-        ((u32)Td4[(s3 >> 16) & 0xff] << 16) ^
-        ((u32)Td4[(s2 >> 24)       ] << 24) ^
-        rk[1];
-    *(u32*)(out+8) =
-        ((u32)Td4[(s2      ) & 0xff])     ^
-        ((u32)Td4[(s1 >>  8) & 0xff] <<  8) ^
-        ((u32)Td4[(s0 >> 16) & 0xff] << 16) ^
-        ((u32)Td4[(s3 >> 24)       ] << 24) ^
-        rk[2];
-    *(u32*)(out+12) =
-        ((u32)Td4[(s3      ) & 0xff])     ^
-        ((u32)Td4[(s2 >>  8) & 0xff] <<  8) ^
-        ((u32)Td4[(s1 >> 16) & 0xff] << 16) ^
-        ((u32)Td4[(s0 >> 24)       ] << 24) ^
-        rk[3];
+    *(u32 *)(out + 0) = ((u32)Td4[(s0) & 0xff]) ^ ((u32)Td4[(s3 >> 8) & 0xff] << 8) ^ ((u32)Td4[(s2 >> 16) & 0xff] << 16) ^ ((u32)Td4[(s1 >> 24)] << 24) ^ rk[0];
+    *(u32 *)(out + 4) = ((u32)Td4[(s1) & 0xff]) ^ ((u32)Td4[(s0 >> 8) & 0xff] << 8) ^ ((u32)Td4[(s3 >> 16) & 0xff] << 16) ^ ((u32)Td4[(s2 >> 24)] << 24) ^ rk[1];
+    *(u32 *)(out + 8) = ((u32)Td4[(s2) & 0xff]) ^ ((u32)Td4[(s1 >> 8) & 0xff] << 8) ^ ((u32)Td4[(s0 >> 16) & 0xff] << 16) ^ ((u32)Td4[(s3 >> 24)] << 24) ^ rk[2];
+    *(u32 *)(out + 12) = ((u32)Td4[(s3) & 0xff]) ^ ((u32)Td4[(s2 >> 8) & 0xff] << 8) ^ ((u32)Td4[(s1 >> 16) & 0xff] << 16) ^ ((u32)Td4[(s0 >> 24)] << 24) ^ rk[3];
 }
diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl
index 5d1283f576902..2345d4574a410 100644
--- a/crypto/aes/asm/aes-s390x.pl
+++ b/crypto/aes/asm/aes-s390x.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2007-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
@@ -1431,6 +1431,9 @@ ()
 	st${g}	$s3,0($sp)			# backchain
 	la	%r1,$stdframe($sp)
 
+	xc	$stdframe+0(64,$sp),$stdframe+0($sp)	# clear reserved/unused
+							# in parameter block
+
 	lmg	$s2,$s3,0($key)			# copy key
 	stg	$s2,$stdframe+80($sp)
 	stg	$s3,$stdframe+88($sp)
diff --git a/crypto/aes/asm/aesni-xts-avx512.pl b/crypto/aes/asm/aesni-xts-avx512.pl
index 55cbb14c66f4f..d89564112e313 100644
--- a/crypto/aes/asm/aesni-xts-avx512.pl
+++ b/crypto/aes/asm/aesni-xts-avx512.pl
@@ -35,13 +35,15 @@
 die "can't locate x86_64-xlate.pl";
 
 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
-        =~ /GNU assembler version ([2-9]\.[0-9]+)/) {
-    $avx512vaes = ($1>=2.26);
+        =~ /GNU assembler version ([0-9]+)\.([0-9]+)/) {
+    my $ver = $1 + $2/100.0; # 3.1->3.01, 3.10->3.10
+    $avx512vaes = ($ver >= 2.30);
 }
 
 if (!$avx512vaes && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
-       `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)(?:\.([0-9]+))?/) {
-    $avx512vaes = ($1==2.11 && $2>=8) + ($1>=2.12);
+       `nasm -v 2>&1` =~ /NASM version ([0-9]+)\.([0-9]+)(?:\.([0-9]+))?/) {
+    my $ver = $1 + $2/100.0 + $3/10000.0; # 3.1.0->3.01, 3.10.1->3.1001
+    $avx512vaes = ($ver >= 2.1108);
 }
 
 if (!$avx512vaes && `$ENV{CC} -v 2>&1`
@@ -2194,7 +2196,7 @@
     vpxorq 	 %zmm6,%zmm5,%zmm5{%k2}
     vpxord 	 %zmm5,%zmm7,%zmm10
 
-    # Make next 8 tweek values by all x 2^8
+    # Make next 8 tweak values by all x 2^8
     vpsrldq 	 \$0xf,%zmm9,%zmm13
     vpclmulqdq 	 \$0x0,%zmm25,%zmm13,%zmm14
     vpslldq 	 \$0x1,%zmm9,%zmm11
@@ -2210,7 +2212,7 @@
     vmovdqu8 	 0x40($input),%zmm2
     vmovdqu8 	 0x80($input),%zmm3
     vmovdqu8 	 0xc0($input),%zmm4
-    vmovdqu8 	 0xf0($input),%zmm5
+    vmovdqu8 	 0xf0($input),%xmm5
     add 	 \$0x100,$input
 ___
     }
@@ -2234,7 +2236,7 @@
     jmp 	 .L_do_n_blocks_${rndsuffix}
 
     .L_start_by8_${rndsuffix}:
-    # Make first 7 tweek values
+    # Make first 7 tweak values
     vbroadcasti32x4 	 ($TW),%zmm0
     vbroadcasti32x4 shufb_15_7(%rip),%zmm8
     mov 	 \$0xaa,$tmp1
diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl
index 4f503a31ca672..af501f8ff573b 100755
--- a/crypto/aes/asm/aesv8-armx.pl
+++ b/crypto/aes/asm/aesv8-armx.pl
@@ -152,7 +152,7 @@
 	adrp	$ptr,.Lrcon
 	add	$ptr,$ptr,:lo12:.Lrcon
 ___
-$code.=<<___	if ($flavour =~ /32/);
+$code.=<<___	if ($flavour !~ /64/);
 	adr	$ptr,.Lrcon
 ___
 $code.=<<___;
diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index 84ddd00cd827b..eed9214d4b180 100644
--- a/crypto/aria/aria.c
+++ b/crypto/aria/aria.c
@@ -32,30 +32,23 @@
 #define rotl32(v, r) (((uint32_t)(v) << (r)) | ((uint32_t)(v) >> (32 - r)))
 #define rotr32(v, r) (((uint32_t)(v) >> (r)) | ((uint32_t)(v) << (32 - r)))
 
-#define bswap32(v)                                          \
-    (((v) << 24) ^ ((v) >> 24) ^                            \
-    (((v) & 0x0000ff00) << 8) ^ (((v) & 0x00ff0000) >> 8))
+#define bswap32(v) \
+    (((v) << 24) ^ ((v) >> 24) ^ (((v) & 0x0000ff00) << 8) ^ (((v) & 0x00ff0000) >> 8))
 
 #define GET_U8_BE(X, Y) ((uint8_t)((X) >> ((3 - Y) * 8)))
-#define GET_U32_BE(X, Y) (                                  \
-    ((uint32_t)((const uint8_t *)(X))[Y * 4    ] << 24) ^   \
-    ((uint32_t)((const uint8_t *)(X))[Y * 4 + 1] << 16) ^   \
-    ((uint32_t)((const uint8_t *)(X))[Y * 4 + 2] <<  8) ^   \
-    ((uint32_t)((const uint8_t *)(X))[Y * 4 + 3]      )     )
-
-#define PUT_U32_BE(DEST, IDX, VAL)                              \
-    do {                                                        \
-        ((uint8_t *)(DEST))[IDX * 4    ] = GET_U8_BE(VAL, 0);   \
-        ((uint8_t *)(DEST))[IDX * 4 + 1] = GET_U8_BE(VAL, 1);   \
-        ((uint8_t *)(DEST))[IDX * 4 + 2] = GET_U8_BE(VAL, 2);   \
-        ((uint8_t *)(DEST))[IDX * 4 + 3] = GET_U8_BE(VAL, 3);   \
-    } while(0)
-
-#define MAKE_U32(V0, V1, V2, V3) (      \
-    ((uint32_t)((uint8_t)(V0)) << 24) | \
-    ((uint32_t)((uint8_t)(V1)) << 16) | \
-    ((uint32_t)((uint8_t)(V2)) <<  8) | \
-    ((uint32_t)((uint8_t)(V3))      )   )
+#define GET_U32_BE(X, Y) ( \
+    ((uint32_t)((const uint8_t *)(X))[Y * 4] << 24) ^ ((uint32_t)((const uint8_t *)(X))[Y * 4 + 1] << 16) ^ ((uint32_t)((const uint8_t *)(X))[Y * 4 + 2] << 8) ^ ((uint32_t)((const uint8_t *)(X))[Y * 4 + 3]))
+
+#define PUT_U32_BE(DEST, IDX, VAL)                            \
+    do {                                                      \
+        ((uint8_t *)(DEST))[IDX * 4] = GET_U8_BE(VAL, 0);     \
+        ((uint8_t *)(DEST))[IDX * 4 + 1] = GET_U8_BE(VAL, 1); \
+        ((uint8_t *)(DEST))[IDX * 4 + 2] = GET_U8_BE(VAL, 2); \
+        ((uint8_t *)(DEST))[IDX * 4 + 3] = GET_U8_BE(VAL, 3); \
+    } while (0)
+
+#define MAKE_U32(V0, V1, V2, V3) ( \
+    ((uint32_t)((uint8_t)(V0)) << 24) | ((uint32_t)((uint8_t)(V1)) << 16) | ((uint32_t)((uint8_t)(V2)) << 8) | ((uint32_t)((uint8_t)(V3))))
 
 /* End Macro*/
 
@@ -342,75 +335,43 @@ static const uint32_t X2[256] = {
 };
 
 /* Key XOR Layer */
-#define ARIA_ADD_ROUND_KEY(RK, T0, T1, T2, T3)  \
-    do {                                        \
-        (T0) ^= (RK)->u[0];                     \
-        (T1) ^= (RK)->u[1];                     \
-        (T2) ^= (RK)->u[2];                     \
-        (T3) ^= (RK)->u[3];                     \
-    } while(0)
+#define ARIA_ADD_ROUND_KEY(RK, T0, T1, T2, T3) \
+    do {                                       \
+        (T0) ^= (RK)->u[0];                    \
+        (T1) ^= (RK)->u[1];                    \
+        (T2) ^= (RK)->u[2];                    \
+        (T3) ^= (RK)->u[3];                    \
+    } while (0)
 
 /* S-Box Layer 1 + M */
-#define ARIA_SBOX_LAYER1_WITH_PRE_DIFF(T0, T1, T2, T3)  \
-    do {                                                \
-        (T0) =                                          \
-            S1[GET_U8_BE(T0, 0)] ^                      \
-            S2[GET_U8_BE(T0, 1)] ^                      \
-            X1[GET_U8_BE(T0, 2)] ^                      \
-            X2[GET_U8_BE(T0, 3)];                       \
-        (T1) =                                          \
-            S1[GET_U8_BE(T1, 0)] ^                      \
-            S2[GET_U8_BE(T1, 1)] ^                      \
-            X1[GET_U8_BE(T1, 2)] ^                      \
-            X2[GET_U8_BE(T1, 3)];                       \
-        (T2) =                                          \
-            S1[GET_U8_BE(T2, 0)] ^                      \
-            S2[GET_U8_BE(T2, 1)] ^                      \
-            X1[GET_U8_BE(T2, 2)] ^                      \
-            X2[GET_U8_BE(T2, 3)];                       \
-        (T3) =                                          \
-            S1[GET_U8_BE(T3, 0)] ^                      \
-            S2[GET_U8_BE(T3, 1)] ^                      \
-            X1[GET_U8_BE(T3, 2)] ^                      \
-            X2[GET_U8_BE(T3, 3)];                       \
-    } while(0)
+#define ARIA_SBOX_LAYER1_WITH_PRE_DIFF(T0, T1, T2, T3)                                                    \
+    do {                                                                                                  \
+        (T0) = S1[GET_U8_BE(T0, 0)] ^ S2[GET_U8_BE(T0, 1)] ^ X1[GET_U8_BE(T0, 2)] ^ X2[GET_U8_BE(T0, 3)]; \
+        (T1) = S1[GET_U8_BE(T1, 0)] ^ S2[GET_U8_BE(T1, 1)] ^ X1[GET_U8_BE(T1, 2)] ^ X2[GET_U8_BE(T1, 3)]; \
+        (T2) = S1[GET_U8_BE(T2, 0)] ^ S2[GET_U8_BE(T2, 1)] ^ X1[GET_U8_BE(T2, 2)] ^ X2[GET_U8_BE(T2, 3)]; \
+        (T3) = S1[GET_U8_BE(T3, 0)] ^ S2[GET_U8_BE(T3, 1)] ^ X1[GET_U8_BE(T3, 2)] ^ X2[GET_U8_BE(T3, 3)]; \
+    } while (0)
 
 /* S-Box Layer 2 + M */
-#define ARIA_SBOX_LAYER2_WITH_PRE_DIFF(T0, T1, T2, T3)  \
-    do {                                                \
-        (T0) =                                          \
-            X1[GET_U8_BE(T0, 0)] ^                      \
-            X2[GET_U8_BE(T0, 1)] ^                      \
-            S1[GET_U8_BE(T0, 2)] ^                      \
-            S2[GET_U8_BE(T0, 3)];                       \
-        (T1) =                                          \
-            X1[GET_U8_BE(T1, 0)] ^                      \
-            X2[GET_U8_BE(T1, 1)] ^                      \
-            S1[GET_U8_BE(T1, 2)] ^                      \
-            S2[GET_U8_BE(T1, 3)];                       \
-        (T2) =                                          \
-            X1[GET_U8_BE(T2, 0)] ^                      \
-            X2[GET_U8_BE(T2, 1)] ^                      \
-            S1[GET_U8_BE(T2, 2)] ^                      \
-            S2[GET_U8_BE(T2, 3)];                       \
-        (T3) =                                          \
-            X1[GET_U8_BE(T3, 0)] ^                      \
-            X2[GET_U8_BE(T3, 1)] ^                      \
-            S1[GET_U8_BE(T3, 2)] ^                      \
-            S2[GET_U8_BE(T3, 3)];                       \
-    } while(0)
+#define ARIA_SBOX_LAYER2_WITH_PRE_DIFF(T0, T1, T2, T3)                                                    \
+    do {                                                                                                  \
+        (T0) = X1[GET_U8_BE(T0, 0)] ^ X2[GET_U8_BE(T0, 1)] ^ S1[GET_U8_BE(T0, 2)] ^ S2[GET_U8_BE(T0, 3)]; \
+        (T1) = X1[GET_U8_BE(T1, 0)] ^ X2[GET_U8_BE(T1, 1)] ^ S1[GET_U8_BE(T1, 2)] ^ S2[GET_U8_BE(T1, 3)]; \
+        (T2) = X1[GET_U8_BE(T2, 0)] ^ X2[GET_U8_BE(T2, 1)] ^ S1[GET_U8_BE(T2, 2)] ^ S2[GET_U8_BE(T2, 3)]; \
+        (T3) = X1[GET_U8_BE(T3, 0)] ^ X2[GET_U8_BE(T3, 1)] ^ S1[GET_U8_BE(T3, 2)] ^ S2[GET_U8_BE(T3, 3)]; \
+    } while (0)
 
 /* Word-level diffusion */
-#define ARIA_DIFF_WORD(T0,T1,T2,T3) \
-    do {                            \
-        (T1) ^= (T2);               \
-        (T2) ^= (T3);               \
-        (T0) ^= (T1);               \
-                                    \
-        (T3) ^= (T1);               \
-        (T2) ^= (T0);               \
-        (T1) ^= (T2);               \
-    } while(0)
+#define ARIA_DIFF_WORD(T0, T1, T2, T3) \
+    do {                               \
+        (T1) ^= (T2);                  \
+        (T2) ^= (T3);                  \
+        (T0) ^= (T1);                  \
+                                       \
+        (T3) ^= (T1);                  \
+        (T2) ^= (T0);                  \
+        (T1) ^= (T2);                  \
+    } while (0)
 
 /* Byte-level diffusion */
 #define ARIA_DIFF_BYTE(T0, T1, T2, T3)                                  \
@@ -418,7 +379,7 @@ static const uint32_t X2[256] = {
         (T1) = (((T1) << 8) & 0xff00ff00) ^ (((T1) >> 8) & 0x00ff00ff); \
         (T2) = rotr32(T2, 16);                                          \
         (T3) = bswap32(T3);                                             \
-    } while(0)
+    } while (0)
 
 /* Odd round Substitution & Diffusion */
 #define ARIA_SUBST_DIFF_ODD(T0, T1, T2, T3)             \
@@ -427,7 +388,7 @@ static const uint32_t X2[256] = {
         ARIA_DIFF_WORD(T0, T1, T2, T3);                 \
         ARIA_DIFF_BYTE(T0, T1, T2, T3);                 \
         ARIA_DIFF_WORD(T0, T1, T2, T3);                 \
-    } while(0)
+    } while (0)
 
 /* Even round Substitution & Diffusion */
 #define ARIA_SUBST_DIFF_EVEN(T0, T1, T2, T3)            \
@@ -436,40 +397,28 @@ static const uint32_t X2[256] = {
         ARIA_DIFF_WORD(T0, T1, T2, T3);                 \
         ARIA_DIFF_BYTE(T2, T3, T0, T1);                 \
         ARIA_DIFF_WORD(T0, T1, T2, T3);                 \
-    } while(0)
+    } while (0)
 
 /* Q, R Macro expanded ARIA GSRK */
-#define _ARIA_GSRK(RK, X, Y, Q, R)                  \
-    do {                                            \
-        (RK)->u[0] =                                \
-            ((X)[0]) ^                              \
-            (((Y)[((Q)    ) % 4]) >> (R)) ^         \
-            (((Y)[((Q) + 3) % 4]) << (32 - (R)));   \
-        (RK)->u[1] =                                \
-            ((X)[1]) ^                              \
-            (((Y)[((Q) + 1) % 4]) >> (R)) ^         \
-            (((Y)[((Q)    ) % 4]) << (32 - (R)));   \
-        (RK)->u[2] =                                \
-            ((X)[2]) ^                              \
-            (((Y)[((Q) + 2) % 4]) >> (R)) ^         \
-            (((Y)[((Q) + 1) % 4]) << (32 - (R)));   \
-        (RK)->u[3] =                                \
-            ((X)[3]) ^                              \
-            (((Y)[((Q) + 3) % 4]) >> (R)) ^         \
-            (((Y)[((Q) + 2) % 4]) << (32 - (R)));   \
-    } while(0)
+#define _ARIA_GSRK(RK, X, Y, Q, R)                                                                    \
+    do {                                                                                              \
+        (RK)->u[0] = ((X)[0]) ^ (((Y)[((Q)) % 4]) >> (R)) ^ (((Y)[((Q) + 3) % 4]) << (32 - (R)));     \
+        (RK)->u[1] = ((X)[1]) ^ (((Y)[((Q) + 1) % 4]) >> (R)) ^ (((Y)[((Q)) % 4]) << (32 - (R)));     \
+        (RK)->u[2] = ((X)[2]) ^ (((Y)[((Q) + 2) % 4]) >> (R)) ^ (((Y)[((Q) + 1) % 4]) << (32 - (R))); \
+        (RK)->u[3] = ((X)[3]) ^ (((Y)[((Q) + 3) % 4]) >> (R)) ^ (((Y)[((Q) + 2) % 4]) << (32 - (R))); \
+    } while (0)
 
 #define ARIA_GSRK(RK, X, Y, N) _ARIA_GSRK(RK, X, Y, 4 - ((N) / 32), (N) % 32)
 
-#define ARIA_DEC_DIFF_BYTE(X, Y, TMP, TMP2)         \
-    do {                                            \
-        (TMP) = (X);                                \
-        (TMP2) = rotr32((TMP), 8);                  \
-        (Y) = (TMP2) ^ rotr32((TMP) ^ (TMP2), 16);  \
-    } while(0)
+#define ARIA_DEC_DIFF_BYTE(X, Y, TMP, TMP2)        \
+    do {                                           \
+        (TMP) = (X);                               \
+        (TMP2) = rotr32((TMP), 8);                 \
+        (Y) = (TMP2) ^ rotr32((TMP) ^ (TMP2), 16); \
+    } while (0)
 
 void ossl_aria_encrypt(const unsigned char *in, unsigned char *out,
-                       const ARIA_KEY *key)
+    const ARIA_KEY *key)
 {
     register uint32_t reg0, reg1, reg2, reg3;
     int Nr;
@@ -508,26 +457,10 @@ void ossl_aria_encrypt(const unsigned char *in, unsigned char *out,
         rk++;
     }
 
-    reg0 = rk->u[0] ^ MAKE_U32(
-        (uint8_t)(X1[GET_U8_BE(reg0, 0)]     ),
-        (uint8_t)(X2[GET_U8_BE(reg0, 1)] >> 8),
-        (uint8_t)(S1[GET_U8_BE(reg0, 2)]     ),
-        (uint8_t)(S2[GET_U8_BE(reg0, 3)]     ));
-    reg1 = rk->u[1] ^ MAKE_U32(
-        (uint8_t)(X1[GET_U8_BE(reg1, 0)]     ),
-        (uint8_t)(X2[GET_U8_BE(reg1, 1)] >> 8),
-        (uint8_t)(S1[GET_U8_BE(reg1, 2)]     ),
-        (uint8_t)(S2[GET_U8_BE(reg1, 3)]     ));
-    reg2 = rk->u[2] ^ MAKE_U32(
-        (uint8_t)(X1[GET_U8_BE(reg2, 0)]     ),
-        (uint8_t)(X2[GET_U8_BE(reg2, 1)] >> 8),
-        (uint8_t)(S1[GET_U8_BE(reg2, 2)]     ),
-        (uint8_t)(S2[GET_U8_BE(reg2, 3)]     ));
-    reg3 = rk->u[3] ^ MAKE_U32(
-        (uint8_t)(X1[GET_U8_BE(reg3, 0)]     ),
-        (uint8_t)(X2[GET_U8_BE(reg3, 1)] >> 8),
-        (uint8_t)(S1[GET_U8_BE(reg3, 2)]     ),
-        (uint8_t)(S2[GET_U8_BE(reg3, 3)]     ));
+    reg0 = rk->u[0] ^ MAKE_U32((uint8_t)(X1[GET_U8_BE(reg0, 0)]), (uint8_t)(X2[GET_U8_BE(reg0, 1)] >> 8), (uint8_t)(S1[GET_U8_BE(reg0, 2)]), (uint8_t)(S2[GET_U8_BE(reg0, 3)]));
+    reg1 = rk->u[1] ^ MAKE_U32((uint8_t)(X1[GET_U8_BE(reg1, 0)]), (uint8_t)(X2[GET_U8_BE(reg1, 1)] >> 8), (uint8_t)(S1[GET_U8_BE(reg1, 2)]), (uint8_t)(S2[GET_U8_BE(reg1, 3)]));
+    reg2 = rk->u[2] ^ MAKE_U32((uint8_t)(X1[GET_U8_BE(reg2, 0)]), (uint8_t)(X2[GET_U8_BE(reg2, 1)] >> 8), (uint8_t)(S1[GET_U8_BE(reg2, 2)]), (uint8_t)(S2[GET_U8_BE(reg2, 3)]));
+    reg3 = rk->u[3] ^ MAKE_U32((uint8_t)(X1[GET_U8_BE(reg3, 0)]), (uint8_t)(X2[GET_U8_BE(reg3, 1)] >> 8), (uint8_t)(S1[GET_U8_BE(reg3, 2)]), (uint8_t)(S2[GET_U8_BE(reg3, 3)]));
 
     PUT_U32_BE(out, 0, reg0);
     PUT_U32_BE(out, 1, reg1);
@@ -536,7 +469,7 @@ void ossl_aria_encrypt(const unsigned char *in, unsigned char *out,
 }
 
 int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
-                              ARIA_KEY *key)
+    ARIA_KEY *key)
 {
     register uint32_t reg0, reg1, reg2, reg3;
     uint32_t w0[4], w1[4], w2[4], w3[4];
@@ -574,12 +507,10 @@ int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
         if (bits > 192) {
             w1[2] = GET_U32_BE(userKey, 6);
             w1[3] = GET_U32_BE(userKey, 7);
-        }
-        else {
+        } else {
             w1[2] = w1[3] = 0;
         }
-    }
-    else {
+    } else {
         w1[0] = w1[1] = w1[2] = w1[3] = 0;
     }
 
@@ -668,7 +599,7 @@ int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
 }
 
 int ossl_aria_set_decrypt_key(const unsigned char *userKey, const int bits,
-                              ARIA_KEY *key)
+    ARIA_KEY *key)
 {
     ARIA_u128 *rk_head;
     ARIA_u128 *rk_tail;
@@ -893,20 +824,14 @@ static const unsigned char sb4[256] = {
     0xf7, 0x4c, 0x11, 0x33, 0x03, 0xa2, 0xac, 0x60
 };
 
-static const ARIA_u128 c1 = {{
-    0x51, 0x7c, 0xc1, 0xb7, 0x27, 0x22, 0x0a, 0x94,
-    0xfe, 0x13, 0xab, 0xe8, 0xfa, 0x9a, 0x6e, 0xe0
-}};
+static const ARIA_u128 c1 = { { 0x51, 0x7c, 0xc1, 0xb7, 0x27, 0x22, 0x0a, 0x94,
+    0xfe, 0x13, 0xab, 0xe8, 0xfa, 0x9a, 0x6e, 0xe0 } };
 
-static const ARIA_u128 c2 = {{
-    0x6d, 0xb1, 0x4a, 0xcc, 0x9e, 0x21, 0xc8, 0x20,
-    0xff, 0x28, 0xb1, 0xd5, 0xef, 0x5d, 0xe2, 0xb0
-}};
+static const ARIA_u128 c2 = { { 0x6d, 0xb1, 0x4a, 0xcc, 0x9e, 0x21, 0xc8, 0x20,
+    0xff, 0x28, 0xb1, 0xd5, 0xef, 0x5d, 0xe2, 0xb0 } };
 
-static const ARIA_u128 c3 = {{
-    0xdb, 0x92, 0x37, 0x1d, 0x21, 0x26, 0xe9, 0x70,
-    0x03, 0x24, 0x97, 0x75, 0x04, 0xe8, 0xc9, 0x0e
-}};
+static const ARIA_u128 c3 = { { 0xdb, 0x92, 0x37, 0x1d, 0x21, 0x26, 0xe9, 0x70,
+    0x03, 0x24, 0x97, 0x75, 0x04, 0xe8, 0xc9, 0x0e } };
 
 /*
  * Exclusive or two 128 bit values into the result.
@@ -925,7 +850,7 @@ static void xor128(ARIA_c128 o, const ARIA_c128 x, const ARIA_u128 *y)
  * It is safe for the output to overlap either input.
  */
 static ossl_inline void rotnr(unsigned int n, ARIA_u128 *o,
-                              const ARIA_u128 *xor, const ARIA_u128 *z)
+    const ARIA_u128 *xor, const ARIA_u128 *z)
 {
     const unsigned int bytes = n / 8, bits = n % 8;
     unsigned int i;
@@ -934,9 +859,7 @@ static ossl_inline void rotnr(unsigned int n, ARIA_u128 *o,
     for (i = 0; i < ARIA_BLOCK_SIZE; i++)
         t.c[(i + bytes) % ARIA_BLOCK_SIZE] = z->c[i];
     for (i = 0; i < ARIA_BLOCK_SIZE; i++)
-        o->c[i] = ((t.c[i] >> bits) |
-                (t.c[i ? i - 1 : ARIA_BLOCK_SIZE - 1] << (8 - bits))) ^
-                xor->c[i];
+        o->c[i] = ((t.c[i] >> bits) | (t.c[i ? i - 1 : ARIA_BLOCK_SIZE - 1] << (8 - bits))) ^ xor->c[i];
 }
 
 /*
@@ -992,7 +915,7 @@ static void sl1(ARIA_u128 *o, const ARIA_u128 *x, const ARIA_u128 *y)
 {
     unsigned int i;
     for (i = 0; i < ARIA_BLOCK_SIZE; i += 4) {
-        o->c[i    ] = sb1[x->c[i    ] ^ y->c[i    ]];
+        o->c[i] = sb1[x->c[i] ^ y->c[i]];
         o->c[i + 1] = sb2[x->c[i + 1] ^ y->c[i + 1]];
         o->c[i + 2] = sb3[x->c[i + 2] ^ y->c[i + 2]];
         o->c[i + 3] = sb4[x->c[i + 3] ^ y->c[i + 3]];
@@ -1007,7 +930,7 @@ static void sl2(ARIA_c128 o, const ARIA_u128 *x, const ARIA_u128 *y)
 {
     unsigned int i;
     for (i = 0; i < ARIA_BLOCK_SIZE; i += 4) {
-        o[i    ] = sb3[x->c[i    ] ^ y->c[i    ]];
+        o[i] = sb3[x->c[i] ^ y->c[i]];
         o[i + 1] = sb4[x->c[i + 1] ^ y->c[i + 1]];
         o[i + 2] = sb1[x->c[i + 2] ^ y->c[i + 2]];
         o[i + 3] = sb2[x->c[i + 3] ^ y->c[i + 3]];
@@ -1020,38 +943,22 @@ static void sl2(ARIA_c128 o, const ARIA_u128 *x, const ARIA_u128 *y)
  */
 static void a(ARIA_u128 *y, const ARIA_u128 *x)
 {
-    y->c[ 0] = x->c[ 3] ^ x->c[ 4] ^ x->c[ 6] ^ x->c[ 8] ^
-               x->c[ 9] ^ x->c[13] ^ x->c[14];
-    y->c[ 1] = x->c[ 2] ^ x->c[ 5] ^ x->c[ 7] ^ x->c[ 8] ^
-               x->c[ 9] ^ x->c[12] ^ x->c[15];
-    y->c[ 2] = x->c[ 1] ^ x->c[ 4] ^ x->c[ 6] ^ x->c[10] ^
-               x->c[11] ^ x->c[12] ^ x->c[15];
-    y->c[ 3] = x->c[ 0] ^ x->c[ 5] ^ x->c[ 7] ^ x->c[10] ^
-               x->c[11] ^ x->c[13] ^ x->c[14];
-    y->c[ 4] = x->c[ 0] ^ x->c[ 2] ^ x->c[ 5] ^ x->c[ 8] ^
-               x->c[11] ^ x->c[14] ^ x->c[15];
-    y->c[ 5] = x->c[ 1] ^ x->c[ 3] ^ x->c[ 4] ^ x->c[ 9] ^
-               x->c[10] ^ x->c[14] ^ x->c[15];
-    y->c[ 6] = x->c[ 0] ^ x->c[ 2] ^ x->c[ 7] ^ x->c[ 9] ^
-               x->c[10] ^ x->c[12] ^ x->c[13];
-    y->c[ 7] = x->c[ 1] ^ x->c[ 3] ^ x->c[ 6] ^ x->c[ 8] ^
-               x->c[11] ^ x->c[12] ^ x->c[13];
-    y->c[ 8] = x->c[ 0] ^ x->c[ 1] ^ x->c[ 4] ^ x->c[ 7] ^
-               x->c[10] ^ x->c[13] ^ x->c[15];
-    y->c[ 9] = x->c[ 0] ^ x->c[ 1] ^ x->c[ 5] ^ x->c[ 6] ^
-               x->c[11] ^ x->c[12] ^ x->c[14];
-    y->c[10] = x->c[ 2] ^ x->c[ 3] ^ x->c[ 5] ^ x->c[ 6] ^
-               x->c[ 8] ^ x->c[13] ^ x->c[15];
-    y->c[11] = x->c[ 2] ^ x->c[ 3] ^ x->c[ 4] ^ x->c[ 7] ^
-               x->c[ 9] ^ x->c[12] ^ x->c[14];
-    y->c[12] = x->c[ 1] ^ x->c[ 2] ^ x->c[ 6] ^ x->c[ 7] ^
-               x->c[ 9] ^ x->c[11] ^ x->c[12];
-    y->c[13] = x->c[ 0] ^ x->c[ 3] ^ x->c[ 6] ^ x->c[ 7] ^
-               x->c[ 8] ^ x->c[10] ^ x->c[13];
-    y->c[14] = x->c[ 0] ^ x->c[ 3] ^ x->c[ 4] ^ x->c[ 5] ^
-               x->c[ 9] ^ x->c[11] ^ x->c[14];
-    y->c[15] = x->c[ 1] ^ x->c[ 2] ^ x->c[ 4] ^ x->c[ 5] ^
-               x->c[ 8] ^ x->c[10] ^ x->c[15];
+    y->c[0] = x->c[3] ^ x->c[4] ^ x->c[6] ^ x->c[8] ^ x->c[9] ^ x->c[13] ^ x->c[14];
+    y->c[1] = x->c[2] ^ x->c[5] ^ x->c[7] ^ x->c[8] ^ x->c[9] ^ x->c[12] ^ x->c[15];
+    y->c[2] = x->c[1] ^ x->c[4] ^ x->c[6] ^ x->c[10] ^ x->c[11] ^ x->c[12] ^ x->c[15];
+    y->c[3] = x->c[0] ^ x->c[5] ^ x->c[7] ^ x->c[10] ^ x->c[11] ^ x->c[13] ^ x->c[14];
+    y->c[4] = x->c[0] ^ x->c[2] ^ x->c[5] ^ x->c[8] ^ x->c[11] ^ x->c[14] ^ x->c[15];
+    y->c[5] = x->c[1] ^ x->c[3] ^ x->c[4] ^ x->c[9] ^ x->c[10] ^ x->c[14] ^ x->c[15];
+    y->c[6] = x->c[0] ^ x->c[2] ^ x->c[7] ^ x->c[9] ^ x->c[10] ^ x->c[12] ^ x->c[13];
+    y->c[7] = x->c[1] ^ x->c[3] ^ x->c[6] ^ x->c[8] ^ x->c[11] ^ x->c[12] ^ x->c[13];
+    y->c[8] = x->c[0] ^ x->c[1] ^ x->c[4] ^ x->c[7] ^ x->c[10] ^ x->c[13] ^ x->c[15];
+    y->c[9] = x->c[0] ^ x->c[1] ^ x->c[5] ^ x->c[6] ^ x->c[11] ^ x->c[12] ^ x->c[14];
+    y->c[10] = x->c[2] ^ x->c[3] ^ x->c[5] ^ x->c[6] ^ x->c[8] ^ x->c[13] ^ x->c[15];
+    y->c[11] = x->c[2] ^ x->c[3] ^ x->c[4] ^ x->c[7] ^ x->c[9] ^ x->c[12] ^ x->c[14];
+    y->c[12] = x->c[1] ^ x->c[2] ^ x->c[6] ^ x->c[7] ^ x->c[9] ^ x->c[11] ^ x->c[12];
+    y->c[13] = x->c[0] ^ x->c[3] ^ x->c[6] ^ x->c[7] ^ x->c[8] ^ x->c[10] ^ x->c[13];
+    y->c[14] = x->c[0] ^ x->c[3] ^ x->c[4] ^ x->c[5] ^ x->c[9] ^ x->c[11] ^ x->c[14];
+    y->c[15] = x->c[1] ^ x->c[2] ^ x->c[4] ^ x->c[5] ^ x->c[8] ^ x->c[10] ^ x->c[15];
 }
 
 /*
@@ -1060,7 +967,7 @@ static void a(ARIA_u128 *y, const ARIA_u128 *x)
  * It is safe for the input and output to overlap.
  */
 static ossl_inline void FO(ARIA_u128 *o, const ARIA_u128 *d,
-                           const ARIA_u128 *rk)
+    const ARIA_u128 *rk)
 {
     ARIA_u128 y;
 
@@ -1074,7 +981,7 @@ static ossl_inline void FO(ARIA_u128 *o, const ARIA_u128 *d,
  * It is safe for the input and output to overlap.
  */
 static ossl_inline void FE(ARIA_u128 *o, const ARIA_u128 *d,
-                           const ARIA_u128 *rk)
+    const ARIA_u128 *rk)
 {
     ARIA_u128 y;
 
@@ -1087,7 +994,7 @@ static ossl_inline void FE(ARIA_u128 *o, const ARIA_u128 *d,
  * in and out can overlap
  */
 static void do_encrypt(unsigned char *o, const unsigned char *pin,
-                       unsigned int rounds, const ARIA_u128 *keys)
+    unsigned int rounds, const ARIA_u128 *keys)
 {
     ARIA_u128 p;
     unsigned int i;
@@ -1107,20 +1014,19 @@ static void do_encrypt(unsigned char *o, const unsigned char *pin,
  * in and out can overlap
  */
 void ossl_aria_encrypt(const unsigned char *in, unsigned char *out,
-                       const ARIA_KEY *key)
+    const ARIA_KEY *key)
 {
     assert(in != NULL && out != NULL && key != NULL);
     do_encrypt(out, in, key->rounds, key->rd_key);
 }
 
-
 /*
  * Expand the cipher key into the encryption key schedule.
  * We short circuit execution of the last two
  * or four rotations based on the key size.
  */
 int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
-                              ARIA_KEY *key)
+    ARIA_KEY *key)
 {
     const ARIA_u128 *ck1, *ck2, *ck3;
     ARIA_u128 kr, w0, w1, w2, w3;
@@ -1157,22 +1063,25 @@ int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
         break;
     }
 
-    FO(&w3, &w0, ck1);    xor128(w1.c, w3.c, &kr);
-    FE(&w3, &w1, ck2);    xor128(w2.c, w3.c, &w0);
-    FO(&kr, &w2, ck3);    xor128(w3.c, kr.c, &w1);
-
-    rot19r(&key->rd_key[ 0], &w0, &w1);
-    rot19r(&key->rd_key[ 1], &w1, &w2);
-    rot19r(&key->rd_key[ 2], &w2, &w3);
-    rot19r(&key->rd_key[ 3], &w3, &w0);
-
-    rot31r(&key->rd_key[ 4], &w0, &w1);
-    rot31r(&key->rd_key[ 5], &w1, &w2);
-    rot31r(&key->rd_key[ 6], &w2, &w3);
-    rot31r(&key->rd_key[ 7], &w3, &w0);
-
-    rot61l(&key->rd_key[ 8], &w0, &w1);
-    rot61l(&key->rd_key[ 9], &w1, &w2);
+    FO(&w3, &w0, ck1);
+    xor128(w1.c, w3.c, &kr);
+    FE(&w3, &w1, ck2);
+    xor128(w2.c, w3.c, &w0);
+    FO(&kr, &w2, ck3);
+    xor128(w3.c, kr.c, &w1);
+
+    rot19r(&key->rd_key[0], &w0, &w1);
+    rot19r(&key->rd_key[1], &w1, &w2);
+    rot19r(&key->rd_key[2], &w2, &w3);
+    rot19r(&key->rd_key[3], &w3, &w0);
+
+    rot31r(&key->rd_key[4], &w0, &w1);
+    rot31r(&key->rd_key[5], &w1, &w2);
+    rot31r(&key->rd_key[6], &w2, &w3);
+    rot31r(&key->rd_key[7], &w3, &w0);
+
+    rot61l(&key->rd_key[8], &w0, &w1);
+    rot61l(&key->rd_key[9], &w1, &w2);
     rot61l(&key->rd_key[10], &w2, &w3);
     rot61l(&key->rd_key[11], &w3, &w0);
 
@@ -1193,7 +1102,7 @@ int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
  * Expand the cipher key into the decryption key schedule.
  */
 int ossl_aria_set_decrypt_key(const unsigned char *userKey, const int bits,
-                              ARIA_KEY *key)
+    ARIA_KEY *key)
 {
     ARIA_KEY ek;
     const int r = ossl_aria_set_encrypt_key(userKey, bits, &ek);
diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
index acd8aee4d5195..d570d1eba6c10 100644
--- a/crypto/arm_arch.h
+++ b/crypto/arm_arch.h
@@ -8,87 +8,80 @@
  */
 
 #ifndef OSSL_CRYPTO_ARM_ARCH_H
-# define OSSL_CRYPTO_ARM_ARCH_H
-
-# if !defined(__ARM_ARCH__)
-#  if defined(__CC_ARM)
-#   define __ARM_ARCH__ __TARGET_ARCH_ARM
-#   if defined(__BIG_ENDIAN)
-#    define __ARMEB__
-#   else
-#    define __ARMEL__
-#   endif
-#  elif defined(__GNUC__)
-#   if   defined(__aarch64__)
-#    define __ARM_ARCH__ 8
-  /*
-   * Why doesn't gcc define __ARM_ARCH__? Instead it defines
-   * bunch of below macros. See all_architectures[] table in
-   * gcc/config/arm/arm.c. On a side note it defines
-   * __ARMEL__/__ARMEB__ for little-/big-endian.
-   */
-#   elif defined(__ARM_ARCH)
-#    define __ARM_ARCH__ __ARM_ARCH
-#   elif defined(__ARM_ARCH_8A__)
-#    define __ARM_ARCH__ 8
-#   elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)     || \
-        defined(__ARM_ARCH_7R__)|| defined(__ARM_ARCH_7M__)     || \
-        defined(__ARM_ARCH_7EM__)
-#    define __ARM_ARCH__ 7
-#   elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__)     || \
-        defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__)     || \
-        defined(__ARM_ARCH_6Z__)|| defined(__ARM_ARCH_6ZK__)    || \
-        defined(__ARM_ARCH_6T2__)
-#    define __ARM_ARCH__ 6
-#   elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__)     || \
-        defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__)    || \
-        defined(__ARM_ARCH_5TEJ__)
-#    define __ARM_ARCH__ 5
-#   elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
-#    define __ARM_ARCH__ 4
-#   else
-#    error "unsupported ARM architecture"
-#   endif
-#  elif defined(__ARM_ARCH)
-#   define __ARM_ARCH__ __ARM_ARCH
-#  endif
-# endif
-
-# if !defined(__ARM_MAX_ARCH__)
-#  define __ARM_MAX_ARCH__ __ARM_ARCH__
-# endif
-
-# if __ARM_MAX_ARCH__<__ARM_ARCH__
-#  error "__ARM_MAX_ARCH__ can't be less than __ARM_ARCH__"
-# elif __ARM_MAX_ARCH__!=__ARM_ARCH__
-#  if __ARM_ARCH__<7 && __ARM_MAX_ARCH__>=7 && defined(__ARMEB__)
-#   error "can't build universal big-endian binary"
-#  endif
-# endif
-
-# ifndef __ASSEMBLER__
+#define OSSL_CRYPTO_ARM_ARCH_H
+
+#if !defined(__ARM_ARCH__)
+#if defined(__CC_ARM)
+#define __ARM_ARCH__ __TARGET_ARCH_ARM
+#if defined(__BIG_ENDIAN)
+#define __ARMEB__
+#else
+#define __ARMEL__
+#endif
+#elif defined(__GNUC__)
+#if defined(__aarch64__)
+#define __ARM_ARCH__ 8
+/*
+ * Why doesn't gcc define __ARM_ARCH__? Instead it defines
+ * bunch of below macros. See all_architectures[] table in
+ * gcc/config/arm/arm.c. On a side note it defines
+ * __ARMEL__/__ARMEB__ for little-/big-endian.
+ */
+#elif defined(__ARM_ARCH)
+#define __ARM_ARCH__ __ARM_ARCH
+#elif defined(__ARM_ARCH_8A__)
+#define __ARM_ARCH__ 8
+#elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)
+#define __ARM_ARCH__ 7
+#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6M__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__)
+#define __ARM_ARCH__ 6
+#elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)
+#define __ARM_ARCH__ 5
+#elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
+#define __ARM_ARCH__ 4
+#else
+#error "unsupported ARM architecture"
+#endif
+#elif defined(__ARM_ARCH)
+#define __ARM_ARCH__ __ARM_ARCH
+#endif
+#endif
+
+#if !defined(__ARM_MAX_ARCH__)
+#define __ARM_MAX_ARCH__ __ARM_ARCH__
+#endif
+
+#if __ARM_MAX_ARCH__ < __ARM_ARCH__
+#error "__ARM_MAX_ARCH__ can't be less than __ARM_ARCH__"
+#elif __ARM_MAX_ARCH__ != __ARM_ARCH__
+#if __ARM_ARCH__ < 7 && __ARM_MAX_ARCH__ >= 7 && defined(__ARMEB__)
+#error "can't build universal big-endian binary"
+#endif
+#endif
+
+#ifndef __ASSEMBLER__
 extern unsigned int OPENSSL_armcap_P;
 extern unsigned int OPENSSL_arm_midr;
 extern unsigned int OPENSSL_armv8_rsa_neonized;
-# endif
-
-# define ARMV7_NEON      (1<<0)
-# define ARMV7_TICK      (1<<1)
-# define ARMV8_AES       (1<<2)
-# define ARMV8_SHA1      (1<<3)
-# define ARMV8_SHA256    (1<<4)
-# define ARMV8_PMULL     (1<<5)
-# define ARMV8_SHA512    (1<<6)
-# define ARMV8_CPUID     (1<<7)
-# define ARMV8_RNG       (1<<8)
-# define ARMV8_SM3       (1<<9)
-# define ARMV8_SM4       (1<<10)
-# define ARMV8_SHA3      (1<<11)
-# define ARMV8_UNROLL8_EOR3      (1<<12)
-# define ARMV8_SVE       (1<<13)
-# define ARMV8_SVE2      (1<<14)
-# define ARMV8_HAVE_SHA3_AND_WORTH_USING     (1<<15)
-# define ARMV8_UNROLL12_EOR3     (1<<16)
+#endif
+
+#define ARMV7_NEON (1 << 0)
+#define ARMV7_TICK (1 << 1)
+#define ARMV8_AES (1 << 2)
+#define ARMV8_SHA1 (1 << 3)
+#define ARMV8_SHA256 (1 << 4)
+#define ARMV8_PMULL (1 << 5)
+#define ARMV8_SHA512 (1 << 6)
+#define ARMV8_CPUID (1 << 7)
+#define ARMV8_RNG (1 << 8)
+#define ARMV8_SM3 (1 << 9)
+#define ARMV8_SM4 (1 << 10)
+#define ARMV8_SHA3 (1 << 11)
+#define ARMV8_UNROLL8_EOR3 (1 << 12)
+#define ARMV8_SVE (1 << 13)
+#define ARMV8_SVE2 (1 << 14)
+#define ARMV8_HAVE_SHA3_AND_WORTH_USING (1 << 15)
+#define ARMV8_UNROLL12_EOR3 (1 << 16)
 
 /*
  * MIDR_EL1 system register
@@ -100,120 +93,116 @@ extern unsigned int OPENSSL_armv8_rsa_neonized;
  *
  */
 
-# define ARM_CPU_IMP_ARM           0x41
-# define HISI_CPU_IMP              0x48
-# define ARM_CPU_IMP_APPLE         0x61
-# define ARM_CPU_IMP_MICROSOFT     0x6D
-# define ARM_CPU_IMP_AMPERE        0xC0
-
-# define ARM_CPU_PART_CORTEX_A72   0xD08
-# define ARM_CPU_PART_N1           0xD0C
-# define ARM_CPU_PART_V1           0xD40
-# define ARM_CPU_PART_N2           0xD49
-# define HISI_CPU_PART_KP920       0xD01
-# define ARM_CPU_PART_V2           0xD4F
-
-# define APPLE_CPU_PART_M1_ICESTORM         0x022
-# define APPLE_CPU_PART_M1_FIRESTORM        0x023
-# define APPLE_CPU_PART_M1_ICESTORM_PRO     0x024
-# define APPLE_CPU_PART_M1_FIRESTORM_PRO    0x025
-# define APPLE_CPU_PART_M1_ICESTORM_MAX     0x028
-# define APPLE_CPU_PART_M1_FIRESTORM_MAX    0x029
-# define APPLE_CPU_PART_M2_BLIZZARD         0x032
-# define APPLE_CPU_PART_M2_AVALANCHE        0x033
-# define APPLE_CPU_PART_M2_BLIZZARD_PRO     0x034
-# define APPLE_CPU_PART_M2_AVALANCHE_PRO    0x035
-# define APPLE_CPU_PART_M2_BLIZZARD_MAX     0x038
-# define APPLE_CPU_PART_M2_AVALANCHE_MAX    0x039
-
-# define MICROSOFT_CPU_PART_COBALT_100      0xD49
-
-# define MIDR_PARTNUM_SHIFT       4
-# define MIDR_PARTNUM_MASK        (0xfffU << MIDR_PARTNUM_SHIFT)
-# define MIDR_PARTNUM(midr)       \
-           (((midr) & MIDR_PARTNUM_MASK) >> MIDR_PARTNUM_SHIFT)
-
-# define MIDR_IMPLEMENTER_SHIFT   24
-# define MIDR_IMPLEMENTER_MASK    (0xffU << MIDR_IMPLEMENTER_SHIFT)
-# define MIDR_IMPLEMENTER(midr)   \
-           (((midr) & MIDR_IMPLEMENTER_MASK) >> MIDR_IMPLEMENTER_SHIFT)
-
-# define MIDR_ARCHITECTURE_SHIFT  16
-# define MIDR_ARCHITECTURE_MASK   (0xfU << MIDR_ARCHITECTURE_SHIFT)
-# define MIDR_ARCHITECTURE(midr)  \
-           (((midr) & MIDR_ARCHITECTURE_MASK) >> MIDR_ARCHITECTURE_SHIFT)
-
-# define MIDR_CPU_MODEL_MASK \
-           (MIDR_IMPLEMENTER_MASK | \
-            MIDR_PARTNUM_MASK     | \
-            MIDR_ARCHITECTURE_MASK)
-
-# define MIDR_CPU_MODEL(imp, partnum) \
-           (((imp)     << MIDR_IMPLEMENTER_SHIFT)  | \
-            (0xfU      << MIDR_ARCHITECTURE_SHIFT) | \
-            ((partnum) << MIDR_PARTNUM_SHIFT))
-
-# define MIDR_IS_CPU_MODEL(midr, imp, partnum) \
-           (((midr) & MIDR_CPU_MODEL_MASK) == MIDR_CPU_MODEL(imp, partnum))
+#define ARM_CPU_IMP_ARM 0x41
+#define HISI_CPU_IMP 0x48
+#define ARM_CPU_IMP_APPLE 0x61
+#define ARM_CPU_IMP_MICROSOFT 0x6D
+#define ARM_CPU_IMP_AMPERE 0xC0
+
+#define ARM_CPU_PART_CORTEX_A72 0xD08
+#define ARM_CPU_PART_N1 0xD0C
+#define ARM_CPU_PART_V1 0xD40
+#define ARM_CPU_PART_N2 0xD49
+#define HISI_CPU_PART_KP920 0xD01
+#define ARM_CPU_PART_V2 0xD4F
+
+#define APPLE_CPU_PART_M1_ICESTORM 0x022
+#define APPLE_CPU_PART_M1_FIRESTORM 0x023
+#define APPLE_CPU_PART_M1_ICESTORM_PRO 0x024
+#define APPLE_CPU_PART_M1_FIRESTORM_PRO 0x025
+#define APPLE_CPU_PART_M1_ICESTORM_MAX 0x028
+#define APPLE_CPU_PART_M1_FIRESTORM_MAX 0x029
+#define APPLE_CPU_PART_M2_BLIZZARD 0x032
+#define APPLE_CPU_PART_M2_AVALANCHE 0x033
+#define APPLE_CPU_PART_M2_BLIZZARD_PRO 0x034
+#define APPLE_CPU_PART_M2_AVALANCHE_PRO 0x035
+#define APPLE_CPU_PART_M2_BLIZZARD_MAX 0x038
+#define APPLE_CPU_PART_M2_AVALANCHE_MAX 0x039
+
+#define MICROSOFT_CPU_PART_COBALT_100 0xD49
+
+#define MIDR_PARTNUM_SHIFT 4
+#define MIDR_PARTNUM_MASK (0xfffU << MIDR_PARTNUM_SHIFT)
+#define MIDR_PARTNUM(midr) \
+    (((midr) & MIDR_PARTNUM_MASK) >> MIDR_PARTNUM_SHIFT)
+
+#define MIDR_IMPLEMENTER_SHIFT 24
+#define MIDR_IMPLEMENTER_MASK (0xffU << MIDR_IMPLEMENTER_SHIFT)
+#define MIDR_IMPLEMENTER(midr) \
+    (((midr) & MIDR_IMPLEMENTER_MASK) >> MIDR_IMPLEMENTER_SHIFT)
+
+#define MIDR_ARCHITECTURE_SHIFT 16
+#define MIDR_ARCHITECTURE_MASK (0xfU << MIDR_ARCHITECTURE_SHIFT)
+#define MIDR_ARCHITECTURE(midr) \
+    (((midr) & MIDR_ARCHITECTURE_MASK) >> MIDR_ARCHITECTURE_SHIFT)
+
+#define MIDR_CPU_MODEL_MASK \
+    (MIDR_IMPLEMENTER_MASK | MIDR_PARTNUM_MASK | MIDR_ARCHITECTURE_MASK)
+
+#define MIDR_CPU_MODEL(imp, partnum) \
+    (((imp) << MIDR_IMPLEMENTER_SHIFT) | (0xfU << MIDR_ARCHITECTURE_SHIFT) | ((partnum) << MIDR_PARTNUM_SHIFT))
+
+#define MIDR_IS_CPU_MODEL(midr, imp, partnum) \
+    (((midr) & MIDR_CPU_MODEL_MASK) == MIDR_CPU_MODEL(imp, partnum))
 
 #if defined(__ASSEMBLER__)
 
-   /*
-    * Support macros for
-    *   - Armv8.3-A Pointer Authentication and
-    *   - Armv8.5-A Branch Target Identification
-    * features which require emitting a .note.gnu.property section with the
-    * appropriate architecture-dependent feature bits set.
-    * Read more: "ELF for the Arm® 64-bit Architecture"
-    */
-
-#  if defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT == 1
-#   define GNU_PROPERTY_AARCH64_BTI (1 << 0)   /* Has Branch Target Identification */
-#   define AARCH64_VALID_CALL_TARGET hint #34  /* BTI 'c' */
-#  else
-#   define GNU_PROPERTY_AARCH64_BTI 0  /* No Branch Target Identification */
-#   define AARCH64_VALID_CALL_TARGET
-#  endif
-
-#  if defined(__ARM_FEATURE_PAC_DEFAULT) && \
-       (__ARM_FEATURE_PAC_DEFAULT & 1) == 1  /* Signed with A-key */
-#   define GNU_PROPERTY_AARCH64_POINTER_AUTH \
-     (1 << 1)                                       /* Has Pointer Authentication */
-#   define AARCH64_SIGN_LINK_REGISTER hint #25      /* PACIASP */
-#   define AARCH64_VALIDATE_LINK_REGISTER hint #29  /* AUTIASP */
-#  elif defined(__ARM_FEATURE_PAC_DEFAULT) && \
-       (__ARM_FEATURE_PAC_DEFAULT & 2) == 2  /* Signed with B-key */
-#   define GNU_PROPERTY_AARCH64_POINTER_AUTH \
-     (1 << 1)                                       /* Has Pointer Authentication */
-#   define AARCH64_SIGN_LINK_REGISTER hint #27      /* PACIBSP */
-#   define AARCH64_VALIDATE_LINK_REGISTER hint #31  /* AUTIBSP */
-#  else
-#   define GNU_PROPERTY_AARCH64_POINTER_AUTH 0  /* No Pointer Authentication */
-#   if GNU_PROPERTY_AARCH64_BTI != 0
-#    define AARCH64_SIGN_LINK_REGISTER AARCH64_VALID_CALL_TARGET
-#   else
-#    define AARCH64_SIGN_LINK_REGISTER
-#   endif
-#   define AARCH64_VALIDATE_LINK_REGISTER
-#  endif
-
-#  if GNU_PROPERTY_AARCH64_POINTER_AUTH != 0 || GNU_PROPERTY_AARCH64_BTI != 0
-    .pushsection .note.gnu.property, "a";
-    .balign 8;
-    .long 4;
-    .long 0x10;
-    .long 0x5;
-    .asciz "GNU";
-    .long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */
-    .long 4;
-    .long (GNU_PROPERTY_AARCH64_POINTER_AUTH | GNU_PROPERTY_AARCH64_BTI);
-    .long 0;
-    .popsection;
-#  endif
-
-# endif  /* defined __ASSEMBLER__ */
-
-# define IS_CPU_SUPPORT_UNROLL8_EOR3() \
-           (OPENSSL_armcap_P & ARMV8_UNROLL8_EOR3)
+/*
+ * Support macros for
+ *   - Armv8.3-A Pointer Authentication and
+ *   - Armv8.5-A Branch Target Identification
+ * features which require emitting a .note.gnu.property section with the
+ * appropriate architecture-dependent feature bits set.
+ * Read more: "ELF for the Arm® 64-bit Architecture"
+ */
+
+#if defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT == 1
+#define GNU_PROPERTY_AARCH64_BTI (1 << 0) /* Has Branch Target Identification */
+#define AARCH64_VALID_CALL_TARGET hint #34 /* BTI 'c' */
+#else
+#define GNU_PROPERTY_AARCH64_BTI 0 /* No Branch Target Identification */
+#define AARCH64_VALID_CALL_TARGET
+#endif
+
+#if defined(__ARM_FEATURE_PAC_DEFAULT) && (__ARM_FEATURE_PAC_DEFAULT & 1) == 1 /* Signed with A-key */
+#define GNU_PROPERTY_AARCH64_POINTER_AUTH \
+    (1 << 1) /* Has Pointer Authentication */
+#define AARCH64_SIGN_LINK_REGISTER hint #25 /* PACIASP */
+#define AARCH64_VALIDATE_LINK_REGISTER hint #29 /* AUTIASP */
+#elif defined(__ARM_FEATURE_PAC_DEFAULT) && (__ARM_FEATURE_PAC_DEFAULT & 2) == 2 /* Signed with B-key */
+#define GNU_PROPERTY_AARCH64_POINTER_AUTH \
+    (1 << 1) /* Has Pointer Authentication */
+#define AARCH64_SIGN_LINK_REGISTER hint #27 /* PACIBSP */
+#define AARCH64_VALIDATE_LINK_REGISTER hint #31 /* AUTIBSP */
+#else
+#define GNU_PROPERTY_AARCH64_POINTER_AUTH 0 /* No Pointer Authentication */
+#if GNU_PROPERTY_AARCH64_BTI != 0
+#define AARCH64_SIGN_LINK_REGISTER AARCH64_VALID_CALL_TARGET
+#else
+#define AARCH64_SIGN_LINK_REGISTER
+#endif
+#define AARCH64_VALIDATE_LINK_REGISTER
+#endif
+
+#if GNU_PROPERTY_AARCH64_POINTER_AUTH != 0 || GNU_PROPERTY_AARCH64_BTI != 0
+/* clang-format off */
+.pushsection .note.gnu.property, "a";
+/* clang-format on */
+.balign 8;
+.long 4;
+.long 0x10;
+.long 0x5;
+.asciz "GNU";
+.long 0xc0000000; /* GNU_PROPERTY_AARCH64_FEATURE_1_AND */
+.long 4;
+.long(GNU_PROPERTY_AARCH64_POINTER_AUTH | GNU_PROPERTY_AARCH64_BTI);
+.long 0;
+.popsection;
+#endif
+
+#endif /* defined __ASSEMBLER__ */
+
+#define IS_CPU_SUPPORT_UNROLL8_EOR3() \
+    (OPENSSL_armcap_P & ARMV8_UNROLL8_EOR3)
 
 #endif
diff --git a/crypto/armcap.c b/crypto/armcap.c
index 7c5a127523acb..03e47dc5bbfb0 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-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
@@ -35,7 +35,7 @@ void OPENSSL_cpuid_setup(void)
     OPENSSL_armcap_P |= ARMV7_NEON;
     OPENSSL_armv8_rsa_neonized = 1;
     if (IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE)) {
-        // These are all covered by one call in Windows
+        /* These are all covered by one call in Windows */
         OPENSSL_armcap_P |= ARMV8_AES;
         OPENSSL_armcap_P |= ARMV8_PMULL;
         OPENSSL_armcap_P |= ARMV8_SHA1;
@@ -58,93 +58,92 @@ uint32_t OPENSSL_rdtsc(void)
 }
 #else /* !_WIN32 && __ARM_MAX_ARCH__ >= 7 */
 
- /* 3 ways of handling things here: __APPLE__,  getauxval() or SIGILL detect */
+/* 3 ways of handling things here: __APPLE__,  getauxval() or SIGILL detect */
 
- /* First determine if getauxval() is available (OSSL_IMPLEMENT_GETAUXVAL) */
+/* First determine if getauxval() is available (OSSL_IMPLEMENT_GETAUXVAL) */
 
-# if defined(__GNUC__) && __GNUC__>=2
-void OPENSSL_cpuid_setup(void) __attribute__ ((constructor));
-# endif
+#if defined(__GNUC__) && __GNUC__ >= 2
+void OPENSSL_cpuid_setup(void) __attribute__((constructor));
+#endif
 
-# if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-#  if __GLIBC_PREREQ(2, 16)
-#   include <sys/auxv.h>
-#   define OSSL_IMPLEMENT_GETAUXVAL
-#  endif
-# elif defined(__ANDROID_API__)
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2, 16)
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
+#elif defined(__ANDROID_API__)
 /* see https://developer.android.google.cn/ndk/guides/cpu-features */
-#  if __ANDROID_API__ >= 18
-#   include <sys/auxv.h>
-#   define OSSL_IMPLEMENT_GETAUXVAL
-#  endif
-# endif
-# if defined(__FreeBSD__) || defined(__OpenBSD__)
-#  include <sys/param.h>
-#  if (defined(__FreeBSD__) && __FreeBSD_version >= 1200000) || \
-    (defined(__OpenBSD__) && OpenBSD >= 202409)
-#   include <sys/auxv.h>
-#   define OSSL_IMPLEMENT_GETAUXVAL
+#if __ANDROID_API__ >= 18
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
+#endif
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#include <sys/param.h>
+#if (defined(__FreeBSD__) && __FreeBSD_version >= 1200000) || (defined(__OpenBSD__) && OpenBSD >= 202409)
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
 
 static unsigned long getauxval(unsigned long key)
 {
-  unsigned long val = 0ul;
+    unsigned long val = 0ul;
 
-  if (elf_aux_info((int)key, &val, sizeof(val)) != 0)
-    return 0ul;
+    if (elf_aux_info((int)key, &val, sizeof(val)) != 0)
+        return 0ul;
 
-  return val;
+    return val;
 }
-#  endif
-# endif
+#endif
+#endif
 
 /*
  * Android: according to https://developer.android.com/ndk/guides/cpu-features,
  * getauxval is supported starting with API level 18
  */
-# if defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__ >= 18
-#  include <sys/auxv.h>
-#  define OSSL_IMPLEMENT_GETAUXVAL
-# endif
+#if defined(__ANDROID__) && defined(__ANDROID_API__) && __ANDROID_API__ >= 18
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
 
 /*
  * ARM puts the feature bits for Crypto Extensions in AT_HWCAP2, whereas
  * AArch64 used AT_HWCAP.
  */
-# ifndef AT_HWCAP
-#  define AT_HWCAP               16
-# endif
-# ifndef AT_HWCAP2
-#  define AT_HWCAP2              26
-# endif
-# if defined(__arm__) || defined (__arm)
-#  define OSSL_HWCAP                  AT_HWCAP
-#  define OSSL_HWCAP_NEON             (1 << 12)
-
-#  define OSSL_HWCAP_CE               AT_HWCAP2
-#  define OSSL_HWCAP_CE_AES           (1 << 0)
-#  define OSSL_HWCAP_CE_PMULL         (1 << 1)
-#  define OSSL_HWCAP_CE_SHA1          (1 << 2)
-#  define OSSL_HWCAP_CE_SHA256        (1 << 3)
-# elif defined(__aarch64__)
-#  define OSSL_HWCAP                  AT_HWCAP
-#  define OSSL_HWCAP_NEON             (1 << 1)
-
-#  define OSSL_HWCAP_CE               AT_HWCAP
-#  define OSSL_HWCAP_CE_AES           (1 << 3)
-#  define OSSL_HWCAP_CE_PMULL         (1 << 4)
-#  define OSSL_HWCAP_CE_SHA1          (1 << 5)
-#  define OSSL_HWCAP_CE_SHA256        (1 << 6)
-#  define OSSL_HWCAP_CPUID            (1 << 11)
-#  define OSSL_HWCAP_SHA3             (1 << 17)
-#  define OSSL_HWCAP_CE_SM3           (1 << 18)
-#  define OSSL_HWCAP_CE_SM4           (1 << 19)
-#  define OSSL_HWCAP_CE_SHA512        (1 << 21)
-#  define OSSL_HWCAP_SVE              (1 << 22)
-                                      /* AT_HWCAP2 */
-#  define OSSL_HWCAP2                 26
-#  define OSSL_HWCAP2_SVE2            (1 << 1)
-#  define OSSL_HWCAP2_RNG             (1 << 16)
-# endif
+#ifndef AT_HWCAP
+#define AT_HWCAP 16
+#endif
+#ifndef AT_HWCAP2
+#define AT_HWCAP2 26
+#endif
+#if defined(__arm__) || defined(__arm)
+#define OSSL_HWCAP AT_HWCAP
+#define OSSL_HWCAP_NEON (1 << 12)
+
+#define OSSL_HWCAP_CE AT_HWCAP2
+#define OSSL_HWCAP_CE_AES (1 << 0)
+#define OSSL_HWCAP_CE_PMULL (1 << 1)
+#define OSSL_HWCAP_CE_SHA1 (1 << 2)
+#define OSSL_HWCAP_CE_SHA256 (1 << 3)
+#elif defined(__aarch64__)
+#define OSSL_HWCAP AT_HWCAP
+#define OSSL_HWCAP_NEON (1 << 1)
+
+#define OSSL_HWCAP_CE AT_HWCAP
+#define OSSL_HWCAP_CE_AES (1 << 3)
+#define OSSL_HWCAP_CE_PMULL (1 << 4)
+#define OSSL_HWCAP_CE_SHA1 (1 << 5)
+#define OSSL_HWCAP_CE_SHA256 (1 << 6)
+#define OSSL_HWCAP_CPUID (1 << 11)
+#define OSSL_HWCAP_SHA3 (1 << 17)
+#define OSSL_HWCAP_CE_SM3 (1 << 18)
+#define OSSL_HWCAP_CE_SM4 (1 << 19)
+#define OSSL_HWCAP_CE_SHA512 (1 << 21)
+#define OSSL_HWCAP_SVE (1 << 22)
+/* AT_HWCAP2 */
+#define OSSL_HWCAP2 26
+#define OSSL_HWCAP2_SVE2 (1 << 1)
+#define OSSL_HWCAP2_RNG (1 << 16)
+#endif
 
 uint32_t _armv7_tick(void);
 
@@ -156,7 +155,7 @@ uint32_t OPENSSL_rdtsc(void)
         return 0;
 }
 
-# ifdef __aarch64__
+#ifdef __aarch64__
 size_t OPENSSL_rndr_asm(unsigned char *buf, size_t len);
 size_t OPENSSL_rndrrs_asm(unsigned char *buf, size_t len);
 
@@ -172,7 +171,7 @@ static size_t OPENSSL_rndr_wrapper(size_t (*func)(unsigned char *, size_t), unsi
         buffer_size = func(buf, len);
         if (buffer_size == len)
             break;
-        usleep(5000);  /* 5000 microseconds (5 milliseconds) */
+        usleep(5000); /* 5000 microseconds (5 milliseconds) */
     }
     return buffer_size;
 }
@@ -186,9 +185,9 @@ size_t OPENSSL_rndrrs_bytes(unsigned char *buf, size_t len)
 {
     return OPENSSL_rndr_wrapper(OPENSSL_rndrrs_asm, buf, len);
 }
-# endif
+#endif
 
-# if !defined(__APPLE__) && !defined(OSSL_IMPLEMENT_GETAUXVAL)
+#if !defined(__APPLE__) && !defined(OSSL_IMPLEMENT_GETAUXVAL)
 static sigset_t all_masked;
 
 static sigjmp_buf ill_jmp;
@@ -207,7 +206,7 @@ void _armv8_aes_probe(void);
 void _armv8_sha1_probe(void);
 void _armv8_sha256_probe(void);
 void _armv8_pmull_probe(void);
-#  ifdef __aarch64__
+#ifdef __aarch64__
 void _armv8_sm3_probe(void);
 void _armv8_sm4_probe(void);
 void _armv8_sha512_probe(void);
@@ -215,13 +214,13 @@ void _armv8_eor3_probe(void);
 void _armv8_sve_probe(void);
 void _armv8_sve2_probe(void);
 void _armv8_rng_probe(void);
-#  endif
-# endif /* !__APPLE__ && !OSSL_IMPLEMENT_GETAUXVAL */
+#endif
+#endif /* !__APPLE__ && !OSSL_IMPLEMENT_GETAUXVAL */
 
 /* We only call _armv8_cpuid_probe() if (OPENSSL_armcap_P & ARMV8_CPUID) != 0 */
 unsigned int _armv8_cpuid_probe(void);
 
-# if defined(__APPLE__)
+#if defined(__APPLE__)
 /*
  * Checks the specified integer sysctl, returning `value` if it's 1, otherwise returning 0.
  */
@@ -232,7 +231,7 @@ static unsigned int sysctl_query(const char *name, unsigned int value)
 
     return (sysctlbyname(name, &sys_value, &len, NULL, 0) == 0 && sys_value == 1) ? value : 0;
 }
-# elif !defined(OSSL_IMPLEMENT_GETAUXVAL)
+#elif !defined(OSSL_IMPLEMENT_GETAUXVAL)
 /*
  * Calls a provided probe function, which may SIGILL. If it doesn't, return `value`, otherwise return 0.
  */
@@ -246,15 +245,15 @@ static unsigned int arm_probe_for(void (*probe)(void), volatile unsigned int val
         return 0;
     }
 }
-# endif
+#endif
 
 void OPENSSL_cpuid_setup(void)
 {
     const char *e;
-# if !defined(__APPLE__) && !defined(OSSL_IMPLEMENT_GETAUXVAL)
+#if !defined(__APPLE__) && !defined(OSSL_IMPLEMENT_GETAUXVAL)
     struct sigaction ill_oact, ill_act;
     sigset_t oset;
-# endif
+#endif
     static int trigger = 0;
 
     if (trigger)
@@ -268,8 +267,8 @@ void OPENSSL_cpuid_setup(void)
         return;
     }
 
-# if defined(__APPLE__)
-#  if !defined(__aarch64__)
+#if defined(__APPLE__)
+#if !defined(__aarch64__)
     /*
      * Capability probing by catching SIGILL appears to be problematic
      * on iOS. But since Apple universe is "monocultural", it's actually
@@ -279,7 +278,7 @@ void OPENSSL_cpuid_setup(void)
         OPENSSL_armcap_P = ARMV7_NEON;
         return;
     }
-#  else
+#else
     {
         /*
          * From
@@ -297,19 +296,15 @@ void OPENSSL_cpuid_setup(void)
             char uarch[64];
 
             size_t len = sizeof(uarch);
-            if ((sysctlbyname("machdep.cpu.brand_string", uarch, &len, NULL, 0) == 0) &&
-               ((strncmp(uarch, "Apple M1", 8) == 0) ||
-                (strncmp(uarch, "Apple M2", 8) == 0) ||
-                (strncmp(uarch, "Apple M3", 8) == 0) ||
-                (strncmp(uarch, "Apple M4", 8) == 0))) {
+            if ((sysctlbyname("machdep.cpu.brand_string", uarch, &len, NULL, 0) == 0) && ((strncmp(uarch, "Apple M1", 8) == 0) || (strncmp(uarch, "Apple M2", 8) == 0) || (strncmp(uarch, "Apple M3", 8) == 0) || (strncmp(uarch, "Apple M4", 8) == 0))) {
                 OPENSSL_armcap_P |= ARMV8_UNROLL8_EOR3;
                 OPENSSL_armcap_P |= ARMV8_HAVE_SHA3_AND_WORTH_USING;
             }
         }
     }
-#  endif       /* __aarch64__ */
+#endif /* __aarch64__ */
 
-# elif defined(OSSL_IMPLEMENT_GETAUXVAL)
+#elif defined(OSSL_IMPLEMENT_GETAUXVAL)
 
     if (getauxval(OSSL_HWCAP) & OSSL_HWCAP_NEON) {
         unsigned long hwcap = getauxval(OSSL_HWCAP_CE);
@@ -328,7 +323,7 @@ void OPENSSL_cpuid_setup(void)
         if (hwcap & OSSL_HWCAP_CE_SHA256)
             OPENSSL_armcap_P |= ARMV8_SHA256;
 
-#  ifdef __aarch64__
+#ifdef __aarch64__
         if (hwcap & OSSL_HWCAP_CE_SM4)
             OPENSSL_armcap_P |= ARMV8_SM4;
 
@@ -342,20 +337,20 @@ void OPENSSL_cpuid_setup(void)
             OPENSSL_armcap_P |= ARMV8_SM3;
         if (hwcap & OSSL_HWCAP_SHA3)
             OPENSSL_armcap_P |= ARMV8_SHA3;
-#  endif
+#endif
     }
-#  ifdef __aarch64__
-        if (getauxval(OSSL_HWCAP) & OSSL_HWCAP_SVE)
-            OPENSSL_armcap_P |= ARMV8_SVE;
+#ifdef __aarch64__
+    if (getauxval(OSSL_HWCAP) & OSSL_HWCAP_SVE)
+        OPENSSL_armcap_P |= ARMV8_SVE;
 
-        if (getauxval(OSSL_HWCAP2) & OSSL_HWCAP2_SVE2)
-            OPENSSL_armcap_P |= ARMV8_SVE2;
+    if (getauxval(OSSL_HWCAP2) & OSSL_HWCAP2_SVE2)
+        OPENSSL_armcap_P |= ARMV8_SVE2;
 
-        if (getauxval(OSSL_HWCAP2) & OSSL_HWCAP2_RNG)
-            OPENSSL_armcap_P |= ARMV8_RNG;
-#  endif
+    if (getauxval(OSSL_HWCAP2) & OSSL_HWCAP2_RNG)
+        OPENSSL_armcap_P |= ARMV8_RNG;
+#endif
 
-# else /* !__APPLE__ && !OSSL_IMPLEMENT_GETAUXVAL */
+#else /* !__APPLE__ && !OSSL_IMPLEMENT_GETAUXVAL */
 
     /* If all else fails, do brute force SIGILL-based feature detection */
 
@@ -385,18 +380,18 @@ void OPENSSL_cpuid_setup(void)
         OPENSSL_armcap_P |= arm_probe_for(_armv8_sha1_probe, ARMV8_SHA1);
         OPENSSL_armcap_P |= arm_probe_for(_armv8_sha256_probe, ARMV8_SHA256);
 
-#  if defined(__aarch64__)
+#if defined(__aarch64__)
         OPENSSL_armcap_P |= arm_probe_for(_armv8_sm3_probe, ARMV8_SM3);
         OPENSSL_armcap_P |= arm_probe_for(_armv8_sm4_probe, ARMV8_SM4);
         OPENSSL_armcap_P |= arm_probe_for(_armv8_sha512_probe, ARMV8_SHA512);
         OPENSSL_armcap_P |= arm_probe_for(_armv8_eor3_probe, ARMV8_SHA3);
-#  endif
+#endif
     }
-#  ifdef __aarch64__
+#ifdef __aarch64__
     OPENSSL_armcap_P |= arm_probe_for(_armv8_sve_probe, ARMV8_SVE);
     OPENSSL_armcap_P |= arm_probe_for(_armv8_sve2_probe, ARMV8_SVE2);
     OPENSSL_armcap_P |= arm_probe_for(_armv8_rng_probe, ARMV8_RNG);
-#  endif
+#endif
 
     /*
      * Probing for ARMV7_TICK is known to produce unreliable results,
@@ -407,43 +402,21 @@ void OPENSSL_cpuid_setup(void)
     sigaction(SIGILL, &ill_oact, NULL);
     sigprocmask(SIG_SETMASK, &oset, NULL);
 
-# endif /* __APPLE__, OSSL_IMPLEMENT_GETAUXVAL */
+#endif /* __APPLE__, OSSL_IMPLEMENT_GETAUXVAL */
 
-# ifdef __aarch64__
+#ifdef __aarch64__
     if (OPENSSL_armcap_P & ARMV8_CPUID)
         OPENSSL_arm_midr = _armv8_cpuid_probe();
 
-    if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72) ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N1)) &&
-        (OPENSSL_armcap_P & ARMV7_NEON)) {
-            OPENSSL_armv8_rsa_neonized = 1;
+    if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N1)) && (OPENSSL_armcap_P & ARMV7_NEON)) {
+        OPENSSL_armv8_rsa_neonized = 1;
     }
-    if ((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_N2) ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_MICROSOFT, MICROSOFT_CPU_PART_COBALT_100) ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V2) ||
-         MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE) &&
-        (OPENSSL_armcap_P & ARMV8_SHA3))
+    if ((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_N2) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_MICROSOFT, MICROSOFT_CPU_PART_COBALT_100) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V2) || MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE) && (OPENSSL_armcap_P & ARMV8_SHA3))
         OPENSSL_armcap_P |= ARMV8_UNROLL8_EOR3;
-    if ((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_V2) ||
-         MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE) &&
-        (OPENSSL_armcap_P & ARMV8_SHA3))
+    if ((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_V2) || MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE) && (OPENSSL_armcap_P & ARMV8_SHA3))
         OPENSSL_armcap_P |= ARMV8_UNROLL12_EOR3;
-    if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM)     ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM)      ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_PRO) ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_PRO)  ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX) ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_MAX)  ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE)     ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD)      ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_PRO) ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_PRO)  ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_MAX) ||
-         MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_MAX)) &&
-        (OPENSSL_armcap_P & ARMV8_SHA3))
+    if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_PRO) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_PRO) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_MAX) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_PRO) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_PRO) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_MAX) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_MAX)) && (OPENSSL_armcap_P & ARMV8_SHA3))
         OPENSSL_armcap_P |= ARMV8_HAVE_SHA3_AND_WORTH_USING;
-# endif
+#endif
 }
 #endif /* _WIN32, __ARM_MAX_ARCH__ >= 7 */
diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c
index a87cb15b44d4b..223efc2bb147d 100644
--- a/crypto/asn1/a_bitstr.c
+++ b/crypto/asn1/a_bitstr.c
@@ -58,7 +58,7 @@ int ossl_i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
                 else if (j & 0x80)
                     bits = 7;
                 else
-                    bits = 0;       /* should not happen */
+                    bits = 0; /* should not happen */
             }
         }
     } else
@@ -82,7 +82,7 @@ int ossl_i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
 }
 
 ASN1_BIT_STRING *ossl_c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
-                                          const unsigned char **pp, long len)
+    const unsigned char **pp, long len)
 {
     ASN1_BIT_STRING *ret = NULL;
     const unsigned char *p;
@@ -117,7 +117,7 @@ ASN1_BIT_STRING *ossl_c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
      */
     ossl_asn1_string_set_bits_left(ret, i);
 
-    if (len-- > 1) {            /* using one because of the bits left byte */
+    if (len-- > 1) { /* using one because of the bits left byte */
         s = OPENSSL_malloc((int)len);
         if (s == NULL) {
             goto err;
@@ -134,7 +134,7 @@ ASN1_BIT_STRING *ossl_c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
         (*a) = ret;
     *pp = p;
     return ret;
- err:
+err:
     if (i != 0)
         ERR_raise(ERR_LIB_ASN1, i);
     if ((a == NULL) || (*a != ret))
@@ -166,7 +166,7 @@ int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value)
 
     if ((a->length < (w + 1)) || (a->data == NULL)) {
         if (!value)
-            return 1;         /* Don't need to set */
+            return 1; /* Don't need to set */
         c = OPENSSL_clear_realloc(a->data, a->length, w + 1);
         if (c == NULL)
             return 0;
@@ -202,7 +202,7 @@ int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n)
  * 'len' is the length of 'flags'.
  */
 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 i, ok;
     /* Check if there is one bit set at all. */
diff --git a/crypto/asn1/a_d2i_fp.c b/crypto/asn1/a_d2i_fp.c
index 4999ac1f65ba9..82d2f7cc902f7 100644
--- a/crypto/asn1/a_d2i_fp.c
+++ b/crypto/asn1/a_d2i_fp.c
@@ -17,9 +17,9 @@
 #include "crypto/asn1.h"
 
 #ifndef NO_OLD_ASN1
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 
-void *ASN1_d2i_fp(void *(*xnew) (void), d2i_of_void *d2i, FILE *in, void **x)
+void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)
 {
     BIO *b;
     void *ret;
@@ -33,9 +33,9 @@ void *ASN1_d2i_fp(void *(*xnew) (void), d2i_of_void *d2i, FILE *in, void **x)
     BIO_free(b);
     return ret;
 }
-# endif
+#endif
 
-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)
 {
     BUF_MEM *b = NULL;
     const unsigned char *p;
@@ -48,7 +48,7 @@ void *ASN1_d2i_bio(void *(*xnew) (void), d2i_of_void *d2i, BIO *in, void **x)
 
     p = (unsigned char *)b->data;
     ret = d2i(x, &p, len);
- err:
+err:
     BUF_MEM_free(b);
     return ret;
 }
@@ -56,7 +56,7 @@ void *ASN1_d2i_bio(void *(*xnew) (void), d2i_of_void *d2i, BIO *in, void **x)
 #endif
 
 void *ASN1_item_d2i_bio_ex(const ASN1_ITEM *it, BIO *in, void *x,
-                           OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     BUF_MEM *b = NULL;
     const unsigned char *p;
@@ -71,7 +71,7 @@ void *ASN1_item_d2i_bio_ex(const ASN1_ITEM *it, BIO *in, void *x,
 
     p = (const unsigned char *)b->data;
     ret = ASN1_item_d2i_ex(x, &p, len, it, libctx, propq);
- err:
+err:
     BUF_MEM_free(b);
     return ret;
 }
@@ -83,7 +83,7 @@ void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x)
 
 #ifndef OPENSSL_NO_STDIO
 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)
 {
     BIO *b;
     char *ret;
@@ -104,7 +104,7 @@ void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x)
 }
 #endif
 
-#define HEADER_SIZE   8
+#define HEADER_SIZE 8
 #define ASN1_CHUNK_INITIAL_SIZE (16 * 1024)
 int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
 {
@@ -150,7 +150,6 @@ int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                 len += i;
                 if ((size_t)i < want)
                     continue;
-
             }
         }
         /* else data already loaded */
@@ -168,9 +167,10 @@ int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
             if (e != ASN1_R_TOO_LONG)
                 goto err;
             ERR_pop_to_mark();
+            ERR_set_mark();
         }
-        i = q - p;            /* header length */
-        off += i;               /* end of data */
+        i = q - p; /* header length */
+        off += i; /* end of data */
 
         if (inf & 1) {
             /* no data body so go round again */
@@ -194,8 +194,7 @@ int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                 size_t chunk_max = ASN1_CHUNK_INITIAL_SIZE;
 
                 want -= (len - off);
-                if (want > INT_MAX /* BIO_read takes an int length */  ||
-                    len + want < len) {
+                if (want > INT_MAX /* BIO_read takes an int length */ || len + want < len) {
                     ERR_raise(ERR_LIB_ASN1, ASN1_R_TOO_LONG);
                     goto err;
                 }
@@ -219,14 +218,14 @@ int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                             ERR_raise(ERR_LIB_ASN1, ASN1_R_NOT_ENOUGH_DATA);
                             goto err;
                         }
-                    /*
-                     * This can't overflow because |len+want| didn't
-                     * overflow.
-                     */
+                        /*
+                         * This can't overflow because |len+want| didn't
+                         * overflow.
+                         */
                         len += i;
                         chunk -= i;
                     }
-                    if (chunk_max < INT_MAX/2)
+                    if (chunk_max < INT_MAX / 2)
                         chunk_max *= 2;
                 }
             }
@@ -248,8 +247,9 @@ int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
     }
 
     *pb = b;
+    ERR_clear_last_mark();
     return off;
- err:
+err:
     ERR_clear_last_mark();
     BUF_MEM_free(b);
     return -1;
diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c
index 67e8a96ba15ff..c172eef3ea8e2 100644
--- a/crypto/asn1/a_digest.c
+++ b/crypto/asn1/a_digest.c
@@ -26,7 +26,7 @@
 #ifndef OPENSSL_NO_DEPRECATED_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)
 {
     int inl;
     unsigned char *str, *p;
@@ -52,8 +52,8 @@ int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
 #endif
 
 int ossl_asn1_item_digest_ex(const ASN1_ITEM *it, const EVP_MD *md, void *asn,
-                             unsigned char *data, unsigned int *len,
-                             OSSL_LIB_CTX *libctx, const char *propq)
+    unsigned char *data, unsigned int *len,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     int i, ret = 0;
     unsigned char *str = NULL;
@@ -85,8 +85,7 @@ int ossl_asn1_item_digest_ex(const ASN1_ITEM *it, const EVP_MD *md, void *asn,
 }
 
 int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *md, void *asn,
-                     unsigned char *data, unsigned int *len)
+    unsigned char *data, unsigned int *len)
 {
     return ossl_asn1_item_digest_ex(it, md, asn, data, len, NULL, NULL);
 }
-
diff --git a/crypto/asn1/a_dup.c b/crypto/asn1/a_dup.c
index e673023faee8a..48f5b3f6a4c82 100644
--- a/crypto/asn1/a_dup.c
+++ b/crypto/asn1/a_dup.c
@@ -69,8 +69,8 @@ void *ASN1_item_dup(const ASN1_ITEM *it, const void *x)
 
     if (asn1_cb != NULL) {
         if (!asn1_cb(ASN1_OP_DUP_PRE, (ASN1_VALUE **)&x, it, NULL)
-                || !asn1_cb(ASN1_OP_GET0_LIBCTX, (ASN1_VALUE **)&x, it, &libctx)
-                || !asn1_cb(ASN1_OP_GET0_PROPQ, (ASN1_VALUE **)&x, it, &propq))
+            || !asn1_cb(ASN1_OP_GET0_LIBCTX, (ASN1_VALUE **)&x, it, &libctx)
+            || !asn1_cb(ASN1_OP_GET0_PROPQ, (ASN1_VALUE **)&x, it, &propq))
             goto auxerr;
     }
 
@@ -89,7 +89,7 @@ void *ASN1_item_dup(const ASN1_ITEM *it, const void *x)
 
     return ret;
 
- auxerr:
+auxerr:
     ERR_raise_data(ERR_LIB_ASN1, ASN1_R_AUX_ERROR, "Type=%s", it->sname);
     return NULL;
 }
diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c
index 0c06ac3c4163c..49e6f2470d8fa 100644
--- a/crypto/asn1/a_gentm.c
+++ b/crypto/asn1/a_gentm.c
@@ -22,7 +22,7 @@ IMPLEMENT_ASN1_DUP_FUNCTION(ASN1_GENERALIZEDTIME)
 
 /* This is the primary function used to parse ASN1_GENERALIZEDTIME */
 static int asn1_generalizedtime_to_tm(struct tm *tm,
-                                      const ASN1_GENERALIZEDTIME *d)
+    const ASN1_GENERALIZEDTIME *d)
 {
     /* wrapper around ossl_asn1_time_to_tm */
     if (d->type != V_ASN1_GENERALIZEDTIME)
@@ -54,14 +54,14 @@ int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str)
 }
 
 ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
-                                               time_t t)
+    time_t t)
 {
     return ASN1_GENERALIZEDTIME_adj(s, t, 0, 0);
 }
 
 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)
 {
     struct tm *ts;
     struct tm data;
diff --git a/crypto/asn1/a_i2d_fp.c b/crypto/asn1/a_i2d_fp.c
index 23e0b0f70003a..e177e20465a4a 100644
--- a/crypto/asn1/a_i2d_fp.c
+++ b/crypto/asn1/a_i2d_fp.c
@@ -14,7 +14,7 @@
 
 #ifndef NO_OLD_ASN1
 
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, const void *x)
 {
     BIO *b;
@@ -29,7 +29,7 @@ int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, const void *x)
     BIO_free(b);
     return ret;
 }
-# endif
+#endif
 
 int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, const void *x)
 {
diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index 854844e7eaf1f..3205802c09db1 100644
--- a/crypto/asn1/a_int.c
+++ b/crypto/asn1/a_int.c
@@ -74,7 +74,7 @@ int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y)
  * used elsewhere below...
  */
 static void twos_complement(unsigned char *dst, const unsigned char *src,
-                            size_t len, unsigned char pad)
+    size_t len, unsigned char pad)
 {
     unsigned int carry = pad & 1;
 
@@ -95,7 +95,7 @@ static void twos_complement(unsigned char *dst, const unsigned char *src,
 }
 
 static size_t i2c_ibuf(const unsigned char *b, size_t blen, int neg,
-                       unsigned char **pp)
+    unsigned char **pp)
 {
     unsigned int pad = 0;
     size_t ret, i;
@@ -125,7 +125,7 @@ static size_t i2c_ibuf(const unsigned char *b, size_t blen, int neg,
         ret += pad;
     } else {
         ret = 1;
-        blen = 0;   /* reduce '(b == NULL || blen == 0)' to '(blen == 0)' */
+        blen = 0; /* reduce '(b == NULL || blen == 0)' to '(blen == 0)' */
     }
 
     if (pp == NULL || (p = *pp) == NULL)
@@ -137,8 +137,8 @@ static size_t i2c_ibuf(const unsigned char *b, size_t blen, int neg,
      * by any number of zeros...
      */
     *p = pb;
-    p += pad;       /* yes, p[0] can be written twice, but it's little
-                     * price to pay for eliminated branches */
+    p += pad; /* yes, p[0] can be written twice, but it's little
+               * price to pay for eliminated branches */
     twos_complement(p, b, blen, pb);
 
     *pp += ret;
@@ -152,7 +152,7 @@ static size_t i2c_ibuf(const unsigned char *b, size_t blen, int neg,
  */
 
 static size_t c2i_ibuf(unsigned char *b, int *pneg,
-                       const unsigned char *p, size_t plen)
+    const unsigned char *p, size_t plen)
 {
     int neg, pad;
     /* Zero content length is illegal */
@@ -253,7 +253,7 @@ static size_t asn1_put_uint64(unsigned char b[sizeof(uint64_t)], uint64_t r)
 
 /* signed version of asn1_get_uint64 */
 static int asn1_get_int64(int64_t *pr, const unsigned char *b, size_t blen,
-                          int neg)
+    int neg)
 {
     uint64_t r;
     if (asn1_get_uint64(&r, b, blen) == 0)
@@ -288,7 +288,7 @@ static int asn1_get_int64(int64_t *pr, const unsigned char *b, size_t blen,
 
 /* Convert ASN1 INTEGER content octets to ASN1_INTEGER structure */
 ASN1_INTEGER *ossl_c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
-                                    long len)
+    long len)
 {
     ASN1_INTEGER *ret = NULL;
     size_t r;
@@ -323,7 +323,7 @@ ASN1_INTEGER *ossl_c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
     if (a != NULL)
         (*a) = ret;
     return ret;
- err:
+err:
     if (a == NULL || *a != ret)
         ASN1_INTEGER_free(ret);
     return NULL;
@@ -366,7 +366,7 @@ static int asn1_string_set_int64(ASN1_STRING *a, int64_t r, int itype)
 }
 
 static int asn1_string_get_uint64(uint64_t *pr, const ASN1_STRING *a,
-                                  int itype)
+    int itype)
 {
     if (a == NULL) {
         ERR_raise(ERR_LIB_ASN1, ERR_R_PASSED_NULL_PARAMETER);
@@ -400,7 +400,7 @@ static int asn1_string_set_uint64(ASN1_STRING *a, uint64_t r, int itype)
  */
 
 ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
-                                long length)
+    long length)
 {
     ASN1_INTEGER *ret = NULL;
     const unsigned char *p;
@@ -454,7 +454,7 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
         (*a) = ret;
     *pp = p;
     return ret;
- err:
+err:
     if (i != 0)
         ERR_raise(ERR_LIB_ASN1, i);
     if ((a == NULL) || (*a != ret))
@@ -463,7 +463,7 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
 }
 
 static ASN1_STRING *bn_to_asn1_string(const BIGNUM *bn, ASN1_STRING *ai,
-                                      int atype)
+    int atype)
 {
     ASN1_INTEGER *ret;
     int len;
@@ -500,14 +500,14 @@ static ASN1_STRING *bn_to_asn1_string(const BIGNUM *bn, ASN1_STRING *ai,
         len = BN_bn2bin(bn, ret->data);
     ret->length = len;
     return ret;
- err:
+err:
     if (ret != ai)
         ASN1_INTEGER_free(ret);
     return NULL;
 }
 
 static BIGNUM *asn1_string_to_bn(const ASN1_INTEGER *ai, BIGNUM *bn,
-                                 int itype)
+    int itype)
 {
     BIGNUM *ret;
 
@@ -620,7 +620,7 @@ BIGNUM *ASN1_ENUMERATED_to_BN(const ASN1_ENUMERATED *ai, BIGNUM *bn)
 
 /* Internal functions used by x_int64.c */
 int ossl_c2i_uint64_int(uint64_t *ret, int *neg,
-                        const unsigned char **pp, long len)
+    const unsigned char **pp, long len)
 {
     unsigned char buf[sizeof(uint64_t)];
     size_t buflen;
@@ -644,4 +644,3 @@ int ossl_i2c_uint64_int(unsigned char *p, uint64_t r, int neg)
     off = asn1_put_uint64(buf, r);
     return i2c_ibuf(buf + off, sizeof(buf) - off, neg, &p);
 }
-
diff --git a/crypto/asn1/a_mbstr.c b/crypto/asn1/a_mbstr.c
index c8170e16267d4..2270e63d51d4e 100644
--- a/crypto/asn1/a_mbstr.c
+++ b/crypto/asn1/a_mbstr.c
@@ -14,8 +14,8 @@
 #include <openssl/asn1.h>
 
 static int traverse_string(const unsigned char *p, int len, int inform,
-                           int (*rfunc) (unsigned long value, void *in),
-                           void *arg);
+    int (*rfunc)(unsigned long value, void *in),
+    void *arg);
 static int in_utf8(unsigned long value, void *arg);
 static int out_utf8(unsigned long value, void *arg);
 static int type_str(unsigned long value, void *arg);
@@ -34,14 +34,14 @@ static int cpy_utf8(unsigned long value, void *arg);
  */
 
 int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len,
-                       int inform, unsigned long mask)
+    int inform, unsigned long mask)
 {
     return ASN1_mbstring_ncopy(out, in, len, inform, mask, 0, 0);
 }
 
 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)
 {
     int str_type;
     int ret;
@@ -50,7 +50,7 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
     ASN1_STRING *dest;
     unsigned char *p;
     int nchar;
-    int (*cpyfunc) (unsigned long, void *) = NULL;
+    int (*cpyfunc)(unsigned long, void *) = NULL;
     if (len == -1)
         len = strlen((const char *)in);
     if (!mask)
@@ -98,13 +98,13 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
 
     if ((minsize > 0) && (nchar < minsize)) {
         ERR_raise_data(ERR_LIB_ASN1, ASN1_R_STRING_TOO_SHORT,
-                       "minsize=%ld", minsize);
+            "minsize=%ld", minsize);
         return -1;
     }
 
     if ((maxsize > 0) && (nchar > maxsize)) {
         ERR_raise_data(ERR_LIB_ASN1, ASN1_R_STRING_TOO_LONG,
-                       "maxsize=%ld", maxsize);
+            "maxsize=%ld", maxsize);
         return -1;
     }
 
@@ -114,7 +114,10 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
         return -1;
     }
 
-    /* Now work out output format and string type */
+    /*
+     * Now work out output format and string type.
+     * These checks should be in sync with the checks in type_str.
+     */
     outform = MBSTRING_ASC;
     if (mask & B_ASN1_NUMERICSTRING)
         str_type = V_ASN1_NUMERICSTRING;
@@ -182,7 +185,11 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
 
     case MBSTRING_UTF8:
         outlen = 0;
-        traverse_string(in, len, inform, out_utf8, &outlen);
+        ret = traverse_string(in, len, inform, out_utf8, &outlen);
+        if (ret < 0) {
+            ERR_raise(ERR_LIB_ASN1, ASN1_R_INVALID_UTF8STRING);
+            return -1;
+        }
         cpyfunc = cpy_utf8;
         break;
     }
@@ -206,8 +213,8 @@ int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
  */
 
 static int traverse_string(const unsigned char *p, int len, int inform,
-                           int (*rfunc) (unsigned long value, void *in),
-                           void *arg)
+    int (*rfunc)(unsigned long value, void *in),
+    void *arg)
 {
     unsigned long value;
     int ret;
@@ -277,11 +284,30 @@ static int out_utf8(unsigned long value, void *arg)
 
 static int type_str(unsigned long value, void *arg)
 {
-    unsigned long types = *((unsigned long *)arg);
+    unsigned long usable_types = *((unsigned long *)arg);
+    unsigned long types = usable_types;
     const int native = value > INT_MAX ? INT_MAX : ossl_fromascii(value);
 
-    if ((types & B_ASN1_NUMERICSTRING) && !(ossl_isdigit(native)
-                                            || native == ' '))
+    /*
+     * Clear out all the types which are not checked later. If any of those
+     * is present in the mask, then the UTF8 type will be added and checked
+     * below.
+     */
+    types &= B_ASN1_NUMERICSTRING | B_ASN1_PRINTABLESTRING
+        | B_ASN1_IA5STRING | B_ASN1_T61STRING | B_ASN1_BMPSTRING
+        | B_ASN1_UNIVERSALSTRING | B_ASN1_UTF8STRING;
+
+    /*
+     * If any other types were in the input mask, they're effectively treated
+     * as UTF8
+     */
+    if (types != usable_types)
+        types |= B_ASN1_UTF8STRING;
+
+    /*
+     * These checks should be in sync with ASN1_mbstring_ncopy.
+     */
+    if ((types & B_ASN1_NUMERICSTRING) && !(ossl_isdigit(native) || native == ' '))
         types &= ~B_ASN1_NUMERICSTRING;
     if ((types & B_ASN1_PRINTABLESTRING) && !ossl_isasn1print(native))
         types &= ~B_ASN1_PRINTABLESTRING;
@@ -348,6 +374,8 @@ static int cpy_utf8(unsigned long value, void *arg)
     p = arg;
     /* We already know there is enough room so pass 0xff as the length */
     ret = UTF8_putc(*p, 0xff, value);
+    if (ret < 0)
+        return ret;
     *p += ret;
     return 1;
 }
diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
index 6eb9feb16c4ba..1c7aa31e83fa6 100644
--- a/crypto/asn1/a_object.c
+++ b/crypto/asn1/a_object.c
@@ -121,7 +121,7 @@ int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
                 if (!BN_add_word(bl, first * 40))
                     goto err;
             } else
-                l += (long)first *40;
+                l += (long)first * 40;
         }
         i = 0;
         if (use_bn) {
@@ -150,7 +150,6 @@ int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
                 if (l == 0L)
                     break;
             }
-
         }
         if (out != NULL) {
             if (len + i > olen) {
@@ -167,7 +166,7 @@ int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
         OPENSSL_free(tmp);
     BN_free(bl);
     return len;
- err:
+err:
     if (tmp != ftmp)
         OPENSSL_free(tmp);
     BN_free(bl);
@@ -188,7 +187,7 @@ int i2a_ASN1_OBJECT(BIO *bp, const ASN1_OBJECT *a)
         return BIO_write(bp, "NULL", 4);
     i = i2t_ASN1_OBJECT(buf, sizeof(buf), a);
     if (i > (int)(sizeof(buf) - 1)) {
-        if (i > INT_MAX - 1) {  /* catch an integer overflow */
+        if (i > INT_MAX - 1) { /* catch an integer overflow */
             ERR_raise(ERR_LIB_ASN1, ASN1_R_LENGTH_TOO_LONG);
             return -1;
         }
@@ -209,7 +208,7 @@ int i2a_ASN1_OBJECT(BIO *bp, const ASN1_OBJECT *a)
 }
 
 ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
-                             long length)
+    long length)
 {
     const unsigned char *p;
     long len;
@@ -231,13 +230,13 @@ ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
     if (ret)
         *pp = p;
     return ret;
- err:
+err:
     ERR_raise(ERR_LIB_ASN1, i);
     return NULL;
 }
 
 ASN1_OBJECT *ossl_c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
-                                  long len)
+    long len)
 {
     ASN1_OBJECT *ret = NULL, tobj;
     const unsigned char *p;
@@ -249,8 +248,7 @@ ASN1_OBJECT *ossl_c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
      * be clear in the last octet. can't have leading 0x80 in subidentifiers,
      * see: X.690 8.19.2
      */
-    if (len <= 0 || len > INT_MAX || pp == NULL || (p = *pp) == NULL ||
-        p[len - 1] & 0x80) {
+    if (len <= 0 || len > INT_MAX || pp == NULL || (p = *pp) == NULL || p[len - 1] & 0x80) {
         ERR_raise(ERR_LIB_ASN1, ASN1_R_INVALID_OBJECT_ENCODING);
         return NULL;
     }
@@ -286,8 +284,7 @@ ASN1_OBJECT *ossl_c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
         }
     }
 
-    if ((a == NULL) || ((*a) == NULL) ||
-        !((*a)->flags & ASN1_OBJECT_FLAG_DYNAMIC)) {
+    if ((a == NULL) || ((*a) == NULL) || !((*a)->flags & ASN1_OBJECT_FLAG_DYNAMIC)) {
         if ((ret = ASN1_OBJECT_new()) == NULL)
             return NULL;
     } else {
@@ -326,7 +323,7 @@ ASN1_OBJECT *ossl_c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
         (*a) = ret;
     *pp = p;
     return ret;
- err:
+err:
     ERR_raise(ERR_LIB_ASN1, i);
     if ((a == NULL) || (*a != ret))
         ASN1_OBJECT_free(ret);
@@ -354,13 +351,13 @@ void ASN1_OBJECT_free(ASN1_OBJECT *a)
          * Disable purely for compile-time strict const checking.  Doing this
          * on a "real" compile will cause memory leaks
          */
-        OPENSSL_free((void*)a->sn);
-        OPENSSL_free((void*)a->ln);
+        OPENSSL_free((void *)a->sn);
+        OPENSSL_free((void *)a->ln);
 #endif
         a->sn = a->ln = NULL;
     }
     if (a->flags & ASN1_OBJECT_FLAG_DYNAMIC_DATA) {
-        OPENSSL_free((void*)a->data);
+        OPENSSL_free((void *)a->data);
         a->data = NULL;
         a->length = 0;
     }
@@ -369,7 +366,7 @@ void ASN1_OBJECT_free(ASN1_OBJECT *a)
 }
 
 ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len,
-                                const char *sn, const char *ln)
+    const char *sn, const char *ln)
 {
     ASN1_OBJECT o;
 
@@ -378,7 +375,6 @@ ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len,
     o.data = data;
     o.nid = nid;
     o.length = len;
-    o.flags = ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
-        ASN1_OBJECT_FLAG_DYNAMIC_DATA;
+    o.flags = ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | ASN1_OBJECT_FLAG_DYNAMIC_DATA;
     return OBJ_dup(&o);
 }
diff --git a/crypto/asn1/a_octet.c b/crypto/asn1/a_octet.c
index fcb2ef0a7d083..4efb8ec5178c0 100644
--- a/crypto/asn1/a_octet.c
+++ b/crypto/asn1/a_octet.c
@@ -17,13 +17,13 @@ ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *x)
 }
 
 int ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a,
-                          const ASN1_OCTET_STRING *b)
+    const ASN1_OCTET_STRING *b)
 {
     return ASN1_STRING_cmp(a, b);
 }
 
 int ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *x, const unsigned char *d,
-                          int len)
+    int len)
 {
     return ASN1_STRING_set(x, d, len);
 }
diff --git a/crypto/asn1/a_print.c b/crypto/asn1/a_print.c
index d2768f74bdcd2..c570e52fbde37 100644
--- a/crypto/asn1/a_print.c
+++ b/crypto/asn1/a_print.c
@@ -77,8 +77,7 @@ int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v)
     n = 0;
     p = (const char *)v->data;
     for (i = 0; i < v->length; i++) {
-        if ((p[i] > '~') || ((p[i] < ' ') &&
-                             (p[i] != '\n') && (p[i] != '\r')))
+        if ((p[i] > '~') || ((p[i] < ' ') && (p[i] != '\n') && (p[i] != '\r')))
             buf[n] = '.';
         else
             buf[n] = p[i];
diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c
index 8507fc3668110..a85f70d3b711a 100644
--- a/crypto/asn1/a_sign.c
+++ b/crypto/asn1/a_sign.c
@@ -25,8 +25,8 @@
 #ifndef OPENSSL_NO_DEPRECATED_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)
 {
     EVP_MD_CTX *ctx = EVP_MD_CTX_new();
     unsigned char *p, *buf_in = NULL, *buf_out = NULL;
@@ -52,8 +52,7 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
              */
             ASN1_TYPE_free(a->parameter);
             a->parameter = NULL;
-        } else if ((a->parameter == NULL) ||
-                   (a->parameter->type != V_ASN1_NULL)) {
+        } else if ((a->parameter == NULL) || (a->parameter->type != V_ASN1_NULL)) {
             ASN1_TYPE_free(a->parameter);
             if ((a->parameter = ASN1_TYPE_new()) == NULL)
                 goto err;
@@ -67,7 +66,7 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
         }
         if (a->algorithm->length == 0) {
             ERR_raise(ERR_LIB_ASN1,
-                      ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD);
+                ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD);
             goto err;
         }
     }
@@ -90,7 +89,7 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
     if (!EVP_SignInit_ex(ctx, type, NULL)
         || !EVP_SignUpdate(ctx, (unsigned char *)buf_in, inl)
         || !EVP_SignFinal(ctx, (unsigned char *)buf_out,
-                          (unsigned int *)&outl, pkey)) {
+            (unsigned int *)&outl, pkey)) {
         outl = 0;
         ERR_raise(ERR_LIB_ASN1, ERR_R_EVP_LIB);
         goto err;
@@ -102,7 +101,7 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
      * has a 'not-used bits' value of 0
      */
     ossl_asn1_string_set_bits_left(signature, 0);
- err:
+err:
     EVP_MD_CTX_free(ctx);
     OPENSSL_clear_free((char *)buf_in, inll);
     OPENSSL_clear_free((char *)buf_out, outll);
@@ -112,18 +111,18 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
 #endif
 
 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)
 {
     return ASN1_item_sign_ex(it, algor1, algor2, signature, data, NULL, pkey,
-                             md, NULL, NULL);
+        md, NULL, NULL);
 }
 
 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 rv = 0;
     EVP_MD_CTX *ctx = evp_md_ctx_new_ex(pkey, id, libctx, propq);
@@ -138,15 +137,15 @@ int ASN1_item_sign_ex(const ASN1_ITEM *it, X509_ALGOR *algor1,
 
     rv = ASN1_item_sign_ctx(it, algor1, algor2, signature, data, ctx);
 
- err:
+err:
     EVP_PKEY_CTX_free(EVP_MD_CTX_get_pkey_ctx(ctx));
     EVP_MD_CTX_free(ctx);
     return rv;
 }
 
 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)
 {
     const EVP_MD *md;
     EVP_PKEY *pkey;
@@ -175,9 +174,8 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
             goto err;
         }
 
-        params[0] =
-            OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_ALGORITHM_ID,
-                                              aid, sizeof(aid));
+        params[0] = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_ALGORITHM_ID,
+            aid, sizeof(aid));
         params[1] = OSSL_PARAM_construct_end();
 
         if (EVP_PKEY_CTX_get_params(pctx, params) <= 0)
@@ -236,15 +234,14 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
 #ifndef OPENSSL_NO_SM2
             EVP_PKEY_get_id(pkey) == NID_sm2 ? NID_sm2 :
 #endif
-            pkey->ameth->pkey_id;
+                                             pkey->ameth->pkey_id;
 
         if (!OBJ_find_sigid_by_algs(&signid, EVP_MD_nid(md), pkey_id)) {
             ERR_raise(ERR_LIB_ASN1, ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED);
             goto err;
         }
 
-        paramtype = pkey->ameth->pkey_flags & ASN1_PKEY_SIGPARAM_NULL ?
-            V_ASN1_NULL : V_ASN1_UNDEF;
+        paramtype = pkey->ameth->pkey_flags & ASN1_PKEY_SIGPARAM_NULL ? V_ASN1_NULL : V_ASN1_UNDEF;
         if (algor1 != NULL
             && !X509_ALGOR_set0(algor1, OBJ_nid2obj(signid), paramtype, NULL))
             goto err;
@@ -284,7 +281,7 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
      * has a 'not-used bits' value of 0
      */
     ossl_asn1_string_set_bits_left(signature, 0);
- err:
+err:
     OPENSSL_clear_free((char *)buf_in, inl);
     OPENSSL_clear_free((char *)buf_out, outll);
     return outl;
diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c
index 4b031a73add55..a908ac898c842 100644
--- a/crypto/asn1/a_strex.c
+++ b/crypto/asn1/a_strex.c
@@ -24,13 +24,9 @@
  * other options.
  */
 
-#define CHARTYPE_BS_ESC         (ASN1_STRFLGS_ESC_2253 | CHARTYPE_FIRST_ESC_2253 | CHARTYPE_LAST_ESC_2253)
+#define CHARTYPE_BS_ESC (ASN1_STRFLGS_ESC_2253 | CHARTYPE_FIRST_ESC_2253 | CHARTYPE_LAST_ESC_2253)
 
-#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | \
-                  ASN1_STRFLGS_ESC_2254 | \
-                  ASN1_STRFLGS_ESC_QUOTE | \
-                  ASN1_STRFLGS_ESC_CTRL | \
-                  ASN1_STRFLGS_ESC_MSB)
+#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | ASN1_STRFLGS_ESC_2254 | ASN1_STRFLGS_ESC_QUOTE | ASN1_STRFLGS_ESC_CTRL | ASN1_STRFLGS_ESC_MSB)
 
 /*
  * Three IO functions for sending data to memory, a BIO and a FILE
@@ -56,7 +52,7 @@ static int send_fp_chars(void *arg, const void *buf, int len)
 }
 #endif
 
-typedef int char_io (void *arg, const void *buf, int len);
+typedef int char_io(void *arg, const void *buf, int len);
 
 /*
  * This function handles display of strings, one character at a time. It is
@@ -65,7 +61,7 @@ typedef int char_io (void *arg, const void *buf, int len);
  */
 
 static int do_esc_char(unsigned long c, unsigned short flags, char *do_quotes,
-                       char_io *io_ch, void *arg)
+    char_io *io_ch, void *arg)
 {
     unsigned short chflgs;
     unsigned char chtmp;
@@ -105,9 +101,7 @@ static int do_esc_char(unsigned long c, unsigned short flags, char *do_quotes,
             return -1;
         return 2;
     }
-    if (chflgs & (ASN1_STRFLGS_ESC_CTRL
-                  | ASN1_STRFLGS_ESC_MSB
-                  | ASN1_STRFLGS_ESC_2254)) {
+    if (chflgs & (ASN1_STRFLGS_ESC_CTRL | ASN1_STRFLGS_ESC_MSB | ASN1_STRFLGS_ESC_2254)) {
         BIO_snprintf(tmphex, 11, "\\%02X", chtmp);
         if (!io_ch(arg, tmphex, 3))
             return -1;
@@ -127,8 +121,8 @@ static int do_esc_char(unsigned long c, unsigned short flags, char *do_quotes,
     return 1;
 }
 
-#define BUF_TYPE_WIDTH_MASK     0x7
-#define BUF_TYPE_CONVUTF8       0x8
+#define BUF_TYPE_WIDTH_MASK 0x7
+#define BUF_TYPE_CONVUTF8 0x8
 
 /*
  * This function sends each character in a buffer to do_esc_char(). It
@@ -137,8 +131,8 @@ static int do_esc_char(unsigned long c, unsigned short flags, char *do_quotes,
  */
 
 static int do_buf(unsigned char *buf, int buflen,
-                  int type, unsigned short flags, char *quotes, char_io *io_ch,
-                  void *arg)
+    int type, unsigned short flags, char *quotes, char_io *io_ch,
+    void *arg)
 {
     int i, outlen, len, charwidth;
     unsigned short orflags;
@@ -193,19 +187,21 @@ static int do_buf(unsigned char *buf, int buflen,
         case 0:
             i = UTF8_getc(p, buflen, &c);
             if (i < 0)
-                return -1;      /* Invalid UTF8String */
+                return -1; /* Invalid UTF8String */
             buflen -= i;
             p += i;
             break;
         default:
-            return -1;          /* invalid width */
+            return -1; /* invalid width */
         }
         if (p == q && flags & ASN1_STRFLGS_ESC_2253)
             orflags = CHARTYPE_LAST_ESC_2253;
         if (type & BUF_TYPE_CONVUTF8) {
             unsigned char utfbuf[6];
-            int utflen;
-            utflen = UTF8_putc(utfbuf, sizeof(utfbuf), c);
+            int utflen = UTF8_putc(utfbuf, sizeof(utfbuf), c);
+
+            if (utflen < 0)
+                return -1; /* error happened with UTF8 */
             for (i = 0; i < utflen; i++) {
                 /*
                  * We don't need to worry about setting orflags correctly
@@ -214,14 +210,14 @@ static int do_buf(unsigned char *buf, int buflen,
                  * character will never be escaped on first and last.
                  */
                 len = do_esc_char(utfbuf[i], flags | orflags, quotes,
-                                  io_ch, arg);
+                    io_ch, arg);
                 if (len < 0)
                     return -1;
                 outlen += len;
             }
         } else {
             len = do_esc_char(c, flags | orflags, quotes,
-                              io_ch, arg);
+                io_ch, arg);
             if (len < 0)
                 return -1;
             outlen += len;
@@ -233,7 +229,7 @@ static int do_buf(unsigned char *buf, int buflen,
 /* This function hex dumps a buffer of characters */
 
 static int do_hex_dump(char_io *io_ch, void *arg, unsigned char *buf,
-                       int buflen)
+    int buflen)
 {
     unsigned char *p, *q;
     char hextmp[2];
@@ -258,7 +254,7 @@ static int do_hex_dump(char_io *io_ch, void *arg, unsigned char *buf,
  */
 
 static int do_dump(unsigned long lflags, char_io *io_ch, void *arg,
-                   const ASN1_STRING *str)
+    const ASN1_STRING *str)
 {
     /*
      * Placing the ASN1_STRING in a temp ASN1_TYPE allows the DER encoding to
@@ -300,24 +296,24 @@ static int do_dump(unsigned long lflags, char_io *io_ch, void *arg,
  */
 
 static const signed char tag2nbyte[] = {
-    -1, -1, -1, -1, -1,         /* 0-4 */
-    -1, -1, -1, -1, -1,         /* 5-9 */
-    -1, -1,                     /* 10-11 */
-     0,                         /* 12 V_ASN1_UTF8STRING */
-    -1, -1, -1, -1, -1,         /* 13-17 */
-     1,                         /* 18 V_ASN1_NUMERICSTRING */
-     1,                         /* 19 V_ASN1_PRINTABLESTRING */
-     1,                         /* 20 V_ASN1_T61STRING */
-    -1,                         /* 21 */
-     1,                         /* 22 V_ASN1_IA5STRING */
-     1,                         /* 23 V_ASN1_UTCTIME */
-     1,                         /* 24 V_ASN1_GENERALIZEDTIME */
-    -1,                         /* 25 */
-     1,                         /* 26 V_ASN1_ISO64STRING */
-    -1,                         /* 27 */
-     4,                         /* 28 V_ASN1_UNIVERSALSTRING */
-    -1,                         /* 29 */
-     2                          /* 30 V_ASN1_BMPSTRING */
+    -1, -1, -1, -1, -1, /* 0-4 */
+    -1, -1, -1, -1, -1, /* 5-9 */
+    -1, -1, /* 10-11 */
+    0, /* 12 V_ASN1_UTF8STRING */
+    -1, -1, -1, -1, -1, /* 13-17 */
+    1, /* 18 V_ASN1_NUMERICSTRING */
+    1, /* 19 V_ASN1_PRINTABLESTRING */
+    1, /* 20 V_ASN1_T61STRING */
+    -1, /* 21 */
+    1, /* 22 V_ASN1_IA5STRING */
+    1, /* 23 V_ASN1_UTCTIME */
+    1, /* 24 V_ASN1_GENERALIZEDTIME */
+    -1, /* 25 */
+    1, /* 26 V_ASN1_ISO64STRING */
+    -1, /* 27 */
+    4, /* 28 V_ASN1_UNIVERSALSTRING */
+    -1, /* 29 */
+    2 /* 30 V_ASN1_BMPSTRING */
 };
 
 /*
@@ -327,7 +323,7 @@ static const signed char tag2nbyte[] = {
  */
 
 static int do_print_ex(char_io *io_ch, void *arg, unsigned long lflags,
-                       const ASN1_STRING *str)
+    const ASN1_STRING *str)
 {
     int outlen, len;
     int type;
@@ -418,11 +414,11 @@ static int do_indent(char_io *io_ch, void *arg, int indent)
     return 1;
 }
 
-#define FN_WIDTH_LN     25
-#define FN_WIDTH_SN     10
+#define FN_WIDTH_LN 25
+#define FN_WIDTH_SN 10
 
 static int do_name_ex(char_io *io_ch, void *arg, const X509_NAME *n,
-                      int indent, unsigned long flags)
+    int indent, unsigned long flags)
 {
     int i, prev = -1, orflags, cnt;
     int fn_opt, fn_nid;
@@ -513,7 +509,7 @@ static int do_name_ex(char_io *io_ch, void *arg, const X509_NAME *n,
             int objlen, fld_len;
             if ((fn_opt == XN_FLAG_FN_OID) || (fn_nid == NID_undef)) {
                 OBJ_obj2txt(objtmp, sizeof(objtmp), fn, 1);
-                fld_len = 0;    /* XXX: what should this be? */
+                fld_len = 0; /* XXX: what should this be? */
                 objbuf = objtmp;
             } else {
                 if (fn_opt == XN_FLAG_FN_SN) {
@@ -560,7 +556,7 @@ static int do_name_ex(char_io *io_ch, void *arg, const X509_NAME *n,
 /* Wrappers round the main functions */
 
 int X509_NAME_print_ex(BIO *out, const X509_NAME *nm, int indent,
-                       unsigned long flags)
+    unsigned long flags)
 {
     if (flags == XN_FLAG_COMPAT)
         return X509_NAME_print(out, nm, indent);
@@ -569,7 +565,7 @@ int X509_NAME_print_ex(BIO *out, const X509_NAME *nm, int indent,
 
 #ifndef OPENSSL_NO_STDIO
 int X509_NAME_print_ex_fp(FILE *fp, const X509_NAME *nm, int indent,
-                          unsigned long flags)
+    unsigned long flags)
 {
     if (flags == XN_FLAG_COMPAT) {
         BIO *btmp;
@@ -618,9 +614,8 @@ int ASN1_STRING_to_UTF8(unsigned char **out, const ASN1_STRING *in)
     stmp.data = NULL;
     stmp.length = 0;
     stmp.flags = 0;
-    ret =
-        ASN1_mbstring_copy(&str, in->data, in->length, mbflag,
-                           B_ASN1_UTF8STRING);
+    ret = ASN1_mbstring_copy(&str, in->data, in->length, mbflag,
+        B_ASN1_UTF8STRING);
     if (ret < 0)
         return ret;
     *out = stmp.data;
diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c
index 8f85971130e71..e6b8d4c79ef33 100644
--- a/crypto/asn1/a_strnid.c
+++ b/crypto/asn1/a_strnid.c
@@ -15,7 +15,7 @@
 static STACK_OF(ASN1_STRING_TABLE) *stable = NULL;
 static void st_free(ASN1_STRING_TABLE *tbl);
 static int sk_table_cmp(const ASN1_STRING_TABLE *const *a,
-                        const ASN1_STRING_TABLE *const *b);
+    const ASN1_STRING_TABLE *const *b);
 
 /*
  * This is the global mask for the mbstring functions: this is use to mask
@@ -77,8 +77,8 @@ int ASN1_STRING_set_default_mask_asc(const char *p)
  */
 
 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 *tbl;
     ASN1_STRING *str = NULL;
@@ -93,10 +93,10 @@ ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out,
         if (!(tbl->flags & STABLE_NO_MASK))
             mask &= global_mask;
         ret = ASN1_mbstring_ncopy(out, in, inlen, inform, mask,
-                                  tbl->minsize, tbl->maxsize);
+            tbl->minsize, tbl->maxsize);
     } else {
         ret = ASN1_mbstring_copy(out, in, inlen, inform,
-                                 DIRSTRING_TYPE & global_mask);
+            DIRSTRING_TYPE & global_mask);
     }
     if (ret <= 0)
         return NULL;
@@ -110,7 +110,7 @@ ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out,
 #include "tbl_standard.h"
 
 static int sk_table_cmp(const ASN1_STRING_TABLE *const *a,
-                        const ASN1_STRING_TABLE *const *b)
+    const ASN1_STRING_TABLE *const *b)
 {
     return (*a)->nid - (*b)->nid;
 }
@@ -185,8 +185,8 @@ static ASN1_STRING_TABLE *stable_get(int nid)
 }
 
 int ASN1_STRING_TABLE_add(int nid,
-                          long minsize, long maxsize, unsigned long mask,
-                          unsigned long flags)
+    long minsize, long maxsize, unsigned long mask,
+    unsigned long flags)
 {
     ASN1_STRING_TABLE *tmp;
 
diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index 194504415dd1a..2472b81ebb185 100644
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -258,13 +258,13 @@ int ossl_asn1_time_to_tm(struct tm *tm, const ASN1_TIME *d)
             *tm = tmp;
         return 1;
     }
- err:
+err:
     return 0;
 }
 
 ASN1_TIME *ossl_asn1_time_from_tm(ASN1_TIME *s, struct tm *ts, int type)
 {
-    char* p;
+    char *p;
     ASN1_TIME *tmps = NULL;
     const size_t len = 20;
 
@@ -291,7 +291,7 @@ ASN1_TIME *ossl_asn1_time_from_tm(ASN1_TIME *s, struct tm *ts, int type)
         goto err;
 
     tmps->type = type;
-    p = (char*)tmps->data;
+    p = (char *)tmps->data;
 
     if (ts->tm_mon > INT_MAX - 1)
         goto err;
@@ -300,21 +300,21 @@ ASN1_TIME *ossl_asn1_time_from_tm(ASN1_TIME *s, struct tm *ts, int type)
         if (ts->tm_year > INT_MAX - 1900)
             goto err;
         tmps->length = BIO_snprintf(p, len, "%04d%02d%02d%02d%02d%02dZ",
-                                    ts->tm_year + 1900, ts->tm_mon + 1,
-                                    ts->tm_mday, ts->tm_hour, ts->tm_min,
-                                    ts->tm_sec);
+            ts->tm_year + 1900, ts->tm_mon + 1,
+            ts->tm_mday, ts->tm_hour, ts->tm_min,
+            ts->tm_sec);
     } else {
         tmps->length = BIO_snprintf(p, len, "%02d%02d%02d%02d%02d%02dZ",
-                                    ts->tm_year % 100, ts->tm_mon + 1,
-                                    ts->tm_mday, ts->tm_hour, ts->tm_min,
-                                    ts->tm_sec);
+            ts->tm_year % 100, ts->tm_mon + 1,
+            ts->tm_mday, ts->tm_hour, ts->tm_min,
+            ts->tm_sec);
     }
 
 #ifdef CHARSET_EBCDIC
     ebcdic2ascii(tmps->data, tmps->data, tmps->length);
 #endif
     return tmps;
- err:
+err:
     if (tmps != s)
         ASN1_STRING_free(tmps);
     return NULL;
@@ -326,7 +326,7 @@ 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)
 {
     struct tm *ts;
     struct tm data;
@@ -354,7 +354,7 @@ int ASN1_TIME_check(const ASN1_TIME *t)
 
 /* Convert an ASN1_TIME structure to GeneralizedTime */
 ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(const ASN1_TIME *t,
-                                                   ASN1_GENERALIZEDTIME **out)
+    ASN1_GENERALIZEDTIME **out)
 {
     ASN1_GENERALIZEDTIME *ret = NULL;
     struct tm tm;
@@ -456,7 +456,7 @@ int ASN1_TIME_to_tm(const ASN1_TIME *s, struct tm *tm)
 }
 
 int ASN1_TIME_diff(int *pday, int *psec,
-                   const ASN1_TIME *from, const ASN1_TIME *to)
+    const ASN1_TIME *from, const ASN1_TIME *to)
 {
     struct tm tm_from, tm_to;
 
@@ -484,7 +484,6 @@ int ASN1_TIME_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags)
     return ossl_asn1_time_print_ex(bp, tm, flags) > 0;
 }
 
-
 /* prints the time with the date format of ISO 8601 */
 /* returns 0 on BIO write error, else -1 in case of parse failure, else 1 */
 int ossl_asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags)
@@ -520,26 +519,30 @@ int ossl_asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags)
         if (f_len > 0) {
             if ((flags & ASN1_DTFLGS_TYPE_MASK) == ASN1_DTFLGS_ISO8601) {
                 return BIO_printf(bp, "%4d-%02d-%02d %02d:%02d:%02d.%.*sZ",
-                                  stm.tm_year + 1900, stm.tm_mon + 1,
-                                  stm.tm_mday, stm.tm_hour,
-                                  stm.tm_min, stm.tm_sec, f_len, f) > 0;
+                           stm.tm_year + 1900, stm.tm_mon + 1,
+                           stm.tm_mday, stm.tm_hour,
+                           stm.tm_min, stm.tm_sec, f_len, f)
+                    > 0;
             } else {
                 return BIO_printf(bp, "%s %2d %02d:%02d:%02d.%.*s %d GMT",
-                                  _asn1_mon[stm.tm_mon], stm.tm_mday, stm.tm_hour,
-                                  stm.tm_min, stm.tm_sec, f_len, f,
-                                  stm.tm_year + 1900) > 0;
+                           _asn1_mon[stm.tm_mon], stm.tm_mday, stm.tm_hour,
+                           stm.tm_min, stm.tm_sec, f_len, f,
+                           stm.tm_year + 1900)
+                    > 0;
             }
         }
     }
     if ((flags & ASN1_DTFLGS_TYPE_MASK) == ASN1_DTFLGS_ISO8601) {
         return BIO_printf(bp, "%4d-%02d-%02d %02d:%02d:%02dZ",
-                          stm.tm_year + 1900, stm.tm_mon + 1,
-                          stm.tm_mday, stm.tm_hour,
-                          stm.tm_min, stm.tm_sec) > 0;
+                   stm.tm_year + 1900, stm.tm_mon + 1,
+                   stm.tm_mday, stm.tm_hour,
+                   stm.tm_min, stm.tm_sec)
+            > 0;
     } else {
         return BIO_printf(bp, "%s %2d %02d:%02d:%02d %d GMT",
-                          _asn1_mon[stm.tm_mon], stm.tm_mday, stm.tm_hour,
-                          stm.tm_min, stm.tm_sec, stm.tm_year + 1900) > 0;
+                   _asn1_mon[stm.tm_mon], stm.tm_mday, stm.tm_hour,
+                   stm.tm_min, stm.tm_sec, stm.tm_year + 1900)
+            > 0;
     }
 }
 
diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c
index 6b638bd80c18e..facd1b6afc5b7 100644
--- a/crypto/asn1/a_type.c
+++ b/crypto/asn1/a_type.c
@@ -16,8 +16,8 @@
 int ASN1_TYPE_get(const ASN1_TYPE *a)
 {
     if (a->type == V_ASN1_BOOLEAN
-            || a->type == V_ASN1_NULL
-            || a->value.ptr != NULL)
+        || a->type == V_ASN1_NULL
+        || a->value.ptr != NULL)
         return a->type;
     else
         return 0;
@@ -26,8 +26,8 @@ int ASN1_TYPE_get(const ASN1_TYPE *a)
 void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value)
 {
     if (a->type != V_ASN1_BOOLEAN
-            && a->type != V_ASN1_NULL
-            && a->value.ptr != NULL) {
+        && a->type != V_ASN1_NULL
+        && a->value.ptr != NULL) {
         ASN1_TYPE **tmp_a = &a;
         ossl_asn1_primitive_free((ASN1_VALUE **)tmp_a, NULL, 0);
     }
@@ -75,7 +75,7 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b)
         result = a->value.boolean - b->value.boolean;
         break;
     case V_ASN1_NULL:
-        result = 0;             /* They do not have content. */
+        result = 0; /* They do not have content. */
         break;
     case V_ASN1_INTEGER:
     case V_ASN1_ENUMERATED:
@@ -99,7 +99,7 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b)
     case V_ASN1_OTHER:
     default:
         result = ASN1_STRING_cmp((ASN1_STRING *)a->value.ptr,
-                                 (ASN1_STRING *)b->value.ptr);
+            (ASN1_STRING *)b->value.ptr);
         break;
     }
 
diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index 323941ba97e2d..27eeb17932884 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -55,7 +55,7 @@ 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)
 {
     struct tm *ts;
     struct tm data;
diff --git a/crypto/asn1/a_utf8.c b/crypto/asn1/a_utf8.c
index 6572726cf1e5a..fb5999fa7f149 100644
--- a/crypto/asn1/a_utf8.c
+++ b/crypto/asn1/a_utf8.c
@@ -73,7 +73,7 @@ int UTF8_getc(const unsigned char *str, int len, unsigned long *val)
         value |= (*p++ & 0x3f) << 12;
         value |= (*p++ & 0x3f) << 6;
         value |= *p++ & 0x3f;
-        if (value < 0x10000)
+        if (value < 0x10000 || value >= UNICODE_LIMIT)
             return -4;
         ret = 4;
     } else
@@ -93,7 +93,7 @@ int UTF8_getc(const unsigned char *str, int len, unsigned long *val)
 int UTF8_putc(unsigned char *str, int len, unsigned long value)
 {
     if (!str)
-        len = 4;                /* Maximum we will need */
+        len = 4; /* Maximum we will need */
     else if (len <= 0)
         return -1;
     if (value < 0x80) {
diff --git a/crypto/asn1/a_verify.c b/crypto/asn1/a_verify.c
index f6cac80962042..55f86ee83ff5b 100644
--- a/crypto/asn1/a_verify.c
+++ b/crypto/asn1/a_verify.c
@@ -25,7 +25,7 @@
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 
 int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *a, ASN1_BIT_STRING *signature,
-                char *data, EVP_PKEY *pkey)
+    char *data, EVP_PKEY *pkey)
 {
     EVP_MD_CTX *ctx = EVP_MD_CTX_new();
     const EVP_MD *type;
@@ -71,13 +71,14 @@ int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *a, ASN1_BIT_STRING *signature,
     ret = -1;
 
     if (EVP_VerifyFinal(ctx, (unsigned char *)signature->data,
-                        (unsigned int)signature->length, pkey) <= 0) {
+            (unsigned int)signature->length, pkey)
+        <= 0) {
         ERR_raise(ERR_LIB_ASN1, ERR_R_EVP_LIB);
         ret = 0;
         goto err;
     }
     ret = 1;
- err:
+err:
     EVP_MD_CTX_free(ctx);
     return ret;
 }
@@ -85,16 +86,16 @@ int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *a, ASN1_BIT_STRING *signature,
 #endif
 
 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)
 {
     return ASN1_item_verify_ex(it, alg, signature, data, NULL, pkey, NULL, NULL);
 }
 
 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)
 {
     EVP_MD_CTX *ctx;
     int rv = -1;
@@ -108,8 +109,8 @@ int ASN1_item_verify_ex(const ASN1_ITEM *it, const X509_ALGOR *alg,
 }
 
 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)
 {
     EVP_PKEY *pkey;
     unsigned char *buf_in = NULL;
@@ -181,8 +182,8 @@ int ASN1_item_verify_ctx(const ASN1_ITEM *it, const X509_ALGOR *alg,
                 type = EVP_get_digestbynid(mdnid);
                 if (type == NULL) {
                     ERR_raise_data(ERR_LIB_ASN1,
-                                   ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM,
-                                   "nid=0x%x", mdnid);
+                        ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM,
+                        "nid=0x%x", mdnid);
                     goto err;
                 }
             }
@@ -213,13 +214,13 @@ int ASN1_item_verify_ctx(const ASN1_ITEM *it, const X509_ALGOR *alg,
     inll = inl;
 
     ret = EVP_DigestVerify(ctx, signature->data, (size_t)signature->length,
-                           buf_in, inl);
+        buf_in, inl);
     if (ret <= 0) {
         ERR_raise(ERR_LIB_ASN1, ERR_R_EVP_LIB);
         goto err;
     }
     ret = 1;
- err:
+err:
     OPENSSL_clear_free(buf_in, inll);
     return ret;
 }
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 6ba13dd7f22e3..14813e60af398 100644
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -24,16 +24,16 @@ typedef int sk_cmp_fn_type(const char *const *a, const char *const *b);
 static STACK_OF(EVP_PKEY_ASN1_METHOD) *app_methods = NULL;
 
 DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,
-                           const EVP_PKEY_ASN1_METHOD *, ameth);
+    const EVP_PKEY_ASN1_METHOD *, ameth);
 
 static int ameth_cmp(const EVP_PKEY_ASN1_METHOD *const *a,
-                     const EVP_PKEY_ASN1_METHOD *const *b)
+    const EVP_PKEY_ASN1_METHOD *const *b)
 {
     return ((*a)->pkey_id - (*b)->pkey_id);
 }
 
 IMPLEMENT_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_ASN1_METHOD *,
-                             const EVP_PKEY_ASN1_METHOD *, ameth);
+    const EVP_PKEY_ASN1_METHOD *, ameth);
 
 int EVP_PKEY_asn1_get_count(void)
 {
@@ -104,7 +104,7 @@ 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 i;
     const EVP_PKEY_ASN1_METHOD *ameth = NULL;
@@ -128,7 +128,7 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
 #endif
         *pe = NULL;
     }
-    for (i = EVP_PKEY_asn1_get_count(); i-- > 0; ) {
+    for (i = EVP_PKEY_asn1_get_count(); i-- > 0;) {
         ameth = EVP_PKEY_asn1_get0(i);
         if (ameth->pkey_flags & ASN1_PKEY_ALIAS)
             continue;
@@ -141,7 +141,9 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
 
 int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
 {
-    EVP_PKEY_ASN1_METHOD tmp = { 0, };
+    EVP_PKEY_ASN1_METHOD tmp = {
+        0,
+    };
 
     /*
      * One of the following must be true:
@@ -152,9 +154,9 @@ int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
      * Anything else is an error and may lead to a corrupt ASN1 method table
      */
     if (!((ameth->pem_str == NULL
-           && (ameth->pkey_flags & ASN1_PKEY_ALIAS) != 0)
-          || (ameth->pem_str != NULL
-              && (ameth->pkey_flags & ASN1_PKEY_ALIAS) == 0))) {
+              && (ameth->pkey_flags & ASN1_PKEY_ALIAS) != 0)
+            || (ameth->pem_str != NULL
+                && (ameth->pkey_flags & ASN1_PKEY_ALIAS) == 0))) {
         ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_INVALID_ARGUMENT);
         return 0;
     }
@@ -168,7 +170,7 @@ int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
     tmp.pkey_id = ameth->pkey_id;
     if (sk_EVP_PKEY_ASN1_METHOD_find(app_methods, &tmp) >= 0) {
         ERR_raise(ERR_LIB_EVP,
-                  EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED);
+            EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED);
         return 0;
     }
 
@@ -193,9 +195,9 @@ int EVP_PKEY_asn1_add_alias(int to, int from)
 }
 
 int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_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)
 {
     if (!ameth)
         return 0;
@@ -218,7 +220,7 @@ 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)
 {
     EVP_PKEY_ASN1_METHOD *ameth = OPENSSL_zalloc(sizeof(*ameth));
 
@@ -243,13 +245,13 @@ EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags,
 
     return ameth;
 
- err:
+err:
     EVP_PKEY_asn1_free(ameth);
     return NULL;
 }
 
 void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,
-                        const EVP_PKEY_ASN1_METHOD *src)
+    const EVP_PKEY_ASN1_METHOD *src)
 {
     int pkey_id = dst->pkey_id;
     int pkey_base_id = dst->pkey_base_id;
@@ -277,17 +279,17 @@ 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))
 {
     ameth->pub_decode = pub_decode;
     ameth->pub_encode = pub_encode;
@@ -298,15 +300,15 @@ void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
 }
 
 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))
 {
     ameth->priv_decode = priv_decode;
     ameth->priv_encode = priv_encode;
@@ -314,19 +316,19 @@ void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
 }
 
 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))
 {
     ameth->param_decode = param_decode;
     ameth->param_encode = param_encode;
@@ -337,98 +339,98 @@ void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
 }
 
 void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
-                            void (*pkey_free) (EVP_PKEY *pkey))
+    void (*pkey_free)(EVP_PKEY *pkey))
 {
     ameth->pkey_free = pkey_free;
 }
 
 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))
 {
     ameth->pkey_ctrl = pkey_ctrl;
 }
 
 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))
 {
     ameth->pkey_security_bits = pkey_security_bits;
 }
 
 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))
 {
     ameth->item_sign = item_sign;
     ameth->item_verify = item_verify;
 }
 
 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))
 {
     ameth->siginf_set = siginf_set;
 }
 
 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))
 {
     ameth->pkey_check = pkey_check;
 }
 
 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))
 {
     ameth->pkey_public_check = pkey_pub_check;
 }
 
 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))
 {
     ameth->pkey_param_check = pkey_param_check;
 }
 
 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))
 {
     ameth->set_priv_key = set_priv_key;
 }
 
 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))
 {
     ameth->set_pub_key = set_pub_key;
 }
 
 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))
 {
     ameth->get_priv_key = get_priv_key;
 }
 
 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))
 {
     ameth->get_pub_key = get_pub_key;
 }
diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c
index f52584244970d..81ac09bba3c87 100644
--- a/crypto/asn1/asn1_err.c
+++ b/crypto/asn1/asn1_err.c
@@ -15,193 +15,193 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA ASN1_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ADDING_OBJECT), "adding object"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ASN1_PARSE_ERROR), "asn1 parse error"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ASN1_SIG_PARSE_ERROR),
-    "asn1 sig parse error"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_AUX_ERROR), "aux error"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BAD_OBJECT_HEADER), "bad object header"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BAD_TEMPLATE), "bad template"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BMPSTRING_IS_WRONG_LENGTH),
-    "bmpstring is wrong length"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BN_LIB), "bn lib"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BOOLEAN_IS_WRONG_LENGTH),
-    "boolean is wrong length"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BUFFER_TOO_SMALL), "buffer too small"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER),
-    "cipher has no object identifier"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_CONTEXT_NOT_INITIALISED),
-    "context not initialised"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DATA_IS_WRONG), "data is wrong"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DECODE_ERROR), "decode error"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DEPTH_EXCEEDED), "depth exceeded"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED),
-    "digest and key type not supported"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ENCODE_ERROR), "encode error"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ERROR_GETTING_TIME),
-    "error getting time"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ERROR_LOADING_SECTION),
-    "error loading section"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ERROR_SETTING_CIPHER_PARAMS),
-    "error setting cipher params"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPECTING_AN_INTEGER),
-    "expecting an integer"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPECTING_AN_OBJECT),
-    "expecting an object"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPLICIT_LENGTH_MISMATCH),
-    "explicit length mismatch"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED),
-    "explicit tag not constructed"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_FIELD_MISSING), "field missing"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_FIRST_NUM_TOO_LARGE),
-    "first num too large"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT),
-    "generalizedtime is too short"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_HEADER_TOO_LONG), "header too long"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_BITSTRING_FORMAT),
-    "illegal bitstring format"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_BOOLEAN), "illegal boolean"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_CHARACTERS),
-    "illegal characters"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_FORMAT), "illegal format"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_HEX), "illegal hex"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_IMPLICIT_TAG),
-    "illegal implicit tag"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_INTEGER), "illegal integer"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NEGATIVE_VALUE),
-    "illegal negative value"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NESTED_TAGGING),
-    "illegal nested tagging"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NULL), "illegal null"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NULL_VALUE),
-    "illegal null value"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_OBJECT), "illegal object"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_OPTIONAL_ANY),
-    "illegal optional any"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE),
-    "illegal options on item template"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_PADDING), "illegal padding"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_TAGGED_ANY),
-    "illegal tagged any"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_TIME_VALUE),
-    "illegal time value"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_ZERO_CONTENT),
-    "illegal zero content"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INTEGER_NOT_ASCII_FORMAT),
-    "integer not ascii format"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG),
-    "integer too large for long"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_BIT_STRING_BITS_LEFT),
-    "invalid bit string bits left"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_BMPSTRING_LENGTH),
-    "invalid bmpstring length"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_DIGIT), "invalid digit"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_MIME_TYPE), "invalid mime type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_MODIFIER), "invalid modifier"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_NUMBER), "invalid number"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_OBJECT_ENCODING),
-    "invalid object encoding"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_SCRYPT_PARAMETERS),
-    "invalid scrypt parameters"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_SEPARATOR), "invalid separator"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_STRING_TABLE_VALUE),
-    "invalid string table value"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_UNIVERSALSTRING_LENGTH),
-    "invalid universalstring length"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_UTF8STRING),
-    "invalid utf8string"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_VALUE), "invalid value"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_LENGTH_TOO_LONG), "length too long"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_LIST_ERROR), "list error"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MIME_NO_CONTENT_TYPE),
-    "mime no content type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MIME_PARSE_ERROR), "mime parse error"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MIME_SIG_PARSE_ERROR),
-    "mime sig parse error"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MISSING_EOC), "missing eoc"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MISSING_SECOND_NUMBER),
-    "missing second number"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MISSING_VALUE), "missing value"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MSTRING_NOT_UNIVERSAL),
-    "mstring not universal"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MSTRING_WRONG_TAG), "mstring wrong tag"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NESTED_ASN1_STRING),
-    "nested asn1 string"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NESTED_TOO_DEEP), "nested too deep"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NON_HEX_CHARACTERS),
-    "non hex characters"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NOT_ASCII_FORMAT), "not ascii format"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NOT_ENOUGH_DATA), "not enough data"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_CONTENT_TYPE), "no content type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_MATCHING_CHOICE_TYPE),
-    "no matching choice type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_MULTIPART_BODY_FAILURE),
-    "no multipart body failure"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_MULTIPART_BOUNDARY),
-    "no multipart boundary"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_SIG_CONTENT_TYPE),
-    "no sig content type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NULL_IS_WRONG_LENGTH),
-    "null is wrong length"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_OBJECT_NOT_ASCII_FORMAT),
-    "object not ascii format"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ODD_NUMBER_OF_CHARS),
-    "odd number of chars"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SECOND_NUMBER_TOO_LARGE),
-    "second number too large"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SEQUENCE_LENGTH_MISMATCH),
-    "sequence length mismatch"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SEQUENCE_NOT_CONSTRUCTED),
-    "sequence not constructed"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG),
-    "sequence or set needs config"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SHORT_LINE), "short line"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SIG_INVALID_MIME_TYPE),
-    "sig invalid mime type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_STREAMING_NOT_SUPPORTED),
-    "streaming not supported"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_STRING_TOO_LONG), "string too long"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_STRING_TOO_SHORT), "string too short"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD),
-    "the asn1 object identifier is not known for this md"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TIME_NOT_ASCII_FORMAT),
-    "time not ascii format"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TOO_LARGE), "too large"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TOO_LONG), "too long"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TOO_SMALL), "too small"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TYPE_NOT_CONSTRUCTED),
-    "type not constructed"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TYPE_NOT_PRIMITIVE),
-    "type not primitive"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNEXPECTED_EOC), "unexpected eoc"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH),
-    "universalstring is wrong length"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_DIGEST), "unknown digest"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_FORMAT), "unknown format"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM),
-    "unknown message digest algorithm"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_OBJECT_TYPE),
-    "unknown object type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE),
-    "unknown public key type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM),
-    "unknown signature algorithm"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_TAG), "unknown tag"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE),
-    "unsupported any defined by type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_CIPHER),
-    "unsupported cipher"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE),
-    "unsupported public key type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_TYPE), "unsupported type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UTCTIME_IS_TOO_SHORT),
-    "utctime is too short"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_WRONG_INTEGER_TYPE),
-    "wrong integer type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_WRONG_PUBLIC_KEY_TYPE),
-    "wrong public key type"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_WRONG_TAG), "wrong tag"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ADDING_OBJECT), "adding object" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ASN1_PARSE_ERROR), "asn1 parse error" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ASN1_SIG_PARSE_ERROR),
+        "asn1 sig parse error" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_AUX_ERROR), "aux error" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BAD_OBJECT_HEADER), "bad object header" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BAD_TEMPLATE), "bad template" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BMPSTRING_IS_WRONG_LENGTH),
+        "bmpstring is wrong length" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BN_LIB), "bn lib" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BOOLEAN_IS_WRONG_LENGTH),
+        "boolean is wrong length" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_BUFFER_TOO_SMALL), "buffer too small" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER),
+        "cipher has no object identifier" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_CONTEXT_NOT_INITIALISED),
+        "context not initialised" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DATA_IS_WRONG), "data is wrong" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DECODE_ERROR), "decode error" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DEPTH_EXCEEDED), "depth exceeded" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED),
+        "digest and key type not supported" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ENCODE_ERROR), "encode error" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ERROR_GETTING_TIME),
+        "error getting time" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ERROR_LOADING_SECTION),
+        "error loading section" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ERROR_SETTING_CIPHER_PARAMS),
+        "error setting cipher params" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPECTING_AN_INTEGER),
+        "expecting an integer" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPECTING_AN_OBJECT),
+        "expecting an object" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPLICIT_LENGTH_MISMATCH),
+        "explicit length mismatch" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED),
+        "explicit tag not constructed" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_FIELD_MISSING), "field missing" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_FIRST_NUM_TOO_LARGE),
+        "first num too large" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT),
+        "generalizedtime is too short" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_HEADER_TOO_LONG), "header too long" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_BITSTRING_FORMAT),
+        "illegal bitstring format" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_BOOLEAN), "illegal boolean" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_CHARACTERS),
+        "illegal characters" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_FORMAT), "illegal format" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_HEX), "illegal hex" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_IMPLICIT_TAG),
+        "illegal implicit tag" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_INTEGER), "illegal integer" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NEGATIVE_VALUE),
+        "illegal negative value" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NESTED_TAGGING),
+        "illegal nested tagging" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NULL), "illegal null" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_NULL_VALUE),
+        "illegal null value" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_OBJECT), "illegal object" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_OPTIONAL_ANY),
+        "illegal optional any" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE),
+        "illegal options on item template" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_PADDING), "illegal padding" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_TAGGED_ANY),
+        "illegal tagged any" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_TIME_VALUE),
+        "illegal time value" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ILLEGAL_ZERO_CONTENT),
+        "illegal zero content" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INTEGER_NOT_ASCII_FORMAT),
+        "integer not ascii format" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INTEGER_TOO_LARGE_FOR_LONG),
+        "integer too large for long" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_BIT_STRING_BITS_LEFT),
+        "invalid bit string bits left" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_BMPSTRING_LENGTH),
+        "invalid bmpstring length" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_DIGIT), "invalid digit" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_MIME_TYPE), "invalid mime type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_MODIFIER), "invalid modifier" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_NUMBER), "invalid number" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_OBJECT_ENCODING),
+        "invalid object encoding" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_SCRYPT_PARAMETERS),
+        "invalid scrypt parameters" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_SEPARATOR), "invalid separator" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_STRING_TABLE_VALUE),
+        "invalid string table value" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_UNIVERSALSTRING_LENGTH),
+        "invalid universalstring length" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_UTF8STRING),
+        "invalid utf8string" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_INVALID_VALUE), "invalid value" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_LENGTH_TOO_LONG), "length too long" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_LIST_ERROR), "list error" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MIME_NO_CONTENT_TYPE),
+        "mime no content type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MIME_PARSE_ERROR), "mime parse error" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MIME_SIG_PARSE_ERROR),
+        "mime sig parse error" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MISSING_EOC), "missing eoc" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MISSING_SECOND_NUMBER),
+        "missing second number" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MISSING_VALUE), "missing value" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MSTRING_NOT_UNIVERSAL),
+        "mstring not universal" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_MSTRING_WRONG_TAG), "mstring wrong tag" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NESTED_ASN1_STRING),
+        "nested asn1 string" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NESTED_TOO_DEEP), "nested too deep" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NON_HEX_CHARACTERS),
+        "non hex characters" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NOT_ASCII_FORMAT), "not ascii format" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NOT_ENOUGH_DATA), "not enough data" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_CONTENT_TYPE), "no content type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_MATCHING_CHOICE_TYPE),
+        "no matching choice type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_MULTIPART_BODY_FAILURE),
+        "no multipart body failure" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_MULTIPART_BOUNDARY),
+        "no multipart boundary" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NO_SIG_CONTENT_TYPE),
+        "no sig content type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_NULL_IS_WRONG_LENGTH),
+        "null is wrong length" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_OBJECT_NOT_ASCII_FORMAT),
+        "object not ascii format" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_ODD_NUMBER_OF_CHARS),
+        "odd number of chars" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SECOND_NUMBER_TOO_LARGE),
+        "second number too large" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SEQUENCE_LENGTH_MISMATCH),
+        "sequence length mismatch" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SEQUENCE_NOT_CONSTRUCTED),
+        "sequence not constructed" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG),
+        "sequence or set needs config" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SHORT_LINE), "short line" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_SIG_INVALID_MIME_TYPE),
+        "sig invalid mime type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_STREAMING_NOT_SUPPORTED),
+        "streaming not supported" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_STRING_TOO_LONG), "string too long" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_STRING_TOO_SHORT), "string too short" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD),
+        "the asn1 object identifier is not known for this md" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TIME_NOT_ASCII_FORMAT),
+        "time not ascii format" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TOO_LARGE), "too large" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TOO_LONG), "too long" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TOO_SMALL), "too small" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TYPE_NOT_CONSTRUCTED),
+        "type not constructed" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_TYPE_NOT_PRIMITIVE),
+        "type not primitive" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNEXPECTED_EOC), "unexpected eoc" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH),
+        "universalstring is wrong length" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_DIGEST), "unknown digest" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_FORMAT), "unknown format" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM),
+        "unknown message digest algorithm" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_OBJECT_TYPE),
+        "unknown object type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE),
+        "unknown public key type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM),
+        "unknown signature algorithm" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNKNOWN_TAG), "unknown tag" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE),
+        "unsupported any defined by type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_CIPHER),
+        "unsupported cipher" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE),
+        "unsupported public key type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UNSUPPORTED_TYPE), "unsupported type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_UTCTIME_IS_TOO_SHORT),
+        "utctime is too short" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_WRONG_INTEGER_TYPE),
+        "wrong integer type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_WRONG_PUBLIC_KEY_TYPE),
+        "wrong public key type" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, ASN1_R_WRONG_TAG), "wrong tag" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 50b4db97aa65a..1c8d3d585940a 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -12,30 +12,30 @@
 #include "internal/cryptlib.h"
 #include "crypto/asn1.h"
 
-#define ASN1_GEN_FLAG           0x10000
-#define ASN1_GEN_FLAG_IMP       (ASN1_GEN_FLAG|1)
-#define ASN1_GEN_FLAG_EXP       (ASN1_GEN_FLAG|2)
-#define ASN1_GEN_FLAG_TAG       (ASN1_GEN_FLAG|3)
-#define ASN1_GEN_FLAG_BITWRAP   (ASN1_GEN_FLAG|4)
-#define ASN1_GEN_FLAG_OCTWRAP   (ASN1_GEN_FLAG|5)
-#define ASN1_GEN_FLAG_SEQWRAP   (ASN1_GEN_FLAG|6)
-#define ASN1_GEN_FLAG_SETWRAP   (ASN1_GEN_FLAG|7)
-#define ASN1_GEN_FLAG_FORMAT    (ASN1_GEN_FLAG|8)
+#define ASN1_GEN_FLAG 0x10000
+#define ASN1_GEN_FLAG_IMP (ASN1_GEN_FLAG | 1)
+#define ASN1_GEN_FLAG_EXP (ASN1_GEN_FLAG | 2)
+#define ASN1_GEN_FLAG_TAG (ASN1_GEN_FLAG | 3)
+#define ASN1_GEN_FLAG_BITWRAP (ASN1_GEN_FLAG | 4)
+#define ASN1_GEN_FLAG_OCTWRAP (ASN1_GEN_FLAG | 5)
+#define ASN1_GEN_FLAG_SEQWRAP (ASN1_GEN_FLAG | 6)
+#define ASN1_GEN_FLAG_SETWRAP (ASN1_GEN_FLAG | 7)
+#define ASN1_GEN_FLAG_FORMAT (ASN1_GEN_FLAG | 8)
 
-#define ASN1_GEN_STR(str,val)   {str, sizeof(str) - 1, val}
+#define ASN1_GEN_STR(str, val) { str, sizeof(str) - 1, val }
 
-#define ASN1_FLAG_EXP_MAX       20
+#define ASN1_FLAG_EXP_MAX 20
 /* Maximum number of nested sequences */
-#define ASN1_GEN_SEQ_MAX_DEPTH  50
+#define ASN1_GEN_SEQ_MAX_DEPTH 50
 
 /* Input formats */
 
 /* ASCII: default */
-#define ASN1_GEN_FORMAT_ASCII   1
+#define ASN1_GEN_FORMAT_ASCII 1
 /* UTF8 */
-#define ASN1_GEN_FORMAT_UTF8    2
+#define ASN1_GEN_FORMAT_UTF8 2
 /* Hex */
-#define ASN1_GEN_FORMAT_HEX     3
+#define ASN1_GEN_FORMAT_HEX 3
 /* List of bits */
 #define ASN1_GEN_FORMAT_BITLIST 4
 
@@ -64,15 +64,15 @@ typedef struct {
 } tag_exp_arg;
 
 static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
-                              int *perr);
+    int *perr);
 static int bitstr_cb(const char *elem, int len, void *bitstr);
 static int asn1_cb(const char *elem, int len, void *bitstr);
 static int append_exp(tag_exp_arg *arg, int exp_tag, int exp_class,
-                      int exp_constructed, int exp_pad, int imp_ok);
+    int exp_constructed, int exp_pad, int imp_ok);
 static int parse_tagging(const char *vstart, int vlen, int *ptag,
-                         int *pclass);
+    int *pclass);
 static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf,
-                             int depth, int *perr);
+    int depth, int *perr);
 static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype);
 static int asn1_str2tag(const char *tagstr, int len);
 
@@ -97,7 +97,7 @@ ASN1_TYPE *ASN1_generate_v3(const char *str, X509V3_CTX *cnf)
 }
 
 static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
-                              int *perr)
+    int *perr)
 {
     ASN1_TYPE *ret;
     tag_exp_arg asn1_tags;
@@ -134,8 +134,9 @@ static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
             return NULL;
         }
         ret = asn1_multi(asn1_tags.utype, asn1_tags.str, cnf, depth, perr);
-    } else
+    } else {
         ret = asn1_str2type(asn1_tags.str, asn1_tags.format, asn1_tags.utype);
+    }
 
     if (!ret)
         return NULL;
@@ -148,6 +149,8 @@ static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
     cpy_len = i2d_ASN1_TYPE(ret, &orig_der);
     ASN1_TYPE_free(ret);
     ret = NULL;
+    if (orig_der == NULL)
+        return NULL;
     /* Set point to start copying for modified encoding */
     cpy_start = orig_der;
 
@@ -156,7 +159,7 @@ static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
         /* If IMPLICIT we will replace the underlying tag */
         /* Skip existing tag+len */
         r = ASN1_get_object(&cpy_start, &hdr_len, &hdr_tag, &hdr_class,
-                            cpy_len);
+            cpy_len);
         if (r & 0x80)
             goto err;
         /* Update copy length */
@@ -169,26 +172,32 @@ static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
             /* Indefinite length constructed */
             hdr_constructed = 2;
             hdr_len = 0;
-        } else
+        } else {
             /* Just retain constructed flag */
             hdr_constructed = r & V_ASN1_CONSTRUCTED;
+        }
         /*
          * Work out new length with IMPLICIT tag: ignore constructed because
          * it will mess up if indefinite length
          */
         len = ASN1_object_size(0, hdr_len, asn1_tags.imp_tag);
-    } else
+        if (len == -1)
+            goto err;
+    } else {
         len = cpy_len;
+    }
 
     /* Work out length in any EXPLICIT, starting from end */
 
     for (i = 0, etmp = asn1_tags.exp_list + asn1_tags.exp_count - 1;
-         i < asn1_tags.exp_count; i++, etmp--) {
+        i < asn1_tags.exp_count; i++, etmp--) {
         /* Content length: number of content octets + any padding */
         len += etmp->exp_pad;
         etmp->exp_len = len;
         /* Total object length: length including new header */
         len = ASN1_object_size(0, len, etmp->exp_tag);
+        if (len == -1)
+            goto err;
     }
 
     /* Allocate buffer for new encoding */
@@ -204,9 +213,9 @@ static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
     /* Output explicit tags first */
 
     for (i = 0, etmp = asn1_tags.exp_list; i < asn1_tags.exp_count;
-         i++, etmp++) {
+        i++, etmp++) {
         ASN1_put_object(&p, etmp->exp_constructed, etmp->exp_len,
-                        etmp->exp_tag, etmp->exp_class);
+            etmp->exp_tag, etmp->exp_class);
         if (etmp->exp_pad)
             *p++ = 0;
     }
@@ -219,7 +228,7 @@ static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
                 || asn1_tags.imp_tag == V_ASN1_SET))
             hdr_constructed = V_ASN1_CONSTRUCTED;
         ASN1_put_object(&p, hdr_constructed, hdr_len,
-                        asn1_tags.imp_tag, asn1_tags.imp_class);
+            asn1_tags.imp_tag, asn1_tags.imp_class);
     }
 
     /* Copy across original encoding */
@@ -230,12 +239,11 @@ static ASN1_TYPE *generate_v3(const char *str, X509V3_CTX *cnf, int depth,
     /* Obtain new ASN1_TYPE structure */
     ret = d2i_ASN1_TYPE(NULL, &cp, len);
 
- err:
+err:
     OPENSSL_free(orig_der);
     OPENSSL_free(new_der);
 
     return ret;
-
 }
 
 static int asn1_cb(const char *elem, int len, void *bitstr)
@@ -338,11 +346,9 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
             return -1;
         }
         break;
-
     }
 
     return 1;
-
 }
 
 static int parse_tagging(const char *vstart, int vlen, int *ptag, int *pclass)
@@ -386,21 +392,19 @@ static int parse_tagging(const char *vstart, int vlen, int *ptag, int *pclass)
 
         default:
             ERR_raise_data(ERR_LIB_ASN1, ASN1_R_INVALID_MODIFIER,
-                           "Char=%c", *eptr);
+                "Char=%c", *eptr);
             return 0;
-
         }
     } else
         *pclass = V_ASN1_CONTEXT_SPECIFIC;
 
     return 1;
-
 }
 
 /* Handle multiple types: SET and SEQUENCE */
 
 static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf,
-                             int depth, int *perr)
+    int depth, int *perr)
 {
     ASN1_TYPE *ret = NULL;
     STACK_OF(ASN1_TYPE) *sk = NULL;
@@ -418,9 +422,8 @@ static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf,
         if (!sect)
             goto bad;
         for (i = 0; i < sk_CONF_VALUE_num(sect); i++) {
-            ASN1_TYPE *typ =
-                generate_v3(sk_CONF_VALUE_value(sect, i)->value, cnf,
-                            depth + 1, perr);
+            ASN1_TYPE *typ = generate_v3(sk_CONF_VALUE_value(sect, i)->value, cnf,
+                depth + 1, perr);
             if (!typ)
                 goto bad;
             if (!sk_ASN1_TYPE_push(sk, typ))
@@ -450,7 +453,7 @@ static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf,
 
     der = NULL;
 
- bad:
+bad:
 
     OPENSSL_free(der);
 
@@ -461,7 +464,7 @@ static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf,
 }
 
 static int append_exp(tag_exp_arg *arg, int exp_tag, int exp_class,
-                      int exp_constructed, int exp_pad, int imp_ok)
+    int exp_constructed, int exp_pad, int imp_ok)
 {
     tag_exp_type *exp_tmp;
     /* Can only have IMPLICIT if permitted */
@@ -620,7 +623,8 @@ static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype)
             goto bad_form;
         }
         if ((atmp->value.integer
-                    = s2i_ASN1_INTEGER(NULL, str)) == NULL) {
+                = s2i_ASN1_INTEGER(NULL, str))
+            == NULL) {
             ERR_raise(ERR_LIB_ASN1, ASN1_R_ILLEGAL_INTEGER);
             goto bad_str;
         }
@@ -678,7 +682,8 @@ static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype)
         }
 
         if (ASN1_mbstring_copy(&atmp->value.asn1_string, (unsigned char *)str,
-                               -1, format, ASN1_tag2bit(utype)) <= 0) {
+                -1, format, ASN1_tag2bit(utype))
+            <= 0) {
             ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
             goto bad_str;
         }
@@ -706,9 +711,8 @@ static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype)
                 goto bad_str;
             }
         } else if ((format == ASN1_GEN_FORMAT_BITLIST)
-                 && (utype == V_ASN1_BIT_STRING)) {
-            if (!CONF_parse_list
-                (str, ',', 1, bitstr_cb, atmp->value.bit_string)) {
+            && (utype == V_ASN1_BIT_STRING)) {
+            if (!CONF_parse_list(str, ',', 1, bitstr_cb, atmp->value.bit_string)) {
                 ERR_raise(ERR_LIB_ASN1, ASN1_R_LIST_ERROR);
                 goto bad_str;
             }
@@ -732,13 +736,12 @@ static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype)
     atmp->type = utype;
     return atmp;
 
- bad_str:
+bad_str:
     ERR_add_error_data(2, "string=", str);
- bad_form:
+bad_form:
 
     ASN1_TYPE_free(atmp);
     return NULL;
-
 }
 
 static int bitstr_cb(const char *elem, int len, void *bitstr)
diff --git a/crypto/asn1/asn1_item_list.h b/crypto/asn1/asn1_item_list.h
index 3d678ae18fd5d..f26954ecb71c0 100644
--- a/crypto/asn1/asn1_item_list.h
+++ b/crypto/asn1/asn1_item_list.h
@@ -64,10 +64,10 @@ static ASN1_ITEM_EXP *asn1_item_list[] = {
     ASN1_ITEM_ref(DIST_POINT_NAME),
     ASN1_ITEM_ref(DIST_POINT),
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     ASN1_ITEM_ref(ECPARAMETERS),
     ASN1_ITEM_ref(ECPKPARAMETERS),
-# endif
+#endif
 #endif
     ASN1_ITEM_ref(EDIPARTYNAME),
     ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index e3a8480eef3f1..ae234bb5ea464 100644
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -14,7 +14,7 @@
 #include "asn1_local.h"
 
 static int asn1_get_length(const unsigned char **pp, int *inf, long *rl,
-                           long max);
+    long max);
 static void asn1_put_length(unsigned char **pp, int length);
 
 static int _asn1_check_infinite_end(const unsigned char **p, long len)
@@ -44,7 +44,7 @@ int ASN1_const_check_infinite_end(const unsigned char **p, long len)
 }
 
 int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
-                    int *pclass, long omax)
+    int *pclass, long omax)
 {
     int i, ret;
     long len;
@@ -101,7 +101,7 @@ int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
     }
     *pp = p;
     return ret | inf;
- err:
+err:
     ERR_raise(ERR_LIB_ASN1, ASN1_R_HEADER_TOO_LONG);
     return 0x80;
 }
@@ -114,7 +114,7 @@ int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
  * are stored most significant digit first.
  */
 static int asn1_get_length(const unsigned char **pp, int *inf, long *rl,
-                           long max)
+    long max)
 {
     const unsigned char *p = *pp;
     unsigned long ret = 0;
@@ -158,7 +158,7 @@ static int asn1_get_length(const unsigned char **pp, int *inf, long *rl,
  * constructed == 2 for indefinite length constructed
  */
 void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag,
-                     int xclass)
+    int xclass)
 {
     unsigned char *p = *pp;
     int i, ttag;
@@ -433,7 +433,7 @@ unsigned char *ASN1_STRING_data(ASN1_STRING *x)
 
 /* |max_len| excludes NUL terminator and may be 0 to indicate no restriction */
 char *ossl_sk_ASN1_UTF8STRING2text(STACK_OF(ASN1_UTF8STRING) *text,
-                                   const char *sep, size_t max_len)
+    const char *sep, size_t max_len)
 {
     int i;
     ASN1_UTF8STRING *current;
diff --git a/crypto/asn1/asn1_local.h b/crypto/asn1/asn1_local.h
index 10e9fcb7de45d..fe9228977df89 100644
--- a/crypto/asn1/asn1_local.h
+++ b/crypto/asn1/asn1_local.h
@@ -37,10 +37,10 @@ struct asn1_sctx_st {
     /* The field value itself */
     ASN1_VALUE **field;
     /* Callback to pass information to */
-    int (*scan_cb) (ASN1_SCTX *ctx);
+    int (*scan_cb)(ASN1_SCTX *ctx);
     /* Context specific application data */
     void *app_data;
-} /* ASN1_SCTX */ ;
+} /* ASN1_SCTX */;
 
 typedef struct mime_param_st MIME_PARAM;
 DEFINE_STACK_OF(MIME_PARAM)
@@ -51,46 +51,46 @@ void ossl_asn1_string_embed_free(ASN1_STRING *a, int embed);
 
 int ossl_asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it);
 int ossl_asn1_get_choice_selector_const(const ASN1_VALUE **pval,
-                                        const ASN1_ITEM *it);
+    const ASN1_ITEM *it);
 int ossl_asn1_set_choice_selector(ASN1_VALUE **pval, int value,
-                                  const ASN1_ITEM *it);
+    const ASN1_ITEM *it);
 
 ASN1_VALUE **ossl_asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
 const ASN1_VALUE **ossl_asn1_get_const_field_ptr(const ASN1_VALUE **pval,
-                                                 const ASN1_TEMPLATE *tt);
+    const ASN1_TEMPLATE *tt);
 
 const ASN1_TEMPLATE *ossl_asn1_do_adb(const ASN1_VALUE *val,
-                                      const ASN1_TEMPLATE *tt,
-                                      int nullerr);
+    const ASN1_TEMPLATE *tt,
+    int nullerr);
 
 int ossl_asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it);
 
 void ossl_asn1_enc_init(ASN1_VALUE **pval, const ASN1_ITEM *it);
 void ossl_asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
 int ossl_asn1_enc_restore(int *len, unsigned char **out, const ASN1_VALUE **pval,
-                          const ASN1_ITEM *it);
+    const ASN1_ITEM *it);
 int ossl_asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen,
-                       const ASN1_ITEM *it);
+    const ASN1_ITEM *it);
 
 void ossl_asn1_item_embed_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed);
 void ossl_asn1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed);
 void ossl_asn1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
 
 ASN1_OBJECT *ossl_c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
-                                  long length);
+    long length);
 int ossl_i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp);
 ASN1_BIT_STRING *ossl_c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
-                                          const unsigned char **pp, long length);
+    const unsigned char **pp, long length);
 int ossl_i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp);
 ASN1_INTEGER *ossl_c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
-                                    long length);
+    long length);
 
 /* Internal functions used by x_int64.c */
 int ossl_c2i_uint64_int(uint64_t *ret, int *neg, const unsigned char **pp,
-                        long len);
+    long len);
 int ossl_i2c_uint64_int(unsigned char *p, uint64_t r, int neg);
 
 ASN1_TIME *ossl_asn1_time_from_tm(ASN1_TIME *s, struct tm *ts, int type);
 
 int ossl_asn1_item_ex_new_intern(ASN1_VALUE **pval, const ASN1_ITEM *it,
-                                 OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
diff --git a/crypto/asn1/asn1_parse.c b/crypto/asn1/asn1_parse.c
index 6a4618d253d54..4feb161e33b16 100644
--- a/crypto/asn1/asn1_parse.c
+++ b/crypto/asn1/asn1_parse.c
@@ -18,9 +18,9 @@
 #endif
 
 static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
-                       int offset, int depth, int indent, int dump);
+    int offset, int depth, int indent, int dump);
 static int asn1_print_info(BIO *bp, long offset, int depth, int hl, long len,
-                           int tag, int xclass, int constructed, int indent)
+    int tag, int xclass, int constructed, int indent)
 {
     char str[128];
     const char *p;
@@ -35,17 +35,19 @@ static int asn1_print_info(BIO *bp, long offset, int depth, int hl, long len,
         p = "prim: ";
     if (constructed != (V_ASN1_CONSTRUCTED | 1)) {
         if (BIO_snprintf(str, sizeof(str), "%5ld:d=%-2d hl=%ld l=%4ld %s",
-                         offset, depth, (long)hl, len, p) <= 0)
+                offset, depth, (long)hl, len, p)
+            <= 0)
             goto err;
     } else {
         if (BIO_snprintf(str, sizeof(str), "%5ld:d=%-2d hl=%ld l=inf  %s",
-                         offset, depth, (long)hl, p) <= 0)
+                offset, depth, (long)hl, p)
+            <= 0)
             goto err;
     }
     if (bp != NULL) {
         if (BIO_set_prefix(bp, str) <= 0) {
             if ((bio = BIO_new(BIO_f_prefix())) == NULL
-                    || (bp = BIO_push(bio, bp)) == NULL)
+                || (bp = BIO_push(bio, bp)) == NULL)
                 goto err;
             pop_f_prefix = 1;
         }
@@ -71,7 +73,7 @@ static int asn1_print_info(BIO *bp, long offset, int depth, int hl, long len,
         p = ASN1_tag2str(tag);
 
     i = (BIO_printf(bp, "%-18s", p) > 0);
- err:
+err:
     if (saved_indent >= 0)
         BIO_set_indent(bp, saved_indent);
     if (pop_f_prefix)
@@ -86,13 +88,13 @@ 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)
 {
     return asn1_parse2(bp, &pp, len, 0, 0, indent, dump);
 }
 
 static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
-                       int offset, int depth, int indent, int dump)
+    int offset, int depth, int indent, int dump)
 {
     const unsigned char *p, *ep, *tot, *op, *opp;
     long len;
@@ -110,7 +112,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
         return 0;
     }
 
-    dump_indent = 6;            /* Because we know BIO_dump_indent() */
+    dump_indent = 6; /* Because we know BIO_dump_indent() */
     p = *pp;
     tot = p + length;
     while (length > 0) {
@@ -126,7 +128,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
          * if j == 0x21 it is a constructed indefinite length object
          */
         if (!asn1_print_info(bp, (long)offset + (long)(op - *pp), depth,
-                             hl, len, tag, xclass, j, (indent) ? depth : 0))
+                hl, len, tag, xclass, j, (indent) ? depth : 0))
             goto end;
         if (j & V_ASN1_CONSTRUCTED) {
             const unsigned char *sp = p;
@@ -141,8 +143,8 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
             if ((j == 0x21) && (len == 0)) {
                 for (;;) {
                     r = asn1_parse2(bp, &p, (long)(tot - p),
-                                    offset + (p - *pp), depth + 1,
-                                    indent, dump);
+                        offset + (p - *pp), depth + 1,
+                        indent, dump);
                     if (r == 0)
                         goto end;
                     if ((r == 2) || (p >= tot)) {
@@ -156,8 +158,8 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                 while (p < ep) {
                     sp = p;
                     r = asn1_parse2(bp, &p, tmp,
-                                    offset + (p - *pp), depth + 1,
-                                    indent, dump);
+                        offset + (p - *pp), depth + 1,
+                        indent, dump);
                     if (r == 0)
                         goto end;
                     tmp -= p - sp;
@@ -169,17 +171,10 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                 goto end;
         } else {
             nl = 0;
-            if ((tag == V_ASN1_PRINTABLESTRING) ||
-                (tag == V_ASN1_T61STRING) ||
-                (tag == V_ASN1_IA5STRING) ||
-                (tag == V_ASN1_VISIBLESTRING) ||
-                (tag == V_ASN1_NUMERICSTRING) ||
-                (tag == V_ASN1_UTF8STRING) ||
-                (tag == V_ASN1_UTCTIME) || (tag == V_ASN1_GENERALIZEDTIME)) {
+            if ((tag == V_ASN1_PRINTABLESTRING) || (tag == V_ASN1_T61STRING) || (tag == V_ASN1_IA5STRING) || (tag == V_ASN1_VISIBLESTRING) || (tag == V_ASN1_NUMERICSTRING) || (tag == V_ASN1_UTF8STRING) || (tag == V_ASN1_UTCTIME) || (tag == V_ASN1_GENERALIZEDTIME)) {
                 if (BIO_write(bp, ":", 1) <= 0)
                     goto end;
-                if ((len > 0) && BIO_write(bp, (const char *)p, (int)len)
-                    != (int)len)
+                if ((len > 0) && BIO_write(bp, (const char *)p, (int)len) != (int)len)
                     goto end;
             } else if (tag == V_ASN1_OBJECT) {
                 opp = op;
@@ -213,25 +208,22 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                      * testing whether the octet string is printable
                      */
                     for (i = 0; i < os->length; i++) {
-                        if (((opp[i] < ' ') &&
-                             (opp[i] != '\n') &&
-                             (opp[i] != '\r') &&
-                             (opp[i] != '\t')) || (opp[i] > '~')) {
+                        if (((opp[i] < ' ') && (opp[i] != '\n') && (opp[i] != '\r') && (opp[i] != '\t')) || (opp[i] > '~')) {
                             printable = 0;
                             break;
                         }
                     }
                     if (printable)
-                        /* printable string */
+                    /* printable string */
                     {
                         if (BIO_write(bp, ":", 1) <= 0)
                             goto end;
                         if (BIO_write(bp, (const char *)opp, os->length) <= 0)
                             goto end;
                     } else if (!dump)
-                        /*
-                         * not printable => print octet string as hex dump
-                         */
+                    /*
+                     * not printable => print octet string as hex dump
+                     */
                     {
                         if (BIO_write(bp, "[HEX DUMP]:", 11) <= 0)
                             goto end;
@@ -240,18 +232,17 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                                 goto end;
                         }
                     } else
-                        /* print the normal dump */
+                    /* print the normal dump */
                     {
                         if (!nl) {
                             if (BIO_write(bp, "\n", 1) <= 0)
                                 goto end;
                         }
                         if (BIO_dump_indent(bp,
-                                            (const char *)opp,
-                                            ((dump == -1 || dump >
-                                              os->
-                                              length) ? os->length : dump),
-                                            dump_indent) <= 0)
+                                (const char *)opp,
+                                ((dump == -1 || dump > os->length) ? os->length : dump),
+                                dump_indent)
+                            <= 0)
                             goto end;
                         nl = 1;
                     }
@@ -316,8 +307,9 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                         goto end;
                 }
                 if (BIO_dump_indent(bp, (const char *)p,
-                                    ((dump == -1 || dump > len) ? len : dump),
-                                    dump_indent) <= 0)
+                        ((dump == -1 || dump > len) ? len : dump),
+                        dump_indent)
+                    <= 0)
                     goto end;
                 nl = 1;
             }
@@ -341,14 +333,14 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
             }
             p += len;
             if ((tag == V_ASN1_EOC) && (xclass == 0)) {
-                ret = 2;        /* End of sequence */
+                ret = 2; /* End of sequence */
                 goto end;
             }
         }
         length -= len;
     }
     ret = 1;
- end:
+end:
     ASN1_OBJECT_free(o);
     ASN1_OCTET_STRING_free(os);
     ASN1_INTEGER_free(ai);
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index b3778226f9aa6..212c34f4bc0fe 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-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
@@ -30,18 +30,18 @@
  */
 
 struct mime_param_st {
-    char *param_name;           /* Param name e.g. "micalg" */
-    char *param_value;          /* Param value e.g. "sha1" */
+    char *param_name; /* Param name e.g. "micalg" */
+    char *param_value; /* Param value e.g. "sha1" */
 };
 
 struct mime_header_st {
-    char *name;                 /* Name of line e.g. "content-type" */
-    char *value;                /* Value of line e.g. "text/plain" */
+    char *name; /* Name of line e.g. "content-type" */
+    char *value; /* Value of line e.g. "text/plain" */
     STACK_OF(MIME_PARAM) *params; /* Zero or more parameters */
 };
 
 static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,
-                            const ASN1_ITEM *it);
+    const ASN1_ITEM *it);
 static char *strip_ends(char *name);
 static char *strip_start(char *name);
 static char *strip_end(char *name);
@@ -49,9 +49,9 @@ static MIME_HEADER *mime_hdr_new(const char *name, const char *value);
 static int mime_hdr_addparam(MIME_HEADER *mhdr, const char *name, const char *value);
 static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio);
 static int mime_hdr_cmp(const MIME_HEADER *const *a,
-                        const MIME_HEADER *const *b);
+    const MIME_HEADER *const *b);
 static int mime_param_cmp(const MIME_PARAM *const *a,
-                          const MIME_PARAM *const *b);
+    const MIME_PARAM *const *b);
 static void mime_param_free(MIME_PARAM *param);
 static int mime_bound_check(char *line, int linelen, const char *bound, int blen);
 static int multi_split(BIO *bio, int flags, const char *bound, STACK_OF(BIO) **ret);
@@ -61,13 +61,13 @@ static MIME_PARAM *mime_param_find(MIME_HEADER *hdr, const char *name);
 static void mime_hdr_free(MIME_HEADER *hdr);
 
 #define MAX_SMLEN 1024
-#define mime_debug(x)           /* x */
+#define mime_debug(x) /* x */
 
 /* Output an ASN1 structure in BER format streaming if necessary */
 
 /* unfortunately cannot constify this due to CMS_stream() and PKCS7_stream() */
 int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
-                        const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     int rv = 1;
 
@@ -96,14 +96,14 @@ int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
      * internally
      */
     else
-        ASN1_item_i2d_bio(it, out, val);
+        rv = ASN1_item_i2d_bio(it, out, val);
     return rv;
 }
 
 /* Base 64 read and write of ASN1 structure */
 
 static int B64_write_ASN1(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
-                          const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     BIO *b64;
     int r;
@@ -126,7 +126,7 @@ static int B64_write_ASN1(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
 /* Streaming ASN1 PEM write */
 
 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)
 {
     int r;
     BIO_printf(out, "-----BEGIN %s-----\n", hdr);
@@ -136,7 +136,7 @@ int PEM_write_bio_ASN1_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
 }
 
 static ASN1_VALUE *b64_read_asn1(BIO *bio, const ASN1_ITEM *it, ASN1_VALUE **x,
-                                 OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     BIO *b64;
     ASN1_VALUE *val;
@@ -168,6 +168,19 @@ static int asn1_write_micalg(BIO *out, STACK_OF(X509_ALGOR) *mdalgs)
             BIO_write(out, ",", 1);
         write_comma = 1;
         md_nid = OBJ_obj2nid(sk_X509_ALGOR_value(mdalgs, i)->algorithm);
+
+        /* RFC 8702 does not define a micalg for SHAKE, assuming "shake-<bitlen>" */
+        if (md_nid == NID_shake128) {
+            if (BIO_puts(out, "shake-128") < 0)
+                goto err;
+            continue;
+        }
+        if (md_nid == NID_shake256) {
+            if (BIO_puts(out, "shake-256") < 0)
+                goto err;
+            continue;
+        }
+
         md = EVP_get_digestbynid(md_nid);
         if (md && md->md_ctrl) {
             int rv;
@@ -204,15 +217,15 @@ static int asn1_write_micalg(BIO *out, STACK_OF(X509_ALGOR) *mdalgs)
 
         case NID_id_GostR3411_94:
             BIO_puts(out, "gostr3411-94");
-            goto err;
+            break;
 
         case NID_id_GostR3411_2012_256:
             BIO_puts(out, "gostr3411-2012-256");
-            goto err;
+            break;
 
         case NID_id_GostR3411_2012_512:
             BIO_puts(out, "gostr3411-2012-512");
-            goto err;
+            break;
 
         default:
             if (have_unknown) {
@@ -222,23 +235,21 @@ static int asn1_write_micalg(BIO *out, STACK_OF(X509_ALGOR) *mdalgs)
                 have_unknown = 1;
             }
             break;
-
         }
     }
 
     ret = 1;
- err:
+err:
 
     return ret;
-
 }
 
 /* SMIME sender */
 
 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)
 {
     char bound[33], c;
     int i;
@@ -272,11 +283,12 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
         BIO_printf(bio, "Content-Type: multipart/signed;");
         BIO_printf(bio, " protocol=\"%ssignature\";", mime_prefix);
         BIO_puts(bio, " micalg=\"");
-        asn1_write_micalg(bio, mdalgs);
+        if (!asn1_write_micalg(bio, mdalgs))
+            return 0;
         BIO_printf(bio, "\"; boundary=\"----%s\"%s%s",
-                   bound, mime_eol, mime_eol);
+            bound, mime_eol, mime_eol);
         BIO_printf(bio, "This is an S/MIME signed message%s%s",
-                   mime_eol, mime_eol);
+            mime_eol, mime_eol);
         /* Now write out the first part */
         BIO_printf(bio, "------%s%s", bound, mime_eol);
         if (!asn1_output_data(bio, data, val, flags, it))
@@ -292,7 +304,7 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
         BIO_printf(bio, " filename=\"smime.p7s\"%s%s", mime_eol, mime_eol);
         B64_write_ASN1(bio, val, NULL, 0, it);
         BIO_printf(bio, "%s------%s--%s%s", mime_eol, bound,
-                   mime_eol, mime_eol);
+            mime_eol, mime_eol);
         return 1;
     }
 
@@ -322,7 +334,7 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
         BIO_printf(bio, " smime-type=%s;", msg_type);
     BIO_printf(bio, " name=\"%s\"%s", cname, mime_eol);
     BIO_printf(bio, "Content-Transfer-Encoding: base64%s%s",
-               mime_eol, mime_eol);
+        mime_eol, mime_eol);
     if (!B64_write_ASN1(bio, val, data, flags, it))
         return 0;
     BIO_printf(bio, "%s", mime_eol);
@@ -330,18 +342,18 @@ int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
 }
 
 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)
 {
     return SMIME_write_ASN1_ex(bio, val, data, flags, ctype_nid, econt_nid,
-                               mdalgs, it, NULL, NULL);
+        mdalgs, it, NULL, NULL);
 }
 
 /* Handle output of ASN1 data */
 
 /* cannot constify val because of CMS_dataFinal() */
 static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,
-                            const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     BIO *tmpbio;
     const ASN1_AUX *aux = it->funcs;
@@ -387,7 +399,6 @@ static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,
     }
 
     return rv;
-
 }
 
 /*
@@ -397,8 +408,8 @@ static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,
  */
 
 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)
 {
     BIO *asnin;
     STACK_OF(MIME_HEADER) *headers = NULL;
@@ -460,10 +471,9 @@ ASN1_VALUE *SMIME_read_ASN1_ex(BIO *bio, int flags, BIO **bcont,
             return NULL;
         }
 
-        if (strcmp(hdr->value, "application/x-pkcs7-signature") &&
-            strcmp(hdr->value, "application/pkcs7-signature")) {
+        if (strcmp(hdr->value, "application/x-pkcs7-signature") && strcmp(hdr->value, "application/pkcs7-signature")) {
             ERR_raise_data(ERR_LIB_ASN1, ASN1_R_SIG_INVALID_MIME_TYPE,
-                           "type: %s", hdr->value);
+                "type: %s", hdr->value);
             sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
             sk_BIO_pop_free(parts, BIO_vfree);
             return NULL;
@@ -488,10 +498,9 @@ ASN1_VALUE *SMIME_read_ASN1_ex(BIO *bio, int flags, BIO **bcont,
 
     /* OK, if not multipart/signed try opaque signature */
 
-    if (strcmp(hdr->value, "application/x-pkcs7-mime") &&
-        strcmp(hdr->value, "application/pkcs7-mime")) {
+    if (strcmp(hdr->value, "application/x-pkcs7-mime") && strcmp(hdr->value, "application/pkcs7-mime")) {
         ERR_raise_data(ERR_LIB_ASN1, ASN1_R_INVALID_MIME_TYPE,
-                       "type: %s", hdr->value);
+            "type: %s", hdr->value);
         sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
         return NULL;
     }
@@ -590,7 +599,7 @@ int SMIME_text(BIO *in, BIO *out)
     }
     if (strcmp(hdr->value, "text/plain")) {
         ERR_raise_data(ERR_LIB_ASN1, ASN1_R_INVALID_MIME_TYPE,
-                       "type: %s", hdr->value);
+            "type: %s", hdr->value);
         sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
         return 0;
     }
@@ -656,7 +665,7 @@ static int multi_split(BIO *bio, int flags, const char *bound, STACK_OF(BIO) **r
 #else
                     1
 #endif
-                        || (flags & SMIME_CRLFEOL) != 0)
+                    || (flags & SMIME_CRLFEOL) != 0)
                     BIO_write(bpart, "\r\n", 2);
                 else
                     BIO_write(bpart, "\n", 1);
@@ -672,13 +681,13 @@ static int multi_split(BIO *bio, int flags, const char *bound, STACK_OF(BIO) **r
 
 /* This is the big one: parse MIME header lines up to message body */
 
-#define MIME_INVALID    0
-#define MIME_START      1
-#define MIME_TYPE       2
-#define MIME_NAME       3
-#define MIME_VALUE      4
-#define MIME_QUOTE      5
-#define MIME_COMMENT    6
+#define MIME_INVALID 0
+#define MIME_START 1
+#define MIME_TYPE 2
+#define MIME_NAME 3
+#define MIME_VALUE 4
+#define MIME_QUOTE 5
+#define MIME_COMMENT 6
 
 static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio)
 {
@@ -701,7 +710,7 @@ static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio)
         ntmp = NULL;
         /* Go through all characters */
         for (p = linebuf, q = linebuf; (c = *p) && (c != '\r') && (c != '\n');
-             p++) {
+            p++) {
 
             /*
              * State machine to handle MIME headers if this looks horrible
@@ -790,18 +799,18 @@ static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio)
             mime_hdr_addparam(mhdr, ntmp, strip_ends(q));
         }
         if (p == linebuf)
-            break;              /* Blank line means end of headers */
+            break; /* Blank line means end of headers */
     }
 
     /* Sort the headers and their params for faster searching */
     sk_MIME_HEADER_sort(headers);
     for (i = 0; i < sk_MIME_HEADER_num(headers); i++)
         if ((mhdr = sk_MIME_HEADER_value(headers, i)) != NULL
-                && mhdr->params != NULL)
+            && mhdr->params != NULL)
             sk_MIME_PARAM_sort(mhdr->params);
     return headers;
 
- err:
+err:
     mime_hdr_free(new_hdr);
     sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
     return NULL;
@@ -880,7 +889,7 @@ static MIME_HEADER *mime_hdr_new(const char *name, const char *value)
         goto err;
     return mhdr;
 
- err:
+err:
     OPENSSL_free(tmpname);
     OPENSSL_free(tmpval);
     OPENSSL_free(mhdr);
@@ -913,7 +922,7 @@ static int mime_hdr_addparam(MIME_HEADER *mhdr, const char *name, const char *va
     if (!sk_MIME_PARAM_push(mhdr->params, mparam))
         goto err;
     return 1;
- err:
+err:
     OPENSSL_free(tmpname);
     OPENSSL_free(tmpval);
     OPENSSL_free(mparam);
@@ -921,7 +930,7 @@ static int mime_hdr_addparam(MIME_HEADER *mhdr, const char *name, const char *va
 }
 
 static int mime_hdr_cmp(const MIME_HEADER *const *a,
-                        const MIME_HEADER *const *b)
+    const MIME_HEADER *const *b)
 {
     if ((*a)->name == NULL || (*b)->name == NULL)
         return ((*a)->name != NULL) - ((*b)->name != NULL);
@@ -930,7 +939,7 @@ static int mime_hdr_cmp(const MIME_HEADER *const *a,
 }
 
 static int mime_param_cmp(const MIME_PARAM *const *a,
-                          const MIME_PARAM *const *b)
+    const MIME_PARAM *const *b)
 {
     if ((*a)->param_name == NULL || (*b)->param_name == NULL)
         return ((*a)->param_name != NULL) - ((*b)->param_name != NULL);
diff --git a/crypto/asn1/asn_mstbl.c b/crypto/asn1/asn_mstbl.c
index b9309576559b2..cc9dba8e03181 100644
--- a/crypto/asn1/asn_mstbl.c
+++ b/crypto/asn1/asn_mstbl.c
@@ -96,19 +96,19 @@ static int do_tcreate(const char *value, const char *name)
             goto err;
     }
     rv = 1;
- err:
+err:
     if (rv == 0) {
         if (cnf)
             ERR_raise_data(ERR_LIB_ASN1, ASN1_R_INVALID_STRING_TABLE_VALUE,
-                           "field=%s, value=%s", cnf->name,
-                                                 cnf->value != NULL ? cnf->value
-                                                 : value);
+                "field=%s, value=%s", cnf->name,
+                cnf->value != NULL ? cnf->value
+                                   : value);
         else
             ERR_raise_data(ERR_LIB_ASN1, ASN1_R_INVALID_STRING_TABLE_VALUE,
-                           "name=%s, value=%s", name, value);
+                "name=%s, value=%s", name, value);
     } else {
         rv = ASN1_STRING_TABLE_add(nid, tbl_min, tbl_max,
-                                   tbl_mask, tbl_flags);
+            tbl_mask, tbl_flags);
         if (!rv)
             ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
     }
diff --git a/crypto/asn1/asn_pack.c b/crypto/asn1/asn_pack.c
index 54f4ae3a67b2e..e8b93030a2837 100644
--- a/crypto/asn1/asn_pack.c
+++ b/crypto/asn1/asn_pack.c
@@ -41,7 +41,7 @@ ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_STRING **oct)
         *oct = octmp;
 
     return octmp;
- err:
+err:
     if (oct == NULL || *oct == NULL)
         ASN1_STRING_free(octmp);
     return NULL;
@@ -61,14 +61,15 @@ 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)
 {
     const unsigned char *p;
     void *ret;
 
     p = oct->data;
-    if ((ret = ASN1_item_d2i_ex(NULL, &p, oct->length, it,\
-                                libctx, propq)) == NULL)
+    if ((ret = ASN1_item_d2i_ex(NULL, &p, oct->length, it,
+             libctx, propq))
+        == NULL)
         ERR_raise(ERR_LIB_ASN1, ASN1_R_DECODE_ERROR);
     return ret;
 }
diff --git a/crypto/asn1/bio_asn1.c b/crypto/asn1/bio_asn1.c
index f1499425010d3..a5f423b41cf5c 100644
--- a/crypto/asn1/bio_asn1.c
+++ b/crypto/asn1/bio_asn1.c
@@ -70,11 +70,11 @@ static long asn1_bio_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
 
 static int asn1_bio_init(BIO_ASN1_BUF_CTX *ctx, int size);
 static int asn1_bio_flush_ex(BIO *b, BIO_ASN1_BUF_CTX *ctx,
-                             asn1_ps_func *cleanup, asn1_bio_state_t next);
+    asn1_ps_func *cleanup, asn1_bio_state_t next);
 static int asn1_bio_setup_ex(BIO *b, BIO_ASN1_BUF_CTX *ctx,
-                             asn1_ps_func *setup,
-                             asn1_bio_state_t ex_state,
-                             asn1_bio_state_t other_state);
+    asn1_ps_func *setup,
+    asn1_bio_state_t ex_state,
+    asn1_bio_state_t other_state);
 
 static const BIO_METHOD methods_asn1 = {
     BIO_TYPE_ASN1,
@@ -171,7 +171,7 @@ static int asn1_bio_write(BIO *b, const char *in, int inl)
             /* Setup prefix data, call it */
         case ASN1_STATE_START:
             if (!asn1_bio_setup_ex(b, ctx, ctx->prefix,
-                                   ASN1_STATE_PRE_COPY, ASN1_STATE_HEADER))
+                    ASN1_STATE_PRE_COPY, ASN1_STATE_HEADER))
                 return -1;
             break;
 
@@ -179,7 +179,7 @@ static int asn1_bio_write(BIO *b, const char *in, int inl)
         case ASN1_STATE_PRE_COPY:
 
             ret = asn1_bio_flush_ex(b, ctx, ctx->prefix_free,
-                                    ASN1_STATE_HEADER);
+                ASN1_STATE_HEADER);
 
             if (ret <= 0)
                 goto done;
@@ -238,21 +238,18 @@ static int asn1_bio_write(BIO *b, const char *in, int inl)
         case ASN1_STATE_DONE:
             BIO_clear_retry_flags(b);
             return 0;
-
         }
-
     }
 
- done:
+done:
     BIO_clear_retry_flags(b);
     BIO_copy_next_retry(b);
 
     return (wrlen > 0) ? wrlen : ret;
-
 }
 
 static int asn1_bio_flush_ex(BIO *b, BIO_ASN1_BUF_CTX *ctx,
-                             asn1_ps_func *cleanup, asn1_bio_state_t next)
+    asn1_ps_func *cleanup, asn1_bio_state_t next)
 {
     int ret;
 
@@ -277,9 +274,9 @@ static int asn1_bio_flush_ex(BIO *b, BIO_ASN1_BUF_CTX *ctx,
 }
 
 static int asn1_bio_setup_ex(BIO *b, BIO_ASN1_BUF_CTX *ctx,
-                             asn1_ps_func *setup,
-                             asn1_bio_state_t ex_state,
-                             asn1_bio_state_t other_state)
+    asn1_ps_func *setup,
+    asn1_bio_state_t ex_state,
+    asn1_bio_state_t other_state)
 {
     if (setup && !setup(b, &ctx->ex_buf, &ctx->ex_len, &ctx->ex_arg)) {
         BIO_clear_retry_flags(b);
@@ -373,13 +370,13 @@ static long asn1_bio_ctrl(BIO *b, int cmd, long arg1, void *arg2)
         /* Call post function if possible */
         if (ctx->state == ASN1_STATE_HEADER) {
             if (!asn1_bio_setup_ex(b, ctx, ctx->suffix,
-                                   ASN1_STATE_POST_COPY, ASN1_STATE_DONE))
+                    ASN1_STATE_POST_COPY, ASN1_STATE_DONE))
                 return 0;
         }
 
         if (ctx->state == ASN1_STATE_POST_COPY) {
             ret = asn1_bio_flush_ex(b, ctx, ctx->suffix_free,
-                                    ASN1_STATE_DONE);
+                ASN1_STATE_DONE);
             if (ret <= 0)
                 return ret;
         }
@@ -395,14 +392,13 @@ static long asn1_bio_ctrl(BIO *b, int cmd, long arg1, void *arg2)
         if (next == NULL)
             return 0;
         return BIO_ctrl(next, cmd, arg1, arg2);
-
     }
 
     return ret;
 }
 
 static int asn1_bio_set_ex(BIO *b, int cmd,
-                           asn1_ps_func *ex_func, asn1_ps_func *ex_free_func)
+    asn1_ps_func *ex_func, asn1_ps_func *ex_free_func)
 {
     BIO_ASN1_EX_FUNCS extmp;
     extmp.ex_func = ex_func;
@@ -411,8 +407,8 @@ static int asn1_bio_set_ex(BIO *b, int cmd,
 }
 
 static int asn1_bio_get_ex(BIO *b, int cmd,
-                           asn1_ps_func **ex_func,
-                           asn1_ps_func **ex_free_func)
+    asn1_ps_func **ex_func,
+    asn1_ps_func **ex_free_func)
 {
     BIO_ASN1_EX_FUNCS extmp;
     int ret;
@@ -425,25 +421,25 @@ static int asn1_bio_get_ex(BIO *b, int cmd,
 }
 
 int BIO_asn1_set_prefix(BIO *b, asn1_ps_func *prefix,
-                        asn1_ps_func *prefix_free)
+    asn1_ps_func *prefix_free)
 {
     return asn1_bio_set_ex(b, BIO_C_SET_PREFIX, prefix, prefix_free);
 }
 
 int BIO_asn1_get_prefix(BIO *b, asn1_ps_func **pprefix,
-                        asn1_ps_func **pprefix_free)
+    asn1_ps_func **pprefix_free)
 {
     return asn1_bio_get_ex(b, BIO_C_GET_PREFIX, pprefix, pprefix_free);
 }
 
 int BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix,
-                        asn1_ps_func *suffix_free)
+    asn1_ps_func *suffix_free)
 {
     return asn1_bio_set_ex(b, BIO_C_SET_SUFFIX, suffix, suffix_free);
 }
 
 int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
-                        asn1_ps_func **psuffix_free)
+    asn1_ps_func **psuffix_free)
 {
     return asn1_bio_get_ex(b, BIO_C_GET_SUFFIX, psuffix, psuffix_free);
 }
diff --git a/crypto/asn1/bio_ndef.c b/crypto/asn1/bio_ndef.c
index 279609e603549..62d936d76b114 100644
--- a/crypto/asn1/bio_ndef.c
+++ b/crypto/asn1/bio_ndef.c
@@ -44,10 +44,10 @@ typedef struct ndef_aux_st {
 
 static int ndef_prefix(BIO *b, unsigned char **pbuf, int *plen, void *parg);
 static int ndef_prefix_free(BIO *b, unsigned char **pbuf, int *plen,
-                            void *parg);
+    void *parg);
 static int ndef_suffix(BIO *b, unsigned char **pbuf, int *plen, void *parg);
 static int ndef_suffix_free(BIO *b, unsigned char **pbuf, int *plen,
-                            void *parg);
+    void *parg);
 
 /*
  * On success, the returned BIO owns the input BIO as part of its BIO chain.
@@ -79,8 +79,8 @@ BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it)
     pop_bio = asn_bio;
 
     if (BIO_asn1_set_prefix(asn_bio, ndef_prefix, ndef_prefix_free) <= 0
-            || BIO_asn1_set_suffix(asn_bio, ndef_suffix, ndef_suffix_free) <= 0
-            || BIO_ctrl(asn_bio, BIO_C_SET_EX_ARG, 0, ndef_aux) <= 0)
+        || BIO_asn1_set_suffix(asn_bio, ndef_suffix, ndef_suffix_free) <= 0
+        || BIO_ctrl(asn_bio, BIO_C_SET_EX_ARG, 0, ndef_aux) <= 0)
         goto err;
 
     /*
@@ -118,7 +118,7 @@ BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it)
 
     return sarg.ndef_bio;
 
- err:
+err:
     /* BIO_pop() is NULL safe */
     (void)BIO_pop(pop_bio);
     BIO_free(asn_bio);
@@ -156,7 +156,7 @@ static int ndef_prefix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
 }
 
 static int ndef_prefix_free(BIO *b, unsigned char **pbuf, int *plen,
-                            void *parg)
+    void *parg)
 {
     NDEF_SUPPORT *ndef_aux;
 
@@ -177,7 +177,7 @@ static int ndef_prefix_free(BIO *b, unsigned char **pbuf, int *plen,
 }
 
 static int ndef_suffix_free(BIO *b, unsigned char **pbuf, int *plen,
-                            void *parg)
+    void *parg)
 {
     NDEF_SUPPORT **pndef_aux = (NDEF_SUPPORT **)parg;
     if (!ndef_prefix_free(b, pbuf, plen, parg))
@@ -207,7 +207,8 @@ static int ndef_suffix(BIO *b, unsigned char **pbuf, int *plen, void *parg)
     sarg.out = ndef_aux->out;
     sarg.boundary = ndef_aux->boundary;
     if (aux->asn1_cb(ASN1_OP_STREAM_POST,
-                     &ndef_aux->val, ndef_aux->it, &sarg) <= 0)
+            &ndef_aux->val, ndef_aux->it, &sarg)
+        <= 0)
         return 0;
 
     derlen = ASN1_item_ndef_i2d(ndef_aux->val, NULL, ndef_aux->it);
diff --git a/crypto/asn1/d2i_param.c b/crypto/asn1/d2i_param.c
index 1a0e2bfe6da48..ac76c57b68c31 100644
--- a/crypto/asn1/d2i_param.c
+++ b/crypto/asn1/d2i_param.c
@@ -16,7 +16,7 @@
 #include "crypto/evp.h"
 
 EVP_PKEY *d2i_KeyParams(int type, EVP_PKEY **a, const unsigned char **pp,
-                        long length)
+    long length)
 {
     EVP_PKEY *ret = NULL;
 
diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c
index 7f68e57328003..2546050c6af6c 100644
--- a/crypto/asn1/d2i_pr.c
+++ b/crypto/asn1/d2i_pr.c
@@ -27,7 +27,7 @@
 
 static EVP_PKEY *
 d2i_PrivateKey_decoder(int keytype, 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)
 {
     OSSL_DECODER_CTX *dctx = NULL;
     size_t len = length;
@@ -63,8 +63,8 @@ d2i_PrivateKey_decoder(int keytype, EVP_PKEY **a, const unsigned char **pp,
             return NULL;
         }
         if (key_name == NULL
-                && PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8info)
-                && OBJ_obj2txt(keytypebuf, sizeof(keytypebuf), algoid, 0))
+            && PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8info)
+            && OBJ_obj2txt(keytypebuf, sizeof(keytypebuf), algoid, 0))
             key_name = keytypebuf;
         structure = "PrivateKeyInfo";
         PKCS8_PRIV_KEY_INFO_free(p8info);
@@ -76,7 +76,7 @@ d2i_PrivateKey_decoder(int keytype, EVP_PKEY **a, const unsigned char **pp,
     if (a != NULL && (bak_a = *a) != NULL)
         ppkey = a;
     dctx = OSSL_DECODER_CTX_new_for_pkey(ppkey, "DER", structure, key_name,
-                                         EVP_PKEY_KEYPAIR, libctx, propq);
+        EVP_PKEY_KEYPAIR, libctx, propq);
     if (a != NULL)
         *a = bak_a;
     if (dctx == NULL)
@@ -92,7 +92,7 @@ d2i_PrivateKey_decoder(int keytype, EVP_PKEY **a, const unsigned char **pp,
         return *ppkey;
     }
 
- err:
+err:
     if (ppkey != a)
         EVP_PKEY_free(*ppkey);
     return NULL;
@@ -100,7 +100,7 @@ d2i_PrivateKey_decoder(int keytype, EVP_PKEY **a, const unsigned char **pp,
 
 EVP_PKEY *
 ossl_d2i_PrivateKey_legacy(int keytype, 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 *ret;
     const unsigned char *p = *pp;
@@ -124,10 +124,9 @@ ossl_d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a, const unsigned char **pp,
     }
 
     ERR_set_mark();
-    if (!ret->ameth->old_priv_decode ||
-        !ret->ameth->old_priv_decode(ret, &p, length)) {
+    if (!ret->ameth->old_priv_decode || !ret->ameth->old_priv_decode(ret, &p, length)) {
         if (ret->ameth->priv_decode != NULL
-                || ret->ameth->priv_decode_ex != NULL) {
+            || ret->ameth->priv_decode_ex != NULL) {
             EVP_PKEY *tmp;
             PKCS8_PRIV_KEY_INFO *p8 = NULL;
             p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, length);
@@ -152,21 +151,21 @@ ossl_d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a, const unsigned char **pp,
             goto err;
         }
     } else {
-      ERR_clear_last_mark();
+        ERR_clear_last_mark();
     }
     *pp = p;
     if (a != NULL)
         *a = ret;
     return ret;
- err:
+err:
     if (a == NULL || *a != ret)
         EVP_PKEY_free(ret);
     return NULL;
 }
 
 EVP_PKEY *d2i_PrivateKey_ex(int keytype, 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 *ret;
 
@@ -178,16 +177,16 @@ EVP_PKEY *d2i_PrivateKey_ex(int keytype, EVP_PKEY **a, const unsigned char **pp,
 }
 
 EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
-                         long length)
+    long length)
 {
     return d2i_PrivateKey_ex(type, a, pp, length, NULL, NULL);
 }
 
 static EVP_PKEY *d2i_AutoPrivateKey_legacy(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)
 {
     STACK_OF(ASN1_TYPE) *inkey;
     const unsigned char *p;
@@ -210,7 +209,7 @@ static EVP_PKEY *d2i_AutoPrivateKey_legacy(EVP_PKEY **a,
     } else if (sk_ASN1_TYPE_num(inkey) == 4) {
         keytype = EVP_PKEY_EC;
     } else if (sk_ASN1_TYPE_num(inkey) == 3) { /* This seems to be PKCS8, not
-                                              * traditional format */
+                                                * traditional format */
         PKCS8_PRIV_KEY_INFO *p8 = d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, length);
         EVP_PKEY *ret;
 
@@ -240,8 +239,8 @@ static EVP_PKEY *d2i_AutoPrivateKey_legacy(EVP_PKEY **a,
  * EVP_PKEY_NONE, which then figures out the type during decoding.
  */
 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 *ret;
 
@@ -253,7 +252,7 @@ EVP_PKEY *d2i_AutoPrivateKey_ex(EVP_PKEY **a, const unsigned char **pp,
 }
 
 EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
-                             long length)
+    long length)
 {
     return d2i_AutoPrivateKey_ex(a, pp, length, NULL, NULL);
 }
diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c
index cf7825c439034..60b21880351c1 100644
--- a/crypto/asn1/d2i_pu.c
+++ b/crypto/asn1/d2i_pu.c
@@ -26,7 +26,7 @@
 #include "crypto/evp.h"
 
 EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
-                        long length)
+    long length)
 {
     EVP_PKEY *ret;
     EVP_PKEY *copy = NULL;
@@ -90,7 +90,7 @@ EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
         (*a) = ret;
     EVP_PKEY_free(copy);
     return ret;
- err:
+err:
     if (a == NULL || *a != ret)
         EVP_PKEY_free(ret);
     EVP_PKEY_free(copy);
diff --git a/crypto/asn1/evp_asn1.c b/crypto/asn1/evp_asn1.c
index 13d8ed3893ab8..caa079fad0ec8 100644
--- a/crypto/asn1/evp_asn1.c
+++ b/crypto/asn1/evp_asn1.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -52,7 +52,7 @@ int ASN1_TYPE_get_octetstring(const ASN1_TYPE *a, unsigned char *data, int max_l
 }
 
 static ossl_inline void asn1_type_init_oct(ASN1_OCTET_STRING *oct,
-                                           unsigned char *data, int len)
+    unsigned char *data, int len)
 {
     oct->data = data;
     oct->type = V_ASN1_OCTET_STRING;
@@ -60,8 +60,14 @@ static ossl_inline void asn1_type_init_oct(ASN1_OCTET_STRING *oct,
     oct->flags = 0;
 }
 
+/*
+ * This function copies 'anum' to 'num' and the data of 'oct' to 'data'.
+ * If the length of 'data' > 'max_len', copies only the first 'max_len'
+ * bytes, but returns the full length of 'oct'; this allows distinguishing
+ * whether all the data was copied.
+ */
 static int asn1_type_get_int_oct(ASN1_OCTET_STRING *oct, int32_t anum,
-                                 long *num, unsigned char *data, int max_len)
+    long *num, unsigned char *data, int max_len)
 {
     int ret = ASN1_STRING_length(oct), n;
 
@@ -85,14 +91,14 @@ typedef struct {
 } asn1_int_oct;
 
 ASN1_SEQUENCE(asn1_int_oct) = {
-        ASN1_EMBED(asn1_int_oct, num, INT32),
-        ASN1_SIMPLE(asn1_int_oct, oct, ASN1_OCTET_STRING)
+    ASN1_EMBED(asn1_int_oct, num, INT32),
+    ASN1_SIMPLE(asn1_int_oct, oct, ASN1_OCTET_STRING)
 } static_ASN1_SEQUENCE_END(asn1_int_oct)
 
-DECLARE_ASN1_ITEM(asn1_int_oct)
+    DECLARE_ASN1_ITEM(asn1_int_oct)
 
 int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data,
-                                  int len)
+    int len)
 {
     asn1_int_oct atmp;
     ASN1_OCTET_STRING oct;
@@ -106,8 +112,15 @@ int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num, unsigned char *data,
     return 0;
 }
 
+/*
+ * This function decodes an int-octet sequence and copies the integer to 'num'
+ * and the data of octet to 'data'.
+ * If the length of 'data' > 'max_len', copies only the first 'max_len'
+ * bytes, but returns the full length of 'oct'; this allows distinguishing
+ * whether all the data was copied.
+ */
 int ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *a, long *num,
-                                  unsigned char *data, int max_len)
+    unsigned char *data, int max_len)
 {
     asn1_int_oct *atmp = NULL;
     int ret = -1;
@@ -124,7 +137,7 @@ int ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *a, long *num,
     ret = asn1_type_get_int_oct(atmp->oct, atmp->num, num, data, max_len);
 
     if (ret == -1) {
- err:
+    err:
         ERR_raise(ERR_LIB_ASN1, ASN1_R_DATA_IS_WRONG);
     }
     M_ASN1_free_of(atmp, asn1_int_oct);
@@ -141,14 +154,14 @@ typedef struct {
  * Section 2. "Content-Authenticated Encryption Algorithms"
  */
 ASN1_SEQUENCE(asn1_oct_int) = {
-        ASN1_SIMPLE(asn1_oct_int, oct, ASN1_OCTET_STRING),
-        ASN1_EMBED(asn1_oct_int, num, INT32)
+    ASN1_SIMPLE(asn1_oct_int, oct, ASN1_OCTET_STRING),
+    ASN1_EMBED(asn1_oct_int, num, INT32)
 } static_ASN1_SEQUENCE_END(asn1_oct_int)
 
-DECLARE_ASN1_ITEM(asn1_oct_int)
+    DECLARE_ASN1_ITEM(asn1_oct_int)
 
 int ossl_asn1_type_set_octetstring_int(ASN1_TYPE *a, long num,
-                                       unsigned char *data, int len)
+    unsigned char *data, int len)
 {
     asn1_oct_int atmp;
     ASN1_OCTET_STRING oct;
@@ -162,8 +175,15 @@ int ossl_asn1_type_set_octetstring_int(ASN1_TYPE *a, long num,
     return 0;
 }
 
+/*
+ * This function decodes an octet-int sequence and copies the data of octet
+ * to 'data' and the integer to 'num'.
+ * If the length of 'data' > 'max_len', copies only the first 'max_len'
+ * bytes, but returns the full length of 'oct'; this allows distinguishing
+ * whether all the data was copied.
+ */
 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)
 {
     asn1_oct_int *atmp = NULL;
     int ret = -1;
@@ -179,7 +199,7 @@ int ossl_asn1_type_get_octetstring_int(const ASN1_TYPE *a, long *num,
     ret = asn1_type_get_int_oct(atmp->oct, atmp->num, num, data, max_len);
 
     if (ret == -1) {
- err:
+    err:
         ERR_raise(ERR_LIB_ASN1, ASN1_R_DATA_IS_WRONG);
     }
     M_ASN1_free_of(atmp, asn1_oct_int);
diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c
index 5b5dda4ce120a..b1fd3f9467c35 100644
--- a/crypto/asn1/f_int.c
+++ b/crypto/asn1/f_int.c
@@ -45,7 +45,7 @@ int i2a_ASN1_INTEGER(BIO *bp, const ASN1_INTEGER *a)
         }
     }
     return n;
- err:
+err:
     return -1;
 }
 
@@ -131,7 +131,7 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size)
     bs->length = num;
     bs->data = s;
     return 1;
- err:
+err:
     ERR_raise(ERR_LIB_ASN1, ASN1_R_SHORT_LINE);
     OPENSSL_free(s);
     return 0;
diff --git a/crypto/asn1/f_string.c b/crypto/asn1/f_string.c
index 7e4e5985149d5..9fb34f495e10e 100644
--- a/crypto/asn1/f_string.c
+++ b/crypto/asn1/f_string.c
@@ -39,7 +39,7 @@ int i2a_ASN1_STRING(BIO *bp, const ASN1_STRING *a, int type)
         }
     }
     return n;
- err:
+err:
     return -1;
 }
 
@@ -125,7 +125,7 @@ int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
     bs->data = s;
     return 1;
 
- err:
+err:
     ERR_raise(ERR_LIB_ASN1, ASN1_R_SHORT_LINE);
     OPENSSL_free(s);
     return 0;
diff --git a/crypto/asn1/i2d_evp.c b/crypto/asn1/i2d_evp.c
index 106ea152733c5..92f7158cffd50 100644
--- a/crypto/asn1/i2d_evp.c
+++ b/crypto/asn1/i2d_evp.c
@@ -19,9 +19,9 @@
 #include <openssl/encoder.h>
 #include <openssl/buffer.h>
 #include <openssl/x509.h>
-#include <openssl/rsa.h>         /* For i2d_RSAPublicKey */
-#include <openssl/dsa.h>         /* For i2d_DSAPublicKey */
-#include <openssl/ec.h>          /* For i2o_ECPublicKey */
+#include <openssl/rsa.h> /* For i2d_RSAPublicKey */
+#include <openssl/dsa.h> /* For i2d_DSAPublicKey */
+#include <openssl/ec.h> /* For i2o_ECPublicKey */
 #include "crypto/asn1.h"
 #include "crypto/evp.h"
 
@@ -31,14 +31,14 @@ struct type_and_structure_st {
 };
 
 static int i2d_provided(const EVP_PKEY *a, int selection,
-                        const struct type_and_structure_st *output_info,
-                        unsigned char **pp)
+    const struct type_and_structure_st *output_info,
+    unsigned char **pp)
 {
     int ret;
 
     for (ret = -1;
-         ret == -1 && output_info->output_type != NULL;
-         output_info++) {
+        ret == -1 && output_info->output_type != NULL;
+        output_info++) {
         /*
          * The i2d_ calls don't take a boundary length for *pp.  However,
          * OSSL_ENCODER_to_data() needs one, so we make one up.  Because
@@ -51,9 +51,9 @@ static int i2d_provided(const EVP_PKEY *a, int selection,
         OSSL_ENCODER_CTX *ctx;
 
         ctx = OSSL_ENCODER_CTX_new_for_pkey(a, selection,
-                                            output_info->output_type,
-                                            output_info->output_structure,
-                                            NULL);
+            output_info->output_type,
+            output_info->output_structure,
+            NULL);
         if (ctx == NULL)
             return -1;
         if (OSSL_ENCODER_to_data(ctx, pp, &len)) {
@@ -75,7 +75,9 @@ int i2d_KeyParams(const EVP_PKEY *a, unsigned char **pp)
     if (evp_pkey_is_provided(a)) {
         static const struct type_and_structure_st output_info[] = {
             { "DER", "type-specific" },
-            { NULL, }
+            {
+                NULL,
+            }
         };
 
         return i2d_provided(a, EVP_PKEY_KEY_PARAMETERS, output_info, pp);
@@ -97,7 +99,9 @@ int i2d_PrivateKey(const EVP_PKEY *a, unsigned char **pp)
         static const struct type_and_structure_st output_info[] = {
             { "DER", "type-specific" },
             { "DER", "PrivateKeyInfo" },
-            { NULL, }
+            {
+                NULL,
+            }
         };
 
         return i2d_provided(a, EVP_PKEY_KEYPAIR, output_info, pp);
@@ -124,8 +128,10 @@ int i2d_PublicKey(const EVP_PKEY *a, unsigned char **pp)
     if (evp_pkey_is_provided(a)) {
         static const struct type_and_structure_st output_info[] = {
             { "DER", "type-specific" },
-            { "blob", NULL },    /* for EC */
-            { NULL, }
+            { "blob", NULL }, /* for EC */
+            {
+                NULL,
+            }
         };
 
         return i2d_provided(a, EVP_PKEY_PUBLIC_KEY, output_info, pp);
diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c
index eb0918f79f972..7b70d6c7a0cf0 100644
--- a/crypto/asn1/n_pkey.c
+++ b/crypto/asn1/n_pkey.c
@@ -16,11 +16,11 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
-#define ASN1_BROKEN_SEQUENCE(tname) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_BROKEN, 0, 0, 0, 0}; \
-        ASN1_SEQUENCE(tname)
+#define ASN1_BROKEN_SEQUENCE(tname)                                             \
+    static const ASN1_AUX tname##_aux = { NULL, ASN1_AFLG_BROKEN, 0, 0, 0, 0 }; \
+    ASN1_SEQUENCE(tname)
 #define static_ASN1_BROKEN_SEQUENCE_END(stname) \
-        static_ASN1_SEQUENCE_END_ref(stname, stname)
+    static_ASN1_SEQUENCE_END_ref(stname, stname)
 
 typedef struct netscape_pkey_st {
     int32_t version;
@@ -37,22 +37,21 @@ typedef struct netscape_encrypted_pkey_st {
     X509_SIG *enckey;
 } NETSCAPE_ENCRYPTED_PKEY;
 
-
 ASN1_BROKEN_SEQUENCE(NETSCAPE_ENCRYPTED_PKEY) = {
-        ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, os, ASN1_OCTET_STRING),
-        ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, enckey, X509_SIG)
+    ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, os, ASN1_OCTET_STRING),
+    ASN1_SIMPLE(NETSCAPE_ENCRYPTED_PKEY, enckey, X509_SIG)
 } static_ASN1_BROKEN_SEQUENCE_END(NETSCAPE_ENCRYPTED_PKEY)
 
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_ENCRYPTED_PKEY)
+    DECLARE_ASN1_FUNCTIONS(NETSCAPE_ENCRYPTED_PKEY)
 DECLARE_ASN1_ENCODE_FUNCTIONS_name(NETSCAPE_ENCRYPTED_PKEY, NETSCAPE_ENCRYPTED_PKEY)
 IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_ENCRYPTED_PKEY)
 
 ASN1_SEQUENCE(NETSCAPE_PKEY) = {
-        ASN1_EMBED(NETSCAPE_PKEY, version, INT32),
-        ASN1_SIMPLE(NETSCAPE_PKEY, algor, X509_ALGOR),
-        ASN1_SIMPLE(NETSCAPE_PKEY, private_key, ASN1_OCTET_STRING)
+    ASN1_EMBED(NETSCAPE_PKEY, version, INT32),
+    ASN1_SIMPLE(NETSCAPE_PKEY, algor, X509_ALGOR),
+    ASN1_SIMPLE(NETSCAPE_PKEY, private_key, ASN1_OCTET_STRING)
 } static_ASN1_SEQUENCE_END(NETSCAPE_PKEY)
 
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_PKEY)
+    DECLARE_ASN1_FUNCTIONS(NETSCAPE_PKEY)
 DECLARE_ASN1_ENCODE_FUNCTIONS_name(NETSCAPE_PKEY, NETSCAPE_PKEY)
 IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_PKEY)
diff --git a/crypto/asn1/nsseq.c b/crypto/asn1/nsseq.c
index 09dc24f25f8da..1b36531941813 100644
--- a/crypto/asn1/nsseq.c
+++ b/crypto/asn1/nsseq.c
@@ -14,7 +14,7 @@
 #include <openssl/objects.h>
 
 static int nsseq_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                    void *exarg)
+    void *exarg)
 {
     if (operation == ASN1_OP_NEW_POST) {
         NETSCAPE_CERT_SEQUENCE *nsseq;
@@ -27,8 +27,8 @@ static int nsseq_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 /* Netscape certificate sequence structure */
 
 ASN1_SEQUENCE_cb(NETSCAPE_CERT_SEQUENCE, nsseq_cb) = {
-        ASN1_SIMPLE(NETSCAPE_CERT_SEQUENCE, type, ASN1_OBJECT),
-        ASN1_EXP_SEQUENCE_OF_OPT(NETSCAPE_CERT_SEQUENCE, certs, X509, 0)
+    ASN1_SIMPLE(NETSCAPE_CERT_SEQUENCE, type, ASN1_OBJECT),
+    ASN1_EXP_SEQUENCE_OF_OPT(NETSCAPE_CERT_SEQUENCE, certs, X509, 0)
 } ASN1_SEQUENCE_END_cb(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
 
 IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_CERT_SEQUENCE)
diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c
index a90c200d42a5e..11782cd315605 100644
--- a/crypto/asn1/p5_pbe.c
+++ b/crypto/asn1/p5_pbe.c
@@ -17,8 +17,8 @@
 /* PKCS#5 password based encryption structure */
 
 ASN1_SEQUENCE(PBEPARAM) = {
-        ASN1_SIMPLE(PBEPARAM, salt, ASN1_OCTET_STRING),
-        ASN1_SIMPLE(PBEPARAM, iter, ASN1_INTEGER)
+    ASN1_SIMPLE(PBEPARAM, salt, ASN1_OCTET_STRING),
+    ASN1_SIMPLE(PBEPARAM, iter, ASN1_INTEGER)
 } ASN1_SEQUENCE_END(PBEPARAM)
 
 IMPLEMENT_ASN1_FUNCTIONS(PBEPARAM)
@@ -26,8 +26,8 @@ IMPLEMENT_ASN1_FUNCTIONS(PBEPARAM)
 /* Set an algorithm identifier for a PKCS#5 PBE algorithm */
 
 int PKCS5_pbe_set0_algor_ex(X509_ALGOR *algor, int alg, int iter,
-                            const unsigned char *salt, int saltlen,
-                            OSSL_LIB_CTX *ctx)
+    const unsigned char *salt, int saltlen,
+    OSSL_LIB_CTX *ctx)
 {
     PBEPARAM *pbe = NULL;
     ASN1_STRING *pbe_str = NULL;
@@ -72,7 +72,7 @@ int PKCS5_pbe_set0_algor_ex(X509_ALGOR *algor, int alg, int iter,
     if (X509_ALGOR_set0(algor, OBJ_nid2obj(alg), V_ASN1_SEQUENCE, pbe_str))
         return 1;
 
- err:
+err:
     OPENSSL_free(sstr);
     PBEPARAM_free(pbe);
     ASN1_STRING_free(pbe_str);
@@ -80,7 +80,7 @@ int PKCS5_pbe_set0_algor_ex(X509_ALGOR *algor, int alg, int iter,
 }
 
 int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
-                         const unsigned char *salt, int saltlen)
+    const unsigned char *salt, int saltlen)
 {
     return PKCS5_pbe_set0_algor_ex(algor, alg, iter, salt, saltlen, NULL);
 }
@@ -88,8 +88,8 @@ int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
 /* Return an algorithm identifier for a PKCS#5 PBE algorithm */
 
 X509_ALGOR *PKCS5_pbe_set_ex(int alg, int iter,
-                             const unsigned char *salt, int saltlen,
-                             OSSL_LIB_CTX *ctx)
+    const unsigned char *salt, int saltlen,
+    OSSL_LIB_CTX *ctx)
 {
     X509_ALGOR *ret;
     ret = X509_ALGOR_new();
@@ -106,8 +106,7 @@ X509_ALGOR *PKCS5_pbe_set_ex(int alg, int iter,
 }
 
 X509_ALGOR *PKCS5_pbe_set(int alg, int iter,
-                          const unsigned char *salt, int saltlen)
+    const unsigned char *salt, int saltlen)
 {
     return PKCS5_pbe_set_ex(alg, iter, salt, saltlen, NULL);
 }
-
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c
index b9ad4db4a79a6..468e9fc769d49 100644
--- a/crypto/asn1/p5_pbev2.c
+++ b/crypto/asn1/p5_pbev2.c
@@ -20,17 +20,17 @@
 /* PKCS#5 v2.0 password based encryption structures */
 
 ASN1_SEQUENCE(PBE2PARAM) = {
-        ASN1_SIMPLE(PBE2PARAM, keyfunc, X509_ALGOR),
-        ASN1_SIMPLE(PBE2PARAM, encryption, X509_ALGOR)
+    ASN1_SIMPLE(PBE2PARAM, keyfunc, X509_ALGOR),
+    ASN1_SIMPLE(PBE2PARAM, encryption, X509_ALGOR)
 } ASN1_SEQUENCE_END(PBE2PARAM)
 
 IMPLEMENT_ASN1_FUNCTIONS(PBE2PARAM)
 
 ASN1_SEQUENCE(PBKDF2PARAM) = {
-        ASN1_SIMPLE(PBKDF2PARAM, salt, ASN1_ANY),
-        ASN1_SIMPLE(PBKDF2PARAM, iter, ASN1_INTEGER),
-        ASN1_OPT(PBKDF2PARAM, keylength, ASN1_INTEGER),
-        ASN1_OPT(PBKDF2PARAM, prf, X509_ALGOR)
+    ASN1_SIMPLE(PBKDF2PARAM, salt, ASN1_ANY),
+    ASN1_SIMPLE(PBKDF2PARAM, iter, ASN1_INTEGER),
+    ASN1_OPT(PBKDF2PARAM, keylength, ASN1_INTEGER),
+    ASN1_OPT(PBKDF2PARAM, prf, X509_ALGOR)
 } ASN1_SEQUENCE_END(PBKDF2PARAM)
 
 IMPLEMENT_ASN1_FUNCTIONS(PBKDF2PARAM)
@@ -49,9 +49,9 @@ IMPLEMENT_ASN1_FUNCTIONS(PBMAC1PARAM)
  */
 
 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)
 {
     X509_ALGOR *scheme = NULL, *ret = NULL;
     int alg_nid, keylen, ivlen;
@@ -105,8 +105,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
      * here: just means use default PRF.
      */
     ERR_set_mark();
-    if ((prf_nid == -1) &&
-        EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PBE_PRF_NID, 0, &prf_nid) <= 0) {
+    if ((prf_nid == -1) && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PBE_PRF_NID, 0, &prf_nid) <= 0) {
         prf_nid = NID_hmacWithSHA256;
     }
     ERR_pop_to_mark();
@@ -125,7 +124,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
     X509_ALGOR_free(pbe2->keyfunc);
 
     pbe2->keyfunc = PKCS5_pbkdf2_set_ex(iter, salt, saltlen, prf_nid, keylen,
-                                        libctx);
+        libctx);
 
     if (pbe2->keyfunc == NULL) {
         ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
@@ -144,7 +143,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
     /* Encode PBE2PARAM into parameter */
 
     if (!ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(PBE2PARAM), pbe2,
-                                 &ret->parameter)) {
+            &ret->parameter)) {
         ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
         goto err;
     }
@@ -154,7 +153,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
 
     return ret;
 
- err:
+err:
     EVP_CIPHER_CTX_free(ctx);
     PBE2PARAM_free(pbe2);
     /* Note 'scheme' is freed as part of pbe2 */
@@ -164,24 +163,23 @@ X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
 }
 
 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)
 {
     return PKCS5_pbe2_set_iv_ex(cipher, iter, salt, saltlen, aiv, prf_nid,
-                                NULL);
+        NULL);
 }
 
 X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
-                           unsigned char *salt, int saltlen)
+    unsigned char *salt, int saltlen)
 {
     return PKCS5_pbe2_set_iv_ex(cipher, iter, salt, saltlen, NULL, -1,
-                                NULL);
+        NULL);
 }
 
-
 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)
 {
     X509_ALGOR *keyfunc = NULL;
     PBKDF2PARAM *kdf = NULL;
@@ -208,7 +206,6 @@ X509_ALGOR *PKCS5_pbkdf2_set_ex(int iter, unsigned char *salt, int saltlen,
     if ((osalt->data = OPENSSL_malloc(saltlen)) == NULL)
         goto err;
 
-
     osalt->length = saltlen;
 
     if (salt) {
@@ -261,7 +258,7 @@ X509_ALGOR *PKCS5_pbkdf2_set_ex(int iter, unsigned char *salt, int saltlen,
     /* Encode PBKDF2PARAM into parameter of pbe2 */
 
     if (!ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(PBKDF2PARAM), kdf,
-                                 &keyfunc->parameter)) {
+            &keyfunc->parameter)) {
         ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
         goto err;
     }
@@ -269,15 +266,14 @@ X509_ALGOR *PKCS5_pbkdf2_set_ex(int iter, unsigned char *salt, int saltlen,
     PBKDF2PARAM_free(kdf);
     return keyfunc;
 
- err:
+err:
     PBKDF2PARAM_free(kdf);
     X509_ALGOR_free(keyfunc);
     return NULL;
 }
 
 X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
-                             int prf_nid, int keylen)
+    int prf_nid, int keylen)
 {
     return PKCS5_pbkdf2_set_ex(iter, salt, saltlen, prf_nid, keylen, NULL);
 }
-
diff --git a/crypto/asn1/p5_scrypt.c b/crypto/asn1/p5_scrypt.c
index 4f3dcecd41ab8..b6d7eee3c95e8 100644
--- a/crypto/asn1/p5_scrypt.c
+++ b/crypto/asn1/p5_scrypt.c
@@ -21,27 +21,27 @@
 /* PKCS#5 scrypt password based encryption structures */
 
 ASN1_SEQUENCE(SCRYPT_PARAMS) = {
-        ASN1_SIMPLE(SCRYPT_PARAMS, salt, ASN1_OCTET_STRING),
-        ASN1_SIMPLE(SCRYPT_PARAMS, costParameter, ASN1_INTEGER),
-        ASN1_SIMPLE(SCRYPT_PARAMS, blockSize, ASN1_INTEGER),
-        ASN1_SIMPLE(SCRYPT_PARAMS, parallelizationParameter, ASN1_INTEGER),
-        ASN1_OPT(SCRYPT_PARAMS, keyLength, ASN1_INTEGER),
+    ASN1_SIMPLE(SCRYPT_PARAMS, salt, ASN1_OCTET_STRING),
+    ASN1_SIMPLE(SCRYPT_PARAMS, costParameter, ASN1_INTEGER),
+    ASN1_SIMPLE(SCRYPT_PARAMS, blockSize, ASN1_INTEGER),
+    ASN1_SIMPLE(SCRYPT_PARAMS, parallelizationParameter, ASN1_INTEGER),
+    ASN1_OPT(SCRYPT_PARAMS, keyLength, ASN1_INTEGER),
 } ASN1_SEQUENCE_END(SCRYPT_PARAMS)
 
 IMPLEMENT_ASN1_FUNCTIONS(SCRYPT_PARAMS)
 
 static X509_ALGOR *pkcs5_scrypt_set(const unsigned char *salt, size_t saltlen,
-                                    size_t keylen, uint64_t N, uint64_t r,
-                                    uint64_t p);
+    size_t keylen, uint64_t N, uint64_t r,
+    uint64_t p);
 
 /*
  * Return an algorithm identifier for a PKCS#5 v2.0 PBE algorithm using 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)
 {
     X509_ALGOR *scheme = NULL, *ret = NULL;
     int alg_nid;
@@ -135,7 +135,8 @@ X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
     /* Encode PBE2PARAM into parameter */
 
     if (ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(PBE2PARAM), pbe2,
-                                &ret->parameter) == NULL) {
+            &ret->parameter)
+        == NULL) {
         ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
         goto err;
     }
@@ -145,7 +146,7 @@ X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
 
     return ret;
 
- err:
+err:
     PBE2PARAM_free(pbe2);
     X509_ALGOR_free(ret);
     EVP_CIPHER_CTX_free(ctx);
@@ -154,8 +155,8 @@ X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
 }
 
 static X509_ALGOR *pkcs5_scrypt_set(const unsigned char *salt, size_t saltlen,
-                                    size_t keylen, uint64_t N, uint64_t r,
-                                    uint64_t p)
+    size_t keylen, uint64_t N, uint64_t r,
+    uint64_t p)
 {
     X509_ALGOR *keyfunc = NULL;
     SCRYPT_PARAMS *sparam = SCRYPT_PARAMS_new();
@@ -219,7 +220,8 @@ static X509_ALGOR *pkcs5_scrypt_set(const unsigned char *salt, size_t saltlen,
     /* Encode SCRYPT_PARAMS into parameter of pbe2 */
 
     if (ASN1_TYPE_pack_sequence(ASN1_ITEM_rptr(SCRYPT_PARAMS), sparam,
-                                &keyfunc->parameter) == NULL) {
+            &keyfunc->parameter)
+        == NULL) {
         ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
         goto err;
     }
@@ -227,16 +229,16 @@ static X509_ALGOR *pkcs5_scrypt_set(const unsigned char *salt, size_t saltlen,
     SCRYPT_PARAMS_free(sparam);
     return keyfunc;
 
- err:
+err:
     SCRYPT_PARAMS_free(sparam);
     X509_ALGOR_free(keyfunc);
     return NULL;
 }
 
 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)
 {
     unsigned char *salt, key[EVP_MAX_KEY_LENGTH];
     uint64_t p, r, N;
@@ -281,7 +283,8 @@ int PKCS5_v2_scrypt_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
         || ASN1_INTEGER_get_uint64(&r, sparam->blockSize) == 0
         || ASN1_INTEGER_get_uint64(&p, sparam->parallelizationParameter) == 0
         || EVP_PBE_scrypt_ex(NULL, 0, NULL, 0, N, r, p, 0, NULL, 0,
-                             libctx, propq) == 0) {
+               libctx, propq)
+            == 0) {
         ERR_raise(ERR_LIB_EVP, EVP_R_ILLEGAL_SCRYPT_PARAMETERS);
         goto err;
     }
@@ -291,10 +294,11 @@ int PKCS5_v2_scrypt_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
     salt = sparam->salt->data;
     saltlen = sparam->salt->length;
     if (EVP_PBE_scrypt_ex(pass, passlen, salt, saltlen, N, r, p, 0, key,
-                          keylen, libctx, propq) == 0)
+            keylen, libctx, propq)
+        == 0)
         goto err;
     rv = EVP_CipherInit_ex(ctx, NULL, NULL, key, NULL, en_de);
- err:
+err:
     if (keylen)
         OPENSSL_cleanse(key, keylen);
     SCRYPT_PARAMS_free(sparam);
@@ -302,8 +306,8 @@ int PKCS5_v2_scrypt_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
 }
 
 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)
 {
     return PKCS5_v2_scrypt_keyivgen_ex(ctx, pass, passlen, param, c, md, en_de, NULL, NULL);
 }
diff --git a/crypto/asn1/p8_pkey.c b/crypto/asn1/p8_pkey.c
index dee188519c22c..143f503dea344 100644
--- a/crypto/asn1/p8_pkey.c
+++ b/crypto/asn1/p8_pkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-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
@@ -15,31 +15,49 @@
 
 /* Minor tweak to operation: zero private key data */
 static int pkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                   void *exarg)
+    void *exarg)
 {
-    /* Since the structure must still be valid use ASN1_OP_FREE_PRE */
-    if (operation == ASN1_OP_FREE_PRE) {
-        PKCS8_PRIV_KEY_INFO *key = (PKCS8_PRIV_KEY_INFO *)*pval;
+    PKCS8_PRIV_KEY_INFO *key;
+    int version;
+
+    switch (operation) {
+    case ASN1_OP_FREE_PRE:
+        /* The structure is still valid during ASN1_OP_FREE_PRE */
+        key = (PKCS8_PRIV_KEY_INFO *)*pval;
         if (key->pkey)
             OPENSSL_cleanse(key->pkey->data, key->pkey->length);
+        break;
+    case ASN1_OP_D2I_POST:
+        /* Insist on a valid version now that the structure is decoded */
+        key = (PKCS8_PRIV_KEY_INFO *)*pval;
+        version = ASN1_INTEGER_get(key->version);
+        if (version < 0 || version > 1)
+            return 0;
+        if (version == 0 && key->kpub != NULL)
+            return 0;
+        break;
     }
     return 1;
 }
 
 ASN1_SEQUENCE_cb(PKCS8_PRIV_KEY_INFO, pkey_cb) = {
-        ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, version, ASN1_INTEGER),
-        ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, pkeyalg, X509_ALGOR),
-        ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, pkey, ASN1_OCTET_STRING),
-        ASN1_IMP_SET_OF_OPT(PKCS8_PRIV_KEY_INFO, attributes, X509_ATTRIBUTE, 0)
+    ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, version, ASN1_INTEGER),
+    ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, pkeyalg, X509_ALGOR),
+    ASN1_SIMPLE(PKCS8_PRIV_KEY_INFO, pkey, ASN1_OCTET_STRING),
+    ASN1_IMP_SET_OF_OPT(PKCS8_PRIV_KEY_INFO, attributes, X509_ATTRIBUTE, 0),
+    ASN1_IMP_OPT(PKCS8_PRIV_KEY_INFO, kpub, ASN1_BIT_STRING, 1)
 } ASN1_SEQUENCE_END_cb(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO)
 
 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)
 {
     if (version >= 0) {
+        /* We only support PKCS#8 v1 (0) and v2 (1). */
+        if (version > 1)
+            return 0;
         if (!ASN1_INTEGER_set(priv->version, version))
             return 0;
     }
@@ -51,8 +69,8 @@ int PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj,
 }
 
 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)
 {
     if (ppkalg)
         *ppkalg = p8->pkeyalg->algorithm;
@@ -72,7 +90,7 @@ PKCS8_pkey_get0_attrs(const PKCS8_PRIV_KEY_INFO *p8)
 }
 
 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)
 {
     if (X509at_add1_attr_by_NID(&p8->attributes, nid, type, bytes, len) != NULL)
         return 1;
@@ -80,7 +98,7 @@ int PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type,
 }
 
 int PKCS8_pkey_add1_attr_by_OBJ(PKCS8_PRIV_KEY_INFO *p8, const ASN1_OBJECT *obj, int type,
-                                const unsigned char *bytes, int len)
+    const unsigned char *bytes, int len)
 {
     return (X509at_add1_attr_by_OBJ(&p8->attributes, obj, type, bytes, len) != NULL);
 }
diff --git a/crypto/asn1/t_bitst.c b/crypto/asn1/t_bitst.c
index e7b817f78e15d..a02df91fc2e88 100644
--- a/crypto/asn1/t_bitst.c
+++ b/crypto/asn1/t_bitst.c
@@ -13,7 +13,7 @@
 #include <openssl/x509v3.h>
 
 int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,
-                               BIT_STRING_BITNAME *tbl, int indent)
+    BIT_STRING_BITNAME *tbl, int indent)
 {
     BIT_STRING_BITNAME *bnam;
     char first = 1;
@@ -31,7 +31,7 @@ int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,
 }
 
 int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, const char *name, int value,
-                            BIT_STRING_BITNAME *tbl)
+    BIT_STRING_BITNAME *tbl)
 {
     int bitnum;
     bitnum = ASN1_BIT_STRING_num_asc(name, tbl);
diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c
index 03579c877cfc0..45becc58d09b6 100644
--- a/crypto/asn1/t_pkey.c
+++ b/crypto/asn1/t_pkey.c
@@ -14,7 +14,7 @@
 #include "crypto/bn.h"
 
 /* Number of octets per line */
-#define ASN1_BUF_PRINT_WIDTH    15
+#define ASN1_BUF_PRINT_WIDTH 15
 /* Maximum indent */
 #define ASN1_PRINT_MAX_INDENT 128
 
@@ -34,8 +34,9 @@ int ASN1_buf_print(BIO *bp, const unsigned char *buf, size_t buflen, int indent)
          * this function is used to print out key components.
          */
         if (BIO_printf(bp, "%02x%s", buf[i],
-                       (i == buflen - 1) ? "" : ":") <= 0)
-                return 0;
+                (i == buflen - 1) ? "" : ":")
+            <= 0)
+            return 0;
     }
     if (BIO_write(bp, "\n", 1) <= 0)
         return 0;
@@ -43,7 +44,7 @@ int ASN1_buf_print(BIO *bp, const unsigned char *buf, size_t buflen, int indent)
 }
 
 int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
-                  unsigned char *ign, int indent)
+    unsigned char *ign, int indent)
 {
     int n, rv = 0;
     const char *neg;
@@ -63,8 +64,9 @@ int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
 
     if (BN_num_bytes(num) <= BN_BYTES) {
         if (BIO_printf(bp, "%s %s%lu (%s0x%lx)\n", number, neg,
-                       (unsigned long)bn_get_words(num)[0], neg,
-                       (unsigned long)bn_get_words(num)[0]) <= 0)
+                (unsigned long)bn_get_words(num)[0], neg,
+                (unsigned long)bn_get_words(num)[0])
+            <= 0)
             return 0;
         return 1;
     }
@@ -75,7 +77,8 @@ int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
         goto err;
     buf[0] = 0;
     if (BIO_printf(bp, "%s%s\n", number,
-                   (neg[0] == '-') ? " (Negative)" : "") <= 0)
+            (neg[0] == '-') ? " (Negative)" : "")
+        <= 0)
         goto err;
     n = BN_bn2bin(num, buf + 1);
 
@@ -87,7 +90,7 @@ int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
     if (ASN1_buf_print(bp, tmp, n, indent + 4) == 0)
         goto err;
     rv = 1;
-    err:
+err:
     OPENSSL_clear_free(buf, buflen);
     return rv;
 }
diff --git a/crypto/asn1/t_spki.c b/crypto/asn1/t_spki.c
index 0397f1f9ee508..c0c647a0e526e 100644
--- a/crypto/asn1/t_spki.c
+++ b/crypto/asn1/t_spki.c
@@ -28,7 +28,7 @@ int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki)
     X509_PUBKEY_get0_param(&spkioid, NULL, NULL, NULL, spki->spkac->pubkey);
     i = OBJ_obj2nid(spkioid);
     BIO_printf(out, "  Public Key Algorithm: %s\n",
-               (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
+        (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
     pkey = X509_PUBKEY_get(spki->spkac->pubkey);
     if (pkey == NULL)
         BIO_printf(out, "  Unable to load public key\n");
@@ -41,7 +41,7 @@ int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki)
         BIO_printf(out, "  Challenge String: %.*s\n", chal->length, chal->data);
     i = OBJ_obj2nid(spki->sig_algor.algorithm);
     BIO_printf(out, "  Signature Algorithm: %s",
-               (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
+        (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
 
     n = spki->signature->length;
     s = (char *)spki->signature->data;
@@ -49,7 +49,7 @@ int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki)
         if ((i % 18) == 0)
             BIO_write(out, "\n      ", 7);
         BIO_printf(out, "%02x%s", (unsigned char)s[i],
-                   ((i + 1) == n) ? "" : ":");
+            ((i + 1) == n) ? "" : ":");
     }
     BIO_write(out, "\n", 1);
     return 1;
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index c4f9d61514eba..91c2e524f55b9 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -14,6 +14,7 @@
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 #include <openssl/err.h>
+#include "crypto/asn1.h"
 #include "internal/numbers.h"
 #include "asn1_local.h"
 
@@ -25,63 +26,80 @@
  */
 #define ASN1_MAX_CONSTRUCTED_NEST 30
 
-static 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);
-
 static int asn1_check_eoc(const unsigned char **in, long len);
 static int asn1_find_end(const unsigned char **in, long len, char inf);
 
 static int asn1_collect(BUF_MEM *buf, const unsigned char **in, long len,
-                        char inf, int tag, int aclass, int depth);
+    char inf, int tag, int aclass, int depth);
 
 static int collect_data(BUF_MEM *buf, const unsigned char **p, long plen);
 
 static int asn1_check_tlen(long *olen, int *otag, unsigned char *oclass,
-                           char *inf, char *cst,
-                           const unsigned char **in, long len,
-                           int exptag, int expclass, char opt, ASN1_TLC *ctx);
+    char *inf, char *cst,
+    const unsigned char **in, long len,
+    int exptag, int expclass, char opt, ASN1_TLC *ctx);
 
 static int asn1_template_ex_d2i(ASN1_VALUE **pval,
-                                const unsigned char **in, long len,
-                                const ASN1_TEMPLATE *tt, char opt,
-                                ASN1_TLC *ctx, int depth, OSSL_LIB_CTX *libctx,
-                                const char *propq);
+    const unsigned char **in, long len,
+    const ASN1_TEMPLATE *tt, char opt,
+    ASN1_TLC *ctx, int depth, OSSL_LIB_CTX *libctx,
+    const char *propq);
 static int asn1_template_noexp_d2i(ASN1_VALUE **val,
-                                   const unsigned char **in, long len,
-                                   const ASN1_TEMPLATE *tt, char opt,
-                                   ASN1_TLC *ctx, int depth,
-                                   OSSL_LIB_CTX *libctx, const char *propq);
+    const unsigned char **in, long len,
+    const ASN1_TEMPLATE *tt, char opt,
+    ASN1_TLC *ctx, int depth,
+    OSSL_LIB_CTX *libctx, const char *propq);
 static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
-                                 const unsigned char **in, long len,
-                                 const ASN1_ITEM *it,
-                                 int tag, int aclass, char opt,
-                                 ASN1_TLC *ctx);
+    const unsigned char **in, long len,
+    const ASN1_ITEM *it,
+    int tag, int aclass, char opt,
+    ASN1_TLC *ctx);
 static int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                       int utype, char *free_cont, const ASN1_ITEM *it);
+    int utype, char *free_cont, const ASN1_ITEM *it);
 
 /* Table to convert tags to bit values, used for MSTRING type */
 static const unsigned long tag2bit[32] = {
     /* tags  0 -  3 */
-    0, 0, 0, B_ASN1_BIT_STRING,
+    0,
+    0,
+    0,
+    B_ASN1_BIT_STRING,
     /* tags  4- 7 */
-    B_ASN1_OCTET_STRING, 0, 0, B_ASN1_UNKNOWN,
+    B_ASN1_OCTET_STRING,
+    0,
+    0,
+    B_ASN1_UNKNOWN,
     /* tags  8-11 */
-    B_ASN1_UNKNOWN, B_ASN1_UNKNOWN, 0, B_ASN1_UNKNOWN,
+    B_ASN1_UNKNOWN,
+    B_ASN1_UNKNOWN,
+    0,
+    B_ASN1_UNKNOWN,
     /* tags 12-15 */
-    B_ASN1_UTF8STRING, B_ASN1_UNKNOWN, B_ASN1_UNKNOWN, B_ASN1_UNKNOWN,
+    B_ASN1_UTF8STRING,
+    B_ASN1_UNKNOWN,
+    B_ASN1_UNKNOWN,
+    B_ASN1_UNKNOWN,
     /* tags 16-19 */
-    B_ASN1_SEQUENCE, 0, B_ASN1_NUMERICSTRING, B_ASN1_PRINTABLESTRING,
+    B_ASN1_SEQUENCE,
+    0,
+    B_ASN1_NUMERICSTRING,
+    B_ASN1_PRINTABLESTRING,
     /* tags 20-22 */
-    B_ASN1_T61STRING, B_ASN1_VIDEOTEXSTRING, B_ASN1_IA5STRING,
+    B_ASN1_T61STRING,
+    B_ASN1_VIDEOTEXSTRING,
+    B_ASN1_IA5STRING,
     /* tags 23-24 */
-    B_ASN1_UTCTIME, B_ASN1_GENERALIZEDTIME,
+    B_ASN1_UTCTIME,
+    B_ASN1_GENERALIZEDTIME,
     /* tags 25-27 */
-    B_ASN1_GRAPHICSTRING, B_ASN1_ISO64STRING, B_ASN1_GENERALSTRING,
+    B_ASN1_GRAPHICSTRING,
+    B_ASN1_ISO64STRING,
+    B_ASN1_GENERALSTRING,
     /* tags 28-31 */
-    B_ASN1_UNIVERSALSTRING, B_ASN1_UNKNOWN, B_ASN1_BMPSTRING, B_ASN1_UNKNOWN,
+    B_ASN1_UNIVERSALSTRING,
+    B_ASN1_UNKNOWN,
+    B_ASN1_BMPSTRING,
+    B_ASN1_UNKNOWN,
 };
 
 unsigned long ASN1_tag2bit(int tag)
@@ -93,9 +111,16 @@ unsigned long ASN1_tag2bit(int tag)
 
 /* Macro to initialize and invalidate the cache */
 
-#define asn1_tlc_clear(c)       do { if ((c) != NULL) (c)->valid = 0; } while (0)
+#define asn1_tlc_clear(c)   \
+    do {                    \
+        if ((c) != NULL)    \
+            (c)->valid = 0; \
+    } while (0)
 /* Version to avoid compiler warning about 'c' always non-NULL */
-#define asn1_tlc_clear_nc(c)    do {(c)->valid = 0; } while (0)
+#define asn1_tlc_clear_nc(c) \
+    do {                     \
+        (c)->valid = 0;      \
+    } while (0)
 
 /*
  * Decode an ASN1 item, this currently behaves just like a standard 'd2i'
@@ -105,9 +130,9 @@ unsigned long ASN1_tag2bit(int tag)
  */
 
 static int asn1_item_ex_d2i_intern(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)
+    long len, const ASN1_ITEM *it, int tag,
+    int aclass, char opt, ASN1_TLC *ctx,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     int rv;
 
@@ -116,24 +141,24 @@ static int asn1_item_ex_d2i_intern(ASN1_VALUE **pval, const unsigned char **in,
         return 0;
     }
     rv = asn1_item_embed_d2i(pval, in, len, it, tag, aclass, opt, ctx, 0,
-                             libctx, propq);
+        libctx, propq);
     if (rv <= 0)
         ASN1_item_ex_free(pval, it);
     return rv;
 }
 
 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)
 {
     return asn1_item_ex_d2i_intern(pval, in, len, it, tag, aclass, opt, ctx,
-                                   NULL, NULL);
+        NULL, NULL);
 }
 
 ASN1_VALUE *ASN1_item_d2i_ex(ASN1_VALUE **pval,
-                             const unsigned char **in, long len,
-                             const ASN1_ITEM *it, OSSL_LIB_CTX *libctx,
-                             const char *propq)
+    const unsigned char **in, long len,
+    const ASN1_ITEM *it, OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     ASN1_TLC c;
     ASN1_VALUE *ptmpval = NULL;
@@ -142,14 +167,15 @@ ASN1_VALUE *ASN1_item_d2i_ex(ASN1_VALUE **pval,
         pval = &ptmpval;
     asn1_tlc_clear_nc(&c);
     if (asn1_item_ex_d2i_intern(pval, in, len, it, -1, 0, 0, &c, libctx,
-                                propq) > 0)
+            propq)
+        > 0)
         return *pval;
     return NULL;
 }
 
 ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **pval,
-                          const unsigned char **in, long len,
-                          const ASN1_ITEM *it)
+    const unsigned char **in, long len,
+    const ASN1_ITEM *it)
 {
     return ASN1_item_d2i_ex(pval, in, len, it, NULL, NULL);
 }
@@ -159,11 +185,11 @@ ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **pval,
  * tag mismatch return -1 to handle OPTIONAL
  */
 
-static 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)
+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)
 {
     const ASN1_TEMPLATE *tt, *errtt = NULL;
     const ASN1_EXTERN_FUNCS *ef;
@@ -208,14 +234,14 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
              */
             if ((tag != -1) || opt) {
                 ERR_raise(ERR_LIB_ASN1,
-                          ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE);
+                    ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE);
                 goto err;
             }
             return asn1_template_ex_d2i(pval, in, len, it->templates, opt, ctx,
-                                        depth, libctx, propq);
+                depth, libctx, propq);
         }
         return asn1_d2i_ex_primitive(pval, in, len, it,
-                                     tag, aclass, opt, ctx);
+            tag, aclass, opt, ctx);
 
     case ASN1_ITYPE_MSTRING:
         /*
@@ -230,7 +256,7 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
         p = *in;
         /* Just read in tag and class */
         ret = asn1_check_tlen(NULL, &otag, &oclass, NULL, NULL,
-                              &p, len, -1, 0, 1, ctx);
+            &p, len, -1, 0, 1, ctx);
         if (!ret) {
             ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
             goto err;
@@ -260,7 +286,7 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
         ef = it->funcs;
         if (ef->asn1_ex_d2i_ex != NULL)
             return ef->asn1_ex_d2i_ex(pval, in, len, it, tag, aclass, opt, ctx,
-                                      libctx, propq);
+                libctx, propq);
         return ef->asn1_ex_d2i(pval, in, len, it, tag, aclass, opt, ctx);
 
     case ASN1_ITYPE_CHOICE:
@@ -296,7 +322,7 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
              * We mark field as OPTIONAL so its absence can be recognised.
              */
             ret = asn1_template_ex_d2i(pchptr, &p, len, tt, 1, ctx, depth,
-                                       libctx, propq);
+                libctx, propq);
             /* If field not present, try the next one */
             if (ret == -1)
                 continue;
@@ -344,7 +370,7 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
         }
         /* Get SEQUENCE length and update len, p */
         ret = asn1_check_tlen(&len, NULL, NULL, &seq_eoc, &cst,
-                              &p, len, tag, aclass, opt, ctx);
+            &p, len, tag, aclass, opt, ctx);
         if (!ret) {
             ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
             goto err;
@@ -363,7 +389,7 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
         }
 
         if (*pval == NULL
-                && !ossl_asn1_item_ex_new_intern(pval, it, libctx, propq)) {
+            && !ossl_asn1_item_ex_new_intern(pval, it, libctx, propq)) {
             ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
             goto err;
         }
@@ -420,7 +446,7 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
              */
 
             ret = asn1_template_ex_d2i(pseqval, &p, len, seqtt, isopt, ctx,
-                                       depth, libctx, propq);
+                depth, libctx, propq);
             if (!ret) {
                 errtt = seqtt;
                 goto err;
@@ -477,12 +503,12 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
     default:
         return 0;
     }
- auxerr:
+auxerr:
     ERR_raise(ERR_LIB_ASN1, ASN1_R_AUX_ERROR);
- err:
+err:
     if (errtt)
         ERR_add_error_data(4, "Field=", errtt->field_name,
-                           ", Type=", it->sname);
+            ", Type=", it->sname);
     else
         ERR_add_error_data(2, "Type=", it->sname);
     return 0;
@@ -494,10 +520,10 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
  */
 
 static int asn1_template_ex_d2i(ASN1_VALUE **val,
-                                const unsigned char **in, long inlen,
-                                const ASN1_TEMPLATE *tt, char opt,
-                                ASN1_TLC *ctx, int depth,
-                                OSSL_LIB_CTX *libctx, const char *propq)
+    const unsigned char **in, long inlen,
+    const ASN1_TEMPLATE *tt, char opt,
+    ASN1_TLC *ctx, int depth,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     int flags, aclass;
     int ret;
@@ -519,7 +545,7 @@ static int asn1_template_ex_d2i(ASN1_VALUE **val,
          * where it starts: so read in EXPLICIT header to get the info.
          */
         ret = asn1_check_tlen(&len, NULL, NULL, &exp_eoc, &cst,
-                              &p, inlen, tt->tag, aclass, opt, ctx);
+            &p, inlen, tt->tag, aclass, opt, ctx);
         q = p;
         if (!ret) {
             ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
@@ -532,7 +558,7 @@ static int asn1_template_ex_d2i(ASN1_VALUE **val,
         }
         /* We've found the field so it can't be OPTIONAL now */
         ret = asn1_template_noexp_d2i(val, &p, len, tt, 0, ctx, depth, libctx,
-                                      propq);
+            propq);
         if (!ret) {
             ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
             return 0;
@@ -556,20 +582,20 @@ static int asn1_template_ex_d2i(ASN1_VALUE **val,
         }
     } else
         return asn1_template_noexp_d2i(val, in, inlen, tt, opt, ctx, depth,
-                                       libctx, propq);
+            libctx, propq);
 
     *in = p;
     return 1;
 
- err:
+err:
     return 0;
 }
 
 static int asn1_template_noexp_d2i(ASN1_VALUE **val,
-                                   const unsigned char **in, long len,
-                                   const ASN1_TEMPLATE *tt, char opt,
-                                   ASN1_TLC *ctx, int depth,
-                                   OSSL_LIB_CTX *libctx, const char *propq)
+    const unsigned char **in, long len,
+    const ASN1_TEMPLATE *tt, char opt,
+    ASN1_TLC *ctx, int depth,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     int flags, aclass;
     int ret;
@@ -608,7 +634,7 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
         }
         /* Get the tag */
         ret = asn1_check_tlen(&len, NULL, NULL, &sk_eoc, NULL,
-                              &p, len, sktag, skaclass, opt, ctx);
+            &p, len, sktag, skaclass, opt, ctx);
         if (!ret) {
             ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
             return 0;
@@ -649,8 +675,9 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
             }
             skfield = NULL;
             if (asn1_item_embed_d2i(&skfield, &p, len,
-                                     ASN1_ITEM_ptr(tt->item), -1, 0, 0, ctx,
-                                     depth, libctx, propq) <= 0) {
+                    ASN1_ITEM_ptr(tt->item), -1, 0, 0, ctx,
+                    depth, libctx, propq)
+                <= 0) {
                 ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
                 /* |skfield| may be partially allocated despite failure. */
                 ASN1_item_free(skfield, ASN1_ITEM_ptr(tt->item));
@@ -670,8 +697,8 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
     } else if (flags & ASN1_TFLG_IMPTAG) {
         /* IMPLICIT tagging */
         ret = asn1_item_embed_d2i(val, &p, len,
-                                  ASN1_ITEM_ptr(tt->item), tt->tag, aclass, opt,
-                                  ctx, depth, libctx, propq);
+            ASN1_ITEM_ptr(tt->item), tt->tag, aclass, opt,
+            ctx, depth, libctx, propq);
         if (!ret) {
             ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
             goto err;
@@ -680,7 +707,7 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
     } else {
         /* Nothing special */
         ret = asn1_item_embed_d2i(val, &p, len, ASN1_ITEM_ptr(tt->item),
-                                  -1, 0, opt, ctx, depth, libctx, propq);
+            -1, 0, opt, ctx, depth, libctx, propq);
         if (!ret) {
             ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
             goto err;
@@ -691,14 +718,14 @@ static int asn1_template_noexp_d2i(ASN1_VALUE **val,
     *in = p;
     return 1;
 
- err:
+err:
     return 0;
 }
 
 static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
-                                 const unsigned char **in, long inlen,
-                                 const ASN1_ITEM *it,
-                                 int tag, int aclass, char opt, ASN1_TLC *ctx)
+    const unsigned char **in, long inlen,
+    const ASN1_ITEM *it,
+    int tag, int aclass, char opt, ASN1_TLC *ctx)
 {
     int ret = 0, utype;
     long plen;
@@ -710,7 +737,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
 
     if (pval == NULL) {
         ERR_raise(ERR_LIB_ASN1, ASN1_R_ILLEGAL_NULL);
-        return 0;               /* Should never happen */
+        return 0; /* Should never happen */
     }
 
     if (it->itype == ASN1_ITYPE_MSTRING) {
@@ -732,7 +759,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
         }
         p = *in;
         ret = asn1_check_tlen(NULL, &utype, &oclass, NULL, NULL,
-                              &p, inlen, -1, 0, 0, ctx);
+            &p, inlen, -1, 0, 0, ctx);
         if (!ret) {
             ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
             return 0;
@@ -747,7 +774,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
     p = *in;
     /* Check header */
     ret = asn1_check_tlen(&plen, NULL, NULL, &inf, &cst,
-                          &p, inlen, tag, aclass, opt, ctx);
+        &p, inlen, tag, aclass, opt, ctx);
     if (!ret) {
         ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
         return 0;
@@ -820,7 +847,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
 
     *in = p;
     ret = 1;
- err:
+err:
     if (free_cont)
         OPENSSL_free(buf.data);
     return ret;
@@ -829,7 +856,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
 /* Translate ASN1 content octets into a structure */
 
 static int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                       int utype, char *free_cont, const ASN1_ITEM *it)
+    int utype, char *free_cont, const ASN1_ITEM *it)
 {
     ASN1_VALUE **opval = NULL;
     ASN1_STRING *stmp;
@@ -960,7 +987,7 @@ static int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
         typ->value.ptr = NULL;
 
     ret = 1;
- err:
+err:
     if (!ret) {
         ASN1_TYPE_free(typ);
         if (opval)
@@ -1004,7 +1031,7 @@ static int asn1_find_end(const unsigned char **in, long len, char inf)
         q = p;
         /* Just read in a header: only care about the length */
         if (!asn1_check_tlen(&plen, NULL, NULL, &inf, NULL, &p, len,
-                             -1, 0, 0, NULL)) {
+                -1, 0, 0, NULL)) {
             ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
             return 0;
         }
@@ -1040,11 +1067,11 @@ static int asn1_find_end(const unsigned char **in, long len, char inf)
  * recursion is allowed at all. Although zero should be adequate examples
  * exist that require a value of 1. So 5 should be more than enough.
  */
-# define ASN1_MAX_STRING_NEST 5
+#define ASN1_MAX_STRING_NEST 5
 #endif
 
 static int asn1_collect(BUF_MEM *buf, const unsigned char **in, long len,
-                        char inf, int tag, int aclass, int depth)
+    char inf, int tag, int aclass, int depth)
 {
     const unsigned char *p, *q;
     long plen;
@@ -1075,7 +1102,7 @@ static int asn1_collect(BUF_MEM *buf, const unsigned char **in, long len,
         }
 
         if (!asn1_check_tlen(&plen, NULL, NULL, &ininf, &cst, &p,
-                             len, tag, aclass, 0, NULL)) {
+                len, tag, aclass, 0, NULL)) {
             ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
             return 0;
         }
@@ -1139,9 +1166,9 @@ static int asn1_check_eoc(const unsigned char **in, long len)
  */
 
 static int asn1_check_tlen(long *olen, int *otag, unsigned char *oclass,
-                           char *inf, char *cst,
-                           const unsigned char **in, long len,
-                           int exptag, int expclass, char opt, ASN1_TLC *ctx)
+    char *inf, char *cst,
+    const unsigned char **in, long len,
+    int exptag, int expclass, char opt, ASN1_TLC *ctx)
 {
     int i;
     int ptag, pclass;
@@ -1222,7 +1249,7 @@ static int asn1_check_tlen(long *olen, int *otag, unsigned char *oclass,
     *in = p;
     return 1;
 
- err:
+err:
     asn1_tlc_clear(ctx);
     return 0;
 }
diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
index dab5f9f278f3a..8dea9f3653926 100644
--- a/crypto/asn1/tasn_enc.c
+++ b/crypto/asn1/tasn_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-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
@@ -17,17 +17,17 @@
 #include "asn1_local.h"
 
 static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out,
-                                 const ASN1_ITEM *it, int tag, int aclass);
+    const ASN1_ITEM *it, int tag, int aclass);
 static int asn1_set_seq_out(STACK_OF(const_ASN1_VALUE) *sk,
-                            unsigned char **out,
-                            int skcontlen, const ASN1_ITEM *item,
-                            int do_sort, int iclass);
+    unsigned char **out,
+    int skcontlen, const ASN1_ITEM *item,
+    int do_sort, int iclass);
 static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
-                                const ASN1_TEMPLATE *tt, int tag, int aclass);
+    const ASN1_TEMPLATE *tt, int tag, int aclass);
 static int asn1_item_flags_i2d(const ASN1_VALUE *val, unsigned char **out,
-                               const ASN1_ITEM *it, int flags);
+    const ASN1_ITEM *it, int flags);
 static int asn1_ex_i2c(const ASN1_VALUE **pval, unsigned char *cout, int *putype,
-                       const ASN1_ITEM *it);
+    const ASN1_ITEM *it);
 
 /*
  * Top level i2d equivalents: the 'ndef' variant instructs the encoder to use
@@ -35,7 +35,7 @@ static int asn1_ex_i2c(const ASN1_VALUE **pval, unsigned char *cout, int *putype
  */
 
 int ASN1_item_ndef_i2d(const ASN1_VALUE *val, unsigned char **out,
-                       const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     return asn1_item_flags_i2d(val, out, it, ASN1_TFLG_NDEF);
 }
@@ -53,7 +53,7 @@ int ASN1_item_i2d(const ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *i
  */
 
 static int asn1_item_flags_i2d(const ASN1_VALUE *val, unsigned char **out,
-                               const ASN1_ITEM *it, int flags)
+    const ASN1_ITEM *it, int flags)
 {
     if (out != NULL && *out == NULL) {
         unsigned char *p, *buf;
@@ -79,7 +79,7 @@ static int asn1_item_flags_i2d(const ASN1_VALUE *val, unsigned char **out,
  */
 
 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)
 {
     const ASN1_TEMPLATE *tt = NULL;
     int i, seqcontlen, seqlen, ndef = 1;
@@ -92,7 +92,7 @@ int ASN1_item_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
 
     if (aux != NULL) {
         asn1_cb = ((aux->flags & ASN1_AFLG_CONST_CB) != 0) ? aux->asn1_const_cb
-            : (ASN1_aux_const_cb *)aux->asn1_cb; /* backward compatibility */
+                                                           : (ASN1_aux_const_cb *)aux->asn1_cb; /* backward compatibility */
     }
 
     switch (it->itype) {
@@ -100,7 +100,7 @@ int ASN1_item_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
     case ASN1_ITYPE_PRIMITIVE:
         if (it->templates)
             return asn1_template_ex_i2d(pval, out, it->templates,
-                                        tag, aclass);
+                tag, aclass);
         return asn1_i2d_ex_primitive(pval, out, it, tag, aclass);
 
     case ASN1_ITYPE_MSTRING:
@@ -206,13 +206,12 @@ int ASN1_item_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
 
     default:
         return 0;
-
     }
     return 0;
 }
 
 static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
-                                const ASN1_TEMPLATE *tt, int tag, int iclass)
+    const ASN1_TEMPLATE *tt, int tag, int iclass)
 {
     const int flags = tt->flags;
     int i, ret, ttag, tclass, ndef, len;
@@ -303,7 +302,7 @@ static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
         for (i = 0; i < sk_const_ASN1_VALUE_num(sk); i++) {
             skitem = sk_const_ASN1_VALUE_value(sk, i);
             len = ASN1_item_ex_i2d(&skitem, NULL, ASN1_ITEM_ptr(tt->item),
-                                   -1, iclass);
+                -1, iclass);
             if (len == -1 || (skcontlen > INT_MAX - len))
                 return -1;
             if (len == 0 && (tt->flags & ASN1_TFLG_OPTIONAL) == 0) {
@@ -332,7 +331,7 @@ static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
         ASN1_put_object(out, ndef, skcontlen, sktag, skaclass);
         /* And the stuff itself */
         asn1_set_seq_out(sk, out, skcontlen, ASN1_ITEM_ptr(tt->item),
-                         isset, iclass);
+            isset, iclass);
         if (ndef == 2) {
             ASN1_put_eoc(out);
             if (flags & ASN1_TFLG_EXPTAG)
@@ -367,7 +366,7 @@ static int asn1_template_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
 
     /* Either normal or IMPLICIT tagging: combine class and flags */
     len = ASN1_item_ex_i2d(pval, out, ASN1_ITEM_ptr(tt->item),
-                              ttag, tclass | iclass);
+        ttag, tclass | iclass);
     if (len == 0 && (tt->flags & ASN1_TFLG_OPTIONAL) == 0) {
         ERR_raise(ERR_LIB_ASN1, ASN1_R_ILLEGAL_ZERO_CONTENT);
         return -1;
@@ -397,9 +396,9 @@ static int der_cmp(const void *a, const void *b)
 /* Output the content octets of SET OF or SEQUENCE OF */
 
 static int asn1_set_seq_out(STACK_OF(const_ASN1_VALUE) *sk,
-                            unsigned char **out,
-                            int skcontlen, const ASN1_ITEM *item,
-                            int do_sort, int iclass)
+    unsigned char **out,
+    int skcontlen, const ASN1_ITEM *item,
+    int do_sort, int iclass)
 {
     int i, ret = 0;
     const ASN1_VALUE *skitem;
@@ -412,7 +411,7 @@ static int asn1_set_seq_out(STACK_OF(const_ASN1_VALUE) *sk,
             do_sort = 0;
         else {
             derlst = OPENSSL_malloc(sk_const_ASN1_VALUE_num(sk)
-                                    * sizeof(*derlst));
+                * sizeof(*derlst));
             if (derlst == NULL)
                 return 0;
             tmpdat = OPENSSL_malloc(skcontlen);
@@ -460,7 +459,7 @@ static int asn1_set_seq_out(STACK_OF(const_ASN1_VALUE) *sk,
 }
 
 static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out,
-                                 const ASN1_ITEM *it, int tag, int aclass)
+    const ASN1_ITEM *it, int tag, int aclass)
 {
     int len;
     int utype;
@@ -480,8 +479,7 @@ static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out,
      * octets so don't include tag+length. We need to check here because the
      * call to asn1_ex_i2c() could change utype.
      */
-    if ((utype == V_ASN1_SEQUENCE) || (utype == V_ASN1_SET) ||
-        (utype == V_ASN1_OTHER))
+    if ((utype == V_ASN1_SEQUENCE) || (utype == V_ASN1_SET) || (utype == V_ASN1_OTHER))
         usetag = 0;
     else
         usetag = 1;
@@ -520,7 +518,7 @@ static int asn1_i2d_ex_primitive(const ASN1_VALUE **pval, unsigned char **out,
 /* Produce content octets from a structure */
 
 static int asn1_ex_i2c(const ASN1_VALUE **pval, unsigned char *cout, int *putype,
-                       const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     ASN1_BOOLEAN *tbool = NULL;
     ASN1_STRING *strtmp;
@@ -565,6 +563,9 @@ static int asn1_ex_i2c(const ASN1_VALUE **pval, unsigned char *cout, int *putype
             return -1;
         break;
 
+    case V_ASN1_UNDEF:
+        return -2;
+
     case V_ASN1_NULL:
         cont = NULL;
         len = 0;
@@ -590,7 +591,7 @@ static int asn1_ex_i2c(const ASN1_VALUE **pval, unsigned char *cout, int *putype
 
     case V_ASN1_BIT_STRING:
         return ossl_i2c_ASN1_BIT_STRING((ASN1_BIT_STRING *)*pval,
-                                        cout ? &cout : NULL);
+            cout ? &cout : NULL);
 
     case V_ASN1_INTEGER:
     case V_ASN1_ENUMERATED:
@@ -632,7 +633,6 @@ static int asn1_ex_i2c(const ASN1_VALUE **pval, unsigned char *cout, int *putype
         len = strtmp->length;
 
         break;
-
     }
     if (cout && len)
         memcpy(cout, cont, len);
diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c
index 00a5397a5e6cf..721bb14b2acb9 100644
--- a/crypto/asn1/tasn_new.c
+++ b/crypto/asn1/tasn_new.c
@@ -16,13 +16,13 @@
 #include "asn1_local.h"
 
 static int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
-                               int embed, OSSL_LIB_CTX *libctx,
-                               const char *propq);
+    int embed, OSSL_LIB_CTX *libctx,
+    const char *propq);
 static int asn1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
-                              int embed);
+    int embed);
 static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it);
 static int asn1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt,
-                             OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 static void asn1_template_clear(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
 static void asn1_primitive_clear(ASN1_VALUE **pval, const ASN1_ITEM *it);
 
@@ -35,7 +35,7 @@ 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)
 {
     ASN1_VALUE *ret = NULL;
     if (asn1_item_embed_new(&ret, it, 0, libctx, propq) > 0)
@@ -45,9 +45,8 @@ ASN1_VALUE *ASN1_item_new_ex(const ASN1_ITEM *it, OSSL_LIB_CTX *libctx,
 
 /* Allocate an ASN1 structure */
 
-
 int ossl_asn1_item_ex_new_intern(ASN1_VALUE **pval, const ASN1_ITEM *it,
-                                 OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     return asn1_item_embed_new(pval, it, 0, libctx, propq);
 }
@@ -58,7 +57,7 @@ int ASN1_item_ex_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 }
 
 int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed,
-                        OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     const ASN1_TEMPLATE *tt = NULL;
     const ASN1_EXTERN_FUNCS *ef;
@@ -157,18 +156,17 @@ int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed,
     }
     return 1;
 
- asn1err2:
+asn1err2:
     ossl_asn1_item_embed_free(pval, it, embed);
- asn1err:
+asn1err:
     ERR_raise(ERR_LIB_ASN1, ERR_R_ASN1_LIB);
     return 0;
 
- auxerr2:
+auxerr2:
     ossl_asn1_item_embed_free(pval, it, embed);
- auxerr:
+auxerr:
     ERR_raise(ERR_LIB_ASN1, ASN1_R_AUX_ERROR);
     return 0;
-
 }
 
 static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
@@ -205,7 +203,7 @@ static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
 }
 
 static int asn1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt,
-                             OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     const ASN1_ITEM *it = ASN1_ITEM_ptr(tt->item);
     int embed = tt->flags & ASN1_TFLG_EMBED;
@@ -240,7 +238,7 @@ static int asn1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt,
     }
     /* Otherwise pass it back to the item routine */
     ret = asn1_item_embed_new(pval, it, embed, libctx, propq);
- done:
+done:
     return ret;
 }
 
@@ -259,7 +257,7 @@ static void asn1_template_clear(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
  */
 
 static int asn1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it,
-                              int embed)
+    int embed)
 {
     ASN1_TYPE *typ;
     ASN1_STRING *str;
diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c
index 73eadc5fd4f6b..080b5623e422f 100644
--- a/crypto/asn1/tasn_prn.c
+++ b/crypto/asn1/tasn_prn.c
@@ -26,10 +26,10 @@
 
 static ASN1_PCTX default_pctx = {
     ASN1_PCTX_FLAGS_SHOW_ABSENT, /* flags */
-    0,                          /* nm_flags */
-    0,                          /* cert_flags */
-    0,                          /* oid_flags */
-    0                           /* str_flags */
+    0, /* nm_flags */
+    0, /* cert_flags */
+    0, /* oid_flags */
+    0 /* str_flags */
 };
 
 ASN1_PCTX *ASN1_PCTX_new(void)
@@ -100,24 +100,24 @@ void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags)
 /* Main print routines */
 
 static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
-                               const ASN1_ITEM *it,
-                               const char *fname, const char *sname,
-                               int nohdr, const ASN1_PCTX *pctx);
+    const ASN1_ITEM *it,
+    const char *fname, const char *sname,
+    int nohdr, const ASN1_PCTX *pctx);
 
 static int asn1_template_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
-                            const ASN1_TEMPLATE *tt, const ASN1_PCTX *pctx);
+    const ASN1_TEMPLATE *tt, const ASN1_PCTX *pctx);
 
 static int asn1_primitive_print(BIO *out, const ASN1_VALUE **fld,
-                                const ASN1_ITEM *it, int indent,
-                                const char *fname, const char *sname,
-                                const ASN1_PCTX *pctx);
+    const ASN1_ITEM *it, int indent,
+    const char *fname, const char *sname,
+    const ASN1_PCTX *pctx);
 
 static int asn1_print_fsname(BIO *out, int indent,
-                             const char *fname, const char *sname,
-                             const ASN1_PCTX *pctx);
+    const char *fname, const char *sname,
+    const ASN1_PCTX *pctx);
 
 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)
 {
     const char *sname;
     if (pctx == NULL)
@@ -130,9 +130,9 @@ int ASN1_item_print(BIO *out, const ASN1_VALUE *ifld, int indent,
 }
 
 static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
-                               const ASN1_ITEM *it,
-                               const char *fname, const char *sname,
-                               int nohdr, const ASN1_PCTX *pctx)
+    const ASN1_ITEM *it,
+    const char *fname, const char *sname,
+    int nohdr, const ASN1_PCTX *pctx)
 {
     const ASN1_TEMPLATE *tt;
     const ASN1_EXTERN_FUNCS *ef;
@@ -146,11 +146,12 @@ static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
         parg.indent = indent;
         parg.pctx = pctx;
         asn1_cb = ((aux->flags & ASN1_AFLG_CONST_CB) != 0) ? aux->asn1_const_cb
-            : (ASN1_aux_const_cb *)aux->asn1_cb; /* backward compatibility */
+                                                           : (ASN1_aux_const_cb *)aux->asn1_cb; /* backward compatibility */
     }
 
-   if (((it->itype != ASN1_ITYPE_PRIMITIVE)
-       || (it->utype != V_ASN1_BOOLEAN)) && *fld == NULL) {
+    if (((it->itype != ASN1_ITYPE_PRIMITIVE)
+            || (it->utype != V_ASN1_BOOLEAN))
+        && *fld == NULL) {
         if (pctx->flags & ASN1_PCTX_FLAGS_SHOW_ABSENT) {
             if (!nohdr && !asn1_print_fsname(out, indent, fname, sname, pctx))
                 return 0;
@@ -164,7 +165,7 @@ static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
     case ASN1_ITYPE_PRIMITIVE:
         if (it->templates) {
             if (!asn1_template_print_ctx(out, fld, indent,
-                                         it->templates, pctx))
+                    it->templates, pctx))
                 return 0;
             break;
         }
@@ -186,8 +187,7 @@ static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
             if ((i == 2) && (BIO_puts(out, "\n") <= 0))
                 return 0;
             return 1;
-        } else if (sname &&
-                   BIO_printf(out, ":EXTERNAL TYPE %s\n", sname) <= 0)
+        } else if (sname && BIO_printf(out, ":EXTERNAL TYPE %s\n", sname) <= 0)
             return 0;
         break;
 
@@ -236,7 +236,7 @@ static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
                 return 0;
             tmpfld = ossl_asn1_get_const_field_ptr(fld, seqtt);
             if (!asn1_template_print_ctx(out, tmpfld,
-                                         indent + 2, seqtt, pctx))
+                    indent + 2, seqtt, pctx))
                 return 0;
         }
         if (pctx->flags & ASN1_PCTX_FLAGS_SHOW_SEQUENCE) {
@@ -260,7 +260,7 @@ static int asn1_item_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
 }
 
 static int asn1_template_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
-                            const ASN1_TEMPLATE *tt, const ASN1_PCTX *pctx)
+    const ASN1_TEMPLATE *tt, const ASN1_PCTX *pctx)
 {
     int i, flags;
     const char *sname, *fname;
@@ -297,7 +297,8 @@ static int asn1_template_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
                 else
                     tname = "SEQUENCE";
                 if (BIO_printf(out, "%*s%s OF %s {\n",
-                               indent, "", tname, tt->field_name) <= 0)
+                        indent, "", tname, tt->field_name)
+                    <= 0)
                     return 0;
             } else if (BIO_printf(out, "%*s%s:\n", indent, "", fname) <= 0)
                 return 0;
@@ -309,12 +310,11 @@ static int asn1_template_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
 
             skitem = sk_const_ASN1_VALUE_value(stack, i);
             if (!asn1_item_print_ctx(out, &skitem, indent + 2,
-                                     ASN1_ITEM_ptr(tt->item), NULL, NULL, 1,
-                                     pctx))
+                    ASN1_ITEM_ptr(tt->item), NULL, NULL, 1,
+                    pctx))
                 return 0;
         }
-        if (i == 0 && BIO_printf(out, "%*s<%s>\n", indent + 2, "",
-                                 stack == NULL ? "ABSENT" : "EMPTY") <= 0)
+        if (i == 0 && BIO_printf(out, "%*s<%s>\n", indent + 2, "", stack == NULL ? "ABSENT" : "EMPTY") <= 0)
             return 0;
         if (pctx->flags & ASN1_PCTX_FLAGS_SHOW_SEQUENCE) {
             if (BIO_printf(out, "%*s}\n", indent, "") <= 0)
@@ -323,12 +323,12 @@ static int asn1_template_print_ctx(BIO *out, const ASN1_VALUE **fld, int indent,
         return 1;
     }
     return asn1_item_print_ctx(out, fld, indent, ASN1_ITEM_ptr(tt->item),
-                               fname, sname, 0, pctx);
+        fname, sname, 0, pctx);
 }
 
 static int asn1_print_fsname(BIO *out, int indent,
-                             const char *fname, const char *sname,
-                             const ASN1_PCTX *pctx)
+    const char *fname, const char *sname,
+    const ASN1_PCTX *pctx)
 {
     static const char spaces[] = "                    ";
     static const int nspaces = sizeof(spaces) - 1;
@@ -379,13 +379,11 @@ static int asn1_print_boolean(BIO *out, int boolval)
     default:
         str = "TRUE";
         break;
-
     }
 
     if (BIO_puts(out, str) <= 0)
         return 0;
     return 1;
-
 }
 
 static int asn1_print_integer(BIO *out, const ASN1_INTEGER *str)
@@ -423,15 +421,16 @@ static int asn1_print_obstring(BIO *out, const ASN1_STRING *str, int indent)
         return 0;
     if ((str->length > 0)
         && BIO_dump_indent(out, (const char *)str->data, str->length,
-                           indent + 2) <= 0)
+               indent + 2)
+            <= 0)
         return 0;
     return 1;
 }
 
 static int asn1_primitive_print(BIO *out, const ASN1_VALUE **fld,
-                                const ASN1_ITEM *it, int indent,
-                                const char *fname, const char *sname,
-                                const ASN1_PCTX *pctx)
+    const ASN1_ITEM *it, int indent,
+    const char *fname, const char *sname,
+    const ASN1_PCTX *pctx)
 {
     long utype;
     ASN1_STRING *str;
@@ -483,14 +482,12 @@ static int asn1_primitive_print(BIO *out, const ASN1_VALUE **fld,
     }
 
     switch (utype) {
-    case V_ASN1_BOOLEAN:
-        {
-            int boolval = *(int *)fld;
-            if (boolval == -1)
-                boolval = it->size;
-            ret = asn1_print_boolean(out, boolval);
-        }
-        break;
+    case V_ASN1_BOOLEAN: {
+        int boolval = *(int *)fld;
+        if (boolval == -1)
+            boolval = it->size;
+        ret = asn1_print_boolean(out, boolval);
+    } break;
 
     case V_ASN1_INTEGER:
     case V_ASN1_ENUMERATED:
@@ -527,7 +524,6 @@ static int asn1_primitive_print(BIO *out, const ASN1_VALUE **fld,
 
     default:
         ret = ASN1_STRING_print_ex(out, str, pctx->str_flags);
-
     }
     if (!ret)
         return 0;
diff --git a/crypto/asn1/tasn_scn.c b/crypto/asn1/tasn_scn.c
index 7ada313b94492..1e46cc90d2d84 100644
--- a/crypto/asn1/tasn_scn.c
+++ b/crypto/asn1/tasn_scn.c
@@ -22,7 +22,7 @@
  * passing details to a callback.
  */
 
-ASN1_SCTX *ASN1_SCTX_new(int (*scan_cb) (ASN1_SCTX *ctx))
+ASN1_SCTX *ASN1_SCTX_new(int (*scan_cb)(ASN1_SCTX *ctx))
 {
     ASN1_SCTX *ret = OPENSSL_zalloc(sizeof(*ret));
 
diff --git a/crypto/asn1/tasn_typ.c b/crypto/asn1/tasn_typ.c
index 8095e32370fc5..0e25b75b9f051 100644
--- a/crypto/asn1/tasn_typ.c
+++ b/crypto/asn1/tasn_typ.c
@@ -13,17 +13,17 @@
 
 /* Declarations for string types */
 
-#define IMPLEMENT_ASN1_STRING_FUNCTIONS(sname) \
-    IMPLEMENT_ASN1_TYPE(sname) \
+#define IMPLEMENT_ASN1_STRING_FUNCTIONS(sname)                 \
+    IMPLEMENT_ASN1_TYPE(sname)                                 \
     IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(sname, sname, sname) \
-sname *sname##_new(void) \
-{ \
-    return ASN1_STRING_type_new(V_##sname); \
-} \
-void sname##_free(sname *x) \
-{ \
-    ASN1_STRING_free(x); \
-}
+    sname *sname##_new(void)                                   \
+    {                                                          \
+        return ASN1_STRING_type_new(V_##sname);                \
+    }                                                          \
+    void sname##_free(sname *x)                                \
+    {                                                          \
+        ASN1_STRING_free(x);                                   \
+    }
 
 IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_OCTET_STRING)
 IMPLEMENT_ASN1_STRING_FUNCTIONS(ASN1_INTEGER)
@@ -72,12 +72,10 @@ IMPLEMENT_ASN1_TYPE_ex(ASN1_FBOOLEAN, ASN1_BOOLEAN, 0)
 
 IMPLEMENT_ASN1_TYPE_ex(ASN1_OCTET_STRING_NDEF, ASN1_OCTET_STRING, ASN1_TFLG_NDEF)
 
-ASN1_ITEM_TEMPLATE(ASN1_SEQUENCE_ANY) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, ASN1_SEQUENCE_ANY, ASN1_ANY)
+ASN1_ITEM_TEMPLATE(ASN1_SEQUENCE_ANY) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, ASN1_SEQUENCE_ANY, ASN1_ANY)
 ASN1_ITEM_TEMPLATE_END(ASN1_SEQUENCE_ANY)
 
-ASN1_ITEM_TEMPLATE(ASN1_SET_ANY) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, ASN1_SET_ANY, ASN1_ANY)
+ASN1_ITEM_TEMPLATE(ASN1_SET_ANY) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, ASN1_SET_ANY, ASN1_ANY)
 ASN1_ITEM_TEMPLATE_END(ASN1_SET_ANY)
 
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY)
diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c
index 67a9ccde62db4..48a1f36de87fb 100644
--- a/crypto/asn1/tasn_utl.c
+++ b/crypto/asn1/tasn_utl.c
@@ -20,7 +20,7 @@
 /* Utility functions for manipulating fields and offsets */
 
 /* Add 'offset' to 'addr' */
-#define offset2ptr(addr, offset) (void *)(((char *) addr) + offset)
+#define offset2ptr(addr, offset) (void *)(((char *)addr) + offset)
 
 /*
  * Given an ASN1_ITEM CHOICE type return the selector value
@@ -34,7 +34,7 @@ int ossl_asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it)
 }
 
 int ossl_asn1_get_choice_selector_const(const ASN1_VALUE **pval,
-                                        const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     int *sel = offset2ptr(*pval, it->utype);
 
@@ -46,7 +46,7 @@ int ossl_asn1_get_choice_selector_const(const ASN1_VALUE **pval,
  */
 
 int ossl_asn1_set_choice_selector(ASN1_VALUE **pval, int value,
-                                  const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     int *sel, ret;
 
@@ -99,7 +99,7 @@ int ossl_asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it)
         break;
     case -1:
         if (!CRYPTO_DOWN_REF(refcnt, &ret))
-            return -1;  /* failed */
+            return -1; /* failed */
         REF_PRINT_EX(it->sname, ret, (void *)it);
         REF_ASSERT_ISNT(ret < 0);
         if (ret == 0) {
@@ -126,7 +126,7 @@ static ASN1_ENCODING *asn1_get_enc_ptr(ASN1_VALUE **pval, const ASN1_ITEM *it)
 }
 
 static const ASN1_ENCODING *asn1_get_const_enc_ptr(const ASN1_VALUE **pval,
-                                                   const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     const ASN1_AUX *aux;
 
@@ -162,7 +162,7 @@ void ossl_asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 }
 
 int ossl_asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen,
-                       const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     ASN1_ENCODING *enc = asn1_get_enc_ptr(pval, it);
 
@@ -182,7 +182,7 @@ int ossl_asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen,
 }
 
 int ossl_asn1_enc_restore(int *len, unsigned char **out, const ASN1_VALUE **pval,
-                          const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     const ASN1_ENCODING *enc = asn1_get_const_enc_ptr(pval, it);
 
@@ -211,7 +211,7 @@ ASN1_VALUE **ossl_asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt)
 
 /* Given an ASN1_TEMPLATE get a const pointer to a field */
 const ASN1_VALUE **ossl_asn1_get_const_field_ptr(const ASN1_VALUE **pval,
-                                                 const ASN1_TEMPLATE *tt)
+    const ASN1_TEMPLATE *tt)
 {
     return offset2ptr(*pval, tt->offset);
 }
@@ -222,8 +222,8 @@ const ASN1_VALUE **ossl_asn1_get_const_field_ptr(const ASN1_VALUE **pval,
  */
 
 const ASN1_TEMPLATE *ossl_asn1_do_adb(const ASN1_VALUE *val,
-                                      const ASN1_TEMPLATE *tt,
-                                      int nullerr)
+    const ASN1_TEMPLATE *tt,
+    int nullerr)
 {
     const ASN1_ADB *adb;
     const ASN1_ADB_TABLE *atbl;
@@ -280,7 +280,7 @@ const ASN1_TEMPLATE *ossl_asn1_do_adb(const ASN1_VALUE *val,
         goto err;
     return adb->default_tt;
 
- err:
+err:
     /* FIXME: should log the value or OID of unsupported type */
     if (nullerr)
         ERR_raise(ERR_LIB_ASN1, ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE);
diff --git a/crypto/asn1/tbl_standard.h b/crypto/asn1/tbl_standard.h
index 3e8fe81eebdd4..da9c299bed8b3 100644
--- a/crypto/asn1/tbl_standard.h
+++ b/crypto/asn1/tbl_standard.h
@@ -9,54 +9,53 @@
 
 /* size limits: this stuff is taken straight from RFC3280 */
 
-#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_serial_number                64
+#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_serial_number 64
 
 /* From RFC4524 */
 
-#define ub_rfc822_mailbox               256
+#define ub_rfc822_mailbox 256
 
 /* This table must be kept in NID order */
 
 static const ASN1_STRING_TABLE tbl_standard[] = {
-    {NID_commonName, 1, ub_common_name, DIRSTRING_TYPE, 0},
-    {NID_countryName, 2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
-    {NID_localityName, 1, ub_locality_name, DIRSTRING_TYPE, 0},
-    {NID_stateOrProvinceName, 1, ub_state_name, DIRSTRING_TYPE, 0},
-    {NID_organizationName, 1, ub_organization_name, DIRSTRING_TYPE, 0},
-    {NID_organizationalUnitName, 1, ub_organization_unit_name, DIRSTRING_TYPE,
-     0},
-    {NID_pkcs9_emailAddress, 1, ub_email_address, B_ASN1_IA5STRING,
-     STABLE_NO_MASK},
-    {NID_pkcs9_unstructuredName, 1, -1, PKCS9STRING_TYPE, 0},
-    {NID_pkcs9_challengePassword, 1, -1, PKCS9STRING_TYPE, 0},
-    {NID_pkcs9_unstructuredAddress, 1, -1, DIRSTRING_TYPE, 0},
-    {NID_givenName, 1, ub_name, DIRSTRING_TYPE, 0},
-    {NID_surname, 1, ub_name, DIRSTRING_TYPE, 0},
-    {NID_initials, 1, ub_name, DIRSTRING_TYPE, 0},
-    {NID_serialNumber, 1, ub_serial_number, B_ASN1_PRINTABLESTRING,
-     STABLE_NO_MASK},
-    {NID_friendlyName, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},
-    {NID_name, 1, ub_name, DIRSTRING_TYPE, 0},
-    {NID_dnQualifier, -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
-    {NID_domainComponent, 1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK},
-    {NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK},
-    {NID_rfc822Mailbox, 1, ub_rfc822_mailbox, B_ASN1_IA5STRING,
-     STABLE_NO_MASK},
-    {NID_jurisdictionCountryName, 2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
-    {NID_INN, 1, 12, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
-    {NID_OGRN, 1, 13, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
-    {NID_SNILS, 1, 11, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
-    {NID_countryCode3c, 3, 3, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK},
-    {NID_countryCode3n, 3, 3, B_ASN1_NUMERICSTRING, STABLE_NO_MASK},
-    {NID_dnsName, 0, -1, B_ASN1_UTF8STRING, STABLE_NO_MASK},
-    {NID_id_on_SmtpUTF8Mailbox, 1, ub_email_address, B_ASN1_UTF8STRING, STABLE_NO_MASK}
+    { NID_commonName, 1, ub_common_name, DIRSTRING_TYPE, 0 },
+    { NID_countryName, 2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK },
+    { NID_localityName, 1, ub_locality_name, DIRSTRING_TYPE, 0 },
+    { NID_stateOrProvinceName, 1, ub_state_name, DIRSTRING_TYPE, 0 },
+    { NID_organizationName, 1, ub_organization_name, DIRSTRING_TYPE, 0 },
+    { NID_organizationalUnitName, 1, ub_organization_unit_name, DIRSTRING_TYPE,
+        0 },
+    { NID_pkcs9_emailAddress, 1, ub_email_address, B_ASN1_IA5STRING,
+        STABLE_NO_MASK },
+    { NID_pkcs9_unstructuredName, 1, -1, PKCS9STRING_TYPE, 0 },
+    { NID_pkcs9_challengePassword, 1, -1, PKCS9STRING_TYPE, 0 },
+    { NID_pkcs9_unstructuredAddress, 1, -1, DIRSTRING_TYPE, 0 },
+    { NID_givenName, 1, ub_name, DIRSTRING_TYPE, 0 },
+    { NID_surname, 1, ub_name, DIRSTRING_TYPE, 0 },
+    { NID_initials, 1, ub_name, DIRSTRING_TYPE, 0 },
+    { NID_serialNumber, 1, ub_serial_number, B_ASN1_PRINTABLESTRING,
+        STABLE_NO_MASK },
+    { NID_friendlyName, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK },
+    { NID_name, 1, ub_name, DIRSTRING_TYPE, 0 },
+    { NID_dnQualifier, -1, -1, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK },
+    { NID_domainComponent, 1, -1, B_ASN1_IA5STRING, STABLE_NO_MASK },
+    { NID_ms_csp_name, -1, -1, B_ASN1_BMPSTRING, STABLE_NO_MASK },
+    { NID_rfc822Mailbox, 1, ub_rfc822_mailbox, B_ASN1_IA5STRING,
+        STABLE_NO_MASK },
+    { NID_jurisdictionCountryName, 2, 2, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK },
+    { NID_INN, 1, 12, B_ASN1_NUMERICSTRING, STABLE_NO_MASK },
+    { NID_OGRN, 1, 13, B_ASN1_NUMERICSTRING, STABLE_NO_MASK },
+    { NID_SNILS, 1, 11, B_ASN1_NUMERICSTRING, STABLE_NO_MASK },
+    { NID_countryCode3c, 3, 3, B_ASN1_PRINTABLESTRING, STABLE_NO_MASK },
+    { NID_countryCode3n, 3, 3, B_ASN1_NUMERICSTRING, STABLE_NO_MASK },
+    { NID_dnsName, 0, -1, B_ASN1_UTF8STRING, STABLE_NO_MASK },
+    { NID_id_on_SmtpUTF8Mailbox, 1, ub_email_address, B_ASN1_UTF8STRING, STABLE_NO_MASK }
 };
-
diff --git a/crypto/asn1/x_algor.c b/crypto/asn1/x_algor.c
index db9dd06e49406..f8faf7209b198 100644
--- a/crypto/asn1/x_algor.c
+++ b/crypto/asn1/x_algor.c
@@ -16,12 +16,11 @@
 #include "crypto/evp.h"
 
 ASN1_SEQUENCE(X509_ALGOR) = {
-        ASN1_SIMPLE(X509_ALGOR, algorithm, ASN1_OBJECT),
-        ASN1_OPT(X509_ALGOR, parameter, ASN1_ANY)
+    ASN1_SIMPLE(X509_ALGOR, algorithm, ASN1_OBJECT),
+    ASN1_OPT(X509_ALGOR, parameter, ASN1_ANY)
 } ASN1_SEQUENCE_END(X509_ALGOR)
 
-ASN1_ITEM_TEMPLATE(X509_ALGORS) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, algorithms, X509_ALGOR)
+ASN1_ITEM_TEMPLATE(X509_ALGORS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, algorithms, X509_ALGOR)
 ASN1_ITEM_TEMPLATE_END(X509_ALGORS)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_ALGOR)
@@ -34,7 +33,7 @@ int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval)
         return 0;
 
     if (ptype != V_ASN1_UNDEF && alg->parameter == NULL
-            && (alg->parameter = ASN1_TYPE_new()) == NULL)
+        && (alg->parameter = ASN1_TYPE_new()) == NULL)
         return 0;
 
     ASN1_OBJECT_free(alg->algorithm);
@@ -63,14 +62,14 @@ X509_ALGOR *ossl_X509_ALGOR_from_nid(int nid, int ptype, void *pval)
         return alg;
     alg->algorithm = NULL; /* precaution to prevent double free */
 
- err:
+err:
     X509_ALGOR_free(alg);
     /* ASN1_OBJECT_free(algo) is not needed due to OBJ_nid2obj() */
     return NULL;
 }
 
 void X509_ALGOR_get0(const ASN1_OBJECT **paobj, int *pptype,
-                     const void **ppval, const X509_ALGOR *algor)
+    const void **ppval, const X509_ALGOR *algor)
 {
     if (paobj)
         *paobj = algor->algorithm;
@@ -111,7 +110,7 @@ int X509_ALGOR_copy(X509_ALGOR *dest, const X509_ALGOR *src)
         return 0;
 
     if (dest->algorithm)
-         ASN1_OBJECT_free(dest->algorithm);
+        ASN1_OBJECT_free(dest->algorithm);
     dest->algorithm = NULL;
 
     if (dest->parameter)
@@ -131,7 +130,8 @@ int X509_ALGOR_copy(X509_ALGOR *dest, const X509_ALGOR *src)
          * set does copy as a side effect.
          */
         if (ASN1_TYPE_set1(dest->parameter, src->parameter->type,
-                           src->parameter->value.ptr) == 0)
+                src->parameter->value.ptr)
+            == 0)
             return 0;
     }
 
@@ -171,7 +171,7 @@ X509_ALGOR *ossl_x509_algor_mgf1_decode(X509_ALGOR *alg)
     if (OBJ_obj2nid(alg->algorithm) != NID_mgf1)
         return NULL;
     return ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(X509_ALGOR),
-                                     alg->parameter);
+        alg->parameter);
 }
 
 /* Allocate and set MGF1 algorithm ID from EVP_MD */
@@ -187,12 +187,12 @@ int ossl_x509_algor_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md)
     if (!ossl_x509_algor_new_from_md(&algtmp, mgf1md))
         goto err;
     if (ASN1_item_pack(algtmp, ASN1_ITEM_rptr(X509_ALGOR), &stmp) == NULL)
-         goto err;
+        goto err;
     *palg = ossl_X509_ALGOR_from_nid(NID_mgf1, V_ASN1_SEQUENCE, stmp);
     if (*palg == NULL)
         goto err;
     stmp = NULL;
- err:
+err:
     ASN1_STRING_free(stmp);
     X509_ALGOR_free(algtmp);
     return *palg != NULL;
diff --git a/crypto/asn1/x_bignum.c b/crypto/asn1/x_bignum.c
index 3ae58a49f0b25..efa2ade30fad3 100644
--- a/crypto/asn1/x_bignum.c
+++ b/crypto/asn1/x_bignum.c
@@ -19,20 +19,20 @@
  * is normally due to an encoding error.
  */
 
-#define BN_SENSITIVE    1
+#define BN_SENSITIVE 1
 
 static int bn_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
 static int bn_secure_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
 static void bn_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
 
 static int bn_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
-                  const ASN1_ITEM *it);
+    const ASN1_ITEM *it);
 static int bn_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                  int utype, char *free_cont, const ASN1_ITEM *it);
+    int utype, char *free_cont, const ASN1_ITEM *it);
 static int bn_secure_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                         int utype, char *free_cont, const ASN1_ITEM *it);
+    int utype, char *free_cont, const ASN1_ITEM *it);
 static int bn_print(BIO *out, const ASN1_VALUE **pval, const ASN1_ITEM *it,
-                    int indent, const ASN1_PCTX *pctx);
+    int indent, const ASN1_PCTX *pctx);
 
 static ASN1_PRIMITIVE_FUNCS bignum_pf = {
     NULL, 0,
@@ -55,14 +55,13 @@ static ASN1_PRIMITIVE_FUNCS cbignum_pf = {
 };
 
 ASN1_ITEM_start(BIGNUM)
-        ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &bignum_pf, 0, "BIGNUM"
-ASN1_ITEM_end(BIGNUM)
+    ASN1_ITYPE_PRIMITIVE,
+    V_ASN1_INTEGER, NULL, 0, &bignum_pf, 0, "BIGNUM" ASN1_ITEM_end(BIGNUM)
 
-ASN1_ITEM_start(CBIGNUM)
-        ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &cbignum_pf, BN_SENSITIVE, "CBIGNUM"
-ASN1_ITEM_end(CBIGNUM)
+                                                ASN1_ITEM_start(CBIGNUM) ASN1_ITYPE_PRIMITIVE,
+    V_ASN1_INTEGER, NULL, 0, &cbignum_pf, BN_SENSITIVE, "CBIGNUM" ASN1_ITEM_end(CBIGNUM)
 
-static int bn_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
+                                                            static int bn_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
     *pval = (ASN1_VALUE *)BN_new();
     if (*pval != NULL)
@@ -92,7 +91,7 @@ static void bn_free(ASN1_VALUE **pval, const ASN1_ITEM *it)
 }
 
 static int bn_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
-                  const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     BIGNUM *bn;
     int pad;
@@ -113,7 +112,7 @@ static int bn_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
 }
 
 static int bn_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                  int utype, char *free_cont, const ASN1_ITEM *it)
+    int utype, char *free_cont, const ASN1_ITEM *it)
 {
     BIGNUM *bn;
 
@@ -128,7 +127,7 @@ static int bn_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
 }
 
 static int bn_secure_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                         int utype, char *free_cont, const ASN1_ITEM *it)
+    int utype, char *free_cont, const ASN1_ITEM *it)
 {
     int ret;
     BIGNUM *bn;
@@ -147,7 +146,7 @@ static int bn_secure_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
 }
 
 static int bn_print(BIO *out, const ASN1_VALUE **pval, const ASN1_ITEM *it,
-                    int indent, const ASN1_PCTX *pctx)
+    int indent, const ASN1_PCTX *pctx)
 {
     if (!BN_print(out, *(BIGNUM **)pval))
         return 0;
diff --git a/crypto/asn1/x_int64.c b/crypto/asn1/x_int64.c
index b7251b8ad8b64..f7cd7cbd95e7e 100644
--- a/crypto/asn1/x_int64.c
+++ b/crypto/asn1/x_int64.c
@@ -23,8 +23,8 @@
 /*
  * We abuse the ASN1_ITEM fields |size| as a flags field
  */
-#define INTxx_FLAG_ZERO_DEFAULT (1<<0)
-#define INTxx_FLAG_SIGNED       (1<<1)
+#define INTxx_FLAG_ZERO_DEFAULT (1 << 0)
+#define INTxx_FLAG_SIGNED (1 << 1)
 
 static int uint64_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
@@ -45,7 +45,7 @@ static void uint64_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
 }
 
 static int uint64_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
-                      const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     uint64_t utmp;
     int neg = 0;
@@ -69,7 +69,7 @@ static int uint64_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
 }
 
 static int uint64_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                      int utype, char *free_cont, const ASN1_ITEM *it)
+    int utype, char *free_cont, const ASN1_ITEM *it)
 {
     uint64_t utmp = 0;
     char *cp;
@@ -96,7 +96,7 @@ static int uint64_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
         return 0;
     }
     if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED
-            && !neg && utmp > INT64_MAX) {
+        && !neg && utmp > INT64_MAX) {
         ERR_raise(ERR_LIB_ASN1, ASN1_R_TOO_LARGE);
         return 0;
     }
@@ -104,13 +104,13 @@ static int uint64_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
         /* ossl_c2i_uint64_int() returns positive values */
         utmp = 0 - utmp;
 
- long_compat:
+long_compat:
     memcpy(cp, &utmp, sizeof(utmp));
     return 1;
 }
 
 static int uint64_print(BIO *out, const ASN1_VALUE **pval, const ASN1_ITEM *it,
-                        int indent, const ASN1_PCTX *pctx)
+    int indent, const ASN1_PCTX *pctx)
 {
     if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED)
         return BIO_printf(out, "%jd\n", **(int64_t **)pval);
@@ -138,7 +138,7 @@ static void uint32_clear(ASN1_VALUE **pval, const ASN1_ITEM *it)
 }
 
 static int uint32_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
-                      const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     uint32_t utmp;
     int neg = 0;
@@ -169,7 +169,7 @@ static int uint32_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
 #define ABS_INT32_MIN ((uint32_t)INT32_MAX + 1)
 
 static int uint32_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                      int utype, char *free_cont, const ASN1_ITEM *it)
+    int utype, char *free_cont, const ASN1_ITEM *it)
 {
     uint64_t utmp = 0;
     uint32_t utmp2 = 0;
@@ -210,21 +210,20 @@ static int uint32_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
         }
     }
 
- long_compat:
+long_compat:
     utmp2 = (uint32_t)utmp;
     memcpy(cp, &utmp2, sizeof(utmp2));
     return 1;
 }
 
 static int uint32_print(BIO *out, const ASN1_VALUE **pval, const ASN1_ITEM *it,
-                        int indent, const ASN1_PCTX *pctx)
+    int indent, const ASN1_PCTX *pctx)
 {
     if ((it->size & INTxx_FLAG_SIGNED) == INTxx_FLAG_SIGNED)
         return BIO_printf(out, "%d\n", (int)**(int32_t **)pval);
     return BIO_printf(out, "%u\n", (unsigned int)**(uint32_t **)pval);
 }
 
-
 /* Define the primitives themselves */
 
 static ASN1_PRIMITIVE_FUNCS uint32_pf = {
@@ -248,40 +247,32 @@ static ASN1_PRIMITIVE_FUNCS uint64_pf = {
 };
 
 ASN1_ITEM_start(INT32)
-    ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint32_pf,
-    INTxx_FLAG_SIGNED, "INT32"
-ASN1_ITEM_end(INT32)
-
-ASN1_ITEM_start(UINT32)
-    ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint32_pf, 0, "UINT32"
-ASN1_ITEM_end(UINT32)
-
-ASN1_ITEM_start(INT64)
-    ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint64_pf,
-    INTxx_FLAG_SIGNED, "INT64"
-ASN1_ITEM_end(INT64)
-
-ASN1_ITEM_start(UINT64)
-    ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint64_pf, 0, "UINT64"
-ASN1_ITEM_end(UINT64)
-
-ASN1_ITEM_start(ZINT32)
-    ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint32_pf,
-    INTxx_FLAG_ZERO_DEFAULT|INTxx_FLAG_SIGNED, "ZINT32"
-ASN1_ITEM_end(ZINT32)
-
-ASN1_ITEM_start(ZUINT32)
-    ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint32_pf,
-    INTxx_FLAG_ZERO_DEFAULT, "ZUINT32"
-ASN1_ITEM_end(ZUINT32)
-
-ASN1_ITEM_start(ZINT64)
-    ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint64_pf,
-    INTxx_FLAG_ZERO_DEFAULT|INTxx_FLAG_SIGNED, "ZINT64"
-ASN1_ITEM_end(ZINT64)
-
-ASN1_ITEM_start(ZUINT64)
-    ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &uint64_pf,
-    INTxx_FLAG_ZERO_DEFAULT, "ZUINT64"
-ASN1_ITEM_end(ZUINT64)
+    ASN1_ITYPE_PRIMITIVE,
+    V_ASN1_INTEGER, NULL, 0, &uint32_pf,
+    INTxx_FLAG_SIGNED, "INT32" ASN1_ITEM_end(INT32)
+
+                           ASN1_ITEM_start(UINT32) ASN1_ITYPE_PRIMITIVE,
+    V_ASN1_INTEGER, NULL, 0, &uint32_pf, 0, "UINT32" ASN1_ITEM_end(UINT32)
+
+                                                ASN1_ITEM_start(INT64) ASN1_ITYPE_PRIMITIVE,
+    V_ASN1_INTEGER, NULL, 0, &uint64_pf,
+    INTxx_FLAG_SIGNED, "INT64" ASN1_ITEM_end(INT64)
+
+                           ASN1_ITEM_start(UINT64) ASN1_ITYPE_PRIMITIVE,
+    V_ASN1_INTEGER, NULL, 0, &uint64_pf, 0, "UINT64" ASN1_ITEM_end(UINT64)
+
+                                                ASN1_ITEM_start(ZINT32) ASN1_ITYPE_PRIMITIVE,
+    V_ASN1_INTEGER, NULL, 0, &uint32_pf,
+    INTxx_FLAG_ZERO_DEFAULT | INTxx_FLAG_SIGNED, "ZINT32" ASN1_ITEM_end(ZINT32)
+
+                                                     ASN1_ITEM_start(ZUINT32) ASN1_ITYPE_PRIMITIVE,
+    V_ASN1_INTEGER, NULL, 0, &uint32_pf,
+    INTxx_FLAG_ZERO_DEFAULT, "ZUINT32" ASN1_ITEM_end(ZUINT32)
+
+                                 ASN1_ITEM_start(ZINT64) ASN1_ITYPE_PRIMITIVE,
+    V_ASN1_INTEGER, NULL, 0, &uint64_pf,
+    INTxx_FLAG_ZERO_DEFAULT | INTxx_FLAG_SIGNED, "ZINT64" ASN1_ITEM_end(ZINT64)
 
+                                                     ASN1_ITEM_start(ZUINT64) ASN1_ITYPE_PRIMITIVE,
+    V_ASN1_INTEGER, NULL, 0, &uint64_pf,
+    INTxx_FLAG_ZERO_DEFAULT, "ZUINT64" ASN1_ITEM_end(ZUINT64)
diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c
index 0685780f08a00..4dc9dc6c6bd0c 100644
--- a/crypto/asn1/x_long.c
+++ b/crypto/asn1/x_long.c
@@ -22,31 +22,30 @@ static int long_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
 static void long_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
 
 static int long_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
-                    const ASN1_ITEM *it);
+    const ASN1_ITEM *it);
 static int long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                    int utype, char *free_cont, const ASN1_ITEM *it);
+    int utype, char *free_cont, const ASN1_ITEM *it);
 static int long_print(BIO *out, const ASN1_VALUE **pval, const ASN1_ITEM *it,
-                      int indent, const ASN1_PCTX *pctx);
+    int indent, const ASN1_PCTX *pctx);
 
 static ASN1_PRIMITIVE_FUNCS long_pf = {
     NULL, 0,
     long_new,
     long_free,
-    long_free,                  /* Clear should set to initial value */
+    long_free, /* Clear should set to initial value */
     long_c2i,
     long_i2c,
     long_print
 };
 
 ASN1_ITEM_start(LONG)
-        ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &long_pf, ASN1_LONG_UNDEF, "LONG"
-ASN1_ITEM_end(LONG)
+    ASN1_ITYPE_PRIMITIVE,
+    V_ASN1_INTEGER, NULL, 0, &long_pf, ASN1_LONG_UNDEF, "LONG" ASN1_ITEM_end(LONG)
 
-ASN1_ITEM_start(ZLONG)
-        ASN1_ITYPE_PRIMITIVE, V_ASN1_INTEGER, NULL, 0, &long_pf, 0, "ZLONG"
-ASN1_ITEM_end(ZLONG)
+                                                            ASN1_ITEM_start(ZLONG) ASN1_ITYPE_PRIMITIVE,
+    V_ASN1_INTEGER, NULL, 0, &long_pf, 0, "ZLONG" ASN1_ITEM_end(ZLONG)
 
-static int long_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
+                                              static int long_new(ASN1_VALUE **pval, const ASN1_ITEM *it)
 {
     memcpy(pval, &it->size, COPY_SIZE(*pval, it->size));
     return 1;
@@ -83,7 +82,7 @@ static int num_bits_ulong(unsigned long value)
 }
 
 static int long_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
-                    const ASN1_ITEM *it)
+    const ASN1_ITEM *it)
 {
     long ltmp;
     unsigned long utmp, sign;
@@ -126,7 +125,7 @@ static int long_i2c(const ASN1_VALUE **pval, unsigned char *cont, int *putype,
 }
 
 static int long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                    int utype, char *free_cont, const ASN1_ITEM *it)
+    int utype, char *free_cont, const ASN1_ITEM *it)
 {
     int i;
     long ltmp;
@@ -187,7 +186,7 @@ static int long_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
 }
 
 static int long_print(BIO *out, const ASN1_VALUE **pval, const ASN1_ITEM *it,
-                      int indent, const ASN1_PCTX *pctx)
+    int indent, const ASN1_PCTX *pctx)
 {
     long l;
 
diff --git a/crypto/asn1/x_sig.c b/crypto/asn1/x_sig.c
index 759a9566531e9..3932ff6f2ceaf 100644
--- a/crypto/asn1/x_sig.c
+++ b/crypto/asn1/x_sig.c
@@ -14,14 +14,14 @@
 #include "crypto/x509.h"
 
 ASN1_SEQUENCE(X509_SIG) = {
-        ASN1_SIMPLE(X509_SIG, algor, X509_ALGOR),
-        ASN1_SIMPLE(X509_SIG, digest, ASN1_OCTET_STRING)
+    ASN1_SIMPLE(X509_SIG, algor, X509_ALGOR),
+    ASN1_SIMPLE(X509_SIG, digest, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(X509_SIG)
 
 IMPLEMENT_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)
 {
     if (palg)
         *palg = sig->algor;
@@ -30,7 +30,7 @@ void X509_SIG_get0(const X509_SIG *sig, const X509_ALGOR **palg,
 }
 
 void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg,
-                   ASN1_OCTET_STRING **pdigest)
+    ASN1_OCTET_STRING **pdigest)
 {
     if (palg)
         *palg = sig->algor;
diff --git a/crypto/asn1/x_spki.c b/crypto/asn1/x_spki.c
index 2d7de66eb79cb..91fbda8bfc9eb 100644
--- a/crypto/asn1/x_spki.c
+++ b/crypto/asn1/x_spki.c
@@ -13,16 +13,16 @@
 #include <openssl/asn1t.h>
 
 ASN1_SEQUENCE(NETSCAPE_SPKAC) = {
-        ASN1_SIMPLE(NETSCAPE_SPKAC, pubkey, X509_PUBKEY),
-        ASN1_SIMPLE(NETSCAPE_SPKAC, challenge, ASN1_IA5STRING)
+    ASN1_SIMPLE(NETSCAPE_SPKAC, pubkey, X509_PUBKEY),
+    ASN1_SIMPLE(NETSCAPE_SPKAC, challenge, ASN1_IA5STRING)
 } ASN1_SEQUENCE_END(NETSCAPE_SPKAC)
 
 IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_SPKAC)
 
 ASN1_SEQUENCE(NETSCAPE_SPKI) = {
-        ASN1_SIMPLE(NETSCAPE_SPKI, spkac, NETSCAPE_SPKAC),
-        ASN1_EMBED(NETSCAPE_SPKI, sig_algor, X509_ALGOR),
-        ASN1_SIMPLE(NETSCAPE_SPKI, signature, ASN1_BIT_STRING)
+    ASN1_SIMPLE(NETSCAPE_SPKI, spkac, NETSCAPE_SPKAC),
+    ASN1_EMBED(NETSCAPE_SPKI, sig_algor, X509_ALGOR),
+    ASN1_SIMPLE(NETSCAPE_SPKI, signature, ASN1_BIT_STRING)
 } ASN1_SEQUENCE_END(NETSCAPE_SPKI)
 
 IMPLEMENT_ASN1_FUNCTIONS(NETSCAPE_SPKI)
diff --git a/crypto/asn1/x_val.c b/crypto/asn1/x_val.c
index a4e57cbcc714f..fdde195b71e0a 100644
--- a/crypto/asn1/x_val.c
+++ b/crypto/asn1/x_val.c
@@ -13,8 +13,8 @@
 #include <openssl/x509.h>
 
 ASN1_SEQUENCE(X509_VAL) = {
-        ASN1_SIMPLE(X509_VAL, notBefore, ASN1_TIME),
-        ASN1_SIMPLE(X509_VAL, notAfter, ASN1_TIME)
+    ASN1_SIMPLE(X509_VAL, notBefore, ASN1_TIME),
+    ASN1_SIMPLE(X509_VAL, notAfter, ASN1_TIME)
 } ASN1_SEQUENCE_END(X509_VAL)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_VAL)
diff --git a/crypto/asn1_dsa.c b/crypto/asn1_dsa.c
index 0782fe7c2a54e..2f338da176a9b 100644
--- a/crypto/asn1_dsa.c
+++ b/crypto/asn1_dsa.c
@@ -43,11 +43,11 @@ int ossl_encode_der_length(WPACKET *pkt, size_t cont_len)
 
     if (cont_len > 0xff) {
         if (!WPACKET_put_bytes_u8(pkt, 0x82)
-                || !WPACKET_put_bytes_u16(pkt, cont_len))
+            || !WPACKET_put_bytes_u16(pkt, cont_len))
             return 0;
     } else {
         if (cont_len > 0x7f
-                && !WPACKET_put_bytes_u8(pkt, 0x81))
+            && !WPACKET_put_bytes_u8(pkt, 0x81))
             return 0;
         if (!WPACKET_put_bytes_u8(pkt, cont_len))
             return 0;
@@ -83,14 +83,14 @@ int ossl_encode_der_integer(WPACKET *pkt, const BIGNUM *n)
     cont_len = BN_num_bits(n) / 8 + 1;
 
     if (!WPACKET_start_sub_packet(pkt)
-            || !WPACKET_put_bytes_u8(pkt, ID_INTEGER)
-            || !ossl_encode_der_length(pkt, cont_len)
-            || !WPACKET_allocate_bytes(pkt, cont_len, &bnbytes)
-            || !WPACKET_close(pkt))
+        || !WPACKET_put_bytes_u8(pkt, ID_INTEGER)
+        || !ossl_encode_der_length(pkt, cont_len)
+        || !WPACKET_allocate_bytes(pkt, cont_len, &bnbytes)
+        || !WPACKET_close(pkt))
         return 0;
 
     if (bnbytes != NULL
-            && BN_bn2binpad(n, bnbytes, (int)cont_len) != (int)cont_len)
+        && BN_bn2binpad(n, bnbytes, (int)cont_len) != (int)cont_len)
         return 0;
 
     return 1;
@@ -123,9 +123,9 @@ int ossl_encode_der_dsa_sig(WPACKET *pkt, const BIGNUM *r, const BIGNUM *s)
 
     /* Calculate the content length */
     if (!ossl_encode_der_integer(dummypkt, r)
-            || !ossl_encode_der_integer(dummypkt, s)
-            || !WPACKET_get_length(dummypkt, &cont_len)
-            || (!isnull && !WPACKET_finish(dummypkt))) {
+        || !ossl_encode_der_integer(dummypkt, s)
+        || !WPACKET_get_length(dummypkt, &cont_len)
+        || (!isnull && !WPACKET_finish(dummypkt))) {
         if (!isnull)
             WPACKET_cleanup(dummypkt);
         return 0;
@@ -133,14 +133,14 @@ int ossl_encode_der_dsa_sig(WPACKET *pkt, const BIGNUM *r, const BIGNUM *s)
 
     /* Add the tag and length bytes */
     if (!WPACKET_put_bytes_u8(pkt, ID_SEQUENCE)
-            || !ossl_encode_der_length(pkt, cont_len)
-               /*
-                * Really encode the integers. We already wrote to the main pkt
-                * if it had a NULL buffer, so don't do it again
-                */
-            || (!isnull && !ossl_encode_der_integer(pkt, r))
-            || (!isnull && !ossl_encode_der_integer(pkt, s))
-            || !WPACKET_close(pkt))
+        || !ossl_encode_der_length(pkt, cont_len)
+        /*
+         * Really encode the integers. We already wrote to the main pkt
+         * if it had a NULL buffer, so don't do it again
+         */
+        || (!isnull && !ossl_encode_der_integer(pkt, r))
+        || (!isnull && !ossl_encode_der_integer(pkt, s))
+        || !WPACKET_close(pkt))
         return 0;
 
     return 1;
@@ -191,25 +191,26 @@ int ossl_decode_der_integer(PACKET *pkt, BIGNUM *n)
 
     /* Check we have an integer and get the content bytes */
     if (!PACKET_get_1(pkt, &tag)
-            || tag != ID_INTEGER
-            || !ossl_decode_der_length(pkt, &contpkt))
+        || tag != ID_INTEGER
+        || !ossl_decode_der_length(pkt, &contpkt))
         return 0;
 
     /* Peek ahead at the first bytes to check for proper encoding */
     tmppkt = contpkt;
     /* The INTEGER must be positive */
     if (!PACKET_get_1(&tmppkt, &tmp)
-            || (tmp & 0x80) != 0)
+        || (tmp & 0x80) != 0)
         return 0;
     /* If there a zero padding byte the next byte must have the msb set */
     if (PACKET_remaining(&tmppkt) > 0 && tmp == 0) {
         if (!PACKET_get_1(&tmppkt, &tmp)
-                || (tmp & 0x80) == 0)
+            || (tmp & 0x80) == 0)
             return 0;
     }
 
     if (BN_bin2bn(PACKET_data(&contpkt),
-                  (int)PACKET_remaining(&contpkt), n) == NULL)
+            (int)PACKET_remaining(&contpkt), n)
+        == NULL)
         return 0;
 
     return 1;
@@ -231,19 +232,19 @@ int ossl_decode_der_integer(PACKET *pkt, BIGNUM *n)
  * were consumed.
  */
 size_t ossl_decode_der_dsa_sig(BIGNUM *r, BIGNUM *s,
-                               const unsigned char **ppin, size_t len)
+    const unsigned char **ppin, size_t len)
 {
     size_t consumed;
     PACKET pkt, contpkt;
     unsigned int tag;
 
     if (!PACKET_buf_init(&pkt, *ppin, len)
-            || !PACKET_get_1(&pkt, &tag)
-            || tag != ID_SEQUENCE
-            || !ossl_decode_der_length(&pkt, &contpkt)
-            || !ossl_decode_der_integer(&contpkt, r)
-            || !ossl_decode_der_integer(&contpkt, s)
-            || PACKET_remaining(&contpkt) != 0)
+        || !PACKET_get_1(&pkt, &tag)
+        || tag != ID_SEQUENCE
+        || !ossl_decode_der_length(&pkt, &contpkt)
+        || !ossl_decode_der_integer(&contpkt, r)
+        || !ossl_decode_der_integer(&contpkt, s)
+        || PACKET_remaining(&contpkt) != 0)
         return 0;
 
     consumed = PACKET_data(&pkt) - *ppin;
diff --git a/crypto/async/arch/async_null.c b/crypto/async/arch/async_null.c
index 306c43df41f4f..28276c1014bc7 100644
--- a/crypto/async/arch/async_null.c
+++ b/crypto/async/arch/async_null.c
@@ -17,13 +17,13 @@ int ASYNC_is_capable(void)
 }
 
 int ASYNC_set_mem_functions(ASYNC_stack_alloc_fn alloc_fn,
-                            ASYNC_stack_free_fn free_fn)
+    ASYNC_stack_free_fn free_fn)
 {
     return 0;
 }
 
 void ASYNC_get_mem_functions(ASYNC_stack_alloc_fn *alloc_fn,
-                             ASYNC_stack_free_fn *free_fn)
+    ASYNC_stack_free_fn *free_fn)
 {
     if (alloc_fn != NULL)
         *alloc_fn = NULL;
@@ -35,4 +35,3 @@ void async_local_cleanup(void)
 {
 }
 #endif
-
diff --git a/crypto/async/arch/async_null.h b/crypto/async/arch/async_null.h
index 536c9829cd2ec..6be0b96f9e6e7 100644
--- a/crypto/async/arch/async_null.h
+++ b/crypto/async/arch/async_null.h
@@ -14,19 +14,18 @@
  * to NULL.
  */
 #ifndef ASYNC_ARCH
-# define ASYNC_NULL
-# define ASYNC_ARCH
+#define ASYNC_NULL
+#define ASYNC_ARCH
 
 typedef struct async_fibre_st {
     int dummy;
 } async_fibre;
 
-
-# define async_fibre_swapcontext(o,n,r)         0
-# define async_fibre_makecontext(c)             0
-# define async_fibre_free(f)
-# define async_fibre_init_dispatcher(f)
-# define async_local_init()                     1
-# define async_local_deinit()
+#define async_fibre_swapcontext(o, n, r) 0
+#define async_fibre_makecontext(c) 0
+#define async_fibre_free(f)
+#define async_fibre_init_dispatcher(f)
+#define async_local_init() 1
+#define async_local_deinit()
 
 #endif
diff --git a/crypto/async/arch/async_posix.c b/crypto/async/arch/async_posix.c
index f2b507c7d0a64..46e2ce7559cd5 100644
--- a/crypto/async/arch/async_posix.c
+++ b/crypto/async/arch/async_posix.c
@@ -12,12 +12,12 @@
 
 #ifdef ASYNC_POSIX
 
-# include <stddef.h>
-# include <unistd.h>
-# include <openssl/err.h>
-# include <openssl/crypto.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <openssl/err.h>
+#include <openssl/crypto.h>
 
-#define STACKSIZE       32768
+#define STACKSIZE 32768
 
 static CRYPTO_RWLOCK *async_mem_lock;
 
@@ -51,7 +51,7 @@ int ASYNC_is_capable(void)
 }
 
 int ASYNC_set_mem_functions(ASYNC_stack_alloc_fn alloc_fn,
-                            ASYNC_stack_free_fn free_fn)
+    ASYNC_stack_free_fn free_fn)
 {
     OPENSSL_init_crypto(OPENSSL_INIT_ASYNC, NULL);
 
@@ -71,7 +71,7 @@ int ASYNC_set_mem_functions(ASYNC_stack_alloc_fn alloc_fn,
 }
 
 void ASYNC_get_mem_functions(ASYNC_stack_alloc_fn *alloc_fn,
-                             ASYNC_stack_free_fn *free_fn)
+    ASYNC_stack_free_fn *free_fn)
 {
     if (alloc_fn != NULL)
         *alloc_fn = stack_alloc_impl;
diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
index ceb86e24bf354..449ca27d222f1 100644
--- a/crypto/async/arch/async_posix.h
+++ b/crypto/async/arch/async_posix.h
@@ -11,21 +11,22 @@
 #define OSSL_CRYPTO_ASYNC_POSIX_H
 #include <openssl/e_os2.h>
 
-#if defined(OPENSSL_SYS_UNIX) \
+#if defined(OPENSSL_SYS_UNIX)                                 \
     && defined(OPENSSL_THREADS) && !defined(OPENSSL_NO_ASYNC) \
-    && !defined(__ANDROID__) && !defined(__OpenBSD__)
+    && !defined(__ANDROID__) && !defined(__OpenBSD__)         \
+    && !defined(OPENSSL_SYS_TANDEM)
 
-# include <unistd.h>
+#include <unistd.h>
 
-# if _POSIX_VERSION >= 200112L \
+#if _POSIX_VERSION >= 200112L \
     && (_POSIX_VERSION < 200809L || defined(__GLIBC__) || defined(__FreeBSD__))
 
-# include <pthread.h>
+#include <pthread.h>
 
-#  define ASYNC_POSIX
-#  define ASYNC_ARCH
+#define ASYNC_POSIX
+#define ASYNC_ARCH
 
-#  if defined(__CET__) || defined(__ia64__)
+#if defined(__CET__) || defined(__ia64__)
 /*
  * When Intel CET is enabled, makecontext will create a different
  * shadow stack for each context.  async_fibre_swapcontext cannot
@@ -34,9 +35,9 @@
  * On IA64 the register stack engine is not saved across setjmp/longjmp. Here
  * swapcontext() performs correctly.
  */
-#   define USE_SWAPCONTEXT
-#  endif
-#  if defined(__aarch64__) && defined(__clang__) \
+#define USE_SWAPCONTEXT
+#endif
+#if defined(__aarch64__) && defined(__clang__) \
     && defined(__ARM_FEATURE_BTI_DEFAULT) && __ARM_FEATURE_BTI_DEFAULT == 1
 /*
  * setjmp/longjmp don't currently work with BTI on all libc implementations
@@ -46,19 +47,23 @@
  * So use the swapcontext implementation, which does work.
  * See https://github.com/llvm/llvm-project/issues/48888.
  */
-#   define USE_SWAPCONTEXT
-#  endif
-#  include <ucontext.h>
-#  ifndef USE_SWAPCONTEXT
-#   include <setjmp.h>
-#  endif
+#define USE_SWAPCONTEXT
+#endif
+#if defined(OPENSSL_SYS_TANDEM)
+#include <tdmsig.h>
+#else
+#include <ucontext.h>
+#endif
+#ifndef USE_SWAPCONTEXT
+#include <setjmp.h>
+#endif
 
 typedef struct async_fibre_st {
     ucontext_t fibre;
-#  ifndef USE_SWAPCONTEXT
+#ifndef USE_SWAPCONTEXT
     jmp_buf env;
     int env_init;
-#  endif
+#endif
 } async_fibre;
 
 int async_local_init(void);
@@ -66,9 +71,9 @@ void async_local_deinit(void);
 
 static ossl_inline int async_fibre_swapcontext(async_fibre *o, async_fibre *n, int r)
 {
-#  ifdef USE_SWAPCONTEXT
+#ifdef USE_SWAPCONTEXT
     swapcontext(&o->fibre, &n->fibre);
-#  else
+#else
     o->env_init = 1;
 
     if (!r || !_setjmp(o->env)) {
@@ -77,16 +82,16 @@ static ossl_inline int async_fibre_swapcontext(async_fibre *o, async_fibre *n, i
         else
             setcontext(&n->fibre);
     }
-#  endif
+#endif
 
     return 1;
 }
 
-#  define async_fibre_init_dispatcher(d)
+#define async_fibre_init_dispatcher(d)
 
 int async_fibre_makecontext(async_fibre *fibre);
 void async_fibre_free(async_fibre *fibre);
 
-# endif
+#endif
 #endif
 #endif /* OSSL_CRYPTO_ASYNC_POSIX_H */
diff --git a/crypto/async/arch/async_win.c b/crypto/async/arch/async_win.c
index cbb8ef24ed787..849da5c3c41b3 100644
--- a/crypto/async/arch/async_win.c
+++ b/crypto/async/arch/async_win.c
@@ -12,8 +12,8 @@
 
 #ifdef ASYNC_WIN
 
-# include <windows.h>
-# include "internal/cryptlib.h"
+#include <windows.h>
+#include "internal/cryptlib.h"
 
 int ASYNC_is_capable(void)
 {
@@ -21,13 +21,13 @@ int ASYNC_is_capable(void)
 }
 
 int ASYNC_set_mem_functions(ASYNC_stack_alloc_fn alloc_fn,
-                            ASYNC_stack_free_fn free_fn)
+    ASYNC_stack_free_fn free_fn)
 {
     return 0;
 }
 
 void ASYNC_get_mem_functions(ASYNC_stack_alloc_fn *alloc_fn,
-                             ASYNC_stack_free_fn *free_fn)
+    ASYNC_stack_free_fn *free_fn)
 {
     if (alloc_fn != NULL)
         *alloc_fn = NULL;
@@ -49,11 +49,11 @@ void async_local_cleanup(void)
 
 int async_fibre_init_dispatcher(async_fibre *fibre)
 {
-# if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
     fibre->fibre = ConvertThreadToFiberEx(NULL, FIBER_FLAG_FLOAT_SWITCH);
-# else
+#else
     fibre->fibre = ConvertThreadToFiber(NULL);
-# endif
+#endif
     if (fibre->fibre == NULL) {
         fibre->converted = 0;
         fibre->fibre = GetCurrentFiber();
diff --git a/crypto/async/arch/async_win.h b/crypto/async/arch/async_win.h
index 6a61a9a380d1c..ef134f53ab2e9 100644
--- a/crypto/async/arch/async_win.h
+++ b/crypto/async/arch/async_win.h
@@ -13,32 +13,32 @@
  */
 #if defined(_WIN32) && !defined(OPENSSL_NO_ASYNC)
 #include <openssl/async.h>
-# define ASYNC_WIN
-# define ASYNC_ARCH
+#define ASYNC_WIN
+#define ASYNC_ARCH
 
-# include <windows.h>
-# include "internal/cryptlib.h"
+#include <windows.h>
+#include "internal/cryptlib.h"
 
 typedef struct async_fibre_st {
     LPVOID fibre;
     int converted;
 } async_fibre;
 
-# define async_fibre_swapcontext(o,n,r) \
-        (SwitchToFiber((n)->fibre), 1)
-
-# if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
-#   define async_fibre_makecontext(c) \
-        ((c)->fibre = CreateFiberEx(0, 0, FIBER_FLAG_FLOAT_SWITCH, \
-                                    async_start_func_win, 0))
-# else
-#   define async_fibre_makecontext(c) \
-        ((c)->fibre = CreateFiber(0, async_start_func_win, 0))
-# endif
-
-# define async_fibre_free(f)             (DeleteFiber((f)->fibre))
-# define async_local_init()              1
-# define async_local_deinit()
+#define async_fibre_swapcontext(o, n, r) \
+    (SwitchToFiber((n)->fibre), 1)
+
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
+#define async_fibre_makecontext(c)                             \
+    ((c)->fibre = CreateFiberEx(0, 0, FIBER_FLAG_FLOAT_SWITCH, \
+         async_start_func_win, 0))
+#else
+#define async_fibre_makecontext(c) \
+    ((c)->fibre = CreateFiber(0, async_start_func_win, 0))
+#endif
+
+#define async_fibre_free(f) (DeleteFiber((f)->fibre))
+#define async_local_init() 1
+#define async_local_deinit()
 
 int async_fibre_init_dispatcher(async_fibre *fibre);
 VOID CALLBACK async_start_func_win(PVOID unused);
diff --git a/crypto/async/async.c b/crypto/async/async.c
index 46c87d6a5af2b..dfd7a14a0b265 100644
--- a/crypto/async/async.c
+++ b/crypto/async/async.c
@@ -22,10 +22,10 @@
 #include "crypto/cryptlib.h"
 #include <string.h>
 
-#define ASYNC_JOB_RUNNING   0
-#define ASYNC_JOB_PAUSING   1
-#define ASYNC_JOB_PAUSED    2
-#define ASYNC_JOB_STOPPING  3
+#define ASYNC_JOB_RUNNING 0
+#define ASYNC_JOB_PAUSING 1
+#define ASYNC_JOB_PAUSED 2
+#define ASYNC_JOB_STOPPING 3
 
 static CRYPTO_THREAD_LOCAL ctxkey;
 static CRYPTO_THREAD_LOCAL poolkey;
@@ -97,7 +97,8 @@ static void async_job_free(ASYNC_JOB *job)
     }
 }
 
-static ASYNC_JOB *async_get_pool_job(void) {
+static ASYNC_JOB *async_get_pool_job(void)
+{
     ASYNC_JOB *job;
     async_pool *pool;
 
@@ -120,7 +121,7 @@ static ASYNC_JOB *async_get_pool_job(void) {
 
         job = async_job_new();
         if (job != NULL) {
-            if (! async_fibre_makecontext(&job->fibrectx)) {
+            if (!async_fibre_makecontext(&job->fibrectx)) {
                 async_job_free(job);
                 return NULL;
             }
@@ -130,7 +131,8 @@ static ASYNC_JOB *async_get_pool_job(void) {
     return job;
 }
 
-static void async_release_job(ASYNC_JOB *job) {
+static void async_release_job(ASYNC_JOB *job)
+{
     async_pool *pool;
 
     pool = (async_pool *)CRYPTO_THREAD_get_local(&poolkey);
@@ -160,7 +162,7 @@ void async_start_func(void)
         /* Stop the job */
         job->status = ASYNC_JOB_STOPPING;
         if (!async_fibre_swapcontext(&job->fibrectx,
-                                     &ctx->dispatcher, 1)) {
+                &ctx->dispatcher, 1)) {
             /*
              * Should not happen. Getting here will close the thread...can't do
              * much about it
@@ -171,7 +173,7 @@ void async_start_func(void)
 }
 
 int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret,
-                    int (*func)(void *), void *args, size_t size)
+    int (*func)(void *), void *args, size_t size)
 {
     async_ctx *ctx;
     OSSL_LIB_CTX *libctx;
@@ -249,7 +251,8 @@ int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *wctx, int *ret,
         if ((ctx->currjob = async_get_pool_job()) == NULL)
             return ASYNC_NO_JOBS;
 
-        if (args != NULL) {
+        /* Check for size > 0 to avoid malloc(0) */
+        if (args != NULL && size > 0) {
             ctx->currjob->funcargs = OPENSSL_malloc(size);
             if (ctx->currjob->funcargs == NULL) {
                 async_release_job(ctx->currjob);
@@ -289,8 +292,8 @@ int ASYNC_pause_job(void)
     async_ctx *ctx = async_get_ctx();
 
     if (ctx == NULL
-            || ctx->currjob == NULL
-            || ctx->blocked) {
+        || ctx->currjob == NULL
+        || ctx->blocked) {
         /*
          * Could be we've deliberately not been started within a job so this is
          * counted as success.
@@ -302,7 +305,7 @@ int ASYNC_pause_job(void)
     job->status = ASYNC_JOB_PAUSING;
 
     if (!async_fibre_swapcontext(&job->fibrectx,
-                                 &ctx->dispatcher, 1)) {
+            &ctx->dispatcher, 1)) {
         ERR_raise(ERR_LIB_ASYNC, ASYNC_R_FAILED_TO_SWAP_CONTEXT);
         return 0;
     }
diff --git a/crypto/async/async_err.c b/crypto/async/async_err.c
index 34db12fb969c0..1e28eb78234bc 100644
--- a/crypto/async/async_err.c
+++ b/crypto/async/async_err.c
@@ -15,14 +15,14 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA ASYNC_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_FAILED_TO_SET_POOL),
-    "failed to set pool"},
-    {ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_FAILED_TO_SWAP_CONTEXT),
-    "failed to swap context"},
-    {ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_INIT_FAILED), "init failed"},
-    {ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_INVALID_POOL_SIZE),
-    "invalid pool size"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_FAILED_TO_SET_POOL),
+        "failed to set pool" },
+    { ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_FAILED_TO_SWAP_CONTEXT),
+        "failed to swap context" },
+    { ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_INIT_FAILED), "init failed" },
+    { ERR_PACK(ERR_LIB_ASYNC, 0, ASYNC_R_INVALID_POOL_SIZE),
+        "invalid pool size" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/async/async_local.h b/crypto/async/async_local.h
index c06f413cf604e..9690adbb1e953 100644
--- a/crypto/async/async_local.h
+++ b/crypto/async/async_local.h
@@ -12,12 +12,12 @@
  * includes <signal.h> which includes <ucontext.h>
  */
 #if defined(__APPLE__) && defined(__MACH__) && !defined(_XOPEN_SOURCE)
-# define _XOPEN_SOURCE          /* Otherwise incomplete ucontext_t structure */
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#define _XOPEN_SOURCE /* Otherwise incomplete ucontext_t structure */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 #if defined(_WIN32)
-# include <windows.h>
+#include <windows.h>
 #endif
 
 #include "crypto/async.h"
@@ -38,7 +38,7 @@ struct async_ctx_st {
 
 struct async_job_st {
     async_fibre fibrectx;
-    int (*func) (void *);
+    int (*func)(void *);
     void *funcargs;
     int ret;
     int status;
@@ -78,4 +78,3 @@ void async_start_func(void);
 async_ctx *async_get_ctx(void);
 
 void async_wait_ctx_reset_counts(ASYNC_WAIT_CTX *ctx);
-
diff --git a/crypto/async/async_wait.c b/crypto/async/async_wait.c
index cf4db49dae393..662cd74dd12e6 100644
--- a/crypto/async/async_wait.c
+++ b/crypto/async/async_wait.c
@@ -42,9 +42,9 @@ 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 *))
 {
     struct fd_lookup_st *fdlookup;
 
@@ -63,7 +63,7 @@ int ASYNC_WAIT_CTX_set_wait_fd(ASYNC_WAIT_CTX *ctx, const void *key,
 }
 
 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)
 {
     struct fd_lookup_st *curr;
 
@@ -85,7 +85,7 @@ int ASYNC_WAIT_CTX_get_fd(ASYNC_WAIT_CTX *ctx, const void *key,
 }
 
 int ASYNC_WAIT_CTX_get_all_fds(ASYNC_WAIT_CTX *ctx, OSSL_ASYNC_FD *fd,
-                               size_t *numfds)
+    size_t *numfds)
 {
     struct fd_lookup_st *curr;
 
@@ -108,8 +108,8 @@ int ASYNC_WAIT_CTX_get_all_fds(ASYNC_WAIT_CTX *ctx, OSSL_ASYNC_FD *fd,
 }
 
 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)
 {
     struct fd_lookup_st *curr;
 
@@ -182,38 +182,38 @@ int ASYNC_WAIT_CTX_clear_fd(ASYNC_WAIT_CTX *ctx, const void *key)
 }
 
 int ASYNC_WAIT_CTX_set_callback(ASYNC_WAIT_CTX *ctx,
-                                ASYNC_callback_fn callback,
-                                void *callback_arg)
+    ASYNC_callback_fn callback,
+    void *callback_arg)
 {
-      if (ctx == NULL)
-          return 0;
+    if (ctx == NULL)
+        return 0;
 
-      ctx->callback = callback;
-      ctx->callback_arg = callback_arg;
-      return 1;
+    ctx->callback = callback;
+    ctx->callback_arg = callback_arg;
+    return 1;
 }
 
 int ASYNC_WAIT_CTX_get_callback(ASYNC_WAIT_CTX *ctx,
-                                ASYNC_callback_fn *callback,
-                                void **callback_arg)
+    ASYNC_callback_fn *callback,
+    void **callback_arg)
 {
-      if (ctx->callback == NULL)
-          return 0;
+    if (ctx->callback == NULL)
+        return 0;
 
-      *callback = ctx->callback;
-      *callback_arg = ctx->callback_arg;
-      return 1;
+    *callback = ctx->callback;
+    *callback_arg = ctx->callback_arg;
+    return 1;
 }
 
 int ASYNC_WAIT_CTX_set_status(ASYNC_WAIT_CTX *ctx, int status)
 {
-      ctx->status = status;
-      return 1;
+    ctx->status = status;
+    return 1;
 }
 
 int ASYNC_WAIT_CTX_get_status(ASYNC_WAIT_CTX *ctx)
 {
-      return ctx->status;
+    return ctx->status;
 }
 
 void async_wait_ctx_reset_counts(ASYNC_WAIT_CTX *ctx)
diff --git a/crypto/bf/bf_cfb64.c b/crypto/bf/bf_cfb64.c
index d7a92662042b9..e380972dbdc9f 100644
--- a/crypto/bf/bf_cfb64.c
+++ b/crypto/bf/bf_cfb64.c
@@ -23,8 +23,8 @@
  */
 
 void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, const BF_KEY *schedule,
-                      unsigned char *ivec, int *num, int encrypt)
+    long length, const BF_KEY *schedule,
+    unsigned char *ivec, int *num, int encrypt)
 {
     register BF_LONG v0, v1, t;
     register int n = *num;
diff --git a/crypto/bf/bf_ecb.c b/crypto/bf/bf_ecb.c
index b02768261d8b9..cee1bf138eef2 100644
--- a/crypto/bf/bf_ecb.c
+++ b/crypto/bf/bf_ecb.c
@@ -29,7 +29,7 @@ const char *BF_options(void)
 }
 
 void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                    const BF_KEY *key, int encrypt)
+    const BF_KEY *key, int encrypt)
 {
     BF_LONG l, d[2];
 
diff --git a/crypto/bf/bf_enc.c b/crypto/bf/bf_enc.c
index 40ddaf4af61ba..39a6e1bbb95c9 100644
--- a/crypto/bf/bf_enc.c
+++ b/crypto/bf/bf_enc.c
@@ -23,7 +23,7 @@
  */
 
 #if (BF_ROUNDS != 16) && (BF_ROUNDS != 20)
-# error If you set BF_ROUNDS to some value other than 16 or 20, you will have \
+#error If you set BF_ROUNDS to some value other than 16 or 20, you will have \
 to modify the code.
 #endif
 
@@ -54,12 +54,12 @@ void BF_encrypt(BF_LONG *data, const BF_KEY *key)
     BF_ENC(l, r, s, p[14]);
     BF_ENC(r, l, s, p[15]);
     BF_ENC(l, r, s, p[16]);
-# if BF_ROUNDS == 20
+#if BF_ROUNDS == 20
     BF_ENC(r, l, s, p[17]);
     BF_ENC(l, r, s, p[18]);
     BF_ENC(r, l, s, p[19]);
     BF_ENC(l, r, s, p[20]);
-# endif
+#endif
     r ^= p[BF_ROUNDS + 1];
 
     data[1] = l & 0xffffffffU;
@@ -77,12 +77,12 @@ void BF_decrypt(BF_LONG *data, const BF_KEY *key)
     r = data[1];
 
     l ^= p[BF_ROUNDS + 1];
-#  if BF_ROUNDS == 20
+#if BF_ROUNDS == 20
     BF_ENC(r, l, s, p[20]);
     BF_ENC(l, r, s, p[19]);
     BF_ENC(r, l, s, p[18]);
     BF_ENC(l, r, s, p[17]);
-#  endif
+#endif
     BF_ENC(r, l, s, p[16]);
     BF_ENC(l, r, s, p[15]);
     BF_ENC(r, l, s, p[14]);
@@ -106,7 +106,7 @@ void BF_decrypt(BF_LONG *data, const BF_KEY *key)
 }
 
 void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                    const BF_KEY *schedule, unsigned char *ivec, int encrypt)
+    const BF_KEY *schedule, unsigned char *ivec, int encrypt)
 {
     register BF_LONG tin0, tin1;
     register BF_LONG tout0, tout1, xor0, xor1;
diff --git a/crypto/bf/bf_local.h b/crypto/bf/bf_local.h
index 53c6963e6b08f..8634a57ceb750 100644
--- a/crypto/bf/bf_local.h
+++ b/crypto/bf/bf_local.h
@@ -8,77 +8,91 @@
  */
 
 #ifndef OSSL_CRYPTO_BF_LOCAL_H
-# define OSSL_CRYPTO_BF_LOCAL_H
-# include <openssl/opensslconf.h>
+#define OSSL_CRYPTO_BF_LOCAL_H
+#include <openssl/opensslconf.h>
 
 /* NOTE - c is not incremented as per n2l */
-# define n2ln(c,l1,l2,n) { \
-                        c+=n; \
-                        l1=l2=0; \
-                        switch (n) { \
-                        case 8: l2 =((unsigned long)(*(--(c))))    ; \
-                        /* fall through */                              \
-                        case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
-                        /* fall through */                              \
-                        case 6: l2|=((unsigned long)(*(--(c))))<<16; \
-                        /* fall through */                              \
-                        case 5: l2|=((unsigned long)(*(--(c))))<<24; \
-                        /* fall through */                              \
-                        case 4: l1 =((unsigned long)(*(--(c))))    ; \
-                        /* fall through */                              \
-                        case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
-                        /* fall through */                              \
-                        case 2: l1|=((unsigned long)(*(--(c))))<<16; \
-                        /* fall through */                              \
-                        case 1: l1|=((unsigned long)(*(--(c))))<<24; \
-                                } \
-                        }
+#define n2ln(c, l1, l2, n)                           \
+    {                                                \
+        c += n;                                      \
+        l1 = l2 = 0;                                 \
+        switch (n) {                                 \
+        case 8:                                      \
+            l2 = ((unsigned long)(*(--(c))));        \
+        /* fall through */                           \
+        case 7:                                      \
+            l2 |= ((unsigned long)(*(--(c)))) << 8;  \
+        /* fall through */                           \
+        case 6:                                      \
+            l2 |= ((unsigned long)(*(--(c)))) << 16; \
+        /* fall through */                           \
+        case 5:                                      \
+            l2 |= ((unsigned long)(*(--(c)))) << 24; \
+        /* fall through */                           \
+        case 4:                                      \
+            l1 = ((unsigned long)(*(--(c))));        \
+        /* fall through */                           \
+        case 3:                                      \
+            l1 |= ((unsigned long)(*(--(c)))) << 8;  \
+        /* fall through */                           \
+        case 2:                                      \
+            l1 |= ((unsigned long)(*(--(c)))) << 16; \
+        /* fall through */                           \
+        case 1:                                      \
+            l1 |= ((unsigned long)(*(--(c)))) << 24; \
+        }                                            \
+    }
 
 /* NOTE - c is not incremented as per l2n */
-# define l2nn(l1,l2,c,n) { \
-                        c+=n; \
-                        switch (n) { \
-                        case 8: *(--(c))=(unsigned char)(((l2)    )&0xff); \
-                        /* fall through */                                    \
-                        case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
-                        /* fall through */                                    \
-                        case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
-                        /* fall through */                                    \
-                        case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
-                        /* fall through */                                    \
-                        case 4: *(--(c))=(unsigned char)(((l1)    )&0xff); \
-                        /* fall through */                                    \
-                        case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
-                        /* fall through */                                    \
-                        case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
-                        /* fall through */                                    \
-                        case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
-                                } \
-                        }
+#define l2nn(l1, l2, c, n)                                   \
+    {                                                        \
+        c += n;                                              \
+        switch (n) {                                         \
+        case 8:                                              \
+            *(--(c)) = (unsigned char)(((l2)) & 0xff);       \
+        /* fall through */                                   \
+        case 7:                                              \
+            *(--(c)) = (unsigned char)(((l2) >> 8) & 0xff);  \
+        /* fall through */                                   \
+        case 6:                                              \
+            *(--(c)) = (unsigned char)(((l2) >> 16) & 0xff); \
+        /* fall through */                                   \
+        case 5:                                              \
+            *(--(c)) = (unsigned char)(((l2) >> 24) & 0xff); \
+        /* fall through */                                   \
+        case 4:                                              \
+            *(--(c)) = (unsigned char)(((l1)) & 0xff);       \
+        /* fall through */                                   \
+        case 3:                                              \
+            *(--(c)) = (unsigned char)(((l1) >> 8) & 0xff);  \
+        /* fall through */                                   \
+        case 2:                                              \
+            *(--(c)) = (unsigned char)(((l1) >> 16) & 0xff); \
+        /* fall through */                                   \
+        case 1:                                              \
+            *(--(c)) = (unsigned char)(((l1) >> 24) & 0xff); \
+        }                                                    \
+    }
 
-# undef n2l
-# define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L, \
-                         l|=((unsigned long)(*((c)++)))<<16L, \
-                         l|=((unsigned long)(*((c)++)))<< 8L, \
-                         l|=((unsigned long)(*((c)++))))
+#undef n2l
+#define n2l(c, l) (l = ((unsigned long)(*((c)++))) << 24L, \
+    l |= ((unsigned long)(*((c)++))) << 16L,               \
+    l |= ((unsigned long)(*((c)++))) << 8L,                \
+    l |= ((unsigned long)(*((c)++))))
 
-# undef l2n
-# define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)     )&0xff))
+#undef l2n
+#define l2n(l, c) (*((c)++) = (unsigned char)(((l) >> 24L) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 16L) & 0xff),                \
+    *((c)++) = (unsigned char)(((l) >> 8L) & 0xff),                 \
+    *((c)++) = (unsigned char)(((l)) & 0xff))
 
 /*
  * This is actually a big endian algorithm, the most significant byte is used
  * to lookup array 0
  */
 
-# define BF_ENC(LL,R,S,P) ( \
-        LL^=P, \
-        LL^=((( S[       ((R>>24)&0xff)] + \
-                S[0x0100+((R>>16)&0xff)])^ \
-                S[0x0200+((R>> 8)&0xff)])+ \
-                S[0x0300+((R    )&0xff)])&0xffffffffU \
-        )
+#define BF_ENC(LL, R, S, P) ( \
+    LL ^= P,                  \
+    LL ^= (((S[((R >> 24) & 0xff)] + S[0x0100 + ((R >> 16) & 0xff)]) ^ S[0x0200 + ((R >> 8) & 0xff)]) + S[0x0300 + ((R) & 0xff)]) & 0xffffffffU)
 
 #endif
diff --git a/crypto/bf/bf_ofb64.c b/crypto/bf/bf_ofb64.c
index 086c3f07f0bc6..5c9193add17e9 100644
--- a/crypto/bf/bf_ofb64.c
+++ b/crypto/bf/bf_ofb64.c
@@ -22,8 +22,8 @@
  * used is contained in *num;
  */
 void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, const BF_KEY *schedule,
-                      unsigned char *ivec, int *num)
+    long length, const BF_KEY *schedule,
+    unsigned char *ivec, int *num)
 {
     register BF_LONG v0, v1, t;
     register int n = *num;
diff --git a/crypto/bf/bf_pi.h b/crypto/bf/bf_pi.h
index 8b9896e7f3e03..ffb3b3e9b35fe 100644
--- a/crypto/bf/bf_pi.h
+++ b/crypto/bf/bf_pi.h
@@ -8,523 +8,1035 @@
  */
 
 static const BF_KEY bf_init = {
+    { 0x243f6a88L, 0x85a308d3L, 0x13198a2eL, 0x03707344L,
+        0xa4093822L, 0x299f31d0L, 0x082efa98L, 0xec4e6c89L,
+        0x452821e6L, 0x38d01377L, 0xbe5466cfL, 0x34e90c6cL,
+        0xc0ac29b7L, 0xc97c50ddL, 0x3f84d5b5L, 0xb5470917L,
+        0x9216d5d9L, 0x8979fb1b },
     {
-     0x243f6a88L, 0x85a308d3L, 0x13198a2eL, 0x03707344L,
-     0xa4093822L, 0x299f31d0L, 0x082efa98L, 0xec4e6c89L,
-     0x452821e6L, 0x38d01377L, 0xbe5466cfL, 0x34e90c6cL,
-     0xc0ac29b7L, 0xc97c50ddL, 0x3f84d5b5L, 0xb5470917L,
-     0x9216d5d9L, 0x8979fb1b}, {
-                                0xd1310ba6L, 0x98dfb5acL, 0x2ffd72dbL,
-                                0xd01adfb7L,
-                                0xb8e1afedL, 0x6a267e96L, 0xba7c9045L,
-                                0xf12c7f99L,
-                                0x24a19947L, 0xb3916cf7L, 0x0801f2e2L,
-                                0x858efc16L,
-                                0x636920d8L, 0x71574e69L, 0xa458fea3L,
-                                0xf4933d7eL,
-                                0x0d95748fL, 0x728eb658L, 0x718bcd58L,
-                                0x82154aeeL,
-                                0x7b54a41dL, 0xc25a59b5L, 0x9c30d539L,
-                                0x2af26013L,
-                                0xc5d1b023L, 0x286085f0L, 0xca417918L,
-                                0xb8db38efL,
-                                0x8e79dcb0L, 0x603a180eL, 0x6c9e0e8bL,
-                                0xb01e8a3eL,
-                                0xd71577c1L, 0xbd314b27L, 0x78af2fdaL,
-                                0x55605c60L,
-                                0xe65525f3L, 0xaa55ab94L, 0x57489862L,
-                                0x63e81440L,
-                                0x55ca396aL, 0x2aab10b6L, 0xb4cc5c34L,
-                                0x1141e8ceL,
-                                0xa15486afL, 0x7c72e993L, 0xb3ee1411L,
-                                0x636fbc2aL,
-                                0x2ba9c55dL, 0x741831f6L, 0xce5c3e16L,
-                                0x9b87931eL,
-                                0xafd6ba33L, 0x6c24cf5cL, 0x7a325381L,
-                                0x28958677L,
-                                0x3b8f4898L, 0x6b4bb9afL, 0xc4bfe81bL,
-                                0x66282193L,
-                                0x61d809ccL, 0xfb21a991L, 0x487cac60L,
-                                0x5dec8032L,
-                                0xef845d5dL, 0xe98575b1L, 0xdc262302L,
-                                0xeb651b88L,
-                                0x23893e81L, 0xd396acc5L, 0x0f6d6ff3L,
-                                0x83f44239L,
-                                0x2e0b4482L, 0xa4842004L, 0x69c8f04aL,
-                                0x9e1f9b5eL,
-                                0x21c66842L, 0xf6e96c9aL, 0x670c9c61L,
-                                0xabd388f0L,
-                                0x6a51a0d2L, 0xd8542f68L, 0x960fa728L,
-                                0xab5133a3L,
-                                0x6eef0b6cL, 0x137a3be4L, 0xba3bf050L,
-                                0x7efb2a98L,
-                                0xa1f1651dL, 0x39af0176L, 0x66ca593eL,
-                                0x82430e88L,
-                                0x8cee8619L, 0x456f9fb4L, 0x7d84a5c3L,
-                                0x3b8b5ebeL,
-                                0xe06f75d8L, 0x85c12073L, 0x401a449fL,
-                                0x56c16aa6L,
-                                0x4ed3aa62L, 0x363f7706L, 0x1bfedf72L,
-                                0x429b023dL,
-                                0x37d0d724L, 0xd00a1248L, 0xdb0fead3L,
-                                0x49f1c09bL,
-                                0x075372c9L, 0x80991b7bL, 0x25d479d8L,
-                                0xf6e8def7L,
-                                0xe3fe501aL, 0xb6794c3bL, 0x976ce0bdL,
-                                0x04c006baL,
-                                0xc1a94fb6L, 0x409f60c4L, 0x5e5c9ec2L,
-                                0x196a2463L,
-                                0x68fb6fafL, 0x3e6c53b5L, 0x1339b2ebL,
-                                0x3b52ec6fL,
-                                0x6dfc511fL, 0x9b30952cL, 0xcc814544L,
-                                0xaf5ebd09L,
-                                0xbee3d004L, 0xde334afdL, 0x660f2807L,
-                                0x192e4bb3L,
-                                0xc0cba857L, 0x45c8740fL, 0xd20b5f39L,
-                                0xb9d3fbdbL,
-                                0x5579c0bdL, 0x1a60320aL, 0xd6a100c6L,
-                                0x402c7279L,
-                                0x679f25feL, 0xfb1fa3ccL, 0x8ea5e9f8L,
-                                0xdb3222f8L,
-                                0x3c7516dfL, 0xfd616b15L, 0x2f501ec8L,
-                                0xad0552abL,
-                                0x323db5faL, 0xfd238760L, 0x53317b48L,
-                                0x3e00df82L,
-                                0x9e5c57bbL, 0xca6f8ca0L, 0x1a87562eL,
-                                0xdf1769dbL,
-                                0xd542a8f6L, 0x287effc3L, 0xac6732c6L,
-                                0x8c4f5573L,
-                                0x695b27b0L, 0xbbca58c8L, 0xe1ffa35dL,
-                                0xb8f011a0L,
-                                0x10fa3d98L, 0xfd2183b8L, 0x4afcb56cL,
-                                0x2dd1d35bL,
-                                0x9a53e479L, 0xb6f84565L, 0xd28e49bcL,
-                                0x4bfb9790L,
-                                0xe1ddf2daL, 0xa4cb7e33L, 0x62fb1341L,
-                                0xcee4c6e8L,
-                                0xef20cadaL, 0x36774c01L, 0xd07e9efeL,
-                                0x2bf11fb4L,
-                                0x95dbda4dL, 0xae909198L, 0xeaad8e71L,
-                                0x6b93d5a0L,
-                                0xd08ed1d0L, 0xafc725e0L, 0x8e3c5b2fL,
-                                0x8e7594b7L,
-                                0x8ff6e2fbL, 0xf2122b64L, 0x8888b812L,
-                                0x900df01cL,
-                                0x4fad5ea0L, 0x688fc31cL, 0xd1cff191L,
-                                0xb3a8c1adL,
-                                0x2f2f2218L, 0xbe0e1777L, 0xea752dfeL,
-                                0x8b021fa1L,
-                                0xe5a0cc0fL, 0xb56f74e8L, 0x18acf3d6L,
-                                0xce89e299L,
-                                0xb4a84fe0L, 0xfd13e0b7L, 0x7cc43b81L,
-                                0xd2ada8d9L,
-                                0x165fa266L, 0x80957705L, 0x93cc7314L,
-                                0x211a1477L,
-                                0xe6ad2065L, 0x77b5fa86L, 0xc75442f5L,
-                                0xfb9d35cfL,
-                                0xebcdaf0cL, 0x7b3e89a0L, 0xd6411bd3L,
-                                0xae1e7e49L,
-                                0x00250e2dL, 0x2071b35eL, 0x226800bbL,
-                                0x57b8e0afL,
-                                0x2464369bL, 0xf009b91eL, 0x5563911dL,
-                                0x59dfa6aaL,
-                                0x78c14389L, 0xd95a537fL, 0x207d5ba2L,
-                                0x02e5b9c5L,
-                                0x83260376L, 0x6295cfa9L, 0x11c81968L,
-                                0x4e734a41L,
-                                0xb3472dcaL, 0x7b14a94aL, 0x1b510052L,
-                                0x9a532915L,
-                                0xd60f573fL, 0xbc9bc6e4L, 0x2b60a476L,
-                                0x81e67400L,
-                                0x08ba6fb5L, 0x571be91fL, 0xf296ec6bL,
-                                0x2a0dd915L,
-                                0xb6636521L, 0xe7b9f9b6L, 0xff34052eL,
-                                0xc5855664L,
-                                0x53b02d5dL, 0xa99f8fa1L, 0x08ba4799L,
-                                0x6e85076aL,
-                                0x4b7a70e9L, 0xb5b32944L, 0xdb75092eL,
-                                0xc4192623L,
-                                0xad6ea6b0L, 0x49a7df7dL, 0x9cee60b8L,
-                                0x8fedb266L,
-                                0xecaa8c71L, 0x699a17ffL, 0x5664526cL,
-                                0xc2b19ee1L,
-                                0x193602a5L, 0x75094c29L, 0xa0591340L,
-                                0xe4183a3eL,
-                                0x3f54989aL, 0x5b429d65L, 0x6b8fe4d6L,
-                                0x99f73fd6L,
-                                0xa1d29c07L, 0xefe830f5L, 0x4d2d38e6L,
-                                0xf0255dc1L,
-                                0x4cdd2086L, 0x8470eb26L, 0x6382e9c6L,
-                                0x021ecc5eL,
-                                0x09686b3fL, 0x3ebaefc9L, 0x3c971814L,
-                                0x6b6a70a1L,
-                                0x687f3584L, 0x52a0e286L, 0xb79c5305L,
-                                0xaa500737L,
-                                0x3e07841cL, 0x7fdeae5cL, 0x8e7d44ecL,
-                                0x5716f2b8L,
-                                0xb03ada37L, 0xf0500c0dL, 0xf01c1f04L,
-                                0x0200b3ffL,
-                                0xae0cf51aL, 0x3cb574b2L, 0x25837a58L,
-                                0xdc0921bdL,
-                                0xd19113f9L, 0x7ca92ff6L, 0x94324773L,
-                                0x22f54701L,
-                                0x3ae5e581L, 0x37c2dadcL, 0xc8b57634L,
-                                0x9af3dda7L,
-                                0xa9446146L, 0x0fd0030eL, 0xecc8c73eL,
-                                0xa4751e41L,
-                                0xe238cd99L, 0x3bea0e2fL, 0x3280bba1L,
-                                0x183eb331L,
-                                0x4e548b38L, 0x4f6db908L, 0x6f420d03L,
-                                0xf60a04bfL,
-                                0x2cb81290L, 0x24977c79L, 0x5679b072L,
-                                0xbcaf89afL,
-                                0xde9a771fL, 0xd9930810L, 0xb38bae12L,
-                                0xdccf3f2eL,
-                                0x5512721fL, 0x2e6b7124L, 0x501adde6L,
-                                0x9f84cd87L,
-                                0x7a584718L, 0x7408da17L, 0xbc9f9abcL,
-                                0xe94b7d8cL,
-                                0xec7aec3aL, 0xdb851dfaL, 0x63094366L,
-                                0xc464c3d2L,
-                                0xef1c1847L, 0x3215d908L, 0xdd433b37L,
-                                0x24c2ba16L,
-                                0x12a14d43L, 0x2a65c451L, 0x50940002L,
-                                0x133ae4ddL,
-                                0x71dff89eL, 0x10314e55L, 0x81ac77d6L,
-                                0x5f11199bL,
-                                0x043556f1L, 0xd7a3c76bL, 0x3c11183bL,
-                                0x5924a509L,
-                                0xf28fe6edL, 0x97f1fbfaL, 0x9ebabf2cL,
-                                0x1e153c6eL,
-                                0x86e34570L, 0xeae96fb1L, 0x860e5e0aL,
-                                0x5a3e2ab3L,
-                                0x771fe71cL, 0x4e3d06faL, 0x2965dcb9L,
-                                0x99e71d0fL,
-                                0x803e89d6L, 0x5266c825L, 0x2e4cc978L,
-                                0x9c10b36aL,
-                                0xc6150ebaL, 0x94e2ea78L, 0xa5fc3c53L,
-                                0x1e0a2df4L,
-                                0xf2f74ea7L, 0x361d2b3dL, 0x1939260fL,
-                                0x19c27960L,
-                                0x5223a708L, 0xf71312b6L, 0xebadfe6eL,
-                                0xeac31f66L,
-                                0xe3bc4595L, 0xa67bc883L, 0xb17f37d1L,
-                                0x018cff28L,
-                                0xc332ddefL, 0xbe6c5aa5L, 0x65582185L,
-                                0x68ab9802L,
-                                0xeecea50fL, 0xdb2f953bL, 0x2aef7dadL,
-                                0x5b6e2f84L,
-                                0x1521b628L, 0x29076170L, 0xecdd4775L,
-                                0x619f1510L,
-                                0x13cca830L, 0xeb61bd96L, 0x0334fe1eL,
-                                0xaa0363cfL,
-                                0xb5735c90L, 0x4c70a239L, 0xd59e9e0bL,
-                                0xcbaade14L,
-                                0xeecc86bcL, 0x60622ca7L, 0x9cab5cabL,
-                                0xb2f3846eL,
-                                0x648b1eafL, 0x19bdf0caL, 0xa02369b9L,
-                                0x655abb50L,
-                                0x40685a32L, 0x3c2ab4b3L, 0x319ee9d5L,
-                                0xc021b8f7L,
-                                0x9b540b19L, 0x875fa099L, 0x95f7997eL,
-                                0x623d7da8L,
-                                0xf837889aL, 0x97e32d77L, 0x11ed935fL,
-                                0x16681281L,
-                                0x0e358829L, 0xc7e61fd6L, 0x96dedfa1L,
-                                0x7858ba99L,
-                                0x57f584a5L, 0x1b227263L, 0x9b83c3ffL,
-                                0x1ac24696L,
-                                0xcdb30aebL, 0x532e3054L, 0x8fd948e4L,
-                                0x6dbc3128L,
-                                0x58ebf2efL, 0x34c6ffeaL, 0xfe28ed61L,
-                                0xee7c3c73L,
-                                0x5d4a14d9L, 0xe864b7e3L, 0x42105d14L,
-                                0x203e13e0L,
-                                0x45eee2b6L, 0xa3aaabeaL, 0xdb6c4f15L,
-                                0xfacb4fd0L,
-                                0xc742f442L, 0xef6abbb5L, 0x654f3b1dL,
-                                0x41cd2105L,
-                                0xd81e799eL, 0x86854dc7L, 0xe44b476aL,
-                                0x3d816250L,
-                                0xcf62a1f2L, 0x5b8d2646L, 0xfc8883a0L,
-                                0xc1c7b6a3L,
-                                0x7f1524c3L, 0x69cb7492L, 0x47848a0bL,
-                                0x5692b285L,
-                                0x095bbf00L, 0xad19489dL, 0x1462b174L,
-                                0x23820e00L,
-                                0x58428d2aL, 0x0c55f5eaL, 0x1dadf43eL,
-                                0x233f7061L,
-                                0x3372f092L, 0x8d937e41L, 0xd65fecf1L,
-                                0x6c223bdbL,
-                                0x7cde3759L, 0xcbee7460L, 0x4085f2a7L,
-                                0xce77326eL,
-                                0xa6078084L, 0x19f8509eL, 0xe8efd855L,
-                                0x61d99735L,
-                                0xa969a7aaL, 0xc50c06c2L, 0x5a04abfcL,
-                                0x800bcadcL,
-                                0x9e447a2eL, 0xc3453484L, 0xfdd56705L,
-                                0x0e1e9ec9L,
-                                0xdb73dbd3L, 0x105588cdL, 0x675fda79L,
-                                0xe3674340L,
-                                0xc5c43465L, 0x713e38d8L, 0x3d28f89eL,
-                                0xf16dff20L,
-                                0x153e21e7L, 0x8fb03d4aL, 0xe6e39f2bL,
-                                0xdb83adf7L,
-                                0xe93d5a68L, 0x948140f7L, 0xf64c261cL,
-                                0x94692934L,
-                                0x411520f7L, 0x7602d4f7L, 0xbcf46b2eL,
-                                0xd4a20068L,
-                                0xd4082471L, 0x3320f46aL, 0x43b7d4b7L,
-                                0x500061afL,
-                                0x1e39f62eL, 0x97244546L, 0x14214f74L,
-                                0xbf8b8840L,
-                                0x4d95fc1dL, 0x96b591afL, 0x70f4ddd3L,
-                                0x66a02f45L,
-                                0xbfbc09ecL, 0x03bd9785L, 0x7fac6dd0L,
-                                0x31cb8504L,
-                                0x96eb27b3L, 0x55fd3941L, 0xda2547e6L,
-                                0xabca0a9aL,
-                                0x28507825L, 0x530429f4L, 0x0a2c86daL,
-                                0xe9b66dfbL,
-                                0x68dc1462L, 0xd7486900L, 0x680ec0a4L,
-                                0x27a18deeL,
-                                0x4f3ffea2L, 0xe887ad8cL, 0xb58ce006L,
-                                0x7af4d6b6L,
-                                0xaace1e7cL, 0xd3375fecL, 0xce78a399L,
-                                0x406b2a42L,
-                                0x20fe9e35L, 0xd9f385b9L, 0xee39d7abL,
-                                0x3b124e8bL,
-                                0x1dc9faf7L, 0x4b6d1856L, 0x26a36631L,
-                                0xeae397b2L,
-                                0x3a6efa74L, 0xdd5b4332L, 0x6841e7f7L,
-                                0xca7820fbL,
-                                0xfb0af54eL, 0xd8feb397L, 0x454056acL,
-                                0xba489527L,
-                                0x55533a3aL, 0x20838d87L, 0xfe6ba9b7L,
-                                0xd096954bL,
-                                0x55a867bcL, 0xa1159a58L, 0xcca92963L,
-                                0x99e1db33L,
-                                0xa62a4a56L, 0x3f3125f9L, 0x5ef47e1cL,
-                                0x9029317cL,
-                                0xfdf8e802L, 0x04272f70L, 0x80bb155cL,
-                                0x05282ce3L,
-                                0x95c11548L, 0xe4c66d22L, 0x48c1133fL,
-                                0xc70f86dcL,
-                                0x07f9c9eeL, 0x41041f0fL, 0x404779a4L,
-                                0x5d886e17L,
-                                0x325f51ebL, 0xd59bc0d1L, 0xf2bcc18fL,
-                                0x41113564L,
-                                0x257b7834L, 0x602a9c60L, 0xdff8e8a3L,
-                                0x1f636c1bL,
-                                0x0e12b4c2L, 0x02e1329eL, 0xaf664fd1L,
-                                0xcad18115L,
-                                0x6b2395e0L, 0x333e92e1L, 0x3b240b62L,
-                                0xeebeb922L,
-                                0x85b2a20eL, 0xe6ba0d99L, 0xde720c8cL,
-                                0x2da2f728L,
-                                0xd0127845L, 0x95b794fdL, 0x647d0862L,
-                                0xe7ccf5f0L,
-                                0x5449a36fL, 0x877d48faL, 0xc39dfd27L,
-                                0xf33e8d1eL,
-                                0x0a476341L, 0x992eff74L, 0x3a6f6eabL,
-                                0xf4f8fd37L,
-                                0xa812dc60L, 0xa1ebddf8L, 0x991be14cL,
-                                0xdb6e6b0dL,
-                                0xc67b5510L, 0x6d672c37L, 0x2765d43bL,
-                                0xdcd0e804L,
-                                0xf1290dc7L, 0xcc00ffa3L, 0xb5390f92L,
-                                0x690fed0bL,
-                                0x667b9ffbL, 0xcedb7d9cL, 0xa091cf0bL,
-                                0xd9155ea3L,
-                                0xbb132f88L, 0x515bad24L, 0x7b9479bfL,
-                                0x763bd6ebL,
-                                0x37392eb3L, 0xcc115979L, 0x8026e297L,
-                                0xf42e312dL,
-                                0x6842ada7L, 0xc66a2b3bL, 0x12754cccL,
-                                0x782ef11cL,
-                                0x6a124237L, 0xb79251e7L, 0x06a1bbe6L,
-                                0x4bfb6350L,
-                                0x1a6b1018L, 0x11caedfaL, 0x3d25bdd8L,
-                                0xe2e1c3c9L,
-                                0x44421659L, 0x0a121386L, 0xd90cec6eL,
-                                0xd5abea2aL,
-                                0x64af674eL, 0xda86a85fL, 0xbebfe988L,
-                                0x64e4c3feL,
-                                0x9dbc8057L, 0xf0f7c086L, 0x60787bf8L,
-                                0x6003604dL,
-                                0xd1fd8346L, 0xf6381fb0L, 0x7745ae04L,
-                                0xd736fcccL,
-                                0x83426b33L, 0xf01eab71L, 0xb0804187L,
-                                0x3c005e5fL,
-                                0x77a057beL, 0xbde8ae24L, 0x55464299L,
-                                0xbf582e61L,
-                                0x4e58f48fL, 0xf2ddfda2L, 0xf474ef38L,
-                                0x8789bdc2L,
-                                0x5366f9c3L, 0xc8b38e74L, 0xb475f255L,
-                                0x46fcd9b9L,
-                                0x7aeb2661L, 0x8b1ddf84L, 0x846a0e79L,
-                                0x915f95e2L,
-                                0x466e598eL, 0x20b45770L, 0x8cd55591L,
-                                0xc902de4cL,
-                                0xb90bace1L, 0xbb8205d0L, 0x11a86248L,
-                                0x7574a99eL,
-                                0xb77f19b6L, 0xe0a9dc09L, 0x662d09a1L,
-                                0xc4324633L,
-                                0xe85a1f02L, 0x09f0be8cL, 0x4a99a025L,
-                                0x1d6efe10L,
-                                0x1ab93d1dL, 0x0ba5a4dfL, 0xa186f20fL,
-                                0x2868f169L,
-                                0xdcb7da83L, 0x573906feL, 0xa1e2ce9bL,
-                                0x4fcd7f52L,
-                                0x50115e01L, 0xa70683faL, 0xa002b5c4L,
-                                0x0de6d027L,
-                                0x9af88c27L, 0x773f8641L, 0xc3604c06L,
-                                0x61a806b5L,
-                                0xf0177a28L, 0xc0f586e0L, 0x006058aaL,
-                                0x30dc7d62L,
-                                0x11e69ed7L, 0x2338ea63L, 0x53c2dd94L,
-                                0xc2c21634L,
-                                0xbbcbee56L, 0x90bcb6deL, 0xebfc7da1L,
-                                0xce591d76L,
-                                0x6f05e409L, 0x4b7c0188L, 0x39720a3dL,
-                                0x7c927c24L,
-                                0x86e3725fL, 0x724d9db9L, 0x1ac15bb4L,
-                                0xd39eb8fcL,
-                                0xed545578L, 0x08fca5b5L, 0xd83d7cd3L,
-                                0x4dad0fc4L,
-                                0x1e50ef5eL, 0xb161e6f8L, 0xa28514d9L,
-                                0x6c51133cL,
-                                0x6fd5c7e7L, 0x56e14ec4L, 0x362abfceL,
-                                0xddc6c837L,
-                                0xd79a3234L, 0x92638212L, 0x670efa8eL,
-                                0x406000e0L,
-                                0x3a39ce37L, 0xd3faf5cfL, 0xabc27737L,
-                                0x5ac52d1bL,
-                                0x5cb0679eL, 0x4fa33742L, 0xd3822740L,
-                                0x99bc9bbeL,
-                                0xd5118e9dL, 0xbf0f7315L, 0xd62d1c7eL,
-                                0xc700c47bL,
-                                0xb78c1b6bL, 0x21a19045L, 0xb26eb1beL,
-                                0x6a366eb4L,
-                                0x5748ab2fL, 0xbc946e79L, 0xc6a376d2L,
-                                0x6549c2c8L,
-                                0x530ff8eeL, 0x468dde7dL, 0xd5730a1dL,
-                                0x4cd04dc6L,
-                                0x2939bbdbL, 0xa9ba4650L, 0xac9526e8L,
-                                0xbe5ee304L,
-                                0xa1fad5f0L, 0x6a2d519aL, 0x63ef8ce2L,
-                                0x9a86ee22L,
-                                0xc089c2b8L, 0x43242ef6L, 0xa51e03aaL,
-                                0x9cf2d0a4L,
-                                0x83c061baL, 0x9be96a4dL, 0x8fe51550L,
-                                0xba645bd6L,
-                                0x2826a2f9L, 0xa73a3ae1L, 0x4ba99586L,
-                                0xef5562e9L,
-                                0xc72fefd3L, 0xf752f7daL, 0x3f046f69L,
-                                0x77fa0a59L,
-                                0x80e4a915L, 0x87b08601L, 0x9b09e6adL,
-                                0x3b3ee593L,
-                                0xe990fd5aL, 0x9e34d797L, 0x2cf0b7d9L,
-                                0x022b8b51L,
-                                0x96d5ac3aL, 0x017da67dL, 0xd1cf3ed6L,
-                                0x7c7d2d28L,
-                                0x1f9f25cfL, 0xadf2b89bL, 0x5ad6b472L,
-                                0x5a88f54cL,
-                                0xe029ac71L, 0xe019a5e6L, 0x47b0acfdL,
-                                0xed93fa9bL,
-                                0xe8d3c48dL, 0x283b57ccL, 0xf8d56629L,
-                                0x79132e28L,
-                                0x785f0191L, 0xed756055L, 0xf7960e44L,
-                                0xe3d35e8cL,
-                                0x15056dd4L, 0x88f46dbaL, 0x03a16125L,
-                                0x0564f0bdL,
-                                0xc3eb9e15L, 0x3c9057a2L, 0x97271aecL,
-                                0xa93a072aL,
-                                0x1b3f6d9bL, 0x1e6321f5L, 0xf59c66fbL,
-                                0x26dcf319L,
-                                0x7533d928L, 0xb155fdf5L, 0x03563482L,
-                                0x8aba3cbbL,
-                                0x28517711L, 0xc20ad9f8L, 0xabcc5167L,
-                                0xccad925fL,
-                                0x4de81751L, 0x3830dc8eL, 0x379d5862L,
-                                0x9320f991L,
-                                0xea7a90c2L, 0xfb3e7bceL, 0x5121ce64L,
-                                0x774fbe32L,
-                                0xa8b6e37eL, 0xc3293d46L, 0x48de5369L,
-                                0x6413e680L,
-                                0xa2ae0810L, 0xdd6db224L, 0x69852dfdL,
-                                0x09072166L,
-                                0xb39a460aL, 0x6445c0ddL, 0x586cdecfL,
-                                0x1c20c8aeL,
-                                0x5bbef7ddL, 0x1b588d40L, 0xccd2017fL,
-                                0x6bb4e3bbL,
-                                0xdda26a7eL, 0x3a59ff45L, 0x3e350a44L,
-                                0xbcb4cdd5L,
-                                0x72eacea8L, 0xfa6484bbL, 0x8d6612aeL,
-                                0xbf3c6f47L,
-                                0xd29be463L, 0x542f5d9eL, 0xaec2771bL,
-                                0xf64e6370L,
-                                0x740e0d8dL, 0xe75b1357L, 0xf8721671L,
-                                0xaf537d5dL,
-                                0x4040cb08L, 0x4eb4e2ccL, 0x34d2466aL,
-                                0x0115af84L,
-                                0xe1b00428L, 0x95983a1dL, 0x06b89fb4L,
-                                0xce6ea048L,
-                                0x6f3f3b82L, 0x3520ab82L, 0x011a1d4bL,
-                                0x277227f8L,
-                                0x611560b1L, 0xe7933fdcL, 0xbb3a792bL,
-                                0x344525bdL,
-                                0xa08839e1L, 0x51ce794bL, 0x2f32c9b7L,
-                                0xa01fbac9L,
-                                0xe01cc87eL, 0xbcc7d1f6L, 0xcf0111c3L,
-                                0xa1e8aac7L,
-                                0x1a908749L, 0xd44fbd9aL, 0xd0dadecbL,
-                                0xd50ada38L,
-                                0x0339c32aL, 0xc6913667L, 0x8df9317cL,
-                                0xe0b12b4fL,
-                                0xf79e59b7L, 0x43f5bb3aL, 0xf2d519ffL,
-                                0x27d9459cL,
-                                0xbf97222cL, 0x15e6fc2aL, 0x0f91fc71L,
-                                0x9b941525L,
-                                0xfae59361L, 0xceb69cebL, 0xc2a86459L,
-                                0x12baa8d1L,
-                                0xb6c1075eL, 0xe3056a0cL, 0x10d25065L,
-                                0xcb03a442L,
-                                0xe0ec6e0eL, 0x1698db3bL, 0x4c98a0beL,
-                                0x3278e964L,
-                                0x9f1f9532L, 0xe0d392dfL, 0xd3a0342bL,
-                                0x8971f21eL,
-                                0x1b0a7441L, 0x4ba3348cL, 0xc5be7120L,
-                                0xc37632d8L,
-                                0xdf359f8dL, 0x9b992f2eL, 0xe60b6f47L,
-                                0x0fe3f11dL,
-                                0xe54cda54L, 0x1edad891L, 0xce6279cfL,
-                                0xcd3e7e6fL,
-                                0x1618b166L, 0xfd2c1d05L, 0x848fd2c5L,
-                                0xf6fb2299L,
-                                0xf523f357L, 0xa6327623L, 0x93a83531L,
-                                0x56cccd02L,
-                                0xacf08162L, 0x5a75ebb5L, 0x6e163697L,
-                                0x88d273ccL,
-                                0xde966292L, 0x81b949d0L, 0x4c50901bL,
-                                0x71c65614L,
-                                0xe6c6c7bdL, 0x327a140aL, 0x45e1d006L,
-                                0xc3f27b9aL,
-                                0xc9aa53fdL, 0x62a80f00L, 0xbb25bfe2L,
-                                0x35bdd2f6L,
-                                0x71126905L, 0xb2040222L, 0xb6cbcf7cL,
-                                0xcd769c2bL,
-                                0x53113ec0L, 0x1640e3d3L, 0x38abbd60L,
-                                0x2547adf0L,
-                                0xba38209cL, 0xf746ce76L, 0x77afa1c5L,
-                                0x20756060L,
-                                0x85cbfe4eL, 0x8ae88dd8L, 0x7aaaf9b0L,
-                                0x4cf9aa7eL,
-                                0x1948c25cL, 0x02fb8a8cL, 0x01c36ae4L,
-                                0xd6ebe1f9L,
-                                0x90d4f869L, 0xa65cdea0L, 0x3f09252dL,
-                                0xc208e69fL,
-                                0xb74e6132L, 0xce77e25bL, 0x578fdfe3L,
-                                0x3ac372e6L,
-                                }
+        0xd1310ba6L,
+        0x98dfb5acL,
+        0x2ffd72dbL,
+        0xd01adfb7L,
+        0xb8e1afedL,
+        0x6a267e96L,
+        0xba7c9045L,
+        0xf12c7f99L,
+        0x24a19947L,
+        0xb3916cf7L,
+        0x0801f2e2L,
+        0x858efc16L,
+        0x636920d8L,
+        0x71574e69L,
+        0xa458fea3L,
+        0xf4933d7eL,
+        0x0d95748fL,
+        0x728eb658L,
+        0x718bcd58L,
+        0x82154aeeL,
+        0x7b54a41dL,
+        0xc25a59b5L,
+        0x9c30d539L,
+        0x2af26013L,
+        0xc5d1b023L,
+        0x286085f0L,
+        0xca417918L,
+        0xb8db38efL,
+        0x8e79dcb0L,
+        0x603a180eL,
+        0x6c9e0e8bL,
+        0xb01e8a3eL,
+        0xd71577c1L,
+        0xbd314b27L,
+        0x78af2fdaL,
+        0x55605c60L,
+        0xe65525f3L,
+        0xaa55ab94L,
+        0x57489862L,
+        0x63e81440L,
+        0x55ca396aL,
+        0x2aab10b6L,
+        0xb4cc5c34L,
+        0x1141e8ceL,
+        0xa15486afL,
+        0x7c72e993L,
+        0xb3ee1411L,
+        0x636fbc2aL,
+        0x2ba9c55dL,
+        0x741831f6L,
+        0xce5c3e16L,
+        0x9b87931eL,
+        0xafd6ba33L,
+        0x6c24cf5cL,
+        0x7a325381L,
+        0x28958677L,
+        0x3b8f4898L,
+        0x6b4bb9afL,
+        0xc4bfe81bL,
+        0x66282193L,
+        0x61d809ccL,
+        0xfb21a991L,
+        0x487cac60L,
+        0x5dec8032L,
+        0xef845d5dL,
+        0xe98575b1L,
+        0xdc262302L,
+        0xeb651b88L,
+        0x23893e81L,
+        0xd396acc5L,
+        0x0f6d6ff3L,
+        0x83f44239L,
+        0x2e0b4482L,
+        0xa4842004L,
+        0x69c8f04aL,
+        0x9e1f9b5eL,
+        0x21c66842L,
+        0xf6e96c9aL,
+        0x670c9c61L,
+        0xabd388f0L,
+        0x6a51a0d2L,
+        0xd8542f68L,
+        0x960fa728L,
+        0xab5133a3L,
+        0x6eef0b6cL,
+        0x137a3be4L,
+        0xba3bf050L,
+        0x7efb2a98L,
+        0xa1f1651dL,
+        0x39af0176L,
+        0x66ca593eL,
+        0x82430e88L,
+        0x8cee8619L,
+        0x456f9fb4L,
+        0x7d84a5c3L,
+        0x3b8b5ebeL,
+        0xe06f75d8L,
+        0x85c12073L,
+        0x401a449fL,
+        0x56c16aa6L,
+        0x4ed3aa62L,
+        0x363f7706L,
+        0x1bfedf72L,
+        0x429b023dL,
+        0x37d0d724L,
+        0xd00a1248L,
+        0xdb0fead3L,
+        0x49f1c09bL,
+        0x075372c9L,
+        0x80991b7bL,
+        0x25d479d8L,
+        0xf6e8def7L,
+        0xe3fe501aL,
+        0xb6794c3bL,
+        0x976ce0bdL,
+        0x04c006baL,
+        0xc1a94fb6L,
+        0x409f60c4L,
+        0x5e5c9ec2L,
+        0x196a2463L,
+        0x68fb6fafL,
+        0x3e6c53b5L,
+        0x1339b2ebL,
+        0x3b52ec6fL,
+        0x6dfc511fL,
+        0x9b30952cL,
+        0xcc814544L,
+        0xaf5ebd09L,
+        0xbee3d004L,
+        0xde334afdL,
+        0x660f2807L,
+        0x192e4bb3L,
+        0xc0cba857L,
+        0x45c8740fL,
+        0xd20b5f39L,
+        0xb9d3fbdbL,
+        0x5579c0bdL,
+        0x1a60320aL,
+        0xd6a100c6L,
+        0x402c7279L,
+        0x679f25feL,
+        0xfb1fa3ccL,
+        0x8ea5e9f8L,
+        0xdb3222f8L,
+        0x3c7516dfL,
+        0xfd616b15L,
+        0x2f501ec8L,
+        0xad0552abL,
+        0x323db5faL,
+        0xfd238760L,
+        0x53317b48L,
+        0x3e00df82L,
+        0x9e5c57bbL,
+        0xca6f8ca0L,
+        0x1a87562eL,
+        0xdf1769dbL,
+        0xd542a8f6L,
+        0x287effc3L,
+        0xac6732c6L,
+        0x8c4f5573L,
+        0x695b27b0L,
+        0xbbca58c8L,
+        0xe1ffa35dL,
+        0xb8f011a0L,
+        0x10fa3d98L,
+        0xfd2183b8L,
+        0x4afcb56cL,
+        0x2dd1d35bL,
+        0x9a53e479L,
+        0xb6f84565L,
+        0xd28e49bcL,
+        0x4bfb9790L,
+        0xe1ddf2daL,
+        0xa4cb7e33L,
+        0x62fb1341L,
+        0xcee4c6e8L,
+        0xef20cadaL,
+        0x36774c01L,
+        0xd07e9efeL,
+        0x2bf11fb4L,
+        0x95dbda4dL,
+        0xae909198L,
+        0xeaad8e71L,
+        0x6b93d5a0L,
+        0xd08ed1d0L,
+        0xafc725e0L,
+        0x8e3c5b2fL,
+        0x8e7594b7L,
+        0x8ff6e2fbL,
+        0xf2122b64L,
+        0x8888b812L,
+        0x900df01cL,
+        0x4fad5ea0L,
+        0x688fc31cL,
+        0xd1cff191L,
+        0xb3a8c1adL,
+        0x2f2f2218L,
+        0xbe0e1777L,
+        0xea752dfeL,
+        0x8b021fa1L,
+        0xe5a0cc0fL,
+        0xb56f74e8L,
+        0x18acf3d6L,
+        0xce89e299L,
+        0xb4a84fe0L,
+        0xfd13e0b7L,
+        0x7cc43b81L,
+        0xd2ada8d9L,
+        0x165fa266L,
+        0x80957705L,
+        0x93cc7314L,
+        0x211a1477L,
+        0xe6ad2065L,
+        0x77b5fa86L,
+        0xc75442f5L,
+        0xfb9d35cfL,
+        0xebcdaf0cL,
+        0x7b3e89a0L,
+        0xd6411bd3L,
+        0xae1e7e49L,
+        0x00250e2dL,
+        0x2071b35eL,
+        0x226800bbL,
+        0x57b8e0afL,
+        0x2464369bL,
+        0xf009b91eL,
+        0x5563911dL,
+        0x59dfa6aaL,
+        0x78c14389L,
+        0xd95a537fL,
+        0x207d5ba2L,
+        0x02e5b9c5L,
+        0x83260376L,
+        0x6295cfa9L,
+        0x11c81968L,
+        0x4e734a41L,
+        0xb3472dcaL,
+        0x7b14a94aL,
+        0x1b510052L,
+        0x9a532915L,
+        0xd60f573fL,
+        0xbc9bc6e4L,
+        0x2b60a476L,
+        0x81e67400L,
+        0x08ba6fb5L,
+        0x571be91fL,
+        0xf296ec6bL,
+        0x2a0dd915L,
+        0xb6636521L,
+        0xe7b9f9b6L,
+        0xff34052eL,
+        0xc5855664L,
+        0x53b02d5dL,
+        0xa99f8fa1L,
+        0x08ba4799L,
+        0x6e85076aL,
+        0x4b7a70e9L,
+        0xb5b32944L,
+        0xdb75092eL,
+        0xc4192623L,
+        0xad6ea6b0L,
+        0x49a7df7dL,
+        0x9cee60b8L,
+        0x8fedb266L,
+        0xecaa8c71L,
+        0x699a17ffL,
+        0x5664526cL,
+        0xc2b19ee1L,
+        0x193602a5L,
+        0x75094c29L,
+        0xa0591340L,
+        0xe4183a3eL,
+        0x3f54989aL,
+        0x5b429d65L,
+        0x6b8fe4d6L,
+        0x99f73fd6L,
+        0xa1d29c07L,
+        0xefe830f5L,
+        0x4d2d38e6L,
+        0xf0255dc1L,
+        0x4cdd2086L,
+        0x8470eb26L,
+        0x6382e9c6L,
+        0x021ecc5eL,
+        0x09686b3fL,
+        0x3ebaefc9L,
+        0x3c971814L,
+        0x6b6a70a1L,
+        0x687f3584L,
+        0x52a0e286L,
+        0xb79c5305L,
+        0xaa500737L,
+        0x3e07841cL,
+        0x7fdeae5cL,
+        0x8e7d44ecL,
+        0x5716f2b8L,
+        0xb03ada37L,
+        0xf0500c0dL,
+        0xf01c1f04L,
+        0x0200b3ffL,
+        0xae0cf51aL,
+        0x3cb574b2L,
+        0x25837a58L,
+        0xdc0921bdL,
+        0xd19113f9L,
+        0x7ca92ff6L,
+        0x94324773L,
+        0x22f54701L,
+        0x3ae5e581L,
+        0x37c2dadcL,
+        0xc8b57634L,
+        0x9af3dda7L,
+        0xa9446146L,
+        0x0fd0030eL,
+        0xecc8c73eL,
+        0xa4751e41L,
+        0xe238cd99L,
+        0x3bea0e2fL,
+        0x3280bba1L,
+        0x183eb331L,
+        0x4e548b38L,
+        0x4f6db908L,
+        0x6f420d03L,
+        0xf60a04bfL,
+        0x2cb81290L,
+        0x24977c79L,
+        0x5679b072L,
+        0xbcaf89afL,
+        0xde9a771fL,
+        0xd9930810L,
+        0xb38bae12L,
+        0xdccf3f2eL,
+        0x5512721fL,
+        0x2e6b7124L,
+        0x501adde6L,
+        0x9f84cd87L,
+        0x7a584718L,
+        0x7408da17L,
+        0xbc9f9abcL,
+        0xe94b7d8cL,
+        0xec7aec3aL,
+        0xdb851dfaL,
+        0x63094366L,
+        0xc464c3d2L,
+        0xef1c1847L,
+        0x3215d908L,
+        0xdd433b37L,
+        0x24c2ba16L,
+        0x12a14d43L,
+        0x2a65c451L,
+        0x50940002L,
+        0x133ae4ddL,
+        0x71dff89eL,
+        0x10314e55L,
+        0x81ac77d6L,
+        0x5f11199bL,
+        0x043556f1L,
+        0xd7a3c76bL,
+        0x3c11183bL,
+        0x5924a509L,
+        0xf28fe6edL,
+        0x97f1fbfaL,
+        0x9ebabf2cL,
+        0x1e153c6eL,
+        0x86e34570L,
+        0xeae96fb1L,
+        0x860e5e0aL,
+        0x5a3e2ab3L,
+        0x771fe71cL,
+        0x4e3d06faL,
+        0x2965dcb9L,
+        0x99e71d0fL,
+        0x803e89d6L,
+        0x5266c825L,
+        0x2e4cc978L,
+        0x9c10b36aL,
+        0xc6150ebaL,
+        0x94e2ea78L,
+        0xa5fc3c53L,
+        0x1e0a2df4L,
+        0xf2f74ea7L,
+        0x361d2b3dL,
+        0x1939260fL,
+        0x19c27960L,
+        0x5223a708L,
+        0xf71312b6L,
+        0xebadfe6eL,
+        0xeac31f66L,
+        0xe3bc4595L,
+        0xa67bc883L,
+        0xb17f37d1L,
+        0x018cff28L,
+        0xc332ddefL,
+        0xbe6c5aa5L,
+        0x65582185L,
+        0x68ab9802L,
+        0xeecea50fL,
+        0xdb2f953bL,
+        0x2aef7dadL,
+        0x5b6e2f84L,
+        0x1521b628L,
+        0x29076170L,
+        0xecdd4775L,
+        0x619f1510L,
+        0x13cca830L,
+        0xeb61bd96L,
+        0x0334fe1eL,
+        0xaa0363cfL,
+        0xb5735c90L,
+        0x4c70a239L,
+        0xd59e9e0bL,
+        0xcbaade14L,
+        0xeecc86bcL,
+        0x60622ca7L,
+        0x9cab5cabL,
+        0xb2f3846eL,
+        0x648b1eafL,
+        0x19bdf0caL,
+        0xa02369b9L,
+        0x655abb50L,
+        0x40685a32L,
+        0x3c2ab4b3L,
+        0x319ee9d5L,
+        0xc021b8f7L,
+        0x9b540b19L,
+        0x875fa099L,
+        0x95f7997eL,
+        0x623d7da8L,
+        0xf837889aL,
+        0x97e32d77L,
+        0x11ed935fL,
+        0x16681281L,
+        0x0e358829L,
+        0xc7e61fd6L,
+        0x96dedfa1L,
+        0x7858ba99L,
+        0x57f584a5L,
+        0x1b227263L,
+        0x9b83c3ffL,
+        0x1ac24696L,
+        0xcdb30aebL,
+        0x532e3054L,
+        0x8fd948e4L,
+        0x6dbc3128L,
+        0x58ebf2efL,
+        0x34c6ffeaL,
+        0xfe28ed61L,
+        0xee7c3c73L,
+        0x5d4a14d9L,
+        0xe864b7e3L,
+        0x42105d14L,
+        0x203e13e0L,
+        0x45eee2b6L,
+        0xa3aaabeaL,
+        0xdb6c4f15L,
+        0xfacb4fd0L,
+        0xc742f442L,
+        0xef6abbb5L,
+        0x654f3b1dL,
+        0x41cd2105L,
+        0xd81e799eL,
+        0x86854dc7L,
+        0xe44b476aL,
+        0x3d816250L,
+        0xcf62a1f2L,
+        0x5b8d2646L,
+        0xfc8883a0L,
+        0xc1c7b6a3L,
+        0x7f1524c3L,
+        0x69cb7492L,
+        0x47848a0bL,
+        0x5692b285L,
+        0x095bbf00L,
+        0xad19489dL,
+        0x1462b174L,
+        0x23820e00L,
+        0x58428d2aL,
+        0x0c55f5eaL,
+        0x1dadf43eL,
+        0x233f7061L,
+        0x3372f092L,
+        0x8d937e41L,
+        0xd65fecf1L,
+        0x6c223bdbL,
+        0x7cde3759L,
+        0xcbee7460L,
+        0x4085f2a7L,
+        0xce77326eL,
+        0xa6078084L,
+        0x19f8509eL,
+        0xe8efd855L,
+        0x61d99735L,
+        0xa969a7aaL,
+        0xc50c06c2L,
+        0x5a04abfcL,
+        0x800bcadcL,
+        0x9e447a2eL,
+        0xc3453484L,
+        0xfdd56705L,
+        0x0e1e9ec9L,
+        0xdb73dbd3L,
+        0x105588cdL,
+        0x675fda79L,
+        0xe3674340L,
+        0xc5c43465L,
+        0x713e38d8L,
+        0x3d28f89eL,
+        0xf16dff20L,
+        0x153e21e7L,
+        0x8fb03d4aL,
+        0xe6e39f2bL,
+        0xdb83adf7L,
+        0xe93d5a68L,
+        0x948140f7L,
+        0xf64c261cL,
+        0x94692934L,
+        0x411520f7L,
+        0x7602d4f7L,
+        0xbcf46b2eL,
+        0xd4a20068L,
+        0xd4082471L,
+        0x3320f46aL,
+        0x43b7d4b7L,
+        0x500061afL,
+        0x1e39f62eL,
+        0x97244546L,
+        0x14214f74L,
+        0xbf8b8840L,
+        0x4d95fc1dL,
+        0x96b591afL,
+        0x70f4ddd3L,
+        0x66a02f45L,
+        0xbfbc09ecL,
+        0x03bd9785L,
+        0x7fac6dd0L,
+        0x31cb8504L,
+        0x96eb27b3L,
+        0x55fd3941L,
+        0xda2547e6L,
+        0xabca0a9aL,
+        0x28507825L,
+        0x530429f4L,
+        0x0a2c86daL,
+        0xe9b66dfbL,
+        0x68dc1462L,
+        0xd7486900L,
+        0x680ec0a4L,
+        0x27a18deeL,
+        0x4f3ffea2L,
+        0xe887ad8cL,
+        0xb58ce006L,
+        0x7af4d6b6L,
+        0xaace1e7cL,
+        0xd3375fecL,
+        0xce78a399L,
+        0x406b2a42L,
+        0x20fe9e35L,
+        0xd9f385b9L,
+        0xee39d7abL,
+        0x3b124e8bL,
+        0x1dc9faf7L,
+        0x4b6d1856L,
+        0x26a36631L,
+        0xeae397b2L,
+        0x3a6efa74L,
+        0xdd5b4332L,
+        0x6841e7f7L,
+        0xca7820fbL,
+        0xfb0af54eL,
+        0xd8feb397L,
+        0x454056acL,
+        0xba489527L,
+        0x55533a3aL,
+        0x20838d87L,
+        0xfe6ba9b7L,
+        0xd096954bL,
+        0x55a867bcL,
+        0xa1159a58L,
+        0xcca92963L,
+        0x99e1db33L,
+        0xa62a4a56L,
+        0x3f3125f9L,
+        0x5ef47e1cL,
+        0x9029317cL,
+        0xfdf8e802L,
+        0x04272f70L,
+        0x80bb155cL,
+        0x05282ce3L,
+        0x95c11548L,
+        0xe4c66d22L,
+        0x48c1133fL,
+        0xc70f86dcL,
+        0x07f9c9eeL,
+        0x41041f0fL,
+        0x404779a4L,
+        0x5d886e17L,
+        0x325f51ebL,
+        0xd59bc0d1L,
+        0xf2bcc18fL,
+        0x41113564L,
+        0x257b7834L,
+        0x602a9c60L,
+        0xdff8e8a3L,
+        0x1f636c1bL,
+        0x0e12b4c2L,
+        0x02e1329eL,
+        0xaf664fd1L,
+        0xcad18115L,
+        0x6b2395e0L,
+        0x333e92e1L,
+        0x3b240b62L,
+        0xeebeb922L,
+        0x85b2a20eL,
+        0xe6ba0d99L,
+        0xde720c8cL,
+        0x2da2f728L,
+        0xd0127845L,
+        0x95b794fdL,
+        0x647d0862L,
+        0xe7ccf5f0L,
+        0x5449a36fL,
+        0x877d48faL,
+        0xc39dfd27L,
+        0xf33e8d1eL,
+        0x0a476341L,
+        0x992eff74L,
+        0x3a6f6eabL,
+        0xf4f8fd37L,
+        0xa812dc60L,
+        0xa1ebddf8L,
+        0x991be14cL,
+        0xdb6e6b0dL,
+        0xc67b5510L,
+        0x6d672c37L,
+        0x2765d43bL,
+        0xdcd0e804L,
+        0xf1290dc7L,
+        0xcc00ffa3L,
+        0xb5390f92L,
+        0x690fed0bL,
+        0x667b9ffbL,
+        0xcedb7d9cL,
+        0xa091cf0bL,
+        0xd9155ea3L,
+        0xbb132f88L,
+        0x515bad24L,
+        0x7b9479bfL,
+        0x763bd6ebL,
+        0x37392eb3L,
+        0xcc115979L,
+        0x8026e297L,
+        0xf42e312dL,
+        0x6842ada7L,
+        0xc66a2b3bL,
+        0x12754cccL,
+        0x782ef11cL,
+        0x6a124237L,
+        0xb79251e7L,
+        0x06a1bbe6L,
+        0x4bfb6350L,
+        0x1a6b1018L,
+        0x11caedfaL,
+        0x3d25bdd8L,
+        0xe2e1c3c9L,
+        0x44421659L,
+        0x0a121386L,
+        0xd90cec6eL,
+        0xd5abea2aL,
+        0x64af674eL,
+        0xda86a85fL,
+        0xbebfe988L,
+        0x64e4c3feL,
+        0x9dbc8057L,
+        0xf0f7c086L,
+        0x60787bf8L,
+        0x6003604dL,
+        0xd1fd8346L,
+        0xf6381fb0L,
+        0x7745ae04L,
+        0xd736fcccL,
+        0x83426b33L,
+        0xf01eab71L,
+        0xb0804187L,
+        0x3c005e5fL,
+        0x77a057beL,
+        0xbde8ae24L,
+        0x55464299L,
+        0xbf582e61L,
+        0x4e58f48fL,
+        0xf2ddfda2L,
+        0xf474ef38L,
+        0x8789bdc2L,
+        0x5366f9c3L,
+        0xc8b38e74L,
+        0xb475f255L,
+        0x46fcd9b9L,
+        0x7aeb2661L,
+        0x8b1ddf84L,
+        0x846a0e79L,
+        0x915f95e2L,
+        0x466e598eL,
+        0x20b45770L,
+        0x8cd55591L,
+        0xc902de4cL,
+        0xb90bace1L,
+        0xbb8205d0L,
+        0x11a86248L,
+        0x7574a99eL,
+        0xb77f19b6L,
+        0xe0a9dc09L,
+        0x662d09a1L,
+        0xc4324633L,
+        0xe85a1f02L,
+        0x09f0be8cL,
+        0x4a99a025L,
+        0x1d6efe10L,
+        0x1ab93d1dL,
+        0x0ba5a4dfL,
+        0xa186f20fL,
+        0x2868f169L,
+        0xdcb7da83L,
+        0x573906feL,
+        0xa1e2ce9bL,
+        0x4fcd7f52L,
+        0x50115e01L,
+        0xa70683faL,
+        0xa002b5c4L,
+        0x0de6d027L,
+        0x9af88c27L,
+        0x773f8641L,
+        0xc3604c06L,
+        0x61a806b5L,
+        0xf0177a28L,
+        0xc0f586e0L,
+        0x006058aaL,
+        0x30dc7d62L,
+        0x11e69ed7L,
+        0x2338ea63L,
+        0x53c2dd94L,
+        0xc2c21634L,
+        0xbbcbee56L,
+        0x90bcb6deL,
+        0xebfc7da1L,
+        0xce591d76L,
+        0x6f05e409L,
+        0x4b7c0188L,
+        0x39720a3dL,
+        0x7c927c24L,
+        0x86e3725fL,
+        0x724d9db9L,
+        0x1ac15bb4L,
+        0xd39eb8fcL,
+        0xed545578L,
+        0x08fca5b5L,
+        0xd83d7cd3L,
+        0x4dad0fc4L,
+        0x1e50ef5eL,
+        0xb161e6f8L,
+        0xa28514d9L,
+        0x6c51133cL,
+        0x6fd5c7e7L,
+        0x56e14ec4L,
+        0x362abfceL,
+        0xddc6c837L,
+        0xd79a3234L,
+        0x92638212L,
+        0x670efa8eL,
+        0x406000e0L,
+        0x3a39ce37L,
+        0xd3faf5cfL,
+        0xabc27737L,
+        0x5ac52d1bL,
+        0x5cb0679eL,
+        0x4fa33742L,
+        0xd3822740L,
+        0x99bc9bbeL,
+        0xd5118e9dL,
+        0xbf0f7315L,
+        0xd62d1c7eL,
+        0xc700c47bL,
+        0xb78c1b6bL,
+        0x21a19045L,
+        0xb26eb1beL,
+        0x6a366eb4L,
+        0x5748ab2fL,
+        0xbc946e79L,
+        0xc6a376d2L,
+        0x6549c2c8L,
+        0x530ff8eeL,
+        0x468dde7dL,
+        0xd5730a1dL,
+        0x4cd04dc6L,
+        0x2939bbdbL,
+        0xa9ba4650L,
+        0xac9526e8L,
+        0xbe5ee304L,
+        0xa1fad5f0L,
+        0x6a2d519aL,
+        0x63ef8ce2L,
+        0x9a86ee22L,
+        0xc089c2b8L,
+        0x43242ef6L,
+        0xa51e03aaL,
+        0x9cf2d0a4L,
+        0x83c061baL,
+        0x9be96a4dL,
+        0x8fe51550L,
+        0xba645bd6L,
+        0x2826a2f9L,
+        0xa73a3ae1L,
+        0x4ba99586L,
+        0xef5562e9L,
+        0xc72fefd3L,
+        0xf752f7daL,
+        0x3f046f69L,
+        0x77fa0a59L,
+        0x80e4a915L,
+        0x87b08601L,
+        0x9b09e6adL,
+        0x3b3ee593L,
+        0xe990fd5aL,
+        0x9e34d797L,
+        0x2cf0b7d9L,
+        0x022b8b51L,
+        0x96d5ac3aL,
+        0x017da67dL,
+        0xd1cf3ed6L,
+        0x7c7d2d28L,
+        0x1f9f25cfL,
+        0xadf2b89bL,
+        0x5ad6b472L,
+        0x5a88f54cL,
+        0xe029ac71L,
+        0xe019a5e6L,
+        0x47b0acfdL,
+        0xed93fa9bL,
+        0xe8d3c48dL,
+        0x283b57ccL,
+        0xf8d56629L,
+        0x79132e28L,
+        0x785f0191L,
+        0xed756055L,
+        0xf7960e44L,
+        0xe3d35e8cL,
+        0x15056dd4L,
+        0x88f46dbaL,
+        0x03a16125L,
+        0x0564f0bdL,
+        0xc3eb9e15L,
+        0x3c9057a2L,
+        0x97271aecL,
+        0xa93a072aL,
+        0x1b3f6d9bL,
+        0x1e6321f5L,
+        0xf59c66fbL,
+        0x26dcf319L,
+        0x7533d928L,
+        0xb155fdf5L,
+        0x03563482L,
+        0x8aba3cbbL,
+        0x28517711L,
+        0xc20ad9f8L,
+        0xabcc5167L,
+        0xccad925fL,
+        0x4de81751L,
+        0x3830dc8eL,
+        0x379d5862L,
+        0x9320f991L,
+        0xea7a90c2L,
+        0xfb3e7bceL,
+        0x5121ce64L,
+        0x774fbe32L,
+        0xa8b6e37eL,
+        0xc3293d46L,
+        0x48de5369L,
+        0x6413e680L,
+        0xa2ae0810L,
+        0xdd6db224L,
+        0x69852dfdL,
+        0x09072166L,
+        0xb39a460aL,
+        0x6445c0ddL,
+        0x586cdecfL,
+        0x1c20c8aeL,
+        0x5bbef7ddL,
+        0x1b588d40L,
+        0xccd2017fL,
+        0x6bb4e3bbL,
+        0xdda26a7eL,
+        0x3a59ff45L,
+        0x3e350a44L,
+        0xbcb4cdd5L,
+        0x72eacea8L,
+        0xfa6484bbL,
+        0x8d6612aeL,
+        0xbf3c6f47L,
+        0xd29be463L,
+        0x542f5d9eL,
+        0xaec2771bL,
+        0xf64e6370L,
+        0x740e0d8dL,
+        0xe75b1357L,
+        0xf8721671L,
+        0xaf537d5dL,
+        0x4040cb08L,
+        0x4eb4e2ccL,
+        0x34d2466aL,
+        0x0115af84L,
+        0xe1b00428L,
+        0x95983a1dL,
+        0x06b89fb4L,
+        0xce6ea048L,
+        0x6f3f3b82L,
+        0x3520ab82L,
+        0x011a1d4bL,
+        0x277227f8L,
+        0x611560b1L,
+        0xe7933fdcL,
+        0xbb3a792bL,
+        0x344525bdL,
+        0xa08839e1L,
+        0x51ce794bL,
+        0x2f32c9b7L,
+        0xa01fbac9L,
+        0xe01cc87eL,
+        0xbcc7d1f6L,
+        0xcf0111c3L,
+        0xa1e8aac7L,
+        0x1a908749L,
+        0xd44fbd9aL,
+        0xd0dadecbL,
+        0xd50ada38L,
+        0x0339c32aL,
+        0xc6913667L,
+        0x8df9317cL,
+        0xe0b12b4fL,
+        0xf79e59b7L,
+        0x43f5bb3aL,
+        0xf2d519ffL,
+        0x27d9459cL,
+        0xbf97222cL,
+        0x15e6fc2aL,
+        0x0f91fc71L,
+        0x9b941525L,
+        0xfae59361L,
+        0xceb69cebL,
+        0xc2a86459L,
+        0x12baa8d1L,
+        0xb6c1075eL,
+        0xe3056a0cL,
+        0x10d25065L,
+        0xcb03a442L,
+        0xe0ec6e0eL,
+        0x1698db3bL,
+        0x4c98a0beL,
+        0x3278e964L,
+        0x9f1f9532L,
+        0xe0d392dfL,
+        0xd3a0342bL,
+        0x8971f21eL,
+        0x1b0a7441L,
+        0x4ba3348cL,
+        0xc5be7120L,
+        0xc37632d8L,
+        0xdf359f8dL,
+        0x9b992f2eL,
+        0xe60b6f47L,
+        0x0fe3f11dL,
+        0xe54cda54L,
+        0x1edad891L,
+        0xce6279cfL,
+        0xcd3e7e6fL,
+        0x1618b166L,
+        0xfd2c1d05L,
+        0x848fd2c5L,
+        0xf6fb2299L,
+        0xf523f357L,
+        0xa6327623L,
+        0x93a83531L,
+        0x56cccd02L,
+        0xacf08162L,
+        0x5a75ebb5L,
+        0x6e163697L,
+        0x88d273ccL,
+        0xde966292L,
+        0x81b949d0L,
+        0x4c50901bL,
+        0x71c65614L,
+        0xe6c6c7bdL,
+        0x327a140aL,
+        0x45e1d006L,
+        0xc3f27b9aL,
+        0xc9aa53fdL,
+        0x62a80f00L,
+        0xbb25bfe2L,
+        0x35bdd2f6L,
+        0x71126905L,
+        0xb2040222L,
+        0xb6cbcf7cL,
+        0xcd769c2bL,
+        0x53113ec0L,
+        0x1640e3d3L,
+        0x38abbd60L,
+        0x2547adf0L,
+        0xba38209cL,
+        0xf746ce76L,
+        0x77afa1c5L,
+        0x20756060L,
+        0x85cbfe4eL,
+        0x8ae88dd8L,
+        0x7aaaf9b0L,
+        0x4cf9aa7eL,
+        0x1948c25cL,
+        0x02fb8a8cL,
+        0x01c36ae4L,
+        0xd6ebe1f9L,
+        0x90d4f869L,
+        0xa65cdea0L,
+        0x3f09252dL,
+        0xc208e69fL,
+        0xb74e6132L,
+        0xce77e25bL,
+        0x578fdfe3L,
+        0x3ac372e6L,
+    }
 };
diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c
index 737910cc7514b..604c327fa70a3 100644
--- a/crypto/bio/bf_buff.c
+++ b/crypto/bio/bf_buff.c
@@ -20,7 +20,7 @@ static long buffer_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int buffer_new(BIO *h);
 static int buffer_free(BIO *data);
 static long buffer_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
-#define DEFAULT_BUFFER_SIZE     4096
+#define DEFAULT_BUFFER_SIZE 4096
 
 static const BIO_METHOD methods_buffer = {
     BIO_TYPE_BUFFER,
@@ -98,7 +98,7 @@ static int buffer_read(BIO *b, char *out, int outl)
     num = 0;
     BIO_clear_retry_flags(b);
 
- start:
+start:
     i = ctx->ibuf_len;
     /* If there is stuff left over, grab it */
     if (i != 0) {
@@ -167,7 +167,7 @@ static int buffer_write(BIO *b, const char *in, int inl)
         return 0;
 
     BIO_clear_retry_flags(b);
- start:
+start:
     i = ctx->obuf_size - (ctx->obuf_len + ctx->obuf_off);
     /* add to buffer and return */
     if (i >= inl) {
@@ -178,7 +178,7 @@ static int buffer_write(BIO *b, const char *in, int inl)
     /* else */
     /* stuff already in buffer, so add to it first, then flush */
     if (ctx->obuf_len != 0) {
-        if (i > 0) {            /* lets fill it up if we can */
+        if (i > 0) { /* lets fill it up if we can */
             memcpy(&(ctx->obuf[ctx->obuf_off + ctx->obuf_len]), in, i);
             in += i;
             inl -= i;
@@ -188,7 +188,7 @@ static int buffer_write(BIO *b, const char *in, int inl)
         /* we now have a full buffer needing flushing */
         for (;;) {
             i = BIO_write(b->next_bio, &(ctx->obuf[ctx->obuf_off]),
-                          ctx->obuf_len);
+                ctx->obuf_len);
             if (i <= 0) {
                 BIO_copy_next_retry(b);
 
@@ -306,7 +306,7 @@ static long buffer_ctrl(BIO *b, int cmd, long num, void *ptr)
             if (*ip == 0) {
                 ibs = (int)num;
                 obs = ctx->obuf_size;
-            } else {            /* if (*ip == 1) */
+            } else { /* if (*ip == 1) */
 
                 ibs = ctx->ibuf_size;
                 obs = (int)num;
@@ -368,7 +368,7 @@ static long buffer_ctrl(BIO *b, int cmd, long num, void *ptr)
             BIO_clear_retry_flags(b);
             if (ctx->obuf_len > 0) {
                 r = BIO_write(b->next_bio,
-                              &(ctx->obuf[ctx->obuf_off]), ctx->obuf_len);
+                    &(ctx->obuf[ctx->obuf_off]), ctx->obuf_len);
                 BIO_copy_next_retry(b);
                 if (r <= 0)
                     return (long)r;
@@ -385,8 +385,7 @@ static long buffer_ctrl(BIO *b, int cmd, long num, void *ptr)
         break;
     case BIO_CTRL_DUP:
         dbio = (BIO *)ptr;
-        if (BIO_set_read_buffer_size(dbio, ctx->ibuf_size) <= 0 ||
-            BIO_set_write_buffer_size(dbio, ctx->obuf_size) <= 0)
+        if (BIO_set_read_buffer_size(dbio, ctx->ibuf_size) <= 0 || BIO_set_write_buffer_size(dbio, ctx->obuf_size) <= 0)
             ret = 0;
         break;
     case BIO_CTRL_PEEK:
@@ -423,7 +422,7 @@ static int buffer_gets(BIO *b, char *buf, int size)
     char *p;
 
     ctx = (BIO_F_BUFFER_CTX *)b->ptr;
-    size--;                     /* reserve space for a '\0' */
+    size--; /* reserve space for a '\0' */
     BIO_clear_retry_flags(b);
 
     for (;;) {
@@ -446,7 +445,7 @@ static int buffer_gets(BIO *b, char *buf, int size)
                 *buf = '\0';
                 return num;
             }
-        } else {                /* read another chunk */
+        } else { /* read another chunk */
 
             i = BIO_read(b->next_bio, ctx->ibuf, ctx->ibuf_size);
             if (i <= 0) {
diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c
index eed3dc4633e05..8eb6d64a653e1 100644
--- a/crypto/bio/bf_lbuf.c
+++ b/crypto/bio/bf_lbuf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -23,7 +23,7 @@ static int linebuffer_free(BIO *data);
 static long linebuffer_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
 
 /* A 10k maximum should be enough for most purposes */
-#define DEFAULT_LINEBUFFER_SIZE 1024*10
+#define DEFAULT_LINEBUFFER_SIZE 1024 * 10
 
 /* #define DEBUG */
 
@@ -48,9 +48,9 @@ const BIO_METHOD *BIO_f_linebuffer(void)
 }
 
 typedef struct bio_linebuffer_ctx_struct {
-    char *obuf;                 /* the output char array */
-    int obuf_size;              /* how big is the output buffer */
-    int obuf_len;               /* how many bytes are in it */
+    char *obuf; /* the output char array */
+    int obuf_size; /* how big is the output buffer */
+    int obuf_len; /* how many bytes are in it */
 } BIO_LINEBUFFER_CTX;
 
 static int linebuffer_new(BIO *bi)
@@ -119,7 +119,8 @@ static int linebuffer_write(BIO *b, const char *in, int inl)
         const char *p;
         char c;
 
-        for (p = in, c = '\0'; p < in + inl && (c = *p) != '\n'; p++) ;
+        for (p = in, c = '\0'; p < in + inl && (c = *p) != '\n'; p++)
+            ;
         if (c == '\n') {
             p++;
             foundnl = 1;
@@ -131,7 +132,7 @@ static int linebuffer_write(BIO *b, const char *in, int inl)
          * concatenate them and write
          */
         while ((foundnl || p - in > ctx->obuf_size - ctx->obuf_len)
-               && ctx->obuf_len > 0) {
+            && ctx->obuf_len > 0) {
             int orig_olen = ctx->obuf_len;
 
             i = ctx->obuf_size - ctx->obuf_len;
@@ -182,18 +183,37 @@ static int linebuffer_write(BIO *b, const char *in, int inl)
             in += i;
             inl -= i;
         }
-    }
-    while (foundnl && inl > 0);
+    } while (foundnl && inl > 0);
     /*
      * We've written as much as we can.  The rest of the input buffer, if
-     * any, is text that doesn't and with a NL and therefore needs to be
-     * saved for the next trip.
+     * any, is text that doesn't end with a NL and therefore we need to try
+     * free up some space in our obuf so we can make forward progress.
      */
-    if (inl > 0) {
-        memcpy(&(ctx->obuf[ctx->obuf_len]), in, inl);
-        ctx->obuf_len += inl;
-        num += inl;
+    while (inl > 0) {
+        size_t avail = (size_t)ctx->obuf_size - (size_t)ctx->obuf_len;
+        size_t to_copy;
+
+        if (avail == 0) {
+            /* Flush buffered data to make room */
+            i = BIO_write(b->next_bio, ctx->obuf, ctx->obuf_len);
+            if (i <= 0) {
+                BIO_copy_next_retry(b);
+                return num > 0 ? num : i;
+            }
+            if (i < ctx->obuf_len)
+                memmove(ctx->obuf, ctx->obuf + i, ctx->obuf_len - i);
+            ctx->obuf_len -= i;
+            continue;
+        }
+
+        to_copy = inl > (int)avail ? avail : (size_t)inl;
+        memcpy(&(ctx->obuf[ctx->obuf_len]), in, to_copy);
+        ctx->obuf_len += (int)to_copy;
+        in += to_copy;
+        inl -= (int)to_copy;
+        num += (int)to_copy;
     }
+
     return num;
 }
 
diff --git a/crypto/bio/bf_prefix.c b/crypto/bio/bf_prefix.c
index 872efa13b5593..9eebbdca56872 100644
--- a/crypto/bio/bf_prefix.c
+++ b/crypto/bio/bf_prefix.c
@@ -13,7 +13,7 @@
 #include "bio_local.h"
 
 static int prefix_write(BIO *b, const char *out, size_t outl,
-                        size_t *numwritten);
+    size_t *numwritten);
 static int prefix_read(BIO *b, char *buf, size_t size, size_t *numread);
 static int prefix_puts(BIO *b, const char *str);
 static int prefix_gets(BIO *b, char *str, int size);
@@ -43,10 +43,10 @@ const BIO_METHOD *BIO_f_prefix(void)
 }
 
 typedef struct prefix_ctx_st {
-    char *prefix;              /* Text prefix, given by user */
-    unsigned int indent;       /* Indentation amount, given by user */
+    char *prefix; /* Text prefix, given by user */
+    unsigned int indent; /* Indentation amount, given by user */
 
-    int linestart;             /* flag to indicate we're at the line start */
+    int linestart; /* flag to indicate we're at the line start */
 } PREFIX_CTX;
 
 static int prefix_create(BIO *b)
@@ -79,7 +79,7 @@ static int prefix_read(BIO *b, char *in, size_t size, size_t *numread)
 }
 
 static int prefix_write(BIO *b, const char *out, size_t outl,
-                        size_t *numwritten)
+    size_t *numwritten)
 {
     PREFIX_CTX *ctx = BIO_get_data(b);
 
@@ -97,7 +97,7 @@ static int prefix_write(BIO *b, const char *out, size_t outl,
          * prepared to handle prefix and indentation the next time around.
          */
         if (outl > 0)
-            ctx->linestart = (out[outl-1] == '\n');
+            ctx->linestart = (out[outl - 1] == '\n');
         return BIO_write_ex(BIO_next(b), out, outl, numwritten);
     }
 
@@ -116,7 +116,7 @@ static int prefix_write(BIO *b, const char *out, size_t outl,
 
             if (ctx->prefix != NULL
                 && !BIO_write_ex(BIO_next(b), ctx->prefix, strlen(ctx->prefix),
-                                 &dontcare))
+                    &dontcare))
                 return 0;
             BIO_printf(BIO_next(b), "%*s", ctx->indent, "");
             ctx->linestart = 0;
diff --git a/crypto/bio/bf_readbuff.c b/crypto/bio/bf_readbuff.c
index 2409c9db97cc6..36971a40c6928 100644
--- a/crypto/bio/bf_readbuff.c
+++ b/crypto/bio/bf_readbuff.c
@@ -19,7 +19,7 @@
 #include "bio_local.h"
 #include "internal/cryptlib.h"
 
-#define DEFAULT_BUFFER_SIZE     4096
+#define DEFAULT_BUFFER_SIZE 4096
 
 static int readbuffer_write(BIO *h, const char *buf, int num);
 static int readbuffer_read(BIO *h, char *buf, int size);
@@ -236,8 +236,8 @@ static int readbuffer_gets(BIO *b, char *buf, int size)
         p = ctx->ibuf + ctx->ibuf_off;
         found_newline = 0;
         for (num_chars = 0;
-             (num_chars < ctx->ibuf_len) && (num_chars < size);
-             num_chars++) {
+            (num_chars < ctx->ibuf_len) && (num_chars < size);
+            num_chars++) {
             *buf++ = p[num_chars];
             if (p[num_chars] == '\n') {
                 found_newline = 1;
@@ -259,33 +259,33 @@ static int readbuffer_gets(BIO *b, char *buf, int size)
      * next bio.
      */
 
-     /* Resize if we have to */
-     if (!readbuffer_resize(ctx, 1 + size))
-         return 0;
-     /*
-      * Read more data from the next bio using BIO_read_ex:
-      * Note we cannot use BIO_gets() here as it does not work on a
-      * binary stream that contains 0x00. (Since strlen() will stop at
-      * any 0x00 not at the last read '\n' in a FILE bio).
-      * Also note that some applications open and close the file bio
-      * multiple times and need to read the next available block when using
-      * stdin - so we need to READ one byte at a time!
-      */
-     p = ctx->ibuf + ctx->ibuf_off;
-     for (i = 0; i < size; ++i) {
-         j = BIO_read(b->next_bio, p, 1);
-         if (j <= 0) {
-             BIO_copy_next_retry(b);
-             *buf = '\0';
-             return num > 0 ? num : j;
-         }
-         *buf++ = *p;
-         num++;
-         ctx->ibuf_off++;
-         if (*p == '\n')
-             break;
-         ++p;
-     }
-     *buf = '\0';
-     return num;
+    /* Resize if we have to */
+    if (!readbuffer_resize(ctx, 1 + size))
+        return 0;
+    /*
+     * Read more data from the next bio using BIO_read_ex:
+     * Note we cannot use BIO_gets() here as it does not work on a
+     * binary stream that contains 0x00. (Since strlen() will stop at
+     * any 0x00 not at the last read '\n' in a FILE bio).
+     * Also note that some applications open and close the file bio
+     * multiple times and need to read the next available block when using
+     * stdin - so we need to READ one byte at a time!
+     */
+    p = ctx->ibuf + ctx->ibuf_off;
+    for (i = 0; i < size; ++i) {
+        j = BIO_read(b->next_bio, p, 1);
+        if (j <= 0) {
+            BIO_copy_next_retry(b);
+            *buf = '\0';
+            return num > 0 ? num : j;
+        }
+        *buf++ = *p;
+        num++;
+        ctx->ibuf_off++;
+        if (*p == '\n')
+            break;
+        ++p;
+    }
+    *buf = '\0';
+    return num;
 }
diff --git a/crypto/bio/bio_addr.c b/crypto/bio/bio_addr.c
index 4bdce0bbe84f5..cf3960a35d7b9 100644
--- a/crypto/bio/bio_addr.c
+++ b/crypto/bio/bio_addr.c
@@ -8,7 +8,7 @@
  */
 
 #ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#define _GNU_SOURCE
 #endif
 
 /*
@@ -126,8 +126,8 @@ int BIO_ADDR_make(BIO_ADDR *ap, const struct sockaddr *sa)
 }
 
 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)
 {
 #ifndef OPENSSL_NO_UNIX_SOCK
     if (family == AF_UNIX) {
@@ -227,7 +227,7 @@ unsigned short BIO_ADDR_rawport(const BIO_ADDR *ap)
  * stack, and 1 on success.
  */
 static int addr_strings(const BIO_ADDR *ap, int numeric,
-                        char **hostname, char **service)
+    char **hostname, char **service)
 {
     if (BIO_sock_init() != 1)
         return 0;
@@ -242,15 +242,16 @@ static int addr_strings(const BIO_ADDR *ap, int numeric,
             flags |= NI_NUMERICHOST | NI_NUMERICSERV;
 
         if ((ret = getnameinfo(BIO_ADDR_sockaddr(ap),
-                               BIO_ADDR_sockaddr_size(ap),
-                               host, sizeof(host), serv, sizeof(serv),
-                               flags)) != 0) {
-# ifdef EAI_SYSTEM
+                 BIO_ADDR_sockaddr_size(ap),
+                 host, sizeof(host), serv, sizeof(serv),
+                 flags))
+            != 0) {
+#ifdef EAI_SYSTEM
             if (ret == EAI_SYSTEM) {
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling getnameinfo()");
+                    "calling getnameinfo()");
             } else
-# endif
+#endif
             {
                 ERR_raise_data(ERR_LIB_BIO, ERR_R_SYS_LIB, gai_strerror(ret));
             }
@@ -265,7 +266,7 @@ static int addr_strings(const BIO_ADDR *ap, int numeric,
          */
         if (serv[0] == '\0') {
             BIO_snprintf(serv, sizeof(serv), "%d",
-                         ntohs(BIO_ADDR_rawport(ap)));
+                ntohs(BIO_ADDR_rawport(ap)));
         }
 
         if (hostname != NULL)
@@ -277,14 +278,14 @@ static int addr_strings(const BIO_ADDR *ap, int numeric,
         if (hostname != NULL)
             *hostname = OPENSSL_strdup(inet_ntoa(ap->s_in.sin_addr));
         if (service != NULL) {
-            char serv[6];        /* port is 16 bits => max 5 decimal digits */
+            char serv[6]; /* port is 16 bits => max 5 decimal digits */
             BIO_snprintf(serv, sizeof(serv), "%d", ntohs(ap->s_in.sin_port));
             *service = OPENSSL_strdup(serv);
         }
     }
 
     if ((hostname != NULL && *hostname == NULL)
-            || (service != NULL && *service == NULL)) {
+        || (service != NULL && *service == NULL)) {
         if (hostname != NULL) {
             OPENSSL_free(*hostname);
             *hostname = NULL;
@@ -455,11 +456,11 @@ void BIO_ADDRINFO_free(BIO_ADDRINFO *bai)
         return;
 
 #ifdef AI_PASSIVE
-# ifndef OPENSSL_NO_UNIX_SOCK
-#  define _cond bai->bai_family != AF_UNIX
-# else
-#  define _cond 1
-# endif
+#ifndef OPENSSL_NO_UNIX_SOCK
+#define _cond bai->bai_family != AF_UNIX
+#else
+#define _cond 1
+#endif
     if (_cond) {
         freeaddrinfo(bai);
         return;
@@ -503,10 +504,12 @@ void BIO_ADDRINFO_free(BIO_ADDRINFO *bai)
  *
  */
 int BIO_parse_hostserv(const char *hostserv, char **host, char **service,
-                       enum BIO_hostserv_priorities hostserv_prio)
+    enum BIO_hostserv_priorities hostserv_prio)
 {
-    const char *h = NULL; size_t hl = 0;
-    const char *p = NULL; size_t pl = 0;
+    const char *h = NULL;
+    size_t hl = 0;
+    const char *p = NULL;
+    size_t pl = 0;
 
     if (*hostserv == '[') {
         if ((p = strchr(hostserv, ']')) == NULL)
@@ -583,10 +586,10 @@ int BIO_parse_hostserv(const char *hostserv, char **host, char **service,
     }
 
     return 1;
- amb_err:
+amb_err:
     ERR_raise(ERR_LIB_BIO, BIO_R_AMBIGUOUS_HOST_OR_SERVICE);
     return 0;
- spec_err:
+spec_err:
     ERR_raise(ERR_LIB_BIO, BIO_R_MALFORMED_HOST_OR_SERVICE);
     return 0;
 }
@@ -601,9 +604,9 @@ int BIO_parse_hostserv(const char *hostserv, char **host, char **service,
  * only happens if a memory allocation error occurred.
  */
 static int addrinfo_wrap(int family, int socktype,
-                         const void *where, size_t wherelen,
-                         unsigned short port,
-                         BIO_ADDRINFO **bai)
+    const void *where, size_t wherelen,
+    unsigned short port,
+    BIO_ADDRINFO **bai)
 {
     if ((*bai = OPENSSL_zalloc(sizeof(**bai))) == NULL)
         return 0;
@@ -646,8 +649,8 @@ DEFINE_RUN_ONCE_STATIC(do_bio_lookup_init)
 }
 
 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)
 {
     return BIO_lookup_ex(host, service, lookup_type, family, socktype, 0, res);
 }
@@ -675,9 +678,9 @@ int BIO_lookup(const char *host, const char *service,
  * The return value is 1 on success or 0 in case of error.
  */
 int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
-                  int family, int socktype, int protocol, BIO_ADDRINFO **res)
+    int family, int socktype, int protocol, BIO_ADDRINFO **res)
 {
-    int ret = 0;                 /* Assume failure */
+    int ret = 0; /* Assume failure */
 
     switch (family) {
     case AF_INET:
@@ -719,12 +722,12 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
         hints.ai_family = family;
         hints.ai_socktype = socktype;
         hints.ai_protocol = protocol;
-# ifdef AI_ADDRCONFIG
-#  ifdef AF_UNSPEC
+#ifdef AI_ADDRCONFIG
+#ifdef AF_UNSPEC
         if (host != NULL && family == AF_UNSPEC)
-#  endif
+#endif
             hints.ai_flags |= AI_ADDRCONFIG;
-# endif
+#endif
 
         if (lookup_type == BIO_LOOKUP_SERVER)
             hints.ai_flags |= AI_PASSIVE;
@@ -732,37 +735,37 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
         /* Note that |res| SHOULD be a 'struct addrinfo **' thanks to
          * macro magic in bio_local.h
          */
-# if defined(AI_ADDRCONFIG) && defined(AI_NUMERICHOST)
-      retry:
-# endif
+#if defined(AI_ADDRCONFIG) && defined(AI_NUMERICHOST)
+    retry:
+#endif
         switch ((gai_ret = getaddrinfo(host, service, &hints, res))) {
-# ifdef EAI_SYSTEM
+#ifdef EAI_SYSTEM
         case EAI_SYSTEM:
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling getaddrinfo()");
+                "calling getaddrinfo()");
             ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB);
             break;
-# endif
-# ifdef EAI_MEMORY
+#endif
+#ifdef EAI_MEMORY
         case EAI_MEMORY:
             ERR_raise_data(ERR_LIB_BIO, ERR_R_SYS_LIB,
-                           gai_strerror(old_ret ? old_ret : gai_ret));
+                gai_strerror(old_ret ? old_ret : gai_ret));
             break;
-# endif
+#endif
         case 0:
-            ret = 1;             /* Success */
+            ret = 1; /* Success */
             break;
         default:
-# if defined(AI_ADDRCONFIG) && defined(AI_NUMERICHOST)
+#if defined(AI_ADDRCONFIG) && defined(AI_NUMERICHOST)
             if (hints.ai_flags & AI_ADDRCONFIG) {
                 hints.ai_flags &= ~AI_ADDRCONFIG;
                 hints.ai_flags |= AI_NUMERICHOST;
                 old_ret = gai_ret;
                 goto retry;
             }
-# endif
+#endif
             ERR_raise_data(ERR_LIB_BIO, ERR_R_SYS_LIB,
-                           gai_strerror(old_ret ? old_ret : gai_ret));
+                gai_strerror(old_ret ? old_ret : gai_ret));
             break;
         }
     } else {
@@ -774,8 +777,8 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
  * '&he_fallback_addresses' are 32-bit pointers
  */
 #if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma pointer_size save
-# pragma pointer_size 32
+#pragma pointer_size save
+#pragma pointer_size 32
 #endif
         /* Windows doesn't seem to have in_addr_t */
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
@@ -794,7 +797,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
             (char **)&he_fallback_addresses
         };
 #if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma pointer_size restore
+#pragma pointer_size restore
 #endif
 
         struct servent *se;
@@ -813,7 +816,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
 
         if (!CRYPTO_THREAD_write_lock(bio_lookup_lock))
             return 0;
-        
+
         he_fallback_address = INADDR_ANY;
         if (host == NULL) {
             he = &he_fallback;
@@ -847,17 +850,17 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
                  * anyway [above getaddrinfo/gai_strerror is]. We just let
                  * system administrator figure this out...
                  */
-# if defined(OPENSSL_SYS_VXWORKS)
+#if defined(OPENSSL_SYS_VXWORKS)
                 /* h_errno doesn't exist on VxWorks */
                 ERR_raise_data(ERR_LIB_SYS, 1000,
-                               "calling gethostbyname()");
-# else
+                    "calling gethostbyname()");
+#else
                 ERR_raise_data(ERR_LIB_SYS, 1000 + h_errno,
-                               "calling gethostbyname()");
-# endif
+                    "calling gethostbyname()");
+#endif
 #else
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling gethostbyname()");
+                    "calling gethostbyname()");
 #endif
                 ret = 0;
                 goto err;
@@ -877,12 +880,12 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
  * VMS C, we need to make sure that 'proto' is a 32-bit pointer.
  */
 #if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma pointer_size save
-# pragma pointer_size 32
+#pragma pointer_size save
+#pragma pointer_size 32
 #endif
             char *proto = NULL;
 #if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma pointer_size restore
+#pragma pointer_size restore
 #endif
 
             switch (socktype) {
@@ -895,7 +898,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
             }
 
             if (endp != service && *endp == '\0'
-                    && portnum > 0 && portnum < 65536) {
+                && portnum > 0 && portnum < 65536) {
                 se_fallback.s_port = htons((unsigned short)portnum);
                 se_fallback.s_proto = proto;
                 se = &se_fallback;
@@ -904,7 +907,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
 
                 if (se == NULL) {
                     ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                                   "calling getservbyname()");
+                        "calling getservbyname()");
                     goto err;
                 }
             } else {
@@ -922,12 +925,12 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
  * the pointer size dance.
  */
 #if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma pointer_size save
-# pragma pointer_size 32
+#pragma pointer_size save
+#pragma pointer_size 32
 #endif
             char **addrlistp;
 #if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma pointer_size restore
+#pragma pointer_size restore
 #endif
             size_t addresses;
             BIO_ADDRINFO *tmp_bai = NULL;
@@ -935,19 +938,19 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
             /* The easiest way to create a linked list from an
                array is to start from the back */
             for (addrlistp = he->h_addr_list; *addrlistp != NULL;
-                 addrlistp++)
+                addrlistp++)
                 ;
 
             for (addresses = addrlistp - he->h_addr_list;
-                 addrlistp--, addresses-- > 0; ) {
+                addrlistp--, addresses-- > 0;) {
                 if (!addrinfo_wrap(he->h_addrtype, socktype,
-                                   *addrlistp, he->h_length,
-                                   se->s_port, &tmp_bai))
+                        *addrlistp, he->h_length,
+                        se->s_port, &tmp_bai))
                     goto addrinfo_wrap_err;
                 tmp_bai->bai_next = *res;
                 *res = tmp_bai;
                 continue;
-             addrinfo_wrap_err:
+            addrinfo_wrap_err:
                 BIO_ADDRINFO_free(*res);
                 *res = NULL;
                 ERR_raise(ERR_LIB_BIO, ERR_R_BIO_LIB);
@@ -957,7 +960,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type,
 
             ret = 1;
         }
-     err:
+    err:
         CRYPTO_THREAD_unlock(bio_lookup_lock);
     }
 
diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c
index 8e4f79ea3cd7a..274adef6ed747 100644
--- a/crypto/bio/bio_cb.c
+++ b/crypto/bio/bio_cb.c
@@ -17,7 +17,7 @@
 #include <openssl/err.h>
 
 long BIO_debug_callback_ex(BIO *bio, int cmd, const char *argp, size_t len,
-                           int argi, long argl, int ret, size_t *processed)
+    int argi, long argl, int ret, size_t *processed)
 {
     BIO *b;
     char buf[256];
@@ -45,41 +45,41 @@ long BIO_debug_callback_ex(BIO *bio, int cmd, const char *argp, size_t len,
     case BIO_CB_READ:
         if (bio->method->type & BIO_TYPE_DESCRIPTOR)
             BIO_snprintf(p, left, "read(%d,%zu) - %s fd=%d\n",
-                         bio->num, len,
-                         bio->method->name, bio->num);
+                bio->num, len,
+                bio->method->name, bio->num);
         else
             BIO_snprintf(p, left, "read(%d,%zu) - %s\n",
-                    bio->num, len, bio->method->name);
+                bio->num, len, bio->method->name);
         break;
     case BIO_CB_WRITE:
         if (bio->method->type & BIO_TYPE_DESCRIPTOR)
             BIO_snprintf(p, left, "write(%d,%zu) - %s fd=%d\n",
-                         bio->num, len,
-                         bio->method->name, bio->num);
+                bio->num, len,
+                bio->method->name, bio->num);
         else
             BIO_snprintf(p, left, "write(%d,%zu) - %s\n",
-                         bio->num, len, bio->method->name);
+                bio->num, len, bio->method->name);
         break;
     case BIO_CB_PUTS:
         BIO_snprintf(p, left, "puts() - %s\n", bio->method->name);
         break;
     case BIO_CB_GETS:
         BIO_snprintf(p, left, "gets(%zu) - %s\n", len,
-                     bio->method->name);
+            bio->method->name);
         break;
     case BIO_CB_CTRL:
         BIO_snprintf(p, left, "ctrl(%d) - %s\n", argi,
-                     bio->method->name);
+            bio->method->name);
         break;
     case BIO_CB_RECVMMSG:
         args = (BIO_MMSG_CB_ARGS *)argp;
         BIO_snprintf(p, left, "recvmmsg(%zu) - %s",
-                     args->num_msg, bio->method->name);
+            args->num_msg, bio->method->name);
         break;
     case BIO_CB_SENDMMSG:
         args = (BIO_MMSG_CB_ARGS *)argp;
         BIO_snprintf(p, left, "sendmmsg(%zu) - %s",
-                     args->num_msg, bio->method->name);
+            args->num_msg, bio->method->name);
         break;
     case BIO_CB_RETURN | BIO_CB_READ:
         BIO_snprintf(p, left, "read return %d processed: %zu\n", ret, l);
@@ -121,14 +121,14 @@ long BIO_debug_callback_ex(BIO *bio, int cmd, const char *argp, size_t len,
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 long BIO_debug_callback(BIO *bio, int cmd, const char *argp,
-                        int argi, long argl, long ret)
+    int argi, long argl, long ret)
 {
     size_t processed = 0;
 
     if (ret > 0)
         processed = (size_t)ret;
     BIO_debug_callback_ex(bio, cmd, argp, (size_t)argi,
-                          argi, argl, ret > 0 ? 1 : (int)ret, &processed);
+        argi, argl, ret > 0 ? 1 : (int)ret, &processed);
     return ret;
 }
 #endif
diff --git a/crypto/bio/bio_dump.c b/crypto/bio/bio_dump.c
index 40c18410e4cf0..c117998df656e 100644
--- a/crypto/bio/bio_dump.c
+++ b/crypto/bio/bio_dump.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -14,19 +14,19 @@
 #include <stdio.h>
 #include "bio_local.h"
 
-#define DUMP_WIDTH      16
+#define DUMP_WIDTH 16
 #define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4))
 
-#define SPACE(buf, pos, n)   (sizeof(buf) - (pos) > (n))
+#define SPACE(buf, pos, n) (sizeof(buf) - (pos) > (n))
 
-int BIO_dump_cb(int (*cb) (const void *data, size_t len, void *u),
-                void *u, const void *s, int len)
+int BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
+    void *u, const void *s, int len)
 {
     return BIO_dump_indent_cb(cb, u, s, len, 0);
 }
 
-int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
-                       void *u, const void *v, int len, int indent)
+int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
+    void *u, const void *v, int len, int indent)
 {
     const unsigned char *s = v;
     int res, ret = 0;
@@ -46,7 +46,9 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
         rows++;
     for (i = 0; i < rows; i++) {
         n = BIO_snprintf(buf, sizeof(buf), "%*s%04x - ", indent, "",
-                         i * dump_width);
+            i * dump_width);
+        if (n < 0)
+            return -1;
         for (j = 0; j < dump_width; j++) {
             if (SPACE(buf, n, 3)) {
                 if (((i * dump_width) + j) >= len) {
@@ -54,7 +56,7 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
                 } else {
                     ch = *(s + i * dump_width + j) & 0xff;
                     BIO_snprintf(buf + n, 4, "%02x%c", ch,
-                                 j == 7 ? '-' : ' ');
+                        j == 7 ? '-' : ' ');
                 }
                 n += 3;
             }
@@ -72,8 +74,8 @@ int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
                 buf[n++] = ((ch >= ' ') && (ch <= '~')) ? ch : '.';
 #else
                 buf[n++] = ((ch >= os_toascii[' ']) && (ch <= os_toascii['~']))
-                           ? os_toebcdic[ch]
-                           : '.';
+                    ? os_toebcdic[ch]
+                    : '.';
 #endif
                 buf[n] = '\0';
             }
@@ -127,7 +129,7 @@ int BIO_dump_indent(BIO *bp, const void *s, int len, int indent)
 }
 
 int BIO_hex_string(BIO *out, int indent, int width, const void *data,
-                   int datalen)
+    int datalen)
 {
     const unsigned char *d = data;
     int i, j = 0;
diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index 6fe295ee52f2d..5883c9b3c1220 100644
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -15,76 +15,76 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA BIO_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_ACCEPT_ERROR), "accept error"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_ADDRINFO_ADDR_IS_NOT_AF_INET),
-    "addrinfo addr is not af inet"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_AMBIGUOUS_HOST_OR_SERVICE),
-    "ambiguous host or service"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_BAD_FOPEN_MODE), "bad fopen mode"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_BROKEN_PIPE), "broken pipe"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_CONNECT_ERROR), "connect error"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_CONNECT_TIMEOUT), "connect timeout"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET),
-    "gethostbyname addr is not af inet"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETSOCKNAME_ERROR), "getsockname error"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS),
-    "getsockname truncated address"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETTING_SOCKTYPE), "getting socktype"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_INVALID_ARGUMENT), "invalid argument"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_INVALID_SOCKET), "invalid socket"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_IN_USE), "in use"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LENGTH_TOO_LONG), "length too long"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LISTEN_V6_ONLY), "listen v6 only"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LOOKUP_RETURNED_NOTHING),
-    "lookup returned nothing"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_MALFORMED_HOST_OR_SERVICE),
-    "malformed host or service"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NBIO_CONNECT_ERROR), "nbio connect error"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED),
-    "no accept addr or service specified"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED),
-    "no hostname or service specified"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_PORT_DEFINED), "no port defined"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_SUCH_FILE), "no such file"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_PORT_MISMATCH), "port mismatch"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TFO_DISABLED), "tfo disabled"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TFO_NO_KERNEL_SUPPORT),
-    "tfo no kernel support"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TRANSFER_ERROR), "transfer error"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TRANSFER_TIMEOUT), "transfer timeout"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_BIND_SOCKET),
-    "unable to bind socket"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_CREATE_SOCKET),
-    "unable to create socket"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_KEEPALIVE),
-    "unable to keepalive"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_LISTEN_SOCKET),
-    "unable to listen socket"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_NODELAY), "unable to nodelay"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_REUSEADDR),
-    "unable to reuseaddr"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_TFO), "unable to tfo"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNAVAILABLE_IP_FAMILY),
-    "unavailable ip family"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNINITIALIZED), "uninitialized"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNKNOWN_INFO_TYPE), "unknown info type"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_IP_FAMILY),
-    "unsupported ip family"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_METHOD), "unsupported method"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_PROTOCOL_FAMILY),
-    "unsupported protocol family"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_WRITE_TO_READ_ONLY_BIO),
-    "write to read only BIO"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_WSASTARTUP), "WSAStartup"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LOCAL_ADDR_NOT_AVAILABLE),
-     "local address not available"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_PEER_ADDR_NOT_AVAILABLE),
-     "peer address not available"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NON_FATAL),
-     "non-fatal or transient error"},
-    {ERR_PACK(ERR_LIB_BIO, 0, BIO_R_PORT_MISMATCH),
-     "port mismatch"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_ACCEPT_ERROR), "accept error" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_ADDRINFO_ADDR_IS_NOT_AF_INET),
+        "addrinfo addr is not af inet" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_AMBIGUOUS_HOST_OR_SERVICE),
+        "ambiguous host or service" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_BAD_FOPEN_MODE), "bad fopen mode" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_BROKEN_PIPE), "broken pipe" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_CONNECT_ERROR), "connect error" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_CONNECT_TIMEOUT), "connect timeout" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET),
+        "gethostbyname addr is not af inet" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETSOCKNAME_ERROR), "getsockname error" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS),
+        "getsockname truncated address" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_GETTING_SOCKTYPE), "getting socktype" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_INVALID_ARGUMENT), "invalid argument" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_INVALID_SOCKET), "invalid socket" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_IN_USE), "in use" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LENGTH_TOO_LONG), "length too long" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LISTEN_V6_ONLY), "listen v6 only" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LOOKUP_RETURNED_NOTHING),
+        "lookup returned nothing" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_MALFORMED_HOST_OR_SERVICE),
+        "malformed host or service" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NBIO_CONNECT_ERROR), "nbio connect error" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED),
+        "no accept addr or service specified" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED),
+        "no hostname or service specified" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_PORT_DEFINED), "no port defined" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NO_SUCH_FILE), "no such file" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_PORT_MISMATCH), "port mismatch" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TFO_DISABLED), "tfo disabled" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TFO_NO_KERNEL_SUPPORT),
+        "tfo no kernel support" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TRANSFER_ERROR), "transfer error" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_TRANSFER_TIMEOUT), "transfer timeout" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_BIND_SOCKET),
+        "unable to bind socket" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_CREATE_SOCKET),
+        "unable to create socket" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_KEEPALIVE),
+        "unable to keepalive" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_LISTEN_SOCKET),
+        "unable to listen socket" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_NODELAY), "unable to nodelay" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_REUSEADDR),
+        "unable to reuseaddr" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNABLE_TO_TFO), "unable to tfo" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNAVAILABLE_IP_FAMILY),
+        "unavailable ip family" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNINITIALIZED), "uninitialized" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNKNOWN_INFO_TYPE), "unknown info type" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_IP_FAMILY),
+        "unsupported ip family" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_METHOD), "unsupported method" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_UNSUPPORTED_PROTOCOL_FAMILY),
+        "unsupported protocol family" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_WRITE_TO_READ_ONLY_BIO),
+        "write to read only BIO" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_WSASTARTUP), "WSAStartup" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_LOCAL_ADDR_NOT_AVAILABLE),
+        "local address not available" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_PEER_ADDR_NOT_AVAILABLE),
+        "peer address not available" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_NON_FATAL),
+        "non-fatal or transient error" },
+    { ERR_PACK(ERR_LIB_BIO, 0, BIO_R_PORT_MISMATCH),
+        "port mismatch" },
+    { 0, NULL }
 };
 
 #endif
@@ -105,7 +105,7 @@ int BIO_err_is_non_fatal(unsigned int errcode)
     if (ERR_SYSTEM_ERROR(errcode))
         return BIO_sock_non_fatal_error(ERR_GET_REASON(errcode));
     else if (ERR_GET_LIB(errcode) == ERR_LIB_BIO
-             && ERR_GET_REASON(errcode) == BIO_R_NON_FATAL)
+        && ERR_GET_REASON(errcode) == BIO_R_NON_FATAL)
         return 1;
     else
         return 0;
diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c
index 85ab4afe182a2..8617ccb1b08bd 100644
--- a/crypto/bio/bio_lib.c
+++ b/crypto/bio/bio_lib.c
@@ -20,12 +20,12 @@
  * len parameter or not
  */
 #define HAS_LEN_OPER(o) ((o) == BIO_CB_READ || (o) == BIO_CB_WRITE \
-                         || (o) == BIO_CB_GETS)
+    || (o) == BIO_CB_GETS)
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# define HAS_CALLBACK(b) ((b)->callback != NULL || (b)->callback_ex != NULL)
+#define HAS_CALLBACK(b) ((b)->callback != NULL || (b)->callback_ex != NULL)
 #else
-# define HAS_CALLBACK(b) ((b)->callback_ex != NULL)
+#define HAS_CALLBACK(b) ((b)->callback_ex != NULL)
 #endif
 /*
  * Helper function to work out whether to call the new style callback or the old
@@ -35,8 +35,8 @@
  * for the "long" used for "inret"
  */
 static long bio_call_callback(BIO *b, int oper, const char *argp, size_t len,
-                              int argi, long argl, long inret,
-                              size_t *processed)
+    int argi, long argl, long inret,
+    size_t *processed)
 {
     long ret = inret;
 #ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -272,9 +272,7 @@ static int bio_read_intern(BIO *b, void *data, size_t dlen, size_t *readbytes)
         return -2;
     }
 
-    if (HAS_CALLBACK(b) &&
-        ((ret = (int)bio_call_callback(b, BIO_CB_READ, data, dlen, 0, 0L, 1L,
-                                       NULL)) <= 0))
+    if (HAS_CALLBACK(b) && ((ret = (int)bio_call_callback(b, BIO_CB_READ, data, dlen, 0, 0L, 1L, NULL)) <= 0))
         return ret;
 
     if (!b->init) {
@@ -289,7 +287,7 @@ static int bio_read_intern(BIO *b, void *data, size_t dlen, size_t *readbytes)
 
     if (HAS_CALLBACK(b))
         ret = (int)bio_call_callback(b, BIO_CB_READ | BIO_CB_RETURN, data,
-                                     dlen, 0, 0L, ret, readbytes);
+            dlen, 0, 0L, ret, readbytes);
 
     /* Shouldn't happen */
     if (ret > 0 && *readbytes > dlen) {
@@ -324,7 +322,7 @@ int BIO_read_ex(BIO *b, void *data, size_t dlen, size_t *readbytes)
 }
 
 static int bio_write_intern(BIO *b, const void *data, size_t dlen,
-                            size_t *written)
+    size_t *written)
 {
     size_t local_written;
     int ret;
@@ -343,9 +341,7 @@ static int bio_write_intern(BIO *b, const void *data, size_t dlen,
         return -2;
     }
 
-    if (HAS_CALLBACK(b) &&
-        ((ret = (int)bio_call_callback(b, BIO_CB_WRITE, data, dlen, 0, 0L, 1L,
-                                       NULL)) <= 0))
+    if (HAS_CALLBACK(b) && ((ret = (int)bio_call_callback(b, BIO_CB_WRITE, data, dlen, 0, 0L, 1L, NULL)) <= 0))
         return ret;
 
     if (!b->init) {
@@ -360,7 +356,7 @@ static int bio_write_intern(BIO *b, const void *data, size_t dlen,
 
     if (HAS_CALLBACK(b))
         ret = (int)bio_call_callback(b, BIO_CB_WRITE | BIO_CB_RETURN, data,
-                                     dlen, 0, 0L, ret, &local_written);
+            dlen, 0, 0L, ret, &local_written);
 
     if (written != NULL)
         *written = local_written;
@@ -392,8 +388,8 @@ int BIO_write_ex(BIO *b, const void *data, size_t dlen, size_t *written)
 }
 
 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)
 {
     size_t ret;
     BIO_MMSG_CB_ARGS args;
@@ -411,14 +407,14 @@ int BIO_sendmmsg(BIO *b, BIO_MSG *msg,
     }
 
     if (HAS_CALLBACK(b)) {
-        args.msg            = msg;
-        args.stride         = stride;
-        args.num_msg        = num_msg;
-        args.flags          = flags;
+        args.msg = msg;
+        args.stride = stride;
+        args.num_msg = num_msg;
+        args.flags = flags;
         args.msgs_processed = msgs_processed;
 
         ret = (size_t)bio_call_callback(b, BIO_CB_SENDMMSG, (void *)&args,
-                                        0, 0, 0, 1, NULL);
+            0, 0, 0, 1, NULL);
         if (ret <= 0)
             return 0;
     }
@@ -433,14 +429,14 @@ int BIO_sendmmsg(BIO *b, BIO_MSG *msg,
 
     if (HAS_CALLBACK(b))
         ret = (size_t)bio_call_callback(b, BIO_CB_SENDMMSG | BIO_CB_RETURN,
-                                        (void *)&args, ret, 0, 0, ret, NULL);
+            (void *)&args, ret, 0, 0, (long)ret, msgs_processed);
 
     return ret;
 }
 
 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)
 {
     size_t ret;
     BIO_MMSG_CB_ARGS args;
@@ -458,14 +454,14 @@ int BIO_recvmmsg(BIO *b, BIO_MSG *msg,
     }
 
     if (HAS_CALLBACK(b)) {
-        args.msg            = msg;
-        args.stride         = stride;
-        args.num_msg        = num_msg;
-        args.flags          = flags;
+        args.msg = msg;
+        args.stride = stride;
+        args.num_msg = num_msg;
+        args.flags = flags;
         args.msgs_processed = msgs_processed;
 
         ret = bio_call_callback(b, BIO_CB_RECVMMSG, (void *)&args,
-                                0, 0, 0, 1, NULL);
+            0, 0, 0, 1, NULL);
         if (ret <= 0)
             return 0;
     }
@@ -480,7 +476,7 @@ int BIO_recvmmsg(BIO *b, BIO_MSG *msg,
 
     if (HAS_CALLBACK(b))
         ret = (size_t)bio_call_callback(b, BIO_CB_RECVMMSG | BIO_CB_RETURN,
-                                        (void *)&args, ret, 0, 0, ret, NULL);
+            (void *)&args, ret, 0, 0, (long)ret, msgs_processed);
 
     return ret;
 }
@@ -530,7 +526,7 @@ int BIO_puts(BIO *b, const char *buf)
 
     if (HAS_CALLBACK(b))
         ret = (int)bio_call_callback(b, BIO_CB_PUTS | BIO_CB_RETURN, buf, 0, 0,
-                                     0L, ret, &written);
+            0L, ret, &written);
 
     if (ret > 0) {
         if (written > INT_MAX) {
@@ -583,7 +579,7 @@ int BIO_gets(BIO *b, char *buf, int size)
 
     if (HAS_CALLBACK(b))
         ret = (int)bio_call_callback(b, BIO_CB_GETS | BIO_CB_RETURN, buf, size,
-                                     0, 0L, ret, &readbytes);
+            0, 0L, ret, &readbytes);
 
     if (ret > 0) {
         /* Shouldn't happen */
@@ -678,7 +674,7 @@ long BIO_ctrl(BIO *b, int cmd, long larg, void *parg)
 
     if (HAS_CALLBACK(b))
         ret = bio_call_callback(b, BIO_CB_CTRL | BIO_CB_RETURN, parg, 0, cmd,
-                                larg, ret, NULL);
+            larg, ret, NULL);
 
     return ret;
 }
@@ -690,14 +686,14 @@ long BIO_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
     if (b == NULL)
         return -2;
     if (b->method == NULL || b->method->callback_ctrl == NULL
-            || cmd != BIO_CTRL_SET_CALLBACK) {
+        || cmd != BIO_CTRL_SET_CALLBACK) {
         ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_METHOD);
         return -2;
     }
 
     if (HAS_CALLBACK(b)) {
         ret = bio_call_callback(b, BIO_CB_CTRL, (void *)&fp, 0, cmd, 0, 1L,
-                                NULL);
+            NULL);
         if (ret <= 0)
             return ret;
     }
@@ -706,7 +702,7 @@ long BIO_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 
     if (HAS_CALLBACK(b))
         ret = bio_call_callback(b, BIO_CB_CTRL | BIO_CB_RETURN, (void *)&fp, 0,
-                                cmd, 0, ret, NULL);
+            cmd, 0, ret, NULL);
 
     return ret;
 }
@@ -888,7 +884,7 @@ BIO *BIO_dup_chain(BIO *in)
 
         /* copy app data */
         if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new_bio->ex_data,
-                                &bio->ex_data)) {
+                &bio->ex_data)) {
             BIO_free(new_bio);
             goto err;
         }
@@ -902,7 +898,7 @@ BIO *BIO_dup_chain(BIO *in)
         }
     }
     return ret;
- err:
+err:
     BIO_free_all(ret);
 
     return NULL;
@@ -1004,7 +1000,7 @@ int BIO_wait(BIO *bio, time_t max_time, unsigned int nap_milliseconds)
 
     if (rv <= 0)
         ERR_raise(ERR_LIB_BIO,
-                  rv == 0 ? BIO_R_TRANSFER_TIMEOUT : BIO_R_TRANSFER_ERROR);
+            rv == 0 ? BIO_R_TRANSFER_TIMEOUT : BIO_R_TRANSFER_ERROR);
     return rv;
 }
 
@@ -1031,7 +1027,7 @@ int BIO_do_connect_retry(BIO *bio, int timeout, int nap_milliseconds)
         nap_milliseconds = 100;
     BIO_set_nbio(bio, !blocking);
 
- retry:
+retry:
     ERR_set_mark();
     rv = BIO_do_connect(bio);
 
@@ -1066,7 +1062,7 @@ int BIO_do_connect_retry(BIO *bio, int timeout, int nap_milliseconds)
             if (rv > 0)
                 goto retry;
             ERR_raise(ERR_LIB_BIO,
-                      rv == 0 ? BIO_R_CONNECT_TIMEOUT : BIO_R_CONNECT_ERROR);
+                rv == 0 ? BIO_R_CONNECT_TIMEOUT : BIO_R_CONNECT_ERROR);
         } else {
             ERR_clear_last_mark();
             rv = -1;
diff --git a/crypto/bio/bio_local.h b/crypto/bio/bio_local.h
index 05954f85bb2f4..60fb944928c00 100644
--- a/crypto/bio/bio_local.h
+++ b/crypto/bio/bio_local.h
@@ -27,14 +27,14 @@
  * For clarity, we check for internal/cryptlib.h since it's a common header
  * that also includes bio.h.
  */
-# ifdef OSSL_INTERNAL_CRYPTLIB_H
-#  error internal/cryptlib.h included before bio_local.h
-# endif
-# ifdef OPENSSL_BIO_H
-#  error openssl/bio.h included before bio_local.h
-# endif
+#ifdef OSSL_INTERNAL_CRYPTLIB_H
+#error internal/cryptlib.h included before bio_local.h
+#endif
+#ifdef OPENSSL_BIO_H
+#error openssl/bio.h included before bio_local.h
+#endif
 
-# ifdef AI_PASSIVE
+#ifdef AI_PASSIVE
 
 /*
  * There's a bug in VMS C header file netdb.h, where struct addrinfo
@@ -43,18 +43,18 @@
  * size.  The easiest workaround is to force struct addrinfo to be the
  * 64-bit variant when compiling in P64 mode.
  */
-#  if defined(OPENSSL_SYS_VMS) && __INITIAL_POINTER_SIZE == 64
-#   define addrinfo __addrinfo64
-#  endif
-
-#  define bio_addrinfo_st addrinfo
-#  define bai_family      ai_family
-#  define bai_socktype    ai_socktype
-#  define bai_protocol    ai_protocol
-#  define bai_addrlen     ai_addrlen
-#  define bai_addr        ai_addr
-#  define bai_next        ai_next
-# else
+#if defined(OPENSSL_SYS_VMS) && __INITIAL_POINTER_SIZE == 64
+#define addrinfo __addrinfo64
+#endif
+
+#define bio_addrinfo_st addrinfo
+#define bai_family ai_family
+#define bai_socktype ai_socktype
+#define bai_protocol ai_protocol
+#define bai_addrlen ai_addrlen
+#define bai_addr ai_addr
+#define bai_next ai_next
+#else
 struct bio_addrinfo_st {
     int bai_family;
     int bai_socktype;
@@ -63,7 +63,7 @@ struct bio_addrinfo_st {
     struct sockaddr *bai_addr;
     struct bio_addrinfo_st *bai_next;
 };
-# endif
+#endif
 #endif
 
 /* END BIO_ADDRINFO/BIO_ADDR stuff. */
@@ -82,17 +82,17 @@ typedef struct bio_f_buffer_ctx_struct {
      * +---------------------------------------------------+
      * <-- off --><------- len ------->
      */
-    /*- BIO *bio; *//*
-     * this is now in the BIO struct
-     */
-    int ibuf_size;              /* how big is the input buffer */
-    int obuf_size;              /* how big is the output buffer */
-    char *ibuf;                 /* the char array */
-    int ibuf_len;               /* how many bytes are in it */
-    int ibuf_off;               /* write/read offset */
-    char *obuf;                 /* the char array */
-    int obuf_len;               /* how many bytes are in it */
-    int obuf_off;               /* write/read offset */
+    /*- BIO *bio; */ /*
+                      * this is now in the BIO struct
+                      */
+    int ibuf_size; /* how big is the input buffer */
+    int obuf_size; /* how big is the output buffer */
+    char *ibuf; /* the char array */
+    int ibuf_len; /* how many bytes are in it */
+    int ibuf_off; /* write/read offset */
+    char *obuf; /* the char array */
+    int obuf_len; /* how many bytes are in it */
+    int obuf_off; /* write/read offset */
 } BIO_F_BUFFER_CTX;
 
 struct bio_st {
@@ -103,15 +103,15 @@ struct bio_st {
     BIO_callback_fn callback;
 #endif
     BIO_callback_fn_ex callback_ex;
-    char *cb_arg;               /* first argument for the callback */
+    char *cb_arg; /* first argument for the callback */
     int init;
     int shutdown;
-    int flags;                  /* extra storage */
+    int flags; /* extra storage */
     int retry_reason;
     int num;
     void *ptr;
-    struct bio_st *next_bio;    /* used by filter BIOs */
-    struct bio_st *prev_bio;    /* used by filter BIOs */
+    struct bio_st *next_bio; /* used by filter BIOs */
+    struct bio_st *prev_bio; /* used by filter BIOs */
     CRYPTO_REF_COUNT references;
     uint64_t num_read;
     uint64_t num_write;
@@ -119,9 +119,9 @@ struct bio_st {
 };
 
 #ifndef OPENSSL_NO_SOCK
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
 typedef unsigned int socklen_t;
-# endif
+#endif
 
 extern CRYPTO_RWLOCK *bio_lookup_lock;
 
@@ -132,50 +132,49 @@ socklen_t BIO_ADDR_sockaddr_size(const BIO_ADDR *ap);
 socklen_t BIO_ADDRINFO_sockaddr_size(const BIO_ADDRINFO *bai);
 const struct sockaddr *BIO_ADDRINFO_sockaddr(const BIO_ADDRINFO *bai);
 
-# if defined(OPENSSL_SYS_WINDOWS) && defined(WSAID_WSARECVMSG)
-#  define BIO_HAVE_WSAMSG
+#if defined(OPENSSL_SYS_WINDOWS) && defined(WSAID_WSARECVMSG)
+#define BIO_HAVE_WSAMSG
 extern LPFN_WSARECVMSG bio_WSARecvMsg;
 extern LPFN_WSASENDMSG bio_WSASendMsg;
-# endif
+#endif
 #endif
 
 extern CRYPTO_REF_COUNT bio_type_count;
 
 void bio_sock_cleanup_int(void);
 
-#if BIO_FLAGS_UPLINK_INTERNAL==0
+#if BIO_FLAGS_UPLINK_INTERNAL == 0
 /* Shortcut UPLINK calls on most platforms... */
-# define UP_stdin        stdin
-# define UP_stdout       stdout
-# define UP_stderr       stderr
-# define UP_fprintf      fprintf
-# define UP_fgets        fgets
-# define UP_fread        fread
-# define UP_fwrite       fwrite
-# undef  UP_fsetmod
-# define UP_feof         feof
-# define UP_fclose       fclose
-
-# define UP_fopen        fopen
-# define UP_fseek        fseek
-# define UP_ftell        ftell
-# define UP_fflush       fflush
-# define UP_ferror       ferror
-# ifdef _WIN32
-#  define UP_fileno       _fileno
-#  define UP_open         _open
-#  define UP_read         _read
-#  define UP_write        _write
-#  define UP_lseek        _lseek
-#  define UP_close        _close
-# else
-#  define UP_fileno       fileno
-#  define UP_open         open
-#  define UP_read         read
-#  define UP_write        write
-#  define UP_lseek        lseek
-#  define UP_close        close
-# endif
-
+#define UP_stdin stdin
+#define UP_stdout stdout
+#define UP_stderr stderr
+#define UP_fprintf fprintf
+#define UP_fgets fgets
+#define UP_fread fread
+#define UP_fwrite fwrite
+#undef UP_fsetmod
+#define UP_feof feof
+#define UP_fclose fclose
+
+#define UP_fopen fopen
+#define UP_fseek fseek
+#define UP_ftell ftell
+#define UP_fflush fflush
+#define UP_ferror ferror
+#ifdef _WIN32
+#define UP_fileno _fileno
+#define UP_open _open
+#define UP_read _read
+#define UP_write _write
+#define UP_lseek _lseek
+#define UP_close _close
+#else
+#define UP_fileno fileno
+#define UP_open open
+#define UP_read read
+#define UP_write write
+#define UP_lseek lseek
+#define UP_close close
 #endif
 
+#endif
diff --git a/crypto/bio/bio_meth.c b/crypto/bio/bio_meth.c
index b665929b5feff..0cab60491e77a 100644
--- a/crypto/bio/bio_meth.c
+++ b/crypto/bio/bio_meth.c
@@ -39,7 +39,7 @@ BIO_METHOD *BIO_meth_new(int type, const char *name)
     BIO_METHOD *biom = OPENSSL_zalloc(sizeof(BIO_METHOD));
 
     if (biom == NULL
-            || (biom->name = OPENSSL_strdup(name)) == NULL) {
+        || (biom->name = OPENSSL_strdup(name)) == NULL) {
         OPENSSL_free(biom);
         return NULL;
     }
@@ -56,13 +56,13 @@ void BIO_meth_free(BIO_METHOD *biom)
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_write(const BIO_METHOD *biom)) (BIO *, const char *, int)
+int (*BIO_meth_get_write(const BIO_METHOD *biom))(BIO *, const char *, int)
 {
     return biom->bwrite_old;
 }
 
-int (*BIO_meth_get_write_ex(const BIO_METHOD *biom)) (BIO *, const char *, size_t,
-                                                size_t *)
+int (*BIO_meth_get_write_ex(const BIO_METHOD *biom))(BIO *, const char *, size_t,
+    size_t *)
 {
     return biom->bwrite;
 }
@@ -89,7 +89,7 @@ int bwrite_conv(BIO *bio, const char *data, size_t datal, size_t *written)
 }
 
 int BIO_meth_set_write(BIO_METHOD *biom,
-                       int (*bwrite) (BIO *, const char *, int))
+    int (*bwrite)(BIO *, const char *, int))
 {
     biom->bwrite_old = bwrite;
     biom->bwrite = bwrite_conv;
@@ -97,7 +97,7 @@ int BIO_meth_set_write(BIO_METHOD *biom,
 }
 
 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 *))
 {
     biom->bwrite_old = NULL;
     biom->bwrite = bwrite;
@@ -105,12 +105,12 @@ int BIO_meth_set_write_ex(BIO_METHOD *biom,
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_read(const BIO_METHOD *biom)) (BIO *, char *, int)
+int (*BIO_meth_get_read(const BIO_METHOD *biom))(BIO *, char *, int)
 {
     return biom->bread_old;
 }
 
-int (*BIO_meth_get_read_ex(const BIO_METHOD *biom)) (BIO *, char *, size_t, size_t *)
+int (*BIO_meth_get_read_ex(const BIO_METHOD *biom))(BIO *, char *, size_t, size_t *)
 {
     return biom->bread;
 }
@@ -137,7 +137,7 @@ int bread_conv(BIO *bio, char *data, size_t datal, size_t *readbytes)
 }
 
 int BIO_meth_set_read(BIO_METHOD *biom,
-                      int (*bread) (BIO *, char *, int))
+    int (*bread)(BIO *, char *, int))
 {
     biom->bread_old = bread;
     biom->bread = bread_conv;
@@ -145,7 +145,7 @@ int BIO_meth_set_read(BIO_METHOD *biom,
 }
 
 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 *))
 {
     biom->bread_old = NULL;
     biom->bread = bread;
@@ -153,110 +153,112 @@ int BIO_meth_set_read_ex(BIO_METHOD *biom,
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_puts(const BIO_METHOD *biom)) (BIO *, const char *)
+int (*BIO_meth_get_puts(const BIO_METHOD *biom))(BIO *, const char *)
 {
     return biom->bputs;
 }
 #endif
 
 int BIO_meth_set_puts(BIO_METHOD *biom,
-                      int (*bputs) (BIO *, const char *))
+    int (*bputs)(BIO *, const char *))
 {
     biom->bputs = bputs;
     return 1;
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int)
+int (*BIO_meth_get_gets(const BIO_METHOD *biom))(BIO *, char *, int)
 {
     return biom->bgets;
 }
 #endif
 
 int BIO_meth_set_gets(BIO_METHOD *biom,
-                      int (*bgets) (BIO *, char *, int))
+    int (*bgets)(BIO *, char *, int))
 {
     biom->bgets = bgets;
     return 1;
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_5
-long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int, long, void *)
+long (*BIO_meth_get_ctrl(const BIO_METHOD *biom))(BIO *, int, long, void *)
 {
     return biom->ctrl;
 }
 #endif
 
 int BIO_meth_set_ctrl(BIO_METHOD *biom,
-                      long (*ctrl) (BIO *, int, long, void *))
+    long (*ctrl)(BIO *, int, long, void *))
 {
     biom->ctrl = ctrl;
     return 1;
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_create(const BIO_METHOD *biom)) (BIO *)
+int (*BIO_meth_get_create(const BIO_METHOD *biom))(BIO *)
 {
     return biom->create;
 }
 #endif
 
-int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *))
+int BIO_meth_set_create(BIO_METHOD *biom, int (*create)(BIO *))
 {
     biom->create = create;
     return 1;
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_destroy(const BIO_METHOD *biom)) (BIO *)
+int (*BIO_meth_get_destroy(const BIO_METHOD *biom))(BIO *)
 {
     return biom->destroy;
 }
 #endif
 
-int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *))
+int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy)(BIO *))
 {
     biom->destroy = destroy;
     return 1;
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_5
-long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom)) (BIO *, int, BIO_info_cb *)
+long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom))(BIO *, int, BIO_info_cb *)
 {
     return biom->callback_ctrl;
 }
 #endif
 
 int BIO_meth_set_callback_ctrl(BIO_METHOD *biom,
-                               long (*callback_ctrl) (BIO *, int,
-                                                      BIO_info_cb *))
+    long (*callback_ctrl)(BIO *, int,
+        BIO_info_cb *))
 {
     biom->callback_ctrl = callback_ctrl;
     return 1;
 }
 
 int BIO_meth_set_sendmmsg(BIO_METHOD *biom,
-                          int (*bsendmmsg) (BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *))
+    int (*bsendmmsg)(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *))
 {
     biom->bsendmmsg = bsendmmsg;
     return 1;
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_sendmmsg(const BIO_METHOD *biom))(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *) {
+int (*BIO_meth_get_sendmmsg(const BIO_METHOD *biom))(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *)
+{
     return biom->bsendmmsg;
 }
 #endif
 
 int BIO_meth_set_recvmmsg(BIO_METHOD *biom,
-                          int (*brecvmmsg) (BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *))
+    int (*brecvmmsg)(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *))
 {
     biom->brecvmmsg = brecvmmsg;
     return 1;
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_5
-int (*BIO_meth_get_recvmmsg(const BIO_METHOD *biom))(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *) {
+int (*BIO_meth_get_recvmmsg(const BIO_METHOD *biom))(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *)
+{
     return biom->brecvmmsg;
 }
 #endif
diff --git a/crypto/bio/bio_print.c b/crypto/bio/bio_print.c
index 5f2543030e54d..b04496a10ba68 100644
--- a/crypto/bio/bio_print.c
+++ b/crypto/bio/bio_print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -23,71 +23,71 @@
  */
 
 #ifdef HAVE_LONG_DOUBLE
-# define LDOUBLE long double
+#define LDOUBLE long double
 #else
-# define LDOUBLE double
+#define LDOUBLE double
 #endif
 
 static int fmtstr(char **, char **, size_t *, size_t *,
-                  const char *, int, int, int);
+    const char *, int, int, int);
 static int fmtint(char **, char **, size_t *, size_t *,
-                  int64_t, int, int, int, int);
+    int64_t, int, int, int, int);
 #ifndef OPENSSL_SYS_UEFI
 static int fmtfp(char **, char **, size_t *, size_t *,
-                 LDOUBLE, int, int, int, int);
+    LDOUBLE, int, int, int, int);
 #endif
 static int doapr_outch(char **, char **, size_t *, size_t *, int);
 static int _dopr(char **sbuffer, char **buffer,
-                 size_t *maxlen, size_t *retlen, int *truncated,
-                 const char *format, va_list args);
+    size_t *maxlen, size_t *retlen, int *truncated,
+    const char *format, va_list args);
 
 /* format read states */
-#define DP_S_DEFAULT    0
-#define DP_S_FLAGS      1
-#define DP_S_MIN        2
-#define DP_S_DOT        3
-#define DP_S_MAX        4
-#define DP_S_MOD        5
-#define DP_S_CONV       6
-#define DP_S_DONE       7
+#define DP_S_DEFAULT 0
+#define DP_S_FLAGS 1
+#define DP_S_MIN 2
+#define DP_S_DOT 3
+#define DP_S_MAX 4
+#define DP_S_MOD 5
+#define DP_S_CONV 6
+#define DP_S_DONE 7
 
 /* format flags - Bits */
 /* left-aligned padding */
-#define DP_F_MINUS      (1 << 0)
+#define DP_F_MINUS (1 << 0)
 /* print an explicit '+' for a value with positive sign */
-#define DP_F_PLUS       (1 << 1)
+#define DP_F_PLUS (1 << 1)
 /* print an explicit ' ' for a value with positive sign */
-#define DP_F_SPACE      (1 << 2)
+#define DP_F_SPACE (1 << 2)
 /* print 0/0x prefix for octal/hex and decimal point for floating point */
-#define DP_F_NUM        (1 << 3)
+#define DP_F_NUM (1 << 3)
 /* print leading zeroes */
-#define DP_F_ZERO       (1 << 4)
+#define DP_F_ZERO (1 << 4)
 /* print HEX in UPPERcase */
-#define DP_F_UP         (1 << 5)
+#define DP_F_UP (1 << 5)
 /* treat value as unsigned */
-#define DP_F_UNSIGNED   (1 << 6)
+#define DP_F_UNSIGNED (1 << 6)
 
 /* conversion flags */
-#define DP_C_SHORT      1
-#define DP_C_LONG       2
-#define DP_C_LDOUBLE    3
-#define DP_C_LLONG      4
-#define DP_C_SIZE       5
+#define DP_C_SHORT 1
+#define DP_C_LONG 2
+#define DP_C_LDOUBLE 3
+#define DP_C_LLONG 4
+#define DP_C_SIZE 5
 
 /* Floating point formats */
-#define F_FORMAT        0
-#define E_FORMAT        1
-#define G_FORMAT        2
+#define F_FORMAT 0
+#define E_FORMAT 1
+#define G_FORMAT 2
 
 /* some handy macros */
 #define char_to_int(p) (p - '0')
-#define OSSL_MAX(p,q) ((p >= q) ? p : q)
+#define OSSL_MAX(p, q) ((p >= q) ? p : q)
 
 static int
 _dopr(char **sbuffer,
-      char **buffer,
-      size_t *maxlen,
-      size_t *retlen, int *truncated, const char *format, va_list args)
+    char **buffer,
+    size_t *maxlen,
+    size_t *retlen, int *truncated, const char *format, va_list args)
 {
     char ch;
     int64_t value;
@@ -115,9 +115,8 @@ _dopr(char **sbuffer,
         case DP_S_DEFAULT:
             if (ch == '%')
                 state = DP_S_FLAGS;
-            else
-                if (!doapr_outch(sbuffer, buffer, &currlen, maxlen, ch))
-                    return 0;
+            else if (!doapr_outch(sbuffer, buffer, &currlen, maxlen, ch))
+                return 0;
             ch = *format++;
             break;
         case DP_S_FLAGS:
@@ -232,7 +231,7 @@ _dopr(char **sbuffer,
                     break;
                 }
                 if (!fmtint(sbuffer, buffer, &currlen, maxlen, value, 10, min,
-                            max, flags))
+                        max, flags))
                     return 0;
                 break;
             case 'X':
@@ -260,8 +259,8 @@ _dopr(char **sbuffer,
                     break;
                 }
                 if (!fmtint(sbuffer, buffer, &currlen, maxlen, value,
-                            ch == 'o' ? 8 : (ch == 'u' ? 10 : 16),
-                            min, max, flags))
+                        ch == 'o' ? 8 : (ch == 'u' ? 10 : 16),
+                        min, max, flags))
                     return 0;
                 break;
 #ifndef OPENSSL_SYS_UEFI
@@ -271,7 +270,7 @@ _dopr(char **sbuffer,
                 else
                     fvalue = va_arg(args, double);
                 if (!fmtfp(sbuffer, buffer, &currlen, maxlen, fvalue, min, max,
-                           flags, F_FORMAT))
+                        flags, F_FORMAT))
                     return 0;
                 break;
             case 'E':
@@ -283,7 +282,7 @@ _dopr(char **sbuffer,
                 else
                     fvalue = va_arg(args, double);
                 if (!fmtfp(sbuffer, buffer, &currlen, maxlen, fvalue, min, max,
-                           flags, E_FORMAT))
+                        flags, E_FORMAT))
                     return 0;
                 break;
             case 'G':
@@ -295,7 +294,7 @@ _dopr(char **sbuffer,
                 else
                     fvalue = va_arg(args, double);
                 if (!fmtfp(sbuffer, buffer, &currlen, maxlen, fvalue, min, max,
-                           flags, G_FORMAT))
+                        flags, G_FORMAT))
                     return 0;
                 break;
 #else
@@ -310,7 +309,7 @@ _dopr(char **sbuffer,
 #endif
             case 'c':
                 if (!doapr_outch(sbuffer, buffer, &currlen, maxlen,
-                                 va_arg(args, int)))
+                        va_arg(args, int)))
                     return 0;
                 break;
             case 's':
@@ -322,22 +321,20 @@ _dopr(char **sbuffer,
                         max = *maxlen;
                 }
                 if (!fmtstr(sbuffer, buffer, &currlen, maxlen, strvalue,
-                            flags, min, max))
+                        flags, min, max))
                     return 0;
                 break;
             case 'p':
                 value = (size_t)va_arg(args, void *);
                 if (!fmtint(sbuffer, buffer, &currlen, maxlen,
-                            value, 16, min, max, flags | DP_F_NUM))
+                        value, 16, min, max, flags | DP_F_NUM))
                     return 0;
                 break;
-            case 'n':
-                {
-                    int *num;
-                    num = va_arg(args, int *);
-                    *num = currlen;
-                }
-                break;
+            case 'n': {
+                int *num;
+                num = va_arg(args, int *);
+                *num = currlen;
+            } break;
             case '%':
                 if (!doapr_outch(sbuffer, buffer, &currlen, maxlen, ch))
                     return 0;
@@ -378,9 +375,9 @@ _dopr(char **sbuffer,
 
 static int
 fmtstr(char **sbuffer,
-       char **buffer,
-       size_t *currlen,
-       size_t *maxlen, const char *value, int flags, int min, int max)
+    char **buffer,
+    size_t *currlen,
+    size_t *maxlen, const char *value, int flags, int min, int max)
 {
     int padlen;
     size_t strln;
@@ -430,9 +427,9 @@ fmtstr(char **sbuffer,
 
 static int
 fmtint(char **sbuffer,
-       char **buffer,
-       size_t *currlen,
-       size_t *maxlen, int64_t value, int base, int min, int max, int flags)
+    char **buffer,
+    size_t *currlen,
+    size_t *maxlen, int64_t value, int base, int min, int max, int flags)
 {
     int signvalue = 0;
     const char *prefix = "";
@@ -473,8 +470,7 @@ fmtint(char **sbuffer,
     convert[place] = 0;
 
     zpadlen = max - place;
-    spadlen =
-        min - OSSL_MAX(max, place) - (signvalue ? 1 : 0) - strlen(prefix);
+    spadlen = min - OSSL_MAX(max, place) - (signvalue ? 1 : 0) - strlen(prefix);
     if (zpadlen < 0)
         zpadlen = 0;
     if (spadlen < 0)
@@ -535,6 +531,10 @@ static LDOUBLE abs_val(LDOUBLE value)
     LDOUBLE result = value;
     if (value < 0)
         result = -value;
+    if (result > 0 && result / 2 == result) /* INF */
+        result = 0;
+    else if (result != result) /* NAN */
+        result = 0;
     return result;
 }
 
@@ -560,9 +560,9 @@ static long roundv(LDOUBLE value)
 
 static int
 fmtfp(char **sbuffer,
-      char **buffer,
-      size_t *currlen,
-      size_t *maxlen, LDOUBLE fvalue, int min, int max, int flags, int style)
+    char **buffer,
+    size_t *currlen,
+    size_t *maxlen, LDOUBLE fvalue, int min, int max, int flags, int style)
 {
     int signvalue = 0;
     LDOUBLE ufvalue;
@@ -590,6 +590,9 @@ fmtfp(char **sbuffer,
         signvalue = '+';
     else if (flags & DP_F_SPACE)
         signvalue = ' ';
+    ufvalue = abs_val(fvalue);
+    if (ufvalue == 0 && fvalue != 0) /* INF or NAN? */
+        signvalue = '?';
 
     /*
      * G_FORMAT sometimes prints like E_FORMAT and sometimes like F_FORMAT
@@ -597,12 +600,12 @@ fmtfp(char **sbuffer,
      * that from here on.
      */
     if (style == G_FORMAT) {
-        if (fvalue == 0.0) {
+        if (ufvalue == 0.0) {
             realstyle = F_FORMAT;
-        } else if (fvalue < 0.0001) {
+        } else if (ufvalue < 0.0001) {
             realstyle = E_FORMAT;
-        } else if ((max == 0 && fvalue >= 10)
-                    || (max > 0 && fvalue >= pow_10(max))) {
+        } else if ((max == 0 && ufvalue >= 10)
+            || (max > 0 && ufvalue >= pow_10(max))) {
             realstyle = E_FORMAT;
         } else {
             realstyle = F_FORMAT;
@@ -612,9 +615,9 @@ fmtfp(char **sbuffer,
     }
 
     if (style != F_FORMAT) {
-        tmpvalue = fvalue;
+        tmpvalue = ufvalue;
         /* Calculate the exponent */
-        if (fvalue != 0.0) {
+        if (ufvalue != 0.0) {
             while (tmpvalue < 1) {
                 tmpvalue *= 10;
                 exp--;
@@ -651,9 +654,9 @@ fmtfp(char **sbuffer,
             }
         }
         if (realstyle == E_FORMAT)
-            fvalue = tmpvalue;
+            ufvalue = tmpvalue;
     }
-    ufvalue = abs_val(fvalue);
+
     /*
      * By subtracting 65535 (2^16-1) we cancel the low order 15 bits
      * of ULONG_MAX to avoid using imprecise floating point values.
@@ -783,7 +786,7 @@ fmtfp(char **sbuffer,
 
         while (fplace > 0) {
             if (!doapr_outch(sbuffer, buffer, currlen, maxlen,
-                             fconvert[--fplace]))
+                    fconvert[--fplace]))
                 return 0;
         }
     }
@@ -800,17 +803,17 @@ fmtfp(char **sbuffer,
         else
             ech = 'E';
         if (!doapr_outch(sbuffer, buffer, currlen, maxlen, ech))
-                return 0;
+            return 0;
         if (exp < 0) {
             if (!doapr_outch(sbuffer, buffer, currlen, maxlen, '-'))
-                    return 0;
+                return 0;
         } else {
             if (!doapr_outch(sbuffer, buffer, currlen, maxlen, '+'))
-                    return 0;
+                return 0;
         }
         while (eplace > 0) {
             if (!doapr_outch(sbuffer, buffer, currlen, maxlen,
-                             econvert[--eplace]))
+                    econvert[--eplace]))
                 return 0;
         }
     }
@@ -825,11 +828,11 @@ fmtfp(char **sbuffer,
 
 #endif /* OPENSSL_SYS_UEFI */
 
-#define BUFFER_INC  1024
+#define BUFFER_INC 1024
 
 static int
 doapr_outch(char **sbuffer,
-            char **buffer, size_t *currlen, size_t *maxlen, int c)
+    char **buffer, size_t *currlen, size_t *maxlen, int c)
 {
     /* If we haven't at least one buffer, someone has done a big booboo */
     if (!ossl_assert(*sbuffer != NULL || buffer != NULL))
@@ -892,9 +895,9 @@ int BIO_vprintf(BIO *bio, const char *format, va_list args)
 {
     int ret;
     size_t retlen;
-    char hugebuf[1024 * 2];     /* Was previously 10k, which is unreasonable
-                                 * in small-stack environments, like threads
-                                 * or DOS programs. */
+    char hugebuf[1024 * 2]; /* Was previously 10k, which is unreasonable
+                             * in small-stack environments, like threads
+                             * or DOS programs. */
     char *hugebufp = hugebuf;
     size_t hugebufsize = sizeof(hugebuf);
     char *dynbuf = NULL;
@@ -902,7 +905,7 @@ int BIO_vprintf(BIO *bio, const char *format, va_list args)
 
     dynbuf = NULL;
     if (!_dopr(&hugebufp, &dynbuf, &hugebufsize, &retlen, &ignored, format,
-                args)) {
+            args)) {
         OPENSSL_free(dynbuf);
         return -1;
     }
diff --git a/crypto/bio/bio_sock.c b/crypto/bio/bio_sock.c
index be1a74620f697..5b793b9af1d1a 100644
--- a/crypto/bio/bio_sock.c
+++ b/crypto/bio/bio_sock.c
@@ -12,43 +12,43 @@
 #include "bio_local.h"
 
 #ifndef OPENSSL_NO_SOCK
-# define SOCKET_PROTOCOL IPPROTO_TCP
-# ifdef SO_MAXCONN
-#  define MAX_LISTEN  SO_MAXCONN
-# elif defined(SOMAXCONN)
-#  define MAX_LISTEN  SOMAXCONN
-# else
-#  define MAX_LISTEN  32
-# endif
-# if defined(OPENSSL_SYS_WINDOWS)
+#define SOCKET_PROTOCOL IPPROTO_TCP
+#ifdef SO_MAXCONN
+#define MAX_LISTEN SO_MAXCONN
+#elif defined(SOMAXCONN)
+#define MAX_LISTEN SOMAXCONN
+#else
+#define MAX_LISTEN 32
+#endif
+#if defined(OPENSSL_SYS_WINDOWS)
 static int wsa_init_done = 0;
-# endif
-
-# if defined __TANDEM
-#  include <unistd.h>
-#  include <sys/time.h> /* select */
-# elif defined _WIN32
-#  include <winsock.h> /* for type fd_set */
-# else
-#  include <unistd.h>
-#  if defined __VMS
-#   include <sys/socket.h>
-#  elif defined _HPUX_SOURCE
-#   include <sys/time.h>
-#  else
-#   include <sys/select.h>
-#  endif
-# endif
-# include "internal/sockets.h" /* for openssl_fdset() */
-
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#endif
+
+#if defined __TANDEM
+#include <unistd.h>
+#include <sys/time.h> /* select */
+#elif defined _WIN32
+#include <winsock.h> /* for type fd_set */
+#else
+#include <unistd.h>
+#if defined __VMS
+#include <sys/socket.h>
+#elif defined _HPUX_SOURCE
+#include <sys/time.h>
+#else
+#include <sys/select.h>
+#endif
+#endif
+#include "internal/sockets.h" /* for openssl_fdset() */
+
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 int BIO_get_host_ip(const char *str, unsigned char *ip)
 {
     BIO_ADDRINFO *res = NULL;
     int ret = 0;
 
     if (BIO_sock_init() != 1)
-        return 0;               /* don't generate another error code here */
+        return 0; /* don't generate another error code here */
 
     if (BIO_lookup(str, NULL, BIO_LOOKUP_CLIENT, AF_INET, SOCK_STREAM, &res)) {
         size_t l;
@@ -82,7 +82,7 @@ int BIO_get_port(const char *str, unsigned short *port_ptr)
     }
 
     if (BIO_sock_init() != 1)
-        return 0;               /* don't generate another error code here */
+        return 0; /* don't generate another error code here */
 
     if (BIO_lookup(NULL, str, BIO_LOOKUP_CLIENT, AF_INET, SOCK_STREAM, &res)) {
         if (BIO_ADDRINFO_family(res) != AF_INET) {
@@ -98,7 +98,7 @@ int BIO_get_port(const char *str, unsigned short *port_ptr)
 
     return ret;
 }
-# endif
+#endif
 
 int BIO_sock_error(int sock)
 {
@@ -118,7 +118,7 @@ int BIO_sock_error(int sock)
         return j;
 }
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 struct hostent *BIO_gethostbyname(const char *name)
 {
     /*
@@ -127,16 +127,16 @@ struct hostent *BIO_gethostbyname(const char *name)
      */
     return gethostbyname(name);
 }
-# endif
+#endif
 
-# ifdef BIO_HAVE_WSAMSG
+#ifdef BIO_HAVE_WSAMSG
 LPFN_WSARECVMSG bio_WSARecvMsg;
 LPFN_WSASENDMSG bio_WSASendMsg;
-# endif
+#endif
 
 int BIO_sock_init(void)
 {
-# ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
     static struct WSAData wsa_state;
 
     if (!wsa_init_done) {
@@ -150,7 +150,7 @@ int BIO_sock_init(void)
          */
         if (WSAStartup(0x0202, &wsa_state) != 0) {
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling wsastartup()");
+                "calling wsastartup()");
             ERR_raise(ERR_LIB_BIO, BIO_R_WSASTARTUP);
             return -1;
         }
@@ -160,7 +160,7 @@ int BIO_sock_init(void)
          * Instead, their function pointers must be loaded via this elaborate
          * process...
          */
-#  ifdef BIO_HAVE_WSAMSG
+#ifdef BIO_HAVE_WSAMSG
         {
             GUID id_WSARecvMsg = WSAID_WSARECVMSG;
             GUID id_WSASendMsg = WSAID_WSASENDMSG;
@@ -170,53 +170,55 @@ int BIO_sock_init(void)
             s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
             if (s != INVALID_SOCKET) {
                 if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER,
-                             &id_WSARecvMsg, sizeof(id_WSARecvMsg),
-                             &bio_WSARecvMsg, sizeof(bio_WSARecvMsg),
-                             &len_out, NULL, NULL) != 0
+                        &id_WSARecvMsg, sizeof(id_WSARecvMsg),
+                        &bio_WSARecvMsg, sizeof(bio_WSARecvMsg),
+                        &len_out, NULL, NULL)
+                        != 0
                     || len_out != sizeof(bio_WSARecvMsg))
                     bio_WSARecvMsg = NULL;
 
                 if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER,
-                             &id_WSASendMsg, sizeof(id_WSASendMsg),
-                             &bio_WSASendMsg, sizeof(bio_WSASendMsg),
-                             &len_out, NULL, NULL) != 0
+                        &id_WSASendMsg, sizeof(id_WSASendMsg),
+                        &bio_WSASendMsg, sizeof(bio_WSASendMsg),
+                        &len_out, NULL, NULL)
+                        != 0
                     || len_out != sizeof(bio_WSASendMsg))
                     bio_WSASendMsg = NULL;
 
                 closesocket(s);
             }
         }
-#  endif
+#endif
     }
-# endif                         /* OPENSSL_SYS_WINDOWS */
-# ifdef WATT32
+#endif /* OPENSSL_SYS_WINDOWS */
+#ifdef WATT32
     extern int _watt_do_exit;
-    _watt_do_exit = 0;          /* don't make sock_init() call exit() */
+    _watt_do_exit = 0; /* don't make sock_init() call exit() */
     if (sock_init())
         return -1;
-# endif
+#endif
 
     return 1;
 }
 
 void bio_sock_cleanup_int(void)
 {
-# ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
     if (wsa_init_done) {
         wsa_init_done = 0;
         WSACleanup();
     }
-# endif
+#endif
 }
 
 int BIO_socket_ioctl(int fd, long type, void *arg)
 {
     int i;
 
-#  ifdef __DJGPP__
+#ifdef __DJGPP__
     i = ioctlsocket(fd, type, (char *)arg);
-#  else
-#   if defined(OPENSSL_SYS_VMS)
+#else
+#if defined(OPENSSL_SYS_VMS)
     /*-
      * 2011-02-18 SMS.
      * VMS ioctl() can't tolerate a 64-bit "void *arg", but we
@@ -224,31 +226,31 @@ int BIO_socket_ioctl(int fd, long type, void *arg)
      * so we arrange a local copy with a short pointer, and use
      * that, instead.
      */
-#    if __INITIAL_POINTER_SIZE == 64
-#     define ARG arg_32p
-#     pragma pointer_size save
-#     pragma pointer_size 32
+#if __INITIAL_POINTER_SIZE == 64
+#define ARG arg_32p
+#pragma pointer_size save
+#pragma pointer_size 32
     unsigned long arg_32;
     unsigned long *arg_32p;
-#     pragma pointer_size restore
+#pragma pointer_size restore
     arg_32p = &arg_32;
     arg_32 = *((unsigned long *)arg);
-#    else                       /* __INITIAL_POINTER_SIZE == 64 */
-#     define ARG arg
-#    endif                      /* __INITIAL_POINTER_SIZE == 64 [else] */
-#   else                        /* defined(OPENSSL_SYS_VMS) */
-#    define ARG arg
-#   endif                       /* defined(OPENSSL_SYS_VMS) [else] */
+#else /* __INITIAL_POINTER_SIZE == 64 */
+#define ARG arg
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+#else /* defined(OPENSSL_SYS_VMS) */
+#define ARG arg
+#endif /* defined(OPENSSL_SYS_VMS) [else] */
 
     i = ioctlsocket(fd, type, ARG);
-#  endif                        /* __DJGPP__ */
+#endif /* __DJGPP__ */
     if (i < 0)
         ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                       "calling ioctlsocket()");
+            "calling ioctlsocket()");
     return i;
 }
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 int BIO_get_accept_socket(char *host, int bind_mode)
 {
     int s = INVALID_SOCKET;
@@ -261,22 +263,23 @@ int BIO_get_accept_socket(char *host, int bind_mode)
     if (BIO_sock_init() != 1)
         goto err;
 
-    if (BIO_lookup(h, p, BIO_LOOKUP_SERVER, AF_UNSPEC, SOCK_STREAM, &res) != 0)
+    if (BIO_lookup(h, p, BIO_LOOKUP_SERVER, AF_UNSPEC, SOCK_STREAM, &res) == 0)
         goto err;
 
     if ((s = BIO_socket(BIO_ADDRINFO_family(res), BIO_ADDRINFO_socktype(res),
-                        BIO_ADDRINFO_protocol(res), 0)) == INVALID_SOCKET) {
+             BIO_ADDRINFO_protocol(res), 0))
+        == INVALID_SOCKET) {
         s = INVALID_SOCKET;
         goto err;
     }
 
     if (!BIO_listen(s, BIO_ADDRINFO_address(res),
-                    bind_mode ? BIO_SOCK_REUSEADDR : 0)) {
+            bind_mode ? BIO_SOCK_REUSEADDR : 0)) {
         BIO_closesocket(s);
         s = INVALID_SOCKET;
     }
 
- err:
+err:
     BIO_ADDRINFO_free(res);
     OPENSSL_free(h);
     OPENSSL_free(p);
@@ -296,7 +299,7 @@ int BIO_accept(int sock, char **ip_port)
             goto end;
         }
         ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                       "calling accept()");
+            "calling accept()");
         ERR_raise(ERR_LIB_BIO, BIO_R_ACCEPT_ERROR);
         goto end;
     }
@@ -323,27 +326,27 @@ int BIO_accept(int sock, char **ip_port)
         OPENSSL_free(port);
     }
 
- end:
+end:
     return ret;
 }
-# endif
+#endif
 
 int BIO_set_tcp_ndelay(int s, int on)
 {
     int ret = 0;
-# if defined(TCP_NODELAY) && (defined(IPPROTO_TCP) || defined(SOL_TCP))
+#if defined(TCP_NODELAY) && (defined(IPPROTO_TCP) || defined(SOL_TCP))
     int opt;
 
-#  ifdef SOL_TCP
+#ifdef SOL_TCP
     opt = SOL_TCP;
-#  else
-#   ifdef IPPROTO_TCP
+#else
+#ifdef IPPROTO_TCP
     opt = IPPROTO_TCP;
-#   endif
-#  endif
+#endif
+#endif
 
     ret = setsockopt(s, opt, TCP_NODELAY, (char *)&on, sizeof(on));
-# endif
+#endif
     return (ret == 0);
 }
 
@@ -353,69 +356,67 @@ int BIO_socket_nbio(int s, int mode)
     int l;
 
     l = mode;
-# ifdef FIONBIO
+#ifdef FIONBIO
     l = mode;
 
     ret = BIO_socket_ioctl(s, FIONBIO, &l);
-# elif defined(F_GETFL) && defined(F_SETFL) && (defined(O_NONBLOCK) || defined(FNDELAY))
+#elif defined(F_GETFL) && defined(F_SETFL) && (defined(O_NONBLOCK) || defined(FNDELAY))
     /* make sure this call always pushes an error level; BIO_socket_ioctl() does so, so we do too. */
 
     l = fcntl(s, F_GETFL, 0);
     if (l == -1) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling fcntl()");
+            "calling fcntl()");
         ret = -1;
     } else {
-#  if defined(O_NONBLOCK)
+#if defined(O_NONBLOCK)
         l &= ~O_NONBLOCK;
-#  else
+#else
         l &= ~FNDELAY; /* BSD4.x */
-#  endif
+#endif
         if (mode) {
-#  if defined(O_NONBLOCK)
+#if defined(O_NONBLOCK)
             l |= O_NONBLOCK;
-#  else
+#else
             l |= FNDELAY; /* BSD4.x */
-#  endif
+#endif
         }
         ret = fcntl(s, F_SETFL, l);
 
         if (ret < 0) {
             ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                           "calling fcntl()");
+                "calling fcntl()");
         }
     }
-# else
+#else
     /* make sure this call always pushes an error level; BIO_socket_ioctl() does so, so we do too. */
     ERR_raise(ERR_LIB_BIO, ERR_R_PASSED_INVALID_ARGUMENT);
-# endif
+#endif
 
     return (ret == 0);
 }
 
 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)
 {
     switch (type) {
-    case BIO_SOCK_INFO_ADDRESS:
-        {
-            socklen_t addr_len;
-            int ret = 0;
-            addr_len = sizeof(*info->addr);
-            ret = getsockname(sock, BIO_ADDR_sockaddr_noconst(info->addr),
-                              &addr_len);
-            if (ret == -1) {
-                ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling getsockname()");
-                ERR_raise(ERR_LIB_BIO, BIO_R_GETSOCKNAME_ERROR);
-                return 0;
-            }
-            if ((size_t)addr_len > sizeof(*info->addr)) {
-                ERR_raise(ERR_LIB_BIO, BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS);
-                return 0;
-            }
+    case BIO_SOCK_INFO_ADDRESS: {
+        socklen_t addr_len;
+        int ret = 0;
+        addr_len = sizeof(*info->addr);
+        ret = getsockname(sock, BIO_ADDR_sockaddr_noconst(info->addr),
+            &addr_len);
+        if (ret == -1) {
+            ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+                "calling getsockname()");
+            ERR_raise(ERR_LIB_BIO, BIO_R_GETSOCKNAME_ERROR);
+            return 0;
+        }
+        if ((size_t)addr_len > sizeof(*info->addr)) {
+            ERR_raise(ERR_LIB_BIO, BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS);
+            return 0;
         }
-        break;
+    } break;
     default:
         ERR_raise(ERR_LIB_BIO, BIO_R_UNKNOWN_INFO_TYPE);
         return 0;
@@ -430,16 +431,16 @@ int BIO_sock_info(int sock,
  */
 int BIO_socket_wait(int fd, int for_read, time_t max_time)
 {
-# if defined(OPENSSL_SYS_WINDOWS) || !defined(POLLIN)
+#if defined(OPENSSL_SYS_WINDOWS) || !defined(POLLIN)
     fd_set confds;
     struct timeval tv;
     time_t now;
 
-#  ifdef _WIN32
+#ifdef _WIN32
     if ((SOCKET)fd == INVALID_SOCKET)
-#  else
+#else
     if (fd < 0 || fd >= FD_SETSIZE)
-#  endif
+#endif
         return -1;
     if (max_time == 0)
         return 1;
@@ -453,8 +454,8 @@ int BIO_socket_wait(int fd, int for_read, time_t max_time)
     tv.tv_usec = 0;
     tv.tv_sec = (long)(max_time - now); /* might overflow */
     return select(fd + 1, for_read ? &confds : NULL,
-                  for_read ? NULL : &confds, NULL, &tv);
-# else
+        for_read ? NULL : &confds, NULL, &tv);
+#else
     struct pollfd confds;
     time_t now;
 
@@ -470,6 +471,6 @@ int BIO_socket_wait(int fd, int for_read, time_t max_time)
     confds.fd = fd;
     confds.events = for_read ? POLLIN : POLLOUT;
     return poll(&confds, 1, (int)(max_time - now) * 1000);
-# endif
+#endif
 }
 #endif /* !defined(OPENSSL_NO_SOCK) */
diff --git a/crypto/bio/bio_sock2.c b/crypto/bio/bio_sock2.c
index 252a9ab0745d7..a9face301a324 100644
--- a/crypto/bio/bio_sock2.c
+++ b/crypto/bio/bio_sock2.c
@@ -18,13 +18,13 @@
 #include <openssl/err.h>
 
 #ifndef OPENSSL_NO_SOCK
-# ifdef SO_MAXCONN
-#  define MAX_LISTEN  SO_MAXCONN
-# elif defined(SOMAXCONN)
-#  define MAX_LISTEN  SOMAXCONN
-# else
-#  define MAX_LISTEN  32
-# endif
+#ifdef SO_MAXCONN
+#define MAX_LISTEN SO_MAXCONN
+#elif defined(SOMAXCONN)
+#define MAX_LISTEN SOMAXCONN
+#else
+#define MAX_LISTEN 32
+#endif
 
 /*-
  * BIO_socket - create a socket
@@ -49,7 +49,7 @@ int BIO_socket(int domain, int socktype, int protocol, int options)
     sock = socket(domain, socktype, protocol);
     if (sock == -1) {
         ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                       "calling socket()");
+            "calling socket()");
         ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_CREATE_SOCKET);
         return INVALID_SOCKET;
     }
@@ -92,9 +92,10 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options)
 
     if (options & BIO_SOCK_KEEPALIVE) {
         if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
-                       (const void *)&on, sizeof(on)) != 0) {
+                (const void *)&on, sizeof(on))
+            != 0) {
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling setsockopt()");
+                "calling setsockopt()");
             ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_KEEPALIVE);
             return 0;
         }
@@ -102,16 +103,17 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options)
 
     if (options & BIO_SOCK_NODELAY) {
         if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
-                       (const void *)&on, sizeof(on)) != 0) {
+                (const void *)&on, sizeof(on))
+            != 0) {
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling setsockopt()");
+                "calling setsockopt()");
             ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_NODELAY);
             return 0;
         }
     }
     if (options & BIO_SOCK_TFO) {
-# if defined(OSSL_TFO_CLIENT_FLAG)
-#  if defined(OSSL_TFO_SYSCTL_CLIENT)
+#if defined(OSSL_TFO_CLIENT_FLAG)
+#if defined(OSSL_TFO_SYSCTL_CLIENT)
         int enabled = 0;
         size_t enabledlen = sizeof(enabled);
 
@@ -125,7 +127,7 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options)
             ERR_raise(ERR_LIB_BIO, BIO_R_TFO_DISABLED);
             return 0;
         }
-#  elif defined(OSSL_TFO_SYSCTL)
+#elif defined(OSSL_TFO_SYSCTL)
         int enabled = 0;
         size_t enabledlen = sizeof(enabled);
 
@@ -139,57 +141,51 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options)
             ERR_raise(ERR_LIB_BIO, BIO_R_TFO_DISABLED);
             return 0;
         }
-#  endif
-# endif
-# if defined(OSSL_TFO_CONNECTX)
+#endif
+#endif
+#if defined(OSSL_TFO_CONNECTX)
         sa_endpoints_t sae;
 
         memset(&sae, 0, sizeof(sae));
         sae.sae_dstaddr = BIO_ADDR_sockaddr(addr);
         sae.sae_dstaddrlen = BIO_ADDR_sockaddr_size(addr);
         if (connectx(sock, &sae, SAE_ASSOCID_ANY,
-                     CONNECT_DATA_IDEMPOTENT | CONNECT_RESUME_ON_READ_WRITE,
-                     NULL, 0, NULL, NULL) == -1) {
+                CONNECT_DATA_IDEMPOTENT | CONNECT_RESUME_ON_READ_WRITE,
+                NULL, 0, NULL, NULL)
+            == -1) {
             if (!BIO_sock_should_retry(-1)) {
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling connectx()");
+                    "calling connectx()");
                 ERR_raise(ERR_LIB_BIO, BIO_R_CONNECT_ERROR);
             }
             return 0;
         }
-# endif
-# if defined(OSSL_TFO_CLIENT_SOCKOPT)
+#endif
+#if defined(OSSL_TFO_CLIENT_SOCKOPT)
         if (setsockopt(sock, IPPROTO_TCP, OSSL_TFO_CLIENT_SOCKOPT,
-                       (const void *)&on, sizeof(on)) != 0) {
+                (const void *)&on, sizeof(on))
+            != 0) {
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling setsockopt()");
+                "calling setsockopt()");
             ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_TFO);
             return 0;
         }
-# endif
-# if defined(OSSL_TFO_DO_NOT_CONNECT)
+#endif
+#if defined(OSSL_TFO_DO_NOT_CONNECT)
         return 1;
-# endif
+#endif
     }
 
     if (connect(sock, BIO_ADDR_sockaddr(addr),
-                BIO_ADDR_sockaddr_size(addr)) == -1) {
+            BIO_ADDR_sockaddr_size(addr))
+        == -1) {
         if (!BIO_sock_should_retry(-1)) {
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling connect()");
+                "calling connect()");
             ERR_raise(ERR_LIB_BIO, BIO_R_CONNECT_ERROR);
         }
         return 0;
     }
-# ifndef OPENSSL_NO_KTLS
-    /*
-     * The new socket is created successfully regardless of ktls_enable.
-     * ktls_enable doesn't change any functionality of the socket, except
-     * changing the setsockopt to enable the processing of ktls_start.
-     * Thus, it is not a problem to call it for non-TLS sockets.
-     */
-    ktls_enable(sock);
-# endif
     return 1;
 }
 
@@ -211,34 +207,35 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options)
  */
 int BIO_bind(int sock, const BIO_ADDR *addr, int options)
 {
-# ifndef OPENSSL_SYS_WINDOWS
+#ifndef OPENSSL_SYS_WINDOWS
     int on = 1;
-# endif
+#endif
 
     if (sock == -1) {
         ERR_raise(ERR_LIB_BIO, BIO_R_INVALID_SOCKET);
         return 0;
     }
 
-# ifndef OPENSSL_SYS_WINDOWS
+#ifndef OPENSSL_SYS_WINDOWS
     /*
      * SO_REUSEADDR has different behavior on Windows than on
      * other operating systems, don't set it there.
      */
     if (options & BIO_SOCK_REUSEADDR) {
         if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
-                       (const void *)&on, sizeof(on)) != 0) {
+                (const void *)&on, sizeof(on))
+            != 0) {
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling setsockopt()");
+                "calling setsockopt()");
             ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_REUSEADDR);
             return 0;
         }
     }
-# endif
+#endif
 
     if (bind(sock, BIO_ADDR_sockaddr(addr), BIO_ADDR_sockaddr_size(addr)) != 0) {
         ERR_raise_data(ERR_LIB_SYS, get_last_socket_error() /* may be 0 */,
-                       "calling bind()");
+            "calling bind()");
         ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_BIND_SOCKET);
         return 0;
     }
@@ -296,10 +293,11 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
     }
 
     if (getsockopt(sock, SOL_SOCKET, SO_TYPE,
-                   (void *)&socktype, &socktype_len) != 0
+            (void *)&socktype, &socktype_len)
+            != 0
         || socktype_len != sizeof(socktype)) {
         ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                       "calling getsockopt()");
+            "calling getsockopt()");
         ERR_raise(ERR_LIB_BIO, BIO_R_GETTING_SOCKTYPE);
         return 0;
     }
@@ -309,9 +307,10 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
 
     if (options & BIO_SOCK_KEEPALIVE) {
         if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
-                       (const void *)&on, sizeof(on)) != 0) {
+                (const void *)&on, sizeof(on))
+            != 0) {
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling setsockopt()");
+                "calling setsockopt()");
             ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_KEEPALIVE);
             return 0;
         }
@@ -319,16 +318,17 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
 
     if (options & BIO_SOCK_NODELAY) {
         if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
-                       (const void *)&on, sizeof(on)) != 0) {
+                (const void *)&on, sizeof(on))
+            != 0) {
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling setsockopt()");
+                "calling setsockopt()");
             ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_NODELAY);
             return 0;
         }
     }
 
-  /* On OpenBSD it is always IPv6 only with IPv6 sockets thus read-only */
-# if defined(IPV6_V6ONLY) && !defined(__OpenBSD__)
+    /* On OpenBSD it is always IPv6 only with IPv6 sockets thus read-only */
+#if defined(IPV6_V6ONLY) && !defined(__OpenBSD__)
     if (BIO_ADDR_family(addr) == AF_INET6) {
         /*
          * Note: Windows default of IPV6_V6ONLY is ON, and Linux is OFF.
@@ -336,34 +336,35 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
          */
         on = options & BIO_SOCK_V6_ONLY ? 1 : 0;
         if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                       (const void *)&on, sizeof(on)) != 0) {
+                (const void *)&on, sizeof(on))
+            != 0) {
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling setsockopt()");
+                "calling setsockopt()");
             ERR_raise(ERR_LIB_BIO, BIO_R_LISTEN_V6_ONLY);
             return 0;
         }
     }
-# endif
+#endif
 
     if (!BIO_bind(sock, addr, options))
         return 0;
 
     if (socktype != SOCK_DGRAM && listen(sock, MAX_LISTEN) == -1) {
         ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                       "calling listen()");
+            "calling listen()");
         ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_LISTEN_SOCKET);
         return 0;
     }
 
-# if defined(OSSL_TFO_SERVER_SOCKOPT)
+#if defined(OSSL_TFO_SERVER_SOCKOPT)
     /*
      * Must do it explicitly after listen() for macOS, still
      * works fine on other OS's
      */
     if ((options & BIO_SOCK_TFO) && socktype != SOCK_DGRAM) {
         int q = OSSL_TFO_SERVER_SOCKOPT_VALUE;
-#  if defined(OSSL_TFO_CLIENT_FLAG)
-#   if defined(OSSL_TFO_SYSCTL_SERVER)
+#if defined(OSSL_TFO_CLIENT_FLAG)
+#if defined(OSSL_TFO_SYSCTL_SERVER)
         int enabled = 0;
         size_t enabledlen = sizeof(enabled);
 
@@ -377,7 +378,7 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
             ERR_raise(ERR_LIB_BIO, BIO_R_TFO_DISABLED);
             return 0;
         }
-#   elif defined(OSSL_TFO_SYSCTL)
+#elif defined(OSSL_TFO_SYSCTL)
         int enabled = 0;
         size_t enabledlen = sizeof(enabled);
 
@@ -391,17 +392,18 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
             ERR_raise(ERR_LIB_BIO, BIO_R_TFO_DISABLED);
             return 0;
         }
-#   endif
-#  endif
+#endif
+#endif
         if (setsockopt(sock, IPPROTO_TCP, OSSL_TFO_SERVER_SOCKOPT,
-                       (void *)&q, sizeof(q)) < 0) {
+                (void *)&q, sizeof(q))
+            < 0) {
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling setsockopt()");
+                "calling setsockopt()");
             ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_TFO);
             return 0;
         }
     }
-# endif
+#endif
 
     return 1;
 }
@@ -422,11 +424,11 @@ int BIO_accept_ex(int accept_sock, BIO_ADDR *addr_, int options)
 
     len = sizeof(*addr);
     accepted_sock = accept(accept_sock,
-                           BIO_ADDR_sockaddr_noconst(addr), &len);
+        BIO_ADDR_sockaddr_noconst(addr), &len);
     if (accepted_sock == -1) {
         if (!BIO_sock_should_retry(accepted_sock)) {
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling accept()");
+                "calling accept()");
             ERR_raise(ERR_LIB_BIO, BIO_R_ACCEPT_ERROR);
         }
         return INVALID_SOCKET;
diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index 4ccdca18ec5c2..14bc36d2d8756 100644
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -18,7 +18,7 @@
 typedef struct bio_accept_st {
     int state;
     int accept_family;
-    int bind_mode;     /* Socket mode for BIO_listen */
+    int bind_mode; /* Socket mode for BIO_listen */
     int accepted_mode; /* Socket mode for BIO_accept (set on accepted sock) */
     char *param_addr;
     char *param_serv;
@@ -27,7 +27,7 @@ typedef struct bio_accept_st {
 
     BIO_ADDRINFO *addr_first;
     const BIO_ADDRINFO *addr_iter;
-    BIO_ADDR cache_accepting_addr;   /* Useful if we asked for port 0 */
+    BIO_ADDR cache_accepting_addr; /* Useful if we asked for port 0 */
     char *cache_accepting_name, *cache_accepting_serv;
     BIO_ADDR cache_peer_addr;
     char *cache_peer_name, *cache_peer_serv;
@@ -46,12 +46,12 @@ static void acpt_close_socket(BIO *data);
 static BIO_ACCEPT *BIO_ACCEPT_new(void);
 static void BIO_ACCEPT_free(BIO_ACCEPT *a);
 
-# define ACPT_S_BEFORE                   1
-# define ACPT_S_GET_ADDR                 2
-# define ACPT_S_CREATE_SOCKET            3
-# define ACPT_S_LISTEN                   4
-# define ACPT_S_ACCEPT                   5
-# define ACPT_S_OK                       6
+#define ACPT_S_BEFORE 1
+#define ACPT_S_GET_ADDR 2
+#define ACPT_S_CREATE_SOCKET 3
+#define ACPT_S_LISTEN 4
+#define ACPT_S_ACCEPT 5
+#define ACPT_S_OK 6
 
 static const BIO_METHOD methods_acceptp = {
     BIO_TYPE_ACCEPT,
@@ -61,11 +61,11 @@ static const BIO_METHOD methods_acceptp = {
     bread_conv,
     acpt_read,
     acpt_puts,
-    NULL,                       /* connect_gets,         */
+    NULL, /* connect_gets,         */
     acpt_ctrl,
     acpt_new,
     acpt_free,
-    NULL,                       /* connect_callback_ctrl */
+    NULL, /* connect_callback_ctrl */
 };
 
 const BIO_METHOD *BIO_s_accept(void)
@@ -155,9 +155,9 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
         case ACPT_S_BEFORE:
             if (c->param_addr == NULL && c->param_serv == NULL) {
                 ERR_raise_data(ERR_LIB_BIO,
-                               BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED,
-                               "hostname=%s, service=%s",
-                               c->param_addr, c->param_serv);
+                    BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED,
+                    "hostname=%s, service=%s",
+                    c->param_addr, c->param_serv);
                 goto exit_loop;
             }
 
@@ -177,37 +177,37 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
             c->state = ACPT_S_GET_ADDR;
             break;
 
-        case ACPT_S_GET_ADDR:
-            {
-                int family = AF_UNSPEC;
-                switch (c->accept_family) {
-                case BIO_FAMILY_IPV6:
-                    if (1) { /* This is a trick we use to avoid bit rot.
-                              * at least the "else" part will always be
-                              * compiled.
-                              */
+        case ACPT_S_GET_ADDR: {
+            int family = AF_UNSPEC;
+            switch (c->accept_family) {
+            case BIO_FAMILY_IPV6:
+                if (1) { /* This is a trick we use to avoid bit rot.
+                          * at least the "else" part will always be
+                          * compiled.
+                          */
 #if OPENSSL_USE_IPV6
-                        family = AF_INET6;
-                    } else {
+                    family = AF_INET6;
+                } else {
 #endif
-                        ERR_raise(ERR_LIB_BIO, BIO_R_UNAVAILABLE_IP_FAMILY);
-                        goto exit_loop;
-                    }
-                    break;
-                case BIO_FAMILY_IPV4:
-                    family = AF_INET;
-                    break;
-                case BIO_FAMILY_IPANY:
-                    family = AF_UNSPEC;
-                    break;
-                default:
-                    ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_IP_FAMILY);
+                    ERR_raise(ERR_LIB_BIO, BIO_R_UNAVAILABLE_IP_FAMILY);
                     goto exit_loop;
                 }
-                if (BIO_lookup(c->param_addr, c->param_serv, BIO_LOOKUP_SERVER,
-                               family, SOCK_STREAM, &c->addr_first) == 0)
-                    goto exit_loop;
+                break;
+            case BIO_FAMILY_IPV4:
+                family = AF_INET;
+                break;
+            case BIO_FAMILY_IPANY:
+                family = AF_UNSPEC;
+                break;
+            default:
+                ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_IP_FAMILY);
+                goto exit_loop;
             }
+            if (BIO_lookup(c->param_addr, c->param_serv, BIO_LOOKUP_SERVER,
+                    family, SOCK_STREAM, &c->addr_first)
+                == 0)
+                goto exit_loop;
+        }
             if (c->addr_first == NULL) {
                 ERR_raise(ERR_LIB_BIO, BIO_R_LOOKUP_RETURNED_NOTHING);
                 goto exit_loop;
@@ -219,8 +219,8 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
         case ACPT_S_CREATE_SOCKET:
             ERR_set_mark();
             s = BIO_socket(BIO_ADDRINFO_family(c->addr_iter),
-                           BIO_ADDRINFO_socktype(c->addr_iter),
-                           BIO_ADDRINFO_protocol(c->addr_iter), 0);
+                BIO_ADDRINFO_socktype(c->addr_iter),
+                BIO_ADDRINFO_protocol(c->addr_iter), 0);
             if (s == (int)INVALID_SOCKET) {
                 if ((c->addr_iter = BIO_ADDRINFO_next(c->addr_iter)) != NULL) {
                     /*
@@ -231,8 +231,8 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
                 }
                 ERR_clear_last_mark();
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling socket(%s, %s)",
-                                c->param_addr, c->param_serv);
+                    "calling socket(%s, %s)",
+                    c->param_addr, c->param_serv);
                 ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_CREATE_SOCKET);
                 goto exit_loop;
             }
@@ -242,31 +242,35 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
             s = -1;
             break;
 
-        case ACPT_S_LISTEN:
-            {
-                if (!BIO_listen(c->accept_sock,
-                                BIO_ADDRINFO_address(c->addr_iter),
-                                c->bind_mode)) {
-                    BIO_closesocket(c->accept_sock);
-                    goto exit_loop;
-                }
+        case ACPT_S_LISTEN: {
+            if (!BIO_listen(c->accept_sock,
+                    BIO_ADDRINFO_address(c->addr_iter),
+                    c->bind_mode)) {
+                BIO_closesocket(c->accept_sock);
+                c->accept_sock = (int)INVALID_SOCKET;
+                b->num = (int)INVALID_SOCKET;
+                goto exit_loop;
             }
+        }
 
             {
                 union BIO_sock_info_u info;
 
                 info.addr = &c->cache_accepting_addr;
                 if (!BIO_sock_info(c->accept_sock, BIO_SOCK_INFO_ADDRESS,
-                                   &info)) {
+                        &info)) {
                     BIO_closesocket(c->accept_sock);
+                    c->accept_sock = (int)INVALID_SOCKET;
+                    b->num = (int)INVALID_SOCKET;
                     goto exit_loop;
                 }
             }
 
-            c->cache_accepting_name =
-                BIO_ADDR_hostname_string(&c->cache_accepting_addr, 1);
-            c->cache_accepting_serv =
-                BIO_ADDR_service_string(&c->cache_accepting_addr, 1);
+            /* Free old values before assigning new ones to prevent memory leak */
+            OPENSSL_free(c->cache_accepting_name);
+            OPENSSL_free(c->cache_accepting_serv);
+            c->cache_accepting_name = BIO_ADDR_hostname_string(&c->cache_accepting_addr, 1);
+            c->cache_accepting_serv = BIO_ADDR_service_string(&c->cache_accepting_addr, 1);
             c->state = ACPT_S_ACCEPT;
             s = -1;
             ret = 1;
@@ -286,7 +290,7 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
             c->cache_peer_serv = NULL;
 
             s = BIO_accept_ex(c->accept_sock, &c->cache_peer_addr,
-                              c->accepted_mode);
+                c->accepted_mode);
 
             /* If the returned socket is invalid, this might still be
              * retryable
@@ -328,10 +332,8 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
             if (BIO_push(b, bio) == NULL)
                 goto exit_loop;
 
-            c->cache_peer_name =
-                BIO_ADDR_hostname_string(&c->cache_peer_addr, 1);
-            c->cache_peer_serv =
-                BIO_ADDR_service_string(&c->cache_peer_addr, 1);
+            c->cache_peer_name = BIO_ADDR_hostname_string(&c->cache_peer_addr, 1);
+            c->cache_peer_serv = BIO_ADDR_service_string(&c->cache_peer_addr, 1);
             c->state = ACPT_S_OK;
             bio = NULL;
             ret = 1;
@@ -351,12 +353,12 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
         }
     }
 
-  exit_loop:
+exit_loop:
     if (bio != NULL)
         BIO_free(bio);
     else if (s >= 0)
         BIO_closesocket(s);
-  end:
+end:
     return ret;
 }
 
@@ -414,6 +416,7 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
         acpt_close_socket(b);
         BIO_ADDRINFO_free(data->addr_first);
         data->addr_first = NULL;
+        data->addr_iter = NULL;
         b->flags = 0;
         break;
     case BIO_C_DO_STATE_MACHINE:
@@ -431,12 +434,13 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
                 OPENSSL_free(data->param_addr);
                 data->param_addr = NULL;
                 ret = BIO_parse_hostserv(ptr,
-                                         &data->param_addr,
-                                         &data->param_serv,
-                                         BIO_PARSE_PRIO_SERV);
+                    &data->param_addr,
+                    &data->param_serv,
+                    BIO_PARSE_PRIO_SERV);
                 if (hold_serv != data->param_serv)
                     OPENSSL_free(hold_serv);
-                b->init = 1;
+                if (ret > 0)
+                    b->init = 1;
             } else if (num == 1) {
                 OPENSSL_free(data->param_serv);
                 if ((data->param_serv = OPENSSL_strdup(ptr)) == NULL)
diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 3af3b27ea5ab4..54de5d3f67cc5 100644
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -43,11 +43,11 @@ static const BIO_METHOD methods_biop = {
     bread_conv,
     bio_read,
     bio_puts,
-    NULL /* no bio_gets */ ,
+    NULL /* no bio_gets */,
     bio_ctrl,
     bio_new,
     bio_free,
-    NULL                        /* no bio_callback_ctrl */
+    NULL /* no bio_callback_ctrl */
 };
 
 const BIO_METHOD *BIO_s_bio(void)
@@ -56,21 +56,21 @@ const BIO_METHOD *BIO_s_bio(void)
 }
 
 struct bio_bio_st {
-    BIO *peer;                  /* NULL if buf == NULL. If peer != NULL, then
-                                 * peer->ptr is also a bio_bio_st, and its
-                                 * "peer" member points back to us. peer !=
-                                 * NULL iff init != 0 in the BIO. */
+    BIO *peer; /* NULL if buf == NULL. If peer != NULL, then
+                * peer->ptr is also a bio_bio_st, and its
+                * "peer" member points back to us. peer !=
+                * NULL iff init != 0 in the BIO. */
     /* This is for what we write (i.e. reading uses peer's struct): */
-    int closed;                 /* valid iff peer != NULL */
-    size_t len;                 /* valid iff buf != NULL; 0 if peer == NULL */
-    size_t offset;              /* valid iff buf != NULL; 0 if len == 0 */
+    int closed; /* valid iff peer != NULL */
+    size_t len; /* valid iff buf != NULL; 0 if peer == NULL */
+    size_t offset; /* valid iff buf != NULL; 0 if len == 0 */
     size_t size;
-    char *buf;                  /* "size" elements (if != NULL) */
-    size_t request;             /* valid iff peer != NULL; 0 if len != 0,
-                                 * otherwise set by peer to number of bytes
-                                 * it (unsuccessfully) tried to read, never
-                                 * more than buffer space (size-len)
-                                 * warrants. */
+    char *buf; /* "size" elements (if != NULL) */
+    size_t request; /* valid iff peer != NULL; 0 if len != 0,
+                     * otherwise set by peer to number of bytes
+                     * it (unsuccessfully) tried to read, never
+                     * more than buffer space (size-len)
+                     * warrants. */
 };
 
 static int bio_new(BIO *bio)
@@ -124,14 +124,14 @@ static int bio_read(BIO *bio, char *buf, int size_)
     assert(peer_b != NULL);
     assert(peer_b->buf != NULL);
 
-    peer_b->request = 0;        /* will be set in "retry_read" situation */
+    peer_b->request = 0; /* will be set in "retry_read" situation */
 
     if (buf == NULL || size == 0)
         return 0;
 
     if (peer_b->len == 0) {
         if (peer_b->closed)
-            return 0;           /* writer has closed, and no data is left */
+            return 0; /* writer has closed, and no data is left */
         else {
             BIO_set_retry_read(bio); /* buffer is empty */
             if (size <= peer_b->size)
@@ -154,7 +154,7 @@ static int bio_read(BIO *bio, char *buf, int size_)
     rest = size;
 
     assert(rest > 0);
-    do {                        /* one or two iterations */
+    do { /* one or two iterations */
         size_t chunk;
 
         assert(rest <= peer_b->len);
@@ -180,8 +180,7 @@ static int bio_read(BIO *bio, char *buf, int size_)
             peer_b->offset = 0;
         }
         rest -= chunk;
-    }
-    while (rest);
+    } while (rest);
 
     return size;
 }
@@ -242,7 +241,7 @@ static ossl_ssize_t bio_nread(BIO *bio, char **buf, size_t num_)
     if (num_ > OSSL_SSIZE_MAX)
         num = OSSL_SSIZE_MAX;
     else
-        num = (ossl_ssize_t) num_;
+        num = (ossl_ssize_t)num_;
 
     available = bio_nread0(bio, buf);
     if (num > available)
@@ -304,7 +303,7 @@ static int bio_write(BIO *bio, const char *buf, int num_)
     rest = num;
 
     assert(rest > 0);
-    do {                        /* one or two iterations */
+    do { /* one or two iterations */
         size_t write_offset;
         size_t chunk;
 
@@ -329,8 +328,7 @@ static int bio_write(BIO *bio, const char *buf, int num_)
 
         rest -= chunk;
         buf += chunk;
-    }
-    while (rest);
+    } while (rest);
 
     return num;
 }
@@ -398,7 +396,7 @@ static ossl_ssize_t bio_nwrite(BIO *bio, char **buf, size_t num_)
     if (num_ > OSSL_SSIZE_MAX)
         num = OSSL_SSIZE_MAX;
     else
-        num = (ossl_ssize_t) num_;
+        num = (ossl_ssize_t)num_;
 
     space = bio_nwrite0(bio, buf);
     if (num > space)
@@ -446,16 +444,14 @@ static long bio_ctrl(BIO *bio, int cmd, long num, void *ptr)
         ret = (long)b->size;
         break;
 
-    case BIO_C_MAKE_BIO_PAIR:
-        {
-            BIO *other_bio = ptr;
+    case BIO_C_MAKE_BIO_PAIR: {
+        BIO *other_bio = ptr;
 
-            if (bio_make_pair(bio, other_bio))
-                ret = 1;
-            else
-                ret = 0;
-        }
-        break;
+        if (bio_make_pair(bio, other_bio))
+            ret = 1;
+        else
+            ret = 0;
+    } break;
 
     case BIO_C_DESTROY_BIO_PAIR:
         /*
@@ -677,7 +673,7 @@ static void bio_destroy_pair(BIO *bio)
 
 /* Exported convenience functions */
 int BIO_new_bio_pair(BIO **bio1_p, size_t writebuf1,
-                     BIO **bio2_p, size_t writebuf2)
+    BIO **bio2_p, size_t writebuf2)
 {
     BIO *bio1 = NULL, *bio2 = NULL;
     long r;
@@ -706,7 +702,7 @@ int BIO_new_bio_pair(BIO **bio1_p, size_t writebuf1,
         goto err;
     ret = 1;
 
- err:
+err:
     if (ret == 0) {
         BIO_free(bio1);
         bio1 = NULL;
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 9d00f18297ffc..335704ee31810 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -23,9 +23,9 @@ typedef struct bio_connect_st {
     char *param_hostname;
     char *param_service;
     int connect_mode;
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
     unsigned char record_type;
-# endif
+#endif
     int tfo_first;
 
     BIO_ADDRINFO *addr_first;
@@ -56,22 +56,22 @@ static int conn_new(BIO *h);
 static int conn_free(BIO *data);
 static long conn_callback_ctrl(BIO *h, int cmd, BIO_info_cb *);
 static int conn_sendmmsg(BIO *h, BIO_MSG *m, size_t s, size_t n,
-                         uint64_t f, size_t *mp);
+    uint64_t f, size_t *mp);
 static int conn_recvmmsg(BIO *h, BIO_MSG *m, size_t s, size_t n,
-                         uint64_t f, size_t *mp);
+    uint64_t f, size_t *mp);
 
 static int conn_state(BIO *b, BIO_CONNECT *c);
 static void conn_close_socket(BIO *data);
 static BIO_CONNECT *BIO_CONNECT_new(void);
 static void BIO_CONNECT_free(BIO_CONNECT *a);
 
-#define BIO_CONN_S_BEFORE                1
-#define BIO_CONN_S_GET_ADDR              2
-#define BIO_CONN_S_CREATE_SOCKET         3
-#define BIO_CONN_S_CONNECT               4
-#define BIO_CONN_S_OK                    5
-#define BIO_CONN_S_BLOCKED_CONNECT       6
-#define BIO_CONN_S_CONNECT_ERROR         7
+#define BIO_CONN_S_BEFORE 1
+#define BIO_CONN_S_GET_ADDR 2
+#define BIO_CONN_S_CREATE_SOCKET 3
+#define BIO_CONN_S_CONNECT 4
+#define BIO_CONN_S_OK 5
+#define BIO_CONN_S_BLOCKED_CONNECT 6
+#define BIO_CONN_S_CONNECT_ERROR 7
 
 static const BIO_METHOD methods_connectp = {
     BIO_TYPE_CONNECT,
@@ -121,47 +121,47 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
         case BIO_CONN_S_BEFORE:
             if (c->param_hostname == NULL && c->param_service == NULL) {
                 ERR_raise_data(ERR_LIB_BIO,
-                               BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED,
-                               "hostname=%s service=%s",
-                               c->param_hostname, c->param_service);
+                    BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED,
+                    "hostname=%s service=%s",
+                    c->param_hostname, c->param_service);
                 goto exit_loop;
             }
             c->state = BIO_CONN_S_GET_ADDR;
             break;
 
-        case BIO_CONN_S_GET_ADDR:
-            {
-                int family = AF_UNSPEC;
-                switch (c->connect_family) {
-                case BIO_FAMILY_IPV6:
-                    if (1) { /* This is a trick we use to avoid bit rot.
-                              * at least the "else" part will always be
-                              * compiled.
-                              */
+        case BIO_CONN_S_GET_ADDR: {
+            int family = AF_UNSPEC;
+            switch (c->connect_family) {
+            case BIO_FAMILY_IPV6:
+                if (1) { /* This is a trick we use to avoid bit rot.
+                          * at least the "else" part will always be
+                          * compiled.
+                          */
 #if OPENSSL_USE_IPV6
-                        family = AF_INET6;
-                    } else {
+                    family = AF_INET6;
+                } else {
 #endif
-                        ERR_raise(ERR_LIB_BIO, BIO_R_UNAVAILABLE_IP_FAMILY);
-                        goto exit_loop;
-                    }
-                    break;
-                case BIO_FAMILY_IPV4:
-                    family = AF_INET;
-                    break;
-                case BIO_FAMILY_IPANY:
-                    family = AF_UNSPEC;
-                    break;
-                default:
-                    ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_IP_FAMILY);
+                    ERR_raise(ERR_LIB_BIO, BIO_R_UNAVAILABLE_IP_FAMILY);
                     goto exit_loop;
                 }
-                if (BIO_lookup(c->param_hostname, c->param_service,
-                               BIO_LOOKUP_CLIENT,
-                               family, c->connect_sock_type,
-                               &c->addr_first) == 0)
-                    goto exit_loop;
+                break;
+            case BIO_FAMILY_IPV4:
+                family = AF_INET;
+                break;
+            case BIO_FAMILY_IPANY:
+                family = AF_UNSPEC;
+                break;
+            default:
+                ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_IP_FAMILY);
+                goto exit_loop;
             }
+            if (BIO_lookup(c->param_hostname, c->param_service,
+                    BIO_LOOKUP_CLIENT,
+                    family, c->connect_sock_type,
+                    &c->addr_first)
+                == 0)
+                goto exit_loop;
+        }
             if (c->addr_first == NULL) {
                 ERR_raise(ERR_LIB_BIO, BIO_R_LOOKUP_RETURNED_NOTHING);
                 goto exit_loop;
@@ -172,12 +172,12 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
 
         case BIO_CONN_S_CREATE_SOCKET:
             ret = BIO_socket(BIO_ADDRINFO_family(c->addr_iter),
-                             BIO_ADDRINFO_socktype(c->addr_iter),
-                             BIO_ADDRINFO_protocol(c->addr_iter), 0);
+                BIO_ADDRINFO_socktype(c->addr_iter),
+                BIO_ADDRINFO_protocol(c->addr_iter), 0);
             if (ret == (int)INVALID_SOCKET) {
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling socket(%s, %s)",
-                               c->param_hostname, c->param_service);
+                    "calling socket(%s, %s)",
+                    c->param_hostname, c->param_service);
                 ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_CREATE_SOCKET);
                 goto exit_loop;
             }
@@ -202,7 +202,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
                     b->retry_reason = BIO_RR_CONNECT;
                     ERR_pop_to_mark();
                 } else if ((c->addr_iter = BIO_ADDRINFO_next(c->addr_iter))
-                           != NULL) {
+                    != NULL) {
                     /*
                      * if there are more addresses to try, do that first
                      */
@@ -213,8 +213,8 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
                 } else {
                     ERR_clear_last_mark();
                     ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                                   "calling connect(%s, %s)",
-                                    c->param_hostname, c->param_service);
+                        "calling connect(%s, %s)",
+                        c->param_hostname, c->param_service);
                     c->state = BIO_CONN_S_CONNECT_ERROR;
                     break;
                 }
@@ -243,8 +243,8 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
                     break;
                 }
                 ERR_raise_data(ERR_LIB_SYS, i,
-                               "calling connect(%s, %s)",
-                                c->param_hostname, c->param_service);
+                    "calling connect(%s, %s)",
+                    c->param_hostname, c->param_service);
                 ERR_raise(ERR_LIB_BIO, BIO_R_NBIO_CONNECT_ERROR);
                 ret = 0;
                 goto exit_loop;
@@ -252,15 +252,6 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
                 if (!conn_create_dgram_bio(b, c))
                     break;
                 c->state = BIO_CONN_S_OK;
-# ifndef OPENSSL_NO_KTLS
-                /*
-                 * The new socket is created successfully regardless of ktls_enable.
-                 * ktls_enable doesn't change any functionality of the socket, except
-                 * changing the setsockopt to enable the processing of ktls_start.
-                 * Thus, it is not a problem to call it for non-TLS sockets.
-                 */
-                ktls_enable(b->num);
-# endif
             }
             break;
 
@@ -284,10 +275,10 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
     }
 
     /* Loop does not exit */
- exit_loop:
+exit_loop:
     if (cb != NULL)
         ret = cb((BIO *)b, c->state, ret);
- end:
+end:
     return ret;
 }
 
@@ -384,11 +375,11 @@ static int conn_read(BIO *b, char *out, int outl)
 
     if (out != NULL) {
         clear_socket_error();
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
         if (BIO_get_ktls_recv(b))
             ret = ktls_read_record(b->num, out, outl);
         else
-# endif
+#endif
             ret = readsocket(b->num, out, outl);
         BIO_clear_retry_flags(b);
         if (ret <= 0) {
@@ -421,7 +412,7 @@ static int conn_write(BIO *b, const char *in, int inl)
     }
 
     clear_socket_error();
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
     if (BIO_should_ktls_ctrl_msg_flag(b)) {
         ret = ktls_send_ctrl_message(b->num, data->record_type, in, inl);
         if (ret >= 0) {
@@ -429,16 +420,16 @@ static int conn_write(BIO *b, const char *in, int inl)
             BIO_clear_ktls_ctrl_msg_flag(b);
         }
     } else
-# endif
-# if defined(OSSL_TFO_SENDTO)
-    if (data->tfo_first) {
+#endif
+#if defined(OSSL_TFO_SENDTO)
+        if (data->tfo_first) {
         int peerlen = BIO_ADDRINFO_sockaddr_size(data->addr_iter);
 
         ret = sendto(b->num, in, inl, OSSL_TFO_SENDTO,
-                     BIO_ADDRINFO_sockaddr(data->addr_iter), peerlen);
+            BIO_ADDRINFO_sockaddr(data->addr_iter), peerlen);
         data->tfo_first = 0;
     } else
-# endif
+#endif
         ret = writesocket(b->num, in, inl);
     BIO_clear_retry_flags(b);
     if (ret <= 0) {
@@ -456,9 +447,9 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
     long ret = 1;
     BIO_CONNECT *data;
     const BIO_ADDR *dg_addr;
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
     ktls_crypto_info_t *crypto_info;
-# endif
+#endif
 
     data = (BIO_CONNECT *)b->ptr;
 
@@ -469,6 +460,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
         conn_close_socket(b);
         BIO_ADDRINFO_free(data->addr_first);
         data->addr_first = NULL;
+        data->addr_iter = NULL;
         b->flags = 0;
         break;
     case BIO_C_DO_STATE_MACHINE:
@@ -489,11 +481,11 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
                 *pptr = (const char *)BIO_ADDRINFO_address(data->addr_iter);
             } else if (num == 3) {
                 switch (BIO_ADDRINFO_family(data->addr_iter)) {
-# if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
                 case AF_INET6:
                     ret = BIO_FAMILY_IPV6;
                     break;
-# endif
+#endif
                 case AF_INET:
                     ret = BIO_FAMILY_IPV4;
                     break;
@@ -526,9 +518,9 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
                 OPENSSL_free(data->param_hostname);
                 data->param_hostname = NULL;
                 ret = BIO_parse_hostserv(ptr,
-                                         &data->param_hostname,
-                                         &data->param_service,
-                                         BIO_PARSE_PRIO_HOST);
+                    &data->param_hostname,
+                    &data->param_service,
+                    BIO_PARSE_PRIO_HOST);
                 if (hold_service != data->param_service)
                     OPENSSL_free(hold_service);
             } else if (num == 1) { /* BIO_set_conn_port */
@@ -602,21 +594,19 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
 
         break;
     case BIO_CTRL_GET_RPOLL_DESCRIPTOR:
-    case BIO_CTRL_GET_WPOLL_DESCRIPTOR:
-        {
-            BIO_POLL_DESCRIPTOR *pd = ptr;
+    case BIO_CTRL_GET_WPOLL_DESCRIPTOR: {
+        BIO_POLL_DESCRIPTOR *pd = ptr;
 
-            if (data->state != BIO_CONN_S_OK)
-                conn_state(b, data); /* best effort */
+        if (data->state != BIO_CONN_S_OK)
+            conn_state(b, data); /* best effort */
 
-            if (data->state >= BIO_CONN_S_CREATE_SOCKET) {
-                pd->type        = BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
-                pd->value.fd    = b->num;
-            } else {
-                ret = 0;
-            }
+        if (data->state >= BIO_CONN_S_CREATE_SOCKET) {
+            pd->type = BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
+            pd->value.fd = b->num;
+        } else {
+            ret = 0;
         }
-        break;
+    } break;
     case BIO_C_SET_NBIO:
         if (num != 0)
             data->connect_mode |= BIO_SOCK_NONBLOCK;
@@ -666,37 +656,33 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
         break;
     case BIO_CTRL_FLUSH:
         break;
-    case BIO_CTRL_DUP:
-        {
-            dbio = (BIO *)ptr;
-            if (data->param_hostname)
-                BIO_set_conn_hostname(dbio, data->param_hostname);
-            if (data->param_service)
-                BIO_set_conn_port(dbio, data->param_service);
-            BIO_set_conn_ip_family(dbio, data->connect_family);
-            BIO_set_conn_mode(dbio, data->connect_mode);
-            /*
-             * FIXME: the cast of the function seems unlikely to be a good
-             * idea
-             */
-            (void)BIO_set_info_callback(dbio, data->info_callback);
-        }
-        break;
+    case BIO_CTRL_DUP: {
+        dbio = (BIO *)ptr;
+        if (data->param_hostname)
+            BIO_set_conn_hostname(dbio, data->param_hostname);
+        if (data->param_service)
+            BIO_set_conn_port(dbio, data->param_service);
+        BIO_set_conn_ip_family(dbio, data->connect_family);
+        BIO_set_conn_mode(dbio, data->connect_mode);
+        /*
+         * FIXME: the cast of the function seems unlikely to be a good
+         * idea
+         */
+        (void)BIO_set_info_callback(dbio, data->info_callback);
+    } break;
     case BIO_CTRL_SET_CALLBACK:
         ret = 0; /* use callback ctrl */
         break;
-    case BIO_CTRL_GET_CALLBACK:
-        {
-            BIO_info_cb **fptr;
+    case BIO_CTRL_GET_CALLBACK: {
+        BIO_info_cb **fptr;
 
-            fptr = (BIO_info_cb **)ptr;
-            *fptr = data->info_callback;
-        }
-        break;
+        fptr = (BIO_info_cb **)ptr;
+        *fptr = data->info_callback;
+    } break;
     case BIO_CTRL_EOF:
         ret = (b->flags & BIO_FLAGS_IN_EOF) != 0;
         break;
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
     case BIO_CTRL_SET_KTLS:
         crypto_info = (ktls_crypto_info_t *)ptr;
         ret = ktls_start(b->num, crypto_info, num);
@@ -721,7 +707,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
         if (ret)
             BIO_set_ktls_zerocopy_sendfile_flag(b);
         break;
-# endif
+#endif
     default:
         ret = 0;
         break;
@@ -737,11 +723,9 @@ static long conn_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
     data = (BIO_CONNECT *)b->ptr;
 
     switch (cmd) {
-    case BIO_CTRL_SET_CALLBACK:
-        {
-            data->info_callback = fp;
-        }
-        break;
+    case BIO_CTRL_SET_CALLBACK: {
+        data->info_callback = fp;
+    } break;
     default:
         ret = 0;
         break;
@@ -792,11 +776,11 @@ int conn_gets(BIO *bio, char *buf, int size)
 
     clear_socket_error();
     while (size-- > 1) {
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
         if (BIO_get_ktls_recv(bio))
             ret = ktls_read_record(bio->num, ptr, 1);
         else
-# endif
+#endif
             ret = readsocket(bio->num, ptr, 1);
         BIO_clear_retry_flags(bio);
         if (ret <= 0) {
@@ -814,7 +798,7 @@ int conn_gets(BIO *bio, char *buf, int size)
 }
 
 static int conn_sendmmsg(BIO *bio, BIO_MSG *msg, size_t stride, size_t num_msgs,
-                         uint64_t flags, size_t *msgs_processed)
+    uint64_t flags, size_t *msgs_processed)
 {
     int ret;
     BIO_CONNECT *data;
@@ -841,11 +825,11 @@ static int conn_sendmmsg(BIO *bio, BIO_MSG *msg, size_t stride, size_t num_msgs,
     }
 
     return BIO_sendmmsg(data->dgram_bio, msg, stride, num_msgs,
-                        flags, msgs_processed);
+        flags, msgs_processed);
 }
 
 static int conn_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride, size_t num_msgs,
-                         uint64_t flags, size_t *msgs_processed)
+    uint64_t flags, size_t *msgs_processed)
 {
     int ret;
     BIO_CONNECT *data;
@@ -872,7 +856,7 @@ static int conn_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride, size_t num_msgs,
     }
 
     return BIO_recvmmsg(data->dgram_bio, msg, stride, num_msgs,
-                        flags, msgs_processed);
+        flags, msgs_processed);
 }
 
 BIO *BIO_new_connect(const char *str)
diff --git a/crypto/bio/bss_core.c b/crypto/bio/bss_core.c
index b9a8eff3464ad..fb9b59caef17c 100644
--- a/crypto/bio/bss_core.c
+++ b/crypto/bio/bss_core.c
@@ -38,7 +38,7 @@ static ossl_inline BIO_CORE_GLOBALS *get_globals(OSSL_LIB_CTX *libctx)
 }
 
 static int bio_core_read_ex(BIO *bio, char *data, size_t data_len,
-                            size_t *bytes_read)
+    size_t *bytes_read)
 {
     BIO_CORE_GLOBALS *bcgbl = get_globals(bio->libctx);
 
@@ -48,7 +48,7 @@ static int bio_core_read_ex(BIO *bio, char *data, size_t data_len,
 }
 
 static int bio_core_write_ex(BIO *bio, const char *data, size_t data_len,
-                             size_t *written)
+    size_t *written)
 {
     BIO_CORE_GLOBALS *bcgbl = get_globals(bio->libctx);
 
@@ -149,7 +149,7 @@ int ossl_bio_init_core(OSSL_LIB_CTX *libctx, const OSSL_DISPATCH *fns)
     BIO_CORE_GLOBALS *bcgbl = get_globals(libctx);
 
     if (bcgbl == NULL)
-	    return 0;
+        return 0;
 
     for (; fns->function_id != 0; fns++) {
         switch (fns->function_id) {
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index ea2550859ccda..548b3b2dd6513 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-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
@@ -8,7 +8,7 @@
  */
 
 #ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#define _GNU_SOURCE
 #endif
 
 #include <stdio.h>
@@ -18,126 +18,136 @@
 #include "bio_local.h"
 #ifndef OPENSSL_NO_DGRAM
 
-# ifndef OPENSSL_NO_SCTP
-#  include <netinet/sctp.h>
-#  include <fcntl.h>
-#  define OPENSSL_SCTP_DATA_CHUNK_TYPE            0x00
-#  define OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE 0xc0
-# endif
+#ifndef OPENSSL_NO_SCTP
+#include <netinet/sctp.h>
+#include <fcntl.h>
+#define OPENSSL_SCTP_DATA_CHUNK_TYPE 0x00
+#define OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE 0xc0
+#endif
 
-# if defined(OPENSSL_SYS_LINUX) && !defined(IP_MTU)
-#  define IP_MTU      14        /* linux is lame */
-# endif
+#if defined(OPENSSL_SYS_LINUX) && !defined(IP_MTU)
+#define IP_MTU 14 /* linux is lame */
+#endif
 
-# if OPENSSL_USE_IPV6 && !defined(IPPROTO_IPV6)
-#  define IPPROTO_IPV6 41       /* windows is lame */
-# endif
+#if OPENSSL_USE_IPV6 && !defined(IPPROTO_IPV6)
+#define IPPROTO_IPV6 41 /* windows is lame */
+#endif
 
-# if defined(__FreeBSD__) && defined(IN6_IS_ADDR_V4MAPPED)
+#if defined(__FreeBSD__) && defined(IN6_IS_ADDR_V4MAPPED)
 /* Standard definition causes type-punning problems. */
-#  undef IN6_IS_ADDR_V4MAPPED
-#  define s6_addr32 __u6_addr.__u6_addr32
-#  define IN6_IS_ADDR_V4MAPPED(a)               \
-        (((a)->s6_addr32[0] == 0) &&          \
-         ((a)->s6_addr32[1] == 0) &&          \
-         ((a)->s6_addr32[2] == htonl(0x0000ffff)))
-# endif
+#undef IN6_IS_ADDR_V4MAPPED
+#define s6_addr32 __u6_addr.__u6_addr32
+#define IN6_IS_ADDR_V4MAPPED(a) \
+    (((a)->s6_addr32[0] == 0) && ((a)->s6_addr32[1] == 0) && ((a)->s6_addr32[2] == htonl(0x0000ffff)))
+#endif
 
 /* Determine what method to use for BIO_sendmmsg and BIO_recvmmsg. */
-# define M_METHOD_NONE       0
-# define M_METHOD_RECVMMSG   1
-# define M_METHOD_RECVMSG    2
-# define M_METHOD_RECVFROM   3
-# define M_METHOD_WSARECVMSG 4
-
-# if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-#  if !(__GLIBC_PREREQ(2, 14))
-#   undef NO_RECVMMSG
-    /*
-     * Some old glibc versions may have recvmmsg and MSG_WAITFORONE flag, but
-     * not sendmmsg. We need both so force this to be disabled on these old
-     * versions
-     */
-#   define NO_RECVMMSG
-#  endif
-# endif
-# if defined(__GNU__)
-   /* GNU/Hurd does not have IP_PKTINFO yet */
-   #undef NO_RECVMSG
-   #define NO_RECVMSG
-# endif
-# if (defined(__ANDROID_API__) && __ANDROID_API__ < 21) || defined(_AIX)
-#  undef NO_RECVMMSG
-#  define NO_RECVMMSG
-# endif
-# if !defined(M_METHOD)
-#  if defined(OPENSSL_SYS_WINDOWS) && defined(BIO_HAVE_WSAMSG) && !defined(NO_WSARECVMSG)
-#   define M_METHOD  M_METHOD_WSARECVMSG
-#  elif !defined(OPENSSL_SYS_WINDOWS) && defined(MSG_WAITFORONE) && !defined(NO_RECVMMSG)
-#   define M_METHOD  M_METHOD_RECVMMSG
-#  elif !defined(OPENSSL_SYS_WINDOWS) && defined(CMSG_LEN) && !defined(NO_RECVMSG)
-#   define M_METHOD  M_METHOD_RECVMSG
-#  elif !defined(NO_RECVFROM)
-#   define M_METHOD  M_METHOD_RECVFROM
-#  else
-#   define M_METHOD  M_METHOD_NONE
-#  endif
-# endif
-
-# if defined(OPENSSL_SYS_WINDOWS)
-#  define BIO_CMSG_SPACE(x) WSA_CMSG_SPACE(x)
-#  define BIO_CMSG_FIRSTHDR(x) WSA_CMSG_FIRSTHDR(x)
-#  define BIO_CMSG_NXTHDR(x, y) WSA_CMSG_NXTHDR(x, y)
-#  define BIO_CMSG_DATA(x) WSA_CMSG_DATA(x)
-#  define BIO_CMSG_LEN(x) WSA_CMSG_LEN(x)
-#  define MSGHDR_TYPE WSAMSG
-#  define CMSGHDR_TYPE WSACMSGHDR
-# else
-#  define MSGHDR_TYPE struct msghdr
-#  define CMSGHDR_TYPE struct cmsghdr
-#  define BIO_CMSG_SPACE(x) CMSG_SPACE(x)
-#  define BIO_CMSG_FIRSTHDR(x) CMSG_FIRSTHDR(x)
-#  define BIO_CMSG_NXTHDR(x, y) CMSG_NXTHDR(x, y)
-#  define BIO_CMSG_DATA(x) CMSG_DATA(x)
-#  define BIO_CMSG_LEN(x) CMSG_LEN(x)
-# endif
-
-# if   M_METHOD == M_METHOD_RECVMMSG   \
-    || M_METHOD == M_METHOD_RECVMSG    \
+#define M_METHOD_NONE 0
+#define M_METHOD_RECVMMSG 1
+#define M_METHOD_RECVMSG 2
+#define M_METHOD_RECVFROM 3
+#define M_METHOD_WSARECVMSG 4
+
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if !(__GLIBC_PREREQ(2, 14))
+#undef NO_RECVMMSG
+/*
+ * Some old glibc versions may have recvmmsg and MSG_WAITFORONE flag, but
+ * not sendmmsg. We need both so force this to be disabled on these old
+ * versions
+ */
+#define NO_RECVMMSG
+#endif
+#endif
+#if defined(__GNU__)
+/* GNU/Hurd does not have IP_PKTINFO yet */
+#undef NO_RECVMSG
+#define NO_RECVMSG
+#endif
+#if (defined(__ANDROID_API__) && __ANDROID_API__ < 21)
+#undef NO_RECVMMSG
+#define NO_RECVMMSG
+#endif
+#if defined(_AIX) && !defined(_AIX72)
+/* AIX >= 7.2 provides sendmmsg() and recvmmsg(). */
+#undef NO_RECVMMSG
+#define NO_RECVMMSG
+#endif
+#if !defined(M_METHOD)
+#if defined(OPENSSL_SYS_WINDOWS) && defined(BIO_HAVE_WSAMSG) && !defined(NO_WSARECVMSG)
+#define M_METHOD M_METHOD_WSARECVMSG
+#elif !defined(OPENSSL_SYS_WINDOWS) && defined(MSG_WAITFORONE) && !defined(NO_RECVMMSG)
+#define M_METHOD M_METHOD_RECVMMSG
+#elif !defined(OPENSSL_SYS_WINDOWS) && defined(CMSG_LEN) && !defined(NO_RECVMSG)
+#define M_METHOD M_METHOD_RECVMSG
+#elif !defined(NO_RECVFROM)
+#define M_METHOD M_METHOD_RECVFROM
+#else
+#define M_METHOD M_METHOD_NONE
+#endif
+#endif
+
+#if defined(OPENSSL_SYS_WINDOWS)
+#define BIO_CMSG_SPACE(x) WSA_CMSG_SPACE(x)
+#define BIO_CMSG_FIRSTHDR(x) WSA_CMSG_FIRSTHDR(x)
+#define BIO_CMSG_NXTHDR(x, y) WSA_CMSG_NXTHDR(x, y)
+#define BIO_CMSG_DATA(x) WSA_CMSG_DATA(x)
+#define BIO_CMSG_LEN(x) WSA_CMSG_LEN(x)
+#define MSGHDR_TYPE WSAMSG
+#define CMSGHDR_TYPE WSACMSGHDR
+#else
+#define MSGHDR_TYPE struct msghdr
+#define CMSGHDR_TYPE struct cmsghdr
+#define BIO_CMSG_SPACE(x) CMSG_SPACE(x)
+#define BIO_CMSG_FIRSTHDR(x) CMSG_FIRSTHDR(x)
+#define BIO_CMSG_NXTHDR(x, y) CMSG_NXTHDR(x, y)
+#define BIO_CMSG_DATA(x) CMSG_DATA(x)
+#define BIO_CMSG_LEN(x) CMSG_LEN(x)
+#endif
+
+#if M_METHOD == M_METHOD_RECVMMSG   \
+    || M_METHOD == M_METHOD_RECVMSG \
     || M_METHOD == M_METHOD_WSARECVMSG
-#  if defined(__APPLE__)
-    /*
-     * CMSG_SPACE is not a constant expression on OSX even though POSIX
-     * says it's supposed to be. This should be adequate.
-     */
-#   define BIO_CMSG_ALLOC_LEN   64
-#  else
-#   if defined(IPV6_PKTINFO)
-#     define BIO_CMSG_ALLOC_LEN_1   BIO_CMSG_SPACE(sizeof(struct in6_pktinfo))
-#   else
-#     define BIO_CMSG_ALLOC_LEN_1   0
-#   endif
-#   if defined(IP_PKTINFO)
-#     define BIO_CMSG_ALLOC_LEN_2   BIO_CMSG_SPACE(sizeof(struct in_pktinfo))
-#   else
-#     define BIO_CMSG_ALLOC_LEN_2   0
-#   endif
-#   if defined(IP_RECVDSTADDR)
-#     define BIO_CMSG_ALLOC_LEN_3   BIO_CMSG_SPACE(sizeof(struct in_addr))
-#   else
-#     define BIO_CMSG_ALLOC_LEN_3   0
-#   endif
-#   define BIO_MAX(X,Y) ((X) > (Y) ? (X) : (Y))
-#   define BIO_CMSG_ALLOC_LEN                                        \
-        BIO_MAX(BIO_CMSG_ALLOC_LEN_1,                                \
-                BIO_MAX(BIO_CMSG_ALLOC_LEN_2, BIO_CMSG_ALLOC_LEN_3))
-#  endif
-#  if (defined(IP_PKTINFO) || defined(IP_RECVDSTADDR)) && defined(IPV6_RECVPKTINFO)
-#   define SUPPORT_LOCAL_ADDR
-#  endif
-# endif
-
-# define BIO_MSG_N(array, stride, n) (*(BIO_MSG *)((char *)(array) + (n)*(stride)))
+#if defined(__APPLE__)
+/*
+ * CMSG_SPACE is not a constant expression on OSX even though POSIX
+ * says it's supposed to be. This should be adequate.
+ */
+#define BIO_CMSG_ALLOC_LEN 64
+#else
+#if defined(IPV6_PKTINFO)
+#define BIO_CMSG_ALLOC_LEN_1 BIO_CMSG_SPACE(sizeof(struct in6_pktinfo))
+#else
+#define BIO_CMSG_ALLOC_LEN_1 0
+#endif
+#if defined(IP_PKTINFO)
+#define BIO_CMSG_ALLOC_LEN_2 BIO_CMSG_SPACE(sizeof(struct in_pktinfo))
+#else
+#define BIO_CMSG_ALLOC_LEN_2 0
+#endif
+#if defined(IP_RECVDSTADDR)
+#define BIO_CMSG_ALLOC_LEN_3 BIO_CMSG_SPACE(sizeof(struct in_addr))
+#else
+#define BIO_CMSG_ALLOC_LEN_3 0
+#endif
+#define BIO_MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+#define BIO_CMSG_ALLOC_LEN        \
+    BIO_MAX(BIO_CMSG_ALLOC_LEN_1, \
+        BIO_MAX(BIO_CMSG_ALLOC_LEN_2, BIO_CMSG_ALLOC_LEN_3))
+#endif
+/*
+ * Although AIX defines IP_RECVDSTADDR and IPV6_RECVPKTINFO, the
+ * implementation requires IP_PKTINFO to be available for AF_INET.
+ * For AF_INET6 there seem to be limitations how local addresses
+ * are handled on AIX. So, disable the support for now.
+ */
+#if (defined(IP_PKTINFO) || defined(IP_RECVDSTADDR)) && defined(IPV6_RECVPKTINFO) \
+    && !defined(_AIX)
+#define SUPPORT_LOCAL_ADDR
+#endif
+#endif
+
+#define BIO_MSG_N(array, stride, n) (*(BIO_MSG *)((char *)(array) + (n) * (stride)))
 
 static int dgram_write(BIO *h, const char *buf, int num);
 static int dgram_read(BIO *h, char *buf, int size);
@@ -147,13 +157,13 @@ static int dgram_new(BIO *h);
 static int dgram_free(BIO *data);
 static int dgram_clear(BIO *bio);
 static int dgram_sendmmsg(BIO *b, BIO_MSG *msg,
-                          size_t stride, size_t num_msg,
-                          uint64_t flags, size_t *num_processed);
+    size_t stride, size_t num_msg,
+    uint64_t flags, size_t *num_processed);
 static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
-                          size_t stride, size_t num_msg,
-                          uint64_t flags, size_t *num_processed);
+    size_t stride, size_t num_msg,
+    uint64_t flags, size_t *num_processed);
 
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
 static int dgram_sctp_write(BIO *h, const char *buf, int num);
 static int dgram_sctp_read(BIO *h, char *buf, int size);
 static int dgram_sctp_puts(BIO *h, const char *str);
@@ -162,11 +172,10 @@ static int dgram_sctp_new(BIO *h);
 static int dgram_sctp_free(BIO *data);
 static int dgram_sctp_wait_for_dry(BIO *b);
 static int dgram_sctp_msg_waiting(BIO *b);
-#  ifdef SCTP_AUTHENTICATION_EVENT
-static void dgram_sctp_handle_auth_free_key_event(BIO *b, union sctp_notification
-                                                  *snp);
-#  endif
-# endif
+#ifdef SCTP_AUTHENTICATION_EVENT
+static void dgram_sctp_handle_auth_free_key_event(BIO *b, union sctp_notification *snp);
+#endif
+#endif
 
 static int BIO_dgram_should_retry(int s);
 
@@ -178,16 +187,16 @@ static const BIO_METHOD methods_dgramp = {
     bread_conv,
     dgram_read,
     dgram_puts,
-    NULL,                       /* dgram_gets,         */
+    NULL, /* dgram_gets,         */
     dgram_ctrl,
     dgram_new,
     dgram_free,
-    NULL,                       /* dgram_callback_ctrl */
+    NULL, /* dgram_callback_ctrl */
     dgram_sendmmsg,
     dgram_recvmmsg,
 };
 
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
 static const BIO_METHOD methods_dgramp_sctp = {
     BIO_TYPE_DGRAM_SCTP,
     "datagram sctp socket",
@@ -196,15 +205,15 @@ static const BIO_METHOD methods_dgramp_sctp = {
     bread_conv,
     dgram_sctp_read,
     dgram_sctp_puts,
-    NULL,                       /* dgram_gets,         */
+    NULL, /* dgram_gets,         */
     dgram_sctp_ctrl,
     dgram_sctp_new,
     dgram_sctp_free,
-    NULL,                       /* dgram_callback_ctrl */
-    NULL,                       /* sendmmsg */
-    NULL,                       /* recvmmsg */
+    NULL, /* dgram_callback_ctrl */
+    NULL, /* sendmmsg */
+    NULL, /* recvmmsg */
 };
-# endif
+#endif
 
 typedef struct bio_dgram_data_st {
     BIO_ADDR peer;
@@ -218,7 +227,7 @@ typedef struct bio_dgram_data_st {
     char local_addr_enabled;
 } bio_dgram_data;
 
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
 typedef struct bio_dgram_sctp_save_message_st {
     BIO *bio;
     char *data;
@@ -243,7 +252,7 @@ typedef struct bio_dgram_sctp_data_st {
     int save_shutdown;
     int peer_auth_tested;
 } bio_dgram_sctp_data;
-# endif
+#endif
 
 const BIO_METHOD *BIO_s_datagram(void)
 {
@@ -302,33 +311,34 @@ static int dgram_clear(BIO *a)
 
 static void dgram_adjust_rcv_timeout(BIO *b)
 {
-# if defined(SO_RCVTIMEO)
+#if defined(SO_RCVTIMEO)
     bio_dgram_data *data = (bio_dgram_data *)b->ptr;
     OSSL_TIME timeleft;
 
     /* Is a timer active? */
     if (!ossl_time_is_zero(data->next_timeout)) {
         /* Read current socket timeout */
-#  ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
         int timeout;
         int sz = sizeof(timeout);
 
         if (getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-                       (void *)&timeout, &sz) < 0)
+                (void *)&timeout, &sz)
+            < 0)
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling getsockopt()");
+                "calling getsockopt()");
         else
             data->socket_timeout = ossl_ms2time(timeout);
-#  else
+#else
         struct timeval tv;
         socklen_t sz = sizeof(tv);
 
         if (getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &tv, &sz) < 0)
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling getsockopt()");
+                "calling getsockopt()");
         else
             data->socket_timeout = ossl_time_from_timeval(tv);
-#  endif
+#endif
 
         /* Calculate time left until timer expires */
         timeleft = ossl_time_subtract(data->next_timeout, ossl_time_now());
@@ -341,22 +351,24 @@ static void dgram_adjust_rcv_timeout(BIO *b)
          */
         if (ossl_time_is_zero(data->socket_timeout)
             || ossl_time_compare(data->socket_timeout, timeleft) >= 0) {
-#  ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
             timeout = (int)ossl_time2ms(timeleft);
             if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-                           (void *)&timeout, sizeof(timeout)) < 0)
+                    (void *)&timeout, sizeof(timeout))
+                < 0)
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling setsockopt()");
-#  else
+                    "calling setsockopt()");
+#else
             tv = ossl_time_to_timeval(timeleft);
             if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &tv,
-                           sizeof(tv)) < 0)
+                    sizeof(tv))
+                < 0)
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling setsockopt()");
-#  endif
+                    "calling setsockopt()");
+#endif
         }
     }
-# endif
+#endif
 }
 
 static void dgram_update_local_addr(BIO *b)
@@ -372,37 +384,38 @@ static void dgram_update_local_addr(BIO *b)
         BIO_ADDR_clear(&data->local_addr);
 }
 
-# if M_METHOD == M_METHOD_RECVMMSG || M_METHOD == M_METHOD_RECVMSG || M_METHOD == M_METHOD_WSARECVMSG
+#if M_METHOD == M_METHOD_RECVMMSG || M_METHOD == M_METHOD_RECVMSG || M_METHOD == M_METHOD_WSARECVMSG
 static int dgram_get_sock_family(BIO *b)
 {
     bio_dgram_data *data = (bio_dgram_data *)b->ptr;
     return data->local_addr.sa.sa_family;
 }
-# endif
+#endif
 
 static void dgram_reset_rcv_timeout(BIO *b)
 {
-# if defined(SO_RCVTIMEO)
+#if defined(SO_RCVTIMEO)
     bio_dgram_data *data = (bio_dgram_data *)b->ptr;
 
     /* Is a timer active? */
     if (!ossl_time_is_zero(data->next_timeout)) {
-#  ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
         int timeout = (int)ossl_time2ms(data->socket_timeout);
 
         if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-                       (void *)&timeout, sizeof(timeout)) < 0)
+                (void *)&timeout, sizeof(timeout))
+            < 0)
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling setsockopt()");
-#  else
+                "calling setsockopt()");
+#else
         struct timeval tv = ossl_time_to_timeval(data->socket_timeout);
 
         if (setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0)
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling setsockopt()");
-#  endif
+                "calling setsockopt()");
+#endif
     }
-# endif
+#endif
 }
 
 static int dgram_read(BIO *b, char *out, int outl)
@@ -421,7 +434,7 @@ static int dgram_read(BIO *b, char *out, int outl)
         if (data->peekmode)
             flags = MSG_PEEK;
         ret = recvfrom(b->num, out, outl, flags,
-                       BIO_ADDR_sockaddr_noconst(&peer), &len);
+            BIO_ADDR_sockaddr_noconst(&peer), &len);
 
         if (!data->connected && ret >= 0)
             BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &peer);
@@ -451,7 +464,7 @@ static int dgram_write(BIO *b, const char *in, int inl)
         int peerlen = BIO_ADDR_sockaddr_size(&data->peer);
 
         ret = sendto(b->num, in, inl, 0,
-                     BIO_ADDR_sockaddr(&data->peer), peerlen);
+            BIO_ADDR_sockaddr(&data->peer), peerlen);
     }
 
     BIO_clear_retry_flags(b);
@@ -464,37 +477,36 @@ static int dgram_write(BIO *b, const char *in, int inl)
     return ret;
 }
 
-static long dgram_get_mtu_overhead(bio_dgram_data *data)
+static long dgram_get_mtu_overhead(BIO_ADDR *addr)
 {
     long ret;
 
-    switch (BIO_ADDR_family(&data->peer)) {
+    switch (BIO_ADDR_family(addr)) {
     case AF_INET:
         /*
          * Assume this is UDP - 20 bytes for IP, 8 bytes for UDP
          */
         ret = 28;
         break;
-# if OPENSSL_USE_IPV6
-    case AF_INET6:
-        {
-#  ifdef IN6_IS_ADDR_V4MAPPED
-            struct in6_addr tmp_addr;
-            if (BIO_ADDR_rawaddress(&data->peer, &tmp_addr, NULL)
-                && IN6_IS_ADDR_V4MAPPED(&tmp_addr))
-                /*
-                 * Assume this is UDP - 20 bytes for IP, 8 bytes for UDP
-                 */
-                ret = 28;
-            else
-#  endif
+#if OPENSSL_USE_IPV6
+    case AF_INET6: {
+#ifdef IN6_IS_ADDR_V4MAPPED
+        struct in6_addr tmp_addr;
+
+        if (BIO_ADDR_rawaddress(addr, &tmp_addr, NULL)
+            && IN6_IS_ADDR_V4MAPPED(&tmp_addr))
+            /*
+             * Assume this is UDP - 20 bytes for IP, 8 bytes for UDP
+             */
+            ret = 28;
+        else
+#endif
             /*
              * Assume this is UDP - 40 bytes for IP, 8 bytes for UDP
              */
             ret = 48;
-        }
-        break;
-# endif
+    } break;
+#endif
     default:
         /* We don't know. Go with the historical default */
         ret = 28;
@@ -504,62 +516,66 @@ static long dgram_get_mtu_overhead(bio_dgram_data *data)
 }
 
 /* Enables appropriate destination address reception option on the socket. */
-# if defined(SUPPORT_LOCAL_ADDR)
-static int enable_local_addr(BIO *b, int enable) {
+#if defined(SUPPORT_LOCAL_ADDR)
+static int enable_local_addr(BIO *b, int enable)
+{
     int af = dgram_get_sock_family(b);
 
     if (af == AF_INET) {
-#  if defined(IP_PKTINFO)
+#if defined(IP_PKTINFO)
         /* IP_PKTINFO is preferred */
         if (setsockopt(b->num, IPPROTO_IP, IP_PKTINFO,
-                       (void *)&enable, sizeof(enable)) < 0)
+                (void *)&enable, sizeof(enable))
+            < 0)
             return 0;
 
         return 1;
 
-#  elif defined(IP_RECVDSTADDR)
+#elif defined(IP_RECVDSTADDR)
         /* Fall back to IP_RECVDSTADDR */
 
         if (setsockopt(b->num, IPPROTO_IP, IP_RECVDSTADDR,
-                       &enable, sizeof(enable)) < 0)
+                &enable, sizeof(enable))
+            < 0)
             return 0;
 
         return 1;
-#  endif
+#endif
     }
 
-#  if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
     if (af == AF_INET6) {
-#   if defined(IPV6_RECVPKTINFO)
+#if defined(IPV6_RECVPKTINFO)
         if (setsockopt(b->num, IPPROTO_IPV6, IPV6_RECVPKTINFO,
-                       &enable, sizeof(enable)) < 0)
+                &enable, sizeof(enable))
+            < 0)
             return 0;
 
         return 1;
-#   endif
+#endif
     }
-#  endif
+#endif
 
     return 0;
 }
-# endif
+#endif
 
 static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
 {
     long ret = 1;
     int *ip;
     bio_dgram_data *data = NULL;
-# ifndef __DJGPP__
+#ifndef __DJGPP__
     /* There are currently no cases where this is used on djgpp/watt32. */
     int sockopt_val = 0;
-# endif
+#endif
     int d_errno;
-# if defined(OPENSSL_SYS_LINUX) && (defined(IP_MTU_DISCOVER) || defined(IP_MTU))
-    socklen_t sockopt_len;      /* assume that system supporting IP_MTU is
-                                 * modern enough to define socklen_t */
+#if defined(OPENSSL_SYS_LINUX) && (defined(IP_MTU_DISCOVER) || defined(IP_MTU))
+    socklen_t sockopt_len; /* assume that system supporting IP_MTU is
+                            * modern enough to define socklen_t */
     socklen_t addr_len;
     BIO_ADDR addr;
-# endif
+#endif
     struct sockaddr_storage ss;
     socklen_t ss_len = sizeof(ss);
 
@@ -583,12 +599,12 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
             BIO_ADDR_make(&data->peer, BIO_ADDR_sockaddr((BIO_ADDR *)&ss));
             data->connected = 1;
         }
-# if defined(SUPPORT_LOCAL_ADDR)
+#if defined(SUPPORT_LOCAL_ADDR)
         if (data->local_addr_enabled) {
             if (enable_local_addr(b, 1) < 1)
                 data->local_addr_enabled = 0;
         }
-# endif
+#endif
         break;
     case BIO_C_GET_FD:
         if (b->init) {
@@ -618,8 +634,8 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
         break;
         /* (Linux)kernel sets DF bit on outgoing IP packets */
     case BIO_CTRL_DGRAM_MTU_DISCOVER:
-# if defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
-        addr_len = (socklen_t) sizeof(addr);
+#if defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO)
+        addr_len = (socklen_t)sizeof(addr);
         BIO_ADDR_clear(&addr);
         if (getsockname(b->num, &addr.sa, &addr_len) < 0) {
             ret = 0;
@@ -629,30 +645,32 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
         case AF_INET:
             sockopt_val = IP_PMTUDISC_DO;
             if ((ret = setsockopt(b->num, IPPROTO_IP, IP_MTU_DISCOVER,
-                                  &sockopt_val, sizeof(sockopt_val))) < 0)
+                     &sockopt_val, sizeof(sockopt_val)))
+                < 0)
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling setsockopt()");
+                    "calling setsockopt()");
             break;
-#  if OPENSSL_USE_IPV6 && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
+#if OPENSSL_USE_IPV6 && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
         case AF_INET6:
             sockopt_val = IPV6_PMTUDISC_DO;
             if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER,
-                                  &sockopt_val, sizeof(sockopt_val))) < 0)
+                     &sockopt_val, sizeof(sockopt_val)))
+                < 0)
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling setsockopt()");
+                    "calling setsockopt()");
             break;
-#  endif
+#endif
         default:
             ret = -1;
             break;
         }
-# else
+#else
         ret = -1;
-# endif
+#endif
         break;
     case BIO_CTRL_DGRAM_QUERY_MTU:
-# if defined(OPENSSL_SYS_LINUX) && defined(IP_MTU)
-        addr_len = (socklen_t) sizeof(addr);
+#if defined(OPENSSL_SYS_LINUX) && defined(IP_MTU)
+        addr_len = (socklen_t)sizeof(addr);
         BIO_ADDR_clear(&addr);
         if (getsockname(b->num, &addr.sa, &addr_len) < 0) {
             ret = 0;
@@ -661,64 +679,55 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
         sockopt_len = sizeof(sockopt_val);
         switch (addr.sa.sa_family) {
         case AF_INET:
-            if ((ret =
-                 getsockopt(b->num, IPPROTO_IP, IP_MTU, (void *)&sockopt_val,
-                            &sockopt_len)) < 0 || sockopt_val < 0) {
+            if ((ret = getsockopt(b->num, IPPROTO_IP, IP_MTU, (void *)&sockopt_val,
+                     &sockopt_len))
+                    < 0
+                || sockopt_val < 0) {
                 ret = 0;
             } else {
-                /*
-                 * we assume that the transport protocol is UDP and no IP
-                 * options are used.
-                 */
-                data->mtu = sockopt_val - 8 - 20;
+                data->mtu = sockopt_val - dgram_get_mtu_overhead(&addr);
                 ret = data->mtu;
             }
             break;
-#  if OPENSSL_USE_IPV6 && defined(IPV6_MTU)
+#if OPENSSL_USE_IPV6 && defined(IPV6_MTU)
         case AF_INET6:
-            if ((ret =
-                 getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU,
-                            (void *)&sockopt_val, &sockopt_len)) < 0
+            if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU,
+                     (void *)&sockopt_val, &sockopt_len))
+                    < 0
                 || sockopt_val < 0) {
                 ret = 0;
             } else {
-                /*
-                 * we assume that the transport protocol is UDP and no IPV6
-                 * options are used.
-                 */
-                data->mtu = sockopt_val - 8 - 40;
+                data->mtu = sockopt_val - dgram_get_mtu_overhead(&addr);
                 ret = data->mtu;
             }
             break;
-#  endif
+#endif
         default:
             ret = 0;
             break;
         }
-# else
+#else
         ret = 0;
-# endif
+#endif
         break;
     case BIO_CTRL_DGRAM_GET_FALLBACK_MTU:
-        ret = -dgram_get_mtu_overhead(data);
+        ret = -dgram_get_mtu_overhead(&data->peer);
         switch (BIO_ADDR_family(&data->peer)) {
         case AF_INET:
             ret += 576;
             break;
-# if OPENSSL_USE_IPV6
-        case AF_INET6:
-            {
-#  ifdef IN6_IS_ADDR_V4MAPPED
-                struct in6_addr tmp_addr;
-                if (BIO_ADDR_rawaddress(&data->peer, &tmp_addr, NULL)
-                    && IN6_IS_ADDR_V4MAPPED(&tmp_addr))
-                    ret += 576;
-                else
-#  endif
-                    ret += 1280;
-            }
-            break;
-# endif
+#if OPENSSL_USE_IPV6
+        case AF_INET6: {
+#ifdef IN6_IS_ADDR_V4MAPPED
+            struct in6_addr tmp_addr;
+            if (BIO_ADDR_rawaddress(&data->peer, &tmp_addr, NULL)
+                && IN6_IS_ADDR_V4MAPPED(&tmp_addr))
+                ret += 576;
+            else
+#endif
+                ret += 1280;
+        } break;
+#endif
         default:
             ret += 576;
             break;
@@ -750,28 +759,26 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
     case BIO_CTRL_DGRAM_SET_PEER:
         BIO_ADDR_make(&data->peer, BIO_ADDR_sockaddr((BIO_ADDR *)ptr));
         break;
-    case BIO_CTRL_DGRAM_DETECT_PEER_ADDR:
-        {
-            BIO_ADDR xaddr, *p = &data->peer;
-            socklen_t xaddr_len = sizeof(xaddr.sa);
-
-            if (BIO_ADDR_family(p) == AF_UNSPEC) {
-                if (getpeername(b->num, (void *)&xaddr.sa, &xaddr_len) == 0
-                    && BIO_ADDR_family(&xaddr) != AF_UNSPEC) {
-                    p = &xaddr;
-                } else {
-                    ret = 0;
-                    break;
-                }
+    case BIO_CTRL_DGRAM_DETECT_PEER_ADDR: {
+        BIO_ADDR xaddr, *p = &data->peer;
+        socklen_t xaddr_len = sizeof(xaddr.sa);
+
+        if (BIO_ADDR_family(p) == AF_UNSPEC) {
+            if (getpeername(b->num, (void *)&xaddr.sa, &xaddr_len) == 0
+                && BIO_ADDR_family(&xaddr) != AF_UNSPEC) {
+                p = &xaddr;
+            } else {
+                ret = 0;
+                break;
             }
+        }
 
-            ret = BIO_ADDR_sockaddr_size(p);
-            if (num == 0 || num > ret)
-                num = ret;
+        ret = BIO_ADDR_sockaddr_size(p);
+        if (num == 0 || num > ret)
+            num = ret;
 
-            memcpy(ptr, p, (ret = num));
-        }
-        break;
+        memcpy(ptr, p, (ret = num));
+    } break;
     case BIO_C_SET_NBIO:
         if (!BIO_socket_nbio(b->num, num != 0))
             ret = 0;
@@ -779,122 +786,133 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
     case BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT:
         data->next_timeout = ossl_time_from_timeval(*(struct timeval *)ptr);
         break;
-# if defined(SO_RCVTIMEO)
+#if defined(SO_RCVTIMEO)
     case BIO_CTRL_DGRAM_SET_RECV_TIMEOUT:
-#  ifdef OPENSSL_SYS_WINDOWS
-        {
-            struct timeval *tv = (struct timeval *)ptr;
-            int timeout = tv->tv_sec * 1000 + tv->tv_usec / 1000;
-
-            if ((ret = setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-                                  (void *)&timeout, sizeof(timeout))) < 0)
-                ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling setsockopt()");
-        }
-#  else
+#ifdef OPENSSL_SYS_WINDOWS
+    {
+        struct timeval *tv = (struct timeval *)ptr;
+        int timeout = tv->tv_sec * 1000 + tv->tv_usec / 1000;
+
+        if ((ret = setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
+                 (void *)&timeout, sizeof(timeout)))
+            < 0)
+            ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+                "calling setsockopt()");
+    }
+#else
         if ((ret = setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, ptr,
-                              sizeof(struct timeval))) < 0)
+                 sizeof(struct timeval)))
+            < 0)
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling setsockopt()");
-#  endif
-        break;
-    case BIO_CTRL_DGRAM_GET_RECV_TIMEOUT:
-        {
-#  ifdef OPENSSL_SYS_WINDOWS
-            int sz = 0;
-            int timeout;
-            struct timeval *tv = (struct timeval *)ptr;
-
-            sz = sizeof(timeout);
-            if ((ret = getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-                                  (void *)&timeout, &sz)) < 0) {
-                ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling getsockopt()");
-            } else {
-                tv->tv_sec = timeout / 1000;
-                tv->tv_usec = (timeout % 1000) * 1000;
-                ret = sizeof(*tv);
-            }
-#  else
-            socklen_t sz = sizeof(struct timeval);
-            if ((ret = getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
-                                  ptr, &sz)) < 0) {
-                ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling getsockopt()");
-            } else {
-                OPENSSL_assert((size_t)sz <= sizeof(struct timeval));
-                ret = (int)sz;
-            }
-#  endif
+                "calling setsockopt()");
+#endif
+    break;
+    case BIO_CTRL_DGRAM_GET_RECV_TIMEOUT: {
+#ifdef OPENSSL_SYS_WINDOWS
+        int sz = 0;
+        int timeout;
+        struct timeval *tv = (struct timeval *)ptr;
+
+        sz = sizeof(timeout);
+        if ((ret = getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
+                 (void *)&timeout, &sz))
+            < 0) {
+            ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+                "calling getsockopt()");
+        } else {
+            tv->tv_sec = timeout / 1000;
+            tv->tv_usec = (timeout % 1000) * 1000;
+            ret = sizeof(*tv);
         }
-        break;
-# endif
-# if defined(SO_SNDTIMEO)
-    case BIO_CTRL_DGRAM_SET_SEND_TIMEOUT:
-#  ifdef OPENSSL_SYS_WINDOWS
-        {
-            struct timeval *tv = (struct timeval *)ptr;
-            int timeout = tv->tv_sec * 1000 + tv->tv_usec / 1000;
+#else
+        socklen_t sz = sizeof(struct timeval);
 
-            if ((ret = setsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
-                                  (void *)&timeout, sizeof(timeout))) < 0)
-                ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling setsockopt()");
+        if ((ret = getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO,
+                 ptr, &sz))
+            < 0) {
+            ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+                "calling getsockopt()");
+        } else if (!ossl_assert((size_t)sz == sizeof(struct timeval))) {
+            ERR_raise_data(ERR_LIB_BIO, ERR_R_INTERNAL_ERROR,
+                "Unexpected getsockopt(SO_RCVTIMEO) return size");
+            ret = -1;
+        } else {
+            ret = (int)sz;
         }
-#  else
+#endif
+    } break;
+#endif
+#if defined(SO_SNDTIMEO)
+    case BIO_CTRL_DGRAM_SET_SEND_TIMEOUT:
+#ifdef OPENSSL_SYS_WINDOWS
+    {
+        struct timeval *tv = (struct timeval *)ptr;
+        int timeout = tv->tv_sec * 1000 + tv->tv_usec / 1000;
+
+        if ((ret = setsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
+                 (void *)&timeout, sizeof(timeout)))
+            < 0)
+            ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+                "calling setsockopt()");
+    }
+#else
         if ((ret = setsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO, ptr,
-                              sizeof(struct timeval))) < 0)
+                 sizeof(struct timeval)))
+            < 0)
             ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                           "calling setsockopt()");
-#  endif
-        break;
-    case BIO_CTRL_DGRAM_GET_SEND_TIMEOUT:
-        {
-#  ifdef OPENSSL_SYS_WINDOWS
-            int sz = 0;
-            int timeout;
-            struct timeval *tv = (struct timeval *)ptr;
-
-            sz = sizeof(timeout);
-            if ((ret = getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
-                                  (void *)&timeout, &sz)) < 0) {
-                ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling getsockopt()");
-            } else {
-                tv->tv_sec = timeout / 1000;
-                tv->tv_usec = (timeout % 1000) * 1000;
-                ret = sizeof(*tv);
-            }
-#  else
-            socklen_t sz = sizeof(struct timeval);
+                "calling setsockopt()");
+#endif
+    break;
+    case BIO_CTRL_DGRAM_GET_SEND_TIMEOUT: {
+#ifdef OPENSSL_SYS_WINDOWS
+        int sz = 0;
+        int timeout;
+        struct timeval *tv = (struct timeval *)ptr;
 
-            if ((ret = getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
-                                  ptr, &sz)) < 0) {
-                ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling getsockopt()");
-            } else {
-                OPENSSL_assert((size_t)sz <= sizeof(struct timeval));
-                ret = (int)sz;
-            }
-#  endif
+        sz = sizeof(timeout);
+        if ((ret = getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
+                 (void *)&timeout, &sz))
+            < 0) {
+            ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+                "calling getsockopt()");
+        } else {
+            tv->tv_sec = timeout / 1000;
+            tv->tv_usec = (timeout % 1000) * 1000;
+            ret = sizeof(*tv);
         }
-        break;
-# endif
+#else
+        socklen_t sz = sizeof(struct timeval);
+
+        if ((ret = getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO,
+                 ptr, &sz))
+            < 0) {
+            ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+                "calling getsockopt()");
+        } else if (!ossl_assert((size_t)sz == sizeof(struct timeval))) {
+            ERR_raise_data(ERR_LIB_BIO, ERR_R_INTERNAL_ERROR,
+                "Unexpected getsockopt(SO_SNDTIMEO) return size");
+            ret = -1;
+        } else {
+            ret = (int)sz;
+        }
+#endif
+    } break;
+#endif
     case BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP:
         /* fall-through */
     case BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP:
-# ifdef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
         d_errno = (data->_errno == WSAETIMEDOUT);
-# else
+#else
         d_errno = (data->_errno == EAGAIN);
-# endif
+#endif
         if (d_errno) {
             ret = 1;
             data->_errno = 0;
         } else
             ret = 0;
         break;
-# ifdef EMSGSIZE
+#ifdef EMSGSIZE
     case BIO_CTRL_DGRAM_MTU_EXCEEDED:
         if (data->_errno == EMSGSIZE) {
             ret = 1;
@@ -902,61 +920,66 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
         } else
             ret = 0;
         break;
-# endif
+#endif
     case BIO_CTRL_DGRAM_SET_DONT_FRAG:
         switch (data->peer.sa.sa_family) {
         case AF_INET:
-# if defined(IP_DONTFRAG)
+#if defined(IP_DONTFRAG)
             sockopt_val = num ? 1 : 0;
             if ((ret = setsockopt(b->num, IPPROTO_IP, IP_DONTFRAG,
-                                  &sockopt_val, sizeof(sockopt_val))) < 0)
+                     &sockopt_val, sizeof(sockopt_val)))
+                < 0)
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling setsockopt()");
-# elif defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER) && defined (IP_PMTUDISC_PROBE)
+                    "calling setsockopt()");
+#elif defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_PROBE)
             sockopt_val = num ? IP_PMTUDISC_PROBE : IP_PMTUDISC_DONT;
             if ((ret = setsockopt(b->num, IPPROTO_IP, IP_MTU_DISCOVER,
-                                  &sockopt_val, sizeof(sockopt_val))) < 0)
+                     &sockopt_val, sizeof(sockopt_val)))
+                < 0)
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling setsockopt()");
-# elif defined(OPENSSL_SYS_WINDOWS) && defined(IP_DONTFRAGMENT)
+                    "calling setsockopt()");
+#elif defined(OPENSSL_SYS_WINDOWS) && defined(IP_DONTFRAGMENT)
             sockopt_val = num ? 1 : 0;
             if ((ret = setsockopt(b->num, IPPROTO_IP, IP_DONTFRAGMENT,
-                                  (const char *)&sockopt_val,
-                                  sizeof(sockopt_val))) < 0)
+                     (const char *)&sockopt_val,
+                     sizeof(sockopt_val)))
+                < 0)
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling setsockopt()");
-# else
+                    "calling setsockopt()");
+#else
             ret = -1;
-# endif
+#endif
             break;
-# if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
         case AF_INET6:
-#  if defined(IPV6_DONTFRAG)
+#if defined(IPV6_DONTFRAG)
             sockopt_val = num ? 1 : 0;
             if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_DONTFRAG,
-                                  (const void *)&sockopt_val,
-                                  sizeof(sockopt_val))) < 0)
+                     (const void *)&sockopt_val,
+                     sizeof(sockopt_val)))
+                < 0)
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling setsockopt()");
+                    "calling setsockopt()");
 
-#  elif defined(OPENSSL_SYS_LINUX) && defined(IPV6_MTUDISCOVER)
-            sockopt_val = num ? IP_PMTUDISC_PROBE : IP_PMTUDISC_DONT;
+#elif defined(OPENSSL_SYS_LINUX) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_PROBE)
+            sockopt_val = num ? IPV6_PMTUDISC_PROBE : IPV6_PMTUDISC_DONT;
             if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER,
-                                  &sockopt_val, sizeof(sockopt_val))) < 0)
+                     &sockopt_val, sizeof(sockopt_val)))
+                < 0)
                 ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                               "calling setsockopt()");
-#  else
+                    "calling setsockopt()");
+#else
             ret = -1;
-#  endif
+#endif
             break;
-# endif
+#endif
         default:
             ret = -1;
             break;
         }
         break;
     case BIO_CTRL_DGRAM_GET_MTU_OVERHEAD:
-        ret = dgram_get_mtu_overhead(data);
+        ret = dgram_get_mtu_overhead(&data->peer);
         break;
 
     /*
@@ -972,15 +995,15 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
         break;
 
     case BIO_CTRL_DGRAM_GET_LOCAL_ADDR_CAP:
-# if defined(SUPPORT_LOCAL_ADDR)
+#if defined(SUPPORT_LOCAL_ADDR)
         ret = 1;
-# else
+#else
         ret = 0;
-# endif
+#endif
         break;
 
     case BIO_CTRL_DGRAM_SET_LOCAL_ADDR_ENABLE:
-# if defined(SUPPORT_LOCAL_ADDR)
+#if defined(SUPPORT_LOCAL_ADDR)
         num = num > 0;
         if (num != data->local_addr_enabled) {
             if (enable_local_addr(b, num) < 1) {
@@ -990,9 +1013,9 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
 
             data->local_addr_enabled = (char)num;
         }
-# else
+#else
         ret = 0;
-# endif
+#endif
         break;
 
     case BIO_CTRL_DGRAM_GET_LOCAL_ADDR_ENABLE:
@@ -1001,20 +1024,18 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
 
     case BIO_CTRL_DGRAM_GET_EFFECTIVE_CAPS:
         ret = (long)(BIO_DGRAM_CAP_HANDLES_DST_ADDR
-                     | BIO_DGRAM_CAP_HANDLES_SRC_ADDR
-                     | BIO_DGRAM_CAP_PROVIDES_DST_ADDR
-                     | BIO_DGRAM_CAP_PROVIDES_SRC_ADDR);
+            | BIO_DGRAM_CAP_HANDLES_SRC_ADDR
+            | BIO_DGRAM_CAP_PROVIDES_DST_ADDR
+            | BIO_DGRAM_CAP_PROVIDES_SRC_ADDR);
         break;
 
     case BIO_CTRL_GET_RPOLL_DESCRIPTOR:
-    case BIO_CTRL_GET_WPOLL_DESCRIPTOR:
-        {
-            BIO_POLL_DESCRIPTOR *pd = ptr;
+    case BIO_CTRL_GET_WPOLL_DESCRIPTOR: {
+        BIO_POLL_DESCRIPTOR *pd = ptr;
 
-            pd->type        = BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
-            pd->value.fd    = b->num;
-        }
-        break;
+        pd->type = BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
+        pd->value.fd = b->num;
+    } break;
 
     default:
         ret = 0;
@@ -1035,9 +1056,9 @@ static int dgram_puts(BIO *bp, const char *str)
     return ret;
 }
 
-# if M_METHOD == M_METHOD_WSARECVMSG
+#if M_METHOD == M_METHOD_WSARECVMSG
 static void translate_msg_win(BIO *b, WSAMSG *mh, WSABUF *iov,
-                              unsigned char *control, BIO_MSG *msg)
+    unsigned char *control, BIO_MSG *msg)
 {
     iov->len = msg->data_len;
     iov->buf = msg->data;
@@ -1046,10 +1067,10 @@ static void translate_msg_win(BIO *b, WSAMSG *mh, WSABUF *iov,
     mh->name = msg->peer != NULL ? &msg->peer->sa : NULL;
     if (msg->peer != NULL && dgram_get_sock_family(b) == AF_INET)
         mh->namelen = sizeof(struct sockaddr_in);
-#  if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
     else if (msg->peer != NULL && dgram_get_sock_family(b) == AF_INET6)
         mh->namelen = sizeof(struct sockaddr_in6);
-#  endif
+#endif
     else
         mh->namelen = 0;
 
@@ -1060,23 +1081,23 @@ static void translate_msg_win(BIO *b, WSAMSG *mh, WSABUF *iov,
      * the control buffer even if we aren't actually going to examine the
      * result.
      */
-    mh->lpBuffers       = iov;
-    mh->dwBufferCount   = 1;
-    mh->Control.len     = BIO_CMSG_ALLOC_LEN;
-    mh->Control.buf     = control;
-    mh->dwFlags         = 0;
+    mh->lpBuffers = iov;
+    mh->dwBufferCount = 1;
+    mh->Control.len = BIO_CMSG_ALLOC_LEN;
+    mh->Control.buf = control;
+    mh->dwFlags = 0;
 }
-# endif
+#endif
 
-# if M_METHOD == M_METHOD_RECVMMSG || M_METHOD == M_METHOD_RECVMSG
+#if M_METHOD == M_METHOD_RECVMMSG || M_METHOD == M_METHOD_RECVMSG
 /* Translates a BIO_MSG to a msghdr and iovec. */
 static void translate_msg(BIO *b, struct msghdr *mh, struct iovec *iov,
-                          unsigned char *control, BIO_MSG *msg)
+    unsigned char *control, BIO_MSG *msg)
 {
     bio_dgram_data *data;
 
     iov->iov_base = msg->data;
-    iov->iov_len  = msg->data_len;
+    iov->iov_len = msg->data_len;
 
     data = (bio_dgram_data *)b->ptr;
     if (data->connected == 0) {
@@ -1084,10 +1105,10 @@ static void translate_msg(BIO *b, struct msghdr *mh, struct iovec *iov,
         mh->msg_name = msg->peer != NULL ? &msg->peer->sa : NULL;
         if (msg->peer != NULL && dgram_get_sock_family(b) == AF_INET)
             mh->msg_namelen = sizeof(struct sockaddr_in);
-#  if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
         else if (msg->peer != NULL && dgram_get_sock_family(b) == AF_INET6)
             mh->msg_namelen = sizeof(struct sockaddr_in6);
-#  endif
+#endif
         else
             mh->msg_namelen = 0;
     } else {
@@ -1095,108 +1116,107 @@ static void translate_msg(BIO *b, struct msghdr *mh, struct iovec *iov,
         mh->msg_namelen = 0;
     }
 
-    mh->msg_iov         = iov;
-    mh->msg_iovlen      = 1;
-    mh->msg_control     = msg->local != NULL ? control : NULL;
-    mh->msg_controllen  = msg->local != NULL ? BIO_CMSG_ALLOC_LEN : 0;
-    mh->msg_flags       = 0;
+    mh->msg_iov = iov;
+    mh->msg_iovlen = 1;
+    mh->msg_control = msg->local != NULL ? control : NULL;
+    mh->msg_controllen = msg->local != NULL ? BIO_CMSG_ALLOC_LEN : 0;
+    mh->msg_flags = 0;
 }
-# endif
+#endif
 
-# if M_METHOD == M_METHOD_RECVMMSG || M_METHOD == M_METHOD_RECVMSG || M_METHOD == M_METHOD_WSARECVMSG
+#if M_METHOD == M_METHOD_RECVMMSG || M_METHOD == M_METHOD_RECVMSG || M_METHOD == M_METHOD_WSARECVMSG
 /* Extracts destination address from the control buffer. */
-static int extract_local(BIO *b, MSGHDR_TYPE *mh, BIO_ADDR *local) {
-#  if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) || defined(IPV6_PKTINFO)
+static int extract_local(BIO *b, MSGHDR_TYPE *mh, BIO_ADDR *local)
+{
+#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) || defined(IPV6_PKTINFO)
     CMSGHDR_TYPE *cmsg;
     int af = dgram_get_sock_family(b);
 
     for (cmsg = BIO_CMSG_FIRSTHDR(mh); cmsg != NULL;
-         cmsg = BIO_CMSG_NXTHDR(mh, cmsg)) {
+        cmsg = BIO_CMSG_NXTHDR(mh, cmsg)) {
         if (af == AF_INET) {
             if (cmsg->cmsg_level != IPPROTO_IP)
                 continue;
 
-#   if defined(IP_PKTINFO)
+#if defined(IP_PKTINFO)
             if (cmsg->cmsg_type != IP_PKTINFO)
                 continue;
 
-            local->s_in.sin_addr =
-                ((struct in_pktinfo *)BIO_CMSG_DATA(cmsg))->ipi_addr;
+            local->s_in.sin_addr = ((struct in_pktinfo *)BIO_CMSG_DATA(cmsg))->ipi_addr;
 
-#   elif defined(IP_RECVDSTADDR)
+#elif defined(IP_RECVDSTADDR)
             if (cmsg->cmsg_type != IP_RECVDSTADDR)
                 continue;
 
             local->s_in.sin_addr = *(struct in_addr *)BIO_CMSG_DATA(cmsg);
-#   endif
+#endif
 
-#   if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR)
+#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR)
             {
                 bio_dgram_data *data = b->ptr;
 
                 local->s_in.sin_family = AF_INET;
-                local->s_in.sin_port   = data->local_addr.s_in.sin_port;
+                local->s_in.sin_port = data->local_addr.s_in.sin_port;
             }
             return 1;
-#   endif
+#endif
         }
-#   if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
         else if (af == AF_INET6) {
             if (cmsg->cmsg_level != IPPROTO_IPV6)
                 continue;
 
-#    if defined(IPV6_RECVPKTINFO)
+#if defined(IPV6_RECVPKTINFO)
             if (cmsg->cmsg_type != IPV6_PKTINFO)
                 continue;
 
             {
                 bio_dgram_data *data = b->ptr;
 
-                local->s_in6.sin6_addr     =
-                    ((struct in6_pktinfo *)BIO_CMSG_DATA(cmsg))->ipi6_addr;
-                local->s_in6.sin6_family   = AF_INET6;
-                local->s_in6.sin6_port     = data->local_addr.s_in6.sin6_port;
-                local->s_in6.sin6_scope_id =
-                    data->local_addr.s_in6.sin6_scope_id;
+                local->s_in6.sin6_addr = ((struct in6_pktinfo *)BIO_CMSG_DATA(cmsg))->ipi6_addr;
+                local->s_in6.sin6_family = AF_INET6;
+                local->s_in6.sin6_port = data->local_addr.s_in6.sin6_port;
+                local->s_in6.sin6_scope_id = data->local_addr.s_in6.sin6_scope_id;
                 local->s_in6.sin6_flowinfo = 0;
             }
             return 1;
-#    endif
+#endif
         }
-#   endif
+#endif
     }
-#  endif
+#endif
 
     return 0;
 }
 
-static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local) {
+static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local)
+{
     int af = dgram_get_sock_family(b);
-#  if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) || defined(IPV6_PKTINFO)
+#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) || defined(IPV6_PKTINFO)
     CMSGHDR_TYPE *cmsg;
     bio_dgram_data *data = b->ptr;
-#  endif
+#endif
 
     if (af == AF_INET) {
-#  if defined(IP_PKTINFO)
+#if defined(IP_PKTINFO)
         struct in_pktinfo *info;
 
-#   if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
         cmsg = (CMSGHDR_TYPE *)mh->Control.buf;
-#   else
+#else
         cmsg = (CMSGHDR_TYPE *)mh->msg_control;
-#   endif
+#endif
 
-        cmsg->cmsg_len   = BIO_CMSG_LEN(sizeof(struct in_pktinfo));
+        cmsg->cmsg_len = BIO_CMSG_LEN(sizeof(struct in_pktinfo));
         cmsg->cmsg_level = IPPROTO_IP;
-        cmsg->cmsg_type  = IP_PKTINFO;
+        cmsg->cmsg_type = IP_PKTINFO;
 
         info = (struct in_pktinfo *)BIO_CMSG_DATA(cmsg);
-#   if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_CYGWIN) && !defined(__FreeBSD__) && !defined(__QNX__)
-        info->ipi_spec_dst      = local->s_in.sin_addr;
-#   endif
-        info->ipi_addr.s_addr   = 0;
-        info->ipi_ifindex       = 0;
+#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_CYGWIN) && !defined(__FreeBSD__) && !defined(__QNX__)
+        info->ipi_spec_dst = local->s_in.sin_addr;
+#endif
+        info->ipi_addr.s_addr = 0;
+        info->ipi_ifindex = 0;
 
         /*
          * We cannot override source port using this API, therefore
@@ -1210,14 +1230,14 @@ static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local) {
             return 0;
         }
 
-#   if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
         mh->Control.len = BIO_CMSG_SPACE(sizeof(struct in_pktinfo));
-#   else
+#else
         mh->msg_controllen = BIO_CMSG_SPACE(sizeof(struct in_pktinfo));
-#   endif
+#endif
         return 1;
 
-#  elif defined(IP_SENDSRCADDR)
+#elif defined(IP_SENDSRCADDR)
         struct in_addr *info;
 
         /*
@@ -1228,15 +1248,15 @@ static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local) {
          * BSD thing, so we don't need an explicit test for BSD here.
          */
         if (local->s_in.sin_addr.s_addr == data->local_addr.s_in.sin_addr.s_addr) {
-            mh->msg_control    = NULL;
+            mh->msg_control = NULL;
             mh->msg_controllen = 0;
             return 1;
         }
 
         cmsg = (struct cmsghdr *)mh->msg_control;
-        cmsg->cmsg_len   = BIO_CMSG_LEN(sizeof(struct in_addr));
+        cmsg->cmsg_len = BIO_CMSG_LEN(sizeof(struct in_addr));
         cmsg->cmsg_level = IPPROTO_IP;
-        cmsg->cmsg_type  = IP_SENDSRCADDR;
+        cmsg->cmsg_type = IP_SENDSRCADDR;
 
         info = (struct in_addr *)BIO_CMSG_DATA(cmsg);
         *info = local->s_in.sin_addr;
@@ -1250,25 +1270,25 @@ static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local) {
 
         mh->msg_controllen = BIO_CMSG_SPACE(sizeof(struct in_addr));
         return 1;
-#  endif
+#endif
     }
-#  if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
     else if (af == AF_INET6) {
-#   if defined(IPV6_PKTINFO)
+#if defined(IPV6_PKTINFO)
         struct in6_pktinfo *info;
 
-#    if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
         cmsg = (CMSGHDR_TYPE *)mh->Control.buf;
-#    else
+#else
         cmsg = (CMSGHDR_TYPE *)mh->msg_control;
-#    endif
-        cmsg->cmsg_len   = BIO_CMSG_LEN(sizeof(struct in6_pktinfo));
+#endif
+        cmsg->cmsg_len = BIO_CMSG_LEN(sizeof(struct in6_pktinfo));
         cmsg->cmsg_level = IPPROTO_IPV6;
-        cmsg->cmsg_type  = IPV6_PKTINFO;
+        cmsg->cmsg_type = IPV6_PKTINFO;
 
         info = (struct in6_pktinfo *)BIO_CMSG_DATA(cmsg);
-        info->ipi6_addr     = local->s_in6.sin6_addr;
-        info->ipi6_ifindex  = 0;
+        info->ipi6_addr = local->s_in6.sin6_addr;
+        info->ipi6_ifindex = 0;
 
         /*
          * See comment above, but also applies to the other fields
@@ -1286,39 +1306,40 @@ static int pack_local(BIO *b, MSGHDR_TYPE *mh, const BIO_ADDR *local) {
             return 0;
         }
 
-#    if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
         mh->Control.len = BIO_CMSG_SPACE(sizeof(struct in6_pktinfo));
-#    else
+#else
         mh->msg_controllen = BIO_CMSG_SPACE(sizeof(struct in6_pktinfo));
-#    endif
+#endif
         return 1;
-#   endif
+#endif
     }
-#  endif
+#endif
 
     return 0;
 }
-# endif
+#endif
 
 /*
  * Converts flags passed to BIO_sendmmsg or BIO_recvmmsg to syscall flags. You
  * should mask out any system flags returned by this function you cannot support
  * in a particular circumstance. Currently no flags are defined.
  */
-# if M_METHOD != M_METHOD_NONE
-static int translate_flags(uint64_t flags) {
+#if M_METHOD != M_METHOD_NONE
+static int translate_flags(uint64_t flags)
+{
     return 0;
 }
-# endif
+#endif
 
 static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
-                          size_t num_msg, uint64_t flags, size_t *num_processed)
+    size_t num_msg, uint64_t flags, size_t *num_processed)
 {
-# if M_METHOD != M_METHOD_NONE && M_METHOD != M_METHOD_RECVMSG
+#if M_METHOD != M_METHOD_NONE && M_METHOD != M_METHOD_RECVMSG
     int ret;
-# endif
-# if M_METHOD == M_METHOD_RECVMMSG
-#  define BIO_MAX_MSGS_PER_CALL   64
+#endif
+#if M_METHOD == M_METHOD_RECVMMSG
+#define BIO_MAX_MSGS_PER_CALL 64
     int sysflags;
     bio_dgram_data *data = (bio_dgram_data *)b->ptr;
     size_t i;
@@ -1326,7 +1347,7 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
     struct iovec iov[BIO_MAX_MSGS_PER_CALL];
     unsigned char control[BIO_MAX_MSGS_PER_CALL][BIO_CMSG_ALLOC_LEN];
     int have_local_enabled = data->local_addr_enabled;
-# elif M_METHOD == M_METHOD_RECVMSG
+#elif M_METHOD == M_METHOD_RECVMSG
     int sysflags;
     bio_dgram_data *data = (bio_dgram_data *)b->ptr;
     ossl_ssize_t l;
@@ -1334,17 +1355,17 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
     struct iovec iov;
     unsigned char control[BIO_CMSG_ALLOC_LEN];
     int have_local_enabled = data->local_addr_enabled;
-# elif M_METHOD == M_METHOD_WSARECVMSG
+#elif M_METHOD == M_METHOD_WSARECVMSG
     bio_dgram_data *data = (bio_dgram_data *)b->ptr;
     int have_local_enabled = data->local_addr_enabled;
     WSAMSG wmsg;
     WSABUF wbuf;
     DWORD num_bytes_sent = 0;
     unsigned char control[BIO_CMSG_ALLOC_LEN];
-# endif
-# if M_METHOD == M_METHOD_RECVFROM || M_METHOD == M_METHOD_WSARECVMSG
+#endif
+#if M_METHOD == M_METHOD_RECVFROM || M_METHOD == M_METHOD_WSARECVMSG
     int sysflags;
-# endif
+#endif
 
     if (num_msg == 0) {
         *num_processed = 0;
@@ -1354,11 +1375,11 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
     if (num_msg > OSSL_SSIZE_MAX)
         num_msg = OSSL_SSIZE_MAX;
 
-# if M_METHOD != M_METHOD_NONE
+#if M_METHOD != M_METHOD_NONE
     sysflags = translate_flags(flags);
-# endif
+#endif
 
-# if M_METHOD == M_METHOD_RECVMMSG
+#if M_METHOD == M_METHOD_RECVMMSG
     /*
      * In the sendmmsg/recvmmsg case, we need to allocate our translated struct
      * msghdr and struct iovec on the stack to support multithreaded use. Thus
@@ -1371,7 +1392,7 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
 
     for (i = 0; i < num_msg; ++i) {
         translate_msg(b, &mh[i].msg_hdr, &iov[i],
-                      control[i], &BIO_MSG_N(msg, stride, i));
+            control[i], &BIO_MSG_N(msg, stride, i));
 
         /* If local address was requested, it must have been enabled */
         if (BIO_MSG_N(msg, stride, i).local != NULL) {
@@ -1382,7 +1403,8 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
             }
 
             if (pack_local(b, &mh[i].msg_hdr,
-                           BIO_MSG_N(msg, stride, i).local) < 1) {
+                    BIO_MSG_N(msg, stride, i).local)
+                < 1) {
                 ERR_raise(ERR_LIB_BIO, BIO_R_LOCAL_ADDR_NOT_AVAILABLE);
                 *num_processed = 0;
                 return 0;
@@ -1400,13 +1422,13 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
 
     for (i = 0; i < (size_t)ret; ++i) {
         BIO_MSG_N(msg, stride, i).data_len = mh[i].msg_len;
-        BIO_MSG_N(msg, stride, i).flags    = 0;
+        BIO_MSG_N(msg, stride, i).flags = 0;
     }
 
     *num_processed = (size_t)ret;
     return 1;
 
-# elif M_METHOD == M_METHOD_RECVMSG
+#elif M_METHOD == M_METHOD_RECVMSG
     /*
      * If sendmsg is available, use it.
      */
@@ -1433,13 +1455,13 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
         return 0;
     }
 
-    msg->data_len   = (size_t)l;
-    msg->flags      = 0;
-    *num_processed  = 1;
+    msg->data_len = (size_t)l;
+    msg->flags = 0;
+    *num_processed = 1;
     return 1;
 
-# elif M_METHOD == M_METHOD_WSARECVMSG || M_METHOD == M_METHOD_RECVFROM
-#  if M_METHOD == M_METHOD_WSARECVMSG
+#elif M_METHOD == M_METHOD_WSARECVMSG || M_METHOD == M_METHOD_RECVFROM
+#if M_METHOD == M_METHOD_WSARECVMSG
     if (bio_WSASendMsg != NULL) {
         /* WSASendMsg-based implementation for Windows. */
         translate_msg_win(b, &wmsg, &wbuf, control, msg);
@@ -1466,11 +1488,11 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
         }
 
         msg[0].data_len = num_bytes_sent;
-        msg[0].flags    = 0;
-        *num_processed  = 1;
+        msg[0].flags = 0;
+        *num_processed = 1;
         return 1;
     }
-#  endif
+#endif
 
     /*
      * Fallback to sendto and send a single message.
@@ -1486,14 +1508,14 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
     }
 
     ret = sendto(b->num, msg[0].data,
-#  if defined(OPENSSL_SYS_WINDOWS)
-                 (int)msg[0].data_len,
-#  else
-                 msg[0].data_len,
-#  endif
-                 sysflags,
-                 msg[0].peer != NULL ? BIO_ADDR_sockaddr(msg[0].peer) : NULL,
-                 msg[0].peer != NULL ? BIO_ADDR_sockaddr_size(msg[0].peer) : 0);
+#if defined(OPENSSL_SYS_WINDOWS)
+        (int)msg[0].data_len,
+#else
+        msg[0].data_len,
+#endif
+        sysflags,
+        msg[0].peer != NULL ? BIO_ADDR_sockaddr(msg[0].peer) : NULL,
+        msg[0].peer != NULL ? BIO_ADDR_sockaddr_size(msg[0].peer) : 0);
     if (ret <= 0) {
         ERR_raise(ERR_LIB_SYS, get_last_socket_error());
         *num_processed = 0;
@@ -1501,25 +1523,25 @@ static int dgram_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
     }
 
     msg[0].data_len = ret;
-    msg[0].flags    = 0;
-    *num_processed  = 1;
+    msg[0].flags = 0;
+    *num_processed = 1;
     return 1;
 
-# else
+#else
     ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_METHOD);
     *num_processed = 0;
     return 0;
-# endif
+#endif
 }
 
 static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
-                          size_t stride, size_t num_msg,
-                          uint64_t flags, size_t *num_processed)
+    size_t stride, size_t num_msg,
+    uint64_t flags, size_t *num_processed)
 {
-# if M_METHOD != M_METHOD_NONE && M_METHOD != M_METHOD_RECVMSG
+#if M_METHOD != M_METHOD_NONE && M_METHOD != M_METHOD_RECVMSG
     int ret;
-# endif
-# if M_METHOD == M_METHOD_RECVMMSG
+#endif
+#if M_METHOD == M_METHOD_RECVMMSG
     int sysflags;
     bio_dgram_data *data = (bio_dgram_data *)b->ptr;
     size_t i;
@@ -1527,7 +1549,7 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
     struct iovec iov[BIO_MAX_MSGS_PER_CALL];
     unsigned char control[BIO_MAX_MSGS_PER_CALL][BIO_CMSG_ALLOC_LEN];
     int have_local_enabled = data->local_addr_enabled;
-# elif M_METHOD == M_METHOD_RECVMSG
+#elif M_METHOD == M_METHOD_RECVMSG
     int sysflags;
     bio_dgram_data *data = (bio_dgram_data *)b->ptr;
     ossl_ssize_t l;
@@ -1535,18 +1557,18 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
     struct iovec iov;
     unsigned char control[BIO_CMSG_ALLOC_LEN];
     int have_local_enabled = data->local_addr_enabled;
-# elif M_METHOD == M_METHOD_WSARECVMSG
+#elif M_METHOD == M_METHOD_WSARECVMSG
     bio_dgram_data *data = (bio_dgram_data *)b->ptr;
     int have_local_enabled = data->local_addr_enabled;
     WSAMSG wmsg;
     WSABUF wbuf;
     DWORD num_bytes_received = 0;
     unsigned char control[BIO_CMSG_ALLOC_LEN];
-# endif
-# if M_METHOD == M_METHOD_RECVFROM || M_METHOD == M_METHOD_WSARECVMSG
+#endif
+#if M_METHOD == M_METHOD_RECVFROM || M_METHOD == M_METHOD_WSARECVMSG
     int sysflags;
     socklen_t slen;
-# endif
+#endif
 
     if (num_msg == 0) {
         *num_processed = 0;
@@ -1556,11 +1578,11 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
     if (num_msg > OSSL_SSIZE_MAX)
         num_msg = OSSL_SSIZE_MAX;
 
-# if M_METHOD != M_METHOD_NONE
+#if M_METHOD != M_METHOD_NONE
     sysflags = translate_flags(flags);
-# endif
+#endif
 
-# if M_METHOD == M_METHOD_RECVMMSG
+#if M_METHOD == M_METHOD_RECVMMSG
     /*
      * In the sendmmsg/recvmmsg case, we need to allocate our translated struct
      * msghdr and struct iovec on the stack to support multithreaded use. Thus
@@ -1573,7 +1595,7 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
 
     for (i = 0; i < num_msg; ++i) {
         translate_msg(b, &mh[i].msg_hdr, &iov[i],
-                      control[i], &BIO_MSG_N(msg, stride, i));
+            control[i], &BIO_MSG_N(msg, stride, i));
 
         /* If local address was requested, it must have been enabled */
         if (BIO_MSG_N(msg, stride, i).local != NULL && !have_local_enabled) {
@@ -1593,27 +1615,28 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
 
     for (i = 0; i < (size_t)ret; ++i) {
         BIO_MSG_N(msg, stride, i).data_len = mh[i].msg_len;
-        BIO_MSG_N(msg, stride, i).flags    = 0;
+        BIO_MSG_N(msg, stride, i).flags = 0;
         /*
          * *(msg->peer) will have been filled in by recvmmsg;
          * for msg->local we parse the control data returned
          */
         if (BIO_MSG_N(msg, stride, i).local != NULL)
             if (extract_local(b, &mh[i].msg_hdr,
-                              BIO_MSG_N(msg, stride, i).local) < 1)
+                    BIO_MSG_N(msg, stride, i).local)
+                < 1)
                 /*
                  * It appears BSDs do not support local addresses for
                  * loopback sockets. In this case, just clear the local
                  * address, as for OS X and Windows in some circumstances
                  * (see below).
                  */
-                BIO_ADDR_clear(msg->local);
+                BIO_ADDR_clear(BIO_MSG_N(msg, stride, i).local);
     }
 
     *num_processed = (size_t)ret;
     return 1;
 
-# elif M_METHOD == M_METHOD_RECVMSG
+#elif M_METHOD == M_METHOD_RECVMSG
     /*
      * If recvmsg is available, use it.
      */
@@ -1637,8 +1660,8 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
         return 0;
     }
 
-    msg->data_len   = (size_t)l;
-    msg->flags      = 0;
+    msg->data_len = (size_t)l;
+    msg->flags = 0;
 
     if (msg->local != NULL)
         if (extract_local(b, &mh, msg->local) < 1)
@@ -1668,8 +1691,8 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
     *num_processed = 1;
     return 1;
 
-# elif M_METHOD == M_METHOD_RECVFROM || M_METHOD == M_METHOD_WSARECVMSG
-#  if M_METHOD == M_METHOD_WSARECVMSG
+#elif M_METHOD == M_METHOD_RECVFROM || M_METHOD == M_METHOD_WSARECVMSG
+#if M_METHOD == M_METHOD_WSARECVMSG
     if (bio_WSARecvMsg != NULL) {
         /* WSARecvMsg-based implementation for Windows. */
         translate_msg_win(b, &wmsg, &wbuf, control, msg);
@@ -1689,7 +1712,7 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
         }
 
         msg[0].data_len = num_bytes_received;
-        msg[0].flags    = 0;
+        msg[0].flags = 0;
         if (msg[0].local != NULL)
             if (extract_local(b, &wmsg, msg[0].local) < 1)
                 /*
@@ -1713,7 +1736,7 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
         *num_processed = 1;
         return 1;
     }
-#  endif
+#endif
 
     /*
      * Fallback to recvfrom and receive a single message.
@@ -1730,32 +1753,33 @@ static int dgram_recvmmsg(BIO *b, BIO_MSG *msg,
 
     slen = sizeof(*msg[0].peer);
     ret = recvfrom(b->num, msg[0].data,
-#  if defined(OPENSSL_SYS_WINDOWS)
-                   (int)msg[0].data_len,
-#  else
-                   msg[0].data_len,
-#  endif
-                   sysflags,
-                   msg[0].peer != NULL ? &msg[0].peer->sa : NULL,
-                   msg[0].peer != NULL ? &slen : NULL);
+#if defined(OPENSSL_SYS_WINDOWS)
+        (int)msg[0].data_len,
+#else
+        msg[0].data_len,
+#endif
+        sysflags,
+        msg[0].peer != NULL ? &msg[0].peer->sa : NULL,
+        msg[0].peer != NULL ? &slen : NULL);
     if (ret <= 0) {
         ERR_raise(ERR_LIB_SYS, get_last_socket_error());
+        *num_processed = 0;
         return 0;
     }
 
     msg[0].data_len = ret;
-    msg[0].flags    = 0;
+    msg[0].flags = 0;
     *num_processed = 1;
     return 1;
 
-# else
+#else
     ERR_raise(ERR_LIB_BIO, BIO_R_UNSUPPORTED_METHOD);
     *num_processed = 0;
     return 0;
-# endif
+#endif
 }
 
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
 const BIO_METHOD *BIO_s_datagram_sctp(void)
 {
     return &methods_dgramp_sctp;
@@ -1770,13 +1794,13 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
     struct sctp_authchunk auth;
     struct sctp_authchunks *authchunks;
     socklen_t sockopt_len;
-#  ifdef SCTP_AUTHENTICATION_EVENT
-#   ifdef SCTP_EVENT
+#ifdef SCTP_AUTHENTICATION_EVENT
+#ifdef SCTP_EVENT
     struct sctp_event event;
-#   else
+#else
     struct sctp_event_subscribe event;
-#   endif
-#  endif
+#endif
+#endif
 
     bio = BIO_new(BIO_s_datagram_sctp());
     if (bio == NULL)
@@ -1785,23 +1809,21 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
 
     /* Activate SCTP-AUTH for DATA and FORWARD-TSN chunks */
     auth.sauth_chunk = OPENSSL_SCTP_DATA_CHUNK_TYPE;
-    ret =
-        setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_CHUNK, &auth,
-                   sizeof(struct sctp_authchunk));
+    ret = setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_CHUNK, &auth,
+        sizeof(struct sctp_authchunk));
     if (ret < 0) {
         BIO_vfree(bio);
         ERR_raise_data(ERR_LIB_BIO, ERR_R_SYS_LIB,
-                       "Ensure SCTP AUTH chunks are enabled in kernel");
+            "Ensure SCTP AUTH chunks are enabled in kernel");
         return NULL;
     }
     auth.sauth_chunk = OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE;
-    ret =
-        setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_CHUNK, &auth,
-                   sizeof(struct sctp_authchunk));
+    ret = setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_CHUNK, &auth,
+        sizeof(struct sctp_authchunk));
     if (ret < 0) {
         BIO_vfree(bio);
         ERR_raise_data(ERR_LIB_BIO, ERR_R_SYS_LIB,
-                       "Ensure SCTP AUTH chunks are enabled in kernel");
+            "Ensure SCTP AUTH chunks are enabled in kernel");
         return NULL;
     }
 
@@ -1811,14 +1833,14 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
      * connected socket won't use it. Similarly with connect(): the socket
      * prior to connection must be activated for SCTP-AUTH
      */
-    sockopt_len = (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
+    sockopt_len = (socklen_t)(sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
     authchunks = OPENSSL_zalloc(sockopt_len);
     if (authchunks == NULL) {
         BIO_vfree(bio);
         return NULL;
     }
     ret = getsockopt(fd, IPPROTO_SCTP, SCTP_LOCAL_AUTH_CHUNKS, authchunks,
-                   &sockopt_len);
+        &sockopt_len);
     if (ret < 0) {
         OPENSSL_free(authchunks);
         BIO_vfree(bio);
@@ -1826,8 +1848,8 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
     }
 
     for (p = (unsigned char *)authchunks->gauth_chunks;
-         p < (unsigned char *)authchunks + sockopt_len;
-         p += sizeof(uint8_t)) {
+        p < (unsigned char *)authchunks + sockopt_len;
+        p += sizeof(uint8_t)) {
         if (*p == OPENSSL_SCTP_DATA_CHUNK_TYPE)
             auth_data = 1;
         if (*p == OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE)
@@ -1839,26 +1861,25 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
     if (!auth_data || !auth_forward) {
         BIO_vfree(bio);
         ERR_raise_data(ERR_LIB_BIO, ERR_R_SYS_LIB,
-                       "Ensure SCTP AUTH chunks are enabled on the "
-                       "underlying socket");
+            "Ensure SCTP AUTH chunks are enabled on the "
+            "underlying socket");
         return NULL;
     }
 
-#  ifdef SCTP_AUTHENTICATION_EVENT
-#   ifdef SCTP_EVENT
+#ifdef SCTP_AUTHENTICATION_EVENT
+#ifdef SCTP_EVENT
     memset(&event, 0, sizeof(event));
     event.se_assoc_id = 0;
     event.se_type = SCTP_AUTHENTICATION_EVENT;
     event.se_on = 1;
-    ret =
-        setsockopt(fd, IPPROTO_SCTP, SCTP_EVENT, &event,
-                   sizeof(struct sctp_event));
+    ret = setsockopt(fd, IPPROTO_SCTP, SCTP_EVENT, &event,
+        sizeof(struct sctp_event));
     if (ret < 0) {
         BIO_vfree(bio);
         return NULL;
     }
-#   else
-    sockopt_len = (socklen_t) sizeof(struct sctp_event_subscribe);
+#else
+    sockopt_len = (socklen_t)sizeof(struct sctp_event_subscribe);
     ret = getsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &event, &sockopt_len);
     if (ret < 0) {
         BIO_vfree(bio);
@@ -1867,23 +1888,21 @@ BIO *BIO_new_dgram_sctp(int fd, int close_flag)
 
     event.sctp_authentication_event = 1;
 
-    ret =
-        setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &event,
-                   sizeof(struct sctp_event_subscribe));
+    ret = setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &event,
+        sizeof(struct sctp_event_subscribe));
     if (ret < 0) {
         BIO_vfree(bio);
         return NULL;
     }
-#   endif
-#  endif
+#endif
+#endif
 
     /*
      * Disable partial delivery by setting the min size larger than the max
      * record size of 2^14 + 2048 + 13
      */
-    ret =
-        setsockopt(fd, IPPROTO_SCTP, SCTP_PARTIAL_DELIVERY_POINT, &optval,
-                   sizeof(optval));
+    ret = setsockopt(fd, IPPROTO_SCTP, SCTP_PARTIAL_DELIVERY_POINT, &optval,
+        sizeof(optval));
     if (ret < 0) {
         BIO_vfree(bio);
         return NULL;
@@ -1905,9 +1924,9 @@ static int dgram_sctp_new(BIO *bi)
     bi->num = 0;
     if ((data = OPENSSL_zalloc(sizeof(*data))) == NULL)
         return 0;
-#  ifdef SCTP_PR_SCTP_NONE
+#ifdef SCTP_PR_SCTP_NONE
     data->prinfo.pr_policy = SCTP_PR_SCTP_NONE;
-#  endif
+#endif
     bi->ptr = data;
 
     bi->flags = 0;
@@ -1923,16 +1942,16 @@ static int dgram_sctp_free(BIO *a)
     if (!dgram_clear(a))
         return 0;
 
-    data = (bio_dgram_sctp_data *) a->ptr;
+    data = (bio_dgram_sctp_data *)a->ptr;
     if (data != NULL)
         OPENSSL_free(data);
 
     return 1;
 }
 
-#  ifdef SCTP_AUTHENTICATION_EVENT
+#ifdef SCTP_AUTHENTICATION_EVENT
 void dgram_sctp_handle_auth_free_key_event(BIO *b,
-                                           union sctp_notification *snp)
+    union sctp_notification *snp)
 {
     int ret;
     struct sctp_authkey_event *authkeyevent = &snp->sn_auth_event;
@@ -1943,16 +1962,16 @@ void dgram_sctp_handle_auth_free_key_event(BIO *b,
         /* delete key */
         authkeyid.scact_keynumber = authkeyevent->auth_keynumber;
         ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_DELETE_KEY,
-                         &authkeyid, sizeof(struct sctp_authkeyid));
+            &authkeyid, sizeof(struct sctp_authkeyid));
     }
 }
-#  endif
+#endif
 
 static int dgram_sctp_read(BIO *b, char *out, int outl)
 {
     int ret = 0, n = 0, i, optval;
     socklen_t optlen;
-    bio_dgram_sctp_data *data = (bio_dgram_sctp_data *) b->ptr;
+    bio_dgram_sctp_data *data = (bio_dgram_sctp_data *)b->ptr;
     struct msghdr msg;
     struct iovec iov;
     struct cmsghdr *cmsg;
@@ -1982,10 +2001,10 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
 
             if (msg.msg_controllen > 0) {
                 for (cmsg = CMSG_FIRSTHDR(&msg); cmsg;
-                     cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+                    cmsg = CMSG_NXTHDR(&msg, cmsg)) {
                     if (cmsg->cmsg_level != IPPROTO_SCTP)
                         continue;
-#  ifdef SCTP_RCVINFO
+#ifdef SCTP_RCVINFO
                     if (cmsg->cmsg_type == SCTP_RCVINFO) {
                         struct sctp_rcvinfo *rcvinfo;
 
@@ -1998,13 +2017,12 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
                         data->rcvinfo.rcv_cumtsn = rcvinfo->rcv_cumtsn;
                         data->rcvinfo.rcv_context = rcvinfo->rcv_context;
                     }
-#  endif
-#  ifdef SCTP_SNDRCV
+#endif
+#ifdef SCTP_SNDRCV
                     if (cmsg->cmsg_type == SCTP_SNDRCV) {
                         struct sctp_sndrcvinfo *sndrcvinfo;
 
-                        sndrcvinfo =
-                            (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
+                        sndrcvinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
                         data->rcvinfo.rcv_sid = sndrcvinfo->sinfo_stream;
                         data->rcvinfo.rcv_ssn = sndrcvinfo->sinfo_ssn;
                         data->rcvinfo.rcv_flags = sndrcvinfo->sinfo_flags;
@@ -2013,38 +2031,41 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
                         data->rcvinfo.rcv_cumtsn = sndrcvinfo->sinfo_cumtsn;
                         data->rcvinfo.rcv_context = sndrcvinfo->sinfo_context;
                     }
-#  endif
+#endif
                 }
             }
 
             if (msg.msg_flags & MSG_NOTIFICATION) {
                 union sctp_notification snp;
 
-                memcpy(&snp, out, sizeof(snp));
+                if (n < (int)sizeof(snp.sn_header))
+                    return -1;
+                memset(&snp, 0, sizeof(snp));
+                memcpy(&snp, out, (size_t)n < sizeof(snp) ? (size_t)n : sizeof(snp));
                 if (snp.sn_header.sn_type == SCTP_SENDER_DRY_EVENT) {
-#  ifdef SCTP_EVENT
+#ifdef SCTP_EVENT
                     struct sctp_event event;
-#  else
+#else
                     struct sctp_event_subscribe event;
                     socklen_t eventsize;
-#  endif
+#endif
 
                     /* disable sender dry event */
-#  ifdef SCTP_EVENT
+#ifdef SCTP_EVENT
                     memset(&event, 0, sizeof(event));
                     event.se_assoc_id = 0;
                     event.se_type = SCTP_SENDER_DRY_EVENT;
                     event.se_on = 0;
                     i = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENT, &event,
-                                   sizeof(struct sctp_event));
+                        sizeof(struct sctp_event));
                     if (i < 0) {
                         ret = i;
                         break;
                     }
-#  else
+#else
                     eventsize = sizeof(struct sctp_event_subscribe);
                     i = getsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
-                                   &eventsize);
+                        &eventsize);
                     if (i < 0) {
                         ret = i;
                         break;
@@ -2053,30 +2074,28 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
                     event.sctp_sender_dry_event = 0;
 
                     i = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
-                                   sizeof(struct sctp_event_subscribe));
+                        sizeof(struct sctp_event_subscribe));
                     if (i < 0) {
                         ret = i;
                         break;
                     }
-#  endif
+#endif
                 }
-#  ifdef SCTP_AUTHENTICATION_EVENT
+#ifdef SCTP_AUTHENTICATION_EVENT
                 if (snp.sn_header.sn_type == SCTP_AUTHENTICATION_EVENT)
                     dgram_sctp_handle_auth_free_key_event(b, &snp);
-#  endif
+#endif
 
                 if (data->handle_notifications != NULL)
                     data->handle_notifications(b, data->notification_context,
-                                               (void *)out);
+                        (void *)out);
 
-                memset(&snp, 0, sizeof(snp));
                 memset(out, 0, outl);
             } else {
                 ret += n;
             }
-        }
-        while ((msg.msg_flags & MSG_NOTIFICATION) && (msg.msg_flags & MSG_EOR)
-               && (ret < outl));
+        } while ((msg.msg_flags & MSG_NOTIFICATION) && (msg.msg_flags & MSG_EOR)
+            && (ret < outl));
 
         if (ret > 0 && !(msg.msg_flags & MSG_EOR)) {
             /* Partial message read, this should never happen! */
@@ -2092,26 +2111,26 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
              * Test if socket buffer can handle max record size (2^14 + 2048
              * + 13)
              */
-            optlen = (socklen_t) sizeof(int);
+            optlen = (socklen_t)sizeof(int);
             ret = getsockopt(b->num, SOL_SOCKET, SO_RCVBUF, &optval, &optlen);
-            if (ret >= 0)
-                OPENSSL_assert(optval >= 18445);
+            if (ret >= 0 && !ossl_assert(optval >= 18445))
+                return -1;
 
             /*
              * Test if SCTP doesn't partially deliver below max record size
              * (2^14 + 2048 + 13)
              */
-            optlen = (socklen_t) sizeof(int);
-            ret =
-                getsockopt(b->num, IPPROTO_SCTP, SCTP_PARTIAL_DELIVERY_POINT,
-                           &optval, &optlen);
-            if (ret >= 0)
-                OPENSSL_assert(optval >= 18445);
+            optlen = (socklen_t)sizeof(int);
+            ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_PARTIAL_DELIVERY_POINT,
+                &optval, &optlen);
+            if (ret >= 0 && !ossl_assert(optval >= 18445))
+                return -1;
 
             /*
              * Partially delivered notification??? Probably a bug....
              */
-            OPENSSL_assert(!(msg.msg_flags & MSG_NOTIFICATION));
+            if (!ossl_assert((msg.msg_flags & MSG_NOTIFICATION) == 0))
+                return -1;
 
             /*
              * Everything seems ok till now, so it's most likely a message
@@ -2136,19 +2155,18 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
             unsigned char *p;
             struct sctp_authchunks *authchunks;
 
-            optlen =
-                (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
+            optlen = (socklen_t)(sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
             authchunks = OPENSSL_malloc(optlen);
             if (authchunks == NULL)
                 return -1;
             memset(authchunks, 0, optlen);
             ii = getsockopt(b->num, IPPROTO_SCTP, SCTP_PEER_AUTH_CHUNKS,
-                            authchunks, &optlen);
+                authchunks, &optlen);
 
             if (ii >= 0)
                 for (p = (unsigned char *)authchunks->gauth_chunks;
-                     p < (unsigned char *)authchunks + optlen;
-                     p += sizeof(uint8_t)) {
+                    p < (unsigned char *)authchunks + optlen;
+                    p += sizeof(uint8_t)) {
                     if (*p == OPENSSL_SCTP_DATA_CHUNK_TYPE)
                         auth_data = 1;
                     if (*p == OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE)
@@ -2179,22 +2197,21 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
 static int dgram_sctp_write(BIO *b, const char *in, int inl)
 {
     int ret;
-    bio_dgram_sctp_data *data = (bio_dgram_sctp_data *) b->ptr;
+    bio_dgram_sctp_data *data = (bio_dgram_sctp_data *)b->ptr;
     struct bio_dgram_sctp_sndinfo *sinfo = &(data->sndinfo);
     struct bio_dgram_sctp_prinfo *pinfo = &(data->prinfo);
     struct bio_dgram_sctp_sndinfo handshake_sinfo;
     struct iovec iov[1];
     struct msghdr msg;
     struct cmsghdr *cmsg;
-#  if defined(SCTP_SNDINFO) && defined(SCTP_PRINFO)
-    char cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndinfo)) +
-                 CMSG_SPACE(sizeof(struct sctp_prinfo))];
+#if defined(SCTP_SNDINFO) && defined(SCTP_PRINFO)
+    char cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndinfo)) + CMSG_SPACE(sizeof(struct sctp_prinfo))];
     struct sctp_sndinfo *sndinfo;
     struct sctp_prinfo *prinfo;
-#  else
+#else
     char cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
     struct sctp_sndrcvinfo *sndrcvinfo;
-#  endif
+#endif
 
     clear_socket_error();
 
@@ -2204,9 +2221,9 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
      */
     if (in[0] != 23) {
         memset(&handshake_sinfo, 0, sizeof(handshake_sinfo));
-#  ifdef SCTP_SACK_IMMEDIATELY
+#ifdef SCTP_SACK_IMMEDIATELY
         handshake_sinfo.snd_flags = SCTP_SACK_IMMEDIATELY;
-#  endif
+#endif
         sinfo = &handshake_sinfo;
     }
 
@@ -2228,10 +2245,10 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
     msg.msg_namelen = 0;
     msg.msg_iov = iov;
     msg.msg_iovlen = 1;
-    msg.msg_control = (caddr_t) cmsgbuf;
+    msg.msg_control = (caddr_t)cmsgbuf;
     msg.msg_controllen = 0;
     msg.msg_flags = 0;
-#  if defined(SCTP_SNDINFO) && defined(SCTP_PRINFO)
+#if defined(SCTP_SNDINFO) && defined(SCTP_PRINFO)
     cmsg = (struct cmsghdr *)cmsgbuf;
     cmsg->cmsg_level = IPPROTO_SCTP;
     cmsg->cmsg_type = SCTP_SNDINFO;
@@ -2244,8 +2261,7 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
     sndinfo->snd_context = sinfo->snd_context;
     msg.msg_controllen += CMSG_SPACE(sizeof(struct sctp_sndinfo));
 
-    cmsg =
-        (struct cmsghdr *)&cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndinfo))];
+    cmsg = (struct cmsghdr *)&cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndinfo))];
     cmsg->cmsg_level = IPPROTO_SCTP;
     cmsg->cmsg_type = SCTP_PRINFO;
     cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_prinfo));
@@ -2254,7 +2270,7 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
     prinfo->pr_policy = pinfo->pr_policy;
     prinfo->pr_value = pinfo->pr_value;
     msg.msg_controllen += CMSG_SPACE(sizeof(struct sctp_prinfo));
-#  else
+#else
     cmsg = (struct cmsghdr *)cmsgbuf;
     cmsg->cmsg_level = IPPROTO_SCTP;
     cmsg->cmsg_type = SCTP_SNDRCV;
@@ -2263,14 +2279,14 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
     memset(sndrcvinfo, 0, sizeof(*sndrcvinfo));
     sndrcvinfo->sinfo_stream = sinfo->snd_sid;
     sndrcvinfo->sinfo_flags = sinfo->snd_flags;
-#   ifdef __FreeBSD__
+#ifdef __FreeBSD__
     sndrcvinfo->sinfo_flags |= pinfo->pr_policy;
-#   endif
+#endif
     sndrcvinfo->sinfo_ppid = sinfo->snd_ppid;
     sndrcvinfo->sinfo_context = sinfo->snd_context;
     sndrcvinfo->sinfo_timetolive = pinfo->pr_value;
     msg.msg_controllen += CMSG_SPACE(sizeof(struct sctp_sndrcvinfo));
-#  endif
+#endif
 
     ret = sendmsg(b->num, &msg, 0);
 
@@ -2292,7 +2308,7 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
     struct sctp_authkeyid authkeyid;
     struct sctp_authkey *authkey = NULL;
 
-    data = (bio_dgram_sctp_data *) b->ptr;
+    data = (bio_dgram_sctp_data *)b->ptr;
 
     switch (cmd) {
     case BIO_CTRL_DGRAM_QUERY_MTU:
@@ -2333,9 +2349,8 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
         else
             data->in_handshake = 0;
 
-        ret =
-            setsockopt(b->num, IPPROTO_SCTP, SCTP_NODELAY,
-                       &data->in_handshake, sizeof(int));
+        ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_NODELAY,
+            &data->in_handshake, sizeof(int));
         break;
     case BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY:
         /*
@@ -2344,9 +2359,8 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
 
         /* Get active key */
         sockopt_len = sizeof(struct sctp_authkeyid);
-        ret =
-            getsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, &authkeyid,
-                       &sockopt_len);
+        ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, &authkeyid,
+            &sockopt_len);
         if (ret < 0)
             break;
 
@@ -2359,18 +2373,17 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
         }
         memset(authkey, 0, sockopt_len);
         authkey->sca_keynumber = authkeyid.scact_keynumber + 1;
-#  ifndef __FreeBSD__
+#ifndef __FreeBSD__
         /*
          * This field is missing in FreeBSD 8.2 and earlier, and FreeBSD 8.3
          * and higher work without it.
          */
         authkey->sca_keylength = 64;
-#  endif
+#endif
         memcpy(&authkey->sca_key[0], ptr, 64 * sizeof(uint8_t));
 
-        ret =
-            setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_KEY, authkey,
-                       sockopt_len);
+        ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_KEY, authkey,
+            sockopt_len);
         OPENSSL_free(authkey);
         authkey = NULL;
         if (ret < 0)
@@ -2378,7 +2391,7 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
 
         /* Reset active key */
         ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY,
-                         &authkeyid, sizeof(struct sctp_authkeyid));
+            &authkeyid, sizeof(struct sctp_authkeyid));
         if (ret < 0)
             break;
 
@@ -2388,16 +2401,15 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
 
         /* Get active key */
         sockopt_len = sizeof(struct sctp_authkeyid);
-        ret =
-            getsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, &authkeyid,
-                       &sockopt_len);
+        ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, &authkeyid,
+            &sockopt_len);
         if (ret < 0)
             break;
 
         /* Set active key */
         authkeyid.scact_keynumber = authkeyid.scact_keynumber + 1;
         ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY,
-                         &authkeyid, sizeof(struct sctp_authkeyid));
+            &authkeyid, sizeof(struct sctp_authkeyid));
         if (ret < 0)
             break;
 
@@ -2424,9 +2436,8 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
         if (data->ccs_rcvd == 1 && data->ccs_sent == 1) {
             /* Get active key */
             sockopt_len = sizeof(struct sctp_authkeyid);
-            ret =
-                getsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY,
-                           &authkeyid, &sockopt_len);
+            ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY,
+                &authkeyid, &sockopt_len);
             if (ret < 0)
                 break;
 
@@ -2435,22 +2446,22 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
              * SCTP_AUTHENTICATION_EVENT is not available.
              */
             authkeyid.scact_keynumber = authkeyid.scact_keynumber - 1;
-#  ifdef SCTP_AUTH_DEACTIVATE_KEY
+#ifdef SCTP_AUTH_DEACTIVATE_KEY
             sockopt_len = sizeof(struct sctp_authkeyid);
             ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_DEACTIVATE_KEY,
-                             &authkeyid, sockopt_len);
+                &authkeyid, sockopt_len);
             if (ret < 0)
                 break;
-#  endif
-#  ifndef SCTP_AUTHENTICATION_EVENT
+#endif
+#ifndef SCTP_AUTHENTICATION_EVENT
             if (authkeyid.scact_keynumber > 0) {
                 authkeyid.scact_keynumber = authkeyid.scact_keynumber - 1;
                 ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_DELETE_KEY,
-                                 &authkeyid, sizeof(struct sctp_authkeyid));
+                    &authkeyid, sizeof(struct sctp_authkeyid));
                 if (ret < 0)
                     break;
             }
-#  endif
+#endif
 
             data->ccs_rcvd = 0;
             data->ccs_sent = 0;
@@ -2525,10 +2536,10 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr)
 }
 
 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)
 {
-    bio_dgram_sctp_data *data = (bio_dgram_sctp_data *) b->ptr;
+    bio_dgram_sctp_data *data = (bio_dgram_sctp_data *)b->ptr;
 
     if (handle_notifications != NULL) {
         data->handle_notifications = handle_notifications;
@@ -2565,24 +2576,23 @@ static int dgram_sctp_wait_for_dry(BIO *b)
     union sctp_notification snp;
     struct msghdr msg;
     struct iovec iov;
-#  ifdef SCTP_EVENT
+#ifdef SCTP_EVENT
     struct sctp_event event;
-#  else
+#else
     struct sctp_event_subscribe event;
     socklen_t eventsize;
-#  endif
-    bio_dgram_sctp_data *data = (bio_dgram_sctp_data *) b->ptr;
+#endif
+    bio_dgram_sctp_data *data = (bio_dgram_sctp_data *)b->ptr;
 
     /* set sender dry event */
-#  ifdef SCTP_EVENT
+#ifdef SCTP_EVENT
     memset(&event, 0, sizeof(event));
     event.se_assoc_id = 0;
     event.se_type = SCTP_SENDER_DRY_EVENT;
     event.se_on = 1;
-    ret =
-        setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENT, &event,
-                   sizeof(struct sctp_event));
-#  else
+    ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENT, &event,
+        sizeof(struct sctp_event));
+#else
     eventsize = sizeof(struct sctp_event_subscribe);
     ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event, &eventsize);
     if (ret < 0)
@@ -2590,10 +2600,9 @@ static int dgram_sctp_wait_for_dry(BIO *b)
 
     event.sctp_sender_dry_event = 1;
 
-    ret =
-        setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
-                   sizeof(struct sctp_event_subscribe));
-#  endif
+    ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
+        sizeof(struct sctp_event_subscribe));
+#endif
     if (ret < 0)
         return -1;
 
@@ -2644,39 +2653,36 @@ static int dgram_sctp_wait_for_dry(BIO *b)
             is_dry = 1;
 
             /* disable sender dry event */
-#  ifdef SCTP_EVENT
+#ifdef SCTP_EVENT
             memset(&event, 0, sizeof(event));
             event.se_assoc_id = 0;
             event.se_type = SCTP_SENDER_DRY_EVENT;
             event.se_on = 0;
-            ret =
-                setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENT, &event,
-                           sizeof(struct sctp_event));
-#  else
-            eventsize = (socklen_t) sizeof(struct sctp_event_subscribe);
-            ret =
-                getsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
-                           &eventsize);
+            ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENT, &event,
+                sizeof(struct sctp_event));
+#else
+            eventsize = (socklen_t)sizeof(struct sctp_event_subscribe);
+            ret = getsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
+                &eventsize);
             if (ret < 0)
                 return -1;
 
             event.sctp_sender_dry_event = 0;
 
-            ret =
-                setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
-                           sizeof(struct sctp_event_subscribe));
-#  endif
+            ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_EVENTS, &event,
+                sizeof(struct sctp_event_subscribe));
+#endif
             if (ret < 0)
                 return -1;
         }
-#  ifdef SCTP_AUTHENTICATION_EVENT
+#ifdef SCTP_AUTHENTICATION_EVENT
         if (snp.sn_header.sn_type == SCTP_AUTHENTICATION_EVENT)
             dgram_sctp_handle_auth_free_key_event(b, &snp);
-#  endif
+#endif
 
         if (data->handle_notifications != NULL)
             data->handle_notifications(b, data->notification_context,
-                                       (void *)&snp);
+                (void *)&snp);
 
         /* found notification, peek again */
         memset(&snp, 0, sizeof(snp));
@@ -2726,7 +2732,7 @@ static int dgram_sctp_msg_waiting(BIO *b)
     union sctp_notification snp;
     struct msghdr msg;
     struct iovec iov;
-    bio_dgram_sctp_data *data = (bio_dgram_sctp_data *) b->ptr;
+    bio_dgram_sctp_data *data = (bio_dgram_sctp_data *)b->ptr;
 
     /* Check if there are any messages waiting to be read */
     do {
@@ -2748,10 +2754,10 @@ static int dgram_sctp_msg_waiting(BIO *b)
 
         /* if notification, process and try again */
         if (n > 0 && (msg.msg_flags & MSG_NOTIFICATION)) {
-#  ifdef SCTP_AUTHENTICATION_EVENT
+#ifdef SCTP_AUTHENTICATION_EVENT
             if (snp.sn_header.sn_type == SCTP_AUTHENTICATION_EVENT)
                 dgram_sctp_handle_auth_free_key_event(b, &snp);
-#  endif
+#endif
 
             memset(&snp, 0, sizeof(snp));
             iov.iov_base = (char *)&snp;
@@ -2767,7 +2773,7 @@ static int dgram_sctp_msg_waiting(BIO *b)
 
             if (data->handle_notifications != NULL)
                 data->handle_notifications(b, data->notification_context,
-                                           (void *)&snp);
+                    (void *)&snp);
         }
 
     } while (n > 0 && (msg.msg_flags & MSG_NOTIFICATION));
@@ -2787,7 +2793,7 @@ static int dgram_sctp_puts(BIO *bp, const char *str)
     ret = dgram_sctp_write(bp, str, n);
     return ret;
 }
-# endif
+#endif
 
 static int BIO_dgram_should_retry(int i)
 {
@@ -2796,13 +2802,13 @@ static int BIO_dgram_should_retry(int i)
     if ((i == 0) || (i == -1)) {
         err = get_last_socket_error();
 
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
         /*
          * If the socket return value (i) is -1 and err is unexpectedly 0 at
          * this point, the error code was overwritten by another system call
          * before this error handling is called.
          */
-# endif
+#endif
 
         return BIO_dgram_non_fatal_error(err);
     }
@@ -2812,43 +2818,43 @@ static int BIO_dgram_should_retry(int i)
 int BIO_dgram_non_fatal_error(int err)
 {
     switch (err) {
-# if defined(OPENSSL_SYS_WINDOWS)
-#  if defined(WSAEWOULDBLOCK)
+#if defined(OPENSSL_SYS_WINDOWS)
+#if defined(WSAEWOULDBLOCK)
     case WSAEWOULDBLOCK:
-#  endif
-# endif
+#endif
+#endif
 
-# ifdef EWOULDBLOCK
-#  ifdef WSAEWOULDBLOCK
-#   if WSAEWOULDBLOCK != EWOULDBLOCK
+#ifdef EWOULDBLOCK
+#ifdef WSAEWOULDBLOCK
+#if WSAEWOULDBLOCK != EWOULDBLOCK
     case EWOULDBLOCK:
-#   endif
-#  else
+#endif
+#else
     case EWOULDBLOCK:
-#  endif
-# endif
+#endif
+#endif
 
-# ifdef EINTR
+#ifdef EINTR
     case EINTR:
-# endif
+#endif
 
-# ifdef EAGAIN
-#  if EWOULDBLOCK != EAGAIN
+#ifdef EAGAIN
+#if EWOULDBLOCK != EAGAIN
     case EAGAIN:
-#  endif
-# endif
+#endif
+#endif
 
-# ifdef EPROTO
+#ifdef EPROTO
     case EPROTO:
-# endif
+#endif
 
-# ifdef EINPROGRESS
+#ifdef EINPROGRESS
     case EINPROGRESS:
-# endif
+#endif
 
-# ifdef EALREADY
+#ifdef EALREADY
     case EALREADY:
-# endif
+#endif
 
         return 1;
     default:
diff --git a/crypto/bio/bss_dgram_pair.c b/crypto/bio/bss_dgram_pair.c
index 540f061ff59a9..780fe8d00e50c 100644
--- a/crypto/bio/bss_dgram_pair.c
+++ b/crypto/bio/bss_dgram_pair.c
@@ -46,9 +46,9 @@ static int ring_buf_init(struct ring_buf *r, size_t nbytes)
 static void ring_buf_destroy(struct ring_buf *r)
 {
     OPENSSL_free(r->start);
-    r->start    = NULL;
-    r->len      = 0;
-    r->count    = 0;
+    r->start = NULL;
+    r->len = 0;
+    r->count = 0;
 }
 
 /*
@@ -141,7 +141,7 @@ static int ring_buf_resize(struct ring_buf *r, size_t nbytes)
             size_t offset = nbytes - r->len;
 
             memmove(new_start + r->idx[1] + offset, new_start + r->idx[1],
-                    r->len - r->idx[1]);
+                r->len - r->idx[1]);
             r->idx[1] += offset;
         }
     } else {
@@ -184,17 +184,17 @@ static int dgram_pair_init(BIO *bio);
 static int dgram_mem_init(BIO *bio);
 static int dgram_pair_free(BIO *bio);
 static int dgram_pair_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
-                               size_t num_msg, uint64_t flags,
-                               size_t *num_processed);
+    size_t num_msg, uint64_t flags,
+    size_t *num_processed);
 static int dgram_pair_recvmmsg(BIO *b, BIO_MSG *msg, size_t stride,
-                               size_t num_msg, uint64_t flags,
-                               size_t *num_processed);
+    size_t num_msg, uint64_t flags,
+    size_t *num_processed);
 
 static int dgram_pair_ctrl_destroy_bio_pair(BIO *bio1);
 static size_t dgram_pair_read_inner(struct bio_dgram_pair_st *b, uint8_t *buf,
-                                    size_t sz);
+    size_t sz);
 
-#define BIO_MSG_N(array, n) (*(BIO_MSG *)((char *)(array) + (n)*stride))
+#define BIO_MSG_N(array, n) (*(BIO_MSG *)((char *)(array) + (n) * stride))
 
 static const BIO_METHOD dgram_pair_method = {
     BIO_TYPE_DGRAM_PAIR,
@@ -264,10 +264,10 @@ struct bio_dgram_pair_st {
      * reads.
      */
     CRYPTO_RWLOCK *lock;
-    unsigned int no_trunc          : 1; /* Reads fail if they would truncate */
+    unsigned int no_trunc : 1; /* Reads fail if they would truncate */
     unsigned int local_addr_enable : 1; /* Can use BIO_MSG->local? */
-    unsigned int role              : 1; /* Determines lock order */
-    unsigned int grows_on_write    : 1; /* Set for BIO_s_dgram_mem only */
+    unsigned int role : 1; /* Determines lock order */
+    unsigned int grows_on_write : 1; /* Set for BIO_s_dgram_mem only */
 };
 
 #define MIN_BUF_LEN (1024)
@@ -281,7 +281,7 @@ static int dgram_pair_init(BIO *bio)
     if (b == NULL)
         return 0;
 
-    b->mtu         = 1472;    /* conservative default MTU */
+    b->mtu = 1472; /* conservative default MTU */
     /* default buffer size */
     b->req_buf_len = 9 * (sizeof(struct dgram_hdr) + b->mtu);
 
@@ -348,7 +348,7 @@ static int dgram_pair_ctrl_make_bio_pair(BIO *bio1, BIO *bio2)
     /* Ensure the BIO we have been passed is actually a dgram pair BIO. */
     if (bio1->method != &dgram_pair_method || bio2->method != &dgram_pair_method) {
         ERR_raise_data(ERR_LIB_BIO, BIO_R_INVALID_ARGUMENT,
-                       "both BIOs must be BIO_dgram_pair");
+            "both BIOs must be BIO_dgram_pair");
         return 0;
     }
 
@@ -366,12 +366,12 @@ static int dgram_pair_ctrl_make_bio_pair(BIO *bio1, BIO *bio2)
      */
     if (b1->peer != NULL || b2->peer != NULL) {
         ERR_raise_data(ERR_LIB_BIO, BIO_R_IN_USE,
-                       "cannot associate a BIO_dgram_pair which is already in use");
+            "cannot associate a BIO_dgram_pair which is already in use");
         return 0;
     }
 
     if (!ossl_assert(b1->req_buf_len >= MIN_BUF_LEN
-                        && b2->req_buf_len >= MIN_BUF_LEN)) {
+            && b2->req_buf_len >= MIN_BUF_LEN)) {
         ERR_raise(ERR_LIB_BIO, BIO_R_UNINITIALIZED);
         return 0;
     }
@@ -389,12 +389,12 @@ static int dgram_pair_ctrl_make_bio_pair(BIO *bio1, BIO *bio2)
             return 0;
         }
 
-    b1->peer    = bio2;
-    b2->peer    = bio1;
-    b1->role    = 0;
-    b2->role    = 1;
-    bio1->init  = 1;
-    bio2->init  = 1;
+    b1->peer = bio2;
+    b2->peer = bio1;
+    b1->role = 0;
+    b2->role = 1;
+    bio1->init = 1;
+    bio2->init = 1;
     return 1;
 }
 
@@ -443,7 +443,6 @@ static int dgram_pair_ctrl_eof(BIO *bio)
     if (!is_dgram_pair(b))
         return 0;
 
-
     peerb = b->peer->ptr;
     if (!ossl_assert(peerb != NULL))
         return -1;
@@ -508,13 +507,13 @@ static size_t dgram_pair_ctrl_pending(BIO *bio)
     if (CRYPTO_THREAD_write_lock(readb->lock) == 0)
         return 0;
 
-    saved_idx   = readb->rbuf.idx[1];
+    saved_idx = readb->rbuf.idx[1];
     saved_count = readb->rbuf.count;
 
     l = dgram_pair_read_inner(readb, (uint8_t *)&hdr, sizeof(hdr));
 
     readb->rbuf.idx[1] = saved_idx;
-    readb->rbuf.count  = saved_count;
+    readb->rbuf.count = saved_count;
 
     CRYPTO_THREAD_unlock(readb->lock);
 
@@ -561,8 +560,7 @@ static int dgram_pair_ctrl_get_local_addr_cap(BIO *bio)
     else
         readb = b;
 
-    return (~readb->cap & (BIO_DGRAM_CAP_HANDLES_SRC_ADDR
-                           | BIO_DGRAM_CAP_PROVIDES_DST_ADDR)) == 0;
+    return (~readb->cap & (BIO_DGRAM_CAP_HANDLES_SRC_ADDR | BIO_DGRAM_CAP_PROVIDES_DST_ADDR)) == 0;
 }
 
 /* BIO_dgram_get_effective_caps (BIO_CTRL_DGRAM_GET_EFFECTIVE_CAPS) */
@@ -801,7 +799,7 @@ static long dgram_pair_ctrl(BIO *bio, int cmd, long num, void *ptr)
 }
 
 int BIO_new_bio_dgram_pair(BIO **pbio1, size_t writebuf1,
-                           BIO **pbio2, size_t writebuf2)
+    BIO **pbio2, size_t writebuf2)
 {
     int ret = 0;
     long r;
@@ -878,8 +876,8 @@ static size_t dgram_pair_read_inner(struct bio_dgram_pair_st *b, uint8_t *buf, s
 
         if (buf != NULL)
             buf += src_len;
-        total_read  += src_len;
-        sz          -= src_len;
+        total_read += src_len;
+        sz -= src_len;
     }
 
     return total_read;
@@ -890,8 +888,8 @@ static size_t dgram_pair_read_inner(struct bio_dgram_pair_st *b, uint8_t *buf, s
  * response code.
  */
 static ossl_ssize_t dgram_pair_read_actual(BIO *bio, char *buf, size_t sz,
-                                           BIO_ADDR *local, BIO_ADDR *peer,
-                                           int is_multi)
+    BIO_ADDR *local, BIO_ADDR *peer,
+    int is_multi)
 {
     size_t l, trunc = 0, saved_idx, saved_count;
     struct bio_dgram_pair_st *b = bio->ptr, *readb;
@@ -921,7 +919,7 @@ static ossl_ssize_t dgram_pair_read_actual(BIO *bio, char *buf, size_t sz,
         return -BIO_R_LOCAL_ADDR_NOT_AVAILABLE;
 
     /* Read the header. */
-    saved_idx   = readb->rbuf.idx[1];
+    saved_idx = readb->rbuf.idx[1];
     saved_count = readb->rbuf.count;
     l = dgram_pair_read_inner(readb, (uint8_t *)&hdr, sizeof(hdr));
     if (l == 0) {
@@ -946,7 +944,7 @@ static ossl_ssize_t dgram_pair_read_actual(BIO *bio, char *buf, size_t sz,
         if (b->no_trunc) {
             /* Restore original state. */
             readb->rbuf.idx[1] = saved_idx;
-            readb->rbuf.count  = saved_count;
+            readb->rbuf.count = saved_count;
             return -BIO_R_NON_FATAL;
         }
     }
@@ -967,14 +965,14 @@ static ossl_ssize_t dgram_pair_read_actual(BIO *bio, char *buf, size_t sz,
     if (local != NULL)
         *local = hdr.dst_addr;
     if (peer != NULL)
-        *peer  = hdr.src_addr;
+        *peer = hdr.src_addr;
 
     return (ossl_ssize_t)l;
 }
 
 /* Threadsafe */
 static int dgram_pair_lock_both_write(struct bio_dgram_pair_st *a,
-                                      struct bio_dgram_pair_st *b)
+    struct bio_dgram_pair_st *b)
 {
     struct bio_dgram_pair_st *x, *y;
 
@@ -999,7 +997,7 @@ static int dgram_pair_lock_both_write(struct bio_dgram_pair_st *a,
 }
 
 static void dgram_pair_unlock_both(struct bio_dgram_pair_st *a,
-                                   struct bio_dgram_pair_st *b)
+    struct bio_dgram_pair_st *b)
 {
     CRYPTO_THREAD_unlock(a->lock);
     CRYPTO_THREAD_unlock(b->lock);
@@ -1049,9 +1047,9 @@ static int dgram_pair_read(BIO *bio, char *buf, int sz_)
 
 /* Threadsafe */
 static int dgram_pair_recvmmsg(BIO *bio, BIO_MSG *msg,
-                               size_t stride, size_t num_msg,
-                               uint64_t flags,
-                               size_t *num_processed)
+    size_t stride, size_t num_msg,
+    uint64_t flags,
+    size_t *num_processed)
 {
     int ret;
     ossl_ssize_t l;
@@ -1084,7 +1082,7 @@ static int dgram_pair_recvmmsg(BIO *bio, BIO_MSG *msg,
     for (i = 0; i < num_msg; ++i) {
         m = &BIO_MSG_N(msg, i);
         l = dgram_pair_read_actual(bio, m->data, m->data_len,
-                                   m->local, m->peer, 1);
+            m->local, m->peer, 1);
         if (l < 0) {
             *num_processed = i;
             if (i > 0) {
@@ -1097,7 +1095,7 @@ static int dgram_pair_recvmmsg(BIO *bio, BIO_MSG *msg,
         }
 
         m->data_len = l;
-        m->flags    = 0;
+        m->flags = 0;
     }
 
     *num_processed = i;
@@ -1167,7 +1165,7 @@ static ossl_inline size_t compute_rbuf_growth(size_t target, size_t current)
 
 /* Must hold local write lock */
 static size_t dgram_pair_write_inner(struct bio_dgram_pair_st *b,
-                                     const uint8_t *buf, size_t sz)
+    const uint8_t *buf, size_t sz)
 {
     size_t total_written = 0;
 
@@ -1203,9 +1201,9 @@ static size_t dgram_pair_write_inner(struct bio_dgram_pair_st *b,
         memcpy(dst_buf, buf, dst_len);
         ring_buf_push(&b->rbuf, dst_len);
 
-        buf             += dst_len;
-        sz              -= dst_len;
-        total_written   += dst_len;
+        buf += dst_len;
+        sz -= dst_len;
+        total_written += dst_len;
     }
 
     return total_written;
@@ -1216,13 +1214,13 @@ static size_t dgram_pair_write_inner(struct bio_dgram_pair_st *b,
  * response code.
  */
 static ossl_ssize_t dgram_pair_write_actual(BIO *bio, const char *buf, size_t sz,
-                                            const BIO_ADDR *local, const BIO_ADDR *peer,
-                                            int is_multi)
+    const BIO_ADDR *local, const BIO_ADDR *peer,
+    int is_multi)
 {
     static const BIO_ADDR zero_addr;
     size_t saved_idx, saved_count;
     struct bio_dgram_pair_st *b = bio->ptr, *readb;
-    struct dgram_hdr hdr = {0};
+    struct dgram_hdr hdr = { 0 };
 
     if (!is_multi)
         BIO_clear_retry_flags(bio);
@@ -1252,16 +1250,16 @@ static ossl_ssize_t dgram_pair_write_actual(BIO *bio, const char *buf, size_t sz
         local = b->local_addr;
     hdr.src_addr = (local != NULL ? *local : zero_addr);
 
-    saved_idx   = b->rbuf.idx[0];
+    saved_idx = b->rbuf.idx[0];
     saved_count = b->rbuf.count;
     if (dgram_pair_write_inner(b, (const uint8_t *)&hdr, sizeof(hdr)) != sizeof(hdr)
-            || dgram_pair_write_inner(b, (const uint8_t *)buf, sz) != sz) {
+        || dgram_pair_write_inner(b, (const uint8_t *)buf, sz) != sz) {
         /*
          * We were not able to push the header and the entirety of the payload
          * onto the ring buffer, so abort and roll back the ring buffer state.
          */
         b->rbuf.idx[0] = saved_idx;
-        b->rbuf.count  = saved_count;
+        b->rbuf.count = saved_count;
         if (!is_multi)
             BIO_set_retry_write(bio);
         return -BIO_R_NON_FATAL;
@@ -1301,8 +1299,8 @@ static int dgram_pair_write(BIO *bio, const char *buf, int sz_)
 
 /* Threadsafe */
 static int dgram_pair_sendmmsg(BIO *bio, BIO_MSG *msg,
-                               size_t stride, size_t num_msg,
-                               uint64_t flags, size_t *num_processed)
+    size_t stride, size_t num_msg,
+    uint64_t flags, size_t *num_processed)
 {
     ossl_ssize_t ret, l;
     BIO_MSG *m;
@@ -1323,7 +1321,7 @@ static int dgram_pair_sendmmsg(BIO *bio, BIO_MSG *msg,
     for (i = 0; i < num_msg; ++i) {
         m = &BIO_MSG_N(msg, i);
         l = dgram_pair_write_actual(bio, m->data, m->data_len,
-                                    m->local, m->peer, 1);
+            m->local, m->peer, 1);
         if (l < 0) {
             *num_processed = i;
             if (i > 0) {
diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c
index 41514589a5dda..6046dd8582e10 100644
--- a/crypto/bio/bss_fd.c
+++ b/crypto/bio/bss_fd.c
@@ -69,7 +69,7 @@ static const BIO_METHOD methods_fdp = {
     fd_ctrl,
     fd_new,
     fd_free,
-    NULL,                       /* fd_callback_ctrl */
+    NULL, /* fd_callback_ctrl */
 };
 
 const BIO_METHOD *BIO_s_fd(void)
@@ -213,7 +213,7 @@ static int fd_gets(BIO *bp, char *buf, int size)
 
     while (ptr < end && fd_read(bp, ptr, 1) > 0) {
         if (*ptr++ == '\n')
-           break;
+            break;
     }
 
     ptr[0] = '\0';
@@ -239,41 +239,41 @@ int BIO_fd_non_fatal_error(int err)
 {
     switch (err) {
 
-# ifdef EWOULDBLOCK
-#  ifdef WSAEWOULDBLOCK
-#   if WSAEWOULDBLOCK != EWOULDBLOCK
+#ifdef EWOULDBLOCK
+#ifdef WSAEWOULDBLOCK
+#if WSAEWOULDBLOCK != EWOULDBLOCK
     case EWOULDBLOCK:
-#   endif
-#  else
+#endif
+#else
     case EWOULDBLOCK:
-#  endif
-# endif
+#endif
+#endif
 
-# if defined(ENOTCONN)
+#if defined(ENOTCONN)
     case ENOTCONN:
-# endif
+#endif
 
-# ifdef EINTR
+#ifdef EINTR
     case EINTR:
-# endif
+#endif
 
-# ifdef EAGAIN
-#  if EWOULDBLOCK != EAGAIN
+#ifdef EAGAIN
+#if EWOULDBLOCK != EAGAIN
     case EAGAIN:
-#  endif
-# endif
+#endif
+#endif
 
-# ifdef EPROTO
+#ifdef EPROTO
     case EPROTO:
-# endif
+#endif
 
-# ifdef EINPROGRESS
+#ifdef EINPROGRESS
     case EINPROGRESS:
-# endif
+#endif
 
-# ifdef EALREADY
+#ifdef EALREADY
     case EALREADY:
-# endif
+#endif
         return 1;
     default:
         break;
diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 2743a14417cf0..c5bdda498bd0e 100644
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -20,9 +20,9 @@
  * of 32-bit platforms which allow for sequential access of large files
  * without extra "magic" comprise *BSD, Darwin, IRIX...
  */
-# ifndef _FILE_OFFSET_BITS
-#  define _FILE_OFFSET_BITS 64
-# endif
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
+#endif
 #endif
 
 #include <stdio.h>
@@ -51,12 +51,12 @@ static const BIO_METHOD methods_filep = {
     file_ctrl,
     file_new,
     file_free,
-    NULL,                      /* file_callback_ctrl */
+    NULL, /* file_callback_ctrl */
 };
 
 BIO *BIO_new_file(const char *filename, const char *mode)
 {
-    BIO  *ret;
+    BIO *ret;
     FILE *file = openssl_fopen(filename, mode);
     int fp_flags = BIO_CLOSE;
 
@@ -65,13 +65,13 @@ BIO *BIO_new_file(const char *filename, const char *mode)
 
     if (file == NULL) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling fopen(%s, %s)",
-                       filename, mode);
+            "calling fopen(%s, %s)",
+            filename, mode);
         if (errno == ENOENT
 #ifdef ENXIO
             || errno == ENXIO
 #endif
-            )
+        )
             ERR_raise(ERR_LIB_BIO, BIO_R_NO_SUCH_FILE);
         else
             ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB);
@@ -144,9 +144,10 @@ static int file_read(BIO *b, char *out, int outl)
             ret = fread(out, 1, (int)outl, (FILE *)b->ptr);
         if (ret == 0
             && (b->flags & BIO_FLAGS_UPLINK_INTERNAL
-                ? UP_ferror((FILE *)b->ptr) : ferror((FILE *)b->ptr))) {
+                    ? UP_ferror((FILE *)b->ptr)
+                    : ferror((FILE *)b->ptr))) {
             ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                           "calling fread()");
+                "calling fread()");
             ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB);
             ret = -1;
         }
@@ -209,33 +210,32 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
         b->shutdown = (int)num & BIO_CLOSE;
         b->ptr = ptr;
         b->init = 1;
-# if BIO_FLAGS_UPLINK_INTERNAL!=0
-#  if defined(__MINGW32__) && defined(__MSVCRT__) && !defined(_IOB_ENTRIES)
-#   define _IOB_ENTRIES 20
-#  endif
+#if BIO_FLAGS_UPLINK_INTERNAL != 0
+#if defined(__MINGW32__) && defined(__MSVCRT__) && !defined(_IOB_ENTRIES)
+#define _IOB_ENTRIES 20
+#endif
         /* Safety net to catch purely internal BIO_set_fp calls */
-#  if (defined(_MSC_VER) && _MSC_VER>=1900) || defined(__BORLANDC__)
+#if (defined(_MSC_VER) && _MSC_VER >= 1900) || defined(__BORLANDC__)
         if (ptr == stdin || ptr == stdout || ptr == stderr)
             BIO_clear_flags(b, BIO_FLAGS_UPLINK_INTERNAL);
-#  elif defined(_IOB_ENTRIES)
-        if ((size_t)ptr >= (size_t)stdin &&
-            (size_t)ptr < (size_t)(stdin + _IOB_ENTRIES))
+#elif defined(_IOB_ENTRIES)
+        if ((size_t)ptr >= (size_t)stdin && (size_t)ptr < (size_t)(stdin + _IOB_ENTRIES))
             BIO_clear_flags(b, BIO_FLAGS_UPLINK_INTERNAL);
-#  endif
-# endif
-# ifdef UP_fsetmod
+#endif
+#endif
+#ifdef UP_fsetmod
         if (b->flags & BIO_FLAGS_UPLINK_INTERNAL)
             UP_fsetmod(b->ptr, (char)((num & BIO_FP_TEXT) ? 't' : 'b'));
         else
-# endif
+#endif
         {
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
             int fd = _fileno((FILE *)ptr);
             if (num & BIO_FP_TEXT)
                 _setmode(fd, _O_TEXT);
             else
                 _setmode(fd, _O_BINARY);
-# elif defined(OPENSSL_SYS_MSDOS)
+#elif defined(OPENSSL_SYS_MSDOS)
             int fd = fileno((FILE *)ptr);
             /* Set correct text/binary mode */
             if (num & BIO_FP_TEXT)
@@ -248,11 +248,11 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
                 } else
                     _setmode(fd, _O_BINARY);
             }
-# elif defined(OPENSSL_SYS_WIN32_CYGWIN)
+#elif defined(OPENSSL_SYS_WIN32_CYGWIN)
             int fd = fileno((FILE *)ptr);
             if (!(num & BIO_FP_TEXT))
                 setmode(fd, O_BINARY);
-# endif
+#endif
         }
         break;
     case BIO_C_SET_FILENAME:
@@ -274,20 +274,20 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
             ret = 0;
             break;
         }
-# if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS)
         if (!(num & BIO_FP_TEXT))
             OPENSSL_strlcat(p, "b", sizeof(p));
         else
             OPENSSL_strlcat(p, "t", sizeof(p));
-# elif defined(OPENSSL_SYS_WIN32_CYGWIN)
+#elif defined(OPENSSL_SYS_WIN32_CYGWIN)
         if (!(num & BIO_FP_TEXT))
             OPENSSL_strlcat(p, "b", sizeof(p));
-# endif
+#endif
         fp = openssl_fopen(ptr, p);
         if (fp == NULL) {
             ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                           "calling fopen(%s, %s)",
-                           ptr, p);
+                "calling fopen(%s, %s)",
+                (const char *)ptr, p);
             ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB);
             ret = 0;
             break;
@@ -312,10 +312,11 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
         break;
     case BIO_CTRL_FLUSH:
         st = b->flags & BIO_FLAGS_UPLINK_INTERNAL
-                ? UP_fflush(b->ptr) : fflush((FILE *)b->ptr);
+            ? UP_fflush(b->ptr)
+            : fflush((FILE *)b->ptr);
         if (st == EOF) {
             ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                           "calling fflush()");
+                "calling fflush()");
             ERR_raise(ERR_LIB_BIO, ERR_R_SYS_LIB);
             ret = 0;
         }
@@ -349,7 +350,7 @@ static int file_gets(BIO *bp, char *buf, int size)
     }
     if (buf[0] != '\0')
         ret = strlen(buf);
- err:
+err:
     return ret;
 }
 
@@ -405,7 +406,7 @@ static const BIO_METHOD methods_filep = {
     file_ctrl,
     file_new,
     file_free,
-    NULL,                      /* file_callback_ctrl */
+    NULL, /* file_callback_ctrl */
 };
 
 const BIO_METHOD *BIO_s_file(void)
@@ -418,4 +419,4 @@ BIO *BIO_new_file(const char *filename, const char *mode)
     return NULL;
 }
 
-#endif                         /* OPENSSL_NO_STDIO */
+#endif /* OPENSSL_NO_STDIO */
diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index f587cab2f8336..8f8e180468e12 100644
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -25,26 +25,26 @@
 #if defined(OPENSSL_SYS_WINCE)
 #elif defined(OPENSSL_SYS_WIN32)
 #elif defined(__wasi__)
-# define NO_SYSLOG
+#define NO_SYSLOG
 #elif defined(OPENSSL_SYS_VMS)
-# include <opcdef.h>
-# include <descrip.h>
-# include <lib$routines.h>
-# include <starlet.h>
+#include <opcdef.h>
+#include <descrip.h>
+#include <lib$routines.h>
+#include <starlet.h>
 /* Some compiler options may mask the declaration of "_malloc32". */
-# if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
-#  if __INITIAL_POINTER_SIZE == 64
-#   pragma pointer_size save
-#   pragma pointer_size 32
+#if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
+#if __INITIAL_POINTER_SIZE == 64
+#pragma pointer_size save
+#pragma pointer_size 32
 void *_malloc32(__size_t);
-#   pragma pointer_size restore
-#  endif                        /* __INITIAL_POINTER_SIZE == 64 */
-# endif                         /* __INITIAL_POINTER_SIZE && defined
-                                 * _ANSI_C_SOURCE */
+#pragma pointer_size restore
+#endif /* __INITIAL_POINTER_SIZE == 64 */
+#endif /* __INITIAL_POINTER_SIZE && defined \
+        * _ANSI_C_SOURCE */
 #elif defined(__DJGPP__) && defined(OPENSSL_NO_SOCK)
-# define NO_SYSLOG
+#define NO_SYSLOG
 #elif (!defined(MSDOS) || defined(WATT32)) && !defined(OPENSSL_SYS_VXWORKS) && !defined(NO_SYSLOG)
-# include <syslog.h>
+#include <syslog.h>
 #endif
 
 #include <openssl/buffer.h>
@@ -52,30 +52,30 @@ void *_malloc32(__size_t);
 
 #ifndef NO_SYSLOG
 
-# if defined(OPENSSL_SYS_WIN32)
-#  define LOG_EMERG       0
-#  define LOG_ALERT       1
-#  define LOG_CRIT        2
-#  define LOG_ERR         3
-#  define LOG_WARNING     4
-#  define LOG_NOTICE      5
-#  define LOG_INFO        6
-#  define LOG_DEBUG       7
-
-#  define LOG_DAEMON      (3<<3)
-# elif defined(OPENSSL_SYS_VMS)
+#if defined(OPENSSL_SYS_WIN32)
+#define LOG_EMERG 0
+#define LOG_ALERT 1
+#define LOG_CRIT 2
+#define LOG_ERR 3
+#define LOG_WARNING 4
+#define LOG_NOTICE 5
+#define LOG_INFO 6
+#define LOG_DEBUG 7
+
+#define LOG_DAEMON (3 << 3)
+#elif defined(OPENSSL_SYS_VMS)
 /* On VMS, we don't really care about these, but we need them to compile */
-#  define LOG_EMERG       0
-#  define LOG_ALERT       1
-#  define LOG_CRIT        2
-#  define LOG_ERR         3
-#  define LOG_WARNING     4
-#  define LOG_NOTICE      5
-#  define LOG_INFO        6
-#  define LOG_DEBUG       7
-
-#  define LOG_DAEMON      OPC$M_NM_NTWORK
-# endif
+#define LOG_EMERG 0
+#define LOG_ALERT 1
+#define LOG_CRIT 2
+#define LOG_ERR 3
+#define LOG_WARNING 4
+#define LOG_NOTICE 5
+#define LOG_INFO 6
+#define LOG_DEBUG 7
+
+#define LOG_DAEMON OPC$M_NM_NTWORK
+#endif
 
 static int slg_write(BIO *h, const char *buf, int num);
 static int slg_puts(BIO *h, const char *str);
@@ -91,14 +91,14 @@ static const BIO_METHOD methods_slg = {
     "syslog",
     bwrite_conv,
     slg_write,
-    NULL,                      /* slg_write_old,    */
-    NULL,                      /* slg_read,         */
+    NULL, /* slg_write_old,    */
+    NULL, /* slg_read,         */
     slg_puts,
     NULL,
     slg_ctrl,
     slg_new,
     slg_free,
-    NULL,                      /* slg_callback_ctrl */
+    NULL, /* slg_callback_ctrl */
 };
 
 const BIO_METHOD *BIO_s_log(void)
@@ -134,66 +134,26 @@ static int slg_write(BIO *b, const char *in, int inl)
         char str[10];
         int log_level;
     } mapping[] = {
-        {
-            6, "PANIC ", LOG_EMERG
-        },
-        {
-            6, "EMERG ", LOG_EMERG
-        },
-        {
-            4, "EMR ", LOG_EMERG
-        },
-        {
-            6, "ALERT ", LOG_ALERT
-        },
-        {
-            4, "ALR ", LOG_ALERT
-        },
-        {
-            5, "CRIT ", LOG_CRIT
-        },
-        {
-            4, "CRI ", LOG_CRIT
-        },
-        {
-            6, "ERROR ", LOG_ERR
-        },
-        {
-            4, "ERR ", LOG_ERR
-        },
-        {
-            8, "WARNING ", LOG_WARNING
-        },
-        {
-            5, "WARN ", LOG_WARNING
-        },
-        {
-            4, "WAR ", LOG_WARNING
-        },
-        {
-            7, "NOTICE ", LOG_NOTICE
-        },
-        {
-            5, "NOTE ", LOG_NOTICE
-        },
-        {
-            4, "NOT ", LOG_NOTICE
-        },
-        {
-            5, "INFO ", LOG_INFO
-        },
-        {
-            4, "INF ", LOG_INFO
-        },
-        {
-            6, "DEBUG ", LOG_DEBUG
-        },
-        {
-            4, "DBG ", LOG_DEBUG
-        },
-        {
-            0, "", LOG_ERR
-        }
+        { 6, "PANIC ", LOG_EMERG },
+        { 6, "EMERG ", LOG_EMERG },
+        { 4, "EMR ", LOG_EMERG },
+        { 6, "ALERT ", LOG_ALERT },
+        { 4, "ALR ", LOG_ALERT },
+        { 5, "CRIT ", LOG_CRIT },
+        { 4, "CRI ", LOG_CRIT },
+        { 6, "ERROR ", LOG_ERR },
+        { 4, "ERR ", LOG_ERR },
+        { 8, "WARNING ", LOG_WARNING },
+        { 5, "WARN ", LOG_WARNING },
+        { 4, "WAR ", LOG_WARNING },
+        { 7, "NOTICE ", LOG_NOTICE },
+        { 5, "NOTE ", LOG_NOTICE },
+        { 4, "NOT ", LOG_NOTICE },
+        { 5, "INFO ", LOG_INFO },
+        { 4, "INF ", LOG_INFO },
+        { 6, "DEBUG ", LOG_DEBUG },
+        { 4, "DBG ", LOG_DEBUG },
+        { 0, "", LOG_ERR }
         /* The default */
     };
 
@@ -238,7 +198,7 @@ static int slg_puts(BIO *bp, const char *str)
     return ret;
 }
 
-# if defined(OPENSSL_SYS_WIN32)
+#if defined(OPENSSL_SYS_WIN32)
 
 static void xopenlog(BIO *bp, char *name, int level)
 {
@@ -291,11 +251,11 @@ static void xsyslog(BIO *bp, int priority, const char *string)
 static void xcloselog(BIO *bp)
 {
     if (bp->ptr)
-        DeregisterEventSource((HANDLE) (bp->ptr));
+        DeregisterEventSource((HANDLE)(bp->ptr));
     bp->ptr = NULL;
 }
 
-# elif defined(OPENSSL_SYS_VMS)
+#elif defined(OPENSSL_SYS_VMS)
 
 static int VMS_OPC_target = LOG_DAEMON;
 
@@ -309,21 +269,21 @@ static void xsyslog(BIO *bp, int priority, const char *string)
     struct dsc$descriptor_s opc_dsc;
 
 /* Arrange 32-bit pointer to opcdef buffer and malloc(), if needed. */
-#  if __INITIAL_POINTER_SIZE == 64
-#   pragma pointer_size save
-#   pragma pointer_size 32
-#   define OPCDEF_TYPE __char_ptr32
-#   define OPCDEF_MALLOC _malloc32
-#  else                         /* __INITIAL_POINTER_SIZE == 64 */
-#   define OPCDEF_TYPE char *
-#   define OPCDEF_MALLOC OPENSSL_malloc
-#  endif                        /* __INITIAL_POINTER_SIZE == 64 [else] */
+#if __INITIAL_POINTER_SIZE == 64
+#pragma pointer_size save
+#pragma pointer_size 32
+#define OPCDEF_TYPE __char_ptr32
+#define OPCDEF_MALLOC _malloc32
+#else /* __INITIAL_POINTER_SIZE == 64 */
+#define OPCDEF_TYPE char *
+#define OPCDEF_MALLOC OPENSSL_malloc
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
 
     struct opcdef *opcdef_p;
 
-#  if __INITIAL_POINTER_SIZE == 64
-#   pragma pointer_size restore
-#  endif                        /* __INITIAL_POINTER_SIZE == 64 */
+#if __INITIAL_POINTER_SIZE == 64
+#pragma pointer_size restore
+#endif /* __INITIAL_POINTER_SIZE == 64 */
 
     char buf[10240];
     unsigned int len;
@@ -374,7 +334,7 @@ static void xsyslog(BIO *bp, int priority, const char *string)
 
     opc_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
     opc_dsc.dsc$b_class = DSC$K_CLASS_S;
-    opc_dsc.dsc$a_pointer = (OPCDEF_TYPE) opcdef_p;
+    opc_dsc.dsc$a_pointer = (OPCDEF_TYPE)opcdef_p;
     opc_dsc.dsc$w_length = len + 8;
 
     sys$sndopr(opc_dsc, 0);
@@ -386,15 +346,15 @@ static void xcloselog(BIO *bp)
 {
 }
 
-# else                          /* Unix/Watt32 */
+#else /* Unix/Watt32 */
 
 static void xopenlog(BIO *bp, char *name, int level)
 {
-#  ifdef WATT32                 /* djgpp/DOS */
+#ifdef WATT32 /* djgpp/DOS */
     openlog(name, LOG_PID | LOG_CONS | LOG_NDELAY, level);
-#  else
+#else
     openlog(name, LOG_PID | LOG_CONS, level);
-#  endif
+#endif
 }
 
 static void xsyslog(BIO *bp, int priority, const char *string)
@@ -407,11 +367,11 @@ static void xcloselog(BIO *bp)
     closelog();
 }
 
-# endif                         /* Unix */
+#endif /* Unix */
 
-#else                           /* NO_SYSLOG */
+#else /* NO_SYSLOG */
 const BIO_METHOD *BIO_s_log(void)
 {
     return NULL;
 }
-#endif                          /* NO_SYSLOG */
+#endif /* NO_SYSLOG */
diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c
index 8cbea38a9021a..4b21025c38b56 100644
--- a/crypto/bio/bss_mem.c
+++ b/crypto/bio/bss_mem.c
@@ -35,7 +35,7 @@ static const BIO_METHOD mem_method = {
     mem_ctrl,
     mem_new,
     mem_free,
-    NULL,                      /* mem_callback_ctrl */
+    NULL, /* mem_callback_ctrl */
 };
 
 static const BIO_METHOD secmem_method = {
@@ -50,7 +50,7 @@ static const BIO_METHOD secmem_method = {
     mem_ctrl,
     secmem_new,
     mem_free,
-    NULL,                      /* mem_callback_ctrl */
+    NULL, /* mem_callback_ctrl */
 };
 
 /*
@@ -60,7 +60,7 @@ static const BIO_METHOD secmem_method = {
  * to be used for reset.
  */
 typedef struct bio_buf_mem_st {
-    struct buf_mem_st *buf;   /* allocated buffer */
+    struct buf_mem_st *buf; /* allocated buffer */
     struct buf_mem_st *readp; /* read pointer */
 } BIO_BUF_MEM;
 
@@ -235,7 +235,7 @@ static int mem_write(BIO *b, const char *in, int inl)
     memcpy(bbm->buf->data + blen, in, inl);
     *bbm->readp = *bbm->buf;
     ret = inl;
- end:
+end:
     return ret;
 }
 
@@ -244,7 +244,7 @@ static long mem_ctrl(BIO *b, int cmd, long num, void *ptr)
     long ret = 1;
     char **pptr;
     BIO_BUF_MEM *bbm = (BIO_BUF_MEM *)b->ptr;
-    BUF_MEM *bm, *bo;            /* bio_mem, bio_other */
+    BUF_MEM *bm, *bo; /* bio_mem, bio_other */
     long off, remain;
 
     if (b->flags & BIO_FLAGS_MEM_RDONLY) {
@@ -275,7 +275,7 @@ static long mem_ctrl(BIO *b, int cmd, long num, void *ptr)
         break;
     case BIO_C_FILE_SEEK:
         if (num < 0 || num > off + remain)
-            return -1;   /* Can't see outside of the current buffer */
+            return -1; /* Can't see outside of the current buffer */
 
         bm->data = (num != 0) ? bo->data + num : bo->data;
         bm->length = bo->length - num;
diff --git a/crypto/bio/bss_null.c b/crypto/bio/bss_null.c
index ba266f186c218..96ecdabcc4eb5 100644
--- a/crypto/bio/bss_null.c
+++ b/crypto/bio/bss_null.c
@@ -29,7 +29,7 @@ static const BIO_METHOD null_method = {
     null_ctrl,
     NULL,
     NULL,
-    NULL,                     /* null_callback_ctrl */
+    NULL, /* null_callback_ctrl */
 };
 
 const BIO_METHOD *BIO_s_null(void)
diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index 82f7be85ae0c3..70a538c2a5093 100644
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -16,17 +16,17 @@
 
 #ifndef OPENSSL_NO_SOCK
 
-# include <openssl/bio.h>
+#include <openssl/bio.h>
 
-# ifdef WATT32
+#ifdef WATT32
 /* Watt-32 uses same names */
-#  undef sock_write
-#  undef sock_read
-#  undef sock_puts
-#  define sock_write SockWrite
-#  define sock_read  SockRead
-#  define sock_puts  SockPuts
-# endif
+#undef sock_write
+#undef sock_read
+#undef sock_puts
+#define sock_write SockWrite
+#define sock_read SockRead
+#define sock_puts SockPuts
+#endif
 
 struct bss_sock_st {
     BIO_ADDR tfo_peer;
@@ -52,11 +52,11 @@ static const BIO_METHOD methods_sockp = {
     bread_conv,
     sock_read,
     sock_puts,
-    NULL,                       /* sock_gets,         */
+    NULL, /* sock_gets,         */
     sock_ctrl,
     sock_new,
     sock_free,
-    NULL,                       /* sock_callback_ctrl */
+    NULL, /* sock_callback_ctrl */
 };
 
 const BIO_METHOD *BIO_s_socket(void)
@@ -72,17 +72,6 @@ BIO *BIO_new_socket(int fd, int close_flag)
     if (ret == NULL)
         return NULL;
     BIO_set_fd(ret, fd, close_flag);
-# ifndef OPENSSL_NO_KTLS
-    {
-        /*
-         * The new socket is created successfully regardless of ktls_enable.
-         * ktls_enable doesn't change any functionality of the socket, except
-         * changing the setsockopt to enable the processing of ktls_start.
-         * Thus, it is not a problem to call it for non-TLS sockets.
-         */
-        ktls_enable(fd);
-    }
-# endif
     return ret;
 }
 
@@ -119,11 +108,11 @@ static int sock_read(BIO *b, char *out, int outl)
 
     if (out != NULL) {
         clear_socket_error();
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
         if (BIO_get_ktls_recv(b))
             ret = ktls_read_record(b->num, out, outl);
         else
-# endif
+#endif
             ret = readsocket(b->num, out, outl);
         BIO_clear_retry_flags(b);
         if (ret <= 0) {
@@ -139,12 +128,12 @@ static int sock_read(BIO *b, char *out, int outl)
 static int sock_write(BIO *b, const char *in, int inl)
 {
     int ret = 0;
-# if !defined(OPENSSL_NO_KTLS) || defined(OSSL_TFO_SENDTO)
+#if !defined(OPENSSL_NO_KTLS) || defined(OSSL_TFO_SENDTO)
     struct bss_sock_st *data = (struct bss_sock_st *)b->ptr;
-# endif
+#endif
 
     clear_socket_error();
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
     if (BIO_should_ktls_ctrl_msg_flag(b)) {
         unsigned char record_type = data->ktls_record_type;
         ret = ktls_send_ctrl_message(b->num, record_type, in, inl);
@@ -153,17 +142,17 @@ static int sock_write(BIO *b, const char *in, int inl)
             BIO_clear_ktls_ctrl_msg_flag(b);
         }
     } else
-# endif
-# if defined(OSSL_TFO_SENDTO)
-    if (data->tfo_first) {
+#endif
+#if defined(OSSL_TFO_SENDTO)
+        if (data->tfo_first) {
         struct bss_sock_st *data = (struct bss_sock_st *)b->ptr;
         socklen_t peerlen = BIO_ADDR_sockaddr_size(&data->tfo_peer);
 
         ret = sendto(b->num, in, inl, OSSL_TFO_SENDTO,
-                     BIO_ADDR_sockaddr(&data->tfo_peer), peerlen);
+            BIO_ADDR_sockaddr(&data->tfo_peer), peerlen);
         data->tfo_first = 0;
     } else
-# endif
+#endif
         ret = writesocket(b->num, in, inl);
     BIO_clear_retry_flags(b);
     if (ret <= 0) {
@@ -178,9 +167,9 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
     long ret = 1;
     int *ip;
     struct bss_sock_st *data = (struct bss_sock_st *)b->ptr;
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
     ktls_crypto_info_t *crypto_info;
-# endif
+#endif
 
     switch (cmd) {
     case BIO_C_SET_FD:
@@ -216,20 +205,18 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
         ret = 1;
         break;
     case BIO_CTRL_GET_RPOLL_DESCRIPTOR:
-    case BIO_CTRL_GET_WPOLL_DESCRIPTOR:
-        {
-            BIO_POLL_DESCRIPTOR *pd = ptr;
-
-            if (!b->init) {
-                ret = 0;
-                break;
-            }
+    case BIO_CTRL_GET_WPOLL_DESCRIPTOR: {
+        BIO_POLL_DESCRIPTOR *pd = ptr;
 
-            pd->type        = BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
-            pd->value.fd    = b->num;
+        if (!b->init) {
+            ret = 0;
+            break;
         }
-        break;
-# ifndef OPENSSL_NO_KTLS
+
+        pd->type = BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
+        pd->value.fd = b->num;
+    } break;
+#ifndef OPENSSL_NO_KTLS
     case BIO_CTRL_SET_KTLS:
         crypto_info = (ktls_crypto_info_t *)ptr;
         ret = ktls_start(b->num, crypto_info, num);
@@ -254,7 +241,7 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
         if (ret)
             BIO_set_ktls_zerocopy_sendfile_flag(b);
         break;
-# endif
+#endif
     case BIO_CTRL_EOF:
         ret = (b->flags & BIO_FLAGS_IN_EOF) != 0;
         break;
@@ -270,7 +257,7 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
     case BIO_C_SET_CONNECT:
         if (ptr != NULL && num == 2) {
             ret = BIO_ADDR_make(&data->tfo_peer,
-                                BIO_ADDR_sockaddr((const BIO_ADDR *)ptr));
+                BIO_ADDR_sockaddr((const BIO_ADDR *)ptr));
             if (ret)
                 data->tfo_first = 1;
         } else {
@@ -308,47 +295,47 @@ int BIO_sock_should_retry(int i)
 int BIO_sock_non_fatal_error(int err)
 {
     switch (err) {
-# if defined(OPENSSL_SYS_WINDOWS)
-#  if defined(WSAEWOULDBLOCK)
+#if defined(OPENSSL_SYS_WINDOWS)
+#if defined(WSAEWOULDBLOCK)
     case WSAEWOULDBLOCK:
-#  endif
-# endif
+#endif
+#endif
 
-# ifdef EWOULDBLOCK
-#  ifdef WSAEWOULDBLOCK
-#   if WSAEWOULDBLOCK != EWOULDBLOCK
+#ifdef EWOULDBLOCK
+#ifdef WSAEWOULDBLOCK
+#if WSAEWOULDBLOCK != EWOULDBLOCK
     case EWOULDBLOCK:
-#   endif
-#  else
+#endif
+#else
     case EWOULDBLOCK:
-#  endif
-# endif
+#endif
+#endif
 
-# if defined(ENOTCONN)
+#if defined(ENOTCONN)
     case ENOTCONN:
-# endif
+#endif
 
-# ifdef EINTR
+#ifdef EINTR
     case EINTR:
-# endif
+#endif
 
-# ifdef EAGAIN
-#  if EWOULDBLOCK != EAGAIN
+#ifdef EAGAIN
+#if EWOULDBLOCK != EAGAIN
     case EAGAIN:
-#  endif
-# endif
+#endif
+#endif
 
-# ifdef EPROTO
+#ifdef EPROTO
     case EPROTO:
-# endif
+#endif
 
-# ifdef EINPROGRESS
+#ifdef EINPROGRESS
     case EINPROGRESS:
-# endif
+#endif
 
-# ifdef EALREADY
+#ifdef EALREADY
     case EALREADY:
-# endif
+#endif
         return 1;
     default:
         break;
@@ -356,4 +343,4 @@ int BIO_sock_non_fatal_error(int err)
     return 0;
 }
 
-#endif                          /* #ifndef OPENSSL_NO_SOCK */
+#endif /* #ifndef OPENSSL_NO_SOCK */
diff --git a/crypto/bio/ossl_core_bio.c b/crypto/bio/ossl_core_bio.c
index 8d21115b652de..79fb54abd9dba 100644
--- a/crypto/bio/ossl_core_bio.c
+++ b/crypto/bio/ossl_core_bio.c
@@ -90,13 +90,13 @@ 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)
 {
     return BIO_read_ex(cb->bio, data, dlen, readbytes);
 }
 
 int ossl_core_bio_write_ex(OSSL_CORE_BIO *cb, const void *data, size_t dlen,
-                           size_t *written)
+    size_t *written)
 {
     return BIO_write_ex(cb->bio, data, dlen, written);
 }
diff --git a/crypto/bn/asm/rsaz-2k-avx512.pl b/crypto/bn/asm/rsaz-2k-avx512.pl
index 131e315324c12..27f2e9b4b9385 100644
--- a/crypto/bn/asm/rsaz-2k-avx512.pl
+++ b/crypto/bn/asm/rsaz-2k-avx512.pl
@@ -40,13 +40,15 @@
 die "can't locate x86_64-xlate.pl";
 
 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
-        =~ /GNU assembler version ([2-9]\.[0-9]+)/) {
-    $avx512ifma = ($1>=2.26);
+        =~ /GNU assembler version ([0-9]+)\.([0-9]+)/) {
+    my $ver = $1 + $2/100.0; # 3.1->3.01, 3.10->3.10
+    $avx512ifma = ($ver >= 2.26);
 }
 
 if (!$avx512ifma && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
-       `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)(?:\.([0-9]+))?/) {
-    $avx512ifma = ($1==2.11 && $2>=8) + ($1>=2.12);
+       `nasm -v 2>&1` =~ /NASM version ([0-9]+)\.([0-9]+)(?:\.([0-9]+))?/) {
+    my $ver = $1 + $2/100.0 + $3/10000.0; # 3.1.0->3.01, 3.10.1->3.1001
+    $avx512ifma = ($ver >= 2.1108);
 }
 
 if (!$avx512ifma && `$ENV{CC} -v 2>&1`
diff --git a/crypto/bn/asm/rsaz-2k-avxifma.pl b/crypto/bn/asm/rsaz-2k-avxifma.pl
index 65710eac3ec4c..ea45d2051a70c 100644
--- a/crypto/bn/asm/rsaz-2k-avxifma.pl
+++ b/crypto/bn/asm/rsaz-2k-avxifma.pl
@@ -27,10 +27,10 @@
 ( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
 die "can't locate x86_64-xlate.pl";
 
-# TODO: Find out the version of NASM that supports VEX-encoded AVX-IFMA instructions
 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
-        =~ /GNU assembler version ([2-9]\.[0-9]+)/) {
-    $avxifma = ($1>=2.40);
+        =~ /GNU assembler version ([0-9]+)\.([0-9]+)/) {
+    my $ver = $1 + $2/100.0;	# 3.1->3.01, 3.10->3.10
+    $avxifma = ($ver >= 2.40);
 }
 
 if (!$avxifma && `$ENV{CC} -v 2>&1`
@@ -39,6 +39,12 @@
     $avxifma = ($ver>=16.0);
 }
 
+if ($win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
+       `nasm -v 2>&1` =~ /NASM version ([0-9]+)\.([0-9]+)(?:\.([0-9]+))?(rc[0-9]+)?/) {
+    my $ver = $1 + $2/100.0 + $3/10000.0; # 3.1.0->3.01, 3.10.1->3.1001
+    $avxifma = ($ver > 2.16) + ($ver == 2.16 && !defined($4));
+}
+
 open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\""
     or die "can't call $xlate: $!";
 *STDOUT=*OUT;
@@ -296,34 +302,34 @@ sub amm52x20_x1_norm {
     and \$0xf, %r14
     vpsubq  .Lmask52x4(%rip), $_R0,  $T0
     shl \$5, %r14
-    vmovapd (%rdx, %r14), $T1
+    vmovapd (%rdx,%r14), $T1
     vblendvpd $T1, $T0, $_R0, $_R0
 
     shr \$4, %r13b
     and \$0xf, %r13
     vpsubq  .Lmask52x4(%rip), $_R0h,  $T0
     shl \$5, %r13
-    vmovapd (%rdx, %r13), $T1
+    vmovapd (%rdx,%r13), $T1
     vblendvpd $T1, $T0, $_R0h, $_R0h
 
     mov %r12b, %r11b
     and \$0xf, %r12
     vpsubq  .Lmask52x4(%rip), $_R1,  $T0
     shl \$5, %r12
-    vmovapd (%rdx, %r12), $T1
+    vmovapd (%rdx,%r12), $T1
     vblendvpd $T1, $T0, $_R1, $_R1
 
     shr \$4, %r11b
     and \$0xf, %r11
     vpsubq  .Lmask52x4(%rip), $_R1h,  $T0
     shl \$5, %r11
-    vmovapd (%rdx, %r11), $T1
+    vmovapd (%rdx,%r11), $T1
     vblendvpd $T1, $T0, $_R1h, $_R1h
 
     and \$0xf, %r10
     vpsubq  .Lmask52x4(%rip), $_R2,  $T0
     shl \$5, %r10
-    vmovapd (%rdx, %r10), $T1
+    vmovapd (%rdx,%r10), $T1
     vblendvpd $T1, $T0, $_R2, $_R2
 
     # Add carries according to the obtained mask
diff --git a/crypto/bn/asm/rsaz-3k-avx512.pl b/crypto/bn/asm/rsaz-3k-avx512.pl
index 235268a68ad70..b2ed3e8ca7cfd 100644
--- a/crypto/bn/asm/rsaz-3k-avx512.pl
+++ b/crypto/bn/asm/rsaz-3k-avx512.pl
@@ -39,13 +39,15 @@
 die "can't locate x86_64-xlate.pl";
 
 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
-        =~ /GNU assembler version ([2-9]\.[0-9]+)/) {
-    $avx512ifma = ($1>=2.26);
+        =~ /GNU assembler version ([0-9]+)\.([0-9]+)/) {
+    my $ver = $1 + $2/100.0; # 3.1->3.01, 3.10->3.10
+    $avx512ifma = ($ver >= 2.26);
 }
 
 if (!$avx512ifma && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
-       `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)(?:\.([0-9]+))?/) {
-    $avx512ifma = ($1==2.11 && $2>=8) + ($1>=2.12);
+       `nasm -v 2>&1` =~ /NASM version ([0-9]+)\.([0-9]+)(?:\.([0-9]+))?/) {
+    my $ver = $1 + $2/100.0 + $3/10000.0; # 3.1.0->3.01, 3.10.1->3.1001
+    $avx512ifma = ($ver >= 2.1108);
 }
 
 if (!$avx512ifma && `$ENV{CC} -v 2>&1`
diff --git a/crypto/bn/asm/rsaz-3k-avxifma.pl b/crypto/bn/asm/rsaz-3k-avxifma.pl
index 64c00c10e325c..a19cb5aaa3092 100644
--- a/crypto/bn/asm/rsaz-3k-avxifma.pl
+++ b/crypto/bn/asm/rsaz-3k-avxifma.pl
@@ -27,7 +27,6 @@
 ( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
 die "can't locate x86_64-xlate.pl";
 
-# TODO: Find out the version of NASM that supports VEX-encoded AVX-IFMA instructions
 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
         =~ /GNU assembler version ([2-9]\.[0-9]+)/) {
     $avxifma = ($1>=2.40);
@@ -39,6 +38,11 @@
     $avxifma = ($ver>=16.0);
 }
 
+if ($win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
+       `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)(?:\.([0-9]+))?(rc[0-9]+)?/) {
+    $avxifma = ($1>2.16) + ($1==2.16 && ((!defined($2) && !defined($3)) || (defined($2))));
+}
+
 open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\""
     or die "can't call $xlate: $!";
 *STDOUT=*OUT;
@@ -355,56 +359,56 @@ sub amm52x30_x1_norm {
     and \$0xf, %r14
     vpsubq  .Lmask52x4(%rip), $_R0,  $T0
     shl \$5, %r14
-    vmovapd (%rdx, %r14), $T1
+    vmovapd (%rdx,%r14), $T1
     vblendvpd $T1, $T0, $_R0, $_R0
 
     shr \$4, %r10b
     and \$0xf, %r10
     vpsubq  .Lmask52x4(%rip), $_R0h,  $T0
     shl \$5, %r10
-    vmovapd (%rdx, %r10), $T1
+    vmovapd (%rdx,%r10), $T1
     vblendvpd $T1, $T0, $_R0h, $_R0h
 
     mov %r13b, %r10b
     and \$0xf, %r13
     vpsubq  .Lmask52x4(%rip), $_R1,  $T0
     shl \$5, %r13
-    vmovapd (%rdx, %r13), $T1
+    vmovapd (%rdx,%r13), $T1
     vblendvpd $T1, $T0, $_R1, $_R1
 
     shr \$4, %r10b
     and \$0xf, %r10
     vpsubq  .Lmask52x4(%rip), $_R1h,  $T0
     shl \$5, %r10
-    vmovapd (%rdx, %r10), $T1
+    vmovapd (%rdx,%r10), $T1
     vblendvpd $T1, $T0, $_R1h, $_R1h
 
     mov %r12b, %r10b
     and \$0xf, %r12
     vpsubq  .Lmask52x4(%rip), $_R2,  $T0
     shl \$5, %r12
-    vmovapd (%rdx, %r12), $T1
+    vmovapd (%rdx,%r12), $T1
     vblendvpd $T1, $T0, $_R2, $_R2
 
     shr \$4, %r10b
     and \$0xf, %r10
     vpsubq  .Lmask52x4(%rip), $_R2h,  $T0
     shl \$5, %r10
-    vmovapd (%rdx, %r10), $T1
+    vmovapd (%rdx,%r10), $T1
     vblendvpd $T1, $T0, $_R2h, $_R2h
 
     mov %r11b, %r10b
     and \$0xf, %r11
     vpsubq  .Lmask52x4(%rip), $_R3,  $T0
     shl \$5, %r11
-    vmovapd (%rdx, %r11), $T1
+    vmovapd (%rdx,%r11), $T1
     vblendvpd $T1, $T0, $_R3, $_R3
 
     shr \$4, %r10b
     and \$0xf, %r10
     vpsubq  .Lmask52x4(%rip), $_R3h,  $T0
     shl \$5, %r10
-    vmovapd (%rdx, %r10), $T1
+    vmovapd (%rdx,%r10), $T1
     vblendvpd $T1, $T0, $_R3h, $_R3h
 
     vpand  .Lmask52x4(%rip), $_R0,  $_R0
diff --git a/crypto/bn/asm/rsaz-4k-avx512.pl b/crypto/bn/asm/rsaz-4k-avx512.pl
index e39374362b6eb..b76ab5904c887 100644
--- a/crypto/bn/asm/rsaz-4k-avx512.pl
+++ b/crypto/bn/asm/rsaz-4k-avx512.pl
@@ -39,13 +39,15 @@
 die "can't locate x86_64-xlate.pl";
 
 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
-        =~ /GNU assembler version ([2-9]\.[0-9]+)/) {
-    $avx512ifma = ($1>=2.26);
+        =~ /GNU assembler version ([0-9]+)\.([0-9]+)/) {
+    my $ver = $1 + $2/100.0; # 3.1->3.01, 3.10->3.10
+    $avx512ifma = ($ver >= 2.26);
 }
 
 if (!$avx512ifma && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
-       `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)(?:\.([0-9]+))?/) {
-    $avx512ifma = ($1==2.11 && $2>=8) + ($1>=2.12);
+       `nasm -v 2>&1` =~ /NASM version ([0-9]+)\.([0-9]+)(?:\.([0-9]+))?/) {
+    my $ver = $1 + $2/100.0 + $3/10000.0; # 3.1.0->3.01, 3.10.1->3.1001
+    $avx512ifma = ($ver >= 2.1108);
 }
 
 if (!$avx512ifma && `$ENV{CC} -v 2>&1`
diff --git a/crypto/bn/asm/rsaz-4k-avxifma.pl b/crypto/bn/asm/rsaz-4k-avxifma.pl
index 5de6a4c4c2b2f..f15e2d74118cb 100644
--- a/crypto/bn/asm/rsaz-4k-avxifma.pl
+++ b/crypto/bn/asm/rsaz-4k-avxifma.pl
@@ -27,7 +27,6 @@
 ( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
 die "can't locate x86_64-xlate.pl";
 
-# TODO: Find out the version of NASM that supports VEX-encoded AVX-IFMA instructions
 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
         =~ /GNU assembler version ([2-9]\.[0-9]+)/) {
     $avxifma = ($1>=2.40);
@@ -39,6 +38,11 @@
     $avxifma = ($ver>=16.0);
 }
 
+if ($win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
+       `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)(?:\.([0-9]+))?(rc[0-9]+)?/) {
+    $avxifma = ($1>2.16) + ($1==2.16 && ((!defined($2) && !defined($3)) || (defined($2))));
+}
+
 open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\""
     or die "can't call $xlate: $!";
 *STDOUT=*OUT;
@@ -424,70 +428,70 @@ sub amm52x40_x1_norm {
     and \$0xf, %r14
     vpsubq  .Lmask52x4(%rip), $_R0,  $tmp
     shl \$5, %r14
-    vmovapd (%r8, %r14), $tmp2
+    vmovapd (%r8,%r14), $tmp2
     vblendvpd $tmp2, $tmp, $_R0, $_R0
 
     shr \$4, %r9b
     and \$0xf, %r9
     vpsubq  .Lmask52x4(%rip), $_R0h,  $tmp
     shl \$5, %r9
-    vmovapd (%r8, %r9), $tmp2
+    vmovapd (%r8,%r9), $tmp2
     vblendvpd $tmp2, $tmp, $_R0h, $_R0h
 
     movb    %r13b,%r9b
     and \$0xf, %r13
     vpsubq  .Lmask52x4(%rip), $_R1,  $tmp
     shl \$5, %r13
-    vmovapd (%r8, %r13), $tmp2
+    vmovapd (%r8,%r13), $tmp2
     vblendvpd $tmp2, $tmp, $_R1, $_R1
 
     shr \$4, %r9b
     and \$0xf, %r9
     vpsubq  .Lmask52x4(%rip), $_R1h,  $tmp
     shl \$5, %r9
-    vmovapd (%r8, %r9), $tmp2
+    vmovapd (%r8,%r9), $tmp2
     vblendvpd $tmp2, $tmp, $_R1h, $_R1h
 
     movb    %r12b,%r9b
     and \$0xf, %r12
     vpsubq  .Lmask52x4(%rip), $_R2,  $tmp
     shl \$5, %r12
-    vmovapd (%r8, %r12), $tmp2
+    vmovapd (%r8,%r12), $tmp2
     vblendvpd $tmp2, $tmp, $_R2, $_R2
 
     shr \$4, %r9b
     and \$0xf, %r9
     vpsubq  .Lmask52x4(%rip), $_R2h,  $tmp
     shl \$5, %r9
-    vmovapd (%r8, %r9), $tmp2
+    vmovapd (%r8,%r9), $tmp2
     vblendvpd $tmp2, $tmp, $_R2h, $_R2h
 
     movb    %r11b,%r9b
     and \$0xf, %r11
     vpsubq  .Lmask52x4(%rip), $_R3,  $tmp
     shl \$5, %r11
-    vmovapd (%r8, %r11), $tmp2
+    vmovapd (%r8,%r11), $tmp2
     vblendvpd $tmp2, $tmp, $_R3, $_R3
 
     shr \$4, %r9b
     and \$0xf, %r9
     vpsubq  .Lmask52x4(%rip), $_R3h,  $tmp
     shl \$5, %r9
-    vmovapd (%r8, %r9), $tmp2
+    vmovapd (%r8,%r9), $tmp2
     vblendvpd $tmp2, $tmp, $_R3h, $_R3h
 
     movb    %r10b,%r9b
     and \$0xf, %r10
     vpsubq  .Lmask52x4(%rip), $_R4,  $tmp
     shl \$5, %r10
-    vmovapd (%r8, %r10), $tmp2
+    vmovapd (%r8,%r10), $tmp2
     vblendvpd $tmp2, $tmp, $_R4, $_R4
 
     shr \$4, %r9b
     and \$0xf, %r9
     vpsubq  .Lmask52x4(%rip), $_R4h,  $tmp
     shl \$5, %r9
-    vmovapd (%r8, %r9), $tmp2
+    vmovapd (%r8,%r9), $tmp2
     vblendvpd $tmp2, $tmp, $_R4h, $_R4h
 
     pop %r8
diff --git a/crypto/bn/asm/rsaz-x86_64.pl b/crypto/bn/asm/rsaz-x86_64.pl
index 36bf229477aa1..64acf8f0d84d5 100755
--- a/crypto/bn/asm/rsaz-x86_64.pl
+++ b/crypto/bn/asm/rsaz-x86_64.pl
@@ -69,13 +69,15 @@
 *STDOUT=*OUT;
 
 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
-		=~ /GNU assembler version ([2-9]\.[0-9]+)/) {
-	$addx = ($1>=2.23);
+		=~ /GNU assembler version ([0-9]+)\.([0-9]+)/) {
+	my $ver = $1 + $2/100.0;	# 3.1->3.01, 3.10->3.10
+	$addx = ($ver >= 2.23);
 }
 
 if (!$addx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
-	    `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/) {
-	$addx = ($1>=2.10);
+	    `nasm -v 2>&1` =~ /NASM version ([0-9]+)\.([0-9]+)/) {
+	my $ver = $1 + $2/100.0;	# 3.1->3.01, 3.10->3.10
+	$addx = ($ver >= 2.10);
 }
 
 if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
diff --git a/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c
index 68453b3d5276c..1e123ede77311 100644
--- a/crypto/bn/asm/x86_64-gcc.c
+++ b/crypto/bn/asm/x86_64-gcc.c
@@ -8,8 +8,10 @@
  */
 
 #include "../bn_local.h"
-#if !(defined(__GNUC__) && __GNUC__>=2)
+#if !(defined(__GNUC__) && __GNUC__ >= 2)
+/* clang-format off */
 # include "../bn_asm.c"         /* kind of dirty hack for Sun Studio */
+/* clang-format on */
 #else
 /*-
  * x86_64 BIGNUM accelerator version 0.1, December 2002.
@@ -63,52 +65,54 @@
  *    machine.
  */
 
-# undef mul
-# undef mul_add
+#undef mul
+#undef mul_add
 
 /*-
  * "m"(a), "+m"(r)      is the way to favor DirectPath µ-code;
  * "g"(0)               let the compiler to decide where does it
  *                      want to keep the value of zero;
  */
-# define mul_add(r,a,word,carry) do {   \
-        register BN_ULONG high,low;     \
-        asm ("mulq %3"                  \
-                : "=a"(low),"=d"(high)  \
-                : "a"(word),"m"(a)      \
-                : "cc");                \
-        asm ("addq %2,%0; adcq %3,%1"   \
-                : "+r"(carry),"+d"(high)\
-                : "a"(low),"g"(0)       \
-                : "cc");                \
-        asm ("addq %2,%0; adcq %3,%1"   \
-                : "+m"(r),"+d"(high)    \
-                : "r"(carry),"g"(0)     \
-                : "cc");                \
-        carry=high;                     \
-        } while (0)
-
-# define mul(r,a,word,carry) do {       \
-        register BN_ULONG high,low;     \
-        asm ("mulq %3"                  \
-                : "=a"(low),"=d"(high)  \
-                : "a"(word),"g"(a)      \
-                : "cc");                \
-        asm ("addq %2,%0; adcq %3,%1"   \
-                : "+r"(carry),"+d"(high)\
-                : "a"(low),"g"(0)       \
-                : "cc");                \
-        (r)=carry, carry=high;          \
-        } while (0)
-# undef sqr
-# define sqr(r0,r1,a)                   \
-        asm ("mulq %2"                  \
-                : "=a"(r0),"=d"(r1)     \
-                : "a"(a)                \
-                : "cc");
+#define mul_add(r, a, word, carry)    \
+    do {                              \
+        register BN_ULONG high, low;  \
+        asm("mulq %3"                 \
+            : "=a"(low), "=d"(high)   \
+            : "a"(word), "m"(a)       \
+            : "cc");                  \
+        asm("addq %2,%0; adcq %3,%1"  \
+            : "+r"(carry), "+d"(high) \
+            : "a"(low), "g"(0)        \
+            : "cc");                  \
+        asm("addq %2,%0; adcq %3,%1"  \
+            : "+m"(r), "+d"(high)     \
+            : "r"(carry), "g"(0)      \
+            : "cc");                  \
+        carry = high;                 \
+    } while (0)
+
+#define mul(r, a, word, carry)        \
+    do {                              \
+        register BN_ULONG high, low;  \
+        asm("mulq %3"                 \
+            : "=a"(low), "=d"(high)   \
+            : "a"(word), "g"(a)       \
+            : "cc");                  \
+        asm("addq %2,%0; adcq %3,%1"  \
+            : "+r"(carry), "+d"(high) \
+            : "a"(low), "g"(0)        \
+            : "cc");                  \
+        (r) = carry, carry = high;    \
+    } while (0)
+#undef sqr
+#define sqr(r0, r1, a)       \
+    asm("mulq %2"            \
+        : "=a"(r0), "=d"(r1) \
+        : "a"(a)             \
+        : "cc");
 
 BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
-                          BN_ULONG w)
+    BN_ULONG w)
 {
     BN_ULONG c1 = 0;
 
@@ -195,15 +199,15 @@ BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d)
 {
     BN_ULONG ret, waste;
 
- asm("divq      %4":"=a"(ret), "=d"(waste)
- :     "a"(l), "d"(h), "r"(d)
- :     "cc");
+    asm("divq      %4" : "=a"(ret), "=d"(waste)
+        : "a"(l), "d"(h), "r"(d)
+        : "cc");
 
     return ret;
 }
 
 BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                      int n)
+    int n)
 {
     BN_ULONG ret;
     size_t i = 0;
@@ -211,26 +215,26 @@ BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
     if (n <= 0)
         return 0;
 
-    asm volatile ("       subq    %0,%0           \n" /* clear carry */
-                  "       jmp     1f              \n"
-                  ".p2align 4                     \n"
-                  "1:     movq    (%4,%2,8),%0    \n"
-                  "       adcq    (%5,%2,8),%0    \n"
-                  "       movq    %0,(%3,%2,8)    \n"
-                  "       lea     1(%2),%2        \n"
-                  "       dec     %1              \n"
-                  "       jnz     1b              \n"
-                  "       sbbq    %0,%0           \n"
-                  :"=&r" (ret), "+c"(n), "+r"(i)
-                  :"r"(rp), "r"(ap), "r"(bp)
-                  :"cc", "memory");
+    asm volatile("       subq    %0,%0           \n" /* clear carry */
+                 "       jmp     1f              \n"
+                 ".p2align 4                     \n"
+                 "1:     movq    (%4,%2,8),%0    \n"
+                 "       adcq    (%5,%2,8),%0    \n"
+                 "       movq    %0,(%3,%2,8)    \n"
+                 "       lea     1(%2),%2        \n"
+                 "       dec     %1              \n"
+                 "       jnz     1b              \n"
+                 "       sbbq    %0,%0           \n"
+        : "=&r"(ret), "+c"(n), "+r"(i)
+        : "r"(rp), "r"(ap), "r"(bp)
+        : "cc", "memory");
 
     return ret & 1;
 }
 
-# ifndef SIMICS
+#ifndef SIMICS
 BN_ULONG bn_sub_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                      int n)
+    int n)
 {
     BN_ULONG ret;
     size_t i = 0;
@@ -238,25 +242,25 @@ BN_ULONG bn_sub_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
     if (n <= 0)
         return 0;
 
-    asm volatile ("       subq    %0,%0           \n" /* clear borrow */
-                  "       jmp     1f              \n"
-                  ".p2align 4                     \n"
-                  "1:     movq    (%4,%2,8),%0    \n"
-                  "       sbbq    (%5,%2,8),%0    \n"
-                  "       movq    %0,(%3,%2,8)    \n"
-                  "       lea     1(%2),%2        \n"
-                  "       dec     %1              \n"
-                  "       jnz     1b              \n"
-                  "       sbbq    %0,%0           \n"
-                  :"=&r" (ret), "+c"(n), "+r"(i)
-                  :"r"(rp), "r"(ap), "r"(bp)
-                  :"cc", "memory");
+    asm volatile("       subq    %0,%0           \n" /* clear borrow */
+                 "       jmp     1f              \n"
+                 ".p2align 4                     \n"
+                 "1:     movq    (%4,%2,8),%0    \n"
+                 "       sbbq    (%5,%2,8),%0    \n"
+                 "       movq    %0,(%3,%2,8)    \n"
+                 "       lea     1(%2),%2        \n"
+                 "       dec     %1              \n"
+                 "       jnz     1b              \n"
+                 "       sbbq    %0,%0           \n"
+        : "=&r"(ret), "+c"(n), "+r"(i)
+        : "r"(rp), "r"(ap), "r"(bp)
+        : "cc", "memory");
 
     return ret & 1;
 }
-# else
+#else
 /* Simics 1.4<7 has buggy sbbq:-( */
-#  define BN_MASK2 0xffffffffffffffffL
+#define BN_MASK2 0xffffffffffffffffL
 BN_ULONG bn_sub_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
 {
     BN_ULONG t1, t2;
@@ -304,7 +308,7 @@ BN_ULONG bn_sub_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
     }
     return c;
 }
-# endif
+#endif
 
 /* mul_add_c(a,b,c0,c1,c2)  -- c+=a*b for three word number c=(c2,c1,c0) */
 /* mul_add_c2(a,b,c0,c1,c2) -- c+=2*a*b for three word number c=(c2,c1,c0) */
@@ -318,77 +322,91 @@ BN_ULONG bn_sub_words(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n)
  * Keep in mind that carrying into high part of multiplication result
  * can not overflow, because it cannot be all-ones.
  */
-# if 0
+#if 0
 /* original macros are kept for reference purposes */
-#  define mul_add_c(a,b,c0,c1,c2)       do {    \
-        BN_ULONG ta = (a), tb = (b);            \
-        BN_ULONG lo, hi;                        \
-        BN_UMULT_LOHI(lo,hi,ta,tb);             \
-        c0 += lo; hi += (c0<lo)?1:0;            \
-        c1 += hi; c2 += (c1<hi)?1:0;            \
-        } while(0)
-
-#  define mul_add_c2(a,b,c0,c1,c2)      do {    \
-        BN_ULONG ta = (a), tb = (b);            \
-        BN_ULONG lo, hi, tt;                    \
-        BN_UMULT_LOHI(lo,hi,ta,tb);             \
-        c0 += lo; tt = hi+((c0<lo)?1:0);        \
-        c1 += tt; c2 += (c1<tt)?1:0;            \
-        c0 += lo; hi += (c0<lo)?1:0;            \
-        c1 += hi; c2 += (c1<hi)?1:0;            \
-        } while(0)
-
-#  define sqr_add_c(a,i,c0,c1,c2)       do {    \
-        BN_ULONG ta = (a)[i];                   \
-        BN_ULONG lo, hi;                        \
-        BN_UMULT_LOHI(lo,hi,ta,ta);             \
-        c0 += lo; hi += (c0<lo)?1:0;            \
-        c1 += hi; c2 += (c1<hi)?1:0;            \
-        } while(0)
-# else
-#  define mul_add_c(a,b,c0,c1,c2) do {  \
-        BN_ULONG t1,t2;                 \
-        asm ("mulq %3"                  \
-                : "=a"(t1),"=d"(t2)     \
-                : "a"(a),"m"(b)         \
-                : "cc");                \
-        asm ("addq %3,%0; adcq %4,%1; adcq %5,%2"       \
-                : "+r"(c0),"+r"(c1),"+r"(c2)            \
-                : "r"(t1),"r"(t2),"g"(0)                \
-                : "cc");                                \
-        } while (0)
-
-#  define sqr_add_c(a,i,c0,c1,c2) do {  \
-        BN_ULONG t1,t2;                 \
-        asm ("mulq %2"                  \
-                : "=a"(t1),"=d"(t2)     \
-                : "a"(a[i])             \
-                : "cc");                \
-        asm ("addq %3,%0; adcq %4,%1; adcq %5,%2"       \
-                : "+r"(c0),"+r"(c1),"+r"(c2)            \
-                : "r"(t1),"r"(t2),"g"(0)                \
-                : "cc");                                \
-        } while (0)
-
-#  define mul_add_c2(a,b,c0,c1,c2) do { \
-        BN_ULONG t1,t2;                 \
-        asm ("mulq %3"                  \
-                : "=a"(t1),"=d"(t2)     \
-                : "a"(a),"m"(b)         \
-                : "cc");                \
-        asm ("addq %3,%0; adcq %4,%1; adcq %5,%2"       \
-                : "+r"(c0),"+r"(c1),"+r"(c2)            \
-                : "r"(t1),"r"(t2),"g"(0)                \
-                : "cc");                                \
-        asm ("addq %3,%0; adcq %4,%1; adcq %5,%2"       \
-                : "+r"(c0),"+r"(c1),"+r"(c2)            \
-                : "r"(t1),"r"(t2),"g"(0)                \
-                : "cc");                                \
-        } while (0)
-# endif
-
-# define sqr_add_c2(a,i,j,c0,c1,c2)      \
-        mul_add_c2((a)[i],(a)[j],c0,c1,c2)
+#define mul_add_c(a, b, c0, c1, c2)    \
+    do {                               \
+        BN_ULONG ta = (a), tb = (b);   \
+        BN_ULONG lo, hi;               \
+        BN_UMULT_LOHI(lo, hi, ta, tb); \
+        c0 += lo;                      \
+        hi += (c0 < lo) ? 1 : 0;       \
+        c1 += hi;                      \
+        c2 += (c1 < hi) ? 1 : 0;       \
+    } while (0)
+
+#define mul_add_c2(a, b, c0, c1, c2)   \
+    do {                               \
+        BN_ULONG ta = (a), tb = (b);   \
+        BN_ULONG lo, hi, tt;           \
+        BN_UMULT_LOHI(lo, hi, ta, tb); \
+        c0 += lo;                      \
+        tt = hi + ((c0 < lo) ? 1 : 0); \
+        c1 += tt;                      \
+        c2 += (c1 < tt) ? 1 : 0;       \
+        c0 += lo;                      \
+        hi += (c0 < lo) ? 1 : 0;       \
+        c1 += hi;                      \
+        c2 += (c1 < hi) ? 1 : 0;       \
+    } while (0)
+
+#define sqr_add_c(a, i, c0, c1, c2)    \
+    do {                               \
+        BN_ULONG ta = (a)[i];          \
+        BN_ULONG lo, hi;               \
+        BN_UMULT_LOHI(lo, hi, ta, ta); \
+        c0 += lo;                      \
+        hi += (c0 < lo) ? 1 : 0;       \
+        c1 += hi;                      \
+        c2 += (c1 < hi) ? 1 : 0;       \
+    } while (0)
+#else
+#define mul_add_c(a, b, c0, c1, c2)              \
+    do {                                         \
+        BN_ULONG t1, t2;                         \
+        asm("mulq %3"                            \
+            : "=a"(t1), "=d"(t2)                 \
+            : "a"(a), "m"(b)                     \
+            : "cc");                             \
+        asm("addq %3,%0; adcq %4,%1; adcq %5,%2" \
+            : "+r"(c0), "+r"(c1), "+r"(c2)       \
+            : "r"(t1), "r"(t2), "g"(0)           \
+            : "cc");                             \
+    } while (0)
+
+#define sqr_add_c(a, i, c0, c1, c2)              \
+    do {                                         \
+        BN_ULONG t1, t2;                         \
+        asm("mulq %2"                            \
+            : "=a"(t1), "=d"(t2)                 \
+            : "a"(a[i])                          \
+            : "cc");                             \
+        asm("addq %3,%0; adcq %4,%1; adcq %5,%2" \
+            : "+r"(c0), "+r"(c1), "+r"(c2)       \
+            : "r"(t1), "r"(t2), "g"(0)           \
+            : "cc");                             \
+    } while (0)
+
+#define mul_add_c2(a, b, c0, c1, c2)             \
+    do {                                         \
+        BN_ULONG t1, t2;                         \
+        asm("mulq %3"                            \
+            : "=a"(t1), "=d"(t2)                 \
+            : "a"(a), "m"(b)                     \
+            : "cc");                             \
+        asm("addq %3,%0; adcq %4,%1; adcq %5,%2" \
+            : "+r"(c0), "+r"(c1), "+r"(c2)       \
+            : "r"(t1), "r"(t2), "g"(0)           \
+            : "cc");                             \
+        asm("addq %3,%0; adcq %4,%1; adcq %5,%2" \
+            : "+r"(c0), "+r"(c1), "+r"(c2)       \
+            : "r"(t1), "r"(t2), "g"(0)           \
+            : "cc");                             \
+    } while (0)
+#endif
+
+#define sqr_add_c2(a, i, j, c0, c1, c2) \
+    mul_add_c2((a)[i], (a)[j], c0, c1, c2)
 
 void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
 {
diff --git a/crypto/bn/asm/x86_64-mont5.pl b/crypto/bn/asm/x86_64-mont5.pl
index 07dd40d9228c8..e06d13d74aeae 100755
--- a/crypto/bn/asm/x86_64-mont5.pl
+++ b/crypto/bn/asm/x86_64-mont5.pl
@@ -48,13 +48,15 @@
 *STDOUT=*OUT;
 
 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
-		=~ /GNU assembler version ([2-9]\.[0-9]+)/) {
-	$addx = ($1>=2.23);
+		=~ /GNU assembler version ([0-9]+)\.([0-9]+)/) {
+	my $ver = $1 + $2/100.0;	# 3.1->3.01, 3.10->3.10
+	$addx = ($ver >= 2.23);
 }
 
 if (!$addx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
-	    `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/) {
-	$addx = ($1>=2.10);
+	    `nasm -v 2>&1` =~ /NASM version ([0-9]+)\.([0-9]+)/) {
+	my $ver = $1 + $2/100.0;	# 3.1->3.01, 3.10->3.10
+	$addx = ($ver >= 2.10);
 }
 
 if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
diff --git a/crypto/bn/bn_add.c b/crypto/bn/bn_add.c
index ae3e549e44307..38de39d1b8aca 100644
--- a/crypto/bn/bn_add.c
+++ b/crypto/bn/bn_add.c
@@ -135,7 +135,7 @@ int BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
     min = b->top;
     dif = max - min;
 
-    if (dif < 0) {              /* hmm... should not be happening */
+    if (dif < 0) { /* hmm... should not be happening */
         ERR_raise(ERR_LIB_BN, BN_R_ARG2_LT_ARG3);
         return 0;
     }
@@ -168,4 +168,3 @@ int BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
 
     return 1;
 }
-
diff --git a/crypto/bn/bn_asm.c b/crypto/bn/bn_asm.c
index c39907a7dfd36..0a77f1b070e1e 100644
--- a/crypto/bn/bn_asm.c
+++ b/crypto/bn/bn_asm.c
@@ -15,7 +15,7 @@
 #if defined(BN_LLONG) || defined(BN_UMULT_HIGH)
 
 BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
-                          BN_ULONG w)
+    BN_ULONG w)
 {
     BN_ULONG c1 = 0;
 
@@ -23,7 +23,7 @@ BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
     if (num <= 0)
         return c1;
 
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
     while (num & ~3) {
         mul_add(rp[0], ap[0], w, c1);
         mul_add(rp[1], ap[1], w, c1);
@@ -33,7 +33,7 @@ BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
         rp += 4;
         num -= 4;
     }
-# endif
+#endif
     while (num) {
         mul_add(rp[0], ap[0], w, c1);
         ap++;
@@ -52,7 +52,7 @@ BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w)
     if (num <= 0)
         return c1;
 
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
     while (num & ~3) {
         mul(rp[0], ap[0], w, c1);
         mul(rp[1], ap[1], w, c1);
@@ -62,7 +62,7 @@ BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w)
         rp += 4;
         num -= 4;
     }
-# endif
+#endif
     while (num) {
         mul(rp[0], ap[0], w, c1);
         ap++;
@@ -78,7 +78,7 @@ void bn_sqr_words(BN_ULONG *r, const BN_ULONG *a, int n)
     if (n <= 0)
         return;
 
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
     while (n & ~3) {
         sqr(r[0], r[1], a[0]);
         sqr(r[2], r[3], a[1]);
@@ -88,7 +88,7 @@ void bn_sqr_words(BN_ULONG *r, const BN_ULONG *a, int n)
         r += 8;
         n -= 4;
     }
-# endif
+#endif
     while (n) {
         sqr(r[0], r[1], a[0]);
         a++;
@@ -97,11 +97,11 @@ void bn_sqr_words(BN_ULONG *r, const BN_ULONG *a, int n)
     }
 }
 
-#else                           /* !(defined(BN_LLONG) ||
-                                 * defined(BN_UMULT_HIGH)) */
+#else /* !(defined(BN_LLONG) || \
+       * defined(BN_UMULT_HIGH)) */
 
 BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
-                          BN_ULONG w)
+    BN_ULONG w)
 {
     BN_ULONG c = 0;
     BN_ULONG bl, bh;
@@ -113,7 +113,7 @@ BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
     bl = LBITS(w);
     bh = HBITS(w);
 
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
     while (num & ~3) {
         mul_add(rp[0], ap[0], bl, bh, c);
         mul_add(rp[1], ap[1], bl, bh, c);
@@ -123,7 +123,7 @@ BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
         rp += 4;
         num -= 4;
     }
-# endif
+#endif
     while (num) {
         mul_add(rp[0], ap[0], bl, bh, c);
         ap++;
@@ -145,7 +145,7 @@ BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w)
     bl = LBITS(w);
     bh = HBITS(w);
 
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
     while (num & ~3) {
         mul(rp[0], ap[0], bl, bh, carry);
         mul(rp[1], ap[1], bl, bh, carry);
@@ -155,7 +155,7 @@ BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w)
         rp += 4;
         num -= 4;
     }
-# endif
+#endif
     while (num) {
         mul(rp[0], ap[0], bl, bh, carry);
         ap++;
@@ -171,7 +171,7 @@ void bn_sqr_words(BN_ULONG *r, const BN_ULONG *a, int n)
     if (n <= 0)
         return;
 
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
     while (n & ~3) {
         sqr64(r[0], r[1], a[0]);
         sqr64(r[2], r[3], a[1]);
@@ -181,7 +181,7 @@ void bn_sqr_words(BN_ULONG *r, const BN_ULONG *a, int n)
         r += 8;
         n -= 4;
     }
-# endif
+#endif
     while (n) {
         sqr64(r[0], r[1], a[0]);
         a++;
@@ -190,14 +190,14 @@ void bn_sqr_words(BN_ULONG *r, const BN_ULONG *a, int n)
     }
 }
 
-#endif                          /* !(defined(BN_LLONG) ||
-                                 * defined(BN_UMULT_HIGH)) */
+#endif /* !(defined(BN_LLONG) || \
+        * defined(BN_UMULT_HIGH)) */
 
 #if defined(BN_LLONG) && defined(BN_DIV2W)
 
 BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d)
 {
-    return ((BN_ULONG)(((((BN_ULLONG) h) << BN_BITS2) | l) / (BN_ULLONG) d));
+    return ((BN_ULONG)(((((BN_ULLONG)h) << BN_BITS2) | l) / (BN_ULLONG)d));
 }
 
 #else
@@ -236,8 +236,7 @@ BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d)
         tl = dl * q;
         for (;;) {
             t = h - th;
-            if ((t & BN_MASK2h) ||
-                ((tl) <= ((t << BN_BITS4) | ((l & BN_MASK2h) >> BN_BITS4))))
+            if ((t & BN_MASK2h) || ((tl) <= ((t << BN_BITS4) | ((l & BN_MASK2h) >> BN_BITS4))))
                 break;
             q--;
             th -= dh;
@@ -266,11 +265,11 @@ BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d)
     ret |= q;
     return ret;
 }
-#endif                          /* !defined(BN_LLONG) && defined(BN_DIV2W) */
+#endif /* !defined(BN_LLONG) && defined(BN_DIV2W) */
 
 #ifdef BN_LLONG
 BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
-                      int n)
+    int n)
 {
     BN_ULLONG ll = 0;
 
@@ -278,18 +277,18 @@ BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
     if (n <= 0)
         return (BN_ULONG)0;
 
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
     while (n & ~3) {
-        ll += (BN_ULLONG) a[0] + b[0];
+        ll += (BN_ULLONG)a[0] + b[0];
         r[0] = (BN_ULONG)ll & BN_MASK2;
         ll >>= BN_BITS2;
-        ll += (BN_ULLONG) a[1] + b[1];
+        ll += (BN_ULLONG)a[1] + b[1];
         r[1] = (BN_ULONG)ll & BN_MASK2;
         ll >>= BN_BITS2;
-        ll += (BN_ULLONG) a[2] + b[2];
+        ll += (BN_ULLONG)a[2] + b[2];
         r[2] = (BN_ULONG)ll & BN_MASK2;
         ll >>= BN_BITS2;
-        ll += (BN_ULLONG) a[3] + b[3];
+        ll += (BN_ULLONG)a[3] + b[3];
         r[3] = (BN_ULONG)ll & BN_MASK2;
         ll >>= BN_BITS2;
         a += 4;
@@ -297,9 +296,9 @@ BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
         r += 4;
         n -= 4;
     }
-# endif
+#endif
     while (n) {
-        ll += (BN_ULLONG) a[0] + b[0];
+        ll += (BN_ULLONG)a[0] + b[0];
         r[0] = (BN_ULONG)ll & BN_MASK2;
         ll >>= BN_BITS2;
         a++;
@@ -309,9 +308,9 @@ BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
     }
     return (BN_ULONG)ll;
 }
-#else                           /* !BN_LLONG */
+#else /* !BN_LLONG */
 BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
-                      int n)
+    int n)
 {
     BN_ULONG c, l, t;
 
@@ -320,7 +319,7 @@ BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
         return (BN_ULONG)0;
 
     c = 0;
-# ifndef OPENSSL_SMALL_FOOTPRINT
+#ifndef OPENSSL_SMALL_FOOTPRINT
     while (n & ~3) {
         t = a[0];
         t = (t + c) & BN_MASK2;
@@ -351,7 +350,7 @@ BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
         r += 4;
         n -= 4;
     }
-# endif
+#endif
     while (n) {
         t = a[0];
         t = (t + c) & BN_MASK2;
@@ -366,10 +365,10 @@ BN_ULONG bn_add_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
     }
     return (BN_ULONG)c;
 }
-#endif                          /* !BN_LLONG */
+#endif /* !BN_LLONG */
 
 BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
-                      int n)
+    int n)
 {
     BN_ULONG t1, t2;
     int c = 0;
@@ -382,28 +381,28 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
     while (n & ~3) {
         t1 = a[0];
         t2 = (t1 - c) & BN_MASK2;
-        c  = (t2 > t1);
+        c = (t2 > t1);
         t1 = b[0];
         t1 = (t2 - t1) & BN_MASK2;
         r[0] = t1;
         c += (t1 > t2);
         t1 = a[1];
         t2 = (t1 - c) & BN_MASK2;
-        c  = (t2 > t1);
+        c = (t2 > t1);
         t1 = b[1];
         t1 = (t2 - t1) & BN_MASK2;
         r[1] = t1;
         c += (t1 > t2);
         t1 = a[2];
         t2 = (t1 - c) & BN_MASK2;
-        c  = (t2 > t1);
+        c = (t2 > t1);
         t1 = b[2];
         t1 = (t2 - t1) & BN_MASK2;
         r[2] = t1;
         c += (t1 > t2);
         t1 = a[3];
         t2 = (t1 - c) & BN_MASK2;
-        c  = (t2 > t1);
+        c = (t2 > t1);
         t1 = b[3];
         t1 = (t2 - t1) & BN_MASK2;
         r[3] = t1;
@@ -417,7 +416,7 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
     while (n) {
         t1 = a[0];
         t2 = (t1 - c) & BN_MASK2;
-        c  = (t2 > t1);
+        c = (t2 > t1);
         t1 = b[0];
         t1 = (t2 - t1) & BN_MASK2;
         r[0] = t1;
@@ -440,148 +439,188 @@ BN_ULONG bn_sub_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
  * c=(c2,c1,c0)
  */
 
-# ifdef BN_LLONG
+#ifdef BN_LLONG
 /*
  * Keep in mind that additions to multiplication result can not
  * overflow, because its high half cannot be all-ones.
  */
-#  define mul_add_c(a,b,c0,c1,c2)       do {    \
-        BN_ULONG hi;                            \
-        BN_ULLONG t = (BN_ULLONG)(a)*(b);       \
-        t += c0;                /* no carry */  \
-        c0 = (BN_ULONG)Lw(t);                   \
-        hi = (BN_ULONG)Hw(t);                   \
-        c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi);   \
-        } while(0)
-
-#  define mul_add_c2(a,b,c0,c1,c2)      do {    \
-        BN_ULONG hi;                            \
-        BN_ULLONG t = (BN_ULLONG)(a)*(b);       \
-        BN_ULLONG tt = t+c0;    /* no carry */  \
-        c0 = (BN_ULONG)Lw(tt);                  \
-        hi = (BN_ULONG)Hw(tt);                  \
-        c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi);   \
-        t += c0;                /* no carry */  \
-        c0 = (BN_ULONG)Lw(t);                   \
-        hi = (BN_ULONG)Hw(t);                   \
-        c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi);   \
-        } while(0)
-
-#  define sqr_add_c(a,i,c0,c1,c2)       do {    \
-        BN_ULONG hi;                            \
-        BN_ULLONG t = (BN_ULLONG)a[i]*a[i];     \
-        t += c0;                /* no carry */  \
-        c0 = (BN_ULONG)Lw(t);                   \
-        hi = (BN_ULONG)Hw(t);                   \
-        c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi);   \
-        } while(0)
-
-#  define sqr_add_c2(a,i,j,c0,c1,c2) \
-        mul_add_c2((a)[i],(a)[j],c0,c1,c2)
-
-# elif defined(BN_UMULT_LOHI)
+#define mul_add_c(a, b, c0, c1, c2)         \
+    do {                                    \
+        BN_ULONG hi;                        \
+        BN_ULLONG t = (BN_ULLONG)(a) * (b); \
+        t += c0; /* no carry */             \
+        c0 = (BN_ULONG)Lw(t);               \
+        hi = (BN_ULONG)Hw(t);               \
+        c1 = (c1 + hi) & BN_MASK2;          \
+        c2 += (c1 < hi);                    \
+    } while (0)
+
+#define mul_add_c2(a, b, c0, c1, c2)          \
+    do {                                      \
+        BN_ULONG hi;                          \
+        BN_ULLONG t = (BN_ULLONG)(a) * (b);   \
+        BN_ULLONG tt = t + c0; /* no carry */ \
+        c0 = (BN_ULONG)Lw(tt);                \
+        hi = (BN_ULONG)Hw(tt);                \
+        c1 = (c1 + hi) & BN_MASK2;            \
+        c2 += (c1 < hi);                      \
+        t += c0; /* no carry */               \
+        c0 = (BN_ULONG)Lw(t);                 \
+        hi = (BN_ULONG)Hw(t);                 \
+        c1 = (c1 + hi) & BN_MASK2;            \
+        c2 += (c1 < hi);                      \
+    } while (0)
+
+#define sqr_add_c(a, i, c0, c1, c2)           \
+    do {                                      \
+        BN_ULONG hi;                          \
+        BN_ULLONG t = (BN_ULLONG)a[i] * a[i]; \
+        t += c0; /* no carry */               \
+        c0 = (BN_ULONG)Lw(t);                 \
+        hi = (BN_ULONG)Hw(t);                 \
+        c1 = (c1 + hi) & BN_MASK2;            \
+        c2 += (c1 < hi);                      \
+    } while (0)
+
+#define sqr_add_c2(a, i, j, c0, c1, c2) \
+    mul_add_c2((a)[i], (a)[j], c0, c1, c2)
+
+#elif defined(BN_UMULT_LOHI)
 /*
  * Keep in mind that additions to hi can not overflow, because
  * the high word of a multiplication result cannot be all-ones.
  */
-#  define mul_add_c(a,b,c0,c1,c2)       do {    \
-        BN_ULONG ta = (a), tb = (b);            \
-        BN_ULONG lo, hi;                        \
-        BN_UMULT_LOHI(lo,hi,ta,tb);             \
-        c0 += lo; hi += (c0<lo);                \
-        c1 += hi; c2 += (c1<hi);                \
-        } while(0)
-
-#  define mul_add_c2(a,b,c0,c1,c2)      do {    \
-        BN_ULONG ta = (a), tb = (b);            \
-        BN_ULONG lo, hi, tt;                    \
-        BN_UMULT_LOHI(lo,hi,ta,tb);             \
-        c0 += lo; tt = hi + (c0<lo);            \
-        c1 += tt; c2 += (c1<tt);                \
-        c0 += lo; hi += (c0<lo);                \
-        c1 += hi; c2 += (c1<hi);                \
-        } while(0)
-
-#  define sqr_add_c(a,i,c0,c1,c2)       do {    \
-        BN_ULONG ta = (a)[i];                   \
-        BN_ULONG lo, hi;                        \
-        BN_UMULT_LOHI(lo,hi,ta,ta);             \
-        c0 += lo; hi += (c0<lo);                \
-        c1 += hi; c2 += (c1<hi);                \
-        } while(0)
-
-#  define sqr_add_c2(a,i,j,c0,c1,c2)    \
-        mul_add_c2((a)[i],(a)[j],c0,c1,c2)
-
-# elif defined(BN_UMULT_HIGH)
+#define mul_add_c(a, b, c0, c1, c2)    \
+    do {                               \
+        BN_ULONG ta = (a), tb = (b);   \
+        BN_ULONG lo, hi;               \
+        BN_UMULT_LOHI(lo, hi, ta, tb); \
+        c0 += lo;                      \
+        hi += (c0 < lo);               \
+        c1 += hi;                      \
+        c2 += (c1 < hi);               \
+    } while (0)
+
+#define mul_add_c2(a, b, c0, c1, c2)   \
+    do {                               \
+        BN_ULONG ta = (a), tb = (b);   \
+        BN_ULONG lo, hi, tt;           \
+        BN_UMULT_LOHI(lo, hi, ta, tb); \
+        c0 += lo;                      \
+        tt = hi + (c0 < lo);           \
+        c1 += tt;                      \
+        c2 += (c1 < tt);               \
+        c0 += lo;                      \
+        hi += (c0 < lo);               \
+        c1 += hi;                      \
+        c2 += (c1 < hi);               \
+    } while (0)
+
+#define sqr_add_c(a, i, c0, c1, c2)    \
+    do {                               \
+        BN_ULONG ta = (a)[i];          \
+        BN_ULONG lo, hi;               \
+        BN_UMULT_LOHI(lo, hi, ta, ta); \
+        c0 += lo;                      \
+        hi += (c0 < lo);               \
+        c1 += hi;                      \
+        c2 += (c1 < hi);               \
+    } while (0)
+
+#define sqr_add_c2(a, i, j, c0, c1, c2) \
+    mul_add_c2((a)[i], (a)[j], c0, c1, c2)
+
+#elif defined(BN_UMULT_HIGH)
 /*
  * Keep in mind that additions to hi can not overflow, because
  * the high word of a multiplication result cannot be all-ones.
  */
-#  define mul_add_c(a,b,c0,c1,c2)       do {    \
-        BN_ULONG ta = (a), tb = (b);            \
-        BN_ULONG lo = ta * tb;                  \
-        BN_ULONG hi = BN_UMULT_HIGH(ta,tb);     \
-        c0 += lo; hi += (c0<lo);                \
-        c1 += hi; c2 += (c1<hi);                \
-        } while(0)
-
-#  define mul_add_c2(a,b,c0,c1,c2)      do {    \
-        BN_ULONG ta = (a), tb = (b), tt;        \
-        BN_ULONG lo = ta * tb;                  \
-        BN_ULONG hi = BN_UMULT_HIGH(ta,tb);     \
-        c0 += lo; tt = hi + (c0<lo);            \
-        c1 += tt; c2 += (c1<tt);                \
-        c0 += lo; hi += (c0<lo);                \
-        c1 += hi; c2 += (c1<hi);                \
-        } while(0)
-
-#  define sqr_add_c(a,i,c0,c1,c2)       do {    \
-        BN_ULONG ta = (a)[i];                   \
-        BN_ULONG lo = ta * ta;                  \
-        BN_ULONG hi = BN_UMULT_HIGH(ta,ta);     \
-        c0 += lo; hi += (c0<lo);                \
-        c1 += hi; c2 += (c1<hi);                \
-        } while(0)
-
-#  define sqr_add_c2(a,i,j,c0,c1,c2)      \
-        mul_add_c2((a)[i],(a)[j],c0,c1,c2)
-
-# else                          /* !BN_LLONG */
+#define mul_add_c(a, b, c0, c1, c2)          \
+    do {                                     \
+        BN_ULONG ta = (a), tb = (b);         \
+        BN_ULONG lo = ta * tb;               \
+        BN_ULONG hi = BN_UMULT_HIGH(ta, tb); \
+        c0 += lo;                            \
+        hi += (c0 < lo);                     \
+        c1 += hi;                            \
+        c2 += (c1 < hi);                     \
+    } while (0)
+
+#define mul_add_c2(a, b, c0, c1, c2)         \
+    do {                                     \
+        BN_ULONG ta = (a), tb = (b), tt;     \
+        BN_ULONG lo = ta * tb;               \
+        BN_ULONG hi = BN_UMULT_HIGH(ta, tb); \
+        c0 += lo;                            \
+        tt = hi + (c0 < lo);                 \
+        c1 += tt;                            \
+        c2 += (c1 < tt);                     \
+        c0 += lo;                            \
+        hi += (c0 < lo);                     \
+        c1 += hi;                            \
+        c2 += (c1 < hi);                     \
+    } while (0)
+
+#define sqr_add_c(a, i, c0, c1, c2)          \
+    do {                                     \
+        BN_ULONG ta = (a)[i];                \
+        BN_ULONG lo = ta * ta;               \
+        BN_ULONG hi = BN_UMULT_HIGH(ta, ta); \
+        c0 += lo;                            \
+        hi += (c0 < lo);                     \
+        c1 += hi;                            \
+        c2 += (c1 < hi);                     \
+    } while (0)
+
+#define sqr_add_c2(a, i, j, c0, c1, c2) \
+    mul_add_c2((a)[i], (a)[j], c0, c1, c2)
+
+#else /* !BN_LLONG */
 /*
  * Keep in mind that additions to hi can not overflow, because
  * the high word of a multiplication result cannot be all-ones.
  */
-#  define mul_add_c(a,b,c0,c1,c2)       do {    \
-        BN_ULONG lo = LBITS(a), hi = HBITS(a);  \
-        BN_ULONG bl = LBITS(b), bh = HBITS(b);  \
-        mul64(lo,hi,bl,bh);                     \
-        c0 = (c0+lo)&BN_MASK2; hi += (c0<lo);   \
-        c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi);   \
-        } while(0)
-
-#  define mul_add_c2(a,b,c0,c1,c2)      do {    \
-        BN_ULONG tt;                            \
-        BN_ULONG lo = LBITS(a), hi = HBITS(a);  \
-        BN_ULONG bl = LBITS(b), bh = HBITS(b);  \
-        mul64(lo,hi,bl,bh);                     \
-        tt = hi;                                \
-        c0 = (c0+lo)&BN_MASK2; tt += (c0<lo);   \
-        c1 = (c1+tt)&BN_MASK2; c2 += (c1<tt);   \
-        c0 = (c0+lo)&BN_MASK2; hi += (c0<lo);   \
-        c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi);   \
-        } while(0)
-
-#  define sqr_add_c(a,i,c0,c1,c2)       do {    \
-        BN_ULONG lo, hi;                        \
-        sqr64(lo,hi,(a)[i]);                    \
-        c0 = (c0+lo)&BN_MASK2; hi += (c0<lo);   \
-        c1 = (c1+hi)&BN_MASK2; c2 += (c1<hi);   \
-        } while(0)
-
-#  define sqr_add_c2(a,i,j,c0,c1,c2) \
-        mul_add_c2((a)[i],(a)[j],c0,c1,c2)
-# endif                         /* !BN_LLONG */
+#define mul_add_c(a, b, c0, c1, c2)            \
+    do {                                       \
+        BN_ULONG lo = LBITS(a), hi = HBITS(a); \
+        BN_ULONG bl = LBITS(b), bh = HBITS(b); \
+        mul64(lo, hi, bl, bh);                 \
+        c0 = (c0 + lo) & BN_MASK2;             \
+        hi += (c0 < lo);                       \
+        c1 = (c1 + hi) & BN_MASK2;             \
+        c2 += (c1 < hi);                       \
+    } while (0)
+
+#define mul_add_c2(a, b, c0, c1, c2)           \
+    do {                                       \
+        BN_ULONG tt;                           \
+        BN_ULONG lo = LBITS(a), hi = HBITS(a); \
+        BN_ULONG bl = LBITS(b), bh = HBITS(b); \
+        mul64(lo, hi, bl, bh);                 \
+        tt = hi;                               \
+        c0 = (c0 + lo) & BN_MASK2;             \
+        tt += (c0 < lo);                       \
+        c1 = (c1 + tt) & BN_MASK2;             \
+        c2 += (c1 < tt);                       \
+        c0 = (c0 + lo) & BN_MASK2;             \
+        hi += (c0 < lo);                       \
+        c1 = (c1 + hi) & BN_MASK2;             \
+        c2 += (c1 < hi);                       \
+    } while (0)
+
+#define sqr_add_c(a, i, c0, c1, c2) \
+    do {                            \
+        BN_ULONG lo, hi;            \
+        sqr64(lo, hi, (a)[i]);      \
+        c0 = (c0 + lo) & BN_MASK2;  \
+        hi += (c0 < lo);            \
+        c1 = (c1 + hi) & BN_MASK2;  \
+        c2 += (c1 < hi);            \
+    } while (0)
+
+#define sqr_add_c2(a, i, j, c0, c1, c2) \
+    mul_add_c2((a)[i], (a)[j], c0, c1, c2)
+#endif /* !BN_LLONG */
 
 void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
 {
@@ -833,9 +872,9 @@ void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a)
     r[7] = c2;
 }
 
-# ifdef OPENSSL_NO_ASM
-#  ifdef OPENSSL_BN_ASM_MONT
-#   include <alloca.h>
+#ifdef OPENSSL_NO_ASM
+#ifdef OPENSSL_BN_ASM_MONT
+#include <alloca.h>
 /*
  * This is essentially reference implementation, which may or may not
  * result in performance improvement. E.g. on IA-32 this routine was
@@ -850,35 +889,35 @@ void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a)
  * [and are known to] differ and are to be documented elsewhere.
  */
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                const BN_ULONG *np, const BN_ULONG *n0p, int num)
+    const BN_ULONG *np, const BN_ULONG *n0p, int num)
 {
     BN_ULONG c0, c1, ml, *tp, n0;
-#   ifdef mul64
+#ifdef mul64
     BN_ULONG mh;
-#   endif
+#endif
     volatile BN_ULONG *vp;
     int i = 0, j;
 
-#   if 0                        /* template for platform-specific
-                                 * implementation */
+#if 0 /* template for platform-specific \
+       * implementation */
     if (ap == bp)
         return bn_sqr_mont(rp, ap, np, n0p, num);
-#   endif
+#endif
     vp = tp = alloca((num + 2) * sizeof(BN_ULONG));
 
     n0 = *n0p;
 
     c0 = 0;
     ml = bp[0];
-#   ifdef mul64
+#ifdef mul64
     mh = HBITS(ml);
     ml = LBITS(ml);
     for (j = 0; j < num; ++j)
         mul(tp[j], ap[j], ml, mh, c0);
-#   else
+#else
     for (j = 0; j < num; ++j)
         mul(tp[j], ap[j], ml, c0);
-#   endif
+#endif
 
     tp[num] = c0;
     tp[num + 1] = 0;
@@ -887,36 +926,36 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
     for (i = 0; i < num; i++) {
         c0 = 0;
         ml = bp[i];
-#   ifdef mul64
+#ifdef mul64
         mh = HBITS(ml);
         ml = LBITS(ml);
         for (j = 0; j < num; ++j)
             mul_add(tp[j], ap[j], ml, mh, c0);
-#   else
+#else
         for (j = 0; j < num; ++j)
             mul_add(tp[j], ap[j], ml, c0);
-#   endif
+#endif
         c1 = (tp[num] + c0) & BN_MASK2;
         tp[num] = c1;
         tp[num + 1] = (c1 < c0 ? 1 : 0);
- enter:
+    enter:
         c1 = tp[0];
         ml = (c1 * n0) & BN_MASK2;
         c0 = 0;
-#   ifdef mul64
+#ifdef mul64
         mh = HBITS(ml);
         ml = LBITS(ml);
         mul_add(c1, np[0], ml, mh, c0);
-#   else
+#else
         mul_add(c1, ml, np[0], c0);
-#   endif
+#endif
         for (j = 1; j < num; j++) {
             c1 = tp[j];
-#   ifdef mul64
+#ifdef mul64
             mul_add(c1, np[j], ml, mh, c0);
-#   else
+#else
             mul_add(c1, ml, np[j], c0);
-#   endif
+#endif
             tp[j - 1] = c1 & BN_MASK2;
         }
         c1 = (tp[num] + c0) & BN_MASK2;
@@ -938,21 +977,21 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
     vp[num + 1] = 0;
     return 1;
 }
-#  else
+#else
 /*
  * Return value of 0 indicates that multiplication/convolution was not
  * performed to signal the caller to fall down to alternative/original
  * code-path.
  */
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                const BN_ULONG *np, const BN_ULONG *n0, int num)
+    const BN_ULONG *np, const BN_ULONG *n0, int num)
 {
     return 0;
 }
-#  endif                        /* OPENSSL_BN_ASM_MONT */
-# endif
+#endif /* OPENSSL_BN_ASM_MONT */
+#endif
 
-#else                           /* !BN_MUL_COMBA */
+#else /* !BN_MUL_COMBA */
 
 /* hmm... is it faster just to do a multiply? */
 void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a)
@@ -987,11 +1026,11 @@ void bn_mul_comba8(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b)
     r[15] = bn_mul_add_words(&(r[7]), a, 8, b[7]);
 }
 
-# ifdef OPENSSL_NO_ASM
-#  ifdef OPENSSL_BN_ASM_MONT
-#   include <alloca.h>
+#ifdef OPENSSL_NO_ASM
+#ifdef OPENSSL_BN_ASM_MONT
+#include <alloca.h>
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                const BN_ULONG *np, const BN_ULONG *n0p, int num)
+    const BN_ULONG *np, const BN_ULONG *n0p, int num)
 {
     BN_ULONG c0, c1, *tp, n0 = *n0p;
     volatile BN_ULONG *vp;
@@ -1030,13 +1069,13 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
     vp[num + 1] = 0;
     return 1;
 }
-#  else
+#else
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                const BN_ULONG *np, const BN_ULONG *n0, int num)
+    const BN_ULONG *np, const BN_ULONG *n0, int num)
 {
     return 0;
 }
-#  endif                        /* OPENSSL_BN_ASM_MONT */
-# endif
+#endif /* OPENSSL_BN_ASM_MONT */
+#endif
 
-#endif                          /* !BN_MUL_COMBA */
+#endif /* !BN_MUL_COMBA */
diff --git a/crypto/bn/bn_blind.c b/crypto/bn/bn_blind.c
index 6c6de1a30f545..73592ee96bb86 100644
--- a/crypto/bn/bn_blind.c
+++ b/crypto/bn/bn_blind.c
@@ -11,19 +11,19 @@
 #include "internal/cryptlib.h"
 #include "bn_local.h"
 
-#define BN_BLINDING_COUNTER     32
+#define BN_BLINDING_COUNTER 32
 
 struct bn_blinding_st {
     BIGNUM *A;
     BIGNUM *Ai;
     BIGNUM *e;
-    BIGNUM *mod;                /* just a reference */
+    BIGNUM *mod; /* just a reference */
     CRYPTO_THREAD_ID tid;
     int counter;
     unsigned long flags;
     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);
+    int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+        const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
     CRYPTO_RWLOCK *lock;
 };
 
@@ -71,7 +71,7 @@ BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod)
 
     return ret;
 
- err:
+err:
     BN_BLINDING_free(ret);
     return NULL;
 }
@@ -100,8 +100,7 @@ int BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx)
     if (b->counter == -1)
         b->counter = 0;
 
-    if (++b->counter == BN_BLINDING_COUNTER && b->e != NULL &&
-        !(b->flags & BN_BLINDING_NO_RECREATE)) {
+    if (++b->counter == BN_BLINDING_COUNTER && b->e != NULL && !(b->flags & BN_BLINDING_NO_RECREATE)) {
         /* re-create blinding parameters */
         if (!BN_BLINDING_create_param(b, NULL, NULL, ctx, NULL, NULL))
             goto err;
@@ -118,7 +117,7 @@ int BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx)
     }
 
     ret = 1;
- err:
+err:
     if (b->counter == BN_BLINDING_COUNTER)
         b->counter = 0;
     return ret;
@@ -163,7 +162,7 @@ int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx)
 }
 
 int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b,
-                          BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret;
 
@@ -230,14 +229,14 @@ void BN_BLINDING_set_flags(BN_BLINDING *b, unsigned long flags)
 }
 
 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)
+    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)
 {
     int retry_counter = 32;
     BN_BLINDING *ret = NULL;
@@ -301,7 +300,7 @@ BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
     }
 
     return ret;
- err:
+err:
     if (b == NULL) {
         BN_BLINDING_free(ret);
         ret = NULL;
diff --git a/crypto/bn/bn_const.c b/crypto/bn/bn_const.c
index 190a36391206b..974868feca8d1 100644
--- a/crypto/bn/bn_const.c
+++ b/crypto/bn/bn_const.c
@@ -12,7 +12,6 @@
 
 #define COPY_BN(dst, src) (dst != NULL) ? BN_copy(dst, &src) : BN_dup(&src)
 
-
 /*-
  * "First Oakley Default Group" from RFC2409, section 6.1.
  *
@@ -25,18 +24,102 @@
 BIGNUM *BN_get_rfc2409_prime_768(BIGNUM *bn)
 {
     static const unsigned char RFC2409_PRIME_768[] = {
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xC9, 0x0F, 0xDA, 0xA2, 0x21, 0x68, 0xC2, 0x34,
-        0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
-        0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74,
-        0x02, 0x0B, 0xBE, 0xA6, 0x3B, 0x13, 0x9B, 0x22,
-        0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
-        0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B,
-        0x30, 0x2B, 0x0A, 0x6D, 0xF2, 0x5F, 0x14, 0x37,
-        0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45,
-        0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6,
-        0xF4, 0x4C, 0x42, 0xE9, 0xA6, 0x3A, 0x36, 0x20,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xC9,
+        0x0F,
+        0xDA,
+        0xA2,
+        0x21,
+        0x68,
+        0xC2,
+        0x34,
+        0xC4,
+        0xC6,
+        0x62,
+        0x8B,
+        0x80,
+        0xDC,
+        0x1C,
+        0xD1,
+        0x29,
+        0x02,
+        0x4E,
+        0x08,
+        0x8A,
+        0x67,
+        0xCC,
+        0x74,
+        0x02,
+        0x0B,
+        0xBE,
+        0xA6,
+        0x3B,
+        0x13,
+        0x9B,
+        0x22,
+        0x51,
+        0x4A,
+        0x08,
+        0x79,
+        0x8E,
+        0x34,
+        0x04,
+        0xDD,
+        0xEF,
+        0x95,
+        0x19,
+        0xB3,
+        0xCD,
+        0x3A,
+        0x43,
+        0x1B,
+        0x30,
+        0x2B,
+        0x0A,
+        0x6D,
+        0xF2,
+        0x5F,
+        0x14,
+        0x37,
+        0x4F,
+        0xE1,
+        0x35,
+        0x6D,
+        0x6D,
+        0x51,
+        0xC2,
+        0x45,
+        0xE4,
+        0x85,
+        0xB5,
+        0x76,
+        0x62,
+        0x5E,
+        0x7E,
+        0xC6,
+        0xF4,
+        0x4C,
+        0x42,
+        0xE9,
+        0xA6,
+        0x3A,
+        0x36,
+        0x20,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
     };
     return BN_bin2bn(RFC2409_PRIME_768, sizeof(RFC2409_PRIME_768), bn);
 }
@@ -53,22 +136,134 @@ BIGNUM *BN_get_rfc2409_prime_768(BIGNUM *bn)
 BIGNUM *BN_get_rfc2409_prime_1024(BIGNUM *bn)
 {
     static const unsigned char RFC2409_PRIME_1024[] = {
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xC9, 0x0F, 0xDA, 0xA2, 0x21, 0x68, 0xC2, 0x34,
-        0xC4, 0xC6, 0x62, 0x8B, 0x80, 0xDC, 0x1C, 0xD1,
-        0x29, 0x02, 0x4E, 0x08, 0x8A, 0x67, 0xCC, 0x74,
-        0x02, 0x0B, 0xBE, 0xA6, 0x3B, 0x13, 0x9B, 0x22,
-        0x51, 0x4A, 0x08, 0x79, 0x8E, 0x34, 0x04, 0xDD,
-        0xEF, 0x95, 0x19, 0xB3, 0xCD, 0x3A, 0x43, 0x1B,
-        0x30, 0x2B, 0x0A, 0x6D, 0xF2, 0x5F, 0x14, 0x37,
-        0x4F, 0xE1, 0x35, 0x6D, 0x6D, 0x51, 0xC2, 0x45,
-        0xE4, 0x85, 0xB5, 0x76, 0x62, 0x5E, 0x7E, 0xC6,
-        0xF4, 0x4C, 0x42, 0xE9, 0xA6, 0x37, 0xED, 0x6B,
-        0x0B, 0xFF, 0x5C, 0xB6, 0xF4, 0x06, 0xB7, 0xED,
-        0xEE, 0x38, 0x6B, 0xFB, 0x5A, 0x89, 0x9F, 0xA5,
-        0xAE, 0x9F, 0x24, 0x11, 0x7C, 0x4B, 0x1F, 0xE6,
-        0x49, 0x28, 0x66, 0x51, 0xEC, 0xE6, 0x53, 0x81,
-        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xC9,
+        0x0F,
+        0xDA,
+        0xA2,
+        0x21,
+        0x68,
+        0xC2,
+        0x34,
+        0xC4,
+        0xC6,
+        0x62,
+        0x8B,
+        0x80,
+        0xDC,
+        0x1C,
+        0xD1,
+        0x29,
+        0x02,
+        0x4E,
+        0x08,
+        0x8A,
+        0x67,
+        0xCC,
+        0x74,
+        0x02,
+        0x0B,
+        0xBE,
+        0xA6,
+        0x3B,
+        0x13,
+        0x9B,
+        0x22,
+        0x51,
+        0x4A,
+        0x08,
+        0x79,
+        0x8E,
+        0x34,
+        0x04,
+        0xDD,
+        0xEF,
+        0x95,
+        0x19,
+        0xB3,
+        0xCD,
+        0x3A,
+        0x43,
+        0x1B,
+        0x30,
+        0x2B,
+        0x0A,
+        0x6D,
+        0xF2,
+        0x5F,
+        0x14,
+        0x37,
+        0x4F,
+        0xE1,
+        0x35,
+        0x6D,
+        0x6D,
+        0x51,
+        0xC2,
+        0x45,
+        0xE4,
+        0x85,
+        0xB5,
+        0x76,
+        0x62,
+        0x5E,
+        0x7E,
+        0xC6,
+        0xF4,
+        0x4C,
+        0x42,
+        0xE9,
+        0xA6,
+        0x37,
+        0xED,
+        0x6B,
+        0x0B,
+        0xFF,
+        0x5C,
+        0xB6,
+        0xF4,
+        0x06,
+        0xB7,
+        0xED,
+        0xEE,
+        0x38,
+        0x6B,
+        0xFB,
+        0x5A,
+        0x89,
+        0x9F,
+        0xA5,
+        0xAE,
+        0x9F,
+        0x24,
+        0x11,
+        0x7C,
+        0x4B,
+        0x1F,
+        0xE6,
+        0x49,
+        0x28,
+        0x66,
+        0x51,
+        0xEC,
+        0xE6,
+        0x53,
+        0x81,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
+        0xFF,
     };
     return BN_bin2bn(RFC2409_PRIME_1024, sizeof(RFC2409_PRIME_1024), bn);
 }
diff --git a/crypto/bn/bn_conv.c b/crypto/bn/bn_conv.c
index 57dda04b0d783..6b095238b77e2 100644
--- a/crypto/bn/bn_conv.c
+++ b/crypto/bn/bn_conv.c
@@ -37,7 +37,7 @@ char *BN_bn2hex(const BIGNUM *a)
         }
     }
     *p = '\0';
- err:
+err:
     return buf;
 }
 
@@ -61,7 +61,7 @@ char *BN_bn2dec(const BIGNUM *a)
      */
     i = BN_num_bits(a) * 3;
     num = (i / 10 + i / 1000 + 1) + 1;
-    tbytes = num + 3;   /* negative and terminator and one spare? */
+    tbytes = num + 3; /* negative and terminator and one spare? */
     bn_data_num = num / BN_DEC_NUM + 1;
     bn_data = OPENSSL_malloc(bn_data_num * sizeof(BN_ULONG));
     buf = OPENSSL_malloc(tbytes);
@@ -106,7 +106,7 @@ char *BN_bn2dec(const BIGNUM *a)
         }
     }
     ok = 1;
- err:
+err:
     OPENSSL_free(bn_data);
     BN_free(t);
     if (ok)
@@ -158,7 +158,7 @@ int BN_hex2bn(BIGNUM **bn, const char *a)
     if (bn_expand(ret, i * 4) == NULL)
         goto err;
 
-    j = i;                      /* least significant 'hex' */
+    j = i; /* least significant 'hex' */
     m = 0;
     h = 0;
     while (j > 0) {
@@ -168,7 +168,7 @@ int BN_hex2bn(BIGNUM **bn, const char *a)
             c = a[j - m];
             k = OPENSSL_hexchar2int(c);
             if (k < 0)
-                k = 0;          /* paranoia */
+                k = 0; /* paranoia */
             l = (l << 4) | k;
 
             if (--m <= 0) {
@@ -187,7 +187,7 @@ int BN_hex2bn(BIGNUM **bn, const char *a)
     if (ret->top != 0)
         ret->neg = neg;
     return num;
- err:
+err:
     if (*bn == NULL)
         BN_free(ret);
     return 0;
@@ -257,7 +257,7 @@ int BN_dec2bn(BIGNUM **bn, const char *a)
     if (ret->top != 0)
         ret->neg = neg;
     return num;
- err:
+err:
     if (*bn == NULL)
         BN_free(ret);
     return 0;
diff --git a/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c
index aa70ca7a3fd9b..90ac7cee60de0 100644
--- a/crypto/bn/bn_ctx.c
+++ b/crypto/bn/bn_ctx.c
@@ -12,9 +12,9 @@
 #include "bn_local.h"
 
 /* How many bignums are in each "pool item"; */
-#define BN_CTX_POOL_SIZE        16
+#define BN_CTX_POOL_SIZE 16
 /* The stack frame info is resizing, set a first-time expansion size; */
-#define BN_CTX_START_FRAMES     32
+#define BN_CTX_START_FRAMES 32
 
 /***********/
 /* BN_POOL */
@@ -86,10 +86,10 @@ static void ctxdbg(BIO *channel, const char *text, BN_CTX *ctx)
     BN_STACK *stack = &ctx->stack;
 
     BIO_printf(channel, "%s\n", text);
-    BIO_printf(channel, "  (%16p): ", (void*)ctx);
+    BIO_printf(channel, "  (%16p): ", (void *)ctx);
     while (bnidx < ctx->used) {
         BIO_printf(channel, "%03x ",
-                   item->vals[bnidx++ % BN_CTX_POOL_SIZE].dmax);
+            item->vals[bnidx++ % BN_CTX_POOL_SIZE].dmax);
         if (!(bnidx % BN_CTX_POOL_SIZE))
             item = item->next;
     }
@@ -106,13 +106,17 @@ static void ctxdbg(BIO *channel, const char *text, BN_CTX *ctx)
     BIO_printf(channel, "\n");
 }
 
-# define CTXDBG(str, ctx)           \
-    OSSL_TRACE_BEGIN(BN_CTX) {      \
-        ctxdbg(trc_out, str, ctx);  \
-    } OSSL_TRACE_END(BN_CTX)
+#define CTXDBG(str, ctx)           \
+    OSSL_TRACE_BEGIN(BN_CTX)       \
+    {                              \
+        ctxdbg(trc_out, str, ctx); \
+    }                              \
+    OSSL_TRACE_END(BN_CTX)
 #else
 /* We do not want tracing in FIPS module */
-# define CTXDBG(str, ctx) do {} while(0)
+#define CTXDBG(str, ctx) \
+    do {                 \
+    } while (0)
 #endif /* FIPS_MODULE */
 
 BN_CTX *BN_CTX_new_ex(OSSL_LIB_CTX *ctx)
@@ -156,11 +160,12 @@ void BN_CTX_free(BN_CTX *ctx)
     if (ctx == NULL)
         return;
 #ifndef FIPS_MODULE
-    OSSL_TRACE_BEGIN(BN_CTX) {
+    OSSL_TRACE_BEGIN(BN_CTX)
+    {
         BN_POOL_ITEM *pool = ctx->pool.head;
         BIO_printf(trc_out,
-                   "BN_CTX_free(): stack-size=%d, pool-bignums=%d\n",
-                   ctx->stack.size, ctx->pool.size);
+            "BN_CTX_free(): stack-size=%d, pool-bignums=%d\n",
+            ctx->stack.size, ctx->pool.size);
         BIO_printf(trc_out, "  dmaxs: ");
         while (pool) {
             unsigned loop = 0;
@@ -169,7 +174,8 @@ void BN_CTX_free(BN_CTX *ctx)
             pool = pool->next;
         }
         BIO_printf(trc_out, "\n");
-    } OSSL_TRACE_END(BN_CTX);
+    }
+    OSSL_TRACE_END(BN_CTX);
 #endif
     BN_STACK_finish(&ctx->stack);
     BN_POOL_finish(&ctx->pool);
@@ -257,13 +263,11 @@ static void BN_STACK_finish(BN_STACK *st)
     st->indexes = NULL;
 }
 
-
 static int BN_STACK_push(BN_STACK *st, unsigned int idx)
 {
     if (st->depth == st->size) {
         /* Need to expand */
-        unsigned int newsize =
-            st->size ? (st->size * 3 / 2) : BN_CTX_START_FRAMES;
+        unsigned int newsize = st->size ? (st->size * 3 / 2) : BN_CTX_START_FRAMES;
         unsigned int *newitems;
 
         if ((newitems = OPENSSL_malloc(sizeof(*newitems) * newsize)) == NULL)
@@ -308,7 +312,6 @@ static void BN_POOL_finish(BN_POOL *p)
     }
 }
 
-
 static BIGNUM *BN_POOL_get(BN_POOL *p, int flag)
 {
     BIGNUM *bn;
diff --git a/crypto/bn/bn_depr.c b/crypto/bn/bn_depr.c
index d55397016a514..01f753ba84c3e 100644
--- a/crypto/bn/bn_depr.c
+++ b/crypto/bn/bn_depr.c
@@ -20,8 +20,8 @@
 #include "bn_local.h"
 
 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)
 {
     BN_GENCB cb;
     BIGNUM *rnd = NULL;
@@ -38,14 +38,14 @@ BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
 
     /* we have a prime :-) */
     return rnd;
- err:
+err:
     BN_free(rnd);
     return NULL;
 }
 
 int BN_is_prime(const BIGNUM *a, int checks,
-                void (*callback) (int, int, void *), BN_CTX *ctx_passed,
-                void *cb_arg)
+    void (*callback)(int, int, void *), BN_CTX *ctx_passed,
+    void *cb_arg)
 {
     BN_GENCB cb;
     BN_GENCB_set_old(&cb, callback, cb_arg);
@@ -53,9 +53,9 @@ int BN_is_prime(const BIGNUM *a, int checks,
 }
 
 int BN_is_prime_fasttest(const BIGNUM *a, int checks,
-                         void (*callback) (int, int, void *),
-                         BN_CTX *ctx_passed, void *cb_arg,
-                         int do_trial_division)
+    void (*callback)(int, int, void *),
+    BN_CTX *ctx_passed, void *cb_arg,
+    int do_trial_division)
 {
     BN_GENCB cb;
     BN_GENCB_set_old(&cb, callback, cb_arg);
diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c
index c0967e534c8c2..542c33d6a8d7a 100644
--- a/crypto/bn/bn_dh.c
+++ b/crypto/bn/bn_dh.c
@@ -10,18 +10,18 @@
 #include "bn_local.h"
 #include "internal/nelem.h"
 
-# include <openssl/dh.h>
-# include "crypto/bn_dh.h"
+#include <openssl/dh.h>
+#include "crypto/bn_dh.h"
 
-# if BN_BITS2 == 64
-#  define BN_DEF(lo, hi) (BN_ULONG)hi << 32 | lo
-# else
-#  define BN_DEF(lo, hi) lo, hi
-# endif
+#if BN_BITS2 == 64
+#define BN_DEF(lo, hi) (BN_ULONG) hi << 32 | lo
+#else
+#define BN_DEF(lo, hi) lo, hi
+#endif
 
 /* DH parameters from RFC3526 */
 
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
 /*
  * "1536-bit MODP Group" from RFC3526, Section 2.
  *
@@ -59,7 +59,7 @@ static const BN_ULONG modp_1536_q[] = {
     BN_DEF(0x4533E63A, 0x94812704), BN_DEF(0xC06E0E68, 0x62633145),
     BN_DEF(0x10B4611A, 0xE487ED51), BN_DEF(0xFFFFFFFF, 0x7FFFFFFF)
 };
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 
 /*-
  * "2048-bit MODP Group" from RFC3526, Section 3.
@@ -88,22 +88,38 @@ static const BN_ULONG modp_2048_p[] = {
 };
 /* q = (p - 1) / 2 */
 static const BN_ULONG modp_2048_q[] = {
-    BN_DEF(0xFFFFFFFF,  0x7FFFFFFF), BN_DEF(0x45565534,  0x0AB9472D),
-    BN_DEF(0x4C7D0288,  0x8AE9130C), BN_DEF(0x754AB572,  0x1CCAA4BE),
-    BN_DEF(0x4AAC0B8C,  0xEF15E5FB), BN_DEF(0x37A62964,  0xDAE2AEF8),
-    BN_DEF(0x7603D147,  0xCD93C1D1), BN_DEF(0x0C074301,  0xF1CF3B96),
-    BN_DEF(0x171B671D,  0x19482F23), BN_DEF(0x650C10BE,  0x78BA3604),
-    BN_DEF(0x255E4C02,  0xB3861AA7), BN_DEF(0xB84B4B36,  0xCF6A9483),
-    BN_DEF(0x1042A95D,  0x0E3179AB), BN_DEF(0xEE51D6CB,  0xC1B2AE91),
-    BN_DEF(0x7E9267AF,  0x348B1FD4), BN_DEF(0x0E2AE9CD,  0xCC6D241B),
-    BN_DEF(0x50B1DF82,  0xE1003E5C), BN_DEF(0xF6722D9E,  0x24943328),
-    BN_DEF(0xBE258FF3,  0xD74F9208), BN_DEF(0xAD44CFD2,  0xF71C35FD),
-    BN_DEF(0x7A035BF6,  0x85FFAE5B), BN_DEF(0xD31BF6B5,  0x7A262174),
-    BN_DEF(0x312F3F63,  0xF242DABB), BN_DEF(0xB6A8E122,  0xA7F09AB6),
-    BN_DEF(0xF92F8A1B,  0x98158536), BN_DEF(0xE69D218D,  0xF7CA8CD9),
-    BN_DEF(0xC71A026E,  0x28A5043C), BN_DEF(0x1D89CD91,  0x0105DF53),
-    BN_DEF(0x4533E63A,  0x94812704), BN_DEF(0xC06E0E68,  0x62633145),
-    BN_DEF(0x10B4611A,  0xE487ED51), BN_DEF(0xFFFFFFFF,  0x7FFFFFFF),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+    BN_DEF(0x45565534, 0x0AB9472D),
+    BN_DEF(0x4C7D0288, 0x8AE9130C),
+    BN_DEF(0x754AB572, 0x1CCAA4BE),
+    BN_DEF(0x4AAC0B8C, 0xEF15E5FB),
+    BN_DEF(0x37A62964, 0xDAE2AEF8),
+    BN_DEF(0x7603D147, 0xCD93C1D1),
+    BN_DEF(0x0C074301, 0xF1CF3B96),
+    BN_DEF(0x171B671D, 0x19482F23),
+    BN_DEF(0x650C10BE, 0x78BA3604),
+    BN_DEF(0x255E4C02, 0xB3861AA7),
+    BN_DEF(0xB84B4B36, 0xCF6A9483),
+    BN_DEF(0x1042A95D, 0x0E3179AB),
+    BN_DEF(0xEE51D6CB, 0xC1B2AE91),
+    BN_DEF(0x7E9267AF, 0x348B1FD4),
+    BN_DEF(0x0E2AE9CD, 0xCC6D241B),
+    BN_DEF(0x50B1DF82, 0xE1003E5C),
+    BN_DEF(0xF6722D9E, 0x24943328),
+    BN_DEF(0xBE258FF3, 0xD74F9208),
+    BN_DEF(0xAD44CFD2, 0xF71C35FD),
+    BN_DEF(0x7A035BF6, 0x85FFAE5B),
+    BN_DEF(0xD31BF6B5, 0x7A262174),
+    BN_DEF(0x312F3F63, 0xF242DABB),
+    BN_DEF(0xB6A8E122, 0xA7F09AB6),
+    BN_DEF(0xF92F8A1B, 0x98158536),
+    BN_DEF(0xE69D218D, 0xF7CA8CD9),
+    BN_DEF(0xC71A026E, 0x28A5043C),
+    BN_DEF(0x1D89CD91, 0x0105DF53),
+    BN_DEF(0x4533E63A, 0x94812704),
+    BN_DEF(0xC06E0E68, 0x62633145),
+    BN_DEF(0x10B4611A, 0xE487ED51),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
 };
 
 /*-
@@ -141,30 +157,54 @@ static const BN_ULONG modp_3072_p[] = {
 };
 /* q = (p - 1) / 2 */
 static const BN_ULONG modp_3072_q[] = {
-    BN_DEF(0xFFFFFFFF,  0x7FFFFFFF), BN_DEF(0x549D6965,  0x25C16890),
-    BN_DEF(0x707E8847,  0xA1EDADFE), BN_DEF(0x3A72D598,  0x047127D0),
-    BN_DEF(0x5D6CA371,  0x3B84C460), BN_DEF(0xBD30AEB6,  0x5DF08BAB),
-    BN_DEF(0x0BBD9006,  0x290F958C), BN_DEF(0x9F643532,  0x6C3B0139),
-    BN_DEF(0x6CC50432,  0xF897FD03), BN_DEF(0x0D697735,  0xE771E913),
-    BN_DEF(0x2512B0CE,  0x8F464A70), BN_DEF(0x6D8499EB,  0xD5FAD746),
-    BN_DEF(0xD370F263,  0xD9CB87C2), BN_DEF(0xAE83063E,  0x457538AB),
-    BN_DEF(0x2C6DF785,  0x767DC282), BN_DEF(0xEF8E5D32,  0xD42A90D5),
-    BN_DEF(0x82283D19,  0xD6998B86), BN_DEF(0x45556216,  0x0AB9472D),
-    BN_DEF(0x4C7D0288,  0x8AE9130C), BN_DEF(0x754AB572,  0x1CCAA4BE),
-    BN_DEF(0x4AAC0B8C,  0xEF15E5FB), BN_DEF(0x37A62964,  0xDAE2AEF8),
-    BN_DEF(0x7603D147,  0xCD93C1D1), BN_DEF(0x0C074301,  0xF1CF3B96),
-    BN_DEF(0x171B671D,  0x19482F23), BN_DEF(0x650C10BE,  0x78BA3604),
-    BN_DEF(0x255E4C02,  0xB3861AA7), BN_DEF(0xB84B4B36,  0xCF6A9483),
-    BN_DEF(0x1042A95D,  0x0E3179AB), BN_DEF(0xEE51D6CB,  0xC1B2AE91),
-    BN_DEF(0x7E9267AF,  0x348B1FD4), BN_DEF(0x0E2AE9CD,  0xCC6D241B),
-    BN_DEF(0x50B1DF82,  0xE1003E5C), BN_DEF(0xF6722D9E,  0x24943328),
-    BN_DEF(0xBE258FF3,  0xD74F9208), BN_DEF(0xAD44CFD2,  0xF71C35FD),
-    BN_DEF(0x7A035BF6,  0x85FFAE5B), BN_DEF(0xD31BF6B5,  0x7A262174),
-    BN_DEF(0x312F3F63,  0xF242DABB), BN_DEF(0xB6A8E122,  0xA7F09AB6),
-    BN_DEF(0xF92F8A1B,  0x98158536), BN_DEF(0xE69D218D,  0xF7CA8CD9),
-    BN_DEF(0xC71A026E,  0x28A5043C), BN_DEF(0x1D89CD91,  0x0105DF53),
-    BN_DEF(0x4533E63A,  0x94812704), BN_DEF(0xC06E0E68,  0x62633145),
-    BN_DEF(0x10B4611A,  0xE487ED51), BN_DEF(0xFFFFFFFF,  0x7FFFFFFF),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+    BN_DEF(0x549D6965, 0x25C16890),
+    BN_DEF(0x707E8847, 0xA1EDADFE),
+    BN_DEF(0x3A72D598, 0x047127D0),
+    BN_DEF(0x5D6CA371, 0x3B84C460),
+    BN_DEF(0xBD30AEB6, 0x5DF08BAB),
+    BN_DEF(0x0BBD9006, 0x290F958C),
+    BN_DEF(0x9F643532, 0x6C3B0139),
+    BN_DEF(0x6CC50432, 0xF897FD03),
+    BN_DEF(0x0D697735, 0xE771E913),
+    BN_DEF(0x2512B0CE, 0x8F464A70),
+    BN_DEF(0x6D8499EB, 0xD5FAD746),
+    BN_DEF(0xD370F263, 0xD9CB87C2),
+    BN_DEF(0xAE83063E, 0x457538AB),
+    BN_DEF(0x2C6DF785, 0x767DC282),
+    BN_DEF(0xEF8E5D32, 0xD42A90D5),
+    BN_DEF(0x82283D19, 0xD6998B86),
+    BN_DEF(0x45556216, 0x0AB9472D),
+    BN_DEF(0x4C7D0288, 0x8AE9130C),
+    BN_DEF(0x754AB572, 0x1CCAA4BE),
+    BN_DEF(0x4AAC0B8C, 0xEF15E5FB),
+    BN_DEF(0x37A62964, 0xDAE2AEF8),
+    BN_DEF(0x7603D147, 0xCD93C1D1),
+    BN_DEF(0x0C074301, 0xF1CF3B96),
+    BN_DEF(0x171B671D, 0x19482F23),
+    BN_DEF(0x650C10BE, 0x78BA3604),
+    BN_DEF(0x255E4C02, 0xB3861AA7),
+    BN_DEF(0xB84B4B36, 0xCF6A9483),
+    BN_DEF(0x1042A95D, 0x0E3179AB),
+    BN_DEF(0xEE51D6CB, 0xC1B2AE91),
+    BN_DEF(0x7E9267AF, 0x348B1FD4),
+    BN_DEF(0x0E2AE9CD, 0xCC6D241B),
+    BN_DEF(0x50B1DF82, 0xE1003E5C),
+    BN_DEF(0xF6722D9E, 0x24943328),
+    BN_DEF(0xBE258FF3, 0xD74F9208),
+    BN_DEF(0xAD44CFD2, 0xF71C35FD),
+    BN_DEF(0x7A035BF6, 0x85FFAE5B),
+    BN_DEF(0xD31BF6B5, 0x7A262174),
+    BN_DEF(0x312F3F63, 0xF242DABB),
+    BN_DEF(0xB6A8E122, 0xA7F09AB6),
+    BN_DEF(0xF92F8A1B, 0x98158536),
+    BN_DEF(0xE69D218D, 0xF7CA8CD9),
+    BN_DEF(0xC71A026E, 0x28A5043C),
+    BN_DEF(0x1D89CD91, 0x0105DF53),
+    BN_DEF(0x4533E63A, 0x94812704),
+    BN_DEF(0xC06E0E68, 0x62633145),
+    BN_DEF(0x10B4611A, 0xE487ED51),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
 };
 
 /*-
@@ -210,38 +250,70 @@ static const BN_ULONG modp_4096_p[] = {
 };
 /* q = (p - 1) / 2 */
 static const BN_ULONG modp_4096_q[] = {
-    BN_DEF(0xFFFFFFFF,  0xFFFFFFFF), BN_DEF(0x9A0318CC,  0xA6FA1AE4),
-    BN_DEF(0x48536047,  0xC37FDBEE), BN_DEF(0x46C7EEE0,  0xC9DA754C),
-    BN_DEF(0xEAD82D54,  0x68034893), BN_DEF(0x10B8240E,  0xDC0DEEBB),
-    BN_DEF(0x67716BD7,  0x8FB094B8), BN_DEF(0x28ADF3F6,  0x119DD0C3),
-    BN_DEF(0xD04861D1,  0xCCD94B27), BN_DEF(0xA735E02E,  0x143E2CA3),
-    BN_DEF(0x0FDF6553,  0x97477E0A), BN_DEF(0x826F477C,  0x6DDDE16D),
-    BN_DEF(0x156A2674,  0x12C1F4E5), BN_DEF(0x5B0A85ED,  0x0D4A341A),
-    BN_DEF(0x357A711E,  0x4CE1938C), BN_DEF(0x5EDD2D93,  0xC438CD08),
-    BN_DEF(0x53C3F36B,  0x8D391E09), BN_DEF(0x54908400,  0x25C16890),
-    BN_DEF(0x707E8847,  0xA1EDADFE), BN_DEF(0x3A72D598,  0x047127D0),
-    BN_DEF(0x5D6CA371,  0x3B84C460), BN_DEF(0xBD30AEB6,  0x5DF08BAB),
-    BN_DEF(0x0BBD9006,  0x290F958C), BN_DEF(0x9F643532,  0x6C3B0139),
-    BN_DEF(0x6CC50432,  0xF897FD03), BN_DEF(0x0D697735,  0xE771E913),
-    BN_DEF(0x2512B0CE,  0x8F464A70), BN_DEF(0x6D8499EB,  0xD5FAD746),
-    BN_DEF(0xD370F263,  0xD9CB87C2), BN_DEF(0xAE83063E,  0x457538AB),
-    BN_DEF(0x2C6DF785,  0x767DC282), BN_DEF(0xEF8E5D32,  0xD42A90D5),
-    BN_DEF(0x82283D19,  0xD6998B86), BN_DEF(0x45556216,  0x0AB9472D),
-    BN_DEF(0x4C7D0288,  0x8AE9130C), BN_DEF(0x754AB572,  0x1CCAA4BE),
-    BN_DEF(0x4AAC0B8C,  0xEF15E5FB), BN_DEF(0x37A62964,  0xDAE2AEF8),
-    BN_DEF(0x7603D147,  0xCD93C1D1), BN_DEF(0x0C074301,  0xF1CF3B96),
-    BN_DEF(0x171B671D,  0x19482F23), BN_DEF(0x650C10BE,  0x78BA3604),
-    BN_DEF(0x255E4C02,  0xB3861AA7), BN_DEF(0xB84B4B36,  0xCF6A9483),
-    BN_DEF(0x1042A95D,  0x0E3179AB), BN_DEF(0xEE51D6CB,  0xC1B2AE91),
-    BN_DEF(0x7E9267AF,  0x348B1FD4), BN_DEF(0x0E2AE9CD,  0xCC6D241B),
-    BN_DEF(0x50B1DF82,  0xE1003E5C), BN_DEF(0xF6722D9E,  0x24943328),
-    BN_DEF(0xBE258FF3,  0xD74F9208), BN_DEF(0xAD44CFD2,  0xF71C35FD),
-    BN_DEF(0x7A035BF6,  0x85FFAE5B), BN_DEF(0xD31BF6B5,  0x7A262174),
-    BN_DEF(0x312F3F63,  0xF242DABB), BN_DEF(0xB6A8E122,  0xA7F09AB6),
-    BN_DEF(0xF92F8A1B,  0x98158536), BN_DEF(0xE69D218D,  0xF7CA8CD9),
-    BN_DEF(0xC71A026E,  0x28A5043C), BN_DEF(0x1D89CD91,  0x0105DF53),
-    BN_DEF(0x4533E63A,  0x94812704), BN_DEF(0xC06E0E68,  0x62633145),
-    BN_DEF(0x10B4611A,  0xE487ED51), BN_DEF(0xFFFFFFFF,  0x7FFFFFFF),
+    BN_DEF(0xFFFFFFFF, 0xFFFFFFFF),
+    BN_DEF(0x9A0318CC, 0xA6FA1AE4),
+    BN_DEF(0x48536047, 0xC37FDBEE),
+    BN_DEF(0x46C7EEE0, 0xC9DA754C),
+    BN_DEF(0xEAD82D54, 0x68034893),
+    BN_DEF(0x10B8240E, 0xDC0DEEBB),
+    BN_DEF(0x67716BD7, 0x8FB094B8),
+    BN_DEF(0x28ADF3F6, 0x119DD0C3),
+    BN_DEF(0xD04861D1, 0xCCD94B27),
+    BN_DEF(0xA735E02E, 0x143E2CA3),
+    BN_DEF(0x0FDF6553, 0x97477E0A),
+    BN_DEF(0x826F477C, 0x6DDDE16D),
+    BN_DEF(0x156A2674, 0x12C1F4E5),
+    BN_DEF(0x5B0A85ED, 0x0D4A341A),
+    BN_DEF(0x357A711E, 0x4CE1938C),
+    BN_DEF(0x5EDD2D93, 0xC438CD08),
+    BN_DEF(0x53C3F36B, 0x8D391E09),
+    BN_DEF(0x54908400, 0x25C16890),
+    BN_DEF(0x707E8847, 0xA1EDADFE),
+    BN_DEF(0x3A72D598, 0x047127D0),
+    BN_DEF(0x5D6CA371, 0x3B84C460),
+    BN_DEF(0xBD30AEB6, 0x5DF08BAB),
+    BN_DEF(0x0BBD9006, 0x290F958C),
+    BN_DEF(0x9F643532, 0x6C3B0139),
+    BN_DEF(0x6CC50432, 0xF897FD03),
+    BN_DEF(0x0D697735, 0xE771E913),
+    BN_DEF(0x2512B0CE, 0x8F464A70),
+    BN_DEF(0x6D8499EB, 0xD5FAD746),
+    BN_DEF(0xD370F263, 0xD9CB87C2),
+    BN_DEF(0xAE83063E, 0x457538AB),
+    BN_DEF(0x2C6DF785, 0x767DC282),
+    BN_DEF(0xEF8E5D32, 0xD42A90D5),
+    BN_DEF(0x82283D19, 0xD6998B86),
+    BN_DEF(0x45556216, 0x0AB9472D),
+    BN_DEF(0x4C7D0288, 0x8AE9130C),
+    BN_DEF(0x754AB572, 0x1CCAA4BE),
+    BN_DEF(0x4AAC0B8C, 0xEF15E5FB),
+    BN_DEF(0x37A62964, 0xDAE2AEF8),
+    BN_DEF(0x7603D147, 0xCD93C1D1),
+    BN_DEF(0x0C074301, 0xF1CF3B96),
+    BN_DEF(0x171B671D, 0x19482F23),
+    BN_DEF(0x650C10BE, 0x78BA3604),
+    BN_DEF(0x255E4C02, 0xB3861AA7),
+    BN_DEF(0xB84B4B36, 0xCF6A9483),
+    BN_DEF(0x1042A95D, 0x0E3179AB),
+    BN_DEF(0xEE51D6CB, 0xC1B2AE91),
+    BN_DEF(0x7E9267AF, 0x348B1FD4),
+    BN_DEF(0x0E2AE9CD, 0xCC6D241B),
+    BN_DEF(0x50B1DF82, 0xE1003E5C),
+    BN_DEF(0xF6722D9E, 0x24943328),
+    BN_DEF(0xBE258FF3, 0xD74F9208),
+    BN_DEF(0xAD44CFD2, 0xF71C35FD),
+    BN_DEF(0x7A035BF6, 0x85FFAE5B),
+    BN_DEF(0xD31BF6B5, 0x7A262174),
+    BN_DEF(0x312F3F63, 0xF242DABB),
+    BN_DEF(0xB6A8E122, 0xA7F09AB6),
+    BN_DEF(0xF92F8A1B, 0x98158536),
+    BN_DEF(0xE69D218D, 0xF7CA8CD9),
+    BN_DEF(0xC71A026E, 0x28A5043C),
+    BN_DEF(0x1D89CD91, 0x0105DF53),
+    BN_DEF(0x4533E63A, 0x94812704),
+    BN_DEF(0xC06E0E68, 0x62633145),
+    BN_DEF(0x10B4611A, 0xE487ED51),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
 };
 
 /*-
@@ -303,54 +375,102 @@ static const BN_ULONG modp_6144_p[] = {
 };
 /* q = (p - 1) / 2 */
 static const BN_ULONG modp_6144_q[] = {
-    BN_DEF(0xFFFFFFFF,  0x7FFFFFFF), BN_DEF(0x36E62012,  0x734A7C8F),
-    BN_DEF(0x85BA3A6B,  0x095F96AD), BN_DEF(0x1FA43077,  0x021F47B3),
-    BN_DEF(0xB71E0234,  0x1C3FF46B), BN_DEF(0x17794B19,  0x6D2B64F6),
-    BN_DEF(0xD189EAAE,  0x758CE658), BN_DEF(0xC50FDFF8,  0x7AA8551E),
-    BN_DEF(0xDBE2ED3B,  0x0350EAC5), BN_DEF(0x794DF194,  0x53CB8AF7),
-    BN_DEF(0x07C01BF0,  0x0A662F69), BN_DEF(0x5FA470EC,  0x6647B6BF),
-    BN_DEF(0x15A0AA55,  0xA5EA03D9), BN_DEF(0xFFAC2D62,  0x078EA2DB),
-    BN_DEF(0x1B66445F,  0x91D4BD3F), BN_DEF(0xDF63F479,  0x2CF3E4BF),
-    BN_DEF(0xC8058E4F,  0x5AD42018), BN_DEF(0xA34C0641,  0x6AAF3817),
-    BN_DEF(0x373A7F7B,  0xFA416BE7), BN_DEF(0xE8B90E81,  0x7819750A),
-    BN_DEF(0xE325C976,  0xACC1E500), BN_DEF(0x9BC6695F,  0x37DC7A00),
-    BN_DEF(0x95EBD7A1,  0x999028A8), BN_DEF(0xF36612A5,  0xEDBF8A23),
-    BN_DEF(0x676A5D8D,  0xA267365D), BN_DEF(0xE7CD8A76,  0x6D1F6DF5),
-    BN_DEF(0x432D448C,  0x8BCB93D8), BN_DEF(0xC813EC18,  0x583529F6),
-    BN_DEF(0xA09800D7,  0x72ED9C17), BN_DEF(0x56CF2987,  0xFC7FCA03),
-    BN_DEF(0x1EDD1BDE,  0x64BA8F3B), BN_DEF(0x3013236F,  0x60EA6E59),
-    BN_DEF(0x693E3813,  0x1B61FD5A), BN_DEF(0x9A014249,  0xA6FA1AE4),
-    BN_DEF(0x48536047,  0xC37FDBEE), BN_DEF(0x46C7EEE0,  0xC9DA754C),
-    BN_DEF(0xEAD82D54,  0x68034893), BN_DEF(0x10B8240E,  0xDC0DEEBB),
-    BN_DEF(0x67716BD7,  0x8FB094B8), BN_DEF(0x28ADF3F6,  0x119DD0C3),
-    BN_DEF(0xD04861D1,  0xCCD94B27), BN_DEF(0xA735E02E,  0x143E2CA3),
-    BN_DEF(0x0FDF6553,  0x97477E0A), BN_DEF(0x826F477C,  0x6DDDE16D),
-    BN_DEF(0x156A2674,  0x12C1F4E5), BN_DEF(0x5B0A85ED,  0x0D4A341A),
-    BN_DEF(0x357A711E,  0x4CE1938C), BN_DEF(0x5EDD2D93,  0xC438CD08),
-    BN_DEF(0x53C3F36B,  0x8D391E09), BN_DEF(0x54908400,  0x25C16890),
-    BN_DEF(0x707E8847,  0xA1EDADFE), BN_DEF(0x3A72D598,  0x047127D0),
-    BN_DEF(0x5D6CA371,  0x3B84C460), BN_DEF(0xBD30AEB6,  0x5DF08BAB),
-    BN_DEF(0x0BBD9006,  0x290F958C), BN_DEF(0x9F643532,  0x6C3B0139),
-    BN_DEF(0x6CC50432,  0xF897FD03), BN_DEF(0x0D697735,  0xE771E913),
-    BN_DEF(0x2512B0CE,  0x8F464A70), BN_DEF(0x6D8499EB,  0xD5FAD746),
-    BN_DEF(0xD370F263,  0xD9CB87C2), BN_DEF(0xAE83063E,  0x457538AB),
-    BN_DEF(0x2C6DF785,  0x767DC282), BN_DEF(0xEF8E5D32,  0xD42A90D5),
-    BN_DEF(0x82283D19,  0xD6998B86), BN_DEF(0x45556216,  0x0AB9472D),
-    BN_DEF(0x4C7D0288,  0x8AE9130C), BN_DEF(0x754AB572,  0x1CCAA4BE),
-    BN_DEF(0x4AAC0B8C,  0xEF15E5FB), BN_DEF(0x37A62964,  0xDAE2AEF8),
-    BN_DEF(0x7603D147,  0xCD93C1D1), BN_DEF(0x0C074301,  0xF1CF3B96),
-    BN_DEF(0x171B671D,  0x19482F23), BN_DEF(0x650C10BE,  0x78BA3604),
-    BN_DEF(0x255E4C02,  0xB3861AA7), BN_DEF(0xB84B4B36,  0xCF6A9483),
-    BN_DEF(0x1042A95D,  0x0E3179AB), BN_DEF(0xEE51D6CB,  0xC1B2AE91),
-    BN_DEF(0x7E9267AF,  0x348B1FD4), BN_DEF(0x0E2AE9CD,  0xCC6D241B),
-    BN_DEF(0x50B1DF82,  0xE1003E5C), BN_DEF(0xF6722D9E,  0x24943328),
-    BN_DEF(0xBE258FF3,  0xD74F9208), BN_DEF(0xAD44CFD2,  0xF71C35FD),
-    BN_DEF(0x7A035BF6,  0x85FFAE5B), BN_DEF(0xD31BF6B5,  0x7A262174),
-    BN_DEF(0x312F3F63,  0xF242DABB), BN_DEF(0xB6A8E122,  0xA7F09AB6),
-    BN_DEF(0xF92F8A1B,  0x98158536), BN_DEF(0xE69D218D,  0xF7CA8CD9),
-    BN_DEF(0xC71A026E,  0x28A5043C), BN_DEF(0x1D89CD91,  0x0105DF53),
-    BN_DEF(0x4533E63A,  0x94812704), BN_DEF(0xC06E0E68,  0x62633145),
-    BN_DEF(0x10B4611A,  0xE487ED51), BN_DEF(0xFFFFFFFF,  0x7FFFFFFF),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+    BN_DEF(0x36E62012, 0x734A7C8F),
+    BN_DEF(0x85BA3A6B, 0x095F96AD),
+    BN_DEF(0x1FA43077, 0x021F47B3),
+    BN_DEF(0xB71E0234, 0x1C3FF46B),
+    BN_DEF(0x17794B19, 0x6D2B64F6),
+    BN_DEF(0xD189EAAE, 0x758CE658),
+    BN_DEF(0xC50FDFF8, 0x7AA8551E),
+    BN_DEF(0xDBE2ED3B, 0x0350EAC5),
+    BN_DEF(0x794DF194, 0x53CB8AF7),
+    BN_DEF(0x07C01BF0, 0x0A662F69),
+    BN_DEF(0x5FA470EC, 0x6647B6BF),
+    BN_DEF(0x15A0AA55, 0xA5EA03D9),
+    BN_DEF(0xFFAC2D62, 0x078EA2DB),
+    BN_DEF(0x1B66445F, 0x91D4BD3F),
+    BN_DEF(0xDF63F479, 0x2CF3E4BF),
+    BN_DEF(0xC8058E4F, 0x5AD42018),
+    BN_DEF(0xA34C0641, 0x6AAF3817),
+    BN_DEF(0x373A7F7B, 0xFA416BE7),
+    BN_DEF(0xE8B90E81, 0x7819750A),
+    BN_DEF(0xE325C976, 0xACC1E500),
+    BN_DEF(0x9BC6695F, 0x37DC7A00),
+    BN_DEF(0x95EBD7A1, 0x999028A8),
+    BN_DEF(0xF36612A5, 0xEDBF8A23),
+    BN_DEF(0x676A5D8D, 0xA267365D),
+    BN_DEF(0xE7CD8A76, 0x6D1F6DF5),
+    BN_DEF(0x432D448C, 0x8BCB93D8),
+    BN_DEF(0xC813EC18, 0x583529F6),
+    BN_DEF(0xA09800D7, 0x72ED9C17),
+    BN_DEF(0x56CF2987, 0xFC7FCA03),
+    BN_DEF(0x1EDD1BDE, 0x64BA8F3B),
+    BN_DEF(0x3013236F, 0x60EA6E59),
+    BN_DEF(0x693E3813, 0x1B61FD5A),
+    BN_DEF(0x9A014249, 0xA6FA1AE4),
+    BN_DEF(0x48536047, 0xC37FDBEE),
+    BN_DEF(0x46C7EEE0, 0xC9DA754C),
+    BN_DEF(0xEAD82D54, 0x68034893),
+    BN_DEF(0x10B8240E, 0xDC0DEEBB),
+    BN_DEF(0x67716BD7, 0x8FB094B8),
+    BN_DEF(0x28ADF3F6, 0x119DD0C3),
+    BN_DEF(0xD04861D1, 0xCCD94B27),
+    BN_DEF(0xA735E02E, 0x143E2CA3),
+    BN_DEF(0x0FDF6553, 0x97477E0A),
+    BN_DEF(0x826F477C, 0x6DDDE16D),
+    BN_DEF(0x156A2674, 0x12C1F4E5),
+    BN_DEF(0x5B0A85ED, 0x0D4A341A),
+    BN_DEF(0x357A711E, 0x4CE1938C),
+    BN_DEF(0x5EDD2D93, 0xC438CD08),
+    BN_DEF(0x53C3F36B, 0x8D391E09),
+    BN_DEF(0x54908400, 0x25C16890),
+    BN_DEF(0x707E8847, 0xA1EDADFE),
+    BN_DEF(0x3A72D598, 0x047127D0),
+    BN_DEF(0x5D6CA371, 0x3B84C460),
+    BN_DEF(0xBD30AEB6, 0x5DF08BAB),
+    BN_DEF(0x0BBD9006, 0x290F958C),
+    BN_DEF(0x9F643532, 0x6C3B0139),
+    BN_DEF(0x6CC50432, 0xF897FD03),
+    BN_DEF(0x0D697735, 0xE771E913),
+    BN_DEF(0x2512B0CE, 0x8F464A70),
+    BN_DEF(0x6D8499EB, 0xD5FAD746),
+    BN_DEF(0xD370F263, 0xD9CB87C2),
+    BN_DEF(0xAE83063E, 0x457538AB),
+    BN_DEF(0x2C6DF785, 0x767DC282),
+    BN_DEF(0xEF8E5D32, 0xD42A90D5),
+    BN_DEF(0x82283D19, 0xD6998B86),
+    BN_DEF(0x45556216, 0x0AB9472D),
+    BN_DEF(0x4C7D0288, 0x8AE9130C),
+    BN_DEF(0x754AB572, 0x1CCAA4BE),
+    BN_DEF(0x4AAC0B8C, 0xEF15E5FB),
+    BN_DEF(0x37A62964, 0xDAE2AEF8),
+    BN_DEF(0x7603D147, 0xCD93C1D1),
+    BN_DEF(0x0C074301, 0xF1CF3B96),
+    BN_DEF(0x171B671D, 0x19482F23),
+    BN_DEF(0x650C10BE, 0x78BA3604),
+    BN_DEF(0x255E4C02, 0xB3861AA7),
+    BN_DEF(0xB84B4B36, 0xCF6A9483),
+    BN_DEF(0x1042A95D, 0x0E3179AB),
+    BN_DEF(0xEE51D6CB, 0xC1B2AE91),
+    BN_DEF(0x7E9267AF, 0x348B1FD4),
+    BN_DEF(0x0E2AE9CD, 0xCC6D241B),
+    BN_DEF(0x50B1DF82, 0xE1003E5C),
+    BN_DEF(0xF6722D9E, 0x24943328),
+    BN_DEF(0xBE258FF3, 0xD74F9208),
+    BN_DEF(0xAD44CFD2, 0xF71C35FD),
+    BN_DEF(0x7A035BF6, 0x85FFAE5B),
+    BN_DEF(0xD31BF6B5, 0x7A262174),
+    BN_DEF(0x312F3F63, 0xF242DABB),
+    BN_DEF(0xB6A8E122, 0xA7F09AB6),
+    BN_DEF(0xF92F8A1B, 0x98158536),
+    BN_DEF(0xE69D218D, 0xF7CA8CD9),
+    BN_DEF(0xC71A026E, 0x28A5043C),
+    BN_DEF(0x1D89CD91, 0x0105DF53),
+    BN_DEF(0x4533E63A, 0x94812704),
+    BN_DEF(0xC06E0E68, 0x62633145),
+    BN_DEF(0x10B4611A, 0xE487ED51),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
 };
 
 /*
@@ -428,70 +548,134 @@ static const BN_ULONG modp_8192_p[] = {
 };
 /* q = (p - 1) / 2 */
 static const BN_ULONG modp_8192_q[] = {
-    BN_DEF(0xFFFFFFFF,  0xFFFFFFFF), BN_DEF(0xCC76E9EF,  0xB064C06E),
-    BN_DEF(0x405CB738,  0xE40FAB74), BN_DEF(0x3B2B4A6F,  0x4F182871),
-    BN_DEF(0xAB3BF4D5,  0xCAAC7223), BN_DEF(0x7E013723,  0xE48C86D3),
-    BN_DEF(0x6AF71C15,  0xC44D0017), BN_DEF(0xA40E366B,  0x2004A1C5),
-    BN_DEF(0x75C3CFC9,  0x1AC8237A), BN_DEF(0x8F67D134,  0xFD79B5E1),
-    BN_DEF(0xBF73A6B9,  0xD8EA885E), BN_DEF(0xAEF6BF50,  0xFCD5A40C),
-    BN_DEF(0x8423428E,  0xB2798E62), BN_DEF(0xD012AEE0,  0x22CBF44C),
-    BN_DEF(0x3A55B51B,  0xEF988770), BN_DEF(0x1FA27C16,  0x369509FC),
-    BN_DEF(0xD9D13C53,  0x03159E7A), BN_DEF(0xF6ADEE9D,  0x3CB41981),
-    BN_DEF(0xD16043F4,  0xFD4EA5BF), BN_DEF(0x17C1C2EE,  0xA5E5E443),
-    BN_DEF(0x36751835,  0x9A39FE32), BN_DEF(0x0D11F863,  0x89F5ABD4),
-    BN_DEF(0x5201BE03,  0x91111702), BN_DEF(0x7E42456C,  0xF1FEDC5F),
-    BN_DEF(0xF1CEB296,  0x11C78B65), BN_DEF(0x15F8E4BC,  0x1A11DA3A),
-    BN_DEF(0x2D727AB4,  0x1D55B1CE), BN_DEF(0xB5D21233,  0x92BB7B49),
-    BN_DEF(0xC57E23F6,  0x3A0FD3DF), BN_DEF(0x46CEE980,  0x1DE4195B),
-    BN_DEF(0x39DC98DD,  0x6C5F6268), BN_DEF(0x54996FC6,  0x1C3BBE5B),
-    BN_DEF(0x897F72F2,  0xBA51C937), BN_DEF(0x36DF08AC,  0x734A7C8F),
-    BN_DEF(0x85BA3A6B,  0x095F96AD), BN_DEF(0x1FA43077,  0x021F47B3),
-    BN_DEF(0xB71E0234,  0x1C3FF46B), BN_DEF(0x17794B19,  0x6D2B64F6),
-    BN_DEF(0xD189EAAE,  0x758CE658), BN_DEF(0xC50FDFF8,  0x7AA8551E),
-    BN_DEF(0xDBE2ED3B,  0x0350EAC5), BN_DEF(0x794DF194,  0x53CB8AF7),
-    BN_DEF(0x07C01BF0,  0x0A662F69), BN_DEF(0x5FA470EC,  0x6647B6BF),
-    BN_DEF(0x15A0AA55,  0xA5EA03D9), BN_DEF(0xFFAC2D62,  0x078EA2DB),
-    BN_DEF(0x1B66445F,  0x91D4BD3F), BN_DEF(0xDF63F479,  0x2CF3E4BF),
-    BN_DEF(0xC8058E4F,  0x5AD42018), BN_DEF(0xA34C0641,  0x6AAF3817),
-    BN_DEF(0x373A7F7B,  0xFA416BE7), BN_DEF(0xE8B90E81,  0x7819750A),
-    BN_DEF(0xE325C976,  0xACC1E500), BN_DEF(0x9BC6695F,  0x37DC7A00),
-    BN_DEF(0x95EBD7A1,  0x999028A8), BN_DEF(0xF36612A5,  0xEDBF8A23),
-    BN_DEF(0x676A5D8D,  0xA267365D), BN_DEF(0xE7CD8A76,  0x6D1F6DF5),
-    BN_DEF(0x432D448C,  0x8BCB93D8), BN_DEF(0xC813EC18,  0x583529F6),
-    BN_DEF(0xA09800D7,  0x72ED9C17), BN_DEF(0x56CF2987,  0xFC7FCA03),
-    BN_DEF(0x1EDD1BDE,  0x64BA8F3B), BN_DEF(0x3013236F,  0x60EA6E59),
-    BN_DEF(0x693E3813,  0x1B61FD5A), BN_DEF(0x9A014249,  0xA6FA1AE4),
-    BN_DEF(0x48536047,  0xC37FDBEE), BN_DEF(0x46C7EEE0,  0xC9DA754C),
-    BN_DEF(0xEAD82D54,  0x68034893), BN_DEF(0x10B8240E,  0xDC0DEEBB),
-    BN_DEF(0x67716BD7,  0x8FB094B8), BN_DEF(0x28ADF3F6,  0x119DD0C3),
-    BN_DEF(0xD04861D1,  0xCCD94B27), BN_DEF(0xA735E02E,  0x143E2CA3),
-    BN_DEF(0x0FDF6553,  0x97477E0A), BN_DEF(0x826F477C,  0x6DDDE16D),
-    BN_DEF(0x156A2674,  0x12C1F4E5), BN_DEF(0x5B0A85ED,  0x0D4A341A),
-    BN_DEF(0x357A711E,  0x4CE1938C), BN_DEF(0x5EDD2D93,  0xC438CD08),
-    BN_DEF(0x53C3F36B,  0x8D391E09), BN_DEF(0x54908400,  0x25C16890),
-    BN_DEF(0x707E8847,  0xA1EDADFE), BN_DEF(0x3A72D598,  0x047127D0),
-    BN_DEF(0x5D6CA371,  0x3B84C460), BN_DEF(0xBD30AEB6,  0x5DF08BAB),
-    BN_DEF(0x0BBD9006,  0x290F958C), BN_DEF(0x9F643532,  0x6C3B0139),
-    BN_DEF(0x6CC50432,  0xF897FD03), BN_DEF(0x0D697735,  0xE771E913),
-    BN_DEF(0x2512B0CE,  0x8F464A70), BN_DEF(0x6D8499EB,  0xD5FAD746),
-    BN_DEF(0xD370F263,  0xD9CB87C2), BN_DEF(0xAE83063E,  0x457538AB),
-    BN_DEF(0x2C6DF785,  0x767DC282), BN_DEF(0xEF8E5D32,  0xD42A90D5),
-    BN_DEF(0x82283D19,  0xD6998B86), BN_DEF(0x45556216,  0x0AB9472D),
-    BN_DEF(0x4C7D0288,  0x8AE9130C), BN_DEF(0x754AB572,  0x1CCAA4BE),
-    BN_DEF(0x4AAC0B8C,  0xEF15E5FB), BN_DEF(0x37A62964,  0xDAE2AEF8),
-    BN_DEF(0x7603D147,  0xCD93C1D1), BN_DEF(0x0C074301,  0xF1CF3B96),
-    BN_DEF(0x171B671D,  0x19482F23), BN_DEF(0x650C10BE,  0x78BA3604),
-    BN_DEF(0x255E4C02,  0xB3861AA7), BN_DEF(0xB84B4B36,  0xCF6A9483),
-    BN_DEF(0x1042A95D,  0x0E3179AB), BN_DEF(0xEE51D6CB,  0xC1B2AE91),
-    BN_DEF(0x7E9267AF,  0x348B1FD4), BN_DEF(0x0E2AE9CD,  0xCC6D241B),
-    BN_DEF(0x50B1DF82,  0xE1003E5C), BN_DEF(0xF6722D9E,  0x24943328),
-    BN_DEF(0xBE258FF3,  0xD74F9208), BN_DEF(0xAD44CFD2,  0xF71C35FD),
-    BN_DEF(0x7A035BF6,  0x85FFAE5B), BN_DEF(0xD31BF6B5,  0x7A262174),
-    BN_DEF(0x312F3F63,  0xF242DABB), BN_DEF(0xB6A8E122,  0xA7F09AB6),
-    BN_DEF(0xF92F8A1B,  0x98158536), BN_DEF(0xE69D218D,  0xF7CA8CD9),
-    BN_DEF(0xC71A026E,  0x28A5043C), BN_DEF(0x1D89CD91,  0x0105DF53),
-    BN_DEF(0x4533E63A,  0x94812704), BN_DEF(0xC06E0E68,  0x62633145),
-    BN_DEF(0x10B4611A,  0xE487ED51), BN_DEF(0xFFFFFFFF,  0x7FFFFFFF),
+    BN_DEF(0xFFFFFFFF, 0xFFFFFFFF),
+    BN_DEF(0xCC76E9EF, 0xB064C06E),
+    BN_DEF(0x405CB738, 0xE40FAB74),
+    BN_DEF(0x3B2B4A6F, 0x4F182871),
+    BN_DEF(0xAB3BF4D5, 0xCAAC7223),
+    BN_DEF(0x7E013723, 0xE48C86D3),
+    BN_DEF(0x6AF71C15, 0xC44D0017),
+    BN_DEF(0xA40E366B, 0x2004A1C5),
+    BN_DEF(0x75C3CFC9, 0x1AC8237A),
+    BN_DEF(0x8F67D134, 0xFD79B5E1),
+    BN_DEF(0xBF73A6B9, 0xD8EA885E),
+    BN_DEF(0xAEF6BF50, 0xFCD5A40C),
+    BN_DEF(0x8423428E, 0xB2798E62),
+    BN_DEF(0xD012AEE0, 0x22CBF44C),
+    BN_DEF(0x3A55B51B, 0xEF988770),
+    BN_DEF(0x1FA27C16, 0x369509FC),
+    BN_DEF(0xD9D13C53, 0x03159E7A),
+    BN_DEF(0xF6ADEE9D, 0x3CB41981),
+    BN_DEF(0xD16043F4, 0xFD4EA5BF),
+    BN_DEF(0x17C1C2EE, 0xA5E5E443),
+    BN_DEF(0x36751835, 0x9A39FE32),
+    BN_DEF(0x0D11F863, 0x89F5ABD4),
+    BN_DEF(0x5201BE03, 0x91111702),
+    BN_DEF(0x7E42456C, 0xF1FEDC5F),
+    BN_DEF(0xF1CEB296, 0x11C78B65),
+    BN_DEF(0x15F8E4BC, 0x1A11DA3A),
+    BN_DEF(0x2D727AB4, 0x1D55B1CE),
+    BN_DEF(0xB5D21233, 0x92BB7B49),
+    BN_DEF(0xC57E23F6, 0x3A0FD3DF),
+    BN_DEF(0x46CEE980, 0x1DE4195B),
+    BN_DEF(0x39DC98DD, 0x6C5F6268),
+    BN_DEF(0x54996FC6, 0x1C3BBE5B),
+    BN_DEF(0x897F72F2, 0xBA51C937),
+    BN_DEF(0x36DF08AC, 0x734A7C8F),
+    BN_DEF(0x85BA3A6B, 0x095F96AD),
+    BN_DEF(0x1FA43077, 0x021F47B3),
+    BN_DEF(0xB71E0234, 0x1C3FF46B),
+    BN_DEF(0x17794B19, 0x6D2B64F6),
+    BN_DEF(0xD189EAAE, 0x758CE658),
+    BN_DEF(0xC50FDFF8, 0x7AA8551E),
+    BN_DEF(0xDBE2ED3B, 0x0350EAC5),
+    BN_DEF(0x794DF194, 0x53CB8AF7),
+    BN_DEF(0x07C01BF0, 0x0A662F69),
+    BN_DEF(0x5FA470EC, 0x6647B6BF),
+    BN_DEF(0x15A0AA55, 0xA5EA03D9),
+    BN_DEF(0xFFAC2D62, 0x078EA2DB),
+    BN_DEF(0x1B66445F, 0x91D4BD3F),
+    BN_DEF(0xDF63F479, 0x2CF3E4BF),
+    BN_DEF(0xC8058E4F, 0x5AD42018),
+    BN_DEF(0xA34C0641, 0x6AAF3817),
+    BN_DEF(0x373A7F7B, 0xFA416BE7),
+    BN_DEF(0xE8B90E81, 0x7819750A),
+    BN_DEF(0xE325C976, 0xACC1E500),
+    BN_DEF(0x9BC6695F, 0x37DC7A00),
+    BN_DEF(0x95EBD7A1, 0x999028A8),
+    BN_DEF(0xF36612A5, 0xEDBF8A23),
+    BN_DEF(0x676A5D8D, 0xA267365D),
+    BN_DEF(0xE7CD8A76, 0x6D1F6DF5),
+    BN_DEF(0x432D448C, 0x8BCB93D8),
+    BN_DEF(0xC813EC18, 0x583529F6),
+    BN_DEF(0xA09800D7, 0x72ED9C17),
+    BN_DEF(0x56CF2987, 0xFC7FCA03),
+    BN_DEF(0x1EDD1BDE, 0x64BA8F3B),
+    BN_DEF(0x3013236F, 0x60EA6E59),
+    BN_DEF(0x693E3813, 0x1B61FD5A),
+    BN_DEF(0x9A014249, 0xA6FA1AE4),
+    BN_DEF(0x48536047, 0xC37FDBEE),
+    BN_DEF(0x46C7EEE0, 0xC9DA754C),
+    BN_DEF(0xEAD82D54, 0x68034893),
+    BN_DEF(0x10B8240E, 0xDC0DEEBB),
+    BN_DEF(0x67716BD7, 0x8FB094B8),
+    BN_DEF(0x28ADF3F6, 0x119DD0C3),
+    BN_DEF(0xD04861D1, 0xCCD94B27),
+    BN_DEF(0xA735E02E, 0x143E2CA3),
+    BN_DEF(0x0FDF6553, 0x97477E0A),
+    BN_DEF(0x826F477C, 0x6DDDE16D),
+    BN_DEF(0x156A2674, 0x12C1F4E5),
+    BN_DEF(0x5B0A85ED, 0x0D4A341A),
+    BN_DEF(0x357A711E, 0x4CE1938C),
+    BN_DEF(0x5EDD2D93, 0xC438CD08),
+    BN_DEF(0x53C3F36B, 0x8D391E09),
+    BN_DEF(0x54908400, 0x25C16890),
+    BN_DEF(0x707E8847, 0xA1EDADFE),
+    BN_DEF(0x3A72D598, 0x047127D0),
+    BN_DEF(0x5D6CA371, 0x3B84C460),
+    BN_DEF(0xBD30AEB6, 0x5DF08BAB),
+    BN_DEF(0x0BBD9006, 0x290F958C),
+    BN_DEF(0x9F643532, 0x6C3B0139),
+    BN_DEF(0x6CC50432, 0xF897FD03),
+    BN_DEF(0x0D697735, 0xE771E913),
+    BN_DEF(0x2512B0CE, 0x8F464A70),
+    BN_DEF(0x6D8499EB, 0xD5FAD746),
+    BN_DEF(0xD370F263, 0xD9CB87C2),
+    BN_DEF(0xAE83063E, 0x457538AB),
+    BN_DEF(0x2C6DF785, 0x767DC282),
+    BN_DEF(0xEF8E5D32, 0xD42A90D5),
+    BN_DEF(0x82283D19, 0xD6998B86),
+    BN_DEF(0x45556216, 0x0AB9472D),
+    BN_DEF(0x4C7D0288, 0x8AE9130C),
+    BN_DEF(0x754AB572, 0x1CCAA4BE),
+    BN_DEF(0x4AAC0B8C, 0xEF15E5FB),
+    BN_DEF(0x37A62964, 0xDAE2AEF8),
+    BN_DEF(0x7603D147, 0xCD93C1D1),
+    BN_DEF(0x0C074301, 0xF1CF3B96),
+    BN_DEF(0x171B671D, 0x19482F23),
+    BN_DEF(0x650C10BE, 0x78BA3604),
+    BN_DEF(0x255E4C02, 0xB3861AA7),
+    BN_DEF(0xB84B4B36, 0xCF6A9483),
+    BN_DEF(0x1042A95D, 0x0E3179AB),
+    BN_DEF(0xEE51D6CB, 0xC1B2AE91),
+    BN_DEF(0x7E9267AF, 0x348B1FD4),
+    BN_DEF(0x0E2AE9CD, 0xCC6D241B),
+    BN_DEF(0x50B1DF82, 0xE1003E5C),
+    BN_DEF(0xF6722D9E, 0x24943328),
+    BN_DEF(0xBE258FF3, 0xD74F9208),
+    BN_DEF(0xAD44CFD2, 0xF71C35FD),
+    BN_DEF(0x7A035BF6, 0x85FFAE5B),
+    BN_DEF(0xD31BF6B5, 0x7A262174),
+    BN_DEF(0x312F3F63, 0xF242DABB),
+    BN_DEF(0xB6A8E122, 0xA7F09AB6),
+    BN_DEF(0xF92F8A1B, 0x98158536),
+    BN_DEF(0xE69D218D, 0xF7CA8CD9),
+    BN_DEF(0xC71A026E, 0x28A5043C),
+    BN_DEF(0x1D89CD91, 0x0105DF53),
+    BN_DEF(0x4533E63A, 0x94812704),
+    BN_DEF(0xC06E0E68, 0x62633145),
+    BN_DEF(0x10B4611A, 0xE487ED51),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
 };
 
 /* DH parameters from RFC5114 */
@@ -623,22 +807,38 @@ static const BN_ULONG ffdhe2048_p[] = {
 };
 /* q = (p - 1) / 2 */
 static const BN_ULONG ffdhe2048_q[] = {
-    BN_DEF(0xFFFFFFFF,  0xFFFFFFFF), BN_DEF(0x30942E4B,  0x4435A11C),
-    BN_DEF(0x60D977FD,  0x6379A513), BN_DEF(0xBE8B41D9,  0xE2C778C1),
-    BN_DEF(0x17611002,  0x9DDAFE5E), BN_DEF(0xA637D6B9,  0xE1FF1D8D),
-    BN_DEF(0x777940C1,  0xC7278919), BN_DEF(0x74C2C1FF,  0xC8B97F4E),
-    BN_DEF(0x941A17B0,  0x601A0266), BN_DEF(0xE6FBF176,  0x4F017E70),
-    BN_DEF(0x770536B8,  0x8583D3E4), BN_DEF(0xB1B95D8C,  0x572B76F3),
-    BN_DEF(0xEF1CA6FA,  0x0EA7A151), BN_DEF(0xB06BFA34,  0xDCB56D5B),
-    BN_DEF(0xD96471FD,  0xE88454A5), BN_DEF(0x59927DB0,  0x5E0558C1),
-    BN_DEF(0xA41D3CBD,  0x98566527), BN_DEF(0x9B56F39A,  0x0EF8AC50),
-    BN_DEF(0x79F7F439,  0xF15344ED), BN_DEF(0x707345BB,  0xCC278638),
-    BN_DEF(0x3FABE49A,  0xDAAB89AF), BN_DEF(0x9EF68D79,  0x42B1B2AA),
-    BN_DEF(0xAF833768,  0x9219FA8F), BN_DEF(0xEAFEB2B0,  0x69EF8F6A),
-    BN_DEF(0x576230BD,  0x7B40D901), BN_DEF(0xB1863AEC,  0xBE97F1B1),
-    BN_DEF(0x124D9F7C,  0xE649CEE7), BN_DEF(0x8A3219FD,  0xD4F09B20),
-    BN_DEF(0xE7169B4A,  0xEC5CE2C1), BN_DEF(0x139E9E78,  0x57EE2B10),
-    BN_DEF(0x515DA54D,  0xD6FC2A2C), BN_DEF(0xFFFFFFFF,  0x7FFFFFFF),
+    BN_DEF(0xFFFFFFFF, 0xFFFFFFFF),
+    BN_DEF(0x30942E4B, 0x4435A11C),
+    BN_DEF(0x60D977FD, 0x6379A513),
+    BN_DEF(0xBE8B41D9, 0xE2C778C1),
+    BN_DEF(0x17611002, 0x9DDAFE5E),
+    BN_DEF(0xA637D6B9, 0xE1FF1D8D),
+    BN_DEF(0x777940C1, 0xC7278919),
+    BN_DEF(0x74C2C1FF, 0xC8B97F4E),
+    BN_DEF(0x941A17B0, 0x601A0266),
+    BN_DEF(0xE6FBF176, 0x4F017E70),
+    BN_DEF(0x770536B8, 0x8583D3E4),
+    BN_DEF(0xB1B95D8C, 0x572B76F3),
+    BN_DEF(0xEF1CA6FA, 0x0EA7A151),
+    BN_DEF(0xB06BFA34, 0xDCB56D5B),
+    BN_DEF(0xD96471FD, 0xE88454A5),
+    BN_DEF(0x59927DB0, 0x5E0558C1),
+    BN_DEF(0xA41D3CBD, 0x98566527),
+    BN_DEF(0x9B56F39A, 0x0EF8AC50),
+    BN_DEF(0x79F7F439, 0xF15344ED),
+    BN_DEF(0x707345BB, 0xCC278638),
+    BN_DEF(0x3FABE49A, 0xDAAB89AF),
+    BN_DEF(0x9EF68D79, 0x42B1B2AA),
+    BN_DEF(0xAF833768, 0x9219FA8F),
+    BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
+    BN_DEF(0x576230BD, 0x7B40D901),
+    BN_DEF(0xB1863AEC, 0xBE97F1B1),
+    BN_DEF(0x124D9F7C, 0xE649CEE7),
+    BN_DEF(0x8A3219FD, 0xD4F09B20),
+    BN_DEF(0xE7169B4A, 0xEC5CE2C1),
+    BN_DEF(0x139E9E78, 0x57EE2B10),
+    BN_DEF(0x515DA54D, 0xD6FC2A2C),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
 };
 
 static const BN_ULONG ffdhe3072_p[] = {
@@ -669,30 +869,54 @@ static const BN_ULONG ffdhe3072_p[] = {
 };
 /* q = (p - 1) / 2 */
 static const BN_ULONG ffdhe3072_q[] = {
-    BN_DEF(0xFFFFFFFF,  0xFFFFFFFF), BN_DEF(0xB363171B,  0x12F20E95),
-    BN_DEF(0x1FEACEBE,  0x9E0D9077), BN_DEF(0xFD29EEF7,  0x055E6835),
-    BN_DEF(0x6AE22427,  0x0EDFCD21), BN_DEF(0xCD86F56D,  0xD5E290CB),
-    BN_DEF(0x911B1D06,  0x743695E2), BN_DEF(0xCE4EFB4F,  0xAE574155),
-    BN_DEF(0x38FAA5FF,  0xB279710F), BN_DEF(0x716BA6E9,  0x7A7EA229),
-    BN_DEF(0xDE21BCA2,  0x5A098649), BN_DEF(0xC289C938,  0x577F0984),
-    BN_DEF(0x60C36C8E,  0x2CC6587D), BN_DEF(0x48FBFBF7,  0xBD6C8E93),
-    BN_DEF(0xEB736483,  0x30DA37E4), BN_DEF(0x7CCE011C,  0xDE1A7A6F),
-    BN_DEF(0xB28C81AD,  0x6F1AAD9D), BN_DEF(0x308FE7EE,  0x4435A11C),
-    BN_DEF(0x60D977FD,  0x6379A513), BN_DEF(0xBE8B41D9,  0xE2C778C1),
-    BN_DEF(0x17611002,  0x9DDAFE5E), BN_DEF(0xA637D6B9,  0xE1FF1D8D),
-    BN_DEF(0x777940C1,  0xC7278919), BN_DEF(0x74C2C1FF,  0xC8B97F4E),
-    BN_DEF(0x941A17B0,  0x601A0266), BN_DEF(0xE6FBF176,  0x4F017E70),
-    BN_DEF(0x770536B8,  0x8583D3E4), BN_DEF(0xB1B95D8C,  0x572B76F3),
-    BN_DEF(0xEF1CA6FA,  0x0EA7A151), BN_DEF(0xB06BFA34,  0xDCB56D5B),
-    BN_DEF(0xD96471FD,  0xE88454A5), BN_DEF(0x59927DB0,  0x5E0558C1),
-    BN_DEF(0xA41D3CBD,  0x98566527), BN_DEF(0x9B56F39A,  0x0EF8AC50),
-    BN_DEF(0x79F7F439,  0xF15344ED), BN_DEF(0x707345BB,  0xCC278638),
-    BN_DEF(0x3FABE49A,  0xDAAB89AF), BN_DEF(0x9EF68D79,  0x42B1B2AA),
-    BN_DEF(0xAF833768,  0x9219FA8F), BN_DEF(0xEAFEB2B0,  0x69EF8F6A),
-    BN_DEF(0x576230BD,  0x7B40D901), BN_DEF(0xB1863AEC,  0xBE97F1B1),
-    BN_DEF(0x124D9F7C,  0xE649CEE7), BN_DEF(0x8A3219FD,  0xD4F09B20),
-    BN_DEF(0xE7169B4A,  0xEC5CE2C1), BN_DEF(0x139E9E78,  0x57EE2B10),
-    BN_DEF(0x515DA54D,  0xD6FC2A2C), BN_DEF(0xFFFFFFFF,  0x7FFFFFFF),
+    BN_DEF(0xFFFFFFFF, 0xFFFFFFFF),
+    BN_DEF(0xB363171B, 0x12F20E95),
+    BN_DEF(0x1FEACEBE, 0x9E0D9077),
+    BN_DEF(0xFD29EEF7, 0x055E6835),
+    BN_DEF(0x6AE22427, 0x0EDFCD21),
+    BN_DEF(0xCD86F56D, 0xD5E290CB),
+    BN_DEF(0x911B1D06, 0x743695E2),
+    BN_DEF(0xCE4EFB4F, 0xAE574155),
+    BN_DEF(0x38FAA5FF, 0xB279710F),
+    BN_DEF(0x716BA6E9, 0x7A7EA229),
+    BN_DEF(0xDE21BCA2, 0x5A098649),
+    BN_DEF(0xC289C938, 0x577F0984),
+    BN_DEF(0x60C36C8E, 0x2CC6587D),
+    BN_DEF(0x48FBFBF7, 0xBD6C8E93),
+    BN_DEF(0xEB736483, 0x30DA37E4),
+    BN_DEF(0x7CCE011C, 0xDE1A7A6F),
+    BN_DEF(0xB28C81AD, 0x6F1AAD9D),
+    BN_DEF(0x308FE7EE, 0x4435A11C),
+    BN_DEF(0x60D977FD, 0x6379A513),
+    BN_DEF(0xBE8B41D9, 0xE2C778C1),
+    BN_DEF(0x17611002, 0x9DDAFE5E),
+    BN_DEF(0xA637D6B9, 0xE1FF1D8D),
+    BN_DEF(0x777940C1, 0xC7278919),
+    BN_DEF(0x74C2C1FF, 0xC8B97F4E),
+    BN_DEF(0x941A17B0, 0x601A0266),
+    BN_DEF(0xE6FBF176, 0x4F017E70),
+    BN_DEF(0x770536B8, 0x8583D3E4),
+    BN_DEF(0xB1B95D8C, 0x572B76F3),
+    BN_DEF(0xEF1CA6FA, 0x0EA7A151),
+    BN_DEF(0xB06BFA34, 0xDCB56D5B),
+    BN_DEF(0xD96471FD, 0xE88454A5),
+    BN_DEF(0x59927DB0, 0x5E0558C1),
+    BN_DEF(0xA41D3CBD, 0x98566527),
+    BN_DEF(0x9B56F39A, 0x0EF8AC50),
+    BN_DEF(0x79F7F439, 0xF15344ED),
+    BN_DEF(0x707345BB, 0xCC278638),
+    BN_DEF(0x3FABE49A, 0xDAAB89AF),
+    BN_DEF(0x9EF68D79, 0x42B1B2AA),
+    BN_DEF(0xAF833768, 0x9219FA8F),
+    BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
+    BN_DEF(0x576230BD, 0x7B40D901),
+    BN_DEF(0xB1863AEC, 0xBE97F1B1),
+    BN_DEF(0x124D9F7C, 0xE649CEE7),
+    BN_DEF(0x8A3219FD, 0xD4F09B20),
+    BN_DEF(0xE7169B4A, 0xEC5CE2C1),
+    BN_DEF(0x139E9E78, 0x57EE2B10),
+    BN_DEF(0x515DA54D, 0xD6FC2A2C),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
 };
 
 static const BN_ULONG ffdhe4096_p[] = {
@@ -731,38 +955,70 @@ static const BN_ULONG ffdhe4096_p[] = {
 };
 /* q = (p - 1) / 2 */
 static const BN_ULONG ffdhe4096_q[] = {
-    BN_DEF(0xFFFFFFFF,  0x7FFFFFFF), BN_DEF(0x2F32AFB5,  0xE345003F),
-    BN_DEF(0xFA20C170,  0xA6DAD428), BN_DEF(0x3FC45235,  0xC764DAAD),
-    BN_DEF(0xE764BEE7,  0x054148E6), BN_DEF(0xFCC68566,  0x15276754),
-    BN_DEF(0xB8A0001E,  0x0D0EDC9E), BN_DEF(0x99E5C5BD,  0x0494CCD1),
-    BN_DEF(0xB8D6801C,  0x36E3BC7C), BN_DEF(0x48C09862,  0x5483B005),
-    BN_DEF(0x96CF3419,  0x76B50F00), BN_DEF(0x77DA18C5,  0x389AE443),
-    BN_DEF(0xBF18E63D,  0x43FAADD2), BN_DEF(0xAA81A002,  0x3BB1E78E),
-    BN_DEF(0x6B4FB68C,  0x563EAFA1), BN_DEF(0x72C42BDB,  0xBC9874F2),
-    BN_DEF(0x8B26FA7D,  0xB737A961), BN_DEF(0xB34F0F78,  0x12F20E95),
-    BN_DEF(0x1FEACEBE,  0x9E0D9077), BN_DEF(0xFD29EEF7,  0x055E6835),
-    BN_DEF(0x6AE22427,  0x0EDFCD21), BN_DEF(0xCD86F56D,  0xD5E290CB),
-    BN_DEF(0x911B1D06,  0x743695E2), BN_DEF(0xCE4EFB4F,  0xAE574155),
-    BN_DEF(0x38FAA5FF,  0xB279710F), BN_DEF(0x716BA6E9,  0x7A7EA229),
-    BN_DEF(0xDE21BCA2,  0x5A098649), BN_DEF(0xC289C938,  0x577F0984),
-    BN_DEF(0x60C36C8E,  0x2CC6587D), BN_DEF(0x48FBFBF7,  0xBD6C8E93),
-    BN_DEF(0xEB736483,  0x30DA37E4), BN_DEF(0x7CCE011C,  0xDE1A7A6F),
-    BN_DEF(0xB28C81AD,  0x6F1AAD9D), BN_DEF(0x308FE7EE,  0x4435A11C),
-    BN_DEF(0x60D977FD,  0x6379A513), BN_DEF(0xBE8B41D9,  0xE2C778C1),
-    BN_DEF(0x17611002,  0x9DDAFE5E), BN_DEF(0xA637D6B9,  0xE1FF1D8D),
-    BN_DEF(0x777940C1,  0xC7278919), BN_DEF(0x74C2C1FF,  0xC8B97F4E),
-    BN_DEF(0x941A17B0,  0x601A0266), BN_DEF(0xE6FBF176,  0x4F017E70),
-    BN_DEF(0x770536B8,  0x8583D3E4), BN_DEF(0xB1B95D8C,  0x572B76F3),
-    BN_DEF(0xEF1CA6FA,  0x0EA7A151), BN_DEF(0xB06BFA34,  0xDCB56D5B),
-    BN_DEF(0xD96471FD,  0xE88454A5), BN_DEF(0x59927DB0,  0x5E0558C1),
-    BN_DEF(0xA41D3CBD,  0x98566527), BN_DEF(0x9B56F39A,  0x0EF8AC50),
-    BN_DEF(0x79F7F439,  0xF15344ED), BN_DEF(0x707345BB,  0xCC278638),
-    BN_DEF(0x3FABE49A,  0xDAAB89AF), BN_DEF(0x9EF68D79,  0x42B1B2AA),
-    BN_DEF(0xAF833768,  0x9219FA8F), BN_DEF(0xEAFEB2B0,  0x69EF8F6A),
-    BN_DEF(0x576230BD,  0x7B40D901), BN_DEF(0xB1863AEC,  0xBE97F1B1),
-    BN_DEF(0x124D9F7C,  0xE649CEE7), BN_DEF(0x8A3219FD,  0xD4F09B20),
-    BN_DEF(0xE7169B4A,  0xEC5CE2C1), BN_DEF(0x139E9E78,  0x57EE2B10),
-    BN_DEF(0x515DA54D,  0xD6FC2A2C), BN_DEF(0xFFFFFFFF,  0x7FFFFFFF),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+    BN_DEF(0x2F32AFB5, 0xE345003F),
+    BN_DEF(0xFA20C170, 0xA6DAD428),
+    BN_DEF(0x3FC45235, 0xC764DAAD),
+    BN_DEF(0xE764BEE7, 0x054148E6),
+    BN_DEF(0xFCC68566, 0x15276754),
+    BN_DEF(0xB8A0001E, 0x0D0EDC9E),
+    BN_DEF(0x99E5C5BD, 0x0494CCD1),
+    BN_DEF(0xB8D6801C, 0x36E3BC7C),
+    BN_DEF(0x48C09862, 0x5483B005),
+    BN_DEF(0x96CF3419, 0x76B50F00),
+    BN_DEF(0x77DA18C5, 0x389AE443),
+    BN_DEF(0xBF18E63D, 0x43FAADD2),
+    BN_DEF(0xAA81A002, 0x3BB1E78E),
+    BN_DEF(0x6B4FB68C, 0x563EAFA1),
+    BN_DEF(0x72C42BDB, 0xBC9874F2),
+    BN_DEF(0x8B26FA7D, 0xB737A961),
+    BN_DEF(0xB34F0F78, 0x12F20E95),
+    BN_DEF(0x1FEACEBE, 0x9E0D9077),
+    BN_DEF(0xFD29EEF7, 0x055E6835),
+    BN_DEF(0x6AE22427, 0x0EDFCD21),
+    BN_DEF(0xCD86F56D, 0xD5E290CB),
+    BN_DEF(0x911B1D06, 0x743695E2),
+    BN_DEF(0xCE4EFB4F, 0xAE574155),
+    BN_DEF(0x38FAA5FF, 0xB279710F),
+    BN_DEF(0x716BA6E9, 0x7A7EA229),
+    BN_DEF(0xDE21BCA2, 0x5A098649),
+    BN_DEF(0xC289C938, 0x577F0984),
+    BN_DEF(0x60C36C8E, 0x2CC6587D),
+    BN_DEF(0x48FBFBF7, 0xBD6C8E93),
+    BN_DEF(0xEB736483, 0x30DA37E4),
+    BN_DEF(0x7CCE011C, 0xDE1A7A6F),
+    BN_DEF(0xB28C81AD, 0x6F1AAD9D),
+    BN_DEF(0x308FE7EE, 0x4435A11C),
+    BN_DEF(0x60D977FD, 0x6379A513),
+    BN_DEF(0xBE8B41D9, 0xE2C778C1),
+    BN_DEF(0x17611002, 0x9DDAFE5E),
+    BN_DEF(0xA637D6B9, 0xE1FF1D8D),
+    BN_DEF(0x777940C1, 0xC7278919),
+    BN_DEF(0x74C2C1FF, 0xC8B97F4E),
+    BN_DEF(0x941A17B0, 0x601A0266),
+    BN_DEF(0xE6FBF176, 0x4F017E70),
+    BN_DEF(0x770536B8, 0x8583D3E4),
+    BN_DEF(0xB1B95D8C, 0x572B76F3),
+    BN_DEF(0xEF1CA6FA, 0x0EA7A151),
+    BN_DEF(0xB06BFA34, 0xDCB56D5B),
+    BN_DEF(0xD96471FD, 0xE88454A5),
+    BN_DEF(0x59927DB0, 0x5E0558C1),
+    BN_DEF(0xA41D3CBD, 0x98566527),
+    BN_DEF(0x9B56F39A, 0x0EF8AC50),
+    BN_DEF(0x79F7F439, 0xF15344ED),
+    BN_DEF(0x707345BB, 0xCC278638),
+    BN_DEF(0x3FABE49A, 0xDAAB89AF),
+    BN_DEF(0x9EF68D79, 0x42B1B2AA),
+    BN_DEF(0xAF833768, 0x9219FA8F),
+    BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
+    BN_DEF(0x576230BD, 0x7B40D901),
+    BN_DEF(0xB1863AEC, 0xBE97F1B1),
+    BN_DEF(0x124D9F7C, 0xE649CEE7),
+    BN_DEF(0x8A3219FD, 0xD4F09B20),
+    BN_DEF(0xE7169B4A, 0xEC5CE2C1),
+    BN_DEF(0x139E9E78, 0x57EE2B10),
+    BN_DEF(0x515DA54D, 0xD6FC2A2C),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
 };
 
 static const BN_ULONG ffdhe6144_p[] = {
@@ -817,54 +1073,102 @@ static const BN_ULONG ffdhe6144_p[] = {
 };
 /* q = (p - 1) / 2 */
 static const BN_ULONG ffdhe6144_q[] = {
-    BN_DEF(0xFFFFFFFF,  0xFFFFFFFF), BN_DEF(0x68720732,  0x5207194E),
-    BN_DEF(0xBC9C6D6A,  0xD20EAB86), BN_DEF(0x6A18B0E0,  0xB1534A93),
-    BN_DEF(0x4D6D8F34,  0x1FEEA547), BN_DEF(0xEE35C06B,  0x2D9DB8FC),
-    BN_DEF(0x63139582,  0xF64E8C08), BN_DEF(0xE5677A01,  0xC66796EA),
-    BN_DEF(0xE4ADC88B,  0x724FA91A), BN_DEF(0xDC2A19C5,  0x282EE416),
-    BN_DEF(0x8AB15423,  0x31149618), BN_DEF(0x3573BFAF,  0x6B9581BA),
-    BN_DEF(0xA316A9C6,  0x7CE4848D), BN_DEF(0x23D33E5F,  0x05746DAC),
-    BN_DEF(0x91308B41,  0x59D39CE0), BN_DEF(0x95140DFB,  0x77556011),
-    BN_DEF(0x3BE57CC9,  0xCA63328F), BN_DEF(0xCA595DE0,  0x3B1F2725),
-    BN_DEF(0x003BECDA,  0xAC3F1C6D), BN_DEF(0x0C1811E1,  0x3FD94FC6),
-    BN_DEF(0xFCF1D137,  0x855F60FF), BN_DEF(0x1A8288F1,  0x50077849),
-    BN_DEF(0x6DB1A06C,  0x5C2A9917), BN_DEF(0xD4D4B488,  0xD29238FB),
-    BN_DEF(0xA67EDA3B,  0x9C40A3FD), BN_DEF(0x2723020F,  0xCD8FAE1F),
-    BN_DEF(0xFE67F638,  0x66D6832B), BN_DEF(0xA6380E1D,  0x59C74619),
-    BN_DEF(0x58E07EA6,  0x48BDEEB2), BN_DEF(0x4DBB1264,  0x1DDA2A19),
-    BN_DEF(0x657A9F53,  0x11DD2221), BN_DEF(0x1C29951D,  0x2733BE96),
-    BN_DEF(0x2281B63D,  0x05FEB25B), BN_DEF(0x2F06EC81,  0xE345003F),
-    BN_DEF(0xFA20C170,  0xA6DAD428), BN_DEF(0x3FC45235,  0xC764DAAD),
-    BN_DEF(0xE764BEE7,  0x054148E6), BN_DEF(0xFCC68566,  0x15276754),
-    BN_DEF(0xB8A0001E,  0x0D0EDC9E), BN_DEF(0x99E5C5BD,  0x0494CCD1),
-    BN_DEF(0xB8D6801C,  0x36E3BC7C), BN_DEF(0x48C09862,  0x5483B005),
-    BN_DEF(0x96CF3419,  0x76B50F00), BN_DEF(0x77DA18C5,  0x389AE443),
-    BN_DEF(0xBF18E63D,  0x43FAADD2), BN_DEF(0xAA81A002,  0x3BB1E78E),
-    BN_DEF(0x6B4FB68C,  0x563EAFA1), BN_DEF(0x72C42BDB,  0xBC9874F2),
-    BN_DEF(0x8B26FA7D,  0xB737A961), BN_DEF(0xB34F0F78,  0x12F20E95),
-    BN_DEF(0x1FEACEBE,  0x9E0D9077), BN_DEF(0xFD29EEF7,  0x055E6835),
-    BN_DEF(0x6AE22427,  0x0EDFCD21), BN_DEF(0xCD86F56D,  0xD5E290CB),
-    BN_DEF(0x911B1D06,  0x743695E2), BN_DEF(0xCE4EFB4F,  0xAE574155),
-    BN_DEF(0x38FAA5FF,  0xB279710F), BN_DEF(0x716BA6E9,  0x7A7EA229),
-    BN_DEF(0xDE21BCA2,  0x5A098649), BN_DEF(0xC289C938,  0x577F0984),
-    BN_DEF(0x60C36C8E,  0x2CC6587D), BN_DEF(0x48FBFBF7,  0xBD6C8E93),
-    BN_DEF(0xEB736483,  0x30DA37E4), BN_DEF(0x7CCE011C,  0xDE1A7A6F),
-    BN_DEF(0xB28C81AD,  0x6F1AAD9D), BN_DEF(0x308FE7EE,  0x4435A11C),
-    BN_DEF(0x60D977FD,  0x6379A513), BN_DEF(0xBE8B41D9,  0xE2C778C1),
-    BN_DEF(0x17611002,  0x9DDAFE5E), BN_DEF(0xA637D6B9,  0xE1FF1D8D),
-    BN_DEF(0x777940C1,  0xC7278919), BN_DEF(0x74C2C1FF,  0xC8B97F4E),
-    BN_DEF(0x941A17B0,  0x601A0266), BN_DEF(0xE6FBF176,  0x4F017E70),
-    BN_DEF(0x770536B8,  0x8583D3E4), BN_DEF(0xB1B95D8C,  0x572B76F3),
-    BN_DEF(0xEF1CA6FA,  0x0EA7A151), BN_DEF(0xB06BFA34,  0xDCB56D5B),
-    BN_DEF(0xD96471FD,  0xE88454A5), BN_DEF(0x59927DB0,  0x5E0558C1),
-    BN_DEF(0xA41D3CBD,  0x98566527), BN_DEF(0x9B56F39A,  0x0EF8AC50),
-    BN_DEF(0x79F7F439,  0xF15344ED), BN_DEF(0x707345BB,  0xCC278638),
-    BN_DEF(0x3FABE49A,  0xDAAB89AF), BN_DEF(0x9EF68D79,  0x42B1B2AA),
-    BN_DEF(0xAF833768,  0x9219FA8F), BN_DEF(0xEAFEB2B0,  0x69EF8F6A),
-    BN_DEF(0x576230BD,  0x7B40D901), BN_DEF(0xB1863AEC,  0xBE97F1B1),
-    BN_DEF(0x124D9F7C,  0xE649CEE7), BN_DEF(0x8A3219FD,  0xD4F09B20),
-    BN_DEF(0xE7169B4A,  0xEC5CE2C1), BN_DEF(0x139E9E78,  0x57EE2B10),
-    BN_DEF(0x515DA54D,  0xD6FC2A2C), BN_DEF(0xFFFFFFFF,  0x7FFFFFFF),
+    BN_DEF(0xFFFFFFFF, 0xFFFFFFFF),
+    BN_DEF(0x68720732, 0x5207194E),
+    BN_DEF(0xBC9C6D6A, 0xD20EAB86),
+    BN_DEF(0x6A18B0E0, 0xB1534A93),
+    BN_DEF(0x4D6D8F34, 0x1FEEA547),
+    BN_DEF(0xEE35C06B, 0x2D9DB8FC),
+    BN_DEF(0x63139582, 0xF64E8C08),
+    BN_DEF(0xE5677A01, 0xC66796EA),
+    BN_DEF(0xE4ADC88B, 0x724FA91A),
+    BN_DEF(0xDC2A19C5, 0x282EE416),
+    BN_DEF(0x8AB15423, 0x31149618),
+    BN_DEF(0x3573BFAF, 0x6B9581BA),
+    BN_DEF(0xA316A9C6, 0x7CE4848D),
+    BN_DEF(0x23D33E5F, 0x05746DAC),
+    BN_DEF(0x91308B41, 0x59D39CE0),
+    BN_DEF(0x95140DFB, 0x77556011),
+    BN_DEF(0x3BE57CC9, 0xCA63328F),
+    BN_DEF(0xCA595DE0, 0x3B1F2725),
+    BN_DEF(0x003BECDA, 0xAC3F1C6D),
+    BN_DEF(0x0C1811E1, 0x3FD94FC6),
+    BN_DEF(0xFCF1D137, 0x855F60FF),
+    BN_DEF(0x1A8288F1, 0x50077849),
+    BN_DEF(0x6DB1A06C, 0x5C2A9917),
+    BN_DEF(0xD4D4B488, 0xD29238FB),
+    BN_DEF(0xA67EDA3B, 0x9C40A3FD),
+    BN_DEF(0x2723020F, 0xCD8FAE1F),
+    BN_DEF(0xFE67F638, 0x66D6832B),
+    BN_DEF(0xA6380E1D, 0x59C74619),
+    BN_DEF(0x58E07EA6, 0x48BDEEB2),
+    BN_DEF(0x4DBB1264, 0x1DDA2A19),
+    BN_DEF(0x657A9F53, 0x11DD2221),
+    BN_DEF(0x1C29951D, 0x2733BE96),
+    BN_DEF(0x2281B63D, 0x05FEB25B),
+    BN_DEF(0x2F06EC81, 0xE345003F),
+    BN_DEF(0xFA20C170, 0xA6DAD428),
+    BN_DEF(0x3FC45235, 0xC764DAAD),
+    BN_DEF(0xE764BEE7, 0x054148E6),
+    BN_DEF(0xFCC68566, 0x15276754),
+    BN_DEF(0xB8A0001E, 0x0D0EDC9E),
+    BN_DEF(0x99E5C5BD, 0x0494CCD1),
+    BN_DEF(0xB8D6801C, 0x36E3BC7C),
+    BN_DEF(0x48C09862, 0x5483B005),
+    BN_DEF(0x96CF3419, 0x76B50F00),
+    BN_DEF(0x77DA18C5, 0x389AE443),
+    BN_DEF(0xBF18E63D, 0x43FAADD2),
+    BN_DEF(0xAA81A002, 0x3BB1E78E),
+    BN_DEF(0x6B4FB68C, 0x563EAFA1),
+    BN_DEF(0x72C42BDB, 0xBC9874F2),
+    BN_DEF(0x8B26FA7D, 0xB737A961),
+    BN_DEF(0xB34F0F78, 0x12F20E95),
+    BN_DEF(0x1FEACEBE, 0x9E0D9077),
+    BN_DEF(0xFD29EEF7, 0x055E6835),
+    BN_DEF(0x6AE22427, 0x0EDFCD21),
+    BN_DEF(0xCD86F56D, 0xD5E290CB),
+    BN_DEF(0x911B1D06, 0x743695E2),
+    BN_DEF(0xCE4EFB4F, 0xAE574155),
+    BN_DEF(0x38FAA5FF, 0xB279710F),
+    BN_DEF(0x716BA6E9, 0x7A7EA229),
+    BN_DEF(0xDE21BCA2, 0x5A098649),
+    BN_DEF(0xC289C938, 0x577F0984),
+    BN_DEF(0x60C36C8E, 0x2CC6587D),
+    BN_DEF(0x48FBFBF7, 0xBD6C8E93),
+    BN_DEF(0xEB736483, 0x30DA37E4),
+    BN_DEF(0x7CCE011C, 0xDE1A7A6F),
+    BN_DEF(0xB28C81AD, 0x6F1AAD9D),
+    BN_DEF(0x308FE7EE, 0x4435A11C),
+    BN_DEF(0x60D977FD, 0x6379A513),
+    BN_DEF(0xBE8B41D9, 0xE2C778C1),
+    BN_DEF(0x17611002, 0x9DDAFE5E),
+    BN_DEF(0xA637D6B9, 0xE1FF1D8D),
+    BN_DEF(0x777940C1, 0xC7278919),
+    BN_DEF(0x74C2C1FF, 0xC8B97F4E),
+    BN_DEF(0x941A17B0, 0x601A0266),
+    BN_DEF(0xE6FBF176, 0x4F017E70),
+    BN_DEF(0x770536B8, 0x8583D3E4),
+    BN_DEF(0xB1B95D8C, 0x572B76F3),
+    BN_DEF(0xEF1CA6FA, 0x0EA7A151),
+    BN_DEF(0xB06BFA34, 0xDCB56D5B),
+    BN_DEF(0xD96471FD, 0xE88454A5),
+    BN_DEF(0x59927DB0, 0x5E0558C1),
+    BN_DEF(0xA41D3CBD, 0x98566527),
+    BN_DEF(0x9B56F39A, 0x0EF8AC50),
+    BN_DEF(0x79F7F439, 0xF15344ED),
+    BN_DEF(0x707345BB, 0xCC278638),
+    BN_DEF(0x3FABE49A, 0xDAAB89AF),
+    BN_DEF(0x9EF68D79, 0x42B1B2AA),
+    BN_DEF(0xAF833768, 0x9219FA8F),
+    BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
+    BN_DEF(0x576230BD, 0x7B40D901),
+    BN_DEF(0xB1863AEC, 0xBE97F1B1),
+    BN_DEF(0x124D9F7C, 0xE649CEE7),
+    BN_DEF(0x8A3219FD, 0xD4F09B20),
+    BN_DEF(0xE7169B4A, 0xEC5CE2C1),
+    BN_DEF(0x139E9E78, 0x57EE2B10),
+    BN_DEF(0x515DA54D, 0xD6FC2A2C),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
 };
 
 static const BN_ULONG ffdhe8192_p[] = {
@@ -935,81 +1239,146 @@ static const BN_ULONG ffdhe8192_p[] = {
 };
 /* q = (p - 1) / 2 */
 static const BN_ULONG ffdhe8192_q[] = {
-    BN_DEF(0xFFFFFFFF,  0x7FFFFFFF), BN_DEF(0xE2E32126,  0x6B4645DB),
-    BN_DEF(0x41C7FC46,  0x008F154A), BN_DEF(0x54FA30A7,  0x84117283),
-    BN_DEF(0xFBD4221E,  0xCBE88EA4), BN_DEF(0x9833BF86,  0x535DFEF2),
-    BN_DEF(0x60FF437F,  0x17BA0F7C), BN_DEF(0x2EB8D43F,  0x7D7D5F0E),
-    BN_DEF(0xFDF2C518,  0x6F697DD5), BN_DEF(0x39585337,  0x5B42AEFF),
-    BN_DEF(0x5D4527F4,  0x8F7E4670), BN_DEF(0x1F97D22B,  0xC1FC0EA5),
-    BN_DEF(0xD2BBF118,  0x50FF183A), BN_DEF(0x446CE050,  0xEADC00CA),
-    BN_DEF(0xD6CD4AFC,  0xB1240B66), BN_DEF(0x286090BD,  0x4CF4F18B),
-    BN_DEF(0x07211E7E,  0x28D5348F), BN_DEF(0x1C137296,  0x0E10BF36),
-    BN_DEF(0x84B81FF7,  0x28D45498), BN_DEF(0xB523073A,  0x5DB84CC3),
-    BN_DEF(0x4E435811,  0xAA0FE346), BN_DEF(0x237EC128,  0x2C8B0660),
-    BN_DEF(0x1AE1AFAE,  0x1423605D), BN_DEF(0xC5BAC141,  0x2A282563),
-    BN_DEF(0xE95782F2,  0x149C441C), BN_DEF(0x600DEB81,  0xE596078E),
-    BN_DEF(0x3E499332,  0xAAAD97BA), BN_DEF(0x51D5C414,  0xC35B18A1),
-    BN_DEF(0xFB258877,  0x05C661DE), BN_DEF(0xF6E8E62F,  0xB43FF5B4),
-    BN_DEF(0x64A84EA1,  0x7ED91FE7), BN_DEF(0xECA8D732,  0x0F212D18),
-    BN_DEF(0x7B00641C,  0x1B568026), BN_DEF(0x67FA3555,  0x5207194E),
-    BN_DEF(0xBC9C6D6A,  0xD20EAB86), BN_DEF(0x6A18B0E0,  0xB1534A93),
-    BN_DEF(0x4D6D8F34,  0x1FEEA547), BN_DEF(0xEE35C06B,  0x2D9DB8FC),
-    BN_DEF(0x63139582,  0xF64E8C08), BN_DEF(0xE5677A01,  0xC66796EA),
-    BN_DEF(0xE4ADC88B,  0x724FA91A), BN_DEF(0xDC2A19C5,  0x282EE416),
-    BN_DEF(0x8AB15423,  0x31149618), BN_DEF(0x3573BFAF,  0x6B9581BA),
-    BN_DEF(0xA316A9C6,  0x7CE4848D), BN_DEF(0x23D33E5F,  0x05746DAC),
-    BN_DEF(0x91308B41,  0x59D39CE0), BN_DEF(0x95140DFB,  0x77556011),
-    BN_DEF(0x3BE57CC9,  0xCA63328F), BN_DEF(0xCA595DE0,  0x3B1F2725),
-    BN_DEF(0x003BECDA,  0xAC3F1C6D), BN_DEF(0x0C1811E1,  0x3FD94FC6),
-    BN_DEF(0xFCF1D137,  0x855F60FF), BN_DEF(0x1A8288F1,  0x50077849),
-    BN_DEF(0x6DB1A06C,  0x5C2A9917), BN_DEF(0xD4D4B488,  0xD29238FB),
-    BN_DEF(0xA67EDA3B,  0x9C40A3FD), BN_DEF(0x2723020F,  0xCD8FAE1F),
-    BN_DEF(0xFE67F638,  0x66D6832B), BN_DEF(0xA6380E1D,  0x59C74619),
-    BN_DEF(0x58E07EA6,  0x48BDEEB2), BN_DEF(0x4DBB1264,  0x1DDA2A19),
-    BN_DEF(0x657A9F53,  0x11DD2221), BN_DEF(0x1C29951D,  0x2733BE96),
-    BN_DEF(0x2281B63D,  0x05FEB25B), BN_DEF(0x2F06EC81,  0xE345003F),
-    BN_DEF(0xFA20C170,  0xA6DAD428), BN_DEF(0x3FC45235,  0xC764DAAD),
-    BN_DEF(0xE764BEE7,  0x054148E6), BN_DEF(0xFCC68566,  0x15276754),
-    BN_DEF(0xB8A0001E,  0x0D0EDC9E), BN_DEF(0x99E5C5BD,  0x0494CCD1),
-    BN_DEF(0xB8D6801C,  0x36E3BC7C), BN_DEF(0x48C09862,  0x5483B005),
-    BN_DEF(0x96CF3419,  0x76B50F00), BN_DEF(0x77DA18C5,  0x389AE443),
-    BN_DEF(0xBF18E63D,  0x43FAADD2), BN_DEF(0xAA81A002,  0x3BB1E78E),
-    BN_DEF(0x6B4FB68C,  0x563EAFA1), BN_DEF(0x72C42BDB,  0xBC9874F2),
-    BN_DEF(0x8B26FA7D,  0xB737A961), BN_DEF(0xB34F0F78,  0x12F20E95),
-    BN_DEF(0x1FEACEBE,  0x9E0D9077), BN_DEF(0xFD29EEF7,  0x055E6835),
-    BN_DEF(0x6AE22427,  0x0EDFCD21), BN_DEF(0xCD86F56D,  0xD5E290CB),
-    BN_DEF(0x911B1D06,  0x743695E2), BN_DEF(0xCE4EFB4F,  0xAE574155),
-    BN_DEF(0x38FAA5FF,  0xB279710F), BN_DEF(0x716BA6E9,  0x7A7EA229),
-    BN_DEF(0xDE21BCA2,  0x5A098649), BN_DEF(0xC289C938,  0x577F0984),
-    BN_DEF(0x60C36C8E,  0x2CC6587D), BN_DEF(0x48FBFBF7,  0xBD6C8E93),
-    BN_DEF(0xEB736483,  0x30DA37E4), BN_DEF(0x7CCE011C,  0xDE1A7A6F),
-    BN_DEF(0xB28C81AD,  0x6F1AAD9D), BN_DEF(0x308FE7EE,  0x4435A11C),
-    BN_DEF(0x60D977FD,  0x6379A513), BN_DEF(0xBE8B41D9,  0xE2C778C1),
-    BN_DEF(0x17611002,  0x9DDAFE5E), BN_DEF(0xA637D6B9,  0xE1FF1D8D),
-    BN_DEF(0x777940C1,  0xC7278919), BN_DEF(0x74C2C1FF,  0xC8B97F4E),
-    BN_DEF(0x941A17B0,  0x601A0266), BN_DEF(0xE6FBF176,  0x4F017E70),
-    BN_DEF(0x770536B8,  0x8583D3E4), BN_DEF(0xB1B95D8C,  0x572B76F3),
-    BN_DEF(0xEF1CA6FA,  0x0EA7A151), BN_DEF(0xB06BFA34,  0xDCB56D5B),
-    BN_DEF(0xD96471FD,  0xE88454A5), BN_DEF(0x59927DB0,  0x5E0558C1),
-    BN_DEF(0xA41D3CBD,  0x98566527), BN_DEF(0x9B56F39A,  0x0EF8AC50),
-    BN_DEF(0x79F7F439,  0xF15344ED), BN_DEF(0x707345BB,  0xCC278638),
-    BN_DEF(0x3FABE49A,  0xDAAB89AF), BN_DEF(0x9EF68D79,  0x42B1B2AA),
-    BN_DEF(0xAF833768,  0x9219FA8F), BN_DEF(0xEAFEB2B0,  0x69EF8F6A),
-    BN_DEF(0x576230BD,  0x7B40D901), BN_DEF(0xB1863AEC,  0xBE97F1B1),
-    BN_DEF(0x124D9F7C,  0xE649CEE7), BN_DEF(0x8A3219FD,  0xD4F09B20),
-    BN_DEF(0xE7169B4A,  0xEC5CE2C1), BN_DEF(0x139E9E78,  0x57EE2B10),
-    BN_DEF(0x515DA54D,  0xD6FC2A2C), BN_DEF(0xFFFFFFFF,  0x7FFFFFFF),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
+    BN_DEF(0xE2E32126, 0x6B4645DB),
+    BN_DEF(0x41C7FC46, 0x008F154A),
+    BN_DEF(0x54FA30A7, 0x84117283),
+    BN_DEF(0xFBD4221E, 0xCBE88EA4),
+    BN_DEF(0x9833BF86, 0x535DFEF2),
+    BN_DEF(0x60FF437F, 0x17BA0F7C),
+    BN_DEF(0x2EB8D43F, 0x7D7D5F0E),
+    BN_DEF(0xFDF2C518, 0x6F697DD5),
+    BN_DEF(0x39585337, 0x5B42AEFF),
+    BN_DEF(0x5D4527F4, 0x8F7E4670),
+    BN_DEF(0x1F97D22B, 0xC1FC0EA5),
+    BN_DEF(0xD2BBF118, 0x50FF183A),
+    BN_DEF(0x446CE050, 0xEADC00CA),
+    BN_DEF(0xD6CD4AFC, 0xB1240B66),
+    BN_DEF(0x286090BD, 0x4CF4F18B),
+    BN_DEF(0x07211E7E, 0x28D5348F),
+    BN_DEF(0x1C137296, 0x0E10BF36),
+    BN_DEF(0x84B81FF7, 0x28D45498),
+    BN_DEF(0xB523073A, 0x5DB84CC3),
+    BN_DEF(0x4E435811, 0xAA0FE346),
+    BN_DEF(0x237EC128, 0x2C8B0660),
+    BN_DEF(0x1AE1AFAE, 0x1423605D),
+    BN_DEF(0xC5BAC141, 0x2A282563),
+    BN_DEF(0xE95782F2, 0x149C441C),
+    BN_DEF(0x600DEB81, 0xE596078E),
+    BN_DEF(0x3E499332, 0xAAAD97BA),
+    BN_DEF(0x51D5C414, 0xC35B18A1),
+    BN_DEF(0xFB258877, 0x05C661DE),
+    BN_DEF(0xF6E8E62F, 0xB43FF5B4),
+    BN_DEF(0x64A84EA1, 0x7ED91FE7),
+    BN_DEF(0xECA8D732, 0x0F212D18),
+    BN_DEF(0x7B00641C, 0x1B568026),
+    BN_DEF(0x67FA3555, 0x5207194E),
+    BN_DEF(0xBC9C6D6A, 0xD20EAB86),
+    BN_DEF(0x6A18B0E0, 0xB1534A93),
+    BN_DEF(0x4D6D8F34, 0x1FEEA547),
+    BN_DEF(0xEE35C06B, 0x2D9DB8FC),
+    BN_DEF(0x63139582, 0xF64E8C08),
+    BN_DEF(0xE5677A01, 0xC66796EA),
+    BN_DEF(0xE4ADC88B, 0x724FA91A),
+    BN_DEF(0xDC2A19C5, 0x282EE416),
+    BN_DEF(0x8AB15423, 0x31149618),
+    BN_DEF(0x3573BFAF, 0x6B9581BA),
+    BN_DEF(0xA316A9C6, 0x7CE4848D),
+    BN_DEF(0x23D33E5F, 0x05746DAC),
+    BN_DEF(0x91308B41, 0x59D39CE0),
+    BN_DEF(0x95140DFB, 0x77556011),
+    BN_DEF(0x3BE57CC9, 0xCA63328F),
+    BN_DEF(0xCA595DE0, 0x3B1F2725),
+    BN_DEF(0x003BECDA, 0xAC3F1C6D),
+    BN_DEF(0x0C1811E1, 0x3FD94FC6),
+    BN_DEF(0xFCF1D137, 0x855F60FF),
+    BN_DEF(0x1A8288F1, 0x50077849),
+    BN_DEF(0x6DB1A06C, 0x5C2A9917),
+    BN_DEF(0xD4D4B488, 0xD29238FB),
+    BN_DEF(0xA67EDA3B, 0x9C40A3FD),
+    BN_DEF(0x2723020F, 0xCD8FAE1F),
+    BN_DEF(0xFE67F638, 0x66D6832B),
+    BN_DEF(0xA6380E1D, 0x59C74619),
+    BN_DEF(0x58E07EA6, 0x48BDEEB2),
+    BN_DEF(0x4DBB1264, 0x1DDA2A19),
+    BN_DEF(0x657A9F53, 0x11DD2221),
+    BN_DEF(0x1C29951D, 0x2733BE96),
+    BN_DEF(0x2281B63D, 0x05FEB25B),
+    BN_DEF(0x2F06EC81, 0xE345003F),
+    BN_DEF(0xFA20C170, 0xA6DAD428),
+    BN_DEF(0x3FC45235, 0xC764DAAD),
+    BN_DEF(0xE764BEE7, 0x054148E6),
+    BN_DEF(0xFCC68566, 0x15276754),
+    BN_DEF(0xB8A0001E, 0x0D0EDC9E),
+    BN_DEF(0x99E5C5BD, 0x0494CCD1),
+    BN_DEF(0xB8D6801C, 0x36E3BC7C),
+    BN_DEF(0x48C09862, 0x5483B005),
+    BN_DEF(0x96CF3419, 0x76B50F00),
+    BN_DEF(0x77DA18C5, 0x389AE443),
+    BN_DEF(0xBF18E63D, 0x43FAADD2),
+    BN_DEF(0xAA81A002, 0x3BB1E78E),
+    BN_DEF(0x6B4FB68C, 0x563EAFA1),
+    BN_DEF(0x72C42BDB, 0xBC9874F2),
+    BN_DEF(0x8B26FA7D, 0xB737A961),
+    BN_DEF(0xB34F0F78, 0x12F20E95),
+    BN_DEF(0x1FEACEBE, 0x9E0D9077),
+    BN_DEF(0xFD29EEF7, 0x055E6835),
+    BN_DEF(0x6AE22427, 0x0EDFCD21),
+    BN_DEF(0xCD86F56D, 0xD5E290CB),
+    BN_DEF(0x911B1D06, 0x743695E2),
+    BN_DEF(0xCE4EFB4F, 0xAE574155),
+    BN_DEF(0x38FAA5FF, 0xB279710F),
+    BN_DEF(0x716BA6E9, 0x7A7EA229),
+    BN_DEF(0xDE21BCA2, 0x5A098649),
+    BN_DEF(0xC289C938, 0x577F0984),
+    BN_DEF(0x60C36C8E, 0x2CC6587D),
+    BN_DEF(0x48FBFBF7, 0xBD6C8E93),
+    BN_DEF(0xEB736483, 0x30DA37E4),
+    BN_DEF(0x7CCE011C, 0xDE1A7A6F),
+    BN_DEF(0xB28C81AD, 0x6F1AAD9D),
+    BN_DEF(0x308FE7EE, 0x4435A11C),
+    BN_DEF(0x60D977FD, 0x6379A513),
+    BN_DEF(0xBE8B41D9, 0xE2C778C1),
+    BN_DEF(0x17611002, 0x9DDAFE5E),
+    BN_DEF(0xA637D6B9, 0xE1FF1D8D),
+    BN_DEF(0x777940C1, 0xC7278919),
+    BN_DEF(0x74C2C1FF, 0xC8B97F4E),
+    BN_DEF(0x941A17B0, 0x601A0266),
+    BN_DEF(0xE6FBF176, 0x4F017E70),
+    BN_DEF(0x770536B8, 0x8583D3E4),
+    BN_DEF(0xB1B95D8C, 0x572B76F3),
+    BN_DEF(0xEF1CA6FA, 0x0EA7A151),
+    BN_DEF(0xB06BFA34, 0xDCB56D5B),
+    BN_DEF(0xD96471FD, 0xE88454A5),
+    BN_DEF(0x59927DB0, 0x5E0558C1),
+    BN_DEF(0xA41D3CBD, 0x98566527),
+    BN_DEF(0x9B56F39A, 0x0EF8AC50),
+    BN_DEF(0x79F7F439, 0xF15344ED),
+    BN_DEF(0x707345BB, 0xCC278638),
+    BN_DEF(0x3FABE49A, 0xDAAB89AF),
+    BN_DEF(0x9EF68D79, 0x42B1B2AA),
+    BN_DEF(0xAF833768, 0x9219FA8F),
+    BN_DEF(0xEAFEB2B0, 0x69EF8F6A),
+    BN_DEF(0x576230BD, 0x7B40D901),
+    BN_DEF(0xB1863AEC, 0xBE97F1B1),
+    BN_DEF(0x124D9F7C, 0xE649CEE7),
+    BN_DEF(0x8A3219FD, 0xD4F09B20),
+    BN_DEF(0xE7169B4A, 0xEC5CE2C1),
+    BN_DEF(0x139E9E78, 0x57EE2B10),
+    BN_DEF(0x515DA54D, 0xD6FC2A2C),
+    BN_DEF(0xFFFFFFFF, 0x7FFFFFFF),
 };
 
 /* Macro to make a BIGNUM from static data */
 
-# define make_dh_bn(x)                   \
+#define make_dh_bn(x)                    \
     extern const BIGNUM ossl_bignum_##x; \
     const BIGNUM ossl_bignum_##x = {     \
-        (BN_ULONG *) x,                  \
+        (BN_ULONG *)x,                   \
         OSSL_NELEM(x),                   \
         OSSL_NELEM(x),                   \
-        0, BN_FLG_STATIC_DATA };
+        0, BN_FLG_STATIC_DATA            \
+    };
 
 static const BN_ULONG value_2 = 2;
 
@@ -1018,37 +1387,37 @@ const BIGNUM ossl_bignum_const_2 = {
 };
 
 make_dh_bn(dh1024_160_p)
-make_dh_bn(dh1024_160_q)
-make_dh_bn(dh1024_160_g)
-make_dh_bn(dh2048_224_p)
-make_dh_bn(dh2048_224_q)
-make_dh_bn(dh2048_224_g)
-make_dh_bn(dh2048_256_p)
-make_dh_bn(dh2048_256_q)
-make_dh_bn(dh2048_256_g)
+    make_dh_bn(dh1024_160_q)
+        make_dh_bn(dh1024_160_g)
+            make_dh_bn(dh2048_224_p)
+                make_dh_bn(dh2048_224_q)
+                    make_dh_bn(dh2048_224_g)
+                        make_dh_bn(dh2048_256_p)
+                            make_dh_bn(dh2048_256_q)
+                                make_dh_bn(dh2048_256_g)
 
-make_dh_bn(ffdhe2048_p)
-make_dh_bn(ffdhe2048_q)
-make_dh_bn(ffdhe3072_p)
-make_dh_bn(ffdhe3072_q)
-make_dh_bn(ffdhe4096_p)
-make_dh_bn(ffdhe4096_q)
-make_dh_bn(ffdhe6144_p)
-make_dh_bn(ffdhe6144_q)
-make_dh_bn(ffdhe8192_p)
-make_dh_bn(ffdhe8192_q)
+                                    make_dh_bn(ffdhe2048_p)
+                                        make_dh_bn(ffdhe2048_q)
+                                            make_dh_bn(ffdhe3072_p)
+                                                make_dh_bn(ffdhe3072_q)
+                                                    make_dh_bn(ffdhe4096_p)
+                                                        make_dh_bn(ffdhe4096_q)
+                                                            make_dh_bn(ffdhe6144_p)
+                                                                make_dh_bn(ffdhe6144_q)
+                                                                    make_dh_bn(ffdhe8192_p)
+                                                                        make_dh_bn(ffdhe8192_q)
 
-# ifndef FIPS_MODULE
-make_dh_bn(modp_1536_p)
-make_dh_bn(modp_1536_q)
-# endif
-make_dh_bn(modp_2048_p)
-make_dh_bn(modp_2048_q)
-make_dh_bn(modp_3072_p)
-make_dh_bn(modp_3072_q)
-make_dh_bn(modp_4096_p)
-make_dh_bn(modp_4096_q)
-make_dh_bn(modp_6144_p)
-make_dh_bn(modp_6144_q)
-make_dh_bn(modp_8192_p)
-make_dh_bn(modp_8192_q)
+#ifndef FIPS_MODULE
+                                                                            make_dh_bn(modp_1536_p)
+                                                                                make_dh_bn(modp_1536_q)
+#endif
+                                                                                    make_dh_bn(modp_2048_p)
+                                                                                        make_dh_bn(modp_2048_q)
+                                                                                            make_dh_bn(modp_3072_p)
+                                                                                                make_dh_bn(modp_3072_q)
+                                                                                                    make_dh_bn(modp_4096_p)
+                                                                                                        make_dh_bn(modp_4096_q)
+                                                                                                            make_dh_bn(modp_6144_p)
+                                                                                                                make_dh_bn(modp_6144_q)
+                                                                                                                    make_dh_bn(modp_8192_p)
+                                                                                                                        make_dh_bn(modp_8192_q)
diff --git a/crypto/bn/bn_div.c b/crypto/bn/bn_div.c
index ff66baa48f226..fc61d70a9da47 100644
--- a/crypto/bn/bn_div.c
+++ b/crypto/bn/bn_div.c
@@ -87,22 +87,22 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
 
 #else
 
-# if defined(BN_DIV3W)
+#if defined(BN_DIV3W)
 BN_ULONG bn_div_3_words(const BN_ULONG *m, BN_ULONG d1, BN_ULONG d0);
-# elif 0
+#elif 0
 /*
  * This is #if-ed away, because it's a reference for assembly implementations,
  * where it can and should be made constant-time. But if you want to test it,
  * just replace 0 with 1.
  */
-#  if BN_BITS2 == 64 && defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16
-#   undef BN_ULLONG
-#   define BN_ULLONG uint128_t
-#   define BN_LLONG
-#  endif
-
-#  ifdef BN_LLONG
-#   define BN_DIV3W
+#if BN_BITS2 == 64 && defined(__SIZEOF_INT128__) && __SIZEOF_INT128__ == 16
+#undef BN_ULLONG
+#define BN_ULLONG uint128_t
+#define BN_LLONG
+#endif
+
+#ifdef BN_LLONG
+#define BN_DIV3W
 /*
  * Interface is somewhat quirky, |m| is pointer to most significant limb,
  * and less significant limb is referred at |m[-1]|. This means that caller
@@ -128,15 +128,15 @@ static BN_ULONG bn_div_3_words(const BN_ULONG *m, BN_ULONG d1, BN_ULONG d0)
         D >>= 1;
     }
 
-    mask = 0 - (Q >> (BN_BITS2 - 1));   /* does it overflow? */
+    mask = 0 - (Q >> (BN_BITS2 - 1)); /* does it overflow? */
 
     Q <<= 1;
     Q |= (R >= D);
 
     return (Q | mask) & BN_MASK2;
 }
-#  endif
-# endif
+#endif
+#endif
 
 static int bn_left_align(BIGNUM *num)
 {
@@ -145,8 +145,8 @@ static int bn_left_align(BIGNUM *num)
     int rshift = BN_num_bits_word(d[top - 1]), lshift, i;
 
     lshift = BN_BITS2 - rshift;
-    rshift %= BN_BITS2;            /* say no to undefined behaviour */
-    rmask = (BN_ULONG)0 - rshift;  /* rmask = 0 - (rshift != 0) */
+    rshift %= BN_BITS2; /* say no to undefined behaviour */
+    rmask = (BN_ULONG)0 - rshift; /* rmask = 0 - (rshift != 0) */
     rmask |= rmask >> 8;
 
     for (i = 0, m = 0; i < top; i++) {
@@ -158,45 +158,47 @@ static int bn_left_align(BIGNUM *num)
     return lshift;
 }
 
-# if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) \
+#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) \
     && !defined(PEDANTIC) && !defined(BN_DIV3W)
-#  if defined(__GNUC__) && __GNUC__>=2
-#   if defined(__i386) || defined (__i386__)
-   /*-
-    * There were two reasons for implementing this template:
-    * - GNU C generates a call to a function (__udivdi3 to be exact)
-    *   in reply to ((((BN_ULLONG)n0)<<BN_BITS2)|n1)/d0 (I fail to
-    *   understand why...);
-    * - divl doesn't only calculate quotient, but also leaves
-    *   remainder in %edx which we can definitely use here:-)
-    */
-#    undef bn_div_words
-#    define bn_div_words(n0,n1,d0)                \
-        ({  asm volatile (                      \
-                "divl   %4"                     \
-                : "=a"(q), "=d"(rem)            \
-                : "a"(n1), "d"(n0), "r"(d0)     \
-                : "cc");                        \
-            q;                                  \
-        })
-#    define REMAINDER_IS_ALREADY_CALCULATED
-#   elif defined(__x86_64) && defined(SIXTY_FOUR_BIT_LONG)
-   /*
-    * Same story here, but it's 128-bit by 64-bit division. Wow!
-    */
-#    undef bn_div_words
-#    define bn_div_words(n0,n1,d0)                \
-        ({  asm volatile (                      \
-                "divq   %4"                     \
-                : "=a"(q), "=d"(rem)            \
-                : "a"(n1), "d"(n0), "r"(d0)     \
-                : "cc");                        \
-            q;                                  \
-        })
-#    define REMAINDER_IS_ALREADY_CALCULATED
-#   endif                       /* __<cpu> */
-#  endif                        /* __GNUC__ */
-# endif                         /* OPENSSL_NO_ASM */
+#if defined(__GNUC__) && __GNUC__ >= 2
+#if defined(__i386) || defined(__i386__)
+/*-
+ * There were two reasons for implementing this template:
+ * - GNU C generates a call to a function (__udivdi3 to be exact)
+ *   in reply to ((((BN_ULLONG)n0)<<BN_BITS2)|n1)/d0 (I fail to
+ *   understand why...);
+ * - divl doesn't only calculate quotient, but also leaves
+ *   remainder in %edx which we can definitely use here:-)
+ */
+#undef bn_div_words
+#define bn_div_words(n0, n1, d0)        \
+    ({                                  \
+        asm volatile(                   \
+            "divl   %4"                 \
+            : "=a"(q), "=d"(rem)        \
+            : "a"(n1), "d"(n0), "r"(d0) \
+            : "cc");                    \
+        q;                              \
+    })
+#define REMAINDER_IS_ALREADY_CALCULATED
+#elif defined(__x86_64) && defined(SIXTY_FOUR_BIT_LONG)
+/*
+ * Same story here, but it's 128-bit by 64-bit division. Wow!
+ */
+#undef bn_div_words
+#define bn_div_words(n0, n1, d0)        \
+    ({                                  \
+        asm volatile(                   \
+            "divq   %4"                 \
+            : "=a"(q), "=d"(rem)        \
+            : "a"(n1), "d"(n0), "r"(d0) \
+            : "cc");                    \
+        q;                              \
+    })
+#define REMAINDER_IS_ALREADY_CALCULATED
+#endif /* __<cpu> */
+#endif /* __GNUC__ */
+#endif /* OPENSSL_NO_ASM */
 
 /*-
  * BN_div computes  dv := num / divisor, rounding towards
@@ -207,7 +209,7 @@ static int bn_left_align(BIGNUM *num)
  * If 'dv' or 'rm' is NULL, the respective value is not returned.
  */
 int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
-           BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret;
 
@@ -262,7 +264,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
  *       divisor's length is considered public;
  */
 int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
-                     const BIGNUM *divisor, BN_CTX *ctx)
+    const BIGNUM *divisor, BN_CTX *ctx)
 {
     int norm_shift, i, j, loop;
     BIGNUM *tmp, *snum, *sdiv, *res;
@@ -342,58 +344,58 @@ int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
          * the first part of the loop uses the top two words of snum and sdiv
          * to calculate a BN_ULONG q such that | wnum - sdiv * q | < sdiv
          */
-# if defined(BN_DIV3W)
+#if defined(BN_DIV3W)
         q = bn_div_3_words(wnumtop, d1, d0);
-# else
+#else
         BN_ULONG n0, n1, rem = 0;
 
         n0 = wnumtop[0];
         n1 = wnumtop[-1];
         if (n0 == d0)
             q = BN_MASK2;
-        else {                  /* n0 < d0 */
+        else { /* n0 < d0 */
             BN_ULONG n2 = (wnumtop == wnum) ? 0 : wnumtop[-2];
-#  ifdef BN_LLONG
+#ifdef BN_LLONG
             BN_ULLONG t2;
 
-#   if defined(BN_LLONG) && defined(BN_DIV2W) && !defined(bn_div_words)
-            q = (BN_ULONG)(((((BN_ULLONG) n0) << BN_BITS2) | n1) / d0);
-#   else
+#if defined(BN_LLONG) && defined(BN_DIV2W) && !defined(bn_div_words)
+            q = (BN_ULONG)(((((BN_ULLONG)n0) << BN_BITS2) | n1) / d0);
+#else
             q = bn_div_words(n0, n1, d0);
-#   endif
+#endif
 
-#   ifndef REMAINDER_IS_ALREADY_CALCULATED
+#ifndef REMAINDER_IS_ALREADY_CALCULATED
             /*
              * rem doesn't have to be BN_ULLONG. The least we
              * know it's less that d0, isn't it?
              */
             rem = (n1 - q * d0) & BN_MASK2;
-#   endif
-            t2 = (BN_ULLONG) d1 *q;
+#endif
+            t2 = (BN_ULLONG)d1 * q;
 
             for (;;) {
-                if (t2 <= ((((BN_ULLONG) rem) << BN_BITS2) | n2))
+                if (t2 <= ((((BN_ULLONG)rem) << BN_BITS2) | n2))
                     break;
                 q--;
                 rem += d0;
                 if (rem < d0)
-                    break;      /* don't let rem overflow */
+                    break; /* don't let rem overflow */
                 t2 -= d1;
             }
-#  else                         /* !BN_LLONG */
+#else /* !BN_LLONG */
             BN_ULONG t2l, t2h;
 
             q = bn_div_words(n0, n1, d0);
-#   ifndef REMAINDER_IS_ALREADY_CALCULATED
+#ifndef REMAINDER_IS_ALREADY_CALCULATED
             rem = (n1 - q * d0) & BN_MASK2;
-#   endif
+#endif
 
-#   if defined(BN_UMULT_LOHI)
+#if defined(BN_UMULT_LOHI)
             BN_UMULT_LOHI(t2l, t2h, d1, q);
-#   elif defined(BN_UMULT_HIGH)
+#elif defined(BN_UMULT_HIGH)
             t2l = d1 * q;
             t2h = BN_UMULT_HIGH(d1, q);
-#   else
+#else
             {
                 BN_ULONG ql, qh;
                 t2l = LBITS(d1);
@@ -402,7 +404,7 @@ int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
                 qh = HBITS(q);
                 mul64(t2l, t2h, ql, qh); /* t2=(BN_ULLONG)d1*q; */
             }
-#   endif
+#endif
 
             for (;;) {
                 if ((t2h < rem) || ((t2h == rem) && (t2l <= n2)))
@@ -410,14 +412,14 @@ int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
                 q--;
                 rem += d0;
                 if (rem < d0)
-                    break;      /* don't let rem overflow */
+                    break; /* don't let rem overflow */
                 if (t2l < d1)
                     t2h--;
                 t2l -= d1;
             }
-#  endif                        /* !BN_LLONG */
+#endif /* !BN_LLONG */
         }
-# endif                         /* !BN_DIV3W */
+#endif /* !BN_DIV3W */
 
         l0 = bn_mul_words(tmp->d, sdiv->d, div_n, q);
         tmp->d[div_n] = l0;
@@ -452,7 +454,7 @@ int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
 
     BN_CTX_end(ctx);
     return 1;
- err:
+err:
     bn_check_top(rm);
     BN_CTX_end(ctx);
     return 0;
diff --git a/crypto/bn/bn_err.c b/crypto/bn/bn_err.c
index 953be9ed47172..84aaf75b529e1 100644
--- a/crypto/bn/bn_err.c
+++ b/crypto/bn/bn_err.c
@@ -15,33 +15,33 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA BN_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_ARG2_LT_ARG3), "arg2 lt arg3"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_BAD_RECIPROCAL), "bad reciprocal"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_BIGNUM_TOO_LONG), "bignum too long"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_BITS_TOO_SMALL), "bits too small"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_CALLED_WITH_EVEN_MODULUS),
-    "called with even modulus"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_DIV_BY_ZERO), "div by zero"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_ENCODING_ERROR), "encoding error"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_EXPAND_ON_STATIC_BIGNUM_DATA),
-    "expand on static bignum data"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_INPUT_NOT_REDUCED), "input not reduced"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_INVALID_LENGTH), "invalid length"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_INVALID_RANGE), "invalid range"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_INVALID_SHIFT), "invalid shift"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_NOT_A_SQUARE), "not a square"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_NOT_INITIALIZED), "not initialized"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_INVERSE), "no inverse"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_PRIME_CANDIDATE), "no prime candidate"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_SOLUTION), "no solution"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_SUITABLE_DIGEST), "no suitable digest"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_PRIVATE_KEY_TOO_LARGE),
-    "private key too large"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_P_IS_NOT_PRIME), "p is not prime"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_TOO_MANY_ITERATIONS), "too many iterations"},
-    {ERR_PACK(ERR_LIB_BN, 0, BN_R_TOO_MANY_TEMPORARY_VARIABLES),
-    "too many temporary variables"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_ARG2_LT_ARG3), "arg2 lt arg3" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_BAD_RECIPROCAL), "bad reciprocal" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_BIGNUM_TOO_LONG), "bignum too long" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_BITS_TOO_SMALL), "bits too small" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_CALLED_WITH_EVEN_MODULUS),
+        "called with even modulus" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_DIV_BY_ZERO), "div by zero" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_ENCODING_ERROR), "encoding error" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_EXPAND_ON_STATIC_BIGNUM_DATA),
+        "expand on static bignum data" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_INPUT_NOT_REDUCED), "input not reduced" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_INVALID_LENGTH), "invalid length" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_INVALID_RANGE), "invalid range" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_INVALID_SHIFT), "invalid shift" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_NOT_A_SQUARE), "not a square" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_NOT_INITIALIZED), "not initialized" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_INVERSE), "no inverse" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_PRIME_CANDIDATE), "no prime candidate" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_SOLUTION), "no solution" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_NO_SUITABLE_DIGEST), "no suitable digest" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_PRIVATE_KEY_TOO_LARGE),
+        "private key too large" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_P_IS_NOT_PRIME), "p is not prime" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_TOO_MANY_ITERATIONS), "too many iterations" },
+    { ERR_PACK(ERR_LIB_BN, 0, BN_R_TOO_MANY_TEMPORARY_VARIABLES),
+        "too many temporary variables" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
index 1dda2e017f1b9..58d38b9ebd2a8 100644
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c
@@ -13,28 +13,28 @@
 
 #include <stdlib.h>
 #ifdef _WIN32
-# include <malloc.h>
-# ifndef alloca
-#  define alloca _alloca
-# endif
+#include <malloc.h>
+#ifndef alloca
+#define alloca _alloca
+#endif
 #elif defined(__GNUC__)
-# ifndef alloca
-#  define alloca(s) __builtin_alloca((s))
-# endif
+#ifndef alloca
+#define alloca(s) __builtin_alloca((s))
+#endif
 #elif defined(__sun)
-# include <alloca.h>
+#include <alloca.h>
 #endif
 
 #include "rsaz_exp.h"
 
 #undef SPARC_T4_MONT
 #if defined(OPENSSL_BN_ASM_MONT) && (defined(__sparc__) || defined(__sparc))
-# include "crypto/sparc_arch.h"
-# define SPARC_T4_MONT
+#include "crypto/sparc_arch.h"
+#define SPARC_T4_MONT
 #endif
 
 /* maximum precomputation table size for *variable* sliding windows */
-#define TABLE_SIZE      32
+#define TABLE_SIZE 32
 
 /*
  * Beyond this limit the constant time code is disabled due to
@@ -52,7 +52,7 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
     BIGNUM *v, *rr;
 
     if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0
-            || BN_get_flags(a, BN_FLG_CONSTTIME) != 0) {
+        || BN_get_flags(a, BN_FLG_CONSTTIME) != 0) {
         /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */
         ERR_raise(ERR_LIB_BN, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return 0;
@@ -88,14 +88,14 @@ int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
         goto err;
 
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     bn_check_top(r);
     return ret;
 }
 
 int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
-               BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret;
 
@@ -140,7 +140,7 @@ int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
 
 #ifdef MONT_MUL_MOD
     if (BN_is_odd(m)) {
-# ifdef MONT_EXP_WORD
+#ifdef MONT_EXP_WORD
         if (a->top == 1 && !a->neg
             && (BN_get_flags(p, BN_FLG_CONSTTIME) == 0)
             && (BN_get_flags(a, BN_FLG_CONSTTIME) == 0)
@@ -148,7 +148,7 @@ int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
             BN_ULONG A = a->d[0];
             ret = BN_mod_exp_mont_word(r, A, p, m, ctx, NULL);
         } else
-# endif
+#endif
             ret = BN_mod_exp_mont(r, a, p, m, ctx, NULL);
     } else
 #endif
@@ -167,7 +167,7 @@ int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
 }
 
 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 i, j, bits, ret = 0, wstart, wend, window;
     int start = 1;
@@ -177,8 +177,8 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
     BN_RECP_CTX recp;
 
     if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0
-            || BN_get_flags(a, BN_FLG_CONSTTIME) != 0
-            || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) {
+        || BN_get_flags(a, BN_FLG_CONSTTIME) != 0
+        || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) {
         /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */
         ERR_raise(ERR_LIB_BN, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return 0;
@@ -217,7 +217,7 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
     }
 
     if (!BN_nnmod(val[0], a, m, ctx))
-        goto err;               /* 1 */
+        goto err; /* 1 */
     if (BN_is_zero(val[0])) {
         BN_zero(r);
         ret = 1;
@@ -227,20 +227,19 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
     window = BN_window_bits_for_exponent_size(bits);
     if (window > 1) {
         if (!BN_mod_mul_reciprocal(aa, val[0], val[0], &recp, ctx))
-            goto err;           /* 2 */
+            goto err; /* 2 */
         j = 1 << (window - 1);
         for (i = 1; i < j; i++) {
-            if (((val[i] = BN_CTX_get(ctx)) == NULL) ||
-                !BN_mod_mul_reciprocal(val[i], val[i - 1], aa, &recp, ctx))
+            if (((val[i] = BN_CTX_get(ctx)) == NULL) || !BN_mod_mul_reciprocal(val[i], val[i - 1], aa, &recp, ctx))
                 goto err;
         }
     }
 
-    start = 1;                  /* This is used to avoid multiplication etc
-                                 * when there is only the value '1' in the
-                                 * buffer. */
-    wstart = bits - 1;          /* The top bit of the window */
-    wend = 0;                   /* The bottom bit of the window */
+    start = 1; /* This is used to avoid multiplication etc
+                * when there is only the value '1' in the
+                * buffer. */
+    wstart = bits - 1; /* The top bit of the window */
+    wend = 0; /* The bottom bit of the window */
 
     if (r == p) {
         BIGNUM *p_dup = BN_CTX_get(ctx);
@@ -254,7 +253,7 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         goto err;
 
     for (;;) {
-        int wvalue;             /* The 'value' of the window */
+        int wvalue; /* The 'value' of the window */
 
         if (BN_is_bit_set(p, wstart) == 0) {
             if (!start)
@@ -302,7 +301,7 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
             break;
     }
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     BN_RECP_CTX_free(&recp);
     bn_check_top(r);
@@ -310,7 +309,7 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 }
 
 int BN_mod_exp_mont(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 i, j, bits, ret = 0, wstart, wend, window;
     int start = 1;
@@ -375,28 +374,27 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
     } else
         aa = a;
     if (!bn_to_mont_fixed_top(val[0], aa, mont, ctx))
-        goto err;               /* 1 */
+        goto err; /* 1 */
 
     window = BN_window_bits_for_exponent_size(bits);
     if (window > 1) {
         if (!bn_mul_mont_fixed_top(d, val[0], val[0], mont, ctx))
-            goto err;           /* 2 */
+            goto err; /* 2 */
         j = 1 << (window - 1);
         for (i = 1; i < j; i++) {
-            if (((val[i] = BN_CTX_get(ctx)) == NULL) ||
-                !bn_mul_mont_fixed_top(val[i], val[i - 1], d, mont, ctx))
+            if (((val[i] = BN_CTX_get(ctx)) == NULL) || !bn_mul_mont_fixed_top(val[i], val[i - 1], d, mont, ctx))
                 goto err;
         }
     }
 
-    start = 1;                  /* This is used to avoid multiplication etc
-                                 * when there is only the value '1' in the
-                                 * buffer. */
-    wstart = bits - 1;          /* The top bit of the window */
-    wend = 0;                   /* The bottom bit of the window */
+    start = 1; /* This is used to avoid multiplication etc
+                * when there is only the value '1' in the
+                * buffer. */
+    wstart = bits - 1; /* The top bit of the window */
+    wend = 0; /* The bottom bit of the window */
 
-#if 1                           /* by Shay Gueron's suggestion */
-    j = m->top;                 /* borrow j */
+#if 1 /* by Shay Gueron's suggestion */
+    j = m->top; /* borrow j */
     if (m->d[j - 1] & (((BN_ULONG)1) << (BN_BITS2 - 1))) {
         if (bn_wexpand(r, j) == NULL)
             goto err;
@@ -408,10 +406,10 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
         r->flags |= BN_FLG_FIXED_TOP;
     } else
 #endif
-    if (!bn_to_mont_fixed_top(r, BN_value_one(), mont, ctx))
+        if (!bn_to_mont_fixed_top(r, BN_value_one(), mont, ctx))
         goto err;
     for (;;) {
-        int wvalue;             /* The 'value' of the window */
+        int wvalue; /* The 'value' of the window */
 
         if (BN_is_bit_set(p, wstart) == 0) {
             if (!start) {
@@ -466,8 +464,8 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
      */
 #if defined(SPARC_T4_MONT)
     if (OPENSSL_sparcv9cap_P[0] & (SPARCV9_VIS3 | SPARCV9_PREFER_FPU)) {
-        j = mont->N.top;        /* borrow j */
-        val[0]->d[0] = 1;       /* borrow val[0] */
+        j = mont->N.top; /* borrow j */
+        val[0]->d[0] = 1; /* borrow val[0] */
         for (i = 1; i < j; i++)
             val[0]->d[i] = 0;
         val[0]->top = j;
@@ -475,10 +473,10 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
             goto err;
     } else
 #endif
-    if (!BN_from_montgomery(rr, r, mont, ctx))
+        if (!BN_from_montgomery(rr, r, mont, ctx))
         goto err;
     ret = 1;
- err:
+err:
     if (in_mont == NULL)
         BN_MONT_CTX_free(mont);
     BN_CTX_end(ctx);
@@ -513,16 +511,16 @@ static BN_ULONG bn_get_bits(const BIGNUM *a, int bitpos)
  */
 
 static int MOD_EXP_CTIME_COPY_TO_PREBUF(const BIGNUM *b, int top,
-                                        unsigned char *buf, int idx,
-                                        int window)
+    unsigned char *buf, int idx,
+    int window)
 {
     int i, j;
     int width = 1 << window;
     BN_ULONG *table = (BN_ULONG *)buf;
 
     if (top > b->top)
-        top = b->top;           /* this works because 'buf' is explicitly
-                                 * zeroed */
+        top = b->top; /* this works because 'buf' is explicitly
+                       * zeroed */
     for (i = 0, j = idx; i < top; i++, j += width) {
         table[j] = b->d[i];
     }
@@ -531,8 +529,8 @@ static int MOD_EXP_CTIME_COPY_TO_PREBUF(const BIGNUM *b, int top,
 }
 
 static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top,
-                                          unsigned char *buf, int idx,
-                                          int window)
+    unsigned char *buf, int idx,
+    int window)
 {
     int i, j;
     int width = 1 << window;
@@ -554,8 +552,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top,
             BN_ULONG acc = 0;
 
             for (j = 0; j < width; j++) {
-                acc |= table[j] &
-                       ((BN_ULONG)0 - (constant_time_eq_int(j,idx)&1));
+                acc |= table[j] & ((BN_ULONG)0 - (constant_time_eq_int(j, idx) & 1));
             }
 
             b->d[i] = acc;
@@ -564,23 +561,20 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top,
         int xstride = 1 << (window - 2);
         BN_ULONG y0, y1, y2, y3;
 
-        i = idx >> (window - 2);        /* equivalent of idx / xstride */
-        idx &= xstride - 1;             /* equivalent of idx % xstride */
+        i = idx >> (window - 2); /* equivalent of idx / xstride */
+        idx &= xstride - 1; /* equivalent of idx % xstride */
 
-        y0 = (BN_ULONG)0 - (constant_time_eq_int(i,0)&1);
-        y1 = (BN_ULONG)0 - (constant_time_eq_int(i,1)&1);
-        y2 = (BN_ULONG)0 - (constant_time_eq_int(i,2)&1);
-        y3 = (BN_ULONG)0 - (constant_time_eq_int(i,3)&1);
+        y0 = (BN_ULONG)0 - (constant_time_eq_int(i, 0) & 1);
+        y1 = (BN_ULONG)0 - (constant_time_eq_int(i, 1) & 1);
+        y2 = (BN_ULONG)0 - (constant_time_eq_int(i, 2) & 1);
+        y3 = (BN_ULONG)0 - (constant_time_eq_int(i, 3) & 1);
 
         for (i = 0; i < top; i++, table += width) {
             BN_ULONG acc = 0;
 
             for (j = 0; j < xstride; j++) {
-                acc |= ( (table[j + 0 * xstride] & y0) |
-                         (table[j + 1 * xstride] & y1) |
-                         (table[j + 2 * xstride] & y2) |
-                         (table[j + 3 * xstride] & y3) )
-                       & ((BN_ULONG)0 - (constant_time_eq_int(j,idx)&1));
+                acc |= ((table[j + 0 * xstride] & y0) | (table[j + 1 * xstride] & y1) | (table[j + 2 * xstride] & y2) | (table[j + 3 * xstride] & y3))
+                    & ((BN_ULONG)0 - (constant_time_eq_int(j, idx) & 1));
             }
 
             b->d[i] = acc;
@@ -597,7 +591,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top,
  * multiple.
  */
 #define MOD_EXP_CTIME_ALIGN(x_) \
-        ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((size_t)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
+    ((unsigned char *)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((size_t)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
 
 /*
  * This variant of BN_mod_exp_mont() uses fixed windows and the special
@@ -607,8 +601,8 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top,
  * http://www.daemonology.net/hyperthreading-considered-harmful/)
  */
 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 i, bits, ret = 0, window, wvalue, wmask, window0;
     int top;
@@ -686,7 +680,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
         if (NULL == bn_wexpand(rr, 16))
             goto err;
         RSAZ_1024_mod_exp_avx2(rr->d, a->d, p->d, m->d, mont->RR.d,
-                               mont->n0[0]);
+            mont->n0[0]);
         rr->top = 16;
         rr->neg = 0;
         bn_correct_top(rr);
@@ -707,16 +701,14 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
     /* Get the window size to use with size of p. */
     window = BN_window_bits_for_ctime_exponent_size(bits);
 #if defined(SPARC_T4_MONT)
-    if (window >= 5 && (top & 15) == 0 && top <= 64 &&
-        (OPENSSL_sparcv9cap_P[1] & (CFR_MONTMUL | CFR_MONTSQR)) ==
-        (CFR_MONTMUL | CFR_MONTSQR) && (t4 = OPENSSL_sparcv9cap_P[0]))
+    if (window >= 5 && (top & 15) == 0 && top <= 64 && (OPENSSL_sparcv9cap_P[1] & (CFR_MONTMUL | CFR_MONTSQR)) == (CFR_MONTMUL | CFR_MONTSQR) && (t4 = OPENSSL_sparcv9cap_P[0]))
         window = 5;
     else
 #endif
 #if defined(OPENSSL_BN_ASM_MONT5)
-    if (window >= 5 && top <= BN_SOFT_LIMIT) {
-        window = 5;             /* ~5% improvement for RSA2048 sign, and even
-                                 * for RSA4096 */
+        if (window >= 5 && top <= BN_SOFT_LIMIT) {
+        window = 5; /* ~5% improvement for RSA2048 sign, and even
+                     * for RSA4096 */
         /* reserve space for mont->N.d[] copy */
         powerbufLen += top * sizeof(mont->N.d[0]);
     }
@@ -728,17 +720,13 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
      * of am, am itself and tmp.
      */
     numPowers = 1 << window;
-    powerbufLen += sizeof(m->d[0]) * (top * numPowers +
-                                      ((2 * top) >
-                                       numPowers ? (2 * top) : numPowers));
+    powerbufLen += sizeof(m->d[0]) * (top * numPowers + ((2 * top) > numPowers ? (2 * top) : numPowers));
 #ifdef alloca
     if (powerbufLen < 3072)
-        powerbufFree =
-            alloca(powerbufLen + MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH);
+        powerbufFree = alloca(powerbufLen + MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH);
     else
 #endif
-        if ((powerbufFree =
-             OPENSSL_malloc(powerbufLen + MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH))
+        if ((powerbufFree = OPENSSL_malloc(powerbufLen + MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH))
             == NULL)
         goto err;
 
@@ -759,7 +747,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
     tmp.flags = am.flags = BN_FLG_STATIC_DATA;
 
     /* prepare a^0 in Montgomery domain */
-#if 1                           /* by Shay Gueron's suggestion */
+#if 1 /* by Shay Gueron's suggestion */
     if (m->d[top - 1] & (((BN_ULONG)1) << (BN_BITS2 - 1))) {
         /* 2^(top*BN_BITS2) - m */
         tmp.d[0] = (0 - m->d[0]) & BN_MASK2;
@@ -768,7 +756,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
         tmp.top = top;
     } else
 #endif
-    if (!bn_to_mont_fixed_top(&tmp, BN_value_one(), mont, ctx))
+        if (!bn_to_mont_fixed_top(&tmp, BN_value_one(), mont, ctx))
         goto err;
 
     /* prepare a^1 in Montgomery domain */
@@ -780,61 +768,61 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
 
 #if defined(SPARC_T4_MONT)
     if (t4) {
-        typedef int (*bn_pwr5_mont_f) (BN_ULONG *tp, const BN_ULONG *np,
-                                       const BN_ULONG *n0, const void *table,
-                                       int power, int bits);
-        int bn_pwr5_mont_t4_8(BN_ULONG *tp, const BN_ULONG *np,
-                              const BN_ULONG *n0, const void *table,
-                              int power, int bits);
-        int bn_pwr5_mont_t4_16(BN_ULONG *tp, const BN_ULONG *np,
-                               const BN_ULONG *n0, const void *table,
-                               int power, int bits);
-        int bn_pwr5_mont_t4_24(BN_ULONG *tp, const BN_ULONG *np,
-                               const BN_ULONG *n0, const void *table,
-                               int power, int bits);
-        int bn_pwr5_mont_t4_32(BN_ULONG *tp, const BN_ULONG *np,
-                               const BN_ULONG *n0, const void *table,
-                               int power, int bits);
+        typedef int (*bn_pwr5_mont_f)(BN_ULONG *tp, const BN_ULONG *np,
+            const BN_ULONG *n0, const void *table,
+            int power, int bits);
+        int bn_pwr5_mont_t4_8(BN_ULONG * tp, const BN_ULONG *np,
+            const BN_ULONG *n0, const void *table,
+            int power, int bits);
+        int bn_pwr5_mont_t4_16(BN_ULONG * tp, const BN_ULONG *np,
+            const BN_ULONG *n0, const void *table,
+            int power, int bits);
+        int bn_pwr5_mont_t4_24(BN_ULONG * tp, const BN_ULONG *np,
+            const BN_ULONG *n0, const void *table,
+            int power, int bits);
+        int bn_pwr5_mont_t4_32(BN_ULONG * tp, const BN_ULONG *np,
+            const BN_ULONG *n0, const void *table,
+            int power, int bits);
         static const bn_pwr5_mont_f pwr5_funcs[4] = {
             bn_pwr5_mont_t4_8, bn_pwr5_mont_t4_16,
             bn_pwr5_mont_t4_24, bn_pwr5_mont_t4_32
         };
         bn_pwr5_mont_f pwr5_worker = pwr5_funcs[top / 16 - 1];
 
-        typedef int (*bn_mul_mont_f) (BN_ULONG *rp, const BN_ULONG *ap,
-                                      const void *bp, const BN_ULONG *np,
-                                      const BN_ULONG *n0);
-        int bn_mul_mont_t4_8(BN_ULONG *rp, const BN_ULONG *ap, const void *bp,
-                             const BN_ULONG *np, const BN_ULONG *n0);
-        int bn_mul_mont_t4_16(BN_ULONG *rp, const BN_ULONG *ap,
-                              const void *bp, const BN_ULONG *np,
-                              const BN_ULONG *n0);
-        int bn_mul_mont_t4_24(BN_ULONG *rp, const BN_ULONG *ap,
-                              const void *bp, const BN_ULONG *np,
-                              const BN_ULONG *n0);
-        int bn_mul_mont_t4_32(BN_ULONG *rp, const BN_ULONG *ap,
-                              const void *bp, const BN_ULONG *np,
-                              const BN_ULONG *n0);
+        typedef int (*bn_mul_mont_f)(BN_ULONG *rp, const BN_ULONG *ap,
+            const void *bp, const BN_ULONG *np,
+            const BN_ULONG *n0);
+        int bn_mul_mont_t4_8(BN_ULONG * rp, const BN_ULONG *ap, const void *bp,
+            const BN_ULONG *np, const BN_ULONG *n0);
+        int bn_mul_mont_t4_16(BN_ULONG * rp, const BN_ULONG *ap,
+            const void *bp, const BN_ULONG *np,
+            const BN_ULONG *n0);
+        int bn_mul_mont_t4_24(BN_ULONG * rp, const BN_ULONG *ap,
+            const void *bp, const BN_ULONG *np,
+            const BN_ULONG *n0);
+        int bn_mul_mont_t4_32(BN_ULONG * rp, const BN_ULONG *ap,
+            const void *bp, const BN_ULONG *np,
+            const BN_ULONG *n0);
         static const bn_mul_mont_f mul_funcs[4] = {
             bn_mul_mont_t4_8, bn_mul_mont_t4_16,
             bn_mul_mont_t4_24, bn_mul_mont_t4_32
         };
         bn_mul_mont_f mul_worker = mul_funcs[top / 16 - 1];
 
-        void bn_mul_mont_vis3(BN_ULONG *rp, const BN_ULONG *ap,
-                              const void *bp, const BN_ULONG *np,
-                              const BN_ULONG *n0, int num);
-        void bn_mul_mont_t4(BN_ULONG *rp, const BN_ULONG *ap,
-                            const void *bp, const BN_ULONG *np,
-                            const BN_ULONG *n0, int num);
-        void bn_mul_mont_gather5_t4(BN_ULONG *rp, const BN_ULONG *ap,
-                                    const void *table, const BN_ULONG *np,
-                                    const BN_ULONG *n0, int num, int power);
+        void bn_mul_mont_vis3(BN_ULONG * rp, const BN_ULONG *ap,
+            const void *bp, const BN_ULONG *np,
+            const BN_ULONG *n0, int num);
+        void bn_mul_mont_t4(BN_ULONG * rp, const BN_ULONG *ap,
+            const void *bp, const BN_ULONG *np,
+            const BN_ULONG *n0, int num);
+        void bn_mul_mont_gather5_t4(BN_ULONG * rp, const BN_ULONG *ap,
+            const void *table, const BN_ULONG *np,
+            const BN_ULONG *n0, int num, int power);
         void bn_flip_n_scatter5_t4(const BN_ULONG *inp, size_t num,
-                                   void *table, size_t power);
-        void bn_gather5_t4(BN_ULONG *out, size_t num,
-                           void *table, size_t power);
-        void bn_flip_t4(BN_ULONG *dst, BN_ULONG *src, size_t num);
+            void *table, size_t power);
+        void bn_gather5_t4(BN_ULONG * out, size_t num,
+            void *table, size_t power);
+        void bn_flip_t4(BN_ULONG * dst, BN_ULONG * src, size_t num);
 
         BN_ULONG *np = mont->N.d, *n0 = mont->n0;
         int stride = 5 * (6 - (top / 16 - 1)); /* multiple of 5, but less
@@ -851,15 +839,13 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
 
         bn_flip_n_scatter5_t4(tmp.d, top, powerbuf, 0);
         bn_flip_n_scatter5_t4(am.d, top, powerbuf, 1);
-        if (!(*mul_worker) (tmp.d, am.d, am.d, np, n0) &&
-            !(*mul_worker) (tmp.d, am.d, am.d, np, n0))
+        if (!(*mul_worker)(tmp.d, am.d, am.d, np, n0) && !(*mul_worker)(tmp.d, am.d, am.d, np, n0))
             bn_mul_mont_vis3(tmp.d, am.d, am.d, np, n0, top);
         bn_flip_n_scatter5_t4(tmp.d, top, powerbuf, 2);
 
         for (i = 3; i < 32; i++) {
             /* Calculate a^i = a^(i-1) * a */
-            if (!(*mul_worker) (tmp.d, tmp.d, am.d, np, n0) &&
-                !(*mul_worker) (tmp.d, tmp.d, am.d, np, n0))
+            if (!(*mul_worker)(tmp.d, tmp.d, am.d, np, n0) && !(*mul_worker)(tmp.d, tmp.d, am.d, np, n0))
                 bn_mul_mont_vis3(tmp.d, tmp.d, am.d, np, n0, top);
             bn_flip_n_scatter5_t4(tmp.d, top, powerbuf, i);
         }
@@ -891,10 +877,10 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
             bits -= stride;
             wvalue = bn_get_bits(p, bits);
 
-            if ((*pwr5_worker) (tmp.d, np, n0, powerbuf, wvalue, stride))
+            if ((*pwr5_worker)(tmp.d, np, n0, powerbuf, wvalue, stride))
                 continue;
             /* retry once and fall back */
-            if ((*pwr5_worker) (tmp.d, np, n0, powerbuf, wvalue, stride))
+            if ((*pwr5_worker)(tmp.d, np, n0, powerbuf, wvalue, stride))
                 continue;
 
             bits += stride - 5;
@@ -906,7 +892,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
             bn_mul_mont_t4(tmp.d, tmp.d, tmp.d, np, n0, top);
             bn_mul_mont_t4(tmp.d, tmp.d, tmp.d, np, n0, top);
             bn_mul_mont_gather5_t4(tmp.d, tmp.d, powerbuf, np, n0, top,
-                                   wvalue);
+                wvalue);
         }
 
         bn_flip_t4(tmp.d, tmp.d, top);
@@ -918,7 +904,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
     } else
 #endif
 #if defined(OPENSSL_BN_ASM_MONT5)
-    if (window == 5 && top > 1) {
+        if (window == 5 && top > 1) {
         /*
          * This optimization uses ideas from https://eprint.iacr.org/2011/239,
          * specifically optimization of cache-timing attack countermeasures,
@@ -936,15 +922,15 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
          * Given those inputs, |bn_mul_mont| may not give reduced
          * output, but it will still produce "almost" reduced output.
          */
-        void bn_mul_mont_gather5(BN_ULONG *rp, const BN_ULONG *ap,
-                                 const void *table, const BN_ULONG *np,
-                                 const BN_ULONG *n0, int num, int power);
+        void bn_mul_mont_gather5(BN_ULONG * rp, const BN_ULONG *ap,
+            const void *table, const BN_ULONG *np,
+            const BN_ULONG *n0, int num, int power);
         void bn_scatter5(const BN_ULONG *inp, size_t num,
-                         void *table, size_t power);
-        void bn_gather5(BN_ULONG *out, size_t num, void *table, size_t power);
-        void bn_power5(BN_ULONG *rp, const BN_ULONG *ap,
-                       const void *table, const BN_ULONG *np,
-                       const BN_ULONG *n0, int num, int power);
+            void *table, size_t power);
+        void bn_gather5(BN_ULONG * out, size_t num, void *table, size_t power);
+        void bn_power5(BN_ULONG * rp, const BN_ULONG *ap,
+            const void *table, const BN_ULONG *np,
+            const BN_ULONG *n0, int num, int power);
         int bn_get_bits5(const BN_ULONG *ap, int off);
 
         BN_ULONG *n0 = mont->n0, *np;
@@ -969,13 +955,13 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
         bn_mul_mont(tmp.d, am.d, am.d, np, n0, top);
         bn_scatter5(tmp.d, top, powerbuf, 2);
 
-# if 0
+#if 0
         for (i = 3; i < 32; i++) {
             /* Calculate a^i = a^(i-1) * a */
             bn_mul_mont_gather5(tmp.d, am.d, powerbuf, np, n0, top, i - 1);
             bn_scatter5(tmp.d, top, powerbuf, i);
         }
-# else
+#else
         /* same as above, but uses squaring for 1/2 of operations */
         for (i = 4; i < 32; i *= 2) {
             bn_mul_mont(tmp.d, tmp.d, tmp.d, np, n0, top);
@@ -1000,7 +986,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
             bn_mul_mont_gather5(tmp.d, am.d, powerbuf, np, n0, top, i - 1);
             bn_scatter5(tmp.d, top, powerbuf, i);
         }
-# endif
+#endif
         /*
          * The exponent may not have a whole number of fixed-size windows.
          * To simplify the main loop, the initial window has between 1 and
@@ -1025,12 +1011,12 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
                 bn_mul_mont(tmp.d, tmp.d, tmp.d, np, n0, top);
                 bn_mul_mont(tmp.d, tmp.d, tmp.d, np, n0, top);
                 bn_mul_mont_gather5(tmp.d, tmp.d, powerbuf, np, n0, top,
-                                    bn_get_bits5(p->d, bits -= 5));
+                    bn_get_bits5(p->d, bits -= 5));
             }
         } else {
             while (bits > 0) {
                 bn_power5(tmp.d, tmp.d, powerbuf, np, n0, top,
-                          bn_get_bits5(p->d, bits -= 5));
+                    bn_get_bits5(p->d, bits -= 5));
             }
         }
 
@@ -1049,7 +1035,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
     } else
 #endif
     {
- fallback:
+    fallback:
         if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, 0, window))
             goto err;
         if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&am, top, powerbuf, 1, window))
@@ -1065,14 +1051,14 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
             if (!bn_mul_mont_fixed_top(&tmp, &am, &am, mont, ctx))
                 goto err;
             if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, 2,
-                                              window))
+                    window))
                 goto err;
             for (i = 3; i < numPowers; i++) {
                 /* Calculate a^i = a^(i-1) * a */
                 if (!bn_mul_mont_fixed_top(&tmp, &am, &tmp, mont, ctx))
                     goto err;
                 if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, i,
-                                                  window))
+                        window))
                     goto err;
             }
         }
@@ -1088,7 +1074,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
         bits -= window0;
         wvalue = bn_get_bits(p, bits) & wmask;
         if (!MOD_EXP_CTIME_COPY_FROM_PREBUF(&tmp, top, powerbuf, wvalue,
-                                            window))
+                window))
             goto err;
 
         wmask = (1 << window) - 1;
@@ -1119,7 +1105,7 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
              * Fetch the appropriate pre-computed value from the pre-buf
              */
             if (!MOD_EXP_CTIME_COPY_FROM_PREBUF(&am, top, powerbuf, wvalue,
-                                                window))
+                    window))
                 goto err;
 
             /* Multiply the result into the intermediate result */
@@ -1135,17 +1121,17 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
      */
 #if defined(SPARC_T4_MONT)
     if (OPENSSL_sparcv9cap_P[0] & (SPARCV9_VIS3 | SPARCV9_PREFER_FPU)) {
-        am.d[0] = 1;            /* borrow am */
+        am.d[0] = 1; /* borrow am */
         for (i = 1; i < top; i++)
             am.d[i] = 0;
         if (!BN_mod_mul_montgomery(rr, &tmp, &am, mont, ctx))
             goto err;
     } else
 #endif
-    if (!bn_from_mont_fixed_top(rr, &tmp, mont, ctx))
+        if (!bn_from_mont_fixed_top(rr, &tmp, mont, ctx))
         goto err;
     ret = 1;
- err:
+err:
     if (in_mont == NULL)
         BN_MONT_CTX_free(mont);
     if (powerbuf != NULL) {
@@ -1157,8 +1143,8 @@ int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
 }
 
 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)
 {
     bn_check_top(a);
     bn_check_top(p);
@@ -1170,7 +1156,7 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
 }
 
 int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG 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)
 {
     BN_MONT_CTX *mont = NULL;
     int b, bits, ret = 0;
@@ -1178,10 +1164,9 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
     BN_ULONG w, next_w;
     BIGNUM *r, *t;
     BIGNUM *swap_tmp;
-#define BN_MOD_MUL_WORD(r, w, m) \
-                (BN_mul_word(r, (w)) && \
-                (/* BN_ucmp(r, (m)) < 0 ? 1 :*/  \
-                        (BN_mod(t, r, m, ctx) && (swap_tmp = r, r = t, t = swap_tmp, 1))))
+#define BN_MOD_MUL_WORD(r, w, m)                            \
+    (BN_mul_word(r, (w)) && (/* BN_ucmp(r, (m)) < 0 ? 1 :*/ \
+         (BN_mod(t, r, m, ctx) && (swap_tmp = r, r = t, t = swap_tmp, 1))))
     /*
      * BN_MOD_MUL_WORD is only used with 'w' large, so the BN_ucmp test is
      * probably more overhead than always using BN_mod (which uses BN_copy if
@@ -1193,10 +1178,10 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
      * the modulus).
      */
 #define BN_TO_MONTGOMERY_WORD(r, w, mont) \
-                (BN_set_word(r, (w)) && BN_to_montgomery(r, r, (mont), ctx))
+    (BN_set_word(r, (w)) && BN_to_montgomery(r, r, (mont), ctx))
 
     if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0
-            || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) {
+        || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) {
         /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */
         ERR_raise(ERR_LIB_BN, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return 0;
@@ -1210,7 +1195,7 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
         return 0;
     }
     if (m->top == 1)
-        a %= m->d[0];           /* make sure that 'a' is reduced */
+        a %= m->d[0]; /* make sure that 'a' is reduced */
 
     bits = BN_num_bits(p);
     if (bits == 0) {
@@ -1244,12 +1229,12 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
             goto err;
     }
 
-    r_is_one = 1;               /* except for Montgomery factor */
+    r_is_one = 1; /* except for Montgomery factor */
 
     /* bits-1 >= 0 */
 
     /* The result is accumulated in the product r*w. */
-    w = a;                      /* bit 'bits-1' of 'p' is always set */
+    w = a; /* bit 'bits-1' of 'p' is always set */
     for (b = bits - 2; b >= 0; b--) {
         /* First, square r*w. */
         next_w = w * w;
@@ -1300,7 +1285,7 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
         }
     }
 
-    if (r_is_one) {             /* can happen only if a == 1 */
+    if (r_is_one) { /* can happen only if a == 1 */
         if (!BN_one(rr))
             goto err;
     } else {
@@ -1308,7 +1293,7 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
             goto err;
     }
     ret = 1;
- err:
+err:
     if (in_mont == NULL)
         BN_MONT_CTX_free(mont);
     BN_CTX_end(ctx);
@@ -1318,7 +1303,7 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
 
 /* The old fallback, simple version :-) */
 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 i, j, bits, ret = 0, wstart, wend, window;
     int start = 1;
@@ -1327,8 +1312,8 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
     BIGNUM *val[TABLE_SIZE];
 
     if (BN_get_flags(p, BN_FLG_CONSTTIME) != 0
-            || BN_get_flags(a, BN_FLG_CONSTTIME) != 0
-            || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) {
+        || BN_get_flags(a, BN_FLG_CONSTTIME) != 0
+        || BN_get_flags(m, BN_FLG_CONSTTIME) != 0) {
         /* BN_FLG_CONSTTIME only supported by BN_mod_exp_mont() */
         ERR_raise(ERR_LIB_BN, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return 0;
@@ -1358,7 +1343,7 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         goto err;
 
     if (!BN_nnmod(val[0], a, m, ctx))
-        goto err;               /* 1 */
+        goto err; /* 1 */
     if (BN_is_zero(val[0])) {
         BN_zero(r);
         ret = 1;
@@ -1368,20 +1353,19 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
     window = BN_window_bits_for_exponent_size(bits);
     if (window > 1) {
         if (!BN_mod_mul(d, val[0], val[0], m, ctx))
-            goto err;           /* 2 */
+            goto err; /* 2 */
         j = 1 << (window - 1);
         for (i = 1; i < j; i++) {
-            if (((val[i] = BN_CTX_get(ctx)) == NULL) ||
-                !BN_mod_mul(val[i], val[i - 1], d, m, ctx))
+            if (((val[i] = BN_CTX_get(ctx)) == NULL) || !BN_mod_mul(val[i], val[i - 1], d, m, ctx))
                 goto err;
         }
     }
 
-    start = 1;                  /* This is used to avoid multiplication etc
-                                 * when there is only the value '1' in the
-                                 * buffer. */
-    wstart = bits - 1;          /* The top bit of the window */
-    wend = 0;                   /* The bottom bit of the window */
+    start = 1; /* This is used to avoid multiplication etc
+                * when there is only the value '1' in the
+                * buffer. */
+    wstart = bits - 1; /* The top bit of the window */
+    wend = 0; /* The bottom bit of the window */
 
     if (r == p) {
         BIGNUM *p_dup = BN_CTX_get(ctx);
@@ -1395,7 +1379,7 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         goto err;
 
     for (;;) {
-        int wvalue;             /* The 'value' of the window */
+        int wvalue; /* The 'value' of the window */
 
         if (BN_is_bit_set(p, wstart) == 0) {
             if (!start)
@@ -1443,7 +1427,7 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
             break;
     }
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     bn_check_top(r);
     return ret;
@@ -1457,10 +1441,10 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
  * it falls back to two BN_mod_exp_mont_consttime() calls.
  */
 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 ret = 0;
 
@@ -1468,13 +1452,7 @@ int BN_mod_exp_mont_consttime_x2(BIGNUM *rr1, const BIGNUM *a1, const BIGNUM *p1
     BN_MONT_CTX *mont1 = NULL;
     BN_MONT_CTX *mont2 = NULL;
 
-    if ((ossl_rsaz_avx512ifma_eligible() || ossl_rsaz_avxifma_eligible()) &&
-        (((a1->top == 16) && (p1->top == 16) && (BN_num_bits(m1) == 1024) &&
-          (a2->top == 16) && (p2->top == 16) && (BN_num_bits(m2) == 1024)) ||
-         ((a1->top == 24) && (p1->top == 24) && (BN_num_bits(m1) == 1536) &&
-          (a2->top == 24) && (p2->top == 24) && (BN_num_bits(m2) == 1536)) ||
-         ((a1->top == 32) && (p1->top == 32) && (BN_num_bits(m1) == 2048) &&
-          (a2->top == 32) && (p2->top == 32) && (BN_num_bits(m2) == 2048)))) {
+    if ((ossl_rsaz_avx512ifma_eligible() || ossl_rsaz_avxifma_eligible()) && (((a1->top == 16) && (p1->top == 16) && (BN_num_bits(m1) == 1024) && (a2->top == 16) && (p2->top == 16) && (BN_num_bits(m2) == 1024)) || ((a1->top == 24) && (p1->top == 24) && (BN_num_bits(m1) == 1536) && (a2->top == 24) && (p2->top == 24) && (BN_num_bits(m2) == 1536)) || ((a1->top == 32) && (p1->top == 32) && (BN_num_bits(m1) == 2048) && (a2->top == 32) && (p2->top == 32) && (BN_num_bits(m2) == 2048)))) {
 
         int topn = a1->top;
         /* Modulus bits of |m1| and |m2| are equal */
@@ -1504,10 +1482,10 @@ int BN_mod_exp_mont_consttime_x2(BIGNUM *rr1, const BIGNUM *a1, const BIGNUM *p1
         }
 
         ret = ossl_rsaz_mod_exp_avx512_x2(rr1->d, a1->d, p1->d, m1->d,
-                                          mont1->RR.d, mont1->n0[0],
-                                          rr2->d, a2->d, p2->d, m2->d,
-                                          mont2->RR.d, mont2->n0[0],
-                                          mod_bits);
+            mont1->RR.d, mont1->n0[0],
+            rr2->d, a2->d, p2->d, m2->d,
+            mont2->RR.d, mont2->n0[0],
+            mod_bits);
 
         rr1->top = topn;
         rr1->neg = 0;
diff --git a/crypto/bn/bn_exp2.c b/crypto/bn/bn_exp2.c
index f5e29fd14de30..53b1ab3fde71a 100644
--- a/crypto/bn/bn_exp2.c
+++ b/crypto/bn/bn_exp2.c
@@ -11,14 +11,13 @@
 #include "internal/cryptlib.h"
 #include "bn_local.h"
 
-#define TABLE_SIZE      32
+#define TABLE_SIZE 32
 
 int BN_mod_exp2_mont(BIGNUM *rr, const BIGNUM *a1, const BIGNUM *p1,
-                     const BIGNUM *a2, const BIGNUM *p2, const BIGNUM *m,
-                     BN_CTX *ctx, BN_MONT_CTX *in_mont)
+    const BIGNUM *a2, const BIGNUM *p2, const BIGNUM *m,
+    BN_CTX *ctx, BN_MONT_CTX *in_mont)
 {
-    int i, j, bits, b, bits1, bits2, ret =
-        0, wpos1, wpos2, window1, window2, wvalue1, wvalue2;
+    int i, j, bits, b, bits1, bits2, ret = 0, wpos1, wpos2, window1, window2, wvalue1, wvalue2;
     int r_is_one = 1;
     BIGNUM *d, *r;
     const BIGNUM *a_mod_m;
@@ -88,8 +87,7 @@ int BN_mod_exp2_mont(BIGNUM *rr, const BIGNUM *a1, const BIGNUM *p1,
 
         j = 1 << (window1 - 1);
         for (i = 1; i < j; i++) {
-            if (((val1[i] = BN_CTX_get(ctx)) == NULL) ||
-                !BN_mod_mul_montgomery(val1[i], val1[i - 1], d, mont, ctx))
+            if (((val1[i] = BN_CTX_get(ctx)) == NULL) || !BN_mod_mul_montgomery(val1[i], val1[i - 1], d, mont, ctx))
                 goto err;
         }
     }
@@ -116,20 +114,19 @@ int BN_mod_exp2_mont(BIGNUM *rr, const BIGNUM *a1, const BIGNUM *p1,
 
         j = 1 << (window2 - 1);
         for (i = 1; i < j; i++) {
-            if (((val2[i] = BN_CTX_get(ctx)) == NULL) ||
-                !BN_mod_mul_montgomery(val2[i], val2[i - 1], d, mont, ctx))
+            if (((val2[i] = BN_CTX_get(ctx)) == NULL) || !BN_mod_mul_montgomery(val2[i], val2[i - 1], d, mont, ctx))
                 goto err;
         }
     }
 
     /* Now compute the power product, using independent windows. */
     r_is_one = 1;
-    wvalue1 = 0;                /* The 'value' of the first window */
-    wvalue2 = 0;                /* The 'value' of the second window */
-    wpos1 = 0;                  /* If wvalue1 > 0, the bottom bit of the
-                                 * first window */
-    wpos2 = 0;                  /* If wvalue2 > 0, the bottom bit of the
-                                 * second window */
+    wvalue1 = 0; /* The 'value' of the first window */
+    wvalue2 = 0; /* The 'value' of the second window */
+    wpos1 = 0; /* If wvalue1 > 0, the bottom bit of the
+                * first window */
+    wpos2 = 0; /* If wvalue2 > 0, the bottom bit of the
+                * second window */
 
     if (!BN_to_montgomery(r, BN_value_one(), mont, ctx))
         goto err;
@@ -192,7 +189,7 @@ int BN_mod_exp2_mont(BIGNUM *rr, const BIGNUM *a1, const BIGNUM *p1,
     if (!BN_from_montgomery(rr, r, mont, ctx))
         goto err;
     ret = 1;
- err:
+err:
     if (in_mont == NULL)
         BN_MONT_CTX_free(mont);
     BN_CTX_end(ctx);
diff --git a/crypto/bn/bn_gcd.c b/crypto/bn/bn_gcd.c
index 13de70eb0d50e..b93ded08db595 100644
--- a/crypto/bn/bn_gcd.c
+++ b/crypto/bn/bn_gcd.c
@@ -18,10 +18,9 @@
  * This is a static function, we ensure all callers in this file pass valid
  * arguments: all passed pointers here are non-NULL.
  */
-static ossl_inline
-BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
-                                 const BIGNUM *a, const BIGNUM *n,
-                                 BN_CTX *ctx, int *pnoinv)
+static ossl_inline BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
+    const BIGNUM *a, const BIGNUM *n,
+    BN_CTX *ctx, int *pnoinv)
 {
     BIGNUM *A, *B, *X, *Y, *M, *D, *T, *R = NULL;
     BIGNUM *ret = NULL;
@@ -62,7 +61,7 @@ BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
          * Turn BN_FLG_CONSTTIME flag on, so that when BN_div is invoked,
          * BN_div_no_branch will be called eventually.
          */
-         {
+        {
             BIGNUM local_B;
             bn_init(&local_B);
             BN_with_flags(&local_B, B, BN_FLG_CONSTTIME);
@@ -111,8 +110,8 @@ BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
          * (**)  sign*Y*a  ==  D*B + M   (mod |n|).
          */
 
-        tmp = A;                /* keep the BIGNUM object, the value does not
-                                 * matter */
+        tmp = A; /* keep the BIGNUM object, the value does not
+                  * matter */
 
         /* (A, B) := (B, A mod B) ... */
         A = B;
@@ -144,8 +143,8 @@ BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
         if (!BN_add(tmp, tmp, Y))
             goto err;
 
-        M = Y;                  /* keep the BIGNUM object, the value does not
-                                 * matter */
+        M = Y; /* keep the BIGNUM object, the value does not
+                * matter */
         Y = X;
         X = tmp;
         sign = -sign;
@@ -183,7 +182,7 @@ BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
     ret = R;
     *pnoinv = 0;
 
- err:
+err:
     if ((ret == NULL) && (in == NULL))
         BN_free(R);
     BN_CTX_end(ctx);
@@ -196,8 +195,8 @@ BIGNUM *bn_mod_inverse_no_branch(BIGNUM *in,
  * all pointers passed here are assumed non-NULL.
  */
 BIGNUM *int_bn_mod_inverse(BIGNUM *in,
-                           const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx,
-                           int *pnoinv)
+    const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx,
+    int *pnoinv)
 {
     BIGNUM *A, *B, *X, *Y, *M, *D, *T, *R = NULL;
     BIGNUM *ret = NULL;
@@ -416,7 +415,7 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in,
              * (**)  sign*Y*a  ==  D*B + M   (mod |n|).
              */
 
-            tmp = A;    /* keep the BIGNUM object, the value does not matter */
+            tmp = A; /* keep the BIGNUM object, the value does not matter */
 
             /* (A, B) := (B, A mod B) ... */
             A = B;
@@ -469,7 +468,7 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in,
                     goto err;
             }
 
-            M = Y;      /* keep the BIGNUM object, the value does not matter */
+            M = Y; /* keep the BIGNUM object, the value does not matter */
             Y = X;
             X = tmp;
             sign = -sign;
@@ -504,7 +503,7 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in,
         goto err;
     }
     ret = R;
- err:
+err:
     if ((ret == NULL) && (in == NULL))
         BN_free(R);
     BN_CTX_end(ctx);
@@ -514,7 +513,7 @@ BIGNUM *int_bn_mod_inverse(BIGNUM *in,
 
 /* solves ax == 1 (mod n) */
 BIGNUM *BN_mod_inverse(BIGNUM *in,
-                       const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx)
+    const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx)
 {
     BN_CTX *new_ctx = NULL;
     BIGNUM *rv;
@@ -621,7 +620,7 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx)
         pow2_flag &= constant_time_is_zero_bn(pow2_numbits_temp);
         pow2_shifts += pow2_flag;
         pow2_numbits = constant_time_select_bn(pow2_condition_mask,
-                                               pow2_numbits, pow2_numbits_temp);
+            pow2_numbits, pow2_numbits_temp);
     }
     pow2_numbits = ~pow2_numbits;
     pow2_shifts *= BN_BITS2;
@@ -669,7 +668,7 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx)
         BN_consttime_swap(g->d[0] & 1 /* g is odd */
                 /* make sure g->top > 0 (i.e. if top == 0 then g == 0 always) */
                 & (~((unsigned int)(g->top - 1) >> (sizeof(g->top) * 8 - 1))),
-                g, temp, top);
+            g, temp, top);
         if (!BN_rshift1(g, g))
             goto err;
     }
@@ -683,7 +682,7 @@ int BN_gcd(BIGNUM *r, const BIGNUM *in_a, const BIGNUM *in_b, BN_CTX *ctx)
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     bn_check_top(r);
     return ret;
diff --git a/crypto/bn/bn_gf2m.c b/crypto/bn/bn_gf2m.c
index ae7e9d751c29c..0fbce8edb6dcc 100644
--- a/crypto/bn/bn_gf2m.c
+++ b/crypto/bn/bn_gf2m.c
@@ -15,51 +15,42 @@
 #include "bn_local.h"
 
 #ifndef OPENSSL_NO_EC2M
-# include <openssl/ec.h>
+#include <openssl/ec.h>
 
 /*
  * Maximum number of iterations before BN_GF2m_mod_solve_quad_arr should
  * fail.
  */
-# define MAX_ITERATIONS 50
-
-# define SQR_nibble(w)   ((((w) & 8) << 3) \
-                       |  (((w) & 4) << 2) \
-                       |  (((w) & 2) << 1) \
-                       |   ((w) & 1))
+#define MAX_ITERATIONS 50
 
+#define SQR_nibble(w) ((((w) & 8) << 3) \
+    | (((w) & 4) << 2)                  \
+    | (((w) & 2) << 1)                  \
+    | ((w) & 1))
 
 /* Platform-specific macros to accelerate squaring. */
-# if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
-#  define SQR1(w) \
-    SQR_nibble((w) >> 60) << 56 | SQR_nibble((w) >> 56) << 48 | \
-    SQR_nibble((w) >> 52) << 40 | SQR_nibble((w) >> 48) << 32 | \
-    SQR_nibble((w) >> 44) << 24 | SQR_nibble((w) >> 40) << 16 | \
-    SQR_nibble((w) >> 36) <<  8 | SQR_nibble((w) >> 32)
-#  define SQR0(w) \
-    SQR_nibble((w) >> 28) << 56 | SQR_nibble((w) >> 24) << 48 | \
-    SQR_nibble((w) >> 20) << 40 | SQR_nibble((w) >> 16) << 32 | \
-    SQR_nibble((w) >> 12) << 24 | SQR_nibble((w) >>  8) << 16 | \
-    SQR_nibble((w) >>  4) <<  8 | SQR_nibble((w)      )
-# endif
-# ifdef THIRTY_TWO_BIT
-#  define SQR1(w) \
-    SQR_nibble((w) >> 28) << 24 | SQR_nibble((w) >> 24) << 16 | \
-    SQR_nibble((w) >> 20) <<  8 | SQR_nibble((w) >> 16)
-#  define SQR0(w) \
-    SQR_nibble((w) >> 12) << 24 | SQR_nibble((w) >>  8) << 16 | \
-    SQR_nibble((w) >>  4) <<  8 | SQR_nibble((w)      )
-# endif
-
-# if !defined(OPENSSL_BN_ASM_GF2m)
+#if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
+#define SQR1(w) \
+    SQR_nibble((w) >> 60) << 56 | SQR_nibble((w) >> 56) << 48 | SQR_nibble((w) >> 52) << 40 | SQR_nibble((w) >> 48) << 32 | SQR_nibble((w) >> 44) << 24 | SQR_nibble((w) >> 40) << 16 | SQR_nibble((w) >> 36) << 8 | SQR_nibble((w) >> 32)
+#define SQR0(w) \
+    SQR_nibble((w) >> 28) << 56 | SQR_nibble((w) >> 24) << 48 | SQR_nibble((w) >> 20) << 40 | SQR_nibble((w) >> 16) << 32 | SQR_nibble((w) >> 12) << 24 | SQR_nibble((w) >> 8) << 16 | SQR_nibble((w) >> 4) << 8 | SQR_nibble((w))
+#endif
+#ifdef THIRTY_TWO_BIT
+#define SQR1(w) \
+    SQR_nibble((w) >> 28) << 24 | SQR_nibble((w) >> 24) << 16 | SQR_nibble((w) >> 20) << 8 | SQR_nibble((w) >> 16)
+#define SQR0(w) \
+    SQR_nibble((w) >> 12) << 24 | SQR_nibble((w) >> 8) << 16 | SQR_nibble((w) >> 4) << 8 | SQR_nibble((w))
+#endif
+
+#if !defined(OPENSSL_BN_ASM_GF2m)
 /*
  * Product of two polynomials a, b each with degree < BN_BITS2 - 1, result is
  * a polynomial r with degree < 2 * BN_BITS - 1 The caller MUST ensure that
  * the variables have the right amount of space allocated.
  */
-#  ifdef THIRTY_TWO_BIT
+#ifdef THIRTY_TWO_BIT
 static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a,
-                            const BN_ULONG b)
+    const BN_ULONG b)
 {
     register BN_ULONG h, l, s;
     BN_ULONG tab[8], top2b = a >> 30;
@@ -125,10 +116,10 @@ static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a,
     *r1 = h;
     *r0 = l;
 }
-#  endif
-#  if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
+#endif
+#if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
 static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a,
-                            const BN_ULONG b)
+    const BN_ULONG b)
 {
     register BN_ULONG h, l, s;
     BN_ULONG tab[16], top3b = a >> 61;
@@ -222,7 +213,7 @@ static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a,
     *r1 = h;
     *r0 = l;
 }
-#  endif
+#endif
 
 /*
  * Product of two polynomials a, b each with degree < 2 * BN_BITS2 - 1,
@@ -230,7 +221,7 @@ static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a,
  * ensure that the variables have the right amount of space allocated.
  */
 static void bn_GF2m_mul_2x2(BN_ULONG *r, const BN_ULONG a1, const BN_ULONG a0,
-                            const BN_ULONG b1, const BN_ULONG b0)
+    const BN_ULONG b1, const BN_ULONG b0)
 {
     BN_ULONG m1, m0;
     /* r[3] = h1, r[2] = h0; r[1] = l1; r[0] = l0 */
@@ -238,13 +229,13 @@ static void bn_GF2m_mul_2x2(BN_ULONG *r, const BN_ULONG a1, const BN_ULONG a0,
     bn_GF2m_mul_1x1(r + 1, r, a0, b0);
     bn_GF2m_mul_1x1(&m1, &m0, a0 ^ a1, b0 ^ b1);
     /* Correction on m1 ^= l1 ^ h1; m0 ^= l0 ^ h0; */
-    r[2] ^= m1 ^ r[1] ^ r[3];   /* h0 ^= m1 ^ l1 ^ h1; */
+    r[2] ^= m1 ^ r[1] ^ r[3]; /* h0 ^= m1 ^ l1 ^ h1; */
     r[1] = r[3] ^ r[2] ^ r[0] ^ m1 ^ m0; /* l1 ^= l0 ^ h0 ^ m0; */
 }
-# else
+#else
 void bn_GF2m_mul_2x2(BN_ULONG *r, BN_ULONG a1, BN_ULONG a0, BN_ULONG b1,
-                     BN_ULONG b0);
-# endif
+    BN_ULONG b0);
+#endif
 
 /*
  * Add polynomials a and b and store result in r; r could be a or b, a and b
@@ -362,7 +353,7 @@ int BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const int p[])
             z[dN] = (z[dN] << d1) >> d1;
         else
             z[dN] = 0;
-        z[0] ^= zz;             /* reduction t^0 component */
+        z[0] ^= zz; /* reduction t^0 component */
 
         for (k = 1; p[k] != 0; k++) {
             BN_ULONG tmp_ulong;
@@ -375,7 +366,6 @@ int BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const int p[])
             if (d0 && (tmp_ulong = zz >> d1))
                 z[n + 1] ^= tmp_ulong;
         }
-
     }
 
     bn_correct_top(r);
@@ -409,7 +399,7 @@ int BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p)
  * the result in r.  r could be a or b; a could be b.
  */
 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)
 {
     int zlen, i, j, k, ret = 0;
     BIGNUM *s;
@@ -451,7 +441,7 @@ int BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
         ret = 1;
     bn_check_top(r);
 
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -464,7 +454,7 @@ int BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
  * BN_GF2m_mod_mul_arr function.
  */
 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)
 {
     int ret = 0;
     const int max = BN_num_bits(p) + 1;
@@ -484,14 +474,14 @@ int BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
     }
     ret = BN_GF2m_mod_mul_arr(r, a, b, arr, ctx);
     bn_check_top(r);
- err:
+err:
     OPENSSL_free(arr);
     return ret;
 }
 
 /* Square a, reduce the result mod p, and store it in a.  r could be a. */
 int BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const int p[],
-                        BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int i, ret = 0;
     BIGNUM *s;
@@ -514,7 +504,7 @@ int BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const int p[],
         goto err;
     bn_check_top(r);
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -544,7 +534,7 @@ int BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
     }
     ret = BN_GF2m_mod_sqr_arr(r, a, arr, ctx);
     bn_check_top(r);
- err:
+err:
     OPENSSL_free(arr);
     return ret;
 }
@@ -556,7 +546,7 @@ int BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
  * Curve Cryptography Over Binary Fields".
  */
 static int BN_GF2m_mod_inv_vartime(BIGNUM *r, const BIGNUM *a,
-                                   const BIGNUM *p, BN_CTX *ctx)
+    const BIGNUM *p, BN_CTX *ctx)
 {
     BIGNUM *b, *c = NULL, *u = NULL, *v = NULL, *tmp;
     int ret = 0;
@@ -580,7 +570,7 @@ static int BN_GF2m_mod_inv_vartime(BIGNUM *r, const BIGNUM *a,
 
     if (!BN_copy(v, p))
         goto err;
-# if 0
+#if 0
     if (!BN_one(b))
         goto err;
 
@@ -615,7 +605,7 @@ static int BN_GF2m_mod_inv_vartime(BIGNUM *r, const BIGNUM *a,
         if (!BN_GF2m_add(b, b, c))
             goto err;
     }
-# else
+#else
     {
         int i;
         int ubits = BN_num_bits(u);
@@ -630,22 +620,22 @@ static int BN_GF2m_mod_inv_vartime(BIGNUM *r, const BIGNUM *a,
             udp[i] = 0;
         u->top = top;
         if (!bn_wexpand(b, top))
-          goto err;
+            goto err;
         bdp = b->d;
         bdp[0] = 1;
         for (i = 1; i < top; i++)
             bdp[i] = 0;
         b->top = top;
         if (!bn_wexpand(c, top))
-          goto err;
+            goto err;
         cdp = c->d;
         for (i = 0; i < top; i++)
             cdp[i] = 0;
         c->top = top;
-        vdp = v->d;             /* It pays off to "cache" *->d pointers,
-                                 * because it allows optimizer to be more
-                                 * aggressive. But we don't have to "cache"
-                                 * p->d, because *p is declared 'const'... */
+        vdp = v->d; /* It pays off to "cache" *->d pointers,
+                     * because it allows optimizer to be more
+                     * aggressive. But we don't have to "cache"
+                     * p->d, because *p is declared 'const'... */
         while (1) {
             while (ubits && !(udp[0] & 1)) {
                 BN_ULONG u0, u1, b0, b1, mask;
@@ -704,20 +694,20 @@ static int BN_GF2m_mod_inv_vartime(BIGNUM *r, const BIGNUM *a,
         }
         bn_correct_top(b);
     }
-# endif
+#endif
 
     if (!BN_copy(r, b))
         goto err;
     bn_check_top(r);
     ret = 1;
 
- err:
-# ifdef BN_DEBUG
+err:
+#ifdef BN_DEBUG
     /* BN_CTX_end would complain about the expanded form */
     bn_correct_top(c);
     bn_correct_top(u);
     bn_correct_top(v);
-# endif
+#endif
     BN_CTX_end(ctx);
     return ret;
 }
@@ -745,7 +735,7 @@ int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
     /* generate blinding value */
     do {
         if (!BN_priv_rand_ex(b, numbits - 1,
-                             BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx))
+                BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx))
             goto err;
     } while (BN_is_zero(b));
 
@@ -763,7 +753,7 @@ int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -775,7 +765,7 @@ int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
  * use the BN_GF2m_mod_inv function.
  */
 int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *xx, const int p[],
-                        BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     BIGNUM *field;
     int ret = 0;
@@ -790,7 +780,7 @@ int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *xx, const int p[],
     ret = BN_GF2m_mod_inv(r, xx, field, ctx);
     bn_check_top(r);
 
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -800,7 +790,7 @@ int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *xx, const int p[],
  * or y, x could equal y.
  */
 int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *y, const BIGNUM *x,
-                    const BIGNUM *p, BN_CTX *ctx)
+    const BIGNUM *p, BN_CTX *ctx)
 {
     BIGNUM *xinv = NULL;
     int ret = 0;
@@ -821,7 +811,7 @@ int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *y, const BIGNUM *x,
     bn_check_top(r);
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -833,7 +823,7 @@ int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *y, const BIGNUM *x,
  * convenience; for best performance, use the BN_GF2m_mod_div function.
  */
 int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *yy, const BIGNUM *xx,
-                        const int p[], BN_CTX *ctx)
+    const int p[], BN_CTX *ctx)
 {
     BIGNUM *field;
     int ret = 0;
@@ -850,7 +840,7 @@ int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *yy, const BIGNUM *xx,
     ret = BN_GF2m_mod_div(r, yy, xx, field, ctx);
     bn_check_top(r);
 
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -861,7 +851,7 @@ int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *yy, const BIGNUM *xx,
  * P1363.
  */
 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)
 {
     int ret = 0, i, n;
     BIGNUM *u;
@@ -895,7 +885,7 @@ int BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
         goto err;
     bn_check_top(r);
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -907,7 +897,7 @@ int BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
  * for best performance, use the BN_GF2m_mod_exp_arr function.
  */
 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)
 {
     int ret = 0;
     const int max = BN_num_bits(p) + 1;
@@ -927,7 +917,7 @@ int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
     }
     ret = BN_GF2m_mod_exp_arr(r, a, b, arr, ctx);
     bn_check_top(r);
- err:
+err:
     OPENSSL_free(arr);
     return ret;
 }
@@ -937,7 +927,7 @@ int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
  * r could be a. Uses exponentiation as in algorithm A.4.1 from IEEE P1363.
  */
 int BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a, const int p[],
-                         BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret = 0;
     BIGNUM *u;
@@ -959,7 +949,7 @@ int BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a, const int p[],
     ret = BN_GF2m_mod_exp_arr(r, a, u, p, ctx);
     bn_check_top(r);
 
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -989,7 +979,7 @@ int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
     }
     ret = BN_GF2m_mod_sqrt_arr(r, a, arr, ctx);
     bn_check_top(r);
- err:
+err:
     OPENSSL_free(arr);
     return ret;
 }
@@ -999,7 +989,7 @@ int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
  * 0. Uses algorithms A.4.7 and A.4.6 from IEEE P1363.
  */
 int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
-                               BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret = 0, count = 0, j;
     BIGNUM *a, *z, *rho, *w, *w2, *tmp;
@@ -1028,7 +1018,7 @@ int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
         goto err;
     }
 
-    if (p[0] & 0x1) {           /* m is odd */
+    if (p[0] & 0x1) { /* m is odd */
         /* compute half-trace of a */
         if (!BN_copy(z, a))
             goto err;
@@ -1041,7 +1031,7 @@ int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
                 goto err;
         }
 
-    } else {                    /* m is even */
+    } else { /* m is even */
 
         rho = BN_CTX_get(ctx);
         w2 = BN_CTX_get(ctx);
@@ -1050,7 +1040,7 @@ int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
             goto err;
         do {
             if (!BN_priv_rand_ex(rho, p[0], BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY,
-                                 0, ctx))
+                    0, ctx))
                 goto err;
             if (!BN_GF2m_mod_arr(rho, rho, p))
                 goto err;
@@ -1092,7 +1082,7 @@ int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -1104,7 +1094,7 @@ int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const int p[],
  * for best performance, use the BN_GF2m_mod_solve_quad_arr function.
  */
 int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                           BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret = 0;
     const int max = BN_num_bits(p) + 1;
@@ -1123,7 +1113,7 @@ int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
     }
     ret = BN_GF2m_mod_solve_quad_arr(r, a, arr, ctx);
     bn_check_top(r);
- err:
+err:
     OPENSSL_free(arr);
     return ret;
 }
diff --git a/crypto/bn/bn_intern.c b/crypto/bn/bn_intern.c
index 505a9dfcc3917..bd299cd1442d7 100644
--- a/crypto/bn/bn_intern.c
+++ b/crypto/bn/bn_intern.c
@@ -36,14 +36,14 @@ signed char *bn_compute_wNAF(const BIGNUM *scalar, int w, size_t *ret_len)
         return r;
     }
 
-    if (w <= 0 || w > 7) {      /* 'signed char' can represent integers with
-                                 * absolute values less than 2^7 */
+    if (w <= 0 || w > 7) { /* 'signed char' can represent integers with
+                            * absolute values less than 2^7 */
         ERR_raise(ERR_LIB_BN, ERR_R_INTERNAL_ERROR);
         goto err;
     }
-    bit = 1 << w;               /* at most 128 */
-    next_bit = bit << 1;        /* at most 256 */
-    mask = next_bit - 1;        /* at most 255 */
+    bit = 1 << w; /* at most 128 */
+    next_bit = bit << 1; /* at most 256 */
+    mask = next_bit - 1; /* at most 255 */
 
     if (BN_is_negative(scalar)) {
         sign = -1;
@@ -77,7 +77,7 @@ signed char *bn_compute_wNAF(const BIGNUM *scalar, int w, size_t *ret_len)
             if (window_val & bit) {
                 digit = window_val - next_bit; /* -2^w < digit < 0 */
 
-#if 1                           /* modified wNAF */
+#if 1 /* modified wNAF */
                 if (j + w + 1 >= len) {
                     /*
                      * Special case for generating modified wNAFs:
@@ -129,7 +129,7 @@ signed char *bn_compute_wNAF(const BIGNUM *scalar, int w, size_t *ret_len)
     *ret_len = j;
     return r;
 
- err:
+err:
     OPENSSL_free(r);
     return NULL;
 }
diff --git a/crypto/bn/bn_kron.c b/crypto/bn/bn_kron.c
index 8258536dcacef..b24bdd1c07c96 100644
--- a/crypto/bn/bn_kron.c
+++ b/crypto/bn/bn_kron.c
@@ -11,13 +11,13 @@
 #include "bn_local.h"
 
 /* least significant word */
-#define BN_lsw(n) (((n)->top == 0) ? (BN_ULONG) 0 : (n)->d[0])
+#define BN_lsw(n) (((n)->top == 0) ? (BN_ULONG)0 : (n)->d[0])
 
 /* Returns -2 for errors because both -1 and 0 are valid results. */
 int BN_kronecker(const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
 {
     int i;
-    int ret = -2;               /* avoid 'uninitialized' warning */
+    int ret = -2; /* avoid 'uninitialized' warning */
     int err = 0;
     BIGNUM *A, *B, *tmp;
     /*-
@@ -131,7 +131,7 @@ int BN_kronecker(const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
         B = tmp;
         tmp->neg = 0;
     }
- end:
+end:
     BN_CTX_end(ctx);
     if (err)
         return -2;
diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index 470592731fa8f..93d54fd0a6ed3 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -28,7 +28,7 @@
  * 8 - 256 == 8192
  */
 static int bn_limit_bits = 0;
-static int bn_limit_num = 8;    /* (1<<bn_limit_bits) */
+static int bn_limit_num = 8; /* (1<<bn_limit_bits) */
 static int bn_limit_bits_low = 0;
 static int bn_limit_num_low = 8; /* (1<<bn_limit_bits_low) */
 static int bn_limit_bits_high = 0;
@@ -94,9 +94,9 @@ const BIGNUM *BN_value_one(void)
  * https://mta.openssl.org/pipermail/openssl-users/2018-August/008465.html
  */
 #if defined(_MSC_VER) && defined(_ARM_) && defined(_WIN32_WCE) \
-    && _MSC_VER>=1400 && _MSC_VER<1501
-# define MS_BROKEN_BN_num_bits_word
-# pragma optimize("", off)
+    && _MSC_VER >= 1400 && _MSC_VER < 1501
+#define MS_BROKEN_BN_num_bits_word
+#pragma optimize("", off)
 #endif
 int BN_num_bits_word(BN_ULONG l)
 {
@@ -143,15 +143,14 @@ int BN_num_bits_word(BN_ULONG l)
     return bits;
 }
 #ifdef MS_BROKEN_BN_num_bits_word
-# pragma optimize("", on)
+#pragma optimize("", on)
 #endif
 
 /*
  * This function still leaks `a->dmax`: it's caller's responsibility to
  * expand the input `a` in advance to a public length.
  */
-static ossl_inline
-int bn_num_bits_consttime(const BIGNUM *a)
+static ossl_inline int bn_num_bits_consttime(const BIGNUM *a)
 {
     int j, ret;
     unsigned int mask, past_i;
@@ -210,7 +209,6 @@ static void bn_free_d(BIGNUM *a, int clear)
         OPENSSL_free(a->d);
 }
 
-
 void BN_clear_free(BIGNUM *a)
 {
     if (a == NULL)
@@ -354,10 +352,7 @@ BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b)
     return a;
 }
 
-#define FLAGS_DATA(flags) ((flags) & (BN_FLG_STATIC_DATA \
-                                    | BN_FLG_CONSTTIME   \
-                                    | BN_FLG_SECURE      \
-                                    | BN_FLG_FIXED_TOP))
+#define FLAGS_DATA(flags) ((flags) & (BN_FLG_STATIC_DATA | BN_FLG_CONSTTIME | BN_FLG_SECURE | BN_FLG_FIXED_TOP))
 #define FLAGS_STRUCT(flags) ((flags) & (BN_FLG_MALLOCED))
 
 void BN_swap(BIGNUM *a, BIGNUM *b)
@@ -428,11 +423,13 @@ int BN_set_word(BIGNUM *a, BN_ULONG w)
     return 1;
 }
 
-typedef enum {BIG, LITTLE} endianness_t;
-typedef enum {SIGNED, UNSIGNED} signedness_t;
+typedef enum { BIG,
+    LITTLE } endianness_t;
+typedef enum { SIGNED,
+    UNSIGNED } signedness_t;
 
 static BIGNUM *bin2bn(const unsigned char *s, int len, BIGNUM *ret,
-                      endianness_t endianness, signedness_t signedness)
+    endianness_t endianness, signedness_t signedness)
 {
     int inc;
     const unsigned char *s2;
@@ -488,7 +485,7 @@ static BIGNUM *bin2bn(const unsigned char *s, int len, BIGNUM *ret,
      * Skip leading sign extensions (the value of |xor|).
      * This is the only spot where |s2| and |inc2| are used.
      */
-    for ( ; len > 0 && *s2 == xor; s2 += inc2, len--)
+    for (; len > 0 && *s2 == xor; s2 += inc2, len--)
         continue;
 
     /*
@@ -513,8 +510,8 @@ static BIGNUM *bin2bn(const unsigned char *s, int len, BIGNUM *ret,
     ret->top = n;
     ret->neg = neg;
     for (i = 0; n-- > 0; i++) {
-        BN_ULONG l = 0;        /* Accumulator */
-        unsigned int m = 0;    /* Offset in a bignum chunk, in bits */
+        BN_ULONG l = 0; /* Accumulator */
+        unsigned int m = 0; /* Offset in a bignum chunk, in bits */
 
         for (; len > 0 && m < BN_BYTES * 8; len--, s += inc, m += 8) {
             BN_ULONG byte_xored = *s ^ xor;
@@ -544,7 +541,7 @@ BIGNUM *BN_signed_bin2bn(const unsigned char *s, int len, BIGNUM *ret)
 }
 
 static int bn2binpad(const BIGNUM *a, unsigned char *to, int tolen,
-                     endianness_t endianness, signedness_t signedness)
+    endianness_t endianness, signedness_t signedness)
 {
     int inc;
     int n, n8;
@@ -558,7 +555,7 @@ static int bn2binpad(const BIGNUM *a, unsigned char *to, int tolen,
      * even for padded output, so it works out...
      */
     n8 = BN_num_bits(a);
-    n = (n8 + 7) / 8;           /* This is what BN_num_bytes() does */
+    n = (n8 + 7) / 8; /* This is what BN_num_bytes() does */
 
     /* Take note of the signedness of the bignum */
     if (signedness == SIGNED) {
@@ -572,8 +569,8 @@ static int bn2binpad(const BIGNUM *a, unsigned char *to, int tolen,
          * to 2's complement.
          */
         ext = (n * 8 == n8)
-            ? !a->neg            /* MSbit set on nonnegative bignum */
-            : a->neg;            /* MSbit unset on negative bignum */
+            ? !a->neg /* MSbit set on nonnegative bignum */
+            : a->neg; /* MSbit unset on negative bignum */
     }
 
     if (tolen == -1) {
@@ -583,7 +580,7 @@ static int bn2binpad(const BIGNUM *a, unsigned char *to, int tolen,
 
         bn_correct_top(&temp);
         n8 = BN_num_bits(&temp);
-        n = (n8 + 7) / 8;       /* This is what BN_num_bytes() does */
+        n = (n8 + 7) / 8; /* This is what BN_num_bytes() does */
         if (tolen < n + ext)
             return -1;
     }
@@ -605,7 +602,7 @@ static int bn2binpad(const BIGNUM *a, unsigned char *to, int tolen,
         inc = 1;
     } else {
         inc = -1;
-        to += tolen - 1;         /* Move to the last byte, not beyond */
+        to += tolen - 1; /* Move to the last byte, not beyond */
     }
 
     lasti = atop - 1;
@@ -714,14 +711,14 @@ int BN_ucmp(const BIGNUM *a, const BIGNUM *b)
     bp = b->d;
 
     if (BN_get_flags(a, BN_FLG_CONSTTIME)
-            && a->top == b->top) {
+        && a->top == b->top) {
         int res = 0;
 
         for (i = 0; i < b->top; i++) {
             res = constant_time_select_int(constant_time_lt_bn(ap[i], bp[i]),
-                                           -1, res);
+                -1, res);
             res = constant_time_select_int(constant_time_lt_bn(bp[i], ap[i]),
-                                           1, res);
+                1, res);
         }
         return res;
     }
@@ -922,13 +919,13 @@ int bn_cmp_part_words(const BN_ULONG *a, const BN_ULONG *b, int cl, int dl)
     if (dl < 0) {
         for (i = dl; i < 0; i++) {
             if (b[n - i] != 0)
-                return -1;      /* a < b */
+                return -1; /* a < b */
         }
     }
     if (dl > 0) {
         for (i = dl; i > 0; i--) {
             if (a[n + i] != 0)
-                return 1;       /* a > b */
+                return 1; /* a > b */
         }
     }
     return bn_cmp_words(a, b, cl);
@@ -1061,7 +1058,7 @@ int ossl_bn_is_word_fixed_top(const BIGNUM *a, const BN_ULONG w)
 
     for (i = 1; i < a->top; i++)
         res = constant_time_select_int(constant_time_is_zero_bn(ap[i]),
-                                       res, 0);
+            res, 0);
     return res;
 }
 
@@ -1076,7 +1073,7 @@ int BN_is_negative(const BIGNUM *a)
 }
 
 int BN_to_montgomery(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont,
-                     BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     return BN_mod_mul_montgomery(r, a, &(mont->RR), mont, ctx);
 }
@@ -1088,8 +1085,8 @@ void BN_with_flags(BIGNUM *dest, const BIGNUM *b, int flags)
     dest->dmax = b->dmax;
     dest->neg = b->neg;
     dest->flags = ((dest->flags & BN_FLG_MALLOCED)
-                   | (b->flags & ~BN_FLG_MALLOCED)
-                   | BN_FLG_STATIC_DATA | flags);
+        | (b->flags & ~BN_FLG_MALLOCED)
+        | BN_FLG_STATIC_DATA | flags);
 }
 
 BN_GENCB *BN_GENCB_new(void)
@@ -1120,8 +1117,8 @@ int BN_get_flags(const BIGNUM *b, int n)
 }
 
 /* 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)
 {
     BN_GENCB *tmp_gencb = gencb;
     tmp_gencb->ver = 1;
@@ -1130,8 +1127,8 @@ void BN_GENCB_set_old(BN_GENCB *gencb, void (*callback) (int, int, void *),
 }
 
 /* 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)
 {
     BN_GENCB *tmp_gencb = gencb;
     tmp_gencb->ver = 2;
diff --git a/crypto/bn/bn_local.h b/crypto/bn/bn_local.h
index b5be37ba973e3..45b545bce3dd6 100644
--- a/crypto/bn/bn_local.h
+++ b/crypto/bn/bn_local.h
@@ -8,22 +8,22 @@
  */
 
 #ifndef OSSL_CRYPTO_BN_LOCAL_H
-# define OSSL_CRYPTO_BN_LOCAL_H
+#define OSSL_CRYPTO_BN_LOCAL_H
 
 /*
  * The EDK2 build doesn't use bn_conf.h; it sets THIRTY_TWO_BIT or
  * SIXTY_FOUR_BIT in its own environment since it doesn't re-run our
  * Configure script and needs to support both 32-bit and 64-bit.
  */
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# if !defined(OPENSSL_SYS_UEFI)
-#  include "crypto/bn_conf.h"
-# endif
+#if !defined(OPENSSL_SYS_UEFI)
+#include "crypto/bn_conf.h"
+#endif
 
-# include "crypto/bn.h"
-# include "internal/cryptlib.h"
-# include "internal/numbers.h"
+#include "crypto/bn.h"
+#include "internal/cryptlib.h"
+#include "internal/numbers.h"
 
 /*
  * These preprocessor symbols control various aspects of the bignum headers
@@ -35,12 +35,12 @@
  * mismanagement of bignum internals. Enable BN_RAND_DEBUG is known to
  * break some of the OpenSSL tests.
  */
-# if defined(BN_RAND_DEBUG) && !defined(BN_DEBUG)
-#  define BN_DEBUG
-# endif
-# if defined(BN_RAND_DEBUG)
-#  include <openssl/rand.h>
-# endif
+#if defined(BN_RAND_DEBUG) && !defined(BN_DEBUG)
+#define BN_DEBUG
+#endif
+#if defined(BN_RAND_DEBUG)
+#include <openssl/rand.h>
+#endif
 
 /*
  * This should limit the stack usage due to alloca to about 4K.
@@ -58,15 +58,15 @@
  * "./config -DBN_SOFT_LIMIT=<limit>" if necessary, and the O/S specific
  * stack limit is known and taken into consideration.
  */
-# ifndef BN_SOFT_LIMIT
-#  define BN_SOFT_LIMIT         (4096 / BN_BYTES)
-# endif
+#ifndef BN_SOFT_LIMIT
+#define BN_SOFT_LIMIT (4096 / BN_BYTES)
+#endif
 
-# ifndef OPENSSL_SMALL_FOOTPRINT
-#  define BN_MUL_COMBA
-#  define BN_SQR_COMBA
-#  define BN_RECURSION
-# endif
+#ifndef OPENSSL_SMALL_FOOTPRINT
+#define BN_MUL_COMBA
+#define BN_SQR_COMBA
+#define BN_RECURSION
+#endif
 
 /*
  * This next option uses the C libraries (2 word)/(1 word) function. If it is
@@ -80,63 +80,61 @@
  * this should be on.  Again this in only really a problem on machines using
  * "long long's", are 32bit, and are not using my assembler code.
  */
-# if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || \
-    defined(OPENSSL_SYS_WIN32) || defined(linux)
-#  define BN_DIV2W
-# endif
+#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(linux)
+#define BN_DIV2W
+#endif
 
 /*
  * 64-bit processor with LP64 ABI
  */
-# ifdef SIXTY_FOUR_BIT_LONG
-#  define BN_ULLONG       unsigned long long
-#  define BN_BITS4        32
-#  define BN_MASK2        (0xffffffffffffffffL)
-#  define BN_MASK2l       (0xffffffffL)
-#  define BN_MASK2h       (0xffffffff00000000L)
-#  define BN_MASK2h1      (0xffffffff80000000L)
-#  define BN_DEC_CONV     (10000000000000000000UL)
-#  define BN_DEC_NUM      19
-#  define BN_DEC_FMT1     "%lu"
-#  define BN_DEC_FMT2     "%019lu"
-# endif
+#ifdef SIXTY_FOUR_BIT_LONG
+#define BN_ULLONG unsigned long long
+#define BN_BITS4 32
+#define BN_MASK2 (0xffffffffffffffffL)
+#define BN_MASK2l (0xffffffffL)
+#define BN_MASK2h (0xffffffff00000000L)
+#define BN_MASK2h1 (0xffffffff80000000L)
+#define BN_DEC_CONV (10000000000000000000UL)
+#define BN_DEC_NUM 19
+#define BN_DEC_FMT1 "%lu"
+#define BN_DEC_FMT2 "%019lu"
+#endif
 
 /*
  * 64-bit processor other than LP64 ABI
  */
-# ifdef SIXTY_FOUR_BIT
-#  undef BN_LLONG
-#  undef BN_ULLONG
-#  define BN_BITS4        32
-#  define BN_MASK2        (0xffffffffffffffffLL)
-#  define BN_MASK2l       (0xffffffffL)
-#  define BN_MASK2h       (0xffffffff00000000LL)
-#  define BN_MASK2h1      (0xffffffff80000000LL)
-#  define BN_DEC_CONV     (10000000000000000000ULL)
-#  define BN_DEC_NUM      19
-#  define BN_DEC_FMT1     "%llu"
-#  define BN_DEC_FMT2     "%019llu"
-# endif
-
-# ifdef THIRTY_TWO_BIT
-#  ifdef BN_LLONG
-#   if defined(_WIN32) && !defined(__GNUC__)
-#    define BN_ULLONG     unsigned __int64
-#   else
-#    define BN_ULLONG     unsigned long long
-#   endif
-#  endif
-#  define BN_BITS4        16
-#  define BN_MASK2        (0xffffffffL)
-#  define BN_MASK2l       (0xffff)
-#  define BN_MASK2h1      (0xffff8000L)
-#  define BN_MASK2h       (0xffff0000L)
-#  define BN_DEC_CONV     (1000000000L)
-#  define BN_DEC_NUM      9
-#  define BN_DEC_FMT1     "%u"
-#  define BN_DEC_FMT2     "%09u"
-# endif
+#ifdef SIXTY_FOUR_BIT
+#undef BN_LLONG
+#undef BN_ULLONG
+#define BN_BITS4 32
+#define BN_MASK2 (0xffffffffffffffffLL)
+#define BN_MASK2l (0xffffffffL)
+#define BN_MASK2h (0xffffffff00000000LL)
+#define BN_MASK2h1 (0xffffffff80000000LL)
+#define BN_DEC_CONV (10000000000000000000ULL)
+#define BN_DEC_NUM 19
+#define BN_DEC_FMT1 "%llu"
+#define BN_DEC_FMT2 "%019llu"
+#endif
 
+#ifdef THIRTY_TWO_BIT
+#ifdef BN_LLONG
+#if defined(_WIN32) && !defined(__GNUC__)
+#define BN_ULLONG unsigned __int64
+#else
+#define BN_ULLONG unsigned long long
+#endif
+#endif
+#define BN_BITS4 16
+#define BN_MASK2 (0xffffffffL)
+#define BN_MASK2l (0xffff)
+#define BN_MASK2h1 (0xffff8000L)
+#define BN_MASK2h (0xffff0000L)
+#define BN_DEC_CONV (1000000000L)
+#define BN_DEC_NUM 9
+#define BN_DEC_FMT1 "%u"
+#define BN_DEC_FMT2 "%09u"
+#endif
 
 /*-
  * Bignum consistency macros
@@ -167,7 +165,7 @@
  * coverage for openssl's own code.
  */
 
-# ifdef BN_DEBUG
+#ifdef BN_DEBUG
 /*
  * The new BN_FLG_FIXED_TOP flag marks vectors that were not treated with
  * bn_correct_top, in other words such vectors are permitted to have zeros
@@ -177,95 +175,92 @@
  * observe it anyway. Moreover, optimizing compiler would actually remove
  * all operations manipulating the bit in question in non-BN_DEBUG build.
  */
-#  define BN_FLG_FIXED_TOP 0x10000
-#  ifdef BN_RAND_DEBUG
-#   define bn_pollute(a) \
-        do { \
-            const BIGNUM *_bnum1 = (a); \
-            if (_bnum1->top < _bnum1->dmax) { \
-                unsigned char _tmp_char; \
-                /* We cast away const without the compiler knowing, any \
-                 * *genuinely* constant variables that aren't mutable \
-                 * wouldn't be constructed with top!=dmax. */ \
-                BN_ULONG *_not_const; \
-                memcpy(&_not_const, &_bnum1->d, sizeof(_not_const)); \
-                (void)RAND_bytes(&_tmp_char, 1); /* Debug only - safe to ignore error return */\
-                memset(_not_const + _bnum1->top, _tmp_char, \
-                       sizeof(*_not_const) * (_bnum1->dmax - _bnum1->top)); \
-            } \
-        } while(0)
-#  else
-#   define bn_pollute(a)
-#  endif
-#  define bn_check_top(a) \
-        do { \
-                const BIGNUM *_bnum2 = (a); \
-                if (_bnum2 != NULL) { \
-                        int _top = _bnum2->top; \
-                        (void)ossl_assert((_top == 0 && !_bnum2->neg) || \
-                                  (_top && ((_bnum2->flags & BN_FLG_FIXED_TOP) \
-                                            || _bnum2->d[_top - 1] != 0))); \
-                        bn_pollute(_bnum2); \
-                } \
-        } while(0)
-
-#  define bn_fix_top(a)           bn_check_top(a)
-
-#  define bn_check_size(bn, bits) bn_wcheck_size(bn, ((bits+BN_BITS2-1))/BN_BITS2)
-#  define bn_wcheck_size(bn, words) \
-        do { \
-                const BIGNUM *_bnum2 = (bn); \
-                assert((words) <= (_bnum2)->dmax && \
-                       (words) >= (_bnum2)->top); \
-                /* avoid unused variable warning with NDEBUG */ \
-                (void)(_bnum2); \
-        } while(0)
-
-# else                          /* !BN_DEBUG */
-
-#  define BN_FLG_FIXED_TOP 0
-#  define bn_pollute(a)
-#  define bn_check_top(a)
-#  define bn_fix_top(a)           bn_correct_top(a)
-#  define bn_check_size(bn, bits)
-#  define bn_wcheck_size(bn, words)
-
-# endif
+#define BN_FLG_FIXED_TOP 0x10000
+#ifdef BN_RAND_DEBUG
+#define bn_pollute(a)                                                                       \
+    do {                                                                                    \
+        const BIGNUM *_bnum1 = (a);                                                         \
+        if (_bnum1->top < _bnum1->dmax) {                                                   \
+            unsigned char _tmp_char;                                                        \
+            /* We cast away const without the compiler knowing, any                         \
+             * *genuinely* constant variables that aren't mutable                           \
+             * wouldn't be constructed with top!=dmax. */                                   \
+            BN_ULONG *_not_const;                                                           \
+            memcpy(&_not_const, &_bnum1->d, sizeof(_not_const));                            \
+            (void)RAND_bytes(&_tmp_char, 1); /* Debug only - safe to ignore error return */ \
+            memset(_not_const + _bnum1->top, _tmp_char,                                     \
+                sizeof(*_not_const) * (_bnum1->dmax - _bnum1->top));                        \
+        }                                                                                   \
+    } while (0)
+#else
+#define bn_pollute(a)
+#endif
+#define bn_check_top(a)                                                                                                                   \
+    do {                                                                                                                                  \
+        const BIGNUM *_bnum2 = (a);                                                                                                       \
+        if (_bnum2 != NULL) {                                                                                                             \
+            int _top = _bnum2->top;                                                                                                       \
+            (void)ossl_assert((_top == 0 && !_bnum2->neg) || (_top && ((_bnum2->flags & BN_FLG_FIXED_TOP) || _bnum2->d[_top - 1] != 0))); \
+            bn_pollute(_bnum2);                                                                                                           \
+        }                                                                                                                                 \
+    } while (0)
+
+#define bn_fix_top(a) bn_check_top(a)
+
+#define bn_check_size(bn, bits) bn_wcheck_size(bn, ((bits + BN_BITS2 - 1)) / BN_BITS2)
+#define bn_wcheck_size(bn, words)                                      \
+    do {                                                               \
+        const BIGNUM *_bnum2 = (bn);                                   \
+        assert((words) <= (_bnum2)->dmax && (words) >= (_bnum2)->top); \
+        /* avoid unused variable warning with NDEBUG */                \
+        (void)(_bnum2);                                                \
+    } while (0)
+
+#else /* !BN_DEBUG */
+
+#define BN_FLG_FIXED_TOP 0
+#define bn_pollute(a)
+#define bn_check_top(a)
+#define bn_fix_top(a) bn_correct_top(a)
+#define bn_check_size(bn, bits)
+#define bn_wcheck_size(bn, words)
+
+#endif
 
 BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
-                          BN_ULONG w);
+    BN_ULONG w);
 BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w);
 void bn_sqr_words(BN_ULONG *rp, const BN_ULONG *ap, int num);
 BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d);
 BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                      int num);
+    int num);
 BN_ULONG bn_sub_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                      int num);
+    int num);
 
 struct bignum_st {
-    BN_ULONG *d;                /*
-                                 * Pointer to an array of 'BN_BITS2' bit
-                                 * chunks. These chunks are organised in
-                                 * a least significant chunk first order.
-                                 */
-    int top;                    /* Index of last used d +1. */
+    BN_ULONG *d; /*
+                  * Pointer to an array of 'BN_BITS2' bit
+                  * chunks. These chunks are organised in
+                  * a least significant chunk first order.
+                  */
+    int top; /* Index of last used d +1. */
     /* The next are internal book keeping for bn_expand. */
-    int dmax;                   /* Size of the d array. */
-    int neg;                    /* one if the number is negative */
+    int dmax; /* Size of the d array. */
+    int neg; /* one if the number is negative */
     int flags;
 };
 
 /* Used for montgomery multiplication */
 struct bn_mont_ctx_st {
-    int ri;                     /* number of bits in R */
-    BIGNUM RR;                  /* used to convert to montgomery form,
-                                   possibly zero-padded */
-    BIGNUM N;                   /* The modulus */
-    BIGNUM Ni;                  /* R*(1/R mod N) - N*Ni = 1 (Ni is only
-                                 * stored for bignum algorithm) */
-    BN_ULONG n0[2];             /* least significant word(s) of Ni; (type
-                                 * changed with 0.9.9, was "BN_ULONG n0;"
-                                 * before) */
+    int ri; /* number of bits in R */
+    BIGNUM RR; /* used to convert to montgomery form,
+                  possibly zero-padded */
+    BIGNUM N; /* The modulus */
+    BIGNUM Ni; /* R*(1/R mod N) - N*Ni = 1 (Ni is only
+                * stored for bignum algorithm) */
+    BN_ULONG n0[2]; /* least significant word(s) of Ni; (type
+                     * changed with 0.9.9, was "BN_ULONG n0;"
+                     * before) */
     int flags;
 };
 
@@ -274,8 +269,8 @@ struct bn_mont_ctx_st {
  * threads
  */
 struct bn_recp_ctx_st {
-    BIGNUM N;                   /* the divisor */
-    BIGNUM Nr;                  /* the reciprocal */
+    BIGNUM N; /* the divisor */
+    BIGNUM Nr; /* the reciprocal */
     int num_bits;
     int shift;
     int flags;
@@ -283,13 +278,13 @@ struct bn_recp_ctx_st {
 
 /* Used for slow "generation" functions. */
 struct bn_gencb_st {
-    unsigned int ver;           /* To handle binary (in)compatibility */
-    void *arg;                  /* callback-specific data */
+    unsigned int ver; /* To handle binary (in)compatibility */
+    void *arg; /* callback-specific data */
     union {
         /* if (ver==1) - handles old style callbacks */
-        void (*cb_1) (int, int, void *);
+        void (*cb_1)(int, int, void *);
         /* if (ver==2) - new callback style */
-        int (*cb_2) (int, int, BN_GENCB *);
+        int (*cb_2)(int, int, BN_GENCB *);
     } cb;
 };
 
@@ -318,18 +313,18 @@ struct bn_gencb_st {
  * (with draws in between).  Very small exponents are often selected
  * with low Hamming weight, so we use  w = 1  for b <= 23.
  */
-# define BN_window_bits_for_exponent_size(b) \
-                ((b) > 671 ? 6 : \
-                 (b) > 239 ? 5 : \
-                 (b) >  79 ? 4 : \
-                 (b) >  23 ? 3 : 1)
+#define BN_window_bits_for_exponent_size(b) \
+    ((b) > 671 ? 6 : (b) > 239 ? 5          \
+            : (b) > 79         ? 4          \
+            : (b) > 23         ? 3          \
+                               : 1)
 
 /*
  * BN_mod_exp_mont_consttime is based on the assumption that the L1 data cache
  * line width of the target processor is at least the following value.
  */
-# define MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH      ( 64 )
-# define MOD_EXP_CTIME_MIN_CACHE_LINE_MASK       (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - 1)
+#define MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH (64)
+#define MOD_EXP_CTIME_MIN_CACHE_LINE_MASK (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - 1)
 
 /*
  * Window sizes optimized for fixed window size modular exponentiation
@@ -340,34 +335,34 @@ struct bn_gencb_st {
  * log_2(32)=5 and log_2(64)=6 respectively. A window size of 7 should only be
  * used on processors that have a 128 byte or greater cache line size.
  */
-# if MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH == 64
+#if MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH == 64
 
-#  define BN_window_bits_for_ctime_exponent_size(b) \
-                ((b) > 937 ? 6 : \
-                 (b) > 306 ? 5 : \
-                 (b) >  89 ? 4 : \
-                 (b) >  22 ? 3 : 1)
-#  define BN_MAX_WINDOW_BITS_FOR_CTIME_EXPONENT_SIZE    (6)
+#define BN_window_bits_for_ctime_exponent_size(b) \
+    ((b) > 937 ? 6 : (b) > 306 ? 5                \
+            : (b) > 89         ? 4                \
+            : (b) > 22         ? 3                \
+                               : 1)
+#define BN_MAX_WINDOW_BITS_FOR_CTIME_EXPONENT_SIZE (6)
 
-# elif MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH == 32
+#elif MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH == 32
 
-#  define BN_window_bits_for_ctime_exponent_size(b) \
-                ((b) > 306 ? 5 : \
-                 (b) >  89 ? 4 : \
-                 (b) >  22 ? 3 : 1)
-#  define BN_MAX_WINDOW_BITS_FOR_CTIME_EXPONENT_SIZE    (5)
+#define BN_window_bits_for_ctime_exponent_size(b) \
+    ((b) > 306 ? 5 : (b) > 89 ? 4                 \
+            : (b) > 22        ? 3                 \
+                              : 1)
+#define BN_MAX_WINDOW_BITS_FOR_CTIME_EXPONENT_SIZE (5)
 
-# endif
+#endif
 
 /* Pentium pro 16,16,16,32,64 */
 /* Alpha       16,16,16,16.64 */
-# define BN_MULL_SIZE_NORMAL                     (16)/* 32 */
-# define BN_MUL_RECURSIVE_SIZE_NORMAL            (16)/* 32 less than */
-# define BN_SQR_RECURSIVE_SIZE_NORMAL            (16)/* 32 */
-# define BN_MUL_LOW_RECURSIVE_SIZE_NORMAL        (32)/* 32 */
-# define BN_MONT_CTX_SET_SIZE_WORD               (64)/* 32 */
+#define BN_MULL_SIZE_NORMAL (16) /* 32 */
+#define BN_MUL_RECURSIVE_SIZE_NORMAL (16) /* 32 less than */
+#define BN_SQR_RECURSIVE_SIZE_NORMAL (16) /* 32 */
+#define BN_MUL_LOW_RECURSIVE_SIZE_NORMAL (32) /* 32 */
+#define BN_MONT_CTX_SET_SIZE_WORD (64) /* 32 */
 
-# if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
+#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
 /*
  * BN_UMULT_HIGH section.
  * If the compiler doesn't support 2*N integer type, then you have to
@@ -384,258 +379,273 @@ struct bn_gencb_st {
  * what BN_UMULT_HIGH macro is about:-) Note that more recent compilers do
  * support 2*64 integer type, which is also used here.
  */
-#  if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16 && \
-      (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
-#   define BN_UMULT_HIGH(a,b)          (((uint128_t)(a)*(b))>>64)
-#   define BN_UMULT_LOHI(low,high,a,b) ({       \
+#if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__ == 16 && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
+#define BN_UMULT_HIGH(a, b) (((uint128_t)(a) * (b)) >> 64)
+#define BN_UMULT_LOHI(low, high, a, b) ({       \
         uint128_t ret=(uint128_t)(a)*(b);   \
-        (high)=ret>>64; (low)=ret;      })
-#  elif defined(__alpha) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT))
-#   if defined(__DECC)
-#    include <c_asm.h>
-#    define BN_UMULT_HIGH(a,b)   (BN_ULONG)asm("umulh %a0,%a1,%v0",(a),(b))
-#   elif defined(__GNUC__) && __GNUC__>=2
-#    define BN_UMULT_HIGH(a,b)   ({     \
+        (high)=ret>>64; (low)=ret; })
+#elif defined(__alpha) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT))
+#if defined(__DECC)
+#include <c_asm.h>
+#define BN_UMULT_HIGH(a, b) (BN_ULONG) asm("umulh %a0,%a1,%v0", (a), (b))
+#elif defined(__GNUC__) && __GNUC__ >= 2
+#define BN_UMULT_HIGH(a, b) ({     \
         register BN_ULONG ret;          \
         asm ("umulh     %1,%2,%0"       \
              : "=r"(ret)                \
              : "r"(a), "r"(b));         \
-        ret;                      })
-#   endif                       /* compiler */
-#  elif defined(_ARCH_PPC64) && defined(SIXTY_FOUR_BIT_LONG)
-#   if defined(__GNUC__) && __GNUC__>=2
-#    define BN_UMULT_HIGH(a,b)   ({     \
+        ret; })
+#endif /* compiler */
+#elif defined(_ARCH_PPC64) && defined(SIXTY_FOUR_BIT_LONG)
+#if defined(__GNUC__) && __GNUC__ >= 2
+#define BN_UMULT_HIGH(a, b) ({     \
         register BN_ULONG ret;          \
         asm ("mulhdu    %0,%1,%2"       \
              : "=r"(ret)                \
              : "r"(a), "r"(b));         \
-        ret;                      })
-#   endif                       /* compiler */
-#  elif (defined(__x86_64) || defined(__x86_64__)) && \
-       (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT))
-#   if defined(__GNUC__) && __GNUC__>=2
-#    define BN_UMULT_HIGH(a,b)   ({     \
+        ret; })
+#endif /* compiler */
+#elif (defined(__x86_64) || defined(__x86_64__)) && (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT))
+#if defined(__GNUC__) && __GNUC__ >= 2
+#define BN_UMULT_HIGH(a, b) ({     \
         register BN_ULONG ret,discard;  \
         asm ("mulq      %3"             \
              : "=a"(discard),"=d"(ret)  \
              : "a"(a), "g"(b)           \
              : "cc");                   \
-        ret;                      })
-#    define BN_UMULT_LOHI(low,high,a,b) \
-        asm ("mulq      %3"             \
-                : "=a"(low),"=d"(high)  \
-                : "a"(a),"g"(b)         \
-                : "cc");
-#   endif
-#  elif (defined(_M_AMD64) || defined(_M_X64)) && defined(SIXTY_FOUR_BIT)
-#   if defined(_MSC_VER) && _MSC_VER>=1400
+        ret; })
+#define BN_UMULT_LOHI(low, high, a, b) \
+    asm("mulq      %3"                 \
+        : "=a"(low), "=d"(high)        \
+        : "a"(a), "g"(b)               \
+        : "cc");
+#endif
+#elif (defined(_M_AMD64) || defined(_M_X64)) && defined(SIXTY_FOUR_BIT)
+#if defined(_MSC_VER) && _MSC_VER >= 1400
 unsigned __int64 __umulh(unsigned __int64 a, unsigned __int64 b);
 unsigned __int64 _umul128(unsigned __int64 a, unsigned __int64 b,
-                          unsigned __int64 *h);
-#    pragma intrinsic(__umulh,_umul128)
-#    define BN_UMULT_HIGH(a,b)           __umulh((a),(b))
-#    define BN_UMULT_LOHI(low,high,a,b)  ((low)=_umul128((a),(b),&(high)))
-#   endif
-#  elif defined(__mips) && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
-#   if defined(__GNUC__) && __GNUC__>=2
-#    define BN_UMULT_HIGH(a,b) ({       \
+    unsigned __int64 *h);
+#pragma intrinsic(__umulh, _umul128)
+#define BN_UMULT_HIGH(a, b) __umulh((a), (b))
+#define BN_UMULT_LOHI(low, high, a, b) ((low) = _umul128((a), (b), &(high)))
+#endif
+#elif defined(__mips) && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
+#if defined(__GNUC__) && __GNUC__ >= 2
+#define BN_UMULT_HIGH(a, b) ({       \
         register BN_ULONG ret;          \
         asm ("dmultu    %1,%2"          \
              : "=h"(ret)                \
              : "r"(a), "r"(b) : "l");   \
-        ret;                    })
-#    define BN_UMULT_LOHI(low,high,a,b) \
-        asm ("dmultu    %2,%3"          \
-             : "=l"(low),"=h"(high)     \
-             : "r"(a), "r"(b));
-#   endif
-#  elif defined(__aarch64__) && defined(SIXTY_FOUR_BIT_LONG)
-#   if defined(__GNUC__) && __GNUC__>=2
-#    define BN_UMULT_HIGH(a,b)   ({     \
+        ret; })
+#define BN_UMULT_LOHI(low, high, a, b) \
+    asm("dmultu    %2,%3"              \
+        : "=l"(low), "=h"(high)        \
+        : "r"(a), "r"(b));
+#endif
+#elif defined(__aarch64__) && defined(SIXTY_FOUR_BIT_LONG)
+#if defined(__GNUC__) && __GNUC__ >= 2
+#define BN_UMULT_HIGH(a, b) ({     \
         register BN_ULONG ret;          \
         asm ("umulh     %0,%1,%2"       \
              : "=r"(ret)                \
              : "r"(a), "r"(b));         \
-        ret;                      })
-#   endif
-#  endif                        /* cpu */
-# endif                         /* OPENSSL_NO_ASM */
-
-# ifdef BN_RAND_DEBUG
-#  define bn_clear_top2max(a) \
-        { \
-        int      ind = (a)->dmax - (a)->top; \
-        BN_ULONG *ftl = &(a)->d[(a)->top-1]; \
-        for (; ind != 0; ind--) \
-                *(++ftl) = 0x0; \
-        }
-# else
-#  define bn_clear_top2max(a)
-# endif
-
-# ifdef BN_LLONG
+        ret; })
+#endif
+#endif /* cpu */
+#endif /* OPENSSL_NO_ASM */
+
+#ifdef BN_RAND_DEBUG
+#define bn_clear_top2max(a)                    \
+    {                                          \
+        int ind = (a)->dmax - (a)->top;        \
+        BN_ULONG *ftl = &(a)->d[(a)->top - 1]; \
+        for (; ind != 0; ind--)                \
+            *(++ftl) = 0x0;                    \
+    }
+#else
+#define bn_clear_top2max(a)
+#endif
+
+#ifdef BN_LLONG
 /*******************************************************************
  * Using the long long type, has to be twice as wide as BN_ULONG...
  */
-#  define Lw(t)    (((BN_ULONG)(t))&BN_MASK2)
-#  define Hw(t)    (((BN_ULONG)((t)>>BN_BITS2))&BN_MASK2)
-
-#  define mul_add(r,a,w,c) { \
-        BN_ULLONG t; \
-        t=(BN_ULLONG)w * (a) + (r) + (c); \
-        (r)= Lw(t); \
-        (c)= Hw(t); \
-        }
-
-#  define mul(r,a,w,c) { \
-        BN_ULLONG t; \
-        t=(BN_ULLONG)w * (a) + (c); \
-        (r)= Lw(t); \
-        (c)= Hw(t); \
-        }
-
-#  define sqr(r0,r1,a) { \
-        BN_ULLONG t; \
-        t=(BN_ULLONG)(a)*(a); \
-        (r0)=Lw(t); \
-        (r1)=Hw(t); \
-        }
-
-# elif defined(BN_UMULT_LOHI)
-#  define mul_add(r,a,w,c) {              \
-        BN_ULONG high,low,ret,tmp=(a);  \
-        ret =  (r);                     \
-        BN_UMULT_LOHI(low,high,w,tmp);  \
-        ret += (c);                     \
-        (c) =  (ret<(c));               \
-        (c) += high;                    \
-        ret += low;                     \
-        (c) += (ret<low);               \
-        (r) =  ret;                     \
-        }
-
-#  define mul(r,a,w,c)    {               \
-        BN_ULONG high,low,ret,ta=(a);   \
-        BN_UMULT_LOHI(low,high,w,ta);   \
-        ret =  low + (c);               \
-        (c) =  high;                    \
-        (c) += (ret<low);               \
-        (r) =  ret;                     \
-        }
-
-#  define sqr(r0,r1,a)    {               \
-        BN_ULONG tmp=(a);               \
-        BN_UMULT_LOHI(r0,r1,tmp,tmp);   \
-        }
-
-# elif defined(BN_UMULT_HIGH)
-#  define mul_add(r,a,w,c) {              \
-        BN_ULONG high,low,ret,tmp=(a);  \
-        ret =  (r);                     \
-        high=  BN_UMULT_HIGH(w,tmp);    \
-        ret += (c);                     \
-        low =  (w) * tmp;               \
-        (c) =  (ret<(c));               \
-        (c) += high;                    \
-        ret += low;                     \
-        (c) += (ret<low);               \
-        (r) =  ret;                     \
-        }
-
-#  define mul(r,a,w,c)    {               \
-        BN_ULONG high,low,ret,ta=(a);   \
-        low =  (w) * ta;                \
-        high=  BN_UMULT_HIGH(w,ta);     \
-        ret =  low + (c);               \
-        (c) =  high;                    \
-        (c) += (ret<low);               \
-        (r) =  ret;                     \
-        }
-
-#  define sqr(r0,r1,a)    {               \
-        BN_ULONG tmp=(a);               \
+#define Lw(t) (((BN_ULONG)(t)) & BN_MASK2)
+#define Hw(t) (((BN_ULONG)((t) >> BN_BITS2)) & BN_MASK2)
+
+#define mul_add(r, a, w, c)                 \
+    {                                       \
+        BN_ULLONG t;                        \
+        t = (BN_ULLONG)w * (a) + (r) + (c); \
+        (r) = Lw(t);                        \
+        (c) = Hw(t);                        \
+    }
+
+#define mul(r, a, w, c)               \
+    {                                 \
+        BN_ULLONG t;                  \
+        t = (BN_ULLONG)w * (a) + (c); \
+        (r) = Lw(t);                  \
+        (c) = Hw(t);                  \
+    }
+
+#define sqr(r0, r1, a)            \
+    {                             \
+        BN_ULLONG t;              \
+        t = (BN_ULLONG)(a) * (a); \
+        (r0) = Lw(t);             \
+        (r1) = Hw(t);             \
+    }
+
+#elif defined(BN_UMULT_LOHI)
+#define mul_add(r, a, w, c)                 \
+    {                                       \
+        BN_ULONG high, low, ret, tmp = (a); \
+        ret = (r);                          \
+        BN_UMULT_LOHI(low, high, w, tmp);   \
+        ret += (c);                         \
+        (c) = (ret < (c));                  \
+        (c) += high;                        \
+        ret += low;                         \
+        (c) += (ret < low);                 \
+        (r) = ret;                          \
+    }
+
+#define mul(r, a, w, c)                    \
+    {                                      \
+        BN_ULONG high, low, ret, ta = (a); \
+        BN_UMULT_LOHI(low, high, w, ta);   \
+        ret = low + (c);                   \
+        (c) = high;                        \
+        (c) += (ret < low);                \
+        (r) = ret;                         \
+    }
+
+#define sqr(r0, r1, a)                   \
+    {                                    \
+        BN_ULONG tmp = (a);              \
+        BN_UMULT_LOHI(r0, r1, tmp, tmp); \
+    }
+
+#elif defined(BN_UMULT_HIGH)
+#define mul_add(r, a, w, c)                 \
+    {                                       \
+        BN_ULONG high, low, ret, tmp = (a); \
+        ret = (r);                          \
+        high = BN_UMULT_HIGH(w, tmp);       \
+        ret += (c);                         \
+        low = (w) * tmp;                    \
+        (c) = (ret < (c));                  \
+        (c) += high;                        \
+        ret += low;                         \
+        (c) += (ret < low);                 \
+        (r) = ret;                          \
+    }
+
+#define mul(r, a, w, c)                    \
+    {                                      \
+        BN_ULONG high, low, ret, ta = (a); \
+        low = (w) * ta;                    \
+        high = BN_UMULT_HIGH(w, ta);       \
+        ret = low + (c);                   \
+        (c) = high;                        \
+        (c) += (ret < low);                \
+        (r) = ret;                         \
+    }
+
+#define sqr(r0, r1, a)                  \
+    {                                   \
+        BN_ULONG tmp = (a);             \
         (r0) = tmp * tmp;               \
-        (r1) = BN_UMULT_HIGH(tmp,tmp);  \
-        }
+        (r1) = BN_UMULT_HIGH(tmp, tmp); \
+    }
 
-# else
+#else
 /*************************************************************
  * No long long type
  */
 
-#  define LBITS(a)        ((a)&BN_MASK2l)
-#  define HBITS(a)        (((a)>>BN_BITS4)&BN_MASK2l)
-#  define L2HBITS(a)      (((a)<<BN_BITS4)&BN_MASK2)
-
-#  define LLBITS(a)       ((a)&BN_MASKl)
-#  define LHBITS(a)       (((a)>>BN_BITS2)&BN_MASKl)
-#  define LL2HBITS(a)     ((BN_ULLONG)((a)&BN_MASKl)<<BN_BITS2)
-
-#  define mul64(l,h,bl,bh) \
-        { \
-        BN_ULONG m,m1,lt,ht; \
- \
-        lt=l; \
-        ht=h; \
-        m =(bh)*(lt); \
-        lt=(bl)*(lt); \
-        m1=(bl)*(ht); \
-        ht =(bh)*(ht); \
-        m=(m+m1)&BN_MASK2; ht += L2HBITS((BN_ULONG)(m < m1)); \
-        ht+=HBITS(m); \
-        m1=L2HBITS(m); \
-        lt=(lt+m1)&BN_MASK2; ht += (lt < m1); \
-        (l)=lt; \
-        (h)=ht; \
-        }
-
-#  define sqr64(lo,ho,in) \
-        { \
-        BN_ULONG l,h,m; \
- \
-        h=(in); \
-        l=LBITS(h); \
-        h=HBITS(h); \
-        m =(l)*(h); \
-        l*=l; \
-        h*=h; \
-        h+=(m&BN_MASK2h1)>>(BN_BITS4-1); \
-        m =(m&BN_MASK2l)<<(BN_BITS4+1); \
-        l=(l+m)&BN_MASK2; h += (l < m); \
-        (lo)=l; \
-        (ho)=h; \
-        }
-
-#  define mul_add(r,a,bl,bh,c) { \
-        BN_ULONG l,h; \
- \
-        h= (a); \
-        l=LBITS(h); \
-        h=HBITS(h); \
-        mul64(l,h,(bl),(bh)); \
- \
-        /* non-multiply part */ \
-        l=(l+(c))&BN_MASK2; h += (l < (c)); \
-        (c)=(r); \
-        l=(l+(c))&BN_MASK2; h += (l < (c)); \
-        (c)=h&BN_MASK2; \
-        (r)=l; \
-        }
-
-#  define mul(r,a,bl,bh,c) { \
-        BN_ULONG l,h; \
- \
-        h= (a); \
-        l=LBITS(h); \
-        h=HBITS(h); \
-        mul64(l,h,(bl),(bh)); \
- \
-        /* non-multiply part */ \
-        l+=(c); h += ((l&BN_MASK2) < (c)); \
-        (c)=h&BN_MASK2; \
-        (r)=l&BN_MASK2; \
-        }
-# endif                         /* !BN_LLONG */
+#define LBITS(a) ((a) & BN_MASK2l)
+#define HBITS(a) (((a) >> BN_BITS4) & BN_MASK2l)
+#define L2HBITS(a) (((a) << BN_BITS4) & BN_MASK2)
+
+#define LLBITS(a) ((a) & BN_MASKl)
+#define LHBITS(a) (((a) >> BN_BITS2) & BN_MASKl)
+#define LL2HBITS(a) ((BN_ULLONG)((a) & BN_MASKl) << BN_BITS2)
+
+#define mul64(l, h, bl, bh)                \
+    {                                      \
+        BN_ULONG m, m1, lt, ht;            \
+                                           \
+        lt = l;                            \
+        ht = h;                            \
+        m = (bh) * (lt);                   \
+        lt = (bl) * (lt);                  \
+        m1 = (bl) * (ht);                  \
+        ht = (bh) * (ht);                  \
+        m = (m + m1) & BN_MASK2;           \
+        ht += L2HBITS((BN_ULONG)(m < m1)); \
+        ht += HBITS(m);                    \
+        m1 = L2HBITS(m);                   \
+        lt = (lt + m1) & BN_MASK2;         \
+        ht += (lt < m1);                   \
+        (l) = lt;                          \
+        (h) = ht;                          \
+    }
+
+#define sqr64(lo, ho, in)                        \
+    {                                            \
+        BN_ULONG l, h, m;                        \
+                                                 \
+        h = (in);                                \
+        l = LBITS(h);                            \
+        h = HBITS(h);                            \
+        m = (l) * (h);                           \
+        l *= l;                                  \
+        h *= h;                                  \
+        h += (m & BN_MASK2h1) >> (BN_BITS4 - 1); \
+        m = (m & BN_MASK2l) << (BN_BITS4 + 1);   \
+        l = (l + m) & BN_MASK2;                  \
+        h += (l < m);                            \
+        (lo) = l;                                \
+        (ho) = h;                                \
+    }
+
+#define mul_add(r, a, bl, bh, c)  \
+    {                             \
+        BN_ULONG l, h;            \
+                                  \
+        h = (a);                  \
+        l = LBITS(h);             \
+        h = HBITS(h);             \
+        mul64(l, h, (bl), (bh));  \
+                                  \
+        /* non-multiply part */   \
+        l = (l + (c)) & BN_MASK2; \
+        h += (l < (c));           \
+        (c) = (r);                \
+        l = (l + (c)) & BN_MASK2; \
+        h += (l < (c));           \
+        (c) = h & BN_MASK2;       \
+        (r) = l;                  \
+    }
+
+#define mul(r, a, bl, bh, c)         \
+    {                                \
+        BN_ULONG l, h;               \
+                                     \
+        h = (a);                     \
+        l = LBITS(h);                \
+        h = HBITS(h);                \
+        mul64(l, h, (bl), (bh));     \
+                                     \
+        /* non-multiply part */      \
+        l += (c);                    \
+        h += ((l & BN_MASK2) < (c)); \
+        (c) = h & BN_MASK2;          \
+        (r) = l & BN_MASK2;          \
+    }
+#endif /* !BN_LLONG */
 
 void BN_RECP_CTX_init(BN_RECP_CTX *recp);
 void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
@@ -650,34 +660,34 @@ void bn_sqr_comba4(BN_ULONG *r, const BN_ULONG *a);
 int bn_cmp_words(const BN_ULONG *a, const BN_ULONG *b, int n);
 int bn_cmp_part_words(const BN_ULONG *a, const BN_ULONG *b, int cl, int dl);
 void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
-                      int dna, int dnb, BN_ULONG *t);
+    int dna, int dnb, BN_ULONG *t);
 void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b,
-                           int n, int tna, int tnb, BN_ULONG *t);
+    int n, int tna, int tnb, BN_ULONG *t);
 void bn_sqr_recursive(BN_ULONG *r, const BN_ULONG *a, int n2, BN_ULONG *t);
 void bn_mul_low_normal(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n);
 void bn_mul_low_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
-                          BN_ULONG *t);
+    BN_ULONG *t);
 BN_ULONG bn_sub_part_words(BN_ULONG *r, const BN_ULONG *a, const BN_ULONG *b,
-                           int cl, int dl);
+    int cl, int dl);
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                const BN_ULONG *np, const BN_ULONG *n0, int num);
+    const BN_ULONG *np, const BN_ULONG *n0, int num);
 void bn_correct_top_consttime(BIGNUM *a);
 BIGNUM *int_bn_mod_inverse(BIGNUM *in,
-                           const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx,
-                           int *noinv);
+    const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx,
+    int *noinv);
 
 static ossl_inline BIGNUM *bn_expand(BIGNUM *a, int bits)
 {
     if (bits > (INT_MAX - BN_BITS2 + 1))
         return NULL;
 
-    if (((bits+BN_BITS2-1)/BN_BITS2) <= (a)->dmax)
+    if (((bits + BN_BITS2 - 1) / BN_BITS2) <= (a)->dmax)
         return a;
 
-    return bn_expand2((a),(bits+BN_BITS2-1)/BN_BITS2);
+    return bn_expand2((a), (bits + BN_BITS2 - 1) / BN_BITS2);
 }
 
 int ossl_bn_check_prime(const BIGNUM *w, int checks, BN_CTX *ctx,
-                        int do_trial_division, BN_GENCB *cb);
+    int do_trial_division, BN_GENCB *cb);
 
 #endif
diff --git a/crypto/bn/bn_mod.c b/crypto/bn/bn_mod.c
index 5f08bfa4a5342..51d5b90a290ae 100644
--- a/crypto/bn/bn_mod.c
+++ b/crypto/bn/bn_mod.c
@@ -28,11 +28,11 @@ int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx)
     if (!r->neg)
         return 1;
     /* now   -|d| < r < 0,  so we have to set  r := r + |d| */
-    return (d->neg ? BN_sub : BN_add) (r, r, d);
+    return (d->neg ? BN_sub : BN_add)(r, r, d);
 }
 
 int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (!BN_add(r, a, b))
         return 0;
@@ -52,7 +52,7 @@ int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
  * move depending on whether or not subtraction borrowed.
  */
 int bn_mod_add_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                         const BIGNUM *m)
+    const BIGNUM *m)
 {
     size_t i, ai, bi, mtop = m->top;
     BN_ULONG storage[1024 / BN_BITS2];
@@ -101,7 +101,7 @@ int bn_mod_add_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
 }
 
 int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                     const BIGNUM *m)
+    const BIGNUM *m)
 {
     int ret = bn_mod_add_fixed_top(r, a, b, m);
 
@@ -112,7 +112,7 @@ int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
 }
 
 int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (!BN_sub(r, a, b))
         return 0;
@@ -134,7 +134,7 @@ int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
  * Thus it takes up to two conditional additions to make |r| positive.
  */
 int bn_mod_sub_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                         const BIGNUM *m)
+    const BIGNUM *m)
 {
     size_t i, ai, bi, mtop = m->top;
     BN_ULONG borrow, carry, ta, tb, mask, *rp;
@@ -188,7 +188,7 @@ int bn_mod_sub_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
  * less than m
  */
 int BN_mod_sub_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                     const BIGNUM *m)
+    const BIGNUM *m)
 {
     if (r == m) {
         ERR_raise(ERR_LIB_BN, ERR_R_PASSED_INVALID_ARGUMENT);
@@ -204,7 +204,7 @@ int BN_mod_sub_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
 
 /* slow but works */
 int BN_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     BIGNUM *t;
     int ret = 0;
@@ -227,7 +227,7 @@ int BN_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
         goto err;
     bn_check_top(r);
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -263,7 +263,7 @@ 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)
 {
     BIGNUM *abs_m = NULL;
     int ret;
diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c
index 4f08394d7f0a1..1527ac10fb1b1 100644
--- a/crypto/bn/bn_mont.c
+++ b/crypto/bn/bn_mont.c
@@ -17,14 +17,14 @@
 #include "internal/cryptlib.h"
 #include "bn_local.h"
 
-#define MONT_WORD               /* use the faster word-based algorithm */
+#define MONT_WORD /* use the faster word-based algorithm */
 
 #ifdef MONT_WORD
 static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont);
 #endif
 
 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 ret = bn_mul_mont_fixed_top(r, a, b, mont, ctx);
 
@@ -35,7 +35,7 @@ int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
 }
 
 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)
 {
     BIGNUM *tmp;
     int ret = 0;
@@ -79,7 +79,7 @@ int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
         goto err;
 #endif
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -99,7 +99,7 @@ static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont)
         return 1;
     }
 
-    max = (2 * nl);             /* carry is stored separately */
+    max = (2 * nl); /* carry is stored separately */
     if (bn_wexpand(r, max) == NULL)
         return 0;
 
@@ -157,10 +157,10 @@ static int bn_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont)
 
     return 1;
 }
-#endif                          /* MONT_WORD */
+#endif /* MONT_WORD */
 
 int BN_from_montgomery(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont,
-                       BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int retn;
 
@@ -172,7 +172,7 @@ int BN_from_montgomery(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont,
 }
 
 int bn_from_mont_fixed_top(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont,
-                           BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int retn = 0;
 #ifdef MONT_WORD
@@ -183,7 +183,7 @@ int bn_from_mont_fixed_top(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont,
         retn = bn_from_montgomery_word(ret, t, mont);
     }
     BN_CTX_end(ctx);
-#else                           /* !MONT_WORD */
+#else /* !MONT_WORD */
     BIGNUM *t1, *t2;
 
     BN_CTX_start(ctx);
@@ -213,14 +213,14 @@ int bn_from_mont_fixed_top(BIGNUM *ret, const BIGNUM *a, BN_MONT_CTX *mont,
     }
     retn = 1;
     bn_check_top(ret);
- err:
+err:
     BN_CTX_end(ctx);
-#endif                          /* MONT_WORD */
+#endif /* MONT_WORD */
     return retn;
 }
 
 int bn_to_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont,
-                         BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     return bn_mul_mont_fixed_top(r, a, &(mont->RR), mont, ctx);
 }
@@ -269,9 +269,9 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
     BN_CTX_start(ctx);
     if ((Ri = BN_CTX_get(ctx)) == NULL)
         goto err;
-    R = &(mont->RR);            /* grab RR as a temp */
+    R = &(mont->RR); /* grab RR as a temp */
     if (!BN_copy(&(mont->N), mod))
-        goto err;               /* Set N */
+        goto err; /* Set N */
     if (BN_get_flags(mod, BN_FLG_CONSTTIME) != 0)
         BN_set_flags(&(mont->N), BN_FLG_CONSTTIME);
     mont->N.neg = 0;
@@ -291,7 +291,7 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
 
         mont->ri = (BN_num_bits(mod) + (BN_BITS2 - 1)) / BN_BITS2 * BN_BITS2;
 
-# if defined(OPENSSL_BN_ASM_MONT) && (BN_BITS2<=32)
+#if defined(OPENSSL_BN_ASM_MONT) && (BN_BITS2 <= 32)
         /*
          * Only certain BN_BITS2<=32 platforms actually make use of n0[1],
          * and we could use the #else case (with a shorter R value) for the
@@ -314,11 +314,11 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
         else if ((BN_mod_inverse(Ri, R, &tmod, ctx)) == NULL)
             goto err;
         if (!BN_lshift(Ri, Ri, 2 * BN_BITS2))
-            goto err;           /* R*Ri */
+            goto err; /* R*Ri */
         if (!BN_is_zero(Ri)) {
             if (!BN_sub_word(Ri, 1))
                 goto err;
-        } else {                /* if N mod word size == 1 */
+        } else { /* if N mod word size == 1 */
 
             if (bn_expand(Ri, (int)sizeof(BN_ULONG) * 2) == NULL)
                 goto err;
@@ -335,12 +335,12 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
          */
         mont->n0[0] = (Ri->top > 0) ? Ri->d[0] : 0;
         mont->n0[1] = (Ri->top > 1) ? Ri->d[1] : 0;
-# else
+#else
         BN_zero(R);
         if (!(BN_set_bit(R, BN_BITS2)))
-            goto err;           /* R */
+            goto err; /* R */
 
-        buf[0] = mod->d[0];     /* tmod = N mod word size */
+        buf[0] = mod->d[0]; /* tmod = N mod word size */
         buf[1] = 0;
         tmod.top = buf[0] != 0 ? 1 : 0;
         /* Ri = R^-1 mod N */
@@ -349,14 +349,14 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
         else if ((BN_mod_inverse(Ri, R, &tmod, ctx)) == NULL)
             goto err;
         if (!BN_lshift(Ri, Ri, BN_BITS2))
-            goto err;           /* R*Ri */
+            goto err; /* R*Ri */
         if (!BN_is_zero(Ri)) {
             if (!BN_sub_word(Ri, 1))
                 goto err;
-        } else {                /* if N mod word size == 1 */
+        } else { /* if N mod word size == 1 */
 
             if (!BN_set_word(Ri, BN_MASK2))
-                goto err;       /* Ri-- (mod word size) */
+                goto err; /* Ri-- (mod word size) */
         }
         if (!BN_div(Ri, NULL, Ri, &tmod, ctx))
             goto err;
@@ -365,19 +365,19 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
          */
         mont->n0[0] = (Ri->top > 0) ? Ri->d[0] : 0;
         mont->n0[1] = 0;
-# endif
+#endif
     }
-#else                           /* !MONT_WORD */
-    {                           /* bignum version */
+#else /* !MONT_WORD */
+    { /* bignum version */
         mont->ri = BN_num_bits(&mont->N);
         BN_zero(R);
         if (!BN_set_bit(R, mont->ri))
-            goto err;           /* R = 2^ri */
+            goto err; /* R = 2^ri */
         /* Ri = R^-1 mod N */
         if ((BN_mod_inverse(Ri, R, &mont->N, ctx)) == NULL)
             goto err;
         if (!BN_lshift(Ri, Ri, mont->ri))
-            goto err;           /* R*Ri */
+            goto err; /* R*Ri */
         if (!BN_sub_word(Ri, 1))
             goto err;
         /*
@@ -401,7 +401,7 @@ int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx)
     mont->RR.flags |= BN_FLG_FIXED_TOP;
 
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -424,7 +424,7 @@ 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_MONT_CTX *ret;
 
@@ -467,7 +467,7 @@ BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, CRYPTO_RWLOCK *lock,
 }
 
 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)
+    size_t rrlen, uint32_t nlo, uint32_t nhi)
 {
     if (BN_copy(&ctx->N, modulus) == NULL)
         return 0;
@@ -481,7 +481,7 @@ int ossl_bn_mont_ctx_set(BN_MONT_CTX *ctx, const BIGNUM *modulus, int ri, const
     ctx->n0[0] = nlo;
     ctx->n0[1] = 0;
 #else
-    ctx->n0[0] = ((BN_ULONG)nhi << 32)| nlo;
+    ctx->n0[0] = ((BN_ULONG)nhi << 32) | nlo;
     ctx->n0[1] = 0;
 #endif
 
diff --git a/crypto/bn/bn_mpi.c b/crypto/bn/bn_mpi.c
index 4eba0ae570029..d2a86a3eada44 100644
--- a/crypto/bn/bn_mpi.c
+++ b/crypto/bn/bn_mpi.c
@@ -49,8 +49,7 @@ BIGNUM *BN_mpi2bn(const unsigned char *d, int n, BIGNUM *ain)
         ERR_raise(ERR_LIB_BN, BN_R_INVALID_LENGTH);
         return NULL;
     }
-    len = ((long)d[0] << 24) | ((long)d[1] << 16) | ((int)d[2] << 8) | (int)
-        d[3];
+    len = ((long)d[0] << 24) | ((long)d[1] << 16) | ((int)d[2] << 8) | (int)d[3];
     if ((len + 4) != n) {
         ERR_raise(ERR_LIB_BN, BN_R_ENCODING_ERROR);
         return NULL;
diff --git a/crypto/bn/bn_mul.c b/crypto/bn/bn_mul.c
index c3864b8c691ab..ff4bf2ca2561e 100644
--- a/crypto/bn/bn_mul.c
+++ b/crypto/bn/bn_mul.c
@@ -25,8 +25,8 @@
  */
 
 BN_ULONG bn_sub_part_words(BN_ULONG *r,
-                           const BN_ULONG *a, const BN_ULONG *b,
-                           int cl, int dl)
+    const BN_ULONG *a, const BN_ULONG *b,
+    int cl, int dl)
 {
     BN_ULONG c, t;
 
@@ -173,20 +173,20 @@ BN_ULONG bn_sub_part_words(BN_ULONG *r,
  */
 /* dnX may not be positive, but n2/2+dnX has to be */
 void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
-                      int dna, int dnb, BN_ULONG *t)
+    int dna, int dnb, BN_ULONG *t)
 {
     int n = n2 / 2, c1, c2;
     int tna = n + dna, tnb = n + dnb;
     unsigned int neg, zero;
     BN_ULONG ln, lo, *p;
 
-# ifdef BN_MUL_COMBA
-#  if 0
+#ifdef BN_MUL_COMBA
+#if 0
     if (n2 == 4) {
         bn_mul_comba4(r, a, b);
         return;
     }
-#  endif
+#endif
     /*
      * Only call bn_mul_comba 8 if n2 == 8 and the two arrays are complete
      * [steve]
@@ -195,13 +195,13 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
         bn_mul_comba8(r, a, b);
         return;
     }
-# endif                         /* BN_MUL_COMBA */
+#endif /* BN_MUL_COMBA */
     /* Else do normal multiply */
     if (n2 < BN_MUL_RECURSIVE_SIZE_NORMAL) {
         bn_mul_normal(r, a, n2 + dna, b, n2 + dnb);
         if ((dna + dnb) < 0)
             memset(&r[2 * n2 + dna + dnb], 0,
-                   sizeof(BN_ULONG) * -(dna + dnb));
+                sizeof(BN_ULONG) * -(dna + dnb));
         return;
     }
     /* r=(a[0]-a[1])*(b[1]-b[0]) */
@@ -240,7 +240,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
         break;
     }
 
-# ifdef BN_MUL_COMBA
+#ifdef BN_MUL_COMBA
     if (n == 4 && dna == 0 && dnb == 0) { /* XXX: bn_mul_comba4 could take
                                            * extra args to do this well */
         if (!zero)
@@ -261,7 +261,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
         bn_mul_comba8(r, a, b);
         bn_mul_comba8(&(r[n2]), &(a[n]), &(b[n]));
     } else
-# endif                         /* BN_MUL_COMBA */
+#endif /* BN_MUL_COMBA */
     {
         p = &(t[n2 * 2]);
         if (!zero)
@@ -280,7 +280,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
 
     c1 = (int)(bn_add_words(t, r, &(r[n2]), n2));
 
-    if (neg) {                  /* if t[32] is negative */
+    if (neg) { /* if t[32] is negative */
         c1 -= (int)(bn_sub_words(&(t[n2]), t, &(t[n2]), n2));
     } else {
         /* Might have a carry */
@@ -320,7 +320,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
  */
 /* tnX may not be negative but less than n */
 void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
-                           int tna, int tnb, BN_ULONG *t)
+    int tna, int tnb, BN_ULONG *t)
 {
     int i, j, n2 = n * 2;
     int c1, c2, neg;
@@ -364,14 +364,14 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
      * The zero case isn't yet implemented here. The speedup would probably
      * be negligible.
      */
-# if 0
+#if 0
     if (n == 4) {
         bn_mul_comba4(&(t[n2]), t, &(t[n]));
         bn_mul_comba4(r, a, b);
         bn_mul_normal(&(r[n2]), &(a[n]), tn, &(b[n]), tn);
         memset(&r[n2 + tn * 2], 0, sizeof(*r) * (n2 - tn * 2));
     } else
-# endif
+#endif
     if (n == 8) {
         bn_mul_comba8(&(t[n2]), t, &(t[n]));
         bn_mul_comba8(r, a, b);
@@ -391,14 +391,14 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
             j = tnb - i;
         if (j == 0) {
             bn_mul_recursive(&(r[n2]), &(a[n]), &(b[n]),
-                             i, tna - i, tnb - i, p);
+                i, tna - i, tnb - i, p);
             memset(&r[n2 + i * 2], 0, sizeof(*r) * (n2 - i * 2));
-        } else if (j > 0) {     /* eg, n == 16, i == 8 and tn == 11 */
+        } else if (j > 0) { /* eg, n == 16, i == 8 and tn == 11 */
             bn_mul_part_recursive(&(r[n2]), &(a[n]), &(b[n]),
-                                  i, tna - i, tnb - i, p);
+                i, tna - i, tnb - i, p);
             memset(&(r[n2 + tna + tnb]), 0,
-                   sizeof(BN_ULONG) * (n2 - tna - tnb));
-        } else {                /* (j < 0) eg, n == 16, i == 8 and tn == 5 */
+                sizeof(BN_ULONG) * (n2 - tna - tnb));
+        } else { /* (j < 0) eg, n == 16, i == 8 and tn == 5 */
 
             memset(&r[n2], 0, sizeof(*r) * n2);
             if (tna < BN_MUL_RECURSIVE_SIZE_NORMAL
@@ -413,13 +413,13 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
                      */
                     if (i < tna || i < tnb) {
                         bn_mul_part_recursive(&(r[n2]),
-                                              &(a[n]), &(b[n]),
-                                              i, tna - i, tnb - i, p);
+                            &(a[n]), &(b[n]),
+                            i, tna - i, tnb - i, p);
                         break;
                     } else if (i == tna || i == tnb) {
                         bn_mul_recursive(&(r[n2]),
-                                         &(a[n]), &(b[n]),
-                                         i, tna - i, tnb - i, p);
+                            &(a[n]), &(b[n]),
+                            i, tna - i, tnb - i, p);
                         break;
                     }
                 }
@@ -435,7 +435,7 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
 
     c1 = (int)(bn_add_words(t, r, &(r[n2]), n2));
 
-    if (neg) {                  /* if t[32] is negative */
+    if (neg) { /* if t[32] is negative */
         c1 -= (int)(bn_sub_words(&(t[n2]), t, &(t[n2]), n2));
     } else {
         /* Might have a carry */
@@ -475,7 +475,7 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
  * r needs to be n2 words and t needs to be n2*2
  */
 void bn_mul_low_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
-                          BN_ULONG *t)
+    BN_ULONG *t)
 {
     int n = n2 / 2;
 
@@ -492,7 +492,7 @@ void bn_mul_low_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
         bn_add_words(&(r[n]), &(r[n]), &(t[n]), n);
     }
 }
-#endif                          /* BN_RECURSION */
+#endif /* BN_RECURSION */
 
 int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
 {
@@ -542,7 +542,7 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
 #endif
 #ifdef BN_MUL_COMBA
     if (i == 0) {
-# if 0
+#if 0
         if (al == 4) {
             if (bn_wexpand(rr, 8) == NULL)
                 goto err;
@@ -550,7 +550,7 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
             bn_mul_comba4(rr->d, a->d, b->d);
             goto end;
         }
-# endif
+#endif
         if (al == 8) {
             if (bn_wexpand(rr, 16) == NULL)
                 goto err;
@@ -559,7 +559,7 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
             goto end;
         }
     }
-#endif                          /* BN_MUL_COMBA */
+#endif /* BN_MUL_COMBA */
 #ifdef BN_RECURSION
     if ((al >= BN_MULL_SIZE_NORMAL) && (bl >= BN_MULL_SIZE_NORMAL)) {
         if (i >= -1 && i <= 1) {
@@ -585,8 +585,8 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
                 if (bn_wexpand(rr, k * 4) == NULL)
                     goto err;
                 bn_mul_part_recursive(rr->d, a->d, b->d,
-                                      j, al - j, bl - j, t->d);
-            } else {            /* al <= j || bl <= j */
+                    j, al - j, bl - j, t->d);
+            } else { /* al <= j || bl <= j */
 
                 if (bn_wexpand(t, k * 2) == NULL)
                     goto err;
@@ -598,14 +598,14 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
             goto end;
         }
     }
-#endif                          /* BN_RECURSION */
+#endif /* BN_RECURSION */
     if (bn_wexpand(rr, top) == NULL)
         goto err;
     rr->top = top;
     bn_mul_normal(rr->d, a->d, al, b->d, bl);
 
 #if defined(BN_MUL_COMBA) || defined(BN_RECURSION)
- end:
+end:
 #endif
     rr->neg = a->neg ^ b->neg;
     rr->flags |= BN_FLG_FIXED_TOP;
@@ -613,7 +613,7 @@ int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
         goto err;
 
     ret = 1;
- err:
+err:
     bn_check_top(r);
     BN_CTX_end(ctx);
     return ret;
@@ -633,7 +633,6 @@ void bn_mul_normal(BN_ULONG *r, BN_ULONG *a, int na, BN_ULONG *b, int nb)
         ltmp = a;
         a = b;
         b = ltmp;
-
     }
     rr = &(r[na]);
     if (nb <= 0) {
diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c
index 527ecb34d8545..aa084996e47be 100644
--- a/crypto/bn/bn_nist.c
+++ b/crypto/bn/bn_nist.c
@@ -10,18 +10,18 @@
 #include "bn_local.h"
 #include "internal/cryptlib.h"
 
-#define BN_NIST_192_TOP (192+BN_BITS2-1)/BN_BITS2
-#define BN_NIST_224_TOP (224+BN_BITS2-1)/BN_BITS2
-#define BN_NIST_256_TOP (256+BN_BITS2-1)/BN_BITS2
-#define BN_NIST_384_TOP (384+BN_BITS2-1)/BN_BITS2
-#define BN_NIST_521_TOP (521+BN_BITS2-1)/BN_BITS2
+#define BN_NIST_192_TOP (192 + BN_BITS2 - 1) / BN_BITS2
+#define BN_NIST_224_TOP (224 + BN_BITS2 - 1) / BN_BITS2
+#define BN_NIST_256_TOP (256 + BN_BITS2 - 1) / BN_BITS2
+#define BN_NIST_384_TOP (384 + BN_BITS2 - 1) / BN_BITS2
+#define BN_NIST_521_TOP (521 + BN_BITS2 - 1) / BN_BITS2
 
 /* pre-computed tables are "carry-less" values of modulus*(i+1) */
 #if BN_BITS2 == 64
 static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {
-    {0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFFULL},
-    {0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL},
-    {0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFCULL, 0xFFFFFFFFFFFFFFFFULL}
+    { 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFFULL },
+    { 0xFFFFFFFFFFFFFFFEULL, 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFFULL },
+    { 0xFFFFFFFFFFFFFFFDULL, 0xFFFFFFFFFFFFFFFCULL, 0xFFFFFFFFFFFFFFFFULL }
 };
 
 static const BN_ULONG _nist_p_192_sqr[] = {
@@ -30,11 +30,11 @@ static const BN_ULONG _nist_p_192_sqr[] = {
 };
 
 static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {
-    {0x0000000000000001ULL, 0xFFFFFFFF00000000ULL,
-     0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL},
-    {0x0000000000000002ULL, 0xFFFFFFFE00000000ULL,
-     0xFFFFFFFFFFFFFFFFULL, 0x00000001FFFFFFFFULL} /* this one is
-                                                    * "carry-full" */
+    { 0x0000000000000001ULL, 0xFFFFFFFF00000000ULL,
+        0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL },
+    { 0x0000000000000002ULL, 0xFFFFFFFE00000000ULL,
+        0xFFFFFFFFFFFFFFFFULL, 0x00000001FFFFFFFFULL } /* this one is
+                                                        * "carry-full" */
 };
 
 static const BN_ULONG _nist_p_224_sqr[] = {
@@ -45,16 +45,16 @@ static const BN_ULONG _nist_p_224_sqr[] = {
 };
 
 static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
-    {0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL,
-     0x0000000000000000ULL, 0xFFFFFFFF00000001ULL},
-    {0xFFFFFFFFFFFFFFFEULL, 0x00000001FFFFFFFFULL,
-     0x0000000000000000ULL, 0xFFFFFFFE00000002ULL},
-    {0xFFFFFFFFFFFFFFFDULL, 0x00000002FFFFFFFFULL,
-     0x0000000000000000ULL, 0xFFFFFFFD00000003ULL},
-    {0xFFFFFFFFFFFFFFFCULL, 0x00000003FFFFFFFFULL,
-     0x0000000000000000ULL, 0xFFFFFFFC00000004ULL},
-    {0xFFFFFFFFFFFFFFFBULL, 0x00000004FFFFFFFFULL,
-     0x0000000000000000ULL, 0xFFFFFFFB00000005ULL},
+    { 0xFFFFFFFFFFFFFFFFULL, 0x00000000FFFFFFFFULL,
+        0x0000000000000000ULL, 0xFFFFFFFF00000001ULL },
+    { 0xFFFFFFFFFFFFFFFEULL, 0x00000001FFFFFFFFULL,
+        0x0000000000000000ULL, 0xFFFFFFFE00000002ULL },
+    { 0xFFFFFFFFFFFFFFFDULL, 0x00000002FFFFFFFFULL,
+        0x0000000000000000ULL, 0xFFFFFFFD00000003ULL },
+    { 0xFFFFFFFFFFFFFFFCULL, 0x00000003FFFFFFFFULL,
+        0x0000000000000000ULL, 0xFFFFFFFC00000004ULL },
+    { 0xFFFFFFFFFFFFFFFBULL, 0x00000004FFFFFFFFULL,
+        0x0000000000000000ULL, 0xFFFFFFFB00000005ULL },
 };
 
 static const BN_ULONG _nist_p_256_sqr[] = {
@@ -65,16 +65,16 @@ static const BN_ULONG _nist_p_256_sqr[] = {
 };
 
 static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
-    {0x00000000FFFFFFFFULL, 0xFFFFFFFF00000000ULL, 0xFFFFFFFFFFFFFFFEULL,
-     0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL},
-    {0x00000001FFFFFFFEULL, 0xFFFFFFFE00000000ULL, 0xFFFFFFFFFFFFFFFDULL,
-     0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL},
-    {0x00000002FFFFFFFDULL, 0xFFFFFFFD00000000ULL, 0xFFFFFFFFFFFFFFFCULL,
-     0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL},
-    {0x00000003FFFFFFFCULL, 0xFFFFFFFC00000000ULL, 0xFFFFFFFFFFFFFFFBULL,
-     0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL},
-    {0x00000004FFFFFFFBULL, 0xFFFFFFFB00000000ULL, 0xFFFFFFFFFFFFFFFAULL,
-     0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL},
+    { 0x00000000FFFFFFFFULL, 0xFFFFFFFF00000000ULL, 0xFFFFFFFFFFFFFFFEULL,
+        0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL },
+    { 0x00000001FFFFFFFEULL, 0xFFFFFFFE00000000ULL, 0xFFFFFFFFFFFFFFFDULL,
+        0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL },
+    { 0x00000002FFFFFFFDULL, 0xFFFFFFFD00000000ULL, 0xFFFFFFFFFFFFFFFCULL,
+        0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL },
+    { 0x00000003FFFFFFFCULL, 0xFFFFFFFC00000000ULL, 0xFFFFFFFFFFFFFFFBULL,
+        0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL },
+    { 0x00000004FFFFFFFBULL, 0xFFFFFFFB00000000ULL, 0xFFFFFFFFFFFFFFFAULL,
+        0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL, 0xFFFFFFFFFFFFFFFFULL },
 };
 
 static const BN_ULONG _nist_p_384_sqr[] = {
@@ -102,9 +102,9 @@ static const BN_ULONG _nist_p_521_sqr[] = {
 };
 #elif BN_BITS2 == 32
 static const BN_ULONG _nist_p_192[][BN_NIST_192_TOP] = {
-    {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
-    {0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
-    {0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF}
+    { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF }
 };
 
 static const BN_ULONG _nist_p_192_sqr[] = {
@@ -113,10 +113,10 @@ static const BN_ULONG _nist_p_192_sqr[] = {
 };
 
 static const BN_ULONG _nist_p_224[][BN_NIST_224_TOP] = {
-    {0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFF,
-     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
-    {0x00000002, 0x00000000, 0x00000000, 0xFFFFFFFE,
-     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF}
+    { 0x00000001, 0x00000000, 0x00000000, 0xFFFFFFFF,
+        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { 0x00000002, 0x00000000, 0x00000000, 0xFFFFFFFE,
+        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF }
 };
 
 static const BN_ULONG _nist_p_224_sqr[] = {
@@ -127,16 +127,16 @@ static const BN_ULONG _nist_p_224_sqr[] = {
 };
 
 static const BN_ULONG _nist_p_256[][BN_NIST_256_TOP] = {
-    {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
-     0x00000000, 0x00000000, 0x00000001, 0xFFFFFFFF},
-    {0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000001,
-     0x00000000, 0x00000000, 0x00000002, 0xFFFFFFFE},
-    {0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000002,
-     0x00000000, 0x00000000, 0x00000003, 0xFFFFFFFD},
-    {0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000003,
-     0x00000000, 0x00000000, 0x00000004, 0xFFFFFFFC},
-    {0xFFFFFFFB, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000004,
-     0x00000000, 0x00000000, 0x00000005, 0xFFFFFFFB},
+    { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000,
+        0x00000000, 0x00000000, 0x00000001, 0xFFFFFFFF },
+    { 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000001,
+        0x00000000, 0x00000000, 0x00000002, 0xFFFFFFFE },
+    { 0xFFFFFFFD, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000002,
+        0x00000000, 0x00000000, 0x00000003, 0xFFFFFFFD },
+    { 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000003,
+        0x00000000, 0x00000000, 0x00000004, 0xFFFFFFFC },
+    { 0xFFFFFFFB, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000004,
+        0x00000000, 0x00000000, 0x00000005, 0xFFFFFFFB },
 };
 
 static const BN_ULONG _nist_p_256_sqr[] = {
@@ -147,16 +147,16 @@ static const BN_ULONG _nist_p_256_sqr[] = {
 };
 
 static const BN_ULONG _nist_p_384[][BN_NIST_384_TOP] = {
-    {0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
-     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
-    {0xFFFFFFFE, 0x00000001, 0x00000000, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFF,
-     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
-    {0xFFFFFFFD, 0x00000002, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFC, 0xFFFFFFFF,
-     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
-    {0xFFFFFFFC, 0x00000003, 0x00000000, 0xFFFFFFFC, 0xFFFFFFFB, 0xFFFFFFFF,
-     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
-    {0xFFFFFFFB, 0x00000004, 0x00000000, 0xFFFFFFFB, 0xFFFFFFFA, 0xFFFFFFFF,
-     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},
+    { 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF,
+        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { 0xFFFFFFFE, 0x00000001, 0x00000000, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFF,
+        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { 0xFFFFFFFD, 0x00000002, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFC, 0xFFFFFFFF,
+        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { 0xFFFFFFFC, 0x00000003, 0x00000000, 0xFFFFFFFC, 0xFFFFFFFB, 0xFFFFFFFF,
+        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
+    { 0xFFFFFFFB, 0x00000004, 0x00000000, 0xFFFFFFFB, 0xFFFFFFFA, 0xFFFFFFFF,
+        0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF },
 };
 
 static const BN_ULONG _nist_p_384_sqr[] = {
@@ -169,8 +169,7 @@ static const BN_ULONG _nist_p_384_sqr[] = {
 static const BN_ULONG _nist_p_521[] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-    0xFFFFFFFF, 0x000001FF
-};
+    0xFFFFFFFF, 0x000001FF };
 
 static const BN_ULONG _nist_p_521_sqr[] = {
     0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -181,7 +180,7 @@ static const BN_ULONG _nist_p_521_sqr[] = {
     0xFFFFFFFF, 0xFFFFFFFF, 0x0003FFFF
 };
 #else
-# error "unsupported BN_BITS2"
+#error "unsupported BN_BITS2"
 #endif
 
 static const BIGNUM ossl_bignum_nist_p_192 = {
@@ -263,15 +262,15 @@ const BIGNUM *BN_get0_nist_prime_521(void)
  * paid for making it a macro.
  */
 #define nist_cp_bn_0(dst, src_in, top, max) \
-{                                           \
-    int ii;                                 \
-    const BN_ULONG *src = src_in;           \
+    {                                       \
+        int ii;                             \
+        const BN_ULONG *src = src_in;       \
                                             \
-    for (ii = 0; ii < top; ii++)            \
-        (dst)[ii] = src[ii];                \
-    for (; ii < max; ii++)                  \
-        (dst)[ii] = 0;                      \
-}
+        for (ii = 0; ii < top; ii++)        \
+            (dst)[ii] = src[ii];            \
+        for (; ii < max; ii++)              \
+            (dst)[ii] = 0;                  \
+    }
 
 static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top)
 {
@@ -282,42 +281,42 @@ static void nist_cp_bn(BN_ULONG *dst, const BN_ULONG *src, int top)
 }
 
 #if BN_BITS2 == 64
-# define bn_cp_64(to, n, from, m)        (to)[n] = (m>=0)?((from)[m]):0;
-# define bn_64_set_0(to, n)              (to)[n] = (BN_ULONG)0;
+#define bn_cp_64(to, n, from, m) (to)[n] = (m >= 0) ? ((from)[m]) : 0;
+#define bn_64_set_0(to, n) (to)[n] = (BN_ULONG)0;
 /*
  * two following macros are implemented under assumption that they
  * are called in a sequence with *ascending* n, i.e. as they are...
  */
-# define bn_cp_32_naked(to, n, from, m)  (((n)&1)?(to[(n)/2]|=((m)&1)?(from[(m)/2]&BN_MASK2h):(from[(m)/2]<<32))\
-                                                :(to[(n)/2] =((m)&1)?(from[(m)/2]>>32):(from[(m)/2]&BN_MASK2l)))
-# define bn_32_set_0(to, n)              (((n)&1)?(to[(n)/2]&=BN_MASK2l):(to[(n)/2]=0));
-# define bn_cp_32(to,n,from,m)           ((m)>=0)?bn_cp_32_naked(to,n,from,m):bn_32_set_0(to,n)
-# if defined(L_ENDIAN)
-#  if defined(__arch64__)
-#   define NIST_INT64 long
-#  else
-#   define NIST_INT64 long long
-#  endif
-# endif
+#define bn_cp_32_naked(to, n, from, m) (((n) & 1) ? (to[(n) / 2] |= ((m) & 1) ? (from[(m) / 2] & BN_MASK2h) : (from[(m) / 2] << 32)) \
+                                                  : (to[(n) / 2] = ((m) & 1) ? (from[(m) / 2] >> 32) : (from[(m) / 2] & BN_MASK2l)))
+#define bn_32_set_0(to, n) (((n) & 1) ? (to[(n) / 2] &= BN_MASK2l) : (to[(n) / 2] = 0));
+#define bn_cp_32(to, n, from, m) ((m) >= 0) ? bn_cp_32_naked(to, n, from, m) : bn_32_set_0(to, n)
+#if defined(L_ENDIAN)
+#if defined(__arch64__)
+#define NIST_INT64 long
 #else
-# define bn_cp_64(to, n, from, m) \
-        { \
-        bn_cp_32(to, (n)*2, from, (m)*2); \
-        bn_cp_32(to, (n)*2+1, from, (m)*2+1); \
-        }
-# define bn_64_set_0(to, n) \
-        { \
-        bn_32_set_0(to, (n)*2); \
-        bn_32_set_0(to, (n)*2+1); \
-        }
-# define bn_cp_32(to, n, from, m)        (to)[n] = (m>=0)?((from)[m]):0;
-# define bn_32_set_0(to, n)              (to)[n] = (BN_ULONG)0;
-# if defined(_WIN32) && !defined(__GNUC__)
-#  define NIST_INT64 __int64
-# elif defined(BN_LLONG)
-#  define NIST_INT64 long long
-# endif
-#endif                          /* BN_BITS2 != 64 */
+#define NIST_INT64 long long
+#endif
+#endif
+#else
+#define bn_cp_64(to, n, from, m)                      \
+    {                                                 \
+        bn_cp_32(to, (n) * 2, from, (m) * 2);         \
+        bn_cp_32(to, (n) * 2 + 1, from, (m) * 2 + 1); \
+    }
+#define bn_64_set_0(to, n)            \
+    {                                 \
+        bn_32_set_0(to, (n) * 2);     \
+        bn_32_set_0(to, (n) * 2 + 1); \
+    }
+#define bn_cp_32(to, n, from, m) (to)[n] = (m >= 0) ? ((from)[m]) : 0;
+#define bn_32_set_0(to, n) (to)[n] = (BN_ULONG)0;
+#if defined(_WIN32) && !defined(__GNUC__)
+#define NIST_INT64 __int64
+#elif defined(BN_LLONG)
+#define NIST_INT64 long long
+#endif
+#endif /* BN_BITS2 != 64 */
 
 #ifdef NIST_INT64
 /* Helpers to load/store a 32-bit word (uint32_t) from/into a memory
@@ -341,23 +340,22 @@ static ossl_inline void store_lo32(void *ptr, NIST_INT64 val)
 }
 #endif /* NIST_INT64 */
 
-#define nist_set_192(to, from, a1, a2, a3) \
-        { \
-        bn_cp_64(to, 0, from, (a3) - 3) \
-        bn_cp_64(to, 1, from, (a2) - 3) \
-        bn_cp_64(to, 2, from, (a1) - 3) \
-        }
+#define nist_set_192(to, from, a1, a2, a3)      \
+    {                                           \
+        bn_cp_64(to, 0, from, (a3) - 3)         \
+            bn_cp_64(to, 1, from, (a2) - 3)     \
+                bn_cp_64(to, 2, from, (a1) - 3) \
+    }
 
 int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
-                    BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int top = a->top, i;
     int carry;
     register BN_ULONG *r_d, *a_d = a->d;
     union {
         BN_ULONG bn[BN_NIST_192_TOP];
-        unsigned int ui[BN_NIST_192_TOP * sizeof(BN_ULONG) /
-                        sizeof(unsigned int)];
+        unsigned int ui[BN_NIST_192_TOP * sizeof(BN_ULONG) / sizeof(unsigned int)];
     } buf;
     BN_ULONG c_d[BN_NIST_192_TOP], *res;
     static const BIGNUM ossl_bignum_nist_p_192_sqr = {
@@ -388,11 +386,11 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
         r_d = a_d;
 
     nist_cp_bn_0(buf.bn, a_d + BN_NIST_192_TOP, top - BN_NIST_192_TOP,
-                 BN_NIST_192_TOP);
+        BN_NIST_192_TOP);
 
 #if defined(NIST_INT64)
     {
-        NIST_INT64 acc;         /* accumulator */
+        NIST_INT64 acc; /* accumulator */
         unsigned int *rp = (unsigned int *)r_d;
         const unsigned int *bp = (const unsigned int *)buf.ui;
 
@@ -444,13 +442,13 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
         nist_set_192(t_d, buf.bn, 4, 4, 0);
         carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
         nist_set_192(t_d, buf.bn, 5, 5, 5)
-            carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
+            carry
+            += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
     }
 #endif
     if (carry > 0)
-        carry =
-            (int)bn_sub_words(r_d, r_d, _nist_p_192[carry - 1],
-                              BN_NIST_192_TOP);
+        carry = (int)bn_sub_words(r_d, r_d, _nist_p_192[carry - 1],
+            BN_NIST_192_TOP);
     else
         carry = 1;
 
@@ -470,30 +468,29 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
     return 1;
 }
 
-typedef BN_ULONG (*bn_addsub_f) (BN_ULONG *, const BN_ULONG *,
-                                 const BN_ULONG *, int);
-
-#define nist_set_224(to, from, a1, a2, a3, a4, a5, a6, a7) \
-        { \
-        bn_cp_32(to, 0, from, (a7) - 7) \
-        bn_cp_32(to, 1, from, (a6) - 7) \
-        bn_cp_32(to, 2, from, (a5) - 7) \
-        bn_cp_32(to, 3, from, (a4) - 7) \
-        bn_cp_32(to, 4, from, (a3) - 7) \
-        bn_cp_32(to, 5, from, (a2) - 7) \
-        bn_cp_32(to, 6, from, (a1) - 7) \
-        }
+typedef BN_ULONG (*bn_addsub_f)(BN_ULONG *, const BN_ULONG *,
+    const BN_ULONG *, int);
+
+#define nist_set_224(to, from, a1, a2, a3, a4, a5, a6, a7)      \
+    {                                                           \
+        bn_cp_32(to, 0, from, (a7) - 7)                         \
+            bn_cp_32(to, 1, from, (a6) - 7)                     \
+                bn_cp_32(to, 2, from, (a5) - 7)                 \
+                    bn_cp_32(to, 3, from, (a4) - 7)             \
+                        bn_cp_32(to, 4, from, (a3) - 7)         \
+                            bn_cp_32(to, 5, from, (a2) - 7)     \
+                                bn_cp_32(to, 6, from, (a1) - 7) \
+    }
 
 int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
-                    BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int top = a->top, i;
     int carry;
     BN_ULONG *r_d, *a_d = a->d;
     union {
         BN_ULONG bn[BN_NIST_224_TOP];
-        unsigned int ui[BN_NIST_224_TOP * sizeof(BN_ULONG) /
-                        sizeof(unsigned int)];
+        unsigned int ui[BN_NIST_224_TOP * sizeof(BN_ULONG) / sizeof(unsigned int)];
     } buf;
     BN_ULONG c_d[BN_NIST_224_TOP], *res;
     bn_addsub_f adjust;
@@ -524,22 +521,22 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
     } else
         r_d = a_d;
 
-#if BN_BITS2==64
+#if BN_BITS2 == 64
     /* copy upper 256 bits of 448 bit number ... */
     nist_cp_bn_0(c_d, a_d + (BN_NIST_224_TOP - 1),
-                 top - (BN_NIST_224_TOP - 1), BN_NIST_224_TOP);
+        top - (BN_NIST_224_TOP - 1), BN_NIST_224_TOP);
     /* ... and right shift by 32 to obtain upper 224 bits */
     nist_set_224(buf.bn, c_d, 14, 13, 12, 11, 10, 9, 8);
     /* truncate lower part to 224 bits too */
     r_d[BN_NIST_224_TOP - 1] &= BN_MASK2l;
 #else
     nist_cp_bn_0(buf.bn, a_d + BN_NIST_224_TOP, top - BN_NIST_224_TOP,
-                 BN_NIST_224_TOP);
+        BN_NIST_224_TOP);
 #endif
 
-#if defined(NIST_INT64) && BN_BITS2!=64
+#if defined(NIST_INT64) && BN_BITS2 != 64
     {
-        NIST_INT64 acc;         /* accumulator */
+        NIST_INT64 acc; /* accumulator */
         unsigned int *rp = (unsigned int *)r_d;
         const unsigned int *bp = (const unsigned int *)buf.ui;
 
@@ -588,9 +585,9 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
         rp[6] = (unsigned int)acc;
 
         carry = (int)(acc >> 32);
-# if BN_BITS2==64
+#if BN_BITS2 == 64
         rp[7] = carry;
-# endif
+#endif
     }
 #else
     {
@@ -605,17 +602,16 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
         nist_set_224(t_d, buf.bn, 0, 0, 0, 0, 13, 12, 11);
         carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP);
 
-# if BN_BITS2==64
+#if BN_BITS2 == 64
         carry = (int)(r_d[BN_NIST_224_TOP - 1] >> 32);
-# endif
+#endif
     }
 #endif
     adjust = bn_sub_words;
     if (carry > 0) {
-        carry =
-            (int)bn_sub_words(r_d, r_d, _nist_p_224[carry - 1],
-                              BN_NIST_224_TOP);
-#if BN_BITS2==64
+        carry = (int)bn_sub_words(r_d, r_d, _nist_p_224[carry - 1],
+            BN_NIST_224_TOP);
+#if BN_BITS2 == 64
         carry = (int)(~(r_d[BN_NIST_224_TOP - 1] >> 32)) & 1;
 #endif
     } else if (carry < 0) {
@@ -626,15 +622,14 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
          * compared to the modulus and conditionally adjusted by
          * *subtracting* the latter.
          */
-        carry =
-            (int)bn_add_words(r_d, r_d, _nist_p_224[-carry - 1],
-                              BN_NIST_224_TOP);
+        carry = (int)bn_add_words(r_d, r_d, _nist_p_224[-carry - 1],
+            BN_NIST_224_TOP);
         adjust = carry ? bn_sub_words : bn_add_words;
     } else
         carry = 1;
 
     /* otherwise it's effectively same as in BN_nist_mod_192... */
-    res = ((*adjust) (c_d, r_d, _nist_p_224[0], BN_NIST_224_TOP) && carry)
+    res = ((*adjust)(c_d, r_d, _nist_p_224[0], BN_NIST_224_TOP) && carry)
         ? r_d
         : c_d;
     nist_cp_bn(r_d, res, BN_NIST_224_TOP);
@@ -644,28 +639,27 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
     return 1;
 }
 
-#define nist_set_256(to, from, a1, a2, a3, a4, a5, a6, a7, a8) \
-        { \
-        bn_cp_32(to, 0, from, (a8) - 8) \
-        bn_cp_32(to, 1, from, (a7) - 8) \
-        bn_cp_32(to, 2, from, (a6) - 8) \
-        bn_cp_32(to, 3, from, (a5) - 8) \
-        bn_cp_32(to, 4, from, (a4) - 8) \
-        bn_cp_32(to, 5, from, (a3) - 8) \
-        bn_cp_32(to, 6, from, (a2) - 8) \
-        bn_cp_32(to, 7, from, (a1) - 8) \
-        }
+#define nist_set_256(to, from, a1, a2, a3, a4, a5, a6, a7, a8)      \
+    {                                                               \
+        bn_cp_32(to, 0, from, (a8) - 8)                             \
+            bn_cp_32(to, 1, from, (a7) - 8)                         \
+                bn_cp_32(to, 2, from, (a6) - 8)                     \
+                    bn_cp_32(to, 3, from, (a5) - 8)                 \
+                        bn_cp_32(to, 4, from, (a4) - 8)             \
+                            bn_cp_32(to, 5, from, (a3) - 8)         \
+                                bn_cp_32(to, 6, from, (a2) - 8)     \
+                                    bn_cp_32(to, 7, from, (a1) - 8) \
+    }
 
 int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
-                    BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int i, top = a->top;
     int carry = 0;
     register BN_ULONG *a_d = a->d, *r_d;
     union {
         BN_ULONG bn[BN_NIST_256_TOP];
-        unsigned int ui[BN_NIST_256_TOP * sizeof(BN_ULONG) /
-                        sizeof(unsigned int)];
+        unsigned int ui[BN_NIST_256_TOP * sizeof(BN_ULONG) / sizeof(unsigned int)];
     } buf;
     BN_ULONG c_d[BN_NIST_256_TOP], *res;
     bn_addsub_f adjust;
@@ -697,11 +691,11 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
         r_d = a_d;
 
     nist_cp_bn_0(buf.bn, a_d + BN_NIST_256_TOP, top - BN_NIST_256_TOP,
-                 BN_NIST_256_TOP);
+        BN_NIST_256_TOP);
 
 #if defined(NIST_INT64)
     {
-        NIST_INT64 acc;         /* accumulator */
+        NIST_INT64 acc; /* accumulator */
         unsigned int *rp = (unsigned int *)r_d;
         const unsigned int *bp = (const unsigned int *)buf.ui;
 
@@ -850,24 +844,21 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
          */
         nist_set_256(t_d, buf.bn, 13, 0, 11, 10, 9, 0, 15, 14);
         carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP);
-
     }
 #endif
     /* see BN_nist_mod_224 for explanation */
     adjust = bn_sub_words;
     if (carry > 0)
-        carry =
-            (int)bn_sub_words(r_d, r_d, _nist_p_256[carry - 1],
-                              BN_NIST_256_TOP);
+        carry = (int)bn_sub_words(r_d, r_d, _nist_p_256[carry - 1],
+            BN_NIST_256_TOP);
     else if (carry < 0) {
-        carry =
-            (int)bn_add_words(r_d, r_d, _nist_p_256[-carry - 1],
-                              BN_NIST_256_TOP);
+        carry = (int)bn_add_words(r_d, r_d, _nist_p_256[-carry - 1],
+            BN_NIST_256_TOP);
         adjust = carry ? bn_sub_words : bn_add_words;
     } else
         carry = 1;
 
-    res = ((*adjust) (c_d, r_d, _nist_p_256[0], BN_NIST_256_TOP) && carry)
+    res = ((*adjust)(c_d, r_d, _nist_p_256[0], BN_NIST_256_TOP) && carry)
         ? r_d
         : c_d;
     nist_cp_bn(r_d, res, BN_NIST_256_TOP);
@@ -877,32 +868,31 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
     return 1;
 }
 
-#define nist_set_384(to,from,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12) \
-        { \
-        bn_cp_32(to, 0, from,  (a12) - 12) \
-        bn_cp_32(to, 1, from,  (a11) - 12) \
-        bn_cp_32(to, 2, from,  (a10) - 12) \
-        bn_cp_32(to, 3, from,  (a9) - 12)  \
-        bn_cp_32(to, 4, from,  (a8) - 12)  \
-        bn_cp_32(to, 5, from,  (a7) - 12)  \
-        bn_cp_32(to, 6, from,  (a6) - 12)  \
-        bn_cp_32(to, 7, from,  (a5) - 12)  \
-        bn_cp_32(to, 8, from,  (a4) - 12)  \
-        bn_cp_32(to, 9, from,  (a3) - 12)  \
-        bn_cp_32(to, 10, from, (a2) - 12)  \
-        bn_cp_32(to, 11, from, (a1) - 12)  \
-        }
+#define nist_set_384(to, from, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12)     \
+    {                                                                                 \
+        bn_cp_32(to, 0, from, (a12) - 12)                                             \
+            bn_cp_32(to, 1, from, (a11) - 12)                                         \
+                bn_cp_32(to, 2, from, (a10) - 12)                                     \
+                    bn_cp_32(to, 3, from, (a9) - 12)                                  \
+                        bn_cp_32(to, 4, from, (a8) - 12)                              \
+                            bn_cp_32(to, 5, from, (a7) - 12)                          \
+                                bn_cp_32(to, 6, from, (a6) - 12)                      \
+                                    bn_cp_32(to, 7, from, (a5) - 12)                  \
+                                        bn_cp_32(to, 8, from, (a4) - 12)              \
+                                            bn_cp_32(to, 9, from, (a3) - 12)          \
+                                                bn_cp_32(to, 10, from, (a2) - 12)     \
+                                                    bn_cp_32(to, 11, from, (a1) - 12) \
+    }
 
 int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
-                    BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int i, top = a->top;
     int carry = 0;
     register BN_ULONG *r_d, *a_d = a->d;
     union {
         BN_ULONG bn[BN_NIST_384_TOP];
-        unsigned int ui[BN_NIST_384_TOP * sizeof(BN_ULONG) /
-                        sizeof(unsigned int)];
+        unsigned int ui[BN_NIST_384_TOP * sizeof(BN_ULONG) / sizeof(unsigned int)];
     } buf;
     BN_ULONG c_d[BN_NIST_384_TOP], *res;
     bn_addsub_f adjust;
@@ -934,11 +924,11 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
         r_d = a_d;
 
     nist_cp_bn_0(buf.bn, a_d + BN_NIST_384_TOP, top - BN_NIST_384_TOP,
-                 BN_NIST_384_TOP);
+        BN_NIST_384_TOP);
 
 #if defined(NIST_INT64)
     {
-        NIST_INT64 acc;         /* accumulator */
+        NIST_INT64 acc; /* accumulator */
         unsigned int *rp = (unsigned int *)r_d;
         const unsigned int *bp = (const unsigned int *)buf.ui;
 
@@ -1077,9 +1067,8 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
             }
             *ap = c;
         }
-        carry =
-            (int)bn_add_words(r_d + (128 / BN_BITS2), r_d + (128 / BN_BITS2),
-                              t_d, BN_NIST_256_TOP);
+        carry = (int)bn_add_words(r_d + (128 / BN_BITS2), r_d + (128 / BN_BITS2),
+            t_d, BN_NIST_256_TOP);
         /*
          * S2
          */
@@ -1088,13 +1077,13 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
          * S3
          */
         nist_set_384(t_d, buf.bn, 20, 19, 18, 17, 16, 15, 14, 13, 12, 23, 22,
-                     21);
+            21);
         carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
         /*
          * S4
          */
         nist_set_384(t_d, buf.bn, 19, 18, 17, 16, 15, 14, 13, 12, 20, 0, 23,
-                     0);
+            0);
         carry += (int)bn_add_words(r_d, r_d, t_d, BN_NIST_384_TOP);
         /*
          * S5
@@ -1110,7 +1099,7 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
          * D1
          */
         nist_set_384(t_d, buf.bn, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12,
-                     23);
+            23);
         carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
         /*
          * D2
@@ -1122,24 +1111,21 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
          */
         nist_set_384(t_d, buf.bn, 0, 0, 0, 0, 0, 0, 0, 23, 23, 0, 0, 0);
         carry -= (int)bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP);
-
     }
 #endif
     /* see BN_nist_mod_224 for explanation */
     adjust = bn_sub_words;
     if (carry > 0)
-        carry =
-            (int)bn_sub_words(r_d, r_d, _nist_p_384[carry - 1],
-                              BN_NIST_384_TOP);
+        carry = (int)bn_sub_words(r_d, r_d, _nist_p_384[carry - 1],
+            BN_NIST_384_TOP);
     else if (carry < 0) {
-        carry =
-            (int)bn_add_words(r_d, r_d, _nist_p_384[-carry - 1],
-                              BN_NIST_384_TOP);
+        carry = (int)bn_add_words(r_d, r_d, _nist_p_384[-carry - 1],
+            BN_NIST_384_TOP);
         adjust = carry ? bn_sub_words : bn_add_words;
     } else
         carry = 1;
 
-    res = ((*adjust) (c_d, r_d, _nist_p_384[0], BN_NIST_384_TOP) && carry)
+    res = ((*adjust)(c_d, r_d, _nist_p_384[0], BN_NIST_384_TOP) && carry)
         ? r_d
         : c_d;
     nist_cp_bn(r_d, res, BN_NIST_384_TOP);
@@ -1149,12 +1135,12 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
     return 1;
 }
 
-#define BN_NIST_521_RSHIFT      (521%BN_BITS2)
-#define BN_NIST_521_LSHIFT      (BN_BITS2-BN_NIST_521_RSHIFT)
-#define BN_NIST_521_TOP_MASK    ((BN_ULONG)BN_MASK2>>BN_NIST_521_LSHIFT)
+#define BN_NIST_521_RSHIFT (521 % BN_BITS2)
+#define BN_NIST_521_LSHIFT (BN_BITS2 - BN_NIST_521_RSHIFT)
+#define BN_NIST_521_TOP_MASK ((BN_ULONG)BN_MASK2 >> BN_NIST_521_LSHIFT)
 
 int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
-                    BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int top = a->top, i;
     BN_ULONG *r_d, *a_d = a->d, t_d[BN_NIST_521_TOP], val, tmp, *res;
@@ -1187,7 +1173,7 @@ int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
 
     /* upper 521 bits, copy ... */
     nist_cp_bn_0(t_d, a_d + (BN_NIST_521_TOP - 1),
-                 top - (BN_NIST_521_TOP - 1), BN_NIST_521_TOP);
+        top - (BN_NIST_521_TOP - 1), BN_NIST_521_TOP);
     /* ... and right shift */
     for (val = t_d[0], i = 0; i < BN_NIST_521_TOP - 1; i++) {
 #if 0
@@ -1200,8 +1186,7 @@ int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
         val = t_d[i + 1];
         t_d[i] = (tmp | val << BN_NIST_521_LSHIFT) & BN_MASK2;
 #else
-        t_d[i] = (val >> BN_NIST_521_RSHIFT |
-                  (tmp = t_d[i + 1]) << BN_NIST_521_LSHIFT) & BN_MASK2;
+        t_d[i] = (val >> BN_NIST_521_RSHIFT | (tmp = t_d[i + 1]) << BN_NIST_521_LSHIFT) & BN_MASK2;
         val = tmp;
 #endif
     }
@@ -1211,7 +1196,7 @@ int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
 
     bn_add_words(r_d, r_d, t_d, BN_NIST_521_TOP);
     res = bn_sub_words(t_d, r_d, _nist_p_521,
-                       BN_NIST_521_TOP)
+              BN_NIST_521_TOP)
         ? r_d
         : t_d;
     nist_cp_bn(r_d, res, BN_NIST_521_TOP);
@@ -1221,8 +1206,9 @@ int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
     return 1;
 }
 
-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)
+{
     if (BN_ucmp(&ossl_bignum_nist_p_192, p) == 0)
         return BN_nist_mod_192;
     if (BN_ucmp(&ossl_bignum_nist_p_224, p) == 0)
diff --git a/crypto/bn/bn_ppc.c b/crypto/bn/bn_ppc.c
index 1e9421bee213d..049ffa50da981 100644
--- a/crypto/bn/bn_ppc.c
+++ b/crypto/bn/bn_ppc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2009-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
@@ -13,18 +13,18 @@
 #include "bn_local.h"
 
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                const BN_ULONG *np, const BN_ULONG *n0, int num)
+    const BN_ULONG *np, const BN_ULONG *n0, int num)
 {
-    int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                        const BN_ULONG *np, const BN_ULONG *n0, int num);
-    int bn_mul4x_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                          const BN_ULONG *np, const BN_ULONG *n0, int num);
-    int bn_mul_mont_fixed_n6(BN_ULONG *rp, const BN_ULONG *ap,
-                             const BN_ULONG *bp, const BN_ULONG *np,
-                             const BN_ULONG *n0, int num);
-    int bn_mul_mont_300_fixed_n6(BN_ULONG *rp, const BN_ULONG *ap,
-                                 const BN_ULONG *bp, const BN_ULONG *np,
-                                 const BN_ULONG *n0, int num);
+    int bn_mul_mont_int(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp,
+        const BN_ULONG *np, const BN_ULONG *n0, int num);
+    int bn_mul4x_mont_int(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp,
+        const BN_ULONG *np, const BN_ULONG *n0, int num);
+    int bn_mul_mont_fixed_n6(BN_ULONG * rp, const BN_ULONG *ap,
+        const BN_ULONG *bp, const BN_ULONG *np,
+        const BN_ULONG *n0, int num);
+    int bn_mul_mont_300_fixed_n6(BN_ULONG * rp, const BN_ULONG *ap,
+        const BN_ULONG *bp, const BN_ULONG *np,
+        const BN_ULONG *n0, int num);
 
     if (num < 4)
         return 0;
@@ -41,12 +41,15 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
      */
 
 #if defined(_ARCH_PPC64) && !defined(__ILP32__)
+    /* Minerva side-channel fix danny */
+#if defined(USE_FIXED_N6)
     if (num == 6) {
         if (OPENSSL_ppccap_P & PPC_MADD300)
             return bn_mul_mont_300_fixed_n6(rp, ap, bp, np, n0, num);
         else
             return bn_mul_mont_fixed_n6(rp, ap, bp, np, n0, num);
     }
+#endif
 #endif
 
     return bn_mul_mont_int(rp, ap, bp, np, n0, num);
diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c
index 96eb1b3c347f4..0c38e2ccd2073 100644
--- a/crypto/bn/bn_prime.c
+++ b/crypto/bn/bn_prime.c
@@ -20,19 +20,19 @@
 #include "bn_prime.h"
 
 static int probable_prime(BIGNUM *rnd, int bits, int safe, prime_t *mods,
-                          BN_CTX *ctx);
+    BN_CTX *ctx);
 static int probable_prime_dh(BIGNUM *rnd, int bits, int safe, prime_t *mods,
-                             const BIGNUM *add, const BIGNUM *rem,
-                             BN_CTX *ctx);
+    const BIGNUM *add, const BIGNUM *rem,
+    BN_CTX *ctx);
 static int bn_is_prime_int(const BIGNUM *w, int checks, BN_CTX *ctx,
-                           int do_trial_division, BN_GENCB *cb);
+    int do_trial_division, BN_GENCB *cb);
 
 #define square(x) ((BN_ULONG)(x) * (BN_ULONG)(x))
 
 #if BN_BITS2 == 64
-# define BN_DEF(lo, hi) (BN_ULONG)hi<<32|lo
+#define BN_DEF(lo, hi) (BN_ULONG) hi << 32 | lo
 #else
-# define BN_DEF(lo, hi) lo, hi
+#define BN_DEF(lo, hi) lo, hi
 #endif
 
 /*
@@ -121,8 +121,8 @@ int BN_GENCB_call(BN_GENCB *cb, int a, int b)
 }
 
 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)
 {
     BIGNUM *t;
     int found = 0;
@@ -152,7 +152,7 @@ int BN_generate_prime_ex2(BIGNUM *ret, int bits, int safe,
     t = BN_CTX_get(ctx);
     if (t == NULL)
         goto err;
- loop:
+loop:
     /* make a random number and set the top and bottom bits */
     if (add == NULL) {
         if (!probable_prime(ret, bits, safe, mods, ctx))
@@ -200,7 +200,7 @@ int BN_generate_prime_ex2(BIGNUM *ret, int bits, int safe,
     }
     /* we have a prime :-) */
     found = 1;
- err:
+err:
     OPENSSL_free(mods);
     BN_CTX_end(ctx);
     bn_check_top(ret);
@@ -209,7 +209,7 @@ int BN_generate_prime_ex2(BIGNUM *ret, int bits, int safe,
 
 #ifndef FIPS_MODULE
 int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe,
-                         const BIGNUM *add, const BIGNUM *rem, BN_GENCB *cb)
+    const BIGNUM *add, const BIGNUM *rem, BN_GENCB *cb)
 {
     BN_CTX *ctx = BN_CTX_new();
     int retval;
@@ -226,13 +226,13 @@ int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe,
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 int BN_is_prime_ex(const BIGNUM *a, int checks, BN_CTX *ctx_passed,
-                   BN_GENCB *cb)
+    BN_GENCB *cb)
 {
     return ossl_bn_check_prime(a, checks, ctx_passed, 0, cb);
 }
 
 int BN_is_prime_fasttest_ex(const BIGNUM *w, int checks, BN_CTX *ctx,
-                            int do_trial_division, BN_GENCB *cb)
+    int do_trial_division, BN_GENCB *cb)
 {
     return ossl_bn_check_prime(w, checks, ctx, do_trial_division, cb);
 }
@@ -240,7 +240,7 @@ int BN_is_prime_fasttest_ex(const BIGNUM *w, int checks, BN_CTX *ctx,
 
 /* Wrapper around bn_is_prime_int that sets the minimum number of checks */
 int ossl_bn_check_prime(const BIGNUM *w, int checks, BN_CTX *ctx,
-                        int do_trial_division, BN_GENCB *cb)
+    int do_trial_division, BN_GENCB *cb)
 {
     int min_checks = bn_mr_min_checks(BN_num_bits(w));
 
@@ -256,7 +256,7 @@ int ossl_bn_check_prime(const BIGNUM *w, int checks, BN_CTX *ctx,
  * (MR rounds) passed in is used without being clamped to a minimum value.
  */
 int ossl_bn_check_generated_prime(const BIGNUM *w, int checks, BN_CTX *ctx,
-                                  BN_GENCB *cb)
+    BN_GENCB *cb)
 {
     return bn_is_prime_int(w, checks, ctx, 1, cb);
 }
@@ -273,7 +273,7 @@ int BN_check_prime(const BIGNUM *p, BN_CTX *ctx, BN_GENCB *cb)
  * Returns 0 when composite, 1 when probable prime, -1 on error.
  */
 static int bn_is_prime_int(const BIGNUM *w, int checks, BN_CTX *ctx,
-                           int do_trial_division, BN_GENCB *cb)
+    int do_trial_division, BN_GENCB *cb)
 {
     int i, status, ret = -1;
 #ifndef FIPS_MODULE
@@ -345,7 +345,7 @@ static int bn_is_prime_int(const BIGNUM *w, int checks, BN_CTX *ctx,
  * returns 0 if there was an error, otherwise it returns 1.
  */
 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 i, j, a, ret = 0;
     BIGNUM *g, *w1, *w3, *x, *m, *z, *b;
@@ -397,7 +397,7 @@ int ossl_bn_miller_rabin_is_prime(const BIGNUM *w, int iterations, BN_CTX *ctx,
     for (i = 0; i < iterations; ++i) {
         /* (Step 4.1) obtain a Random string of bits b where 1 < b < w-1 */
         if (!BN_priv_rand_range_ex(b, w3, 0, ctx)
-                || !BN_add_word(b, 2)) /* 1 < b < w-1 */
+            || !BN_add_word(b, 2)) /* 1 < b < w-1 */
             goto err;
 
         if (enhanced) {
@@ -418,7 +418,7 @@ int ossl_bn_miller_rabin_is_prime(const BIGNUM *w, int iterations, BN_CTX *ctx,
         if (BN_is_one(z) || BN_cmp(z, w1) == 0)
             goto outer_loop;
         /* (Step 4.7) for j = 1 to a-1 */
-        for (j = 1; j < a ; ++j) {
+        for (j = 1; j < a; ++j) {
             /* (Step 4.7.1 - 4.7.2) x = z. z = x^2 mod w */
             if (!BN_copy(x, z) || !BN_mod_mul(z, x, x, w, ctx))
                 goto err;
@@ -439,7 +439,7 @@ int ossl_bn_miller_rabin_is_prime(const BIGNUM *w, int iterations, BN_CTX *ctx,
         /* (Step 4.11) x = b^(w-1) mod w */
         if (!BN_copy(x, z))
             goto err;
-composite:
+    composite:
         if (enhanced) {
             /* (Step 4.1.2) g = GCD(x-1, w) */
             if (!BN_sub_word(x, 1) || !BN_gcd(g, x, w, ctx))
@@ -454,7 +454,7 @@ int ossl_bn_miller_rabin_is_prime(const BIGNUM *w, int iterations, BN_CTX *ctx,
         }
         ret = 1;
         goto err;
-outer_loop: ;
+    outer_loop:;
         /* (Step 4.1.5) */
         if (!BN_GENCB_call(cb, 1, i))
             goto err;
@@ -485,16 +485,16 @@ outer_loop: ;
  * Returns 1 on success and 0 on error.
  */
 static int probable_prime(BIGNUM *rnd, int bits, int safe, prime_t *mods,
-                          BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int i;
     BN_ULONG delta;
     int trial_divisions = calc_trial_divisions(bits);
     BN_ULONG maxdelta = BN_MASK2 - primes[trial_divisions - 1];
 
- again:
+again:
     if (!BN_priv_rand_ex(rnd, bits, BN_RAND_TOP_TWO, BN_RAND_BOTTOM_ODD, 0,
-                         ctx))
+            ctx))
         return 0;
     if (safe && !BN_set_bit(rnd, 1))
         return 0;
@@ -503,10 +503,10 @@ static int probable_prime(BIGNUM *rnd, int bits, int safe, prime_t *mods,
         BN_ULONG mod = BN_mod_word(rnd, (BN_ULONG)primes[i]);
         if (mod == (BN_ULONG)-1)
             return 0;
-        mods[i] = (prime_t) mod;
+        mods[i] = (prime_t)mod;
     }
     delta = 0;
- loop:
+loop:
     for (i = 1; i < trial_divisions; i++) {
         /*
          * check that rnd is a prime and also that
@@ -516,7 +516,7 @@ static int probable_prime(BIGNUM *rnd, int bits, int safe, prime_t *mods,
          * we check only the primes up to sqrt(rnd)
          */
         if (bits <= 31 && delta <= 0x7fffffff
-                && square(primes[i]) > BN_get_word(rnd) + delta)
+            && square(primes[i]) > BN_get_word(rnd) + delta)
             break;
         if (safe ? (mods[i] + delta) % primes[i] <= 1
                  : (mods[i] + delta) % primes[i] == 0) {
@@ -543,8 +543,8 @@ static int probable_prime(BIGNUM *rnd, int bits, int safe, prime_t *mods,
  * Returns 1 on success and 0 on error.
  */
 static int probable_prime_dh(BIGNUM *rnd, int bits, int safe, prime_t *mods,
-                             const BIGNUM *add, const BIGNUM *rem,
-                             BN_CTX *ctx)
+    const BIGNUM *add, const BIGNUM *rem,
+    BN_CTX *ctx)
 {
     int i, ret = 0;
     BIGNUM *t1;
@@ -559,7 +559,7 @@ static int probable_prime_dh(BIGNUM *rnd, int bits, int safe, prime_t *mods,
     if (maxdelta > BN_MASK2 - BN_get_word(add))
         maxdelta = BN_MASK2 - BN_get_word(add);
 
- again:
+again:
     if (!BN_rand_ex(rnd, bits, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ODD, 0, ctx))
         goto err;
 
@@ -578,7 +578,7 @@ static int probable_prime_dh(BIGNUM *rnd, int bits, int safe, prime_t *mods,
     }
 
     if (BN_num_bits(rnd) < bits
-            || BN_get_word(rnd) < (safe ? 5u : 3u)) {
+        || BN_get_word(rnd) < (safe ? 5u : 3u)) {
         if (!BN_add(rnd, rnd, add))
             goto err;
     }
@@ -588,14 +588,14 @@ static int probable_prime_dh(BIGNUM *rnd, int bits, int safe, prime_t *mods,
         BN_ULONG mod = BN_mod_word(rnd, (BN_ULONG)primes[i]);
         if (mod == (BN_ULONG)-1)
             goto err;
-        mods[i] = (prime_t) mod;
+        mods[i] = (prime_t)mod;
     }
     delta = 0;
- loop:
+loop:
     for (i = 1; i < trial_divisions; i++) {
         /* check that rnd is a prime */
         if (bits <= 31 && delta <= 0x7fffffff
-                && square(primes[i]) > BN_get_word(rnd) + delta)
+            && square(primes[i]) > BN_get_word(rnd) + delta)
             break;
         /* rnd mod p == 1 implies q = (rnd-1)/2 is divisible by p */
         if (safe ? (mods[i] + delta) % primes[i] <= 1
@@ -610,7 +610,7 @@ static int probable_prime_dh(BIGNUM *rnd, int bits, int safe, prime_t *mods,
         goto err;
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     bn_check_top(rnd);
     return ret;
diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c
index ccc954c5b1c08..a04e6cf0c2d8a 100644
--- a/crypto/bn/bn_print.c
+++ b/crypto/bn/bn_print.c
@@ -49,7 +49,7 @@ int BN_print(BIO *bp, const BIGNUM *a)
         }
     }
     ret = 1;
- end:
+end:
     return ret;
 }
 
@@ -62,10 +62,10 @@ char *BN_options(void)
         init++;
 #ifdef BN_LLONG
         BIO_snprintf(data, sizeof(data), "bn(%zu,%zu)",
-                     sizeof(BN_ULLONG) * 8, sizeof(BN_ULONG) * 8);
+            sizeof(BN_ULLONG) * 8, sizeof(BN_ULONG) * 8);
 #else
         BIO_snprintf(data, sizeof(data), "bn(%zu,%zu)",
-                     sizeof(BN_ULONG) * 8, sizeof(BN_ULONG) * 8);
+            sizeof(BN_ULONG) * 8, sizeof(BN_ULONG) * 8);
 #endif
     }
     return data;
diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index da537a07a9146..18b5bf8ef87fc 100644
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -17,11 +17,13 @@
 #include <openssl/evp.h>
 
 typedef enum bnrand_flag_e {
-    NORMAL, TESTING, PRIVATE
+    NORMAL,
+    TESTING,
+    PRIVATE
 } BNRAND_FLAG;
 
 static int bnrand(BNRAND_FLAG flag, BIGNUM *rnd, int bits, int top, int bottom,
-                  unsigned int strength, BN_CTX *ctx)
+    unsigned int strength, BN_CTX *ctx)
 {
     unsigned char *buf = NULL;
     int b, ret = 0, bit, bytes, mask;
@@ -82,12 +84,12 @@ static int bnrand(BNRAND_FLAG flag, BIGNUM *rnd, int bits, int top, int bottom,
         }
     }
     buf[0] &= ~mask;
-    if (bottom)                 /* set bottom bit if requested */
+    if (bottom) /* set bottom bit if requested */
         buf[bytes - 1] |= 1;
     if (!BN_bin2bn(buf, bytes, rnd))
         goto err;
     ret = 1;
- err:
+err:
     OPENSSL_clear_free(buf, bytes);
     bn_check_top(rnd);
     return ret;
@@ -98,7 +100,7 @@ static int bnrand(BNRAND_FLAG flag, BIGNUM *rnd, int bits, int top, int bottom,
 }
 
 int BN_rand_ex(BIGNUM *rnd, int bits, int top, int bottom,
-               unsigned int strength, BN_CTX *ctx)
+    unsigned int strength, BN_CTX *ctx)
 {
     return bnrand(NORMAL, rnd, bits, top, bottom, strength, ctx);
 }
@@ -115,7 +117,7 @@ int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom)
 #endif
 
 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)
 {
     return bnrand(PRIVATE, rnd, bits, top, bottom, strength, ctx);
 }
@@ -129,7 +131,7 @@ int BN_priv_rand(BIGNUM *rnd, int bits, int top, int bottom)
 
 /* random number r:  0 <= r < range */
 static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range,
-                        unsigned int strength, BN_CTX *ctx)
+    unsigned int strength, BN_CTX *ctx)
 {
     int n;
     int count = 100;
@@ -144,7 +146,7 @@ static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range,
         return 0;
     }
 
-    n = BN_num_bits(range);     /* n > 0 */
+    n = BN_num_bits(range); /* n > 0 */
 
     /* BN_is_bit_set(range, n - 1) always holds */
 
@@ -157,7 +159,7 @@ static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range,
          */
         do {
             if (!bnrand(flag, r, n + 1, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY,
-                        strength, ctx))
+                    strength, ctx))
                 return 0;
 
             /*
@@ -179,21 +181,19 @@ static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range,
                 return 0;
             }
 
-        }
-        while (BN_cmp(r, range) >= 0);
+        } while (BN_cmp(r, range) >= 0);
     } else {
         do {
             /* range = 11..._2  or  range = 101..._2 */
             if (!bnrand(flag, r, n, BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY,
-                        strength, ctx))
+                    strength, ctx))
                 return 0;
 
             if (!--count) {
                 ERR_raise(ERR_LIB_BN, BN_R_TOO_MANY_ITERATIONS);
                 return 0;
             }
-        }
-        while (BN_cmp(r, range) >= 0);
+        } while (BN_cmp(r, range) >= 0);
     }
 
     bn_check_top(r);
@@ -201,7 +201,7 @@ static int bnrand_range(BNRAND_FLAG flag, BIGNUM *r, const BIGNUM *range,
 }
 
 int BN_rand_range_ex(BIGNUM *r, const BIGNUM *range, unsigned int strength,
-                     BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     return bnrand_range(NORMAL, r, range, strength, ctx);
 }
@@ -214,7 +214,7 @@ int BN_rand_range(BIGNUM *r, const BIGNUM *range)
 #endif
 
 int BN_priv_rand_range_ex(BIGNUM *r, const BIGNUM *range, unsigned int strength,
-                          BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     return bnrand_range(PRIVATE, r, range, strength, ctx);
 }
@@ -225,7 +225,7 @@ int BN_priv_rand_range(BIGNUM *r, const BIGNUM *range)
     return bnrand_range(PRIVATE, r, range, 0, NULL);
 }
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom)
 {
     return BN_rand(rnd, bits, top, bottom);
@@ -235,11 +235,11 @@ int BN_pseudo_rand_range(BIGNUM *r, const BIGNUM *range)
 {
     return BN_rand_range(r, range);
 }
-# endif
+#endif
 #endif
 
 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 n;
     int count = 100;
@@ -254,7 +254,7 @@ int ossl_bn_priv_rand_range_fixed_top(BIGNUM *r, const BIGNUM *range,
         return 0;
     }
 
-    n = BN_num_bits(range);     /* n > 0 */
+    n = BN_num_bits(range); /* n > 0 */
 
     /* BN_is_bit_set(range, n - 1) always holds */
 
@@ -264,7 +264,7 @@ int ossl_bn_priv_rand_range_fixed_top(BIGNUM *r, const BIGNUM *range,
         BN_set_flags(r, BN_FLG_CONSTTIME);
         do {
             if (!bnrand(PRIVATE, r, n + 1, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY,
-                        strength, ctx))
+                    strength, ctx))
                 return 0;
 
             if (!--count) {
@@ -272,8 +272,7 @@ int ossl_bn_priv_rand_range_fixed_top(BIGNUM *r, const BIGNUM *range,
                 return 0;
             }
             ossl_bn_mask_bits_fixed_top(r, n);
-        }
-        while (BN_ucmp(r, range) >= 0);
+        } while (BN_ucmp(r, range) >= 0);
 #ifdef BN_DEBUG
         /* With BN_DEBUG on a fixed top number cannot be returned */
         bn_correct_top(r);
@@ -292,9 +291,9 @@ int ossl_bn_priv_rand_range_fixed_top(BIGNUM *r, const BIGNUM *range,
  * used.
  */
 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)
 {
     EVP_MD_CTX *mdctx = EVP_MD_CTX_new();
     /*
@@ -308,7 +307,7 @@ int ossl_bn_gen_dsa_nonce_fixed_top(BIGNUM *out, const BIGNUM *range,
     const unsigned num_k_bytes = BN_num_bytes(range) + 1;
     unsigned char private_bytes[96];
     unsigned char *k_bytes = NULL;
-    const int max_n = 64;           /* Pr(failure to generate) < 2^max_n */
+    const int max_n = 64; /* Pr(failure to generate) < 2^max_n */
     int n;
     int ret = 0;
     EVP_MD *md = NULL;
@@ -344,17 +343,18 @@ int ossl_bn_gen_dsa_nonce_fixed_top(BIGNUM *out, const BIGNUM *range,
 
         for (done = 1; done < num_k_bytes;) {
             if (RAND_priv_bytes_ex(libctx, random_bytes, sizeof(random_bytes),
-                                   0) <= 0)
+                    0)
+                <= 0)
                 goto end;
 
             if (!EVP_DigestInit_ex(mdctx, md, NULL)
-                    || !EVP_DigestUpdate(mdctx, &i, sizeof(i))
-                    || !EVP_DigestUpdate(mdctx, private_bytes,
-                                         sizeof(private_bytes))
-                    || !EVP_DigestUpdate(mdctx, message, message_len)
-                    || !EVP_DigestUpdate(mdctx, random_bytes,
-                                         sizeof(random_bytes))
-                    || !EVP_DigestFinal_ex(mdctx, digest, NULL))
+                || !EVP_DigestUpdate(mdctx, &i, sizeof(i))
+                || !EVP_DigestUpdate(mdctx, private_bytes,
+                    sizeof(private_bytes))
+                || !EVP_DigestUpdate(mdctx, message, message_len)
+                || !EVP_DigestUpdate(mdctx, random_bytes,
+                    sizeof(random_bytes))
+                || !EVP_DigestFinal_ex(mdctx, digest, NULL))
                 goto end;
 
             todo = num_k_bytes - done;
@@ -384,7 +384,7 @@ int ossl_bn_gen_dsa_nonce_fixed_top(BIGNUM *out, const BIGNUM *range,
     /* Failed to generate anything */
     ERR_raise(ERR_LIB_BN, ERR_R_INTERNAL_ERROR);
 
- end:
+end:
     EVP_MD_CTX_free(mdctx);
     EVP_MD_free(md);
     OPENSSL_clear_free(k_bytes, num_k_bytes);
@@ -395,13 +395,13 @@ int ossl_bn_gen_dsa_nonce_fixed_top(BIGNUM *out, const BIGNUM *range,
 }
 
 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)
 {
     int ret;
 
     ret = ossl_bn_gen_dsa_nonce_fixed_top(out, range, priv, message,
-                                          message_len, ctx);
+        message_len, ctx);
     /*
      * This call makes the BN_generate_dsa_nonce non-const-time, thus we
      * do not use it internally. But fixed_top BNs currently cannot be returned
diff --git a/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c
index 83fd175c437f5..26fb737e2515b 100644
--- a/crypto/bn/bn_recp.c
+++ b/crypto/bn/bn_recp.c
@@ -51,7 +51,7 @@ int BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *d, 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 ret = 0;
     BIGNUM *a;
@@ -70,17 +70,17 @@ int BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *x, const BIGNUM *y,
         }
         ca = a;
     } else
-        ca = x;                 /* Just do the mod */
+        ca = x; /* Just do the mod */
 
     ret = BN_div_recp(NULL, r, ca, recp, ctx);
- err:
+err:
     BN_CTX_end(ctx);
     bn_check_top(r);
     return ret;
 }
 
 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)
 {
     int i, j, ret = 0;
     BIGNUM *a, *b, *d, *r;
@@ -156,7 +156,7 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
     r->neg = BN_is_zero(r) ? 0 : m->neg;
     d->neg = m->neg ^ recp->N.neg;
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     bn_check_top(dv);
     bn_check_top(rem);
@@ -185,7 +185,7 @@ int BN_reciprocal(BIGNUM *r, const BIGNUM *m, int len, BN_CTX *ctx)
         goto err;
 
     ret = len;
- err:
+err:
     bn_check_top(r);
     BN_CTX_end(ctx);
     return ret;
diff --git a/crypto/bn/bn_rsa_fips186_4.c b/crypto/bn/bn_rsa_fips186_4.c
index c967ca962978a..c2574167d06df 100644
--- a/crypto/bn/bn_rsa_fips186_4.c
+++ b/crypto/bn/bn_rsa_fips186_4.c
@@ -29,9 +29,9 @@
 #include "internal/nelem.h"
 
 #if BN_BITS2 == 64
-# define BN_DEF(lo, hi) (BN_ULONG)hi<<32|lo
+#define BN_DEF(lo, hi) (BN_ULONG) hi << 32 | lo
 #else
-# define BN_DEF(lo, hi) lo, hi
+#define BN_DEF(lo, hi) lo, hi
 #endif
 
 /* 1 / sqrt(2) * 2^256, rounded up */
@@ -130,9 +130,9 @@ static int bn_rsa_fips186_5_aux_prime_max_sum_size_for_prob_primes(int nbits)
  * Returns: 1 on success otherwise it returns 0.
  */
 static int bn_rsa_fips186_4_find_aux_prob_prime(const BIGNUM *Xp1,
-                                                BIGNUM *p1, BN_CTX *ctx,
-                                                int rounds,
-                                                BN_GENCB *cb)
+    BIGNUM *p1, BN_CTX *ctx,
+    int rounds,
+    BN_GENCB *cb)
 {
     int ret = 0;
     int i = 0;
@@ -182,11 +182,11 @@ static int bn_rsa_fips186_4_find_aux_prob_prime(const BIGNUM *Xp1,
  * Returns: 1 on success otherwise it returns 0.
  */
 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 ret = 0;
     BIGNUM *p1i = NULL, *p2i = NULL, *Xp1i = NULL, *Xp2i = NULL;
@@ -213,28 +213,27 @@ int ossl_bn_rsa_fips186_4_gen_prob_primes(BIGNUM *p, BIGNUM *Xpout,
     if (Xp1 == NULL) {
         /* Set the top and bottom bits to make it odd and the correct size */
         if (!BN_priv_rand_ex(Xp1i, bitlen, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ODD,
-                             0, ctx))
+                0, ctx))
             goto err;
     }
     /* (Steps 4.1/5.1): Randomly generate Xp2 if it is not passed in */
     if (Xp2 == NULL) {
         /* Set the top and bottom bits to make it odd and the correct size */
         if (!BN_priv_rand_ex(Xp2i, bitlen, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ODD,
-                             0, ctx))
+                0, ctx))
             goto err;
     }
 
     /* (Steps 4.2/5.2) - find first auxiliary probable primes */
     if (!bn_rsa_fips186_4_find_aux_prob_prime(Xp1i, p1i, ctx, rounds, cb)
-            || !bn_rsa_fips186_4_find_aux_prob_prime(Xp2i, p2i, ctx, rounds, cb))
+        || !bn_rsa_fips186_4_find_aux_prob_prime(Xp2i, p2i, ctx, rounds, cb))
         goto err;
-    /* (Table B.1) auxiliary prime Max length check */
-    if ((BN_num_bits(p1i) + BN_num_bits(p2i)) >=
-            bn_rsa_fips186_5_aux_prime_max_sum_size_for_prob_primes(nlen))
+    /* (FIPS 186-5 Table A.1) auxiliary prime Max length check */
+    if ((BN_num_bits(p1i) + BN_num_bits(p2i)) > bn_rsa_fips186_5_aux_prime_max_sum_size_for_prob_primes(nlen))
         goto err;
     /* (Steps 4.3/5.3) - generate prime */
     if (!ossl_bn_rsa_fips186_4_derive_prime(p, Xpout, Xp, p1i, p2i, nlen, e,
-                                            ctx, cb))
+            ctx, cb))
         goto err;
     ret = 1;
 err:
@@ -273,9 +272,9 @@ int ossl_bn_rsa_fips186_4_gen_prob_primes(BIGNUM *p, BIGNUM *Xpout,
  *     Y, X, r1, r2, e are not NULL.
  */
 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)
 {
     int ret = 0;
     int i, imax, rounds;
@@ -311,7 +310,7 @@ int ossl_bn_rsa_fips186_4_derive_prime(BIGNUM *Y, BIGNUM *X, const BIGNUM *Xin,
         if (bits < BN_num_bits(&ossl_bn_inv_sqrt_2))
             goto err;
         if (!BN_lshift(base, &ossl_bn_inv_sqrt_2,
-                       bits - BN_num_bits(&ossl_bn_inv_sqrt_2))
+                bits - BN_num_bits(&ossl_bn_inv_sqrt_2))
             || !BN_lshift(range, BN_value_one(), bits)
             || !BN_sub(range, range, base))
             goto err;
@@ -376,7 +375,7 @@ int ossl_bn_rsa_fips186_4_derive_prime(BIGNUM *Y, BIGNUM *X, const BIGNUM *Xin,
 
             /* (Step 7) If GCD(Y-1) == 1 & Y is probably prime then return Y */
             if (BN_copy(y1, Y) == NULL
-                    || !BN_sub_word(y1, 1))
+                || !BN_sub_word(y1, 1))
                 goto err;
 
             if (BN_are_coprime(y1, e, ctx)) {
diff --git a/crypto/bn/bn_s390x.c b/crypto/bn/bn_s390x.c
index 0b60f4ec1d939..641d5878bef0f 100644
--- a/crypto/bn/bn_s390x.c
+++ b/crypto/bn/bn_s390x.c
@@ -12,16 +12,16 @@
 
 #ifdef S390X_MOD_EXP
 
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <fcntl.h>
-# include <asm/zcrypt.h>
-# include <sys/ioctl.h>
-# include <unistd.h>
-# include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <asm/zcrypt.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <errno.h>
 
 static int s390x_mod_exp_hw(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                            const BIGNUM *m)
+    const BIGNUM *m)
 {
     struct ica_rsa_modexpo me;
     unsigned char *buffer;
@@ -63,13 +63,13 @@ static int s390x_mod_exp_hw(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
          */
         OPENSSL_s390xcex_nodev = 1;
     }
- dealloc:
+dealloc:
     OPENSSL_clear_free(buffer, 4 * size);
     return res;
 }
 
 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)
 {
     if (s390x_mod_exp_hw(r, a, p, m) == 1)
         return 1;
@@ -77,7 +77,7 @@ int s390x_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 }
 
 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)
 {
     struct ica_rsa_modexpo_crt crt;
     unsigned char *buffer, *part;
@@ -140,20 +140,20 @@ int s390x_crt(BIGNUM *r, const BIGNUM *i, const BIGNUM *p, const BIGNUM *q,
          */
         OPENSSL_s390xcex_nodev = 1;
     }
- dealloc:
+dealloc:
     OPENSSL_clear_free(buffer, 9 * size + 24);
     return res;
 }
 
 #else
 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)
 {
     return BN_mod_exp_mont(r, a, p, m, 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)
 {
     return 0;
 }
diff --git a/crypto/bn/bn_shift.c b/crypto/bn/bn_shift.c
index d67331f1f634c..577b7bc5b08a9 100644
--- a/crypto/bn/bn_shift.c
+++ b/crypto/bn/bn_shift.c
@@ -120,8 +120,8 @@ int bn_lshift_fixed_top(BIGNUM *r, const BIGNUM *a, int n)
     if (a->top != 0) {
         lb = (unsigned int)n % BN_BITS2;
         rb = BN_BITS2 - lb;
-        rb %= BN_BITS2;            /* say no to undefined behaviour */
-        rmask = (BN_ULONG)0 - rb;  /* rmask = 0 - (rb != 0) */
+        rb %= BN_BITS2; /* say no to undefined behaviour */
+        rmask = (BN_ULONG)0 - rb; /* rmask = 0 - (rb != 0) */
         rmask |= rmask >> 8;
         f = &(a->d[0]);
         t = &(r->d[nw]);
@@ -191,8 +191,8 @@ int bn_rshift_fixed_top(BIGNUM *r, const BIGNUM *a, int n)
 
     rb = (unsigned int)n % BN_BITS2;
     lb = BN_BITS2 - rb;
-    lb %= BN_BITS2;            /* say no to undefined behaviour */
-    mask = (BN_ULONG)0 - lb;   /* mask = 0 - (lb != 0) */
+    lb %= BN_BITS2; /* say no to undefined behaviour */
+    mask = (BN_ULONG)0 - lb; /* mask = 0 - (lb != 0) */
     mask |= mask >> 8;
     top = a->top - nw;
     if (r != a && bn_wexpand(r, top) == NULL)
diff --git a/crypto/bn/bn_sparc.c b/crypto/bn/bn_sparc.c
index a810c3b1faee9..a236e42dfae93 100644
--- a/crypto/bn/bn_sparc.c
+++ b/crypto/bn/bn_sparc.c
@@ -11,66 +11,61 @@
 #include <openssl/bn.h>
 #include "internal/cryptlib.h"
 #include "crypto/sparc_arch.h"
-#include "bn_local.h"    /* for definition of bn_mul_mont */
+#include "bn_local.h" /* for definition of bn_mul_mont */
 
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                const BN_ULONG *np, const BN_ULONG *n0, int num)
+    const BN_ULONG *np, const BN_ULONG *n0, int num)
 {
-    int bn_mul_mont_vis3(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                         const BN_ULONG *np, const BN_ULONG *n0, int num);
-    int bn_mul_mont_fpu(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                        const BN_ULONG *np, const BN_ULONG *n0, int num);
-    int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                        const BN_ULONG *np, const BN_ULONG *n0, int num);
+    int bn_mul_mont_vis3(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp,
+        const BN_ULONG *np, const BN_ULONG *n0, int num);
+    int bn_mul_mont_fpu(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp,
+        const BN_ULONG *np, const BN_ULONG *n0, int num);
+    int bn_mul_mont_int(BN_ULONG * rp, const BN_ULONG *ap, const BN_ULONG *bp,
+        const BN_ULONG *np, const BN_ULONG *n0, int num);
 
     if (!(num & 1) && num >= 6) {
-        if ((num & 15) == 0 && num <= 64 &&
-            (OPENSSL_sparcv9cap_P[1] & (CFR_MONTMUL | CFR_MONTSQR)) ==
-            (CFR_MONTMUL | CFR_MONTSQR)) {
-            typedef int (*bn_mul_mont_f) (BN_ULONG *rp, const BN_ULONG *ap,
-                                          const BN_ULONG *bp,
-                                          const BN_ULONG *np,
-                                          const BN_ULONG *n0);
-            int bn_mul_mont_t4_8(BN_ULONG *rp, const BN_ULONG *ap,
-                                 const BN_ULONG *bp, const BN_ULONG *np,
-                                 const BN_ULONG *n0);
-            int bn_mul_mont_t4_16(BN_ULONG *rp, const BN_ULONG *ap,
-                                  const BN_ULONG *bp, const BN_ULONG *np,
-                                  const BN_ULONG *n0);
-            int bn_mul_mont_t4_24(BN_ULONG *rp, const BN_ULONG *ap,
-                                  const BN_ULONG *bp, const BN_ULONG *np,
-                                  const BN_ULONG *n0);
-            int bn_mul_mont_t4_32(BN_ULONG *rp, const BN_ULONG *ap,
-                                  const BN_ULONG *bp, const BN_ULONG *np,
-                                  const BN_ULONG *n0);
+        if ((num & 15) == 0 && num <= 64 && (OPENSSL_sparcv9cap_P[1] & (CFR_MONTMUL | CFR_MONTSQR)) == (CFR_MONTMUL | CFR_MONTSQR)) {
+            typedef int (*bn_mul_mont_f)(BN_ULONG *rp, const BN_ULONG *ap,
+                const BN_ULONG *bp,
+                const BN_ULONG *np,
+                const BN_ULONG *n0);
+            int bn_mul_mont_t4_8(BN_ULONG * rp, const BN_ULONG *ap,
+                const BN_ULONG *bp, const BN_ULONG *np,
+                const BN_ULONG *n0);
+            int bn_mul_mont_t4_16(BN_ULONG * rp, const BN_ULONG *ap,
+                const BN_ULONG *bp, const BN_ULONG *np,
+                const BN_ULONG *n0);
+            int bn_mul_mont_t4_24(BN_ULONG * rp, const BN_ULONG *ap,
+                const BN_ULONG *bp, const BN_ULONG *np,
+                const BN_ULONG *n0);
+            int bn_mul_mont_t4_32(BN_ULONG * rp, const BN_ULONG *ap,
+                const BN_ULONG *bp, const BN_ULONG *np,
+                const BN_ULONG *n0);
             static const bn_mul_mont_f funcs[4] = {
                 bn_mul_mont_t4_8, bn_mul_mont_t4_16,
                 bn_mul_mont_t4_24, bn_mul_mont_t4_32
             };
             bn_mul_mont_f worker = funcs[num / 16 - 1];
 
-            if ((*worker) (rp, ap, bp, np, n0))
+            if ((*worker)(rp, ap, bp, np, n0))
                 return 1;
             /* retry once and fall back */
-            if ((*worker) (rp, ap, bp, np, n0))
+            if ((*worker)(rp, ap, bp, np, n0))
                 return 1;
             return bn_mul_mont_vis3(rp, ap, bp, np, n0, num);
         }
         if ((OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS3))
             return bn_mul_mont_vis3(rp, ap, bp, np, n0, num);
         else if (num >= 8 &&
-                 /*
-                  * bn_mul_mont_fpu doesn't use FMADD, we just use the
-                  * flag to detect when FPU path is preferable in cases
-                  * when current heuristics is unreliable. [it works
-                  * out because FMADD-capable processors where FPU
-                  * code path is undesirable are also VIS3-capable and
-                  * VIS3 code path takes precedence.]
-                  */
-                 ( (OPENSSL_sparcv9cap_P[0] & SPARCV9_FMADD) ||
-                   (OPENSSL_sparcv9cap_P[0] &
-                    (SPARCV9_PREFER_FPU | SPARCV9_VIS1)) ==
-                   (SPARCV9_PREFER_FPU | SPARCV9_VIS1) ))
+            /*
+             * bn_mul_mont_fpu doesn't use FMADD, we just use the
+             * flag to detect when FPU path is preferable in cases
+             * when current heuristics is unreliable. [it works
+             * out because FMADD-capable processors where FPU
+             * code path is undesirable are also VIS3-capable and
+             * VIS3 code path takes precedence.]
+             */
+            ((OPENSSL_sparcv9cap_P[0] & SPARCV9_FMADD) || (OPENSSL_sparcv9cap_P[0] & (SPARCV9_PREFER_FPU | SPARCV9_VIS1)) == (SPARCV9_PREFER_FPU | SPARCV9_VIS1)))
             return bn_mul_mont_fpu(rp, ap, bp, np, n0, num);
     }
     return bn_mul_mont_int(rp, ap, bp, np, n0, num);
diff --git a/crypto/bn/bn_sqr.c b/crypto/bn/bn_sqr.c
index 990bed90b5906..34b33a30a3bdf 100644
--- a/crypto/bn/bn_sqr.c
+++ b/crypto/bn/bn_sqr.c
@@ -45,7 +45,7 @@ int bn_sqr_fixed_top(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
     if (rr == NULL || tmp == NULL)
         goto err;
 
-    max = 2 * al;               /* Non-zero (from above) */
+    max = 2 * al; /* Non-zero (from above) */
     if (bn_wexpand(rr, max) == NULL)
         goto err;
 
@@ -98,7 +98,7 @@ int bn_sqr_fixed_top(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
         goto err;
 
     ret = 1;
- err:
+err:
     bn_check_top(rr);
     bn_check_top(tmp);
     BN_CTX_end(ctx);
@@ -160,18 +160,18 @@ void bn_sqr_recursive(BN_ULONG *r, const BN_ULONG *a, int n2, BN_ULONG *t)
     BN_ULONG ln, lo, *p;
 
     if (n2 == 4) {
-# ifndef BN_SQR_COMBA
+#ifndef BN_SQR_COMBA
         bn_sqr_normal(r, a, 4, t);
-# else
+#else
         bn_sqr_comba4(r, a);
-# endif
+#endif
         return;
     } else if (n2 == 8) {
-# ifndef BN_SQR_COMBA
+#ifndef BN_SQR_COMBA
         bn_sqr_normal(r, a, 8, t);
-# else
+#else
         bn_sqr_comba8(r, a);
-# endif
+#endif
         return;
     }
     if (n2 < BN_SQR_RECURSIVE_SIZE_NORMAL) {
diff --git a/crypto/bn/bn_sqrt.c b/crypto/bn/bn_sqrt.c
index 5c77e72132d42..4b4bc7d5d11a0 100644
--- a/crypto/bn/bn_sqrt.c
+++ b/crypto/bn/bn_sqrt.c
@@ -171,7 +171,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
      * find some y that is not a square.
      */
     if (!BN_copy(q, p))
-        goto end;               /* use 'q' as temp */
+        goto end; /* use 'q' as temp */
     q->neg = 0;
     i = 2;
     do {
@@ -186,7 +186,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
             if (!BN_priv_rand_ex(y, BN_num_bits(p), 0, 0, 0, ctx))
                 goto end;
             if (BN_ucmp(y, p) >= 0) {
-                if (!(p->neg ? BN_add : BN_sub) (y, y, p))
+                if (!(p->neg ? BN_add : BN_sub)(y, y, p))
                     goto end;
             }
             /* now 0 <= y < |p| */
@@ -203,8 +203,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
             ERR_raise(ERR_LIB_BN, BN_R_P_IS_NOT_PRIME);
             goto end;
         }
-    }
-    while (r == 1 && ++i < 82);
+    } while (r == 1 && ++i < 82);
 
     if (r != -1) {
         /*
@@ -255,7 +254,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
         goto end;
 
     /* x := a^((q-1)/2) */
-    if (BN_is_zero(t)) {        /* special case: p = 2^e + 1 */
+    if (BN_is_zero(t)) { /* special case: p = 2^e + 1 */
         if (!BN_nnmod(t, A, p, ctx))
             goto end;
         if (BN_is_zero(t)) {
@@ -339,7 +338,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
         e = i;
     }
 
- vrfy:
+vrfy:
     if (!err) {
         /*
          * verify the result -- the input might have been not a square (test
@@ -355,7 +354,7 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
         }
     }
 
- end:
+end:
     if (err) {
         if (ret != in)
             BN_clear_free(ret);
diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c
index ffb8fc61e0fe9..1cc30a56ddd5a 100644
--- a/crypto/bn/bn_srp.c
+++ b/crypto/bn/bn_srp.c
@@ -15,19 +15,19 @@
 #include <openssl/srp.h>
 #include "crypto/bn_srp.h"
 
-# if (BN_BYTES == 8)
-#  if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#   define bn_pack4(a1,a2,a3,a4) ((a1##UI64<<48)|(a2##UI64<<32)|(a3##UI64<<16)|a4##UI64)
-#  elif defined(__arch64__)
-#   define bn_pack4(a1,a2,a3,a4) ((a1##UL<<48)|(a2##UL<<32)|(a3##UL<<16)|a4##UL)
-#  else
-#   define bn_pack4(a1,a2,a3,a4) ((a1##ULL<<48)|(a2##ULL<<32)|(a3##ULL<<16)|a4##ULL)
-#  endif
-# elif (BN_BYTES == 4)
-#  define bn_pack4(a1,a2,a3,a4)  ((a3##UL<<16)|a4##UL), ((a1##UL<<16)|a2##UL)
-# else
-#  error "unsupported BN_BYTES"
-# endif
+#if (BN_BYTES == 8)
+#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
+#define bn_pack4(a1, a2, a3, a4) ((a1##UI64 << 48) | (a2##UI64 << 32) | (a3##UI64 << 16) | a4##UI64)
+#elif defined(__arch64__)
+#define bn_pack4(a1, a2, a3, a4) ((a1##UL << 48) | (a2##UL << 32) | (a3##UL << 16) | a4##UL)
+#else
+#define bn_pack4(a1, a2, a3, a4) ((a1##ULL << 48) | (a2##ULL << 32) | (a3##ULL << 16) | a4##ULL)
+#endif
+#elif (BN_BYTES == 4)
+#define bn_pack4(a1, a2, a3, a4) ((a3##UL << 16) | a4##UL), ((a1##UL << 16) | a2##UL)
+#else
+#error "unsupported BN_BYTES"
+#endif
 
 static const BN_ULONG bn_group_1024_value[] = {
     bn_pack4(0x9FC6, 0x1D2F, 0xC0EB, 0x06E3),
diff --git a/crypto/bn/bn_word.c b/crypto/bn/bn_word.c
index 93c014793e22c..80c5413e80871 100644
--- a/crypto/bn/bn_word.c
+++ b/crypto/bn/bn_word.c
@@ -51,8 +51,7 @@ BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w)
         ret = ((ret << BN_BITS4) | ((a->d[i] >> BN_BITS4) & BN_MASK2l)) % w;
         ret = ((ret << BN_BITS4) | (a->d[i] & BN_MASK2l)) % w;
 #else
-        ret = (BN_ULLONG) (((ret << (BN_ULLONG) BN_BITS2) | a->d[i]) %
-                           (BN_ULLONG) w);
+        ret = (BN_ULLONG)(((ret << (BN_ULLONG)BN_BITS2) | a->d[i]) % (BN_ULLONG)w);
 #endif
     }
     return (BN_ULONG)ret;
diff --git a/crypto/bn/bn_x931p.c b/crypto/bn/bn_x931p.c
index 20d35cf7afbd4..2a86f7391b1a8 100644
--- a/crypto/bn/bn_x931p.c
+++ b/crypto/bn/bn_x931p.c
@@ -21,7 +21,7 @@
  */
 
 static int bn_x931_derive_pi(BIGNUM *pi, const BIGNUM *Xpi, BN_CTX *ctx,
-                             BN_GENCB *cb)
+    BN_GENCB *cb)
 {
     int i = 0, is_prime;
     if (!BN_copy(pi, Xpi))
@@ -51,9 +51,9 @@ static int bn_x931_derive_pi(BIGNUM *pi, const BIGNUM *Xpi, BN_CTX *ctx,
  */
 
 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)
 {
     int ret = 0;
 
@@ -147,7 +147,7 @@ int BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
 
     ret = 1;
 
- err:
+err:
 
     BN_CTX_end(ctx);
 
@@ -176,7 +176,7 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx)
      * exceeded.
      */
     if (!BN_priv_rand_ex(Xp, nbits, BN_RAND_TOP_TWO, BN_RAND_BOTTOM_ANY, 0,
-                         ctx))
+            ctx))
         return 0;
 
     BN_CTX_start(ctx);
@@ -186,7 +186,7 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx)
 
     for (i = 0; i < 1000; i++) {
         if (!BN_priv_rand_ex(Xq, nbits, BN_RAND_TOP_TWO, BN_RAND_BOTTOM_ANY, 0,
-                             ctx))
+                ctx))
             goto err;
 
         /* Check that |Xp - Xq| > 2^(nbits - 100) */
@@ -203,7 +203,7 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx)
 
     return 0;
 
- err:
+err:
     BN_CTX_end(ctx);
     return 0;
 }
@@ -217,9 +217,9 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx)
  */
 
 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)
+    BIGNUM *Xp1, BIGNUM *Xp2,
+    const BIGNUM *Xp,
+    const BIGNUM *e, BN_CTX *ctx, BN_GENCB *cb)
 {
     int ret = 0;
 
@@ -240,9 +240,8 @@ int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
 
     ret = 1;
 
- error:
+error:
     BN_CTX_end(ctx);
 
     return ret;
-
 }
diff --git a/crypto/bn/rsaz_exp.c b/crypto/bn/rsaz_exp.c
index 80b583f35ae85..b52eacb44adc4 100644
--- a/crypto/bn/rsaz_exp.c
+++ b/crypto/bn/rsaz_exp.c
@@ -25,15 +25,15 @@ NON_EMPTY_TRANSLATION_UNIT
  */
 void rsaz_1024_norm2red_avx2(void *red, const void *norm);
 void rsaz_1024_mul_avx2(void *ret, const void *a, const void *b,
-                        const void *n, BN_ULONG k);
+    const void *n, BN_ULONG k);
 void rsaz_1024_sqr_avx2(void *ret, const void *a, const void *n, BN_ULONG k,
-                        int cnt);
+    int cnt);
 void rsaz_1024_scatter5_avx2(void *tbl, const void *val, int i);
 void rsaz_1024_gather5_avx2(void *val, const void *tbl, int i);
 void rsaz_1024_red2norm_avx2(void *norm, const void *red);
 
 #if defined(__SUNPRO_C)
-# pragma align 64(one,two80)
+#pragma align 64(one, two80)
 #endif
 
 ALIGN64 static const BN_ULONG one[40] = {
@@ -47,10 +47,10 @@ ALIGN64 static const BN_ULONG two80[40] = {
 };
 
 void RSAZ_1024_mod_exp_avx2(BN_ULONG result_norm[16],
-                            const BN_ULONG base_norm[16],
-                            const BN_ULONG exponent[16],
-                            const BN_ULONG m_norm[16], const BN_ULONG RR[16],
-                            BN_ULONG k0)
+    const BN_ULONG base_norm[16],
+    const BN_ULONG exponent[16],
+    const BN_ULONG m_norm[16], const BN_ULONG RR[16],
+    BN_ULONG k0)
 {
     unsigned char storage[320 * 3 + 32 * 9 * 16 + 64]; /* 5.5KB */
     unsigned char *p_str = storage + (64 - ((size_t)storage % 64));
@@ -64,9 +64,9 @@ void RSAZ_1024_mod_exp_avx2(BN_ULONG result_norm[16],
     if ((((size_t)p_str & 4095) + 320) >> 12) {
         result = p_str;
         a_inv = p_str + 320;
-        m = p_str + 320 * 2;    /* should not cross page */
+        m = p_str + 320 * 2; /* should not cross page */
     } else {
-        m = p_str;              /* should not cross page */
+        m = p_str; /* should not cross page */
         result = p_str + 320;
         a_inv = p_str + 320 * 2;
     }
@@ -206,7 +206,7 @@ void RSAZ_1024_mod_exp_avx2(BN_ULONG result_norm[16],
 
     index = 1014;
 
-    while (index > -1) {        /* loop for the remaining 127 windows */
+    while (index > -1) { /* loop for the remaining 127 windows */
 
         rsaz_1024_sqr_avx2(result, result, m, k0, 5);
 
@@ -241,20 +241,20 @@ void RSAZ_1024_mod_exp_avx2(BN_ULONG result_norm[16],
  * See crypto/bn/rsaz-x86_64.pl for further details.
  */
 void rsaz_512_mul(void *ret, const void *a, const void *b, const void *n,
-                  BN_ULONG k);
+    BN_ULONG k);
 void rsaz_512_mul_scatter4(void *ret, const void *a, const void *n,
-                           BN_ULONG k, const void *tbl, unsigned int power);
+    BN_ULONG k, const void *tbl, unsigned int power);
 void rsaz_512_mul_gather4(void *ret, const void *a, const void *tbl,
-                          const void *n, BN_ULONG k, unsigned int power);
+    const void *n, BN_ULONG k, unsigned int power);
 void rsaz_512_mul_by_one(void *ret, const void *a, const void *n, BN_ULONG k);
 void rsaz_512_sqr(void *ret, const void *a, const void *n, BN_ULONG k,
-                  int cnt);
+    int cnt);
 void rsaz_512_scatter4(void *tbl, const BN_ULONG *val, int power);
 void rsaz_512_gather4(BN_ULONG *val, const void *tbl, int power);
 
 void RSAZ_512_mod_exp(BN_ULONG result[8],
-                      const BN_ULONG base[8], const BN_ULONG exponent[8],
-                      const BN_ULONG m[8], BN_ULONG k0, const BN_ULONG RR[8])
+    const BN_ULONG base[8], const BN_ULONG exponent[8],
+    const BN_ULONG m[8], BN_ULONG k0, const BN_ULONG RR[8])
 {
     unsigned char storage[16 * 8 * 8 + 64 * 2 + 64]; /* 1.2KB */
     unsigned char *table = storage + (64 - ((size_t)storage % 64));
diff --git a/crypto/bn/rsaz_exp.h b/crypto/bn/rsaz_exp.h
index 49a0bf3bf1990..b3510c0a66e19 100644
--- a/crypto/bn/rsaz_exp.h
+++ b/crypto/bn/rsaz_exp.h
@@ -13,52 +13,49 @@
  */
 
 #ifndef OSSL_CRYPTO_BN_RSAZ_EXP_H
-# define OSSL_CRYPTO_BN_RSAZ_EXP_H
+#define OSSL_CRYPTO_BN_RSAZ_EXP_H
 
-# undef RSAZ_ENABLED
-# if defined(OPENSSL_BN_ASM_MONT) && \
-        (defined(__x86_64) || defined(__x86_64__) || \
-         defined(_M_AMD64) || defined(_M_X64))
-#  define RSAZ_ENABLED
+#undef RSAZ_ENABLED
+#if defined(OPENSSL_BN_ASM_MONT) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
+#define RSAZ_ENABLED
 
-#  include <openssl/bn.h>
-#  include "internal/constant_time.h"
-#  include "bn_local.h"
+#include <openssl/bn.h>
+#include "internal/constant_time.h"
+#include "bn_local.h"
 
 void RSAZ_1024_mod_exp_avx2(BN_ULONG result[16],
-                            const BN_ULONG base_norm[16],
-                            const BN_ULONG exponent[16],
-                            const BN_ULONG m_norm[16], const BN_ULONG RR[16],
-                            BN_ULONG k0);
+    const BN_ULONG base_norm[16],
+    const BN_ULONG exponent[16],
+    const BN_ULONG m_norm[16], const BN_ULONG RR[16],
+    BN_ULONG k0);
 int rsaz_avx2_eligible(void);
 
 void RSAZ_512_mod_exp(BN_ULONG result[8],
-                      const BN_ULONG base_norm[8], const BN_ULONG exponent[8],
-                      const BN_ULONG m_norm[8], BN_ULONG k0,
-                      const BN_ULONG RR[8]);
-
+    const BN_ULONG base_norm[8], const BN_ULONG exponent[8],
+    const BN_ULONG m_norm[8], BN_ULONG k0,
+    const BN_ULONG RR[8]);
 
 int ossl_rsaz_avx512ifma_eligible(void);
 
 int ossl_rsaz_avxifma_eligible(void);
 
 int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
-                                const BN_ULONG *base1,
-                                const BN_ULONG *exponent1,
-                                const BN_ULONG *m1,
-                                const BN_ULONG *RR1,
-                                BN_ULONG k0_1,
-                                BN_ULONG *res2,
-                                const BN_ULONG *base2,
-                                const BN_ULONG *exponent2,
-                                const BN_ULONG *m2,
-                                const BN_ULONG *RR2,
-                                BN_ULONG k0_2,
-                                int factor_size);
+    const BN_ULONG *base1,
+    const BN_ULONG *exponent1,
+    const BN_ULONG *m1,
+    const BN_ULONG *RR1,
+    BN_ULONG k0_1,
+    BN_ULONG *res2,
+    const BN_ULONG *base2,
+    const BN_ULONG *exponent2,
+    const BN_ULONG *m2,
+    const BN_ULONG *RR2,
+    BN_ULONG k0_2,
+    int factor_size);
 
 static ossl_inline void bn_select_words(BN_ULONG *r, BN_ULONG mask,
-                                        const BN_ULONG *a,
-                                        const BN_ULONG *b, size_t num)
+    const BN_ULONG *a,
+    const BN_ULONG *b, size_t num)
 {
     size_t i;
 
@@ -68,15 +65,15 @@ static ossl_inline void bn_select_words(BN_ULONG *r, BN_ULONG mask,
 }
 
 static ossl_inline BN_ULONG bn_reduce_once_in_place(BN_ULONG *r,
-                                                    BN_ULONG carry,
-                                                    const BN_ULONG *m,
-                                                    BN_ULONG *tmp, size_t num)
+    BN_ULONG carry,
+    const BN_ULONG *m,
+    BN_ULONG *tmp, size_t num)
 {
     carry -= bn_sub_words(tmp, r, m, num);
     bn_select_words(r, carry, r /* tmp < 0 */, tmp /* tmp >= 0 */, num);
     return carry;
 }
 
-# endif
+#endif
 
 #endif
diff --git a/crypto/bn/rsaz_exp_x2.c b/crypto/bn/rsaz_exp_x2.c
index e335462087353..70adf2294d089 100644
--- a/crypto/bn/rsaz_exp_x2.c
+++ b/crypto/bn/rsaz_exp_x2.c
@@ -21,28 +21,28 @@
 #ifndef RSAZ_ENABLED
 NON_EMPTY_TRANSLATION_UNIT
 #else
-# include <assert.h>
-# include <string.h>
+#include <assert.h>
+#include <string.h>
 
-# define ALIGN_OF(ptr, boundary) \
+#define ALIGN_OF(ptr, boundary) \
     ((unsigned char *)(ptr) + (boundary - (((size_t)(ptr)) & (boundary - 1))))
 
 /* Internal radix */
-# define DIGIT_SIZE (52)
+#define DIGIT_SIZE (52)
 /* 52-bit mask */
-# define DIGIT_MASK ((uint64_t)0xFFFFFFFFFFFFF)
+#define DIGIT_MASK ((uint64_t)0xFFFFFFFFFFFFF)
 
-# define BITS2WORD8_SIZE(x)  (((x) + 7) >> 3)
-# define BITS2WORD64_SIZE(x) (((x) + 63) >> 6)
+#define BITS2WORD8_SIZE(x) (((x) + 7) >> 3)
+#define BITS2WORD64_SIZE(x) (((x) + 63) >> 6)
 
 /* Number of registers required to hold |digits_num| amount of qword digits */
-# define NUMBER_OF_REGISTERS(digits_num, register_size)            \
+#define NUMBER_OF_REGISTERS(digits_num, register_size) \
     (((digits_num) * 64 + (register_size) - 1) / (register_size))
 
 static ossl_inline uint64_t get_digit(const uint8_t *in, int in_len);
 static ossl_inline void put_digit(uint8_t *out, int out_len, uint64_t digit);
 static void to_words52(BN_ULONG *out, int out_len, const BN_ULONG *in,
-                       int in_bitsize);
+    int in_bitsize);
 static void from_words52(BN_ULONG *bn_out, int out_bitsize, const BN_ULONG *in);
 static ossl_inline void set_bit(BN_ULONG *a, int idx);
 
@@ -66,99 +66,108 @@ static ossl_inline int number_of_digits(int bitsize, int digit_size)
  */
 
 void ossl_rsaz_amm52x20_x1_ifma256(BN_ULONG *res, const BN_ULONG *a,
-                                   const BN_ULONG *b, const BN_ULONG *m,
-                                   BN_ULONG k0);
+    const BN_ULONG *b, const BN_ULONG *m,
+    BN_ULONG k0);
 void ossl_rsaz_amm52x20_x2_ifma256(BN_ULONG *out, const BN_ULONG *a,
-                                   const BN_ULONG *b, const BN_ULONG *m,
-                                   const BN_ULONG k0[2]);
+    const BN_ULONG *b, const BN_ULONG *m,
+    const BN_ULONG k0[2]);
 void ossl_extract_multiplier_2x20_win5(BN_ULONG *red_Y,
-                                       const BN_ULONG *red_table,
-                                       int red_table_idx1, int red_table_idx2);
+    const BN_ULONG *red_table,
+    int red_table_idx1, int red_table_idx2);
 
 void ossl_rsaz_amm52x30_x1_ifma256(BN_ULONG *res, const BN_ULONG *a,
-                                   const BN_ULONG *b, const BN_ULONG *m,
-                                   BN_ULONG k0);
+    const BN_ULONG *b, const BN_ULONG *m,
+    BN_ULONG k0);
 void ossl_rsaz_amm52x30_x2_ifma256(BN_ULONG *out, const BN_ULONG *a,
-                                   const BN_ULONG *b, const BN_ULONG *m,
-                                   const BN_ULONG k0[2]);
+    const BN_ULONG *b, const BN_ULONG *m,
+    const BN_ULONG k0[2]);
 void ossl_extract_multiplier_2x30_win5(BN_ULONG *red_Y,
-                                       const BN_ULONG *red_table,
-                                       int red_table_idx1, int red_table_idx2);
+    const BN_ULONG *red_table,
+    int red_table_idx1, int red_table_idx2);
 
 void ossl_rsaz_amm52x40_x1_ifma256(BN_ULONG *res, const BN_ULONG *a,
-                                   const BN_ULONG *b, const BN_ULONG *m,
-                                   BN_ULONG k0);
+    const BN_ULONG *b, const BN_ULONG *m,
+    BN_ULONG k0);
 void ossl_rsaz_amm52x40_x2_ifma256(BN_ULONG *out, const BN_ULONG *a,
-                                   const BN_ULONG *b, const BN_ULONG *m,
-                                   const BN_ULONG k0[2]);
+    const BN_ULONG *b, const BN_ULONG *m,
+    const BN_ULONG k0[2]);
 void ossl_extract_multiplier_2x40_win5(BN_ULONG *red_Y,
-                                       const BN_ULONG *red_table,
-                                       int red_table_idx1, int red_table_idx2);
+    const BN_ULONG *red_table,
+    int red_table_idx1, int red_table_idx2);
 
 void ossl_rsaz_amm52x20_x1_avxifma256(BN_ULONG *res, const BN_ULONG *a,
-                                      const BN_ULONG *b, const BN_ULONG *m,
-                                      BN_ULONG k0);
+    const BN_ULONG *b, const BN_ULONG *m,
+    BN_ULONG k0);
 void ossl_rsaz_amm52x20_x2_avxifma256(BN_ULONG *out, const BN_ULONG *a,
-                                      const BN_ULONG *b, const BN_ULONG *m,
-                                      const BN_ULONG k0[2]);
+    const BN_ULONG *b, const BN_ULONG *m,
+    const BN_ULONG k0[2]);
 void ossl_extract_multiplier_2x20_win5_avx(BN_ULONG *red_Y,
-                                           const BN_ULONG *red_table,
-                                           int red_table_idx1,
-                                           int red_table_idx2);
+    const BN_ULONG *red_table,
+    int red_table_idx1,
+    int red_table_idx2);
 
 void ossl_rsaz_amm52x30_x1_avxifma256(BN_ULONG *res, const BN_ULONG *a,
-                                      const BN_ULONG *b, const BN_ULONG *m,
-                                      BN_ULONG k0);
+    const BN_ULONG *b, const BN_ULONG *m,
+    BN_ULONG k0);
 void ossl_rsaz_amm52x30_x2_avxifma256(BN_ULONG *out, const BN_ULONG *a,
-                                      const BN_ULONG *b, const BN_ULONG *m,
-                                      const BN_ULONG k0[2]);
+    const BN_ULONG *b, const BN_ULONG *m,
+    const BN_ULONG k0[2]);
 void ossl_extract_multiplier_2x30_win5_avx(BN_ULONG *red_Y,
-                                           const BN_ULONG *red_table,
-                                           int red_table_idx1,
-                                           int red_table_idx2);
+    const BN_ULONG *red_table,
+    int red_table_idx1,
+    int red_table_idx2);
 
 void ossl_rsaz_amm52x40_x1_avxifma256(BN_ULONG *res, const BN_ULONG *a,
-                                      const BN_ULONG *b, const BN_ULONG *m,
-                                      BN_ULONG k0);
+    const BN_ULONG *b, const BN_ULONG *m,
+    BN_ULONG k0);
 void ossl_rsaz_amm52x40_x2_avxifma256(BN_ULONG *out, const BN_ULONG *a,
-                                      const BN_ULONG *b, const BN_ULONG *m,
-                                      const BN_ULONG k0[2]);
+    const BN_ULONG *b, const BN_ULONG *m,
+    const BN_ULONG k0[2]);
 void ossl_extract_multiplier_2x40_win5_avx(BN_ULONG *red_Y,
-                                           const BN_ULONG *red_table,
-                                           int red_table_idx1,
-                                           int red_table_idx2);
+    const BN_ULONG *red_table,
+    int red_table_idx1,
+    int red_table_idx2);
 
 typedef void (*AMM)(BN_ULONG *res, const BN_ULONG *a, const BN_ULONG *b,
-                    const BN_ULONG *m, BN_ULONG k0);
+    const BN_ULONG *m, BN_ULONG k0);
 
 static AMM ossl_rsaz_amm52_x1[] = {
-    ossl_rsaz_amm52x20_x1_avxifma256, ossl_rsaz_amm52x20_x1_ifma256,
-    ossl_rsaz_amm52x30_x1_avxifma256, ossl_rsaz_amm52x30_x1_ifma256,
-    ossl_rsaz_amm52x40_x1_avxifma256, ossl_rsaz_amm52x40_x1_ifma256,
+    ossl_rsaz_amm52x20_x1_avxifma256,
+    ossl_rsaz_amm52x20_x1_ifma256,
+    ossl_rsaz_amm52x30_x1_avxifma256,
+    ossl_rsaz_amm52x30_x1_ifma256,
+    ossl_rsaz_amm52x40_x1_avxifma256,
+    ossl_rsaz_amm52x40_x1_ifma256,
 };
 
 typedef void (*DAMM)(BN_ULONG *res, const BN_ULONG *a, const BN_ULONG *b,
-                     const BN_ULONG *m, const BN_ULONG k0[2]);
+    const BN_ULONG *m, const BN_ULONG k0[2]);
 
 static DAMM ossl_rsaz_amm52_x2[] = {
-    ossl_rsaz_amm52x20_x2_avxifma256, ossl_rsaz_amm52x20_x2_ifma256,
-    ossl_rsaz_amm52x30_x2_avxifma256, ossl_rsaz_amm52x30_x2_ifma256,
-    ossl_rsaz_amm52x40_x2_avxifma256, ossl_rsaz_amm52x40_x2_ifma256,
+    ossl_rsaz_amm52x20_x2_avxifma256,
+    ossl_rsaz_amm52x20_x2_ifma256,
+    ossl_rsaz_amm52x30_x2_avxifma256,
+    ossl_rsaz_amm52x30_x2_ifma256,
+    ossl_rsaz_amm52x40_x2_avxifma256,
+    ossl_rsaz_amm52x40_x2_ifma256,
 };
 
 typedef void (*DEXTRACT)(BN_ULONG *res, const BN_ULONG *red_table,
-                         int red_table_idx, int tbl_idx);
+    int red_table_idx, int tbl_idx);
 
 static DEXTRACT ossl_extract_multiplier_win5[] = {
-    ossl_extract_multiplier_2x20_win5_avx, ossl_extract_multiplier_2x20_win5,
-    ossl_extract_multiplier_2x30_win5_avx, ossl_extract_multiplier_2x30_win5,
-    ossl_extract_multiplier_2x40_win5_avx, ossl_extract_multiplier_2x40_win5,
+    ossl_extract_multiplier_2x20_win5_avx,
+    ossl_extract_multiplier_2x20_win5,
+    ossl_extract_multiplier_2x30_win5_avx,
+    ossl_extract_multiplier_2x30_win5,
+    ossl_extract_multiplier_2x40_win5_avx,
+    ossl_extract_multiplier_2x40_win5,
 };
 
 static int RSAZ_mod_exp_x2_ifma256(BN_ULONG *res, const BN_ULONG *base,
-                                   const BN_ULONG *exp[2], const BN_ULONG *m,
-                                   const BN_ULONG *rr, const BN_ULONG k0[2],
-                                   int modulus_bitsize);
+    const BN_ULONG *exp[2], const BN_ULONG *m,
+    const BN_ULONG *rr, const BN_ULONG k0[2],
+    int modulus_bitsize);
 
 /*
  * Dual Montgomery modular exponentiation using prime moduli of the
@@ -190,18 +199,18 @@ static int RSAZ_mod_exp_x2_ifma256(BN_ULONG *res, const BN_ULONG *base,
  *         1 in case of success.
  */
 int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
-                                const BN_ULONG *base1,
-                                const BN_ULONG *exp1,
-                                const BN_ULONG *m1,
-                                const BN_ULONG *rr1,
-                                BN_ULONG k0_1,
-                                BN_ULONG *res2,
-                                const BN_ULONG *base2,
-                                const BN_ULONG *exp2,
-                                const BN_ULONG *m2,
-                                const BN_ULONG *rr2,
-                                BN_ULONG k0_2,
-                                int factor_size)
+    const BN_ULONG *base1,
+    const BN_ULONG *exp1,
+    const BN_ULONG *m1,
+    const BN_ULONG *rr1,
+    BN_ULONG k0_1,
+    BN_ULONG *res2,
+    const BN_ULONG *base2,
+    const BN_ULONG *exp2,
+    const BN_ULONG *m2,
+    const BN_ULONG *rr2,
+    BN_ULONG k0_2,
+    int factor_size)
 {
     int ret = 0;
 
@@ -223,10 +232,10 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
     BN_ULONG *storage = NULL;
     BN_ULONG *storage_aligned = NULL;
     int storage_len_bytes = 7 * regs_capacity * sizeof(BN_ULONG)
-                           + 64 /* alignment */;
+        + 64 /* alignment */;
 
-    const BN_ULONG *exp[2] = {0};
-    BN_ULONG k0[2] = {0};
+    const BN_ULONG *exp[2] = { 0 };
+    BN_ULONG k0[2] = { 0 };
     /* AMM = Almost Montgomery Multiplication */
     AMM amm = NULL;
     int avx512ifma = !!ossl_rsaz_avx512ifma_eligible();
@@ -244,19 +253,19 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
     /* Memory layout for red(undant) representations */
     base1_red = storage_aligned;
     base2_red = storage_aligned + 1 * regs_capacity;
-    m1_red    = storage_aligned + 2 * regs_capacity;
-    m2_red    = storage_aligned + 3 * regs_capacity;
-    rr1_red   = storage_aligned + 4 * regs_capacity;
-    rr2_red   = storage_aligned + 5 * regs_capacity;
+    m1_red = storage_aligned + 2 * regs_capacity;
+    m2_red = storage_aligned + 3 * regs_capacity;
+    rr1_red = storage_aligned + 4 * regs_capacity;
+    rr2_red = storage_aligned + 5 * regs_capacity;
     coeff_red = storage_aligned + 6 * regs_capacity;
 
     /* Convert base_i, m_i, rr_i, from regular to 52-bit radix */
     to_words52(base1_red, regs_capacity, base1, factor_size);
     to_words52(base2_red, regs_capacity, base2, factor_size);
-    to_words52(m1_red,    regs_capacity, m1,    factor_size);
-    to_words52(m2_red,    regs_capacity, m2,    factor_size);
-    to_words52(rr1_red,   regs_capacity, rr1,   factor_size);
-    to_words52(rr2_red,   regs_capacity, rr2,   factor_size);
+    to_words52(m1_red, regs_capacity, m1, factor_size);
+    to_words52(m2_red, regs_capacity, m2, factor_size);
+    to_words52(rr1_red, regs_capacity, rr1, factor_size);
+    to_words52(rr2_red, regs_capacity, rr2, factor_size);
 
     /*
      * Compute target domain Montgomery converters RR' for each modulus
@@ -278,11 +287,11 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
     /* (1) in reduced domain representation */
     set_bit(coeff_red, 64 * (int)(coeff_pow / 52) + coeff_pow % 52);
 
-    amm(rr1_red, rr1_red, rr1_red, m1_red, k0_1);     /* (2) for m1 */
-    amm(rr1_red, rr1_red, coeff_red, m1_red, k0_1);   /* (3) for m1 */
+    amm(rr1_red, rr1_red, rr1_red, m1_red, k0_1); /* (2) for m1 */
+    amm(rr1_red, rr1_red, coeff_red, m1_red, k0_1); /* (3) for m1 */
 
-    amm(rr2_red, rr2_red, rr2_red, m2_red, k0_2);     /* (2) for m2 */
-    amm(rr2_red, rr2_red, coeff_red, m2_red, k0_2);   /* (3) for m2 */
+    amm(rr2_red, rr2_red, rr2_red, m2_red, k0_2); /* (2) for m2 */
+    amm(rr2_red, rr2_red, coeff_red, m2_red, k0_2); /* (3) for m2 */
 
     exp[0] = exp1;
     exp[1] = exp2;
@@ -292,7 +301,7 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
 
     /* Dual (2-exps in parallel) exponentiation */
     ret = RSAZ_mod_exp_x2_ifma256(rr1_red, base1_red, exp, m1_red, rr1_red,
-                                  k0, factor_size);
+        k0, factor_size);
     if (!ret)
         goto err;
 
@@ -337,12 +346,12 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1,
  * \return (void).
  */
 int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
-                            const BN_ULONG *base,
-                            const BN_ULONG *exp[2],
-                            const BN_ULONG *m,
-                            const BN_ULONG *rr,
-                            const BN_ULONG k0[2],
-                            int modulus_bitsize)
+    const BN_ULONG *base,
+    const BN_ULONG *exp[2],
+    const BN_ULONG *m,
+    const BN_ULONG *rr,
+    const BN_ULONG k0[2],
+    int modulus_bitsize)
 {
     int ret = 0;
     int idx;
@@ -352,9 +361,9 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
     int exp_win_mask = (1U << exp_win_size) - 1;
 
     /*
-    * Number of digits (64-bit words) in redundant representation to handle
-    * modulus bits
-    */
+     * Number of digits (64-bit words) in redundant representation to handle
+     * modulus bits
+     */
     int red_digits = 0;
     int exp_digits = 0;
 
@@ -363,12 +372,12 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
     int storage_len_bytes = 0;
 
     /* Red(undant) result Y and multiplier X */
-    BN_ULONG *red_Y = NULL;     /* [2][red_digits] */
-    BN_ULONG *red_X = NULL;     /* [2][red_digits] */
+    BN_ULONG *red_Y = NULL; /* [2][red_digits] */
+    BN_ULONG *red_X = NULL; /* [2][red_digits] */
     /* Pre-computed table of base powers */
     BN_ULONG *red_table = NULL; /* [1U << exp_win_size][2][red_digits] */
     /* Expanded exponent */
-    BN_ULONG *expz = NULL;      /* [2][exp_digits + 1] */
+    BN_ULONG *expz = NULL; /* [2][exp_digits + 1] */
 
     /* Dual AMM */
     DAMM damm = NULL;
@@ -380,7 +389,7 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
  * Squaring is done using multiplication now. That can be a subject of
  * optimization in future.
  */
-# define DAMS(r,a,m,k0) damm((r),(a),(a),(m),(k0))
+#define DAMS(r, a, m, k0) damm((r), (a), (a), (m), (k0))
 
     if (modulus_bitsize != 1024 && modulus_bitsize != 1536 && modulus_bitsize != 2048)
         goto err;
@@ -406,22 +415,22 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
         goto err;
     }
 
-    storage_len_bytes = (2 * red_digits                         /* red_Y     */
-                       + 2 * red_digits                         /* red_X     */
-                       + 2 * red_digits * (1U << exp_win_size)  /* red_table */
-                       + 2 * (exp_digits + 1))                  /* expz      */
-                       * sizeof(BN_ULONG)
-                       + 64;                                    /* alignment */
+    storage_len_bytes = (2 * red_digits /* red_Y     */
+                            + 2 * red_digits /* red_X     */
+                            + 2 * red_digits * (1U << exp_win_size) /* red_table */
+                            + 2 * (exp_digits + 1)) /* expz      */
+            * sizeof(BN_ULONG)
+        + 64; /* alignment */
 
     storage = (BN_ULONG *)OPENSSL_zalloc(storage_len_bytes);
     if (storage == NULL)
         goto err;
     storage_aligned = (BN_ULONG *)ALIGN_OF(storage, 64);
 
-    red_Y     = storage_aligned;
-    red_X     = red_Y + 2 * red_digits;
+    red_Y = storage_aligned;
+    red_X = red_Y + 2 * red_digits;
     red_table = red_X + 2 * red_digits;
-    expz      = red_table + 2 * red_digits * (1U << exp_win_size);
+    expz = red_table + 2 * red_digits * (1U << exp_win_size);
 
     /*
      * Compute table of powers base^i, i = 0, ..., (2^EXP_WIN_SIZE) - 1
@@ -430,15 +439,15 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
      */
     red_X[0 * red_digits] = 1;
     red_X[1 * red_digits] = 1;
-    damm(&red_table[0 * 2 * red_digits], (const BN_ULONG*)red_X, rr, m, k0);
-    damm(&red_table[1 * 2 * red_digits], base,  rr, m, k0);
+    damm(&red_table[0 * 2 * red_digits], (const BN_ULONG *)red_X, rr, m, k0);
+    damm(&red_table[1 * 2 * red_digits], base, rr, m, k0);
 
     for (idx = 1; idx < (int)((1U << exp_win_size) / 2); idx++) {
         DAMS(&red_table[(2 * idx + 0) * 2 * red_digits],
-             &red_table[(1 * idx)     * 2 * red_digits], m, k0);
+            &red_table[(1 * idx) * 2 * red_digits], m, k0);
         damm(&red_table[(2 * idx + 1) * 2 * red_digits],
-             &red_table[(2 * idx)     * 2 * red_digits],
-             &red_table[1 * 2 * red_digits], m, k0);
+            &red_table[(2 * idx) * 2 * red_digits],
+            &red_table[1 * 2 * red_digits], m, k0);
     }
 
     /* Copy and expand exponents */
@@ -479,7 +488,7 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
         red_table_idx_0 >>= exp_chunk_shift;
         red_table_idx_1 >>= exp_chunk_shift;
 
-        extract(&red_Y[0 * red_digits], (const BN_ULONG*)red_table, (int)red_table_idx_0, (int)red_table_idx_1);
+        extract(&red_Y[0 * red_digits], (const BN_ULONG *)red_table, (int)red_table_idx_0, (int)red_table_idx_1);
 
         /* Process other exp windows */
         for (exp_bit_no -= exp_win_size; exp_bit_no >= 0; exp_bit_no -= exp_win_size) {
@@ -520,17 +529,17 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
                     red_table_idx_1 &= table_idx_mask;
                 }
 
-                extract(&red_X[0 * red_digits], (const BN_ULONG*)red_table, (int)red_table_idx_0, (int)red_table_idx_1);
+                extract(&red_X[0 * red_digits], (const BN_ULONG *)red_table, (int)red_table_idx_0, (int)red_table_idx_1);
             }
 
             /* Series of squaring */
-            DAMS((BN_ULONG*)red_Y, (const BN_ULONG*)red_Y, m, k0);
-            DAMS((BN_ULONG*)red_Y, (const BN_ULONG*)red_Y, m, k0);
-            DAMS((BN_ULONG*)red_Y, (const BN_ULONG*)red_Y, m, k0);
-            DAMS((BN_ULONG*)red_Y, (const BN_ULONG*)red_Y, m, k0);
-            DAMS((BN_ULONG*)red_Y, (const BN_ULONG*)red_Y, m, k0);
+            DAMS((BN_ULONG *)red_Y, (const BN_ULONG *)red_Y, m, k0);
+            DAMS((BN_ULONG *)red_Y, (const BN_ULONG *)red_Y, m, k0);
+            DAMS((BN_ULONG *)red_Y, (const BN_ULONG *)red_Y, m, k0);
+            DAMS((BN_ULONG *)red_Y, (const BN_ULONG *)red_Y, m, k0);
+            DAMS((BN_ULONG *)red_Y, (const BN_ULONG *)red_Y, m, k0);
 
-            damm((BN_ULONG*)red_Y, (const BN_ULONG*)red_Y, (const BN_ULONG*)red_X, m, k0);
+            damm((BN_ULONG *)red_Y, (const BN_ULONG *)red_Y, (const BN_ULONG *)red_X, m, k0);
         }
     }
 
@@ -549,7 +558,7 @@ int RSAZ_mod_exp_x2_ifma256(BN_ULONG *out,
     memset(red_X, 0, 2 * red_digits * sizeof(BN_ULONG));
     red_X[0 * red_digits] = 1;
     red_X[1 * red_digits] = 1;
-    damm(out, (const BN_ULONG*)red_Y, (const BN_ULONG*)red_X, m, k0);
+    damm(out, (const BN_ULONG *)red_Y, (const BN_ULONG *)red_X, m, k0);
 
     ret = 1;
 
@@ -583,7 +592,7 @@ static ossl_inline uint64_t get_digit(const uint8_t *in, int in_len)
  * words in redundant (base=2^52) one.
  */
 static void to_words52(BN_ULONG *out, int out_len,
-                       const BN_ULONG *in, int in_bitsize)
+    const BN_ULONG *in, int in_bitsize)
 {
     uint8_t *in_str = NULL;
 
@@ -655,7 +664,7 @@ static void from_words52(BN_ULONG *out, int out_bitsize, const BN_ULONG *in)
         uint8_t *out_str = (uint8_t *)out;
 
         for (; out_bitsize >= (2 * DIGIT_SIZE);
-               out_bitsize -= (2 * DIGIT_SIZE), in += 2) {
+            out_bitsize -= (2 * DIGIT_SIZE), in += 2) {
             uint64_t digit;
 
             digit = in[0];
@@ -671,7 +680,7 @@ static void from_words52(BN_ULONG *out, int out_bitsize, const BN_ULONG *in)
             out_str += 6;
             out_bitsize -= DIGIT_SIZE;
             put_digit(out_str, BITS2WORD8_SIZE(out_bitsize),
-                        (in[1] << 4 | in[0] >> 48));
+                (in[1] << 4 | in[0] >> 48));
         } else if (out_bitsize) {
             put_digit(out_str, BITS2WORD8_SIZE(out_bitsize), in[0]);
         }
diff --git a/crypto/bsearch.c b/crypto/bsearch.c
index f812c4f8ef0f9..192ccbeb916f5 100644
--- a/crypto/bsearch.c
+++ b/crypto/bsearch.c
@@ -11,8 +11,8 @@
 #include "internal/cryptlib.h"
 
 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)
 {
     const char *base_ = base;
     int l, h, i = 0, c = 0;
@@ -25,7 +25,7 @@ const void *ossl_bsearch(const void *key, const void *base, int num,
     while (l < h) {
         i = (l + h) / 2;
         p = &(base_[i * size]);
-        c = (*cmp) (key, p);
+        c = (*cmp)(key, p);
         if (c < 0)
             h = i;
         else if (c > 0)
@@ -36,7 +36,7 @@ const void *ossl_bsearch(const void *key, const void *base, int num,
     if (c != 0 && !(flags & OSSL_BSEARCH_VALUE_ON_NOMATCH))
         p = NULL;
     else if (c == 0 && (flags & OSSL_BSEARCH_FIRST_VALUE_ON_MATCH)) {
-        while (i > 0 && (*cmp) (key, &(base_[(i - 1) * size])) == 0)
+        while (i > 0 && (*cmp)(key, &(base_[(i - 1) * size])) == 0)
             i--;
         p = &(base_[i * size]);
     }
diff --git a/crypto/buffer/buf_err.c b/crypto/buffer/buf_err.c
index 9233b0a23c17e..32209c0829800 100644
--- a/crypto/buffer/buf_err.c
+++ b/crypto/buffer/buf_err.c
@@ -15,7 +15,7 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA BUF_str_reasons[] = {
-    {0, NULL}
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/camellia/camellia.c b/crypto/camellia/camellia.c
index a4de9f891ab86..cd9521a019fe3 100644
--- a/crypto/camellia/camellia.c
+++ b/crypto/camellia/camellia.c
@@ -50,11 +50,11 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define RightRotate(x, s) ( ((x) >> (s)) + ((x) << (32 - s)) )
-#define LeftRotate(x, s)  ( ((x) << (s)) + ((x) >> (32 - s)) )
+#define RightRotate(x, s) (((x) >> (s)) + ((x) << (32 - s)))
+#define LeftRotate(x, s) (((x) << (s)) + ((x) >> (32 - s)))
 
-#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))
 
 /* S-box data */
 #define SBOX1_1110 Camellia_SBOX[0]
@@ -62,178 +62,178 @@
 #define SBOX2_0222 Camellia_SBOX[2]
 #define SBOX3_3033 Camellia_SBOX[3]
 static const u32 Camellia_SBOX[][256] = {
-    {0x70707000, 0x82828200, 0x2c2c2c00, 0xececec00, 0xb3b3b300, 0x27272700,
-     0xc0c0c000, 0xe5e5e500, 0xe4e4e400, 0x85858500, 0x57575700, 0x35353500,
-     0xeaeaea00, 0x0c0c0c00, 0xaeaeae00, 0x41414100, 0x23232300, 0xefefef00,
-     0x6b6b6b00, 0x93939300, 0x45454500, 0x19191900, 0xa5a5a500, 0x21212100,
-     0xededed00, 0x0e0e0e00, 0x4f4f4f00, 0x4e4e4e00, 0x1d1d1d00, 0x65656500,
-     0x92929200, 0xbdbdbd00, 0x86868600, 0xb8b8b800, 0xafafaf00, 0x8f8f8f00,
-     0x7c7c7c00, 0xebebeb00, 0x1f1f1f00, 0xcecece00, 0x3e3e3e00, 0x30303000,
-     0xdcdcdc00, 0x5f5f5f00, 0x5e5e5e00, 0xc5c5c500, 0x0b0b0b00, 0x1a1a1a00,
-     0xa6a6a600, 0xe1e1e100, 0x39393900, 0xcacaca00, 0xd5d5d500, 0x47474700,
-     0x5d5d5d00, 0x3d3d3d00, 0xd9d9d900, 0x01010100, 0x5a5a5a00, 0xd6d6d600,
-     0x51515100, 0x56565600, 0x6c6c6c00, 0x4d4d4d00, 0x8b8b8b00, 0x0d0d0d00,
-     0x9a9a9a00, 0x66666600, 0xfbfbfb00, 0xcccccc00, 0xb0b0b000, 0x2d2d2d00,
-     0x74747400, 0x12121200, 0x2b2b2b00, 0x20202000, 0xf0f0f000, 0xb1b1b100,
-     0x84848400, 0x99999900, 0xdfdfdf00, 0x4c4c4c00, 0xcbcbcb00, 0xc2c2c200,
-     0x34343400, 0x7e7e7e00, 0x76767600, 0x05050500, 0x6d6d6d00, 0xb7b7b700,
-     0xa9a9a900, 0x31313100, 0xd1d1d100, 0x17171700, 0x04040400, 0xd7d7d700,
-     0x14141400, 0x58585800, 0x3a3a3a00, 0x61616100, 0xdedede00, 0x1b1b1b00,
-     0x11111100, 0x1c1c1c00, 0x32323200, 0x0f0f0f00, 0x9c9c9c00, 0x16161600,
-     0x53535300, 0x18181800, 0xf2f2f200, 0x22222200, 0xfefefe00, 0x44444400,
-     0xcfcfcf00, 0xb2b2b200, 0xc3c3c300, 0xb5b5b500, 0x7a7a7a00, 0x91919100,
-     0x24242400, 0x08080800, 0xe8e8e800, 0xa8a8a800, 0x60606000, 0xfcfcfc00,
-     0x69696900, 0x50505000, 0xaaaaaa00, 0xd0d0d000, 0xa0a0a000, 0x7d7d7d00,
-     0xa1a1a100, 0x89898900, 0x62626200, 0x97979700, 0x54545400, 0x5b5b5b00,
-     0x1e1e1e00, 0x95959500, 0xe0e0e000, 0xffffff00, 0x64646400, 0xd2d2d200,
-     0x10101000, 0xc4c4c400, 0x00000000, 0x48484800, 0xa3a3a300, 0xf7f7f700,
-     0x75757500, 0xdbdbdb00, 0x8a8a8a00, 0x03030300, 0xe6e6e600, 0xdadada00,
-     0x09090900, 0x3f3f3f00, 0xdddddd00, 0x94949400, 0x87878700, 0x5c5c5c00,
-     0x83838300, 0x02020200, 0xcdcdcd00, 0x4a4a4a00, 0x90909000, 0x33333300,
-     0x73737300, 0x67676700, 0xf6f6f600, 0xf3f3f300, 0x9d9d9d00, 0x7f7f7f00,
-     0xbfbfbf00, 0xe2e2e200, 0x52525200, 0x9b9b9b00, 0xd8d8d800, 0x26262600,
-     0xc8c8c800, 0x37373700, 0xc6c6c600, 0x3b3b3b00, 0x81818100, 0x96969600,
-     0x6f6f6f00, 0x4b4b4b00, 0x13131300, 0xbebebe00, 0x63636300, 0x2e2e2e00,
-     0xe9e9e900, 0x79797900, 0xa7a7a700, 0x8c8c8c00, 0x9f9f9f00, 0x6e6e6e00,
-     0xbcbcbc00, 0x8e8e8e00, 0x29292900, 0xf5f5f500, 0xf9f9f900, 0xb6b6b600,
-     0x2f2f2f00, 0xfdfdfd00, 0xb4b4b400, 0x59595900, 0x78787800, 0x98989800,
-     0x06060600, 0x6a6a6a00, 0xe7e7e700, 0x46464600, 0x71717100, 0xbababa00,
-     0xd4d4d400, 0x25252500, 0xababab00, 0x42424200, 0x88888800, 0xa2a2a200,
-     0x8d8d8d00, 0xfafafa00, 0x72727200, 0x07070700, 0xb9b9b900, 0x55555500,
-     0xf8f8f800, 0xeeeeee00, 0xacacac00, 0x0a0a0a00, 0x36363600, 0x49494900,
-     0x2a2a2a00, 0x68686800, 0x3c3c3c00, 0x38383800, 0xf1f1f100, 0xa4a4a400,
-     0x40404000, 0x28282800, 0xd3d3d300, 0x7b7b7b00, 0xbbbbbb00, 0xc9c9c900,
-     0x43434300, 0xc1c1c100, 0x15151500, 0xe3e3e300, 0xadadad00, 0xf4f4f400,
-     0x77777700, 0xc7c7c700, 0x80808000, 0x9e9e9e00},
-    {0x70700070, 0x2c2c002c, 0xb3b300b3, 0xc0c000c0, 0xe4e400e4, 0x57570057,
-     0xeaea00ea, 0xaeae00ae, 0x23230023, 0x6b6b006b, 0x45450045, 0xa5a500a5,
-     0xeded00ed, 0x4f4f004f, 0x1d1d001d, 0x92920092, 0x86860086, 0xafaf00af,
-     0x7c7c007c, 0x1f1f001f, 0x3e3e003e, 0xdcdc00dc, 0x5e5e005e, 0x0b0b000b,
-     0xa6a600a6, 0x39390039, 0xd5d500d5, 0x5d5d005d, 0xd9d900d9, 0x5a5a005a,
-     0x51510051, 0x6c6c006c, 0x8b8b008b, 0x9a9a009a, 0xfbfb00fb, 0xb0b000b0,
-     0x74740074, 0x2b2b002b, 0xf0f000f0, 0x84840084, 0xdfdf00df, 0xcbcb00cb,
-     0x34340034, 0x76760076, 0x6d6d006d, 0xa9a900a9, 0xd1d100d1, 0x04040004,
-     0x14140014, 0x3a3a003a, 0xdede00de, 0x11110011, 0x32320032, 0x9c9c009c,
-     0x53530053, 0xf2f200f2, 0xfefe00fe, 0xcfcf00cf, 0xc3c300c3, 0x7a7a007a,
-     0x24240024, 0xe8e800e8, 0x60600060, 0x69690069, 0xaaaa00aa, 0xa0a000a0,
-     0xa1a100a1, 0x62620062, 0x54540054, 0x1e1e001e, 0xe0e000e0, 0x64640064,
-     0x10100010, 0x00000000, 0xa3a300a3, 0x75750075, 0x8a8a008a, 0xe6e600e6,
-     0x09090009, 0xdddd00dd, 0x87870087, 0x83830083, 0xcdcd00cd, 0x90900090,
-     0x73730073, 0xf6f600f6, 0x9d9d009d, 0xbfbf00bf, 0x52520052, 0xd8d800d8,
-     0xc8c800c8, 0xc6c600c6, 0x81810081, 0x6f6f006f, 0x13130013, 0x63630063,
-     0xe9e900e9, 0xa7a700a7, 0x9f9f009f, 0xbcbc00bc, 0x29290029, 0xf9f900f9,
-     0x2f2f002f, 0xb4b400b4, 0x78780078, 0x06060006, 0xe7e700e7, 0x71710071,
-     0xd4d400d4, 0xabab00ab, 0x88880088, 0x8d8d008d, 0x72720072, 0xb9b900b9,
-     0xf8f800f8, 0xacac00ac, 0x36360036, 0x2a2a002a, 0x3c3c003c, 0xf1f100f1,
-     0x40400040, 0xd3d300d3, 0xbbbb00bb, 0x43430043, 0x15150015, 0xadad00ad,
-     0x77770077, 0x80800080, 0x82820082, 0xecec00ec, 0x27270027, 0xe5e500e5,
-     0x85850085, 0x35350035, 0x0c0c000c, 0x41410041, 0xefef00ef, 0x93930093,
-     0x19190019, 0x21210021, 0x0e0e000e, 0x4e4e004e, 0x65650065, 0xbdbd00bd,
-     0xb8b800b8, 0x8f8f008f, 0xebeb00eb, 0xcece00ce, 0x30300030, 0x5f5f005f,
-     0xc5c500c5, 0x1a1a001a, 0xe1e100e1, 0xcaca00ca, 0x47470047, 0x3d3d003d,
-     0x01010001, 0xd6d600d6, 0x56560056, 0x4d4d004d, 0x0d0d000d, 0x66660066,
-     0xcccc00cc, 0x2d2d002d, 0x12120012, 0x20200020, 0xb1b100b1, 0x99990099,
-     0x4c4c004c, 0xc2c200c2, 0x7e7e007e, 0x05050005, 0xb7b700b7, 0x31310031,
-     0x17170017, 0xd7d700d7, 0x58580058, 0x61610061, 0x1b1b001b, 0x1c1c001c,
-     0x0f0f000f, 0x16160016, 0x18180018, 0x22220022, 0x44440044, 0xb2b200b2,
-     0xb5b500b5, 0x91910091, 0x08080008, 0xa8a800a8, 0xfcfc00fc, 0x50500050,
-     0xd0d000d0, 0x7d7d007d, 0x89890089, 0x97970097, 0x5b5b005b, 0x95950095,
-     0xffff00ff, 0xd2d200d2, 0xc4c400c4, 0x48480048, 0xf7f700f7, 0xdbdb00db,
-     0x03030003, 0xdada00da, 0x3f3f003f, 0x94940094, 0x5c5c005c, 0x02020002,
-     0x4a4a004a, 0x33330033, 0x67670067, 0xf3f300f3, 0x7f7f007f, 0xe2e200e2,
-     0x9b9b009b, 0x26260026, 0x37370037, 0x3b3b003b, 0x96960096, 0x4b4b004b,
-     0xbebe00be, 0x2e2e002e, 0x79790079, 0x8c8c008c, 0x6e6e006e, 0x8e8e008e,
-     0xf5f500f5, 0xb6b600b6, 0xfdfd00fd, 0x59590059, 0x98980098, 0x6a6a006a,
-     0x46460046, 0xbaba00ba, 0x25250025, 0x42420042, 0xa2a200a2, 0xfafa00fa,
-     0x07070007, 0x55550055, 0xeeee00ee, 0x0a0a000a, 0x49490049, 0x68680068,
-     0x38380038, 0xa4a400a4, 0x28280028, 0x7b7b007b, 0xc9c900c9, 0xc1c100c1,
-     0xe3e300e3, 0xf4f400f4, 0xc7c700c7, 0x9e9e009e},
-    {0x00e0e0e0, 0x00050505, 0x00585858, 0x00d9d9d9, 0x00676767, 0x004e4e4e,
-     0x00818181, 0x00cbcbcb, 0x00c9c9c9, 0x000b0b0b, 0x00aeaeae, 0x006a6a6a,
-     0x00d5d5d5, 0x00181818, 0x005d5d5d, 0x00828282, 0x00464646, 0x00dfdfdf,
-     0x00d6d6d6, 0x00272727, 0x008a8a8a, 0x00323232, 0x004b4b4b, 0x00424242,
-     0x00dbdbdb, 0x001c1c1c, 0x009e9e9e, 0x009c9c9c, 0x003a3a3a, 0x00cacaca,
-     0x00252525, 0x007b7b7b, 0x000d0d0d, 0x00717171, 0x005f5f5f, 0x001f1f1f,
-     0x00f8f8f8, 0x00d7d7d7, 0x003e3e3e, 0x009d9d9d, 0x007c7c7c, 0x00606060,
-     0x00b9b9b9, 0x00bebebe, 0x00bcbcbc, 0x008b8b8b, 0x00161616, 0x00343434,
-     0x004d4d4d, 0x00c3c3c3, 0x00727272, 0x00959595, 0x00ababab, 0x008e8e8e,
-     0x00bababa, 0x007a7a7a, 0x00b3b3b3, 0x00020202, 0x00b4b4b4, 0x00adadad,
-     0x00a2a2a2, 0x00acacac, 0x00d8d8d8, 0x009a9a9a, 0x00171717, 0x001a1a1a,
-     0x00353535, 0x00cccccc, 0x00f7f7f7, 0x00999999, 0x00616161, 0x005a5a5a,
-     0x00e8e8e8, 0x00242424, 0x00565656, 0x00404040, 0x00e1e1e1, 0x00636363,
-     0x00090909, 0x00333333, 0x00bfbfbf, 0x00989898, 0x00979797, 0x00858585,
-     0x00686868, 0x00fcfcfc, 0x00ececec, 0x000a0a0a, 0x00dadada, 0x006f6f6f,
-     0x00535353, 0x00626262, 0x00a3a3a3, 0x002e2e2e, 0x00080808, 0x00afafaf,
-     0x00282828, 0x00b0b0b0, 0x00747474, 0x00c2c2c2, 0x00bdbdbd, 0x00363636,
-     0x00222222, 0x00383838, 0x00646464, 0x001e1e1e, 0x00393939, 0x002c2c2c,
-     0x00a6a6a6, 0x00303030, 0x00e5e5e5, 0x00444444, 0x00fdfdfd, 0x00888888,
-     0x009f9f9f, 0x00656565, 0x00878787, 0x006b6b6b, 0x00f4f4f4, 0x00232323,
-     0x00484848, 0x00101010, 0x00d1d1d1, 0x00515151, 0x00c0c0c0, 0x00f9f9f9,
-     0x00d2d2d2, 0x00a0a0a0, 0x00555555, 0x00a1a1a1, 0x00414141, 0x00fafafa,
-     0x00434343, 0x00131313, 0x00c4c4c4, 0x002f2f2f, 0x00a8a8a8, 0x00b6b6b6,
-     0x003c3c3c, 0x002b2b2b, 0x00c1c1c1, 0x00ffffff, 0x00c8c8c8, 0x00a5a5a5,
-     0x00202020, 0x00898989, 0x00000000, 0x00909090, 0x00474747, 0x00efefef,
-     0x00eaeaea, 0x00b7b7b7, 0x00151515, 0x00060606, 0x00cdcdcd, 0x00b5b5b5,
-     0x00121212, 0x007e7e7e, 0x00bbbbbb, 0x00292929, 0x000f0f0f, 0x00b8b8b8,
-     0x00070707, 0x00040404, 0x009b9b9b, 0x00949494, 0x00212121, 0x00666666,
-     0x00e6e6e6, 0x00cecece, 0x00ededed, 0x00e7e7e7, 0x003b3b3b, 0x00fefefe,
-     0x007f7f7f, 0x00c5c5c5, 0x00a4a4a4, 0x00373737, 0x00b1b1b1, 0x004c4c4c,
-     0x00919191, 0x006e6e6e, 0x008d8d8d, 0x00767676, 0x00030303, 0x002d2d2d,
-     0x00dedede, 0x00969696, 0x00262626, 0x007d7d7d, 0x00c6c6c6, 0x005c5c5c,
-     0x00d3d3d3, 0x00f2f2f2, 0x004f4f4f, 0x00191919, 0x003f3f3f, 0x00dcdcdc,
-     0x00797979, 0x001d1d1d, 0x00525252, 0x00ebebeb, 0x00f3f3f3, 0x006d6d6d,
-     0x005e5e5e, 0x00fbfbfb, 0x00696969, 0x00b2b2b2, 0x00f0f0f0, 0x00313131,
-     0x000c0c0c, 0x00d4d4d4, 0x00cfcfcf, 0x008c8c8c, 0x00e2e2e2, 0x00757575,
-     0x00a9a9a9, 0x004a4a4a, 0x00575757, 0x00848484, 0x00111111, 0x00454545,
-     0x001b1b1b, 0x00f5f5f5, 0x00e4e4e4, 0x000e0e0e, 0x00737373, 0x00aaaaaa,
-     0x00f1f1f1, 0x00dddddd, 0x00595959, 0x00141414, 0x006c6c6c, 0x00929292,
-     0x00545454, 0x00d0d0d0, 0x00787878, 0x00707070, 0x00e3e3e3, 0x00494949,
-     0x00808080, 0x00505050, 0x00a7a7a7, 0x00f6f6f6, 0x00777777, 0x00939393,
-     0x00868686, 0x00838383, 0x002a2a2a, 0x00c7c7c7, 0x005b5b5b, 0x00e9e9e9,
-     0x00eeeeee, 0x008f8f8f, 0x00010101, 0x003d3d3d},
-    {0x38003838, 0x41004141, 0x16001616, 0x76007676, 0xd900d9d9, 0x93009393,
-     0x60006060, 0xf200f2f2, 0x72007272, 0xc200c2c2, 0xab00abab, 0x9a009a9a,
-     0x75007575, 0x06000606, 0x57005757, 0xa000a0a0, 0x91009191, 0xf700f7f7,
-     0xb500b5b5, 0xc900c9c9, 0xa200a2a2, 0x8c008c8c, 0xd200d2d2, 0x90009090,
-     0xf600f6f6, 0x07000707, 0xa700a7a7, 0x27002727, 0x8e008e8e, 0xb200b2b2,
-     0x49004949, 0xde00dede, 0x43004343, 0x5c005c5c, 0xd700d7d7, 0xc700c7c7,
-     0x3e003e3e, 0xf500f5f5, 0x8f008f8f, 0x67006767, 0x1f001f1f, 0x18001818,
-     0x6e006e6e, 0xaf00afaf, 0x2f002f2f, 0xe200e2e2, 0x85008585, 0x0d000d0d,
-     0x53005353, 0xf000f0f0, 0x9c009c9c, 0x65006565, 0xea00eaea, 0xa300a3a3,
-     0xae00aeae, 0x9e009e9e, 0xec00ecec, 0x80008080, 0x2d002d2d, 0x6b006b6b,
-     0xa800a8a8, 0x2b002b2b, 0x36003636, 0xa600a6a6, 0xc500c5c5, 0x86008686,
-     0x4d004d4d, 0x33003333, 0xfd00fdfd, 0x66006666, 0x58005858, 0x96009696,
-     0x3a003a3a, 0x09000909, 0x95009595, 0x10001010, 0x78007878, 0xd800d8d8,
-     0x42004242, 0xcc00cccc, 0xef00efef, 0x26002626, 0xe500e5e5, 0x61006161,
-     0x1a001a1a, 0x3f003f3f, 0x3b003b3b, 0x82008282, 0xb600b6b6, 0xdb00dbdb,
-     0xd400d4d4, 0x98009898, 0xe800e8e8, 0x8b008b8b, 0x02000202, 0xeb00ebeb,
-     0x0a000a0a, 0x2c002c2c, 0x1d001d1d, 0xb000b0b0, 0x6f006f6f, 0x8d008d8d,
-     0x88008888, 0x0e000e0e, 0x19001919, 0x87008787, 0x4e004e4e, 0x0b000b0b,
-     0xa900a9a9, 0x0c000c0c, 0x79007979, 0x11001111, 0x7f007f7f, 0x22002222,
-     0xe700e7e7, 0x59005959, 0xe100e1e1, 0xda00dada, 0x3d003d3d, 0xc800c8c8,
-     0x12001212, 0x04000404, 0x74007474, 0x54005454, 0x30003030, 0x7e007e7e,
-     0xb400b4b4, 0x28002828, 0x55005555, 0x68006868, 0x50005050, 0xbe00bebe,
-     0xd000d0d0, 0xc400c4c4, 0x31003131, 0xcb00cbcb, 0x2a002a2a, 0xad00adad,
-     0x0f000f0f, 0xca00caca, 0x70007070, 0xff00ffff, 0x32003232, 0x69006969,
-     0x08000808, 0x62006262, 0x00000000, 0x24002424, 0xd100d1d1, 0xfb00fbfb,
-     0xba00baba, 0xed00eded, 0x45004545, 0x81008181, 0x73007373, 0x6d006d6d,
-     0x84008484, 0x9f009f9f, 0xee00eeee, 0x4a004a4a, 0xc300c3c3, 0x2e002e2e,
-     0xc100c1c1, 0x01000101, 0xe600e6e6, 0x25002525, 0x48004848, 0x99009999,
-     0xb900b9b9, 0xb300b3b3, 0x7b007b7b, 0xf900f9f9, 0xce00cece, 0xbf00bfbf,
-     0xdf00dfdf, 0x71007171, 0x29002929, 0xcd00cdcd, 0x6c006c6c, 0x13001313,
-     0x64006464, 0x9b009b9b, 0x63006363, 0x9d009d9d, 0xc000c0c0, 0x4b004b4b,
-     0xb700b7b7, 0xa500a5a5, 0x89008989, 0x5f005f5f, 0xb100b1b1, 0x17001717,
-     0xf400f4f4, 0xbc00bcbc, 0xd300d3d3, 0x46004646, 0xcf00cfcf, 0x37003737,
-     0x5e005e5e, 0x47004747, 0x94009494, 0xfa00fafa, 0xfc00fcfc, 0x5b005b5b,
-     0x97009797, 0xfe00fefe, 0x5a005a5a, 0xac00acac, 0x3c003c3c, 0x4c004c4c,
-     0x03000303, 0x35003535, 0xf300f3f3, 0x23002323, 0xb800b8b8, 0x5d005d5d,
-     0x6a006a6a, 0x92009292, 0xd500d5d5, 0x21002121, 0x44004444, 0x51005151,
-     0xc600c6c6, 0x7d007d7d, 0x39003939, 0x83008383, 0xdc00dcdc, 0xaa00aaaa,
-     0x7c007c7c, 0x77007777, 0x56005656, 0x05000505, 0x1b001b1b, 0xa400a4a4,
-     0x15001515, 0x34003434, 0x1e001e1e, 0x1c001c1c, 0xf800f8f8, 0x52005252,
-     0x20002020, 0x14001414, 0xe900e9e9, 0xbd00bdbd, 0xdd00dddd, 0xe400e4e4,
-     0xa100a1a1, 0xe000e0e0, 0x8a008a8a, 0xf100f1f1, 0xd600d6d6, 0x7a007a7a,
-     0xbb00bbbb, 0xe300e3e3, 0x40004040, 0x4f004f4f}
+    { 0x70707000, 0x82828200, 0x2c2c2c00, 0xececec00, 0xb3b3b300, 0x27272700,
+        0xc0c0c000, 0xe5e5e500, 0xe4e4e400, 0x85858500, 0x57575700, 0x35353500,
+        0xeaeaea00, 0x0c0c0c00, 0xaeaeae00, 0x41414100, 0x23232300, 0xefefef00,
+        0x6b6b6b00, 0x93939300, 0x45454500, 0x19191900, 0xa5a5a500, 0x21212100,
+        0xededed00, 0x0e0e0e00, 0x4f4f4f00, 0x4e4e4e00, 0x1d1d1d00, 0x65656500,
+        0x92929200, 0xbdbdbd00, 0x86868600, 0xb8b8b800, 0xafafaf00, 0x8f8f8f00,
+        0x7c7c7c00, 0xebebeb00, 0x1f1f1f00, 0xcecece00, 0x3e3e3e00, 0x30303000,
+        0xdcdcdc00, 0x5f5f5f00, 0x5e5e5e00, 0xc5c5c500, 0x0b0b0b00, 0x1a1a1a00,
+        0xa6a6a600, 0xe1e1e100, 0x39393900, 0xcacaca00, 0xd5d5d500, 0x47474700,
+        0x5d5d5d00, 0x3d3d3d00, 0xd9d9d900, 0x01010100, 0x5a5a5a00, 0xd6d6d600,
+        0x51515100, 0x56565600, 0x6c6c6c00, 0x4d4d4d00, 0x8b8b8b00, 0x0d0d0d00,
+        0x9a9a9a00, 0x66666600, 0xfbfbfb00, 0xcccccc00, 0xb0b0b000, 0x2d2d2d00,
+        0x74747400, 0x12121200, 0x2b2b2b00, 0x20202000, 0xf0f0f000, 0xb1b1b100,
+        0x84848400, 0x99999900, 0xdfdfdf00, 0x4c4c4c00, 0xcbcbcb00, 0xc2c2c200,
+        0x34343400, 0x7e7e7e00, 0x76767600, 0x05050500, 0x6d6d6d00, 0xb7b7b700,
+        0xa9a9a900, 0x31313100, 0xd1d1d100, 0x17171700, 0x04040400, 0xd7d7d700,
+        0x14141400, 0x58585800, 0x3a3a3a00, 0x61616100, 0xdedede00, 0x1b1b1b00,
+        0x11111100, 0x1c1c1c00, 0x32323200, 0x0f0f0f00, 0x9c9c9c00, 0x16161600,
+        0x53535300, 0x18181800, 0xf2f2f200, 0x22222200, 0xfefefe00, 0x44444400,
+        0xcfcfcf00, 0xb2b2b200, 0xc3c3c300, 0xb5b5b500, 0x7a7a7a00, 0x91919100,
+        0x24242400, 0x08080800, 0xe8e8e800, 0xa8a8a800, 0x60606000, 0xfcfcfc00,
+        0x69696900, 0x50505000, 0xaaaaaa00, 0xd0d0d000, 0xa0a0a000, 0x7d7d7d00,
+        0xa1a1a100, 0x89898900, 0x62626200, 0x97979700, 0x54545400, 0x5b5b5b00,
+        0x1e1e1e00, 0x95959500, 0xe0e0e000, 0xffffff00, 0x64646400, 0xd2d2d200,
+        0x10101000, 0xc4c4c400, 0x00000000, 0x48484800, 0xa3a3a300, 0xf7f7f700,
+        0x75757500, 0xdbdbdb00, 0x8a8a8a00, 0x03030300, 0xe6e6e600, 0xdadada00,
+        0x09090900, 0x3f3f3f00, 0xdddddd00, 0x94949400, 0x87878700, 0x5c5c5c00,
+        0x83838300, 0x02020200, 0xcdcdcd00, 0x4a4a4a00, 0x90909000, 0x33333300,
+        0x73737300, 0x67676700, 0xf6f6f600, 0xf3f3f300, 0x9d9d9d00, 0x7f7f7f00,
+        0xbfbfbf00, 0xe2e2e200, 0x52525200, 0x9b9b9b00, 0xd8d8d800, 0x26262600,
+        0xc8c8c800, 0x37373700, 0xc6c6c600, 0x3b3b3b00, 0x81818100, 0x96969600,
+        0x6f6f6f00, 0x4b4b4b00, 0x13131300, 0xbebebe00, 0x63636300, 0x2e2e2e00,
+        0xe9e9e900, 0x79797900, 0xa7a7a700, 0x8c8c8c00, 0x9f9f9f00, 0x6e6e6e00,
+        0xbcbcbc00, 0x8e8e8e00, 0x29292900, 0xf5f5f500, 0xf9f9f900, 0xb6b6b600,
+        0x2f2f2f00, 0xfdfdfd00, 0xb4b4b400, 0x59595900, 0x78787800, 0x98989800,
+        0x06060600, 0x6a6a6a00, 0xe7e7e700, 0x46464600, 0x71717100, 0xbababa00,
+        0xd4d4d400, 0x25252500, 0xababab00, 0x42424200, 0x88888800, 0xa2a2a200,
+        0x8d8d8d00, 0xfafafa00, 0x72727200, 0x07070700, 0xb9b9b900, 0x55555500,
+        0xf8f8f800, 0xeeeeee00, 0xacacac00, 0x0a0a0a00, 0x36363600, 0x49494900,
+        0x2a2a2a00, 0x68686800, 0x3c3c3c00, 0x38383800, 0xf1f1f100, 0xa4a4a400,
+        0x40404000, 0x28282800, 0xd3d3d300, 0x7b7b7b00, 0xbbbbbb00, 0xc9c9c900,
+        0x43434300, 0xc1c1c100, 0x15151500, 0xe3e3e300, 0xadadad00, 0xf4f4f400,
+        0x77777700, 0xc7c7c700, 0x80808000, 0x9e9e9e00 },
+    { 0x70700070, 0x2c2c002c, 0xb3b300b3, 0xc0c000c0, 0xe4e400e4, 0x57570057,
+        0xeaea00ea, 0xaeae00ae, 0x23230023, 0x6b6b006b, 0x45450045, 0xa5a500a5,
+        0xeded00ed, 0x4f4f004f, 0x1d1d001d, 0x92920092, 0x86860086, 0xafaf00af,
+        0x7c7c007c, 0x1f1f001f, 0x3e3e003e, 0xdcdc00dc, 0x5e5e005e, 0x0b0b000b,
+        0xa6a600a6, 0x39390039, 0xd5d500d5, 0x5d5d005d, 0xd9d900d9, 0x5a5a005a,
+        0x51510051, 0x6c6c006c, 0x8b8b008b, 0x9a9a009a, 0xfbfb00fb, 0xb0b000b0,
+        0x74740074, 0x2b2b002b, 0xf0f000f0, 0x84840084, 0xdfdf00df, 0xcbcb00cb,
+        0x34340034, 0x76760076, 0x6d6d006d, 0xa9a900a9, 0xd1d100d1, 0x04040004,
+        0x14140014, 0x3a3a003a, 0xdede00de, 0x11110011, 0x32320032, 0x9c9c009c,
+        0x53530053, 0xf2f200f2, 0xfefe00fe, 0xcfcf00cf, 0xc3c300c3, 0x7a7a007a,
+        0x24240024, 0xe8e800e8, 0x60600060, 0x69690069, 0xaaaa00aa, 0xa0a000a0,
+        0xa1a100a1, 0x62620062, 0x54540054, 0x1e1e001e, 0xe0e000e0, 0x64640064,
+        0x10100010, 0x00000000, 0xa3a300a3, 0x75750075, 0x8a8a008a, 0xe6e600e6,
+        0x09090009, 0xdddd00dd, 0x87870087, 0x83830083, 0xcdcd00cd, 0x90900090,
+        0x73730073, 0xf6f600f6, 0x9d9d009d, 0xbfbf00bf, 0x52520052, 0xd8d800d8,
+        0xc8c800c8, 0xc6c600c6, 0x81810081, 0x6f6f006f, 0x13130013, 0x63630063,
+        0xe9e900e9, 0xa7a700a7, 0x9f9f009f, 0xbcbc00bc, 0x29290029, 0xf9f900f9,
+        0x2f2f002f, 0xb4b400b4, 0x78780078, 0x06060006, 0xe7e700e7, 0x71710071,
+        0xd4d400d4, 0xabab00ab, 0x88880088, 0x8d8d008d, 0x72720072, 0xb9b900b9,
+        0xf8f800f8, 0xacac00ac, 0x36360036, 0x2a2a002a, 0x3c3c003c, 0xf1f100f1,
+        0x40400040, 0xd3d300d3, 0xbbbb00bb, 0x43430043, 0x15150015, 0xadad00ad,
+        0x77770077, 0x80800080, 0x82820082, 0xecec00ec, 0x27270027, 0xe5e500e5,
+        0x85850085, 0x35350035, 0x0c0c000c, 0x41410041, 0xefef00ef, 0x93930093,
+        0x19190019, 0x21210021, 0x0e0e000e, 0x4e4e004e, 0x65650065, 0xbdbd00bd,
+        0xb8b800b8, 0x8f8f008f, 0xebeb00eb, 0xcece00ce, 0x30300030, 0x5f5f005f,
+        0xc5c500c5, 0x1a1a001a, 0xe1e100e1, 0xcaca00ca, 0x47470047, 0x3d3d003d,
+        0x01010001, 0xd6d600d6, 0x56560056, 0x4d4d004d, 0x0d0d000d, 0x66660066,
+        0xcccc00cc, 0x2d2d002d, 0x12120012, 0x20200020, 0xb1b100b1, 0x99990099,
+        0x4c4c004c, 0xc2c200c2, 0x7e7e007e, 0x05050005, 0xb7b700b7, 0x31310031,
+        0x17170017, 0xd7d700d7, 0x58580058, 0x61610061, 0x1b1b001b, 0x1c1c001c,
+        0x0f0f000f, 0x16160016, 0x18180018, 0x22220022, 0x44440044, 0xb2b200b2,
+        0xb5b500b5, 0x91910091, 0x08080008, 0xa8a800a8, 0xfcfc00fc, 0x50500050,
+        0xd0d000d0, 0x7d7d007d, 0x89890089, 0x97970097, 0x5b5b005b, 0x95950095,
+        0xffff00ff, 0xd2d200d2, 0xc4c400c4, 0x48480048, 0xf7f700f7, 0xdbdb00db,
+        0x03030003, 0xdada00da, 0x3f3f003f, 0x94940094, 0x5c5c005c, 0x02020002,
+        0x4a4a004a, 0x33330033, 0x67670067, 0xf3f300f3, 0x7f7f007f, 0xe2e200e2,
+        0x9b9b009b, 0x26260026, 0x37370037, 0x3b3b003b, 0x96960096, 0x4b4b004b,
+        0xbebe00be, 0x2e2e002e, 0x79790079, 0x8c8c008c, 0x6e6e006e, 0x8e8e008e,
+        0xf5f500f5, 0xb6b600b6, 0xfdfd00fd, 0x59590059, 0x98980098, 0x6a6a006a,
+        0x46460046, 0xbaba00ba, 0x25250025, 0x42420042, 0xa2a200a2, 0xfafa00fa,
+        0x07070007, 0x55550055, 0xeeee00ee, 0x0a0a000a, 0x49490049, 0x68680068,
+        0x38380038, 0xa4a400a4, 0x28280028, 0x7b7b007b, 0xc9c900c9, 0xc1c100c1,
+        0xe3e300e3, 0xf4f400f4, 0xc7c700c7, 0x9e9e009e },
+    { 0x00e0e0e0, 0x00050505, 0x00585858, 0x00d9d9d9, 0x00676767, 0x004e4e4e,
+        0x00818181, 0x00cbcbcb, 0x00c9c9c9, 0x000b0b0b, 0x00aeaeae, 0x006a6a6a,
+        0x00d5d5d5, 0x00181818, 0x005d5d5d, 0x00828282, 0x00464646, 0x00dfdfdf,
+        0x00d6d6d6, 0x00272727, 0x008a8a8a, 0x00323232, 0x004b4b4b, 0x00424242,
+        0x00dbdbdb, 0x001c1c1c, 0x009e9e9e, 0x009c9c9c, 0x003a3a3a, 0x00cacaca,
+        0x00252525, 0x007b7b7b, 0x000d0d0d, 0x00717171, 0x005f5f5f, 0x001f1f1f,
+        0x00f8f8f8, 0x00d7d7d7, 0x003e3e3e, 0x009d9d9d, 0x007c7c7c, 0x00606060,
+        0x00b9b9b9, 0x00bebebe, 0x00bcbcbc, 0x008b8b8b, 0x00161616, 0x00343434,
+        0x004d4d4d, 0x00c3c3c3, 0x00727272, 0x00959595, 0x00ababab, 0x008e8e8e,
+        0x00bababa, 0x007a7a7a, 0x00b3b3b3, 0x00020202, 0x00b4b4b4, 0x00adadad,
+        0x00a2a2a2, 0x00acacac, 0x00d8d8d8, 0x009a9a9a, 0x00171717, 0x001a1a1a,
+        0x00353535, 0x00cccccc, 0x00f7f7f7, 0x00999999, 0x00616161, 0x005a5a5a,
+        0x00e8e8e8, 0x00242424, 0x00565656, 0x00404040, 0x00e1e1e1, 0x00636363,
+        0x00090909, 0x00333333, 0x00bfbfbf, 0x00989898, 0x00979797, 0x00858585,
+        0x00686868, 0x00fcfcfc, 0x00ececec, 0x000a0a0a, 0x00dadada, 0x006f6f6f,
+        0x00535353, 0x00626262, 0x00a3a3a3, 0x002e2e2e, 0x00080808, 0x00afafaf,
+        0x00282828, 0x00b0b0b0, 0x00747474, 0x00c2c2c2, 0x00bdbdbd, 0x00363636,
+        0x00222222, 0x00383838, 0x00646464, 0x001e1e1e, 0x00393939, 0x002c2c2c,
+        0x00a6a6a6, 0x00303030, 0x00e5e5e5, 0x00444444, 0x00fdfdfd, 0x00888888,
+        0x009f9f9f, 0x00656565, 0x00878787, 0x006b6b6b, 0x00f4f4f4, 0x00232323,
+        0x00484848, 0x00101010, 0x00d1d1d1, 0x00515151, 0x00c0c0c0, 0x00f9f9f9,
+        0x00d2d2d2, 0x00a0a0a0, 0x00555555, 0x00a1a1a1, 0x00414141, 0x00fafafa,
+        0x00434343, 0x00131313, 0x00c4c4c4, 0x002f2f2f, 0x00a8a8a8, 0x00b6b6b6,
+        0x003c3c3c, 0x002b2b2b, 0x00c1c1c1, 0x00ffffff, 0x00c8c8c8, 0x00a5a5a5,
+        0x00202020, 0x00898989, 0x00000000, 0x00909090, 0x00474747, 0x00efefef,
+        0x00eaeaea, 0x00b7b7b7, 0x00151515, 0x00060606, 0x00cdcdcd, 0x00b5b5b5,
+        0x00121212, 0x007e7e7e, 0x00bbbbbb, 0x00292929, 0x000f0f0f, 0x00b8b8b8,
+        0x00070707, 0x00040404, 0x009b9b9b, 0x00949494, 0x00212121, 0x00666666,
+        0x00e6e6e6, 0x00cecece, 0x00ededed, 0x00e7e7e7, 0x003b3b3b, 0x00fefefe,
+        0x007f7f7f, 0x00c5c5c5, 0x00a4a4a4, 0x00373737, 0x00b1b1b1, 0x004c4c4c,
+        0x00919191, 0x006e6e6e, 0x008d8d8d, 0x00767676, 0x00030303, 0x002d2d2d,
+        0x00dedede, 0x00969696, 0x00262626, 0x007d7d7d, 0x00c6c6c6, 0x005c5c5c,
+        0x00d3d3d3, 0x00f2f2f2, 0x004f4f4f, 0x00191919, 0x003f3f3f, 0x00dcdcdc,
+        0x00797979, 0x001d1d1d, 0x00525252, 0x00ebebeb, 0x00f3f3f3, 0x006d6d6d,
+        0x005e5e5e, 0x00fbfbfb, 0x00696969, 0x00b2b2b2, 0x00f0f0f0, 0x00313131,
+        0x000c0c0c, 0x00d4d4d4, 0x00cfcfcf, 0x008c8c8c, 0x00e2e2e2, 0x00757575,
+        0x00a9a9a9, 0x004a4a4a, 0x00575757, 0x00848484, 0x00111111, 0x00454545,
+        0x001b1b1b, 0x00f5f5f5, 0x00e4e4e4, 0x000e0e0e, 0x00737373, 0x00aaaaaa,
+        0x00f1f1f1, 0x00dddddd, 0x00595959, 0x00141414, 0x006c6c6c, 0x00929292,
+        0x00545454, 0x00d0d0d0, 0x00787878, 0x00707070, 0x00e3e3e3, 0x00494949,
+        0x00808080, 0x00505050, 0x00a7a7a7, 0x00f6f6f6, 0x00777777, 0x00939393,
+        0x00868686, 0x00838383, 0x002a2a2a, 0x00c7c7c7, 0x005b5b5b, 0x00e9e9e9,
+        0x00eeeeee, 0x008f8f8f, 0x00010101, 0x003d3d3d },
+    { 0x38003838, 0x41004141, 0x16001616, 0x76007676, 0xd900d9d9, 0x93009393,
+        0x60006060, 0xf200f2f2, 0x72007272, 0xc200c2c2, 0xab00abab, 0x9a009a9a,
+        0x75007575, 0x06000606, 0x57005757, 0xa000a0a0, 0x91009191, 0xf700f7f7,
+        0xb500b5b5, 0xc900c9c9, 0xa200a2a2, 0x8c008c8c, 0xd200d2d2, 0x90009090,
+        0xf600f6f6, 0x07000707, 0xa700a7a7, 0x27002727, 0x8e008e8e, 0xb200b2b2,
+        0x49004949, 0xde00dede, 0x43004343, 0x5c005c5c, 0xd700d7d7, 0xc700c7c7,
+        0x3e003e3e, 0xf500f5f5, 0x8f008f8f, 0x67006767, 0x1f001f1f, 0x18001818,
+        0x6e006e6e, 0xaf00afaf, 0x2f002f2f, 0xe200e2e2, 0x85008585, 0x0d000d0d,
+        0x53005353, 0xf000f0f0, 0x9c009c9c, 0x65006565, 0xea00eaea, 0xa300a3a3,
+        0xae00aeae, 0x9e009e9e, 0xec00ecec, 0x80008080, 0x2d002d2d, 0x6b006b6b,
+        0xa800a8a8, 0x2b002b2b, 0x36003636, 0xa600a6a6, 0xc500c5c5, 0x86008686,
+        0x4d004d4d, 0x33003333, 0xfd00fdfd, 0x66006666, 0x58005858, 0x96009696,
+        0x3a003a3a, 0x09000909, 0x95009595, 0x10001010, 0x78007878, 0xd800d8d8,
+        0x42004242, 0xcc00cccc, 0xef00efef, 0x26002626, 0xe500e5e5, 0x61006161,
+        0x1a001a1a, 0x3f003f3f, 0x3b003b3b, 0x82008282, 0xb600b6b6, 0xdb00dbdb,
+        0xd400d4d4, 0x98009898, 0xe800e8e8, 0x8b008b8b, 0x02000202, 0xeb00ebeb,
+        0x0a000a0a, 0x2c002c2c, 0x1d001d1d, 0xb000b0b0, 0x6f006f6f, 0x8d008d8d,
+        0x88008888, 0x0e000e0e, 0x19001919, 0x87008787, 0x4e004e4e, 0x0b000b0b,
+        0xa900a9a9, 0x0c000c0c, 0x79007979, 0x11001111, 0x7f007f7f, 0x22002222,
+        0xe700e7e7, 0x59005959, 0xe100e1e1, 0xda00dada, 0x3d003d3d, 0xc800c8c8,
+        0x12001212, 0x04000404, 0x74007474, 0x54005454, 0x30003030, 0x7e007e7e,
+        0xb400b4b4, 0x28002828, 0x55005555, 0x68006868, 0x50005050, 0xbe00bebe,
+        0xd000d0d0, 0xc400c4c4, 0x31003131, 0xcb00cbcb, 0x2a002a2a, 0xad00adad,
+        0x0f000f0f, 0xca00caca, 0x70007070, 0xff00ffff, 0x32003232, 0x69006969,
+        0x08000808, 0x62006262, 0x00000000, 0x24002424, 0xd100d1d1, 0xfb00fbfb,
+        0xba00baba, 0xed00eded, 0x45004545, 0x81008181, 0x73007373, 0x6d006d6d,
+        0x84008484, 0x9f009f9f, 0xee00eeee, 0x4a004a4a, 0xc300c3c3, 0x2e002e2e,
+        0xc100c1c1, 0x01000101, 0xe600e6e6, 0x25002525, 0x48004848, 0x99009999,
+        0xb900b9b9, 0xb300b3b3, 0x7b007b7b, 0xf900f9f9, 0xce00cece, 0xbf00bfbf,
+        0xdf00dfdf, 0x71007171, 0x29002929, 0xcd00cdcd, 0x6c006c6c, 0x13001313,
+        0x64006464, 0x9b009b9b, 0x63006363, 0x9d009d9d, 0xc000c0c0, 0x4b004b4b,
+        0xb700b7b7, 0xa500a5a5, 0x89008989, 0x5f005f5f, 0xb100b1b1, 0x17001717,
+        0xf400f4f4, 0xbc00bcbc, 0xd300d3d3, 0x46004646, 0xcf00cfcf, 0x37003737,
+        0x5e005e5e, 0x47004747, 0x94009494, 0xfa00fafa, 0xfc00fcfc, 0x5b005b5b,
+        0x97009797, 0xfe00fefe, 0x5a005a5a, 0xac00acac, 0x3c003c3c, 0x4c004c4c,
+        0x03000303, 0x35003535, 0xf300f3f3, 0x23002323, 0xb800b8b8, 0x5d005d5d,
+        0x6a006a6a, 0x92009292, 0xd500d5d5, 0x21002121, 0x44004444, 0x51005151,
+        0xc600c6c6, 0x7d007d7d, 0x39003939, 0x83008383, 0xdc00dcdc, 0xaa00aaaa,
+        0x7c007c7c, 0x77007777, 0x56005656, 0x05000505, 0x1b001b1b, 0xa400a4a4,
+        0x15001515, 0x34003434, 0x1e001e1e, 0x1c001c1c, 0xf800f8f8, 0x52005252,
+        0x20002020, 0x14001414, 0xe900e9e9, 0xbd00bdbd, 0xdd00dddd, 0xe400e4e4,
+        0xa100a1a1, 0xe000e0e0, 0x8a008a8a, 0xf100f1f1, 0xd600d6d6, 0x7a007a7a,
+        0xbb00bbbb, 0xe300e3e3, 0x40004040, 0x4f004f4f }
 };
 
 /* Key generation constants */
@@ -250,38 +250,40 @@ static const u32 SIGMA[] = {
  * ~16 registers. For platforms with less registers [well, x86 to be
  * specific] assembler version should be/is provided anyway...
  */
-#define Camellia_Feistel(_s0,_s1,_s2,_s3,_key) do {\
-        register u32 _t0,_t1,_t2,_t3;\
-\
-        _t0  = _s0 ^ (_key)[0];\
-        _t3  = SBOX4_4404[_t0&0xff];\
-        _t1  = _s1 ^ (_key)[1];\
-        _t3 ^= SBOX3_3033[(_t0 >> 8)&0xff];\
-        _t2  = SBOX1_1110[_t1&0xff];\
-        _t3 ^= SBOX2_0222[(_t0 >> 16)&0xff];\
-        _t2 ^= SBOX4_4404[(_t1 >> 8)&0xff];\
-        _t3 ^= SBOX1_1110[(_t0 >> 24)];\
-        _t2 ^= _t3;\
-        _t3  = RightRotate(_t3,8);\
-        _t2 ^= SBOX3_3033[(_t1 >> 16)&0xff];\
-        _s3 ^= _t3;\
-        _t2 ^= SBOX2_0222[(_t1 >> 24)];\
-        _s2 ^= _t2; \
-        _s3 ^= _t2;\
-} while(0)
+#define Camellia_Feistel(_s0, _s1, _s2, _s3, _key) \
+    do {                                           \
+        register u32 _t0, _t1, _t2, _t3;           \
+                                                   \
+        _t0 = _s0 ^ (_key)[0];                     \
+        _t3 = SBOX4_4404[_t0 & 0xff];              \
+        _t1 = _s1 ^ (_key)[1];                     \
+        _t3 ^= SBOX3_3033[(_t0 >> 8) & 0xff];      \
+        _t2 = SBOX1_1110[_t1 & 0xff];              \
+        _t3 ^= SBOX2_0222[(_t0 >> 16) & 0xff];     \
+        _t2 ^= SBOX4_4404[(_t1 >> 8) & 0xff];      \
+        _t3 ^= SBOX1_1110[(_t0 >> 24)];            \
+        _t2 ^= _t3;                                \
+        _t3 = RightRotate(_t3, 8);                 \
+        _t2 ^= SBOX3_3033[(_t1 >> 16) & 0xff];     \
+        _s3 ^= _t3;                                \
+        _t2 ^= SBOX2_0222[(_t1 >> 24)];            \
+        _s2 ^= _t2;                                \
+        _s3 ^= _t2;                                \
+    } while (0)
 
 /*
  * Note that n has to be less than 32. Rotations for larger amount
  * of bits are achieved by "rotating" order of s-elements and
  * adjusting n accordingly, e.g. RotLeft128(s1,s2,s3,s0,n-32).
  */
-#define RotLeft128(_s0,_s1,_s2,_s3,_n) do {\
-        u32 _t0=_s0>>(32-_n);\
-        _s0 = (_s0<<_n) | (_s1>>(32-_n));\
-        _s1 = (_s1<<_n) | (_s2>>(32-_n));\
-        _s2 = (_s2<<_n) | (_s3>>(32-_n));\
-        _s3 = (_s3<<_n) | _t0;\
-} while (0)
+#define RotLeft128(_s0, _s1, _s2, _s3, _n)      \
+    do {                                        \
+        u32 _t0 = _s0 >> (32 - _n);             \
+        _s0 = (_s0 << _n) | (_s1 >> (32 - _n)); \
+        _s1 = (_s1 << _n) | (_s2 >> (32 - _n)); \
+        _s2 = (_s2 << _n) | (_s3 >> (32 - _n)); \
+        _s3 = (_s3 << _n) | _t0;                \
+    } while (0)
 
 int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
 {
@@ -343,7 +345,7 @@ int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
         RotLeft128(s0, s1, s2, s3, 17); /* KL <<<111 */
         k[44] = s0, k[45] = s1, k[46] = s2, k[47] = s3;
 
-        return 3;               /* grand rounds */
+        return 3; /* grand rounds */
     } else {
         k[12] = s0, k[13] = s1, k[14] = s2, k[15] = s3;
         s0 ^= k[8], s1 ^= k[9], s2 ^= k[10], s3 ^= k[11];
@@ -388,7 +390,7 @@ int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
         RotLeft128(s2, s3, s0, s1, 2); /* KL <<<111 */
         k[60] = s2, k[61] = s3, k[62] = s0, k[63] = s1;
 
-        return 4;               /* grand rounds */
+        return 4; /* grand rounds */
     }
     /*
      * It is possible to perform certain precalculations, which
@@ -401,8 +403,8 @@ int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
 }
 
 void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[],
-                                  const KEY_TABLE_TYPE keyTable,
-                                  u8 ciphertext[])
+    const KEY_TABLE_TYPE keyTable,
+    u8 ciphertext[])
 {
     register u32 s0, s1, s2, s3;
     const u32 *k = keyTable, *kend = keyTable + grandRounds * 16;
@@ -447,15 +449,15 @@ void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[],
 }
 
 void Camellia_EncryptBlock(int keyBitLength, const u8 plaintext[],
-                           const KEY_TABLE_TYPE keyTable, u8 ciphertext[])
+    const KEY_TABLE_TYPE keyTable, u8 ciphertext[])
 {
     Camellia_EncryptBlock_Rounds(keyBitLength == 128 ? 3 : 4,
-                                 plaintext, keyTable, ciphertext);
+        plaintext, keyTable, ciphertext);
 }
 
 void Camellia_DecryptBlock_Rounds(int grandRounds, const u8 ciphertext[],
-                                  const KEY_TABLE_TYPE keyTable,
-                                  u8 plaintext[])
+    const KEY_TABLE_TYPE keyTable,
+    u8 plaintext[])
 {
     u32 s0, s1, s2, s3;
     const u32 *k = keyTable + grandRounds * 16, *kend = keyTable + 4;
@@ -500,8 +502,8 @@ void Camellia_DecryptBlock_Rounds(int grandRounds, const u8 ciphertext[],
 }
 
 void Camellia_DecryptBlock(int keyBitLength, const u8 ciphertext[],
-                           const KEY_TABLE_TYPE keyTable, u8 plaintext[])
+    const KEY_TABLE_TYPE keyTable, u8 plaintext[])
 {
     Camellia_DecryptBlock_Rounds(keyBitLength == 128 ? 3 : 4,
-                                 ciphertext, keyTable, plaintext);
+        ciphertext, keyTable, plaintext);
 }
diff --git a/crypto/camellia/cmll_cbc.c b/crypto/camellia/cmll_cbc.c
index 140681a9bd260..51d8310b48c4d 100644
--- a/crypto/camellia/cmll_cbc.c
+++ b/crypto/camellia/cmll_cbc.c
@@ -17,14 +17,14 @@
 #include <openssl/modes.h>
 
 void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                          size_t len, const CAMELLIA_KEY *key,
-                          unsigned char *ivec, const int enc)
+    size_t len, const CAMELLIA_KEY *key,
+    unsigned char *ivec, const int enc)
 {
 
     if (enc)
         CRYPTO_cbc128_encrypt(in, out, len, key, ivec,
-                              (block128_f) Camellia_encrypt);
+            (block128_f)Camellia_encrypt);
     else
         CRYPTO_cbc128_decrypt(in, out, len, key, ivec,
-                              (block128_f) Camellia_decrypt);
+            (block128_f)Camellia_decrypt);
 }
diff --git a/crypto/camellia/cmll_cfb.c b/crypto/camellia/cmll_cfb.c
index 8a92572d93954..ea4ab67512bb2 100644
--- a/crypto/camellia/cmll_cfb.c
+++ b/crypto/camellia/cmll_cfb.c
@@ -23,27 +23,27 @@
  */
 
 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)
+    size_t length, const CAMELLIA_KEY *key,
+    unsigned char *ivec, int *num, const int enc)
 {
 
     CRYPTO_cfb128_encrypt(in, out, length, key, ivec, num, enc,
-                          (block128_f) Camellia_encrypt);
+        (block128_f)Camellia_encrypt);
 }
 
 /* N.B. This expects the input to be packed, MS bit first */
 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)
+    size_t length, const CAMELLIA_KEY *key,
+    unsigned char *ivec, int *num, const int enc)
 {
     CRYPTO_cfb128_1_encrypt(in, out, length, key, ivec, num, enc,
-                            (block128_f) Camellia_encrypt);
+        (block128_f)Camellia_encrypt);
 }
 
 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)
+    size_t length, const CAMELLIA_KEY *key,
+    unsigned char *ivec, int *num, const int enc)
 {
     CRYPTO_cfb128_8_encrypt(in, out, length, key, ivec, num, enc,
-                            (block128_f) Camellia_encrypt);
+        (block128_f)Camellia_encrypt);
 }
diff --git a/crypto/camellia/cmll_ctr.c b/crypto/camellia/cmll_ctr.c
index 26d875e34c418..58a89d7131914 100644
--- a/crypto/camellia/cmll_ctr.c
+++ b/crypto/camellia/cmll_ctr.c
@@ -17,12 +17,12 @@
 #include <openssl/modes.h>
 
 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)
+    size_t length, const CAMELLIA_KEY *key,
+    unsigned char ivec[CAMELLIA_BLOCK_SIZE],
+    unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
+    unsigned int *num)
 {
 
     CRYPTO_ctr128_encrypt(in, out, length, key, ivec, ecount_buf, num,
-                          (block128_f) Camellia_encrypt);
+        (block128_f)Camellia_encrypt);
 }
diff --git a/crypto/camellia/cmll_ecb.c b/crypto/camellia/cmll_ecb.c
index 86ffbd51e6c28..fddf7c7837e87 100644
--- a/crypto/camellia/cmll_ecb.c
+++ b/crypto/camellia/cmll_ecb.c
@@ -17,7 +17,7 @@
 #include "cmll_local.h"
 
 void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                          const CAMELLIA_KEY *key, const int enc)
+    const CAMELLIA_KEY *key, const int enc)
 {
     if (CAMELLIA_ENCRYPT == enc)
         Camellia_encrypt(in, out, key);
diff --git a/crypto/camellia/cmll_local.h b/crypto/camellia/cmll_local.h
index c1d940d3d8f80..f585994ff9e82 100644
--- a/crypto/camellia/cmll_local.h
+++ b/crypto/camellia/cmll_local.h
@@ -23,21 +23,21 @@
  */
 
 #ifndef OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H
-# define OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H
+#define OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H
 
 typedef unsigned int u32;
 typedef unsigned char u8;
 
 int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey,
-                     KEY_TABLE_TYPE keyTable);
+    KEY_TABLE_TYPE keyTable);
 void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[],
-                                  const KEY_TABLE_TYPE keyTable,
-                                  u8 ciphertext[]);
+    const KEY_TABLE_TYPE keyTable,
+    u8 ciphertext[]);
 void Camellia_DecryptBlock_Rounds(int grandRounds, const u8 ciphertext[],
-                                  const KEY_TABLE_TYPE keyTable,
-                                  u8 plaintext[]);
+    const KEY_TABLE_TYPE keyTable,
+    u8 plaintext[]);
 void Camellia_EncryptBlock(int keyBitLength, const u8 plaintext[],
-                           const KEY_TABLE_TYPE keyTable, u8 ciphertext[]);
+    const KEY_TABLE_TYPE keyTable, u8 ciphertext[]);
 void Camellia_DecryptBlock(int keyBitLength, const u8 ciphertext[],
-                           const KEY_TABLE_TYPE keyTable, u8 plaintext[]);
-#endif                          /* #ifndef OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H */
+    const KEY_TABLE_TYPE keyTable, u8 plaintext[]);
+#endif /* #ifndef OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H */
diff --git a/crypto/camellia/cmll_misc.c b/crypto/camellia/cmll_misc.c
index f98dff7e3daa4..30db3a380c160 100644
--- a/crypto/camellia/cmll_misc.c
+++ b/crypto/camellia/cmll_misc.c
@@ -18,7 +18,7 @@
 #include "cmll_local.h"
 
 int Camellia_set_key(const unsigned char *userKey, const int bits,
-                     CAMELLIA_KEY *key)
+    CAMELLIA_KEY *key)
 {
     if (!userKey || !key)
         return -1;
@@ -29,13 +29,13 @@ int Camellia_set_key(const unsigned char *userKey, const int bits,
 }
 
 void Camellia_encrypt(const unsigned char *in, unsigned char *out,
-                      const CAMELLIA_KEY *key)
+    const CAMELLIA_KEY *key)
 {
     Camellia_EncryptBlock_Rounds(key->grand_rounds, in, key->u.rd_key, out);
 }
 
 void Camellia_decrypt(const unsigned char *in, unsigned char *out,
-                      const CAMELLIA_KEY *key)
+    const CAMELLIA_KEY *key)
 {
     Camellia_DecryptBlock_Rounds(key->grand_rounds, in, key->u.rd_key, out);
 }
diff --git a/crypto/camellia/cmll_ofb.c b/crypto/camellia/cmll_ofb.c
index 4eeb0b5b75ee8..93d146c0d638a 100644
--- a/crypto/camellia/cmll_ofb.c
+++ b/crypto/camellia/cmll_ofb.c
@@ -22,9 +22,9 @@
  * used is contained in *num;
  */
 void Camellia_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const CAMELLIA_KEY *key,
-                             unsigned char *ivec, int *num)
+    size_t length, const CAMELLIA_KEY *key,
+    unsigned char *ivec, int *num)
 {
     CRYPTO_ofb128_encrypt(in, out, length, key, ivec, num,
-                          (block128_f) Camellia_encrypt);
+        (block128_f)Camellia_encrypt);
 }
diff --git a/crypto/cast/c_cfb64.c b/crypto/cast/c_cfb64.c
index 97081734ecb79..4170f77a78ebb 100644
--- a/crypto/cast/c_cfb64.c
+++ b/crypto/cast/c_cfb64.c
@@ -23,8 +23,8 @@
  */
 
 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)
 {
     register CAST_LONG v0, v1, t;
     register int n = *num;
diff --git a/crypto/cast/c_ecb.c b/crypto/cast/c_ecb.c
index a0ab660f84895..2f847fdde79b7 100644
--- a/crypto/cast/c_ecb.c
+++ b/crypto/cast/c_ecb.c
@@ -18,7 +18,7 @@
 #include <openssl/opensslv.h>
 
 void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      const CAST_KEY *ks, int enc)
+    const CAST_KEY *ks, int enc)
 {
     CAST_LONG l, d[2];
 
diff --git a/crypto/cast/c_enc.c b/crypto/cast/c_enc.c
index 4ed945a508872..0879373707e34 100644
--- a/crypto/cast/c_enc.c
+++ b/crypto/cast/c_enc.c
@@ -81,8 +81,8 @@ void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key)
 }
 
 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)
 {
     register CAST_LONG tin0, tin1;
     register CAST_LONG tout0, tout1, xor0, xor1;
diff --git a/crypto/cast/c_ofb64.c b/crypto/cast/c_ofb64.c
index d4aa10ff6867f..431446ab5fb71 100644
--- a/crypto/cast/c_ofb64.c
+++ b/crypto/cast/c_ofb64.c
@@ -22,8 +22,8 @@
  * used is contained in *num;
  */
 void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, const CAST_KEY *schedule,
-                        unsigned char *ivec, int *num)
+    long length, const CAST_KEY *schedule,
+    unsigned char *ivec, int *num)
 {
     register CAST_LONG v0, v1, t;
     register int n = *num;
diff --git a/crypto/cast/c_skey.c b/crypto/cast/c_skey.c
index 030e20ea31475..953c6e8efecce 100644
--- a/crypto/cast/c_skey.c
+++ b/crypto/cast/c_skey.c
@@ -17,12 +17,12 @@
 #include "cast_local.h"
 #include "cast_s.h"
 
-#define CAST_exp(l,A,a,n) \
-        A[n/4]=l; \
-        a[n+3]=(l    )&0xff; \
-        a[n+2]=(l>> 8)&0xff; \
-        a[n+1]=(l>>16)&0xff; \
-        a[n+0]=(l>>24)&0xff;
+#define CAST_exp(l, A, a, n)     \
+    A[n / 4] = l;                \
+    a[n + 3] = (l) & 0xff;       \
+    a[n + 2] = (l >> 8) & 0xff;  \
+    a[n + 1] = (l >> 16) & 0xff; \
+    a[n + 0] = (l >> 24) & 0xff;
 
 #define S4 CAST_S_table4
 #define S5 CAST_S_table5
@@ -53,8 +53,7 @@ void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data)
     X[0] = ((x[0] << 24) | (x[1] << 16) | (x[2] << 8) | x[3]) & 0xffffffffL;
     X[1] = ((x[4] << 24) | (x[5] << 16) | (x[6] << 8) | x[7]) & 0xffffffffL;
     X[2] = ((x[8] << 24) | (x[9] << 16) | (x[10] << 8) | x[11]) & 0xffffffffL;
-    X[3] =
-        ((x[12] << 24) | (x[13] << 16) | (x[14] << 8) | x[15]) & 0xffffffffL;
+    X[3] = ((x[12] << 24) | (x[13] << 16) | (x[14] << 8) | x[15]) & 0xffffffffL;
 
     for (;;) {
         l = X[0] ^ S4[x[13]] ^ S5[x[15]] ^ S6[x[12]] ^ S7[x[14]] ^ S6[x[8]];
diff --git a/crypto/cast/cast_local.h b/crypto/cast/cast_local.h
index e99fe0882ae73..f24b8bccdc0c9 100644
--- a/crypto/cast/cast_local.h
+++ b/crypto/cast/cast_local.h
@@ -8,129 +8,154 @@
  */
 
 #ifdef OPENSSL_SYS_WIN32
-# include <stdlib.h>
+#include <stdlib.h>
 #endif
 
 /* NOTE - c is not incremented as per n2l */
-#define n2ln(c,l1,l2,n) { \
-                        c+=n; \
-                        l1=l2=0; \
-                        switch (n) { \
-                        case 8: l2 =((unsigned long)(*(--(c))))    ; \
-                        /* fall through */                              \
-                        case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
-                        /* fall through */                              \
-                        case 6: l2|=((unsigned long)(*(--(c))))<<16; \
-                        /* fall through */                              \
-                        case 5: l2|=((unsigned long)(*(--(c))))<<24; \
-                        /* fall through */                              \
-                        case 4: l1 =((unsigned long)(*(--(c))))    ; \
-                        /* fall through */                              \
-                        case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
-                        /* fall through */                              \
-                        case 2: l1|=((unsigned long)(*(--(c))))<<16; \
-                        /* fall through */                              \
-                        case 1: l1|=((unsigned long)(*(--(c))))<<24; \
-                                } \
-                        }
+#define n2ln(c, l1, l2, n)                           \
+    {                                                \
+        c += n;                                      \
+        l1 = l2 = 0;                                 \
+        switch (n) {                                 \
+        case 8:                                      \
+            l2 = ((unsigned long)(*(--(c))));        \
+        /* fall through */                           \
+        case 7:                                      \
+            l2 |= ((unsigned long)(*(--(c)))) << 8;  \
+        /* fall through */                           \
+        case 6:                                      \
+            l2 |= ((unsigned long)(*(--(c)))) << 16; \
+        /* fall through */                           \
+        case 5:                                      \
+            l2 |= ((unsigned long)(*(--(c)))) << 24; \
+        /* fall through */                           \
+        case 4:                                      \
+            l1 = ((unsigned long)(*(--(c))));        \
+        /* fall through */                           \
+        case 3:                                      \
+            l1 |= ((unsigned long)(*(--(c)))) << 8;  \
+        /* fall through */                           \
+        case 2:                                      \
+            l1 |= ((unsigned long)(*(--(c)))) << 16; \
+        /* fall through */                           \
+        case 1:                                      \
+            l1 |= ((unsigned long)(*(--(c)))) << 24; \
+        }                                            \
+    }
 
 /* NOTE - c is not incremented as per l2n */
-#define l2nn(l1,l2,c,n) { \
-                        c+=n; \
-                        switch (n) { \
-                        case 8: *(--(c))=(unsigned char)(((l2)    )&0xff); \
-                        /* fall through */                                    \
-                        case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
-                        /* fall through */                                    \
-                        case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
-                        /* fall through */                                    \
-                        case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
-                        /* fall through */                                    \
-                        case 4: *(--(c))=(unsigned char)(((l1)    )&0xff); \
-                        /* fall through */                                    \
-                        case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
-                        /* fall through */                                    \
-                        case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
-                        /* fall through */                                    \
-                        case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
-                                } \
-                        }
+#define l2nn(l1, l2, c, n)                                   \
+    {                                                        \
+        c += n;                                              \
+        switch (n) {                                         \
+        case 8:                                              \
+            *(--(c)) = (unsigned char)(((l2)) & 0xff);       \
+        /* fall through */                                   \
+        case 7:                                              \
+            *(--(c)) = (unsigned char)(((l2) >> 8) & 0xff);  \
+        /* fall through */                                   \
+        case 6:                                              \
+            *(--(c)) = (unsigned char)(((l2) >> 16) & 0xff); \
+        /* fall through */                                   \
+        case 5:                                              \
+            *(--(c)) = (unsigned char)(((l2) >> 24) & 0xff); \
+        /* fall through */                                   \
+        case 4:                                              \
+            *(--(c)) = (unsigned char)(((l1)) & 0xff);       \
+        /* fall through */                                   \
+        case 3:                                              \
+            *(--(c)) = (unsigned char)(((l1) >> 8) & 0xff);  \
+        /* fall through */                                   \
+        case 2:                                              \
+            *(--(c)) = (unsigned char)(((l1) >> 16) & 0xff); \
+        /* fall through */                                   \
+        case 1:                                              \
+            *(--(c)) = (unsigned char)(((l1) >> 24) & 0xff); \
+        }                                                    \
+    }
 
 #undef n2l
-#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L, \
-                         l|=((unsigned long)(*((c)++)))<<16L, \
-                         l|=((unsigned long)(*((c)++)))<< 8L, \
-                         l|=((unsigned long)(*((c)++))))
+#define n2l(c, l) (l = ((unsigned long)(*((c)++))) << 24L, \
+    l |= ((unsigned long)(*((c)++))) << 16L,               \
+    l |= ((unsigned long)(*((c)++))) << 8L,                \
+    l |= ((unsigned long)(*((c)++))))
 
 #undef l2n
-#define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)     )&0xff))
+#define l2n(l, c) (*((c)++) = (unsigned char)(((l) >> 24L) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 16L) & 0xff),                \
+    *((c)++) = (unsigned char)(((l) >> 8L) & 0xff),                 \
+    *((c)++) = (unsigned char)(((l)) & 0xff))
 
 #if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)
-# define ROTL(a,n)     (_lrotl(a,n))
+#define ROTL(a, n) (_lrotl(a, n))
 #else
-# define ROTL(a,n)     ((((a)<<(n))&0xffffffffL)|((a)>>((32-(n))&31)))
+#define ROTL(a, n) ((((a) << (n)) & 0xffffffffL) | ((a) >> ((32 - (n)) & 31)))
 #endif
 
-#define C_M    0x3fc
-#define C_0    22L
-#define C_1    14L
-#define C_2     6L
-#define C_3     2L              /* left shift */
+#define C_M 0x3fc
+#define C_0 22L
+#define C_1 14L
+#define C_2 6L
+#define C_3 2L /* left shift */
 
 /* The rotate has an extra 16 added to it to help the x86 asm */
 #if defined(CAST_PTR)
-# define E_CAST(n,key,L,R,OP1,OP2,OP3) \
-        { \
-        int i; \
-        t=(key[n*2] OP1 R)&0xffffffffL; \
-        i=key[n*2+1]; \
-        t=ROTL(t,i); \
-        L^= (((((*(CAST_LONG *)((unsigned char *) \
-                        CAST_S_table0+((t>>C_2)&C_M)) OP2 \
-                *(CAST_LONG *)((unsigned char *) \
-                        CAST_S_table1+((t<<C_3)&C_M)))&0xffffffffL) OP3 \
-                *(CAST_LONG *)((unsigned char *) \
-                        CAST_S_table2+((t>>C_0)&C_M)))&0xffffffffL) OP1 \
-                *(CAST_LONG *)((unsigned char *) \
-                        CAST_S_table3+((t>>C_1)&C_M)))&0xffffffffL; \
-        }
+#define E_CAST(n, key, L, R, OP1, OP2, OP3)            \
+    {                                                  \
+        int i;                                         \
+        t = (key[n * 2] OP1 R) & 0xffffffffL;          \
+        i = key[n * 2 + 1];                            \
+        t = ROTL(t, i);                                \
+        L ^= (((((*(CAST_LONG *)((unsigned char *)     \
+                                     CAST_S_table0     \
+                      + ((t >> C_2) & C_M)) OP2        \
+                     * (CAST_LONG *)((unsigned char *) \
+                                         CAST_S_table1 \
+                         + ((t << C_3) & C_M)))        \
+                    & 0xffffffffL) OP3                 \
+                   * (CAST_LONG *)((unsigned char *)   \
+                                       CAST_S_table2   \
+                       + ((t >> C_0) & C_M)))          \
+                  & 0xffffffffL) OP1                   \
+                 * (CAST_LONG *)((unsigned char *)     \
+                                     CAST_S_table3     \
+                     + ((t >> C_1) & C_M)))            \
+            & 0xffffffffL;                             \
+    }
 #elif defined(CAST_PTR2)
-# define E_CAST(n,key,L,R,OP1,OP2,OP3) \
-        { \
-        int i; \
-        CAST_LONG u,v,w; \
-        w=(key[n*2] OP1 R)&0xffffffffL; \
-        i=key[n*2+1]; \
-        w=ROTL(w,i); \
-        u=w>>C_2; \
-        v=w<<C_3; \
-        u&=C_M; \
-        v&=C_M; \
-        t= *(CAST_LONG *)((unsigned char *)CAST_S_table0+u); \
-        u=w>>C_0; \
-        t=(t OP2 *(CAST_LONG *)((unsigned char *)CAST_S_table1+v))&0xffffffffL;\
-        v=w>>C_1; \
-        u&=C_M; \
-        v&=C_M; \
-        t=(t OP3 *(CAST_LONG *)((unsigned char *)CAST_S_table2+u)&0xffffffffL);\
-        t=(t OP1 *(CAST_LONG *)((unsigned char *)CAST_S_table3+v)&0xffffffffL);\
-        L^=(t&0xffffffff); \
-        }
+#define E_CAST(n, key, L, R, OP1, OP2, OP3)                                            \
+    {                                                                                  \
+        int i;                                                                         \
+        CAST_LONG u, v, w;                                                             \
+        w = (key[n * 2] OP1 R) & 0xffffffffL;                                          \
+        i = key[n * 2 + 1];                                                            \
+        w = ROTL(w, i);                                                                \
+        u = w >> C_2;                                                                  \
+        v = w << C_3;                                                                  \
+        u &= C_M;                                                                      \
+        v &= C_M;                                                                      \
+        t = *(CAST_LONG *)((unsigned char *)CAST_S_table0 + u);                        \
+        u = w >> C_0;                                                                  \
+        t = (t OP2 * (CAST_LONG *)((unsigned char *)CAST_S_table1 + v)) & 0xffffffffL; \
+        v = w >> C_1;                                                                  \
+        u &= C_M;                                                                      \
+        v &= C_M;                                                                      \
+        t = (t OP3 * (CAST_LONG *)((unsigned char *)CAST_S_table2 + u) & 0xffffffffL); \
+        t = (t OP1 * (CAST_LONG *)((unsigned char *)CAST_S_table3 + v) & 0xffffffffL); \
+        L ^= (t & 0xffffffff);                                                         \
+    }
 #else
-# define E_CAST(n,key,L,R,OP1,OP2,OP3) \
-        { \
-        CAST_LONG a,b,c,d; \
-        t=(key[n*2] OP1 R)&0xffffffff; \
-        t=ROTL(t,(key[n*2+1])); \
-        a=CAST_S_table0[(t>> 8)&0xff]; \
-        b=CAST_S_table1[(t    )&0xff]; \
-        c=CAST_S_table2[(t>>24)&0xff]; \
-        d=CAST_S_table3[(t>>16)&0xff]; \
-        L^=(((((a OP2 b)&0xffffffffL) OP3 c)&0xffffffffL) OP1 d)&0xffffffffL; \
-        }
+#define E_CAST(n, key, L, R, OP1, OP2, OP3)                                           \
+    {                                                                                 \
+        CAST_LONG a, b, c, d;                                                         \
+        t = (key[n * 2] OP1 R) & 0xffffffff;                                          \
+        t = ROTL(t, (key[n * 2 + 1]));                                                \
+        a = CAST_S_table0[(t >> 8) & 0xff];                                           \
+        b = CAST_S_table1[(t) & 0xff];                                                \
+        c = CAST_S_table2[(t >> 24) & 0xff];                                          \
+        d = CAST_S_table3[(t >> 16) & 0xff];                                          \
+        L ^= (((((a OP2 b) & 0xffffffffL) OP3 c) & 0xffffffffL) OP1 d) & 0xffffffffL; \
+    }
 #endif
 
 extern const CAST_LONG CAST_S_table0[256];
diff --git a/crypto/cast/cast_s.h b/crypto/cast/cast_s.h
index 57163d17e124c..345b4dd731763 100644
--- a/crypto/cast/cast_s.h
+++ b/crypto/cast/cast_s.h
@@ -8,537 +8,2073 @@
  */
 
 const CAST_LONG CAST_S_table0[256] = {
-    0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a,
-    0x1e213f2f, 0x9c004dd3, 0x6003e540, 0xcf9fc949,
-    0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675,
-    0x6e63a0e0, 0x15c361d2, 0xc2e7661d, 0x22d4ff8e,
-    0x28683b6f, 0xc07fd059, 0xff2379c8, 0x775f50e2,
-    0x43c340d3, 0xdf2f8656, 0x887ca41a, 0xa2d2bd2d,
-    0xa1c9e0d6, 0x346c4819, 0x61b76d87, 0x22540f2f,
-    0x2abe32e1, 0xaa54166b, 0x22568e3a, 0xa2d341d0,
-    0x66db40c8, 0xa784392f, 0x004dff2f, 0x2db9d2de,
-    0x97943fac, 0x4a97c1d8, 0x527644b7, 0xb5f437a7,
-    0xb82cbaef, 0xd751d159, 0x6ff7f0ed, 0x5a097a1f,
-    0x827b68d0, 0x90ecf52e, 0x22b0c054, 0xbc8e5935,
-    0x4b6d2f7f, 0x50bb64a2, 0xd2664910, 0xbee5812d,
-    0xb7332290, 0xe93b159f, 0xb48ee411, 0x4bff345d,
-    0xfd45c240, 0xad31973f, 0xc4f6d02e, 0x55fc8165,
-    0xd5b1caad, 0xa1ac2dae, 0xa2d4b76d, 0xc19b0c50,
-    0x882240f2, 0x0c6e4f38, 0xa4e4bfd7, 0x4f5ba272,
-    0x564c1d2f, 0xc59c5319, 0xb949e354, 0xb04669fe,
-    0xb1b6ab8a, 0xc71358dd, 0x6385c545, 0x110f935d,
-    0x57538ad5, 0x6a390493, 0xe63d37e0, 0x2a54f6b3,
-    0x3a787d5f, 0x6276a0b5, 0x19a6fcdf, 0x7a42206a,
-    0x29f9d4d5, 0xf61b1891, 0xbb72275e, 0xaa508167,
-    0x38901091, 0xc6b505eb, 0x84c7cb8c, 0x2ad75a0f,
-    0x874a1427, 0xa2d1936b, 0x2ad286af, 0xaa56d291,
-    0xd7894360, 0x425c750d, 0x93b39e26, 0x187184c9,
-    0x6c00b32d, 0x73e2bb14, 0xa0bebc3c, 0x54623779,
-    0x64459eab, 0x3f328b82, 0x7718cf82, 0x59a2cea6,
-    0x04ee002e, 0x89fe78e6, 0x3fab0950, 0x325ff6c2,
-    0x81383f05, 0x6963c5c8, 0x76cb5ad6, 0xd49974c9,
-    0xca180dcf, 0x380782d5, 0xc7fa5cf6, 0x8ac31511,
-    0x35e79e13, 0x47da91d0, 0xf40f9086, 0xa7e2419e,
-    0x31366241, 0x051ef495, 0xaa573b04, 0x4a805d8d,
-    0x548300d0, 0x00322a3c, 0xbf64cddf, 0xba57a68e,
-    0x75c6372b, 0x50afd341, 0xa7c13275, 0x915a0bf5,
-    0x6b54bfab, 0x2b0b1426, 0xab4cc9d7, 0x449ccd82,
-    0xf7fbf265, 0xab85c5f3, 0x1b55db94, 0xaad4e324,
-    0xcfa4bd3f, 0x2deaa3e2, 0x9e204d02, 0xc8bd25ac,
-    0xeadf55b3, 0xd5bd9e98, 0xe31231b2, 0x2ad5ad6c,
-    0x954329de, 0xadbe4528, 0xd8710f69, 0xaa51c90f,
-    0xaa786bf6, 0x22513f1e, 0xaa51a79b, 0x2ad344cc,
-    0x7b5a41f0, 0xd37cfbad, 0x1b069505, 0x41ece491,
-    0xb4c332e6, 0x032268d4, 0xc9600acc, 0xce387e6d,
-    0xbf6bb16c, 0x6a70fb78, 0x0d03d9c9, 0xd4df39de,
-    0xe01063da, 0x4736f464, 0x5ad328d8, 0xb347cc96,
-    0x75bb0fc3, 0x98511bfb, 0x4ffbcc35, 0xb58bcf6a,
-    0xe11f0abc, 0xbfc5fe4a, 0xa70aec10, 0xac39570a,
-    0x3f04442f, 0x6188b153, 0xe0397a2e, 0x5727cb79,
-    0x9ceb418f, 0x1cacd68d, 0x2ad37c96, 0x0175cb9d,
-    0xc69dff09, 0xc75b65f0, 0xd9db40d8, 0xec0e7779,
-    0x4744ead4, 0xb11c3274, 0xdd24cb9e, 0x7e1c54bd,
-    0xf01144f9, 0xd2240eb1, 0x9675b3fd, 0xa3ac3755,
-    0xd47c27af, 0x51c85f4d, 0x56907596, 0xa5bb15e6,
-    0x580304f0, 0xca042cf1, 0x011a37ea, 0x8dbfaadb,
-    0x35ba3e4a, 0x3526ffa0, 0xc37b4d09, 0xbc306ed9,
-    0x98a52666, 0x5648f725, 0xff5e569d, 0x0ced63d0,
-    0x7c63b2cf, 0x700b45e1, 0xd5ea50f1, 0x85a92872,
-    0xaf1fbda7, 0xd4234870, 0xa7870bf3, 0x2d3b4d79,
-    0x42e04198, 0x0cd0ede7, 0x26470db8, 0xf881814c,
-    0x474d6ad7, 0x7c0c5e5c, 0xd1231959, 0x381b7298,
-    0xf5d2f4db, 0xab838653, 0x6e2f1e23, 0x83719c9e,
-    0xbd91e046, 0x9a56456e, 0xdc39200c, 0x20c8c571,
-    0x962bda1c, 0xe1e696ff, 0xb141ab08, 0x7cca89b9,
-    0x1a69e783, 0x02cc4843, 0xa2f7c579, 0x429ef47d,
-    0x427b169c, 0x5ac9f049, 0xdd8f0f00, 0x5c8165bf,
+    0x30fb40d4,
+    0x9fa0ff0b,
+    0x6beccd2f,
+    0x3f258c7a,
+    0x1e213f2f,
+    0x9c004dd3,
+    0x6003e540,
+    0xcf9fc949,
+    0xbfd4af27,
+    0x88bbbdb5,
+    0xe2034090,
+    0x98d09675,
+    0x6e63a0e0,
+    0x15c361d2,
+    0xc2e7661d,
+    0x22d4ff8e,
+    0x28683b6f,
+    0xc07fd059,
+    0xff2379c8,
+    0x775f50e2,
+    0x43c340d3,
+    0xdf2f8656,
+    0x887ca41a,
+    0xa2d2bd2d,
+    0xa1c9e0d6,
+    0x346c4819,
+    0x61b76d87,
+    0x22540f2f,
+    0x2abe32e1,
+    0xaa54166b,
+    0x22568e3a,
+    0xa2d341d0,
+    0x66db40c8,
+    0xa784392f,
+    0x004dff2f,
+    0x2db9d2de,
+    0x97943fac,
+    0x4a97c1d8,
+    0x527644b7,
+    0xb5f437a7,
+    0xb82cbaef,
+    0xd751d159,
+    0x6ff7f0ed,
+    0x5a097a1f,
+    0x827b68d0,
+    0x90ecf52e,
+    0x22b0c054,
+    0xbc8e5935,
+    0x4b6d2f7f,
+    0x50bb64a2,
+    0xd2664910,
+    0xbee5812d,
+    0xb7332290,
+    0xe93b159f,
+    0xb48ee411,
+    0x4bff345d,
+    0xfd45c240,
+    0xad31973f,
+    0xc4f6d02e,
+    0x55fc8165,
+    0xd5b1caad,
+    0xa1ac2dae,
+    0xa2d4b76d,
+    0xc19b0c50,
+    0x882240f2,
+    0x0c6e4f38,
+    0xa4e4bfd7,
+    0x4f5ba272,
+    0x564c1d2f,
+    0xc59c5319,
+    0xb949e354,
+    0xb04669fe,
+    0xb1b6ab8a,
+    0xc71358dd,
+    0x6385c545,
+    0x110f935d,
+    0x57538ad5,
+    0x6a390493,
+    0xe63d37e0,
+    0x2a54f6b3,
+    0x3a787d5f,
+    0x6276a0b5,
+    0x19a6fcdf,
+    0x7a42206a,
+    0x29f9d4d5,
+    0xf61b1891,
+    0xbb72275e,
+    0xaa508167,
+    0x38901091,
+    0xc6b505eb,
+    0x84c7cb8c,
+    0x2ad75a0f,
+    0x874a1427,
+    0xa2d1936b,
+    0x2ad286af,
+    0xaa56d291,
+    0xd7894360,
+    0x425c750d,
+    0x93b39e26,
+    0x187184c9,
+    0x6c00b32d,
+    0x73e2bb14,
+    0xa0bebc3c,
+    0x54623779,
+    0x64459eab,
+    0x3f328b82,
+    0x7718cf82,
+    0x59a2cea6,
+    0x04ee002e,
+    0x89fe78e6,
+    0x3fab0950,
+    0x325ff6c2,
+    0x81383f05,
+    0x6963c5c8,
+    0x76cb5ad6,
+    0xd49974c9,
+    0xca180dcf,
+    0x380782d5,
+    0xc7fa5cf6,
+    0x8ac31511,
+    0x35e79e13,
+    0x47da91d0,
+    0xf40f9086,
+    0xa7e2419e,
+    0x31366241,
+    0x051ef495,
+    0xaa573b04,
+    0x4a805d8d,
+    0x548300d0,
+    0x00322a3c,
+    0xbf64cddf,
+    0xba57a68e,
+    0x75c6372b,
+    0x50afd341,
+    0xa7c13275,
+    0x915a0bf5,
+    0x6b54bfab,
+    0x2b0b1426,
+    0xab4cc9d7,
+    0x449ccd82,
+    0xf7fbf265,
+    0xab85c5f3,
+    0x1b55db94,
+    0xaad4e324,
+    0xcfa4bd3f,
+    0x2deaa3e2,
+    0x9e204d02,
+    0xc8bd25ac,
+    0xeadf55b3,
+    0xd5bd9e98,
+    0xe31231b2,
+    0x2ad5ad6c,
+    0x954329de,
+    0xadbe4528,
+    0xd8710f69,
+    0xaa51c90f,
+    0xaa786bf6,
+    0x22513f1e,
+    0xaa51a79b,
+    0x2ad344cc,
+    0x7b5a41f0,
+    0xd37cfbad,
+    0x1b069505,
+    0x41ece491,
+    0xb4c332e6,
+    0x032268d4,
+    0xc9600acc,
+    0xce387e6d,
+    0xbf6bb16c,
+    0x6a70fb78,
+    0x0d03d9c9,
+    0xd4df39de,
+    0xe01063da,
+    0x4736f464,
+    0x5ad328d8,
+    0xb347cc96,
+    0x75bb0fc3,
+    0x98511bfb,
+    0x4ffbcc35,
+    0xb58bcf6a,
+    0xe11f0abc,
+    0xbfc5fe4a,
+    0xa70aec10,
+    0xac39570a,
+    0x3f04442f,
+    0x6188b153,
+    0xe0397a2e,
+    0x5727cb79,
+    0x9ceb418f,
+    0x1cacd68d,
+    0x2ad37c96,
+    0x0175cb9d,
+    0xc69dff09,
+    0xc75b65f0,
+    0xd9db40d8,
+    0xec0e7779,
+    0x4744ead4,
+    0xb11c3274,
+    0xdd24cb9e,
+    0x7e1c54bd,
+    0xf01144f9,
+    0xd2240eb1,
+    0x9675b3fd,
+    0xa3ac3755,
+    0xd47c27af,
+    0x51c85f4d,
+    0x56907596,
+    0xa5bb15e6,
+    0x580304f0,
+    0xca042cf1,
+    0x011a37ea,
+    0x8dbfaadb,
+    0x35ba3e4a,
+    0x3526ffa0,
+    0xc37b4d09,
+    0xbc306ed9,
+    0x98a52666,
+    0x5648f725,
+    0xff5e569d,
+    0x0ced63d0,
+    0x7c63b2cf,
+    0x700b45e1,
+    0xd5ea50f1,
+    0x85a92872,
+    0xaf1fbda7,
+    0xd4234870,
+    0xa7870bf3,
+    0x2d3b4d79,
+    0x42e04198,
+    0x0cd0ede7,
+    0x26470db8,
+    0xf881814c,
+    0x474d6ad7,
+    0x7c0c5e5c,
+    0xd1231959,
+    0x381b7298,
+    0xf5d2f4db,
+    0xab838653,
+    0x6e2f1e23,
+    0x83719c9e,
+    0xbd91e046,
+    0x9a56456e,
+    0xdc39200c,
+    0x20c8c571,
+    0x962bda1c,
+    0xe1e696ff,
+    0xb141ab08,
+    0x7cca89b9,
+    0x1a69e783,
+    0x02cc4843,
+    0xa2f7c579,
+    0x429ef47d,
+    0x427b169c,
+    0x5ac9f049,
+    0xdd8f0f00,
+    0x5c8165bf,
 };
 
 const CAST_LONG CAST_S_table1[256] = {
-    0x1f201094, 0xef0ba75b, 0x69e3cf7e, 0x393f4380,
-    0xfe61cf7a, 0xeec5207a, 0x55889c94, 0x72fc0651,
-    0xada7ef79, 0x4e1d7235, 0xd55a63ce, 0xde0436ba,
-    0x99c430ef, 0x5f0c0794, 0x18dcdb7d, 0xa1d6eff3,
-    0xa0b52f7b, 0x59e83605, 0xee15b094, 0xe9ffd909,
-    0xdc440086, 0xef944459, 0xba83ccb3, 0xe0c3cdfb,
-    0xd1da4181, 0x3b092ab1, 0xf997f1c1, 0xa5e6cf7b,
-    0x01420ddb, 0xe4e7ef5b, 0x25a1ff41, 0xe180f806,
-    0x1fc41080, 0x179bee7a, 0xd37ac6a9, 0xfe5830a4,
-    0x98de8b7f, 0x77e83f4e, 0x79929269, 0x24fa9f7b,
-    0xe113c85b, 0xacc40083, 0xd7503525, 0xf7ea615f,
-    0x62143154, 0x0d554b63, 0x5d681121, 0xc866c359,
-    0x3d63cf73, 0xcee234c0, 0xd4d87e87, 0x5c672b21,
-    0x071f6181, 0x39f7627f, 0x361e3084, 0xe4eb573b,
-    0x602f64a4, 0xd63acd9c, 0x1bbc4635, 0x9e81032d,
-    0x2701f50c, 0x99847ab4, 0xa0e3df79, 0xba6cf38c,
-    0x10843094, 0x2537a95e, 0xf46f6ffe, 0xa1ff3b1f,
-    0x208cfb6a, 0x8f458c74, 0xd9e0a227, 0x4ec73a34,
-    0xfc884f69, 0x3e4de8df, 0xef0e0088, 0x3559648d,
-    0x8a45388c, 0x1d804366, 0x721d9bfd, 0xa58684bb,
-    0xe8256333, 0x844e8212, 0x128d8098, 0xfed33fb4,
-    0xce280ae1, 0x27e19ba5, 0xd5a6c252, 0xe49754bd,
-    0xc5d655dd, 0xeb667064, 0x77840b4d, 0xa1b6a801,
-    0x84db26a9, 0xe0b56714, 0x21f043b7, 0xe5d05860,
-    0x54f03084, 0x066ff472, 0xa31aa153, 0xdadc4755,
-    0xb5625dbf, 0x68561be6, 0x83ca6b94, 0x2d6ed23b,
-    0xeccf01db, 0xa6d3d0ba, 0xb6803d5c, 0xaf77a709,
-    0x33b4a34c, 0x397bc8d6, 0x5ee22b95, 0x5f0e5304,
-    0x81ed6f61, 0x20e74364, 0xb45e1378, 0xde18639b,
-    0x881ca122, 0xb96726d1, 0x8049a7e8, 0x22b7da7b,
-    0x5e552d25, 0x5272d237, 0x79d2951c, 0xc60d894c,
-    0x488cb402, 0x1ba4fe5b, 0xa4b09f6b, 0x1ca815cf,
-    0xa20c3005, 0x8871df63, 0xb9de2fcb, 0x0cc6c9e9,
-    0x0beeff53, 0xe3214517, 0xb4542835, 0x9f63293c,
-    0xee41e729, 0x6e1d2d7c, 0x50045286, 0x1e6685f3,
-    0xf33401c6, 0x30a22c95, 0x31a70850, 0x60930f13,
-    0x73f98417, 0xa1269859, 0xec645c44, 0x52c877a9,
-    0xcdff33a6, 0xa02b1741, 0x7cbad9a2, 0x2180036f,
-    0x50d99c08, 0xcb3f4861, 0xc26bd765, 0x64a3f6ab,
-    0x80342676, 0x25a75e7b, 0xe4e6d1fc, 0x20c710e6,
-    0xcdf0b680, 0x17844d3b, 0x31eef84d, 0x7e0824e4,
-    0x2ccb49eb, 0x846a3bae, 0x8ff77888, 0xee5d60f6,
-    0x7af75673, 0x2fdd5cdb, 0xa11631c1, 0x30f66f43,
-    0xb3faec54, 0x157fd7fa, 0xef8579cc, 0xd152de58,
-    0xdb2ffd5e, 0x8f32ce19, 0x306af97a, 0x02f03ef8,
-    0x99319ad5, 0xc242fa0f, 0xa7e3ebb0, 0xc68e4906,
-    0xb8da230c, 0x80823028, 0xdcdef3c8, 0xd35fb171,
-    0x088a1bc8, 0xbec0c560, 0x61a3c9e8, 0xbca8f54d,
-    0xc72feffa, 0x22822e99, 0x82c570b4, 0xd8d94e89,
-    0x8b1c34bc, 0x301e16e6, 0x273be979, 0xb0ffeaa6,
-    0x61d9b8c6, 0x00b24869, 0xb7ffce3f, 0x08dc283b,
-    0x43daf65a, 0xf7e19798, 0x7619b72f, 0x8f1c9ba4,
-    0xdc8637a0, 0x16a7d3b1, 0x9fc393b7, 0xa7136eeb,
-    0xc6bcc63e, 0x1a513742, 0xef6828bc, 0x520365d6,
-    0x2d6a77ab, 0x3527ed4b, 0x821fd216, 0x095c6e2e,
-    0xdb92f2fb, 0x5eea29cb, 0x145892f5, 0x91584f7f,
-    0x5483697b, 0x2667a8cc, 0x85196048, 0x8c4bacea,
-    0x833860d4, 0x0d23e0f9, 0x6c387e8a, 0x0ae6d249,
-    0xb284600c, 0xd835731d, 0xdcb1c647, 0xac4c56ea,
-    0x3ebd81b3, 0x230eabb0, 0x6438bc87, 0xf0b5b1fa,
-    0x8f5ea2b3, 0xfc184642, 0x0a036b7a, 0x4fb089bd,
-    0x649da589, 0xa345415e, 0x5c038323, 0x3e5d3bb9,
-    0x43d79572, 0x7e6dd07c, 0x06dfdf1e, 0x6c6cc4ef,
-    0x7160a539, 0x73bfbe70, 0x83877605, 0x4523ecf1,
+    0x1f201094,
+    0xef0ba75b,
+    0x69e3cf7e,
+    0x393f4380,
+    0xfe61cf7a,
+    0xeec5207a,
+    0x55889c94,
+    0x72fc0651,
+    0xada7ef79,
+    0x4e1d7235,
+    0xd55a63ce,
+    0xde0436ba,
+    0x99c430ef,
+    0x5f0c0794,
+    0x18dcdb7d,
+    0xa1d6eff3,
+    0xa0b52f7b,
+    0x59e83605,
+    0xee15b094,
+    0xe9ffd909,
+    0xdc440086,
+    0xef944459,
+    0xba83ccb3,
+    0xe0c3cdfb,
+    0xd1da4181,
+    0x3b092ab1,
+    0xf997f1c1,
+    0xa5e6cf7b,
+    0x01420ddb,
+    0xe4e7ef5b,
+    0x25a1ff41,
+    0xe180f806,
+    0x1fc41080,
+    0x179bee7a,
+    0xd37ac6a9,
+    0xfe5830a4,
+    0x98de8b7f,
+    0x77e83f4e,
+    0x79929269,
+    0x24fa9f7b,
+    0xe113c85b,
+    0xacc40083,
+    0xd7503525,
+    0xf7ea615f,
+    0x62143154,
+    0x0d554b63,
+    0x5d681121,
+    0xc866c359,
+    0x3d63cf73,
+    0xcee234c0,
+    0xd4d87e87,
+    0x5c672b21,
+    0x071f6181,
+    0x39f7627f,
+    0x361e3084,
+    0xe4eb573b,
+    0x602f64a4,
+    0xd63acd9c,
+    0x1bbc4635,
+    0x9e81032d,
+    0x2701f50c,
+    0x99847ab4,
+    0xa0e3df79,
+    0xba6cf38c,
+    0x10843094,
+    0x2537a95e,
+    0xf46f6ffe,
+    0xa1ff3b1f,
+    0x208cfb6a,
+    0x8f458c74,
+    0xd9e0a227,
+    0x4ec73a34,
+    0xfc884f69,
+    0x3e4de8df,
+    0xef0e0088,
+    0x3559648d,
+    0x8a45388c,
+    0x1d804366,
+    0x721d9bfd,
+    0xa58684bb,
+    0xe8256333,
+    0x844e8212,
+    0x128d8098,
+    0xfed33fb4,
+    0xce280ae1,
+    0x27e19ba5,
+    0xd5a6c252,
+    0xe49754bd,
+    0xc5d655dd,
+    0xeb667064,
+    0x77840b4d,
+    0xa1b6a801,
+    0x84db26a9,
+    0xe0b56714,
+    0x21f043b7,
+    0xe5d05860,
+    0x54f03084,
+    0x066ff472,
+    0xa31aa153,
+    0xdadc4755,
+    0xb5625dbf,
+    0x68561be6,
+    0x83ca6b94,
+    0x2d6ed23b,
+    0xeccf01db,
+    0xa6d3d0ba,
+    0xb6803d5c,
+    0xaf77a709,
+    0x33b4a34c,
+    0x397bc8d6,
+    0x5ee22b95,
+    0x5f0e5304,
+    0x81ed6f61,
+    0x20e74364,
+    0xb45e1378,
+    0xde18639b,
+    0x881ca122,
+    0xb96726d1,
+    0x8049a7e8,
+    0x22b7da7b,
+    0x5e552d25,
+    0x5272d237,
+    0x79d2951c,
+    0xc60d894c,
+    0x488cb402,
+    0x1ba4fe5b,
+    0xa4b09f6b,
+    0x1ca815cf,
+    0xa20c3005,
+    0x8871df63,
+    0xb9de2fcb,
+    0x0cc6c9e9,
+    0x0beeff53,
+    0xe3214517,
+    0xb4542835,
+    0x9f63293c,
+    0xee41e729,
+    0x6e1d2d7c,
+    0x50045286,
+    0x1e6685f3,
+    0xf33401c6,
+    0x30a22c95,
+    0x31a70850,
+    0x60930f13,
+    0x73f98417,
+    0xa1269859,
+    0xec645c44,
+    0x52c877a9,
+    0xcdff33a6,
+    0xa02b1741,
+    0x7cbad9a2,
+    0x2180036f,
+    0x50d99c08,
+    0xcb3f4861,
+    0xc26bd765,
+    0x64a3f6ab,
+    0x80342676,
+    0x25a75e7b,
+    0xe4e6d1fc,
+    0x20c710e6,
+    0xcdf0b680,
+    0x17844d3b,
+    0x31eef84d,
+    0x7e0824e4,
+    0x2ccb49eb,
+    0x846a3bae,
+    0x8ff77888,
+    0xee5d60f6,
+    0x7af75673,
+    0x2fdd5cdb,
+    0xa11631c1,
+    0x30f66f43,
+    0xb3faec54,
+    0x157fd7fa,
+    0xef8579cc,
+    0xd152de58,
+    0xdb2ffd5e,
+    0x8f32ce19,
+    0x306af97a,
+    0x02f03ef8,
+    0x99319ad5,
+    0xc242fa0f,
+    0xa7e3ebb0,
+    0xc68e4906,
+    0xb8da230c,
+    0x80823028,
+    0xdcdef3c8,
+    0xd35fb171,
+    0x088a1bc8,
+    0xbec0c560,
+    0x61a3c9e8,
+    0xbca8f54d,
+    0xc72feffa,
+    0x22822e99,
+    0x82c570b4,
+    0xd8d94e89,
+    0x8b1c34bc,
+    0x301e16e6,
+    0x273be979,
+    0xb0ffeaa6,
+    0x61d9b8c6,
+    0x00b24869,
+    0xb7ffce3f,
+    0x08dc283b,
+    0x43daf65a,
+    0xf7e19798,
+    0x7619b72f,
+    0x8f1c9ba4,
+    0xdc8637a0,
+    0x16a7d3b1,
+    0x9fc393b7,
+    0xa7136eeb,
+    0xc6bcc63e,
+    0x1a513742,
+    0xef6828bc,
+    0x520365d6,
+    0x2d6a77ab,
+    0x3527ed4b,
+    0x821fd216,
+    0x095c6e2e,
+    0xdb92f2fb,
+    0x5eea29cb,
+    0x145892f5,
+    0x91584f7f,
+    0x5483697b,
+    0x2667a8cc,
+    0x85196048,
+    0x8c4bacea,
+    0x833860d4,
+    0x0d23e0f9,
+    0x6c387e8a,
+    0x0ae6d249,
+    0xb284600c,
+    0xd835731d,
+    0xdcb1c647,
+    0xac4c56ea,
+    0x3ebd81b3,
+    0x230eabb0,
+    0x6438bc87,
+    0xf0b5b1fa,
+    0x8f5ea2b3,
+    0xfc184642,
+    0x0a036b7a,
+    0x4fb089bd,
+    0x649da589,
+    0xa345415e,
+    0x5c038323,
+    0x3e5d3bb9,
+    0x43d79572,
+    0x7e6dd07c,
+    0x06dfdf1e,
+    0x6c6cc4ef,
+    0x7160a539,
+    0x73bfbe70,
+    0x83877605,
+    0x4523ecf1,
 };
 
 const CAST_LONG CAST_S_table2[256] = {
-    0x8defc240, 0x25fa5d9f, 0xeb903dbf, 0xe810c907,
-    0x47607fff, 0x369fe44b, 0x8c1fc644, 0xaececa90,
-    0xbeb1f9bf, 0xeefbcaea, 0xe8cf1950, 0x51df07ae,
-    0x920e8806, 0xf0ad0548, 0xe13c8d83, 0x927010d5,
-    0x11107d9f, 0x07647db9, 0xb2e3e4d4, 0x3d4f285e,
-    0xb9afa820, 0xfade82e0, 0xa067268b, 0x8272792e,
-    0x553fb2c0, 0x489ae22b, 0xd4ef9794, 0x125e3fbc,
-    0x21fffcee, 0x825b1bfd, 0x9255c5ed, 0x1257a240,
-    0x4e1a8302, 0xbae07fff, 0x528246e7, 0x8e57140e,
-    0x3373f7bf, 0x8c9f8188, 0xa6fc4ee8, 0xc982b5a5,
-    0xa8c01db7, 0x579fc264, 0x67094f31, 0xf2bd3f5f,
-    0x40fff7c1, 0x1fb78dfc, 0x8e6bd2c1, 0x437be59b,
-    0x99b03dbf, 0xb5dbc64b, 0x638dc0e6, 0x55819d99,
-    0xa197c81c, 0x4a012d6e, 0xc5884a28, 0xccc36f71,
-    0xb843c213, 0x6c0743f1, 0x8309893c, 0x0feddd5f,
-    0x2f7fe850, 0xd7c07f7e, 0x02507fbf, 0x5afb9a04,
-    0xa747d2d0, 0x1651192e, 0xaf70bf3e, 0x58c31380,
-    0x5f98302e, 0x727cc3c4, 0x0a0fb402, 0x0f7fef82,
-    0x8c96fdad, 0x5d2c2aae, 0x8ee99a49, 0x50da88b8,
-    0x8427f4a0, 0x1eac5790, 0x796fb449, 0x8252dc15,
-    0xefbd7d9b, 0xa672597d, 0xada840d8, 0x45f54504,
-    0xfa5d7403, 0xe83ec305, 0x4f91751a, 0x925669c2,
-    0x23efe941, 0xa903f12e, 0x60270df2, 0x0276e4b6,
-    0x94fd6574, 0x927985b2, 0x8276dbcb, 0x02778176,
-    0xf8af918d, 0x4e48f79e, 0x8f616ddf, 0xe29d840e,
-    0x842f7d83, 0x340ce5c8, 0x96bbb682, 0x93b4b148,
-    0xef303cab, 0x984faf28, 0x779faf9b, 0x92dc560d,
-    0x224d1e20, 0x8437aa88, 0x7d29dc96, 0x2756d3dc,
-    0x8b907cee, 0xb51fd240, 0xe7c07ce3, 0xe566b4a1,
-    0xc3e9615e, 0x3cf8209d, 0x6094d1e3, 0xcd9ca341,
-    0x5c76460e, 0x00ea983b, 0xd4d67881, 0xfd47572c,
-    0xf76cedd9, 0xbda8229c, 0x127dadaa, 0x438a074e,
-    0x1f97c090, 0x081bdb8a, 0x93a07ebe, 0xb938ca15,
-    0x97b03cff, 0x3dc2c0f8, 0x8d1ab2ec, 0x64380e51,
-    0x68cc7bfb, 0xd90f2788, 0x12490181, 0x5de5ffd4,
-    0xdd7ef86a, 0x76a2e214, 0xb9a40368, 0x925d958f,
-    0x4b39fffa, 0xba39aee9, 0xa4ffd30b, 0xfaf7933b,
-    0x6d498623, 0x193cbcfa, 0x27627545, 0x825cf47a,
-    0x61bd8ba0, 0xd11e42d1, 0xcead04f4, 0x127ea392,
-    0x10428db7, 0x8272a972, 0x9270c4a8, 0x127de50b,
-    0x285ba1c8, 0x3c62f44f, 0x35c0eaa5, 0xe805d231,
-    0x428929fb, 0xb4fcdf82, 0x4fb66a53, 0x0e7dc15b,
-    0x1f081fab, 0x108618ae, 0xfcfd086d, 0xf9ff2889,
-    0x694bcc11, 0x236a5cae, 0x12deca4d, 0x2c3f8cc5,
-    0xd2d02dfe, 0xf8ef5896, 0xe4cf52da, 0x95155b67,
-    0x494a488c, 0xb9b6a80c, 0x5c8f82bc, 0x89d36b45,
-    0x3a609437, 0xec00c9a9, 0x44715253, 0x0a874b49,
-    0xd773bc40, 0x7c34671c, 0x02717ef6, 0x4feb5536,
-    0xa2d02fff, 0xd2bf60c4, 0xd43f03c0, 0x50b4ef6d,
-    0x07478cd1, 0x006e1888, 0xa2e53f55, 0xb9e6d4bc,
-    0xa2048016, 0x97573833, 0xd7207d67, 0xde0f8f3d,
-    0x72f87b33, 0xabcc4f33, 0x7688c55d, 0x7b00a6b0,
-    0x947b0001, 0x570075d2, 0xf9bb88f8, 0x8942019e,
-    0x4264a5ff, 0x856302e0, 0x72dbd92b, 0xee971b69,
-    0x6ea22fde, 0x5f08ae2b, 0xaf7a616d, 0xe5c98767,
-    0xcf1febd2, 0x61efc8c2, 0xf1ac2571, 0xcc8239c2,
-    0x67214cb8, 0xb1e583d1, 0xb7dc3e62, 0x7f10bdce,
-    0xf90a5c38, 0x0ff0443d, 0x606e6dc6, 0x60543a49,
-    0x5727c148, 0x2be98a1d, 0x8ab41738, 0x20e1be24,
-    0xaf96da0f, 0x68458425, 0x99833be5, 0x600d457d,
-    0x282f9350, 0x8334b362, 0xd91d1120, 0x2b6d8da0,
-    0x642b1e31, 0x9c305a00, 0x52bce688, 0x1b03588a,
-    0xf7baefd5, 0x4142ed9c, 0xa4315c11, 0x83323ec5,
-    0xdfef4636, 0xa133c501, 0xe9d3531c, 0xee353783,
+    0x8defc240,
+    0x25fa5d9f,
+    0xeb903dbf,
+    0xe810c907,
+    0x47607fff,
+    0x369fe44b,
+    0x8c1fc644,
+    0xaececa90,
+    0xbeb1f9bf,
+    0xeefbcaea,
+    0xe8cf1950,
+    0x51df07ae,
+    0x920e8806,
+    0xf0ad0548,
+    0xe13c8d83,
+    0x927010d5,
+    0x11107d9f,
+    0x07647db9,
+    0xb2e3e4d4,
+    0x3d4f285e,
+    0xb9afa820,
+    0xfade82e0,
+    0xa067268b,
+    0x8272792e,
+    0x553fb2c0,
+    0x489ae22b,
+    0xd4ef9794,
+    0x125e3fbc,
+    0x21fffcee,
+    0x825b1bfd,
+    0x9255c5ed,
+    0x1257a240,
+    0x4e1a8302,
+    0xbae07fff,
+    0x528246e7,
+    0x8e57140e,
+    0x3373f7bf,
+    0x8c9f8188,
+    0xa6fc4ee8,
+    0xc982b5a5,
+    0xa8c01db7,
+    0x579fc264,
+    0x67094f31,
+    0xf2bd3f5f,
+    0x40fff7c1,
+    0x1fb78dfc,
+    0x8e6bd2c1,
+    0x437be59b,
+    0x99b03dbf,
+    0xb5dbc64b,
+    0x638dc0e6,
+    0x55819d99,
+    0xa197c81c,
+    0x4a012d6e,
+    0xc5884a28,
+    0xccc36f71,
+    0xb843c213,
+    0x6c0743f1,
+    0x8309893c,
+    0x0feddd5f,
+    0x2f7fe850,
+    0xd7c07f7e,
+    0x02507fbf,
+    0x5afb9a04,
+    0xa747d2d0,
+    0x1651192e,
+    0xaf70bf3e,
+    0x58c31380,
+    0x5f98302e,
+    0x727cc3c4,
+    0x0a0fb402,
+    0x0f7fef82,
+    0x8c96fdad,
+    0x5d2c2aae,
+    0x8ee99a49,
+    0x50da88b8,
+    0x8427f4a0,
+    0x1eac5790,
+    0x796fb449,
+    0x8252dc15,
+    0xefbd7d9b,
+    0xa672597d,
+    0xada840d8,
+    0x45f54504,
+    0xfa5d7403,
+    0xe83ec305,
+    0x4f91751a,
+    0x925669c2,
+    0x23efe941,
+    0xa903f12e,
+    0x60270df2,
+    0x0276e4b6,
+    0x94fd6574,
+    0x927985b2,
+    0x8276dbcb,
+    0x02778176,
+    0xf8af918d,
+    0x4e48f79e,
+    0x8f616ddf,
+    0xe29d840e,
+    0x842f7d83,
+    0x340ce5c8,
+    0x96bbb682,
+    0x93b4b148,
+    0xef303cab,
+    0x984faf28,
+    0x779faf9b,
+    0x92dc560d,
+    0x224d1e20,
+    0x8437aa88,
+    0x7d29dc96,
+    0x2756d3dc,
+    0x8b907cee,
+    0xb51fd240,
+    0xe7c07ce3,
+    0xe566b4a1,
+    0xc3e9615e,
+    0x3cf8209d,
+    0x6094d1e3,
+    0xcd9ca341,
+    0x5c76460e,
+    0x00ea983b,
+    0xd4d67881,
+    0xfd47572c,
+    0xf76cedd9,
+    0xbda8229c,
+    0x127dadaa,
+    0x438a074e,
+    0x1f97c090,
+    0x081bdb8a,
+    0x93a07ebe,
+    0xb938ca15,
+    0x97b03cff,
+    0x3dc2c0f8,
+    0x8d1ab2ec,
+    0x64380e51,
+    0x68cc7bfb,
+    0xd90f2788,
+    0x12490181,
+    0x5de5ffd4,
+    0xdd7ef86a,
+    0x76a2e214,
+    0xb9a40368,
+    0x925d958f,
+    0x4b39fffa,
+    0xba39aee9,
+    0xa4ffd30b,
+    0xfaf7933b,
+    0x6d498623,
+    0x193cbcfa,
+    0x27627545,
+    0x825cf47a,
+    0x61bd8ba0,
+    0xd11e42d1,
+    0xcead04f4,
+    0x127ea392,
+    0x10428db7,
+    0x8272a972,
+    0x9270c4a8,
+    0x127de50b,
+    0x285ba1c8,
+    0x3c62f44f,
+    0x35c0eaa5,
+    0xe805d231,
+    0x428929fb,
+    0xb4fcdf82,
+    0x4fb66a53,
+    0x0e7dc15b,
+    0x1f081fab,
+    0x108618ae,
+    0xfcfd086d,
+    0xf9ff2889,
+    0x694bcc11,
+    0x236a5cae,
+    0x12deca4d,
+    0x2c3f8cc5,
+    0xd2d02dfe,
+    0xf8ef5896,
+    0xe4cf52da,
+    0x95155b67,
+    0x494a488c,
+    0xb9b6a80c,
+    0x5c8f82bc,
+    0x89d36b45,
+    0x3a609437,
+    0xec00c9a9,
+    0x44715253,
+    0x0a874b49,
+    0xd773bc40,
+    0x7c34671c,
+    0x02717ef6,
+    0x4feb5536,
+    0xa2d02fff,
+    0xd2bf60c4,
+    0xd43f03c0,
+    0x50b4ef6d,
+    0x07478cd1,
+    0x006e1888,
+    0xa2e53f55,
+    0xb9e6d4bc,
+    0xa2048016,
+    0x97573833,
+    0xd7207d67,
+    0xde0f8f3d,
+    0x72f87b33,
+    0xabcc4f33,
+    0x7688c55d,
+    0x7b00a6b0,
+    0x947b0001,
+    0x570075d2,
+    0xf9bb88f8,
+    0x8942019e,
+    0x4264a5ff,
+    0x856302e0,
+    0x72dbd92b,
+    0xee971b69,
+    0x6ea22fde,
+    0x5f08ae2b,
+    0xaf7a616d,
+    0xe5c98767,
+    0xcf1febd2,
+    0x61efc8c2,
+    0xf1ac2571,
+    0xcc8239c2,
+    0x67214cb8,
+    0xb1e583d1,
+    0xb7dc3e62,
+    0x7f10bdce,
+    0xf90a5c38,
+    0x0ff0443d,
+    0x606e6dc6,
+    0x60543a49,
+    0x5727c148,
+    0x2be98a1d,
+    0x8ab41738,
+    0x20e1be24,
+    0xaf96da0f,
+    0x68458425,
+    0x99833be5,
+    0x600d457d,
+    0x282f9350,
+    0x8334b362,
+    0xd91d1120,
+    0x2b6d8da0,
+    0x642b1e31,
+    0x9c305a00,
+    0x52bce688,
+    0x1b03588a,
+    0xf7baefd5,
+    0x4142ed9c,
+    0xa4315c11,
+    0x83323ec5,
+    0xdfef4636,
+    0xa133c501,
+    0xe9d3531c,
+    0xee353783,
 };
 
 const CAST_LONG CAST_S_table3[256] = {
-    0x9db30420, 0x1fb6e9de, 0xa7be7bef, 0xd273a298,
-    0x4a4f7bdb, 0x64ad8c57, 0x85510443, 0xfa020ed1,
-    0x7e287aff, 0xe60fb663, 0x095f35a1, 0x79ebf120,
-    0xfd059d43, 0x6497b7b1, 0xf3641f63, 0x241e4adf,
-    0x28147f5f, 0x4fa2b8cd, 0xc9430040, 0x0cc32220,
-    0xfdd30b30, 0xc0a5374f, 0x1d2d00d9, 0x24147b15,
-    0xee4d111a, 0x0fca5167, 0x71ff904c, 0x2d195ffe,
-    0x1a05645f, 0x0c13fefe, 0x081b08ca, 0x05170121,
-    0x80530100, 0xe83e5efe, 0xac9af4f8, 0x7fe72701,
-    0xd2b8ee5f, 0x06df4261, 0xbb9e9b8a, 0x7293ea25,
-    0xce84ffdf, 0xf5718801, 0x3dd64b04, 0xa26f263b,
-    0x7ed48400, 0x547eebe6, 0x446d4ca0, 0x6cf3d6f5,
-    0x2649abdf, 0xaea0c7f5, 0x36338cc1, 0x503f7e93,
-    0xd3772061, 0x11b638e1, 0x72500e03, 0xf80eb2bb,
-    0xabe0502e, 0xec8d77de, 0x57971e81, 0xe14f6746,
-    0xc9335400, 0x6920318f, 0x081dbb99, 0xffc304a5,
-    0x4d351805, 0x7f3d5ce3, 0xa6c866c6, 0x5d5bcca9,
-    0xdaec6fea, 0x9f926f91, 0x9f46222f, 0x3991467d,
-    0xa5bf6d8e, 0x1143c44f, 0x43958302, 0xd0214eeb,
-    0x022083b8, 0x3fb6180c, 0x18f8931e, 0x281658e6,
-    0x26486e3e, 0x8bd78a70, 0x7477e4c1, 0xb506e07c,
-    0xf32d0a25, 0x79098b02, 0xe4eabb81, 0x28123b23,
-    0x69dead38, 0x1574ca16, 0xdf871b62, 0x211c40b7,
-    0xa51a9ef9, 0x0014377b, 0x041e8ac8, 0x09114003,
-    0xbd59e4d2, 0xe3d156d5, 0x4fe876d5, 0x2f91a340,
-    0x557be8de, 0x00eae4a7, 0x0ce5c2ec, 0x4db4bba6,
-    0xe756bdff, 0xdd3369ac, 0xec17b035, 0x06572327,
-    0x99afc8b0, 0x56c8c391, 0x6b65811c, 0x5e146119,
-    0x6e85cb75, 0xbe07c002, 0xc2325577, 0x893ff4ec,
-    0x5bbfc92d, 0xd0ec3b25, 0xb7801ab7, 0x8d6d3b24,
-    0x20c763ef, 0xc366a5fc, 0x9c382880, 0x0ace3205,
-    0xaac9548a, 0xeca1d7c7, 0x041afa32, 0x1d16625a,
-    0x6701902c, 0x9b757a54, 0x31d477f7, 0x9126b031,
-    0x36cc6fdb, 0xc70b8b46, 0xd9e66a48, 0x56e55a79,
-    0x026a4ceb, 0x52437eff, 0x2f8f76b4, 0x0df980a5,
-    0x8674cde3, 0xedda04eb, 0x17a9be04, 0x2c18f4df,
-    0xb7747f9d, 0xab2af7b4, 0xefc34d20, 0x2e096b7c,
-    0x1741a254, 0xe5b6a035, 0x213d42f6, 0x2c1c7c26,
-    0x61c2f50f, 0x6552daf9, 0xd2c231f8, 0x25130f69,
-    0xd8167fa2, 0x0418f2c8, 0x001a96a6, 0x0d1526ab,
-    0x63315c21, 0x5e0a72ec, 0x49bafefd, 0x187908d9,
-    0x8d0dbd86, 0x311170a7, 0x3e9b640c, 0xcc3e10d7,
-    0xd5cad3b6, 0x0caec388, 0xf73001e1, 0x6c728aff,
-    0x71eae2a1, 0x1f9af36e, 0xcfcbd12f, 0xc1de8417,
-    0xac07be6b, 0xcb44a1d8, 0x8b9b0f56, 0x013988c3,
-    0xb1c52fca, 0xb4be31cd, 0xd8782806, 0x12a3a4e2,
-    0x6f7de532, 0x58fd7eb6, 0xd01ee900, 0x24adffc2,
-    0xf4990fc5, 0x9711aac5, 0x001d7b95, 0x82e5e7d2,
-    0x109873f6, 0x00613096, 0xc32d9521, 0xada121ff,
-    0x29908415, 0x7fbb977f, 0xaf9eb3db, 0x29c9ed2a,
-    0x5ce2a465, 0xa730f32c, 0xd0aa3fe8, 0x8a5cc091,
-    0xd49e2ce7, 0x0ce454a9, 0xd60acd86, 0x015f1919,
-    0x77079103, 0xdea03af6, 0x78a8565e, 0xdee356df,
-    0x21f05cbe, 0x8b75e387, 0xb3c50651, 0xb8a5c3ef,
-    0xd8eeb6d2, 0xe523be77, 0xc2154529, 0x2f69efdf,
-    0xafe67afb, 0xf470c4b2, 0xf3e0eb5b, 0xd6cc9876,
-    0x39e4460c, 0x1fda8538, 0x1987832f, 0xca007367,
-    0xa99144f8, 0x296b299e, 0x492fc295, 0x9266beab,
-    0xb5676e69, 0x9bd3ddda, 0xdf7e052f, 0xdb25701c,
-    0x1b5e51ee, 0xf65324e6, 0x6afce36c, 0x0316cc04,
-    0x8644213e, 0xb7dc59d0, 0x7965291f, 0xccd6fd43,
-    0x41823979, 0x932bcdf6, 0xb657c34d, 0x4edfd282,
-    0x7ae5290c, 0x3cb9536b, 0x851e20fe, 0x9833557e,
-    0x13ecf0b0, 0xd3ffb372, 0x3f85c5c1, 0x0aef7ed2,
+    0x9db30420,
+    0x1fb6e9de,
+    0xa7be7bef,
+    0xd273a298,
+    0x4a4f7bdb,
+    0x64ad8c57,
+    0x85510443,
+    0xfa020ed1,
+    0x7e287aff,
+    0xe60fb663,
+    0x095f35a1,
+    0x79ebf120,
+    0xfd059d43,
+    0x6497b7b1,
+    0xf3641f63,
+    0x241e4adf,
+    0x28147f5f,
+    0x4fa2b8cd,
+    0xc9430040,
+    0x0cc32220,
+    0xfdd30b30,
+    0xc0a5374f,
+    0x1d2d00d9,
+    0x24147b15,
+    0xee4d111a,
+    0x0fca5167,
+    0x71ff904c,
+    0x2d195ffe,
+    0x1a05645f,
+    0x0c13fefe,
+    0x081b08ca,
+    0x05170121,
+    0x80530100,
+    0xe83e5efe,
+    0xac9af4f8,
+    0x7fe72701,
+    0xd2b8ee5f,
+    0x06df4261,
+    0xbb9e9b8a,
+    0x7293ea25,
+    0xce84ffdf,
+    0xf5718801,
+    0x3dd64b04,
+    0xa26f263b,
+    0x7ed48400,
+    0x547eebe6,
+    0x446d4ca0,
+    0x6cf3d6f5,
+    0x2649abdf,
+    0xaea0c7f5,
+    0x36338cc1,
+    0x503f7e93,
+    0xd3772061,
+    0x11b638e1,
+    0x72500e03,
+    0xf80eb2bb,
+    0xabe0502e,
+    0xec8d77de,
+    0x57971e81,
+    0xe14f6746,
+    0xc9335400,
+    0x6920318f,
+    0x081dbb99,
+    0xffc304a5,
+    0x4d351805,
+    0x7f3d5ce3,
+    0xa6c866c6,
+    0x5d5bcca9,
+    0xdaec6fea,
+    0x9f926f91,
+    0x9f46222f,
+    0x3991467d,
+    0xa5bf6d8e,
+    0x1143c44f,
+    0x43958302,
+    0xd0214eeb,
+    0x022083b8,
+    0x3fb6180c,
+    0x18f8931e,
+    0x281658e6,
+    0x26486e3e,
+    0x8bd78a70,
+    0x7477e4c1,
+    0xb506e07c,
+    0xf32d0a25,
+    0x79098b02,
+    0xe4eabb81,
+    0x28123b23,
+    0x69dead38,
+    0x1574ca16,
+    0xdf871b62,
+    0x211c40b7,
+    0xa51a9ef9,
+    0x0014377b,
+    0x041e8ac8,
+    0x09114003,
+    0xbd59e4d2,
+    0xe3d156d5,
+    0x4fe876d5,
+    0x2f91a340,
+    0x557be8de,
+    0x00eae4a7,
+    0x0ce5c2ec,
+    0x4db4bba6,
+    0xe756bdff,
+    0xdd3369ac,
+    0xec17b035,
+    0x06572327,
+    0x99afc8b0,
+    0x56c8c391,
+    0x6b65811c,
+    0x5e146119,
+    0x6e85cb75,
+    0xbe07c002,
+    0xc2325577,
+    0x893ff4ec,
+    0x5bbfc92d,
+    0xd0ec3b25,
+    0xb7801ab7,
+    0x8d6d3b24,
+    0x20c763ef,
+    0xc366a5fc,
+    0x9c382880,
+    0x0ace3205,
+    0xaac9548a,
+    0xeca1d7c7,
+    0x041afa32,
+    0x1d16625a,
+    0x6701902c,
+    0x9b757a54,
+    0x31d477f7,
+    0x9126b031,
+    0x36cc6fdb,
+    0xc70b8b46,
+    0xd9e66a48,
+    0x56e55a79,
+    0x026a4ceb,
+    0x52437eff,
+    0x2f8f76b4,
+    0x0df980a5,
+    0x8674cde3,
+    0xedda04eb,
+    0x17a9be04,
+    0x2c18f4df,
+    0xb7747f9d,
+    0xab2af7b4,
+    0xefc34d20,
+    0x2e096b7c,
+    0x1741a254,
+    0xe5b6a035,
+    0x213d42f6,
+    0x2c1c7c26,
+    0x61c2f50f,
+    0x6552daf9,
+    0xd2c231f8,
+    0x25130f69,
+    0xd8167fa2,
+    0x0418f2c8,
+    0x001a96a6,
+    0x0d1526ab,
+    0x63315c21,
+    0x5e0a72ec,
+    0x49bafefd,
+    0x187908d9,
+    0x8d0dbd86,
+    0x311170a7,
+    0x3e9b640c,
+    0xcc3e10d7,
+    0xd5cad3b6,
+    0x0caec388,
+    0xf73001e1,
+    0x6c728aff,
+    0x71eae2a1,
+    0x1f9af36e,
+    0xcfcbd12f,
+    0xc1de8417,
+    0xac07be6b,
+    0xcb44a1d8,
+    0x8b9b0f56,
+    0x013988c3,
+    0xb1c52fca,
+    0xb4be31cd,
+    0xd8782806,
+    0x12a3a4e2,
+    0x6f7de532,
+    0x58fd7eb6,
+    0xd01ee900,
+    0x24adffc2,
+    0xf4990fc5,
+    0x9711aac5,
+    0x001d7b95,
+    0x82e5e7d2,
+    0x109873f6,
+    0x00613096,
+    0xc32d9521,
+    0xada121ff,
+    0x29908415,
+    0x7fbb977f,
+    0xaf9eb3db,
+    0x29c9ed2a,
+    0x5ce2a465,
+    0xa730f32c,
+    0xd0aa3fe8,
+    0x8a5cc091,
+    0xd49e2ce7,
+    0x0ce454a9,
+    0xd60acd86,
+    0x015f1919,
+    0x77079103,
+    0xdea03af6,
+    0x78a8565e,
+    0xdee356df,
+    0x21f05cbe,
+    0x8b75e387,
+    0xb3c50651,
+    0xb8a5c3ef,
+    0xd8eeb6d2,
+    0xe523be77,
+    0xc2154529,
+    0x2f69efdf,
+    0xafe67afb,
+    0xf470c4b2,
+    0xf3e0eb5b,
+    0xd6cc9876,
+    0x39e4460c,
+    0x1fda8538,
+    0x1987832f,
+    0xca007367,
+    0xa99144f8,
+    0x296b299e,
+    0x492fc295,
+    0x9266beab,
+    0xb5676e69,
+    0x9bd3ddda,
+    0xdf7e052f,
+    0xdb25701c,
+    0x1b5e51ee,
+    0xf65324e6,
+    0x6afce36c,
+    0x0316cc04,
+    0x8644213e,
+    0xb7dc59d0,
+    0x7965291f,
+    0xccd6fd43,
+    0x41823979,
+    0x932bcdf6,
+    0xb657c34d,
+    0x4edfd282,
+    0x7ae5290c,
+    0x3cb9536b,
+    0x851e20fe,
+    0x9833557e,
+    0x13ecf0b0,
+    0xd3ffb372,
+    0x3f85c5c1,
+    0x0aef7ed2,
 };
 
 const CAST_LONG CAST_S_table4[256] = {
-    0x7ec90c04, 0x2c6e74b9, 0x9b0e66df, 0xa6337911,
-    0xb86a7fff, 0x1dd358f5, 0x44dd9d44, 0x1731167f,
-    0x08fbf1fa, 0xe7f511cc, 0xd2051b00, 0x735aba00,
-    0x2ab722d8, 0x386381cb, 0xacf6243a, 0x69befd7a,
-    0xe6a2e77f, 0xf0c720cd, 0xc4494816, 0xccf5c180,
-    0x38851640, 0x15b0a848, 0xe68b18cb, 0x4caadeff,
-    0x5f480a01, 0x0412b2aa, 0x259814fc, 0x41d0efe2,
-    0x4e40b48d, 0x248eb6fb, 0x8dba1cfe, 0x41a99b02,
-    0x1a550a04, 0xba8f65cb, 0x7251f4e7, 0x95a51725,
-    0xc106ecd7, 0x97a5980a, 0xc539b9aa, 0x4d79fe6a,
-    0xf2f3f763, 0x68af8040, 0xed0c9e56, 0x11b4958b,
-    0xe1eb5a88, 0x8709e6b0, 0xd7e07156, 0x4e29fea7,
-    0x6366e52d, 0x02d1c000, 0xc4ac8e05, 0x9377f571,
-    0x0c05372a, 0x578535f2, 0x2261be02, 0xd642a0c9,
-    0xdf13a280, 0x74b55bd2, 0x682199c0, 0xd421e5ec,
-    0x53fb3ce8, 0xc8adedb3, 0x28a87fc9, 0x3d959981,
-    0x5c1ff900, 0xfe38d399, 0x0c4eff0b, 0x062407ea,
-    0xaa2f4fb1, 0x4fb96976, 0x90c79505, 0xb0a8a774,
-    0xef55a1ff, 0xe59ca2c2, 0xa6b62d27, 0xe66a4263,
-    0xdf65001f, 0x0ec50966, 0xdfdd55bc, 0x29de0655,
-    0x911e739a, 0x17af8975, 0x32c7911c, 0x89f89468,
-    0x0d01e980, 0x524755f4, 0x03b63cc9, 0x0cc844b2,
-    0xbcf3f0aa, 0x87ac36e9, 0xe53a7426, 0x01b3d82b,
-    0x1a9e7449, 0x64ee2d7e, 0xcddbb1da, 0x01c94910,
-    0xb868bf80, 0x0d26f3fd, 0x9342ede7, 0x04a5c284,
-    0x636737b6, 0x50f5b616, 0xf24766e3, 0x8eca36c1,
-    0x136e05db, 0xfef18391, 0xfb887a37, 0xd6e7f7d4,
-    0xc7fb7dc9, 0x3063fcdf, 0xb6f589de, 0xec2941da,
-    0x26e46695, 0xb7566419, 0xf654efc5, 0xd08d58b7,
-    0x48925401, 0xc1bacb7f, 0xe5ff550f, 0xb6083049,
-    0x5bb5d0e8, 0x87d72e5a, 0xab6a6ee1, 0x223a66ce,
-    0xc62bf3cd, 0x9e0885f9, 0x68cb3e47, 0x086c010f,
-    0xa21de820, 0xd18b69de, 0xf3f65777, 0xfa02c3f6,
-    0x407edac3, 0xcbb3d550, 0x1793084d, 0xb0d70eba,
-    0x0ab378d5, 0xd951fb0c, 0xded7da56, 0x4124bbe4,
-    0x94ca0b56, 0x0f5755d1, 0xe0e1e56e, 0x6184b5be,
-    0x580a249f, 0x94f74bc0, 0xe327888e, 0x9f7b5561,
-    0xc3dc0280, 0x05687715, 0x646c6bd7, 0x44904db3,
-    0x66b4f0a3, 0xc0f1648a, 0x697ed5af, 0x49e92ff6,
-    0x309e374f, 0x2cb6356a, 0x85808573, 0x4991f840,
-    0x76f0ae02, 0x083be84d, 0x28421c9a, 0x44489406,
-    0x736e4cb8, 0xc1092910, 0x8bc95fc6, 0x7d869cf4,
-    0x134f616f, 0x2e77118d, 0xb31b2be1, 0xaa90b472,
-    0x3ca5d717, 0x7d161bba, 0x9cad9010, 0xaf462ba2,
-    0x9fe459d2, 0x45d34559, 0xd9f2da13, 0xdbc65487,
-    0xf3e4f94e, 0x176d486f, 0x097c13ea, 0x631da5c7,
-    0x445f7382, 0x175683f4, 0xcdc66a97, 0x70be0288,
-    0xb3cdcf72, 0x6e5dd2f3, 0x20936079, 0x459b80a5,
-    0xbe60e2db, 0xa9c23101, 0xeba5315c, 0x224e42f2,
-    0x1c5c1572, 0xf6721b2c, 0x1ad2fff3, 0x8c25404e,
-    0x324ed72f, 0x4067b7fd, 0x0523138e, 0x5ca3bc78,
-    0xdc0fd66e, 0x75922283, 0x784d6b17, 0x58ebb16e,
-    0x44094f85, 0x3f481d87, 0xfcfeae7b, 0x77b5ff76,
-    0x8c2302bf, 0xaaf47556, 0x5f46b02a, 0x2b092801,
-    0x3d38f5f7, 0x0ca81f36, 0x52af4a8a, 0x66d5e7c0,
-    0xdf3b0874, 0x95055110, 0x1b5ad7a8, 0xf61ed5ad,
-    0x6cf6e479, 0x20758184, 0xd0cefa65, 0x88f7be58,
-    0x4a046826, 0x0ff6f8f3, 0xa09c7f70, 0x5346aba0,
-    0x5ce96c28, 0xe176eda3, 0x6bac307f, 0x376829d2,
-    0x85360fa9, 0x17e3fe2a, 0x24b79767, 0xf5a96b20,
-    0xd6cd2595, 0x68ff1ebf, 0x7555442c, 0xf19f06be,
-    0xf9e0659a, 0xeeb9491d, 0x34010718, 0xbb30cab8,
-    0xe822fe15, 0x88570983, 0x750e6249, 0xda627e55,
-    0x5e76ffa8, 0xb1534546, 0x6d47de08, 0xefe9e7d4,
+    0x7ec90c04,
+    0x2c6e74b9,
+    0x9b0e66df,
+    0xa6337911,
+    0xb86a7fff,
+    0x1dd358f5,
+    0x44dd9d44,
+    0x1731167f,
+    0x08fbf1fa,
+    0xe7f511cc,
+    0xd2051b00,
+    0x735aba00,
+    0x2ab722d8,
+    0x386381cb,
+    0xacf6243a,
+    0x69befd7a,
+    0xe6a2e77f,
+    0xf0c720cd,
+    0xc4494816,
+    0xccf5c180,
+    0x38851640,
+    0x15b0a848,
+    0xe68b18cb,
+    0x4caadeff,
+    0x5f480a01,
+    0x0412b2aa,
+    0x259814fc,
+    0x41d0efe2,
+    0x4e40b48d,
+    0x248eb6fb,
+    0x8dba1cfe,
+    0x41a99b02,
+    0x1a550a04,
+    0xba8f65cb,
+    0x7251f4e7,
+    0x95a51725,
+    0xc106ecd7,
+    0x97a5980a,
+    0xc539b9aa,
+    0x4d79fe6a,
+    0xf2f3f763,
+    0x68af8040,
+    0xed0c9e56,
+    0x11b4958b,
+    0xe1eb5a88,
+    0x8709e6b0,
+    0xd7e07156,
+    0x4e29fea7,
+    0x6366e52d,
+    0x02d1c000,
+    0xc4ac8e05,
+    0x9377f571,
+    0x0c05372a,
+    0x578535f2,
+    0x2261be02,
+    0xd642a0c9,
+    0xdf13a280,
+    0x74b55bd2,
+    0x682199c0,
+    0xd421e5ec,
+    0x53fb3ce8,
+    0xc8adedb3,
+    0x28a87fc9,
+    0x3d959981,
+    0x5c1ff900,
+    0xfe38d399,
+    0x0c4eff0b,
+    0x062407ea,
+    0xaa2f4fb1,
+    0x4fb96976,
+    0x90c79505,
+    0xb0a8a774,
+    0xef55a1ff,
+    0xe59ca2c2,
+    0xa6b62d27,
+    0xe66a4263,
+    0xdf65001f,
+    0x0ec50966,
+    0xdfdd55bc,
+    0x29de0655,
+    0x911e739a,
+    0x17af8975,
+    0x32c7911c,
+    0x89f89468,
+    0x0d01e980,
+    0x524755f4,
+    0x03b63cc9,
+    0x0cc844b2,
+    0xbcf3f0aa,
+    0x87ac36e9,
+    0xe53a7426,
+    0x01b3d82b,
+    0x1a9e7449,
+    0x64ee2d7e,
+    0xcddbb1da,
+    0x01c94910,
+    0xb868bf80,
+    0x0d26f3fd,
+    0x9342ede7,
+    0x04a5c284,
+    0x636737b6,
+    0x50f5b616,
+    0xf24766e3,
+    0x8eca36c1,
+    0x136e05db,
+    0xfef18391,
+    0xfb887a37,
+    0xd6e7f7d4,
+    0xc7fb7dc9,
+    0x3063fcdf,
+    0xb6f589de,
+    0xec2941da,
+    0x26e46695,
+    0xb7566419,
+    0xf654efc5,
+    0xd08d58b7,
+    0x48925401,
+    0xc1bacb7f,
+    0xe5ff550f,
+    0xb6083049,
+    0x5bb5d0e8,
+    0x87d72e5a,
+    0xab6a6ee1,
+    0x223a66ce,
+    0xc62bf3cd,
+    0x9e0885f9,
+    0x68cb3e47,
+    0x086c010f,
+    0xa21de820,
+    0xd18b69de,
+    0xf3f65777,
+    0xfa02c3f6,
+    0x407edac3,
+    0xcbb3d550,
+    0x1793084d,
+    0xb0d70eba,
+    0x0ab378d5,
+    0xd951fb0c,
+    0xded7da56,
+    0x4124bbe4,
+    0x94ca0b56,
+    0x0f5755d1,
+    0xe0e1e56e,
+    0x6184b5be,
+    0x580a249f,
+    0x94f74bc0,
+    0xe327888e,
+    0x9f7b5561,
+    0xc3dc0280,
+    0x05687715,
+    0x646c6bd7,
+    0x44904db3,
+    0x66b4f0a3,
+    0xc0f1648a,
+    0x697ed5af,
+    0x49e92ff6,
+    0x309e374f,
+    0x2cb6356a,
+    0x85808573,
+    0x4991f840,
+    0x76f0ae02,
+    0x083be84d,
+    0x28421c9a,
+    0x44489406,
+    0x736e4cb8,
+    0xc1092910,
+    0x8bc95fc6,
+    0x7d869cf4,
+    0x134f616f,
+    0x2e77118d,
+    0xb31b2be1,
+    0xaa90b472,
+    0x3ca5d717,
+    0x7d161bba,
+    0x9cad9010,
+    0xaf462ba2,
+    0x9fe459d2,
+    0x45d34559,
+    0xd9f2da13,
+    0xdbc65487,
+    0xf3e4f94e,
+    0x176d486f,
+    0x097c13ea,
+    0x631da5c7,
+    0x445f7382,
+    0x175683f4,
+    0xcdc66a97,
+    0x70be0288,
+    0xb3cdcf72,
+    0x6e5dd2f3,
+    0x20936079,
+    0x459b80a5,
+    0xbe60e2db,
+    0xa9c23101,
+    0xeba5315c,
+    0x224e42f2,
+    0x1c5c1572,
+    0xf6721b2c,
+    0x1ad2fff3,
+    0x8c25404e,
+    0x324ed72f,
+    0x4067b7fd,
+    0x0523138e,
+    0x5ca3bc78,
+    0xdc0fd66e,
+    0x75922283,
+    0x784d6b17,
+    0x58ebb16e,
+    0x44094f85,
+    0x3f481d87,
+    0xfcfeae7b,
+    0x77b5ff76,
+    0x8c2302bf,
+    0xaaf47556,
+    0x5f46b02a,
+    0x2b092801,
+    0x3d38f5f7,
+    0x0ca81f36,
+    0x52af4a8a,
+    0x66d5e7c0,
+    0xdf3b0874,
+    0x95055110,
+    0x1b5ad7a8,
+    0xf61ed5ad,
+    0x6cf6e479,
+    0x20758184,
+    0xd0cefa65,
+    0x88f7be58,
+    0x4a046826,
+    0x0ff6f8f3,
+    0xa09c7f70,
+    0x5346aba0,
+    0x5ce96c28,
+    0xe176eda3,
+    0x6bac307f,
+    0x376829d2,
+    0x85360fa9,
+    0x17e3fe2a,
+    0x24b79767,
+    0xf5a96b20,
+    0xd6cd2595,
+    0x68ff1ebf,
+    0x7555442c,
+    0xf19f06be,
+    0xf9e0659a,
+    0xeeb9491d,
+    0x34010718,
+    0xbb30cab8,
+    0xe822fe15,
+    0x88570983,
+    0x750e6249,
+    0xda627e55,
+    0x5e76ffa8,
+    0xb1534546,
+    0x6d47de08,
+    0xefe9e7d4,
 };
 
 const CAST_LONG CAST_S_table5[256] = {
-    0xf6fa8f9d, 0x2cac6ce1, 0x4ca34867, 0xe2337f7c,
-    0x95db08e7, 0x016843b4, 0xeced5cbc, 0x325553ac,
-    0xbf9f0960, 0xdfa1e2ed, 0x83f0579d, 0x63ed86b9,
-    0x1ab6a6b8, 0xde5ebe39, 0xf38ff732, 0x8989b138,
-    0x33f14961, 0xc01937bd, 0xf506c6da, 0xe4625e7e,
-    0xa308ea99, 0x4e23e33c, 0x79cbd7cc, 0x48a14367,
-    0xa3149619, 0xfec94bd5, 0xa114174a, 0xeaa01866,
-    0xa084db2d, 0x09a8486f, 0xa888614a, 0x2900af98,
-    0x01665991, 0xe1992863, 0xc8f30c60, 0x2e78ef3c,
-    0xd0d51932, 0xcf0fec14, 0xf7ca07d2, 0xd0a82072,
-    0xfd41197e, 0x9305a6b0, 0xe86be3da, 0x74bed3cd,
-    0x372da53c, 0x4c7f4448, 0xdab5d440, 0x6dba0ec3,
-    0x083919a7, 0x9fbaeed9, 0x49dbcfb0, 0x4e670c53,
-    0x5c3d9c01, 0x64bdb941, 0x2c0e636a, 0xba7dd9cd,
-    0xea6f7388, 0xe70bc762, 0x35f29adb, 0x5c4cdd8d,
-    0xf0d48d8c, 0xb88153e2, 0x08a19866, 0x1ae2eac8,
-    0x284caf89, 0xaa928223, 0x9334be53, 0x3b3a21bf,
-    0x16434be3, 0x9aea3906, 0xefe8c36e, 0xf890cdd9,
-    0x80226dae, 0xc340a4a3, 0xdf7e9c09, 0xa694a807,
-    0x5b7c5ecc, 0x221db3a6, 0x9a69a02f, 0x68818a54,
-    0xceb2296f, 0x53c0843a, 0xfe893655, 0x25bfe68a,
-    0xb4628abc, 0xcf222ebf, 0x25ac6f48, 0xa9a99387,
-    0x53bddb65, 0xe76ffbe7, 0xe967fd78, 0x0ba93563,
-    0x8e342bc1, 0xe8a11be9, 0x4980740d, 0xc8087dfc,
-    0x8de4bf99, 0xa11101a0, 0x7fd37975, 0xda5a26c0,
-    0xe81f994f, 0x9528cd89, 0xfd339fed, 0xb87834bf,
-    0x5f04456d, 0x22258698, 0xc9c4c83b, 0x2dc156be,
-    0x4f628daa, 0x57f55ec5, 0xe2220abe, 0xd2916ebf,
-    0x4ec75b95, 0x24f2c3c0, 0x42d15d99, 0xcd0d7fa0,
-    0x7b6e27ff, 0xa8dc8af0, 0x7345c106, 0xf41e232f,
-    0x35162386, 0xe6ea8926, 0x3333b094, 0x157ec6f2,
-    0x372b74af, 0x692573e4, 0xe9a9d848, 0xf3160289,
-    0x3a62ef1d, 0xa787e238, 0xf3a5f676, 0x74364853,
-    0x20951063, 0x4576698d, 0xb6fad407, 0x592af950,
-    0x36f73523, 0x4cfb6e87, 0x7da4cec0, 0x6c152daa,
-    0xcb0396a8, 0xc50dfe5d, 0xfcd707ab, 0x0921c42f,
-    0x89dff0bb, 0x5fe2be78, 0x448f4f33, 0x754613c9,
-    0x2b05d08d, 0x48b9d585, 0xdc049441, 0xc8098f9b,
-    0x7dede786, 0xc39a3373, 0x42410005, 0x6a091751,
-    0x0ef3c8a6, 0x890072d6, 0x28207682, 0xa9a9f7be,
-    0xbf32679d, 0xd45b5b75, 0xb353fd00, 0xcbb0e358,
-    0x830f220a, 0x1f8fb214, 0xd372cf08, 0xcc3c4a13,
-    0x8cf63166, 0x061c87be, 0x88c98f88, 0x6062e397,
-    0x47cf8e7a, 0xb6c85283, 0x3cc2acfb, 0x3fc06976,
-    0x4e8f0252, 0x64d8314d, 0xda3870e3, 0x1e665459,
-    0xc10908f0, 0x513021a5, 0x6c5b68b7, 0x822f8aa0,
-    0x3007cd3e, 0x74719eef, 0xdc872681, 0x073340d4,
-    0x7e432fd9, 0x0c5ec241, 0x8809286c, 0xf592d891,
-    0x08a930f6, 0x957ef305, 0xb7fbffbd, 0xc266e96f,
-    0x6fe4ac98, 0xb173ecc0, 0xbc60b42a, 0x953498da,
-    0xfba1ae12, 0x2d4bd736, 0x0f25faab, 0xa4f3fceb,
-    0xe2969123, 0x257f0c3d, 0x9348af49, 0x361400bc,
-    0xe8816f4a, 0x3814f200, 0xa3f94043, 0x9c7a54c2,
-    0xbc704f57, 0xda41e7f9, 0xc25ad33a, 0x54f4a084,
-    0xb17f5505, 0x59357cbe, 0xedbd15c8, 0x7f97c5ab,
-    0xba5ac7b5, 0xb6f6deaf, 0x3a479c3a, 0x5302da25,
-    0x653d7e6a, 0x54268d49, 0x51a477ea, 0x5017d55b,
-    0xd7d25d88, 0x44136c76, 0x0404a8c8, 0xb8e5a121,
-    0xb81a928a, 0x60ed5869, 0x97c55b96, 0xeaec991b,
-    0x29935913, 0x01fdb7f1, 0x088e8dfa, 0x9ab6f6f5,
-    0x3b4cbf9f, 0x4a5de3ab, 0xe6051d35, 0xa0e1d855,
-    0xd36b4cf1, 0xf544edeb, 0xb0e93524, 0xbebb8fbd,
-    0xa2d762cf, 0x49c92f54, 0x38b5f331, 0x7128a454,
-    0x48392905, 0xa65b1db8, 0x851c97bd, 0xd675cf2f,
+    0xf6fa8f9d,
+    0x2cac6ce1,
+    0x4ca34867,
+    0xe2337f7c,
+    0x95db08e7,
+    0x016843b4,
+    0xeced5cbc,
+    0x325553ac,
+    0xbf9f0960,
+    0xdfa1e2ed,
+    0x83f0579d,
+    0x63ed86b9,
+    0x1ab6a6b8,
+    0xde5ebe39,
+    0xf38ff732,
+    0x8989b138,
+    0x33f14961,
+    0xc01937bd,
+    0xf506c6da,
+    0xe4625e7e,
+    0xa308ea99,
+    0x4e23e33c,
+    0x79cbd7cc,
+    0x48a14367,
+    0xa3149619,
+    0xfec94bd5,
+    0xa114174a,
+    0xeaa01866,
+    0xa084db2d,
+    0x09a8486f,
+    0xa888614a,
+    0x2900af98,
+    0x01665991,
+    0xe1992863,
+    0xc8f30c60,
+    0x2e78ef3c,
+    0xd0d51932,
+    0xcf0fec14,
+    0xf7ca07d2,
+    0xd0a82072,
+    0xfd41197e,
+    0x9305a6b0,
+    0xe86be3da,
+    0x74bed3cd,
+    0x372da53c,
+    0x4c7f4448,
+    0xdab5d440,
+    0x6dba0ec3,
+    0x083919a7,
+    0x9fbaeed9,
+    0x49dbcfb0,
+    0x4e670c53,
+    0x5c3d9c01,
+    0x64bdb941,
+    0x2c0e636a,
+    0xba7dd9cd,
+    0xea6f7388,
+    0xe70bc762,
+    0x35f29adb,
+    0x5c4cdd8d,
+    0xf0d48d8c,
+    0xb88153e2,
+    0x08a19866,
+    0x1ae2eac8,
+    0x284caf89,
+    0xaa928223,
+    0x9334be53,
+    0x3b3a21bf,
+    0x16434be3,
+    0x9aea3906,
+    0xefe8c36e,
+    0xf890cdd9,
+    0x80226dae,
+    0xc340a4a3,
+    0xdf7e9c09,
+    0xa694a807,
+    0x5b7c5ecc,
+    0x221db3a6,
+    0x9a69a02f,
+    0x68818a54,
+    0xceb2296f,
+    0x53c0843a,
+    0xfe893655,
+    0x25bfe68a,
+    0xb4628abc,
+    0xcf222ebf,
+    0x25ac6f48,
+    0xa9a99387,
+    0x53bddb65,
+    0xe76ffbe7,
+    0xe967fd78,
+    0x0ba93563,
+    0x8e342bc1,
+    0xe8a11be9,
+    0x4980740d,
+    0xc8087dfc,
+    0x8de4bf99,
+    0xa11101a0,
+    0x7fd37975,
+    0xda5a26c0,
+    0xe81f994f,
+    0x9528cd89,
+    0xfd339fed,
+    0xb87834bf,
+    0x5f04456d,
+    0x22258698,
+    0xc9c4c83b,
+    0x2dc156be,
+    0x4f628daa,
+    0x57f55ec5,
+    0xe2220abe,
+    0xd2916ebf,
+    0x4ec75b95,
+    0x24f2c3c0,
+    0x42d15d99,
+    0xcd0d7fa0,
+    0x7b6e27ff,
+    0xa8dc8af0,
+    0x7345c106,
+    0xf41e232f,
+    0x35162386,
+    0xe6ea8926,
+    0x3333b094,
+    0x157ec6f2,
+    0x372b74af,
+    0x692573e4,
+    0xe9a9d848,
+    0xf3160289,
+    0x3a62ef1d,
+    0xa787e238,
+    0xf3a5f676,
+    0x74364853,
+    0x20951063,
+    0x4576698d,
+    0xb6fad407,
+    0x592af950,
+    0x36f73523,
+    0x4cfb6e87,
+    0x7da4cec0,
+    0x6c152daa,
+    0xcb0396a8,
+    0xc50dfe5d,
+    0xfcd707ab,
+    0x0921c42f,
+    0x89dff0bb,
+    0x5fe2be78,
+    0x448f4f33,
+    0x754613c9,
+    0x2b05d08d,
+    0x48b9d585,
+    0xdc049441,
+    0xc8098f9b,
+    0x7dede786,
+    0xc39a3373,
+    0x42410005,
+    0x6a091751,
+    0x0ef3c8a6,
+    0x890072d6,
+    0x28207682,
+    0xa9a9f7be,
+    0xbf32679d,
+    0xd45b5b75,
+    0xb353fd00,
+    0xcbb0e358,
+    0x830f220a,
+    0x1f8fb214,
+    0xd372cf08,
+    0xcc3c4a13,
+    0x8cf63166,
+    0x061c87be,
+    0x88c98f88,
+    0x6062e397,
+    0x47cf8e7a,
+    0xb6c85283,
+    0x3cc2acfb,
+    0x3fc06976,
+    0x4e8f0252,
+    0x64d8314d,
+    0xda3870e3,
+    0x1e665459,
+    0xc10908f0,
+    0x513021a5,
+    0x6c5b68b7,
+    0x822f8aa0,
+    0x3007cd3e,
+    0x74719eef,
+    0xdc872681,
+    0x073340d4,
+    0x7e432fd9,
+    0x0c5ec241,
+    0x8809286c,
+    0xf592d891,
+    0x08a930f6,
+    0x957ef305,
+    0xb7fbffbd,
+    0xc266e96f,
+    0x6fe4ac98,
+    0xb173ecc0,
+    0xbc60b42a,
+    0x953498da,
+    0xfba1ae12,
+    0x2d4bd736,
+    0x0f25faab,
+    0xa4f3fceb,
+    0xe2969123,
+    0x257f0c3d,
+    0x9348af49,
+    0x361400bc,
+    0xe8816f4a,
+    0x3814f200,
+    0xa3f94043,
+    0x9c7a54c2,
+    0xbc704f57,
+    0xda41e7f9,
+    0xc25ad33a,
+    0x54f4a084,
+    0xb17f5505,
+    0x59357cbe,
+    0xedbd15c8,
+    0x7f97c5ab,
+    0xba5ac7b5,
+    0xb6f6deaf,
+    0x3a479c3a,
+    0x5302da25,
+    0x653d7e6a,
+    0x54268d49,
+    0x51a477ea,
+    0x5017d55b,
+    0xd7d25d88,
+    0x44136c76,
+    0x0404a8c8,
+    0xb8e5a121,
+    0xb81a928a,
+    0x60ed5869,
+    0x97c55b96,
+    0xeaec991b,
+    0x29935913,
+    0x01fdb7f1,
+    0x088e8dfa,
+    0x9ab6f6f5,
+    0x3b4cbf9f,
+    0x4a5de3ab,
+    0xe6051d35,
+    0xa0e1d855,
+    0xd36b4cf1,
+    0xf544edeb,
+    0xb0e93524,
+    0xbebb8fbd,
+    0xa2d762cf,
+    0x49c92f54,
+    0x38b5f331,
+    0x7128a454,
+    0x48392905,
+    0xa65b1db8,
+    0x851c97bd,
+    0xd675cf2f,
 };
 
 const CAST_LONG CAST_S_table6[256] = {
-    0x85e04019, 0x332bf567, 0x662dbfff, 0xcfc65693,
-    0x2a8d7f6f, 0xab9bc912, 0xde6008a1, 0x2028da1f,
-    0x0227bce7, 0x4d642916, 0x18fac300, 0x50f18b82,
-    0x2cb2cb11, 0xb232e75c, 0x4b3695f2, 0xb28707de,
-    0xa05fbcf6, 0xcd4181e9, 0xe150210c, 0xe24ef1bd,
-    0xb168c381, 0xfde4e789, 0x5c79b0d8, 0x1e8bfd43,
-    0x4d495001, 0x38be4341, 0x913cee1d, 0x92a79c3f,
-    0x089766be, 0xbaeeadf4, 0x1286becf, 0xb6eacb19,
-    0x2660c200, 0x7565bde4, 0x64241f7a, 0x8248dca9,
-    0xc3b3ad66, 0x28136086, 0x0bd8dfa8, 0x356d1cf2,
-    0x107789be, 0xb3b2e9ce, 0x0502aa8f, 0x0bc0351e,
-    0x166bf52a, 0xeb12ff82, 0xe3486911, 0xd34d7516,
-    0x4e7b3aff, 0x5f43671b, 0x9cf6e037, 0x4981ac83,
-    0x334266ce, 0x8c9341b7, 0xd0d854c0, 0xcb3a6c88,
-    0x47bc2829, 0x4725ba37, 0xa66ad22b, 0x7ad61f1e,
-    0x0c5cbafa, 0x4437f107, 0xb6e79962, 0x42d2d816,
-    0x0a961288, 0xe1a5c06e, 0x13749e67, 0x72fc081a,
-    0xb1d139f7, 0xf9583745, 0xcf19df58, 0xbec3f756,
-    0xc06eba30, 0x07211b24, 0x45c28829, 0xc95e317f,
-    0xbc8ec511, 0x38bc46e9, 0xc6e6fa14, 0xbae8584a,
-    0xad4ebc46, 0x468f508b, 0x7829435f, 0xf124183b,
-    0x821dba9f, 0xaff60ff4, 0xea2c4e6d, 0x16e39264,
-    0x92544a8b, 0x009b4fc3, 0xaba68ced, 0x9ac96f78,
-    0x06a5b79a, 0xb2856e6e, 0x1aec3ca9, 0xbe838688,
-    0x0e0804e9, 0x55f1be56, 0xe7e5363b, 0xb3a1f25d,
-    0xf7debb85, 0x61fe033c, 0x16746233, 0x3c034c28,
-    0xda6d0c74, 0x79aac56c, 0x3ce4e1ad, 0x51f0c802,
-    0x98f8f35a, 0x1626a49f, 0xeed82b29, 0x1d382fe3,
-    0x0c4fb99a, 0xbb325778, 0x3ec6d97b, 0x6e77a6a9,
-    0xcb658b5c, 0xd45230c7, 0x2bd1408b, 0x60c03eb7,
-    0xb9068d78, 0xa33754f4, 0xf430c87d, 0xc8a71302,
-    0xb96d8c32, 0xebd4e7be, 0xbe8b9d2d, 0x7979fb06,
-    0xe7225308, 0x8b75cf77, 0x11ef8da4, 0xe083c858,
-    0x8d6b786f, 0x5a6317a6, 0xfa5cf7a0, 0x5dda0033,
-    0xf28ebfb0, 0xf5b9c310, 0xa0eac280, 0x08b9767a,
-    0xa3d9d2b0, 0x79d34217, 0x021a718d, 0x9ac6336a,
-    0x2711fd60, 0x438050e3, 0x069908a8, 0x3d7fedc4,
-    0x826d2bef, 0x4eeb8476, 0x488dcf25, 0x36c9d566,
-    0x28e74e41, 0xc2610aca, 0x3d49a9cf, 0xbae3b9df,
-    0xb65f8de6, 0x92aeaf64, 0x3ac7d5e6, 0x9ea80509,
-    0xf22b017d, 0xa4173f70, 0xdd1e16c3, 0x15e0d7f9,
-    0x50b1b887, 0x2b9f4fd5, 0x625aba82, 0x6a017962,
-    0x2ec01b9c, 0x15488aa9, 0xd716e740, 0x40055a2c,
-    0x93d29a22, 0xe32dbf9a, 0x058745b9, 0x3453dc1e,
-    0xd699296e, 0x496cff6f, 0x1c9f4986, 0xdfe2ed07,
-    0xb87242d1, 0x19de7eae, 0x053e561a, 0x15ad6f8c,
-    0x66626c1c, 0x7154c24c, 0xea082b2a, 0x93eb2939,
-    0x17dcb0f0, 0x58d4f2ae, 0x9ea294fb, 0x52cf564c,
-    0x9883fe66, 0x2ec40581, 0x763953c3, 0x01d6692e,
-    0xd3a0c108, 0xa1e7160e, 0xe4f2dfa6, 0x693ed285,
-    0x74904698, 0x4c2b0edd, 0x4f757656, 0x5d393378,
-    0xa132234f, 0x3d321c5d, 0xc3f5e194, 0x4b269301,
-    0xc79f022f, 0x3c997e7e, 0x5e4f9504, 0x3ffafbbd,
-    0x76f7ad0e, 0x296693f4, 0x3d1fce6f, 0xc61e45be,
-    0xd3b5ab34, 0xf72bf9b7, 0x1b0434c0, 0x4e72b567,
-    0x5592a33d, 0xb5229301, 0xcfd2a87f, 0x60aeb767,
-    0x1814386b, 0x30bcc33d, 0x38a0c07d, 0xfd1606f2,
-    0xc363519b, 0x589dd390, 0x5479f8e6, 0x1cb8d647,
-    0x97fd61a9, 0xea7759f4, 0x2d57539d, 0x569a58cf,
-    0xe84e63ad, 0x462e1b78, 0x6580f87e, 0xf3817914,
-    0x91da55f4, 0x40a230f3, 0xd1988f35, 0xb6e318d2,
-    0x3ffa50bc, 0x3d40f021, 0xc3c0bdae, 0x4958c24c,
-    0x518f36b2, 0x84b1d370, 0x0fedce83, 0x878ddada,
-    0xf2a279c7, 0x94e01be8, 0x90716f4b, 0x954b8aa3,
+    0x85e04019,
+    0x332bf567,
+    0x662dbfff,
+    0xcfc65693,
+    0x2a8d7f6f,
+    0xab9bc912,
+    0xde6008a1,
+    0x2028da1f,
+    0x0227bce7,
+    0x4d642916,
+    0x18fac300,
+    0x50f18b82,
+    0x2cb2cb11,
+    0xb232e75c,
+    0x4b3695f2,
+    0xb28707de,
+    0xa05fbcf6,
+    0xcd4181e9,
+    0xe150210c,
+    0xe24ef1bd,
+    0xb168c381,
+    0xfde4e789,
+    0x5c79b0d8,
+    0x1e8bfd43,
+    0x4d495001,
+    0x38be4341,
+    0x913cee1d,
+    0x92a79c3f,
+    0x089766be,
+    0xbaeeadf4,
+    0x1286becf,
+    0xb6eacb19,
+    0x2660c200,
+    0x7565bde4,
+    0x64241f7a,
+    0x8248dca9,
+    0xc3b3ad66,
+    0x28136086,
+    0x0bd8dfa8,
+    0x356d1cf2,
+    0x107789be,
+    0xb3b2e9ce,
+    0x0502aa8f,
+    0x0bc0351e,
+    0x166bf52a,
+    0xeb12ff82,
+    0xe3486911,
+    0xd34d7516,
+    0x4e7b3aff,
+    0x5f43671b,
+    0x9cf6e037,
+    0x4981ac83,
+    0x334266ce,
+    0x8c9341b7,
+    0xd0d854c0,
+    0xcb3a6c88,
+    0x47bc2829,
+    0x4725ba37,
+    0xa66ad22b,
+    0x7ad61f1e,
+    0x0c5cbafa,
+    0x4437f107,
+    0xb6e79962,
+    0x42d2d816,
+    0x0a961288,
+    0xe1a5c06e,
+    0x13749e67,
+    0x72fc081a,
+    0xb1d139f7,
+    0xf9583745,
+    0xcf19df58,
+    0xbec3f756,
+    0xc06eba30,
+    0x07211b24,
+    0x45c28829,
+    0xc95e317f,
+    0xbc8ec511,
+    0x38bc46e9,
+    0xc6e6fa14,
+    0xbae8584a,
+    0xad4ebc46,
+    0x468f508b,
+    0x7829435f,
+    0xf124183b,
+    0x821dba9f,
+    0xaff60ff4,
+    0xea2c4e6d,
+    0x16e39264,
+    0x92544a8b,
+    0x009b4fc3,
+    0xaba68ced,
+    0x9ac96f78,
+    0x06a5b79a,
+    0xb2856e6e,
+    0x1aec3ca9,
+    0xbe838688,
+    0x0e0804e9,
+    0x55f1be56,
+    0xe7e5363b,
+    0xb3a1f25d,
+    0xf7debb85,
+    0x61fe033c,
+    0x16746233,
+    0x3c034c28,
+    0xda6d0c74,
+    0x79aac56c,
+    0x3ce4e1ad,
+    0x51f0c802,
+    0x98f8f35a,
+    0x1626a49f,
+    0xeed82b29,
+    0x1d382fe3,
+    0x0c4fb99a,
+    0xbb325778,
+    0x3ec6d97b,
+    0x6e77a6a9,
+    0xcb658b5c,
+    0xd45230c7,
+    0x2bd1408b,
+    0x60c03eb7,
+    0xb9068d78,
+    0xa33754f4,
+    0xf430c87d,
+    0xc8a71302,
+    0xb96d8c32,
+    0xebd4e7be,
+    0xbe8b9d2d,
+    0x7979fb06,
+    0xe7225308,
+    0x8b75cf77,
+    0x11ef8da4,
+    0xe083c858,
+    0x8d6b786f,
+    0x5a6317a6,
+    0xfa5cf7a0,
+    0x5dda0033,
+    0xf28ebfb0,
+    0xf5b9c310,
+    0xa0eac280,
+    0x08b9767a,
+    0xa3d9d2b0,
+    0x79d34217,
+    0x021a718d,
+    0x9ac6336a,
+    0x2711fd60,
+    0x438050e3,
+    0x069908a8,
+    0x3d7fedc4,
+    0x826d2bef,
+    0x4eeb8476,
+    0x488dcf25,
+    0x36c9d566,
+    0x28e74e41,
+    0xc2610aca,
+    0x3d49a9cf,
+    0xbae3b9df,
+    0xb65f8de6,
+    0x92aeaf64,
+    0x3ac7d5e6,
+    0x9ea80509,
+    0xf22b017d,
+    0xa4173f70,
+    0xdd1e16c3,
+    0x15e0d7f9,
+    0x50b1b887,
+    0x2b9f4fd5,
+    0x625aba82,
+    0x6a017962,
+    0x2ec01b9c,
+    0x15488aa9,
+    0xd716e740,
+    0x40055a2c,
+    0x93d29a22,
+    0xe32dbf9a,
+    0x058745b9,
+    0x3453dc1e,
+    0xd699296e,
+    0x496cff6f,
+    0x1c9f4986,
+    0xdfe2ed07,
+    0xb87242d1,
+    0x19de7eae,
+    0x053e561a,
+    0x15ad6f8c,
+    0x66626c1c,
+    0x7154c24c,
+    0xea082b2a,
+    0x93eb2939,
+    0x17dcb0f0,
+    0x58d4f2ae,
+    0x9ea294fb,
+    0x52cf564c,
+    0x9883fe66,
+    0x2ec40581,
+    0x763953c3,
+    0x01d6692e,
+    0xd3a0c108,
+    0xa1e7160e,
+    0xe4f2dfa6,
+    0x693ed285,
+    0x74904698,
+    0x4c2b0edd,
+    0x4f757656,
+    0x5d393378,
+    0xa132234f,
+    0x3d321c5d,
+    0xc3f5e194,
+    0x4b269301,
+    0xc79f022f,
+    0x3c997e7e,
+    0x5e4f9504,
+    0x3ffafbbd,
+    0x76f7ad0e,
+    0x296693f4,
+    0x3d1fce6f,
+    0xc61e45be,
+    0xd3b5ab34,
+    0xf72bf9b7,
+    0x1b0434c0,
+    0x4e72b567,
+    0x5592a33d,
+    0xb5229301,
+    0xcfd2a87f,
+    0x60aeb767,
+    0x1814386b,
+    0x30bcc33d,
+    0x38a0c07d,
+    0xfd1606f2,
+    0xc363519b,
+    0x589dd390,
+    0x5479f8e6,
+    0x1cb8d647,
+    0x97fd61a9,
+    0xea7759f4,
+    0x2d57539d,
+    0x569a58cf,
+    0xe84e63ad,
+    0x462e1b78,
+    0x6580f87e,
+    0xf3817914,
+    0x91da55f4,
+    0x40a230f3,
+    0xd1988f35,
+    0xb6e318d2,
+    0x3ffa50bc,
+    0x3d40f021,
+    0xc3c0bdae,
+    0x4958c24c,
+    0x518f36b2,
+    0x84b1d370,
+    0x0fedce83,
+    0x878ddada,
+    0xf2a279c7,
+    0x94e01be8,
+    0x90716f4b,
+    0x954b8aa3,
 };
 
 const CAST_LONG CAST_S_table7[256] = {
-    0xe216300d, 0xbbddfffc, 0xa7ebdabd, 0x35648095,
-    0x7789f8b7, 0xe6c1121b, 0x0e241600, 0x052ce8b5,
-    0x11a9cfb0, 0xe5952f11, 0xece7990a, 0x9386d174,
-    0x2a42931c, 0x76e38111, 0xb12def3a, 0x37ddddfc,
-    0xde9adeb1, 0x0a0cc32c, 0xbe197029, 0x84a00940,
-    0xbb243a0f, 0xb4d137cf, 0xb44e79f0, 0x049eedfd,
-    0x0b15a15d, 0x480d3168, 0x8bbbde5a, 0x669ded42,
-    0xc7ece831, 0x3f8f95e7, 0x72df191b, 0x7580330d,
-    0x94074251, 0x5c7dcdfa, 0xabbe6d63, 0xaa402164,
-    0xb301d40a, 0x02e7d1ca, 0x53571dae, 0x7a3182a2,
-    0x12a8ddec, 0xfdaa335d, 0x176f43e8, 0x71fb46d4,
-    0x38129022, 0xce949ad4, 0xb84769ad, 0x965bd862,
-    0x82f3d055, 0x66fb9767, 0x15b80b4e, 0x1d5b47a0,
-    0x4cfde06f, 0xc28ec4b8, 0x57e8726e, 0x647a78fc,
-    0x99865d44, 0x608bd593, 0x6c200e03, 0x39dc5ff6,
-    0x5d0b00a3, 0xae63aff2, 0x7e8bd632, 0x70108c0c,
-    0xbbd35049, 0x2998df04, 0x980cf42a, 0x9b6df491,
-    0x9e7edd53, 0x06918548, 0x58cb7e07, 0x3b74ef2e,
-    0x522fffb1, 0xd24708cc, 0x1c7e27cd, 0xa4eb215b,
-    0x3cf1d2e2, 0x19b47a38, 0x424f7618, 0x35856039,
-    0x9d17dee7, 0x27eb35e6, 0xc9aff67b, 0x36baf5b8,
-    0x09c467cd, 0xc18910b1, 0xe11dbf7b, 0x06cd1af8,
-    0x7170c608, 0x2d5e3354, 0xd4de495a, 0x64c6d006,
-    0xbcc0c62c, 0x3dd00db3, 0x708f8f34, 0x77d51b42,
-    0x264f620f, 0x24b8d2bf, 0x15c1b79e, 0x46a52564,
-    0xf8d7e54e, 0x3e378160, 0x7895cda5, 0x859c15a5,
-    0xe6459788, 0xc37bc75f, 0xdb07ba0c, 0x0676a3ab,
-    0x7f229b1e, 0x31842e7b, 0x24259fd7, 0xf8bef472,
-    0x835ffcb8, 0x6df4c1f2, 0x96f5b195, 0xfd0af0fc,
-    0xb0fe134c, 0xe2506d3d, 0x4f9b12ea, 0xf215f225,
-    0xa223736f, 0x9fb4c428, 0x25d04979, 0x34c713f8,
-    0xc4618187, 0xea7a6e98, 0x7cd16efc, 0x1436876c,
-    0xf1544107, 0xbedeee14, 0x56e9af27, 0xa04aa441,
-    0x3cf7c899, 0x92ecbae6, 0xdd67016d, 0x151682eb,
-    0xa842eedf, 0xfdba60b4, 0xf1907b75, 0x20e3030f,
-    0x24d8c29e, 0xe139673b, 0xefa63fb8, 0x71873054,
-    0xb6f2cf3b, 0x9f326442, 0xcb15a4cc, 0xb01a4504,
-    0xf1e47d8d, 0x844a1be5, 0xbae7dfdc, 0x42cbda70,
-    0xcd7dae0a, 0x57e85b7a, 0xd53f5af6, 0x20cf4d8c,
-    0xcea4d428, 0x79d130a4, 0x3486ebfb, 0x33d3cddc,
-    0x77853b53, 0x37effcb5, 0xc5068778, 0xe580b3e6,
-    0x4e68b8f4, 0xc5c8b37e, 0x0d809ea2, 0x398feb7c,
-    0x132a4f94, 0x43b7950e, 0x2fee7d1c, 0x223613bd,
-    0xdd06caa2, 0x37df932b, 0xc4248289, 0xacf3ebc3,
-    0x5715f6b7, 0xef3478dd, 0xf267616f, 0xc148cbe4,
-    0x9052815e, 0x5e410fab, 0xb48a2465, 0x2eda7fa4,
-    0xe87b40e4, 0xe98ea084, 0x5889e9e1, 0xefd390fc,
-    0xdd07d35b, 0xdb485694, 0x38d7e5b2, 0x57720101,
-    0x730edebc, 0x5b643113, 0x94917e4f, 0x503c2fba,
-    0x646f1282, 0x7523d24a, 0xe0779695, 0xf9c17a8f,
-    0x7a5b2121, 0xd187b896, 0x29263a4d, 0xba510cdf,
-    0x81f47c9f, 0xad1163ed, 0xea7b5965, 0x1a00726e,
-    0x11403092, 0x00da6d77, 0x4a0cdd61, 0xad1f4603,
-    0x605bdfb0, 0x9eedc364, 0x22ebe6a8, 0xcee7d28a,
-    0xa0e736a0, 0x5564a6b9, 0x10853209, 0xc7eb8f37,
-    0x2de705ca, 0x8951570f, 0xdf09822b, 0xbd691a6c,
-    0xaa12e4f2, 0x87451c0f, 0xe0f6a27a, 0x3ada4819,
-    0x4cf1764f, 0x0d771c2b, 0x67cdb156, 0x350d8384,
-    0x5938fa0f, 0x42399ef3, 0x36997b07, 0x0e84093d,
-    0x4aa93e61, 0x8360d87b, 0x1fa98b0c, 0x1149382c,
-    0xe97625a5, 0x0614d1b7, 0x0e25244b, 0x0c768347,
-    0x589e8d82, 0x0d2059d1, 0xa466bb1e, 0xf8da0a82,
-    0x04f19130, 0xba6e4ec0, 0x99265164, 0x1ee7230d,
-    0x50b2ad80, 0xeaee6801, 0x8db2a283, 0xea8bf59e,
+    0xe216300d,
+    0xbbddfffc,
+    0xa7ebdabd,
+    0x35648095,
+    0x7789f8b7,
+    0xe6c1121b,
+    0x0e241600,
+    0x052ce8b5,
+    0x11a9cfb0,
+    0xe5952f11,
+    0xece7990a,
+    0x9386d174,
+    0x2a42931c,
+    0x76e38111,
+    0xb12def3a,
+    0x37ddddfc,
+    0xde9adeb1,
+    0x0a0cc32c,
+    0xbe197029,
+    0x84a00940,
+    0xbb243a0f,
+    0xb4d137cf,
+    0xb44e79f0,
+    0x049eedfd,
+    0x0b15a15d,
+    0x480d3168,
+    0x8bbbde5a,
+    0x669ded42,
+    0xc7ece831,
+    0x3f8f95e7,
+    0x72df191b,
+    0x7580330d,
+    0x94074251,
+    0x5c7dcdfa,
+    0xabbe6d63,
+    0xaa402164,
+    0xb301d40a,
+    0x02e7d1ca,
+    0x53571dae,
+    0x7a3182a2,
+    0x12a8ddec,
+    0xfdaa335d,
+    0x176f43e8,
+    0x71fb46d4,
+    0x38129022,
+    0xce949ad4,
+    0xb84769ad,
+    0x965bd862,
+    0x82f3d055,
+    0x66fb9767,
+    0x15b80b4e,
+    0x1d5b47a0,
+    0x4cfde06f,
+    0xc28ec4b8,
+    0x57e8726e,
+    0x647a78fc,
+    0x99865d44,
+    0x608bd593,
+    0x6c200e03,
+    0x39dc5ff6,
+    0x5d0b00a3,
+    0xae63aff2,
+    0x7e8bd632,
+    0x70108c0c,
+    0xbbd35049,
+    0x2998df04,
+    0x980cf42a,
+    0x9b6df491,
+    0x9e7edd53,
+    0x06918548,
+    0x58cb7e07,
+    0x3b74ef2e,
+    0x522fffb1,
+    0xd24708cc,
+    0x1c7e27cd,
+    0xa4eb215b,
+    0x3cf1d2e2,
+    0x19b47a38,
+    0x424f7618,
+    0x35856039,
+    0x9d17dee7,
+    0x27eb35e6,
+    0xc9aff67b,
+    0x36baf5b8,
+    0x09c467cd,
+    0xc18910b1,
+    0xe11dbf7b,
+    0x06cd1af8,
+    0x7170c608,
+    0x2d5e3354,
+    0xd4de495a,
+    0x64c6d006,
+    0xbcc0c62c,
+    0x3dd00db3,
+    0x708f8f34,
+    0x77d51b42,
+    0x264f620f,
+    0x24b8d2bf,
+    0x15c1b79e,
+    0x46a52564,
+    0xf8d7e54e,
+    0x3e378160,
+    0x7895cda5,
+    0x859c15a5,
+    0xe6459788,
+    0xc37bc75f,
+    0xdb07ba0c,
+    0x0676a3ab,
+    0x7f229b1e,
+    0x31842e7b,
+    0x24259fd7,
+    0xf8bef472,
+    0x835ffcb8,
+    0x6df4c1f2,
+    0x96f5b195,
+    0xfd0af0fc,
+    0xb0fe134c,
+    0xe2506d3d,
+    0x4f9b12ea,
+    0xf215f225,
+    0xa223736f,
+    0x9fb4c428,
+    0x25d04979,
+    0x34c713f8,
+    0xc4618187,
+    0xea7a6e98,
+    0x7cd16efc,
+    0x1436876c,
+    0xf1544107,
+    0xbedeee14,
+    0x56e9af27,
+    0xa04aa441,
+    0x3cf7c899,
+    0x92ecbae6,
+    0xdd67016d,
+    0x151682eb,
+    0xa842eedf,
+    0xfdba60b4,
+    0xf1907b75,
+    0x20e3030f,
+    0x24d8c29e,
+    0xe139673b,
+    0xefa63fb8,
+    0x71873054,
+    0xb6f2cf3b,
+    0x9f326442,
+    0xcb15a4cc,
+    0xb01a4504,
+    0xf1e47d8d,
+    0x844a1be5,
+    0xbae7dfdc,
+    0x42cbda70,
+    0xcd7dae0a,
+    0x57e85b7a,
+    0xd53f5af6,
+    0x20cf4d8c,
+    0xcea4d428,
+    0x79d130a4,
+    0x3486ebfb,
+    0x33d3cddc,
+    0x77853b53,
+    0x37effcb5,
+    0xc5068778,
+    0xe580b3e6,
+    0x4e68b8f4,
+    0xc5c8b37e,
+    0x0d809ea2,
+    0x398feb7c,
+    0x132a4f94,
+    0x43b7950e,
+    0x2fee7d1c,
+    0x223613bd,
+    0xdd06caa2,
+    0x37df932b,
+    0xc4248289,
+    0xacf3ebc3,
+    0x5715f6b7,
+    0xef3478dd,
+    0xf267616f,
+    0xc148cbe4,
+    0x9052815e,
+    0x5e410fab,
+    0xb48a2465,
+    0x2eda7fa4,
+    0xe87b40e4,
+    0xe98ea084,
+    0x5889e9e1,
+    0xefd390fc,
+    0xdd07d35b,
+    0xdb485694,
+    0x38d7e5b2,
+    0x57720101,
+    0x730edebc,
+    0x5b643113,
+    0x94917e4f,
+    0x503c2fba,
+    0x646f1282,
+    0x7523d24a,
+    0xe0779695,
+    0xf9c17a8f,
+    0x7a5b2121,
+    0xd187b896,
+    0x29263a4d,
+    0xba510cdf,
+    0x81f47c9f,
+    0xad1163ed,
+    0xea7b5965,
+    0x1a00726e,
+    0x11403092,
+    0x00da6d77,
+    0x4a0cdd61,
+    0xad1f4603,
+    0x605bdfb0,
+    0x9eedc364,
+    0x22ebe6a8,
+    0xcee7d28a,
+    0xa0e736a0,
+    0x5564a6b9,
+    0x10853209,
+    0xc7eb8f37,
+    0x2de705ca,
+    0x8951570f,
+    0xdf09822b,
+    0xbd691a6c,
+    0xaa12e4f2,
+    0x87451c0f,
+    0xe0f6a27a,
+    0x3ada4819,
+    0x4cf1764f,
+    0x0d771c2b,
+    0x67cdb156,
+    0x350d8384,
+    0x5938fa0f,
+    0x42399ef3,
+    0x36997b07,
+    0x0e84093d,
+    0x4aa93e61,
+    0x8360d87b,
+    0x1fa98b0c,
+    0x1149382c,
+    0xe97625a5,
+    0x0614d1b7,
+    0x0e25244b,
+    0x0c768347,
+    0x589e8d82,
+    0x0d2059d1,
+    0xa466bb1e,
+    0xf8da0a82,
+    0x04f19130,
+    0xba6e4ec0,
+    0x99265164,
+    0x1ee7230d,
+    0x50b2ad80,
+    0xeaee6801,
+    0x8db2a283,
+    0xea8bf59e,
 };
diff --git a/crypto/chacha/asm/chacha-armv8-sve.pl b/crypto/chacha/asm/chacha-armv8-sve.pl
index 705917fb52c54..62a8be6fe12c9 100755
--- a/crypto/chacha/asm/chacha-armv8-sve.pl
+++ b/crypto/chacha/asm/chacha-armv8-sve.pl
@@ -248,9 +248,6 @@ ()
 	my $next_offset = $offset + 1;
 $code.=<<___;
 	ld1w	{$reg.s},p0/z,[$inp,#$offset,MUL VL]
-#ifdef  __AARCH64EB__
-	revb    $reg.s,p0/m,$reg.s
-#endif
 ___
 	if (@_) {
 		&load_regs($next_offset, @_);
@@ -272,9 +269,6 @@ ()
 	my $reg = shift;
 	my $next_offset = $offset + 1;
 $code.=<<___;
-#ifdef  __AARCH64EB__
-	revb	$reg.s,p0/m,$reg.s
-#endif
 	st1w	{$reg.s},p0,[$outp,#$offset,MUL VL]
 ___
 	if (@_) {
@@ -480,13 +474,29 @@ ()
 $code.=<<___;
 #ifdef	__AARCH64EB__
 	rev	@sxx[0],@sxx[0]
+	revb	@mx[0].s,p0/m,@mx[0].s
+	revb	@mx[1].s,p0/m,@mx[1].s
 	rev	@sxx[2],@sxx[2]
+	revb	@mx[2].s,p0/m,@mx[2].s
+	revb	@mx[3].s,p0/m,@mx[3].s
 	rev	@sxx[4],@sxx[4]
+	revb	@mx[4].s,p0/m,@mx[4].s
+	revb	@mx[5].s,p0/m,@mx[5].s
 	rev	@sxx[6],@sxx[6]
+	revb	@mx[6].s,p0/m,@mx[6].s
+	revb	@mx[7].s,p0/m,@mx[7].s
 	rev	@sxx[8],@sxx[8]
+	revb	@mx[8].s,p0/m,@mx[8].s
+	revb	@mx[9].s,p0/m,@mx[9].s
 	rev	@sxx[10],@sxx[10]
+	revb	@mx[10].s,p0/m,@mx[10].s
+	revb	@mx[11].s,p0/m,@mx[11].s
 	rev	@sxx[12],@sxx[12]
+	revb	@mx[12].s,p0/m,@mx[12].s
+	revb	@mx[13].s,p0/m,@mx[13].s
 	rev	@sxx[14],@sxx[14]
+	revb	@mx[14].s,p0/m,@mx[14].s
+	revb	@mx[15].s,p0/m,@mx[15].s
 #endif
 	.if mixin == 1
 		add	@K[6],@K[6],#1
diff --git a/crypto/chacha/asm/chacha-x86.pl b/crypto/chacha/asm/chacha-x86.pl
index d0e83d88cec3b..a1ea4ea461b06 100755
--- a/crypto/chacha/asm/chacha-x86.pl
+++ b/crypto/chacha/asm/chacha-x86.pl
@@ -49,12 +49,12 @@
 
 $ymm=1 if ($xmm &&
 		`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
-			=~ /GNU assembler version ([2-9]\.[0-9]+)/ &&
-		($gasver=$1)>=2.19);	# first version supporting AVX
+			=~ /GNU assembler version ([0-9]+)\.([0-9]+)/ &&
+		($gasver = $1 + $2/100.0) >= 2.19);	# first version supporting AVX
 
 $ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32n" &&
-		`nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/ &&
-		$1>=2.03);	# first version supporting AVX
+		`nasm -v 2>&1` =~ /NASM version ([0-9]+)\.([0-9]+)/ &&
+		$1 + $2/100.0 >= 2.03);	# first version supporting AVX
 
 $ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32" &&
 		`ml 2>&1` =~ /Version ([0-9]+)\./ &&
diff --git a/crypto/chacha/asm/chacha-x86_64.pl b/crypto/chacha/asm/chacha-x86_64.pl
index 5506e33fa2d09..d46bc03b3eec2 100755
--- a/crypto/chacha/asm/chacha-x86_64.pl
+++ b/crypto/chacha/asm/chacha-x86_64.pl
@@ -71,14 +71,15 @@
 die "can't locate x86_64-xlate.pl";
 
 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
-		=~ /GNU assembler version ([2-9]\.[0-9]+)/) {
-	$avx = ($1>=2.19) + ($1>=2.22) + ($1>=2.25);
+		=~ /GNU assembler version ([0-9]+)\.([0-9]+)/) {
+	my $ver = $1 + $2/100.0; # 3.1->3.01, 3.10->3.10
+	$avx = ($ver >= 2.19) + ($ver >= 2.22) + ($ver >= 2.25);
 }
 
 if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
-	   `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)(?:\.([0-9]+))?/) {
-	$avx = ($1>=2.09) + ($1>=2.10) + ($1>=2.12);
-	$avx += 1 if ($1==2.11 && $2>=8);
+	   `nasm -v 2>&1` =~ /NASM version ([0-9]+)\.([0-9]+)(?:\.([0-9]+))?/) {
+	my $ver = $1 + $2/100.0 + $3/10000.0; # 3.1.0->3.01, 3.10.1->3.1001
+	$avx = ($ver >= 2.09) + ($ver >= 2.10) + ($ver >= 2.1108);
 }
 
 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
diff --git a/crypto/chacha/chacha_enc.c b/crypto/chacha/chacha_enc.c
index f6fbc119885a8..3cd4f0188d35d 100644
--- a/crypto/chacha/chacha_enc.c
+++ b/crypto/chacha/chacha_enc.c
@@ -22,43 +22,43 @@ typedef union {
     u8 c[64];
 } chacha_buf;
 
-# define ROTATE(v, n) (((v) << (n)) | ((v) >> (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) ({ u32 ret;                   \
+#define ROTATE(v, n) (((v) << (n)) | ((v) >> (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) ({ u32 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) ({ u32 ret;                   \
+                        : "r"(x), "i"(32 - (n))); ret; })
+#endif
+#if __riscv_xlen == 32
+#undef ROTATE
+#define ROTATE(x, n) ({ u32 ret;                   \
                         asm ("rori %0, %1, %2"         \
                         : "=r"(ret)                    \
-                        : "r"(x), "i"(32 - (n))); ret;})
-#    endif
-#   endif
-#  endif
-# endif
-
-# define U32TO8_LITTLE(p, v) do { \
-                                (p)[0] = (u8)(v >>  0); \
-                                (p)[1] = (u8)(v >>  8); \
-                                (p)[2] = (u8)(v >> 16); \
-                                (p)[3] = (u8)(v >> 24); \
-                                } while(0)
+                        : "r"(x), "i"(32 - (n))); ret; })
+#endif
+#endif
+#endif
+#endif
+
+#define U32TO8_LITTLE(p, v)     \
+    do {                        \
+        (p)[0] = (u8)(v >> 0);  \
+        (p)[1] = (u8)(v >> 8);  \
+        (p)[2] = (u8)(v >> 16); \
+        (p)[3] = (u8)(v >> 24); \
+    } while (0)
 
 /* QUARTERROUND updates a, b, c, d with a ChaCha "quarter" round. */
-# define QUARTERROUND(a,b,c,d) ( \
-                x[a] += x[b], x[d] = ROTATE((x[d] ^ x[a]),16), \
-                x[c] += x[d], x[b] = ROTATE((x[b] ^ x[c]),12), \
-                x[a] += x[b], x[d] = ROTATE((x[d] ^ x[a]), 8), \
-                x[c] += x[d], x[b] = ROTATE((x[b] ^ x[c]), 7)  )
+#define QUARTERROUND(a, b, c, d) (                  \
+    x[a] += x[b], x[d] = ROTATE((x[d] ^ x[a]), 16), \
+    x[c] += x[d], x[b] = ROTATE((x[b] ^ x[c]), 12), \
+    x[a] += x[b], x[d] = ROTATE((x[d] ^ x[a]), 8),  \
+    x[c] += x[d], x[b] = ROTATE((x[b] ^ x[c]), 7))
 
 /* chacha_core performs 20 rounds of ChaCha on the input words in
  * |input| and writes the 64 output bytes to |output|. */
@@ -92,10 +92,10 @@ static void chacha20_core(chacha_buf *output, const u32 input[16])
 
 #ifdef INCLUDE_C_CHACHA20
 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])
 #else
 void ChaCha20_ctr32(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
 {
     u32 input[16];
@@ -104,17 +104,17 @@ void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp, size_t len,
 
     /* sigma constant "expand 32-byte k" in little-endian encoding */
     input[0] = ((u32)ossl_toascii('e')) | ((u32)ossl_toascii('x') << 8)
-               | ((u32)ossl_toascii('p') << 16)
-               | ((u32)ossl_toascii('a') << 24);
+        | ((u32)ossl_toascii('p') << 16)
+        | ((u32)ossl_toascii('a') << 24);
     input[1] = ((u32)ossl_toascii('n')) | ((u32)ossl_toascii('d') << 8)
-               | ((u32)ossl_toascii(' ') << 16)
-               | ((u32)ossl_toascii('3') << 24);
+        | ((u32)ossl_toascii(' ') << 16)
+        | ((u32)ossl_toascii('3') << 24);
     input[2] = ((u32)ossl_toascii('2')) | ((u32)ossl_toascii('-') << 8)
-               | ((u32)ossl_toascii('b') << 16)
-               | ((u32)ossl_toascii('y') << 24);
+        | ((u32)ossl_toascii('b') << 16)
+        | ((u32)ossl_toascii('y') << 24);
     input[3] = ((u32)ossl_toascii('t')) | ((u32)ossl_toascii('e') << 8)
-               | ((u32)ossl_toascii(' ') << 16)
-               | ((u32)ossl_toascii('k') << 24);
+        | ((u32)ossl_toascii(' ') << 16)
+        | ((u32)ossl_toascii('k') << 24);
 
     input[4] = key[0];
     input[5] = key[1];
diff --git a/crypto/chacha/chacha_ppc.c b/crypto/chacha/chacha_ppc.c
index 91ed85eaf02b1..b36881a833669 100644
--- a/crypto/chacha/chacha_ppc.c
+++ b/crypto/chacha/chacha_ppc.c
@@ -15,28 +15,29 @@
 #include "crypto/ppc_arch.h"
 
 void ChaCha20_ctr32_int(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]);
 void ChaCha20_ctr32_vmx(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]);
 void ChaCha20_ctr32_vsx(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]);
 void ChaCha20_ctr32_vsx_p10(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]);
 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])
 {
 #if !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX)
-    OPENSSL_ppccap_P & PPC_BRD31
-        ? ChaCha20_ctr32_vsx_p10(out, inp, len, key, counter) :
+    OPENSSL_ppccap_P &PPC_BRD31
+        ? ChaCha20_ctr32_vsx_p10(out, inp, len, key, counter)
+        :
 #endif
-          OPENSSL_ppccap_P & PPC_CRYPTO207
-            ? ChaCha20_ctr32_vsx(out, inp, len, key, counter)
-            : OPENSSL_ppccap_P & PPC_ALTIVEC
-                 ? ChaCha20_ctr32_vmx(out, inp, len, key, counter)
-                 : ChaCha20_ctr32_int(out, inp, len, key, counter);
+        OPENSSL_ppccap_P &PPC_CRYPTO207
+        ? ChaCha20_ctr32_vsx(out, inp, len, key, counter)
+        : OPENSSL_ppccap_P &PPC_ALTIVEC
+        ? ChaCha20_ctr32_vmx(out, inp, len, key, counter)
+        : ChaCha20_ctr32_int(out, inp, len, key, counter);
 }
diff --git a/crypto/chacha/chacha_riscv.c b/crypto/chacha/chacha_riscv.c
index 734444bfa88b7..c9f17b35d85dc 100644
--- a/crypto/chacha/chacha_riscv.c
+++ b/crypto/chacha/chacha_riscv.c
@@ -41,17 +41,19 @@
 #include "crypto/riscv_arch.h"
 
 void ChaCha20_ctr32_v_zbb_zvkb(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]);
 
 void ChaCha20_ctr32_v_zbb(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]);
 
 void ChaCha20_ctr32(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])
 {
-    if (len > CHACHA_BLK_SIZE && RISCV_HAS_ZBB() && riscv_vlen() >= 128) {
+    if (len > CHACHA_BLK_SIZE && RISCV_HAS_ZBB() && riscv_vlen() >= 128
+        && (size_t)out % sizeof(size_t) == 0
+        && (size_t)inp % sizeof(size_t) == 0) {
         if (RISCV_HAS_ZVKB()) {
             ChaCha20_ctr32_v_zbb_zvkb(out, inp, len, key, counter);
         } else {
diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c
index 16f4b904ad853..03b127ebb926c 100644
--- a/crypto/cmac/cmac.c
+++ b/crypto/cmac/cmac.c
@@ -109,8 +109,8 @@ int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in)
 }
 
 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[])
 {
     static const unsigned char zero_iv[EVP_MAX_BLOCK_LENGTH] = { 0 };
     int block_len;
@@ -171,7 +171,7 @@ int ossl_cmac_init(CMAC_CTX *ctx, const void *key, size_t keylen,
 }
 
 int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
-              const EVP_CIPHER *cipher, ENGINE *impl)
+    const EVP_CIPHER *cipher, ENGINE *impl)
 {
     return ossl_cmac_init(ctx, key, keylen, cipher, impl, NULL);
 }
@@ -242,7 +242,6 @@ int CMAC_Update(CMAC_CTX *ctx, const void *in, size_t dlen)
     memcpy(ctx->last_block, data, dlen);
     ctx->nlast_block = dlen;
     return 1;
-
 }
 
 int CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen)
diff --git a/crypto/cmp/cmp_asn.c b/crypto/cmp/cmp_asn.c
index a326320267438..740e4466a1ac0 100644
--- a/crypto/cmp/cmp_asn.c
+++ b/crypto/cmp/cmp_asn.c
@@ -18,7 +18,7 @@
 #include <openssl/cmp.h>
 #include <openssl/crmf.h>
 
-/* ASN.1 declarations from RFC4210 */
+/* ASN.1 declarations from RFC 9810 */
 ASN1_SEQUENCE(OSSL_CMP_REVANNCONTENT) = {
     /* OSSL_CMP_PKISTATUS is effectively ASN1_INTEGER so it is used directly */
     ASN1_SIMPLE(OSSL_CMP_REVANNCONTENT, status, ASN1_INTEGER),
@@ -36,14 +36,12 @@ ASN1_SEQUENCE(OSSL_CMP_CHALLENGE) = {
 } ASN1_SEQUENCE_END(OSSL_CMP_CHALLENGE)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CHALLENGE)
 
-ASN1_ITEM_TEMPLATE(OSSL_CMP_POPODECKEYCHALLCONTENT) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
-                          OSSL_CMP_POPODECKEYCHALLCONTENT, OSSL_CMP_CHALLENGE)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_POPODECKEYCHALLCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+    OSSL_CMP_POPODECKEYCHALLCONTENT, OSSL_CMP_CHALLENGE)
 ASN1_ITEM_TEMPLATE_END(OSSL_CMP_POPODECKEYCHALLCONTENT)
 
-ASN1_ITEM_TEMPLATE(OSSL_CMP_POPODECKEYRESPCONTENT) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
-                          OSSL_CMP_POPODECKEYRESPCONTENT, ASN1_INTEGER)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_POPODECKEYRESPCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+    OSSL_CMP_POPODECKEYRESPCONTENT, ASN1_INTEGER)
 ASN1_ITEM_TEMPLATE_END(OSSL_CMP_POPODECKEYRESPCONTENT)
 
 ASN1_SEQUENCE(OSSL_CMP_CAKEYUPDANNCONTENT) = {
@@ -61,76 +59,74 @@ ASN1_SEQUENCE(OSSL_CMP_ERRORMSGCONTENT) = {
     ASN1_OPT(OSSL_CMP_ERRORMSGCONTENT, errorCode, ASN1_INTEGER),
     /* OSSL_CMP_PKIFREETEXT is a ASN1_UTF8STRING sequence, so used directly */
     ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ERRORMSGCONTENT, errorDetails,
-                         ASN1_UTF8STRING)
+        ASN1_UTF8STRING)
 } ASN1_SEQUENCE_END(OSSL_CMP_ERRORMSGCONTENT)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_ERRORMSGCONTENT)
 
 ASN1_ADB_TEMPLATE(infotypeandvalue_default) = ASN1_OPT(OSSL_CMP_ITAV,
-                                                       infoValue.other,
-                                                       ASN1_ANY);
+    infoValue.other,
+    ASN1_ANY);
 /* ITAV means InfoTypeAndValue */
 ASN1_ADB(OSSL_CMP_ITAV) = {
     /* OSSL_CMP_CMPCERTIFICATE is effectively X509 so it is used directly */
-    ADB_ENTRY(NID_id_it_caProtEncCert, ASN1_OPT(OSSL_CMP_ITAV,
-                                                infoValue.caProtEncCert, X509)),
+    ADB_ENTRY(NID_id_it_caProtEncCert, ASN1_OPT(OSSL_CMP_ITAV, infoValue.caProtEncCert, X509)),
     ADB_ENTRY(NID_id_it_signKeyPairTypes,
-              ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV,
-                                   infoValue.signKeyPairTypes, X509_ALGOR)),
+        ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV,
+            infoValue.signKeyPairTypes, X509_ALGOR)),
     ADB_ENTRY(NID_id_it_encKeyPairTypes,
-              ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV,
-                                   infoValue.encKeyPairTypes, X509_ALGOR)),
+        ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV,
+            infoValue.encKeyPairTypes, X509_ALGOR)),
     ADB_ENTRY(NID_id_it_preferredSymmAlg,
-              ASN1_OPT(OSSL_CMP_ITAV, infoValue.preferredSymmAlg,
-                       X509_ALGOR)),
+        ASN1_OPT(OSSL_CMP_ITAV, infoValue.preferredSymmAlg,
+            X509_ALGOR)),
     ADB_ENTRY(NID_id_it_caKeyUpdateInfo,
-              ASN1_OPT(OSSL_CMP_ITAV, infoValue.caKeyUpdateInfo,
-                       OSSL_CMP_CAKEYUPDANNCONTENT)),
+        ASN1_OPT(OSSL_CMP_ITAV, infoValue.caKeyUpdateInfo,
+            OSSL_CMP_CAKEYUPDANNCONTENT)),
     ADB_ENTRY(NID_id_it_currentCRL,
-              ASN1_OPT(OSSL_CMP_ITAV, infoValue.currentCRL, X509_CRL)),
+        ASN1_OPT(OSSL_CMP_ITAV, infoValue.currentCRL, X509_CRL)),
     ADB_ENTRY(NID_id_it_unsupportedOIDs,
-              ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV,
-                                   infoValue.unsupportedOIDs, ASN1_OBJECT)),
+        ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV,
+            infoValue.unsupportedOIDs, ASN1_OBJECT)),
     ADB_ENTRY(NID_id_it_keyPairParamReq,
-              ASN1_OPT(OSSL_CMP_ITAV, infoValue.keyPairParamReq,
-                       ASN1_OBJECT)),
+        ASN1_OPT(OSSL_CMP_ITAV, infoValue.keyPairParamReq,
+            ASN1_OBJECT)),
     ADB_ENTRY(NID_id_it_keyPairParamRep,
-              ASN1_OPT(OSSL_CMP_ITAV, infoValue.keyPairParamRep,
-                       X509_ALGOR)),
+        ASN1_OPT(OSSL_CMP_ITAV, infoValue.keyPairParamRep,
+            X509_ALGOR)),
     ADB_ENTRY(NID_id_it_revPassphrase,
-              ASN1_OPT(OSSL_CMP_ITAV, infoValue.revPassphrase,
-                       OSSL_CRMF_ENCRYPTEDVALUE)),
+        ASN1_OPT(OSSL_CMP_ITAV, infoValue.revPassphrase,
+            OSSL_CRMF_ENCRYPTEDVALUE)),
     ADB_ENTRY(NID_id_it_implicitConfirm,
-              ASN1_OPT(OSSL_CMP_ITAV, infoValue.implicitConfirm,
-                       ASN1_NULL)),
+        ASN1_OPT(OSSL_CMP_ITAV, infoValue.implicitConfirm,
+            ASN1_NULL)),
     ADB_ENTRY(NID_id_it_confirmWaitTime,
-              ASN1_OPT(OSSL_CMP_ITAV, infoValue.confirmWaitTime,
-                       ASN1_GENERALIZEDTIME)),
+        ASN1_OPT(OSSL_CMP_ITAV, infoValue.confirmWaitTime,
+            ASN1_GENERALIZEDTIME)),
     ADB_ENTRY(NID_id_it_origPKIMessage,
-              ASN1_OPT(OSSL_CMP_ITAV, infoValue.origPKIMessage,
-                       OSSL_CMP_MSGS)),
+        ASN1_OPT(OSSL_CMP_ITAV, infoValue.origPKIMessage,
+            OSSL_CMP_MSGS)),
     ADB_ENTRY(NID_id_it_suppLangTags,
-              ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.suppLangTagsValue,
-                                   ASN1_UTF8STRING)),
+        ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.suppLangTagsValue,
+            ASN1_UTF8STRING)),
     ADB_ENTRY(NID_id_it_caCerts,
-              ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.caCerts, X509)),
+        ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.caCerts, X509)),
     ADB_ENTRY(NID_id_it_rootCaCert,
-              ASN1_OPT(OSSL_CMP_ITAV, infoValue.rootCaCert, X509)),
+        ASN1_OPT(OSSL_CMP_ITAV, infoValue.rootCaCert, X509)),
     ADB_ENTRY(NID_id_it_rootCaKeyUpdate,
-              ASN1_OPT(OSSL_CMP_ITAV, infoValue.rootCaKeyUpdate,
-                       OSSL_CMP_ROOTCAKEYUPDATE)),
+        ASN1_OPT(OSSL_CMP_ITAV, infoValue.rootCaKeyUpdate,
+            OSSL_CMP_ROOTCAKEYUPDATE)),
     ADB_ENTRY(NID_id_it_certReqTemplate,
-              ASN1_OPT(OSSL_CMP_ITAV, infoValue.certReqTemplate,
-                       OSSL_CMP_CERTREQTEMPLATE)),
+        ASN1_OPT(OSSL_CMP_ITAV, infoValue.certReqTemplate,
+            OSSL_CMP_CERTREQTEMPLATE)),
     ADB_ENTRY(NID_id_it_certProfile,
-              ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.certProfile,
-                                   ASN1_UTF8STRING)),
+        ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.certProfile,
+            ASN1_UTF8STRING)),
     ADB_ENTRY(NID_id_it_crlStatusList,
-              ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.crlStatusList,
-                                   OSSL_CMP_CRLSTATUS)),
+        ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.crlStatusList,
+            OSSL_CMP_CRLSTATUS)),
     ADB_ENTRY(NID_id_it_crls,
-              ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.crls, X509_CRL))
-} ASN1_ADB_END(OSSL_CMP_ITAV, 0, infoType, 0,
-               &infotypeandvalue_default_tt, NULL);
+        ASN1_SEQUENCE_OF_OPT(OSSL_CMP_ITAV, infoValue.crls, X509_CRL))
+} ASN1_ADB_END(OSSL_CMP_ITAV, 0, infoType, 0, &infotypeandvalue_default_tt, NULL);
 
 ASN1_SEQUENCE(OSSL_CMP_ITAV) = {
     ASN1_SIMPLE(OSSL_CMP_ITAV, infoType, ASN1_OBJECT),
@@ -147,16 +143,15 @@ ASN1_SEQUENCE(OSSL_CMP_ROOTCAKEYUPDATE) = {
 } ASN1_SEQUENCE_END(OSSL_CMP_ROOTCAKEYUPDATE)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_ROOTCAKEYUPDATE)
 
-ASN1_ITEM_TEMPLATE(OSSL_CMP_ATAVS) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
-                          OSSL_CMP_ATAVS, OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_ATAVS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+    OSSL_CMP_ATAVS, OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
 ASN1_ITEM_TEMPLATE_END(OSSL_CMP_ATAVS)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_ATAVS)
 
 ASN1_SEQUENCE(OSSL_CMP_CERTREQTEMPLATE) = {
     ASN1_SIMPLE(OSSL_CMP_CERTREQTEMPLATE, certTemplate, OSSL_CRMF_CERTTEMPLATE),
     ASN1_SEQUENCE_OF_OPT(OSSL_CMP_CERTREQTEMPLATE, keySpec,
-                         OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
+        OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
 } ASN1_SEQUENCE_END(OSSL_CMP_CERTREQTEMPLATE)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CERTREQTEMPLATE)
 
@@ -185,7 +180,7 @@ 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)
 {
     itav->infoType = type;
     itav->infoValue.other = value;
@@ -206,7 +201,7 @@ ASN1_TYPE *OSSL_CMP_ITAV_get0_value(const OSSL_CMP_ITAV *itav)
 }
 
 int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
-                                   OSSL_CMP_ITAV *itav)
+    OSSL_CMP_ITAV *itav)
 {
     int created = 0;
 
@@ -224,7 +219,7 @@ int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **itav_sk_p,
         goto err;
     return 1;
 
- err:
+err:
     if (created) {
         sk_OSSL_CMP_ITAV_free(*itav_sk_p);
         *itav_sk_p = NULL;
@@ -245,7 +240,7 @@ OSSL_CMP_ITAV
 }
 
 int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
-                                   STACK_OF(ASN1_UTF8STRING) **out)
+    STACK_OF(ASN1_UTF8STRING) **out)
 {
     if (itav == NULL || out == NULL) {
         ERR_raise(ERR_LIB_CMP, ERR_R_PASSED_NULL_PARAMETER);
@@ -266,8 +261,7 @@ OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts)
     if (itav == NULL)
         return NULL;
     if (sk_X509_num(caCerts) > 0
-        && (itav->infoValue.caCerts =
-            sk_X509_deep_copy(caCerts, X509_dup, X509_free)) == NULL) {
+        && (itav->infoValue.caCerts = sk_X509_deep_copy(caCerts, X509_dup, X509_free)) == NULL) {
         OSSL_CMP_ITAV_free(itav);
         return NULL;
     }
@@ -286,7 +280,8 @@ int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out)
         return 0;
     }
     *out = sk_X509_num(itav->infoValue.caCerts) > 0
-        ? itav->infoValue.caCerts : NULL;
+        ? itav->infoValue.caCerts
+        : NULL;
     return 1;
 }
 
@@ -297,7 +292,7 @@ OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_rootCaCert(const X509 *rootCaCert)
     if (itav == NULL)
         return NULL;
     if (rootCaCert != NULL
-            && (itav->infoValue.rootCaCert = X509_dup(rootCaCert)) == NULL) {
+        && (itav->infoValue.rootCaCert = X509_dup(rootCaCert)) == NULL) {
         OSSL_CMP_ITAV_free(itav);
         return NULL;
     }
@@ -319,8 +314,8 @@ int OSSL_CMP_ITAV_get0_rootCaCert(const OSSL_CMP_ITAV *itav, X509 **out)
     return 1;
 }
 OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_rootCaKeyUpdate(const X509 *newWithNew,
-                                                 const X509 *newWithOld,
-                                                 const X509 *oldWithNew)
+    const X509 *newWithOld,
+    const X509 *oldWithNew)
 {
     OSSL_CMP_ITAV *itav;
     OSSL_CMP_ROOTCAKEYUPDATE *upd = NULL;
@@ -346,15 +341,15 @@ OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_rootCaKeyUpdate(const X509 *newWithNew,
     itav->infoValue.rootCaKeyUpdate = upd;
     return itav;
 
- err:
+err:
     OSSL_CMP_ROOTCAKEYUPDATE_free(upd);
     return NULL;
 }
 
 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_ROOTCAKEYUPDATE *upd;
 
@@ -377,7 +372,7 @@ int OSSL_CMP_ITAV_get0_rootCaKeyUpdate(const OSSL_CMP_ITAV *itav,
 
 OSSL_CMP_ITAV
 *OSSL_CMP_ITAV_new0_certReqTemplate(OSSL_CRMF_CERTTEMPLATE *certTemplate,
-                                    OSSL_CMP_ATAVS *keySpec)
+    OSSL_CMP_ATAVS *keySpec)
 {
     OSSL_CMP_ITAV *itav;
     OSSL_CMP_CERTREQTEMPLATE *tmpl;
@@ -403,8 +398,8 @@ OSSL_CMP_ITAV
 }
 
 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_CERTREQTEMPLATE *tpl;
 
@@ -441,22 +436,22 @@ int OSSL_CMP_ITAV_get1_certReqTemplate(const OSSL_CMP_ITAV *itav,
 
             if (type == NULL) {
                 ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_KEYSPEC,
-                               "keySpec with index %d in certReqTemplate does not exist",
-                               i);
+                    "keySpec with index %d in certReqTemplate does not exist",
+                    i);
                 goto err;
             }
             nid = OBJ_obj2nid(type);
 
             if (nid != NID_id_regCtrl_algId
-                    && nid != NID_id_regCtrl_rsaKeyLen) {
+                && nid != NID_id_regCtrl_rsaKeyLen) {
                 name = OBJ_nid2ln(nid);
                 if (name == NULL)
                     name = OBJ_nid2sn(nid);
                 if (name == NULL)
                     name = "<undef>";
                 ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_KEYSPEC,
-                               "keySpec with index %d in certReqTemplate has invalid type %s",
-                               i, name);
+                    "keySpec with index %d in certReqTemplate has invalid type %s",
+                    i, name);
                 goto err;
             }
             OSSL_CMP_ATAV_push1(keySpec, atav);
@@ -464,7 +459,7 @@ int OSSL_CMP_ITAV_get1_certReqTemplate(const OSSL_CMP_ITAV *itav,
     }
     return 1;
 
- err:
+err:
     OSSL_CRMF_CERTTEMPLATE_free(*certTemplate);
     *certTemplate = NULL;
     sk_OSSL_CMP_ATAV_pop_free(*keySpec, OSSL_CMP_ATAV_free);
@@ -484,7 +479,7 @@ OSSL_CMP_ATAV *OSSL_CMP_ATAV_create(ASN1_OBJECT *type, ASN1_TYPE *value)
 }
 
 void OSSL_CMP_ATAV_set0(OSSL_CMP_ATAV *atav, ASN1_OBJECT *type,
-                        ASN1_TYPE *value)
+    ASN1_TYPE *value)
 {
     atav->type = type;
     atav->value.other = value;
@@ -509,7 +504,7 @@ OSSL_CMP_ATAV *OSSL_CMP_ATAV_new_algId(const X509_ALGOR *alg)
     if ((dup = X509_ALGOR_dup(alg)) == NULL)
         return NULL;
     res = OSSL_CMP_ATAV_create(OBJ_nid2obj(NID_id_regCtrl_algId),
-                               (ASN1_TYPE *)dup);
+        (ASN1_TYPE *)dup);
     if (res == NULL)
         X509_ALGOR_free(dup);
     return res;
@@ -535,7 +530,8 @@ OSSL_CMP_ATAV *OSSL_CMP_ATAV_new_rsaKeyLen(int len)
         return NULL;
     if (!ASN1_INTEGER_set(aint, len)
         || (res = OSSL_CMP_ATAV_create(OBJ_nid2obj(NID_id_regCtrl_rsaKeyLen),
-                                       (ASN1_TYPE *)aint)) == NULL)
+                (ASN1_TYPE *)aint))
+            == NULL)
         ASN1_INTEGER_free(aint);
     return res;
 }
@@ -545,7 +541,7 @@ int OSSL_CMP_ATAV_get_rsaKeyLen(const OSSL_CMP_ATAV *atav)
     int64_t val;
 
     if (atav == NULL || OBJ_obj2nid(atav->type) != NID_id_regCtrl_rsaKeyLen
-            || !ASN1_INTEGER_get_int64(&val, atav->value.rsaKeyLen))
+        || !ASN1_INTEGER_get_int64(&val, atav->value.rsaKeyLen))
         return -1;
     if (val <= 0 || val > INT_MAX)
         return -2;
@@ -581,7 +577,7 @@ int OSSL_CMP_ATAV_push1(OSSL_CMP_ATAVS **sk_p, const OSSL_CMP_ATAV *atav)
         return 1;
     OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(dup);
 
- err:
+err:
     if (created) {
         sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(*sk_p);
         *sk_p = NULL;
@@ -602,7 +598,7 @@ OSSL_CMP_ITAV
 }
 
 int OSSL_CMP_ITAV_get0_crlStatusList(const OSSL_CMP_ITAV *itav,
-                                     STACK_OF(OSSL_CMP_CRLSTATUS) **out)
+    STACK_OF(OSSL_CMP_CRLSTATUS) **out)
 {
     if (itav == NULL || out == NULL) {
         ERR_raise(ERR_LIB_CMP, ERR_R_PASSED_NULL_PARAMETER);
@@ -617,8 +613,8 @@ int OSSL_CMP_ITAV_get0_crlStatusList(const OSSL_CMP_ITAV *itav,
 }
 
 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)
 {
     OSSL_CMP_CRLSOURCE *crlsource;
     OSSL_CMP_CRLSTATUS *crlstatus;
@@ -642,18 +638,18 @@ OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_new1(const DIST_POINT_NAME *dpn,
             goto err;
     } else {
         crlsource->type = OSSL_CMP_CRLSOURCE_ISSUER;
-        if ((crlsource->value.issuer =
-             sk_GENERAL_NAME_deep_copy(issuer, GENERAL_NAME_dup,
-                                       GENERAL_NAME_free)) == NULL)
+        if ((crlsource->value.issuer = sk_GENERAL_NAME_deep_copy(issuer, GENERAL_NAME_dup,
+                 GENERAL_NAME_free))
+            == NULL)
             goto err;
     }
 
     if (thisUpdate != NULL
-            && (crlstatus->thisUpdate = ASN1_TIME_dup(thisUpdate)) == NULL)
+        && (crlstatus->thisUpdate = ASN1_TIME_dup(thisUpdate)) == NULL)
         goto err;
     return crlstatus;
 
- err:
+err:
     OSSL_CMP_CRLSTATUS_free(crlstatus);
     return NULL;
 }
@@ -684,7 +680,7 @@ static int gennames_allowed(GENERAL_NAMES *names, int only_DN)
 }
 
 OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_create(const X509_CRL *crl,
-                                              const X509 *cert, int only_DN)
+    const X509 *cert, int only_DN)
 {
     STACK_OF(DIST_POINT) *crldps = NULL;
     ISSUING_DIST_POINT *idp = NULL;
@@ -723,7 +719,7 @@ OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_create(const X509_CRL *crl,
             return NULL;
         }
         idp = X509_CRL_get_ext_d2i(crl,
-                                   NID_issuing_distribution_point, NULL, NULL);
+            NID_issuing_distribution_point, NULL, NULL);
         if (idp != NULL && idp->distpoint != NULL)
             dpn = idp->distpoint;
     }
@@ -748,7 +744,7 @@ OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_create(const X509_CRL *crl,
     }
 
     status = OSSL_CMP_CRLSTATUS_new1(dpn, CRLissuer, last);
- end:
+end:
     sk_DIST_POINT_pop_free(crldps, DIST_POINT_free);
     ISSUING_DIST_POINT_free(idp);
     AUTHORITY_KEYID_free(akid);
@@ -757,8 +753,8 @@ OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_create(const X509_CRL *crl,
 }
 
 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)
 {
     OSSL_CMP_CRLSOURCE *crlsource;
 
@@ -797,8 +793,8 @@ OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_crls(const X509_CRL *crl)
 
     if (crl != NULL) {
         if ((crls = sk_X509_CRL_new_reserve(NULL, 1)) == NULL
-                || (crl_copy = X509_CRL_dup(crl)) == NULL
-                || !sk_X509_CRL_push(crls, crl_copy))
+            || (crl_copy = X509_CRL_dup(crl)) == NULL
+            || !sk_X509_CRL_push(crls, crl_copy))
             goto err;
         crl_copy = NULL; /* ownership transferred to crls */
     }
@@ -807,7 +803,7 @@ OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_crls(const X509_CRL *crl)
     itav->infoValue.crls = crls;
     return itav;
 
- err:
+err:
     OPENSSL_free(crl_copy);
     sk_X509_CRL_free(crls);
     OSSL_CMP_ITAV_free(itav);
@@ -849,7 +845,7 @@ int ossl_cmp_asn1_get_int(const ASN1_INTEGER *a)
 }
 
 static int ossl_cmp_msg_cb(int operation, ASN1_VALUE **pval,
-                           ossl_unused const ASN1_ITEM *it, void *exarg)
+    ossl_unused const ASN1_ITEM *it, void *exarg)
 {
     OSSL_CMP_MSG *msg = (OSSL_CMP_MSG *)*pval;
 
@@ -858,28 +854,22 @@ static int ossl_cmp_msg_cb(int operation, ASN1_VALUE **pval,
         OPENSSL_free(msg->propq);
         break;
 
-    case ASN1_OP_DUP_POST:
-        {
-            OSSL_CMP_MSG *old = exarg;
+    case ASN1_OP_DUP_POST: {
+        OSSL_CMP_MSG *old = exarg;
 
-            if (!ossl_cmp_msg_set0_libctx(msg, old->libctx, old->propq))
-                return 0;
-        }
-        break;
-    case ASN1_OP_GET0_LIBCTX:
-        {
-            OSSL_LIB_CTX **libctx = exarg;
+        if (!ossl_cmp_msg_set0_libctx(msg, old->libctx, old->propq))
+            return 0;
+    } break;
+    case ASN1_OP_GET0_LIBCTX: {
+        OSSL_LIB_CTX **libctx = exarg;
 
-            *libctx = msg->libctx;
-        }
-        break;
-    case ASN1_OP_GET0_PROPQ:
-        {
-            const char **propq = exarg;
+        *libctx = msg->libctx;
+    } break;
+    case ASN1_OP_GET0_PROPQ: {
+        const char **propq = exarg;
 
-            *propq = msg->propq;
-        }
-        break;
+        *propq = msg->propq;
+    } break;
     default:
         break;
     }
@@ -891,17 +881,17 @@ ASN1_CHOICE(OSSL_CMP_CERTORENCCERT) = {
     /* OSSL_CMP_CMPCERTIFICATE is effectively X509 so it is used directly */
     ASN1_EXP(OSSL_CMP_CERTORENCCERT, value.certificate, X509, 0),
     ASN1_EXP(OSSL_CMP_CERTORENCCERT, value.encryptedCert,
-             OSSL_CRMF_ENCRYPTEDKEY, 1),
+        OSSL_CRMF_ENCRYPTEDKEY, 1),
 } ASN1_CHOICE_END(OSSL_CMP_CERTORENCCERT)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CERTORENCCERT)
 
 ASN1_SEQUENCE(OSSL_CMP_CERTIFIEDKEYPAIR) = {
     ASN1_SIMPLE(OSSL_CMP_CERTIFIEDKEYPAIR, certOrEncCert,
-                OSSL_CMP_CERTORENCCERT),
+        OSSL_CMP_CERTORENCCERT),
     ASN1_EXP_OPT(OSSL_CMP_CERTIFIEDKEYPAIR, privateKey,
-                 OSSL_CRMF_ENCRYPTEDKEY, 0),
+        OSSL_CRMF_ENCRYPTEDKEY, 0),
     ASN1_EXP_OPT(OSSL_CMP_CERTIFIEDKEYPAIR, publicationInfo,
-                 OSSL_CRMF_PKIPUBLICATIONINFO, 1)
+        OSSL_CRMF_PKIPUBLICATIONINFO, 1)
 } ASN1_SEQUENCE_END(OSSL_CMP_CERTIFIEDKEYPAIR)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CERTIFIEDKEYPAIR)
 
@@ -911,15 +901,14 @@ ASN1_SEQUENCE(OSSL_CMP_REVDETAILS) = {
 } ASN1_SEQUENCE_END(OSSL_CMP_REVDETAILS)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_REVDETAILS)
 
-ASN1_ITEM_TEMPLATE(OSSL_CMP_REVREQCONTENT) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_REVREQCONTENT,
-                          OSSL_CMP_REVDETAILS)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_REVREQCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_REVREQCONTENT,
+    OSSL_CMP_REVDETAILS)
 ASN1_ITEM_TEMPLATE_END(OSSL_CMP_REVREQCONTENT)
 
 ASN1_SEQUENCE(OSSL_CMP_REVREPCONTENT) = {
     ASN1_SEQUENCE_OF(OSSL_CMP_REVREPCONTENT, status, OSSL_CMP_PKISI),
     ASN1_EXP_SEQUENCE_OF_OPT(OSSL_CMP_REVREPCONTENT, revCerts, OSSL_CRMF_CERTID,
-                             0),
+        0),
     ASN1_EXP_SEQUENCE_OF_OPT(OSSL_CMP_REVREPCONTENT, crls, X509_CRL, 1)
 } ASN1_SEQUENCE_END(OSSL_CMP_REVREPCONTENT)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_REVREPCONTENT)
@@ -929,12 +918,11 @@ ASN1_SEQUENCE(OSSL_CMP_KEYRECREPCONTENT) = {
     ASN1_EXP_OPT(OSSL_CMP_KEYRECREPCONTENT, newSigCert, X509, 0),
     ASN1_EXP_SEQUENCE_OF_OPT(OSSL_CMP_KEYRECREPCONTENT, caCerts, X509, 1),
     ASN1_EXP_SEQUENCE_OF_OPT(OSSL_CMP_KEYRECREPCONTENT, keyPairHist,
-                             OSSL_CMP_CERTIFIEDKEYPAIR, 2)
+        OSSL_CMP_CERTIFIEDKEYPAIR, 2)
 } ASN1_SEQUENCE_END(OSSL_CMP_KEYRECREPCONTENT)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_KEYRECREPCONTENT)
 
-ASN1_ITEM_TEMPLATE(OSSL_CMP_PKISTATUS) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_UNIVERSAL, 0, status, ASN1_INTEGER)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_PKISTATUS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_UNIVERSAL, 0, status, ASN1_INTEGER)
 ASN1_ITEM_TEMPLATE_END(OSSL_CMP_PKISTATUS)
 
 ASN1_SEQUENCE(OSSL_CMP_PKISI) = {
@@ -955,16 +943,15 @@ ASN1_SEQUENCE(OSSL_CMP_CERTSTATUS) = {
 } ASN1_SEQUENCE_END(OSSL_CMP_CERTSTATUS)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CERTSTATUS)
 
-ASN1_ITEM_TEMPLATE(OSSL_CMP_CERTCONFIRMCONTENT) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_CERTCONFIRMCONTENT,
-                          OSSL_CMP_CERTSTATUS)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_CERTCONFIRMCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_CERTCONFIRMCONTENT,
+    OSSL_CMP_CERTSTATUS)
 ASN1_ITEM_TEMPLATE_END(OSSL_CMP_CERTCONFIRMCONTENT)
 
 ASN1_SEQUENCE(OSSL_CMP_CERTRESPONSE) = {
     ASN1_SIMPLE(OSSL_CMP_CERTRESPONSE, certReqId, ASN1_INTEGER),
     ASN1_SIMPLE(OSSL_CMP_CERTRESPONSE, status, OSSL_CMP_PKISI),
     ASN1_OPT(OSSL_CMP_CERTRESPONSE, certifiedKeyPair,
-             OSSL_CMP_CERTIFIEDKEYPAIR),
+        OSSL_CMP_CERTIFIEDKEYPAIR),
     ASN1_OPT(OSSL_CMP_CERTRESPONSE, rspInfo, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(OSSL_CMP_CERTRESPONSE)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CERTRESPONSE)
@@ -974,9 +961,8 @@ ASN1_SEQUENCE(OSSL_CMP_POLLREQ) = {
 } ASN1_SEQUENCE_END(OSSL_CMP_POLLREQ)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_POLLREQ)
 
-ASN1_ITEM_TEMPLATE(OSSL_CMP_POLLREQCONTENT) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_POLLREQCONTENT,
-                          OSSL_CMP_POLLREQ)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_POLLREQCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_POLLREQCONTENT,
+    OSSL_CMP_POLLREQ)
 ASN1_ITEM_TEMPLATE_END(OSSL_CMP_POLLREQCONTENT)
 
 ASN1_SEQUENCE(OSSL_CMP_POLLREP) = {
@@ -986,10 +972,9 @@ ASN1_SEQUENCE(OSSL_CMP_POLLREP) = {
 } ASN1_SEQUENCE_END(OSSL_CMP_POLLREP)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_POLLREP)
 
-ASN1_ITEM_TEMPLATE(OSSL_CMP_POLLREPCONTENT) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
-                          OSSL_CMP_POLLREPCONTENT,
-                          OSSL_CMP_POLLREP)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_POLLREPCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+    OSSL_CMP_POLLREPCONTENT,
+    OSSL_CMP_POLLREP)
 ASN1_ITEM_TEMPLATE_END(OSSL_CMP_POLLREPCONTENT)
 
 ASN1_SEQUENCE(OSSL_CMP_CERTREPMESSAGE) = {
@@ -999,19 +984,16 @@ ASN1_SEQUENCE(OSSL_CMP_CERTREPMESSAGE) = {
 } ASN1_SEQUENCE_END(OSSL_CMP_CERTREPMESSAGE)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_CERTREPMESSAGE)
 
-ASN1_ITEM_TEMPLATE(OSSL_CMP_GENMSGCONTENT) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_GENMSGCONTENT,
-                          OSSL_CMP_ITAV)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_GENMSGCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_GENMSGCONTENT,
+    OSSL_CMP_ITAV)
 ASN1_ITEM_TEMPLATE_END(OSSL_CMP_GENMSGCONTENT)
 
-ASN1_ITEM_TEMPLATE(OSSL_CMP_GENREPCONTENT) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_GENREPCONTENT,
-                          OSSL_CMP_ITAV)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_GENREPCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_GENREPCONTENT,
+    OSSL_CMP_ITAV)
 ASN1_ITEM_TEMPLATE_END(OSSL_CMP_GENREPCONTENT)
 
-ASN1_ITEM_TEMPLATE(OSSL_CMP_CRLANNCONTENT) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
-                          OSSL_CMP_CRLANNCONTENT, X509_CRL)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_CRLANNCONTENT) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+    OSSL_CMP_CRLANNCONTENT, X509_CRL)
 ASN1_ITEM_TEMPLATE_END(OSSL_CMP_CRLANNCONTENT)
 
 ASN1_CHOICE(OSSL_CMP_PKIBODY) = {
@@ -1021,9 +1003,9 @@ ASN1_CHOICE(OSSL_CMP_PKIBODY) = {
     ASN1_EXP(OSSL_CMP_PKIBODY, value.cp, OSSL_CMP_CERTREPMESSAGE, 3),
     ASN1_EXP(OSSL_CMP_PKIBODY, value.p10cr, X509_REQ, 4),
     ASN1_EXP(OSSL_CMP_PKIBODY, value.popdecc,
-             OSSL_CMP_POPODECKEYCHALLCONTENT, 5),
+        OSSL_CMP_POPODECKEYCHALLCONTENT, 5),
     ASN1_EXP(OSSL_CMP_PKIBODY, value.popdecr,
-             OSSL_CMP_POPODECKEYRESPCONTENT, 6),
+        OSSL_CMP_POPODECKEYRESPCONTENT, 6),
     ASN1_EXP(OSSL_CMP_PKIBODY, value.kur, OSSL_CRMF_MSGS, 7),
     ASN1_EXP(OSSL_CMP_PKIBODY, value.kup, OSSL_CMP_CERTREPMESSAGE, 8),
     ASN1_EXP(OSSL_CMP_PKIBODY, value.krr, OSSL_CRMF_MSGS, 9),
@@ -1061,7 +1043,7 @@ ASN1_SEQUENCE(OSSL_CMP_PKIHEADER) = {
     /* OSSL_CMP_PKIFREETEXT is a ASN1_UTF8STRING sequence, so used directly */
     ASN1_EXP_SEQUENCE_OF_OPT(OSSL_CMP_PKIHEADER, freeText, ASN1_UTF8STRING, 7),
     ASN1_EXP_SEQUENCE_OF_OPT(OSSL_CMP_PKIHEADER, generalInfo,
-                             OSSL_CMP_ITAV, 8)
+        OSSL_CMP_ITAV, 8)
 } ASN1_SEQUENCE_END(OSSL_CMP_PKIHEADER)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CMP_PKIHEADER)
 
@@ -1080,7 +1062,6 @@ ASN1_SEQUENCE_cb(OSSL_CMP_MSG, ossl_cmp_msg_cb) = {
 } ASN1_SEQUENCE_END_cb(OSSL_CMP_MSG, OSSL_CMP_MSG)
 IMPLEMENT_ASN1_DUP_FUNCTION(OSSL_CMP_MSG)
 
-ASN1_ITEM_TEMPLATE(OSSL_CMP_MSGS) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_MSGS,
-                          OSSL_CMP_MSG)
+ASN1_ITEM_TEMPLATE(OSSL_CMP_MSGS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_CMP_MSGS,
+    OSSL_CMP_MSG)
 ASN1_ITEM_TEMPLATE_END(OSSL_CMP_MSGS)
diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c
index e129705e0e638..ec865b2437894 100644
--- a/crypto/cmp/cmp_client.c
+++ b/crypto/cmp/cmp_client.c
@@ -21,7 +21,7 @@
 #include <openssl/cmp_util.h>
 
 #define IS_CREP(t) ((t) == OSSL_CMP_PKIBODY_IP || (t) == OSSL_CMP_PKIBODY_CP \
-                        || (t) == OSSL_CMP_PKIBODY_KUP)
+    || (t) == OSSL_CMP_PKIBODY_KUP)
 
 /*-
  * Evaluate whether there's an exception (violating the standard) configured for
@@ -29,9 +29,9 @@
  * Returns 1 on acceptance, 0 on rejection, or -1 on (internal) error.
  */
 static int unprotected_exception(const OSSL_CMP_CTX *ctx,
-                                 const OSSL_CMP_MSG *rep,
-                                 int invalid_protection,
-                                 ossl_unused int expected_type)
+    const OSSL_CMP_MSG *rep,
+    int invalid_protection,
+    ossl_unused int expected_type)
 {
     int rcvd_type = OSSL_CMP_MSG_get_bodytype(rep /* may be NULL */);
     const char *msg_type = NULL;
@@ -46,18 +46,16 @@ static int unprotected_exception(const OSSL_CMP_CTX *ctx,
     case OSSL_CMP_PKIBODY_ERROR:
         msg_type = "error response";
         break;
-    case OSSL_CMP_PKIBODY_RP:
-        {
-            OSSL_CMP_PKISI *si =
-                ossl_cmp_revrepcontent_get_pkisi(rep->body->value.rp,
-                                                 OSSL_CMP_REVREQSID);
-
-            if (si == NULL)
-                return -1;
-            if (ossl_cmp_pkisi_get_status(si) == OSSL_CMP_PKISTATUS_rejection)
-                msg_type = "revocation response message with rejection status";
-            break;
-        }
+    case OSSL_CMP_PKIBODY_RP: {
+        OSSL_CMP_PKISI *si = ossl_cmp_revrepcontent_get_pkisi(rep->body->value.rp,
+            OSSL_CMP_REVREQSID);
+
+        if (si == NULL)
+            return -1;
+        if (ossl_cmp_pkisi_get_status(si) == OSSL_CMP_PKISTATUS_rejection)
+            msg_type = "revocation response message with rejection status";
+        break;
+    }
     case OSSL_CMP_PKIBODY_PKICONF:
         msg_type = "PKI Confirmation message";
         break;
@@ -65,8 +63,7 @@ static int unprotected_exception(const OSSL_CMP_CTX *ctx,
         if (IS_CREP(rcvd_type)) {
             int any_rid = OSSL_CMP_CERTREQID_NONE;
             OSSL_CMP_CERTREPMESSAGE *crepmsg = rep->body->value.ip;
-            OSSL_CMP_CERTRESPONSE *crep =
-                ossl_cmp_certrepmessage_get0_certresponse(crepmsg, any_rid);
+            OSSL_CMP_CERTRESPONSE *crep = ossl_cmp_certrepmessage_get0_certresponse(crepmsg, any_rid);
 
             if (sk_OSSL_CMP_CERTRESPONSE_num(crepmsg->response) > 1)
                 return -1;
@@ -80,7 +77,7 @@ static int unprotected_exception(const OSSL_CMP_CTX *ctx,
     if (msg_type == NULL)
         return 0;
     ossl_cmp_log2(WARN, ctx, "ignoring %s protection of %s",
-                  invalid_protection ? "invalid" : "missing", msg_type);
+        invalid_protection ? "invalid" : "missing", msg_type);
     return 1;
 }
 
@@ -100,7 +97,7 @@ static int save_statusInfo(OSSL_CMP_CTX *ctx, OSSL_CMP_PKISI *si)
     ctx->failInfoCode = ossl_cmp_pkisi_get_pkifailureinfo(si);
 
     if (!ossl_cmp_ctx_set0_statusString(ctx, sk_ASN1_UTF8STRING_new_null())
-            || (ctx->statusString == NULL))
+        || (ctx->statusString == NULL))
         return 0;
 
     ss = si->statusString; /* may be NULL */
@@ -129,7 +126,7 @@ static int is_crep_with_waiting(const OSSL_CMP_MSG *resp, int rid)
     crep = ossl_cmp_certrepmessage_get0_certresponse(crepmsg, rid);
 
     return (crep != NULL
-            && ossl_cmp_pkisi_get_status(crep->status)
+        && ossl_cmp_pkisi_get_status(crep->status)
             == OSSL_CMP_PKISTATUS_waiting);
 }
 
@@ -140,13 +137,11 @@ static int is_crep_with_waiting(const OSSL_CMP_MSG *resp, int rid)
  * Regardless of success, caller is responsible for freeing *rep (unless NULL).
  */
 static int send_receive_check(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
-                              OSSL_CMP_MSG **rep, int expected_type)
+    OSSL_CMP_MSG **rep, int expected_type)
 {
-    int begin_transaction =
-        expected_type != OSSL_CMP_PKIBODY_POLLREP
+    int begin_transaction = expected_type != OSSL_CMP_PKIBODY_POLLREP
         && expected_type != OSSL_CMP_PKIBODY_PKICONF;
-    const char *req_type_str =
-        ossl_cmp_bodytype_to_string(OSSL_CMP_MSG_get_bodytype(req));
+    const char *req_type_str = ossl_cmp_bodytype_to_string(OSSL_CMP_MSG_get_bodytype(req));
     const char *expected_type_str = ossl_cmp_bodytype_to_string(expected_type);
     int bak_msg_timeout = ctx->msg_timeout;
     int bt;
@@ -188,10 +183,9 @@ static int send_receive_check(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
 
     if (*rep == NULL) {
         ERR_raise_data(ERR_LIB_CMP,
-                       ctx->total_timeout != 0 && time(NULL) >= ctx->end_time ?
-                       CMP_R_TOTAL_TIMEOUT : CMP_R_TRANSFER_ERROR,
-                       "request sent: %s, expected response: %s",
-                       req_type_str, expected_type_str);
+            ctx->total_timeout != 0 && time(NULL) >= ctx->end_time ? CMP_R_TOTAL_TIMEOUT : CMP_R_TRANSFER_ERROR,
+            "request sent: %s, expected response: %s",
+            req_type_str, expected_type_str);
         return 0;
     }
 
@@ -202,15 +196,15 @@ static int send_receive_check(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
      * the following msg verification may also produce log entries and may fail.
      */
     ossl_cmp_log2(INFO, ctx, "received %s%s", ossl_cmp_bodytype_to_string(bt),
-                  ossl_cmp_is_error_with_waiting(*rep) ? " (waiting)" : "");
+        ossl_cmp_is_error_with_waiting(*rep) ? " (waiting)" : "");
 
     /* copy received extraCerts to ctx->extraCertsIn so they can be retrieved */
     if (bt != OSSL_CMP_PKIBODY_POLLREP && bt != OSSL_CMP_PKIBODY_PKICONF
-            && !ossl_cmp_ctx_set1_extraCertsIn(ctx, (*rep)->extraCerts))
+        && !ossl_cmp_ctx_set1_extraCertsIn(ctx, (*rep)->extraCerts))
         return 0;
 
     if (!ossl_cmp_msg_check_update(ctx, *rep, unprotected_exception,
-                                   expected_type))
+            expected_type))
         return 0;
 
     /*
@@ -222,33 +216,34 @@ static int send_receive_check(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
      */
     if (bt == expected_type
         || (expected_type == OSSL_CMP_PKIBODY_POLLREP
-            ? bt != OSSL_CMP_PKIBODY_ERROR
-            : ossl_cmp_is_error_with_waiting(*rep)))
+                ? bt != OSSL_CMP_PKIBODY_ERROR
+                : ossl_cmp_is_error_with_waiting(*rep)))
         return 1;
 
     /* received message type is not one of the expected ones (e.g., error) */
-    ERR_raise(ERR_LIB_CMP, bt == OSSL_CMP_PKIBODY_ERROR ? CMP_R_RECEIVED_ERROR :
-              CMP_R_UNEXPECTED_PKIBODY); /* in next line for mkerr.pl */
+    ERR_raise(ERR_LIB_CMP, bt == OSSL_CMP_PKIBODY_ERROR ? CMP_R_RECEIVED_ERROR : CMP_R_UNEXPECTED_PKIBODY); /* in next line for mkerr.pl */
 
     if (bt != OSSL_CMP_PKIBODY_ERROR) {
         ERR_add_error_data(3, "message type is '",
-                           ossl_cmp_bodytype_to_string(bt), "'");
+            ossl_cmp_bodytype_to_string(bt), "'");
     } else {
         OSSL_CMP_ERRORMSGCONTENT *emc = (*rep)->body->value.error;
         OSSL_CMP_PKISI *si = emc->pKIStatusInfo;
         char buf[OSSL_CMP_PKISI_BUFLEN];
 
         if (save_statusInfo(ctx, si)
-                && OSSL_CMP_CTX_snprint_PKIStatus(ctx, buf,
-                                                  sizeof(buf)) != NULL)
+            && OSSL_CMP_CTX_snprint_PKIStatus(ctx, buf,
+                   sizeof(buf))
+                != NULL)
             ERR_add_error_data(1, buf);
         if (emc->errorCode != NULL
-                && BIO_snprintf(buf, sizeof(buf), "; errorCode: %08lX",
-                                ASN1_INTEGER_get(emc->errorCode)) > 0)
+            && BIO_snprintf(buf, sizeof(buf), "; errorCode: %08lX",
+                   ASN1_INTEGER_get(emc->errorCode))
+                > 0)
             ERR_add_error_data(1, buf);
         if (emc->errorDetails != NULL) {
             char *text = ossl_sk_ASN1_UTF8STRING2text(emc->errorDetails, ", ",
-                                                      OSSL_CMP_PKISI_BUFLEN - 1);
+                OSSL_CMP_PKISI_BUFLEN - 1);
 
             if (text != NULL && *text != '\0')
                 ERR_add_error_data(2, "; errorDetails: ", text);
@@ -280,13 +275,13 @@ static int send_receive_check(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
  *           or a response with 'waiting' status has been received).
  */
 static int poll_for_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
-                             OSSL_CMP_MSG **rep, int *checkAfter)
+    OSSL_CMP_MSG **rep, int *checkAfter)
 {
     OSSL_CMP_MSG *preq = NULL;
     OSSL_CMP_MSG *prep = NULL;
 
     ossl_cmp_info(ctx,
-                  "received 'waiting' PKIStatus, starting to poll for response");
+        "received 'waiting' PKIStatus, starting to poll for response");
     *rep = NULL;
     for (;;) {
         if ((preq = ossl_cmp_pollReq_new(ctx, rid)) == NULL)
@@ -315,32 +310,34 @@ static int poll_for_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
                 ERR_raise(ERR_LIB_CMP, CMP_R_BAD_CHECKAFTER_IN_POLLREP);
                 goto err;
             }
-            if (check_after < 0 || (uint64_t)check_after
-                > (sleep ? ULONG_MAX / 1000 : INT_MAX)) {
+            if (check_after < 0 || (uint64_t)check_after > (sleep ? ULONG_MAX / 1000 : INT_MAX)) {
                 ERR_raise(ERR_LIB_CMP, CMP_R_CHECKAFTER_OUT_OF_RANGE);
                 if (BIO_snprintf(str, OSSL_CMP_PKISI_BUFLEN, "value = %jd",
-                                 check_after) >= 0)
+                        check_after)
+                    >= 0)
                     ERR_add_error_data(1, str);
                 goto err;
             }
 
             if (pollRep->reason == NULL
-                    || (len = BIO_snprintf(str, OSSL_CMP_PKISI_BUFLEN,
-                                           " with reason = '")) < 0) {
+                || (len = BIO_snprintf(str, OSSL_CMP_PKISI_BUFLEN,
+                        " with reason = '"))
+                    < 0) {
                 *str = '\0';
             } else {
                 char *text = ossl_sk_ASN1_UTF8STRING2text(pollRep->reason, ", ",
-                                                          sizeof(str) - len - 2);
+                    sizeof(str) - len - 2);
 
                 if (text == NULL
-                        || BIO_snprintf(str + len, sizeof(str) - len,
-                                        "%s'", text) < 0)
+                    || BIO_snprintf(str + len, sizeof(str) - len,
+                           "%s'", text)
+                        < 0)
                     *str = '\0';
                 OPENSSL_free(text);
             }
             ossl_cmp_log2(INFO, ctx,
-                          "received polling response%s; checkAfter = %ld seconds",
-                          str, check_after);
+                "received polling response%s; checkAfter = %ld seconds",
+                str, check_after);
 
             if (ctx->total_timeout != 0) { /* timeout is not infinite */
                 const int exp = OSSL_CMP_EXPECTED_RESP_TIME;
@@ -367,18 +364,18 @@ static int poll_for_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
                 return -1; /* exits the loop */
             }
         } else if (is_crep_with_waiting(prep, rid)
-                   || ossl_cmp_is_error_with_waiting(prep)) {
+            || ossl_cmp_is_error_with_waiting(prep)) {
             /* received status must not be 'waiting' */
             (void)ossl_cmp_exchange_error(ctx, OSSL_CMP_PKISTATUS_rejection,
-                                          OSSL_CMP_CTX_FAILINFO_badRequest,
-                                          "polling already started",
-                                          0 /* errorCode */, NULL);
+                OSSL_CMP_CTX_FAILINFO_badRequest,
+                "polling already started",
+                0 /* errorCode */, NULL);
             ERR_raise(ERR_LIB_CMP, CMP_R_UNEXPECTED_PKISTATUS);
             goto err;
         } else {
             ossl_cmp_info(ctx, "received final response after polling");
             if (!ossl_cmp_ctx_set1_first_senderNonce(ctx, NULL))
-                return 0;
+                goto err;
             break;
         }
     }
@@ -389,7 +386,7 @@ static int poll_for_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
     *rep = prep;
 
     return 1;
- err:
+err:
     (void)ossl_cmp_ctx_set1_first_senderNonce(ctx, NULL);
     OSSL_CMP_MSG_free(preq);
     OSSL_CMP_MSG_free(prep);
@@ -397,7 +394,7 @@ static int poll_for_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
 }
 
 static int save_senderNonce_if_waiting(OSSL_CMP_CTX *ctx,
-                                       const OSSL_CMP_MSG *rep, int rid)
+    const OSSL_CMP_MSG *rep, int rid)
 {
     /*
      * Lightweight CMP Profile section 4.4 states: the senderNonce of the
@@ -405,7 +402,7 @@ static int save_senderNonce_if_waiting(OSSL_CMP_CTX *ctx,
      * the recipNonce of the final response to be received after polling.
      */
     if ((is_crep_with_waiting(rep, rid)
-         || ossl_cmp_is_error_with_waiting(rep))
+            || ossl_cmp_is_error_with_waiting(rep))
         && !ossl_cmp_ctx_set1_first_senderNonce(ctx, ctx->senderNonce))
         return 0;
 
@@ -417,7 +414,7 @@ static int save_senderNonce_if_waiting(OSSL_CMP_CTX *ctx,
  * Polling for ip/cp/kup/ with 'waiting' status is handled by cert_response().
  */
 static int send_receive_also_delayed(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
-                                     OSSL_CMP_MSG **rep, int expected_type)
+    OSSL_CMP_MSG **rep, int expected_type)
 {
 
     if (!send_receive_check(ctx, req, rep, expected_type))
@@ -435,7 +432,8 @@ static int send_receive_also_delayed(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
         *rep = NULL;
 
         if (poll_for_response(ctx, 1 /* can sleep */, OSSL_CMP_CERTREQID_NONE,
-                              rep, NULL /* checkAfter */) <= 0) {
+                rep, NULL /* checkAfter */)
+            <= 0) {
             ERR_raise(ERR_LIB_CMP, CMP_R_POLLING_FAILED);
             return 0;
         }
@@ -452,7 +450,7 @@ static int send_receive_also_delayed(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
  * not modifying ctx->status during the certConf exchange
  */
 int ossl_cmp_exchange_certConf(OSSL_CMP_CTX *ctx, int certReqId,
-                               int fail_info, const char *txt)
+    int fail_info, const char *txt)
 {
     OSSL_CMP_MSG *certConf;
     OSSL_CMP_MSG *PKIconf = NULL;
@@ -464,9 +462,9 @@ int ossl_cmp_exchange_certConf(OSSL_CMP_CTX *ctx, int certReqId,
         goto err;
 
     res = send_receive_also_delayed(ctx, certConf, &PKIconf,
-                                    OSSL_CMP_PKIBODY_PKICONF);
+        OSSL_CMP_PKIBODY_PKICONF);
 
- err:
+err:
     OSSL_CMP_MSG_free(certConf);
     OSSL_CMP_MSG_free(PKIconf);
     return res;
@@ -474,7 +472,7 @@ int ossl_cmp_exchange_certConf(OSSL_CMP_CTX *ctx, int certReqId,
 
 /* Send given error and check response */
 int ossl_cmp_exchange_error(OSSL_CMP_CTX *ctx, int status, int fail_info,
-                            const char *txt, int errorCode, const char *details)
+    const char *txt, int errorCode, const char *details)
 {
     OSSL_CMP_MSG *error = NULL;
     OSSL_CMP_PKISI *si = NULL;
@@ -489,9 +487,9 @@ int ossl_cmp_exchange_error(OSSL_CMP_CTX *ctx, int status, int fail_info,
         goto err;
 
     res = send_receive_also_delayed(ctx, error,
-                                    &PKIconf, OSSL_CMP_PKIBODY_PKICONF);
+        &PKIconf, OSSL_CMP_PKIBODY_PKICONF);
 
- err:
+err:
     OSSL_CMP_MSG_free(error);
     OSSL_CMP_PKISI_free(si);
     OSSL_CMP_MSG_free(PKIconf);
@@ -504,7 +502,7 @@ int ossl_cmp_exchange_error(OSSL_CMP_CTX *ctx, int status, int fail_info,
  * Returns NULL if not found or on error.
  */
 static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
-                              OSSL_CMP_CERTRESPONSE *crep)
+    OSSL_CMP_CERTRESPONSE *crep)
 {
     char buf[OSSL_CMP_PKISI_BUFLEN];
     X509 *crt = NULL;
@@ -515,7 +513,7 @@ static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
     switch (ossl_cmp_pkisi_get_status(crep->status)) {
     case OSSL_CMP_PKISTATUS_waiting:
         ossl_cmp_err(ctx,
-                     "received \"waiting\" status for cert when actually aiming to extract cert");
+            "received \"waiting\" status for cert when actually aiming to extract cert");
         ERR_raise(ERR_LIB_CMP, CMP_R_ENCOUNTERED_WAITING);
         goto err;
     case OSSL_CMP_PKISTATUS_grantedWithMods:
@@ -530,11 +528,11 @@ static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
         goto err;
     case OSSL_CMP_PKISTATUS_revocationWarning:
         ossl_cmp_warn(ctx,
-                      "received \"revocationWarning\" - a revocation of the cert is imminent");
+            "received \"revocationWarning\" - a revocation of the cert is imminent");
         break;
     case OSSL_CMP_PKISTATUS_revocationNotification:
         ossl_cmp_warn(ctx,
-                      "received \"revocationNotification\" - a revocation of the cert has occurred");
+            "received \"revocationNotification\" - a revocation of the cert has occurred");
         break;
     case OSSL_CMP_PKISTATUS_keyUpdateWarning:
         if (bodytype != OSSL_CMP_PKIBODY_KUR) {
@@ -544,8 +542,8 @@ static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
         break;
     default:
         ossl_cmp_log1(ERROR, ctx,
-                      "received unsupported PKIStatus %d for certificate",
-                      ctx->status);
+            "received unsupported PKIStatus %d for certificate",
+            ctx->status);
         ERR_raise(ERR_LIB_CMP, CMP_R_UNKNOWN_PKISTATUS);
         goto err;
     }
@@ -555,7 +553,7 @@ static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
 
     return crt;
 
- err:
+err:
     if (OSSL_CMP_CTX_snprint_PKIStatus(ctx, buf, sizeof(buf)) != NULL)
         ERR_add_error_data(1, buf);
     return NULL;
@@ -566,11 +564,11 @@ static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
  * ctx->certConf_cb_arg, which has been initialized using opt_out_trusted, and
  * ctx->untrusted, which at this point already contains msg->extraCerts.
  * Returns 0 on acceptance, else a bit field reflecting PKIFailureInfo.
- * Quoting from RFC 4210 section 5.1. Overall PKI Message:
+ * Quoting from RFC 9810 section 5.1. Overall PKI Message:
  *     The extraCerts field can contain certificates that may be useful to
  *     the recipient.  For example, this can be used by a CA or RA to
  *     present an end entity with certificates that it needs to verify its
- *     own new certificate (if, for example, the CA that issued the end
+ *     own new certificate (for example, if the CA that issued the end
  *     entity's certificate is not a root CA for the end entity).  Note that
  *     this field does not necessarily contain a certification path; the
  *     recipient may have to sort, select from, or otherwise process the
@@ -579,7 +577,7 @@ static X509 *get1_cert_status(OSSL_CMP_CTX *ctx, int bodytype,
  * an EE must be able to validate the certificates it gets enrolled.
  */
 int OSSL_CMP_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
-                         const char **text)
+    const char **text)
 {
     X509_STORE *out_trusted = OSSL_CMP_CTX_get_certConf_cb_arg(ctx);
     STACK_OF(X509) *chain = NULL;
@@ -592,7 +590,7 @@ int OSSL_CMP_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
     if (out_trusted == NULL) {
         ossl_cmp_debug(ctx, "trying to build chain for newly enrolled cert");
         chain = X509_build_chain(cert, ctx->untrusted, out_trusted,
-                                 0, ctx->libctx, ctx->propq);
+            0, ctx->libctx, ctx->propq);
     } else {
         X509_STORE_CTX *csc = X509_STORE_CTX_new_ex(ctx->libctx, ctx->propq);
 
@@ -603,16 +601,16 @@ int OSSL_CMP_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
             goto err;
         /* disable any cert status/revocation checking etc. */
         X509_VERIFY_PARAM_clear_flags(X509_STORE_CTX_get0_param(csc),
-                                      ~(X509_V_FLAG_USE_CHECK_TIME
-                                        | X509_V_FLAG_NO_CHECK_TIME
-                                        | X509_V_FLAG_PARTIAL_CHAIN
-                                        | X509_V_FLAG_POLICY_CHECK));
+            ~(X509_V_FLAG_USE_CHECK_TIME
+                | X509_V_FLAG_NO_CHECK_TIME
+                | X509_V_FLAG_PARTIAL_CHAIN
+                | X509_V_FLAG_POLICY_CHECK));
         if (X509_verify_cert(csc) <= 0)
             goto err;
 
         if (!ossl_x509_add_certs_new(&chain, X509_STORE_CTX_get0_chain(csc),
-                                     X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP
-                                     | X509_ADD_FLAG_NO_SS)) {
+                X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP
+                    | X509_ADD_FLAG_NO_SS)) {
             sk_X509_free(chain);
             chain = NULL;
         }
@@ -628,14 +626,14 @@ int OSSL_CMP_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
             fail_info = 1 << OSSL_CMP_PKIFAILUREINFO_incorrectData;
         } else {
             ossl_cmp_debug(ctx,
-                           "success validating newly enrolled cert");
+                "success validating newly enrolled cert");
         }
     } else if (chain == NULL) {
         ossl_cmp_warn(ctx, "could not build approximate chain for newly enrolled cert, resorting to received extraCerts");
         chain = OSSL_CMP_CTX_get1_extraCertsIn(ctx);
     } else {
         ossl_cmp_debug(ctx,
-                       "success building approximate chain for newly enrolled cert");
+            "success building approximate chain for newly enrolled cert");
     }
     (void)ossl_cmp_ctx_set1_newChain(ctx, chain);
     OSSL_STACK_OF_X509_free(chain);
@@ -652,9 +650,9 @@ int OSSL_CMP_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
  * Regardless of success, caller is responsible for freeing *resp (unless NULL).
  */
 static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
-                         OSSL_CMP_MSG **resp, int *checkAfter,
-                         ossl_unused int req_type,
-                         ossl_unused int expected_type)
+    OSSL_CMP_MSG **resp, int *checkAfter,
+    ossl_unused int req_type,
+    ossl_unused int expected_type)
 {
     EVP_PKEY *rkey = NULL;
     int fail_info = 0; /* no failure */
@@ -671,7 +669,7 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
     if (!ossl_assert(ctx != NULL))
         return 0;
 
- retry:
+retry:
     rcvd_type = OSSL_CMP_MSG_get_bodytype(*resp);
     if (IS_CREP(rcvd_type)) {
         crepmsg = (*resp)->body->value.ip; /* same for cp and kup */
@@ -746,14 +744,14 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
      * to the context so that they can be retrieved if necessary
      */
     if (crepmsg != NULL && crepmsg->caPubs != NULL
-            && !ossl_cmp_ctx_set1_caPubs(ctx, crepmsg->caPubs))
+        && !ossl_cmp_ctx_set1_caPubs(ctx, crepmsg->caPubs))
         return 0;
 
     subj = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0);
     rkey = ossl_cmp_ctx_get0_newPubkey(ctx);
     if (rkey != NULL
         /* X509_check_private_key() also works if rkey is just public key */
-            && !(X509_check_private_key(ctx->newCert, rkey))) {
+        && !(X509_check_private_key(ctx->newCert, rkey))) {
         fail_info = 1 << OSSL_CMP_PKIFAILUREINFO_incorrectData;
         txt = "public key in new certificate does not match our enrollment key";
         /*-
@@ -772,17 +770,17 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
      */
     cb = ctx->certConf_cb != NULL ? ctx->certConf_cb : OSSL_CMP_certConf_cb;
     if ((fail_info = cb(ctx, ctx->newCert, fail_info, &txt)) != 0
-            && txt == NULL)
+        && txt == NULL)
         txt = "CMP client did not accept it";
     if (fail_info != 0) /* immediately log error before any certConf exchange */
         ossl_cmp_log1(ERROR, ctx,
-                      "rejecting newly enrolled cert with subject: %s", subj);
+            "rejecting newly enrolled cert with subject: %s", subj);
     /*
      * certConf exchange should better be moved to do_certreq_seq() such that
      * also more low-level errors with CertReqMessages get reported to server
      */
     if (!ctx->disableConfirm
-            && !ossl_cmp_hdr_has_implicitConfirm((*resp)->header)) {
+        && !ossl_cmp_hdr_has_implicitConfirm((*resp)->header)) {
         if (!ossl_cmp_exchange_certConf(ctx, rid, fail_info, txt))
             ret = 0;
     }
@@ -790,8 +788,8 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
     /* not throwing failure earlier as transfer_cb may call ERR_clear_error() */
     if (fail_info != 0) {
         ERR_raise_data(ERR_LIB_CMP, CMP_R_CERTIFICATE_NOT_ACCEPTED,
-                       "rejecting newly enrolled cert with subject: %s; %s",
-                       subj, txt);
+            "rejecting newly enrolled cert with subject: %s; %s",
+            subj, txt);
         ctx->status = OSSL_CMP_PKISTATUS_rejection;
         ret = 0;
     }
@@ -800,8 +798,8 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
 }
 
 static int initial_certreq(OSSL_CMP_CTX *ctx,
-                           int req_type, const OSSL_CRMF_MSG *crm,
-                           OSSL_CMP_MSG **p_rep, int rep_type)
+    int req_type, const OSSL_CRMF_MSG *crm,
+    OSSL_CMP_MSG **p_rep, int rep_type)
 {
     OSSL_CMP_MSG *req;
     int res;
@@ -821,7 +819,7 @@ static int initial_certreq(OSSL_CMP_CTX *ctx,
 }
 
 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)
 {
     OSSL_CMP_MSG *rep = NULL;
     int is_p10 = req_type == OSSL_CMP_PKIBODY_P10CR;
@@ -839,20 +837,20 @@ int OSSL_CMP_try_certreq(OSSL_CMP_CTX *ctx, int req_type,
             goto err;
 
         if (!save_senderNonce_if_waiting(ctx, rep, rid))
-            return 0;
+            goto err;
     } else {
         if (req_type < 0)
             return ossl_cmp_exchange_error(ctx, OSSL_CMP_PKISTATUS_rejection,
-                                           0, "polling aborted",
-                                           0 /* errorCode */, "by application");
+                0, "polling aborted",
+                0 /* errorCode */, "by application");
         res = poll_for_response(ctx, 0 /* no sleep */, rid, &rep, checkAfter);
         if (res <= 0) /* waiting or error */
             return res;
     }
     res = cert_response(ctx, 0 /* no sleep */, rid, &rep, checkAfter,
-                        req_type, rep_type);
+        req_type, rep_type);
 
- err:
+err:
     OSSL_CMP_MSG_free(rep);
     return res;
 }
@@ -865,7 +863,7 @@ int OSSL_CMP_try_certreq(OSSL_CMP_CTX *ctx, int req_type,
  * Returns pointer to received certificate, or NULL if none was received.
  */
 X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
-                            const OSSL_CRMF_MSG *crm)
+    const OSSL_CRMF_MSG *crm)
 {
     OSSL_CMP_MSG *rep = NULL;
     int is_p10 = req_type == OSSL_CMP_PKIBODY_P10CR;
@@ -882,14 +880,14 @@ X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
         goto err;
 
     if (!save_senderNonce_if_waiting(ctx, rep, rid))
-        return 0;
+        goto err;
 
     if (cert_response(ctx, 1 /* sleep */, rid, &rep, NULL, req_type, rep_type)
         <= 0)
         goto err;
 
     result = ctx->newCert;
- err:
+err:
     OSSL_CMP_MSG_free(rep);
     return result;
 }
@@ -960,7 +958,7 @@ int OSSL_CMP_exec_RR_ses(OSSL_CMP_CTX *ctx)
     case OSSL_CMP_PKISTATUS_revocationNotification:
         /* interpretation as warning or error depends on CA */
         ossl_cmp_warn(ctx,
-                      "revocation accepted (PKIStatus=revocationNotification)");
+            "revocation accepted (PKIStatus=revocationNotification)");
         ret = 1;
         break;
     case OSSL_CMP_PKISTATUS_waiting:
@@ -975,11 +973,9 @@ int OSSL_CMP_exec_RR_ses(OSSL_CMP_CTX *ctx)
     /* check any present CertId in optional revCerts field */
     if (sk_OSSL_CRMF_CERTID_num(rrep->revCerts) >= 1) {
         OSSL_CRMF_CERTID *cid;
-        OSSL_CRMF_CERTTEMPLATE *tmpl =
-            sk_OSSL_CMP_REVDETAILS_value(rr->body->value.rr, rsid)->certDetails;
+        OSSL_CRMF_CERTTEMPLATE *tmpl = sk_OSSL_CMP_REVDETAILS_value(rr->body->value.rr, rsid)->certDetails;
         const X509_NAME *issuer = OSSL_CRMF_CERTTEMPLATE_get0_issuer(tmpl);
-        const ASN1_INTEGER *serial =
-            OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(tmpl);
+        const ASN1_INTEGER *serial = OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(tmpl);
 
         if (sk_OSSL_CRMF_CERTID_num(rrep->revCerts) != num_RevDetails) {
             ERR_raise(ERR_LIB_CMP, CMP_R_WRONG_RP_COMPONENT_COUNT);
@@ -999,7 +995,8 @@ int OSSL_CMP_exec_RR_ses(OSSL_CMP_CTX *ctx)
 #endif
         }
         if (ASN1_INTEGER_cmp(serial,
-                             OSSL_CRMF_CERTID_get0_serialNumber(cid)) != 0) {
+                OSSL_CRMF_CERTID_get0_serialNumber(cid))
+            != 0) {
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
             ERR_raise(ERR_LIB_CMP, CMP_R_WRONG_SERIAL_IN_RP);
             ret = 0;
@@ -1015,12 +1012,12 @@ int OSSL_CMP_exec_RR_ses(OSSL_CMP_CTX *ctx)
         goto err;
     }
 
- err:
+err:
     if (ret == 0
-            && OSSL_CMP_CTX_snprint_PKIStatus(ctx, buf, sizeof(buf)) != NULL)
+        && OSSL_CMP_CTX_snprint_PKIStatus(ctx, buf, sizeof(buf)) != NULL)
         ERR_add_error_data(1, buf);
 
- end:
+end:
     OSSL_CMP_MSG_free(rr);
     OSSL_CMP_MSG_free(rp);
     return ret;
@@ -1052,7 +1049,7 @@ STACK_OF(OSSL_CMP_ITAV) *OSSL_CMP_exec_GENM_ses(OSSL_CMP_CTX *ctx)
     /* received stack of itavs not to be freed with the genp */
     genp->body->value.genp = NULL;
 
- err:
+err:
     OSSL_CMP_MSG_free(genm);
     OSSL_CMP_MSG_free(genp);
 
diff --git a/crypto/cmp/cmp_ctx.c b/crypto/cmp/cmp_ctx.c
index 7b78ab16036bc..947374d4ec2e7 100644
--- a/crypto/cmp/cmp_ctx.c
+++ b/crypto/cmp/cmp_ctx.c
@@ -22,15 +22,15 @@
 
 #define DEFINE_OSSL_CMP_CTX_get0(FIELD, TYPE) \
     DEFINE_OSSL_CMP_CTX_get0_NAME(FIELD, FIELD, TYPE)
-#define DEFINE_OSSL_CMP_CTX_get0_NAME(NAME, FIELD, TYPE) \
-TYPE *OSSL_CMP_CTX_get0_##NAME(const OSSL_CMP_CTX *ctx) \
-{ \
-    if (ctx == NULL) { \
-        ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
-        return NULL; \
-    } \
-    return ctx->FIELD; \
-}
+#define DEFINE_OSSL_CMP_CTX_get0_NAME(NAME, FIELD, TYPE)    \
+    TYPE *OSSL_CMP_CTX_get0_##NAME(const OSSL_CMP_CTX *ctx) \
+    {                                                       \
+        if (ctx == NULL) {                                  \
+            ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);    \
+            return NULL;                                    \
+        }                                                   \
+        return ctx->FIELD;                                  \
+    }
 
 /*
  * Get current certificate store containing trusted root CA certs
@@ -39,36 +39,36 @@ DEFINE_OSSL_CMP_CTX_get0_NAME(trusted, trusted, X509_STORE)
 
 #define DEFINE_OSSL_set0(PREFIX, FIELD, TYPE) \
     DEFINE_OSSL_set0_NAME(PREFIX, FIELD, FIELD, TYPE)
-#define DEFINE_OSSL_set0_NAME(PREFIX, NAME, FIELD, TYPE) \
-int PREFIX##_set0##_##NAME(OSSL_CMP_CTX *ctx, TYPE *val) \
-{ \
-    if (ctx == NULL) { \
-        ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
-        return 0; \
-    } \
-    TYPE##_free(ctx->FIELD); \
-    ctx->FIELD = val; \
-    return 1; \
-}
+#define DEFINE_OSSL_set0_NAME(PREFIX, NAME, FIELD, TYPE)     \
+    int PREFIX##_set0##_##NAME(OSSL_CMP_CTX *ctx, TYPE *val) \
+    {                                                        \
+        if (ctx == NULL) {                                   \
+            ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);     \
+            return 0;                                        \
+        }                                                    \
+        TYPE##_free(ctx->FIELD);                             \
+        ctx->FIELD = val;                                    \
+        return 1;                                            \
+    }
 
-/*
- * Set certificate store containing trusted (root) CA certs and possibly CRLs
- * and a cert verification callback function used for CMP server authentication.
- * Any already existing store entry is freed. Given NULL, the entry is reset.
- */
-DEFINE_OSSL_set0_NAME(OSSL_CMP_CTX, trusted, trusted, X509_STORE)
+    /*
+     * Set certificate store containing trusted (root) CA certs and possibly CRLs
+     * and a cert verification callback function used for CMP server authentication.
+     * Any already existing store entry is freed. Given NULL, the entry is reset.
+     */
+    DEFINE_OSSL_set0_NAME(OSSL_CMP_CTX, trusted, trusted, X509_STORE)
 
-DEFINE_OSSL_CMP_CTX_get0(libctx, OSSL_LIB_CTX)
-DEFINE_OSSL_CMP_CTX_get0(propq, const char)
+        DEFINE_OSSL_CMP_CTX_get0(libctx, OSSL_LIB_CTX)
+            DEFINE_OSSL_CMP_CTX_get0(propq, const char)
 
-/* Get current list of non-trusted intermediate certs */
-DEFINE_OSSL_CMP_CTX_get0(untrusted, STACK_OF(X509))
+    /* Get current list of non-trusted intermediate certs */
+    DEFINE_OSSL_CMP_CTX_get0(untrusted, STACK_OF(X509))
 
-/*
- * Set untrusted certificates for path construction in authentication of
- * the CMP server and potentially others (TLS server, newly enrolled cert).
- */
-int OSSL_CMP_CTX_set1_untrusted(OSSL_CMP_CTX *ctx, STACK_OF(X509) *certs)
+    /*
+     * Set untrusted certificates for path construction in authentication of
+     * the CMP server and potentially others (TLS server, newly enrolled cert).
+     */
+    int OSSL_CMP_CTX_set1_untrusted(OSSL_CMP_CTX *ctx, STACK_OF(X509) *certs)
 {
     STACK_OF(X509) *untrusted = NULL;
 
@@ -77,12 +77,12 @@ int OSSL_CMP_CTX_set1_untrusted(OSSL_CMP_CTX *ctx, STACK_OF(X509) *certs)
         return 0;
     }
     if (!ossl_x509_add_certs_new(&untrusted, certs,
-                                 X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
+            X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
         goto err;
     OSSL_STACK_OF_X509_free(ctx->untrusted);
     ctx->untrusted = untrusted;
     return 1;
- err:
+err:
     OSSL_STACK_OF_X509_free(untrusted);
     return 0;
 }
@@ -144,7 +144,7 @@ OSSL_CMP_CTX *OSSL_CMP_CTX_new(OSSL_LIB_CTX *libctx, const char *propq)
     /* all other elements are initialized to 0 or NULL, respectively */
     return ctx;
 
- err:
+err:
     OSSL_CMP_CTX_free(ctx);
     return NULL;
 }
@@ -252,62 +252,62 @@ void OSSL_CMP_CTX_free(OSSL_CMP_CTX *ctx)
     OPENSSL_free(ctx);
 }
 
-#define DEFINE_OSSL_set(PREFIX, FIELD, TYPE) \
-int PREFIX##_set_##FIELD(OSSL_CMP_CTX *ctx, TYPE val) \
-{ \
-    if (ctx == NULL) { \
-        ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
-        return 0; \
-    } \
-    ctx->FIELD = val; \
-    return 1; \
-}
+#define DEFINE_OSSL_set(PREFIX, FIELD, TYPE)              \
+    int PREFIX##_set_##FIELD(OSSL_CMP_CTX *ctx, TYPE val) \
+    {                                                     \
+        if (ctx == NULL) {                                \
+            ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);  \
+            return 0;                                     \
+        }                                                 \
+        ctx->FIELD = val;                                 \
+        return 1;                                         \
+    }
 
 DEFINE_OSSL_set(ossl_cmp_ctx, status, int)
 
-#define DEFINE_OSSL_get(PREFIX, FIELD, TYPE, ERR_RET) \
-TYPE PREFIX##_get_##FIELD(const OSSL_CMP_CTX *ctx) \
-{ \
-    if (ctx == NULL) { \
-        ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
-        return ERR_RET; \
-    } \
-    return ctx->FIELD; \
-}
+#define DEFINE_OSSL_get(PREFIX, FIELD, TYPE, ERR_RET)    \
+    TYPE PREFIX##_get_##FIELD(const OSSL_CMP_CTX *ctx)   \
+    {                                                    \
+        if (ctx == NULL) {                               \
+            ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
+            return ERR_RET;                              \
+        }                                                \
+        return ctx->FIELD;                               \
+    }
 
-/*
- * Returns the PKIStatus from the last CertRepMessage
- * or Revocation Response or error message, -1 on error
- */
-DEFINE_OSSL_get(OSSL_CMP_CTX, status, int, -1)
+    /*
+     * Returns the PKIStatus from the last CertRepMessage
+     * or Revocation Response or error message, -1 on error
+     */
+    DEFINE_OSSL_get(OSSL_CMP_CTX, status, int, -1)
 
-/*
- * Returns the statusString from the last CertRepMessage
- * or Revocation Response or error message, NULL on error
- */
-DEFINE_OSSL_CMP_CTX_get0(statusString, OSSL_CMP_PKIFREETEXT)
+    /*
+     * Returns the statusString from the last CertRepMessage
+     * or Revocation Response or error message, NULL on error
+     */
+    DEFINE_OSSL_CMP_CTX_get0(statusString, OSSL_CMP_PKIFREETEXT)
 
-DEFINE_OSSL_set0(ossl_cmp_ctx, statusString, OSSL_CMP_PKIFREETEXT)
+        DEFINE_OSSL_set0(ossl_cmp_ctx, statusString, OSSL_CMP_PKIFREETEXT)
 
-/* Set callback function for checking if the cert is ok or should be rejected */
-DEFINE_OSSL_set(OSSL_CMP_CTX, certConf_cb, OSSL_CMP_certConf_cb_t)
+    /* Set callback function for checking if the cert is ok or should be rejected */
+    DEFINE_OSSL_set(OSSL_CMP_CTX, certConf_cb, OSSL_CMP_certConf_cb_t)
 
-/*
- * Set argument, respectively a pointer to a structure containing arguments,
- * optionally to be used by the certConf callback.
- */
-DEFINE_OSSL_set(OSSL_CMP_CTX, certConf_cb_arg, void *)
+    /*
+     * Set argument, respectively a pointer to a structure containing arguments,
+     * optionally to be used by the certConf callback.
+     */
+    DEFINE_OSSL_set(OSSL_CMP_CTX, certConf_cb_arg, void *)
 
-/*
- * Get argument, respectively the pointer to a structure containing arguments,
- * optionally to be used by certConf callback.
- * Returns callback argument set previously (NULL if not set or on error)
- */
-DEFINE_OSSL_get(OSSL_CMP_CTX, certConf_cb_arg, void *, NULL)
+    /*
+     * Get argument, respectively the pointer to a structure containing arguments,
+     * optionally to be used by certConf callback.
+     * Returns callback argument set previously (NULL if not set or on error)
+     */
+    DEFINE_OSSL_get(OSSL_CMP_CTX, certConf_cb_arg, void *, NULL)
 
 #ifndef OPENSSL_NO_TRACE
-static size_t ossl_cmp_log_trace_cb(const char *buf, size_t cnt,
-                                    int category, int cmd, void *vdata)
+        static size_t ossl_cmp_log_trace_cb(const char *buf, size_t cnt,
+            int category, int cmd, void *vdata)
 {
     OSSL_CMP_CTX *ctx = vdata;
     const char *msg;
@@ -327,11 +327,11 @@ static size_t ossl_cmp_log_trace_cb(const char *buf, size_t cnt,
         goto end; /* suppress output since severity is not sufficient */
 
     if (!ctx->log_cb(func != NULL ? func : "(no func)",
-                     file != NULL ? file : "(no file)",
-                     line, level, msg))
+            file != NULL ? file : "(no file)",
+            line, level, msg))
         cnt = 0;
 
- end:
+end:
     OPENSSL_free(func);
     OPENSSL_free(file);
     return cnt;
@@ -340,8 +340,8 @@ static size_t ossl_cmp_log_trace_cb(const char *buf, size_t cnt,
 
 /* Print CMP log messages (i.e., diagnostic info) via the log cb of the ctx */
 int ossl_cmp_print_log(OSSL_CMP_severity level, const OSSL_CMP_CTX *ctx,
-                       const char *func, const char *file, int line,
-                       const char *level_str, const char *format, ...)
+    const char *func, const char *file, int line,
+    const char *level_str, const char *format, ...)
 {
     va_list args;
     char hugebuf[1024 * 2];
@@ -367,17 +367,19 @@ int ossl_cmp_print_log(OSSL_CMP_severity level, const OSSL_CMP_CTX *ctx,
 
 #ifndef OPENSSL_NO_TRACE
     if (OSSL_TRACE_ENABLED(CMP)) {
-        OSSL_TRACE_BEGIN(CMP) {
-            int printed =
-                BIO_snprintf(hugebuf, sizeof(hugebuf),
-                             "%s:%s:%d:" OSSL_CMP_LOG_PREFIX "%s: ",
-                             func, file, line, level_str);
+        OSSL_TRACE_BEGIN(CMP)
+        {
+            int printed = BIO_snprintf(hugebuf, sizeof(hugebuf),
+                "%s:%s:%d:" OSSL_CMP_LOG_PREFIX "%s: ",
+                func, file, line, level_str);
             if (printed > 0 && (size_t)printed < sizeof(hugebuf)) {
                 if (BIO_vsnprintf(hugebuf + printed,
-                                  sizeof(hugebuf) - printed, format, args) > 0)
+                        sizeof(hugebuf) - printed, format, args)
+                    > 0)
                     res = BIO_puts(trc_out, hugebuf) > 0;
             }
-        } OSSL_TRACE_END(CMP);
+        }
+        OSSL_TRACE_END(CMP);
     }
 #else /* compensate for disabled trace API */
     {
@@ -401,7 +403,7 @@ int OSSL_CMP_CTX_set_log_cb(OSSL_CMP_CTX *ctx, OSSL_CMP_log_cb_t cb)
 #ifndef OPENSSL_NO_TRACE
     /* do also in case cb == NULL, to switch off logging output: */
     if (!OSSL_trace_set_callback(OSSL_TRACE_CATEGORY_CMP,
-                                 ossl_cmp_log_trace_cb, ctx))
+            ossl_cmp_log_trace_cb, ctx))
         return 0;
 #endif
 
@@ -421,19 +423,18 @@ void OSSL_CMP_CTX_print_errors(const OSSL_CMP_CTX *ctx)
  * (i.e., the user name) when using PBMAC.
  */
 int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx,
-                                     const unsigned char *ref, int len)
+    const unsigned char *ref, int len)
 {
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
         return 0;
     }
-    return
-        ossl_cmp_asn1_octet_string_set1_bytes(&ctx->referenceValue, ref, len);
+    return ossl_cmp_asn1_octet_string_set1_bytes(&ctx->referenceValue, ref, len);
 }
 
 /* Set or clear the password to be used for protecting messages with PBMAC */
 int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
-                                  const unsigned char *sec, int len)
+    const unsigned char *sec, int len)
 {
     ASN1_OCTET_STRING *secretValue = NULL;
 
@@ -451,57 +452,57 @@ int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
     return 1;
 }
 
-#define DEFINE_OSSL_CMP_CTX_get1_certs(FIELD) \
-STACK_OF(X509) *OSSL_CMP_CTX_get1_##FIELD(const OSSL_CMP_CTX *ctx) \
-{ \
-    if (ctx == NULL) { \
-        ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
-        return NULL; \
-    } \
-    return X509_chain_up_ref(ctx->FIELD); \
-}
+#define DEFINE_OSSL_CMP_CTX_get1_certs(FIELD)                          \
+    STACK_OF(X509) *OSSL_CMP_CTX_get1_##FIELD(const OSSL_CMP_CTX *ctx) \
+    {                                                                  \
+        if (ctx == NULL) {                                             \
+            ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);               \
+            return NULL;                                               \
+        }                                                              \
+        return X509_chain_up_ref(ctx->FIELD);                          \
+    }
 
 /* Returns the cert chain computed by OSSL_CMP_certConf_cb(), NULL on error */
 DEFINE_OSSL_CMP_CTX_get1_certs(newChain)
 
-#define DEFINE_OSSL_set1_certs(PREFIX, FIELD) \
-int PREFIX##_set1_##FIELD(OSSL_CMP_CTX *ctx, STACK_OF(X509) *certs) \
-{ \
-    if (ctx == NULL) { \
-        ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
-        return 0; \
-    } \
-    OSSL_STACK_OF_X509_free(ctx->FIELD); \
-    ctx->FIELD = NULL; \
-    return certs == NULL || (ctx->FIELD = X509_chain_up_ref(certs)) != NULL; \
-}
-
-/*
- * Copies any given stack of inbound X509 certificates to newChain
- * of the OSSL_CMP_CTX structure so that they may be retrieved later.
- */
-DEFINE_OSSL_set1_certs(ossl_cmp_ctx, newChain)
-
-/* Returns the stack of extraCerts received in CertRepMessage, NULL on error */
-DEFINE_OSSL_CMP_CTX_get1_certs(extraCertsIn)
-
-/*
- * Copies any given stack of inbound X509 certificates to extraCertsIn
- * of the OSSL_CMP_CTX structure so that they may be retrieved later.
- */
-DEFINE_OSSL_set1_certs(ossl_cmp_ctx, extraCertsIn)
-
-/*
- * Copies any given stack as the new stack of X509
- * certificates to send out in the extraCerts field.
- */
-DEFINE_OSSL_set1_certs(OSSL_CMP_CTX, extraCertsOut)
+#define DEFINE_OSSL_set1_certs(PREFIX, FIELD)                                    \
+    int PREFIX##_set1_##FIELD(OSSL_CMP_CTX *ctx, STACK_OF(X509) *certs)          \
+    {                                                                            \
+        if (ctx == NULL) {                                                       \
+            ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);                         \
+            return 0;                                                            \
+        }                                                                        \
+        OSSL_STACK_OF_X509_free(ctx->FIELD);                                     \
+        ctx->FIELD = NULL;                                                       \
+        return certs == NULL || (ctx->FIELD = X509_chain_up_ref(certs)) != NULL; \
+    }
 
-/*
- * Add the given policy info object
- * to the X509_EXTENSIONS of the requested certificate template.
- */
-int OSSL_CMP_CTX_push0_policy(OSSL_CMP_CTX *ctx, POLICYINFO *pinfo)
+    /*
+     * Copies any given stack of inbound X509 certificates to newChain
+     * of the OSSL_CMP_CTX structure so that they may be retrieved later.
+     */
+    DEFINE_OSSL_set1_certs(ossl_cmp_ctx, newChain)
+
+    /* Returns the stack of extraCerts received in CertRepMessage, NULL on error */
+    DEFINE_OSSL_CMP_CTX_get1_certs(extraCertsIn)
+
+    /*
+     * Copies any given stack of inbound X509 certificates to extraCertsIn
+     * of the OSSL_CMP_CTX structure so that they may be retrieved later.
+     */
+    DEFINE_OSSL_set1_certs(ossl_cmp_ctx, extraCertsIn)
+
+    /*
+     * Copies any given stack as the new stack of X509
+     * certificates to send out in the extraCerts field.
+     */
+    DEFINE_OSSL_set1_certs(OSSL_CMP_CTX, extraCertsOut)
+
+    /*
+     * Add the given policy info object
+     * to the X509_EXTENSIONS of the requested certificate template.
+     */
+    int OSSL_CMP_CTX_push0_policy(OSSL_CMP_CTX *ctx, POLICYINFO *pinfo)
 {
     if (ctx == NULL || pinfo == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -509,7 +510,7 @@ int OSSL_CMP_CTX_push0_policy(OSSL_CMP_CTX *ctx, POLICYINFO *pinfo)
     }
 
     if (ctx->policies == NULL
-            && (ctx->policies = CERTIFICATEPOLICIES_new()) == NULL)
+        && (ctx->policies = CERTIFICATEPOLICIES_new()) == NULL)
         return 0;
 
     return sk_POLICYINFO_push(ctx->policies, pinfo);
@@ -538,8 +539,8 @@ int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx)
 
 DEFINE_OSSL_CMP_CTX_get0(geninfo_ITAVs, STACK_OF(OSSL_CMP_ITAV))
 
-/* Add an itav for the body of outgoing general messages */
-int OSSL_CMP_CTX_push0_genm_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav)
+    /* Add an itav for the body of outgoing general messages */
+    int OSSL_CMP_CTX_push0_genm_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav)
 {
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -555,82 +556,82 @@ int OSSL_CMP_CTX_push0_genm_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav)
  */
 DEFINE_OSSL_CMP_CTX_get1_certs(caPubs)
 
-/*
- * Copies any given stack of certificates to the given
- * OSSL_CMP_CTX structure so that they may be retrieved later.
- */
-DEFINE_OSSL_set1_certs(ossl_cmp_ctx, caPubs)
+    /*
+     * Copies any given stack of certificates to the given
+     * OSSL_CMP_CTX structure so that they may be retrieved later.
+     */
+    DEFINE_OSSL_set1_certs(ossl_cmp_ctx, caPubs)
 
 #define char_dup OPENSSL_strdup
 #define char_free OPENSSL_free
-#define DEFINE_OSSL_CMP_CTX_set1(FIELD, TYPE) /* this uses _dup */ \
-int OSSL_CMP_CTX_set1_##FIELD(OSSL_CMP_CTX *ctx, const TYPE *val) \
-{ \
-    TYPE *val_dup = NULL; \
-    \
-    if (ctx == NULL) { \
-        ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
-        return 0; \
-    } \
-    \
-    if (val != NULL && (val_dup = TYPE##_dup(val)) == NULL) \
-        return 0; \
-    TYPE##_free(ctx->FIELD); \
-    ctx->FIELD = val_dup; \
-    return 1; \
-}
+#define DEFINE_OSSL_CMP_CTX_set1(FIELD, TYPE) /* this uses _dup */    \
+    int OSSL_CMP_CTX_set1_##FIELD(OSSL_CMP_CTX *ctx, const TYPE *val) \
+    {                                                                 \
+        TYPE *val_dup = NULL;                                         \
+                                                                      \
+        if (ctx == NULL) {                                            \
+            ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);              \
+            return 0;                                                 \
+        }                                                             \
+                                                                      \
+        if (val != NULL && (val_dup = TYPE##_dup(val)) == NULL)       \
+            return 0;                                                 \
+        TYPE##_free(ctx->FIELD);                                      \
+        ctx->FIELD = val_dup;                                         \
+        return 1;                                                     \
+    }
 
 #define X509_invalid(cert) (!ossl_x509v3_cache_extensions(cert))
 #define EVP_PKEY_invalid(key) 0
 
-#define DEFINE_OSSL_set1_up_ref(PREFIX, FIELD, TYPE) \
-int PREFIX##_set1_##FIELD(OSSL_CMP_CTX *ctx, TYPE *val) \
-{ \
-    if (ctx == NULL) { \
-        ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
-        return 0; \
-    } \
-    \
-    /* prevent misleading error later on malformed cert or provider issue */ \
-    if (val != NULL && TYPE##_invalid(val)) { \
-        ERR_raise(ERR_LIB_CMP, CMP_R_POTENTIALLY_INVALID_CERTIFICATE); \
-        return 0; \
-    } \
-    if (val != NULL && !TYPE##_up_ref(val)) \
-        return 0; \
-    TYPE##_free(ctx->FIELD); \
-    ctx->FIELD = val; \
-    return 1; \
-}
+#define DEFINE_OSSL_set1_up_ref(PREFIX, FIELD, TYPE)                             \
+    int PREFIX##_set1_##FIELD(OSSL_CMP_CTX *ctx, TYPE *val)                      \
+    {                                                                            \
+        if (ctx == NULL) {                                                       \
+            ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);                         \
+            return 0;                                                            \
+        }                                                                        \
+                                                                                 \
+        /* prevent misleading error later on malformed cert or provider issue */ \
+        if (val != NULL && TYPE##_invalid(val)) {                                \
+            ERR_raise(ERR_LIB_CMP, CMP_R_POTENTIALLY_INVALID_CERTIFICATE);       \
+            return 0;                                                            \
+        }                                                                        \
+        if (val != NULL && !TYPE##_up_ref(val))                                  \
+            return 0;                                                            \
+        TYPE##_free(ctx->FIELD);                                                 \
+        ctx->FIELD = val;                                                        \
+        return 1;                                                                \
+    }
 
-DEFINE_OSSL_set1_up_ref(ossl_cmp_ctx, validatedSrvCert, X509)
+        DEFINE_OSSL_set1_up_ref(ossl_cmp_ctx, validatedSrvCert, X509)
 
-/*
- * Pins the server certificate to be directly trusted (even if it is expired)
- * for verifying response messages.
- * Cert pointer is not consumed. It may be NULL to clear the entry.
- */
-DEFINE_OSSL_set1_up_ref(OSSL_CMP_CTX, srvCert, X509)
+    /*
+     * Pins the server certificate to be directly trusted (even if it is expired)
+     * for verifying response messages.
+     * Cert pointer is not consumed. It may be NULL to clear the entry.
+     */
+    DEFINE_OSSL_set1_up_ref(OSSL_CMP_CTX, srvCert, X509)
 
-/* Set the X509 name of the recipient to be placed in the PKIHeader */
-DEFINE_OSSL_CMP_CTX_set1(recipient, X509_NAME)
+    /* Set the X509 name of the recipient to be placed in the PKIHeader */
+    DEFINE_OSSL_CMP_CTX_set1(recipient, X509_NAME)
 
-/* Store the X509 name of the expected sender in the PKIHeader of responses */
-DEFINE_OSSL_CMP_CTX_set1(expected_sender, X509_NAME)
+    /* Store the X509 name of the expected sender in the PKIHeader of responses */
+    DEFINE_OSSL_CMP_CTX_set1(expected_sender, X509_NAME)
 
-/* Set the X509 name of the issuer to be placed in the certTemplate */
-DEFINE_OSSL_CMP_CTX_set1(issuer, X509_NAME)
+    /* Set the X509 name of the issuer to be placed in the certTemplate */
+    DEFINE_OSSL_CMP_CTX_set1(issuer, X509_NAME)
 
-/* Set the ASN1_INTEGER serial to be placed in the certTemplate for rr */
-DEFINE_OSSL_CMP_CTX_set1(serialNumber, ASN1_INTEGER)
-/*
- * Set the subject name that will be placed in the certificate
- * request. This will be the subject name on the received certificate.
- */
-DEFINE_OSSL_CMP_CTX_set1(subjectName, X509_NAME)
+    /* Set the ASN1_INTEGER serial to be placed in the certTemplate for rr */
+    DEFINE_OSSL_CMP_CTX_set1(serialNumber, ASN1_INTEGER)
+    /*
+     * Set the subject name that will be placed in the certificate
+     * request. This will be the subject name on the received certificate.
+     */
+    DEFINE_OSSL_CMP_CTX_set1(subjectName, X509_NAME)
 
-/* Set the X.509v3 certificate request extensions to be used in IR/CR/KUR */
-int OSSL_CMP_CTX_set0_reqExtensions(OSSL_CMP_CTX *ctx, X509_EXTENSIONS *exts)
+    /* Set the X.509v3 certificate request extensions to be used in IR/CR/KUR */
+    int OSSL_CMP_CTX_set0_reqExtensions(OSSL_CMP_CTX *ctx, X509_EXTENSIONS *exts)
 {
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -638,7 +639,7 @@ int OSSL_CMP_CTX_set0_reqExtensions(OSSL_CMP_CTX *ctx, X509_EXTENSIONS *exts)
     }
 
     if (sk_GENERAL_NAME_num(ctx->subjectAltNames) > 0 && exts != NULL
-            && X509v3_get_ext_by_NID(exts, NID_subject_alt_name, -1) >= 0) {
+        && X509v3_get_ext_by_NID(exts, NID_subject_alt_name, -1) >= 0) {
         ERR_raise(ERR_LIB_CMP, CMP_R_MULTIPLE_SAN_SOURCES);
         return 0;
     }
@@ -657,7 +658,8 @@ int OSSL_CMP_CTX_reqExtensions_have_SAN(OSSL_CMP_CTX *ctx)
     /* if one of the following conditions 'fail' this is not an error */
     return ctx->reqExtensions != NULL
         && X509v3_get_ext_by_NID(ctx->reqExtensions,
-                                 NID_subject_alt_name, -1) >= 0;
+               NID_subject_alt_name, -1)
+        >= 0;
 }
 
 /*
@@ -665,7 +667,7 @@ int OSSL_CMP_CTX_reqExtensions_have_SAN(OSSL_CMP_CTX *ctx)
  * request's extensions field to request subject alternative names.
  */
 int OSSL_CMP_CTX_push1_subjectAltName(OSSL_CMP_CTX *ctx,
-                                      const GENERAL_NAME *name)
+    const GENERAL_NAME *name)
 {
     GENERAL_NAME *name_dup;
 
@@ -680,7 +682,7 @@ int OSSL_CMP_CTX_push1_subjectAltName(OSSL_CMP_CTX *ctx,
     }
 
     if (ctx->subjectAltNames == NULL
-            && (ctx->subjectAltNames = sk_GENERAL_NAME_new_null()) == NULL)
+        && (ctx->subjectAltNames = sk_GENERAL_NAME_new_null()) == NULL)
         return 0;
     if ((name_dup = GENERAL_NAME_dup(name)) == NULL)
         return 0;
@@ -697,8 +699,8 @@ int OSSL_CMP_CTX_push1_subjectAltName(OSSL_CMP_CTX *ctx,
  */
 DEFINE_OSSL_set1_up_ref(OSSL_CMP_CTX, cert, X509)
 
-int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
-                                  STACK_OF(X509) *candidates)
+    int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
+        STACK_OF(X509) *candidates)
 {
     STACK_OF(X509) *chain;
 
@@ -708,12 +710,12 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
     }
 
     if (!ossl_x509_add_certs_new(&ctx->untrusted, candidates,
-                                 X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
+            X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
         return 0;
 
     ossl_cmp_debug(ctx, "trying to build chain for own CMP signer cert");
     chain = X509_build_chain(ctx->cert, ctx->untrusted, own_trusted, 0,
-                             ctx->libctx, ctx->propq);
+        ctx->libctx, ctx->propq);
     if (chain == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_FAILED_BUILDING_OWN_CHAIN);
         return 0;
@@ -731,29 +733,29 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
  */
 DEFINE_OSSL_set1_up_ref(OSSL_CMP_CTX, oldCert, X509)
 
-/* Set the PKCS#10 CSR to be sent in P10CR */
-DEFINE_OSSL_CMP_CTX_set1(p10CSR, X509_REQ)
+    /* Set the PKCS#10 CSR to be sent in P10CR */
+    DEFINE_OSSL_CMP_CTX_set1(p10CSR, X509_REQ)
 
-/*
- * Set the (newly received in IP/KUP/CP) certificate in the context.
- * This only permits for one cert to be enrolled at a time.
- */
-DEFINE_OSSL_set0(ossl_cmp_ctx, newCert, X509)
+    /*
+     * Set the (newly received in IP/KUP/CP) certificate in the context.
+     * This only permits for one cert to be enrolled at a time.
+     */
+    DEFINE_OSSL_set0(ossl_cmp_ctx, newCert, X509)
 
-/* Get successfully validated server cert, if any, of current transaction */
-DEFINE_OSSL_CMP_CTX_get0(validatedSrvCert, X509)
+    /* Get successfully validated server cert, if any, of current transaction */
+    DEFINE_OSSL_CMP_CTX_get0(validatedSrvCert, X509)
 
-/*
- * Get the (newly received in IP/KUP/CP) client certificate from the context
- * This only permits for one client cert to be received...
- */
-DEFINE_OSSL_CMP_CTX_get0(newCert, X509)
+    /*
+     * Get the (newly received in IP/KUP/CP) client certificate from the context
+     * This only permits for one client cert to be received...
+     */
+    DEFINE_OSSL_CMP_CTX_get0(newCert, X509)
 
-/* Set the client's current private key */
-DEFINE_OSSL_set1_up_ref(OSSL_CMP_CTX, pkey, EVP_PKEY)
+    /* Set the client's current private key */
+    DEFINE_OSSL_set1_up_ref(OSSL_CMP_CTX, pkey, EVP_PKEY)
 
-/* Set new key pair. Used e.g. when doing Key Update */
-int OSSL_CMP_CTX_set0_newPkey(OSSL_CMP_CTX *ctx, int priv, EVP_PKEY *pkey)
+    /* Set new key pair. Used e.g. when doing Key Update */
+    int OSSL_CMP_CTX_set0_newPkey(OSSL_CMP_CTX *ctx, int priv, EVP_PKEY *pkey)
 {
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -797,80 +799,80 @@ EVP_PKEY *ossl_cmp_ctx_get0_newPubkey(const OSSL_CMP_CTX *ctx)
     return ctx->pkey;
 }
 
-#define DEFINE_set1_ASN1_OCTET_STRING(PREFIX, FIELD) \
-int PREFIX##_set1_##FIELD(OSSL_CMP_CTX *ctx, const ASN1_OCTET_STRING *id) \
-{ \
-    if (ctx == NULL) { \
-        ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
-        return 0; \
-    } \
-    return ossl_cmp_asn1_octet_string_set1(&ctx->FIELD, id); \
-}
+#define DEFINE_set1_ASN1_OCTET_STRING(PREFIX, FIELD)                          \
+    int PREFIX##_set1_##FIELD(OSSL_CMP_CTX *ctx, const ASN1_OCTET_STRING *id) \
+    {                                                                         \
+        if (ctx == NULL) {                                                    \
+            ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);                      \
+            return 0;                                                         \
+        }                                                                     \
+        return ossl_cmp_asn1_octet_string_set1(&ctx->FIELD, id);              \
+    }
 
 /* Set the given transactionID to the context */
 DEFINE_set1_ASN1_OCTET_STRING(OSSL_CMP_CTX, transactionID)
 
-/* Set the nonce to be used for the recipNonce in the message created next */
-DEFINE_set1_ASN1_OCTET_STRING(ossl_cmp_ctx, recipNonce)
+    /* Set the nonce to be used for the recipNonce in the message created next */
+    DEFINE_set1_ASN1_OCTET_STRING(ossl_cmp_ctx, recipNonce)
 
-/* Stores the given nonce as the last senderNonce sent out */
-DEFINE_set1_ASN1_OCTET_STRING(OSSL_CMP_CTX, senderNonce)
+    /* Stores the given nonce as the last senderNonce sent out */
+    DEFINE_set1_ASN1_OCTET_STRING(OSSL_CMP_CTX, senderNonce)
 
-/* store the first req sender nonce for verifying delayed delivery */
-DEFINE_set1_ASN1_OCTET_STRING(ossl_cmp_ctx, first_senderNonce)
+    /* store the first req sender nonce for verifying delayed delivery */
+    DEFINE_set1_ASN1_OCTET_STRING(ossl_cmp_ctx, first_senderNonce)
 
-/* Set the proxy server to use for HTTP(S) connections */
-DEFINE_OSSL_CMP_CTX_set1(proxy, char)
+    /* Set the proxy server to use for HTTP(S) connections */
+    DEFINE_OSSL_CMP_CTX_set1(proxy, char)
 
-/* Set the (HTTP) hostname of the CMP server */
-DEFINE_OSSL_CMP_CTX_set1(server, char)
+    /* Set the (HTTP) hostname of the CMP server */
+    DEFINE_OSSL_CMP_CTX_set1(server, char)
 
-/* Set the server exclusion list of the HTTP proxy server */
-DEFINE_OSSL_CMP_CTX_set1(no_proxy, char)
+    /* Set the server exclusion list of the HTTP proxy server */
+    DEFINE_OSSL_CMP_CTX_set1(no_proxy, char)
 
 #ifndef OPENSSL_NO_HTTP
-/* Set the http connect/disconnect callback function to be used for HTTP(S) */
-DEFINE_OSSL_set(OSSL_CMP_CTX, http_cb, OSSL_HTTP_bio_cb_t)
+    /* Set the http connect/disconnect callback function to be used for HTTP(S) */
+    DEFINE_OSSL_set(OSSL_CMP_CTX, http_cb, OSSL_HTTP_bio_cb_t)
 
-/* Set argument optionally to be used by the http connect/disconnect callback */
-DEFINE_OSSL_set(OSSL_CMP_CTX, http_cb_arg, void *)
+    /* Set argument optionally to be used by the http connect/disconnect callback */
+    DEFINE_OSSL_set(OSSL_CMP_CTX, http_cb_arg, void *)
 
-/*
- * Get argument optionally to be used by the http connect/disconnect callback
- * Returns callback argument set previously (NULL if not set or on error)
- */
-DEFINE_OSSL_get(OSSL_CMP_CTX, http_cb_arg, void *, NULL)
+    /*
+     * Get argument optionally to be used by the http connect/disconnect callback
+     * Returns callback argument set previously (NULL if not set or on error)
+     */
+    DEFINE_OSSL_get(OSSL_CMP_CTX, http_cb_arg, void *, NULL)
 #endif
 
-/* Set callback function for sending CMP request and receiving response */
-DEFINE_OSSL_set(OSSL_CMP_CTX, transfer_cb, OSSL_CMP_transfer_cb_t)
+    /* Set callback function for sending CMP request and receiving response */
+    DEFINE_OSSL_set(OSSL_CMP_CTX, transfer_cb, OSSL_CMP_transfer_cb_t)
 
-/* Set argument optionally to be used by the transfer callback */
-DEFINE_OSSL_set(OSSL_CMP_CTX, transfer_cb_arg, void *)
+    /* Set argument optionally to be used by the transfer callback */
+    DEFINE_OSSL_set(OSSL_CMP_CTX, transfer_cb_arg, void *)
 
-/*
- * Get argument optionally to be used by the transfer callback.
- * Returns callback argument set previously (NULL if not set or on error)
- */
-DEFINE_OSSL_get(OSSL_CMP_CTX, transfer_cb_arg, void *, NULL)
+    /*
+     * Get argument optionally to be used by the transfer callback.
+     * Returns callback argument set previously (NULL if not set or on error)
+     */
+    DEFINE_OSSL_get(OSSL_CMP_CTX, transfer_cb_arg, void *, NULL)
 
-/** Set the HTTP server port to be used */
-DEFINE_OSSL_set(OSSL_CMP_CTX, serverPort, int)
+    /** Set the HTTP server port to be used */
+    DEFINE_OSSL_set(OSSL_CMP_CTX, serverPort, int)
 
-/* Set the HTTP path to be used on the server (e.g "pkix/") */
-DEFINE_OSSL_CMP_CTX_set1(serverPath, char)
+    /* Set the HTTP path to be used on the server (e.g "pkix/") */
+    DEFINE_OSSL_CMP_CTX_set1(serverPath, char)
 
-/* Set the failInfo error code as bit encoding in OSSL_CMP_CTX */
-DEFINE_OSSL_set(ossl_cmp_ctx, failInfoCode, int)
+    /* Set the failInfo error code as bit encoding in OSSL_CMP_CTX */
+    DEFINE_OSSL_set(ossl_cmp_ctx, failInfoCode, int)
 
-/*
- * Get the failInfo error code in OSSL_CMP_CTX as bit encoding.
- * Returns bit string as integer on success, -1 on error
- */
-DEFINE_OSSL_get(OSSL_CMP_CTX, failInfoCode, int, -1)
+    /*
+     * Get the failInfo error code in OSSL_CMP_CTX as bit encoding.
+     * Returns bit string as integer on success, -1 on error
+     */
+    DEFINE_OSSL_get(OSSL_CMP_CTX, failInfoCode, int, -1)
 
-/* Set a Boolean or integer option of the context to the "val" arg */
-int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val)
+    /* Set a Boolean or integer option of the context to the "val" arg */
+    int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val)
 {
     int min_val;
 
diff --git a/crypto/cmp/cmp_err.c b/crypto/cmp/cmp_err.c
index 6d87d7b463ddd..fe1d8b3d1d29c 100644
--- a/crypto/cmp/cmp_err.c
+++ b/crypto/cmp/cmp_err.c
@@ -14,193 +14,193 @@
 
 #ifndef OPENSSL_NO_CMP
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA CMP_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ALGORITHM_NOT_SUPPORTED),
-    "algorithm not supported"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_BAD_CHECKAFTER_IN_POLLREP),
-    "bad checkafter in pollrep"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_BAD_REQUEST_ID), "bad request id"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTHASH_UNMATCHED), "certhash unmatched"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTID_NOT_FOUND), "certid not found"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTIFICATE_NOT_ACCEPTED),
-    "certificate not accepted"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTIFICATE_NOT_FOUND),
-    "certificate not found"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTREQMSG_NOT_FOUND),
-    "certreqmsg not found"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTRESPONSE_NOT_FOUND),
-    "certresponse not found"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERT_AND_KEY_DO_NOT_MATCH),
-    "cert and key do not match"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CHECKAFTER_OUT_OF_RANGE),
-    "checkafter out of range"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ENCOUNTERED_KEYUPDATEWARNING),
-    "encountered keyupdatewarning"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ENCOUNTERED_WAITING),
-    "encountered waiting"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CALCULATING_PROTECTION),
-    "error calculating protection"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_CERTCONF),
-    "error creating certconf"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_CERTREP),
-    "error creating certrep"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_CERTREQ),
-    "error creating certreq"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_ERROR),
-    "error creating error"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_GENM),
-    "error creating genm"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_GENP),
-    "error creating genp"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_PKICONF),
-    "error creating pkiconf"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_POLLREP),
-    "error creating pollrep"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_POLLREQ),
-    "error creating pollreq"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_RP), "error creating rp"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_RR), "error creating rr"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_PARSING_PKISTATUS),
-    "error parsing pkistatus"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_PROCESSING_MESSAGE),
-    "error processing message"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_PROTECTING_MESSAGE),
-    "error protecting message"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_SETTING_CERTHASH),
-    "error setting certhash"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_UNEXPECTED_CERTCONF),
-    "error unexpected certconf"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_VALIDATING_PROTECTION),
-    "error validating protection"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_VALIDATING_SIGNATURE),
-    "error validating signature"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_EXPECTED_POLLREQ), "expected pollreq"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILED_BUILDING_OWN_CHAIN),
-    "failed building own chain"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILED_EXTRACTING_CENTRAL_GEN_KEY),
-     "failed extracting central gen key"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILED_EXTRACTING_PUBKEY),
-    "failed extracting pubkey"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILURE_OBTAINING_RANDOM),
-    "failure obtaining random"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAIL_INFO_OUT_OF_RANGE),
-    "fail info out of range"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GENERATE_CERTREQTEMPLATE),
-    "generate certreqtemplate"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GENERATE_CRLSTATUS),
-    "error creating crlstatus"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GETTING_GENP), "getting genp"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GET_ITAV), "get itav"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_ARGS), "invalid args"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_GENP), "invalid genp"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_KEYSPEC), "invalid keyspec"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_OPTION), "invalid option"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_ROOTCAKEYUPDATE),
-    "invalid rootcakeyupdate"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_CENTRAL_GEN_KEY),
-     "missing central gen key"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_CERTID), "missing certid"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION),
-    "missing key input for creating protection"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_KEY_USAGE_DIGITALSIGNATURE),
-    "missing key usage digitalsignature"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_P10CSR), "missing p10csr"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PBM_SECRET), "missing pbm secret"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PRIVATE_KEY),
-    "missing private key"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PRIVATE_KEY_FOR_POPO),
-    "missing private key for popo"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PROTECTION), "missing protection"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PUBLIC_KEY), "missing public key"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_REFERENCE_CERT),
-    "missing reference cert"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_SECRET), "missing secret"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_SENDER_IDENTIFICATION),
-    "missing sender identification"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_TRUST_ANCHOR),
-    "missing trust anchor"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_TRUST_STORE),
-    "missing trust store"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MULTIPLE_REQUESTS_NOT_SUPPORTED),
-    "multiple requests not supported"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MULTIPLE_RESPONSES_NOT_SUPPORTED),
-    "multiple responses not supported"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MULTIPLE_SAN_SOURCES),
-    "multiple san sources"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_NO_STDIO), "no stdio"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_NO_SUITABLE_SENDER_CERT),
-    "no suitable sender cert"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_NULL_ARGUMENT), "null argument"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_PKIBODY_ERROR), "pkibody error"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_PKISTATUSINFO_NOT_FOUND),
-    "pkistatusinfo not found"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_POLLING_FAILED), "polling failed"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_POTENTIALLY_INVALID_CERTIFICATE),
-    "potentially invalid certificate"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_RECEIVED_ERROR), "received error"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_RECIPNONCE_UNMATCHED),
-    "recipnonce unmatched"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_REQUEST_NOT_ACCEPTED),
-    "request not accepted"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_REQUEST_REJECTED_BY_SERVER),
-    "request rejected by server"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_SENDER_GENERALNAME_TYPE_NOT_SUPPORTED),
-    "sender generalname type not supported"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_SRVCERT_DOES_NOT_VALIDATE_MSG),
-    "srvcert does not validate msg"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_TOTAL_TIMEOUT), "total timeout"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_TRANSACTIONID_UNMATCHED),
-    "transactionid unmatched"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_TRANSFER_ERROR), "transfer error"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNCLEAN_CTX), "unclean ctx"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_CENTRAL_GEN_KEY),
-     "unexpected central gen key"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_CERTPROFILE),
-    "unexpected certprofile"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_CRLSTATUSLIST),
-    "unexpected crlstatuslist"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_PKIBODY), "unexpected pkibody"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_PKISTATUS),
-    "unexpected pkistatus"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_POLLREQ), "unexpected pollreq"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_PVNO), "unexpected pvno"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_SENDER), "unexpected sender"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_ALGORITHM_ID),
-    "unknown algorithm id"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_CERT_TYPE), "unknown cert type"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_CRL_ISSUER), "unknown crl issuer"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_PKISTATUS), "unknown pkistatus"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_ALGORITHM),
-    "unsupported algorithm"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_KEY_TYPE),
-    "unsupported key type"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_PKIBODY),
-    "unsupported pkibody"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC),
-    "unsupported protection alg dhbasedmac"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_VALUE_TOO_LARGE), "value too large"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_VALUE_TOO_SMALL), "value too small"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_ALGORITHM_OID),
-    "wrong algorithm oid"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_CERTID), "wrong certid"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_CERTID_IN_RP), "wrong certid in rp"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_PBM_VALUE), "wrong pbm value"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_RP_COMPONENT_COUNT),
-    "wrong rp component count"},
-    {ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_SERIAL_IN_RP), "wrong serial in rp"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ALGORITHM_NOT_SUPPORTED),
+        "algorithm not supported" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_BAD_CHECKAFTER_IN_POLLREP),
+        "bad checkafter in pollrep" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_BAD_REQUEST_ID), "bad request id" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTHASH_UNMATCHED), "certhash unmatched" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTID_NOT_FOUND), "certid not found" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTIFICATE_NOT_ACCEPTED),
+        "certificate not accepted" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTIFICATE_NOT_FOUND),
+        "certificate not found" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTREQMSG_NOT_FOUND),
+        "certreqmsg not found" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERTRESPONSE_NOT_FOUND),
+        "certresponse not found" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CERT_AND_KEY_DO_NOT_MATCH),
+        "cert and key do not match" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_CHECKAFTER_OUT_OF_RANGE),
+        "checkafter out of range" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ENCOUNTERED_KEYUPDATEWARNING),
+        "encountered keyupdatewarning" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ENCOUNTERED_WAITING),
+        "encountered waiting" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CALCULATING_PROTECTION),
+        "error calculating protection" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_CERTCONF),
+        "error creating certconf" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_CERTREP),
+        "error creating certrep" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_CERTREQ),
+        "error creating certreq" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_ERROR),
+        "error creating error" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_GENM),
+        "error creating genm" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_GENP),
+        "error creating genp" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_PKICONF),
+        "error creating pkiconf" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_POLLREP),
+        "error creating pollrep" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_POLLREQ),
+        "error creating pollreq" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_RP), "error creating rp" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_CREATING_RR), "error creating rr" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_PARSING_PKISTATUS),
+        "error parsing pkistatus" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_PROCESSING_MESSAGE),
+        "error processing message" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_PROTECTING_MESSAGE),
+        "error protecting message" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_SETTING_CERTHASH),
+        "error setting certhash" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_UNEXPECTED_CERTCONF),
+        "error unexpected certconf" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_VALIDATING_PROTECTION),
+        "error validating protection" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ERROR_VALIDATING_SIGNATURE),
+        "error validating signature" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_EXPECTED_POLLREQ), "expected pollreq" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILED_BUILDING_OWN_CHAIN),
+        "failed building own chain" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILED_EXTRACTING_CENTRAL_GEN_KEY),
+        "failed extracting central gen key" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILED_EXTRACTING_PUBKEY),
+        "failed extracting pubkey" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAILURE_OBTAINING_RANDOM),
+        "failure obtaining random" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_FAIL_INFO_OUT_OF_RANGE),
+        "fail info out of range" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GENERATE_CERTREQTEMPLATE),
+        "generate certreqtemplate" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GENERATE_CRLSTATUS),
+        "error creating crlstatus" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GETTING_GENP), "getting genp" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_GET_ITAV), "get itav" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_ARGS), "invalid args" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_GENP), "invalid genp" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_KEYSPEC), "invalid keyspec" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_OPTION), "invalid option" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_INVALID_ROOTCAKEYUPDATE),
+        "invalid rootcakeyupdate" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_CENTRAL_GEN_KEY),
+        "missing central gen key" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_CERTID), "missing certid" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION),
+        "missing key input for creating protection" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_KEY_USAGE_DIGITALSIGNATURE),
+        "missing key usage digitalsignature" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_P10CSR), "missing p10csr" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PBM_SECRET), "missing pbm secret" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PRIVATE_KEY),
+        "missing private key" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PRIVATE_KEY_FOR_POPO),
+        "missing private key for popo" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PROTECTION), "missing protection" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_PUBLIC_KEY), "missing public key" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_REFERENCE_CERT),
+        "missing reference cert" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_SECRET), "missing secret" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_SENDER_IDENTIFICATION),
+        "missing sender identification" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_TRUST_ANCHOR),
+        "missing trust anchor" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MISSING_TRUST_STORE),
+        "missing trust store" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MULTIPLE_REQUESTS_NOT_SUPPORTED),
+        "multiple requests not supported" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MULTIPLE_RESPONSES_NOT_SUPPORTED),
+        "multiple responses not supported" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_MULTIPLE_SAN_SOURCES),
+        "multiple san sources" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_NO_STDIO), "no stdio" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_NO_SUITABLE_SENDER_CERT),
+        "no suitable sender cert" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_NULL_ARGUMENT), "null argument" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_PKIBODY_ERROR), "pkibody error" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_PKISTATUSINFO_NOT_FOUND),
+        "pkistatusinfo not found" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_POLLING_FAILED), "polling failed" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_POTENTIALLY_INVALID_CERTIFICATE),
+        "potentially invalid certificate" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_RECEIVED_ERROR), "received error" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_RECIPNONCE_UNMATCHED),
+        "recipnonce unmatched" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_REQUEST_NOT_ACCEPTED),
+        "request not accepted" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_REQUEST_REJECTED_BY_SERVER),
+        "request rejected by server" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_SENDER_GENERALNAME_TYPE_NOT_SUPPORTED),
+        "sender generalname type not supported" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_SRVCERT_DOES_NOT_VALIDATE_MSG),
+        "srvcert does not validate msg" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_TOTAL_TIMEOUT), "total timeout" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_TRANSACTIONID_UNMATCHED),
+        "transactionid unmatched" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_TRANSFER_ERROR), "transfer error" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNCLEAN_CTX), "unclean ctx" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_CENTRAL_GEN_KEY),
+        "unexpected central gen key" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_CERTPROFILE),
+        "unexpected certprofile" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_CRLSTATUSLIST),
+        "unexpected crlstatuslist" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_PKIBODY), "unexpected pkibody" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_PKISTATUS),
+        "unexpected pkistatus" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_POLLREQ), "unexpected pollreq" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_PVNO), "unexpected pvno" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNEXPECTED_SENDER), "unexpected sender" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_ALGORITHM_ID),
+        "unknown algorithm id" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_CERT_TYPE), "unknown cert type" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_CRL_ISSUER), "unknown crl issuer" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNKNOWN_PKISTATUS), "unknown pkistatus" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_ALGORITHM),
+        "unsupported algorithm" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_KEY_TYPE),
+        "unsupported key type" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_PKIBODY),
+        "unsupported pkibody" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC),
+        "unsupported protection alg dhbasedmac" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_VALUE_TOO_LARGE), "value too large" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_VALUE_TOO_SMALL), "value too small" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_ALGORITHM_OID),
+        "wrong algorithm oid" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_CERTID), "wrong certid" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_CERTID_IN_RP), "wrong certid in rp" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_PBM_VALUE), "wrong pbm value" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_RP_COMPONENT_COUNT),
+        "wrong rp component count" },
+    { ERR_PACK(ERR_LIB_CMP, 0, CMP_R_WRONG_SERIAL_IN_RP), "wrong serial in rp" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_CMP_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(CMP_str_reasons[0].error) == NULL)
         ERR_load_strings_const(CMP_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/cmp/cmp_genm.c b/crypto/cmp/cmp_genm.c
index 6afe3e720ea22..bcc121f146954 100644
--- a/crypto/cmp/cmp_genm.c
+++ b/crypto/cmp/cmp_genm.c
@@ -19,39 +19,38 @@ static const X509_VERIFY_PARAM *get0_trustedStore_vpm(const OSSL_CMP_CTX *ctx)
 }
 
 static void cert_msg(const char *func, const char *file, int lineno,
-                     OSSL_CMP_severity level, OSSL_CMP_CTX *ctx,
-                     const char *source, X509 *cert, const char *msg)
+    OSSL_CMP_severity level, OSSL_CMP_CTX *ctx,
+    const char *source, X509 *cert, const char *msg)
 {
     char *subj = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0);
 
     ossl_cmp_print_log(level, ctx, func, file, lineno,
-                       level == OSSL_CMP_LOG_WARNING ? "WARN" : "ERR",
-                       "certificate from '%s' with subject '%s' %s",
-                       source, subj, msg);
+        level == OSSL_CMP_LOG_WARNING ? "WARN" : "ERR",
+        "certificate from '%s' with subject '%s' %s",
+        source, subj, msg);
     OPENSSL_free(subj);
 }
 
 /* use |type_CA| -1 (no CA type check) or 0 (must be EE) or 1 (must be CA) */
 static int ossl_X509_check(OSSL_CMP_CTX *ctx, const char *source, X509 *cert,
-                           int type_CA, const X509_VERIFY_PARAM *vpm)
+    int type_CA, const X509_VERIFY_PARAM *vpm)
 {
     uint32_t ex_flags = X509_get_extension_flags(cert);
     int res = X509_cmp_timeframe(vpm, X509_get0_notBefore(cert),
-                                 X509_get0_notAfter(cert));
+        X509_get0_notAfter(cert));
     int ret = res == 0;
-    OSSL_CMP_severity level =
-        vpm == NULL ? OSSL_CMP_LOG_WARNING : OSSL_CMP_LOG_ERR;
+    OSSL_CMP_severity level = vpm == NULL ? OSSL_CMP_LOG_WARNING : OSSL_CMP_LOG_ERR;
 
     if (!ret)
         cert_msg(OPENSSL_FUNC, OPENSSL_FILE, OPENSSL_LINE, level, ctx,
-                 source, cert, res > 0 ? "has expired" : "not yet valid");
+            source, cert, res > 0 ? "has expired" : "not yet valid");
     if (type_CA >= 0 && (ex_flags & EXFLAG_V1) == 0) {
         int is_CA = (ex_flags & EXFLAG_CA) != 0;
 
         if ((type_CA != 0) != is_CA) {
             cert_msg(OPENSSL_FUNC, OPENSSL_FILE, OPENSSL_LINE, level, ctx,
-                     source, cert,
-                     is_CA ? "is not an EE cert" : "is not a CA cert");
+                source, cert,
+                is_CA ? "is not an EE cert" : "is not a CA cert");
             ret = 0;
         }
     }
@@ -59,22 +58,22 @@ static int ossl_X509_check(OSSL_CMP_CTX *ctx, const char *source, X509 *cert,
 }
 
 static int ossl_X509_check_all(OSSL_CMP_CTX *ctx, const char *source,
-                               STACK_OF(X509) *certs,
-                               int type_CA, const X509_VERIFY_PARAM *vpm)
+    STACK_OF(X509) *certs,
+    int type_CA, const X509_VERIFY_PARAM *vpm)
 {
     int i;
     int ret = 1;
 
     for (i = 0; i < sk_X509_num(certs /* may be NULL */); i++)
         ret = ossl_X509_check(ctx, source,
-                              sk_X509_value(certs, i), type_CA, vpm)
+                  sk_X509_value(certs, i), type_CA, vpm)
             && ret; /* Having 'ret' after the '&&', all certs are checked. */
     return ret;
 }
 
 static OSSL_CMP_ITAV *get_genm_itav(OSSL_CMP_CTX *ctx,
-                                    OSSL_CMP_ITAV *req, /* gets consumed */
-                                    int expected, const char *desc)
+    OSSL_CMP_ITAV *req, /* gets consumed */
+    int expected, const char *desc)
 {
     STACK_OF(OSSL_CMP_ITAV) *itavs = NULL;
     int i, n;
@@ -85,7 +84,7 @@ static OSSL_CMP_ITAV *get_genm_itav(OSSL_CMP_CTX *ctx,
     }
     if (OSSL_CMP_CTX_get_status(ctx) != OSSL_CMP_PKISTATUS_unspecified) {
         ERR_raise_data(ERR_LIB_CMP, CMP_R_UNCLEAN_CTX,
-                       "client context in unsuitable state; should call CMPclient_reinit() before");
+            "client context in unsuitable state; should call CMPclient_reinit() before");
         goto err;
     }
 
@@ -96,21 +95,21 @@ static OSSL_CMP_ITAV *get_genm_itav(OSSL_CMP_CTX *ctx,
     if (itavs == NULL) {
         if (OSSL_CMP_CTX_get_status(ctx) != OSSL_CMP_PKISTATUS_request)
             ERR_raise_data(ERR_LIB_CMP, CMP_R_GETTING_GENP,
-                           "with infoType %s", desc);
+                "with infoType %s", desc);
         return NULL;
     }
 
     if ((n = sk_OSSL_CMP_ITAV_num(itavs)) <= 0) {
         ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_GENP,
-                       "response on genm requesting infoType %s does not include suitable value", desc);
+            "response on genm requesting infoType %s does not include suitable value", desc);
         sk_OSSL_CMP_ITAV_free(itavs);
         return NULL;
     }
 
     if (n > 1)
         ossl_cmp_log2(WARN, ctx,
-                      "response on genm contains %d ITAVs; will use the first ITAV with infoType id-it-%s",
-                      n, desc);
+            "response on genm contains %d ITAVs; will use the first ITAV with infoType id-it-%s",
+            n, desc);
     for (i = 0; i < n; i++) {
         OSSL_CMP_ITAV *itav = sk_OSSL_CMP_ITAV_shift(itavs);
         ASN1_OBJECT *obj = OSSL_CMP_ITAV_get0_type(itav);
@@ -130,9 +129,9 @@ static OSSL_CMP_ITAV *get_genm_itav(OSSL_CMP_CTX *ctx,
         OSSL_CMP_ITAV_free(itav);
     }
     ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_GENP,
-                   "could not find any ITAV for %s", desc);
+        "could not find any ITAV for %s", desc);
 
- err:
+err:
     sk_OSSL_CMP_ITAV_free(itavs);
     OSSL_CMP_ITAV_free(req);
     return NULL;
@@ -161,19 +160,19 @@ int OSSL_CMP_get1_caCerts(OSSL_CMP_CTX *ctx, STACK_OF(X509) **out)
         goto end;
 
     if (!ossl_X509_check_all(ctx, "genp", certs, 1 /* CA */,
-                             get0_trustedStore_vpm(ctx))) {
+            get0_trustedStore_vpm(ctx))) {
         ret = 0;
         goto end;
     }
     *out = sk_X509_new_reserve(NULL, sk_X509_num(certs));
     if (!X509_add_certs(*out, certs,
-                        X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP)) {
+            X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP)) {
         sk_X509_pop_free(*out, X509_free);
         *out = NULL;
         ret = 0;
     }
 
- end:
+end:
     OSSL_CMP_ITAV_free(itav);
     return ret;
 }
@@ -181,16 +180,15 @@ int OSSL_CMP_get1_caCerts(OSSL_CMP_CTX *ctx, STACK_OF(X509) **out)
 static int selfsigned_verify_cb(int ok, X509_STORE_CTX *store_ctx)
 {
     if (ok == 0
-            && X509_STORE_CTX_get_error_depth(store_ctx) == 0
-            && X509_STORE_CTX_get_error(store_ctx)
+        && X509_STORE_CTX_get_error_depth(store_ctx) == 0
+        && X509_STORE_CTX_get_error(store_ctx)
             == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) {
         /* in this case, custom chain building */
         int i;
         STACK_OF(X509) *trust;
         STACK_OF(X509) *chain = X509_STORE_CTX_get0_chain(store_ctx);
         STACK_OF(X509) *untrusted = X509_STORE_CTX_get0_untrusted(store_ctx);
-        X509_STORE_CTX_check_issued_fn check_issued =
-            X509_STORE_CTX_get_check_issued(store_ctx);
+        X509_STORE_CTX_check_issued_fn check_issued = X509_STORE_CTX_get_check_issued(store_ctx);
         X509 *cert = sk_X509_value(chain, 0); /* target cert */
         X509 *issuer;
 
@@ -223,8 +221,8 @@ static int selfsigned_verify_cb(int ok, X509_STORE_CTX *store_ctx)
 
 /* vanilla X509_verify_cert() does not support self-signed certs as target */
 static int verify_ss_cert(OSSL_LIB_CTX *libctx, const char *propq,
-                          X509_STORE *ts, STACK_OF(X509) *untrusted,
-                          X509 *target)
+    X509_STORE *ts, STACK_OF(X509) *untrusted,
+    X509 *target)
 {
     X509_STORE_CTX *csc = NULL;
     int ok = 0;
@@ -235,20 +233,20 @@ static int verify_ss_cert(OSSL_LIB_CTX *libctx, const char *propq,
     }
 
     if ((csc = X509_STORE_CTX_new_ex(libctx, propq)) == NULL
-            || !X509_STORE_CTX_init(csc, ts, target, untrusted))
+        || !X509_STORE_CTX_init(csc, ts, target, untrusted))
         goto err;
     X509_STORE_CTX_set_verify_cb(csc, selfsigned_verify_cb);
     ok = X509_verify_cert(csc) > 0;
 
- err:
+err:
     X509_STORE_CTX_free(csc);
     return ok;
 }
 
 static int
 verify_ss_cert_trans(OSSL_CMP_CTX *ctx, X509 *trusted /* may be NULL */,
-                     X509 *trans /* the only untrusted cert, may be NULL */,
-                     X509 *target, const char *desc)
+    X509 *trans /* the only untrusted cert, may be NULL */,
+    X509 *target, const char *desc)
 {
     X509_STORE *ts = OSSL_CMP_CTX_get0_trusted(ctx);
     STACK_OF(X509) *untrusted = NULL;
@@ -265,19 +263,18 @@ verify_ss_cert_trans(OSSL_CMP_CTX *ctx, X509 *trusted /* may be NULL */,
     }
 
     if (trans != NULL
-            && !ossl_x509_add_cert_new(&untrusted, trans, X509_ADD_FLAG_UP_REF))
+        && !ossl_x509_add_cert_new(&untrusted, trans, X509_ADD_FLAG_UP_REF))
         goto err;
 
     res = verify_ss_cert(OSSL_CMP_CTX_get0_libctx(ctx),
-                         OSSL_CMP_CTX_get0_propq(ctx),
-                         ts, untrusted, target);
+        OSSL_CMP_CTX_get0_propq(ctx),
+        ts, untrusted, target);
     if (!res)
         ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_ROOTCAKEYUPDATE,
-                       "failed to validate %s certificate received in genp %s",
-                       desc, trusted == NULL ? "using trust store"
-                       : "with given certificate as trust anchor");
+            "failed to validate %s certificate received in genp %s",
+            desc, trusted == NULL ? "using trust store" : "with given certificate as trust anchor");
 
- err:
+err:
     sk_X509_pop_free(untrusted, X509_free);
     if (trusted != NULL)
         X509_STORE_free(ts);
@@ -285,8 +282,8 @@ verify_ss_cert_trans(OSSL_CMP_CTX *ctx, X509 *trusted /* may be NULL */,
 }
 
 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)
 {
     X509 *oldWithOld_copy = NULL, *my_newWithOld, *my_oldWithNew;
     OSSL_CMP_ITAV *req, *itav;
@@ -305,7 +302,7 @@ int OSSL_CMP_get1_rootCaKeyUpdate(OSSL_CMP_CTX *ctx,
         return 0;
 
     if (!OSSL_CMP_ITAV_get0_rootCaKeyUpdate(itav, newWithNew,
-                                            &my_newWithOld, &my_oldWithNew))
+            &my_newWithOld, &my_oldWithNew))
         goto end;
     /* no root CA cert update available */
     if (*newWithNew == NULL) {
@@ -315,41 +312,39 @@ int OSSL_CMP_get1_rootCaKeyUpdate(OSSL_CMP_CTX *ctx,
     if ((oldWithOld_copy = X509_dup(oldWithOld)) == NULL && oldWithOld != NULL)
         goto end;
     if (!verify_ss_cert_trans(ctx, oldWithOld_copy, my_newWithOld,
-                              *newWithNew, "newWithNew")) {
+            *newWithNew, "newWithNew")) {
         ERR_raise(ERR_LIB_CMP, CMP_R_INVALID_ROOTCAKEYUPDATE);
         goto end;
     }
     if (oldWithOld != NULL && my_oldWithNew != NULL
         && !verify_ss_cert_trans(ctx, *newWithNew, my_oldWithNew,
-                                 oldWithOld_copy, "oldWithOld")) {
+            oldWithOld_copy, "oldWithOld")) {
         ERR_raise(ERR_LIB_CMP, CMP_R_INVALID_ROOTCAKEYUPDATE);
         goto end;
     }
 
     if (!X509_up_ref(*newWithNew))
         goto end;
-    if (newWithOld != NULL &&
-        (*newWithOld = my_newWithOld) != NULL && !X509_up_ref(*newWithOld))
+    if (newWithOld != NULL && (*newWithOld = my_newWithOld) != NULL && !X509_up_ref(*newWithOld))
         goto free;
-    if (oldWithNew == NULL ||
-        (*oldWithNew = my_oldWithNew) == NULL || X509_up_ref(*oldWithNew)) {
+    if (oldWithNew == NULL || (*oldWithNew = my_oldWithNew) == NULL || X509_up_ref(*oldWithNew)) {
         res = 1;
         goto end;
     }
     if (newWithOld != NULL)
         X509_free(*newWithOld);
- free:
+free:
     X509_free(*newWithNew);
 
- end:
+end:
     OSSL_CMP_ITAV_free(itav);
     X509_free(oldWithOld_copy);
     return res;
 }
 
 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)
 {
     OSSL_CMP_CRLSTATUS *status = NULL;
     STACK_OF(OSSL_CMP_CRLSTATUS) *list = NULL;
@@ -390,8 +385,8 @@ int OSSL_CMP_get1_crlUpdate(OSSL_CMP_CTX *ctx, const X509 *crlcert,
     }
     if (sk_X509_CRL_num(crls) != 1) {
         ERR_raise_data(ERR_LIB_CMP, CMP_R_INVALID_GENP,
-                       "Unexpected number of CRLs in genp: %d",
-                       sk_X509_CRL_num(crls));
+            "Unexpected number of CRLs in genp: %d",
+            sk_X509_CRL_num(crls));
         goto end;
     }
 
@@ -400,7 +395,7 @@ int OSSL_CMP_get1_crlUpdate(OSSL_CMP_CTX *ctx, const X509 *crlcert,
         goto end;
     }
     res = 1;
- end:
+end:
     OSSL_CMP_CRLSTATUS_free(status);
     sk_OSSL_CMP_CRLSTATUS_free(list);
     OSSL_CMP_ITAV_free(itav);
@@ -408,8 +403,8 @@ int OSSL_CMP_get1_crlUpdate(OSSL_CMP_CTX *ctx, const X509 *crlcert,
 }
 
 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)
 {
     OSSL_CMP_ITAV *req, *itav = NULL;
     int res = 0;
@@ -428,14 +423,15 @@ int OSSL_CMP_get1_certReqTemplate(OSSL_CMP_CTX *ctx,
     }
 
     if ((itav = get_genm_itav(ctx, req, NID_id_it_certReqTemplate,
-                              "certReqTemplate")) == NULL)
+             "certReqTemplate"))
+        == NULL)
         return 0;
 
     if (!OSSL_CMP_ITAV_get1_certReqTemplate(itav, certTemplate, keySpec))
         goto end;
 
     res = 1;
- end:
+end:
     OSSL_CMP_ITAV_free(itav);
     return res;
 }
diff --git a/crypto/cmp/cmp_hdr.c b/crypto/cmp/cmp_hdr.c
index d00c9f76bb42b..7715861b9da27 100644
--- a/crypto/cmp/cmp_hdr.c
+++ b/crypto/cmp/cmp_hdr.c
@@ -41,13 +41,12 @@ int ossl_cmp_hdr_get_pvno(const OSSL_CMP_PKIHEADER *hdr)
 int ossl_cmp_hdr_get_protection_nid(const OSSL_CMP_PKIHEADER *hdr)
 {
     if (!ossl_assert(hdr != NULL)
-            || hdr->protectionAlg == NULL)
+        || hdr->protectionAlg == NULL)
         return NID_undef;
     return OBJ_obj2nid(hdr->protectionAlg->algorithm);
 }
 
-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)
 {
     if (hdr == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -73,7 +72,7 @@ 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)
 {
     if (hdr == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -113,7 +112,7 @@ int ossl_cmp_hdr_update_messageTime(OSSL_CMP_PKIHEADER *hdr)
     if (!ossl_assert(hdr != NULL))
         return 0;
     if (hdr->messageTime == NULL
-            && (hdr->messageTime = ASN1_GENERALIZEDTIME_new()) == NULL)
+        && (hdr->messageTime = ASN1_GENERALIZEDTIME_new()) == NULL)
         return 0;
     return ASN1_GENERALIZEDTIME_set(hdr->messageTime, time(NULL)) != NULL;
 }
@@ -133,7 +132,7 @@ static int set_random(ASN1_OCTET_STRING **tgt, OSSL_CMP_CTX *ctx, size_t len)
 }
 
 int ossl_cmp_hdr_set1_senderKID(OSSL_CMP_PKIHEADER *hdr,
-                                const ASN1_OCTET_STRING *senderKID)
+    const ASN1_OCTET_STRING *senderKID)
 {
     if (!ossl_assert(hdr != NULL))
         return 0;
@@ -147,7 +146,7 @@ int ossl_cmp_hdr_push0_freeText(OSSL_CMP_PKIHEADER *hdr, ASN1_UTF8STRING *text)
         return 0;
 
     if (hdr->freeText == NULL
-            && (hdr->freeText = sk_ASN1_UTF8STRING_new_null()) == NULL)
+        && (hdr->freeText = sk_ASN1_UTF8STRING_new_null()) == NULL)
         return 0;
 
     return sk_ASN1_UTF8STRING_push(hdr->freeText, text);
@@ -159,16 +158,15 @@ int ossl_cmp_hdr_push1_freeText(OSSL_CMP_PKIHEADER *hdr, ASN1_UTF8STRING *text)
         return 0;
 
     if (hdr->freeText == NULL
-            && (hdr->freeText = sk_ASN1_UTF8STRING_new_null()) == NULL)
+        && (hdr->freeText = sk_ASN1_UTF8STRING_new_null()) == NULL)
         return 0;
 
-    return
-        ossl_cmp_sk_ASN1_UTF8STRING_push_str(hdr->freeText, (char *)text->data,
-                                             text->length);
+    return ossl_cmp_sk_ASN1_UTF8STRING_push_str(hdr->freeText, (char *)text->data,
+        text->length);
 }
 
 int ossl_cmp_hdr_generalInfo_push0_item(OSSL_CMP_PKIHEADER *hdr,
-                                        OSSL_CMP_ITAV *itav)
+    OSSL_CMP_ITAV *itav)
 {
     if (!ossl_assert(hdr != NULL && itav != NULL))
         return 0;
@@ -176,7 +174,7 @@ int ossl_cmp_hdr_generalInfo_push0_item(OSSL_CMP_PKIHEADER *hdr,
 }
 
 int ossl_cmp_hdr_generalInfo_push1_items(OSSL_CMP_PKIHEADER *hdr,
-                                         const STACK_OF(OSSL_CMP_ITAV) *itavs)
+    const STACK_OF(OSSL_CMP_ITAV) *itavs)
 {
     int i;
     OSSL_CMP_ITAV *itav;
@@ -208,13 +206,14 @@ int ossl_cmp_hdr_set_implicitConfirm(OSSL_CMP_PKIHEADER *hdr)
     if (asn1null == NULL)
         return 0;
     if ((itav = OSSL_CMP_ITAV_create(OBJ_nid2obj(NID_id_it_implicitConfirm),
-                                     asn1null)) == NULL)
+             asn1null))
+        == NULL)
         goto err;
     if (!ossl_cmp_hdr_generalInfo_push0_item(hdr, itav))
         goto err;
     return 1;
 
- err:
+err:
     ASN1_TYPE_free(asn1null);
     OSSL_CMP_ITAV_free(itav);
     return 0;
@@ -234,7 +233,7 @@ int ossl_cmp_hdr_has_implicitConfirm(const OSSL_CMP_PKIHEADER *hdr)
     for (i = 0; i < itavCount; i++) {
         itav = sk_OSSL_CMP_ITAV_value(hdr->generalInfo, i);
         if (itav != NULL
-                && OBJ_obj2nid(itav->infoType) == NID_id_it_implicitConfirm)
+            && OBJ_obj2nid(itav->infoType) == NID_id_it_implicitConfirm)
             return 1;
     }
 
@@ -256,17 +255,17 @@ int ossl_cmp_hdr_set_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr)
         char *tid;
 
         if (!set_random(&ctx->transactionID, ctx,
-                        OSSL_CMP_TRANSACTIONID_LENGTH))
+                OSSL_CMP_TRANSACTIONID_LENGTH))
             return 0;
         tid = i2s_ASN1_OCTET_STRING(NULL, ctx->transactionID);
         if (tid != NULL)
             ossl_cmp_log1(DEBUG, ctx,
-                          "Starting new transaction with ID=%s", tid);
+                "Starting new transaction with ID=%s", tid);
         OPENSSL_free(tid);
     }
 
     return ossl_cmp_asn1_octet_string_set1(&hdr->transactionID,
-                                           ctx->transactionID);
+        ctx->transactionID);
 }
 
 /* fill in all fields of the hdr according to the info given in ctx */
@@ -286,10 +285,9 @@ int ossl_cmp_hdr_init(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr)
      * If no protection cert nor oldCert nor CSR nor subject is given,
      * sender name is not known to the client and thus set to NULL-DN
      */
-    sender = ctx->cert != NULL ? X509_get_subject_name(ctx->cert) :
-        ctx->oldCert != NULL ? X509_get_subject_name(ctx->oldCert) :
-        ctx->p10CSR != NULL ? X509_REQ_get_subject_name(ctx->p10CSR) :
-        ctx->subjectName;
+    sender = ctx->cert != NULL ? X509_get_subject_name(ctx->cert) : ctx->oldCert != NULL ? X509_get_subject_name(ctx->oldCert)
+        : ctx->p10CSR != NULL                                                            ? X509_REQ_get_subject_name(ctx->p10CSR)
+                                                                                         : ctx->subjectName;
     if (!ossl_cmp_hdr_set1_sender(hdr, sender))
         return 0;
 
@@ -312,8 +310,8 @@ int ossl_cmp_hdr_init(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr)
         return 0;
 
     if (ctx->recipNonce != NULL
-            && !ossl_cmp_asn1_octet_string_set1(&hdr->recipNonce,
-                                                ctx->recipNonce))
+        && !ossl_cmp_asn1_octet_string_set1(&hdr->recipNonce,
+            ctx->recipNonce))
         return 0;
 
     if (!ossl_cmp_hdr_set_transactionID(ctx, hdr))
@@ -344,7 +342,7 @@ int ossl_cmp_hdr_init(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr)
      * -- (this field is intended for human consumption)
      */
     if (ctx->freeText != NULL
-            && !ossl_cmp_hdr_push1_freeText(hdr, ctx->freeText))
+        && !ossl_cmp_hdr_push1_freeText(hdr, ctx->freeText))
         return 0;
 
     return 1;
diff --git a/crypto/cmp/cmp_http.c b/crypto/cmp/cmp_http.c
index c0226e562a32e..1e2307211041c 100644
--- a/crypto/cmp/cmp_http.c
+++ b/crypto/cmp/cmp_http.c
@@ -33,11 +33,11 @@ static int keep_alive(int keep_alive, int body_type, BIO **bios)
          * Ask for persistent connection only if may need more round trips.
          * Do so even with disableConfirm because polling might be needed.
          */
-            && body_type != OSSL_CMP_PKIBODY_IR
-            && body_type != OSSL_CMP_PKIBODY_CR
-            && body_type != OSSL_CMP_PKIBODY_P10CR
-            && body_type != OSSL_CMP_PKIBODY_KUR
-            && body_type != OSSL_CMP_PKIBODY_POLLREQ)
+        && body_type != OSSL_CMP_PKIBODY_IR
+        && body_type != OSSL_CMP_PKIBODY_CR
+        && body_type != OSSL_CMP_PKIBODY_P10CR
+        && body_type != OSSL_CMP_PKIBODY_KUR
+        && body_type != OSSL_CMP_PKIBODY_POLLREQ)
         keep_alive = 0;
     return keep_alive;
 }
@@ -46,7 +46,7 @@ static int keep_alive(int keep_alive, int body_type, BIO **bios)
  * Send the PKIMessage req and on success return the response, else NULL.
  */
 OSSL_CMP_MSG *OSSL_CMP_MSG_http_perform(OSSL_CMP_CTX *ctx,
-                                        const OSSL_CMP_MSG *req)
+    const OSSL_CMP_MSG *req)
 {
     char server_port[32] = { '\0' };
     STACK_OF(CONF_VALUE) *headers = NULL;
@@ -71,7 +71,7 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_http_perform(OSSL_CMP_CTX *ctx,
     if (ctx->serverPort != 0)
         BIO_snprintf(server_port, sizeof(server_port), "%d", ctx->serverPort);
     tls_used = ctx->tls_used >= 0 ? ctx->tls_used != 0
-        : OSSL_CMP_CTX_get_http_cb_arg(ctx) != NULL; /* backward compat */
+                                  : OSSL_CMP_CTX_get_http_cb_arg(ctx) != NULL; /* backward compat */
     if (ctx->http_ctx == NULL) { /* using existing connection or yet not set up own connection */
         const char *path = ctx->serverPath;
 
@@ -81,26 +81,26 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_http_perform(OSSL_CMP_CTX *ctx,
             path++;
         if (bios == NULL)
             ossl_cmp_log4(DEBUG, ctx,
-                          "connecting to CMP server via http%s://%s:%s%s/%s",
-                          tls_used ? "s" : "", ctx->server, server_port, path);
+                "connecting to CMP server via http%s://%s:%s/%s",
+                tls_used ? "s" : "", ctx->server, server_port, path);
         else
             ossl_cmp_log3(DEBUG, ctx,
-                          "using existing connection with CMP server %s%s and HTTP path /%s",
-                          ctx->server, server_port, path);
+                "using existing connection with CMP server %s:%s and HTTP path /%s",
+                ctx->server, server_port, path);
     }
 
     rsp = OSSL_HTTP_transfer(&ctx->http_ctx, ctx->server, server_port,
-                             ctx->serverPath, tls_used,
-                             ctx->proxy, ctx->no_proxy,
-                             bios == NULL ? NULL : bios[0] /* bio */,
-                             bios == NULL ? NULL : bios[1] /* rbio */,
-                             ctx->http_cb, OSSL_CMP_CTX_get_http_cb_arg(ctx),
-                             0 /* buf_size */, headers,
-                             content_type_pkix, req_mem,
-                             content_type_pkix, 1 /* expect_asn1 */,
-                             OSSL_HTTP_DEFAULT_MAX_RESP_LEN,
-                             ctx->msg_timeout,
-                             keep_alive(ctx->keep_alive, req->body->type, bios));
+        ctx->serverPath, tls_used,
+        ctx->proxy, ctx->no_proxy,
+        bios == NULL ? NULL : bios[0] /* bio */,
+        bios == NULL ? NULL : bios[1] /* rbio */,
+        ctx->http_cb, OSSL_CMP_CTX_get_http_cb_arg(ctx),
+        0 /* buf_size */, headers,
+        content_type_pkix, req_mem,
+        content_type_pkix, 1 /* expect_asn1 */,
+        OSSL_HTTP_DEFAULT_MAX_RESP_LEN,
+        ctx->msg_timeout,
+        keep_alive(ctx->keep_alive, req->body->type, bios));
     BIO_free(req_mem);
     res = (OSSL_CMP_MSG *)ASN1_item_d2i_bio(it, rsp, NULL);
     BIO_free(rsp);
@@ -116,7 +116,7 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_http_perform(OSSL_CMP_CTX *ctx,
      */
     if (res != NULL)
         ossl_cmp_debug(ctx, "finished reading response from CMP server");
- err:
+err:
     sk_CONF_VALUE_pop_free(headers, X509V3_conf_free);
     return res;
 }
diff --git a/crypto/cmp/cmp_local.h b/crypto/cmp/cmp_local.h
index bbca4e0ac5656..4b98b8cb78ff2 100644
--- a/crypto/cmp/cmp_local.h
+++ b/crypto/cmp/cmp_local.h
@@ -10,22 +10,22 @@
  */
 
 #ifndef OSSL_CRYPTO_CMP_LOCAL_H
-# define OSSL_CRYPTO_CMP_LOCAL_H
+#define OSSL_CRYPTO_CMP_LOCAL_H
 
-# include "internal/cryptlib.h"
+#include "internal/cryptlib.h"
 
-# include <openssl/cmp.h>
-# include <openssl/err.h>
+#include <openssl/cmp.h>
+#include <openssl/err.h>
 
 /* explicit #includes not strictly needed since implied by the above: */
-# include <openssl/crmf.h>
-# include <openssl/types.h>
-# include <openssl/safestack.h>
-# include <openssl/x509.h>
-# include <openssl/x509v3.h>
-# include "crypto/x509.h"
+#include <openssl/crmf.h>
+#include <openssl/types.h>
+#include <openssl/safestack.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include "crypto/x509.h"
 
-# define IS_NULL_DN(name) (X509_NAME_get_entry(name, 0) == NULL)
+#define IS_NULL_DN(name) (X509_NAME_get_entry(name, 0) == NULL)
 
 /*
  * this structure is used to store the context for CMP sessions
@@ -52,10 +52,10 @@ struct ossl_cmp_ctx_st {
     int tls_used; /* whether to use TLS for client-side HTTP connections */
     /* attempts polling for a response if a 'waiting' PKIStatus is received */
     time_t end_time; /* session start time + totaltimeout */
-# ifndef OPENSSL_NO_HTTP
+#ifndef OPENSSL_NO_HTTP
     OSSL_HTTP_bio_cb_t http_cb;
     void *http_cb_arg; /* allows to store optional argument to cb */
-# endif
+#endif
 
     /* server authentication */
     /*
@@ -818,63 +818,63 @@ int ossl_cmp_asn1_get_int(const ASN1_INTEGER *a);
 
 /* from cmp_util.c */
 const char *ossl_cmp_log_parse_metadata(const char *buf,
-                                        OSSL_CMP_severity *level, char **func,
-                                        char **file, int *line);
-# define ossl_cmp_add_error_data(txt) ERR_add_error_txt(" : ", txt)
-# define ossl_cmp_add_error_line(txt) ERR_add_error_txt("\n", txt)
+    OSSL_CMP_severity *level, char **func,
+    char **file, int *line);
+#define ossl_cmp_add_error_data(txt) ERR_add_error_txt(" : ", txt)
+#define ossl_cmp_add_error_line(txt) ERR_add_error_txt("\n", txt)
 /* The two functions manipulating X509_STORE could be generally useful */
 int ossl_cmp_X509_STORE_add1_certs(X509_STORE *store, STACK_OF(X509) *certs,
-                                   int only_self_issued);
+    int only_self_issued);
 STACK_OF(X509) *ossl_cmp_X509_STORE_get1_certs(X509_STORE *store);
 int ossl_cmp_sk_ASN1_UTF8STRING_push_str(STACK_OF(ASN1_UTF8STRING) *sk,
-                                         const char *text, int len);
+    const char *text, int len);
 int ossl_cmp_asn1_octet_string_set1(ASN1_OCTET_STRING **tgt,
-                                    const ASN1_OCTET_STRING *src);
+    const ASN1_OCTET_STRING *src);
 int ossl_cmp_asn1_octet_string_set1_bytes(ASN1_OCTET_STRING **tgt,
-                                          const unsigned char *bytes, int len);
+    const unsigned char *bytes, int len);
 
 /* from cmp_ctx.c */
 int ossl_cmp_print_log(OSSL_CMP_severity level, const OSSL_CMP_CTX *ctx,
-                       const char *func, const char *file, int line,
-                       const char *level_str, const char *format, ...);
-# define ossl_cmp_log(level, ctx, msg) \
+    const char *func, const char *file, int line,
+    const char *level_str, const char *format, ...);
+#define ossl_cmp_log(level, ctx, msg)                                         \
     ossl_cmp_print_log(OSSL_CMP_LOG_##level, ctx, OPENSSL_FUNC, OPENSSL_FILE, \
-                       OPENSSL_LINE, #level, "%s", msg)
-# define ossl_cmp_log1(level, ctx, fmt, arg1) \
+        OPENSSL_LINE, #level, "%s", msg)
+#define ossl_cmp_log1(level, ctx, fmt, arg1)                                  \
     ossl_cmp_print_log(OSSL_CMP_LOG_##level, ctx, OPENSSL_FUNC, OPENSSL_FILE, \
-                       OPENSSL_LINE, #level, fmt, arg1)
-# define ossl_cmp_log2(level, ctx, fmt, arg1, arg2) \
+        OPENSSL_LINE, #level, fmt, arg1)
+#define ossl_cmp_log2(level, ctx, fmt, arg1, arg2)                            \
     ossl_cmp_print_log(OSSL_CMP_LOG_##level, ctx, OPENSSL_FUNC, OPENSSL_FILE, \
-                       OPENSSL_LINE, #level, fmt, arg1, arg2)
-# define ossl_cmp_log3(level, ctx, fmt, arg1, arg2, arg3) \
+        OPENSSL_LINE, #level, fmt, arg1, arg2)
+#define ossl_cmp_log3(level, ctx, fmt, arg1, arg2, arg3)                      \
     ossl_cmp_print_log(OSSL_CMP_LOG_##level, ctx, OPENSSL_FUNC, OPENSSL_FILE, \
-                       OPENSSL_LINE, #level, fmt, arg1, arg2, arg3)
-# define ossl_cmp_log4(level, ctx, fmt, arg1, arg2, arg3, arg4)         \
+        OPENSSL_LINE, #level, fmt, arg1, arg2, arg3)
+#define ossl_cmp_log4(level, ctx, fmt, arg1, arg2, arg3, arg4)                \
     ossl_cmp_print_log(OSSL_CMP_LOG_##level, ctx, OPENSSL_FUNC, OPENSSL_FILE, \
-                       OPENSSL_LINE, #level, fmt, arg1, arg2, arg3, arg4)
-# define OSSL_CMP_LOG_ERROR OSSL_CMP_LOG_ERR
-# define OSSL_CMP_LOG_WARN OSSL_CMP_LOG_WARNING
-# define ossl_cmp_alert(ctx, msg) ossl_cmp_log(ALERT, ctx, msg)
-# define ossl_cmp_err(ctx, msg)   ossl_cmp_log(ERROR, ctx, msg)
-# define ossl_cmp_warn(ctx, msg)  ossl_cmp_log(WARN,  ctx, msg)
-# define ossl_cmp_info(ctx, msg)  ossl_cmp_log(INFO,  ctx, msg)
-# define ossl_cmp_debug(ctx, msg) ossl_cmp_log(DEBUG, ctx, msg)
-# define ossl_cmp_trace(ctx, msg) ossl_cmp_log(TRACE, ctx, msg)
+        OPENSSL_LINE, #level, fmt, arg1, arg2, arg3, arg4)
+#define OSSL_CMP_LOG_ERROR OSSL_CMP_LOG_ERR
+#define OSSL_CMP_LOG_WARN OSSL_CMP_LOG_WARNING
+#define ossl_cmp_alert(ctx, msg) ossl_cmp_log(ALERT, ctx, msg)
+#define ossl_cmp_err(ctx, msg) ossl_cmp_log(ERROR, ctx, msg)
+#define ossl_cmp_warn(ctx, msg) ossl_cmp_log(WARN, ctx, msg)
+#define ossl_cmp_info(ctx, msg) ossl_cmp_log(INFO, ctx, msg)
+#define ossl_cmp_debug(ctx, msg) ossl_cmp_log(DEBUG, ctx, msg)
+#define ossl_cmp_trace(ctx, msg) ossl_cmp_log(TRACE, ctx, msg)
 int ossl_cmp_ctx_set1_validatedSrvCert(OSSL_CMP_CTX *ctx, X509 *cert);
 int ossl_cmp_ctx_set_status(OSSL_CMP_CTX *ctx, int status);
 int ossl_cmp_ctx_set0_statusString(OSSL_CMP_CTX *ctx,
-                                   OSSL_CMP_PKIFREETEXT *text);
+    OSSL_CMP_PKIFREETEXT *text);
 int ossl_cmp_ctx_set_failInfoCode(OSSL_CMP_CTX *ctx, int fail_info);
 int ossl_cmp_ctx_set0_newCert(OSSL_CMP_CTX *ctx, X509 *cert);
 int ossl_cmp_ctx_set1_newChain(OSSL_CMP_CTX *ctx, STACK_OF(X509) *newChain);
 int ossl_cmp_ctx_set1_caPubs(OSSL_CMP_CTX *ctx, STACK_OF(X509) *caPubs);
 int ossl_cmp_ctx_set1_extraCertsIn(OSSL_CMP_CTX *ctx,
-                                   STACK_OF(X509) *extraCertsIn);
+    STACK_OF(X509) *extraCertsIn);
 int ossl_cmp_ctx_set1_recipNonce(OSSL_CMP_CTX *ctx,
-                                 const ASN1_OCTET_STRING *nonce);
+    const ASN1_OCTET_STRING *nonce);
 EVP_PKEY *ossl_cmp_ctx_get0_newPubkey(const OSSL_CMP_CTX *ctx);
 int ossl_cmp_ctx_set1_first_senderNonce(OSSL_CMP_CTX *ctx,
-                                        const ASN1_OCTET_STRING *nonce);
+    const ASN1_OCTET_STRING *nonce);
 
 /* from cmp_status.c */
 int ossl_cmp_pkisi_get_status(const OSSL_CMP_PKISI *si);
@@ -893,104 +893,104 @@ int ossl_cmp_hdr_set1_sender(OSSL_CMP_PKIHEADER *hdr, const X509_NAME *nm);
 int ossl_cmp_hdr_set1_recipient(OSSL_CMP_PKIHEADER *hdr, const X509_NAME *nm);
 int ossl_cmp_hdr_update_messageTime(OSSL_CMP_PKIHEADER *hdr);
 int ossl_cmp_hdr_set1_senderKID(OSSL_CMP_PKIHEADER *hdr,
-                                const ASN1_OCTET_STRING *senderKID);
+    const ASN1_OCTET_STRING *senderKID);
 int ossl_cmp_hdr_push0_freeText(OSSL_CMP_PKIHEADER *hdr, ASN1_UTF8STRING *text);
 int ossl_cmp_hdr_push1_freeText(OSSL_CMP_PKIHEADER *hdr, ASN1_UTF8STRING *text);
 int ossl_cmp_hdr_generalInfo_push0_item(OSSL_CMP_PKIHEADER *hdr,
-                                        OSSL_CMP_ITAV *itav);
+    OSSL_CMP_ITAV *itav);
 int ossl_cmp_hdr_generalInfo_push1_items(OSSL_CMP_PKIHEADER *hdr,
-                                         const STACK_OF(OSSL_CMP_ITAV) *itavs);
+    const STACK_OF(OSSL_CMP_ITAV) *itavs);
 int ossl_cmp_hdr_set_implicitConfirm(OSSL_CMP_PKIHEADER *hdr);
 int ossl_cmp_hdr_has_implicitConfirm(const OSSL_CMP_PKIHEADER *hdr);
-# define OSSL_CMP_TRANSACTIONID_LENGTH 16
-# define OSSL_CMP_SENDERNONCE_LENGTH 16
+#define OSSL_CMP_TRANSACTIONID_LENGTH 16
+#define OSSL_CMP_SENDERNONCE_LENGTH 16
 int ossl_cmp_hdr_set_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr);
 int ossl_cmp_hdr_init(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr);
 
 /* from cmp_msg.c */
 /* OSSL_CMP_MSG bodytype ASN.1 choice IDs */
-# define OSSL_CMP_PKIBODY_IR        0
-# define OSSL_CMP_PKIBODY_IP        1
-# define OSSL_CMP_PKIBODY_CR        2
-# define OSSL_CMP_PKIBODY_CP        3
-# define OSSL_CMP_PKIBODY_P10CR     4
-# define OSSL_CMP_PKIBODY_POPDECC   5
-# define OSSL_CMP_PKIBODY_POPDECR   6
-# define OSSL_CMP_PKIBODY_KUR       7
-# define OSSL_CMP_PKIBODY_KUP       8
-# define OSSL_CMP_PKIBODY_KRR       9
-# define OSSL_CMP_PKIBODY_KRP      10
-# define OSSL_CMP_PKIBODY_RR       11
-# define OSSL_CMP_PKIBODY_RP       12
-# define OSSL_CMP_PKIBODY_CCR      13
-# define OSSL_CMP_PKIBODY_CCP      14
-# define OSSL_CMP_PKIBODY_CKUANN   15
-# define OSSL_CMP_PKIBODY_CANN     16
-# define OSSL_CMP_PKIBODY_RANN     17
-# define OSSL_CMP_PKIBODY_CRLANN   18
-# define OSSL_CMP_PKIBODY_PKICONF  19
-# define OSSL_CMP_PKIBODY_NESTED   20
-# define OSSL_CMP_PKIBODY_GENM     21
-# define OSSL_CMP_PKIBODY_GENP     22
-# define OSSL_CMP_PKIBODY_ERROR    23
-# define OSSL_CMP_PKIBODY_CERTCONF 24
-# define OSSL_CMP_PKIBODY_POLLREQ  25
-# define OSSL_CMP_PKIBODY_POLLREP  26
-# define OSSL_CMP_PKIBODY_TYPE_MAX OSSL_CMP_PKIBODY_POLLREP
+#define OSSL_CMP_PKIBODY_IR 0
+#define OSSL_CMP_PKIBODY_IP 1
+#define OSSL_CMP_PKIBODY_CR 2
+#define OSSL_CMP_PKIBODY_CP 3
+#define OSSL_CMP_PKIBODY_P10CR 4
+#define OSSL_CMP_PKIBODY_POPDECC 5
+#define OSSL_CMP_PKIBODY_POPDECR 6
+#define OSSL_CMP_PKIBODY_KUR 7
+#define OSSL_CMP_PKIBODY_KUP 8
+#define OSSL_CMP_PKIBODY_KRR 9
+#define OSSL_CMP_PKIBODY_KRP 10
+#define OSSL_CMP_PKIBODY_RR 11
+#define OSSL_CMP_PKIBODY_RP 12
+#define OSSL_CMP_PKIBODY_CCR 13
+#define OSSL_CMP_PKIBODY_CCP 14
+#define OSSL_CMP_PKIBODY_CKUANN 15
+#define OSSL_CMP_PKIBODY_CANN 16
+#define OSSL_CMP_PKIBODY_RANN 17
+#define OSSL_CMP_PKIBODY_CRLANN 18
+#define OSSL_CMP_PKIBODY_PKICONF 19
+#define OSSL_CMP_PKIBODY_NESTED 20
+#define OSSL_CMP_PKIBODY_GENM 21
+#define OSSL_CMP_PKIBODY_GENP 22
+#define OSSL_CMP_PKIBODY_ERROR 23
+#define OSSL_CMP_PKIBODY_CERTCONF 24
+#define OSSL_CMP_PKIBODY_POLLREQ 25
+#define OSSL_CMP_PKIBODY_POLLREP 26
+#define OSSL_CMP_PKIBODY_TYPE_MAX OSSL_CMP_PKIBODY_POLLREP
 /* certReqId for the first - and so far only - certificate request */
-# define OSSL_CMP_CERTREQID         0
-# define OSSL_CMP_CERTREQID_NONE    -1
-# define OSSL_CMP_CERTREQID_INVALID -2
+#define OSSL_CMP_CERTREQID 0
+#define OSSL_CMP_CERTREQID_NONE -1
+#define OSSL_CMP_CERTREQID_INVALID -2
 /* sequence id for the first - and so far only - revocation request */
-# define OSSL_CMP_REVREQSID 0
+#define OSSL_CMP_REVREQSID 0
 int ossl_cmp_msg_set0_libctx(OSSL_CMP_MSG *msg, OSSL_LIB_CTX *libctx,
-                             const char *propq);
+    const char *propq);
 const char *ossl_cmp_bodytype_to_string(int type);
 int ossl_cmp_msg_set_bodytype(OSSL_CMP_MSG *msg, int type);
 OSSL_CMP_MSG *ossl_cmp_msg_create(OSSL_CMP_CTX *ctx, int bodytype);
 OSSL_CMP_MSG *ossl_cmp_certreq_new(OSSL_CMP_CTX *ctx, int bodytype,
-                                   const OSSL_CRMF_MSG *crm);
+    const OSSL_CRMF_MSG *crm);
 OSSL_CMP_MSG *ossl_cmp_certrep_new(OSSL_CMP_CTX *ctx, int bodytype,
-                                   int certReqId, const OSSL_CMP_PKISI *si,
-                                   X509 *cert, const EVP_PKEY *pkey,
-                                   const X509 *encryption_recip,
-                                   STACK_OF(X509) *chain, STACK_OF(X509) *caPubs,
-                                   int unprotectedErrors);
+    int certReqId, const OSSL_CMP_PKISI *si,
+    X509 *cert, const EVP_PKEY *pkey,
+    const X509 *encryption_recip,
+    STACK_OF(X509) *chain, STACK_OF(X509) *caPubs,
+    int unprotectedErrors);
 OSSL_CMP_MSG *ossl_cmp_rr_new(OSSL_CMP_CTX *ctx);
 OSSL_CMP_MSG *ossl_cmp_rp_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
-                              const OSSL_CRMF_CERTID *cid,
-                              int unprotectedErrors);
+    const OSSL_CRMF_CERTID *cid,
+    int unprotectedErrors);
 OSSL_CMP_MSG *ossl_cmp_pkiconf_new(OSSL_CMP_CTX *ctx);
 OSSL_CMP_MSG *ossl_cmp_pollRep_new(OSSL_CMP_CTX *ctx, int crid,
-                                   int64_t poll_after);
+    int64_t poll_after);
 int ossl_cmp_msg_gen_push0_ITAV(OSSL_CMP_MSG *msg, OSSL_CMP_ITAV *itav);
 int ossl_cmp_msg_gen_push1_ITAVs(OSSL_CMP_MSG *msg,
-                                 const STACK_OF(OSSL_CMP_ITAV) *itavs);
+    const STACK_OF(OSSL_CMP_ITAV) *itavs);
 OSSL_CMP_MSG *ossl_cmp_genm_new(OSSL_CMP_CTX *ctx);
 OSSL_CMP_MSG *ossl_cmp_genp_new(OSSL_CMP_CTX *ctx,
-                                const STACK_OF(OSSL_CMP_ITAV) *itavs);
+    const STACK_OF(OSSL_CMP_ITAV) *itavs);
 OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
-                                 int64_t errorCode, const char *details,
-                                 int unprotected);
+    int64_t errorCode, const char *details,
+    int unprotected);
 int ossl_cmp_certstatus_set0_certHash(OSSL_CMP_CERTSTATUS *certStatus,
-                                      ASN1_OCTET_STRING *hash);
+    ASN1_OCTET_STRING *hash);
 OSSL_CMP_MSG *ossl_cmp_certConf_new(OSSL_CMP_CTX *ctx, int certReqId,
-                                    int fail_info, const char *text);
+    int fail_info, const char *text);
 OSSL_CMP_MSG *ossl_cmp_pollReq_new(OSSL_CMP_CTX *ctx, int crid);
 OSSL_CMP_MSG *ossl_cmp_pollRep_new(OSSL_CMP_CTX *ctx, int crid,
-                                   int64_t poll_after);
+    int64_t poll_after);
 OSSL_CMP_PKISI *
 ossl_cmp_revrepcontent_get_pkisi(OSSL_CMP_REVREPCONTENT *rrep, int rsid);
 OSSL_CRMF_CERTID *ossl_cmp_revrepcontent_get_CertId(OSSL_CMP_REVREPCONTENT *rc,
-                                                    int rsid);
+    int rsid);
 OSSL_CMP_POLLREP *
 ossl_cmp_pollrepcontent_get0_pollrep(const OSSL_CMP_POLLREPCONTENT *prc,
-                                     int rid);
+    int rid);
 OSSL_CMP_CERTRESPONSE *
 ossl_cmp_certrepmessage_get0_certresponse(const OSSL_CMP_CERTREPMESSAGE *crm,
-                                          int rid);
+    int rid);
 X509 *ossl_cmp_certresponse_get1_cert(const OSSL_CMP_CTX *ctx,
-                                      const OSSL_CMP_CERTRESPONSE *crep);
+    const OSSL_CMP_CERTRESPONSE *crep);
 OSSL_CMP_MSG *ossl_cmp_msg_load(const char *file);
 int ossl_cmp_is_error_with_waiting(const OSSL_CMP_MSG *msg);
 
@@ -998,26 +998,26 @@ int ossl_cmp_is_error_with_waiting(const OSSL_CMP_MSG *msg);
 void ossl_cmp_set_own_chain(OSSL_CMP_CTX *ctx);
 int ossl_cmp_msg_add_extraCerts(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
 ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_CTX *ctx,
-                                          const OSSL_CMP_MSG *msg);
+    const OSSL_CMP_MSG *msg);
 int ossl_cmp_msg_protect(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
 
 /* from cmp_vfy.c */
 typedef int (*ossl_cmp_allow_unprotected_cb_t)(const OSSL_CMP_CTX *ctx,
-                                               const OSSL_CMP_MSG *msg,
-                                               int invalid_protection, int arg);
+    const OSSL_CMP_MSG *msg,
+    int invalid_protection, int arg);
 int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
-                              ossl_cmp_allow_unprotected_cb_t cb, int cb_arg);
+    ossl_cmp_allow_unprotected_cb_t cb, int cb_arg);
 int ossl_cmp_msg_check_received(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
-                                ossl_cmp_allow_unprotected_cb_t cb, int cb_arg);
+    ossl_cmp_allow_unprotected_cb_t cb, int cb_arg);
 int ossl_cmp_verify_popo(const OSSL_CMP_CTX *ctx,
-                         const OSSL_CMP_MSG *msg, int accept_RAVerified);
+    const OSSL_CMP_MSG *msg, int accept_RAVerified);
 
 /* from cmp_client.c */
 /* expected max time per msg round trip, used for last try during polling: */
-# define OSSL_CMP_EXPECTED_RESP_TIME 2
+#define OSSL_CMP_EXPECTED_RESP_TIME 2
 int ossl_cmp_exchange_certConf(OSSL_CMP_CTX *ctx, int certReqId,
-                               int fail_info, const char *txt);
+    int fail_info, const char *txt);
 int ossl_cmp_exchange_error(OSSL_CMP_CTX *ctx, int status, int fail_info,
-                            const char *txt, int errorCode, const char *detail);
+    const char *txt, int errorCode, const char *detail);
 
 #endif /* !defined(OSSL_CRYPTO_CMP_LOCAL_H) */
diff --git a/crypto/cmp/cmp_msg.c b/crypto/cmp/cmp_msg.c
index 055f14c8f861a..0a501cf783b83 100644
--- a/crypto/cmp/cmp_msg.c
+++ b/crypto/cmp/cmp_msg.c
@@ -28,7 +28,7 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_new(OSSL_LIB_CTX *libctx, const char *propq)
     OSSL_CMP_MSG *msg = NULL;
 
     msg = (OSSL_CMP_MSG *)ASN1_item_new_ex(ASN1_ITEM_rptr(OSSL_CMP_MSG),
-                                           libctx, propq);
+        libctx, propq);
     if (!ossl_cmp_msg_set0_libctx(msg, libctx, propq)) {
         OSSL_CMP_MSG_free(msg);
         msg = NULL;
@@ -47,7 +47,7 @@ void OSSL_CMP_MSG_free(OSSL_CMP_MSG *msg)
  * Use OSSL_CMP_MSG_new() instead if possible.
  */
 int ossl_cmp_msg_set0_libctx(OSSL_CMP_MSG *msg, OSSL_LIB_CTX *libctx,
-                             const char *propq)
+    const char *propq)
 {
     if (msg != NULL) {
         msg->libctx = libctx;
@@ -74,11 +74,33 @@ OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg)
 const char *ossl_cmp_bodytype_to_string(int type)
 {
     static const char *type_names[] = {
-        "IR", "IP", "CR", "CP", "P10CR",
-        "POPDECC", "POPDECR", "KUR", "KUP",
-        "KRR", "KRP", "RR", "RP", "CCR", "CCP",
-        "CKUANN", "CANN", "RANN", "CRLANN", "PKICONF", "NESTED",
-        "GENM", "GENP", "ERROR", "CERTCONF", "POLLREQ", "POLLREP",
+        "IR",
+        "IP",
+        "CR",
+        "CP",
+        "P10CR",
+        "POPDECC",
+        "POPDECR",
+        "KUR",
+        "KUP",
+        "KRR",
+        "KRP",
+        "RR",
+        "RP",
+        "CCR",
+        "CCP",
+        "CKUANN",
+        "CANN",
+        "RANN",
+        "CRLANN",
+        "PKICONF",
+        "NESTED",
+        "GENM",
+        "GENP",
+        "ERROR",
+        "CERTCONF",
+        "POLLREQ",
+        "POLLREP",
     };
 
     if (type < 0 || type > OSSL_CMP_PKIBODY_TYPE_MAX)
@@ -170,11 +192,11 @@ OSSL_CMP_MSG *ossl_cmp_msg_create(OSSL_CMP_CTX *ctx, int bodytype)
     if ((msg = OSSL_CMP_MSG_new(ctx->libctx, ctx->propq)) == NULL)
         return NULL;
     if (!ossl_cmp_hdr_init(ctx, msg->header)
-            || !ossl_cmp_msg_set_bodytype(msg, bodytype))
+        || !ossl_cmp_msg_set_bodytype(msg, bodytype))
         goto err;
     if (ctx->geninfo_ITAVs != NULL
-            && !ossl_cmp_hdr_generalInfo_push1_items(msg->header,
-                                                     ctx->geninfo_ITAVs))
+        && !ossl_cmp_hdr_generalInfo_push1_items(msg->header,
+            ctx->geninfo_ITAVs))
         goto err;
 
     switch (bodytype) {
@@ -211,8 +233,7 @@ OSSL_CMP_MSG *ossl_cmp_msg_create(OSSL_CMP_CTX *ctx, int bodytype)
         return msg;
 
     case OSSL_CMP_PKIBODY_CERTCONF:
-        if ((msg->body->value.certConf =
-             sk_OSSL_CMP_CERTSTATUS_new_null()) == NULL)
+        if ((msg->body->value.certConf = sk_OSSL_CMP_CERTSTATUS_new_null()) == NULL)
             goto err;
         return msg;
     case OSSL_CMP_PKIBODY_PKICONF:
@@ -246,17 +267,17 @@ OSSL_CMP_MSG *ossl_cmp_msg_create(OSSL_CMP_CTX *ctx, int bodytype)
         goto err;
     }
 
- err:
+err:
     OSSL_CMP_MSG_free(msg);
     return NULL;
 }
 
-#define HAS_SAN(ctx) \
+#define HAS_SAN(ctx)                                 \
     (sk_GENERAL_NAME_num((ctx)->subjectAltNames) > 0 \
-         || OSSL_CMP_CTX_reqExtensions_have_SAN(ctx) == 1)
+        || OSSL_CMP_CTX_reqExtensions_have_SAN(ctx) == 1)
 
 static const X509_NAME *determine_subj(OSSL_CMP_CTX *ctx, int for_KUR,
-                                       const X509_NAME *ref_subj)
+    const X509_NAME *ref_subj)
 {
     if (ctx->subjectName != NULL)
         return IS_NULL_DN(ctx->subjectName) ? NULL : ctx->subjectName;
@@ -280,8 +301,7 @@ OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid)
     /* refcert defaults to current client cert */
     EVP_PKEY *rkey = ossl_cmp_ctx_get0_newPubkey(ctx);
     STACK_OF(GENERAL_NAME) *default_sans = NULL;
-    const X509_NAME *ref_subj =
-        refcert != NULL ? X509_get_subject_name(refcert) : NULL;
+    const X509_NAME *ref_subj = refcert != NULL ? X509_get_subject_name(refcert) : NULL;
     const X509_NAME *subject = determine_subj(ctx, for_KUR, ref_subj);
     const X509_NAME *issuer = ctx->issuer != NULL || refcert == NULL
         ? (IS_NULL_DN(ctx->issuer) ? NULL : ctx->issuer)
@@ -305,17 +325,17 @@ OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid)
         return NULL;
     tmpl = OSSL_CRMF_MSG_get0_tmpl(crm);
     if (!OSSL_CRMF_MSG_set_certReqId(crm, rid)
-            /*
-             * fill certTemplate, corresponding to CertificationRequestInfo
-             * of PKCS#10. The rkey param cannot be NULL so far -
-             * it could be NULL if centralized key creation was supported
-             */
-            || !OSSL_CRMF_CERTTEMPLATE_fill(OSSL_CRMF_MSG_get0_tmpl(crm), rkey,
-                                            subject, issuer, NULL /* serial */))
+        /*
+         * fill certTemplate, corresponding to CertificationRequestInfo
+         * of PKCS#10. The rkey param cannot be NULL so far -
+         * it could be NULL if centralized key creation was supported
+         */
+        || !OSSL_CRMF_CERTTEMPLATE_fill(OSSL_CRMF_MSG_get0_tmpl(crm), rkey,
+            subject, issuer, NULL /* serial */))
         goto err;
     if (rkey != NULL && central_keygen)
         X509_PUBKEY_set0_public_key(OSSL_CRMF_CERTTEMPLATE_get0_publicKey(tmpl),
-                                    NULL, 0);
+            NULL, 0);
 
     if (ctx->days != 0) {
         time_t now = time(NULL);
@@ -323,8 +343,8 @@ OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid)
         ASN1_TIME *notAfter = ASN1_TIME_adj(NULL, now, ctx->days, 0);
 
         if (notBefore == NULL
-                || notAfter == NULL
-                || !OSSL_CRMF_MSG_set0_validity(crm, notBefore, notAfter)) {
+            || notAfter == NULL
+            || !OSSL_CRMF_MSG_set0_validity(crm, notBefore, notAfter)) {
             ASN1_TIME_free(notBefore);
             ASN1_TIME_free(notAfter);
             goto err;
@@ -333,24 +353,24 @@ OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid)
 
     /* extensions */
     if (ctx->p10CSR != NULL
-            && (exts = X509_REQ_get_extensions(ctx->p10CSR)) == NULL)
+        && (exts = X509_REQ_get_extensions(ctx->p10CSR)) == NULL)
         goto err;
     if (!ctx->SubjectAltName_nodefault && !HAS_SAN(ctx) && refcert != NULL
         && (default_sans = X509V3_get_d2i(X509_get0_extensions(refcert),
-                                          NID_subject_alt_name, NULL, NULL))
-        != NULL
-            && !add1_extension(&exts, NID_subject_alt_name, crit, default_sans))
+                NID_subject_alt_name, NULL, NULL))
+            != NULL
+        && !add1_extension(&exts, NID_subject_alt_name, crit, default_sans))
         goto err;
     if (sk_X509_EXTENSION_num(ctx->reqExtensions) > 0 /* augment/override existing ones */
-            && X509v3_add_extensions(&exts, ctx->reqExtensions) == NULL)
+        && X509v3_add_extensions(&exts, ctx->reqExtensions) == NULL)
         goto err;
     if (sk_GENERAL_NAME_num(ctx->subjectAltNames) > 0
-            && !add1_extension(&exts, NID_subject_alt_name,
-                               crit, ctx->subjectAltNames))
+        && !add1_extension(&exts, NID_subject_alt_name,
+            crit, ctx->subjectAltNames))
         goto err;
     if (ctx->policies != NULL
-            && !add1_extension(&exts, NID_certificate_policies,
-                               ctx->setPoliciesCritical, ctx->policies))
+        && !add1_extension(&exts, NID_certificate_policies,
+            ctx->setPoliciesCritical, ctx->policies))
         goto err;
     if (!OSSL_CRMF_MSG_set0_extensions(crm, exts))
         goto err;
@@ -359,9 +379,8 @@ OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid)
 
     /* for KUR, set OldCertId according to D.6 */
     if (for_KUR && refcert != NULL) {
-        OSSL_CRMF_CERTID *cid =
-            OSSL_CRMF_CERTID_gen(X509_get_issuer_name(refcert),
-                                 X509_get0_serialNumber(refcert));
+        OSSL_CRMF_CERTID *cid = OSSL_CRMF_CERTID_gen(X509_get_issuer_name(refcert),
+            X509_get0_serialNumber(refcert));
         int ret;
 
         if (cid == NULL)
@@ -374,18 +393,18 @@ OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid)
 
     goto end;
 
- err:
+err:
     OSSL_CRMF_MSG_free(crm);
     crm = NULL;
 
- end:
+end:
     sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
     sk_GENERAL_NAME_pop_free(default_sans, GENERAL_NAME_free);
     return crm;
 }
 
 OSSL_CMP_MSG *ossl_cmp_certreq_new(OSSL_CMP_CTX *ctx, int type,
-                                   const OSSL_CRMF_MSG *crm)
+    const OSSL_CRMF_MSG *crm)
 {
     OSSL_CMP_MSG *msg;
     OSSL_CRMF_MSG *local_crm = NULL;
@@ -394,7 +413,7 @@ OSSL_CMP_MSG *ossl_cmp_certreq_new(OSSL_CMP_CTX *ctx, int type,
         return NULL;
 
     if (type != OSSL_CMP_PKIBODY_IR && type != OSSL_CMP_PKIBODY_CR
-            && type != OSSL_CMP_PKIBODY_KUR && type != OSSL_CMP_PKIBODY_P10CR) {
+        && type != OSSL_CMP_PKIBODY_KUR && type != OSSL_CMP_PKIBODY_P10CR) {
         ERR_raise(ERR_LIB_CMP, CMP_R_INVALID_ARGS);
         return NULL;
     }
@@ -422,12 +441,12 @@ OSSL_CMP_MSG *ossl_cmp_certreq_new(OSSL_CMP_CTX *ctx, int type,
         }
         if (crm == NULL) {
             local_crm = OSSL_CMP_CTX_setup_CRM(ctx,
-                                               type == OSSL_CMP_PKIBODY_KUR,
-                                               OSSL_CMP_CERTREQID);
+                type == OSSL_CMP_PKIBODY_KUR,
+                OSSL_CMP_CERTREQID);
             if (local_crm == NULL
                 || !OSSL_CRMF_MSG_create_popo(ctx->popoMethod, local_crm,
-                                              privkey, ctx->digest,
-                                              ctx->libctx, ctx->propq))
+                    privkey, ctx->digest,
+                    ctx->libctx, ctx->propq))
                 goto err;
         } else {
             if ((local_crm = OSSL_CRMF_MSG_dup(crm)) == NULL)
@@ -445,7 +464,7 @@ OSSL_CMP_MSG *ossl_cmp_certreq_new(OSSL_CMP_CTX *ctx, int type,
 
     return msg;
 
- err:
+err:
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_CERTREQ);
     OSSL_CRMF_MSG_free(local_crm);
     OSSL_CMP_MSG_free(msg);
@@ -472,14 +491,14 @@ static OSSL_CRMF_ENCRYPTEDKEY *enc_privkey(OSSL_CMP_CTX *ctx, const EVP_PKEY *pk
     ossl_cmp_set_own_chain(ctx);
     cipher = EVP_CIPHER_fetch(ctx->libctx, SN_aes_256_cbc, ctx->propq);
     envData = ossl_cms_sign_encrypt(privbio, ctx->cert, ctx->chain, ctx->pkey, CMS_BINARY,
-                                    encryption_recips, cipher, CMS_BINARY,
-                                    ctx->libctx, ctx->propq);
+        encryption_recips, cipher, CMS_BINARY,
+        ctx->libctx, ctx->propq);
     EVP_CIPHER_free(cipher);
     if (envData == NULL)
         goto err;
     ek = OSSL_CRMF_ENCRYPTEDKEY_init_envdata(envData);
 
- err:
+err:
     sk_X509_pop_free(encryption_recips, X509_free);
     BIO_free(privbio);
     if (ek == NULL)
@@ -490,11 +509,11 @@ static OSSL_CRMF_ENCRYPTEDKEY *enc_privkey(OSSL_CMP_CTX *ctx, const EVP_PKEY *pk
 #endif
 
 OSSL_CMP_MSG *ossl_cmp_certrep_new(OSSL_CMP_CTX *ctx, int bodytype,
-                                   int certReqId, const OSSL_CMP_PKISI *si,
-                                   X509 *cert, const EVP_PKEY *pkey,
-                                   const X509 *encryption_recip,
-                                   STACK_OF(X509) *chain, STACK_OF(X509) *caPubs,
-                                   int unprotectedErrors)
+    int certReqId, const OSSL_CMP_PKISI *si,
+    X509 *cert, const EVP_PKEY *pkey,
+    const X509 *encryption_recip,
+    STACK_OF(X509) *chain, STACK_OF(X509) *caPubs,
+    int unprotectedErrors)
 {
     OSSL_CMP_MSG *msg = NULL;
     OSSL_CMP_CERTREPMESSAGE *repMsg = NULL;
@@ -517,12 +536,12 @@ OSSL_CMP_MSG *ossl_cmp_certrep_new(OSSL_CMP_CTX *ctx, int bodytype,
         goto err;
     OSSL_CMP_PKISI_free(resp->status);
     if ((resp->status = OSSL_CMP_PKISI_dup(si)) == NULL
-            || !ASN1_INTEGER_set(resp->certReqId, certReqId))
+        || !ASN1_INTEGER_set(resp->certReqId, certReqId))
         goto err;
 
     status = ossl_cmp_pkisi_get_status(resp->status);
     if (status != OSSL_CMP_PKISTATUS_rejection
-            && status != OSSL_CMP_PKISTATUS_waiting && cert != NULL) {
+        && status != OSSL_CMP_PKISTATUS_waiting && cert != NULL) {
         if (encryption_recip != NULL) {
             ERR_raise(ERR_LIB_CMP, ERR_R_UNSUPPORTED);
             goto err;
@@ -531,8 +550,7 @@ OSSL_CMP_MSG *ossl_cmp_certrep_new(OSSL_CMP_CTX *ctx, int bodytype,
         if ((resp->certifiedKeyPair = OSSL_CMP_CERTIFIEDKEYPAIR_new())
             == NULL)
             goto err;
-        resp->certifiedKeyPair->certOrEncCert->type =
-            OSSL_CMP_CERTORENCCERT_CERTIFICATE;
+        resp->certifiedKeyPair->certOrEncCert->type = OSSL_CMP_CERTORENCCERT_CERTIFICATE;
         if (!X509_up_ref(cert))
             goto err;
         resp->certifiedKeyPair->certOrEncCert->value.certificate = cert;
@@ -553,21 +571,21 @@ OSSL_CMP_MSG *ossl_cmp_certrep_new(OSSL_CMP_CTX *ctx, int bodytype,
     resp = NULL;
 
     if (bodytype == OSSL_CMP_PKIBODY_IP && caPubs != NULL
-            && (repMsg->caPubs = X509_chain_up_ref(caPubs)) == NULL)
+        && (repMsg->caPubs = X509_chain_up_ref(caPubs)) == NULL)
         goto err;
     if (sk_X509_num(chain) > 0
         && !ossl_x509_add_certs_new(&msg->extraCerts, chain,
-                                    X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
+            X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
         goto err;
 
     if (!unprotectedErrors
-            || ossl_cmp_pkisi_get_status(si) != OSSL_CMP_PKISTATUS_rejection)
+        || ossl_cmp_pkisi_get_status(si) != OSSL_CMP_PKISTATUS_rejection)
         if (!ossl_cmp_msg_protect(ctx, msg))
             goto err;
 
     return msg;
 
- err:
+err:
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_CERTREP);
     OSSL_CMP_CERTRESPONSE_free(resp);
     OSSL_CMP_MSG_free(msg);
@@ -585,8 +603,8 @@ OSSL_CMP_MSG *ossl_cmp_rr_new(OSSL_CMP_CTX *ctx)
     int ret;
 
     if (!ossl_assert(ctx != NULL
-                     && (ctx->oldCert != NULL || ctx->p10CSR != NULL
-                         || (ctx->serialNumber != NULL && ctx->issuer != NULL))))
+            && (ctx->oldCert != NULL || ctx->p10CSR != NULL
+                || (ctx->serialNumber != NULL && ctx->issuer != NULL))))
         return NULL;
 
     if ((rd = OSSL_CMP_REVDETAILS_new()) == NULL)
@@ -607,14 +625,14 @@ OSSL_CMP_MSG *ossl_cmp_rr_new(OSSL_CMP_CTX *ctx)
 
     /* Fill the template from the contents of the certificate to be revoked */
     ret = OSSL_CRMF_CERTTEMPLATE_fill(rd->certDetails, pubkey, subject,
-                                      issuer, serialNumber);
+        issuer, serialNumber);
     if (!ret)
         goto err;
 
     /* revocation reason code is optional */
     if (ctx->revocationReason != CRL_REASON_NONE
-            && !add_crl_reason_extension(&rd->crlEntryDetails,
-                                         ctx->revocationReason))
+        && !add_crl_reason_extension(&rd->crlEntryDetails,
+            ctx->revocationReason))
         goto err;
 
     if ((msg = ossl_cmp_msg_create(ctx, OSSL_CMP_PKIBODY_RR)) == NULL)
@@ -630,7 +648,7 @@ OSSL_CMP_MSG *ossl_cmp_rr_new(OSSL_CMP_CTX *ctx)
 
     return msg;
 
- err:
+err:
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_RR);
     OSSL_CMP_MSG_free(msg);
     OSSL_CMP_REVDETAILS_free(rd);
@@ -638,7 +656,7 @@ OSSL_CMP_MSG *ossl_cmp_rr_new(OSSL_CMP_CTX *ctx)
 }
 
 OSSL_CMP_MSG *ossl_cmp_rp_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
-                              const OSSL_CRMF_CERTID *cid, int unprotectedErrors)
+    const OSSL_CRMF_CERTID *cid, int unprotectedErrors)
 {
     OSSL_CMP_REVREPCONTENT *rep = NULL;
     OSSL_CMP_PKISI *si1 = NULL;
@@ -653,7 +671,7 @@ OSSL_CMP_MSG *ossl_cmp_rp_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
     rep = msg->body->value.rp;
 
     if ((si1 = OSSL_CMP_PKISI_dup(si)) == NULL
-            || !sk_OSSL_CMP_PKISI_push(rep->status, si1))
+        || !sk_OSSL_CMP_PKISI_push(rep->status, si1))
         goto err;
 
     si1 = NULL; /* ownership transferred to rep->status */
@@ -662,20 +680,20 @@ OSSL_CMP_MSG *ossl_cmp_rp_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
         goto err;
     if (cid != NULL) {
         if ((cid_copy = OSSL_CRMF_CERTID_dup(cid)) == NULL
-                || !sk_OSSL_CRMF_CERTID_push(rep->revCerts, cid_copy))
+            || !sk_OSSL_CRMF_CERTID_push(rep->revCerts, cid_copy))
             goto err;
 
         cid_copy = NULL; /* ownership transferred to rep->revCerts */
     }
 
     if (!unprotectedErrors
-            || ossl_cmp_pkisi_get_status(si) != OSSL_CMP_PKISTATUS_rejection)
+        || ossl_cmp_pkisi_get_status(si) != OSSL_CMP_PKISTATUS_rejection)
         if (!ossl_cmp_msg_protect(ctx, msg))
             goto err;
 
     return msg;
 
- err:
+err:
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_RP);
     OSSL_CMP_PKISI_free(si1);
     OSSL_CRMF_CERTID_free(cid_copy);
@@ -695,7 +713,7 @@ OSSL_CMP_MSG *ossl_cmp_pkiconf_new(OSSL_CMP_CTX *ctx)
     if (ossl_cmp_msg_protect(ctx, msg))
         return msg;
 
- err:
+err:
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_PKICONF);
     OSSL_CMP_MSG_free(msg);
     return NULL;
@@ -710,7 +728,7 @@ int ossl_cmp_msg_gen_push0_ITAV(OSSL_CMP_MSG *msg, OSSL_CMP_ITAV *itav)
 
     bodytype = OSSL_CMP_MSG_get_bodytype(msg);
     if (bodytype != OSSL_CMP_PKIBODY_GENM
-            && bodytype != OSSL_CMP_PKIBODY_GENP) {
+        && bodytype != OSSL_CMP_PKIBODY_GENP) {
         ERR_raise(ERR_LIB_CMP, CMP_R_INVALID_ARGS);
         return 0;
     }
@@ -720,7 +738,7 @@ int ossl_cmp_msg_gen_push0_ITAV(OSSL_CMP_MSG *msg, OSSL_CMP_ITAV *itav)
 }
 
 int ossl_cmp_msg_gen_push1_ITAVs(OSSL_CMP_MSG *msg,
-                                 const STACK_OF(OSSL_CMP_ITAV) *itavs)
+    const STACK_OF(OSSL_CMP_ITAV) *itavs)
 {
     int i;
     OSSL_CMP_ITAV *itav = NULL;
@@ -731,7 +749,7 @@ int ossl_cmp_msg_gen_push1_ITAVs(OSSL_CMP_MSG *msg,
     for (i = 0; i < sk_OSSL_CMP_ITAV_num(itavs); i++) {
         itav = OSSL_CMP_ITAV_dup(sk_OSSL_CMP_ITAV_value(itavs, i));
         if (itav == NULL
-                || !ossl_cmp_msg_gen_push0_ITAV(msg, itav)) {
+            || !ossl_cmp_msg_gen_push0_ITAV(msg, itav)) {
             OSSL_CMP_ITAV_free(itav);
             return 0;
         }
@@ -744,8 +762,8 @@ int ossl_cmp_msg_gen_push1_ITAVs(OSSL_CMP_MSG *msg,
  * returns a pointer to the PKIMessage on success, NULL on error
  */
 static OSSL_CMP_MSG *gen_new(OSSL_CMP_CTX *ctx,
-                             const STACK_OF(OSSL_CMP_ITAV) *itavs,
-                             int body_type, int err_code)
+    const STACK_OF(OSSL_CMP_ITAV) *itavs,
+    int body_type, int err_code)
 {
     OSSL_CMP_MSG *msg = NULL;
 
@@ -763,7 +781,7 @@ static OSSL_CMP_MSG *gen_new(OSSL_CMP_CTX *ctx,
 
     return msg;
 
- err:
+err:
     ERR_raise(ERR_LIB_CMP, err_code);
     OSSL_CMP_MSG_free(msg);
     return NULL;
@@ -772,19 +790,19 @@ static OSSL_CMP_MSG *gen_new(OSSL_CMP_CTX *ctx,
 OSSL_CMP_MSG *ossl_cmp_genm_new(OSSL_CMP_CTX *ctx)
 {
     return gen_new(ctx, ctx->genm_ITAVs,
-                   OSSL_CMP_PKIBODY_GENM, CMP_R_ERROR_CREATING_GENM);
+        OSSL_CMP_PKIBODY_GENM, CMP_R_ERROR_CREATING_GENM);
 }
 
 OSSL_CMP_MSG *ossl_cmp_genp_new(OSSL_CMP_CTX *ctx,
-                                const STACK_OF(OSSL_CMP_ITAV) *itavs)
+    const STACK_OF(OSSL_CMP_ITAV) *itavs)
 {
     return gen_new(ctx, itavs,
-                   OSSL_CMP_PKIBODY_GENP, CMP_R_ERROR_CREATING_GENP);
+        OSSL_CMP_PKIBODY_GENP, CMP_R_ERROR_CREATING_GENP);
 }
 
 OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
-                                 int64_t errorCode, const char *details,
-                                 int unprotected)
+    int64_t errorCode, const char *details,
+    int unprotected)
 {
     OSSL_CMP_MSG *msg = NULL;
     const char *lib = NULL, *reason = NULL;
@@ -805,7 +823,7 @@ OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
     if (!ASN1_INTEGER_set_int64(msg->body->value.error->errorCode, errorCode))
         goto err;
     if (errorCode > 0
-            && (uint64_t)errorCode < ((uint64_t)ERR_SYSTEM_FLAG << 1)) {
+        && (uint64_t)errorCode < ((uint64_t)ERR_SYSTEM_FLAG << 1)) {
         lib = ERR_lib_error_string((unsigned long)errorCode);
         reason = ERR_reason_error_string((unsigned long)errorCode);
     }
@@ -814,13 +832,13 @@ OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
             goto err;
         msg->body->value.error->errorDetails = ft;
         if (lib != NULL && *lib != '\0'
-                && !ossl_cmp_sk_ASN1_UTF8STRING_push_str(ft, lib, -1))
+            && !ossl_cmp_sk_ASN1_UTF8STRING_push_str(ft, lib, -1))
             goto err;
         if (reason != NULL && *reason != '\0'
-                && !ossl_cmp_sk_ASN1_UTF8STRING_push_str(ft, reason, -1))
+            && !ossl_cmp_sk_ASN1_UTF8STRING_push_str(ft, reason, -1))
             goto err;
         if (details != NULL
-                && !ossl_cmp_sk_ASN1_UTF8STRING_push_str(ft, details, -1))
+            && !ossl_cmp_sk_ASN1_UTF8STRING_push_str(ft, details, -1))
             goto err;
     }
 
@@ -828,7 +846,7 @@ OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
         goto err;
     return msg;
 
- err:
+err:
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_ERROR);
     OSSL_CMP_MSG_free(msg);
     return NULL;
@@ -840,7 +858,7 @@ OSSL_CMP_MSG *ossl_cmp_error_new(OSSL_CMP_CTX *ctx, const OSSL_CMP_PKISI *si,
  * to confirm that the certificate was received successfully.
  */
 int ossl_cmp_certstatus_set0_certHash(OSSL_CMP_CERTSTATUS *certStatus,
-                                      ASN1_OCTET_STRING *hash)
+    ASN1_OCTET_STRING *hash)
 {
     if (!ossl_assert(certStatus != NULL))
         return 0;
@@ -850,7 +868,7 @@ int ossl_cmp_certstatus_set0_certHash(OSSL_CMP_CERTSTATUS *certStatus,
 }
 
 OSSL_CMP_MSG *ossl_cmp_certConf_new(OSSL_CMP_CTX *ctx, int certReqId,
-                                    int fail_info, const char *text)
+    int fail_info, const char *text)
 {
     OSSL_CMP_MSG *msg = NULL;
     OSSL_CMP_CERTSTATUS *certStatus = NULL;
@@ -860,8 +878,8 @@ OSSL_CMP_MSG *ossl_cmp_certConf_new(OSSL_CMP_CTX *ctx, int certReqId,
     OSSL_CMP_PKISI *sinfo;
 
     if (!ossl_assert(ctx != NULL && ctx->newCert != NULL
-                     && (certReqId == OSSL_CMP_CERTREQID
-                         || certReqId == OSSL_CMP_CERTREQID_NONE)))
+            && (certReqId == OSSL_CMP_CERTREQID
+                || certReqId == OSSL_CMP_CERTREQID_NONE)))
         return NULL;
 
     if ((unsigned)fail_info > OSSL_CMP_PKIFAILUREINFO_MAX_BIT_PATTERN) {
@@ -911,9 +929,7 @@ OSSL_CMP_MSG *ossl_cmp_certConf_new(OSSL_CMP_CTX *ctx, int certReqId,
      * be provided in the statusInfo field, perhaps for auditing purposes at
      * the CA/RA.
      */
-    sinfo = fail_info != 0 ?
-        OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_rejection, fail_info, text) :
-        OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_accepted, 0, text);
+    sinfo = fail_info != 0 ? OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_rejection, fail_info, text) : OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_accepted, 0, text);
     if (sinfo == NULL)
         goto err;
     certStatus->statusInfo = sinfo;
@@ -923,7 +939,7 @@ OSSL_CMP_MSG *ossl_cmp_certConf_new(OSSL_CMP_CTX *ctx, int certReqId,
 
     return msg;
 
- err:
+err:
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_CERTCONF);
     OSSL_CMP_MSG_free(msg);
     ASN1_OCTET_STRING_free(certHash);
@@ -942,8 +958,8 @@ OSSL_CMP_MSG *ossl_cmp_pollReq_new(OSSL_CMP_CTX *ctx, int crid)
         goto err;
 
     if ((preq = OSSL_CMP_POLLREQ_new()) == NULL
-            || !ASN1_INTEGER_set(preq->certReqId, crid)
-            || !sk_OSSL_CMP_POLLREQ_push(msg->body->value.pollReq, preq))
+        || !ASN1_INTEGER_set(preq->certReqId, crid)
+        || !sk_OSSL_CMP_POLLREQ_push(msg->body->value.pollReq, preq))
         goto err;
 
     preq = NULL;
@@ -952,7 +968,7 @@ OSSL_CMP_MSG *ossl_cmp_pollReq_new(OSSL_CMP_CTX *ctx, int crid)
 
     return msg;
 
- err:
+err:
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_POLLREQ);
     OSSL_CMP_POLLREQ_free(preq);
     OSSL_CMP_MSG_free(msg);
@@ -960,7 +976,7 @@ OSSL_CMP_MSG *ossl_cmp_pollReq_new(OSSL_CMP_CTX *ctx, int crid)
 }
 
 OSSL_CMP_MSG *ossl_cmp_pollRep_new(OSSL_CMP_CTX *ctx, int crid,
-                                   int64_t poll_after)
+    int64_t poll_after)
 {
     OSSL_CMP_MSG *msg;
     OSSL_CMP_POLLREP *prep;
@@ -983,7 +999,7 @@ OSSL_CMP_MSG *ossl_cmp_pollRep_new(OSSL_CMP_CTX *ctx, int crid,
         goto err;
     return msg;
 
- err:
+err:
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_POLLREP);
     OSSL_CMP_MSG_free(msg);
     return NULL;
@@ -1055,7 +1071,7 @@ static int suitable_rid(const ASN1_INTEGER *certReqId, int rid)
  */
 OSSL_CMP_POLLREP *
 ossl_cmp_pollrepcontent_get0_pollrep(const OSSL_CMP_POLLREPCONTENT *prc,
-                                     int rid)
+    int rid)
 {
     OSSL_CMP_POLLREP *pollRep = NULL;
     int i;
@@ -1070,7 +1086,7 @@ ossl_cmp_pollrepcontent_get0_pollrep(const OSSL_CMP_POLLREPCONTENT *prc,
     }
 
     ERR_raise_data(ERR_LIB_CMP, CMP_R_CERTRESPONSE_NOT_FOUND,
-                   "expected certReqId = %d", rid);
+        "expected certReqId = %d", rid);
     return NULL;
 }
 
@@ -1081,7 +1097,7 @@ ossl_cmp_pollrepcontent_get0_pollrep(const OSSL_CMP_POLLREPCONTENT *prc,
  */
 OSSL_CMP_CERTRESPONSE *
 ossl_cmp_certrepmessage_get0_certresponse(const OSSL_CMP_CERTREPMESSAGE *crm,
-                                          int rid)
+    int rid)
 {
     OSSL_CMP_CERTRESPONSE *crep = NULL;
     int i;
@@ -1096,7 +1112,7 @@ ossl_cmp_certrepmessage_get0_certresponse(const OSSL_CMP_CERTREPMESSAGE *crm,
     }
 
     ERR_raise_data(ERR_LIB_CMP, CMP_R_CERTRESPONSE_NOT_FOUND,
-                   "expected certReqId = %d", rid);
+        "expected certReqId = %d", rid);
     return NULL;
 }
 
@@ -1131,10 +1147,10 @@ X509 *ossl_cmp_certresponse_get1_cert(const OSSL_CMP_CTX *ctx, const OSSL_CMP_CE
         }
         /* found encrypted private key, try to extract */
         pkey = OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(encr_key, ctx->trusted,
-                                                ctx->untrusted,
-                                                ctx->pkey, ctx->cert,
-                                                ctx->secretValue,
-                                                ctx->libctx, ctx->propq);
+            ctx->untrusted,
+            ctx->pkey, ctx->cert,
+            ctx->secretValue,
+            ctx->libctx, ctx->propq);
         if (pkey == NULL) {
             ERR_raise(ERR_LIB_CMP, CMP_R_FAILED_EXTRACTING_CENTRAL_GEN_KEY);
             return NULL;
@@ -1151,7 +1167,7 @@ X509 *ossl_cmp_certresponse_get1_cert(const OSSL_CMP_CTX *ctx, const OSSL_CMP_CE
             crt = X509_dup(coec->value.certificate);
             break;
         case OSSL_CMP_CERTORENCCERT_ENCRYPTEDCERT:
-            /* cert encrypted for indirect PoP; RFC 4210, 5.2.8.2 */
+            /* cert encrypted for indirect PoP; RFC 9810, 5.2.8.3.2 */
             pkey = OSSL_CMP_CTX_get0_newPkey(ctx, 1);
             /* pkey is ctx->newPkey (if private, else NULL) or ctx->pkey */
             if (pkey == NULL) {
@@ -1159,7 +1175,7 @@ X509 *ossl_cmp_certresponse_get1_cert(const OSSL_CMP_CTX *ctx, const OSSL_CMP_CE
                 return NULL;
             }
             crt = OSSL_CRMF_ENCRYPTEDKEY_get1_encCert(coec->value.encryptedCert,
-                                                      ctx->libctx, ctx->propq, pkey, 0);
+                ctx->libctx, ctx->propq, pkey, 0);
             break;
         default:
             ERR_raise(ERR_LIB_CMP, CMP_R_UNKNOWN_CERT_TYPE);
@@ -1182,7 +1198,7 @@ int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
     if (!ossl_cmp_hdr_set_transactionID(ctx, msg->header))
         return 0;
     return msg->header->protectionAlg == NULL
-            || ossl_cmp_msg_protect(ctx, msg);
+        || ossl_cmp_msg_protect(ctx, msg);
 }
 
 int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
@@ -1194,13 +1210,13 @@ int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
     if (ctx->recipNonce == NULL) /* nothing to do for 1st msg in transaction */
         return 1;
     if (!ossl_cmp_asn1_octet_string_set1(&msg->header->recipNonce,
-                                         ctx->recipNonce))
+            ctx->recipNonce))
         return 0;
     return msg->header->protectionAlg == NULL || ossl_cmp_msg_protect(ctx, msg);
 }
 
 OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
-                                const char *propq)
+    const char *propq)
 {
     OSSL_CMP_MSG *msg;
     BIO *bio = NULL;
@@ -1217,7 +1233,7 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
     }
 
     if ((bio = BIO_new_file(file, "rb")) == NULL
-            || d2i_OSSL_CMP_MSG_bio(bio, &msg) == NULL) {
+        || d2i_OSSL_CMP_MSG_bio(bio, &msg) == NULL) {
         OSSL_CMP_MSG_free(msg);
         msg = NULL;
     }
@@ -1244,25 +1260,25 @@ int OSSL_CMP_MSG_write(const char *file, const OSSL_CMP_MSG *msg)
 }
 
 OSSL_CMP_MSG *d2i_OSSL_CMP_MSG(OSSL_CMP_MSG **msg, const unsigned char **in,
-                               long len)
+    long len)
 {
     OSSL_LIB_CTX *libctx = NULL;
     const char *propq = NULL;
 
     if (msg != NULL && *msg != NULL) {
-        libctx  = (*msg)->libctx;
+        libctx = (*msg)->libctx;
         propq = (*msg)->propq;
     }
 
     return (OSSL_CMP_MSG *)ASN1_item_d2i_ex((ASN1_VALUE **)msg, in, len,
-                                            ASN1_ITEM_rptr(OSSL_CMP_MSG),
-                                            libctx, propq);
+        ASN1_ITEM_rptr(OSSL_CMP_MSG),
+        libctx, propq);
 }
 
 int i2d_OSSL_CMP_MSG(const OSSL_CMP_MSG *msg, unsigned char **out)
 {
     return ASN1_item_i2d((const ASN1_VALUE *)msg, out,
-                         ASN1_ITEM_rptr(OSSL_CMP_MSG));
+        ASN1_ITEM_rptr(OSSL_CMP_MSG));
 }
 
 OSSL_CMP_MSG *d2i_OSSL_CMP_MSG_bio(BIO *bio, OSSL_CMP_MSG **msg)
@@ -1271,12 +1287,12 @@ OSSL_CMP_MSG *d2i_OSSL_CMP_MSG_bio(BIO *bio, OSSL_CMP_MSG **msg)
     const char *propq = NULL;
 
     if (msg != NULL && *msg != NULL) {
-        libctx  = (*msg)->libctx;
+        libctx = (*msg)->libctx;
         propq = (*msg)->propq;
     }
 
     return ASN1_item_d2i_bio_ex(ASN1_ITEM_rptr(OSSL_CMP_MSG), bio, msg, libctx,
-                                propq);
+        propq);
 }
 
 int i2d_OSSL_CMP_MSG_bio(BIO *bio, const OSSL_CMP_MSG *msg)
@@ -1290,6 +1306,6 @@ int ossl_cmp_is_error_with_waiting(const OSSL_CMP_MSG *msg)
         return 0;
 
     return (OSSL_CMP_MSG_get_bodytype(msg) == OSSL_CMP_PKIBODY_ERROR
-            && ossl_cmp_pkisi_get_status(msg->body->value.error->pKIStatusInfo)
+        && ossl_cmp_pkisi_get_status(msg->body->value.error->pKIStatusInfo)
             == OSSL_CMP_PKISTATUS_waiting);
 }
diff --git a/crypto/cmp/cmp_protect.c b/crypto/cmp/cmp_protect.c
index e4f3bffed720f..1c8d2135fdab6 100644
--- a/crypto/cmp/cmp_protect.c
+++ b/crypto/cmp/cmp_protect.c
@@ -31,7 +31,7 @@
  * returns ASN1_BIT_STRING representing the protection on success, else NULL
  */
 ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_CTX *ctx,
-                                          const OSSL_CMP_MSG *msg)
+    const OSSL_CMP_MSG *msg)
 {
     ASN1_BIT_STRING *prot = NULL;
     OSSL_CMP_PROTECTEDPART prot_part;
@@ -87,9 +87,9 @@ ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_CTX *ctx,
         }
 
         if (!OSSL_CRMF_pbm_new(ctx->libctx, ctx->propq,
-                               pbm, prot_part_der, prot_part_der_len,
-                               ctx->secretValue->data, ctx->secretValue->length,
-                               &protection, &sig_len))
+                pbm, prot_part_der, prot_part_der_len,
+                ctx->secretValue->data, ctx->secretValue->length,
+                &protection, &sig_len))
             goto end;
 
         if ((prot = ASN1_BIT_STRING_new()) == NULL)
@@ -111,7 +111,7 @@ ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_CTX *ctx,
 
         if (ctx->pkey == NULL) {
             ERR_raise(ERR_LIB_CMP,
-                      CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION);
+                CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION);
             return NULL;
         }
         if (EVP_PKEY_get_default_digest_name(ctx->pkey, name, sizeof(name)) > 0
@@ -121,9 +121,9 @@ ASN1_BIT_STRING *ossl_cmp_calc_protection(const OSSL_CMP_CTX *ctx,
         if ((prot = ASN1_BIT_STRING_new()) == NULL)
             return NULL;
         if (ASN1_item_sign_ex(ASN1_ITEM_rptr(OSSL_CMP_PROTECTEDPART),
-                              msg->header->protectionAlg, /* sets X509_ALGOR */
-                              NULL, prot, &prot_part, NULL, ctx->pkey, md,
-                              ctx->libctx, ctx->propq))
+                msg->header->protectionAlg, /* sets X509_ALGOR */
+                NULL, prot, &prot_part, NULL, ctx->pkey, md,
+                ctx->libctx, ctx->propq))
             return prot;
         ASN1_BIT_STRING_free(prot);
         return NULL;
@@ -138,7 +138,7 @@ void ossl_cmp_set_own_chain(OSSL_CMP_CTX *ctx)
     if (ctx->chain == NULL) {
         ossl_cmp_debug(ctx, "trying to build chain for own CMP signer cert");
         ctx->chain = X509_build_chain(ctx->cert, ctx->untrusted, NULL, 0,
-                                      ctx->libctx, ctx->propq);
+            ctx->libctx, ctx->propq);
         if (ctx->chain != NULL) {
             ossl_cmp_debug(ctx, "success building chain for own CMP signer cert");
         } else {
@@ -157,7 +157,7 @@ int ossl_cmp_msg_add_extraCerts(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
 
     /* Add first ctx->cert and its chain if using signature-based protection */
     if (!ctx->unprotectedSend && ctx->secretValue == NULL
-            && ctx->cert != NULL && ctx->pkey != NULL) {
+        && ctx->cert != NULL && ctx->pkey != NULL) {
         int prepend = X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP
             | X509_ADD_FLAG_PREPEND | X509_ADD_FLAG_NO_SS;
 
@@ -175,7 +175,7 @@ int ossl_cmp_msg_add_extraCerts(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
 
     /* add any additional certificates from ctx->extraCertsOut */
     if (!ossl_x509_add_certs_new(&msg->extraCerts, ctx->extraCertsOut,
-                                 X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
+            X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
         return 0;
 
     /* in case extraCerts are empty list avoid empty ASN.1 sequence */
@@ -202,8 +202,8 @@ static X509_ALGOR *pbmac_algor(const OSSL_CMP_CTX *ctx)
         return NULL;
 
     pbm = OSSL_CRMF_pbmp_new(ctx->libctx, ctx->pbm_slen,
-                             EVP_MD_get_type(ctx->pbm_owf), ctx->pbm_itercnt,
-                             ctx->pbm_mac);
+        EVP_MD_get_type(ctx->pbm_owf), ctx->pbm_itercnt,
+        ctx->pbm_mac);
     pbm_str = ASN1_STRING_new();
     if (pbm == NULL || pbm_str == NULL)
         goto err;
@@ -212,8 +212,8 @@ static X509_ALGOR *pbmac_algor(const OSSL_CMP_CTX *ctx)
     if (!ASN1_STRING_set(pbm_str, pbm_der, pbm_der_len))
         goto err;
     alg = ossl_X509_ALGOR_from_nid(NID_id_PasswordBasedMAC,
-                                   V_ASN1_SEQUENCE, pbm_str);
- err:
+        V_ASN1_SEQUENCE, pbm_str);
+err:
     if (alg == NULL)
         ASN1_STRING_free(pbm_str);
     OPENSSL_free(pbm_der);
@@ -222,7 +222,7 @@ static X509_ALGOR *pbmac_algor(const OSSL_CMP_CTX *ctx)
 }
 
 static int set_senderKID(const OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg,
-                         const ASN1_OCTET_STRING *id)
+    const ASN1_OCTET_STRING *id)
 {
     if (id == NULL)
         id = ctx->referenceValue; /* standard for PBM, fallback for sig-based */
@@ -280,12 +280,12 @@ int ossl_cmp_msg_protect(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
          */
     } else {
         ERR_raise(ERR_LIB_CMP,
-                  CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION);
+            CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION);
         goto err;
     }
     if (!ctx->unprotectedSend
         /* protect according to msg->header->protectionAlg partly set above */
-            && ((msg->protection = ossl_cmp_calc_protection(ctx, msg)) == NULL))
+        && ((msg->protection = ossl_cmp_calc_protection(ctx, msg)) == NULL))
         goto err;
 
     /*
@@ -298,16 +298,16 @@ int ossl_cmp_msg_protect(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
         goto err;
 
     /*
-     * As required by RFC 4210 section 5.1.1., if the sender name is not known
+     * As required by RFC 9810 section 5.1.1., if the sender name is not known
      * to the client it set to NULL-DN. In this case for identification at least
      * the senderKID must be set, where we took the referenceValue as fallback.
      */
     if (!(ossl_cmp_general_name_is_NULL_DN(msg->header->sender)
-          && msg->header->senderKID == NULL))
+            && msg->header->senderKID == NULL))
         return 1;
     ERR_raise(ERR_LIB_CMP, CMP_R_MISSING_SENDER_IDENTIFICATION);
 
- err:
+err:
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROTECTING_MESSAGE);
     return 0;
 }
diff --git a/crypto/cmp/cmp_server.c b/crypto/cmp/cmp_server.c
index 6a833f83c5385..9bf51a61a58bd 100644
--- a/crypto/cmp/cmp_server.c
+++ b/crypto/cmp/cmp_server.c
@@ -22,9 +22,9 @@
 /* the context for the generic CMP server */
 struct ossl_cmp_srv_ctx_st {
     OSSL_CMP_CTX *ctx; /* CMP client context reused for transactionID etc. */
-    void *custom_ctx;  /* application-specific server context */
-    int certReqId;     /* of ir/cr/kur, OSSL_CMP_CERTREQID_NONE for p10cr */
-    int polling;       /* current transaction is in polling mode */
+    void *custom_ctx; /* application-specific server context */
+    int certReqId; /* of ir/cr/kur, OSSL_CMP_CERTREQID_NONE for p10cr */
+    int polling; /* current transaction is in polling mode */
 
     OSSL_CMP_SRV_cert_request_cb_t process_cert_request;
     OSSL_CMP_SRV_rr_cb_t process_rr;
@@ -36,9 +36,9 @@ struct ossl_cmp_srv_ctx_st {
     OSSL_CMP_SRV_clean_transaction_cb_t clean_transaction;
 
     int sendUnprotectedErrors; /* Send error and rejection msgs unprotected */
-    int acceptUnprotected;     /* Accept requests with no/invalid prot. */
-    int acceptRAVerified;      /* Accept ir/cr/kur with POPO RAVerified */
-    int grantImplicitConfirm;  /* Grant implicit confirmation if requested */
+    int acceptUnprotected; /* Accept requests with no/invalid prot. */
+    int acceptRAVerified; /* Accept ir/cr/kur with POPO RAVerified */
+    int grantImplicitConfirm; /* Grant implicit confirmation if requested */
 
 }; /* OSSL_CMP_SRV_CTX */
 
@@ -65,18 +65,18 @@ OSSL_CMP_SRV_CTX *OSSL_CMP_SRV_CTX_new(OSSL_LIB_CTX *libctx, const char *propq)
 
     /* all other elements are initialized to 0 or NULL, respectively */
     return ctx;
- err:
+err:
     OSSL_CMP_SRV_CTX_free(ctx);
     return NULL;
 }
 
 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)
 {
     if (srv_ctx == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -93,8 +93,8 @@ int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
 }
 
 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)
 {
     if (srv_ctx == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -124,7 +124,7 @@ 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)
 {
     if (srv_ctx == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -155,7 +155,7 @@ 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)
 {
     if (srv_ctx == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -167,7 +167,7 @@ int OSSL_CMP_SRV_CTX_set_grant_implicit_confirm(OSSL_CMP_SRV_CTX *srv_ctx,
 
 /* return error msg with waiting status if polling is initiated, else NULL */
 static OSSL_CMP_MSG *delayed_delivery(OSSL_CMP_SRV_CTX *srv_ctx,
-                                      const OSSL_CMP_MSG *req)
+    const OSSL_CMP_MSG *req)
 {
     int ret;
     unsigned long err;
@@ -178,7 +178,7 @@ static OSSL_CMP_MSG *delayed_delivery(OSSL_CMP_SRV_CTX *srv_ctx,
     OSSL_CMP_MSG *msg;
 
     if (!ossl_assert(srv_ctx != NULL && srv_ctx->ctx != NULL && req != NULL
-                     && srv_ctx->delayed_delivery != NULL))
+            && srv_ctx->delayed_delivery != NULL))
         return NULL;
 
     ret = srv_ctx->delayed_delivery(srv_ctx, req);
@@ -200,7 +200,7 @@ static OSSL_CMP_MSG *delayed_delivery(OSSL_CMP_SRV_CTX *srv_ctx,
         return NULL;
 
     msg = ossl_cmp_error_new(srv_ctx->ctx, si, errorCode, details,
-                             srv_ctx->sendUnprotectedErrors);
+        srv_ctx->sendUnprotectedErrors);
     OSSL_CMP_PKISI_free(si);
     return msg;
 }
@@ -211,7 +211,7 @@ static OSSL_CMP_MSG *delayed_delivery(OSSL_CMP_SRV_CTX *srv_ctx,
  * returns an ip/cp/kup on success and NULL on error
  */
 static OSSL_CMP_MSG *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
-                                          const OSSL_CMP_MSG *req)
+    const OSSL_CMP_MSG *req)
 {
     OSSL_CMP_MSG *msg = NULL;
     OSSL_CMP_PKISI *si = NULL;
@@ -271,26 +271,26 @@ static OSSL_CMP_MSG *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
         && !ossl_cmp_verify_popo(srv_ctx->ctx, req, srv_ctx->acceptRAVerified)) {
         /* Proof of possession could not be verified */
         si = OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_rejection,
-                                     1 << OSSL_CMP_PKIFAILUREINFO_badPOP,
-                                     ERR_reason_error_string(ERR_peek_error()));
+            1 << OSSL_CMP_PKIFAILUREINFO_badPOP,
+            ERR_reason_error_string(ERR_peek_error()));
         if (si == NULL)
             return NULL;
     } else {
         OSSL_CMP_PKIHEADER *hdr = OSSL_CMP_MSG_get0_header(req);
 
         si = srv_ctx->process_cert_request(srv_ctx, req, certReqId, crm, p10cr,
-                                           &certOut, &chainOut, &caPubs);
+            &certOut, &chainOut, &caPubs);
         if (si == NULL)
             goto err;
         if (ossl_cmp_pkisi_get_status(si) == OSSL_CMP_PKISTATUS_waiting)
             srv_ctx->polling = 1;
         /* set OSSL_CMP_OPT_IMPLICIT_CONFIRM if and only if transaction ends */
         if (!OSSL_CMP_CTX_set_option(srv_ctx->ctx,
-                                     OSSL_CMP_OPT_IMPLICIT_CONFIRM,
-                                     ossl_cmp_hdr_has_implicitConfirm(hdr)
-                                         && srv_ctx->grantImplicitConfirm
-                                         /* do not set if polling starts: */
-                                         && certOut != NULL))
+                OSSL_CMP_OPT_IMPLICIT_CONFIRM,
+                ossl_cmp_hdr_has_implicitConfirm(hdr)
+                    && srv_ctx->grantImplicitConfirm
+                    /* do not set if polling starts: */
+                    && certOut != NULL))
             goto err;
         if (central_keygen == 1
             && srv_ctx->ctx->newPkey_priv && srv_ctx->ctx->newPkey != NULL)
@@ -298,13 +298,13 @@ static OSSL_CMP_MSG *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
     }
 
     msg = ossl_cmp_certrep_new(srv_ctx->ctx, bodytype, certReqId, si,
-                               certOut, keyOut, NULL /* enc */, chainOut, caPubs,
-                               srv_ctx->sendUnprotectedErrors);
+        certOut, keyOut, NULL /* enc */, chainOut, caPubs,
+        srv_ctx->sendUnprotectedErrors);
     /* When supporting OSSL_CRMF_POPO_KEYENC, "enc" will need to be set */
     if (msg == NULL)
         ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_CERTREP);
 
- err:
+err:
     OSSL_CMP_PKISI_free(si);
     X509_free(certOut);
     OSSL_CMP_CTX_set0_newPkey(srv_ctx->ctx, 0, NULL);
@@ -314,7 +314,7 @@ static OSSL_CMP_MSG *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
 }
 
 static OSSL_CMP_MSG *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
-                                const OSSL_CMP_MSG *req)
+    const OSSL_CMP_MSG *req)
 {
     OSSL_CMP_MSG *msg = NULL;
     OSSL_CMP_REVDETAILS *details;
@@ -341,16 +341,17 @@ static OSSL_CMP_MSG *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
     issuer = OSSL_CRMF_CERTTEMPLATE_get0_issuer(tmpl);
     serial = OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(tmpl);
     if (issuer != NULL && serial != NULL
-            && (certId = OSSL_CRMF_CERTID_gen(issuer, serial)) == NULL)
+        && (certId = OSSL_CRMF_CERTID_gen(issuer, serial)) == NULL)
         return NULL;
     if ((si = srv_ctx->process_rr(srv_ctx, req, issuer, serial)) == NULL)
         goto err;
 
     if ((msg = ossl_cmp_rp_new(srv_ctx->ctx, si, certId,
-                               srv_ctx->sendUnprotectedErrors)) == NULL)
+             srv_ctx->sendUnprotectedErrors))
+        == NULL)
         ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_RR);
 
- err:
+err:
     OSSL_CRMF_CERTID_free(certId);
     OSSL_CMP_PKISI_free(si);
     return msg;
@@ -361,7 +362,7 @@ static OSSL_CMP_MSG *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
  * incoming message
  */
 static OSSL_CMP_MSG *process_genm(OSSL_CMP_SRV_CTX *srv_ctx,
-                                  const OSSL_CMP_MSG *req)
+    const OSSL_CMP_MSG *req)
 {
     OSSL_CMP_GENMSGCONTENT *itavs;
     OSSL_CMP_MSG *msg;
@@ -378,7 +379,7 @@ static OSSL_CMP_MSG *process_genm(OSSL_CMP_SRV_CTX *srv_ctx,
 }
 
 static OSSL_CMP_MSG *process_error(OSSL_CMP_SRV_CTX *srv_ctx,
-                                   const OSSL_CMP_MSG *req)
+    const OSSL_CMP_MSG *req)
 {
     OSSL_CMP_ERRORMSGCONTENT *errorContent;
     OSSL_CMP_MSG *msg;
@@ -387,7 +388,7 @@ static OSSL_CMP_MSG *process_error(OSSL_CMP_SRV_CTX *srv_ctx,
         return NULL;
     errorContent = req->body->value.error;
     srv_ctx->process_error(srv_ctx, req, errorContent->pKIStatusInfo,
-                           errorContent->errorCode, errorContent->errorDetails);
+        errorContent->errorCode, errorContent->errorDetails);
 
     if ((msg = ossl_cmp_pkiconf_new(srv_ctx->ctx)) == NULL)
         ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_PKICONF);
@@ -395,7 +396,7 @@ static OSSL_CMP_MSG *process_error(OSSL_CMP_SRV_CTX *srv_ctx,
 }
 
 static OSSL_CMP_MSG *process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
-                                      const OSSL_CMP_MSG *req)
+    const OSSL_CMP_MSG *req)
 {
     OSSL_CMP_CTX *ctx;
     OSSL_CMP_CERTCONFIRMCONTENT *ccc;
@@ -411,7 +412,7 @@ static OSSL_CMP_MSG *process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
     num = sk_OSSL_CMP_CERTSTATUS_num(ccc);
 
     if (OSSL_CMP_CTX_get_option(ctx, OSSL_CMP_OPT_IMPLICIT_CONFIRM) == 1
-            || ctx->status != OSSL_CMP_PKISTATUS_trans) {
+        || ctx->status != OSSL_CMP_PKISTATUS_trans) {
         ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_UNEXPECTED_CERTCONF);
         return NULL;
     }
@@ -442,8 +443,8 @@ static OSSL_CMP_MSG *process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
             const char *str = ossl_cmp_PKIStatus_to_string(pki_status);
 
             ossl_cmp_log2(INFO, ctx, "certificate rejected by client %s %s",
-                          str == NULL ? "without" : "with",
-                          str == NULL ? "PKIStatus" : str);
+                str == NULL ? "without" : "with",
+                str == NULL ? "PKIStatus" : str);
         }
     }
 
@@ -454,12 +455,12 @@ static OSSL_CMP_MSG *process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
 
 /* pollReq is handled separately, to avoid recursive call */
 static OSSL_CMP_MSG *process_non_polling_request(OSSL_CMP_SRV_CTX *srv_ctx,
-                                                 const OSSL_CMP_MSG *req)
+    const OSSL_CMP_MSG *req)
 {
     OSSL_CMP_MSG *rsp = NULL;
 
     if (!ossl_assert(srv_ctx != NULL && srv_ctx->ctx != NULL && req != NULL
-                     && req->body != NULL))
+            && req->body != NULL))
         return NULL;
 
     switch (OSSL_CMP_MSG_get_bodytype(req)) {
@@ -509,7 +510,7 @@ static OSSL_CMP_MSG *process_non_polling_request(OSSL_CMP_SRV_CTX *srv_ctx,
 }
 
 static OSSL_CMP_MSG *process_pollReq(OSSL_CMP_SRV_CTX *srv_ctx,
-                                     const OSSL_CMP_MSG *req)
+    const OSSL_CMP_MSG *req)
 {
     OSSL_CMP_POLLREQCONTENT *prc;
     OSSL_CMP_POLLREQ *pr;
@@ -535,7 +536,7 @@ static OSSL_CMP_MSG *process_pollReq(OSSL_CMP_SRV_CTX *srv_ctx,
     pr = sk_OSSL_CMP_POLLREQ_value(prc, 0);
     certReqId = ossl_cmp_asn1_get_int(pr->certReqId);
     if (!srv_ctx->process_pollReq(srv_ctx, req, certReqId,
-                                  &orig_req, &check_after))
+            &orig_req, &check_after))
         return NULL;
 
     if (orig_req != NULL) {
@@ -544,7 +545,8 @@ static OSSL_CMP_MSG *process_pollReq(OSSL_CMP_SRV_CTX *srv_ctx,
         OSSL_CMP_MSG_free(orig_req);
     } else {
         if ((msg = ossl_cmp_pollRep_new(srv_ctx->ctx, certReqId,
-                                        check_after)) == NULL)
+                 check_after))
+            == NULL)
             ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_CREATING_POLLREP);
     }
     return msg;
@@ -555,16 +557,16 @@ static OSSL_CMP_MSG *process_pollReq(OSSL_CMP_SRV_CTX *srv_ctx,
  * Return 1 on acceptance, 0 on rejection, or -1 on (internal) error.
  */
 static int unprotected_exception(const OSSL_CMP_CTX *ctx,
-                                 const OSSL_CMP_MSG *req,
-                                 int invalid_protection,
-                                 int accept_unprotected_requests)
+    const OSSL_CMP_MSG *req,
+    int invalid_protection,
+    int accept_unprotected_requests)
 {
     if (!ossl_assert(ctx != NULL && req != NULL))
         return -1;
 
     if (accept_unprotected_requests) {
         ossl_cmp_log1(WARN, ctx, "ignoring %s protection of request message",
-                      invalid_protection ? "invalid" : "missing");
+            invalid_protection ? "invalid" : "missing");
         return 1;
     }
     if (OSSL_CMP_MSG_get_bodytype(req) == OSSL_CMP_PKIBODY_ERROR
@@ -579,7 +581,7 @@ static int unprotected_exception(const OSSL_CMP_CTX *ctx,
  * returns created message and NULL on internal error
  */
 OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
-                                           const OSSL_CMP_MSG *req)
+    const OSSL_CMP_MSG *req)
 {
     OSSL_CMP_CTX *ctx;
     ASN1_OCTET_STRING *backup_secret;
@@ -589,8 +591,8 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
     OSSL_CMP_MSG *rsp = NULL;
 
     if (srv_ctx == NULL || srv_ctx->ctx == NULL
-            || req == NULL || req->body == NULL
-            || (hdr = OSSL_CMP_MSG_get0_header(req)) == NULL) {
+        || req == NULL || req->body == NULL
+        || (hdr = OSSL_CMP_MSG_get0_header(req)) == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
         return 0;
     }
@@ -598,7 +600,7 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
     backup_secret = ctx->secretValue;
     req_type = OSSL_CMP_MSG_get_bodytype(req);
     ossl_cmp_log1(DEBUG, ctx,
-                  "received %s", ossl_cmp_bodytype_to_string(req_type));
+        "received %s", ossl_cmp_bodytype_to_string(req_type));
 
     /*
      * Some things need to be done already before validating the message in
@@ -612,7 +614,7 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
         goto err;
 
     if (srv_ctx->polling && req_type != OSSL_CMP_PKIBODY_POLLREQ
-            && req_type != OSSL_CMP_PKIBODY_ERROR) {
+        && req_type != OSSL_CMP_PKIBODY_ERROR) {
         ERR_raise(ERR_LIB_CMP, CMP_R_EXPECTED_POLLREQ);
         goto err;
     }
@@ -630,17 +632,17 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
 
             if (tid != NULL)
                 ossl_cmp_log1(WARN, ctx,
-                              "Assuming that last transaction with ID=%s got aborted",
-                              tid);
+                    "Assuming that last transaction with ID=%s got aborted",
+                    tid);
             OPENSSL_free(tid);
         }
         /* start of a new transaction, reset transactionID and senderNonce */
         if (!OSSL_CMP_CTX_set1_transactionID(ctx, NULL)
-                || !OSSL_CMP_CTX_set1_senderNonce(ctx, NULL))
+            || !OSSL_CMP_CTX_set1_senderNonce(ctx, NULL))
             goto err;
 
         if (srv_ctx->clean_transaction != NULL
-                && !srv_ctx->clean_transaction(srv_ctx, NULL)) {
+            && !srv_ctx->clean_transaction(srv_ctx, NULL)) {
             ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
             goto err;
         }
@@ -657,9 +659,9 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
     }
 
     req_verified = ossl_cmp_msg_check_update(ctx, req, unprotected_exception,
-                                             srv_ctx->acceptUnprotected);
+        srv_ctx->acceptUnprotected);
     if (ctx->secretValue != NULL && ctx->pkey != NULL
-            && ossl_cmp_hdr_get_protection_nid(hdr) != NID_id_PasswordBasedMAC)
+        && ossl_cmp_hdr_get_protection_nid(hdr) != NID_id_PasswordBasedMAC)
         ctx->secretValue = NULL; /* use MSG_SIG_ALG when protecting rsp */
     if (!req_verified)
         goto err;
@@ -677,7 +679,7 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
         rsp = process_non_polling_request(srv_ctx, req);
     }
 
- err:
+err:
     if (rsp == NULL) {
         /* on error, try to respond with CMP error message to client */
         const char *data = NULL, *reason = NULL;
@@ -703,20 +705,20 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
             data = NULL;
         reason = ERR_reason_error_string(err);
         if ((si = OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_rejection,
-                                          fail_info, reason)) != NULL) {
+                 fail_info, reason))
+            != NULL) {
             rsp = ossl_cmp_error_new(srv_ctx->ctx, si, err,
-                                     data, srv_ctx->sendUnprotectedErrors);
+                data, srv_ctx->sendUnprotectedErrors);
             OSSL_CMP_PKISI_free(si);
         }
     }
     OSSL_CMP_CTX_print_errors(ctx);
     ctx->secretValue = backup_secret;
 
-    rsp_type =
-        rsp != NULL ? OSSL_CMP_MSG_get_bodytype(rsp) : OSSL_CMP_PKIBODY_ERROR;
+    rsp_type = rsp != NULL ? OSSL_CMP_MSG_get_bodytype(rsp) : OSSL_CMP_PKIBODY_ERROR;
     if (rsp != NULL)
         ossl_cmp_log1(DEBUG, ctx,
-                      "sending %s", ossl_cmp_bodytype_to_string(rsp_type));
+            "sending %s", ossl_cmp_bodytype_to_string(rsp_type));
     else
         ossl_cmp_log(ERR, ctx, "cannot send proper CMP response");
 
@@ -760,7 +762,7 @@ OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
  * error stack.
  */
 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_SRV_CTX *srv_ctx = NULL;
 
diff --git a/crypto/cmp/cmp_status.c b/crypto/cmp/cmp_status.c
index b9086d84f8462..c32539ed61dd5 100644
--- a/crypto/cmp/cmp_status.c
+++ b/crypto/cmp/cmp_status.c
@@ -30,7 +30,7 @@
 
 int ossl_cmp_pkisi_get_status(const OSSL_CMP_PKISI *si)
 {
-    int res ;
+    int res;
 
     if (!ossl_assert(si != NULL && si->status != NULL))
         return -1;
@@ -57,7 +57,7 @@ const char *ossl_cmp_PKIStatus_to_string(int status)
         return "PKIStatus: key update warning - update already done for the cert";
     default:
         ERR_raise_data(ERR_LIB_CMP, CMP_R_ERROR_PARSING_PKISTATUS,
-                       "PKIStatus: invalid=%d", status);
+            "PKIStatus: invalid=%d", status);
         return NULL;
     }
 }
@@ -165,10 +165,9 @@ int ossl_cmp_pkisi_check_pkifailureinfo(const OSSL_CMP_PKISI *si, int bit_index)
  * place human-readable error string created from PKIStatusInfo in given buffer
  * returns pointer to the same buffer containing the string, or NULL on error
  */
-static
-char *snprint_PKIStatusInfo_parts(int status, int fail_info,
-                                  const OSSL_CMP_PKIFREETEXT *status_strings,
-                                  char *buf, size_t bufsize)
+static char *snprint_PKIStatusInfo_parts(int status, int fail_info,
+    const OSSL_CMP_PKIFREETEXT *status_strings,
+    char *buf, size_t bufsize)
 {
     int failure;
     const char *status_string, *failure_string;
@@ -180,14 +179,14 @@ char *snprint_PKIStatusInfo_parts(int status, int fail_info,
     char *write_ptr = buf;
 
     if (buf == NULL
-            || status < 0
-            || (status_string = ossl_cmp_PKIStatus_to_string(status)) == NULL)
+        || status < 0
+        || (status_string = ossl_cmp_PKIStatus_to_string(status)) == NULL)
         return NULL;
 
-#define ADVANCE_BUFFER  \
-    if (printed_chars < 0 || (size_t)printed_chars >= bufsize)  \
-        return NULL; \
-    write_ptr += printed_chars; \
+#define ADVANCE_BUFFER                                         \
+    if (printed_chars < 0 || (size_t)printed_chars >= bufsize) \
+        return NULL;                                           \
+    write_ptr += printed_chars;                                \
     bufsize -= printed_chars;
 
     printed_chars = BIO_snprintf(write_ptr, bufsize, "%s", status_string);
@@ -205,8 +204,8 @@ char *snprint_PKIStatusInfo_parts(int status, int fail_info,
                 failure_string = CMP_PKIFAILUREINFO_to_string(failure);
                 if (failure_string != NULL) {
                     printed_chars = BIO_snprintf(write_ptr, bufsize, "%s%s",
-                                                 failinfo_found ? ", " : "",
-                                                 failure_string);
+                        failinfo_found ? ", " : "",
+                        failure_string);
                     ADVANCE_BUFFER;
                     failinfo_found = 1;
                 }
@@ -214,7 +213,7 @@ char *snprint_PKIStatusInfo_parts(int status, int fail_info,
         }
     }
     if (!failinfo_found && status != OSSL_CMP_PKISTATUS_accepted
-            && status != OSSL_CMP_PKISTATUS_grantedWithMods) {
+        && status != OSSL_CMP_PKISTATUS_grantedWithMods) {
         printed_chars = BIO_snprintf(write_ptr, bufsize, "; <no failure info>");
         ADVANCE_BUFFER;
     }
@@ -223,14 +222,14 @@ char *snprint_PKIStatusInfo_parts(int status, int fail_info,
     n_status_strings = sk_ASN1_UTF8STRING_num(status_strings);
     if (n_status_strings > 0) {
         printed_chars = BIO_snprintf(write_ptr, bufsize, "; StatusString%s: ",
-                                     n_status_strings > 1 ? "s" : "");
+            n_status_strings > 1 ? "s" : "");
         ADVANCE_BUFFER;
         for (i = 0; i < n_status_strings; i++) {
             text = sk_ASN1_UTF8STRING_value(status_strings, i);
             printed_chars = BIO_snprintf(write_ptr, bufsize, "\"%.*s\"%s",
-                                         ASN1_STRING_length(text),
-                                         ASN1_STRING_get0_data(text),
-                                         i < n_status_strings - 1 ? ", " : "");
+                ASN1_STRING_length(text),
+                ASN1_STRING_get0_data(text),
+                i < n_status_strings - 1 ? ", " : "");
             ADVANCE_BUFFER;
         }
     }
@@ -239,7 +238,7 @@ char *snprint_PKIStatusInfo_parts(int status, int fail_info,
 }
 
 char *OSSL_CMP_snprint_PKIStatusInfo(const OSSL_CMP_PKISI *statusInfo,
-                                     char *buf, size_t bufsize)
+    char *buf, size_t bufsize)
 {
     int failure_info;
 
@@ -251,12 +250,12 @@ char *OSSL_CMP_snprint_PKIStatusInfo(const OSSL_CMP_PKISI *statusInfo,
     failure_info = ossl_cmp_pkisi_get_pkifailureinfo(statusInfo);
 
     return snprint_PKIStatusInfo_parts(ASN1_INTEGER_get(statusInfo->status),
-                                       failure_info,
-                                       statusInfo->statusString, buf, bufsize);
+        failure_info,
+        statusInfo->statusString, buf, bufsize);
 }
 
 char *OSSL_CMP_CTX_snprint_PKIStatus(const OSSL_CMP_CTX *ctx, char *buf,
-                                     size_t bufsize)
+    size_t bufsize)
 {
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
@@ -264,9 +263,9 @@ char *OSSL_CMP_CTX_snprint_PKIStatus(const OSSL_CMP_CTX *ctx, char *buf,
     }
 
     return snprint_PKIStatusInfo_parts(OSSL_CMP_CTX_get_status(ctx),
-                                       OSSL_CMP_CTX_get_failInfoCode(ctx),
-                                       OSSL_CMP_CTX_get0_statusString(ctx),
-                                       buf, bufsize);
+        OSSL_CMP_CTX_get_failInfoCode(ctx),
+        OSSL_CMP_CTX_get0_statusString(ctx),
+        buf, bufsize);
 }
 
 /*-
@@ -276,7 +275,7 @@ char *OSSL_CMP_CTX_snprint_PKIStatus(const OSSL_CMP_CTX *ctx, char *buf,
  * and TS_RESP_CTX_add_failure_info() in ../ts/ts_rsp_sign.c
  */
 OSSL_CMP_PKISI *OSSL_CMP_STATUSINFO_new(int status, int fail_info,
-                                        const char *text)
+    const char *text)
 {
     OSSL_CMP_PKISI *si = OSSL_CMP_PKISI_new();
     ASN1_UTF8STRING *utf8_text = NULL;
@@ -289,7 +288,7 @@ OSSL_CMP_PKISI *OSSL_CMP_STATUSINFO_new(int status, int fail_info,
 
     if (text != NULL) {
         if ((utf8_text = ASN1_UTF8STRING_new()) == NULL
-                || !ASN1_STRING_set(utf8_text, text, -1))
+            || !ASN1_STRING_set(utf8_text, text, -1))
             goto err;
         if ((si->statusString = sk_ASN1_UTF8STRING_new_null()) == NULL)
             goto err;
@@ -302,7 +301,7 @@ OSSL_CMP_PKISI *OSSL_CMP_STATUSINFO_new(int status, int fail_info,
     for (failure = 0; failure <= OSSL_CMP_PKIFAILUREINFO_MAX; failure++) {
         if ((fail_info & (1 << failure)) != 0) {
             if (si->failInfo == NULL
-                    && (si->failInfo = ASN1_BIT_STRING_new()) == NULL)
+                && (si->failInfo = ASN1_BIT_STRING_new()) == NULL)
                 goto err;
             if (!ASN1_BIT_STRING_set_bit(si->failInfo, failure, 1))
                 goto err;
@@ -310,7 +309,7 @@ OSSL_CMP_PKISI *OSSL_CMP_STATUSINFO_new(int status, int fail_info,
     }
     return si;
 
- err:
+err:
     OSSL_CMP_PKISI_free(si);
     ASN1_UTF8STRING_free(utf8_text);
     return NULL;
diff --git a/crypto/cmp/cmp_util.c b/crypto/cmp/cmp_util.c
index f3c21c5d914cd..13308addd68b0 100644
--- a/crypto/cmp/cmp_util.c
+++ b/crypto/cmp/cmp_util.c
@@ -25,13 +25,13 @@ int OSSL_CMP_log_open(void) /* is designed to be idempotent */
 #ifdef OPENSSL_NO_TRACE
     return 1;
 #else
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
     BIO *bio = BIO_new_fp(stdout, BIO_NOCLOSE);
 
     if (bio != NULL && OSSL_trace_set_channel(OSSL_TRACE_CATEGORY_CMP, bio))
         return 1;
     BIO_free(bio);
-# endif
+#endif
     ERR_raise(ERR_LIB_CMP, CMP_R_NO_STDIO);
     return 0;
 #endif
@@ -59,21 +59,19 @@ static OSSL_CMP_severity parse_level(const char *level)
     if (len > max_level_len)
         return -1;
     OPENSSL_strlcpy(level_copy, level, len + 1);
-    return
-        strcmp(level_copy, "EMERG") == 0 ? OSSL_CMP_LOG_EMERG :
-        strcmp(level_copy, "ALERT") == 0 ? OSSL_CMP_LOG_ALERT :
-        strcmp(level_copy, "CRIT") == 0 ? OSSL_CMP_LOG_CRIT :
-        strcmp(level_copy, "ERROR") == 0 ? OSSL_CMP_LOG_ERR :
-        strcmp(level_copy, "WARN") == 0 ? OSSL_CMP_LOG_WARNING :
-        strcmp(level_copy, "NOTE") == 0 ? OSSL_CMP_LOG_NOTICE :
-        strcmp(level_copy, "INFO") == 0 ? OSSL_CMP_LOG_INFO :
-        strcmp(level_copy, "DEBUG") == 0 ? OSSL_CMP_LOG_DEBUG :
-        -1;
+    return strcmp(level_copy, "EMERG") == 0 ? OSSL_CMP_LOG_EMERG : strcmp(level_copy, "ALERT") == 0 ? OSSL_CMP_LOG_ALERT
+        : strcmp(level_copy, "CRIT") == 0                                                           ? OSSL_CMP_LOG_CRIT
+        : strcmp(level_copy, "ERROR") == 0                                                          ? OSSL_CMP_LOG_ERR
+        : strcmp(level_copy, "WARN") == 0                                                           ? OSSL_CMP_LOG_WARNING
+        : strcmp(level_copy, "NOTE") == 0                                                           ? OSSL_CMP_LOG_NOTICE
+        : strcmp(level_copy, "INFO") == 0                                                           ? OSSL_CMP_LOG_INFO
+        : strcmp(level_copy, "DEBUG") == 0                                                          ? OSSL_CMP_LOG_DEBUG
+                                                                                                    : -1;
 }
 
 const char *ossl_cmp_log_parse_metadata(const char *buf,
-                                        OSSL_CMP_severity *level,
-                                        char **func, char **file, int *line)
+    OSSL_CMP_severity *level,
+    char **func, char **file, int *line)
 {
     const char *p_func = buf;
     const char *p_file = buf == NULL ? NULL : strchr(buf, ':');
@@ -121,29 +119,31 @@ static const char *improve_location_name(const char *func, const char *fallback)
         return func == NULL ? UNKNOWN_FUNC : func;
 
     return func == NULL || *func == '\0' || strcmp(func, UNKNOWN_FUNC) == 0
-        ? fallback : func;
+        ? fallback
+        : func;
 }
 
 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)
 {
-    const char *level_string =
-        level == OSSL_CMP_LOG_EMERG ? "EMERG" :
-        level == OSSL_CMP_LOG_ALERT ? "ALERT" :
-        level == OSSL_CMP_LOG_CRIT ? "CRIT" :
-        level == OSSL_CMP_LOG_ERR ? "error" :
-        level == OSSL_CMP_LOG_WARNING ? "warning" :
-        level == OSSL_CMP_LOG_NOTICE ? "NOTE" :
-        level == OSSL_CMP_LOG_INFO ? "info" :
-        level == OSSL_CMP_LOG_DEBUG ? "DEBUG" : "(unknown level)";
+    const char *level_string = level == OSSL_CMP_LOG_EMERG ? "EMERG" : level == OSSL_CMP_LOG_ALERT ? "ALERT"
+        : level == OSSL_CMP_LOG_CRIT                                                               ? "CRIT"
+        : level == OSSL_CMP_LOG_ERR                                                                ? "error"
+        : level == OSSL_CMP_LOG_WARNING                                                            ? "warning"
+        : level == OSSL_CMP_LOG_NOTICE                                                             ? "NOTE"
+        : level == OSSL_CMP_LOG_INFO                                                               ? "info"
+        : level == OSSL_CMP_LOG_DEBUG                                                              ? "DEBUG"
+                                                                                                   : "(unknown level)";
 
 #ifndef NDEBUG
     if (BIO_printf(bio, "%s:%s:%d:", improve_location_name(component, "CMP"),
-                   file, line) < 0)
+            file, line)
+        < 0)
         return 0;
 #endif
-    return BIO_printf(bio, OSSL_CMP_LOG_PREFIX"%s: %s\n",
-                      level_string, msg) >= 0;
+    return BIO_printf(bio, OSSL_CMP_LOG_PREFIX "%s: %s\n",
+               level_string, msg)
+        >= 0;
 }
 
 #define ERR_PRINT_BUF_SIZE 4096
@@ -156,8 +156,7 @@ void OSSL_CMP_print_errors_cb(OSSL_CMP_log_cb_t log_fn)
     int line, flags;
 
     while ((err = ERR_get_error_all(&file, &line, &func, &data, &flags)) != 0) {
-        const char *component =
-            improve_location_name(func, ERR_lib_error_string(err));
+        const char *component = improve_location_name(func, ERR_lib_error_string(err));
         unsigned long reason = ERR_GET_REASON(err);
         const char *rs = NULL;
         char rsbuf[256];
@@ -185,7 +184,7 @@ void OSSL_CMP_print_errors_cb(OSSL_CMP_log_cb_t log_fn)
 
             if (bio != NULL) {
                 OSSL_CMP_print_to_bio(bio, component, file, line,
-                                      OSSL_CMP_LOG_ERR, msg);
+                    OSSL_CMP_LOG_ERR, msg);
                 BIO_free(bio);
             }
 #else
@@ -199,7 +198,7 @@ void OSSL_CMP_print_errors_cb(OSSL_CMP_log_cb_t log_fn)
 }
 
 int ossl_cmp_X509_STORE_add1_certs(X509_STORE *store, STACK_OF(X509) *certs,
-                                   int only_self_signed)
+    int only_self_signed)
 {
     int i;
 
@@ -220,7 +219,7 @@ int ossl_cmp_X509_STORE_add1_certs(X509_STORE *store, STACK_OF(X509) *certs,
 }
 
 int ossl_cmp_sk_ASN1_UTF8STRING_push_str(STACK_OF(ASN1_UTF8STRING) *sk,
-                                         const char *text, int len)
+    const char *text, int len)
 {
     ASN1_UTF8STRING *utf8string;
 
@@ -234,13 +233,13 @@ int ossl_cmp_sk_ASN1_UTF8STRING_push_str(STACK_OF(ASN1_UTF8STRING) *sk,
         goto err;
     return 1;
 
- err:
+err:
     ASN1_UTF8STRING_free(utf8string);
     return 0;
 }
 
 int ossl_cmp_asn1_octet_string_set1(ASN1_OCTET_STRING **tgt,
-                                    const ASN1_OCTET_STRING *src)
+    const ASN1_OCTET_STRING *src)
 {
     ASN1_OCTET_STRING *new;
 
@@ -264,7 +263,7 @@ int ossl_cmp_asn1_octet_string_set1(ASN1_OCTET_STRING **tgt,
 }
 
 int ossl_cmp_asn1_octet_string_set1_bytes(ASN1_OCTET_STRING **tgt,
-                                          const unsigned char *bytes, int len)
+    const unsigned char *bytes, int len)
 {
     ASN1_OCTET_STRING *new = NULL;
 
@@ -274,7 +273,7 @@ int ossl_cmp_asn1_octet_string_set1_bytes(ASN1_OCTET_STRING **tgt,
     }
     if (bytes != NULL) {
         if ((new = ASN1_OCTET_STRING_new()) == NULL
-                || !(ASN1_OCTET_STRING_set(new, bytes, len))) {
+            || !(ASN1_OCTET_STRING_set(new, bytes, len))) {
             ASN1_OCTET_STRING_free(new);
             return 0;
         }
diff --git a/crypto/cmp/cmp_vfy.c b/crypto/cmp/cmp_vfy.c
index 47bf38b2af5da..873bee8b6ad37 100644
--- a/crypto/cmp/cmp_vfy.c
+++ b/crypto/cmp/cmp_vfy.c
@@ -23,7 +23,7 @@
 
 /* Verify a message protected by signature according to RFC section 5.1.3.3 */
 static int verify_signature(const OSSL_CMP_CTX *cmp_ctx,
-                            const OSSL_CMP_MSG *msg, X509 *cert)
+    const OSSL_CMP_MSG *msg, X509 *cert)
 {
     OSSL_CMP_PROTECTEDPART prot_part;
     EVP_PKEY *pubkey = NULL;
@@ -38,7 +38,7 @@ static int verify_signature(const OSSL_CMP_CTX *cmp_ctx,
         return 0;
     /* verify that keyUsage, if present, contains digitalSignature */
     if (!cmp_ctx->ignore_keyusage
-            && (X509_get_key_usage(cert) & X509v3_KU_DIGITAL_SIGNATURE) == 0) {
+        && (X509_get_key_usage(cert) & X509v3_KU_DIGITAL_SIGNATURE) == 0) {
         ERR_raise(ERR_LIB_CMP, CMP_R_MISSING_KEY_USAGE_DIGITALSIGNATURE);
         goto sig_err;
     }
@@ -53,21 +53,22 @@ static int verify_signature(const OSSL_CMP_CTX *cmp_ctx,
     prot_part.body = msg->body;
 
     if (ASN1_item_verify_ex(ASN1_ITEM_rptr(OSSL_CMP_PROTECTEDPART),
-                            msg->header->protectionAlg, msg->protection,
-                            &prot_part, NULL, pubkey, cmp_ctx->libctx,
-                            cmp_ctx->propq) > 0) {
+            msg->header->protectionAlg, msg->protection,
+            &prot_part, NULL, pubkey, cmp_ctx->libctx,
+            cmp_ctx->propq)
+        > 0) {
         res = 1;
         goto end;
     }
 
- sig_err:
+sig_err:
     res = ossl_x509_print_ex_brief(bio, cert, X509_FLAG_NO_EXTENSIONS);
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_VALIDATING_SIGNATURE);
     if (res)
         ERR_add_error_mem_bio("\n", bio);
     res = 0;
 
- end:
+end:
     EVP_PKEY_free(pubkey);
     BIO_free(bio);
 
@@ -85,10 +86,11 @@ static int verify_PBMAC(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
         return 0; /* failed to generate protection string! */
 
     valid = msg->protection != NULL && msg->protection->length >= 0
-            && msg->protection->type == protection->type
-            && msg->protection->length == protection->length
-            && CRYPTO_memcmp(msg->protection->data, protection->data,
-                             protection->length) == 0;
+        && msg->protection->type == protection->type
+        && msg->protection->length == protection->length
+        && CRYPTO_memcmp(msg->protection->data, protection->data,
+               protection->length)
+            == 0;
     ASN1_BIT_STRING_free(protection);
     if (!valid)
         ERR_raise(ERR_LIB_CMP, CMP_R_WRONG_PBM_VALUE);
@@ -104,7 +106,7 @@ static int verify_PBMAC(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
  * Returns 1 on successful validation and 0 otherwise.
  */
 int OSSL_CMP_validate_cert_path(const OSSL_CMP_CTX *ctx,
-                                X509_STORE *trusted_store, X509 *cert)
+    X509_STORE *trusted_store, X509 *cert)
 {
     int valid = 0;
     X509_STORE_CTX *csc = NULL;
@@ -121,8 +123,8 @@ int OSSL_CMP_validate_cert_path(const OSSL_CMP_CTX *ctx,
     }
 
     if ((csc = X509_STORE_CTX_new_ex(ctx->libctx, ctx->propq)) == NULL
-            || !X509_STORE_CTX_init(csc, trusted_store,
-                                    cert, ctx->untrusted))
+        || !X509_STORE_CTX_init(csc, trusted_store,
+            cert, ctx->untrusted))
         goto err;
 
     valid = X509_verify_cert(csc) > 0;
@@ -132,7 +134,7 @@ int OSSL_CMP_validate_cert_path(const OSSL_CMP_CTX *ctx,
     if (!valid && ERR_GET_REASON(err) != CMP_R_POTENTIALLY_INVALID_CERTIFICATE)
         ERR_raise(ERR_LIB_CMP, CMP_R_POTENTIALLY_INVALID_CERTIFICATE);
 
- err:
+err:
     /* directly output any fresh errors, needed for check_msg_find_cert() */
     OSSL_CMP_CTX_print_errors(ctx);
     X509_STORE_CTX_free(csc);
@@ -148,7 +150,7 @@ static int verify_cb_cert(X509_STORE *ts, X509 *cert, int err)
     if (ts == NULL || (verify_cb = X509_STORE_get_verify_cb(ts)) == NULL)
         return ok;
     if ((csc = X509_STORE_CTX_new()) != NULL
-            && X509_STORE_CTX_init(csc, ts, cert, NULL)) {
+        && X509_STORE_CTX_init(csc, ts, cert, NULL)) {
         X509_STORE_CTX_set_error(csc, err);
         X509_STORE_CTX_set_current_cert(csc, cert);
         ok = (*verify_cb)(0, csc);
@@ -159,8 +161,8 @@ static int verify_cb_cert(X509_STORE *ts, X509 *cert, int err)
 
 /* Return 0 if expect_name != NULL and there is no matching actual_name */
 static int check_name(const OSSL_CMP_CTX *ctx, int log_success,
-                      const char *actual_desc, const X509_NAME *actual_name,
-                      const char *expect_desc, const X509_NAME *expect_name)
+    const char *actual_desc, const X509_NAME *actual_name,
+    const char *expect_desc, const X509_NAME *expect_name)
 {
     char *str;
 
@@ -176,7 +178,7 @@ static int check_name(const OSSL_CMP_CTX *ctx, int log_success,
     if (X509_NAME_cmp(actual_name, expect_name) == 0) {
         if (log_success && str != NULL)
             ossl_cmp_log3(INFO, ctx, " %s matches %s: %s",
-                          actual_desc, expect_desc, str);
+                actual_desc, expect_desc, str);
         OPENSSL_free(str);
         return 1;
     }
@@ -192,8 +194,8 @@ static int check_name(const OSSL_CMP_CTX *ctx, int log_success,
 
 /* Return 0 if skid != NULL and there is no matching subject key ID in cert */
 static int check_kid(const OSSL_CMP_CTX *ctx,
-                     const ASN1_OCTET_STRING *ckid,
-                     const ASN1_OCTET_STRING *skid)
+    const ASN1_OCTET_STRING *ckid,
+    const ASN1_OCTET_STRING *skid)
 {
     char *str;
 
@@ -223,7 +225,7 @@ static int check_kid(const OSSL_CMP_CTX *ctx,
 }
 
 static int already_checked(const X509 *cert,
-                           const STACK_OF(X509) *already_checked)
+    const STACK_OF(X509) *already_checked)
 {
     int i;
 
@@ -242,10 +244,10 @@ static int already_checked(const X509 *cert,
  * Returns 0 on error or not acceptable, else 1.
  */
 static int cert_acceptable(const OSSL_CMP_CTX *ctx,
-                           const char *desc1, const char *desc2, X509 *cert,
-                           const STACK_OF(X509) *already_checked1,
-                           const STACK_OF(X509) *already_checked2,
-                           const OSSL_CMP_MSG *msg)
+    const char *desc1, const char *desc2, X509 *cert,
+    const STACK_OF(X509) *already_checked1,
+    const STACK_OF(X509) *already_checked2,
+    const OSSL_CMP_MSG *msg)
 {
     X509_STORE *ts = ctx->trusted;
     int self_issued = X509_check_issued(cert, cert) == X509_V_OK;
@@ -254,7 +256,7 @@ static int cert_acceptable(const OSSL_CMP_CTX *ctx,
     int time_cmp;
 
     ossl_cmp_log3(INFO, ctx, " considering %s%s %s with..",
-                  self_issued ? "self-issued ": "", desc1, desc2);
+        self_issued ? "self-issued " : "", desc1, desc2);
     if ((str = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0)) != NULL)
         ossl_cmp_log1(INFO, ctx, "  subject = %s", str);
     OPENSSL_free(str);
@@ -266,27 +268,26 @@ static int cert_acceptable(const OSSL_CMP_CTX *ctx,
     }
 
     if (already_checked(cert, already_checked1)
-            || already_checked(cert, already_checked2)) {
+        || already_checked(cert, already_checked2)) {
         ossl_cmp_info(ctx, " cert has already been checked");
         return 0;
     }
 
     time_cmp = X509_cmp_timeframe(vpm, X509_get0_notBefore(cert),
-                                  X509_get0_notAfter(cert));
+        X509_get0_notAfter(cert));
     if (time_cmp != 0) {
         int err = time_cmp > 0 ? X509_V_ERR_CERT_HAS_EXPIRED
                                : X509_V_ERR_CERT_NOT_YET_VALID;
 
-        ossl_cmp_warn(ctx, time_cmp > 0 ? "cert has expired"
-                                        : "cert is not yet valid");
+        ossl_cmp_warn(ctx, time_cmp > 0 ? "cert has expired" : "cert is not yet valid");
         if (ctx->log_cb != NULL /* logging not temporarily disabled */
-                && verify_cb_cert(ts, cert, err) <= 0)
+            && verify_cb_cert(ts, cert, err) <= 0)
             return 0;
     }
 
     if (!check_name(ctx, 1,
-                    "cert subject", X509_get_subject_name(cert),
-                    "sender field", msg->header->sender->d.directoryName))
+            "cert subject", X509_get_subject_name(cert),
+            "sender field", msg->header->sender->d.directoryName))
         return 0;
 
     if (!check_kid(ctx, X509_get0_subject_key_id(cert), msg->header->senderKID))
@@ -306,13 +307,13 @@ static int cert_acceptable(const OSSL_CMP_CTX *ctx,
 }
 
 static int check_cert_path(const OSSL_CMP_CTX *ctx, X509_STORE *store,
-                           X509 *scrt)
+    X509 *scrt)
 {
     if (OSSL_CMP_validate_cert_path(ctx, store, scrt))
         return 1;
 
     ossl_cmp_warn(ctx,
-                  "msg signature validates but cert path validation failed");
+        "msg signature validates but cert path validation failed");
     return 0;
 }
 
@@ -324,7 +325,7 @@ static int check_cert_path(const OSSL_CMP_CTX *ctx, X509_STORE *store,
  * provided it also can validate the newly enrolled certificate
  */
 static int check_cert_path_3gpp(const OSSL_CMP_CTX *ctx,
-                                const OSSL_CMP_MSG *msg, X509 *scrt)
+    const OSSL_CMP_MSG *msg, X509 *scrt)
 {
     int valid = 0;
     X509_STORE *store;
@@ -333,43 +334,40 @@ static int check_cert_path_3gpp(const OSSL_CMP_CTX *ctx,
         return 0;
 
     if ((store = X509_STORE_new()) == NULL
-            || !ossl_cmp_X509_STORE_add1_certs(store, msg->extraCerts,
-                                               1 /* self-issued only */))
+        || !ossl_cmp_X509_STORE_add1_certs(store, msg->extraCerts,
+            1 /* self-issued only */))
         goto err;
 
     /* store does not include CRLs */
     valid = OSSL_CMP_validate_cert_path(ctx, store, scrt);
     if (!valid) {
         ossl_cmp_warn(ctx,
-                      "also exceptional 3GPP mode cert path validation failed");
-    } else {
+            "also exceptional 3GPP mode cert path validation failed");
+    } else if (OSSL_CMP_MSG_get_bodytype(msg) == OSSL_CMP_PKIBODY_IP) {
         /*
          * verify that the newly enrolled certificate (which assumed rid ==
          * OSSL_CMP_CERTREQID) can also be validated with the same trusted store
          */
-        OSSL_CMP_CERTRESPONSE *crep =
-            ossl_cmp_certrepmessage_get0_certresponse(msg->body->value.ip,
-                                                      OSSL_CMP_CERTREQID);
-        X509 *newcrt = ossl_cmp_certresponse_get1_cert(ctx, crep);
+        OSSL_CMP_CERTRESPONSE *crep = ossl_cmp_certrepmessage_get0_certresponse(msg->body->value.ip,
+            OSSL_CMP_CERTREQID);
+        X509 *newcrt = NULL;
 
-        /*
-         * maybe better use get_cert_status() from cmp_client.c, which catches
-         * errors
-         */
-        valid = OSSL_CMP_validate_cert_path(ctx, store, newcrt);
+        valid = crep != NULL
+            && (newcrt = ossl_cmp_certresponse_get1_cert(ctx, crep)) != NULL
+            && OSSL_CMP_validate_cert_path(ctx, store, newcrt);
         X509_free(newcrt);
     }
 
- err:
+err:
     X509_STORE_free(store);
     return valid;
 }
 
 static int check_msg_given_cert(const OSSL_CMP_CTX *ctx, X509 *cert,
-                                const OSSL_CMP_MSG *msg)
+    const OSSL_CMP_MSG *msg)
 {
     return cert_acceptable(ctx, "previously validated", "sender cert",
-                           cert, NULL, NULL, msg)
+               cert, NULL, NULL, msg)
         && (check_cert_path(ctx, ctx->trusted, cert)
             || check_cert_path_3gpp(ctx, msg, cert));
 }
@@ -380,10 +378,10 @@ static int check_msg_given_cert(const OSSL_CMP_CTX *ctx, X509 *cert,
  * On success cache the found cert using ossl_cmp_ctx_set1_validatedSrvCert().
  */
 static int check_msg_with_certs(OSSL_CMP_CTX *ctx, const STACK_OF(X509) *certs,
-                                const char *desc,
-                                const STACK_OF(X509) *already_checked1,
-                                const STACK_OF(X509) *already_checked2,
-                                const OSSL_CMP_MSG *msg, int mode_3gpp)
+    const char *desc,
+    const STACK_OF(X509) *already_checked1,
+    const STACK_OF(X509) *already_checked2,
+    const OSSL_CMP_MSG *msg, int mode_3gpp)
 {
     int in_extraCerts = already_checked1 == NULL;
     int n_acceptable_certs = 0;
@@ -400,7 +398,7 @@ static int check_msg_with_certs(OSSL_CMP_CTX *ctx, const STACK_OF(X509) *certs,
         if (!ossl_assert(cert != NULL))
             return 0;
         if (!cert_acceptable(ctx, "cert from", desc, cert,
-                             already_checked1, already_checked2, msg))
+                already_checked1, already_checked2, msg))
             continue;
         n_acceptable_certs++;
         if (mode_3gpp ? check_cert_path_3gpp(ctx, msg, cert)
@@ -420,36 +418,33 @@ static int check_msg_with_certs(OSSL_CMP_CTX *ctx, const STACK_OF(X509) *certs,
  * On success cache the found cert using ossl_cmp_ctx_set1_validatedSrvCert().
  */
 static int check_msg_all_certs(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
-                               int mode_3gpp)
+    int mode_3gpp)
 {
     int ret = 0;
 
     if (ctx->permitTAInExtraCertsForIR
-            && OSSL_CMP_MSG_get_bodytype(msg) == OSSL_CMP_PKIBODY_IP)
-        ossl_cmp_info(ctx, mode_3gpp ?
-                      "normal mode failed; trying now 3GPP mode trusting extraCerts"
-                      : "trying first normal mode using trust store");
+        && OSSL_CMP_MSG_get_bodytype(msg) == OSSL_CMP_PKIBODY_IP)
+        ossl_cmp_info(ctx, mode_3gpp ? "normal mode failed; trying now 3GPP mode trusting extraCerts" : "trying first normal mode using trust store");
     else if (mode_3gpp)
         return 0;
 
     if (check_msg_with_certs(ctx, msg->extraCerts, "extraCerts",
-                             NULL, NULL, msg, mode_3gpp))
+            NULL, NULL, msg, mode_3gpp))
         return 1;
     if (check_msg_with_certs(ctx, ctx->untrusted, "untrusted certs",
-                             msg->extraCerts, NULL, msg, mode_3gpp))
+            msg->extraCerts, NULL, msg, mode_3gpp))
         return 1;
 
     if (ctx->trusted == NULL) {
-        ossl_cmp_warn(ctx, mode_3gpp ? "no self-issued extraCerts"
-                                     : "no trusted store");
+        ossl_cmp_warn(ctx, mode_3gpp ? "no self-issued extraCerts" : "no trusted store");
     } else {
         STACK_OF(X509) *trusted = X509_STORE_get1_all_certs(ctx->trusted);
 
         ret = check_msg_with_certs(ctx, trusted,
-                                   mode_3gpp ? "self-issued extraCerts"
-                                             : "certs in trusted store",
-                                   msg->extraCerts, ctx->untrusted,
-                                   msg, mode_3gpp);
+            mode_3gpp ? "self-issued extraCerts"
+                      : "certs in trusted store",
+            msg->extraCerts, ctx->untrusted,
+            msg, mode_3gpp);
         OSSL_STACK_OF_X509_free(trusted);
     }
     return ret;
@@ -498,12 +493,12 @@ static int check_msg_find_cert(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
         (void)ossl_cmp_ctx_set1_validatedSrvCert(ctx, NULL);
         /* re-do the above check (just) for adding diagnostic information */
         ossl_cmp_info(ctx,
-                      "trying to verify msg signature with previously validated cert");
+            "trying to verify msg signature with previously validated cert");
         (void)check_msg_given_cert(ctx, scrt, msg);
     }
 
     res = check_msg_all_certs(ctx, msg, 0 /* using ctx->trusted */)
-            || check_msg_all_certs(ctx, msg, 1 /* 3gpp */);
+        || check_msg_all_certs(ctx, msg, 1 /* 3gpp */);
     ctx->log_cb = backup_log_cb;
     if (res) {
         /* discard any diagnostic information on trying to use certs */
@@ -538,7 +533,7 @@ static int check_msg_find_cert(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
         ERR_add_error_txt(NULL, skid_str);
     }
 
- end:
+end:
     OPENSSL_free(sname);
     OPENSSL_free(skid_str);
     return res;
@@ -566,13 +561,13 @@ int OSSL_CMP_validate_msg(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
 
     ossl_cmp_debug(ctx, "validating CMP message");
     if (ctx == NULL || msg == NULL
-            || msg->header == NULL || msg->body == NULL) {
+        || msg->header == NULL || msg->body == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT);
         return 0;
     }
 
     if (msg->header->protectionAlg == NULL /* unprotected message */
-            || msg->protection == NULL || msg->protection->data == NULL) {
+        || msg->protection == NULL || msg->protection->data == NULL) {
         ERR_raise(ERR_LIB_CMP, CMP_R_MISSING_PROTECTION);
         return 0;
     }
@@ -587,7 +582,7 @@ int OSSL_CMP_validate_msg(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
         }
         if (verify_PBMAC(ctx, msg)) {
             /*
-             * RFC 4210, 5.3.2: 'Note that if the PKI Message Protection is
+             * RFC 9810, 5.3.2: 'Note that if the PKI message protection is
              * "shared secret information", then any certificate transported in
              * the caPubs field may be directly trusted as a root CA
              * certificate by the initiator.'
@@ -612,7 +607,7 @@ int OSSL_CMP_validate_msg(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
                 break;
             }
             ossl_cmp_debug(ctx,
-                           "successfully validated PBM-based CMP message protection");
+                "successfully validated PBM-based CMP message protection");
             return 1;
         }
         ossl_cmp_warn(ctx, "verifying PBM-based CMP message protection failed");
@@ -638,15 +633,16 @@ int OSSL_CMP_validate_msg(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
                 return 0;
             }
             if (check_msg_find_cert(ctx, msg)) {
-                ossl_cmp_debug(ctx,
-                               "successfully validated signature-based CMP message protection using trust store");
+                ossl_cmp_log1(DEBUG, ctx,
+                    "successfully validated signature-based CMP message protection using trust store%s",
+                    ctx->permitTAInExtraCertsForIR ? " or 3GPP mode" : "");
                 return 1;
             }
         } else { /* use pinned sender cert */
             /* use ctx->srvCert for signature check even if not acceptable */
             if (verify_signature(ctx, msg, scrt)) {
                 ossl_cmp_debug(ctx,
-                               "successfully validated signature-based CMP message protection using pinned server cert");
+                    "successfully validated signature-based CMP message protection using pinned server cert");
                 return ossl_cmp_ctx_set1_validatedSrvCert(ctx, scrt);
             }
             ossl_cmp_warn(ctx, "CMP message signature verification failed");
@@ -658,7 +654,7 @@ int OSSL_CMP_validate_msg(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg)
 }
 
 static int check_transactionID_or_nonce(ASN1_OCTET_STRING *expected,
-                                        ASN1_OCTET_STRING *actual, int reason)
+    ASN1_OCTET_STRING *actual, int reason)
 {
     if (expected != NULL
         && (actual == NULL || ASN1_OCTET_STRING_cmp(expected, actual) != 0)) {
@@ -666,12 +662,12 @@ static int check_transactionID_or_nonce(ASN1_OCTET_STRING *expected,
         char *expected_str, *actual_str;
 
         expected_str = i2s_ASN1_OCTET_STRING(NULL, expected);
-        actual_str = actual == NULL ? NULL: i2s_ASN1_OCTET_STRING(NULL, actual);
+        actual_str = actual == NULL ? NULL : i2s_ASN1_OCTET_STRING(NULL, actual);
         ERR_raise_data(ERR_LIB_CMP, reason,
-                       "expected = %s, actual = %s",
-                       expected_str == NULL ? "?" : expected_str,
-                       actual == NULL ? "(none)" :
-                       actual_str == NULL ? "?" : actual_str);
+            "expected = %s, actual = %s",
+            expected_str == NULL ? "?" : expected_str,
+            actual == NULL ? "(none)" : actual_str == NULL ? "?"
+                                                           : actual_str);
         OPENSSL_free(expected_str);
         OPENSSL_free(actual_str);
         return 0;
@@ -701,7 +697,7 @@ static int check_transactionID_or_nonce(ASN1_OCTET_STRING *expected,
  * Returns 1 on success, 0 on error.
  */
 int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
-                              ossl_cmp_allow_unprotected_cb_t cb, int cb_arg)
+    ossl_cmp_allow_unprotected_cb_t cb, int cb_arg)
 {
     OSSL_CMP_PKIHEADER *hdr;
     const X509_NAME *expected_sender;
@@ -730,10 +726,10 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
          * misused certificate of an unauthorized entity of a trusted hierarchy.
          */
         if (!check_name(ctx, 0, "sender DN field", actual_sender,
-                        "expected sender", expected_sender)) {
+                "expected sender", expected_sender)) {
             str = X509_NAME_oneline(actual_sender, NULL, 0);
             ERR_raise_data(ERR_LIB_CMP, CMP_R_UNEXPECTED_SENDER,
-                           str != NULL ? str : "<unknown>");
+                str != NULL ? str : "<unknown>");
             OPENSSL_free(str);
             return 0;
         }
@@ -743,7 +739,7 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
     num_added = sk_X509_num(msg->extraCerts);
     if (num_added > 10)
         ossl_cmp_log1(WARN, ctx, "received CMP message contains %d extraCerts",
-                      num_added);
+            num_added);
     /*
      * Store any provided extraCerts in ctx for use in OSSL_CMP_validate_msg()
      * and for future use, such that they are available to ctx->certConf_cb and
@@ -755,9 +751,9 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
      */
     num_untrusted = ctx->untrusted == NULL ? 0 : sk_X509_num(ctx->untrusted);
     res = ossl_x509_add_certs_new(&ctx->untrusted, msg->extraCerts,
-                                  /* this allows self-signed certs */
-                                  X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP
-                                  | X509_ADD_FLAG_PREPEND);
+        /* this allows self-signed certs */
+        X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP
+            | X509_ADD_FLAG_PREPEND);
     num_added = (ctx->untrusted == NULL ? 0 : sk_X509_num(ctx->untrusted))
         - num_untrusted;
     if (!res) {
@@ -792,7 +788,7 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
 
     /* check CMP version number in header */
     if (ossl_cmp_hdr_get_pvno(hdr) != OSSL_CMP_PVNO_2
-            && ossl_cmp_hdr_get_pvno(hdr) != OSSL_CMP_PVNO_3) {
+        && ossl_cmp_hdr_get_pvno(hdr) != OSSL_CMP_PVNO_3) {
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
         ERR_raise(ERR_LIB_CMP, CMP_R_UNEXPECTED_PVNO);
         return 0;
@@ -808,7 +804,7 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
 
     /* compare received transactionID with the expected one in previous msg */
     if (!check_transactionID_or_nonce(ctx->transactionID, hdr->transactionID,
-                                      CMP_R_TRANSACTIONID_UNMATCHED))
+            CMP_R_TRANSACTIONID_UNMATCHED))
         return 0;
 
     /*
@@ -818,14 +814,14 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
     (void)ERR_set_mark();
     /* compare received nonce with the one we sent */
     if (!check_transactionID_or_nonce(ctx->senderNonce, hdr->recipNonce,
-                                      CMP_R_RECIPNONCE_UNMATCHED)) {
+            CMP_R_RECIPNONCE_UNMATCHED)) {
         /* check if we are polling and received final response */
         if (ctx->first_senderNonce == NULL
             || OSSL_CMP_MSG_get_bodytype(msg) == OSSL_CMP_PKIBODY_POLLREP
             /* compare received nonce with our sender nonce at poll start */
             || !check_transactionID_or_nonce(ctx->first_senderNonce,
-                                             hdr->recipNonce,
-                                             CMP_R_RECIPNONCE_UNMATCHED)) {
+                hdr->recipNonce,
+                CMP_R_RECIPNONCE_UNMATCHED)) {
             (void)ERR_clear_last_mark();
             return 0;
         }
@@ -838,7 +834,7 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
         return 0;
 
     /*
-     * RFC 4210 section 5.1.1 states: the recipNonce is copied from
+     * RFC 9810 section 5.1.1 states: the recipNonce is copied from
      * the senderNonce of the previous message in the transaction.
      * --> Store for setting in next message
      */
@@ -847,7 +843,7 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
 
     if (ossl_cmp_hdr_get_protection_nid(hdr) == NID_id_PasswordBasedMAC) {
         /*
-         * RFC 4210, 5.3.2: 'Note that if the PKI Message Protection is
+         * RFC 9810, 5.3.2: 'Note that if the PKI message protection is
          * "shared secret information", then any certificate transported in
          * the caPubs field may be directly trusted as a root CA
          * certificate by the initiator.'
@@ -874,30 +870,29 @@ int ossl_cmp_msg_check_update(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
 }
 
 int ossl_cmp_verify_popo(const OSSL_CMP_CTX *ctx,
-                         const OSSL_CMP_MSG *msg, int acceptRAVerified)
+    const OSSL_CMP_MSG *msg, int acceptRAVerified)
 {
     if (!ossl_assert(msg != NULL && msg->body != NULL))
         return 0;
     switch (msg->body->type) {
-    case OSSL_CMP_PKIBODY_P10CR:
-        {
-            X509_REQ *req = msg->body->value.p10cr;
+    case OSSL_CMP_PKIBODY_P10CR: {
+        X509_REQ *req = msg->body->value.p10cr;
 
-            if (X509_REQ_verify_ex(req, X509_REQ_get0_pubkey(req), ctx->libctx,
-                                   ctx->propq) <= 0) {
+        if (X509_REQ_verify_ex(req, X509_REQ_get0_pubkey(req), ctx->libctx,
+                ctx->propq)
+            <= 0) {
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-                ERR_raise(ERR_LIB_CMP, CMP_R_REQUEST_NOT_ACCEPTED);
-                return 0;
+            ERR_raise(ERR_LIB_CMP, CMP_R_REQUEST_NOT_ACCEPTED);
+            return 0;
 #endif
-            }
         }
-        break;
+    } break;
     case OSSL_CMP_PKIBODY_IR:
     case OSSL_CMP_PKIBODY_CR:
     case OSSL_CMP_PKIBODY_KUR:
         if (!OSSL_CRMF_MSGS_verify_popo(msg->body->value.ir, OSSL_CMP_CERTREQID,
-                                        acceptRAVerified,
-                                        ctx->libctx, ctx->propq)) {
+                acceptRAVerified,
+                ctx->libctx, ctx->propq)) {
 #ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
             return 0;
 #endif
diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c
index 1ed2399617755..580850bc93951 100644
--- a/crypto/cms/cms_asn1.c
+++ b/crypto/cms/cms_asn1.c
@@ -13,38 +13,29 @@
 #include <openssl/cms.h>
 #include "cms_local.h"
 
-
 ASN1_SEQUENCE(CMS_IssuerAndSerialNumber) = {
-        ASN1_SIMPLE(CMS_IssuerAndSerialNumber, issuer, X509_NAME),
-        ASN1_SIMPLE(CMS_IssuerAndSerialNumber, serialNumber, ASN1_INTEGER)
+    ASN1_SIMPLE(CMS_IssuerAndSerialNumber, issuer, X509_NAME),
+    ASN1_SIMPLE(CMS_IssuerAndSerialNumber, serialNumber, ASN1_INTEGER)
 } ASN1_SEQUENCE_END(CMS_IssuerAndSerialNumber)
 
 ASN1_SEQUENCE(CMS_OtherCertificateFormat) = {
-        ASN1_SIMPLE(CMS_OtherCertificateFormat, otherCertFormat, ASN1_OBJECT),
-        ASN1_OPT(CMS_OtherCertificateFormat, otherCert, ASN1_ANY)
+    ASN1_SIMPLE(CMS_OtherCertificateFormat, otherCertFormat, ASN1_OBJECT),
+    ASN1_OPT(CMS_OtherCertificateFormat, otherCert, ASN1_ANY)
 } static_ASN1_SEQUENCE_END(CMS_OtherCertificateFormat)
 
-ASN1_CHOICE(CMS_CertificateChoices) = {
-        ASN1_SIMPLE(CMS_CertificateChoices, d.certificate, X509),
-        ASN1_IMP(CMS_CertificateChoices, d.extendedCertificate, ASN1_SEQUENCE, 0),
-        ASN1_IMP(CMS_CertificateChoices, d.v1AttrCert, ASN1_SEQUENCE, 1),
-        ASN1_IMP(CMS_CertificateChoices, d.v2AttrCert, ASN1_SEQUENCE, 2),
-        ASN1_IMP(CMS_CertificateChoices, d.other, CMS_OtherCertificateFormat, 3)
-} ASN1_CHOICE_END(CMS_CertificateChoices)
+    ASN1_CHOICE(CMS_CertificateChoices)
+    = { ASN1_SIMPLE(CMS_CertificateChoices, d.certificate, X509), ASN1_IMP(CMS_CertificateChoices, d.extendedCertificate, ASN1_SEQUENCE, 0), ASN1_IMP(CMS_CertificateChoices, d.v1AttrCert, ASN1_SEQUENCE, 1), ASN1_IMP(CMS_CertificateChoices, d.v2AttrCert, ASN1_SEQUENCE, 2), ASN1_IMP(CMS_CertificateChoices, d.other, CMS_OtherCertificateFormat, 3) } ASN1_CHOICE_END(CMS_CertificateChoices)
 
 ASN1_CHOICE(CMS_SignerIdentifier) = {
-        ASN1_SIMPLE(CMS_SignerIdentifier, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
-        ASN1_IMP(CMS_SignerIdentifier, d.subjectKeyIdentifier, ASN1_OCTET_STRING, 0)
+    ASN1_SIMPLE(CMS_SignerIdentifier, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
+    ASN1_IMP(CMS_SignerIdentifier, d.subjectKeyIdentifier, ASN1_OCTET_STRING, 0)
 } static_ASN1_CHOICE_END(CMS_SignerIdentifier)
 
-ASN1_NDEF_SEQUENCE(CMS_EncapsulatedContentInfo) = {
-        ASN1_SIMPLE(CMS_EncapsulatedContentInfo, eContentType, ASN1_OBJECT),
-        ASN1_NDEF_EXP_OPT(CMS_EncapsulatedContentInfo, eContent, ASN1_OCTET_STRING_NDEF, 0)
-} static_ASN1_NDEF_SEQUENCE_END(CMS_EncapsulatedContentInfo)
+    ASN1_NDEF_SEQUENCE(CMS_EncapsulatedContentInfo)
+    = { ASN1_SIMPLE(CMS_EncapsulatedContentInfo, eContentType, ASN1_OBJECT), ASN1_NDEF_EXP_OPT(CMS_EncapsulatedContentInfo, eContent, ASN1_OCTET_STRING_NDEF, 0) } static_ASN1_NDEF_SEQUENCE_END(CMS_EncapsulatedContentInfo)
 
-/* Minor tweak to operation: free up signer key, cert */
-static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                     void *exarg)
+    /* Minor tweak to operation: free up signer key, cert */
+    static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
 {
     if (operation == ASN1_OP_FREE_POST) {
         CMS_SignerInfo *si = (CMS_SignerInfo *)*pval;
@@ -57,42 +48,39 @@ static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_SEQUENCE_cb(CMS_SignerInfo, cms_si_cb) = {
-        ASN1_EMBED(CMS_SignerInfo, version, INT32),
-        ASN1_SIMPLE(CMS_SignerInfo, sid, CMS_SignerIdentifier),
-        ASN1_SIMPLE(CMS_SignerInfo, digestAlgorithm, X509_ALGOR),
-        ASN1_IMP_SET_OF_OPT(CMS_SignerInfo, signedAttrs, X509_ATTRIBUTE, 0),
-        ASN1_SIMPLE(CMS_SignerInfo, signatureAlgorithm, X509_ALGOR),
-        ASN1_SIMPLE(CMS_SignerInfo, signature, ASN1_OCTET_STRING),
-        ASN1_IMP_SET_OF_OPT(CMS_SignerInfo, unsignedAttrs, X509_ATTRIBUTE, 1)
+    ASN1_EMBED(CMS_SignerInfo, version, INT32),
+    ASN1_SIMPLE(CMS_SignerInfo, sid, CMS_SignerIdentifier),
+    ASN1_SIMPLE(CMS_SignerInfo, digestAlgorithm, X509_ALGOR),
+    ASN1_IMP_SET_OF_OPT(CMS_SignerInfo, signedAttrs, X509_ATTRIBUTE, 0),
+    ASN1_SIMPLE(CMS_SignerInfo, signatureAlgorithm, X509_ALGOR),
+    ASN1_SIMPLE(CMS_SignerInfo, signature, ASN1_OCTET_STRING),
+    ASN1_IMP_SET_OF_OPT(CMS_SignerInfo, unsignedAttrs, X509_ATTRIBUTE, 1)
 } ASN1_SEQUENCE_END_cb(CMS_SignerInfo, CMS_SignerInfo)
 
 ASN1_SEQUENCE(CMS_OtherRevocationInfoFormat) = {
-        ASN1_SIMPLE(CMS_OtherRevocationInfoFormat, otherRevInfoFormat, ASN1_OBJECT),
-        ASN1_OPT(CMS_OtherRevocationInfoFormat, otherRevInfo, ASN1_ANY)
+    ASN1_SIMPLE(CMS_OtherRevocationInfoFormat, otherRevInfoFormat, ASN1_OBJECT),
+    ASN1_OPT(CMS_OtherRevocationInfoFormat, otherRevInfo, ASN1_ANY)
 } static_ASN1_SEQUENCE_END(CMS_OtherRevocationInfoFormat)
 
-ASN1_CHOICE(CMS_RevocationInfoChoice) = {
-        ASN1_SIMPLE(CMS_RevocationInfoChoice, d.crl, X509_CRL),
-        ASN1_IMP(CMS_RevocationInfoChoice, d.other, CMS_OtherRevocationInfoFormat, 1)
-} ASN1_CHOICE_END(CMS_RevocationInfoChoice)
+    ASN1_CHOICE(CMS_RevocationInfoChoice)
+    = { ASN1_SIMPLE(CMS_RevocationInfoChoice, d.crl, X509_CRL), ASN1_IMP(CMS_RevocationInfoChoice, d.other, CMS_OtherRevocationInfoFormat, 1) } ASN1_CHOICE_END(CMS_RevocationInfoChoice)
 
 ASN1_NDEF_SEQUENCE(CMS_SignedData) = {
-        ASN1_EMBED(CMS_SignedData, version, INT32),
-        ASN1_SET_OF(CMS_SignedData, digestAlgorithms, X509_ALGOR),
-        ASN1_SIMPLE(CMS_SignedData, encapContentInfo, CMS_EncapsulatedContentInfo),
-        ASN1_IMP_SET_OF_OPT(CMS_SignedData, certificates, CMS_CertificateChoices, 0),
-        ASN1_IMP_SET_OF_OPT(CMS_SignedData, crls, CMS_RevocationInfoChoice, 1),
-        ASN1_SET_OF(CMS_SignedData, signerInfos, CMS_SignerInfo)
+    ASN1_EMBED(CMS_SignedData, version, INT32),
+    ASN1_SET_OF(CMS_SignedData, digestAlgorithms, X509_ALGOR),
+    ASN1_SIMPLE(CMS_SignedData, encapContentInfo, CMS_EncapsulatedContentInfo),
+    ASN1_IMP_SET_OF_OPT(CMS_SignedData, certificates, CMS_CertificateChoices, 0),
+    ASN1_IMP_SET_OF_OPT(CMS_SignedData, crls, CMS_RevocationInfoChoice, 1),
+    ASN1_SET_OF(CMS_SignedData, signerInfos, CMS_SignerInfo)
 } ASN1_NDEF_SEQUENCE_END(CMS_SignedData)
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(CMS_SignedData)
 
 ASN1_SEQUENCE(CMS_OriginatorInfo) = {
-        ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, certificates, CMS_CertificateChoices, 0),
-        ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, crls, CMS_RevocationInfoChoice, 1)
+    ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, certificates, CMS_CertificateChoices, 0),
+    ASN1_IMP_SET_OF_OPT(CMS_OriginatorInfo, crls, CMS_RevocationInfoChoice, 1)
 } static_ASN1_SEQUENCE_END(CMS_OriginatorInfo)
 
-static int cms_ec_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                     void *exarg)
+    static int cms_ec_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
 {
     CMS_EncryptedContentInfo *ec = (CMS_EncryptedContentInfo *)*pval;
 
@@ -102,36 +90,35 @@ static int cms_ec_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_NDEF_SEQUENCE_cb(CMS_EncryptedContentInfo, cms_ec_cb) = {
-        ASN1_SIMPLE(CMS_EncryptedContentInfo, contentType, ASN1_OBJECT),
-        ASN1_SIMPLE(CMS_EncryptedContentInfo, contentEncryptionAlgorithm, X509_ALGOR),
-        ASN1_IMP_OPT(CMS_EncryptedContentInfo, encryptedContent, ASN1_OCTET_STRING_NDEF, 0)
+    ASN1_SIMPLE(CMS_EncryptedContentInfo, contentType, ASN1_OBJECT),
+    ASN1_SIMPLE(CMS_EncryptedContentInfo, contentEncryptionAlgorithm, X509_ALGOR),
+    ASN1_IMP_OPT(CMS_EncryptedContentInfo, encryptedContent, ASN1_OCTET_STRING_NDEF, 0)
 } ASN1_NDEF_SEQUENCE_END_cb(CMS_EncryptedContentInfo, CMS_EncryptedContentInfo)
 
 ASN1_SEQUENCE(CMS_KeyTransRecipientInfo) = {
-        ASN1_EMBED(CMS_KeyTransRecipientInfo, version, INT32),
-        ASN1_SIMPLE(CMS_KeyTransRecipientInfo, rid, CMS_SignerIdentifier),
-        ASN1_SIMPLE(CMS_KeyTransRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
-        ASN1_SIMPLE(CMS_KeyTransRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
+    ASN1_EMBED(CMS_KeyTransRecipientInfo, version, INT32),
+    ASN1_SIMPLE(CMS_KeyTransRecipientInfo, rid, CMS_SignerIdentifier),
+    ASN1_SIMPLE(CMS_KeyTransRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
+    ASN1_SIMPLE(CMS_KeyTransRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(CMS_KeyTransRecipientInfo)
 
 ASN1_SEQUENCE(CMS_OtherKeyAttribute) = {
-        ASN1_SIMPLE(CMS_OtherKeyAttribute, keyAttrId, ASN1_OBJECT),
-        ASN1_OPT(CMS_OtherKeyAttribute, keyAttr, ASN1_ANY)
+    ASN1_SIMPLE(CMS_OtherKeyAttribute, keyAttrId, ASN1_OBJECT),
+    ASN1_OPT(CMS_OtherKeyAttribute, keyAttr, ASN1_ANY)
 } ASN1_SEQUENCE_END(CMS_OtherKeyAttribute)
 
 ASN1_SEQUENCE(CMS_RecipientKeyIdentifier) = {
-        ASN1_SIMPLE(CMS_RecipientKeyIdentifier, subjectKeyIdentifier, ASN1_OCTET_STRING),
-        ASN1_OPT(CMS_RecipientKeyIdentifier, date, ASN1_GENERALIZEDTIME),
-        ASN1_OPT(CMS_RecipientKeyIdentifier, other, CMS_OtherKeyAttribute)
+    ASN1_SIMPLE(CMS_RecipientKeyIdentifier, subjectKeyIdentifier, ASN1_OCTET_STRING),
+    ASN1_OPT(CMS_RecipientKeyIdentifier, date, ASN1_GENERALIZEDTIME),
+    ASN1_OPT(CMS_RecipientKeyIdentifier, other, CMS_OtherKeyAttribute)
 } ASN1_SEQUENCE_END(CMS_RecipientKeyIdentifier)
 
 ASN1_CHOICE(CMS_KeyAgreeRecipientIdentifier) = {
-  ASN1_SIMPLE(CMS_KeyAgreeRecipientIdentifier, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
-  ASN1_IMP(CMS_KeyAgreeRecipientIdentifier, d.rKeyId, CMS_RecipientKeyIdentifier, 0)
+    ASN1_SIMPLE(CMS_KeyAgreeRecipientIdentifier, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
+    ASN1_IMP(CMS_KeyAgreeRecipientIdentifier, d.rKeyId, CMS_RecipientKeyIdentifier, 0)
 } static_ASN1_CHOICE_END(CMS_KeyAgreeRecipientIdentifier)
 
-static int cms_rek_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                      void *exarg)
+    static int cms_rek_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
 {
     CMS_RecipientEncryptedKey *rek = (CMS_RecipientEncryptedKey *)*pval;
     if (operation == ASN1_OP_FREE_POST) {
@@ -141,23 +128,22 @@ static int cms_rek_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_SEQUENCE_cb(CMS_RecipientEncryptedKey, cms_rek_cb) = {
-        ASN1_SIMPLE(CMS_RecipientEncryptedKey, rid, CMS_KeyAgreeRecipientIdentifier),
-        ASN1_SIMPLE(CMS_RecipientEncryptedKey, encryptedKey, ASN1_OCTET_STRING)
+    ASN1_SIMPLE(CMS_RecipientEncryptedKey, rid, CMS_KeyAgreeRecipientIdentifier),
+    ASN1_SIMPLE(CMS_RecipientEncryptedKey, encryptedKey, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END_cb(CMS_RecipientEncryptedKey, CMS_RecipientEncryptedKey)
 
 ASN1_SEQUENCE(CMS_OriginatorPublicKey) = {
-  ASN1_SIMPLE(CMS_OriginatorPublicKey, algorithm, X509_ALGOR),
-  ASN1_SIMPLE(CMS_OriginatorPublicKey, publicKey, ASN1_BIT_STRING)
+    ASN1_SIMPLE(CMS_OriginatorPublicKey, algorithm, X509_ALGOR),
+    ASN1_SIMPLE(CMS_OriginatorPublicKey, publicKey, ASN1_BIT_STRING)
 } ASN1_SEQUENCE_END(CMS_OriginatorPublicKey)
 
 ASN1_CHOICE(CMS_OriginatorIdentifierOrKey) = {
-  ASN1_SIMPLE(CMS_OriginatorIdentifierOrKey, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
-  ASN1_IMP(CMS_OriginatorIdentifierOrKey, d.subjectKeyIdentifier, ASN1_OCTET_STRING, 0),
-  ASN1_IMP(CMS_OriginatorIdentifierOrKey, d.originatorKey, CMS_OriginatorPublicKey, 1)
+    ASN1_SIMPLE(CMS_OriginatorIdentifierOrKey, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
+    ASN1_IMP(CMS_OriginatorIdentifierOrKey, d.subjectKeyIdentifier, ASN1_OCTET_STRING, 0),
+    ASN1_IMP(CMS_OriginatorIdentifierOrKey, d.originatorKey, CMS_OriginatorPublicKey, 1)
 } static_ASN1_CHOICE_END(CMS_OriginatorIdentifierOrKey)
 
-static int cms_kari_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                       void *exarg)
+    static int cms_kari_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
 {
     CMS_KeyAgreeRecipientInfo *kari = (CMS_KeyAgreeRecipientInfo *)*pval;
     if (operation == ASN1_OP_NEW_POST) {
@@ -174,41 +160,36 @@ static int cms_kari_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_SEQUENCE_cb(CMS_KeyAgreeRecipientInfo, cms_kari_cb) = {
-        ASN1_EMBED(CMS_KeyAgreeRecipientInfo, version, INT32),
-        ASN1_EXP(CMS_KeyAgreeRecipientInfo, originator, CMS_OriginatorIdentifierOrKey, 0),
-        ASN1_EXP_OPT(CMS_KeyAgreeRecipientInfo, ukm, ASN1_OCTET_STRING, 1),
-        ASN1_SIMPLE(CMS_KeyAgreeRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
-        ASN1_SEQUENCE_OF(CMS_KeyAgreeRecipientInfo, recipientEncryptedKeys, CMS_RecipientEncryptedKey)
+    ASN1_EMBED(CMS_KeyAgreeRecipientInfo, version, INT32),
+    ASN1_EXP(CMS_KeyAgreeRecipientInfo, originator, CMS_OriginatorIdentifierOrKey, 0),
+    ASN1_EXP_OPT(CMS_KeyAgreeRecipientInfo, ukm, ASN1_OCTET_STRING, 1),
+    ASN1_SIMPLE(CMS_KeyAgreeRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
+    ASN1_SEQUENCE_OF(CMS_KeyAgreeRecipientInfo, recipientEncryptedKeys, CMS_RecipientEncryptedKey)
 } ASN1_SEQUENCE_END_cb(CMS_KeyAgreeRecipientInfo, CMS_KeyAgreeRecipientInfo)
 
 ASN1_SEQUENCE(CMS_KEKIdentifier) = {
-        ASN1_SIMPLE(CMS_KEKIdentifier, keyIdentifier, ASN1_OCTET_STRING),
-        ASN1_OPT(CMS_KEKIdentifier, date, ASN1_GENERALIZEDTIME),
-        ASN1_OPT(CMS_KEKIdentifier, other, CMS_OtherKeyAttribute)
+    ASN1_SIMPLE(CMS_KEKIdentifier, keyIdentifier, ASN1_OCTET_STRING),
+    ASN1_OPT(CMS_KEKIdentifier, date, ASN1_GENERALIZEDTIME),
+    ASN1_OPT(CMS_KEKIdentifier, other, CMS_OtherKeyAttribute)
 } static_ASN1_SEQUENCE_END(CMS_KEKIdentifier)
 
-ASN1_SEQUENCE(CMS_KEKRecipientInfo) = {
-        ASN1_EMBED(CMS_KEKRecipientInfo, version, INT32),
-        ASN1_SIMPLE(CMS_KEKRecipientInfo, kekid, CMS_KEKIdentifier),
-        ASN1_SIMPLE(CMS_KEKRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
-        ASN1_SIMPLE(CMS_KEKRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
-} ASN1_SEQUENCE_END(CMS_KEKRecipientInfo)
+    ASN1_SEQUENCE(CMS_KEKRecipientInfo)
+    = { ASN1_EMBED(CMS_KEKRecipientInfo, version, INT32), ASN1_SIMPLE(CMS_KEKRecipientInfo, kekid, CMS_KEKIdentifier), ASN1_SIMPLE(CMS_KEKRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR), ASN1_SIMPLE(CMS_KEKRecipientInfo, encryptedKey, ASN1_OCTET_STRING) } ASN1_SEQUENCE_END(CMS_KEKRecipientInfo)
 
 ASN1_SEQUENCE(CMS_PasswordRecipientInfo) = {
-        ASN1_EMBED(CMS_PasswordRecipientInfo, version, INT32),
-        ASN1_IMP_OPT(CMS_PasswordRecipientInfo, keyDerivationAlgorithm, X509_ALGOR, 0),
-        ASN1_SIMPLE(CMS_PasswordRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
-        ASN1_SIMPLE(CMS_PasswordRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
+    ASN1_EMBED(CMS_PasswordRecipientInfo, version, INT32),
+    ASN1_IMP_OPT(CMS_PasswordRecipientInfo, keyDerivationAlgorithm, X509_ALGOR, 0),
+    ASN1_SIMPLE(CMS_PasswordRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
+    ASN1_SIMPLE(CMS_PasswordRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(CMS_PasswordRecipientInfo)
 
 ASN1_SEQUENCE(CMS_OtherRecipientInfo) = {
-  ASN1_SIMPLE(CMS_OtherRecipientInfo, oriType, ASN1_OBJECT),
-  ASN1_OPT(CMS_OtherRecipientInfo, oriValue, ASN1_ANY)
+    ASN1_SIMPLE(CMS_OtherRecipientInfo, oriType, ASN1_OBJECT),
+    ASN1_OPT(CMS_OtherRecipientInfo, oriValue, ASN1_ANY)
 } static_ASN1_SEQUENCE_END(CMS_OtherRecipientInfo)
 
-/* Free up RecipientInfo additional data */
-static int cms_ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                     void *exarg)
+    /* Free up RecipientInfo additional data */
+    static int cms_ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
 {
     if (operation == ASN1_OP_FREE_PRE) {
         CMS_RecipientInfo *ri = (CMS_RecipientInfo *)*pval;
@@ -229,82 +210,83 @@ static int cms_ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_CHOICE_cb(CMS_RecipientInfo, cms_ri_cb) = {
-        ASN1_SIMPLE(CMS_RecipientInfo, d.ktri, CMS_KeyTransRecipientInfo),
-        ASN1_IMP(CMS_RecipientInfo, d.kari, CMS_KeyAgreeRecipientInfo, 1),
-        ASN1_IMP(CMS_RecipientInfo, d.kekri, CMS_KEKRecipientInfo, 2),
-        ASN1_IMP(CMS_RecipientInfo, d.pwri, CMS_PasswordRecipientInfo, 3),
-        ASN1_IMP(CMS_RecipientInfo, d.ori, CMS_OtherRecipientInfo, 4)
+    ASN1_SIMPLE(CMS_RecipientInfo, d.ktri, CMS_KeyTransRecipientInfo),
+    ASN1_IMP(CMS_RecipientInfo, d.kari, CMS_KeyAgreeRecipientInfo, 1),
+    ASN1_IMP(CMS_RecipientInfo, d.kekri, CMS_KEKRecipientInfo, 2),
+    ASN1_IMP(CMS_RecipientInfo, d.pwri, CMS_PasswordRecipientInfo, 3),
+    ASN1_IMP(CMS_RecipientInfo, d.ori, CMS_OtherRecipientInfo, 4)
 } ASN1_CHOICE_END_cb(CMS_RecipientInfo, CMS_RecipientInfo, type)
 
 ASN1_NDEF_SEQUENCE(CMS_EnvelopedData) = {
-        ASN1_EMBED(CMS_EnvelopedData, version, INT32),
-        ASN1_IMP_OPT(CMS_EnvelopedData, originatorInfo, CMS_OriginatorInfo, 0),
-        ASN1_SET_OF(CMS_EnvelopedData, recipientInfos, CMS_RecipientInfo),
-        ASN1_SIMPLE(CMS_EnvelopedData, encryptedContentInfo, CMS_EncryptedContentInfo),
-        ASN1_IMP_SET_OF_OPT(CMS_EnvelopedData, unprotectedAttrs, X509_ATTRIBUTE, 1)
+    ASN1_EMBED(CMS_EnvelopedData, version, INT32),
+    ASN1_IMP_OPT(CMS_EnvelopedData, originatorInfo, CMS_OriginatorInfo, 0),
+    ASN1_SET_OF(CMS_EnvelopedData, recipientInfos, CMS_RecipientInfo),
+    ASN1_SIMPLE(CMS_EnvelopedData, encryptedContentInfo, CMS_EncryptedContentInfo),
+    ASN1_IMP_SET_OF_OPT(CMS_EnvelopedData, unprotectedAttrs, X509_ATTRIBUTE, 1)
 } ASN1_NDEF_SEQUENCE_END(CMS_EnvelopedData)
 IMPLEMENT_ASN1_DUP_FUNCTION(CMS_EnvelopedData)
 
 ASN1_NDEF_SEQUENCE(CMS_DigestedData) = {
-        ASN1_EMBED(CMS_DigestedData, version, INT32),
-        ASN1_SIMPLE(CMS_DigestedData, digestAlgorithm, X509_ALGOR),
-        ASN1_SIMPLE(CMS_DigestedData, encapContentInfo, CMS_EncapsulatedContentInfo),
-        ASN1_SIMPLE(CMS_DigestedData, digest, ASN1_OCTET_STRING)
+    ASN1_EMBED(CMS_DigestedData, version, INT32),
+    ASN1_SIMPLE(CMS_DigestedData, digestAlgorithm, X509_ALGOR),
+    ASN1_SIMPLE(CMS_DigestedData, encapContentInfo, CMS_EncapsulatedContentInfo),
+    ASN1_SIMPLE(CMS_DigestedData, digest, ASN1_OCTET_STRING)
 } ASN1_NDEF_SEQUENCE_END(CMS_DigestedData)
 
 ASN1_NDEF_SEQUENCE(CMS_EncryptedData) = {
-        ASN1_EMBED(CMS_EncryptedData, version, INT32),
-        ASN1_SIMPLE(CMS_EncryptedData, encryptedContentInfo, CMS_EncryptedContentInfo),
-        ASN1_IMP_SET_OF_OPT(CMS_EncryptedData, unprotectedAttrs, X509_ATTRIBUTE, 1)
+    ASN1_EMBED(CMS_EncryptedData, version, INT32),
+    ASN1_SIMPLE(CMS_EncryptedData, encryptedContentInfo, CMS_EncryptedContentInfo),
+    ASN1_IMP_SET_OF_OPT(CMS_EncryptedData, unprotectedAttrs, X509_ATTRIBUTE, 1)
 } ASN1_NDEF_SEQUENCE_END(CMS_EncryptedData)
 
 /* Defined in RFC 5083 - Section 2.1. AuthEnvelopedData Type */
 ASN1_NDEF_SEQUENCE(CMS_AuthEnvelopedData) = {
-        ASN1_EMBED(CMS_AuthEnvelopedData, version, INT32),
-        ASN1_IMP_OPT(CMS_AuthEnvelopedData, originatorInfo, CMS_OriginatorInfo, 0),
-        ASN1_SET_OF(CMS_AuthEnvelopedData, recipientInfos, CMS_RecipientInfo),
-        ASN1_SIMPLE(CMS_AuthEnvelopedData, authEncryptedContentInfo, CMS_EncryptedContentInfo),
-        ASN1_IMP_SET_OF_OPT(CMS_AuthEnvelopedData, authAttrs, X509_ALGOR, 2),
-        ASN1_SIMPLE(CMS_AuthEnvelopedData, mac, ASN1_OCTET_STRING),
-        ASN1_IMP_SET_OF_OPT(CMS_AuthEnvelopedData, unauthAttrs, X509_ALGOR, 3)
+    ASN1_EMBED(CMS_AuthEnvelopedData, version, INT32),
+    ASN1_IMP_OPT(CMS_AuthEnvelopedData, originatorInfo, CMS_OriginatorInfo, 0),
+    ASN1_SET_OF(CMS_AuthEnvelopedData, recipientInfos, CMS_RecipientInfo),
+    ASN1_SIMPLE(CMS_AuthEnvelopedData, authEncryptedContentInfo, CMS_EncryptedContentInfo),
+    ASN1_IMP_SET_OF_OPT(CMS_AuthEnvelopedData, authAttrs, X509_ALGOR, 2),
+    ASN1_SIMPLE(CMS_AuthEnvelopedData, mac, ASN1_OCTET_STRING),
+    ASN1_IMP_SET_OF_OPT(CMS_AuthEnvelopedData, unauthAttrs, X509_ALGOR, 3)
 } ASN1_NDEF_SEQUENCE_END(CMS_AuthEnvelopedData)
 
 ASN1_NDEF_SEQUENCE(CMS_AuthenticatedData) = {
-        ASN1_EMBED(CMS_AuthenticatedData, version, INT32),
-        ASN1_IMP_OPT(CMS_AuthenticatedData, originatorInfo, CMS_OriginatorInfo, 0),
-        ASN1_SET_OF(CMS_AuthenticatedData, recipientInfos, CMS_RecipientInfo),
-        ASN1_SIMPLE(CMS_AuthenticatedData, macAlgorithm, X509_ALGOR),
-        ASN1_IMP(CMS_AuthenticatedData, digestAlgorithm, X509_ALGOR, 1),
-        ASN1_SIMPLE(CMS_AuthenticatedData, encapContentInfo, CMS_EncapsulatedContentInfo),
-        ASN1_IMP_SET_OF_OPT(CMS_AuthenticatedData, authAttrs, X509_ALGOR, 2),
-        ASN1_SIMPLE(CMS_AuthenticatedData, mac, ASN1_OCTET_STRING),
-        ASN1_IMP_SET_OF_OPT(CMS_AuthenticatedData, unauthAttrs, X509_ALGOR, 3)
+    ASN1_EMBED(CMS_AuthenticatedData, version, INT32),
+    ASN1_IMP_OPT(CMS_AuthenticatedData, originatorInfo, CMS_OriginatorInfo, 0),
+    ASN1_SET_OF(CMS_AuthenticatedData, recipientInfos, CMS_RecipientInfo),
+    ASN1_SIMPLE(CMS_AuthenticatedData, macAlgorithm, X509_ALGOR),
+    ASN1_IMP(CMS_AuthenticatedData, digestAlgorithm, X509_ALGOR, 1),
+    ASN1_SIMPLE(CMS_AuthenticatedData, encapContentInfo, CMS_EncapsulatedContentInfo),
+    ASN1_IMP_SET_OF_OPT(CMS_AuthenticatedData, authAttrs, X509_ALGOR, 2),
+    ASN1_SIMPLE(CMS_AuthenticatedData, mac, ASN1_OCTET_STRING),
+    ASN1_IMP_SET_OF_OPT(CMS_AuthenticatedData, unauthAttrs, X509_ALGOR, 3)
 } static_ASN1_NDEF_SEQUENCE_END(CMS_AuthenticatedData)
 
-ASN1_NDEF_SEQUENCE(CMS_CompressedData) = {
-        ASN1_EMBED(CMS_CompressedData, version, INT32),
-        ASN1_SIMPLE(CMS_CompressedData, compressionAlgorithm, X509_ALGOR),
-        ASN1_SIMPLE(CMS_CompressedData, encapContentInfo, CMS_EncapsulatedContentInfo),
-} ASN1_NDEF_SEQUENCE_END(CMS_CompressedData)
+    ASN1_NDEF_SEQUENCE(CMS_CompressedData)
+    = {
+          ASN1_EMBED(CMS_CompressedData, version, INT32),
+          ASN1_SIMPLE(CMS_CompressedData, compressionAlgorithm, X509_ALGOR),
+          ASN1_SIMPLE(CMS_CompressedData, encapContentInfo, CMS_EncapsulatedContentInfo),
+      } ASN1_NDEF_SEQUENCE_END(CMS_CompressedData)
 
 /* This is the ANY DEFINED BY table for the top level ContentInfo structure */
 
 ASN1_ADB_TEMPLATE(cms_default) = ASN1_EXP(CMS_ContentInfo, d.other, ASN1_ANY, 0);
 
 ASN1_ADB(CMS_ContentInfo) = {
-        ADB_ENTRY(NID_pkcs7_data, ASN1_NDEF_EXP(CMS_ContentInfo, d.data, ASN1_OCTET_STRING_NDEF, 0)),
-        ADB_ENTRY(NID_pkcs7_signed, ASN1_NDEF_EXP(CMS_ContentInfo, d.signedData, CMS_SignedData, 0)),
-        ADB_ENTRY(NID_pkcs7_enveloped, ASN1_NDEF_EXP(CMS_ContentInfo, d.envelopedData, CMS_EnvelopedData, 0)),
-        ADB_ENTRY(NID_pkcs7_digest, ASN1_NDEF_EXP(CMS_ContentInfo, d.digestedData, CMS_DigestedData, 0)),
-        ADB_ENTRY(NID_pkcs7_encrypted, ASN1_NDEF_EXP(CMS_ContentInfo, d.encryptedData, CMS_EncryptedData, 0)),
-        ADB_ENTRY(NID_id_smime_ct_authEnvelopedData, ASN1_NDEF_EXP(CMS_ContentInfo, d.authEnvelopedData, CMS_AuthEnvelopedData, 0)),
-        ADB_ENTRY(NID_id_smime_ct_authData, ASN1_NDEF_EXP(CMS_ContentInfo, d.authenticatedData, CMS_AuthenticatedData, 0)),
-        ADB_ENTRY(NID_id_smime_ct_compressedData, ASN1_NDEF_EXP(CMS_ContentInfo, d.compressedData, CMS_CompressedData, 0)),
+    ADB_ENTRY(NID_pkcs7_data, ASN1_NDEF_EXP(CMS_ContentInfo, d.data, ASN1_OCTET_STRING_NDEF, 0)),
+    ADB_ENTRY(NID_pkcs7_signed, ASN1_NDEF_EXP(CMS_ContentInfo, d.signedData, CMS_SignedData, 0)),
+    ADB_ENTRY(NID_pkcs7_enveloped, ASN1_NDEF_EXP(CMS_ContentInfo, d.envelopedData, CMS_EnvelopedData, 0)),
+    ADB_ENTRY(NID_pkcs7_digest, ASN1_NDEF_EXP(CMS_ContentInfo, d.digestedData, CMS_DigestedData, 0)),
+    ADB_ENTRY(NID_pkcs7_encrypted, ASN1_NDEF_EXP(CMS_ContentInfo, d.encryptedData, CMS_EncryptedData, 0)),
+    ADB_ENTRY(NID_id_smime_ct_authEnvelopedData, ASN1_NDEF_EXP(CMS_ContentInfo, d.authEnvelopedData, CMS_AuthEnvelopedData, 0)),
+    ADB_ENTRY(NID_id_smime_ct_authData, ASN1_NDEF_EXP(CMS_ContentInfo, d.authenticatedData, CMS_AuthenticatedData, 0)),
+    ADB_ENTRY(NID_id_smime_ct_compressedData, ASN1_NDEF_EXP(CMS_ContentInfo, d.compressedData, CMS_CompressedData, 0)),
 } ASN1_ADB_END(CMS_ContentInfo, 0, contentType, 0, &cms_default_tt, NULL);
 
 /* CMS streaming support */
 static int cms_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                  void *exarg)
+    void *exarg)
 {
     ASN1_STREAM_ARG *sarg = exarg;
     CMS_ContentInfo *cms = NULL;
@@ -333,14 +315,13 @@ static int cms_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
     case ASN1_OP_FREE_POST:
         OPENSSL_free(cms->ctx.propq);
         break;
-
     }
     return 1;
 }
 
 ASN1_NDEF_SEQUENCE_cb(CMS_ContentInfo, cms_cb) = {
-        ASN1_SIMPLE(CMS_ContentInfo, contentType, ASN1_OBJECT),
-        ASN1_ADB_OBJECT(CMS_ContentInfo)
+    ASN1_SIMPLE(CMS_ContentInfo, contentType, ASN1_OBJECT),
+    ASN1_ADB_OBJECT(CMS_ContentInfo)
 } ASN1_NDEF_SEQUENCE_END_cb(CMS_ContentInfo, CMS_ContentInfo)
 
 /* Specials for signed attributes */
@@ -350,8 +331,7 @@ ASN1_NDEF_SEQUENCE_cb(CMS_ContentInfo, cms_cb) = {
  * encoding.
  */
 
-ASN1_ITEM_TEMPLATE(CMS_Attributes_Sign) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_ORDER, 0, CMS_ATTRIBUTES, X509_ATTRIBUTE)
+ASN1_ITEM_TEMPLATE(CMS_Attributes_Sign) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_ORDER, 0, CMS_ATTRIBUTES, X509_ATTRIBUTE)
 ASN1_ITEM_TEMPLATE_END(CMS_Attributes_Sign)
 
 /*
@@ -359,29 +339,23 @@ ASN1_ITEM_TEMPLATE_END(CMS_Attributes_Sign)
  * SEQUENCE OF and tag it to SET OF
  */
 
-ASN1_ITEM_TEMPLATE(CMS_Attributes_Verify) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_IMPTAG | ASN1_TFLG_UNIVERSAL,
-                                V_ASN1_SET, CMS_ATTRIBUTES, X509_ATTRIBUTE)
+ASN1_ITEM_TEMPLATE(CMS_Attributes_Verify) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_IMPTAG | ASN1_TFLG_UNIVERSAL,
+    V_ASN1_SET, CMS_ATTRIBUTES, X509_ATTRIBUTE)
 ASN1_ITEM_TEMPLATE_END(CMS_Attributes_Verify)
 
-
-
 ASN1_CHOICE(CMS_ReceiptsFrom) = {
-  ASN1_IMP_EMBED(CMS_ReceiptsFrom, d.allOrFirstTier, INT32, 0),
-  ASN1_IMP_SEQUENCE_OF(CMS_ReceiptsFrom, d.receiptList, GENERAL_NAMES, 1)
+    ASN1_IMP_EMBED(CMS_ReceiptsFrom, d.allOrFirstTier, INT32, 0),
+    ASN1_IMP_SEQUENCE_OF(CMS_ReceiptsFrom, d.receiptList, GENERAL_NAMES, 1)
 } static_ASN1_CHOICE_END(CMS_ReceiptsFrom)
 
-ASN1_SEQUENCE(CMS_ReceiptRequest) = {
-  ASN1_SIMPLE(CMS_ReceiptRequest, signedContentIdentifier, ASN1_OCTET_STRING),
-  ASN1_SIMPLE(CMS_ReceiptRequest, receiptsFrom, CMS_ReceiptsFrom),
-  ASN1_SEQUENCE_OF(CMS_ReceiptRequest, receiptsTo, GENERAL_NAMES)
-} ASN1_SEQUENCE_END(CMS_ReceiptRequest)
+    ASN1_SEQUENCE(CMS_ReceiptRequest)
+    = { ASN1_SIMPLE(CMS_ReceiptRequest, signedContentIdentifier, ASN1_OCTET_STRING), ASN1_SIMPLE(CMS_ReceiptRequest, receiptsFrom, CMS_ReceiptsFrom), ASN1_SEQUENCE_OF(CMS_ReceiptRequest, receiptsTo, GENERAL_NAMES) } ASN1_SEQUENCE_END(CMS_ReceiptRequest)
 
 ASN1_SEQUENCE(CMS_Receipt) = {
-  ASN1_EMBED(CMS_Receipt, version, INT32),
-  ASN1_SIMPLE(CMS_Receipt, contentType, ASN1_OBJECT),
-  ASN1_SIMPLE(CMS_Receipt, signedContentIdentifier, ASN1_OCTET_STRING),
-  ASN1_SIMPLE(CMS_Receipt, originatorSignatureValue, ASN1_OCTET_STRING)
+    ASN1_EMBED(CMS_Receipt, version, INT32),
+    ASN1_SIMPLE(CMS_Receipt, contentType, ASN1_OBJECT),
+    ASN1_SIMPLE(CMS_Receipt, signedContentIdentifier, ASN1_OCTET_STRING),
+    ASN1_SIMPLE(CMS_Receipt, originatorSignatureValue, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(CMS_Receipt)
 
 /*
@@ -396,13 +370,12 @@ typedef struct {
 } CMS_SharedInfo;
 
 ASN1_SEQUENCE(CMS_SharedInfo) = {
-  ASN1_SIMPLE(CMS_SharedInfo, keyInfo, X509_ALGOR),
-  ASN1_EXP_OPT(CMS_SharedInfo, entityUInfo, ASN1_OCTET_STRING, 0),
-  ASN1_EXP_OPT(CMS_SharedInfo, suppPubInfo, ASN1_OCTET_STRING, 2),
+    ASN1_SIMPLE(CMS_SharedInfo, keyInfo, X509_ALGOR),
+    ASN1_EXP_OPT(CMS_SharedInfo, entityUInfo, ASN1_OCTET_STRING, 0),
+    ASN1_EXP_OPT(CMS_SharedInfo, suppPubInfo, ASN1_OCTET_STRING, 2),
 } static_ASN1_SEQUENCE_END(CMS_SharedInfo)
 
-int CMS_SharedInfo_encode(unsigned char **pder, X509_ALGOR *kekalg,
-                          ASN1_OCTET_STRING *ukm, int keylen)
+    int CMS_SharedInfo_encode(unsigned char **pder, X509_ALGOR *kekalg, ASN1_OCTET_STRING *ukm, int keylen)
 {
     union {
         CMS_SharedInfo *pecsi;
diff --git a/crypto/cms/cms_att.c b/crypto/cms/cms_att.c
index 64acda72630af..86852afda43e0 100644
--- a/crypto/cms/cms_att.c
+++ b/crypto/cms/cms_att.c
@@ -25,44 +25,30 @@
  *  - RFC 5035 Section 5.4
  */
 /* This is a signed attribute */
-#define CMS_ATTR_F_SIGNED         0x01
+#define CMS_ATTR_F_SIGNED 0x01
 /* This is an unsigned attribute */
-#define CMS_ATTR_F_UNSIGNED       0x02
+#define CMS_ATTR_F_UNSIGNED 0x02
 /* Must be present if there are any other attributes of the same type */
-#define CMS_ATTR_F_REQUIRED_COND  0x10
+#define CMS_ATTR_F_REQUIRED_COND 0x10
 /* There can only be one instance of this attribute */
-#define CMS_ATTR_F_ONLY_ONE       0x20
+#define CMS_ATTR_F_ONLY_ONE 0x20
 /* The Attribute's value must have exactly one entry */
 #define CMS_ATTR_F_ONE_ATTR_VALUE 0x40
 
 /* Attributes rules for different attributes */
 static const struct {
-    int nid;   /* The attribute id */
+    int nid; /* The attribute id */
     int flags;
 } cms_attribute_properties[] = {
     /* See RFC Section 11 */
-    { NID_pkcs9_contentType, CMS_ATTR_F_SIGNED
-                             | CMS_ATTR_F_ONLY_ONE
-                             | CMS_ATTR_F_ONE_ATTR_VALUE
-                             | CMS_ATTR_F_REQUIRED_COND },
-    { NID_pkcs9_messageDigest, CMS_ATTR_F_SIGNED
-                               | CMS_ATTR_F_ONLY_ONE
-                               | CMS_ATTR_F_ONE_ATTR_VALUE
-                               | CMS_ATTR_F_REQUIRED_COND },
-    { NID_pkcs9_signingTime, CMS_ATTR_F_SIGNED
-                             | CMS_ATTR_F_ONLY_ONE
-                             | CMS_ATTR_F_ONE_ATTR_VALUE },
+    { NID_pkcs9_contentType, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE | CMS_ATTR_F_REQUIRED_COND },
+    { NID_pkcs9_messageDigest, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE | CMS_ATTR_F_REQUIRED_COND },
+    { NID_pkcs9_signingTime, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE },
     { NID_pkcs9_countersignature, CMS_ATTR_F_UNSIGNED },
     /* ESS */
-    { NID_id_smime_aa_signingCertificate, CMS_ATTR_F_SIGNED
-                                          | CMS_ATTR_F_ONLY_ONE
-                                          | CMS_ATTR_F_ONE_ATTR_VALUE },
-    { NID_id_smime_aa_signingCertificateV2, CMS_ATTR_F_SIGNED
-                                            | CMS_ATTR_F_ONLY_ONE
-                                            | CMS_ATTR_F_ONE_ATTR_VALUE },
-    { NID_id_smime_aa_receiptRequest, CMS_ATTR_F_SIGNED
-                                      | CMS_ATTR_F_ONLY_ONE
-                                      | CMS_ATTR_F_ONE_ATTR_VALUE }
+    { NID_id_smime_aa_signingCertificate, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE },
+    { NID_id_smime_aa_signingCertificateV2, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE },
+    { NID_id_smime_aa_receiptRequest, CMS_ATTR_F_SIGNED | CMS_ATTR_F_ONLY_ONE | CMS_ATTR_F_ONE_ATTR_VALUE }
 };
 
 /* CMS SignedData Attribute utilities */
@@ -78,7 +64,7 @@ int CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid, int lastpos)
 }
 
 int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj,
-                               int lastpos)
+    int lastpos)
 {
     return X509at_get_attr_by_OBJ(si->signedAttrs, obj, lastpos);
 }
@@ -101,8 +87,8 @@ 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)
 {
     if (ossl_x509at_add1_attr_by_OBJ(&si->signedAttrs, obj, type, bytes, len))
         return 1;
@@ -110,7 +96,7 @@ int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si,
 }
 
 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)
 {
     if (ossl_x509at_add1_attr_by_NID(&si->signedAttrs, nid, type, bytes, len))
         return 1;
@@ -118,18 +104,18 @@ int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si,
 }
 
 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)
 {
     if (ossl_x509at_add1_attr_by_txt(&si->signedAttrs, attrname, type, bytes,
-                                     len))
+            len))
         return 1;
     return 0;
 }
 
 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)
 {
     return X509at_get0_data_by_OBJ(si->signedAttrs, oid, lastpos, type);
 }
@@ -140,13 +126,13 @@ 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)
 {
     return X509at_get_attr_by_NID(si->unsignedAttrs, nid, lastpos);
 }
 
 int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si,
-                                 const ASN1_OBJECT *obj, int lastpos)
+    const ASN1_OBJECT *obj, int lastpos)
 {
     return X509at_get_attr_by_OBJ(si->unsignedAttrs, obj, lastpos);
 }
@@ -169,8 +155,8 @@ 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)
 {
     if (ossl_x509at_add1_attr_by_OBJ(&si->unsignedAttrs, obj, type, bytes, len))
         return 1;
@@ -178,8 +164,8 @@ int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si,
 }
 
 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)
 {
     if (ossl_x509at_add1_attr_by_NID(&si->unsignedAttrs, nid, type, bytes, len))
         return 1;
@@ -187,17 +173,17 @@ int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si,
 }
 
 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)
 {
     if (ossl_x509at_add1_attr_by_txt(&si->unsignedAttrs, attrname,
-                                     type, bytes, len))
+            type, bytes, len))
         return 1;
     return 0;
 }
 
 void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
-                                    int lastpos, int type)
+    int lastpos, int type)
 {
     return X509at_get0_data_by_OBJ(si->unsignedAttrs, oid, lastpos, type);
 }
@@ -209,8 +195,8 @@ void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
  * If an attribute was found *lastpos returns the index of the found attribute.
  */
 static X509_ATTRIBUTE *cms_attrib_get(int nid,
-                                      const STACK_OF(X509_ATTRIBUTE) *attrs,
-                                      int *lastpos)
+    const STACK_OF(X509_ATTRIBUTE) *attrs,
+    int *lastpos)
 {
     X509_ATTRIBUTE *at;
     int loc;
@@ -225,8 +211,8 @@ static X509_ATTRIBUTE *cms_attrib_get(int nid,
 }
 
 static int cms_check_attribute(int nid, int flags, int type,
-                               const STACK_OF(X509_ATTRIBUTE) *attrs,
-                               int have_attrs)
+    const STACK_OF(X509_ATTRIBUTE) *attrs,
+    int have_attrs)
 {
     int lastpos = -1;
     X509_ATTRIBUTE *at = cms_attrib_get(nid, attrs, &lastpos);
@@ -244,7 +230,7 @@ static int cms_check_attribute(int nid, int flags, int type,
                 && count != 1)
             /* There should be at least one value */
             || count == 0)
-        return 0;
+            return 0;
     } else {
         /* fail if a required attribute is missing */
         if (have_attrs
@@ -276,9 +262,9 @@ int ossl_cms_si_check_attributes(const CMS_SignerInfo *si)
         int flags = cms_attribute_properties[i].flags;
 
         if (!cms_check_attribute(nid, flags, CMS_ATTR_F_SIGNED,
-                                 si->signedAttrs, have_signed_attrs)
+                si->signedAttrs, have_signed_attrs)
             || !cms_check_attribute(nid, flags, CMS_ATTR_F_UNSIGNED,
-                                    si->unsignedAttrs, have_unsigned_attrs)) {
+                si->unsignedAttrs, have_unsigned_attrs)) {
             ERR_raise(ERR_LIB_CMS, CMS_R_ATTRIBUTE_ERROR);
             return 0;
         }
diff --git a/crypto/cms/cms_cd.c b/crypto/cms/cms_cd.c
index 3000268480f4e..3c649f0bd280b 100644
--- a/crypto/cms/cms_cd.c
+++ b/crypto/cms/cms_cd.c
@@ -22,8 +22,8 @@
 /* CMS CompressedData Utilities */
 
 CMS_ContentInfo *ossl_cms_CompressedData_create(int comp_nid,
-                                                OSSL_LIB_CTX *libctx,
-                                                const char *propq)
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     CMS_ContentInfo *cms;
     CMS_CompressedData *cd;
@@ -51,14 +51,14 @@ CMS_ContentInfo *ossl_cms_CompressedData_create(int comp_nid,
     cd->version = 0;
 
     (void)X509_ALGOR_set0(cd->compressionAlgorithm,
-                          OBJ_nid2obj(NID_zlib_compression),
-                          V_ASN1_UNDEF, NULL); /* cannot fail */
+        OBJ_nid2obj(NID_zlib_compression),
+        V_ASN1_UNDEF, NULL); /* cannot fail */
 
     cd->encapContentInfo->eContentType = OBJ_nid2obj(NID_pkcs7_data);
 
     return cms;
 
- err:
+err:
     CMS_ContentInfo_free(cms);
     return NULL;
 }
diff --git a/crypto/cms/cms_dd.c b/crypto/cms/cms_dd.c
index 40b20249a3ad7..aff9af63cafd6 100644
--- a/crypto/cms/cms_dd.c
+++ b/crypto/cms/cms_dd.c
@@ -18,8 +18,8 @@
 /* CMS DigestedData Utilities */
 
 CMS_ContentInfo *ossl_cms_DigestedData_create(const EVP_MD *md,
-                                              OSSL_LIB_CTX *libctx,
-                                              const char *propq)
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     CMS_ContentInfo *cms;
     CMS_DigestedData *dd;
@@ -43,7 +43,7 @@ CMS_ContentInfo *ossl_cms_DigestedData_create(const EVP_MD *md,
 
     return cms;
 
- err:
+err:
     CMS_ContentInfo_free(cms);
     return NULL;
 }
@@ -53,11 +53,11 @@ BIO *ossl_cms_DigestedData_init_bio(const CMS_ContentInfo *cms)
     CMS_DigestedData *dd = cms->d.digestedData;
 
     return ossl_cms_DigestAlgorithm_init_bio(dd->digestAlgorithm,
-                                             ossl_cms_get0_cmsctx(cms));
+        ossl_cms_get0_cmsctx(cms));
 }
 
 int ossl_cms_DigestedData_do_final(const CMS_ContentInfo *cms, BIO *chain,
-                                   int verify)
+    int verify)
 {
     EVP_MD_CTX *mctx = EVP_MD_CTX_new();
     unsigned char md[EVP_MAX_MD_SIZE];
@@ -94,9 +94,8 @@ int ossl_cms_DigestedData_do_final(const CMS_ContentInfo *cms, BIO *chain,
         r = 1;
     }
 
- err:
+err:
     EVP_MD_CTX_free(mctx);
 
     return r;
-
 }
diff --git a/crypto/cms/cms_dh.c b/crypto/cms/cms_dh.c
index b49e5f7f5366e..ab3453d1c7c12 100644
--- a/crypto/cms/cms_dh.c
+++ b/crypto/cms/cms_dh.c
@@ -18,7 +18,7 @@
 #include "cms_local.h"
 
 static int dh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
-                              X509_ALGOR *alg, ASN1_BIT_STRING *pubkey)
+    X509_ALGOR *alg, ASN1_BIT_STRING *pubkey)
 {
     const ASN1_OBJECT *aoid;
     int atype;
@@ -64,13 +64,13 @@ static int dh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
 
     pkpeer = EVP_PKEY_new();
     if (pkpeer == NULL
-            || !EVP_PKEY_copy_parameters(pkpeer, pk)
-            || EVP_PKEY_set1_encoded_public_key(pkpeer, buf, plen) <= 0)
+        || !EVP_PKEY_copy_parameters(pkpeer, pk)
+        || EVP_PKEY_set1_encoded_public_key(pkpeer, buf, plen) <= 0)
         goto err;
 
     if (EVP_PKEY_derive_set_peer(pctx, pkpeer) > 0)
         rv = 1;
- err:
+err:
     ASN1_INTEGER_free(public_key);
     BN_free(bnpub);
     OPENSSL_free(buf);
@@ -104,7 +104,7 @@ static int dh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri)
     }
 
     if (EVP_PKEY_CTX_set_dh_kdf_type(pctx, EVP_PKEY_DH_KDF_X9_42) <= 0
-            || EVP_PKEY_CTX_set_dh_kdf_md(pctx, EVP_sha1()) <= 0)
+        || EVP_PKEY_CTX_set_dh_kdf_md(pctx, EVP_sha1()) <= 0)
         goto err;
 
     if (alg->parameter->type != V_ASN1_SEQUENCE)
@@ -136,7 +136,7 @@ static int dh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri)
         goto err;
     /* Use OBJ_nid2obj to ensure we use built in OID that isn't freed */
     if (EVP_PKEY_CTX_set0_dh_kdf_oid(pctx,
-                                     OBJ_nid2obj(EVP_CIPHER_get_type(kekcipher)))
+            OBJ_nid2obj(EVP_CIPHER_get_type(kekcipher)))
         <= 0)
         goto err;
 
@@ -152,7 +152,7 @@ static int dh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri)
     dukm = NULL;
 
     rv = 1;
- err:
+err:
     X509_ALGOR_free(kekalg);
     EVP_CIPHER_free(kekcipher);
     OPENSSL_free(dukm);
@@ -171,9 +171,9 @@ static int dh_cms_decrypt(CMS_RecipientInfo *ri)
         ASN1_BIT_STRING *pubkey;
 
         if (!CMS_RecipientInfo_kari_get0_orig_id(ri, &alg, &pubkey,
-                                                 NULL, NULL, NULL))
+                NULL, NULL, NULL))
             return 0;
-        if (alg ==  NULL || pubkey == NULL)
+        if (alg == NULL || pubkey == NULL)
             return 0;
         if (!dh_cms_set_peerkey(pctx, alg, pubkey)) {
             ERR_raise(ERR_LIB_CMS, CMS_R_PEER_KEY_ERROR);
@@ -212,7 +212,7 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri)
     /* Get ephemeral key */
     pkey = EVP_PKEY_CTX_get0_pkey(pctx);
     if (!CMS_RecipientInfo_kari_get0_orig_id(ri, &talg, &pubkey,
-                                             NULL, NULL, NULL))
+            NULL, NULL, NULL))
         goto err;
 
     /* Is everything uninitialised? */
@@ -239,7 +239,7 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri)
 
         penc = NULL;
         (void)X509_ALGOR_set0(talg, OBJ_nid2obj(NID_dhpublicnumber),
-                              V_ASN1_UNDEF, NULL); /* cannot fail */
+            V_ASN1_UNDEF, NULL); /* cannot fail */
     }
 
     /* See if custom parameters set */
@@ -317,11 +317,11 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri)
     ASN1_STRING_set0(wrap_str, penc, penclen);
     penc = NULL;
     rv = X509_ALGOR_set0(talg, OBJ_nid2obj(NID_id_smime_alg_ESDH),
-                         V_ASN1_SEQUENCE, wrap_str);
+        V_ASN1_SEQUENCE, wrap_str);
     if (!rv)
         ASN1_STRING_free(wrap_str);
 
- err:
+err:
     OPENSSL_free(penc);
     X509_ALGOR_free(wrap_alg);
     OPENSSL_free(dukm);
diff --git a/crypto/cms/cms_ec.c b/crypto/cms/cms_ec.c
index 6e9962ed6e8fe..ff8adad616686 100644
--- a/crypto/cms/cms_ec.c
+++ b/crypto/cms/cms_ec.c
@@ -18,7 +18,7 @@
 #include "cms_local.h"
 
 static EVP_PKEY *pkey_type2param(int ptype, const void *pval,
-                                 OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     EVP_PKEY *pkey = NULL;
     EVP_PKEY_CTX *pctx = NULL;
@@ -31,7 +31,7 @@ static EVP_PKEY *pkey_type2param(int ptype, const void *pval,
         int selection = OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
 
         ctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", NULL, "EC",
-                                            selection, libctx, propq);
+            selection, libctx, propq);
         if (ctx == NULL)
             goto err;
 
@@ -50,7 +50,7 @@ static EVP_PKEY *pkey_type2param(int ptype, const void *pval,
         if (pctx == NULL || EVP_PKEY_paramgen_init(pctx) <= 0)
             goto err;
         if (OBJ_obj2txt(groupname, sizeof(groupname), poid, 0) <= 0
-                || EVP_PKEY_CTX_set_group_name(pctx, groupname) <= 0) {
+            || EVP_PKEY_CTX_set_group_name(pctx, groupname) <= 0) {
             ERR_raise(ERR_LIB_CMS, CMS_R_DECODE_ERROR);
             goto err;
         }
@@ -63,7 +63,7 @@ static EVP_PKEY *pkey_type2param(int ptype, const void *pval,
     ERR_raise(ERR_LIB_CMS, CMS_R_DECODE_ERROR);
     return NULL;
 
- err:
+err:
     EVP_PKEY_free(pkey);
     EVP_PKEY_CTX_free(pctx);
     OSSL_DECODER_CTX_free(ctx);
@@ -71,7 +71,7 @@ static EVP_PKEY *pkey_type2param(int ptype, const void *pval,
 }
 
 static int ecdh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
-                                X509_ALGOR *alg, ASN1_BIT_STRING *pubkey)
+    X509_ALGOR *alg, ASN1_BIT_STRING *pubkey)
 {
     const ASN1_OBJECT *aoid;
     int atype;
@@ -100,8 +100,8 @@ static int ecdh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
             goto err;
     } else {
         pkpeer = pkey_type2param(atype, aval,
-                                 EVP_PKEY_CTX_get0_libctx(pctx),
-                                 EVP_PKEY_CTX_get0_propq(pctx));
+            EVP_PKEY_CTX_get0_libctx(pctx),
+            EVP_PKEY_CTX_get0_propq(pctx));
         if (pkpeer == NULL)
             goto err;
     }
@@ -116,7 +116,7 @@ static int ecdh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
 
     if (EVP_PKEY_derive_set_peer(pctx, pkpeer) > 0)
         rv = 1;
- err:
+err:
     EVP_PKEY_free(pkpeer);
     return rv;
 }
@@ -210,7 +210,7 @@ static int ecdh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri)
     der = NULL;
 
     rv = 1;
- err:
+err:
     EVP_CIPHER_free(kekcipher);
     X509_ALGOR_free(kekalg);
     OPENSSL_free(der);
@@ -230,7 +230,7 @@ static int ecdh_cms_decrypt(CMS_RecipientInfo *ri)
         ASN1_BIT_STRING *pubkey;
 
         if (!CMS_RecipientInfo_kari_get0_orig_id(ri, &alg, &pubkey,
-                                                 NULL, NULL, NULL))
+                NULL, NULL, NULL))
             return 0;
         if (alg == NULL || pubkey == NULL)
             return 0;
@@ -270,7 +270,7 @@ static int ecdh_cms_encrypt(CMS_RecipientInfo *ri)
     /* Get ephemeral key */
     pkey = EVP_PKEY_CTX_get0_pkey(pctx);
     if (!CMS_RecipientInfo_kari_get0_orig_id(ri, &talg, &pubkey,
-                                             NULL, NULL, NULL))
+            NULL, NULL, NULL))
         goto err;
     X509_ALGOR_get0(&aoid, NULL, NULL, talg);
     /* Is everything uninitialised? */
@@ -286,7 +286,7 @@ static int ecdh_cms_encrypt(CMS_RecipientInfo *ri)
 
         penc = NULL;
         (void)X509_ALGOR_set0(talg, OBJ_nid2obj(NID_X9_62_id_ecPublicKey),
-                              V_ASN1_UNDEF, NULL); /* cannot fail */
+            V_ASN1_UNDEF, NULL); /* cannot fail */
     }
 
     /* See if custom parameters set */
@@ -373,7 +373,7 @@ static int ecdh_cms_encrypt(CMS_RecipientInfo *ri)
     if (!rv)
         ASN1_STRING_free(wrap_str);
 
- err:
+err:
     OPENSSL_free(penc);
     X509_ALGOR_free(wrap_alg);
     return rv;
diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c
index ea8f07e1affc6..08afb5ab114b0 100644
--- a/crypto/cms/cms_enc.c
+++ b/crypto/cms/cms_enc.c
@@ -23,7 +23,7 @@
 /* Return BIO based on EncryptedContentInfo and key */
 
 BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
-                                        const CMS_CTX *cms_ctx)
+    const CMS_CTX *cms_ctx, int auth)
 {
     BIO *b;
     EVP_CIPHER_CTX *ctx;
@@ -64,7 +64,7 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
     }
     if (cipher != NULL) {
         fetched_ciph = EVP_CIPHER_fetch(libctx, EVP_CIPHER_get0_name(cipher),
-                                        propq);
+            propq);
         if (fetched_ciph != NULL)
             cipher = fetched_ciph;
     }
@@ -104,10 +104,15 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
             goto err;
         }
         if ((EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)) {
+            if (!auth) {
+                ERR_raise(ERR_LIB_CMS, CMS_R_CIPHER_AEAD_IN_ENVELOPED_DATA);
+                goto err;
+            }
             piv = aparams.iv;
             if (ec->taglen > 0
-                    && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
-                                           ec->taglen, ec->tag) <= 0) {
+                && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
+                       ec->taglen, ec->tag)
+                    <= 0) {
                 ERR_raise(ERR_LIB_CMS, CMS_R_CIPHER_AEAD_SET_TAG_ERROR);
                 goto err;
             }
@@ -135,7 +140,6 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
             keep_key = 1;
         else
             ERR_clear_error();
-
     }
 
     if (ec->keylen != tkeylen) {
@@ -189,7 +193,7 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
     }
     ok = 1;
 
- err:
+err:
     EVP_CIPHER_free(fetched_ciph);
     if (!keep_key || !ok) {
         OPENSSL_clear_free(ec->key, ec->keylen);
@@ -203,9 +207,9 @@ BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
 }
 
 int ossl_cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec,
-                                   const EVP_CIPHER *cipher,
-                                   const unsigned char *key, size_t keylen,
-                                   const CMS_CTX *cms_ctx)
+    const EVP_CIPHER *cipher,
+    const unsigned char *key, size_t keylen,
+    const CMS_CTX *cms_ctx)
 {
     ec->cipher = cipher;
     if (key) {
@@ -220,7 +224,7 @@ int ossl_cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec,
 }
 
 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)
 {
     CMS_EncryptedContentInfo *ec;
 
@@ -229,6 +233,14 @@ int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
         return 0;
     }
     if (ciph) {
+        if ((EVP_CIPHER_get_flags(ciph) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0) {
+            ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM);
+            return 0;
+        }
+        if (cms->d.encryptedData != NULL) {
+            M_ASN1_free_of(cms->d.encryptedData, CMS_EncryptedData);
+            cms->d.encryptedData = NULL;
+        }
         cms->d.encryptedData = M_ASN1_new_of(CMS_EncryptedData);
         if (!cms->d.encryptedData) {
             ERR_raise(ERR_LIB_CMS, ERR_R_ASN1_LIB);
@@ -242,7 +254,7 @@ int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
     }
     ec = cms->d.encryptedData->encryptedContentInfo;
     return ossl_cms_EncryptedContent_init(ec, ciph, key, keylen,
-                                          ossl_cms_get0_cmsctx(cms));
+        ossl_cms_get0_cmsctx(cms));
 }
 
 BIO *ossl_cms_EncryptedData_init_bio(const CMS_ContentInfo *cms)
@@ -251,5 +263,5 @@ BIO *ossl_cms_EncryptedData_init_bio(const CMS_ContentInfo *cms)
     if (enc->encryptedContentInfo->cipher && enc->unprotectedAttrs)
         enc->version = 2;
     return ossl_cms_EncryptedContent_init_bio(enc->encryptedContentInfo,
-                                              ossl_cms_get0_cmsctx(cms));
+        ossl_cms_get0_cmsctx(cms), 0);
 }
diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 375239c78db39..0828d157fad6e 100644
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -24,7 +24,7 @@
 static void cms_env_set_version(CMS_EnvelopedData *env);
 
 #define CMS_ENVELOPED_STANDARD 1
-#define CMS_ENVELOPED_AUTH     2
+#define CMS_ENVELOPED_AUTH 2
 
 static int cms_get_enveloped_type_simple(const CMS_ContentInfo *cms)
 {
@@ -78,8 +78,7 @@ static CMS_EnvelopedData *cms_enveloped_data_init(CMS_ContentInfo *cms)
             return NULL;
         }
         cms->d.envelopedData->version = 0;
-        cms->d.envelopedData->encryptedContentInfo->contentType =
-            OBJ_nid2obj(NID_pkcs7_data);
+        cms->d.envelopedData->encryptedContentInfo->contentType = OBJ_nid2obj(NID_pkcs7_data);
         ASN1_OBJECT_free(cms->contentType);
         cms->contentType = OBJ_nid2obj(NID_pkcs7_enveloped);
         return cms->d.envelopedData;
@@ -98,8 +97,7 @@ cms_auth_enveloped_data_init(CMS_ContentInfo *cms)
         }
         /* Defined in RFC 5083 - Section 2.1. "AuthEnvelopedData Type" */
         cms->d.authEnvelopedData->version = 0;
-        cms->d.authEnvelopedData->authEncryptedContentInfo->contentType =
-            OBJ_nid2obj(NID_pkcs7_data);
+        cms->d.authEnvelopedData->authEncryptedContentInfo->contentType = OBJ_nid2obj(NID_pkcs7_data);
         ASN1_OBJECT_free(cms->contentType);
         cms->contentType = OBJ_nid2obj(NID_id_smime_ct_authEnvelopedData);
         return cms->d.authEnvelopedData;
@@ -151,11 +149,11 @@ CMS_EncryptedContentInfo *ossl_cms_get0_env_enc_content(const CMS_ContentInfo *c
     switch (cms_get_enveloped_type(cms)) {
     case CMS_ENVELOPED_STANDARD:
         return cms->d.envelopedData == NULL ? NULL
-            : cms->d.envelopedData->encryptedContentInfo;
+                                            : cms->d.envelopedData->encryptedContentInfo;
 
     case CMS_ENVELOPED_AUTH:
         return cms->d.authEnvelopedData == NULL ? NULL
-            : cms->d.authEnvelopedData->authEncryptedContentInfo;
+                                                : cms->d.authEnvelopedData->authEncryptedContentInfo;
 
     default:
         return NULL;
@@ -193,8 +191,8 @@ void ossl_cms_RecipientInfos_set_cmsctx(CMS_ContentInfo *cms)
             case CMS_RECIPINFO_TRANS:
                 ri->d.ktri->cms_ctx = ctx;
                 ossl_x509_set0_libctx(ri->d.ktri->recip,
-                                      ossl_cms_ctx_get0_libctx(ctx),
-                                      ossl_cms_ctx_get0_propq(ctx));
+                    ossl_cms_ctx_get0_libctx(ctx),
+                    ossl_cms_ctx_get0_propq(ctx));
                 break;
             case CMS_RECIPINFO_KEK:
                 ri->d.kekri->cms_ctx = ctx;
@@ -224,8 +222,8 @@ EVP_PKEY_CTX *CMS_RecipientInfo_get0_pkey_ctx(CMS_RecipientInfo *ri)
 }
 
 CMS_ContentInfo *CMS_EnvelopedData_create_ex(const EVP_CIPHER *cipher,
-                                             OSSL_LIB_CTX *libctx,
-                                             const char *propq)
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     CMS_ContentInfo *cms;
     CMS_EnvelopedData *env;
@@ -238,10 +236,10 @@ CMS_ContentInfo *CMS_EnvelopedData_create_ex(const EVP_CIPHER *cipher,
         goto err;
 
     if (!ossl_cms_EncryptedContent_init(env->encryptedContentInfo, cipher, NULL,
-                                        0, ossl_cms_get0_cmsctx(cms)))
+            0, ossl_cms_get0_cmsctx(cms)))
         goto err;
     return cms;
- err:
+err:
     CMS_ContentInfo_free(cms);
     ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
     return NULL;
@@ -253,9 +251,9 @@ CMS_ContentInfo *CMS_EnvelopedData_create(const EVP_CIPHER *cipher)
 }
 
 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_ContentInfo *ci;
     BIO *bio = NULL;
@@ -267,19 +265,19 @@ BIO *CMS_EnvelopedData_decrypt(CMS_EnvelopedData *env, BIO *detached_data,
     }
 
     if ((ci = CMS_ContentInfo_new_ex(libctx, propq)) == NULL
-            || (bio = BIO_new(BIO_s_mem())) == NULL)
+        || (bio = BIO_new(BIO_s_mem())) == NULL)
         goto end;
     ci->contentType = OBJ_nid2obj(NID_pkcs7_enveloped);
     ci->d.envelopedData = env;
     if (secret != NULL
-        && CMS_decrypt_set1_password(ci, (unsigned char *)
-                                     ASN1_STRING_get0_data(secret),
-                                     ASN1_STRING_length(secret)) != 1)
+        && CMS_decrypt_set1_password(ci, (unsigned char *)ASN1_STRING_get0_data(secret),
+               ASN1_STRING_length(secret))
+            != 1)
         goto end;
     res = CMS_decrypt(ci, secret == NULL ? pkey : NULL,
-                      secret == NULL ? cert : NULL, detached_data, bio, flags);
+        secret == NULL ? cert : NULL, detached_data, bio, flags);
 
- end:
+end:
     if (ci != NULL) {
         ci->d.envelopedData = NULL; /* do not indirectly free |env| */
         ci->contentType = NULL;
@@ -294,7 +292,7 @@ BIO *CMS_EnvelopedData_decrypt(CMS_EnvelopedData *env, BIO *detached_data,
 
 CMS_ContentInfo *
 CMS_AuthEnvelopedData_create_ex(const EVP_CIPHER *cipher, OSSL_LIB_CTX *libctx,
-                                const char *propq)
+    const char *propq)
 {
     CMS_ContentInfo *cms;
     CMS_AuthEnvelopedData *aenv;
@@ -306,17 +304,16 @@ CMS_AuthEnvelopedData_create_ex(const EVP_CIPHER *cipher, OSSL_LIB_CTX *libctx,
     if (aenv == NULL)
         goto merr;
     if (!ossl_cms_EncryptedContent_init(aenv->authEncryptedContentInfo,
-                                        cipher, NULL, 0,
-                                        ossl_cms_get0_cmsctx(cms)))
+            cipher, NULL, 0,
+            ossl_cms_get0_cmsctx(cms)))
         goto merr;
     return cms;
- merr:
+merr:
     CMS_ContentInfo_free(cms);
     ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
     return NULL;
 }
 
-
 CMS_ContentInfo *CMS_AuthEnvelopedData_create(const EVP_CIPHER *cipher)
 {
     return CMS_AuthEnvelopedData_create_ex(cipher, NULL, NULL);
@@ -327,8 +324,8 @@ CMS_ContentInfo *CMS_AuthEnvelopedData_create(const EVP_CIPHER *cipher)
 /* Initialise a ktri based on passed certificate and key */
 
 static int cms_RecipientInfo_ktri_init(CMS_RecipientInfo *ri, X509 *recip,
-                                       EVP_PKEY *pk, unsigned int flags,
-                                       const CMS_CTX *ctx)
+    EVP_PKEY *pk, unsigned int flags,
+    const CMS_CTX *ctx)
 {
     CMS_KeyTransRecipientInfo *ktri;
     int idtype;
@@ -369,8 +366,8 @@ static int cms_RecipientInfo_ktri_init(CMS_RecipientInfo *ri, X509 *recip,
 
     if (flags & CMS_KEY_PARAM) {
         ktri->pctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(ctx),
-                                                ktri->pkey,
-                                                ossl_cms_ctx_get0_propq(ctx));
+            ktri->pkey,
+            ossl_cms_ctx_get0_propq(ctx));
         if (ktri->pctx == NULL)
             return 0;
         if (EVP_PKEY_encrypt_init(ktri->pctx) <= 0)
@@ -385,8 +382,8 @@ static int cms_RecipientInfo_ktri_init(CMS_RecipientInfo *ri, X509 *recip,
  */
 
 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)
 {
     CMS_RecipientInfo *ri = NULL;
     STACK_OF(CMS_RecipientInfo) *ris;
@@ -419,14 +416,13 @@ CMS_RecipientInfo *CMS_add1_recipient(CMS_ContentInfo *cms, X509 *recip,
 
     case CMS_RECIPINFO_AGREE:
         if (!ossl_cms_RecipientInfo_kari_init(ri, recip, pk, originator,
-                                              originatorPrivKey, flags, ctx))
+                originatorPrivKey, flags, ctx))
             goto err;
         break;
 
     default:
         ERR_raise(ERR_LIB_CMS, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
         goto err;
-
     }
 
     if (!sk_CMS_RecipientInfo_push(ris, ri)) {
@@ -436,21 +432,20 @@ CMS_RecipientInfo *CMS_add1_recipient(CMS_ContentInfo *cms, X509 *recip,
 
     return ri;
 
- err:
+err:
     M_ASN1_free_of(ri, CMS_RecipientInfo);
     return NULL;
-
 }
 
 CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms, X509 *recip,
-                                           unsigned int flags)
+    unsigned int flags)
 {
-     return CMS_add1_recipient(cms, recip, NULL, NULL, flags);
+    return CMS_add1_recipient(cms, recip, NULL, NULL, flags);
 }
 
 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)
 {
     CMS_KeyTransRecipientInfo *ktri;
     if (ri->type != CMS_RECIPINFO_TRANS) {
@@ -470,9 +465,9 @@ int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri,
 }
 
 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_KeyTransRecipientInfo *ktri;
     if (ri->type != CMS_RECIPINFO_TRANS) {
@@ -482,7 +477,7 @@ int CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri,
     ktri = ri->d.ktri;
 
     return ossl_cms_SignerIdentifier_get0_signer_id(ktri->rid, keyid, issuer,
-                                                    sno);
+        sno);
 }
 
 int CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert)
@@ -508,7 +503,7 @@ int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey)
 /* Encrypt content key in key transport recipient info */
 
 static int cms_RecipientInfo_ktri_encrypt(const CMS_ContentInfo *cms,
-                                          CMS_RecipientInfo *ri)
+    CMS_RecipientInfo *ri)
 {
     CMS_KeyTransRecipientInfo *ktri;
     CMS_EncryptedContentInfo *ec;
@@ -533,8 +528,8 @@ static int cms_RecipientInfo_ktri_encrypt(const CMS_ContentInfo *cms,
             goto err;
     } else {
         pctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(ctx),
-                                          ktri->pkey,
-                                          ossl_cms_ctx_get0_propq(ctx));
+            ktri->pkey,
+            ossl_cms_ctx_get0_propq(ctx));
         if (pctx == NULL)
             return 0;
 
@@ -557,7 +552,7 @@ static int cms_RecipientInfo_ktri_encrypt(const CMS_ContentInfo *cms,
 
     ret = 1;
 
- err:
+err:
     EVP_PKEY_CTX_free(pctx);
     ktri->pctx = NULL;
     OPENSSL_free(ek);
@@ -567,7 +562,7 @@ static int cms_RecipientInfo_ktri_encrypt(const CMS_ContentInfo *cms,
 /* Decrypt content key from KTRI */
 
 static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
-                                          CMS_RecipientInfo *ri)
+    CMS_RecipientInfo *ri)
 {
     CMS_KeyTransRecipientInfo *ktri = ri->d.ktri;
     EVP_PKEY *pkey = ktri->pkey;
@@ -590,7 +585,7 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
     }
 
     if (cms->d.envelopedData->encryptedContentInfo->havenocert
-            && !cms->d.envelopedData->encryptedContentInfo->debug) {
+        && !cms->d.envelopedData->encryptedContentInfo->debug) {
         X509_ALGOR *calg = ec->contentEncryptionAlgorithm;
         char name[OSSL_MAX_NAME_SIZE];
 
@@ -632,8 +627,9 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
         EVP_PKEY_CTX_ctrl_str(ktri->pctx, "rsa_pkcs1_implicit_rejection", "0");
 
     if (evp_pkey_decrypt_alloc(ktri->pctx, &ek, &eklen, fixlen,
-                               ktri->encryptedKey->data,
-                               ktri->encryptedKey->length) <= 0)
+            ktri->encryptedKey->data,
+            ktri->encryptedKey->length)
+        <= 0)
         goto err;
 
     ret = 1;
@@ -642,7 +638,7 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
     ec->key = ek;
     ec->keylen = eklen;
 
- err:
+err:
     EVP_PKEY_CTX_free(ktri->pctx);
     ktri->pctx = NULL;
     if (!ret)
@@ -654,7 +650,7 @@ static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
 /* Key Encrypted Key (KEK) RecipientInfo routines */
 
 int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri,
-                                   const unsigned char *id, size_t idlen)
+    const unsigned char *id, size_t idlen)
 {
     ASN1_OCTET_STRING tmp_os;
     CMS_KEKRecipientInfo *kekri;
@@ -690,11 +686,11 @@ static size_t aes_wrap_keylen(int nid)
 }
 
 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)
 {
     CMS_RecipientInfo *ri = NULL;
     CMS_KEKRecipientInfo *kekri;
@@ -735,7 +731,6 @@ CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,
             ERR_raise(ERR_LIB_CMS, CMS_R_INVALID_KEY_LENGTH);
             goto err;
         }
-
     }
 
     /* Initialize recipient info */
@@ -784,21 +779,21 @@ CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,
     }
 
     (void)X509_ALGOR_set0(kekri->keyEncryptionAlgorithm, OBJ_nid2obj(nid),
-                          V_ASN1_UNDEF, NULL); /* cannot fail */
+        V_ASN1_UNDEF, NULL); /* cannot fail */
 
     return ri;
 
- err:
+err:
     M_ASN1_free_of(ri, CMS_RecipientInfo);
     return NULL;
 }
 
 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)
 {
     CMS_KEKIdentifier *rkid;
     if (ri->type != CMS_RECIPINFO_KEK) {
@@ -828,7 +823,7 @@ int CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri,
 }
 
 int CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri,
-                               unsigned char *key, size_t keylen)
+    unsigned char *key, size_t keylen)
 {
     CMS_KEKRecipientInfo *kekri;
     if (ri->type != CMS_RECIPINFO_KEK) {
@@ -860,14 +855,13 @@ static EVP_CIPHER *cms_get_key_wrap_cipher(size_t keylen, const CMS_CTX *ctx)
         return NULL;
     }
     return EVP_CIPHER_fetch(ossl_cms_ctx_get0_libctx(ctx), alg,
-                            ossl_cms_ctx_get0_propq(ctx));
+        ossl_cms_ctx_get0_propq(ctx));
 }
 
-
 /* Encrypt content key in KEK recipient info */
 
 static int cms_RecipientInfo_kekri_encrypt(const CMS_ContentInfo *cms,
-                                           CMS_RecipientInfo *ri)
+    CMS_RecipientInfo *ri)
 {
     CMS_EncryptedContentInfo *ec;
     CMS_KEKRecipientInfo *kekri;
@@ -909,8 +903,8 @@ static int cms_RecipientInfo_kekri_encrypt(const CMS_ContentInfo *cms,
 
     EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPHER_CTX_FLAG_WRAP_ALLOW);
     if (!EVP_EncryptInit_ex(ctx, cipher, NULL, kekri->key, NULL)
-            || !EVP_EncryptUpdate(ctx, wkey, &wkeylen, ec->key, ec->keylen)
-            || !EVP_EncryptFinal_ex(ctx, wkey + wkeylen, &outlen)) {
+        || !EVP_EncryptUpdate(ctx, wkey, &wkeylen, ec->key, ec->keylen)
+        || !EVP_EncryptFinal_ex(ctx, wkey + wkeylen, &outlen)) {
         ERR_raise(ERR_LIB_CMS, CMS_R_WRAP_ERROR);
         goto err;
     }
@@ -924,7 +918,7 @@ static int cms_RecipientInfo_kekri_encrypt(const CMS_ContentInfo *cms,
 
     r = 1;
 
- err:
+err:
     EVP_CIPHER_free(cipher);
     if (!r)
         OPENSSL_free(wkey);
@@ -936,7 +930,7 @@ static int cms_RecipientInfo_kekri_encrypt(const CMS_ContentInfo *cms,
 /* Decrypt content key in KEK recipient info */
 
 static int cms_RecipientInfo_kekri_decrypt(CMS_ContentInfo *cms,
-                                           CMS_RecipientInfo *ri)
+    CMS_RecipientInfo *ri)
 {
     CMS_EncryptedContentInfo *ec;
     CMS_KEKRecipientInfo *kekri;
@@ -989,10 +983,10 @@ static int cms_RecipientInfo_kekri_decrypt(CMS_ContentInfo *cms,
     }
 
     if (!EVP_DecryptInit_ex(ctx, cipher, NULL, kekri->key, NULL)
-            || !EVP_DecryptUpdate(ctx, ukey, &ukeylen,
-                                  kekri->encryptedKey->data,
-                                  kekri->encryptedKey->length)
-            || !EVP_DecryptFinal_ex(ctx, ukey + ukeylen, &outlen)) {
+        || !EVP_DecryptUpdate(ctx, ukey, &ukeylen,
+            kekri->encryptedKey->data,
+            kekri->encryptedKey->length)
+        || !EVP_DecryptFinal_ex(ctx, ukey + ukeylen, &outlen)) {
         ERR_raise(ERR_LIB_CMS, CMS_R_UNWRAP_ERROR);
         goto err;
     }
@@ -1004,7 +998,7 @@ static int cms_RecipientInfo_kekri_decrypt(CMS_ContentInfo *cms,
 
     r = 1;
 
- err:
+err:
     EVP_CIPHER_free(cipher);
     if (!r)
         OPENSSL_free(ukey);
@@ -1104,7 +1098,7 @@ static void cms_env_set_version(CMS_EnvelopedData *env)
             env->version = 3;
             return;
         } else if (ri->type != CMS_RECIPINFO_TRANS
-                   || ri->d.ktri->version != 0) {
+            || ri->d.ktri->version != 0) {
             env->version = 2;
         }
     }
@@ -1116,7 +1110,7 @@ static void cms_env_set_version(CMS_EnvelopedData *env)
 }
 
 static int cms_env_encrypt_content_key(const CMS_ContentInfo *cms,
-                                       STACK_OF(CMS_RecipientInfo) *ris)
+    STACK_OF(CMS_RecipientInfo) *ris)
 {
     int i;
     CMS_RecipientInfo *ri;
@@ -1141,7 +1135,8 @@ static BIO *cms_EnvelopedData_Decryption_init_bio(CMS_ContentInfo *cms)
 {
     CMS_EncryptedContentInfo *ec = cms->d.envelopedData->encryptedContentInfo;
     BIO *contentBio = ossl_cms_EncryptedContent_init_bio(ec,
-                                                         ossl_cms_get0_cmsctx(cms));
+        ossl_cms_get0_cmsctx(cms),
+        0);
     EVP_CIPHER_CTX *ctx = NULL;
 
     if (contentBio == NULL)
@@ -1157,9 +1152,11 @@ static BIO *cms_EnvelopedData_Decryption_init_bio(CMS_ContentInfo *cms)
      * deal with it using special ctrl function
      */
     if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
-                & EVP_CIPH_FLAG_CIPHER_WITH_MAC) != 0
-         && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PROCESS_UNPROTECTED, 0,
-                                cms->d.envelopedData->unprotectedAttrs) <= 0) {
+            & EVP_CIPH_FLAG_CIPHER_WITH_MAC)
+            != 0
+        && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PROCESS_UNPROTECTED, 0,
+               cms->d.envelopedData->unprotectedAttrs)
+            <= 0) {
         BIO_free(contentBio);
         return NULL;
     }
@@ -1177,7 +1174,7 @@ static BIO *cms_EnvelopedData_Encryption_init_bio(CMS_ContentInfo *cms)
     /* Get BIO first to set up key */
 
     ec = env->encryptedContentInfo;
-    ret = ossl_cms_EncryptedContent_init_bio(ec, ossl_cms_get0_cmsctx(cms));
+    ret = ossl_cms_EncryptedContent_init_bio(ec, ossl_cms_get0_cmsctx(cms), 0);
 
     /* If error end of processing */
     if (!ret)
@@ -1195,7 +1192,7 @@ static BIO *cms_EnvelopedData_Encryption_init_bio(CMS_ContentInfo *cms)
 
     ok = 1;
 
- err:
+err:
     cms_env_clear_ec(ec);
     if (ok)
         return ret;
@@ -1206,8 +1203,8 @@ static BIO *cms_EnvelopedData_Encryption_init_bio(CMS_ContentInfo *cms)
 BIO *ossl_cms_EnvelopedData_init_bio(CMS_ContentInfo *cms)
 {
     if (cms->d.envelopedData->encryptedContentInfo->cipher != NULL) {
-         /* If cipher is set it's encryption */
-         return cms_EnvelopedData_Encryption_init_bio(cms);
+        /* If cipher is set it's encryption */
+        return cms_EnvelopedData_Encryption_init_bio(cms);
     }
 
     /* If cipher is not set it's decryption */
@@ -1229,7 +1226,7 @@ BIO *ossl_cms_AuthEnvelopedData_init_bio(CMS_ContentInfo *cms)
         ec->tag = aenv->mac->data;
         ec->taglen = aenv->mac->length;
     }
-    ret = ossl_cms_EncryptedContent_init_bio(ec, ossl_cms_get0_cmsctx(cms));
+    ret = ossl_cms_EncryptedContent_init_bio(ec, ossl_cms_get0_cmsctx(cms), 1);
 
     /* If error or no cipher end of processing */
     if (ret == NULL || ec->cipher == NULL)
@@ -1247,7 +1244,7 @@ BIO *ossl_cms_AuthEnvelopedData_init_bio(CMS_ContentInfo *cms)
 
     ok = 1;
 
- err:
+err:
     cms_env_clear_ec(ec);
     if (ok)
         return ret;
@@ -1277,7 +1274,8 @@ int ossl_cms_EnvelopedData_final(CMS_ContentInfo *cms, BIO *chain)
      * deal with it using special ctrl function
      */
     if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
-            & EVP_CIPH_FLAG_CIPHER_WITH_MAC) != 0) {
+            & EVP_CIPH_FLAG_CIPHER_WITH_MAC)
+        != 0) {
         if (env->unprotectedAttrs == NULL)
             env->unprotectedAttrs = sk_X509_ATTRIBUTE_new_null();
 
@@ -1287,7 +1285,8 @@ int ossl_cms_EnvelopedData_final(CMS_ContentInfo *cms, BIO *chain)
         }
 
         if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_PROCESS_UNPROTECTED,
-                                1, env->unprotectedAttrs) <= 0) {
+                1, env->unprotectedAttrs)
+            <= 0) {
             ERR_raise(ERR_LIB_CMS, CMS_R_CTRL_FAILURE);
             return 0;
         }
@@ -1314,9 +1313,10 @@ int ossl_cms_AuthEnvelopedData_final(CMS_ContentInfo *cms, BIO *cmsbio)
 
     taglen = EVP_CIPHER_CTX_get_tag_length(ctx);
     if (taglen <= 0
-            || (tag = OPENSSL_malloc(taglen)) == NULL
-            || EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, taglen,
-                                   tag) <= 0) {
+        || (tag = OPENSSL_malloc(taglen)) == NULL
+        || EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, taglen,
+               tag)
+            <= 0) {
         ERR_raise(ERR_LIB_CMS, CMS_R_CIPHER_GET_TAG);
         goto err;
     }
@@ -1370,7 +1370,7 @@ int ossl_cms_pkey_is_ri_type_supported(EVP_PKEY *pk, int ri_type)
         int i, r;
 
         i = pk->ameth->pkey_ctrl(pk, ASN1_PKEY_CTRL_CMS_IS_RI_TYPE_SUPPORTED,
-                                 ri_type, &r);
+            ri_type, &r);
         if (i > 0)
             return r;
     }
diff --git a/crypto/cms/cms_err.c b/crypto/cms/cms_err.c
index 98d6bea5f028a..1b0a0039f99fe 100644
--- a/crypto/cms/cms_err.c
+++ b/crypto/cms/cms_err.c
@@ -14,169 +14,171 @@
 
 #ifndef OPENSSL_NO_CMS
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA CMS_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ADD_SIGNER_ERROR), "add signer error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ATTRIBUTE_ERROR), "attribute error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_ALREADY_PRESENT),
-     "certificate already present"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_HAS_NO_KEYID),
-     "certificate has no keyid"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_VERIFY_ERROR),
-     "certificate verify error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_AEAD_SET_TAG_ERROR),
-     "cipher aead set tag error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_GET_TAG), "cipher get tag"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_INITIALISATION_ERROR),
-     "cipher initialisation error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR),
-     "cipher parameter initialisation error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CMS_DATAFINAL_ERROR),
-     "cms datafinal error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CMS_LIB), "cms lib"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENTIDENTIFIER_MISMATCH),
-     "contentidentifier mismatch"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_NOT_FOUND), "content not found"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_MISMATCH),
-     "content type mismatch"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA),
-     "content type not compressed data"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA),
-     "content type not enveloped data"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA),
-     "content type not signed data"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_VERIFY_ERROR),
-     "content verify error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CTRL_ERROR), "ctrl error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CTRL_FAILURE), "ctrl failure"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_DECODE_ERROR), "decode error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_DECRYPT_ERROR), "decrypt error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_GETTING_PUBLIC_KEY),
-     "error getting public key"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE),
-     "error reading messagedigest attribute"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_SETTING_KEY), "error setting key"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_SETTING_RECIPIENTINFO),
-     "error setting recipientinfo"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT),
-     "error unsupported static key agreement"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR),
-     "ess signing certid mismatch error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_ENCRYPTED_KEY_LENGTH),
-     "invalid encrypted key length"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER),
-     "invalid key encryption parameter"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_KEY_LENGTH), "invalid key length"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_LABEL), "invalid label"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_OAEP_PARAMETERS),
-     "invalid oaep parameters"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_KDF_PARAMETER_ERROR),
-     "kdf parameter error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MD_BIO_INIT_ERROR), "md bio init error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH),
-     "messagedigest attribute wrong length"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MESSAGEDIGEST_WRONG_LENGTH),
-     "messagedigest wrong length"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_ERROR), "msgsigdigest error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE),
-     "msgsigdigest verification failure"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_WRONG_LENGTH),
-     "msgsigdigest wrong length"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NEED_ONE_SIGNER), "need one signer"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_A_SIGNED_RECEIPT),
-     "not a signed receipt"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_ENCRYPTED_DATA), "not encrypted data"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEK), "not kek"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEY_AGREEMENT), "not key agreement"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEY_TRANSPORT), "not key transport"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_PWRI), "not pwri"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),
-     "not supported for this key type"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CIPHER), "no cipher"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CONTENT), "no content"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CONTENT_TYPE), "no content type"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_DEFAULT_DIGEST), "no default digest"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_DIGEST_SET), "no digest set"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_KEY), "no key"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_KEY_OR_CERT), "no key or cert"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_DIGEST), "no matching digest"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_RECIPIENT),
-     "no matching recipient"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_SIGNATURE),
-     "no matching signature"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MSGSIGDIGEST), "no msgsigdigest"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PASSWORD), "no password"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PRIVATE_KEY), "no private key"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PUBLIC_KEY), "no public key"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_RECEIPT_REQUEST), "no receipt request"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_SIGNERS), "no signers"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_OPERATION_UNSUPPORTED),
-     "operation unsupported"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_PEER_KEY_ERROR), "peer key error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
-     "private key does not match certificate"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_RECEIPT_DECODE_ERROR),
-     "receipt decode error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_RECIPIENT_ERROR), "recipient error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SHARED_INFO_ERROR), "shared info error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SIGNER_CERTIFICATE_NOT_FOUND),
-     "signer certificate not found"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SIGNFINAL_ERROR), "signfinal error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SMIME_TEXT_ERROR), "smime text error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_STORE_INIT_ERROR), "store init error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_COMPRESSED_DATA),
-     "type not compressed data"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_DATA), "type not data"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_DIGESTED_DATA),
-     "type not digested data"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_ENCRYPTED_DATA),
-     "type not encrypted data"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_ENVELOPED_DATA),
-     "type not enveloped data"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNABLE_TO_FINALIZE_CONTEXT),
-     "unable to finalize context"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_CIPHER), "unknown cipher"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_DIGEST_ALGORITHM),
-     "unknown digest algorithm"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_ID), "unknown id"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM),
-     "unsupported compression algorithm"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM),
-     "unsupported content encryption algorithm"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_CONTENT_TYPE),
-     "unsupported content type"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_ENCRYPTION_TYPE),
-     "unsupported encryption type"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_KEK_ALGORITHM),
-     "unsupported kek algorithm"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM),
-     "unsupported key encryption algorithm"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_LABEL_SOURCE),
-     "unsupported label source"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE),
-     "unsupported recipientinfo type"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENT_TYPE),
-     "unsupported recipient type"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM),
-     "unsupported signature algorithm"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_TYPE), "unsupported type"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_ERROR), "unwrap error"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_FAILURE), "unwrap failure"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_VERIFICATION_FAILURE),
-     "verification failure"},
-    {ERR_PACK(ERR_LIB_CMS, 0, CMS_R_WRAP_ERROR), "wrap error"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ADD_SIGNER_ERROR), "add signer error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ATTRIBUTE_ERROR), "attribute error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_ALREADY_PRESENT),
+        "certificate already present" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_HAS_NO_KEYID),
+        "certificate has no keyid" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CERTIFICATE_VERIFY_ERROR),
+        "certificate verify error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_AEAD_IN_ENVELOPED_DATA),
+        "cipher aead in enveloped data" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_AEAD_SET_TAG_ERROR),
+        "cipher aead set tag error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_GET_TAG), "cipher get tag" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_INITIALISATION_ERROR),
+        "cipher initialisation error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR),
+        "cipher parameter initialisation error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CMS_DATAFINAL_ERROR),
+        "cms datafinal error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CMS_LIB), "cms lib" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENTIDENTIFIER_MISMATCH),
+        "contentidentifier mismatch" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_NOT_FOUND), "content not found" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_MISMATCH),
+        "content type mismatch" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA),
+        "content type not compressed data" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA),
+        "content type not enveloped data" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA),
+        "content type not signed data" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CONTENT_VERIFY_ERROR),
+        "content verify error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CTRL_ERROR), "ctrl error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_CTRL_FAILURE), "ctrl failure" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_DECODE_ERROR), "decode error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_DECRYPT_ERROR), "decrypt error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_GETTING_PUBLIC_KEY),
+        "error getting public key" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE),
+        "error reading messagedigest attribute" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_SETTING_KEY), "error setting key" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_SETTING_RECIPIENTINFO),
+        "error setting recipientinfo" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT),
+        "error unsupported static key agreement" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR),
+        "ess signing certid mismatch error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_ENCRYPTED_KEY_LENGTH),
+        "invalid encrypted key length" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER),
+        "invalid key encryption parameter" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_KEY_LENGTH), "invalid key length" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_LABEL), "invalid label" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_INVALID_OAEP_PARAMETERS),
+        "invalid oaep parameters" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_KDF_PARAMETER_ERROR),
+        "kdf parameter error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MD_BIO_INIT_ERROR), "md bio init error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH),
+        "messagedigest attribute wrong length" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MESSAGEDIGEST_WRONG_LENGTH),
+        "messagedigest wrong length" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_ERROR), "msgsigdigest error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE),
+        "msgsigdigest verification failure" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_MSGSIGDIGEST_WRONG_LENGTH),
+        "msgsigdigest wrong length" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NEED_ONE_SIGNER), "need one signer" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_A_SIGNED_RECEIPT),
+        "not a signed receipt" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_ENCRYPTED_DATA), "not encrypted data" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEK), "not kek" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEY_AGREEMENT), "not key agreement" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_KEY_TRANSPORT), "not key transport" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_PWRI), "not pwri" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),
+        "not supported for this key type" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CIPHER), "no cipher" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CONTENT), "no content" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_CONTENT_TYPE), "no content type" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_DEFAULT_DIGEST), "no default digest" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_DIGEST_SET), "no digest set" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_KEY), "no key" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_KEY_OR_CERT), "no key or cert" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_DIGEST), "no matching digest" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_RECIPIENT),
+        "no matching recipient" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MATCHING_SIGNATURE),
+        "no matching signature" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_MSGSIGDIGEST), "no msgsigdigest" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PASSWORD), "no password" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PRIVATE_KEY), "no private key" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_PUBLIC_KEY), "no public key" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_RECEIPT_REQUEST), "no receipt request" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_NO_SIGNERS), "no signers" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_OPERATION_UNSUPPORTED),
+        "operation unsupported" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_PEER_KEY_ERROR), "peer key error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
+        "private key does not match certificate" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_RECEIPT_DECODE_ERROR),
+        "receipt decode error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_RECIPIENT_ERROR), "recipient error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SHARED_INFO_ERROR), "shared info error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SIGNER_CERTIFICATE_NOT_FOUND),
+        "signer certificate not found" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SIGNFINAL_ERROR), "signfinal error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_SMIME_TEXT_ERROR), "smime text error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_STORE_INIT_ERROR), "store init error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_COMPRESSED_DATA),
+        "type not compressed data" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_DATA), "type not data" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_DIGESTED_DATA),
+        "type not digested data" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_ENCRYPTED_DATA),
+        "type not encrypted data" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_TYPE_NOT_ENVELOPED_DATA),
+        "type not enveloped data" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNABLE_TO_FINALIZE_CONTEXT),
+        "unable to finalize context" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_CIPHER), "unknown cipher" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_DIGEST_ALGORITHM),
+        "unknown digest algorithm" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNKNOWN_ID), "unknown id" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM),
+        "unsupported compression algorithm" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM),
+        "unsupported content encryption algorithm" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_CONTENT_TYPE),
+        "unsupported content type" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_ENCRYPTION_TYPE),
+        "unsupported encryption type" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_KEK_ALGORITHM),
+        "unsupported kek algorithm" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM),
+        "unsupported key encryption algorithm" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_LABEL_SOURCE),
+        "unsupported label source" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE),
+        "unsupported recipientinfo type" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_RECIPIENT_TYPE),
+        "unsupported recipient type" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM),
+        "unsupported signature algorithm" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNSUPPORTED_TYPE), "unsupported type" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_ERROR), "unwrap error" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_UNWRAP_FAILURE), "unwrap failure" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_VERIFICATION_FAILURE),
+        "verification failure" },
+    { ERR_PACK(ERR_LIB_CMS, 0, CMS_R_WRAP_ERROR), "wrap error" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_CMS_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(CMS_str_reasons[0].error) == NULL)
         ERR_load_strings_const(CMS_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c
index 0885a682161cd..480e1c8b1ddca 100644
--- a/crypto/cms/cms_ess.c
+++ b/crypto/cms/cms_ess.c
@@ -50,7 +50,7 @@ int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr)
  * or -1 on attribute parsing failure.
  */
 static int ossl_cms_signerinfo_get_signing_cert(const CMS_SignerInfo *si,
-                                                ESS_SIGNING_CERT **psc)
+    ESS_SIGNING_CERT **psc)
 {
     ASN1_STRING *str;
     ESS_SIGNING_CERT *sc;
@@ -77,7 +77,7 @@ static int ossl_cms_signerinfo_get_signing_cert(const CMS_SignerInfo *si,
  * or -1 on attribute parsing failure.
  */
 static int ossl_cms_signerinfo_get_signing_cert_v2(const CMS_SignerInfo *si,
-                                                   ESS_SIGNING_CERT_V2 **psc)
+    ESS_SIGNING_CERT_V2 **psc)
 {
     ASN1_STRING *str;
     ESS_SIGNING_CERT_V2 *sc;
@@ -100,7 +100,7 @@ static int ossl_cms_signerinfo_get_signing_cert_v2(const CMS_SignerInfo *si,
 }
 
 int ossl_cms_check_signing_certs(const CMS_SignerInfo *si,
-                                 const STACK_OF(X509) *chain)
+    const STACK_OF(X509) *chain)
 {
     ESS_SIGNING_CERT *ss = NULL;
     ESS_SIGNING_CERT_V2 *ssv2 = NULL;
@@ -133,7 +133,8 @@ CMS_ReceiptRequest *CMS_ReceiptRequest_create0_ex(
             goto err;
         }
         if (RAND_bytes_ex(libctx, rr->signedContentIdentifier->data, 32,
-                          0) <= 0)
+                0)
+            <= 0)
             goto err;
     }
 
@@ -150,10 +151,9 @@ CMS_ReceiptRequest *CMS_ReceiptRequest_create0_ex(
 
     return rr;
 
- err:
+err:
     CMS_ReceiptRequest_free(rr);
     return NULL;
-
 }
 
 CMS_ReceiptRequest *CMS_ReceiptRequest_create0(
@@ -161,7 +161,7 @@ CMS_ReceiptRequest *CMS_ReceiptRequest_create0(
     STACK_OF(GENERAL_NAMES) *receiptList, STACK_OF(GENERAL_NAMES) *receiptsTo)
 {
     return CMS_ReceiptRequest_create0_ex(id, idlen, allorfirst, receiptList,
-                                         receiptsTo, NULL);
+        receiptsTo, NULL);
 }
 
 int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr)
@@ -176,25 +176,24 @@ int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr)
     }
 
     if (!CMS_signed_add1_attr_by_NID(si, NID_id_smime_aa_receiptRequest,
-                                     V_ASN1_SEQUENCE, rrder, rrderlen)) {
+            V_ASN1_SEQUENCE, rrder, rrderlen)) {
         ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
         goto err;
     }
 
     r = 1;
 
- err:
+err:
     OPENSSL_free(rrder);
 
     return r;
-
 }
 
 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)
 {
     if (pcid != NULL)
         *pcid = rr->signedContentIdentifier;
@@ -216,16 +215,16 @@ void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
 /* Digest a SignerInfo structure for msgSigDigest attribute processing */
 
 static int cms_msgSigDigest(CMS_SignerInfo *si,
-                            unsigned char *dig, unsigned int *diglen)
+    unsigned char *dig, unsigned int *diglen)
 {
     const EVP_MD *md = EVP_get_digestbyobj(si->digestAlgorithm->algorithm);
 
     if (md == NULL)
         return 0;
     if (!ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(CMS_Attributes_Verify), md,
-                                  si->signedAttrs, dig, diglen,
-                                  ossl_cms_ctx_get0_libctx(si->cms_ctx),
-                                  ossl_cms_ctx_get0_propq(si->cms_ctx)))
+            si->signedAttrs, dig, diglen,
+            ossl_cms_ctx_get0_libctx(si->cms_ctx),
+            ossl_cms_ctx_get0_propq(si->cms_ctx)))
         return 0;
     return 1;
 }
@@ -242,7 +241,7 @@ int ossl_cms_msgSigDigest_add1(CMS_SignerInfo *dest, CMS_SignerInfo *src)
         return 0;
     }
     if (!CMS_signed_add1_attr_by_NID(dest, NID_id_smime_aa_msgSigDigest,
-                                     V_ASN1_OCTET_STRING, dig, diglen)) {
+            V_ASN1_OCTET_STRING, dig, diglen)) {
         ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
         return 0;
     }
@@ -312,9 +311,8 @@ int ossl_cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
     /* Get msgSigDigest value and compare */
 
     msig = CMS_signed_get0_data_by_OBJ(si,
-                                       OBJ_nid2obj
-                                       (NID_id_smime_aa_msgSigDigest), -3,
-                                       V_ASN1_OCTET_STRING);
+        OBJ_nid2obj(NID_id_smime_aa_msgSigDigest), -3,
+        V_ASN1_OCTET_STRING);
 
     if (!msig) {
         ERR_raise(ERR_LIB_CMS, CMS_R_NO_MSGSIGDIGEST);
@@ -339,8 +337,8 @@ int ossl_cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
     /* Compare content types */
 
     octype = CMS_signed_get0_data_by_OBJ(osi,
-                                         OBJ_nid2obj(NID_pkcs9_contentType),
-                                         -3, V_ASN1_OBJECT);
+        OBJ_nid2obj(NID_pkcs9_contentType),
+        -3, V_ASN1_OBJECT);
     if (!octype) {
         ERR_raise(ERR_LIB_CMS, CMS_R_NO_CONTENT_TYPE);
         goto err;
@@ -361,18 +359,17 @@ int ossl_cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
     }
 
     if (ASN1_STRING_cmp(rr->signedContentIdentifier,
-                        rct->signedContentIdentifier)) {
+            rct->signedContentIdentifier)) {
         ERR_raise(ERR_LIB_CMS, CMS_R_CONTENTIDENTIFIER_MISMATCH);
         goto err;
     }
 
     r = 1;
 
- err:
+err:
     CMS_ReceiptRequest_free(rr);
     M_ASN1_free_of(rct, CMS_Receipt);
     return r;
-
 }
 
 /*
@@ -399,8 +396,8 @@ ASN1_OCTET_STRING *ossl_cms_encode_Receipt(CMS_SignerInfo *si)
     /* Get original content type */
 
     ctype = CMS_signed_get0_data_by_OBJ(si,
-                                        OBJ_nid2obj(NID_pkcs9_contentType),
-                                        -3, V_ASN1_OBJECT);
+        OBJ_nid2obj(NID_pkcs9_contentType),
+        -3, V_ASN1_OBJECT);
     if (!ctype) {
         ERR_raise(ERR_LIB_CMS, CMS_R_NO_CONTENT_TYPE);
         goto err;
@@ -413,7 +410,7 @@ ASN1_OCTET_STRING *ossl_cms_encode_Receipt(CMS_SignerInfo *si)
 
     os = ASN1_item_pack(&rct, ASN1_ITEM_rptr(CMS_Receipt), NULL);
 
- err:
+err:
     CMS_ReceiptRequest_free(rr);
     return os;
 }
diff --git a/crypto/cms/cms_io.c b/crypto/cms/cms_io.c
index f5d70e84cec7c..14a758da5dc24 100644
--- a/crypto/cms/cms_io.c
+++ b/crypto/cms/cms_io.c
@@ -40,8 +40,8 @@ CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms)
     const CMS_CTX *ctx = ossl_cms_get0_cmsctx(cms == NULL ? NULL : *cms);
 
     ci = ASN1_item_d2i_bio_ex(ASN1_ITEM_rptr(CMS_ContentInfo), bp, cms,
-                              ossl_cms_ctx_get0_libctx(ctx),
-                              ossl_cms_ctx_get0_propq(ctx));
+        ossl_cms_ctx_get0_libctx(ctx),
+        ossl_cms_ctx_get0_propq(ctx));
     if (ci != NULL) {
         ERR_set_mark();
         ossl_cms_resolve_libctx(ci);
@@ -60,7 +60,7 @@ IMPLEMENT_PEM_rw(CMS, CMS_ContentInfo, PEM_STRING_CMS, CMS_ContentInfo)
 BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms)
 {
     return BIO_new_NDEF(out, (ASN1_VALUE *)cms,
-                        ASN1_ITEM_rptr(CMS_ContentInfo));
+        ASN1_ITEM_rptr(CMS_ContentInfo));
 }
 
 /* CMS wrappers round generalised stream and MIME routines */
@@ -68,14 +68,14 @@ BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms)
 int i2d_CMS_bio_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags)
 {
     return i2d_ASN1_bio_stream(out, (ASN1_VALUE *)cms, in, flags,
-                               ASN1_ITEM_rptr(CMS_ContentInfo));
+        ASN1_ITEM_rptr(CMS_ContentInfo));
 }
 
 int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *in,
-                             int flags)
+    int flags)
 {
     return PEM_write_bio_ASN1_stream(out, (ASN1_VALUE *)cms, in, flags,
-                                     "CMS", ASN1_ITEM_rptr(CMS_ContentInfo));
+        "CMS", ASN1_ITEM_rptr(CMS_ContentInfo));
 }
 
 int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags)
@@ -91,23 +91,23 @@ int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags)
         mdalgs = NULL;
 
     return SMIME_write_ASN1_ex(bio, (ASN1_VALUE *)cms, data, flags, ctype_nid,
-                               econt_nid, mdalgs,
-                               ASN1_ITEM_rptr(CMS_ContentInfo),
-                               ossl_cms_ctx_get0_libctx(ctx),
-                               ossl_cms_ctx_get0_propq(ctx));
+        econt_nid, mdalgs,
+        ASN1_ITEM_rptr(CMS_ContentInfo),
+        ossl_cms_ctx_get0_libctx(ctx),
+        ossl_cms_ctx_get0_propq(ctx));
 }
 
 CMS_ContentInfo *SMIME_read_CMS_ex(BIO *bio, int flags, BIO **bcont,
-                                   CMS_ContentInfo **cms)
+    CMS_ContentInfo **cms)
 {
     CMS_ContentInfo *ci;
     const CMS_CTX *ctx = ossl_cms_get0_cmsctx(cms == NULL ? NULL : *cms);
 
     ci = (CMS_ContentInfo *)SMIME_read_ASN1_ex(bio, flags, bcont,
-                                               ASN1_ITEM_rptr(CMS_ContentInfo),
-                                               (ASN1_VALUE **)cms,
-                                               ossl_cms_ctx_get0_libctx(ctx),
-                                               ossl_cms_ctx_get0_propq(ctx));
+        ASN1_ITEM_rptr(CMS_ContentInfo),
+        (ASN1_VALUE **)cms,
+        ossl_cms_ctx_get0_libctx(ctx),
+        ossl_cms_ctx_get0_propq(ctx));
     if (ci != NULL) {
         ERR_set_mark();
         ossl_cms_resolve_libctx(ci);
diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c
index ba7579f9f2308..eb5b5d7862857 100644
--- a/crypto/cms/cms_kari.c
+++ b/crypto/cms/cms_kari.c
@@ -26,8 +26,8 @@
 /* Key Agreement Recipient Info (KARI) routines */
 
 int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri,
-                                    X509_ALGOR **palg,
-                                    ASN1_OCTET_STRING **pukm)
+    X509_ALGOR **palg,
+    ASN1_OCTET_STRING **pukm)
 {
     if (ri->type != CMS_RECIPINFO_AGREE) {
         ERR_raise(ERR_LIB_CMS, CMS_R_NOT_KEY_AGREEMENT);
@@ -53,11 +53,11 @@ STACK_OF(CMS_RecipientEncryptedKey)
 }
 
 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)
 {
     CMS_OriginatorIdentifierOrKey *oik;
 
@@ -111,10 +111,10 @@ 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)
 {
     CMS_KeyAgreeRecipientIdentifier *rid = rek->rid;
 
@@ -146,7 +146,7 @@ int CMS_RecipientEncryptedKey_get0_id(CMS_RecipientEncryptedKey *rek,
 }
 
 int CMS_RecipientEncryptedKey_cert_cmp(CMS_RecipientEncryptedKey *rek,
-                                       X509 *cert)
+    X509 *cert)
 {
     CMS_KeyAgreeRecipientIdentifier *rid = rek->rid;
 
@@ -154,13 +154,13 @@ int CMS_RecipientEncryptedKey_cert_cmp(CMS_RecipientEncryptedKey *rek,
         return ossl_cms_ias_cert_cmp(rid->d.issuerAndSerialNumber, cert);
     else if (rid->type == CMS_REK_KEYIDENTIFIER)
         return ossl_cms_keyid_cert_cmp(rid->d.rKeyId->subjectKeyIdentifier,
-                                       cert);
+            cert);
     else
         return -1;
 }
 
 int CMS_RecipientInfo_kari_set0_pkey_and_peer(CMS_RecipientInfo *ri,
-                                              EVP_PKEY *pk, X509 *peer)
+    EVP_PKEY *pk, X509 *peer)
 {
     EVP_PKEY_CTX *pctx;
     CMS_KeyAgreeRecipientInfo *kari = ri->d.kari;
@@ -171,8 +171,8 @@ int CMS_RecipientInfo_kari_set0_pkey_and_peer(CMS_RecipientInfo *ri,
         return 1;
 
     pctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(kari->cms_ctx),
-                                      pk,
-                                      ossl_cms_ctx_get0_propq(kari->cms_ctx));
+        pk,
+        ossl_cms_ctx_get0_propq(kari->cms_ctx));
     if (pctx == NULL || EVP_PKEY_derive_init(pctx) <= 0)
         goto err;
 
@@ -185,7 +185,7 @@ int CMS_RecipientInfo_kari_set0_pkey_and_peer(CMS_RecipientInfo *ri,
 
     kari->pctx = pctx;
     return 1;
- err:
+err:
     EVP_PKEY_CTX_free(pctx);
     return 0;
 }
@@ -208,8 +208,8 @@ EVP_CIPHER_CTX *CMS_RecipientInfo_kari_get0_ctx(CMS_RecipientInfo *ri)
  */
 
 static int cms_kek_cipher(unsigned char **pout, size_t *poutlen,
-                          const unsigned char *in, size_t inlen,
-                          CMS_KeyAgreeRecipientInfo *kari, int enc)
+    const unsigned char *in, size_t inlen,
+    CMS_KeyAgreeRecipientInfo *kari, int enc)
 {
     /* Key encryption key */
     unsigned char kek[EVP_MAX_KEY_LENGTH];
@@ -239,7 +239,7 @@ static int cms_kek_cipher(unsigned char **pout, size_t *poutlen,
     *poutlen = (size_t)outlen;
     rv = 1;
 
- err:
+err:
     OPENSSL_cleanse(kek, keklen);
     if (!rv)
         OPENSSL_free(out);
@@ -251,8 +251,8 @@ static int cms_kek_cipher(unsigned char **pout, size_t *poutlen,
 }
 
 int CMS_RecipientInfo_kari_decrypt(CMS_ContentInfo *cms,
-                                   CMS_RecipientInfo *ri,
-                                   CMS_RecipientEncryptedKey *rek)
+    CMS_RecipientInfo *ri,
+    CMS_RecipientEncryptedKey *rek)
 {
     int rv = 0;
     unsigned char *enckey = NULL, *cek = NULL;
@@ -274,14 +274,14 @@ int CMS_RecipientInfo_kari_decrypt(CMS_ContentInfo *cms,
     ec->keylen = ceklen;
     cek = NULL;
     rv = 1;
- err:
+err:
     OPENSSL_free(cek);
     return rv;
 }
 
 /* Create ephemeral key and initialise context based on it */
 static int cms_kari_create_ephemeral_key(CMS_KeyAgreeRecipientInfo *kari,
-                                         EVP_PKEY *pk)
+    EVP_PKEY *pk)
 {
     EVP_PKEY_CTX *pctx = NULL;
     EVP_PKEY *ekey = NULL;
@@ -305,7 +305,7 @@ static int cms_kari_create_ephemeral_key(CMS_KeyAgreeRecipientInfo *kari,
         goto err;
     kari->pctx = pctx;
     rv = 1;
- err:
+err:
     if (!rv)
         EVP_PKEY_CTX_free(pctx);
     EVP_PKEY_free(ekey);
@@ -314,23 +314,23 @@ static int cms_kari_create_ephemeral_key(CMS_KeyAgreeRecipientInfo *kari,
 
 /* Set originator private key and initialise context based on it */
 static int cms_kari_set_originator_private_key(CMS_KeyAgreeRecipientInfo *kari,
-                                               EVP_PKEY *originatorPrivKey )
+    EVP_PKEY *originatorPrivKey)
 {
     EVP_PKEY_CTX *pctx = NULL;
     int rv = 0;
     const CMS_CTX *ctx = kari->cms_ctx;
 
     pctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(ctx),
-                                      originatorPrivKey,
-                                      ossl_cms_ctx_get0_propq(ctx));
+        originatorPrivKey,
+        ossl_cms_ctx_get0_propq(ctx));
     if (pctx == NULL)
         goto err;
     if (EVP_PKEY_derive_init(pctx) <= 0)
-         goto err;
+        goto err;
 
     kari->pctx = pctx;
     rv = 1;
- err:
+err:
     if (rv == 0)
         EVP_PKEY_CTX_free(pctx);
     return rv;
@@ -338,10 +338,10 @@ static int cms_kari_set_originator_private_key(CMS_KeyAgreeRecipientInfo *kari,
 
 /* Initialise a kari based on passed certificate and key */
 
-int ossl_cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri,  X509 *recip,
-                                     EVP_PKEY *recipPubKey, X509 *originator,
-                                     EVP_PKEY *originatorPrivKey,
-                                     unsigned int flags, const CMS_CTX *ctx)
+int ossl_cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri, X509 *recip,
+    EVP_PKEY *recipPubKey, X509 *originator,
+    EVP_PKEY *originatorPrivKey,
+    unsigned int flags, const CMS_CTX *ctx)
 {
     CMS_KeyAgreeRecipientInfo *kari;
     CMS_RecipientEncryptedKey *rek = NULL;
@@ -389,16 +389,16 @@ int ossl_cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri,  X509 *recip,
             return 0;
 
         if (flags & CMS_USE_ORIGINATOR_KEYID) {
-             oik->type = CMS_OIK_KEYIDENTIFIER;
-             oik->d.subjectKeyIdentifier = ASN1_OCTET_STRING_new();
-             if (oik->d.subjectKeyIdentifier == NULL)
-                  return 0;
-             if (!ossl_cms_set1_keyid(&oik->d.subjectKeyIdentifier, originator))
-                  return 0;
+            oik->type = CMS_OIK_KEYIDENTIFIER;
+            oik->d.subjectKeyIdentifier = ASN1_OCTET_STRING_new();
+            if (oik->d.subjectKeyIdentifier == NULL)
+                return 0;
+            if (!ossl_cms_set1_keyid(&oik->d.subjectKeyIdentifier, originator))
+                return 0;
         } else {
-             oik->type = CMS_REK_ISSUER_SERIAL;
-             if (!ossl_cms_set1_ias(&oik->d.issuerAndSerialNumber, originator))
-                  return 0;
+            oik->type = CMS_REK_ISSUER_SERIAL;
+            if (!ossl_cms_set1_ias(&oik->d.issuerAndSerialNumber, originator))
+                return 0;
         }
 
         if (!cms_kari_set_originator_private_key(kari, originatorPrivKey))
@@ -413,7 +413,7 @@ int ossl_cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri,  X509 *recip,
 }
 
 static int cms_wrap_init(CMS_KeyAgreeRecipientInfo *kari,
-                         const EVP_CIPHER *cipher)
+    const EVP_CIPHER *cipher)
 {
     const CMS_CTX *cms_ctx = kari->cms_ctx;
     EVP_CIPHER_CTX *ctx = kari->ctx;
@@ -435,15 +435,15 @@ static int cms_wrap_init(CMS_KeyAgreeRecipientInfo *kari,
     keylen = EVP_CIPHER_get_key_length(cipher);
     if ((EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_GET_WRAP_CIPHER) != 0) {
         ret = EVP_CIPHER_meth_get_ctrl(cipher)(NULL, EVP_CTRL_GET_WRAP_CIPHER,
-                                               0, &kekcipher);
+            0, &kekcipher);
         if (ret <= 0)
-             return 0;
+            return 0;
 
         if (kekcipher != NULL) {
-             if (EVP_CIPHER_get_mode(kekcipher) != EVP_CIPH_WRAP_MODE)
-                 return 0;
-             kekcipher_name = EVP_CIPHER_get0_name(kekcipher);
-             goto enc;
+            if (EVP_CIPHER_get_mode(kekcipher) != EVP_CIPH_WRAP_MODE)
+                return 0;
+            kekcipher_name = EVP_CIPHER_get0_name(kekcipher);
+            goto enc;
         }
     }
 
@@ -456,7 +456,7 @@ static int cms_wrap_init(CMS_KeyAgreeRecipientInfo *kari,
         kekcipher_name = SN_id_smime_alg_CMS3DESwrap;
     else
 #endif
-    if (keylen <= 16)
+        if (keylen <= 16)
         kekcipher_name = SN_id_aes128_wrap;
     else if (keylen <= 24)
         kekcipher_name = SN_id_aes192_wrap;
@@ -464,8 +464,8 @@ static int cms_wrap_init(CMS_KeyAgreeRecipientInfo *kari,
         kekcipher_name = SN_id_aes256_wrap;
 enc:
     fetched_kekcipher = EVP_CIPHER_fetch(ossl_cms_ctx_get0_libctx(cms_ctx),
-                                         kekcipher_name,
-                                         ossl_cms_ctx_get0_propq(cms_ctx));
+        kekcipher_name,
+        ossl_cms_ctx_get0_propq(cms_ctx));
     if (fetched_kekcipher == NULL)
         return 0;
     ret = EVP_EncryptInit_ex(ctx, fetched_kekcipher, NULL, NULL, NULL);
@@ -476,7 +476,7 @@ static int cms_wrap_init(CMS_KeyAgreeRecipientInfo *kari,
 /* Encrypt content key in key agreement recipient info */
 
 int ossl_cms_RecipientInfo_kari_encrypt(const CMS_ContentInfo *cms,
-                                        CMS_RecipientInfo *ri)
+    CMS_RecipientInfo *ri)
 {
     CMS_KeyAgreeRecipientInfo *kari;
     CMS_EncryptedContentInfo *ec;
@@ -523,7 +523,7 @@ int ossl_cms_RecipientInfo_kari_encrypt(const CMS_ContentInfo *cms,
         if (EVP_PKEY_derive_set_peer(kari->pctx, rek->pkey) <= 0)
             return 0;
         if (!cms_kek_cipher(&enckey, &enckeylen, ec->key, ec->keylen,
-                            kari, 1))
+                kari, 1))
             return 0;
         ASN1_STRING_set0(rek->encryptedKey, enckey, enckeylen);
     }
diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
index e8aeb806b2e9f..e3fe76e206dbc 100644
--- a/crypto/cms/cms_lib.c
+++ b/crypto/cms/cms_lib.c
@@ -14,6 +14,7 @@
 #include <openssl/bio.h>
 #include <openssl/asn1.h>
 #include <openssl/cms.h>
+#include <openssl/core_names.h>
 #include "internal/sizes.h"
 #include "internal/cryptlib.h"
 #include "crypto/x509.h"
@@ -21,21 +22,22 @@
 #include "internal/cms.h"
 
 static STACK_OF(CMS_CertificateChoices)
-**cms_get0_certificate_choices(CMS_ContentInfo *cms);
+    **
+    cms_get0_certificate_choices(CMS_ContentInfo *cms);
 
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(CMS_ContentInfo)
 IMPLEMENT_ASN1_PRINT_FUNCTION(CMS_ContentInfo)
 
 CMS_ContentInfo *d2i_CMS_ContentInfo(CMS_ContentInfo **a,
-                                     const unsigned char **in, long len)
+    const unsigned char **in, long len)
 {
     CMS_ContentInfo *ci;
     const CMS_CTX *ctx = ossl_cms_get0_cmsctx(a == NULL ? NULL : *a);
 
     ci = (CMS_ContentInfo *)ASN1_item_d2i_ex((ASN1_VALUE **)a, in, len,
-                                          (CMS_ContentInfo_it()),
-                                          ossl_cms_ctx_get0_libctx(ctx),
-                                          ossl_cms_ctx_get0_propq(ctx));
+        (CMS_ContentInfo_it()),
+        ossl_cms_ctx_get0_libctx(ctx),
+        ossl_cms_ctx_get0_propq(ctx));
     if (ci != NULL) {
         ERR_set_mark();
         ossl_cms_resolve_libctx(ci);
@@ -54,7 +56,7 @@ CMS_ContentInfo *CMS_ContentInfo_new_ex(OSSL_LIB_CTX *libctx, const char *propq)
     CMS_ContentInfo *ci;
 
     ci = (CMS_ContentInfo *)ASN1_item_new_ex(ASN1_ITEM_rptr(CMS_ContentInfo),
-                                             libctx, propq);
+        libctx, propq);
     if (ci != NULL) {
         ci->ctx.libctx = libctx;
         ci->ctx.propq = NULL;
@@ -193,7 +195,6 @@ BIO *CMS_dataInit(CMS_ContentInfo *cms, BIO *icont)
     if (!icont)
         BIO_free(cont);
     return NULL;
-
 }
 
 /* unfortunately cannot constify SMIME_write_ASN1() due to this function */
@@ -203,8 +204,8 @@ int CMS_dataFinal(CMS_ContentInfo *cms, BIO *cmsbio)
 }
 
 int ossl_cms_DataFinal(CMS_ContentInfo *cms, BIO *cmsbio,
-                       const unsigned char *precomp_md,
-                       unsigned int precomp_mdlen)
+    const unsigned char *precomp_md,
+    unsigned int precomp_mdlen)
 {
     ASN1_OCTET_STRING **pos = CMS_get0_content(cms);
 
@@ -280,7 +281,7 @@ ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms)
 
     case NID_id_smime_ct_authEnvelopedData:
         return &cms->d.authEnvelopedData->authEncryptedContentInfo
-                                        ->encryptedContent;
+                    ->encryptedContent;
 
     case NID_id_smime_ct_authData:
         return &cms->d.authenticatedData->encapContentInfo->eContent;
@@ -293,7 +294,6 @@ ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms)
             return &cms->d.other->value.octet_string;
         ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_CONTENT_TYPE);
         return NULL;
-
     }
 }
 
@@ -320,7 +320,7 @@ static ASN1_OBJECT **cms_get0_econtent_type(CMS_ContentInfo *cms)
 
     case NID_id_smime_ct_authEnvelopedData:
         return &cms->d.authEnvelopedData->authEncryptedContentInfo
-                                        ->contentType;
+                    ->contentType;
     case NID_id_smime_ct_authData:
         return &cms->d.authenticatedData->encapContentInfo->eContentType;
 
@@ -330,7 +330,6 @@ static ASN1_OBJECT **cms_get0_econtent_type(CMS_ContentInfo *cms)
     default:
         ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_CONTENT_TYPE);
         return NULL;
-
     }
 }
 
@@ -400,20 +399,21 @@ int CMS_set_detached(CMS_ContentInfo *cms, int detached)
 /* Create a digest BIO from an X509_ALGOR structure */
 
 BIO *ossl_cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm,
-                                       const CMS_CTX *ctx)
+    const CMS_CTX *ctx)
 {
     BIO *mdbio = NULL;
     const ASN1_OBJECT *digestoid;
     const EVP_MD *digest = NULL;
     EVP_MD *fetched_digest = NULL;
     char alg[OSSL_MAX_NAME_SIZE];
+    size_t xof_len = 0;
 
     X509_ALGOR_get0(&digestoid, NULL, NULL, digestAlgorithm);
     OBJ_obj2txt(alg, sizeof(alg), digestoid, 0);
 
     (void)ERR_set_mark();
     fetched_digest = EVP_MD_fetch(ossl_cms_ctx_get0_libctx(ctx), alg,
-                                  ossl_cms_ctx_get0_propq(ctx));
+        ossl_cms_ctx_get0_propq(ctx));
 
     if (fetched_digest != NULL)
         digest = fetched_digest;
@@ -431,9 +431,27 @@ BIO *ossl_cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm,
         ERR_raise(ERR_LIB_CMS, CMS_R_MD_BIO_INIT_ERROR);
         goto err;
     }
+    if (EVP_MD_xof(digest)) {
+        if (EVP_MD_is_a(digest, SN_shake128))
+            xof_len = 32;
+        else if (EVP_MD_is_a(digest, SN_shake256))
+            xof_len = 64;
+        if (xof_len > 0) {
+            EVP_MD_CTX *mdctx;
+            OSSL_PARAM params[2];
+
+            if (BIO_get_md_ctx(mdbio, &mdctx) <= 0 || mdctx == NULL)
+                goto err;
+            params[0] = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_XOFLEN,
+                &xof_len);
+            params[1] = OSSL_PARAM_construct_end();
+            if (!EVP_MD_CTX_set_params(mdctx, params))
+                goto err;
+        }
+    }
     EVP_MD_free(fetched_digest);
     return mdbio;
- err:
+err:
     EVP_MD_free(fetched_digest);
     BIO_free(mdbio);
     return NULL;
@@ -442,7 +460,7 @@ BIO *ossl_cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm,
 /* Locate a message digest content from a BIO chain based on SignerInfo */
 
 int ossl_cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain,
-                                      X509_ALGOR *mdalg)
+    X509_ALGOR *mdalg)
 {
     int nid;
     const ASN1_OBJECT *mdoid;
@@ -469,7 +487,8 @@ int ossl_cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain,
 }
 
 static STACK_OF(CMS_CertificateChoices)
-**cms_get0_certificate_choices(CMS_ContentInfo *cms)
+    **
+    cms_get0_certificate_choices(CMS_ContentInfo *cms)
 {
     switch (OBJ_obj2nid(cms->contentType)) {
 
@@ -489,7 +508,6 @@ static STACK_OF(CMS_CertificateChoices)
     default:
         ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_CONTENT_TYPE);
         return NULL;
-
     }
 }
 
@@ -552,7 +570,8 @@ int CMS_add1_cert(CMS_ContentInfo *cms, X509 *cert)
 }
 
 static STACK_OF(CMS_RevocationInfoChoice)
-**cms_get0_revocation_choices(CMS_ContentInfo *cms)
+    **
+    cms_get0_revocation_choices(CMS_ContentInfo *cms)
 {
     switch (OBJ_obj2nid(cms->contentType)) {
 
@@ -572,7 +591,6 @@ static STACK_OF(CMS_RevocationInfoChoice)
     default:
         ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_CONTENT_TYPE);
         return NULL;
-
     }
 }
 
@@ -654,7 +672,7 @@ int ossl_cms_get1_certs_ex(CMS_ContentInfo *cms, STACK_OF(X509) **certs)
         cch = sk_CMS_CertificateChoices_value(*pcerts, i);
         if (cch->type == 0) {
             if (!X509_add_cert(*certs, cch->d.certificate,
-                               X509_ADD_FLAG_UP_REF)) {
+                    X509_ADD_FLAG_UP_REF)) {
                 OSSL_STACK_OF_X509_free(*certs);
                 *certs = NULL;
                 return 0;
@@ -747,7 +765,7 @@ int ossl_cms_set1_ias(CMS_IssuerAndSerialNumber **pias, X509 *cert)
     M_ASN1_free_of(*pias, CMS_IssuerAndSerialNumber);
     *pias = ias;
     return 1;
- err:
+err:
     M_ASN1_free_of(ias, CMS_IssuerAndSerialNumber);
     return 0;
 }
@@ -772,10 +790,10 @@ int ossl_cms_set1_keyid(ASN1_OCTET_STRING **pkeyid, X509 *cert)
 }
 
 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)
+    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)
 {
     CMS_EnvelopedData *evd = NULL;
     BIO *privbio = NULL, *signbio = NULL;
@@ -799,7 +817,7 @@ CMS_EnvelopedData *ossl_cms_sign_encrypt(BIO *data, X509 *sign_cert, STACK_OF(X5
         goto err;
     evd = CMS_EnvelopedData_dup(evpcms->d.envelopedData);
 
- err:
+err:
     BIO_free(privbio);
     BIO_free(signbio);
     CMS_ContentInfo_free(signcms);
diff --git a/crypto/cms/cms_local.h b/crypto/cms/cms_local.h
index 8ed67f5c19f47..b412a74c7773b 100644
--- a/crypto/cms/cms_local.h
+++ b/crypto/cms/cms_local.h
@@ -8,9 +8,9 @@
  */
 
 #ifndef OSSL_CRYPTO_CMS_LOCAL_H
-# define OSSL_CRYPTO_CMS_LOCAL_H
+#define OSSL_CRYPTO_CMS_LOCAL_H
 
-# include <openssl/x509.h>
+#include <openssl/x509.h>
 
 /*
  * Cryptographic message syntax (CMS) structures: taken from RFC3852
@@ -298,8 +298,8 @@ struct CMS_RevocationInfoChoice_st {
     } d;
 };
 
-# define CMS_REVCHOICE_CRL               0
-# define CMS_REVCHOICE_OTHER             1
+#define CMS_REVCHOICE_CRL 0
+#define CMS_REVCHOICE_OTHER 1
 
 struct CMS_OtherRevocationInfoFormat_st {
     ASN1_OBJECT *otherRevInfoFormat;
@@ -317,11 +317,11 @@ struct CMS_CertificateChoices {
     } d;
 };
 
-# define CMS_CERTCHOICE_CERT             0
-# define CMS_CERTCHOICE_EXCERT           1
-# define CMS_CERTCHOICE_V1ACERT          2
-# define CMS_CERTCHOICE_V2ACERT          3
-# define CMS_CERTCHOICE_OTHER            4
+#define CMS_CERTCHOICE_CERT 0
+#define CMS_CERTCHOICE_EXCERT 1
+#define CMS_CERTCHOICE_V1ACERT 2
+#define CMS_CERTCHOICE_V2ACERT 3
+#define CMS_CERTCHOICE_OTHER 4
 
 struct CMS_OtherCertificateFormat_st {
     ASN1_OBJECT *otherCertFormat;
@@ -376,18 +376,18 @@ DECLARE_ASN1_ITEM(CMS_RecipientInfo)
 DECLARE_ASN1_ITEM(CMS_PasswordRecipientInfo)
 DECLARE_ASN1_ALLOC_FUNCTIONS(CMS_IssuerAndSerialNumber)
 
-# 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_ISSUER_SERIAL     0
-# define CMS_RECIPINFO_KEYIDENTIFIER     1
+#define CMS_RECIPINFO_ISSUER_SERIAL 0
+#define CMS_RECIPINFO_KEYIDENTIFIER 1
 
-# define CMS_REK_ISSUER_SERIAL           0
-# define CMS_REK_KEYIDENTIFIER           1
+#define CMS_REK_ISSUER_SERIAL 0
+#define CMS_REK_KEYIDENTIFIER 1
 
-# define CMS_OIK_ISSUER_SERIAL           0
-# define CMS_OIK_KEYIDENTIFIER           1
-# define CMS_OIK_PUBKEY                  2
+#define CMS_OIK_ISSUER_SERIAL 0
+#define CMS_OIK_KEYIDENTIFIER 1
+#define CMS_OIK_PUBKEY 2
 
 BIO *ossl_cms_content_bio(CMS_ContentInfo *cms);
 const CMS_CTX *ossl_cms_get0_cmsctx(const CMS_ContentInfo *cms);
@@ -397,37 +397,37 @@ void ossl_cms_resolve_libctx(CMS_ContentInfo *ci);
 
 CMS_ContentInfo *ossl_cms_Data_create(OSSL_LIB_CTX *ctx, const char *propq);
 int ossl_cms_DataFinal(CMS_ContentInfo *cms, BIO *cmsbio,
-                       const unsigned char *precomp_md,
-                       unsigned int precomp_mdlen);
+    const unsigned char *precomp_md,
+    unsigned int precomp_mdlen);
 
 CMS_ContentInfo *ossl_cms_DigestedData_create(const EVP_MD *md,
-                                              OSSL_LIB_CTX *libctx,
-                                              const char *propq);
+    OSSL_LIB_CTX *libctx,
+    const char *propq);
 BIO *ossl_cms_DigestedData_init_bio(const CMS_ContentInfo *cms);
 int ossl_cms_DigestedData_do_final(const CMS_ContentInfo *cms,
-                                   BIO *chain, int verify);
+    BIO *chain, int verify);
 
 BIO *ossl_cms_SignedData_init_bio(CMS_ContentInfo *cms);
 int ossl_cms_SignedData_final(CMS_ContentInfo *cms, BIO *chain,
-                              const unsigned char *precomp_md,
-                              unsigned int precomp_mdlen);
+    const unsigned char *precomp_md,
+    unsigned int precomp_mdlen);
 int ossl_cms_set1_SignerIdentifier(CMS_SignerIdentifier *sid, X509 *cert,
-                                   int type, const CMS_CTX *ctx);
+    int type, const CMS_CTX *ctx);
 int ossl_cms_SignerIdentifier_get0_signer_id(CMS_SignerIdentifier *sid,
-                                             ASN1_OCTET_STRING **keyid,
-                                             X509_NAME **issuer,
-                                             ASN1_INTEGER **sno);
+    ASN1_OCTET_STRING **keyid,
+    X509_NAME **issuer,
+    ASN1_INTEGER **sno);
 int ossl_cms_SignerIdentifier_cert_cmp(CMS_SignerIdentifier *sid, X509 *cert);
 
 CMS_ContentInfo *ossl_cms_CompressedData_create(int comp_nid,
-                                                OSSL_LIB_CTX *libctx,
-                                                const char *propq);
+    OSSL_LIB_CTX *libctx,
+    const char *propq);
 BIO *ossl_cms_CompressedData_init_bio(const CMS_ContentInfo *cms);
 
 BIO *ossl_cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm,
-                                       const CMS_CTX *ctx);
+    const CMS_CTX *ctx);
 int ossl_cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain,
-                                      X509_ALGOR *mdalg);
+    X509_ALGOR *mdalg);
 
 int ossl_cms_ias_cert_cmp(CMS_IssuerAndSerialNumber *ias, X509 *cert);
 int ossl_cms_keyid_cert_cmp(ASN1_OCTET_STRING *keyid, X509 *cert);
@@ -435,12 +435,12 @@ int ossl_cms_set1_ias(CMS_IssuerAndSerialNumber **pias, X509 *cert);
 int ossl_cms_set1_keyid(ASN1_OCTET_STRING **pkeyid, X509 *cert);
 
 BIO *ossl_cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec,
-                                        const CMS_CTX *ctx);
+    const CMS_CTX *ctx, int auth);
 BIO *ossl_cms_EncryptedData_init_bio(const CMS_ContentInfo *cms);
 int ossl_cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec,
-                                   const EVP_CIPHER *cipher,
-                                   const unsigned char *key, size_t keylen,
-                                   const CMS_CTX *ctx);
+    const EVP_CIPHER *cipher,
+    const unsigned char *key, size_t keylen,
+    const CMS_CTX *ctx);
 
 int ossl_cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms);
 int ossl_cms_msgSigDigest_add1(CMS_SignerInfo *dest, CMS_SignerInfo *src);
@@ -463,24 +463,23 @@ void ossl_cms_RecipientInfos_set_cmsctx(CMS_ContentInfo *cms);
 
 /* KARI routines */
 int ossl_cms_RecipientInfo_kari_init(CMS_RecipientInfo *ri, X509 *recip,
-                                     EVP_PKEY *recipPubKey, X509 *originator,
-                                     EVP_PKEY *originatorPrivKey,
-                                     unsigned int flags,
-                                     const CMS_CTX *ctx);
+    EVP_PKEY *recipPubKey, X509 *originator,
+    EVP_PKEY *originatorPrivKey,
+    unsigned int flags,
+    const CMS_CTX *ctx);
 int ossl_cms_RecipientInfo_kari_encrypt(const CMS_ContentInfo *cms,
-                                        CMS_RecipientInfo *ri);
+    CMS_RecipientInfo *ri);
 
 /* PWRI routines */
 int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
-                                      CMS_RecipientInfo *ri, int en_de);
+    CMS_RecipientInfo *ri, int en_de);
 /* SignerInfo routines */
 int ossl_cms_si_check_attributes(const CMS_SignerInfo *si);
 void ossl_cms_SignerInfos_set_cmsctx(CMS_ContentInfo *cms);
 
-
 /* ESS routines */
 int ossl_cms_check_signing_certs(const CMS_SignerInfo *si,
-                                 const STACK_OF(X509) *chain);
+    const STACK_OF(X509) *chain);
 
 int ossl_cms_dh_envelope(CMS_RecipientInfo *ri, int decrypt);
 int ossl_cms_ecdh_envelope(CMS_RecipientInfo *ri, int decrypt);
diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c
index a7d609f83791a..d62dbbde881b3 100644
--- a/crypto/cms/cms_pwri.c
+++ b/crypto/cms/cms_pwri.c
@@ -20,7 +20,7 @@
 #include "cms_local.h"
 
 int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
-                                    unsigned char *pass, ossl_ssize_t passlen)
+    unsigned char *pass, ossl_ssize_t passlen)
 {
     CMS_PasswordRecipientInfo *pwri;
     if (ri->type != CMS_RECIPINFO_PASS) {
@@ -37,11 +37,11 @@ int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
 }
 
 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)
 {
     STACK_OF(CMS_RecipientInfo) *ris;
     CMS_RecipientInfo *ri = NULL;
@@ -156,8 +156,7 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
     }
 
     if (!ASN1_item_pack(encalg, ASN1_ITEM_rptr(X509_ALGOR),
-                        &pwri->keyEncryptionAlgorithm->parameter->
-                        value.sequence)) {
+            &pwri->keyEncryptionAlgorithm->parameter->value.sequence)) {
         ERR_raise(ERR_LIB_CMS, ERR_R_ASN1_LIB);
         goto err;
     }
@@ -169,7 +168,7 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
     /* Setup PBE algorithm */
 
     pwri->keyDerivationAlgorithm = PKCS5_pbkdf2_set_ex(iter, NULL, 0, -1, -1,
-                                                       cms_ctx->libctx);
+        cms_ctx->libctx);
 
     if (pwri->keyDerivationAlgorithm == NULL)
         goto err;
@@ -184,13 +183,12 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
 
     return ri;
 
- err:
+err:
     EVP_CIPHER_CTX_free(ctx);
     if (ri)
         M_ASN1_free_of(ri, CMS_RecipientInfo);
     X509_ALGOR_free(encalg);
     return NULL;
-
 }
 
 /*
@@ -199,8 +197,8 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
  */
 
 static int kek_unwrap_key(unsigned char *out, size_t *outlen,
-                          const unsigned char *in, size_t inlen,
-                          EVP_CIPHER_CTX *ctx)
+    const unsigned char *in, size_t inlen,
+    EVP_CIPHER_CTX *ctx)
 {
     size_t blocklen = EVP_CIPHER_CTX_get_block_size(ctx);
     unsigned char *tmp;
@@ -221,14 +219,14 @@ static int kek_unwrap_key(unsigned char *out, size_t *outlen,
         return 0;
     /* setup IV by decrypting last two blocks */
     if (!EVP_DecryptUpdate(ctx, tmp + inlen - 2 * blocklen, &outl,
-                           in + inlen - 2 * blocklen, blocklen * 2)
+            in + inlen - 2 * blocklen, blocklen * 2)
         /*
          * Do a decrypt of last decrypted block to set IV to correct value
          * output it to start of buffer so we don't corrupt decrypted block
          * this works because buffer is at least two block lengths long.
          */
         || !EVP_DecryptUpdate(ctx, tmp, &outl,
-                              tmp + inlen - blocklen, blocklen)
+            tmp + inlen - blocklen, blocklen)
         /* Can now decrypt first n - 1 blocks */
         || !EVP_DecryptUpdate(ctx, tmp, &outl, in, inlen - blocklen)
 
@@ -242,22 +240,21 @@ static int kek_unwrap_key(unsigned char *out, size_t *outlen,
         /* Check byte failure */
         goto err;
     }
-    if (inlen < (size_t)(tmp[0] - 4)) {
+    if (inlen < 4 + (size_t)tmp[0]) {
         /* Invalid length value */
         goto err;
     }
     *outlen = (size_t)tmp[0];
     memcpy(out, tmp + 4, *outlen);
     rv = 1;
- err:
+err:
     OPENSSL_clear_free(tmp, inlen);
     return rv;
-
 }
 
 static int kek_wrap_key(unsigned char *out, size_t *outlen,
-                        const unsigned char *in, size_t inlen,
-                        EVP_CIPHER_CTX *ctx, const CMS_CTX *cms_ctx)
+    const unsigned char *in, size_t inlen,
+    EVP_CIPHER_CTX *ctx, const CMS_CTX *cms_ctx)
 {
     size_t blocklen = EVP_CIPHER_CTX_get_block_size(ctx);
     size_t olen;
@@ -290,7 +287,8 @@ static int kek_wrap_key(unsigned char *out, size_t *outlen,
         /* Add random padding to end */
         if (olen > inlen + 4
             && RAND_bytes_ex(ossl_cms_ctx_get0_libctx(cms_ctx), out + 4 + inlen,
-                             olen - 4 - inlen, 0) <= 0)
+                   olen - 4 - inlen, 0)
+                <= 0)
             return 0;
         /* Encrypt twice */
         if (!EVP_EncryptUpdate(ctx, out, &dummy, out, olen)
@@ -306,7 +304,7 @@ static int kek_wrap_key(unsigned char *out, size_t *outlen,
 /* Encrypt/Decrypt content key in PWRI recipient info */
 
 int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
-                                      CMS_RecipientInfo *ri, int en_de)
+    CMS_RecipientInfo *ri, int en_de)
 {
     CMS_EncryptedContentInfo *ec;
     CMS_PasswordRecipientInfo *pwri;
@@ -335,7 +333,7 @@ int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
     }
 
     kekalg = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(X509_ALGOR),
-                                       algtmp->parameter);
+        algtmp->parameter);
 
     if (kekalg == NULL) {
         ERR_raise(ERR_LIB_CMS, CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER);
@@ -344,7 +342,7 @@ int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
 
     OBJ_obj2txt(name, sizeof(name), kekalg->algorithm, 0);
     kekcipher = EVP_CIPHER_fetch(ossl_cms_ctx_get0_libctx(cms_ctx), name,
-                                 ossl_cms_ctx_get0_propq(cms_ctx));
+        ossl_cms_ctx_get0_propq(cms_ctx));
 
     if (kekcipher == NULL) {
         ERR_raise(ERR_LIB_CMS, CMS_R_UNKNOWN_CIPHER);
@@ -369,10 +367,10 @@ int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
 
     /* Finish password based key derivation to setup key in "ctx" */
 
-    if (EVP_PBE_CipherInit_ex(algtmp->algorithm,
-                              (char *)pwri->pass, pwri->passlen,
-                              algtmp->parameter, kekctx, en_de,
-                              cms_ctx->libctx, cms_ctx->propq) < 0) {
+    if (!EVP_PBE_CipherInit_ex(algtmp->algorithm,
+            (char *)pwri->pass, (int)pwri->passlen,
+            algtmp->parameter, kekctx, en_de,
+            cms_ctx->libctx, cms_ctx->propq)) {
         ERR_raise(ERR_LIB_CMS, ERR_R_EVP_LIB);
         goto err;
     }
@@ -398,8 +396,8 @@ int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
         if (key == NULL)
             goto err;
         if (!kek_unwrap_key(key, &keylen,
-                            pwri->encryptedKey->data,
-                            pwri->encryptedKey->length, kekctx)) {
+                pwri->encryptedKey->data,
+                pwri->encryptedKey->length, kekctx)) {
             ERR_raise(ERR_LIB_CMS, CMS_R_UNWRAP_FAILURE);
             goto err;
         }
@@ -407,12 +405,11 @@ int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
         OPENSSL_clear_free(ec->key, ec->keylen);
         ec->key = key;
         ec->keylen = keylen;
-
     }
 
     r = 1;
 
- err:
+err:
     EVP_CIPHER_free(kekcipher);
     EVP_CIPHER_CTX_free(kekctx);
 
@@ -421,5 +418,4 @@ int ossl_cms_RecipientInfo_pwri_crypt(const CMS_ContentInfo *cms,
     X509_ALGOR_free(kekalg);
 
     return r;
-
 }
diff --git a/crypto/cms/cms_rsa.c b/crypto/cms/cms_rsa.c
index f132df5c8a0f9..6b65842cc14ec 100644
--- a/crypto/cms/cms_rsa.c
+++ b/crypto/cms/cms_rsa.c
@@ -21,7 +21,7 @@ static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg)
     RSA_OAEP_PARAMS *oaep;
 
     oaep = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(RSA_OAEP_PARAMS),
-                                     alg->parameter);
+        alg->parameter);
 
     if (oaep == NULL)
         return NULL;
@@ -99,14 +99,14 @@ static int rsa_cms_decrypt(CMS_RecipientInfo *ri)
     if (EVP_PKEY_CTX_set_rsa_mgf1_md(pkctx, mgf1md) <= 0)
         goto err;
     if (label != NULL
-            && EVP_PKEY_CTX_set0_rsa_oaep_label(pkctx, label, labellen) <= 0) {
+        && EVP_PKEY_CTX_set0_rsa_oaep_label(pkctx, label, labellen) <= 0) {
         OPENSSL_free(label);
         goto err;
     }
     /* Carry on */
     rv = 1;
 
- err:
+err:
     RSA_OAEP_PARAMS_free(oaep);
     return rv;
 }
@@ -130,7 +130,7 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri)
     }
     if (pad_mode == RSA_PKCS1_PADDING)
         return X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaEncryption),
-                               V_ASN1_NULL, NULL);
+            V_ASN1_NULL, NULL);
 
     /* Not supported */
     if (pad_mode != RSA_PKCS1_OAEP_PADDING)
@@ -158,7 +158,7 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri)
             goto err;
 
         oaep->pSourceFunc = ossl_X509_ALGOR_from_nid(NID_pSpecified,
-                                                     V_ASN1_OCTET_STRING, los);
+            V_ASN1_OCTET_STRING, los);
         if (oaep->pSourceFunc == NULL)
             goto err;
 
@@ -171,7 +171,7 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri)
         goto err;
     os = NULL;
     rv = 1;
- err:
+err:
     RSA_OAEP_PARAMS_free(oaep);
     ASN1_STRING_free(os);
     ASN1_OCTET_STRING_free(los);
@@ -209,7 +209,7 @@ static int rsa_cms_sign(CMS_SignerInfo *si)
     }
     if (pad_mode == RSA_PKCS1_PADDING)
         return X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaEncryption),
-                               V_ASN1_NULL, NULL);
+            V_ASN1_NULL, NULL);
 
     /* We don't support it */
     if (pad_mode != RSA_PKCS1_PSS_PADDING)
diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c
index 9d5b8607de0e2..eb9859d7122a5 100644
--- a/crypto/cms/cms_sd.c
+++ b/crypto/cms/cms_sd.c
@@ -42,8 +42,7 @@ static CMS_SignedData *cms_signed_data_init(CMS_ContentInfo *cms)
             return NULL;
         }
         cms->d.signedData->version = 1;
-        cms->d.signedData->encapContentInfo->eContentType =
-            OBJ_nid2obj(NID_pkcs7_data);
+        cms->d.signedData->encapContentInfo->eContentType = OBJ_nid2obj(NID_pkcs7_data);
         cms->d.signedData->encapContentInfo->partial = 1;
         ASN1_OBJECT_free(cms->contentType);
         cms->contentType = OBJ_nid2obj(NID_pkcs7_signed);
@@ -109,7 +108,6 @@ static void cms_sd_set_version(CMS_SignedData *sd)
 
     if (sd->version < 1)
         sd->version = 1;
-
 }
 
 /*
@@ -130,7 +128,8 @@ static int cms_set_si_contentType_attr(CMS_ContentInfo *cms, CMS_SignerInfo *si)
 
     /* Add the contentType attribute */
     return CMS_signed_add1_attr_by_NID(si, NID_pkcs9_contentType,
-                                       V_ASN1_OBJECT, ctype, -1) > 0;
+               V_ASN1_OBJECT, ctype, -1)
+        > 0;
 }
 
 /* Copy an existing messageDigest value */
@@ -150,20 +149,19 @@ static int cms_copy_messageDigest(CMS_ContentInfo *cms, CMS_SignerInfo *si)
         if (CMS_signed_get_attr_count(sitmp) < 0)
             continue;
         if (OBJ_cmp(si->digestAlgorithm->algorithm,
-                    sitmp->digestAlgorithm->algorithm))
+                sitmp->digestAlgorithm->algorithm))
             continue;
         messageDigest = CMS_signed_get0_data_by_OBJ(sitmp,
-                                                    OBJ_nid2obj
-                                                    (NID_pkcs9_messageDigest),
-                                                    -3, V_ASN1_OCTET_STRING);
+            OBJ_nid2obj(NID_pkcs9_messageDigest),
+            -3, V_ASN1_OCTET_STRING);
         if (!messageDigest) {
             ERR_raise(ERR_LIB_CMS, CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE);
             return 0;
         }
 
         if (CMS_signed_add1_attr_by_NID(si, NID_pkcs9_messageDigest,
-                                        V_ASN1_OCTET_STRING,
-                                        messageDigest, -1))
+                V_ASN1_OCTET_STRING,
+                messageDigest, -1))
             return 1;
         else
             return 0;
@@ -173,7 +171,7 @@ static int cms_copy_messageDigest(CMS_ContentInfo *cms, CMS_SignerInfo *si)
 }
 
 int ossl_cms_set1_SignerIdentifier(CMS_SignerIdentifier *sid, X509 *cert,
-                                   int type, const CMS_CTX *ctx)
+    int type, const CMS_CTX *ctx)
 {
     switch (type) {
     case CMS_SIGNERINFO_ISSUER_SERIAL:
@@ -197,9 +195,9 @@ int ossl_cms_set1_SignerIdentifier(CMS_SignerIdentifier *sid, X509 *cert,
 }
 
 int ossl_cms_SignerIdentifier_get0_signer_id(CMS_SignerIdentifier *sid,
-                                             ASN1_OCTET_STRING **keyid,
-                                             X509_NAME **issuer,
-                                             ASN1_INTEGER **sno)
+    ASN1_OCTET_STRING **keyid,
+    X509_NAME **issuer,
+    ASN1_INTEGER **sno)
 {
     if (sid->type == CMS_SIGNERINFO_ISSUER_SERIAL) {
         if (issuer)
@@ -230,7 +228,9 @@ static int cms_signature_nomd(EVP_PKEY *pkey)
     char def_md[80];
 
     return EVP_PKEY_get_default_digest_name(pkey, def_md, sizeof(def_md)) == 2
-        && strcmp(def_md, "UNDEF") == 0 ? 1 : 0;
+            && strcmp(def_md, "UNDEF") == 0
+        ? 1
+        : 0;
 }
 
 /* Method to map any, incl. provider-implemented PKEY types to OIDs */
@@ -293,7 +293,7 @@ static int cms_sd_asn1_ctrl(CMS_SignerInfo *si, int cmd)
 
 /* Add SigningCertificate signed attribute to the signer info. */
 static int ossl_cms_add1_signing_cert(CMS_SignerInfo *si,
-                                      const ESS_SIGNING_CERT *sc)
+    const ESS_SIGNING_CERT *sc)
 {
     ASN1_STRING *seq = NULL;
     unsigned char *p, *pp = NULL;
@@ -311,14 +311,14 @@ static int ossl_cms_add1_signing_cert(CMS_SignerInfo *si,
     }
     OPENSSL_free(pp);
     ret = CMS_signed_add1_attr_by_NID(si, NID_id_smime_aa_signingCertificate,
-                                      V_ASN1_SEQUENCE, seq, -1);
+        V_ASN1_SEQUENCE, seq, -1);
     ASN1_STRING_free(seq);
     return ret;
 }
 
 /* Add SigningCertificateV2 signed attribute to the signer info. */
 static int ossl_cms_add1_signing_cert_v2(CMS_SignerInfo *si,
-                                         const ESS_SIGNING_CERT_V2 *sc)
+    const ESS_SIGNING_CERT_V2 *sc)
 {
     ASN1_STRING *seq = NULL;
     unsigned char *p, *pp = NULL;
@@ -336,14 +336,14 @@ static int ossl_cms_add1_signing_cert_v2(CMS_SignerInfo *si,
     }
     OPENSSL_free(pp);
     ret = CMS_signed_add1_attr_by_NID(si, NID_id_smime_aa_signingCertificateV2,
-                                      V_ASN1_SEQUENCE, seq, -1);
+        V_ASN1_SEQUENCE, seq, -1);
     ASN1_STRING_free(seq);
     return ret;
 }
 
 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)
 {
     CMS_SignedData *sd;
     CMS_SignerInfo *si = NULL;
@@ -403,13 +403,13 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
 
         if (EVP_PKEY_get_default_digest_nid(pk, &def_nid) <= 0) {
             ERR_raise_data(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST,
-                           "pkey nid=%d", EVP_PKEY_get_id(pk));
+                "pkey nid=%d", EVP_PKEY_get_id(pk));
             goto err;
         }
         md = EVP_get_digestbynid(def_nid);
         if (md == NULL) {
             ERR_raise_data(ERR_LIB_CMS, CMS_R_NO_DEFAULT_DIGEST,
-                           "default md nid=%d", def_nid);
+                "default md nid=%d", def_nid);
             goto err;
         }
     }
@@ -443,7 +443,7 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
 
     if (!(flags & CMS_KEY_PARAM) && !cms_sd_asn1_ctrl(si, 0)) {
         ERR_raise_data(ERR_LIB_CMS, CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM,
-                       "pkey nid=%d", EVP_PKEY_get_id(pk));
+            "pkey nid=%d", EVP_PKEY_get_id(pk));
         goto err;
     }
     if (!(flags & CMS_NOATTR)) {
@@ -486,13 +486,15 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
 
             if (md == NULL || EVP_MD_is_a(md, SN_sha1)) {
                 if ((sc = OSSL_ESS_signing_cert_new_init(signer,
-                                                         NULL, 1)) == NULL)
+                         NULL, 1))
+                    == NULL)
                     goto err;
                 add_sc = ossl_cms_add1_signing_cert(si, sc);
                 ESS_SIGNING_CERT_free(sc);
             } else {
                 if ((sc2 = OSSL_ESS_signing_cert_v2_new_init(md, signer,
-                                                             NULL, 1)) == NULL)
+                         NULL, 1))
+                    == NULL)
                     goto err;
                 add_sc = ossl_cms_add1_signing_cert_v2(si, sc2);
                 ESS_SIGNING_CERT_V2_free(sc2);
@@ -505,8 +507,7 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
                 goto err;
             if (!cms_set_si_contentType_attr(cms, si))
                 goto err;
-            if (!(flags & (CMS_PARTIAL | CMS_KEY_PARAM)) &&
-                !CMS_SignerInfo_sign(si))
+            if (!(flags & (CMS_PARTIAL | CMS_KEY_PARAM)) && !CMS_SignerInfo_sign(si))
                 goto err;
         }
     }
@@ -522,8 +523,8 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
     if (flags & CMS_KEY_PARAM) {
         if (flags & CMS_NOATTR) {
             si->pctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(ctx),
-                                                  si->pkey,
-                                                  ossl_cms_ctx_get0_propq(ctx));
+                si->pkey,
+                ossl_cms_ctx_get0_propq(ctx));
             if (si->pctx == NULL)
                 goto err;
             if (EVP_PKEY_sign_init(si->pctx) <= 0)
@@ -531,14 +532,14 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
             if (EVP_PKEY_CTX_set_signature_md(si->pctx, md) <= 0)
                 goto err;
         } else if (EVP_DigestSignInit_ex(si->mctx, &si->pctx,
-                                         EVP_MD_get0_name(md),
-                                         ossl_cms_ctx_get0_libctx(ctx),
-                                         ossl_cms_ctx_get0_propq(ctx),
-                                         pk, NULL) <= 0) {
+                       EVP_MD_get0_name(md),
+                       ossl_cms_ctx_get0_libctx(ctx),
+                       ossl_cms_ctx_get0_propq(ctx),
+                       pk, NULL)
+            <= 0) {
             si->pctx = NULL;
             goto err;
-        }
-        else {
+        } else {
             EVP_MD_CTX_set_flags(si->mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);
         }
     }
@@ -552,10 +553,9 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
 
     return si;
 
- err:
+err:
     M_ASN1_free_of(si, CMS_SignerInfo);
     return NULL;
-
 }
 
 void ossl_cms_SignerInfos_set_cmsctx(CMS_ContentInfo *cms)
@@ -592,18 +592,18 @@ static int cms_add1_signingTime(CMS_SignerInfo *si, ASN1_TIME *t)
     }
 
     if (CMS_signed_add1_attr_by_NID(si, NID_pkcs9_signingTime,
-                                    tt->type, tt, -1) <= 0) {
+            tt->type, tt, -1)
+        <= 0) {
         ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
         goto err;
     }
 
     r = 1;
- err:
+err:
     if (t == NULL)
         ASN1_TIME_free(tt);
 
     return r;
-
 }
 
 EVP_PKEY_CTX *CMS_SignerInfo_get0_pkey_ctx(CMS_SignerInfo *si)
@@ -635,7 +635,7 @@ STACK_OF(X509) *CMS_get0_signers(CMS_ContentInfo *cms)
         si = sk_CMS_SignerInfo_value(sinfos, i);
         if (si->signer != NULL) {
             if (!ossl_x509_add_cert_new(&signers, si->signer,
-                                        X509_ADD_FLAG_DEFAULT)) {
+                    X509_ADD_FLAG_DEFAULT)) {
                 sk_X509_free(signers);
                 return NULL;
             }
@@ -657,8 +657,8 @@ 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)
 {
     return ossl_cms_SignerIdentifier_get0_signer_id(si->sid, keyid, issuer, sno);
 }
@@ -669,7 +669,7 @@ int CMS_SignerInfo_cert_cmp(CMS_SignerInfo *si, X509 *cert)
 }
 
 int CMS_set1_signers_certs(CMS_ContentInfo *cms, STACK_OF(X509) *scerts,
-                           unsigned int flags)
+    unsigned int flags)
 {
     CMS_SignedData *sd;
     CMS_SignerInfo *si;
@@ -716,8 +716,8 @@ int CMS_set1_signers_certs(CMS_ContentInfo *cms, STACK_OF(X509) *scerts,
 }
 
 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)
 {
     if (pk != NULL)
         *pk = si->pkey;
@@ -735,9 +735,9 @@ ASN1_OCTET_STRING *CMS_SignerInfo_get0_signature(CMS_SignerInfo *si)
 }
 
 static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
-                                       CMS_SignerInfo *si, BIO *chain,
-                                       const unsigned char *md,
-                                       unsigned int mdlen)
+    CMS_SignerInfo *si, BIO *chain,
+    const unsigned char *md,
+    unsigned int mdlen)
 {
     EVP_MD_CTX *mctx = EVP_MD_CTX_new();
     int r = 0;
@@ -772,7 +772,7 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
             md = computed_md;
         }
         if (!CMS_signed_add1_attr_by_NID(si, NID_pkcs9_messageDigest,
-                                         V_ASN1_OCTET_STRING, md, mdlen))
+                V_ASN1_OCTET_STRING, md, mdlen))
             goto err;
         /* Copy content type across */
         if (!cms_set_si_contentType_attr(cms, si))
@@ -812,8 +812,8 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
         if (siglen == 0 || (sig = OPENSSL_malloc(siglen)) == NULL)
             goto err;
         if (!EVP_SignFinal_ex(mctx, sig, &siglen, si->pkey,
-                              ossl_cms_ctx_get0_libctx(ctx),
-                              ossl_cms_ctx_get0_propq(ctx))) {
+                ossl_cms_ctx_get0_libctx(ctx),
+                ossl_cms_ctx_get0_propq(ctx))) {
             ERR_raise(ERR_LIB_CMS, CMS_R_SIGNFINAL_ERROR);
             OPENSSL_free(sig);
             goto err;
@@ -823,16 +823,15 @@ static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
 
     r = 1;
 
- err:
+err:
     EVP_MD_CTX_free(mctx);
     EVP_PKEY_CTX_free(pctx);
     return r;
-
 }
 
 int ossl_cms_SignedData_final(CMS_ContentInfo *cms, BIO *chain,
-                              const unsigned char *precomp_md,
-                              unsigned int precomp_mdlen)
+    const unsigned char *precomp_md,
+    unsigned int precomp_mdlen)
 {
     STACK_OF(CMS_SignerInfo) *sinfos;
     CMS_SignerInfo *si;
@@ -842,7 +841,7 @@ int ossl_cms_SignedData_final(CMS_ContentInfo *cms, BIO *chain,
     for (i = 0; i < sk_CMS_SignerInfo_num(sinfos); i++) {
         si = sk_CMS_SignerInfo_value(sinfos, i);
         if (!cms_SignerInfo_content_sign(cms, si, chain,
-                                         precomp_md, precomp_mdlen))
+                precomp_md, precomp_mdlen))
             return 0;
     }
     cms->d.signedData->encapContentInfo->partial = 0;
@@ -860,7 +859,8 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
     char md_name_buf[OSSL_MAX_NAME_SIZE], *md_name;
 
     if (OBJ_obj2txt(md_name_buf, sizeof(md_name_buf),
-                    si->digestAlgorithm->algorithm, 0) <= 0)
+            si->digestAlgorithm->algorithm, 0)
+        <= 0)
         return 0;
     md_name = cms_signature_nomd(si->pkey) ? NULL : md_name_buf;
 
@@ -878,9 +878,10 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
     } else {
         EVP_MD_CTX_reset(mctx);
         if (EVP_DigestSignInit_ex(mctx, &pctx, md_name,
-                                  ossl_cms_ctx_get0_libctx(ctx),
-                                  ossl_cms_ctx_get0_propq(ctx), si->pkey,
-                                  NULL) <= 0)
+                ossl_cms_ctx_get0_libctx(ctx),
+                ossl_cms_ctx_get0_propq(ctx), si->pkey,
+                NULL)
+            <= 0)
             goto err;
         EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);
         si->pctx = pctx;
@@ -888,13 +889,14 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
 
     if (md_name == NULL) {
         if (ASN1_item_sign_ctx(ASN1_ITEM_rptr(CMS_Attributes_Sign), NULL,
-                               NULL, si->signature, si->signedAttrs, mctx) <= 0)
+                NULL, si->signature, si->signedAttrs, mctx)
+            <= 0)
             goto err;
         return 1;
     }
 
     alen = ASN1_item_i2d((ASN1_VALUE *)si->signedAttrs, &abuf,
-                         ASN1_ITEM_rptr(CMS_Attributes_Sign));
+        ASN1_ITEM_rptr(CMS_Attributes_Sign));
     if (alen < 0 || abuf == NULL)
         goto err;
     if (EVP_DigestSignUpdate(mctx, abuf, alen) <= 0)
@@ -914,7 +916,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
 
     return 1;
 
- err:
+err:
     OPENSSL_free(abuf);
     EVP_MD_CTX_reset(mctx);
     return 0;
@@ -942,9 +944,9 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
 
     if (cms_signature_nomd(si->pkey)) {
         r = ASN1_item_verify_ex(ASN1_ITEM_rptr(CMS_Attributes_Sign),
-                                si->signatureAlgorithm, si->signature,
-                                si->signedAttrs, NULL, si->pkey,
-                                libctx, propq);
+            si->signatureAlgorithm, si->signature,
+            si->signedAttrs, NULL, si->pkey,
+            libctx, propq);
         if (r <= 0)
             ERR_raise(ERR_LIB_CMS, CMS_R_VERIFICATION_FAILURE);
         return r;
@@ -976,7 +978,8 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
         si->pctx = NULL;
     }
     if (EVP_DigestVerifyInit_ex(mctx, &si->pctx, EVP_MD_get0_name(md), libctx,
-                                propq, si->pkey, NULL) <= 0) {
+            propq, si->pkey, NULL)
+        <= 0) {
         si->pctx = NULL;
         goto err;
     }
@@ -986,7 +989,7 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
         goto err;
 
     alen = ASN1_item_i2d((ASN1_VALUE *)si->signedAttrs, &abuf,
-                         ASN1_ITEM_rptr(CMS_Attributes_Verify));
+        ASN1_ITEM_rptr(CMS_Attributes_Verify));
     if (abuf == NULL || alen < 0)
         goto err;
     r = EVP_DigestVerifyUpdate(mctx, abuf, alen);
@@ -996,10 +999,10 @@ int CMS_SignerInfo_verify(CMS_SignerInfo *si)
         goto err;
     }
     r = EVP_DigestVerifyFinal(mctx,
-                              si->signature->data, si->signature->length);
+        si->signature->data, si->signature->length);
     if (r <= 0)
         ERR_raise(ERR_LIB_CMS, CMS_R_VERIFICATION_FAILURE);
- err:
+err:
     EVP_MD_free(fetched_md);
     EVP_MD_CTX_reset(mctx);
     return r;
@@ -1023,7 +1026,7 @@ BIO *ossl_cms_SignedData_init_bio(CMS_ContentInfo *cms)
 
         digestAlgorithm = sk_X509_ALGOR_value(sd->digestAlgorithms, i);
         mdbio = ossl_cms_DigestAlgorithm_init_bio(digestAlgorithm,
-                                                  ossl_cms_get0_cmsctx(cms));
+            ossl_cms_get0_cmsctx(cms));
         if (mdbio == NULL)
             goto err;
         if (chain != NULL)
@@ -1032,7 +1035,7 @@ BIO *ossl_cms_SignedData_init_bio(CMS_ContentInfo *cms)
             chain = mdbio;
     }
     return chain;
- err:
+err:
     BIO_free_all(chain);
     return NULL;
 }
@@ -1053,8 +1056,8 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
     /* If we have any signed attributes look for messageDigest value */
     if (CMS_signed_get_attr_count(si) >= 0) {
         os = CMS_signed_get0_data_by_OBJ(si,
-                                         OBJ_nid2obj(NID_pkcs9_messageDigest),
-                                         -3, V_ASN1_OCTET_STRING);
+            OBJ_nid2obj(NID_pkcs9_messageDigest),
+            -3, V_ASN1_OCTET_STRING);
         if (os == NULL) {
             ERR_raise(ERR_LIB_CMS, CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE);
             goto err;
@@ -1087,8 +1090,8 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
         const CMS_CTX *ctx = si->cms_ctx;
 
         pkctx = EVP_PKEY_CTX_new_from_pkey(ossl_cms_ctx_get0_libctx(ctx),
-                                           si->pkey,
-                                           ossl_cms_ctx_get0_propq(ctx));
+            si->pkey,
+            ossl_cms_ctx_get0_propq(ctx));
         if (pkctx == NULL)
             goto err;
         if (EVP_PKEY_verify_init(pkctx) <= 0)
@@ -1102,25 +1105,24 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
         }
         si->pctx = NULL;
         r = EVP_PKEY_verify(pkctx, si->signature->data,
-                            si->signature->length, mval, mlen);
+            si->signature->length, mval, mlen);
         if (r <= 0) {
             ERR_raise(ERR_LIB_CMS, CMS_R_VERIFICATION_FAILURE);
             r = 0;
         }
     }
 
- err:
+err:
     EVP_PKEY_CTX_free(pkctx);
     EVP_MD_CTX_free(mctx);
     return r;
-
 }
 
 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)
 {
     CMS_ContentInfo *ci;
     BIO *bio = NULL;
@@ -1146,7 +1148,7 @@ BIO *CMS_SignedData_verify(CMS_SignedData *sd, BIO *detached_data,
             goto end;
     res = CMS_verify(ci, scerts, store, detached_data, bio, flags);
 
- end:
+end:
     if (ci != NULL)
         ci->d.signedData = NULL; /* do not indirectly free |sd| */
     CMS_ContentInfo_free(ci);
@@ -1166,13 +1168,13 @@ int CMS_add_smimecap(CMS_SignerInfo *si, STACK_OF(X509_ALGOR) *algs)
     if (smderlen <= 0)
         return 0;
     r = CMS_signed_add1_attr_by_NID(si, NID_SMIMECapabilities,
-                                    V_ASN1_SEQUENCE, smder, smderlen);
+        V_ASN1_SEQUENCE, smder, smderlen);
     OPENSSL_free(smder);
     return r;
 }
 
 int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs,
-                            int algnid, int keysize)
+    int algnid, int keysize)
 {
     X509_ALGOR *alg;
     ASN1_INTEGER *key = NULL;
@@ -1184,8 +1186,7 @@ int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs,
             return 0;
         }
     }
-    alg = ossl_X509_ALGOR_from_nid(algnid, key != NULL ? V_ASN1_INTEGER :
-                                   V_ASN1_UNDEF, key);
+    alg = ossl_X509_ALGOR_from_nid(algnid, key != NULL ? V_ASN1_INTEGER : V_ASN1_UNDEF, key);
     if (alg == NULL) {
         ASN1_INTEGER_free(key);
         return 0;
diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index 3f3d93fa00958..920464b3deec4 100644
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -69,11 +69,10 @@ static int cms_copy_content(BIO *out, BIO *in, unsigned int flags)
     }
 
     r = 1;
- err:
+err:
     if (tmpout != out)
         BIO_free(tmpout);
     return r;
-
 }
 
 static int check_content(CMS_ContentInfo *cms)
@@ -120,7 +119,7 @@ int CMS_data(CMS_ContentInfo *cms, BIO *out, 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)
 {
     CMS_ContentInfo *cms = ossl_cms_Data_create(libctx, propq);
 
@@ -140,7 +139,7 @@ CMS_ContentInfo *CMS_data_create(BIO *in, unsigned int flags)
 }
 
 int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-                      unsigned int flags)
+    unsigned int flags)
 {
     BIO *cont;
     int r;
@@ -165,8 +164,8 @@ int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
 }
 
 CMS_ContentInfo *CMS_digest_create_ex(BIO *in, const EVP_MD *md,
-                                      unsigned int flags, OSSL_LIB_CTX *ctx,
-                                      const char *propq)
+    unsigned int flags, OSSL_LIB_CTX *ctx,
+    const char *propq)
 {
     CMS_ContentInfo *cms;
 
@@ -191,14 +190,14 @@ CMS_ContentInfo *CMS_digest_create_ex(BIO *in, const EVP_MD *md,
 }
 
 CMS_ContentInfo *CMS_digest_create(BIO *in, const EVP_MD *md,
-                                   unsigned int flags)
+    unsigned int flags)
 {
     return CMS_digest_create_ex(in, md, flags, NULL, NULL);
 }
 
 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)
 {
     BIO *cont;
     int r;
@@ -222,10 +221,10 @@ int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms,
 }
 
 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)
 {
     CMS_ContentInfo *cms;
 
@@ -246,32 +245,32 @@ CMS_ContentInfo *CMS_EncryptedData_encrypt_ex(BIO *in, const EVP_CIPHER *cipher,
         || CMS_final(cms, in, NULL, flags))
         return cms;
 
- err:
+err:
     CMS_ContentInfo_free(cms);
     return NULL;
 }
 
 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)
 {
     return CMS_EncryptedData_encrypt_ex(in, cipher, key, keylen, flags, NULL,
-                                        NULL);
+        NULL);
 }
 
 static int cms_signerinfo_verify_cert(CMS_SignerInfo *si,
-                                      X509_STORE *store,
-                                      STACK_OF(X509) *untrusted,
-                                      STACK_OF(X509_CRL) *crls,
-                                      STACK_OF(X509) **chain,
-                                      const CMS_CTX *cms_ctx)
+    X509_STORE *store,
+    STACK_OF(X509) *untrusted,
+    STACK_OF(X509_CRL) *crls,
+    STACK_OF(X509) **chain,
+    const CMS_CTX *cms_ctx)
 {
     X509_STORE_CTX *ctx;
     X509 *signer;
     int i, j, r = 0;
 
     ctx = X509_STORE_CTX_new_ex(ossl_cms_ctx_get0_libctx(cms_ctx),
-                                ossl_cms_ctx_get0_propq(cms_ctx));
+        ossl_cms_ctx_get0_propq(cms_ctx));
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_CMS, ERR_R_X509_LIB);
         goto err;
@@ -289,7 +288,7 @@ static int cms_signerinfo_verify_cert(CMS_SignerInfo *si,
     if (i <= 0) {
         j = X509_STORE_CTX_get_error(ctx);
         ERR_raise_data(ERR_LIB_CMS, CMS_R_CERTIFICATE_VERIFY_ERROR,
-                       "Verify error: %s", X509_verify_cert_error_string(j));
+            "Verify error: %s", X509_verify_cert_error_string(j));
         goto err;
     }
     r = 1;
@@ -297,15 +296,14 @@ static int cms_signerinfo_verify_cert(CMS_SignerInfo *si,
     /* also send back the trust chain when required */
     if (chain != NULL)
         *chain = X509_STORE_CTX_get1_chain(ctx);
- err:
+err:
     X509_STORE_CTX_free(ctx);
     return r;
-
 }
 
 /* This strongly overlaps with PKCS7_verify() */
 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)
 {
     CMS_SignerInfo *si;
     STACK_OF(CMS_SignerInfo) *sinfos;
@@ -365,8 +363,7 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
             goto err;
         if (sk_X509_num(certs) > 0
             && !ossl_x509_add_certs_new(&untrusted, certs,
-                                        X509_ADD_FLAG_UP_REF |
-                                        X509_ADD_FLAG_NO_DUP))
+                X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
             goto err;
 
         if ((flags & CMS_NOCRL) == 0
@@ -376,8 +373,8 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
             si = sk_CMS_SignerInfo_value(sinfos, i);
 
             if (!cms_signerinfo_verify_cert(si, store, untrusted, crls,
-                                            si_chains ? &si_chains[i] : NULL,
-                                            ctx))
+                    si_chains ? &si_chains[i] : NULL,
+                    ctx))
                 goto err;
         }
     }
@@ -457,7 +454,6 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
 
         if (!cms_copy_content(out, cmsbio, flags))
             goto err;
-
     }
     if (!(flags & CMS_NO_CONTENT_VERIFY)) {
         for (i = 0; i < sk_CMS_SignerInfo_num(sinfos); i++) {
@@ -470,7 +466,7 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
     }
 
     ret = 1;
- err:
+err:
     if (!(flags & SMIME_BINARY) && dcont) {
         do_free_upto(cmsbio, tmpout);
         if (tmpin != dcont)
@@ -485,7 +481,7 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
     if (out != tmpout)
         BIO_free_all(tmpout);
 
- err2:
+err2:
     if (si_chains != NULL) {
         for (i = 0; i < scount; ++i)
             OSSL_STACK_OF_X509_free(si_chains[i]);
@@ -498,8 +494,8 @@ int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
 }
 
 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)
 {
     int r;
 
@@ -511,9 +507,9 @@ int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,
 }
 
 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;
     int i;
@@ -525,7 +521,7 @@ CMS_ContentInfo *CMS_sign_ex(X509 *signcert, EVP_PKEY *pkey,
     }
     if (flags & CMS_ASCIICRLF
         && !CMS_set1_eContentType(cms,
-                                  OBJ_nid2obj(NID_id_ct_asciiTextWithCRLF))) {
+            OBJ_nid2obj(NID_id_ct_asciiTextWithCRLF))) {
         ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
         goto err;
     }
@@ -553,20 +549,20 @@ CMS_ContentInfo *CMS_sign_ex(X509 *signcert, EVP_PKEY *pkey,
     else
         goto err;
 
- err:
+err:
     CMS_ContentInfo_free(cms);
     return NULL;
 }
 
 CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
-                          BIO *data, unsigned int flags)
+    BIO *data, unsigned int flags)
 {
     return CMS_sign_ex(signcert, pkey, certs, data, flags, NULL, NULL);
 }
 
 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)
 {
     CMS_SignerInfo *rct_si;
     CMS_ContentInfo *cms = NULL;
@@ -586,8 +582,8 @@ CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
     /* Initialize signed data */
 
     cms = CMS_sign_ex(NULL, NULL, certs, NULL, flags,
-                      ossl_cms_ctx_get0_libctx(ctx),
-                      ossl_cms_ctx_get0_propq(ctx));
+        ossl_cms_ctx_get0_libctx(ctx),
+        ossl_cms_ctx_get0_propq(ctx));
     if (cms == NULL)
         goto err;
 
@@ -627,28 +623,26 @@ CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
 
     r = 1;
 
- err:
+err:
     BIO_free(rct_cont);
     if (r)
         return cms;
     CMS_ContentInfo_free(cms);
     ASN1_OCTET_STRING_free(os);
     return NULL;
-
 }
 
 CMS_ContentInfo *CMS_encrypt_ex(STACK_OF(X509) *certs, BIO *data,
-                                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)
 {
     CMS_ContentInfo *cms;
     int i;
     X509 *recip;
 
-
     cms = (EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)
-          ? CMS_AuthEnvelopedData_create_ex(cipher, libctx, propq)
-          : CMS_EnvelopedData_create_ex(cipher, libctx, propq);
+        ? CMS_AuthEnvelopedData_create_ex(cipher, libctx, propq)
+        : CMS_EnvelopedData_create_ex(cipher, libctx, propq);
     if (cms == NULL) {
         ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
         goto err;
@@ -670,20 +664,20 @@ CMS_ContentInfo *CMS_encrypt_ex(STACK_OF(X509) *certs, BIO *data,
     else
         ERR_raise(ERR_LIB_CMS, ERR_R_CMS_LIB);
 
- err:
+err:
     CMS_ContentInfo_free(cms);
     return NULL;
 }
 
 CMS_ContentInfo *CMS_encrypt(STACK_OF(X509) *certs, BIO *data,
-                             const EVP_CIPHER *cipher, unsigned int flags)
+    const EVP_CIPHER *cipher, unsigned int flags)
 {
     return CMS_encrypt_ex(certs, data, cipher, flags, NULL, NULL);
 }
 
 static int cms_kari_set1_pkey_and_peer(CMS_ContentInfo *cms,
-                                       CMS_RecipientInfo *ri,
-                                       EVP_PKEY *pk, X509 *cert, X509 *peer)
+    CMS_RecipientInfo *ri,
+    EVP_PKEY *pk, X509 *cert, X509 *peer)
 {
     int i;
     STACK_OF(CMS_RecipientEncryptedKey) *reks;
@@ -708,11 +702,11 @@ static int cms_kari_set1_pkey_and_peer(CMS_ContentInfo *cms,
 
 int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert)
 {
-     return CMS_decrypt_set1_pkey_and_peer(cms, pk, cert, NULL);
+    return CMS_decrypt_set1_pkey_and_peer(cms, pk, cert, NULL);
 }
 
 int CMS_decrypt_set1_pkey_and_peer(CMS_ContentInfo *cms, EVP_PKEY *pk,
-                                   X509 *cert, X509 *peer)
+    X509 *cert, X509 *peer)
 {
     STACK_OF(CMS_RecipientInfo) *ris = CMS_get0_RecipientInfos(cms);
     CMS_RecipientInfo *ri;
@@ -732,8 +726,8 @@ int CMS_decrypt_set1_pkey_and_peer(CMS_ContentInfo *cms, EVP_PKEY *pk,
 
     cms_pkey_ri_type = ossl_cms_pkey_get_ri_type(pk);
     if (cms_pkey_ri_type == CMS_RECIPINFO_NONE) {
-         ERR_raise(ERR_LIB_CMS, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
-         return 0;
+        ERR_raise(ERR_LIB_CMS, CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
+        return 0;
     }
 
     for (i = 0; i < sk_CMS_RecipientInfo_num(ris); i++) {
@@ -793,12 +787,11 @@ int CMS_decrypt_set1_pkey_and_peer(CMS_ContentInfo *cms, EVP_PKEY *pk,
     if (!match_ri)
         ERR_raise(ERR_LIB_CMS, CMS_R_NO_MATCHING_RECIPIENT);
     return 0;
-
 }
 
 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)
 {
     STACK_OF(CMS_RecipientInfo) *ris;
     CMS_RecipientInfo *ri;
@@ -812,7 +805,7 @@ int CMS_decrypt_set1_key(CMS_ContentInfo *cms,
 
         /* If we have an id, try matching RecipientInfo, else try them all */
         if (id == NULL
-                || (CMS_RecipientInfo_kekri_id_cmp(ri, id, idlen) == 0)) {
+            || (CMS_RecipientInfo_kekri_id_cmp(ri, id, idlen) == 0)) {
             match_ri = 1;
             CMS_RecipientInfo_set0_key(ri, key, keylen);
             r = CMS_RecipientInfo_decrypt(cms, ri);
@@ -830,11 +823,10 @@ int CMS_decrypt_set1_key(CMS_ContentInfo *cms,
     if (!match_ri)
         ERR_raise(ERR_LIB_CMS, CMS_R_NO_MATCHING_RECIPIENT);
     return 0;
-
 }
 
 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) *ris = CMS_get0_RecipientInfos(cms);
     CMS_RecipientInfo *ri;
@@ -865,11 +857,10 @@ int CMS_decrypt_set1_password(CMS_ContentInfo *cms,
     if (!match_ri)
         ERR_raise(ERR_LIB_CMS, CMS_R_NO_MATCHING_RECIPIENT);
     return 0;
-
 }
 
 int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert,
-                BIO *dcont, BIO *out, unsigned int flags)
+    BIO *dcont, BIO *out, unsigned int flags)
 {
     int r;
     BIO *cont;
@@ -877,7 +868,7 @@ int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert,
     int nid = OBJ_obj2nid(CMS_get0_type(cms));
 
     if (nid != NID_pkcs7_enveloped
-            && nid != NID_id_smime_ct_authEnvelopedData) {
+        && nid != NID_id_smime_ct_authEnvelopedData) {
         ERR_raise(ERR_LIB_CMS, CMS_R_TYPE_NOT_ENVELOPED_DATA);
         return 0;
     }
@@ -925,12 +916,11 @@ int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags)
     do_free_upto(cmsbio, dcont);
 
     return ret;
-
 }
 
 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)
 {
     BIO *cmsbio;
     int ret = 0;
@@ -956,7 +946,7 @@ int CMS_final_digest(CMS_ContentInfo *cms,
 #ifndef OPENSSL_NO_ZLIB
 
 int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-                   unsigned int flags)
+    unsigned int flags)
 {
     BIO *cont;
     int r;
@@ -1000,7 +990,7 @@ CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags)
 #else
 
 int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-                   unsigned int flags)
+    unsigned int flags)
 {
     ERR_raise(ERR_LIB_CMS, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
     return 0;
diff --git a/crypto/comp/c_brotli.c b/crypto/comp/c_brotli.c
index 07e1e76471c5d..74bbc74dc77e6 100644
--- a/crypto/comp/c_brotli.c
+++ b/crypto/comp/c_brotli.c
@@ -23,11 +23,11 @@
 COMP_METHOD *COMP_brotli(void);
 
 #ifdef OPENSSL_NO_BROTLI
-# undef BROTLI_SHARED
+#undef BROTLI_SHARED
 #else
 
-# include <brotli/decode.h>
-# include <brotli/encode.h>
+#include <brotli/decode.h>
+#include <brotli/encode.h>
 
 /* memory allocations functions for brotli initialisation */
 static void *brotli_alloc(void *opaque, size_t size)
@@ -46,12 +46,12 @@ static void brotli_free(void *opaque, void *address)
  * work.  Therefore, all BROTLI routines are loaded at run time
  * and we do not link to a .LIB file when BROTLI_SHARED is set.
  */
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-#  include <windows.h>
-# endif
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#include <windows.h>
+#endif
 
-# ifdef BROTLI_SHARED
-#  include "internal/dso.h"
+#ifdef BROTLI_SHARED
+#include "internal/dso.h"
 
 /* Function pointers */
 typedef BrotliEncoderState *(*encode_init_ft)(brotli_alloc_func, brotli_free_func, void *);
@@ -87,23 +87,22 @@ static decode_oneshot_ft p_decode_oneshot = NULL;
 static DSO *brotli_encode_dso = NULL;
 static DSO *brotli_decode_dso = NULL;
 
-#  define BrotliEncoderCreateInstance p_encode_init
-#  define BrotliEncoderCompressStream p_encode_stream
-#  define BrotliEncoderHasMoreOutput p_encode_has_more
-#  define BrotliEncoderDestroyInstance p_encode_end
-#  define BrotliEncoderCompress p_encode_oneshot
-
-#  define BrotliDecoderCreateInstance p_decode_init
-#  define BrotliDecoderDecompressStream p_decode_stream
-#  define BrotliDecoderHasMoreOutput p_decode_has_more
-#  define BrotliDecoderDestroyInstance p_decode_end
-#  define BrotliDecoderGetErrorCode p_decode_error
-#  define BrotliDecoderErrorString p_decode_error_string
-#  define BrotliDecoderIsFinished p_decode_is_finished
-#  define BrotliDecoderDecompress p_decode_oneshot
+#define BrotliEncoderCreateInstance p_encode_init
+#define BrotliEncoderCompressStream p_encode_stream
+#define BrotliEncoderHasMoreOutput p_encode_has_more
+#define BrotliEncoderDestroyInstance p_encode_end
+#define BrotliEncoderCompress p_encode_oneshot
 
-# endif /* ifdef BROTLI_SHARED */
+#define BrotliDecoderCreateInstance p_decode_init
+#define BrotliDecoderDecompressStream p_decode_stream
+#define BrotliDecoderHasMoreOutput p_decode_has_more
+#define BrotliDecoderDestroyInstance p_decode_end
+#define BrotliDecoderGetErrorCode p_decode_error
+#define BrotliDecoderErrorString p_decode_error_string
+#define BrotliDecoderIsFinished p_decode_is_finished
+#define BrotliDecoderDecompress p_decode_oneshot
 
+#endif /* ifdef BROTLI_SHARED */
 
 struct brotli_state {
     BrotliEncoderState *encoder;
@@ -127,7 +126,7 @@ static int brotli_stateful_init(COMP_CTX *ctx)
 
     ctx->data = state;
     return 1;
- err:
+err:
     BrotliDecoderDestroyInstance(state->decoder);
     BrotliEncoderDestroyInstance(state->encoder);
     OPENSSL_free(state);
@@ -147,8 +146,8 @@ static void brotli_stateful_finish(COMP_CTX *ctx)
 }
 
 static ossl_ssize_t brotli_stateful_compress_block(COMP_CTX *ctx, unsigned char *out,
-                                                   size_t olen, unsigned char *in,
-                                                   size_t ilen)
+    size_t olen, unsigned char *in,
+    size_t ilen)
 {
     BROTLI_BOOL done;
     struct brotli_state *state = ctx->data;
@@ -169,11 +168,11 @@ static ossl_ssize_t brotli_stateful_compress_block(COMP_CTX *ctx, unsigned char
      * output buffer space
      */
     done = BrotliEncoderCompressStream(state->encoder, BROTLI_OPERATION_FLUSH,
-                                       &in_avail, (const uint8_t**)&in,
-                                       &out_avail, &out, NULL);
+        &in_avail, (const uint8_t **)&in,
+        &out_avail, &out, NULL);
     if (done == BROTLI_FALSE
-            || in_avail != 0
-            || BrotliEncoderHasMoreOutput(state->encoder))
+        || in_avail != 0
+        || BrotliEncoderHasMoreOutput(state->encoder))
         return -1;
 
     if (out_avail > olen)
@@ -182,8 +181,8 @@ static ossl_ssize_t brotli_stateful_compress_block(COMP_CTX *ctx, unsigned char
 }
 
 static ossl_ssize_t brotli_stateful_expand_block(COMP_CTX *ctx, unsigned char *out,
-                                                 size_t olen, unsigned char *in,
-                                                 size_t ilen)
+    size_t olen, unsigned char *in,
+    size_t ilen)
 {
     BrotliDecoderResult result;
     struct brotli_state *state = ctx->data;
@@ -197,11 +196,11 @@ static ossl_ssize_t brotli_stateful_expand_block(COMP_CTX *ctx, unsigned char *o
         return 0;
 
     result = BrotliDecoderDecompressStream(state->decoder, &in_avail,
-                                           (const uint8_t**)&in, &out_avail,
-                                           &out, NULL);
+        (const uint8_t **)&in, &out_avail,
+        &out, NULL);
     if (result == BROTLI_DECODER_RESULT_ERROR
-            || in_avail != 0
-            || BrotliDecoderHasMoreOutput(state->decoder))
+        || in_avail != 0
+        || BrotliDecoderHasMoreOutput(state->decoder))
         return -1;
 
     if (out_avail > olen)
@@ -228,8 +227,8 @@ static void brotli_oneshot_finish(COMP_CTX *ctx)
 }
 
 static ossl_ssize_t brotli_oneshot_compress_block(COMP_CTX *ctx, unsigned char *out,
-                                                  size_t olen, unsigned char *in,
-                                                  size_t ilen)
+    size_t olen, unsigned char *in,
+    size_t ilen)
 {
     size_t out_size = olen;
     ossl_ssize_t ret;
@@ -238,8 +237,9 @@ static ossl_ssize_t brotli_oneshot_compress_block(COMP_CTX *ctx, unsigned char *
         return 0;
 
     if (BrotliEncoderCompress(BROTLI_DEFAULT_QUALITY, BROTLI_DEFAULT_WINDOW,
-                              BROTLI_DEFAULT_MODE, ilen, in,
-                              &out_size, out) == BROTLI_FALSE)
+            BROTLI_DEFAULT_MODE, ilen, in,
+            &out_size, out)
+        == BROTLI_FALSE)
         return -1;
 
     if (out_size > OSSL_SSIZE_MAX)
@@ -251,8 +251,8 @@ static ossl_ssize_t brotli_oneshot_compress_block(COMP_CTX *ctx, unsigned char *
 }
 
 static ossl_ssize_t brotli_oneshot_expand_block(COMP_CTX *ctx, unsigned char *out,
-                                                size_t olen, unsigned char *in,
-                                                size_t ilen)
+    size_t olen, unsigned char *in,
+    size_t ilen)
 {
     size_t out_size = olen;
     ossl_ssize_t ret;
@@ -283,14 +283,14 @@ static COMP_METHOD brotli_oneshot_method = {
 static CRYPTO_ONCE brotli_once = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(ossl_comp_brotli_init)
 {
-# ifdef BROTLI_SHARED
-#  if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-#   define LIBBROTLIENC "BROTLIENC"
-#   define LIBBROTLIDEC "BROTLIDEC"
-#  else
-#   define LIBBROTLIENC "brotlienc"
-#   define LIBBROTLIDEC "brotlidec"
-#  endif
+#ifdef BROTLI_SHARED
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#define LIBBROTLIENC "BROTLIENC"
+#define LIBBROTLIDEC "BROTLIDEC"
+#else
+#define LIBBROTLIENC "brotlienc"
+#define LIBBROTLIDEC "brotlidec"
+#endif
 
     brotli_encode_dso = DSO_load(NULL, LIBBROTLIENC, NULL, 0);
     if (brotli_encode_dso != NULL) {
@@ -314,14 +314,14 @@ DEFINE_RUN_ONCE_STATIC(ossl_comp_brotli_init)
     }
 
     if (p_encode_init == NULL || p_encode_stream == NULL || p_encode_has_more == NULL
-            || p_encode_end == NULL || p_encode_oneshot == NULL || p_decode_init == NULL
-            || p_decode_stream == NULL || p_decode_has_more == NULL || p_decode_end == NULL
-            || p_decode_error == NULL || p_decode_error_string == NULL || p_decode_is_finished == NULL
-            || p_decode_oneshot == NULL) {
+        || p_encode_end == NULL || p_encode_oneshot == NULL || p_decode_init == NULL
+        || p_decode_stream == NULL || p_decode_has_more == NULL || p_decode_end == NULL
+        || p_decode_error == NULL || p_decode_error_string == NULL || p_decode_is_finished == NULL
+        || p_decode_oneshot == NULL) {
         ossl_comp_brotli_cleanup();
         return 0;
     }
-# endif
+#endif
     return 1;
 }
 #endif /* ifndef BROTLI / else */
@@ -394,14 +394,14 @@ typedef struct {
         unsigned char *buf;
         size_t bufsize;
         BrotliEncoderState *state;
-        int mode;                      /* Encoder mode to use */
+        int mode; /* Encoder mode to use */
         int done;
         unsigned char *ptr;
         size_t count;
     } encode;
 } BIO_BROTLI_CTX;
 
-# define BROTLI_DEFAULT_BUFSIZE 1024
+#define BROTLI_DEFAULT_BUFSIZE 1024
 
 static int bio_brotli_new(BIO *bi);
 static int bio_brotli_free(BIO *bi);
@@ -419,8 +419,8 @@ static const BIO_METHOD bio_meth_brotli = {
     /* TODO: Convert to new style read function */
     bread_conv,
     bio_brotli_read,
-    NULL,                      /* bio_brotli_puts, */
-    NULL,                      /* bio_brotli_gets, */
+    NULL, /* bio_brotli_puts, */
+    NULL, /* bio_brotli_gets, */
     bio_brotli_ctrl,
     bio_brotli_new,
     bio_brotli_free,
@@ -443,12 +443,12 @@ static int bio_brotli_new(BIO *bi)
 {
     BIO_BROTLI_CTX *ctx;
 
-# ifdef BROTLI_SHARED
+#ifdef BROTLI_SHARED
     if (!RUN_ONCE(&brotli_once, ossl_comp_brotli_init)) {
         ERR_raise(ERR_LIB_COMP, COMP_R_BROTLI_NOT_SUPPORTED);
         return 0;
     }
-# endif
+#endif
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_COMP, ERR_R_MALLOC_FAILURE);
@@ -468,7 +468,7 @@ static int bio_brotli_new(BIO *bi)
 
     return 1;
 
- err:
+err:
     ERR_raise(ERR_LIB_COMP, ERR_R_MALLOC_FAILURE);
     BrotliDecoderDestroyInstance(ctx->decode.state);
     BrotliEncoderDestroyInstance(ctx->encode.state);
@@ -533,8 +533,8 @@ static int bio_brotli_read(BIO *b, char *out, int outl)
     for (;;) {
         /* Decompress while data available */
         while (ctx->decode.avail_in > 0 || BrotliDecoderHasMoreOutput(ctx->decode.state)) {
-            bret = BrotliDecoderDecompressStream(ctx->decode.state, &ctx->decode.avail_in, (const uint8_t**)&ctx->decode.next_in,
-                                                  &ctx->decode.avail_out, &ctx->decode.next_out, NULL);
+            bret = BrotliDecoderDecompressStream(ctx->decode.state, &ctx->decode.avail_in, (const uint8_t **)&ctx->decode.next_in,
+                &ctx->decode.avail_out, &ctx->decode.next_out, NULL);
             if (bret == BROTLI_DECODER_RESULT_ERROR) {
                 ERR_raise(ERR_LIB_COMP, COMP_R_BROTLI_DECODE_ERROR);
                 ERR_add_error_data(1, BrotliDecoderErrorString(BrotliDecoderGetErrorCode(ctx->decode.state)));
@@ -633,8 +633,8 @@ static int bio_brotli_write(BIO *b, const char *in, int inl)
         ctx->encode.next_out = ctx->encode.buf;
         ctx->encode.avail_out = ctx->encode.bufsize;
         /* Compress some more */
-        brret = BrotliEncoderCompressStream(ctx->encode.state, BROTLI_OPERATION_FLUSH, &ctx->encode.avail_in, (const uint8_t**)&ctx->encode.next_in,
-                                            &ctx->encode.avail_out, &ctx->encode.next_out, NULL);
+        brret = BrotliEncoderCompressStream(ctx->encode.state, BROTLI_OPERATION_FLUSH, &ctx->encode.avail_in, (const uint8_t **)&ctx->encode.next_in,
+            &ctx->encode.avail_out, &ctx->encode.next_out, NULL);
         if (brret != BROTLI_TRUE) {
             ERR_raise(ERR_LIB_COMP, COMP_R_BROTLI_ENCODE_ERROR);
             ERR_add_error_data(1, "brotli encoder error");
@@ -683,9 +683,9 @@ static int bio_brotli_flush(BIO *b)
         ctx->encode.avail_out = ctx->encode.bufsize;
         /* Compress some more */
         brret = BrotliEncoderCompressStream(ctx->encode.state, BROTLI_OPERATION_FINISH, &ctx->encode.avail_in,
-                                            (const uint8_t**)&ctx->encode.next_in, &ctx->encode.avail_out, &ctx->encode.next_out, NULL);
+            (const uint8_t **)&ctx->encode.next_in, &ctx->encode.avail_out, &ctx->encode.next_out, NULL);
         if (brret != BROTLI_TRUE) {
-            ERR_raise(ERR_LIB_COMP, COMP_R_BROTLI_DECODE_ERROR);
+            ERR_raise(ERR_LIB_COMP, COMP_R_BROTLI_ENCODE_ERROR);
             ERR_add_error_data(1, "brotli encoder error");
             return 0;
         }
@@ -766,7 +766,7 @@ static long bio_brotli_ctrl(BIO *b, int cmd, long num, void *ptr)
         BIO_copy_next_retry(b);
         break;
 
-   case BIO_CTRL_WPENDING:
+    case BIO_CTRL_WPENDING:
         if (BrotliEncoderHasMoreOutput(ctx->encode.state))
             ret = 1;
         else
@@ -783,7 +783,6 @@ static long bio_brotli_ctrl(BIO *b, int cmd, long num, void *ptr)
     default:
         ret = BIO_ctrl(next, cmd, num, ptr);
         break;
-
     }
 
     return ret;
diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 0fbab8f014fe5..7e970f81e9a51 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -21,19 +21,19 @@
 COMP_METHOD *COMP_zlib(void);
 
 #ifdef OPENSSL_NO_ZLIB
-# undef ZLIB_SHARED
+#undef ZLIB_SHARED
 #else
 
-# include <zlib.h>
+#include <zlib.h>
 
 static int zlib_stateful_init(COMP_CTX *ctx);
 static void zlib_stateful_finish(COMP_CTX *ctx);
 static ossl_ssize_t zlib_stateful_compress_block(COMP_CTX *ctx, unsigned char *out,
-                                                 size_t olen, unsigned char *in,
-                                                 size_t ilen);
+    size_t olen, unsigned char *in,
+    size_t ilen);
 static ossl_ssize_t zlib_stateful_expand_block(COMP_CTX *ctx, unsigned char *out,
-                                               size_t olen, unsigned char *in,
-                                               size_t ilen);
+    size_t olen, unsigned char *in,
+    size_t ilen);
 
 /* memory allocations functions for zlib initialisation */
 static void *zlib_zalloc(void *opaque, unsigned int no, unsigned int size)
@@ -49,7 +49,6 @@ static void zlib_zfree(void *opaque, void *address)
     OPENSSL_free(address);
 }
 
-
 static COMP_METHOD zlib_stateful_method = {
     NID_zlib_compression,
     LN_zlib_compression,
@@ -65,28 +64,28 @@ static COMP_METHOD zlib_stateful_method = {
  * work.  Therefore, all ZLIB routines are loaded at run time
  * and we do not link to a .LIB file when ZLIB_SHARED is set.
  */
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-#  include <windows.h>
-# endif                         /* !(OPENSSL_SYS_WINDOWS ||
-                                 * OPENSSL_SYS_WIN32) */
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#include <windows.h>
+#endif /* !(OPENSSL_SYS_WINDOWS || \
+        * OPENSSL_SYS_WIN32) */
 
-# ifdef ZLIB_SHARED
-#  include "internal/dso.h"
+#ifdef ZLIB_SHARED
+#include "internal/dso.h"
 
 /* Function pointers */
-typedef int (*compress_ft) (Bytef *dest, uLongf *destLen,
-                            const Bytef *source, uLong sourceLen);
-typedef int (*uncompress_ft) (Bytef *dest, uLongf *destLen,
-                              const Bytef *source, uLong sourceLen);
-typedef int (*inflateEnd_ft) (z_streamp strm);
-typedef int (*inflate_ft) (z_streamp strm, int flush);
-typedef int (*inflateInit__ft) (z_streamp strm,
-                                const char *version, int stream_size);
-typedef int (*deflateEnd_ft) (z_streamp strm);
-typedef int (*deflate_ft) (z_streamp strm, int flush);
-typedef int (*deflateInit__ft) (z_streamp strm, int level,
-                                const char *version, int stream_size);
-typedef const char *(*zError__ft) (int err);
+typedef int (*compress_ft)(Bytef *dest, uLongf *destLen,
+    const Bytef *source, uLong sourceLen);
+typedef int (*uncompress_ft)(Bytef *dest, uLongf *destLen,
+    const Bytef *source, uLong sourceLen);
+typedef int (*inflateEnd_ft)(z_streamp strm);
+typedef int (*inflate_ft)(z_streamp strm, int flush);
+typedef int (*inflateInit__ft)(z_streamp strm,
+    const char *version, int stream_size);
+typedef int (*deflateEnd_ft)(z_streamp strm);
+typedef int (*deflate_ft)(z_streamp strm, int flush);
+typedef int (*deflateInit__ft)(z_streamp strm, int level,
+    const char *version, int stream_size);
+typedef const char *(*zError__ft)(int err);
 static compress_ft p_compress = NULL;
 static uncompress_ft p_uncompress = NULL;
 static inflateEnd_ft p_inflateEnd = NULL;
@@ -99,16 +98,16 @@ static zError__ft p_zError = NULL;
 
 static DSO *zlib_dso = NULL;
 
-#  define compress                p_compress
-#  define uncompress              p_uncompress
-#  define inflateEnd              p_inflateEnd
-#  define inflate                 p_inflate
-#  define inflateInit_            p_inflateInit_
-#  define deflateEnd              p_deflateEnd
-#  define deflate                 p_deflate
-#  define deflateInit_            p_deflateInit_
-#  define zError                  p_zError
-# endif                         /* ZLIB_SHARED */
+#define compress p_compress
+#define uncompress p_uncompress
+#define inflateEnd p_inflateEnd
+#define inflate p_inflate
+#define inflateInit_ p_inflateInit_
+#define deflateEnd p_deflateEnd
+#define deflate p_deflate
+#define deflateInit_ p_deflateInit_
+#define zError p_zError
+#endif /* ZLIB_SHARED */
 
 struct zlib_state {
     z_stream istream;
@@ -138,13 +137,13 @@ static int zlib_stateful_init(COMP_CTX *ctx)
     state->ostream.next_in = Z_NULL;
     state->ostream.next_out = Z_NULL;
     err = deflateInit_(&state->ostream, Z_DEFAULT_COMPRESSION,
-                       ZLIB_VERSION, sizeof(z_stream));
+        ZLIB_VERSION, sizeof(z_stream));
     if (err != Z_OK)
         goto err;
 
     ctx->data = state;
     return 1;
- err:
+err:
     OPENSSL_free(state);
     return 0;
 }
@@ -158,8 +157,8 @@ static void zlib_stateful_finish(COMP_CTX *ctx)
 }
 
 static ossl_ssize_t zlib_stateful_compress_block(COMP_CTX *ctx, unsigned char *out,
-                                                 size_t olen, unsigned char *in,
-                                                 size_t ilen)
+    size_t olen, unsigned char *in,
+    size_t ilen)
 {
     int err = Z_OK;
     struct zlib_state *state = ctx->data;
@@ -181,8 +180,8 @@ static ossl_ssize_t zlib_stateful_compress_block(COMP_CTX *ctx, unsigned char *o
 }
 
 static ossl_ssize_t zlib_stateful_expand_block(COMP_CTX *ctx, unsigned char *out,
-                                               size_t olen, unsigned char *in,
-                                               size_t ilen)
+    size_t olen, unsigned char *in,
+    size_t ilen)
 {
     int err = Z_OK;
     struct zlib_state *state = ctx->data;
@@ -215,8 +214,8 @@ static void zlib_oneshot_finish(COMP_CTX *ctx)
 }
 
 static ossl_ssize_t zlib_oneshot_compress_block(COMP_CTX *ctx, unsigned char *out,
-                                                size_t olen, unsigned char *in,
-                                                size_t ilen)
+    size_t olen, unsigned char *in,
+    size_t ilen)
 {
     uLongf out_size;
 
@@ -237,8 +236,8 @@ static ossl_ssize_t zlib_oneshot_compress_block(COMP_CTX *ctx, unsigned char *ou
 }
 
 static ossl_ssize_t zlib_oneshot_expand_block(COMP_CTX *ctx, unsigned char *out,
-                                              size_t olen, unsigned char *in,
-                                              size_t ilen)
+    size_t olen, unsigned char *in,
+    size_t ilen)
 {
     uLongf out_size;
 
@@ -270,39 +269,39 @@ static COMP_METHOD zlib_oneshot_method = {
 static CRYPTO_ONCE zlib_once = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(ossl_comp_zlib_init)
 {
-# ifdef ZLIB_SHARED
+#ifdef ZLIB_SHARED
     /* LIBZ may be externally defined, and we should respect that value */
-#  ifndef LIBZ
-#   if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-#    define LIBZ "ZLIB1"
-#   elif defined(OPENSSL_SYS_VMS)
-#    define LIBZ "LIBZ"
-#   else
-#    define LIBZ "z"
-#   endif
-#  endif
+#ifndef LIBZ
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#define LIBZ "ZLIB1"
+#elif defined(OPENSSL_SYS_VMS)
+#define LIBZ "LIBZ"
+#else
+#define LIBZ "z"
+#endif
+#endif
 
     zlib_dso = DSO_load(NULL, LIBZ, NULL, 0);
     if (zlib_dso != NULL) {
-        p_compress = (compress_ft) DSO_bind_func(zlib_dso, "compress");
-        p_uncompress = (compress_ft) DSO_bind_func(zlib_dso, "uncompress");
-        p_inflateEnd = (inflateEnd_ft) DSO_bind_func(zlib_dso, "inflateEnd");
-        p_inflate = (inflate_ft) DSO_bind_func(zlib_dso, "inflate");
-        p_inflateInit_ = (inflateInit__ft) DSO_bind_func(zlib_dso, "inflateInit_");
-        p_deflateEnd = (deflateEnd_ft) DSO_bind_func(zlib_dso, "deflateEnd");
-        p_deflate = (deflate_ft) DSO_bind_func(zlib_dso, "deflate");
-        p_deflateInit_ = (deflateInit__ft) DSO_bind_func(zlib_dso, "deflateInit_");
-        p_zError = (zError__ft) DSO_bind_func(zlib_dso, "zError");
-
-        if (p_compress == NULL || p_uncompress == NULL || p_inflateEnd == NULL
-                || p_inflate == NULL || p_inflateInit_ == NULL
-                || p_deflateEnd == NULL || p_deflate == NULL
-                || p_deflateInit_ == NULL || p_zError == NULL) {
-            ossl_comp_zlib_cleanup();
-            return 0;
-        }
+        p_compress = (compress_ft)DSO_bind_func(zlib_dso, "compress");
+        p_uncompress = (uncompress_ft)DSO_bind_func(zlib_dso, "uncompress");
+        p_inflateEnd = (inflateEnd_ft)DSO_bind_func(zlib_dso, "inflateEnd");
+        p_inflate = (inflate_ft)DSO_bind_func(zlib_dso, "inflate");
+        p_inflateInit_ = (inflateInit__ft)DSO_bind_func(zlib_dso, "inflateInit_");
+        p_deflateEnd = (deflateEnd_ft)DSO_bind_func(zlib_dso, "deflateEnd");
+        p_deflate = (deflate_ft)DSO_bind_func(zlib_dso, "deflate");
+        p_deflateInit_ = (deflateInit__ft)DSO_bind_func(zlib_dso, "deflateInit_");
+        p_zError = (zError__ft)DSO_bind_func(zlib_dso, "zError");
     }
-# endif
+
+    if (p_compress == NULL || p_uncompress == NULL || p_inflateEnd == NULL
+        || p_inflate == NULL || p_inflateInit_ == NULL
+        || p_deflateEnd == NULL || p_deflate == NULL
+        || p_deflateInit_ == NULL || p_zError == NULL) {
+        ossl_comp_zlib_cleanup();
+        return 0;
+    }
+#endif
     return 1;
 }
 #endif
@@ -345,19 +344,19 @@ void ossl_comp_zlib_cleanup(void)
 /* Zlib based compression/decompression filter BIO */
 
 typedef struct {
-    unsigned char *ibuf;        /* Input buffer */
-    int ibufsize;               /* Buffer size */
-    z_stream zin;               /* Input decompress context */
-    unsigned char *obuf;        /* Output buffer */
-    int obufsize;               /* Output buffer size */
-    unsigned char *optr;        /* Position in output buffer */
-    int ocount;                 /* Amount of data in output buffer */
-    int odone;                  /* deflate EOF */
-    int comp_level;             /* Compression level to use */
-    z_stream zout;              /* Output compression context */
+    unsigned char *ibuf; /* Input buffer */
+    int ibufsize; /* Buffer size */
+    z_stream zin; /* Input decompress context */
+    unsigned char *obuf; /* Output buffer */
+    int obufsize; /* Output buffer size */
+    unsigned char *optr; /* Position in output buffer */
+    int ocount; /* Amount of data in output buffer */
+    int odone; /* deflate EOF */
+    int comp_level; /* Compression level to use */
+    z_stream zout; /* Output compression context */
 } BIO_ZLIB_CTX;
 
-# define ZLIB_DEFAULT_BUFSIZE 1024
+#define ZLIB_DEFAULT_BUFSIZE 1024
 
 static int bio_zlib_new(BIO *bi);
 static int bio_zlib_free(BIO *bi);
@@ -373,8 +372,8 @@ static const BIO_METHOD bio_meth_zlib = {
     bio_zlib_write,
     bread_conv,
     bio_zlib_read,
-    NULL,                      /* bio_zlib_puts, */
-    NULL,                      /* bio_zlib_gets, */
+    NULL, /* bio_zlib_puts, */
+    NULL, /* bio_zlib_gets, */
     bio_zlib_ctrl,
     bio_zlib_new,
     bio_zlib_free,
@@ -396,12 +395,12 @@ static int bio_zlib_new(BIO *bi)
 {
     BIO_ZLIB_CTX *ctx;
 
-# ifdef ZLIB_SHARED
+#ifdef ZLIB_SHARED
     if (!RUN_ONCE(&zlib_once, ossl_comp_zlib_init)) {
         ERR_raise(ERR_LIB_COMP, COMP_R_ZLIB_NOT_SUPPORTED);
         return 0;
     }
-# endif
+#endif
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx == NULL)
         return 0;
@@ -460,7 +459,7 @@ static int bio_zlib_read(BIO *b, char *out, int outl)
             return 0;
         if ((ret = inflateInit(zin)) != Z_OK) {
             ERR_raise_data(ERR_LIB_COMP, COMP_R_ZLIB_INFLATE_ERROR,
-                           "zlib error: %s", zError(ret));
+                "zlib error: %s", zError(ret));
             return 0;
         }
         zin->next_in = ctx->ibuf;
@@ -476,7 +475,7 @@ static int bio_zlib_read(BIO *b, char *out, int outl)
             ret = inflate(zin, 0);
             if ((ret != Z_OK) && (ret != Z_STREAM_END)) {
                 ERR_raise_data(ERR_LIB_COMP, COMP_R_ZLIB_INFLATE_ERROR,
-                               "zlib error: %s", zError(ret));
+                    "zlib error: %s", zError(ret));
                 return 0;
             }
             /* If EOF or we've read everything then return */
@@ -525,7 +524,7 @@ static int bio_zlib_write(BIO *b, const char *in, int inl)
         ctx->ocount = 0;
         if ((ret = deflateInit(zout, ctx->comp_level)) != Z_OK) {
             ERR_raise_data(ERR_LIB_COMP, COMP_R_ZLIB_DEFLATE_ERROR,
-                           "zlib error: %s", zError(ret));
+                "zlib error: %s", zError(ret));
             return 0;
         }
         zout->next_out = ctx->obuf;
@@ -564,7 +563,7 @@ static int bio_zlib_write(BIO *b, const char *in, int inl)
         ret = deflate(zout, 0);
         if (ret != Z_OK) {
             ERR_raise_data(ERR_LIB_COMP, COMP_R_ZLIB_DEFLATE_ERROR,
-                           "zlib error: %s", zError(ret));
+                "zlib error: %s", zError(ret));
             return 0;
         }
         ctx->ocount = ctx->obufsize - zout->avail_out;
@@ -613,7 +612,7 @@ static int bio_zlib_flush(BIO *b)
             ctx->odone = 1;
         else if (ret != Z_OK) {
             ERR_raise_data(ERR_LIB_COMP, COMP_R_ZLIB_DEFLATE_ERROR,
-                           "zlib error: %s", zError(ret));
+                "zlib error: %s", zError(ret));
             return 0;
         }
         ctx->ocount = ctx->obufsize - zout->avail_out;
@@ -705,7 +704,6 @@ static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr)
     default:
         ret = BIO_ctrl(next, cmd, num, ptr);
         break;
-
     }
 
     return ret;
diff --git a/crypto/comp/c_zstd.c b/crypto/comp/c_zstd.c
index b4667649f3ce0..2cd3046050ed2 100644
--- a/crypto/comp/c_zstd.c
+++ b/crypto/comp/c_zstd.c
@@ -26,24 +26,24 @@
 COMP_METHOD *COMP_zstd(void);
 
 #ifdef OPENSSL_NO_ZSTD
-# undef ZSTD_SHARED
+#undef ZSTD_SHARED
 #else
 
-# ifndef ZSTD_SHARED
-#  define ZSTD_STATIC_LINKING_ONLY
-# endif
-# include <zstd.h>
+#ifndef ZSTD_SHARED
+#define ZSTD_STATIC_LINKING_ONLY
+#endif
+#include <zstd.h>
 
 /* Note: There is also a linux zstd.h file in the kernel source */
-# ifndef ZSTD_H_235446
-#  error Wrong (i.e. linux) zstd.h included.
-# endif
+#ifndef ZSTD_H_235446
+#error Wrong (i.e. linux) zstd.h included.
+#endif
 
-# if ZSTD_VERSION_MAJOR != 1 && ZSTD_VERSION_MINOR < 4
-#  error Expecting version 1.4 or greater of ZSTD
-# endif
+#if ZSTD_VERSION_MAJOR != 1 || ZSTD_VERSION_MINOR < 4
+#error Expecting version 1.4 or greater of ZSTD 1.x
+#endif
 
-# ifndef ZSTD_SHARED
+#ifndef ZSTD_SHARED
 /* memory allocations functions for zstd initialisation */
 static void *zstd_alloc(void *opaque, size_t size)
 {
@@ -60,7 +60,7 @@ static ZSTD_customMem zstd_mem_funcs = {
     zstd_free,
     NULL
 };
-# endif
+#endif
 
 /*
  * When OpenSSL is built on Windows, we do not want to require that
@@ -68,28 +68,28 @@ static ZSTD_customMem zstd_mem_funcs = {
  * work.  Therefore, all ZSTD routines are loaded at run time
  * and we do not link to a .LIB file when ZSTD_SHARED is set.
  */
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-#  include <windows.h>
-# endif
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#include <windows.h>
+#endif
 
-# ifdef ZSTD_SHARED
-#  include "internal/dso.h"
+#ifdef ZSTD_SHARED
+#include "internal/dso.h"
 
 /* Function pointers */
-typedef ZSTD_CStream* (*createCStream_ft)(void);
-typedef size_t (*initCStream_ft)(ZSTD_CStream*, int);
-typedef size_t (*freeCStream_ft)(ZSTD_CStream*);
-typedef size_t (*compressStream2_ft)(ZSTD_CCtx*, ZSTD_outBuffer*, ZSTD_inBuffer*, ZSTD_EndDirective);
-typedef size_t (*flushStream_ft)(ZSTD_CStream*, ZSTD_outBuffer*);
-typedef size_t (*endStream_ft)(ZSTD_CStream*, ZSTD_outBuffer*);
-typedef size_t (*compress_ft)(void*, size_t, const void*, size_t, int);
-typedef ZSTD_DStream* (*createDStream_ft)(void);
-typedef size_t (*initDStream_ft)(ZSTD_DStream*);
-typedef size_t (*freeDStream_ft)(ZSTD_DStream*);
-typedef size_t (*decompressStream_ft)(ZSTD_DStream*, ZSTD_outBuffer*, ZSTD_inBuffer*);
-typedef size_t (*decompress_ft)(void*, size_t, const void*, size_t);
+typedef ZSTD_CStream *(*createCStream_ft)(void);
+typedef size_t (*initCStream_ft)(ZSTD_CStream *, int);
+typedef size_t (*freeCStream_ft)(ZSTD_CStream *);
+typedef size_t (*compressStream2_ft)(ZSTD_CCtx *, ZSTD_outBuffer *, ZSTD_inBuffer *, ZSTD_EndDirective);
+typedef size_t (*flushStream_ft)(ZSTD_CStream *, ZSTD_outBuffer *);
+typedef size_t (*endStream_ft)(ZSTD_CStream *, ZSTD_outBuffer *);
+typedef size_t (*compress_ft)(void *, size_t, const void *, size_t, int);
+typedef ZSTD_DStream *(*createDStream_ft)(void);
+typedef size_t (*initDStream_ft)(ZSTD_DStream *);
+typedef size_t (*freeDStream_ft)(ZSTD_DStream *);
+typedef size_t (*decompressStream_ft)(ZSTD_DStream *, ZSTD_outBuffer *, ZSTD_inBuffer *);
+typedef size_t (*decompress_ft)(void *, size_t, const void *, size_t);
 typedef unsigned (*isError_ft)(size_t);
-typedef const char* (*getErrorName_ft)(size_t);
+typedef const char *(*getErrorName_ft)(size_t);
 typedef size_t (*DStreamInSize_ft)(void);
 typedef size_t (*CStreamInSize_ft)(void);
 
@@ -112,24 +112,24 @@ static CStreamInSize_ft p_CStreamInSize = NULL;
 
 static DSO *zstd_dso = NULL;
 
-#  define ZSTD_createCStream p_createCStream
-#  define ZSTD_initCStream p_initCStream
-#  define ZSTD_freeCStream p_freeCStream
-#  define ZSTD_compressStream2 p_compressStream2
-#  define ZSTD_flushStream p_flushStream
-#  define ZSTD_endStream p_endStream
-#  define ZSTD_compress p_compress
-#  define ZSTD_createDStream p_createDStream
-#  define ZSTD_initDStream p_initDStream
-#  define ZSTD_freeDStream p_freeDStream
-#  define ZSTD_decompressStream p_decompressStream
-#  define ZSTD_decompress p_decompress
-#  define ZSTD_isError p_isError
-#  define ZSTD_getErrorName p_getErrorName
-#  define ZSTD_DStreamInSize p_DStreamInSize
-#  define ZSTD_CStreamInSize p_CStreamInSize
-
-# endif /* ifdef ZSTD_SHARED */
+#define ZSTD_createCStream p_createCStream
+#define ZSTD_initCStream p_initCStream
+#define ZSTD_freeCStream p_freeCStream
+#define ZSTD_compressStream2 p_compressStream2
+#define ZSTD_flushStream p_flushStream
+#define ZSTD_endStream p_endStream
+#define ZSTD_compress p_compress
+#define ZSTD_createDStream p_createDStream
+#define ZSTD_initDStream p_initDStream
+#define ZSTD_freeDStream p_freeDStream
+#define ZSTD_decompressStream p_decompressStream
+#define ZSTD_decompress p_decompress
+#define ZSTD_isError p_isError
+#define ZSTD_getErrorName p_getErrorName
+#define ZSTD_DStreamInSize p_DStreamInSize
+#define ZSTD_CStreamInSize p_CStreamInSize
+
+#endif /* ifdef ZSTD_SHARED */
 
 struct zstd_state {
     ZSTD_CStream *compressor;
@@ -143,27 +143,27 @@ static int zstd_stateful_init(COMP_CTX *ctx)
     if (state == NULL)
         return 0;
 
-# ifdef ZSTD_SHARED
+#ifdef ZSTD_SHARED
     state->compressor = ZSTD_createCStream();
-# else
+#else
     state->compressor = ZSTD_createCStream_advanced(zstd_mem_funcs);
-# endif
+#endif
     if (state->compressor == NULL)
         goto err;
     ZSTD_initCStream(state->compressor, ZSTD_CLEVEL_DEFAULT);
 
-# ifdef ZSTD_SHARED
+#ifdef ZSTD_SHARED
     state->decompressor = ZSTD_createDStream();
-# else
+#else
     state->decompressor = ZSTD_createDStream_advanced(zstd_mem_funcs);
-# endif
+#endif
     if (state->decompressor == NULL)
         goto err;
     ZSTD_initDStream(state->decompressor);
 
     ctx->data = state;
     return 1;
- err:
+err:
     ZSTD_freeCStream(state->compressor);
     ZSTD_freeDStream(state->decompressor);
     OPENSSL_free(state);
@@ -183,8 +183,8 @@ static void zstd_stateful_finish(COMP_CTX *ctx)
 }
 
 static ossl_ssize_t zstd_stateful_compress_block(COMP_CTX *ctx, unsigned char *out,
-                                                 size_t olen, unsigned char *in,
-                                                 size_t ilen)
+    size_t olen, unsigned char *in,
+    size_t ilen)
 {
     ZSTD_inBuffer inbuf;
     ZSTD_outBuffer outbuf;
@@ -232,7 +232,7 @@ static ossl_ssize_t zstd_stateful_compress_block(COMP_CTX *ctx, unsigned char *o
     if (ZSTD_isError(ret))
         return -1;
 
- end:
+end:
     if (outbuf.pos > OSSL_SSIZE_MAX)
         return -1;
     fret = (ossl_ssize_t)outbuf.pos;
@@ -242,8 +242,8 @@ static ossl_ssize_t zstd_stateful_compress_block(COMP_CTX *ctx, unsigned char *o
 }
 
 static ossl_ssize_t zstd_stateful_expand_block(COMP_CTX *ctx, unsigned char *out,
-                                               size_t olen, unsigned char *in,
-                                               size_t ilen)
+    size_t olen, unsigned char *in,
+    size_t ilen)
 {
     ZSTD_inBuffer inbuf;
     ZSTD_outBuffer outbuf;
@@ -283,7 +283,6 @@ static ossl_ssize_t zstd_stateful_expand_block(COMP_CTX *ctx, unsigned char *out
     return fret;
 }
 
-
 static COMP_METHOD zstd_stateful_method = {
     NID_zstd,
     LN_zstd,
@@ -303,8 +302,8 @@ static void zstd_oneshot_finish(COMP_CTX *ctx)
 }
 
 static ossl_ssize_t zstd_oneshot_compress_block(COMP_CTX *ctx, unsigned char *out,
-                                               size_t olen, unsigned char *in,
-                                               size_t ilen)
+    size_t olen, unsigned char *in,
+    size_t ilen)
 {
     size_t out_size;
     ossl_ssize_t ret;
@@ -326,8 +325,8 @@ static ossl_ssize_t zstd_oneshot_compress_block(COMP_CTX *ctx, unsigned char *ou
 }
 
 static ossl_ssize_t zstd_oneshot_expand_block(COMP_CTX *ctx, unsigned char *out,
-                                              size_t olen, unsigned char *in,
-                                              size_t ilen)
+    size_t olen, unsigned char *in,
+    size_t ilen)
 {
     size_t out_size;
     ossl_ssize_t ret;
@@ -360,12 +359,12 @@ static COMP_METHOD zstd_oneshot_method = {
 static CRYPTO_ONCE zstd_once = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(ossl_comp_zstd_init)
 {
-# ifdef ZSTD_SHARED
-#  if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-#   define LIBZSTD "LIBZSTD"
-#  else
-#   define LIBZSTD  "zstd"
-#  endif
+#ifdef ZSTD_SHARED
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#define LIBZSTD "LIBZSTD"
+#else
+#define LIBZSTD "zstd"
+#endif
 
     zstd_dso = DSO_load(NULL, LIBZSTD, NULL, 0);
     if (zstd_dso != NULL) {
@@ -388,15 +387,15 @@ DEFINE_RUN_ONCE_STATIC(ossl_comp_zstd_init)
     }
 
     if (p_createCStream == NULL || p_initCStream == NULL || p_freeCStream == NULL
-            || p_compressStream2 == NULL || p_flushStream == NULL || p_endStream == NULL
-            || p_compress == NULL || p_createDStream == NULL || p_initDStream == NULL
-            || p_freeDStream == NULL || p_decompressStream == NULL || p_decompress == NULL
-            || p_isError == NULL || p_getErrorName == NULL || p_DStreamInSize == NULL
-            || p_CStreamInSize == NULL) {
+        || p_compressStream2 == NULL || p_flushStream == NULL || p_endStream == NULL
+        || p_compress == NULL || p_createDStream == NULL || p_initDStream == NULL
+        || p_freeDStream == NULL || p_decompressStream == NULL || p_decompress == NULL
+        || p_isError == NULL || p_getErrorName == NULL || p_DStreamInSize == NULL
+        || p_CStreamInSize == NULL) {
         ossl_comp_zstd_cleanup();
         return 0;
     }
-# endif
+#endif
     return 1;
 }
 #endif /* ifndef ZSTD / else */
@@ -457,7 +456,7 @@ typedef struct {
         ZSTD_DStream *state;
         ZSTD_inBuffer inbuf; /* has const src */
         size_t bufsize;
-        void* buffer;
+        void *buffer;
     } decompress;
     struct { /* output structure */
         ZSTD_CStream *state;
@@ -467,7 +466,7 @@ typedef struct {
     } compress;
 } BIO_ZSTD_CTX;
 
-# define ZSTD_DEFAULT_BUFSIZE 1024
+#define ZSTD_DEFAULT_BUFSIZE 1024
 
 static int bio_zstd_new(BIO *bi);
 static int bio_zstd_free(BIO *bi);
@@ -485,8 +484,8 @@ static const BIO_METHOD bio_meth_zstd = {
     /* TODO: Convert to new style read function */
     bread_conv,
     bio_zstd_read,
-    NULL,                      /* bio_zstd_puts, */
-    NULL,                      /* bio_zstd_gets, */
+    NULL, /* bio_zstd_puts, */
+    NULL, /* bio_zstd_gets, */
     bio_zstd_ctrl,
     bio_zstd_new,
     bio_zstd_free,
@@ -508,34 +507,34 @@ static int bio_zstd_new(BIO *bi)
 {
     BIO_ZSTD_CTX *ctx;
 
-# ifdef ZSTD_SHARED
+#ifdef ZSTD_SHARED
     (void)COMP_zstd();
     if (zstd_dso == NULL) {
         ERR_raise(ERR_LIB_COMP, COMP_R_ZSTD_NOT_SUPPORTED);
         return 0;
     }
-# endif
+#endif
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_COMP, ERR_R_MALLOC_FAILURE);
         return 0;
     }
 
-# ifdef ZSTD_SHARED
-    ctx->decompress.state =  ZSTD_createDStream();
-# else
-    ctx->decompress.state =  ZSTD_createDStream_advanced(zstd_mem_funcs);
-# endif
+#ifdef ZSTD_SHARED
+    ctx->decompress.state = ZSTD_createDStream();
+#else
+    ctx->decompress.state = ZSTD_createDStream_advanced(zstd_mem_funcs);
+#endif
     if (ctx->decompress.state == NULL)
         goto err;
     ZSTD_initDStream(ctx->decompress.state);
     ctx->decompress.bufsize = ZSTD_DStreamInSize();
 
-# ifdef ZSTD_SHARED
+#ifdef ZSTD_SHARED
     ctx->compress.state = ZSTD_createCStream();
-# else
+#else
     ctx->compress.state = ZSTD_createCStream_advanced(zstd_mem_funcs);
-# endif
+#endif
     if (ctx->compress.state == NULL)
         goto err;
     ZSTD_initCStream(ctx->compress.state, ZSTD_CLEVEL_DEFAULT);
@@ -545,7 +544,7 @@ static int bio_zstd_new(BIO *bi)
     BIO_set_data(bi, ctx);
 
     return 1;
- err:
+err:
     ERR_raise(ERR_LIB_COMP, ERR_R_MALLOC_FAILURE);
     ZSTD_freeDStream(ctx->decompress.state);
     ZSTD_freeCStream(ctx->compress.state);
@@ -582,7 +581,11 @@ static int bio_zstd_read(BIO *b, char *out, int outl)
     ZSTD_outBuffer outBuf;
     BIO *next = BIO_next(b);
 
-    if (out == NULL || outl <= 0)
+    if (out == NULL) {
+        ERR_raise(ERR_LIB_COMP, ERR_R_PASSED_NULL_PARAMETER);
+        return -1;
+    }
+    if (outl <= 0)
         return 0;
 
     ctx = BIO_get_data(b);
@@ -591,7 +594,7 @@ static int bio_zstd_read(BIO *b, char *out, int outl)
         ctx->decompress.buffer = OPENSSL_malloc(ctx->decompress.bufsize);
         if (ctx->decompress.buffer == NULL) {
             ERR_raise(ERR_LIB_COMP, ERR_R_MALLOC_FAILURE);
-            return 0;
+            return -1;
         }
         ctx->decompress.inbuf.src = ctx->decompress.buffer;
         ctx->decompress.inbuf.size = 0;
@@ -664,8 +667,8 @@ static int bio_zstd_write(BIO *b, const char *in, int inl)
     for (;;) {
         /* If data in output buffer write it first */
         while (ctx->compress.write_pos < ctx->compress.outbuf.pos) {
-            ret = BIO_write(next, (unsigned char*)ctx->compress.outbuf.dst + ctx->compress.write_pos,
-                            ctx->compress.outbuf.pos - ctx->compress.write_pos);
+            ret = BIO_write(next, (unsigned char *)ctx->compress.outbuf.dst + ctx->compress.write_pos,
+                ctx->compress.outbuf.pos - ctx->compress.write_pos);
             if (ret <= 0) {
                 BIO_copy_next_retry(b);
                 if (ret < 0 && inBuf.pos == 0)
@@ -716,8 +719,8 @@ static int bio_zstd_flush(BIO *b)
     for (;;) {
         /* If data in output buffer write it first */
         while (ctx->compress.write_pos < ctx->compress.outbuf.pos) {
-            ret = BIO_write(next, (unsigned char*)ctx->compress.outbuf.dst + ctx->compress.write_pos,
-                            ctx->compress.outbuf.pos - ctx->compress.write_pos);
+            ret = BIO_write(next, (unsigned char *)ctx->compress.outbuf.dst + ctx->compress.write_pos,
+                ctx->compress.outbuf.pos - ctx->compress.write_pos);
             if (ret <= 0) {
                 BIO_copy_next_retry(b);
                 return ret;
@@ -732,7 +735,7 @@ static int bio_zstd_flush(BIO *b)
         /* Compress some more */
         zret = ZSTD_flushStream(ctx->compress.state, &ctx->compress.outbuf);
         if (ZSTD_isError(zret)) {
-            ERR_raise(ERR_LIB_COMP, COMP_R_ZSTD_DECODE_ERROR);
+            ERR_raise(ERR_LIB_COMP, COMP_R_ZSTD_COMPRESS_ERROR);
             ERR_add_error_data(1, ZSTD_getErrorName(zret));
             return 0;
         }
@@ -811,7 +814,7 @@ static long bio_zstd_ctrl(BIO *b, int cmd, long num, void *ptr)
         BIO_copy_next_retry(b);
         break;
 
-   case BIO_CTRL_WPENDING:
+    case BIO_CTRL_WPENDING:
         if (ctx->compress.outbuf.pos < ctx->compress.outbuf.size)
             ret = 1;
         else
@@ -828,7 +831,6 @@ static long bio_zstd_ctrl(BIO *b, int cmd, long num, void *ptr)
     default:
         ret = BIO_ctrl(next, cmd, num, ptr);
         break;
-
     }
 
     return ret;
diff --git a/crypto/comp/comp_err.c b/crypto/comp/comp_err.c
index 2345da693ec6a..0aa0dc6302483 100644
--- a/crypto/comp/comp_err.c
+++ b/crypto/comp/comp_err.c
@@ -14,39 +14,39 @@
 
 #ifndef OPENSSL_NO_COMP
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA COMP_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_BROTLI_DECODE_ERROR),
-    "brotli decode error"},
-    {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_BROTLI_ENCODE_ERROR),
-    "brotli encode error"},
-    {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_BROTLI_NOT_SUPPORTED),
-    "brotli not supported"},
-    {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_DEFLATE_ERROR),
-    "zlib deflate error"},
-    {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_INFLATE_ERROR),
-    "zlib inflate error"},
-    {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_NOT_SUPPORTED),
-    "zlib not supported"},
-    {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_COMPRESS_ERROR),
-    "zstd compress error"},
-    {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_DECODE_ERROR), "zstd decode error"},
-    {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_DECOMPRESS_ERROR),
-    "zstd decompress error"},
-    {ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_NOT_SUPPORTED),
-    "zstd not supported"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_BROTLI_DECODE_ERROR),
+        "brotli decode error" },
+    { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_BROTLI_ENCODE_ERROR),
+        "brotli encode error" },
+    { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_BROTLI_NOT_SUPPORTED),
+        "brotli not supported" },
+    { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_DEFLATE_ERROR),
+        "zlib deflate error" },
+    { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_INFLATE_ERROR),
+        "zlib inflate error" },
+    { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_NOT_SUPPORTED),
+        "zlib not supported" },
+    { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_COMPRESS_ERROR),
+        "zstd compress error" },
+    { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_DECODE_ERROR), "zstd decode error" },
+    { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_DECOMPRESS_ERROR),
+        "zstd decompress error" },
+    { ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZSTD_NOT_SUPPORTED),
+        "zstd not supported" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_COMP_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(COMP_str_reasons[0].error) == NULL)
         ERR_load_strings_const(COMP_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/comp/comp_lib.c b/crypto/comp/comp_lib.c
index 56ca17a7a54a1..1254b37d31a47 100644
--- a/crypto/comp/comp_lib.c
+++ b/crypto/comp/comp_lib.c
@@ -62,7 +62,7 @@ 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 ret;
     if (ctx->meth->compress == NULL) {
@@ -77,7 +77,7 @@ int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
 }
 
 int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
-                      unsigned char *in, int ilen)
+    unsigned char *in, int ilen)
 {
     int ret;
 
@@ -92,7 +92,7 @@ int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
     return ret;
 }
 
-int COMP_CTX_get_type(const COMP_CTX* comp)
+int COMP_CTX_get_type(const COMP_CTX *comp)
 {
     return comp->meth ? comp->meth->type : NID_undef;
 }
diff --git a/crypto/comp/comp_local.h b/crypto/comp/comp_local.h
index d8be9271a0cbc..fbc5ab318c1fb 100644
--- a/crypto/comp/comp_local.h
+++ b/crypto/comp/comp_local.h
@@ -8,16 +8,16 @@
  */
 
 struct comp_method_st {
-    int type;                   /* NID for compression library */
-    const char *name;           /* A text string to identify the library */
-    int (*init) (COMP_CTX *ctx);
-    void (*finish) (COMP_CTX *ctx);
-    ossl_ssize_t (*compress) (COMP_CTX *ctx,
-                             unsigned char *out, size_t olen,
-                             unsigned char *in, size_t ilen);
-    ossl_ssize_t (*expand) (COMP_CTX *ctx,
-                            unsigned char *out, size_t olen,
-                            unsigned char *in, size_t ilen);
+    int type; /* NID for compression library */
+    const char *name; /* A text string to identify the library */
+    int (*init)(COMP_CTX *ctx);
+    void (*finish)(COMP_CTX *ctx);
+    ossl_ssize_t (*compress)(COMP_CTX *ctx,
+        unsigned char *out, size_t olen,
+        unsigned char *in, size_t ilen);
+    ossl_ssize_t (*expand)(COMP_CTX *ctx,
+        unsigned char *out, size_t olen,
+        unsigned char *in, size_t ilen);
 };
 
 struct comp_ctx_st {
@@ -26,5 +26,5 @@ struct comp_ctx_st {
     unsigned long compress_out;
     unsigned long expand_in;
     unsigned long expand_out;
-    void* data;
+    void *data;
 };
diff --git a/crypto/comp_methods.c b/crypto/comp_methods.c
index d4f00c1a54614..2b282dc0e189c 100644
--- a/crypto/comp_methods.c
+++ b/crypto/comp_methods.c
@@ -14,9 +14,9 @@
 #include "internal/cryptlib.h"
 #include "internal/comp.h"
 
-#define SSL_COMP_NULL_IDX       0
-#define SSL_COMP_ZLIB_IDX       1
-#define SSL_COMP_NUM_IDX        2
+#define SSL_COMP_NULL_IDX 0
+#define SSL_COMP_ZLIB_IDX 1
+#define SSL_COMP_NUM_IDX 2
 
 #ifndef OPENSSL_NO_COMP
 static int sk_comp_cmp(const SSL_COMP *const *a, const SSL_COMP *const *b)
diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c
index 5b1bf0e78f394..c615d007fba2c 100644
--- a/crypto/conf/conf_api.c
+++ b/crypto/conf/conf_api.c
@@ -32,7 +32,7 @@ CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section)
 }
 
 STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf,
-                                               const char *section)
+    const char *section)
 {
     CONF_VALUE *v;
 
@@ -64,7 +64,7 @@ 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)
 {
     CONF_VALUE *v, vv;
     char *p;
@@ -205,7 +205,7 @@ CONF_VALUE *_CONF_new_section(CONF *conf, const char *section)
         goto err;
     return v;
 
- err:
+err:
     sk_CONF_VALUE_free(sk);
     if (v != NULL)
         OPENSSL_free(v->section);
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index 399aefb199631..d693ce43d1b85 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -13,8 +13,8 @@
 #include <string.h>
 #include "internal/e_os.h" /* struct stat */
 #ifdef __TANDEM
-# include <sys/types.h> /* needed for stat.h */
-# include <sys/stat.h> /* struct stat */
+#include <sys/types.h> /* needed for stat.h */
+#include <sys/stat.h> /* struct stat */
 #endif
 #include "internal/cryptlib.h"
 #include "internal/o_dir.h"
@@ -26,21 +26,21 @@
 #include <openssl/buffer.h>
 #include <openssl/err.h>
 #ifndef OPENSSL_NO_POSIX_IO
-# include <sys/stat.h>
-# ifdef _WIN32
-#  define stat    _stat
-# endif
+#include <sys/stat.h>
+#ifdef _WIN32
+#define stat _stat
+#endif
 #endif
 
 #ifndef S_ISDIR
-# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
+#define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
 #endif
 
 /*
  * The maximum length we can grow a value to after variable expansion. 64k
  * should be more than enough for all reasonable uses.
  */
-#define MAX_CONF_VALUE_LENGTH       65536
+#define MAX_CONF_VALUE_LENGTH 65536
 
 static int is_keytype(const CONF *conf, char c, unsigned short type);
 static char *eat_ws(CONF *conf, char *p);
@@ -50,10 +50,10 @@ static void clear_comments(CONF *conf, char *p);
 static int str_copy(CONF *conf, char *section, char **to, char *from);
 static char *scan_quote(CONF *conf, char *p);
 static char *scan_dquote(CONF *conf, char *p);
-#define scan_esc(conf,p)        (((IS_EOF((conf),(p)[1]))?((p)+1):((p)+2)))
+#define scan_esc(conf, p) (((IS_EOF((conf), (p)[1])) ? ((p) + 1) : ((p) + 2)))
 #ifndef OPENSSL_NO_POSIX_IO
 static BIO *process_include(char *include, OPENSSL_DIR_CTX **dirctx,
-                            char **dirpath);
+    char **dirpath);
 static BIO *get_next_file(const char *path, OPENSSL_DIR_CTX **dirctx);
 #endif
 
@@ -188,7 +188,6 @@ static int def_load(CONF *conf, const char *name, long *line)
     return ret;
 }
 
-
 /* Parse a boolean value and fill in *flag. Return 0 on error. */
 static int parsebool(const char *pval, int *flag)
 {
@@ -196,7 +195,7 @@ static int parsebool(const char *pval, int *flag)
         || OPENSSL_strcasecmp(pval, "true") == 0) {
         *flag = 1;
     } else if (OPENSSL_strcasecmp(pval, "off") == 0
-               || OPENSSL_strcasecmp(pval, "false") == 0) {
+        || OPENSSL_strcasecmp(pval, "false") == 0) {
         *flag = 0;
     } else {
         ERR_raise(ERR_LIB_CONF, CONF_R_INVALID_PRAGMA);
@@ -208,7 +207,7 @@ static int parsebool(const char *pval, int *flag)
 static int def_load_bio(CONF *conf, BIO *in, long *line)
 {
 /* The macro BUFSIZE conflicts with a system macro in VxWorks */
-#define CONFBUFSIZE     512
+#define CONFBUFSIZE 512
     int bufnum = 0, i, ii;
     BUF_MEM *buff = NULL;
     char *s, *p, *end;
@@ -259,7 +258,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
         }
         p = &(buff->data[bufnum]);
         *p = '\0';
- read_retry:
+    read_retry:
         if (in != NULL && BIO_gets(in, p, CONFBUFSIZE - 1) < 0)
             goto err;
         p[CONFBUFSIZE - 1] = '\0';
@@ -267,7 +266,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
         if (first_call) {
             /* Other BOMs imply unsupported multibyte encoding,
              * so don't strip them and let the error raise */
-            const unsigned char utf8_bom[3] = {0xEF, 0xBB, 0xBF};
+            const unsigned char utf8_bom[3] = { 0xEF, 0xBB, 0xBF };
 
             if (i >= 3 && memcmp(p, utf8_bom, 3) == 0) {
                 memmove(p, p + 3, i - 3);
@@ -317,10 +316,10 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
          * we removed some trailing stuff so there is a new line on the end.
          */
         if (ii && i == ii)
-            again = 1;          /* long line */
+            again = 1; /* long line */
         else {
             p[i] = '\0';
-            eline++;            /* another input line */
+            eline++; /* another input line */
         }
 
         /* we now have a line with trailing \r\n removed */
@@ -349,14 +348,14 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
         clear_comments(conf, buf);
         s = eat_ws(conf, buf);
         if (IS_EOF(conf, *s))
-            continue;           /* blank line */
+            continue; /* blank line */
         if (*s == '[') {
             char *ss;
 
             s++;
             start = eat_ws(conf, s);
             ss = start;
- again:
+        again:
             end = eat_alpha_numeric(conf, ss);
             p = eat_ws(conf, end);
             if (*p != ']') {
@@ -485,7 +484,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
                 }
 
                 if (conf->flag_abspath
-                        && !ossl_is_absolute_path(include_path)) {
+                    && !ossl_is_absolute_path(include_path)) {
                     ERR_raise(ERR_LIB_CONF, CONF_R_RELATIVE_PATH);
                     OPENSSL_free(include_path);
                     goto err;
@@ -523,7 +522,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
                 continue;
             } else if (*p != '=') {
                 ERR_raise_data(ERR_LIB_CONF, CONF_R_MISSING_EQUAL_SIGN,
-                               "HERE-->%s", p);
+                    "HERE-->%s", p);
                 goto err;
             }
             *end = '\0';
@@ -546,7 +545,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
                     tv = _CONF_new_section(conf, psection);
                 if (tv == NULL) {
                     ERR_raise(ERR_LIB_CONF,
-                              CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
+                        CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
                     goto err;
                 }
             } else
@@ -567,7 +566,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
     sk_BIO_free(biosk);
     return 1;
 
- err:
+err:
     BUF_MEM_free(buff);
     OPENSSL_free(section);
     /*
@@ -698,9 +697,9 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
         } else if (IS_EOF(conf, *from))
             break;
         else if (*from == '$'
-                 && (!conf->flag_dollarid
-                     || from[1] == '{'
-                     || from[1] == '(')) {
+            && (!conf->flag_dollarid
+                || from[1] == '{'
+                || from[1] == '(')) {
             size_t newsize;
 
             /* try to expand it */
@@ -718,7 +717,7 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
             cp = section;
             e = np = s;
             while (IS_ALNUM(conf, *e)
-                   || (conf->flag_dollarid && IS_DOLLAR(conf, *e)))
+                || (conf->flag_dollarid && IS_DOLLAR(conf, *e)))
                 e++;
             if ((e[0] == ':') && (e[1] == ':')) {
                 cp = np;
@@ -728,7 +727,7 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
                 e += 2;
                 np = e;
                 while (IS_ALNUM(conf, *e)
-                       || (conf->flag_dollarid && IS_DOLLAR(conf, *e)))
+                    || (conf->flag_dollarid && IS_DOLLAR(conf, *e)))
                     e++;
             }
             r = *e;
@@ -792,7 +791,7 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
     *pto = buf->data;
     OPENSSL_free(buf);
     return 1;
- err:
+err:
     BUF_MEM_free(buf);
     return 0;
 }
@@ -804,7 +803,7 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
  * also an opened directory context and the include path.
  */
 static BIO *process_include(char *include, OPENSSL_DIR_CTX **dirctx,
-                            char **dirpath)
+    char **dirpath)
 {
     struct stat st;
     BIO *next;
@@ -818,7 +817,7 @@ static BIO *process_include(char *include, OPENSSL_DIR_CTX **dirctx,
     if (S_ISDIR(st.st_mode)) {
         if (*dirctx != NULL) {
             ERR_raise_data(ERR_LIB_CONF, CONF_R_RECURSIVE_DIRECTORY_INCLUDE,
-                           "%s", include);
+                "%s", include);
             return NULL;
         }
         /* a directory, load its contents */
@@ -846,9 +845,8 @@ static BIO *get_next_file(const char *path, OPENSSL_DIR_CTX **dirctx)
 
         namelen = strlen(filename);
 
-
         if ((namelen > 5
-             && OPENSSL_strcasecmp(filename + namelen - 5, ".conf") == 0)
+                && OPENSSL_strcasecmp(filename + namelen - 5, ".conf") == 0)
             || (namelen > 4
                 && OPENSSL_strcasecmp(filename + namelen - 4, ".cnf") == 0)) {
             size_t newlen;
@@ -892,16 +890,16 @@ static BIO *get_next_file(const char *path, OPENSSL_DIR_CTX **dirctx)
 
 static int is_keytype(const CONF *conf, char c, unsigned short type)
 {
-    const unsigned short *keytypes = (const unsigned short *) conf->meth_data;
+    const unsigned short *keytypes = (const unsigned short *)conf->meth_data;
     unsigned char key = (unsigned char)c;
 
 #ifdef CHARSET_EBCDIC
-# if CHAR_BIT > 8
+#if CHAR_BIT > 8
     if (key > 255) {
         /* key is out of range for os_toascii table */
         return 0;
     }
-# endif
+#endif
     /* convert key from ebcdic to ascii */
     key = os_toascii[key];
 #endif
@@ -942,7 +940,7 @@ static char *eat_alpha_numeric(CONF *conf, char *p)
             continue;
         }
         if (!(IS_ALNUM_PUNCT(conf, *p)
-              || (conf->flag_dollarid && IS_DOLLAR(conf, *p))))
+                || (conf->flag_dollarid && IS_DOLLAR(conf, *p))))
             return p;
         p++;
     }
diff --git a/crypto/conf/conf_err.c b/crypto/conf/conf_err.c
index 9f1309c507c5b..0dd42e0f43c75 100644
--- a/crypto/conf/conf_err.c
+++ b/crypto/conf/conf_err.c
@@ -15,51 +15,51 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA CONF_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_ERROR_LOADING_DSO), "error loading dso"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_INVALID_PRAGMA), "invalid pragma"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_LIST_CANNOT_BE_NULL),
-    "list cannot be null"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MANDATORY_BRACES_IN_VARIABLE_EXPANSION),
-    "mandatory braces in variable expansion"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MISSING_CLOSE_SQUARE_BRACKET),
-    "missing close square bracket"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MISSING_EQUAL_SIGN),
-    "missing equal sign"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MISSING_INIT_FUNCTION),
-    "missing init function"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MODULE_INITIALIZATION_ERROR),
-    "module initialization error"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_CLOSE_BRACE), "no close brace"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_CONF), "no conf"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE),
-    "no conf or environment variable"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_SECTION), "no section"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_SUCH_FILE), "no such file"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_VALUE), "no value"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NUMBER_TOO_LARGE), "number too large"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION),
-    "openssl conf references missing section"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RECURSIVE_DIRECTORY_INCLUDE),
-    "recursive directory include"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RECURSIVE_SECTION_REFERENCE),
-    "recursive section reference"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RELATIVE_PATH), "relative path"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_COMMAND_SECTION_EMPTY),
-    "ssl command section empty"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_COMMAND_SECTION_NOT_FOUND),
-    "ssl command section not found"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_SECTION_EMPTY), "ssl section empty"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_SECTION_NOT_FOUND),
-    "ssl section not found"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_UNABLE_TO_CREATE_NEW_SECTION),
-    "unable to create new section"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_UNKNOWN_MODULE_NAME),
-    "unknown module name"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_VARIABLE_EXPANSION_TOO_LONG),
-    "variable expansion too long"},
-    {ERR_PACK(ERR_LIB_CONF, 0, CONF_R_VARIABLE_HAS_NO_VALUE),
-    "variable has no value"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_ERROR_LOADING_DSO), "error loading dso" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_INVALID_PRAGMA), "invalid pragma" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_LIST_CANNOT_BE_NULL),
+        "list cannot be null" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MANDATORY_BRACES_IN_VARIABLE_EXPANSION),
+        "mandatory braces in variable expansion" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MISSING_CLOSE_SQUARE_BRACKET),
+        "missing close square bracket" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MISSING_EQUAL_SIGN),
+        "missing equal sign" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MISSING_INIT_FUNCTION),
+        "missing init function" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_MODULE_INITIALIZATION_ERROR),
+        "module initialization error" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_CLOSE_BRACE), "no close brace" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_CONF), "no conf" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE),
+        "no conf or environment variable" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_SECTION), "no section" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_SUCH_FILE), "no such file" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NO_VALUE), "no value" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_NUMBER_TOO_LARGE), "number too large" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION),
+        "openssl conf references missing section" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RECURSIVE_DIRECTORY_INCLUDE),
+        "recursive directory include" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RECURSIVE_SECTION_REFERENCE),
+        "recursive section reference" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_RELATIVE_PATH), "relative path" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_COMMAND_SECTION_EMPTY),
+        "ssl command section empty" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_COMMAND_SECTION_NOT_FOUND),
+        "ssl command section not found" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_SECTION_EMPTY), "ssl section empty" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_SSL_SECTION_NOT_FOUND),
+        "ssl section not found" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_UNABLE_TO_CREATE_NEW_SECTION),
+        "unable to create new section" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_UNKNOWN_MODULE_NAME),
+        "unknown module name" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_VARIABLE_EXPANSION_TOO_LONG),
+        "variable expansion too long" },
+    { ERR_PACK(ERR_LIB_CONF, 0, CONF_R_VARIABLE_HAS_NO_VALUE),
+        "variable has no value" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
index a8b41b66a2e20..6efd95283e9ed 100644
--- a/crypto/conf/conf_lib.c
+++ b/crypto/conf/conf_lib.c
@@ -44,7 +44,7 @@ int CONF_set_default_method(CONF_METHOD *meth)
 }
 
 LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
-                                long *eline)
+    long *eline)
 {
     LHASH_OF(CONF_VALUE) *ltmp;
     BIO *in = NULL;
@@ -67,7 +67,7 @@ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
 
 #ifndef OPENSSL_NO_STDIO
 LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
-                                   long *eline)
+    long *eline)
 {
     BIO *btmp;
     LHASH_OF(CONF_VALUE) *ltmp;
@@ -82,7 +82,7 @@ LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
 #endif
 
 LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
-                                    long *eline)
+    long *eline)
 {
     CONF ctmp;
     int ret;
@@ -96,7 +96,7 @@ LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
 }
 
 STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
-                                       const char *section)
+    const char *section)
 {
     if (conf == NULL) {
         return NULL;
@@ -109,7 +109,7 @@ STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
 }
 
 char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
-                      const char *name)
+    const char *name)
 {
     if (conf == NULL) {
         return NCONF_get_string(NULL, group, name);
@@ -122,7 +122,7 @@ char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
 }
 
 long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,
-                     const char *name)
+    const char *name)
 {
     int status;
     long result = 0;
@@ -314,7 +314,7 @@ char *NCONF_get_string(const CONF *conf, const char *group, const char *name)
         return NULL;
     }
     ERR_raise_data(ERR_LIB_CONF, CONF_R_NO_VALUE,
-                   "group=%s name=%s", group, name);
+        "group=%s name=%s", group, name);
     return NULL;
 }
 
@@ -329,7 +329,7 @@ static int default_to_int(const CONF *conf, char c)
 }
 
 int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
-                       long *result)
+    long *result)
 {
     char *str;
     long res;
@@ -367,7 +367,7 @@ int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
 }
 
 long _CONF_get_number(const CONF *conf, const char *section,
-                      const char *name)
+    const char *name)
 {
     int status;
     long result = 0;
@@ -420,7 +420,6 @@ OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void)
     return ret;
 }
 
-
 #ifndef OPENSSL_NO_STDIO
 /*
  * If CRYPTO_set_mem_functions is called after this, then
@@ -429,7 +428,7 @@ OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void)
  * strdup & free instead of OPENSSL_strdup & OPENSSL_free.
  */
 int OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings,
-                                     const char *filename)
+    const char *filename)
 {
     char *newfilename = NULL;
 
@@ -446,7 +445,7 @@ int OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings,
 }
 
 void OPENSSL_INIT_set_config_file_flags(OPENSSL_INIT_SETTINGS *settings,
-                                        unsigned long flags)
+    unsigned long flags)
 {
     settings->flags = flags;
 }
@@ -458,7 +457,7 @@ void OPENSSL_INIT_set_config_file_flags(OPENSSL_INIT_SETTINGS *settings,
  * strdup & free instead of OPENSSL_strdup & OPENSSL_free.
  */
 int OPENSSL_INIT_set_config_appname(OPENSSL_INIT_SETTINGS *settings,
-                                    const char *appname)
+    const char *appname)
 {
     char *newappname = NULL;
 
diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index 9d49a5f69d109..adc0c5f369698 100644
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -73,15 +73,15 @@ static CRYPTO_ONCE load_builtin_modules = CRYPTO_ONCE_STATIC_INIT;
 static void module_free(CONF_MODULE *md);
 static void module_finish(CONF_IMODULE *imod);
 static int module_run(const CONF *cnf, const char *name, const char *value,
-                      unsigned long flags);
+    unsigned long flags);
 static CONF_MODULE *module_add(DSO *dso, const char *name,
-                               conf_init_func *ifunc,
-                               conf_finish_func *ffunc);
+    conf_init_func *ifunc,
+    conf_finish_func *ffunc);
 static CONF_MODULE *module_find(const char *name);
 static int module_init(CONF_MODULE *pmod, const char *name, const char *value,
-                       const CONF *cnf);
+    const CONF *cnf);
 static CONF_MODULE *module_load_dso(const CONF *cnf, const char *name,
-                                    const char *value);
+    const char *value);
 
 static int conf_modules_finish_int(void);
 
@@ -126,7 +126,7 @@ static int conf_diagnostics(const CONF *cnf)
 /* Main function: load modules from a CONF structure */
 
 int CONF_modules_load(const CONF *cnf, const char *appname,
-                      unsigned long flags)
+    unsigned long flags)
 {
     STACK_OF(CONF_VALUE) *values;
     CONF_VALUE *vl;
@@ -138,9 +138,9 @@ int CONF_modules_load(const CONF *cnf, const char *appname,
 
     if (conf_diagnostics(cnf))
         flags &= ~(CONF_MFLAGS_IGNORE_ERRORS
-                   | CONF_MFLAGS_IGNORE_RETURN_CODES
-                   | CONF_MFLAGS_SILENT
-                   | CONF_MFLAGS_IGNORE_MISSING_FILE);
+            | CONF_MFLAGS_IGNORE_RETURN_CODES
+            | CONF_MFLAGS_SILENT
+            | CONF_MFLAGS_IGNORE_MISSING_FILE);
 
     ERR_set_mark();
     if (appname)
@@ -161,8 +161,8 @@ int CONF_modules_load(const CONF *cnf, const char *appname,
         if (!(flags & CONF_MFLAGS_SILENT)) {
             ERR_clear_last_mark();
             ERR_raise_data(ERR_LIB_CONF,
-                           CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION,
-                           "openssl_conf=%s", vsection);
+                CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION,
+                "openssl_conf=%s", vsection);
         } else {
             ERR_pop_to_mark();
         }
@@ -175,7 +175,7 @@ int CONF_modules_load(const CONF *cnf, const char *appname,
         ERR_set_mark();
         ret = module_run(cnf, vl->name, vl->value, flags);
         OSSL_TRACE3(CONF, "Running module %s (%s) returned %d\n",
-                    vl->name, vl->value, ret);
+            vl->name, vl->value, ret);
         if (ret <= 0)
             if (!(flags & CONF_MFLAGS_IGNORE_ERRORS)) {
                 ERR_clear_last_mark();
@@ -185,11 +185,10 @@ int CONF_modules_load(const CONF *cnf, const char *appname,
     }
 
     return 1;
-
 }
 
 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)
 {
     char *file = NULL;
     CONF *conf = NULL;
@@ -215,8 +214,7 @@ int CONF_modules_load_file_ex(OSSL_LIB_CTX *libctx, const char *filename,
         goto err;
 
     if (NCONF_load(conf, file, NULL) <= 0) {
-        if ((flags & CONF_MFLAGS_IGNORE_MISSING_FILE) &&
-            (ERR_GET_REASON(ERR_peek_last_error()) == CONF_R_NO_SUCH_FILE)) {
+        if ((flags & CONF_MFLAGS_IGNORE_MISSING_FILE) && (ERR_GET_REASON(ERR_peek_last_error()) == CONF_R_NO_SUCH_FILE)) {
             ret = 1;
         }
         goto err;
@@ -226,7 +224,7 @@ int CONF_modules_load_file_ex(OSSL_LIB_CTX *libctx, const char *filename,
     /* CONF_modules_load() might change the diagnostics setting, reread it. */
     diagnostics = OSSL_LIB_CTX_get_conf_diagnostics(libctx);
 
- err:
+err:
     if (filename == NULL)
         OPENSSL_free(file);
     NCONF_free(conf);
@@ -243,7 +241,7 @@ int CONF_modules_load_file_ex(OSSL_LIB_CTX *libctx, const char *filename,
 }
 
 int CONF_modules_load_file(const char *filename,
-                           const char *appname, unsigned long flags)
+    const char *appname, unsigned long flags)
 {
     return CONF_modules_load_file_ex(NULL, filename, appname, flags);
 }
@@ -259,7 +257,7 @@ DEFINE_RUN_ONCE_STATIC(do_load_builtin_modules)
 }
 
 static int module_run(const CONF *cnf, const char *name, const char *value,
-                      unsigned long flags)
+    unsigned long flags)
 {
     CONF_MODULE *md;
     int ret;
@@ -276,7 +274,7 @@ static int module_run(const CONF *cnf, const char *name, const char *value,
     if (!md) {
         if (!(flags & CONF_MFLAGS_SILENT)) {
             ERR_raise_data(ERR_LIB_CONF, CONF_R_UNKNOWN_MODULE_NAME,
-                           "module=%s", name);
+                "module=%s", name);
         }
         return -1;
     }
@@ -286,8 +284,8 @@ static int module_run(const CONF *cnf, const char *name, const char *value,
     if (ret <= 0) {
         if (!(flags & CONF_MFLAGS_SILENT))
             ERR_raise_data(ERR_LIB_CONF, CONF_R_MODULE_INITIALIZATION_ERROR,
-                           "module=%s, value=%s retcode=%-8d",
-                           name, value, ret);
+                "module=%s, value=%s retcode=%-8d",
+                name, value, ret);
     }
 
     return ret;
@@ -295,7 +293,7 @@ static int module_run(const CONF *cnf, const char *name, const char *value,
 
 /* Load a module from a DSO */
 static CONF_MODULE *module_load_dso(const CONF *cnf,
-                                    const char *name, const char *value)
+    const char *name, const char *value)
 {
     DSO *dso = NULL;
     conf_init_func *ifunc;
@@ -328,7 +326,7 @@ static CONF_MODULE *module_load_dso(const CONF *cnf,
 
     return md;
 
- err:
+err:
     DSO_free(dso);
     ERR_raise_data(ERR_LIB_CONF, errcode, "module=%s, path=%s", name, path);
     return NULL;
@@ -336,7 +334,7 @@ static CONF_MODULE *module_load_dso(const CONF *cnf,
 
 /* add module to list */
 static CONF_MODULE *module_add(DSO *dso, const char *name,
-                               conf_init_func *ifunc, conf_finish_func *ffunc)
+    conf_init_func *ifunc, conf_finish_func *ffunc)
 {
     CONF_MODULE *tmod = NULL;
     STACK_OF(CONF_MODULE) *old_modules;
@@ -377,7 +375,7 @@ static CONF_MODULE *module_add(DSO *dso, const char *name,
     sk_CONF_MODULE_free(old_modules);
     return tmod;
 
- err:
+err:
     ossl_rcu_write_unlock(module_list_lock);
     if (tmod != NULL) {
         OPENSSL_free(tmod->name);
@@ -427,7 +425,7 @@ static CONF_MODULE *module_find(const char *name)
 
 /* initialize a module */
 static int module_init(CONF_MODULE *pmod, const char *name, const char *value,
-                       const CONF *cnf)
+    const CONF *cnf)
 {
     int ret = 1;
     int init_called = 0;
@@ -490,13 +488,13 @@ static int module_init(CONF_MODULE *pmod, const char *name, const char *value,
     sk_CONF_IMODULE_free(old_modules);
     return ret;
 
- err:
+err:
 
     /* We've started the module so we'd better finish it */
     if (pmod->finish && init_called)
         pmod->finish(imod);
 
- memerr:
+memerr:
     if (imod) {
         OPENSSL_free(imod->name);
         OPENSSL_free(imod->value);
@@ -504,7 +502,6 @@ static int module_init(CONF_MODULE *pmod, const char *name, const char *value,
     }
 
     return -1;
-
 }
 
 /*
@@ -557,7 +554,6 @@ void CONF_modules_unload(int all)
     ossl_synchronize_rcu(module_list_lock);
     sk_CONF_MODULE_free(old_modules);
     sk_CONF_MODULE_pop_free(to_delete, module_free);
-
 }
 
 /* unload a single module */
@@ -620,7 +616,7 @@ static void module_finish(CONF_IMODULE *imod)
 /* Add a static module to OpenSSL */
 
 int CONF_module_add(const char *name, conf_init_func *ifunc,
-                    conf_finish_func *ffunc)
+    conf_finish_func *ffunc)
 {
     if (module_add(NULL, name, ifunc, ffunc))
         return 1;
@@ -725,8 +721,8 @@ 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)
 {
     int ret;
     const char *lstart, *tmpend, *p;
diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index 106434dcbf3d7..e0d661720664e 100644
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -17,7 +17,7 @@
 #include <openssl/engine.h>
 
 #if defined(_WIN32) && !defined(__BORLANDC__)
-# define strdup _strdup
+#define strdup _strdup
 #endif
 
 /*
@@ -63,12 +63,12 @@ int ossl_config_int(const OPENSSL_INIT_SETTINGS *settings)
 
 #ifdef OPENSSL_INIT_DEBUG
     fprintf(stderr, "OPENSSL_INIT: ossl_config_int(%s, %s, %lu)\n",
-            filename, appname, flags);
+        filename, appname, flags);
 #endif
 
 #ifndef OPENSSL_SYS_UEFI
     ret = CONF_modules_load_file_ex(OSSL_LIB_CTX_get0_global_default(),
-                                    filename, appname, flags);
+        filename, appname, flags);
 #else
     ret = 1;
 #endif
diff --git a/crypto/conf/conf_ssl.c b/crypto/conf/conf_ssl.c
index 84c5b2afe5818..c8796715c00e6 100644
--- a/crypto/conf/conf_ssl.c
+++ b/crypto/conf/conf_ssl.c
@@ -68,8 +68,7 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
     ssl_conf_section = CONF_imodule_get_value(md);
     cmd_lists = NCONF_get_section(cnf, ssl_conf_section);
     if (sk_CONF_VALUE_num(cmd_lists) <= 0) {
-        int rcode =
-            cmd_lists == NULL
+        int rcode = cmd_lists == NULL
             ? CONF_R_SSL_SECTION_NOT_FOUND
             : CONF_R_SSL_SECTION_EMPTY;
 
@@ -88,13 +87,12 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
         STACK_OF(CONF_VALUE) *cmds = NCONF_get_section(cnf, sect->value);
 
         if (sk_CONF_VALUE_num(cmds) <= 0) {
-            int rcode =
-                cmds == NULL
+            int rcode = cmds == NULL
                 ? CONF_R_SSL_COMMAND_SECTION_NOT_FOUND
                 : CONF_R_SSL_COMMAND_SECTION_EMPTY;
 
             ERR_raise_data(ERR_LIB_CONF, rcode,
-                           "name=%s, value=%s", sect->name, sect->value);
+                "name=%s, value=%s", sect->name, sect->value);
             goto err;
         }
         ssl_name->name = OPENSSL_strdup(sect->name);
@@ -121,10 +119,9 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
             if (cmd->cmd == NULL || cmd->arg == NULL)
                 goto err;
         }
-
     }
     rv = 1;
- err:
+err:
     if (rv == 0)
         ssl_module_free(md);
     return rv;
@@ -170,7 +167,7 @@ int conf_ssl_name_find(const char *name, size_t *idx)
  * argument is returned in |*arg|.
  */
 void conf_ssl_get_cmd(const SSL_CONF_CMD *cmd, size_t idx, char **cmdstr,
-                      char **arg)
+    char **arg)
 {
     *cmdstr = cmd[idx].cmd;
     *arg = cmd[idx].arg;
diff --git a/crypto/context.c b/crypto/context.c
index f15bc3d755e5c..1ae88e42aa919 100644
--- a/crypto/context.c
+++ b/crypto/context.c
@@ -219,7 +219,7 @@ static int context_init(OSSL_LIB_CTX *ctx)
 
     return 1;
 
- err:
+err:
     context_deinit_objs(ctx);
 
     if (exdata_done)
@@ -265,7 +265,6 @@ static void context_deinit_objs(OSSL_LIB_CTX *ctx)
         ctx->decoder_cache = NULL;
     }
 
-
     /* P2. We want encoder_store to be cleaned up before the provider store */
     if (ctx->encoder_store != NULL) {
         ossl_method_store_free(ctx->encoder_store);
@@ -363,7 +362,6 @@ static void context_deinit_objs(OSSL_LIB_CTX *ctx)
         ctx->comp_methods = NULL;
     }
 #endif
-
 }
 
 static int context_deinit(OSSL_LIB_CTX *ctx)
@@ -456,7 +454,7 @@ OSSL_LIB_CTX *OSSL_LIB_CTX_new(void)
 
 #ifndef FIPS_MODULE
 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 *ctx = OSSL_LIB_CTX_new();
 
@@ -472,7 +470,7 @@ OSSL_LIB_CTX *OSSL_LIB_CTX_new_from_dispatch(const OSSL_CORE_HANDLE *handle,
 }
 
 OSSL_LIB_CTX *OSSL_LIB_CTX_new_child(const OSSL_CORE_HANDLE *handle,
-                                     const OSSL_DISPATCH *in)
+    const OSSL_DISPATCH *in)
 {
     OSSL_LIB_CTX *ctx = OSSL_LIB_CTX_new_from_dispatch(handle, in);
 
diff --git a/crypto/core_algorithm.c b/crypto/core_algorithm.c
index 16055bad30224..8741067da2988 100644
--- a/crypto/core_algorithm.c
+++ b/crypto/core_algorithm.c
@@ -15,15 +15,15 @@
 
 struct algorithm_data_st {
     OSSL_LIB_CTX *libctx;
-    int operation_id;            /* May be zero for finding them all */
+    int operation_id; /* May be zero for finding them all */
     int (*pre)(OSSL_PROVIDER *, int operation_id, int no_store, void *data,
-               int *result);
+        int *result);
     int (*reserve_store)(int no_store, void *data);
     void (*fn)(OSSL_PROVIDER *, const OSSL_ALGORITHM *, int no_store,
-               void *data);
+        void *data);
     int (*unreserve_store)(void *data);
     int (*post)(OSSL_PROVIDER *, int operation_id, int no_store, void *data,
-                int *result);
+        int *result);
     void *data;
 };
 
@@ -40,7 +40,7 @@ struct algorithm_data_st {
  * 1 if successful so far, and adding should continue
  */
 static int algorithm_do_map(OSSL_PROVIDER *provider, const OSSL_ALGORITHM *map,
-                            int cur_operation, int no_store, void *cbdata)
+    int cur_operation, int no_store, void *cbdata)
 {
     struct algorithm_data_st *data = cbdata;
     int ret = 0;
@@ -54,7 +54,7 @@ static int algorithm_do_map(OSSL_PROVIDER *provider, const OSSL_ALGORITHM *map,
         /* If there is no pre-condition function, assume "yes" */
         ret = 1;
     } else if (!data->pre(provider, cur_operation, no_store, data->data,
-                          &ret)) {
+                   &ret)) {
         /* Error, bail out! */
         ret = -1;
         goto end;
@@ -82,12 +82,12 @@ static int algorithm_do_map(OSSL_PROVIDER *provider, const OSSL_ALGORITHM *map,
         /* If there is no post-condition function, assume "yes" */
         ret = 1;
     } else if (!data->post(provider, cur_operation, no_store, data->data,
-                           &ret)) {
+                   &ret)) {
         /* Error, bail out! */
         ret = -1;
     }
 
- end:
+end:
     data->unreserve_store(data->data);
 
     return ret;
@@ -111,14 +111,14 @@ static int algorithm_do_this(OSSL_PROVIDER *provider, void *cbdata)
         first_operation = last_operation = data->operation_id;
 
     for (cur_operation = first_operation;
-         cur_operation <= last_operation;
-         cur_operation++) {
-        int no_store = 0;        /* Assume caching is ok */
+        cur_operation <= last_operation;
+        cur_operation++) {
+        int no_store = 0; /* Assume caching is ok */
         const OSSL_ALGORITHM *map = NULL;
         int ret = 0;
 
         map = ossl_provider_query_operation(provider, cur_operation,
-                                            &no_store);
+            &no_store);
         ret = algorithm_do_map(provider, map, cur_operation, no_store, data);
         ossl_provider_unquery_operation(provider, cur_operation, map);
 
@@ -135,19 +135,21 @@ static int algorithm_do_this(OSSL_PROVIDER *provider, void *cbdata)
 }
 
 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)
 {
-    struct algorithm_data_st cbdata = { 0, };
+    struct algorithm_data_st cbdata = {
+        0,
+    };
 
     cbdata.libctx = libctx;
     cbdata.operation_id = operation_id;
@@ -169,7 +171,7 @@ void ossl_algorithm_do_all(OSSL_LIB_CTX *libctx, int operation_id,
          * a programming error in the functions up the call stack.
          */
         if (!ossl_assert(ossl_lib_ctx_get_concrete(libctx)
-                         == ossl_lib_ctx_get_concrete(libctx2)))
+                == ossl_lib_ctx_get_concrete(libctx2)))
             return;
 
         cbdata.libctx = libctx2;
diff --git a/crypto/core_fetch.c b/crypto/core_fetch.c
index a0ab97b105795..3293f70372d80 100644
--- a/crypto/core_fetch.c
+++ b/crypto/core_fetch.c
@@ -58,8 +58,8 @@ static int ossl_method_construct_unreserve_store(void *cbdata)
 }
 
 static int ossl_method_construct_precondition(OSSL_PROVIDER *provider,
-                                              int operation_id, int no_store,
-                                              void *cbdata, int *result)
+    int operation_id, int no_store,
+    void *cbdata, int *result)
 {
     if (!ossl_assert(result != NULL)) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -85,8 +85,8 @@ static int ossl_method_construct_precondition(OSSL_PROVIDER *provider,
 }
 
 static int ossl_method_construct_postcondition(OSSL_PROVIDER *provider,
-                                               int operation_id, int no_store,
-                                               void *cbdata, int *result)
+    int operation_id, int no_store,
+    void *cbdata, int *result)
 {
     if (!ossl_assert(result != NULL)) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -101,8 +101,8 @@ static int ossl_method_construct_postcondition(OSSL_PROVIDER *provider,
 }
 
 static void ossl_method_construct_this(OSSL_PROVIDER *provider,
-                                       const OSSL_ALGORITHM *algo,
-                                       int no_store, void *cbdata)
+    const OSSL_ALGORITHM *algo,
+    int no_store, void *cbdata)
 {
     struct construct_data_st *data = cbdata;
     void *method = NULL;
@@ -112,8 +112,8 @@ static void ossl_method_construct_this(OSSL_PROVIDER *provider,
         return;
 
     OSSL_TRACE2(QUERY,
-                "ossl_method_construct_this: putting an algo to the store %p with no_store %d\n",
-                (void *)data->store, no_store);
+        "ossl_method_construct_this: putting an algo to the store %p with no_store %d\n",
+        (void *)data->store, no_store);
     /*
      * Note regarding putting the method in stores:
      *
@@ -125,15 +125,15 @@ static void ossl_method_construct_this(OSSL_PROVIDER *provider,
      * of the passed method.
      */
     data->mcm->put(no_store ? data->store : NULL, method, provider, algo->algorithm_names,
-                   algo->property_definition, data->mcm_data);
+        algo->property_definition, data->mcm_data);
 
     /* refcnt-- because we're dropping the reference */
     data->mcm->destruct(method, data->mcm_data);
 }
 
 void *ossl_method_construct(OSSL_LIB_CTX *libctx, int operation_id,
-                            OSSL_PROVIDER **provider_rw, int force_store,
-                            OSSL_METHOD_CONSTRUCT_METHOD *mcm, void *mcm_data)
+    OSSL_PROVIDER **provider_rw, int force_store,
+    OSSL_METHOD_CONSTRUCT_METHOD *mcm, void *mcm_data)
 {
     void *method = NULL;
     OSSL_PROVIDER *provider = provider_rw != NULL ? *provider_rw : NULL;
@@ -155,17 +155,17 @@ void *ossl_method_construct(OSSL_LIB_CTX *libctx, int operation_id,
     cbdata.mcm = mcm;
     cbdata.mcm_data = mcm_data;
     ossl_algorithm_do_all(libctx, operation_id, provider,
-                          ossl_method_construct_precondition,
-                          ossl_method_construct_reserve_store,
-                          ossl_method_construct_this,
-                          ossl_method_construct_unreserve_store,
-                          ossl_method_construct_postcondition,
-                          &cbdata);
+        ossl_method_construct_precondition,
+        ossl_method_construct_reserve_store,
+        ossl_method_construct_this,
+        ossl_method_construct_unreserve_store,
+        ossl_method_construct_postcondition,
+        &cbdata);
 
     /* If there is a temporary store, try there first */
     if (cbdata.store != NULL)
         method = mcm->get(cbdata.store, (const OSSL_PROVIDER **)provider_rw,
-                          mcm_data);
+            mcm_data);
 
     /* If no method was found yet, try the global store */
     if (method == NULL)
diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c
index f36f070fa2abc..8e646c3bcc41e 100644
--- a/crypto/core_namemap.c
+++ b/crypto/core_namemap.c
@@ -13,7 +13,7 @@
 #include "internal/sizes.h"
 #include "crypto/context.h"
 
-#define NAMEMAP_HT_BUCKETS 2048
+#define NAMEMAP_HT_BUCKETS 512
 
 HT_START_KEY_DEFN(namenum_key)
 HT_DEF_KEY_FIELD_CHAR_ARRAY(name, 64)
@@ -30,14 +30,14 @@ DEFINE_STACK_OF(NAMES)
 
 struct ossl_namemap_st {
     /* Flags */
-    unsigned int stored:1; /* If 1, it's stored in a library context */
+    unsigned int stored : 1; /* If 1, it's stored in a library context */
 
-    HT *namenum_ht;        /* Name->number mapping */
+    HT *namenum_ht; /* Name->number mapping */
 
     CRYPTO_RWLOCK *lock;
     STACK_OF(NAMES) *numnames;
 
-    TSAN_QUALIFIER int max_number;     /* Current max number */
+    TSAN_QUALIFIER int max_number; /* Current max number */
 };
 
 static void name_string_free(char *name)
@@ -104,8 +104,8 @@ int ossl_namemap_empty(OSSL_NAMEMAP *namemap)
  * return value of 0 means that the callback was not called for any names.
  */
 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)
 {
     int i;
     NAMES *names;
@@ -164,7 +164,7 @@ 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)
 {
     int number = 0;
     HT_VALUE *val;
@@ -191,7 +191,7 @@ int ossl_namemap_name2num_n(const OSSL_NAMEMAP *namemap,
 }
 
 const char *ossl_namemap_num2name(const OSSL_NAMEMAP *namemap, int number,
-                                  size_t idx)
+    size_t idx)
 {
     NAMES *names;
     const char *ret = NULL;
@@ -213,7 +213,7 @@ const char *ossl_namemap_num2name(const OSSL_NAMEMAP *namemap, int number,
 
 /* This function is not thread safe, the namemap must be locked */
 static int numname_insert(OSSL_NAMEMAP *namemap, int number,
-                          const char *name)
+    const char *name)
 {
     NAMES *names;
     char *tmpname;
@@ -245,7 +245,7 @@ static int numname_insert(OSSL_NAMEMAP *namemap, int number,
     }
     return number;
 
- err:
+err:
     if (number <= 0)
         sk_OPENSSL_STRING_pop_free(names, name_string_free);
     OPENSSL_free(tmpname);
@@ -254,7 +254,7 @@ static int numname_insert(OSSL_NAMEMAP *namemap, int number,
 
 /* This function is not thread safe, the namemap must be locked */
 static int namemap_add_name(OSSL_NAMEMAP *namemap, int number,
-                            const char *name)
+    const char *name)
 {
     int ret;
     HT_VALUE val = { 0 };
@@ -285,7 +285,7 @@ static int namemap_add_name(OSSL_NAMEMAP *namemap, int number,
 }
 
 int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number,
-                          const char *name)
+    const char *name)
 {
     int tmp_number;
 
@@ -305,7 +305,7 @@ int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number,
 }
 
 int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
-                           const char *names, const char separator)
+    const char *names, const char separator)
 {
     char *tmp, *p, *q, *endp;
 
@@ -331,10 +331,10 @@ int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
         size_t l;
 
         if ((q = strchr(p, separator)) == NULL) {
-            l = strlen(p);       /* offset to \0 */
+            l = strlen(p); /* offset to \0 */
             q = p + l;
         } else {
-            l = q - p;           /* offset to the next separator */
+            l = q - p; /* offset to the next separator */
             *q++ = '\0';
         }
 
@@ -350,8 +350,8 @@ int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
             number = this_number;
         } else if (this_number != 0 && this_number != number) {
             ERR_raise_data(ERR_LIB_CRYPTO, CRYPTO_R_CONFLICTING_NAMES,
-                           "\"%s\" has an existing different identity %d (from \"%s\")",
-                           p, this_number, names);
+                "\"%s\" has an existing different identity %d (from \"%s\")",
+                p, this_number, names);
             number = 0;
             goto end;
         }
@@ -369,14 +369,14 @@ int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
             number = this_number;
         } else if (this_number != number) {
             ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
-                           "Got number %d when expecting %d",
-                           this_number, number);
+                "Got number %d when expecting %d",
+                this_number, number);
             number = 0;
             goto end;
         }
     }
 
- end:
+end:
     CRYPTO_THREAD_unlock(namemap->lock);
     OPENSSL_free(tmp);
     return number;
@@ -392,7 +392,7 @@ int ossl_namemap_add_names(OSSL_NAMEMAP *namemap, int number,
 
 /* Creates an initial namemap with names found in the legacy method db */
 static void get_legacy_evp_names(int base_nid, int nid, const char *pem_name,
-                                 void *arg)
+    void *arg)
 {
     int num = 0;
     ASN1_OBJECT *obj;
@@ -433,7 +433,7 @@ static void get_legacy_md_names(const OBJ_NAME *on, void *arg)
 }
 
 static void get_legacy_pkey_meth_names(const EVP_PKEY_ASN1_METHOD *ameth,
-                                       void *arg)
+    void *arg)
 {
     int nid = 0, base_nid = 0, flags = 0;
     const char *pem_name = NULL;
@@ -482,8 +482,7 @@ OSSL_NAMEMAP *ossl_namemap_stored(OSSL_LIB_CTX *libctx)
 #ifndef FIPS_MODULE
     int nms;
 #endif
-    OSSL_NAMEMAP *namemap =
-        ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_NAMEMAP_INDEX);
+    OSSL_NAMEMAP *namemap = ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_NAMEMAP_INDEX);
 
     if (namemap == NULL)
         return NULL;
@@ -502,12 +501,13 @@ OSSL_NAMEMAP *ossl_namemap_stored(OSSL_LIB_CTX *libctx)
 
         /* Before pilfering, we make sure the legacy database is populated */
         OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
-                            | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
+                | OPENSSL_INIT_ADD_ALL_DIGESTS,
+            NULL);
 
         OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH,
-                        get_legacy_cipher_names, namemap);
+            get_legacy_cipher_names, namemap);
         OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH,
-                        get_legacy_md_names, namemap);
+            get_legacy_md_names, namemap);
 
         /* We also pilfer data from the legacy EVP_PKEY_ASN1_METHODs */
         for (i = 0, end = EVP_PKEY_asn1_get_count(); i < end; i++)
@@ -539,7 +539,7 @@ OSSL_NAMEMAP *ossl_namemap_new(OSSL_LIB_CTX *libctx)
 
     return namemap;
 
- err:
+err:
     ossl_namemap_free(namemap);
     return NULL;
 }
diff --git a/crypto/cpt_err.c b/crypto/cpt_err.c
index bbcad8e51d2d5..e102782978bb3 100644
--- a/crypto/cpt_err.c
+++ b/crypto/cpt_err.c
@@ -15,66 +15,66 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA CRYPTO_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_BAD_ALGORITHM_NAME),
-    "bad algorithm name"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_CONFLICTING_NAMES),
-    "conflicting names"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_HEX_STRING_TOO_SHORT),
-    "hex string too short"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_ILLEGAL_HEX_DIGIT),
-    "illegal hex digit"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INSUFFICIENT_DATA_SPACE),
-    "insufficient data space"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INSUFFICIENT_PARAM_SIZE),
-    "insufficient param size"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INSUFFICIENT_SECURE_DATA_SPACE),
-    "insufficient secure data space"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INTEGER_OVERFLOW),
-    "integer overflow"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INVALID_NEGATIVE_VALUE),
-    "invalid negative value"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INVALID_NULL_ARGUMENT),
-    "invalid null argument"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INVALID_OSSL_PARAM_TYPE),
-    "invalid ossl param type"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_NO_PARAMS_TO_MERGE),
-    "no params to merge"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_NO_SPACE_FOR_TERMINATING_NULL),
-    "no space for terminating null"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_ODD_NUMBER_OF_DIGITS),
-    "odd number of digits"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_CANNOT_BE_REPRESENTED_EXACTLY),
-    "param cannot be represented exactly"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_NOT_INTEGER_TYPE),
-    "param not integer type"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_OF_INCOMPATIBLE_TYPE),
-    "param of incompatible type"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_UNSIGNED_INTEGER_NEGATIVE_VALUE_UNSUPPORTED),
-    "param unsigned integer negative value unsupported"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_UNSUPPORTED_FLOATING_POINT_FORMAT),
-    "param unsupported floating point format"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_VALUE_TOO_LARGE_FOR_DESTINATION),
-    "param value too large for destination"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PROVIDER_ALREADY_EXISTS),
-    "provider already exists"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PROVIDER_SECTION_ERROR),
-    "provider section error"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_RANDOM_SECTION_ERROR),
-    "random section error"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_SECURE_MALLOC_FAILURE),
-    "secure malloc failure"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_STRING_TOO_LONG), "string too long"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_MANY_BYTES), "too many bytes"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_MANY_NAMES), "too many names"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_MANY_RECORDS),
-    "too many records"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_SMALL_BUFFER),
-    "too small buffer"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_UNKNOWN_NAME_IN_RANDOM_SECTION),
-    "unknown name in random section"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_ZERO_LENGTH_NUMBER),
-    "zero length number"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_BAD_ALGORITHM_NAME),
+        "bad algorithm name" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_CONFLICTING_NAMES),
+        "conflicting names" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_HEX_STRING_TOO_SHORT),
+        "hex string too short" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_ILLEGAL_HEX_DIGIT),
+        "illegal hex digit" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INSUFFICIENT_DATA_SPACE),
+        "insufficient data space" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INSUFFICIENT_PARAM_SIZE),
+        "insufficient param size" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INSUFFICIENT_SECURE_DATA_SPACE),
+        "insufficient secure data space" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INTEGER_OVERFLOW),
+        "integer overflow" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INVALID_NEGATIVE_VALUE),
+        "invalid negative value" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INVALID_NULL_ARGUMENT),
+        "invalid null argument" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_INVALID_OSSL_PARAM_TYPE),
+        "invalid ossl param type" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_NO_PARAMS_TO_MERGE),
+        "no params to merge" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_NO_SPACE_FOR_TERMINATING_NULL),
+        "no space for terminating null" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_ODD_NUMBER_OF_DIGITS),
+        "odd number of digits" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_CANNOT_BE_REPRESENTED_EXACTLY),
+        "param cannot be represented exactly" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_NOT_INTEGER_TYPE),
+        "param not integer type" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_OF_INCOMPATIBLE_TYPE),
+        "param of incompatible type" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_UNSIGNED_INTEGER_NEGATIVE_VALUE_UNSUPPORTED),
+        "param unsigned integer negative value unsupported" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_UNSUPPORTED_FLOATING_POINT_FORMAT),
+        "param unsupported floating point format" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PARAM_VALUE_TOO_LARGE_FOR_DESTINATION),
+        "param value too large for destination" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PROVIDER_ALREADY_EXISTS),
+        "provider already exists" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PROVIDER_SECTION_ERROR),
+        "provider section error" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_RANDOM_SECTION_ERROR),
+        "random section error" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_SECURE_MALLOC_FAILURE),
+        "secure malloc failure" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_STRING_TOO_LONG), "string too long" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_MANY_BYTES), "too many bytes" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_MANY_NAMES), "too many names" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_MANY_RECORDS),
+        "too many records" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_TOO_SMALL_BUFFER),
+        "too small buffer" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_UNKNOWN_NAME_IN_RANDOM_SECTION),
+        "unknown name in random section" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_ZERO_LENGTH_NUMBER),
+        "zero length number" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/cpuid.c b/crypto/cpuid.c
index 538a5a039f20d..d659135919d1f 100644
--- a/crypto/cpuid.c
+++ b/crypto/cpuid.c
@@ -10,13 +10,11 @@
 #include "internal/e_os.h"
 #include "crypto/cryptlib.h"
 
-#if     defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
-        defined(__x86_64) || defined(__x86_64__) || \
-        defined(_M_AMD64) || defined(_M_X64)
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
 
 extern unsigned int OPENSSL_ia32cap_P[OPENSSL_IA32CAP_P_MAX_INDEXES];
 
-# if defined(OPENSSL_CPUID_OBJ)
+#if defined(OPENSSL_CPUID_OBJ)
 
 /*
  * Purpose of these minimalistic and character-type-agnostic subroutines
@@ -27,9 +25,9 @@ extern unsigned int OPENSSL_ia32cap_P[OPENSSL_IA32CAP_P_MAX_INDEXES];
  * between the sets, while the rest would be simply rejected by ossl_is*
  * subroutines.
  */
-#  ifdef _WIN32
+#ifdef _WIN32
 typedef WCHAR variant_char;
-#   define OPENSSL_IA32CAP_P_MAX_CHAR_SIZE 256
+#define OPENSSL_IA32CAP_P_MAX_CHAR_SIZE 256
 static variant_char *ossl_getenv(const char *name)
 {
     /*
@@ -42,12 +40,12 @@ static variant_char *ossl_getenv(const char *name)
 
     return (len > 0 && len < OPENSSL_IA32CAP_P_MAX_CHAR_SIZE) ? value : NULL;
 }
-#  else
+#else
 typedef char variant_char;
-#   define ossl_getenv getenv
-#  endif
+#define ossl_getenv getenv
+#endif
 
-#  include "crypto/ctype.h"
+#include "crypto/ctype.h"
 
 static int todigit(variant_char c)
 {
@@ -78,7 +76,8 @@ static uint64_t ossl_strtouint64(const variant_char *str)
 }
 
 static variant_char *ossl_strchr(const variant_char *str, char srch)
-{   variant_char c;
+{
+    variant_char c;
 
     while ((c = *str)) {
         if (c == srch)
@@ -89,7 +88,7 @@ static variant_char *ossl_strchr(const variant_char *str, char srch)
     return NULL;
 }
 
-#  define OPENSSL_CPUID_SETUP
+#define OPENSSL_CPUID_SETUP
 typedef uint64_t IA32CAP;
 
 void OPENSSL_cpuid_setup(void)
@@ -112,7 +111,7 @@ void OPENSSL_cpuid_setup(void)
         if (off) {
             IA32CAP mask = vec;
             vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P) & ~mask;
-            if (mask & (1<<24)) {
+            if (mask & (1 << 24)) {
                 /*
                  * User disables FXSR bit, mask even other capabilities
                  * that operate exclusively on XMM, so we don't have to
@@ -121,7 +120,7 @@ void OPENSSL_cpuid_setup(void)
                  * do it in x86_64 case, but we can safely assume that
                  * x86_64 users won't actually flip this flag.
                  */
-                vec &= ~((IA32CAP)(1<<1|1<<11|1<<25|1<<28) << 32);
+                vec &= ~((IA32CAP)(1 << 1 | 1 << 11 | 1 << 25 | 1 << 28) << 32);
             }
         } else if (env[0] == ':') {
             vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P);
@@ -146,7 +145,7 @@ void OPENSSL_cpuid_setup(void)
                         OPENSSL_ia32cap_P[index + 1] = (unsigned int)(vecx >> 32);
                     }
                 }
-                /* skip delimeter */
+                /* skip delimiter */
                 if ((env = ossl_strchr(env, ':')) != NULL)
                     env++;
             } else { /* zeroize the next two indexes */
@@ -170,17 +169,17 @@ void OPENSSL_cpuid_setup(void)
     OPENSSL_ia32cap_P[0] = (unsigned int)vec | (1 << 10);
     OPENSSL_ia32cap_P[1] = (unsigned int)(vec >> 32);
 }
-# else
+#else
 unsigned int OPENSSL_ia32cap_P[OPENSSL_IA32CAP_P_MAX_INDEXES];
-# endif
+#endif
 #endif
 
 #ifndef OPENSSL_CPUID_OBJ
-# ifndef OPENSSL_CPUID_SETUP
+#ifndef OPENSSL_CPUID_SETUP
 void OPENSSL_cpuid_setup(void)
 {
 }
-# endif
+#endif
 
 /*
  * The rest are functions that are defined in the same assembler files as
@@ -195,7 +194,7 @@ void OPENSSL_cpuid_setup(void)
  *
  * There are also assembler versions of this function.
  */
-# undef CRYPTO_memcmp
+#undef CRYPTO_memcmp
 int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)
 {
     size_t i;
diff --git a/crypto/crmf/crmf_asn.c b/crypto/crmf/crmf_asn.c
index a4a0ff1b172d4..75ab71b1eb5a6 100644
--- a/crypto/crmf/crmf_asn.c
+++ b/crypto/crmf/crmf_asn.c
@@ -28,16 +28,16 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_PRIVATEKEYINFO)
 
 ASN1_CHOICE(OSSL_CRMF_ENCKEYWITHID_IDENTIFIER) = {
     ASN1_SIMPLE(OSSL_CRMF_ENCKEYWITHID_IDENTIFIER,
-                value.string, ASN1_UTF8STRING),
+        value.string, ASN1_UTF8STRING),
     ASN1_SIMPLE(OSSL_CRMF_ENCKEYWITHID_IDENTIFIER,
-                value.generalName, GENERAL_NAME)
+        value.generalName, GENERAL_NAME)
 } ASN1_CHOICE_END(OSSL_CRMF_ENCKEYWITHID_IDENTIFIER)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_ENCKEYWITHID_IDENTIFIER)
 
 ASN1_SEQUENCE(OSSL_CRMF_ENCKEYWITHID) = {
     ASN1_SIMPLE(OSSL_CRMF_ENCKEYWITHID, privateKey, OSSL_CRMF_PRIVATEKEYINFO),
     ASN1_OPT(OSSL_CRMF_ENCKEYWITHID, identifier,
-             OSSL_CRMF_ENCKEYWITHID_IDENTIFIER)
+        OSSL_CRMF_ENCKEYWITHID_IDENTIFIER)
 } ASN1_SEQUENCE_END(OSSL_CRMF_ENCKEYWITHID)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_ENCKEYWITHID)
 
@@ -82,7 +82,7 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_SINGLEPUBINFO)
 ASN1_SEQUENCE(OSSL_CRMF_PKIPUBLICATIONINFO) = {
     ASN1_SIMPLE(OSSL_CRMF_PKIPUBLICATIONINFO, action, ASN1_INTEGER),
     ASN1_SEQUENCE_OF_OPT(OSSL_CRMF_PKIPUBLICATIONINFO, pubInfos,
-                         OSSL_CRMF_SINGLEPUBINFO)
+        OSSL_CRMF_SINGLEPUBINFO)
 } ASN1_SEQUENCE_END(OSSL_CRMF_PKIPUBLICATIONINFO)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_PKIPUBLICATIONINFO)
 IMPLEMENT_ASN1_DUP_FUNCTION(OSSL_CRMF_PKIPUBLICATIONINFO)
@@ -113,22 +113,22 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_PBMPARAMETER)
 
 ASN1_CHOICE(OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO) = {
     ASN1_EXP(OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO, value.sender,
-             GENERAL_NAME, 0),
+        GENERAL_NAME, 0),
     ASN1_SIMPLE(OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO, value.publicKeyMAC,
-                OSSL_CRMF_PKMACVALUE)
+        OSSL_CRMF_PKMACVALUE)
 } ASN1_CHOICE_END(OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO)
 
 ASN1_SEQUENCE(OSSL_CRMF_POPOSIGNINGKEYINPUT) = {
     ASN1_SIMPLE(OSSL_CRMF_POPOSIGNINGKEYINPUT, authInfo,
-                OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO),
+        OSSL_CRMF_POPOSIGNINGKEYINPUT_AUTHINFO),
     ASN1_SIMPLE(OSSL_CRMF_POPOSIGNINGKEYINPUT, publicKey, X509_PUBKEY)
 } ASN1_SEQUENCE_END(OSSL_CRMF_POPOSIGNINGKEYINPUT)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_POPOSIGNINGKEYINPUT)
 
 ASN1_SEQUENCE(OSSL_CRMF_POPOSIGNINGKEY) = {
     ASN1_IMP_OPT(OSSL_CRMF_POPOSIGNINGKEY, poposkInput,
-                 OSSL_CRMF_POPOSIGNINGKEYINPUT, 0),
+        OSSL_CRMF_POPOSIGNINGKEYINPUT, 0),
     ASN1_SIMPLE(OSSL_CRMF_POPOSIGNINGKEY, algorithmIdentifier, X509_ALGOR),
     ASN1_SIMPLE(OSSL_CRMF_POPOSIGNINGKEY, signature, ASN1_BIT_STRING)
 } ASN1_SEQUENCE_END(OSSL_CRMF_POPOSIGNINGKEY)
@@ -142,39 +142,37 @@ ASN1_CHOICE(OSSL_CRMF_POPO) = {
 } ASN1_CHOICE_END(OSSL_CRMF_POPO)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_POPO)
 
-ASN1_ADB_TEMPLATE(attributetypeandvalue_default) =
-    ASN1_OPT(OSSL_CRMF_ATTRIBUTETYPEANDVALUE, value.other, ASN1_ANY);
+ASN1_ADB_TEMPLATE(attributetypeandvalue_default) = ASN1_OPT(OSSL_CRMF_ATTRIBUTETYPEANDVALUE, value.other, ASN1_ANY);
 ASN1_ADB(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) = {
     ADB_ENTRY(NID_id_regCtrl_regToken,
-              ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
-                          value.regToken, ASN1_UTF8STRING)),
+        ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+            value.regToken, ASN1_UTF8STRING)),
     ADB_ENTRY(NID_id_regCtrl_authenticator,
-              ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
-                          value.authenticator, ASN1_UTF8STRING)),
+        ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+            value.authenticator, ASN1_UTF8STRING)),
     ADB_ENTRY(NID_id_regCtrl_pkiPublicationInfo,
-              ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
-                          value.pkiPublicationInfo,
-                          OSSL_CRMF_PKIPUBLICATIONINFO)),
+        ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+            value.pkiPublicationInfo,
+            OSSL_CRMF_PKIPUBLICATIONINFO)),
     ADB_ENTRY(NID_id_regCtrl_oldCertID,
-              ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
-                          value.oldCertID, OSSL_CRMF_CERTID)),
+        ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+            value.oldCertID, OSSL_CRMF_CERTID)),
     ADB_ENTRY(NID_id_regCtrl_protocolEncrKey,
-              ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
-                          value.protocolEncrKey, X509_PUBKEY)),
+        ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+            value.protocolEncrKey, X509_PUBKEY)),
     ADB_ENTRY(NID_id_regCtrl_algId,
-              ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
-                          value.algId, X509_ALGOR)),
+        ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+            value.algId, X509_ALGOR)),
     ADB_ENTRY(NID_id_regCtrl_rsaKeyLen,
-              ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
-                          value.rsaKeyLen, ASN1_INTEGER)),
+        ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+            value.rsaKeyLen, ASN1_INTEGER)),
     ADB_ENTRY(NID_id_regInfo_utf8Pairs,
-              ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
-                          value.utf8Pairs, ASN1_UTF8STRING)),
+        ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+            value.utf8Pairs, ASN1_UTF8STRING)),
     ADB_ENTRY(NID_id_regInfo_certReq,
-              ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
-                          value.certReq, OSSL_CRMF_CERTREQUEST)),
-} ASN1_ADB_END(OSSL_CRMF_ATTRIBUTETYPEANDVALUE, 0, type, 0,
-               &attributetypeandvalue_default_tt, NULL);
+        ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
+            value.certReq, OSSL_CRMF_CERTREQUEST)),
+} ASN1_ADB_END(OSSL_CRMF_ATTRIBUTETYPEANDVALUE, 0, type, 0, &attributetypeandvalue_default_tt, NULL);
 
 ASN1_SEQUENCE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) = {
     ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE, type, ASN1_OBJECT),
@@ -186,7 +184,7 @@ IMPLEMENT_ASN1_DUP_FUNCTION(OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
 
 ASN1_SEQUENCE(OSSL_CRMF_OPTIONALVALIDITY) = {
     ASN1_EXP_OPT(OSSL_CRMF_OPTIONALVALIDITY, notBefore, ASN1_TIME, 0),
-    ASN1_EXP_OPT(OSSL_CRMF_OPTIONALVALIDITY, notAfter,  ASN1_TIME, 1)
+    ASN1_EXP_OPT(OSSL_CRMF_OPTIONALVALIDITY, notAfter, ASN1_TIME, 1)
 } ASN1_SEQUENCE_END(OSSL_CRMF_OPTIONALVALIDITY)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_OPTIONALVALIDITY)
 
@@ -204,7 +202,7 @@ ASN1_SEQUENCE(OSSL_CRMF_CERTTEMPLATE) = {
     ASN1_IMP_OPT(OSSL_CRMF_CERTTEMPLATE, signingAlg, X509_ALGOR, 2),
     ASN1_EXP_OPT(OSSL_CRMF_CERTTEMPLATE, issuer, X509_NAME, 3),
     ASN1_IMP_OPT(OSSL_CRMF_CERTTEMPLATE, validity,
-                 OSSL_CRMF_OPTIONALVALIDITY, 4),
+        OSSL_CRMF_OPTIONALVALIDITY, 4),
     ASN1_EXP_OPT(OSSL_CRMF_CERTTEMPLATE, subject, X509_NAME, 5),
     ASN1_IMP_OPT(OSSL_CRMF_CERTTEMPLATE, publicKey, X509_PUBKEY, 6),
     /* issuerUID is deprecated in version 2 */
@@ -212,7 +210,7 @@ ASN1_SEQUENCE(OSSL_CRMF_CERTTEMPLATE) = {
     /* subjectUID is deprecated in version 2 */
     ASN1_IMP_OPT(OSSL_CRMF_CERTTEMPLATE, subjectUID, ASN1_BIT_STRING, 8),
     ASN1_IMP_SEQUENCE_OF_OPT(OSSL_CRMF_CERTTEMPLATE, extensions,
-                             X509_EXTENSION, 9),
+        X509_EXTENSION, 9),
 } ASN1_SEQUENCE_END(OSSL_CRMF_CERTTEMPLATE)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_CERTTEMPLATE)
 IMPLEMENT_ASN1_DUP_FUNCTION(OSSL_CRMF_CERTTEMPLATE)
@@ -221,7 +219,7 @@ ASN1_SEQUENCE(OSSL_CRMF_CERTREQUEST) = {
     ASN1_SIMPLE(OSSL_CRMF_CERTREQUEST, certReqId, ASN1_INTEGER),
     ASN1_SIMPLE(OSSL_CRMF_CERTREQUEST, certTemplate, OSSL_CRMF_CERTTEMPLATE),
     ASN1_SEQUENCE_OF_OPT(OSSL_CRMF_CERTREQUEST, controls,
-                         OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
+        OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
 } ASN1_SEQUENCE_END(OSSL_CRMF_CERTREQUEST)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_CERTREQUEST)
 IMPLEMENT_ASN1_DUP_FUNCTION(OSSL_CRMF_CERTREQUEST)
@@ -230,13 +228,12 @@ ASN1_SEQUENCE(OSSL_CRMF_MSG) = {
     ASN1_SIMPLE(OSSL_CRMF_MSG, certReq, OSSL_CRMF_CERTREQUEST),
     ASN1_OPT(OSSL_CRMF_MSG, popo, OSSL_CRMF_POPO),
     ASN1_SEQUENCE_OF_OPT(OSSL_CRMF_MSG, regInfo,
-                         OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
+        OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
 } ASN1_SEQUENCE_END(OSSL_CRMF_MSG)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_MSG)
 IMPLEMENT_ASN1_DUP_FUNCTION(OSSL_CRMF_MSG)
 
-ASN1_ITEM_TEMPLATE(OSSL_CRMF_MSGS) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
-                          OSSL_CRMF_MSGS, OSSL_CRMF_MSG)
+ASN1_ITEM_TEMPLATE(OSSL_CRMF_MSGS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+    OSSL_CRMF_MSGS, OSSL_CRMF_MSG)
 ASN1_ITEM_TEMPLATE_END(OSSL_CRMF_MSGS)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_MSGS)
diff --git a/crypto/crmf/crmf_err.c b/crypto/crmf/crmf_err.c
index 4727c83353048..11e4271ec60e4 100644
--- a/crypto/crmf/crmf_err.c
+++ b/crypto/crmf/crmf_err.c
@@ -14,72 +14,72 @@
 
 #ifndef OPENSSL_NO_CRMF
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA CRMF_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_BAD_PBM_ITERATIONCOUNT),
-     "bad pbm iterationcount"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_CMS_NOT_SUPPORTED), "cms not supported"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_CRMFERROR), "crmferror"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR), "error"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECODING_CERTIFICATE),
-     "error decoding certificate"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECODING_ENCRYPTEDKEY),
-     "error decoding encryptedkey"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_CERTIFICATE),
-     "error decrypting certificate"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_ENCRYPTEDKEY),
-     "error decrypting encryptedkey"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_ENCRYPTEDVALUE),
-     "error decrypting encryptedvalue"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_SYMMETRIC_KEY),
-     "error decrypting symmetric key"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_SETTING_PURPOSE),
-     "error setting purpose"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_VERIFYING_ENCRYPTEDKEY),
-     "error verifying encryptedkey"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_FAILURE_OBTAINING_RANDOM),
-     "failure obtaining random"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ITERATIONCOUNT_BELOW_100),
-     "iterationcount below 100"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_MALFORMED_IV), "malformed iv"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_NULL_ARGUMENT), "null argument"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPOSKINPUT_NOT_SUPPORTED),
-     "poposkinput not supported"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_INCONSISTENT_CENTRAL_KEYGEN),
-     "popo inconsistent central keygen"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_INCONSISTENT_PUBLIC_KEY),
-     "popo inconsistent public key"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_MISSING), "popo missing"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_MISSING_PUBLIC_KEY),
-     "popo missing public key"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_MISSING_SUBJECT),
-     "popo missing subject"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_RAVERIFIED_NOT_ACCEPTED),
-     "popo raverified not accepted"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_SETTING_MAC_ALGOR_FAILURE),
-     "setting mac algor failure"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_SETTING_OWF_ALGOR_FAILURE),
-     "setting owf algor failure"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_ALGORITHM),
-     "unsupported algorithm"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_CIPHER),
-     "unsupported cipher"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_METHOD_FOR_CREATING_POPO),
-     "unsupported method for creating popo"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_POPO_METHOD),
-     "unsupported popo method"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_BAD_PBM_ITERATIONCOUNT),
+        "bad pbm iterationcount" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_CMS_NOT_SUPPORTED), "cms not supported" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_CRMFERROR), "crmferror" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR), "error" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECODING_CERTIFICATE),
+        "error decoding certificate" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECODING_ENCRYPTEDKEY),
+        "error decoding encryptedkey" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_CERTIFICATE),
+        "error decrypting certificate" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_ENCRYPTEDKEY),
+        "error decrypting encryptedkey" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_ENCRYPTEDVALUE),
+        "error decrypting encryptedvalue" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_DECRYPTING_SYMMETRIC_KEY),
+        "error decrypting symmetric key" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_SETTING_PURPOSE),
+        "error setting purpose" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ERROR_VERIFYING_ENCRYPTEDKEY),
+        "error verifying encryptedkey" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_FAILURE_OBTAINING_RANDOM),
+        "failure obtaining random" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_ITERATIONCOUNT_BELOW_100),
+        "iterationcount below 100" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_MALFORMED_IV), "malformed iv" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_NULL_ARGUMENT), "null argument" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPOSKINPUT_NOT_SUPPORTED),
+        "poposkinput not supported" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_INCONSISTENT_CENTRAL_KEYGEN),
+        "popo inconsistent central keygen" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_INCONSISTENT_PUBLIC_KEY),
+        "popo inconsistent public key" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_MISSING), "popo missing" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_MISSING_PUBLIC_KEY),
+        "popo missing public key" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_MISSING_SUBJECT),
+        "popo missing subject" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_POPO_RAVERIFIED_NOT_ACCEPTED),
+        "popo raverified not accepted" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_SETTING_MAC_ALGOR_FAILURE),
+        "setting mac algor failure" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_SETTING_OWF_ALGOR_FAILURE),
+        "setting owf algor failure" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_ALGORITHM),
+        "unsupported algorithm" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_CIPHER),
+        "unsupported cipher" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_METHOD_FOR_CREATING_POPO),
+        "unsupported method for creating popo" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, CRMF_R_UNSUPPORTED_POPO_METHOD),
+        "unsupported popo method" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_CRMF_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(CRMF_str_reasons[0].error) == NULL)
         ERR_load_strings_const(CRMF_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/crmf/crmf_lib.c b/crypto/crmf/crmf_lib.c
index 8238496e73803..d5c8983b2fd42 100644
--- a/crypto/crmf/crmf_lib.c
+++ b/crypto/crmf/crmf_lib.c
@@ -45,43 +45,43 @@
  * valt = Value Type
  * ctrlinf = "regCtrl" or "regInfo"
  */
-#define IMPLEMENT_CRMF_CTRL_FUNC(atyp, valt, ctrlinf)                        \
-valt *OSSL_CRMF_MSG_get0_##ctrlinf##_##atyp(const OSSL_CRMF_MSG *msg)        \
-{                                                                            \
-    int i;                                                                   \
-    STACK_OF(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) *controls;                     \
-    OSSL_CRMF_ATTRIBUTETYPEANDVALUE *atav = NULL;                            \
-                                                                             \
-    if (msg == NULL || msg->certReq == NULL)                                 \
-        return NULL;                                                         \
-    controls = msg->certReq->controls;                                       \
-    for (i = 0; i < sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_num(controls); i++) { \
-        atav = sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_value(controls, i);        \
-        if (OBJ_obj2nid(atav->type) == NID_id_##ctrlinf##_##atyp)            \
-            return atav->value.atyp;                                         \
-    }                                                                        \
-    return NULL;                                                             \
-}                                                                            \
- \
-int OSSL_CRMF_MSG_set1_##ctrlinf##_##atyp(OSSL_CRMF_MSG *msg, const valt *in) \
-{                                                                         \
-    OSSL_CRMF_ATTRIBUTETYPEANDVALUE *atav = NULL;                         \
-                                                                          \
-    if (msg == NULL || in == NULL)                                        \
-        goto err;                                                         \
-    if ((atav = OSSL_CRMF_ATTRIBUTETYPEANDVALUE_new()) == NULL)           \
-        goto err;                                                         \
-    if ((atav->type = OBJ_nid2obj(NID_id_##ctrlinf##_##atyp)) == NULL)    \
-        goto err;                                                         \
-    if ((atav->value.atyp = valt##_dup(in)) == NULL)                      \
-        goto err;                                                         \
-    if (!OSSL_CRMF_MSG_push0_##ctrlinf(msg, atav))                        \
-        goto err;                                                         \
-    return 1;                                                             \
- err:                                                                     \
-    OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(atav);                           \
-    return 0;                                                             \
-}
+#define IMPLEMENT_CRMF_CTRL_FUNC(atyp, valt, ctrlinf)                             \
+    valt *OSSL_CRMF_MSG_get0_##ctrlinf##_##atyp(const OSSL_CRMF_MSG *msg)         \
+    {                                                                             \
+        int i;                                                                    \
+        STACK_OF(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) *controls;                      \
+        OSSL_CRMF_ATTRIBUTETYPEANDVALUE *atav = NULL;                             \
+                                                                                  \
+        if (msg == NULL || msg->certReq == NULL)                                  \
+            return NULL;                                                          \
+        controls = msg->certReq->controls;                                        \
+        for (i = 0; i < sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_num(controls); i++) {  \
+            atav = sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_value(controls, i);         \
+            if (OBJ_obj2nid(atav->type) == NID_id_##ctrlinf##_##atyp)             \
+                return atav->value.atyp;                                          \
+        }                                                                         \
+        return NULL;                                                              \
+    }                                                                             \
+                                                                                  \
+    int OSSL_CRMF_MSG_set1_##ctrlinf##_##atyp(OSSL_CRMF_MSG *msg, const valt *in) \
+    {                                                                             \
+        OSSL_CRMF_ATTRIBUTETYPEANDVALUE *atav = NULL;                             \
+                                                                                  \
+        if (msg == NULL || in == NULL)                                            \
+            goto err;                                                             \
+        if ((atav = OSSL_CRMF_ATTRIBUTETYPEANDVALUE_new()) == NULL)               \
+            goto err;                                                             \
+        if ((atav->type = OBJ_nid2obj(NID_id_##ctrlinf##_##atyp)) == NULL)        \
+            goto err;                                                             \
+        if ((atav->value.atyp = valt##_dup(in)) == NULL)                          \
+            goto err;                                                             \
+        if (!OSSL_CRMF_MSG_push0_##ctrlinf(msg, atav))                            \
+            goto err;                                                             \
+        return 1;                                                                 \
+    err:                                                                          \
+        OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(atav);                               \
+        return 0;                                                                 \
+    }
 
 /*-
  * Pushes the given control attribute into the controls stack of a CertRequest
@@ -89,7 +89,7 @@ int OSSL_CRMF_MSG_set1_##ctrlinf##_##atyp(OSSL_CRMF_MSG *msg, const valt *in) \
  * returns 1 on success, 0 on error
  */
 static int OSSL_CRMF_MSG_push0_regCtrl(OSSL_CRMF_MSG *crm,
-                                       OSSL_CRMF_ATTRIBUTETYPEANDVALUE *ctrl)
+    OSSL_CRMF_ATTRIBUTETYPEANDVALUE *ctrl)
 {
     int new = 0;
 
@@ -108,7 +108,7 @@ static int OSSL_CRMF_MSG_push0_regCtrl(OSSL_CRMF_MSG *crm,
         goto err;
 
     return 1;
- err:
+err:
     if (new != 0) {
         sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(crm->certReq->controls);
         crm->certReq->controls = NULL;
@@ -124,11 +124,11 @@ IMPLEMENT_CRMF_CTRL_FUNC(regToken, ASN1_STRING, regCtrl)
 IMPLEMENT_CRMF_CTRL_FUNC(authenticator, ASN1_UTF8STRING, regCtrl)
 
 int OSSL_CRMF_MSG_set0_SinglePubInfo(OSSL_CRMF_SINGLEPUBINFO *spi,
-                                     int method, GENERAL_NAME *nm)
+    int method, GENERAL_NAME *nm)
 {
     if (spi == NULL
-            || method < OSSL_CRMF_PUB_METHOD_DONTCARE
-            || method > OSSL_CRMF_PUB_METHOD_LDAP) {
+        || method < OSSL_CRMF_PUB_METHOD_DONTCARE
+        || method > OSSL_CRMF_PUB_METHOD_LDAP) {
         ERR_raise(ERR_LIB_CRMF, ERR_R_PASSED_INVALID_ARGUMENT);
         return 0;
     }
@@ -140,9 +140,8 @@ int OSSL_CRMF_MSG_set0_SinglePubInfo(OSSL_CRMF_SINGLEPUBINFO *spi,
     return 1;
 }
 
-int
-OSSL_CRMF_MSG_PKIPublicationInfo_push0_SinglePubInfo(OSSL_CRMF_PKIPUBLICATIONINFO *pi,
-                                                     OSSL_CRMF_SINGLEPUBINFO *spi)
+int OSSL_CRMF_MSG_PKIPublicationInfo_push0_SinglePubInfo(OSSL_CRMF_PKIPUBLICATIONINFO *pi,
+    OSSL_CRMF_SINGLEPUBINFO *spi)
 {
     if (pi == NULL || spi == NULL) {
         ERR_raise(ERR_LIB_CRMF, CRMF_R_NULL_ARGUMENT);
@@ -157,11 +156,11 @@ OSSL_CRMF_MSG_PKIPublicationInfo_push0_SinglePubInfo(OSSL_CRMF_PKIPUBLICATIONINF
 }
 
 int OSSL_CRMF_MSG_set_PKIPublicationInfo_action(OSSL_CRMF_PKIPUBLICATIONINFO *pi,
-                                                int action)
+    int action)
 {
     if (pi == NULL
-            || action < OSSL_CRMF_PUB_ACTION_DONTPUBLISH
-            || action > OSSL_CRMF_PUB_ACTION_PLEASEPUBLISH) {
+        || action < OSSL_CRMF_PUB_ACTION_DONTPUBLISH
+        || action > OSSL_CRMF_PUB_ACTION_PLEASEPUBLISH) {
         ERR_raise(ERR_LIB_CRMF, ERR_R_PASSED_INVALID_ARGUMENT);
         return 0;
     }
@@ -171,13 +170,13 @@ int OSSL_CRMF_MSG_set_PKIPublicationInfo_action(OSSL_CRMF_PKIPUBLICATIONINFO *pi
 
 /* id-regCtrl-pkiPublicationInfo Control (section 6.3) */
 IMPLEMENT_CRMF_CTRL_FUNC(pkiPublicationInfo, OSSL_CRMF_PKIPUBLICATIONINFO,
-                         regCtrl)
+    regCtrl)
 
 /* id-regCtrl-oldCertID Control (section 6.5) from the given */
 IMPLEMENT_CRMF_CTRL_FUNC(oldCertID, OSSL_CRMF_CERTID, regCtrl)
 
 OSSL_CRMF_CERTID *OSSL_CRMF_CERTID_gen(const X509_NAME *issuer,
-                                       const ASN1_INTEGER *serial)
+    const ASN1_INTEGER *serial)
 {
     OSSL_CRMF_CERTID *cid = NULL;
 
@@ -199,7 +198,7 @@ OSSL_CRMF_CERTID *OSSL_CRMF_CERTID_gen(const X509_NAME *issuer,
 
     return cid;
 
- err:
+err:
     OSSL_CRMF_CERTID_free(cid);
     return NULL;
 }
@@ -215,7 +214,7 @@ IMPLEMENT_CRMF_CTRL_FUNC(protocolEncrKey, X509_PUBKEY, regCtrl)
  * returns 1 on success, 0 on error
  */
 static int OSSL_CRMF_MSG_push0_regInfo(OSSL_CRMF_MSG *crm,
-                                       OSSL_CRMF_ATTRIBUTETYPEANDVALUE *ri)
+    OSSL_CRMF_ATTRIBUTETYPEANDVALUE *ri)
 {
     STACK_OF(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) *info = NULL;
 
@@ -232,7 +231,7 @@ static int OSSL_CRMF_MSG_push0_regInfo(OSSL_CRMF_MSG *crm,
         goto err;
     return 1;
 
- err:
+err:
     if (info != NULL)
         crm->regInfo = NULL;
     sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(info);
@@ -256,7 +255,7 @@ OSSL_CRMF_CERTTEMPLATE *OSSL_CRMF_MSG_get0_tmpl(const OSSL_CRMF_MSG *crm)
 }
 
 int OSSL_CRMF_MSG_set0_validity(OSSL_CRMF_MSG *crm,
-                                ASN1_TIME *notBefore, ASN1_TIME *notAfter)
+    ASN1_TIME *notBefore, ASN1_TIME *notAfter)
 {
     OSSL_CRMF_OPTIONALVALIDITY *vld;
     OSSL_CRMF_CERTTEMPLATE *tmpl = OSSL_CRMF_MSG_get0_tmpl(crm);
@@ -314,7 +313,7 @@ int OSSL_CRMF_MSG_get_certReqId(const OSSL_CRMF_MSG *crm)
 }
 
 int OSSL_CRMF_MSG_set0_extensions(OSSL_CRMF_MSG *crm,
-                                  X509_EXTENSIONS *exts)
+    X509_EXTENSIONS *exts)
 {
     OSSL_CRMF_CERTTEMPLATE *tmpl = OSSL_CRMF_MSG_get0_tmpl(crm);
 
@@ -334,7 +333,7 @@ int OSSL_CRMF_MSG_set0_extensions(OSSL_CRMF_MSG *crm,
 }
 
 int OSSL_CRMF_MSG_push0_extension(OSSL_CRMF_MSG *crm,
-                                  X509_EXTENSION *ext)
+    X509_EXTENSION *ext)
 {
     int new = 0;
     OSSL_CRMF_CERTTEMPLATE *tmpl = OSSL_CRMF_MSG_get0_tmpl(crm);
@@ -353,7 +352,7 @@ int OSSL_CRMF_MSG_push0_extension(OSSL_CRMF_MSG *crm,
     if (!sk_X509_EXTENSION_push(tmpl->extensions, ext))
         goto err;
     return 1;
- err:
+err:
     if (new != 0) {
         sk_X509_EXTENSION_free(tmpl->extensions);
         tmpl->extensions = NULL;
@@ -362,9 +361,9 @@ int OSSL_CRMF_MSG_push0_extension(OSSL_CRMF_MSG *crm,
 }
 
 static int create_popo_signature(OSSL_CRMF_POPOSIGNINGKEY *ps,
-                                 const OSSL_CRMF_CERTREQUEST *cr,
-                                 EVP_PKEY *pkey, const EVP_MD *digest,
-                                 OSSL_LIB_CTX *libctx, const char *propq)
+    const OSSL_CRMF_CERTREQUEST *cr,
+    EVP_PKEY *pkey, const EVP_MD *digest,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     char name[80] = "";
     EVP_PKEY *pub;
@@ -384,18 +383,18 @@ static int create_popo_signature(OSSL_CRMF_POPOSIGNINGKEY *ps,
     }
 
     if (EVP_PKEY_get_default_digest_name(pkey, name, sizeof(name)) > 0
-            && strcmp(name, "UNDEF") == 0) /* at least for Ed25519, Ed448 */
+        && strcmp(name, "UNDEF") == 0) /* at least for Ed25519, Ed448 */
         digest = NULL;
 
     return ASN1_item_sign_ex(ASN1_ITEM_rptr(OSSL_CRMF_CERTREQUEST),
-                             ps->algorithmIdentifier, /* sets this X509_ALGOR */
-                             NULL, ps->signature, /* sets the ASN1_BIT_STRING */
-                             cr, NULL, pkey, digest, libctx, propq);
+        ps->algorithmIdentifier, /* sets this X509_ALGOR */
+        NULL, ps->signature, /* sets the ASN1_BIT_STRING */
+        cr, NULL, pkey, digest, libctx, propq);
 }
 
 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)
 {
     OSSL_CRMF_POPO *pp = NULL;
     ASN1_INTEGER *tag = NULL;
@@ -417,30 +416,27 @@ int OSSL_CRMF_MSG_create_popo(int meth, OSSL_CRMF_MSG *crm,
             goto err;
         break;
 
-    case OSSL_CRMF_POPO_SIGNATURE:
-        {
-            OSSL_CRMF_POPOSIGNINGKEY *ps = OSSL_CRMF_POPOSIGNINGKEY_new();
-
-            if (ps == NULL)
-                goto err;
-            if (!create_popo_signature(ps, crm->certReq, pkey, digest,
-                                       libctx, propq)) {
-                OSSL_CRMF_POPOSIGNINGKEY_free(ps);
-                goto err;
-            }
-            pp->value.signature = ps;
+    case OSSL_CRMF_POPO_SIGNATURE: {
+        OSSL_CRMF_POPOSIGNINGKEY *ps = OSSL_CRMF_POPOSIGNINGKEY_new();
+
+        if (ps == NULL)
+            goto err;
+        if (!create_popo_signature(ps, crm->certReq, pkey, digest,
+                libctx, propq)) {
+            OSSL_CRMF_POPOSIGNINGKEY_free(ps);
+            goto err;
         }
-        break;
+        pp->value.signature = ps;
+    } break;
 
     case OSSL_CRMF_POPO_KEYENC:
         if ((pp->value.keyEncipherment = OSSL_CRMF_POPOPRIVKEY_new()) == NULL)
             goto err;
         tag = ASN1_INTEGER_new();
-        pp->value.keyEncipherment->type =
-            OSSL_CRMF_POPOPRIVKEY_SUBSEQUENTMESSAGE;
+        pp->value.keyEncipherment->type = OSSL_CRMF_POPOPRIVKEY_SUBSEQUENTMESSAGE;
         pp->value.keyEncipherment->value.subsequentMessage = tag;
         if (tag == NULL
-                || !ASN1_INTEGER_set(tag, OSSL_CRMF_SUBSEQUENTMESSAGE_ENCRCERT))
+            || !ASN1_INTEGER_set(tag, OSSL_CRMF_SUBSEQUENTMESSAGE_ENCRCERT))
             goto err;
         break;
 
@@ -449,20 +445,20 @@ int OSSL_CRMF_MSG_create_popo(int meth, OSSL_CRMF_MSG *crm,
         goto err;
     }
 
- end:
+end:
     OSSL_CRMF_POPO_free(crm->popo);
     crm->popo = pp;
 
     return 1;
- err:
+err:
     OSSL_CRMF_POPO_free(pp);
     return 0;
 }
 
 /* verifies the Proof-of-Possession of the request with the given rid in reqs */
 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_MSG *req = NULL;
     X509_PUBKEY *pubkey = NULL;
@@ -525,8 +521,9 @@ int OSSL_CRMF_MSGS_verify_popo(const OSSL_CRMF_MSGS *reqs,
             asn = req->certReq;
         }
         if (ASN1_item_verify_ex(it, sig->algorithmIdentifier, sig->signature,
-                                asn, NULL, X509_PUBKEY_get0(pubkey), libctx,
-                                propq) < 1)
+                asn, NULL, X509_PUBKEY_get0(pubkey), libctx,
+                propq)
+            < 1)
             return 0;
         break;
     case OSSL_CRMF_POPO_KEYENC:
@@ -582,20 +579,17 @@ X509_PUBKEY
     return tmpl != NULL ? tmpl->publicKey : NULL;
 }
 
-const ASN1_INTEGER
-*OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(const OSSL_CRMF_CERTTEMPLATE *tmpl)
+const ASN1_INTEGER *OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(const OSSL_CRMF_CERTTEMPLATE *tmpl)
 {
     return tmpl != NULL ? tmpl->serialNumber : NULL;
 }
 
-const X509_NAME
-*OSSL_CRMF_CERTTEMPLATE_get0_subject(const OSSL_CRMF_CERTTEMPLATE *tmpl)
+const X509_NAME *OSSL_CRMF_CERTTEMPLATE_get0_subject(const OSSL_CRMF_CERTTEMPLATE *tmpl)
 {
     return tmpl != NULL ? tmpl->subject : NULL;
 }
 
-const X509_NAME
-*OSSL_CRMF_CERTTEMPLATE_get0_issuer(const OSSL_CRMF_CERTTEMPLATE *tmpl)
+const X509_NAME *OSSL_CRMF_CERTTEMPLATE_get0_issuer(const OSSL_CRMF_CERTTEMPLATE *tmpl)
 {
     return tmpl != NULL ? tmpl->issuer : NULL;
 }
@@ -608,12 +602,11 @@ X509_EXTENSIONS
 
 const X509_NAME *OSSL_CRMF_CERTID_get0_issuer(const OSSL_CRMF_CERTID *cid)
 {
-    return cid != NULL && cid->issuer->type == GEN_DIRNAME ?
-        cid->issuer->d.directoryName : NULL;
+    return cid != NULL && cid->issuer->type == GEN_DIRNAME ? cid->issuer->d.directoryName : NULL;
 }
 
 const ASN1_INTEGER *OSSL_CRMF_CERTID_get0_serialNumber(const OSSL_CRMF_CERTID
-                                                       *cid)
+        *cid)
 {
     return cid != NULL ? cid->serialNumber : NULL;
 }
@@ -623,10 +616,10 @@ const ASN1_INTEGER *OSSL_CRMF_CERTID_get0_serialNumber(const OSSL_CRMF_CERTID
  * Any other NULL argument will leave the respective field unchanged.
  */
 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)
 {
     if (tmpl == NULL) {
         ERR_raise(ERR_LIB_CRMF, CRMF_R_NULL_ARGUMENT);
@@ -664,16 +657,16 @@ static int check_cmKGA(ossl_unused const X509_PURPOSE *purpose, const X509 *x, i
     }
     ret = 0;
 
- end:
+end:
     sk_ASN1_OBJECT_pop_free(ekus, ASN1_OBJECT_free);
     return ret;
 }
 #endif /* OPENSSL_NO_CMS */
 
 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)
 {
 #ifndef OPENSSL_NO_CMS
     BIO *bio = NULL;
@@ -694,7 +687,7 @@ EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encrypt
         int len;
 
         p = OSSL_CRMF_ENCRYPTEDVALUE_decrypt(encryptedKey->value.encryptedValue,
-                                             libctx, propq, pkey, &len);
+            libctx, propq, pkey, &len);
         if ((p_copy = p) != NULL)
             ret = d2i_AutoPrivateKey_ex(NULL, &p_copy, len, libctx, propq);
         OPENSSL_free(p);
@@ -707,8 +700,9 @@ EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encrypt
         return NULL;
     }
     if ((bio = CMS_EnvelopedData_decrypt(encryptedKey->value.envelopedData,
-                                         NULL, pkey, cert, secret, 0,
-                                         libctx, propq)) == NULL) {
+             NULL, pkey, cert, secret, 0,
+             libctx, propq))
+        == NULL) {
         ERR_raise(ERR_LIB_CRMF, CRMF_R_ERROR_DECRYPTING_ENCRYPTEDKEY);
         goto end;
     }
@@ -719,7 +713,7 @@ EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encrypt
     if ((purpose_id = X509_PURPOSE_get_by_sname(SN_cmKGA)) < 0) {
         purpose_id = X509_PURPOSE_get_unused_id(libctx);
         if (!X509_PURPOSE_add(purpose_id, X509_TRUST_COMPAT, 0, check_cmKGA,
-                              LN_cmKGA, SN_cmKGA, NULL))
+                LN_cmKGA, SN_cmKGA, NULL))
             goto end;
     }
     if ((vpm = X509_STORE_get0_param(ts)) == NULL)
@@ -733,7 +727,7 @@ EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encrypt
     }
 
     pkey_bio = CMS_SignedData_verify(sd, NULL, NULL /* scerts */, ts,
-                                     extra, NULL, 0, libctx, propq);
+        extra, NULL, 0, libctx, propq);
 
     if (!X509_STORE_set_purpose(ts, bak_purpose_id)) {
         ERR_raise(ERR_LIB_CRMF, CRMF_R_ERROR_SETTING_PURPOSE);
@@ -749,7 +743,7 @@ EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encrypt
     if ((ret = d2i_PrivateKey_ex_bio(pkey_bio, NULL, libctx, propq)) == NULL)
         ERR_raise(ERR_LIB_CRMF, CRMF_R_ERROR_DECODING_ENCRYPTEDKEY);
 
- end:
+end:
     CMS_SignedData_free(sd);
     BIO_free(bio);
     BIO_free(pkey_bio);
@@ -762,10 +756,9 @@ EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encrypt
 #endif /* OPENSSL_NO_CMS */
 }
 
-unsigned char
-*OSSL_CRMF_ENCRYPTEDVALUE_decrypt(const OSSL_CRMF_ENCRYPTEDVALUE *enc,
-                                  OSSL_LIB_CTX *libctx, const char *propq,
-                                  EVP_PKEY *pkey, int *outlen)
+unsigned char *OSSL_CRMF_ENCRYPTEDVALUE_decrypt(const OSSL_CRMF_ENCRYPTEDVALUE *enc,
+    OSSL_LIB_CTX *libctx, const char *propq,
+    EVP_PKEY *pkey, int *outlen)
 {
     EVP_CIPHER_CTX *evp_ctx = NULL; /* context for symmetric encryption */
     unsigned char *ek = NULL; /* decrypted symmetric encryption key */
@@ -784,7 +777,7 @@ unsigned char
     }
     *outlen = 0;
     if (enc == NULL || enc->symmAlg == NULL || enc->encSymmKey == NULL
-            || enc->encValue == NULL || pkey == NULL) {
+        || enc->encValue == NULL || pkey == NULL) {
         ERR_raise(ERR_LIB_CRMF, CRMF_R_NULL_ARGUMENT);
         return NULL;
     }
@@ -811,12 +804,13 @@ unsigned char
         int retval;
 
         if (EVP_PKEY_decrypt(pkctx, NULL, &eksize,
-                             encKey->data, encKey->length) <= 0
-                || (ek = OPENSSL_malloc(eksize)) == NULL)
+                encKey->data, encKey->length)
+                <= 0
+            || (ek = OPENSSL_malloc(eksize)) == NULL)
             goto end;
         retval = EVP_PKEY_decrypt(pkctx, ek, &eksize, encKey->data, encKey->length);
         failure = ~constant_time_is_zero_s(constant_time_msb(retval)
-                                           | constant_time_is_zero(retval));
+            | constant_time_is_zero(retval));
         failure |= ~constant_time_eq_s(eksize, (size_t)cikeysize);
         if (failure) {
             ERR_clear_error(); /* error state may have sensitive information */
@@ -829,30 +823,29 @@ unsigned char
     if ((iv = OPENSSL_malloc(EVP_CIPHER_get_iv_length(cipher))) == NULL)
         goto end;
     if (ASN1_TYPE_get_octetstring(enc->symmAlg->parameter, iv,
-                                  EVP_CIPHER_get_iv_length(cipher))
+            EVP_CIPHER_get_iv_length(cipher))
         != EVP_CIPHER_get_iv_length(cipher)) {
         ERR_raise(ERR_LIB_CRMF, CRMF_R_MALFORMED_IV);
         goto end;
     }
 
-    if ((out = OPENSSL_malloc(enc->encValue->length +
-                              EVP_CIPHER_get_block_size(cipher))) == NULL
-            || (evp_ctx = EVP_CIPHER_CTX_new()) == NULL)
+    if ((out = OPENSSL_malloc(enc->encValue->length + EVP_CIPHER_get_block_size(cipher))) == NULL
+        || (evp_ctx = EVP_CIPHER_CTX_new()) == NULL)
         goto end;
     EVP_CIPHER_CTX_set_padding(evp_ctx, 0);
 
     if (!EVP_DecryptInit(evp_ctx, cipher, ek, iv)
-            || !EVP_DecryptUpdate(evp_ctx, out, outlen,
-                                  enc->encValue->data,
-                                  enc->encValue->length)
-            || !EVP_DecryptFinal(evp_ctx, out + *outlen, &n)) {
+        || !EVP_DecryptUpdate(evp_ctx, out, outlen,
+            enc->encValue->data,
+            enc->encValue->length)
+        || !EVP_DecryptFinal(evp_ctx, out + *outlen, &n)) {
         ERR_raise(ERR_LIB_CRMF, CRMF_R_ERROR_DECRYPTING_ENCRYPTEDVALUE);
         goto end;
     }
     *outlen += n;
     ret = 1;
 
- end:
+end:
     EVP_PKEY_CTX_free(pkctx);
     EVP_CIPHER_CTX_free(evp_ctx);
     EVP_CIPHER_free(cipher);
@@ -866,14 +859,14 @@ unsigned char
 
 /*
  * Decrypts the certificate in the given encryptedValue using private key pkey.
- * This is needed for the indirect PoP method as in RFC 4210 section 5.2.8.2.
+ * This is needed for the indirect PoP method as in RFC 9810 section 5.2.8.3.2.
  *
  * returns a pointer to the decrypted certificate
  * returns NULL on error or if no certificate available
  */
 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)
 {
     unsigned char *buf = NULL;
     const unsigned char *p;
@@ -890,20 +883,20 @@ X509 *OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert(const OSSL_CRMF_ENCRYPTEDVALUE *ecer
         cert = NULL;
     }
 
- end:
+end:
     OPENSSL_free(buf);
     return cert;
 }
 /*-
  * Decrypts the certificate in the given encryptedKey using private key pkey.
- * This is needed for the indirect PoP method as in RFC 4210 section 5.2.8.2.
+ * This is needed for the indirect PoP method as in RFC 9810 section 5.2.8.3.2.
  *
  * returns a pointer to the decrypted certificate
  * returns NULL on error or if no certificate available
  */
 X509 *OSSL_CRMF_ENCRYPTEDKEY_get1_encCert(const OSSL_CRMF_ENCRYPTEDKEY *ecert,
-                                          OSSL_LIB_CTX *libctx, const char *propq,
-                                          EVP_PKEY *pkey, unsigned int flags)
+    OSSL_LIB_CTX *libctx, const char *propq,
+    EVP_PKEY *pkey, unsigned int flags)
 {
 #ifndef OPENSSL_NO_CMS
     BIO *bio;
@@ -912,11 +905,11 @@ X509 *OSSL_CRMF_ENCRYPTEDKEY_get1_encCert(const OSSL_CRMF_ENCRYPTEDKEY *ecert,
 
     if (ecert->type != OSSL_CRMF_ENCRYPTEDKEY_ENVELOPEDDATA)
         return OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert(ecert->value.encryptedValue,
-                                                     libctx, propq, pkey);
+            libctx, propq, pkey);
 #ifndef OPENSSL_NO_CMS
     bio = CMS_EnvelopedData_decrypt(ecert->value.envelopedData, NULL,
-                                    pkey, NULL /* cert */, NULL, flags,
-                                    libctx, propq);
+        pkey, NULL /* cert */, NULL, flags,
+        libctx, propq);
     if (bio == NULL)
         return NULL;
     cert = d2i_X509_bio(bio, NULL);
diff --git a/crypto/crmf/crmf_local.h b/crypto/crmf/crmf_local.h
index 1cda2cb39eb50..44ea4b4843e7e 100644
--- a/crypto/crmf/crmf_local.h
+++ b/crypto/crmf/crmf_local.h
@@ -12,18 +12,18 @@
  */
 
 #ifndef OSSL_CRYPTO_CRMF_LOCAL_H
-# define OSSL_CRYPTO_CRMF_LOCAL_H
+#define OSSL_CRYPTO_CRMF_LOCAL_H
 
-# include <openssl/crmf.h>
-# include <openssl/cms.h> /* for CMS_EnvelopedData and CMS_SignedData */
-# include <openssl/err.h>
-# include "internal/crmf.h" /* for ossl_crmf_attributetypeandvalue_st */
+#include <openssl/crmf.h>
+#include <openssl/cms.h> /* for CMS_EnvelopedData and CMS_SignedData */
+#include <openssl/err.h>
+#include "internal/crmf.h" /* for ossl_crmf_attributetypeandvalue_st */
 
 /* 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>
 
 /*-
  * EncryptedValue ::= SEQUENCE {
@@ -45,10 +45,10 @@
  * }
  */
 struct ossl_crmf_encryptedvalue_st {
-    X509_ALGOR *intendedAlg;      /* 0 */
-    X509_ALGOR *symmAlg;          /* 1 */
-    ASN1_BIT_STRING *encSymmKey;  /* 2 */
-    X509_ALGOR *keyAlg;           /* 3 */
+    X509_ALGOR *intendedAlg; /* 0 */
+    X509_ALGOR *symmAlg; /* 1 */
+    ASN1_BIT_STRING *encSymmKey; /* 2 */
+    X509_ALGOR *keyAlg; /* 3 */
     ASN1_OCTET_STRING *valueHint; /* 4 */
     ASN1_BIT_STRING *encValue;
 } /* OSSL_CRMF_ENCRYPTEDVALUE */;
@@ -60,15 +60,15 @@ struct ossl_crmf_encryptedvalue_st {
  *       -- The encrypted private key MUST be placed in the envelopedData
  *       -- encryptedContentInfo encryptedContent OCTET STRING.
  */
-# define OSSL_CRMF_ENCRYPTEDKEY_ENVELOPEDDATA 1
+#define OSSL_CRMF_ENCRYPTEDKEY_ENVELOPEDDATA 1
 
 struct ossl_crmf_encryptedkey_st {
     int type;
     union {
         OSSL_CRMF_ENCRYPTEDVALUE *encryptedValue; /* 0 */ /* Deprecated */
-# ifndef OPENSSL_NO_CMS
+#ifndef OPENSSL_NO_CMS
         CMS_EnvelopedData *envelopedData; /* 1 */
-# endif
+#endif
     } value;
 } /* OSSL_CRMF_ENCRYPTEDKEY */;
 
@@ -232,7 +232,7 @@ struct ossl_crmf_pbmparameter_st {
     ASN1_INTEGER *iterationCount;
     X509_ALGOR *mac;
 } /* OSSL_CRMF_PBMPARAMETER */;
-# define OSSL_CRMF_PBM_MAX_ITERATION_COUNT 100000 /* if too large allows DoS */
+#define OSSL_CRMF_PBM_MAX_ITERATION_COUNT 100000 /* if too large allows DoS */
 
 /*-
  * POPOSigningKeyInput ::= SEQUENCE {
diff --git a/crypto/crmf/crmf_pbm.c b/crypto/crmf/crmf_pbm.c
index d4c7af38cb0fc..58199fc0d298b 100644
--- a/crypto/crmf/crmf_pbm.c
+++ b/crypto/crmf/crmf_pbm.c
@@ -37,8 +37,8 @@
  * returns pointer to OSSL_CRMF_PBMPARAMETER on success, NULL on error
  */
 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)
 {
     OSSL_CRMF_PBMPARAMETER *pbm = NULL;
     unsigned char *salt = NULL;
@@ -106,7 +106,7 @@ OSSL_CRMF_PBMPARAMETER *OSSL_CRMF_pbmp_new(OSSL_LIB_CTX *libctx, size_t slen,
 
     OPENSSL_free(salt);
     return pbm;
- err:
+err:
     OPENSSL_free(salt);
     OSSL_CRMF_PBMPARAMETER_free(pbm);
     return NULL;
@@ -125,10 +125,10 @@ OSSL_CRMF_PBMPARAMETER *OSSL_CRMF_pbmp_new(OSSL_LIB_CTX *libctx, size_t slen,
  */
 /* could be combined with other MAC calculations in the library */
 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 **out, size_t *outlen)
+    const OSSL_CRMF_PBMPARAMETER *pbmp,
+    const unsigned char *msg, size_t msglen,
+    const unsigned char *sec, size_t seclen,
+    unsigned char **out, size_t *outlen)
 {
     int mac_nid, hmac_md_nid = NID_undef;
     char mdname[OSSL_MAX_NAME_SIZE];
@@ -142,7 +142,7 @@ int OSSL_CRMF_pbm_new(OSSL_LIB_CTX *libctx, const char *propq,
     int ok = 0;
 
     if (out == NULL || pbmp == NULL || pbmp->mac == NULL
-            || pbmp->mac->algorithm == NULL || msg == NULL || sec == NULL) {
+        || pbmp->mac->algorithm == NULL || msg == NULL || sec == NULL) {
         ERR_raise(ERR_LIB_CRMF, CRMF_R_NULL_ARGUMENT);
         goto err;
     }
@@ -175,8 +175,8 @@ int OSSL_CRMF_pbm_new(OSSL_LIB_CTX *libctx, const char *propq,
     if (!EVP_DigestFinal_ex(ctx, basekey, &bklen))
         goto err;
     if (!ASN1_INTEGER_get_int64(&iterations, pbmp->iterationCount)
-            || iterations < 100 /* min from RFC */
-            || iterations > OSSL_CRMF_PBM_MAX_ITERATION_COUNT) {
+        || iterations < 100 /* min from RFC */
+        || iterations > OSSL_CRMF_PBM_MAX_ITERATION_COUNT) {
         ERR_raise(ERR_LIB_CRMF, CRMF_R_BAD_PBM_ITERATIONCOUNT);
         goto err;
     }
@@ -200,18 +200,20 @@ int OSSL_CRMF_pbm_new(OSSL_LIB_CTX *libctx, const char *propq,
 
     if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, mac_nid, NULL, &hmac_md_nid, NULL)
         || OBJ_obj2txt(hmac_mdname, sizeof(hmac_mdname),
-                       OBJ_nid2obj(hmac_md_nid), 0) <= 0) {
+               OBJ_nid2obj(hmac_md_nid), 0)
+            <= 0) {
         ERR_raise(ERR_LIB_CRMF, CRMF_R_UNSUPPORTED_ALGORITHM);
         goto err;
     }
     /* could be generalized to allow non-HMAC: */
     if (EVP_Q_mac(libctx, "HMAC", propq, hmac_mdname, NULL, basekey, bklen,
-                  msg, msglen, mac_res, EVP_MAX_MD_SIZE, outlen) == NULL)
+            msg, msglen, mac_res, EVP_MAX_MD_SIZE, outlen)
+        == NULL)
         goto err;
 
     ok = 1;
 
- err:
+err:
     OPENSSL_cleanse(basekey, bklen);
     EVP_MD_free(owf);
     EVP_MD_CTX_free(ctx);
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 6c1947943879d..54a1ff3688c9b 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -13,28 +13,28 @@
 #include <openssl/safestack.h>
 
 #if defined(_WIN32) && !defined(OPENSSL_SYS_UEFI)
-# include <tchar.h>
-# include <signal.h>
-# ifdef __WATCOMC__
-#  if defined(_UNICODE) || defined(__UNICODE__)
-#   define _vsntprintf _vsnwprintf
-#  else
-#   define _vsntprintf _vsnprintf
-#  endif
-# endif
-# ifdef _MSC_VER
-#  define alloca _alloca
-# endif
+#include <tchar.h>
+#include <signal.h>
+#ifdef __WATCOMC__
+#if defined(_UNICODE) || defined(__UNICODE__)
+#define _vsntprintf _vsnwprintf
+#else
+#define _vsntprintf _vsnprintf
+#endif
+#endif
+#ifdef _MSC_VER
+#define alloca _alloca
+#endif
 
-# if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
-#  ifdef OPENSSL_SYS_WIN_CORE
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0333
+#ifdef OPENSSL_SYS_WIN_CORE
 
 int OPENSSL_isservice(void)
 {
     /* OneCore API cannot interact with GUI */
     return 1;
 }
-#  else
+#else
 int OPENSSL_isservice(void)
 {
     HWINSTA h;
@@ -60,26 +60,25 @@ int OPENSSL_isservice(void)
     }
 
     if (_OPENSSL_isservice.p != (void *)-1)
-        return (*_OPENSSL_isservice.f) ();
+        return (*_OPENSSL_isservice.f)();
 
     h = GetProcessWindowStation();
     if (h == NULL)
         return -1;
 
-    if (GetUserObjectInformationW(h, UOI_NAME, NULL, 0, &len) ||
-        GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+    if (GetUserObjectInformationW(h, UOI_NAME, NULL, 0, &len) || GetLastError() != ERROR_INSUFFICIENT_BUFFER)
         return -1;
 
     if (len > 512)
-        return -1;              /* paranoia */
-    len++, len &= ~1;           /* paranoia */
+        return -1; /* paranoia */
+    len++, len &= ~1; /* paranoia */
     name = (WCHAR *)alloca(len + sizeof(WCHAR));
     if (!GetUserObjectInformationW(h, UOI_NAME, name, len, &len))
         return -1;
 
-    len++, len &= ~1;           /* paranoia */
+    len++, len &= ~1; /* paranoia */
     name[len / sizeof(WCHAR)] = L'\0'; /* paranoia */
-#   if 1
+#if 1
     /*
      * This doesn't cover "interactive" services [working with real
      * WinSta0's] nor programs started non-interactively by Task Scheduler
@@ -87,21 +86,21 @@ int OPENSSL_isservice(void)
      */
     if (wcsstr(name, L"Service-0x"))
         return 1;
-#   else
+#else
     /* This covers all non-interactive programs such as services. */
     if (!wcsstr(name, L"WinSta0"))
         return 1;
-#   endif
+#endif
     else
         return 0;
 }
-#  endif
-# else
+#endif
+#else
 int OPENSSL_isservice(void)
 {
     return 0;
 }
-# endif
+#endif
 
 void OPENSSL_showfatal(const char *fmta, ...)
 {
@@ -114,22 +113,21 @@ void OPENSSL_showfatal(const char *fmta, ...)
      * Windows CE does not have a concept of a console application,
      * so we need to guard the check.
      */
-# ifdef STD_ERROR_HANDLE
+#ifdef STD_ERROR_HANDLE
     HANDLE h;
 
-    if ((h = GetStdHandle(STD_ERROR_HANDLE)) != NULL &&
-        GetFileType(h) != FILE_TYPE_UNKNOWN) {
+    if ((h = GetStdHandle(STD_ERROR_HANDLE)) != NULL && GetFileType(h) != FILE_TYPE_UNKNOWN) {
         /* must be console application */
         int len;
         DWORD out;
 
         va_start(ap, fmta);
         len = _vsnprintf((char *)buf, sizeof(buf), fmta, ap);
-        WriteFile(h, buf, len < 0 ? sizeof(buf) : (DWORD) len, &out, NULL);
+        WriteFile(h, buf, len < 0 ? sizeof(buf) : (DWORD)len, &out, NULL);
         va_end(ap);
         return;
     }
-# endif
+#endif
 
     if (sizeof(TCHAR) == sizeof(char))
         fmt = (const TCHAR *)fmta;
@@ -191,19 +189,19 @@ void OPENSSL_showfatal(const char *fmta, ...)
     buf[OSSL_NELEM(buf) - 1] = _T('\0');
     va_end(ap);
 
-# if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
-#  ifdef OPENSSL_SYS_WIN_CORE
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0333
+#ifdef OPENSSL_SYS_WIN_CORE
     /* ONECORE is always NONGUI and NT >= 0x0601 */
-#   if !defined(NDEBUG)
-        /*
-        * We are in a situation where we tried to report a critical
-        * error and this failed for some reason. As a last resort,
-        * in debug builds, send output to the debugger or any other
-        * tool like DebugView which can monitor the output.
-        */
-        OutputDebugString(buf);
-#   endif
-#  else
+#if !defined(NDEBUG)
+    /*
+     * We are in a situation where we tried to report a critical
+     * error and this failed for some reason. As a last resort,
+     * in debug builds, send output to the debugger or any other
+     * tool like DebugView which can monitor the output.
+     */
+    OutputDebugString(buf);
+#endif
+#else
     /* this -------------v--- guards NT-specific calls */
     if (check_winnt() && OPENSSL_isservice() > 0) {
         HANDLE hEventLog = RegisterEventSource(NULL, _T("OpenSSL"));
@@ -212,8 +210,8 @@ void OPENSSL_showfatal(const char *fmta, ...)
             const TCHAR *pmsg = buf;
 
             if (!ReportEvent(hEventLog, EVENTLOG_ERROR_TYPE, 0, 0, NULL,
-                             1, 0, &pmsg, NULL)) {
-#   if !defined(NDEBUG)
+                    1, 0, &pmsg, NULL)) {
+#if !defined(NDEBUG)
                 /*
                  * We are in a situation where we tried to report a critical
                  * error and this failed for some reason. As a last resort,
@@ -221,7 +219,7 @@ void OPENSSL_showfatal(const char *fmta, ...)
                  * tool like DebugView which can monitor the output.
                  */
                 OutputDebugString(pmsg);
-#   endif
+#endif
             }
 
             (void)DeregisterEventSource(hEventLog);
@@ -229,10 +227,10 @@ void OPENSSL_showfatal(const char *fmta, ...)
     } else {
         MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONERROR);
     }
-#  endif
-# else
+#endif
+#else
     MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONERROR);
-# endif
+#endif
 }
 #else
 void OPENSSL_showfatal(const char *fmta, ...)
@@ -255,16 +253,16 @@ int OPENSSL_isservice(void)
 void OPENSSL_die(const char *message, const char *file, int line)
 {
     OPENSSL_showfatal("%s:%d: OpenSSL internal error: %s\n",
-                      file, line, message);
+        file, line, message);
 #if !defined(_WIN32) || defined(OPENSSL_SYS_UEFI)
     abort();
 #else
     /*
      * Win32 abort() customarily shows a dialog, but we just did that...
      */
-# if !defined(_WIN32_WCE)
+#if !defined(_WIN32_WCE)
     raise(SIGABRT);
-# endif
+#endif
     _exit(3);
 #endif
 }
@@ -275,8 +273,8 @@ void OPENSSL_die(const char *message, const char *file, int line)
  * This is used by platform version identification tools.
  * Do not inline this procedure or make it static.
  */
-# define OPENSSL_VPROC_STRING_(x)    x##_CRYPTO
-# define OPENSSL_VPROC_STRING(x)     OPENSSL_VPROC_STRING_(x)
-# define OPENSSL_VPROC_FUNC          OPENSSL_VPROC_STRING(OPENSSL_VPROC)
-void OPENSSL_VPROC_FUNC(void) {}
+#define OPENSSL_VPROC_STRING_(x) x##_CRYPTO
+#define OPENSSL_VPROC_STRING(x) OPENSSL_VPROC_STRING_(x)
+#define OPENSSL_VPROC_FUNC OPENSSL_VPROC_STRING(OPENSSL_VPROC)
+void OPENSSL_VPROC_FUNC(void) { }
 #endif /* __TANDEM */
diff --git a/crypto/ct/ct_b64.c b/crypto/ct/ct_b64.c
index 2535442063b53..e7eb9740ee08b 100644
--- a/crypto/ct/ct_b64.c
+++ b/crypto/ct/ct_b64.c
@@ -59,13 +59,13 @@ static int ct_base64_decode(const char *in, unsigned char **out)
 }
 
 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)
+    ct_log_entry_type_t entry_type, uint64_t timestamp,
+    const char *extensions_base64,
+    const char *signature_base64)
 {
     SCT *sct = SCT_new();
     unsigned char *dec = NULL;
-    const unsigned char* p = NULL;
+    const unsigned char *p = NULL;
     int declen;
 
     if (sct == NULL) {
@@ -118,7 +118,7 @@ SCT *SCT_new_from_base64(unsigned char version, const char *logid_base64,
 
     return sct;
 
- err:
+err:
     OPENSSL_free(dec);
     SCT_free(sct);
     return NULL;
@@ -131,8 +131,8 @@ SCT *SCT_new_from_base64(unsigned char version, const char *logid_base64,
  * -1 on internal (malloc) failure
  */
 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)
 {
     unsigned char *pkey_der = NULL;
     int pkey_der_len;
@@ -168,7 +168,7 @@ int CTLOG_new_from_base64_ex(CTLOG **ct_log, const char *pkey_base64,
 }
 
 int CTLOG_new_from_base64(CTLOG **ct_log, const char *pkey_base64,
-                          const char *name)
+    const char *name)
 {
     return CTLOG_new_from_base64_ex(ct_log, pkey_base64, name, NULL, NULL);
 }
diff --git a/crypto/ct/ct_err.c b/crypto/ct/ct_err.c
index c4dd05119ebab..21d9061b9b088 100644
--- a/crypto/ct/ct_err.c
+++ b/crypto/ct/ct_err.c
@@ -14,46 +14,46 @@
 
 #ifndef OPENSSL_NO_CT
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA CT_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_BASE64_DECODE_ERROR), "base64 decode error"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_INVALID_LOG_ID_LENGTH),
-    "invalid log id length"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_INVALID), "log conf invalid"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_INVALID_KEY),
-    "log conf invalid key"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_MISSING_DESCRIPTION),
-    "log conf missing description"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_MISSING_KEY),
-    "log conf missing key"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_KEY_INVALID), "log key invalid"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_FUTURE_TIMESTAMP),
-    "sct future timestamp"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_INVALID), "sct invalid"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_INVALID_SIGNATURE),
-    "sct invalid signature"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_LIST_INVALID), "sct list invalid"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_LOG_ID_MISMATCH), "sct log id mismatch"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_NOT_SET), "sct not set"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_UNSUPPORTED_VERSION),
-    "sct unsupported version"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_UNRECOGNIZED_SIGNATURE_NID),
-    "unrecognized signature nid"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_UNSUPPORTED_ENTRY_TYPE),
-    "unsupported entry type"},
-    {ERR_PACK(ERR_LIB_CT, 0, CT_R_UNSUPPORTED_VERSION), "unsupported version"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_BASE64_DECODE_ERROR), "base64 decode error" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_INVALID_LOG_ID_LENGTH),
+        "invalid log id length" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_INVALID), "log conf invalid" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_INVALID_KEY),
+        "log conf invalid key" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_MISSING_DESCRIPTION),
+        "log conf missing description" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_CONF_MISSING_KEY),
+        "log conf missing key" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_LOG_KEY_INVALID), "log key invalid" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_FUTURE_TIMESTAMP),
+        "sct future timestamp" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_INVALID), "sct invalid" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_INVALID_SIGNATURE),
+        "sct invalid signature" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_LIST_INVALID), "sct list invalid" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_LOG_ID_MISMATCH), "sct log id mismatch" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_NOT_SET), "sct not set" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_SCT_UNSUPPORTED_VERSION),
+        "sct unsupported version" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_UNRECOGNIZED_SIGNATURE_NID),
+        "unrecognized signature nid" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_UNSUPPORTED_ENTRY_TYPE),
+        "unsupported entry type" },
+    { ERR_PACK(ERR_LIB_CT, 0, CT_R_UNSUPPORTED_VERSION), "unsupported version" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_CT_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(CT_str_reasons[0].error) == NULL)
         ERR_load_strings_const(CT_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/ct/ct_local.h b/crypto/ct/ct_local.h
index e5614ddf5eb4a..d2f6c48cbdefb 100644
--- a/crypto/ct/ct_local.h
+++ b/crypto/ct/ct_local.h
@@ -18,40 +18,41 @@
  * From RFC6962: opaque SerializedSCT<1..2^16-1>; struct { SerializedSCT
  * sct_list <1..2^16-1>; } SignedCertificateTimestampList;
  */
-# define MAX_SCT_SIZE            65535
-# define MAX_SCT_LIST_SIZE       MAX_SCT_SIZE
+#define MAX_SCT_SIZE 65535
+#define MAX_SCT_LIST_SIZE MAX_SCT_SIZE
 
 /*
  * Macros to read and write integers in network-byte order.
  */
 
-#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 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 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 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 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 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 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 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))
 
 /* Signed Certificate Timestamp */
 struct sct_st {
@@ -63,10 +64,10 @@ struct sct_st {
     unsigned char *log_id;
     size_t log_id_len;
     /*
-    * Note, we cannot distinguish between an unset timestamp, and one
-    * that is set to 0.  However since CT didn't exist in 1970, no real
-    * SCT should ever be set as such.
-    */
+     * Note, we cannot distinguish between an unset timestamp, and one
+     * that is set to 0.  However since CT didn't exist in 1970, no real
+     * SCT should ever be set as such.
+     */
     uint64_t timestamp;
     unsigned char *ext;
     size_t ext_len;
@@ -191,24 +192,24 @@ __owur int SCT_is_complete(const SCT *sct);
 __owur int SCT_signature_is_complete(const SCT *sct);
 
 /*
-* Serialize (to TLS format) an |sct| signature and write it to |out|.
-* If |out| is null, no signature will be output but the length will be returned.
-* If |out| points to a null pointer, a string will be allocated to hold the
-* TLS-format signature. It is the responsibility of the caller to free it.
-* If |out| points to an allocated string, the signature will be written to it.
-* The length of the signature in TLS format will be returned.
-*/
+ * Serialize (to TLS format) an |sct| signature and write it to |out|.
+ * If |out| is null, no signature will be output but the length will be returned.
+ * If |out| points to a null pointer, a string will be allocated to hold the
+ * TLS-format signature. It is the responsibility of the caller to free it.
+ * If |out| points to an allocated string, the signature will be written to it.
+ * The length of the signature in TLS format will be returned.
+ */
 __owur int i2o_SCT_signature(const SCT *sct, unsigned char **out);
 
 /*
-* Parses an SCT signature in TLS format and populates the |sct| with it.
-* |in| should be a pointer to a string containing the TLS-format signature.
-* |in| will be advanced to the end of the signature if parsing succeeds.
-* |len| should be the length of the signature in |in|.
-* Returns the number of bytes parsed, or a negative integer if an error occurs.
-* If an error occurs, the SCT's signature NID may be updated whilst the
-* signature field itself remains unset.
-*/
+ * Parses an SCT signature in TLS format and populates the |sct| with it.
+ * |in| should be a pointer to a string containing the TLS-format signature.
+ * |in| will be advanced to the end of the signature if parsing succeeds.
+ * |len| should be the length of the signature in |in|.
+ * Returns the number of bytes parsed, or a negative integer if an error occurs.
+ * If an error occurs, the SCT's signature NID may be updated whilst the
+ * signature field itself remains unset.
+ */
 __owur int o2i_SCT_signature(SCT *sct, const unsigned char **in, size_t len);
 
 /*
diff --git a/crypto/ct/ct_log.c b/crypto/ct/ct_log.c
index 95084dc76fcdd..b9990dc9a083a 100644
--- a/crypto/ct/ct_log.c
+++ b/crypto/ct/ct_log.c
@@ -56,7 +56,7 @@ static CTLOG_STORE_LOAD_CTX *ctlog_store_load_ctx_new(void);
  * Deletes a CT log store load context.
  * Does not delete any of the fields.
  */
-static void ctlog_store_load_ctx_free(CTLOG_STORE_LOAD_CTX* ctx);
+static void ctlog_store_load_ctx_free(CTLOG_STORE_LOAD_CTX *ctx);
 
 static CTLOG_STORE_LOAD_CTX *ctlog_store_load_ctx_new(void)
 {
@@ -65,7 +65,7 @@ static CTLOG_STORE_LOAD_CTX *ctlog_store_load_ctx_new(void)
     return ctx;
 }
 
-static void ctlog_store_load_ctx_free(CTLOG_STORE_LOAD_CTX* ctx)
+static void ctlog_store_load_ctx_free(CTLOG_STORE_LOAD_CTX *ctx)
 {
     OPENSSL_free(ctx);
 }
@@ -90,7 +90,7 @@ static int ct_v1_log_id_from_pkey(CTLOG *log, EVP_PKEY *pkey)
     }
 
     ret = EVP_Digest(pkey_der, pkey_der_len, log->log_id, &len, sha256,
-                     NULL);
+        NULL);
 err:
     EVP_MD_free(sha256);
     OPENSSL_free(pkey_der);
@@ -138,7 +138,7 @@ void CTLOG_STORE_free(CTLOG_STORE *store)
 }
 
 static int ctlog_new_from_conf(CTLOG_STORE *store, CTLOG **ct_log,
-                               const CONF *conf, const char *section)
+    const CONF *conf, const char *section)
 {
     const char *description = NCONF_get_string(conf, section, "description");
     char *pkey_base64;
@@ -155,7 +155,7 @@ static int ctlog_new_from_conf(CTLOG_STORE *store, CTLOG **ct_log,
     }
 
     return CTLOG_new_from_base64_ex(ct_log, pkey_base64, description,
-                                    store->libctx, store->propq);
+        store->libctx, store->propq);
 }
 
 int CTLOG_STORE_load_default_file(CTLOG_STORE *store)
@@ -163,7 +163,7 @@ int CTLOG_STORE_load_default_file(CTLOG_STORE *store)
     const char *fpath = ossl_safe_getenv(CTLOG_FILE_EVP);
 
     if (fpath == NULL)
-      fpath = CTLOG_FILE;
+        fpath = CTLOG_FILE;
 
     return CTLOG_STORE_load_file(store, fpath);
 }
@@ -175,7 +175,7 @@ int CTLOG_STORE_load_default_file(CTLOG_STORE *store)
  * It may stop parsing and returns -1 on any internal (malloc) error.
  */
 static int ctlog_store_load_log(const char *log_name, int log_name_len,
-                                void *arg)
+    void *arg)
 {
     CTLOG_STORE_LOAD_CTX *load_ctx = arg;
     CTLOG *ct_log = NULL;
@@ -216,7 +216,7 @@ int CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file)
 {
     int ret = 0;
     char *enabled_logs;
-    CTLOG_STORE_LOAD_CTX* load_ctx = ctlog_store_load_ctx_new();
+    CTLOG_STORE_LOAD_CTX *load_ctx = ctlog_store_load_ctx_new();
 
     if (load_ctx == NULL)
         return 0;
@@ -236,8 +236,7 @@ int CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file)
         goto end;
     }
 
-    if (!CONF_parse_list(enabled_logs, ',', 1, ctlog_store_load_log, load_ctx) ||
-        load_ctx->invalid_log_entries > 0) {
+    if (!CONF_parse_list(enabled_logs, ',', 1, ctlog_store_load_log, load_ctx) || load_ctx->invalid_log_entries > 0) {
         ERR_raise(ERR_LIB_CT, CT_R_LOG_CONF_INVALID);
         goto end;
     }
@@ -255,7 +254,7 @@ int CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file)
  * Copies the name.
  */
 CTLOG *CTLOG_new_ex(EVP_PKEY *public_key, const char *name, OSSL_LIB_CTX *libctx,
-                    const char *propq)
+    const char *propq)
 {
     CTLOG *ret = OPENSSL_zalloc(sizeof(*ret));
 
@@ -305,7 +304,7 @@ const char *CTLOG_get0_name(const CTLOG *log)
 }
 
 void CTLOG_get0_log_id(const CTLOG *log, const uint8_t **log_id,
-                       size_t *log_id_len)
+    size_t *log_id_len)
 {
     *log_id = log->log_id;
     *log_id_len = CT_V1_HASHLEN;
@@ -321,8 +320,8 @@ EVP_PKEY *CTLOG_get0_public_key(const CTLOG *log)
  * Returns NULL if no match 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)
 {
     int i;
 
diff --git a/crypto/ct/ct_oct.c b/crypto/ct/ct_oct.c
index 145b277109ef9..03885f4dd5475 100644
--- a/crypto/ct/ct_oct.c
+++ b/crypto/ct/ct_oct.c
@@ -8,7 +8,7 @@
  */
 
 #ifdef OPENSSL_NO_CT
-# error "CT is disabled"
+#error "CT is disabled"
 #endif
 
 #include <limits.h>
@@ -166,10 +166,10 @@ int i2o_SCT_signature(const SCT *sct, unsigned char **out)
     }
 
     /*
-    * (1 byte) Hash algorithm
-    * (1 byte) Signature algorithm
-    * (2 bytes + ?) Signature
-    */
+     * (1 byte) Hash algorithm
+     * (1 byte) Signature algorithm
+     * (2 bytes + ?) Signature
+     */
     len = 4 + sct->sig_len;
 
     if (out != NULL) {
@@ -251,7 +251,7 @@ int i2o_SCT(const SCT *sct, unsigned char **out)
 }
 
 STACK_OF(SCT) *o2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp,
-                            size_t len)
+    size_t len)
 {
     STACK_OF(SCT) *sk = NULL;
     size_t list_len, sct_len;
@@ -308,7 +308,7 @@ STACK_OF(SCT) *o2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp,
         *a = sk;
     return sk;
 
- err:
+err:
     if (a == NULL || *a == NULL)
         SCT_LIST_free(sk);
     return NULL;
@@ -342,8 +342,8 @@ int i2o_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp)
                 goto err;
             s2n(sct_len, p2);
         } else {
-          if ((sct_len = i2o_SCT(sk_SCT_value(a, i), NULL)) == -1)
-              goto err;
+            if ((sct_len = i2o_SCT(sk_SCT_value(a, i), NULL)) == -1)
+                goto err;
         }
         len2 += 2 + sct_len;
     }
@@ -359,7 +359,7 @@ int i2o_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp)
     }
     return len2;
 
- err:
+err:
     if (is_pp_new) {
         OPENSSL_free(*pp);
         *pp = NULL;
@@ -368,7 +368,7 @@ int i2o_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp)
 }
 
 STACK_OF(SCT) *d2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp,
-                            long len)
+    long len)
 {
     ASN1_OCTET_STRING *oct = NULL;
     STACK_OF(SCT) *sk = NULL;
diff --git a/crypto/ct/ct_policy.c b/crypto/ct/ct_policy.c
index 725be7ce2ae00..c7b8d8d73fecf 100644
--- a/crypto/ct/ct_policy.c
+++ b/crypto/ct/ct_policy.c
@@ -8,7 +8,7 @@
  */
 
 #ifdef OPENSSL_NO_CT
-# error "CT is disabled"
+#error "CT is disabled"
 #endif
 
 #include <openssl/ct.h>
@@ -26,7 +26,7 @@
 static const time_t SCT_CLOCK_DRIFT_TOLERANCE = 300;
 
 CT_POLICY_EVAL_CTX *CT_POLICY_EVAL_CTX_new_ex(OSSL_LIB_CTX *libctx,
-                                              const char *propq)
+    const char *propq)
 {
     CT_POLICY_EVAL_CTX *ctx = OPENSSL_zalloc(sizeof(CT_POLICY_EVAL_CTX));
     OSSL_TIME now;
@@ -44,7 +44,7 @@ CT_POLICY_EVAL_CTX *CT_POLICY_EVAL_CTX_new_ex(OSSL_LIB_CTX *libctx,
     }
 
     now = ossl_time_add(ossl_time_now(),
-                        ossl_seconds2time(SCT_CLOCK_DRIFT_TOLERANCE));
+        ossl_seconds2time(SCT_CLOCK_DRIFT_TOLERANCE));
     ctx->epoch_time_in_ms = ossl_time2ms(now);
 
     return ctx;
@@ -82,7 +82,7 @@ int CT_POLICY_EVAL_CTX_set1_issuer(CT_POLICY_EVAL_CTX *ctx, X509 *issuer)
 }
 
 void CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(CT_POLICY_EVAL_CTX *ctx,
-                                               CTLOG_STORE *log_store)
+    CTLOG_STORE *log_store)
 {
     ctx->log_store = log_store;
 }
@@ -92,12 +92,12 @@ void CT_POLICY_EVAL_CTX_set_time(CT_POLICY_EVAL_CTX *ctx, uint64_t time_in_ms)
     ctx->epoch_time_in_ms = time_in_ms;
 }
 
-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)
 {
     return ctx->cert;
 }
 
-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)
 {
     return ctx->issuer;
 }
diff --git a/crypto/ct/ct_prn.c b/crypto/ct/ct_prn.c
index 374235b7ec57e..fabd9d213fd66 100644
--- a/crypto/ct/ct_prn.c
+++ b/crypto/ct/ct_prn.c
@@ -8,7 +8,7 @@
  */
 
 #ifdef OPENSSL_NO_CT
-# error "CT is disabled"
+#error "CT is disabled"
 #endif
 
 #include <openssl/asn1.h>
@@ -34,14 +34,14 @@ static void timestamp_print(uint64_t timestamp, BIO *out)
     if (gen == NULL)
         return;
     ASN1_GENERALIZEDTIME_adj(gen, (time_t)0,
-                             (int)(timestamp / 86400000),
-                             (timestamp % 86400000) / 1000);
+        (int)(timestamp / 86400000),
+        (timestamp % 86400000) / 1000);
     /*
      * Note GeneralizedTime from ASN1_GENERALIZETIME_adj is always 15
      * characters long with a final Z. Update it with fractional seconds.
      */
     BIO_snprintf(genstr, sizeof(genstr), "%.14s.%03dZ",
-                 ASN1_STRING_get0_data(gen), (unsigned int)(timestamp % 1000));
+        ASN1_STRING_get0_data(gen), (unsigned int)(timestamp % 1000));
     if (ASN1_GENERALIZEDTIME_set_string(gen, genstr))
         ASN1_GENERALIZEDTIME_print(out, gen);
     ASN1_GENERALIZEDTIME_free(gen);
@@ -68,13 +68,13 @@ const char *SCT_validation_status_string(const SCT *sct)
 }
 
 void SCT_print(const SCT *sct, BIO *out, int indent,
-               const CTLOG_STORE *log_store)
+    const CTLOG_STORE *log_store)
 {
     const CTLOG *log = NULL;
 
     if (log_store != NULL) {
         log = CTLOG_STORE_get0_log_by_id(log_store, sct->log_id,
-                                         sct->log_id_len);
+            sct->log_id_len);
     }
 
     BIO_printf(out, "%*sSigned Certificate Timestamp:", indent, "");
@@ -90,7 +90,7 @@ void SCT_print(const SCT *sct, BIO *out, int indent,
 
     if (log != NULL) {
         BIO_printf(out, "\n%*sLog       : %s", indent + 4, "",
-                   CTLOG_get0_name(log));
+            CTLOG_get0_name(log));
     }
 
     BIO_printf(out, "\n%*sLog ID    : ", indent + 4, "");
@@ -112,7 +112,7 @@ void SCT_print(const SCT *sct, BIO *out, int indent,
 }
 
 void SCT_LIST_print(const STACK_OF(SCT) *sct_list, BIO *out, int indent,
-                    const char *separator, const CTLOG_STORE *log_store)
+    const char *separator, const CTLOG_STORE *log_store)
 {
     int sct_count = sk_SCT_num(sct_list);
     int i;
diff --git a/crypto/ct/ct_sct.c b/crypto/ct/ct_sct.c
index ec87d02309f30..4a59f7dd88901 100644
--- a/crypto/ct/ct_sct.c
+++ b/crypto/ct/ct_sct.c
@@ -8,7 +8,7 @@
  */
 
 #ifdef OPENSSL_NO_CT
-# error "CT disabled"
+#error "CT disabled"
 #endif
 
 #include <openssl/ct.h>
@@ -110,7 +110,6 @@ int SCT_set1_log_id(SCT *sct, const unsigned char *log_id, size_t log_id_len)
     return 1;
 }
 
-
 void SCT_set_timestamp(SCT *sct, uint64_t timestamp)
 {
     sct->timestamp = timestamp;
@@ -248,8 +247,7 @@ int SCT_is_complete(const SCT *sct)
 
 int SCT_signature_is_complete(const SCT *sct)
 {
-    return SCT_get_signature_nid(sct) != NID_undef &&
-        sct->sig != NULL && sct->sig_len > 0;
+    return SCT_get_signature_nid(sct) != NID_undef && sct->sig != NULL && sct->sig_len > 0;
 }
 
 sct_source_t SCT_get_source(const SCT *sct)
@@ -296,7 +294,7 @@ int SCT_validate(SCT *sct, const CT_POLICY_EVAL_CTX *ctx)
     }
 
     log = CTLOG_STORE_get0_log_by_id(ctx->log_store,
-                                     sct->log_id, sct->log_id_len);
+        sct->log_id, sct->log_id_len);
 
     /* Similarly, an SCT from an unknown log also cannot be validated. */
     if (log == NULL) {
@@ -352,8 +350,7 @@ int SCT_validate(SCT *sct, const CT_POLICY_EVAL_CTX *ctx)
     if (SCT_CTX_set1_cert(sctx, ctx->cert, NULL) != 1)
         sct->validation_status = SCT_VALIDATION_STATUS_UNVERIFIED;
     else
-        sct->validation_status = SCT_CTX_verify(sctx, sct) == 1 ?
-            SCT_VALIDATION_STATUS_VALID : SCT_VALIDATION_STATUS_INVALID;
+        sct->validation_status = SCT_CTX_verify(sctx, sct) == 1 ? SCT_VALIDATION_STATUS_VALID : SCT_VALIDATION_STATUS_INVALID;
 
 end:
     is_sct_valid = sct->validation_status == SCT_VALIDATION_STATUS_VALID;
diff --git a/crypto/ct/ct_sct_ctx.c b/crypto/ct/ct_sct_ctx.c
index effd724a0af3e..af5be04eff4bc 100644
--- a/crypto/ct/ct_sct_ctx.c
+++ b/crypto/ct/ct_sct_ctx.c
@@ -8,7 +8,7 @@
  */
 
 #ifdef OPENSSL_NO_CT
-# error "CT is disabled"
+#error "CT is disabled"
 #endif
 
 #include <stddef.h>
@@ -81,9 +81,9 @@ __owur static int ct_x509_cert_fixup(X509 *cert, X509 *presigner)
         return 1;
 
     preidx = ct_x509_get_ext(presigner, NID_authority_key_identifier,
-                             &pre_akid_ext_is_dup);
+        &pre_akid_ext_is_dup);
     certidx = ct_x509_get_ext(cert, NID_authority_key_identifier,
-                              &cert_akid_ext_is_dup);
+        &cert_akid_ext_is_dup);
 
     /* An error occurred whilst searching for the extension */
     if (preidx < -1 || certidx < -1)
@@ -109,8 +109,7 @@ __owur static int ct_x509_cert_fixup(X509 *cert, X509 *presigner)
         if (preext == NULL || certext == NULL)
             return 0;
         preextdata = X509_EXTENSION_get_data(preext);
-        if (preextdata == NULL ||
-            !X509_EXTENSION_set_data(certext, preextdata))
+        if (preextdata == NULL || !X509_EXTENSION_set_data(certext, preextdata))
             return 0;
     }
     return 1;
@@ -199,7 +198,7 @@ int SCT_CTX_set1_cert(SCT_CTX *sctx, X509 *cert, X509 *presigner)
 }
 
 __owur static int ct_public_key_hash(SCT_CTX *sctx, X509_PUBKEY *pkey,
-                                     unsigned char **hash, size_t *hash_len)
+    unsigned char **hash, size_t *hash_len)
 {
     int ret = 0;
     unsigned char *md = NULL, *der = NULL;
@@ -235,7 +234,7 @@ __owur static int ct_public_key_hash(SCT_CTX *sctx, X509_PUBKEY *pkey,
 
     md = NULL;
     ret = 1;
- err:
+err:
     EVP_MD_free(sha256);
     OPENSSL_free(md);
     OPENSSL_free(der);
diff --git a/crypto/ct/ct_vfy.c b/crypto/ct/ct_vfy.c
index 27fb79f403833..342a0e6587853 100644
--- a/crypto/ct/ct_vfy.c
+++ b/crypto/ct/ct_vfy.c
@@ -98,9 +98,7 @@ int SCT_CTX_verify(const SCT_CTX *sctx, const SCT *sct)
     EVP_MD_CTX *ctx = NULL;
     int ret = 0;
 
-    if (!SCT_is_complete(sct) || sctx->pkey == NULL ||
-        sct->entry_type == CT_LOG_ENTRY_TYPE_NOT_SET ||
-        (sct->entry_type == CT_LOG_ENTRY_TYPE_PRECERT && sctx->ihash == NULL)) {
+    if (!SCT_is_complete(sct) || sctx->pkey == NULL || sct->entry_type == CT_LOG_ENTRY_TYPE_NOT_SET || (sct->entry_type == CT_LOG_ENTRY_TYPE_PRECERT && sctx->ihash == NULL)) {
         ERR_raise(ERR_LIB_CT, CT_R_SCT_NOT_SET);
         return 0;
     }
@@ -108,8 +106,7 @@ int SCT_CTX_verify(const SCT_CTX *sctx, const SCT *sct)
         ERR_raise(ERR_LIB_CT, CT_R_SCT_UNSUPPORTED_VERSION);
         return 0;
     }
-    if (sct->log_id_len != sctx->pkeyhashlen ||
-        memcmp(sct->log_id, sctx->pkeyhash, sctx->pkeyhashlen) != 0) {
+    if (sct->log_id_len != sctx->pkeyhashlen || memcmp(sct->log_id, sctx->pkeyhash, sctx->pkeyhashlen) != 0) {
         ERR_raise(ERR_LIB_CT, CT_R_SCT_LOG_ID_MISMATCH);
         return 0;
     }
@@ -123,7 +120,7 @@ int SCT_CTX_verify(const SCT_CTX *sctx, const SCT *sct)
         goto end;
 
     if (!EVP_DigestVerifyInit_ex(ctx, NULL, "SHA2-256", sctx->libctx,
-                                 sctx->propq, sctx->pkey, NULL))
+            sctx->propq, sctx->pkey, NULL))
         goto end;
 
     if (!sct_ctx_update(ctx, sctx, sct))
diff --git a/crypto/ct/ct_x509v3.c b/crypto/ct/ct_x509v3.c
index 1284ec711db93..c78a92e9d617b 100644
--- a/crypto/ct/ct_x509v3.c
+++ b/crypto/ct/ct_x509v3.c
@@ -8,7 +8,7 @@
  */
 
 #ifdef OPENSSL_NO_CT
-# error "CT is disabled"
+#error "CT is disabled"
 #endif
 
 #include "ct_local.h"
@@ -20,11 +20,11 @@ static char *i2s_poison(const X509V3_EXT_METHOD *method, void *val)
 
 static void *s2i_poison(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx, const char *str)
 {
-   return ASN1_NULL_new();
+    return ASN1_NULL_new();
 }
 
 static int i2r_SCT_LIST(X509V3_EXT_METHOD *method, STACK_OF(SCT) *sct_list,
-                 BIO *out, int indent)
+    BIO *out, int indent)
 {
     SCT_LIST_print(sct_list, out, indent, "\n", NULL);
     return 1;
@@ -47,22 +47,22 @@ static int set_sct_list_source(STACK_OF(SCT) *s, sct_source_t source)
 }
 
 static STACK_OF(SCT) *x509_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,
-                                            const unsigned char **pp,
-                                            long len)
+    const unsigned char **pp,
+    long len)
 {
-     STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len);
+    STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len);
 
-     if (set_sct_list_source(s, SCT_SOURCE_X509V3_EXTENSION) != 1) {
-         SCT_LIST_free(s);
-         *a = NULL;
-         return NULL;
-     }
-     return s;
+    if (set_sct_list_source(s, SCT_SOURCE_X509V3_EXTENSION) != 1) {
+        SCT_LIST_free(s);
+        *a = NULL;
+        return NULL;
+    }
+    return s;
 }
 
 static STACK_OF(SCT) *ocsp_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,
-                                            const unsigned char **pp,
-                                            long len)
+    const unsigned char **pp,
+    long len)
 {
     STACK_OF(SCT) *s = d2i_SCT_LIST(a, pp, len);
 
@@ -78,27 +78,27 @@ static STACK_OF(SCT) *ocsp_ext_d2i_SCT_LIST(STACK_OF(SCT) **a,
 const X509V3_EXT_METHOD ossl_v3_ct_scts[3] = {
     /* X509v3 extension in certificates that contains SCTs */
     { NID_ct_precert_scts, 0, NULL,
-    NULL, (X509V3_EXT_FREE)SCT_LIST_free,
-    (X509V3_EXT_D2I)x509_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,
-    NULL, NULL,
-    NULL, NULL,
-    (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
-    NULL },
+        NULL, (X509V3_EXT_FREE)SCT_LIST_free,
+        (X509V3_EXT_D2I)x509_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,
+        NULL, NULL,
+        NULL, NULL,
+        (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
+        NULL },
 
     /* X509v3 extension to mark a certificate as a pre-certificate */
     { NID_ct_precert_poison, 0, ASN1_ITEM_ref(ASN1_NULL),
-    NULL, NULL, NULL, NULL,
-    i2s_poison, s2i_poison,
-    NULL, NULL,
-    NULL, NULL,
-    NULL },
+        NULL, NULL, NULL, NULL,
+        i2s_poison, s2i_poison,
+        NULL, NULL,
+        NULL, NULL,
+        NULL },
 
     /* OCSP extension that contains SCTs */
     { NID_ct_cert_scts, 0, NULL,
-    0, (X509V3_EXT_FREE)SCT_LIST_free,
-    (X509V3_EXT_D2I)ocsp_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,
-    NULL, NULL,
-    NULL, NULL,
-    (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
-    NULL },
+        0, (X509V3_EXT_FREE)SCT_LIST_free,
+        (X509V3_EXT_D2I)ocsp_ext_d2i_SCT_LIST, (X509V3_EXT_I2D)i2d_SCT_LIST,
+        NULL, NULL,
+        NULL, NULL,
+        (X509V3_EXT_I2R)i2r_SCT_LIST, NULL,
+        NULL },
 };
diff --git a/crypto/ctype.c b/crypto/ctype.c
index 48b3025ba539d..686fe64165fcb 100644
--- a/crypto/ctype.c
+++ b/crypto/ctype.c
@@ -19,208 +19,208 @@
  * Characters outside of the seven bit ASCII range are detected before indexing.
  */
 static const unsigned short ctype_char_map[128] = {
-   /* 00 nul */ CTYPE_MASK_cntrl,
-   /* 01 soh */ CTYPE_MASK_cntrl,
-   /* 02 stx */ CTYPE_MASK_cntrl,
-   /* 03 etx */ CTYPE_MASK_cntrl,
-   /* 04 eot */ CTYPE_MASK_cntrl,
-   /* 05 enq */ CTYPE_MASK_cntrl,
-   /* 06 ack */ CTYPE_MASK_cntrl,
-   /* 07 \a  */ CTYPE_MASK_cntrl,
-   /* 08 \b  */ CTYPE_MASK_cntrl,
-   /* 09 \t  */ CTYPE_MASK_blank | CTYPE_MASK_cntrl | CTYPE_MASK_space,
-   /* 0A \n  */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
-   /* 0B \v  */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
-   /* 0C \f  */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
-   /* 0D \r  */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
-   /* 0E so  */ CTYPE_MASK_cntrl,
-   /* 0F si  */ CTYPE_MASK_cntrl,
-   /* 10 dle */ CTYPE_MASK_cntrl,
-   /* 11 dc1 */ CTYPE_MASK_cntrl,
-   /* 12 dc2 */ CTYPE_MASK_cntrl,
-   /* 13 dc3 */ CTYPE_MASK_cntrl,
-   /* 14 dc4 */ CTYPE_MASK_cntrl,
-   /* 15 nak */ CTYPE_MASK_cntrl,
-   /* 16 syn */ CTYPE_MASK_cntrl,
-   /* 17 etb */ CTYPE_MASK_cntrl,
-   /* 18 can */ CTYPE_MASK_cntrl,
-   /* 19 em  */ CTYPE_MASK_cntrl,
-   /* 1A sub */ CTYPE_MASK_cntrl,
-   /* 1B esc */ CTYPE_MASK_cntrl,
-   /* 1C fs  */ CTYPE_MASK_cntrl,
-   /* 1D gs  */ CTYPE_MASK_cntrl,
-   /* 1E rs  */ CTYPE_MASK_cntrl,
-   /* 1F us  */ CTYPE_MASK_cntrl,
-   /* 20     */ CTYPE_MASK_blank | CTYPE_MASK_print | CTYPE_MASK_space
-                | CTYPE_MASK_asn1print,
-   /* 21  !  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 22  "  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 23  #  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 24  $  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 25  %  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 26  &  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 27  '  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
-                | CTYPE_MASK_asn1print,
-   /* 28  (  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
-                | CTYPE_MASK_asn1print,
-   /* 29  )  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
-                | CTYPE_MASK_asn1print,
-   /* 2A  *  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 2B  +  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 2C  ,  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
-                | CTYPE_MASK_asn1print,
-   /* 2D  -  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
-                | CTYPE_MASK_asn1print,
-   /* 2E  .  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
-                | CTYPE_MASK_asn1print,
-   /* 2F  /  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 30  0  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 31  1  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 32  2  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 33  3  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 34  4  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 35  5  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 36  6  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 37  7  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 38  8  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 39  9  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 3A  :  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
-                | CTYPE_MASK_asn1print,
-   /* 3B  ;  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 3C  <  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 3D  =  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 3E  >  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 3F  ?  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
-                | CTYPE_MASK_asn1print,
-   /* 40  @  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 41  A  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 42  B  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 43  C  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 44  D  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 45  E  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 46  F  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 47  G  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 48  H  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 49  I  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 4A  J  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 4B  K  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 4C  L  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 4D  M  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 4E  N  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 4F  O  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 50  P  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 51  Q  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 52  R  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 53  S  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 54  T  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 55  U  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 56  V  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 57  W  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 58  X  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 59  Y  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 5A  Z  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 5B  [  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 5C  \  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 5D  ]  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 5E  ^  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 5F  _  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 60  `  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 61  a  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 62  b  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 63  c  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 64  d  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 65  e  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 66  f  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 67  g  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 68  h  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 69  i  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 6A  j  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 6B  k  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 6C  l  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 6D  m  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 6E  n  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 6F  o  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 70  p  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 71  q  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 72  r  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 73  s  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 74  t  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 75  u  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 76  v  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 77  w  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 78  x  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 79  y  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 7A  z  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
-                | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
-   /* 7B  {  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 7C  |  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 7D  }  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 7E  ~  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
-   /* 7F del */ CTYPE_MASK_cntrl
+    /* 00 nul */ CTYPE_MASK_cntrl,
+    /* 01 soh */ CTYPE_MASK_cntrl,
+    /* 02 stx */ CTYPE_MASK_cntrl,
+    /* 03 etx */ CTYPE_MASK_cntrl,
+    /* 04 eot */ CTYPE_MASK_cntrl,
+    /* 05 enq */ CTYPE_MASK_cntrl,
+    /* 06 ack */ CTYPE_MASK_cntrl,
+    /* 07 \a  */ CTYPE_MASK_cntrl,
+    /* 08 \b  */ CTYPE_MASK_cntrl,
+    /* 09 \t  */ CTYPE_MASK_blank | CTYPE_MASK_cntrl | CTYPE_MASK_space,
+    /* 0A \n  */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
+    /* 0B \v  */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
+    /* 0C \f  */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
+    /* 0D \r  */ CTYPE_MASK_cntrl | CTYPE_MASK_space,
+    /* 0E so  */ CTYPE_MASK_cntrl,
+    /* 0F si  */ CTYPE_MASK_cntrl,
+    /* 10 dle */ CTYPE_MASK_cntrl,
+    /* 11 dc1 */ CTYPE_MASK_cntrl,
+    /* 12 dc2 */ CTYPE_MASK_cntrl,
+    /* 13 dc3 */ CTYPE_MASK_cntrl,
+    /* 14 dc4 */ CTYPE_MASK_cntrl,
+    /* 15 nak */ CTYPE_MASK_cntrl,
+    /* 16 syn */ CTYPE_MASK_cntrl,
+    /* 17 etb */ CTYPE_MASK_cntrl,
+    /* 18 can */ CTYPE_MASK_cntrl,
+    /* 19 em  */ CTYPE_MASK_cntrl,
+    /* 1A sub */ CTYPE_MASK_cntrl,
+    /* 1B esc */ CTYPE_MASK_cntrl,
+    /* 1C fs  */ CTYPE_MASK_cntrl,
+    /* 1D gs  */ CTYPE_MASK_cntrl,
+    /* 1E rs  */ CTYPE_MASK_cntrl,
+    /* 1F us  */ CTYPE_MASK_cntrl,
+    /* 20     */ CTYPE_MASK_blank | CTYPE_MASK_print | CTYPE_MASK_space
+        | CTYPE_MASK_asn1print,
+    /* 21  !  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 22  "  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 23  #  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 24  $  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 25  %  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 26  &  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 27  '  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+        | CTYPE_MASK_asn1print,
+    /* 28  (  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+        | CTYPE_MASK_asn1print,
+    /* 29  )  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+        | CTYPE_MASK_asn1print,
+    /* 2A  *  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 2B  +  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 2C  ,  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+        | CTYPE_MASK_asn1print,
+    /* 2D  -  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+        | CTYPE_MASK_asn1print,
+    /* 2E  .  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+        | CTYPE_MASK_asn1print,
+    /* 2F  /  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 30  0  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 31  1  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 32  2  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 33  3  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 34  4  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 35  5  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 36  6  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 37  7  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 38  8  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 39  9  */ CTYPE_MASK_digit | CTYPE_MASK_graph | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 3A  :  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+        | CTYPE_MASK_asn1print,
+    /* 3B  ;  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 3C  <  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 3D  =  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 3E  >  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 3F  ?  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct
+        | CTYPE_MASK_asn1print,
+    /* 40  @  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 41  A  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 42  B  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 43  C  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 44  D  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 45  E  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 46  F  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 47  G  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 48  H  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 49  I  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 4A  J  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 4B  K  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 4C  L  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 4D  M  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 4E  N  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 4F  O  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 50  P  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 51  Q  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 52  R  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 53  S  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 54  T  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 55  U  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 56  V  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 57  W  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 58  X  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 59  Y  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 5A  Z  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_upper
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 5B  [  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 5C  \  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 5D  ]  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 5E  ^  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 5F  _  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 60  `  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 61  a  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 62  b  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 63  c  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 64  d  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 65  e  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 66  f  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_xdigit | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 67  g  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 68  h  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 69  i  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 6A  j  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 6B  k  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 6C  l  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 6D  m  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 6E  n  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 6F  o  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 70  p  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 71  q  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 72  r  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 73  s  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 74  t  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 75  u  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 76  v  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 77  w  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 78  x  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 79  y  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 7A  z  */ CTYPE_MASK_graph | CTYPE_MASK_lower | CTYPE_MASK_print
+        | CTYPE_MASK_base64 | CTYPE_MASK_asn1print,
+    /* 7B  {  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 7C  |  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 7D  }  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 7E  ~  */ CTYPE_MASK_graph | CTYPE_MASK_print | CTYPE_MASK_punct,
+    /* 7F del */ CTYPE_MASK_cntrl
 };
 
 #ifdef CHARSET_EBCDIC
@@ -262,9 +262,9 @@ int ossl_ctype_check(int c, unsigned int mask)
  * accessing memory via ctype_char_map[].
  */
 
-#define ASCII_IS_DIGIT(c)   (c >= 0x30 && c <= 0x39)
-#define ASCII_IS_UPPER(c)   (c >= 0x41 && c <= 0x5A)
-#define ASCII_IS_LOWER(c)   (c >= 0x61 && c <= 0x7A)
+#define ASCII_IS_DIGIT(c) (c >= 0x30 && c <= 0x39)
+#define ASCII_IS_UPPER(c) (c >= 0x41 && c <= 0x5A)
+#define ASCII_IS_LOWER(c) (c >= 0x61 && c <= 0x7A)
 
 int ossl_isdigit(int c)
 {
diff --git a/crypto/cversion.c b/crypto/cversion.c
index 87154645b0f05..1a922961df704 100644
--- a/crypto/cversion.c
+++ b/crypto/cversion.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -63,16 +63,16 @@ static CRYPTO_ONCE version_strings_once = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(version_strings_setup)
 {
     BIO_snprintf(openssldir, sizeof(openssldir), "OPENSSLDIR: \"%s\"",
-                 ossl_get_openssldir());
+        ossl_get_openssldir());
     BIO_snprintf(enginesdir, sizeof(enginesdir), "ENGINESDIR: \"%s\"",
-                 ossl_get_enginesdir());
+        ossl_get_enginesdir());
     BIO_snprintf(modulesdir, sizeof(modulesdir), "MODULESDIR: \"%s\"",
-                 ossl_get_modulesdir());
+        ossl_get_modulesdir());
     return 1;
 }
 
-# define TOSTR(x) #x
-# define OSSL_WINCTX_STRING "OSSL_WINCTX: \"" ## TOSTR(OSSL_WINCTX) ## "\""
+#define TOSTR(x) #x
+#define OSSL_WINCTX_STRING "OSSL_WINCTX: \"" TOSTR(OSSL_WINCTX) "\""
 
 #endif
 
@@ -105,23 +105,23 @@ const char *OpenSSL_version(int t)
         return modulesdir;
 #else
     case OPENSSL_DIR:
-# ifdef OPENSSLDIR
+#ifdef OPENSSLDIR
         return "OPENSSLDIR: \"" OPENSSLDIR "\"";
-# else
+#else
         return "OPENSSLDIR: N/A";
-# endif
+#endif
     case OPENSSL_ENGINES_DIR:
-# ifdef ENGINESDIR
+#ifdef ENGINESDIR
         return "ENGINESDIR: \"" ENGINESDIR "\"";
-# else
+#else
         return "ENGINESDIR: N/A";
-# endif
+#endif
     case OPENSSL_MODULES_DIR:
-# ifdef MODULESDIR
+#ifdef MODULESDIR
         return "MODULESDIR: \"" MODULESDIR "\"";
-# else
+#else
         return "MODULESDIR: N/A";
-# endif
+#endif
 #endif
     case OPENSSL_CPU_INFO:
         if (OPENSSL_info(OPENSSL_INFO_CPU_SETTINGS) != NULL)
diff --git a/crypto/defaults.c b/crypto/defaults.c
index 908539cf31cfe..17d8ffdd7cdb8 100644
--- a/crypto/defaults.c
+++ b/crypto/defaults.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -15,12 +15,13 @@
 
 #if defined(_WIN32) && defined(OSSL_WINCTX)
 
-# define TOSTR(x) #x
-# define MAKESTR(x) TOSTR(x)
-# define NOQUOTE(x) x
-# if defined(OSSL_WINCTX)
-# define REGISTRY_KEY "SOFTWARE\\WOW6432Node\\OpenSSL" ##"-"## MAKESTR(OPENSSL_VERSION_MAJOR) ##"."## MAKESTR(OPENSSL_VERSION_MINOR) ##"-"## MAKESTR(OSSL_WINCTX)
-# endif
+#define TOSTR(x) #x
+#define MAKESTR(x) TOSTR(x)
+#define NOQUOTE(x) x
+#if defined(OSSL_WINCTX)
+#define REGISTRY_KEY "SOFTWARE\\WOW6432Node\\OpenSSL" \
+                     "-" MAKESTR(OPENSSL_VERSION_MAJOR) "." MAKESTR(OPENSSL_VERSION_MINOR) "-" MAKESTR(OSSL_WINCTX)
+#endif
 
 /**
  * @brief The directory where OpenSSL is installed.
@@ -60,51 +61,56 @@ static char *modulesdirptr = NULL;
  *
  * @return A pointer to a char array containing the registry directories.
  */
-static char *get_windows_regdirs(char *dst, LPCTSTR valuename)
+static char *get_windows_regdirs(char *dst, DWORD dstsizebytes, LPCWSTR valuename)
 {
     char *retval = NULL;
-# ifdef REGISTRY_KEY
-    DWORD keysize;
+#ifdef REGISTRY_KEY
+    DWORD keysizebytes;
     DWORD ktype;
     HKEY hkey;
     LSTATUS ret;
     DWORD index = 0;
-    LPCTCH tempstr = NULL;
-   
+    LPCWSTR tempstr = NULL;
+
     ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-                       TEXT(REGISTRY_KEY), KEY_WOW64_32KEY,
-                       KEY_QUERY_VALUE, &hkey);
+        TEXT(REGISTRY_KEY), KEY_WOW64_32KEY,
+        KEY_QUERY_VALUE, &hkey);
     if (ret != ERROR_SUCCESS)
         goto out;
 
-    ret = RegQueryValueEx(hkey, valuename, NULL, &ktype, NULL,
-                          &keysize);
+    /* Always use wide call so we can avoid extra encoding conversions on the output */
+    ret = RegQueryValueExW(hkey, valuename, NULL, &ktype, NULL,
+        &keysizebytes);
     if (ret != ERROR_SUCCESS)
         goto out;
-    if (ktype != REG_EXPAND_SZ)
+    if (ktype != REG_EXPAND_SZ && ktype != REG_SZ)
         goto out;
-    if (keysize > MAX_PATH)
+    if (keysizebytes > MAX_PATH * sizeof(WCHAR))
         goto out;
 
-    keysize++;
-    tempstr = OPENSSL_zalloc(keysize * sizeof(TCHAR));
+    /*
+     * RegQueryValueExW does not guarantee the buffer is null terminated,
+     * so we make space for one in the allocation
+     */
+    tempstr = OPENSSL_zalloc(keysizebytes + sizeof(WCHAR));
 
     if (tempstr == NULL)
         goto out;
 
-    if (RegQueryValueEx(hkey, valuename,
-                        NULL, &ktype, tempstr, &keysize) != ERROR_SUCCESS)
+    if (RegQueryValueExW(hkey, valuename,
+            NULL, &ktype, (LPBYTE)tempstr, &keysizebytes)
+        != ERROR_SUCCESS)
         goto out;
 
-    if (!WideCharToMultiByte(CP_UTF8, 0, tempstr, -1, dst, keysize,
-                             NULL, NULL)) 
+    if (!WideCharToMultiByte(CP_UTF8, 0, tempstr, -1, dst, dstsizebytes,
+            NULL, NULL))
         goto out;
 
     retval = dst;
 out:
     OPENSSL_free(tempstr);
     RegCloseKey(hkey);
-# endif /* REGISTRY_KEY */
+#endif /* REGISTRY_KEY */
     return retval;
 }
 
@@ -117,9 +123,9 @@ static CRYPTO_ONCE defaults_setup_init = CRYPTO_ONCE_STATIC_INIT;
  */
 DEFINE_RUN_ONCE_STATIC(do_defaults_setup)
 {
-    get_windows_regdirs(openssldir, TEXT("OPENSSLDIR"));
-    get_windows_regdirs(enginesdir, TEXT("ENGINESDIR"));
-    get_windows_regdirs(modulesdir, TEXT("MODULESDIR"));
+    get_windows_regdirs(openssldir, sizeof(openssldir), L"OPENSSLDIR");
+    get_windows_regdirs(enginesdir, sizeof(enginesdir), L"ENGINESDIR");
+    get_windows_regdirs(modulesdir, sizeof(modulesdir), L"MODULESDIR");
 
     /*
      * Set our pointers only if the directories are fetched properly
@@ -144,11 +150,11 @@ DEFINE_RUN_ONCE_STATIC(do_defaults_setup)
  */
 const char *ossl_get_openssldir(void)
 {
-#if defined(_WIN32) && defined (OSSL_WINCTX)
+#if defined(_WIN32) && defined(OSSL_WINCTX)
     if (!RUN_ONCE(&defaults_setup_init, do_defaults_setup))
         return NULL;
     return (const char *)openssldirptr;
-# else
+#else
     return OPENSSLDIR;
 #endif
 }
@@ -160,7 +166,7 @@ const char *ossl_get_openssldir(void)
  */
 const char *ossl_get_enginesdir(void)
 {
-#if defined(_WIN32) && defined (OSSL_WINCTX)
+#if defined(_WIN32) && defined(OSSL_WINCTX)
     if (!RUN_ONCE(&defaults_setup_init, do_defaults_setup))
         return NULL;
     return (const char *)enginesdirptr;
@@ -192,7 +198,7 @@ const char *ossl_get_modulesdir(void)
  */
 const char *ossl_get_wininstallcontext(void)
 {
-#if defined(_WIN32) && defined (OSSL_WINCTX)
+#if defined(_WIN32) && defined(OSSL_WINCTX)
     return MAKESTR(OSSL_WINCTX);
 #else
     return "Undefined";
diff --git a/crypto/der_writer.c b/crypto/der_writer.c
index bd330785f9031..5efd481aabab6 100644
--- a/crypto/der_writer.c
+++ b/crypto/der_writer.c
@@ -49,8 +49,8 @@ static int int_end_context(WPACKET *pkt, int tag)
 }
 
 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)
 {
     return int_start_context(pkt, tag)
         && WPACKET_memcpy(pkt, precompiled, precompiled_n)
@@ -68,7 +68,7 @@ int ossl_DER_w_boolean(WPACKET *pkt, int tag, int b)
 }
 
 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)
 {
     return int_start_context(pkt, tag)
         && WPACKET_start_sub_packet(pkt)
@@ -91,9 +91,9 @@ int ossl_DER_w_octet_string_uint32(WPACKET *pkt, int tag, uint32_t value)
 }
 
 static int int_der_w_integer(WPACKET *pkt, int tag,
-                             int (*put_bytes)(WPACKET *pkt, const void *v,
-                                              unsigned int *top_byte),
-                             const void *v)
+    int (*put_bytes)(WPACKET *pkt, const void *v,
+        unsigned int *top_byte),
+    const void *v)
 {
     unsigned int top_byte = 0;
 
@@ -107,7 +107,7 @@ static int int_der_w_integer(WPACKET *pkt, int tag,
 }
 
 static int int_put_bytes_uint32(WPACKET *pkt, const void *v,
-                               unsigned int *top_byte)
+    unsigned int *top_byte)
 {
     const uint32_t *value = v;
     uint32_t tmp = *value;
@@ -131,14 +131,13 @@ int ossl_DER_w_uint32(WPACKET *pkt, int tag, uint32_t v)
 }
 
 static int int_put_bytes_bn(WPACKET *pkt, const void *v,
-                            unsigned int *top_byte)
+    unsigned int *top_byte)
 {
     unsigned char *p = NULL;
     size_t n = BN_num_bytes(v);
 
     /* The BIGNUM limbs are in LE order */
-    *top_byte =
-        ((bn_get_words(v) [(n - 1) / BN_BYTES]) >> (8 * ((n - 1) % BN_BYTES)))
+    *top_byte = ((bn_get_words(v)[(n - 1) / BN_BYTES]) >> (8 * ((n - 1) % BN_BYTES)))
         & 0xFF;
 
     if (!WPACKET_allocate_bytes(pkt, n, &p))
@@ -193,7 +192,7 @@ int ossl_DER_w_end_sequence(WPACKET *pkt, int tag)
         && WPACKET_close(pkt)
         && WPACKET_get_total_written(pkt, &size2)
         && (size1 == size2
-            ? WPACKET_set_flags(pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
-            : WPACKET_put_bytes_u8(pkt, DER_F_CONSTRUCTED | DER_P_SEQUENCE))
+                ? WPACKET_set_flags(pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
+                : WPACKET_put_bytes_u8(pkt, DER_F_CONSTRUCTED | DER_P_SEQUENCE))
         && int_end_context(pkt, tag);
 }
diff --git a/crypto/des/cbc_cksm.c b/crypto/des/cbc_cksm.c
index d8ab38bf23777..b44f348690827 100644
--- a/crypto/des/cbc_cksm.c
+++ b/crypto/des/cbc_cksm.c
@@ -16,8 +16,8 @@
 #include "des_local.h"
 
 DES_LONG DES_cbc_cksum(const unsigned char *in, DES_cblock *output,
-                       long length, DES_key_schedule *schedule,
-                       const_DES_cblock *ivec)
+    long length, DES_key_schedule *schedule,
+    const_DES_cblock *ivec)
 {
     register DES_LONG tout0, tout1, tin0, tin1;
     register long l = length;
diff --git a/crypto/des/cbc_enc.c b/crypto/des/cbc_enc.c
index aa8ac1a5c339f..d13cbe19d2b46 100644
--- a/crypto/des/cbc_enc.c
+++ b/crypto/des/cbc_enc.c
@@ -15,4 +15,6 @@
 
 #define CBC_ENC_C__DONT_UPDATE_IV
 
+/* clang-format off */
 #include "ncbc_enc.c"           /* des_cbc_encrypt */
+/* clang-format on */
diff --git a/crypto/des/cfb64ede.c b/crypto/des/cfb64ede.c
index c8e4e5cd2d933..26613a05fe8a4 100644
--- a/crypto/des/cfb64ede.c
+++ b/crypto/des/cfb64ede.c
@@ -22,9 +22,9 @@
  */
 
 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)
 {
     register DES_LONG v0, v1;
     register long l = length;
@@ -89,9 +89,9 @@ void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
  */
 
 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)
 {
     register DES_LONG d0, d1, v0, v1;
     register unsigned long l = length, n = ((unsigned int)numbits + 7) / 8;
diff --git a/crypto/des/cfb64enc.c b/crypto/des/cfb64enc.c
index 93ebf76825c98..3ddd6819e2ed8 100644
--- a/crypto/des/cfb64enc.c
+++ b/crypto/des/cfb64enc.c
@@ -22,8 +22,8 @@
  */
 
 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)
 {
     register DES_LONG v0, v1;
     register long l = length;
diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c
index 51c4dd2ab916d..35b244b0e2c40 100644
--- a/crypto/des/cfb_enc.c
+++ b/crypto/des/cfb_enc.c
@@ -28,13 +28,12 @@
  * will not be compatible with any encryption prior to that date. Ben.
  */
 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)
 {
     register DES_LONG d0, d1, v0, v1;
     register unsigned long l = length;
-    register int num = numbits / 8, n = (numbits + 7) / 8, i, rem =
-        numbits % 8;
+    register int num = numbits / 8, n = (numbits + 7) / 8, i, rem = numbits % 8;
     DES_LONG ti[2];
     unsigned char *iv;
 #ifndef L_ENDIAN
@@ -90,8 +89,7 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
                     memmove(ovec, ovec + num, 8);
                 else
                     for (i = 0; i < 8; ++i)
-                        ovec[i] = ovec[i + num] << rem |
-                            ovec[i + num + 1] >> (8 - rem);
+                        ovec[i] = ovec[i + num] << rem | ovec[i + num + 1] >> (8 - rem);
 #ifdef L_ENDIAN
                 v0 = sh[0], v1 = sh[1];
 #else
@@ -133,8 +131,7 @@ void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
                     memmove(ovec, ovec + num, 8);
                 else
                     for (i = 0; i < 8; ++i)
-                        ovec[i] = ovec[i + num] << rem |
-                            ovec[i + num + 1] >> (8 - rem);
+                        ovec[i] = ovec[i + num] << rem | ovec[i + num + 1] >> (8 - rem);
 #ifdef L_ENDIAN
                 v0 = sh[0], v1 = sh[1];
 #else
diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c
index 0041f21b8d3ba..4d1f8775ab088 100644
--- a/crypto/des/des_enc.c
+++ b/crypto/des/des_enc.c
@@ -43,39 +43,39 @@ void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
      * loop
      */
     if (enc) {
-        D_ENCRYPT(l, r, 0);     /* 1 */
-        D_ENCRYPT(r, l, 2);     /* 2 */
-        D_ENCRYPT(l, r, 4);     /* 3 */
-        D_ENCRYPT(r, l, 6);     /* 4 */
-        D_ENCRYPT(l, r, 8);     /* 5 */
-        D_ENCRYPT(r, l, 10);    /* 6 */
-        D_ENCRYPT(l, r, 12);    /* 7 */
-        D_ENCRYPT(r, l, 14);    /* 8 */
-        D_ENCRYPT(l, r, 16);    /* 9 */
-        D_ENCRYPT(r, l, 18);    /* 10 */
-        D_ENCRYPT(l, r, 20);    /* 11 */
-        D_ENCRYPT(r, l, 22);    /* 12 */
-        D_ENCRYPT(l, r, 24);    /* 13 */
-        D_ENCRYPT(r, l, 26);    /* 14 */
-        D_ENCRYPT(l, r, 28);    /* 15 */
-        D_ENCRYPT(r, l, 30);    /* 16 */
+        D_ENCRYPT(l, r, 0); /* 1 */
+        D_ENCRYPT(r, l, 2); /* 2 */
+        D_ENCRYPT(l, r, 4); /* 3 */
+        D_ENCRYPT(r, l, 6); /* 4 */
+        D_ENCRYPT(l, r, 8); /* 5 */
+        D_ENCRYPT(r, l, 10); /* 6 */
+        D_ENCRYPT(l, r, 12); /* 7 */
+        D_ENCRYPT(r, l, 14); /* 8 */
+        D_ENCRYPT(l, r, 16); /* 9 */
+        D_ENCRYPT(r, l, 18); /* 10 */
+        D_ENCRYPT(l, r, 20); /* 11 */
+        D_ENCRYPT(r, l, 22); /* 12 */
+        D_ENCRYPT(l, r, 24); /* 13 */
+        D_ENCRYPT(r, l, 26); /* 14 */
+        D_ENCRYPT(l, r, 28); /* 15 */
+        D_ENCRYPT(r, l, 30); /* 16 */
     } else {
-        D_ENCRYPT(l, r, 30);    /* 16 */
-        D_ENCRYPT(r, l, 28);    /* 15 */
-        D_ENCRYPT(l, r, 26);    /* 14 */
-        D_ENCRYPT(r, l, 24);    /* 13 */
-        D_ENCRYPT(l, r, 22);    /* 12 */
-        D_ENCRYPT(r, l, 20);    /* 11 */
-        D_ENCRYPT(l, r, 18);    /* 10 */
-        D_ENCRYPT(r, l, 16);    /* 9 */
-        D_ENCRYPT(l, r, 14);    /* 8 */
-        D_ENCRYPT(r, l, 12);    /* 7 */
-        D_ENCRYPT(l, r, 10);    /* 6 */
-        D_ENCRYPT(r, l, 8);     /* 5 */
-        D_ENCRYPT(l, r, 6);     /* 4 */
-        D_ENCRYPT(r, l, 4);     /* 3 */
-        D_ENCRYPT(l, r, 2);     /* 2 */
-        D_ENCRYPT(r, l, 0);     /* 1 */
+        D_ENCRYPT(l, r, 30); /* 16 */
+        D_ENCRYPT(r, l, 28); /* 15 */
+        D_ENCRYPT(l, r, 26); /* 14 */
+        D_ENCRYPT(r, l, 24); /* 13 */
+        D_ENCRYPT(l, r, 22); /* 12 */
+        D_ENCRYPT(r, l, 20); /* 11 */
+        D_ENCRYPT(l, r, 18); /* 10 */
+        D_ENCRYPT(r, l, 16); /* 9 */
+        D_ENCRYPT(l, r, 14); /* 8 */
+        D_ENCRYPT(r, l, 12); /* 7 */
+        D_ENCRYPT(l, r, 10); /* 6 */
+        D_ENCRYPT(r, l, 8); /* 5 */
+        D_ENCRYPT(l, r, 6); /* 4 */
+        D_ENCRYPT(r, l, 4); /* 3 */
+        D_ENCRYPT(l, r, 2); /* 2 */
+        D_ENCRYPT(r, l, 0); /* 1 */
     }
 
     /* rotate and clear the top bits on machines with 8byte longs */
@@ -112,39 +112,39 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
      * loop
      */
     if (enc) {
-        D_ENCRYPT(l, r, 0);     /* 1 */
-        D_ENCRYPT(r, l, 2);     /* 2 */
-        D_ENCRYPT(l, r, 4);     /* 3 */
-        D_ENCRYPT(r, l, 6);     /* 4 */
-        D_ENCRYPT(l, r, 8);     /* 5 */
-        D_ENCRYPT(r, l, 10);    /* 6 */
-        D_ENCRYPT(l, r, 12);    /* 7 */
-        D_ENCRYPT(r, l, 14);    /* 8 */
-        D_ENCRYPT(l, r, 16);    /* 9 */
-        D_ENCRYPT(r, l, 18);    /* 10 */
-        D_ENCRYPT(l, r, 20);    /* 11 */
-        D_ENCRYPT(r, l, 22);    /* 12 */
-        D_ENCRYPT(l, r, 24);    /* 13 */
-        D_ENCRYPT(r, l, 26);    /* 14 */
-        D_ENCRYPT(l, r, 28);    /* 15 */
-        D_ENCRYPT(r, l, 30);    /* 16 */
+        D_ENCRYPT(l, r, 0); /* 1 */
+        D_ENCRYPT(r, l, 2); /* 2 */
+        D_ENCRYPT(l, r, 4); /* 3 */
+        D_ENCRYPT(r, l, 6); /* 4 */
+        D_ENCRYPT(l, r, 8); /* 5 */
+        D_ENCRYPT(r, l, 10); /* 6 */
+        D_ENCRYPT(l, r, 12); /* 7 */
+        D_ENCRYPT(r, l, 14); /* 8 */
+        D_ENCRYPT(l, r, 16); /* 9 */
+        D_ENCRYPT(r, l, 18); /* 10 */
+        D_ENCRYPT(l, r, 20); /* 11 */
+        D_ENCRYPT(r, l, 22); /* 12 */
+        D_ENCRYPT(l, r, 24); /* 13 */
+        D_ENCRYPT(r, l, 26); /* 14 */
+        D_ENCRYPT(l, r, 28); /* 15 */
+        D_ENCRYPT(r, l, 30); /* 16 */
     } else {
-        D_ENCRYPT(l, r, 30);    /* 16 */
-        D_ENCRYPT(r, l, 28);    /* 15 */
-        D_ENCRYPT(l, r, 26);    /* 14 */
-        D_ENCRYPT(r, l, 24);    /* 13 */
-        D_ENCRYPT(l, r, 22);    /* 12 */
-        D_ENCRYPT(r, l, 20);    /* 11 */
-        D_ENCRYPT(l, r, 18);    /* 10 */
-        D_ENCRYPT(r, l, 16);    /* 9 */
-        D_ENCRYPT(l, r, 14);    /* 8 */
-        D_ENCRYPT(r, l, 12);    /* 7 */
-        D_ENCRYPT(l, r, 10);    /* 6 */
-        D_ENCRYPT(r, l, 8);     /* 5 */
-        D_ENCRYPT(l, r, 6);     /* 4 */
-        D_ENCRYPT(r, l, 4);     /* 3 */
-        D_ENCRYPT(l, r, 2);     /* 2 */
-        D_ENCRYPT(r, l, 0);     /* 1 */
+        D_ENCRYPT(l, r, 30); /* 16 */
+        D_ENCRYPT(r, l, 28); /* 15 */
+        D_ENCRYPT(l, r, 26); /* 14 */
+        D_ENCRYPT(r, l, 24); /* 13 */
+        D_ENCRYPT(l, r, 22); /* 12 */
+        D_ENCRYPT(r, l, 20); /* 11 */
+        D_ENCRYPT(l, r, 18); /* 10 */
+        D_ENCRYPT(r, l, 16); /* 9 */
+        D_ENCRYPT(l, r, 14); /* 8 */
+        D_ENCRYPT(r, l, 12); /* 7 */
+        D_ENCRYPT(l, r, 10); /* 6 */
+        D_ENCRYPT(r, l, 8); /* 5 */
+        D_ENCRYPT(l, r, 6); /* 4 */
+        D_ENCRYPT(r, l, 4); /* 3 */
+        D_ENCRYPT(l, r, 2); /* 2 */
+        D_ENCRYPT(r, l, 0); /* 1 */
     }
     /* rotate and clear the top bits on machines with 8byte longs */
     data[0] = ROTATE(l, 3) & 0xffffffffL;
@@ -153,7 +153,7 @@ void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
 }
 
 void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
-                  DES_key_schedule *ks2, DES_key_schedule *ks3)
+    DES_key_schedule *ks2, DES_key_schedule *ks3)
 {
     register DES_LONG l, r;
 
@@ -173,7 +173,7 @@ void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
 }
 
 void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
-                  DES_key_schedule *ks2, DES_key_schedule *ks3)
+    DES_key_schedule *ks2, DES_key_schedule *ks3)
 {
     register DES_LONG l, r;
 
@@ -194,13 +194,15 @@ void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
 
 #ifndef DES_DEFAULT_OPTIONS
 
-# undef CBC_ENC_C__DONT_UPDATE_IV
+#undef CBC_ENC_C__DONT_UPDATE_IV
+/* clang-format off */
 # include "ncbc_enc.c"          /* DES_ncbc_encrypt */
+/* clang-format on */
 
 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)
 {
     register DES_LONG tin0, tin1;
     register DES_LONG tout0, tout1, xor0, xor1;
@@ -302,4 +304,4 @@ void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
     tin[0] = tin[1] = 0;
 }
 
-#endif                          /* DES_DEFAULT_OPTIONS */
+#endif /* DES_DEFAULT_OPTIONS */
diff --git a/crypto/des/des_local.h b/crypto/des/des_local.h
index d43f2c87374d6..8d08aca7e6123 100644
--- a/crypto/des/des_local.h
+++ b/crypto/des/des_local.h
@@ -8,132 +8,159 @@
  */
 
 #ifndef OSSL_CRYPTO_DES_LOCAL_H
-# define OSSL_CRYPTO_DES_LOCAL_H
+#define OSSL_CRYPTO_DES_LOCAL_H
 
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
 
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-# include <openssl/des.h>
+#include <openssl/des.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
 
-# define ITERATIONS 16
-# define HALF_ITERATIONS 8
+#define ITERATIONS 16
+#define HALF_ITERATIONS 8
 
-# define c2l(c,l)        (l =((DES_LONG)(*((c)++)))    , \
-                         l|=((DES_LONG)(*((c)++)))<< 8L, \
-                         l|=((DES_LONG)(*((c)++)))<<16L, \
-                         l|=((DES_LONG)(*((c)++)))<<24L)
+#define c2l(c, l) (l = ((DES_LONG)(*((c)++))), \
+    l |= ((DES_LONG)(*((c)++))) << 8L,         \
+    l |= ((DES_LONG)(*((c)++))) << 16L,        \
+    l |= ((DES_LONG)(*((c)++))) << 24L)
 
 /* NOTE - c is not incremented as per c2l */
-# define c2ln(c,l1,l2,n) { \
-                        c+=n; \
-                        l1=l2=0; \
-                        switch (n) { \
-                        case 8: l2 =((DES_LONG)(*(--(c))))<<24L; \
-                        /* fall through */                          \
-                        case 7: l2|=((DES_LONG)(*(--(c))))<<16L; \
-                        /* fall through */                          \
-                        case 6: l2|=((DES_LONG)(*(--(c))))<< 8L; \
-                        /* fall through */                          \
-                        case 5: l2|=((DES_LONG)(*(--(c))));      \
-                        /* fall through */                          \
-                        case 4: l1 =((DES_LONG)(*(--(c))))<<24L; \
-                        /* fall through */                          \
-                        case 3: l1|=((DES_LONG)(*(--(c))))<<16L; \
-                        /* fall through */                          \
-                        case 2: l1|=((DES_LONG)(*(--(c))))<< 8L; \
-                        /* fall through */                          \
-                        case 1: l1|=((DES_LONG)(*(--(c))));      \
-                                } \
-                        }
-
-# define l2c(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>24L)&0xff))
+#define c2ln(c, l1, l2, n)                       \
+    {                                            \
+        c += n;                                  \
+        l1 = l2 = 0;                             \
+        switch (n) {                             \
+        case 8:                                  \
+            l2 = ((DES_LONG)(*(--(c)))) << 24L;  \
+        /* fall through */                       \
+        case 7:                                  \
+            l2 |= ((DES_LONG)(*(--(c)))) << 16L; \
+        /* fall through */                       \
+        case 6:                                  \
+            l2 |= ((DES_LONG)(*(--(c)))) << 8L;  \
+        /* fall through */                       \
+        case 5:                                  \
+            l2 |= ((DES_LONG)(*(--(c))));        \
+        /* fall through */                       \
+        case 4:                                  \
+            l1 = ((DES_LONG)(*(--(c)))) << 24L;  \
+        /* fall through */                       \
+        case 3:                                  \
+            l1 |= ((DES_LONG)(*(--(c)))) << 16L; \
+        /* fall through */                       \
+        case 2:                                  \
+            l1 |= ((DES_LONG)(*(--(c)))) << 8L;  \
+        /* fall through */                       \
+        case 1:                                  \
+            l1 |= ((DES_LONG)(*(--(c))));        \
+        }                                        \
+    }
+
+#define l2c(l, c) (*((c)++) = (unsigned char)(((l)) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 8L) & 0xff),          \
+    *((c)++) = (unsigned char)(((l) >> 16L) & 0xff),         \
+    *((c)++) = (unsigned char)(((l) >> 24L) & 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)>>24L)&0xff); \
-                        /* fall through */                                     \
-                        case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \
-                        /* fall through */                                     \
-                        case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \
-                        /* fall through */                                     \
-                        case 5: *(--(c))=(unsigned char)(((l2)     )&0xff); \
-                        /* fall through */                                     \
-                        case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \
-                        /* fall through */                                     \
-                        case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \
-                        /* fall through */                                     \
-                        case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \
-                        /* fall through */                                     \
-                        case 1: *(--(c))=(unsigned char)(((l1)     )&0xff); \
-                                } \
-                        }
-
-# if defined(_MSC_VER)
-#  define ROTATE(a,n)     (_lrotr(a,n))
-# elif defined(__ICC)
-#  define ROTATE(a,n)     (_rotr(a,n))
-# elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
-#  if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-#   define ROTATE(a,n)   ({ register unsigned int ret;   \
-                                asm ("rorl %1,%0"       \
-                                        : "=r"(ret)     \
-                                        : "I"(n),"0"(a) \
-                                        : "cc");        \
-                           ret;                         \
-                        })
-#  elif defined(__riscv_zbb) || defined(__riscv_zbkb)
-#   if __riscv_xlen == 64
-#    define ROTATE(x, n) ({ register unsigned int ret; \
+#define l2cn(l1, l2, c, n)                                    \
+    {                                                         \
+        c += n;                                               \
+        switch (n) {                                          \
+        case 8:                                               \
+            *(--(c)) = (unsigned char)(((l2) >> 24L) & 0xff); \
+        /* fall through */                                    \
+        case 7:                                               \
+            *(--(c)) = (unsigned char)(((l2) >> 16L) & 0xff); \
+        /* fall through */                                    \
+        case 6:                                               \
+            *(--(c)) = (unsigned char)(((l2) >> 8L) & 0xff);  \
+        /* fall through */                                    \
+        case 5:                                               \
+            *(--(c)) = (unsigned char)(((l2)) & 0xff);        \
+        /* fall through */                                    \
+        case 4:                                               \
+            *(--(c)) = (unsigned char)(((l1) >> 24L) & 0xff); \
+        /* fall through */                                    \
+        case 3:                                               \
+            *(--(c)) = (unsigned char)(((l1) >> 16L) & 0xff); \
+        /* fall through */                                    \
+        case 2:                                               \
+            *(--(c)) = (unsigned char)(((l1) >> 8L) & 0xff);  \
+        /* fall through */                                    \
+        case 1:                                               \
+            *(--(c)) = (unsigned char)(((l1)) & 0xff);        \
+        }                                                     \
+    }
+
+#if defined(_MSC_VER)
+#define ROTATE(a, n) (_lrotr(a, n))
+#elif defined(__ICC)
+#define ROTATE(a, n) (_rotr(a, n))
+#elif defined(__GNUC__) && __GNUC__ >= 2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
+#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
+#define ROTATE(a, n) ({        \
+    register unsigned int ret; \
+    asm("rorl %1,%0"           \
+        : "=r"(ret)            \
+        : "I"(n), "0"(a)       \
+        : "cc");               \
+    ret;                       \
+})
+#elif defined(__riscv_zbb) || defined(__riscv_zbkb)
+#if __riscv_xlen == 64
+#define ROTATE(x, n) ({ register unsigned int ret; \
                        asm ("roriw %0, %1, %2"         \
                        : "=r"(ret)                     \
                        : "r"(x), "i"(n)); ret; })
-#   endif
-#   if __riscv_xlen == 32
-#    define ROTATE(x, n) ({ register unsigned int ret; \
+#endif
+#if __riscv_xlen == 32
+#define ROTATE(x, n) ({ register unsigned int ret; \
                        asm ("rori %0, %1, %2"          \
                        : "=r"(ret)                     \
                        : "r"(x), "i"(n)); ret; })
-#   endif
-#  endif
-# endif
-# ifndef ROTATE
-#  define ROTATE(a,n)     (((a)>>(n))+((a)<<(32-(n))))
-# endif
+#endif
+#endif
+#endif
+#ifndef ROTATE
+#define ROTATE(a, n) (((a) >> (n)) + ((a) << (32 - (n))))
+#endif
 
 /*
  * Don't worry about the LOAD_DATA() stuff, that is used by fcrypt() to add
  * it's little bit to the front
  */
 
-# ifdef DES_FCRYPT
-
-#  define LOAD_DATA_tmp(R,S,u,t,E0,E1) \
-        { DES_LONG tmp; LOAD_DATA(R,S,u,t,E0,E1,tmp); }
-
-#  define LOAD_DATA(R,S,u,t,E0,E1,tmp) \
-        t=R^(R>>16L); \
-        u=t&E0; t&=E1; \
-        tmp=(u<<16); u^=R^s[S  ]; u^=tmp; \
-        tmp=(t<<16); t^=R^s[S+1]; t^=tmp
-# else
-#  define LOAD_DATA_tmp(a,b,c,d,e,f) LOAD_DATA(a,b,c,d,e,f,g)
-#  define LOAD_DATA(R,S,u,t,E0,E1,tmp) \
-        u=R^s[S  ]; \
-        t=R^s[S+1]
-# endif
+#ifdef DES_FCRYPT
+
+#define LOAD_DATA_tmp(R, S, u, t, E0, E1)   \
+    {                                       \
+        DES_LONG tmp;                       \
+        LOAD_DATA(R, S, u, t, E0, E1, tmp); \
+    }
+
+#define LOAD_DATA(R, S, u, t, E0, E1, tmp) \
+    t = R ^ (R >> 16L);                    \
+    u = t & E0;                            \
+    t &= E1;                               \
+    tmp = (u << 16);                       \
+    u ^= R ^ s[S];                         \
+    u ^= tmp;                              \
+    tmp = (t << 16);                       \
+    t ^= R ^ s[S + 1];                     \
+    t ^= tmp
+#else
+#define LOAD_DATA_tmp(a, b, c, d, e, f) LOAD_DATA(a, b, c, d, e, f, g)
+#define LOAD_DATA(R, S, u, t, E0, E1, tmp) \
+    u = R ^ s[S];                          \
+    t = R ^ s[S + 1]
+#endif
 
 /*
  * It recently occurred to me that 0^0^0^0^0^0^0 == 0, so there is no reason
@@ -141,84 +168,78 @@
  * since things can be xored directly into L
  */
 
-# define D_ENCRYPT(LL,R,S) { \
-        LOAD_DATA_tmp(R,S,u,t,E0,E1); \
-        t=ROTATE(t,4); \
-        LL^= \
-            DES_SPtrans[0][(u>> 2L)&0x3f]^ \
-            DES_SPtrans[2][(u>>10L)&0x3f]^ \
-            DES_SPtrans[4][(u>>18L)&0x3f]^ \
-            DES_SPtrans[6][(u>>26L)&0x3f]^ \
-            DES_SPtrans[1][(t>> 2L)&0x3f]^ \
-            DES_SPtrans[3][(t>>10L)&0x3f]^ \
-            DES_SPtrans[5][(t>>18L)&0x3f]^ \
-            DES_SPtrans[7][(t>>26L)&0x3f]; }
-
-        /*-
-         * IP and FP
-         * The problem is more of a geometric problem that random bit fiddling.
-         0  1  2  3  4  5  6  7      62 54 46 38 30 22 14  6
-         8  9 10 11 12 13 14 15      60 52 44 36 28 20 12  4
-        16 17 18 19 20 21 22 23      58 50 42 34 26 18 10  2
-        24 25 26 27 28 29 30 31  to  56 48 40 32 24 16  8  0
-
-        32 33 34 35 36 37 38 39      63 55 47 39 31 23 15  7
-        40 41 42 43 44 45 46 47      61 53 45 37 29 21 13  5
-        48 49 50 51 52 53 54 55      59 51 43 35 27 19 11  3
-        56 57 58 59 60 61 62 63      57 49 41 33 25 17  9  1
-
-        The output has been subject to swaps of the form
-        0 1 -> 3 1 but the odd and even bits have been put into
-        2 3    2 0
-        different words.  The main trick is to remember that
-        t=((l>>size)^r)&(mask);
-        r^=t;
-        l^=(t<<size);
-        can be used to swap and move bits between words.
-
-        So l =  0  1  2  3  r = 16 17 18 19
-                4  5  6  7      20 21 22 23
-                8  9 10 11      24 25 26 27
-               12 13 14 15      28 29 30 31
-        becomes (for size == 2 and mask == 0x3333)
-           t =   2^16  3^17 -- --   l =  0  1 16 17  r =  2  3 18 19
-                 6^20  7^21 -- --        4  5 20 21       6  7 22 23
-                10^24 11^25 -- --        8  9 24 25      10 11 24 25
-                14^28 15^29 -- --       12 13 28 29      14 15 28 29
-
-        Thanks for hints from Richard Outerbridge - he told me IP&FP
-        could be done in 15 xor, 10 shifts and 5 ands.
-        When I finally started to think of the problem in 2D
-        I first got ~42 operations without xors.  When I remembered
-        how to use xors :-) I got it to its final state.
-        */
-# define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
-        (b)^=(t),\
-        (a)^=((t)<<(n)))
-
-# define IP(l,r) \
-        { \
-        register DES_LONG tt; \
-        PERM_OP(r,l,tt, 4,0x0f0f0f0fL); \
-        PERM_OP(l,r,tt,16,0x0000ffffL); \
-        PERM_OP(r,l,tt, 2,0x33333333L); \
-        PERM_OP(l,r,tt, 8,0x00ff00ffL); \
-        PERM_OP(r,l,tt, 1,0x55555555L); \
-        }
-
-# define FP(l,r) \
-        { \
-        register DES_LONG tt; \
-        PERM_OP(l,r,tt, 1,0x55555555L); \
-        PERM_OP(r,l,tt, 8,0x00ff00ffL); \
-        PERM_OP(l,r,tt, 2,0x33333333L); \
-        PERM_OP(r,l,tt,16,0x0000ffffL); \
-        PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \
-        }
+#define D_ENCRYPT(LL, R, S)                                                                                                                                                                                                                                                                                \
+    {                                                                                                                                                                                                                                                                                                      \
+        LOAD_DATA_tmp(R, S, u, t, E0, E1);                                                                                                                                                                                                                                                                 \
+        t = ROTATE(t, 4);                                                                                                                                                                                                                                                                                  \
+        LL ^= DES_SPtrans[0][(u >> 2L) & 0x3f] ^ DES_SPtrans[2][(u >> 10L) & 0x3f] ^ DES_SPtrans[4][(u >> 18L) & 0x3f] ^ DES_SPtrans[6][(u >> 26L) & 0x3f] ^ DES_SPtrans[1][(t >> 2L) & 0x3f] ^ DES_SPtrans[3][(t >> 10L) & 0x3f] ^ DES_SPtrans[5][(t >> 18L) & 0x3f] ^ DES_SPtrans[7][(t >> 26L) & 0x3f]; \
+    }
+
+/*-
+ * IP and FP
+ * The problem is more of a geometric problem that random bit fiddling.
+ 0  1  2  3  4  5  6  7      62 54 46 38 30 22 14  6
+ 8  9 10 11 12 13 14 15      60 52 44 36 28 20 12  4
+16 17 18 19 20 21 22 23      58 50 42 34 26 18 10  2
+24 25 26 27 28 29 30 31  to  56 48 40 32 24 16  8  0
+
+32 33 34 35 36 37 38 39      63 55 47 39 31 23 15  7
+40 41 42 43 44 45 46 47      61 53 45 37 29 21 13  5
+48 49 50 51 52 53 54 55      59 51 43 35 27 19 11  3
+56 57 58 59 60 61 62 63      57 49 41 33 25 17  9  1
+
+The output has been subject to swaps of the form
+0 1 -> 3 1 but the odd and even bits have been put into
+2 3    2 0
+different words.  The main trick is to remember that
+t=((l>>size)^r)&(mask);
+r^=t;
+l^=(t<<size);
+can be used to swap and move bits between words.
+
+So l =  0  1  2  3  r = 16 17 18 19
+        4  5  6  7      20 21 22 23
+        8  9 10 11      24 25 26 27
+       12 13 14 15      28 29 30 31
+becomes (for size == 2 and mask == 0x3333)
+   t =   2^16  3^17 -- --   l =  0  1 16 17  r =  2  3 18 19
+         6^20  7^21 -- --        4  5 20 21       6  7 22 23
+        10^24 11^25 -- --        8  9 24 25      10 11 24 25
+        14^28 15^29 -- --       12 13 28 29      14 15 28 29
+
+Thanks for hints from Richard Outerbridge - he told me IP&FP
+could be done in 15 xor, 10 shifts and 5 ands.
+When I finally started to think of the problem in 2D
+I first got ~42 operations without xors.  When I remembered
+how to use xors :-) I got it to its final state.
+*/
+#define PERM_OP(a, b, t, n, m) ((t) = ((((a) >> (n)) ^ (b)) & (m)), \
+    (b) ^= (t),                                                     \
+    (a) ^= ((t) << (n)))
+
+#define IP(l, r)                            \
+    {                                       \
+        register DES_LONG tt;               \
+        PERM_OP(r, l, tt, 4, 0x0f0f0f0fL);  \
+        PERM_OP(l, r, tt, 16, 0x0000ffffL); \
+        PERM_OP(r, l, tt, 2, 0x33333333L);  \
+        PERM_OP(l, r, tt, 8, 0x00ff00ffL);  \
+        PERM_OP(r, l, tt, 1, 0x55555555L);  \
+    }
+
+#define FP(l, r)                            \
+    {                                       \
+        register DES_LONG tt;               \
+        PERM_OP(l, r, tt, 1, 0x55555555L);  \
+        PERM_OP(r, l, tt, 8, 0x00ff00ffL);  \
+        PERM_OP(l, r, tt, 2, 0x33333333L);  \
+        PERM_OP(r, l, tt, 16, 0x0000ffffL); \
+        PERM_OP(l, r, tt, 4, 0x0f0f0f0fL);  \
+    }
 
 extern const DES_LONG DES_SPtrans[8][64];
 
 void fcrypt_body(DES_LONG *out, DES_key_schedule *ks,
-                 DES_LONG Eswap0, DES_LONG Eswap1);
+    DES_LONG Eswap0, DES_LONG Eswap1);
 
 #endif
diff --git a/crypto/des/ecb3_enc.c b/crypto/des/ecb3_enc.c
index 48e524dc36662..8348dc8cc1f2f 100644
--- a/crypto/des/ecb3_enc.c
+++ b/crypto/des/ecb3_enc.c
@@ -16,8 +16,8 @@
 #include "des_local.h"
 
 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)
 {
     register DES_LONG l0, l1;
     DES_LONG ll[2];
diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c
index c230a3737ce86..7f2e90badbd48 100644
--- a/crypto/des/ecb_enc.c
+++ b/crypto/des/ecb_enc.c
@@ -17,7 +17,6 @@
 #include <openssl/opensslv.h>
 #include <openssl/bio.h>
 
-
 const char *DES_options(void)
 {
     static int init = 1;
@@ -34,7 +33,7 @@ const char *DES_options(void)
 }
 
 void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
-                     DES_key_schedule *ks, int enc)
+    DES_key_schedule *ks, int enc)
 {
     register DES_LONG l;
     DES_LONG ll[2];
diff --git a/crypto/des/fcrypt.c b/crypto/des/fcrypt.c
index c3827a61c9bda..ebf5ce0ee0004 100644
--- a/crypto/des/fcrypt.c
+++ b/crypto/des/fcrypt.c
@@ -16,12 +16,12 @@
 /* NOCW */
 #include <stdio.h>
 #ifdef _OSD_POSIX
-# ifndef CHARSET_EBCDIC
-#  define CHARSET_EBCDIC 1
-# endif
+#ifndef CHARSET_EBCDIC
+#define CHARSET_EBCDIC 1
+#endif
 #endif
 #ifdef CHARSET_EBCDIC
-# include <openssl/ebcdic.h>
+#include <openssl/ebcdic.h>
 #endif
 
 #include <openssl/crypto.h>
@@ -32,22 +32,134 @@
  * implementations do.
  */
 static const unsigned char con_salt[128] = {
-    0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9,
-    0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1,
-    0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9,
-    0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1,
-    0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9,
-    0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x00, 0x01,
-    0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09,
-    0x0A, 0x0B, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A,
-    0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12,
-    0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A,
-    0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22,
-    0x23, 0x24, 0x25, 0x20, 0x21, 0x22, 0x23, 0x24,
-    0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C,
-    0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34,
-    0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C,
-    0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44,
+    0xD2,
+    0xD3,
+    0xD4,
+    0xD5,
+    0xD6,
+    0xD7,
+    0xD8,
+    0xD9,
+    0xDA,
+    0xDB,
+    0xDC,
+    0xDD,
+    0xDE,
+    0xDF,
+    0xE0,
+    0xE1,
+    0xE2,
+    0xE3,
+    0xE4,
+    0xE5,
+    0xE6,
+    0xE7,
+    0xE8,
+    0xE9,
+    0xEA,
+    0xEB,
+    0xEC,
+    0xED,
+    0xEE,
+    0xEF,
+    0xF0,
+    0xF1,
+    0xF2,
+    0xF3,
+    0xF4,
+    0xF5,
+    0xF6,
+    0xF7,
+    0xF8,
+    0xF9,
+    0xFA,
+    0xFB,
+    0xFC,
+    0xFD,
+    0xFE,
+    0xFF,
+    0x00,
+    0x01,
+    0x02,
+    0x03,
+    0x04,
+    0x05,
+    0x06,
+    0x07,
+    0x08,
+    0x09,
+    0x0A,
+    0x0B,
+    0x05,
+    0x06,
+    0x07,
+    0x08,
+    0x09,
+    0x0A,
+    0x0B,
+    0x0C,
+    0x0D,
+    0x0E,
+    0x0F,
+    0x10,
+    0x11,
+    0x12,
+    0x13,
+    0x14,
+    0x15,
+    0x16,
+    0x17,
+    0x18,
+    0x19,
+    0x1A,
+    0x1B,
+    0x1C,
+    0x1D,
+    0x1E,
+    0x1F,
+    0x20,
+    0x21,
+    0x22,
+    0x23,
+    0x24,
+    0x25,
+    0x20,
+    0x21,
+    0x22,
+    0x23,
+    0x24,
+    0x25,
+    0x26,
+    0x27,
+    0x28,
+    0x29,
+    0x2A,
+    0x2B,
+    0x2C,
+    0x2D,
+    0x2E,
+    0x2F,
+    0x30,
+    0x31,
+    0x32,
+    0x33,
+    0x34,
+    0x35,
+    0x36,
+    0x37,
+    0x38,
+    0x39,
+    0x3A,
+    0x3B,
+    0x3C,
+    0x3D,
+    0x3E,
+    0x3F,
+    0x40,
+    0x41,
+    0x42,
+    0x43,
+    0x44,
 };
 
 static const unsigned char cov_2char[64] = {
@@ -69,7 +181,7 @@ char *DES_crypt(const char *buf, const char *salt)
     return DES_fcrypt(buf, salt, buff);
 #else
     char e_salt[2 + 1];
-    char e_buf[32 + 1];         /* replace 32 by 8 ? */
+    char e_buf[32 + 1]; /* replace 32 by 8 ? */
     char *ret;
 
     if (salt[0] == '\0' || salt[1] == '\0')
diff --git a/crypto/des/fcrypt_b.c b/crypto/des/fcrypt_b.c
index e843e0e643972..1212e37a53a89 100644
--- a/crypto/des/fcrypt_b.c
+++ b/crypto/des/fcrypt_b.c
@@ -20,16 +20,16 @@
 #undef DES_FCRYPT
 
 #undef PERM_OP
-#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
-        (b)^=(t),\
-        (a)^=((t)<<(n)))
+#define PERM_OP(a, b, t, n, m) ((t) = ((((a) >> (n)) ^ (b)) & (m)), \
+    (b) ^= (t),                                                     \
+    (a) ^= ((t) << (n)))
 
 #undef HPERM_OP
-#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
-        (a)=(a)^(t)^(t>>(16-(n))))\
+#define HPERM_OP(a, t, n, m) ((t) = ((((a) << (16 - (n))) ^ (a)) & (m)), \
+    (a) = (a) ^ (t) ^ (t >> (16 - (n))))
 
 void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
-                 DES_LONG Eswap1)
+    DES_LONG Eswap1)
 {
     register DES_LONG l, r, t, u;
     register DES_LONG *s;
@@ -44,22 +44,22 @@ void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
     E1 = Eswap1;
 
     for (j = 0; j < 25; j++) {
-        D_ENCRYPT(l, r, 0);     /* 1 */
-        D_ENCRYPT(r, l, 2);     /* 2 */
-        D_ENCRYPT(l, r, 4);     /* 3 */
-        D_ENCRYPT(r, l, 6);     /* 4 */
-        D_ENCRYPT(l, r, 8);     /* 5 */
-        D_ENCRYPT(r, l, 10);    /* 6 */
-        D_ENCRYPT(l, r, 12);    /* 7 */
-        D_ENCRYPT(r, l, 14);    /* 8 */
-        D_ENCRYPT(l, r, 16);    /* 9 */
-        D_ENCRYPT(r, l, 18);    /* 10 */
-        D_ENCRYPT(l, r, 20);    /* 11 */
-        D_ENCRYPT(r, l, 22);    /* 12 */
-        D_ENCRYPT(l, r, 24);    /* 13 */
-        D_ENCRYPT(r, l, 26);    /* 14 */
-        D_ENCRYPT(l, r, 28);    /* 15 */
-        D_ENCRYPT(r, l, 30);    /* 16 */
+        D_ENCRYPT(l, r, 0); /* 1 */
+        D_ENCRYPT(r, l, 2); /* 2 */
+        D_ENCRYPT(l, r, 4); /* 3 */
+        D_ENCRYPT(r, l, 6); /* 4 */
+        D_ENCRYPT(l, r, 8); /* 5 */
+        D_ENCRYPT(r, l, 10); /* 6 */
+        D_ENCRYPT(l, r, 12); /* 7 */
+        D_ENCRYPT(r, l, 14); /* 8 */
+        D_ENCRYPT(l, r, 16); /* 9 */
+        D_ENCRYPT(r, l, 18); /* 10 */
+        D_ENCRYPT(l, r, 20); /* 11 */
+        D_ENCRYPT(r, l, 22); /* 12 */
+        D_ENCRYPT(l, r, 24); /* 13 */
+        D_ENCRYPT(r, l, 26); /* 14 */
+        D_ENCRYPT(l, r, 28); /* 15 */
+        D_ENCRYPT(r, l, 30); /* 16 */
         t = l;
         l = r;
         r = t;
@@ -67,11 +67,11 @@ void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
     l = ROTATE(l, 3) & 0xffffffffL;
     r = ROTATE(r, 3) & 0xffffffffL;
 
-    PERM_OP(l, r, t,  1, 0x55555555L);
-    PERM_OP(r, l, t,  8, 0x00ff00ffL);
-    PERM_OP(l, r, t,  2, 0x33333333L);
+    PERM_OP(l, r, t, 1, 0x55555555L);
+    PERM_OP(r, l, t, 8, 0x00ff00ffL);
+    PERM_OP(l, r, t, 2, 0x33333333L);
     PERM_OP(r, l, t, 16, 0x0000ffffL);
-    PERM_OP(l, r, t,  4, 0x0f0f0f0fL);
+    PERM_OP(l, r, t, 4, 0x0f0f0f0fL);
 
     out[0] = r;
     out[1] = l;
diff --git a/crypto/des/ncbc_enc.c b/crypto/des/ncbc_enc.c
index e8decf1fbee00..3f2feb90e58d8 100644
--- a/crypto/des/ncbc_enc.c
+++ b/crypto/des/ncbc_enc.c
@@ -17,11 +17,11 @@
 
 #ifdef CBC_ENC_C__DONT_UPDATE_IV
 void DES_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                     DES_key_schedule *_schedule, DES_cblock *ivec, int enc)
+    DES_key_schedule *_schedule, DES_cblock *ivec, int enc)
 #else
 void DES_ncbc_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, DES_key_schedule *_schedule,
-                      DES_cblock *ivec, int enc)
+    long length, DES_key_schedule *_schedule,
+    DES_cblock *ivec, int enc)
 #endif
 {
     register DES_LONG tin0, tin1;
diff --git a/crypto/des/ofb64ede.c b/crypto/des/ofb64ede.c
index edcfac853011b..b0f9f0441cfb7 100644
--- a/crypto/des/ofb64ede.c
+++ b/crypto/des/ofb64ede.c
@@ -21,9 +21,9 @@
  * used is contained in *num;
  */
 void DES_ede3_ofb64_encrypt(register const unsigned char *in,
-                            register unsigned char *out, long length,
-                            DES_key_schedule *k1, DES_key_schedule *k2,
-                            DES_key_schedule *k3, DES_cblock *ivec, int *num)
+    register unsigned char *out, long length,
+    DES_key_schedule *k1, DES_key_schedule *k2,
+    DES_key_schedule *k3, DES_cblock *ivec, int *num)
 {
     register DES_LONG v0, v1;
     register int n = *num;
diff --git a/crypto/des/ofb64enc.c b/crypto/des/ofb64enc.c
index 73d4e21d2f9bb..df4e2077e96cd 100644
--- a/crypto/des/ofb64enc.c
+++ b/crypto/des/ofb64enc.c
@@ -21,8 +21,8 @@
  * used is contained in *num;
  */
 void DES_ofb64_encrypt(register const unsigned char *in,
-                       register unsigned char *out, long length,
-                       DES_key_schedule *schedule, DES_cblock *ivec, int *num)
+    register unsigned char *out, long length,
+    DES_key_schedule *schedule, DES_cblock *ivec, int *num)
 {
     register DES_LONG v0, v1, t;
     register int n = *num;
diff --git a/crypto/des/ofb_enc.c b/crypto/des/ofb_enc.c
index 50c7f4c43213d..24c184c55e445 100644
--- a/crypto/des/ofb_enc.c
+++ b/crypto/des/ofb_enc.c
@@ -22,8 +22,8 @@
  * will come from the 3rd and half the 4th byte.
  */
 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)
 {
     register DES_LONG d0, d1, vv0, vv1, v0, v1, n = (numbits + 7) / 8;
     register DES_LONG mask0, mask1;
@@ -72,10 +72,10 @@ void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
         } else if (num == 64) {
             v0 = vv0;
             v1 = vv1;
-        } else if (num > 32) {  /* && num != 64 */
+        } else if (num > 32) { /* && num != 64 */
             v0 = ((v1 >> (num - 32)) | (vv0 << (64 - num))) & 0xffffffffL;
             v1 = ((vv0 >> (num - 32)) | (vv1 << (64 - num))) & 0xffffffffL;
-        } else {                /* num < 32 */
+        } else { /* num < 32 */
 
             v0 = ((v0 >> num) | (v1 << (32 - num))) & 0xffffffffL;
             v1 = ((v1 >> num) | (vv0 << (32 - num))) & 0xffffffffL;
diff --git a/crypto/des/pcbc_enc.c b/crypto/des/pcbc_enc.c
index dd9eb1a92774e..33aaf43168538 100644
--- a/crypto/des/pcbc_enc.c
+++ b/crypto/des/pcbc_enc.c
@@ -16,8 +16,8 @@
 #include "des_local.h"
 
 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)
 {
     register DES_LONG sin0, sin1, xor0, xor1, tout0, tout1;
     DES_LONG tin[2];
diff --git a/crypto/des/qud_cksm.c b/crypto/des/qud_cksm.c
index 9f68399077973..d519c48a2f9aa 100644
--- a/crypto/des/qud_cksm.c
+++ b/crypto/des/qud_cksm.c
@@ -23,16 +23,16 @@
 #include "des_local.h"
 
 #define Q_B0(a) (((DES_LONG)(a)))
-#define Q_B1(a) (((DES_LONG)(a))<<8)
-#define Q_B2(a) (((DES_LONG)(a))<<16)
-#define Q_B3(a) (((DES_LONG)(a))<<24)
+#define Q_B1(a) (((DES_LONG)(a)) << 8)
+#define Q_B2(a) (((DES_LONG)(a)) << 16)
+#define Q_B3(a) (((DES_LONG)(a)) << 24)
 
 /* used to scramble things a bit */
 /* Got the value MIT uses via brute force :-) 2/10/90 eay */
-#define NOISE   ((DES_LONG)83653421L)
+#define NOISE ((DES_LONG)83653421L)
 
 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)
 {
     DES_LONG z0, z1, t0, t1;
     int i;
@@ -44,10 +44,8 @@ DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
         out_count = 1;
     lp = (DES_LONG *)&(output[0])[0];
 
-    z0 = Q_B0((*seed)[0]) | Q_B1((*seed)[1]) | Q_B2((*seed)[2]) |
-        Q_B3((*seed)[3]);
-    z1 = Q_B0((*seed)[4]) | Q_B1((*seed)[5]) | Q_B2((*seed)[6]) |
-        Q_B3((*seed)[7]);
+    z0 = Q_B0((*seed)[0]) | Q_B1((*seed)[1]) | Q_B2((*seed)[2]) | Q_B3((*seed)[3]);
+    z1 = Q_B0((*seed)[4]) | Q_B1((*seed)[5]) | Q_B2((*seed)[6]) | Q_B3((*seed)[7]);
 
     for (i = 0; ((i < 4) && (i < out_count)); i++) {
         cp = input;
@@ -66,9 +64,9 @@ DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
             t1 = z1;
             /* square, well sort of square */
             z0 = ((((t0 * t0) & 0xffffffffL) + ((t1 * t1) & 0xffffffffL))
-                  & 0xffffffffL) % 0x7fffffffL;
-            z1 = ((t0 * ((t1 + NOISE) & 0xffffffffL)) & 0xffffffffL) %
-                0x7fffffffL;
+                     & 0xffffffffL)
+                % 0x7fffffffL;
+            z1 = ((t0 * ((t1 + NOISE) & 0xffffffffL)) & 0xffffffffL) % 0x7fffffffL;
         }
         if (lp != NULL) {
             /*
diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index 5c958cdbb6aa4..ae17c5092569b 100644
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -93,23 +93,23 @@ int DES_check_key_parity(const_DES_cblock *key)
  */
 static const DES_cblock weak_keys[] = {
     /* weak keys */
-    {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
-    {0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE},
-    {0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E},
-    {0xE0, 0xE0, 0xE0, 0xE0, 0xF1, 0xF1, 0xF1, 0xF1},
+    { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
+    { 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE },
+    { 0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E },
+    { 0xE0, 0xE0, 0xE0, 0xE0, 0xF1, 0xF1, 0xF1, 0xF1 },
     /* semi-weak keys */
-    {0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE},
-    {0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01},
-    {0x1F, 0xE0, 0x1F, 0xE0, 0x0E, 0xF1, 0x0E, 0xF1},
-    {0xE0, 0x1F, 0xE0, 0x1F, 0xF1, 0x0E, 0xF1, 0x0E},
-    {0x01, 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1},
-    {0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1, 0x01},
-    {0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E, 0xFE},
-    {0xFE, 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E},
-    {0x01, 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E},
-    {0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E, 0x01},
-    {0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE},
-    {0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1}
+    { 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE },
+    { 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01 },
+    { 0x1F, 0xE0, 0x1F, 0xE0, 0x0E, 0xF1, 0x0E, 0xF1 },
+    { 0xE0, 0x1F, 0xE0, 0x1F, 0xF1, 0x0E, 0xF1, 0x0E },
+    { 0x01, 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1 },
+    { 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1, 0x01 },
+    { 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E, 0xFE },
+    { 0xFE, 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E },
+    { 0x01, 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E },
+    { 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E, 0x01 },
+    { 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE },
+    { 0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1 }
 };
 
 /*
@@ -136,162 +136,546 @@ int DES_is_weak_key(const_DES_cblock *key)
  *      (a)=((a)^((t)<<(n))))
  */
 
-#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
-        (a)=(a)^(t)^(t>>(16-(n))))
+#define HPERM_OP(a, t, n, m) ((t) = ((((a) << (16 - (n))) ^ (a)) & (m)), \
+    (a) = (a) ^ (t) ^ (t >> (16 - (n))))
 
 static const DES_LONG des_skb[8][64] = {
     {
-     /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
-     0x00000000L, 0x00000010L, 0x20000000L, 0x20000010L,
-     0x00010000L, 0x00010010L, 0x20010000L, 0x20010010L,
-     0x00000800L, 0x00000810L, 0x20000800L, 0x20000810L,
-     0x00010800L, 0x00010810L, 0x20010800L, 0x20010810L,
-     0x00000020L, 0x00000030L, 0x20000020L, 0x20000030L,
-     0x00010020L, 0x00010030L, 0x20010020L, 0x20010030L,
-     0x00000820L, 0x00000830L, 0x20000820L, 0x20000830L,
-     0x00010820L, 0x00010830L, 0x20010820L, 0x20010830L,
-     0x00080000L, 0x00080010L, 0x20080000L, 0x20080010L,
-     0x00090000L, 0x00090010L, 0x20090000L, 0x20090010L,
-     0x00080800L, 0x00080810L, 0x20080800L, 0x20080810L,
-     0x00090800L, 0x00090810L, 0x20090800L, 0x20090810L,
-     0x00080020L, 0x00080030L, 0x20080020L, 0x20080030L,
-     0x00090020L, 0x00090030L, 0x20090020L, 0x20090030L,
-     0x00080820L, 0x00080830L, 0x20080820L, 0x20080830L,
-     0x00090820L, 0x00090830L, 0x20090820L, 0x20090830L,
-     },
+        /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+        0x00000000L,
+        0x00000010L,
+        0x20000000L,
+        0x20000010L,
+        0x00010000L,
+        0x00010010L,
+        0x20010000L,
+        0x20010010L,
+        0x00000800L,
+        0x00000810L,
+        0x20000800L,
+        0x20000810L,
+        0x00010800L,
+        0x00010810L,
+        0x20010800L,
+        0x20010810L,
+        0x00000020L,
+        0x00000030L,
+        0x20000020L,
+        0x20000030L,
+        0x00010020L,
+        0x00010030L,
+        0x20010020L,
+        0x20010030L,
+        0x00000820L,
+        0x00000830L,
+        0x20000820L,
+        0x20000830L,
+        0x00010820L,
+        0x00010830L,
+        0x20010820L,
+        0x20010830L,
+        0x00080000L,
+        0x00080010L,
+        0x20080000L,
+        0x20080010L,
+        0x00090000L,
+        0x00090010L,
+        0x20090000L,
+        0x20090010L,
+        0x00080800L,
+        0x00080810L,
+        0x20080800L,
+        0x20080810L,
+        0x00090800L,
+        0x00090810L,
+        0x20090800L,
+        0x20090810L,
+        0x00080020L,
+        0x00080030L,
+        0x20080020L,
+        0x20080030L,
+        0x00090020L,
+        0x00090030L,
+        0x20090020L,
+        0x20090030L,
+        0x00080820L,
+        0x00080830L,
+        0x20080820L,
+        0x20080830L,
+        0x00090820L,
+        0x00090830L,
+        0x20090820L,
+        0x20090830L,
+    },
     {
-     /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
-     0x00000000L, 0x02000000L, 0x00002000L, 0x02002000L,
-     0x00200000L, 0x02200000L, 0x00202000L, 0x02202000L,
-     0x00000004L, 0x02000004L, 0x00002004L, 0x02002004L,
-     0x00200004L, 0x02200004L, 0x00202004L, 0x02202004L,
-     0x00000400L, 0x02000400L, 0x00002400L, 0x02002400L,
-     0x00200400L, 0x02200400L, 0x00202400L, 0x02202400L,
-     0x00000404L, 0x02000404L, 0x00002404L, 0x02002404L,
-     0x00200404L, 0x02200404L, 0x00202404L, 0x02202404L,
-     0x10000000L, 0x12000000L, 0x10002000L, 0x12002000L,
-     0x10200000L, 0x12200000L, 0x10202000L, 0x12202000L,
-     0x10000004L, 0x12000004L, 0x10002004L, 0x12002004L,
-     0x10200004L, 0x12200004L, 0x10202004L, 0x12202004L,
-     0x10000400L, 0x12000400L, 0x10002400L, 0x12002400L,
-     0x10200400L, 0x12200400L, 0x10202400L, 0x12202400L,
-     0x10000404L, 0x12000404L, 0x10002404L, 0x12002404L,
-     0x10200404L, 0x12200404L, 0x10202404L, 0x12202404L,
-     },
+        /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
+        0x00000000L,
+        0x02000000L,
+        0x00002000L,
+        0x02002000L,
+        0x00200000L,
+        0x02200000L,
+        0x00202000L,
+        0x02202000L,
+        0x00000004L,
+        0x02000004L,
+        0x00002004L,
+        0x02002004L,
+        0x00200004L,
+        0x02200004L,
+        0x00202004L,
+        0x02202004L,
+        0x00000400L,
+        0x02000400L,
+        0x00002400L,
+        0x02002400L,
+        0x00200400L,
+        0x02200400L,
+        0x00202400L,
+        0x02202400L,
+        0x00000404L,
+        0x02000404L,
+        0x00002404L,
+        0x02002404L,
+        0x00200404L,
+        0x02200404L,
+        0x00202404L,
+        0x02202404L,
+        0x10000000L,
+        0x12000000L,
+        0x10002000L,
+        0x12002000L,
+        0x10200000L,
+        0x12200000L,
+        0x10202000L,
+        0x12202000L,
+        0x10000004L,
+        0x12000004L,
+        0x10002004L,
+        0x12002004L,
+        0x10200004L,
+        0x12200004L,
+        0x10202004L,
+        0x12202004L,
+        0x10000400L,
+        0x12000400L,
+        0x10002400L,
+        0x12002400L,
+        0x10200400L,
+        0x12200400L,
+        0x10202400L,
+        0x12202400L,
+        0x10000404L,
+        0x12000404L,
+        0x10002404L,
+        0x12002404L,
+        0x10200404L,
+        0x12200404L,
+        0x10202404L,
+        0x12202404L,
+    },
     {
-     /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
-     0x00000000L, 0x00000001L, 0x00040000L, 0x00040001L,
-     0x01000000L, 0x01000001L, 0x01040000L, 0x01040001L,
-     0x00000002L, 0x00000003L, 0x00040002L, 0x00040003L,
-     0x01000002L, 0x01000003L, 0x01040002L, 0x01040003L,
-     0x00000200L, 0x00000201L, 0x00040200L, 0x00040201L,
-     0x01000200L, 0x01000201L, 0x01040200L, 0x01040201L,
-     0x00000202L, 0x00000203L, 0x00040202L, 0x00040203L,
-     0x01000202L, 0x01000203L, 0x01040202L, 0x01040203L,
-     0x08000000L, 0x08000001L, 0x08040000L, 0x08040001L,
-     0x09000000L, 0x09000001L, 0x09040000L, 0x09040001L,
-     0x08000002L, 0x08000003L, 0x08040002L, 0x08040003L,
-     0x09000002L, 0x09000003L, 0x09040002L, 0x09040003L,
-     0x08000200L, 0x08000201L, 0x08040200L, 0x08040201L,
-     0x09000200L, 0x09000201L, 0x09040200L, 0x09040201L,
-     0x08000202L, 0x08000203L, 0x08040202L, 0x08040203L,
-     0x09000202L, 0x09000203L, 0x09040202L, 0x09040203L,
-     },
+        /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
+        0x00000000L,
+        0x00000001L,
+        0x00040000L,
+        0x00040001L,
+        0x01000000L,
+        0x01000001L,
+        0x01040000L,
+        0x01040001L,
+        0x00000002L,
+        0x00000003L,
+        0x00040002L,
+        0x00040003L,
+        0x01000002L,
+        0x01000003L,
+        0x01040002L,
+        0x01040003L,
+        0x00000200L,
+        0x00000201L,
+        0x00040200L,
+        0x00040201L,
+        0x01000200L,
+        0x01000201L,
+        0x01040200L,
+        0x01040201L,
+        0x00000202L,
+        0x00000203L,
+        0x00040202L,
+        0x00040203L,
+        0x01000202L,
+        0x01000203L,
+        0x01040202L,
+        0x01040203L,
+        0x08000000L,
+        0x08000001L,
+        0x08040000L,
+        0x08040001L,
+        0x09000000L,
+        0x09000001L,
+        0x09040000L,
+        0x09040001L,
+        0x08000002L,
+        0x08000003L,
+        0x08040002L,
+        0x08040003L,
+        0x09000002L,
+        0x09000003L,
+        0x09040002L,
+        0x09040003L,
+        0x08000200L,
+        0x08000201L,
+        0x08040200L,
+        0x08040201L,
+        0x09000200L,
+        0x09000201L,
+        0x09040200L,
+        0x09040201L,
+        0x08000202L,
+        0x08000203L,
+        0x08040202L,
+        0x08040203L,
+        0x09000202L,
+        0x09000203L,
+        0x09040202L,
+        0x09040203L,
+    },
     {
-     /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
-     0x00000000L, 0x00100000L, 0x00000100L, 0x00100100L,
-     0x00000008L, 0x00100008L, 0x00000108L, 0x00100108L,
-     0x00001000L, 0x00101000L, 0x00001100L, 0x00101100L,
-     0x00001008L, 0x00101008L, 0x00001108L, 0x00101108L,
-     0x04000000L, 0x04100000L, 0x04000100L, 0x04100100L,
-     0x04000008L, 0x04100008L, 0x04000108L, 0x04100108L,
-     0x04001000L, 0x04101000L, 0x04001100L, 0x04101100L,
-     0x04001008L, 0x04101008L, 0x04001108L, 0x04101108L,
-     0x00020000L, 0x00120000L, 0x00020100L, 0x00120100L,
-     0x00020008L, 0x00120008L, 0x00020108L, 0x00120108L,
-     0x00021000L, 0x00121000L, 0x00021100L, 0x00121100L,
-     0x00021008L, 0x00121008L, 0x00021108L, 0x00121108L,
-     0x04020000L, 0x04120000L, 0x04020100L, 0x04120100L,
-     0x04020008L, 0x04120008L, 0x04020108L, 0x04120108L,
-     0x04021000L, 0x04121000L, 0x04021100L, 0x04121100L,
-     0x04021008L, 0x04121008L, 0x04021108L, 0x04121108L,
-     },
+        /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
+        0x00000000L,
+        0x00100000L,
+        0x00000100L,
+        0x00100100L,
+        0x00000008L,
+        0x00100008L,
+        0x00000108L,
+        0x00100108L,
+        0x00001000L,
+        0x00101000L,
+        0x00001100L,
+        0x00101100L,
+        0x00001008L,
+        0x00101008L,
+        0x00001108L,
+        0x00101108L,
+        0x04000000L,
+        0x04100000L,
+        0x04000100L,
+        0x04100100L,
+        0x04000008L,
+        0x04100008L,
+        0x04000108L,
+        0x04100108L,
+        0x04001000L,
+        0x04101000L,
+        0x04001100L,
+        0x04101100L,
+        0x04001008L,
+        0x04101008L,
+        0x04001108L,
+        0x04101108L,
+        0x00020000L,
+        0x00120000L,
+        0x00020100L,
+        0x00120100L,
+        0x00020008L,
+        0x00120008L,
+        0x00020108L,
+        0x00120108L,
+        0x00021000L,
+        0x00121000L,
+        0x00021100L,
+        0x00121100L,
+        0x00021008L,
+        0x00121008L,
+        0x00021108L,
+        0x00121108L,
+        0x04020000L,
+        0x04120000L,
+        0x04020100L,
+        0x04120100L,
+        0x04020008L,
+        0x04120008L,
+        0x04020108L,
+        0x04120108L,
+        0x04021000L,
+        0x04121000L,
+        0x04021100L,
+        0x04121100L,
+        0x04021008L,
+        0x04121008L,
+        0x04021108L,
+        0x04121108L,
+    },
     {
-     /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
-     0x00000000L, 0x10000000L, 0x00010000L, 0x10010000L,
-     0x00000004L, 0x10000004L, 0x00010004L, 0x10010004L,
-     0x20000000L, 0x30000000L, 0x20010000L, 0x30010000L,
-     0x20000004L, 0x30000004L, 0x20010004L, 0x30010004L,
-     0x00100000L, 0x10100000L, 0x00110000L, 0x10110000L,
-     0x00100004L, 0x10100004L, 0x00110004L, 0x10110004L,
-     0x20100000L, 0x30100000L, 0x20110000L, 0x30110000L,
-     0x20100004L, 0x30100004L, 0x20110004L, 0x30110004L,
-     0x00001000L, 0x10001000L, 0x00011000L, 0x10011000L,
-     0x00001004L, 0x10001004L, 0x00011004L, 0x10011004L,
-     0x20001000L, 0x30001000L, 0x20011000L, 0x30011000L,
-     0x20001004L, 0x30001004L, 0x20011004L, 0x30011004L,
-     0x00101000L, 0x10101000L, 0x00111000L, 0x10111000L,
-     0x00101004L, 0x10101004L, 0x00111004L, 0x10111004L,
-     0x20101000L, 0x30101000L, 0x20111000L, 0x30111000L,
-     0x20101004L, 0x30101004L, 0x20111004L, 0x30111004L,
-     },
+        /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+        0x00000000L,
+        0x10000000L,
+        0x00010000L,
+        0x10010000L,
+        0x00000004L,
+        0x10000004L,
+        0x00010004L,
+        0x10010004L,
+        0x20000000L,
+        0x30000000L,
+        0x20010000L,
+        0x30010000L,
+        0x20000004L,
+        0x30000004L,
+        0x20010004L,
+        0x30010004L,
+        0x00100000L,
+        0x10100000L,
+        0x00110000L,
+        0x10110000L,
+        0x00100004L,
+        0x10100004L,
+        0x00110004L,
+        0x10110004L,
+        0x20100000L,
+        0x30100000L,
+        0x20110000L,
+        0x30110000L,
+        0x20100004L,
+        0x30100004L,
+        0x20110004L,
+        0x30110004L,
+        0x00001000L,
+        0x10001000L,
+        0x00011000L,
+        0x10011000L,
+        0x00001004L,
+        0x10001004L,
+        0x00011004L,
+        0x10011004L,
+        0x20001000L,
+        0x30001000L,
+        0x20011000L,
+        0x30011000L,
+        0x20001004L,
+        0x30001004L,
+        0x20011004L,
+        0x30011004L,
+        0x00101000L,
+        0x10101000L,
+        0x00111000L,
+        0x10111000L,
+        0x00101004L,
+        0x10101004L,
+        0x00111004L,
+        0x10111004L,
+        0x20101000L,
+        0x30101000L,
+        0x20111000L,
+        0x30111000L,
+        0x20101004L,
+        0x30101004L,
+        0x20111004L,
+        0x30111004L,
+    },
     {
-     /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
-     0x00000000L, 0x08000000L, 0x00000008L, 0x08000008L,
-     0x00000400L, 0x08000400L, 0x00000408L, 0x08000408L,
-     0x00020000L, 0x08020000L, 0x00020008L, 0x08020008L,
-     0x00020400L, 0x08020400L, 0x00020408L, 0x08020408L,
-     0x00000001L, 0x08000001L, 0x00000009L, 0x08000009L,
-     0x00000401L, 0x08000401L, 0x00000409L, 0x08000409L,
-     0x00020001L, 0x08020001L, 0x00020009L, 0x08020009L,
-     0x00020401L, 0x08020401L, 0x00020409L, 0x08020409L,
-     0x02000000L, 0x0A000000L, 0x02000008L, 0x0A000008L,
-     0x02000400L, 0x0A000400L, 0x02000408L, 0x0A000408L,
-     0x02020000L, 0x0A020000L, 0x02020008L, 0x0A020008L,
-     0x02020400L, 0x0A020400L, 0x02020408L, 0x0A020408L,
-     0x02000001L, 0x0A000001L, 0x02000009L, 0x0A000009L,
-     0x02000401L, 0x0A000401L, 0x02000409L, 0x0A000409L,
-     0x02020001L, 0x0A020001L, 0x02020009L, 0x0A020009L,
-     0x02020401L, 0x0A020401L, 0x02020409L, 0x0A020409L,
-     },
+        /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
+        0x00000000L,
+        0x08000000L,
+        0x00000008L,
+        0x08000008L,
+        0x00000400L,
+        0x08000400L,
+        0x00000408L,
+        0x08000408L,
+        0x00020000L,
+        0x08020000L,
+        0x00020008L,
+        0x08020008L,
+        0x00020400L,
+        0x08020400L,
+        0x00020408L,
+        0x08020408L,
+        0x00000001L,
+        0x08000001L,
+        0x00000009L,
+        0x08000009L,
+        0x00000401L,
+        0x08000401L,
+        0x00000409L,
+        0x08000409L,
+        0x00020001L,
+        0x08020001L,
+        0x00020009L,
+        0x08020009L,
+        0x00020401L,
+        0x08020401L,
+        0x00020409L,
+        0x08020409L,
+        0x02000000L,
+        0x0A000000L,
+        0x02000008L,
+        0x0A000008L,
+        0x02000400L,
+        0x0A000400L,
+        0x02000408L,
+        0x0A000408L,
+        0x02020000L,
+        0x0A020000L,
+        0x02020008L,
+        0x0A020008L,
+        0x02020400L,
+        0x0A020400L,
+        0x02020408L,
+        0x0A020408L,
+        0x02000001L,
+        0x0A000001L,
+        0x02000009L,
+        0x0A000009L,
+        0x02000401L,
+        0x0A000401L,
+        0x02000409L,
+        0x0A000409L,
+        0x02020001L,
+        0x0A020001L,
+        0x02020009L,
+        0x0A020009L,
+        0x02020401L,
+        0x0A020401L,
+        0x02020409L,
+        0x0A020409L,
+    },
     {
-     /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
-     0x00000000L, 0x00000100L, 0x00080000L, 0x00080100L,
-     0x01000000L, 0x01000100L, 0x01080000L, 0x01080100L,
-     0x00000010L, 0x00000110L, 0x00080010L, 0x00080110L,
-     0x01000010L, 0x01000110L, 0x01080010L, 0x01080110L,
-     0x00200000L, 0x00200100L, 0x00280000L, 0x00280100L,
-     0x01200000L, 0x01200100L, 0x01280000L, 0x01280100L,
-     0x00200010L, 0x00200110L, 0x00280010L, 0x00280110L,
-     0x01200010L, 0x01200110L, 0x01280010L, 0x01280110L,
-     0x00000200L, 0x00000300L, 0x00080200L, 0x00080300L,
-     0x01000200L, 0x01000300L, 0x01080200L, 0x01080300L,
-     0x00000210L, 0x00000310L, 0x00080210L, 0x00080310L,
-     0x01000210L, 0x01000310L, 0x01080210L, 0x01080310L,
-     0x00200200L, 0x00200300L, 0x00280200L, 0x00280300L,
-     0x01200200L, 0x01200300L, 0x01280200L, 0x01280300L,
-     0x00200210L, 0x00200310L, 0x00280210L, 0x00280310L,
-     0x01200210L, 0x01200310L, 0x01280210L, 0x01280310L,
-     },
+        /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
+        0x00000000L,
+        0x00000100L,
+        0x00080000L,
+        0x00080100L,
+        0x01000000L,
+        0x01000100L,
+        0x01080000L,
+        0x01080100L,
+        0x00000010L,
+        0x00000110L,
+        0x00080010L,
+        0x00080110L,
+        0x01000010L,
+        0x01000110L,
+        0x01080010L,
+        0x01080110L,
+        0x00200000L,
+        0x00200100L,
+        0x00280000L,
+        0x00280100L,
+        0x01200000L,
+        0x01200100L,
+        0x01280000L,
+        0x01280100L,
+        0x00200010L,
+        0x00200110L,
+        0x00280010L,
+        0x00280110L,
+        0x01200010L,
+        0x01200110L,
+        0x01280010L,
+        0x01280110L,
+        0x00000200L,
+        0x00000300L,
+        0x00080200L,
+        0x00080300L,
+        0x01000200L,
+        0x01000300L,
+        0x01080200L,
+        0x01080300L,
+        0x00000210L,
+        0x00000310L,
+        0x00080210L,
+        0x00080310L,
+        0x01000210L,
+        0x01000310L,
+        0x01080210L,
+        0x01080310L,
+        0x00200200L,
+        0x00200300L,
+        0x00280200L,
+        0x00280300L,
+        0x01200200L,
+        0x01200300L,
+        0x01280200L,
+        0x01280300L,
+        0x00200210L,
+        0x00200310L,
+        0x00280210L,
+        0x00280310L,
+        0x01200210L,
+        0x01200310L,
+        0x01280210L,
+        0x01280310L,
+    },
     {
-     /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
-     0x00000000L, 0x04000000L, 0x00040000L, 0x04040000L,
-     0x00000002L, 0x04000002L, 0x00040002L, 0x04040002L,
-     0x00002000L, 0x04002000L, 0x00042000L, 0x04042000L,
-     0x00002002L, 0x04002002L, 0x00042002L, 0x04042002L,
-     0x00000020L, 0x04000020L, 0x00040020L, 0x04040020L,
-     0x00000022L, 0x04000022L, 0x00040022L, 0x04040022L,
-     0x00002020L, 0x04002020L, 0x00042020L, 0x04042020L,
-     0x00002022L, 0x04002022L, 0x00042022L, 0x04042022L,
-     0x00000800L, 0x04000800L, 0x00040800L, 0x04040800L,
-     0x00000802L, 0x04000802L, 0x00040802L, 0x04040802L,
-     0x00002800L, 0x04002800L, 0x00042800L, 0x04042800L,
-     0x00002802L, 0x04002802L, 0x00042802L, 0x04042802L,
-     0x00000820L, 0x04000820L, 0x00040820L, 0x04040820L,
-     0x00000822L, 0x04000822L, 0x00040822L, 0x04040822L,
-     0x00002820L, 0x04002820L, 0x00042820L, 0x04042820L,
-     0x00002822L, 0x04002822L, 0x00042822L, 0x04042822L,
-     }
+        /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
+        0x00000000L,
+        0x04000000L,
+        0x00040000L,
+        0x04040000L,
+        0x00000002L,
+        0x04000002L,
+        0x00040002L,
+        0x04040002L,
+        0x00002000L,
+        0x04002000L,
+        0x00042000L,
+        0x04042000L,
+        0x00002002L,
+        0x04002002L,
+        0x00042002L,
+        0x04042002L,
+        0x00000020L,
+        0x04000020L,
+        0x00040020L,
+        0x04040020L,
+        0x00000022L,
+        0x04000022L,
+        0x00040022L,
+        0x04040022L,
+        0x00002020L,
+        0x04002020L,
+        0x00042020L,
+        0x04042020L,
+        0x00002022L,
+        0x04002022L,
+        0x00042022L,
+        0x04042022L,
+        0x00000800L,
+        0x04000800L,
+        0x00040800L,
+        0x04040800L,
+        0x00000802L,
+        0x04000802L,
+        0x00040802L,
+        0x04040802L,
+        0x00002800L,
+        0x04002800L,
+        0x00042800L,
+        0x04042800L,
+        0x00002802L,
+        0x04002802L,
+        0x00042802L,
+        0x04042802L,
+        0x00000820L,
+        0x04000820L,
+        0x00040820L,
+        0x04040820L,
+        0x00000822L,
+        0x04000822L,
+        0x00040822L,
+        0x04040822L,
+        0x00002820L,
+        0x04002820L,
+        0x00042820L,
+        0x04042820L,
+        0x00002822L,
+        0x04002822L,
+        0x00042822L,
+        0x04042822L,
+    }
 };
 
 /* Return values as DES_set_key_checked() but always set the key */
@@ -325,8 +709,8 @@ int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule)
 void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
 {
     static const int shifts2[16] = {
-         0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0
-     };
+        0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0
+    };
     register DES_LONG c, d, t, s, t2;
     register const unsigned char *in;
     register DES_LONG *k;
@@ -352,8 +736,7 @@ void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
     PERM_OP(d, c, t, 1, 0x55555555L);
     PERM_OP(c, d, t, 8, 0x00ff00ffL);
     PERM_OP(d, c, t, 1, 0x55555555L);
-    d = (((d & 0x000000ffL) << 16L) | (d & 0x0000ff00L) |
-         ((d & 0x00ff0000L) >> 16L) | ((c & 0xf0000000L) >> 4L));
+    d = (((d & 0x000000ffL) << 16L) | (d & 0x0000ff00L) | ((d & 0x00ff0000L) >> 16L) | ((c & 0xf0000000L) >> 4L));
     c &= 0x0fffffffL;
 
     for (i = 0; i < ITERATIONS; i++) {
@@ -370,15 +753,8 @@ void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
          * could be a few less shifts but I am to lazy at this point in time
          * to investigate
          */
-        s = des_skb[0][(c) & 0x3f] |
-            des_skb[1][((c >> 6L) & 0x03) | ((c >> 7L) & 0x3c)] |
-            des_skb[2][((c >> 13L) & 0x0f) | ((c >> 14L) & 0x30)] |
-            des_skb[3][((c >> 20L) & 0x01) | ((c >> 21L) & 0x06) |
-                       ((c >> 22L) & 0x38)];
-        t = des_skb[4][(d) & 0x3f] |
-            des_skb[5][((d >> 7L) & 0x03) | ((d >> 8L) & 0x3c)] |
-            des_skb[6][(d >> 15L) & 0x3f] |
-            des_skb[7][((d >> 21L) & 0x0f) | ((d >> 22L) & 0x30)];
+        s = des_skb[0][(c) & 0x3f] | des_skb[1][((c >> 6L) & 0x03) | ((c >> 7L) & 0x3c)] | des_skb[2][((c >> 13L) & 0x0f) | ((c >> 14L) & 0x30)] | des_skb[3][((c >> 20L) & 0x01) | ((c >> 21L) & 0x06) | ((c >> 22L) & 0x38)];
+        t = des_skb[4][(d) & 0x3f] | des_skb[5][((d >> 7L) & 0x03) | ((d >> 8L) & 0x3c)] | des_skb[6][(d >> 15L) & 0x3f] | des_skb[7][((d >> 21L) & 0x0f) | ((d >> 22L) & 0x30)];
 
         /* table contained 0213 4657 */
         t2 = ((t << 16L) | (s & 0x0000ffffL)) & 0xffffffffL;
diff --git a/crypto/des/spr.h b/crypto/des/spr.h
index 1fe3394ba0dc1..955fbc2989d8d 100644
--- a/crypto/des/spr.h
+++ b/crypto/des/spr.h
@@ -10,154 +10,538 @@
 const DES_LONG DES_SPtrans[8][64] = {
     {
         /* nibble 0 */
-        0x02080800L, 0x00080000L, 0x02000002L, 0x02080802L,
-        0x02000000L, 0x00080802L, 0x00080002L, 0x02000002L,
-        0x00080802L, 0x02080800L, 0x02080000L, 0x00000802L,
-        0x02000802L, 0x02000000L, 0x00000000L, 0x00080002L,
-        0x00080000L, 0x00000002L, 0x02000800L, 0x00080800L,
-        0x02080802L, 0x02080000L, 0x00000802L, 0x02000800L,
-        0x00000002L, 0x00000800L, 0x00080800L, 0x02080002L,
-        0x00000800L, 0x02000802L, 0x02080002L, 0x00000000L,
-        0x00000000L, 0x02080802L, 0x02000800L, 0x00080002L,
-        0x02080800L, 0x00080000L, 0x00000802L, 0x02000800L,
-        0x02080002L, 0x00000800L, 0x00080800L, 0x02000002L,
-        0x00080802L, 0x00000002L, 0x02000002L, 0x02080000L,
-        0x02080802L, 0x00080800L, 0x02080000L, 0x02000802L,
-        0x02000000L, 0x00000802L, 0x00080002L, 0x00000000L,
-        0x00080000L, 0x02000000L, 0x02000802L, 0x02080800L,
-        0x00000002L, 0x02080002L, 0x00000800L, 0x00080802L,
+        0x02080800L,
+        0x00080000L,
+        0x02000002L,
+        0x02080802L,
+        0x02000000L,
+        0x00080802L,
+        0x00080002L,
+        0x02000002L,
+        0x00080802L,
+        0x02080800L,
+        0x02080000L,
+        0x00000802L,
+        0x02000802L,
+        0x02000000L,
+        0x00000000L,
+        0x00080002L,
+        0x00080000L,
+        0x00000002L,
+        0x02000800L,
+        0x00080800L,
+        0x02080802L,
+        0x02080000L,
+        0x00000802L,
+        0x02000800L,
+        0x00000002L,
+        0x00000800L,
+        0x00080800L,
+        0x02080002L,
+        0x00000800L,
+        0x02000802L,
+        0x02080002L,
+        0x00000000L,
+        0x00000000L,
+        0x02080802L,
+        0x02000800L,
+        0x00080002L,
+        0x02080800L,
+        0x00080000L,
+        0x00000802L,
+        0x02000800L,
+        0x02080002L,
+        0x00000800L,
+        0x00080800L,
+        0x02000002L,
+        0x00080802L,
+        0x00000002L,
+        0x02000002L,
+        0x02080000L,
+        0x02080802L,
+        0x00080800L,
+        0x02080000L,
+        0x02000802L,
+        0x02000000L,
+        0x00000802L,
+        0x00080002L,
+        0x00000000L,
+        0x00080000L,
+        0x02000000L,
+        0x02000802L,
+        0x02080800L,
+        0x00000002L,
+        0x02080002L,
+        0x00000800L,
+        0x00080802L,
     },
     {
         /* nibble 1 */
-        0x40108010L, 0x00000000L, 0x00108000L, 0x40100000L,
-        0x40000010L, 0x00008010L, 0x40008000L, 0x00108000L,
-        0x00008000L, 0x40100010L, 0x00000010L, 0x40008000L,
-        0x00100010L, 0x40108000L, 0x40100000L, 0x00000010L,
-        0x00100000L, 0x40008010L, 0x40100010L, 0x00008000L,
-        0x00108010L, 0x40000000L, 0x00000000L, 0x00100010L,
-        0x40008010L, 0x00108010L, 0x40108000L, 0x40000010L,
-        0x40000000L, 0x00100000L, 0x00008010L, 0x40108010L,
-        0x00100010L, 0x40108000L, 0x40008000L, 0x00108010L,
-        0x40108010L, 0x00100010L, 0x40000010L, 0x00000000L,
-        0x40000000L, 0x00008010L, 0x00100000L, 0x40100010L,
-        0x00008000L, 0x40000000L, 0x00108010L, 0x40008010L,
-        0x40108000L, 0x00008000L, 0x00000000L, 0x40000010L,
-        0x00000010L, 0x40108010L, 0x00108000L, 0x40100000L,
-        0x40100010L, 0x00100000L, 0x00008010L, 0x40008000L,
-        0x40008010L, 0x00000010L, 0x40100000L, 0x00108000L,
+        0x40108010L,
+        0x00000000L,
+        0x00108000L,
+        0x40100000L,
+        0x40000010L,
+        0x00008010L,
+        0x40008000L,
+        0x00108000L,
+        0x00008000L,
+        0x40100010L,
+        0x00000010L,
+        0x40008000L,
+        0x00100010L,
+        0x40108000L,
+        0x40100000L,
+        0x00000010L,
+        0x00100000L,
+        0x40008010L,
+        0x40100010L,
+        0x00008000L,
+        0x00108010L,
+        0x40000000L,
+        0x00000000L,
+        0x00100010L,
+        0x40008010L,
+        0x00108010L,
+        0x40108000L,
+        0x40000010L,
+        0x40000000L,
+        0x00100000L,
+        0x00008010L,
+        0x40108010L,
+        0x00100010L,
+        0x40108000L,
+        0x40008000L,
+        0x00108010L,
+        0x40108010L,
+        0x00100010L,
+        0x40000010L,
+        0x00000000L,
+        0x40000000L,
+        0x00008010L,
+        0x00100000L,
+        0x40100010L,
+        0x00008000L,
+        0x40000000L,
+        0x00108010L,
+        0x40008010L,
+        0x40108000L,
+        0x00008000L,
+        0x00000000L,
+        0x40000010L,
+        0x00000010L,
+        0x40108010L,
+        0x00108000L,
+        0x40100000L,
+        0x40100010L,
+        0x00100000L,
+        0x00008010L,
+        0x40008000L,
+        0x40008010L,
+        0x00000010L,
+        0x40100000L,
+        0x00108000L,
     },
     {
         /* nibble 2 */
-        0x04000001L, 0x04040100L, 0x00000100L, 0x04000101L,
-        0x00040001L, 0x04000000L, 0x04000101L, 0x00040100L,
-        0x04000100L, 0x00040000L, 0x04040000L, 0x00000001L,
-        0x04040101L, 0x00000101L, 0x00000001L, 0x04040001L,
-        0x00000000L, 0x00040001L, 0x04040100L, 0x00000100L,
-        0x00000101L, 0x04040101L, 0x00040000L, 0x04000001L,
-        0x04040001L, 0x04000100L, 0x00040101L, 0x04040000L,
-        0x00040100L, 0x00000000L, 0x04000000L, 0x00040101L,
-        0x04040100L, 0x00000100L, 0x00000001L, 0x00040000L,
-        0x00000101L, 0x00040001L, 0x04040000L, 0x04000101L,
-        0x00000000L, 0x04040100L, 0x00040100L, 0x04040001L,
-        0x00040001L, 0x04000000L, 0x04040101L, 0x00000001L,
-        0x00040101L, 0x04000001L, 0x04000000L, 0x04040101L,
-        0x00040000L, 0x04000100L, 0x04000101L, 0x00040100L,
-        0x04000100L, 0x00000000L, 0x04040001L, 0x00000101L,
-        0x04000001L, 0x00040101L, 0x00000100L, 0x04040000L,
+        0x04000001L,
+        0x04040100L,
+        0x00000100L,
+        0x04000101L,
+        0x00040001L,
+        0x04000000L,
+        0x04000101L,
+        0x00040100L,
+        0x04000100L,
+        0x00040000L,
+        0x04040000L,
+        0x00000001L,
+        0x04040101L,
+        0x00000101L,
+        0x00000001L,
+        0x04040001L,
+        0x00000000L,
+        0x00040001L,
+        0x04040100L,
+        0x00000100L,
+        0x00000101L,
+        0x04040101L,
+        0x00040000L,
+        0x04000001L,
+        0x04040001L,
+        0x04000100L,
+        0x00040101L,
+        0x04040000L,
+        0x00040100L,
+        0x00000000L,
+        0x04000000L,
+        0x00040101L,
+        0x04040100L,
+        0x00000100L,
+        0x00000001L,
+        0x00040000L,
+        0x00000101L,
+        0x00040001L,
+        0x04040000L,
+        0x04000101L,
+        0x00000000L,
+        0x04040100L,
+        0x00040100L,
+        0x04040001L,
+        0x00040001L,
+        0x04000000L,
+        0x04040101L,
+        0x00000001L,
+        0x00040101L,
+        0x04000001L,
+        0x04000000L,
+        0x04040101L,
+        0x00040000L,
+        0x04000100L,
+        0x04000101L,
+        0x00040100L,
+        0x04000100L,
+        0x00000000L,
+        0x04040001L,
+        0x00000101L,
+        0x04000001L,
+        0x00040101L,
+        0x00000100L,
+        0x04040000L,
     },
     {
         /* nibble 3 */
-        0x00401008L, 0x10001000L, 0x00000008L, 0x10401008L,
-        0x00000000L, 0x10400000L, 0x10001008L, 0x00400008L,
-        0x10401000L, 0x10000008L, 0x10000000L, 0x00001008L,
-        0x10000008L, 0x00401008L, 0x00400000L, 0x10000000L,
-        0x10400008L, 0x00401000L, 0x00001000L, 0x00000008L,
-        0x00401000L, 0x10001008L, 0x10400000L, 0x00001000L,
-        0x00001008L, 0x00000000L, 0x00400008L, 0x10401000L,
-        0x10001000L, 0x10400008L, 0x10401008L, 0x00400000L,
-        0x10400008L, 0x00001008L, 0x00400000L, 0x10000008L,
-        0x00401000L, 0x10001000L, 0x00000008L, 0x10400000L,
-        0x10001008L, 0x00000000L, 0x00001000L, 0x00400008L,
-        0x00000000L, 0x10400008L, 0x10401000L, 0x00001000L,
-        0x10000000L, 0x10401008L, 0x00401008L, 0x00400000L,
-        0x10401008L, 0x00000008L, 0x10001000L, 0x00401008L,
-        0x00400008L, 0x00401000L, 0x10400000L, 0x10001008L,
-        0x00001008L, 0x10000000L, 0x10000008L, 0x10401000L,
+        0x00401008L,
+        0x10001000L,
+        0x00000008L,
+        0x10401008L,
+        0x00000000L,
+        0x10400000L,
+        0x10001008L,
+        0x00400008L,
+        0x10401000L,
+        0x10000008L,
+        0x10000000L,
+        0x00001008L,
+        0x10000008L,
+        0x00401008L,
+        0x00400000L,
+        0x10000000L,
+        0x10400008L,
+        0x00401000L,
+        0x00001000L,
+        0x00000008L,
+        0x00401000L,
+        0x10001008L,
+        0x10400000L,
+        0x00001000L,
+        0x00001008L,
+        0x00000000L,
+        0x00400008L,
+        0x10401000L,
+        0x10001000L,
+        0x10400008L,
+        0x10401008L,
+        0x00400000L,
+        0x10400008L,
+        0x00001008L,
+        0x00400000L,
+        0x10000008L,
+        0x00401000L,
+        0x10001000L,
+        0x00000008L,
+        0x10400000L,
+        0x10001008L,
+        0x00000000L,
+        0x00001000L,
+        0x00400008L,
+        0x00000000L,
+        0x10400008L,
+        0x10401000L,
+        0x00001000L,
+        0x10000000L,
+        0x10401008L,
+        0x00401008L,
+        0x00400000L,
+        0x10401008L,
+        0x00000008L,
+        0x10001000L,
+        0x00401008L,
+        0x00400008L,
+        0x00401000L,
+        0x10400000L,
+        0x10001008L,
+        0x00001008L,
+        0x10000000L,
+        0x10000008L,
+        0x10401000L,
     },
     {
         /* nibble 4 */
-        0x08000000L, 0x00010000L, 0x00000400L, 0x08010420L,
-        0x08010020L, 0x08000400L, 0x00010420L, 0x08010000L,
-        0x00010000L, 0x00000020L, 0x08000020L, 0x00010400L,
-        0x08000420L, 0x08010020L, 0x08010400L, 0x00000000L,
-        0x00010400L, 0x08000000L, 0x00010020L, 0x00000420L,
-        0x08000400L, 0x00010420L, 0x00000000L, 0x08000020L,
-        0x00000020L, 0x08000420L, 0x08010420L, 0x00010020L,
-        0x08010000L, 0x00000400L, 0x00000420L, 0x08010400L,
-        0x08010400L, 0x08000420L, 0x00010020L, 0x08010000L,
-        0x00010000L, 0x00000020L, 0x08000020L, 0x08000400L,
-        0x08000000L, 0x00010400L, 0x08010420L, 0x00000000L,
-        0x00010420L, 0x08000000L, 0x00000400L, 0x00010020L,
-        0x08000420L, 0x00000400L, 0x00000000L, 0x08010420L,
-        0x08010020L, 0x08010400L, 0x00000420L, 0x00010000L,
-        0x00010400L, 0x08010020L, 0x08000400L, 0x00000420L,
-        0x00000020L, 0x00010420L, 0x08010000L, 0x08000020L,
+        0x08000000L,
+        0x00010000L,
+        0x00000400L,
+        0x08010420L,
+        0x08010020L,
+        0x08000400L,
+        0x00010420L,
+        0x08010000L,
+        0x00010000L,
+        0x00000020L,
+        0x08000020L,
+        0x00010400L,
+        0x08000420L,
+        0x08010020L,
+        0x08010400L,
+        0x00000000L,
+        0x00010400L,
+        0x08000000L,
+        0x00010020L,
+        0x00000420L,
+        0x08000400L,
+        0x00010420L,
+        0x00000000L,
+        0x08000020L,
+        0x00000020L,
+        0x08000420L,
+        0x08010420L,
+        0x00010020L,
+        0x08010000L,
+        0x00000400L,
+        0x00000420L,
+        0x08010400L,
+        0x08010400L,
+        0x08000420L,
+        0x00010020L,
+        0x08010000L,
+        0x00010000L,
+        0x00000020L,
+        0x08000020L,
+        0x08000400L,
+        0x08000000L,
+        0x00010400L,
+        0x08010420L,
+        0x00000000L,
+        0x00010420L,
+        0x08000000L,
+        0x00000400L,
+        0x00010020L,
+        0x08000420L,
+        0x00000400L,
+        0x00000000L,
+        0x08010420L,
+        0x08010020L,
+        0x08010400L,
+        0x00000420L,
+        0x00010000L,
+        0x00010400L,
+        0x08010020L,
+        0x08000400L,
+        0x00000420L,
+        0x00000020L,
+        0x00010420L,
+        0x08010000L,
+        0x08000020L,
     },
     {
         /* nibble 5 */
-        0x80000040L, 0x00200040L, 0x00000000L, 0x80202000L,
-        0x00200040L, 0x00002000L, 0x80002040L, 0x00200000L,
-        0x00002040L, 0x80202040L, 0x00202000L, 0x80000000L,
-        0x80002000L, 0x80000040L, 0x80200000L, 0x00202040L,
-        0x00200000L, 0x80002040L, 0x80200040L, 0x00000000L,
-        0x00002000L, 0x00000040L, 0x80202000L, 0x80200040L,
-        0x80202040L, 0x80200000L, 0x80000000L, 0x00002040L,
-        0x00000040L, 0x00202000L, 0x00202040L, 0x80002000L,
-        0x00002040L, 0x80000000L, 0x80002000L, 0x00202040L,
-        0x80202000L, 0x00200040L, 0x00000000L, 0x80002000L,
-        0x80000000L, 0x00002000L, 0x80200040L, 0x00200000L,
-        0x00200040L, 0x80202040L, 0x00202000L, 0x00000040L,
-        0x80202040L, 0x00202000L, 0x00200000L, 0x80002040L,
-        0x80000040L, 0x80200000L, 0x00202040L, 0x00000000L,
-        0x00002000L, 0x80000040L, 0x80002040L, 0x80202000L,
-        0x80200000L, 0x00002040L, 0x00000040L, 0x80200040L,
+        0x80000040L,
+        0x00200040L,
+        0x00000000L,
+        0x80202000L,
+        0x00200040L,
+        0x00002000L,
+        0x80002040L,
+        0x00200000L,
+        0x00002040L,
+        0x80202040L,
+        0x00202000L,
+        0x80000000L,
+        0x80002000L,
+        0x80000040L,
+        0x80200000L,
+        0x00202040L,
+        0x00200000L,
+        0x80002040L,
+        0x80200040L,
+        0x00000000L,
+        0x00002000L,
+        0x00000040L,
+        0x80202000L,
+        0x80200040L,
+        0x80202040L,
+        0x80200000L,
+        0x80000000L,
+        0x00002040L,
+        0x00000040L,
+        0x00202000L,
+        0x00202040L,
+        0x80002000L,
+        0x00002040L,
+        0x80000000L,
+        0x80002000L,
+        0x00202040L,
+        0x80202000L,
+        0x00200040L,
+        0x00000000L,
+        0x80002000L,
+        0x80000000L,
+        0x00002000L,
+        0x80200040L,
+        0x00200000L,
+        0x00200040L,
+        0x80202040L,
+        0x00202000L,
+        0x00000040L,
+        0x80202040L,
+        0x00202000L,
+        0x00200000L,
+        0x80002040L,
+        0x80000040L,
+        0x80200000L,
+        0x00202040L,
+        0x00000000L,
+        0x00002000L,
+        0x80000040L,
+        0x80002040L,
+        0x80202000L,
+        0x80200000L,
+        0x00002040L,
+        0x00000040L,
+        0x80200040L,
     },
     {
         /* nibble 6 */
-        0x00004000L, 0x00000200L, 0x01000200L, 0x01000004L,
-        0x01004204L, 0x00004004L, 0x00004200L, 0x00000000L,
-        0x01000000L, 0x01000204L, 0x00000204L, 0x01004000L,
-        0x00000004L, 0x01004200L, 0x01004000L, 0x00000204L,
-        0x01000204L, 0x00004000L, 0x00004004L, 0x01004204L,
-        0x00000000L, 0x01000200L, 0x01000004L, 0x00004200L,
-        0x01004004L, 0x00004204L, 0x01004200L, 0x00000004L,
-        0x00004204L, 0x01004004L, 0x00000200L, 0x01000000L,
-        0x00004204L, 0x01004000L, 0x01004004L, 0x00000204L,
-        0x00004000L, 0x00000200L, 0x01000000L, 0x01004004L,
-        0x01000204L, 0x00004204L, 0x00004200L, 0x00000000L,
-        0x00000200L, 0x01000004L, 0x00000004L, 0x01000200L,
-        0x00000000L, 0x01000204L, 0x01000200L, 0x00004200L,
-        0x00000204L, 0x00004000L, 0x01004204L, 0x01000000L,
-        0x01004200L, 0x00000004L, 0x00004004L, 0x01004204L,
-        0x01000004L, 0x01004200L, 0x01004000L, 0x00004004L,
+        0x00004000L,
+        0x00000200L,
+        0x01000200L,
+        0x01000004L,
+        0x01004204L,
+        0x00004004L,
+        0x00004200L,
+        0x00000000L,
+        0x01000000L,
+        0x01000204L,
+        0x00000204L,
+        0x01004000L,
+        0x00000004L,
+        0x01004200L,
+        0x01004000L,
+        0x00000204L,
+        0x01000204L,
+        0x00004000L,
+        0x00004004L,
+        0x01004204L,
+        0x00000000L,
+        0x01000200L,
+        0x01000004L,
+        0x00004200L,
+        0x01004004L,
+        0x00004204L,
+        0x01004200L,
+        0x00000004L,
+        0x00004204L,
+        0x01004004L,
+        0x00000200L,
+        0x01000000L,
+        0x00004204L,
+        0x01004000L,
+        0x01004004L,
+        0x00000204L,
+        0x00004000L,
+        0x00000200L,
+        0x01000000L,
+        0x01004004L,
+        0x01000204L,
+        0x00004204L,
+        0x00004200L,
+        0x00000000L,
+        0x00000200L,
+        0x01000004L,
+        0x00000004L,
+        0x01000200L,
+        0x00000000L,
+        0x01000204L,
+        0x01000200L,
+        0x00004200L,
+        0x00000204L,
+        0x00004000L,
+        0x01004204L,
+        0x01000000L,
+        0x01004200L,
+        0x00000004L,
+        0x00004004L,
+        0x01004204L,
+        0x01000004L,
+        0x01004200L,
+        0x01004000L,
+        0x00004004L,
     },
     {
         /* nibble 7 */
-        0x20800080L, 0x20820000L, 0x00020080L, 0x00000000L,
-        0x20020000L, 0x00800080L, 0x20800000L, 0x20820080L,
-        0x00000080L, 0x20000000L, 0x00820000L, 0x00020080L,
-        0x00820080L, 0x20020080L, 0x20000080L, 0x20800000L,
-        0x00020000L, 0x00820080L, 0x00800080L, 0x20020000L,
-        0x20820080L, 0x20000080L, 0x00000000L, 0x00820000L,
-        0x20000000L, 0x00800000L, 0x20020080L, 0x20800080L,
-        0x00800000L, 0x00020000L, 0x20820000L, 0x00000080L,
-        0x00800000L, 0x00020000L, 0x20000080L, 0x20820080L,
-        0x00020080L, 0x20000000L, 0x00000000L, 0x00820000L,
-        0x20800080L, 0x20020080L, 0x20020000L, 0x00800080L,
-        0x20820000L, 0x00000080L, 0x00800080L, 0x20020000L,
-        0x20820080L, 0x00800000L, 0x20800000L, 0x20000080L,
-        0x00820000L, 0x00020080L, 0x20020080L, 0x20800000L,
-        0x00000080L, 0x20820000L, 0x00820080L, 0x00000000L,
-        0x20000000L, 0x20800080L, 0x00020000L, 0x00820080L,
+        0x20800080L,
+        0x20820000L,
+        0x00020080L,
+        0x00000000L,
+        0x20020000L,
+        0x00800080L,
+        0x20800000L,
+        0x20820080L,
+        0x00000080L,
+        0x20000000L,
+        0x00820000L,
+        0x00020080L,
+        0x00820080L,
+        0x20020080L,
+        0x20000080L,
+        0x20800000L,
+        0x00020000L,
+        0x00820080L,
+        0x00800080L,
+        0x20020000L,
+        0x20820080L,
+        0x20000080L,
+        0x00000000L,
+        0x00820000L,
+        0x20000000L,
+        0x00800000L,
+        0x20020080L,
+        0x20800080L,
+        0x00800000L,
+        0x00020000L,
+        0x20820000L,
+        0x00000080L,
+        0x00800000L,
+        0x00020000L,
+        0x20000080L,
+        0x20820080L,
+        0x00020080L,
+        0x20000000L,
+        0x00000000L,
+        0x00820000L,
+        0x20800080L,
+        0x20020080L,
+        0x20020000L,
+        0x00800080L,
+        0x20820000L,
+        0x00000080L,
+        0x00800080L,
+        0x20020000L,
+        0x20820080L,
+        0x00800000L,
+        0x20800000L,
+        0x20000080L,
+        0x00820000L,
+        0x00020080L,
+        0x20020080L,
+        0x20800000L,
+        0x00000080L,
+        0x20820000L,
+        0x00820080L,
+        0x00000000L,
+        0x20000000L,
+        0x20800080L,
+        0x00020000L,
+        0x00820080L,
     }
 };
diff --git a/crypto/des/xcbc_enc.c b/crypto/des/xcbc_enc.c
index 8ad1f1db6dc3d..0507e44790e14 100644
--- a/crypto/des/xcbc_enc.c
+++ b/crypto/des/xcbc_enc.c
@@ -18,9 +18,9 @@
 /* RSA's DESX */
 
 void DES_xcbc_encrypt(const unsigned char *in, unsigned char *out,
-                      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)
 {
     register DES_LONG tin0, tin1;
     register DES_LONG tout0, tout1, xor0, xor1;
diff --git a/crypto/deterministic_nonce.c b/crypto/deterministic_nonce.c
index 3da9ba420f2d2..5b3adbcfabf12 100644
--- a/crypto/deterministic_nonce.c
+++ b/crypto/deterministic_nonce.c
@@ -26,7 +26,7 @@
  * Returns: 1 if successful, or  0 otherwise.
  */
 static int bits2int(BIGNUM *out, int qlen_bits,
-                    const unsigned char *in, size_t inlen)
+    const unsigned char *in, size_t inlen)
 {
     int blen_bits = inlen * 8;
     int shift;
@@ -53,7 +53,7 @@ static int bits2int(BIGNUM *out, int qlen_bits,
  * Returns: 1 if successful, or  0 otherwise.
  */
 static int bits2int_consttime(BIGNUM *out, int qlen_bits,
-                              const unsigned char *in, size_t inlen)
+    const unsigned char *in, size_t inlen)
 {
     int blen_bits = (inlen - sizeof(BN_ULONG)) * 8;
     int shift;
@@ -97,24 +97,24 @@ static int int2octets(unsigned char *out, const BIGNUM *num, int rlen)
  * Returns: 1 if successful, or  0 otherwise.
  */
 static int bits2octets(unsigned char *out, const BIGNUM *q, int qlen_bits,
-                       int rlen, const unsigned char *in, size_t inlen)
+    int rlen, const unsigned char *in, size_t inlen)
 {
-   int ret = 0;
-   BIGNUM *z = BN_new();
+    int ret = 0;
+    BIGNUM *z = BN_new();
 
-   if (z == NULL
-           || !bits2int(z, qlen_bits, in, inlen))
-       goto err;
+    if (z == NULL
+        || !bits2int(z, qlen_bits, in, inlen))
+        goto err;
 
-   /* z2 = z1 mod q (Do a simple subtract, since z1 < 2^qlen_bits) */
-   if (BN_cmp(z, q) >= 0
-           && !BN_usub(z, z, q))
-       goto err;
+    /* z2 = z1 mod q (Do a simple subtract, since z1 < 2^qlen_bits) */
+    if (BN_cmp(z, q) >= 0
+        && !BN_usub(z, z, q))
+        goto err;
 
-   ret = int2octets(out, z, rlen);
+    ret = int2octets(out, z, rlen);
 err:
-   BN_free(z);
-   return ret;
+    BN_free(z);
+    return ret;
 }
 
 /*
@@ -129,9 +129,9 @@ static int bits2octets(unsigned char *out, const BIGNUM *q, int qlen_bits,
  * Returns: The created KDF HMAC_DRBG object if successful, or NULL otherwise.
  */
 static EVP_KDF_CTX *kdf_setup(const char *digestname,
-                              const unsigned char *entropy, size_t entropylen,
-                              const unsigned char *nonce, size_t noncelen,
-                              OSSL_LIB_CTX *libctx, const char *propq)
+    const unsigned char *entropy, size_t entropylen,
+    const unsigned char *nonce, size_t noncelen,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     EVP_KDF_CTX *ctx = NULL;
     EVP_KDF *kdf = NULL;
@@ -145,14 +145,14 @@ static EVP_KDF_CTX *kdf_setup(const char *digestname,
 
     p = params;
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)digestname, 0);
+        (char *)digestname, 0);
     if (propq != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_PROPERTIES,
-                                                (char *)propq, 0);
+            (char *)propq, 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_HMACDRBG_ENTROPY,
-                                             (void *)entropy, entropylen);
+        (void *)entropy, entropylen);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_HMACDRBG_NONCE,
-                                             (void *)nonce, noncelen);
+        (void *)nonce, noncelen);
     *p = OSSL_PARAM_construct_end();
 
     if (EVP_KDF_CTX_set_params(ctx, params) <= 0)
@@ -179,11 +179,11 @@ static EVP_KDF_CTX *kdf_setup(const char *digestname,
  * Returns: 1 if successful, or  0 otherwise.
  */
 int ossl_gen_deterministic_nonce_rfc6979(BIGNUM *out, const BIGNUM *q,
-                                         const BIGNUM *priv,
-                                         const unsigned char *hm, size_t hmlen,
-                                         const char *digestname,
-                                         OSSL_LIB_CTX *libctx,
-                                         const char *propq)
+    const BIGNUM *priv,
+    const unsigned char *hm, size_t hmlen,
+    const char *digestname,
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     EVP_KDF_CTX *kdfctx = NULL;
     int ret = 0, rlen = 0, qlen_bits = 0;
@@ -213,7 +213,7 @@ int ossl_gen_deterministic_nonce_rfc6979(BIGNUM *out, const BIGNUM *q,
     memset(T, 0xff, prefsz);
 
     if (!int2octets(entropyx, priv, rlen)
-            || !bits2octets(nonceh, q, qlen_bits, rlen, hm, hmlen))
+        || !bits2octets(nonceh, q, qlen_bits, rlen, hm, hmlen))
         goto end;
 
     kdfctx = kdf_setup(digestname, entropyx, rlen, nonceh, rlen, libctx, propq);
@@ -222,11 +222,11 @@ int ossl_gen_deterministic_nonce_rfc6979(BIGNUM *out, const BIGNUM *q,
 
     do {
         if (!EVP_KDF_derive(kdfctx, rbits, rlen, NULL)
-                || !bits2int_consttime(out, qlen_bits, T, rlen + prefsz))
+            || !bits2int_consttime(out, qlen_bits, T, rlen + prefsz))
             goto end;
     } while (ossl_bn_is_word_fixed_top(out, 0)
-            || ossl_bn_is_word_fixed_top(out, 1)
-            || BN_ucmp(out, q) >= 0);
+        || ossl_bn_is_word_fixed_top(out, 1)
+        || BN_ucmp(out, q) >= 0);
 #ifdef BN_DEBUG
     /* With BN_DEBUG on a fixed top number cannot be returned */
     bn_correct_top(out);
diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index 80e1612256be2..af839de4f5a84 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -32,7 +32,7 @@
  */
 
 static DH *d2i_dhp(const EVP_PKEY *pkey, const unsigned char **pp,
-                   long length)
+    long length)
 {
     DH *dh = NULL;
     int is_dhx = (pkey->ameth == &ossl_dhx_asn1_meth);
@@ -102,7 +102,7 @@ static int dh_pub_decode(EVP_PKEY *pkey, const X509_PUBKEY *pubkey)
     EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, dh);
     return 1;
 
- err:
+err:
     ASN1_INTEGER_free(public_key);
     DH_free(dh);
     return 0;
@@ -145,10 +145,10 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     }
 
     if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),
-                               ptype, str, penc, penclen))
+            ptype, str, penc, penclen))
         return 1;
 
- err:
+err:
     OPENSSL_free(penc);
     ASN1_STRING_free(str);
 
@@ -213,19 +213,19 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     }
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(pkey->ameth->pkey_id), 0,
-                         V_ASN1_SEQUENCE, params, dp, dplen)) {
+            V_ASN1_SEQUENCE, params, dp, dplen)) {
         OPENSSL_clear_free(dp, dplen);
         goto err;
     }
     return 1;
 
- err:
+err:
     ASN1_STRING_free(params);
     return 0;
 }
 
 static int dh_param_decode(EVP_PKEY *pkey,
-                           const unsigned char **pder, int derlen)
+    const unsigned char **pder, int derlen)
 {
     DH *dh;
 
@@ -258,7 +258,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent, int ptype)
         pub_key = NULL;
 
     if (x->params.p == NULL || (ptype == 2 && priv_key == NULL)
-            || (ptype > 0 && pub_key == NULL)) {
+        || (ptype > 0 && pub_key == NULL)) {
         reason = ERR_R_PASSED_NULL_PARAMETER;
         goto err;
     }
@@ -271,7 +271,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent, int ptype)
         ktype = "DH Parameters";
 
     if (!BIO_indent(bp, indent, 128)
-            || BIO_printf(bp, "%s: (%d bit)\n", ktype, DH_bits(x)) <= 0)
+        || BIO_printf(bp, "%s: (%d bit)\n", ktype, DH_bits(x)) <= 0)
         goto err;
     indent += 4;
 
@@ -285,14 +285,15 @@ static int do_dh_print(BIO *bp, const DH *x, int indent, int ptype)
 
     if (x->length != 0) {
         if (!BIO_indent(bp, indent, 128)
-                || BIO_printf(bp, "recommended-private-length: %d bits\n",
-                              (int)x->length) <= 0)
+            || BIO_printf(bp, "recommended-private-length: %d bits\n",
+                   (int)x->length)
+                <= 0)
             goto err;
     }
 
     return 1;
 
- err:
+err:
     ERR_raise(ERR_LIB_DH, reason);
     return 0;
 }
@@ -315,7 +316,7 @@ static int dh_security_bits(const EVP_PKEY *pkey)
 static int dh_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
 {
     return ossl_ffc_params_cmp(&a->pkey.dh->params, &b->pkey.dh->params,
-                               a->ameth != &ossl_dhx_asn1_meth);
+        a->ameth != &ossl_dhx_asn1_meth);
 }
 
 static int int_dh_param_copy(DH *to, const DH *from, int is_x942)
@@ -351,7 +352,7 @@ static int dh_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
             return 0;
     }
     return int_dh_param_copy(to->pkey.dh, from->pkey.dh,
-                             from->ameth == &ossl_dhx_asn1_meth);
+        from->ameth == &ossl_dhx_asn1_meth);
 }
 
 static int dh_missing_parameters(const EVP_PKEY *a)
@@ -372,19 +373,19 @@ static int dh_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
 }
 
 static int dh_param_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                          ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return do_dh_print(bp, pkey->pkey.dh, indent, 0);
 }
 
 static int dh_public_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                           ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return do_dh_print(bp, pkey->pkey.dh, indent, 1);
 }
 
 static int dh_private_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                            ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return do_dh_print(bp, pkey->pkey.dh, indent, 2);
 }
@@ -402,12 +403,12 @@ static int dh_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
         /* We should only be here if we have a legacy key */
         if (!ossl_assert(evp_pkey_is_legacy(pkey)))
             return 0;
-        dh = (DH *) evp_pkey_get0_DH_int(pkey);
+        dh = (DH *)evp_pkey_get0_DH_int(pkey);
         if (dh == NULL)
             return 0;
         return ossl_dh_buf2key(dh, arg2, arg1);
     case ASN1_PKEY_CTRL_GET1_TLS_ENCPT:
-        dh = (DH *) EVP_PKEY_get0_DH(pkey);
+        dh = (DH *)EVP_PKEY_get0_DH(pkey);
         if (dh == NULL)
             return 0;
         return ossl_dh_key2buf(dh, arg2, 0, 1);
@@ -422,7 +423,6 @@ static int dhx_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
     default:
         return -2;
     }
-
 }
 
 static int dh_pkey_public_check(const EVP_PKEY *pkey)
@@ -450,8 +450,8 @@ static size_t dh_pkey_dirty_cnt(const EVP_PKEY *pkey)
 }
 
 static int dh_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
-                             OSSL_FUNC_keymgmt_import_fn *importer,
-                             OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_FUNC_keymgmt_import_fn *importer,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     DH *dh = from->pkey.dh;
     OSSL_PARAM_BLD *tmpl;
@@ -489,7 +489,7 @@ static int dh_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
     }
     if (priv_key != NULL) {
         if (!OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PRIV_KEY,
-                                    priv_key))
+                priv_key))
             goto err;
         selection |= OSSL_KEYMGMT_SELECT_PRIVATE_KEY;
     }
@@ -507,7 +507,7 @@ static int dh_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
 }
 
 static int dh_pkey_import_from_type(const OSSL_PARAM params[], void *vpctx,
-                                    int type)
+    int type)
 {
     EVP_PKEY_CTX *pctx = vpctx;
     EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(pctx);
diff --git a/crypto/dh/dh_asn1.c b/crypto/dh/dh_asn1.c
index 5fa91a8ec7dcd..af78e2e84bf88 100644
--- a/crypto/dh/dh_asn1.c
+++ b/crypto/dh/dh_asn1.c
@@ -23,7 +23,7 @@
 
 /* Override the default free and new methods */
 static int dh_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                 void *exarg)
+    void *exarg)
 {
     if (operation == ASN1_OP_NEW_PRE) {
         *pval = (ASN1_VALUE *)DH_new();
@@ -46,9 +46,9 @@ static int dh_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_SEQUENCE_cb(DHparams, dh_cb) = {
-        ASN1_SIMPLE(DH, params.p, BIGNUM),
-        ASN1_SIMPLE(DH, params.g, BIGNUM),
-        ASN1_OPT_EMBED(DH, length, ZINT32),
+    ASN1_SIMPLE(DH, params.p, BIGNUM),
+    ASN1_SIMPLE(DH, params.g, BIGNUM),
+    ASN1_OPT_EMBED(DH, length, ZINT32),
 } ASN1_SEQUENCE_END_cb(DH, DHparams)
 
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DH, DHparams, DHparams)
@@ -72,20 +72,21 @@ typedef struct {
 } int_dhx942_dh;
 
 ASN1_SEQUENCE(DHvparams) = {
-        ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
-        ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
+    ASN1_SIMPLE(int_dhvparams, seed, ASN1_BIT_STRING),
+    ASN1_SIMPLE(int_dhvparams, counter, BIGNUM)
 } static_ASN1_SEQUENCE_END_name(int_dhvparams, DHvparams)
 
-ASN1_SEQUENCE(DHxparams) = {
-        ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
-        ASN1_SIMPLE(int_dhx942_dh, g, BIGNUM),
-        ASN1_SIMPLE(int_dhx942_dh, q, BIGNUM),
-        ASN1_OPT(int_dhx942_dh, j, BIGNUM),
-        ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
-} static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
-
-int_dhx942_dh *d2i_int_dhx(int_dhx942_dh **a,
-                           const unsigned char **pp, long length);
+    ASN1_SEQUENCE(DHxparams)
+    = {
+          ASN1_SIMPLE(int_dhx942_dh, p, BIGNUM),
+          ASN1_SIMPLE(int_dhx942_dh, g, BIGNUM),
+          ASN1_SIMPLE(int_dhx942_dh, q, BIGNUM),
+          ASN1_OPT(int_dhx942_dh, j, BIGNUM),
+          ASN1_OPT(int_dhx942_dh, vparams, DHvparams),
+      } static_ASN1_SEQUENCE_END_name(int_dhx942_dh, DHxparams)
+
+          int_dhx942_dh
+    * d2i_int_dhx(int_dhx942_dh * *a, const unsigned char **pp, long length);
 int i2d_int_dhx(const int_dhx942_dh *a, unsigned char **pp);
 
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(int_dhx942_dh, DHxparams, int_dhx)
@@ -118,8 +119,8 @@ DH *d2i_DHxparams(DH **a, const unsigned char **pp, long length)
         /* The counter has a maximum value of 4 * numbits(p) - 1 */
         size_t counter = (size_t)BN_get_word(dhx->vparams->counter);
         ossl_ffc_params_set_validate_params(params, dhx->vparams->seed->data,
-                                            dhx->vparams->seed->length,
-                                            counter);
+            dhx->vparams->seed->length,
+            counter);
         ASN1_BIT_STRING_free(dhx->vparams->seed);
         BN_free(dhx->vparams->counter);
         OPENSSL_free(dhx->vparams);
@@ -143,7 +144,7 @@ int i2d_DHxparams(const DH *dh, unsigned char **pp)
     int counter;
 
     ossl_ffc_params_get0_pqg(params, (const BIGNUM **)&dhx.p,
-                             (const BIGNUM **)&dhx.q, (const BIGNUM **)&dhx.g);
+        (const BIGNUM **)&dhx.q, (const BIGNUM **)&dhx.g);
     dhx.j = params->j;
     ossl_ffc_params_get_validate_params(params, &seed.data, &seedlen, &counter);
     seed.length = (int)seedlen;
diff --git a/crypto/dh/dh_backend.c b/crypto/dh/dh_backend.c
index 1aaa88dacae11..f68429862cd56 100644
--- a/crypto/dh/dh_backend.c
+++ b/crypto/dh/dh_backend.c
@@ -16,7 +16,7 @@
 #include <openssl/err.h>
 #include <openssl/core_names.h>
 #ifndef FIPS_MODULE
-# include <openssl/x509.h>
+#include <openssl/x509.h>
 #endif
 #include "internal/param_build_set.h"
 #include "crypto/dh.h"
@@ -47,8 +47,7 @@ int ossl_dh_params_fromdata(DH *dh, const OSSL_PARAM params[])
     if (!dh_ffc_params_fromdata(dh, params))
         return 0;
 
-    param_priv_len =
-        OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_DH_PRIV_LEN);
+    param_priv_len = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_DH_PRIV_LEN);
     if (param_priv_len != NULL
         && (!OSSL_PARAM_get_long(param_priv_len, &priv_len)
             || !DH_set_length(dh, priv_len)))
@@ -82,7 +81,7 @@ int ossl_dh_key_fromdata(DH *dh, const OSSL_PARAM params[], int include_private)
 
     return 1;
 
- err:
+err:
     BN_clear_free(priv_key);
     BN_free(pub_key);
     return 0;
@@ -101,7 +100,7 @@ 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)
 {
     const BIGNUM *priv = NULL, *pub = NULL;
 
@@ -166,20 +165,20 @@ DH *ossl_dh_dup(const DH *dh, int selection)
 
 #ifndef FIPS_MODULE
     if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_DH,
-                            &dupkey->ex_data, &dh->ex_data))
+            &dupkey->ex_data, &dh->ex_data))
         goto err;
 #endif
 
     return dupkey;
 
- err:
+err:
     DH_free(dupkey);
     return NULL;
 }
 
 #ifndef FIPS_MODULE
 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)
 {
     const unsigned char *p, *pm;
     int pklen, pmlen;
@@ -232,12 +231,12 @@ DH *ossl_dh_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
 
     goto done;
 
- decerr:
+decerr:
     ERR_raise(ERR_LIB_DH, EVP_R_DECODE_ERROR);
- dherr:
+dherr:
     DH_free(dh);
     dh = NULL;
- done:
+done:
     ASN1_STRING_clear_free(privkey);
     return dh;
 }
diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c
index ae23f61839eab..3002609b68f5e 100644
--- a/crypto/dh/dh_check.c
+++ b/crypto/dh/dh_check.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/bn.h>
+#include <openssl/self_test.h>
 #include "dh_local.h"
 #include "crypto/dh.h"
 
@@ -63,7 +64,7 @@ int DH_check_params(const DH *dh, int *ret)
      * validity tests.
      */
     return ossl_ffc_params_FIPS186_4_validate(dh->libctx, &dh->params,
-                                              FFC_PARAM_TYPE_DH, ret, NULL);
+        FFC_PARAM_TYPE_DH, ret, NULL);
 }
 #else
 int DH_check_params(const DH *dh, int *ret)
@@ -97,7 +98,7 @@ int DH_check_params(const DH *dh, int *ret)
         *ret |= DH_MODULUS_TOO_LARGE;
 
     ok = 1;
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     return ok;
@@ -220,7 +221,7 @@ int DH_check(const DH *dh, int *ret)
             *ret |= DH_CHECK_P_NOT_SAFE_PRIME;
     }
     ok = 1;
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     return ok;
@@ -272,7 +273,7 @@ int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret)
 int ossl_dh_check_pub_key_partial(const DH *dh, const BIGNUM *pub_key, int *ret)
 {
     return ossl_ffc_validate_public_key_partial(&dh->params, pub_key, ret)
-           && *ret == 0;
+        && *ret == 0;
 }
 
 int ossl_dh_check_priv_key(const DH *dh, const BIGNUM *priv_key, int *ret)
@@ -329,17 +330,27 @@ int ossl_dh_check_priv_key(const DH *dh, const BIGNUM *priv_key, int *ret)
  * FFC pairwise check from SP800-56A R3.
  *    Section 5.6.2.1.4 Owner Assurance of Pair-wise Consistency
  */
-int ossl_dh_check_pairwise(const DH *dh)
+int ossl_dh_check_pairwise(const DH *dh, int return_on_null_numbers)
 {
     int ret = 0;
     BN_CTX *ctx = NULL;
     BIGNUM *pub_key = NULL;
+    OSSL_SELF_TEST *st = NULL;
+    OSSL_CALLBACK *stcb = NULL;
+    void *stcbarg = NULL;
 
     if (dh->params.p == NULL
         || dh->params.g == NULL
         || dh->priv_key == NULL
         || dh->pub_key == NULL)
-        return 0;
+        return return_on_null_numbers;
+
+    OSSL_SELF_TEST_get_callback(dh->libctx, &stcb, &stcbarg);
+    st = OSSL_SELF_TEST_new(stcb, stcbarg);
+    if (st == NULL)
+        goto err;
+    OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
+        OSSL_SELF_TEST_DESC_PCT_DH);
 
     ctx = BN_CTX_new_ex(dh->libctx);
     if (ctx == NULL)
@@ -351,10 +362,27 @@ int ossl_dh_check_pairwise(const DH *dh)
     /* recalculate the public key = (g ^ priv) mod p */
     if (!ossl_dh_generate_public_key(ctx, dh, dh->priv_key, pub_key))
         goto err;
+
+#ifdef FIPS_MODULE
+    {
+        int len;
+        unsigned char bytes[1024] = { 0 }; /* Max key size of 8192 bits */
+
+        if (BN_num_bytes(pub_key) > (int)sizeof(bytes))
+            goto err;
+        len = BN_bn2bin(pub_key, bytes);
+        OSSL_SELF_TEST_oncorrupt_byte(st, bytes);
+        if (BN_bin2bn(bytes, len, pub_key) == NULL)
+            goto err;
+    }
+#endif
     /* check it matches the existing public_key */
     ret = BN_cmp(pub_key, dh->pub_key) == 0;
 err:
     BN_free(pub_key);
     BN_CTX_free(ctx);
+
+    OSSL_SELF_TEST_onend(st, ret);
+    OSSL_SELF_TEST_free(st);
     return ret;
 }
diff --git a/crypto/dh/dh_depr.c b/crypto/dh/dh_depr.c
index 5822d511d958a..50336c1359cce 100644
--- a/crypto/dh/dh_depr.c
+++ b/crypto/dh/dh_depr.c
@@ -23,7 +23,7 @@
 #include <openssl/dh.h>
 
 DH *DH_generate_parameters(int prime_len, int generator,
-                           void (*callback) (int, int, void *), void *cb_arg)
+    void (*callback)(int, int, void *), void *cb_arg)
 {
     BN_GENCB *cb;
     DH *ret = NULL;
diff --git a/crypto/dh/dh_err.c b/crypto/dh/dh_err.c
index 4d6d2acd98a8b..63c6d98a3b332 100644
--- a/crypto/dh/dh_err.c
+++ b/crypto/dh/dh_err.c
@@ -14,62 +14,62 @@
 
 #ifndef OPENSSL_NO_DH
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA DH_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_BAD_FFC_PARAMETERS), "bad ffc parameters"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR), "bad generator"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_BN_DECODE_ERROR), "bn decode error"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_BN_ERROR), "bn error"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_INVALID_J_VALUE),
-    "check invalid j value"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_INVALID_Q_VALUE),
-    "check invalid q value"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_PUBKEY_INVALID),
-    "check pubkey invalid"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_PUBKEY_TOO_LARGE),
-    "check pubkey too large"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_PUBKEY_TOO_SMALL),
-    "check pubkey too small"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_P_NOT_PRIME), "check p not prime"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_P_NOT_SAFE_PRIME),
-    "check p not safe prime"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_Q_NOT_PRIME), "check q not prime"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_DECODE_ERROR), "decode error"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PARAMETER_NAME),
-    "invalid parameter name"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PARAMETER_NID),
-    "invalid parameter nid"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PUBKEY), "invalid public key"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_SECRET), "invalid secret"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_SIZE), "invalid size"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_KDF_PARAMETER_ERROR), "kdf parameter error"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_KEYS_NOT_SET), "keys not set"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_MISSING_PUBKEY), "missing pubkey"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_MODULUS_TOO_LARGE), "modulus too large"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_MODULUS_TOO_SMALL), "modulus too small"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_NOT_SUITABLE_GENERATOR),
-    "not suitable generator"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_NO_PARAMETERS_SET), "no parameters set"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_NO_PRIVATE_VALUE), "no private value"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_PARAMETER_ENCODING_ERROR),
-    "parameter encoding error"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_PEER_KEY_ERROR), "peer key error"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_Q_TOO_LARGE), "q too large"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_SHARED_INFO_ERROR), "shared info error"},
-    {ERR_PACK(ERR_LIB_DH, 0, DH_R_UNABLE_TO_CHECK_GENERATOR),
-    "unable to check generator"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_BAD_FFC_PARAMETERS), "bad ffc parameters" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_BAD_GENERATOR), "bad generator" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_BN_DECODE_ERROR), "bn decode error" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_BN_ERROR), "bn error" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_INVALID_J_VALUE),
+        "check invalid j value" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_INVALID_Q_VALUE),
+        "check invalid q value" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_PUBKEY_INVALID),
+        "check pubkey invalid" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_PUBKEY_TOO_LARGE),
+        "check pubkey too large" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_PUBKEY_TOO_SMALL),
+        "check pubkey too small" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_P_NOT_PRIME), "check p not prime" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_P_NOT_SAFE_PRIME),
+        "check p not safe prime" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_CHECK_Q_NOT_PRIME), "check q not prime" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_DECODE_ERROR), "decode error" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PARAMETER_NAME),
+        "invalid parameter name" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PARAMETER_NID),
+        "invalid parameter nid" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_PUBKEY), "invalid public key" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_SECRET), "invalid secret" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_INVALID_SIZE), "invalid size" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_KDF_PARAMETER_ERROR), "kdf parameter error" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_KEYS_NOT_SET), "keys not set" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_MISSING_PUBKEY), "missing pubkey" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_MODULUS_TOO_LARGE), "modulus too large" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_MODULUS_TOO_SMALL), "modulus too small" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_NOT_SUITABLE_GENERATOR),
+        "not suitable generator" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_NO_PARAMETERS_SET), "no parameters set" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_NO_PRIVATE_VALUE), "no private value" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_PARAMETER_ENCODING_ERROR),
+        "parameter encoding error" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_PEER_KEY_ERROR), "peer key error" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_Q_TOO_LARGE), "q too large" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_SHARED_INFO_ERROR), "shared info error" },
+    { ERR_PACK(ERR_LIB_DH, 0, DH_R_UNABLE_TO_CHECK_GENERATOR),
+        "unable to check generator" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_DH_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(DH_str_reasons[0].error) == NULL)
         ERR_load_strings_const(DH_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c
index b73bfb7f3b8d9..094b6e70c7c60 100644
--- a/crypto/dh/dh_gen.c
+++ b/crypto/dh/dh_gen.c
@@ -33,24 +33,24 @@
 
 #ifndef FIPS_MODULE
 static int dh_builtin_genparams(DH *ret, int prime_len, int generator,
-                                BN_GENCB *cb);
+    BN_GENCB *cb);
 #endif /* FIPS_MODULE */
 
 int ossl_dh_generate_ffc_parameters(DH *dh, int type, int pbits, int qbits,
-                                    BN_GENCB *cb)
+    BN_GENCB *cb)
 {
     int ret, res;
 
 #ifndef FIPS_MODULE
     if (type == DH_PARAMGEN_TYPE_FIPS_186_2)
         ret = ossl_ffc_params_FIPS186_2_generate(dh->libctx, &dh->params,
-                                                 FFC_PARAM_TYPE_DH,
-                                                 pbits, qbits, &res, cb);
+            FFC_PARAM_TYPE_DH,
+            pbits, qbits, &res, cb);
     else
 #endif
         ret = ossl_ffc_params_FIPS186_4_generate(dh->libctx, &dh->params,
-                                                 FFC_PARAM_TYPE_DH,
-                                                 pbits, qbits, &res, cb);
+            FFC_PARAM_TYPE_DH,
+            pbits, qbits, &res, cb);
     if (ret > 0)
         dh->dirty_cnt++;
     return ret;
@@ -113,7 +113,7 @@ static int dh_gen_named_group(OSSL_LIB_CTX *libctx, DH *ret, int prime_len)
 #endif /* FIPS_MODULE */
 
 int DH_generate_parameters_ex(DH *ret, int prime_len, int generator,
-                              BN_GENCB *cb)
+    BN_GENCB *cb)
 {
 #ifdef FIPS_MODULE
     if (generator != 2)
@@ -154,7 +154,7 @@ int DH_generate_parameters_ex(DH *ret, int prime_len, int generator,
  * for 5, p mod 60 == 59
  */
 static int dh_builtin_genparams(DH *ret, int prime_len, int generator,
-                                BN_GENCB *cb)
+    BN_GENCB *cb)
 {
     BIGNUM *t1, *t2;
     int g, ok = -1;
@@ -222,10 +222,11 @@ static int dh_builtin_genparams(DH *ret, int prime_len, int generator,
         goto err;
     /* We are using safe prime p, set key length equivalent to RFC 7919 */
     ret->length = (2 * ossl_ifc_ffc_compute_security_bits(prime_len)
-                   + 24) / 25 * 25;
+                      + 24)
+        / 25 * 25;
     ret->dirty_cnt++;
     ok = 1;
- err:
+err:
     if (ok == -1) {
         ERR_raise(ERR_LIB_DH, ERR_R_BN_LIB);
         ok = 0;
diff --git a/crypto/dh/dh_group_params.c b/crypto/dh/dh_group_params.c
index 460bd8f009894..dd2fa7da156ad 100644
--- a/crypto/dh/dh_group_params.c
+++ b/crypto/dh/dh_group_params.c
@@ -68,8 +68,9 @@ void ossl_dh_cache_named_group(DH *dh)
         return;
 
     if ((group = ossl_ffc_numbers_to_dh_named_group(dh->params.p,
-                                                    dh->params.q,
-                                                    dh->params.g)) != NULL) {
+             dh->params.q,
+             dh->params.g))
+        != NULL) {
         if (dh->params.q == NULL)
             dh->params.q = (BIGNUM *)ossl_ffc_named_group_get_q(group);
         /* cache the nid and default key length */
diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c
index 64f8064d9ddad..898bd7f517a3e 100644
--- a/crypto/dh/dh_kdf.c
+++ b/crypto/dh/dh_kdf.c
@@ -25,11 +25,11 @@
 
 /* Key derivation function from X9.63/SECG */
 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 ret = 0;
     EVP_KDF_CTX *kctx = NULL;
@@ -45,14 +45,14 @@ int ossl_dh_kdf_X9_42_asn1(unsigned char *out, size_t outlen,
         goto err;
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)mdname, 0);
+        (char *)mdname, 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
-                                             (unsigned char *)Z, Zlen);
+        (unsigned char *)Z, Zlen);
     if (ukm != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_UKM,
-                                                 (unsigned char *)ukm, ukmlen);
+            (unsigned char *)ukm, ukmlen);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_CEK_ALG,
-                                            (char *)cek_alg, 0);
+        (char *)cek_alg, 0);
     *p = OSSL_PARAM_construct_end();
     ret = EVP_KDF_derive(kctx, out, outlen, params) > 0;
 err:
@@ -63,9 +63,9 @@ int ossl_dh_kdf_X9_42_asn1(unsigned char *out, size_t outlen,
 
 #if !defined(FIPS_MODULE)
 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)
 {
     char key_alg[OSSL_MAX_NAME_SIZE];
     const OSSL_PROVIDER *prov = EVP_MD_get0_provider(md);
@@ -75,6 +75,6 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,
         return 0;
 
     return ossl_dh_kdf_X9_42_asn1(out, outlen, Z, Zlen, key_alg,
-                                  ukm, ukmlen, md, libctx, NULL);
+        ukm, ukmlen, md, libctx, NULL);
 }
 #endif /* !defined(FIPS_MODULE) */
diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
index 7132b9b68e537..2d9f7a8100fe8 100644
--- a/crypto/dh/dh_key.c
+++ b/crypto/dh/dh_key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -21,15 +21,15 @@
 #include "crypto/security_bits.h"
 
 #ifdef FIPS_MODULE
-# define MIN_STRENGTH 112
+#define MIN_STRENGTH 112
 #else
-# define MIN_STRENGTH 80
+#define MIN_STRENGTH 80
 #endif
 
 static int generate_key(DH *dh);
 static int dh_bn_mod_exp(const DH *dh, BIGNUM *r,
-                         const BIGNUM *a, const BIGNUM *p,
-                         const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+    const BIGNUM *a, const BIGNUM *p,
+    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
 static int dh_init(DH *dh);
 static int dh_finish(DH *dh);
 
@@ -76,7 +76,7 @@ int ossl_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
 
     if (dh->flags & DH_FLAG_CACHE_MONT_P) {
         mont = BN_MONT_CTX_set_locked(&dh->method_mont_p,
-                                      dh->lock, dh->params.p, ctx);
+            dh->lock, dh->params.p, ctx);
         BN_set_flags(dh->priv_key, BN_FLG_CONSTTIME);
         if (!mont)
             goto err;
@@ -84,7 +84,7 @@ int ossl_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
 
     /* (Step 1) Z = pub_key^priv_key mod p */
     if (!dh->meth->bn_mod_exp(dh, z, pub_key, dh->priv_key, dh->params.p, ctx,
-                              mont)) {
+            mont)) {
         ERR_raise(ERR_LIB_DH, ERR_R_BN_LIB);
         goto err;
     }
@@ -100,7 +100,7 @@ int ossl_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
 
     /* return the padded key, i.e. same number of bytes as the modulus */
     ret = BN_bn2binpad(z, key, BN_num_bytes(dh->params.p));
- err:
+err:
     BN_clear(z); /* (Step 2) destroy intermediate values */
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
@@ -187,8 +187,8 @@ const DH_METHOD *DH_get_default_method(void)
 }
 
 static int dh_bn_mod_exp(const DH *dh, BIGNUM *r,
-                         const BIGNUM *a, const BIGNUM *p,
-                         const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
+    const BIGNUM *a, const BIGNUM *p,
+    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
 {
 #ifdef S390X_MOD_EXP
     return s390x_mod_exp(r, a, p, m, ctx, m_ctx);
@@ -227,7 +227,7 @@ int DH_generate_key(DH *dh)
 }
 
 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 ret = 0;
     BIGNUM *prk = BN_new();
@@ -254,7 +254,7 @@ int ossl_dh_generate_public_key(BN_CTX *ctx, const DH *dh,
 
     /* pub_key = g^priv_key mod p */
     if (!dh->meth->bn_mod_exp(dh, pub_key, dh->params.g, prk, dh->params.p,
-                              ctx, mont))
+            ctx, mont))
         goto err;
     ret = 1;
 err:
@@ -267,7 +267,7 @@ static int generate_key(DH *dh)
     int ok = 0;
     int generate_new_key = 0;
 #ifndef FIPS_MODULE
-    unsigned l;
+    int l;
 #endif
     BN_CTX *ctx = NULL;
     BIGNUM *pub_key = NULL, *priv_key = NULL;
@@ -311,15 +311,14 @@ static int generate_key(DH *dh)
     if (generate_new_key) {
         /* Is it an approved safe prime ?*/
         if (DH_get_nid(dh) != NID_undef) {
-            int max_strength =
-                    ossl_ifc_ffc_compute_security_bits(BN_num_bits(dh->params.p));
+            int max_strength = ossl_ifc_ffc_compute_security_bits(BN_num_bits(dh->params.p));
 
             if (dh->params.q == NULL
                 || dh->length > BN_num_bits(dh->params.q))
                 goto err;
             /* dh->length = maximum bit length of generated private key */
             if (!ossl_ffc_generate_private_key(ctx, &dh->params, dh->length,
-                                               max_strength, priv_key))
+                    max_strength, priv_key))
                 goto err;
         } else {
 #ifdef FIPS_MODULE
@@ -327,13 +326,15 @@ static int generate_key(DH *dh)
                 goto err;
 #else
             if (dh->params.q == NULL) {
-                /* secret exponent length, must satisfy 2^(l-1) <= p */
-                if (dh->length != 0
-                    && dh->length >= BN_num_bits(dh->params.p))
+                /* secret exponent length, must satisfy 2^l < (p-1)/2 */
+                l = BN_num_bits(dh->params.p);
+                if (dh->length >= l)
                     goto err;
-                l = dh->length ? dh->length : BN_num_bits(dh->params.p) - 1;
+                l -= 2;
+                if (dh->length != 0 && dh->length < l)
+                    l = dh->length;
                 if (!BN_priv_rand_ex(priv_key, l, BN_RAND_TOP_ONE,
-                                     BN_RAND_BOTTOM_ANY, 0, ctx))
+                        BN_RAND_BOTTOM_ANY, 0, ctx))
                     goto err;
                 /*
                  * We handle just one known case where g is a quadratic non-residue:
@@ -350,7 +351,7 @@ static int generate_key(DH *dh)
             {
                 /* Do a partial check for invalid p, q, g */
                 if (!ossl_ffc_params_simple_validate(dh->libctx, &dh->params,
-                                                     FFC_PARAM_TYPE_DH, NULL))
+                        FFC_PARAM_TYPE_DH, NULL))
                     goto err;
                 /*
                  * For FFC FIPS 186-4 keygen
@@ -358,9 +359,9 @@ static int generate_key(DH *dh)
                  * Max Private key size N = len(q)
                  */
                 if (!ossl_ffc_generate_private_key(ctx, &dh->params,
-                                                   BN_num_bits(dh->params.q),
-                                                   MIN_STRENGTH,
-                                                   priv_key))
+                        BN_num_bits(dh->params.q),
+                        MIN_STRENGTH,
+                        priv_key))
                     goto err;
             }
         }
@@ -373,7 +374,7 @@ static int generate_key(DH *dh)
     dh->priv_key = priv_key;
     dh->dirty_cnt++;
     ok = 1;
- err:
+err:
     if (ok != 1)
         ERR_raise(ERR_LIB_DH, ERR_R_BN_LIB);
 
@@ -414,7 +415,7 @@ int ossl_dh_buf2key(DH *dh, const unsigned char *buf, size_t len)
 }
 
 size_t ossl_dh_key2buf(const DH *dh, unsigned char **pbuf_out, size_t size,
-                       int alloc)
+    int alloc)
 {
     const BIGNUM *pubkey;
     unsigned char *pbuf = NULL;
@@ -424,8 +425,8 @@ size_t ossl_dh_key2buf(const DH *dh, unsigned char **pbuf_out, size_t size,
     DH_get0_pqg(dh, &p, NULL, NULL);
     DH_get0_key(dh, &pubkey, NULL);
     if (p == NULL || pubkey == NULL
-            || (p_size = BN_num_bytes(p)) == 0
-            || BN_num_bytes(pubkey) == 0) {
+        || (p_size = BN_num_bytes(p)) == 0
+        || BN_num_bytes(pubkey) == 0) {
         ERR_raise(ERR_LIB_DH, DH_R_INVALID_PUBKEY);
         return 0;
     }
diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index 93e08b3f8c71b..94026e50ce7b6 100644
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <openssl/bn.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include <openssl/obj_mac.h>
 #include <openssl/core_names.h>
@@ -53,12 +53,12 @@ const DH_METHOD *ossl_dh_get_method(const DH *dh)
 {
     return dh->meth;
 }
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 DH *DH_new(void)
 {
     return dh_new_intern(NULL, NULL);
 }
-# endif
+#endif
 
 DH *DH_new_method(ENGINE *engine)
 {
@@ -94,7 +94,7 @@ static DH *dh_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx)
     ret->libctx = libctx;
     ret->meth = DH_get_default_method();
 #if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_ENGINE)
-    ret->flags = ret->meth->flags;  /* early default init */
+    ret->flags = ret->meth->flags; /* early default init */
     if (engine) {
         if (!ENGINE_init(engine)) {
             ERR_raise(ERR_LIB_DH, ERR_R_ENGINE_LIB);
@@ -128,7 +128,7 @@ static DH *dh_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx)
 
     return ret;
 
- err:
+err:
     DH_free(ret);
     return NULL;
 }
@@ -149,9 +149,9 @@ void DH_free(DH *r)
     if (r->meth != NULL && r->meth->finish != NULL)
         r->meth->finish(r);
 #if !defined(FIPS_MODULE)
-# if !defined(OPENSSL_NO_ENGINE)
+#if !defined(OPENSSL_NO_ENGINE)
     ENGINE_finish(r->engine);
-# endif
+#endif
     CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DH, r, &r->ex_data);
 #endif
 
@@ -223,7 +223,7 @@ int DH_security_bits(const DH *dh)
 }
 
 void DH_get0_pqg(const DH *dh,
-                 const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
+    const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
 {
     ossl_ffc_params_get0_pqg(&dh->params, p, q, g);
 }
diff --git a/crypto/dh/dh_local.h b/crypto/dh/dh_local.h
index 1ff075e3dc1df..ed4e0f1e9a4da 100644
--- a/crypto/dh/dh_local.h
+++ b/crypto/dh/dh_local.h
@@ -11,7 +11,7 @@
 #include "internal/refcount.h"
 #include "internal/ffc.h"
 
-#define DH_MIN_MODULUS_BITS     512
+#define DH_MIN_MODULUS_BITS 512
 
 struct dh_st {
     /*
@@ -23,8 +23,8 @@ struct dh_st {
     FFC_PARAMS params;
     /* max generated private key length (can be less than len(q)) */
     int32_t length;
-    BIGNUM *pub_key;            /* g^x % p */
-    BIGNUM *priv_key;           /* x */
+    BIGNUM *pub_key; /* g^x % p */
+    BIGNUM *priv_key; /* x */
     int flags;
     BN_MONT_CTX *method_mont_p;
     CRYPTO_REF_COUNT references;
@@ -43,18 +43,18 @@ struct dh_st {
 struct dh_method {
     char *name;
     /* Methods here */
-    int (*generate_key) (DH *dh);
-    int (*compute_key) (unsigned char *key, const BIGNUM *pub_key, DH *dh);
+    int (*generate_key)(DH *dh);
+    int (*compute_key)(unsigned char *key, const BIGNUM *pub_key, DH *dh);
 
     /* Can be null */
-    int (*bn_mod_exp) (const DH *dh, BIGNUM *r, const BIGNUM *a,
-                       const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-                       BN_MONT_CTX *m_ctx);
-    int (*init) (DH *dh);
-    int (*finish) (DH *dh);
+    int (*bn_mod_exp)(const DH *dh, BIGNUM *r, const BIGNUM *a,
+        const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
+        BN_MONT_CTX *m_ctx);
+    int (*init)(DH *dh);
+    int (*finish)(DH *dh);
     int flags;
     char *app_data;
     /* If this is non-NULL, it will be used to generate parameters */
-    int (*generate_params) (DH *dh, int prime_len, int generator,
-                            BN_GENCB *cb);
+    int (*generate_params)(DH *dh, int prime_len, int generator,
+        BN_GENCB *cb);
 };
diff --git a/crypto/dh/dh_meth.c b/crypto/dh/dh_meth.c
index f5652e07852e7..809ec4209fa36 100644
--- a/crypto/dh/dh_meth.c
+++ b/crypto/dh/dh_meth.c
@@ -99,41 +99,38 @@ int DH_meth_set0_app_data(DH_METHOD *dhm, void *app_data)
     return 1;
 }
 
-int (*DH_meth_get_generate_key(const DH_METHOD *dhm)) (DH *)
+int (*DH_meth_get_generate_key(const DH_METHOD *dhm))(DH *)
 {
     return dhm->generate_key;
 }
 
-int DH_meth_set_generate_key(DH_METHOD *dhm, int (*generate_key) (DH *))
+int DH_meth_set_generate_key(DH_METHOD *dhm, int (*generate_key)(DH *))
 {
     dhm->generate_key = generate_key;
     return 1;
 }
 
-int (*DH_meth_get_compute_key(const DH_METHOD *dhm))
-        (unsigned char *key, const BIGNUM *pub_key, DH *dh)
+int (*DH_meth_get_compute_key(const DH_METHOD *dhm))(unsigned char *key, const BIGNUM *pub_key, DH *dh)
 {
     return dhm->compute_key;
 }
 
 int DH_meth_set_compute_key(DH_METHOD *dhm,
-        int (*compute_key) (unsigned char *key, const BIGNUM *pub_key, DH *dh))
+    int (*compute_key)(unsigned char *key, const BIGNUM *pub_key, DH *dh))
 {
     dhm->compute_key = compute_key;
     return 1;
 }
 
-
-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 (*DH_meth_get_bn_mod_exp(const DH_METHOD *dhm))(const DH *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
+    BN_CTX *, BN_MONT_CTX *)
 {
     return dhm->bn_mod_exp;
 }
 
 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 *))
 {
     dhm->bn_mod_exp = bn_mod_exp;
     return 1;
@@ -150,25 +147,24 @@ int DH_meth_set_init(DH_METHOD *dhm, int (*init)(DH *))
     return 1;
 }
 
-int (*DH_meth_get_finish(const DH_METHOD *dhm)) (DH *)
+int (*DH_meth_get_finish(const DH_METHOD *dhm))(DH *)
 {
     return dhm->finish;
 }
 
-int DH_meth_set_finish(DH_METHOD *dhm, int (*finish) (DH *))
+int DH_meth_set_finish(DH_METHOD *dhm, int (*finish)(DH *))
 {
     dhm->finish = finish;
     return 1;
 }
 
-int (*DH_meth_get_generate_params(const DH_METHOD *dhm))
-        (DH *, int, int, BN_GENCB *)
+int (*DH_meth_get_generate_params(const DH_METHOD *dhm))(DH *, int, int, BN_GENCB *)
 {
     return dhm->generate_params;
 }
 
 int DH_meth_set_generate_params(DH_METHOD *dhm,
-        int (*generate_params) (DH *, int, int, BN_GENCB *))
+    int (*generate_params)(DH *, int, int, BN_GENCB *))
 {
     dhm->generate_params = generate_params;
     return 1;
diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c
index c11ada98267c7..dd36dce2818e2 100644
--- a/crypto/dh/dh_pmeth.c
+++ b/crypto/dh/dh_pmeth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-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
@@ -80,7 +80,6 @@ static void pkey_dh_cleanup(EVP_PKEY_CTX *ctx)
     }
 }
 
-
 static int pkey_dh_copy(EVP_PKEY_CTX *dst, const EVP_PKEY_CTX *src)
 {
     DH_PKEY_CTX *dctx, *sctx;
@@ -105,7 +104,7 @@ static int pkey_dh_copy(EVP_PKEY_CTX *dst, const EVP_PKEY_CTX *src)
     if (sctx->kdf_ukm != NULL) {
         dctx->kdf_ukm = OPENSSL_memdup(sctx->kdf_ukm, sctx->kdf_ukmlen);
         if (dctx->kdf_ukm == NULL)
-          return 0;
+            return 0;
         dctx->kdf_ukmlen = sctx->kdf_ukmlen;
     }
     dctx->kdf_outlen = sctx->kdf_outlen;
@@ -215,12 +214,11 @@ static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 
     default:
         return -2;
-
     }
 }
 
 static int pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx,
-                            const char *type, const char *value)
+    const char *type, const char *value)
 {
     if (strcmp(type, "dh_paramgen_prime_len") == 0) {
         int len;
@@ -272,7 +270,7 @@ static int pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx,
 }
 
 static DH *ffc_params_generate(OSSL_LIB_CTX *libctx, DH_PKEY_CTX *dctx,
-                               BN_GENCB *pcb)
+    BN_GENCB *pcb)
 {
     DH *ret;
     int rv = 0;
@@ -296,20 +294,20 @@ static DH *ffc_params_generate(OSSL_LIB_CTX *libctx, DH_PKEY_CTX *dctx,
     if (dctx->md != NULL)
         ossl_ffc_set_digest(&ret->params, EVP_MD_get0_name(dctx->md), NULL);
 
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
     if (dctx->paramgen_type == DH_PARAMGEN_TYPE_FIPS_186_2)
         rv = ossl_ffc_params_FIPS186_2_generate(libctx, &ret->params,
-                                                FFC_PARAM_TYPE_DH,
-                                                prime_len, subprime_len, &res,
-                                                pcb);
+            FFC_PARAM_TYPE_DH,
+            prime_len, subprime_len, &res,
+            pcb);
     else
-# endif
-    /* For FIPS we always use the DH_PARAMGEN_TYPE_FIPS_186_4 generator */
-    if (dctx->paramgen_type >= DH_PARAMGEN_TYPE_FIPS_186_2)
-        rv = ossl_ffc_params_FIPS186_4_generate(libctx, &ret->params,
-                                                FFC_PARAM_TYPE_DH,
-                                                prime_len, subprime_len, &res,
-                                                pcb);
+#endif
+        /* For FIPS we always use the DH_PARAMGEN_TYPE_FIPS_186_4 generator */
+        if (dctx->paramgen_type >= DH_PARAMGEN_TYPE_FIPS_186_2)
+            rv = ossl_ffc_params_FIPS186_4_generate(libctx, &ret->params,
+                FFC_PARAM_TYPE_DH,
+                prime_len, subprime_len, &res,
+                pcb);
     if (rv <= 0) {
         DH_free(ret);
         return NULL;
@@ -318,7 +316,7 @@ static DH *ffc_params_generate(OSSL_LIB_CTX *libctx, DH_PKEY_CTX *dctx,
 }
 
 static int pkey_dh_paramgen(EVP_PKEY_CTX *ctx,
-                            EVP_PKEY *pkey)
+    EVP_PKEY *pkey)
 {
     DH *dh = NULL;
     DH_PKEY_CTX *dctx = ctx->data;
@@ -345,9 +343,9 @@ static int pkey_dh_paramgen(EVP_PKEY_CTX *ctx,
             return 0;
         evp_pkey_set_cb_translate(pcb, ctx);
     }
-# ifdef FIPS_MODULE
+#ifdef FIPS_MODULE
     dctx->paramgen_type = DH_PARAMGEN_TYPE_FIPS_186_4;
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
     if (dctx->paramgen_type >= DH_PARAMGEN_TYPE_FIPS_186_2) {
         dh = ffc_params_generate(NULL, dctx, pcb);
         BN_GENCB_free(pcb);
@@ -362,7 +360,7 @@ static int pkey_dh_paramgen(EVP_PKEY_CTX *ctx,
         return 0;
     }
     ret = DH_generate_parameters_ex(dh,
-                                    dctx->prime_len, dctx->generator, pcb);
+        dctx->prime_len, dctx->generator, pcb);
     BN_GENCB_free(pcb);
     if (ret)
         EVP_PKEY_assign_DH(pkey, dh);
@@ -394,7 +392,7 @@ static int pkey_dh_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
 }
 
 static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
-                          size_t *keylen)
+    size_t *keylen)
 {
     int ret;
     DH *dh;
@@ -408,7 +406,7 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
     }
     dh = (DH *)EVP_PKEY_get0_DH(ctx->pkey);
     dhpub = EVP_PKEY_get0_DH(ctx->peerkey);
-    if (dhpub == NULL) {
+    if (dhpub == NULL || dh == NULL) {
         ERR_raise(ERR_LIB_DH, DH_R_KEYS_NOT_SET);
         return 0;
     }
@@ -422,12 +420,11 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
             ret = DH_compute_key_padded(key, dhpubbn, dh);
         else
             ret = DH_compute_key(key, dhpubbn, dh);
-        if (ret < 0)
+        if (ret <= 0)
             return ret;
         *keylen = ret;
         return 1;
-    }
-    else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {
+    } else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {
 
         unsigned char *Z = NULL;
         int Zlen = 0;
@@ -448,11 +445,11 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
         if (DH_compute_key_padded(Z, dhpubbn, dh) <= 0)
             goto err;
         if (!DH_KDF_X9_42(key, *keylen, Z, Zlen, dctx->kdf_oid,
-                          dctx->kdf_ukm, dctx->kdf_ukmlen, dctx->kdf_md))
+                dctx->kdf_ukm, dctx->kdf_ukmlen, dctx->kdf_md))
             goto err;
         *keylen = dctx->kdf_outlen;
         ret = 1;
- err:
+    err:
         OPENSSL_clear_free(Z, Zlen);
         return ret;
     }
diff --git a/crypto/dh/dh_rfc5114.c b/crypto/dh/dh_rfc5114.c
index 7b1e0610bd711..366776ce4ee37 100644
--- a/crypto/dh/dh_rfc5114.c
+++ b/crypto/dh/dh_rfc5114.c
@@ -25,23 +25,23 @@
  * because they get wiped using BN_clear_free() when DH_free() is called.
  */
 
-#define make_dh(x) \
-DH *DH_get_##x(void) \
-{ \
-    DH *dh = DH_new(); \
-\
-    if (dh == NULL) \
-        return NULL; \
-    dh->params.p = BN_dup(&ossl_bignum_dh##x##_p); \
-    dh->params.g = BN_dup(&ossl_bignum_dh##x##_g); \
-    dh->params.q = BN_dup(&ossl_bignum_dh##x##_q); \
-    if (dh->params.p == NULL || dh->params.q == NULL || dh->params.g == NULL) {\
-        DH_free(dh); \
-        return NULL; \
-    } \
-    return dh; \
-}
+#define make_dh(x)                                                                  \
+    DH *DH_get_##x(void)                                                            \
+    {                                                                               \
+        DH *dh = DH_new();                                                          \
+                                                                                    \
+        if (dh == NULL)                                                             \
+            return NULL;                                                            \
+        dh->params.p = BN_dup(&ossl_bignum_dh##x##_p);                              \
+        dh->params.g = BN_dup(&ossl_bignum_dh##x##_g);                              \
+        dh->params.q = BN_dup(&ossl_bignum_dh##x##_q);                              \
+        if (dh->params.p == NULL || dh->params.q == NULL || dh->params.g == NULL) { \
+            DH_free(dh);                                                            \
+            return NULL;                                                            \
+        }                                                                           \
+        return dh;                                                                  \
+    }
 
 make_dh(1024_160)
-make_dh(2048_224)
-make_dh(2048_256)
+    make_dh(2048_224)
+        make_dh(2048_256)
diff --git a/crypto/dllmain.c b/crypto/dllmain.c
index 96198a9397371..1525878705412 100644
--- a/crypto/dllmain.c
+++ b/crypto/dllmain.c
@@ -11,14 +11,14 @@
 #include "crypto/cryptlib.h"
 
 #if defined(_WIN32) || defined(__CYGWIN__)
-# ifdef __CYGWIN__
+#ifdef __CYGWIN__
 /* pick DLL_[PROCESS|THREAD]_[ATTACH|DETACH] definitions */
-#  include <windows.h>
+#include <windows.h>
 /*
  * this has side-effect of _WIN32 getting defined, which otherwise is
  * mutually exclusive with __CYGWIN__...
  */
-# endif
+#endif
 
 /*
  * All we really need to do is remove the 'error' state when a thread
@@ -43,4 +43,3 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     return TRUE;
 }
 #endif
-
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 169c1bb677a51..2480e88d1e71b 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -77,11 +77,10 @@ static int dsa_pub_decode(EVP_PKEY *pkey, const X509_PUBKEY *pubkey)
     EVP_PKEY_assign_DSA(pkey, dsa);
     return 1;
 
- err:
+err:
     ASN1_INTEGER_free(public_key);
     DSA_free(dsa);
     return 0;
-
 }
 
 static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
@@ -135,7 +134,7 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     if (X509_PUBKEY_set0_param(pk, aobj, ptype, str, penc, penclen))
         return 1;
 
- err:
+err:
     OPENSSL_free(penc);
     ASN1_STRING_free(str);
 
@@ -167,7 +166,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     unsigned char *dp = NULL;
     int dplen;
 
-    if (pkey->pkey.dsa  == NULL|| pkey->pkey.dsa->priv_key == NULL) {
+    if (pkey->pkey.dsa == NULL || pkey->pkey.dsa->priv_key == NULL) {
         ERR_raise(ERR_LIB_DSA, DSA_R_MISSING_PARAMETERS);
         goto err;
     }
@@ -204,13 +203,13 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     }
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_dsa), 0,
-                         V_ASN1_SEQUENCE, params, dp, dplen)) {
+            V_ASN1_SEQUENCE, params, dp, dplen)) {
         OPENSSL_clear_free(dp, dplen);
         goto err;
     }
     return 1;
 
- err:
+err:
     ASN1_STRING_free(params);
     return 0;
 }
@@ -313,12 +312,12 @@ static int do_dsa_print(BIO *bp, const DSA *x, int off, int ptype)
     if (!ossl_ffc_params_print(bp, &x->params, off))
         goto err;
     ret = 1;
- err:
+err:
     return ret;
 }
 
 static int dsa_param_decode(EVP_PKEY *pkey,
-                            const unsigned char **pder, int derlen)
+    const unsigned char **pder, int derlen)
 {
     DSA *dsa;
 
@@ -336,25 +335,25 @@ static int dsa_param_encode(const EVP_PKEY *pkey, unsigned char **pder)
 }
 
 static int dsa_param_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                           ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return do_dsa_print(bp, pkey->pkey.dsa, indent, 0);
 }
 
 static int dsa_pub_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                         ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return do_dsa_print(bp, pkey->pkey.dsa, indent, 1);
 }
 
 static int dsa_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                          ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return do_dsa_print(bp, pkey->pkey.dsa, indent, 2);
 }
 
 static int old_dsa_priv_decode(EVP_PKEY *pkey,
-                               const unsigned char **pder, int derlen)
+    const unsigned char **pder, int derlen)
 {
     DSA *dsa;
 
@@ -373,7 +372,7 @@ static int old_dsa_priv_encode(const EVP_PKEY *pkey, unsigned char **pder)
 }
 
 static int dsa_sig_print(BIO *bp, const X509_ALGOR *sigalg,
-                         const ASN1_STRING *sig, int indent, ASN1_PCTX *pctx)
+    const ASN1_STRING *sig, int indent, ASN1_PCTX *pctx)
 {
     DSA_SIG *dsa_sig;
     const unsigned char *p;
@@ -400,7 +399,7 @@ static int dsa_sig_print(BIO *bp, const X509_ALGOR *sigalg,
         if (!ASN1_bn_print(bp, "s:   ", s, NULL, indent))
             goto err;
         rv = 1;
- err:
+    err:
         DSA_SIG_free(dsa_sig);
         return rv;
     }
@@ -427,8 +426,8 @@ static size_t dsa_pkey_dirty_cnt(const EVP_PKEY *pkey)
 }
 
 static int dsa_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
-                              OSSL_FUNC_keymgmt_import_fn *importer,
-                              OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_FUNC_keymgmt_import_fn *importer,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     DSA *dsa = from->pkey.dsa;
     OSSL_PARAM_BLD *tmpl;
@@ -453,13 +452,13 @@ static int dsa_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
     selection |= OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS;
     if (pub_key != NULL) {
         if (!OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PUB_KEY,
-                                    pub_key))
+                pub_key))
             goto err;
         selection |= OSSL_KEYMGMT_SELECT_PUBLIC_KEY;
     }
     if (priv_key != NULL) {
         if (!OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PRIV_KEY,
-                                    priv_key))
+                priv_key))
             goto err;
         selection |= OSSL_KEYMGMT_SELECT_PRIVATE_KEY;
     }
@@ -471,7 +470,7 @@ static int dsa_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
     rv = importer(to_keydata, selection, params);
 
     OSSL_PARAM_free(params);
- err:
+err:
     OSSL_PARAM_BLD_free(tmpl);
     return rv;
 }
@@ -520,63 +519,61 @@ const EVP_PKEY_ASN1_METHOD ossl_dsa_asn1_meths[4] = {
 
     /* This aliases NID_dsa with NID_dsa_2 */
     {
-     EVP_PKEY_DSA1,
-     EVP_PKEY_DSA,
-     ASN1_PKEY_ALIAS},
+        EVP_PKEY_DSA1,
+        EVP_PKEY_DSA,
+        ASN1_PKEY_ALIAS },
 
     /* This aliases NID_dsaWithSHA with NID_dsaWithSHA_2 */
     {
-     EVP_PKEY_DSA4,
-     EVP_PKEY_DSA2,
-     ASN1_PKEY_ALIAS},
+        EVP_PKEY_DSA4,
+        EVP_PKEY_DSA2,
+        ASN1_PKEY_ALIAS },
 
     /* This aliases NID_dsaWithSHA with NID_dsaWithSHA1 */
     {
-     EVP_PKEY_DSA3,
-     EVP_PKEY_DSA2,
-     ASN1_PKEY_ALIAS},
-
-    {
-     EVP_PKEY_DSA,
-     EVP_PKEY_DSA,
-     0,
-
-     "DSA",
-     "OpenSSL DSA method",
-
-     dsa_pub_decode,
-     dsa_pub_encode,
-     dsa_pub_cmp,
-     dsa_pub_print,
-
-     dsa_priv_decode,
-     dsa_priv_encode,
-     dsa_priv_print,
-
-     int_dsa_size,
-     dsa_bits,
-     dsa_security_bits,
-
-     dsa_param_decode,
-     dsa_param_encode,
-     dsa_missing_parameters,
-     dsa_copy_parameters,
-     dsa_cmp_parameters,
-     dsa_param_print,
-     dsa_sig_print,
-
-     int_dsa_free,
-     dsa_pkey_ctrl,
-     old_dsa_priv_decode,
-     old_dsa_priv_encode,
-
-     NULL, NULL, NULL,
-     NULL, NULL, NULL,
-     NULL, NULL, NULL, NULL,
-
-     dsa_pkey_dirty_cnt,
-     dsa_pkey_export_to,
-     dsa_pkey_import_from,
-     dsa_pkey_copy
-    }
+        EVP_PKEY_DSA3,
+        EVP_PKEY_DSA2,
+        ASN1_PKEY_ALIAS },
+
+    { EVP_PKEY_DSA,
+        EVP_PKEY_DSA,
+        0,
+
+        "DSA",
+        "OpenSSL DSA method",
+
+        dsa_pub_decode,
+        dsa_pub_encode,
+        dsa_pub_cmp,
+        dsa_pub_print,
+
+        dsa_priv_decode,
+        dsa_priv_encode,
+        dsa_priv_print,
+
+        int_dsa_size,
+        dsa_bits,
+        dsa_security_bits,
+
+        dsa_param_decode,
+        dsa_param_encode,
+        dsa_missing_parameters,
+        dsa_copy_parameters,
+        dsa_cmp_parameters,
+        dsa_param_print,
+        dsa_sig_print,
+
+        int_dsa_free,
+        dsa_pkey_ctrl,
+        old_dsa_priv_decode,
+        old_dsa_priv_encode,
+
+        NULL, NULL, NULL,
+        NULL, NULL, NULL,
+        NULL, NULL, NULL, NULL,
+
+        dsa_pkey_dirty_cnt,
+        dsa_pkey_export_to,
+        dsa_pkey_import_from,
+        dsa_pkey_copy }
 };
diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c
index 300ce6806df58..3366610a9fdc8 100644
--- a/crypto/dsa/dsa_asn1.c
+++ b/crypto/dsa/dsa_asn1.c
@@ -23,7 +23,7 @@
 
 /* Override the default free and new methods */
 static int dsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                  void *exarg)
+    void *exarg)
 {
     if (operation == ASN1_OP_NEW_PRE) {
         *pval = (ASN1_VALUE *)DSA_new();
@@ -39,32 +39,32 @@ static int dsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_SEQUENCE_cb(DSAPrivateKey, dsa_cb) = {
-        ASN1_EMBED(DSA, version, INT32),
-        ASN1_SIMPLE(DSA, params.p, BIGNUM),
-        ASN1_SIMPLE(DSA, params.q, BIGNUM),
-        ASN1_SIMPLE(DSA, params.g, BIGNUM),
-        ASN1_SIMPLE(DSA, pub_key, BIGNUM),
-        ASN1_SIMPLE(DSA, priv_key, CBIGNUM)
+    ASN1_EMBED(DSA, version, INT32),
+    ASN1_SIMPLE(DSA, params.p, BIGNUM),
+    ASN1_SIMPLE(DSA, params.q, BIGNUM),
+    ASN1_SIMPLE(DSA, params.g, BIGNUM),
+    ASN1_SIMPLE(DSA, pub_key, BIGNUM),
+    ASN1_SIMPLE(DSA, priv_key, CBIGNUM)
 } static_ASN1_SEQUENCE_END_cb(DSA, DSAPrivateKey)
 
-IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DSA, DSAPrivateKey, DSAPrivateKey)
+    IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DSA, DSAPrivateKey, DSAPrivateKey)
 
 ASN1_SEQUENCE_cb(DSAparams, dsa_cb) = {
-        ASN1_SIMPLE(DSA, params.p, BIGNUM),
-        ASN1_SIMPLE(DSA, params.q, BIGNUM),
-        ASN1_SIMPLE(DSA, params.g, BIGNUM),
+    ASN1_SIMPLE(DSA, params.p, BIGNUM),
+    ASN1_SIMPLE(DSA, params.q, BIGNUM),
+    ASN1_SIMPLE(DSA, params.g, BIGNUM),
 } static_ASN1_SEQUENCE_END_cb(DSA, DSAparams)
 
-IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DSA, DSAparams, DSAparams)
+    IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DSA, DSAparams, DSAparams)
 
 ASN1_SEQUENCE_cb(DSAPublicKey, dsa_cb) = {
-        ASN1_SIMPLE(DSA, pub_key, BIGNUM),
-        ASN1_SIMPLE(DSA, params.p, BIGNUM),
-        ASN1_SIMPLE(DSA, params.q, BIGNUM),
-        ASN1_SIMPLE(DSA, params.g, BIGNUM)
+    ASN1_SIMPLE(DSA, pub_key, BIGNUM),
+    ASN1_SIMPLE(DSA, params.p, BIGNUM),
+    ASN1_SIMPLE(DSA, params.q, BIGNUM),
+    ASN1_SIMPLE(DSA, params.g, BIGNUM)
 } static_ASN1_SEQUENCE_END_cb(DSA, DSAPublicKey)
 
-IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DSA, DSAPublicKey, DSAPublicKey)
+    IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(DSA, DSAPublicKey, DSAPublicKey)
 
 DSA *DSAparams_dup(const DSA *dsa)
 {
diff --git a/crypto/dsa/dsa_backend.c b/crypto/dsa/dsa_backend.c
index 8bd4b8ad7e0e2..4d71d17b916e0 100644
--- a/crypto/dsa/dsa_backend.c
+++ b/crypto/dsa/dsa_backend.c
@@ -16,7 +16,7 @@
 #include <openssl/core_names.h>
 #include <openssl/err.h>
 #ifndef FIPS_MODULE
-# include <openssl/x509.h>
+#include <openssl/x509.h>
 #endif
 #include "crypto/dsa.h"
 #include "dsa_local.h"
@@ -28,7 +28,7 @@
  */
 
 int ossl_dsa_key_fromdata(DSA *dsa, const OSSL_PARAM params[],
-                          int include_private)
+    int include_private)
 {
     const OSSL_PARAM *param_priv_key = NULL, *param_pub_key;
     BIGNUM *priv_key = NULL, *pub_key = NULL;
@@ -37,11 +37,9 @@ int ossl_dsa_key_fromdata(DSA *dsa, const OSSL_PARAM params[],
         return 0;
 
     if (include_private) {
-        param_priv_key =
-            OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
+        param_priv_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
     }
-    param_pub_key =
-        OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
+    param_pub_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
 
     /* It's ok if neither half is present */
     if (param_priv_key == NULL && param_pub_key == NULL)
@@ -57,7 +55,7 @@ int ossl_dsa_key_fromdata(DSA *dsa, const OSSL_PARAM params[],
 
     return 1;
 
- err:
+err:
     BN_clear_free(priv_key);
     BN_free(pub_key);
     return 0;
@@ -108,20 +106,20 @@ DSA *ossl_dsa_dup(const DSA *dsa, int selection)
 
 #ifndef FIPS_MODULE
     if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_DSA,
-                            &dupkey->ex_data, &dsa->ex_data))
+            &dupkey->ex_data, &dsa->ex_data))
         goto err;
 #endif
 
     return dupkey;
 
- err:
+err:
     DSA_free(dupkey);
     return NULL;
 }
 
 #ifndef FIPS_MODULE
 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)
 {
     const unsigned char *p, *pm;
     int pklen, pmlen;
@@ -180,14 +178,14 @@ DSA *ossl_dsa_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
 
     goto done;
 
- decerr:
+decerr:
     ERR_raise(ERR_LIB_DSA, DSA_R_DECODE_ERROR);
- dsaerr:
+dsaerr:
     BN_free(dsa_privkey);
     BN_free(dsa_pubkey);
     DSA_free(dsa);
     dsa = NULL;
- done:
+done:
     BN_CTX_free(ctx);
     ASN1_STRING_clear_free(privkey);
     return dsa;
diff --git a/crypto/dsa/dsa_check.c b/crypto/dsa/dsa_check.c
index e1375dfad9c0f..c206688ce2611 100644
--- a/crypto/dsa/dsa_check.c
+++ b/crypto/dsa/dsa_check.c
@@ -49,7 +49,7 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
 
     if (checktype == OSSL_KEYMGMT_VALIDATE_QUICK_CHECK)
         return ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params,
-                                               FFC_PARAM_TYPE_DSA, ret);
+            FFC_PARAM_TYPE_DSA, ret);
     else
         /*
          * Do full FFC domain params validation according to FIPS-186-4
@@ -57,7 +57,7 @@ int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret)
          *  - only if possible (i.e., seed is set) in default provider
          */
         return ossl_ffc_params_full_validate(dsa->libctx, &dsa->params,
-                                             FFC_PARAM_TYPE_DSA, ret);
+            FFC_PARAM_TYPE_DSA, ret);
 }
 
 /*
@@ -69,7 +69,7 @@ int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret)
         return 0;
 
     return ossl_ffc_validate_public_key(&dsa->params, pub_key, ret)
-           && *ret == 0;
+        && *ret == 0;
 }
 
 /*
@@ -83,7 +83,7 @@ int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key, int *r
         return 0;
 
     return ossl_ffc_validate_public_key_partial(&dsa->params, pub_key, ret)
-           && *ret == 0;
+        && *ret == 0;
 }
 
 int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret)
diff --git a/crypto/dsa/dsa_depr.c b/crypto/dsa/dsa_depr.c
index 95f8d1f3a9cb2..b07826440e939 100644
--- a/crypto/dsa/dsa_depr.c
+++ b/crypto/dsa/dsa_depr.c
@@ -29,10 +29,10 @@
 #include <openssl/sha.h>
 
 DSA *DSA_generate_parameters(int bits,
-                             unsigned char *seed_in, int seed_len,
-                             int *counter_ret, unsigned long *h_ret,
-                             void (*callback) (int, int, void *),
-                             void *cb_arg)
+    unsigned char *seed_in, int seed_len,
+    int *counter_ret, unsigned long *h_ret,
+    void (*callback)(int, int, void *),
+    void *cb_arg)
 {
     BN_GENCB *cb;
     DSA *ret;
@@ -46,7 +46,7 @@ DSA *DSA_generate_parameters(int bits,
     BN_GENCB_set_old(cb, callback, cb_arg);
 
     if (DSA_generate_parameters_ex(ret, bits, seed_in, seed_len,
-                                   counter_ret, h_ret, cb)) {
+            counter_ret, h_ret, cb)) {
         BN_GENCB_free(cb);
         return ret;
     }
diff --git a/crypto/dsa/dsa_err.c b/crypto/dsa/dsa_err.c
index a92ca61664772..12bc68ab56e19 100644
--- a/crypto/dsa/dsa_err.c
+++ b/crypto/dsa/dsa_err.c
@@ -14,40 +14,40 @@
 
 #ifndef OPENSSL_NO_DSA
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA DSA_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BAD_FFC_PARAMETERS), "bad ffc parameters"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BAD_Q_VALUE), "bad q value"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BN_DECODE_ERROR), "bn decode error"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BN_ERROR), "bn error"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_DECODE_ERROR), "decode error"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_INVALID_DIGEST_TYPE),
-    "invalid digest type"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_INVALID_PARAMETERS), "invalid parameters"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_MISSING_PARAMETERS), "missing parameters"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_MISSING_PRIVATE_KEY),
-    "missing private key"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_MODULUS_TOO_LARGE), "modulus too large"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_NO_PARAMETERS_SET), "no parameters set"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_PARAMETER_ENCODING_ERROR),
-    "parameter encoding error"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_P_NOT_PRIME), "p not prime"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_Q_NOT_PRIME), "q not prime"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_SEED_LEN_SMALL),
-    "seed_len is less than the length of q"},
-    {ERR_PACK(ERR_LIB_DSA, 0, DSA_R_TOO_MANY_RETRIES), "too many retries"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BAD_FFC_PARAMETERS), "bad ffc parameters" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BAD_Q_VALUE), "bad q value" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BN_DECODE_ERROR), "bn decode error" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_BN_ERROR), "bn error" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_DECODE_ERROR), "decode error" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_INVALID_DIGEST_TYPE),
+        "invalid digest type" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_INVALID_PARAMETERS), "invalid parameters" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_MISSING_PARAMETERS), "missing parameters" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_MISSING_PRIVATE_KEY),
+        "missing private key" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_MODULUS_TOO_LARGE), "modulus too large" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_NO_PARAMETERS_SET), "no parameters set" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_PARAMETER_ENCODING_ERROR),
+        "parameter encoding error" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_P_NOT_PRIME), "p not prime" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_Q_NOT_PRIME), "q not prime" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_SEED_LEN_SMALL),
+        "seed_len is less than the length of q" },
+    { ERR_PACK(ERR_LIB_DSA, 0, DSA_R_TOO_MANY_RETRIES), "too many retries" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_DSA_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(DSA_str_reasons[0].error) == NULL)
         ERR_load_strings_const(DSA_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index a450921412811..69344dd0905ae 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -24,20 +24,20 @@
 #include "dsa_local.h"
 
 int ossl_dsa_generate_ffc_parameters(DSA *dsa, int type, int pbits, int qbits,
-                                     BN_GENCB *cb)
+    BN_GENCB *cb)
 {
     int ret = 0, res;
 
 #ifndef FIPS_MODULE
     if (type == DSA_PARAMGEN_TYPE_FIPS_186_2)
         ret = ossl_ffc_params_FIPS186_2_generate(dsa->libctx, &dsa->params,
-                                                 FFC_PARAM_TYPE_DSA,
-                                                 pbits, qbits, &res, cb);
+            FFC_PARAM_TYPE_DSA,
+            pbits, qbits, &res, cb);
     else
 #endif
         ret = ossl_ffc_params_FIPS186_4_generate(dsa->libctx, &dsa->params,
-                                                 FFC_PARAM_TYPE_DSA,
-                                                 pbits, qbits, &res, cb);
+            FFC_PARAM_TYPE_DSA,
+            pbits, qbits, &res, cb);
     if (ret > 0)
         dsa->dirty_cnt++;
     return ret;
@@ -45,26 +45,26 @@ int ossl_dsa_generate_ffc_parameters(DSA *dsa, int type, int pbits, int qbits,
 
 #ifndef FIPS_MODULE
 int DSA_generate_parameters_ex(DSA *dsa, int bits,
-                               const unsigned char *seed_in, int seed_len,
-                               int *counter_ret, unsigned long *h_ret,
-                               BN_GENCB *cb)
+    const unsigned char *seed_in, int seed_len,
+    int *counter_ret, unsigned long *h_ret,
+    BN_GENCB *cb)
 {
     if (dsa->meth->dsa_paramgen)
         return dsa->meth->dsa_paramgen(dsa, bits, seed_in, seed_len,
-                                       counter_ret, h_ret, cb);
+            counter_ret, h_ret, cb);
     if (seed_in != NULL
         && !ossl_ffc_params_set_validate_params(&dsa->params, seed_in, seed_len,
-                                                -1))
+            -1))
         return 0;
 
     /* The old code used FIPS 186-2 DSA Parameter generation */
     if (bits < 2048 && seed_len <= 20) {
         if (!ossl_dsa_generate_ffc_parameters(dsa, DSA_PARAMGEN_TYPE_FIPS_186_2,
-                                              bits, 160, cb))
+                bits, 160, cb))
             return 0;
     } else {
         if (!ossl_dsa_generate_ffc_parameters(dsa, DSA_PARAMGEN_TYPE_FIPS_186_4,
-                                              bits, 0, cb))
+                bits, 0, cb))
             return 0;
     }
 
diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c
index 1c2bab1714b3b..aa69c3eea8fb8 100644
--- a/crypto/dsa/dsa_key.c
+++ b/crypto/dsa/dsa_key.c
@@ -23,9 +23,9 @@
 #include "dsa_local.h"
 
 #ifdef FIPS_MODULE
-# define MIN_STRENGTH 112
+#define MIN_STRENGTH 112
 #else
-# define MIN_STRENGTH 80
+#define MIN_STRENGTH 80
 #endif
 
 static int dsa_keygen(DSA *dsa);
@@ -40,7 +40,7 @@ int DSA_generate_key(DSA *dsa)
 }
 
 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 ret = 0;
     BIGNUM *prk = BN_new();
@@ -73,11 +73,11 @@ int ossl_dsa_generate_public_key(BN_CTX *ctx, const DSA *dsa,
  * the comparison of the original public key to a newly calculated public key.
  */
 static int dsa_keygen_knownanswer_test(DSA *dsa, BN_CTX *ctx,
-                                       OSSL_CALLBACK *cb, void *cbarg)
+    OSSL_CALLBACK *cb, void *cbarg)
 {
     int len, ret = 0;
     OSSL_SELF_TEST *st = NULL;
-    unsigned char bytes[512] = {0};
+    unsigned char bytes[512] = { 0 };
     BIGNUM *pub_key2 = BN_new();
 
     if (pub_key2 == NULL)
@@ -88,7 +88,7 @@ static int dsa_keygen_knownanswer_test(DSA *dsa, BN_CTX *ctx,
         goto err;
 
     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT_KAT,
-                               OSSL_SELF_TEST_DESC_PCT_DSA);
+        OSSL_SELF_TEST_DESC_PCT_DSA);
 
     if (!ossl_dsa_generate_public_key(ctx, dsa, dsa->priv_key, pub_key2))
         goto err;
@@ -114,7 +114,7 @@ static int dsa_keygen_knownanswer_test(DSA *dsa, BN_CTX *ctx,
 static int dsa_keygen_pairwise_test(DSA *dsa, OSSL_CALLBACK *cb, void *cbarg)
 {
     int ret = 0;
-    unsigned char dgst[16] = {0};
+    unsigned char dgst[16] = { 0 };
     unsigned int dgst_len = (unsigned int)sizeof(dgst);
     DSA_SIG *sig = NULL;
     OSSL_SELF_TEST *st = NULL;
@@ -124,7 +124,7 @@ static int dsa_keygen_pairwise_test(DSA *dsa, OSSL_CALLBACK *cb, void *cbarg)
         goto err;
 
     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
-                           OSSL_SELF_TEST_DESC_PCT_DSA);
+        OSSL_SELF_TEST_DESC_PCT_DSA);
 
     sig = DSA_do_sign(dgst, (int)dgst_len, dsa);
     if (sig == NULL)
@@ -162,7 +162,7 @@ static int dsa_keygen(DSA *dsa)
 
     /* Do a partial check for invalid p, q, g */
     if (!ossl_ffc_params_simple_validate(dsa->libctx, &dsa->params,
-                                         FFC_PARAM_TYPE_DSA, NULL))
+            FFC_PARAM_TYPE_DSA, NULL))
         goto err;
 
     /*
@@ -171,8 +171,8 @@ static int dsa_keygen(DSA *dsa)
      * Max Private key size N = len(q)
      */
     if (!ossl_ffc_generate_private_key(ctx, &dsa->params,
-                                       BN_num_bits(dsa->params.q),
-                                       MIN_STRENGTH, priv_key))
+            BN_num_bits(dsa->params.q),
+            MIN_STRENGTH, priv_key))
         goto err;
 
     if (dsa->pub_key == NULL) {
@@ -196,7 +196,7 @@ static int dsa_keygen(DSA *dsa)
 
         OSSL_SELF_TEST_get_callback(dsa->libctx, &cb, &cbarg);
         ok = dsa_keygen_pairwise_test(dsa, cb, cbarg)
-             && dsa_keygen_knownanswer_test(dsa, ctx, cb, cbarg);
+            && dsa_keygen_knownanswer_test(dsa, ctx, cb, cbarg);
         if (!ok) {
             ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT);
             BN_free(dsa->pub_key);
@@ -210,7 +210,7 @@ static int dsa_keygen(DSA *dsa)
 #endif
     dsa->dirty_cnt++;
 
- err:
+err:
     if (pub_key != dsa->pub_key)
         BN_free(pub_key);
     if (priv_key != dsa->priv_key)
diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index db6e3b059b4de..382fe9d0f1621 100644
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -15,7 +15,7 @@
 
 #include <openssl/bn.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include "internal/cryptlib.h"
 #include "internal/refcount.h"
@@ -37,7 +37,7 @@ void *DSA_get_ex_data(const DSA *d, int idx)
     return CRYPTO_get_ex_data(&d->ex_data, idx);
 }
 
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
 DH *DSA_dup_DH(const DSA *r)
 {
     /*
@@ -75,13 +75,13 @@ DH *DSA_dup_DH(const DSA *r)
 
     return ret;
 
- err:
+err:
     BN_free(pub_key);
     BN_free(priv_key);
     DH_free(ret);
     return NULL;
 }
-# endif /*  OPENSSL_NO_DH */
+#endif /*  OPENSSL_NO_DH */
 
 void DSA_clear_flags(DSA *d, int flags)
 {
@@ -124,7 +124,6 @@ int DSA_set_method(DSA *dsa, const DSA_METHOD *meth)
 }
 #endif /* FIPS_MODULE */
 
-
 const DSA_METHOD *DSA_get_method(DSA *d)
 {
     return d->meth;
@@ -175,7 +174,7 @@ static DSA *dsa_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx)
 
 #ifndef FIPS_MODULE
     if (!ossl_crypto_new_ex_data_ex(libctx, CRYPTO_EX_INDEX_DSA, ret,
-                                    &ret->ex_data))
+            &ret->ex_data))
         goto err;
 #endif
 
@@ -188,7 +187,7 @@ static DSA *dsa_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx)
 
     return ret;
 
- err:
+err:
     DSA_free(ret);
     return NULL;
 }
@@ -260,7 +259,7 @@ void ossl_dsa_set0_libctx(DSA *d, OSSL_LIB_CTX *libctx)
 }
 
 void DSA_get0_pqg(const DSA *d,
-                  const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
+    const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
 {
     ossl_ffc_params_get0_pqg(&d->params, p, q, g);
 }
@@ -307,7 +306,7 @@ const BIGNUM *DSA_get0_priv_key(const DSA *d)
 }
 
 void DSA_get0_key(const DSA *d,
-                  const BIGNUM **pub_key, const BIGNUM **priv_key)
+    const BIGNUM **pub_key, const BIGNUM **priv_key)
 {
     if (pub_key != NULL)
         *pub_key = d->pub_key;
@@ -334,7 +333,7 @@ int DSA_security_bits(const DSA *d)
 {
     if (d->params.p != NULL && d->params.q != NULL)
         return BN_security_bits(BN_num_bits(d->params.p),
-                                BN_num_bits(d->params.q));
+            BN_num_bits(d->params.q));
     return -1;
 }
 
diff --git a/crypto/dsa/dsa_local.h b/crypto/dsa/dsa_local.h
index 38cb64a829414..73a6bad653dbc 100644
--- a/crypto/dsa/dsa_local.h
+++ b/crypto/dsa/dsa_local.h
@@ -19,8 +19,8 @@ struct dsa_st {
     int pad;
     int32_t version;
     FFC_PARAMS params;
-    BIGNUM *pub_key;            /* y public key */
-    BIGNUM *priv_key;           /* x private key */
+    BIGNUM *pub_key; /* y public key */
+    BIGNUM *priv_key; /* x private key */
     int flags;
     /* Normally used to cache montgomery values */
     BN_MONT_CTX *method_mont_p;
@@ -45,30 +45,30 @@ struct DSA_SIG_st {
 
 struct dsa_method {
     char *name;
-    DSA_SIG *(*dsa_do_sign) (const unsigned char *dgst, int dlen, DSA *dsa);
-    int (*dsa_sign_setup) (DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
-                           BIGNUM **rp);
-    int (*dsa_do_verify) (const unsigned char *dgst, int dgst_len,
-                          DSA_SIG *sig, DSA *dsa);
-    int (*dsa_mod_exp) (DSA *dsa, BIGNUM *rr, const BIGNUM *a1,
-                        const BIGNUM *p1, const BIGNUM *a2, const BIGNUM *p2,
-                        const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont);
+    DSA_SIG *(*dsa_do_sign)(const unsigned char *dgst, int dlen, DSA *dsa);
+    int (*dsa_sign_setup)(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
+        BIGNUM **rp);
+    int (*dsa_do_verify)(const unsigned char *dgst, int dgst_len,
+        DSA_SIG *sig, DSA *dsa);
+    int (*dsa_mod_exp)(DSA *dsa, BIGNUM *rr, const BIGNUM *a1,
+        const BIGNUM *p1, const BIGNUM *a2, const BIGNUM *p2,
+        const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont);
     /* Can be null */
-    int (*bn_mod_exp) (DSA *dsa, BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                       const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-    int (*init) (DSA *dsa);
-    int (*finish) (DSA *dsa);
+    int (*bn_mod_exp)(DSA *dsa, BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+        const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+    int (*init)(DSA *dsa);
+    int (*finish)(DSA *dsa);
     int flags;
     void *app_data;
     /* If this is non-NULL, it is used to generate DSA parameters */
-    int (*dsa_paramgen) (DSA *dsa, int bits,
-                         const unsigned char *seed, int seed_len,
-                         int *counter_ret, unsigned long *h_ret,
-                         BN_GENCB *cb);
+    int (*dsa_paramgen)(DSA *dsa, int bits,
+        const unsigned char *seed, int seed_len,
+        int *counter_ret, unsigned long *h_ret,
+        BN_GENCB *cb);
     /* If this is non-NULL, it is used to generate DSA keys */
-    int (*dsa_keygen) (DSA *dsa);
+    int (*dsa_keygen)(DSA *dsa);
 };
 
 DSA_SIG *ossl_dsa_do_sign_int(const unsigned char *dgst, int dlen, DSA *dsa,
-                              unsigned int nonce_type, const char *digestname,
-                              OSSL_LIB_CTX *libctx, const char *propq);
+    unsigned int nonce_type, const char *digestname,
+    OSSL_LIB_CTX *libctx, const char *propq);
diff --git a/crypto/dsa/dsa_meth.c b/crypto/dsa/dsa_meth.c
index f2b759a9dea61..175630c290123 100644
--- a/crypto/dsa/dsa_meth.c
+++ b/crypto/dsa/dsa_meth.c
@@ -100,71 +100,66 @@ int DSA_meth_set0_app_data(DSA_METHOD *dsam, void *app_data)
     return 1;
 }
 
-DSA_SIG *(*DSA_meth_get_sign(const DSA_METHOD *dsam))
-        (const unsigned char *, int, DSA *)
+DSA_SIG *(*DSA_meth_get_sign(const DSA_METHOD *dsam))(const unsigned char *, int, DSA *)
 {
     return dsam->dsa_do_sign;
 }
 
 int DSA_meth_set_sign(DSA_METHOD *dsam,
-                       DSA_SIG *(*sign) (const unsigned char *, int, DSA *))
+    DSA_SIG *(*sign)(const unsigned char *, int, DSA *))
 {
     dsam->dsa_do_sign = sign;
     return 1;
 }
 
-int (*DSA_meth_get_sign_setup(const DSA_METHOD *dsam))
-        (DSA *, BN_CTX *, BIGNUM **, BIGNUM **)
+int (*DSA_meth_get_sign_setup(const DSA_METHOD *dsam))(DSA *, BN_CTX *, BIGNUM **, BIGNUM **)
 {
     return dsam->dsa_sign_setup;
 }
 
 int DSA_meth_set_sign_setup(DSA_METHOD *dsam,
-        int (*sign_setup) (DSA *, BN_CTX *, BIGNUM **, BIGNUM **))
+    int (*sign_setup)(DSA *, BN_CTX *, BIGNUM **, BIGNUM **))
 {
     dsam->dsa_sign_setup = sign_setup;
     return 1;
 }
 
-int (*DSA_meth_get_verify(const DSA_METHOD *dsam))
-        (const unsigned char *, int, DSA_SIG *, DSA *)
+int (*DSA_meth_get_verify(const DSA_METHOD *dsam))(const unsigned char *, int, DSA_SIG *, DSA *)
 {
     return dsam->dsa_do_verify;
 }
 
 int DSA_meth_set_verify(DSA_METHOD *dsam,
-    int (*verify) (const unsigned char *, int, DSA_SIG *, DSA *))
+    int (*verify)(const unsigned char *, int, DSA_SIG *, DSA *))
 {
     dsam->dsa_do_verify = verify;
     return 1;
 }
 
-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 (*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 *)
 {
     return dsam->dsa_mod_exp;
 }
 
 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 *))
+    int (*mod_exp)(DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
+        const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *,
+        BN_MONT_CTX *))
 {
     dsam->dsa_mod_exp = mod_exp;
     return 1;
 }
 
-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 (*DSA_meth_get_bn_mod_exp(const DSA_METHOD *dsam))(DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *,
+    BN_MONT_CTX *)
 {
     return dsam->bn_mod_exp;
 }
 
 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 *))
 {
     dsam->bn_mod_exp = bn_mod_exp;
     return 1;
@@ -181,38 +176,37 @@ int DSA_meth_set_init(DSA_METHOD *dsam, int (*init)(DSA *))
     return 1;
 }
 
-int (*DSA_meth_get_finish(const DSA_METHOD *dsam)) (DSA *)
+int (*DSA_meth_get_finish(const DSA_METHOD *dsam))(DSA *)
 {
     return dsam->finish;
 }
 
-int DSA_meth_set_finish(DSA_METHOD *dsam, int (*finish) (DSA *))
+int DSA_meth_set_finish(DSA_METHOD *dsam, int (*finish)(DSA *))
 {
     dsam->finish = finish;
     return 1;
 }
 
-int (*DSA_meth_get_paramgen(const DSA_METHOD *dsam))
-        (DSA *, int, const unsigned char *, int, int *, unsigned long *,
-         BN_GENCB *)
+int (*DSA_meth_get_paramgen(const DSA_METHOD *dsam))(DSA *, int, const unsigned char *, int, int *, unsigned long *,
+    BN_GENCB *)
 {
     return dsam->dsa_paramgen;
 }
 
 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 *))
 {
     dsam->dsa_paramgen = paramgen;
     return 1;
 }
 
-int (*DSA_meth_get_keygen(const DSA_METHOD *dsam)) (DSA *)
+int (*DSA_meth_get_keygen(const DSA_METHOD *dsam))(DSA *)
 {
     return dsam->dsa_keygen;
 }
 
-int DSA_meth_set_keygen(DSA_METHOD *dsam, int (*keygen) (DSA *))
+int DSA_meth_set_keygen(DSA_METHOD *dsam, int (*keygen)(DSA *))
 {
     dsam->dsa_keygen = keygen;
     return 1;
diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c
index 59b26d73696b9..7bfcb434d084f 100644
--- a/crypto/dsa/dsa_ossl.c
+++ b/crypto/dsa/dsa_ossl.c
@@ -22,30 +22,30 @@
 #include <openssl/asn1.h>
 #include "internal/deterministic_nonce.h"
 
-#define MIN_DSA_SIGN_QBITS   128
+#define MIN_DSA_SIGN_QBITS 128
 #define MAX_DSA_SIGN_RETRIES 8
 
 static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
 static int dsa_sign_setup_no_digest(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
-                                    BIGNUM **rp);
+    BIGNUM **rp);
 static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
-                          BIGNUM **rp, const unsigned char *dgst, int dlen,
-                          unsigned int nonce_type, const char *digestname,
-                          OSSL_LIB_CTX *libctx, const char *propq);
+    BIGNUM **rp, const unsigned char *dgst, int dlen,
+    unsigned int nonce_type, const char *digestname,
+    OSSL_LIB_CTX *libctx, const char *propq);
 static int dsa_do_verify(const unsigned char *dgst, int dgst_len,
-                         DSA_SIG *sig, DSA *dsa);
+    DSA_SIG *sig, DSA *dsa);
 static int dsa_init(DSA *dsa);
 static int dsa_finish(DSA *dsa);
 static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q,
-                                      BN_CTX *ctx);
+    BN_CTX *ctx);
 
 static DSA_METHOD openssl_dsa_meth = {
     "OpenSSL DSA method",
     dsa_do_sign,
     dsa_sign_setup_no_digest,
     dsa_do_verify,
-    NULL,                       /* dsa_mod_exp, */
-    NULL,                       /* dsa_bn_mod_exp, */
+    NULL, /* dsa_mod_exp, */
+    NULL, /* dsa_bn_mod_exp, */
     dsa_init,
     dsa_finish,
     DSA_FLAG_FIPS_METHOD,
@@ -74,8 +74,8 @@ const DSA_METHOD *DSA_OpenSSL(void)
 }
 
 DSA_SIG *ossl_dsa_do_sign_int(const unsigned char *dgst, int dlen, DSA *dsa,
-                              unsigned int nonce_type, const char *digestname,
-                              OSSL_LIB_CTX *libctx, const char *propq)
+    unsigned int nonce_type, const char *digestname,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     BIGNUM *kinv = NULL;
     BIGNUM *m, *blind, *blindm, *tmp;
@@ -114,9 +114,9 @@ DSA_SIG *ossl_dsa_do_sign_int(const unsigned char *dgst, int dlen, DSA *dsa,
     if (tmp == NULL)
         goto err;
 
- redo:
+redo:
     if (!dsa_sign_setup(dsa, ctx, &kinv, &ret->r, dgst, dlen,
-                        nonce_type, digestname, libctx, propq))
+            nonce_type, digestname, libctx, propq))
         goto err;
 
     if (dlen > BN_num_bytes(dsa->params.q))
@@ -145,7 +145,7 @@ DSA_SIG *ossl_dsa_do_sign_int(const unsigned char *dgst, int dlen, DSA *dsa,
      */
     do {
         if (!BN_priv_rand_ex(blind, BN_num_bits(dsa->params.q) - 1,
-                             BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx))
+                BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx))
             goto err;
     } while (BN_is_zero(blind));
     BN_set_flags(blind, BN_FLG_CONSTTIME);
@@ -190,7 +190,7 @@ DSA_SIG *ossl_dsa_do_sign_int(const unsigned char *dgst, int dlen, DSA *dsa,
         goto redo;
     }
     rv = 1;
- err:
+err:
     if (rv == 0) {
         ERR_raise(ERR_LIB_DSA, reason);
         DSA_SIG_free(ret);
@@ -204,21 +204,21 @@ DSA_SIG *ossl_dsa_do_sign_int(const unsigned char *dgst, int dlen, DSA *dsa,
 static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
 {
     return ossl_dsa_do_sign_int(dgst, dlen, dsa,
-                                0, NULL, NULL, NULL);
+        0, NULL, NULL, NULL);
 }
 
 static int dsa_sign_setup_no_digest(DSA *dsa, BN_CTX *ctx_in,
-                                    BIGNUM **kinvp, BIGNUM **rp)
+    BIGNUM **kinvp, BIGNUM **rp)
 {
     return dsa_sign_setup(dsa, ctx_in, kinvp, rp, NULL, 0,
-                          0, NULL, NULL, NULL);
+        0, NULL, NULL, NULL);
 }
 
 static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
-                          BIGNUM **kinvp, BIGNUM **rp,
-                          const unsigned char *dgst, int dlen,
-                          unsigned int nonce_type, const char *digestname,
-                          OSSL_LIB_CTX *libctx, const char *propq)
+    BIGNUM **kinvp, BIGNUM **rp,
+    const unsigned char *dgst, int dlen,
+    unsigned int nonce_type, const char *digestname,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     BN_CTX *ctx = NULL;
     BIGNUM *k, *kinv = NULL, *r = *rp;
@@ -271,10 +271,10 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
             if (nonce_type == 1) {
 #ifndef FIPS_MODULE
                 if (!ossl_gen_deterministic_nonce_rfc6979(k, dsa->params.q,
-                                                          dsa->priv_key,
-                                                          dgst, dlen,
-                                                          digestname,
-                                                          libctx, propq))
+                        dsa->priv_key,
+                        dgst, dlen,
+                        digestname,
+                        libctx, propq))
 #endif
                     goto err;
             } else {
@@ -283,8 +283,8 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
                  * This protects the private key from a weak PRNG.
                  */
                 if (!ossl_bn_gen_dsa_nonce_fixed_top(k, dsa->params.q,
-                                                     dsa->priv_key, dgst,
-                                                     dlen, ctx))
+                        dsa->priv_key, dgst,
+                        dlen, ctx))
                     goto err;
             }
         } else if (!ossl_bn_priv_rand_range_fixed_top(k, dsa->params.q, 0, ctx))
@@ -296,7 +296,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
 
     if (dsa->flags & DSA_FLAG_CACHE_MONT_P) {
         if (!BN_MONT_CTX_set_locked(&dsa->method_mont_p,
-                                    dsa->lock, dsa->params.p, ctx))
+                dsa->lock, dsa->params.p, ctx))
             goto err;
     }
 
@@ -322,13 +322,13 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
     BN_consttime_swap(BN_is_bit_set(l, q_bits), k, l, q_words + 2);
 
     if ((dsa)->meth->bn_mod_exp != NULL) {
-            if (!dsa->meth->bn_mod_exp(dsa, r, dsa->params.g, k, dsa->params.p,
-                                       ctx, dsa->method_mont_p))
-                goto err;
+        if (!dsa->meth->bn_mod_exp(dsa, r, dsa->params.g, k, dsa->params.p,
+                ctx, dsa->method_mont_p))
+            goto err;
     } else {
-            if (!BN_mod_exp_mont(r, dsa->params.g, k, dsa->params.p, ctx,
-                                 dsa->method_mont_p))
-                goto err;
+        if (!BN_mod_exp_mont(r, dsa->params.g, k, dsa->params.p, ctx,
+                dsa->method_mont_p))
+            goto err;
     }
 
     if (!BN_mod(r, r, dsa->params.q, ctx))
@@ -342,7 +342,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
     *kinvp = kinv;
     kinv = NULL;
     ret = 1;
- err:
+err:
     if (!ret)
         ERR_raise(ERR_LIB_DSA, ERR_R_BN_LIB);
     if (ctx != ctx_in)
@@ -353,7 +353,7 @@ static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in,
 }
 
 static int dsa_do_verify(const unsigned char *dgst, int dgst_len,
-                         DSA_SIG *sig, DSA *dsa)
+    DSA_SIG *sig, DSA *dsa)
 {
     BN_CTX *ctx;
     BIGNUM *u1, *u2, *t1;
@@ -388,13 +388,11 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len,
 
     DSA_SIG_get0(sig, &r, &s);
 
-    if (BN_is_zero(r) || BN_is_negative(r) ||
-        BN_ucmp(r, dsa->params.q) >= 0) {
+    if (BN_is_zero(r) || BN_is_negative(r) || BN_ucmp(r, dsa->params.q) >= 0) {
         ret = 0;
         goto err;
     }
-    if (BN_is_zero(s) || BN_is_negative(s) ||
-        BN_ucmp(s, dsa->params.q) >= 0) {
+    if (BN_is_zero(s) || BN_is_negative(s) || BN_ucmp(s, dsa->params.q) >= 0) {
         ret = 0;
         goto err;
     }
@@ -426,18 +424,18 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len,
 
     if (dsa->flags & DSA_FLAG_CACHE_MONT_P) {
         mont = BN_MONT_CTX_set_locked(&dsa->method_mont_p,
-                                      dsa->lock, dsa->params.p, ctx);
+            dsa->lock, dsa->params.p, ctx);
         if (!mont)
             goto err;
     }
 
     if (dsa->meth->dsa_mod_exp != NULL) {
         if (!dsa->meth->dsa_mod_exp(dsa, t1, dsa->params.g, u1, dsa->pub_key, u2,
-                                    dsa->params.p, ctx, mont))
+                dsa->params.p, ctx, mont))
             goto err;
     } else {
         if (!BN_mod_exp2_mont(t1, dsa->params.g, u1, dsa->pub_key, u2,
-                              dsa->params.p, ctx, mont))
+                dsa->params.p, ctx, mont))
             goto err;
     }
 
@@ -450,7 +448,7 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len,
      */
     ret = (BN_ucmp(u1, r) == 0);
 
- err:
+err:
     if (ret < 0)
         ERR_raise(ERR_LIB_DSA, ERR_R_BN_LIB);
     BN_CTX_free(ctx);
@@ -481,7 +479,7 @@ static int dsa_finish(DSA *dsa)
  * BIGNUM is returned which the caller must free.
  */
 static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q,
-                                      BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     BIGNUM *res = NULL;
     BIGNUM *r, *e;
@@ -491,9 +489,9 @@ static BIGNUM *dsa_mod_inverse_fermat(const BIGNUM *k, const BIGNUM *q,
 
     BN_CTX_start(ctx);
     if ((e = BN_CTX_get(ctx)) != NULL
-            && BN_set_word(r, 2)
-            && BN_sub(e, q, r)
-            && BN_mod_exp_mont(r, k, e, q, ctx, NULL))
+        && BN_set_word(r, 2)
+        && BN_sub(e, q, r)
+        && BN_mod_exp_mont(r, k, e, q, ctx, NULL))
         res = r;
     else
         BN_free(r);
diff --git a/crypto/dsa/dsa_pmeth.c b/crypto/dsa/dsa_pmeth.c
index 00ac18fdffea8..e41e634944b22 100644
--- a/crypto/dsa/dsa_pmeth.c
+++ b/crypto/dsa/dsa_pmeth.c
@@ -26,13 +26,13 @@
 
 typedef struct {
     /* Parameter gen parameters */
-    int nbits;                  /* size of p in bits (default: 2048) */
-    int qbits;                  /* size of q in bits (default: 224) */
-    const EVP_MD *pmd;          /* MD for parameter generation */
+    int nbits; /* size of p in bits (default: 2048) */
+    int qbits; /* size of q in bits (default: 224) */
+    const EVP_MD *pmd; /* MD for parameter generation */
     /* Keygen callback info */
     int gentmp[2];
     /* message digest */
-    const EVP_MD *md;           /* MD for the signature */
+    const EVP_MD *md; /* MD for the signature */
 } DSA_PKEY_CTX;
 
 static int pkey_dsa_init(EVP_PKEY_CTX *ctx)
@@ -75,8 +75,8 @@ static void pkey_dsa_cleanup(EVP_PKEY_CTX *ctx)
 }
 
 static int pkey_dsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
-                         size_t *siglen, const unsigned char *tbs,
-                         size_t tbslen)
+    size_t *siglen, const unsigned char *tbs,
+    size_t tbslen)
 {
     int ret, md_size;
     unsigned int sltmp;
@@ -105,8 +105,8 @@ static int pkey_dsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
 }
 
 static int pkey_dsa_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 ret, md_size;
     DSA_PKEY_CTX *dctx = ctx->data;
@@ -148,9 +148,7 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
         return 1;
 
     case EVP_PKEY_CTRL_DSA_PARAMGEN_MD:
-        if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256) {
+        if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256) {
             ERR_raise(ERR_LIB_DSA, DSA_R_INVALID_DIGEST_TYPE);
             return 0;
         }
@@ -158,17 +156,7 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
         return 1;
 
     case EVP_PKEY_CTRL_MD:
-        if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_dsa &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_dsaWithSHA &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha384 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha512 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_224 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_256 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_384 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_512) {
+        if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 && EVP_MD_get_type((const EVP_MD *)p2) != NID_dsa && EVP_MD_get_type((const EVP_MD *)p2) != NID_dsaWithSHA && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha384 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha512 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_256 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_384 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_512) {
             ERR_raise(ERR_LIB_DSA, DSA_R_INVALID_DIGEST_TYPE);
             return 0;
         }
@@ -189,12 +177,11 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
         return -2;
     default:
         return -2;
-
     }
 }
 
 static int pkey_dsa_ctrl_str(EVP_PKEY_CTX *ctx,
-                             const char *type, const char *value)
+    const char *type, const char *value)
 {
     if (strcmp(type, "dsa_paramgen_bits") == 0) {
         int nbits;
@@ -240,8 +227,8 @@ static int pkey_dsa_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
         ossl_ffc_set_digest(&dsa->params, EVP_MD_get0_name(dctx->md), NULL);
 
     ret = ossl_ffc_params_FIPS186_4_generate(NULL, &dsa->params,
-                                             FFC_PARAM_TYPE_DSA, dctx->nbits,
-                                             dctx->qbits, &res, pcb);
+        FFC_PARAM_TYPE_DSA, dctx->nbits,
+        dctx->qbits, &res, pcb);
     BN_GENCB_free(pcb);
     if (ret > 0)
         EVP_PKEY_assign_DSA(pkey, dsa);
diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c
index aab7953c0d9b5..e5abd3632ea3c 100644
--- a/crypto/dsa/dsa_sign.c
+++ b/crypto/dsa/dsa_sign.c
@@ -86,7 +86,7 @@ int i2d_DSA_SIG(const DSA_SIG *sig, unsigned char **ppout)
             return -1;
     } else if (*ppout == NULL) {
         if ((buf = BUF_MEM_new()) == NULL
-                || !WPACKET_init_len(&pkt, buf, 0)) {
+            || !WPACKET_init_len(&pkt, buf, 0)) {
             BUF_MEM_free(buf);
             return -1;
         }
@@ -96,8 +96,8 @@ int i2d_DSA_SIG(const DSA_SIG *sig, unsigned char **ppout)
     }
 
     if (!ossl_encode_der_dsa_sig(&pkt, sig->r, sig->s)
-            || !WPACKET_get_total_written(&pkt, &encoded_len)
-            || !WPACKET_finish(&pkt)) {
+        || !WPACKET_get_total_written(&pkt, &encoded_len)
+        || !WPACKET_finish(&pkt)) {
         BUF_MEM_free(buf);
         WPACKET_cleanup(&pkt);
         return -1;
@@ -151,9 +151,9 @@ int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s)
 }
 
 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)
 {
     DSA_SIG *s;
 
@@ -167,7 +167,7 @@ int ossl_dsa_sign_int(int type, const unsigned char *dgst, int dlen,
         s = DSA_do_sign(dgst, dlen, dsa);
     else
         s = ossl_dsa_do_sign_int(dgst, dlen, dsa,
-                                 nonce_type, digestname, libctx, propq);
+            nonce_type, digestname, libctx, propq);
     if (s == NULL) {
         *siglen = 0;
         return 0;
@@ -178,10 +178,10 @@ int ossl_dsa_sign_int(int type, const unsigned char *dgst, int dlen,
 }
 
 int DSA_sign(int type, const unsigned char *dgst, int dlen,
-             unsigned char *sig, unsigned int *siglen, DSA *dsa)
+    unsigned char *sig, unsigned int *siglen, DSA *dsa)
 {
     return ossl_dsa_sign_int(type, dgst, dlen, sig, siglen, dsa,
-                             0, NULL, NULL, NULL);
+        0, NULL, NULL, NULL);
 }
 
 /* data has already been hashed (probably with SHA or SHA-1). */
@@ -192,7 +192,7 @@ int DSA_sign(int type, const unsigned char *dgst, int dlen,
  *     -1: error
  */
 int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
-               const unsigned char *sigbuf, int siglen, DSA *dsa)
+    const unsigned char *sigbuf, int siglen, DSA *dsa)
 {
     DSA_SIG *s;
     const unsigned char *p = sigbuf;
@@ -210,7 +210,7 @@ int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
     if (derlen != siglen || memcmp(sigbuf, der, derlen))
         goto err;
     ret = DSA_do_verify(dgst, dgst_len, s, dsa);
- err:
+err:
     OPENSSL_clear_free(der, derlen);
     DSA_SIG_free(s);
     return ret;
diff --git a/crypto/dsa/dsa_vrf.c b/crypto/dsa/dsa_vrf.c
index b0a9d965d9592..0fca0b24d429d 100644
--- a/crypto/dsa/dsa_vrf.c
+++ b/crypto/dsa/dsa_vrf.c
@@ -17,7 +17,7 @@
 #include "dsa_local.h"
 
 int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
-                  DSA *dsa)
+    DSA *dsa)
 {
     return dsa->meth->dsa_do_verify(dgst, dgst_len, sig, dsa);
 }
diff --git a/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c
index 7bfb02093b9ed..ff51764deafe9 100644
--- a/crypto/dso/dso_dl.c
+++ b/crypto/dso/dso_dl.c
@@ -11,17 +11,17 @@
 
 #ifdef DSO_DL
 
-# include <dl.h>
+#include <dl.h>
 
 /* Part of the hack in "dl_load" ... */
-# define DSO_MAX_TRANSLATED_SIZE 256
+#define DSO_MAX_TRANSLATED_SIZE 256
 
 static int dl_load(DSO *dso);
 static int dl_unload(DSO *dso);
 static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname);
 static char *dl_name_converter(DSO *dso, const char *filename);
 static char *dl_merger(DSO *dso, const char *filespec1,
-                       const char *filespec2);
+    const char *filespec2);
 static int dl_pathbyaddr(void *addr, char *path, int sz);
 static void *dl_globallookup(const char *name);
 
@@ -30,11 +30,11 @@ static DSO_METHOD dso_meth_dl = {
     dl_load,
     dl_unload,
     dl_bind_func,
-    NULL,                       /* ctrl */
+    NULL, /* ctrl */
     dl_name_converter,
     dl_merger,
-    NULL,                       /* init */
-    NULL,                       /* finish */
+    NULL, /* init */
+    NULL, /* finish */
     dl_pathbyaddr,
     dl_globallookup
 };
@@ -64,18 +64,16 @@ static int dl_load(DSO *dso)
         ERR_raise(ERR_LIB_DSO, DSO_R_NO_FILENAME);
         goto err;
     }
-    ptr = shl_load(filename, BIND_IMMEDIATE |
-                   (dso->flags & DSO_FLAG_NO_NAME_TRANSLATION ? 0 :
-                    DYNAMIC_PATH), 0L);
+    ptr = shl_load(filename, BIND_IMMEDIATE | (dso->flags & DSO_FLAG_NO_NAME_TRANSLATION ? 0 : DYNAMIC_PATH), 0L);
     if (ptr == NULL) {
         char errbuf[160];
 
         if (openssl_strerror_r(errno, errbuf, sizeof(errbuf)))
             ERR_raise_data(ERR_LIB_DSO, DSO_R_LOAD_FAILED,
-                           "filename(%s): %s", filename, errbuf);
+                "filename(%s): %s", filename, errbuf);
         else
             ERR_raise_data(ERR_LIB_DSO, DSO_R_LOAD_FAILED,
-                           "filename(%s): errno %d", filename, errno);
+                "filename(%s): errno %d", filename, errno);
         goto err;
     }
     if (!sk_push(dso->meth_data, (char *)ptr)) {
@@ -88,7 +86,7 @@ static int dl_load(DSO *dso)
      */
     dso->loaded_filename = filename;
     return 1;
- err:
+err:
     /* Cleanup! */
     OPENSSL_free(filename);
     if (ptr != NULL)
@@ -106,7 +104,7 @@ static int dl_unload(DSO *dso)
     if (sk_num(dso->meth_data) < 1)
         return 1;
     /* Is this statement legal? */
-    ptr = (shl_t) sk_pop(dso->meth_data);
+    ptr = (shl_t)sk_pop(dso->meth_data);
     if (ptr == NULL) {
         ERR_raise(ERR_LIB_DSO, DSO_R_NULL_HANDLE);
         /*
@@ -132,7 +130,7 @@ static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname)
         ERR_raise(ERR_LIB_DSO, DSO_R_STACK_ERROR);
         return NULL;
     }
-    ptr = (shl_t) sk_value(dso->meth_data, sk_num(dso->meth_data) - 1);
+    ptr = (shl_t)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1);
     if (ptr == NULL) {
         ERR_raise(ERR_LIB_DSO, DSO_R_NULL_HANDLE);
         return NULL;
@@ -142,10 +140,10 @@ static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname)
 
         if (openssl_strerror_r(errno, errbuf, sizeof(errbuf)))
             ERR_raise_data(ERR_LIB_DSO, DSO_R_SYM_FAILURE,
-                           "symname(%s): %s", symname, errbuf);
+                "symname(%s): %s", symname, errbuf);
         else
             ERR_raise_data(ERR_LIB_DSO, DSO_R_SYM_FAILURE,
-                           "symname(%s): errno %d", symname, errno);
+                "symname(%s): errno %d", symname, errno);
         return NULL;
     }
     return (DSO_FUNC_TYPE)sym;
@@ -176,13 +174,13 @@ static char *dl_merger(DSO *dso, const char *filespec1, const char *filespec2)
         if (merged == NULL)
             return NULL;
     } else
-        /*
-         * This part isn't as trivial as it looks.  It assumes that the
-         * second file specification really is a directory, and makes no
-         * checks whatsoever.  Therefore, the result becomes the
-         * concatenation of filespec2 followed by a slash followed by
-         * filespec1.
-         */
+    /*
+     * This part isn't as trivial as it looks.  It assumes that the
+     * second file specification really is a directory, and makes no
+     * checks whatsoever.  Therefore, the result becomes the
+     * concatenation of filespec2 followed by a slash followed by
+     * filespec1.
+     */
     {
         int spec2len, len;
 
@@ -222,7 +220,7 @@ static char *dl_name_converter(DSO *dso, const char *filename)
         /* We will convert this to "%s.s?" or "lib%s.s?" */
         rsize += strlen(DSO_EXTENSION); /* The length of ".s?" */
         if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
-            rsize += 3;         /* The length of "lib" */
+            rsize += 3; /* The length of "lib" */
     }
     translated = OPENSSL_malloc(rsize);
     if (translated == NULL) {
@@ -231,8 +229,10 @@ static char *dl_name_converter(DSO *dso, const char *filename)
     }
     if (transform)
         BIO_snprintf(translated, rsize,
-                     (DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0
-                     ? "lib%s%s" : "%s%s", filename, DSO_EXTENSION);
+            (DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0
+                ? "lib%s%s"
+                : "%s%s",
+            filename, DSO_EXTENSION);
     else
         BIO_snprintf(translated, rsize, "%s", filename);
     return translated;
@@ -245,7 +245,7 @@ static int dl_pathbyaddr(void *addr, char *path, int sz)
 
     if (addr == NULL) {
         union {
-            int (*f) (void *, char *, int);
+            int (*f)(void *, char *, int);
             void *p;
         } t = {
             dl_pathbyaddr
@@ -254,8 +254,7 @@ static int dl_pathbyaddr(void *addr, char *path, int sz)
     }
 
     for (i = -1; shl_get_r(i, &inf) == 0; i++) {
-        if (((size_t)addr >= inf.tstart && (size_t)addr < inf.tend) ||
-            ((size_t)addr >= inf.dstart && (size_t)addr < inf.dend)) {
+        if (((size_t)addr >= inf.tstart && (size_t)addr < inf.tend) || ((size_t)addr >= inf.dstart && (size_t)addr < inf.dend)) {
             len = (int)strlen(inf.filename);
             if (sz <= 0)
                 return len + 1;
@@ -277,4 +276,4 @@ static void *dl_globallookup(const char *name)
 
     return shl_findsym(&h, name, TYPE_UNDEFINED, &ret) ? NULL : ret;
 }
-#endif                          /* DSO_DL */
+#endif /* DSO_DL */
diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index b5a7b7be2cbc6..26493009743ed 100644
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -13,7 +13,7 @@
  * too late, because those headers are protected from re- inclusion.
  */
 #ifndef _GNU_SOURCE
-# define _GNU_SOURCE            /* make sure dladdr is declared */
+#define _GNU_SOURCE /* make sure dladdr is declared */
 #endif
 
 #include "dso_local.h"
@@ -21,29 +21,26 @@
 
 #ifdef DSO_DLFCN
 
-# ifdef HAVE_DLFCN_H
-#  ifdef __osf__
-#   define __EXTENSIONS__
-#  endif
-#  include <dlfcn.h>
-#  define HAVE_DLINFO 1
-#  if defined(__SCO_VERSION__) || defined(_SCO_ELF) || \
-     (defined(__osf__) && !defined(RTLD_NEXT))     || \
-     (defined(__OpenBSD__) && !defined(RTLD_SELF)) || \
-     defined(__ANDROID__) || defined(__TANDEM)
-#   undef HAVE_DLINFO
-#  endif
-# endif
+#ifdef HAVE_DLFCN_H
+#ifdef __osf__
+#define __EXTENSIONS__
+#endif
+#include <dlfcn.h>
+#define HAVE_DLINFO 1
+#if defined(__SCO_VERSION__) || defined(_SCO_ELF) || (defined(__osf__) && !defined(RTLD_NEXT)) || (defined(__OpenBSD__) && !defined(RTLD_SELF)) || defined(__ANDROID__) || defined(__TANDEM)
+#undef HAVE_DLINFO
+#endif
+#endif
 
 /* Part of the hack in "dlfcn_load" ... */
-# define DSO_MAX_TRANSLATED_SIZE 256
+#define DSO_MAX_TRANSLATED_SIZE 256
 
 static int dlfcn_load(DSO *dso);
 static int dlfcn_unload(DSO *dso);
 static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname);
 static char *dlfcn_name_converter(DSO *dso, const char *filename);
 static char *dlfcn_merger(DSO *dso, const char *filespec1,
-                          const char *filespec2);
+    const char *filespec2);
 static int dlfcn_pathbyaddr(void *addr, char *path, int sz);
 static void *dlfcn_globallookup(const char *name);
 
@@ -52,11 +49,11 @@ static DSO_METHOD dso_meth_dlfcn = {
     dlfcn_load,
     dlfcn_unload,
     dlfcn_bind_func,
-    NULL,                       /* ctrl */
+    NULL, /* ctrl */
     dlfcn_name_converter,
     dlfcn_merger,
-    NULL,                       /* init */
-    NULL,                       /* finish */
+    NULL, /* init */
+    NULL, /* finish */
     dlfcn_pathbyaddr,
     dlfcn_globallookup
 };
@@ -74,19 +71,19 @@ DSO_METHOD *DSO_METHOD_openssl(void)
  * relatively easily to deal with cases as we find them. Initially this is to
  * cope with OpenBSD.
  */
-# if defined(__OpenBSD__) || defined(__NetBSD__)
-#  ifdef DL_LAZY
-#   define DLOPEN_FLAG DL_LAZY
-#  else
-#   ifdef RTLD_NOW
-#    define DLOPEN_FLAG RTLD_NOW
-#   else
-#    define DLOPEN_FLAG 0
-#   endif
-#  endif
-# else
-#  define DLOPEN_FLAG RTLD_NOW  /* Hope this works everywhere else */
-# endif
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+#ifdef DL_LAZY
+#define DLOPEN_FLAG DL_LAZY
+#else
+#ifdef RTLD_NOW
+#define DLOPEN_FLAG RTLD_NOW
+#else
+#define DLOPEN_FLAG 0
+#endif
+#endif
+#else
+#define DLOPEN_FLAG RTLD_NOW /* Hope this works everywhere else */
+#endif
 
 /*
  * For this DSO_METHOD, our meth_data STACK will contain; (i) the handle
@@ -105,18 +102,18 @@ static int dlfcn_load(DSO *dso)
         ERR_raise(ERR_LIB_DSO, DSO_R_NO_FILENAME);
         goto err;
     }
-# ifdef RTLD_GLOBAL
+#ifdef RTLD_GLOBAL
     if (dso->flags & DSO_FLAG_GLOBAL_SYMBOLS)
         flags |= RTLD_GLOBAL;
-# endif
-# ifdef _AIX
+#endif
+#ifdef _AIX
     if (filename[strlen(filename) - 1] == ')')
         flags |= RTLD_MEMBER;
-# endif
+#endif
     ptr = dlopen(filename, flags);
     if (ptr == NULL) {
         ERR_raise_data(ERR_LIB_DSO, DSO_R_LOAD_FAILED,
-                       "filename(%s): %s", filename, dlerror());
+            "filename(%s): %s", filename, dlerror());
         goto err;
     }
     /*
@@ -131,7 +128,7 @@ static int dlfcn_load(DSO *dso)
     /* Success */
     dso->loaded_filename = filename;
     return 1;
- err:
+err:
     /* Cleanup! */
     OPENSSL_free(filename);
     if (ptr != NULL)
@@ -186,14 +183,14 @@ static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname)
     u.dlret = dlsym(ptr, symname);
     if (u.dlret == NULL) {
         ERR_raise_data(ERR_LIB_DSO, DSO_R_SYM_FAILURE,
-                       "symname(%s): %s", symname, dlerror());
+            "symname(%s): %s", symname, dlerror());
         return NULL;
     }
     return u.sym;
 }
 
 static char *dlfcn_merger(DSO *dso, const char *filespec1,
-                          const char *filespec2)
+    const char *filespec2)
 {
     char *merged;
 
@@ -254,9 +251,9 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename)
     transform = (strchr(filename, '/') == NULL);
     if (transform) {
         /* We will convert this to "%s.so" or "lib%s.so" etc */
-        rsize += strlen(DSO_EXTENSION);    /* The length of ".so" */
+        rsize += strlen(DSO_EXTENSION); /* The length of ".so" */
         if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
-            rsize += 3;         /* The length of "lib" */
+            rsize += 3; /* The length of "lib" */
     }
     translated = OPENSSL_malloc(rsize);
     if (translated == NULL) {
@@ -274,7 +271,7 @@ static char *dlfcn_name_converter(DSO *dso, const char *filename)
     return translated;
 }
 
-# ifdef __sgi
+#ifdef __sgi
 /*-
 This is a quote from IRIX manual for dladdr(3c):
 
@@ -288,9 +285,9 @@ This is a quote from IRIX manual for dladdr(3c):
      intention to change this interface, so on a practical level, the code
      below is safe to use on IRIX.
 */
-#  include <rld_interface.h>
-#  ifndef _RLD_INTERFACE_DLFCN_H_DLADDR
-#   define _RLD_INTERFACE_DLFCN_H_DLADDR
+#include <rld_interface.h>
+#ifndef _RLD_INTERFACE_DLFCN_H_DLADDR
+#define _RLD_INTERFACE_DLFCN_H_DLADDR
 typedef struct Dl_info {
     const char *dli_fname;
     void *dli_fbase;
@@ -300,10 +297,10 @@ typedef struct Dl_info {
     int dli_reserved1;
     long dli_reserved[4];
 } Dl_info;
-#  else
+#else
 typedef struct Dl_info Dl_info;
-#  endif
-#  define _RLD_DLADDR             14
+#endif
+#define _RLD_DLADDR 14
 
 static int dladdr(void *address, Dl_info *dl)
 {
@@ -311,18 +308,18 @@ static int dladdr(void *address, Dl_info *dl)
     v = _rld_new_interface(_RLD_DLADDR, address, dl);
     return (int)v;
 }
-# endif                         /* __sgi */
+#endif /* __sgi */
 
-# ifdef _AIX
+#ifdef _AIX
 /*-
  * See IBM's AIX Version 7.2, Technical Reference:
  *  Base Operating System and Extensions, Volume 1 and 2
  *  https://www.ibm.com/support/knowledgecenter/ssw_aix_72/com.ibm.aix.base/technicalreferences.htm
  */
-#  include <sys/ldr.h>
-#  include <errno.h>
+#include <sys/ldr.h>
+#include <errno.h>
 /* ~ 64 * (sizeof(struct ld_info) + _XOPEN_PATH_MAX + _XOPEN_NAME_MAX) */
-#  define DLFCN_LDINFO_SIZE 86976
+#define DLFCN_LDINFO_SIZE 86976
 typedef struct Dl_info {
     const char *dli_fname;
 } Dl_info;
@@ -359,11 +356,9 @@ static int dladdr(void *ptr, Dl_info *dl)
     do {
         this_ldi = next_ldi;
         if (((addr >= (uintptr_t)this_ldi->ldinfo_textorg)
-             && (addr < ((uintptr_t)this_ldi->ldinfo_textorg +
-                         this_ldi->ldinfo_textsize)))
+                && (addr < ((uintptr_t)this_ldi->ldinfo_textorg + this_ldi->ldinfo_textsize)))
             || ((addr >= (uintptr_t)this_ldi->ldinfo_dataorg)
-                && (addr < ((uintptr_t)this_ldi->ldinfo_dataorg +
-                            this_ldi->ldinfo_datasize)))) {
+                && (addr < ((uintptr_t)this_ldi->ldinfo_dataorg + this_ldi->ldinfo_datasize)))) {
             char *buffer, *member;
             size_t buffer_sz, member_len;
 
@@ -389,24 +384,23 @@ static int dladdr(void *ptr, Dl_info *dl)
                 errno = ENOMEM;
             }
         } else {
-            next_ldi = (struct ld_info *)((uintptr_t)this_ldi +
-                                          this_ldi->ldinfo_next);
+            next_ldi = (struct ld_info *)((uintptr_t)this_ldi + this_ldi->ldinfo_next);
         }
     } while (this_ldi->ldinfo_next && !found);
     OPENSSL_free((void *)ldinfos);
     return (found && dl->dli_fname != NULL);
 }
-# endif                         /* _AIX */
+#endif /* _AIX */
 
 static int dlfcn_pathbyaddr(void *addr, char *path, int sz)
 {
-# ifdef HAVE_DLINFO
+#ifdef HAVE_DLINFO
     Dl_info dli;
     int len;
 
     if (addr == NULL) {
         union {
-            int (*f) (void *, char *, int);
+            int (*f)(void *, char *, int);
             void *p;
         } t = {
             dlfcn_pathbyaddr
@@ -417,23 +411,23 @@ static int dlfcn_pathbyaddr(void *addr, char *path, int sz)
     if (dladdr(addr, &dli)) {
         len = (int)strlen(dli.dli_fname);
         if (sz <= 0) {
-#  ifdef _AIX
+#ifdef _AIX
             OPENSSL_free((void *)dli.dli_fname);
-#  endif
+#endif
             return len + 1;
         }
         if (len >= sz)
             len = sz - 1;
         memcpy(path, dli.dli_fname, len);
         path[len++] = 0;
-#  ifdef _AIX
+#ifdef _AIX
         OPENSSL_free((void *)dli.dli_fname);
-#  endif
+#endif
         return len;
     }
 
     ERR_add_error_data(2, "dlfcn_pathbyaddr(): ", dlerror());
-# endif
+#endif
     return -1;
 }
 
@@ -448,4 +442,4 @@ static void *dlfcn_globallookup(const char *name)
 
     return ret;
 }
-#endif                          /* DSO_DLFCN */
+#endif /* DSO_DLFCN */
diff --git a/crypto/dso/dso_err.c b/crypto/dso/dso_err.c
index 6934a1b364bc8..ec55b9a30a92c 100644
--- a/crypto/dso/dso_err.c
+++ b/crypto/dso/dso_err.c
@@ -14,34 +14,34 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA DSO_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_CTRL_FAILED), "control command failed"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_DSO_ALREADY_LOADED), "dso already loaded"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_EMPTY_FILE_STRUCTURE),
-    "empty file structure"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_FAILURE), "failure"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_FILENAME_TOO_BIG), "filename too big"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_FINISH_FAILED),
-    "cleanup method function failed"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_INCORRECT_FILE_SYNTAX),
-    "incorrect file syntax"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_LOAD_FAILED),
-    "could not load the shared library"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_NAME_TRANSLATION_FAILED),
-    "name translation failed"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_NO_FILENAME), "no filename"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_NULL_HANDLE),
-    "a null shared library handle was used"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_SET_FILENAME_FAILED),
-    "set filename failed"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_STACK_ERROR),
-    "the meth_data stack is corrupt"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_SYM_FAILURE),
-    "could not bind to the requested symbol name"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_UNLOAD_FAILED),
-    "could not unload the shared library"},
-    {ERR_PACK(ERR_LIB_DSO, 0, DSO_R_UNSUPPORTED),
-    "functionality not supported"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_CTRL_FAILED), "control command failed" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_DSO_ALREADY_LOADED), "dso already loaded" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_EMPTY_FILE_STRUCTURE),
+        "empty file structure" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_FAILURE), "failure" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_FILENAME_TOO_BIG), "filename too big" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_FINISH_FAILED),
+        "cleanup method function failed" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_INCORRECT_FILE_SYNTAX),
+        "incorrect file syntax" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_LOAD_FAILED),
+        "could not load the shared library" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_NAME_TRANSLATION_FAILED),
+        "name translation failed" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_NO_FILENAME), "no filename" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_NULL_HANDLE),
+        "a null shared library handle was used" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_SET_FILENAME_FAILED),
+        "set filename failed" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_STACK_ERROR),
+        "the meth_data stack is corrupt" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_SYM_FAILURE),
+        "could not bind to the requested symbol name" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_UNLOAD_FAILED),
+        "could not unload the shared library" },
+    { ERR_PACK(ERR_LIB_DSO, 0, DSO_R_UNSUPPORTED),
+        "functionality not supported" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c
index 65579cb8b3607..6f51e4d35a0d1 100644
--- a/crypto/dso/dso_lib.c
+++ b/crypto/dso/dso_lib.c
@@ -149,7 +149,7 @@ DSO *DSO_load(DSO *dso, const char *filename, DSO_METHOD *meth, int flags)
     }
     /* Load succeeded */
     return ret;
- err:
+err:
     if (allocated)
         DSO_free(ret);
     return NULL;
@@ -296,7 +296,7 @@ int DSO_pathbyaddr(void *addr, char *path, int sz)
         ERR_raise(ERR_LIB_DSO, DSO_R_UNSUPPORTED);
         return -1;
     }
-    return (*meth->pathbyaddr) (addr, path, sz);
+    return (*meth->pathbyaddr)(addr, path, sz);
 }
 
 DSO *DSO_dsobyaddr(void *addr, int flags)
@@ -310,7 +310,7 @@ DSO *DSO_dsobyaddr(void *addr, int flags)
 
     filename = OPENSSL_malloc(len);
     if (filename != NULL
-            && DSO_pathbyaddr(addr, filename, len) == len)
+        && DSO_pathbyaddr(addr, filename, len) == len)
         ret = DSO_load(NULL, filename, NULL, flags);
 
     OPENSSL_free(filename);
@@ -325,5 +325,5 @@ void *DSO_global_lookup(const char *name)
         ERR_raise(ERR_LIB_DSO, DSO_R_UNSUPPORTED);
         return NULL;
     }
-    return (*meth->globallookup) (name);
+    return (*meth->globallookup)(name);
 }
diff --git a/crypto/dso/dso_local.h b/crypto/dso/dso_local.h
index d7af0b064e504..f3ec80210118c 100644
--- a/crypto/dso/dso_local.h
+++ b/crypto/dso/dso_local.h
@@ -70,9 +70,9 @@ struct dso_meth_st {
      * successful load populates the loaded_filename field, and likewise a
      * successful unload OPENSSL_frees and NULLs it out.
      */
-    int (*dso_load) (DSO *dso);
+    int (*dso_load)(DSO *dso);
     /* Unloads a shared library */
-    int (*dso_unload) (DSO *dso);
+    int (*dso_unload)(DSO *dso);
     /*
      * Binds a function - assumes a return type of DSO_FUNC_TYPE. This should
      * be cast to the real function prototype by the caller. Platforms that
@@ -80,12 +80,12 @@ struct dso_meth_st {
      * is possible within ANSI C) are highly unlikely to have shared
      * libraries at all, let alone a DSO_METHOD implemented for them.
      */
-    DSO_FUNC_TYPE (*dso_bind_func) (DSO *dso, const char *symname);
+    DSO_FUNC_TYPE (*dso_bind_func)(DSO *dso, const char *symname);
     /*
      * The generic (yuck) "ctrl()" function. NB: Negative return values
      * (rather than zero) indicate errors.
      */
-    long (*dso_ctrl) (DSO *dso, int cmd, long larg, void *parg);
+    long (*dso_ctrl)(DSO *dso, int cmd, long larg, void *parg);
     /*
      * The default DSO_METHOD-specific function for converting filenames to a
      * canonical native form.
@@ -97,10 +97,10 @@ struct dso_meth_st {
      */
     DSO_MERGER_FUNC dso_merger;
     /* [De]Initialisation handlers. */
-    int (*init) (DSO *dso);
-    int (*finish) (DSO *dso);
+    int (*init)(DSO *dso);
+    int (*finish)(DSO *dso);
     /* Return pathname of the module containing location */
-    int (*pathbyaddr) (void *addr, char *path, int sz);
+    int (*pathbyaddr)(void *addr, char *path, int sz);
     /* Perform global symbol lookup, i.e. among *all* modules */
-    void *(*globallookup) (const char *symname);
+    void *(*globallookup)(const char *symname);
 };
diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c
index 6c84bb198828c..9038ce9b93edd 100644
--- a/crypto/dso/dso_vms.c
+++ b/crypto/dso/dso_vms.c
@@ -11,22 +11,22 @@
 
 #ifdef OPENSSL_SYS_VMS
 
-# pragma message disable DOLLARID
-# include <errno.h>
-# include <rms.h>
-# include <lib$routines.h>
-# include <libfisdef.h>
-# include <stsdef.h>
-# include <descrip.h>
-# include <starlet.h>
-# include "../vms_rms.h"
+#pragma message disable DOLLARID
+#include <errno.h>
+#include <rms.h>
+#include <lib$routines.h>
+#include <libfisdef.h>
+#include <stsdef.h>
+#include <descrip.h>
+#include <starlet.h>
+#include "../vms_rms.h"
 
 /* Some compiler options may mask the declaration of "_malloc32". */
-# define DSO_MALLOC OPENSSL_malloc
-# if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
-#  if __INITIAL_POINTER_SIZE == 64
-#   pragma pointer_size save
-#   pragma pointer_size 32
+#define DSO_MALLOC OPENSSL_malloc
+#if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
+#if __INITIAL_POINTER_SIZE == 64
+#pragma pointer_size save
+#pragma pointer_size 32
 void *_malloc32(__size_t);
 static void *dso_malloc(__size_t num, const char *file, int line)
 {
@@ -38,34 +38,34 @@ static void *dso_malloc(__size_t num, const char *file, int line)
     }
     return ret;
 }
-#   undef DSO_MALLOC
-#   define DSO_MALLOC(num) dso_malloc((num), OPENSSL_FILE, OPENSSL_LINE)
-#   pragma pointer_size restore
-#  endif                        /* __INITIAL_POINTER_SIZE == 64 [else] */
-# endif                         /* __INITIAL_POINTER_SIZE && defined
-                                 * _ANSI_C_SOURCE */
+#undef DSO_MALLOC
+#define DSO_MALLOC(num) dso_malloc((num), OPENSSL_FILE, OPENSSL_LINE)
+#pragma pointer_size restore
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+#endif /* __INITIAL_POINTER_SIZE && defined \
+        * _ANSI_C_SOURCE */
 
-# pragma message disable DOLLARID
+#pragma message disable DOLLARID
 
 static int vms_load(DSO *dso);
 static int vms_unload(DSO *dso);
 static DSO_FUNC_TYPE vms_bind_func(DSO *dso, const char *symname);
 static char *vms_name_converter(DSO *dso, const char *filename);
 static char *vms_merger(DSO *dso, const char *filespec1,
-                        const char *filespec2);
+    const char *filespec2);
 
 static DSO_METHOD dso_meth_vms = {
     "OpenSSL 'VMS' shared library method",
     vms_load,
-    NULL,                       /* unload */
+    NULL, /* unload */
     vms_bind_func,
-    NULL,                       /* ctrl */
+    NULL, /* ctrl */
     vms_name_converter,
     vms_merger,
-    NULL,                       /* init */
-    NULL,                       /* finish */
-    NULL,                       /* pathbyaddr */
-    NULL                        /* globallookup */
+    NULL, /* init */
+    NULL, /* finish */
+    NULL, /* pathbyaddr */
+    NULL /* globallookup */
 };
 
 /*
@@ -101,25 +101,25 @@ static int vms_load(DSO *dso)
     char *filename = DSO_convert_filename(dso, NULL);
 
 /* Ensure 32-bit pointer for "p", and appropriate malloc() function. */
-# if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
-#  if __INITIAL_POINTER_SIZE == 64
-#   pragma pointer_size save
-#   pragma pointer_size 32
-#  endif                        /* __INITIAL_POINTER_SIZE == 64 */
-# endif                         /* __INITIAL_POINTER_SIZE && defined
-                                 * _ANSI_C_SOURCE */
+#if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
+#if __INITIAL_POINTER_SIZE == 64
+#pragma pointer_size save
+#pragma pointer_size 32
+#endif /* __INITIAL_POINTER_SIZE == 64 */
+#endif /* __INITIAL_POINTER_SIZE && defined \
+        * _ANSI_C_SOURCE */
 
     DSO_VMS_INTERNAL *p = NULL;
 
-# if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
-#  if __INITIAL_POINTER_SIZE == 64
-#   pragma pointer_size restore
-#  endif                        /* __INITIAL_POINTER_SIZE == 64 */
-# endif                         /* __INITIAL_POINTER_SIZE && defined
-                                 * _ANSI_C_SOURCE */
+#if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
+#if __INITIAL_POINTER_SIZE == 64
+#pragma pointer_size restore
+#endif /* __INITIAL_POINTER_SIZE == 64 */
+#endif /* __INITIAL_POINTER_SIZE && defined \
+        * _ANSI_C_SOURCE */
 
-    const char *sp1, *sp2;      /* Search result */
-    const char *ext = NULL;     /* possible extension to add */
+    const char *sp1, *sp2; /* Search result */
+    const char *ext = NULL; /* possible extension to add */
 
     if (filename == NULL) {
         ERR_raise(ERR_LIB_DSO, DSO_R_NO_FILENAME);
@@ -158,7 +158,7 @@ static int vms_load(DSO *dso)
     if (sp1 == NULL)
         sp1 = filename;
     else
-        sp1++;                  /* The byte after the found character */
+        sp1++; /* The byte after the found character */
     /* Now, let's see if there's a type, and save the position in sp2 */
     sp2 = strchr(sp1, '.');
     /*
@@ -222,7 +222,7 @@ static int vms_load(DSO *dso)
     /* Success (for now, we lie.  We actually do not know...) */
     dso->loaded_filename = filename;
     return 1;
- err:
+err:
     /* Cleanup! */
     OPENSSL_free(p);
     OPENSSL_free(filename);
@@ -258,8 +258,8 @@ static int vms_unload(DSO *dso)
  * handler works (it makes this function return
  */
 static int do_find_symbol(DSO_VMS_INTERNAL *ptr,
-                          struct dsc$descriptor_s *symname_dsc, void **sym,
-                          unsigned long flags)
+    struct dsc$descriptor_s *symname_dsc, void **sym,
+    unsigned long flags)
 {
     /*
      * Make sure that signals are caught and returned instead of aborting the
@@ -270,16 +270,16 @@ static int do_find_symbol(DSO_VMS_INTERNAL *ptr,
 
     if (ptr->imagename_dsc.dsc$w_length)
         return lib$find_image_symbol(&ptr->filename_dsc,
-                                     symname_dsc, sym,
-                                     &ptr->imagename_dsc, flags);
+            symname_dsc, sym,
+            &ptr->imagename_dsc, flags);
     else
         return lib$find_image_symbol(&ptr->filename_dsc,
-                                     symname_dsc, sym, 0, flags);
+            symname_dsc, sym, 0, flags);
 }
 
-# ifndef LIB$M_FIS_MIXEDCASE
-#  define LIB$M_FIS_MIXEDCASE (1 << 4);
-# endif
+#ifndef LIB$M_FIS_MIXEDCASE
+#define LIB$M_FIS_MIXEDCASE (1 << 4);
+#endif
 void vms_bind_sym(DSO *dso, const char *symname, void **sym)
 {
     DSO_VMS_INTERNAL *ptr;
@@ -287,16 +287,16 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
     struct dsc$descriptor_s symname_dsc;
 
 /* Arrange 32-bit pointer to (copied) string storage, if needed. */
-# if __INITIAL_POINTER_SIZE == 64
-#  define SYMNAME symname_32p
-#  pragma pointer_size save
-#  pragma pointer_size 32
+#if __INITIAL_POINTER_SIZE == 64
+#define SYMNAME symname_32p
+#pragma pointer_size save
+#pragma pointer_size 32
     char *symname_32p;
-#  pragma pointer_size restore
+#pragma pointer_size restore
     char symname_32[NAMX_MAXRSS + 1];
-# else                          /* __INITIAL_POINTER_SIZE == 64 */
-#  define SYMNAME ((char *) symname)
-# endif                         /* __INITIAL_POINTER_SIZE == 64 [else] */
+#else /* __INITIAL_POINTER_SIZE == 64 */
+#define SYMNAME ((char *)symname)
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
 
     *sym = NULL;
 
@@ -304,11 +304,11 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
         ERR_raise(ERR_LIB_DSO, ERR_R_PASSED_NULL_PARAMETER);
         return;
     }
-# if __INITIAL_POINTER_SIZE == 64
+#if __INITIAL_POINTER_SIZE == 64
     /* Copy the symbol name to storage with a 32-bit pointer. */
     symname_32p = symname_32;
     strcpy(symname_32p, symname);
-# endif                         /* __INITIAL_POINTER_SIZE == 64 [else] */
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
 
     symname_dsc.dsc$w_length = strlen(SYMNAME);
     symname_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
@@ -320,7 +320,7 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
         return;
     }
     ptr = (DSO_VMS_INTERNAL *)sk_void_value(dso->meth_data,
-                                            sk_void_num(dso->meth_data) - 1);
+        sk_void_num(dso->meth_data) - 1);
     if (ptr == NULL) {
         ERR_raise(ERR_LIB_DSO, DSO_R_NULL_HANDLE);
         return;
@@ -352,13 +352,13 @@ void vms_bind_sym(DSO *dso, const char *symname, void **sym)
 
             if (ptr->imagename_dsc.dsc$w_length)
                 ERR_raise_data(ERR_LIB_DSO, DSO_R_SYM_FAILURE,
-                               "Symbol %s in %s (%s): %s",
-                               symname, ptr->filename, ptr->imagename,
-                               errstring);
+                    "Symbol %s in %s (%s): %s",
+                    symname, ptr->filename, ptr->imagename,
+                    errstring);
             else
                 ERR_raise_data(ERR_LIB_DSO, DSO_R_SYM_FAILURE,
-                               "Symbol %s in %s: %s",
-                               symname, ptr->filename, errstring);
+                    "Symbol %s in %s: %s",
+                    symname, ptr->filename, errstring);
         }
         return;
     }
@@ -373,7 +373,7 @@ static DSO_FUNC_TYPE vms_bind_func(DSO *dso, const char *symname)
 }
 
 static char *vms_merger(DSO *dso, const char *filespec1,
-                        const char *filespec2)
+    const char *filespec2)
 {
     int status;
     int filespec1len, filespec2len;
@@ -383,20 +383,20 @@ static char *vms_merger(DSO *dso, const char *filespec1,
     char *merged;
 
 /* Arrange 32-bit pointer to (copied) string storage, if needed. */
-# if __INITIAL_POINTER_SIZE == 64
-#  define FILESPEC1 filespec1_32p;
-#  define FILESPEC2 filespec2_32p;
-#  pragma pointer_size save
-#  pragma pointer_size 32
+#if __INITIAL_POINTER_SIZE == 64
+#define FILESPEC1 filespec1_32p;
+#define FILESPEC2 filespec2_32p;
+#pragma pointer_size save
+#pragma pointer_size 32
     char *filespec1_32p;
     char *filespec2_32p;
-#  pragma pointer_size restore
+#pragma pointer_size restore
     char filespec1_32[NAMX_MAXRSS + 1];
     char filespec2_32[NAMX_MAXRSS + 1];
-# else                          /* __INITIAL_POINTER_SIZE == 64 */
-#  define FILESPEC1 ((char *) filespec1)
-#  define FILESPEC2 ((char *) filespec2)
-# endif                         /* __INITIAL_POINTER_SIZE == 64 [else] */
+#else /* __INITIAL_POINTER_SIZE == 64 */
+#define FILESPEC1 ((char *)filespec1)
+#define FILESPEC2 ((char *)filespec2)
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
 
     if (!filespec1)
         filespec1 = "";
@@ -405,13 +405,13 @@ static char *vms_merger(DSO *dso, const char *filespec1,
     filespec1len = strlen(filespec1);
     filespec2len = strlen(filespec2);
 
-# if __INITIAL_POINTER_SIZE == 64
+#if __INITIAL_POINTER_SIZE == 64
     /* Copy the file names to storage with a 32-bit pointer. */
     filespec1_32p = filespec1_32;
     filespec2_32p = filespec2_32;
     strcpy(filespec1_32p, filespec1);
     strcpy(filespec2_32p, filespec2);
-# endif                         /* __INITIAL_POINTER_SIZE == 64 [else] */
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
 
     fab = cc$rms_fab;
     nam = CC_RMS_NAMX;
@@ -422,7 +422,7 @@ static char *vms_merger(DSO *dso, const char *filespec1,
     FAB_OR_NAML(fab, nam).FAB_OR_NAML_DNS = filespec2len;
     NAMX_DNA_FNA_SET(fab)
 
-        nam.NAMX_ESA = esa;
+    nam.NAMX_ESA = esa;
     nam.NAMX_ESS = NAMX_MAXRSS;
     nam.NAMX_NOP = NAM$M_SYNCHK | NAM$M_PWD;
     SET_NAMX_NO_SHORT_UPCASE(nam);
@@ -449,8 +449,8 @@ static char *vms_merger(DSO *dso, const char *filespec1,
             errstring[length] = '\0';
 
             ERR_raise_data(ERR_LIB_DSO, DSO_R_FAILURE,
-                           "filespec \"%s\", default \"%s\": %s",
-                           filespec1, filespec2, errstring);
+                "filespec \"%s\", default \"%s\": %s",
+                filespec1, filespec2, errstring);
         }
         return NULL;
     }
@@ -498,4 +498,4 @@ static char *vms_name_converter(DSO *dso, const char *filename)
     return translated;
 }
 
-#endif                          /* OPENSSL_SYS_VMS */
+#endif /* OPENSSL_SYS_VMS */
diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 085ddef9695be..c36bd7570646b 100644
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -12,8 +12,8 @@
 
 #if defined(DSO_WIN32)
 
-# ifdef _WIN32_WCE
-#  if _WIN32_WCE < 300
+#ifdef _WIN32_WCE
+#if _WIN32_WCE < 300
 static FARPROC GetProcAddressA(HMODULE hModule, LPCSTR lpProcName)
 {
     WCHAR lpProcNameW[64];
@@ -27,43 +27,43 @@ static FARPROC GetProcAddressA(HMODULE hModule, LPCSTR lpProcName)
 
     return GetProcAddressW(hModule, lpProcNameW);
 }
-#  endif
-#  undef GetProcAddress
-#  define GetProcAddress GetProcAddressA
+#endif
+#undef GetProcAddress
+#define GetProcAddress GetProcAddressA
 
 static HINSTANCE LoadLibraryA(LPCSTR lpLibFileName)
 {
     WCHAR *fnamw;
     size_t len_0 = strlen(lpLibFileName) + 1, i;
 
-#  ifdef _MSC_VER
+#ifdef _MSC_VER
     fnamw = (WCHAR *)_alloca(len_0 * sizeof(WCHAR));
-#  else
+#else
     fnamw = (WCHAR *)alloca(len_0 * sizeof(WCHAR));
-#  endif
+#endif
     if (fnamw == NULL) {
         SetLastError(ERROR_NOT_ENOUGH_MEMORY);
         return NULL;
     }
-#  if defined(_WIN32_WCE) && _WIN32_WCE>=101
+#if defined(_WIN32_WCE) && _WIN32_WCE >= 101
     if (!MultiByteToWideChar(CP_ACP, 0, lpLibFileName, len_0, fnamw, len_0))
-#  endif
+#endif
         for (i = 0; i < len_0; i++)
             fnamw[i] = (WCHAR)lpLibFileName[i];
 
     return LoadLibraryW(fnamw);
 }
-# endif
+#endif
 
 /* Part of the hack in "win32_load" ... */
-# define DSO_MAX_TRANSLATED_SIZE 256
+#define DSO_MAX_TRANSLATED_SIZE 256
 
 static int win32_load(DSO *dso);
 static int win32_unload(DSO *dso);
 static DSO_FUNC_TYPE win32_bind_func(DSO *dso, const char *symname);
 static char *win32_name_converter(DSO *dso, const char *filename);
 static char *win32_merger(DSO *dso, const char *filespec1,
-                          const char *filespec2);
+    const char *filespec2);
 static int win32_pathbyaddr(void *addr, char *path, int sz);
 static void *win32_globallookup(const char *name);
 
@@ -74,12 +74,12 @@ static DSO_METHOD dso_meth_win32 = {
     win32_load,
     win32_unload,
     win32_bind_func,
-    NULL,                       /* ctrl */
+    NULL, /* ctrl */
     win32_name_converter,
     win32_merger,
-    NULL,                       /* init */
-    NULL,                       /* finish */
-    win32_pathbyaddr,           /* pathbyaddr */
+    NULL, /* init */
+    NULL, /* finish */
+    win32_pathbyaddr, /* pathbyaddr */
     win32_globallookup
 };
 
@@ -106,7 +106,7 @@ static int win32_load(DSO *dso)
     h = LoadLibraryA(filename);
     if (h == NULL) {
         ERR_raise_data(ERR_LIB_DSO, DSO_R_LOAD_FAILED,
-                       "filename(%s)", filename);
+            "filename(%s)", filename);
         goto err;
     }
     p = OPENSSL_malloc(sizeof(*p));
@@ -120,7 +120,7 @@ static int win32_load(DSO *dso)
     /* Success */
     dso->loaded_filename = filename;
     return 1;
- err:
+err:
     /* Cleanup ! */
     OPENSSL_free(filename);
     OPENSSL_free(p);
@@ -199,10 +199,12 @@ struct file_st {
 };
 
 static struct file_st *win32_splitter(DSO *dso, const char *filename,
-                                      int assume_last_is_dir)
+    int assume_last_is_dir)
 {
     struct file_st *result = NULL;
-    enum { IN_NODE, IN_DEVICE, IN_FILE } position;
+    enum { IN_NODE,
+        IN_DEVICE,
+        IN_FILE } position;
     const char *start = filename;
     char last;
 
@@ -281,8 +283,7 @@ static struct file_st *win32_splitter(DSO *dso, const char *filename,
             filename++;
             break;
         }
-    }
-    while (last);
+    } while (last);
 
     if (!result->nodelen)
         result->node = NULL;
@@ -309,17 +310,17 @@ static char *win32_joiner(DSO *dso, const struct file_st *file_split)
     if (file_split->node) {
         len += 2 + file_split->nodelen; /* 2 for starting \\ */
         if (file_split->predir || file_split->dir || file_split->file)
-            len++;              /* 1 for ending \ */
+            len++; /* 1 for ending \ */
     } else if (file_split->device) {
         len += file_split->devicelen + 1; /* 1 for ending : */
     }
     len += file_split->predirlen;
     if (file_split->predir && (file_split->dir || file_split->file)) {
-        len++;                  /* 1 for ending \ */
+        len++; /* 1 for ending \ */
     }
     len += file_split->dirlen;
     if (file_split->dir && file_split->file) {
-        len++;                  /* 1 for ending \ */
+        len++; /* 1 for ending \ */
     }
     len += file_split->filelen;
 
@@ -350,8 +351,7 @@ static char *win32_joiner(DSO *dso, const struct file_st *file_split)
     start = file_split->predir;
     while (file_split->predirlen > (start - file_split->predir)) {
         const char *end = openssl_strnchr(start, '/',
-                                          file_split->predirlen - (start -
-                                                                   file_split->predir));
+            file_split->predirlen - (start - file_split->predir));
         if (!end)
             end = start
                 + file_split->predirlen - (start - file_split->predir);
@@ -364,8 +364,7 @@ static char *win32_joiner(DSO *dso, const struct file_st *file_split)
     start = file_split->dir;
     while (file_split->dirlen > (start - file_split->dir)) {
         const char *end = openssl_strnchr(start, '/',
-                                          file_split->dirlen - (start -
-                                                                file_split->dir));
+            file_split->dirlen - (start - file_split->dir));
         if (!end)
             end = start + file_split->dirlen - (start - file_split->dir);
         strncpy(&result[offset], start, end - start);
@@ -381,7 +380,7 @@ static char *win32_joiner(DSO *dso, const struct file_st *file_split)
 }
 
 static char *win32_merger(DSO *dso, const char *filespec1,
-                          const char *filespec2)
+    const char *filespec2)
 {
     char *merged = NULL;
     struct file_st *filespec1_split = NULL;
@@ -423,7 +422,7 @@ static char *win32_merger(DSO *dso, const char *filespec1,
             filespec1_split->dir = filespec2_split->dir;
             filespec1_split->dirlen = filespec2_split->dirlen;
         } else if (filespec1_split->dir[0] != '\\'
-                   && filespec1_split->dir[0] != '/') {
+            && filespec1_split->dir[0] != '/') {
             filespec1_split->predir = filespec2_split->dir;
             filespec1_split->predirlen = filespec2_split->dirlen;
         }
@@ -444,9 +443,7 @@ static char *win32_name_converter(DSO *dso, const char *filename)
     char *translated;
     int len, transform;
 
-    transform = ((strstr(filename, "/") == NULL) &&
-                 (strstr(filename, "\\") == NULL) &&
-                 (strstr(filename, ":") == NULL));
+    transform = ((strstr(filename, "/") == NULL) && (strstr(filename, "\\") == NULL) && (strstr(filename, ":") == NULL));
     /* If transform != 0, then we convert to %s.dll, else just dupe filename */
 
     len = strlen(filename) + 1;
@@ -472,19 +469,19 @@ static const char *openssl_strnchr(const char *string, int c, size_t len)
     return NULL;
 }
 
-# include <tlhelp32.h>
-# ifdef _WIN32_WCE
-#  define DLLNAME "TOOLHELP.DLL"
-# else
-#  ifdef MODULEENTRY32
-#   undef MODULEENTRY32         /* unmask the ASCII version! */
-#  endif
-#  define DLLNAME "KERNEL32.DLL"
-# endif
+#include <tlhelp32.h>
+#ifdef _WIN32_WCE
+#define DLLNAME "TOOLHELP.DLL"
+#else
+#ifdef MODULEENTRY32
+#undef MODULEENTRY32 /* unmask the ASCII version! */
+#endif
+#define DLLNAME "KERNEL32.DLL"
+#endif
 
-typedef HANDLE(WINAPI *CREATETOOLHELP32SNAPSHOT) (DWORD, DWORD);
-typedef BOOL(WINAPI *CLOSETOOLHELP32SNAPSHOT) (HANDLE);
-typedef BOOL(WINAPI *MODULE32) (HANDLE, MODULEENTRY32 *);
+typedef HANDLE(WINAPI *CREATETOOLHELP32SNAPSHOT)(DWORD, DWORD);
+typedef BOOL(WINAPI *CLOSETOOLHELP32SNAPSHOT)(HANDLE);
+typedef BOOL(WINAPI *MODULE32)(HANDLE, MODULEENTRY32 *);
 
 static int win32_pathbyaddr(void *addr, char *path, int sz)
 {
@@ -497,7 +494,7 @@ static int win32_pathbyaddr(void *addr, char *path, int sz)
 
     if (addr == NULL) {
         union {
-            int (*f) (void *, char *, int);
+            int (*f)(void *, char *, int);
             void *p;
         } t = {
             win32_pathbyaddr
@@ -519,20 +516,20 @@ static int win32_pathbyaddr(void *addr, char *path, int sz)
         return -1;
     }
     /* We take the rest for granted... */
-# ifdef _WIN32_WCE
+#ifdef _WIN32_WCE
     close_snap = (CLOSETOOLHELP32SNAPSHOT)
         GetProcAddress(dll, "CloseToolhelp32Snapshot");
-# else
-    close_snap = (CLOSETOOLHELP32SNAPSHOT) CloseHandle;
-# endif
-    module_first = (MODULE32) GetProcAddress(dll, "Module32First");
-    module_next = (MODULE32) GetProcAddress(dll, "Module32Next");
+#else
+    close_snap = (CLOSETOOLHELP32SNAPSHOT)CloseHandle;
+#endif
+    module_first = (MODULE32)GetProcAddress(dll, "Module32First");
+    module_next = (MODULE32)GetProcAddress(dll, "Module32Next");
 
     /*
      * Take a snapshot of current process which includes
      * list of all involved modules.
      */
-    hModuleSnap = (*create_snap) (TH32CS_SNAPMODULE, 0);
+    hModuleSnap = (*create_snap)(TH32CS_SNAPMODULE, 0);
     if (hModuleSnap == INVALID_HANDLE_VALUE) {
         FreeLibrary(dll);
         ERR_raise(ERR_LIB_DSO, DSO_R_UNSUPPORTED);
@@ -541,8 +538,8 @@ static int win32_pathbyaddr(void *addr, char *path, int sz)
 
     me32.dwSize = sizeof(me32);
 
-    if (!(*module_first) (hModuleSnap, &me32)) {
-        (*close_snap) (hModuleSnap);
+    if (!(*module_first)(hModuleSnap, &me32)) {
+        (*close_snap)(hModuleSnap);
         FreeLibrary(dll);
         ERR_raise(ERR_LIB_DSO, DSO_R_FAILURE);
         return -1;
@@ -550,15 +547,14 @@ static int win32_pathbyaddr(void *addr, char *path, int sz)
 
     /* Enumerate the modules to find one which includes me. */
     do {
-        if ((size_t) addr >= (size_t) me32.modBaseAddr &&
-            (size_t) addr < (size_t) (me32.modBaseAddr + me32.modBaseSize)) {
-            (*close_snap) (hModuleSnap);
+        if ((size_t)addr >= (size_t)me32.modBaseAddr && (size_t)addr < (size_t)(me32.modBaseAddr + me32.modBaseSize)) {
+            (*close_snap)(hModuleSnap);
             FreeLibrary(dll);
-# ifdef _WIN32_WCE
-#  if _WIN32_WCE >= 101
+#ifdef _WIN32_WCE
+#if _WIN32_WCE >= 101
             return WideCharToMultiByte(CP_ACP, 0, me32.szExePath, -1,
-                                       path, sz, NULL, NULL);
-#  else
+                path, sz, NULL, NULL);
+#else
             {
                 int i, len = (int)wcslen(me32.szExePath);
                 if (sz <= 0)
@@ -570,8 +566,8 @@ static int win32_pathbyaddr(void *addr, char *path, int sz)
                 path[len++] = '\0';
                 return len;
             }
-#  endif
-# else
+#endif
+#else
             {
                 int len = (int)strlen(me32.szExePath);
                 if (sz <= 0)
@@ -582,11 +578,11 @@ static int win32_pathbyaddr(void *addr, char *path, int sz)
                 path[len++] = '\0';
                 return len;
             }
-# endif
+#endif
         }
-    } while ((*module_next) (hModuleSnap, &me32));
+    } while ((*module_next)(hModuleSnap, &me32));
 
-    (*close_snap) (hModuleSnap);
+    (*close_snap)(hModuleSnap);
     FreeLibrary(dll);
     return 0;
 }
@@ -618,16 +614,16 @@ static void *win32_globallookup(const char *name)
         return NULL;
     }
     /* We take the rest for granted... */
-# ifdef _WIN32_WCE
+#ifdef _WIN32_WCE
     close_snap = (CLOSETOOLHELP32SNAPSHOT)
         GetProcAddress(dll, "CloseToolhelp32Snapshot");
-# else
-    close_snap = (CLOSETOOLHELP32SNAPSHOT) CloseHandle;
-# endif
-    module_first = (MODULE32) GetProcAddress(dll, "Module32First");
-    module_next = (MODULE32) GetProcAddress(dll, "Module32Next");
+#else
+    close_snap = (CLOSETOOLHELP32SNAPSHOT)CloseHandle;
+#endif
+    module_first = (MODULE32)GetProcAddress(dll, "Module32First");
+    module_next = (MODULE32)GetProcAddress(dll, "Module32Next");
 
-    hModuleSnap = (*create_snap) (TH32CS_SNAPMODULE, 0);
+    hModuleSnap = (*create_snap)(TH32CS_SNAPMODULE, 0);
     if (hModuleSnap == INVALID_HANDLE_VALUE) {
         FreeLibrary(dll);
         ERR_raise(ERR_LIB_DSO, DSO_R_UNSUPPORTED);
@@ -636,22 +632,22 @@ static void *win32_globallookup(const char *name)
 
     me32.dwSize = sizeof(me32);
 
-    if (!(*module_first) (hModuleSnap, &me32)) {
-        (*close_snap) (hModuleSnap);
+    if (!(*module_first)(hModuleSnap, &me32)) {
+        (*close_snap)(hModuleSnap);
         FreeLibrary(dll);
         return NULL;
     }
 
     do {
         if ((ret.f = GetProcAddress(me32.hModule, name))) {
-            (*close_snap) (hModuleSnap);
+            (*close_snap)(hModuleSnap);
             FreeLibrary(dll);
             return ret.p;
         }
-    } while ((*module_next) (hModuleSnap, &me32));
+    } while ((*module_next)(hModuleSnap, &me32));
 
-    (*close_snap) (hModuleSnap);
+    (*close_snap)(hModuleSnap);
     FreeLibrary(dll);
     return NULL;
 }
-#endif                          /* DSO_WIN32 */
+#endif /* DSO_WIN32 */
diff --git a/crypto/ebcdic.c b/crypto/ebcdic.c
index 970ffc015c9d8..eb94210826112 100644
--- a/crypto/ebcdic.c
+++ b/crypto/ebcdic.c
@@ -7,14 +7,14 @@
  * https://www.openssl.org/source/license.html
  */
 
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
 #ifndef CHARSET_EBCDIC
 NON_EMPTY_TRANSLATION_UNIT
 #else
 
-# include <openssl/ebcdic.h>
+#include <openssl/ebcdic.h>
 
-# ifdef CHARSET_EBCDIC_TEST
+#ifdef CHARSET_EBCDIC_TEST
 /*
  * Here we're looking to test the EBCDIC code on an ASCII system so we don't do
  * any translation in these tables at all.
@@ -92,7 +92,7 @@ const unsigned char os_toebcdic[256] = {
     0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
 };
 
-# elif defined(_OSD_POSIX)
+#elif defined(_OSD_POSIX)
 /*
  * "BS2000 OSD" is a POSIX subsystem on a main frame. It is made by Siemens
  * AG, Germany, for their BS2000 mainframe machines. Within the POSIX
@@ -111,67 +111,83 @@ const unsigned char os_toebcdic[256] = {
 const unsigned char os_toascii[256] = {
     /*
      * 00
-     */ 0x00, 0x01, 0x02, 0x03, 0x85, 0x09, 0x86, 0x7f,
+     */
+    0x00, 0x01, 0x02, 0x03, 0x85, 0x09, 0x86, 0x7f,
     0x87, 0x8d, 0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* ................ */
     /*
      * 10
-     */ 0x10, 0x11, 0x12, 0x13, 0x8f, 0x0a, 0x08, 0x97,
+     */
+    0x10, 0x11, 0x12, 0x13, 0x8f, 0x0a, 0x08, 0x97,
     0x18, 0x19, 0x9c, 0x9d, 0x1c, 0x1d, 0x1e, 0x1f, /* ................ */
     /*
      * 20
-     */ 0x80, 0x81, 0x82, 0x83, 0x84, 0x92, 0x17, 0x1b,
+     */
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x92, 0x17, 0x1b,
     0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x05, 0x06, 0x07, /* ................ */
     /*
      * 30
-     */ 0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04,
+     */
+    0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04,
     0x98, 0x99, 0x9a, 0x9b, 0x14, 0x15, 0x9e, 0x1a, /* ................ */
     /*
      * 40
-     */ 0x20, 0xa0, 0xe2, 0xe4, 0xe0, 0xe1, 0xe3, 0xe5,
+     */
+    0x20, 0xa0, 0xe2, 0xe4, 0xe0, 0xe1, 0xe3, 0xe5,
     0xe7, 0xf1, 0x60, 0x2e, 0x3c, 0x28, 0x2b, 0x7c, /* .........`.<(+| */
     /*
      * 50
-     */ 0x26, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef,
+     */
+    0x26, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef,
     0xec, 0xdf, 0x21, 0x24, 0x2a, 0x29, 0x3b, 0x9f, /* &.........!$*);. */
     /*
      * 60
-     */ 0x2d, 0x2f, 0xc2, 0xc4, 0xc0, 0xc1, 0xc3, 0xc5,
-    0xc7, 0xd1, 0x5e, 0x2c, 0x25, 0x5f, 0x3e, 0x3f,    /*-/........^,%_>?*/
+     */
+    0x2d, 0x2f, 0xc2, 0xc4, 0xc0, 0xc1, 0xc3, 0xc5,
+    0xc7, 0xd1, 0x5e, 0x2c, 0x25, 0x5f, 0x3e, 0x3f, /*-/........^,%_>?*/
     /*
      * 70
-     */ 0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, 0xce, 0xcf,
+     */
+    0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, 0xce, 0xcf,
     0xcc, 0xa8, 0x3a, 0x23, 0x40, 0x27, 0x3d, 0x22, /* ..........:#@'=" */
     /*
      * 80
-     */ 0xd8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+     */
+    0xd8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
     0x68, 0x69, 0xab, 0xbb, 0xf0, 0xfd, 0xfe, 0xb1, /* .abcdefghi...... */
     /*
      * 90
-     */ 0xb0, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70,
+     */
+    0xb0, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70,
     0x71, 0x72, 0xaa, 0xba, 0xe6, 0xb8, 0xc6, 0xa4, /* .jklmnopqr...... */
     /*
      * a0
-     */ 0xb5, 0xaf, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
+     */
+    0xb5, 0xaf, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
     0x79, 0x7a, 0xa1, 0xbf, 0xd0, 0xdd, 0xde, 0xae, /* ..stuvwxyz...... */
     /*
      * b0
-     */ 0xa2, 0xa3, 0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc,
+     */
+    0xa2, 0xa3, 0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc,
     0xbd, 0xbe, 0xac, 0x5b, 0x5c, 0x5d, 0xb4, 0xd7, /* ...........[\].. */
     /*
      * c0
-     */ 0xf9, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+     */
+    0xf9, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
     0x48, 0x49, 0xad, 0xf4, 0xf6, 0xf2, 0xf3, 0xf5, /* .ABCDEFGHI...... */
     /*
      * d0
-     */ 0xa6, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50,
+     */
+    0xa6, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50,
     0x51, 0x52, 0xb9, 0xfb, 0xfc, 0xdb, 0xfa, 0xff, /* .JKLMNOPQR...... */
     /*
      * e0
-     */ 0xd9, 0xf7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+     */
+    0xd9, 0xf7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
     0x59, 0x5a, 0xb2, 0xd4, 0xd6, 0xd2, 0xd3, 0xd5, /* ..STUVWXYZ...... */
     /*
      * f0
-     */ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+     */
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
     0x38, 0x39, 0xb3, 0x7b, 0xdc, 0x7d, 0xda, 0x7e /* 0123456789.{.}.~ */
 };
 
@@ -179,71 +195,87 @@ const unsigned char os_toascii[256] = {
 const unsigned char os_toebcdic[256] = {
     /*
      * 00
-     */ 0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f,
+     */
+    0x00, 0x01, 0x02, 0x03, 0x37, 0x2d, 0x2e, 0x2f,
     0x16, 0x05, 0x15, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* ................ */
     /*
      * 10
-     */ 0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26,
+     */
+    0x10, 0x11, 0x12, 0x13, 0x3c, 0x3d, 0x32, 0x26,
     0x18, 0x19, 0x3f, 0x27, 0x1c, 0x1d, 0x1e, 0x1f, /* ................ */
     /*
      * 20
-     */ 0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d,
+     */
+    0x40, 0x5a, 0x7f, 0x7b, 0x5b, 0x6c, 0x50, 0x7d,
     0x4d, 0x5d, 0x5c, 0x4e, 0x6b, 0x60, 0x4b, 0x61, /* !"#$%&'()*+,-./ */
     /*
      * 30
-     */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+     */
+    0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
     0xf8, 0xf9, 0x7a, 0x5e, 0x4c, 0x7e, 0x6e, 0x6f, /* 0123456789:;<=>? */
     /*
      * 40
-     */ 0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+     */
+    0x7c, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
     0xc8, 0xc9, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, /* @ABCDEFGHIJKLMNO */
     /*
      * 50
-     */ 0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
+     */
+    0xd7, 0xd8, 0xd9, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
     0xe7, 0xe8, 0xe9, 0xbb, 0xbc, 0xbd, 0x6a, 0x6d, /* PQRSTUVWXYZ[\]^_ */
     /*
      * 60
-     */ 0x4a, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+     */
+    0x4a, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
     0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, /* `abcdefghijklmno */
     /*
      * 70
-     */ 0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6,
+     */
+    0x97, 0x98, 0x99, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6,
     0xa7, 0xa8, 0xa9, 0xfb, 0x4f, 0xfd, 0xff, 0x07, /* pqrstuvwxyz{|}~. */
     /*
      * 80
-     */ 0x20, 0x21, 0x22, 0x23, 0x24, 0x04, 0x06, 0x08,
+     */
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x04, 0x06, 0x08,
     0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x09, 0x0a, 0x14, /* ................ */
     /*
      * 90
-     */ 0x30, 0x31, 0x25, 0x33, 0x34, 0x35, 0x36, 0x17,
+     */
+    0x30, 0x31, 0x25, 0x33, 0x34, 0x35, 0x36, 0x17,
     0x38, 0x39, 0x3a, 0x3b, 0x1a, 0x1b, 0x3e, 0x5f, /* ................ */
     /*
      * a0
-     */ 0x41, 0xaa, 0xb0, 0xb1, 0x9f, 0xb2, 0xd0, 0xb5,
+     */
+    0x41, 0xaa, 0xb0, 0xb1, 0x9f, 0xb2, 0xd0, 0xb5,
     0x79, 0xb4, 0x9a, 0x8a, 0xba, 0xca, 0xaf, 0xa1, /* ................ */
     /*
      * b0
-     */ 0x90, 0x8f, 0xea, 0xfa, 0xbe, 0xa0, 0xb6, 0xb3,
+     */
+    0x90, 0x8f, 0xea, 0xfa, 0xbe, 0xa0, 0xb6, 0xb3,
     0x9d, 0xda, 0x9b, 0x8b, 0xb7, 0xb8, 0xb9, 0xab, /* ................ */
     /*
      * c0
-     */ 0x64, 0x65, 0x62, 0x66, 0x63, 0x67, 0x9e, 0x68,
+     */
+    0x64, 0x65, 0x62, 0x66, 0x63, 0x67, 0x9e, 0x68,
     0x74, 0x71, 0x72, 0x73, 0x78, 0x75, 0x76, 0x77, /* ................ */
     /*
      * d0
-     */ 0xac, 0x69, 0xed, 0xee, 0xeb, 0xef, 0xec, 0xbf,
+     */
+    0xac, 0x69, 0xed, 0xee, 0xeb, 0xef, 0xec, 0xbf,
     0x80, 0xe0, 0xfe, 0xdd, 0xfc, 0xad, 0xae, 0x59, /* ................ */
     /*
      * e0
-     */ 0x44, 0x45, 0x42, 0x46, 0x43, 0x47, 0x9c, 0x48,
+     */
+    0x44, 0x45, 0x42, 0x46, 0x43, 0x47, 0x9c, 0x48,
     0x54, 0x51, 0x52, 0x53, 0x58, 0x55, 0x56, 0x57, /* ................ */
     /*
      * f0
-     */ 0x8c, 0x49, 0xcd, 0xce, 0xcb, 0xcf, 0xcc, 0xe1,
+     */
+    0x8c, 0x49, 0xcd, 0xce, 0xcb, 0xcf, 0xcc, 0xe1,
     0x70, 0xc0, 0xde, 0xdb, 0xdc, 0x8d, 0x8e, 0xdf /* ................ */
 };
 
-# else /*_OSD_POSIX*/
+#else /*_OSD_POSIX*/
 
 /*
  * This code does basic character mapping for IBM's TPF and OS/390 operating
@@ -325,7 +357,7 @@ const unsigned char os_toebcdic[256] = {
     0x8c, 0x49, 0xcd, 0xce, 0xcb, 0xcf, 0xcc, 0xe1, /* f0-ff: */
     0x70, 0xdd, 0xde, 0xdb, 0xdc, 0x8d, 0x8e, 0xdf /* ................ */
 };
-# endif/*_OSD_POSIX*/
+#endif /*_OSD_POSIX*/
 
 /*
  * Translate a memory block from EBCDIC (host charset) to ASCII (net charset)
diff --git a/crypto/ec/asm/ecp_nistp384-ppc64.pl b/crypto/ec/asm/ecp_nistp384-ppc64.pl
index 28f4168e52181..43028d047d080 100755
--- a/crypto/ec/asm/ecp_nistp384-ppc64.pl
+++ b/crypto/ec/asm/ecp_nistp384-ppc64.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
+# 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
@@ -7,13 +7,15 @@
 # https://www.openssl.org/source/license.html
 #
 # ====================================================================
-# Written by Rohan McLure <rmclure@linux.ibm.com> for the OpenSSL
-# project.
+# Written by Danny Tsen <dtsen@us.ibm.com> # for the OpenSSL project.
+#
+# Copyright 2025- IBM Corp.
 # ====================================================================
 #
-# p384 lower-level primitives for PPC64 using vector instructions.
+# p384 lower-level primitives for PPC64.
 #
 
+
 use strict;
 use warnings;
 
@@ -21,7 +23,7 @@
 my $output = "";
 while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {}
 if (!$output) {
-    $output = "-";
+        $output = "-";
 }
 
 my ($xlate, $dir);
@@ -35,272 +37,1496 @@
 
 my $code = "";
 
-my ($sp, $outp, $savelr, $savesp) = ("r1", "r3", "r10", "r12");
-
-my $vzero = "v32";
-
-sub startproc($)
-{
-    my ($name) = @_;
-
-    $code.=<<___;
-    .globl ${name}
-    .align 5
-${name}:
-
-___
-}
+$code.=<<___;
+.machine "any"
+.text
 
-sub endproc($)
-{
-    my ($name) = @_;
+.globl  p384_felem_mul
+.type   p384_felem_mul,\@function
+.align	4
+p384_felem_mul:
+
+	stdu	1, -176(1)
+	mflr	0
+	std	14, 56(1)
+	std	15, 64(1)
+	std	16, 72(1)
+	std	17, 80(1)
+	std	18, 88(1)
+	std	19, 96(1)
+	std	20, 104(1)
+	std	21, 112(1)
+	std	22, 120(1)
+
+	bl	_p384_felem_mul_core
+
+	mtlr	0
+	ld	14, 56(1)
+	ld	15, 64(1)
+	ld	16, 72(1)
+	ld	17, 80(1)
+	ld	18, 88(1)
+	ld	19, 96(1)
+	ld	20, 104(1)
+	ld	21, 112(1)
+	ld	22, 120(1)
+	addi	1, 1, 176
+	blr
+.size   p384_felem_mul,.-p384_felem_mul
+
+.globl  p384_felem_square
+.type   p384_felem_square,\@function
+.align	4
+p384_felem_square:
+
+	stdu	1, -176(1)
+	mflr	0
+	std	14, 56(1)
+	std	15, 64(1)
+	std	16, 72(1)
+	std	17, 80(1)
+
+	bl	_p384_felem_square_core
+
+	mtlr	0
+	ld	14, 56(1)
+	ld	15, 64(1)
+	ld	16, 72(1)
+	ld	17, 80(1)
+	addi	1, 1, 176
+	blr
+.size   p384_felem_square,.-p384_felem_square
 
-    $code.=<<___;
-    blr
-        .size ${name},.-${name}
+#
+# Felem mul core function -
+# r3, r4 and r5 need to pre-loaded.
+#
+.type   _p384_felem_mul_core,\@function
+.align	4
+_p384_felem_mul_core:
+
+	ld	6,0(4)
+	ld	14,0(5)
+	ld	7,8(4)
+	ld	15,8(5)
+	ld	8,16(4)
+	ld	16,16(5)
+	ld	9,24(4)
+	ld	17,24(5)
+	ld	10,32(4)
+	ld	18,32(5)
+	ld	11,40(4)
+	ld	19,40(5)
+	ld	12,48(4)
+	ld	20,48(5)
+
+	# out0
+	mulld	21, 14, 6
+	mulhdu	22, 14, 6
+	std	21, 0(3)
+	std	22, 8(3)
+
+	vxor	0, 0, 0
+
+	# out1
+	mtvsrdd	32+13, 14, 6
+	mtvsrdd	32+14, 7, 15
+	vmsumudm 1, 13, 14, 0
+
+	# out2
+	mtvsrdd	32+15, 15, 6
+	mtvsrdd	32+16, 7, 16
+	mtvsrdd	32+17, 0, 8
+	mtvsrdd	32+18, 0, 14
+	vmsumudm 19, 15, 16, 0
+	vmsumudm 2, 17, 18, 19
+
+	# out3
+	mtvsrdd	32+13, 16, 6
+	mtvsrdd	32+14, 7, 17
+	mtvsrdd	32+15, 14, 8
+	mtvsrdd	32+16, 9, 15
+	vmsumudm 19, 13, 14, 0
+	vmsumudm 3, 15, 16, 19
+
+	# out4
+	mtvsrdd	32+13, 17, 6
+	mtvsrdd	32+14, 7, 18
+	mtvsrdd	32+15, 15, 8
+	mtvsrdd	32+16, 9, 16
+	mtvsrdd	32+17, 0, 10
+	mtvsrdd	32+18, 0, 14
+	vmsumudm 19, 13, 14, 0
+	vmsumudm 4, 15, 16, 19
+	vmsumudm 4, 17, 18, 4
+
+	# out5
+	mtvsrdd	32+13, 18, 6
+	mtvsrdd	32+14, 7, 19
+	mtvsrdd	32+15, 16, 8
+	mtvsrdd	32+16, 9, 17
+	mtvsrdd	32+17, 14, 10
+	mtvsrdd	32+18, 11, 15
+	vmsumudm 19, 13, 14, 0
+	vmsumudm 5, 15, 16, 19
+	vmsumudm 5, 17, 18, 5
+
+	stxv	32+1, 16(3)
+	stxv	32+2, 32(3)
+	stxv	32+3, 48(3)
+	stxv	32+4, 64(3)
+	stxv	32+5, 80(3)
+
+	# out6
+	mtvsrdd	32+13, 19, 6
+	mtvsrdd	32+14, 7, 20
+	mtvsrdd	32+15, 17, 8
+	mtvsrdd	32+16, 9, 18
+	mtvsrdd	32+17, 15, 10
+	mtvsrdd	32+18, 11, 16
+	vmsumudm 19, 13, 14, 0
+	vmsumudm 6, 15, 16, 19
+	mtvsrdd	32+13, 0, 12
+	mtvsrdd	32+14, 0, 14
+	vmsumudm 19, 17, 18, 6
+	vmsumudm 6, 13, 14, 19
+
+	# out7
+	mtvsrdd	32+13, 19, 7
+	mtvsrdd	32+14, 8, 20
+	mtvsrdd	32+15, 17, 9
+	mtvsrdd	32+16, 10, 18
+	mtvsrdd	32+17, 15, 11
+	mtvsrdd	32+18, 12, 16
+	vmsumudm 19, 13, 14, 0
+	vmsumudm 7, 15, 16, 19
+	vmsumudm 7, 17, 18, 7
+
+	# out8
+	mtvsrdd	32+13, 19, 8
+	mtvsrdd	32+14, 9, 20
+	mtvsrdd	32+15, 17, 10
+	mtvsrdd	32+16, 11, 18
+	mtvsrdd	32+17, 0, 12
+	mtvsrdd	32+18, 0, 16
+	vmsumudm 19, 13, 14, 0
+	vmsumudm 8, 15, 16, 19
+	vmsumudm 8, 17, 18, 8
+
+	# out9
+	mtvsrdd	32+13, 19, 9
+	mtvsrdd	32+14, 10, 20
+	mtvsrdd	32+15, 17, 11
+	mtvsrdd	32+16, 12, 18
+	vmsumudm 19, 13, 14, 0
+	vmsumudm 9, 15, 16, 19
+
+	# out10
+	mtvsrdd	32+13, 19, 10
+	mtvsrdd	32+14, 11, 20
+	mtvsrdd	32+15, 0, 12
+	mtvsrdd	32+16, 0, 18
+	vmsumudm 19, 13, 14, 0
+	vmsumudm 10, 15, 16, 19
+
+	# out11
+	mtvsrdd	32+17, 19, 11
+	mtvsrdd	32+18, 12, 20
+	vmsumudm 11, 17, 18, 0
+
+	stxv	32+6, 96(3)
+	stxv	32+7, 112(3)
+	stxv	32+8, 128(3)
+	stxv	32+9, 144(3)
+	stxv	32+10, 160(3)
+	stxv	32+11, 176(3)
+
+	# out12
+	mulld	21, 20, 12
+	mulhdu	22, 20, 12	# out12
+
+	std	21, 192(3)
+	std	22, 200(3)
+
+	blr
+.size   _p384_felem_mul_core,.-_p384_felem_mul_core
 
-___
-}
+#
+# Felem square core function -
+# r3 and r4 need to pre-loaded.
+#
+.type   _p384_felem_square_core,\@function
+.align	4
+_p384_felem_square_core:
+
+	ld	6, 0(4)
+	ld	7, 8(4)
+	ld	8, 16(4)
+	ld	9, 24(4)
+	ld	10, 32(4)
+	ld	11, 40(4)
+	ld	12, 48(4)
+
+	vxor	0, 0, 0
+
+	# out0
+	mulld	14, 6, 6
+	mulhdu	15, 6, 6
+	std	14, 0(3)
+	std	15, 8(3)
+
+	# out1
+	add	14, 6, 6
+	mtvsrdd	32+13, 0, 14
+	mtvsrdd	32+14, 0, 7
+	vmsumudm 1, 13, 14, 0
+
+	# out2
+	mtvsrdd	32+15, 7, 14
+	mtvsrdd	32+16, 7, 8
+	vmsumudm 2, 15, 16, 0
+
+	# out3
+	add	15, 7, 7
+	mtvsrdd	32+13, 8, 14
+	mtvsrdd	32+14, 15, 9
+	vmsumudm 3, 13, 14, 0
+
+	# out4
+	mtvsrdd	32+13, 9, 14
+	mtvsrdd	32+14, 15, 10
+	mtvsrdd	32+15, 0, 8
+	vmsumudm 4, 13, 14, 0
+	vmsumudm 4, 15, 15, 4
+
+	# out5
+	mtvsrdd	32+13, 10, 14
+	mtvsrdd	32+14, 15, 11
+	add	16, 8, 8
+	mtvsrdd	32+15, 0, 16
+	mtvsrdd	32+16, 0, 9
+	vmsumudm 5, 13, 14, 0
+	vmsumudm 5, 15, 16, 5
+
+	stxv	32+1, 16(3)
+	stxv	32+2, 32(3)
+	stxv	32+3, 48(3)
+	stxv	32+4, 64(3)
+
+	# out6
+	mtvsrdd	32+13, 11, 14
+	mtvsrdd	32+14, 15, 12
+	mtvsrdd	32+15, 9, 16
+	mtvsrdd	32+16, 9, 10
+	stxv	32+5, 80(3)
+	vmsumudm 19, 13, 14, 0
+	vmsumudm 6, 15, 16, 19
+
+	# out7
+	add	17, 9, 9
+	mtvsrdd	32+13, 11, 15
+	mtvsrdd	32+14, 16, 12
+	mtvsrdd	32+15, 0, 17
+	mtvsrdd	32+16, 0, 10
+	vmsumudm 19, 13, 14, 0
+	vmsumudm 7, 15, 16, 19
+
+	# out8
+	mtvsrdd	32+13, 11, 16
+	mtvsrdd	32+14, 17, 12
+	mtvsrdd	32+15, 0, 10
+	vmsumudm 19, 13, 14, 0
+	vmsumudm 8, 15, 15, 19
+
+	# out9
+	add	14, 10, 10
+	mtvsrdd	32+13, 11, 17
+	mtvsrdd	32+14, 14, 12
+	vmsumudm 9, 13, 14, 0
+
+	# out10
+	mtvsrdd	32+13, 11, 14
+	mtvsrdd	32+14, 11, 12
+	vmsumudm 10, 13, 14, 0
+
+	stxv	32+6, 96(3)
+	stxv	32+7, 112(3)
+
+	# out11
+	#add	14, 11, 11
+	#mtvsrdd	32+13, 0, 14
+	#mtvsrdd	32+14, 0, 12
+	#vmsumudm 11, 13, 14, 0
+
+	mulld	6, 12, 11
+	mulhdu	7, 12, 11
+	addc	8, 6, 6
+	adde	9, 7, 7
+
+	stxv	32+8, 128(3)
+	stxv	32+9, 144(3)
+	stxv	32+10, 160(3)
+	#stxv	32+11, 176(3)
+
+	# out12
+	mulld	14, 12, 12
+	mulhdu	15, 12, 12
+
+	std	8, 176(3)
+	std	9, 184(3)
+	std	14, 192(3)
+	std	15, 200(3)
+
+	blr
+.size   _p384_felem_square_core,.-_p384_felem_square_core
 
-sub load_vrs($$)
-{
-    my ($pointer, $reg_list) = @_;
+#
+# widefelem (128 bits) * 8
+#
+.macro F128_X_8 _off1 _off2
+	ld	9,\\_off1(3)
+	ld	8,\\_off2(3)
+	srdi	10,9,61
+	rldimi	10,8,3,0
+	sldi	9,9,3
+	std	9,\\_off1(3)
+	std	10,\\_off2(3)
+.endm
 
-    for (my $i = 0; $i <= 6; $i++) {
-        my $offset = $i * 8;
-        $code.=<<___;
-    lxsd        $reg_list->[$i],$offset($pointer)
-___
-    }
+.globl p384_felem128_mul_by_8
+.type	p384_felem128_mul_by_8, \@function
+.align 4
+p384_felem128_mul_by_8:
 
-    $code.=<<___;
+	F128_X_8 0, 8
 
-___
-}
+	F128_X_8 16, 24
 
-sub store_vrs($$)
-{
-    my ($pointer, $reg_list) = @_;
+	F128_X_8 32, 40
 
-    for (my $i = 0; $i <= 12; $i++) {
-        my $offset = $i * 16;
-        $code.=<<___;
-    stxv        $reg_list->[$i],$offset($pointer)
-___
-    }
+	F128_X_8 48, 56
 
-    $code.=<<___;
+	F128_X_8 64, 72
 
-___
-}
+	F128_X_8 80, 88
 
-$code.=<<___;
-.machine    "any"
-.text
+	F128_X_8 96, 104
 
-___
+	F128_X_8 112, 120
 
-{
-    # mul/square common
-    my ($t1, $t2, $t3, $t4) = ("v33", "v34", "v42", "v43");
-    my ($zero, $one) = ("r8", "r9");
-    my $out = "v51";
+	F128_X_8 128, 136
 
-    {
-        #
-        # p384_felem_mul
-        #
+	F128_X_8 144, 152
 
-        my ($in1p, $in2p) = ("r4", "r5");
-        my @in1 = map("v$_",(44..50));
-        my @in2 = map("v$_",(35..41));
+	F128_X_8 160, 168
 
-        startproc("p384_felem_mul");
+	F128_X_8 176, 184
 
-        $code.=<<___;
-    vspltisw    $vzero,0
+	F128_X_8 192, 200
 
-___
+	blr
+.size	p384_felem128_mul_by_8,.-p384_felem128_mul_by_8
 
-        load_vrs($in1p, \@in1);
-        load_vrs($in2p, \@in2);
-
-        $code.=<<___;
-    vmsumudm    $out,$in1[0],$in2[0],$vzero
-    stxv        $out,0($outp)
-
-    xxpermdi    $t1,$in1[0],$in1[1],0b00
-    xxpermdi    $t2,$in2[1],$in2[0],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    stxv        $out,16($outp)
-
-    xxpermdi    $t2,$in2[2],$in2[1],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    vmsumudm    $out,$in1[2],$in2[0],$out
-    stxv        $out,32($outp)
-
-    xxpermdi    $t2,$in2[1],$in2[0],0b00
-    xxpermdi    $t3,$in1[2],$in1[3],0b00
-    xxpermdi    $t4,$in2[3],$in2[2],0b00
-    vmsumudm    $out,$t1,$t4,$vzero
-    vmsumudm    $out,$t3,$t2,$out
-    stxv        $out,48($outp)
-
-    xxpermdi    $t2,$in2[4],$in2[3],0b00
-    xxpermdi    $t4,$in2[2],$in2[1],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    vmsumudm    $out,$t3,$t4,$out
-    vmsumudm    $out,$in1[4],$in2[0],$out
-    stxv        $out,64($outp)
-
-    xxpermdi    $t2,$in2[5],$in2[4],0b00
-    xxpermdi    $t4,$in2[3],$in2[2],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    vmsumudm    $out,$t3,$t4,$out
-    xxpermdi    $t4,$in2[1],$in2[0],0b00
-    xxpermdi    $t1,$in1[4],$in1[5],0b00
-    vmsumudm    $out,$t1,$t4,$out
-    stxv        $out,80($outp)
-
-    xxpermdi    $t1,$in1[0],$in1[1],0b00
-    xxpermdi    $t2,$in2[6],$in2[5],0b00
-    xxpermdi    $t4,$in2[4],$in2[3],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    vmsumudm    $out,$t3,$t4,$out
-    xxpermdi    $t2,$in2[2],$in2[1],0b00
-    xxpermdi    $t1,$in1[4],$in1[5],0b00
-    vmsumudm    $out,$t1,$t2,$out
-    vmsumudm    $out,$in1[6],$in2[0],$out
-    stxv        $out,96($outp)
-
-    xxpermdi    $t1,$in1[1],$in1[2],0b00
-    xxpermdi    $t2,$in2[6],$in2[5],0b00
-    xxpermdi    $t3,$in1[3],$in1[4],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    vmsumudm    $out,$t3,$t4,$out
-    xxpermdi    $t3,$in2[2],$in2[1],0b00
-    xxpermdi    $t1,$in1[5],$in1[6],0b00
-    vmsumudm    $out,$t1,$t3,$out
-    stxv        $out,112($outp)
-
-    xxpermdi    $t1,$in1[2],$in1[3],0b00
-    xxpermdi    $t3,$in1[4],$in1[5],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    vmsumudm    $out,$t3,$t4,$out
-    vmsumudm    $out,$in1[6],$in2[2],$out
-    stxv        $out,128($outp)
-
-    xxpermdi    $t1,$in1[3],$in1[4],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    xxpermdi    $t1,$in1[5],$in1[6],0b00
-    vmsumudm    $out,$t1,$t4,$out
-    stxv        $out,144($outp)
-
-    vmsumudm    $out,$t3,$t2,$vzero
-    vmsumudm    $out,$in1[6],$in2[4],$out
-    stxv        $out,160($outp)
-
-    vmsumudm    $out,$t1,$t2,$vzero
-    stxv        $out,176($outp)
-
-    vmsumudm    $out,$in1[6],$in2[6],$vzero
-    stxv        $out,192($outp)
-___
+#
+# widefelem (128 bits) * 2
+#
+.macro F128_X_2 _off1 _off2
+	ld	9,\\_off1(3)
+	ld	8,\\_off2(3)
+	srdi	10,9,63
+	rldimi	10,8,1,0
+	sldi	9,9,1
+	std	9,\\_off1(3)
+	std	10,\\_off2(3)
+.endm
+
+.globl p384_felem128_mul_by_2
+.type	p384_felem128_mul_by_2, \@function
+.align 4
+p384_felem128_mul_by_2:
+
+	F128_X_2 0, 8
+
+	F128_X_2 16, 24
+
+	F128_X_2 32, 40
+
+	F128_X_2 48, 56
+
+	F128_X_2 64, 72
+
+	F128_X_2 80, 88
+
+	F128_X_2 96, 104
+
+	F128_X_2 112, 120
+
+	F128_X_2 128, 136
+
+	F128_X_2 144, 152
+
+	F128_X_2 160, 168
+
+	F128_X_2 176, 184
+
+	F128_X_2 192, 200
+
+	blr
+.size	p384_felem128_mul_by_2,.-p384_felem128_mul_by_2
+
+.globl p384_felem_diff128
+.type	p384_felem_diff128, \@function
+.align 4
+p384_felem_diff128:
+
+	addis   5, 2, .LConst_two127\@toc\@ha
+	addi    5, 5, .LConst_two127\@toc\@l
+
+	ld	10, 0(3)
+	ld	8, 8(3)
+	li	9, 0
+	addc	10, 10, 9
+	li	7, -1
+	rldicr	7, 7, 0, 0	# two127
+	adde	8, 8, 7
+	ld	11, 0(4)
+	ld	12, 8(4)
+	subfc	11, 11, 10
+	subfe	12, 12, 8
+	std	11, 0(3)	# out0
+	std	12, 8(3)
+
+	# two127m71 = (r10, r9)
+	ld	8, 16(3)
+	ld	7, 24(3)
+	ld	10, 24(5)	# two127m71
+	addc	8, 8, 9
+	adde	7, 7, 10
+	ld	11, 16(4)
+	ld	12, 24(4)
+	subfc	11, 11, 8
+	subfe	12, 12, 7
+	std	11, 16(3)	# out1
+	std	12, 24(3)
+
+	ld	8, 32(3)
+	ld	7, 40(3)
+	addc	8, 8, 9
+	adde	7, 7, 10
+	ld	11, 32(4)
+	ld	12, 40(4)
+	subfc	11, 11, 8
+	subfe	12, 12, 7
+	std	11, 32(3)	# out2
+	std	12, 40(3)
+
+	ld	8, 48(3)
+	ld	7, 56(3)
+	addc	8, 8, 9
+	adde	7, 7, 10
+	ld	11, 48(4)
+	ld	12, 56(4)
+	subfc	11, 11, 8
+	subfe	12, 12, 7
+	std	11, 48(3)	# out3
+	std	12, 56(3)
+
+	ld	8, 64(3)
+	ld	7, 72(3)
+	addc	8, 8, 9
+	adde	7, 7, 10
+	ld	11, 64(4)
+	ld	12, 72(4)
+	subfc	11, 11, 8
+	subfe	12, 12, 7
+	std	11, 64(3)	# out4
+	std	12, 72(3)
+
+	ld	8, 80(3)
+	ld	7, 88(3)
+	addc	8, 8, 9
+	adde	7, 7, 10
+	ld	11, 80(4)
+	ld	12, 88(4)
+	subfc	11, 11, 8
+	subfe	12, 12, 7
+	std	11, 80(3)	# out5
+	std	12, 88(3)
+
+	ld	8, 96(3)
+	ld	7, 104(3)
+	ld	6, 40(5)	# two127p111m79m71
+	addc	8, 8, 9
+	adde	7, 7, 6
+	ld	11, 96(4)
+	ld	12, 104(4)
+	subfc	11, 11, 8
+	subfe	12, 12, 7
+	std	11, 96(3)	# out6
+	std	12, 104(3)
+
+	ld	8, 112(3)
+	ld	7, 120(3)
+	ld	6, 56(5)	# two127m119m71
+	addc	8, 8, 9
+	adde	7, 7, 6
+	ld	11, 112(4)
+	ld	12, 120(4)
+	subfc	11, 11, 8
+	subfe	12, 12, 7
+	std	11, 112(3)	# out7
+	std	12, 120(3)
+
+	ld	8, 128(3)
+	ld	7, 136(3)
+	ld	6, 72(5)	# two127m95m71
+	addc	8, 8, 9
+	adde	7, 7, 6
+	ld	11, 128(4)
+	ld	12, 136(4)
+	subfc	11, 11, 8
+	subfe	12, 12, 7
+	std	11, 128(3)	# out8
+	std	12, 136(3)
+
+	ld	8, 144(3)
+	ld	7, 152(3)
+	addc	8, 8, 9
+	adde	7, 7, 10
+	ld	11, 144(4)
+	ld	12, 152(4)
+	subfc	11, 11, 8
+	subfe	12, 12, 7
+	std	11, 144(3)	# out9
+	std	12, 152(3)
+
+	ld	8, 160(3)
+	ld	7, 168(3)
+	addc	8, 8, 9
+	adde	7, 7, 10
+	ld	11, 160(4)
+	ld	12, 168(4)
+	subfc	11, 11, 8
+	subfe	12, 12, 7
+	std	11, 160(3)	# out10
+	std	12, 168(3)
+
+	ld	8, 176(3)
+	ld	7, 184(3)
+	addc	8, 8, 9
+	adde	7, 7, 10
+	ld	11, 176(4)
+	ld	12, 184(4)
+	subfc	11, 11, 8
+	subfe	12, 12, 7
+	std	11, 176(3)	# out11
+	std	12, 184(3)
+
+	ld	8, 192(3)
+	ld	7, 200(3)
+	addc	8, 8, 9
+	adde	7, 7, 10
+	ld	11, 192(4)
+	ld	12, 200(4)
+	subfc	11, 11, 8
+	subfe	12, 12, 7
+	std	11, 192(3)	# out12
+	std	12, 200(3)
+
+	blr
+.size	p384_felem_diff128,.-p384_felem_diff128
+
+.data
+.align 4
+.LConst_two127:
+#two127
+.long 0x00000000, 0x00000000, 0x00000000, 0x80000000
+#two127m71
+.long 0x00000000, 0x00000000, 0xffffff80, 0x7fffffff
+#two127p111m79m71
+.long 0x00000000, 0x00000000, 0xffff7f80, 0x80007fff
+#two127m119m71
+.long 0x00000000, 0x00000000, 0xffffff80, 0x7f7fffff
+#two127m95m71
+.long 0x00000000, 0x00000000, 0x7fffff80, 0x7fffffff
 
-        endproc("p384_felem_mul");
-    }
+.text
 
-    {
-        #
-        # p384_felem_square
-        #
+.globl p384_felem_diff_128_64
+.type	p384_felem_diff_128_64, \@function
+.align 4
+p384_felem_diff_128_64:
+	addis   5, 2, .LConst_128_two64\@toc\@ha
+	addi    5, 5, .LConst_128_two64\@toc\@l
+
+	ld	9, 0(3)
+	ld	10, 8(3)
+	ld	8, 48(5)	# two64p48m16
+	li	7, 0
+	addc	9, 9, 8
+	li	6, 1
+	adde	10, 10, 6
+	ld	11, 0(4)
+	subfc	8, 11, 9
+	subfe	12, 7, 10
+	std	8, 0(3)		# out0
+	std	12, 8(3)
+
+	ld	9, 16(3)
+	ld	10, 24(3)
+	ld	8, 0(5)		# two64m56m8
+	addc	9, 9, 8
+	addze	10, 10
+	ld	11, 8(4)
+	subfc	11, 11, 9
+	subfe	12, 7, 10
+	std	11, 16(3)	# out1
+	std	12, 24(3)
+
+	ld	9, 32(3)
+	ld	10, 40(3)
+	ld	8, 16(5)	# two64m32m8
+	addc	9, 9, 8
+	addze	10, 10
+	ld	11, 16(4)
+	subfc	11, 11, 9
+	subfe	12, 7, 10
+	std	11, 32(3)	# out2
+	std	12, 40(3)
+
+	ld	10, 48(3)
+	ld	8, 56(3)
+	#ld	9, 32(5)	# two64m8
+	li	9, -256		# two64m8
+	addc	10, 10, 9
+	addze	8, 8
+	ld	11, 24(4)
+	subfc	11, 11, 10
+	subfe	12, 7, 8
+	std	11, 48(3)	# out3
+	std	12, 56(3)
+
+	ld	10, 64(3)
+	ld	8, 72(3)
+	addc	10, 10, 9
+	addze	8, 8
+	ld	11, 32(4)
+	subfc	11, 11, 10
+	subfe	12, 7, 8
+	std	11, 64(3)	# out4
+	std	12, 72(3)
+
+	ld	10, 80(3)
+	ld	8, 88(3)
+	addc	10, 10, 9
+	addze	8, 8
+	ld	11, 40(4)
+	subfc	11, 11, 10
+	subfe	12, 7, 8
+	std	11, 80(3)	# out5
+	std	12, 88(3)
+
+	ld	10, 96(3)
+	ld	8, 104(3)
+	addc	10, 10, 9
+	addze	9, 8
+	ld	11, 48(4)
+	subfc	11, 11, 10
+	subfe	12, 7, 9
+	std	11, 96(3)	# out6
+	std	12, 104(3)
+
+	blr
+.size	p384_felem_diff_128_64,.-p384_felem_diff_128_64
+
+.data
+.align 4
+.LConst_128_two64:
+#two64m56m8
+.long 0xffffff00, 0xfeffffff, 0x00000000, 0x00000000
+#two64m32m8
+.long 0xffffff00, 0xfffffffe, 0x00000000, 0x00000000
+#two64m8
+.long 0xffffff00, 0xffffffff, 0x00000000, 0x00000000
+#two64p48m16
+.long 0xffff0000, 0x0000ffff, 0x00000001, 0x00000000
+
+.LConst_two60:
+#two60m52m4
+.long 0xfffffff0, 0x0fefffff, 0x0, 0x0
+#two60p44m12
+.long 0xfffff000, 0x10000fff, 0x0, 0x0
+#two60m28m4
+.long 0xeffffff0, 0x0fffffff, 0x0, 0x0
+#two60m4
+.long 0xfffffff0, 0x0fffffff, 0x0, 0x0
 
-        my ($inp) = ("r4");
-        my @in = map("v$_",(44..50));
-        my @inx2 = map("v$_",(35..41));
+.text
+#
+# static void felem_diff64(felem out, const felem in)
+#
+.globl p384_felem_diff64
+.type	p384_felem_diff64, \@function
+.align 4
+p384_felem_diff64:
+	addis   5, 2, .LConst_two60\@toc\@ha
+	addi    5, 5, .LConst_two60\@toc\@l
+
+	ld	9, 0(3)
+	ld	8, 16(5)	# two60p44m12
+	li	7, 0
+	add	9, 9, 8
+	ld	11, 0(4)
+	subf	8, 11, 9
+	std	8, 0(3)		# out0
+
+	ld	9, 8(3)
+	ld	8, 0(5)		# two60m52m4
+	add	9, 9, 8
+	ld	11, 8(4)
+	subf	11, 11, 9
+	std	11, 8(3)	# out1
+
+	ld	9, 16(3)
+	ld	8, 32(5)	# two60m28m4
+	add	9, 9, 8
+	ld	11, 16(4)
+	subf	11, 11, 9
+	std	11, 16(3)	# out2
+
+	ld	10, 24(3)
+	ld	9, 48(5)	# two60m4
+	add	10, 10, 9
+	ld	12, 24(4)
+	subf	12, 12, 10
+	std	12, 24(3)	# out3
+
+	ld	10, 32(3)
+	add	10, 10, 9
+	ld	11, 32(4)
+	subf	11, 11, 10
+	std	11, 32(3)	# out4
+
+	ld	10, 40(3)
+	add	10, 10, 9
+	ld	12, 40(4)
+	subf	12, 12, 10
+	std	12, 40(3)	# out5
+
+	ld	10, 48(3)
+	add	10, 10, 9
+	ld	11, 48(4)
+	subf	11, 11, 10
+	std	11, 48(3)	# out6
+
+	blr
+.size	p384_felem_diff64,.-p384_felem_diff64
 
-        startproc("p384_felem_square");
+.text
+#
+# Shift 128 bits right <nbits>
+#
+.macro SHR o_h o_l in_h in_l nbits
+	srdi	\\o_l, \\in_l, \\nbits		# shift lower right <nbits>
+	rldimi	\\o_l, \\in_h, 64-\\nbits, 0	# insert <64-nbits> from hi
+	srdi	\\o_h, \\in_h, \\nbits		# shift higher right <nbits>
+.endm
 
-        $code.=<<___;
-    vspltisw    $vzero,0
+#
+# static void felem_reduce(felem out, const widefelem in)
+#
+.global p384_felem_reduce
+.type   p384_felem_reduce,\@function
+.align 4
+p384_felem_reduce:
+
+	stdu    1, -208(1)
+	mflr	0
+	std     14, 56(1)
+	std     15, 64(1)
+	std     16, 72(1)
+	std     17, 80(1)
+	std     18, 88(1)
+	std     19, 96(1)
+	std     20, 104(1)
+	std     21, 112(1)
+	std     22, 120(1)
+	std     23, 128(1)
+	std     24, 136(1)
+	std     25, 144(1)
+	std     26, 152(1)
+	std     27, 160(1)
+	std     28, 168(1)
+	std     29, 176(1)
+	std     30, 184(1)
+	std     31, 192(1)
+
+	bl	_p384_felem_reduce_core
+
+	mtlr	0
+	ld     14, 56(1)
+	ld     15, 64(1)
+	ld     16, 72(1)
+	ld     17, 80(1)
+	ld     18, 88(1)
+	ld     19, 96(1)
+	ld     20, 104(1)
+	ld     21, 112(1)
+	ld     22, 120(1)
+	ld     23, 128(1)
+	ld     24, 136(1)
+	ld     25, 144(1)
+	ld     26, 152(1)
+	ld     27, 160(1)
+	ld     28, 168(1)
+	ld     29, 176(1)
+	ld     30, 184(1)
+	ld     31, 192(1)
+	addi	1, 1, 208
+	blr
+.size   p384_felem_reduce,.-p384_felem_reduce
 
-___
+#
+# Felem reduction core function -
+# r3 and r4 need to pre-loaded.
+#
+.type   _p384_felem_reduce_core,\@function
+.align 4
+_p384_felem_reduce_core:
+	addis   12, 2, .LConst\@toc\@ha
+	addi    12, 12, .LConst\@toc\@l
+
+	# load constat p
+	ld	11, 8(12)	# hi - two124m68
+
+	# acc[6] = in[6] + two124m68;
+	ld	26, 96(4)	# in[6].l
+	ld	27, 96+8(4)	# in[6].h
+	add	27, 27, 11
+
+	# acc[5] = in[5] + two124m68;
+	ld	24, 80(4)	# in[5].l
+	ld	25, 80+8(4)	# in[5].h
+	add	25, 25, 11
+
+	# acc[4] = in[4] + two124m68;
+	ld	22, 64(4)	# in[4].l
+	ld	23, 64+8(4)	# in[4].h
+	add	23, 23, 11
+
+	# acc[3] = in[3] + two124m68;
+	ld	20, 48(4)	# in[3].l
+	ld	21, 48+8(4)	# in[3].h
+	add	21, 21, 11
+
+	ld	11, 48+8(12)	# hi - two124m92m68
+
+	# acc[2] = in[2] + two124m92m68;
+	ld	18, 32(4)	# in[2].l
+	ld	19, 32+8(4)	# in[2].h
+	add	19, 19, 11
+
+	ld	11, 16+8(12)	# high - two124m116m68
+
+	# acc[1] = in[1] + two124m116m68;
+	ld	16, 16(4)	# in[1].l
+	ld	17, 16+8(4)	# in[1].h
+	add	17, 17, 11
+
+	ld	11, 32+8(12)	# high - two124p108m76
+
+	# acc[0] = in[0] + two124p108m76;
+	ld	14, 0(4)	# in[0].l
+	ld	15, 0+8(4)	# in[0].h
+	add	15, 15, 11
+
+	# compute mask
+	li	7, -1
+
+	# Eliminate in[12]
+
+	# acc[8] += in[12] >> 32;
+	ld	5, 192(4)	# in[12].l
+	ld	6, 192+8(4)	# in[12].h
+	SHR 9, 10, 6, 5, 32
+	ld	30, 128(4)	# in[8].l
+	ld	31, 136(4)	# in[8].h
+	addc	30, 30, 10
+	adde	31, 31, 9
+
+	# acc[7] += (in[12] & 0xffffffff) << 24;
+	srdi	11, 7, 32	# 0xffffffff
+	and	11, 11, 5
+	sldi	11, 11, 24	# << 24
+	ld	28, 112(4)	# in[7].l
+	ld	29, 120(4)	# in[7].h
+	addc	28, 28, 11
+	addze	29, 29
+
+	# acc[7] += in[12] >> 8;
+	SHR 9, 10, 6, 5, 8
+	addc	28, 28, 10
+	adde	29, 29, 9
+
+	# acc[6] += (in[12] & 0xff) << 48;
+	andi.	11, 5, 0xff
+	sldi	11, 11, 48
+	addc	26, 26, 11
+	addze	27, 27
+
+	# acc[6] -= in[12] >> 16;
+	SHR 9, 10, 6, 5, 16
+	subfc	26, 10, 26
+	subfe	27, 9, 27
+
+	# acc[5] -= (in[12] & 0xffff) << 40;
+	srdi	11, 7, 48	# 0xffff
+	and	11, 11, 5
+	sldi	11, 11, 40	# << 40
+	li	9, 0
+	subfc	24, 11, 24
+	subfe	25, 9, 25
+
+	# acc[6] += in[12] >> 48;
+	SHR 9, 10, 6, 5, 48
+	addc	26, 26, 10
+	adde	27, 27, 9
+
+	# acc[5] += (in[12] & 0xffffffffffff) << 8;
+	srdi	11, 7, 16	# 0xffffffffffff
+	and	11, 11, 5
+	sldi	11, 11, 8	# << 8
+	addc	24, 24, 11
+	addze	25, 25
+
+	# Eliminate in[11]
+
+	# acc[7] += in[11] >> 32;
+	ld	5, 176(4)	# in[11].l
+	ld	6, 176+8(4)	# in[11].h
+	SHR 9, 10, 6, 5, 32
+	addc	28, 28, 10
+	adde	29, 29, 9
+
+	# acc[6] += (in[11] & 0xffffffff) << 24;
+	srdi	11, 7, 32	# 0xffffffff
+	and	11, 11, 5
+	sldi	11, 11, 24	# << 24
+	addc	26, 26, 11
+	addze	27, 27
+
+	# acc[6] += in[11] >> 8;
+	SHR 9, 10, 6, 5, 8
+	addc	26, 26, 10
+	adde	27, 27, 9
+
+	# acc[5] += (in[11] & 0xff) << 48;
+	andi.	11, 5, 0xff
+	sldi	11, 11, 48
+	addc	24, 24, 11
+	addze	25, 25
+
+	# acc[5] -= in[11] >> 16;
+	SHR 9, 10, 6, 5, 16
+	subfc	24, 10, 24
+	subfe	25, 9, 25
+
+	# acc[4] -= (in[11] & 0xffff) << 40;
+	srdi	11, 7, 48	# 0xffff
+	and	11, 11, 5
+	sldi	11, 11, 40	# << 40
+	li	9, 0
+	subfc	22, 11, 22
+	subfe	23, 9, 23
+
+	# acc[5] += in[11] >> 48;
+	SHR 9, 10, 6, 5, 48
+	addc	24, 24, 10
+	adde	25, 25, 9
+
+	# acc[4] += (in[11] & 0xffffffffffff) << 8;
+	srdi	11, 7, 16	# 0xffffffffffff
+	and	11, 11, 5
+	sldi	11, 11, 8	# << 8
+	addc	22, 22, 11
+	addze	23, 23
+
+	# Eliminate in[10]
+
+	# acc[6] += in[10] >> 32;
+	ld	5, 160(4)	# in[10].l
+	ld	6, 160+8(4)	# in[10].h
+	SHR 9, 10, 6, 5, 32
+	addc	26, 26, 10
+	adde	27, 27, 9
+
+	# acc[5] += (in[10] & 0xffffffff) << 24;
+	srdi	11, 7, 32	# 0xffffffff
+	and	11, 11, 5
+	sldi	11, 11, 24	# << 24
+	addc	24, 24, 11
+	addze	25, 25
+
+	# acc[5] += in[10] >> 8;
+	SHR 9, 10, 6, 5, 8
+	addc	24, 24, 10
+	adde	25, 25, 9
+
+	# acc[4] += (in[10] & 0xff) << 48;
+	andi.	11, 5, 0xff
+	sldi	11, 11, 48
+	addc	22, 22, 11
+	addze	23, 23
+
+	# acc[4] -= in[10] >> 16;
+	SHR 9, 10, 6, 5, 16
+	subfc	22, 10, 22
+	subfe	23, 9, 23
+
+	# acc[3] -= (in[10] & 0xffff) << 40;
+	srdi	11, 7, 48	# 0xffff
+	and	11, 11, 5
+	sldi	11, 11, 40	# << 40
+	li	9, 0
+	subfc	20, 11, 20
+	subfe	21, 9, 21
+
+	# acc[4] += in[10] >> 48;
+	SHR 9, 10, 6, 5, 48
+	addc	22, 22, 10
+	adde	23, 23, 9
+
+	# acc[3] += (in[10] & 0xffffffffffff) << 8;
+	srdi	11, 7, 16	# 0xffffffffffff
+	and	11, 11, 5
+	sldi	11, 11, 8	# << 8
+	addc	20, 20, 11
+	addze	21, 21
+
+	# Eliminate in[9]
+
+	# acc[5] += in[9] >> 32;
+	ld	5, 144(4)	# in[9].l
+	ld	6, 144+8(4)	# in[9].h
+	SHR 9, 10, 6, 5, 32
+	addc	24, 24, 10
+	adde	25, 25, 9
+
+	# acc[4] += (in[9] & 0xffffffff) << 24;
+	srdi	11, 7, 32	# 0xffffffff
+	and	11, 11, 5
+	sldi	11, 11, 24	# << 24
+	addc	22, 22, 11
+	addze	23, 23
+
+	# acc[4] += in[9] >> 8;
+	SHR 9, 10, 6, 5, 8
+	addc	22, 22, 10
+	adde	23, 23, 9
+
+	# acc[3] += (in[9] & 0xff) << 48;
+	andi.	11, 5, 0xff
+	sldi	11, 11, 48
+	addc	20, 20, 11
+	addze	21, 21
+
+	# acc[3] -= in[9] >> 16;
+	SHR 9, 10, 6, 5, 16
+	subfc	20, 10, 20
+	subfe	21, 9, 21
+
+	# acc[2] -= (in[9] & 0xffff) << 40;
+	srdi	11, 7, 48	# 0xffff
+	and	11, 11, 5
+	sldi	11, 11, 40	# << 40
+	li	9, 0
+	subfc	18, 11, 18
+	subfe	19, 9, 19
+
+	# acc[3] += in[9] >> 48;
+	SHR 9, 10, 6, 5, 48
+	addc	20, 20, 10
+	adde	21, 21, 9
+
+	# acc[2] += (in[9] & 0xffffffffffff) << 8;
+	srdi	11, 7, 16	# 0xffffffffffff
+	and	11, 11, 5
+	sldi	11, 11, 8	# << 8
+	addc	18, 18, 11
+	addze	19, 19
+
+	# Eliminate acc[8]
+
+	# acc[4] += acc[8] >> 32;
+	mr	5, 30		# acc[8].l
+	mr	6, 31		# acc[8].h
+	SHR 9, 10, 6, 5, 32
+	addc	22, 22, 10
+	adde	23, 23, 9
+
+	# acc[3] += (acc[8] & 0xffffffff) << 24;
+	srdi	11, 7, 32	# 0xffffffff
+	and	11, 11, 5
+	sldi	11, 11, 24	# << 24
+	addc	20, 20, 11
+	addze	21, 21
+
+	# acc[3] += acc[8] >> 8;
+	SHR 9, 10, 6, 5, 8
+	addc	20, 20, 10
+	adde	21, 21, 9
+
+	# acc[2] += (acc[8] & 0xff) << 48;
+	andi.	11, 5, 0xff
+	sldi	11, 11, 48
+	addc	18, 18, 11
+	addze	19, 19
+
+	# acc[2] -= acc[8] >> 16;
+	SHR 9, 10, 6, 5, 16
+	subfc	18, 10, 18
+	subfe	19, 9, 19
+
+	# acc[1] -= (acc[8] & 0xffff) << 40;
+	srdi	11, 7, 48	# 0xffff
+	and	11, 11, 5
+	sldi	11, 11, 40	# << 40
+	li	9, 0
+	subfc	16, 11, 16
+	subfe	17, 9, 17
+
+	#acc[2] += acc[8] >> 48;
+	SHR 9, 10, 6, 5, 48
+	addc	18, 18, 10
+	adde	19, 19, 9
+
+	# acc[1] += (acc[8] & 0xffffffffffff) << 8;
+	srdi	11, 7, 16	# 0xffffffffffff
+	and	11, 11, 5
+	sldi	11, 11, 8	# << 8
+	addc	16, 16, 11
+	addze	17, 17
+
+	# Eliminate acc[7]
+
+	# acc[3] += acc[7] >> 32;
+	mr	5, 28		# acc[7].l
+	mr	6, 29		# acc[7].h
+	SHR 9, 10, 6, 5, 32
+	addc	20, 20, 10
+	adde	21, 21, 9
+
+	# acc[2] += (acc[7] & 0xffffffff) << 24;
+	srdi	11, 7, 32	# 0xffffffff
+	and	11, 11, 5
+	sldi	11, 11, 24	# << 24
+	addc	18, 18, 11
+	addze	19, 19
+
+	# acc[2] += acc[7] >> 8;
+	SHR 9, 10, 6, 5, 8
+	addc	18, 18, 10
+	adde	19, 19, 9
+
+	# acc[1] += (acc[7] & 0xff) << 48;
+	andi.	11, 5, 0xff
+	sldi	11, 11, 48
+	addc	16, 16, 11
+	addze	17, 17
+
+	# acc[1] -= acc[7] >> 16;
+	SHR 9, 10, 6, 5, 16
+	subfc	16, 10, 16
+	subfe	17, 9, 17
+
+	# acc[0] -= (acc[7] & 0xffff) << 40;
+	srdi	11, 7, 48	# 0xffff
+	and	11, 11, 5
+	sldi	11, 11, 40	# << 40
+	li	9, 0
+	subfc	14, 11, 14
+	subfe	15, 9, 15
+
+	# acc[1] += acc[7] >> 48;
+	SHR 9, 10, 6, 5, 48
+	addc	16, 16, 10
+	adde	17, 17, 9
+
+	# acc[0] += (acc[7] & 0xffffffffffff) << 8;
+	srdi	11, 7, 16	# 0xffffffffffff
+	and	11, 11, 5
+	sldi	11, 11, 8	# << 8
+	addc	14, 14, 11
+	addze	15, 15
+
+	#
+	# Carry 4 -> 5 -> 6
+	#
+	# acc[5] += acc[4] >> 56;
+	# acc[4] &= 0x00ffffffffffffff;
+	SHR 9, 10, 23, 22, 56
+	addc	24, 24, 10
+	adde	25, 25, 9
+	srdi	11, 7, 8	# 0x00ffffffffffffff
+	and	22, 22, 11
+	li	23, 0
+
+	# acc[6] += acc[5] >> 56;
+	# acc[5] &= 0x00ffffffffffffff;
+	SHR 9, 10, 25, 24, 56
+	addc	26, 26, 10
+	adde	27, 27, 9
+	and	24, 24, 11
+	li	25, 0
+
+	# [3]: Eliminate high bits of acc[6] */
+	# temp = acc[6] >> 48;
+	# acc[6] &= 0x0000ffffffffffff;
+	SHR 31, 30, 27, 26, 48	# temp = acc[6] >> 48
+	srdi	11, 7, 16	# 0x0000ffffffffffff
+	and	26, 26, 11
+	li	27, 0
+
+	# temp < 2^80
+	# acc[3] += temp >> 40;
+	SHR 9, 10, 31, 30, 40
+	addc	20, 20, 10
+	adde	21, 21, 9
+
+	# acc[2] += (temp & 0xffffffffff) << 16;
+	srdi	11, 7, 24	# 0xffffffffff
+	and	10, 30, 11
+	sldi	10, 10, 16
+	addc	18, 18, 10
+	addze	19, 19
+
+	# acc[2] += temp >> 16;
+	SHR 9, 10, 31, 30, 16
+	addc	18, 18, 10
+	adde	19, 19, 9
+
+	# acc[1] += (temp & 0xffff) << 40;
+	srdi	11, 7, 48	# 0xffff
+	and	10, 30, 11
+	sldi	10, 10, 40
+	addc	16, 16, 10
+	addze	17, 17
+
+	# acc[1] -= temp >> 24;
+	SHR 9, 10, 31, 30, 24
+	subfc	16, 10, 16
+	subfe	17, 9, 17
+
+	# acc[0] -= (temp & 0xffffff) << 32;
+	srdi	11, 7, 40	# 0xffffff
+	and	10, 30, 11
+	sldi	10, 10, 32
+	li	9, 0
+	subfc	14, 10, 14
+	subfe	15, 9, 15
+
+	# acc[0] += temp;
+	addc	14, 14, 30
+	adde	15, 15, 31
+
+	# Carry 0 -> 1 -> 2 -> 3 -> 4 -> 5 -> 6
+	#
+	# acc[1] += acc[0] >> 56;   /* acc[1] < acc_old[1] + 2^72 */
+	SHR 9, 10, 15, 14, 56
+	addc	16, 16, 10
+	adde	17, 17, 9
+
+	# acc[0] &= 0x00ffffffffffffff;
+	srdi	11, 7, 8	# 0x00ffffffffffffff
+	and	14, 14, 11
+	li	15, 0
+
+	# acc[2] += acc[1] >> 56;   /* acc[2] < acc_old[2] + 2^72 + 2^16 */
+	SHR 9, 10, 17, 16, 56
+	addc	18, 18, 10
+	adde	19, 19, 9
+
+	# acc[1] &= 0x00ffffffffffffff;
+	and	16, 16, 11
+	li	17, 0
+
+	# acc[3] += acc[2] >> 56;   /* acc[3] < acc_old[3] + 2^72 + 2^16 */
+	SHR 9, 10, 19, 18, 56
+	addc	20, 20, 10
+	adde	21, 21, 9
+
+	# acc[2] &= 0x00ffffffffffffff;
+	and	18, 18, 11
+	li	19, 0
+
+	# acc[4] += acc[3] >> 56;
+	SHR 9, 10, 21, 20, 56
+	addc	22, 22, 10
+	adde	23, 23, 9
+
+	# acc[3] &= 0x00ffffffffffffff;
+	and	20, 20, 11
+	li	21, 0
+
+	# acc[5] += acc[4] >> 56;
+	SHR 9, 10, 23, 22, 56
+	addc	24, 24, 10
+	adde	25, 25, 9
+
+	# acc[4] &= 0x00ffffffffffffff;
+	and	22, 22, 11
+
+	# acc[6] += acc[5] >> 56;
+	SHR 9, 10, 25, 24, 56
+	addc	26, 26, 10
+	adde	27, 27, 9
+
+	# acc[5] &= 0x00ffffffffffffff;
+	and	24, 24, 11
+
+	std	14, 0(3)
+	std	16, 8(3)
+	std	18, 16(3)
+	std	20, 24(3)
+	std	22, 32(3)
+	std	24, 40(3)
+	std	26, 48(3)
+	blr
+.size   _p384_felem_reduce_core,.-_p384_felem_reduce_core
+
+.data
+.align 4
+.LConst:
+# two124m68:
+.long 0x0, 0x0, 0xfffffff0, 0xfffffff
+# two124m116m68:
+.long 0x0, 0x0, 0xfffffff0, 0xfefffff
+#two124p108m76:
+.long 0x0, 0x0, 0xfffff000, 0x10000fff
+#two124m92m68:
+.long 0x0, 0x0, 0xeffffff0, 0xfffffff
 
-        load_vrs($inp, \@in);
+.text
 
-        $code.=<<___;
-    li        $zero,0
-    li        $one,1
-    mtvsrdd        $t1,$one,$zero
-___
+#
+# void p384_felem_square_reduce(felem out, const felem in)
+#
+.global p384_felem_square_reduce
+.type   p384_felem_square_reduce,\@function
+.align 4
+p384_felem_square_reduce:
+	stdu    1, -512(1)
+	mflr	0
+	std     14, 56(1)
+	std     15, 64(1)
+	std     16, 72(1)
+	std     17, 80(1)
+	std     18, 88(1)
+	std     19, 96(1)
+	std     20, 104(1)
+	std     21, 112(1)
+	std     22, 120(1)
+	std     23, 128(1)
+	std     24, 136(1)
+	std     25, 144(1)
+	std     26, 152(1)
+	std     27, 160(1)
+	std     28, 168(1)
+	std     29, 176(1)
+	std     30, 184(1)
+	std     31, 192(1)
+
+	std	3, 496(1)
+	addi	3, 1, 208
+	bl _p384_felem_square_core
+
+	mr	4, 3
+	ld	3, 496(1)
+	bl _p384_felem_reduce_core
+
+	ld     14, 56(1)
+	ld     15, 64(1)
+	ld     16, 72(1)
+	ld     17, 80(1)
+	ld     18, 88(1)
+	ld     19, 96(1)
+	ld     20, 104(1)
+	ld     21, 112(1)
+	ld     22, 120(1)
+	ld     23, 128(1)
+	ld     24, 136(1)
+	ld     25, 144(1)
+	ld     26, 152(1)
+	ld     27, 160(1)
+	ld     28, 168(1)
+	ld     29, 176(1)
+	ld     30, 184(1)
+	ld     31, 192(1)
+	addi	1, 1, 512
+	mtlr	0
+	blr
+.size   p384_felem_square_reduce,.-p384_felem_square_reduce
 
-        for (my $i = 0; $i <= 6; $i++) {
-            $code.=<<___;
-    vsld        $inx2[$i],$in[$i],$t1
-___
-        }
-
-        $code.=<<___;
-    vmsumudm    $out,$in[0],$in[0],$vzero
-    stxv        $out,0($outp)
-
-    vmsumudm    $out,$in[0],$inx2[1],$vzero
-    stxv        $out,16($outp)
-
-    vmsumudm    $out,$in[0],$inx2[2],$vzero
-    vmsumudm    $out,$in[1],$in[1],$out
-    stxv        $out,32($outp)
-
-    xxpermdi    $t1,$in[0],$in[1],0b00
-    xxpermdi    $t2,$inx2[3],$inx2[2],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    stxv        $out,48($outp)
-
-    xxpermdi    $t4,$inx2[4],$inx2[3],0b00
-    vmsumudm    $out,$t1,$t4,$vzero
-    vmsumudm    $out,$in[2],$in[2],$out
-    stxv        $out,64($outp)
-
-    xxpermdi    $t2,$inx2[5],$inx2[4],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    vmsumudm    $out,$in[2],$inx2[3],$out
-    stxv        $out,80($outp)
-
-    xxpermdi    $t2,$inx2[6],$inx2[5],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    vmsumudm    $out,$in[2],$inx2[4],$out
-    vmsumudm    $out,$in[3],$in[3],$out
-    stxv        $out,96($outp)
-
-    xxpermdi    $t3,$in[1],$in[2],0b00
-    vmsumudm    $out,$t3,$t2,$vzero
-    vmsumudm    $out,$in[3],$inx2[4],$out
-    stxv        $out,112($outp)
-
-    xxpermdi    $t1,$in[2],$in[3],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    vmsumudm    $out,$in[4],$in[4],$out
-    stxv        $out,128($outp)
-
-    xxpermdi    $t1,$in[3],$in[4],0b00
-    vmsumudm    $out,$t1,$t2,$vzero
-    stxv        $out,144($outp)
-
-    vmsumudm    $out,$in[4],$inx2[6],$vzero
-    vmsumudm    $out,$in[5],$in[5],$out
-    stxv        $out,160($outp)
-
-    vmsumudm    $out,$in[5],$inx2[6],$vzero
-    stxv        $out,176($outp)
-
-    vmsumudm    $out,$in[6],$in[6],$vzero
-    stxv        $out,192($outp)
+#
+# void p384_felem_mul_reduce(felem out, const felem in1, const felem in2)
+#
+.global p384_felem_mul_reduce
+.type   p384_felem_mul_reduce,\@function
+.align 5
+p384_felem_mul_reduce:
+	stdu    1, -512(1)
+	mflr	0
+	std     14, 56(1)
+	std     15, 64(1)
+	std     16, 72(1)
+	std     17, 80(1)
+	std     18, 88(1)
+	std     19, 96(1)
+	std     20, 104(1)
+	std     21, 112(1)
+	std     22, 120(1)
+	std     23, 128(1)
+	std     24, 136(1)
+	std     25, 144(1)
+	std     26, 152(1)
+	std     27, 160(1)
+	std     28, 168(1)
+	std     29, 176(1)
+	std     30, 184(1)
+	std     31, 192(1)
+
+	std	3, 496(1)
+	addi	3, 1, 208
+	bl _p384_felem_mul_core
+
+	mr	4, 3
+	ld	3, 496(1)
+	bl _p384_felem_reduce_core
+
+	ld     14, 56(1)
+	ld     15, 64(1)
+	ld     16, 72(1)
+	ld     17, 80(1)
+	ld     18, 88(1)
+	ld     19, 96(1)
+	ld     20, 104(1)
+	ld     21, 112(1)
+	ld     22, 120(1)
+	ld     23, 128(1)
+	ld     24, 136(1)
+	ld     25, 144(1)
+	ld     26, 152(1)
+	ld     27, 160(1)
+	ld     28, 168(1)
+	ld     29, 176(1)
+	ld     30, 184(1)
+	ld     31, 192(1)
+	addi	1, 1, 512
+	mtlr	0
+	blr
+.size   p384_felem_mul_reduce,.-p384_felem_mul_reduce
 ___
 
-        endproc("p384_felem_square");
-    }
-}
-
 $code =~ s/\`([^\`]*)\`/eval $1/gem;
 print $code;
 close STDOUT or die "error closing STDOUT: $!";
diff --git a/crypto/ec/curve25519.c b/crypto/ec/curve25519.c
index 68c06ae624f16..c6886763aba7e 100644
--- a/crypto/ec/curve25519.c
+++ b/crypto/ec/curve25519.c
@@ -21,10 +21,9 @@
 
 #include "internal/numbers.h"
 
-#if defined(X25519_ASM) && (defined(__x86_64) || defined(__x86_64__) || \
-                            defined(_M_AMD64) || defined(_M_X64))
+#if defined(X25519_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
 
-# define BASE_2_64_IMPLEMENTED
+#define BASE_2_64_IMPLEMENTED
 
 typedef uint64_t fe64[4];
 
@@ -45,12 +44,12 @@ void x25519_fe64_mul121666(fe64 h, fe64 f);
 void x25519_fe64_add(fe64 h, const fe64 f, const fe64 g);
 void x25519_fe64_sub(fe64 h, const fe64 f, const fe64 g);
 void x25519_fe64_tobytes(uint8_t *s, const fe64 f);
-# define fe64_mul x25519_fe64_mul
-# define fe64_sqr x25519_fe64_sqr
-# define fe64_mul121666 x25519_fe64_mul121666
-# define fe64_add x25519_fe64_add
-# define fe64_sub x25519_fe64_sub
-# define fe64_tobytes x25519_fe64_tobytes
+#define fe64_mul x25519_fe64_mul
+#define fe64_sqr x25519_fe64_sqr
+#define fe64_mul121666 x25519_fe64_mul121666
+#define fe64_add x25519_fe64_add
+#define fe64_sub x25519_fe64_sub
+#define fe64_tobytes x25519_fe64_tobytes
 
 static uint64_t load_8(const uint8_t *in)
 {
@@ -209,7 +208,7 @@ static void fe64_invert(fe64 out, const fe64 z)
  * fe64_* subroutines.
  */
 static void x25519_scalar_mulx(uint8_t out[32], const uint8_t scalar[32],
-                               const uint8_t point[32])
+    const uint8_t point[32])
 {
     fe64 x1, x2, z2, x3, z3, tmp0, tmp1;
     uint8_t e[32];
@@ -217,7 +216,7 @@ static void x25519_scalar_mulx(uint8_t out[32], const uint8_t scalar[32],
     int pos;
 
     memcpy(e, scalar, 32);
-    e[0]  &= 0xf8;
+    e[0] &= 0xf8;
     e[31] &= 0x7f;
     e[31] |= 0x40;
     fe64_frombytes(x1, point);
@@ -261,18 +260,18 @@ static void x25519_scalar_mulx(uint8_t out[32], const uint8_t scalar[32],
 }
 #endif
 
-#if defined(X25519_ASM) \
-    || ( defined(INT128_MAX) \
-         && !defined(__sparc__) \
-         && (!defined(__SIZEOF_LONG__) || (__SIZEOF_LONG__ == 8)) \
-         && !(defined(__ANDROID__) && !defined(__clang__)) )
+#if defined(X25519_ASM)                                          \
+    || (defined(INT128_MAX)                                      \
+        && !defined(__sparc__)                                   \
+        && (!defined(__SIZEOF_LONG__) || (__SIZEOF_LONG__ == 8)) \
+        && !(defined(__ANDROID__) && !defined(__clang__)))
 /*
  * Base 2^51 implementation. It's virtually no different from reference
  * base 2^25.5 implementation in respect to lax boundary conditions for
  * intermediate values and even individual limbs. So that whatever you
  * know about the reference, applies even here...
  */
-# define BASE_2_51_IMPLEMENTED
+#define BASE_2_51_IMPLEMENTED
 
 typedef uint64_t fe51[5];
 
@@ -309,16 +308,20 @@ static uint64_t load_6(const uint8_t *in)
 
 static void fe51_frombytes(fe51 h, const uint8_t *s)
 {
-    uint64_t h0 = load_7(s);                                /* 56 bits */
-    uint64_t h1 = load_6(s + 7) << 5;                       /* 53 bits */
-    uint64_t h2 = load_7(s + 13) << 2;                      /* 58 bits */
-    uint64_t h3 = load_6(s + 20) << 7;                      /* 55 bits */
-    uint64_t h4 = (load_6(s + 26) & 0x7fffffffffff) << 4;   /* 51 bits */
-
-    h1 |= h0 >> 51; h0 &= MASK51;
-    h2 |= h1 >> 51; h1 &= MASK51;
-    h3 |= h2 >> 51; h2 &= MASK51;
-    h4 |= h3 >> 51; h3 &= MASK51;
+    uint64_t h0 = load_7(s); /* 56 bits */
+    uint64_t h1 = load_6(s + 7) << 5; /* 53 bits */
+    uint64_t h2 = load_7(s + 13) << 2; /* 58 bits */
+    uint64_t h3 = load_6(s + 20) << 7; /* 55 bits */
+    uint64_t h4 = (load_6(s + 26) & 0x7fffffffffff) << 4; /* 51 bits */
+
+    h1 |= h0 >> 51;
+    h0 &= MASK51;
+    h2 |= h1 >> 51;
+    h1 &= MASK51;
+    h3 |= h2 >> 51;
+    h2 &= MASK51;
+    h4 |= h3 >> 51;
+    h3 &= MASK51;
 
     h[0] = h0;
     h[1] = h1;
@@ -345,11 +348,15 @@ static void fe51_tobytes(uint8_t *s, const fe51 h)
 
     /* full reduce */
     h0 += 19 * q;
-    h1 += h0 >> 51; h0 &= MASK51;
-    h2 += h1 >> 51; h1 &= MASK51;
-    h3 += h2 >> 51; h2 &= MASK51;
-    h4 += h3 >> 51; h3 &= MASK51;
-                    h4 &= MASK51;
+    h1 += h0 >> 51;
+    h0 &= MASK51;
+    h2 += h1 >> 51;
+    h1 &= MASK51;
+    h3 += h2 >> 51;
+    h2 &= MASK51;
+    h4 += h3 >> 51;
+    h3 &= MASK51;
+    h4 &= MASK51;
 
     /* smash */
     s[0] = (uint8_t)(h0 >> 0);
@@ -386,14 +393,14 @@ static void fe51_tobytes(uint8_t *s, const fe51 h)
     s[31] = (uint8_t)(h4 >> 44);
 }
 
-# if defined(X25519_ASM)
+#if defined(X25519_ASM)
 void x25519_fe51_mul(fe51 h, const fe51 f, const fe51 g);
 void x25519_fe51_sqr(fe51 h, const fe51 f);
 void x25519_fe51_mul121666(fe51 h, fe51 f);
-#  define fe51_mul x25519_fe51_mul
-#  define fe51_sq  x25519_fe51_sqr
-#  define fe51_mul121666 x25519_fe51_mul121666
-# else
+#define fe51_mul x25519_fe51_mul
+#define fe51_sq x25519_fe51_sqr
+#define fe51_mul121666 x25519_fe51_mul121666
+#else
 
 typedef uint128_t u128;
 
@@ -438,15 +445,22 @@ static void fe51_mul(fe51 h, const fe51 f, const fe51 g)
     h4 += (u128)f_i * g0;
 
     /* partial [lazy] reduction */
-    h3 += (uint64_t)(h2 >> 51); g2 = (uint64_t)h2 & MASK51;
-    h1 += (uint64_t)(h0 >> 51); g0 = (uint64_t)h0 & MASK51;
-
-    h4 += (uint64_t)(h3 >> 51); g3 = (uint64_t)h3 & MASK51;
-    g2 += (uint64_t)(h1 >> 51); g1 = (uint64_t)h1 & MASK51;
-
-    g0 += (uint64_t)(h4 >> 51) * 19; g4 = (uint64_t)h4 & MASK51;
-    g3 += g2 >> 51; g2 &= MASK51;
-    g1 += g0 >> 51; g0 &= MASK51;
+    h3 += (uint64_t)(h2 >> 51);
+    g2 = (uint64_t)h2 & MASK51;
+    h1 += (uint64_t)(h0 >> 51);
+    g0 = (uint64_t)h0 & MASK51;
+
+    h4 += (uint64_t)(h3 >> 51);
+    g3 = (uint64_t)h3 & MASK51;
+    g2 += (uint64_t)(h1 >> 51);
+    g1 = (uint64_t)h1 & MASK51;
+
+    g0 += (uint64_t)(h4 >> 51) * 19;
+    g4 = (uint64_t)h4 & MASK51;
+    g3 += g2 >> 51;
+    g2 &= MASK51;
+    g1 += g0 >> 51;
+    g0 &= MASK51;
 
     h[0] = g0;
     h[1] = g1;
@@ -457,9 +471,9 @@ static void fe51_mul(fe51 h, const fe51 f, const fe51 g)
 
 static void fe51_sq(fe51 h, const fe51 f)
 {
-#  if defined(OPENSSL_SMALL_FOOTPRINT)
+#if defined(OPENSSL_SMALL_FOOTPRINT)
     fe51_mul(h, f, f);
-#  else
+#else
     /* dedicated squaring gives 16-25% overall improvement */
     uint64_t g0 = f[0];
     uint64_t g1 = f[1];
@@ -468,45 +482,55 @@ static void fe51_sq(fe51 h, const fe51 f)
     uint64_t g4 = f[4];
     u128 h0, h1, h2, h3, h4;
 
-    h0 = (u128)g0 * g0;     g0 *= 2;
+    h0 = (u128)g0 * g0;
+    g0 *= 2;
     h1 = (u128)g0 * g1;
     h2 = (u128)g0 * g2;
     h3 = (u128)g0 * g3;
     h4 = (u128)g0 * g4;
 
-    g0 = g4;                /* borrow g0 */
+    g0 = g4; /* borrow g0 */
     h3 += (u128)g0 * (g4 *= 19);
 
-    h2 += (u128)g1 * g1;    g1 *= 2;
+    h2 += (u128)g1 * g1;
+    g1 *= 2;
     h3 += (u128)g1 * g2;
     h4 += (u128)g1 * g3;
     h0 += (u128)g1 * g4;
 
-    g0 = g3;                /* borrow g0 */
+    g0 = g3; /* borrow g0 */
     h1 += (u128)g0 * (g3 *= 19);
     h2 += (u128)(g0 * 2) * g4;
 
-    h4 += (u128)g2 * g2;    g2 *= 2;
+    h4 += (u128)g2 * g2;
+    g2 *= 2;
     h0 += (u128)g2 * g3;
     h1 += (u128)g2 * g4;
 
     /* partial [lazy] reduction */
-    h3 += (uint64_t)(h2 >> 51); g2 = (uint64_t)h2 & MASK51;
-    h1 += (uint64_t)(h0 >> 51); g0 = (uint64_t)h0 & MASK51;
-
-    h4 += (uint64_t)(h3 >> 51); g3 = (uint64_t)h3 & MASK51;
-    g2 += (uint64_t)(h1 >> 51); g1 = (uint64_t)h1 & MASK51;
-
-    g0 += (uint64_t)(h4 >> 51) * 19; g4 = (uint64_t)h4 & MASK51;
-    g3 += g2 >> 51; g2 &= MASK51;
-    g1 += g0 >> 51; g0 &= MASK51;
+    h3 += (uint64_t)(h2 >> 51);
+    g2 = (uint64_t)h2 & MASK51;
+    h1 += (uint64_t)(h0 >> 51);
+    g0 = (uint64_t)h0 & MASK51;
+
+    h4 += (uint64_t)(h3 >> 51);
+    g3 = (uint64_t)h3 & MASK51;
+    g2 += (uint64_t)(h1 >> 51);
+    g1 = (uint64_t)h1 & MASK51;
+
+    g0 += (uint64_t)(h4 >> 51) * 19;
+    g4 = (uint64_t)h4 & MASK51;
+    g3 += g2 >> 51;
+    g2 &= MASK51;
+    g1 += g0 >> 51;
+    g0 &= MASK51;
 
     h[0] = g0;
     h[1] = g1;
     h[2] = g2;
     h[3] = g3;
     h[4] = g4;
-#  endif
+#endif
 }
 
 static void fe51_mul121666(fe51 h, fe51 f)
@@ -518,15 +542,22 @@ static void fe51_mul121666(fe51 h, fe51 f)
     u128 h4 = f[4] * (u128)121666;
     uint64_t g0, g1, g2, g3, g4;
 
-    h3 += (uint64_t)(h2 >> 51); g2 = (uint64_t)h2 & MASK51;
-    h1 += (uint64_t)(h0 >> 51); g0 = (uint64_t)h0 & MASK51;
+    h3 += (uint64_t)(h2 >> 51);
+    g2 = (uint64_t)h2 & MASK51;
+    h1 += (uint64_t)(h0 >> 51);
+    g0 = (uint64_t)h0 & MASK51;
 
-    h4 += (uint64_t)(h3 >> 51); g3 = (uint64_t)h3 & MASK51;
-    g2 += (uint64_t)(h1 >> 51); g1 = (uint64_t)h1 & MASK51;
+    h4 += (uint64_t)(h3 >> 51);
+    g3 = (uint64_t)h3 & MASK51;
+    g2 += (uint64_t)(h1 >> 51);
+    g1 = (uint64_t)h1 & MASK51;
 
-    g0 += (uint64_t)(h4 >> 51) * 19; g4 = (uint64_t)h4 & MASK51;
-    g3 += g2 >> 51; g2 &= MASK51;
-    g1 += g0 >> 51; g0 &= MASK51;
+    g0 += (uint64_t)(h4 >> 51) * 19;
+    g4 = (uint64_t)h4 & MASK51;
+    g3 += g2 >> 51;
+    g2 &= MASK51;
+    g1 += g0 >> 51;
+    g0 &= MASK51;
 
     h[0] = g0;
     h[1] = g1;
@@ -534,7 +565,7 @@ static void fe51_mul121666(fe51 h, fe51 f)
     h[3] = g3;
     h[4] = g4;
 }
-# endif
+#endif
 
 static void fe51_add(fe51 h, const fe51 f, const fe51 g)
 {
@@ -694,22 +725,22 @@ static void fe51_invert(fe51 out, const fe51 z)
  * fe51_* subroutines.
  */
 static void x25519_scalar_mult(uint8_t out[32], const uint8_t scalar[32],
-                               const uint8_t point[32])
+    const uint8_t point[32])
 {
     fe51 x1, x2, z2, x3, z3, tmp0, tmp1;
     uint8_t e[32];
     unsigned swap = 0;
     int pos;
 
-# ifdef BASE_2_64_IMPLEMENTED
+#ifdef BASE_2_64_IMPLEMENTED
     if (x25519_fe64_eligible()) {
         x25519_scalar_mulx(out, scalar, point);
         return;
     }
-# endif
+#endif
 
     memcpy(e, scalar, 32);
-    e[0]  &= 0xf8;
+    e[0] &= 0xf8;
     e[31] &= 0x7f;
     e[31] |= 0x40;
     fe51_frombytes(x1, point);
@@ -770,7 +801,7 @@ static void x25519_scalar_mult(uint8_t out[32], const uint8_t scalar[32],
  */
 typedef int32_t fe[10];
 
-static const int64_t kBottom21Bits =  0x1fffffLL;
+static const int64_t kBottom21Bits = 0x1fffffLL;
 static const int64_t kBottom25Bits = 0x1ffffffLL;
 static const int64_t kBottom26Bits = 0x3ffffffLL;
 static const int64_t kTop39Bits = 0xfffffffffe000000LL;
@@ -780,7 +811,7 @@ static uint64_t load_3(const uint8_t *in)
 {
     uint64_t result;
 
-    result  = ((uint64_t)in[0]);
+    result = ((uint64_t)in[0]);
     result |= ((uint64_t)in[1]) << 8;
     result |= ((uint64_t)in[2]) << 16;
     return result;
@@ -790,7 +821,7 @@ static uint64_t load_4(const uint8_t *in)
 {
     uint64_t result;
 
-    result  = ((uint64_t)in[0]);
+    result = ((uint64_t)in[0]);
     result |= ((uint64_t)in[1]) << 8;
     result |= ((uint64_t)in[2]) << 16;
     result |= ((uint64_t)in[3]) << 24;
@@ -800,15 +831,15 @@ static uint64_t load_4(const uint8_t *in)
 static void fe_frombytes(fe h, const uint8_t *s)
 {
     /* Ignores top bit of h. */
-    int64_t h0 =  load_4(s);
-    int64_t h1 =  load_3(s +  4) << 6;
-    int64_t h2 =  load_3(s +  7) << 5;
-    int64_t h3 =  load_3(s + 10) << 3;
-    int64_t h4 =  load_3(s + 13) << 2;
-    int64_t h5 =  load_4(s + 16);
-    int64_t h6 =  load_3(s + 20) << 7;
-    int64_t h7 =  load_3(s + 23) << 5;
-    int64_t h8 =  load_3(s + 26) << 4;
+    int64_t h0 = load_4(s);
+    int64_t h1 = load_3(s + 4) << 6;
+    int64_t h2 = load_3(s + 7) << 5;
+    int64_t h3 = load_3(s + 10) << 3;
+    int64_t h4 = load_3(s + 13) << 2;
+    int64_t h5 = load_4(s + 16);
+    int64_t h6 = load_3(s + 20) << 7;
+    int64_t h7 = load_3(s + 23) << 5;
+    int64_t h8 = load_3(s + 26) << 4;
     int64_t h9 = (load_3(s + 29) & 0x7fffff) << 2;
     int64_t carry0;
     int64_t carry1;
@@ -821,17 +852,37 @@ static void fe_frombytes(fe h, const uint8_t *s)
     int64_t carry8;
     int64_t carry9;
 
-    carry9 = h9 + (1 << 24); h0 += (carry9 >> 25) * 19; h9 -= carry9 & kTop39Bits;
-    carry1 = h1 + (1 << 24); h2 += carry1 >> 25; h1 -= carry1 & kTop39Bits;
-    carry3 = h3 + (1 << 24); h4 += carry3 >> 25; h3 -= carry3 & kTop39Bits;
-    carry5 = h5 + (1 << 24); h6 += carry5 >> 25; h5 -= carry5 & kTop39Bits;
-    carry7 = h7 + (1 << 24); h8 += carry7 >> 25; h7 -= carry7 & kTop39Bits;
-
-    carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
-    carry2 = h2 + (1 << 25); h3 += carry2 >> 26; h2 -= carry2 & kTop38Bits;
-    carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
-    carry6 = h6 + (1 << 25); h7 += carry6 >> 26; h6 -= carry6 & kTop38Bits;
-    carry8 = h8 + (1 << 25); h9 += carry8 >> 26; h8 -= carry8 & kTop38Bits;
+    carry9 = h9 + (1 << 24);
+    h0 += (carry9 >> 25) * 19;
+    h9 -= carry9 & kTop39Bits;
+    carry1 = h1 + (1 << 24);
+    h2 += carry1 >> 25;
+    h1 -= carry1 & kTop39Bits;
+    carry3 = h3 + (1 << 24);
+    h4 += carry3 >> 25;
+    h3 -= carry3 & kTop39Bits;
+    carry5 = h5 + (1 << 24);
+    h6 += carry5 >> 25;
+    h5 -= carry5 & kTop39Bits;
+    carry7 = h7 + (1 << 24);
+    h8 += carry7 >> 25;
+    h7 -= carry7 & kTop39Bits;
+
+    carry0 = h0 + (1 << 25);
+    h1 += carry0 >> 26;
+    h0 -= carry0 & kTop38Bits;
+    carry2 = h2 + (1 << 25);
+    h3 += carry2 >> 26;
+    h2 -= carry2 & kTop38Bits;
+    carry4 = h4 + (1 << 25);
+    h5 += carry4 >> 26;
+    h4 -= carry4 & kTop38Bits;
+    carry6 = h6 + (1 << 25);
+    h7 += carry6 >> 26;
+    h6 -= carry6 & kTop38Bits;
+    carry8 = h8 + (1 << 25);
+    h9 += carry8 >> 26;
+    h8 -= carry8 & kTop38Bits;
 
     h[0] = (int32_t)h0;
     h[1] = (int32_t)h1;
@@ -883,7 +934,7 @@ static void fe_tobytes(uint8_t *s, const fe h)
     int32_t h9 = h[9];
     int32_t q;
 
-    q = (19 * h9 + (((int32_t) 1) << 24)) >> 25;
+    q = (19 * h9 + (((int32_t)1) << 24)) >> 25;
     q = (h0 + q) >> 26;
     q = (h1 + q) >> 25;
     q = (h2 + q) >> 26;
@@ -899,16 +950,25 @@ static void fe_tobytes(uint8_t *s, const fe h)
     h0 += 19 * q;
     /* Goal: Output h-2^255 q, which is between 0 and 2^255-20. */
 
-    h1 += h0 >> 26; h0 &= kBottom26Bits;
-    h2 += h1 >> 25; h1 &= kBottom25Bits;
-    h3 += h2 >> 26; h2 &= kBottom26Bits;
-    h4 += h3 >> 25; h3 &= kBottom25Bits;
-    h5 += h4 >> 26; h4 &= kBottom26Bits;
-    h6 += h5 >> 25; h5 &= kBottom25Bits;
-    h7 += h6 >> 26; h6 &= kBottom26Bits;
-    h8 += h7 >> 25; h7 &= kBottom25Bits;
-    h9 += h8 >> 26; h8 &= kBottom26Bits;
-                    h9 &= kBottom25Bits;
+    h1 += h0 >> 26;
+    h0 &= kBottom26Bits;
+    h2 += h1 >> 25;
+    h1 &= kBottom25Bits;
+    h3 += h2 >> 26;
+    h2 &= kBottom26Bits;
+    h4 += h3 >> 25;
+    h3 &= kBottom25Bits;
+    h5 += h4 >> 26;
+    h4 &= kBottom26Bits;
+    h6 += h5 >> 25;
+    h5 &= kBottom25Bits;
+    h7 += h6 >> 26;
+    h6 &= kBottom26Bits;
+    h8 += h7 >> 25;
+    h7 &= kBottom25Bits;
+    h9 += h8 >> 26;
+    h8 &= kBottom26Bits;
+    h9 &= kBottom25Bits;
     /* h10 = carry9 */
 
     /*
@@ -917,38 +977,38 @@ static void fe_tobytes(uint8_t *s, const fe h)
      * evidently 2^255 h10-2^255 q = 0.
      * Goal: Output h0+...+2^230 h9.
      */
-    s[ 0] = (uint8_t) (h0 >>  0);
-    s[ 1] = (uint8_t) (h0 >>  8);
-    s[ 2] = (uint8_t) (h0 >> 16);
-    s[ 3] = (uint8_t)((h0 >> 24) | ((uint32_t)(h1) << 2));
-    s[ 4] = (uint8_t) (h1 >>  6);
-    s[ 5] = (uint8_t) (h1 >> 14);
-    s[ 6] = (uint8_t)((h1 >> 22) | ((uint32_t)(h2) << 3));
-    s[ 7] = (uint8_t) (h2 >>  5);
-    s[ 8] = (uint8_t) (h2 >> 13);
-    s[ 9] = (uint8_t)((h2 >> 21) | ((uint32_t)(h3) << 5));
-    s[10] = (uint8_t) (h3 >>  3);
-    s[11] = (uint8_t) (h3 >> 11);
+    s[0] = (uint8_t)(h0 >> 0);
+    s[1] = (uint8_t)(h0 >> 8);
+    s[2] = (uint8_t)(h0 >> 16);
+    s[3] = (uint8_t)((h0 >> 24) | ((uint32_t)(h1) << 2));
+    s[4] = (uint8_t)(h1 >> 6);
+    s[5] = (uint8_t)(h1 >> 14);
+    s[6] = (uint8_t)((h1 >> 22) | ((uint32_t)(h2) << 3));
+    s[7] = (uint8_t)(h2 >> 5);
+    s[8] = (uint8_t)(h2 >> 13);
+    s[9] = (uint8_t)((h2 >> 21) | ((uint32_t)(h3) << 5));
+    s[10] = (uint8_t)(h3 >> 3);
+    s[11] = (uint8_t)(h3 >> 11);
     s[12] = (uint8_t)((h3 >> 19) | ((uint32_t)(h4) << 6));
-    s[13] = (uint8_t) (h4 >>  2);
-    s[14] = (uint8_t) (h4 >> 10);
-    s[15] = (uint8_t) (h4 >> 18);
-    s[16] = (uint8_t) (h5 >>  0);
-    s[17] = (uint8_t) (h5 >>  8);
-    s[18] = (uint8_t) (h5 >> 16);
+    s[13] = (uint8_t)(h4 >> 2);
+    s[14] = (uint8_t)(h4 >> 10);
+    s[15] = (uint8_t)(h4 >> 18);
+    s[16] = (uint8_t)(h5 >> 0);
+    s[17] = (uint8_t)(h5 >> 8);
+    s[18] = (uint8_t)(h5 >> 16);
     s[19] = (uint8_t)((h5 >> 24) | ((uint32_t)(h6) << 1));
-    s[20] = (uint8_t) (h6 >>  7);
-    s[21] = (uint8_t) (h6 >> 15);
+    s[20] = (uint8_t)(h6 >> 7);
+    s[21] = (uint8_t)(h6 >> 15);
     s[22] = (uint8_t)((h6 >> 23) | ((uint32_t)(h7) << 3));
-    s[23] = (uint8_t) (h7 >>  5);
-    s[24] = (uint8_t) (h7 >> 13);
+    s[23] = (uint8_t)(h7 >> 5);
+    s[24] = (uint8_t)(h7 >> 13);
     s[25] = (uint8_t)((h7 >> 21) | ((uint32_t)(h8) << 4));
-    s[26] = (uint8_t) (h8 >>  4);
-    s[27] = (uint8_t) (h8 >> 12);
+    s[26] = (uint8_t)(h8 >> 4);
+    s[27] = (uint8_t)(h8 >> 12);
     s[28] = (uint8_t)((h8 >> 20) | ((uint32_t)(h9) << 6));
-    s[29] = (uint8_t) (h9 >>  2);
-    s[30] = (uint8_t) (h9 >> 10);
-    s[31] = (uint8_t) (h9 >> 18);
+    s[29] = (uint8_t)(h9 >> 2);
+    s[30] = (uint8_t)(h9 >> 10);
+    s[31] = (uint8_t)(h9 >> 18);
 }
 
 /* h = f */
@@ -1078,116 +1138,116 @@ static void fe_mul(fe h, const fe f, const fe g)
     int32_t f5_2 = 2 * f5;
     int32_t f7_2 = 2 * f7;
     int32_t f9_2 = 2 * f9;
-    int64_t f0g0    = f0   * (int64_t) g0;
-    int64_t f0g1    = f0   * (int64_t) g1;
-    int64_t f0g2    = f0   * (int64_t) g2;
-    int64_t f0g3    = f0   * (int64_t) g3;
-    int64_t f0g4    = f0   * (int64_t) g4;
-    int64_t f0g5    = f0   * (int64_t) g5;
-    int64_t f0g6    = f0   * (int64_t) g6;
-    int64_t f0g7    = f0   * (int64_t) g7;
-    int64_t f0g8    = f0   * (int64_t) g8;
-    int64_t f0g9    = f0   * (int64_t) g9;
-    int64_t f1g0    = f1   * (int64_t) g0;
-    int64_t f1g1_2  = f1_2 * (int64_t) g1;
-    int64_t f1g2    = f1   * (int64_t) g2;
-    int64_t f1g3_2  = f1_2 * (int64_t) g3;
-    int64_t f1g4    = f1   * (int64_t) g4;
-    int64_t f1g5_2  = f1_2 * (int64_t) g5;
-    int64_t f1g6    = f1   * (int64_t) g6;
-    int64_t f1g7_2  = f1_2 * (int64_t) g7;
-    int64_t f1g8    = f1   * (int64_t) g8;
-    int64_t f1g9_38 = f1_2 * (int64_t) g9_19;
-    int64_t f2g0    = f2   * (int64_t) g0;
-    int64_t f2g1    = f2   * (int64_t) g1;
-    int64_t f2g2    = f2   * (int64_t) g2;
-    int64_t f2g3    = f2   * (int64_t) g3;
-    int64_t f2g4    = f2   * (int64_t) g4;
-    int64_t f2g5    = f2   * (int64_t) g5;
-    int64_t f2g6    = f2   * (int64_t) g6;
-    int64_t f2g7    = f2   * (int64_t) g7;
-    int64_t f2g8_19 = f2   * (int64_t) g8_19;
-    int64_t f2g9_19 = f2   * (int64_t) g9_19;
-    int64_t f3g0    = f3   * (int64_t) g0;
-    int64_t f3g1_2  = f3_2 * (int64_t) g1;
-    int64_t f3g2    = f3   * (int64_t) g2;
-    int64_t f3g3_2  = f3_2 * (int64_t) g3;
-    int64_t f3g4    = f3   * (int64_t) g4;
-    int64_t f3g5_2  = f3_2 * (int64_t) g5;
-    int64_t f3g6    = f3   * (int64_t) g6;
-    int64_t f3g7_38 = f3_2 * (int64_t) g7_19;
-    int64_t f3g8_19 = f3   * (int64_t) g8_19;
-    int64_t f3g9_38 = f3_2 * (int64_t) g9_19;
-    int64_t f4g0    = f4   * (int64_t) g0;
-    int64_t f4g1    = f4   * (int64_t) g1;
-    int64_t f4g2    = f4   * (int64_t) g2;
-    int64_t f4g3    = f4   * (int64_t) g3;
-    int64_t f4g4    = f4   * (int64_t) g4;
-    int64_t f4g5    = f4   * (int64_t) g5;
-    int64_t f4g6_19 = f4   * (int64_t) g6_19;
-    int64_t f4g7_19 = f4   * (int64_t) g7_19;
-    int64_t f4g8_19 = f4   * (int64_t) g8_19;
-    int64_t f4g9_19 = f4   * (int64_t) g9_19;
-    int64_t f5g0    = f5   * (int64_t) g0;
-    int64_t f5g1_2  = f5_2 * (int64_t) g1;
-    int64_t f5g2    = f5   * (int64_t) g2;
-    int64_t f5g3_2  = f5_2 * (int64_t) g3;
-    int64_t f5g4    = f5   * (int64_t) g4;
-    int64_t f5g5_38 = f5_2 * (int64_t) g5_19;
-    int64_t f5g6_19 = f5   * (int64_t) g6_19;
-    int64_t f5g7_38 = f5_2 * (int64_t) g7_19;
-    int64_t f5g8_19 = f5   * (int64_t) g8_19;
-    int64_t f5g9_38 = f5_2 * (int64_t) g9_19;
-    int64_t f6g0    = f6   * (int64_t) g0;
-    int64_t f6g1    = f6   * (int64_t) g1;
-    int64_t f6g2    = f6   * (int64_t) g2;
-    int64_t f6g3    = f6   * (int64_t) g3;
-    int64_t f6g4_19 = f6   * (int64_t) g4_19;
-    int64_t f6g5_19 = f6   * (int64_t) g5_19;
-    int64_t f6g6_19 = f6   * (int64_t) g6_19;
-    int64_t f6g7_19 = f6   * (int64_t) g7_19;
-    int64_t f6g8_19 = f6   * (int64_t) g8_19;
-    int64_t f6g9_19 = f6   * (int64_t) g9_19;
-    int64_t f7g0    = f7   * (int64_t) g0;
-    int64_t f7g1_2  = f7_2 * (int64_t) g1;
-    int64_t f7g2    = f7   * (int64_t) g2;
-    int64_t f7g3_38 = f7_2 * (int64_t) g3_19;
-    int64_t f7g4_19 = f7   * (int64_t) g4_19;
-    int64_t f7g5_38 = f7_2 * (int64_t) g5_19;
-    int64_t f7g6_19 = f7   * (int64_t) g6_19;
-    int64_t f7g7_38 = f7_2 * (int64_t) g7_19;
-    int64_t f7g8_19 = f7   * (int64_t) g8_19;
-    int64_t f7g9_38 = f7_2 * (int64_t) g9_19;
-    int64_t f8g0    = f8   * (int64_t) g0;
-    int64_t f8g1    = f8   * (int64_t) g1;
-    int64_t f8g2_19 = f8   * (int64_t) g2_19;
-    int64_t f8g3_19 = f8   * (int64_t) g3_19;
-    int64_t f8g4_19 = f8   * (int64_t) g4_19;
-    int64_t f8g5_19 = f8   * (int64_t) g5_19;
-    int64_t f8g6_19 = f8   * (int64_t) g6_19;
-    int64_t f8g7_19 = f8   * (int64_t) g7_19;
-    int64_t f8g8_19 = f8   * (int64_t) g8_19;
-    int64_t f8g9_19 = f8   * (int64_t) g9_19;
-    int64_t f9g0    = f9   * (int64_t) g0;
-    int64_t f9g1_38 = f9_2 * (int64_t) g1_19;
-    int64_t f9g2_19 = f9   * (int64_t) g2_19;
-    int64_t f9g3_38 = f9_2 * (int64_t) g3_19;
-    int64_t f9g4_19 = f9   * (int64_t) g4_19;
-    int64_t f9g5_38 = f9_2 * (int64_t) g5_19;
-    int64_t f9g6_19 = f9   * (int64_t) g6_19;
-    int64_t f9g7_38 = f9_2 * (int64_t) g7_19;
-    int64_t f9g8_19 = f9   * (int64_t) g8_19;
-    int64_t f9g9_38 = f9_2 * (int64_t) g9_19;
+    int64_t f0g0 = f0 * (int64_t)g0;
+    int64_t f0g1 = f0 * (int64_t)g1;
+    int64_t f0g2 = f0 * (int64_t)g2;
+    int64_t f0g3 = f0 * (int64_t)g3;
+    int64_t f0g4 = f0 * (int64_t)g4;
+    int64_t f0g5 = f0 * (int64_t)g5;
+    int64_t f0g6 = f0 * (int64_t)g6;
+    int64_t f0g7 = f0 * (int64_t)g7;
+    int64_t f0g8 = f0 * (int64_t)g8;
+    int64_t f0g9 = f0 * (int64_t)g9;
+    int64_t f1g0 = f1 * (int64_t)g0;
+    int64_t f1g1_2 = f1_2 * (int64_t)g1;
+    int64_t f1g2 = f1 * (int64_t)g2;
+    int64_t f1g3_2 = f1_2 * (int64_t)g3;
+    int64_t f1g4 = f1 * (int64_t)g4;
+    int64_t f1g5_2 = f1_2 * (int64_t)g5;
+    int64_t f1g6 = f1 * (int64_t)g6;
+    int64_t f1g7_2 = f1_2 * (int64_t)g7;
+    int64_t f1g8 = f1 * (int64_t)g8;
+    int64_t f1g9_38 = f1_2 * (int64_t)g9_19;
+    int64_t f2g0 = f2 * (int64_t)g0;
+    int64_t f2g1 = f2 * (int64_t)g1;
+    int64_t f2g2 = f2 * (int64_t)g2;
+    int64_t f2g3 = f2 * (int64_t)g3;
+    int64_t f2g4 = f2 * (int64_t)g4;
+    int64_t f2g5 = f2 * (int64_t)g5;
+    int64_t f2g6 = f2 * (int64_t)g6;
+    int64_t f2g7 = f2 * (int64_t)g7;
+    int64_t f2g8_19 = f2 * (int64_t)g8_19;
+    int64_t f2g9_19 = f2 * (int64_t)g9_19;
+    int64_t f3g0 = f3 * (int64_t)g0;
+    int64_t f3g1_2 = f3_2 * (int64_t)g1;
+    int64_t f3g2 = f3 * (int64_t)g2;
+    int64_t f3g3_2 = f3_2 * (int64_t)g3;
+    int64_t f3g4 = f3 * (int64_t)g4;
+    int64_t f3g5_2 = f3_2 * (int64_t)g5;
+    int64_t f3g6 = f3 * (int64_t)g6;
+    int64_t f3g7_38 = f3_2 * (int64_t)g7_19;
+    int64_t f3g8_19 = f3 * (int64_t)g8_19;
+    int64_t f3g9_38 = f3_2 * (int64_t)g9_19;
+    int64_t f4g0 = f4 * (int64_t)g0;
+    int64_t f4g1 = f4 * (int64_t)g1;
+    int64_t f4g2 = f4 * (int64_t)g2;
+    int64_t f4g3 = f4 * (int64_t)g3;
+    int64_t f4g4 = f4 * (int64_t)g4;
+    int64_t f4g5 = f4 * (int64_t)g5;
+    int64_t f4g6_19 = f4 * (int64_t)g6_19;
+    int64_t f4g7_19 = f4 * (int64_t)g7_19;
+    int64_t f4g8_19 = f4 * (int64_t)g8_19;
+    int64_t f4g9_19 = f4 * (int64_t)g9_19;
+    int64_t f5g0 = f5 * (int64_t)g0;
+    int64_t f5g1_2 = f5_2 * (int64_t)g1;
+    int64_t f5g2 = f5 * (int64_t)g2;
+    int64_t f5g3_2 = f5_2 * (int64_t)g3;
+    int64_t f5g4 = f5 * (int64_t)g4;
+    int64_t f5g5_38 = f5_2 * (int64_t)g5_19;
+    int64_t f5g6_19 = f5 * (int64_t)g6_19;
+    int64_t f5g7_38 = f5_2 * (int64_t)g7_19;
+    int64_t f5g8_19 = f5 * (int64_t)g8_19;
+    int64_t f5g9_38 = f5_2 * (int64_t)g9_19;
+    int64_t f6g0 = f6 * (int64_t)g0;
+    int64_t f6g1 = f6 * (int64_t)g1;
+    int64_t f6g2 = f6 * (int64_t)g2;
+    int64_t f6g3 = f6 * (int64_t)g3;
+    int64_t f6g4_19 = f6 * (int64_t)g4_19;
+    int64_t f6g5_19 = f6 * (int64_t)g5_19;
+    int64_t f6g6_19 = f6 * (int64_t)g6_19;
+    int64_t f6g7_19 = f6 * (int64_t)g7_19;
+    int64_t f6g8_19 = f6 * (int64_t)g8_19;
+    int64_t f6g9_19 = f6 * (int64_t)g9_19;
+    int64_t f7g0 = f7 * (int64_t)g0;
+    int64_t f7g1_2 = f7_2 * (int64_t)g1;
+    int64_t f7g2 = f7 * (int64_t)g2;
+    int64_t f7g3_38 = f7_2 * (int64_t)g3_19;
+    int64_t f7g4_19 = f7 * (int64_t)g4_19;
+    int64_t f7g5_38 = f7_2 * (int64_t)g5_19;
+    int64_t f7g6_19 = f7 * (int64_t)g6_19;
+    int64_t f7g7_38 = f7_2 * (int64_t)g7_19;
+    int64_t f7g8_19 = f7 * (int64_t)g8_19;
+    int64_t f7g9_38 = f7_2 * (int64_t)g9_19;
+    int64_t f8g0 = f8 * (int64_t)g0;
+    int64_t f8g1 = f8 * (int64_t)g1;
+    int64_t f8g2_19 = f8 * (int64_t)g2_19;
+    int64_t f8g3_19 = f8 * (int64_t)g3_19;
+    int64_t f8g4_19 = f8 * (int64_t)g4_19;
+    int64_t f8g5_19 = f8 * (int64_t)g5_19;
+    int64_t f8g6_19 = f8 * (int64_t)g6_19;
+    int64_t f8g7_19 = f8 * (int64_t)g7_19;
+    int64_t f8g8_19 = f8 * (int64_t)g8_19;
+    int64_t f8g9_19 = f8 * (int64_t)g9_19;
+    int64_t f9g0 = f9 * (int64_t)g0;
+    int64_t f9g1_38 = f9_2 * (int64_t)g1_19;
+    int64_t f9g2_19 = f9 * (int64_t)g2_19;
+    int64_t f9g3_38 = f9_2 * (int64_t)g3_19;
+    int64_t f9g4_19 = f9 * (int64_t)g4_19;
+    int64_t f9g5_38 = f9_2 * (int64_t)g5_19;
+    int64_t f9g6_19 = f9 * (int64_t)g6_19;
+    int64_t f9g7_38 = f9_2 * (int64_t)g7_19;
+    int64_t f9g8_19 = f9 * (int64_t)g8_19;
+    int64_t f9g9_38 = f9_2 * (int64_t)g9_19;
     int64_t h0 = f0g0 + f1g9_38 + f2g8_19 + f3g7_38 + f4g6_19 + f5g5_38 + f6g4_19 + f7g3_38 + f8g2_19 + f9g1_38;
-    int64_t h1 = f0g1 + f1g0    + f2g9_19 + f3g8_19 + f4g7_19 + f5g6_19 + f6g5_19 + f7g4_19 + f8g3_19 + f9g2_19;
-    int64_t h2 = f0g2 + f1g1_2  + f2g0    + f3g9_38 + f4g8_19 + f5g7_38 + f6g6_19 + f7g5_38 + f8g4_19 + f9g3_38;
-    int64_t h3 = f0g3 + f1g2    + f2g1    + f3g0    + f4g9_19 + f5g8_19 + f6g7_19 + f7g6_19 + f8g5_19 + f9g4_19;
-    int64_t h4 = f0g4 + f1g3_2  + f2g2    + f3g1_2  + f4g0    + f5g9_38 + f6g8_19 + f7g7_38 + f8g6_19 + f9g5_38;
-    int64_t h5 = f0g5 + f1g4    + f2g3    + f3g2    + f4g1    + f5g0    + f6g9_19 + f7g8_19 + f8g7_19 + f9g6_19;
-    int64_t h6 = f0g6 + f1g5_2  + f2g4    + f3g3_2  + f4g2    + f5g1_2  + f6g0    + f7g9_38 + f8g8_19 + f9g7_38;
-    int64_t h7 = f0g7 + f1g6    + f2g5    + f3g4    + f4g3    + f5g2    + f6g1    + f7g0    + f8g9_19 + f9g8_19;
-    int64_t h8 = f0g8 + f1g7_2  + f2g6    + f3g5_2  + f4g4    + f5g3_2  + f6g2    + f7g1_2  + f8g0    + f9g9_38;
-    int64_t h9 = f0g9 + f1g8    + f2g7    + f3g6    + f4g5    + f5g4    + f6g3    + f7g2    + f8g1    + f9g0   ;
+    int64_t h1 = f0g1 + f1g0 + f2g9_19 + f3g8_19 + f4g7_19 + f5g6_19 + f6g5_19 + f7g4_19 + f8g3_19 + f9g2_19;
+    int64_t h2 = f0g2 + f1g1_2 + f2g0 + f3g9_38 + f4g8_19 + f5g7_38 + f6g6_19 + f7g5_38 + f8g4_19 + f9g3_38;
+    int64_t h3 = f0g3 + f1g2 + f2g1 + f3g0 + f4g9_19 + f5g8_19 + f6g7_19 + f7g6_19 + f8g5_19 + f9g4_19;
+    int64_t h4 = f0g4 + f1g3_2 + f2g2 + f3g1_2 + f4g0 + f5g9_38 + f6g8_19 + f7g7_38 + f8g6_19 + f9g5_38;
+    int64_t h5 = f0g5 + f1g4 + f2g3 + f3g2 + f4g1 + f5g0 + f6g9_19 + f7g8_19 + f8g7_19 + f9g6_19;
+    int64_t h6 = f0g6 + f1g5_2 + f2g4 + f3g3_2 + f4g2 + f5g1_2 + f6g0 + f7g9_38 + f8g8_19 + f9g7_38;
+    int64_t h7 = f0g7 + f1g6 + f2g5 + f3g4 + f4g3 + f5g2 + f6g1 + f7g0 + f8g9_19 + f9g8_19;
+    int64_t h8 = f0g8 + f1g7_2 + f2g6 + f3g5_2 + f4g4 + f5g3_2 + f6g2 + f7g1_2 + f8g0 + f9g9_38;
+    int64_t h9 = f0g9 + f1g8 + f2g7 + f3g6 + f4g5 + f5g4 + f6g3 + f7g2 + f8g1 + f9g0;
     int64_t carry0;
     int64_t carry1;
     int64_t carry2;
@@ -1204,46 +1264,70 @@ static void fe_mul(fe h, const fe f, const fe g)
      * |h1| <= (1.65*1.65*2^51*(1+1+19+19+19+19+19+19+19+19))
      *   i.e. |h1| <= 1.7*2^59; narrower ranges for h3, h5, h7, h9 */
 
-    carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
-    carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
+    carry0 = h0 + (1 << 25);
+    h1 += carry0 >> 26;
+    h0 -= carry0 & kTop38Bits;
+    carry4 = h4 + (1 << 25);
+    h5 += carry4 >> 26;
+    h4 -= carry4 & kTop38Bits;
     /* |h0| <= 2^25 */
     /* |h4| <= 2^25 */
     /* |h1| <= 1.71*2^59 */
     /* |h5| <= 1.71*2^59 */
 
-    carry1 = h1 + (1 << 24); h2 += carry1 >> 25; h1 -= carry1 & kTop39Bits;
-    carry5 = h5 + (1 << 24); h6 += carry5 >> 25; h5 -= carry5 & kTop39Bits;
+    carry1 = h1 + (1 << 24);
+    h2 += carry1 >> 25;
+    h1 -= carry1 & kTop39Bits;
+    carry5 = h5 + (1 << 24);
+    h6 += carry5 >> 25;
+    h5 -= carry5 & kTop39Bits;
     /* |h1| <= 2^24; from now on fits into int32 */
     /* |h5| <= 2^24; from now on fits into int32 */
     /* |h2| <= 1.41*2^60 */
     /* |h6| <= 1.41*2^60 */
 
-    carry2 = h2 + (1 << 25); h3 += carry2 >> 26; h2 -= carry2 & kTop38Bits;
-    carry6 = h6 + (1 << 25); h7 += carry6 >> 26; h6 -= carry6 & kTop38Bits;
+    carry2 = h2 + (1 << 25);
+    h3 += carry2 >> 26;
+    h2 -= carry2 & kTop38Bits;
+    carry6 = h6 + (1 << 25);
+    h7 += carry6 >> 26;
+    h6 -= carry6 & kTop38Bits;
     /* |h2| <= 2^25; from now on fits into int32 unchanged */
     /* |h6| <= 2^25; from now on fits into int32 unchanged */
     /* |h3| <= 1.71*2^59 */
     /* |h7| <= 1.71*2^59 */
 
-    carry3 = h3 + (1 << 24); h4 += carry3 >> 25; h3 -= carry3 & kTop39Bits;
-    carry7 = h7 + (1 << 24); h8 += carry7 >> 25; h7 -= carry7 & kTop39Bits;
+    carry3 = h3 + (1 << 24);
+    h4 += carry3 >> 25;
+    h3 -= carry3 & kTop39Bits;
+    carry7 = h7 + (1 << 24);
+    h8 += carry7 >> 25;
+    h7 -= carry7 & kTop39Bits;
     /* |h3| <= 2^24; from now on fits into int32 unchanged */
     /* |h7| <= 2^24; from now on fits into int32 unchanged */
     /* |h4| <= 1.72*2^34 */
     /* |h8| <= 1.41*2^60 */
 
-    carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
-    carry8 = h8 + (1 << 25); h9 += carry8 >> 26; h8 -= carry8 & kTop38Bits;
+    carry4 = h4 + (1 << 25);
+    h5 += carry4 >> 26;
+    h4 -= carry4 & kTop38Bits;
+    carry8 = h8 + (1 << 25);
+    h9 += carry8 >> 26;
+    h8 -= carry8 & kTop38Bits;
     /* |h4| <= 2^25; from now on fits into int32 unchanged */
     /* |h8| <= 2^25; from now on fits into int32 unchanged */
     /* |h5| <= 1.01*2^24 */
     /* |h9| <= 1.71*2^59 */
 
-    carry9 = h9 + (1 << 24); h0 += (carry9 >> 25) * 19; h9 -= carry9 & kTop39Bits;
+    carry9 = h9 + (1 << 24);
+    h0 += (carry9 >> 25) * 19;
+    h9 -= carry9 & kTop39Bits;
     /* |h9| <= 2^24; from now on fits into int32 unchanged */
     /* |h0| <= 1.1*2^39 */
 
-    carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
+    carry0 = h0 + (1 << 25);
+    h1 += carry0 >> 26;
+    h0 -= carry0 & kTop38Bits;
     /* |h0| <= 2^25; from now on fits into int32 unchanged */
     /* |h1| <= 1.01*2^24 */
 
@@ -1297,71 +1381,71 @@ static void fe_sq(fe h, const fe f)
     int32_t f7_38 = 38 * f7; /* 1.959375*2^30 */
     int32_t f8_19 = 19 * f8; /* 1.959375*2^30 */
     int32_t f9_38 = 38 * f9; /* 1.959375*2^30 */
-    int64_t f0f0    = f0   * (int64_t) f0;
-    int64_t f0f1_2  = f0_2 * (int64_t) f1;
-    int64_t f0f2_2  = f0_2 * (int64_t) f2;
-    int64_t f0f3_2  = f0_2 * (int64_t) f3;
-    int64_t f0f4_2  = f0_2 * (int64_t) f4;
-    int64_t f0f5_2  = f0_2 * (int64_t) f5;
-    int64_t f0f6_2  = f0_2 * (int64_t) f6;
-    int64_t f0f7_2  = f0_2 * (int64_t) f7;
-    int64_t f0f8_2  = f0_2 * (int64_t) f8;
-    int64_t f0f9_2  = f0_2 * (int64_t) f9;
-    int64_t f1f1_2  = f1_2 * (int64_t) f1;
-    int64_t f1f2_2  = f1_2 * (int64_t) f2;
-    int64_t f1f3_4  = f1_2 * (int64_t) f3_2;
-    int64_t f1f4_2  = f1_2 * (int64_t) f4;
-    int64_t f1f5_4  = f1_2 * (int64_t) f5_2;
-    int64_t f1f6_2  = f1_2 * (int64_t) f6;
-    int64_t f1f7_4  = f1_2 * (int64_t) f7_2;
-    int64_t f1f8_2  = f1_2 * (int64_t) f8;
-    int64_t f1f9_76 = f1_2 * (int64_t) f9_38;
-    int64_t f2f2    = f2   * (int64_t) f2;
-    int64_t f2f3_2  = f2_2 * (int64_t) f3;
-    int64_t f2f4_2  = f2_2 * (int64_t) f4;
-    int64_t f2f5_2  = f2_2 * (int64_t) f5;
-    int64_t f2f6_2  = f2_2 * (int64_t) f6;
-    int64_t f2f7_2  = f2_2 * (int64_t) f7;
-    int64_t f2f8_38 = f2_2 * (int64_t) f8_19;
-    int64_t f2f9_38 = f2   * (int64_t) f9_38;
-    int64_t f3f3_2  = f3_2 * (int64_t) f3;
-    int64_t f3f4_2  = f3_2 * (int64_t) f4;
-    int64_t f3f5_4  = f3_2 * (int64_t) f5_2;
-    int64_t f3f6_2  = f3_2 * (int64_t) f6;
-    int64_t f3f7_76 = f3_2 * (int64_t) f7_38;
-    int64_t f3f8_38 = f3_2 * (int64_t) f8_19;
-    int64_t f3f9_76 = f3_2 * (int64_t) f9_38;
-    int64_t f4f4    = f4   * (int64_t) f4;
-    int64_t f4f5_2  = f4_2 * (int64_t) f5;
-    int64_t f4f6_38 = f4_2 * (int64_t) f6_19;
-    int64_t f4f7_38 = f4   * (int64_t) f7_38;
-    int64_t f4f8_38 = f4_2 * (int64_t) f8_19;
-    int64_t f4f9_38 = f4   * (int64_t) f9_38;
-    int64_t f5f5_38 = f5   * (int64_t) f5_38;
-    int64_t f5f6_38 = f5_2 * (int64_t) f6_19;
-    int64_t f5f7_76 = f5_2 * (int64_t) f7_38;
-    int64_t f5f8_38 = f5_2 * (int64_t) f8_19;
-    int64_t f5f9_76 = f5_2 * (int64_t) f9_38;
-    int64_t f6f6_19 = f6   * (int64_t) f6_19;
-    int64_t f6f7_38 = f6   * (int64_t) f7_38;
-    int64_t f6f8_38 = f6_2 * (int64_t) f8_19;
-    int64_t f6f9_38 = f6   * (int64_t) f9_38;
-    int64_t f7f7_38 = f7   * (int64_t) f7_38;
-    int64_t f7f8_38 = f7_2 * (int64_t) f8_19;
-    int64_t f7f9_76 = f7_2 * (int64_t) f9_38;
-    int64_t f8f8_19 = f8   * (int64_t) f8_19;
-    int64_t f8f9_38 = f8   * (int64_t) f9_38;
-    int64_t f9f9_38 = f9   * (int64_t) f9_38;
-    int64_t h0 = f0f0   + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38;
+    int64_t f0f0 = f0 * (int64_t)f0;
+    int64_t f0f1_2 = f0_2 * (int64_t)f1;
+    int64_t f0f2_2 = f0_2 * (int64_t)f2;
+    int64_t f0f3_2 = f0_2 * (int64_t)f3;
+    int64_t f0f4_2 = f0_2 * (int64_t)f4;
+    int64_t f0f5_2 = f0_2 * (int64_t)f5;
+    int64_t f0f6_2 = f0_2 * (int64_t)f6;
+    int64_t f0f7_2 = f0_2 * (int64_t)f7;
+    int64_t f0f8_2 = f0_2 * (int64_t)f8;
+    int64_t f0f9_2 = f0_2 * (int64_t)f9;
+    int64_t f1f1_2 = f1_2 * (int64_t)f1;
+    int64_t f1f2_2 = f1_2 * (int64_t)f2;
+    int64_t f1f3_4 = f1_2 * (int64_t)f3_2;
+    int64_t f1f4_2 = f1_2 * (int64_t)f4;
+    int64_t f1f5_4 = f1_2 * (int64_t)f5_2;
+    int64_t f1f6_2 = f1_2 * (int64_t)f6;
+    int64_t f1f7_4 = f1_2 * (int64_t)f7_2;
+    int64_t f1f8_2 = f1_2 * (int64_t)f8;
+    int64_t f1f9_76 = f1_2 * (int64_t)f9_38;
+    int64_t f2f2 = f2 * (int64_t)f2;
+    int64_t f2f3_2 = f2_2 * (int64_t)f3;
+    int64_t f2f4_2 = f2_2 * (int64_t)f4;
+    int64_t f2f5_2 = f2_2 * (int64_t)f5;
+    int64_t f2f6_2 = f2_2 * (int64_t)f6;
+    int64_t f2f7_2 = f2_2 * (int64_t)f7;
+    int64_t f2f8_38 = f2_2 * (int64_t)f8_19;
+    int64_t f2f9_38 = f2 * (int64_t)f9_38;
+    int64_t f3f3_2 = f3_2 * (int64_t)f3;
+    int64_t f3f4_2 = f3_2 * (int64_t)f4;
+    int64_t f3f5_4 = f3_2 * (int64_t)f5_2;
+    int64_t f3f6_2 = f3_2 * (int64_t)f6;
+    int64_t f3f7_76 = f3_2 * (int64_t)f7_38;
+    int64_t f3f8_38 = f3_2 * (int64_t)f8_19;
+    int64_t f3f9_76 = f3_2 * (int64_t)f9_38;
+    int64_t f4f4 = f4 * (int64_t)f4;
+    int64_t f4f5_2 = f4_2 * (int64_t)f5;
+    int64_t f4f6_38 = f4_2 * (int64_t)f6_19;
+    int64_t f4f7_38 = f4 * (int64_t)f7_38;
+    int64_t f4f8_38 = f4_2 * (int64_t)f8_19;
+    int64_t f4f9_38 = f4 * (int64_t)f9_38;
+    int64_t f5f5_38 = f5 * (int64_t)f5_38;
+    int64_t f5f6_38 = f5_2 * (int64_t)f6_19;
+    int64_t f5f7_76 = f5_2 * (int64_t)f7_38;
+    int64_t f5f8_38 = f5_2 * (int64_t)f8_19;
+    int64_t f5f9_76 = f5_2 * (int64_t)f9_38;
+    int64_t f6f6_19 = f6 * (int64_t)f6_19;
+    int64_t f6f7_38 = f6 * (int64_t)f7_38;
+    int64_t f6f8_38 = f6_2 * (int64_t)f8_19;
+    int64_t f6f9_38 = f6 * (int64_t)f9_38;
+    int64_t f7f7_38 = f7 * (int64_t)f7_38;
+    int64_t f7f8_38 = f7_2 * (int64_t)f8_19;
+    int64_t f7f9_76 = f7_2 * (int64_t)f9_38;
+    int64_t f8f8_19 = f8 * (int64_t)f8_19;
+    int64_t f8f9_38 = f8 * (int64_t)f9_38;
+    int64_t f9f9_38 = f9 * (int64_t)f9_38;
+    int64_t h0 = f0f0 + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38;
     int64_t h1 = f0f1_2 + f2f9_38 + f3f8_38 + f4f7_38 + f5f6_38;
-    int64_t h2 = f0f2_2 + f1f1_2  + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19;
-    int64_t h3 = f0f3_2 + f1f2_2  + f4f9_38 + f5f8_38 + f6f7_38;
-    int64_t h4 = f0f4_2 + f1f3_4  + f2f2    + f5f9_76 + f6f8_38 + f7f7_38;
-    int64_t h5 = f0f5_2 + f1f4_2  + f2f3_2  + f6f9_38 + f7f8_38;
-    int64_t h6 = f0f6_2 + f1f5_4  + f2f4_2  + f3f3_2  + f7f9_76 + f8f8_19;
-    int64_t h7 = f0f7_2 + f1f6_2  + f2f5_2  + f3f4_2  + f8f9_38;
-    int64_t h8 = f0f8_2 + f1f7_4  + f2f6_2  + f3f5_4  + f4f4    + f9f9_38;
-    int64_t h9 = f0f9_2 + f1f8_2  + f2f7_2  + f3f6_2  + f4f5_2;
+    int64_t h2 = f0f2_2 + f1f1_2 + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19;
+    int64_t h3 = f0f3_2 + f1f2_2 + f4f9_38 + f5f8_38 + f6f7_38;
+    int64_t h4 = f0f4_2 + f1f3_4 + f2f2 + f5f9_76 + f6f8_38 + f7f7_38;
+    int64_t h5 = f0f5_2 + f1f4_2 + f2f3_2 + f6f9_38 + f7f8_38;
+    int64_t h6 = f0f6_2 + f1f5_4 + f2f4_2 + f3f3_2 + f7f9_76 + f8f8_19;
+    int64_t h7 = f0f7_2 + f1f6_2 + f2f5_2 + f3f4_2 + f8f9_38;
+    int64_t h8 = f0f8_2 + f1f7_4 + f2f6_2 + f3f5_4 + f4f4 + f9f9_38;
+    int64_t h9 = f0f9_2 + f1f8_2 + f2f7_2 + f3f6_2 + f4f5_2;
     int64_t carry0;
     int64_t carry1;
     int64_t carry2;
@@ -1373,24 +1457,48 @@ static void fe_sq(fe h, const fe f)
     int64_t carry8;
     int64_t carry9;
 
-    carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
-    carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
-
-    carry1 = h1 + (1 << 24); h2 += carry1 >> 25; h1 -= carry1 & kTop39Bits;
-    carry5 = h5 + (1 << 24); h6 += carry5 >> 25; h5 -= carry5 & kTop39Bits;
-
-    carry2 = h2 + (1 << 25); h3 += carry2 >> 26; h2 -= carry2 & kTop38Bits;
-    carry6 = h6 + (1 << 25); h7 += carry6 >> 26; h6 -= carry6 & kTop38Bits;
-
-    carry3 = h3 + (1 << 24); h4 += carry3 >> 25; h3 -= carry3 & kTop39Bits;
-    carry7 = h7 + (1 << 24); h8 += carry7 >> 25; h7 -= carry7 & kTop39Bits;
-
-    carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
-    carry8 = h8 + (1 << 25); h9 += carry8 >> 26; h8 -= carry8 & kTop38Bits;
-
-    carry9 = h9 + (1 << 24); h0 += (carry9 >> 25) * 19; h9 -= carry9 & kTop39Bits;
-
-    carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
+    carry0 = h0 + (1 << 25);
+    h1 += carry0 >> 26;
+    h0 -= carry0 & kTop38Bits;
+    carry4 = h4 + (1 << 25);
+    h5 += carry4 >> 26;
+    h4 -= carry4 & kTop38Bits;
+
+    carry1 = h1 + (1 << 24);
+    h2 += carry1 >> 25;
+    h1 -= carry1 & kTop39Bits;
+    carry5 = h5 + (1 << 24);
+    h6 += carry5 >> 25;
+    h5 -= carry5 & kTop39Bits;
+
+    carry2 = h2 + (1 << 25);
+    h3 += carry2 >> 26;
+    h2 -= carry2 & kTop38Bits;
+    carry6 = h6 + (1 << 25);
+    h7 += carry6 >> 26;
+    h6 -= carry6 & kTop38Bits;
+
+    carry3 = h3 + (1 << 24);
+    h4 += carry3 >> 25;
+    h3 -= carry3 & kTop39Bits;
+    carry7 = h7 + (1 << 24);
+    h8 += carry7 >> 25;
+    h7 -= carry7 & kTop39Bits;
+
+    carry4 = h4 + (1 << 25);
+    h5 += carry4 >> 26;
+    h4 -= carry4 & kTop38Bits;
+    carry8 = h8 + (1 << 25);
+    h9 += carry8 >> 26;
+    h8 -= carry8 & kTop38Bits;
+
+    carry9 = h9 + (1 << 24);
+    h0 += (carry9 >> 25) * 19;
+    h9 -= carry9 & kTop39Bits;
+
+    carry0 = h0 + (1 << 25);
+    h1 += carry0 >> 26;
+    h0 -= carry0 & kTop38Bits;
 
     h[0] = (int32_t)h0;
     h[1] = (int32_t)h1;
@@ -1528,7 +1636,7 @@ static void fe_cmov(fe f, const fe g, unsigned b)
 {
     size_t i;
 
-    b = 0-b;
+    b = 0 - b;
     for (i = 0; i < 10; i++) {
         int32_t x = f[i] ^ g[i];
         x &= b;
@@ -1546,7 +1654,7 @@ static void fe_cmov(fe f, const fe g, unsigned b)
 static int fe_isnonzero(const fe f)
 {
     uint8_t s[32];
-    static const uint8_t zero[32] = {0};
+    static const uint8_t zero[32] = { 0 };
 
     fe_tobytes(s, f);
 
@@ -1606,71 +1714,71 @@ static void fe_sq2(fe h, const fe f)
     int32_t f7_38 = 38 * f7; /* 1.959375*2^30 */
     int32_t f8_19 = 19 * f8; /* 1.959375*2^30 */
     int32_t f9_38 = 38 * f9; /* 1.959375*2^30 */
-    int64_t f0f0    = f0   * (int64_t) f0;
-    int64_t f0f1_2  = f0_2 * (int64_t) f1;
-    int64_t f0f2_2  = f0_2 * (int64_t) f2;
-    int64_t f0f3_2  = f0_2 * (int64_t) f3;
-    int64_t f0f4_2  = f0_2 * (int64_t) f4;
-    int64_t f0f5_2  = f0_2 * (int64_t) f5;
-    int64_t f0f6_2  = f0_2 * (int64_t) f6;
-    int64_t f0f7_2  = f0_2 * (int64_t) f7;
-    int64_t f0f8_2  = f0_2 * (int64_t) f8;
-    int64_t f0f9_2  = f0_2 * (int64_t) f9;
-    int64_t f1f1_2  = f1_2 * (int64_t) f1;
-    int64_t f1f2_2  = f1_2 * (int64_t) f2;
-    int64_t f1f3_4  = f1_2 * (int64_t) f3_2;
-    int64_t f1f4_2  = f1_2 * (int64_t) f4;
-    int64_t f1f5_4  = f1_2 * (int64_t) f5_2;
-    int64_t f1f6_2  = f1_2 * (int64_t) f6;
-    int64_t f1f7_4  = f1_2 * (int64_t) f7_2;
-    int64_t f1f8_2  = f1_2 * (int64_t) f8;
-    int64_t f1f9_76 = f1_2 * (int64_t) f9_38;
-    int64_t f2f2    = f2   * (int64_t) f2;
-    int64_t f2f3_2  = f2_2 * (int64_t) f3;
-    int64_t f2f4_2  = f2_2 * (int64_t) f4;
-    int64_t f2f5_2  = f2_2 * (int64_t) f5;
-    int64_t f2f6_2  = f2_2 * (int64_t) f6;
-    int64_t f2f7_2  = f2_2 * (int64_t) f7;
-    int64_t f2f8_38 = f2_2 * (int64_t) f8_19;
-    int64_t f2f9_38 = f2   * (int64_t) f9_38;
-    int64_t f3f3_2  = f3_2 * (int64_t) f3;
-    int64_t f3f4_2  = f3_2 * (int64_t) f4;
-    int64_t f3f5_4  = f3_2 * (int64_t) f5_2;
-    int64_t f3f6_2  = f3_2 * (int64_t) f6;
-    int64_t f3f7_76 = f3_2 * (int64_t) f7_38;
-    int64_t f3f8_38 = f3_2 * (int64_t) f8_19;
-    int64_t f3f9_76 = f3_2 * (int64_t) f9_38;
-    int64_t f4f4    = f4   * (int64_t) f4;
-    int64_t f4f5_2  = f4_2 * (int64_t) f5;
-    int64_t f4f6_38 = f4_2 * (int64_t) f6_19;
-    int64_t f4f7_38 = f4   * (int64_t) f7_38;
-    int64_t f4f8_38 = f4_2 * (int64_t) f8_19;
-    int64_t f4f9_38 = f4   * (int64_t) f9_38;
-    int64_t f5f5_38 = f5   * (int64_t) f5_38;
-    int64_t f5f6_38 = f5_2 * (int64_t) f6_19;
-    int64_t f5f7_76 = f5_2 * (int64_t) f7_38;
-    int64_t f5f8_38 = f5_2 * (int64_t) f8_19;
-    int64_t f5f9_76 = f5_2 * (int64_t) f9_38;
-    int64_t f6f6_19 = f6   * (int64_t) f6_19;
-    int64_t f6f7_38 = f6   * (int64_t) f7_38;
-    int64_t f6f8_38 = f6_2 * (int64_t) f8_19;
-    int64_t f6f9_38 = f6   * (int64_t) f9_38;
-    int64_t f7f7_38 = f7   * (int64_t) f7_38;
-    int64_t f7f8_38 = f7_2 * (int64_t) f8_19;
-    int64_t f7f9_76 = f7_2 * (int64_t) f9_38;
-    int64_t f8f8_19 = f8   * (int64_t) f8_19;
-    int64_t f8f9_38 = f8   * (int64_t) f9_38;
-    int64_t f9f9_38 = f9   * (int64_t) f9_38;
-    int64_t h0 = f0f0   + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38;
+    int64_t f0f0 = f0 * (int64_t)f0;
+    int64_t f0f1_2 = f0_2 * (int64_t)f1;
+    int64_t f0f2_2 = f0_2 * (int64_t)f2;
+    int64_t f0f3_2 = f0_2 * (int64_t)f3;
+    int64_t f0f4_2 = f0_2 * (int64_t)f4;
+    int64_t f0f5_2 = f0_2 * (int64_t)f5;
+    int64_t f0f6_2 = f0_2 * (int64_t)f6;
+    int64_t f0f7_2 = f0_2 * (int64_t)f7;
+    int64_t f0f8_2 = f0_2 * (int64_t)f8;
+    int64_t f0f9_2 = f0_2 * (int64_t)f9;
+    int64_t f1f1_2 = f1_2 * (int64_t)f1;
+    int64_t f1f2_2 = f1_2 * (int64_t)f2;
+    int64_t f1f3_4 = f1_2 * (int64_t)f3_2;
+    int64_t f1f4_2 = f1_2 * (int64_t)f4;
+    int64_t f1f5_4 = f1_2 * (int64_t)f5_2;
+    int64_t f1f6_2 = f1_2 * (int64_t)f6;
+    int64_t f1f7_4 = f1_2 * (int64_t)f7_2;
+    int64_t f1f8_2 = f1_2 * (int64_t)f8;
+    int64_t f1f9_76 = f1_2 * (int64_t)f9_38;
+    int64_t f2f2 = f2 * (int64_t)f2;
+    int64_t f2f3_2 = f2_2 * (int64_t)f3;
+    int64_t f2f4_2 = f2_2 * (int64_t)f4;
+    int64_t f2f5_2 = f2_2 * (int64_t)f5;
+    int64_t f2f6_2 = f2_2 * (int64_t)f6;
+    int64_t f2f7_2 = f2_2 * (int64_t)f7;
+    int64_t f2f8_38 = f2_2 * (int64_t)f8_19;
+    int64_t f2f9_38 = f2 * (int64_t)f9_38;
+    int64_t f3f3_2 = f3_2 * (int64_t)f3;
+    int64_t f3f4_2 = f3_2 * (int64_t)f4;
+    int64_t f3f5_4 = f3_2 * (int64_t)f5_2;
+    int64_t f3f6_2 = f3_2 * (int64_t)f6;
+    int64_t f3f7_76 = f3_2 * (int64_t)f7_38;
+    int64_t f3f8_38 = f3_2 * (int64_t)f8_19;
+    int64_t f3f9_76 = f3_2 * (int64_t)f9_38;
+    int64_t f4f4 = f4 * (int64_t)f4;
+    int64_t f4f5_2 = f4_2 * (int64_t)f5;
+    int64_t f4f6_38 = f4_2 * (int64_t)f6_19;
+    int64_t f4f7_38 = f4 * (int64_t)f7_38;
+    int64_t f4f8_38 = f4_2 * (int64_t)f8_19;
+    int64_t f4f9_38 = f4 * (int64_t)f9_38;
+    int64_t f5f5_38 = f5 * (int64_t)f5_38;
+    int64_t f5f6_38 = f5_2 * (int64_t)f6_19;
+    int64_t f5f7_76 = f5_2 * (int64_t)f7_38;
+    int64_t f5f8_38 = f5_2 * (int64_t)f8_19;
+    int64_t f5f9_76 = f5_2 * (int64_t)f9_38;
+    int64_t f6f6_19 = f6 * (int64_t)f6_19;
+    int64_t f6f7_38 = f6 * (int64_t)f7_38;
+    int64_t f6f8_38 = f6_2 * (int64_t)f8_19;
+    int64_t f6f9_38 = f6 * (int64_t)f9_38;
+    int64_t f7f7_38 = f7 * (int64_t)f7_38;
+    int64_t f7f8_38 = f7_2 * (int64_t)f8_19;
+    int64_t f7f9_76 = f7_2 * (int64_t)f9_38;
+    int64_t f8f8_19 = f8 * (int64_t)f8_19;
+    int64_t f8f9_38 = f8 * (int64_t)f9_38;
+    int64_t f9f9_38 = f9 * (int64_t)f9_38;
+    int64_t h0 = f0f0 + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38;
     int64_t h1 = f0f1_2 + f2f9_38 + f3f8_38 + f4f7_38 + f5f6_38;
-    int64_t h2 = f0f2_2 + f1f1_2  + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19;
-    int64_t h3 = f0f3_2 + f1f2_2  + f4f9_38 + f5f8_38 + f6f7_38;
-    int64_t h4 = f0f4_2 + f1f3_4  + f2f2    + f5f9_76 + f6f8_38 + f7f7_38;
-    int64_t h5 = f0f5_2 + f1f4_2  + f2f3_2  + f6f9_38 + f7f8_38;
-    int64_t h6 = f0f6_2 + f1f5_4  + f2f4_2  + f3f3_2  + f7f9_76 + f8f8_19;
-    int64_t h7 = f0f7_2 + f1f6_2  + f2f5_2  + f3f4_2  + f8f9_38;
-    int64_t h8 = f0f8_2 + f1f7_4  + f2f6_2  + f3f5_4  + f4f4    + f9f9_38;
-    int64_t h9 = f0f9_2 + f1f8_2  + f2f7_2  + f3f6_2  + f4f5_2;
+    int64_t h2 = f0f2_2 + f1f1_2 + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19;
+    int64_t h3 = f0f3_2 + f1f2_2 + f4f9_38 + f5f8_38 + f6f7_38;
+    int64_t h4 = f0f4_2 + f1f3_4 + f2f2 + f5f9_76 + f6f8_38 + f7f7_38;
+    int64_t h5 = f0f5_2 + f1f4_2 + f2f3_2 + f6f9_38 + f7f8_38;
+    int64_t h6 = f0f6_2 + f1f5_4 + f2f4_2 + f3f3_2 + f7f9_76 + f8f8_19;
+    int64_t h7 = f0f7_2 + f1f6_2 + f2f5_2 + f3f4_2 + f8f9_38;
+    int64_t h8 = f0f8_2 + f1f7_4 + f2f6_2 + f3f5_4 + f4f4 + f9f9_38;
+    int64_t h9 = f0f9_2 + f1f8_2 + f2f7_2 + f3f6_2 + f4f5_2;
     int64_t carry0;
     int64_t carry1;
     int64_t carry2;
@@ -1693,24 +1801,48 @@ static void fe_sq2(fe h, const fe f)
     h8 += h8;
     h9 += h9;
 
-    carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
-    carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
-
-    carry1 = h1 + (1 << 24); h2 += carry1 >> 25; h1 -= carry1 & kTop39Bits;
-    carry5 = h5 + (1 << 24); h6 += carry5 >> 25; h5 -= carry5 & kTop39Bits;
-
-    carry2 = h2 + (1 << 25); h3 += carry2 >> 26; h2 -= carry2 & kTop38Bits;
-    carry6 = h6 + (1 << 25); h7 += carry6 >> 26; h6 -= carry6 & kTop38Bits;
-
-    carry3 = h3 + (1 << 24); h4 += carry3 >> 25; h3 -= carry3 & kTop39Bits;
-    carry7 = h7 + (1 << 24); h8 += carry7 >> 25; h7 -= carry7 & kTop39Bits;
-
-    carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
-    carry8 = h8 + (1 << 25); h9 += carry8 >> 26; h8 -= carry8 & kTop38Bits;
-
-    carry9 = h9 + (1 << 24); h0 += (carry9 >> 25) * 19; h9 -= carry9 & kTop39Bits;
-
-    carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
+    carry0 = h0 + (1 << 25);
+    h1 += carry0 >> 26;
+    h0 -= carry0 & kTop38Bits;
+    carry4 = h4 + (1 << 25);
+    h5 += carry4 >> 26;
+    h4 -= carry4 & kTop38Bits;
+
+    carry1 = h1 + (1 << 24);
+    h2 += carry1 >> 25;
+    h1 -= carry1 & kTop39Bits;
+    carry5 = h5 + (1 << 24);
+    h6 += carry5 >> 25;
+    h5 -= carry5 & kTop39Bits;
+
+    carry2 = h2 + (1 << 25);
+    h3 += carry2 >> 26;
+    h2 -= carry2 & kTop38Bits;
+    carry6 = h6 + (1 << 25);
+    h7 += carry6 >> 26;
+    h6 -= carry6 & kTop38Bits;
+
+    carry3 = h3 + (1 << 24);
+    h4 += carry3 >> 25;
+    h3 -= carry3 & kTop39Bits;
+    carry7 = h7 + (1 << 24);
+    h8 += carry7 >> 25;
+    h7 -= carry7 & kTop39Bits;
+
+    carry4 = h4 + (1 << 25);
+    h5 += carry4 >> 26;
+    h4 -= carry4 & kTop38Bits;
+    carry8 = h8 + (1 << 25);
+    h9 += carry8 >> 26;
+    h8 -= carry8 & kTop38Bits;
+
+    carry9 = h9 + (1 << 24);
+    h0 += (carry9 >> 25) * 19;
+    h9 -= carry9 & kTop39Bits;
+
+    carry0 = h0 + (1 << 25);
+    h1 += carry0 >> 26;
+    h0 -= carry0 & kTop38Bits;
 
     h[0] = (int32_t)h0;
     h[1] = (int32_t)h1;
@@ -1855,13 +1987,13 @@ static void ge_p3_tobytes(uint8_t *s, const ge_p3 *h)
 }
 
 static const fe d = {
-    -10913610, 13857413, -15372611, 6949391,   114729,
-    -8787816,  -6275908, -3247719,  -18696448, -12055116
+    -10913610, 13857413, -15372611, 6949391, 114729,
+    -8787816, -6275908, -3247719, -18696448, -12055116
 };
 
 static const fe sqrtm1 = {
-    -32595792, -7943725,  9377950,  3500415, 12389472,
-    -272473,   -25146209, -2005654, 326686,  11406482
+    -32595792, -7943725, 9377950, 3500415, 12389472,
+    -272473, -25146209, -2005654, 326686, 11406482
 };
 
 static int ge_frombytes_vartime(ge_p3 *h, const uint8_t *s)
@@ -1934,8 +2066,8 @@ static void ge_p3_to_p2(ge_p2 *r, const ge_p3 *p)
 }
 
 static const fe d2 = {
-    -21827239, -5839606,  -30745221, 13898782, 229458,
-    15978800,  -12551817, -6495438,  29715968, 9444199
+    -21827239, -5839606, -30745221, 13898782, 229458,
+    15978800, -12551817, -6495438, 29715968, 9444199
 };
 
 /* r = p */
@@ -2063,9 +2195,9 @@ static uint8_t equal(signed char b, signed char c)
     uint8_t ub = b;
     uint8_t uc = c;
     uint8_t x = ub ^ uc; /* 0: yes; 1..255: no */
-    uint32_t y = x;      /* 0: yes; 1..255: no */
-    y -= 1;              /* 4294967295: yes; 0..254: no */
-    y >>= 31;            /* 1: yes; 0: no */
+    uint32_t y = x; /* 0: yes; 1..255: no */
+    y -= 1; /* 4294967295: yes; 0..254: no */
+    y >>= 31; /* 1: yes; 0: no */
     return y;
 }
 
@@ -2080,2114 +2212,2114 @@ static void cmov(ge_precomp *t, const ge_precomp *u, uint8_t b)
 static const ge_precomp k25519Precomp[32][8] = {
     {
         {
-            {25967493, -14356035, 29566456, 3660896, -12694345, 4014787,
-             27544626, -11754271, -6079156, 2047605},
-            {-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692,
-             5043384, 19500929, -15469378},
-            {-8738181, 4489570, 9688441, -14785194, 10184609, -12363380,
-             29287919, 11864899, -24514362, -4438546},
+            { 25967493, -14356035, 29566456, 3660896, -12694345, 4014787,
+                27544626, -11754271, -6079156, 2047605 },
+            { -12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692,
+                5043384, 19500929, -15469378 },
+            { -8738181, 4489570, 9688441, -14785194, 10184609, -12363380,
+                29287919, 11864899, -24514362, -4438546 },
         },
         {
-            {-12815894, -12976347, -21581243, 11784320, -25355658, -2750717,
-             -11717903, -3814571, -358445, -10211303},
-            {-21703237, 6903825, 27185491, 6451973, -29577724, -9554005,
-             -15616551, 11189268, -26829678, -5319081},
-            {26966642, 11152617, 32442495, 15396054, 14353839, -12752335,
-             -3128826, -9541118, -15472047, -4166697},
+            { -12815894, -12976347, -21581243, 11784320, -25355658, -2750717,
+                -11717903, -3814571, -358445, -10211303 },
+            { -21703237, 6903825, 27185491, 6451973, -29577724, -9554005,
+                -15616551, 11189268, -26829678, -5319081 },
+            { 26966642, 11152617, 32442495, 15396054, 14353839, -12752335,
+                -3128826, -9541118, -15472047, -4166697 },
         },
         {
-            {15636291, -9688557, 24204773, -7912398, 616977, -16685262,
-             27787600, -14772189, 28944400, -1550024},
-            {16568933, 4717097, -11556148, -1102322, 15682896, -11807043,
-             16354577, -11775962, 7689662, 11199574},
-            {30464156, -5976125, -11779434, -15670865, 23220365, 15915852,
-             7512774, 10017326, -17749093, -9920357},
+            { 15636291, -9688557, 24204773, -7912398, 616977, -16685262,
+                27787600, -14772189, 28944400, -1550024 },
+            { 16568933, 4717097, -11556148, -1102322, 15682896, -11807043,
+                16354577, -11775962, 7689662, 11199574 },
+            { 30464156, -5976125, -11779434, -15670865, 23220365, 15915852,
+                7512774, 10017326, -17749093, -9920357 },
         },
         {
-            {-17036878, 13921892, 10945806, -6033431, 27105052, -16084379,
-             -28926210, 15006023, 3284568, -6276540},
-            {23599295, -8306047, -11193664, -7687416, 13236774, 10506355,
-             7464579, 9656445, 13059162, 10374397},
-            {7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664,
-             -3839045, -641708, -101325},
+            { -17036878, 13921892, 10945806, -6033431, 27105052, -16084379,
+                -28926210, 15006023, 3284568, -6276540 },
+            { 23599295, -8306047, -11193664, -7687416, 13236774, 10506355,
+                7464579, 9656445, 13059162, 10374397 },
+            { 7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664,
+                -3839045, -641708, -101325 },
         },
         {
-            {10861363, 11473154, 27284546, 1981175, -30064349, 12577861,
-             32867885, 14515107, -15438304, 10819380},
-            {4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668,
-             12483688, -12668491, 5581306},
-            {19563160, 16186464, -29386857, 4097519, 10237984, -4348115,
-             28542350, 13850243, -23678021, -15815942},
+            { 10861363, 11473154, 27284546, 1981175, -30064349, 12577861,
+                32867885, 14515107, -15438304, 10819380 },
+            { 4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668,
+                12483688, -12668491, 5581306 },
+            { 19563160, 16186464, -29386857, 4097519, 10237984, -4348115,
+                28542350, 13850243, -23678021, -15815942 },
         },
         {
-            {-15371964, -12862754, 32573250, 4720197, -26436522, 5875511,
-             -19188627, -15224819, -9818940, -12085777},
-            {-8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240,
-             -15689887, 1762328, 14866737},
-            {-18199695, -15951423, -10473290, 1707278, -17185920, 3916101,
-             -28236412, 3959421, 27914454, 4383652},
+            { -15371964, -12862754, 32573250, 4720197, -26436522, 5875511,
+                -19188627, -15224819, -9818940, -12085777 },
+            { -8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240,
+                -15689887, 1762328, 14866737 },
+            { -18199695, -15951423, -10473290, 1707278, -17185920, 3916101,
+                -28236412, 3959421, 27914454, 4383652 },
         },
         {
-            {5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852,
-             5230134, -23952439, -15175766},
-            {-30269007, -3463509, 7665486, 10083793, 28475525, 1649722,
-             20654025, 16520125, 30598449, 7715701},
-            {28881845, 14381568, 9657904, 3680757, -20181635, 7843316,
-             -31400660, 1370708, 29794553, -1409300},
+            { 5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852,
+                5230134, -23952439, -15175766 },
+            { -30269007, -3463509, 7665486, 10083793, 28475525, 1649722,
+                20654025, 16520125, 30598449, 7715701 },
+            { 28881845, 14381568, 9657904, 3680757, -20181635, 7843316,
+                -31400660, 1370708, 29794553, -1409300 },
         },
         {
-            {14499471, -2729599, -33191113, -4254652, 28494862, 14271267,
-             30290735, 10876454, -33154098, 2381726},
-            {-7195431, -2655363, -14730155, 462251, -27724326, 3941372,
-             -6236617, 3696005, -32300832, 15351955},
-            {27431194, 8222322, 16448760, -3907995, -18707002, 11938355,
-             -32961401, -2970515, 29551813, 10109425},
+            { 14499471, -2729599, -33191113, -4254652, 28494862, 14271267,
+                30290735, 10876454, -33154098, 2381726 },
+            { -7195431, -2655363, -14730155, 462251, -27724326, 3941372,
+                -6236617, 3696005, -32300832, 15351955 },
+            { 27431194, 8222322, 16448760, -3907995, -18707002, 11938355,
+                -32961401, -2970515, 29551813, 10109425 },
         },
     },
     {
         {
-            {-13657040, -13155431, -31283750, 11777098, 21447386, 6519384,
-             -2378284, -1627556, 10092783, -4764171},
-            {27939166, 14210322, 4677035, 16277044, -22964462, -12398139,
-             -32508754, 12005538, -17810127, 12803510},
-            {17228999, -15661624, -1233527, 300140, -1224870, -11714777,
-             30364213, -9038194, 18016357, 4397660},
+            { -13657040, -13155431, -31283750, 11777098, 21447386, 6519384,
+                -2378284, -1627556, 10092783, -4764171 },
+            { 27939166, 14210322, 4677035, 16277044, -22964462, -12398139,
+                -32508754, 12005538, -17810127, 12803510 },
+            { 17228999, -15661624, -1233527, 300140, -1224870, -11714777,
+                30364213, -9038194, 18016357, 4397660 },
         },
         {
-            {-10958843, -7690207, 4776341, -14954238, 27850028, -15602212,
-             -26619106, 14544525, -17477504, 982639},
-            {29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899,
-             -4120128, -21047696, 9934963},
-            {5793303, 16271923, -24131614, -10116404, 29188560, 1206517,
-             -14747930, 4559895, -30123922, -10897950},
+            { -10958843, -7690207, 4776341, -14954238, 27850028, -15602212,
+                -26619106, 14544525, -17477504, 982639 },
+            { 29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899,
+                -4120128, -21047696, 9934963 },
+            { 5793303, 16271923, -24131614, -10116404, 29188560, 1206517,
+                -14747930, 4559895, -30123922, -10897950 },
         },
         {
-            {-27643952, -11493006, 16282657, -11036493, 28414021, -15012264,
-             24191034, 4541697, -13338309, 5500568},
-            {12650548, -1497113, 9052871, 11355358, -17680037, -8400164,
-             -17430592, 12264343, 10874051, 13524335},
-            {25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038,
-             5080568, -22528059, 5376628},
+            { -27643952, -11493006, 16282657, -11036493, 28414021, -15012264,
+                24191034, 4541697, -13338309, 5500568 },
+            { 12650548, -1497113, 9052871, 11355358, -17680037, -8400164,
+                -17430592, 12264343, 10874051, 13524335 },
+            { 25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038,
+                5080568, -22528059, 5376628 },
         },
         {
-            {-26088264, -4011052, -17013699, -3537628, -6726793, 1920897,
-             -22321305, -9447443, 4535768, 1569007},
-            {-2255422, 14606630, -21692440, -8039818, 28430649, 8775819,
-             -30494562, 3044290, 31848280, 12543772},
-            {-22028579, 2943893, -31857513, 6777306, 13784462, -4292203,
-             -27377195, -2062731, 7718482, 14474653},
+            { -26088264, -4011052, -17013699, -3537628, -6726793, 1920897,
+                -22321305, -9447443, 4535768, 1569007 },
+            { -2255422, 14606630, -21692440, -8039818, 28430649, 8775819,
+                -30494562, 3044290, 31848280, 12543772 },
+            { -22028579, 2943893, -31857513, 6777306, 13784462, -4292203,
+                -27377195, -2062731, 7718482, 14474653 },
         },
         {
-            {2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965,
-             -7236665, 24316168, -5253567},
-            {13741529, 10911568, -33233417, -8603737, -20177830, -1033297,
-             33040651, -13424532, -20729456, 8321686},
-            {21060490, -2212744, 15712757, -4336099, 1639040, 10656336,
-             23845965, -11874838, -9984458, 608372},
+            { 2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965,
+                -7236665, 24316168, -5253567 },
+            { 13741529, 10911568, -33233417, -8603737, -20177830, -1033297,
+                33040651, -13424532, -20729456, 8321686 },
+            { 21060490, -2212744, 15712757, -4336099, 1639040, 10656336,
+                23845965, -11874838, -9984458, 608372 },
         },
         {
-            {-13672732, -15087586, -10889693, -7557059, -6036909, 11305547,
-             1123968, -6780577, 27229399, 23887},
-            {-23244140, -294205, -11744728, 14712571, -29465699, -2029617,
-             12797024, -6440308, -1633405, 16678954},
-            {-29500620, 4770662, -16054387, 14001338, 7830047, 9564805,
-             -1508144, -4795045, -17169265, 4904953},
+            { -13672732, -15087586, -10889693, -7557059, -6036909, 11305547,
+                1123968, -6780577, 27229399, 23887 },
+            { -23244140, -294205, -11744728, 14712571, -29465699, -2029617,
+                12797024, -6440308, -1633405, 16678954 },
+            { -29500620, 4770662, -16054387, 14001338, 7830047, 9564805,
+                -1508144, -4795045, -17169265, 4904953 },
         },
         {
-            {24059557, 14617003, 19037157, -15039908, 19766093, -14906429,
-             5169211, 16191880, 2128236, -4326833},
-            {-16981152, 4124966, -8540610, -10653797, 30336522, -14105247,
-             -29806336, 916033, -6882542, -2986532},
-            {-22630907, 12419372, -7134229, -7473371, -16478904, 16739175,
-             285431, 2763829, 15736322, 4143876},
+            { 24059557, 14617003, 19037157, -15039908, 19766093, -14906429,
+                5169211, 16191880, 2128236, -4326833 },
+            { -16981152, 4124966, -8540610, -10653797, 30336522, -14105247,
+                -29806336, 916033, -6882542, -2986532 },
+            { -22630907, 12419372, -7134229, -7473371, -16478904, 16739175,
+                285431, 2763829, 15736322, 4143876 },
         },
         {
-            {2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801,
-             -14594663, 23527084, -16458268},
-            {33431127, -11130478, -17838966, -15626900, 8909499, 8376530,
-             -32625340, 4087881, -15188911, -14416214},
-            {1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055,
-             4357868, -4774191, -16323038},
+            { 2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801,
+                -14594663, 23527084, -16458268 },
+            { 33431127, -11130478, -17838966, -15626900, 8909499, 8376530,
+                -32625340, 4087881, -15188911, -14416214 },
+            { 1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055,
+                4357868, -4774191, -16323038 },
         },
     },
     {
         {
-            {6721966, 13833823, -23523388, -1551314, 26354293, -11863321,
-             23365147, -3949732, 7390890, 2759800},
-            {4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353,
-             -4264057, 1244380, -12919645},
-            {-4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413,
-             9208236, 15886429, 16489664},
+            { 6721966, 13833823, -23523388, -1551314, 26354293, -11863321,
+                23365147, -3949732, 7390890, 2759800 },
+            { 4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353,
+                -4264057, 1244380, -12919645 },
+            { -4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413,
+                9208236, 15886429, 16489664 },
         },
         {
-            {1996075, 10375649, 14346367, 13311202, -6874135, -16438411,
-             -13693198, 398369, -30606455, -712933},
-            {-25307465, 9795880, -2777414, 14878809, -33531835, 14780363,
-             13348553, 12076947, -30836462, 5113182},
-            {-17770784, 11797796, 31950843, 13929123, -25888302, 12288344,
-             -30341101, -7336386, 13847711, 5387222},
+            { 1996075, 10375649, 14346367, 13311202, -6874135, -16438411,
+                -13693198, 398369, -30606455, -712933 },
+            { -25307465, 9795880, -2777414, 14878809, -33531835, 14780363,
+                13348553, 12076947, -30836462, 5113182 },
+            { -17770784, 11797796, 31950843, 13929123, -25888302, 12288344,
+                -30341101, -7336386, 13847711, 5387222 },
         },
         {
-            {-18582163, -3416217, 17824843, -2340966, 22744343, -10442611,
-             8763061, 3617786, -19600662, 10370991},
-            {20246567, -14369378, 22358229, -543712, 18507283, -10413996,
-             14554437, -8746092, 32232924, 16763880},
-            {9648505, 10094563, 26416693, 14745928, -30374318, -6472621,
-             11094161, 15689506, 3140038, -16510092},
+            { -18582163, -3416217, 17824843, -2340966, 22744343, -10442611,
+                8763061, 3617786, -19600662, 10370991 },
+            { 20246567, -14369378, 22358229, -543712, 18507283, -10413996,
+                14554437, -8746092, 32232924, 16763880 },
+            { 9648505, 10094563, 26416693, 14745928, -30374318, -6472621,
+                11094161, 15689506, 3140038, -16510092 },
         },
         {
-            {-16160072, 5472695, 31895588, 4744994, 8823515, 10365685,
-             -27224800, 9448613, -28774454, 366295},
-            {19153450, 11523972, -11096490, -6503142, -24647631, 5420647,
-             28344573, 8041113, 719605, 11671788},
-            {8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916,
-             -15266516, 27000813, -10195553},
+            { -16160072, 5472695, 31895588, 4744994, 8823515, 10365685,
+                -27224800, 9448613, -28774454, 366295 },
+            { 19153450, 11523972, -11096490, -6503142, -24647631, 5420647,
+                28344573, 8041113, 719605, 11671788 },
+            { 8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916,
+                -15266516, 27000813, -10195553 },
         },
         {
-            {-15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065,
-             5336097, 6750977, -14521026},
-            {11836410, -3979488, 26297894, 16080799, 23455045, 15735944,
-             1695823, -8819122, 8169720, 16220347},
-            {-18115838, 8653647, 17578566, -6092619, -8025777, -16012763,
-             -11144307, -2627664, -5990708, -14166033},
+            { -15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065,
+                5336097, 6750977, -14521026 },
+            { 11836410, -3979488, 26297894, 16080799, 23455045, 15735944,
+                1695823, -8819122, 8169720, 16220347 },
+            { -18115838, 8653647, 17578566, -6092619, -8025777, -16012763,
+                -11144307, -2627664, -5990708, -14166033 },
         },
         {
-            {-23308498, -10968312, 15213228, -10081214, -30853605, -11050004,
-             27884329, 2847284, 2655861, 1738395},
-            {-27537433, -14253021, -25336301, -8002780, -9370762, 8129821,
-             21651608, -3239336, -19087449, -11005278},
-            {1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092,
-             5821408, 10478196, 8544890},
+            { -23308498, -10968312, 15213228, -10081214, -30853605, -11050004,
+                27884329, 2847284, 2655861, 1738395 },
+            { -27537433, -14253021, -25336301, -8002780, -9370762, 8129821,
+                21651608, -3239336, -19087449, -11005278 },
+            { 1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092,
+                5821408, 10478196, 8544890 },
         },
         {
-            {32173121, -16129311, 24896207, 3921497, 22579056, -3410854,
-             19270449, 12217473, 17789017, -3395995},
-            {-30552961, -2228401, -15578829, -10147201, 13243889, 517024,
-             15479401, -3853233, 30460520, 1052596},
-            {-11614875, 13323618, 32618793, 8175907, -15230173, 12596687,
-             27491595, -4612359, 3179268, -9478891},
+            { 32173121, -16129311, 24896207, 3921497, 22579056, -3410854,
+                19270449, 12217473, 17789017, -3395995 },
+            { -30552961, -2228401, -15578829, -10147201, 13243889, 517024,
+                15479401, -3853233, 30460520, 1052596 },
+            { -11614875, 13323618, 32618793, 8175907, -15230173, 12596687,
+                27491595, -4612359, 3179268, -9478891 },
         },
         {
-            {31947069, -14366651, -4640583, -15339921, -15125977, -6039709,
-             -14756777, -16411740, 19072640, -9511060},
-            {11685058, 11822410, 3158003, -13952594, 33402194, -4165066,
-             5977896, -5215017, 473099, 5040608},
-            {-20290863, 8198642, -27410132, 11602123, 1290375, -2799760,
-             28326862, 1721092, -19558642, -3131606},
+            { 31947069, -14366651, -4640583, -15339921, -15125977, -6039709,
+                -14756777, -16411740, 19072640, -9511060 },
+            { 11685058, 11822410, 3158003, -13952594, 33402194, -4165066,
+                5977896, -5215017, 473099, 5040608 },
+            { -20290863, 8198642, -27410132, 11602123, 1290375, -2799760,
+                28326862, 1721092, -19558642, -3131606 },
         },
     },
     {
         {
-            {7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786,
-             8076149, -27868496, 11538389},
-            {-19935666, 3899861, 18283497, -6801568, -15728660, -11249211,
-             8754525, 7446702, -5676054, 5797016},
-            {-11295600, -3793569, -15782110, -7964573, 12708869, -8456199,
-             2014099, -9050574, -2369172, -5877341},
+            { 7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786,
+                8076149, -27868496, 11538389 },
+            { -19935666, 3899861, 18283497, -6801568, -15728660, -11249211,
+                8754525, 7446702, -5676054, 5797016 },
+            { -11295600, -3793569, -15782110, -7964573, 12708869, -8456199,
+                2014099, -9050574, -2369172, -5877341 },
         },
         {
-            {-22472376, -11568741, -27682020, 1146375, 18956691, 16640559,
-             1192730, -3714199, 15123619, 10811505},
-            {14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363,
-             15776356, -28886779, -11974553},
-            {-28241164, -8072475, -4978962, -5315317, 29416931, 1847569,
-             -20654173, -16484855, 4714547, -9600655},
+            { -22472376, -11568741, -27682020, 1146375, 18956691, 16640559,
+                1192730, -3714199, 15123619, 10811505 },
+            { 14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363,
+                15776356, -28886779, -11974553 },
+            { -28241164, -8072475, -4978962, -5315317, 29416931, 1847569,
+                -20654173, -16484855, 4714547, -9600655 },
         },
         {
-            {15200332, 8368572, 19679101, 15970074, -31872674, 1959451,
-             24611599, -4543832, -11745876, 12340220},
-            {12876937, -10480056, 33134381, 6590940, -6307776, 14872440,
-             9613953, 8241152, 15370987, 9608631},
-            {-4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868,
-             15866074, -28210621, -8814099},
+            { 15200332, 8368572, 19679101, 15970074, -31872674, 1959451,
+                24611599, -4543832, -11745876, 12340220 },
+            { 12876937, -10480056, 33134381, 6590940, -6307776, 14872440,
+                9613953, 8241152, 15370987, 9608631 },
+            { -4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868,
+                15866074, -28210621, -8814099 },
         },
         {
-            {26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233,
-             858697, 20571223, 8420556},
-            {14620715, 13067227, -15447274, 8264467, 14106269, 15080814,
-             33531827, 12516406, -21574435, -12476749},
-            {236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519,
-             7256740, 8791136, 15069930},
+            { 26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233,
+                858697, 20571223, 8420556 },
+            { 14620715, 13067227, -15447274, 8264467, 14106269, 15080814,
+                33531827, 12516406, -21574435, -12476749 },
+            { 236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519,
+                7256740, 8791136, 15069930 },
         },
         {
-            {1276410, -9371918, 22949635, -16322807, -23493039, -5702186,
-             14711875, 4874229, -30663140, -2331391},
-            {5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175,
-             -7912378, -33069337, 9234253},
-            {20590503, -9018988, 31529744, -7352666, -2706834, 10650548,
-             31559055, -11609587, 18979186, 13396066},
+            { 1276410, -9371918, 22949635, -16322807, -23493039, -5702186,
+                14711875, 4874229, -30663140, -2331391 },
+            { 5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175,
+                -7912378, -33069337, 9234253 },
+            { 20590503, -9018988, 31529744, -7352666, -2706834, 10650548,
+                31559055, -11609587, 18979186, 13396066 },
         },
         {
-            {24474287, 4968103, 22267082, 4407354, 24063882, -8325180,
-             -18816887, 13594782, 33514650, 7021958},
-            {-11566906, -6565505, -21365085, 15928892, -26158305, 4315421,
-             -25948728, -3916677, -21480480, 12868082},
-            {-28635013, 13504661, 19988037, -2132761, 21078225, 6443208,
-             -21446107, 2244500, -12455797, -8089383},
+            { 24474287, 4968103, 22267082, 4407354, 24063882, -8325180,
+                -18816887, 13594782, 33514650, 7021958 },
+            { -11566906, -6565505, -21365085, 15928892, -26158305, 4315421,
+                -25948728, -3916677, -21480480, 12868082 },
+            { -28635013, 13504661, 19988037, -2132761, 21078225, 6443208,
+                -21446107, 2244500, -12455797, -8089383 },
         },
         {
-            {-30595528, 13793479, -5852820, 319136, -25723172, -6263899,
-             33086546, 8957937, -15233648, 5540521},
-            {-11630176, -11503902, -8119500, -7643073, 2620056, 1022908,
-             -23710744, -1568984, -16128528, -14962807},
-            {23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819,
-             892185, -11513277, -15205948},
+            { -30595528, 13793479, -5852820, 319136, -25723172, -6263899,
+                33086546, 8957937, -15233648, 5540521 },
+            { -11630176, -11503902, -8119500, -7643073, 2620056, 1022908,
+                -23710744, -1568984, -16128528, -14962807 },
+            { 23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819,
+                892185, -11513277, -15205948 },
         },
         {
-            {9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819,
-             4763127, -19179614, 5867134},
-            {-32765025, 1927590, 31726409, -4753295, 23962434, -16019500,
-             27846559, 5931263, -29749703, -16108455},
-            {27461885, -2977536, 22380810, 1815854, -23033753, -3031938,
-             7283490, -15148073, -19526700, 7734629},
+            { 9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819,
+                4763127, -19179614, 5867134 },
+            { -32765025, 1927590, 31726409, -4753295, 23962434, -16019500,
+                27846559, 5931263, -29749703, -16108455 },
+            { 27461885, -2977536, 22380810, 1815854, -23033753, -3031938,
+                7283490, -15148073, -19526700, 7734629 },
         },
     },
     {
         {
-            {-8010264, -9590817, -11120403, 6196038, 29344158, -13430885,
-             7585295, -3176626, 18549497, 15302069},
-            {-32658337, -6171222, -7672793, -11051681, 6258878, 13504381,
-             10458790, -6418461, -8872242, 8424746},
-            {24687205, 8613276, -30667046, -3233545, 1863892, -1830544,
-             19206234, 7134917, -11284482, -828919},
+            { -8010264, -9590817, -11120403, 6196038, 29344158, -13430885,
+                7585295, -3176626, 18549497, 15302069 },
+            { -32658337, -6171222, -7672793, -11051681, 6258878, 13504381,
+                10458790, -6418461, -8872242, 8424746 },
+            { 24687205, 8613276, -30667046, -3233545, 1863892, -1830544,
+                19206234, 7134917, -11284482, -828919 },
         },
         {
-            {11334899, -9218022, 8025293, 12707519, 17523892, -10476071,
-             10243738, -14685461, -5066034, 16498837},
-            {8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925,
-             -14124238, 6536641, 10543906},
-            {-28946384, 15479763, -17466835, 568876, -1497683, 11223454,
-             -2669190, -16625574, -27235709, 8876771},
+            { 11334899, -9218022, 8025293, 12707519, 17523892, -10476071,
+                10243738, -14685461, -5066034, 16498837 },
+            { 8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925,
+                -14124238, 6536641, 10543906 },
+            { -28946384, 15479763, -17466835, 568876, -1497683, 11223454,
+                -2669190, -16625574, -27235709, 8876771 },
         },
         {
-            {-25742899, -12566864, -15649966, -846607, -33026686, -796288,
-             -33481822, 15824474, -604426, -9039817},
-            {10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697,
-             -4890037, 1657394, 3084098},
-            {10477963, -7470260, 12119566, -13250805, 29016247, -5365589,
-             31280319, 14396151, -30233575, 15272409},
+            { -25742899, -12566864, -15649966, -846607, -33026686, -796288,
+                -33481822, 15824474, -604426, -9039817 },
+            { 10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697,
+                -4890037, 1657394, 3084098 },
+            { 10477963, -7470260, 12119566, -13250805, 29016247, -5365589,
+                31280319, 14396151, -30233575, 15272409 },
         },
         {
-            {-12288309, 3169463, 28813183, 16658753, 25116432, -5630466,
-             -25173957, -12636138, -25014757, 1950504},
-            {-26180358, 9489187, 11053416, -14746161, -31053720, 5825630,
-             -8384306, -8767532, 15341279, 8373727},
-            {28685821, 7759505, -14378516, -12002860, -31971820, 4079242,
-             298136, -10232602, -2878207, 15190420},
+            { -12288309, 3169463, 28813183, 16658753, 25116432, -5630466,
+                -25173957, -12636138, -25014757, 1950504 },
+            { -26180358, 9489187, 11053416, -14746161, -31053720, 5825630,
+                -8384306, -8767532, 15341279, 8373727 },
+            { 28685821, 7759505, -14378516, -12002860, -31971820, 4079242,
+                298136, -10232602, -2878207, 15190420 },
         },
         {
-            {-32932876, 13806336, -14337485, -15794431, -24004620, 10940928,
-             8669718, 2742393, -26033313, -6875003},
-            {-1580388, -11729417, -25979658, -11445023, -17411874, -10912854,
-             9291594, -16247779, -12154742, 6048605},
-            {-30305315, 14843444, 1539301, 11864366, 20201677, 1900163,
-             13934231, 5128323, 11213262, 9168384},
+            { -32932876, 13806336, -14337485, -15794431, -24004620, 10940928,
+                8669718, 2742393, -26033313, -6875003 },
+            { -1580388, -11729417, -25979658, -11445023, -17411874, -10912854,
+                9291594, -16247779, -12154742, 6048605 },
+            { -30305315, 14843444, 1539301, 11864366, 20201677, 1900163,
+                13934231, 5128323, 11213262, 9168384 },
         },
         {
-            {-26280513, 11007847, 19408960, -940758, -18592965, -4328580,
-             -5088060, -11105150, 20470157, -16398701},
-            {-23136053, 9282192, 14855179, -15390078, -7362815, -14408560,
-             -22783952, 14461608, 14042978, 5230683},
-            {29969567, -2741594, -16711867, -8552442, 9175486, -2468974,
-             21556951, 3506042, -5933891, -12449708},
+            { -26280513, 11007847, 19408960, -940758, -18592965, -4328580,
+                -5088060, -11105150, 20470157, -16398701 },
+            { -23136053, 9282192, 14855179, -15390078, -7362815, -14408560,
+                -22783952, 14461608, 14042978, 5230683 },
+            { 29969567, -2741594, -16711867, -8552442, 9175486, -2468974,
+                21556951, 3506042, -5933891, -12449708 },
         },
         {
-            {-3144746, 8744661, 19704003, 4581278, -20430686, 6830683,
-             -21284170, 8971513, -28539189, 15326563},
-            {-19464629, 10110288, -17262528, -3503892, -23500387, 1355669,
-             -15523050, 15300988, -20514118, 9168260},
-            {-5353335, 4488613, -23803248, 16314347, 7780487, -15638939,
-             -28948358, 9601605, 33087103, -9011387},
+            { -3144746, 8744661, 19704003, 4581278, -20430686, 6830683,
+                -21284170, 8971513, -28539189, 15326563 },
+            { -19464629, 10110288, -17262528, -3503892, -23500387, 1355669,
+                -15523050, 15300988, -20514118, 9168260 },
+            { -5353335, 4488613, -23803248, 16314347, 7780487, -15638939,
+                -28948358, 9601605, 33087103, -9011387 },
         },
         {
-            {-19443170, -15512900, -20797467, -12445323, -29824447, 10229461,
-             -27444329, -15000531, -5996870, 15664672},
-            {23294591, -16632613, -22650781, -8470978, 27844204, 11461195,
-             13099750, -2460356, 18151676, 13417686},
-            {-24722913, -4176517, -31150679, 5988919, -26858785, 6685065,
-             1661597, -12551441, 15271676, -15452665},
+            { -19443170, -15512900, -20797467, -12445323, -29824447, 10229461,
+                -27444329, -15000531, -5996870, 15664672 },
+            { 23294591, -16632613, -22650781, -8470978, 27844204, 11461195,
+                13099750, -2460356, 18151676, 13417686 },
+            { -24722913, -4176517, -31150679, 5988919, -26858785, 6685065,
+                1661597, -12551441, 15271676, -15452665 },
         },
     },
     {
         {
-            {11433042, -13228665, 8239631, -5279517, -1985436, -725718,
-             -18698764, 2167544, -6921301, -13440182},
-            {-31436171, 15575146, 30436815, 12192228, -22463353, 9395379,
-             -9917708, -8638997, 12215110, 12028277},
-            {14098400, 6555944, 23007258, 5757252, -15427832, -12950502,
-             30123440, 4617780, -16900089, -655628},
+            { 11433042, -13228665, 8239631, -5279517, -1985436, -725718,
+                -18698764, 2167544, -6921301, -13440182 },
+            { -31436171, 15575146, 30436815, 12192228, -22463353, 9395379,
+                -9917708, -8638997, 12215110, 12028277 },
+            { 14098400, 6555944, 23007258, 5757252, -15427832, -12950502,
+                30123440, 4617780, -16900089, -655628 },
         },
         {
-            {-4026201, -15240835, 11893168, 13718664, -14809462, 1847385,
-             -15819999, 10154009, 23973261, -12684474},
-            {-26531820, -3695990, -1908898, 2534301, -31870557, -16550355,
-             18341390, -11419951, 32013174, -10103539},
-            {-25479301, 10876443, -11771086, -14625140, -12369567, 1838104,
-             21911214, 6354752, 4425632, -837822},
+            { -4026201, -15240835, 11893168, 13718664, -14809462, 1847385,
+                -15819999, 10154009, 23973261, -12684474 },
+            { -26531820, -3695990, -1908898, 2534301, -31870557, -16550355,
+                18341390, -11419951, 32013174, -10103539 },
+            { -25479301, 10876443, -11771086, -14625140, -12369567, 1838104,
+                21911214, 6354752, 4425632, -837822 },
         },
         {
-            {-10433389, -14612966, 22229858, -3091047, -13191166, 776729,
-             -17415375, -12020462, 4725005, 14044970},
-            {19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390,
-             -1411784, -19522291, -16109756},
-            {-24864089, 12986008, -10898878, -5558584, -11312371, -148526,
-             19541418, 8180106, 9282262, 10282508},
+            { -10433389, -14612966, 22229858, -3091047, -13191166, 776729,
+                -17415375, -12020462, 4725005, 14044970 },
+            { 19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390,
+                -1411784, -19522291, -16109756 },
+            { -24864089, 12986008, -10898878, -5558584, -11312371, -148526,
+                19541418, 8180106, 9282262, 10282508 },
         },
         {
-            {-26205082, 4428547, -8661196, -13194263, 4098402, -14165257,
-             15522535, 8372215, 5542595, -10702683},
-            {-10562541, 14895633, 26814552, -16673850, -17480754, -2489360,
-             -2781891, 6993761, -18093885, 10114655},
-            {-20107055, -929418, 31422704, 10427861, -7110749, 6150669,
-             -29091755, -11529146, 25953725, -106158},
+            { -26205082, 4428547, -8661196, -13194263, 4098402, -14165257,
+                15522535, 8372215, 5542595, -10702683 },
+            { -10562541, 14895633, 26814552, -16673850, -17480754, -2489360,
+                -2781891, 6993761, -18093885, 10114655 },
+            { -20107055, -929418, 31422704, 10427861, -7110749, 6150669,
+                -29091755, -11529146, 25953725, -106158 },
         },
         {
-            {-4234397, -8039292, -9119125, 3046000, 2101609, -12607294,
-             19390020, 6094296, -3315279, 12831125},
-            {-15998678, 7578152, 5310217, 14408357, -33548620, -224739,
-             31575954, 6326196, 7381791, -2421839},
-            {-20902779, 3296811, 24736065, -16328389, 18374254, 7318640,
-             6295303, 8082724, -15362489, 12339664},
+            { -4234397, -8039292, -9119125, 3046000, 2101609, -12607294,
+                19390020, 6094296, -3315279, 12831125 },
+            { -15998678, 7578152, 5310217, 14408357, -33548620, -224739,
+                31575954, 6326196, 7381791, -2421839 },
+            { -20902779, 3296811, 24736065, -16328389, 18374254, 7318640,
+                6295303, 8082724, -15362489, 12339664 },
         },
         {
-            {27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414,
-             15768922, 25091167, 14856294},
-            {-18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300,
-             -12695493, -22182473, -9012899},
-            {-11423429, -5421590, 11632845, 3405020, 30536730, -11674039,
-             -27260765, 13866390, 30146206, 9142070},
+            { 27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414,
+                15768922, 25091167, 14856294 },
+            { -18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300,
+                -12695493, -22182473, -9012899 },
+            { -11423429, -5421590, 11632845, 3405020, 30536730, -11674039,
+                -27260765, 13866390, 30146206, 9142070 },
         },
         {
-            {3924129, -15307516, -13817122, -10054960, 12291820, -668366,
-             -27702774, 9326384, -8237858, 4171294},
-            {-15921940, 16037937, 6713787, 16606682, -21612135, 2790944,
-             26396185, 3731949, 345228, -5462949},
-            {-21327538, 13448259, 25284571, 1143661, 20614966, -8849387,
-             2031539, -12391231, -16253183, -13582083},
+            { 3924129, -15307516, -13817122, -10054960, 12291820, -668366,
+                -27702774, 9326384, -8237858, 4171294 },
+            { -15921940, 16037937, 6713787, 16606682, -21612135, 2790944,
+                26396185, 3731949, 345228, -5462949 },
+            { -21327538, 13448259, 25284571, 1143661, 20614966, -8849387,
+                2031539, -12391231, -16253183, -13582083 },
         },
         {
-            {31016211, -16722429, 26371392, -14451233, -5027349, 14854137,
-             17477601, 3842657, 28012650, -16405420},
-            {-5075835, 9368966, -8562079, -4600902, -15249953, 6970560,
-             -9189873, 16292057, -8867157, 3507940},
-            {29439664, 3537914, 23333589, 6997794, -17555561, -11018068,
-             -15209202, -15051267, -9164929, 6580396},
+            { 31016211, -16722429, 26371392, -14451233, -5027349, 14854137,
+                17477601, 3842657, 28012650, -16405420 },
+            { -5075835, 9368966, -8562079, -4600902, -15249953, 6970560,
+                -9189873, 16292057, -8867157, 3507940 },
+            { 29439664, 3537914, 23333589, 6997794, -17555561, -11018068,
+                -15209202, -15051267, -9164929, 6580396 },
         },
     },
     {
         {
-            {-12185861, -7679788, 16438269, 10826160, -8696817, -6235611,
-             17860444, -9273846, -2095802, 9304567},
-            {20714564, -4336911, 29088195, 7406487, 11426967, -5095705,
-             14792667, -14608617, 5289421, -477127},
-            {-16665533, -10650790, -6160345, -13305760, 9192020, -1802462,
-             17271490, 12349094, 26939669, -3752294},
+            { -12185861, -7679788, 16438269, 10826160, -8696817, -6235611,
+                17860444, -9273846, -2095802, 9304567 },
+            { 20714564, -4336911, 29088195, 7406487, 11426967, -5095705,
+                14792667, -14608617, 5289421, -477127 },
+            { -16665533, -10650790, -6160345, -13305760, 9192020, -1802462,
+                17271490, 12349094, 26939669, -3752294 },
         },
         {
-            {-12889898, 9373458, 31595848, 16374215, 21471720, 13221525,
-             -27283495, -12348559, -3698806, 117887},
-            {22263325, -6560050, 3984570, -11174646, -15114008, -566785,
-             28311253, 5358056, -23319780, 541964},
-            {16259219, 3261970, 2309254, -15534474, -16885711, -4581916,
-             24134070, -16705829, -13337066, -13552195},
+            { -12889898, 9373458, 31595848, 16374215, 21471720, 13221525,
+                -27283495, -12348559, -3698806, 117887 },
+            { 22263325, -6560050, 3984570, -11174646, -15114008, -566785,
+                28311253, 5358056, -23319780, 541964 },
+            { 16259219, 3261970, 2309254, -15534474, -16885711, -4581916,
+                24134070, -16705829, -13337066, -13552195 },
         },
         {
-            {9378160, -13140186, -22845982, -12745264, 28198281, -7244098,
-             -2399684, -717351, 690426, 14876244},
-            {24977353, -314384, -8223969, -13465086, 28432343, -1176353,
-             -13068804, -12297348, -22380984, 6618999},
-            {-1538174, 11685646, 12944378, 13682314, -24389511, -14413193,
-             8044829, -13817328, 32239829, -5652762},
+            { 9378160, -13140186, -22845982, -12745264, 28198281, -7244098,
+                -2399684, -717351, 690426, 14876244 },
+            { 24977353, -314384, -8223969, -13465086, 28432343, -1176353,
+                -13068804, -12297348, -22380984, 6618999 },
+            { -1538174, 11685646, 12944378, 13682314, -24389511, -14413193,
+                8044829, -13817328, 32239829, -5652762 },
         },
         {
-            {-18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647,
-             -10350059, 32779359, 5095274},
-            {-33008130, -5214506, -32264887, -3685216, 9460461, -9327423,
-             -24601656, 14506724, 21639561, -2630236},
-            {-16400943, -13112215, 25239338, 15531969, 3987758, -4499318,
-             -1289502, -6863535, 17874574, 558605},
+            { -18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647,
+                -10350059, 32779359, 5095274 },
+            { -33008130, -5214506, -32264887, -3685216, 9460461, -9327423,
+                -24601656, 14506724, 21639561, -2630236 },
+            { -16400943, -13112215, 25239338, 15531969, 3987758, -4499318,
+                -1289502, -6863535, 17874574, 558605 },
         },
         {
-            {-13600129, 10240081, 9171883, 16131053, -20869254, 9599700,
-             33499487, 5080151, 2085892, 5119761},
-            {-22205145, -2519528, -16381601, 414691, -25019550, 2170430,
-             30634760, -8363614, -31999993, -5759884},
-            {-6845704, 15791202, 8550074, -1312654, 29928809, -12092256,
-             27534430, -7192145, -22351378, 12961482},
+            { -13600129, 10240081, 9171883, 16131053, -20869254, 9599700,
+                33499487, 5080151, 2085892, 5119761 },
+            { -22205145, -2519528, -16381601, 414691, -25019550, 2170430,
+                30634760, -8363614, -31999993, -5759884 },
+            { -6845704, 15791202, 8550074, -1312654, 29928809, -12092256,
+                27534430, -7192145, -22351378, 12961482 },
         },
         {
-            {-24492060, -9570771, 10368194, 11582341, -23397293, -2245287,
-             16533930, 8206996, -30194652, -5159638},
-            {-11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630,
-             7031275, 7589640, 8945490},
-            {-32152748, 8917967, 6661220, -11677616, -1192060, -15793393,
-             7251489, -11182180, 24099109, -14456170},
+            { -24492060, -9570771, 10368194, 11582341, -23397293, -2245287,
+                16533930, 8206996, -30194652, -5159638 },
+            { -11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630,
+                7031275, 7589640, 8945490 },
+            { -32152748, 8917967, 6661220, -11677616, -1192060, -15793393,
+                7251489, -11182180, 24099109, -14456170 },
         },
         {
-            {5019558, -7907470, 4244127, -14714356, -26933272, 6453165,
-             -19118182, -13289025, -6231896, -10280736},
-            {10853594, 10721687, 26480089, 5861829, -22995819, 1972175,
-             -1866647, -10557898, -3363451, -6441124},
-            {-17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661,
-             -2008168, -13866408, 7421392},
+            { 5019558, -7907470, 4244127, -14714356, -26933272, 6453165,
+                -19118182, -13289025, -6231896, -10280736 },
+            { 10853594, 10721687, 26480089, 5861829, -22995819, 1972175,
+                -1866647, -10557898, -3363451, -6441124 },
+            { -17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661,
+                -2008168, -13866408, 7421392 },
         },
         {
-            {8139927, -6546497, 32257646, -5890546, 30375719, 1886181,
-             -21175108, 15441252, 28826358, -4123029},
-            {6267086, 9695052, 7709135, -16603597, -32869068, -1886135,
-             14795160, -7840124, 13746021, -1742048},
-            {28584902, 7787108, -6732942, -15050729, 22846041, -7571236,
-             -3181936, -363524, 4771362, -8419958},
+            { 8139927, -6546497, 32257646, -5890546, 30375719, 1886181,
+                -21175108, 15441252, 28826358, -4123029 },
+            { 6267086, 9695052, 7709135, -16603597, -32869068, -1886135,
+                14795160, -7840124, 13746021, -1742048 },
+            { 28584902, 7787108, -6732942, -15050729, 22846041, -7571236,
+                -3181936, -363524, 4771362, -8419958 },
         },
     },
     {
         {
-            {24949256, 6376279, -27466481, -8174608, -18646154, -9930606,
-             33543569, -12141695, 3569627, 11342593},
-            {26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886,
-             4608608, 7325975, -14801071},
-            {-11618399, -14554430, -24321212, 7655128, -1369274, 5214312,
-             -27400540, 10258390, -17646694, -8186692},
+            { 24949256, 6376279, -27466481, -8174608, -18646154, -9930606,
+                33543569, -12141695, 3569627, 11342593 },
+            { 26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886,
+                4608608, 7325975, -14801071 },
+            { -11618399, -14554430, -24321212, 7655128, -1369274, 5214312,
+                -27400540, 10258390, -17646694, -8186692 },
         },
         {
-            {11431204, 15823007, 26570245, 14329124, 18029990, 4796082,
-             -31446179, 15580664, 9280358, -3973687},
-            {-160783, -10326257, -22855316, -4304997, -20861367, -13621002,
-             -32810901, -11181622, -15545091, 4387441},
-            {-20799378, 12194512, 3937617, -5805892, -27154820, 9340370,
-             -24513992, 8548137, 20617071, -7482001},
+            { 11431204, 15823007, 26570245, 14329124, 18029990, 4796082,
+                -31446179, 15580664, 9280358, -3973687 },
+            { -160783, -10326257, -22855316, -4304997, -20861367, -13621002,
+                -32810901, -11181622, -15545091, 4387441 },
+            { -20799378, 12194512, 3937617, -5805892, -27154820, 9340370,
+                -24513992, 8548137, 20617071, -7482001 },
         },
         {
-            {-938825, -3930586, -8714311, 16124718, 24603125, -6225393,
-             -13775352, -11875822, 24345683, 10325460},
-            {-19855277, -1568885, -22202708, 8714034, 14007766, 6928528,
-             16318175, -1010689, 4766743, 3552007},
-            {-21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514,
-             14481909, 10988822, -3994762},
+            { -938825, -3930586, -8714311, 16124718, 24603125, -6225393,
+                -13775352, -11875822, 24345683, 10325460 },
+            { -19855277, -1568885, -22202708, 8714034, 14007766, 6928528,
+                16318175, -1010689, 4766743, 3552007 },
+            { -21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514,
+                14481909, 10988822, -3994762 },
         },
         {
-            {15564307, -14311570, 3101243, 5684148, 30446780, -8051356,
-             12677127, -6505343, -8295852, 13296005},
-            {-9442290, 6624296, -30298964, -11913677, -4670981, -2057379,
-             31521204, 9614054, -30000824, 12074674},
-            {4771191, -135239, 14290749, -13089852, 27992298, 14998318,
-             -1413936, -1556716, 29832613, -16391035},
+            { 15564307, -14311570, 3101243, 5684148, 30446780, -8051356,
+                12677127, -6505343, -8295852, 13296005 },
+            { -9442290, 6624296, -30298964, -11913677, -4670981, -2057379,
+                31521204, 9614054, -30000824, 12074674 },
+            { 4771191, -135239, 14290749, -13089852, 27992298, 14998318,
+                -1413936, -1556716, 29832613, -16391035 },
         },
         {
-            {7064884, -7541174, -19161962, -5067537, -18891269, -2912736,
-             25825242, 5293297, -27122660, 13101590},
-            {-2298563, 2439670, -7466610, 1719965, -27267541, -16328445,
-             32512469, -5317593, -30356070, -4190957},
-            {-30006540, 10162316, -33180176, 3981723, -16482138, -13070044,
-             14413974, 9515896, 19568978, 9628812},
+            { 7064884, -7541174, -19161962, -5067537, -18891269, -2912736,
+                25825242, 5293297, -27122660, 13101590 },
+            { -2298563, 2439670, -7466610, 1719965, -27267541, -16328445,
+                32512469, -5317593, -30356070, -4190957 },
+            { -30006540, 10162316, -33180176, 3981723, -16482138, -13070044,
+                14413974, 9515896, 19568978, 9628812 },
         },
         {
-            {33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894,
-             -6106839, -6291786, 3437740},
-            {-18978877, 3884493, 19469877, 12726490, 15913552, 13614290,
-             -22961733, 70104, 7463304, 4176122},
-            {-27124001, 10659917, 11482427, -16070381, 12771467, -6635117,
-             -32719404, -5322751, 24216882, 5944158},
+            { 33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894,
+                -6106839, -6291786, 3437740 },
+            { -18978877, 3884493, 19469877, 12726490, 15913552, 13614290,
+                -22961733, 70104, 7463304, 4176122 },
+            { -27124001, 10659917, 11482427, -16070381, 12771467, -6635117,
+                -32719404, -5322751, 24216882, 5944158 },
         },
         {
-            {8894125, 7450974, -2664149, -9765752, -28080517, -12389115,
-             19345746, 14680796, 11632993, 5847885},
-            {26942781, -2315317, 9129564, -4906607, 26024105, 11769399,
-             -11518837, 6367194, -9727230, 4782140},
-            {19916461, -4828410, -22910704, -11414391, 25606324, -5972441,
-             33253853, 8220911, 6358847, -1873857},
+            { 8894125, 7450974, -2664149, -9765752, -28080517, -12389115,
+                19345746, 14680796, 11632993, 5847885 },
+            { 26942781, -2315317, 9129564, -4906607, 26024105, 11769399,
+                -11518837, 6367194, -9727230, 4782140 },
+            { 19916461, -4828410, -22910704, -11414391, 25606324, -5972441,
+                33253853, 8220911, 6358847, -1873857 },
         },
         {
-            {801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388,
-             -4480480, -13538503, 1387155},
-            {19646058, 5720633, -11416706, 12814209, 11607948, 12749789,
-             14147075, 15156355, -21866831, 11835260},
-            {19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523,
-             15467869, -26560550, 5052483},
+            { 801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388,
+                -4480480, -13538503, 1387155 },
+            { 19646058, 5720633, -11416706, 12814209, 11607948, 12749789,
+                14147075, 15156355, -21866831, 11835260 },
+            { 19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523,
+                15467869, -26560550, 5052483 },
         },
     },
     {
         {
-            {-3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123,
-             -12618185, 12228557, -7003677},
-            {32944382, 14922211, -22844894, 5188528, 21913450, -8719943,
-             4001465, 13238564, -6114803, 8653815},
-            {22865569, -4652735, 27603668, -12545395, 14348958, 8234005,
-             24808405, 5719875, 28483275, 2841751},
+            { -3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123,
+                -12618185, 12228557, -7003677 },
+            { 32944382, 14922211, -22844894, 5188528, 21913450, -8719943,
+                4001465, 13238564, -6114803, 8653815 },
+            { 22865569, -4652735, 27603668, -12545395, 14348958, 8234005,
+                24808405, 5719875, 28483275, 2841751 },
         },
         {
-            {-16420968, -1113305, -327719, -12107856, 21886282, -15552774,
-             -1887966, -315658, 19932058, -12739203},
-            {-11656086, 10087521, -8864888, -5536143, -19278573, -3055912,
-             3999228, 13239134, -4777469, -13910208},
-            {1382174, -11694719, 17266790, 9194690, -13324356, 9720081,
-             20403944, 11284705, -14013818, 3093230},
+            { -16420968, -1113305, -327719, -12107856, 21886282, -15552774,
+                -1887966, -315658, 19932058, -12739203 },
+            { -11656086, 10087521, -8864888, -5536143, -19278573, -3055912,
+                3999228, 13239134, -4777469, -13910208 },
+            { 1382174, -11694719, 17266790, 9194690, -13324356, 9720081,
+                20403944, 11284705, -14013818, 3093230 },
         },
         {
-            {16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424,
-             16271225, -24049421, -6691850},
-            {-21911077, -5927941, -4611316, -5560156, -31744103, -10785293,
-             24123614, 15193618, -21652117, -16739389},
-            {-9935934, -4289447, -25279823, 4372842, 2087473, 10399484,
-             31870908, 14690798, 17361620, 11864968},
+            { 16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424,
+                16271225, -24049421, -6691850 },
+            { -21911077, -5927941, -4611316, -5560156, -31744103, -10785293,
+                24123614, 15193618, -21652117, -16739389 },
+            { -9935934, -4289447, -25279823, 4372842, 2087473, 10399484,
+                31870908, 14690798, 17361620, 11864968 },
         },
         {
-            {-11307610, 6210372, 13206574, 5806320, -29017692, -13967200,
-             -12331205, -7486601, -25578460, -16240689},
-            {14668462, -12270235, 26039039, 15305210, 25515617, 4542480,
-             10453892, 6577524, 9145645, -6443880},
-            {5974874, 3053895, -9433049, -10385191, -31865124, 3225009,
-             -7972642, 3936128, -5652273, -3050304},
+            { -11307610, 6210372, 13206574, 5806320, -29017692, -13967200,
+                -12331205, -7486601, -25578460, -16240689 },
+            { 14668462, -12270235, 26039039, 15305210, 25515617, 4542480,
+                10453892, 6577524, 9145645, -6443880 },
+            { 5974874, 3053895, -9433049, -10385191, -31865124, 3225009,
+                -7972642, 3936128, -5652273, -3050304 },
         },
         {
-            {30625386, -4729400, -25555961, -12792866, -20484575, 7695099,
-             17097188, -16303496, -27999779, 1803632},
-            {-3553091, 9865099, -5228566, 4272701, -5673832, -16689700,
-             14911344, 12196514, -21405489, 7047412},
-            {20093277, 9920966, -11138194, -5343857, 13161587, 12044805,
-             -32856851, 4124601, -32343828, -10257566},
+            { 30625386, -4729400, -25555961, -12792866, -20484575, 7695099,
+                17097188, -16303496, -27999779, 1803632 },
+            { -3553091, 9865099, -5228566, 4272701, -5673832, -16689700,
+                14911344, 12196514, -21405489, 7047412 },
+            { 20093277, 9920966, -11138194, -5343857, 13161587, 12044805,
+                -32856851, 4124601, -32343828, -10257566 },
         },
         {
-            {-20788824, 14084654, -13531713, 7842147, 19119038, -13822605,
-             4752377, -8714640, -21679658, 2288038},
-            {-26819236, -3283715, 29965059, 3039786, -14473765, 2540457,
-             29457502, 14625692, -24819617, 12570232},
-            {-1063558, -11551823, 16920318, 12494842, 1278292, -5869109,
-             -21159943, -3498680, -11974704, 4724943},
+            { -20788824, 14084654, -13531713, 7842147, 19119038, -13822605,
+                4752377, -8714640, -21679658, 2288038 },
+            { -26819236, -3283715, 29965059, 3039786, -14473765, 2540457,
+                29457502, 14625692, -24819617, 12570232 },
+            { -1063558, -11551823, 16920318, 12494842, 1278292, -5869109,
+                -21159943, -3498680, -11974704, 4724943 },
         },
         {
-            {17960970, -11775534, -4140968, -9702530, -8876562, -1410617,
-             -12907383, -8659932, -29576300, 1903856},
-            {23134274, -14279132, -10681997, -1611936, 20684485, 15770816,
-             -12989750, 3190296, 26955097, 14109738},
-            {15308788, 5320727, -30113809, -14318877, 22902008, 7767164,
-             29425325, -11277562, 31960942, 11934971},
+            { 17960970, -11775534, -4140968, -9702530, -8876562, -1410617,
+                -12907383, -8659932, -29576300, 1903856 },
+            { 23134274, -14279132, -10681997, -1611936, 20684485, 15770816,
+                -12989750, 3190296, 26955097, 14109738 },
+            { 15308788, 5320727, -30113809, -14318877, 22902008, 7767164,
+                29425325, -11277562, 31960942, 11934971 },
         },
         {
-            {-27395711, 8435796, 4109644, 12222639, -24627868, 14818669,
-             20638173, 4875028, 10491392, 1379718},
-            {-13159415, 9197841, 3875503, -8936108, -1383712, -5879801,
-             33518459, 16176658, 21432314, 12180697},
-            {-11787308, 11500838, 13787581, -13832590, -22430679, 10140205,
-             1465425, 12689540, -10301319, -13872883},
+            { -27395711, 8435796, 4109644, 12222639, -24627868, 14818669,
+                20638173, 4875028, 10491392, 1379718 },
+            { -13159415, 9197841, 3875503, -8936108, -1383712, -5879801,
+                33518459, 16176658, 21432314, 12180697 },
+            { -11787308, 11500838, 13787581, -13832590, -22430679, 10140205,
+                1465425, 12689540, -10301319, -13872883 },
         },
     },
     {
         {
-            {5414091, -15386041, -21007664, 9643570, 12834970, 1186149,
-             -2622916, -1342231, 26128231, 6032912},
-            {-26337395, -13766162, 32496025, -13653919, 17847801, -12669156,
-             3604025, 8316894, -25875034, -10437358},
-            {3296484, 6223048, 24680646, -12246460, -23052020, 5903205,
-             -8862297, -4639164, 12376617, 3188849},
+            { 5414091, -15386041, -21007664, 9643570, 12834970, 1186149,
+                -2622916, -1342231, 26128231, 6032912 },
+            { -26337395, -13766162, 32496025, -13653919, 17847801, -12669156,
+                3604025, 8316894, -25875034, -10437358 },
+            { 3296484, 6223048, 24680646, -12246460, -23052020, 5903205,
+                -8862297, -4639164, 12376617, 3188849 },
         },
         {
-            {29190488, -14659046, 27549113, -1183516, 3520066, -10697301,
-             32049515, -7309113, -16109234, -9852307},
-            {-14744486, -9309156, 735818, -598978, -20407687, -5057904,
-             25246078, -15795669, 18640741, -960977},
-            {-6928835, -16430795, 10361374, 5642961, 4910474, 12345252,
-             -31638386, -494430, 10530747, 1053335},
+            { 29190488, -14659046, 27549113, -1183516, 3520066, -10697301,
+                32049515, -7309113, -16109234, -9852307 },
+            { -14744486, -9309156, 735818, -598978, -20407687, -5057904,
+                25246078, -15795669, 18640741, -960977 },
+            { -6928835, -16430795, 10361374, 5642961, 4910474, 12345252,
+                -31638386, -494430, 10530747, 1053335 },
         },
         {
-            {-29265967, -14186805, -13538216, -12117373, -19457059, -10655384,
-             -31462369, -2948985, 24018831, 15026644},
-            {-22592535, -3145277, -2289276, 5953843, -13440189, 9425631,
-             25310643, 13003497, -2314791, -15145616},
-            {-27419985, -603321, -8043984, -1669117, -26092265, 13987819,
-             -27297622, 187899, -23166419, -2531735},
+            { -29265967, -14186805, -13538216, -12117373, -19457059, -10655384,
+                -31462369, -2948985, 24018831, 15026644 },
+            { -22592535, -3145277, -2289276, 5953843, -13440189, 9425631,
+                25310643, 13003497, -2314791, -15145616 },
+            { -27419985, -603321, -8043984, -1669117, -26092265, 13987819,
+                -27297622, 187899, -23166419, -2531735 },
         },
         {
-            {-21744398, -13810475, 1844840, 5021428, -10434399, -15911473,
-             9716667, 16266922, -5070217, 726099},
-            {29370922, -6053998, 7334071, -15342259, 9385287, 2247707,
-             -13661962, -4839461, 30007388, -15823341},
-            {-936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109,
-             730663, 9835848, 4555336},
+            { -21744398, -13810475, 1844840, 5021428, -10434399, -15911473,
+                9716667, 16266922, -5070217, 726099 },
+            { 29370922, -6053998, 7334071, -15342259, 9385287, 2247707,
+                -13661962, -4839461, 30007388, -15823341 },
+            { -936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109,
+                730663, 9835848, 4555336 },
         },
         {
-            {-23376435, 1410446, -22253753, -12899614, 30867635, 15826977,
-             17693930, 544696, -11985298, 12422646},
-            {31117226, -12215734, -13502838, 6561947, -9876867, -12757670,
-             -5118685, -4096706, 29120153, 13924425},
-            {-17400879, -14233209, 19675799, -2734756, -11006962, -5858820,
-             -9383939, -11317700, 7240931, -237388},
+            { -23376435, 1410446, -22253753, -12899614, 30867635, 15826977,
+                17693930, 544696, -11985298, 12422646 },
+            { 31117226, -12215734, -13502838, 6561947, -9876867, -12757670,
+                -5118685, -4096706, 29120153, 13924425 },
+            { -17400879, -14233209, 19675799, -2734756, -11006962, -5858820,
+                -9383939, -11317700, 7240931, -237388 },
         },
         {
-            {-31361739, -11346780, -15007447, -5856218, -22453340, -12152771,
-             1222336, 4389483, 3293637, -15551743},
-            {-16684801, -14444245, 11038544, 11054958, -13801175, -3338533,
-             -24319580, 7733547, 12796905, -6335822},
-            {-8759414, -10817836, -25418864, 10783769, -30615557, -9746811,
-             -28253339, 3647836, 3222231, -11160462},
+            { -31361739, -11346780, -15007447, -5856218, -22453340, -12152771,
+                1222336, 4389483, 3293637, -15551743 },
+            { -16684801, -14444245, 11038544, 11054958, -13801175, -3338533,
+                -24319580, 7733547, 12796905, -6335822 },
+            { -8759414, -10817836, -25418864, 10783769, -30615557, -9746811,
+                -28253339, 3647836, 3222231, -11160462 },
         },
         {
-            {18606113, 1693100, -25448386, -15170272, 4112353, 10045021,
-             23603893, -2048234, -7550776, 2484985},
-            {9255317, -3131197, -12156162, -1004256, 13098013, -9214866,
-             16377220, -2102812, -19802075, -3034702},
-            {-22729289, 7496160, -5742199, 11329249, 19991973, -3347502,
-             -31718148, 9936966, -30097688, -10618797},
+            { 18606113, 1693100, -25448386, -15170272, 4112353, 10045021,
+                23603893, -2048234, -7550776, 2484985 },
+            { 9255317, -3131197, -12156162, -1004256, 13098013, -9214866,
+                16377220, -2102812, -19802075, -3034702 },
+            { -22729289, 7496160, -5742199, 11329249, 19991973, -3347502,
+                -31718148, 9936966, -30097688, -10618797 },
         },
         {
-            {21878590, -5001297, 4338336, 13643897, -3036865, 13160960,
-             19708896, 5415497, -7360503, -4109293},
-            {27736861, 10103576, 12500508, 8502413, -3413016, -9633558,
-             10436918, -1550276, -23659143, -8132100},
-            {19492550, -12104365, -29681976, -852630, -3208171, 12403437,
-             30066266, 8367329, 13243957, 8709688},
+            { 21878590, -5001297, 4338336, 13643897, -3036865, 13160960,
+                19708896, 5415497, -7360503, -4109293 },
+            { 27736861, 10103576, 12500508, 8502413, -3413016, -9633558,
+                10436918, -1550276, -23659143, -8132100 },
+            { 19492550, -12104365, -29681976, -852630, -3208171, 12403437,
+                30066266, 8367329, 13243957, 8709688 },
         },
     },
     {
         {
-            {12015105, 2801261, 28198131, 10151021, 24818120, -4743133,
-             -11194191, -5645734, 5150968, 7274186},
-            {2831366, -12492146, 1478975, 6122054, 23825128, -12733586,
-             31097299, 6083058, 31021603, -9793610},
-            {-2529932, -2229646, 445613, 10720828, -13849527, -11505937,
-             -23507731, 16354465, 15067285, -14147707},
+            { 12015105, 2801261, 28198131, 10151021, 24818120, -4743133,
+                -11194191, -5645734, 5150968, 7274186 },
+            { 2831366, -12492146, 1478975, 6122054, 23825128, -12733586,
+                31097299, 6083058, 31021603, -9793610 },
+            { -2529932, -2229646, 445613, 10720828, -13849527, -11505937,
+                -23507731, 16354465, 15067285, -14147707 },
         },
         {
-            {7840942, 14037873, -33364863, 15934016, -728213, -3642706,
-             21403988, 1057586, -19379462, -12403220},
-            {915865, -16469274, 15608285, -8789130, -24357026, 6060030,
-             -17371319, 8410997, -7220461, 16527025},
-            {32922597, -556987, 20336074, -16184568, 10903705, -5384487,
-             16957574, 52992, 23834301, 6588044},
+            { 7840942, 14037873, -33364863, 15934016, -728213, -3642706,
+                21403988, 1057586, -19379462, -12403220 },
+            { 915865, -16469274, 15608285, -8789130, -24357026, 6060030,
+                -17371319, 8410997, -7220461, 16527025 },
+            { 32922597, -556987, 20336074, -16184568, 10903705, -5384487,
+                16957574, 52992, 23834301, 6588044 },
         },
         {
-            {32752030, 11232950, 3381995, -8714866, 22652988, -10744103,
-             17159699, 16689107, -20314580, -1305992},
-            {-4689649, 9166776, -25710296, -10847306, 11576752, 12733943,
-             7924251, -2752281, 1976123, -7249027},
-            {21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041,
-             -3371252, 12331345, -8237197},
+            { 32752030, 11232950, 3381995, -8714866, 22652988, -10744103,
+                17159699, 16689107, -20314580, -1305992 },
+            { -4689649, 9166776, -25710296, -10847306, 11576752, 12733943,
+                7924251, -2752281, 1976123, -7249027 },
+            { 21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041,
+                -3371252, 12331345, -8237197 },
         },
         {
-            {8651614, -4477032, -16085636, -4996994, 13002507, 2950805,
-             29054427, -5106970, 10008136, -4667901},
-            {31486080, 15114593, -14261250, 12951354, 14369431, -7387845,
-             16347321, -13662089, 8684155, -10532952},
-            {19443825, 11385320, 24468943, -9659068, -23919258, 2187569,
-             -26263207, -6086921, 31316348, 14219878},
+            { 8651614, -4477032, -16085636, -4996994, 13002507, 2950805,
+                29054427, -5106970, 10008136, -4667901 },
+            { 31486080, 15114593, -14261250, 12951354, 14369431, -7387845,
+                16347321, -13662089, 8684155, -10532952 },
+            { 19443825, 11385320, 24468943, -9659068, -23919258, 2187569,
+                -26263207, -6086921, 31316348, 14219878 },
         },
         {
-            {-28594490, 1193785, 32245219, 11392485, 31092169, 15722801,
-             27146014, 6992409, 29126555, 9207390},
-            {32382935, 1110093, 18477781, 11028262, -27411763, -7548111,
-             -4980517, 10843782, -7957600, -14435730},
-            {2814918, 7836403, 27519878, -7868156, -20894015, -11553689,
-             -21494559, 8550130, 28346258, 1994730},
+            { -28594490, 1193785, 32245219, 11392485, 31092169, 15722801,
+                27146014, 6992409, 29126555, 9207390 },
+            { 32382935, 1110093, 18477781, 11028262, -27411763, -7548111,
+                -4980517, 10843782, -7957600, -14435730 },
+            { 2814918, 7836403, 27519878, -7868156, -20894015, -11553689,
+                -21494559, 8550130, 28346258, 1994730 },
         },
         {
-            {-19578299, 8085545, -14000519, -3948622, 2785838, -16231307,
-             -19516951, 7174894, 22628102, 8115180},
-            {-30405132, 955511, -11133838, -15078069, -32447087, -13278079,
-             -25651578, 3317160, -9943017, 930272},
-            {-15303681, -6833769, 28856490, 1357446, 23421993, 1057177,
-             24091212, -1388970, -22765376, -10650715},
+            { -19578299, 8085545, -14000519, -3948622, 2785838, -16231307,
+                -19516951, 7174894, 22628102, 8115180 },
+            { -30405132, 955511, -11133838, -15078069, -32447087, -13278079,
+                -25651578, 3317160, -9943017, 930272 },
+            { -15303681, -6833769, 28856490, 1357446, 23421993, 1057177,
+                24091212, -1388970, -22765376, -10650715 },
         },
         {
-            {-22751231, -5303997, -12907607, -12768866, -15811511, -7797053,
-             -14839018, -16554220, -1867018, 8398970},
-            {-31969310, 2106403, -4736360, 1362501, 12813763, 16200670,
-             22981545, -6291273, 18009408, -15772772},
-            {-17220923, -9545221, -27784654, 14166835, 29815394, 7444469,
-             29551787, -3727419, 19288549, 1325865},
+            { -22751231, -5303997, -12907607, -12768866, -15811511, -7797053,
+                -14839018, -16554220, -1867018, 8398970 },
+            { -31969310, 2106403, -4736360, 1362501, 12813763, 16200670,
+                22981545, -6291273, 18009408, -15772772 },
+            { -17220923, -9545221, -27784654, 14166835, 29815394, 7444469,
+                29551787, -3727419, 19288549, 1325865 },
         },
         {
-            {15100157, -15835752, -23923978, -1005098, -26450192, 15509408,
-             12376730, -3479146, 33166107, -8042750},
-            {20909231, 13023121, -9209752, 16251778, -5778415, -8094914,
-             12412151, 10018715, 2213263, -13878373},
-            {32529814, -11074689, 30361439, -16689753, -9135940, 1513226,
-             22922121, 6382134, -5766928, 8371348},
+            { 15100157, -15835752, -23923978, -1005098, -26450192, 15509408,
+                12376730, -3479146, 33166107, -8042750 },
+            { 20909231, 13023121, -9209752, 16251778, -5778415, -8094914,
+                12412151, 10018715, 2213263, -13878373 },
+            { 32529814, -11074689, 30361439, -16689753, -9135940, 1513226,
+                22922121, 6382134, -5766928, 8371348 },
         },
     },
     {
         {
-            {9923462, 11271500, 12616794, 3544722, -29998368, -1721626,
-             12891687, -8193132, -26442943, 10486144},
-            {-22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726,
-             2610596, -23921530, -11455195},
-            {5408411, -1136691, -4969122, 10561668, 24145918, 14240566,
-             31319731, -4235541, 19985175, -3436086},
+            { 9923462, 11271500, 12616794, 3544722, -29998368, -1721626,
+                12891687, -8193132, -26442943, 10486144 },
+            { -22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726,
+                2610596, -23921530, -11455195 },
+            { 5408411, -1136691, -4969122, 10561668, 24145918, 14240566,
+                31319731, -4235541, 19985175, -3436086 },
         },
         {
-            {-13994457, 16616821, 14549246, 3341099, 32155958, 13648976,
-             -17577068, 8849297, 65030, 8370684},
-            {-8320926, -12049626, 31204563, 5839400, -20627288, -1057277,
-             -19442942, 6922164, 12743482, -9800518},
-            {-2361371, 12678785, 28815050, 4759974, -23893047, 4884717,
-             23783145, 11038569, 18800704, 255233},
+            { -13994457, 16616821, 14549246, 3341099, 32155958, 13648976,
+                -17577068, 8849297, 65030, 8370684 },
+            { -8320926, -12049626, 31204563, 5839400, -20627288, -1057277,
+                -19442942, 6922164, 12743482, -9800518 },
+            { -2361371, 12678785, 28815050, 4759974, -23893047, 4884717,
+                23783145, 11038569, 18800704, 255233 },
         },
         {
-            {-5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847,
-             9066957, 19258688, -14753793},
-            {-2936654, -10827535, -10432089, 14516793, -3640786, 4372541,
-             -31934921, 2209390, -1524053, 2055794},
-            {580882, 16705327, 5468415, -2683018, -30926419, -14696000,
-             -7203346, -8994389, -30021019, 7394435},
+            { -5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847,
+                9066957, 19258688, -14753793 },
+            { -2936654, -10827535, -10432089, 14516793, -3640786, 4372541,
+                -31934921, 2209390, -1524053, 2055794 },
+            { 580882, 16705327, 5468415, -2683018, -30926419, -14696000,
+                -7203346, -8994389, -30021019, 7394435 },
         },
         {
-            {23838809, 1822728, -15738443, 15242727, 8318092, -3733104,
-             -21672180, -3492205, -4821741, 14799921},
-            {13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804,
-             13496856, -9056018, 7402518},
-            {2286874, -4435931, -20042458, -2008336, -13696227, 5038122,
-             11006906, -15760352, 8205061, 1607563},
+            { 23838809, 1822728, -15738443, 15242727, 8318092, -3733104,
+                -21672180, -3492205, -4821741, 14799921 },
+            { 13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804,
+                13496856, -9056018, 7402518 },
+            { 2286874, -4435931, -20042458, -2008336, -13696227, 5038122,
+                11006906, -15760352, 8205061, 1607563 },
         },
         {
-            {14414086, -8002132, 3331830, -3208217, 22249151, -5594188,
-             18364661, -2906958, 30019587, -9029278},
-            {-27688051, 1585953, -10775053, 931069, -29120221, -11002319,
-             -14410829, 12029093, 9944378, 8024},
-            {4368715, -3709630, 29874200, -15022983, -20230386, -11410704,
-             -16114594, -999085, -8142388, 5640030},
+            { 14414086, -8002132, 3331830, -3208217, 22249151, -5594188,
+                18364661, -2906958, 30019587, -9029278 },
+            { -27688051, 1585953, -10775053, 931069, -29120221, -11002319,
+                -14410829, 12029093, 9944378, 8024 },
+            { 4368715, -3709630, 29874200, -15022983, -20230386, -11410704,
+                -16114594, -999085, -8142388, 5640030 },
         },
         {
-            {10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887,
-             -16694564, 15219798, -14327783},
-            {27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605,
-             -1173195, -18342183, 9742717},
-            {6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614,
-             7406442, 12420155, 1994844},
+            { 10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887,
+                -16694564, 15219798, -14327783 },
+            { 27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605,
+                -1173195, -18342183, 9742717 },
+            { 6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614,
+                7406442, 12420155, 1994844 },
         },
         {
-            {14012521, -5024720, -18384453, -9578469, -26485342, -3936439,
-             -13033478, -10909803, 24319929, -6446333},
-            {16412690, -4507367, 10772641, 15929391, -17068788, -4658621,
-             10555945, -10484049, -30102368, -4739048},
-            {22397382, -7767684, -9293161, -12792868, 17166287, -9755136,
-             -27333065, 6199366, 21880021, -12250760},
+            { 14012521, -5024720, -18384453, -9578469, -26485342, -3936439,
+                -13033478, -10909803, 24319929, -6446333 },
+            { 16412690, -4507367, 10772641, 15929391, -17068788, -4658621,
+                10555945, -10484049, -30102368, -4739048 },
+            { 22397382, -7767684, -9293161, -12792868, 17166287, -9755136,
+                -27333065, 6199366, 21880021, -12250760 },
         },
         {
-            {-4283307, 5368523, -31117018, 8163389, -30323063, 3209128,
-             16557151, 8890729, 8840445, 4957760},
-            {-15447727, 709327, -6919446, -10870178, -29777922, 6522332,
-             -21720181, 12130072, -14796503, 5005757},
-            {-2114751, -14308128, 23019042, 15765735, -25269683, 6002752,
-             10183197, -13239326, -16395286, -2176112},
+            { -4283307, 5368523, -31117018, 8163389, -30323063, 3209128,
+                16557151, 8890729, 8840445, 4957760 },
+            { -15447727, 709327, -6919446, -10870178, -29777922, 6522332,
+                -21720181, 12130072, -14796503, 5005757 },
+            { -2114751, -14308128, 23019042, 15765735, -25269683, 6002752,
+                10183197, -13239326, -16395286, -2176112 },
         },
     },
     {
         {
-            {-19025756, 1632005, 13466291, -7995100, -23640451, 16573537,
-             -32013908, -3057104, 22208662, 2000468},
-            {3065073, -1412761, -25598674, -361432, -17683065, -5703415,
-             -8164212, 11248527, -3691214, -7414184},
-            {10379208, -6045554, 8877319, 1473647, -29291284, -12507580,
-             16690915, 2553332, -3132688, 16400289},
+            { -19025756, 1632005, 13466291, -7995100, -23640451, 16573537,
+                -32013908, -3057104, 22208662, 2000468 },
+            { 3065073, -1412761, -25598674, -361432, -17683065, -5703415,
+                -8164212, 11248527, -3691214, -7414184 },
+            { 10379208, -6045554, 8877319, 1473647, -29291284, -12507580,
+                16690915, 2553332, -3132688, 16400289 },
         },
         {
-            {15716668, 1254266, -18472690, 7446274, -8448918, 6344164,
-             -22097271, -7285580, 26894937, 9132066},
-            {24158887, 12938817, 11085297, -8177598, -28063478, -4457083,
-             -30576463, 64452, -6817084, -2692882},
-            {13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710,
-             -3418511, -4688006, 2364226},
+            { 15716668, 1254266, -18472690, 7446274, -8448918, 6344164,
+                -22097271, -7285580, 26894937, 9132066 },
+            { 24158887, 12938817, 11085297, -8177598, -28063478, -4457083,
+                -30576463, 64452, -6817084, -2692882 },
+            { 13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710,
+                -3418511, -4688006, 2364226 },
         },
         {
-            {16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024,
-             -11697457, 15445875, -7798101},
-            {29004207, -7867081, 28661402, -640412, -12794003, -7943086,
-             31863255, -4135540, -278050, -15759279},
-            {-6122061, -14866665, -28614905, 14569919, -10857999, -3591829,
-             10343412, -6976290, -29828287, -10815811},
+            { 16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024,
+                -11697457, 15445875, -7798101 },
+            { 29004207, -7867081, 28661402, -640412, -12794003, -7943086,
+                31863255, -4135540, -278050, -15759279 },
+            { -6122061, -14866665, -28614905, 14569919, -10857999, -3591829,
+                10343412, -6976290, -29828287, -10815811 },
         },
         {
-            {27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636,
-             15372179, 17293797, 960709},
-            {20263915, 11434237, -5765435, 11236810, 13505955, -10857102,
-             -16111345, 6493122, -19384511, 7639714},
-            {-2830798, -14839232, 25403038, -8215196, -8317012, -16173699,
-             18006287, -16043750, 29994677, -15808121},
+            { 27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636,
+                15372179, 17293797, 960709 },
+            { 20263915, 11434237, -5765435, 11236810, 13505955, -10857102,
+                -16111345, 6493122, -19384511, 7639714 },
+            { -2830798, -14839232, 25403038, -8215196, -8317012, -16173699,
+                18006287, -16043750, 29994677, -15808121 },
         },
         {
-            {9769828, 5202651, -24157398, -13631392, -28051003, -11561624,
-             -24613141, -13860782, -31184575, 709464},
-            {12286395, 13076066, -21775189, -1176622, -25003198, 4057652,
-             -32018128, -8890874, 16102007, 13205847},
-            {13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170,
-             8525972, 10151379, 10394400},
+            { 9769828, 5202651, -24157398, -13631392, -28051003, -11561624,
+                -24613141, -13860782, -31184575, 709464 },
+            { 12286395, 13076066, -21775189, -1176622, -25003198, 4057652,
+                -32018128, -8890874, 16102007, 13205847 },
+            { 13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170,
+                8525972, 10151379, 10394400 },
         },
         {
-            {4024660, -16137551, 22436262, 12276534, -9099015, -2686099,
-             19698229, 11743039, -33302334, 8934414},
-            {-15879800, -4525240, -8580747, -2934061, 14634845, -698278,
-             -9449077, 3137094, -11536886, 11721158},
-            {17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229,
-             8835153, -9205489, -1280045},
+            { 4024660, -16137551, 22436262, 12276534, -9099015, -2686099,
+                19698229, 11743039, -33302334, 8934414 },
+            { -15879800, -4525240, -8580747, -2934061, 14634845, -698278,
+                -9449077, 3137094, -11536886, 11721158 },
+            { 17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229,
+                8835153, -9205489, -1280045 },
         },
         {
-            {-461409, -7830014, 20614118, 16688288, -7514766, -4807119,
-             22300304, 505429, 6108462, -6183415},
-            {-5070281, 12367917, -30663534, 3234473, 32617080, -8422642,
-             29880583, -13483331, -26898490, -7867459},
-            {-31975283, 5726539, 26934134, 10237677, -3173717, -605053,
-             24199304, 3795095, 7592688, -14992079},
+            { -461409, -7830014, 20614118, 16688288, -7514766, -4807119,
+                22300304, 505429, 6108462, -6183415 },
+            { -5070281, 12367917, -30663534, 3234473, 32617080, -8422642,
+                29880583, -13483331, -26898490, -7867459 },
+            { -31975283, 5726539, 26934134, 10237677, -3173717, -605053,
+                24199304, 3795095, 7592688, -14992079 },
         },
         {
-            {21594432, -14964228, 17466408, -4077222, 32537084, 2739898,
-             6407723, 12018833, -28256052, 4298412},
-            {-20650503, -11961496, -27236275, 570498, 3767144, -1717540,
-             13891942, -1569194, 13717174, 10805743},
-            {-14676630, -15644296, 15287174, 11927123, 24177847, -8175568,
-             -796431, 14860609, -26938930, -5863836},
+            { 21594432, -14964228, 17466408, -4077222, 32537084, 2739898,
+                6407723, 12018833, -28256052, 4298412 },
+            { -20650503, -11961496, -27236275, 570498, 3767144, -1717540,
+                13891942, -1569194, 13717174, 10805743 },
+            { -14676630, -15644296, 15287174, 11927123, 24177847, -8175568,
+                -796431, 14860609, -26938930, -5863836 },
         },
     },
     {
         {
-            {12962541, 5311799, -10060768, 11658280, 18855286, -7954201,
-             13286263, -12808704, -4381056, 9882022},
-            {18512079, 11319350, -20123124, 15090309, 18818594, 5271736,
-             -22727904, 3666879, -23967430, -3299429},
-            {-6789020, -3146043, 16192429, 13241070, 15898607, -14206114,
-             -10084880, -6661110, -2403099, 5276065},
+            { 12962541, 5311799, -10060768, 11658280, 18855286, -7954201,
+                13286263, -12808704, -4381056, 9882022 },
+            { 18512079, 11319350, -20123124, 15090309, 18818594, 5271736,
+                -22727904, 3666879, -23967430, -3299429 },
+            { -6789020, -3146043, 16192429, 13241070, 15898607, -14206114,
+                -10084880, -6661110, -2403099, 5276065 },
         },
         {
-            {30169808, -5317648, 26306206, -11750859, 27814964, 7069267,
-             7152851, 3684982, 1449224, 13082861},
-            {10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382,
-             15056736, -21016438, -8202000},
-            {-33150110, 3261608, 22745853, 7948688, 19370557, -15177665,
-             -26171976, 6482814, -10300080, -11060101},
+            { 30169808, -5317648, 26306206, -11750859, 27814964, 7069267,
+                7152851, 3684982, 1449224, 13082861 },
+            { 10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382,
+                15056736, -21016438, -8202000 },
+            { -33150110, 3261608, 22745853, 7948688, 19370557, -15177665,
+                -26171976, 6482814, -10300080, -11060101 },
         },
         {
-            {32869458, -5408545, 25609743, 15678670, -10687769, -15471071,
-             26112421, 2521008, -22664288, 6904815},
-            {29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737,
-             3841096, -29003639, -6657642},
-            {10340844, -6630377, -18656632, -2278430, 12621151, -13339055,
-             30878497, -11824370, -25584551, 5181966},
+            { 32869458, -5408545, 25609743, 15678670, -10687769, -15471071,
+                26112421, 2521008, -22664288, 6904815 },
+            { 29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737,
+                3841096, -29003639, -6657642 },
+            { 10340844, -6630377, -18656632, -2278430, 12621151, -13339055,
+                30878497, -11824370, -25584551, 5181966 },
         },
         {
-            {25940115, -12658025, 17324188, -10307374, -8671468, 15029094,
-             24396252, -16450922, -2322852, -12388574},
-            {-21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390,
-             12641087, 20603771, -6561742},
-            {-18882287, -11673380, 24849422, 11501709, 13161720, -4768874,
-             1925523, 11914390, 4662781, 7820689},
+            { 25940115, -12658025, 17324188, -10307374, -8671468, 15029094,
+                24396252, -16450922, -2322852, -12388574 },
+            { -21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390,
+                12641087, 20603771, -6561742 },
+            { -18882287, -11673380, 24849422, 11501709, 13161720, -4768874,
+                1925523, 11914390, 4662781, 7820689 },
         },
         {
-            {12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456,
-             12172924, 16136752, 15264020},
-            {-10349955, -14680563, -8211979, 2330220, -17662549, -14545780,
-             10658213, 6671822, 19012087, 3772772},
-            {3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732,
-             -15762884, 20527771, 12988982},
+            { 12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456,
+                12172924, 16136752, 15264020 },
+            { -10349955, -14680563, -8211979, 2330220, -17662549, -14545780,
+                10658213, 6671822, 19012087, 3772772 },
+            { 3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732,
+                -15762884, 20527771, 12988982 },
         },
         {
-            {-14822485, -5797269, -3707987, 12689773, -898983, -10914866,
-             -24183046, -10564943, 3299665, -12424953},
-            {-16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197,
-             6461331, -25583147, 8991218},
-            {-17226263, 1816362, -1673288, -6086439, 31783888, -8175991,
-             -32948145, 7417950, -30242287, 1507265},
+            { -14822485, -5797269, -3707987, 12689773, -898983, -10914866,
+                -24183046, -10564943, 3299665, -12424953 },
+            { -16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197,
+                6461331, -25583147, 8991218 },
+            { -17226263, 1816362, -1673288, -6086439, 31783888, -8175991,
+                -32948145, 7417950, -30242287, 1507265 },
         },
         {
-            {29692663, 6829891, -10498800, 4334896, 20945975, -11906496,
-             -28887608, 8209391, 14606362, -10647073},
-            {-3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695,
-             9761487, 4170404, -2085325},
-            {-11587470, 14855945, -4127778, -1531857, -26649089, 15084046,
-             22186522, 16002000, -14276837, -8400798},
+            { 29692663, 6829891, -10498800, 4334896, 20945975, -11906496,
+                -28887608, 8209391, 14606362, -10647073 },
+            { -3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695,
+                9761487, 4170404, -2085325 },
+            { -11587470, 14855945, -4127778, -1531857, -26649089, 15084046,
+                22186522, 16002000, -14276837, -8400798 },
         },
         {
-            {-4811456, 13761029, -31703877, -2483919, -3312471, 7869047,
-             -7113572, -9620092, 13240845, 10965870},
-            {-7742563, -8256762, -14768334, -13656260, -23232383, 12387166,
-             4498947, 14147411, 29514390, 4302863},
-            {-13413405, -12407859, 20757302, -13801832, 14785143, 8976368,
-             -5061276, -2144373, 17846988, -13971927},
+            { -4811456, 13761029, -31703877, -2483919, -3312471, 7869047,
+                -7113572, -9620092, 13240845, 10965870 },
+            { -7742563, -8256762, -14768334, -13656260, -23232383, 12387166,
+                4498947, 14147411, 29514390, 4302863 },
+            { -13413405, -12407859, 20757302, -13801832, 14785143, 8976368,
+                -5061276, -2144373, 17846988, -13971927 },
         },
     },
     {
         {
-            {-2244452, -754728, -4597030, -1066309, -6247172, 1455299,
-             -21647728, -9214789, -5222701, 12650267},
-            {-9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813,
-             13770293, -19134326, 10958663},
-            {22470984, 12369526, 23446014, -5441109, -21520802, -9698723,
-             -11772496, -11574455, -25083830, 4271862},
+            { -2244452, -754728, -4597030, -1066309, -6247172, 1455299,
+                -21647728, -9214789, -5222701, 12650267 },
+            { -9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813,
+                13770293, -19134326, 10958663 },
+            { 22470984, 12369526, 23446014, -5441109, -21520802, -9698723,
+                -11772496, -11574455, -25083830, 4271862 },
         },
         {
-            {-25169565, -10053642, -19909332, 15361595, -5984358, 2159192,
-             75375, -4278529, -32526221, 8469673},
-            {15854970, 4148314, -8893890, 7259002, 11666551, 13824734,
-             -30531198, 2697372, 24154791, -9460943},
-            {15446137, -15806644, 29759747, 14019369, 30811221, -9610191,
-             -31582008, 12840104, 24913809, 9815020},
+            { -25169565, -10053642, -19909332, 15361595, -5984358, 2159192,
+                75375, -4278529, -32526221, 8469673 },
+            { 15854970, 4148314, -8893890, 7259002, 11666551, 13824734,
+                -30531198, 2697372, 24154791, -9460943 },
+            { 15446137, -15806644, 29759747, 14019369, 30811221, -9610191,
+                -31582008, 12840104, 24913809, 9815020 },
         },
         {
-            {-4709286, -5614269, -31841498, -12288893, -14443537, 10799414,
-             -9103676, 13438769, 18735128, 9466238},
-            {11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821,
-             -10896103, -22728655, 16199064},
-            {14576810, 379472, -26786533, -8317236, -29426508, -10812974,
-             -102766, 1876699, 30801119, 2164795},
+            { -4709286, -5614269, -31841498, -12288893, -14443537, 10799414,
+                -9103676, 13438769, 18735128, 9466238 },
+            { 11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821,
+                -10896103, -22728655, 16199064 },
+            { 14576810, 379472, -26786533, -8317236, -29426508, -10812974,
+                -102766, 1876699, 30801119, 2164795 },
         },
         {
-            {15995086, 3199873, 13672555, 13712240, -19378835, -4647646,
-             -13081610, -15496269, -13492807, 1268052},
-            {-10290614, -3659039, -3286592, 10948818, 23037027, 3794475,
-             -3470338, -12600221, -17055369, 3565904},
-            {29210088, -9419337, -5919792, -4952785, 10834811, -13327726,
-             -16512102, -10820713, -27162222, -14030531},
+            { 15995086, 3199873, 13672555, 13712240, -19378835, -4647646,
+                -13081610, -15496269, -13492807, 1268052 },
+            { -10290614, -3659039, -3286592, 10948818, 23037027, 3794475,
+                -3470338, -12600221, -17055369, 3565904 },
+            { 29210088, -9419337, -5919792, -4952785, 10834811, -13327726,
+                -16512102, -10820713, -27162222, -14030531 },
         },
         {
-            {-13161890, 15508588, 16663704, -8156150, -28349942, 9019123,
-             -29183421, -3769423, 2244111, -14001979},
-            {-5152875, -3800936, -9306475, -6071583, 16243069, 14684434,
-             -25673088, -16180800, 13491506, 4641841},
-            {10813417, 643330, -19188515, -728916, 30292062, -16600078,
-             27548447, -7721242, 14476989, -12767431},
+            { -13161890, 15508588, 16663704, -8156150, -28349942, 9019123,
+                -29183421, -3769423, 2244111, -14001979 },
+            { -5152875, -3800936, -9306475, -6071583, 16243069, 14684434,
+                -25673088, -16180800, 13491506, 4641841 },
+            { 10813417, 643330, -19188515, -728916, 30292062, -16600078,
+                27548447, -7721242, 14476989, -12767431 },
         },
         {
-            {10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937,
-             -1644259, -27912810, 12651324},
-            {-31185513, -813383, 22271204, 11835308, 10201545, 15351028,
-             17099662, 3988035, 21721536, -3148940},
-            {10202177, -6545839, -31373232, -9574638, -32150642, -8119683,
-             -12906320, 3852694, 13216206, 14842320},
+            { 10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937,
+                -1644259, -27912810, 12651324 },
+            { -31185513, -813383, 22271204, 11835308, 10201545, 15351028,
+                17099662, 3988035, 21721536, -3148940 },
+            { 10202177, -6545839, -31373232, -9574638, -32150642, -8119683,
+                -12906320, 3852694, 13216206, 14842320 },
         },
         {
-            {-15815640, -10601066, -6538952, -7258995, -6984659, -6581778,
-             -31500847, 13765824, -27434397, 9900184},
-            {14465505, -13833331, -32133984, -14738873, -27443187, 12990492,
-             33046193, 15796406, -7051866, -8040114},
-            {30924417, -8279620, 6359016, -12816335, 16508377, 9071735,
-             -25488601, 15413635, 9524356, -7018878},
+            { -15815640, -10601066, -6538952, -7258995, -6984659, -6581778,
+                -31500847, 13765824, -27434397, 9900184 },
+            { 14465505, -13833331, -32133984, -14738873, -27443187, 12990492,
+                33046193, 15796406, -7051866, -8040114 },
+            { 30924417, -8279620, 6359016, -12816335, 16508377, 9071735,
+                -25488601, 15413635, 9524356, -7018878 },
         },
         {
-            {12274201, -13175547, 32627641, -1785326, 6736625, 13267305,
-             5237659, -5109483, 15663516, 4035784},
-            {-2951309, 8903985, 17349946, 601635, -16432815, -4612556,
-             -13732739, -15889334, -22258478, 4659091},
-            {-16916263, -4952973, -30393711, -15158821, 20774812, 15897498,
-             5736189, 15026997, -2178256, -13455585},
+            { 12274201, -13175547, 32627641, -1785326, 6736625, 13267305,
+                5237659, -5109483, 15663516, 4035784 },
+            { -2951309, 8903985, 17349946, 601635, -16432815, -4612556,
+                -13732739, -15889334, -22258478, 4659091 },
+            { -16916263, -4952973, -30393711, -15158821, 20774812, 15897498,
+                5736189, 15026997, -2178256, -13455585 },
         },
     },
     {
         {
-            {-8858980, -2219056, 28571666, -10155518, -474467, -10105698,
-             -3801496, 278095, 23440562, -290208},
-            {10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275,
-             11551483, -16571960, -7442864},
-            {17932739, -12437276, -24039557, 10749060, 11316803, 7535897,
-             22503767, 5561594, -3646624, 3898661},
+            { -8858980, -2219056, 28571666, -10155518, -474467, -10105698,
+                -3801496, 278095, 23440562, -290208 },
+            { 10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275,
+                11551483, -16571960, -7442864 },
+            { 17932739, -12437276, -24039557, 10749060, 11316803, 7535897,
+                22503767, 5561594, -3646624, 3898661 },
         },
         {
-            {7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531,
-             7152530, 21831162, 1245233},
-            {26958459, -14658026, 4314586, 8346991, -5677764, 11960072,
-             -32589295, -620035, -30402091, -16716212},
-            {-12165896, 9166947, 33491384, 13673479, 29787085, 13096535,
-             6280834, 14587357, -22338025, 13987525},
+            { 7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531,
+                7152530, 21831162, 1245233 },
+            { 26958459, -14658026, 4314586, 8346991, -5677764, 11960072,
+                -32589295, -620035, -30402091, -16716212 },
+            { -12165896, 9166947, 33491384, 13673479, 29787085, 13096535,
+                6280834, 14587357, -22338025, 13987525 },
         },
         {
-            {-24349909, 7778775, 21116000, 15572597, -4833266, -5357778,
-             -4300898, -5124639, -7469781, -2858068},
-            {9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781,
-             6439245, -14581012, 4091397},
-            {-8426427, 1470727, -28109679, -1596990, 3978627, -5123623,
-             -19622683, 12092163, 29077877, -14741988},
+            { -24349909, 7778775, 21116000, 15572597, -4833266, -5357778,
+                -4300898, -5124639, -7469781, -2858068 },
+            { 9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781,
+                6439245, -14581012, 4091397 },
+            { -8426427, 1470727, -28109679, -1596990, 3978627, -5123623,
+                -19622683, 12092163, 29077877, -14741988 },
         },
         {
-            {5269168, -6859726, -13230211, -8020715, 25932563, 1763552,
-             -5606110, -5505881, -20017847, 2357889},
-            {32264008, -15407652, -5387735, -1160093, -2091322, -3946900,
-             23104804, -12869908, 5727338, 189038},
-            {14609123, -8954470, -6000566, -16622781, -14577387, -7743898,
-             -26745169, 10942115, -25888931, -14884697},
+            { 5269168, -6859726, -13230211, -8020715, 25932563, 1763552,
+                -5606110, -5505881, -20017847, 2357889 },
+            { 32264008, -15407652, -5387735, -1160093, -2091322, -3946900,
+                23104804, -12869908, 5727338, 189038 },
+            { 14609123, -8954470, -6000566, -16622781, -14577387, -7743898,
+                -26745169, 10942115, -25888931, -14884697 },
         },
         {
-            {20513500, 5557931, -15604613, 7829531, 26413943, -2019404,
-             -21378968, 7471781, 13913677, -5137875},
-            {-25574376, 11967826, 29233242, 12948236, -6754465, 4713227,
-             -8940970, 14059180, 12878652, 8511905},
-            {-25656801, 3393631, -2955415, -7075526, -2250709, 9366908,
-             -30223418, 6812974, 5568676, -3127656},
+            { 20513500, 5557931, -15604613, 7829531, 26413943, -2019404,
+                -21378968, 7471781, 13913677, -5137875 },
+            { -25574376, 11967826, 29233242, 12948236, -6754465, 4713227,
+                -8940970, 14059180, 12878652, 8511905 },
+            { -25656801, 3393631, -2955415, -7075526, -2250709, 9366908,
+                -30223418, 6812974, 5568676, -3127656 },
         },
         {
-            {11630004, 12144454, 2116339, 13606037, 27378885, 15676917,
-             -17408753, -13504373, -14395196, 8070818},
-            {27117696, -10007378, -31282771, -5570088, 1127282, 12772488,
-             -29845906, 10483306, -11552749, -1028714},
-            {10637467, -5688064, 5674781, 1072708, -26343588, -6982302,
-             -1683975, 9177853, -27493162, 15431203},
+            { 11630004, 12144454, 2116339, 13606037, 27378885, 15676917,
+                -17408753, -13504373, -14395196, 8070818 },
+            { 27117696, -10007378, -31282771, -5570088, 1127282, 12772488,
+                -29845906, 10483306, -11552749, -1028714 },
+            { 10637467, -5688064, 5674781, 1072708, -26343588, -6982302,
+                -1683975, 9177853, -27493162, 15431203 },
         },
         {
-            {20525145, 10892566, -12742472, 12779443, -29493034, 16150075,
-             -28240519, 14943142, -15056790, -7935931},
-            {-30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767,
-             -3239766, -3356550, 9594024},
-            {-23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683,
-             -6492290, 13352335, -10977084},
+            { 20525145, 10892566, -12742472, 12779443, -29493034, 16150075,
+                -28240519, 14943142, -15056790, -7935931 },
+            { -30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767,
+                -3239766, -3356550, 9594024 },
+            { -23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683,
+                -6492290, 13352335, -10977084 },
         },
         {
-            {-1931799, -5407458, 3304649, -12884869, 17015806, -4877091,
-             -29783850, -7752482, -13215537, -319204},
-            {20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742,
-             15077870, -22750759, 14523817},
-            {27406042, -6041657, 27423596, -4497394, 4996214, 10002360,
-             -28842031, -4545494, -30172742, -4805667},
+            { -1931799, -5407458, 3304649, -12884869, 17015806, -4877091,
+                -29783850, -7752482, -13215537, -319204 },
+            { 20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742,
+                15077870, -22750759, 14523817 },
+            { 27406042, -6041657, 27423596, -4497394, 4996214, 10002360,
+                -28842031, -4545494, -30172742, -4805667 },
         },
     },
     {
         {
-            {11374242, 12660715, 17861383, -12540833, 10935568, 1099227,
-             -13886076, -9091740, -27727044, 11358504},
-            {-12730809, 10311867, 1510375, 10778093, -2119455, -9145702,
-             32676003, 11149336, -26123651, 4985768},
-            {-19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043,
-             13794114, -19414307, -15621255},
+            { 11374242, 12660715, 17861383, -12540833, 10935568, 1099227,
+                -13886076, -9091740, -27727044, 11358504 },
+            { -12730809, 10311867, 1510375, 10778093, -2119455, -9145702,
+                32676003, 11149336, -26123651, 4985768 },
+            { -19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043,
+                13794114, -19414307, -15621255 },
         },
         {
-            {6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603,
-             6970005, -1691065, -9004790},
-            {1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622,
-             -5475723, -16796596, -5031438},
-            {-22273315, -13524424, -64685, -4334223, -18605636, -10921968,
-             -20571065, -7007978, -99853, -10237333},
+            { 6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603,
+                6970005, -1691065, -9004790 },
+            { 1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622,
+                -5475723, -16796596, -5031438 },
+            { -22273315, -13524424, -64685, -4334223, -18605636, -10921968,
+                -20571065, -7007978, -99853, -10237333 },
         },
         {
-            {17747465, 10039260, 19368299, -4050591, -20630635, -16041286,
-             31992683, -15857976, -29260363, -5511971},
-            {31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999,
-             -3744247, 4882242, -10626905},
-            {29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198,
-             3272828, -5190932, -4162409},
+            { 17747465, 10039260, 19368299, -4050591, -20630635, -16041286,
+                31992683, -15857976, -29260363, -5511971 },
+            { 31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999,
+                -3744247, 4882242, -10626905 },
+            { 29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198,
+                3272828, -5190932, -4162409 },
         },
         {
-            {12501286, 4044383, -8612957, -13392385, -32430052, 5136599,
-             -19230378, -3529697, 330070, -3659409},
-            {6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522,
-             -8573892, -271295, 12071499},
-            {-8365515, -4042521, 25133448, -4517355, -6211027, 2265927,
-             -32769618, 1936675, -5159697, 3829363},
+            { 12501286, 4044383, -8612957, -13392385, -32430052, 5136599,
+                -19230378, -3529697, 330070, -3659409 },
+            { 6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522,
+                -8573892, -271295, 12071499 },
+            { -8365515, -4042521, 25133448, -4517355, -6211027, 2265927,
+                -32769618, 1936675, -5159697, 3829363 },
         },
         {
-            {28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550,
-             -6567787, 26333140, 14267664},
-            {-11067219, 11871231, 27385719, -10559544, -4585914, -11189312,
-             10004786, -8709488, -21761224, 8930324},
-            {-21197785, -16396035, 25654216, -1725397, 12282012, 11008919,
-             1541940, 4757911, -26491501, -16408940},
+            { 28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550,
+                -6567787, 26333140, 14267664 },
+            { -11067219, 11871231, 27385719, -10559544, -4585914, -11189312,
+                10004786, -8709488, -21761224, 8930324 },
+            { -21197785, -16396035, 25654216, -1725397, 12282012, 11008919,
+                1541940, 4757911, -26491501, -16408940 },
         },
         {
-            {13537262, -7759490, -20604840, 10961927, -5922820, -13218065,
-             -13156584, 6217254, -15943699, 13814990},
-            {-17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681,
-             9257833, -1956526, -1776914},
-            {-25045300, -10191966, 15366585, 15166509, -13105086, 8423556,
-             -29171540, 12361135, -18685978, 4578290},
+            { 13537262, -7759490, -20604840, 10961927, -5922820, -13218065,
+                -13156584, 6217254, -15943699, 13814990 },
+            { -17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681,
+                9257833, -1956526, -1776914 },
+            { -25045300, -10191966, 15366585, 15166509, -13105086, 8423556,
+                -29171540, 12361135, -18685978, 4578290 },
         },
         {
-            {24579768, 3711570, 1342322, -11180126, -27005135, 14124956,
-             -22544529, 14074919, 21964432, 8235257},
-            {-6528613, -2411497, 9442966, -5925588, 12025640, -1487420,
-             -2981514, -1669206, 13006806, 2355433},
-            {-16304899, -13605259, -6632427, -5142349, 16974359, -10911083,
-             27202044, 1719366, 1141648, -12796236},
+            { 24579768, 3711570, 1342322, -11180126, -27005135, 14124956,
+                -22544529, 14074919, 21964432, 8235257 },
+            { -6528613, -2411497, 9442966, -5925588, 12025640, -1487420,
+                -2981514, -1669206, 13006806, 2355433 },
+            { -16304899, -13605259, -6632427, -5142349, 16974359, -10911083,
+                27202044, 1719366, 1141648, -12796236 },
         },
         {
-            {-12863944, -13219986, -8318266, -11018091, -6810145, -4843894,
-             13475066, -3133972, 32674895, 13715045},
-            {11423335, -5468059, 32344216, 8962751, 24989809, 9241752,
-             -13265253, 16086212, -28740881, -15642093},
-            {-1409668, 12530728, -6368726, 10847387, 19531186, -14132160,
-             -11709148, 7791794, -27245943, 4383347},
+            { -12863944, -13219986, -8318266, -11018091, -6810145, -4843894,
+                13475066, -3133972, 32674895, 13715045 },
+            { 11423335, -5468059, 32344216, 8962751, 24989809, 9241752,
+                -13265253, 16086212, -28740881, -15642093 },
+            { -1409668, 12530728, -6368726, 10847387, 19531186, -14132160,
+                -11709148, 7791794, -27245943, 4383347 },
         },
     },
     {
         {
-            {-28970898, 5271447, -1266009, -9736989, -12455236, 16732599,
-             -4862407, -4906449, 27193557, 6245191},
-            {-15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898,
-             3260492, 22510453, 8577507},
-            {-12632451, 11257346, -32692994, 13548177, -721004, 10879011,
-             31168030, 13952092, -29571492, -3635906},
+            { -28970898, 5271447, -1266009, -9736989, -12455236, 16732599,
+                -4862407, -4906449, 27193557, 6245191 },
+            { -15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898,
+                3260492, 22510453, 8577507 },
+            { -12632451, 11257346, -32692994, 13548177, -721004, 10879011,
+                31168030, 13952092, -29571492, -3635906 },
         },
         {
-            {3877321, -9572739, 32416692, 5405324, -11004407, -13656635,
-             3759769, 11935320, 5611860, 8164018},
-            {-16275802, 14667797, 15906460, 12155291, -22111149, -9039718,
-             32003002, -8832289, 5773085, -8422109},
-            {-23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725,
-             12376320, 31632953, 190926},
+            { 3877321, -9572739, 32416692, 5405324, -11004407, -13656635,
+                3759769, 11935320, 5611860, 8164018 },
+            { -16275802, 14667797, 15906460, 12155291, -22111149, -9039718,
+                32003002, -8832289, 5773085, -8422109 },
+            { -23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725,
+                12376320, 31632953, 190926 },
         },
         {
-            {-24593607, -16138885, -8423991, 13378746, 14162407, 6901328,
-             -8288749, 4508564, -25341555, -3627528},
-            {8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941,
-             -14786005, -1672488, 827625},
-            {-32720583, -16289296, -32503547, 7101210, 13354605, 2659080,
-             -1800575, -14108036, -24878478, 1541286},
+            { -24593607, -16138885, -8423991, 13378746, 14162407, 6901328,
+                -8288749, 4508564, -25341555, -3627528 },
+            { 8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941,
+                -14786005, -1672488, 827625 },
+            { -32720583, -16289296, -32503547, 7101210, 13354605, 2659080,
+                -1800575, -14108036, -24878478, 1541286 },
         },
         {
-            {2901347, -1117687, 3880376, -10059388, -17620940, -3612781,
-             -21802117, -3567481, 20456845, -1885033},
-            {27019610, 12299467, -13658288, -1603234, -12861660, -4861471,
-             -19540150, -5016058, 29439641, 15138866},
-            {21536104, -6626420, -32447818, -10690208, -22408077, 5175814,
-             -5420040, -16361163, 7779328, 109896},
+            { 2901347, -1117687, 3880376, -10059388, -17620940, -3612781,
+                -21802117, -3567481, 20456845, -1885033 },
+            { 27019610, 12299467, -13658288, -1603234, -12861660, -4861471,
+                -19540150, -5016058, 29439641, 15138866 },
+            { 21536104, -6626420, -32447818, -10690208, -22408077, 5175814,
+                -5420040, -16361163, 7779328, 109896 },
         },
         {
-            {30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390,
-             12180118, 23177719, -554075},
-            {26572847, 3405927, -31701700, 12890905, -19265668, 5335866,
-             -6493768, 2378492, 4439158, -13279347},
-            {-22716706, 3489070, -9225266, -332753, 18875722, -1140095,
-             14819434, -12731527, -17717757, -5461437},
+            { 30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390,
+                12180118, 23177719, -554075 },
+            { 26572847, 3405927, -31701700, 12890905, -19265668, 5335866,
+                -6493768, 2378492, 4439158, -13279347 },
+            { -22716706, 3489070, -9225266, -332753, 18875722, -1140095,
+                14819434, -12731527, -17717757, -5461437 },
         },
         {
-            {-5056483, 16566551, 15953661, 3767752, -10436499, 15627060,
-             -820954, 2177225, 8550082, -15114165},
-            {-18473302, 16596775, -381660, 15663611, 22860960, 15585581,
-             -27844109, -3582739, -23260460, -8428588},
-            {-32480551, 15707275, -8205912, -5652081, 29464558, 2713815,
-             -22725137, 15860482, -21902570, 1494193},
+            { -5056483, 16566551, 15953661, 3767752, -10436499, 15627060,
+                -820954, 2177225, 8550082, -15114165 },
+            { -18473302, 16596775, -381660, 15663611, 22860960, 15585581,
+                -27844109, -3582739, -23260460, -8428588 },
+            { -32480551, 15707275, -8205912, -5652081, 29464558, 2713815,
+                -22725137, 15860482, -21902570, 1494193 },
         },
         {
-            {-19562091, -14087393, -25583872, -9299552, 13127842, 759709,
-             21923482, 16529112, 8742704, 12967017},
-            {-28464899, 1553205, 32536856, -10473729, -24691605, -406174,
-             -8914625, -2933896, -29903758, 15553883},
-            {21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572,
-             14513274, 19375923, -12647961},
+            { -19562091, -14087393, -25583872, -9299552, 13127842, 759709,
+                21923482, 16529112, 8742704, 12967017 },
+            { -28464899, 1553205, 32536856, -10473729, -24691605, -406174,
+                -8914625, -2933896, -29903758, 15553883 },
+            { 21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572,
+                14513274, 19375923, -12647961 },
         },
         {
-            {8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818,
-             -6222716, 2862653, 9455043},
-            {29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124,
-             -2990080, 15511449, 4789663},
-            {-20679756, 7004547, 8824831, -9434977, -4045704, -3750736,
-             -5754762, 108893, 23513200, 16652362},
+            { 8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818,
+                -6222716, 2862653, 9455043 },
+            { 29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124,
+                -2990080, 15511449, 4789663 },
+            { -20679756, 7004547, 8824831, -9434977, -4045704, -3750736,
+                -5754762, 108893, 23513200, 16652362 },
         },
     },
     {
         {
-            {-33256173, 4144782, -4476029, -6579123, 10770039, -7155542,
-             -6650416, -12936300, -18319198, 10212860},
-            {2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801,
-             2600940, -9988298, -12506466},
-            {-24645692, 13317462, -30449259, -15653928, 21365574, -10869657,
-             11344424, 864440, -2499677, -16710063},
+            { -33256173, 4144782, -4476029, -6579123, 10770039, -7155542,
+                -6650416, -12936300, -18319198, 10212860 },
+            { 2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801,
+                2600940, -9988298, -12506466 },
+            { -24645692, 13317462, -30449259, -15653928, 21365574, -10869657,
+                11344424, 864440, -2499677, -16710063 },
         },
         {
-            {-26432803, 6148329, -17184412, -14474154, 18782929, -275997,
-             -22561534, 211300, 2719757, 4940997},
-            {-1323882, 3911313, -6948744, 14759765, -30027150, 7851207,
-             21690126, 8518463, 26699843, 5276295},
-            {-13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586,
-             149635, -15452774, 7159369},
+            { -26432803, 6148329, -17184412, -14474154, 18782929, -275997,
+                -22561534, 211300, 2719757, 4940997 },
+            { -1323882, 3911313, -6948744, 14759765, -30027150, 7851207,
+                21690126, 8518463, 26699843, 5276295 },
+            { -13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586,
+                149635, -15452774, 7159369 },
         },
         {
-            {9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009,
-             8312176, 22477218, -8403385},
-            {18155857, -16504990, 19744716, 9006923, 15154154, -10538976,
-             24256460, -4864995, -22548173, 9334109},
-            {2986088, -4911893, 10776628, -3473844, 10620590, -7083203,
-             -21413845, 14253545, -22587149, 536906},
+            { 9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009,
+                8312176, 22477218, -8403385 },
+            { 18155857, -16504990, 19744716, 9006923, 15154154, -10538976,
+                24256460, -4864995, -22548173, 9334109 },
+            { 2986088, -4911893, 10776628, -3473844, 10620590, -7083203,
+                -21413845, 14253545, -22587149, 536906 },
         },
         {
-            {4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551,
-             10589625, 10838060, -15420424},
-            {-19342404, 867880, 9277171, -3218459, -14431572, -1986443,
-             19295826, -15796950, 6378260, 699185},
-            {7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039,
-             15693155, -5045064, -13373962},
+            { 4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551,
+                10589625, 10838060, -15420424 },
+            { -19342404, 867880, 9277171, -3218459, -14431572, -1986443,
+                19295826, -15796950, 6378260, 699185 },
+            { 7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039,
+                15693155, -5045064, -13373962 },
         },
         {
-            {-7737563, -5869402, -14566319, -7406919, 11385654, 13201616,
-             31730678, -10962840, -3918636, -9669325},
-            {10188286, -15770834, -7336361, 13427543, 22223443, 14896287,
-             30743455, 7116568, -21786507, 5427593},
-            {696102, 13206899, 27047647, -10632082, 15285305, -9853179,
-             10798490, -4578720, 19236243, 12477404},
+            { -7737563, -5869402, -14566319, -7406919, 11385654, 13201616,
+                31730678, -10962840, -3918636, -9669325 },
+            { 10188286, -15770834, -7336361, 13427543, 22223443, 14896287,
+                30743455, 7116568, -21786507, 5427593 },
+            { 696102, 13206899, 27047647, -10632082, 15285305, -9853179,
+                10798490, -4578720, 19236243, 12477404 },
         },
         {
-            {-11229439, 11243796, -17054270, -8040865, -788228, -8167967,
-             -3897669, 11180504, -23169516, 7733644},
-            {17800790, -14036179, -27000429, -11766671, 23887827, 3149671,
-             23466177, -10538171, 10322027, 15313801},
-            {26246234, 11968874, 32263343, -5468728, 6830755, -13323031,
-             -15794704, -101982, -24449242, 10890804},
+            { -11229439, 11243796, -17054270, -8040865, -788228, -8167967,
+                -3897669, 11180504, -23169516, 7733644 },
+            { 17800790, -14036179, -27000429, -11766671, 23887827, 3149671,
+                23466177, -10538171, 10322027, 15313801 },
+            { 26246234, 11968874, 32263343, -5468728, 6830755, -13323031,
+                -15794704, -101982, -24449242, 10890804 },
         },
         {
-            {-31365647, 10271363, -12660625, -6267268, 16690207, -13062544,
-             -14982212, 16484931, 25180797, -5334884},
-            {-586574, 10376444, -32586414, -11286356, 19801893, 10997610,
-             2276632, 9482883, 316878, 13820577},
-            {-9882808, -4510367, -2115506, 16457136, -11100081, 11674996,
-             30756178, -7515054, 30696930, -3712849},
+            { -31365647, 10271363, -12660625, -6267268, 16690207, -13062544,
+                -14982212, 16484931, 25180797, -5334884 },
+            { -586574, 10376444, -32586414, -11286356, 19801893, 10997610,
+                2276632, 9482883, 316878, 13820577 },
+            { -9882808, -4510367, -2115506, 16457136, -11100081, 11674996,
+                30756178, -7515054, 30696930, -3712849 },
         },
         {
-            {32988917, -9603412, 12499366, 7910787, -10617257, -11931514,
-             -7342816, -9985397, -32349517, 7392473},
-            {-8855661, 15927861, 9866406, -3649411, -2396914, -16655781,
-             -30409476, -9134995, 25112947, -2926644},
-            {-2504044, -436966, 25621774, -5678772, 15085042, -5479877,
-             -24884878, -13526194, 5537438, -13914319},
+            { 32988917, -9603412, 12499366, 7910787, -10617257, -11931514,
+                -7342816, -9985397, -32349517, 7392473 },
+            { -8855661, 15927861, 9866406, -3649411, -2396914, -16655781,
+                -30409476, -9134995, 25112947, -2926644 },
+            { -2504044, -436966, 25621774, -5678772, 15085042, -5479877,
+                -24884878, -13526194, 5537438, -13914319 },
         },
     },
     {
         {
-            {-11225584, 2320285, -9584280, 10149187, -33444663, 5808648,
-             -14876251, -1729667, 31234590, 6090599},
-            {-9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721,
-             15878753, -6970405, -9034768},
-            {-27757857, 247744, -15194774, -9002551, 23288161, -10011936,
-             -23869595, 6503646, 20650474, 1804084},
+            { -11225584, 2320285, -9584280, 10149187, -33444663, 5808648,
+                -14876251, -1729667, 31234590, 6090599 },
+            { -9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721,
+                15878753, -6970405, -9034768 },
+            { -27757857, 247744, -15194774, -9002551, 23288161, -10011936,
+                -23869595, 6503646, 20650474, 1804084 },
         },
         {
-            {-27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995,
-             -10329713, 27842616, -202328},
-            {-15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656,
-             5031932, -11375082, 12714369},
-            {20807691, -7270825, 29286141, 11421711, -27876523, -13868230,
-             -21227475, 1035546, -19733229, 12796920},
+            { -27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995,
+                -10329713, 27842616, -202328 },
+            { -15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656,
+                5031932, -11375082, 12714369 },
+            { 20807691, -7270825, 29286141, 11421711, -27876523, -13868230,
+                -21227475, 1035546, -19733229, 12796920 },
         },
         {
-            {12076899, -14301286, -8785001, -11848922, -25012791, 16400684,
-             -17591495, -12899438, 3480665, -15182815},
-            {-32361549, 5457597, 28548107, 7833186, 7303070, -11953545,
-             -24363064, -15921875, -33374054, 2771025},
-            {-21389266, 421932, 26597266, 6860826, 22486084, -6737172,
-             -17137485, -4210226, -24552282, 15673397},
+            { 12076899, -14301286, -8785001, -11848922, -25012791, 16400684,
+                -17591495, -12899438, 3480665, -15182815 },
+            { -32361549, 5457597, 28548107, 7833186, 7303070, -11953545,
+                -24363064, -15921875, -33374054, 2771025 },
+            { -21389266, 421932, 26597266, 6860826, 22486084, -6737172,
+                -17137485, -4210226, -24552282, 15673397 },
         },
         {
-            {-20184622, 2338216, 19788685, -9620956, -4001265, -8740893,
-             -20271184, 4733254, 3727144, -12934448},
-            {6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594,
-             7975683, 31123697, -10958981},
-            {30069250, -11435332, 30434654, 2958439, 18399564, -976289,
-             12296869, 9204260, -16432438, 9648165},
+            { -20184622, 2338216, 19788685, -9620956, -4001265, -8740893,
+                -20271184, 4733254, 3727144, -12934448 },
+            { 6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594,
+                7975683, 31123697, -10958981 },
+            { 30069250, -11435332, 30434654, 2958439, 18399564, -976289,
+                12296869, 9204260, -16432438, 9648165 },
         },
         {
-            {32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266,
-             5248604, -26008332, -11377501},
-            {17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711,
-             15298639, 2662509, -16297073},
-            {-1172927, -7558695, -4366770, -4287744, -21346413, -8434326,
-             32087529, -1222777, 32247248, -14389861},
+            { 32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266,
+                5248604, -26008332, -11377501 },
+            { 17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711,
+                15298639, 2662509, -16297073 },
+            { -1172927, -7558695, -4366770, -4287744, -21346413, -8434326,
+                32087529, -1222777, 32247248, -14389861 },
         },
         {
-            {14312628, 1221556, 17395390, -8700143, -4945741, -8684635,
-             -28197744, -9637817, -16027623, -13378845},
-            {-1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502,
-             9803137, 17597934, 2346211},
-            {18510800, 15337574, 26171504, 981392, -22241552, 7827556,
-             -23491134, -11323352, 3059833, -11782870},
+            { 14312628, 1221556, 17395390, -8700143, -4945741, -8684635,
+                -28197744, -9637817, -16027623, -13378845 },
+            { -1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502,
+                9803137, 17597934, 2346211 },
+            { 18510800, 15337574, 26171504, 981392, -22241552, 7827556,
+                -23491134, -11323352, 3059833, -11782870 },
         },
         {
-            {10141598, 6082907, 17829293, -1947643, 9830092, 13613136,
-             -25556636, -5544586, -33502212, 3592096},
-            {33114168, -15889352, -26525686, -13343397, 33076705, 8716171,
-             1151462, 1521897, -982665, -6837803},
-            {-32939165, -4255815, 23947181, -324178, -33072974, -12305637,
-             -16637686, 3891704, 26353178, 693168},
+            { 10141598, 6082907, 17829293, -1947643, 9830092, 13613136,
+                -25556636, -5544586, -33502212, 3592096 },
+            { 33114168, -15889352, -26525686, -13343397, 33076705, 8716171,
+                1151462, 1521897, -982665, -6837803 },
+            { -32939165, -4255815, 23947181, -324178, -33072974, -12305637,
+                -16637686, 3891704, 26353178, 693168 },
         },
         {
-            {30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294,
-             -400668, 31375464, 14369965},
-            {-14370654, -7772529, 1510301, 6434173, -18784789, -6262728,
-             32732230, -13108839, 17901441, 16011505},
-            {18171223, -11934626, -12500402, 15197122, -11038147, -15230035,
-             -19172240, -16046376, 8764035, 12309598},
+            { 30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294,
+                -400668, 31375464, 14369965 },
+            { -14370654, -7772529, 1510301, 6434173, -18784789, -6262728,
+                32732230, -13108839, 17901441, 16011505 },
+            { 18171223, -11934626, -12500402, 15197122, -11038147, -15230035,
+                -19172240, -16046376, 8764035, 12309598 },
         },
     },
     {
         {
-            {5975908, -5243188, -19459362, -9681747, -11541277, 14015782,
-             -23665757, 1228319, 17544096, -10593782},
-            {5811932, -1715293, 3442887, -2269310, -18367348, -8359541,
-             -18044043, -15410127, -5565381, 12348900},
-            {-31399660, 11407555, 25755363, 6891399, -3256938, 14872274,
-             -24849353, 8141295, -10632534, -585479},
+            { 5975908, -5243188, -19459362, -9681747, -11541277, 14015782,
+                -23665757, 1228319, 17544096, -10593782 },
+            { 5811932, -1715293, 3442887, -2269310, -18367348, -8359541,
+                -18044043, -15410127, -5565381, 12348900 },
+            { -31399660, 11407555, 25755363, 6891399, -3256938, 14872274,
+                -24849353, 8141295, -10632534, -585479 },
         },
         {
-            {-12675304, 694026, -5076145, 13300344, 14015258, -14451394,
-             -9698672, -11329050, 30944593, 1130208},
-            {8247766, -6710942, -26562381, -7709309, -14401939, -14648910,
-             4652152, 2488540, 23550156, -271232},
-            {17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737,
-             -5908146, -408818, -137719},
+            { -12675304, 694026, -5076145, 13300344, 14015258, -14451394,
+                -9698672, -11329050, 30944593, 1130208 },
+            { 8247766, -6710942, -26562381, -7709309, -14401939, -14648910,
+                4652152, 2488540, 23550156, -271232 },
+            { 17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737,
+                -5908146, -408818, -137719 },
         },
         {
-            {16091085, -16253926, 18599252, 7340678, 2137637, -1221657,
-             -3364161, 14550936, 3260525, -7166271},
-            {-4910104, -13332887, 18550887, 10864893, -16459325, -7291596,
-             -23028869, -13204905, -12748722, 2701326},
-            {-8574695, 16099415, 4629974, -16340524, -20786213, -6005432,
-             -10018363, 9276971, 11329923, 1862132},
+            { 16091085, -16253926, 18599252, 7340678, 2137637, -1221657,
+                -3364161, 14550936, 3260525, -7166271 },
+            { -4910104, -13332887, 18550887, 10864893, -16459325, -7291596,
+                -23028869, -13204905, -12748722, 2701326 },
+            { -8574695, 16099415, 4629974, -16340524, -20786213, -6005432,
+                -10018363, 9276971, 11329923, 1862132 },
         },
         {
-            {14763076, -15903608, -30918270, 3689867, 3511892, 10313526,
-             -21951088, 12219231, -9037963, -940300},
-            {8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216,
-             -2909717, -15438168, 11595570},
-            {15214962, 3537601, -26238722, -14058872, 4418657, -15230761,
-             13947276, 10730794, -13489462, -4363670},
+            { 14763076, -15903608, -30918270, 3689867, 3511892, 10313526,
+                -21951088, 12219231, -9037963, -940300 },
+            { 8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216,
+                -2909717, -15438168, 11595570 },
+            { 15214962, 3537601, -26238722, -14058872, 4418657, -15230761,
+                13947276, 10730794, -13489462, -4363670 },
         },
         {
-            {-2538306, 7682793, 32759013, 263109, -29984731, -7955452,
-             -22332124, -10188635, 977108, 699994},
-            {-12466472, 4195084, -9211532, 550904, -15565337, 12917920,
-             19118110, -439841, -30534533, -14337913},
-            {31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237,
-             -10051775, 12493932, -5409317},
+            { -2538306, 7682793, 32759013, 263109, -29984731, -7955452,
+                -22332124, -10188635, 977108, 699994 },
+            { -12466472, 4195084, -9211532, 550904, -15565337, 12917920,
+                19118110, -439841, -30534533, -14337913 },
+            { 31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237,
+                -10051775, 12493932, -5409317 },
         },
         {
-            {-25680606, 5260744, -19235809, -6284470, -3695942, 16566087,
-             27218280, 2607121, 29375955, 6024730},
-            {842132, -2794693, -4763381, -8722815, 26332018, -12405641,
-             11831880, 6985184, -9940361, 2854096},
-            {-4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645,
-             960770, 12121869, 16648078},
+            { -25680606, 5260744, -19235809, -6284470, -3695942, 16566087,
+                27218280, 2607121, 29375955, 6024730 },
+            { 842132, -2794693, -4763381, -8722815, 26332018, -12405641,
+                11831880, 6985184, -9940361, 2854096 },
+            { -4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645,
+                960770, 12121869, 16648078 },
         },
         {
-            {-15218652, 14667096, -13336229, 2013717, 30598287, -464137,
-             -31504922, -7882064, 20237806, 2838411},
-            {-19288047, 4453152, 15298546, -16178388, 22115043, -15972604,
-             12544294, -13470457, 1068881, -12499905},
-            {-9558883, -16518835, 33238498, 13506958, 30505848, -1114596,
-             -8486907, -2630053, 12521378, 4845654},
+            { -15218652, 14667096, -13336229, 2013717, 30598287, -464137,
+                -31504922, -7882064, 20237806, 2838411 },
+            { -19288047, 4453152, 15298546, -16178388, 22115043, -15972604,
+                12544294, -13470457, 1068881, -12499905 },
+            { -9558883, -16518835, 33238498, 13506958, 30505848, -1114596,
+                -8486907, -2630053, 12521378, 4845654 },
         },
         {
-            {-28198521, 10744108, -2958380, 10199664, 7759311, -13088600,
-             3409348, -873400, -6482306, -12885870},
-            {-23561822, 6230156, -20382013, 10655314, -24040585, -11621172,
-             10477734, -1240216, -3113227, 13974498},
-            {12966261, 15550616, -32038948, -1615346, 21025980, -629444,
-             5642325, 7188737, 18895762, 12629579},
+            { -28198521, 10744108, -2958380, 10199664, 7759311, -13088600,
+                3409348, -873400, -6482306, -12885870 },
+            { -23561822, 6230156, -20382013, 10655314, -24040585, -11621172,
+                10477734, -1240216, -3113227, 13974498 },
+            { 12966261, 15550616, -32038948, -1615346, 21025980, -629444,
+                5642325, 7188737, 18895762, 12629579 },
         },
     },
     {
         {
-            {14741879, -14946887, 22177208, -11721237, 1279741, 8058600,
-             11758140, 789443, 32195181, 3895677},
-            {10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575,
-             -3566119, -8982069, 4429647},
-            {-2453894, 15725973, -20436342, -10410672, -5803908, -11040220,
-             -7135870, -11642895, 18047436, -15281743},
+            { 14741879, -14946887, 22177208, -11721237, 1279741, 8058600,
+                11758140, 789443, 32195181, 3895677 },
+            { 10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575,
+                -3566119, -8982069, 4429647 },
+            { -2453894, 15725973, -20436342, -10410672, -5803908, -11040220,
+                -7135870, -11642895, 18047436, -15281743 },
         },
         {
-            {-25173001, -11307165, 29759956, 11776784, -22262383, -15820455,
-             10993114, -12850837, -17620701, -9408468},
-            {21987233, 700364, -24505048, 14972008, -7774265, -5718395,
-             32155026, 2581431, -29958985, 8773375},
-            {-25568350, 454463, -13211935, 16126715, 25240068, 8594567,
-             20656846, 12017935, -7874389, -13920155},
+            { -25173001, -11307165, 29759956, 11776784, -22262383, -15820455,
+                10993114, -12850837, -17620701, -9408468 },
+            { 21987233, 700364, -24505048, 14972008, -7774265, -5718395,
+                32155026, 2581431, -29958985, 8773375 },
+            { -25568350, 454463, -13211935, 16126715, 25240068, 8594567,
+                20656846, 12017935, -7874389, -13920155 },
         },
         {
-            {6028182, 6263078, -31011806, -11301710, -818919, 2461772,
-             -31841174, -5468042, -1721788, -2776725},
-            {-12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845,
-             -4166698, 28408820, 6816612},
-            {-10358094, -8237829, 19549651, -12169222, 22082623, 16147817,
-             20613181, 13982702, -10339570, 5067943},
+            { 6028182, 6263078, -31011806, -11301710, -818919, 2461772,
+                -31841174, -5468042, -1721788, -2776725 },
+            { -12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845,
+                -4166698, 28408820, 6816612 },
+            { -10358094, -8237829, 19549651, -12169222, 22082623, 16147817,
+                20613181, 13982702, -10339570, 5067943 },
         },
         {
-            {-30505967, -3821767, 12074681, 13582412, -19877972, 2443951,
-             -19719286, 12746132, 5331210, -10105944},
-            {30528811, 3601899, -1957090, 4619785, -27361822, -15436388,
-             24180793, -12570394, 27679908, -1648928},
-            {9402404, -13957065, 32834043, 10838634, -26580150, -13237195,
-             26653274, -8685565, 22611444, -12715406},
+            { -30505967, -3821767, 12074681, 13582412, -19877972, 2443951,
+                -19719286, 12746132, 5331210, -10105944 },
+            { 30528811, 3601899, -1957090, 4619785, -27361822, -15436388,
+                24180793, -12570394, 27679908, -1648928 },
+            { 9402404, -13957065, 32834043, 10838634, -26580150, -13237195,
+                26653274, -8685565, 22611444, -12715406 },
         },
         {
-            {22190590, 1118029, 22736441, 15130463, -30460692, -5991321,
-             19189625, -4648942, 4854859, 6622139},
-            {-8310738, -2953450, -8262579, -3388049, -10401731, -271929,
-             13424426, -3567227, 26404409, 13001963},
-            {-31241838, -15415700, -2994250, 8939346, 11562230, -12840670,
-             -26064365, -11621720, -15405155, 11020693},
+            { 22190590, 1118029, 22736441, 15130463, -30460692, -5991321,
+                19189625, -4648942, 4854859, 6622139 },
+            { -8310738, -2953450, -8262579, -3388049, -10401731, -271929,
+                13424426, -3567227, 26404409, 13001963 },
+            { -31241838, -15415700, -2994250, 8939346, 11562230, -12840670,
+                -26064365, -11621720, -15405155, 11020693 },
         },
         {
-            {1866042, -7949489, -7898649, -10301010, 12483315, 13477547,
-             3175636, -12424163, 28761762, 1406734},
-            {-448555, -1777666, 13018551, 3194501, -9580420, -11161737,
-             24760585, -4347088, 25577411, -13378680},
-            {-24290378, 4759345, -690653, -1852816, 2066747, 10693769,
-             -29595790, 9884936, -9368926, 4745410},
+            { 1866042, -7949489, -7898649, -10301010, 12483315, 13477547,
+                3175636, -12424163, 28761762, 1406734 },
+            { -448555, -1777666, 13018551, 3194501, -9580420, -11161737,
+                24760585, -4347088, 25577411, -13378680 },
+            { -24290378, 4759345, -690653, -1852816, 2066747, 10693769,
+                -29595790, 9884936, -9368926, 4745410 },
         },
         {
-            {-9141284, 6049714, -19531061, -4341411, -31260798, 9944276,
-             -15462008, -11311852, 10931924, -11931931},
-            {-16561513, 14112680, -8012645, 4817318, -8040464, -11414606,
-             -22853429, 10856641, -20470770, 13434654},
-            {22759489, -10073434, -16766264, -1871422, 13637442, -10168091,
-             1765144, -12654326, 28445307, -5364710},
+            { -9141284, 6049714, -19531061, -4341411, -31260798, 9944276,
+                -15462008, -11311852, 10931924, -11931931 },
+            { -16561513, 14112680, -8012645, 4817318, -8040464, -11414606,
+                -22853429, 10856641, -20470770, 13434654 },
+            { 22759489, -10073434, -16766264, -1871422, 13637442, -10168091,
+                1765144, -12654326, 28445307, -5364710 },
         },
         {
-            {29875063, 12493613, 2795536, -3786330, 1710620, 15181182,
-             -10195717, -8788675, 9074234, 1167180},
-            {-26205683, 11014233, -9842651, -2635485, -26908120, 7532294,
-             -18716888, -9535498, 3843903, 9367684},
-            {-10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123,
-             8601684, -139197, 4242895},
+            { 29875063, 12493613, 2795536, -3786330, 1710620, 15181182,
+                -10195717, -8788675, 9074234, 1167180 },
+            { -26205683, 11014233, -9842651, -2635485, -26908120, 7532294,
+                -18716888, -9535498, 3843903, 9367684 },
+            { -10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123,
+                8601684, -139197, 4242895 },
         },
     },
     {
         {
-            {22092954, -13191123, -2042793, -11968512, 32186753, -11517388,
-             -6574341, 2470660, -27417366, 16625501},
-            {-11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857,
-             2602725, -27351616, 14247413},
-            {6314175, -10264892, -32772502, 15957557, -10157730, 168750,
-             -8618807, 14290061, 27108877, -1180880},
+            { 22092954, -13191123, -2042793, -11968512, 32186753, -11517388,
+                -6574341, 2470660, -27417366, 16625501 },
+            { -11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857,
+                2602725, -27351616, 14247413 },
+            { 6314175, -10264892, -32772502, 15957557, -10157730, 168750,
+                -8618807, 14290061, 27108877, -1180880 },
         },
         {
-            {-8586597, -7170966, 13241782, 10960156, -32991015, -13794596,
-             33547976, -11058889, -27148451, 981874},
-            {22833440, 9293594, -32649448, -13618667, -9136966, 14756819,
-             -22928859, -13970780, -10479804, -16197962},
-            {-7768587, 3326786, -28111797, 10783824, 19178761, 14905060,
-             22680049, 13906969, -15933690, 3797899},
+            { -8586597, -7170966, 13241782, 10960156, -32991015, -13794596,
+                33547976, -11058889, -27148451, 981874 },
+            { 22833440, 9293594, -32649448, -13618667, -9136966, 14756819,
+                -22928859, -13970780, -10479804, -16197962 },
+            { -7768587, 3326786, -28111797, 10783824, 19178761, 14905060,
+                22680049, 13906969, -15933690, 3797899 },
         },
         {
-            {21721356, -4212746, -12206123, 9310182, -3882239, -13653110,
-             23740224, -2709232, 20491983, -8042152},
-            {9209270, -15135055, -13256557, -6167798, -731016, 15289673,
-             25947805, 15286587, 30997318, -6703063},
-            {7392032, 16618386, 23946583, -8039892, -13265164, -1533858,
-             -14197445, -2321576, 17649998, -250080},
+            { 21721356, -4212746, -12206123, 9310182, -3882239, -13653110,
+                23740224, -2709232, 20491983, -8042152 },
+            { 9209270, -15135055, -13256557, -6167798, -731016, 15289673,
+                25947805, 15286587, 30997318, -6703063 },
+            { 7392032, 16618386, 23946583, -8039892, -13265164, -1533858,
+                -14197445, -2321576, 17649998, -250080 },
         },
         {
-            {-9301088, -14193827, 30609526, -3049543, -25175069, -1283752,
-             -15241566, -9525724, -2233253, 7662146},
-            {-17558673, 1763594, -33114336, 15908610, -30040870, -12174295,
-             7335080, -8472199, -3174674, 3440183},
-            {-19889700, -5977008, -24111293, -9688870, 10799743, -16571957,
-             40450, -4431835, 4862400, 1133},
+            { -9301088, -14193827, 30609526, -3049543, -25175069, -1283752,
+                -15241566, -9525724, -2233253, 7662146 },
+            { -17558673, 1763594, -33114336, 15908610, -30040870, -12174295,
+                7335080, -8472199, -3174674, 3440183 },
+            { -19889700, -5977008, -24111293, -9688870, 10799743, -16571957,
+                40450, -4431835, 4862400, 1133 },
         },
         {
-            {-32856209, -7873957, -5422389, 14860950, -16319031, 7956142,
-             7258061, 311861, -30594991, -7379421},
-            {-3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763,
-             16527196, 18278453, 15405622},
-            {-4381906, 8508652, -19898366, -3674424, -5984453, 15149970,
-             -13313598, 843523, -21875062, 13626197},
+            { -32856209, -7873957, -5422389, 14860950, -16319031, 7956142,
+                7258061, 311861, -30594991, -7379421 },
+            { -3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763,
+                16527196, 18278453, 15405622 },
+            { -4381906, 8508652, -19898366, -3674424, -5984453, 15149970,
+                -13313598, 843523, -21875062, 13626197 },
         },
         {
-            {2281448, -13487055, -10915418, -2609910, 1879358, 16164207,
-             -10783882, 3953792, 13340839, 15928663},
-            {31727126, -7179855, -18437503, -8283652, 2875793, -16390330,
-             -25269894, -7014826, -23452306, 5964753},
-            {4100420, -5959452, -17179337, 6017714, -18705837, 12227141,
-             -26684835, 11344144, 2538215, -7570755},
+            { 2281448, -13487055, -10915418, -2609910, 1879358, 16164207,
+                -10783882, 3953792, 13340839, 15928663 },
+            { 31727126, -7179855, -18437503, -8283652, 2875793, -16390330,
+                -25269894, -7014826, -23452306, 5964753 },
+            { 4100420, -5959452, -17179337, 6017714, -18705837, 12227141,
+                -26684835, 11344144, 2538215, -7570755 },
         },
         {
-            {-9433605, 6123113, 11159803, -2156608, 30016280, 14966241,
-             -20474983, 1485421, -629256, -15958862},
-            {-26804558, 4260919, 11851389, 9658551, -32017107, 16367492,
-             -20205425, -13191288, 11659922, -11115118},
-            {26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568,
-             -10170080, 33100372, -1306171},
+            { -9433605, 6123113, 11159803, -2156608, 30016280, 14966241,
+                -20474983, 1485421, -629256, -15958862 },
+            { -26804558, 4260919, 11851389, 9658551, -32017107, 16367492,
+                -20205425, -13191288, 11659922, -11115118 },
+            { 26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568,
+                -10170080, 33100372, -1306171 },
         },
         {
-            {15121113, -5201871, -10389905, 15427821, -27509937, -15992507,
-             21670947, 4486675, -5931810, -14466380},
-            {16166486, -9483733, -11104130, 6023908, -31926798, -1364923,
-             2340060, -16254968, -10735770, -10039824},
-            {28042865, -3557089, -12126526, 12259706, -3717498, -6945899,
-             6766453, -8689599, 18036436, 5803270},
+            { 15121113, -5201871, -10389905, 15427821, -27509937, -15992507,
+                21670947, 4486675, -5931810, -14466380 },
+            { 16166486, -9483733, -11104130, 6023908, -31926798, -1364923,
+                2340060, -16254968, -10735770, -10039824 },
+            { 28042865, -3557089, -12126526, 12259706, -3717498, -6945899,
+                6766453, -8689599, 18036436, 5803270 },
         },
     },
     {
         {
-            {-817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391,
-             4598332, -6159431, -14117438},
-            {-31031306, -14256194, 17332029, -2383520, 31312682, -5967183,
-             696309, 50292, -20095739, 11763584},
-            {-594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117,
-             -12613632, -19773211, -10713562},
+            { -817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391,
+                4598332, -6159431, -14117438 },
+            { -31031306, -14256194, 17332029, -2383520, 31312682, -5967183,
+                696309, 50292, -20095739, 11763584 },
+            { -594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117,
+                -12613632, -19773211, -10713562 },
         },
         {
-            {30464590, -11262872, -4127476, -12734478, 19835327, -7105613,
-             -24396175, 2075773, -17020157, 992471},
-            {18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841,
-             8080033, -11574335, -10601610},
-            {19598397, 10334610, 12555054, 2555664, 18821899, -10339780,
-             21873263, 16014234, 26224780, 16452269},
+            { 30464590, -11262872, -4127476, -12734478, 19835327, -7105613,
+                -24396175, 2075773, -17020157, 992471 },
+            { 18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841,
+                8080033, -11574335, -10601610 },
+            { 19598397, 10334610, 12555054, 2555664, 18821899, -10339780,
+                21873263, 16014234, 26224780, 16452269 },
         },
         {
-            {-30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804,
-             -7618186, -20533829, 3698650},
-            {14187449, 3448569, -10636236, -10810935, -22663880, -3433596,
-             7268410, -10890444, 27394301, 12015369},
-            {19695761, 16087646, 28032085, 12999827, 6817792, 11427614,
-             20244189, -1312777, -13259127, -3402461},
+            { -30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804,
+                -7618186, -20533829, 3698650 },
+            { 14187449, 3448569, -10636236, -10810935, -22663880, -3433596,
+                7268410, -10890444, 27394301, 12015369 },
+            { 19695761, 16087646, 28032085, 12999827, 6817792, 11427614,
+                20244189, -1312777, -13259127, -3402461 },
         },
         {
-            {30860103, 12735208, -1888245, -4699734, -16974906, 2256940,
-             -8166013, 12298312, -8550524, -10393462},
-            {-5719826, -11245325, -1910649, 15569035, 26642876, -7587760,
-             -5789354, -15118654, -4976164, 12651793},
-            {-2848395, 9953421, 11531313, -5282879, 26895123, -12697089,
-             -13118820, -16517902, 9768698, -2533218},
+            { 30860103, 12735208, -1888245, -4699734, -16974906, 2256940,
+                -8166013, 12298312, -8550524, -10393462 },
+            { -5719826, -11245325, -1910649, 15569035, 26642876, -7587760,
+                -5789354, -15118654, -4976164, 12651793 },
+            { -2848395, 9953421, 11531313, -5282879, 26895123, -12697089,
+                -13118820, -16517902, 9768698, -2533218 },
         },
         {
-            {-24719459, 1894651, -287698, -4704085, 15348719, -8156530,
-             32767513, 12765450, 4940095, 10678226},
-            {18860224, 15980149, -18987240, -1562570, -26233012, -11071856,
-             -7843882, 13944024, -24372348, 16582019},
-            {-15504260, 4970268, -29893044, 4175593, -20993212, -2199756,
-             -11704054, 15444560, -11003761, 7989037},
+            { -24719459, 1894651, -287698, -4704085, 15348719, -8156530,
+                32767513, 12765450, 4940095, 10678226 },
+            { 18860224, 15980149, -18987240, -1562570, -26233012, -11071856,
+                -7843882, 13944024, -24372348, 16582019 },
+            { -15504260, 4970268, -29893044, 4175593, -20993212, -2199756,
+                -11704054, 15444560, -11003761, 7989037 },
         },
         {
-            {31490452, 5568061, -2412803, 2182383, -32336847, 4531686,
-             -32078269, 6200206, -19686113, -14800171},
-            {-17308668, -15879940, -31522777, -2831, -32887382, 16375549,
-             8680158, -16371713, 28550068, -6857132},
-            {-28126887, -5688091, 16837845, -1820458, -6850681, 12700016,
-             -30039981, 4364038, 1155602, 5988841},
+            { 31490452, 5568061, -2412803, 2182383, -32336847, 4531686,
+                -32078269, 6200206, -19686113, -14800171 },
+            { -17308668, -15879940, -31522777, -2831, -32887382, 16375549,
+                8680158, -16371713, 28550068, -6857132 },
+            { -28126887, -5688091, 16837845, -1820458, -6850681, 12700016,
+                -30039981, 4364038, 1155602, 5988841 },
         },
         {
-            {21890435, -13272907, -12624011, 12154349, -7831873, 15300496,
-             23148983, -4470481, 24618407, 8283181},
-            {-33136107, -10512751, 9975416, 6841041, -31559793, 16356536,
-             3070187, -7025928, 1466169, 10740210},
-            {-1509399, -15488185, -13503385, -10655916, 32799044, 909394,
-             -13938903, -5779719, -32164649, -15327040},
+            { 21890435, -13272907, -12624011, 12154349, -7831873, 15300496,
+                23148983, -4470481, 24618407, 8283181 },
+            { -33136107, -10512751, 9975416, 6841041, -31559793, 16356536,
+                3070187, -7025928, 1466169, 10740210 },
+            { -1509399, -15488185, -13503385, -10655916, 32799044, 909394,
+                -13938903, -5779719, -32164649, -15327040 },
         },
         {
-            {3960823, -14267803, -28026090, -15918051, -19404858, 13146868,
-             15567327, 951507, -3260321, -573935},
-            {24740841, 5052253, -30094131, 8961361, 25877428, 6165135,
-             -24368180, 14397372, -7380369, -6144105},
-            {-28888365, 3510803, -28103278, -1158478, -11238128, -10631454,
-             -15441463, -14453128, -1625486, -6494814},
+            { 3960823, -14267803, -28026090, -15918051, -19404858, 13146868,
+                15567327, 951507, -3260321, -573935 },
+            { 24740841, 5052253, -30094131, 8961361, 25877428, 6165135,
+                -24368180, 14397372, -7380369, -6144105 },
+            { -28888365, 3510803, -28103278, -1158478, -11238128, -10631454,
+                -15441463, -14453128, -1625486, -6494814 },
         },
     },
     {
         {
-            {793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843,
-             -4885251, -9906200, -621852},
-            {5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374,
-             1468826, -6171428, -15186581},
-            {-4859255, -3779343, -2917758, -6748019, 7778750, 11688288,
-             -30404353, -9871238, -1558923, -9863646},
+            { 793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843,
+                -4885251, -9906200, -621852 },
+            { 5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374,
+                1468826, -6171428, -15186581 },
+            { -4859255, -3779343, -2917758, -6748019, 7778750, 11688288,
+                -30404353, -9871238, -1558923, -9863646 },
         },
         {
-            {10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958,
-             14783338, -30581476, -15757844},
-            {10566929, 12612572, -31944212, 11118703, -12633376, 12362879,
-             21752402, 8822496, 24003793, 14264025},
-            {27713862, -7355973, -11008240, 9227530, 27050101, 2504721,
-             23886875, -13117525, 13958495, -5732453},
+            { 10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958,
+                14783338, -30581476, -15757844 },
+            { 10566929, 12612572, -31944212, 11118703, -12633376, 12362879,
+                21752402, 8822496, 24003793, 14264025 },
+            { 27713862, -7355973, -11008240, 9227530, 27050101, 2504721,
+                23886875, -13117525, 13958495, -5732453 },
         },
         {
-            {-23481610, 4867226, -27247128, 3900521, 29838369, -8212291,
-             -31889399, -10041781, 7340521, -15410068},
-            {4646514, -8011124, -22766023, -11532654, 23184553, 8566613,
-             31366726, -1381061, -15066784, -10375192},
-            {-17270517, 12723032, -16993061, 14878794, 21619651, -6197576,
-             27584817, 3093888, -8843694, 3849921},
+            { -23481610, 4867226, -27247128, 3900521, 29838369, -8212291,
+                -31889399, -10041781, 7340521, -15410068 },
+            { 4646514, -8011124, -22766023, -11532654, 23184553, 8566613,
+                31366726, -1381061, -15066784, -10375192 },
+            { -17270517, 12723032, -16993061, 14878794, 21619651, -6197576,
+                27584817, 3093888, -8843694, 3849921 },
         },
         {
-            {-9064912, 2103172, 25561640, -15125738, -5239824, 9582958,
-             32477045, -9017955, 5002294, -15550259},
-            {-12057553, -11177906, 21115585, -13365155, 8808712, -12030708,
-             16489530, 13378448, -25845716, 12741426},
-            {-5946367, 10645103, -30911586, 15390284, -3286982, -7118677,
-             24306472, 15852464, 28834118, -7646072},
+            { -9064912, 2103172, 25561640, -15125738, -5239824, 9582958,
+                32477045, -9017955, 5002294, -15550259 },
+            { -12057553, -11177906, 21115585, -13365155, 8808712, -12030708,
+                16489530, 13378448, -25845716, 12741426 },
+            { -5946367, 10645103, -30911586, 15390284, -3286982, -7118677,
+                24306472, 15852464, 28834118, -7646072 },
         },
         {
-            {-17335748, -9107057, -24531279, 9434953, -8472084, -583362,
-             -13090771, 455841, 20461858, 5491305},
-            {13669248, -16095482, -12481974, -10203039, -14569770, -11893198,
-             -24995986, 11293807, -28588204, -9421832},
-            {28497928, 6272777, -33022994, 14470570, 8906179, -1225630,
-             18504674, -14165166, 29867745, -8795943},
+            { -17335748, -9107057, -24531279, 9434953, -8472084, -583362,
+                -13090771, 455841, 20461858, 5491305 },
+            { 13669248, -16095482, -12481974, -10203039, -14569770, -11893198,
+                -24995986, 11293807, -28588204, -9421832 },
+            { 28497928, 6272777, -33022994, 14470570, 8906179, -1225630,
+                18504674, -14165166, 29867745, -8795943 },
         },
         {
-            {-16207023, 13517196, -27799630, -13697798, 24009064, -6373891,
-             -6367600, -13175392, 22853429, -4012011},
-            {24191378, 16712145, -13931797, 15217831, 14542237, 1646131,
-             18603514, -11037887, 12876623, -2112447},
-            {17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753,
-             608397, 16031844, 3723494},
+            { -16207023, 13517196, -27799630, -13697798, 24009064, -6373891,
+                -6367600, -13175392, 22853429, -4012011 },
+            { 24191378, 16712145, -13931797, 15217831, 14542237, 1646131,
+                18603514, -11037887, 12876623, -2112447 },
+            { 17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753,
+                608397, 16031844, 3723494 },
         },
         {
-            {-28632773, 12763728, -20446446, 7577504, 33001348, -13017745,
-             17558842, -7872890, 23896954, -4314245},
-            {-20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064,
-             7229064, -9919646, -8826859},
-            {28816045, 298879, -28165016, -15920938, 19000928, -1665890,
-             -12680833, -2949325, -18051778, -2082915},
+            { -28632773, 12763728, -20446446, 7577504, 33001348, -13017745,
+                17558842, -7872890, 23896954, -4314245 },
+            { -20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064,
+                7229064, -9919646, -8826859 },
+            { 28816045, 298879, -28165016, -15920938, 19000928, -1665890,
+                -12680833, -2949325, -18051778, -2082915 },
         },
         {
-            {16000882, -344896, 3493092, -11447198, -29504595, -13159789,
-             12577740, 16041268, -19715240, 7847707},
-            {10151868, 10572098, 27312476, 7922682, 14825339, 4723128,
-             -32855931, -6519018, -10020567, 3852848},
-            {-11430470, 15697596, -21121557, -4420647, 5386314, 15063598,
-             16514493, -15932110, 29330899, -15076224},
+            { 16000882, -344896, 3493092, -11447198, -29504595, -13159789,
+                12577740, 16041268, -19715240, 7847707 },
+            { 10151868, 10572098, 27312476, 7922682, 14825339, 4723128,
+                -32855931, -6519018, -10020567, 3852848 },
+            { -11430470, 15697596, -21121557, -4420647, 5386314, 15063598,
+                16514493, -15932110, 29330899, -15076224 },
         },
     },
     {
         {
-            {-25499735, -4378794, -15222908, -6901211, 16615731, 2051784,
-             3303702, 15490, -27548796, 12314391},
-            {15683520, -6003043, 18109120, -9980648, 15337968, -5997823,
-             -16717435, 15921866, 16103996, -3731215},
-            {-23169824, -10781249, 13588192, -1628807, -3798557, -1074929,
-             -19273607, 5402699, -29815713, -9841101},
+            { -25499735, -4378794, -15222908, -6901211, 16615731, 2051784,
+                3303702, 15490, -27548796, 12314391 },
+            { 15683520, -6003043, 18109120, -9980648, 15337968, -5997823,
+                -16717435, 15921866, 16103996, -3731215 },
+            { -23169824, -10781249, 13588192, -1628807, -3798557, -1074929,
+                -19273607, 5402699, -29815713, -9841101 },
         },
         {
-            {23190676, 2384583, -32714340, 3462154, -29903655, -1529132,
-             -11266856, 8911517, -25205859, 2739713},
-            {21374101, -3554250, -33524649, 9874411, 15377179, 11831242,
-             -33529904, 6134907, 4931255, 11987849},
-            {-7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539,
-             13861388, -30076310, 10117930},
+            { 23190676, 2384583, -32714340, 3462154, -29903655, -1529132,
+                -11266856, 8911517, -25205859, 2739713 },
+            { 21374101, -3554250, -33524649, 9874411, 15377179, 11831242,
+                -33529904, 6134907, 4931255, 11987849 },
+            { -7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539,
+                13861388, -30076310, 10117930 },
         },
         {
-            {-29501170, -10744872, -26163768, 13051539, -25625564, 5089643,
-             -6325503, 6704079, 12890019, 15728940},
-            {-21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376,
-             -10428139, 12885167, 8311031},
-            {-17516482, 5352194, 10384213, -13811658, 7506451, 13453191,
-             26423267, 4384730, 1888765, -5435404},
+            { -29501170, -10744872, -26163768, 13051539, -25625564, 5089643,
+                -6325503, 6704079, 12890019, 15728940 },
+            { -21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376,
+                -10428139, 12885167, 8311031 },
+            { -17516482, 5352194, 10384213, -13811658, 7506451, 13453191,
+                26423267, 4384730, 1888765, -5435404 },
         },
         {
-            {-25817338, -3107312, -13494599, -3182506, 30896459, -13921729,
-             -32251644, -12707869, -19464434, -3340243},
-            {-23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245,
-             14845197, 17151279, -9854116},
-            {-24830458, -12733720, -15165978, 10367250, -29530908, -265356,
-             22825805, -7087279, -16866484, 16176525},
+            { -25817338, -3107312, -13494599, -3182506, 30896459, -13921729,
+                -32251644, -12707869, -19464434, -3340243 },
+            { -23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245,
+                14845197, 17151279, -9854116 },
+            { -24830458, -12733720, -15165978, 10367250, -29530908, -265356,
+                22825805, -7087279, -16866484, 16176525 },
         },
         {
-            {-23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182,
-             -10363426, -28746253, -10197509},
-            {-10626600, -4486402, -13320562, -5125317, 3432136, -6393229,
-             23632037, -1940610, 32808310, 1099883},
-            {15030977, 5768825, -27451236, -2887299, -6427378, -15361371,
-             -15277896, -6809350, 2051441, -15225865},
+            { -23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182,
+                -10363426, -28746253, -10197509 },
+            { -10626600, -4486402, -13320562, -5125317, 3432136, -6393229,
+                23632037, -1940610, 32808310, 1099883 },
+            { 15030977, 5768825, -27451236, -2887299, -6427378, -15361371,
+                -15277896, -6809350, 2051441, -15225865 },
         },
         {
-            {-3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398,
-             -14154188, -22686354, 16633660},
-            {4577086, -16752288, 13249841, -15304328, 19958763, -14537274,
-             18559670, -10759549, 8402478, -9864273},
-            {-28406330, -1051581, -26790155, -907698, -17212414, -11030789,
-             9453451, -14980072, 17983010, 9967138},
+            { -3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398,
+                -14154188, -22686354, 16633660 },
+            { 4577086, -16752288, 13249841, -15304328, 19958763, -14537274,
+                18559670, -10759549, 8402478, -9864273 },
+            { -28406330, -1051581, -26790155, -907698, -17212414, -11030789,
+                9453451, -14980072, 17983010, 9967138 },
         },
         {
-            {-25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990,
-             7806337, 17507396, 3651560},
-            {-10420457, -4118111, 14584639, 15971087, -15768321, 8861010,
-             26556809, -5574557, -18553322, -11357135},
-            {2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121,
-             8459447, -5605463, -7621941},
+            { -25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990,
+                7806337, 17507396, 3651560 },
+            { -10420457, -4118111, 14584639, 15971087, -15768321, 8861010,
+                26556809, -5574557, -18553322, -11357135 },
+            { 2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121,
+                8459447, -5605463, -7621941 },
         },
         {
-            {-4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813,
-             -849066, 17258084, -7977739},
-            {18164541, -10595176, -17154882, -1542417, 19237078, -9745295,
-             23357533, -15217008, 26908270, 12150756},
-            {-30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168,
-             -5537701, -32302074, 16215819},
+            { -4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813,
+                -849066, 17258084, -7977739 },
+            { 18164541, -10595176, -17154882, -1542417, 19237078, -9745295,
+                23357533, -15217008, 26908270, 12150756 },
+            { -30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168,
+                -5537701, -32302074, 16215819 },
         },
     },
     {
         {
-            {-6898905, 9824394, -12304779, -4401089, -31397141, -6276835,
-             32574489, 12532905, -7503072, -8675347},
-            {-27343522, -16515468, -27151524, -10722951, 946346, 16291093,
-             254968, 7168080, 21676107, -1943028},
-            {21260961, -8424752, -16831886, -11920822, -23677961, 3968121,
-             -3651949, -6215466, -3556191, -7913075},
+            { -6898905, 9824394, -12304779, -4401089, -31397141, -6276835,
+                32574489, 12532905, -7503072, -8675347 },
+            { -27343522, -16515468, -27151524, -10722951, 946346, 16291093,
+                254968, 7168080, 21676107, -1943028 },
+            { 21260961, -8424752, -16831886, -11920822, -23677961, 3968121,
+                -3651949, -6215466, -3556191, -7913075 },
         },
         {
-            {16544754, 13250366, -16804428, 15546242, -4583003, 12757258,
-             -2462308, -8680336, -18907032, -9662799},
-            {-2415239, -15577728, 18312303, 4964443, -15272530, -12653564,
-             26820651, 16690659, 25459437, -4564609},
-            {-25144690, 11425020, 28423002, -11020557, -6144921, -15826224,
-             9142795, -2391602, -6432418, -1644817},
+            { 16544754, 13250366, -16804428, 15546242, -4583003, 12757258,
+                -2462308, -8680336, -18907032, -9662799 },
+            { -2415239, -15577728, 18312303, 4964443, -15272530, -12653564,
+                26820651, 16690659, 25459437, -4564609 },
+            { -25144690, 11425020, 28423002, -11020557, -6144921, -15826224,
+                9142795, -2391602, -6432418, -1644817 },
         },
         {
-            {-23104652, 6253476, 16964147, -3768872, -25113972, -12296437,
-             -27457225, -16344658, 6335692, 7249989},
-            {-30333227, 13979675, 7503222, -12368314, -11956721, -4621693,
-             -30272269, 2682242, 25993170, -12478523},
-            {4364628, 5930691, 32304656, -10044554, -8054781, 15091131,
-             22857016, -10598955, 31820368, 15075278},
+            { -23104652, 6253476, 16964147, -3768872, -25113972, -12296437,
+                -27457225, -16344658, 6335692, 7249989 },
+            { -30333227, 13979675, 7503222, -12368314, -11956721, -4621693,
+                -30272269, 2682242, 25993170, -12478523 },
+            { 4364628, 5930691, 32304656, -10044554, -8054781, 15091131,
+                22857016, -10598955, 31820368, 15075278 },
         },
         {
-            {31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788,
-             -9650886, -17970238, 12833045},
-            {19073683, 14851414, -24403169, -11860168, 7625278, 11091125,
-             -19619190, 2074449, -9413939, 14905377},
-            {24483667, -11935567, -2518866, -11547418, -1553130, 15355506,
-             -25282080, 9253129, 27628530, -7555480},
+            { 31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788,
+                -9650886, -17970238, 12833045 },
+            { 19073683, 14851414, -24403169, -11860168, 7625278, 11091125,
+                -19619190, 2074449, -9413939, 14905377 },
+            { 24483667, -11935567, -2518866, -11547418, -1553130, 15355506,
+                -25282080, 9253129, 27628530, -7555480 },
         },
         {
-            {17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324,
-             -9157582, -14110875, 15297016},
-            {510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417,
-             -11864220, 8683221, 2921426},
-            {18606791, 11874196, 27155355, -5281482, -24031742, 6265446,
-             -25178240, -1278924, 4674690, 13890525},
+            { 17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324,
+                -9157582, -14110875, 15297016 },
+            { 510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417,
+                -11864220, 8683221, 2921426 },
+            { 18606791, 11874196, 27155355, -5281482, -24031742, 6265446,
+                -25178240, -1278924, 4674690, 13890525 },
         },
         {
-            {13609624, 13069022, -27372361, -13055908, 24360586, 9592974,
-             14977157, 9835105, 4389687, 288396},
-            {9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062,
-             8317628, 23388070, 16052080},
-            {12720016, 11937594, -31970060, -5028689, 26900120, 8561328,
-             -20155687, -11632979, -14754271, -10812892},
+            { 13609624, 13069022, -27372361, -13055908, 24360586, 9592974,
+                14977157, 9835105, 4389687, 288396 },
+            { 9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062,
+                8317628, 23388070, 16052080 },
+            { 12720016, 11937594, -31970060, -5028689, 26900120, 8561328,
+                -20155687, -11632979, -14754271, -10812892 },
         },
         {
-            {15961858, 14150409, 26716931, -665832, -22794328, 13603569,
-             11829573, 7467844, -28822128, 929275},
-            {11038231, -11582396, -27310482, -7316562, -10498527, -16307831,
-             -23479533, -9371869, -21393143, 2465074},
-            {20017163, -4323226, 27915242, 1529148, 12396362, 15675764,
-             13817261, -9658066, 2463391, -4622140},
+            { 15961858, 14150409, 26716931, -665832, -22794328, 13603569,
+                11829573, 7467844, -28822128, 929275 },
+            { 11038231, -11582396, -27310482, -7316562, -10498527, -16307831,
+                -23479533, -9371869, -21393143, 2465074 },
+            { 20017163, -4323226, 27915242, 1529148, 12396362, 15675764,
+                13817261, -9658066, 2463391, -4622140 },
         },
         {
-            {-16358878, -12663911, -12065183, 4996454, -1256422, 1073572,
-             9583558, 12851107, 4003896, 12673717},
-            {-1731589, -15155870, -3262930, 16143082, 19294135, 13385325,
-             14741514, -9103726, 7903886, 2348101},
-            {24536016, -16515207, 12715592, -3862155, 1511293, 10047386,
-             -3842346, -7129159, -28377538, 10048127},
+            { -16358878, -12663911, -12065183, 4996454, -1256422, 1073572,
+                9583558, 12851107, 4003896, 12673717 },
+            { -1731589, -15155870, -3262930, 16143082, 19294135, 13385325,
+                14741514, -9103726, 7903886, 2348101 },
+            { 24536016, -16515207, 12715592, -3862155, 1511293, 10047386,
+                -3842346, -7129159, -28377538, 10048127 },
         },
     },
     {
         {
-            {-12622226, -6204820, 30718825, 2591312, -10617028, 12192840,
-             18873298, -7297090, -32297756, 15221632},
-            {-26478122, -11103864, 11546244, -1852483, 9180880, 7656409,
-             -21343950, 2095755, 29769758, 6593415},
-            {-31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345,
-             -6118678, 30958054, 8292160},
+            { -12622226, -6204820, 30718825, 2591312, -10617028, 12192840,
+                18873298, -7297090, -32297756, 15221632 },
+            { -26478122, -11103864, 11546244, -1852483, 9180880, 7656409,
+                -21343950, 2095755, 29769758, 6593415 },
+            { -31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345,
+                -6118678, 30958054, 8292160 },
         },
         {
-            {31429822, -13959116, 29173532, 15632448, 12174511, -2760094,
-             32808831, 3977186, 26143136, -3148876},
-            {22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633,
-             -1674433, -3758243, -2304625},
-            {-15491917, 8012313, -2514730, -12702462, -23965846, -10254029,
-             -1612713, -1535569, -16664475, 8194478},
+            { 31429822, -13959116, 29173532, 15632448, 12174511, -2760094,
+                32808831, 3977186, 26143136, -3148876 },
+            { 22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633,
+                -1674433, -3758243, -2304625 },
+            { -15491917, 8012313, -2514730, -12702462, -23965846, -10254029,
+                -1612713, -1535569, -16664475, 8194478 },
         },
         {
-            {27338066, -7507420, -7414224, 10140405, -19026427, -6589889,
-             27277191, 8855376, 28572286, 3005164},
-            {26287124, 4821776, 25476601, -4145903, -3764513, -15788984,
-             -18008582, 1182479, -26094821, -13079595},
-            {-7171154, 3178080, 23970071, 6201893, -17195577, -4489192,
-             -21876275, -13982627, 32208683, -1198248},
+            { 27338066, -7507420, -7414224, 10140405, -19026427, -6589889,
+                27277191, 8855376, 28572286, 3005164 },
+            { 26287124, 4821776, 25476601, -4145903, -3764513, -15788984,
+                -18008582, 1182479, -26094821, -13079595 },
+            { -7171154, 3178080, 23970071, 6201893, -17195577, -4489192,
+                -21876275, -13982627, 32208683, -1198248 },
         },
         {
-            {-16657702, 2817643, -10286362, 14811298, 6024667, 13349505,
-             -27315504, -10497842, -27672585, -11539858},
-            {15941029, -9405932, -21367050, 8062055, 31876073, -238629,
-             -15278393, -1444429, 15397331, -4130193},
-            {8934485, -13485467, -23286397, -13423241, -32446090, 14047986,
-             31170398, -1441021, -27505566, 15087184},
+            { -16657702, 2817643, -10286362, 14811298, 6024667, 13349505,
+                -27315504, -10497842, -27672585, -11539858 },
+            { 15941029, -9405932, -21367050, 8062055, 31876073, -238629,
+                -15278393, -1444429, 15397331, -4130193 },
+            { 8934485, -13485467, -23286397, -13423241, -32446090, 14047986,
+                31170398, -1441021, -27505566, 15087184 },
         },
         {
-            {-18357243, -2156491, 24524913, -16677868, 15520427, -6360776,
-             -15502406, 11461896, 16788528, -5868942},
-            {-1947386, 16013773, 21750665, 3714552, -17401782, -16055433,
-             -3770287, -10323320, 31322514, -11615635},
-            {21426655, -5650218, -13648287, -5347537, -28812189, -4920970,
-             -18275391, -14621414, 13040862, -12112948},
+            { -18357243, -2156491, 24524913, -16677868, 15520427, -6360776,
+                -15502406, 11461896, 16788528, -5868942 },
+            { -1947386, 16013773, 21750665, 3714552, -17401782, -16055433,
+                -3770287, -10323320, 31322514, -11615635 },
+            { 21426655, -5650218, -13648287, -5347537, -28812189, -4920970,
+                -18275391, -14621414, 13040862, -12112948 },
         },
         {
-            {11293895, 12478086, -27136401, 15083750, -29307421, 14748872,
-             14555558, -13417103, 1613711, 4896935},
-            {-25894883, 15323294, -8489791, -8057900, 25967126, -13425460,
-             2825960, -4897045, -23971776, -11267415},
-            {-15924766, -5229880, -17443532, 6410664, 3622847, 10243618,
-             20615400, 12405433, -23753030, -8436416},
+            { 11293895, 12478086, -27136401, 15083750, -29307421, 14748872,
+                14555558, -13417103, 1613711, 4896935 },
+            { -25894883, 15323294, -8489791, -8057900, 25967126, -13425460,
+                2825960, -4897045, -23971776, -11267415 },
+            { -15924766, -5229880, -17443532, 6410664, 3622847, 10243618,
+                20615400, 12405433, -23753030, -8436416 },
         },
         {
-            {-7091295, 12556208, -20191352, 9025187, -17072479, 4333801,
-             4378436, 2432030, 23097949, -566018},
-            {4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264,
-             10103221, -18512313, 2424778},
-            {366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678,
-             1344109, -3642553, 12412659},
+            { -7091295, 12556208, -20191352, 9025187, -17072479, 4333801,
+                4378436, 2432030, 23097949, -566018 },
+            { 4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264,
+                10103221, -18512313, 2424778 },
+            { 366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678,
+                1344109, -3642553, 12412659 },
         },
         {
-            {-24001791, 7690286, 14929416, -168257, -32210835, -13412986,
-             24162697, -15326504, -3141501, 11179385},
-            {18289522, -14724954, 8056945, 16430056, -21729724, 7842514,
-             -6001441, -1486897, -18684645, -11443503},
-            {476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959,
-             13403813, 11052904, 5219329},
+            { -24001791, 7690286, 14929416, -168257, -32210835, -13412986,
+                24162697, -15326504, -3141501, 11179385 },
+            { 18289522, -14724954, 8056945, 16430056, -21729724, 7842514,
+                -6001441, -1486897, -18684645, -11443503 },
+            { 476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959,
+                13403813, 11052904, 5219329 },
         },
     },
     {
         {
-            {20678546, -8375738, -32671898, 8849123, -5009758, 14574752,
-             31186971, -3973730, 9014762, -8579056},
-            {-13644050, -10350239, -15962508, 5075808, -1514661, -11534600,
-             -33102500, 9160280, 8473550, -3256838},
-            {24900749, 14435722, 17209120, -15292541, -22592275, 9878983,
-             -7689309, -16335821, -24568481, 11788948},
+            { 20678546, -8375738, -32671898, 8849123, -5009758, 14574752,
+                31186971, -3973730, 9014762, -8579056 },
+            { -13644050, -10350239, -15962508, 5075808, -1514661, -11534600,
+                -33102500, 9160280, 8473550, -3256838 },
+            { 24900749, 14435722, 17209120, -15292541, -22592275, 9878983,
+                -7689309, -16335821, -24568481, 11788948 },
         },
         {
-            {-3118155, -11395194, -13802089, 14797441, 9652448, -6845904,
-             -20037437, 10410733, -24568470, -1458691},
-            {-15659161, 16736706, -22467150, 10215878, -9097177, 7563911,
-             11871841, -12505194, -18513325, 8464118},
-            {-23400612, 8348507, -14585951, -861714, -3950205, -6373419,
-             14325289, 8628612, 33313881, -8370517},
+            { -3118155, -11395194, -13802089, 14797441, 9652448, -6845904,
+                -20037437, 10410733, -24568470, -1458691 },
+            { -15659161, 16736706, -22467150, 10215878, -9097177, 7563911,
+                11871841, -12505194, -18513325, 8464118 },
+            { -23400612, 8348507, -14585951, -861714, -3950205, -6373419,
+                14325289, 8628612, 33313881, -8370517 },
         },
         {
-            {-20186973, -4967935, 22367356, 5271547, -1097117, -4788838,
-             -24805667, -10236854, -8940735, -5818269},
-            {-6948785, -1795212, -32625683, -16021179, 32635414, -7374245,
-             15989197, -12838188, 28358192, -4253904},
-            {-23561781, -2799059, -32351682, -1661963, -9147719, 10429267,
-             -16637684, 4072016, -5351664, 5596589},
+            { -20186973, -4967935, 22367356, 5271547, -1097117, -4788838,
+                -24805667, -10236854, -8940735, -5818269 },
+            { -6948785, -1795212, -32625683, -16021179, 32635414, -7374245,
+                15989197, -12838188, 28358192, -4253904 },
+            { -23561781, -2799059, -32351682, -1661963, -9147719, 10429267,
+                -16637684, 4072016, -5351664, 5596589 },
         },
         {
-            {-28236598, -3390048, 12312896, 6213178, 3117142, 16078565,
-             29266239, 2557221, 1768301, 15373193},
-            {-7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902,
-             -4504991, -24660491, 3442910},
-            {-30210571, 5124043, 14181784, 8197961, 18964734, -11939093,
-             22597931, 7176455, -18585478, 13365930},
+            { -28236598, -3390048, 12312896, 6213178, 3117142, 16078565,
+                29266239, 2557221, 1768301, 15373193 },
+            { -7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902,
+                -4504991, -24660491, 3442910 },
+            { -30210571, 5124043, 14181784, 8197961, 18964734, -11939093,
+                22597931, 7176455, -18585478, 13365930 },
         },
         {
-            {-7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107,
-             -8570186, -9689599, -3031667},
-            {25008904, -10771599, -4305031, -9638010, 16265036, 15721635,
-             683793, -11823784, 15723479, -15163481},
-            {-9660625, 12374379, -27006999, -7026148, -7724114, -12314514,
-             11879682, 5400171, 519526, -1235876},
+            { -7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107,
+                -8570186, -9689599, -3031667 },
+            { 25008904, -10771599, -4305031, -9638010, 16265036, 15721635,
+                683793, -11823784, 15723479, -15163481 },
+            { -9660625, 12374379, -27006999, -7026148, -7724114, -12314514,
+                11879682, 5400171, 519526, -1235876 },
         },
         {
-            {22258397, -16332233, -7869817, 14613016, -22520255, -2950923,
-             -20353881, 7315967, 16648397, 7605640},
-            {-8081308, -8464597, -8223311, 9719710, 19259459, -15348212,
-             23994942, -5281555, -9468848, 4763278},
-            {-21699244, 9220969, -15730624, 1084137, -25476107, -2852390,
-             31088447, -7764523, -11356529, 728112},
+            { 22258397, -16332233, -7869817, 14613016, -22520255, -2950923,
+                -20353881, 7315967, 16648397, 7605640 },
+            { -8081308, -8464597, -8223311, 9719710, 19259459, -15348212,
+                23994942, -5281555, -9468848, 4763278 },
+            { -21699244, 9220969, -15730624, 1084137, -25476107, -2852390,
+                31088447, -7764523, -11356529, 728112 },
         },
         {
-            {26047220, -11751471, -6900323, -16521798, 24092068, 9158119,
-             -4273545, -12555558, -29365436, -5498272},
-            {17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007,
-             12327945, 10750447, 10014012},
-            {-10312768, 3936952, 9156313, -8897683, 16498692, -994647,
-             -27481051, -666732, 3424691, 7540221},
+            { 26047220, -11751471, -6900323, -16521798, 24092068, 9158119,
+                -4273545, -12555558, -29365436, -5498272 },
+            { 17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007,
+                12327945, 10750447, 10014012 },
+            { -10312768, 3936952, 9156313, -8897683, 16498692, -994647,
+                -27481051, -666732, 3424691, 7540221 },
         },
         {
-            {30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422,
-             -16317219, -9244265, 15258046},
-            {13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406,
-             2711395, 1062915, -5136345},
-            {-19240248, -11254599, -29509029, -7499965, -5835763, 13005411,
-             -6066489, 12194497, 32960380, 1459310},
+            { 30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422,
+                -16317219, -9244265, 15258046 },
+            { 13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406,
+                2711395, 1062915, -5136345 },
+            { -19240248, -11254599, -29509029, -7499965, -5835763, 13005411,
+                -6066489, 12194497, 32960380, 1459310 },
         },
     },
     {
         {
-            {19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197,
-             -6101885, 18638003, -11174937},
-            {31395534, 15098109, 26581030, 8030562, -16527914, -5007134,
-             9012486, -7584354, -6643087, -5442636},
-            {-9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222,
-             9677543, -32294889, -6456008},
+            { 19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197,
+                -6101885, 18638003, -11174937 },
+            { 31395534, 15098109, 26581030, 8030562, -16527914, -5007134,
+                9012486, -7584354, -6643087, -5442636 },
+            { -9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222,
+                9677543, -32294889, -6456008 },
         },
         {
-            {-2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579,
-             -7839692, -7852844, -8138429},
-            {-15236356, -15433509, 7766470, 746860, 26346930, -10221762,
-             -27333451, 10754588, -9431476, 5203576},
-            {31834314, 14135496, -770007, 5159118, 20917671, -16768096,
-             -7467973, -7337524, 31809243, 7347066},
+            { -2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579,
+                -7839692, -7852844, -8138429 },
+            { -15236356, -15433509, 7766470, 746860, 26346930, -10221762,
+                -27333451, 10754588, -9431476, 5203576 },
+            { 31834314, 14135496, -770007, 5159118, 20917671, -16768096,
+                -7467973, -7337524, 31809243, 7347066 },
         },
         {
-            {-9606723, -11874240, 20414459, 13033986, 13716524, -11691881,
-             19797970, -12211255, 15192876, -2087490},
-            {-12663563, -2181719, 1168162, -3804809, 26747877, -14138091,
-             10609330, 12694420, 33473243, -13382104},
-            {33184999, 11180355, 15832085, -11385430, -1633671, 225884,
-             15089336, -11023903, -6135662, 14480053},
+            { -9606723, -11874240, 20414459, 13033986, 13716524, -11691881,
+                19797970, -12211255, 15192876, -2087490 },
+            { -12663563, -2181719, 1168162, -3804809, 26747877, -14138091,
+                10609330, 12694420, 33473243, -13382104 },
+            { 33184999, 11180355, 15832085, -11385430, -1633671, 225884,
+                15089336, -11023903, -6135662, 14480053 },
         },
         {
-            {31308717, -5619998, 31030840, -1897099, 15674547, -6582883,
-             5496208, 13685227, 27595050, 8737275},
-            {-20318852, -15150239, 10933843, -16178022, 8335352, -7546022,
-             -31008351, -12610604, 26498114, 66511},
-            {22644454, -8761729, -16671776, 4884562, -3105614, -13559366,
-             30540766, -4286747, -13327787, -7515095},
+            { 31308717, -5619998, 31030840, -1897099, 15674547, -6582883,
+                5496208, 13685227, 27595050, 8737275 },
+            { -20318852, -15150239, 10933843, -16178022, 8335352, -7546022,
+                -31008351, -12610604, 26498114, 66511 },
+            { 22644454, -8761729, -16671776, 4884562, -3105614, -13559366,
+                30540766, -4286747, -13327787, -7515095 },
         },
         {
-            {-28017847, 9834845, 18617207, -2681312, -3401956, -13307506,
-             8205540, 13585437, -17127465, 15115439},
-            {23711543, -672915, 31206561, -8362711, 6164647, -9709987,
-             -33535882, -1426096, 8236921, 16492939},
-            {-23910559, -13515526, -26299483, -4503841, 25005590, -7687270,
-             19574902, 10071562, 6708380, -6222424},
+            { -28017847, 9834845, 18617207, -2681312, -3401956, -13307506,
+                8205540, 13585437, -17127465, 15115439 },
+            { 23711543, -672915, 31206561, -8362711, 6164647, -9709987,
+                -33535882, -1426096, 8236921, 16492939 },
+            { -23910559, -13515526, -26299483, -4503841, 25005590, -7687270,
+                19574902, 10071562, 6708380, -6222424 },
         },
         {
-            {2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017,
-             9328700, 29955601, -11678310},
-            {3096359, 9271816, -21620864, -15521844, -14847996, -7592937,
-             -25892142, -12635595, -9917575, 6216608},
-            {-32615849, 338663, -25195611, 2510422, -29213566, -13820213,
-             24822830, -6146567, -26767480, 7525079},
+            { 2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017,
+                9328700, 29955601, -11678310 },
+            { 3096359, 9271816, -21620864, -15521844, -14847996, -7592937,
+                -25892142, -12635595, -9917575, 6216608 },
+            { -32615849, 338663, -25195611, 2510422, -29213566, -13820213,
+                24822830, -6146567, -26767480, 7525079 },
         },
         {
-            {-23066649, -13985623, 16133487, -7896178, -3389565, 778788,
-             -910336, -2782495, -19386633, 11994101},
-            {21691500, -13624626, -641331, -14367021, 3285881, -3483596,
-             -25064666, 9718258, -7477437, 13381418},
-            {18445390, -4202236, 14979846, 11622458, -1727110, -3582980,
-             23111648, -6375247, 28535282, 15779576},
+            { -23066649, -13985623, 16133487, -7896178, -3389565, 778788,
+                -910336, -2782495, -19386633, 11994101 },
+            { 21691500, -13624626, -641331, -14367021, 3285881, -3483596,
+                -25064666, 9718258, -7477437, 13381418 },
+            { 18445390, -4202236, 14979846, 11622458, -1727110, -3582980,
+                23111648, -6375247, 28535282, 15779576 },
         },
         {
-            {30098053, 3089662, -9234387, 16662135, -21306940, 11308411,
-             -14068454, 12021730, 9955285, -16303356},
-            {9734894, -14576830, -7473633, -9138735, 2060392, 11313496,
-             -18426029, 9924399, 20194861, 13380996},
-            {-26378102, -7965207, -22167821, 15789297, -18055342, -6168792,
-             -1984914, 15707771, 26342023, 10146099},
+            { 30098053, 3089662, -9234387, 16662135, -21306940, 11308411,
+                -14068454, 12021730, 9955285, -16303356 },
+            { 9734894, -14576830, -7473633, -9138735, 2060392, 11313496,
+                -18426029, 9924399, 20194861, 13380996 },
+            { -26378102, -7965207, -22167821, 15789297, -18055342, -6168792,
+                -1984914, 15707771, 26342023, 10146099 },
         },
     },
     {
         {
-            {-26016874, -219943, 21339191, -41388, 19745256, -2878700,
-             -29637280, 2227040, 21612326, -545728},
-            {-13077387, 1184228, 23562814, -5970442, -20351244, -6348714,
-             25764461, 12243797, -20856566, 11649658},
-            {-10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944,
-             6114064, 33514190, 2333242},
+            { -26016874, -219943, 21339191, -41388, 19745256, -2878700,
+                -29637280, 2227040, 21612326, -545728 },
+            { -13077387, 1184228, 23562814, -5970442, -20351244, -6348714,
+                25764461, 12243797, -20856566, 11649658 },
+            { -10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944,
+                6114064, 33514190, 2333242 },
         },
         {
-            {-21433588, -12421821, 8119782, 7219913, -21830522, -9016134,
-             -6679750, -12670638, 24350578, -13450001},
-            {-4116307, -11271533, -23886186, 4843615, -30088339, 690623,
-             -31536088, -10406836, 8317860, 12352766},
-            {18200138, -14475911, -33087759, -2696619, -23702521, -9102511,
-             -23552096, -2287550, 20712163, 6719373},
+            { -21433588, -12421821, 8119782, 7219913, -21830522, -9016134,
+                -6679750, -12670638, 24350578, -13450001 },
+            { -4116307, -11271533, -23886186, 4843615, -30088339, 690623,
+                -31536088, -10406836, 8317860, 12352766 },
+            { 18200138, -14475911, -33087759, -2696619, -23702521, -9102511,
+                -23552096, -2287550, 20712163, 6719373 },
         },
         {
-            {26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530,
-             -3763210, 26224235, -3297458},
-            {-17168938, -14854097, -3395676, -16369877, -19954045, 14050420,
-             21728352, 9493610, 18620611, -16428628},
-            {-13323321, 13325349, 11432106, 5964811, 18609221, 6062965,
-             -5269471, -9725556, -30701573, -16479657},
+            { 26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530,
+                -3763210, 26224235, -3297458 },
+            { -17168938, -14854097, -3395676, -16369877, -19954045, 14050420,
+                21728352, 9493610, 18620611, -16428628 },
+            { -13323321, 13325349, 11432106, 5964811, 18609221, 6062965,
+                -5269471, -9725556, -30701573, -16479657 },
         },
         {
-            {-23860538, -11233159, 26961357, 1640861, -32413112, -16737940,
-             12248509, -5240639, 13735342, 1934062},
-            {25089769, 6742589, 17081145, -13406266, 21909293, -16067981,
-             -15136294, -3765346, -21277997, 5473616},
-            {31883677, -7961101, 1083432, -11572403, 22828471, 13290673,
-             -7125085, 12469656, 29111212, -5451014},
+            { -23860538, -11233159, 26961357, 1640861, -32413112, -16737940,
+                12248509, -5240639, 13735342, 1934062 },
+            { 25089769, 6742589, 17081145, -13406266, 21909293, -16067981,
+                -15136294, -3765346, -21277997, 5473616 },
+            { 31883677, -7961101, 1083432, -11572403, 22828471, 13290673,
+                -7125085, 12469656, 29111212, -5451014 },
         },
         {
-            {24244947, -15050407, -26262976, 2791540, -14997599, 16666678,
-             24367466, 6388839, -10295587, 452383},
-            {-25640782, -3417841, 5217916, 16224624, 19987036, -4082269,
-             -24236251, -5915248, 15766062, 8407814},
-            {-20406999, 13990231, 15495425, 16395525, 5377168, 15166495,
-             -8917023, -4388953, -8067909, 2276718},
+            { 24244947, -15050407, -26262976, 2791540, -14997599, 16666678,
+                24367466, 6388839, -10295587, 452383 },
+            { -25640782, -3417841, 5217916, 16224624, 19987036, -4082269,
+                -24236251, -5915248, 15766062, 8407814 },
+            { -20406999, 13990231, 15495425, 16395525, 5377168, 15166495,
+                -8917023, -4388953, -8067909, 2276718 },
         },
         {
-            {30157918, 12924066, -17712050, 9245753, 19895028, 3368142,
-             -23827587, 5096219, 22740376, -7303417},
-            {2041139, -14256350, 7783687, 13876377, -25946985, -13352459,
-             24051124, 13742383, -15637599, 13295222},
-            {33338237, -8505733, 12532113, 7977527, 9106186, -1715251,
-             -17720195, -4612972, -4451357, -14669444},
+            { 30157918, 12924066, -17712050, 9245753, 19895028, 3368142,
+                -23827587, 5096219, 22740376, -7303417 },
+            { 2041139, -14256350, 7783687, 13876377, -25946985, -13352459,
+                24051124, 13742383, -15637599, 13295222 },
+            { 33338237, -8505733, 12532113, 7977527, 9106186, -1715251,
+                -17720195, -4612972, -4451357, -14669444 },
         },
         {
-            {-20045281, 5454097, -14346548, 6447146, 28862071, 1883651,
-             -2469266, -4141880, 7770569, 9620597},
-            {23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528,
-             -1694323, -33502340, -14767970},
-            {1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801,
-             1220118, 30494170, -11440799},
+            { -20045281, 5454097, -14346548, 6447146, 28862071, 1883651,
+                -2469266, -4141880, 7770569, 9620597 },
+            { 23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528,
+                -1694323, -33502340, -14767970 },
+            { 1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801,
+                1220118, 30494170, -11440799 },
         },
         {
-            {-5037580, -13028295, -2970559, -3061767, 15640974, -6701666,
-             -26739026, 926050, -1684339, -13333647},
-            {13908495, -3549272, 30919928, -6273825, -21521863, 7989039,
-             9021034, 9078865, 3353509, 4033511},
-            {-29663431, -15113610, 32259991, -344482, 24295849, -12912123,
-             23161163, 8839127, 27485041, 7356032},
+            { -5037580, -13028295, -2970559, -3061767, 15640974, -6701666,
+                -26739026, 926050, -1684339, -13333647 },
+            { 13908495, -3549272, 30919928, -6273825, -21521863, 7989039,
+                9021034, 9078865, 3353509, 4033511 },
+            { -29663431, -15113610, 32259991, -344482, 24295849, -12912123,
+                23161163, 8839127, 27485041, 7356032 },
         },
     },
     {
         {
-            {9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142,
-             2625015, 28431036, -16771834},
-            {-23839233, -8311415, -25945511, 7480958, -17681669, -8354183,
-             -22545972, 14150565, 15970762, 4099461},
-            {29262576, 16756590, 26350592, -8793563, 8529671, -11208050,
-             13617293, -9937143, 11465739, 8317062},
+            { 9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142,
+                2625015, 28431036, -16771834 },
+            { -23839233, -8311415, -25945511, 7480958, -17681669, -8354183,
+                -22545972, 14150565, 15970762, 4099461 },
+            { 29262576, 16756590, 26350592, -8793563, 8529671, -11208050,
+                13617293, -9937143, 11465739, 8317062 },
         },
         {
-            {-25493081, -6962928, 32500200, -9419051, -23038724, -2302222,
-             14898637, 3848455, 20969334, -5157516},
-            {-20384450, -14347713, -18336405, 13884722, -33039454, 2842114,
-             -21610826, -3649888, 11177095, 14989547},
-            {-24496721, -11716016, 16959896, 2278463, 12066309, 10137771,
-             13515641, 2581286, -28487508, 9930240},
+            { -25493081, -6962928, 32500200, -9419051, -23038724, -2302222,
+                14898637, 3848455, 20969334, -5157516 },
+            { -20384450, -14347713, -18336405, 13884722, -33039454, 2842114,
+                -21610826, -3649888, 11177095, 14989547 },
+            { -24496721, -11716016, 16959896, 2278463, 12066309, 10137771,
+                13515641, 2581286, -28487508, 9930240 },
         },
         {
-            {-17751622, -2097826, 16544300, -13009300, -15914807, -14949081,
-             18345767, -13403753, 16291481, -5314038},
-            {-33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774,
-             6957617, 4368891, 9788741},
-            {16660756, 7281060, -10830758, 12911820, 20108584, -8101676,
-             -21722536, -8613148, 16250552, -11111103},
+            { -17751622, -2097826, 16544300, -13009300, -15914807, -14949081,
+                18345767, -13403753, 16291481, -5314038 },
+            { -33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774,
+                6957617, 4368891, 9788741 },
+            { 16660756, 7281060, -10830758, 12911820, 20108584, -8101676,
+                -21722536, -8613148, 16250552, -11111103 },
         },
         {
-            {-19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584,
-             10604807, -30190403, 4782747},
-            {-1354539, 14736941, -7367442, -13292886, 7710542, -14155590,
-             -9981571, 4383045, 22546403, 437323},
-            {31665577, -12180464, -16186830, 1491339, -18368625, 3294682,
-             27343084, 2786261, -30633590, -14097016},
+            { -19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584,
+                10604807, -30190403, 4782747 },
+            { -1354539, 14736941, -7367442, -13292886, 7710542, -14155590,
+                -9981571, 4383045, 22546403, 437323 },
+            { 31665577, -12180464, -16186830, 1491339, -18368625, 3294682,
+                27343084, 2786261, -30633590, -14097016 },
         },
         {
-            {-14467279, -683715, -33374107, 7448552, 19294360, 14334329,
-             -19690631, 2355319, -19284671, -6114373},
-            {15121312, -15796162, 6377020, -6031361, -10798111, -12957845,
-             18952177, 15496498, -29380133, 11754228},
-            {-2637277, -13483075, 8488727, -14303896, 12728761, -1622493,
-             7141596, 11724556, 22761615, -10134141},
+            { -14467279, -683715, -33374107, 7448552, 19294360, 14334329,
+                -19690631, 2355319, -19284671, -6114373 },
+            { 15121312, -15796162, 6377020, -6031361, -10798111, -12957845,
+                18952177, 15496498, -29380133, 11754228 },
+            { -2637277, -13483075, 8488727, -14303896, 12728761, -1622493,
+                7141596, 11724556, 22761615, -10134141 },
         },
         {
-            {16918416, 11729663, -18083579, 3022987, -31015732, -13339659,
-             -28741185, -12227393, 32851222, 11717399},
-            {11166634, 7338049, -6722523, 4531520, -29468672, -7302055,
-             31474879, 3483633, -1193175, -4030831},
-            {-185635, 9921305, 31456609, -13536438, -12013818, 13348923,
-             33142652, 6546660, -19985279, -3948376},
+            { 16918416, 11729663, -18083579, 3022987, -31015732, -13339659,
+                -28741185, -12227393, 32851222, 11717399 },
+            { 11166634, 7338049, -6722523, 4531520, -29468672, -7302055,
+                31474879, 3483633, -1193175, -4030831 },
+            { -185635, 9921305, 31456609, -13536438, -12013818, 13348923,
+                33142652, 6546660, -19985279, -3948376 },
         },
         {
-            {-32460596, 11266712, -11197107, -7899103, 31703694, 3855903,
-             -8537131, -12833048, -30772034, -15486313},
-            {-18006477, 12709068, 3991746, -6479188, -21491523, -10550425,
-             -31135347, -16049879, 10928917, 3011958},
-            {-6957757, -15594337, 31696059, 334240, 29576716, 14796075,
-             -30831056, -12805180, 18008031, 10258577},
+            { -32460596, 11266712, -11197107, -7899103, 31703694, 3855903,
+                -8537131, -12833048, -30772034, -15486313 },
+            { -18006477, 12709068, 3991746, -6479188, -21491523, -10550425,
+                -31135347, -16049879, 10928917, 3011958 },
+            { -6957757, -15594337, 31696059, 334240, 29576716, 14796075,
+                -30831056, -12805180, 18008031, 10258577 },
         },
         {
-            {-22448644, 15655569, 7018479, -4410003, -30314266, -1201591,
-             -1853465, 1367120, 25127874, 6671743},
-            {29701166, -14373934, -10878120, 9279288, -17568, 13127210,
-             21382910, 11042292, 25838796, 4642684},
-            {-20430234, 14955537, -24126347, 8124619, -5369288, -5990470,
-             30468147, -13900640, 18423289, 4177476},
+            { -22448644, 15655569, 7018479, -4410003, -30314266, -1201591,
+                -1853465, 1367120, 25127874, 6671743 },
+            { 29701166, -14373934, -10878120, 9279288, -17568, 13127210,
+                21382910, 11042292, 25838796, 4642684 },
+            { -20430234, 14955537, -24126347, 8124619, -5369288, -5990470,
+                30468147, -13900640, 18423289, 4177476 },
         },
     },
 };
@@ -4292,7 +4424,7 @@ static void fe_cswap(fe f, fe g, unsigned int b)
 {
     size_t i;
 
-    b = 0-b;
+    b = 0 - b;
     for (i = 0; i < 10; i++) {
         int32_t x = f[i] ^ g[i];
         x &= b;
@@ -4324,16 +4456,16 @@ static void fe_mul121666(fe h, fe f)
     int32_t f7 = f[7];
     int32_t f8 = f[8];
     int32_t f9 = f[9];
-    int64_t h0 = f0 * (int64_t) 121666;
-    int64_t h1 = f1 * (int64_t) 121666;
-    int64_t h2 = f2 * (int64_t) 121666;
-    int64_t h3 = f3 * (int64_t) 121666;
-    int64_t h4 = f4 * (int64_t) 121666;
-    int64_t h5 = f5 * (int64_t) 121666;
-    int64_t h6 = f6 * (int64_t) 121666;
-    int64_t h7 = f7 * (int64_t) 121666;
-    int64_t h8 = f8 * (int64_t) 121666;
-    int64_t h9 = f9 * (int64_t) 121666;
+    int64_t h0 = f0 * (int64_t)121666;
+    int64_t h1 = f1 * (int64_t)121666;
+    int64_t h2 = f2 * (int64_t)121666;
+    int64_t h3 = f3 * (int64_t)121666;
+    int64_t h4 = f4 * (int64_t)121666;
+    int64_t h5 = f5 * (int64_t)121666;
+    int64_t h6 = f6 * (int64_t)121666;
+    int64_t h7 = f7 * (int64_t)121666;
+    int64_t h8 = f8 * (int64_t)121666;
+    int64_t h9 = f9 * (int64_t)121666;
     int64_t carry0;
     int64_t carry1;
     int64_t carry2;
@@ -4345,17 +4477,37 @@ static void fe_mul121666(fe h, fe f)
     int64_t carry8;
     int64_t carry9;
 
-    carry9 = h9 + (1 << 24); h0 += (carry9 >> 25) * 19; h9 -= carry9 & kTop39Bits;
-    carry1 = h1 + (1 << 24); h2 += carry1 >> 25; h1 -= carry1 & kTop39Bits;
-    carry3 = h3 + (1 << 24); h4 += carry3 >> 25; h3 -= carry3 & kTop39Bits;
-    carry5 = h5 + (1 << 24); h6 += carry5 >> 25; h5 -= carry5 & kTop39Bits;
-    carry7 = h7 + (1 << 24); h8 += carry7 >> 25; h7 -= carry7 & kTop39Bits;
-
-    carry0 = h0 + (1 << 25); h1 += carry0 >> 26; h0 -= carry0 & kTop38Bits;
-    carry2 = h2 + (1 << 25); h3 += carry2 >> 26; h2 -= carry2 & kTop38Bits;
-    carry4 = h4 + (1 << 25); h5 += carry4 >> 26; h4 -= carry4 & kTop38Bits;
-    carry6 = h6 + (1 << 25); h7 += carry6 >> 26; h6 -= carry6 & kTop38Bits;
-    carry8 = h8 + (1 << 25); h9 += carry8 >> 26; h8 -= carry8 & kTop38Bits;
+    carry9 = h9 + (1 << 24);
+    h0 += (carry9 >> 25) * 19;
+    h9 -= carry9 & kTop39Bits;
+    carry1 = h1 + (1 << 24);
+    h2 += carry1 >> 25;
+    h1 -= carry1 & kTop39Bits;
+    carry3 = h3 + (1 << 24);
+    h4 += carry3 >> 25;
+    h3 -= carry3 & kTop39Bits;
+    carry5 = h5 + (1 << 24);
+    h6 += carry5 >> 25;
+    h5 -= carry5 & kTop39Bits;
+    carry7 = h7 + (1 << 24);
+    h8 += carry7 >> 25;
+    h7 -= carry7 & kTop39Bits;
+
+    carry0 = h0 + (1 << 25);
+    h1 += carry0 >> 26;
+    h0 -= carry0 & kTop38Bits;
+    carry2 = h2 + (1 << 25);
+    h3 += carry2 >> 26;
+    h2 -= carry2 & kTop38Bits;
+    carry4 = h4 + (1 << 25);
+    h5 += carry4 >> 26;
+    h4 -= carry4 & kTop38Bits;
+    carry6 = h6 + (1 << 25);
+    h7 += carry6 >> 26;
+    h6 -= carry6 & kTop38Bits;
+    carry8 = h8 + (1 << 25);
+    h9 += carry8 >> 26;
+    h8 -= carry8 & kTop38Bits;
 
     h[0] = (int32_t)h0;
     h[1] = (int32_t)h1;
@@ -4370,8 +4522,9 @@ static void fe_mul121666(fe h, fe f)
 }
 
 static void x25519_scalar_mult_generic(uint8_t out[32],
-                                       const uint8_t scalar[32],
-                                       const uint8_t point[32]) {
+    const uint8_t scalar[32],
+    const uint8_t point[32])
+{
     fe x1, x2, z2, x3, z3, tmp0, tmp1;
     uint8_t e[32];
     unsigned swap = 0;
@@ -4421,7 +4574,8 @@ static void x25519_scalar_mult_generic(uint8_t out[32],
 }
 
 static void x25519_scalar_mult(uint8_t out[32], const uint8_t scalar[32],
-                               const uint8_t point[32]) {
+    const uint8_t point[32])
+{
     x25519_scalar_mult_generic(out, scalar, point);
 }
 #endif
@@ -4463,68 +4617,68 @@ static void slide(signed char *r, const uint8_t *a)
 
 static const ge_precomp Bi[8] = {
     {
-        {25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626,
-         -11754271, -6079156, 2047605},
-        {-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692,
-         5043384, 19500929, -15469378},
-        {-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919,
-         11864899, -24514362, -4438546},
+        { 25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626,
+            -11754271, -6079156, 2047605 },
+        { -12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692,
+            5043384, 19500929, -15469378 },
+        { -8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919,
+            11864899, -24514362, -4438546 },
     },
     {
-        {15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600,
-         -14772189, 28944400, -1550024},
-        {16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577,
-         -11775962, 7689662, 11199574},
-        {30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774,
-         10017326, -17749093, -9920357},
+        { 15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600,
+            -14772189, 28944400, -1550024 },
+        { 16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577,
+            -11775962, 7689662, 11199574 },
+        { 30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774,
+            10017326, -17749093, -9920357 },
     },
     {
-        {10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885,
-         14515107, -15438304, 10819380},
-        {4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668,
-         12483688, -12668491, 5581306},
-        {19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350,
-         13850243, -23678021, -15815942},
+        { 10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885,
+            14515107, -15438304, 10819380 },
+        { 4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668,
+            12483688, -12668491, 5581306 },
+        { 19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350,
+            13850243, -23678021, -15815942 },
     },
     {
-        {5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852,
-         5230134, -23952439, -15175766},
-        {-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025,
-         16520125, 30598449, 7715701},
-        {28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660,
-         1370708, 29794553, -1409300},
+        { 5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852,
+            5230134, -23952439, -15175766 },
+        { -30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025,
+            16520125, 30598449, 7715701 },
+        { 28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660,
+            1370708, 29794553, -1409300 },
     },
     {
-        {-22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211,
-         -1361450, -13062696, 13821877},
-        {-6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028,
-         -7212327, 18853322, -14220951},
-        {4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358,
-         -10431137, 2207753, -3209784},
+        { -22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211,
+            -1361450, -13062696, 13821877 },
+        { -6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028,
+            -7212327, 18853322, -14220951 },
+        { 4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358,
+            -10431137, 2207753, -3209784 },
     },
     {
-        {-25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364,
-         -663000, -31111463, -16132436},
-        {25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789,
-         15725684, 171356, 6466918},
-        {23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339,
-         -14088058, -30714912, 16193877},
+        { -25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364,
+            -663000, -31111463, -16132436 },
+        { 25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789,
+            15725684, 171356, 6466918 },
+        { 23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339,
+            -14088058, -30714912, 16193877 },
     },
     {
-        {-33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398,
-         4729455, -18074513, 9256800},
-        {-25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405,
-         9761698, -19827198, 630305},
-        {-13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551,
-         -15960994, -2449256, -14291300},
+        { -33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398,
+            4729455, -18074513, 9256800 },
+        { -25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405,
+            9761698, -19827198, 630305 },
+        { -13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551,
+            -15960994, -2449256, -14291300 },
     },
     {
-        {-3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575,
-         15033784, 25105118, -7894876},
-        {-24326370, 15950226, -31801215, -14592823, -11662737, -5090925,
-         1573892, -2625887, 2198790, -15804619},
-        {-3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022,
-         -16236442, -32461234, -12290683},
+        { -3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575,
+            15033784, 25105118, -7894876 },
+        { -24326370, 15950226, -31801215, -14592823, -11662737, -5090925,
+            1573892, -2625887, 2198790, -15804619 },
+        { -3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022,
+            -16236442, -32461234, -12290683 },
     },
 };
 
@@ -4536,7 +4690,7 @@ static const ge_precomp Bi[8] = {
  * B is the Ed25519 base point (x,4/5) with x positive.
  */
 static void ge_double_scalarmult_vartime(ge_p2 *r, const uint8_t *a,
-                                         const ge_p3 *A, const uint8_t *b)
+    const ge_p3 *A, const uint8_t *b)
 {
     signed char aslide[256];
     signed char bslide[256];
@@ -4616,33 +4770,33 @@ static void ge_double_scalarmult_vartime(ge_p2 *r, const uint8_t *a,
  *   s[0]+256*s[1]+...+256^31*s[31] = s mod l
  *   where l = 2^252 + 27742317777372353535851937790883648493.
  *   Overwrites s in place.
-*/
+ */
 static void x25519_sc_reduce(uint8_t *s)
 {
-    int64_t s0  = kBottom21Bits &  load_3(s);
-    int64_t s1  = kBottom21Bits & (load_4(s +  2) >> 5);
-    int64_t s2  = kBottom21Bits & (load_3(s +  5) >> 2);
-    int64_t s3  = kBottom21Bits & (load_4(s +  7) >> 7);
-    int64_t s4  = kBottom21Bits & (load_4(s + 10) >> 4);
-    int64_t s5  = kBottom21Bits & (load_3(s + 13) >> 1);
-    int64_t s6  = kBottom21Bits & (load_4(s + 15) >> 6);
-    int64_t s7  = kBottom21Bits & (load_3(s + 18) >> 3);
-    int64_t s8  = kBottom21Bits &  load_3(s + 21);
-    int64_t s9  = kBottom21Bits & (load_4(s + 23) >> 5);
+    int64_t s0 = kBottom21Bits & load_3(s);
+    int64_t s1 = kBottom21Bits & (load_4(s + 2) >> 5);
+    int64_t s2 = kBottom21Bits & (load_3(s + 5) >> 2);
+    int64_t s3 = kBottom21Bits & (load_4(s + 7) >> 7);
+    int64_t s4 = kBottom21Bits & (load_4(s + 10) >> 4);
+    int64_t s5 = kBottom21Bits & (load_3(s + 13) >> 1);
+    int64_t s6 = kBottom21Bits & (load_4(s + 15) >> 6);
+    int64_t s7 = kBottom21Bits & (load_3(s + 18) >> 3);
+    int64_t s8 = kBottom21Bits & load_3(s + 21);
+    int64_t s9 = kBottom21Bits & (load_4(s + 23) >> 5);
     int64_t s10 = kBottom21Bits & (load_3(s + 26) >> 2);
     int64_t s11 = kBottom21Bits & (load_4(s + 28) >> 7);
     int64_t s12 = kBottom21Bits & (load_4(s + 31) >> 4);
     int64_t s13 = kBottom21Bits & (load_3(s + 34) >> 1);
     int64_t s14 = kBottom21Bits & (load_4(s + 36) >> 6);
     int64_t s15 = kBottom21Bits & (load_3(s + 39) >> 3);
-    int64_t s16 = kBottom21Bits &  load_3(s + 42);
+    int64_t s16 = kBottom21Bits & load_3(s + 42);
     int64_t s17 = kBottom21Bits & (load_4(s + 44) >> 5);
     int64_t s18 = kBottom21Bits & (load_3(s + 47) >> 2);
     int64_t s19 = kBottom21Bits & (load_4(s + 49) >> 7);
     int64_t s20 = kBottom21Bits & (load_4(s + 52) >> 4);
     int64_t s21 = kBottom21Bits & (load_3(s + 55) >> 1);
     int64_t s22 = kBottom21Bits & (load_4(s + 57) >> 6);
-    int64_t s23 =                 (load_4(s + 60) >> 3);
+    int64_t s23 = (load_4(s + 60) >> 3);
     int64_t carry0;
     int64_t carry1;
     int64_t carry2;
@@ -4667,7 +4821,7 @@ static void x25519_sc_reduce(uint8_t *s)
     s14 -= s23 * 997805;
     s15 += s23 * 136657;
     s16 -= s23 * 683901;
-    s23  = 0;
+    s23 = 0;
 
     s10 += s22 * 666643;
     s11 += s22 * 470296;
@@ -4675,46 +4829,46 @@ static void x25519_sc_reduce(uint8_t *s)
     s13 -= s22 * 997805;
     s14 += s22 * 136657;
     s15 -= s22 * 683901;
-    s22  = 0;
+    s22 = 0;
 
-    s9  += s21 * 666643;
+    s9 += s21 * 666643;
     s10 += s21 * 470296;
     s11 += s21 * 654183;
     s12 -= s21 * 997805;
     s13 += s21 * 136657;
     s14 -= s21 * 683901;
-    s21  = 0;
+    s21 = 0;
 
-    s8  += s20 * 666643;
-    s9  += s20 * 470296;
+    s8 += s20 * 666643;
+    s9 += s20 * 470296;
     s10 += s20 * 654183;
     s11 -= s20 * 997805;
     s12 += s20 * 136657;
     s13 -= s20 * 683901;
-    s20  = 0;
+    s20 = 0;
 
-    s7  += s19 * 666643;
-    s8  += s19 * 470296;
-    s9  += s19 * 654183;
+    s7 += s19 * 666643;
+    s8 += s19 * 470296;
+    s9 += s19 * 654183;
     s10 -= s19 * 997805;
     s11 += s19 * 136657;
     s12 -= s19 * 683901;
-    s19  = 0;
+    s19 = 0;
 
-    s6  += s18 * 666643;
-    s7  += s18 * 470296;
-    s8  += s18 * 654183;
-    s9  -= s18 * 997805;
+    s6 += s18 * 666643;
+    s7 += s18 * 470296;
+    s8 += s18 * 654183;
+    s9 -= s18 * 997805;
     s10 += s18 * 136657;
     s11 -= s18 * 683901;
-    s18  = 0;
+    s18 = 0;
 
     carry6 = (s6 + (1 << 20)) >> 21;
-    s7  += carry6;
-    s6  -= carry6 * (1 << 21);
+    s7 += carry6;
+    s6 -= carry6 * (1 << 21);
     carry8 = (s8 + (1 << 20)) >> 21;
-    s9  += carry8;
-    s8  -= carry8 * (1 << 21);
+    s9 += carry8;
+    s8 -= carry8 * (1 << 21);
     carry10 = (s10 + (1 << 20)) >> 21;
     s11 += carry10;
     s10 -= carry10 * (1 << 21);
@@ -4729,11 +4883,11 @@ static void x25519_sc_reduce(uint8_t *s)
     s16 -= carry16 * (1 << 21);
 
     carry7 = (s7 + (1 << 20)) >> 21;
-    s8  += carry7;
-    s7  -= carry7 * (1 << 21);
+    s8 += carry7;
+    s7 -= carry7 * (1 << 21);
     carry9 = (s9 + (1 << 20)) >> 21;
     s10 += carry9;
-    s9  -= carry9 * (1 << 21);
+    s9 -= carry9 * (1 << 21);
     carry11 = (s11 + (1 << 20)) >> 21;
     s12 += carry11;
     s11 -= carry11 * (1 << 21);
@@ -4744,130 +4898,130 @@ static void x25519_sc_reduce(uint8_t *s)
     s16 += carry15;
     s15 -= carry15 * (1 << 21);
 
-    s5  += s17 * 666643;
-    s6  += s17 * 470296;
-    s7  += s17 * 654183;
-    s8  -= s17 * 997805;
-    s9  += s17 * 136657;
+    s5 += s17 * 666643;
+    s6 += s17 * 470296;
+    s7 += s17 * 654183;
+    s8 -= s17 * 997805;
+    s9 += s17 * 136657;
     s10 -= s17 * 683901;
-    s17  = 0;
-
-    s4  += s16 * 666643;
-    s5  += s16 * 470296;
-    s6  += s16 * 654183;
-    s7  -= s16 * 997805;
-    s8  += s16 * 136657;
-    s9  -= s16 * 683901;
-    s16  = 0;
-
-    s3  += s15 * 666643;
-    s4  += s15 * 470296;
-    s5  += s15 * 654183;
-    s6  -= s15 * 997805;
-    s7  += s15 * 136657;
-    s8  -= s15 * 683901;
-    s15  = 0;
-
-    s2  += s14 * 666643;
-    s3  += s14 * 470296;
-    s4  += s14 * 654183;
-    s5  -= s14 * 997805;
-    s6  += s14 * 136657;
-    s7  -= s14 * 683901;
-    s14  = 0;
-
-    s1  += s13 * 666643;
-    s2  += s13 * 470296;
-    s3  += s13 * 654183;
-    s4  -= s13 * 997805;
-    s5  += s13 * 136657;
-    s6  -= s13 * 683901;
-    s13  = 0;
-
-    s0  += s12 * 666643;
-    s1  += s12 * 470296;
-    s2  += s12 * 654183;
-    s3  -= s12 * 997805;
-    s4  += s12 * 136657;
-    s5  -= s12 * 683901;
-    s12  = 0;
+    s17 = 0;
+
+    s4 += s16 * 666643;
+    s5 += s16 * 470296;
+    s6 += s16 * 654183;
+    s7 -= s16 * 997805;
+    s8 += s16 * 136657;
+    s9 -= s16 * 683901;
+    s16 = 0;
+
+    s3 += s15 * 666643;
+    s4 += s15 * 470296;
+    s5 += s15 * 654183;
+    s6 -= s15 * 997805;
+    s7 += s15 * 136657;
+    s8 -= s15 * 683901;
+    s15 = 0;
+
+    s2 += s14 * 666643;
+    s3 += s14 * 470296;
+    s4 += s14 * 654183;
+    s5 -= s14 * 997805;
+    s6 += s14 * 136657;
+    s7 -= s14 * 683901;
+    s14 = 0;
+
+    s1 += s13 * 666643;
+    s2 += s13 * 470296;
+    s3 += s13 * 654183;
+    s4 -= s13 * 997805;
+    s5 += s13 * 136657;
+    s6 -= s13 * 683901;
+    s13 = 0;
+
+    s0 += s12 * 666643;
+    s1 += s12 * 470296;
+    s2 += s12 * 654183;
+    s3 -= s12 * 997805;
+    s4 += s12 * 136657;
+    s5 -= s12 * 683901;
+    s12 = 0;
 
     carry0 = (s0 + (1 << 20)) >> 21;
-    s1  += carry0;
-    s0  -= carry0 * (1 << 21);
+    s1 += carry0;
+    s0 -= carry0 * (1 << 21);
     carry2 = (s2 + (1 << 20)) >> 21;
-    s3  += carry2;
-    s2  -= carry2 * (1 << 21);
+    s3 += carry2;
+    s2 -= carry2 * (1 << 21);
     carry4 = (s4 + (1 << 20)) >> 21;
-    s5  += carry4;
-    s4  -= carry4 * (1 << 21);
+    s5 += carry4;
+    s4 -= carry4 * (1 << 21);
     carry6 = (s6 + (1 << 20)) >> 21;
     s7 += carry6;
     s6 -= carry6 * (1 << 21);
     carry8 = (s8 + (1 << 20)) >> 21;
-    s9  += carry8;
-    s8  -= carry8 * (1 << 21);
+    s9 += carry8;
+    s8 -= carry8 * (1 << 21);
     carry10 = (s10 + (1 << 20)) >> 21;
     s11 += carry10;
     s10 -= carry10 * (1 << 21);
 
     carry1 = (s1 + (1 << 20)) >> 21;
-    s2  += carry1;
-    s1  -= carry1 * (1 << 21);
+    s2 += carry1;
+    s1 -= carry1 * (1 << 21);
     carry3 = (s3 + (1 << 20)) >> 21;
-    s4  += carry3;
-    s3  -= carry3 * (1 << 21);
+    s4 += carry3;
+    s3 -= carry3 * (1 << 21);
     carry5 = (s5 + (1 << 20)) >> 21;
-    s6  += carry5;
-    s5  -= carry5 * (1 << 21);
+    s6 += carry5;
+    s5 -= carry5 * (1 << 21);
     carry7 = (s7 + (1 << 20)) >> 21;
-    s8  += carry7;
-    s7  -= carry7 * (1 << 21);
+    s8 += carry7;
+    s7 -= carry7 * (1 << 21);
     carry9 = (s9 + (1 << 20)) >> 21;
     s10 += carry9;
-    s9  -= carry9 * (1 << 21);
+    s9 -= carry9 * (1 << 21);
     carry11 = (s11 + (1 << 20)) >> 21;
     s12 += carry11;
     s11 -= carry11 * (1 << 21);
 
-    s0  += s12 * 666643;
-    s1  += s12 * 470296;
-    s2  += s12 * 654183;
-    s3  -= s12 * 997805;
-    s4  += s12 * 136657;
-    s5  -= s12 * 683901;
-    s12  = 0;
+    s0 += s12 * 666643;
+    s1 += s12 * 470296;
+    s2 += s12 * 654183;
+    s3 -= s12 * 997805;
+    s4 += s12 * 136657;
+    s5 -= s12 * 683901;
+    s12 = 0;
 
     carry0 = s0 >> 21;
-    s1  += carry0;
-    s0  -= carry0 * (1 << 21);
+    s1 += carry0;
+    s0 -= carry0 * (1 << 21);
     carry1 = s1 >> 21;
-    s2  += carry1;
-    s1  -= carry1 * (1 << 21);
+    s2 += carry1;
+    s1 -= carry1 * (1 << 21);
     carry2 = s2 >> 21;
-    s3  += carry2;
-    s2  -= carry2 * (1 << 21);
+    s3 += carry2;
+    s2 -= carry2 * (1 << 21);
     carry3 = s3 >> 21;
-    s4  += carry3;
-    s3  -= carry3 * (1 << 21);
+    s4 += carry3;
+    s3 -= carry3 * (1 << 21);
     carry4 = s4 >> 21;
-    s5  += carry4;
-    s4  -= carry4 * (1 << 21);
+    s5 += carry4;
+    s4 -= carry4 * (1 << 21);
     carry5 = s5 >> 21;
-    s6  += carry5;
-    s5  -= carry5 * (1 << 21);
+    s6 += carry5;
+    s5 -= carry5 * (1 << 21);
     carry6 = s6 >> 21;
-    s7  += carry6;
-    s6  -= carry6 * (1 << 21);
+    s7 += carry6;
+    s6 -= carry6 * (1 << 21);
     carry7 = s7 >> 21;
-    s8  += carry7;
-    s7  -= carry7 * (1 << 21);
+    s8 += carry7;
+    s7 -= carry7 * (1 << 21);
     carry8 = s8 >> 21;
-    s9  += carry8;
-    s8  -= carry8 * (1 << 21);
+    s9 += carry8;
+    s8 -= carry8 * (1 << 21);
     carry9 = s9 >> 21;
     s10 += carry9;
-    s9  -= carry9 * (1 << 21);
+    s9 -= carry9 * (1 << 21);
     carry10 = s10 >> 21;
     s11 += carry10;
     s10 -= carry10 * (1 << 21);
@@ -4875,80 +5029,80 @@ static void x25519_sc_reduce(uint8_t *s)
     s12 += carry11;
     s11 -= carry11 * (1 << 21);
 
-    s0  += s12 * 666643;
-    s1  += s12 * 470296;
-    s2  += s12 * 654183;
-    s3  -= s12 * 997805;
-    s4  += s12 * 136657;
-    s5  -= s12 * 683901;
-    s12  = 0;
+    s0 += s12 * 666643;
+    s1 += s12 * 470296;
+    s2 += s12 * 654183;
+    s3 -= s12 * 997805;
+    s4 += s12 * 136657;
+    s5 -= s12 * 683901;
+    s12 = 0;
 
     carry0 = s0 >> 21;
-    s1  += carry0;
-    s0  -= carry0 * (1 << 21);
+    s1 += carry0;
+    s0 -= carry0 * (1 << 21);
     carry1 = s1 >> 21;
-    s2  += carry1;
-    s1  -= carry1 * (1 << 21);
+    s2 += carry1;
+    s1 -= carry1 * (1 << 21);
     carry2 = s2 >> 21;
-    s3  += carry2;
-    s2  -= carry2 * (1 << 21);
+    s3 += carry2;
+    s2 -= carry2 * (1 << 21);
     carry3 = s3 >> 21;
-    s4  += carry3;
-    s3  -= carry3 * (1 << 21);
+    s4 += carry3;
+    s3 -= carry3 * (1 << 21);
     carry4 = s4 >> 21;
-    s5  += carry4;
-    s4  -= carry4 * (1 << 21);
+    s5 += carry4;
+    s4 -= carry4 * (1 << 21);
     carry5 = s5 >> 21;
-    s6  += carry5;
-    s5  -= carry5 * (1 << 21);
+    s6 += carry5;
+    s5 -= carry5 * (1 << 21);
     carry6 = s6 >> 21;
-    s7  += carry6;
-    s6  -= carry6 * (1 << 21);
+    s7 += carry6;
+    s6 -= carry6 * (1 << 21);
     carry7 = s7 >> 21;
-    s8  += carry7;
-    s7  -= carry7 * (1 << 21);
+    s8 += carry7;
+    s7 -= carry7 * (1 << 21);
     carry8 = s8 >> 21;
-    s9  += carry8;
-    s8  -= carry8 * (1 << 21);
+    s9 += carry8;
+    s8 -= carry8 * (1 << 21);
     carry9 = s9 >> 21;
     s10 += carry9;
-    s9  -= carry9 * (1 << 21);
+    s9 -= carry9 * (1 << 21);
     carry10 = s10 >> 21;
     s11 += carry10;
     s10 -= carry10 * (1 << 21);
 
-    s[ 0] = (uint8_t) (s0  >>  0);
-    s[ 1] = (uint8_t) (s0  >>  8);
-    s[ 2] = (uint8_t)((s0  >> 16) | (s1  <<  5));
-    s[ 3] = (uint8_t) (s1  >>  3);
-    s[ 4] = (uint8_t) (s1  >> 11);
-    s[ 5] = (uint8_t)((s1  >> 19) | (s2  <<  2));
-    s[ 6] = (uint8_t) (s2  >>  6);
-    s[ 7] = (uint8_t)((s2  >> 14) | (s3  <<  7));
-    s[ 8] = (uint8_t) (s3  >>  1);
-    s[ 9] = (uint8_t) (s3  >>  9);
-    s[10] = (uint8_t)((s3  >> 17) | (s4  <<  4));
-    s[11] = (uint8_t) (s4  >>  4);
-    s[12] = (uint8_t) (s4  >> 12);
-    s[13] = (uint8_t)((s4  >> 20) | (s5  <<  1));
-    s[14] = (uint8_t) (s5  >>  7);
-    s[15] = (uint8_t)((s5  >> 15) | (s6  <<  6));
-    s[16] = (uint8_t) (s6  >>  2);
-    s[17] = (uint8_t) (s6  >> 10);
-    s[18] = (uint8_t)((s6  >> 18) | (s7  <<  3));
-    s[19] = (uint8_t) (s7  >>  5);
-    s[20] = (uint8_t) (s7  >> 13);
-    s[21] = (uint8_t) (s8  >>  0);
-    s[22] = (uint8_t) (s8  >>  8);
-    s[23] = (uint8_t)((s8  >> 16) | (s9  <<  5));
-    s[24] = (uint8_t) (s9  >>  3);
-    s[25] = (uint8_t) (s9  >> 11);
-    s[26] = (uint8_t)((s9  >> 19) | (s10 <<  2));
-    s[27] = (uint8_t) (s10 >>  6);
-    s[28] = (uint8_t)((s10 >> 14) | (s11 <<  7));
-    s[29] = (uint8_t) (s11 >>  1);
-    s[30] = (uint8_t) (s11 >>  9);
-    s[31] = (uint8_t) (s11 >> 17);
+    s[0] = (uint8_t)(s0 >> 0);
+    s[1] = (uint8_t)(s0 >> 8);
+    s[2] = (uint8_t)((s0 >> 16) | (s1 << 5));
+    s[3] = (uint8_t)(s1 >> 3);
+    s[4] = (uint8_t)(s1 >> 11);
+    s[5] = (uint8_t)((s1 >> 19) | (s2 << 2));
+    s[6] = (uint8_t)(s2 >> 6);
+    s[7] = (uint8_t)((s2 >> 14) | (s3 << 7));
+    s[8] = (uint8_t)(s3 >> 1);
+    s[9] = (uint8_t)(s3 >> 9);
+    s[10] = (uint8_t)((s3 >> 17) | (s4 << 4));
+    s[11] = (uint8_t)(s4 >> 4);
+    s[12] = (uint8_t)(s4 >> 12);
+    s[13] = (uint8_t)((s4 >> 20) | (s5 << 1));
+    s[14] = (uint8_t)(s5 >> 7);
+    s[15] = (uint8_t)((s5 >> 15) | (s6 << 6));
+    s[16] = (uint8_t)(s6 >> 2);
+    s[17] = (uint8_t)(s6 >> 10);
+    s[18] = (uint8_t)((s6 >> 18) | (s7 << 3));
+    s[19] = (uint8_t)(s7 >> 5);
+    s[20] = (uint8_t)(s7 >> 13);
+    s[21] = (uint8_t)(s8 >> 0);
+    s[22] = (uint8_t)(s8 >> 8);
+    s[23] = (uint8_t)((s8 >> 16) | (s9 << 5));
+    s[24] = (uint8_t)(s9 >> 3);
+    s[25] = (uint8_t)(s9 >> 11);
+    s[26] = (uint8_t)((s9 >> 19) | (s10 << 2));
+    s[27] = (uint8_t)(s10 >> 6);
+    s[28] = (uint8_t)((s10 >> 14) | (s11 << 7));
+    s[29] = (uint8_t)(s11 >> 1);
+    s[30] = (uint8_t)(s11 >> 9);
+    s[31] = (uint8_t)(s11 >> 17);
 }
 
 /*
@@ -4962,44 +5116,44 @@ static void x25519_sc_reduce(uint8_t *s)
  *   where l = 2^252 + 27742317777372353535851937790883648493.
  */
 static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
-                      const uint8_t *c)
+    const uint8_t *c)
 {
-    int64_t a0  = kBottom21Bits &  load_3(a);
-    int64_t a1  = kBottom21Bits & (load_4(a +  2) >> 5);
-    int64_t a2  = kBottom21Bits & (load_3(a +  5) >> 2);
-    int64_t a3  = kBottom21Bits & (load_4(a +  7) >> 7);
-    int64_t a4  = kBottom21Bits & (load_4(a + 10) >> 4);
-    int64_t a5  = kBottom21Bits & (load_3(a + 13) >> 1);
-    int64_t a6  = kBottom21Bits & (load_4(a + 15) >> 6);
-    int64_t a7  = kBottom21Bits & (load_3(a + 18) >> 3);
-    int64_t a8  = kBottom21Bits &  load_3(a + 21);
-    int64_t a9  = kBottom21Bits & (load_4(a + 23) >> 5);
+    int64_t a0 = kBottom21Bits & load_3(a);
+    int64_t a1 = kBottom21Bits & (load_4(a + 2) >> 5);
+    int64_t a2 = kBottom21Bits & (load_3(a + 5) >> 2);
+    int64_t a3 = kBottom21Bits & (load_4(a + 7) >> 7);
+    int64_t a4 = kBottom21Bits & (load_4(a + 10) >> 4);
+    int64_t a5 = kBottom21Bits & (load_3(a + 13) >> 1);
+    int64_t a6 = kBottom21Bits & (load_4(a + 15) >> 6);
+    int64_t a7 = kBottom21Bits & (load_3(a + 18) >> 3);
+    int64_t a8 = kBottom21Bits & load_3(a + 21);
+    int64_t a9 = kBottom21Bits & (load_4(a + 23) >> 5);
     int64_t a10 = kBottom21Bits & (load_3(a + 26) >> 2);
-    int64_t a11 =                 (load_4(a + 28) >> 7);
-    int64_t b0  = kBottom21Bits &  load_3(b);
-    int64_t b1  = kBottom21Bits & (load_4(b +  2) >> 5);
-    int64_t b2  = kBottom21Bits & (load_3(b +  5) >> 2);
-    int64_t b3  = kBottom21Bits & (load_4(b +  7) >> 7);
-    int64_t b4  = kBottom21Bits & (load_4(b + 10) >> 4);
-    int64_t b5  = kBottom21Bits & (load_3(b + 13) >> 1);
-    int64_t b6  = kBottom21Bits & (load_4(b + 15) >> 6);
-    int64_t b7  = kBottom21Bits & (load_3(b + 18) >> 3);
-    int64_t b8  = kBottom21Bits &  load_3(b + 21);
-    int64_t b9  = kBottom21Bits & (load_4(b + 23) >> 5);
+    int64_t a11 = (load_4(a + 28) >> 7);
+    int64_t b0 = kBottom21Bits & load_3(b);
+    int64_t b1 = kBottom21Bits & (load_4(b + 2) >> 5);
+    int64_t b2 = kBottom21Bits & (load_3(b + 5) >> 2);
+    int64_t b3 = kBottom21Bits & (load_4(b + 7) >> 7);
+    int64_t b4 = kBottom21Bits & (load_4(b + 10) >> 4);
+    int64_t b5 = kBottom21Bits & (load_3(b + 13) >> 1);
+    int64_t b6 = kBottom21Bits & (load_4(b + 15) >> 6);
+    int64_t b7 = kBottom21Bits & (load_3(b + 18) >> 3);
+    int64_t b8 = kBottom21Bits & load_3(b + 21);
+    int64_t b9 = kBottom21Bits & (load_4(b + 23) >> 5);
     int64_t b10 = kBottom21Bits & (load_3(b + 26) >> 2);
-    int64_t b11 =                 (load_4(b + 28) >> 7);
-    int64_t c0  = kBottom21Bits &  load_3(c);
-    int64_t c1  = kBottom21Bits & (load_4(c +  2) >> 5);
-    int64_t c2  = kBottom21Bits & (load_3(c +  5) >> 2);
-    int64_t c3  = kBottom21Bits & (load_4(c +  7) >> 7);
-    int64_t c4  = kBottom21Bits & (load_4(c + 10) >> 4);
-    int64_t c5  = kBottom21Bits & (load_3(c + 13) >> 1);
-    int64_t c6  = kBottom21Bits & (load_4(c + 15) >> 6);
-    int64_t c7  = kBottom21Bits & (load_3(c + 18) >> 3);
-    int64_t c8  = kBottom21Bits &  load_3(c + 21);
-    int64_t c9  = kBottom21Bits & (load_4(c + 23) >> 5);
+    int64_t b11 = (load_4(b + 28) >> 7);
+    int64_t c0 = kBottom21Bits & load_3(c);
+    int64_t c1 = kBottom21Bits & (load_4(c + 2) >> 5);
+    int64_t c2 = kBottom21Bits & (load_3(c + 5) >> 2);
+    int64_t c3 = kBottom21Bits & (load_4(c + 7) >> 7);
+    int64_t c4 = kBottom21Bits & (load_4(c + 10) >> 4);
+    int64_t c5 = kBottom21Bits & (load_3(c + 13) >> 1);
+    int64_t c6 = kBottom21Bits & (load_4(c + 15) >> 6);
+    int64_t c7 = kBottom21Bits & (load_3(c + 18) >> 3);
+    int64_t c8 = kBottom21Bits & load_3(c + 21);
+    int64_t c9 = kBottom21Bits & (load_4(c + 23) >> 5);
     int64_t c10 = kBottom21Bits & (load_3(c + 26) >> 2);
-    int64_t c11 =                 (load_4(c + 28) >> 7);
+    int64_t c11 = (load_4(c + 28) >> 7);
     int64_t s0;
     int64_t s1;
     int64_t s2;
@@ -5048,46 +5202,46 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
     int64_t carry21;
     int64_t carry22;
 
-    s0  = c0   +   a0 * b0;
-    s1  = c1   +   a0 * b1   +   a1 * b0;
-    s2  = c2   +   a0 * b2   +   a1 * b1   +   a2 * b0;
-    s3  = c3   +   a0 * b3   +   a1 * b2   +   a2 * b1  +   a3 * b0;
-    s4  = c4   +   a0 * b4   +   a1 * b3   +   a2 * b2  +   a3 * b1  +   a4 * b0;
-    s5  = c5   +   a0 * b5   +   a1 * b4   +   a2 * b3  +   a3 * b2  +   a4 * b1  +   a5 * b0;
-    s6  = c6   +   a0 * b6   +   a1 * b5   +   a2 * b4  +   a3 * b3  +   a4 * b2  +   a5 * b1 +   a6 * b0;
-    s7  = c7   +   a0 * b7   +   a1 * b6   +   a2 * b5  +   a3 * b4  +   a4 * b3  +   a5 * b2 +   a6 * b1   +   a7 * b0;
-    s8  = c8   +   a0 * b8   +   a1 * b7   +   a2 * b6  +   a3 * b5  +   a4 * b4  +   a5 * b3 +   a6 * b2   +   a7 * b1   +   a8 * b0;
-    s9  = c9   +   a0 * b9   +   a1 * b8   +   a2 * b7  +   a3 * b6  +   a4 * b5  +   a5 * b4 +   a6 * b3   +   a7 * b2   +   a8 * b1  +   a9 * b0;
-    s10 = c10  +   a0 * b10  +   a1 * b9   +   a2 * b8  +   a3 * b7  +   a4 * b6  +   a5 * b5 +   a6 * b4   +   a7 * b3   +   a8 * b2  +   a9 * b1  +  a10 * b0;
-    s11 = c11  +   a0 * b11  +   a1 * b10  +   a2 * b9  +   a3 * b8  +   a4 * b7  +   a5 * b6 +   a6 * b5   +   a7 * b4   +   a8 * b3  +   a9 * b2  +  a10 * b1  +  a11 * b0;
-    s12 =          a1 * b11  +   a2 * b10  +   a3 * b9  +   a4 * b8  +   a5 * b7  +   a6 * b6 +   a7 * b5   +   a8 * b4   +   a9 * b3  +  a10 * b2  +  a11 * b1;
-    s13 =          a2 * b11  +   a3 * b10  +   a4 * b9  +   a5 * b8  +   a6 * b7  +   a7 * b6 +   a8 * b5   +   a9 * b4   +  a10 * b3  +  a11 * b2;
-    s14 =          a3 * b11  +   a4 * b10  +   a5 * b9  +   a6 * b8  +   a7 * b7  +   a8 * b6 +   a9 * b5   +  a10 * b4   +  a11 * b3;
-    s15 =          a4 * b11  +   a5 * b10  +   a6 * b9  +   a7 * b8  +   a8 * b7  +   a9 * b6 +  a10 * b5   +  a11 * b4;
-    s16 =          a5 * b11  +   a6 * b10  +   a7 * b9  +   a8 * b8  +   a9 * b7  +  a10 * b6 +  a11 * b5;
-    s17 =          a6 * b11  +   a7 * b10  +   a8 * b9  +   a9 * b8  +  a10 * b7  +  a11 * b6;
-    s18 =          a7 * b11  +   a8 * b10  +   a9 * b9  +  a10 * b8  +  a11 * b7;
-    s19 =          a8 * b11  +   a9 * b10  +  a10 * b9  +  a11 * b8;
-    s20 =          a9 * b11  +  a10 * b10  +  a11 * b9;
-    s21 =         a10 * b11  +  a11 * b10;
-    s22 =         a11 * b11;
-    s23 =         0;
+    s0 = c0 + a0 * b0;
+    s1 = c1 + a0 * b1 + a1 * b0;
+    s2 = c2 + a0 * b2 + a1 * b1 + a2 * b0;
+    s3 = c3 + a0 * b3 + a1 * b2 + a2 * b1 + a3 * b0;
+    s4 = c4 + a0 * b4 + a1 * b3 + a2 * b2 + a3 * b1 + a4 * b0;
+    s5 = c5 + a0 * b5 + a1 * b4 + a2 * b3 + a3 * b2 + a4 * b1 + a5 * b0;
+    s6 = c6 + a0 * b6 + a1 * b5 + a2 * b4 + a3 * b3 + a4 * b2 + a5 * b1 + a6 * b0;
+    s7 = c7 + a0 * b7 + a1 * b6 + a2 * b5 + a3 * b4 + a4 * b3 + a5 * b2 + a6 * b1 + a7 * b0;
+    s8 = c8 + a0 * b8 + a1 * b7 + a2 * b6 + a3 * b5 + a4 * b4 + a5 * b3 + a6 * b2 + a7 * b1 + a8 * b0;
+    s9 = c9 + a0 * b9 + a1 * b8 + a2 * b7 + a3 * b6 + a4 * b5 + a5 * b4 + a6 * b3 + a7 * b2 + a8 * b1 + a9 * b0;
+    s10 = c10 + a0 * b10 + a1 * b9 + a2 * b8 + a3 * b7 + a4 * b6 + a5 * b5 + a6 * b4 + a7 * b3 + a8 * b2 + a9 * b1 + a10 * b0;
+    s11 = c11 + a0 * b11 + a1 * b10 + a2 * b9 + a3 * b8 + a4 * b7 + a5 * b6 + a6 * b5 + a7 * b4 + a8 * b3 + a9 * b2 + a10 * b1 + a11 * b0;
+    s12 = a1 * b11 + a2 * b10 + a3 * b9 + a4 * b8 + a5 * b7 + a6 * b6 + a7 * b5 + a8 * b4 + a9 * b3 + a10 * b2 + a11 * b1;
+    s13 = a2 * b11 + a3 * b10 + a4 * b9 + a5 * b8 + a6 * b7 + a7 * b6 + a8 * b5 + a9 * b4 + a10 * b3 + a11 * b2;
+    s14 = a3 * b11 + a4 * b10 + a5 * b9 + a6 * b8 + a7 * b7 + a8 * b6 + a9 * b5 + a10 * b4 + a11 * b3;
+    s15 = a4 * b11 + a5 * b10 + a6 * b9 + a7 * b8 + a8 * b7 + a9 * b6 + a10 * b5 + a11 * b4;
+    s16 = a5 * b11 + a6 * b10 + a7 * b9 + a8 * b8 + a9 * b7 + a10 * b6 + a11 * b5;
+    s17 = a6 * b11 + a7 * b10 + a8 * b9 + a9 * b8 + a10 * b7 + a11 * b6;
+    s18 = a7 * b11 + a8 * b10 + a9 * b9 + a10 * b8 + a11 * b7;
+    s19 = a8 * b11 + a9 * b10 + a10 * b9 + a11 * b8;
+    s20 = a9 * b11 + a10 * b10 + a11 * b9;
+    s21 = a10 * b11 + a11 * b10;
+    s22 = a11 * b11;
+    s23 = 0;
 
     carry0 = (s0 + (1 << 20)) >> 21;
-    s1  += carry0;
-    s0  -= carry0 * (1 << 21);
+    s1 += carry0;
+    s0 -= carry0 * (1 << 21);
     carry2 = (s2 + (1 << 20)) >> 21;
-    s3  += carry2;
-    s2  -= carry2 * (1 << 21);
+    s3 += carry2;
+    s2 -= carry2 * (1 << 21);
     carry4 = (s4 + (1 << 20)) >> 21;
-    s5  += carry4;
-    s4  -= carry4 * (1 << 21);
+    s5 += carry4;
+    s4 -= carry4 * (1 << 21);
     carry6 = (s6 + (1 << 20)) >> 21;
-    s7  += carry6;
-    s6  -= carry6 * (1 << 21);
+    s7 += carry6;
+    s6 -= carry6 * (1 << 21);
     carry8 = (s8 + (1 << 20)) >> 21;
-    s9  += carry8;
-    s8  -= carry8 * (1 << 21);
+    s9 += carry8;
+    s8 -= carry8 * (1 << 21);
     carry10 = (s10 + (1 << 20)) >> 21;
     s11 += carry10;
     s10 -= carry10 * (1 << 21);
@@ -5111,20 +5265,20 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
     s22 -= carry22 * (1 << 21);
 
     carry1 = (s1 + (1 << 20)) >> 21;
-    s2  += carry1;
-    s1  -= carry1 * (1 << 21);
+    s2 += carry1;
+    s1 -= carry1 * (1 << 21);
     carry3 = (s3 + (1 << 20)) >> 21;
-    s4  += carry3;
-    s3  -= carry3 * (1 << 21);
+    s4 += carry3;
+    s3 -= carry3 * (1 << 21);
     carry5 = (s5 + (1 << 20)) >> 21;
-    s6  += carry5;
-    s5  -= carry5 * (1 << 21);
+    s6 += carry5;
+    s5 -= carry5 * (1 << 21);
     carry7 = (s7 + (1 << 20)) >> 21;
-    s8  += carry7;
-    s7  -= carry7 * (1 << 21);
+    s8 += carry7;
+    s7 -= carry7 * (1 << 21);
     carry9 = (s9 + (1 << 20)) >> 21;
     s10 += carry9;
-    s9  -= carry9 * (1 << 21);
+    s9 -= carry9 * (1 << 21);
     carry11 = (s11 + (1 << 20)) >> 21;
     s12 += carry11;
     s11 -= carry11 * (1 << 21);
@@ -5150,7 +5304,7 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
     s14 -= s23 * 997805;
     s15 += s23 * 136657;
     s16 -= s23 * 683901;
-    s23  = 0;
+    s23 = 0;
 
     s10 += s22 * 666643;
     s11 += s22 * 470296;
@@ -5158,46 +5312,46 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
     s13 -= s22 * 997805;
     s14 += s22 * 136657;
     s15 -= s22 * 683901;
-    s22  = 0;
+    s22 = 0;
 
-    s9  += s21 * 666643;
+    s9 += s21 * 666643;
     s10 += s21 * 470296;
     s11 += s21 * 654183;
     s12 -= s21 * 997805;
     s13 += s21 * 136657;
     s14 -= s21 * 683901;
-    s21  = 0;
+    s21 = 0;
 
-    s8  += s20 * 666643;
-    s9  += s20 * 470296;
+    s8 += s20 * 666643;
+    s9 += s20 * 470296;
     s10 += s20 * 654183;
     s11 -= s20 * 997805;
     s12 += s20 * 136657;
     s13 -= s20 * 683901;
-    s20  = 0;
+    s20 = 0;
 
-    s7  += s19 * 666643;
-    s8  += s19 * 470296;
-    s9  += s19 * 654183;
+    s7 += s19 * 666643;
+    s8 += s19 * 470296;
+    s9 += s19 * 654183;
     s10 -= s19 * 997805;
     s11 += s19 * 136657;
     s12 -= s19 * 683901;
-    s19  = 0;
+    s19 = 0;
 
-    s6  += s18 * 666643;
-    s7  += s18 * 470296;
-    s8  += s18 * 654183;
-    s9  -= s18 * 997805;
+    s6 += s18 * 666643;
+    s7 += s18 * 470296;
+    s8 += s18 * 654183;
+    s9 -= s18 * 997805;
     s10 += s18 * 136657;
     s11 -= s18 * 683901;
-    s18  = 0;
+    s18 = 0;
 
     carry6 = (s6 + (1 << 20)) >> 21;
-    s7  += carry6;
-    s6  -= carry6 * (1 << 21);
+    s7 += carry6;
+    s6 -= carry6 * (1 << 21);
     carry8 = (s8 + (1 << 20)) >> 21;
-    s9  += carry8;
-    s8  -= carry8 * (1 << 21);
+    s9 += carry8;
+    s8 -= carry8 * (1 << 21);
     carry10 = (s10 + (1 << 20)) >> 21;
     s11 += carry10;
     s10 -= carry10 * (1 << 21);
@@ -5212,11 +5366,11 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
     s16 -= carry16 * (1 << 21);
 
     carry7 = (s7 + (1 << 20)) >> 21;
-    s8  += carry7;
-    s7  -= carry7 * (1 << 21);
+    s8 += carry7;
+    s7 -= carry7 * (1 << 21);
     carry9 = (s9 + (1 << 20)) >> 21;
     s10 += carry9;
-    s9  -= carry9 * (1 << 21);
+    s9 -= carry9 * (1 << 21);
     carry11 = (s11 + (1 << 20)) >> 21;
     s12 += carry11;
     s11 -= carry11 * (1 << 21);
@@ -5227,130 +5381,130 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
     s16 += carry15;
     s15 -= carry15 * (1 << 21);
 
-    s5  += s17 * 666643;
-    s6  += s17 * 470296;
-    s7  += s17 * 654183;
-    s8  -= s17 * 997805;
-    s9  += s17 * 136657;
+    s5 += s17 * 666643;
+    s6 += s17 * 470296;
+    s7 += s17 * 654183;
+    s8 -= s17 * 997805;
+    s9 += s17 * 136657;
     s10 -= s17 * 683901;
-    s17  = 0;
-
-    s4  += s16 * 666643;
-    s5  += s16 * 470296;
-    s6  += s16 * 654183;
-    s7  -= s16 * 997805;
-    s8  += s16 * 136657;
-    s9  -= s16 * 683901;
-    s16  = 0;
-
-    s3  += s15 * 666643;
-    s4  += s15 * 470296;
-    s5  += s15 * 654183;
-    s6  -= s15 * 997805;
-    s7  += s15 * 136657;
-    s8  -= s15 * 683901;
-    s15  = 0;
-
-    s2  += s14 * 666643;
-    s3  += s14 * 470296;
-    s4  += s14 * 654183;
-    s5  -= s14 * 997805;
-    s6  += s14 * 136657;
-    s7  -= s14 * 683901;
-    s14  = 0;
-
-    s1  += s13 * 666643;
-    s2  += s13 * 470296;
-    s3  += s13 * 654183;
-    s4  -= s13 * 997805;
-    s5  += s13 * 136657;
-    s6  -= s13 * 683901;
-    s13  = 0;
-
-    s0  += s12 * 666643;
-    s1  += s12 * 470296;
-    s2  += s12 * 654183;
-    s3  -= s12 * 997805;
-    s4  += s12 * 136657;
-    s5  -= s12 * 683901;
+    s17 = 0;
+
+    s4 += s16 * 666643;
+    s5 += s16 * 470296;
+    s6 += s16 * 654183;
+    s7 -= s16 * 997805;
+    s8 += s16 * 136657;
+    s9 -= s16 * 683901;
+    s16 = 0;
+
+    s3 += s15 * 666643;
+    s4 += s15 * 470296;
+    s5 += s15 * 654183;
+    s6 -= s15 * 997805;
+    s7 += s15 * 136657;
+    s8 -= s15 * 683901;
+    s15 = 0;
+
+    s2 += s14 * 666643;
+    s3 += s14 * 470296;
+    s4 += s14 * 654183;
+    s5 -= s14 * 997805;
+    s6 += s14 * 136657;
+    s7 -= s14 * 683901;
+    s14 = 0;
+
+    s1 += s13 * 666643;
+    s2 += s13 * 470296;
+    s3 += s13 * 654183;
+    s4 -= s13 * 997805;
+    s5 += s13 * 136657;
+    s6 -= s13 * 683901;
+    s13 = 0;
+
+    s0 += s12 * 666643;
+    s1 += s12 * 470296;
+    s2 += s12 * 654183;
+    s3 -= s12 * 997805;
+    s4 += s12 * 136657;
+    s5 -= s12 * 683901;
     s12 = 0;
 
     carry0 = (s0 + (1 << 20)) >> 21;
-    s1  += carry0;
-    s0  -= carry0 * (1 << 21);
+    s1 += carry0;
+    s0 -= carry0 * (1 << 21);
     carry2 = (s2 + (1 << 20)) >> 21;
-    s3  += carry2;
-    s2  -= carry2 * (1 << 21);
+    s3 += carry2;
+    s2 -= carry2 * (1 << 21);
     carry4 = (s4 + (1 << 20)) >> 21;
-    s5  += carry4;
-    s4  -= carry4 * (1 << 21);
+    s5 += carry4;
+    s4 -= carry4 * (1 << 21);
     carry6 = (s6 + (1 << 20)) >> 21;
-    s7  += carry6;
-    s6  -= carry6 * (1 << 21);
+    s7 += carry6;
+    s6 -= carry6 * (1 << 21);
     carry8 = (s8 + (1 << 20)) >> 21;
-    s9  += carry8;
-    s8  -= carry8 * (1 << 21);
+    s9 += carry8;
+    s8 -= carry8 * (1 << 21);
     carry10 = (s10 + (1 << 20)) >> 21;
     s11 += carry10;
     s10 -= carry10 * (1 << 21);
 
     carry1 = (s1 + (1 << 20)) >> 21;
-    s2  += carry1;
-    s1  -= carry1 * (1 << 21);
+    s2 += carry1;
+    s1 -= carry1 * (1 << 21);
     carry3 = (s3 + (1 << 20)) >> 21;
-    s4  += carry3;
-    s3  -= carry3 * (1 << 21);
+    s4 += carry3;
+    s3 -= carry3 * (1 << 21);
     carry5 = (s5 + (1 << 20)) >> 21;
-    s6  += carry5;
-    s5  -= carry5 * (1 << 21);
+    s6 += carry5;
+    s5 -= carry5 * (1 << 21);
     carry7 = (s7 + (1 << 20)) >> 21;
-    s8  += carry7;
-    s7  -= carry7 * (1 << 21);
+    s8 += carry7;
+    s7 -= carry7 * (1 << 21);
     carry9 = (s9 + (1 << 20)) >> 21;
     s10 += carry9;
-    s9  -= carry9 * (1 << 21);
+    s9 -= carry9 * (1 << 21);
     carry11 = (s11 + (1 << 20)) >> 21;
     s12 += carry11;
     s11 -= carry11 * (1 << 21);
 
-    s0  += s12 * 666643;
-    s1  += s12 * 470296;
-    s2  += s12 * 654183;
-    s3  -= s12 * 997805;
-    s4  += s12 * 136657;
-    s5  -= s12 * 683901;
-    s12  = 0;
+    s0 += s12 * 666643;
+    s1 += s12 * 470296;
+    s2 += s12 * 654183;
+    s3 -= s12 * 997805;
+    s4 += s12 * 136657;
+    s5 -= s12 * 683901;
+    s12 = 0;
 
     carry0 = s0 >> 21;
-    s1  += carry0;
-    s0  -= carry0 * (1 << 21);
+    s1 += carry0;
+    s0 -= carry0 * (1 << 21);
     carry1 = s1 >> 21;
-    s2  += carry1;
-    s1  -= carry1 * (1 << 21);
+    s2 += carry1;
+    s1 -= carry1 * (1 << 21);
     carry2 = s2 >> 21;
-    s3  += carry2;
-    s2  -= carry2 * (1 << 21);
+    s3 += carry2;
+    s2 -= carry2 * (1 << 21);
     carry3 = s3 >> 21;
-    s4  += carry3;
-    s3  -= carry3 * (1 << 21);
+    s4 += carry3;
+    s3 -= carry3 * (1 << 21);
     carry4 = s4 >> 21;
-    s5  += carry4;
-    s4  -= carry4 * (1 << 21);
+    s5 += carry4;
+    s4 -= carry4 * (1 << 21);
     carry5 = s5 >> 21;
-    s6  += carry5;
-    s5  -= carry5 * (1 << 21);
+    s6 += carry5;
+    s5 -= carry5 * (1 << 21);
     carry6 = s6 >> 21;
-    s7  += carry6;
-    s6  -= carry6 * (1 << 21);
+    s7 += carry6;
+    s6 -= carry6 * (1 << 21);
     carry7 = s7 >> 21;
-    s8  += carry7;
-    s7  -= carry7 * (1 << 21);
+    s8 += carry7;
+    s7 -= carry7 * (1 << 21);
     carry8 = s8 >> 21;
-    s9  += carry8;
-    s8  -= carry8 * (1 << 21);
+    s9 += carry8;
+    s8 -= carry8 * (1 << 21);
     carry9 = s9 >> 21;
     s10 += carry9;
-    s9  -= carry9 * (1 << 21);
+    s9 -= carry9 * (1 << 21);
     carry10 = s10 >> 21;
     s11 += carry10;
     s10 -= carry10 * (1 << 21);
@@ -5358,94 +5512,93 @@ static void sc_muladd(uint8_t *s, const uint8_t *a, const uint8_t *b,
     s12 += carry11;
     s11 -= carry11 * (1 << 21);
 
-    s0  += s12 * 666643;
-    s1  += s12 * 470296;
-    s2  += s12 * 654183;
-    s3  -= s12 * 997805;
-    s4  += s12 * 136657;
-    s5  -= s12 * 683901;
-    s12  = 0;
+    s0 += s12 * 666643;
+    s1 += s12 * 470296;
+    s2 += s12 * 654183;
+    s3 -= s12 * 997805;
+    s4 += s12 * 136657;
+    s5 -= s12 * 683901;
+    s12 = 0;
 
     carry0 = s0 >> 21;
-    s1  += carry0;
-    s0  -= carry0 * (1 << 21);
+    s1 += carry0;
+    s0 -= carry0 * (1 << 21);
     carry1 = s1 >> 21;
-    s2  += carry1;
-    s1  -= carry1 * (1 << 21);
+    s2 += carry1;
+    s1 -= carry1 * (1 << 21);
     carry2 = s2 >> 21;
-    s3  += carry2;
-    s2  -= carry2 * (1 << 21);
+    s3 += carry2;
+    s2 -= carry2 * (1 << 21);
     carry3 = s3 >> 21;
-    s4  += carry3;
-    s3  -= carry3 * (1 << 21);
+    s4 += carry3;
+    s3 -= carry3 * (1 << 21);
     carry4 = s4 >> 21;
-    s5  += carry4;
-    s4  -= carry4 * (1 << 21);
+    s5 += carry4;
+    s4 -= carry4 * (1 << 21);
     carry5 = s5 >> 21;
-    s6  += carry5;
-    s5  -= carry5 * (1 << 21);
+    s6 += carry5;
+    s5 -= carry5 * (1 << 21);
     carry6 = s6 >> 21;
-    s7  += carry6;
-    s6  -= carry6 * (1 << 21);
+    s7 += carry6;
+    s6 -= carry6 * (1 << 21);
     carry7 = s7 >> 21;
-    s8  += carry7;
-    s7  -= carry7 * (1 << 21);
+    s8 += carry7;
+    s7 -= carry7 * (1 << 21);
     carry8 = s8 >> 21;
-    s9  += carry8;
-    s8  -= carry8 * (1 << 21);
+    s9 += carry8;
+    s8 -= carry8 * (1 << 21);
     carry9 = s9 >> 21;
     s10 += carry9;
-    s9  -= carry9 * (1 << 21);
+    s9 -= carry9 * (1 << 21);
     carry10 = s10 >> 21;
     s11 += carry10;
     s10 -= carry10 * (1 << 21);
 
-    s[ 0] = (uint8_t) (s0  >>  0);
-    s[ 1] = (uint8_t) (s0  >>  8);
-    s[ 2] = (uint8_t)((s0  >> 16) | (s1 << 5));
-    s[ 3] = (uint8_t) (s1  >>  3);
-    s[ 4] = (uint8_t) (s1  >> 11);
-    s[ 5] = (uint8_t)((s1  >> 19) | (s2 << 2));
-    s[ 6] = (uint8_t) (s2  >>  6);
-    s[ 7] = (uint8_t)((s2  >> 14) | (s3 << 7));
-    s[ 8] = (uint8_t) (s3  >>  1);
-    s[ 9] = (uint8_t) (s3  >>  9);
-    s[10] = (uint8_t)((s3  >> 17) | (s4 << 4));
-    s[11] = (uint8_t) (s4  >>  4);
-    s[12] = (uint8_t) (s4  >> 12);
-    s[13] = (uint8_t)((s4  >> 20) | (s5 << 1));
-    s[14] = (uint8_t) (s5  >>  7);
-    s[15] = (uint8_t)((s5  >> 15) | (s6 << 6));
-    s[16] = (uint8_t) (s6  >>  2);
-    s[17] = (uint8_t) (s6  >> 10);
-    s[18] = (uint8_t)((s6  >> 18) | (s7 << 3));
-    s[19] = (uint8_t) (s7  >>  5);
-    s[20] = (uint8_t) (s7  >> 13);
-    s[21] = (uint8_t) (s8  >>  0);
-    s[22] = (uint8_t) (s8  >>  8);
-    s[23] = (uint8_t)((s8  >> 16) | (s9 << 5));
-    s[24] = (uint8_t) (s9  >>  3);
-    s[25] = (uint8_t) (s9  >> 11);
-    s[26] = (uint8_t)((s9  >> 19) | (s10 << 2));
-    s[27] = (uint8_t) (s10 >>  6);
+    s[0] = (uint8_t)(s0 >> 0);
+    s[1] = (uint8_t)(s0 >> 8);
+    s[2] = (uint8_t)((s0 >> 16) | (s1 << 5));
+    s[3] = (uint8_t)(s1 >> 3);
+    s[4] = (uint8_t)(s1 >> 11);
+    s[5] = (uint8_t)((s1 >> 19) | (s2 << 2));
+    s[6] = (uint8_t)(s2 >> 6);
+    s[7] = (uint8_t)((s2 >> 14) | (s3 << 7));
+    s[8] = (uint8_t)(s3 >> 1);
+    s[9] = (uint8_t)(s3 >> 9);
+    s[10] = (uint8_t)((s3 >> 17) | (s4 << 4));
+    s[11] = (uint8_t)(s4 >> 4);
+    s[12] = (uint8_t)(s4 >> 12);
+    s[13] = (uint8_t)((s4 >> 20) | (s5 << 1));
+    s[14] = (uint8_t)(s5 >> 7);
+    s[15] = (uint8_t)((s5 >> 15) | (s6 << 6));
+    s[16] = (uint8_t)(s6 >> 2);
+    s[17] = (uint8_t)(s6 >> 10);
+    s[18] = (uint8_t)((s6 >> 18) | (s7 << 3));
+    s[19] = (uint8_t)(s7 >> 5);
+    s[20] = (uint8_t)(s7 >> 13);
+    s[21] = (uint8_t)(s8 >> 0);
+    s[22] = (uint8_t)(s8 >> 8);
+    s[23] = (uint8_t)((s8 >> 16) | (s9 << 5));
+    s[24] = (uint8_t)(s9 >> 3);
+    s[25] = (uint8_t)(s9 >> 11);
+    s[26] = (uint8_t)((s9 >> 19) | (s10 << 2));
+    s[27] = (uint8_t)(s10 >> 6);
     s[28] = (uint8_t)((s10 >> 14) | (s11 << 7));
-    s[29] = (uint8_t) (s11 >>  1);
-    s[30] = (uint8_t) (s11 >>  9);
-    s[31] = (uint8_t) (s11 >> 17);
+    s[29] = (uint8_t)(s11 >> 1);
+    s[30] = (uint8_t)(s11 >> 9);
+    s[31] = (uint8_t)(s11 >> 17);
 }
 
 static int hash_init_with_dom(EVP_MD_CTX *hash_ctx,
-                              EVP_MD *sha512,
-                              const uint8_t dom2flag,
-                              const uint8_t phflag,
-                              const uint8_t *context,
-                              const size_t context_len)
+    EVP_MD *sha512,
+    const uint8_t dom2flag,
+    const uint8_t phflag,
+    const uint8_t *context,
+    const size_t context_len)
 {
     /* ASCII: "SigEd25519 no Ed25519 collisions", in hex for EBCDIC compatibility */
-    const char dom_s[] =
-            "\x53\x69\x67\x45\x64\x32\x35\x35\x31\x39\x20\x6e"
-            "\x6f\x20\x45\x64\x32\x35\x35\x31\x39\x20\x63\x6f"
-            "\x6c\x6c\x69\x73\x69\x6f\x6e\x73";
+    const char dom_s[] = "\x53\x69\x67\x45\x64\x32\x35\x35\x31\x39\x20\x6e"
+                         "\x6f\x20\x45\x64\x32\x35\x35\x31\x39\x20\x63\x6f"
+                         "\x6c\x6c\x69\x73\x69\x6f\x6e\x73";
     uint8_t dom[2];
 
     if (!EVP_DigestInit_ex(hash_ctx, sha512, NULL))
@@ -5461,7 +5614,7 @@ static int hash_init_with_dom(EVP_MD_CTX *hash_ctx,
     dom[0] = (uint8_t)(phflag >= 1 ? 1 : 0);
     dom[1] = (uint8_t)context_len;
 
-    if (!EVP_DigestUpdate(hash_ctx, dom_s, sizeof(dom_s)-1)
+    if (!EVP_DigestUpdate(hash_ctx, dom_s, sizeof(dom_s) - 1)
         || !EVP_DigestUpdate(hash_ctx, dom, sizeof(dom))
         || !EVP_DigestUpdate(hash_ctx, context, context_len)) {
         return 0;
@@ -5470,12 +5623,11 @@ static int hash_init_with_dom(EVP_MD_CTX *hash_ctx,
     return 1;
 }
 
-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_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)
 {
     uint8_t az[SHA512_DIGEST_LENGTH];
     uint8_t nonce[SHA512_DIGEST_LENGTH];
@@ -5543,8 +5695,7 @@ ossl_ed25519_sign(uint8_t *out_sig, const uint8_t *tbs, size_t tbs_len,
  * does this check internally.
  * For some reason the FIPS ACVP requires a EDDSA KeyVer test.
  */
-int
-ossl_ed25519_pubkey_verify(const uint8_t *pub, size_t pub_len)
+int ossl_ed25519_pubkey_verify(const uint8_t *pub, size_t pub_len)
 {
     ge_p3 A;
 
@@ -5555,12 +5706,11 @@ ossl_ed25519_pubkey_verify(const uint8_t *pub, size_t pub_len)
 
 static const char allzeroes[15];
 
-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_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 i;
     ge_p3 A;
@@ -5661,10 +5811,9 @@ ossl_ed25519_verify(const uint8_t *tbs, size_t tbs_len,
     return res;
 }
 
-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_public_from_private(OSSL_LIB_CTX *ctx, uint8_t out_public_key[32],
+    const uint8_t private_key[32],
+    const char *propq)
 {
     uint8_t az[SHA512_DIGEST_LENGTH];
     ge_p3 A;
@@ -5692,19 +5841,17 @@ ossl_ed25519_public_from_private(OSSL_LIB_CTX *ctx, uint8_t out_public_key[32],
     return 1;
 }
 
-int
-ossl_x25519(uint8_t out_shared_key[32], const uint8_t private_key[32],
-            const uint8_t peer_public_value[32])
+int ossl_x25519(uint8_t out_shared_key[32], const uint8_t private_key[32],
+    const uint8_t peer_public_value[32])
 {
-    static const uint8_t kZeros[32] = {0};
+    static const uint8_t kZeros[32] = { 0 };
     x25519_scalar_mult(out_shared_key, private_key, peer_public_value);
     /* The all-zero output results when the input is a point of small order. */
     return CRYPTO_memcmp(kZeros, out_shared_key, 32) != 0;
 }
 
-void
-ossl_x25519_public_from_private(uint8_t out_public_value[32],
-                                const uint8_t private_key[32])
+void ossl_x25519_public_from_private(uint8_t out_public_value[32],
+    const uint8_t private_key[32])
 {
     uint8_t e[32];
     ge_p3 A;
diff --git a/crypto/ec/curve448/arch_32/arch_intrinsics.h b/crypto/ec/curve448/arch_32/arch_intrinsics.h
index 7a54903ac95aa..6a2bf46a53cef 100644
--- a/crypto/ec/curve448/arch_32/arch_intrinsics.h
+++ b/crypto/ec/curve448/arch_32/arch_intrinsics.h
@@ -11,17 +11,17 @@
  */
 
 #ifndef OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H
-# define OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H
+#define OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H
 
 #include "internal/constant_time.h"
 
-# define ARCH_WORD_BITS 32
+#define ARCH_WORD_BITS 32
 
-#define word_is_zero(a)     constant_time_is_zero_32(a)
+#define word_is_zero(a) constant_time_is_zero_32(a)
 
 static ossl_inline uint64_t widemul(uint32_t a, uint32_t b)
 {
     return ((uint64_t)a) * b;
 }
 
-#endif                          /* OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H */
diff --git a/crypto/ec/curve448/arch_32/f_impl.h b/crypto/ec/curve448/arch_32/f_impl.h
index 5cd25c04e1236..017844c11db8b 100644
--- a/crypto/ec/curve448/arch_32/f_impl.h
+++ b/crypto/ec/curve448/arch_32/f_impl.h
@@ -11,14 +11,18 @@
  */
 
 #ifndef OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H
-# define OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H
+#define OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H
 
-# define GF_HEADROOM 2
-# define LIMB(x) ((x) & ((1 << 28) - 1)), ((x) >> 28)
-# define FIELD_LITERAL(a, b, c, d, e, f, g, h) \
-    {{LIMB(a), LIMB(b), LIMB(c), LIMB(d), LIMB(e), LIMB(f), LIMB(g), LIMB(h)}}
+#define GF_HEADROOM 2
+#define LIMB(x) ((x) & ((1 << 28) - 1)), ((x) >> 28)
+#define FIELD_LITERAL(a, b, c, d, e, f, g, h)                                      \
+    {                                                                              \
+        {                                                                          \
+            LIMB(a), LIMB(b), LIMB(c), LIMB(d), LIMB(e), LIMB(f), LIMB(g), LIMB(h) \
+        }                                                                          \
+    }
 
-# define LIMB_PLACE_VALUE(i) 28
+#define LIMB_PLACE_VALUE(i) 28
 
 void gf_add_RAW(gf out, const gf a, const gf b)
 {
@@ -57,4 +61,4 @@ void gf_weak_reduce(gf a)
     a->limb[0] = (a->limb[0] & mask) + tmp;
 }
 
-#endif                  /* OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H */
diff --git a/crypto/ec/curve448/arch_32/f_impl32.c b/crypto/ec/curve448/arch_32/f_impl32.c
index 140c73c64fc19..783344f7d3e11 100644
--- a/crypto/ec/curve448/arch_32/f_impl32.c
+++ b/crypto/ec/curve448/arch_32/f_impl32.c
@@ -19,9 +19,9 @@
 NON_EMPTY_TRANSLATION_UNIT
 #else
 
-# include "../field.h"
+#include "../field.h"
 
-void ossl_gf_mul(gf_s * RESTRICT cs, const gf as, const gf bs)
+void ossl_gf_mul(gf_s *RESTRICT cs, const gf as, const gf bs)
 {
     const uint32_t *a = as->limb, *b = bs->limb;
     uint32_t *c = cs->limb;
@@ -70,7 +70,7 @@ void ossl_gf_mul(gf_s * RESTRICT cs, const gf as, const gf bs)
     c[1] += ((uint32_t)(accum1));
 }
 
-void ossl_gf_mulw_unsigned(gf_s * RESTRICT cs, const gf as, uint32_t b)
+void ossl_gf_mulw_unsigned(gf_s *RESTRICT cs, const gf as, uint32_t b)
 {
     const uint32_t *a = as->limb;
     uint32_t *c = cs->limb;
@@ -98,8 +98,8 @@ void ossl_gf_mulw_unsigned(gf_s * RESTRICT cs, const gf as, uint32_t b)
     c[1] += (uint32_t)(accum8 >> 28);
 }
 
-void ossl_gf_sqr(gf_s * RESTRICT cs, const gf as)
+void ossl_gf_sqr(gf_s *RESTRICT cs, const gf as)
 {
-    ossl_gf_mul(cs, as, as);         /* Performs better with a dedicated square */
+    ossl_gf_mul(cs, as, as); /* Performs better with a dedicated square */
 }
 #endif
diff --git a/crypto/ec/curve448/arch_64/arch_intrinsics.h b/crypto/ec/curve448/arch_64/arch_intrinsics.h
index e12b8cf226240..09f0fdf34e412 100644
--- a/crypto/ec/curve448/arch_64/arch_intrinsics.h
+++ b/crypto/ec/curve448/arch_64/arch_intrinsics.h
@@ -11,17 +11,17 @@
  */
 
 #ifndef OSSL_CRYPTO_EC_CURVE448_ARCH_64_INTRINSICS_H
-# define OSSL_CRYPTO_EC_CURVE448_ARCH_64_INTRINSICS_H
+#define OSSL_CRYPTO_EC_CURVE448_ARCH_64_INTRINSICS_H
 
-# include "internal/constant_time.h"
+#include "internal/constant_time.h"
 
-# define ARCH_WORD_BITS 64
+#define ARCH_WORD_BITS 64
 
-# define word_is_zero(a)     constant_time_is_zero_64(a)
+#define word_is_zero(a) constant_time_is_zero_64(a)
 
 static ossl_inline uint128_t widemul(uint64_t a, uint64_t b)
 {
-    return ((uint128_t) a) * b;
+    return ((uint128_t)a) * b;
 }
 
-#endif                          /* OSSL_CRYPTO_EC_CURVE448_ARCH_64_INTRINSICS_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_64_INTRINSICS_H */
diff --git a/crypto/ec/curve448/arch_64/f_impl.h b/crypto/ec/curve448/arch_64/f_impl.h
index faaeb8d9944b5..3e27820171e2c 100644
--- a/crypto/ec/curve448/arch_64/f_impl.h
+++ b/crypto/ec/curve448/arch_64/f_impl.h
@@ -11,12 +11,17 @@
  */
 
 #ifndef OSSL_CRYPTO_EC_CURVE448_ARCH_64_F_IMPL_H
-# define OSSL_CRYPTO_EC_CURVE448_ARCH_64_F_IMPL_H
+#define OSSL_CRYPTO_EC_CURVE448_ARCH_64_F_IMPL_H
 
-# define GF_HEADROOM 9999        /* Everything is reduced anyway */
-# define FIELD_LITERAL(a,b,c,d,e,f,g,h) {{a,b,c,d,e,f,g,h}}
+#define GF_HEADROOM 9999 /* Everything is reduced anyway */
+#define FIELD_LITERAL(a, b, c, d, e, f, g, h) \
+    {                                         \
+        {                                     \
+            a, b, c, d, e, f, g, h            \
+        }                                     \
+    }
 
-# define LIMB_PLACE_VALUE(i) 56
+#define LIMB_PLACE_VALUE(i) 56
 
 void gf_add_RAW(gf out, const gf a, const gf b)
 {
@@ -55,4 +60,4 @@ void gf_weak_reduce(gf a)
     a->limb[0] = (a->limb[0] & mask) + tmp;
 }
 
-#endif                  /* OSSL_CRYPTO_EC_CURVE448_ARCH_64_F_IMPL_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_64_F_IMPL_H */
diff --git a/crypto/ec/curve448/arch_64/f_impl64.c b/crypto/ec/curve448/arch_64/f_impl64.c
index 06cc33a964716..73c481deea09f 100644
--- a/crypto/ec/curve448/arch_64/f_impl64.c
+++ b/crypto/ec/curve448/arch_64/f_impl64.c
@@ -19,9 +19,9 @@
 NON_EMPTY_TRANSLATION_UNIT
 #else
 
-# include "../field.h"
+#include "../field.h"
 
-void ossl_gf_mul(gf_s * RESTRICT cs, const gf as, const gf bs)
+void ossl_gf_mul(gf_s *RESTRICT cs, const gf as, const gf bs)
 {
     const uint64_t *a = as->limb, *b = bs->limb;
     uint64_t *c = cs->limb;
@@ -73,7 +73,7 @@ void ossl_gf_mul(gf_s * RESTRICT cs, const gf as, const gf bs)
     c[1] += ((uint64_t)(accum1));
 }
 
-void ossl_gf_mulw_unsigned(gf_s * RESTRICT cs, const gf as, uint32_t b)
+void ossl_gf_mulw_unsigned(gf_s *RESTRICT cs, const gf as, uint32_t b)
 {
     const uint64_t *a = as->limb;
     uint64_t *c = cs->limb;
@@ -99,7 +99,7 @@ void ossl_gf_mulw_unsigned(gf_s * RESTRICT cs, const gf as, uint32_t b)
     c[1] += accum4 >> 56;
 }
 
-void ossl_gf_sqr(gf_s * RESTRICT cs, const gf as)
+void ossl_gf_sqr(gf_s *RESTRICT cs, const gf as)
 {
     const uint64_t *a = as->limb;
     uint64_t *c = cs->limb;
diff --git a/crypto/ec/curve448/curve448.c b/crypto/ec/curve448/curve448.c
index 1db78ee5c6b5f..1a31f86355985 100644
--- a/crypto/ec/curve448/curve448.c
+++ b/crypto/ec/curve448/curve448.c
@@ -23,20 +23,16 @@
 #define C448_WNAF_FIXED_TABLE_BITS 5
 #define C448_WNAF_VAR_TABLE_BITS 3
 
-#define EDWARDS_D       (-39081)
+#define EDWARDS_D (-39081)
 
 static const curve448_scalar_t precomputed_scalarmul_adjustment = {
-    {
-        {
-            SC_LIMB(0xc873d6d54a7bb0cfULL), SC_LIMB(0xe933d8d723a70aadULL),
-            SC_LIMB(0xbb124b65129c96fdULL), SC_LIMB(0x00000008335dc163ULL)
-        }
-    }
+    { { SC_LIMB(0xc873d6d54a7bb0cfULL), SC_LIMB(0xe933d8d723a70aadULL),
+        SC_LIMB(0xbb124b65129c96fdULL), SC_LIMB(0x00000008335dc163ULL) } }
 };
 
 #define TWISTED_D (EDWARDS_D - 1)
 
-#define WBITS C448_WORD_BITS   /* NB this may be different from ARCH_WORD_BITS */
+#define WBITS C448_WORD_BITS /* NB this may be different from ARCH_WORD_BITS */
 
 /* Inverse. */
 static void gf_invert(gf y, const gf x, int assert_nonzero)
@@ -44,38 +40,38 @@ static void gf_invert(gf y, const gf x, int assert_nonzero)
     mask_t ret;
     gf t1, t2;
 
-    ossl_gf_sqr(t1, x);              /* o^2 */
-    ret = gf_isr(t2, t1);       /* +-1/sqrt(o^2) = +-1/o */
+    ossl_gf_sqr(t1, x); /* o^2 */
+    ret = gf_isr(t2, t1); /* +-1/sqrt(o^2) = +-1/o */
     (void)ret;
     if (assert_nonzero)
         assert(ret);
     ossl_gf_sqr(t1, t2);
-    ossl_gf_mul(t2, t1, x);          /* not direct to y in case of alias. */
+    ossl_gf_mul(t2, t1, x); /* not direct to y in case of alias. */
     gf_copy(y, t2);
 }
 
 /** identity = (0,1) */
 const curve448_point_t ossl_curve448_point_identity = {
-    {{{{0}}}, {{{1}}}, {{{1}}}, {{{0}}}}
+    { { { { 0 } } }, { { { 1 } } }, { { { 1 } } }, { { { 0 } } } }
 };
 
 static void point_double_internal(curve448_point_t p, const curve448_point_t q,
-                                  int before_double)
+    int before_double)
 {
     gf a, b, c, d;
 
     ossl_gf_sqr(c, q->x);
     ossl_gf_sqr(a, q->y);
-    gf_add_nr(d, c, a);         /* 2+e */
+    gf_add_nr(d, c, a); /* 2+e */
     gf_add_nr(p->t, q->y, q->x); /* 2+e */
     ossl_gf_sqr(b, p->t);
-    gf_subx_nr(b, b, d, 3);     /* 4+e */
-    gf_sub_nr(p->t, a, c);      /* 3+e */
+    gf_subx_nr(b, b, d, 3); /* 4+e */
+    gf_sub_nr(p->t, a, c); /* 3+e */
     ossl_gf_sqr(p->x, q->z);
     gf_add_nr(p->z, p->x, p->x); /* 2+e */
     gf_subx_nr(a, p->z, p->t, 4); /* 6+e */
     if (GF_HEADROOM == 5)
-        gf_weak_reduce(a);      /* or 1+e */
+        gf_weak_reduce(a); /* or 1+e */
     ossl_gf_mul(p->x, a, b);
     ossl_gf_mul(p->z, p->t, a);
     ossl_gf_mul(p->y, p->t, d);
@@ -124,19 +120,19 @@ static void niels_to_pt(curve448_point_t e, const niels_t n)
 }
 
 static void add_niels_to_pt(curve448_point_t d, const niels_t e,
-                            int before_double)
+    int before_double)
 {
     gf a, b, c;
 
-    gf_sub_nr(b, d->y, d->x);   /* 3+e */
+    gf_sub_nr(b, d->y, d->x); /* 3+e */
     ossl_gf_mul(a, e->a, b);
-    gf_add_nr(b, d->x, d->y);   /* 2+e */
+    gf_add_nr(b, d->x, d->y); /* 2+e */
     ossl_gf_mul(d->y, e->b, b);
     ossl_gf_mul(d->x, e->c, d->t);
-    gf_add_nr(c, a, d->y);      /* 2+e */
-    gf_sub_nr(b, d->y, a);      /* 3+e */
+    gf_add_nr(c, a, d->y); /* 2+e */
+    gf_sub_nr(b, d->y, a); /* 3+e */
     gf_sub_nr(d->y, d->z, d->x); /* 3+e */
-    gf_add_nr(a, d->x, d->z);   /* 2+e */
+    gf_add_nr(a, d->x, d->z); /* 2+e */
     ossl_gf_mul(d->z, a, d->y);
     ossl_gf_mul(d->x, d->y, b);
     ossl_gf_mul(d->y, a, c);
@@ -145,19 +141,19 @@ static void add_niels_to_pt(curve448_point_t d, const niels_t e,
 }
 
 static void sub_niels_from_pt(curve448_point_t d, const niels_t e,
-                              int before_double)
+    int before_double)
 {
     gf a, b, c;
 
-    gf_sub_nr(b, d->y, d->x);   /* 3+e */
+    gf_sub_nr(b, d->y, d->x); /* 3+e */
     ossl_gf_mul(a, e->b, b);
-    gf_add_nr(b, d->x, d->y);   /* 2+e */
+    gf_add_nr(b, d->x, d->y); /* 2+e */
     ossl_gf_mul(d->y, e->a, b);
     ossl_gf_mul(d->x, e->c, d->t);
-    gf_add_nr(c, a, d->y);      /* 2+e */
-    gf_sub_nr(b, d->y, a);      /* 3+e */
+    gf_add_nr(c, a, d->y); /* 2+e */
+    gf_sub_nr(b, d->y, a); /* 3+e */
     gf_add_nr(d->y, d->z, d->x); /* 2+e */
-    gf_sub_nr(a, d->z, d->x);   /* 3+e */
+    gf_sub_nr(a, d->z, d->x); /* 3+e */
     ossl_gf_mul(d->z, a, d->y);
     ossl_gf_mul(d->x, d->y, b);
     ossl_gf_mul(d->y, a, c);
@@ -166,7 +162,7 @@ static void sub_niels_from_pt(curve448_point_t d, const niels_t e,
 }
 
 static void add_pniels_to_pt(curve448_point_t p, const pniels_t pn,
-                             int before_double)
+    int before_double)
 {
     gf L0;
 
@@ -176,7 +172,7 @@ static void add_pniels_to_pt(curve448_point_t p, const pniels_t pn,
 }
 
 static void sub_pniels_from_pt(curve448_point_t p, const pniels_t pn,
-                               int before_double)
+    int before_double)
 {
     gf L0;
 
@@ -187,7 +183,7 @@ static void sub_pniels_from_pt(curve448_point_t p, const pniels_t pn,
 
 c448_bool_t
 ossl_curve448_point_eq(const curve448_point_t p,
-                       const curve448_point_t q)
+    const curve448_point_t q)
 {
     mask_t succ;
     gf a, b;
@@ -221,17 +217,16 @@ ossl_curve448_point_valid(const curve448_point_t p)
     return mask_to_bool(out);
 }
 
-static ossl_inline void constant_time_lookup_niels(niels_s * RESTRICT ni,
-                                                   const niels_t *table,
-                                                   int nelts, int idx)
+static ossl_inline void constant_time_lookup_niels(niels_s *RESTRICT ni,
+    const niels_t *table,
+    int nelts, int idx)
 {
     constant_time_lookup(ni, table, sizeof(niels_s), nelts, idx);
 }
 
-void
-ossl_curve448_precomputed_scalarmul(curve448_point_t out,
-                                    const curve448_precomputed_s *table,
-                                    const curve448_scalar_t scalar)
+void ossl_curve448_precomputed_scalarmul(curve448_point_t out,
+    const curve448_precomputed_s *table,
+    const curve448_scalar_t scalar)
 {
     unsigned int i, j, k;
     const unsigned int n = COMBS_N, t = COMBS_T, s = COMBS_S;
@@ -253,8 +248,7 @@ ossl_curve448_precomputed_scalarmul(curve448_point_t out,
                 unsigned int bit = (i - 1) + s * (k + j * t);
 
                 if (bit < C448_SCALAR_BITS)
-                    tab |=
-                        (scalar1x->limb[bit / WBITS] >> (bit % WBITS) & 1) << k;
+                    tab |= (scalar1x->limb[bit / WBITS] >> (bit % WBITS) & 1) << k;
             }
 
             invert = (tab >> (t - 1)) - 1;
@@ -262,7 +256,7 @@ ossl_curve448_precomputed_scalarmul(curve448_point_t out,
             tab &= (1 << (t - 1)) - 1;
 
             constant_time_lookup_niels(ni, &table->table[j << (t - 1)],
-                                       1 << (t - 1), tab);
+                1 << (t - 1), tab);
 
             cond_neg_niels(ni, invert);
             if ((i != s) || j != 0)
@@ -276,10 +270,9 @@ ossl_curve448_precomputed_scalarmul(curve448_point_t out,
     OPENSSL_cleanse(scalar1x, sizeof(scalar1x));
 }
 
-void
-ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
-                                    uint8_t enc[EDDSA_448_PUBLIC_BYTES],
-                                    const curve448_point_t p)
+void ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
+    uint8_t enc[EDDSA_448_PUBLIC_BYTES],
+    const curve448_point_t p)
 {
     gf x, y, z, t;
     curve448_point_t q;
@@ -326,8 +319,8 @@ ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
 
 c448_error_t
 ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(
-                                curve448_point_t p,
-                                const uint8_t enc[EDDSA_448_PUBLIC_BYTES])
+    curve448_point_t p,
+    const uint8_t enc[EDDSA_448_PUBLIC_BYTES])
 {
     uint8_t enc2[EDDSA_448_PUBLIC_BYTES];
     mask_t low;
@@ -342,14 +335,14 @@ ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(
     succ &= word_is_zero(enc2[EDDSA_448_PRIVATE_BYTES - 1]);
 
     ossl_gf_sqr(p->x, p->y);
-    gf_sub(p->z, ONE, p->x);    /* num = 1-y^2 */
+    gf_sub(p->z, ONE, p->x); /* num = 1-y^2 */
     gf_mulw(p->t, p->x, EDWARDS_D); /* dy^2 */
-    gf_sub(p->t, ONE, p->t);    /* denom = 1-dy^2 or 1-d + dy^2 */
+    gf_sub(p->t, ONE, p->t); /* denom = 1-dy^2 or 1-d + dy^2 */
 
     ossl_gf_mul(p->x, p->z, p->t);
     succ &= gf_isr(p->t, p->x); /* 1/sqrt(num * denom) */
 
-    ossl_gf_mul(p->x, p->t, p->z);   /* sqrt(num / denom) */
+    ossl_gf_mul(p->x, p->t, p->z); /* sqrt(num / denom) */
     gf_cond_neg(p->x, gf_lobit(p->x) ^ low);
     gf_copy(p->z, ONE);
 
@@ -385,8 +378,8 @@ ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(
 
 c448_error_t
 ossl_x448_int(uint8_t out[X_PUBLIC_BYTES],
-              const uint8_t base[X_PUBLIC_BYTES],
-              const uint8_t scalar[X_PRIVATE_BYTES])
+    const uint8_t base[X_PUBLIC_BYTES],
+    const uint8_t scalar[X_PRIVATE_BYTES])
 {
     gf x1, x2, z2, x3, z3, t1, t2;
     int t;
@@ -410,7 +403,7 @@ ossl_x448_int(uint8_t out[X_PUBLIC_BYTES],
             sb = -1;
 
         k_t = (sb >> (t % 8)) & 1;
-        k_t = 0 - k_t;             /* set to all 0s or all 1s */
+        k_t = 0 - k_t; /* set to all 0s or all 1s */
 
         swap ^= k_t;
         gf_cond_swap(x2, x3, swap);
@@ -422,26 +415,26 @@ ossl_x448_int(uint8_t out[X_PUBLIC_BYTES],
          * comments, "2+e" is saying that the coefficients are at most 2+epsilon
          * times the reduction limit.
          */
-        gf_add_nr(t1, x2, z2);  /* A = x2 + z2 */ /* 2+e */
-        gf_sub_nr(t2, x2, z2);  /* B = x2 - z2 */ /* 3+e */
-        gf_sub_nr(z2, x3, z3);  /* D = x3 - z3 */ /* 3+e */
-        ossl_gf_mul(x2, t1, z2);     /* DA */
-        gf_add_nr(z2, z3, x3);  /* C = x3 + z3 */ /* 2+e */
-        ossl_gf_mul(x3, t2, z2);     /* CB */
-        gf_sub_nr(z3, x2, x3);  /* DA-CB */ /* 3+e */
-        ossl_gf_sqr(z2, z3);         /* (DA-CB)^2 */
-        ossl_gf_mul(z3, x1, z2);     /* z3 = x1(DA-CB)^2 */
-        gf_add_nr(z2, x2, x3);  /* (DA+CB) */ /* 2+e */
-        ossl_gf_sqr(x3, z2);         /* x3 = (DA+CB)^2 */
-
-        ossl_gf_sqr(z2, t1);         /* AA = A^2 */
-        ossl_gf_sqr(t1, t2);         /* BB = B^2 */
-        ossl_gf_mul(x2, z2, t1);     /* x2 = AA*BB */
-        gf_sub_nr(t2, z2, t1);  /* E = AA-BB */ /* 3+e */
+        gf_add_nr(t1, x2, z2); /* A = x2 + z2 */ /* 2+e */
+        gf_sub_nr(t2, x2, z2); /* B = x2 - z2 */ /* 3+e */
+        gf_sub_nr(z2, x3, z3); /* D = x3 - z3 */ /* 3+e */
+        ossl_gf_mul(x2, t1, z2); /* DA */
+        gf_add_nr(z2, z3, x3); /* C = x3 + z3 */ /* 2+e */
+        ossl_gf_mul(x3, t2, z2); /* CB */
+        gf_sub_nr(z3, x2, x3); /* DA-CB */ /* 3+e */
+        ossl_gf_sqr(z2, z3); /* (DA-CB)^2 */
+        ossl_gf_mul(z3, x1, z2); /* z3 = x1(DA-CB)^2 */
+        gf_add_nr(z2, x2, x3); /* (DA+CB) */ /* 2+e */
+        ossl_gf_sqr(x3, z2); /* x3 = (DA+CB)^2 */
+
+        ossl_gf_sqr(z2, t1); /* AA = A^2 */
+        ossl_gf_sqr(t1, t2); /* BB = B^2 */
+        ossl_gf_mul(x2, z2, t1); /* x2 = AA*BB */
+        gf_sub_nr(t2, z2, t1); /* E = AA-BB */ /* 3+e */
 
         gf_mulw(t1, t2, -EDWARDS_D); /* E*-d = a24*E */
-        gf_add_nr(t1, t1, z2);  /* AA + a24*E */ /* 2+e */
-        ossl_gf_mul(z2, t2, t1);     /* z2 = E(AA+a24*E) */
+        gf_add_nr(t1, t1, z2); /* AA + a24*E */ /* 2+e */
+        ossl_gf_mul(z2, t2, t1); /* z2 = E(AA+a24*E) */
     }
 
     /* Finish */
@@ -463,23 +456,22 @@ ossl_x448_int(uint8_t out[X_PUBLIC_BYTES],
     return c448_succeed_if(mask_to_bool(nz));
 }
 
-void
-ossl_curve448_point_mul_by_ratio_and_encode_like_x448(uint8_t
-                                                      out[X_PUBLIC_BYTES],
-                                                      const curve448_point_t p)
+void ossl_curve448_point_mul_by_ratio_and_encode_like_x448(uint8_t
+                                                               out[X_PUBLIC_BYTES],
+    const curve448_point_t p)
 {
     curve448_point_t q;
 
     curve448_point_copy(q, p);
-    gf_invert(q->t, q->x, 0);   /* 1/x */
-    ossl_gf_mul(q->z, q->t, q->y);   /* y/x */
-    ossl_gf_sqr(q->y, q->z);         /* (y/x)^2 */
+    gf_invert(q->t, q->x, 0); /* 1/x */
+    ossl_gf_mul(q->z, q->t, q->y); /* y/x */
+    ossl_gf_sqr(q->y, q->z); /* (y/x)^2 */
     gf_serialize(out, q->y, 1);
     ossl_curve448_point_destroy(q);
 }
 
 void ossl_x448_derive_public_key(uint8_t out[X_PUBLIC_BYTES],
-                                 const uint8_t scalar[X_PRIVATE_BYTES])
+    const uint8_t scalar[X_PRIVATE_BYTES])
 {
     /* Scalar conditioning */
     uint8_t scalar2[X_PRIVATE_BYTES];
@@ -500,7 +492,7 @@ void ossl_x448_derive_public_key(uint8_t out[X_PUBLIC_BYTES],
         ossl_curve448_scalar_halve(the_scalar, the_scalar);
 
     ossl_curve448_precomputed_scalarmul(p, ossl_curve448_precomputed_base,
-                                        the_scalar);
+        the_scalar);
     ossl_curve448_point_mul_by_ratio_and_encode_like_x448(out, p);
     ossl_curve448_point_destroy(p);
 }
@@ -511,9 +503,9 @@ struct smvt_control {
 };
 
 #if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3))
-# define NUMTRAILINGZEROS       __builtin_ctz
+#define NUMTRAILINGZEROS __builtin_ctz
 #else
-# define NUMTRAILINGZEROS       numtrailingzeros
+#define NUMTRAILINGZEROS numtrailingzeros
 static uint32_t numtrailingzeros(uint32_t i)
 {
     uint32_t tmp;
@@ -551,9 +543,9 @@ static uint32_t numtrailingzeros(uint32_t i)
 #endif
 
 static int recode_wnaf(struct smvt_control *control,
-                       /* [nbits/(table_bits + 1) + 3] */
-                       const curve448_scalar_t scalar,
-                       unsigned int table_bits)
+    /* [nbits/(table_bits + 1) + 3] */
+    const curve448_scalar_t scalar,
+    unsigned int table_bits)
 {
     unsigned int table_size = C448_SCALAR_BITS / (table_bits + 1) + 3;
     int position = table_size - 1; /* at the end */
@@ -578,7 +570,8 @@ static int recode_wnaf(struct smvt_control *control,
         if (w < (C448_SCALAR_BITS - 1) / 16 + 1) {
             /* Refill the 16 high bits of current */
             current += (uint32_t)((scalar->limb[w / B_OVER_16]
-                       >> (16 * (w % B_OVER_16))) << 16);
+                                      >> (16 * (w % B_OVER_16)))
+                << 16);
         }
 
         while (current & 0xFFFF) {
@@ -614,8 +607,8 @@ static int recode_wnaf(struct smvt_control *control,
 }
 
 static void prepare_wnaf_table(pniels_t *output,
-                               const curve448_point_t working,
-                               unsigned int tbits)
+    const curve448_point_t working,
+    unsigned int tbits)
 {
     curve448_point_t tmp;
     int i;
@@ -641,18 +634,15 @@ static void prepare_wnaf_table(pniels_t *output,
     OPENSSL_cleanse(twop, sizeof(twop));
 }
 
-void
-ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
-                                               const curve448_scalar_t scalar1,
-                                               const curve448_point_t base2,
-                                               const curve448_scalar_t scalar2)
+void ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
+    const curve448_scalar_t scalar1,
+    const curve448_point_t base2,
+    const curve448_scalar_t scalar2)
 {
     const int table_bits_var = C448_WNAF_VAR_TABLE_BITS;
     const int table_bits_pre = C448_WNAF_FIXED_TABLE_BITS;
-    struct smvt_control control_var[C448_SCALAR_BITS /
-                                    (C448_WNAF_VAR_TABLE_BITS + 1) + 3];
-    struct smvt_control control_pre[C448_SCALAR_BITS /
-                                    (C448_WNAF_FIXED_TABLE_BITS + 1) + 3];
+    struct smvt_control control_var[C448_SCALAR_BITS / (C448_WNAF_VAR_TABLE_BITS + 1) + 3];
+    struct smvt_control control_pre[C448_SCALAR_BITS / (C448_WNAF_FIXED_TABLE_BITS + 1) + 3];
     int ncb_pre = recode_wnaf(control_pre, scalar1, table_bits_pre);
     int ncb_var = recode_wnaf(control_var, scalar2, table_bits_var);
     pniels_t precmp_var[1 << C448_WNAF_VAR_TABLE_BITS];
@@ -671,8 +661,8 @@ ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
     } else if (i == control_pre[0].power && i >= 0) {
         pniels_to_pt(combo, precmp_var[control_var[0].addend >> 1]);
         add_niels_to_pt(combo,
-                        ossl_curve448_wnaf_base[control_pre[0].addend >> 1],
-                        i);
+            ossl_curve448_wnaf_base[control_pre[0].addend >> 1],
+            i);
         contv++;
         contp++;
     } else {
@@ -692,12 +682,13 @@ ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
 
             if (control_var[contv].addend > 0)
                 add_pniels_to_pt(combo,
-                                 precmp_var[control_var[contv].addend >> 1],
-                                 i && !cp);
+                    precmp_var[control_var[contv].addend >> 1],
+                    i && !cp);
             else
                 sub_pniels_from_pt(combo,
-                                   precmp_var[(-control_var[contv].addend)
-                                              >> 1], i && !cp);
+                    precmp_var[(-control_var[contv].addend)
+                        >> 1],
+                    i && !cp);
             contv++;
         }
 
@@ -706,12 +697,16 @@ ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
 
             if (control_pre[contp].addend > 0)
                 add_niels_to_pt(combo,
-                                ossl_curve448_wnaf_base[control_pre[contp].addend
-                                                   >> 1], i);
+                    ossl_curve448_wnaf_base[control_pre[contp].addend
+                        >> 1],
+                    i);
             else
                 sub_niels_from_pt(combo,
-                                  ossl_curve448_wnaf_base[(-control_pre
-                                                      [contp].addend) >> 1], i);
+                    ossl_curve448_wnaf_base[(-control_pre
+                                                    [contp]
+                                                        .addend)
+                        >> 1],
+                    i);
             contp++;
         }
     }
@@ -733,14 +728,14 @@ void ossl_curve448_point_destroy(curve448_point_t point)
 }
 
 int ossl_x448(uint8_t out_shared_key[56], const uint8_t private_key[56],
-              const uint8_t peer_public_value[56])
+    const uint8_t peer_public_value[56])
 {
     return ossl_x448_int(out_shared_key, peer_public_value, private_key)
-           == C448_SUCCESS;
+        == C448_SUCCESS;
 }
 
 void ossl_x448_public_from_private(uint8_t out_public_value[56],
-                                   const uint8_t private_key[56])
+    const uint8_t private_key[56])
 {
     ossl_x448_derive_public_key(out_public_value, private_key);
 }
diff --git a/crypto/ec/curve448/curve448_local.h b/crypto/ec/curve448/curve448_local.h
index 5c569ea8b9d2b..96a1ad00e799a 100644
--- a/crypto/ec/curve448/curve448_local.h
+++ b/crypto/ec/curve448/curve448_local.h
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_CRYPTO_EC_CURVE448_LOCAL_H
-# define OSSL_CRYPTO_EC_CURVE448_LOCAL_H
-# include "curve448utils.h"
+#define OSSL_CRYPTO_EC_CURVE448_LOCAL_H
+#include "curve448utils.h"
 
-#endif              /* OSSL_CRYPTO_EC_CURVE448_LOCAL_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_LOCAL_H */
diff --git a/crypto/ec/curve448/curve448_tables.c b/crypto/ec/curve448/curve448_tables.c
index 0c6f626b3e6e8..f3888378fb683 100644
--- a/crypto/ec/curve448/curve448_tables.c
+++ b/crypto/ec/curve448/curve448_tables.c
@@ -14,1470 +14,1578 @@
 #include "point_448.h"
 
 static const curve448_precomputed_s curve448_precomputed_base_table = {
-    {
-        {{
-            {FIELD_LITERAL(0x00cc3b062366f4ccULL, 0x003d6e34e314aa3cULL,
-                           0x00d51c0a7521774dULL, 0x0094e060eec6ab8bULL,
-                           0x00d21291b4d80082ULL, 0x00befed12b55ef1eULL,
-                           0x00c3dd2df5c94518ULL, 0x00e0a7b112b8d4e6ULL)},
-            {FIELD_LITERAL(0x0019eb5608d8723aULL, 0x00d1bab52fb3aedbULL,
-                           0x00270a7311ebc90cULL, 0x0037c12b91be7f13ULL,
-                           0x005be16cd8b5c704ULL, 0x003e181acda888e1ULL,
-                           0x00bc1f00fc3fc6d0ULL, 0x00d3839bfa319e20ULL)},
-            {FIELD_LITERAL(0x003caeb88611909fULL, 0x00ea8b378c4df3d4ULL,
-                           0x00b3295b95a5a19aULL, 0x00a65f97514bdfb5ULL,
-                           0x00b39efba743cab1ULL, 0x0016ba98b862fd2dULL,
-                           0x0001508812ee71d7ULL, 0x000a75740eea114aULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00ebcf0eb649f823ULL, 0x00166d332e98ea03ULL,
-                           0x0059ddf64f5cd5f6ULL, 0x0047763123d9471bULL,
-                           0x00a64065c53ef62fULL, 0x00978e44c480153dULL,
-                           0x000b5b2a0265f194ULL, 0x0046a24b9f32965aULL)},
-            {FIELD_LITERAL(0x00b9eef787034df0ULL, 0x0020bc24de3390cdULL,
-                           0x000022160bae99bbULL, 0x00ae66e886e97946ULL,
-                           0x0048d4bbe02cbb8bULL, 0x0072ba97b34e38d4ULL,
-                           0x00eae7ec8f03e85aULL, 0x005ba92ecf808b2cULL)},
-            {FIELD_LITERAL(0x00c9cfbbe74258fdULL, 0x00843a979ea9eaa7ULL,
-                           0x000cbb4371cfbe90ULL, 0x0059bac8f7f0a628ULL,
-                           0x004b3dff882ff530ULL, 0x0011869df4d90733ULL,
-                           0x00595aa71f4abfc2ULL, 0x0070e2d38990c2e6ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00de2010c0a01733ULL, 0x00c739a612e24297ULL,
-                           0x00a7212643141d7cULL, 0x00f88444f6b67c11ULL,
-                           0x00484b7b16ec28f2ULL, 0x009c1b8856af9c68ULL,
-                           0x00ff4669591fe9d6ULL, 0x0054974be08a32c8ULL)},
-            {FIELD_LITERAL(0x0010de3fd682ceedULL, 0x008c07642d83ca4eULL,
-                           0x0013bb064e00a1ccULL, 0x009411ae27870e11ULL,
-                           0x00ea8e5b4d531223ULL, 0x0032fe7d2aaece2eULL,
-                           0x00d989e243e7bb41ULL, 0x000fe79a508e9b8bULL)},
-            {FIELD_LITERAL(0x005e0426b9bfc5b1ULL, 0x0041a5b1d29ee4faULL,
-                           0x0015b0def7774391ULL, 0x00bc164f1f51af01ULL,
-                           0x00d543b0942797b9ULL, 0x003c129b6398099cULL,
-                           0x002b114c6e5adf18ULL, 0x00b4e630e4018a7bULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00d490afc95f8420ULL, 0x00b096bf50c1d9b9ULL,
-                           0x00799fd707679866ULL, 0x007c74d9334afbeaULL,
-                           0x00efaa8be80ff4edULL, 0x0075c4943bb81694ULL,
-                           0x00c21c2fca161f36ULL, 0x00e77035d492bfeeULL)},
-            {FIELD_LITERAL(0x006658a190dd6661ULL, 0x00e0e9bab38609a6ULL,
-                           0x0028895c802237edULL, 0x006a0229c494f587ULL,
-                           0x002dcde96c9916b7ULL, 0x00d158822de16218ULL,
-                           0x00173b917a06856fULL, 0x00ca78a79ae07326ULL)},
-            {FIELD_LITERAL(0x00e35bfc79caced4ULL, 0x0087238a3e1fe3bbULL,
-                           0x00bcbf0ff4ceff5bULL, 0x00a19c1c94099b91ULL,
-                           0x0071e102b49db976ULL, 0x0059e3d004eada1eULL,
-                           0x008da78afa58a47eULL, 0x00579c8ebf269187ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00a16c2905eee75fULL, 0x009d4bcaea2c7e1dULL,
-                           0x00d3bd79bfad19dfULL, 0x0050da745193342cULL,
-                           0x006abdb8f6b29ab1ULL, 0x00a24fe0a4fef7efULL,
-                           0x0063730da1057dfbULL, 0x00a08c312c8eb108ULL)},
-            {FIELD_LITERAL(0x00b583be005375beULL, 0x00a40c8f8a4e3df4ULL,
-                           0x003fac4a8f5bdbf7ULL, 0x00d4481d872cd718ULL,
-                           0x004dc8749cdbaefeULL, 0x00cce740d5e5c975ULL,
-                           0x000b1c1f4241fd21ULL, 0x00a76de1b4e1cd07ULL)},
-            {FIELD_LITERAL(0x007a076500d30b62ULL, 0x000a6e117b7f090fULL,
-                           0x00c8712ae7eebd9aULL, 0x000fbd6c1d5f6ff7ULL,
-                           0x003a7977246ebf11ULL, 0x00166ed969c6600eULL,
-                           0x00aa42e469c98becULL, 0x00dc58f307cf0666ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x004b491f65a9a28bULL, 0x006a10309e8a55b7ULL,
-                           0x00b67210185187efULL, 0x00cf6497b12d9b8fULL,
-                           0x0085778c56e2b1baULL, 0x0015b4c07a814d85ULL,
-                           0x00686479e62da561ULL, 0x008de5d88f114916ULL)},
-            {FIELD_LITERAL(0x00e37c88d6bba7b1ULL, 0x003e4577e1b8d433ULL,
-                           0x0050d8ea5f510ec0ULL, 0x0042fc9f2da9ef59ULL,
-                           0x003bd074c1141420ULL, 0x00561b8b7b68774eULL,
-                           0x00232e5e5d1013a3ULL, 0x006b7f2cb3d7e73fULL)},
-            {FIELD_LITERAL(0x004bdd0f0b41e6a0ULL, 0x001773057c405d24ULL,
-                           0x006029f99915bd97ULL, 0x006a5ba70a17fe2fULL,
-                           0x0046111977df7e08ULL, 0x004d8124c89fb6b7ULL,
-                           0x00580983b2bb2724ULL, 0x00207bf330d6f3feULL)},
-        }}, {{
-            {FIELD_LITERAL(0x007efdc93972a48bULL, 0x002f5e50e78d5feeULL,
-                           0x0080dc11d61c7fe5ULL, 0x0065aa598707245bULL,
-                           0x009abba2300641beULL, 0x000c68787656543aULL,
-                           0x00ffe0fef2dc0a17ULL, 0x00007ffbd6cb4f3aULL)},
-            {FIELD_LITERAL(0x0036012f2b836efcULL, 0x00458c126d6b5fbcULL,
-                           0x00a34436d719ad1eULL, 0x0097be6167117deaULL,
-                           0x0009c219c879cff3ULL, 0x0065564493e60755ULL,
-                           0x00993ac94a8cdec0ULL, 0x002d4885a4d0dbafULL)},
-            {FIELD_LITERAL(0x00598b60b4c068baULL, 0x00c547a0be7f1afdULL,
-                           0x009582164acf12afULL, 0x00af4acac4fbbe40ULL,
-                           0x005f6ca7c539121aULL, 0x003b6e752ebf9d66ULL,
-                           0x00f08a30d5cac5d4ULL, 0x00e399bb5f97c5a9ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x007445a0409c0a66ULL, 0x00a65c369f3829c0ULL,
-                           0x0031d248a4f74826ULL, 0x006817f34defbe8eULL,
-                           0x00649741d95ebf2eULL, 0x00d46466ab16b397ULL,
-                           0x00fdc35703bee414ULL, 0x00343b43334525f8ULL)},
-            {FIELD_LITERAL(0x001796bea93f6401ULL, 0x00090c5a42e85269ULL,
-                           0x00672412ba1252edULL, 0x001201d47b6de7deULL,
-                           0x006877bccfe66497ULL, 0x00b554fd97a4c161ULL,
-                           0x009753f42dbac3cfULL, 0x00e983e3e378270aULL)},
-            {FIELD_LITERAL(0x00ac3eff18849872ULL, 0x00f0eea3bff05690ULL,
-                           0x00a6d72c21dd505dULL, 0x001b832642424169ULL,
-                           0x00a6813017b540e5ULL, 0x00a744bd71b385cdULL,
-                           0x0022a7d089130a7bULL, 0x004edeec9a133486ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00b2d6729196e8a9ULL, 0x0088a9bb2031cef4ULL,
-                           0x00579e7787dc1567ULL, 0x0030f49feb059190ULL,
-                           0x00a0b1d69c7f7d8fULL, 0x0040bdcc6d9d806fULL,
-                           0x00d76c4037edd095ULL, 0x00bbf24376415dd7ULL)},
-            {FIELD_LITERAL(0x00240465ff5a7197ULL, 0x00bb97e76caf27d0ULL,
-                           0x004b4edbf8116d39ULL, 0x001d8586f708cbaaULL,
-                           0x000f8ee8ff8e4a50ULL, 0x00dde5a1945dd622ULL,
-                           0x00e6fc1c0957e07cULL, 0x0041c9cdabfd88a0ULL)},
-            {FIELD_LITERAL(0x005344b0bf5b548cULL, 0x002957d0b705cc99ULL,
-                           0x00f586a70390553dULL, 0x0075b3229f583cc3ULL,
-                           0x00a1aa78227490e4ULL, 0x001bf09cf7957717ULL,
-                           0x00cf6bf344325f52ULL, 0x0065bd1c23ca3ecfULL)},
-        }}, {{
-            {FIELD_LITERAL(0x009bff3b3239363cULL, 0x00e17368796ef7c0ULL,
-                           0x00528b0fe0971f3aULL, 0x0008014fc8d4a095ULL,
-                           0x00d09f2e8a521ec4ULL, 0x006713ab5dde5987ULL,
-                           0x0003015758e0dbb1ULL, 0x00215999f1ba212dULL)},
-            {FIELD_LITERAL(0x002c88e93527da0eULL, 0x0077c78f3456aad5ULL,
-                           0x0071087a0a389d1cULL, 0x00934dac1fb96dbdULL,
-                           0x008470e801162697ULL, 0x005bc2196cd4ad49ULL,
-                           0x00e535601d5087c3ULL, 0x00769888700f497fULL)},
-            {FIELD_LITERAL(0x00da7a4b557298adULL, 0x0019d2589ea5df76ULL,
-                           0x00ef3e38be0c6497ULL, 0x00a9644e1312609aULL,
-                           0x004592f61b2558daULL, 0x0082c1df510d7e46ULL,
-                           0x0042809a535c0023ULL, 0x00215bcb5afd7757ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x002b9df55a1a4213ULL, 0x00dcfc3b464a26beULL,
-                           0x00c4f9e07a8144d5ULL, 0x00c8e0617a92b602ULL,
-                           0x008e3c93accafae0ULL, 0x00bf1bcb95b2ca60ULL,
-                           0x004ce2426a613bf3ULL, 0x00266cac58e40921ULL)},
-            {FIELD_LITERAL(0x008456d5db76e8f0ULL, 0x0032ca9cab2ce163ULL,
-                           0x0059f2b8bf91abcfULL, 0x0063c2a021712788ULL,
-                           0x00f86155af22f72dULL, 0x00db98b2a6c005a0ULL,
-                           0x00ac6e416a693ac4ULL, 0x007a93572af53226ULL)},
-            {FIELD_LITERAL(0x0087767520f0de22ULL, 0x0091f64012279fb5ULL,
-                           0x001050f1f0644999ULL, 0x004f097a2477ad3cULL,
-                           0x006b37913a9947bdULL, 0x001a3d78645af241ULL,
-                           0x0057832bbb3008a7ULL, 0x002c1d902b80dc20ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x001a6002bf178877ULL, 0x009bce168aa5af50ULL,
-                           0x005fc318ff04a7f5ULL, 0x0052818f55c36461ULL,
-                           0x008768f5d4b24afbULL, 0x0037ffbae7b69c85ULL,
-                           0x0018195a4b61edc0ULL, 0x001e12ea088434b2ULL)},
-            {FIELD_LITERAL(0x0047d3f804e7ab07ULL, 0x00a809ab5f905260ULL,
-                           0x00b3ffc7cdaf306dULL, 0x00746e8ec2d6e509ULL,
-                           0x00d0dade8887a645ULL, 0x00acceeebde0dd37ULL,
-                           0x009bc2579054686bULL, 0x0023804f97f1c2bfULL)},
-            {FIELD_LITERAL(0x0043e2e2e50b80d7ULL, 0x00143aafe4427e0fULL,
-                           0x005594aaecab855bULL, 0x008b12ccaaecbc01ULL,
-                           0x002deeb091082bc3ULL, 0x009cca4be2ae7514ULL,
-                           0x00142b96e696d047ULL, 0x00ad2a2b1c05256aULL)},
-        }}, {{
-            {FIELD_LITERAL(0x003914f2f144b78bULL, 0x007a95dd8bee6f68ULL,
-                           0x00c7f4384d61c8e6ULL, 0x004e51eb60f1bdb2ULL,
-                           0x00f64be7aa4621d8ULL, 0x006797bfec2f0ac0ULL,
-                           0x007d17aab3c75900ULL, 0x001893e73cac8bc5ULL)},
-            {FIELD_LITERAL(0x00140360b768665bULL, 0x00b68aca4967f977ULL,
-                           0x0001089b66195ae4ULL, 0x00fe71122185e725ULL,
-                           0x000bca2618d49637ULL, 0x00a54f0557d7e98aULL,
-                           0x00cdcd2f91d6f417ULL, 0x00ab8c13741fd793ULL)},
-            {FIELD_LITERAL(0x00725ee6b1e549e0ULL, 0x007124a0769777faULL,
-                           0x000b68fdad07ae42ULL, 0x0085b909cd4952dfULL,
-                           0x0092d2e3c81606f4ULL, 0x009f22f6cac099a0ULL,
-                           0x00f59da57f2799a8ULL, 0x00f06c090122f777ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00ce0bed0a3532bcULL, 0x001a5048a22df16bULL,
-                           0x00e31db4cbad8bf1ULL, 0x00e89292120cf00eULL,
-                           0x007d1dd1a9b00034ULL, 0x00e2a9041ff8f680ULL,
-                           0x006a4c837ae596e7ULL, 0x00713af1068070b3ULL)},
-            {FIELD_LITERAL(0x00c4fe64ce66d04bULL, 0x00b095d52e09b3d7ULL,
-                           0x00758bbecb1a3a8eULL, 0x00f35cce8d0650c0ULL,
-                           0x002b878aa5984473ULL, 0x0062e0a3b7544ddcULL,
-                           0x00b25b290ed116feULL, 0x007b0f6abe0bebf2ULL)},
-            {FIELD_LITERAL(0x0081d4e3addae0a8ULL, 0x003410c836c7ffccULL,
-                           0x00c8129ad89e4314ULL, 0x000e3d5a23922dcdULL,
-                           0x00d91e46f29c31f3ULL, 0x006c728cde8c5947ULL,
-                           0x002bc655ba2566c0ULL, 0x002ca94721533108ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x0051e4b3f764d8a9ULL, 0x0019792d46e904a0ULL,
-                           0x00853bc13dbc8227ULL, 0x000840208179f12dULL,
-                           0x0068243474879235ULL, 0x0013856fbfe374d0ULL,
-                           0x00bda12fe8676424ULL, 0x00bbb43635926eb2ULL)},
-            {FIELD_LITERAL(0x0012cdc880a93982ULL, 0x003c495b21cd1b58ULL,
-                           0x00b7e5c93f22a26eULL, 0x0044aa82dfb99458ULL,
-                           0x009ba092cdffe9c0ULL, 0x00a14b3ab2083b73ULL,
-                           0x000271c2f70e1c4bULL, 0x00eea9cac0f66eb8ULL)},
-            {FIELD_LITERAL(0x001a1847c4ac5480ULL, 0x00b1b412935bb03aULL,
-                           0x00f74285983bf2b2ULL, 0x00624138b5b5d0f1ULL,
-                           0x008820c0b03d38bfULL, 0x00b94e50a18c1572ULL,
-                           0x0060f6934841798fULL, 0x00c52f5d66d6ebe2ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00da23d59f9bcea6ULL, 0x00e0f27007a06a4bULL,
-                           0x00128b5b43a6758cULL, 0x000cf50190fa8b56ULL,
-                           0x00fc877aba2b2d72ULL, 0x00623bef52edf53fULL,
-                           0x00e6af6b819669e2ULL, 0x00e314dc34fcaa4fULL)},
-            {FIELD_LITERAL(0x0066e5eddd164d1eULL, 0x00418a7c6fe28238ULL,
-                           0x0002e2f37e962c25ULL, 0x00f01f56b5975306ULL,
-                           0x0048842fa503875cULL, 0x0057b0e968078143ULL,
-                           0x00ff683024f3d134ULL, 0x0082ae28fcad12e4ULL)},
-            {FIELD_LITERAL(0x0011ddfd21260e42ULL, 0x00d05b0319a76892ULL,
-                           0x00183ea4368e9b8fULL, 0x00b0815662affc96ULL,
-                           0x00b466a5e7ce7c88ULL, 0x00db93b07506e6eeULL,
-                           0x0033885f82f62401ULL, 0x0086f9090ec9b419ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00d95d1c5fcb435aULL, 0x0016d1ed6b5086f9ULL,
-                           0x00792aa0b7e54d71ULL, 0x0067b65715f1925dULL,
-                           0x00a219755ec6176bULL, 0x00bc3f026b12c28fULL,
-                           0x00700c897ffeb93eULL, 0x0089b83f6ec50b46ULL)},
-            {FIELD_LITERAL(0x003c97e6384da36eULL, 0x00423d53eac81a09ULL,
-                           0x00b70d68f3cdce35ULL, 0x00ee7959b354b92cULL,
-                           0x00f4e9718819c8caULL, 0x009349f12acbffe9ULL,
-                           0x005aee7b62cb7da6ULL, 0x00d97764154ffc86ULL)},
-            {FIELD_LITERAL(0x00526324babb46dcULL, 0x002ee99b38d7bf9eULL,
-                           0x007ea51794706ef4ULL, 0x00abeb04da6e3c39ULL,
-                           0x006b457c1d281060ULL, 0x00fe243e9a66c793ULL,
-                           0x00378de0fb6c6ee4ULL, 0x003e4194b9c3cb93ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00fed3cd80ca2292ULL, 0x0015b043a73ca613ULL,
-                           0x000a9fd7bf9be227ULL, 0x003b5e03de2db983ULL,
-                           0x005af72d46904ef7ULL, 0x00c0f1b5c49faa99ULL,
-                           0x00dc86fc3bd305e1ULL, 0x00c92f08c1cb1797ULL)},
-            {FIELD_LITERAL(0x0079680ce111ed3bULL, 0x001a1ed82806122cULL,
-                           0x000c2e7466d15df3ULL, 0x002c407f6f7150fdULL,
-                           0x00c5e7c96b1b0ce3ULL, 0x009aa44626863ff9ULL,
-                           0x00887b8b5b80be42ULL, 0x00b6023cec964825ULL)},
-            {FIELD_LITERAL(0x00e4a8e1048970c8ULL, 0x0062887b7830a302ULL,
-                           0x00bcf1c8cd81402bULL, 0x0056dbb81a68f5beULL,
-                           0x0014eced83f12452ULL, 0x00139e1a510150dfULL,
-                           0x00bb81140a82d1a3ULL, 0x000febcc1aaf1aa7ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00a7527958238159ULL, 0x0013ec9537a84cd6ULL,
-                           0x001d7fee7d562525ULL, 0x00b9eefa6191d5e5ULL,
-                           0x00dbc97db70bcb8aULL, 0x00481affc7a4d395ULL,
-                           0x006f73d3e70c31bbULL, 0x00183f324ed96a61ULL)},
-            {FIELD_LITERAL(0x0039dd7ce7fc6860ULL, 0x00d64f6425653da1ULL,
-                           0x003e037c7f57d0afULL, 0x0063477a06e2bcf2ULL,
-                           0x001727dbb7ac67e6ULL, 0x0049589f5efafe2eULL,
-                           0x00fc0fef2e813d54ULL, 0x008baa5d087fb50dULL)},
-            {FIELD_LITERAL(0x0024fb59d9b457c7ULL, 0x00a7d4e060223e4cULL,
-                           0x00c118d1b555fd80ULL, 0x0082e216c732f22aULL,
-                           0x00cd2a2993089504ULL, 0x003638e836a3e13dULL,
-                           0x000d855ee89b4729ULL, 0x008ec5b7d4810c91ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x001bf51f7d65cdfdULL, 0x00d14cdafa16a97dULL,
-                           0x002c38e60fcd10e7ULL, 0x00a27446e393efbdULL,
-                           0x000b5d8946a71fddULL, 0x0063df2cde128f2fULL,
-                           0x006c8679569b1888ULL, 0x0059ffc4925d732dULL)},
-            {FIELD_LITERAL(0x00ece96f95f2b66fULL, 0x00ece7952813a27bULL,
-                           0x0026fc36592e489eULL, 0x007157d1a2de0f66ULL,
-                           0x00759dc111d86ddfULL, 0x0012881e5780bb0fULL,
-                           0x00c8ccc83ad29496ULL, 0x0012b9bd1929eb71ULL)},
-            {FIELD_LITERAL(0x000fa15a20da5df0ULL, 0x00349ddb1a46cd31ULL,
-                           0x002c512ad1d8e726ULL, 0x00047611f669318dULL,
-                           0x009e68fba591e17eULL, 0x004320dffa803906ULL,
-                           0x00a640874951a3d3ULL, 0x00b6353478baa24fULL)},
-        }}, {{
-            {FIELD_LITERAL(0x009696510000d333ULL, 0x00ec2f788bc04826ULL,
-                           0x000e4d02b1f67ba5ULL, 0x00659aa8dace08b6ULL,
-                           0x00d7a38a3a3ae533ULL, 0x008856defa8c746bULL,
-                           0x004d7a4402d3da1aULL, 0x00ea82e06229260fULL)},
-            {FIELD_LITERAL(0x006a15bb20f75c0cULL, 0x0079a144027a5d0cULL,
-                           0x00d19116ce0b4d70ULL, 0x0059b83bcb0b268eULL,
-                           0x005f58f63f16c127ULL, 0x0079958318ee2c37ULL,
-                           0x00defbb063d07f82ULL, 0x00f1f0b931d2d446ULL)},
-            {FIELD_LITERAL(0x00cb5e4c3c35d422ULL, 0x008df885ca43577fULL,
-                           0x00fa50b16ca3e471ULL, 0x005a0e58e17488c8ULL,
-                           0x00b2ceccd6d34d19ULL, 0x00f01d5d235e36e9ULL,
-                           0x00db2e7e4be6ca44ULL, 0x00260ab77f35fccdULL)},
-        }}, {{
-            {FIELD_LITERAL(0x006f6fd9baac61d5ULL, 0x002a7710a020a895ULL,
-                           0x009de0db7fc03d4dULL, 0x00cdedcb1875f40bULL,
-                           0x00050caf9b6b1e22ULL, 0x005e3a6654456ab0ULL,
-                           0x00775fdf8c4423d4ULL, 0x0028701ea5738b5dULL)},
-            {FIELD_LITERAL(0x009ffd90abfeae96ULL, 0x00cba3c2b624a516ULL,
-                           0x005ef08bcee46c91ULL, 0x00e6fde30afb6185ULL,
-                           0x00f0b4db4f818ce4ULL, 0x006c54f45d2127f5ULL,
-                           0x00040125035854c7ULL, 0x00372658a3287e13ULL)},
-            {FIELD_LITERAL(0x00d7070fb1beb2abULL, 0x0078fc845a93896bULL,
-                           0x006894a4b2f224a6ULL, 0x005bdd8192b9dbdeULL,
-                           0x00b38839874b3a9eULL, 0x00f93618b04b7a57ULL,
-                           0x003e3ec75fd2c67eULL, 0x00bf5e6bfc29494aULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00f19224ebba2aa5ULL, 0x0074f89d358e694dULL,
-                           0x00eea486597135adULL, 0x0081579a4555c7e1ULL,
-                           0x0010b9b872930a9dULL, 0x00f002e87a30ecc0ULL,
-                           0x009b9d66b6de56e2ULL, 0x00a3c4f45e8004ebULL)},
-            {FIELD_LITERAL(0x0045e8dda9400888ULL, 0x002ff12e5fc05db7ULL,
-                           0x00a7098d54afe69cULL, 0x00cdbe846a500585ULL,
-                           0x00879c1593ca1882ULL, 0x003f7a7fea76c8b0ULL,
-                           0x002cd73dd0c8e0a1ULL, 0x00645d6ce96f51feULL)},
-            {FIELD_LITERAL(0x002b7e83e123d6d6ULL, 0x00398346f7419c80ULL,
-                           0x0042922e55940163ULL, 0x005e7fc5601886a3ULL,
-                           0x00e88f2cee1d3103ULL, 0x00e7fab135f2e377ULL,
-                           0x00b059984dbf0dedULL, 0x0009ce080faa5bb8ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x0085e78af7758979ULL, 0x00275a4ee1631a3aULL,
-                           0x00d26bc0ed78b683ULL, 0x004f8355ea21064fULL,
-                           0x00d618e1a32696e5ULL, 0x008d8d7b150e5680ULL,
-                           0x00a74cd854b278d2ULL, 0x001dd62702203ea0ULL)},
-            {FIELD_LITERAL(0x00f89335c2a59286ULL, 0x00a0f5c905d55141ULL,
-                           0x00b41fb836ee9382ULL, 0x00e235d51730ca43ULL,
-                           0x00a5cb37b5c0a69aULL, 0x009b966ffe136c45ULL,
-                           0x00cb2ea10bf80ed1ULL, 0x00fb2b370b40dc35ULL)},
-            {FIELD_LITERAL(0x00d687d16d4ee8baULL, 0x0071520bdd069dffULL,
-                           0x00de85c60d32355dULL, 0x0087d2e3565102f4ULL,
-                           0x00cde391b8dfc9aaULL, 0x00e18d69efdfefe5ULL,
-                           0x004a9d0591954e91ULL, 0x00fa36dd8b50eee5ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x002e788749a865f7ULL, 0x006e4dc3116861eaULL,
-                           0x009f1428c37276e6ULL, 0x00e7d2e0fc1e1226ULL,
-                           0x003aeebc6b6c45f6ULL, 0x0071a8073bf500c9ULL,
-                           0x004b22ad986b530cULL, 0x00f439e63c0d79d4ULL)},
-            {FIELD_LITERAL(0x006bc3d53011f470ULL, 0x00032d6e692b83e8ULL,
-                           0x00059722f497cd0bULL, 0x0009b4e6f0c497ccULL,
-                           0x0058a804b7cce6c0ULL, 0x002b71d3302bbd5dULL,
-                           0x00e2f82a36765fceULL, 0x008dded99524c703ULL)},
-            {FIELD_LITERAL(0x004d058953747d64ULL, 0x00701940fe79aa6fULL,
-                           0x00a620ac71c760bfULL, 0x009532b611158b75ULL,
-                           0x00547ed7f466f300ULL, 0x003cb5ab53a8401aULL,
-                           0x00c7763168ce3120ULL, 0x007e48e33e4b9ab2ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x001b2fc57bf3c738ULL, 0x006a3f918993fb80ULL,
-                           0x0026f7a14fdec288ULL, 0x0075a2cdccef08dbULL,
-                           0x00d3ecbc9eecdbf1ULL, 0x0048c40f06e5bf7fULL,
-                           0x00d63e423009896bULL, 0x000598bc99c056a8ULL)},
-            {FIELD_LITERAL(0x002f194eaafa46dcULL, 0x008e38f57fe87613ULL,
-                           0x00dc8e5ae25f4ab2ULL, 0x000a17809575e6bdULL,
-                           0x00d3ec7923ba366aULL, 0x003a7e72e0ad75e3ULL,
-                           0x0010024b88436e0aULL, 0x00ed3c5444b64051ULL)},
-            {FIELD_LITERAL(0x00831fc1340af342ULL, 0x00c9645669466d35ULL,
-                           0x007692b4cc5a080fULL, 0x009fd4a47ac9259fULL,
-                           0x001eeddf7d45928bULL, 0x003c0446fc45f28bULL,
-                           0x002c0713aa3e2507ULL, 0x0095706935f0f41eULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00766ae4190ec6d8ULL, 0x0065768cabc71380ULL,
-                           0x00b902598416cdc2ULL, 0x00380021ad38df52ULL,
-                           0x008f0b89d6551134ULL, 0x004254d4cc62c5a5ULL,
-                           0x000d79f4484b9b94ULL, 0x00b516732ae3c50eULL)},
-            {FIELD_LITERAL(0x001fb73475c45509ULL, 0x00d2b2e5ea43345aULL,
-                           0x00cb3c3842077bd1ULL, 0x0029f90ad820946eULL,
-                           0x007c11b2380778aaULL, 0x009e54ece62c1704ULL,
-                           0x004bc60c41ca01c3ULL, 0x004525679a5a0b03ULL)},
-            {FIELD_LITERAL(0x00c64fbddbed87b3ULL, 0x0040601d11731faaULL,
-                           0x009c22475b6f9d67ULL, 0x0024b79dae875f15ULL,
-                           0x00616fed3f02c3b0ULL, 0x0000cf39f6af2d3bULL,
-                           0x00c46bac0aa9a688ULL, 0x00ab23e2800da204ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x000b3a37617632b0ULL, 0x00597199fe1cfb6cULL,
-                           0x0042a7ccdfeafdd6ULL, 0x004cc9f15ebcea17ULL,
-                           0x00f436e596a6b4a4ULL, 0x00168861142df0d8ULL,
-                           0x000753edfec26af5ULL, 0x000c495d7e388116ULL)},
-            {FIELD_LITERAL(0x0017085f4a346148ULL, 0x00c7cf7a37f62272ULL,
-                           0x001776e129bc5c30ULL, 0x009955134c9eef2aULL,
-                           0x001ba5bdf1df07beULL, 0x00ec39497103a55cULL,
-                           0x006578354fda6cfbULL, 0x005f02719d4f15eeULL)},
-            {FIELD_LITERAL(0x0052b9d9b5d9655dULL, 0x00d4ec7ba1b461c3ULL,
-                           0x00f95df4974f280bULL, 0x003d8e5ca11aeb51ULL,
-                           0x00d4981eb5a70b26ULL, 0x000af9a4f6659f29ULL,
-                           0x004598c846faeb43ULL, 0x0049d9a183a47670ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x000a72d23dcb3f1fULL, 0x00a3737f84011727ULL,
-                           0x00f870c0fbbf4a47ULL, 0x00a7aadd04b5c9caULL,
-                           0x000c7715c67bd072ULL, 0x00015a136afcd74eULL,
-                           0x0080d5caea499634ULL, 0x0026b448ec7514b7ULL)},
-            {FIELD_LITERAL(0x00b60167d9e7d065ULL, 0x00e60ba0d07381e8ULL,
-                           0x003a4f17b725c2d4ULL, 0x006c19fe176b64faULL,
-                           0x003b57b31af86ccbULL, 0x0021047c286180fdULL,
-                           0x00bdc8fb00c6dbb6ULL, 0x00fe4a9f4bab4f3fULL)},
-            {FIELD_LITERAL(0x0088ffc3a16111f7ULL, 0x009155e4245d0bc8ULL,
-                           0x00851d68220572d5ULL, 0x00557ace1e514d29ULL,
-                           0x0031d7c339d91022ULL, 0x00101d0ae2eaceeaULL,
-                           0x00246ab3f837b66aULL, 0x00d5216d381ff530ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x0057e7ea35f36daeULL, 0x00f47d7ad15de22eULL,
-                           0x00d757ea4b105115ULL, 0x008311457d579d7eULL,
-                           0x00b49b75b1edd4ebULL, 0x0081c7ff742fd63aULL,
-                           0x00ddda3187433df6ULL, 0x00475727d55f9c66ULL)},
-            {FIELD_LITERAL(0x00a6295218dc136aULL, 0x00563b3af0e9c012ULL,
-                           0x00d3753b0145db1bULL, 0x004550389c043dc1ULL,
-                           0x00ea94ae27401bdfULL, 0x002b0b949f2b7956ULL,
-                           0x00c63f780ad8e23cULL, 0x00e591c47d6bab15ULL)},
-            {FIELD_LITERAL(0x00416c582b058eb6ULL, 0x004107da5b2cc695ULL,
-                           0x00b3cd2556aeec64ULL, 0x00c0b418267e57a1ULL,
-                           0x001799293579bd2eULL, 0x0046ed44590e4d07ULL,
-                           0x001d7459b3630a1eULL, 0x00c6afba8b6696aaULL)},
-        }}, {{
-            {FIELD_LITERAL(0x008d6009b26da3f8ULL, 0x00898e88ca06b1caULL,
-                           0x00edb22b2ed7fe62ULL, 0x00fbc93516aabe80ULL,
-                           0x008b4b470c42ce0dULL, 0x00e0032ba7d0dcbbULL,
-                           0x00d76da3a956ecc8ULL, 0x007f20fe74e3852aULL)},
-            {FIELD_LITERAL(0x002419222c607674ULL, 0x00a7f23af89188b3ULL,
-                           0x00ad127284e73d1cULL, 0x008bba582fae1c51ULL,
-                           0x00fc6aa7ca9ecab1ULL, 0x003df5319eb6c2baULL,
-                           0x002a05af8a8b199aULL, 0x004bf8354558407cULL)},
-            {FIELD_LITERAL(0x00ce7d4a30f0fcbfULL, 0x00d02c272629f03dULL,
-                           0x0048c001f7400bc2ULL, 0x002c21368011958dULL,
-                           0x0098a550391e96b5ULL, 0x002d80b66390f379ULL,
-                           0x001fa878760cc785ULL, 0x001adfce54b613d5ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x001ed4dc71fa2523ULL, 0x005d0bff19bf9b5cULL,
-                           0x00c3801cee065a64ULL, 0x001ed0b504323fbfULL,
-                           0x0003ab9fdcbbc593ULL, 0x00df82070178b8d2ULL,
-                           0x00a2bcaa9c251f85ULL, 0x00c628a3674bd02eULL)},
-            {FIELD_LITERAL(0x006b7a0674f9f8deULL, 0x00a742414e5c7cffULL,
-                           0x0041cbf3c6e13221ULL, 0x00e3a64fd207af24ULL,
-                           0x0087c05f15fbe8d1ULL, 0x004c50936d9e8a33ULL,
-                           0x001306ec21042b6dULL, 0x00a4f4137d1141c2ULL)},
-            {FIELD_LITERAL(0x0009e6fb921568b0ULL, 0x00b3c60120219118ULL,
-                           0x002a6c3460dd503aULL, 0x009db1ef11654b54ULL,
-                           0x0063e4bf0be79601ULL, 0x00670d34bb2592b9ULL,
-                           0x00dcee2f6c4130ceULL, 0x00b2682e88e77f54ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x000d5b4b3da135abULL, 0x00838f3e5064d81dULL,
-                           0x00d44eb50f6d94edULL, 0x0008931ab502ac6dULL,
-                           0x00debe01ca3d3586ULL, 0x0025c206775f0641ULL,
-                           0x005ad4b6ae912763ULL, 0x007e2c318ad8f247ULL)},
-            {FIELD_LITERAL(0x00ddbe0750dd1addULL, 0x004b3c7b885844b8ULL,
-                           0x00363e7ecf12f1aeULL, 0x0062e953e6438f9dULL,
-                           0x0023cc73b076afe9ULL, 0x00b09fa083b4da32ULL,
-                           0x00c7c3d2456c541dULL, 0x005b591ec6b694d4ULL)},
-            {FIELD_LITERAL(0x0028656e19d62fcfULL, 0x0052a4af03df148dULL,
-                           0x00122765ddd14e42ULL, 0x00f2252904f67157ULL,
-                           0x004741965b636f3aULL, 0x006441d296132cb9ULL,
-                           0x005e2106f956a5b7ULL, 0x00247029592d335cULL)},
-        }}, {{
-            {FIELD_LITERAL(0x003fe038eb92f894ULL, 0x000e6da1b72e8e32ULL,
-                           0x003a1411bfcbe0faULL, 0x00b55d473164a9e4ULL,
-                           0x00b9a775ac2df48dULL, 0x0002ddf350659e21ULL,
-                           0x00a279a69eb19cb3ULL, 0x00f844eab25cba44ULL)},
-            {FIELD_LITERAL(0x00c41d1f9c1f1ac1ULL, 0x007b2df4e9f19146ULL,
-                           0x00b469355fd5ba7aULL, 0x00b5e1965afc852aULL,
-                           0x00388d5f1e2d8217ULL, 0x0022079e4c09ae93ULL,
-                           0x0014268acd4ef518ULL, 0x00c1dd8d9640464cULL)},
-            {FIELD_LITERAL(0x0038526adeed0c55ULL, 0x00dd68c607e3fe85ULL,
-                           0x00f746ddd48a5d57ULL, 0x0042f2952b963b7cULL,
-                           0x001cbbd6876d5ec2ULL, 0x005e341470bca5c2ULL,
-                           0x00871d41e085f413ULL, 0x00e53ab098f45732ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x004d51124797c831ULL, 0x008f5ae3750347adULL,
-                           0x0070ced94c1a0c8eULL, 0x00f6db2043898e64ULL,
-                           0x000d00c9a5750cd0ULL, 0x000741ec59bad712ULL,
-                           0x003c9d11aab37b7fULL, 0x00a67ba169807714ULL)},
-            {FIELD_LITERAL(0x00adb2c1566e8b8fULL, 0x0096c68a35771a9aULL,
-                           0x00869933356f334aULL, 0x00ba9c93459f5962ULL,
-                           0x009ec73fb6e8ca4bULL, 0x003c3802c27202e1ULL,
-                           0x0031f5b733e0c008ULL, 0x00f9058c19611fa9ULL)},
-            {FIELD_LITERAL(0x00238f01814a3421ULL, 0x00c325a44b6cce28ULL,
-                           0x002136f97aeb0e73ULL, 0x000cac8268a4afe2ULL,
-                           0x0022fd218da471b3ULL, 0x009dcd8dfff8def9ULL,
-                           0x00cb9f8181d999bbULL, 0x00143ae56edea349ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x0000623bf87622c5ULL, 0x00a1966fdd069496ULL,
-                           0x00c315b7b812f9fcULL, 0x00bdf5efcd128b97ULL,
-                           0x001d464f532e3e16ULL, 0x003cd94f081bfd7eULL,
-                           0x00ed9dae12ce4009ULL, 0x002756f5736eee70ULL)},
-            {FIELD_LITERAL(0x00a5187e6ee7341bULL, 0x00e6d52e82d83b6eULL,
-                           0x00df3c41323094a7ULL, 0x00b3324f444e9de9ULL,
-                           0x00689eb21a35bfe5ULL, 0x00f16363becd548dULL,
-                           0x00e187cc98e7f60fULL, 0x00127d9062f0ccabULL)},
-            {FIELD_LITERAL(0x004ad71b31c29e40ULL, 0x00a5fcace12fae29ULL,
-                           0x004425b5597280edULL, 0x00e7ef5d716c3346ULL,
-                           0x0010b53ada410ac8ULL, 0x0092310226060c9bULL,
-                           0x0091c26128729c7eULL, 0x0088b42900f8ec3bULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00f1e26e9762d4a8ULL, 0x00d9d74082183414ULL,
-                           0x00ffec9bd57a0282ULL, 0x000919e128fd497aULL,
-                           0x00ab7ae7d00fe5f8ULL, 0x0054dc442851ff68ULL,
-                           0x00c9ebeb3b861687ULL, 0x00507f7cab8b698fULL)},
-            {FIELD_LITERAL(0x00c13c5aae3ae341ULL, 0x009c6c9ed98373e7ULL,
-                           0x00098f26864577a8ULL, 0x0015b886e9488b45ULL,
-                           0x0037692c42aadba5ULL, 0x00b83170b8e7791cULL,
-                           0x001670952ece1b44ULL, 0x00fd932a39276da2ULL)},
-            {FIELD_LITERAL(0x0081a3259bef3398ULL, 0x005480fff416107bULL,
-                           0x00ce4f607d21be98ULL, 0x003ffc084b41df9bULL,
-                           0x0043d0bb100502d1ULL, 0x00ec35f575ba3261ULL,
-                           0x00ca18f677300ef3ULL, 0x00e8bb0a827d8548ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00df76b3328ada72ULL, 0x002e20621604a7c2ULL,
-                           0x00f910638a105b09ULL, 0x00ef4724d96ef2cdULL,
-                           0x00377d83d6b8a2f7ULL, 0x00b4f48805ade324ULL,
-                           0x001cd5da8b152018ULL, 0x0045af671a20ca7fULL)},
-            {FIELD_LITERAL(0x009ae3b93a56c404ULL, 0x004a410b7a456699ULL,
-                           0x00023a619355e6b2ULL, 0x009cdc7297387257ULL,
-                           0x0055b94d4ae70d04ULL, 0x002cbd607f65b005ULL,
-                           0x003208b489697166ULL, 0x00ea2aa058867370ULL)},
-            {FIELD_LITERAL(0x00f29d2598ee3f32ULL, 0x00b4ac5385d82adcULL,
-                           0x007633eaf04df19bULL, 0x00aa2d3d77ceab01ULL,
-                           0x004a2302fcbb778aULL, 0x00927f225d5afa34ULL,
-                           0x004a8e9d5047f237ULL, 0x008224ae9dbce530ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x001cf640859b02f8ULL, 0x00758d1d5d5ce427ULL,
-                           0x00763c784ef4604cULL, 0x005fa81aee205270ULL,
-                           0x00ac537bfdfc44cbULL, 0x004b919bd342d670ULL,
-                           0x00238508d9bf4b7aULL, 0x00154888795644f3ULL)},
-            {FIELD_LITERAL(0x00c845923c084294ULL, 0x00072419a201bc25ULL,
-                           0x0045f408b5f8e669ULL, 0x00e9d6a186b74dfeULL,
-                           0x00e19108c68fa075ULL, 0x0017b91d874177b7ULL,
-                           0x002f0ca2c7912c5aULL, 0x009400aa385a90a2ULL)},
-            {FIELD_LITERAL(0x0071110b01482184ULL, 0x00cfed0044f2bef8ULL,
-                           0x0034f2901cf4662eULL, 0x003b4ae2a67f9834ULL,
-                           0x00cca9b96fe94810ULL, 0x00522507ae77abd0ULL,
-                           0x00bac7422721e73eULL, 0x0066622b0f3a62b0ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00f8ac5cf4705b6aULL, 0x00867d82dcb457e3ULL,
-                           0x007e13ab2ccc2ce9ULL, 0x009ee9a018d3930eULL,
-                           0x008370f8ecb42df8ULL, 0x002d9f019add263eULL,
-                           0x003302385b92d196ULL, 0x00a15654536e2c0cULL)},
-            {FIELD_LITERAL(0x0026ef1614e160afULL, 0x00c023f9edfc9c76ULL,
-                           0x00cff090da5f57baULL, 0x0076db7a66643ae9ULL,
-                           0x0019462f8c646999ULL, 0x008fec00b3854b22ULL,
-                           0x00d55041692a0a1cULL, 0x0065db894215ca00ULL)},
-            {FIELD_LITERAL(0x00a925036e0a451cULL, 0x002a0390c36b6cc1ULL,
-                           0x00f27020d90894f4ULL, 0x008d90d52cbd3d7fULL,
-                           0x00e1d0137392f3b8ULL, 0x00f017c158b51a8fULL,
-                           0x00cac313d3ed7dbcULL, 0x00b99a81e3eb42d3ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00b54850275fe626ULL, 0x0053a3fd1ec71140ULL,
-                           0x00e3d2d7dbe096faULL, 0x00e4ac7b595cce4cULL,
-                           0x0077bad449c0a494ULL, 0x00b7c98814afd5b3ULL,
-                           0x0057226f58486cf9ULL, 0x00b1557154f0cc57ULL)},
-            {FIELD_LITERAL(0x008cc9cd236315c0ULL, 0x0031d9c5b39fda54ULL,
-                           0x00a5713ef37e1171ULL, 0x00293d5ae2886325ULL,
-                           0x00c4aba3e05015e1ULL, 0x0003f35ef78e4fc6ULL,
-                           0x0039d6bd3ac1527bULL, 0x0019d7c3afb77106ULL)},
-            {FIELD_LITERAL(0x007b162931a985afULL, 0x00ad40a2e0daa713ULL,
-                           0x006df27c4009f118ULL, 0x00503e9f4e2e8becULL,
-                           0x00751a77c82c182dULL, 0x000298937769245bULL,
-                           0x00ffb1e8fabf9ee5ULL, 0x0008334706e09abeULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00dbca4e98a7dcd9ULL, 0x00ee29cfc78bde99ULL,
-                           0x00e4a3b6995f52e9ULL, 0x0045d70189ae8096ULL,
-                           0x00fd2a8a3b9b0d1bULL, 0x00af1793b107d8e1ULL,
-                           0x00dbf92cbe4afa20ULL, 0x00da60f798e3681dULL)},
-            {FIELD_LITERAL(0x004246bfcecc627aULL, 0x004ba431246c03a4ULL,
-                           0x00bd1d101872d497ULL, 0x003b73d3f185ee16ULL,
-                           0x001feb2e2678c0e3ULL, 0x00ff13c5a89dec76ULL,
-                           0x00ed06042e771d8fULL, 0x00a4fd2a897a83ddULL)},
-            {FIELD_LITERAL(0x009a4a3be50d6597ULL, 0x00de3165fc5a1096ULL,
-                           0x004f3f56e345b0c7ULL, 0x00f7bf721d5ab8bcULL,
-                           0x004313e47b098c50ULL, 0x00e4c7d5c0e1adbbULL,
-                           0x002e3e3db365051eULL, 0x00a480c2cd6a96fbULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00417fa30a7119edULL, 0x00af257758419751ULL,
-                           0x00d358a487b463d4ULL, 0x0089703cc720b00dULL,
-                           0x00ce56314ff7f271ULL, 0x0064db171ade62c1ULL,
-                           0x00640b36d4a22fedULL, 0x00424eb88696d23fULL)},
-            {FIELD_LITERAL(0x004ede34af2813f3ULL, 0x00d4a8e11c9e8216ULL,
-                           0x004796d5041de8a5ULL, 0x00c4c6b4d21cc987ULL,
-                           0x00e8a433ee07fa1eULL, 0x0055720b5abcc5a1ULL,
-                           0x008873ea9c74b080ULL, 0x005b3fec1ab65d48ULL)},
-            {FIELD_LITERAL(0x0047e5277db70ec5ULL, 0x000a096c66db7d6bULL,
-                           0x00b4164cc1730159ULL, 0x004a9f783fe720feULL,
-                           0x00a8177b94449dbcULL, 0x0095a24ff49a599fULL,
-                           0x0069c1c578250cbcULL, 0x00452019213debf4ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x0021ce99e09ebda3ULL, 0x00fcbd9f91875ad0ULL,
-                           0x009bbf6b7b7a0b5fULL, 0x00388886a69b1940ULL,
-                           0x00926a56d0f81f12ULL, 0x00e12903c3358d46ULL,
-                           0x005dfce4e8e1ce9dULL, 0x0044cfa94e2f7e23ULL)},
-            {FIELD_LITERAL(0x001bd59c09e982eaULL, 0x00f72daeb937b289ULL,
-                           0x0018b76dca908e0eULL, 0x00edb498512384adULL,
-                           0x00ce0243b6cc9538ULL, 0x00f96ff690cb4e70ULL,
-                           0x007c77bf9f673c8dULL, 0x005bf704c088a528ULL)},
-            {FIELD_LITERAL(0x0093d4628dcb33beULL, 0x0095263d51d42582ULL,
-                           0x0049b3222458fe06ULL, 0x00e7fce73b653a7fULL,
-                           0x003ca2ebce60b369ULL, 0x00c5de239a32bea4ULL,
-                           0x0063b8b3d71fb6bfULL, 0x0039aeeb78a1a839ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x007dc52da400336cULL, 0x001fded1e15b9457ULL,
-                           0x00902e00f5568e3aULL, 0x00219bef40456d2dULL,
-                           0x005684161fb3dbc9ULL, 0x004a4e9be49a76eaULL,
-                           0x006e685ae88b78ffULL, 0x0021c42f13042d3cULL)},
-            {FIELD_LITERAL(0x00fb22bb5fd3ce50ULL, 0x0017b48aada7ae54ULL,
-                           0x00fd5c44ad19a536ULL, 0x000ccc4e4e55e45cULL,
-                           0x00fd637d45b4c3f5ULL, 0x0038914e023c37cfULL,
-                           0x00ac1881d6a8d898ULL, 0x00611ed8d3d943a8ULL)},
-            {FIELD_LITERAL(0x0056e2259d113d2bULL, 0x00594819b284ec16ULL,
-                           0x00c7bf794bb36696ULL, 0x00721ee75097cdc6ULL,
-                           0x00f71be9047a2892ULL, 0x00df6ba142564edfULL,
-                           0x0069580b7a184e8dULL, 0x00f056e38fca0feeULL)},
-        }}, {{
-            {FIELD_LITERAL(0x009df98566a18c6dULL, 0x00cf3a200968f219ULL,
-                           0x0044ba60da6d9086ULL, 0x00dbc9c0e344da03ULL,
-                           0x000f9401c4466855ULL, 0x00d46a57c5b0a8d1ULL,
-                           0x00875a635d7ac7c6ULL, 0x00ef4a933b7e0ae6ULL)},
-            {FIELD_LITERAL(0x005e8694077a1535ULL, 0x008bef75f71c8f1dULL,
-                           0x000a7c1316423511ULL, 0x00906e1d70604320ULL,
-                           0x003fc46c1a2ffbd6ULL, 0x00d1d5022e68f360ULL,
-                           0x002515fba37bbf46ULL, 0x00ca16234e023b44ULL)},
-            {FIELD_LITERAL(0x00787c99561f4690ULL, 0x00a857a8c1561f27ULL,
-                           0x00a10df9223c09feULL, 0x00b98a9562e3b154ULL,
-                           0x004330b8744c3ed2ULL, 0x00e06812807ec5c4ULL,
-                           0x00e4cf6a7db9f1e3ULL, 0x00d95b089f132a34ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x002922b39ca33eecULL, 0x0090d12a5f3ab194ULL,
-                           0x00ab60c02fb5f8edULL, 0x00188d292abba1cfULL,
-                           0x00e10edec9698f6eULL, 0x0069a4d9934133c8ULL,
-                           0x0024aac40e6d3d06ULL, 0x001702c2177661b0ULL)},
-            {FIELD_LITERAL(0x00139078397030bdULL, 0x000e3c447e859a00ULL,
-                           0x0064a5b334c82393ULL, 0x00b8aabeb7358093ULL,
-                           0x00020778bb9ae73bULL, 0x0032ee94c7892a18ULL,
-                           0x008215253cb41bdaULL, 0x005e2797593517aeULL)},
-            {FIELD_LITERAL(0x0083765a5f855d4aULL, 0x0051b6d1351b8ee2ULL,
-                           0x00116de548b0f7bbULL, 0x0087bd88703affa0ULL,
-                           0x0095b2cc34d7fdd2ULL, 0x0084cd81b53f0bc8ULL,
-                           0x008562fc995350edULL, 0x00a39abb193651e3ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x0019e23f0474b114ULL, 0x00eb94c2ad3b437eULL,
-                           0x006ddb34683b75acULL, 0x00391f9209b564c6ULL,
-                           0x00083b3bb3bff7aaULL, 0x00eedcd0f6dceefcULL,
-                           0x00b50817f794fe01ULL, 0x0036474deaaa75c9ULL)},
-            {FIELD_LITERAL(0x0091868594265aa2ULL, 0x00797accae98ca6dULL,
-                           0x0008d8c5f0f8a184ULL, 0x00d1f4f1c2b2fe6eULL,
-                           0x0036783dfb48a006ULL, 0x008c165120503527ULL,
-                           0x0025fd780058ce9bULL, 0x0068beb007be7d27ULL)},
-            {FIELD_LITERAL(0x00d0ff88aa7c90c2ULL, 0x00b2c60dacf53394ULL,
-                           0x0094a7284d9666d6ULL, 0x00bed9022ce7a19dULL,
-                           0x00c51553f0cd7682ULL, 0x00c3fb870b124992ULL,
-                           0x008d0bc539956c9bULL, 0x00fc8cf258bb8885ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x003667bf998406f8ULL, 0x0000115c43a12975ULL,
-                           0x001e662f3b20e8fdULL, 0x0019ffa534cb24ebULL,
-                           0x00016be0dc8efb45ULL, 0x00ff76a8b26243f5ULL,
-                           0x00ae20d241a541e3ULL, 0x0069bd6af13cd430ULL)},
-            {FIELD_LITERAL(0x0045fdc16487cda3ULL, 0x00b2d8e844cf2ed7ULL,
-                           0x00612c50e88c1607ULL, 0x00a08aabc66c1672ULL,
-                           0x006031fdcbb24d97ULL, 0x001b639525744b93ULL,
-                           0x004409d62639ab17ULL, 0x00a1853d0347ab1dULL)},
-            {FIELD_LITERAL(0x0075a1a56ebf5c21ULL, 0x00a3e72be9ac53edULL,
-                           0x00efcde1629170c2ULL, 0x0004225fe91ef535ULL,
-                           0x0088049fc73dfda7ULL, 0x004abc74857e1288ULL,
-                           0x0024e2434657317cULL, 0x00d98cb3d3e5543cULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00b4b53eab6bdb19ULL, 0x009b22d8b43711d0ULL,
-                           0x00d948b9d961785dULL, 0x00cb167b6f279eadULL,
-                           0x00191de3a678e1c9ULL, 0x00d9dd9511095c2eULL,
-                           0x00f284324cd43067ULL, 0x00ed74fa535151ddULL)},
-            {FIELD_LITERAL(0x007e32c049b5c477ULL, 0x009d2bfdbd9bcfd8ULL,
-                           0x00636e93045938c6ULL, 0x007fde4af7687298ULL,
-                           0x0046a5184fafa5d3ULL, 0x0079b1e7f13a359bULL,
-                           0x00875adf1fb927d6ULL, 0x00333e21c61bcad2ULL)},
-            {FIELD_LITERAL(0x00048014f73d8b8dULL, 0x0075684aa0966388ULL,
-                           0x0092be7df06dc47cULL, 0x0097cebcd0f5568aULL,
-                           0x005a7004d9c4c6a9ULL, 0x00b0ecbb659924c7ULL,
-                           0x00d90332dd492a7cULL, 0x0057fc14df11493dULL)},
-        }}, {{
-            {FIELD_LITERAL(0x0008ed8ea0ad95beULL, 0x0041d324b9709645ULL,
-                           0x00e25412257a19b4ULL, 0x0058df9f3423d8d2ULL,
-                           0x00a9ab20def71304ULL, 0x009ae0dbf8ac4a81ULL,
-                           0x00c9565977e4392aULL, 0x003c9269444baf55ULL)},
-            {FIELD_LITERAL(0x007df6cbb926830bULL, 0x00d336058ae37865ULL,
-                           0x007af47dac696423ULL, 0x0048d3011ec64ac8ULL,
-                           0x006b87666e40049fULL, 0x0036a2e0e51303d7ULL,
-                           0x00ba319bd79dbc55ULL, 0x003e2737ecc94f53ULL)},
-            {FIELD_LITERAL(0x00d296ff726272d9ULL, 0x00f6d097928fcf57ULL,
-                           0x00e0e616a55d7013ULL, 0x00deaf454ed9eac7ULL,
-                           0x0073a56bedef4d92ULL, 0x006ccfdf6fc92e19ULL,
-                           0x009d1ee1371a7218ULL, 0x00ee3c2ee4462d80ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00437bce9bccdf9dULL, 0x00e0c8e2f85dc0a3ULL,
-                           0x00c91a7073995a19ULL, 0x00856ec9fe294559ULL,
-                           0x009e4b33394b156eULL, 0x00e245b0dc497e5cULL,
-                           0x006a54e687eeaeffULL, 0x00f1cd1cd00fdb7cULL)},
-            {FIELD_LITERAL(0x008132ae5c5d8cd1ULL, 0x00121d68324a1d9fULL,
-                           0x00d6be9dafcb8c76ULL, 0x00684d9070edf745ULL,
-                           0x00519fbc96d7448eULL, 0x00388182fdc1f27eULL,
-                           0x000235baed41f158ULL, 0x00bf6cf6f1a1796aULL)},
-            {FIELD_LITERAL(0x002adc4b4d148219ULL, 0x003084ada0d3a90aULL,
-                           0x0046de8aab0f2e4eULL, 0x00452d342a67b5fdULL,
-                           0x00d4b50f01d4de21ULL, 0x00db6d9fc0cefb79ULL,
-                           0x008c184c86a462cdULL, 0x00e17c83764d42daULL)},
-        }}, {{
-            {FIELD_LITERAL(0x007b2743b9a1e01aULL, 0x007847ffd42688c4ULL,
-                           0x006c7844d610a316ULL, 0x00f0cb8b250aa4b0ULL,
-                           0x00a19060143b3ae6ULL, 0x0014eb10b77cfd80ULL,
-                           0x000170905729dd06ULL, 0x00063b5b9cd72477ULL)},
-            {FIELD_LITERAL(0x00ce382dc7993d92ULL, 0x00021153e938b4c8ULL,
-                           0x00096f7567f48f51ULL, 0x0058f81ddfe4b0d5ULL,
-                           0x00cc379a56b355c7ULL, 0x002c760770d3e819ULL,
-                           0x00ee22d1d26e5a40ULL, 0x00de6d93d5b082d7ULL)},
-            {FIELD_LITERAL(0x000a91a42c52e056ULL, 0x00185f6b77fce7eaULL,
-                           0x000803c51962f6b5ULL, 0x0022528582ba563dULL,
-                           0x0043f8040e9856d6ULL, 0x0085a29ec81fb860ULL,
-                           0x005f9a611549f5ffULL, 0x00c1f974ecbd4b06ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x005b64c6fd65ec97ULL, 0x00c1fdd7f877bc7fULL,
-                           0x000d9cc6c89f841cULL, 0x005c97b7f1aff9adULL,
-                           0x0075e3c61475d47eULL, 0x001ecb1ba8153011ULL,
-                           0x00fe7f1c8d71d40dULL, 0x003fa9757a229832ULL)},
-            {FIELD_LITERAL(0x00ffc5c89d2b0cbaULL, 0x00d363d42e3e6fc3ULL,
-                           0x0019a1a0118e2e8aULL, 0x00f7baeff48882e1ULL,
-                           0x001bd5af28c6b514ULL, 0x0055476ca2253cb2ULL,
-                           0x00d8eb1977e2ddf3ULL, 0x00b173b1adb228a1ULL)},
-            {FIELD_LITERAL(0x00f2cb99dd0ad707ULL, 0x00e1e08b6859ddd8ULL,
-                           0x000008f2d0650bccULL, 0x00d7ed392f8615c3ULL,
-                           0x00976750a94da27fULL, 0x003e83bb0ecb69baULL,
-                           0x00df8e8d15c14ac6ULL, 0x00f9f7174295d9c2ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00f11cc8e0e70bcbULL, 0x00e5dc689974e7ddULL,
-                           0x0014e409f9ee5870ULL, 0x00826e6689acbd63ULL,
-                           0x008a6f4e3d895d88ULL, 0x00b26a8da41fd4adULL,
-                           0x000fb7723f83efd7ULL, 0x009c749db0a5f6c3ULL)},
-            {FIELD_LITERAL(0x002389319450f9baULL, 0x003677f31aa1250aULL,
-                           0x0092c3db642f38cbULL, 0x00f8b64c0dfc9773ULL,
-                           0x00cd49fe3505b795ULL, 0x0068105a4090a510ULL,
-                           0x00df0ba2072a8bb6ULL, 0x00eb396143afd8beULL)},
-            {FIELD_LITERAL(0x00a0d4ecfb24cdffULL, 0x00ddaf8008ba6479ULL,
-                           0x00f0b3e36d4b0f44ULL, 0x003734bd3af1f146ULL,
-                           0x00b87e2efc75527eULL, 0x00d230df55ddab50ULL,
-                           0x002613257ae56c1dULL, 0x00bc0946d135934dULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00468711bd994651ULL, 0x0033108fa67561bfULL,
-                           0x0089d760192a54b4ULL, 0x00adc433de9f1871ULL,
-                           0x000467d05f36e050ULL, 0x007847e0f0579f7fULL,
-                           0x00a2314ad320052dULL, 0x00b3a93649f0b243ULL)},
-            {FIELD_LITERAL(0x0067f8f0c4fe26c9ULL, 0x0079c4a3cc8f67b9ULL,
-                           0x0082b1e62f23550dULL, 0x00f2d409caefd7f5ULL,
-                           0x0080e67dcdb26e81ULL, 0x0087ae993ea1f98aULL,
-                           0x00aa108becf61d03ULL, 0x001acf11efb608a3ULL)},
-            {FIELD_LITERAL(0x008225febbab50d9ULL, 0x00f3b605e4dd2083ULL,
-                           0x00a32b28189e23d2ULL, 0x00d507e5e5eb4c97ULL,
-                           0x005a1a84e302821fULL, 0x0006f54c1c5f08c7ULL,
-                           0x00a347c8cb2843f0ULL, 0x0009f73e9544bfa5ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x006c59c9ae744185ULL, 0x009fc32f1b4282cdULL,
-                           0x004d6348ca59b1acULL, 0x00105376881be067ULL,
-                           0x00af4096013147dcULL, 0x004abfb5a5cb3124ULL,
-                           0x000d2a7f8626c354ULL, 0x009c6ed568e07431ULL)},
-            {FIELD_LITERAL(0x00e828333c297f8bULL, 0x009ef3cf8c3f7e1fULL,
-                           0x00ab45f8fff31cb9ULL, 0x00c8b4178cb0b013ULL,
-                           0x00d0c50dd3260a3fULL, 0x0097126ac257f5bcULL,
-                           0x0042376cc90c705aULL, 0x001d96fdb4a1071eULL)},
-            {FIELD_LITERAL(0x00542d44d89ee1a8ULL, 0x00306642e0442d98ULL,
-                           0x0090853872b87338ULL, 0x002362cbf22dc044ULL,
-                           0x002c222adff663b8ULL, 0x0067c924495fcb79ULL,
-                           0x000e621d983c977cULL, 0x00df77a9eccb66fbULL)},
-        }}, {{
-            {FIELD_LITERAL(0x002809e4bbf1814aULL, 0x00b9e854f9fafb32ULL,
-                           0x00d35e67c10f7a67ULL, 0x008f1bcb76e748cfULL,
-                           0x004224d9515687d2ULL, 0x005ba0b774e620c4ULL,
-                           0x00b5e57db5d54119ULL, 0x00e15babe5683282ULL)},
-            {FIELD_LITERAL(0x00832d02369b482cULL, 0x00cba52ff0d93450ULL,
-                           0x003fa9c908d554dbULL, 0x008d1e357b54122fULL,
-                           0x00abd91c2dc950c6ULL, 0x007eff1df4c0ec69ULL,
-                           0x003f6aeb13fb2d31ULL, 0x00002d6179fc5b2cULL)},
-            {FIELD_LITERAL(0x0046c9eda81c9c89ULL, 0x00b60cb71c8f62fcULL,
-                           0x0022f5a683baa558ULL, 0x00f87319fccdf997ULL,
-                           0x009ca09b51ce6a22ULL, 0x005b12baf4af7d77ULL,
-                           0x008a46524a1e33e2ULL, 0x00035a77e988be0dULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00a7efe46a7dbe2fULL, 0x002f66fd55014fe7ULL,
-                           0x006a428afa1ff026ULL, 0x0056caaa9604ab72ULL,
-                           0x0033f3bcd7fac8aeULL, 0x00ccb1aa01c86764ULL,
-                           0x00158d1edf13bf40ULL, 0x009848ee76fcf3b4ULL)},
-            {FIELD_LITERAL(0x00a9e7730a819691ULL, 0x00d9cc73c4992b70ULL,
-                           0x00e299bde067de5aULL, 0x008c314eb705192aULL,
-                           0x00e7226f17e8a3ccULL, 0x0029dfd956e65a47ULL,
-                           0x0053a8e839073b12ULL, 0x006f942b2ab1597eULL)},
-            {FIELD_LITERAL(0x001c3d780ecd5e39ULL, 0x0094f247fbdcc5feULL,
-                           0x00d5c786fd527764ULL, 0x00b6f4da74f0db2aULL,
-                           0x0080f1f8badcd5fcULL, 0x00f36a373ad2e23bULL,
-                           0x00f804f9f4343bf2ULL, 0x00d1af40ec623982ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x0082aeace5f1b144ULL, 0x00f68b3108cf4dd3ULL,
-                           0x00634af01dde3020ULL, 0x000beab5df5c2355ULL,
-                           0x00e8b790d1b49b0bULL, 0x00e48d15854e36f4ULL,
-                           0x0040ab2d95f3db9fULL, 0x002711c4ed9e899aULL)},
-            {FIELD_LITERAL(0x0039343746531ebeULL, 0x00c8509d835d429dULL,
-                           0x00e79eceff6b0018ULL, 0x004abfd31e8efce5ULL,
-                           0x007bbfaaa1e20210ULL, 0x00e3be89c193e179ULL,
-                           0x001c420f4c31d585ULL, 0x00f414a315bef5aeULL)},
-            {FIELD_LITERAL(0x007c296a24990df8ULL, 0x00d5d07525a75588ULL,
-                           0x00dd8e113e94b7e7ULL, 0x007bbc58febe0cc8ULL,
-                           0x0029f51af9bfcad3ULL, 0x007e9311ec7ab6f3ULL,
-                           0x009a884de1676343ULL, 0x0050d5f2dce84be9ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x005fa020cca2450aULL, 0x00491c29db6416d8ULL,
-                           0x0037cefe3f9f9a85ULL, 0x003d405230647066ULL,
-                           0x0049e835f0fdbe89ULL, 0x00feb78ac1a0815cULL,
-                           0x00828e4b32dc9724ULL, 0x00db84f2dc8d6fd4ULL)},
-            {FIELD_LITERAL(0x0098cddc8b39549aULL, 0x006da37e3b05d22cULL,
-                           0x00ce633cfd4eb3cbULL, 0x00fda288ef526acdULL,
-                           0x0025338878c5d30aULL, 0x00f34438c4e5a1b4ULL,
-                           0x00584efea7c310f1ULL, 0x0041a551f1b660adULL)},
-            {FIELD_LITERAL(0x00d7f7a8fbd6437aULL, 0x0062872413bf3753ULL,
-                           0x00ad4bbcb43c584bULL, 0x007fe49be601d7e3ULL,
-                           0x0077c659789babf4ULL, 0x00eb45fcb06a741bULL,
-                           0x005ce244913f9708ULL, 0x0088426401736326ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x007bf562ca768d7cULL, 0x006c1f3a174e387cULL,
-                           0x00f024b447fee939ULL, 0x007e7af75f01143fULL,
-                           0x003adb70b4eed89dULL, 0x00e43544021ad79aULL,
-                           0x0091f7f7042011f6ULL, 0x0093c1a1ee3a0ddcULL)},
-            {FIELD_LITERAL(0x00a0b68ec1eb72d2ULL, 0x002c03235c0d45a0ULL,
-                           0x00553627323fe8c5ULL, 0x006186e94b17af94ULL,
-                           0x00a9906196e29f14ULL, 0x0025b3aee6567733ULL,
-                           0x007e0dd840080517ULL, 0x0018eb5801a4ba93ULL)},
-            {FIELD_LITERAL(0x00d7fe7017bf6a40ULL, 0x006e3f0624be0c42ULL,
-                           0x00ffbba205358245ULL, 0x00f9fc2cf8194239ULL,
-                           0x008d93b37bf15b4eULL, 0x006ddf2e38be8e95ULL,
-                           0x002b6e79bf5fcff9ULL, 0x00ab355da425e2deULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00938f97e20be973ULL, 0x0099141a36aaf306ULL,
-                           0x0057b0ca29e545a1ULL, 0x0085db571f9fbc13ULL,
-                           0x008b333c554b4693ULL, 0x0043ab6ef3e241cbULL,
-                           0x0054fb20aa1e5c70ULL, 0x00be0ff852760adfULL)},
-            {FIELD_LITERAL(0x003973d8938971d6ULL, 0x002aca26fa80c1f5ULL,
-                           0x00108af1faa6b513ULL, 0x00daae275d7924e6ULL,
-                           0x0053634ced721308ULL, 0x00d2355fe0bbd443ULL,
-                           0x00357612b2d22095ULL, 0x00f9bb9dd4136cf3ULL)},
-            {FIELD_LITERAL(0x002bff12cf5e03a5ULL, 0x001bdb1fa8a19cf8ULL,
-                           0x00c91c6793f84d39ULL, 0x00f869f1b2eba9afULL,
-                           0x0059bc547dc3236bULL, 0x00d91611d6d38689ULL,
-                           0x00e062daaa2c0214ULL, 0x00ed3c047cc2bc82ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x000050d70c32b31aULL, 0x001939d576d437b3ULL,
-                           0x00d709e598bf9fe6ULL, 0x00a885b34bd2ee9eULL,
-                           0x00dd4b5c08ab1a50ULL, 0x0091bebd50b55639ULL,
-                           0x00cf79ff64acdbc6ULL, 0x006067a39d826336ULL)},
-            {FIELD_LITERAL(0x0062dd0fb31be374ULL, 0x00fcc96b84c8e727ULL,
-                           0x003f64f1375e6ae3ULL, 0x0057d9b6dd1af004ULL,
-                           0x00d6a167b1103c7bULL, 0x00dd28f3180fb537ULL,
-                           0x004ff27ad7167128ULL, 0x008934c33461f2acULL)},
-            {FIELD_LITERAL(0x0065b472b7900043ULL, 0x00ba7efd2ff1064bULL,
-                           0x000b67d6c4c3020fULL, 0x0012d28469f4e46dULL,
-                           0x0031c32939703ec7ULL, 0x00b49f0bce133066ULL,
-                           0x00f7e10416181d47ULL, 0x005c90f51867eeccULL)},
-        }}, {{
-            {FIELD_LITERAL(0x0051207abd179101ULL, 0x00fc2a5c20d9c5daULL,
-                           0x00fb9d5f2701b6dfULL, 0x002dd040fdea82b8ULL,
-                           0x00f163b0738442ffULL, 0x00d9736bd68855b8ULL,
-                           0x00e0d8e93005e61cULL, 0x00df5a40b3988570ULL)},
-            {FIELD_LITERAL(0x0006918f5dfce6dcULL, 0x00d4bf1c793c57fbULL,
-                           0x0069a3f649435364ULL, 0x00e89a50e5b0cd6eULL,
-                           0x00b9f6a237e973afULL, 0x006d4ed8b104e41dULL,
-                           0x00498946a3924cd2ULL, 0x00c136ec5ac9d4f7ULL)},
-            {FIELD_LITERAL(0x0011a9c290ac5336ULL, 0x002b9a2d4a6a6533ULL,
-                           0x009a8a68c445d937ULL, 0x00361b27b07e5e5cULL,
-                           0x003c043b1755b974ULL, 0x00b7eb66cf1155eeULL,
-                           0x0077af5909eefff2ULL, 0x0098f609877cc806ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00ab13af436bf8f4ULL, 0x000bcf0a0dac8574ULL,
-                           0x00d50c864f705045ULL, 0x00c40e611debc842ULL,
-                           0x0085010489bd5caaULL, 0x007c5050acec026fULL,
-                           0x00f67d943c8da6d1ULL, 0x00de1da0278074c6ULL)},
-            {FIELD_LITERAL(0x00b373076597455fULL, 0x00e83f1af53ac0f5ULL,
-                           0x0041f63c01dc6840ULL, 0x0097dea19b0c6f4bULL,
-                           0x007f9d63b4c1572cULL, 0x00e692d492d0f5f0ULL,
-                           0x00cbcb392e83b4adULL, 0x0069c0f39ed9b1a8ULL)},
-            {FIELD_LITERAL(0x00861030012707c9ULL, 0x009fbbdc7fd4aafbULL,
-                           0x008f591d6b554822ULL, 0x00df08a41ea18adeULL,
-                           0x009d7d83e642abeaULL, 0x0098c71bda3b78ffULL,
-                           0x0022c89e7021f005ULL, 0x0044d29a3fe1e3c4ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00e748cd7b5c52f2ULL, 0x00ea9df883f89cc3ULL,
-                           0x0018970df156b6c7ULL, 0x00c5a46c2a33a847ULL,
-                           0x00cbde395e32aa09ULL, 0x0072474ebb423140ULL,
-                           0x00fb00053086a23dULL, 0x001dafcfe22d4e1fULL)},
-            {FIELD_LITERAL(0x00c903ee6d825540ULL, 0x00add6c4cf98473eULL,
-                           0x007636efed4227f1ULL, 0x00905124ae55e772ULL,
-                           0x00e6b38fab12ed53ULL, 0x0045e132b863fe55ULL,
-                           0x003974662edb366aULL, 0x00b1787052be8208ULL)},
-            {FIELD_LITERAL(0x00a614b00d775c7cULL, 0x00d7c78941cc7754ULL,
-                           0x00422dd68b5dabc4ULL, 0x00a6110f0167d28bULL,
-                           0x00685a309c252886ULL, 0x00b439ffd5143660ULL,
-                           0x003656e29ee7396fULL, 0x00c7c9b9ed5ad854ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x0040f7e7c5b37bf2ULL, 0x0064e4dc81181bbaULL,
-                           0x00a8767ae2a366b6ULL, 0x001496b4f90546f2ULL,
-                           0x002a28493f860441ULL, 0x0021f59513049a3aULL,
-                           0x00852d369a8b7ee3ULL, 0x00dd2e7d8b7d30a9ULL)},
-            {FIELD_LITERAL(0x00006e34a35d9fbcULL, 0x00eee4e48b2f019aULL,
-                           0x006b344743003a5fULL, 0x00541d514f04a7e3ULL,
-                           0x00e81f9ee7647455ULL, 0x005e2b916c438f81ULL,
-                           0x00116f8137b7eff0ULL, 0x009bd3decc7039d1ULL)},
-            {FIELD_LITERAL(0x0005d226f434110dULL, 0x00af8288b8ef21d5ULL,
-                           0x004a7a52ef181c8cULL, 0x00be0b781b4b06deULL,
-                           0x00e6e3627ded07e1ULL, 0x00e43aa342272b8bULL,
-                           0x00e86ab424577d84ULL, 0x00fb292c566e35bbULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00334f5303ea1222ULL, 0x00dfb3dbeb0a5d3eULL,
-                           0x002940d9592335c1ULL, 0x00706a7a63e8938aULL,
-                           0x005a533558bc4cafULL, 0x00558e33192022a9ULL,
-                           0x00970d9faf74c133ULL, 0x002979fcb63493caULL)},
-            {FIELD_LITERAL(0x00e38abece3c82abULL, 0x005a51f18a2c7a86ULL,
-                           0x009dafa2e86d592eULL, 0x00495a62eb688678ULL,
-                           0x00b79df74c0eb212ULL, 0x0023e8cc78b75982ULL,
-                           0x005998cb91075e13ULL, 0x00735aa9ba61bc76ULL)},
-            {FIELD_LITERAL(0x00d9f7a82ddbe628ULL, 0x00a1fc782889ae0fULL,
-                           0x0071ffda12d14b66ULL, 0x0037cf4eca7fb3d5ULL,
-                           0x00c80bc242c58808ULL, 0x0075bf8c2d08c863ULL,
-                           0x008d41f31afc52a7ULL, 0x00197962ecf38741ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x006e9f475cccf2eeULL, 0x00454b9cd506430cULL,
-                           0x00224a4fb79ee479ULL, 0x0062e3347ef0b5e2ULL,
-                           0x0034fd2a3512232aULL, 0x00b8b3cb0f457046ULL,
-                           0x00eb20165daa38ecULL, 0x00128eebc2d9c0f7ULL)},
-            {FIELD_LITERAL(0x00bfc5fa1e4ea21fULL, 0x00c21d7b6bb892e6ULL,
-                           0x00cf043f3acf0291ULL, 0x00c13f2f849b3c90ULL,
-                           0x00d1a97ebef10891ULL, 0x0061e130a445e7feULL,
-                           0x0019513fdedbf22bULL, 0x001d60c813bff841ULL)},
-            {FIELD_LITERAL(0x0019561c7fcf0213ULL, 0x00e3dca6843ebd77ULL,
-                           0x0068ea95b9ca920eULL, 0x009bdfb70f253595ULL,
-                           0x00c68f59186aa02aULL, 0x005aee1cca1c3039ULL,
-                           0x00ab79a8a937a1ceULL, 0x00b9a0e549959e6fULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00c79e0b6d97dfbdULL, 0x00917c71fd2bc6e8ULL,
-                           0x00db7529ccfb63d8ULL, 0x00be5be957f17866ULL,
-                           0x00a9e11fdc2cdac1ULL, 0x007b91a8e1f44443ULL,
-                           0x00a3065e4057d80fULL, 0x004825f5b8d5f6d4ULL)},
-            {FIELD_LITERAL(0x003e4964fa8a8fc8ULL, 0x00f6a1cdbcf41689ULL,
-                           0x00943cb18fe7fda7ULL, 0x00606dafbf34440aULL,
-                           0x005d37a86399c789ULL, 0x00e79a2a69417403ULL,
-                           0x00fe34f7e68b8866ULL, 0x0011f448ed2df10eULL)},
-            {FIELD_LITERAL(0x00f1f57efcc1fcc4ULL, 0x00513679117de154ULL,
-                           0x002e5b5b7c86d8c3ULL, 0x009f6486561f9cfbULL,
-                           0x00169e74b0170cf7ULL, 0x00900205af4af696ULL,
-                           0x006acfddb77853f3ULL, 0x00df184c90f31068ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00b37396c3320791ULL, 0x00fc7b67175c5783ULL,
-                           0x00c36d2cd73ecc38ULL, 0x0080ebcc0b328fc5ULL,
-                           0x0043a5b22b35d35dULL, 0x00466c9f1713c9daULL,
-                           0x0026ad346dcaa8daULL, 0x007c684e701183a6ULL)},
-            {FIELD_LITERAL(0x00fd579ffb691713ULL, 0x00b76af4f81c412dULL,
-                           0x00f239de96110f82ULL, 0x00e965fb437f0306ULL,
-                           0x00ca7e9436900921ULL, 0x00e487f1325fa24aULL,
-                           0x00633907de476380ULL, 0x00721c62ac5b8ea0ULL)},
-            {FIELD_LITERAL(0x00c0d54e542eb4f9ULL, 0x004ed657171c8dcfULL,
-                           0x00b743a4f7c2a39bULL, 0x00fd9f93ed6cc567ULL,
-                           0x00307fae3113e58bULL, 0x0058aa577c93c319ULL,
-                           0x00d254556f35b346ULL, 0x00491aada2203f0dULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00dff3103786ff34ULL, 0x000144553b1f20c3ULL,
-                           0x0095613baeb930e4ULL, 0x00098058275ea5d4ULL,
-                           0x007cd1402b046756ULL, 0x0074d74e4d58aee3ULL,
-                           0x005f93fc343ff69bULL, 0x00873df17296b3b0ULL)},
-            {FIELD_LITERAL(0x00c4a1fb48635413ULL, 0x00b5dd54423ad59fULL,
-                           0x009ff5d53fd24a88ULL, 0x003c98d267fc06a7ULL,
-                           0x002db7cb20013641ULL, 0x00bd1d6716e191f2ULL,
-                           0x006dbc8b29094241ULL, 0x0044bbf233dafa2cULL)},
-            {FIELD_LITERAL(0x0055838d41f531e6ULL, 0x00bf6a2dd03c81b2ULL,
-                           0x005827a061c4839eULL, 0x0000de2cbb36aac3ULL,
-                           0x002efa29d9717478ULL, 0x00f9e928cc8a77baULL,
-                           0x00c134b458def9efULL, 0x00958a182223fc48ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x000a9ee23c06881fULL, 0x002c727d3d871945ULL,
-                           0x00f47d971512d24aULL, 0x00671e816f9ef31aULL,
-                           0x00883af2cfaad673ULL, 0x00601f98583d6c9aULL,
-                           0x00b435f5adc79655ULL, 0x00ad87b71c04bff2ULL)},
-            {FIELD_LITERAL(0x007860d99db787cfULL, 0x00fda8983018f4a8ULL,
-                           0x008c8866bac4743cULL, 0x00ef471f84c82a3fULL,
-                           0x00abea5976d3b8e7ULL, 0x00714882896cd015ULL,
-                           0x00b49fae584ddac5ULL, 0x008e33a1a0b69c81ULL)},
-            {FIELD_LITERAL(0x007b6ee2c9e8a9ecULL, 0x002455dbbd89d622ULL,
-                           0x006490cf4eaab038ULL, 0x00d925f6c3081561ULL,
-                           0x00153b3047de7382ULL, 0x003b421f8bdceb6fULL,
-                           0x00761a4a5049da78ULL, 0x00980348c5202433ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x007f8a43da97dd5cULL, 0x00058539c800fc7bULL,
-                           0x0040f3cf5a28414aULL, 0x00d68dd0d95283d6ULL,
-                           0x004adce9da90146eULL, 0x00befa41c7d4f908ULL,
-                           0x007603bc2e3c3060ULL, 0x00bdf360ab3545dbULL)},
-            {FIELD_LITERAL(0x00eebfd4e2312cc3ULL, 0x00474b2564e4fc8cULL,
-                           0x003303ef14b1da9bULL, 0x003c93e0e66beb1dULL,
-                           0x0013619b0566925aULL, 0x008817c24d901bf3ULL,
-                           0x00b62bd8898d218bULL, 0x0075a7716f1e88a2ULL)},
-            {FIELD_LITERAL(0x0009218da1e6890fULL, 0x0026907f5fd02575ULL,
-                           0x004dabed5f19d605ULL, 0x003abf181870249dULL,
-                           0x00b52fd048cc92c4ULL, 0x00b6dd51e415a5c5ULL,
-                           0x00d9eb82bd2b4014ULL, 0x002c865a43b46b43ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x0070047189452f4cULL, 0x00f7ad12e1ce78d5ULL,
-                           0x00af1ba51ec44a8bULL, 0x005f39f63e667cd6ULL,
-                           0x00058eac4648425eULL, 0x00d7fdab42bea03bULL,
-                           0x0028576a5688de15ULL, 0x00af973209e77c10ULL)},
-            {FIELD_LITERAL(0x00c338b915d8fef0ULL, 0x00a893292045c39aULL,
-                           0x0028ab4f2eba6887ULL, 0x0060743cb519fd61ULL,
-                           0x0006213964093ac0ULL, 0x007c0b7a43f6266dULL,
-                           0x008e3557c4fa5bdaULL, 0x002da976de7b8d9dULL)},
-            {FIELD_LITERAL(0x0048729f8a8b6dcdULL, 0x00fe23b85cc4d323ULL,
-                           0x00e7384d16e4db0eULL, 0x004a423970678942ULL,
-                           0x00ec0b763345d4baULL, 0x00c477b9f99ed721ULL,
-                           0x00c29dad3777b230ULL, 0x001c517b466f7df6ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x006366c380f7b574ULL, 0x001c7d1f09ff0438ULL,
-                           0x003e20a7301f5b22ULL, 0x00d3efb1916d28f6ULL,
-                           0x0049f4f81060ce83ULL, 0x00c69d91ea43ced1ULL,
-                           0x002b6f3e5cd269edULL, 0x005b0fb22ce9ec65ULL)},
-            {FIELD_LITERAL(0x00aa2261022d883fULL, 0x00ebcca4548010acULL,
-                           0x002528512e28a437ULL, 0x0070ca7676b66082ULL,
-                           0x0084bda170f7c6d3ULL, 0x00581b4747c9b8bbULL,
-                           0x005c96a01061c7e2ULL, 0x00fb7c4a362b5273ULL)},
-            {FIELD_LITERAL(0x00c30020eb512d02ULL, 0x0060f288283a4d26ULL,
-                           0x00b7ed13becde260ULL, 0x0075ebb74220f6e9ULL,
-                           0x00701079fcfe8a1fULL, 0x001c28fcdff58938ULL,
-                           0x002e4544b8f4df6bULL, 0x0060c5bc4f1a7d73ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x00ae307cf069f701ULL, 0x005859f222dd618bULL,
-                           0x00212d6c46ec0b0dULL, 0x00a0fe4642afb62dULL,
-                           0x00420d8e4a0a8903ULL, 0x00a80ff639bdf7b0ULL,
-                           0x0019bee1490b5d8eULL, 0x007439e4b9c27a86ULL)},
-            {FIELD_LITERAL(0x00a94700032a093fULL, 0x0076e96c225216e7ULL,
-                           0x00a63a4316e45f91ULL, 0x007d8bbb4645d3b2ULL,
-                           0x00340a6ff22793ebULL, 0x006f935d4572aeb7ULL,
-                           0x00b1fb69f00afa28ULL, 0x009e8f3423161ed3ULL)},
-            {FIELD_LITERAL(0x009ef49c6b5ced17ULL, 0x00a555e6269e9f0aULL,
-                           0x007e6f1d79ec73b5ULL, 0x009ac78695a32ac4ULL,
-                           0x0001d77fbbcd5682ULL, 0x008cea1fee0aaeedULL,
-                           0x00f42bea82a53462ULL, 0x002e46ab96cafcc9ULL)},
-        }}, {{
-            {FIELD_LITERAL(0x0051cfcc5885377aULL, 0x00dce566cb1803caULL,
-                           0x00430c7643f2c7d4ULL, 0x00dce1a1337bdcc0ULL,
-                           0x0010d5bd7283c128ULL, 0x003b1b547f9b46feULL,
-                           0x000f245e37e770abULL, 0x007b72511f022b37ULL)},
-            {FIELD_LITERAL(0x0060db815bc4786cULL, 0x006fab25beedc434ULL,
-                           0x00c610d06084797cULL, 0x000c48f08537bec0ULL,
-                           0x0031aba51c5b93daULL, 0x007968fa6e01f347ULL,
-                           0x0030070da52840c6ULL, 0x00c043c225a4837fULL)},
-            {FIELD_LITERAL(0x001bcfd00649ee93ULL, 0x006dceb47e2a0fd5ULL,
-                           0x00f2cebda0cf8fd0ULL, 0x00b6b9d9d1fbdec3ULL,
-                           0x00815262e6490611ULL, 0x00ef7f5ce3176760ULL,
-                           0x00e49cd0c998d58bULL, 0x005fc6cc269ba57cULL)},
-        }}, {{
-            {FIELD_LITERAL(0x008940211aa0d633ULL, 0x00addae28136571dULL,
-                           0x00d68fdbba20d673ULL, 0x003bc6129bc9e21aULL,
-                           0x000346cf184ebe9aULL, 0x0068774d741ebc7fULL,
-                           0x0019d5e9e6966557ULL, 0x0003cbd7f981b651ULL)},
-            {FIELD_LITERAL(0x004a2902926f8d3fULL, 0x00ad79b42637ab75ULL,
-                           0x0088f60b90f2d4e8ULL, 0x0030f54ef0e398c4ULL,
-                           0x00021dc9bf99681eULL, 0x007ebf66fde74ee3ULL,
-                           0x004ade654386e9a4ULL, 0x00e7485066be4c27ULL)},
-            {FIELD_LITERAL(0x00445f1263983be0ULL, 0x004cf371dda45e6aULL,
-                           0x00744a89d5a310e7ULL, 0x001f20ce4f904833ULL,
-                           0x00e746edebe66e29ULL, 0x000912ab1f6c153dULL,
-                           0x00f61d77d9b2444cULL, 0x0001499cd6647610ULL)},
-        }}
-    }
+    { { {
+          { FIELD_LITERAL(0x00cc3b062366f4ccULL, 0x003d6e34e314aa3cULL,
+              0x00d51c0a7521774dULL, 0x0094e060eec6ab8bULL,
+              0x00d21291b4d80082ULL, 0x00befed12b55ef1eULL,
+              0x00c3dd2df5c94518ULL, 0x00e0a7b112b8d4e6ULL) },
+          { FIELD_LITERAL(0x0019eb5608d8723aULL, 0x00d1bab52fb3aedbULL,
+              0x00270a7311ebc90cULL, 0x0037c12b91be7f13ULL,
+              0x005be16cd8b5c704ULL, 0x003e181acda888e1ULL,
+              0x00bc1f00fc3fc6d0ULL, 0x00d3839bfa319e20ULL) },
+          { FIELD_LITERAL(0x003caeb88611909fULL, 0x00ea8b378c4df3d4ULL,
+              0x00b3295b95a5a19aULL, 0x00a65f97514bdfb5ULL,
+              0x00b39efba743cab1ULL, 0x0016ba98b862fd2dULL,
+              0x0001508812ee71d7ULL, 0x000a75740eea114aULL) },
+      } },
+        { {
+            { FIELD_LITERAL(0x00ebcf0eb649f823ULL, 0x00166d332e98ea03ULL,
+                0x0059ddf64f5cd5f6ULL, 0x0047763123d9471bULL,
+                0x00a64065c53ef62fULL, 0x00978e44c480153dULL,
+                0x000b5b2a0265f194ULL, 0x0046a24b9f32965aULL) },
+            { FIELD_LITERAL(0x00b9eef787034df0ULL, 0x0020bc24de3390cdULL,
+                0x000022160bae99bbULL, 0x00ae66e886e97946ULL,
+                0x0048d4bbe02cbb8bULL, 0x0072ba97b34e38d4ULL,
+                0x00eae7ec8f03e85aULL, 0x005ba92ecf808b2cULL) },
+            { FIELD_LITERAL(0x00c9cfbbe74258fdULL, 0x00843a979ea9eaa7ULL,
+                0x000cbb4371cfbe90ULL, 0x0059bac8f7f0a628ULL,
+                0x004b3dff882ff530ULL, 0x0011869df4d90733ULL,
+                0x00595aa71f4abfc2ULL, 0x0070e2d38990c2e6ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00de2010c0a01733ULL, 0x00c739a612e24297ULL,
+                0x00a7212643141d7cULL, 0x00f88444f6b67c11ULL,
+                0x00484b7b16ec28f2ULL, 0x009c1b8856af9c68ULL,
+                0x00ff4669591fe9d6ULL, 0x0054974be08a32c8ULL) },
+            { FIELD_LITERAL(0x0010de3fd682ceedULL, 0x008c07642d83ca4eULL,
+                0x0013bb064e00a1ccULL, 0x009411ae27870e11ULL,
+                0x00ea8e5b4d531223ULL, 0x0032fe7d2aaece2eULL,
+                0x00d989e243e7bb41ULL, 0x000fe79a508e9b8bULL) },
+            { FIELD_LITERAL(0x005e0426b9bfc5b1ULL, 0x0041a5b1d29ee4faULL,
+                0x0015b0def7774391ULL, 0x00bc164f1f51af01ULL,
+                0x00d543b0942797b9ULL, 0x003c129b6398099cULL,
+                0x002b114c6e5adf18ULL, 0x00b4e630e4018a7bULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00d490afc95f8420ULL, 0x00b096bf50c1d9b9ULL,
+                0x00799fd707679866ULL, 0x007c74d9334afbeaULL,
+                0x00efaa8be80ff4edULL, 0x0075c4943bb81694ULL,
+                0x00c21c2fca161f36ULL, 0x00e77035d492bfeeULL) },
+            { FIELD_LITERAL(0x006658a190dd6661ULL, 0x00e0e9bab38609a6ULL,
+                0x0028895c802237edULL, 0x006a0229c494f587ULL,
+                0x002dcde96c9916b7ULL, 0x00d158822de16218ULL,
+                0x00173b917a06856fULL, 0x00ca78a79ae07326ULL) },
+            { FIELD_LITERAL(0x00e35bfc79caced4ULL, 0x0087238a3e1fe3bbULL,
+                0x00bcbf0ff4ceff5bULL, 0x00a19c1c94099b91ULL,
+                0x0071e102b49db976ULL, 0x0059e3d004eada1eULL,
+                0x008da78afa58a47eULL, 0x00579c8ebf269187ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00a16c2905eee75fULL, 0x009d4bcaea2c7e1dULL,
+                0x00d3bd79bfad19dfULL, 0x0050da745193342cULL,
+                0x006abdb8f6b29ab1ULL, 0x00a24fe0a4fef7efULL,
+                0x0063730da1057dfbULL, 0x00a08c312c8eb108ULL) },
+            { FIELD_LITERAL(0x00b583be005375beULL, 0x00a40c8f8a4e3df4ULL,
+                0x003fac4a8f5bdbf7ULL, 0x00d4481d872cd718ULL,
+                0x004dc8749cdbaefeULL, 0x00cce740d5e5c975ULL,
+                0x000b1c1f4241fd21ULL, 0x00a76de1b4e1cd07ULL) },
+            { FIELD_LITERAL(0x007a076500d30b62ULL, 0x000a6e117b7f090fULL,
+                0x00c8712ae7eebd9aULL, 0x000fbd6c1d5f6ff7ULL,
+                0x003a7977246ebf11ULL, 0x00166ed969c6600eULL,
+                0x00aa42e469c98becULL, 0x00dc58f307cf0666ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x004b491f65a9a28bULL, 0x006a10309e8a55b7ULL,
+                0x00b67210185187efULL, 0x00cf6497b12d9b8fULL,
+                0x0085778c56e2b1baULL, 0x0015b4c07a814d85ULL,
+                0x00686479e62da561ULL, 0x008de5d88f114916ULL) },
+            { FIELD_LITERAL(0x00e37c88d6bba7b1ULL, 0x003e4577e1b8d433ULL,
+                0x0050d8ea5f510ec0ULL, 0x0042fc9f2da9ef59ULL,
+                0x003bd074c1141420ULL, 0x00561b8b7b68774eULL,
+                0x00232e5e5d1013a3ULL, 0x006b7f2cb3d7e73fULL) },
+            { FIELD_LITERAL(0x004bdd0f0b41e6a0ULL, 0x001773057c405d24ULL,
+                0x006029f99915bd97ULL, 0x006a5ba70a17fe2fULL,
+                0x0046111977df7e08ULL, 0x004d8124c89fb6b7ULL,
+                0x00580983b2bb2724ULL, 0x00207bf330d6f3feULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x007efdc93972a48bULL, 0x002f5e50e78d5feeULL,
+                0x0080dc11d61c7fe5ULL, 0x0065aa598707245bULL,
+                0x009abba2300641beULL, 0x000c68787656543aULL,
+                0x00ffe0fef2dc0a17ULL, 0x00007ffbd6cb4f3aULL) },
+            { FIELD_LITERAL(0x0036012f2b836efcULL, 0x00458c126d6b5fbcULL,
+                0x00a34436d719ad1eULL, 0x0097be6167117deaULL,
+                0x0009c219c879cff3ULL, 0x0065564493e60755ULL,
+                0x00993ac94a8cdec0ULL, 0x002d4885a4d0dbafULL) },
+            { FIELD_LITERAL(0x00598b60b4c068baULL, 0x00c547a0be7f1afdULL,
+                0x009582164acf12afULL, 0x00af4acac4fbbe40ULL,
+                0x005f6ca7c539121aULL, 0x003b6e752ebf9d66ULL,
+                0x00f08a30d5cac5d4ULL, 0x00e399bb5f97c5a9ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x007445a0409c0a66ULL, 0x00a65c369f3829c0ULL,
+                0x0031d248a4f74826ULL, 0x006817f34defbe8eULL,
+                0x00649741d95ebf2eULL, 0x00d46466ab16b397ULL,
+                0x00fdc35703bee414ULL, 0x00343b43334525f8ULL) },
+            { FIELD_LITERAL(0x001796bea93f6401ULL, 0x00090c5a42e85269ULL,
+                0x00672412ba1252edULL, 0x001201d47b6de7deULL,
+                0x006877bccfe66497ULL, 0x00b554fd97a4c161ULL,
+                0x009753f42dbac3cfULL, 0x00e983e3e378270aULL) },
+            { FIELD_LITERAL(0x00ac3eff18849872ULL, 0x00f0eea3bff05690ULL,
+                0x00a6d72c21dd505dULL, 0x001b832642424169ULL,
+                0x00a6813017b540e5ULL, 0x00a744bd71b385cdULL,
+                0x0022a7d089130a7bULL, 0x004edeec9a133486ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00b2d6729196e8a9ULL, 0x0088a9bb2031cef4ULL,
+                0x00579e7787dc1567ULL, 0x0030f49feb059190ULL,
+                0x00a0b1d69c7f7d8fULL, 0x0040bdcc6d9d806fULL,
+                0x00d76c4037edd095ULL, 0x00bbf24376415dd7ULL) },
+            { FIELD_LITERAL(0x00240465ff5a7197ULL, 0x00bb97e76caf27d0ULL,
+                0x004b4edbf8116d39ULL, 0x001d8586f708cbaaULL,
+                0x000f8ee8ff8e4a50ULL, 0x00dde5a1945dd622ULL,
+                0x00e6fc1c0957e07cULL, 0x0041c9cdabfd88a0ULL) },
+            { FIELD_LITERAL(0x005344b0bf5b548cULL, 0x002957d0b705cc99ULL,
+                0x00f586a70390553dULL, 0x0075b3229f583cc3ULL,
+                0x00a1aa78227490e4ULL, 0x001bf09cf7957717ULL,
+                0x00cf6bf344325f52ULL, 0x0065bd1c23ca3ecfULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x009bff3b3239363cULL, 0x00e17368796ef7c0ULL,
+                0x00528b0fe0971f3aULL, 0x0008014fc8d4a095ULL,
+                0x00d09f2e8a521ec4ULL, 0x006713ab5dde5987ULL,
+                0x0003015758e0dbb1ULL, 0x00215999f1ba212dULL) },
+            { FIELD_LITERAL(0x002c88e93527da0eULL, 0x0077c78f3456aad5ULL,
+                0x0071087a0a389d1cULL, 0x00934dac1fb96dbdULL,
+                0x008470e801162697ULL, 0x005bc2196cd4ad49ULL,
+                0x00e535601d5087c3ULL, 0x00769888700f497fULL) },
+            { FIELD_LITERAL(0x00da7a4b557298adULL, 0x0019d2589ea5df76ULL,
+                0x00ef3e38be0c6497ULL, 0x00a9644e1312609aULL,
+                0x004592f61b2558daULL, 0x0082c1df510d7e46ULL,
+                0x0042809a535c0023ULL, 0x00215bcb5afd7757ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x002b9df55a1a4213ULL, 0x00dcfc3b464a26beULL,
+                0x00c4f9e07a8144d5ULL, 0x00c8e0617a92b602ULL,
+                0x008e3c93accafae0ULL, 0x00bf1bcb95b2ca60ULL,
+                0x004ce2426a613bf3ULL, 0x00266cac58e40921ULL) },
+            { FIELD_LITERAL(0x008456d5db76e8f0ULL, 0x0032ca9cab2ce163ULL,
+                0x0059f2b8bf91abcfULL, 0x0063c2a021712788ULL,
+                0x00f86155af22f72dULL, 0x00db98b2a6c005a0ULL,
+                0x00ac6e416a693ac4ULL, 0x007a93572af53226ULL) },
+            { FIELD_LITERAL(0x0087767520f0de22ULL, 0x0091f64012279fb5ULL,
+                0x001050f1f0644999ULL, 0x004f097a2477ad3cULL,
+                0x006b37913a9947bdULL, 0x001a3d78645af241ULL,
+                0x0057832bbb3008a7ULL, 0x002c1d902b80dc20ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x001a6002bf178877ULL, 0x009bce168aa5af50ULL,
+                0x005fc318ff04a7f5ULL, 0x0052818f55c36461ULL,
+                0x008768f5d4b24afbULL, 0x0037ffbae7b69c85ULL,
+                0x0018195a4b61edc0ULL, 0x001e12ea088434b2ULL) },
+            { FIELD_LITERAL(0x0047d3f804e7ab07ULL, 0x00a809ab5f905260ULL,
+                0x00b3ffc7cdaf306dULL, 0x00746e8ec2d6e509ULL,
+                0x00d0dade8887a645ULL, 0x00acceeebde0dd37ULL,
+                0x009bc2579054686bULL, 0x0023804f97f1c2bfULL) },
+            { FIELD_LITERAL(0x0043e2e2e50b80d7ULL, 0x00143aafe4427e0fULL,
+                0x005594aaecab855bULL, 0x008b12ccaaecbc01ULL,
+                0x002deeb091082bc3ULL, 0x009cca4be2ae7514ULL,
+                0x00142b96e696d047ULL, 0x00ad2a2b1c05256aULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x003914f2f144b78bULL, 0x007a95dd8bee6f68ULL,
+                0x00c7f4384d61c8e6ULL, 0x004e51eb60f1bdb2ULL,
+                0x00f64be7aa4621d8ULL, 0x006797bfec2f0ac0ULL,
+                0x007d17aab3c75900ULL, 0x001893e73cac8bc5ULL) },
+            { FIELD_LITERAL(0x00140360b768665bULL, 0x00b68aca4967f977ULL,
+                0x0001089b66195ae4ULL, 0x00fe71122185e725ULL,
+                0x000bca2618d49637ULL, 0x00a54f0557d7e98aULL,
+                0x00cdcd2f91d6f417ULL, 0x00ab8c13741fd793ULL) },
+            { FIELD_LITERAL(0x00725ee6b1e549e0ULL, 0x007124a0769777faULL,
+                0x000b68fdad07ae42ULL, 0x0085b909cd4952dfULL,
+                0x0092d2e3c81606f4ULL, 0x009f22f6cac099a0ULL,
+                0x00f59da57f2799a8ULL, 0x00f06c090122f777ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00ce0bed0a3532bcULL, 0x001a5048a22df16bULL,
+                0x00e31db4cbad8bf1ULL, 0x00e89292120cf00eULL,
+                0x007d1dd1a9b00034ULL, 0x00e2a9041ff8f680ULL,
+                0x006a4c837ae596e7ULL, 0x00713af1068070b3ULL) },
+            { FIELD_LITERAL(0x00c4fe64ce66d04bULL, 0x00b095d52e09b3d7ULL,
+                0x00758bbecb1a3a8eULL, 0x00f35cce8d0650c0ULL,
+                0x002b878aa5984473ULL, 0x0062e0a3b7544ddcULL,
+                0x00b25b290ed116feULL, 0x007b0f6abe0bebf2ULL) },
+            { FIELD_LITERAL(0x0081d4e3addae0a8ULL, 0x003410c836c7ffccULL,
+                0x00c8129ad89e4314ULL, 0x000e3d5a23922dcdULL,
+                0x00d91e46f29c31f3ULL, 0x006c728cde8c5947ULL,
+                0x002bc655ba2566c0ULL, 0x002ca94721533108ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x0051e4b3f764d8a9ULL, 0x0019792d46e904a0ULL,
+                0x00853bc13dbc8227ULL, 0x000840208179f12dULL,
+                0x0068243474879235ULL, 0x0013856fbfe374d0ULL,
+                0x00bda12fe8676424ULL, 0x00bbb43635926eb2ULL) },
+            { FIELD_LITERAL(0x0012cdc880a93982ULL, 0x003c495b21cd1b58ULL,
+                0x00b7e5c93f22a26eULL, 0x0044aa82dfb99458ULL,
+                0x009ba092cdffe9c0ULL, 0x00a14b3ab2083b73ULL,
+                0x000271c2f70e1c4bULL, 0x00eea9cac0f66eb8ULL) },
+            { FIELD_LITERAL(0x001a1847c4ac5480ULL, 0x00b1b412935bb03aULL,
+                0x00f74285983bf2b2ULL, 0x00624138b5b5d0f1ULL,
+                0x008820c0b03d38bfULL, 0x00b94e50a18c1572ULL,
+                0x0060f6934841798fULL, 0x00c52f5d66d6ebe2ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00da23d59f9bcea6ULL, 0x00e0f27007a06a4bULL,
+                0x00128b5b43a6758cULL, 0x000cf50190fa8b56ULL,
+                0x00fc877aba2b2d72ULL, 0x00623bef52edf53fULL,
+                0x00e6af6b819669e2ULL, 0x00e314dc34fcaa4fULL) },
+            { FIELD_LITERAL(0x0066e5eddd164d1eULL, 0x00418a7c6fe28238ULL,
+                0x0002e2f37e962c25ULL, 0x00f01f56b5975306ULL,
+                0x0048842fa503875cULL, 0x0057b0e968078143ULL,
+                0x00ff683024f3d134ULL, 0x0082ae28fcad12e4ULL) },
+            { FIELD_LITERAL(0x0011ddfd21260e42ULL, 0x00d05b0319a76892ULL,
+                0x00183ea4368e9b8fULL, 0x00b0815662affc96ULL,
+                0x00b466a5e7ce7c88ULL, 0x00db93b07506e6eeULL,
+                0x0033885f82f62401ULL, 0x0086f9090ec9b419ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00d95d1c5fcb435aULL, 0x0016d1ed6b5086f9ULL,
+                0x00792aa0b7e54d71ULL, 0x0067b65715f1925dULL,
+                0x00a219755ec6176bULL, 0x00bc3f026b12c28fULL,
+                0x00700c897ffeb93eULL, 0x0089b83f6ec50b46ULL) },
+            { FIELD_LITERAL(0x003c97e6384da36eULL, 0x00423d53eac81a09ULL,
+                0x00b70d68f3cdce35ULL, 0x00ee7959b354b92cULL,
+                0x00f4e9718819c8caULL, 0x009349f12acbffe9ULL,
+                0x005aee7b62cb7da6ULL, 0x00d97764154ffc86ULL) },
+            { FIELD_LITERAL(0x00526324babb46dcULL, 0x002ee99b38d7bf9eULL,
+                0x007ea51794706ef4ULL, 0x00abeb04da6e3c39ULL,
+                0x006b457c1d281060ULL, 0x00fe243e9a66c793ULL,
+                0x00378de0fb6c6ee4ULL, 0x003e4194b9c3cb93ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00fed3cd80ca2292ULL, 0x0015b043a73ca613ULL,
+                0x000a9fd7bf9be227ULL, 0x003b5e03de2db983ULL,
+                0x005af72d46904ef7ULL, 0x00c0f1b5c49faa99ULL,
+                0x00dc86fc3bd305e1ULL, 0x00c92f08c1cb1797ULL) },
+            { FIELD_LITERAL(0x0079680ce111ed3bULL, 0x001a1ed82806122cULL,
+                0x000c2e7466d15df3ULL, 0x002c407f6f7150fdULL,
+                0x00c5e7c96b1b0ce3ULL, 0x009aa44626863ff9ULL,
+                0x00887b8b5b80be42ULL, 0x00b6023cec964825ULL) },
+            { FIELD_LITERAL(0x00e4a8e1048970c8ULL, 0x0062887b7830a302ULL,
+                0x00bcf1c8cd81402bULL, 0x0056dbb81a68f5beULL,
+                0x0014eced83f12452ULL, 0x00139e1a510150dfULL,
+                0x00bb81140a82d1a3ULL, 0x000febcc1aaf1aa7ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00a7527958238159ULL, 0x0013ec9537a84cd6ULL,
+                0x001d7fee7d562525ULL, 0x00b9eefa6191d5e5ULL,
+                0x00dbc97db70bcb8aULL, 0x00481affc7a4d395ULL,
+                0x006f73d3e70c31bbULL, 0x00183f324ed96a61ULL) },
+            { FIELD_LITERAL(0x0039dd7ce7fc6860ULL, 0x00d64f6425653da1ULL,
+                0x003e037c7f57d0afULL, 0x0063477a06e2bcf2ULL,
+                0x001727dbb7ac67e6ULL, 0x0049589f5efafe2eULL,
+                0x00fc0fef2e813d54ULL, 0x008baa5d087fb50dULL) },
+            { FIELD_LITERAL(0x0024fb59d9b457c7ULL, 0x00a7d4e060223e4cULL,
+                0x00c118d1b555fd80ULL, 0x0082e216c732f22aULL,
+                0x00cd2a2993089504ULL, 0x003638e836a3e13dULL,
+                0x000d855ee89b4729ULL, 0x008ec5b7d4810c91ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x001bf51f7d65cdfdULL, 0x00d14cdafa16a97dULL,
+                0x002c38e60fcd10e7ULL, 0x00a27446e393efbdULL,
+                0x000b5d8946a71fddULL, 0x0063df2cde128f2fULL,
+                0x006c8679569b1888ULL, 0x0059ffc4925d732dULL) },
+            { FIELD_LITERAL(0x00ece96f95f2b66fULL, 0x00ece7952813a27bULL,
+                0x0026fc36592e489eULL, 0x007157d1a2de0f66ULL,
+                0x00759dc111d86ddfULL, 0x0012881e5780bb0fULL,
+                0x00c8ccc83ad29496ULL, 0x0012b9bd1929eb71ULL) },
+            { FIELD_LITERAL(0x000fa15a20da5df0ULL, 0x00349ddb1a46cd31ULL,
+                0x002c512ad1d8e726ULL, 0x00047611f669318dULL,
+                0x009e68fba591e17eULL, 0x004320dffa803906ULL,
+                0x00a640874951a3d3ULL, 0x00b6353478baa24fULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x009696510000d333ULL, 0x00ec2f788bc04826ULL,
+                0x000e4d02b1f67ba5ULL, 0x00659aa8dace08b6ULL,
+                0x00d7a38a3a3ae533ULL, 0x008856defa8c746bULL,
+                0x004d7a4402d3da1aULL, 0x00ea82e06229260fULL) },
+            { FIELD_LITERAL(0x006a15bb20f75c0cULL, 0x0079a144027a5d0cULL,
+                0x00d19116ce0b4d70ULL, 0x0059b83bcb0b268eULL,
+                0x005f58f63f16c127ULL, 0x0079958318ee2c37ULL,
+                0x00defbb063d07f82ULL, 0x00f1f0b931d2d446ULL) },
+            { FIELD_LITERAL(0x00cb5e4c3c35d422ULL, 0x008df885ca43577fULL,
+                0x00fa50b16ca3e471ULL, 0x005a0e58e17488c8ULL,
+                0x00b2ceccd6d34d19ULL, 0x00f01d5d235e36e9ULL,
+                0x00db2e7e4be6ca44ULL, 0x00260ab77f35fccdULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x006f6fd9baac61d5ULL, 0x002a7710a020a895ULL,
+                0x009de0db7fc03d4dULL, 0x00cdedcb1875f40bULL,
+                0x00050caf9b6b1e22ULL, 0x005e3a6654456ab0ULL,
+                0x00775fdf8c4423d4ULL, 0x0028701ea5738b5dULL) },
+            { FIELD_LITERAL(0x009ffd90abfeae96ULL, 0x00cba3c2b624a516ULL,
+                0x005ef08bcee46c91ULL, 0x00e6fde30afb6185ULL,
+                0x00f0b4db4f818ce4ULL, 0x006c54f45d2127f5ULL,
+                0x00040125035854c7ULL, 0x00372658a3287e13ULL) },
+            { FIELD_LITERAL(0x00d7070fb1beb2abULL, 0x0078fc845a93896bULL,
+                0x006894a4b2f224a6ULL, 0x005bdd8192b9dbdeULL,
+                0x00b38839874b3a9eULL, 0x00f93618b04b7a57ULL,
+                0x003e3ec75fd2c67eULL, 0x00bf5e6bfc29494aULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00f19224ebba2aa5ULL, 0x0074f89d358e694dULL,
+                0x00eea486597135adULL, 0x0081579a4555c7e1ULL,
+                0x0010b9b872930a9dULL, 0x00f002e87a30ecc0ULL,
+                0x009b9d66b6de56e2ULL, 0x00a3c4f45e8004ebULL) },
+            { FIELD_LITERAL(0x0045e8dda9400888ULL, 0x002ff12e5fc05db7ULL,
+                0x00a7098d54afe69cULL, 0x00cdbe846a500585ULL,
+                0x00879c1593ca1882ULL, 0x003f7a7fea76c8b0ULL,
+                0x002cd73dd0c8e0a1ULL, 0x00645d6ce96f51feULL) },
+            { FIELD_LITERAL(0x002b7e83e123d6d6ULL, 0x00398346f7419c80ULL,
+                0x0042922e55940163ULL, 0x005e7fc5601886a3ULL,
+                0x00e88f2cee1d3103ULL, 0x00e7fab135f2e377ULL,
+                0x00b059984dbf0dedULL, 0x0009ce080faa5bb8ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x0085e78af7758979ULL, 0x00275a4ee1631a3aULL,
+                0x00d26bc0ed78b683ULL, 0x004f8355ea21064fULL,
+                0x00d618e1a32696e5ULL, 0x008d8d7b150e5680ULL,
+                0x00a74cd854b278d2ULL, 0x001dd62702203ea0ULL) },
+            { FIELD_LITERAL(0x00f89335c2a59286ULL, 0x00a0f5c905d55141ULL,
+                0x00b41fb836ee9382ULL, 0x00e235d51730ca43ULL,
+                0x00a5cb37b5c0a69aULL, 0x009b966ffe136c45ULL,
+                0x00cb2ea10bf80ed1ULL, 0x00fb2b370b40dc35ULL) },
+            { FIELD_LITERAL(0x00d687d16d4ee8baULL, 0x0071520bdd069dffULL,
+                0x00de85c60d32355dULL, 0x0087d2e3565102f4ULL,
+                0x00cde391b8dfc9aaULL, 0x00e18d69efdfefe5ULL,
+                0x004a9d0591954e91ULL, 0x00fa36dd8b50eee5ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x002e788749a865f7ULL, 0x006e4dc3116861eaULL,
+                0x009f1428c37276e6ULL, 0x00e7d2e0fc1e1226ULL,
+                0x003aeebc6b6c45f6ULL, 0x0071a8073bf500c9ULL,
+                0x004b22ad986b530cULL, 0x00f439e63c0d79d4ULL) },
+            { FIELD_LITERAL(0x006bc3d53011f470ULL, 0x00032d6e692b83e8ULL,
+                0x00059722f497cd0bULL, 0x0009b4e6f0c497ccULL,
+                0x0058a804b7cce6c0ULL, 0x002b71d3302bbd5dULL,
+                0x00e2f82a36765fceULL, 0x008dded99524c703ULL) },
+            { FIELD_LITERAL(0x004d058953747d64ULL, 0x00701940fe79aa6fULL,
+                0x00a620ac71c760bfULL, 0x009532b611158b75ULL,
+                0x00547ed7f466f300ULL, 0x003cb5ab53a8401aULL,
+                0x00c7763168ce3120ULL, 0x007e48e33e4b9ab2ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x001b2fc57bf3c738ULL, 0x006a3f918993fb80ULL,
+                0x0026f7a14fdec288ULL, 0x0075a2cdccef08dbULL,
+                0x00d3ecbc9eecdbf1ULL, 0x0048c40f06e5bf7fULL,
+                0x00d63e423009896bULL, 0x000598bc99c056a8ULL) },
+            { FIELD_LITERAL(0x002f194eaafa46dcULL, 0x008e38f57fe87613ULL,
+                0x00dc8e5ae25f4ab2ULL, 0x000a17809575e6bdULL,
+                0x00d3ec7923ba366aULL, 0x003a7e72e0ad75e3ULL,
+                0x0010024b88436e0aULL, 0x00ed3c5444b64051ULL) },
+            { FIELD_LITERAL(0x00831fc1340af342ULL, 0x00c9645669466d35ULL,
+                0x007692b4cc5a080fULL, 0x009fd4a47ac9259fULL,
+                0x001eeddf7d45928bULL, 0x003c0446fc45f28bULL,
+                0x002c0713aa3e2507ULL, 0x0095706935f0f41eULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00766ae4190ec6d8ULL, 0x0065768cabc71380ULL,
+                0x00b902598416cdc2ULL, 0x00380021ad38df52ULL,
+                0x008f0b89d6551134ULL, 0x004254d4cc62c5a5ULL,
+                0x000d79f4484b9b94ULL, 0x00b516732ae3c50eULL) },
+            { FIELD_LITERAL(0x001fb73475c45509ULL, 0x00d2b2e5ea43345aULL,
+                0x00cb3c3842077bd1ULL, 0x0029f90ad820946eULL,
+                0x007c11b2380778aaULL, 0x009e54ece62c1704ULL,
+                0x004bc60c41ca01c3ULL, 0x004525679a5a0b03ULL) },
+            { FIELD_LITERAL(0x00c64fbddbed87b3ULL, 0x0040601d11731faaULL,
+                0x009c22475b6f9d67ULL, 0x0024b79dae875f15ULL,
+                0x00616fed3f02c3b0ULL, 0x0000cf39f6af2d3bULL,
+                0x00c46bac0aa9a688ULL, 0x00ab23e2800da204ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x000b3a37617632b0ULL, 0x00597199fe1cfb6cULL,
+                0x0042a7ccdfeafdd6ULL, 0x004cc9f15ebcea17ULL,
+                0x00f436e596a6b4a4ULL, 0x00168861142df0d8ULL,
+                0x000753edfec26af5ULL, 0x000c495d7e388116ULL) },
+            { FIELD_LITERAL(0x0017085f4a346148ULL, 0x00c7cf7a37f62272ULL,
+                0x001776e129bc5c30ULL, 0x009955134c9eef2aULL,
+                0x001ba5bdf1df07beULL, 0x00ec39497103a55cULL,
+                0x006578354fda6cfbULL, 0x005f02719d4f15eeULL) },
+            { FIELD_LITERAL(0x0052b9d9b5d9655dULL, 0x00d4ec7ba1b461c3ULL,
+                0x00f95df4974f280bULL, 0x003d8e5ca11aeb51ULL,
+                0x00d4981eb5a70b26ULL, 0x000af9a4f6659f29ULL,
+                0x004598c846faeb43ULL, 0x0049d9a183a47670ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x000a72d23dcb3f1fULL, 0x00a3737f84011727ULL,
+                0x00f870c0fbbf4a47ULL, 0x00a7aadd04b5c9caULL,
+                0x000c7715c67bd072ULL, 0x00015a136afcd74eULL,
+                0x0080d5caea499634ULL, 0x0026b448ec7514b7ULL) },
+            { FIELD_LITERAL(0x00b60167d9e7d065ULL, 0x00e60ba0d07381e8ULL,
+                0x003a4f17b725c2d4ULL, 0x006c19fe176b64faULL,
+                0x003b57b31af86ccbULL, 0x0021047c286180fdULL,
+                0x00bdc8fb00c6dbb6ULL, 0x00fe4a9f4bab4f3fULL) },
+            { FIELD_LITERAL(0x0088ffc3a16111f7ULL, 0x009155e4245d0bc8ULL,
+                0x00851d68220572d5ULL, 0x00557ace1e514d29ULL,
+                0x0031d7c339d91022ULL, 0x00101d0ae2eaceeaULL,
+                0x00246ab3f837b66aULL, 0x00d5216d381ff530ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x0057e7ea35f36daeULL, 0x00f47d7ad15de22eULL,
+                0x00d757ea4b105115ULL, 0x008311457d579d7eULL,
+                0x00b49b75b1edd4ebULL, 0x0081c7ff742fd63aULL,
+                0x00ddda3187433df6ULL, 0x00475727d55f9c66ULL) },
+            { FIELD_LITERAL(0x00a6295218dc136aULL, 0x00563b3af0e9c012ULL,
+                0x00d3753b0145db1bULL, 0x004550389c043dc1ULL,
+                0x00ea94ae27401bdfULL, 0x002b0b949f2b7956ULL,
+                0x00c63f780ad8e23cULL, 0x00e591c47d6bab15ULL) },
+            { FIELD_LITERAL(0x00416c582b058eb6ULL, 0x004107da5b2cc695ULL,
+                0x00b3cd2556aeec64ULL, 0x00c0b418267e57a1ULL,
+                0x001799293579bd2eULL, 0x0046ed44590e4d07ULL,
+                0x001d7459b3630a1eULL, 0x00c6afba8b6696aaULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x008d6009b26da3f8ULL, 0x00898e88ca06b1caULL,
+                0x00edb22b2ed7fe62ULL, 0x00fbc93516aabe80ULL,
+                0x008b4b470c42ce0dULL, 0x00e0032ba7d0dcbbULL,
+                0x00d76da3a956ecc8ULL, 0x007f20fe74e3852aULL) },
+            { FIELD_LITERAL(0x002419222c607674ULL, 0x00a7f23af89188b3ULL,
+                0x00ad127284e73d1cULL, 0x008bba582fae1c51ULL,
+                0x00fc6aa7ca9ecab1ULL, 0x003df5319eb6c2baULL,
+                0x002a05af8a8b199aULL, 0x004bf8354558407cULL) },
+            { FIELD_LITERAL(0x00ce7d4a30f0fcbfULL, 0x00d02c272629f03dULL,
+                0x0048c001f7400bc2ULL, 0x002c21368011958dULL,
+                0x0098a550391e96b5ULL, 0x002d80b66390f379ULL,
+                0x001fa878760cc785ULL, 0x001adfce54b613d5ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x001ed4dc71fa2523ULL, 0x005d0bff19bf9b5cULL,
+                0x00c3801cee065a64ULL, 0x001ed0b504323fbfULL,
+                0x0003ab9fdcbbc593ULL, 0x00df82070178b8d2ULL,
+                0x00a2bcaa9c251f85ULL, 0x00c628a3674bd02eULL) },
+            { FIELD_LITERAL(0x006b7a0674f9f8deULL, 0x00a742414e5c7cffULL,
+                0x0041cbf3c6e13221ULL, 0x00e3a64fd207af24ULL,
+                0x0087c05f15fbe8d1ULL, 0x004c50936d9e8a33ULL,
+                0x001306ec21042b6dULL, 0x00a4f4137d1141c2ULL) },
+            { FIELD_LITERAL(0x0009e6fb921568b0ULL, 0x00b3c60120219118ULL,
+                0x002a6c3460dd503aULL, 0x009db1ef11654b54ULL,
+                0x0063e4bf0be79601ULL, 0x00670d34bb2592b9ULL,
+                0x00dcee2f6c4130ceULL, 0x00b2682e88e77f54ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x000d5b4b3da135abULL, 0x00838f3e5064d81dULL,
+                0x00d44eb50f6d94edULL, 0x0008931ab502ac6dULL,
+                0x00debe01ca3d3586ULL, 0x0025c206775f0641ULL,
+                0x005ad4b6ae912763ULL, 0x007e2c318ad8f247ULL) },
+            { FIELD_LITERAL(0x00ddbe0750dd1addULL, 0x004b3c7b885844b8ULL,
+                0x00363e7ecf12f1aeULL, 0x0062e953e6438f9dULL,
+                0x0023cc73b076afe9ULL, 0x00b09fa083b4da32ULL,
+                0x00c7c3d2456c541dULL, 0x005b591ec6b694d4ULL) },
+            { FIELD_LITERAL(0x0028656e19d62fcfULL, 0x0052a4af03df148dULL,
+                0x00122765ddd14e42ULL, 0x00f2252904f67157ULL,
+                0x004741965b636f3aULL, 0x006441d296132cb9ULL,
+                0x005e2106f956a5b7ULL, 0x00247029592d335cULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x003fe038eb92f894ULL, 0x000e6da1b72e8e32ULL,
+                0x003a1411bfcbe0faULL, 0x00b55d473164a9e4ULL,
+                0x00b9a775ac2df48dULL, 0x0002ddf350659e21ULL,
+                0x00a279a69eb19cb3ULL, 0x00f844eab25cba44ULL) },
+            { FIELD_LITERAL(0x00c41d1f9c1f1ac1ULL, 0x007b2df4e9f19146ULL,
+                0x00b469355fd5ba7aULL, 0x00b5e1965afc852aULL,
+                0x00388d5f1e2d8217ULL, 0x0022079e4c09ae93ULL,
+                0x0014268acd4ef518ULL, 0x00c1dd8d9640464cULL) },
+            { FIELD_LITERAL(0x0038526adeed0c55ULL, 0x00dd68c607e3fe85ULL,
+                0x00f746ddd48a5d57ULL, 0x0042f2952b963b7cULL,
+                0x001cbbd6876d5ec2ULL, 0x005e341470bca5c2ULL,
+                0x00871d41e085f413ULL, 0x00e53ab098f45732ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x004d51124797c831ULL, 0x008f5ae3750347adULL,
+                0x0070ced94c1a0c8eULL, 0x00f6db2043898e64ULL,
+                0x000d00c9a5750cd0ULL, 0x000741ec59bad712ULL,
+                0x003c9d11aab37b7fULL, 0x00a67ba169807714ULL) },
+            { FIELD_LITERAL(0x00adb2c1566e8b8fULL, 0x0096c68a35771a9aULL,
+                0x00869933356f334aULL, 0x00ba9c93459f5962ULL,
+                0x009ec73fb6e8ca4bULL, 0x003c3802c27202e1ULL,
+                0x0031f5b733e0c008ULL, 0x00f9058c19611fa9ULL) },
+            { FIELD_LITERAL(0x00238f01814a3421ULL, 0x00c325a44b6cce28ULL,
+                0x002136f97aeb0e73ULL, 0x000cac8268a4afe2ULL,
+                0x0022fd218da471b3ULL, 0x009dcd8dfff8def9ULL,
+                0x00cb9f8181d999bbULL, 0x00143ae56edea349ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x0000623bf87622c5ULL, 0x00a1966fdd069496ULL,
+                0x00c315b7b812f9fcULL, 0x00bdf5efcd128b97ULL,
+                0x001d464f532e3e16ULL, 0x003cd94f081bfd7eULL,
+                0x00ed9dae12ce4009ULL, 0x002756f5736eee70ULL) },
+            { FIELD_LITERAL(0x00a5187e6ee7341bULL, 0x00e6d52e82d83b6eULL,
+                0x00df3c41323094a7ULL, 0x00b3324f444e9de9ULL,
+                0x00689eb21a35bfe5ULL, 0x00f16363becd548dULL,
+                0x00e187cc98e7f60fULL, 0x00127d9062f0ccabULL) },
+            { FIELD_LITERAL(0x004ad71b31c29e40ULL, 0x00a5fcace12fae29ULL,
+                0x004425b5597280edULL, 0x00e7ef5d716c3346ULL,
+                0x0010b53ada410ac8ULL, 0x0092310226060c9bULL,
+                0x0091c26128729c7eULL, 0x0088b42900f8ec3bULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00f1e26e9762d4a8ULL, 0x00d9d74082183414ULL,
+                0x00ffec9bd57a0282ULL, 0x000919e128fd497aULL,
+                0x00ab7ae7d00fe5f8ULL, 0x0054dc442851ff68ULL,
+                0x00c9ebeb3b861687ULL, 0x00507f7cab8b698fULL) },
+            { FIELD_LITERAL(0x00c13c5aae3ae341ULL, 0x009c6c9ed98373e7ULL,
+                0x00098f26864577a8ULL, 0x0015b886e9488b45ULL,
+                0x0037692c42aadba5ULL, 0x00b83170b8e7791cULL,
+                0x001670952ece1b44ULL, 0x00fd932a39276da2ULL) },
+            { FIELD_LITERAL(0x0081a3259bef3398ULL, 0x005480fff416107bULL,
+                0x00ce4f607d21be98ULL, 0x003ffc084b41df9bULL,
+                0x0043d0bb100502d1ULL, 0x00ec35f575ba3261ULL,
+                0x00ca18f677300ef3ULL, 0x00e8bb0a827d8548ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00df76b3328ada72ULL, 0x002e20621604a7c2ULL,
+                0x00f910638a105b09ULL, 0x00ef4724d96ef2cdULL,
+                0x00377d83d6b8a2f7ULL, 0x00b4f48805ade324ULL,
+                0x001cd5da8b152018ULL, 0x0045af671a20ca7fULL) },
+            { FIELD_LITERAL(0x009ae3b93a56c404ULL, 0x004a410b7a456699ULL,
+                0x00023a619355e6b2ULL, 0x009cdc7297387257ULL,
+                0x0055b94d4ae70d04ULL, 0x002cbd607f65b005ULL,
+                0x003208b489697166ULL, 0x00ea2aa058867370ULL) },
+            { FIELD_LITERAL(0x00f29d2598ee3f32ULL, 0x00b4ac5385d82adcULL,
+                0x007633eaf04df19bULL, 0x00aa2d3d77ceab01ULL,
+                0x004a2302fcbb778aULL, 0x00927f225d5afa34ULL,
+                0x004a8e9d5047f237ULL, 0x008224ae9dbce530ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x001cf640859b02f8ULL, 0x00758d1d5d5ce427ULL,
+                0x00763c784ef4604cULL, 0x005fa81aee205270ULL,
+                0x00ac537bfdfc44cbULL, 0x004b919bd342d670ULL,
+                0x00238508d9bf4b7aULL, 0x00154888795644f3ULL) },
+            { FIELD_LITERAL(0x00c845923c084294ULL, 0x00072419a201bc25ULL,
+                0x0045f408b5f8e669ULL, 0x00e9d6a186b74dfeULL,
+                0x00e19108c68fa075ULL, 0x0017b91d874177b7ULL,
+                0x002f0ca2c7912c5aULL, 0x009400aa385a90a2ULL) },
+            { FIELD_LITERAL(0x0071110b01482184ULL, 0x00cfed0044f2bef8ULL,
+                0x0034f2901cf4662eULL, 0x003b4ae2a67f9834ULL,
+                0x00cca9b96fe94810ULL, 0x00522507ae77abd0ULL,
+                0x00bac7422721e73eULL, 0x0066622b0f3a62b0ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00f8ac5cf4705b6aULL, 0x00867d82dcb457e3ULL,
+                0x007e13ab2ccc2ce9ULL, 0x009ee9a018d3930eULL,
+                0x008370f8ecb42df8ULL, 0x002d9f019add263eULL,
+                0x003302385b92d196ULL, 0x00a15654536e2c0cULL) },
+            { FIELD_LITERAL(0x0026ef1614e160afULL, 0x00c023f9edfc9c76ULL,
+                0x00cff090da5f57baULL, 0x0076db7a66643ae9ULL,
+                0x0019462f8c646999ULL, 0x008fec00b3854b22ULL,
+                0x00d55041692a0a1cULL, 0x0065db894215ca00ULL) },
+            { FIELD_LITERAL(0x00a925036e0a451cULL, 0x002a0390c36b6cc1ULL,
+                0x00f27020d90894f4ULL, 0x008d90d52cbd3d7fULL,
+                0x00e1d0137392f3b8ULL, 0x00f017c158b51a8fULL,
+                0x00cac313d3ed7dbcULL, 0x00b99a81e3eb42d3ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00b54850275fe626ULL, 0x0053a3fd1ec71140ULL,
+                0x00e3d2d7dbe096faULL, 0x00e4ac7b595cce4cULL,
+                0x0077bad449c0a494ULL, 0x00b7c98814afd5b3ULL,
+                0x0057226f58486cf9ULL, 0x00b1557154f0cc57ULL) },
+            { FIELD_LITERAL(0x008cc9cd236315c0ULL, 0x0031d9c5b39fda54ULL,
+                0x00a5713ef37e1171ULL, 0x00293d5ae2886325ULL,
+                0x00c4aba3e05015e1ULL, 0x0003f35ef78e4fc6ULL,
+                0x0039d6bd3ac1527bULL, 0x0019d7c3afb77106ULL) },
+            { FIELD_LITERAL(0x007b162931a985afULL, 0x00ad40a2e0daa713ULL,
+                0x006df27c4009f118ULL, 0x00503e9f4e2e8becULL,
+                0x00751a77c82c182dULL, 0x000298937769245bULL,
+                0x00ffb1e8fabf9ee5ULL, 0x0008334706e09abeULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00dbca4e98a7dcd9ULL, 0x00ee29cfc78bde99ULL,
+                0x00e4a3b6995f52e9ULL, 0x0045d70189ae8096ULL,
+                0x00fd2a8a3b9b0d1bULL, 0x00af1793b107d8e1ULL,
+                0x00dbf92cbe4afa20ULL, 0x00da60f798e3681dULL) },
+            { FIELD_LITERAL(0x004246bfcecc627aULL, 0x004ba431246c03a4ULL,
+                0x00bd1d101872d497ULL, 0x003b73d3f185ee16ULL,
+                0x001feb2e2678c0e3ULL, 0x00ff13c5a89dec76ULL,
+                0x00ed06042e771d8fULL, 0x00a4fd2a897a83ddULL) },
+            { FIELD_LITERAL(0x009a4a3be50d6597ULL, 0x00de3165fc5a1096ULL,
+                0x004f3f56e345b0c7ULL, 0x00f7bf721d5ab8bcULL,
+                0x004313e47b098c50ULL, 0x00e4c7d5c0e1adbbULL,
+                0x002e3e3db365051eULL, 0x00a480c2cd6a96fbULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00417fa30a7119edULL, 0x00af257758419751ULL,
+                0x00d358a487b463d4ULL, 0x0089703cc720b00dULL,
+                0x00ce56314ff7f271ULL, 0x0064db171ade62c1ULL,
+                0x00640b36d4a22fedULL, 0x00424eb88696d23fULL) },
+            { FIELD_LITERAL(0x004ede34af2813f3ULL, 0x00d4a8e11c9e8216ULL,
+                0x004796d5041de8a5ULL, 0x00c4c6b4d21cc987ULL,
+                0x00e8a433ee07fa1eULL, 0x0055720b5abcc5a1ULL,
+                0x008873ea9c74b080ULL, 0x005b3fec1ab65d48ULL) },
+            { FIELD_LITERAL(0x0047e5277db70ec5ULL, 0x000a096c66db7d6bULL,
+                0x00b4164cc1730159ULL, 0x004a9f783fe720feULL,
+                0x00a8177b94449dbcULL, 0x0095a24ff49a599fULL,
+                0x0069c1c578250cbcULL, 0x00452019213debf4ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x0021ce99e09ebda3ULL, 0x00fcbd9f91875ad0ULL,
+                0x009bbf6b7b7a0b5fULL, 0x00388886a69b1940ULL,
+                0x00926a56d0f81f12ULL, 0x00e12903c3358d46ULL,
+                0x005dfce4e8e1ce9dULL, 0x0044cfa94e2f7e23ULL) },
+            { FIELD_LITERAL(0x001bd59c09e982eaULL, 0x00f72daeb937b289ULL,
+                0x0018b76dca908e0eULL, 0x00edb498512384adULL,
+                0x00ce0243b6cc9538ULL, 0x00f96ff690cb4e70ULL,
+                0x007c77bf9f673c8dULL, 0x005bf704c088a528ULL) },
+            { FIELD_LITERAL(0x0093d4628dcb33beULL, 0x0095263d51d42582ULL,
+                0x0049b3222458fe06ULL, 0x00e7fce73b653a7fULL,
+                0x003ca2ebce60b369ULL, 0x00c5de239a32bea4ULL,
+                0x0063b8b3d71fb6bfULL, 0x0039aeeb78a1a839ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x007dc52da400336cULL, 0x001fded1e15b9457ULL,
+                0x00902e00f5568e3aULL, 0x00219bef40456d2dULL,
+                0x005684161fb3dbc9ULL, 0x004a4e9be49a76eaULL,
+                0x006e685ae88b78ffULL, 0x0021c42f13042d3cULL) },
+            { FIELD_LITERAL(0x00fb22bb5fd3ce50ULL, 0x0017b48aada7ae54ULL,
+                0x00fd5c44ad19a536ULL, 0x000ccc4e4e55e45cULL,
+                0x00fd637d45b4c3f5ULL, 0x0038914e023c37cfULL,
+                0x00ac1881d6a8d898ULL, 0x00611ed8d3d943a8ULL) },
+            { FIELD_LITERAL(0x0056e2259d113d2bULL, 0x00594819b284ec16ULL,
+                0x00c7bf794bb36696ULL, 0x00721ee75097cdc6ULL,
+                0x00f71be9047a2892ULL, 0x00df6ba142564edfULL,
+                0x0069580b7a184e8dULL, 0x00f056e38fca0feeULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x009df98566a18c6dULL, 0x00cf3a200968f219ULL,
+                0x0044ba60da6d9086ULL, 0x00dbc9c0e344da03ULL,
+                0x000f9401c4466855ULL, 0x00d46a57c5b0a8d1ULL,
+                0x00875a635d7ac7c6ULL, 0x00ef4a933b7e0ae6ULL) },
+            { FIELD_LITERAL(0x005e8694077a1535ULL, 0x008bef75f71c8f1dULL,
+                0x000a7c1316423511ULL, 0x00906e1d70604320ULL,
+                0x003fc46c1a2ffbd6ULL, 0x00d1d5022e68f360ULL,
+                0x002515fba37bbf46ULL, 0x00ca16234e023b44ULL) },
+            { FIELD_LITERAL(0x00787c99561f4690ULL, 0x00a857a8c1561f27ULL,
+                0x00a10df9223c09feULL, 0x00b98a9562e3b154ULL,
+                0x004330b8744c3ed2ULL, 0x00e06812807ec5c4ULL,
+                0x00e4cf6a7db9f1e3ULL, 0x00d95b089f132a34ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x002922b39ca33eecULL, 0x0090d12a5f3ab194ULL,
+                0x00ab60c02fb5f8edULL, 0x00188d292abba1cfULL,
+                0x00e10edec9698f6eULL, 0x0069a4d9934133c8ULL,
+                0x0024aac40e6d3d06ULL, 0x001702c2177661b0ULL) },
+            { FIELD_LITERAL(0x00139078397030bdULL, 0x000e3c447e859a00ULL,
+                0x0064a5b334c82393ULL, 0x00b8aabeb7358093ULL,
+                0x00020778bb9ae73bULL, 0x0032ee94c7892a18ULL,
+                0x008215253cb41bdaULL, 0x005e2797593517aeULL) },
+            { FIELD_LITERAL(0x0083765a5f855d4aULL, 0x0051b6d1351b8ee2ULL,
+                0x00116de548b0f7bbULL, 0x0087bd88703affa0ULL,
+                0x0095b2cc34d7fdd2ULL, 0x0084cd81b53f0bc8ULL,
+                0x008562fc995350edULL, 0x00a39abb193651e3ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x0019e23f0474b114ULL, 0x00eb94c2ad3b437eULL,
+                0x006ddb34683b75acULL, 0x00391f9209b564c6ULL,
+                0x00083b3bb3bff7aaULL, 0x00eedcd0f6dceefcULL,
+                0x00b50817f794fe01ULL, 0x0036474deaaa75c9ULL) },
+            { FIELD_LITERAL(0x0091868594265aa2ULL, 0x00797accae98ca6dULL,
+                0x0008d8c5f0f8a184ULL, 0x00d1f4f1c2b2fe6eULL,
+                0x0036783dfb48a006ULL, 0x008c165120503527ULL,
+                0x0025fd780058ce9bULL, 0x0068beb007be7d27ULL) },
+            { FIELD_LITERAL(0x00d0ff88aa7c90c2ULL, 0x00b2c60dacf53394ULL,
+                0x0094a7284d9666d6ULL, 0x00bed9022ce7a19dULL,
+                0x00c51553f0cd7682ULL, 0x00c3fb870b124992ULL,
+                0x008d0bc539956c9bULL, 0x00fc8cf258bb8885ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x003667bf998406f8ULL, 0x0000115c43a12975ULL,
+                0x001e662f3b20e8fdULL, 0x0019ffa534cb24ebULL,
+                0x00016be0dc8efb45ULL, 0x00ff76a8b26243f5ULL,
+                0x00ae20d241a541e3ULL, 0x0069bd6af13cd430ULL) },
+            { FIELD_LITERAL(0x0045fdc16487cda3ULL, 0x00b2d8e844cf2ed7ULL,
+                0x00612c50e88c1607ULL, 0x00a08aabc66c1672ULL,
+                0x006031fdcbb24d97ULL, 0x001b639525744b93ULL,
+                0x004409d62639ab17ULL, 0x00a1853d0347ab1dULL) },
+            { FIELD_LITERAL(0x0075a1a56ebf5c21ULL, 0x00a3e72be9ac53edULL,
+                0x00efcde1629170c2ULL, 0x0004225fe91ef535ULL,
+                0x0088049fc73dfda7ULL, 0x004abc74857e1288ULL,
+                0x0024e2434657317cULL, 0x00d98cb3d3e5543cULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00b4b53eab6bdb19ULL, 0x009b22d8b43711d0ULL,
+                0x00d948b9d961785dULL, 0x00cb167b6f279eadULL,
+                0x00191de3a678e1c9ULL, 0x00d9dd9511095c2eULL,
+                0x00f284324cd43067ULL, 0x00ed74fa535151ddULL) },
+            { FIELD_LITERAL(0x007e32c049b5c477ULL, 0x009d2bfdbd9bcfd8ULL,
+                0x00636e93045938c6ULL, 0x007fde4af7687298ULL,
+                0x0046a5184fafa5d3ULL, 0x0079b1e7f13a359bULL,
+                0x00875adf1fb927d6ULL, 0x00333e21c61bcad2ULL) },
+            { FIELD_LITERAL(0x00048014f73d8b8dULL, 0x0075684aa0966388ULL,
+                0x0092be7df06dc47cULL, 0x0097cebcd0f5568aULL,
+                0x005a7004d9c4c6a9ULL, 0x00b0ecbb659924c7ULL,
+                0x00d90332dd492a7cULL, 0x0057fc14df11493dULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x0008ed8ea0ad95beULL, 0x0041d324b9709645ULL,
+                0x00e25412257a19b4ULL, 0x0058df9f3423d8d2ULL,
+                0x00a9ab20def71304ULL, 0x009ae0dbf8ac4a81ULL,
+                0x00c9565977e4392aULL, 0x003c9269444baf55ULL) },
+            { FIELD_LITERAL(0x007df6cbb926830bULL, 0x00d336058ae37865ULL,
+                0x007af47dac696423ULL, 0x0048d3011ec64ac8ULL,
+                0x006b87666e40049fULL, 0x0036a2e0e51303d7ULL,
+                0x00ba319bd79dbc55ULL, 0x003e2737ecc94f53ULL) },
+            { FIELD_LITERAL(0x00d296ff726272d9ULL, 0x00f6d097928fcf57ULL,
+                0x00e0e616a55d7013ULL, 0x00deaf454ed9eac7ULL,
+                0x0073a56bedef4d92ULL, 0x006ccfdf6fc92e19ULL,
+                0x009d1ee1371a7218ULL, 0x00ee3c2ee4462d80ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00437bce9bccdf9dULL, 0x00e0c8e2f85dc0a3ULL,
+                0x00c91a7073995a19ULL, 0x00856ec9fe294559ULL,
+                0x009e4b33394b156eULL, 0x00e245b0dc497e5cULL,
+                0x006a54e687eeaeffULL, 0x00f1cd1cd00fdb7cULL) },
+            { FIELD_LITERAL(0x008132ae5c5d8cd1ULL, 0x00121d68324a1d9fULL,
+                0x00d6be9dafcb8c76ULL, 0x00684d9070edf745ULL,
+                0x00519fbc96d7448eULL, 0x00388182fdc1f27eULL,
+                0x000235baed41f158ULL, 0x00bf6cf6f1a1796aULL) },
+            { FIELD_LITERAL(0x002adc4b4d148219ULL, 0x003084ada0d3a90aULL,
+                0x0046de8aab0f2e4eULL, 0x00452d342a67b5fdULL,
+                0x00d4b50f01d4de21ULL, 0x00db6d9fc0cefb79ULL,
+                0x008c184c86a462cdULL, 0x00e17c83764d42daULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x007b2743b9a1e01aULL, 0x007847ffd42688c4ULL,
+                0x006c7844d610a316ULL, 0x00f0cb8b250aa4b0ULL,
+                0x00a19060143b3ae6ULL, 0x0014eb10b77cfd80ULL,
+                0x000170905729dd06ULL, 0x00063b5b9cd72477ULL) },
+            { FIELD_LITERAL(0x00ce382dc7993d92ULL, 0x00021153e938b4c8ULL,
+                0x00096f7567f48f51ULL, 0x0058f81ddfe4b0d5ULL,
+                0x00cc379a56b355c7ULL, 0x002c760770d3e819ULL,
+                0x00ee22d1d26e5a40ULL, 0x00de6d93d5b082d7ULL) },
+            { FIELD_LITERAL(0x000a91a42c52e056ULL, 0x00185f6b77fce7eaULL,
+                0x000803c51962f6b5ULL, 0x0022528582ba563dULL,
+                0x0043f8040e9856d6ULL, 0x0085a29ec81fb860ULL,
+                0x005f9a611549f5ffULL, 0x00c1f974ecbd4b06ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x005b64c6fd65ec97ULL, 0x00c1fdd7f877bc7fULL,
+                0x000d9cc6c89f841cULL, 0x005c97b7f1aff9adULL,
+                0x0075e3c61475d47eULL, 0x001ecb1ba8153011ULL,
+                0x00fe7f1c8d71d40dULL, 0x003fa9757a229832ULL) },
+            { FIELD_LITERAL(0x00ffc5c89d2b0cbaULL, 0x00d363d42e3e6fc3ULL,
+                0x0019a1a0118e2e8aULL, 0x00f7baeff48882e1ULL,
+                0x001bd5af28c6b514ULL, 0x0055476ca2253cb2ULL,
+                0x00d8eb1977e2ddf3ULL, 0x00b173b1adb228a1ULL) },
+            { FIELD_LITERAL(0x00f2cb99dd0ad707ULL, 0x00e1e08b6859ddd8ULL,
+                0x000008f2d0650bccULL, 0x00d7ed392f8615c3ULL,
+                0x00976750a94da27fULL, 0x003e83bb0ecb69baULL,
+                0x00df8e8d15c14ac6ULL, 0x00f9f7174295d9c2ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00f11cc8e0e70bcbULL, 0x00e5dc689974e7ddULL,
+                0x0014e409f9ee5870ULL, 0x00826e6689acbd63ULL,
+                0x008a6f4e3d895d88ULL, 0x00b26a8da41fd4adULL,
+                0x000fb7723f83efd7ULL, 0x009c749db0a5f6c3ULL) },
+            { FIELD_LITERAL(0x002389319450f9baULL, 0x003677f31aa1250aULL,
+                0x0092c3db642f38cbULL, 0x00f8b64c0dfc9773ULL,
+                0x00cd49fe3505b795ULL, 0x0068105a4090a510ULL,
+                0x00df0ba2072a8bb6ULL, 0x00eb396143afd8beULL) },
+            { FIELD_LITERAL(0x00a0d4ecfb24cdffULL, 0x00ddaf8008ba6479ULL,
+                0x00f0b3e36d4b0f44ULL, 0x003734bd3af1f146ULL,
+                0x00b87e2efc75527eULL, 0x00d230df55ddab50ULL,
+                0x002613257ae56c1dULL, 0x00bc0946d135934dULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00468711bd994651ULL, 0x0033108fa67561bfULL,
+                0x0089d760192a54b4ULL, 0x00adc433de9f1871ULL,
+                0x000467d05f36e050ULL, 0x007847e0f0579f7fULL,
+                0x00a2314ad320052dULL, 0x00b3a93649f0b243ULL) },
+            { FIELD_LITERAL(0x0067f8f0c4fe26c9ULL, 0x0079c4a3cc8f67b9ULL,
+                0x0082b1e62f23550dULL, 0x00f2d409caefd7f5ULL,
+                0x0080e67dcdb26e81ULL, 0x0087ae993ea1f98aULL,
+                0x00aa108becf61d03ULL, 0x001acf11efb608a3ULL) },
+            { FIELD_LITERAL(0x008225febbab50d9ULL, 0x00f3b605e4dd2083ULL,
+                0x00a32b28189e23d2ULL, 0x00d507e5e5eb4c97ULL,
+                0x005a1a84e302821fULL, 0x0006f54c1c5f08c7ULL,
+                0x00a347c8cb2843f0ULL, 0x0009f73e9544bfa5ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x006c59c9ae744185ULL, 0x009fc32f1b4282cdULL,
+                0x004d6348ca59b1acULL, 0x00105376881be067ULL,
+                0x00af4096013147dcULL, 0x004abfb5a5cb3124ULL,
+                0x000d2a7f8626c354ULL, 0x009c6ed568e07431ULL) },
+            { FIELD_LITERAL(0x00e828333c297f8bULL, 0x009ef3cf8c3f7e1fULL,
+                0x00ab45f8fff31cb9ULL, 0x00c8b4178cb0b013ULL,
+                0x00d0c50dd3260a3fULL, 0x0097126ac257f5bcULL,
+                0x0042376cc90c705aULL, 0x001d96fdb4a1071eULL) },
+            { FIELD_LITERAL(0x00542d44d89ee1a8ULL, 0x00306642e0442d98ULL,
+                0x0090853872b87338ULL, 0x002362cbf22dc044ULL,
+                0x002c222adff663b8ULL, 0x0067c924495fcb79ULL,
+                0x000e621d983c977cULL, 0x00df77a9eccb66fbULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x002809e4bbf1814aULL, 0x00b9e854f9fafb32ULL,
+                0x00d35e67c10f7a67ULL, 0x008f1bcb76e748cfULL,
+                0x004224d9515687d2ULL, 0x005ba0b774e620c4ULL,
+                0x00b5e57db5d54119ULL, 0x00e15babe5683282ULL) },
+            { FIELD_LITERAL(0x00832d02369b482cULL, 0x00cba52ff0d93450ULL,
+                0x003fa9c908d554dbULL, 0x008d1e357b54122fULL,
+                0x00abd91c2dc950c6ULL, 0x007eff1df4c0ec69ULL,
+                0x003f6aeb13fb2d31ULL, 0x00002d6179fc5b2cULL) },
+            { FIELD_LITERAL(0x0046c9eda81c9c89ULL, 0x00b60cb71c8f62fcULL,
+                0x0022f5a683baa558ULL, 0x00f87319fccdf997ULL,
+                0x009ca09b51ce6a22ULL, 0x005b12baf4af7d77ULL,
+                0x008a46524a1e33e2ULL, 0x00035a77e988be0dULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00a7efe46a7dbe2fULL, 0x002f66fd55014fe7ULL,
+                0x006a428afa1ff026ULL, 0x0056caaa9604ab72ULL,
+                0x0033f3bcd7fac8aeULL, 0x00ccb1aa01c86764ULL,
+                0x00158d1edf13bf40ULL, 0x009848ee76fcf3b4ULL) },
+            { FIELD_LITERAL(0x00a9e7730a819691ULL, 0x00d9cc73c4992b70ULL,
+                0x00e299bde067de5aULL, 0x008c314eb705192aULL,
+                0x00e7226f17e8a3ccULL, 0x0029dfd956e65a47ULL,
+                0x0053a8e839073b12ULL, 0x006f942b2ab1597eULL) },
+            { FIELD_LITERAL(0x001c3d780ecd5e39ULL, 0x0094f247fbdcc5feULL,
+                0x00d5c786fd527764ULL, 0x00b6f4da74f0db2aULL,
+                0x0080f1f8badcd5fcULL, 0x00f36a373ad2e23bULL,
+                0x00f804f9f4343bf2ULL, 0x00d1af40ec623982ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x0082aeace5f1b144ULL, 0x00f68b3108cf4dd3ULL,
+                0x00634af01dde3020ULL, 0x000beab5df5c2355ULL,
+                0x00e8b790d1b49b0bULL, 0x00e48d15854e36f4ULL,
+                0x0040ab2d95f3db9fULL, 0x002711c4ed9e899aULL) },
+            { FIELD_LITERAL(0x0039343746531ebeULL, 0x00c8509d835d429dULL,
+                0x00e79eceff6b0018ULL, 0x004abfd31e8efce5ULL,
+                0x007bbfaaa1e20210ULL, 0x00e3be89c193e179ULL,
+                0x001c420f4c31d585ULL, 0x00f414a315bef5aeULL) },
+            { FIELD_LITERAL(0x007c296a24990df8ULL, 0x00d5d07525a75588ULL,
+                0x00dd8e113e94b7e7ULL, 0x007bbc58febe0cc8ULL,
+                0x0029f51af9bfcad3ULL, 0x007e9311ec7ab6f3ULL,
+                0x009a884de1676343ULL, 0x0050d5f2dce84be9ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x005fa020cca2450aULL, 0x00491c29db6416d8ULL,
+                0x0037cefe3f9f9a85ULL, 0x003d405230647066ULL,
+                0x0049e835f0fdbe89ULL, 0x00feb78ac1a0815cULL,
+                0x00828e4b32dc9724ULL, 0x00db84f2dc8d6fd4ULL) },
+            { FIELD_LITERAL(0x0098cddc8b39549aULL, 0x006da37e3b05d22cULL,
+                0x00ce633cfd4eb3cbULL, 0x00fda288ef526acdULL,
+                0x0025338878c5d30aULL, 0x00f34438c4e5a1b4ULL,
+                0x00584efea7c310f1ULL, 0x0041a551f1b660adULL) },
+            { FIELD_LITERAL(0x00d7f7a8fbd6437aULL, 0x0062872413bf3753ULL,
+                0x00ad4bbcb43c584bULL, 0x007fe49be601d7e3ULL,
+                0x0077c659789babf4ULL, 0x00eb45fcb06a741bULL,
+                0x005ce244913f9708ULL, 0x0088426401736326ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x007bf562ca768d7cULL, 0x006c1f3a174e387cULL,
+                0x00f024b447fee939ULL, 0x007e7af75f01143fULL,
+                0x003adb70b4eed89dULL, 0x00e43544021ad79aULL,
+                0x0091f7f7042011f6ULL, 0x0093c1a1ee3a0ddcULL) },
+            { FIELD_LITERAL(0x00a0b68ec1eb72d2ULL, 0x002c03235c0d45a0ULL,
+                0x00553627323fe8c5ULL, 0x006186e94b17af94ULL,
+                0x00a9906196e29f14ULL, 0x0025b3aee6567733ULL,
+                0x007e0dd840080517ULL, 0x0018eb5801a4ba93ULL) },
+            { FIELD_LITERAL(0x00d7fe7017bf6a40ULL, 0x006e3f0624be0c42ULL,
+                0x00ffbba205358245ULL, 0x00f9fc2cf8194239ULL,
+                0x008d93b37bf15b4eULL, 0x006ddf2e38be8e95ULL,
+                0x002b6e79bf5fcff9ULL, 0x00ab355da425e2deULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00938f97e20be973ULL, 0x0099141a36aaf306ULL,
+                0x0057b0ca29e545a1ULL, 0x0085db571f9fbc13ULL,
+                0x008b333c554b4693ULL, 0x0043ab6ef3e241cbULL,
+                0x0054fb20aa1e5c70ULL, 0x00be0ff852760adfULL) },
+            { FIELD_LITERAL(0x003973d8938971d6ULL, 0x002aca26fa80c1f5ULL,
+                0x00108af1faa6b513ULL, 0x00daae275d7924e6ULL,
+                0x0053634ced721308ULL, 0x00d2355fe0bbd443ULL,
+                0x00357612b2d22095ULL, 0x00f9bb9dd4136cf3ULL) },
+            { FIELD_LITERAL(0x002bff12cf5e03a5ULL, 0x001bdb1fa8a19cf8ULL,
+                0x00c91c6793f84d39ULL, 0x00f869f1b2eba9afULL,
+                0x0059bc547dc3236bULL, 0x00d91611d6d38689ULL,
+                0x00e062daaa2c0214ULL, 0x00ed3c047cc2bc82ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x000050d70c32b31aULL, 0x001939d576d437b3ULL,
+                0x00d709e598bf9fe6ULL, 0x00a885b34bd2ee9eULL,
+                0x00dd4b5c08ab1a50ULL, 0x0091bebd50b55639ULL,
+                0x00cf79ff64acdbc6ULL, 0x006067a39d826336ULL) },
+            { FIELD_LITERAL(0x0062dd0fb31be374ULL, 0x00fcc96b84c8e727ULL,
+                0x003f64f1375e6ae3ULL, 0x0057d9b6dd1af004ULL,
+                0x00d6a167b1103c7bULL, 0x00dd28f3180fb537ULL,
+                0x004ff27ad7167128ULL, 0x008934c33461f2acULL) },
+            { FIELD_LITERAL(0x0065b472b7900043ULL, 0x00ba7efd2ff1064bULL,
+                0x000b67d6c4c3020fULL, 0x0012d28469f4e46dULL,
+                0x0031c32939703ec7ULL, 0x00b49f0bce133066ULL,
+                0x00f7e10416181d47ULL, 0x005c90f51867eeccULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x0051207abd179101ULL, 0x00fc2a5c20d9c5daULL,
+                0x00fb9d5f2701b6dfULL, 0x002dd040fdea82b8ULL,
+                0x00f163b0738442ffULL, 0x00d9736bd68855b8ULL,
+                0x00e0d8e93005e61cULL, 0x00df5a40b3988570ULL) },
+            { FIELD_LITERAL(0x0006918f5dfce6dcULL, 0x00d4bf1c793c57fbULL,
+                0x0069a3f649435364ULL, 0x00e89a50e5b0cd6eULL,
+                0x00b9f6a237e973afULL, 0x006d4ed8b104e41dULL,
+                0x00498946a3924cd2ULL, 0x00c136ec5ac9d4f7ULL) },
+            { FIELD_LITERAL(0x0011a9c290ac5336ULL, 0x002b9a2d4a6a6533ULL,
+                0x009a8a68c445d937ULL, 0x00361b27b07e5e5cULL,
+                0x003c043b1755b974ULL, 0x00b7eb66cf1155eeULL,
+                0x0077af5909eefff2ULL, 0x0098f609877cc806ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00ab13af436bf8f4ULL, 0x000bcf0a0dac8574ULL,
+                0x00d50c864f705045ULL, 0x00c40e611debc842ULL,
+                0x0085010489bd5caaULL, 0x007c5050acec026fULL,
+                0x00f67d943c8da6d1ULL, 0x00de1da0278074c6ULL) },
+            { FIELD_LITERAL(0x00b373076597455fULL, 0x00e83f1af53ac0f5ULL,
+                0x0041f63c01dc6840ULL, 0x0097dea19b0c6f4bULL,
+                0x007f9d63b4c1572cULL, 0x00e692d492d0f5f0ULL,
+                0x00cbcb392e83b4adULL, 0x0069c0f39ed9b1a8ULL) },
+            { FIELD_LITERAL(0x00861030012707c9ULL, 0x009fbbdc7fd4aafbULL,
+                0x008f591d6b554822ULL, 0x00df08a41ea18adeULL,
+                0x009d7d83e642abeaULL, 0x0098c71bda3b78ffULL,
+                0x0022c89e7021f005ULL, 0x0044d29a3fe1e3c4ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00e748cd7b5c52f2ULL, 0x00ea9df883f89cc3ULL,
+                0x0018970df156b6c7ULL, 0x00c5a46c2a33a847ULL,
+                0x00cbde395e32aa09ULL, 0x0072474ebb423140ULL,
+                0x00fb00053086a23dULL, 0x001dafcfe22d4e1fULL) },
+            { FIELD_LITERAL(0x00c903ee6d825540ULL, 0x00add6c4cf98473eULL,
+                0x007636efed4227f1ULL, 0x00905124ae55e772ULL,
+                0x00e6b38fab12ed53ULL, 0x0045e132b863fe55ULL,
+                0x003974662edb366aULL, 0x00b1787052be8208ULL) },
+            { FIELD_LITERAL(0x00a614b00d775c7cULL, 0x00d7c78941cc7754ULL,
+                0x00422dd68b5dabc4ULL, 0x00a6110f0167d28bULL,
+                0x00685a309c252886ULL, 0x00b439ffd5143660ULL,
+                0x003656e29ee7396fULL, 0x00c7c9b9ed5ad854ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x0040f7e7c5b37bf2ULL, 0x0064e4dc81181bbaULL,
+                0x00a8767ae2a366b6ULL, 0x001496b4f90546f2ULL,
+                0x002a28493f860441ULL, 0x0021f59513049a3aULL,
+                0x00852d369a8b7ee3ULL, 0x00dd2e7d8b7d30a9ULL) },
+            { FIELD_LITERAL(0x00006e34a35d9fbcULL, 0x00eee4e48b2f019aULL,
+                0x006b344743003a5fULL, 0x00541d514f04a7e3ULL,
+                0x00e81f9ee7647455ULL, 0x005e2b916c438f81ULL,
+                0x00116f8137b7eff0ULL, 0x009bd3decc7039d1ULL) },
+            { FIELD_LITERAL(0x0005d226f434110dULL, 0x00af8288b8ef21d5ULL,
+                0x004a7a52ef181c8cULL, 0x00be0b781b4b06deULL,
+                0x00e6e3627ded07e1ULL, 0x00e43aa342272b8bULL,
+                0x00e86ab424577d84ULL, 0x00fb292c566e35bbULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00334f5303ea1222ULL, 0x00dfb3dbeb0a5d3eULL,
+                0x002940d9592335c1ULL, 0x00706a7a63e8938aULL,
+                0x005a533558bc4cafULL, 0x00558e33192022a9ULL,
+                0x00970d9faf74c133ULL, 0x002979fcb63493caULL) },
+            { FIELD_LITERAL(0x00e38abece3c82abULL, 0x005a51f18a2c7a86ULL,
+                0x009dafa2e86d592eULL, 0x00495a62eb688678ULL,
+                0x00b79df74c0eb212ULL, 0x0023e8cc78b75982ULL,
+                0x005998cb91075e13ULL, 0x00735aa9ba61bc76ULL) },
+            { FIELD_LITERAL(0x00d9f7a82ddbe628ULL, 0x00a1fc782889ae0fULL,
+                0x0071ffda12d14b66ULL, 0x0037cf4eca7fb3d5ULL,
+                0x00c80bc242c58808ULL, 0x0075bf8c2d08c863ULL,
+                0x008d41f31afc52a7ULL, 0x00197962ecf38741ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x006e9f475cccf2eeULL, 0x00454b9cd506430cULL,
+                0x00224a4fb79ee479ULL, 0x0062e3347ef0b5e2ULL,
+                0x0034fd2a3512232aULL, 0x00b8b3cb0f457046ULL,
+                0x00eb20165daa38ecULL, 0x00128eebc2d9c0f7ULL) },
+            { FIELD_LITERAL(0x00bfc5fa1e4ea21fULL, 0x00c21d7b6bb892e6ULL,
+                0x00cf043f3acf0291ULL, 0x00c13f2f849b3c90ULL,
+                0x00d1a97ebef10891ULL, 0x0061e130a445e7feULL,
+                0x0019513fdedbf22bULL, 0x001d60c813bff841ULL) },
+            { FIELD_LITERAL(0x0019561c7fcf0213ULL, 0x00e3dca6843ebd77ULL,
+                0x0068ea95b9ca920eULL, 0x009bdfb70f253595ULL,
+                0x00c68f59186aa02aULL, 0x005aee1cca1c3039ULL,
+                0x00ab79a8a937a1ceULL, 0x00b9a0e549959e6fULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00c79e0b6d97dfbdULL, 0x00917c71fd2bc6e8ULL,
+                0x00db7529ccfb63d8ULL, 0x00be5be957f17866ULL,
+                0x00a9e11fdc2cdac1ULL, 0x007b91a8e1f44443ULL,
+                0x00a3065e4057d80fULL, 0x004825f5b8d5f6d4ULL) },
+            { FIELD_LITERAL(0x003e4964fa8a8fc8ULL, 0x00f6a1cdbcf41689ULL,
+                0x00943cb18fe7fda7ULL, 0x00606dafbf34440aULL,
+                0x005d37a86399c789ULL, 0x00e79a2a69417403ULL,
+                0x00fe34f7e68b8866ULL, 0x0011f448ed2df10eULL) },
+            { FIELD_LITERAL(0x00f1f57efcc1fcc4ULL, 0x00513679117de154ULL,
+                0x002e5b5b7c86d8c3ULL, 0x009f6486561f9cfbULL,
+                0x00169e74b0170cf7ULL, 0x00900205af4af696ULL,
+                0x006acfddb77853f3ULL, 0x00df184c90f31068ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00b37396c3320791ULL, 0x00fc7b67175c5783ULL,
+                0x00c36d2cd73ecc38ULL, 0x0080ebcc0b328fc5ULL,
+                0x0043a5b22b35d35dULL, 0x00466c9f1713c9daULL,
+                0x0026ad346dcaa8daULL, 0x007c684e701183a6ULL) },
+            { FIELD_LITERAL(0x00fd579ffb691713ULL, 0x00b76af4f81c412dULL,
+                0x00f239de96110f82ULL, 0x00e965fb437f0306ULL,
+                0x00ca7e9436900921ULL, 0x00e487f1325fa24aULL,
+                0x00633907de476380ULL, 0x00721c62ac5b8ea0ULL) },
+            { FIELD_LITERAL(0x00c0d54e542eb4f9ULL, 0x004ed657171c8dcfULL,
+                0x00b743a4f7c2a39bULL, 0x00fd9f93ed6cc567ULL,
+                0x00307fae3113e58bULL, 0x0058aa577c93c319ULL,
+                0x00d254556f35b346ULL, 0x00491aada2203f0dULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00dff3103786ff34ULL, 0x000144553b1f20c3ULL,
+                0x0095613baeb930e4ULL, 0x00098058275ea5d4ULL,
+                0x007cd1402b046756ULL, 0x0074d74e4d58aee3ULL,
+                0x005f93fc343ff69bULL, 0x00873df17296b3b0ULL) },
+            { FIELD_LITERAL(0x00c4a1fb48635413ULL, 0x00b5dd54423ad59fULL,
+                0x009ff5d53fd24a88ULL, 0x003c98d267fc06a7ULL,
+                0x002db7cb20013641ULL, 0x00bd1d6716e191f2ULL,
+                0x006dbc8b29094241ULL, 0x0044bbf233dafa2cULL) },
+            { FIELD_LITERAL(0x0055838d41f531e6ULL, 0x00bf6a2dd03c81b2ULL,
+                0x005827a061c4839eULL, 0x0000de2cbb36aac3ULL,
+                0x002efa29d9717478ULL, 0x00f9e928cc8a77baULL,
+                0x00c134b458def9efULL, 0x00958a182223fc48ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x000a9ee23c06881fULL, 0x002c727d3d871945ULL,
+                0x00f47d971512d24aULL, 0x00671e816f9ef31aULL,
+                0x00883af2cfaad673ULL, 0x00601f98583d6c9aULL,
+                0x00b435f5adc79655ULL, 0x00ad87b71c04bff2ULL) },
+            { FIELD_LITERAL(0x007860d99db787cfULL, 0x00fda8983018f4a8ULL,
+                0x008c8866bac4743cULL, 0x00ef471f84c82a3fULL,
+                0x00abea5976d3b8e7ULL, 0x00714882896cd015ULL,
+                0x00b49fae584ddac5ULL, 0x008e33a1a0b69c81ULL) },
+            { FIELD_LITERAL(0x007b6ee2c9e8a9ecULL, 0x002455dbbd89d622ULL,
+                0x006490cf4eaab038ULL, 0x00d925f6c3081561ULL,
+                0x00153b3047de7382ULL, 0x003b421f8bdceb6fULL,
+                0x00761a4a5049da78ULL, 0x00980348c5202433ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x007f8a43da97dd5cULL, 0x00058539c800fc7bULL,
+                0x0040f3cf5a28414aULL, 0x00d68dd0d95283d6ULL,
+                0x004adce9da90146eULL, 0x00befa41c7d4f908ULL,
+                0x007603bc2e3c3060ULL, 0x00bdf360ab3545dbULL) },
+            { FIELD_LITERAL(0x00eebfd4e2312cc3ULL, 0x00474b2564e4fc8cULL,
+                0x003303ef14b1da9bULL, 0x003c93e0e66beb1dULL,
+                0x0013619b0566925aULL, 0x008817c24d901bf3ULL,
+                0x00b62bd8898d218bULL, 0x0075a7716f1e88a2ULL) },
+            { FIELD_LITERAL(0x0009218da1e6890fULL, 0x0026907f5fd02575ULL,
+                0x004dabed5f19d605ULL, 0x003abf181870249dULL,
+                0x00b52fd048cc92c4ULL, 0x00b6dd51e415a5c5ULL,
+                0x00d9eb82bd2b4014ULL, 0x002c865a43b46b43ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x0070047189452f4cULL, 0x00f7ad12e1ce78d5ULL,
+                0x00af1ba51ec44a8bULL, 0x005f39f63e667cd6ULL,
+                0x00058eac4648425eULL, 0x00d7fdab42bea03bULL,
+                0x0028576a5688de15ULL, 0x00af973209e77c10ULL) },
+            { FIELD_LITERAL(0x00c338b915d8fef0ULL, 0x00a893292045c39aULL,
+                0x0028ab4f2eba6887ULL, 0x0060743cb519fd61ULL,
+                0x0006213964093ac0ULL, 0x007c0b7a43f6266dULL,
+                0x008e3557c4fa5bdaULL, 0x002da976de7b8d9dULL) },
+            { FIELD_LITERAL(0x0048729f8a8b6dcdULL, 0x00fe23b85cc4d323ULL,
+                0x00e7384d16e4db0eULL, 0x004a423970678942ULL,
+                0x00ec0b763345d4baULL, 0x00c477b9f99ed721ULL,
+                0x00c29dad3777b230ULL, 0x001c517b466f7df6ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x006366c380f7b574ULL, 0x001c7d1f09ff0438ULL,
+                0x003e20a7301f5b22ULL, 0x00d3efb1916d28f6ULL,
+                0x0049f4f81060ce83ULL, 0x00c69d91ea43ced1ULL,
+                0x002b6f3e5cd269edULL, 0x005b0fb22ce9ec65ULL) },
+            { FIELD_LITERAL(0x00aa2261022d883fULL, 0x00ebcca4548010acULL,
+                0x002528512e28a437ULL, 0x0070ca7676b66082ULL,
+                0x0084bda170f7c6d3ULL, 0x00581b4747c9b8bbULL,
+                0x005c96a01061c7e2ULL, 0x00fb7c4a362b5273ULL) },
+            { FIELD_LITERAL(0x00c30020eb512d02ULL, 0x0060f288283a4d26ULL,
+                0x00b7ed13becde260ULL, 0x0075ebb74220f6e9ULL,
+                0x00701079fcfe8a1fULL, 0x001c28fcdff58938ULL,
+                0x002e4544b8f4df6bULL, 0x0060c5bc4f1a7d73ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x00ae307cf069f701ULL, 0x005859f222dd618bULL,
+                0x00212d6c46ec0b0dULL, 0x00a0fe4642afb62dULL,
+                0x00420d8e4a0a8903ULL, 0x00a80ff639bdf7b0ULL,
+                0x0019bee1490b5d8eULL, 0x007439e4b9c27a86ULL) },
+            { FIELD_LITERAL(0x00a94700032a093fULL, 0x0076e96c225216e7ULL,
+                0x00a63a4316e45f91ULL, 0x007d8bbb4645d3b2ULL,
+                0x00340a6ff22793ebULL, 0x006f935d4572aeb7ULL,
+                0x00b1fb69f00afa28ULL, 0x009e8f3423161ed3ULL) },
+            { FIELD_LITERAL(0x009ef49c6b5ced17ULL, 0x00a555e6269e9f0aULL,
+                0x007e6f1d79ec73b5ULL, 0x009ac78695a32ac4ULL,
+                0x0001d77fbbcd5682ULL, 0x008cea1fee0aaeedULL,
+                0x00f42bea82a53462ULL, 0x002e46ab96cafcc9ULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x0051cfcc5885377aULL, 0x00dce566cb1803caULL,
+                0x00430c7643f2c7d4ULL, 0x00dce1a1337bdcc0ULL,
+                0x0010d5bd7283c128ULL, 0x003b1b547f9b46feULL,
+                0x000f245e37e770abULL, 0x007b72511f022b37ULL) },
+            { FIELD_LITERAL(0x0060db815bc4786cULL, 0x006fab25beedc434ULL,
+                0x00c610d06084797cULL, 0x000c48f08537bec0ULL,
+                0x0031aba51c5b93daULL, 0x007968fa6e01f347ULL,
+                0x0030070da52840c6ULL, 0x00c043c225a4837fULL) },
+            { FIELD_LITERAL(0x001bcfd00649ee93ULL, 0x006dceb47e2a0fd5ULL,
+                0x00f2cebda0cf8fd0ULL, 0x00b6b9d9d1fbdec3ULL,
+                0x00815262e6490611ULL, 0x00ef7f5ce3176760ULL,
+                0x00e49cd0c998d58bULL, 0x005fc6cc269ba57cULL) },
+        } },
+        { {
+            { FIELD_LITERAL(0x008940211aa0d633ULL, 0x00addae28136571dULL,
+                0x00d68fdbba20d673ULL, 0x003bc6129bc9e21aULL,
+                0x000346cf184ebe9aULL, 0x0068774d741ebc7fULL,
+                0x0019d5e9e6966557ULL, 0x0003cbd7f981b651ULL) },
+            { FIELD_LITERAL(0x004a2902926f8d3fULL, 0x00ad79b42637ab75ULL,
+                0x0088f60b90f2d4e8ULL, 0x0030f54ef0e398c4ULL,
+                0x00021dc9bf99681eULL, 0x007ebf66fde74ee3ULL,
+                0x004ade654386e9a4ULL, 0x00e7485066be4c27ULL) },
+            { FIELD_LITERAL(0x00445f1263983be0ULL, 0x004cf371dda45e6aULL,
+                0x00744a89d5a310e7ULL, 0x001f20ce4f904833ULL,
+                0x00e746edebe66e29ULL, 0x000912ab1f6c153dULL,
+                0x00f61d77d9b2444cULL, 0x0001499cd6647610ULL) },
+        } } }
 };
 const struct curve448_precomputed_s *ossl_curve448_precomputed_base
     = &curve448_precomputed_base_table;
 
 static const niels_t curve448_wnaf_base_table[32] = {
-    {{
-        {FIELD_LITERAL(0x00303cda6feea532ULL, 0x00860f1d5a3850e4ULL,
-                       0x00226b9fa4728ccdULL, 0x00e822938a0a0c0cULL,
-                       0x00263a61c9ea9216ULL, 0x001204029321b828ULL,
-                       0x006a468360983c65ULL, 0x0002846f0a782143ULL)},
-        {FIELD_LITERAL(0x00303cda6feea532ULL, 0x00860f1d5a3850e4ULL,
-                       0x00226b9fa4728ccdULL, 0x006822938a0a0c0cULL,
-                       0x00263a61c9ea9215ULL, 0x001204029321b828ULL,
-                       0x006a468360983c65ULL, 0x0082846f0a782143ULL)},
-        {FIELD_LITERAL(0x00ef8e22b275198dULL, 0x00b0eb141a0b0e8bULL,
-                       0x001f6789da3cb38cULL, 0x006d2ff8ed39073eULL,
-                       0x00610bdb69a167f3ULL, 0x00571f306c9689b4ULL,
-                       0x00f557e6f84b2df8ULL, 0x002affd38b2c86dbULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00cea0fc8d2e88b5ULL, 0x00821612d69f1862ULL,
-                       0x0074c283b3e67522ULL, 0x005a195ba05a876dULL,
-                       0x000cddfe557feea4ULL, 0x008046c795bcc5e5ULL,
-                       0x00540969f4d6e119ULL, 0x00d27f96d6b143d5ULL)},
-        {FIELD_LITERAL(0x000c3b1019d474e8ULL, 0x00e19533e4952284ULL,
-                       0x00cc9810ba7c920aULL, 0x00f103d2785945acULL,
-                       0x00bfa5696cc69b34ULL, 0x00a8d3d51e9ca839ULL,
-                       0x005623cb459586b9ULL, 0x00eae7ce1cd52e9eULL)},
-        {FIELD_LITERAL(0x0005a178751dd7d8ULL, 0x002cc3844c69c42fULL,
-                       0x00acbfe5efe10539ULL, 0x009c20f43431a65aULL,
-                       0x008435d96374a7b3ULL, 0x009ee57566877bd3ULL,
-                       0x0044691725ed4757ULL, 0x001e87bb2fe2c6b2ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x000cedc4debf7a04ULL, 0x002ffa45000470acULL,
-                       0x002e9f9678201915ULL, 0x0017da1208c4fe72ULL,
-                       0x007d558cc7d656cbULL, 0x0037a827287cf289ULL,
-                       0x00142472d3441819ULL, 0x009c21f166cf8dd1ULL)},
-        {FIELD_LITERAL(0x003ef83af164b2f2ULL, 0x000949a5a0525d0dULL,
-                       0x00f4498186cac051ULL, 0x00e77ac09ef126d2ULL,
-                       0x0073ae0b2c9296e9ULL, 0x001c163f6922e3edULL,
-                       0x0062946159321beaULL, 0x00cfb79b22990b39ULL)},
-        {FIELD_LITERAL(0x00b001431ca9e654ULL, 0x002d7e5eabcc9a3aULL,
-                       0x0052e8114c2f6747ULL, 0x0079ac4f94487f92ULL,
-                       0x00bffd919b5d749cULL, 0x00261f92ad15e620ULL,
-                       0x00718397b7a97895ULL, 0x00c1443e6ebbc0c4ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00eacd90c1e0a049ULL, 0x008977935b149fbeULL,
-                       0x0004cb9ba11c93dcULL, 0x009fbd5b3470844dULL,
-                       0x004bc18c9bfc22cfULL, 0x0057679a991839f3ULL,
-                       0x00ef15b76fb4092eULL, 0x0074a5173a225041ULL)},
-        {FIELD_LITERAL(0x003f5f9d7ec4777bULL, 0x00ab2e733c919c94ULL,
-                       0x001bb6c035245ae5ULL, 0x00a325a49a883630ULL,
-                       0x0033e9a9ea3cea2fULL, 0x00e442a1eaa0e844ULL,
-                       0x00b2116d5b0e71b8ULL, 0x00c16abed6d64047ULL)},
-        {FIELD_LITERAL(0x00c560b5ed051165ULL, 0x001945adc5d65094ULL,
-                       0x00e221865710f910ULL, 0x00cc12bc9e9b8cebULL,
-                       0x004faa9518914e35ULL, 0x0017476d89d42f6dULL,
-                       0x00b8f637c8fa1c8bULL, 0x0088c7d2790864b8ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00ef7eafc1c69be6ULL, 0x0085d3855778fbeaULL,
-                       0x002c8d5b450cb6f5ULL, 0x004e77de5e1e7fecULL,
-                       0x0047c057893abdedULL, 0x001b430b85d51e16ULL,
-                       0x00965c7b45640c3cULL, 0x00487b2bb1162b97ULL)},
-        {FIELD_LITERAL(0x0099c73a311beec2ULL, 0x00a3eff38d8912adULL,
-                       0x002efa9d1d7e8972ULL, 0x00f717ae1e14d126ULL,
-                       0x002833f795850c8bULL, 0x0066c12ad71486bdULL,
-                       0x00ae9889da4820ebULL, 0x00d6044309555c08ULL)},
-        {FIELD_LITERAL(0x004b1c5283d15e41ULL, 0x00669d8ea308ff75ULL,
-                       0x0004390233f762a1ULL, 0x00e1d67b83cb6cecULL,
-                       0x003eebaa964c78b1ULL, 0x006b0aff965eb664ULL,
-                       0x00b313d4470bdc37ULL, 0x008814ffcb3cb9d8ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x009724b8ce68db70ULL, 0x007678b5ed006f3dULL,
-                       0x00bdf4b89c0abd73ULL, 0x00299748e04c7c6dULL,
-                       0x00ddd86492c3c977ULL, 0x00c5a7febfa30a99ULL,
-                       0x00ed84715b4b02bbULL, 0x00319568adf70486ULL)},
-        {FIELD_LITERAL(0x0070ff2d864de5bbULL, 0x005a37eeb637ee95ULL,
-                       0x0033741c258de160ULL, 0x00e6ca5cb1988f46ULL,
-                       0x001ceabd92a24661ULL, 0x0030957bd500fe40ULL,
-                       0x001c3362afe912c5ULL, 0x005187889f678bd2ULL)},
-        {FIELD_LITERAL(0x0086835fc62bbdc7ULL, 0x009c3516ca4910a1ULL,
-                       0x00956c71f8d00783ULL, 0x0095c78fcf63235fULL,
-                       0x00fc7ff6ba05c222ULL, 0x00cdd8b3f8d74a52ULL,
-                       0x00ac5ae16de8256eULL, 0x00e9d4be8ed48624ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00c0ce11405df2d8ULL, 0x004e3f37b293d7b6ULL,
-                       0x002410172e1ac6dbULL, 0x00b8dbff4bf8143dULL,
-                       0x003a7b409d56eb66ULL, 0x003e0f6a0dfef9afULL,
-                       0x0081c4e4d3645be1ULL, 0x00ce76076b127623ULL)},
-        {FIELD_LITERAL(0x00f6ee0f98974239ULL, 0x0042d89af07d3a4fULL,
-                       0x00846b7fe84346b5ULL, 0x006a21fc6a8d39a1ULL,
-                       0x00ac8bc2541ff2d9ULL, 0x006d4e2a77732732ULL,
-                       0x009a39b694cc3f2fULL, 0x0085c0aa2a404c8fULL)},
-        {FIELD_LITERAL(0x00b261101a218548ULL, 0x00c1cae96424277bULL,
-                       0x00869da0a77dd268ULL, 0x00bc0b09f8ec83eaULL,
-                       0x00d61027f8e82ba9ULL, 0x00aa4c85999dce67ULL,
-                       0x00eac3132b9f3fe1ULL, 0x00fb9b0cf1c695d2ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x0043079295512f0dULL, 0x0046a009861758e0ULL,
-                       0x003ee2842a807378ULL, 0x0034cc9d1298e4faULL,
-                       0x009744eb4d31b3eeULL, 0x00afacec96650cd0ULL,
-                       0x00ac891b313761aeULL, 0x00e864d6d26e708aULL)},
-        {FIELD_LITERAL(0x00a84d7c8a23b491ULL, 0x0088e19aa868b27fULL,
-                       0x0005986d43e78ce9ULL, 0x00f28012f0606d28ULL,
-                       0x0017ded7e10249b3ULL, 0x005ed4084b23af9bULL,
-                       0x00b9b0a940564472ULL, 0x00ad9056cceeb1f4ULL)},
-        {FIELD_LITERAL(0x00db91b357fe755eULL, 0x00a1aa544b15359cULL,
-                       0x00af4931a0195574ULL, 0x007686124fe11aefULL,
-                       0x00d1ead3c7b9ef7eULL, 0x00aaf5fc580f8c15ULL,
-                       0x00e727be147ee1ecULL, 0x003c61c1e1577b86ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x009d3fca983220cfULL, 0x00cd11acbc853dc4ULL,
-                       0x0017590409d27f1dULL, 0x00d2176698082802ULL,
-                       0x00fa01251b2838c8ULL, 0x00dd297a0d9b51c6ULL,
-                       0x00d76c92c045820aULL, 0x00534bc7c46c9033ULL)},
-        {FIELD_LITERAL(0x0080ed9bc9b07338ULL, 0x00fceac7745d2652ULL,
-                       0x008a9d55f5f2cc69ULL, 0x0096ce72df301ac5ULL,
-                       0x00f53232e7974d87ULL, 0x0071728c7ae73947ULL,
-                       0x0090507602570778ULL, 0x00cb81cfd883b1b2ULL)},
-        {FIELD_LITERAL(0x005011aadea373daULL, 0x003a8578ec896034ULL,
-                       0x00f20a6535fa6d71ULL, 0x005152d31e5a87cfULL,
-                       0x002bac1c8e68ca31ULL, 0x00b0e323db4c1381ULL,
-                       0x00f1d596b7d5ae25ULL, 0x00eae458097cb4e0ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00920ac80f9b0d21ULL, 0x00f80f7f73401246ULL,
-                       0x0086d37849b557d6ULL, 0x0002bd4b317b752eULL,
-                       0x00b26463993a42bbULL, 0x002070422a73b129ULL,
-                       0x00341acaa0380cb3ULL, 0x00541914dd66a1b2ULL)},
-        {FIELD_LITERAL(0x00c1513cd66abe8cULL, 0x000139e01118944dULL,
-                       0x0064abbcb8080bbbULL, 0x00b3b08202473142ULL,
-                       0x00c629ef25da2403ULL, 0x00f0aec3310d9b7fULL,
-                       0x0050b2227472d8cdULL, 0x00f6c8a922d41fb4ULL)},
-        {FIELD_LITERAL(0x001075ccf26b7b1fULL, 0x00bb6bb213170433ULL,
-                       0x00e9491ad262da79ULL, 0x009ef4f48d2d384cULL,
-                       0x008992770766f09dULL, 0x001584396b6b1101ULL,
-                       0x00af3f8676c9feefULL, 0x0024603c40269118ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x009dd7b31319527cULL, 0x001e7ac948d873a9ULL,
-                       0x00fa54b46ef9673aULL, 0x0066efb8d5b02fe6ULL,
-                       0x00754b1d3928aeaeULL, 0x0004262ac72a6f6bULL,
-                       0x0079b7d49a6eb026ULL, 0x003126a753540102ULL)},
-        {FIELD_LITERAL(0x009666e24f693947ULL, 0x00f714311269d45fULL,
-                       0x0010ffac1d0c851cULL, 0x0066e80c37363497ULL,
-                       0x00f1f4ad010c60b0ULL, 0x0015c87408470ff7ULL,
-                       0x00651d5e9c7766a4ULL, 0x008138819d7116deULL)},
-        {FIELD_LITERAL(0x003934b11c57253bULL, 0x00ef308edf21f46eULL,
-                       0x00e54e99c7a16198ULL, 0x0080d57135764e63ULL,
-                       0x00751c27b946bc24ULL, 0x00dd389ce4e9e129ULL,
-                       0x00a1a2bfd1cd84dcULL, 0x002fae73e5149b32ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00911657dffb4cddULL, 0x00c100b7cc553d06ULL,
-                       0x00449d075ec467ccULL, 0x007062100bc64e70ULL,
-                       0x0043cf86f7bd21e7ULL, 0x00f401dc4b797deaULL,
-                       0x005224afb2f62e65ULL, 0x00d1ede3fb5a42beULL)},
-        {FIELD_LITERAL(0x00f2ba36a41aa144ULL, 0x00a0c22d946ee18fULL,
-                       0x008aae8ef9a14f99ULL, 0x00eef4d79b19bb36ULL,
-                       0x008e75ce3d27b1fcULL, 0x00a65daa03b29a27ULL,
-                       0x00d9cc83684eb145ULL, 0x009e1ed80cc2ed74ULL)},
-        {FIELD_LITERAL(0x00bed953d1997988ULL, 0x00b93ed175a24128ULL,
-                       0x00871c5963fb6365ULL, 0x00ca2df20014a787ULL,
-                       0x00f5d9c1d0b34322ULL, 0x00f6f5942818db0aULL,
-                       0x004cc091f49c9906ULL, 0x00e8a188a60bff9fULL)},
-    }}, {{
-        {FIELD_LITERAL(0x0032c7762032fae8ULL, 0x00e4087232e0bc21ULL,
-                       0x00f767344b6e8d85ULL, 0x00bbf369b76c2aa2ULL,
-                       0x008a1f46c6e1570cULL, 0x001368cd9780369fULL,
-                       0x007359a39d079430ULL, 0x0003646512921434ULL)},
-        {FIELD_LITERAL(0x007c4b47ca7c73e7ULL, 0x005396221039734bULL,
-                       0x008b64ddf0e45d7eULL, 0x00bfad5af285e6c2ULL,
-                       0x008ec711c5b1a1a8ULL, 0x00cf663301237f98ULL,
-                       0x00917ee3f1655126ULL, 0x004152f337efedd8ULL)},
-        {FIELD_LITERAL(0x0007c7edc9305daaULL, 0x000a6664f273701cULL,
-                       0x00f6e78795e200b1ULL, 0x005d05b9ecd2473eULL,
-                       0x0014f5f17c865786ULL, 0x00c7fd2d166fa995ULL,
-                       0x004939a2d8eb80e0ULL, 0x002244ba0942c199ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00321e767f0262cfULL, 0x002e57d776caf68eULL,
-                       0x00bf2c94814f0437ULL, 0x00c339196acd622fULL,
-                       0x001db4cce71e2770ULL, 0x001ded5ddba6eee2ULL,
-                       0x0078608ab1554c8dULL, 0x00067fe0ab76365bULL)},
-        {FIELD_LITERAL(0x00f09758e11e3985ULL, 0x00169efdbd64fad3ULL,
-                       0x00e8889b7d6dacd6ULL, 0x0035cdd58ea88209ULL,
-                       0x00bcda47586d7f49ULL, 0x003cdddcb2879088ULL,
-                       0x0016da70187e954bULL, 0x009556ea2e92aacdULL)},
-        {FIELD_LITERAL(0x008cab16bd1ff897ULL, 0x00b389972cdf753fULL,
-                       0x00ea8ed1e46dfdc0ULL, 0x004fe7ef94c589f4ULL,
-                       0x002b8ae9b805ecf3ULL, 0x0025c08d892874a5ULL,
-                       0x0023938e98d44c4cULL, 0x00f759134cabf69cULL)},
-    }}, {{
-        {FIELD_LITERAL(0x006c2a84678e4b3bULL, 0x007a194aacd1868fULL,
-                       0x00ed0225af424761ULL, 0x00da0a6f293c64b8ULL,
-                       0x001062ac5c6a7a18ULL, 0x0030f5775a8aeef4ULL,
-                       0x0002acaad76b7af0ULL, 0x00410b8fd63a579fULL)},
-        {FIELD_LITERAL(0x001ec59db3d9590eULL, 0x001e9e3f1c3f182dULL,
-                       0x0045a9c3ec2cab14ULL, 0x0008198572aeb673ULL,
-                       0x00773b74068bd167ULL, 0x0012535eaa395434ULL,
-                       0x0044dba9e3bbb74aULL, 0x002fba4d3c74bd0eULL)},
-        {FIELD_LITERAL(0x0042bf08fe66922cULL, 0x003318b8fbb49e8cULL,
-                       0x00d75946004aa14cULL, 0x00f601586b42bf1cULL,
-                       0x00c74cf1d912fe66ULL, 0x00abcb36974b30adULL,
-                       0x007eb78720c9d2b8ULL, 0x009f54ab7bd4df85ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00db9fc948f73826ULL, 0x00fa8b3746ed8ee9ULL,
-                       0x00132cb65aafbeb2ULL, 0x00c36ff3fe7925b8ULL,
-                       0x00837daed353d2feULL, 0x00ec661be0667cf4ULL,
-                       0x005beb8ed2e90204ULL, 0x00d77dd69e564967ULL)},
-        {FIELD_LITERAL(0x0042e6268b861751ULL, 0x0008dd0469500c16ULL,
-                       0x00b51b57c338a3fdULL, 0x00cc4497d85cff6bULL,
-                       0x002f13d6b57c34a4ULL, 0x0083652eaf301105ULL,
-                       0x00cc344294cc93a8ULL, 0x0060f4d02810e270ULL)},
-        {FIELD_LITERAL(0x00a8954363cd518bULL, 0x00ad171124bccb7bULL,
-                       0x0065f46a4adaae00ULL, 0x001b1a5b2a96e500ULL,
-                       0x0043fe24f8233285ULL, 0x0066996d8ae1f2c3ULL,
-                       0x00c530f3264169f9ULL, 0x00c0f92d07cf6a57ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x0036a55c6815d943ULL, 0x008c8d1def993db3ULL,
-                       0x002e0e1e8ff7318fULL, 0x00d883a4b92db00aULL,
-                       0x002f5e781ae33906ULL, 0x001a72adb235c06dULL,
-                       0x00f2e59e736e9caaULL, 0x001a4b58e3031914ULL)},
-        {FIELD_LITERAL(0x00d73bfae5e00844ULL, 0x00bf459766fb5f52ULL,
-                       0x0061b4f5a5313cdeULL, 0x004392d4c3b95514ULL,
-                       0x000d3551b1077523ULL, 0x0000998840ee5d71ULL,
-                       0x006de6e340448b7bULL, 0x00251aa504875d6eULL)},
-        {FIELD_LITERAL(0x003bf343427ac342ULL, 0x00adc0a78642b8c5ULL,
-                       0x0003b893175a8314ULL, 0x0061a34ade5703bcULL,
-                       0x00ea3ea8bb71d632ULL, 0x00be0df9a1f198c2ULL,
-                       0x0046dd8e7c1635fbULL, 0x00f1523fdd25d5e5ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00633f63fc9dd406ULL, 0x00e713ff80e04a43ULL,
-                       0x0060c6e970f2d621ULL, 0x00a57cd7f0df1891ULL,
-                       0x00f2406a550650bbULL, 0x00b064290efdc684ULL,
-                       0x001eab0144d17916ULL, 0x00cd15f863c293abULL)},
-        {FIELD_LITERAL(0x0029cec55273f70dULL, 0x007044ee275c6340ULL,
-                       0x0040f637a93015e2ULL, 0x00338bb78db5aae9ULL,
-                       0x001491b2a6132147ULL, 0x00a125d6cfe6bde3ULL,
-                       0x005f7ac561ba8669ULL, 0x001d5eaea3fbaacfULL)},
-        {FIELD_LITERAL(0x00054e9635e3be31ULL, 0x000e43f31e2872beULL,
-                       0x00d05b1c9e339841ULL, 0x006fac50bd81fd98ULL,
-                       0x00cdc7852eaebb09ULL, 0x004ff519b061991bULL,
-                       0x009099e8107d4c85ULL, 0x00273e24c36a4a61ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00070b4441ef2c46ULL, 0x00efa5b02801a109ULL,
-                       0x00bf0b8c3ee64adfULL, 0x008a67e0b3452e98ULL,
-                       0x001916b1f2fa7a74ULL, 0x00d781a78ff6cdc3ULL,
-                       0x008682ce57e5c919ULL, 0x00cc1109dd210da3ULL)},
-        {FIELD_LITERAL(0x00cae8aaff388663ULL, 0x005e983a35dda1c7ULL,
-                       0x007ab1030d8e37f4ULL, 0x00e48940f5d032feULL,
-                       0x006a36f9ef30b331ULL, 0x009be6f03958c757ULL,
-                       0x0086231ceba91400ULL, 0x008bd0f7b823e7aaULL)},
-        {FIELD_LITERAL(0x00cf881ebef5a45aULL, 0x004ebea78e7c6f2cULL,
-                       0x0090da9209cf26a0ULL, 0x00de2b2e4c775b84ULL,
-                       0x0071d6031c3c15aeULL, 0x00d9e927ef177d70ULL,
-                       0x00894ee8c23896fdULL, 0x00e3b3b401e41aadULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00204fef26864170ULL, 0x00819269c5dee0f8ULL,
-                       0x00bfb4713ec97966ULL, 0x0026339a6f34df78ULL,
-                       0x001f26e64c761dc2ULL, 0x00effe3af313cb60ULL,
-                       0x00e17b70138f601bULL, 0x00f16e1ccd9ede5eULL)},
-        {FIELD_LITERAL(0x005d9a8353fdb2dbULL, 0x0055cc2048c698f0ULL,
-                       0x00f6c4ac89657218ULL, 0x00525034d73faeb2ULL,
-                       0x00435776fbda3c7dULL, 0x0070ea5312323cbcULL,
-                       0x007a105d44d069fbULL, 0x006dbc8d6dc786aaULL)},
-        {FIELD_LITERAL(0x0017cff19cd394ecULL, 0x00fef7b810922587ULL,
-                       0x00e6483970dff548ULL, 0x00ddf36ad6874264ULL,
-                       0x00e61778523fcce2ULL, 0x0093a66c0c93b24aULL,
-                       0x00fd367114db7f86ULL, 0x007652d7ddce26ddULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00d92ced7ba12843ULL, 0x00aea9c7771e86e7ULL,
-                       0x0046639693354f7bULL, 0x00a628dbb6a80c47ULL,
-                       0x003a0b0507372953ULL, 0x00421113ab45c0d9ULL,
-                       0x00e545f08362ab7aULL, 0x0028ce087b4d6d96ULL)},
-        {FIELD_LITERAL(0x00a67ee7cf9f99ebULL, 0x005713b275f2ff68ULL,
-                       0x00f1d536a841513dULL, 0x00823b59b024712eULL,
-                       0x009c46b9d0d38cecULL, 0x00cdb1595aa2d7d4ULL,
-                       0x008375b3423d9af8ULL, 0x000ab0b516d978f7ULL)},
-        {FIELD_LITERAL(0x00428dcb3c510b0fULL, 0x00585607ea24bb4eULL,
-                       0x003736bf1603687aULL, 0x00c47e568c4fe3c7ULL,
-                       0x003cd00282848605ULL, 0x0043a487c3b91939ULL,
-                       0x004ffc04e1095a06ULL, 0x00a4c989a3d4b918ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00a8778d0e429f7aULL, 0x004c02b059105a68ULL,
-                       0x0016653b609da3ffULL, 0x00d5107bd1a12d27ULL,
-                       0x00b4708f9a771cabULL, 0x00bb63b662033f69ULL,
-                       0x0072f322240e7215ULL, 0x0019445b59c69222ULL)},
-        {FIELD_LITERAL(0x00cf4f6069a658e6ULL, 0x0053ca52859436a6ULL,
-                       0x0064b994d7e3e117ULL, 0x00cb469b9a07f534ULL,
-                       0x00cfb68f399e9d47ULL, 0x00f0dcb8dac1c6e7ULL,
-                       0x00f2ab67f538b3a5ULL, 0x0055544f178ab975ULL)},
-        {FIELD_LITERAL(0x0099b7a2685d538cULL, 0x00e2f1897b7c0018ULL,
-                       0x003adac8ce48dae3ULL, 0x00089276d5c50c0cULL,
-                       0x00172fca07ad6717ULL, 0x00cb1a72f54069e5ULL,
-                       0x004ee42f133545b3ULL, 0x00785f8651362f16ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x0049cbac38509e11ULL, 0x0015234505d42cdfULL,
-                       0x00794fb0b5840f1cULL, 0x00496437344045a5ULL,
-                       0x0031b6d944e4f9b0ULL, 0x00b207318ac1f5d8ULL,
-                       0x0000c840da7f5c5dULL, 0x00526f373a5c8814ULL)},
-        {FIELD_LITERAL(0x002c7b7742d1dfd9ULL, 0x002cabeb18623c01ULL,
-                       0x00055f5e3e044446ULL, 0x006c20f3b4ef54baULL,
-                       0x00c600141ec6b35fULL, 0x00354f437f1a32a3ULL,
-                       0x00bac4624a3520f9ULL, 0x00c483f734a90691ULL)},
-        {FIELD_LITERAL(0x0053a737d422918dULL, 0x00f7fca1d8758625ULL,
-                       0x00c360336dadb04cULL, 0x00f38e3d9158a1b8ULL,
-                       0x0069ce3b418e84c6ULL, 0x005d1697eca16eadULL,
-                       0x00f8bd6a35ece13dULL, 0x007885dfc2b5afeaULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00c3617ae260776cULL, 0x00b20dc3e96922d7ULL,
-                       0x00a1a7802246706aULL, 0x00ca6505a5240244ULL,
-                       0x002246b62d919782ULL, 0x001439102d7aa9b3ULL,
-                       0x00e8af1139e6422cULL, 0x00c888d1b52f2b05ULL)},
-        {FIELD_LITERAL(0x005b67690ffd41d9ULL, 0x005294f28df516f9ULL,
-                       0x00a879272412fcb9ULL, 0x00098b629a6d1c8dULL,
-                       0x00fabd3c8050865aULL, 0x00cd7e5b0a3879c5ULL,
-                       0x00153238210f3423ULL, 0x00357cac101e9f42ULL)},
-        {FIELD_LITERAL(0x008917b454444fb7ULL, 0x00f59247c97e441bULL,
-                       0x00a6200a6815152dULL, 0x0009a4228601d254ULL,
-                       0x001c0360559bd374ULL, 0x007563362039cb36ULL,
-                       0x00bd75b48d74e32bULL, 0x0017f515ac3499e8ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x001532a7ffe41c5aULL, 0x00eb1edce358d6bfULL,
-                       0x00ddbacc7b678a7bULL, 0x008a7b70f3c841a3ULL,
-                       0x00f1923bf27d3f4cULL, 0x000b2713ed8f7873ULL,
-                       0x00aaf67e29047902ULL, 0x0044994a70b3976dULL)},
-        {FIELD_LITERAL(0x00d54e802082d42cULL, 0x00a55aa0dce7cc6cULL,
-                       0x006477b96073f146ULL, 0x0082efe4ceb43594ULL,
-                       0x00a922bcba026845ULL, 0x0077f19d1ab75182ULL,
-                       0x00c2bb2737846e59ULL, 0x0004d7eec791dd33ULL)},
-        {FIELD_LITERAL(0x0044588d1a81d680ULL, 0x00b0a9097208e4f8ULL,
-                       0x00212605350dc57eULL, 0x0028717cd2871123ULL,
-                       0x00fb083c100fd979ULL, 0x0045a056ce063fdfULL,
-                       0x00a5d604b4dd6a41ULL, 0x001dabc08ba4e236ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00c4887198d7a7faULL, 0x00244f98fb45784aULL,
-                       0x0045911e15a15d01ULL, 0x001d323d374c0966ULL,
-                       0x00967c3915196562ULL, 0x0039373abd2f3c67ULL,
-                       0x000d2c5614312423ULL, 0x0041cf2215442ce3ULL)},
-        {FIELD_LITERAL(0x008ede889ada7f06ULL, 0x001611e91de2e135ULL,
-                       0x00fdb9a458a471b9ULL, 0x00563484e03710d1ULL,
-                       0x0031cc81925e3070ULL, 0x0062c97b3af80005ULL,
-                       0x00fa733eea28edebULL, 0x00e82457e1ebbc88ULL)},
-        {FIELD_LITERAL(0x006a0df5fe9b6f59ULL, 0x00a0d4ff46040d92ULL,
-                       0x004a7cedb6f93250ULL, 0x00d1df8855b8c357ULL,
-                       0x00e73a46086fd058ULL, 0x0048fb0add6dfe59ULL,
-                       0x001e03a28f1b4e3dULL, 0x00a871c993308d76ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x0030dbb2d1766ec8ULL, 0x00586c0ad138555eULL,
-                       0x00d1a34f9e91c77cULL, 0x0063408ad0e89014ULL,
-                       0x00d61231b05f6f5bULL, 0x0009abf569f5fd8aULL,
-                       0x00aec67a110f1c43ULL, 0x0031d1a790938dd7ULL)},
-        {FIELD_LITERAL(0x006cded841e2a862ULL, 0x00198d60af0ab6fbULL,
-                       0x0018f09db809e750ULL, 0x004e6ac676016263ULL,
-                       0x00eafcd1620969cbULL, 0x002c9784ca34917dULL,
-                       0x0054f00079796de7ULL, 0x00d9fab5c5972204ULL)},
-        {FIELD_LITERAL(0x004bd0fee2438a83ULL, 0x00b571e62b0f83bdULL,
-                       0x0059287d7ce74800ULL, 0x00fb3631b645c3f0ULL,
-                       0x00a018e977f78494ULL, 0x0091e27065c27b12ULL,
-                       0x007696c1817165e0ULL, 0x008c40be7c45ba3aULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00a0f326327cb684ULL, 0x001c7d0f672680ffULL,
-                       0x008c1c81ffb112d1ULL, 0x00f8f801674eddc8ULL,
-                       0x00e926d5d48c2a9dULL, 0x005bd6d954c6fe9aULL,
-                       0x004c6b24b4e33703ULL, 0x00d05eb5c09105ccULL)},
-        {FIELD_LITERAL(0x00d61731caacf2cfULL, 0x002df0c7609e01c5ULL,
-                       0x00306172208b1e2bULL, 0x00b413fe4fb2b686ULL,
-                       0x00826d360902a221ULL, 0x003f8d056e67e7f7ULL,
-                       0x0065025b0175e989ULL, 0x00369add117865ebULL)},
-        {FIELD_LITERAL(0x00aaf895aec2fa11ULL, 0x000f892bc313eb52ULL,
-                       0x005b1c794dad050bULL, 0x003f8ec4864cec14ULL,
-                       0x00af81058d0b90e5ULL, 0x00ebe43e183997bbULL,
-                       0x00a9d610f9f3e615ULL, 0x007acd8eec2e88d3ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x0049b2fab13812a3ULL, 0x00846db32cd60431ULL,
-                       0x000177fa578c8d6cULL, 0x00047d0e2ad4bc51ULL,
-                       0x00b158ba38d1e588ULL, 0x006a45daad79e3f3ULL,
-                       0x000997b93cab887bULL, 0x00c47ea42fa23dc3ULL)},
-        {FIELD_LITERAL(0x0012b6fef7aeb1caULL, 0x009412768194b6a7ULL,
-                       0x00ff0d351f23ab93ULL, 0x007e8a14c1aff71bULL,
-                       0x006c1c0170c512bcULL, 0x0016243ea02ab2e5ULL,
-                       0x007bb6865b303f3eULL, 0x0015ce6b29b159f4ULL)},
-        {FIELD_LITERAL(0x009961cd02e68108ULL, 0x00e2035d3a1d0836ULL,
-                       0x005d51f69b5e1a1dULL, 0x004bccb4ea36edcdULL,
-                       0x0069be6a7aeef268ULL, 0x0063f4dd9de8d5a7ULL,
-                       0x006283783092ca35ULL, 0x0075a31af2c35409ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00c412365162e8cfULL, 0x00012283fb34388aULL,
-                       0x003e6543babf39e2ULL, 0x00eead6b3a804978ULL,
-                       0x0099c0314e8b326fULL, 0x00e98e0a8d477a4fULL,
-                       0x00d2eb96b127a687ULL, 0x00ed8d7df87571bbULL)},
-        {FIELD_LITERAL(0x00777463e308cacfULL, 0x00c8acb93950132dULL,
-                       0x00ebddbf4ca48b2cULL, 0x0026ad7ca0795a0aULL,
-                       0x00f99a3d9a715064ULL, 0x000d60bcf9d4dfccULL,
-                       0x005e65a73a437a06ULL, 0x0019d536a8db56c8ULL)},
-        {FIELD_LITERAL(0x00192d7dd558d135ULL, 0x0027cd6a8323ffa7ULL,
-                       0x00239f1a412dc1e7ULL, 0x0046b4b3be74fc5cULL,
-                       0x0020c47a2bef5bceULL, 0x00aa17e48f43862bULL,
-                       0x00f7e26c96342e5fULL, 0x0008011c530f39a9ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x00aad4ac569bf0f1ULL, 0x00a67adc90b27740ULL,
-                       0x0048551369a5751aULL, 0x0031252584a3306aULL,
-                       0x0084e15df770e6fcULL, 0x00d7bba1c74b5805ULL,
-                       0x00a80ef223af1012ULL, 0x0089c85ceb843a34ULL)},
-        {FIELD_LITERAL(0x00c4545be4a54004ULL, 0x0099e11f60357e6cULL,
-                       0x001f3936d19515a6ULL, 0x007793df84341a6eULL,
-                       0x0051061886717ffaULL, 0x00e9b0a660b28f85ULL,
-                       0x0044ea685892de0dULL, 0x000257d2a1fda9d9ULL)},
-        {FIELD_LITERAL(0x007e8b01b24ac8a8ULL, 0x006cf3b0b5ca1337ULL,
-                       0x00f1607d3e36a570ULL, 0x0039b7fab82991a1ULL,
-                       0x00231777065840c5ULL, 0x00998e5afdd346f9ULL,
-                       0x00b7dc3e64acc85fULL, 0x00baacc748013ad6ULL)},
-    }}, {{
-        {FIELD_LITERAL(0x008ea6a4177580bfULL, 0x005fa1953e3f0378ULL,
-                       0x005fe409ac74d614ULL, 0x00452327f477e047ULL,
-                       0x00a4018507fb6073ULL, 0x007b6e71951caac8ULL,
-                       0x0012b42ab8a6ce91ULL, 0x0080eca677294ab7ULL)},
-        {FIELD_LITERAL(0x00a53edc023ba69bULL, 0x00c6afa83ddde2e8ULL,
-                       0x00c3f638b307b14eULL, 0x004a357a64414062ULL,
-                       0x00e4d94d8b582dc9ULL, 0x001739caf71695b7ULL,
-                       0x0012431b2ae28de1ULL, 0x003b6bc98682907cULL)},
-        {FIELD_LITERAL(0x008a9a93be1f99d6ULL, 0x0079fa627cc699c8ULL,
-                       0x00b0cfb134ba84c8ULL, 0x001c4b778249419aULL,
-                       0x00df4ab3d9c44f40ULL, 0x009f596e6c1a9e3cULL,
-                       0x001979c0df237316ULL, 0x00501e953a919b87ULL)},
-    }}
+    { {
+        { FIELD_LITERAL(0x00303cda6feea532ULL, 0x00860f1d5a3850e4ULL,
+            0x00226b9fa4728ccdULL, 0x00e822938a0a0c0cULL,
+            0x00263a61c9ea9216ULL, 0x001204029321b828ULL,
+            0x006a468360983c65ULL, 0x0002846f0a782143ULL) },
+        { FIELD_LITERAL(0x00303cda6feea532ULL, 0x00860f1d5a3850e4ULL,
+            0x00226b9fa4728ccdULL, 0x006822938a0a0c0cULL,
+            0x00263a61c9ea9215ULL, 0x001204029321b828ULL,
+            0x006a468360983c65ULL, 0x0082846f0a782143ULL) },
+        { FIELD_LITERAL(0x00ef8e22b275198dULL, 0x00b0eb141a0b0e8bULL,
+            0x001f6789da3cb38cULL, 0x006d2ff8ed39073eULL,
+            0x00610bdb69a167f3ULL, 0x00571f306c9689b4ULL,
+            0x00f557e6f84b2df8ULL, 0x002affd38b2c86dbULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00cea0fc8d2e88b5ULL, 0x00821612d69f1862ULL,
+            0x0074c283b3e67522ULL, 0x005a195ba05a876dULL,
+            0x000cddfe557feea4ULL, 0x008046c795bcc5e5ULL,
+            0x00540969f4d6e119ULL, 0x00d27f96d6b143d5ULL) },
+        { FIELD_LITERAL(0x000c3b1019d474e8ULL, 0x00e19533e4952284ULL,
+            0x00cc9810ba7c920aULL, 0x00f103d2785945acULL,
+            0x00bfa5696cc69b34ULL, 0x00a8d3d51e9ca839ULL,
+            0x005623cb459586b9ULL, 0x00eae7ce1cd52e9eULL) },
+        { FIELD_LITERAL(0x0005a178751dd7d8ULL, 0x002cc3844c69c42fULL,
+            0x00acbfe5efe10539ULL, 0x009c20f43431a65aULL,
+            0x008435d96374a7b3ULL, 0x009ee57566877bd3ULL,
+            0x0044691725ed4757ULL, 0x001e87bb2fe2c6b2ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x000cedc4debf7a04ULL, 0x002ffa45000470acULL,
+            0x002e9f9678201915ULL, 0x0017da1208c4fe72ULL,
+            0x007d558cc7d656cbULL, 0x0037a827287cf289ULL,
+            0x00142472d3441819ULL, 0x009c21f166cf8dd1ULL) },
+        { FIELD_LITERAL(0x003ef83af164b2f2ULL, 0x000949a5a0525d0dULL,
+            0x00f4498186cac051ULL, 0x00e77ac09ef126d2ULL,
+            0x0073ae0b2c9296e9ULL, 0x001c163f6922e3edULL,
+            0x0062946159321beaULL, 0x00cfb79b22990b39ULL) },
+        { FIELD_LITERAL(0x00b001431ca9e654ULL, 0x002d7e5eabcc9a3aULL,
+            0x0052e8114c2f6747ULL, 0x0079ac4f94487f92ULL,
+            0x00bffd919b5d749cULL, 0x00261f92ad15e620ULL,
+            0x00718397b7a97895ULL, 0x00c1443e6ebbc0c4ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00eacd90c1e0a049ULL, 0x008977935b149fbeULL,
+            0x0004cb9ba11c93dcULL, 0x009fbd5b3470844dULL,
+            0x004bc18c9bfc22cfULL, 0x0057679a991839f3ULL,
+            0x00ef15b76fb4092eULL, 0x0074a5173a225041ULL) },
+        { FIELD_LITERAL(0x003f5f9d7ec4777bULL, 0x00ab2e733c919c94ULL,
+            0x001bb6c035245ae5ULL, 0x00a325a49a883630ULL,
+            0x0033e9a9ea3cea2fULL, 0x00e442a1eaa0e844ULL,
+            0x00b2116d5b0e71b8ULL, 0x00c16abed6d64047ULL) },
+        { FIELD_LITERAL(0x00c560b5ed051165ULL, 0x001945adc5d65094ULL,
+            0x00e221865710f910ULL, 0x00cc12bc9e9b8cebULL,
+            0x004faa9518914e35ULL, 0x0017476d89d42f6dULL,
+            0x00b8f637c8fa1c8bULL, 0x0088c7d2790864b8ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00ef7eafc1c69be6ULL, 0x0085d3855778fbeaULL,
+            0x002c8d5b450cb6f5ULL, 0x004e77de5e1e7fecULL,
+            0x0047c057893abdedULL, 0x001b430b85d51e16ULL,
+            0x00965c7b45640c3cULL, 0x00487b2bb1162b97ULL) },
+        { FIELD_LITERAL(0x0099c73a311beec2ULL, 0x00a3eff38d8912adULL,
+            0x002efa9d1d7e8972ULL, 0x00f717ae1e14d126ULL,
+            0x002833f795850c8bULL, 0x0066c12ad71486bdULL,
+            0x00ae9889da4820ebULL, 0x00d6044309555c08ULL) },
+        { FIELD_LITERAL(0x004b1c5283d15e41ULL, 0x00669d8ea308ff75ULL,
+            0x0004390233f762a1ULL, 0x00e1d67b83cb6cecULL,
+            0x003eebaa964c78b1ULL, 0x006b0aff965eb664ULL,
+            0x00b313d4470bdc37ULL, 0x008814ffcb3cb9d8ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x009724b8ce68db70ULL, 0x007678b5ed006f3dULL,
+            0x00bdf4b89c0abd73ULL, 0x00299748e04c7c6dULL,
+            0x00ddd86492c3c977ULL, 0x00c5a7febfa30a99ULL,
+            0x00ed84715b4b02bbULL, 0x00319568adf70486ULL) },
+        { FIELD_LITERAL(0x0070ff2d864de5bbULL, 0x005a37eeb637ee95ULL,
+            0x0033741c258de160ULL, 0x00e6ca5cb1988f46ULL,
+            0x001ceabd92a24661ULL, 0x0030957bd500fe40ULL,
+            0x001c3362afe912c5ULL, 0x005187889f678bd2ULL) },
+        { FIELD_LITERAL(0x0086835fc62bbdc7ULL, 0x009c3516ca4910a1ULL,
+            0x00956c71f8d00783ULL, 0x0095c78fcf63235fULL,
+            0x00fc7ff6ba05c222ULL, 0x00cdd8b3f8d74a52ULL,
+            0x00ac5ae16de8256eULL, 0x00e9d4be8ed48624ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00c0ce11405df2d8ULL, 0x004e3f37b293d7b6ULL,
+            0x002410172e1ac6dbULL, 0x00b8dbff4bf8143dULL,
+            0x003a7b409d56eb66ULL, 0x003e0f6a0dfef9afULL,
+            0x0081c4e4d3645be1ULL, 0x00ce76076b127623ULL) },
+        { FIELD_LITERAL(0x00f6ee0f98974239ULL, 0x0042d89af07d3a4fULL,
+            0x00846b7fe84346b5ULL, 0x006a21fc6a8d39a1ULL,
+            0x00ac8bc2541ff2d9ULL, 0x006d4e2a77732732ULL,
+            0x009a39b694cc3f2fULL, 0x0085c0aa2a404c8fULL) },
+        { FIELD_LITERAL(0x00b261101a218548ULL, 0x00c1cae96424277bULL,
+            0x00869da0a77dd268ULL, 0x00bc0b09f8ec83eaULL,
+            0x00d61027f8e82ba9ULL, 0x00aa4c85999dce67ULL,
+            0x00eac3132b9f3fe1ULL, 0x00fb9b0cf1c695d2ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x0043079295512f0dULL, 0x0046a009861758e0ULL,
+            0x003ee2842a807378ULL, 0x0034cc9d1298e4faULL,
+            0x009744eb4d31b3eeULL, 0x00afacec96650cd0ULL,
+            0x00ac891b313761aeULL, 0x00e864d6d26e708aULL) },
+        { FIELD_LITERAL(0x00a84d7c8a23b491ULL, 0x0088e19aa868b27fULL,
+            0x0005986d43e78ce9ULL, 0x00f28012f0606d28ULL,
+            0x0017ded7e10249b3ULL, 0x005ed4084b23af9bULL,
+            0x00b9b0a940564472ULL, 0x00ad9056cceeb1f4ULL) },
+        { FIELD_LITERAL(0x00db91b357fe755eULL, 0x00a1aa544b15359cULL,
+            0x00af4931a0195574ULL, 0x007686124fe11aefULL,
+            0x00d1ead3c7b9ef7eULL, 0x00aaf5fc580f8c15ULL,
+            0x00e727be147ee1ecULL, 0x003c61c1e1577b86ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x009d3fca983220cfULL, 0x00cd11acbc853dc4ULL,
+            0x0017590409d27f1dULL, 0x00d2176698082802ULL,
+            0x00fa01251b2838c8ULL, 0x00dd297a0d9b51c6ULL,
+            0x00d76c92c045820aULL, 0x00534bc7c46c9033ULL) },
+        { FIELD_LITERAL(0x0080ed9bc9b07338ULL, 0x00fceac7745d2652ULL,
+            0x008a9d55f5f2cc69ULL, 0x0096ce72df301ac5ULL,
+            0x00f53232e7974d87ULL, 0x0071728c7ae73947ULL,
+            0x0090507602570778ULL, 0x00cb81cfd883b1b2ULL) },
+        { FIELD_LITERAL(0x005011aadea373daULL, 0x003a8578ec896034ULL,
+            0x00f20a6535fa6d71ULL, 0x005152d31e5a87cfULL,
+            0x002bac1c8e68ca31ULL, 0x00b0e323db4c1381ULL,
+            0x00f1d596b7d5ae25ULL, 0x00eae458097cb4e0ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00920ac80f9b0d21ULL, 0x00f80f7f73401246ULL,
+            0x0086d37849b557d6ULL, 0x0002bd4b317b752eULL,
+            0x00b26463993a42bbULL, 0x002070422a73b129ULL,
+            0x00341acaa0380cb3ULL, 0x00541914dd66a1b2ULL) },
+        { FIELD_LITERAL(0x00c1513cd66abe8cULL, 0x000139e01118944dULL,
+            0x0064abbcb8080bbbULL, 0x00b3b08202473142ULL,
+            0x00c629ef25da2403ULL, 0x00f0aec3310d9b7fULL,
+            0x0050b2227472d8cdULL, 0x00f6c8a922d41fb4ULL) },
+        { FIELD_LITERAL(0x001075ccf26b7b1fULL, 0x00bb6bb213170433ULL,
+            0x00e9491ad262da79ULL, 0x009ef4f48d2d384cULL,
+            0x008992770766f09dULL, 0x001584396b6b1101ULL,
+            0x00af3f8676c9feefULL, 0x0024603c40269118ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x009dd7b31319527cULL, 0x001e7ac948d873a9ULL,
+            0x00fa54b46ef9673aULL, 0x0066efb8d5b02fe6ULL,
+            0x00754b1d3928aeaeULL, 0x0004262ac72a6f6bULL,
+            0x0079b7d49a6eb026ULL, 0x003126a753540102ULL) },
+        { FIELD_LITERAL(0x009666e24f693947ULL, 0x00f714311269d45fULL,
+            0x0010ffac1d0c851cULL, 0x0066e80c37363497ULL,
+            0x00f1f4ad010c60b0ULL, 0x0015c87408470ff7ULL,
+            0x00651d5e9c7766a4ULL, 0x008138819d7116deULL) },
+        { FIELD_LITERAL(0x003934b11c57253bULL, 0x00ef308edf21f46eULL,
+            0x00e54e99c7a16198ULL, 0x0080d57135764e63ULL,
+            0x00751c27b946bc24ULL, 0x00dd389ce4e9e129ULL,
+            0x00a1a2bfd1cd84dcULL, 0x002fae73e5149b32ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00911657dffb4cddULL, 0x00c100b7cc553d06ULL,
+            0x00449d075ec467ccULL, 0x007062100bc64e70ULL,
+            0x0043cf86f7bd21e7ULL, 0x00f401dc4b797deaULL,
+            0x005224afb2f62e65ULL, 0x00d1ede3fb5a42beULL) },
+        { FIELD_LITERAL(0x00f2ba36a41aa144ULL, 0x00a0c22d946ee18fULL,
+            0x008aae8ef9a14f99ULL, 0x00eef4d79b19bb36ULL,
+            0x008e75ce3d27b1fcULL, 0x00a65daa03b29a27ULL,
+            0x00d9cc83684eb145ULL, 0x009e1ed80cc2ed74ULL) },
+        { FIELD_LITERAL(0x00bed953d1997988ULL, 0x00b93ed175a24128ULL,
+            0x00871c5963fb6365ULL, 0x00ca2df20014a787ULL,
+            0x00f5d9c1d0b34322ULL, 0x00f6f5942818db0aULL,
+            0x004cc091f49c9906ULL, 0x00e8a188a60bff9fULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x0032c7762032fae8ULL, 0x00e4087232e0bc21ULL,
+            0x00f767344b6e8d85ULL, 0x00bbf369b76c2aa2ULL,
+            0x008a1f46c6e1570cULL, 0x001368cd9780369fULL,
+            0x007359a39d079430ULL, 0x0003646512921434ULL) },
+        { FIELD_LITERAL(0x007c4b47ca7c73e7ULL, 0x005396221039734bULL,
+            0x008b64ddf0e45d7eULL, 0x00bfad5af285e6c2ULL,
+            0x008ec711c5b1a1a8ULL, 0x00cf663301237f98ULL,
+            0x00917ee3f1655126ULL, 0x004152f337efedd8ULL) },
+        { FIELD_LITERAL(0x0007c7edc9305daaULL, 0x000a6664f273701cULL,
+            0x00f6e78795e200b1ULL, 0x005d05b9ecd2473eULL,
+            0x0014f5f17c865786ULL, 0x00c7fd2d166fa995ULL,
+            0x004939a2d8eb80e0ULL, 0x002244ba0942c199ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00321e767f0262cfULL, 0x002e57d776caf68eULL,
+            0x00bf2c94814f0437ULL, 0x00c339196acd622fULL,
+            0x001db4cce71e2770ULL, 0x001ded5ddba6eee2ULL,
+            0x0078608ab1554c8dULL, 0x00067fe0ab76365bULL) },
+        { FIELD_LITERAL(0x00f09758e11e3985ULL, 0x00169efdbd64fad3ULL,
+            0x00e8889b7d6dacd6ULL, 0x0035cdd58ea88209ULL,
+            0x00bcda47586d7f49ULL, 0x003cdddcb2879088ULL,
+            0x0016da70187e954bULL, 0x009556ea2e92aacdULL) },
+        { FIELD_LITERAL(0x008cab16bd1ff897ULL, 0x00b389972cdf753fULL,
+            0x00ea8ed1e46dfdc0ULL, 0x004fe7ef94c589f4ULL,
+            0x002b8ae9b805ecf3ULL, 0x0025c08d892874a5ULL,
+            0x0023938e98d44c4cULL, 0x00f759134cabf69cULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x006c2a84678e4b3bULL, 0x007a194aacd1868fULL,
+            0x00ed0225af424761ULL, 0x00da0a6f293c64b8ULL,
+            0x001062ac5c6a7a18ULL, 0x0030f5775a8aeef4ULL,
+            0x0002acaad76b7af0ULL, 0x00410b8fd63a579fULL) },
+        { FIELD_LITERAL(0x001ec59db3d9590eULL, 0x001e9e3f1c3f182dULL,
+            0x0045a9c3ec2cab14ULL, 0x0008198572aeb673ULL,
+            0x00773b74068bd167ULL, 0x0012535eaa395434ULL,
+            0x0044dba9e3bbb74aULL, 0x002fba4d3c74bd0eULL) },
+        { FIELD_LITERAL(0x0042bf08fe66922cULL, 0x003318b8fbb49e8cULL,
+            0x00d75946004aa14cULL, 0x00f601586b42bf1cULL,
+            0x00c74cf1d912fe66ULL, 0x00abcb36974b30adULL,
+            0x007eb78720c9d2b8ULL, 0x009f54ab7bd4df85ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00db9fc948f73826ULL, 0x00fa8b3746ed8ee9ULL,
+            0x00132cb65aafbeb2ULL, 0x00c36ff3fe7925b8ULL,
+            0x00837daed353d2feULL, 0x00ec661be0667cf4ULL,
+            0x005beb8ed2e90204ULL, 0x00d77dd69e564967ULL) },
+        { FIELD_LITERAL(0x0042e6268b861751ULL, 0x0008dd0469500c16ULL,
+            0x00b51b57c338a3fdULL, 0x00cc4497d85cff6bULL,
+            0x002f13d6b57c34a4ULL, 0x0083652eaf301105ULL,
+            0x00cc344294cc93a8ULL, 0x0060f4d02810e270ULL) },
+        { FIELD_LITERAL(0x00a8954363cd518bULL, 0x00ad171124bccb7bULL,
+            0x0065f46a4adaae00ULL, 0x001b1a5b2a96e500ULL,
+            0x0043fe24f8233285ULL, 0x0066996d8ae1f2c3ULL,
+            0x00c530f3264169f9ULL, 0x00c0f92d07cf6a57ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x0036a55c6815d943ULL, 0x008c8d1def993db3ULL,
+            0x002e0e1e8ff7318fULL, 0x00d883a4b92db00aULL,
+            0x002f5e781ae33906ULL, 0x001a72adb235c06dULL,
+            0x00f2e59e736e9caaULL, 0x001a4b58e3031914ULL) },
+        { FIELD_LITERAL(0x00d73bfae5e00844ULL, 0x00bf459766fb5f52ULL,
+            0x0061b4f5a5313cdeULL, 0x004392d4c3b95514ULL,
+            0x000d3551b1077523ULL, 0x0000998840ee5d71ULL,
+            0x006de6e340448b7bULL, 0x00251aa504875d6eULL) },
+        { FIELD_LITERAL(0x003bf343427ac342ULL, 0x00adc0a78642b8c5ULL,
+            0x0003b893175a8314ULL, 0x0061a34ade5703bcULL,
+            0x00ea3ea8bb71d632ULL, 0x00be0df9a1f198c2ULL,
+            0x0046dd8e7c1635fbULL, 0x00f1523fdd25d5e5ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00633f63fc9dd406ULL, 0x00e713ff80e04a43ULL,
+            0x0060c6e970f2d621ULL, 0x00a57cd7f0df1891ULL,
+            0x00f2406a550650bbULL, 0x00b064290efdc684ULL,
+            0x001eab0144d17916ULL, 0x00cd15f863c293abULL) },
+        { FIELD_LITERAL(0x0029cec55273f70dULL, 0x007044ee275c6340ULL,
+            0x0040f637a93015e2ULL, 0x00338bb78db5aae9ULL,
+            0x001491b2a6132147ULL, 0x00a125d6cfe6bde3ULL,
+            0x005f7ac561ba8669ULL, 0x001d5eaea3fbaacfULL) },
+        { FIELD_LITERAL(0x00054e9635e3be31ULL, 0x000e43f31e2872beULL,
+            0x00d05b1c9e339841ULL, 0x006fac50bd81fd98ULL,
+            0x00cdc7852eaebb09ULL, 0x004ff519b061991bULL,
+            0x009099e8107d4c85ULL, 0x00273e24c36a4a61ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00070b4441ef2c46ULL, 0x00efa5b02801a109ULL,
+            0x00bf0b8c3ee64adfULL, 0x008a67e0b3452e98ULL,
+            0x001916b1f2fa7a74ULL, 0x00d781a78ff6cdc3ULL,
+            0x008682ce57e5c919ULL, 0x00cc1109dd210da3ULL) },
+        { FIELD_LITERAL(0x00cae8aaff388663ULL, 0x005e983a35dda1c7ULL,
+            0x007ab1030d8e37f4ULL, 0x00e48940f5d032feULL,
+            0x006a36f9ef30b331ULL, 0x009be6f03958c757ULL,
+            0x0086231ceba91400ULL, 0x008bd0f7b823e7aaULL) },
+        { FIELD_LITERAL(0x00cf881ebef5a45aULL, 0x004ebea78e7c6f2cULL,
+            0x0090da9209cf26a0ULL, 0x00de2b2e4c775b84ULL,
+            0x0071d6031c3c15aeULL, 0x00d9e927ef177d70ULL,
+            0x00894ee8c23896fdULL, 0x00e3b3b401e41aadULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00204fef26864170ULL, 0x00819269c5dee0f8ULL,
+            0x00bfb4713ec97966ULL, 0x0026339a6f34df78ULL,
+            0x001f26e64c761dc2ULL, 0x00effe3af313cb60ULL,
+            0x00e17b70138f601bULL, 0x00f16e1ccd9ede5eULL) },
+        { FIELD_LITERAL(0x005d9a8353fdb2dbULL, 0x0055cc2048c698f0ULL,
+            0x00f6c4ac89657218ULL, 0x00525034d73faeb2ULL,
+            0x00435776fbda3c7dULL, 0x0070ea5312323cbcULL,
+            0x007a105d44d069fbULL, 0x006dbc8d6dc786aaULL) },
+        { FIELD_LITERAL(0x0017cff19cd394ecULL, 0x00fef7b810922587ULL,
+            0x00e6483970dff548ULL, 0x00ddf36ad6874264ULL,
+            0x00e61778523fcce2ULL, 0x0093a66c0c93b24aULL,
+            0x00fd367114db7f86ULL, 0x007652d7ddce26ddULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00d92ced7ba12843ULL, 0x00aea9c7771e86e7ULL,
+            0x0046639693354f7bULL, 0x00a628dbb6a80c47ULL,
+            0x003a0b0507372953ULL, 0x00421113ab45c0d9ULL,
+            0x00e545f08362ab7aULL, 0x0028ce087b4d6d96ULL) },
+        { FIELD_LITERAL(0x00a67ee7cf9f99ebULL, 0x005713b275f2ff68ULL,
+            0x00f1d536a841513dULL, 0x00823b59b024712eULL,
+            0x009c46b9d0d38cecULL, 0x00cdb1595aa2d7d4ULL,
+            0x008375b3423d9af8ULL, 0x000ab0b516d978f7ULL) },
+        { FIELD_LITERAL(0x00428dcb3c510b0fULL, 0x00585607ea24bb4eULL,
+            0x003736bf1603687aULL, 0x00c47e568c4fe3c7ULL,
+            0x003cd00282848605ULL, 0x0043a487c3b91939ULL,
+            0x004ffc04e1095a06ULL, 0x00a4c989a3d4b918ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00a8778d0e429f7aULL, 0x004c02b059105a68ULL,
+            0x0016653b609da3ffULL, 0x00d5107bd1a12d27ULL,
+            0x00b4708f9a771cabULL, 0x00bb63b662033f69ULL,
+            0x0072f322240e7215ULL, 0x0019445b59c69222ULL) },
+        { FIELD_LITERAL(0x00cf4f6069a658e6ULL, 0x0053ca52859436a6ULL,
+            0x0064b994d7e3e117ULL, 0x00cb469b9a07f534ULL,
+            0x00cfb68f399e9d47ULL, 0x00f0dcb8dac1c6e7ULL,
+            0x00f2ab67f538b3a5ULL, 0x0055544f178ab975ULL) },
+        { FIELD_LITERAL(0x0099b7a2685d538cULL, 0x00e2f1897b7c0018ULL,
+            0x003adac8ce48dae3ULL, 0x00089276d5c50c0cULL,
+            0x00172fca07ad6717ULL, 0x00cb1a72f54069e5ULL,
+            0x004ee42f133545b3ULL, 0x00785f8651362f16ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x0049cbac38509e11ULL, 0x0015234505d42cdfULL,
+            0x00794fb0b5840f1cULL, 0x00496437344045a5ULL,
+            0x0031b6d944e4f9b0ULL, 0x00b207318ac1f5d8ULL,
+            0x0000c840da7f5c5dULL, 0x00526f373a5c8814ULL) },
+        { FIELD_LITERAL(0x002c7b7742d1dfd9ULL, 0x002cabeb18623c01ULL,
+            0x00055f5e3e044446ULL, 0x006c20f3b4ef54baULL,
+            0x00c600141ec6b35fULL, 0x00354f437f1a32a3ULL,
+            0x00bac4624a3520f9ULL, 0x00c483f734a90691ULL) },
+        { FIELD_LITERAL(0x0053a737d422918dULL, 0x00f7fca1d8758625ULL,
+            0x00c360336dadb04cULL, 0x00f38e3d9158a1b8ULL,
+            0x0069ce3b418e84c6ULL, 0x005d1697eca16eadULL,
+            0x00f8bd6a35ece13dULL, 0x007885dfc2b5afeaULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00c3617ae260776cULL, 0x00b20dc3e96922d7ULL,
+            0x00a1a7802246706aULL, 0x00ca6505a5240244ULL,
+            0x002246b62d919782ULL, 0x001439102d7aa9b3ULL,
+            0x00e8af1139e6422cULL, 0x00c888d1b52f2b05ULL) },
+        { FIELD_LITERAL(0x005b67690ffd41d9ULL, 0x005294f28df516f9ULL,
+            0x00a879272412fcb9ULL, 0x00098b629a6d1c8dULL,
+            0x00fabd3c8050865aULL, 0x00cd7e5b0a3879c5ULL,
+            0x00153238210f3423ULL, 0x00357cac101e9f42ULL) },
+        { FIELD_LITERAL(0x008917b454444fb7ULL, 0x00f59247c97e441bULL,
+            0x00a6200a6815152dULL, 0x0009a4228601d254ULL,
+            0x001c0360559bd374ULL, 0x007563362039cb36ULL,
+            0x00bd75b48d74e32bULL, 0x0017f515ac3499e8ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x001532a7ffe41c5aULL, 0x00eb1edce358d6bfULL,
+            0x00ddbacc7b678a7bULL, 0x008a7b70f3c841a3ULL,
+            0x00f1923bf27d3f4cULL, 0x000b2713ed8f7873ULL,
+            0x00aaf67e29047902ULL, 0x0044994a70b3976dULL) },
+        { FIELD_LITERAL(0x00d54e802082d42cULL, 0x00a55aa0dce7cc6cULL,
+            0x006477b96073f146ULL, 0x0082efe4ceb43594ULL,
+            0x00a922bcba026845ULL, 0x0077f19d1ab75182ULL,
+            0x00c2bb2737846e59ULL, 0x0004d7eec791dd33ULL) },
+        { FIELD_LITERAL(0x0044588d1a81d680ULL, 0x00b0a9097208e4f8ULL,
+            0x00212605350dc57eULL, 0x0028717cd2871123ULL,
+            0x00fb083c100fd979ULL, 0x0045a056ce063fdfULL,
+            0x00a5d604b4dd6a41ULL, 0x001dabc08ba4e236ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00c4887198d7a7faULL, 0x00244f98fb45784aULL,
+            0x0045911e15a15d01ULL, 0x001d323d374c0966ULL,
+            0x00967c3915196562ULL, 0x0039373abd2f3c67ULL,
+            0x000d2c5614312423ULL, 0x0041cf2215442ce3ULL) },
+        { FIELD_LITERAL(0x008ede889ada7f06ULL, 0x001611e91de2e135ULL,
+            0x00fdb9a458a471b9ULL, 0x00563484e03710d1ULL,
+            0x0031cc81925e3070ULL, 0x0062c97b3af80005ULL,
+            0x00fa733eea28edebULL, 0x00e82457e1ebbc88ULL) },
+        { FIELD_LITERAL(0x006a0df5fe9b6f59ULL, 0x00a0d4ff46040d92ULL,
+            0x004a7cedb6f93250ULL, 0x00d1df8855b8c357ULL,
+            0x00e73a46086fd058ULL, 0x0048fb0add6dfe59ULL,
+            0x001e03a28f1b4e3dULL, 0x00a871c993308d76ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x0030dbb2d1766ec8ULL, 0x00586c0ad138555eULL,
+            0x00d1a34f9e91c77cULL, 0x0063408ad0e89014ULL,
+            0x00d61231b05f6f5bULL, 0x0009abf569f5fd8aULL,
+            0x00aec67a110f1c43ULL, 0x0031d1a790938dd7ULL) },
+        { FIELD_LITERAL(0x006cded841e2a862ULL, 0x00198d60af0ab6fbULL,
+            0x0018f09db809e750ULL, 0x004e6ac676016263ULL,
+            0x00eafcd1620969cbULL, 0x002c9784ca34917dULL,
+            0x0054f00079796de7ULL, 0x00d9fab5c5972204ULL) },
+        { FIELD_LITERAL(0x004bd0fee2438a83ULL, 0x00b571e62b0f83bdULL,
+            0x0059287d7ce74800ULL, 0x00fb3631b645c3f0ULL,
+            0x00a018e977f78494ULL, 0x0091e27065c27b12ULL,
+            0x007696c1817165e0ULL, 0x008c40be7c45ba3aULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00a0f326327cb684ULL, 0x001c7d0f672680ffULL,
+            0x008c1c81ffb112d1ULL, 0x00f8f801674eddc8ULL,
+            0x00e926d5d48c2a9dULL, 0x005bd6d954c6fe9aULL,
+            0x004c6b24b4e33703ULL, 0x00d05eb5c09105ccULL) },
+        { FIELD_LITERAL(0x00d61731caacf2cfULL, 0x002df0c7609e01c5ULL,
+            0x00306172208b1e2bULL, 0x00b413fe4fb2b686ULL,
+            0x00826d360902a221ULL, 0x003f8d056e67e7f7ULL,
+            0x0065025b0175e989ULL, 0x00369add117865ebULL) },
+        { FIELD_LITERAL(0x00aaf895aec2fa11ULL, 0x000f892bc313eb52ULL,
+            0x005b1c794dad050bULL, 0x003f8ec4864cec14ULL,
+            0x00af81058d0b90e5ULL, 0x00ebe43e183997bbULL,
+            0x00a9d610f9f3e615ULL, 0x007acd8eec2e88d3ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x0049b2fab13812a3ULL, 0x00846db32cd60431ULL,
+            0x000177fa578c8d6cULL, 0x00047d0e2ad4bc51ULL,
+            0x00b158ba38d1e588ULL, 0x006a45daad79e3f3ULL,
+            0x000997b93cab887bULL, 0x00c47ea42fa23dc3ULL) },
+        { FIELD_LITERAL(0x0012b6fef7aeb1caULL, 0x009412768194b6a7ULL,
+            0x00ff0d351f23ab93ULL, 0x007e8a14c1aff71bULL,
+            0x006c1c0170c512bcULL, 0x0016243ea02ab2e5ULL,
+            0x007bb6865b303f3eULL, 0x0015ce6b29b159f4ULL) },
+        { FIELD_LITERAL(0x009961cd02e68108ULL, 0x00e2035d3a1d0836ULL,
+            0x005d51f69b5e1a1dULL, 0x004bccb4ea36edcdULL,
+            0x0069be6a7aeef268ULL, 0x0063f4dd9de8d5a7ULL,
+            0x006283783092ca35ULL, 0x0075a31af2c35409ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00c412365162e8cfULL, 0x00012283fb34388aULL,
+            0x003e6543babf39e2ULL, 0x00eead6b3a804978ULL,
+            0x0099c0314e8b326fULL, 0x00e98e0a8d477a4fULL,
+            0x00d2eb96b127a687ULL, 0x00ed8d7df87571bbULL) },
+        { FIELD_LITERAL(0x00777463e308cacfULL, 0x00c8acb93950132dULL,
+            0x00ebddbf4ca48b2cULL, 0x0026ad7ca0795a0aULL,
+            0x00f99a3d9a715064ULL, 0x000d60bcf9d4dfccULL,
+            0x005e65a73a437a06ULL, 0x0019d536a8db56c8ULL) },
+        { FIELD_LITERAL(0x00192d7dd558d135ULL, 0x0027cd6a8323ffa7ULL,
+            0x00239f1a412dc1e7ULL, 0x0046b4b3be74fc5cULL,
+            0x0020c47a2bef5bceULL, 0x00aa17e48f43862bULL,
+            0x00f7e26c96342e5fULL, 0x0008011c530f39a9ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x00aad4ac569bf0f1ULL, 0x00a67adc90b27740ULL,
+            0x0048551369a5751aULL, 0x0031252584a3306aULL,
+            0x0084e15df770e6fcULL, 0x00d7bba1c74b5805ULL,
+            0x00a80ef223af1012ULL, 0x0089c85ceb843a34ULL) },
+        { FIELD_LITERAL(0x00c4545be4a54004ULL, 0x0099e11f60357e6cULL,
+            0x001f3936d19515a6ULL, 0x007793df84341a6eULL,
+            0x0051061886717ffaULL, 0x00e9b0a660b28f85ULL,
+            0x0044ea685892de0dULL, 0x000257d2a1fda9d9ULL) },
+        { FIELD_LITERAL(0x007e8b01b24ac8a8ULL, 0x006cf3b0b5ca1337ULL,
+            0x00f1607d3e36a570ULL, 0x0039b7fab82991a1ULL,
+            0x00231777065840c5ULL, 0x00998e5afdd346f9ULL,
+            0x00b7dc3e64acc85fULL, 0x00baacc748013ad6ULL) },
+    } },
+    { {
+        { FIELD_LITERAL(0x008ea6a4177580bfULL, 0x005fa1953e3f0378ULL,
+            0x005fe409ac74d614ULL, 0x00452327f477e047ULL,
+            0x00a4018507fb6073ULL, 0x007b6e71951caac8ULL,
+            0x0012b42ab8a6ce91ULL, 0x0080eca677294ab7ULL) },
+        { FIELD_LITERAL(0x00a53edc023ba69bULL, 0x00c6afa83ddde2e8ULL,
+            0x00c3f638b307b14eULL, 0x004a357a64414062ULL,
+            0x00e4d94d8b582dc9ULL, 0x001739caf71695b7ULL,
+            0x0012431b2ae28de1ULL, 0x003b6bc98682907cULL) },
+        { FIELD_LITERAL(0x008a9a93be1f99d6ULL, 0x0079fa627cc699c8ULL,
+            0x00b0cfb134ba84c8ULL, 0x001c4b778249419aULL,
+            0x00df4ab3d9c44f40ULL, 0x009f596e6c1a9e3cULL,
+            0x001979c0df237316ULL, 0x00501e953a919b87ULL) },
+    } }
 };
 const niels_t *ossl_curve448_wnaf_base = curve448_wnaf_base_table;
diff --git a/crypto/ec/curve448/curve448utils.h b/crypto/ec/curve448/curve448utils.h
index 664c6e6ff306d..c3ca6ba53e7a1 100644
--- a/crypto/ec/curve448/curve448utils.h
+++ b/crypto/ec/curve448/curve448utils.h
@@ -11,11 +11,11 @@
  */
 
 #ifndef OSSL_CRYPTO_EC_CURVE448UTILS_H
-# define OSSL_CRYPTO_EC_CURVE448UTILS_H
+#define OSSL_CRYPTO_EC_CURVE448UTILS_H
 
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
 
-# include "internal/numbers.h"
+#include "internal/numbers.h"
 
 /*
  * Internal word types. Somewhat tricky.  This could be decided separately per
@@ -24,18 +24,18 @@
  * header was built with eg arch_neon, you might end up linking a library built
  * with arch_arm32.
  */
-# ifndef C448_WORD_BITS
-#  if (defined(__SIZEOF_INT128__) && (__SIZEOF_INT128__ == 16)) \
-      && !defined(__sparc__) \
-      && (!defined(__SIZEOF_LONG__) || (__SIZEOF_LONG__ == 8))
+#ifndef C448_WORD_BITS
+#if (defined(__SIZEOF_INT128__) && (__SIZEOF_INT128__ == 16)) \
+    && !defined(__sparc__)                                    \
+    && (!defined(__SIZEOF_LONG__) || (__SIZEOF_LONG__ == 8))
 
-#   define C448_WORD_BITS 64      /* The number of bits in a word */
-#  else
-#   define C448_WORD_BITS 32      /* The number of bits in a word */
-#  endif
-# endif
+#define C448_WORD_BITS 64 /* The number of bits in a word */
+#else
+#define C448_WORD_BITS 32 /* The number of bits in a word */
+#endif
+#endif
 
-# if C448_WORD_BITS == 64
+#if C448_WORD_BITS == 64
 /* Word size for internal computations */
 typedef uint64_t c448_word_t;
 /* Signed word size for internal computations */
@@ -46,7 +46,7 @@ typedef uint64_t c448_bool_t;
 typedef uint128_t c448_dword_t;
 /* Signed double-word size for internal computations */
 typedef int128_t c448_dsword_t;
-# elif C448_WORD_BITS == 32
+#elif C448_WORD_BITS == 32
 /* Word size for internal computations */
 typedef uint32_t c448_word_t;
 /* Signed word size for internal computations */
@@ -57,26 +57,26 @@ typedef uint32_t c448_bool_t;
 typedef uint64_t c448_dword_t;
 /* Signed double-word size for internal computations */
 typedef int64_t c448_dsword_t;
-# else
-#  error "Only supporting C448_WORD_BITS = 32 or 64 for now"
-# endif
+#else
+#error "Only supporting C448_WORD_BITS = 32 or 64 for now"
+#endif
 
 /* C448_TRUE = -1 so that C448_TRUE & x = x */
-# define C448_TRUE      (0 - (c448_bool_t)1)
+#define C448_TRUE (0 - (c448_bool_t)1)
 
 /* C448_FALSE = 0 so that C448_FALSE & x = 0 */
-# define C448_FALSE     0
+#define C448_FALSE 0
 
 /* Another boolean type used to indicate success or failure. */
 typedef enum {
     C448_SUCCESS = -1, /**< The operation succeeded. */
-    C448_FAILURE = 0   /**< The operation failed. */
+    C448_FAILURE = 0 /**< The operation failed. */
 } c448_error_t;
 
 /* Return success if x is true */
 static ossl_inline c448_error_t c448_succeed_if(c448_bool_t x)
 {
-    return (c448_error_t) x;
+    return (c448_error_t)x;
 }
 
-#endif                          /* __C448_COMMON_H__ */
+#endif /* __C448_COMMON_H__ */
diff --git a/crypto/ec/curve448/ed448.h b/crypto/ec/curve448/ed448.h
index f4f01892d3c3c..1c94649557cad 100644
--- a/crypto/ec/curve448/ed448.h
+++ b/crypto/ec/curve448/ed448.h
@@ -11,25 +11,24 @@
  */
 
 #ifndef OSSL_CRYPTO_EC_CURVE448_ED448_H
-# define OSSL_CRYPTO_EC_CURVE448_ED448_H
+#define OSSL_CRYPTO_EC_CURVE448_ED448_H
 
-# include "point_448.h"
+#include "point_448.h"
 
 /* Number of bytes in an EdDSA public key. */
-# define EDDSA_448_PUBLIC_BYTES 57
+#define EDDSA_448_PUBLIC_BYTES 57
 
 /* Number of bytes in an EdDSA private key. */
-# define EDDSA_448_PRIVATE_BYTES EDDSA_448_PUBLIC_BYTES
+#define EDDSA_448_PRIVATE_BYTES EDDSA_448_PUBLIC_BYTES
 
 /* Number of bytes in an EdDSA signature. */
-# define EDDSA_448_SIGNATURE_BYTES (EDDSA_448_PUBLIC_BYTES + \
-                                    EDDSA_448_PRIVATE_BYTES)
+#define EDDSA_448_SIGNATURE_BYTES (EDDSA_448_PUBLIC_BYTES + EDDSA_448_PRIVATE_BYTES)
 
 /* EdDSA encoding ratio. */
-# define C448_EDDSA_ENCODE_RATIO 4
+#define C448_EDDSA_ENCODE_RATIO 4
 
 /* EdDSA decoding ratio. */
-# define C448_EDDSA_DECODE_RATIO (4 / 4)
+#define C448_EDDSA_DECODE_RATIO (4 / 4)
 
 /*
  * EdDSA key generation.  This function uses a different (non-Decaf) encoding.
@@ -39,10 +38,10 @@
  */
 c448_error_t
 ossl_c448_ed448_derive_public_key(
-                              OSSL_LIB_CTX *ctx,
-                              uint8_t pubkey [EDDSA_448_PUBLIC_BYTES],
-                              const uint8_t privkey [EDDSA_448_PRIVATE_BYTES],
-                              const char *propq);
+    OSSL_LIB_CTX *ctx,
+    uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+    const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
+    const char *propq);
 
 /*
  * EdDSA signing.
@@ -63,13 +62,13 @@ ossl_c448_ed448_derive_public_key(
  */
 c448_error_t
 ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
-                     uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
-                     const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
-                     const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
-                     const uint8_t *message, size_t message_len,
-                     uint8_t prehashed, const uint8_t *context,
-                     size_t context_len,
-                     const char *propq);
+    uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+    const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
+    const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+    const uint8_t *message, size_t message_len,
+    uint8_t prehashed, const uint8_t *context,
+    size_t context_len,
+    const char *propq);
 
 /*
  * EdDSA signing with prehash.
@@ -89,13 +88,13 @@ ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
  */
 c448_error_t
 ossl_c448_ed448_sign_prehash(OSSL_LIB_CTX *ctx,
-                             uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
-                             const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
-                             const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
-                             const uint8_t hash[64],
-                             const uint8_t *context,
-                             size_t context_len,
-                             const char *propq);
+    uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+    const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
+    const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+    const uint8_t hash[64],
+    const uint8_t *context,
+    size_t context_len,
+    const char *propq);
 
 /*
  * EdDSA signature verification.
@@ -117,14 +116,14 @@ ossl_c448_ed448_sign_prehash(OSSL_LIB_CTX *ctx,
  */
 c448_error_t
 ossl_c448_ed448_verify(OSSL_LIB_CTX *ctx,
-                       const uint8_t
-                       signature[EDDSA_448_SIGNATURE_BYTES],
-                       const uint8_t
-                       pubkey[EDDSA_448_PUBLIC_BYTES],
-                       const uint8_t *message, size_t message_len,
-                       uint8_t prehashed, const uint8_t *context,
-                       uint8_t context_len,
-                       const char *propq);
+    const uint8_t
+        signature[EDDSA_448_SIGNATURE_BYTES],
+    const uint8_t
+        pubkey[EDDSA_448_PUBLIC_BYTES],
+    const uint8_t *message, size_t message_len,
+    uint8_t prehashed, const uint8_t *context,
+    uint8_t context_len,
+    const char *propq);
 
 /*
  * EdDSA signature verification.
@@ -145,13 +144,13 @@ ossl_c448_ed448_verify(OSSL_LIB_CTX *ctx,
  */
 c448_error_t
 ossl_c448_ed448_verify_prehash(
-                            OSSL_LIB_CTX *ctx,
-                            const uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
-                            const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
-                            const uint8_t hash[64],
-                            const uint8_t *context,
-                            uint8_t context_len,
-                            const char *propq);
+    OSSL_LIB_CTX *ctx,
+    const uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+    const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+    const uint8_t hash[64],
+    const uint8_t *context,
+    uint8_t context_len,
+    const char *propq);
 
 /*
  * EdDSA point encoding.  Used internally, exposed externally.
@@ -176,10 +175,9 @@ ossl_c448_ed448_verify_prehash(
  * enc (out): The encoded point.
  * p (in): The point.
  */
-void
-ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
-                                    uint8_t enc [EDDSA_448_PUBLIC_BYTES],
-                                    const curve448_point_t p);
+void ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
+    uint8_t enc[EDDSA_448_PUBLIC_BYTES],
+    const curve448_point_t p);
 
 /*
  * EdDSA point decoding.  Multiplies by C448_EDDSA_DECODE_RATIO, and
@@ -192,8 +190,8 @@ ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(
  */
 c448_error_t
 ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(
-                            curve448_point_t p,
-                            const uint8_t enc[EDDSA_448_PUBLIC_BYTES]);
+    curve448_point_t p,
+    const uint8_t enc[EDDSA_448_PUBLIC_BYTES]);
 
 /*
  * EdDSA to ECDH private key conversion
@@ -205,9 +203,9 @@ ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(
  */
 c448_error_t
 ossl_c448_ed448_convert_private_key_to_x448(
-                                    OSSL_LIB_CTX *ctx,
-                                    uint8_t x[X448_PRIVATE_BYTES],
-                                    const uint8_t ed[EDDSA_448_PRIVATE_BYTES],
-                                    const char *propq);
+    OSSL_LIB_CTX *ctx,
+    uint8_t x[X448_PRIVATE_BYTES],
+    const uint8_t ed[EDDSA_448_PRIVATE_BYTES],
+    const char *propq);
 
-#endif                          /* OSSL_CRYPTO_EC_CURVE448_ED448_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_ED448_H */
diff --git a/crypto/ec/curve448/eddsa.c b/crypto/ec/curve448/eddsa.c
index 080486e9f3694..f90ee2e82d172 100644
--- a/crypto/ec/curve448/eddsa.c
+++ b/crypto/ec/curve448/eddsa.c
@@ -21,8 +21,8 @@
 #define COFACTOR 4
 
 static c448_error_t oneshot_hash(OSSL_LIB_CTX *ctx, uint8_t *out, size_t outlen,
-                                 const uint8_t *in, size_t inlen,
-                                 const char *propq)
+    const uint8_t *in, size_t inlen,
+    const char *propq)
 {
     EVP_MD_CTX *hashctx = EVP_MD_CTX_new();
     EVP_MD *shake256 = NULL;
@@ -36,12 +36,12 @@ static c448_error_t oneshot_hash(OSSL_LIB_CTX *ctx, uint8_t *out, size_t outlen,
         goto err;
 
     if (!EVP_DigestInit_ex(hashctx, shake256, NULL)
-            || !EVP_DigestUpdate(hashctx, in, inlen)
-            || !EVP_DigestFinalXOF(hashctx, out, outlen))
+        || !EVP_DigestUpdate(hashctx, in, inlen)
+        || !EVP_DigestFinalXOF(hashctx, out, outlen))
         goto err;
 
     ret = C448_SUCCESS;
- err:
+err:
     EVP_MD_CTX_free(hashctx);
     EVP_MD_free(shake256);
     return ret;
@@ -55,11 +55,11 @@ static void clamp(uint8_t secret_scalar_ser[EDDSA_448_PRIVATE_BYTES])
 }
 
 static c448_error_t hash_init_with_dom(OSSL_LIB_CTX *ctx, EVP_MD_CTX *hashctx,
-                                       uint8_t prehashed,
-                                       uint8_t for_prehash,
-                                       const uint8_t *context,
-                                       size_t context_len,
-                                       const char *propq)
+    uint8_t prehashed,
+    uint8_t for_prehash,
+    const uint8_t *context,
+    size_t context_len,
+    const char *propq)
 {
     /* ASCII: "SigEd448", in hex for EBCDIC compatibility */
     const char dom_s[] = "\x53\x69\x67\x45\x64\x34\x34\x38";
@@ -70,7 +70,7 @@ static c448_error_t hash_init_with_dom(OSSL_LIB_CTX *ctx, EVP_MD_CTX *hashctx,
         return C448_FAILURE;
 
     dom[0] = (uint8_t)(2 - (prehashed == 0 ? 1 : 0)
-                       - (for_prehash == 0 ? 1 : 0));
+        - (for_prehash == 0 ? 1 : 0));
     dom[1] = (uint8_t)context_len;
 
     shake256 = EVP_MD_fetch(ctx, "SHAKE256", propq);
@@ -78,9 +78,9 @@ static c448_error_t hash_init_with_dom(OSSL_LIB_CTX *ctx, EVP_MD_CTX *hashctx,
         return C448_FAILURE;
 
     if (!EVP_DigestInit_ex(hashctx, shake256, NULL)
-            || !EVP_DigestUpdate(hashctx, dom_s, sizeof(dom_s)-1)
-            || !EVP_DigestUpdate(hashctx, dom, sizeof(dom))
-            || !EVP_DigestUpdate(hashctx, context, context_len)) {
+        || !EVP_DigestUpdate(hashctx, dom_s, sizeof(dom_s) - 1)
+        || !EVP_DigestUpdate(hashctx, dom, sizeof(dom))
+        || !EVP_DigestUpdate(hashctx, context, context_len)) {
         EVP_MD_free(shake256);
         return C448_FAILURE;
     }
@@ -92,23 +92,23 @@ static c448_error_t hash_init_with_dom(OSSL_LIB_CTX *ctx, EVP_MD_CTX *hashctx,
 /* In this file because it uses the hash */
 c448_error_t
 ossl_c448_ed448_convert_private_key_to_x448(
-                            OSSL_LIB_CTX *ctx,
-                            uint8_t x[X448_PRIVATE_BYTES],
-                            const uint8_t ed [EDDSA_448_PRIVATE_BYTES],
-                            const char *propq)
+    OSSL_LIB_CTX *ctx,
+    uint8_t x[X448_PRIVATE_BYTES],
+    const uint8_t ed[EDDSA_448_PRIVATE_BYTES],
+    const char *propq)
 {
     /* pass the private key through oneshot_hash function */
     /* and keep the first X448_PRIVATE_BYTES bytes */
     return oneshot_hash(ctx, x, X448_PRIVATE_BYTES, ed,
-                        EDDSA_448_PRIVATE_BYTES, propq);
+        EDDSA_448_PRIVATE_BYTES, propq);
 }
 
 c448_error_t
 ossl_c448_ed448_derive_public_key(
-                        OSSL_LIB_CTX *ctx,
-                        uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
-                        const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
-                        const char *propq)
+    OSSL_LIB_CTX *ctx,
+    uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+    const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
+    const char *propq)
 {
     /* only this much used for keygen */
     uint8_t secret_scalar_ser[EDDSA_448_PRIVATE_BYTES];
@@ -117,15 +117,15 @@ ossl_c448_ed448_derive_public_key(
     curve448_point_t p;
 
     if (!oneshot_hash(ctx, secret_scalar_ser, sizeof(secret_scalar_ser),
-                      privkey,
-                      EDDSA_448_PRIVATE_BYTES,
-                      propq))
+            privkey,
+            EDDSA_448_PRIVATE_BYTES,
+            propq))
         return C448_FAILURE;
 
     clamp(secret_scalar_ser);
 
     ossl_curve448_scalar_decode_long(secret_scalar, secret_scalar_ser,
-                                     sizeof(secret_scalar_ser));
+        sizeof(secret_scalar_ser));
 
     /*
      * Since we are going to mul_by_cofactor during encoding, divide by it
@@ -139,7 +139,7 @@ ossl_c448_ed448_derive_public_key(
         ossl_curve448_scalar_halve(secret_scalar, secret_scalar);
 
     ossl_curve448_precomputed_scalarmul(p, ossl_curve448_precomputed_base,
-                                        secret_scalar);
+        secret_scalar);
 
     ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(pubkey, p);
 
@@ -153,12 +153,12 @@ ossl_c448_ed448_derive_public_key(
 
 c448_error_t
 ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
-                     uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
-                     const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
-                     const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
-                     const uint8_t *message, size_t message_len,
-                     uint8_t prehashed, const uint8_t *context,
-                     size_t context_len, const char *propq)
+    uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+    const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
+    const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+    const uint8_t *message, size_t message_len,
+    uint8_t prehashed, const uint8_t *context,
+    size_t context_len, const char *propq)
 {
     curve448_scalar_t secret_scalar;
     EVP_MD_CTX *hashctx = EVP_MD_CTX_new();
@@ -179,19 +179,19 @@ ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
         uint8_t expanded[EDDSA_448_PRIVATE_BYTES * 2];
 
         if (!oneshot_hash(ctx, expanded, sizeof(expanded), privkey,
-                          EDDSA_448_PRIVATE_BYTES, propq))
+                EDDSA_448_PRIVATE_BYTES, propq))
             goto err;
         clamp(expanded);
         ossl_curve448_scalar_decode_long(secret_scalar, expanded,
-                                         EDDSA_448_PRIVATE_BYTES);
+            EDDSA_448_PRIVATE_BYTES);
 
         /* Hash to create the nonce */
         if (!hash_init_with_dom(ctx, hashctx, prehashed, 0, context,
-                                context_len, propq)
-                || !EVP_DigestUpdate(hashctx,
-                                     expanded + EDDSA_448_PRIVATE_BYTES,
-                                     EDDSA_448_PRIVATE_BYTES)
-                || !EVP_DigestUpdate(hashctx, message, message_len)) {
+                context_len, propq)
+            || !EVP_DigestUpdate(hashctx,
+                expanded + EDDSA_448_PRIVATE_BYTES,
+                EDDSA_448_PRIVATE_BYTES)
+            || !EVP_DigestUpdate(hashctx, message, message_len)) {
             OPENSSL_cleanse(expanded, sizeof(expanded));
             goto err;
         }
@@ -218,7 +218,7 @@ ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
             ossl_curve448_scalar_halve(nonce_scalar_2, nonce_scalar_2);
 
         ossl_curve448_precomputed_scalarmul(p, ossl_curve448_precomputed_base,
-                                            nonce_scalar_2);
+            nonce_scalar_2);
         ossl_curve448_point_mul_by_ratio_and_encode_like_eddsa(nonce_point, p);
         ossl_curve448_point_destroy(p);
         ossl_curve448_scalar_destroy(nonce_scalar_2);
@@ -229,15 +229,15 @@ ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
 
         /* Compute the challenge */
         if (!hash_init_with_dom(ctx, hashctx, prehashed, 0, context, context_len,
-                                propq)
-                || !EVP_DigestUpdate(hashctx, nonce_point, sizeof(nonce_point))
-                || !EVP_DigestUpdate(hashctx, pubkey, EDDSA_448_PUBLIC_BYTES)
-                || !EVP_DigestUpdate(hashctx, message, message_len)
-                || !EVP_DigestFinalXOF(hashctx, challenge, sizeof(challenge)))
+                propq)
+            || !EVP_DigestUpdate(hashctx, nonce_point, sizeof(nonce_point))
+            || !EVP_DigestUpdate(hashctx, pubkey, EDDSA_448_PUBLIC_BYTES)
+            || !EVP_DigestUpdate(hashctx, message, message_len)
+            || !EVP_DigestFinalXOF(hashctx, challenge, sizeof(challenge)))
             goto err;
 
         ossl_curve448_scalar_decode_long(challenge_scalar, challenge,
-                                         sizeof(challenge));
+            sizeof(challenge));
         OPENSSL_cleanse(challenge, sizeof(challenge));
     }
 
@@ -247,29 +247,29 @@ ossl_c448_ed448_sign(OSSL_LIB_CTX *ctx,
     OPENSSL_cleanse(signature, EDDSA_448_SIGNATURE_BYTES);
     memcpy(signature, nonce_point, sizeof(nonce_point));
     ossl_curve448_scalar_encode(&signature[EDDSA_448_PUBLIC_BYTES],
-                                challenge_scalar);
+        challenge_scalar);
 
     ossl_curve448_scalar_destroy(secret_scalar);
     ossl_curve448_scalar_destroy(nonce_scalar);
     ossl_curve448_scalar_destroy(challenge_scalar);
 
     ret = C448_SUCCESS;
- err:
+err:
     EVP_MD_CTX_free(hashctx);
     return ret;
 }
 
 c448_error_t
 ossl_c448_ed448_sign_prehash(
-                        OSSL_LIB_CTX *ctx,
-                        uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
-                        const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
-                        const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
-                        const uint8_t hash[64], const uint8_t *context,
-                        size_t context_len, const char *propq)
+    OSSL_LIB_CTX *ctx,
+    uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+    const uint8_t privkey[EDDSA_448_PRIVATE_BYTES],
+    const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+    const uint8_t hash[64], const uint8_t *context,
+    size_t context_len, const char *propq)
 {
     return ossl_c448_ed448_sign(ctx, signature, privkey, pubkey, hash, 64, 1,
-                                context, context_len, propq);
+        context, context_len, propq);
 }
 
 static c448_error_t
@@ -285,12 +285,12 @@ c448_ed448_pubkey_verify(const uint8_t *pub, size_t pub_len)
 
 c448_error_t
 ossl_c448_ed448_verify(
-                    OSSL_LIB_CTX *ctx,
-                    const uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
-                    const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
-                    const uint8_t *message, size_t message_len,
-                    uint8_t prehashed, const uint8_t *context,
-                    uint8_t context_len, const char *propq)
+    OSSL_LIB_CTX *ctx,
+    const uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+    const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+    const uint8_t *message, size_t message_len,
+    uint8_t prehashed, const uint8_t *context,
+    uint8_t context_len, const char *propq)
 {
     curve448_point_t pk_point, r_point;
     c448_error_t error;
@@ -321,14 +321,12 @@ ossl_c448_ed448_verify(
     if (i < 0)
         return C448_FAILURE;
 
-    error =
-        ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(pk_point, pubkey);
+    error = ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(pk_point, pubkey);
 
     if (C448_SUCCESS != error)
         return error;
 
-    error =
-        ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(r_point, signature);
+    error = ossl_curve448_point_decode_like_eddsa_and_mul_by_ratio(r_point, signature);
     if (C448_SUCCESS != error)
         return error;
 
@@ -338,57 +336,57 @@ ossl_c448_ed448_verify(
         uint8_t challenge[2 * EDDSA_448_PRIVATE_BYTES];
 
         if (hashctx == NULL
-                || !hash_init_with_dom(ctx, hashctx, prehashed, 0, context,
-                                       context_len, propq)
-                || !EVP_DigestUpdate(hashctx, signature, EDDSA_448_PUBLIC_BYTES)
-                || !EVP_DigestUpdate(hashctx, pubkey, EDDSA_448_PUBLIC_BYTES)
-                || !EVP_DigestUpdate(hashctx, message, message_len)
-                || !EVP_DigestFinalXOF(hashctx, challenge, sizeof(challenge))) {
+            || !hash_init_with_dom(ctx, hashctx, prehashed, 0, context,
+                context_len, propq)
+            || !EVP_DigestUpdate(hashctx, signature, EDDSA_448_PUBLIC_BYTES)
+            || !EVP_DigestUpdate(hashctx, pubkey, EDDSA_448_PUBLIC_BYTES)
+            || !EVP_DigestUpdate(hashctx, message, message_len)
+            || !EVP_DigestFinalXOF(hashctx, challenge, sizeof(challenge))) {
             EVP_MD_CTX_free(hashctx);
             return C448_FAILURE;
         }
 
         EVP_MD_CTX_free(hashctx);
         ossl_curve448_scalar_decode_long(challenge_scalar, challenge,
-                                         sizeof(challenge));
+            sizeof(challenge));
         OPENSSL_cleanse(challenge, sizeof(challenge));
     }
     ossl_curve448_scalar_sub(challenge_scalar, ossl_curve448_scalar_zero,
-                             challenge_scalar);
+        challenge_scalar);
 
     ossl_curve448_scalar_decode_long(response_scalar,
-                                     &signature[EDDSA_448_PUBLIC_BYTES],
-                                     EDDSA_448_PRIVATE_BYTES);
+        &signature[EDDSA_448_PUBLIC_BYTES],
+        EDDSA_448_PRIVATE_BYTES);
 
     /* pk_point = -c(x(P)) + (cx + k)G = kG */
     ossl_curve448_base_double_scalarmul_non_secret(pk_point,
-                                                   response_scalar,
-                                                   pk_point, challenge_scalar);
+        response_scalar,
+        pk_point, challenge_scalar);
     return c448_succeed_if(ossl_curve448_point_eq(pk_point, r_point));
 }
 
 c448_error_t
 ossl_c448_ed448_verify_prehash(
-                    OSSL_LIB_CTX *ctx,
-                    const uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
-                    const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
-                    const uint8_t hash[64], const uint8_t *context,
-                    uint8_t context_len, const char *propq)
+    OSSL_LIB_CTX *ctx,
+    const uint8_t signature[EDDSA_448_SIGNATURE_BYTES],
+    const uint8_t pubkey[EDDSA_448_PUBLIC_BYTES],
+    const uint8_t hash[64], const uint8_t *context,
+    uint8_t context_len, const char *propq)
 {
     return ossl_c448_ed448_verify(ctx, signature, pubkey, hash, 64, 1, context,
-                                  context_len, propq);
+        context_len, 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_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)
 {
     return ossl_c448_ed448_sign(ctx, out_sig, private_key, public_key, message,
-                                message_len, phflag, context, context_len,
-                                propq) == C448_SUCCESS;
+               message_len, phflag, context, context_len,
+               propq)
+        == C448_SUCCESS;
 }
 
 /*
@@ -396,28 +394,27 @@ ossl_ed448_sign(OSSL_LIB_CTX *ctx, uint8_t *out_sig,
  * does this check internally.
  * For some reason the FIPS ACVP requires a EDDSA KeyVer test.
  */
-int
-ossl_ed448_pubkey_verify(const uint8_t *pub, size_t pub_len)
+int ossl_ed448_pubkey_verify(const uint8_t *pub, size_t pub_len)
 {
     return c448_ed448_pubkey_verify(pub, 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_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)
 {
     return ossl_c448_ed448_verify(ctx, signature, public_key, message,
-                                  message_len, phflag, context, (uint8_t)context_len,
-                                  propq) == C448_SUCCESS;
+               message_len, phflag, context, (uint8_t)context_len,
+               propq)
+        == C448_SUCCESS;
 }
 
-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_public_from_private(OSSL_LIB_CTX *ctx, uint8_t out_public_key[57],
+    const uint8_t private_key[57], const char *propq)
 {
     return ossl_c448_ed448_derive_public_key(ctx, out_public_key, private_key,
-                                             propq) == C448_SUCCESS;
+               propq)
+        == C448_SUCCESS;
 }
diff --git a/crypto/ec/curve448/f_generic.c b/crypto/ec/curve448/f_generic.c
index 9a4675a8b3db4..ad605b65e8f19 100644
--- a/crypto/ec/curve448/f_generic.c
+++ b/crypto/ec/curve448/f_generic.c
@@ -13,8 +13,8 @@
 
 static const gf MODULUS = {
     FIELD_LITERAL(0xffffffffffffffULL, 0xffffffffffffffULL, 0xffffffffffffffULL,
-                  0xffffffffffffffULL, 0xfffffffffffffeULL, 0xffffffffffffffULL,
-                  0xffffffffffffffULL, 0xffffffffffffffULL)
+        0xffffffffffffffULL, 0xfffffffffffffeULL, 0xffffffffffffffULL,
+        0xffffffffffffffULL, 0xffffffffffffffULL)
 };
 
 /* Serialize to wire format. */
@@ -32,7 +32,7 @@ void gf_serialize(uint8_t serial[SER_BYTES], const gf x, int with_hibit)
 
     for (i = 0; i < (with_hibit ? X_SER_BYTES : SER_BYTES); i++) {
         if (fill < 8 && j < NLIMBS) {
-            buffer |= ((dword_t) red->limb[LIMBPERM(j)]) << fill;
+            buffer |= ((dword_t)red->limb[LIMBPERM(j)]) << fill;
             fill += LIMB_PLACE_VALUE(LIMBPERM(j));
             j++;
         }
@@ -64,7 +64,7 @@ mask_t gf_lobit(const gf x)
 
 /* Deserialize from wire format; return -1 on success and 0 on failure. */
 mask_t gf_deserialize(gf x, const uint8_t serial[SER_BYTES], int with_hibit,
-                      uint8_t hi_nmask)
+    uint8_t hi_nmask)
 {
     unsigned int j = 0, fill = 0;
     dword_t buffer = 0;
@@ -80,19 +80,16 @@ mask_t gf_deserialize(gf x, const uint8_t serial[SER_BYTES], int with_hibit,
             sj = serial[j];
             if (j == nbytes - 1)
                 sj &= ~hi_nmask;
-            buffer |= ((dword_t) sj) << fill;
+            buffer |= ((dword_t)sj) << fill;
             fill += 8;
             j++;
         }
-        x->limb[LIMBPERM(i)] = (word_t)
-            ((i < NLIMBS - 1) ? buffer & LIMB_MASK(LIMBPERM(i)) : buffer);
+        x->limb[LIMBPERM(i)] = (word_t)((i < NLIMBS - 1) ? buffer & LIMB_MASK(LIMBPERM(i)) : buffer);
         fill -= LIMB_PLACE_VALUE(LIMBPERM(i));
         buffer >>= LIMB_PLACE_VALUE(LIMBPERM(i));
-        scarry =
-            (scarry + x->limb[LIMBPERM(i)] -
-             MODULUS->limb[LIMBPERM(i)]) >> (8 * sizeof(word_t));
+        scarry = (scarry + x->limb[LIMBPERM(i)] - MODULUS->limb[LIMBPERM(i)]) >> (8 * sizeof(word_t));
     }
-    succ = with_hibit ? 0 - (mask_t) 1 : ~gf_hibit(x);
+    succ = with_hibit ? 0 - (mask_t)1 : ~gf_hibit(x);
     return succ & word_is_zero((word_t)buffer) & ~word_is_zero((word_t)scarry);
 }
 
@@ -105,7 +102,7 @@ void gf_strong_reduce(gf a)
     unsigned int i;
 
     /* first, clear high */
-    gf_weak_reduce(a);          /* Determined to have negligible perf impact. */
+    gf_weak_reduce(a); /* Determined to have negligible perf impact. */
 
     /* now the total is less than 2p */
 
@@ -128,9 +125,7 @@ void gf_strong_reduce(gf a)
 
     /* add it back */
     for (i = 0; i < NLIMBS; i++) {
-        carry =
-            carry + a->limb[LIMBPERM(i)] +
-            (scarry_0 & MODULUS->limb[LIMBPERM(i)]);
+        carry = carry + a->limb[LIMBPERM(i)] + (scarry_0 & MODULUS->limb[LIMBPERM(i)]);
         a->limb[LIMBPERM(i)] = carry & LIMB_MASK(LIMBPERM(i));
         carry >>= LIMB_PLACE_VALUE(LIMBPERM(i));
     }
diff --git a/crypto/ec/curve448/field.h b/crypto/ec/curve448/field.h
index 80b1355b77aa4..5de942f0423cd 100644
--- a/crypto/ec/curve448/field.h
+++ b/crypto/ec/curve448/field.h
@@ -11,35 +11,35 @@
  */
 
 #ifndef OSSL_CRYPTO_EC_CURVE448_FIELD_H
-# define OSSL_CRYPTO_EC_CURVE448_FIELD_H
-
-# include "internal/constant_time.h"
-# include <string.h>
-# include <assert.h>
-# include "word.h"
-
-# define NLIMBS (64/sizeof(word_t))
-# define X_SER_BYTES 56
-# define SER_BYTES 56
-
-# if defined(__GNUC__) || defined(__clang__)
-#  define INLINE_UNUSED __inline__ __attribute__((__unused__,__always_inline__))
-#  define RESTRICT __restrict__
-#  define ALIGNED __attribute__((__aligned__(16)))
-# else
-#  define INLINE_UNUSED ossl_inline
-#  define RESTRICT
-#  define ALIGNED
-# endif
+#define OSSL_CRYPTO_EC_CURVE448_FIELD_H
+
+#include "internal/constant_time.h"
+#include <string.h>
+#include <assert.h>
+#include "word.h"
+
+#define NLIMBS (64 / sizeof(word_t))
+#define X_SER_BYTES 56
+#define SER_BYTES 56
+
+#if defined(__GNUC__) || defined(__clang__)
+#define INLINE_UNUSED __inline__ __attribute__((__unused__, __always_inline__))
+#define RESTRICT __restrict__
+#define ALIGNED __attribute__((__aligned__(16)))
+#else
+#define INLINE_UNUSED ossl_inline
+#define RESTRICT
+#define ALIGNED
+#endif
 
 typedef struct gf_s {
     word_t limb[NLIMBS];
 } ALIGNED gf_s, gf[1];
 
 /* RFC 7748 support */
-# define X_PUBLIC_BYTES  X_SER_BYTES
-# define X_PRIVATE_BYTES X_PUBLIC_BYTES
-# define X_PRIVATE_BITS  448
+#define X_PUBLIC_BYTES X_SER_BYTES
+#define X_PRIVATE_BYTES X_PUBLIC_BYTES
+#define X_PRIVATE_BITS 448
 
 static INLINE_UNUSED void gf_copy(gf out, const gf a)
 {
@@ -54,9 +54,9 @@ static INLINE_UNUSED void gf_weak_reduce(gf inout);
 void gf_strong_reduce(gf inout);
 void gf_add(gf out, const gf a, const gf b);
 void gf_sub(gf out, const gf a, const gf b);
-void ossl_gf_mul(gf_s * RESTRICT out, const gf a, const gf b);
-void ossl_gf_mulw_unsigned(gf_s * RESTRICT out, const gf a, uint32_t b);
-void ossl_gf_sqr(gf_s * RESTRICT out, const gf a);
+void ossl_gf_mul(gf_s *RESTRICT out, const gf a, const gf b);
+void ossl_gf_mulw_unsigned(gf_s *RESTRICT out, const gf a, uint32_t b);
+void ossl_gf_sqr(gf_s *RESTRICT out, const gf a);
 mask_t gf_isr(gf a, const gf x); /** a^2 x = 1, QNR, or 0 if x=0.  Return true if successful */
 mask_t gf_eq(const gf x, const gf y);
 mask_t gf_lobit(const gf x);
@@ -64,22 +64,21 @@ mask_t gf_hibit(const gf x);
 
 void gf_serialize(uint8_t serial[SER_BYTES], const gf x, int with_highbit);
 mask_t gf_deserialize(gf x, const uint8_t serial[SER_BYTES], int with_hibit,
-                      uint8_t hi_nmask);
-
-
-# define LIMBPERM(i) (i)
-# if (ARCH_WORD_BITS == 32)
-#  include "arch_32/f_impl.h"    /* Bring in the inline implementations */
-#  define LIMB_MASK(i) (((1)<<LIMB_PLACE_VALUE(i))-1)
-# elif (ARCH_WORD_BITS == 64)
-#  include "arch_64/f_impl.h"    /* Bring in the inline implementations */
-#  define LIMB_MASK(i) (((1ULL)<<LIMB_PLACE_VALUE(i))-1)
-# endif
+    uint8_t hi_nmask);
+
+#define LIMBPERM(i) (i)
+#if (ARCH_WORD_BITS == 32)
+#include "arch_32/f_impl.h" /* Bring in the inline implementations */
+#define LIMB_MASK(i) (((1) << LIMB_PLACE_VALUE(i)) - 1)
+#elif (ARCH_WORD_BITS == 64)
+#include "arch_64/f_impl.h" /* Bring in the inline implementations */
+#define LIMB_MASK(i) (((1ULL) << LIMB_PLACE_VALUE(i)) - 1)
+#endif
 
-static const gf ZERO = {{{0}}}, ONE = {{{1}}};
+static const gf ZERO = { { { 0 } } }, ONE = { { { 1 } } };
 
 /* Square x, n times. */
-static ossl_inline void gf_sqrn(gf_s * RESTRICT y, const gf x, int n)
+static ossl_inline void gf_sqrn(gf_s *RESTRICT y, const gf x, int n)
 {
     gf tmp;
 
@@ -98,7 +97,7 @@ static ossl_inline void gf_sqrn(gf_s * RESTRICT y, const gf x, int n)
     }
 }
 
-# define gf_add_nr gf_add_RAW
+#define gf_add_nr gf_add_RAW
 
 /* Subtract mod p.  Bias by 2 and don't reduce  */
 static ossl_inline void gf_sub_nr(gf c, const gf a, const gf b)
@@ -137,11 +136,11 @@ static ossl_inline void gf_cond_sel(gf x, const gf y, const gf z, mask_t is_z)
     for (i = 0; i < NLIMBS; i++) {
 #if ARCH_WORD_BITS == 32
         x[0].limb[i] = constant_time_select_32(is_z, z[0].limb[i],
-                                               y[0].limb[i]);
+            y[0].limb[i]);
 #else
         /* Must be 64 bit */
         x[0].limb[i] = constant_time_select_64(is_z, z[0].limb[i],
-                                               y[0].limb[i]);
+            y[0].limb[i]);
 #endif
     }
 }
@@ -156,7 +155,7 @@ static ossl_inline void gf_cond_neg(gf x, mask_t neg)
 }
 
 /* Constant time, if (swap) (x,y) = (y,x); */
-static ossl_inline void gf_cond_swap(gf x, gf_s * RESTRICT y, mask_t swap)
+static ossl_inline void gf_cond_swap(gf x, gf_s *RESTRICT y, mask_t swap)
 {
     size_t i;
 
@@ -170,4 +169,4 @@ static ossl_inline void gf_cond_swap(gf x, gf_s * RESTRICT y, mask_t swap)
     }
 }
 
-#endif                          /* OSSL_CRYPTO_EC_CURVE448_FIELD_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_FIELD_H */
diff --git a/crypto/ec/curve448/point_448.h b/crypto/ec/curve448/point_448.h
index 96a54558d6b30..5e98d2f3d955e 100644
--- a/crypto/ec/curve448/point_448.h
+++ b/crypto/ec/curve448/point_448.h
@@ -11,10 +11,10 @@
  */
 
 #ifndef OSSL_CRYPTO_EC_CURVE448_POINT_448_H
-# define OSSL_CRYPTO_EC_CURVE448_POINT_448_H
+#define OSSL_CRYPTO_EC_CURVE448_POINT_448_H
 
-# include "curve448utils.h"
-# include "field.h"
+#include "curve448utils.h"
+#include "field.h"
 
 /* Comb config: number of combs, n, t, s. */
 #define COMBS_N 5
@@ -35,22 +35,22 @@ struct curve448_precomputed_s {
     niels_t table[COMBS_N << (COMBS_T - 1)];
 };
 
-# define C448_SCALAR_LIMBS ((446-1)/C448_WORD_BITS+1)
+#define C448_SCALAR_LIMBS ((446 - 1) / C448_WORD_BITS + 1)
 
 /* The number of bits in a scalar */
-# define C448_SCALAR_BITS 446
+#define C448_SCALAR_BITS 446
 
 /* Number of bytes in a serialized scalar. */
-# define C448_SCALAR_BYTES 56
+#define C448_SCALAR_BYTES 56
 
 /* X448 encoding ratio. */
-# define X448_ENCODE_RATIO 2
+#define X448_ENCODE_RATIO 2
 
 /* Number of bytes in an x448 public key */
-# define X448_PUBLIC_BYTES 56
+#define X448_PUBLIC_BYTES 56
 
 /* Number of bytes in an x448 private key */
-# define X448_PRIVATE_BYTES 56
+#define X448_PRIVATE_BYTES 56
 
 /* Twisted Edwards extended homogeneous coordinates */
 typedef struct curve448_point_s {
@@ -94,7 +94,7 @@ extern const niels_t *ossl_curve448_wnaf_base;
  */
 c448_error_t
 ossl_curve448_scalar_decode(curve448_scalar_t out,
-                            const unsigned char ser[C448_SCALAR_BYTES]);
+    const unsigned char ser[C448_SCALAR_BYTES]);
 
 /*
  * Read a scalar from wire format or from bytes.  Reduces mod scalar prime.
@@ -103,9 +103,8 @@ ossl_curve448_scalar_decode(curve448_scalar_t out,
  * ser_len (in): Length of serialized form.
  * out (out): Deserialized form.
  */
-void
-ossl_curve448_scalar_decode_long(curve448_scalar_t out,
-                                 const unsigned char *ser, size_t ser_len);
+void ossl_curve448_scalar_decode_long(curve448_scalar_t out,
+    const unsigned char *ser, size_t ser_len);
 
 /*
  * Serialize a scalar to wire format.
@@ -113,9 +112,8 @@ ossl_curve448_scalar_decode_long(curve448_scalar_t out,
  * ser (out): Serialized form of a scalar.
  * s (in): Deserialized scalar.
  */
-void
-ossl_curve448_scalar_encode(unsigned char ser[C448_SCALAR_BYTES],
-                            const curve448_scalar_t s);
+void ossl_curve448_scalar_encode(unsigned char ser[C448_SCALAR_BYTES],
+    const curve448_scalar_t s);
 
 /*
  * Add two scalars. |a|, |b| and |out| may alias each other.
@@ -124,9 +122,8 @@ ossl_curve448_scalar_encode(unsigned char ser[C448_SCALAR_BYTES],
  * b (in): Another scalar.
  * out (out): a+b.
  */
-void
-ossl_curve448_scalar_add(curve448_scalar_t out,
-                         const curve448_scalar_t a, const curve448_scalar_t b);
+void ossl_curve448_scalar_add(curve448_scalar_t out,
+    const curve448_scalar_t a, const curve448_scalar_t b);
 
 /*
  * Subtract two scalars.  |a|, |b| and |out| may alias each other.
@@ -134,9 +131,8 @@ ossl_curve448_scalar_add(curve448_scalar_t out,
  * b (in): Another scalar.
  * out (out): a-b.
  */
-void
-ossl_curve448_scalar_sub(curve448_scalar_t out,
-                         const curve448_scalar_t a, const curve448_scalar_t b);
+void ossl_curve448_scalar_sub(curve448_scalar_t out,
+    const curve448_scalar_t a, const curve448_scalar_t b);
 
 /*
  * Multiply two scalars. |a|, |b| and |out| may alias each other.
@@ -145,18 +141,16 @@ ossl_curve448_scalar_sub(curve448_scalar_t out,
  * b (in): Another scalar.
  * out (out): a*b.
  */
-void
-ossl_curve448_scalar_mul(curve448_scalar_t out,
-                         const curve448_scalar_t a, const curve448_scalar_t b);
+void ossl_curve448_scalar_mul(curve448_scalar_t out,
+    const curve448_scalar_t a, const curve448_scalar_t b);
 
 /*
-* Halve a scalar.  |a| and |out| may alias each other.
-*
-* a (in): A scalar.
-* out (out): a/2.
-*/
-void
-ossl_curve448_scalar_halve(curve448_scalar_t out, const curve448_scalar_t a);
+ * Halve a scalar.  |a| and |out| may alias each other.
+ *
+ * a (in): A scalar.
+ * out (out): a/2.
+ */
+void ossl_curve448_scalar_halve(curve448_scalar_t out, const curve448_scalar_t a);
 
 /*
  * Copy a scalar.  The scalars may alias each other, in which case this
@@ -166,7 +160,7 @@ ossl_curve448_scalar_halve(curve448_scalar_t out, const curve448_scalar_t a);
  * out (out): Will become a copy of a.
  */
 static ossl_inline void curve448_scalar_copy(curve448_scalar_t out,
-                                             const curve448_scalar_t a)
+    const curve448_scalar_t a)
 {
     *out = *a;
 }
@@ -179,7 +173,7 @@ static ossl_inline void curve448_scalar_copy(curve448_scalar_t out,
  * b (in): Any point.
  */
 static ossl_inline void curve448_point_copy(curve448_point_t a,
-                                            const curve448_point_t b)
+    const curve448_point_t b)
 {
     *a = *b;
 }
@@ -197,7 +191,7 @@ static ossl_inline void curve448_point_copy(curve448_point_t a,
  */
 __owur c448_bool_t
 ossl_curve448_point_eq(const curve448_point_t a,
-                       const curve448_point_t b);
+    const curve448_point_t b);
 
 /*
  * Double a point. Equivalent to curve448_point_add(two_a,a,a), but potentially
@@ -206,8 +200,7 @@ ossl_curve448_point_eq(const curve448_point_t a,
  * two_a (out): The sum a+a.
  * a (in): A point.
  */
-void
-ossl_curve448_point_double(curve448_point_t two_a, const curve448_point_t a);
+void ossl_curve448_point_double(curve448_point_t two_a, const curve448_point_t a);
 
 /*
  * RFC 7748 Diffie-Hellman scalarmul.  This function uses a different
@@ -224,8 +217,8 @@ ossl_curve448_point_double(curve448_point_t two_a, const curve448_point_t a);
  */
 __owur c448_error_t
 ossl_x448_int(uint8_t out[X448_PUBLIC_BYTES],
-              const uint8_t base[X448_PUBLIC_BYTES],
-              const uint8_t scalar[X448_PRIVATE_BYTES]);
+    const uint8_t base[X448_PUBLIC_BYTES],
+    const uint8_t scalar[X448_PRIVATE_BYTES]);
 
 /*
  * Multiply a point by X448_ENCODE_RATIO, then encode it like RFC 7748.
@@ -246,10 +239,9 @@ ossl_x448_int(uint8_t out[X448_PUBLIC_BYTES],
  * out (out): The scaled and encoded point.
  * p (in): The point to be scaled and encoded.
  */
-void
-ossl_curve448_point_mul_by_ratio_and_encode_like_x448(
-                                        uint8_t out[X448_PUBLIC_BYTES],
-                                        const curve448_point_t p);
+void ossl_curve448_point_mul_by_ratio_and_encode_like_x448(
+    uint8_t out[X448_PUBLIC_BYTES],
+    const curve448_point_t p);
 
 /*
  * RFC 7748 Diffie-Hellman base point scalarmul.  This function uses a different
@@ -258,9 +250,8 @@ ossl_curve448_point_mul_by_ratio_and_encode_like_x448(
  * out (out): The scaled point base*scalar
  * scalar (in): The scalar to multiply by.
  */
-void
-ossl_x448_derive_public_key(uint8_t out[X448_PUBLIC_BYTES],
-                            const uint8_t scalar[X448_PRIVATE_BYTES]);
+void ossl_x448_derive_public_key(uint8_t out[X448_PUBLIC_BYTES],
+    const uint8_t scalar[X448_PRIVATE_BYTES]);
 
 /*
  * Multiply a precomputed base point by a scalar: out = scalar*base.
@@ -269,10 +260,9 @@ ossl_x448_derive_public_key(uint8_t out[X448_PUBLIC_BYTES],
  * base (in): The point to be scaled.
  * scalar (in): The scalar to multiply by.
  */
-void
-ossl_curve448_precomputed_scalarmul(curve448_point_t scaled,
-                                    const curve448_precomputed_s *base,
-                                    const curve448_scalar_t scalar);
+void ossl_curve448_precomputed_scalarmul(curve448_point_t scaled,
+    const curve448_precomputed_s *base,
+    const curve448_scalar_t scalar);
 
 /*
  * Multiply two base points by two scalars:
@@ -289,11 +279,10 @@ ossl_curve448_precomputed_scalarmul(curve448_point_t scaled,
  * Warning: This function takes variable time, and may leak the scalars used.
  * It is designed for signature verification.
  */
-void
-ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
-                                               const curve448_scalar_t scalar1,
-                                               const curve448_point_t base2,
-                                               const curve448_scalar_t scalar2);
+void ossl_curve448_base_double_scalarmul_non_secret(curve448_point_t combo,
+    const curve448_scalar_t scalar1,
+    const curve448_point_t base2,
+    const curve448_scalar_t scalar2);
 
 /*
  * Test that a point is valid, for debugging purposes.
@@ -313,4 +302,4 @@ void ossl_curve448_scalar_destroy(curve448_scalar_t scalar);
 /* Overwrite point with zeros. */
 void ossl_curve448_point_destroy(curve448_point_t point);
 
-#endif                          /* OSSL_CRYPTO_EC_CURVE448_POINT_448_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_POINT_448_H */
diff --git a/crypto/ec/curve448/scalar.c b/crypto/ec/curve448/scalar.c
index 99c0d83db13ba..191b0b4fd2cf9 100644
--- a/crypto/ec/curve448/scalar.c
+++ b/crypto/ec/curve448/scalar.c
@@ -14,41 +14,30 @@
 #include "word.h"
 #include "point_448.h"
 
-static const c448_word_t MONTGOMERY_FACTOR = (c448_word_t) 0x3bd440fae918bc5ULL;
+static const c448_word_t MONTGOMERY_FACTOR = (c448_word_t)0x3bd440fae918bc5ULL;
 static const curve448_scalar_t sc_p = {
-    {
-        {
-            SC_LIMB(0x2378c292ab5844f3ULL), SC_LIMB(0x216cc2728dc58f55ULL),
-            SC_LIMB(0xc44edb49aed63690ULL), SC_LIMB(0xffffffff7cca23e9ULL),
-            SC_LIMB(0xffffffffffffffffULL), SC_LIMB(0xffffffffffffffffULL),
-            SC_LIMB(0x3fffffffffffffffULL)
-        }
-    }
-}, sc_r2 = {
-    {
-        {
-
-            SC_LIMB(0xe3539257049b9b60ULL), SC_LIMB(0x7af32c4bc1b195d9ULL),
-            SC_LIMB(0x0d66de2388ea1859ULL), SC_LIMB(0xae17cf725ee4d838ULL),
-            SC_LIMB(0x1a9cc14ba3c47c44ULL), SC_LIMB(0x2052bcb7e4d070afULL),
-            SC_LIMB(0x3402a939f823b729ULL)
-        }
-    }
-};
+    { { SC_LIMB(0x2378c292ab5844f3ULL), SC_LIMB(0x216cc2728dc58f55ULL),
+        SC_LIMB(0xc44edb49aed63690ULL), SC_LIMB(0xffffffff7cca23e9ULL),
+        SC_LIMB(0xffffffffffffffffULL), SC_LIMB(0xffffffffffffffffULL),
+        SC_LIMB(0x3fffffffffffffffULL) } }
+},
+                               sc_r2 = { { {
+
+                                   SC_LIMB(0xe3539257049b9b60ULL), SC_LIMB(0x7af32c4bc1b195d9ULL), SC_LIMB(0x0d66de2388ea1859ULL), SC_LIMB(0xae17cf725ee4d838ULL), SC_LIMB(0x1a9cc14ba3c47c44ULL), SC_LIMB(0x2052bcb7e4d070afULL), SC_LIMB(0x3402a939f823b729ULL) } } };
 
-#define WBITS C448_WORD_BITS   /* NB this may be different from ARCH_WORD_BITS */
+#define WBITS C448_WORD_BITS /* NB this may be different from ARCH_WORD_BITS */
 
-const curve448_scalar_t ossl_curve448_scalar_one = {{{1}}};
-const curve448_scalar_t ossl_curve448_scalar_zero = {{{0}}};
+const curve448_scalar_t ossl_curve448_scalar_one = { { { 1 } } };
+const curve448_scalar_t ossl_curve448_scalar_zero = { { { 0 } } };
 
 /*
  * {extra,accum} - sub +? p
  * Must have extra <= 1
  */
 static void sc_subx(curve448_scalar_t out,
-                    const c448_word_t accum[C448_SCALAR_LIMBS],
-                    const curve448_scalar_t sub,
-                    const curve448_scalar_t p, c448_word_t extra)
+    const c448_word_t accum[C448_SCALAR_LIMBS],
+    const curve448_scalar_t sub,
+    const curve448_scalar_t p, c448_word_t extra)
 {
     c448_dsword_t chain = 0;
     unsigned int i;
@@ -59,7 +48,7 @@ static void sc_subx(curve448_scalar_t out,
         out->limb[i] = (c448_word_t)chain;
         chain >>= WBITS;
     }
-    borrow = (c448_word_t)chain + extra;     /* = 0 or -1 */
+    borrow = (c448_word_t)chain + extra; /* = 0 or -1 */
 
     chain = 0;
     for (i = 0; i < C448_SCALAR_LIMBS; i++) {
@@ -70,7 +59,7 @@ static void sc_subx(curve448_scalar_t out,
 }
 
 static void sc_montmul(curve448_scalar_t out, const curve448_scalar_t a,
-                       const curve448_scalar_t b)
+    const curve448_scalar_t b)
 {
     unsigned int i, j;
     c448_word_t accum[C448_SCALAR_LIMBS + 1] = { 0 };
@@ -82,7 +71,7 @@ static void sc_montmul(curve448_scalar_t out, const curve448_scalar_t a,
 
         c448_dword_t chain = 0;
         for (j = 0; j < C448_SCALAR_LIMBS; j++) {
-            chain += ((c448_dword_t) mand) * mier[j] + accum[j];
+            chain += ((c448_dword_t)mand) * mier[j] + accum[j];
             accum[j] = (c448_word_t)chain;
             chain >>= WBITS;
         }
@@ -92,7 +81,7 @@ static void sc_montmul(curve448_scalar_t out, const curve448_scalar_t a,
         chain = 0;
         mier = sc_p->limb;
         for (j = 0; j < C448_SCALAR_LIMBS; j++) {
-            chain += (c448_dword_t) mand *mier[j] + accum[j];
+            chain += (c448_dword_t)mand * mier[j] + accum[j];
             if (j)
                 accum[j - 1] = (c448_word_t)chain;
             chain >>= WBITS;
@@ -107,22 +96,20 @@ static void sc_montmul(curve448_scalar_t out, const curve448_scalar_t a,
 }
 
 void ossl_curve448_scalar_mul(curve448_scalar_t out, const curve448_scalar_t a,
-                              const curve448_scalar_t b)
+    const curve448_scalar_t b)
 {
     sc_montmul(out, a, b);
     sc_montmul(out, out, sc_r2);
 }
 
-void
-ossl_curve448_scalar_sub(curve448_scalar_t out, const curve448_scalar_t a,
-                         const curve448_scalar_t b)
+void ossl_curve448_scalar_sub(curve448_scalar_t out, const curve448_scalar_t a,
+    const curve448_scalar_t b)
 {
     sc_subx(out, a->limb, b, sc_p, 0);
 }
 
-void
-ossl_curve448_scalar_add(curve448_scalar_t out, const curve448_scalar_t a,
-                         const curve448_scalar_t b)
+void ossl_curve448_scalar_add(curve448_scalar_t out, const curve448_scalar_t a,
+    const curve448_scalar_t b)
 {
     c448_dword_t chain = 0;
     unsigned int i;
@@ -136,8 +123,8 @@ ossl_curve448_scalar_add(curve448_scalar_t out, const curve448_scalar_t a,
 }
 
 static ossl_inline void scalar_decode_short(curve448_scalar_t s,
-                                            const unsigned char *ser,
-                                            size_t nbytes)
+    const unsigned char *ser,
+    size_t nbytes)
 {
     size_t i, j, k = 0;
 
@@ -145,14 +132,14 @@ static ossl_inline void scalar_decode_short(curve448_scalar_t s,
         c448_word_t out = 0;
 
         for (j = 0; j < sizeof(c448_word_t) && k < nbytes; j++, k++)
-            out |= ((c448_word_t) ser[k]) << (8 * j);
+            out |= ((c448_word_t)ser[k]) << (8 * j);
         s->limb[i] = out;
     }
 }
 
 c448_error_t
 ossl_curve448_scalar_decode(curve448_scalar_t s,
-                            const unsigned char ser[C448_SCALAR_BYTES])
+    const unsigned char ser[C448_SCALAR_BYTES])
 {
     unsigned int i;
     c448_dsword_t accum = 0;
@@ -172,9 +159,8 @@ void ossl_curve448_scalar_destroy(curve448_scalar_t scalar)
     OPENSSL_cleanse(scalar, sizeof(curve448_scalar_t));
 }
 
-void
-ossl_curve448_scalar_decode_long(curve448_scalar_t s,
-                                 const unsigned char *ser, size_t ser_len)
+void ossl_curve448_scalar_decode_long(curve448_scalar_t s,
+    const unsigned char *ser, size_t ser_len)
 {
     size_t i;
     curve448_scalar_t t1, t2;
@@ -210,9 +196,8 @@ ossl_curve448_scalar_decode_long(curve448_scalar_t s,
     ossl_curve448_scalar_destroy(t2);
 }
 
-void
-ossl_curve448_scalar_encode(unsigned char ser[C448_SCALAR_BYTES],
-                            const curve448_scalar_t s)
+void ossl_curve448_scalar_encode(unsigned char ser[C448_SCALAR_BYTES],
+    const curve448_scalar_t s)
 {
     unsigned int i, j, k = 0;
 
@@ -222,8 +207,7 @@ ossl_curve448_scalar_encode(unsigned char ser[C448_SCALAR_BYTES],
     }
 }
 
-void
-ossl_curve448_scalar_halve(curve448_scalar_t out, const curve448_scalar_t a)
+void ossl_curve448_scalar_halve(curve448_scalar_t out, const curve448_scalar_t a)
 {
     c448_word_t mask = 0 - (a->limb[0] & 1);
     c448_dword_t chain = 0;
diff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h
index f8292eef88f29..8137be6abb8ef 100644
--- a/crypto/ec/curve448/word.h
+++ b/crypto/ec/curve448/word.h
@@ -11,47 +11,47 @@
  */
 
 #ifndef OSSL_CRYPTO_EC_CURVE448_WORD_H
-# define OSSL_CRYPTO_EC_CURVE448_WORD_H
+#define OSSL_CRYPTO_EC_CURVE448_WORD_H
 
-# include <string.h>
-# include <assert.h>
-# include <stdlib.h>
-# include <openssl/e_os2.h>
-# include "curve448utils.h"
+#include <string.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <openssl/e_os2.h>
+#include "curve448utils.h"
 
-# ifdef INT128_MAX
-#  include "arch_64/arch_intrinsics.h"
-# else
-#  include "arch_32/arch_intrinsics.h"
-# endif
+#ifdef INT128_MAX
+#include "arch_64/arch_intrinsics.h"
+#else
+#include "arch_32/arch_intrinsics.h"
+#endif
 
-# if (ARCH_WORD_BITS == 64)
+#if (ARCH_WORD_BITS == 64)
 typedef uint64_t word_t, mask_t;
 typedef uint128_t dword_t;
 typedef int32_t hsword_t;
 typedef int64_t sword_t;
 typedef int128_t dsword_t;
-# elif (ARCH_WORD_BITS == 32)
+#elif (ARCH_WORD_BITS == 32)
 typedef uint32_t word_t, mask_t;
 typedef uint64_t dword_t;
 typedef int16_t hsword_t;
 typedef int32_t sword_t;
 typedef int64_t dsword_t;
-# else
-#  error "For now, we only support 32- and 64-bit architectures."
-# endif
+#else
+#error "For now, we only support 32- and 64-bit architectures."
+#endif
 
 /*
  * Scalar limbs are keyed off of the API word size instead of the arch word
  * size.
  */
-# if C448_WORD_BITS == 64
-#  define SC_LIMB(x) (x)
-# elif C448_WORD_BITS == 32
-#  define SC_LIMB(x) ((uint32_t)(x)),((x) >> 32)
-# else
-#  error "For now we only support 32- and 64-bit architectures."
-# endif
+#if C448_WORD_BITS == 64
+#define SC_LIMB(x) (x)
+#elif C448_WORD_BITS == 32
+#define SC_LIMB(x) ((uint32_t)(x)), ((x) >> 32)
+#else
+#error "For now we only support 32- and 64-bit architectures."
+#endif
 
 /*
  * The plan on booleans: The external interface uses c448_bool_t, but this
@@ -83,4 +83,4 @@ static ossl_inline mask_t bool_to_mask(c448_bool_t m)
     return ret;
 }
 
-#endif                          /* OSSL_CRYPTO_EC_CURVE448_WORD_H */
+#endif /* OSSL_CRYPTO_EC_CURVE448_WORD_H */
diff --git a/crypto/ec/ec2_oct.c b/crypto/ec/ec2_oct.c
index 4ed6287562a7a..dc58f97380aac 100644
--- a/crypto/ec/ec2_oct.c
+++ b/crypto/ec/ec2_oct.c
@@ -37,9 +37,9 @@
  * (and additionally fail to cite the EUROCRYPT '92 publication as prior art).
  */
 int ossl_ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group,
-                                                   EC_POINT *point,
-                                                   const BIGNUM *x_, int y_bit,
-                                                   BN_CTX *ctx)
+    EC_POINT *point,
+    const BIGNUM *x_, int y_bit,
+    BN_CTX *ctx)
 {
     BIGNUM *tmp, *x, *y, *z;
     int ret = 0, z0;
@@ -109,7 +109,7 @@ int ossl_ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
     BN_CTX_free(new_ctx);
@@ -123,9 +123,9 @@ int ossl_ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group,
  * an error will be returned.
  */
 size_t ossl_ec_GF2m_simple_point2oct(const EC_GROUP *group,
-                                     const EC_POINT *point,
-                                     point_conversion_form_t form,
-                                     unsigned char *buf, size_t len, BN_CTX *ctx)
+    const EC_POINT *point,
+    point_conversion_form_t form,
+    unsigned char *buf, size_t len, BN_CTX *ctx)
 {
     size_t ret;
     int used_ctx = 0;
@@ -156,9 +156,7 @@ size_t ossl_ec_GF2m_simple_point2oct(const EC_GROUP *group,
 
     /* ret := required output buffer length */
     field_len = (EC_GROUP_get_degree(group) + 7) / 8;
-    ret =
-        (form ==
-         POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
+    ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
 
     /* if 'buf' is NULL, just return required length */
     if (buf != NULL) {
@@ -240,7 +238,7 @@ size_t ossl_ec_GF2m_simple_point2oct(const EC_GROUP *group,
 #endif
     return ret;
 
- err:
+err:
     if (used_ctx)
         BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
@@ -254,8 +252,8 @@ size_t ossl_ec_GF2m_simple_point2oct(const EC_GROUP *group,
  * simple implementation only uses affine coordinates.
  */
 int ossl_ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
-                                  const unsigned char *buf, size_t len,
-                                  BN_CTX *ctx)
+    const unsigned char *buf, size_t len,
+    BN_CTX *ctx)
 {
     point_conversion_form_t form;
     int y_bit, m;
@@ -308,9 +306,7 @@ int ossl_ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
 
     m = EC_GROUP_get_degree(group);
     field_len = (m + 7) / 8;
-    enc_len =
-        (form ==
-         POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
+    enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
 
     if (len != enc_len) {
         ERR_raise(ERR_LIB_EC, EC_R_INVALID_ENCODING);
@@ -380,7 +376,7 @@ int ossl_ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
     BN_CTX_free(new_ctx);
diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c
index 13e702684eab9..17f814e4c95d9 100644
--- a/crypto/ec/ec2_smpl.c
+++ b/crypto/ec/ec2_smpl.c
@@ -86,11 +86,9 @@ int ossl_ec_GF2m_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
     dest->poly[3] = src->poly[3];
     dest->poly[4] = src->poly[4];
     dest->poly[5] = src->poly[5];
-    if (bn_wexpand(dest->a, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) ==
-        NULL)
+    if (bn_wexpand(dest->a, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL)
         return 0;
-    if (bn_wexpand(dest->b, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) ==
-        NULL)
+    if (bn_wexpand(dest->b, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2) == NULL)
         return 0;
     bn_set_all_zero(dest->a);
     bn_set_all_zero(dest->b);
@@ -99,8 +97,8 @@ int ossl_ec_GF2m_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
 
 /* Set the curve parameters of an EC_GROUP structure. */
 int ossl_ec_GF2m_simple_group_set_curve(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)
 {
     int ret = 0, i;
 
@@ -130,7 +128,7 @@ int ossl_ec_GF2m_simple_group_set_curve(EC_GROUP *group,
     bn_set_all_zero(group->b);
 
     ret = 1;
- err:
+err:
     return ret;
 }
 
@@ -139,7 +137,7 @@ int ossl_ec_GF2m_simple_group_set_curve(EC_GROUP *group,
  * then there values will not be set but the method will return with success.
  */
 int ossl_ec_GF2m_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p,
-                                        BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
+    BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
 {
     int ret = 0;
 
@@ -160,7 +158,7 @@ int ossl_ec_GF2m_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p,
 
     ret = 1;
 
- err:
+err:
     return ret;
 }
 
@@ -178,7 +176,7 @@ int ossl_ec_GF2m_simple_group_get_degree(const EC_GROUP *group)
  * elliptic curve <=> b != 0 (mod p)
  */
 int ossl_ec_GF2m_simple_group_check_discriminant(const EC_GROUP *group,
-                                                 BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret = 0;
     BIGNUM *b;
@@ -210,7 +208,7 @@ int ossl_ec_GF2m_simple_group_check_discriminant(const EC_GROUP *group,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
     BN_CTX_free(new_ctx);
@@ -274,7 +272,7 @@ int ossl_ec_GF2m_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
  * represented by having Z=0.
  */
 int ossl_ec_GF2m_simple_point_set_to_infinity(const EC_GROUP *group,
-                                              EC_POINT *point)
+    EC_POINT *point)
 {
     point->Z_is_one = 0;
     BN_zero(point->Z);
@@ -286,10 +284,10 @@ int ossl_ec_GF2m_simple_point_set_to_infinity(const EC_GROUP *group,
  * the simple implementation only uses affine coordinates.
  */
 int ossl_ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group,
-                                                     EC_POINT *point,
-                                                     const BIGNUM *x,
-                                                     const BIGNUM *y,
-                                                     BN_CTX *ctx)
+    EC_POINT *point,
+    const BIGNUM *x,
+    const BIGNUM *y,
+    BN_CTX *ctx)
 {
     int ret = 0;
     if (x == NULL || y == NULL) {
@@ -309,7 +307,7 @@ int ossl_ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group,
     point->Z_is_one = 1;
     ret = 1;
 
- err:
+err:
     return ret;
 }
 
@@ -318,9 +316,9 @@ int ossl_ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group,
  * implementation only uses affine coordinates.
  */
 int ossl_ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group,
-                                                     const EC_POINT *point,
-                                                     BIGNUM *x, BIGNUM *y,
-                                                     BN_CTX *ctx)
+    const EC_POINT *point,
+    BIGNUM *x, BIGNUM *y,
+    BN_CTX *ctx)
 {
     int ret = 0;
 
@@ -345,7 +343,7 @@ int ossl_ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group,
     }
     ret = 1;
 
- err:
+err:
     return ret;
 }
 
@@ -354,7 +352,7 @@ int ossl_ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group,
  * b. Uses algorithm A.10.2 of IEEE P1363.
  */
 int ossl_ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r,
-                            const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
+    const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
 {
     BIGNUM *x0, *y0, *x1, *y1, *x2, *y2, *s, *t;
     int ret = 0;
@@ -462,7 +460,7 @@ int ossl_ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
     BN_CTX_free(new_ctx);
@@ -475,13 +473,13 @@ int ossl_ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r,
  * A.10.2 of IEEE P1363.
  */
 int ossl_ec_GF2m_simple_dbl(const EC_GROUP *group, EC_POINT *r,
-                            const EC_POINT *a, BN_CTX *ctx)
+    const EC_POINT *a, BN_CTX *ctx)
 {
     return ossl_ec_GF2m_simple_add(group, r, a, a, ctx);
 }
 
 int ossl_ec_GF2m_simple_invert(const EC_GROUP *group, EC_POINT *point,
-                               BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (EC_POINT_is_at_infinity(group, point) || BN_is_zero(point->Y))
         /* point is its own inverse */
@@ -495,7 +493,7 @@ int ossl_ec_GF2m_simple_invert(const EC_GROUP *group, EC_POINT *point,
 
 /* Indicates whether the given point is the point at infinity. */
 int ossl_ec_GF2m_simple_is_at_infinity(const EC_GROUP *group,
-                                       const EC_POINT *point)
+    const EC_POINT *point)
 {
     return BN_is_zero(point->Z);
 }
@@ -506,13 +504,13 @@ int ossl_ec_GF2m_simple_is_at_infinity(const EC_GROUP *group,
  *      y^2 + x*y = x^3 + a*x^2 + b.
  */
 int ossl_ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
-                                    BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret = -1;
     BIGNUM *lh, *y2;
-    int (*field_mul) (const EC_GROUP *, BIGNUM *, const BIGNUM *,
-                      const BIGNUM *, BN_CTX *);
-    int (*field_sqr) (const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
+    int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *,
+        const BIGNUM *, BN_CTX *);
+    int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
 #ifndef FIPS_MODULE
     BN_CTX *new_ctx = NULL;
 #endif
@@ -563,7 +561,7 @@ int ossl_ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point
         goto err;
     ret = BN_is_zero(lh);
 
- err:
+err:
     BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
     BN_CTX_free(new_ctx);
@@ -579,7 +577,7 @@ int ossl_ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point
  *   1   not equal
  */
 int ossl_ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
-                            const EC_POINT *b, BN_CTX *ctx)
+    const EC_POINT *b, BN_CTX *ctx)
 {
     BIGNUM *aX, *aY, *bX, *bY;
     int ret = -1;
@@ -620,7 +618,7 @@ int ossl_ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
         goto err;
     ret = ((BN_cmp(aX, bX) == 0) && BN_cmp(aY, bY) == 0) ? 0 : 1;
 
- err:
+err:
     BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
     BN_CTX_free(new_ctx);
@@ -630,7 +628,7 @@ int ossl_ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
 
 /* Forces the given EC_POINT to internally use affine coordinates. */
 int ossl_ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point,
-                                    BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     BIGNUM *x, *y;
     int ret = 0;
@@ -667,7 +665,7 @@ int ossl_ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
     BN_CTX_free(new_ctx);
@@ -679,7 +677,7 @@ int ossl_ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point,
  * Forces each of the EC_POINTs in the given array to use affine coordinates.
  */
 int ossl_ec_GF2m_simple_points_make_affine(const EC_GROUP *group, size_t num,
-                                           EC_POINT *points[], BN_CTX *ctx)
+    EC_POINT *points[], BN_CTX *ctx)
 {
     size_t i;
 
@@ -693,21 +691,21 @@ int ossl_ec_GF2m_simple_points_make_affine(const EC_GROUP *group, size_t num,
 
 /* Wrapper to simple binary polynomial field multiplication implementation. */
 int ossl_ec_GF2m_simple_field_mul(const EC_GROUP *group, BIGNUM *r,
-                                  const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+    const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
 {
     return BN_GF2m_mod_mul_arr(r, a, b, group->poly, ctx);
 }
 
 /* Wrapper to simple binary polynomial field squaring implementation. */
 int ossl_ec_GF2m_simple_field_sqr(const EC_GROUP *group, BIGNUM *r,
-                                  const BIGNUM *a, BN_CTX *ctx)
+    const BIGNUM *a, BN_CTX *ctx)
 {
     return BN_GF2m_mod_sqr_arr(r, a, group->poly, ctx);
 }
 
 /* Wrapper to simple binary polynomial field division implementation. */
 int ossl_ec_GF2m_simple_field_div(const EC_GROUP *group, BIGNUM *r,
-                                  const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+    const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
 {
     return BN_GF2m_mod_div(r, a, b, group->field, ctx);
 }
@@ -718,10 +716,9 @@ int ossl_ec_GF2m_simple_field_div(const EC_GROUP *group, BIGNUM *r,
  * Modified to blind s and r independently.
  * s:= p, r := 2p
  */
-static
-int ec_GF2m_simple_ladder_pre(const EC_GROUP *group,
-                              EC_POINT *r, EC_POINT *s,
-                              EC_POINT *p, BN_CTX *ctx)
+static int ec_GF2m_simple_ladder_pre(const EC_GROUP *group,
+    EC_POINT *r, EC_POINT *s,
+    EC_POINT *p, BN_CTX *ctx)
 {
     /* if p is not affine, something is wrong */
     if (p->Z_is_one == 0)
@@ -730,7 +727,7 @@ int ec_GF2m_simple_ladder_pre(const EC_GROUP *group,
     /* s blinding: make sure lambda (s->Z here) is not zero */
     do {
         if (!BN_priv_rand_ex(s->Z, BN_num_bits(group->field) - 1,
-                             BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx)) {
+                BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx)) {
             ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
             return 0;
         }
@@ -738,21 +735,21 @@ int ec_GF2m_simple_ladder_pre(const EC_GROUP *group,
 
     /* if field_encode defined convert between representations */
     if ((group->meth->field_encode != NULL
-         && !group->meth->field_encode(group, s->Z, s->Z, ctx))
+            && !group->meth->field_encode(group, s->Z, s->Z, ctx))
         || !group->meth->field_mul(group, s->X, p->X, s->Z, ctx))
         return 0;
 
     /* r blinding: make sure lambda (r->Y here for storage) is not zero */
     do {
         if (!BN_priv_rand_ex(r->Y, BN_num_bits(group->field) - 1,
-                             BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx)) {
+                BN_RAND_TOP_ANY, BN_RAND_BOTTOM_ANY, 0, ctx)) {
             ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
             return 0;
         }
     } while (BN_is_zero(r->Y));
 
     if ((group->meth->field_encode != NULL
-         && !group->meth->field_encode(group, r->Y, r->Y, ctx))
+            && !group->meth->field_encode(group, r->Y, r->Y, ctx))
         || !group->meth->field_sqr(group, r->Z, p->X, ctx)
         || !group->meth->field_sqr(group, r->X, r->Z, ctx)
         || !BN_GF2m_add(r->X, r->X, group->b)
@@ -771,10 +768,9 @@ int ec_GF2m_simple_ladder_pre(const EC_GROUP *group,
  * http://www.hyperelliptic.org/EFD/g12o/auto-code/shortw/xz/ladder/mladd-2003-s.op3
  * s := r + s, r := 2r
  */
-static
-int ec_GF2m_simple_ladder_step(const EC_GROUP *group,
-                               EC_POINT *r, EC_POINT *s,
-                               EC_POINT *p, BN_CTX *ctx)
+static int ec_GF2m_simple_ladder_step(const EC_GROUP *group,
+    EC_POINT *r, EC_POINT *s,
+    EC_POINT *p, BN_CTX *ctx)
 {
     if (!group->meth->field_mul(group, r->Y, r->Z, s->X, ctx)
         || !group->meth->field_mul(group, s->X, r->X, s->Z, ctx)
@@ -801,10 +797,9 @@ int ec_GF2m_simple_ladder_step(const EC_GROUP *group,
  * without Precomputation" (Lopez and Dahab, CHES 1999),
  * Appendix Alg Mxy.
  */
-static
-int ec_GF2m_simple_ladder_post(const EC_GROUP *group,
-                               EC_POINT *r, EC_POINT *s,
-                               EC_POINT *p, BN_CTX *ctx)
+static int ec_GF2m_simple_ladder_post(const EC_GROUP *group,
+    EC_POINT *r, EC_POINT *s,
+    EC_POINT *p, BN_CTX *ctx)
 {
     int ret = 0;
     BIGNUM *t0, *t1, *t2 = NULL;
@@ -859,17 +854,16 @@ int ec_GF2m_simple_ladder_post(const EC_GROUP *group,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
 
-static
-int ec_GF2m_simple_points_mul(const EC_GROUP *group, EC_POINT *r,
-                              const BIGNUM *scalar, size_t num,
-                              const EC_POINT *points[],
-                              const BIGNUM *scalars[],
-                              BN_CTX *ctx)
+static int ec_GF2m_simple_points_mul(const EC_GROUP *group, EC_POINT *r,
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[],
+    const BIGNUM *scalars[],
+    BN_CTX *ctx)
 {
     int ret = 0;
     EC_POINT *t = NULL;
@@ -916,7 +910,7 @@ int ec_GF2m_simple_points_mul(const EC_GROUP *group, EC_POINT *r,
 
     ret = 1;
 
- err:
+err:
     EC_POINT_free(t);
     return ret;
 }
@@ -927,7 +921,7 @@ int ec_GF2m_simple_points_mul(const EC_GROUP *group, EC_POINT *r,
  * SCA hardening is with blinding: BN_GF2m_mod_inv does that.
  */
 static int ec_GF2m_simple_field_inv(const EC_GROUP *group, BIGNUM *r,
-                                    const BIGNUM *a, BN_CTX *ctx)
+    const BIGNUM *a, BN_CTX *ctx)
 {
     int ret;
 
diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c
index ad28ba6827d4e..33c9d94c008eb 100644
--- a/crypto/ec/ec_ameth.c
+++ b/crypto/ec/ec_ameth.c
@@ -37,7 +37,7 @@ static int eckey_param2type(int *pptype, void **ppval, const EC_KEY *ec_key)
     }
     if (EC_GROUP_get_asn1_flag(group)
         && (nid = EC_GROUP_get_curve_name(group)))
-        /* we have a 'named curve' => just set the OID */
+    /* we have a 'named curve' => just set the OID */
     {
         ASN1_OBJECT *asn1obj = OBJ_nid2obj(nid);
 
@@ -47,7 +47,7 @@ static int eckey_param2type(int *pptype, void **ppval, const EC_KEY *ec_key)
         }
         *ppval = asn1obj;
         *pptype = V_ASN1_OBJECT;
-    } else {                    /* explicit parameters */
+    } else { /* explicit parameters */
 
         ASN1_STRING *pstr = NULL;
         pstr = ASN1_STRING_new();
@@ -88,9 +88,9 @@ static int eckey_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
     if (penclen <= 0)
         goto err;
     if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_EC),
-                               ptype, pval, penc, penclen))
+            ptype, pval, penc, penclen))
         return 1;
- err:
+err:
     if (ptype == V_ASN1_SEQUENCE)
         ASN1_STRING_free(pval);
     OPENSSL_free(penc);
@@ -123,7 +123,7 @@ static int eckey_pub_decode(EVP_PKEY *pkey, const X509_PUBKEY *pubkey)
     EVP_PKEY_assign_EC_KEY(pkey, eckey);
     return 1;
 
- ecerr:
+ecerr:
     EC_KEY_free(eckey);
     return 0;
 }
@@ -133,7 +133,7 @@ static int eckey_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
     int r;
     const EC_GROUP *group = EC_KEY_get0_group(b->pkey.ec);
     const EC_POINT *pa = EC_KEY_get0_public_key(a->pkey.ec),
-        *pb = EC_KEY_get0_public_key(b->pkey.ec);
+                   *pb = EC_KEY_get0_public_key(b->pkey.ec);
 
     if (group == NULL || pa == NULL || pb == NULL)
         return -2;
@@ -146,7 +146,7 @@ static int eckey_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
 }
 
 static int eckey_priv_decode_ex(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8,
-                                OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     int ret = 0;
     EC_KEY *eckey = ossl_ec_key_from_pkcs8(p8, libctx, propq);
@@ -188,7 +188,7 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     }
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_X9_62_id_ecPublicKey), 0,
-                         ptype, pval, ep, eplen)) {
+            ptype, pval, ep, eplen)) {
         ERR_raise(ERR_LIB_EC, ERR_R_ASN1_LIB);
         OPENSSL_clear_free(ep, eplen);
         goto err;
@@ -196,7 +196,7 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 
     return 1;
 
- err:
+err:
     if (ptype == V_ASN1_SEQUENCE)
         ASN1_STRING_free(pval);
     return 0;
@@ -251,7 +251,7 @@ static int ec_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
         goto err;
     EC_GROUP_free(group);
     return 1;
- err:
+err:
     EC_GROUP_free(group);
     return 0;
 }
@@ -259,7 +259,7 @@ static int ec_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
 static int ec_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
 {
     const EC_GROUP *group_a = EC_KEY_get0_group(a->pkey.ec),
-        *group_b = EC_KEY_get0_group(b->pkey.ec);
+                   *group_b = EC_KEY_get0_group(b->pkey.ec);
 
     if (group_a == NULL || group_b == NULL)
         return -2;
@@ -315,7 +315,8 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, ec_print_t ktype)
     if (!BIO_indent(bp, off, 128))
         goto err;
     if (BIO_printf(bp, "%s: (%d bit)\n", ecstr,
-                   EC_GROUP_order_bits(group)) <= 0)
+            EC_GROUP_order_bits(group))
+        <= 0)
         goto err;
 
     if (privlen != 0) {
@@ -335,7 +336,7 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, ec_print_t ktype)
     if (!ECPKParameters_print(bp, group, off))
         goto err;
     ret = 1;
- err:
+err:
     if (!ret)
         ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
     OPENSSL_clear_free(priv, privlen);
@@ -344,7 +345,7 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, ec_print_t ktype)
 }
 
 static int eckey_param_decode(EVP_PKEY *pkey,
-                              const unsigned char **pder, int derlen)
+    const unsigned char **pder, int derlen)
 {
     EC_KEY *eckey;
 
@@ -360,25 +361,25 @@ static int eckey_param_encode(const EVP_PKEY *pkey, unsigned char **pder)
 }
 
 static int eckey_param_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                             ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return do_EC_KEY_print(bp, pkey->pkey.ec, indent, EC_KEY_PRINT_PARAM);
 }
 
 static int eckey_pub_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                           ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return do_EC_KEY_print(bp, pkey->pkey.ec, indent, EC_KEY_PRINT_PUBLIC);
 }
 
 static int eckey_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                            ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return do_EC_KEY_print(bp, pkey->pkey.ec, indent, EC_KEY_PRINT_PRIVATE);
 }
 
 static int old_ec_priv_decode(EVP_PKEY *pkey,
-                              const unsigned char **pder, int derlen)
+    const unsigned char **pder, int derlen)
 {
     EC_KEY *ec;
 
@@ -400,7 +401,7 @@ static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
         if (EVP_PKEY_get_id(pkey) == EVP_PKEY_SM2) {
             /* For SM2, the only valid digest-alg is SM3 */
             *(int *)arg2 = NID_sm3;
-            return 2;            /* Make it mandatory */
+            return 2; /* Make it mandatory */
         }
         *(int *)arg2 = NID_sha256;
         return 1;
@@ -413,7 +414,7 @@ static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
 
     case ASN1_PKEY_CTRL_GET1_TLS_ENCPT:
         return EC_KEY_key2buf(EVP_PKEY_get0_EC_KEY(pkey),
-                              POINT_CONVERSION_UNCOMPRESSED, arg2, NULL);
+            POINT_CONVERSION_UNCOMPRESSED, arg2, NULL);
 
     default:
         return -2;
@@ -462,16 +463,14 @@ static int ec_pkey_param_check(const EVP_PKEY *pkey)
     return EC_GROUP_check(eckey->group, NULL);
 }
 
-static
-size_t ec_pkey_dirty_cnt(const EVP_PKEY *pkey)
+static size_t ec_pkey_dirty_cnt(const EVP_PKEY *pkey)
 {
     return pkey->pkey.ec->dirty_cnt;
 }
 
-static
-int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
-                      OSSL_FUNC_keymgmt_import_fn *importer,
-                      OSSL_LIB_CTX *libctx, const char *propq)
+static int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
+    OSSL_FUNC_keymgmt_import_fn *importer,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     const EC_KEY *eckey = NULL;
     const EC_GROUP *ecg = NULL;
@@ -486,8 +485,8 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
     BN_CTX *bnctx = NULL;
 
     if (from == NULL
-            || (eckey = from->pkey.ec) == NULL
-            || (ecg = EC_KEY_get0_group(eckey)) == NULL)
+        || (eckey = from->pkey.ec) == NULL
+        || (ecg = EC_KEY_get0_group(eckey)) == NULL)
         return 0;
 
     tmpl = OSSL_PARAM_BLD_new();
@@ -516,12 +515,13 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
         point_conversion_form_t format = EC_KEY_get_conv_form(eckey);
 
         if ((pub_key_buflen = EC_POINT_point2buf(ecg, pub_point,
-                                                 format,
-                                                 &pub_key_buf, bnctx)) == 0
+                 format,
+                 &pub_key_buf, bnctx))
+                == 0
             || !OSSL_PARAM_BLD_push_octet_string(tmpl,
-                                                 OSSL_PKEY_PARAM_PUB_KEY,
-                                                 pub_key_buf,
-                                                 pub_key_buflen))
+                OSSL_PKEY_PARAM_PUB_KEY,
+                pub_key_buf,
+                pub_key_buflen))
             goto err;
         selection |= OSSL_KEYMGMT_SELECT_PUBLIC_KEY;
     }
@@ -570,8 +570,8 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
 
         sz = (ecbits + 7) / 8;
         if (!OSSL_PARAM_BLD_push_BN_pad(tmpl,
-                                        OSSL_PKEY_PARAM_PRIV_KEY,
-                                        priv_key, sz))
+                OSSL_PKEY_PARAM_PRIV_KEY,
+                priv_key, sz))
             goto err;
         selection |= OSSL_KEYMGMT_SELECT_PRIVATE_KEY;
 
@@ -580,13 +580,12 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
          * contains a private key, so we check for the flag and export it only
          * in this case.
          */
-        ecdh_cofactor_mode =
-            (EC_KEY_get_flags(eckey) & EC_FLAG_COFACTOR_ECDH) ? 1 : 0;
+        ecdh_cofactor_mode = (EC_KEY_get_flags(eckey) & EC_FLAG_COFACTOR_ECDH) ? 1 : 0;
 
         /* Export the ECDH_COFACTOR_MODE parameter */
         if (!OSSL_PARAM_BLD_push_int(tmpl,
-                                     OSSL_PKEY_PARAM_USE_COFACTOR_ECDH,
-                                     ecdh_cofactor_mode))
+                OSSL_PKEY_PARAM_USE_COFACTOR_ECDH,
+                ecdh_cofactor_mode))
             goto err;
         selection |= OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS;
     }
@@ -596,7 +595,7 @@ int ec_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
     /* We export, the provider imports */
     rv = importer(to_keydata, selection, params);
 
- err:
+err:
     OSSL_PARAM_BLD_free(tmpl);
     OSSL_PARAM_free(params);
     OPENSSL_free(pub_key_buf);
@@ -701,9 +700,9 @@ const EVP_PKEY_ASN1_METHOD ossl_eckey_asn1_meth = {
 
 #if !defined(OPENSSL_NO_SM2)
 const EVP_PKEY_ASN1_METHOD ossl_sm2_asn1_meth = {
-   EVP_PKEY_SM2,
-   EVP_PKEY_EC,
-   ASN1_PKEY_ALIAS
+    EVP_PKEY_SM2,
+    EVP_PKEY_EC,
+    ASN1_PKEY_ALIAS
 };
 #endif
 
@@ -712,7 +711,7 @@ int EC_KEY_print(BIO *bp, const EC_KEY *x, int off)
     int private = EC_KEY_get0_private_key(x) != NULL;
 
     return do_EC_KEY_print(bp, x, off,
-                private ? EC_KEY_PRINT_PRIVATE : EC_KEY_PRINT_PUBLIC);
+        private ? EC_KEY_PRINT_PRIVATE : EC_KEY_PRINT_PUBLIC);
 }
 
 int ECParameters_print(BIO *bp, const EC_KEY *x)
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 643d2d8d7b824..bfd0242c6f56b 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -73,7 +73,7 @@ struct ec_parameters_st {
     ASN1_OCTET_STRING *base;
     ASN1_INTEGER *order;
     ASN1_INTEGER *cofactor;
-} /* ECPARAMETERS */ ;
+} /* ECPARAMETERS */;
 
 typedef enum {
     ECPKPARAMETERS_TYPE_NAMED = 0,
@@ -88,7 +88,7 @@ struct ecpk_parameters_st {
         ECPARAMETERS *parameters;
         ASN1_NULL *implicitlyCA;
     } value;
-} /* ECPKPARAMETERS */ ;
+} /* ECPKPARAMETERS */;
 
 /* SEC1 ECPrivateKey */
 typedef struct ec_privatekey_st {
@@ -100,65 +100,56 @@ typedef struct ec_privatekey_st {
 
 /* the OpenSSL ASN.1 definitions */
 ASN1_SEQUENCE(X9_62_PENTANOMIAL) = {
-        ASN1_EMBED(X9_62_PENTANOMIAL, k1, INT32),
-        ASN1_EMBED(X9_62_PENTANOMIAL, k2, INT32),
-        ASN1_EMBED(X9_62_PENTANOMIAL, k3, INT32)
+    ASN1_EMBED(X9_62_PENTANOMIAL, k1, INT32),
+    ASN1_EMBED(X9_62_PENTANOMIAL, k2, INT32),
+    ASN1_EMBED(X9_62_PENTANOMIAL, k3, INT32)
 } static_ASN1_SEQUENCE_END(X9_62_PENTANOMIAL)
 
-DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL)
+    DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL)
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL)
 
 ASN1_ADB_TEMPLATE(char_two_def) = ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.other, ASN1_ANY);
 
 ASN1_ADB(X9_62_CHARACTERISTIC_TWO) = {
-        ADB_ENTRY(NID_X9_62_onBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.onBasis, ASN1_NULL)),
-        ADB_ENTRY(NID_X9_62_tpBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.tpBasis, ASN1_INTEGER)),
-        ADB_ENTRY(NID_X9_62_ppBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.ppBasis, X9_62_PENTANOMIAL))
+    ADB_ENTRY(NID_X9_62_onBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.onBasis, ASN1_NULL)),
+    ADB_ENTRY(NID_X9_62_tpBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.tpBasis, ASN1_INTEGER)),
+    ADB_ENTRY(NID_X9_62_ppBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.ppBasis, X9_62_PENTANOMIAL))
 } ASN1_ADB_END(X9_62_CHARACTERISTIC_TWO, 0, type, 0, &char_two_def_tt, NULL);
 
 ASN1_SEQUENCE(X9_62_CHARACTERISTIC_TWO) = {
-        ASN1_EMBED(X9_62_CHARACTERISTIC_TWO, m, INT32),
-        ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, type, ASN1_OBJECT),
-        ASN1_ADB_OBJECT(X9_62_CHARACTERISTIC_TWO)
+    ASN1_EMBED(X9_62_CHARACTERISTIC_TWO, m, INT32),
+    ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, type, ASN1_OBJECT),
+    ASN1_ADB_OBJECT(X9_62_CHARACTERISTIC_TWO)
 } static_ASN1_SEQUENCE_END(X9_62_CHARACTERISTIC_TWO)
 
-DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO)
+    DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO)
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO)
 
 ASN1_ADB_TEMPLATE(fieldID_def) = ASN1_SIMPLE(X9_62_FIELDID, p.other, ASN1_ANY);
 
 ASN1_ADB(X9_62_FIELDID) = {
-        ADB_ENTRY(NID_X9_62_prime_field, ASN1_SIMPLE(X9_62_FIELDID, p.prime, ASN1_INTEGER)),
-        ADB_ENTRY(NID_X9_62_characteristic_two_field, ASN1_SIMPLE(X9_62_FIELDID, p.char_two, X9_62_CHARACTERISTIC_TWO))
+    ADB_ENTRY(NID_X9_62_prime_field, ASN1_SIMPLE(X9_62_FIELDID, p.prime, ASN1_INTEGER)),
+    ADB_ENTRY(NID_X9_62_characteristic_two_field, ASN1_SIMPLE(X9_62_FIELDID, p.char_two, X9_62_CHARACTERISTIC_TWO))
 } ASN1_ADB_END(X9_62_FIELDID, 0, fieldType, 0, &fieldID_def_tt, NULL);
 
 ASN1_SEQUENCE(X9_62_FIELDID) = {
-        ASN1_SIMPLE(X9_62_FIELDID, fieldType, ASN1_OBJECT),
-        ASN1_ADB_OBJECT(X9_62_FIELDID)
+    ASN1_SIMPLE(X9_62_FIELDID, fieldType, ASN1_OBJECT),
+    ASN1_ADB_OBJECT(X9_62_FIELDID)
 } static_ASN1_SEQUENCE_END(X9_62_FIELDID)
 
-ASN1_SEQUENCE(X9_62_CURVE) = {
-        ASN1_SIMPLE(X9_62_CURVE, a, ASN1_OCTET_STRING),
-        ASN1_SIMPLE(X9_62_CURVE, b, ASN1_OCTET_STRING),
-        ASN1_OPT(X9_62_CURVE, seed, ASN1_BIT_STRING)
-} static_ASN1_SEQUENCE_END(X9_62_CURVE)
-
-ASN1_SEQUENCE(ECPARAMETERS) = {
-        ASN1_EMBED(ECPARAMETERS, version, INT32),
-        ASN1_SIMPLE(ECPARAMETERS, fieldID, X9_62_FIELDID),
-        ASN1_SIMPLE(ECPARAMETERS, curve, X9_62_CURVE),
-        ASN1_SIMPLE(ECPARAMETERS, base, ASN1_OCTET_STRING),
-        ASN1_SIMPLE(ECPARAMETERS, order, ASN1_INTEGER),
-        ASN1_OPT(ECPARAMETERS, cofactor, ASN1_INTEGER)
-} ASN1_SEQUENCE_END(ECPARAMETERS)
+    ASN1_SEQUENCE(X9_62_CURVE)
+    = { ASN1_SIMPLE(X9_62_CURVE, a, ASN1_OCTET_STRING), ASN1_SIMPLE(X9_62_CURVE, b, ASN1_OCTET_STRING), ASN1_OPT(X9_62_CURVE, seed, ASN1_BIT_STRING) } static_ASN1_SEQUENCE_END(X9_62_CURVE)
+
+        ASN1_SEQUENCE(ECPARAMETERS)
+    = { ASN1_EMBED(ECPARAMETERS, version, INT32), ASN1_SIMPLE(ECPARAMETERS, fieldID, X9_62_FIELDID), ASN1_SIMPLE(ECPARAMETERS, curve, X9_62_CURVE), ASN1_SIMPLE(ECPARAMETERS, base, ASN1_OCTET_STRING), ASN1_SIMPLE(ECPARAMETERS, order, ASN1_INTEGER), ASN1_OPT(ECPARAMETERS, cofactor, ASN1_INTEGER) } ASN1_SEQUENCE_END(ECPARAMETERS)
 
 DECLARE_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS)
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS)
 
 ASN1_CHOICE(ECPKPARAMETERS) = {
-        ASN1_SIMPLE(ECPKPARAMETERS, value.named_curve, ASN1_OBJECT),
-        ASN1_SIMPLE(ECPKPARAMETERS, value.parameters, ECPARAMETERS),
-        ASN1_SIMPLE(ECPKPARAMETERS, value.implicitlyCA, ASN1_NULL)
+    ASN1_SIMPLE(ECPKPARAMETERS, value.named_curve, ASN1_OBJECT),
+    ASN1_SIMPLE(ECPKPARAMETERS, value.parameters, ECPARAMETERS),
+    ASN1_SIMPLE(ECPKPARAMETERS, value.implicitlyCA, ASN1_NULL)
 } ASN1_CHOICE_END(ECPKPARAMETERS)
 
 DECLARE_ASN1_FUNCTIONS(ECPKPARAMETERS)
@@ -166,13 +157,13 @@ DECLARE_ASN1_ENCODE_FUNCTIONS_name(ECPKPARAMETERS, ECPKPARAMETERS)
 IMPLEMENT_ASN1_FUNCTIONS(ECPKPARAMETERS)
 
 ASN1_SEQUENCE(EC_PRIVATEKEY) = {
-        ASN1_EMBED(EC_PRIVATEKEY, version, INT32),
-        ASN1_SIMPLE(EC_PRIVATEKEY, privateKey, ASN1_OCTET_STRING),
-        ASN1_EXP_OPT(EC_PRIVATEKEY, parameters, ECPKPARAMETERS, 0),
-        ASN1_EXP_OPT(EC_PRIVATEKEY, publicKey, ASN1_BIT_STRING, 1)
+    ASN1_EMBED(EC_PRIVATEKEY, version, INT32),
+    ASN1_SIMPLE(EC_PRIVATEKEY, privateKey, ASN1_OCTET_STRING),
+    ASN1_EXP_OPT(EC_PRIVATEKEY, parameters, ECPKPARAMETERS, 0),
+    ASN1_EXP_OPT(EC_PRIVATEKEY, publicKey, ASN1_BIT_STRING, 1)
 } static_ASN1_SEQUENCE_END(EC_PRIVATEKEY)
 
-DECLARE_ASN1_FUNCTIONS(EC_PRIVATEKEY)
+    DECLARE_ASN1_FUNCTIONS(EC_PRIVATEKEY)
 DECLARE_ASN1_ENCODE_FUNCTIONS_name(EC_PRIVATEKEY, EC_PRIVATEKEY)
 IMPLEMENT_ASN1_FUNCTIONS(EC_PRIVATEKEY)
 
@@ -284,7 +275,7 @@ static int ec_asn1_group2fieldid(const EC_GROUP *group, X9_62_FIELDID *field)
             char_two->p.ppBasis->k1 = (long)k1;
             char_two->p.ppBasis->k2 = (long)k2;
             char_two->p.ppBasis->k3 = (long)k3;
-        } else {                /* field_type == NID_X9_62_onBasis */
+        } else { /* field_type == NID_X9_62_onBasis */
 
             /* for ONB the parameters are (asn1) NULL */
             char_two->p.onBasis = ASN1_NULL_new();
@@ -302,7 +293,7 @@ static int ec_asn1_group2fieldid(const EC_GROUP *group, X9_62_FIELDID *field)
 
     ok = 1;
 
- err:
+err:
     BN_free(tmp);
     return ok;
 }
@@ -359,7 +350,7 @@ static int ec_asn1_group2curve(const EC_GROUP *group, X9_62_CURVE *curve)
             }
         ossl_asn1_string_set_bits_left(curve->seed, 0);
         if (!ASN1_BIT_STRING_set(curve->seed, group->seed,
-                                 (int)group->seed_len)) {
+                (int)group->seed_len)) {
             ERR_raise(ERR_LIB_EC, ERR_R_ASN1_LIB);
             goto err;
         }
@@ -370,7 +361,7 @@ static int ec_asn1_group2curve(const EC_GROUP *group, X9_62_CURVE *curve)
 
     ok = 1;
 
- err:
+err:
     OPENSSL_free(a_buf);
     OPENSSL_free(b_buf);
     BN_free(tmp_1);
@@ -379,7 +370,7 @@ static int ec_asn1_group2curve(const EC_GROUP *group, X9_62_CURVE *curve)
 }
 
 ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group,
-                                        ECPARAMETERS *params)
+    ECPARAMETERS *params)
 {
     size_t len = 0;
     ECPARAMETERS *ret = NULL;
@@ -458,14 +449,14 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group,
 
     return ret;
 
- err:
+err:
     if (params == NULL)
         ECPARAMETERS_free(ret);
     return NULL;
 }
 
 ECPKPARAMETERS *EC_GROUP_get_ecpkparameters(const EC_GROUP *group,
-                                            ECPKPARAMETERS *params)
+    ECPKPARAMETERS *params)
 {
     int ok = 1, tmp;
     ECPKPARAMETERS *ret = params;
@@ -479,7 +470,7 @@ ECPKPARAMETERS *EC_GROUP_get_ecpkparameters(const EC_GROUP *group,
         if (ret->type == ECPKPARAMETERS_TYPE_NAMED)
             ASN1_OBJECT_free(ret->value.named_curve);
         else if (ret->type == ECPKPARAMETERS_TYPE_EXPLICIT
-                 && ret->value.parameters != NULL)
+            && ret->value.parameters != NULL)
             ECPARAMETERS_free(ret->value.parameters);
     }
 
@@ -505,8 +496,7 @@ ECPKPARAMETERS *EC_GROUP_get_ecpkparameters(const EC_GROUP *group,
     } else {
         /* use the ECPARAMETERS structure */
         ret->type = ECPKPARAMETERS_TYPE_EXPLICIT;
-        if ((ret->value.parameters =
-             EC_GROUP_get_ecparameters(group, NULL)) == NULL)
+        if ((ret->value.parameters = EC_GROUP_get_ecparameters(group, NULL)) == NULL)
             ok = 0;
     }
 
@@ -528,8 +518,8 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
     BN_CTX *ctx = NULL;
 
     if (params->fieldID == NULL
-            || params->fieldID->fieldType == NULL
-            || params->fieldID->p.ptr == NULL) {
+        || params->fieldID->fieldType == NULL
+        || params->fieldID->p.ptr == NULL) {
         ERR_raise(ERR_LIB_EC, EC_R_ASN1_ERROR);
         goto err;
     }
@@ -541,8 +531,8 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
      * compatibility.
      */
     if (params->curve == NULL
-            || params->curve->a == NULL || params->curve->a->data == NULL
-            || params->curve->b == NULL || params->curve->b->data == NULL) {
+        || params->curve->a == NULL || params->curve->a->data == NULL
+        || params->curve->b == NULL || params->curve->b->data == NULL) {
         ERR_raise(ERR_LIB_EC, EC_R_ASN1_ERROR);
         goto err;
     }
@@ -616,9 +606,8 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
                 goto err;
             }
 
-            if (!
-                (char_two->m > penta->k3 && penta->k3 > penta->k2
-                 && penta->k2 > penta->k1 && penta->k1 > 0)) {
+            if (!(char_two->m > penta->k3 && penta->k3 > penta->k2
+                    && penta->k2 > penta->k1 && penta->k1 > 0)) {
                 ERR_raise(ERR_LIB_EC, EC_R_INVALID_PENTANOMIAL_BASIS);
                 goto err;
             }
@@ -637,7 +626,7 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
         } else if (tmp == NID_X9_62_onBasis) {
             ERR_raise(ERR_LIB_EC, EC_R_NOT_IMPLEMENTED);
             goto err;
-        } else {                /* error */
+        } else { /* error */
 
             ERR_raise(ERR_LIB_EC, EC_R_ASN1_ERROR);
             goto err;
@@ -699,14 +688,14 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
         if ((ret->seed = OPENSSL_malloc(params->curve->seed->length)) == NULL)
             goto err;
         memcpy(ret->seed, params->curve->seed->data,
-               params->curve->seed->length);
+            params->curve->seed->length);
         ret->seed_len = params->curve->seed->length;
     }
 
     if (params->order == NULL
-            || params->base == NULL
-            || params->base->data == NULL
-            || params->base->length == 0) {
+        || params->base == NULL
+        || params->base->data == NULL
+        || params->base->length == 0) {
         ERR_raise(ERR_LIB_EC, EC_R_ASN1_ERROR);
         goto err;
     }
@@ -715,12 +704,11 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
         goto err;
 
     /* set the point conversion form */
-    EC_GROUP_set_point_conversion_form(ret, (point_conversion_form_t)
-                                       (params->base->data[0] & ~0x01));
+    EC_GROUP_set_point_conversion_form(ret, (point_conversion_form_t)(params->base->data[0] & ~0x01));
 
     /* extract the ec point */
     if (!EC_POINT_oct2point(ret, point, params->base->data,
-                            params->base->length, NULL)) {
+            params->base->length, NULL)) {
         ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
         goto err;
     }
@@ -770,8 +758,8 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
         goto err;
     }
     if ((dup = EC_GROUP_dup(ret)) == NULL
-            || EC_GROUP_set_seed(dup, NULL, 0) != 1
-            || !EC_GROUP_set_generator(dup, point, a, NULL)) {
+        || EC_GROUP_set_seed(dup, NULL, 0) != 1
+        || !EC_GROUP_set_generator(dup, point, a, NULL)) {
         ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
         goto err;
     }
@@ -826,7 +814,7 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)
 
     ok = 1;
 
- err:
+err:
     if (!ok) {
         EC_GROUP_free(ret);
         ret = NULL;
@@ -965,7 +953,8 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
     if (priv_key->privateKey) {
         ASN1_OCTET_STRING *pkey = priv_key->privateKey;
         if (EC_KEY_oct2priv(ret, ASN1_STRING_get0_data(pkey),
-                            ASN1_STRING_length(pkey)) == 0)
+                ASN1_STRING_length(pkey))
+            == 0)
             goto err;
     } else {
         ERR_raise(ERR_LIB_EC, EC_R_MISSING_PRIVATE_KEY);
@@ -995,7 +984,7 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
     } else {
         if (ret->group->meth->keygenpub == NULL
             || ret->group->meth->keygenpub(ret) == 0)
-                goto err;
+            goto err;
         /* Remember the original private-key-only encoding. */
         ret->enc_flag |= EC_PKEY_NO_PUBKEY;
     }
@@ -1007,7 +996,7 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
     ret->dirty_cnt++;
     return ret;
 
- err:
+err:
     if (a == NULL || *a != ret)
         EC_KEY_free(ret);
     EC_PRIVATEKEY_free(priv_key);
@@ -1017,13 +1006,12 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
 int i2d_ECPrivateKey(const EC_KEY *a, unsigned char **out)
 {
     int ret = 0, ok = 0;
-    unsigned char *priv= NULL, *pub= NULL;
+    unsigned char *priv = NULL, *pub = NULL;
     size_t privlen = 0, publen = 0;
 
     EC_PRIVATEKEY *priv_key = NULL;
 
-    if (a == NULL || a->group == NULL ||
-        (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key == NULL)) {
+    if (a == NULL || a->group == NULL || (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key == NULL)) {
         ERR_raise(ERR_LIB_EC, ERR_R_PASSED_NULL_PARAMETER);
         goto err;
     }
@@ -1046,9 +1034,9 @@ int i2d_ECPrivateKey(const EC_KEY *a, unsigned char **out)
     priv = NULL;
 
     if (!(a->enc_flag & EC_PKEY_NO_PARAMETERS)) {
-        if ((priv_key->parameters =
-             EC_GROUP_get_ecpkparameters(a->group,
-                                        priv_key->parameters)) == NULL) {
+        if ((priv_key->parameters = EC_GROUP_get_ecpkparameters(a->group,
+                 priv_key->parameters))
+            == NULL) {
             ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
             goto err;
         }
@@ -1078,7 +1066,7 @@ int i2d_ECPrivateKey(const EC_KEY *a, unsigned char **out)
         goto err;
     }
     ok = 1;
- err:
+err:
     OPENSSL_clear_free(priv, privlen);
     OPENSSL_free(pub);
     EC_PRIVATEKEY_free(priv_key);
@@ -1113,7 +1101,7 @@ EC_KEY *d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len)
 
     if (!d2i_ECPKParameters(&ret->group, in, len)) {
         if (a == NULL || *a != ret)
-             EC_KEY_free(ret);
+            EC_KEY_free(ret);
         else
             ret->dirty_cnt++;
         return NULL;
@@ -1162,7 +1150,7 @@ int i2o_ECPublicKey(const EC_KEY *a, unsigned char **out)
     }
 
     buf_len = EC_POINT_point2oct(a->group, a->pub_key,
-                                 a->conv_form, NULL, 0, NULL);
+        a->conv_form, NULL, 0, NULL);
 
     if (out == NULL || buf_len == 0)
         /* out == NULL => just return the length of the octet string */
@@ -1174,7 +1162,7 @@ int i2o_ECPublicKey(const EC_KEY *a, unsigned char **out)
         new_buffer = 1;
     }
     if (!EC_POINT_point2oct(a->group, a->pub_key, a->conv_form,
-                            *out, buf_len, NULL)) {
+            *out, buf_len, NULL)) {
         ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
         if (new_buffer) {
             OPENSSL_free(*out);
@@ -1247,7 +1235,7 @@ int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **ppout)
             return -1;
     } else if (*ppout == NULL) {
         if ((buf = BUF_MEM_new()) == NULL
-                || !WPACKET_init_len(&pkt, buf, 0)) {
+            || !WPACKET_init_len(&pkt, buf, 0)) {
             BUF_MEM_free(buf);
             return -1;
         }
@@ -1257,8 +1245,8 @@ int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **ppout)
     }
 
     if (!ossl_encode_der_dsa_sig(&pkt, sig->r, sig->s)
-            || !WPACKET_get_total_written(&pkt, &encoded_len)
-            || !WPACKET_finish(&pkt)) {
+        || !WPACKET_get_total_written(&pkt, &encoded_len)
+        || !WPACKET_finish(&pkt)) {
         BUF_MEM_free(buf);
         WPACKET_cleanup(&pkt);
         return -1;
diff --git a/crypto/ec/ec_backend.c b/crypto/ec/ec_backend.c
index f0191a7db3b06..7c37d898f78be 100644
--- a/crypto/ec/ec_backend.c
+++ b/crypto/ec/ec_backend.c
@@ -18,8 +18,8 @@
 #include <openssl/params.h>
 #include <openssl/err.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
-# include <openssl/x509.h>
+#include <openssl/engine.h>
+#include <openssl/x509.h>
 #endif
 #include "crypto/bn.h"
 #include "crypto/ec.h"
@@ -155,8 +155,8 @@ char *ossl_ec_pt_format_id2name(int id)
 }
 
 static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
-                                    OSSL_PARAM params[], BN_CTX *bnctx,
-                                    unsigned char **genbuf)
+    OSSL_PARAM params[], BN_CTX *bnctx,
+    unsigned char **genbuf)
 {
     int ret = 0, fid;
     const char *field_type;
@@ -215,7 +215,7 @@ static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
             goto err;
         }
         if (!ossl_param_build_set_bn(tmpl, params, OSSL_PKEY_PARAM_EC_ORDER,
-                                    order)) {
+                order)) {
             ERR_raise(ERR_LIB_EC, ERR_R_CRYPTO_LIB);
             goto err;
         }
@@ -224,8 +224,8 @@ static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
     param = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_EC_FIELD_TYPE);
     if (tmpl != NULL || param != NULL) {
         if (!ossl_param_build_set_utf8_string(tmpl, params,
-                                              OSSL_PKEY_PARAM_EC_FIELD_TYPE,
-                                              field_type)) {
+                OSSL_PKEY_PARAM_EC_FIELD_TYPE,
+                field_type)) {
             ERR_raise(ERR_LIB_EC, ERR_R_CRYPTO_LIB);
             goto err;
         }
@@ -247,8 +247,8 @@ static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
             goto err;
         }
         if (!ossl_param_build_set_octet_string(tmpl, params,
-                                               OSSL_PKEY_PARAM_EC_GENERATOR,
-                                               *genbuf, genbuf_len)) {
+                OSSL_PKEY_PARAM_EC_GENERATOR,
+                *genbuf, genbuf_len)) {
             ERR_raise(ERR_LIB_EC, ERR_R_CRYPTO_LIB);
             goto err;
         }
@@ -260,7 +260,7 @@ static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
 
         if (cofactor != NULL
             && !ossl_param_build_set_bn(tmpl, params,
-                                        OSSL_PKEY_PARAM_EC_COFACTOR, cofactor)) {
+                OSSL_PKEY_PARAM_EC_COFACTOR, cofactor)) {
             ERR_raise(ERR_LIB_EC, ERR_R_CRYPTO_LIB);
             goto err;
         }
@@ -274,8 +274,8 @@ static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
         if (seed != NULL
             && seed_len > 0
             && !ossl_param_build_set_octet_string(tmpl, params,
-                                                  OSSL_PKEY_PARAM_EC_SEED,
-                                                  seed, seed_len)) {
+                OSSL_PKEY_PARAM_EC_SEED,
+                seed, seed_len)) {
             ERR_raise(ERR_LIB_EC, ERR_R_CRYPTO_LIB);
             goto err;
         }
@@ -286,9 +286,9 @@ static int ec_group_explicit_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
 }
 
 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 ret = 0, curve_nid, encoding_flag;
     const char *encoding_name, *pt_form_name;
@@ -303,8 +303,8 @@ int ossl_ec_group_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
     pt_form_name = ossl_ec_pt_format_id2name(genform);
     if (pt_form_name == NULL
         || !ossl_param_build_set_utf8_string(
-                tmpl, params,
-                OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT, pt_form_name)) {
+            tmpl, params,
+            OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT, pt_form_name)) {
         ERR_raise(ERR_LIB_EC, EC_R_INVALID_FORM);
         return 0;
     }
@@ -312,15 +312,15 @@ int ossl_ec_group_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
     encoding_name = ec_param_encoding_id2name(encoding_flag);
     if (encoding_name == NULL
         || !ossl_param_build_set_utf8_string(tmpl, params,
-                                             OSSL_PKEY_PARAM_EC_ENCODING,
-                                             encoding_name)) {
+            OSSL_PKEY_PARAM_EC_ENCODING,
+            encoding_name)) {
         ERR_raise(ERR_LIB_EC, EC_R_INVALID_ENCODING);
         return 0;
     }
 
     if (!ossl_param_build_set_int(tmpl, params,
-                                  OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS,
-                                  group->decoded_from_explicit_params))
+            OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS,
+            group->decoded_from_explicit_params))
         return 0;
 
     curve_nid = EC_GROUP_get_curve_name(group);
@@ -340,8 +340,8 @@ int ossl_ec_group_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
 
         if (curve_name == NULL
             || !ossl_param_build_set_utf8_string(tmpl, params,
-                                                 OSSL_PKEY_PARAM_GROUP_NAME,
-                                                 curve_name)) {
+                OSSL_PKEY_PARAM_GROUP_NAME,
+                curve_name)) {
             ERR_raise(ERR_LIB_EC, EC_R_INVALID_CURVE);
             goto err;
         }
@@ -370,7 +370,7 @@ int ossl_ec_set_ecdh_cofactor_mode(EC_KEY *ec, int mode)
     if (mode < 0 || mode > 1)
         return 0;
 
-    if ((cofactor = EC_GROUP_get0_cofactor(ecg)) == NULL )
+    if ((cofactor = EC_GROUP_get0_cofactor(ecg)) == NULL)
         return 0;
 
     /* ECDH cofactor mode has no effect if cofactor is 1 */
@@ -408,11 +408,9 @@ int ossl_ec_key_fromdata(EC_KEY *ec, const OSSL_PARAM params[], int include_priv
     if (ecg == NULL)
         return 0;
 
-    param_pub_key =
-        OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
+    param_pub_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
     if (include_private)
-        param_priv_key =
-            OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
+        param_priv_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
 
     ctx = BN_CTX_new_ex(ossl_ec_key_get_libctx(ec));
     if (ctx == NULL)
@@ -420,10 +418,10 @@ int ossl_ec_key_fromdata(EC_KEY *ec, const OSSL_PARAM params[], int include_priv
 
     if (param_pub_key != NULL)
         if (!OSSL_PARAM_get_octet_string(param_pub_key,
-                                         (void **)&pub_key, 0, &pub_key_len)
+                (void **)&pub_key, 0, &pub_key_len)
             || (pub_point = EC_POINT_new(ecg)) == NULL
             || !EC_POINT_oct2point(ecg, pub_point, pub_key, pub_key_len, ctx))
-        goto err;
+            goto err;
 
     if (param_priv_key != NULL && include_private) {
         int fixed_words;
@@ -488,7 +486,7 @@ int ossl_ec_key_fromdata(EC_KEY *ec, const OSSL_PARAM params[], int include_priv
 
     ok = 1;
 
- err:
+err:
     BN_CTX_free(ctx);
     BN_clear_free(priv_key);
     OPENSSL_free(pub_key);
@@ -504,8 +502,8 @@ int ossl_ec_group_fromdata(EC_KEY *ec, const OSSL_PARAM params[])
     if (ec == NULL)
         return 0;
 
-     group = EC_GROUP_new_from_params(params, ossl_ec_key_get_libctx(ec),
-                                      ossl_ec_key_get0_propq(ec));
+    group = EC_GROUP_new_from_params(params, ossl_ec_key_get_libctx(ec),
+        ossl_ec_key_get0_propq(ec));
 
     if (!EC_KEY_set_group(ec, group))
         goto err;
@@ -591,7 +589,6 @@ int ossl_ec_key_is_foreign(const EC_KEY *ec)
         return 1;
 #endif
     return 0;
-
 }
 
 EC_KEY *ossl_ec_key_dup(const EC_KEY *src, int selection)
@@ -604,14 +601,15 @@ EC_KEY *ossl_ec_key_dup(const EC_KEY *src, int selection)
     }
 
     if ((ret = ossl_ec_key_new_method_int(src->libctx, src->propq,
-                                          src->engine)) == NULL)
+             src->engine))
+        == NULL)
         return NULL;
 
     /* copy the parameters */
     if (src->group != NULL
         && (selection & OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) != 0) {
         ret->group = ossl_ec_group_new_ex(src->libctx, src->propq,
-                                          src->group->meth);
+            src->group->meth);
         if (ret->group == NULL
             || !EC_GROUP_copy(ret->group, src->group))
             goto err;
@@ -629,7 +627,7 @@ EC_KEY *ossl_ec_key_dup(const EC_KEY *src, int selection)
         ret->pub_key = EC_POINT_new(ret->group);
         if (ret->pub_key == NULL
             || !EC_POINT_copy(ret->pub_key, src->pub_key))
-                goto err;
+            goto err;
     }
 
     /* copy the private key */
@@ -657,20 +655,21 @@ EC_KEY *ossl_ec_key_dup(const EC_KEY *src, int selection)
 
 #ifndef FIPS_MODULE
     if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_EC_KEY,
-                            &ret->ex_data, &src->ex_data))
+            &ret->ex_data, &src->ex_data))
         goto err;
 #endif
 
     if (ret->meth != NULL && ret->meth->copy != NULL) {
         if ((selection
-             & OSSL_KEYMGMT_SELECT_KEYPAIR) != OSSL_KEYMGMT_SELECT_KEYPAIR)
+                & OSSL_KEYMGMT_SELECT_KEYPAIR)
+            != OSSL_KEYMGMT_SELECT_KEYPAIR)
             goto err;
         if (ret->meth->copy(ret, src) == 0)
             goto err;
     }
 
     return ret;
- err:
+err:
     EC_KEY_free(ret);
     return NULL;
 }
@@ -758,7 +757,7 @@ 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)
 {
     int ptype = 0;
     const void *pval = NULL;
@@ -776,7 +775,6 @@ EC_KEY *ossl_ec_key_param_from_x509_algor(const X509_ALGOR *palg,
         const unsigned char *pm = pstr->data;
         int pmlen = pstr->length;
 
-
         if (d2i_ECParameters(&eckey, &pm, pmlen) == NULL) {
             ERR_raise(ERR_LIB_EC, EC_R_DECODE_ERROR);
             goto ecerr;
@@ -802,14 +800,14 @@ EC_KEY *ossl_ec_key_param_from_x509_algor(const X509_ALGOR *palg,
 
     return eckey;
 
- ecerr:
+ecerr:
     EC_KEY_free(eckey);
     EC_GROUP_free(group);
     return NULL;
 }
 
 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)
 {
     const unsigned char *p = NULL;
     int pklen;
@@ -829,7 +827,7 @@ EC_KEY *ossl_ec_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
     }
 
     return eckey;
- err:
+err:
     EC_KEY_free(eckey);
     return NULL;
 }
diff --git a/crypto/ec/ec_check.c b/crypto/ec/ec_check.c
index 9ed94b328c69d..a112960021952 100644
--- a/crypto/ec/ec_check.c
+++ b/crypto/ec/ec_check.c
@@ -17,7 +17,7 @@
 #include <openssl/err.h>
 
 int EC_GROUP_check_named_curve(const EC_GROUP *group, int nist_only,
-                               BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int nid;
     BN_CTX *new_ctx = NULL;
@@ -47,9 +47,9 @@ int EC_GROUP_check(const EC_GROUP *group, BN_CTX *ctx)
 {
 #ifdef FIPS_MODULE
     /*
-    * ECC domain parameter validation.
-    * See SP800-56A R3 5.5.2 "Assurances of Domain-Parameter Validity" Part 1b.
-    */
+     * ECC domain parameter validation.
+     * See SP800-56A R3 5.5.2 "Assurances of Domain-Parameter Validity" Part 1b.
+     */
     return EC_GROUP_check_named_curve(group, 1, ctx) >= 0 ? 1 : 0;
 #else
     int ret = 0;
@@ -110,7 +110,7 @@ int EC_GROUP_check(const EC_GROUP *group, BN_CTX *ctx)
 
     ret = 1;
 
- err:
+err:
     BN_CTX_free(new_ctx);
     EC_POINT_free(point);
     return ret;
diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index f46aac5d33f92..c17a7e547712c 100644
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c
@@ -23,10 +23,10 @@
 #include "internal/nelem.h"
 
 typedef struct {
-    int field_type,             /* either NID_X9_62_prime_field or
-                                 * NID_X9_62_characteristic_two_field */
-     seed_len, param_len;
-    unsigned int cofactor;      /* promoted to BN_ULONG */
+    int field_type, /* either NID_X9_62_prime_field or
+                     * NID_X9_62_characteristic_two_field */
+        seed_len, param_len;
+    unsigned int cofactor; /* promoted to BN_ULONG */
 } EC_CURVE_DATA;
 
 /* the nist prime curves */
@@ -34,11 +34,8 @@ static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 24 * 6];
 } _EC_NIST_PRIME_192 = {
-    {
-        NID_X9_62_prime_field, 20, 24, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 24, 1 },
+    { /* seed */
         0x30, 0x45, 0xAE, 0x6F, 0xC8, 0x42, 0x2F, 0x64, 0xED, 0x57, 0x95, 0x28,
         0xD3, 0x81, 0x20, 0xEA, 0xE1, 0x21, 0x96, 0xD5,
         /* p */
@@ -58,19 +55,15 @@ static const struct {
         0x6b, 0x24, 0xcd, 0xd5, 0x73, 0xf9, 0x77, 0xa1, 0x1e, 0x79, 0x48, 0x11,
         /* order */
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0x99, 0xDE, 0xF8, 0x36, 0x14, 0x6B, 0xC9, 0xB1, 0xB4, 0xD2, 0x28, 0x31
-    }
+        0x99, 0xDE, 0xF8, 0x36, 0x14, 0x6B, 0xC9, 0xB1, 0xB4, 0xD2, 0x28, 0x31 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 28 * 6];
 } _EC_NIST_PRIME_224 = {
-    {
-        NID_X9_62_prime_field, 20, 28, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 28, 1 },
+    { /* seed */
         0xBD, 0x71, 0x34, 0x47, 0x99, 0xD5, 0xC7, 0xFC, 0xDC, 0x45, 0xB5, 0x9F,
         0xA3, 0xB9, 0xAB, 0x8F, 0x6A, 0x94, 0x8B, 0xC5,
         /* p */
@@ -96,19 +89,15 @@ static const struct {
         /* order */
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0x16, 0xA2, 0xE0, 0xB8, 0xF0, 0x3E, 0x13, 0xDD, 0x29, 0x45,
-        0x5C, 0x5C, 0x2A, 0x3D
-    }
+        0x5C, 0x5C, 0x2A, 0x3D }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 48 * 6];
 } _EC_NIST_PRIME_384 = {
-    {
-        NID_X9_62_prime_field, 20, 48, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 48, 1 },
+    { /* seed */
         0xA3, 0x35, 0x92, 0x6A, 0xA3, 0x19, 0xA2, 0x7A, 0x1D, 0x00, 0x89, 0x6A,
         0x67, 0x73, 0xA4, 0x82, 0x7A, 0xCD, 0xAC, 0x73,
         /* p */
@@ -140,19 +129,15 @@ static const struct {
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xC7, 0x63, 0x4D, 0x81, 0xF4, 0x37, 0x2D, 0xDF, 0x58, 0x1A, 0x0D, 0xB2,
-        0x48, 0xB0, 0xA7, 0x7A, 0xEC, 0xEC, 0x19, 0x6A, 0xCC, 0xC5, 0x29, 0x73
-    }
+        0x48, 0xB0, 0xA7, 0x7A, 0xEC, 0xEC, 0x19, 0x6A, 0xCC, 0xC5, 0x29, 0x73 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 66 * 6];
 } _EC_NIST_PRIME_521 = {
-    {
-        NID_X9_62_prime_field, 20, 66, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 66, 1 },
+    { /* seed */
         0xD0, 0x9E, 0x88, 0x00, 0x29, 0x1C, 0xB8, 0x53, 0x96, 0xCC, 0x67, 0x17,
         0x39, 0x32, 0x84, 0xAA, 0xA0, 0xDA, 0x64, 0xBA,
         /* p */
@@ -196,21 +181,17 @@ static const struct {
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x51, 0x86,
         0x87, 0x83, 0xBF, 0x2F, 0x96, 0x6B, 0x7F, 0xCC, 0x01, 0x48, 0xF7, 0x09,
         0xA5, 0xD0, 0x3B, 0xB5, 0xC9, 0xB8, 0x89, 0x9C, 0x47, 0xAE, 0xBB, 0x6F,
-        0xB7, 0x1E, 0x91, 0x38, 0x64, 0x09
-    }
+        0xB7, 0x1E, 0x91, 0x38, 0x64, 0x09 }
 };
 
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
 /* the x9.62 prime curves (minus the nist prime curves) */
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 24 * 6];
 } _EC_X9_62_PRIME_192V2 = {
-    {
-        NID_X9_62_prime_field, 20, 24, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 24, 1 },
+    { /* seed */
         0x31, 0xA9, 0x2E, 0xE2, 0x02, 0x9F, 0xD1, 0x0D, 0x90, 0x1B, 0x11, 0x3E,
         0x99, 0x07, 0x10, 0xF0, 0xD2, 0x1A, 0xC6, 0xB6,
         /* p */
@@ -230,19 +211,15 @@ static const struct {
         0x08, 0x3d, 0xf2, 0xf2, 0xb0, 0x84, 0x7d, 0xe9, 0x70, 0xb2, 0xde, 0x15,
         /* order */
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE,
-        0x5F, 0xB1, 0xA7, 0x24, 0xDC, 0x80, 0x41, 0x86, 0x48, 0xD8, 0xDD, 0x31
-    }
+        0x5F, 0xB1, 0xA7, 0x24, 0xDC, 0x80, 0x41, 0x86, 0x48, 0xD8, 0xDD, 0x31 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 24 * 6];
 } _EC_X9_62_PRIME_192V3 = {
-    {
-        NID_X9_62_prime_field, 20, 24, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 24, 1 },
+    { /* seed */
         0xC4, 0x69, 0x68, 0x44, 0x35, 0xDE, 0xB3, 0x78, 0xC4, 0xB6, 0x5C, 0xA9,
         0x59, 0x1E, 0x2A, 0x57, 0x63, 0x05, 0x9A, 0x2E,
         /* p */
@@ -262,19 +239,15 @@ static const struct {
         0x6a, 0x6d, 0xc8, 0xf9, 0x97, 0x8a, 0xca, 0x76, 0x48, 0xa9, 0x43, 0xb0,
         /* order */
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0x7A, 0x62, 0xD0, 0x31, 0xC8, 0x3F, 0x42, 0x94, 0xF6, 0x40, 0xEC, 0x13
-    }
+        0x7A, 0x62, 0xD0, 0x31, 0xC8, 0x3F, 0x42, 0x94, 0xF6, 0x40, 0xEC, 0x13 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 30 * 6];
 } _EC_X9_62_PRIME_239V1 = {
-    {
-        NID_X9_62_prime_field, 20, 30, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 30, 1 },
+    { /* seed */
         0xE4, 0x3B, 0xB4, 0x60, 0xF0, 0xB8, 0x0C, 0xC0, 0xC0, 0xB0, 0x75, 0x79,
         0x8E, 0x94, 0x80, 0x60, 0xF8, 0x32, 0x1B, 0x7D,
         /* p */
@@ -300,19 +273,15 @@ static const struct {
         /* order */
         0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0x7F, 0xFF, 0xFF, 0x9E, 0x5E, 0x9A, 0x9F, 0x5D, 0x90, 0x71, 0xFB, 0xD1,
-        0x52, 0x26, 0x88, 0x90, 0x9D, 0x0B
-    }
+        0x52, 0x26, 0x88, 0x90, 0x9D, 0x0B }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 30 * 6];
 } _EC_X9_62_PRIME_239V2 = {
-    {
-        NID_X9_62_prime_field, 20, 30, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 30, 1 },
+    { /* seed */
         0xE8, 0xB4, 0x01, 0x16, 0x04, 0x09, 0x53, 0x03, 0xCA, 0x3B, 0x80, 0x99,
         0x98, 0x2B, 0xE0, 0x9F, 0xCB, 0x9A, 0xE6, 0x16,
         /* p */
@@ -338,19 +307,15 @@ static const struct {
         /* order */
         0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0x80, 0x00, 0x00, 0xCF, 0xA7, 0xE8, 0x59, 0x43, 0x77, 0xD4, 0x14, 0xC0,
-        0x38, 0x21, 0xBC, 0x58, 0x20, 0x63
-    }
+        0x38, 0x21, 0xBC, 0x58, 0x20, 0x63 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 30 * 6];
 } _EC_X9_62_PRIME_239V3 = {
-    {
-        NID_X9_62_prime_field, 20, 30, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 30, 1 },
+    { /* seed */
         0x7D, 0x73, 0x74, 0x16, 0x8F, 0xFE, 0x34, 0x71, 0xB6, 0x0A, 0x85, 0x76,
         0x86, 0xA1, 0x94, 0x75, 0xD3, 0xBF, 0xA2, 0xFF,
         /* p */
@@ -376,8 +341,7 @@ static const struct {
         /* order */
         0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0x7F, 0xFF, 0xFF, 0x97, 0x5D, 0xEB, 0x41, 0xB3, 0xA6, 0x05, 0x7C, 0x3C,
-        0x43, 0x21, 0x46, 0x52, 0x65, 0x51
-    }
+        0x43, 0x21, 0x46, 0x52, 0x65, 0x51 }
 };
 #endif /* FIPS_MODULE */
 
@@ -385,11 +349,8 @@ static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 32 * 8];
 } _EC_X9_62_PRIME_256V1 = {
-    {
-        NID_X9_62_prime_field, 20, 32, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 32, 1 },
+    { /* seed */
         0xC4, 0x9D, 0x36, 0x08, 0x86, 0xE7, 0x04, 0x93, 0x6A, 0x66, 0x78, 0xE1,
         0x13, 0x9D, 0x26, 0xB7, 0x81, 0x9F, 0x7E, 0x90,
         /* p */
@@ -423,8 +384,7 @@ static const struct {
         /* RR for order */
         0x66, 0xe1, 0x2d, 0x94, 0xf3, 0xd9, 0x56, 0x20, 0x28, 0x45, 0xb2, 0x39,
         0x2b, 0x6b, 0xec, 0x59, 0x46, 0x99, 0x79, 0x9c, 0x49, 0xbd, 0x6f, 0xa6,
-        0x83, 0x24, 0x4c, 0x95, 0xbe, 0x79, 0xee, 0xa2
-    }
+        0x83, 0x24, 0x4c, 0x95, 0xbe, 0x79, 0xee, 0xa2 }
 };
 
 #ifndef FIPS_MODULE
@@ -433,11 +393,8 @@ static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 14 * 6];
 } _EC_SECG_PRIME_112R1 = {
-    {
-        NID_X9_62_prime_field, 20, 14, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 14, 1 },
+    { /* seed */
         0x00, 0xF5, 0x0B, 0x02, 0x8E, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61,
         0x51, 0x75, 0x29, 0x04, 0x72, 0x78, 0x3F, 0xB1,
         /* p */
@@ -457,19 +414,15 @@ static const struct {
         0x75, 0x00,
         /* order */
         0xDB, 0x7C, 0x2A, 0xBF, 0x62, 0xE3, 0x5E, 0x76, 0x28, 0xDF, 0xAC, 0x65,
-        0x61, 0xC5
-    }
+        0x61, 0xC5 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 14 * 6];
 } _EC_SECG_PRIME_112R2 = {
-    {
-        NID_X9_62_prime_field, 20, 14, 4
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 14, 4 },
+    { /* seed */
         0x00, 0x27, 0x57, 0xA1, 0x11, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61,
         0x51, 0x75, 0x53, 0x16, 0xC0, 0x5E, 0x0B, 0xD4,
         /* p */
@@ -489,19 +442,15 @@ static const struct {
         0x6e, 0x97,
         /* order */
         0x36, 0xDF, 0x0A, 0xAF, 0xD8, 0xB8, 0xD7, 0x59, 0x7C, 0xA1, 0x05, 0x20,
-        0xD0, 0x4B
-    }
+        0xD0, 0x4B }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 16 * 6];
 } _EC_SECG_PRIME_128R1 = {
-    {
-        NID_X9_62_prime_field, 20, 16, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 16, 1 },
+    { /* seed */
         0x00, 0x0E, 0x0D, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61, 0x51, 0x75,
         0x0C, 0xC0, 0x3A, 0x44, 0x73, 0xD0, 0x36, 0x79,
         /* p */
@@ -521,19 +470,15 @@ static const struct {
         0xdd, 0xed, 0x7a, 0x83,
         /* order */
         0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x75, 0xA3, 0x0D, 0x1B,
-        0x90, 0x38, 0xA1, 0x15
-    }
+        0x90, 0x38, 0xA1, 0x15 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 16 * 6];
 } _EC_SECG_PRIME_128R2 = {
-    {
-        NID_X9_62_prime_field, 20, 16, 4
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 16, 4 },
+    { /* seed */
         0x00, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61, 0x51, 0x75, 0x12, 0xD8,
         0xF0, 0x34, 0x31, 0xFC, 0xE6, 0x3B, 0x88, 0xF4,
         /* p */
@@ -553,19 +498,15 @@ static const struct {
         0x5f, 0xc3, 0x4b, 0x44,
         /* order */
         0x3F, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0xBE, 0x00, 0x24, 0x72,
-        0x06, 0x13, 0xB5, 0xA3
-    }
+        0x06, 0x13, 0xB5, 0xA3 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 21 * 6];
 } _EC_SECG_PRIME_160K1 = {
-    {
-        NID_X9_62_prime_field, 0, 21, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 21, 1 },
+    { /* no seed */
         /* p */
         0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xAC, 0x73,
@@ -583,19 +524,15 @@ static const struct {
         0x86, 0x53, 0x17, 0x33, 0xc3, 0xf0, 0x3c, 0x4f, 0xee,
         /* order */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xB8,
-        0xFA, 0x16, 0xDF, 0xAB, 0x9A, 0xCA, 0x16, 0xB6, 0xB3
-    }
+        0xFA, 0x16, 0xDF, 0xAB, 0x9A, 0xCA, 0x16, 0xB6, 0xB3 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 21 * 6];
 } _EC_SECG_PRIME_160R1 = {
-    {
-        NID_X9_62_prime_field, 20, 21, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 21, 1 },
+    { /* seed */
         0x10, 0x53, 0xCD, 0xE4, 0x2C, 0x14, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
         0x15, 0x17, 0x53, 0x3B, 0xF3, 0xF8, 0x33, 0x45,
         /* p */
@@ -615,19 +552,15 @@ static const struct {
         0x12, 0x04, 0x23, 0x51, 0x37, 0x7a, 0xc5, 0xfb, 0x32,
         /* order */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xF4,
-        0xC8, 0xF9, 0x27, 0xAE, 0xD3, 0xCA, 0x75, 0x22, 0x57
-    }
+        0xC8, 0xF9, 0x27, 0xAE, 0xD3, 0xCA, 0x75, 0x22, 0x57 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 21 * 6];
 } _EC_SECG_PRIME_160R2 = {
-    {
-        NID_X9_62_prime_field, 20, 21, 1
-    },
-    {
-        /* seed */
+    { NID_X9_62_prime_field, 20, 21, 1 },
+    { /* seed */
         0xB9, 0x9B, 0x99, 0xB0, 0x99, 0xB3, 0x23, 0xE0, 0x27, 0x09, 0xA4, 0xD6,
         0x96, 0xE6, 0x76, 0x87, 0x56, 0x15, 0x17, 0x51,
         /* p */
@@ -647,19 +580,15 @@ static const struct {
         0x0d, 0xf9, 0x98, 0x2c, 0xfe, 0xa7, 0xd4, 0x3f, 0x2e,
         /* order */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x35,
-        0x1E, 0xE7, 0x86, 0xA8, 0x18, 0xF3, 0xA1, 0xA1, 0x6B
-    }
+        0x1E, 0xE7, 0x86, 0xA8, 0x18, 0xF3, 0xA1, 0xA1, 0x6B }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 24 * 6];
 } _EC_SECG_PRIME_192K1 = {
-    {
-        NID_X9_62_prime_field, 0, 24, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 24, 1 },
+    { /* no seed */
         /* p */
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xEE, 0x37,
@@ -677,19 +606,15 @@ static const struct {
         0x15, 0xbe, 0x86, 0x34, 0x40, 0x82, 0xaa, 0x88, 0xd9, 0x5e, 0x2f, 0x9d,
         /* order */
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE,
-        0x26, 0xF2, 0xFC, 0x17, 0x0F, 0x69, 0x46, 0x6A, 0x74, 0xDE, 0xFD, 0x8D
-    }
+        0x26, 0xF2, 0xFC, 0x17, 0x0F, 0x69, 0x46, 0x6A, 0x74, 0xDE, 0xFD, 0x8D }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 29 * 6];
 } _EC_SECG_PRIME_224K1 = {
-    {
-        NID_X9_62_prime_field, 0, 29, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 29, 1 },
+    { /* no seed */
         /* p */
         0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -713,19 +638,15 @@ static const struct {
         /* order */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x01, 0xDC, 0xE8, 0xD2, 0xEC, 0x61, 0x84, 0xCA, 0xF0, 0xA9,
-        0x71, 0x76, 0x9F, 0xB1, 0xF7
-    }
+        0x71, 0x76, 0x9F, 0xB1, 0xF7 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 32 * 6];
 } _EC_SECG_PRIME_256K1 = {
-    {
-        NID_X9_62_prime_field, 0, 32, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 32, 1 },
+    { /* no seed */
         /* p */
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -749,8 +670,7 @@ static const struct {
         /* order */
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFE, 0xBA, 0xAE, 0xDC, 0xE6, 0xAF, 0x48, 0xA0, 0x3B,
-        0xBF, 0xD2, 0x5E, 0x8C, 0xD0, 0x36, 0x41, 0x41
-    }
+        0xBF, 0xD2, 0x5E, 0x8C, 0xD0, 0x36, 0x41, 0x41 }
 };
 
 /* some wap/wtls curves */
@@ -758,11 +678,8 @@ static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 15 * 6];
 } _EC_WTLS_8 = {
-    {
-        NID_X9_62_prime_field, 0, 15, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 15, 1 },
+    { /* no seed */
         /* p */
         0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFD, 0xE7,
@@ -780,19 +697,15 @@ static const struct {
         0x00, 0x00, 0x02,
         /* order */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xEC, 0xEA, 0x55, 0x1A,
-        0xD8, 0x37, 0xE9
-    }
+        0xD8, 0x37, 0xE9 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 21 * 6];
 } _EC_WTLS_9 = {
-    {
-        NID_X9_62_prime_field, 0, 21, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 21, 1 },
+    { /* no seed */
         /* p */
         0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x80, 0x8F,
@@ -810,19 +723,15 @@ static const struct {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
         /* order */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xCD,
-        0xC9, 0x8A, 0xE0, 0xE2, 0xDE, 0x57, 0x4A, 0xBF, 0x33
-    }
+        0xC9, 0x8A, 0xE0, 0xE2, 0xDE, 0x57, 0x4A, 0xBF, 0x33 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 28 * 6];
 } _EC_WTLS_12 = {
-    {
-        NID_X9_62_prime_field, 0, 28, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 28, 1 },
+    { /* no seed */
         /* p */
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -846,8 +755,7 @@ static const struct {
         /* order */
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0x16, 0xA2, 0xE0, 0xB8, 0xF0, 0x3E, 0x13, 0xDD, 0x29, 0x45,
-        0x5C, 0x5C, 0x2A, 0x3D
-    }
+        0x5C, 0x5C, 0x2A, 0x3D }
 };
 #endif /* FIPS_MODULE */
 
@@ -855,16 +763,13 @@ static const struct {
 
 /* characteristic two curves */
 
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 15 * 6];
 } _EC_SECG_CHAR2_113R1 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 15, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 15, 2 },
+    { /* seed */
         0x10, 0xE7, 0x23, 0xAB, 0x14, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56, 0x15,
         0x17, 0x56, 0xFE, 0xBF, 0x8F, 0xCB, 0x49, 0xA9,
         /* p */
@@ -884,19 +789,15 @@ static const struct {
         0xD3, 0x18, 0x86,
         /* order */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD9, 0xCC, 0xEC, 0x8A,
-        0x39, 0xE5, 0x6F
-    }
+        0x39, 0xE5, 0x6F }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 15 * 6];
 } _EC_SECG_CHAR2_113R2 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 15, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 15, 2 },
+    { /* seed */
         0x10, 0xC0, 0xFB, 0x15, 0x76, 0x08, 0x60, 0xDE, 0xF1, 0xEE, 0xF4, 0xD6,
         0x96, 0xE6, 0x76, 0x87, 0x56, 0x15, 0x17, 0x5D,
         /* p */
@@ -916,19 +817,15 @@ static const struct {
         0xBA, 0xBA, 0x1D,
         /* order */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x78, 0x9B, 0x24,
-        0x96, 0xAF, 0x93
-    }
+        0x96, 0xAF, 0x93 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 17 * 6];
 } _EC_SECG_CHAR2_131R1 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 17, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 17, 2 },
+    { /* seed */
         0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61, 0x51, 0x75, 0x98, 0x5B, 0xD3,
         0xAD, 0xBA, 0xDA, 0x21, 0xB4, 0x3A, 0x97, 0xE2,
         /* p */
@@ -948,19 +845,15 @@ static const struct {
         0x1B, 0x4E, 0xF9, 0xE1, 0x50,
         /* order */
         0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x31, 0x23, 0x95,
-        0x3A, 0x94, 0x64, 0xB5, 0x4D
-    }
+        0x3A, 0x94, 0x64, 0xB5, 0x4D }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 17 * 6];
 } _EC_SECG_CHAR2_131R2 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 17, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 17, 2 },
+    { /* seed */
         0x98, 0x5B, 0xD3, 0xAD, 0xBA, 0xD4, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
         0x15, 0x17, 0x5A, 0x21, 0xB4, 0x3A, 0x97, 0xE3,
         /* p */
@@ -980,20 +873,16 @@ static const struct {
         0x5D, 0xE9, 0xEB, 0x24, 0x0F,
         /* order */
         0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x69, 0x54, 0xA2,
-        0x33, 0x04, 0x9B, 0xA9, 0x8F
-    }
+        0x33, 0x04, 0x9B, 0xA9, 0x8F }
 };
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 21 * 6];
 } _EC_NIST_CHAR2_163K = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 21, 2
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 21, 2 },
+    { /* no seed */
         /* p */
         0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC9,
@@ -1011,20 +900,16 @@ static const struct {
         0x80, 0x05, 0x36, 0xD5, 0x38, 0xCC, 0xDA, 0xA3, 0xD9,
         /* order */
         0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01,
-        0x08, 0xA2, 0xE0, 0xCC, 0x0D, 0x99, 0xF8, 0xA5, 0xEF
-    }
+        0x08, 0xA2, 0xE0, 0xCC, 0x0D, 0x99, 0xF8, 0xA5, 0xEF }
 };
 
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 21 * 6];
 } _EC_SECG_CHAR2_163R1 = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 21, 2
-    },
-    {
-        /* p */
+    { NID_X9_62_characteristic_two_field, 0, 21, 2 },
+    { /* p */
         0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC9,
         /* a */
@@ -1041,20 +926,16 @@ static const struct {
         0xFC, 0xE3, 0xC8, 0x09, 0x88, 0xF4, 0x1F, 0xF8, 0x83,
         /* order */
         0x03, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x48,
-        0xAA, 0xB6, 0x89, 0xC2, 0x9C, 0xA7, 0x10, 0x27, 0x9B
-    }
+        0xAA, 0xB6, 0x89, 0xC2, 0x9C, 0xA7, 0x10, 0x27, 0x9B }
 };
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 21 * 6];
 } _EC_NIST_CHAR2_163B = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 21, 2
-    },
-    {
-        /* p */
+    { NID_X9_62_characteristic_two_field, 0, 21, 2 },
+    { /* p */
         0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC9,
         /* a */
@@ -1071,20 +952,16 @@ static const struct {
         0x45, 0xB1, 0x1C, 0x5C, 0x0C, 0x79, 0x73, 0x24, 0xF1,
         /* order */
         0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x92,
-        0xFE, 0x77, 0xE7, 0x0C, 0x12, 0xA4, 0x23, 0x4C, 0x33
-    }
+        0xFE, 0x77, 0xE7, 0x0C, 0x12, 0xA4, 0x23, 0x4C, 0x33 }
 };
 
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 25 * 6];
 } _EC_SECG_CHAR2_193R1 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 25, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 25, 2 },
+    { /* seed */
         0x10, 0x3F, 0xAE, 0xC7, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61, 0x51,
         0x75, 0x77, 0x7F, 0xC5, 0xB1, 0x91, 0xEF, 0x30,
         /* p */
@@ -1110,19 +987,15 @@ static const struct {
         /* order */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0xC7, 0xF3, 0x4A, 0x77, 0x8F, 0x44, 0x3A, 0xCC, 0x92, 0x0E, 0xBA,
-        0x49
-    }
+        0x49 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 25 * 6];
 } _EC_SECG_CHAR2_193R2 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 25, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 25, 2 },
+    { /* seed */
         0x10, 0xB7, 0xB4, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56, 0x15, 0x17, 0x51,
         0x37, 0xC8, 0xA1, 0x6F, 0xD0, 0xDA, 0x22, 0x11,
         /* p */
@@ -1148,20 +1021,16 @@ static const struct {
         /* order */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x01, 0x5A, 0xAB, 0x56, 0x1B, 0x00, 0x54, 0x13, 0xCC, 0xD4, 0xEE, 0x99,
-        0xD5
-    }
+        0xD5 }
 };
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 30 * 6];
 } _EC_NIST_CHAR2_233K = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 30, 4
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 30, 4 },
+    { /* no seed */
         /* p */
         0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
@@ -1185,19 +1054,15 @@ static const struct {
         /* order */
         0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x06, 0x9D, 0x5B, 0xB9, 0x15, 0xBC, 0xD4, 0x6E, 0xFB,
-        0x1A, 0xD5, 0xF1, 0x73, 0xAB, 0xDF
-    }
+        0x1A, 0xD5, 0xF1, 0x73, 0xAB, 0xDF }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 30 * 6];
 } _EC_NIST_CHAR2_233B = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 30, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 30, 2 },
+    { /* seed */
         0x74, 0xD5, 0x9F, 0xF0, 0x7F, 0x6B, 0x41, 0x3D, 0x0E, 0xA1, 0x4B, 0x34,
         0x4B, 0x20, 0xA2, 0xDB, 0x04, 0x9B, 0x50, 0xC3,
         /* p */
@@ -1223,8 +1088,7 @@ static const struct {
         /* order */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x13, 0xE9, 0x74, 0xE7, 0x2F, 0x8A, 0x69, 0x22, 0x03,
-        0x1D, 0x26, 0x03, 0xCF, 0xE0, 0xD7
-    }
+        0x1D, 0x26, 0x03, 0xCF, 0xE0, 0xD7 }
 };
 
 #ifndef FIPS_MODULE
@@ -1232,11 +1096,8 @@ static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 30 * 6];
 } _EC_SECG_CHAR2_239K1 = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 30, 4
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 30, 4 },
+    { /* no seed */
         /* p */
         0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1260,20 +1121,16 @@ static const struct {
         /* order */
         0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x5A, 0x79, 0xFE, 0xC6, 0x7C, 0xB6, 0xE9, 0x1F, 0x1C,
-        0x1D, 0xA8, 0x00, 0xE4, 0x78, 0xA5
-    }
+        0x1D, 0xA8, 0x00, 0xE4, 0x78, 0xA5 }
 };
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 36 * 6];
 } _EC_NIST_CHAR2_283K = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 36, 4
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 36, 4 },
+    { /* no seed */
         /* p */
         0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1297,19 +1154,15 @@ static const struct {
         /* order */
         0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xAE, 0x2E, 0xD0, 0x75, 0x77,
-        0x26, 0x5D, 0xFF, 0x7F, 0x94, 0x45, 0x1E, 0x06, 0x1E, 0x16, 0x3C, 0x61
-    }
+        0x26, 0x5D, 0xFF, 0x7F, 0x94, 0x45, 0x1E, 0x06, 0x1E, 0x16, 0x3C, 0x61 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 36 * 6];
 } _EC_NIST_CHAR2_283B = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 36, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 36, 2 },
+    { /* seed */
         0x77, 0xE2, 0xB0, 0x73, 0x70, 0xEB, 0x0F, 0x83, 0x2A, 0x6D, 0xD5, 0xB6,
         0x2D, 0xFC, 0x88, 0xCD, 0x06, 0xBB, 0x84, 0xBE,
         /* p */
@@ -1335,19 +1188,15 @@ static const struct {
         /* order */
         0x03, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x90, 0x39, 0x96, 0x60, 0xFC,
-        0x93, 0x8A, 0x90, 0x16, 0x5B, 0x04, 0x2A, 0x7C, 0xEF, 0xAD, 0xB3, 0x07
-    }
+        0x93, 0x8A, 0x90, 0x16, 0x5B, 0x04, 0x2A, 0x7C, 0xEF, 0xAD, 0xB3, 0x07 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 52 * 6];
 } _EC_NIST_CHAR2_409K = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 52, 4
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 52, 4 },
+    { /* no seed */
         /* p */
         0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1383,19 +1232,15 @@ static const struct {
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFE, 0x5F, 0x83, 0xB2, 0xD4, 0xEA, 0x20, 0x40, 0x0E, 0xC4,
         0x55, 0x7D, 0x5E, 0xD3, 0xE3, 0xE7, 0xCA, 0x5B, 0x4B, 0x5C, 0x83, 0xB8,
-        0xE0, 0x1E, 0x5F, 0xCF
-    }
+        0xE0, 0x1E, 0x5F, 0xCF }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 52 * 6];
 } _EC_NIST_CHAR2_409B = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 52, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 52, 2 },
+    { /* seed */
         0x40, 0x99, 0xB5, 0xA4, 0x57, 0xF9, 0xD6, 0x9F, 0x79, 0x21, 0x3D, 0x09,
         0x4C, 0x4B, 0xCD, 0x4D, 0x42, 0x62, 0x21, 0x0B,
         /* p */
@@ -1433,19 +1278,15 @@ static const struct {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x01, 0xE2, 0xAA, 0xD6, 0xA6, 0x12, 0xF3, 0x33, 0x07, 0xBE,
         0x5F, 0xA4, 0x7C, 0x3C, 0x9E, 0x05, 0x2F, 0x83, 0x81, 0x64, 0xCD, 0x37,
-        0xD9, 0xA2, 0x11, 0x73
-    }
+        0xD9, 0xA2, 0x11, 0x73 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 72 * 6];
 } _EC_NIST_CHAR2_571K = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 72, 4
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 72, 4 },
+    { /* no seed */
         /* p */
         0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1487,19 +1328,15 @@ static const struct {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x13, 0x18, 0x50, 0xE1, 0xF1, 0x9A, 0x63, 0xE4, 0xB3, 0x91, 0xA8, 0xDB,
         0x91, 0x7F, 0x41, 0x38, 0xB6, 0x30, 0xD8, 0x4B, 0xE5, 0xD6, 0x39, 0x38,
-        0x1E, 0x91, 0xDE, 0xB4, 0x5C, 0xFE, 0x77, 0x8F, 0x63, 0x7C, 0x10, 0x01
-    }
+        0x1E, 0x91, 0xDE, 0xB4, 0x5C, 0xFE, 0x77, 0x8F, 0x63, 0x7C, 0x10, 0x01 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 72 * 6];
 } _EC_NIST_CHAR2_571B = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 72, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 72, 2 },
+    { /* seed */
         0x2A, 0xA0, 0x58, 0xF7, 0x3A, 0x0E, 0x33, 0xAB, 0x48, 0x6B, 0x0F, 0x61,
         0x04, 0x10, 0xC5, 0x3A, 0x7F, 0x13, 0x23, 0x10,
         /* p */
@@ -1543,20 +1380,16 @@ static const struct {
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xE6, 0x61, 0xCE, 0x18, 0xFF, 0x55, 0x98, 0x73, 0x08, 0x05, 0x9B, 0x18,
         0x68, 0x23, 0x85, 0x1E, 0xC7, 0xDD, 0x9C, 0xA1, 0x16, 0x1D, 0xE9, 0x3D,
-        0x51, 0x74, 0xD6, 0x6E, 0x83, 0x82, 0xE9, 0xBB, 0x2F, 0xE8, 0x4E, 0x47
-    }
+        0x51, 0x74, 0xD6, 0x6E, 0x83, 0x82, 0xE9, 0xBB, 0x2F, 0xE8, 0x4E, 0x47 }
 };
 
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 21 * 6];
 } _EC_X9_62_CHAR2_163V1 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 21, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 21, 2 },
+    { /* seed */
         0xD2, 0xC0, 0xFB, 0x15, 0x76, 0x08, 0x60, 0xDE, 0xF1, 0xEE, 0xF4, 0xD6,
         0x96, 0xE6, 0x76, 0x87, 0x56, 0x15, 0x17, 0x54,
         /* p */
@@ -1576,19 +1409,15 @@ static const struct {
         0xF7, 0xEA, 0x58, 0x48, 0xAE, 0xF0, 0xB7, 0xCA, 0x9F,
         /* order */
         0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xE6,
-        0x0F, 0xC8, 0x82, 0x1C, 0xC7, 0x4D, 0xAE, 0xAF, 0xC1
-    }
+        0x0F, 0xC8, 0x82, 0x1C, 0xC7, 0x4D, 0xAE, 0xAF, 0xC1 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 21 * 6];
 } _EC_X9_62_CHAR2_163V2 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 21, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 21, 2 },
+    { /* seed */
         0x53, 0x81, 0x4C, 0x05, 0x0D, 0x44, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
         0x15, 0x17, 0x58, 0x0C, 0xA4, 0xE2, 0x9F, 0xFD,
         /* p */
@@ -1608,19 +1437,15 @@ static const struct {
         0x90, 0x02, 0x1B, 0x23, 0x86, 0xDF, 0xD1, 0x9F, 0xC5,
         /* order */
         0x03, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xF6,
-        0x4D, 0xE1, 0x15, 0x1A, 0xDB, 0xB7, 0x8F, 0x10, 0xA7
-    }
+        0x4D, 0xE1, 0x15, 0x1A, 0xDB, 0xB7, 0x8F, 0x10, 0xA7 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 21 * 6];
 } _EC_X9_62_CHAR2_163V3 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 21, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 21, 2 },
+    { /* seed */
         0x50, 0xCB, 0xF1, 0xD9, 0x5C, 0xA9, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75,
         0x61, 0x51, 0x75, 0xF1, 0x6A, 0x36, 0xA3, 0xB8,
         /* p */
@@ -1640,19 +1465,15 @@ static const struct {
         0xF3, 0x71, 0x8B, 0x89, 0x3D, 0xF5, 0x9A, 0x05, 0xD0,
         /* order */
         0x03, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x1A,
-        0xEE, 0x14, 0x0F, 0x11, 0x0A, 0xFF, 0x96, 0x13, 0x09
-    }
+        0xEE, 0x14, 0x0F, 0x11, 0x0A, 0xFF, 0x96, 0x13, 0x09 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 23 * 6];
 } _EC_X9_62_CHAR2_176V1 = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 23, 0xFF6E
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 23, 0xFF6E },
+    { /* no seed */
         /* p */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x07,
@@ -1670,19 +1491,15 @@ static const struct {
         0x7D, 0x61, 0xB4, 0x36, 0xE1, 0xD9, 0x2B, 0xB1, 0x6A, 0x56, 0x2C,
         /* order */
         0x00, 0x00, 0x01, 0x00, 0x92, 0x53, 0x73, 0x97, 0xEC, 0xA4, 0xF6, 0x14,
-        0x57, 0x99, 0xD6, 0x2B, 0x0A, 0x19, 0xCE, 0x06, 0xFE, 0x26, 0xAD
-    }
+        0x57, 0x99, 0xD6, 0x2B, 0x0A, 0x19, 0xCE, 0x06, 0xFE, 0x26, 0xAD }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 24 * 6];
 } _EC_X9_62_CHAR2_191V1 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 24, 2
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 24, 2 },
+    { /* seed */
         0x4E, 0x13, 0xCA, 0x54, 0x27, 0x44, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
         0x15, 0x17, 0x55, 0x2F, 0x27, 0x9A, 0x8C, 0x84,
         /* p */
@@ -1702,19 +1519,15 @@ static const struct {
         0x0E, 0xA2, 0x45, 0xCA, 0x24, 0x18, 0xEA, 0x0E, 0xF9, 0x80, 0x18, 0xFB,
         /* order */
         0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x04, 0xA2, 0x0E, 0x90, 0xC3, 0x90, 0x67, 0xC8, 0x93, 0xBB, 0xB9, 0xA5
-    }
+        0x04, 0xA2, 0x0E, 0x90, 0xC3, 0x90, 0x67, 0xC8, 0x93, 0xBB, 0xB9, 0xA5 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 24 * 6];
 } _EC_X9_62_CHAR2_191V2 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 24, 4
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 24, 4 },
+    { /* seed */
         0x08, 0x71, 0xEF, 0x2F, 0xEF, 0x24, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
         0x15, 0x17, 0x58, 0xBE, 0xE0, 0xD9, 0x5C, 0x15,
         /* p */
@@ -1734,19 +1547,15 @@ static const struct {
         0xD9, 0x21, 0x3A, 0x3E, 0x1C, 0xF3, 0x7A, 0xEC, 0x43, 0x7D, 0x66, 0x8A,
         /* order */
         0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x50, 0x50, 0x8C, 0xB8, 0x9F, 0x65, 0x28, 0x24, 0xE0, 0x6B, 0x81, 0x73
-    }
+        0x50, 0x50, 0x8C, 0xB8, 0x9F, 0x65, 0x28, 0x24, 0xE0, 0x6B, 0x81, 0x73 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 24 * 6];
 } _EC_X9_62_CHAR2_191V3 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 24, 6
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 24, 6 },
+    { /* seed */
         0xE0, 0x53, 0x51, 0x2D, 0xC6, 0x84, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
         0x15, 0x17, 0x50, 0x67, 0xAE, 0x78, 0x6D, 0x1F,
         /* p */
@@ -1766,19 +1575,15 @@ static const struct {
         0x6E, 0x6A, 0xD3, 0x4C, 0xE0, 0xA7, 0x7C, 0xD7, 0x12, 0x7B, 0x06, 0xBE,
         /* order */
         0x15, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
-        0x61, 0x0C, 0x0B, 0x19, 0x68, 0x12, 0xBF, 0xB6, 0x28, 0x8A, 0x3E, 0xA3
-    }
+        0x61, 0x0C, 0x0B, 0x19, 0x68, 0x12, 0xBF, 0xB6, 0x28, 0x8A, 0x3E, 0xA3 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 27 * 6];
 } _EC_X9_62_CHAR2_208W1 = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 27, 0xFE48
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 27, 0xFE48 },
+    { /* no seed */
         /* p */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1802,19 +1607,15 @@ static const struct {
         /* order */
         0x00, 0x00, 0x01, 0x01, 0xBA, 0xF9, 0x5C, 0x97, 0x23, 0xC5, 0x7B, 0x6C,
         0x21, 0xDA, 0x2E, 0xFF, 0x2D, 0x5E, 0xD5, 0x88, 0xBD, 0xD5, 0x71, 0x7E,
-        0x21, 0x2F, 0x9D
-    }
+        0x21, 0x2F, 0x9D }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 30 * 6];
 } _EC_X9_62_CHAR2_239V1 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 30, 4
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 30, 4 },
+    { /* seed */
         0xD3, 0x4B, 0x9A, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61, 0x51, 0x75,
         0xCA, 0x71, 0xB9, 0x20, 0xBF, 0xEF, 0xB0, 0x5D,
         /* p */
@@ -1840,19 +1641,15 @@ static const struct {
         /* order */
         0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x0F, 0x4D, 0x42, 0xFF, 0xE1, 0x49, 0x2A, 0x49, 0x93,
-        0xF1, 0xCA, 0xD6, 0x66, 0xE4, 0x47
-    }
+        0xF1, 0xCA, 0xD6, 0x66, 0xE4, 0x47 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 30 * 6];
 } _EC_X9_62_CHAR2_239V2 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 30, 6
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 30, 6 },
+    { /* seed */
         0x2A, 0xA6, 0x98, 0x2F, 0xDF, 0xA4, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
         0x15, 0x17, 0x5D, 0x26, 0x67, 0x27, 0x27, 0x7D,
         /* p */
@@ -1878,19 +1675,15 @@ static const struct {
         /* order */
         0x15, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
         0x55, 0x55, 0x55, 0x3C, 0x6F, 0x28, 0x85, 0x25, 0x9C, 0x31, 0xE3, 0xFC,
-        0xDF, 0x15, 0x46, 0x24, 0x52, 0x2D
-    }
+        0xDF, 0x15, 0x46, 0x24, 0x52, 0x2D }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 30 * 6];
 } _EC_X9_62_CHAR2_239V3 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 30, 0xA
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 30, 0xA },
+    { /* seed */
         0x9E, 0x07, 0x6F, 0x4D, 0x69, 0x6E, 0x67, 0x68, 0x75, 0x61, 0x51, 0x75,
         0xE1, 0x1E, 0x9F, 0xDD, 0x77, 0xF9, 0x20, 0x41,
         /* p */
@@ -1916,19 +1709,15 @@ static const struct {
         /* order */
         0x0C, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
         0xCC, 0xCC, 0xCC, 0xAC, 0x49, 0x12, 0xD2, 0xD9, 0xDF, 0x90, 0x3E, 0xF9,
-        0x88, 0x8B, 0x8A, 0x0E, 0x4C, 0xFF
-    }
+        0x88, 0x8B, 0x8A, 0x0E, 0x4C, 0xFF }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 35 * 6];
 } _EC_X9_62_CHAR2_272W1 = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 35, 0xFF06
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 35, 0xFF06 },
+    { /* no seed */
         /* p */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1952,19 +1741,15 @@ static const struct {
         /* order */
         0x00, 0x00, 0x01, 0x00, 0xFA, 0xF5, 0x13, 0x54, 0xE0, 0xE3, 0x9E, 0x48,
         0x92, 0xDF, 0x6E, 0x31, 0x9C, 0x72, 0xC8, 0x16, 0x16, 0x03, 0xFA, 0x45,
-        0xAA, 0x7B, 0x99, 0x8A, 0x16, 0x7B, 0x8F, 0x1E, 0x62, 0x95, 0x21
-    }
+        0xAA, 0x7B, 0x99, 0x8A, 0x16, 0x7B, 0x8F, 0x1E, 0x62, 0x95, 0x21 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 39 * 6];
 } _EC_X9_62_CHAR2_304W1 = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 39, 0xFE2E
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 39, 0xFE2E },
+    { /* no seed */
         /* p */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1994,19 +1779,15 @@ static const struct {
         0x00, 0x00, 0x01, 0x01, 0xD5, 0x56, 0x57, 0x2A, 0xAB, 0xAC, 0x80, 0x01,
         0x01, 0xD5, 0x56, 0x57, 0x2A, 0xAB, 0xAC, 0x80, 0x01, 0x02, 0x2D, 0x5C,
         0x91, 0xDD, 0x17, 0x3F, 0x8F, 0xB5, 0x61, 0xDA, 0x68, 0x99, 0x16, 0x44,
-        0x43, 0x05, 0x1D
-    }
+        0x43, 0x05, 0x1D }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[20 + 45 * 6];
 } _EC_X9_62_CHAR2_359V1 = {
-    {
-        NID_X9_62_characteristic_two_field, 20, 45, 0x4C
-    },
-    {
-        /* seed */
+    { NID_X9_62_characteristic_two_field, 20, 45, 0x4C },
+    { /* seed */
         0x2B, 0x35, 0x49, 0x20, 0xB7, 0x24, 0xD6, 0x96, 0xE6, 0x76, 0x87, 0x56,
         0x15, 0x17, 0x58, 0x5B, 0xA1, 0x33, 0x2D, 0xC6,
         /* p */
@@ -2038,19 +1819,15 @@ static const struct {
         0x01, 0xAF, 0x28, 0x6B, 0xCA, 0x1A, 0xF2, 0x86, 0xBC, 0xA1, 0xAF, 0x28,
         0x6B, 0xCA, 0x1A, 0xF2, 0x86, 0xBC, 0xA1, 0xAF, 0x28, 0x6B, 0xC9, 0xFB,
         0x8F, 0x6B, 0x85, 0xC5, 0x56, 0x89, 0x2C, 0x20, 0xA7, 0xEB, 0x96, 0x4F,
-        0xE7, 0x71, 0x9E, 0x74, 0xF4, 0x90, 0x75, 0x8D, 0x3B
-    }
+        0xE7, 0x71, 0x9E, 0x74, 0xF4, 0x90, 0x75, 0x8D, 0x3B }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 47 * 6];
 } _EC_X9_62_CHAR2_368W1 = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 47, 0xFF70
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 47, 0xFF70 },
+    { /* no seed */
         /* p */
         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2080,19 +1857,15 @@ static const struct {
         0x00, 0x00, 0x01, 0x00, 0x90, 0x51, 0x2D, 0xA9, 0xAF, 0x72, 0xB0, 0x83,
         0x49, 0xD9, 0x8A, 0x5D, 0xD4, 0xC7, 0xB0, 0x53, 0x2E, 0xCA, 0x51, 0xCE,
         0x03, 0xE2, 0xD1, 0x0F, 0x3B, 0x7A, 0xC5, 0x79, 0xBD, 0x87, 0xE9, 0x09,
-        0xAE, 0x40, 0xA6, 0xF1, 0x31, 0xE9, 0xCF, 0xCE, 0x5B, 0xD9, 0x67
-    }
+        0xAE, 0x40, 0xA6, 0xF1, 0x31, 0xE9, 0xCF, 0xCE, 0x5B, 0xD9, 0x67 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 54 * 6];
 } _EC_X9_62_CHAR2_431R1 = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 54, 0x2760
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 54, 0x2760 },
+    { /* no seed */
         /* p */
         0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2128,19 +1901,15 @@ static const struct {
         0x34, 0x03, 0x40, 0x34, 0x03, 0x40, 0x34, 0x03, 0x40, 0x34, 0x03, 0x40,
         0x34, 0x03, 0x40, 0x34, 0x03, 0x23, 0xC3, 0x13, 0xFA, 0xB5, 0x05, 0x89,
         0x70, 0x3B, 0x5E, 0xC6, 0x8D, 0x35, 0x87, 0xFE, 0xC6, 0x0D, 0x16, 0x1C,
-        0xC1, 0x49, 0xC1, 0xAD, 0x4A, 0x91
-    }
+        0xC1, 0x49, 0xC1, 0xAD, 0x4A, 0x91 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 15 * 6];
 } _EC_WTLS_1 = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 15, 2
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 15, 2 },
+    { /* no seed */
         /* p */
         0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x02, 0x01,
@@ -2158,8 +1927,7 @@ static const struct {
         0xEB, 0xCC, 0x15,
         /* order */
         0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xBF, 0x91, 0xAF,
-        0x6D, 0xEA, 0x73
-    }
+        0x6D, 0xEA, 0x73 }
 };
 
 /* IPSec curves */
@@ -2172,11 +1940,8 @@ static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 20 * 6];
 } _EC_IPSEC_155_ID3 = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 20, 3
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 20, 3 },
+    { /* no seed */
         /* p */
         0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
@@ -2194,8 +1959,7 @@ static const struct {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc8,
         /* order */
         0x02, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xC7, 0xF3,
-        0xC7, 0x88, 0x1B, 0xD0, 0x86, 0x8F, 0xA8, 0x6C
-    }
+        0xC7, 0x88, 0x1B, 0xD0, 0x86, 0x8F, 0xA8, 0x6C }
 };
 
 /*
@@ -2207,11 +1971,8 @@ static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 24 * 6];
 } _EC_IPSEC_185_ID4 = {
-    {
-        NID_X9_62_characteristic_two_field, 0, 24, 2
-    },
-    {
-        /* no seed */
+    { NID_X9_62_characteristic_two_field, 0, 24, 2 },
+    { /* no seed */
         /* p */
         0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
@@ -2229,10 +1990,9 @@ static const struct {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d,
         /* order */
         0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-        0xED, 0xF9, 0x7C, 0x44, 0xDB, 0x9F, 0x24, 0x20, 0xBA, 0xFC, 0xA7, 0x5E
-    }
+        0xED, 0xF9, 0x7C, 0x44, 0xDB, 0x9F, 0x24, 0x20, 0xBA, 0xFC, 0xA7, 0x5E }
 };
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 #endif /* OPENSSL_NO_EC2M */
 
 /*
@@ -2248,11 +2008,8 @@ static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 20 * 6];
 } _EC_brainpoolP160r1 = {
-    {
-        NID_X9_62_prime_field, 0, 20, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 20, 1 },
+    { /* no seed */
         /* p */
         0xE9, 0x5E, 0x4A, 0x5F, 0x73, 0x70, 0x59, 0xDC, 0x60, 0xDF, 0xC7, 0xAD,
         0x95, 0xB3, 0xD8, 0x13, 0x95, 0x15, 0x62, 0x0F,
@@ -2270,19 +2027,15 @@ static const struct {
         0x66, 0x9C, 0x97, 0x63, 0x16, 0xDA, 0x63, 0x21,
         /* order */
         0xE9, 0x5E, 0x4A, 0x5F, 0x73, 0x70, 0x59, 0xDC, 0x60, 0xDF, 0x59, 0x91,
-        0xD4, 0x50, 0x29, 0x40, 0x9E, 0x60, 0xFC, 0x09
-    }
+        0xD4, 0x50, 0x29, 0x40, 0x9E, 0x60, 0xFC, 0x09 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 20 * 6];
 } _EC_brainpoolP160t1 = {
-    {
-        NID_X9_62_prime_field, 0, 20, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 20, 1 },
+    { /* no seed */
         /* p */
         0xE9, 0x5E, 0x4A, 0x5F, 0x73, 0x70, 0x59, 0xDC, 0x60, 0xDF, 0xC7, 0xAD,
         0x95, 0xB3, 0xD8, 0x13, 0x95, 0x15, 0x62, 0x0F,
@@ -2300,19 +2053,15 @@ static const struct {
         0x24, 0x43, 0x77, 0x21, 0x52, 0xC9, 0xE0, 0xAD,
         /* order */
         0xE9, 0x5E, 0x4A, 0x5F, 0x73, 0x70, 0x59, 0xDC, 0x60, 0xDF, 0x59, 0x91,
-        0xD4, 0x50, 0x29, 0x40, 0x9E, 0x60, 0xFC, 0x09
-    }
+        0xD4, 0x50, 0x29, 0x40, 0x9E, 0x60, 0xFC, 0x09 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 24 * 6];
 } _EC_brainpoolP192r1 = {
-    {
-        NID_X9_62_prime_field, 0, 24, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 24, 1 },
+    { /* no seed */
         /* p */
         0xC3, 0x02, 0xF4, 0x1D, 0x93, 0x2A, 0x36, 0xCD, 0xA7, 0xA3, 0x46, 0x30,
         0x93, 0xD1, 0x8D, 0xB7, 0x8F, 0xCE, 0x47, 0x6D, 0xE1, 0xA8, 0x62, 0x97,
@@ -2330,19 +2079,15 @@ static const struct {
         0xC1, 0x49, 0x00, 0x02, 0xE6, 0x77, 0x3F, 0xA2, 0xFA, 0x29, 0x9B, 0x8F,
         /* order */
         0xC3, 0x02, 0xF4, 0x1D, 0x93, 0x2A, 0x36, 0xCD, 0xA7, 0xA3, 0x46, 0x2F,
-        0x9E, 0x9E, 0x91, 0x6B, 0x5B, 0xE8, 0xF1, 0x02, 0x9A, 0xC4, 0xAC, 0xC1
-    }
+        0x9E, 0x9E, 0x91, 0x6B, 0x5B, 0xE8, 0xF1, 0x02, 0x9A, 0xC4, 0xAC, 0xC1 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 24 * 6];
 } _EC_brainpoolP192t1 = {
-    {
-        NID_X9_62_prime_field, 0, 24, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 24, 1 },
+    { /* no seed */
         /* p */
         0xC3, 0x02, 0xF4, 0x1D, 0x93, 0x2A, 0x36, 0xCD, 0xA7, 0xA3, 0x46, 0x30,
         0x93, 0xD1, 0x8D, 0xB7, 0x8F, 0xCE, 0x47, 0x6D, 0xE1, 0xA8, 0x62, 0x97,
@@ -2360,19 +2105,15 @@ static const struct {
         0x44, 0x9D, 0x00, 0x84, 0xB7, 0xE5, 0xB3, 0xDE, 0x7C, 0xCC, 0x01, 0xC9,
         /* order */
         0xC3, 0x02, 0xF4, 0x1D, 0x93, 0x2A, 0x36, 0xCD, 0xA7, 0xA3, 0x46, 0x2F,
-        0x9E, 0x9E, 0x91, 0x6B, 0x5B, 0xE8, 0xF1, 0x02, 0x9A, 0xC4, 0xAC, 0xC1
-    }
+        0x9E, 0x9E, 0x91, 0x6B, 0x5B, 0xE8, 0xF1, 0x02, 0x9A, 0xC4, 0xAC, 0xC1 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 28 * 6];
 } _EC_brainpoolP224r1 = {
-    {
-        NID_X9_62_prime_field, 0, 28, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 28, 1 },
+    { /* no seed */
         /* p */
         0xD7, 0xC1, 0x34, 0xAA, 0x26, 0x43, 0x66, 0x86, 0x2A, 0x18, 0x30, 0x25,
         0x75, 0xD1, 0xD7, 0x87, 0xB0, 0x9F, 0x07, 0x57, 0x97, 0xDA, 0x89, 0xF5,
@@ -2396,19 +2137,15 @@ static const struct {
         /* order */
         0xD7, 0xC1, 0x34, 0xAA, 0x26, 0x43, 0x66, 0x86, 0x2A, 0x18, 0x30, 0x25,
         0x75, 0xD0, 0xFB, 0x98, 0xD1, 0x16, 0xBC, 0x4B, 0x6D, 0xDE, 0xBC, 0xA3,
-        0xA5, 0xA7, 0x93, 0x9F
-    }
+        0xA5, 0xA7, 0x93, 0x9F }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 28 * 6];
 } _EC_brainpoolP224t1 = {
-    {
-        NID_X9_62_prime_field, 0, 28, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 28, 1 },
+    { /* no seed */
         /* p */
         0xD7, 0xC1, 0x34, 0xAA, 0x26, 0x43, 0x66, 0x86, 0x2A, 0x18, 0x30, 0x25,
         0x75, 0xD1, 0xD7, 0x87, 0xB0, 0x9F, 0x07, 0x57, 0x97, 0xDA, 0x89, 0xF5,
@@ -2432,19 +2169,15 @@ static const struct {
         /* order */
         0xD7, 0xC1, 0x34, 0xAA, 0x26, 0x43, 0x66, 0x86, 0x2A, 0x18, 0x30, 0x25,
         0x75, 0xD0, 0xFB, 0x98, 0xD1, 0x16, 0xBC, 0x4B, 0x6D, 0xDE, 0xBC, 0xA3,
-        0xA5, 0xA7, 0x93, 0x9F
-    }
+        0xA5, 0xA7, 0x93, 0x9F }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 32 * 6];
 } _EC_brainpoolP256r1 = {
-    {
-        NID_X9_62_prime_field, 0, 32, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 32, 1 },
+    { /* no seed */
         /* p */
         0xA9, 0xFB, 0x57, 0xDB, 0xA1, 0xEE, 0xA9, 0xBC, 0x3E, 0x66, 0x0A, 0x90,
         0x9D, 0x83, 0x8D, 0x72, 0x6E, 0x3B, 0xF6, 0x23, 0xD5, 0x26, 0x20, 0x28,
@@ -2468,19 +2201,15 @@ static const struct {
         /* order */
         0xA9, 0xFB, 0x57, 0xDB, 0xA1, 0xEE, 0xA9, 0xBC, 0x3E, 0x66, 0x0A, 0x90,
         0x9D, 0x83, 0x8D, 0x71, 0x8C, 0x39, 0x7A, 0xA3, 0xB5, 0x61, 0xA6, 0xF7,
-        0x90, 0x1E, 0x0E, 0x82, 0x97, 0x48, 0x56, 0xA7
-    }
+        0x90, 0x1E, 0x0E, 0x82, 0x97, 0x48, 0x56, 0xA7 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 32 * 6];
 } _EC_brainpoolP256t1 = {
-    {
-        NID_X9_62_prime_field, 0, 32, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 32, 1 },
+    { /* no seed */
         /* p */
         0xA9, 0xFB, 0x57, 0xDB, 0xA1, 0xEE, 0xA9, 0xBC, 0x3E, 0x66, 0x0A, 0x90,
         0x9D, 0x83, 0x8D, 0x72, 0x6E, 0x3B, 0xF6, 0x23, 0xD5, 0x26, 0x20, 0x28,
@@ -2504,19 +2233,15 @@ static const struct {
         /* order */
         0xA9, 0xFB, 0x57, 0xDB, 0xA1, 0xEE, 0xA9, 0xBC, 0x3E, 0x66, 0x0A, 0x90,
         0x9D, 0x83, 0x8D, 0x71, 0x8C, 0x39, 0x7A, 0xA3, 0xB5, 0x61, 0xA6, 0xF7,
-        0x90, 0x1E, 0x0E, 0x82, 0x97, 0x48, 0x56, 0xA7
-    }
+        0x90, 0x1E, 0x0E, 0x82, 0x97, 0x48, 0x56, 0xA7 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 40 * 6];
 } _EC_brainpoolP320r1 = {
-    {
-        NID_X9_62_prime_field, 0, 40, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 40, 1 },
+    { /* no seed */
         /* p */
         0xD3, 0x5E, 0x47, 0x20, 0x36, 0xBC, 0x4F, 0xB7, 0xE1, 0x3C, 0x78, 0x5E,
         0xD2, 0x01, 0xE0, 0x65, 0xF9, 0x8F, 0xCF, 0xA6, 0xF6, 0xF4, 0x0D, 0xEF,
@@ -2546,19 +2271,15 @@ static const struct {
         0xD3, 0x5E, 0x47, 0x20, 0x36, 0xBC, 0x4F, 0xB7, 0xE1, 0x3C, 0x78, 0x5E,
         0xD2, 0x01, 0xE0, 0x65, 0xF9, 0x8F, 0xCF, 0xA5, 0xB6, 0x8F, 0x12, 0xA3,
         0x2D, 0x48, 0x2E, 0xC7, 0xEE, 0x86, 0x58, 0xE9, 0x86, 0x91, 0x55, 0x5B,
-        0x44, 0xC5, 0x93, 0x11
-    }
+        0x44, 0xC5, 0x93, 0x11 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 40 * 6];
 } _EC_brainpoolP320t1 = {
-    {
-        NID_X9_62_prime_field, 0, 40, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 40, 1 },
+    { /* no seed */
         /* p */
         0xD3, 0x5E, 0x47, 0x20, 0x36, 0xBC, 0x4F, 0xB7, 0xE1, 0x3C, 0x78, 0x5E,
         0xD2, 0x01, 0xE0, 0x65, 0xF9, 0x8F, 0xCF, 0xA6, 0xF6, 0xF4, 0x0D, 0xEF,
@@ -2588,19 +2309,15 @@ static const struct {
         0xD3, 0x5E, 0x47, 0x20, 0x36, 0xBC, 0x4F, 0xB7, 0xE1, 0x3C, 0x78, 0x5E,
         0xD2, 0x01, 0xE0, 0x65, 0xF9, 0x8F, 0xCF, 0xA5, 0xB6, 0x8F, 0x12, 0xA3,
         0x2D, 0x48, 0x2E, 0xC7, 0xEE, 0x86, 0x58, 0xE9, 0x86, 0x91, 0x55, 0x5B,
-        0x44, 0xC5, 0x93, 0x11
-    }
+        0x44, 0xC5, 0x93, 0x11 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 48 * 6];
 } _EC_brainpoolP384r1 = {
-    {
-        NID_X9_62_prime_field, 0, 48, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 48, 1 },
+    { /* no seed */
         /* p */
         0x8C, 0xB9, 0x1E, 0x82, 0xA3, 0x38, 0x6D, 0x28, 0x0F, 0x5D, 0x6F, 0x7E,
         0x50, 0xE6, 0x41, 0xDF, 0x15, 0x2F, 0x71, 0x09, 0xED, 0x54, 0x56, 0xB4,
@@ -2630,19 +2347,15 @@ static const struct {
         0x8C, 0xB9, 0x1E, 0x82, 0xA3, 0x38, 0x6D, 0x28, 0x0F, 0x5D, 0x6F, 0x7E,
         0x50, 0xE6, 0x41, 0xDF, 0x15, 0x2F, 0x71, 0x09, 0xED, 0x54, 0x56, 0xB3,
         0x1F, 0x16, 0x6E, 0x6C, 0xAC, 0x04, 0x25, 0xA7, 0xCF, 0x3A, 0xB6, 0xAF,
-        0x6B, 0x7F, 0xC3, 0x10, 0x3B, 0x88, 0x32, 0x02, 0xE9, 0x04, 0x65, 0x65
-    }
+        0x6B, 0x7F, 0xC3, 0x10, 0x3B, 0x88, 0x32, 0x02, 0xE9, 0x04, 0x65, 0x65 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 48 * 6];
 } _EC_brainpoolP384t1 = {
-    {
-        NID_X9_62_prime_field, 0, 48, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 48, 1 },
+    { /* no seed */
         /* p */
         0x8C, 0xB9, 0x1E, 0x82, 0xA3, 0x38, 0x6D, 0x28, 0x0F, 0x5D, 0x6F, 0x7E,
         0x50, 0xE6, 0x41, 0xDF, 0x15, 0x2F, 0x71, 0x09, 0xED, 0x54, 0x56, 0xB4,
@@ -2672,19 +2385,15 @@ static const struct {
         0x8C, 0xB9, 0x1E, 0x82, 0xA3, 0x38, 0x6D, 0x28, 0x0F, 0x5D, 0x6F, 0x7E,
         0x50, 0xE6, 0x41, 0xDF, 0x15, 0x2F, 0x71, 0x09, 0xED, 0x54, 0x56, 0xB3,
         0x1F, 0x16, 0x6E, 0x6C, 0xAC, 0x04, 0x25, 0xA7, 0xCF, 0x3A, 0xB6, 0xAF,
-        0x6B, 0x7F, 0xC3, 0x10, 0x3B, 0x88, 0x32, 0x02, 0xE9, 0x04, 0x65, 0x65
-    }
+        0x6B, 0x7F, 0xC3, 0x10, 0x3B, 0x88, 0x32, 0x02, 0xE9, 0x04, 0x65, 0x65 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 64 * 6];
 } _EC_brainpoolP512r1 = {
-    {
-        NID_X9_62_prime_field, 0, 64, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 64, 1 },
+    { /* no seed */
         /* p */
         0xAA, 0xDD, 0x9D, 0xB8, 0xDB, 0xE9, 0xC4, 0x8B, 0x3F, 0xD4, 0xE6, 0xAE,
         0x33, 0xC9, 0xFC, 0x07, 0xCB, 0x30, 0x8D, 0xB3, 0xB3, 0xC9, 0xD2, 0x0E,
@@ -2726,19 +2435,15 @@ static const struct {
         0xD6, 0x63, 0x9C, 0xCA, 0x70, 0x33, 0x08, 0x70, 0x55, 0x3E, 0x5C, 0x41,
         0x4C, 0xA9, 0x26, 0x19, 0x41, 0x86, 0x61, 0x19, 0x7F, 0xAC, 0x10, 0x47,
         0x1D, 0xB1, 0xD3, 0x81, 0x08, 0x5D, 0xDA, 0xDD, 0xB5, 0x87, 0x96, 0x82,
-        0x9C, 0xA9, 0x00, 0x69
-    }
+        0x9C, 0xA9, 0x00, 0x69 }
 };
 
 static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 64 * 6];
 } _EC_brainpoolP512t1 = {
-    {
-        NID_X9_62_prime_field, 0, 64, 1
-    },
-    {
-        /* no seed */
+    { NID_X9_62_prime_field, 0, 64, 1 },
+    { /* no seed */
         /* p */
         0xAA, 0xDD, 0x9D, 0xB8, 0xDB, 0xE9, 0xC4, 0x8B, 0x3F, 0xD4, 0xE6, 0xAE,
         0x33, 0xC9, 0xFC, 0x07, 0xCB, 0x30, 0x8D, 0xB3, 0xB3, 0xC9, 0xD2, 0x0E,
@@ -2780,8 +2485,7 @@ static const struct {
         0xD6, 0x63, 0x9C, 0xCA, 0x70, 0x33, 0x08, 0x70, 0x55, 0x3E, 0x5C, 0x41,
         0x4C, 0xA9, 0x26, 0x19, 0x41, 0x86, 0x61, 0x19, 0x7F, 0xAC, 0x10, 0x47,
         0x1D, 0xB1, 0xD3, 0x81, 0x08, 0x5D, 0xDA, 0xDD, 0xB5, 0x87, 0x96, 0x82,
-        0x9C, 0xA9, 0x00, 0x69
-    }
+        0x9C, 0xA9, 0x00, 0x69 }
 };
 #endif /* FIPS_MODULE */
 
@@ -2790,36 +2494,208 @@ static const struct {
     EC_CURVE_DATA h;
     unsigned char data[0 + 32 * 6];
 } _EC_sm2p256v1 = {
-    {
-       NID_X9_62_prime_field, 0, 32, 1
-    },
+    { NID_X9_62_prime_field, 0, 32, 1 },
     {
         /* no seed */
 
         /* p */
-        0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        /* a */
-        0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
-        /* b */
-        0x28, 0xe9, 0xfa, 0x9e, 0x9d, 0x9f, 0x5e, 0x34, 0x4d, 0x5a, 0x9e, 0x4b,
-        0xcf, 0x65, 0x09, 0xa7, 0xf3, 0x97, 0x89, 0xf5, 0x15, 0xab, 0x8f, 0x92,
-        0xdd, 0xbc, 0xbd, 0x41, 0x4d, 0x94, 0x0e, 0x93,
-        /* x */
-        0x32, 0xc4, 0xae, 0x2c, 0x1f, 0x19, 0x81, 0x19, 0x5f, 0x99, 0x04, 0x46,
-        0x6a, 0x39, 0xc9, 0x94, 0x8f, 0xe3, 0x0b, 0xbf, 0xf2, 0x66, 0x0b, 0xe1,
-        0x71, 0x5a, 0x45, 0x89, 0x33, 0x4c, 0x74, 0xc7,
-        /* y */
-        0xbc, 0x37, 0x36, 0xa2, 0xf4, 0xf6, 0x77, 0x9c, 0x59, 0xbd, 0xce, 0xe3,
-        0x6b, 0x69, 0x21, 0x53, 0xd0, 0xa9, 0x87, 0x7c, 0xc6, 0x2a, 0x47, 0x40,
-        0x02, 0xdf, 0x32, 0xe5, 0x21, 0x39, 0xf0, 0xa0,
-        /* order */
-        0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0x72, 0x03, 0xdf, 0x6b, 0x21, 0xc6, 0x05, 0x2b,
-        0x53, 0xbb, 0xf4, 0x09, 0x39, 0xd5, 0x41, 0x23,
+        0xff,
+        0xff,
+        0xff,
+        0xfe,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        /* a */
+        0xff,
+        0xff,
+        0xff,
+        0xfe,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xfc,
+        /* b */
+        0x28,
+        0xe9,
+        0xfa,
+        0x9e,
+        0x9d,
+        0x9f,
+        0x5e,
+        0x34,
+        0x4d,
+        0x5a,
+        0x9e,
+        0x4b,
+        0xcf,
+        0x65,
+        0x09,
+        0xa7,
+        0xf3,
+        0x97,
+        0x89,
+        0xf5,
+        0x15,
+        0xab,
+        0x8f,
+        0x92,
+        0xdd,
+        0xbc,
+        0xbd,
+        0x41,
+        0x4d,
+        0x94,
+        0x0e,
+        0x93,
+        /* x */
+        0x32,
+        0xc4,
+        0xae,
+        0x2c,
+        0x1f,
+        0x19,
+        0x81,
+        0x19,
+        0x5f,
+        0x99,
+        0x04,
+        0x46,
+        0x6a,
+        0x39,
+        0xc9,
+        0x94,
+        0x8f,
+        0xe3,
+        0x0b,
+        0xbf,
+        0xf2,
+        0x66,
+        0x0b,
+        0xe1,
+        0x71,
+        0x5a,
+        0x45,
+        0x89,
+        0x33,
+        0x4c,
+        0x74,
+        0xc7,
+        /* y */
+        0xbc,
+        0x37,
+        0x36,
+        0xa2,
+        0xf4,
+        0xf6,
+        0x77,
+        0x9c,
+        0x59,
+        0xbd,
+        0xce,
+        0xe3,
+        0x6b,
+        0x69,
+        0x21,
+        0x53,
+        0xd0,
+        0xa9,
+        0x87,
+        0x7c,
+        0xc6,
+        0x2a,
+        0x47,
+        0x40,
+        0x02,
+        0xdf,
+        0x32,
+        0xe5,
+        0x21,
+        0x39,
+        0xf0,
+        0xa0,
+        /* order */
+        0xff,
+        0xff,
+        0xff,
+        0xfe,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0xff,
+        0x72,
+        0x03,
+        0xdf,
+        0x6b,
+        0x21,
+        0xc6,
+        0x05,
+        0x2b,
+        0x53,
+        0xbb,
+        0xf4,
+        0x09,
+        0x39,
+        0xd5,
+        0x41,
+        0x23,
     }
 };
 #endif /* OPENSSL_NO_SM2 */
@@ -2827,7 +2703,7 @@ static const struct {
 typedef struct _ec_list_element_st {
     int nid;
     const EC_CURVE_DATA *data;
-    const EC_METHOD *(*meth) (void);
+    const EC_METHOD *(*meth)(void);
     const char *comment;
 } ec_list_element;
 
@@ -2835,73 +2711,73 @@ typedef struct _ec_list_element_st {
 static const ec_list_element curve_list[] = {
     /* prime field curves */
     /* secg curves */
-    {NID_secp224r1, &_EC_NIST_PRIME_224.h,
-# if !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
-     EC_GFp_nistp224_method,
-# else
-     0,
-# endif
-     "NIST/SECG curve over a 224 bit prime field"},
+    { NID_secp224r1, &_EC_NIST_PRIME_224.h,
+#if !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+        EC_GFp_nistp224_method,
+#else
+        0,
+#endif
+        "NIST/SECG curve over a 224 bit prime field" },
     /* SECG secp256r1 is the same as X9.62 prime256v1 and hence omitted */
-    {NID_secp384r1, &_EC_NIST_PRIME_384.h,
-# if defined(S390X_EC_ASM)
-     EC_GFp_s390x_nistp384_method,
-# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
-     ossl_ec_GFp_nistp384_method,
-# else
-     0,
-# endif
-     "NIST/SECG curve over a 384 bit prime field"},
-
-    {NID_secp521r1, &_EC_NIST_PRIME_521.h,
-# if defined(S390X_EC_ASM)
-     EC_GFp_s390x_nistp521_method,
-# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
-     EC_GFp_nistp521_method,
-# else
-     0,
-# endif
-     "NIST/SECG curve over a 521 bit prime field"},
+    { NID_secp384r1, &_EC_NIST_PRIME_384.h,
+#if defined(S390X_EC_ASM)
+        EC_GFp_s390x_nistp384_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+        ossl_ec_GFp_nistp384_method,
+#else
+        0,
+#endif
+        "NIST/SECG curve over a 384 bit prime field" },
+
+    { NID_secp521r1, &_EC_NIST_PRIME_521.h,
+#if defined(S390X_EC_ASM)
+        EC_GFp_s390x_nistp521_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+        EC_GFp_nistp521_method,
+#else
+        0,
+#endif
+        "NIST/SECG curve over a 521 bit prime field" },
 
     /* X9.62 curves */
-    {NID_X9_62_prime192v1, &_EC_NIST_PRIME_192.h, 0,
-     "NIST/X9.62/SECG curve over a 192 bit prime field"},
-    {NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1.h,
-# if defined(ECP_NISTZ256_ASM)
-     EC_GFp_nistz256_method,
-# elif defined(S390X_EC_ASM)
-     EC_GFp_s390x_nistp256_method,
-# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
-     EC_GFp_nistp256_method,
-# else
-     0,
-# endif
-     "X9.62/SECG curve over a 256 bit prime field"},
-
-# ifndef OPENSSL_NO_EC2M
+    { NID_X9_62_prime192v1, &_EC_NIST_PRIME_192.h, 0,
+        "NIST/X9.62/SECG curve over a 192 bit prime field" },
+    { NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1.h,
+#if defined(ECP_NISTZ256_ASM)
+        EC_GFp_nistz256_method,
+#elif defined(S390X_EC_ASM)
+        EC_GFp_s390x_nistp256_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+        EC_GFp_nistp256_method,
+#else
+        0,
+#endif
+        "X9.62/SECG curve over a 256 bit prime field" },
+
+#ifndef OPENSSL_NO_EC2M
     /* characteristic two field curves */
     /* NIST/SECG curves */
-    {NID_sect163k1, &_EC_NIST_CHAR2_163K.h, 0,
-     "NIST/SECG/WTLS curve over a 163 bit binary field"},
-    {NID_sect163r2, &_EC_NIST_CHAR2_163B.h, 0,
-     "NIST/SECG curve over a 163 bit binary field"},
-    {NID_sect233k1, &_EC_NIST_CHAR2_233K.h, 0,
-     "NIST/SECG/WTLS curve over a 233 bit binary field"},
-    {NID_sect233r1, &_EC_NIST_CHAR2_233B.h, 0,
-     "NIST/SECG/WTLS curve over a 233 bit binary field"},
-    {NID_sect283k1, &_EC_NIST_CHAR2_283K.h, 0,
-     "NIST/SECG curve over a 283 bit binary field"},
-    {NID_sect283r1, &_EC_NIST_CHAR2_283B.h, 0,
-     "NIST/SECG curve over a 283 bit binary field"},
-    {NID_sect409k1, &_EC_NIST_CHAR2_409K.h, 0,
-     "NIST/SECG curve over a 409 bit binary field"},
-    {NID_sect409r1, &_EC_NIST_CHAR2_409B.h, 0,
-     "NIST/SECG curve over a 409 bit binary field"},
-    {NID_sect571k1, &_EC_NIST_CHAR2_571K.h, 0,
-     "NIST/SECG curve over a 571 bit binary field"},
-    {NID_sect571r1, &_EC_NIST_CHAR2_571B.h, 0,
-     "NIST/SECG curve over a 571 bit binary field"},
-# endif
+    { NID_sect163k1, &_EC_NIST_CHAR2_163K.h, 0,
+        "NIST/SECG/WTLS curve over a 163 bit binary field" },
+    { NID_sect163r2, &_EC_NIST_CHAR2_163B.h, 0,
+        "NIST/SECG curve over a 163 bit binary field" },
+    { NID_sect233k1, &_EC_NIST_CHAR2_233K.h, 0,
+        "NIST/SECG/WTLS curve over a 233 bit binary field" },
+    { NID_sect233r1, &_EC_NIST_CHAR2_233B.h, 0,
+        "NIST/SECG/WTLS curve over a 233 bit binary field" },
+    { NID_sect283k1, &_EC_NIST_CHAR2_283K.h, 0,
+        "NIST/SECG curve over a 283 bit binary field" },
+    { NID_sect283r1, &_EC_NIST_CHAR2_283B.h, 0,
+        "NIST/SECG curve over a 283 bit binary field" },
+    { NID_sect409k1, &_EC_NIST_CHAR2_409K.h, 0,
+        "NIST/SECG curve over a 409 bit binary field" },
+    { NID_sect409r1, &_EC_NIST_CHAR2_409B.h, 0,
+        "NIST/SECG curve over a 409 bit binary field" },
+    { NID_sect571k1, &_EC_NIST_CHAR2_571K.h, 0,
+        "NIST/SECG curve over a 571 bit binary field" },
+    { NID_sect571r1, &_EC_NIST_CHAR2_571B.h, 0,
+        "NIST/SECG curve over a 571 bit binary field" },
+#endif
 };
 
 #else
@@ -2909,225 +2785,225 @@ static const ec_list_element curve_list[] = {
 static const ec_list_element curve_list[] = {
     /* prime field curves */
     /* secg curves */
-    {NID_secp112r1, &_EC_SECG_PRIME_112R1.h, 0,
-     "SECG/WTLS curve over a 112 bit prime field"},
-    {NID_secp112r2, &_EC_SECG_PRIME_112R2.h, 0,
-     "SECG curve over a 112 bit prime field"},
-    {NID_secp128r1, &_EC_SECG_PRIME_128R1.h, 0,
-     "SECG curve over a 128 bit prime field"},
-    {NID_secp128r2, &_EC_SECG_PRIME_128R2.h, 0,
-     "SECG curve over a 128 bit prime field"},
-    {NID_secp160k1, &_EC_SECG_PRIME_160K1.h, 0,
-     "SECG curve over a 160 bit prime field"},
-    {NID_secp160r1, &_EC_SECG_PRIME_160R1.h, 0,
-     "SECG curve over a 160 bit prime field"},
-    {NID_secp160r2, &_EC_SECG_PRIME_160R2.h, 0,
-     "SECG/WTLS curve over a 160 bit prime field"},
+    { NID_secp112r1, &_EC_SECG_PRIME_112R1.h, 0,
+        "SECG/WTLS curve over a 112 bit prime field" },
+    { NID_secp112r2, &_EC_SECG_PRIME_112R2.h, 0,
+        "SECG curve over a 112 bit prime field" },
+    { NID_secp128r1, &_EC_SECG_PRIME_128R1.h, 0,
+        "SECG curve over a 128 bit prime field" },
+    { NID_secp128r2, &_EC_SECG_PRIME_128R2.h, 0,
+        "SECG curve over a 128 bit prime field" },
+    { NID_secp160k1, &_EC_SECG_PRIME_160K1.h, 0,
+        "SECG curve over a 160 bit prime field" },
+    { NID_secp160r1, &_EC_SECG_PRIME_160R1.h, 0,
+        "SECG curve over a 160 bit prime field" },
+    { NID_secp160r2, &_EC_SECG_PRIME_160R2.h, 0,
+        "SECG/WTLS curve over a 160 bit prime field" },
     /* SECG secp192r1 is the same as X9.62 prime192v1 and hence omitted */
-    {NID_secp192k1, &_EC_SECG_PRIME_192K1.h, 0,
-     "SECG curve over a 192 bit prime field"},
-    {NID_secp224k1, &_EC_SECG_PRIME_224K1.h, 0,
-     "SECG curve over a 224 bit prime field"},
-# ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-    {NID_secp224r1, &_EC_NIST_PRIME_224.h, EC_GFp_nistp224_method,
-     "NIST/SECG curve over a 224 bit prime field"},
-# else
-    {NID_secp224r1, &_EC_NIST_PRIME_224.h, 0,
-     "NIST/SECG curve over a 224 bit prime field"},
-# endif
-    {NID_secp256k1, &_EC_SECG_PRIME_256K1.h, 0,
-     "SECG curve over a 256 bit prime field"},
+    { NID_secp192k1, &_EC_SECG_PRIME_192K1.h, 0,
+        "SECG curve over a 192 bit prime field" },
+    { NID_secp224k1, &_EC_SECG_PRIME_224K1.h, 0,
+        "SECG curve over a 224 bit prime field" },
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+    { NID_secp224r1, &_EC_NIST_PRIME_224.h, EC_GFp_nistp224_method,
+        "NIST/SECG curve over a 224 bit prime field" },
+#else
+    { NID_secp224r1, &_EC_NIST_PRIME_224.h, 0,
+        "NIST/SECG curve over a 224 bit prime field" },
+#endif
+    { NID_secp256k1, &_EC_SECG_PRIME_256K1.h, 0,
+        "SECG curve over a 256 bit prime field" },
     /* SECG secp256r1 is the same as X9.62 prime256v1 and hence omitted */
-    {NID_secp384r1, &_EC_NIST_PRIME_384.h,
-# if defined(S390X_EC_ASM)
-     EC_GFp_s390x_nistp384_method,
-# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
-     ossl_ec_GFp_nistp384_method,
-# else
-     0,
-# endif
-     "NIST/SECG curve over a 384 bit prime field"},
-    {NID_secp521r1, &_EC_NIST_PRIME_521.h,
-# if defined(S390X_EC_ASM)
-     EC_GFp_s390x_nistp521_method,
-# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
-     EC_GFp_nistp521_method,
-# else
-     0,
-# endif
-     "NIST/SECG curve over a 521 bit prime field"},
+    { NID_secp384r1, &_EC_NIST_PRIME_384.h,
+#if defined(S390X_EC_ASM)
+        EC_GFp_s390x_nistp384_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+        ossl_ec_GFp_nistp384_method,
+#else
+        0,
+#endif
+        "NIST/SECG curve over a 384 bit prime field" },
+    { NID_secp521r1, &_EC_NIST_PRIME_521.h,
+#if defined(S390X_EC_ASM)
+        EC_GFp_s390x_nistp521_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+        EC_GFp_nistp521_method,
+#else
+        0,
+#endif
+        "NIST/SECG curve over a 521 bit prime field" },
     /* X9.62 curves */
-    {NID_X9_62_prime192v1, &_EC_NIST_PRIME_192.h, 0,
-     "NIST/X9.62/SECG curve over a 192 bit prime field"},
-    {NID_X9_62_prime192v2, &_EC_X9_62_PRIME_192V2.h, 0,
-     "X9.62 curve over a 192 bit prime field"},
-    {NID_X9_62_prime192v3, &_EC_X9_62_PRIME_192V3.h, 0,
-     "X9.62 curve over a 192 bit prime field"},
-    {NID_X9_62_prime239v1, &_EC_X9_62_PRIME_239V1.h, 0,
-     "X9.62 curve over a 239 bit prime field"},
-    {NID_X9_62_prime239v2, &_EC_X9_62_PRIME_239V2.h, 0,
-     "X9.62 curve over a 239 bit prime field"},
-    {NID_X9_62_prime239v3, &_EC_X9_62_PRIME_239V3.h, 0,
-     "X9.62 curve over a 239 bit prime field"},
-    {NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1.h,
-# if defined(ECP_NISTZ256_ASM)
-     EC_GFp_nistz256_method,
-# elif defined(S390X_EC_ASM)
-     EC_GFp_s390x_nistp256_method,
-# elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
-     EC_GFp_nistp256_method,
-# else
-     0,
-# endif
-     "X9.62/SECG curve over a 256 bit prime field"},
-# ifndef OPENSSL_NO_EC2M
+    { NID_X9_62_prime192v1, &_EC_NIST_PRIME_192.h, 0,
+        "NIST/X9.62/SECG curve over a 192 bit prime field" },
+    { NID_X9_62_prime192v2, &_EC_X9_62_PRIME_192V2.h, 0,
+        "X9.62 curve over a 192 bit prime field" },
+    { NID_X9_62_prime192v3, &_EC_X9_62_PRIME_192V3.h, 0,
+        "X9.62 curve over a 192 bit prime field" },
+    { NID_X9_62_prime239v1, &_EC_X9_62_PRIME_239V1.h, 0,
+        "X9.62 curve over a 239 bit prime field" },
+    { NID_X9_62_prime239v2, &_EC_X9_62_PRIME_239V2.h, 0,
+        "X9.62 curve over a 239 bit prime field" },
+    { NID_X9_62_prime239v3, &_EC_X9_62_PRIME_239V3.h, 0,
+        "X9.62 curve over a 239 bit prime field" },
+    { NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1.h,
+#if defined(ECP_NISTZ256_ASM)
+        EC_GFp_nistz256_method,
+#elif defined(S390X_EC_ASM)
+        EC_GFp_s390x_nistp256_method,
+#elif !defined(OPENSSL_NO_EC_NISTP_64_GCC_128)
+        EC_GFp_nistp256_method,
+#else
+        0,
+#endif
+        "X9.62/SECG curve over a 256 bit prime field" },
+#ifndef OPENSSL_NO_EC2M
     /* characteristic two field curves */
     /* NIST/SECG curves */
-    {NID_sect113r1, &_EC_SECG_CHAR2_113R1.h, 0,
-     "SECG curve over a 113 bit binary field"},
-    {NID_sect113r2, &_EC_SECG_CHAR2_113R2.h, 0,
-     "SECG curve over a 113 bit binary field"},
-    {NID_sect131r1, &_EC_SECG_CHAR2_131R1.h, 0,
-     "SECG/WTLS curve over a 131 bit binary field"},
-    {NID_sect131r2, &_EC_SECG_CHAR2_131R2.h, 0,
-     "SECG curve over a 131 bit binary field"},
-    {NID_sect163k1, &_EC_NIST_CHAR2_163K.h, 0,
-     "NIST/SECG/WTLS curve over a 163 bit binary field"},
-    {NID_sect163r1, &_EC_SECG_CHAR2_163R1.h, 0,
-     "SECG curve over a 163 bit binary field"},
-    {NID_sect163r2, &_EC_NIST_CHAR2_163B.h, 0,
-     "NIST/SECG curve over a 163 bit binary field"},
-    {NID_sect193r1, &_EC_SECG_CHAR2_193R1.h, 0,
-     "SECG curve over a 193 bit binary field"},
-    {NID_sect193r2, &_EC_SECG_CHAR2_193R2.h, 0,
-     "SECG curve over a 193 bit binary field"},
-    {NID_sect233k1, &_EC_NIST_CHAR2_233K.h, 0,
-     "NIST/SECG/WTLS curve over a 233 bit binary field"},
-    {NID_sect233r1, &_EC_NIST_CHAR2_233B.h, 0,
-     "NIST/SECG/WTLS curve over a 233 bit binary field"},
-    {NID_sect239k1, &_EC_SECG_CHAR2_239K1.h, 0,
-     "SECG curve over a 239 bit binary field"},
-    {NID_sect283k1, &_EC_NIST_CHAR2_283K.h, 0,
-     "NIST/SECG curve over a 283 bit binary field"},
-    {NID_sect283r1, &_EC_NIST_CHAR2_283B.h, 0,
-     "NIST/SECG curve over a 283 bit binary field"},
-    {NID_sect409k1, &_EC_NIST_CHAR2_409K.h, 0,
-     "NIST/SECG curve over a 409 bit binary field"},
-    {NID_sect409r1, &_EC_NIST_CHAR2_409B.h, 0,
-     "NIST/SECG curve over a 409 bit binary field"},
-    {NID_sect571k1, &_EC_NIST_CHAR2_571K.h, 0,
-     "NIST/SECG curve over a 571 bit binary field"},
-    {NID_sect571r1, &_EC_NIST_CHAR2_571B.h, 0,
-     "NIST/SECG curve over a 571 bit binary field"},
+    { NID_sect113r1, &_EC_SECG_CHAR2_113R1.h, 0,
+        "SECG curve over a 113 bit binary field" },
+    { NID_sect113r2, &_EC_SECG_CHAR2_113R2.h, 0,
+        "SECG curve over a 113 bit binary field" },
+    { NID_sect131r1, &_EC_SECG_CHAR2_131R1.h, 0,
+        "SECG/WTLS curve over a 131 bit binary field" },
+    { NID_sect131r2, &_EC_SECG_CHAR2_131R2.h, 0,
+        "SECG curve over a 131 bit binary field" },
+    { NID_sect163k1, &_EC_NIST_CHAR2_163K.h, 0,
+        "NIST/SECG/WTLS curve over a 163 bit binary field" },
+    { NID_sect163r1, &_EC_SECG_CHAR2_163R1.h, 0,
+        "SECG curve over a 163 bit binary field" },
+    { NID_sect163r2, &_EC_NIST_CHAR2_163B.h, 0,
+        "NIST/SECG curve over a 163 bit binary field" },
+    { NID_sect193r1, &_EC_SECG_CHAR2_193R1.h, 0,
+        "SECG curve over a 193 bit binary field" },
+    { NID_sect193r2, &_EC_SECG_CHAR2_193R2.h, 0,
+        "SECG curve over a 193 bit binary field" },
+    { NID_sect233k1, &_EC_NIST_CHAR2_233K.h, 0,
+        "NIST/SECG/WTLS curve over a 233 bit binary field" },
+    { NID_sect233r1, &_EC_NIST_CHAR2_233B.h, 0,
+        "NIST/SECG/WTLS curve over a 233 bit binary field" },
+    { NID_sect239k1, &_EC_SECG_CHAR2_239K1.h, 0,
+        "SECG curve over a 239 bit binary field" },
+    { NID_sect283k1, &_EC_NIST_CHAR2_283K.h, 0,
+        "NIST/SECG curve over a 283 bit binary field" },
+    { NID_sect283r1, &_EC_NIST_CHAR2_283B.h, 0,
+        "NIST/SECG curve over a 283 bit binary field" },
+    { NID_sect409k1, &_EC_NIST_CHAR2_409K.h, 0,
+        "NIST/SECG curve over a 409 bit binary field" },
+    { NID_sect409r1, &_EC_NIST_CHAR2_409B.h, 0,
+        "NIST/SECG curve over a 409 bit binary field" },
+    { NID_sect571k1, &_EC_NIST_CHAR2_571K.h, 0,
+        "NIST/SECG curve over a 571 bit binary field" },
+    { NID_sect571r1, &_EC_NIST_CHAR2_571B.h, 0,
+        "NIST/SECG curve over a 571 bit binary field" },
     /* X9.62 curves */
-    {NID_X9_62_c2pnb163v1, &_EC_X9_62_CHAR2_163V1.h, 0,
-     "X9.62 curve over a 163 bit binary field"},
-    {NID_X9_62_c2pnb163v2, &_EC_X9_62_CHAR2_163V2.h, 0,
-     "X9.62 curve over a 163 bit binary field"},
-    {NID_X9_62_c2pnb163v3, &_EC_X9_62_CHAR2_163V3.h, 0,
-     "X9.62 curve over a 163 bit binary field"},
-    {NID_X9_62_c2pnb176v1, &_EC_X9_62_CHAR2_176V1.h, 0,
-     "X9.62 curve over a 176 bit binary field"},
-    {NID_X9_62_c2tnb191v1, &_EC_X9_62_CHAR2_191V1.h, 0,
-     "X9.62 curve over a 191 bit binary field"},
-    {NID_X9_62_c2tnb191v2, &_EC_X9_62_CHAR2_191V2.h, 0,
-     "X9.62 curve over a 191 bit binary field"},
-    {NID_X9_62_c2tnb191v3, &_EC_X9_62_CHAR2_191V3.h, 0,
-     "X9.62 curve over a 191 bit binary field"},
-    {NID_X9_62_c2pnb208w1, &_EC_X9_62_CHAR2_208W1.h, 0,
-     "X9.62 curve over a 208 bit binary field"},
-    {NID_X9_62_c2tnb239v1, &_EC_X9_62_CHAR2_239V1.h, 0,
-     "X9.62 curve over a 239 bit binary field"},
-    {NID_X9_62_c2tnb239v2, &_EC_X9_62_CHAR2_239V2.h, 0,
-     "X9.62 curve over a 239 bit binary field"},
-    {NID_X9_62_c2tnb239v3, &_EC_X9_62_CHAR2_239V3.h, 0,
-     "X9.62 curve over a 239 bit binary field"},
-    {NID_X9_62_c2pnb272w1, &_EC_X9_62_CHAR2_272W1.h, 0,
-     "X9.62 curve over a 272 bit binary field"},
-    {NID_X9_62_c2pnb304w1, &_EC_X9_62_CHAR2_304W1.h, 0,
-     "X9.62 curve over a 304 bit binary field"},
-    {NID_X9_62_c2tnb359v1, &_EC_X9_62_CHAR2_359V1.h, 0,
-     "X9.62 curve over a 359 bit binary field"},
-    {NID_X9_62_c2pnb368w1, &_EC_X9_62_CHAR2_368W1.h, 0,
-     "X9.62 curve over a 368 bit binary field"},
-    {NID_X9_62_c2tnb431r1, &_EC_X9_62_CHAR2_431R1.h, 0,
-     "X9.62 curve over a 431 bit binary field"},
+    { NID_X9_62_c2pnb163v1, &_EC_X9_62_CHAR2_163V1.h, 0,
+        "X9.62 curve over a 163 bit binary field" },
+    { NID_X9_62_c2pnb163v2, &_EC_X9_62_CHAR2_163V2.h, 0,
+        "X9.62 curve over a 163 bit binary field" },
+    { NID_X9_62_c2pnb163v3, &_EC_X9_62_CHAR2_163V3.h, 0,
+        "X9.62 curve over a 163 bit binary field" },
+    { NID_X9_62_c2pnb176v1, &_EC_X9_62_CHAR2_176V1.h, 0,
+        "X9.62 curve over a 176 bit binary field" },
+    { NID_X9_62_c2tnb191v1, &_EC_X9_62_CHAR2_191V1.h, 0,
+        "X9.62 curve over a 191 bit binary field" },
+    { NID_X9_62_c2tnb191v2, &_EC_X9_62_CHAR2_191V2.h, 0,
+        "X9.62 curve over a 191 bit binary field" },
+    { NID_X9_62_c2tnb191v3, &_EC_X9_62_CHAR2_191V3.h, 0,
+        "X9.62 curve over a 191 bit binary field" },
+    { NID_X9_62_c2pnb208w1, &_EC_X9_62_CHAR2_208W1.h, 0,
+        "X9.62 curve over a 208 bit binary field" },
+    { NID_X9_62_c2tnb239v1, &_EC_X9_62_CHAR2_239V1.h, 0,
+        "X9.62 curve over a 239 bit binary field" },
+    { NID_X9_62_c2tnb239v2, &_EC_X9_62_CHAR2_239V2.h, 0,
+        "X9.62 curve over a 239 bit binary field" },
+    { NID_X9_62_c2tnb239v3, &_EC_X9_62_CHAR2_239V3.h, 0,
+        "X9.62 curve over a 239 bit binary field" },
+    { NID_X9_62_c2pnb272w1, &_EC_X9_62_CHAR2_272W1.h, 0,
+        "X9.62 curve over a 272 bit binary field" },
+    { NID_X9_62_c2pnb304w1, &_EC_X9_62_CHAR2_304W1.h, 0,
+        "X9.62 curve over a 304 bit binary field" },
+    { NID_X9_62_c2tnb359v1, &_EC_X9_62_CHAR2_359V1.h, 0,
+        "X9.62 curve over a 359 bit binary field" },
+    { NID_X9_62_c2pnb368w1, &_EC_X9_62_CHAR2_368W1.h, 0,
+        "X9.62 curve over a 368 bit binary field" },
+    { NID_X9_62_c2tnb431r1, &_EC_X9_62_CHAR2_431R1.h, 0,
+        "X9.62 curve over a 431 bit binary field" },
     /*
      * the WAP/WTLS curves [unlike SECG, spec has its own OIDs for curves
      * from X9.62]
      */
-    {NID_wap_wsg_idm_ecid_wtls1, &_EC_WTLS_1.h, 0,
-     "WTLS curve over a 113 bit binary field"},
-    {NID_wap_wsg_idm_ecid_wtls3, &_EC_NIST_CHAR2_163K.h, 0,
-     "NIST/SECG/WTLS curve over a 163 bit binary field"},
-    {NID_wap_wsg_idm_ecid_wtls4, &_EC_SECG_CHAR2_113R1.h, 0,
-     "SECG curve over a 113 bit binary field"},
-    {NID_wap_wsg_idm_ecid_wtls5, &_EC_X9_62_CHAR2_163V1.h, 0,
-     "X9.62 curve over a 163 bit binary field"},
-# endif
-    {NID_wap_wsg_idm_ecid_wtls6, &_EC_SECG_PRIME_112R1.h, 0,
-     "SECG/WTLS curve over a 112 bit prime field"},
-    {NID_wap_wsg_idm_ecid_wtls7, &_EC_SECG_PRIME_160R2.h, 0,
-     "SECG/WTLS curve over a 160 bit prime field"},
-    {NID_wap_wsg_idm_ecid_wtls8, &_EC_WTLS_8.h, 0,
-     "WTLS curve over a 112 bit prime field"},
-    {NID_wap_wsg_idm_ecid_wtls9, &_EC_WTLS_9.h, 0,
-     "WTLS curve over a 160 bit prime field"},
-# ifndef OPENSSL_NO_EC2M
-    {NID_wap_wsg_idm_ecid_wtls10, &_EC_NIST_CHAR2_233K.h, 0,
-     "NIST/SECG/WTLS curve over a 233 bit binary field"},
-    {NID_wap_wsg_idm_ecid_wtls11, &_EC_NIST_CHAR2_233B.h, 0,
-     "NIST/SECG/WTLS curve over a 233 bit binary field"},
-# endif
-    {NID_wap_wsg_idm_ecid_wtls12, &_EC_WTLS_12.h, 0,
-     "WTLS curve over a 224 bit prime field"},
-# ifndef OPENSSL_NO_EC2M
+    { NID_wap_wsg_idm_ecid_wtls1, &_EC_WTLS_1.h, 0,
+        "WTLS curve over a 113 bit binary field" },
+    { NID_wap_wsg_idm_ecid_wtls3, &_EC_NIST_CHAR2_163K.h, 0,
+        "NIST/SECG/WTLS curve over a 163 bit binary field" },
+    { NID_wap_wsg_idm_ecid_wtls4, &_EC_SECG_CHAR2_113R1.h, 0,
+        "SECG curve over a 113 bit binary field" },
+    { NID_wap_wsg_idm_ecid_wtls5, &_EC_X9_62_CHAR2_163V1.h, 0,
+        "X9.62 curve over a 163 bit binary field" },
+#endif
+    { NID_wap_wsg_idm_ecid_wtls6, &_EC_SECG_PRIME_112R1.h, 0,
+        "SECG/WTLS curve over a 112 bit prime field" },
+    { NID_wap_wsg_idm_ecid_wtls7, &_EC_SECG_PRIME_160R2.h, 0,
+        "SECG/WTLS curve over a 160 bit prime field" },
+    { NID_wap_wsg_idm_ecid_wtls8, &_EC_WTLS_8.h, 0,
+        "WTLS curve over a 112 bit prime field" },
+    { NID_wap_wsg_idm_ecid_wtls9, &_EC_WTLS_9.h, 0,
+        "WTLS curve over a 160 bit prime field" },
+#ifndef OPENSSL_NO_EC2M
+    { NID_wap_wsg_idm_ecid_wtls10, &_EC_NIST_CHAR2_233K.h, 0,
+        "NIST/SECG/WTLS curve over a 233 bit binary field" },
+    { NID_wap_wsg_idm_ecid_wtls11, &_EC_NIST_CHAR2_233B.h, 0,
+        "NIST/SECG/WTLS curve over a 233 bit binary field" },
+#endif
+    { NID_wap_wsg_idm_ecid_wtls12, &_EC_WTLS_12.h, 0,
+        "WTLS curve over a 224 bit prime field" },
+#ifndef OPENSSL_NO_EC2M
     /* IPSec curves */
-    {NID_ipsec3, &_EC_IPSEC_155_ID3.h, 0,
-     "\n\tIPSec/IKE/Oakley curve #3 over a 155 bit binary field.\n"
-     "\tNot suitable for ECDSA.\n\tQuestionable extension field!"},
-    {NID_ipsec4, &_EC_IPSEC_185_ID4.h, 0,
-     "\n\tIPSec/IKE/Oakley curve #4 over a 185 bit binary field.\n"
-     "\tNot suitable for ECDSA.\n\tQuestionable extension field!"},
-# endif
+    { NID_ipsec3, &_EC_IPSEC_155_ID3.h, 0,
+        "\n\tIPSec/IKE/Oakley curve #3 over a 155 bit binary field.\n"
+        "\tNot suitable for ECDSA.\n\tQuestionable extension field!" },
+    { NID_ipsec4, &_EC_IPSEC_185_ID4.h, 0,
+        "\n\tIPSec/IKE/Oakley curve #4 over a 185 bit binary field.\n"
+        "\tNot suitable for ECDSA.\n\tQuestionable extension field!" },
+#endif
     /* brainpool curves */
-    {NID_brainpoolP160r1, &_EC_brainpoolP160r1.h, 0,
-     "RFC 5639 curve over a 160 bit prime field"},
-    {NID_brainpoolP160t1, &_EC_brainpoolP160t1.h, 0,
-     "RFC 5639 curve over a 160 bit prime field"},
-    {NID_brainpoolP192r1, &_EC_brainpoolP192r1.h, 0,
-     "RFC 5639 curve over a 192 bit prime field"},
-    {NID_brainpoolP192t1, &_EC_brainpoolP192t1.h, 0,
-     "RFC 5639 curve over a 192 bit prime field"},
-    {NID_brainpoolP224r1, &_EC_brainpoolP224r1.h, 0,
-     "RFC 5639 curve over a 224 bit prime field"},
-    {NID_brainpoolP224t1, &_EC_brainpoolP224t1.h, 0,
-     "RFC 5639 curve over a 224 bit prime field"},
-    {NID_brainpoolP256r1, &_EC_brainpoolP256r1.h, 0,
-     "RFC 5639 curve over a 256 bit prime field"},
-    {NID_brainpoolP256t1, &_EC_brainpoolP256t1.h, 0,
-     "RFC 5639 curve over a 256 bit prime field"},
-    {NID_brainpoolP320r1, &_EC_brainpoolP320r1.h, 0,
-     "RFC 5639 curve over a 320 bit prime field"},
-    {NID_brainpoolP320t1, &_EC_brainpoolP320t1.h, 0,
-     "RFC 5639 curve over a 320 bit prime field"},
-    {NID_brainpoolP384r1, &_EC_brainpoolP384r1.h, 0,
-     "RFC 5639 curve over a 384 bit prime field"},
-    {NID_brainpoolP384t1, &_EC_brainpoolP384t1.h, 0,
-     "RFC 5639 curve over a 384 bit prime field"},
-    {NID_brainpoolP512r1, &_EC_brainpoolP512r1.h, 0,
-     "RFC 5639 curve over a 512 bit prime field"},
-    {NID_brainpoolP512t1, &_EC_brainpoolP512t1.h, 0,
-     "RFC 5639 curve over a 512 bit prime field"},
+    { NID_brainpoolP160r1, &_EC_brainpoolP160r1.h, 0,
+        "RFC 5639 curve over a 160 bit prime field" },
+    { NID_brainpoolP160t1, &_EC_brainpoolP160t1.h, 0,
+        "RFC 5639 curve over a 160 bit prime field" },
+    { NID_brainpoolP192r1, &_EC_brainpoolP192r1.h, 0,
+        "RFC 5639 curve over a 192 bit prime field" },
+    { NID_brainpoolP192t1, &_EC_brainpoolP192t1.h, 0,
+        "RFC 5639 curve over a 192 bit prime field" },
+    { NID_brainpoolP224r1, &_EC_brainpoolP224r1.h, 0,
+        "RFC 5639 curve over a 224 bit prime field" },
+    { NID_brainpoolP224t1, &_EC_brainpoolP224t1.h, 0,
+        "RFC 5639 curve over a 224 bit prime field" },
+    { NID_brainpoolP256r1, &_EC_brainpoolP256r1.h, 0,
+        "RFC 5639 curve over a 256 bit prime field" },
+    { NID_brainpoolP256t1, &_EC_brainpoolP256t1.h, 0,
+        "RFC 5639 curve over a 256 bit prime field" },
+    { NID_brainpoolP320r1, &_EC_brainpoolP320r1.h, 0,
+        "RFC 5639 curve over a 320 bit prime field" },
+    { NID_brainpoolP320t1, &_EC_brainpoolP320t1.h, 0,
+        "RFC 5639 curve over a 320 bit prime field" },
+    { NID_brainpoolP384r1, &_EC_brainpoolP384r1.h, 0,
+        "RFC 5639 curve over a 384 bit prime field" },
+    { NID_brainpoolP384t1, &_EC_brainpoolP384t1.h, 0,
+        "RFC 5639 curve over a 384 bit prime field" },
+    { NID_brainpoolP512r1, &_EC_brainpoolP512r1.h, 0,
+        "RFC 5639 curve over a 512 bit prime field" },
+    { NID_brainpoolP512t1, &_EC_brainpoolP512t1.h, 0,
+        "RFC 5639 curve over a 512 bit prime field" },
 #ifndef OPENSSL_NO_SM2
-    {NID_sm2, &_EC_sm2p256v1.h,
-# ifdef ECP_SM2P256_ASM
-     EC_GFp_sm2p256_method,
-# else
-     0,
-# endif
-     "SM2 curve over a 256 bit prime field"},
-# endif
+    { NID_sm2, &_EC_sm2p256v1.h,
+#ifdef ECP_SM2P256_ASM
+        EC_GFp_sm2p256_method,
+#else
+        0,
+#endif
+        "SM2 curve over a 256 bit prime field" },
+#endif
 };
 #endif /* FIPS_MODULE */
 
@@ -3148,14 +3024,13 @@ static const ec_list_element *ec_curve_nid2curve(int nid)
 }
 
 static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
-                                        const char *propq,
-                                        const ec_list_element curve)
+    const char *propq,
+    const ec_list_element curve)
 {
     EC_GROUP *group = NULL;
     EC_POINT *P = NULL;
     BN_CTX *ctx = NULL;
-    BIGNUM *p = NULL, *a = NULL, *b = NULL, *x = NULL, *y = NULL, *order =
-        NULL;
+    BIGNUM *p = NULL, *a = NULL, *b = NULL, *x = NULL, *y = NULL, *order = NULL;
     int ok = 0;
     int seed_len, param_len;
     const EC_METHOD *meth;
@@ -3165,7 +3040,7 @@ static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
     /* If no curve data curve method must handle everything */
     if (curve.data == NULL)
         return ossl_ec_group_new_ex(libctx, propq,
-                                    curve.meth != NULL ? curve.meth() : NULL);
+            curve.meth != NULL ? curve.meth() : NULL);
 
     if ((ctx = BN_CTX_new_ex(libctx)) == NULL) {
         ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
@@ -3184,7 +3059,7 @@ static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
             goto err;
         }
         if (group->meth->group_full_init != NULL) {
-            if (!group->meth->group_full_init(group, params)){
+            if (!group->meth->group_full_init(group, params)) {
                 ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
                 goto err;
             }
@@ -3194,7 +3069,7 @@ static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
         }
     }
 
-    params += seed_len;         /* skip seed */
+    params += seed_len; /* skip seed */
 
     if ((p = BN_bin2bn(params + 0 * param_len, param_len, NULL)) == NULL
         || (a = BN_bin2bn(params + 1 * param_len, param_len, NULL)) == NULL
@@ -3215,8 +3090,8 @@ static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
         }
     }
 #ifndef OPENSSL_NO_EC2M
-    else {                      /* field_type ==
-                                 * NID_X9_62_characteristic_two_field */
+    else { /* field_type ==
+            * NID_X9_62_characteristic_two_field */
 
         if ((group = EC_GROUP_new_curve_GF2m(p, a, b, ctx)) == NULL) {
             ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
@@ -3294,7 +3169,7 @@ static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
 #endif
 
     ok = 1;
- err:
+err:
     if (!ok) {
         EC_GROUP_free(group);
         group = NULL;
@@ -3311,7 +3186,7 @@ static EC_GROUP *ec_group_new_from_data(OSSL_LIB_CTX *libctx,
 }
 
 EC_GROUP *EC_GROUP_new_by_curve_name_ex(OSSL_LIB_CTX *libctx, const char *propq,
-                                        int nid)
+    int nid)
 {
     EC_GROUP *ret = NULL;
     const ec_list_element *curve;
@@ -3320,7 +3195,7 @@ EC_GROUP *EC_GROUP_new_by_curve_name_ex(OSSL_LIB_CTX *libctx, const char *propq,
         || (ret = ec_group_new_from_data(libctx, propq, *curve)) == NULL) {
 #ifndef FIPS_MODULE
         ERR_raise_data(ERR_LIB_EC, EC_R_UNKNOWN_GROUP,
-                       "name=%s", OBJ_nid2sn(nid));
+            "name=%s", OBJ_nid2sn(nid));
 #else
         ERR_raise(ERR_LIB_EC, EC_R_UNKNOWN_GROUP);
 #endif
@@ -3383,7 +3258,7 @@ int ossl_ec_curve_nid_from_params(const EC_GROUP *group, BN_CTX *ctx)
     const EC_POINT *generator = NULL;
     const BIGNUM *cofactor = NULL;
     /* An array of BIGNUMs for (p, a, b, x, y, order) */
-    BIGNUM *bn[NUM_BN_FIELDS] = {NULL, NULL, NULL, NULL, NULL, NULL};
+    BIGNUM *bn[NUM_BN_FIELDS] = { NULL, NULL, NULL, NULL, NULL, NULL };
 
     /* Use the optional named curve nid as a search field */
     nid = EC_GROUP_get_curve_name(group);
@@ -3421,20 +3296,20 @@ int ossl_ec_curve_nid_from_params(const EC_GROUP *group, BN_CTX *ctx)
      */
     /* Get p, a & b */
     if (!(EC_GROUP_get_curve(group, bn[0], bn[1], bn[2], ctx)
-        && ((generator = EC_GROUP_get0_generator(group)) != NULL)
-        /* Get x & y */
-        && EC_POINT_get_affine_coordinates(group, generator, bn[3], bn[4], ctx)
-        /* Get order */
-        && EC_GROUP_get_order(group, bn[5], ctx)))
+            && ((generator = EC_GROUP_get0_generator(group)) != NULL)
+            /* Get x & y */
+            && EC_POINT_get_affine_coordinates(group, generator, bn[3], bn[4], ctx)
+            /* Get order */
+            && EC_GROUP_get_order(group, bn[5], ctx)))
         goto end;
 
-   /*
+    /*
      * Convert the bignum array to bytes that are joined together to form
      * a single buffer that contains data for all fields.
      * (p, a, b, x, y, order) are all zero padded to be the same size.
      */
     for (i = 0; i < NUM_BN_FIELDS; ++i) {
-        if (BN_bn2binpad(bn[i], &param_bytes[i*param_len], param_len) <= 0)
+        if (BN_bn2binpad(bn[i], &param_bytes[i * param_len], param_len) <= 0)
             goto end;
     }
 
@@ -3451,15 +3326,15 @@ int ossl_ec_curve_nid_from_params(const EC_GROUP *group, BN_CTX *ctx)
             && param_len == data->param_len
             && (nid <= 0 || nid == curve.nid)
             /* check the optional cofactor (ignore if its zero) */
-            && (BN_is_zero(cofactor)
+            && (cofactor == NULL || BN_is_zero(cofactor)
                 || BN_is_word(cofactor, (const BN_ULONG)curve.data->cofactor))
             /* Check the optional seed (ignore if its not set) */
             && (data->seed_len == 0 || seed_len == 0
                 || ((size_t)data->seed_len == seed_len
-                     && memcmp(params_seed, seed, seed_len) == 0))
+                    && memcmp(params_seed, seed, seed_len) == 0))
             /* Check that the groups params match the built-in curve params */
             && memcmp(param_bytes, params, param_len * NUM_BN_FIELDS)
-                             == 0) {
+                == 0) {
             ret = curve.nid;
             goto end;
         }
diff --git a/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c
index 1145bfb68f90d..77f9209108950 100644
--- a/crypto/ec/ec_cvt.c
+++ b/crypto/ec/ec_cvt.c
@@ -19,7 +19,7 @@
 #include "ec_local.h"
 
 EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
-                                 const BIGNUM *b, BN_CTX *ctx)
+    const BIGNUM *b, BN_CTX *ctx)
 {
     const EC_METHOD *meth;
     EC_GROUP *ret;
@@ -68,7 +68,7 @@ EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
 
 #ifndef OPENSSL_NO_EC2M
 EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a,
-                                  const BIGNUM *b, BN_CTX *ctx)
+    const BIGNUM *b, BN_CTX *ctx)
 {
     const EC_METHOD *meth;
     EC_GROUP *ret;
diff --git a/crypto/ec/ec_deprecated.c b/crypto/ec/ec_deprecated.c
index 905b560638350..c05785e0df508 100644
--- a/crypto/ec/ec_deprecated.c
+++ b/crypto/ec/ec_deprecated.c
@@ -19,9 +19,9 @@
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 BIGNUM *EC_POINT_point2bn(const EC_GROUP *group,
-                          const EC_POINT *point,
-                          point_conversion_form_t form,
-                          BIGNUM *ret, BN_CTX *ctx)
+    const EC_POINT *point,
+    point_conversion_form_t form,
+    BIGNUM *ret, BN_CTX *ctx)
 {
     size_t buf_len = 0;
     unsigned char *buf;
@@ -39,7 +39,7 @@ BIGNUM *EC_POINT_point2bn(const EC_GROUP *group,
 }
 
 EC_POINT *EC_POINT_bn2point(const EC_GROUP *group,
-                            const BIGNUM *bn, EC_POINT *point, BN_CTX *ctx)
+    const BIGNUM *bn, EC_POINT *point, BN_CTX *ctx)
 {
     size_t buf_len = 0;
     unsigned char *buf;
diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c
index 480376686b9e7..4e3152d0df6b0 100644
--- a/crypto/ec/ec_err.c
+++ b/crypto/ec/ec_err.c
@@ -14,121 +14,121 @@
 
 #ifndef OPENSSL_NO_EC
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA EC_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_ASN1_ERROR), "asn1 error"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_BAD_SIGNATURE), "bad signature"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_BIGNUM_OUT_OF_RANGE), "bignum out of range"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_BUFFER_TOO_SMALL), "buffer too small"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_CANNOT_INVERT), "cannot invert"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_COORDINATES_OUT_OF_RANGE),
-    "coordinates out of range"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_CURVE_DOES_NOT_SUPPORT_ECDH),
-    "curve does not support ecdh"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA),
-    "curve does not support ecdsa"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_CURVE_DOES_NOT_SUPPORT_SIGNING),
-    "curve does not support signing"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_DECODE_ERROR), "decode error"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_DISCRIMINANT_IS_ZERO),
-    "discriminant is zero"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_EC_GROUP_NEW_BY_NAME_FAILURE),
-    "ec group new by name failure"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_EXPLICIT_PARAMS_NOT_SUPPORTED),
-    "explicit params not supported"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_FAILED_MAKING_PUBLIC_KEY),
-    "failed making public key"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_FIELD_TOO_LARGE), "field too large"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_GF2M_NOT_SUPPORTED), "gf2m not supported"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_GROUP2PKPARAMETERS_FAILURE),
-    "group2pkparameters failure"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_I2D_ECPKPARAMETERS_FAILURE),
-    "i2d ecpkparameters failure"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INCOMPATIBLE_OBJECTS),
-    "incompatible objects"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_A), "invalid a"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_ARGUMENT), "invalid argument"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_B), "invalid b"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_COFACTOR), "invalid cofactor"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_COMPRESSED_POINT),
-    "invalid compressed point"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_COMPRESSION_BIT),
-    "invalid compression bit"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_CURVE), "invalid curve"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_DIGEST), "invalid digest"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_DIGEST_TYPE), "invalid digest type"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_ENCODING), "invalid encoding"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_FIELD), "invalid field"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_FORM), "invalid form"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_GENERATOR), "invalid generator"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_GROUP_ORDER), "invalid group order"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_KEY), "invalid key"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_LENGTH), "invalid length"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_NAMED_GROUP_CONVERSION),
-    "invalid named group conversion"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_OUTPUT_LENGTH),
-    "invalid output length"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_P), "invalid p"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_PEER_KEY), "invalid peer key"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_PENTANOMIAL_BASIS),
-    "invalid pentanomial basis"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_PRIVATE_KEY), "invalid private key"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_SEED), "invalid seed"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_TRINOMIAL_BASIS),
-    "invalid trinomial basis"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_KDF_PARAMETER_ERROR), "kdf parameter error"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_KEYS_NOT_SET), "keys not set"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_LADDER_POST_FAILURE), "ladder post failure"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_LADDER_PRE_FAILURE), "ladder pre failure"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_LADDER_STEP_FAILURE), "ladder step failure"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_MISSING_OID), "missing OID"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_MISSING_PARAMETERS), "missing parameters"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_MISSING_PRIVATE_KEY), "missing private key"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_NEED_NEW_SETUP_VALUES),
-    "need new setup values"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_NOT_A_NIST_PRIME), "not a NIST prime"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_NOT_IMPLEMENTED), "not implemented"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_NOT_INITIALIZED), "not initialized"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_NO_PARAMETERS_SET), "no parameters set"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_NO_PRIVATE_VALUE), "no private value"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_OPERATION_NOT_SUPPORTED),
-    "operation not supported"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_PASSED_NULL_PARAMETER),
-    "passed null parameter"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_PEER_KEY_ERROR), "peer key error"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_ARITHMETIC_FAILURE),
-    "point arithmetic failure"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_AT_INFINITY), "point at infinity"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_COORDINATES_BLIND_FAILURE),
-    "point coordinates blind failure"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_IS_NOT_ON_CURVE),
-    "point is not on curve"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_RANDOM_NUMBER_GENERATION_FAILED),
-    "random number generation failed"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_SHARED_INFO_ERROR), "shared info error"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_SLOT_FULL), "slot full"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_TOO_MANY_RETRIES), "too many retries"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_UNDEFINED_GENERATOR), "undefined generator"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_UNDEFINED_ORDER), "undefined order"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_UNKNOWN_COFACTOR), "unknown cofactor"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_UNKNOWN_GROUP), "unknown group"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_UNKNOWN_ORDER), "unknown order"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_UNSUPPORTED_FIELD), "unsupported field"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_WRONG_CURVE_PARAMETERS),
-    "wrong curve parameters"},
-    {ERR_PACK(ERR_LIB_EC, 0, EC_R_WRONG_ORDER), "wrong order"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_ASN1_ERROR), "asn1 error" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_BAD_SIGNATURE), "bad signature" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_BIGNUM_OUT_OF_RANGE), "bignum out of range" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_BUFFER_TOO_SMALL), "buffer too small" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_CANNOT_INVERT), "cannot invert" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_COORDINATES_OUT_OF_RANGE),
+        "coordinates out of range" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_CURVE_DOES_NOT_SUPPORT_ECDH),
+        "curve does not support ecdh" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA),
+        "curve does not support ecdsa" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_CURVE_DOES_NOT_SUPPORT_SIGNING),
+        "curve does not support signing" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_DECODE_ERROR), "decode error" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_DISCRIMINANT_IS_ZERO),
+        "discriminant is zero" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_EC_GROUP_NEW_BY_NAME_FAILURE),
+        "ec group new by name failure" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_EXPLICIT_PARAMS_NOT_SUPPORTED),
+        "explicit params not supported" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_FAILED_MAKING_PUBLIC_KEY),
+        "failed making public key" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_FIELD_TOO_LARGE), "field too large" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_GF2M_NOT_SUPPORTED), "gf2m not supported" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_GROUP2PKPARAMETERS_FAILURE),
+        "group2pkparameters failure" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_I2D_ECPKPARAMETERS_FAILURE),
+        "i2d ecpkparameters failure" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INCOMPATIBLE_OBJECTS),
+        "incompatible objects" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_A), "invalid a" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_ARGUMENT), "invalid argument" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_B), "invalid b" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_COFACTOR), "invalid cofactor" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_COMPRESSED_POINT),
+        "invalid compressed point" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_COMPRESSION_BIT),
+        "invalid compression bit" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_CURVE), "invalid curve" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_DIGEST), "invalid digest" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_DIGEST_TYPE), "invalid digest type" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_ENCODING), "invalid encoding" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_FIELD), "invalid field" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_FORM), "invalid form" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_GENERATOR), "invalid generator" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_GROUP_ORDER), "invalid group order" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_KEY), "invalid key" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_LENGTH), "invalid length" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_NAMED_GROUP_CONVERSION),
+        "invalid named group conversion" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_OUTPUT_LENGTH),
+        "invalid output length" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_P), "invalid p" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_PEER_KEY), "invalid peer key" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_PENTANOMIAL_BASIS),
+        "invalid pentanomial basis" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_PRIVATE_KEY), "invalid private key" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_SEED), "invalid seed" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_INVALID_TRINOMIAL_BASIS),
+        "invalid trinomial basis" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_KDF_PARAMETER_ERROR), "kdf parameter error" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_KEYS_NOT_SET), "keys not set" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_LADDER_POST_FAILURE), "ladder post failure" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_LADDER_PRE_FAILURE), "ladder pre failure" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_LADDER_STEP_FAILURE), "ladder step failure" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_MISSING_OID), "missing OID" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_MISSING_PARAMETERS), "missing parameters" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_MISSING_PRIVATE_KEY), "missing private key" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_NEED_NEW_SETUP_VALUES),
+        "need new setup values" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_NOT_A_NIST_PRIME), "not a NIST prime" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_NOT_IMPLEMENTED), "not implemented" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_NOT_INITIALIZED), "not initialized" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_NO_PARAMETERS_SET), "no parameters set" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_NO_PRIVATE_VALUE), "no private value" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_OPERATION_NOT_SUPPORTED),
+        "operation not supported" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_PASSED_NULL_PARAMETER),
+        "passed null parameter" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_PEER_KEY_ERROR), "peer key error" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_ARITHMETIC_FAILURE),
+        "point arithmetic failure" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_AT_INFINITY), "point at infinity" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_COORDINATES_BLIND_FAILURE),
+        "point coordinates blind failure" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_POINT_IS_NOT_ON_CURVE),
+        "point is not on curve" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_RANDOM_NUMBER_GENERATION_FAILED),
+        "random number generation failed" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_SHARED_INFO_ERROR), "shared info error" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_SLOT_FULL), "slot full" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_TOO_MANY_RETRIES), "too many retries" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_UNDEFINED_GENERATOR), "undefined generator" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_UNDEFINED_ORDER), "undefined order" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_UNKNOWN_COFACTOR), "unknown cofactor" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_UNKNOWN_GROUP), "unknown group" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_UNKNOWN_ORDER), "unknown order" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_UNSUPPORTED_FIELD), "unsupported field" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_WRONG_CURVE_PARAMETERS),
+        "wrong curve parameters" },
+    { ERR_PACK(ERR_LIB_EC, 0, EC_R_WRONG_ORDER), "wrong order" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_EC_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(EC_str_reasons[0].error) == NULL)
         ERR_load_strings_const(EC_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c
index a3907ca5994dc..8723ead41e0e7 100644
--- a/crypto/ec/ec_key.c
+++ b/crypto/ec/ec_key.c
@@ -20,7 +20,7 @@
 #include "internal/refcount.h"
 #include <openssl/err.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include <openssl/self_test.h>
 #include "prov/providercommon.h"
@@ -28,7 +28,7 @@
 #include "crypto/bn.h"
 
 static int ecdsa_keygen_pairwise_test(EC_KEY *eckey, OSSL_CALLBACK *cb,
-                                      void *cbarg);
+    void *cbarg);
 
 #ifndef FIPS_MODULE
 EC_KEY *EC_KEY_new(void)
@@ -43,7 +43,7 @@ EC_KEY *EC_KEY_new_ex(OSSL_LIB_CTX *ctx, const char *propq)
 }
 
 EC_KEY *EC_KEY_new_by_curve_name_ex(OSSL_LIB_CTX *ctx, const char *propq,
-                                    int nid)
+    int nid)
 {
     EC_KEY *ret = EC_KEY_new_ex(ctx, propq);
     if (ret == NULL)
@@ -126,7 +126,7 @@ EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
         /* clear the old group */
         EC_GROUP_free(dest->group);
         dest->group = ossl_ec_group_new_ex(src->libctx, src->propq,
-                                           src->group->meth);
+            src->group->meth);
         if (dest->group == NULL)
             return NULL;
         if (!EC_GROUP_copy(dest->group, src->group))
@@ -156,7 +156,6 @@ EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
         }
     }
 
-
     /* copy the rest */
     dest->enc_flag = src->enc_flag;
     dest->conv_form = src->conv_form;
@@ -164,7 +163,7 @@ EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
     dest->flags = src->flags;
 #ifndef FIPS_MODULE
     if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_EC_KEY,
-                            &dest->ex_data, &src->ex_data))
+            &dest->ex_data, &src->ex_data))
         return NULL;
 #endif
 
@@ -251,11 +250,11 @@ int ossl_ec_key_gen(EC_KEY *eckey)
  * the comparison of the original public key to a newly calculated public key.
  */
 static int ecdsa_keygen_knownanswer_test(EC_KEY *eckey, BN_CTX *ctx,
-                                         OSSL_CALLBACK *cb, void *cbarg)
+    OSSL_CALLBACK *cb, void *cbarg)
 {
     int len, ret = 0;
     OSSL_SELF_TEST *st = NULL;
-    unsigned char bytes[512] = {0};
+    unsigned char bytes[512] = { 0 };
     EC_POINT *pub_key2 = NULL;
 
     st = OSSL_SELF_TEST_new(cb, cbarg);
@@ -263,7 +262,7 @@ static int ecdsa_keygen_knownanswer_test(EC_KEY *eckey, BN_CTX *ctx,
         return 0;
 
     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT_KAT,
-                               OSSL_SELF_TEST_DESC_PCT_ECDSA);
+        OSSL_SELF_TEST_DESC_PCT_ECDSA);
 
     if ((pub_key2 = EC_POINT_new(eckey->group)) == NULL)
         goto err;
@@ -276,7 +275,7 @@ static int ecdsa_keygen_knownanswer_test(EC_KEY *eckey, BN_CTX *ctx,
         goto err;
     len = BN_bn2bin(pub_key2->X, bytes);
     if (OSSL_SELF_TEST_oncorrupt_byte(st, bytes)
-            && BN_bin2bn(bytes, len, pub_key2->X) == NULL)
+        && BN_bin2bn(bytes, len, pub_key2->X) == NULL)
         goto err;
     ret = !EC_POINT_cmp(eckey->group, eckey->pub_key, pub_key2, ctx);
 
@@ -353,7 +352,7 @@ static int ec_generate_key(EC_KEY *eckey, int pairwise_test)
     do
         if (!BN_priv_rand_range_ex(priv_key, order, 0, ctx))
             goto err;
-    while (BN_is_zero(priv_key)) ;
+    while (BN_is_zero(priv_key));
 
     if (eckey->pub_key == NULL) {
         pub_key = EC_POINT_new(group);
@@ -384,7 +383,7 @@ static int ec_generate_key(EC_KEY *eckey, int pairwise_test)
 
         OSSL_SELF_TEST_get_callback(eckey->libctx, &cb, &cbarg);
         ok = ecdsa_keygen_pairwise_test(eckey, cb, cbarg)
-             && ecdsa_keygen_knownanswer_test(eckey, ctx, cb, cbarg);
+            && ecdsa_keygen_knownanswer_test(eckey, ctx, cb, cbarg);
     }
 err:
     /* Step (9): If there is an error return an invalid keypair. */
@@ -408,7 +407,7 @@ static int ec_generate_key(EC_KEY *eckey, int pairwise_test)
  * derive the private key.
  */
 int ossl_ec_generate_key_dhkem(EC_KEY *eckey,
-                               const unsigned char *ikm, size_t ikmlen)
+    const unsigned char *ikm, size_t ikmlen)
 {
     int ok = 0;
 
@@ -457,7 +456,7 @@ int ossl_ec_key_simple_generate_public_key(EC_KEY *eckey)
      * pub_key = priv_key * G (where G is a point on the curve)
      */
     ret = EC_POINT_mul(eckey->group, eckey->pub_key, eckey->priv_key, NULL,
-                       NULL, ctx);
+        NULL, ctx);
 
     BN_CTX_free(ctx);
     if (ret == 1)
@@ -627,9 +626,9 @@ int ossl_ec_key_pairwise_check(const EC_KEY *eckey, BN_CTX *ctx)
     EC_POINT *point = NULL;
 
     if (eckey == NULL
-       || eckey->group == NULL
-       || eckey->pub_key == NULL
-       || eckey->priv_key == NULL) {
+        || eckey->group == NULL
+        || eckey->pub_key == NULL
+        || eckey->priv_key == NULL) {
         ERR_raise(ERR_LIB_EC, ERR_R_PASSED_NULL_PARAMETER);
         return 0;
     }
@@ -638,7 +637,6 @@ int ossl_ec_key_pairwise_check(const EC_KEY *eckey, BN_CTX *ctx)
     if (point == NULL)
         goto err;
 
-
     if (!EC_POINT_mul(eckey->group, point, eckey->priv_key, NULL, NULL, ctx)) {
         ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
         goto err;
@@ -653,7 +651,6 @@ int ossl_ec_key_pairwise_check(const EC_KEY *eckey, BN_CTX *ctx)
     return ret;
 }
 
-
 /*
  * ECC Key validation as specified in SP800-56A R3.
  *    Section 5.6.2.3.3 ECC Full Public-Key Validation
@@ -691,7 +688,7 @@ int ossl_ec_key_simple_check_key(const EC_KEY *eckey)
 }
 
 int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
-                                             BIGNUM *y)
+    BIGNUM *y)
 {
     BN_CTX *ctx = NULL;
     BIGNUM *tx, *ty;
@@ -740,12 +737,11 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
 
     ok = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     EC_POINT_free(point);
     return ok;
-
 }
 
 OSSL_LIB_CTX *ossl_ec_key_get_libctx(const EC_KEY *key)
@@ -960,7 +956,7 @@ int EC_KEY_decoded_from_explicit_params(const EC_KEY *key)
 }
 
 size_t EC_KEY_key2buf(const EC_KEY *key, point_conversion_form_t form,
-                        unsigned char **pbuf, BN_CTX *ctx)
+    unsigned char **pbuf, BN_CTX *ctx)
 {
     if (key == NULL || key->pub_key == NULL || key->group == NULL)
         return 0;
@@ -968,7 +964,7 @@ size_t EC_KEY_key2buf(const EC_KEY *key, point_conversion_form_t form,
 }
 
 int EC_KEY_oct2key(EC_KEY *key, const unsigned char *buf, size_t len,
-                   BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (key == NULL || key->group == NULL)
         return 0;
@@ -992,7 +988,7 @@ int EC_KEY_oct2key(EC_KEY *key, const unsigned char *buf, size_t len,
 }
 
 size_t EC_KEY_priv2oct(const EC_KEY *eckey,
-                       unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     if (eckey->group == NULL || eckey->group->meth == NULL)
         return 0;
@@ -1005,7 +1001,7 @@ size_t EC_KEY_priv2oct(const EC_KEY *eckey,
 }
 
 size_t ossl_ec_key_simple_priv2oct(const EC_KEY *eckey,
-                                   unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     size_t buf_len;
 
@@ -1044,7 +1040,7 @@ int EC_KEY_oct2priv(EC_KEY *eckey, const unsigned char *buf, size_t len)
 }
 
 int ossl_ec_key_simple_oct2priv(EC_KEY *eckey, const unsigned char *buf,
-                                size_t len)
+    size_t len)
 {
     if (eckey->priv_key == NULL)
         eckey->priv_key = BN_secure_new();
@@ -1097,10 +1093,10 @@ int EC_KEY_can_sign(const EC_KEY *eckey)
  * omitted here.
  */
 static int ecdsa_keygen_pairwise_test(EC_KEY *eckey, OSSL_CALLBACK *cb,
-                                      void *cbarg)
+    void *cbarg)
 {
     int ret = 0;
-    unsigned char dgst[16] = {0};
+    unsigned char dgst[16] = { 0 };
     int dgst_len = (int)sizeof(dgst);
     ECDSA_SIG *sig = NULL;
     OSSL_SELF_TEST *st = NULL;
@@ -1110,7 +1106,7 @@ static int ecdsa_keygen_pairwise_test(EC_KEY *eckey, OSSL_CALLBACK *cb,
         return 0;
 
     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
-                           OSSL_SELF_TEST_DESC_PCT_ECDSA);
+        OSSL_SELF_TEST_DESC_PCT_ECDSA);
 
     sig = ECDSA_do_sign(dgst, dgst_len, eckey);
     if (sig == NULL)
diff --git a/crypto/ec/ec_kmeth.c b/crypto/ec/ec_kmeth.c
index 054a3333a78f1..1e712f84e53e3 100644
--- a/crypto/ec/ec_kmeth.c
+++ b/crypto/ec/ec_kmeth.c
@@ -16,16 +16,15 @@
 #include <string.h>
 #include <openssl/ec.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include <openssl/err.h>
 #include "ec_local.h"
 
-
 static const EC_KEY_METHOD openssl_ec_key_method = {
     "OpenSSL EC_KEY method",
     0,
-    0,0,0,0,0,0,
+    0, 0, 0, 0, 0, 0,
     ossl_ec_key_gen,
     ossl_ecdh_compute_key,
     ossl_ecdsa_sign,
@@ -79,7 +78,7 @@ int EC_KEY_set_method(EC_KEY *key, const EC_KEY_METHOD *meth)
 }
 
 EC_KEY *ossl_ec_key_new_method_int(OSSL_LIB_CTX *libctx, const char *propq,
-                                   ENGINE *engine)
+    ENGINE *engine)
 {
     EC_KEY *ret = OPENSSL_zalloc(sizeof(*ret));
 
@@ -134,7 +133,7 @@ EC_KEY *ossl_ec_key_new_method_int(OSSL_LIB_CTX *libctx, const char *propq,
     }
     return ret;
 
- err:
+err:
     EC_KEY_free(ret);
     return NULL;
 }
@@ -147,9 +146,9 @@ EC_KEY *EC_KEY_new_method(ENGINE *engine)
 #endif
 
 int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
-                     const EC_KEY *eckey,
-                     void *(*KDF) (const void *in, size_t inlen, void *out,
-                                   size_t *outlen))
+    const EC_KEY *eckey,
+    void *(*KDF)(const void *in, size_t inlen, void *out,
+        size_t *outlen))
 {
     unsigned char *sec = NULL;
     size_t seclen;
@@ -193,14 +192,14 @@ void EC_KEY_METHOD_free(EC_KEY_METHOD *meth)
 }
 
 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))
+    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))
 {
     meth->init = init;
     meth->finish = finish;
@@ -211,33 +210,33 @@ void EC_KEY_METHOD_set_init(EC_KEY_METHOD *meth,
 }
 
 void EC_KEY_METHOD_set_keygen(EC_KEY_METHOD *meth,
-                              int (*keygen)(EC_KEY *key))
+    int (*keygen)(EC_KEY *key))
 {
     meth->keygen = keygen;
 }
 
 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))
+    int (*ckey)(unsigned char **psec,
+        size_t *pseclen,
+        const EC_POINT *pub_key,
+        const EC_KEY *ecdh))
 {
     meth->compute_key = ckey;
 }
 
 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))
+    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))
 {
     meth->sign = sign;
     meth->sign_setup = sign_setup;
@@ -245,29 +244,28 @@ void EC_KEY_METHOD_set_sign(EC_KEY_METHOD *meth,
 }
 
 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))
+    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))
 {
     meth->verify = verify;
     meth->verify_sig = verify_sig;
 }
 
 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))
+    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))
 {
     if (pinit != NULL)
         *pinit = meth->init;
@@ -284,35 +282,35 @@ void EC_KEY_METHOD_get_init(const EC_KEY_METHOD *meth,
 }
 
 void EC_KEY_METHOD_get_keygen(const EC_KEY_METHOD *meth,
-                              int (**pkeygen)(EC_KEY *key))
+    int (**pkeygen)(EC_KEY *key))
 {
     if (pkeygen != NULL)
         *pkeygen = meth->keygen;
 }
 
 void EC_KEY_METHOD_get_compute_key(const EC_KEY_METHOD *meth,
-                                   int (**pck)(unsigned char **pout,
-                                               size_t *poutlen,
-                                               const EC_POINT *pub_key,
-                                               const EC_KEY *ecdh))
+    int (**pck)(unsigned char **pout,
+        size_t *poutlen,
+        const EC_POINT *pub_key,
+        const EC_KEY *ecdh))
 {
     if (pck != NULL)
         *pck = meth->compute_key;
 }
 
 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))
+    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))
 {
     if (psign != NULL)
         *psign = meth->sign;
@@ -323,14 +321,13 @@ void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
 }
 
 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))
+    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))
 {
     if (pverify != NULL)
         *pverify = meth->verify;
diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c
index b55677fb1f4fb..13dcd29b115cb 100644
--- a/crypto/ec/ec_lib.c
+++ b/crypto/ec/ec_lib.c
@@ -28,7 +28,7 @@
 /* functions for EC_GROUP objects */
 
 EC_GROUP *ossl_ec_group_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
-                               const EC_METHOD *meth)
+    const EC_METHOD *meth)
 {
     EC_GROUP *ret;
 
@@ -66,7 +66,7 @@ EC_GROUP *ossl_ec_group_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
         goto err;
     return ret;
 
- err:
+err:
     BN_free(ret->order);
     BN_free(ret->cofactor);
     OPENSSL_free(ret->propq);
@@ -75,12 +75,12 @@ EC_GROUP *ossl_ec_group_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
 EC_GROUP *EC_GROUP_new(const EC_METHOD *meth)
 {
     return ossl_ec_group_new_ex(NULL, NULL, meth);
 }
-# endif
+#endif
 #endif
 
 void EC_pre_comp_free(EC_GROUP *group)
@@ -281,12 +281,12 @@ EC_GROUP *EC_GROUP_dup(const EC_GROUP *a)
 
     ok = 1;
 
- err:
+err:
     if (!ok) {
         EC_GROUP_free(t);
         return NULL;
     }
-        return t;
+    return t;
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -316,7 +316,8 @@ static int ec_precompute_mont_data(EC_GROUP *);
  *
  * Otherwise, zero cofactor and return success.
  */
-static int ec_guess_cofactor(EC_GROUP *group) {
+static int ec_guess_cofactor(EC_GROUP *group)
+{
     int ret = 0;
     BN_CTX *ctx = NULL;
     BIGNUM *q = NULL;
@@ -358,14 +359,14 @@ static int ec_guess_cofactor(EC_GROUP *group) {
         || !BN_div(group->cofactor, NULL, group->cofactor, group->order, ctx))
         goto err;
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     return ret;
 }
 
 int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator,
-                           const BIGNUM *order, const BIGNUM *cofactor)
+    const BIGNUM *order, const BIGNUM *cofactor)
 {
     if (generator == NULL) {
         ERR_raise(ERR_LIB_EC, ERR_R_PASSED_NULL_PARAMETER);
@@ -465,7 +466,7 @@ int EC_GROUP_order_bits(const EC_GROUP *group)
 }
 
 int EC_GROUP_get_cofactor(const EC_GROUP *group, BIGNUM *cofactor,
-                          BN_CTX *ctx)
+    BN_CTX *ctx)
 {
 
     if (group->cofactor == NULL)
@@ -484,8 +485,7 @@ const BIGNUM *EC_GROUP_get0_cofactor(const EC_GROUP *group)
 void EC_GROUP_set_curve_name(EC_GROUP *group, int nid)
 {
     group->curve_name = nid;
-    group->asn1_flag =
-        (nid != NID_undef)
+    group->asn1_flag = (nid != NID_undef)
         ? OPENSSL_EC_NAMED_CURVE
         : OPENSSL_EC_EXPLICIT_CURVE;
 }
@@ -516,13 +516,13 @@ 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)
 {
     group->asn1_form = form;
 }
 
 point_conversion_form_t EC_GROUP_get_point_conversion_form(const EC_GROUP
-                                                           *group)
+        *group)
 {
     return group->asn1_form;
 }
@@ -555,7 +555,7 @@ size_t EC_GROUP_get_seed_len(const EC_GROUP *group)
 }
 
 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)
 {
     if (group->meth->group_set_curve == 0) {
         ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -565,7 +565,7 @@ int EC_GROUP_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
 }
 
 int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
-                       BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (group->meth->group_get_curve == NULL) {
         ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -576,30 +576,30 @@ int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
 
 #ifndef OPENSSL_NO_DEPRECATED_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 *b, BN_CTX *ctx)
 {
     return EC_GROUP_set_curve(group, p, a, b, ctx);
 }
 
 int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
-                           BIGNUM *b, BN_CTX *ctx)
+    BIGNUM *b, BN_CTX *ctx)
 {
     return EC_GROUP_get_curve(group, p, a, b, ctx);
 }
 
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
 int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
-                            const BIGNUM *b, BN_CTX *ctx)
+    const BIGNUM *b, BN_CTX *ctx)
 {
     return EC_GROUP_set_curve(group, p, a, b, ctx);
 }
 
 int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
-                            BIGNUM *b, BN_CTX *ctx)
+    BIGNUM *b, BN_CTX *ctx)
 {
     return EC_GROUP_get_curve(group, p, a, b, ctx);
 }
-# endif
+#endif
 #endif
 
 int EC_GROUP_get_degree(const EC_GROUP *group)
@@ -632,8 +632,7 @@ int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx)
     if (EC_GROUP_get_field_type(a) != EC_GROUP_get_field_type(b))
         return 1;
     /* compare the curve name (if present in both) */
-    if (EC_GROUP_get_curve_name(a) && EC_GROUP_get_curve_name(b) &&
-        EC_GROUP_get_curve_name(a) != EC_GROUP_get_curve_name(b))
+    if (EC_GROUP_get_curve_name(a) && EC_GROUP_get_curve_name(b) && EC_GROUP_get_curve_name(a) != EC_GROUP_get_curve_name(b))
         return 1;
     if (a->meth->flags & EC_FLAGS_CUSTOM_CURVE)
         return 0;
@@ -664,8 +663,7 @@ int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx)
      * XXX This approach assumes that the external representation of curves
      * over the same field type is the same.
      */
-    if (!a->meth->group_get_curve(a, a1, a2, a3, ctx) ||
-        !b->meth->group_get_curve(b, b1, b2, b3, ctx))
+    if (!a->meth->group_get_curve(a, a1, a2, a3, ctx) || !b->meth->group_get_curve(b, b1, b2, b3, ctx))
         r = 1;
 
     /* return 1 if the curve parameters are different */
@@ -674,8 +672,7 @@ int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx)
 
     /* XXX EC_POINT_cmp() assumes that the methods are equal */
     /* return 1 if the generators are different */
-    if (r || EC_POINT_cmp(a, EC_GROUP_get0_generator(a),
-                          EC_GROUP_get0_generator(b), ctx) != 0)
+    if (r || EC_POINT_cmp(a, EC_GROUP_get0_generator(a), EC_GROUP_get0_generator(b), ctx) != 0)
         r = 1;
 
     if (!r) {
@@ -775,9 +772,9 @@ int EC_POINT_copy(EC_POINT *dest, const EC_POINT *src)
         return 0;
     }
     if (dest->meth != src->meth
-            || (dest->curve_name != src->curve_name
-                 && dest->curve_name != 0
-                 && src->curve_name != 0)) {
+        || (dest->curve_name != src->curve_name
+            && dest->curve_name != 0
+            && src->curve_name != 0)) {
         ERR_raise(ERR_LIB_EC, EC_R_INCOMPATIBLE_OBJECTS);
         return 0;
     }
@@ -827,9 +824,9 @@ int EC_POINT_set_to_infinity(const EC_GROUP *group, EC_POINT *point)
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
-                                             EC_POINT *point, const BIGNUM *x,
-                                             const BIGNUM *y, const BIGNUM *z,
-                                             BN_CTX *ctx)
+    EC_POINT *point, const BIGNUM *x,
+    const BIGNUM *y, const BIGNUM *z,
+    BN_CTX *ctx)
 {
     if (group->meth->field_type != NID_X9_62_prime_field) {
         ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -840,13 +837,13 @@ int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
         return 0;
     }
     return ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group, point,
-                                                              x, y, z, ctx);
+        x, y, z, ctx);
 }
 
 int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
-                                             const EC_POINT *point, BIGNUM *x,
-                                             BIGNUM *y, BIGNUM *z,
-                                             BN_CTX *ctx)
+    const EC_POINT *point, BIGNUM *x,
+    BIGNUM *y, BIGNUM *z,
+    BN_CTX *ctx)
 {
     if (group->meth->field_type != NID_X9_62_prime_field) {
         ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -857,13 +854,13 @@ int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
         return 0;
     }
     return ossl_ec_GFp_simple_get_Jprojective_coordinates_GFp(group, point,
-                                                              x, y, z, ctx);
+        x, y, z, ctx);
 }
 #endif
 
 int EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,
-                                    const BIGNUM *x, const BIGNUM *y,
-                                    BN_CTX *ctx)
+    const BIGNUM *x, const BIGNUM *y,
+    BN_CTX *ctx)
 {
     if (group->meth->point_set_affine_coordinates == NULL) {
         ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -885,25 +882,25 @@ int EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group,
-                                        EC_POINT *point, const BIGNUM *x,
-                                        const BIGNUM *y, BN_CTX *ctx)
+    EC_POINT *point, const BIGNUM *x,
+    const BIGNUM *y, BN_CTX *ctx)
 {
     return EC_POINT_set_affine_coordinates(group, point, x, y, ctx);
 }
 
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
 int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group,
-                                         EC_POINT *point, const BIGNUM *x,
-                                         const BIGNUM *y, BN_CTX *ctx)
+    EC_POINT *point, const BIGNUM *x,
+    const BIGNUM *y, BN_CTX *ctx)
 {
     return EC_POINT_set_affine_coordinates(group, point, x, y, ctx);
 }
-# endif
+#endif
 #endif
 
 int EC_POINT_get_affine_coordinates(const EC_GROUP *group,
-                                    const EC_POINT *point, BIGNUM *x, BIGNUM *y,
-                                    BN_CTX *ctx)
+    const EC_POINT *point, BIGNUM *x, BIGNUM *y,
+    BN_CTX *ctx)
 {
     if (group->meth->point_get_affine_coordinates == NULL) {
         ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -922,24 +919,24 @@ int EC_POINT_get_affine_coordinates(const EC_GROUP *group,
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
-                                        const EC_POINT *point, BIGNUM *x,
-                                        BIGNUM *y, BN_CTX *ctx)
+    const EC_POINT *point, BIGNUM *x,
+    BIGNUM *y, BN_CTX *ctx)
 {
     return EC_POINT_get_affine_coordinates(group, point, x, y, ctx);
 }
 
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
 int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
-                                         const EC_POINT *point, BIGNUM *x,
-                                         BIGNUM *y, BN_CTX *ctx)
+    const EC_POINT *point, BIGNUM *x,
+    BIGNUM *y, BN_CTX *ctx)
 {
     return EC_POINT_get_affine_coordinates(group, point, x, y, ctx);
 }
-# endif
+#endif
 #endif
 
 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)
 {
     if (group->meth->add == 0) {
         ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -954,7 +951,7 @@ int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
 }
 
 int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
-                 BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (group->meth->dbl == 0) {
         ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -1001,7 +998,7 @@ int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)
  * -1: An error occurred
  */
 int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
-                         BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (group->meth->is_on_curve == 0) {
         ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -1015,7 +1012,7 @@ int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
 }
 
 int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b,
-                 BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (group->meth->point_cmp == 0) {
         ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
@@ -1043,7 +1040,7 @@ int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
 }
 
 int EC_POINTs_make_affine(const EC_GROUP *group, size_t num,
-                          EC_POINT *points[], BN_CTX *ctx)
+    EC_POINT *points[], BN_CTX *ctx)
 {
     size_t i;
 
@@ -1069,8 +1066,8 @@ int EC_POINTs_make_affine(const EC_GROUP *group, size_t num,
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
-                  size_t num, const EC_POINT *points[],
-                  const BIGNUM *scalars[], BN_CTX *ctx)
+    size_t num, const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *ctx)
 {
     int ret = 0;
     size_t i = 0;
@@ -1116,7 +1113,7 @@ int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 #endif
 
 int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *g_scalar,
-                 const EC_POINT *point, const BIGNUM *p_scalar, BN_CTX *ctx)
+    const EC_POINT *point, const BIGNUM *p_scalar, BN_CTX *ctx)
 {
     int ret = 0;
     size_t num;
@@ -1165,7 +1162,7 @@ int EC_GROUP_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
     if (group->meth->precompute_mult != 0)
         return group->meth->precompute_mult(group, ctx);
     else
-        return 1;               /* nothing to do, so report success */
+        return 1; /* nothing to do, so report success */
 }
 
 int EC_GROUP_have_precompute_mult(const EC_GROUP *group)
@@ -1177,8 +1174,8 @@ int EC_GROUP_have_precompute_mult(const EC_GROUP *group)
     if (group->meth->have_precompute_mult != 0)
         return group->meth->have_precompute_mult(group);
     else
-        return 0;               /* cannot tell whether precomputation has
-                                 * been performed */
+        return 0; /* cannot tell whether precomputation has
+                   * been performed */
 }
 #endif
 
@@ -1209,7 +1206,7 @@ static int ec_precompute_mont_data(EC_GROUP *group)
 
     ret = 1;
 
- err:
+err:
 
     BN_CTX_free(ctx);
     return ret;
@@ -1235,7 +1232,7 @@ int ossl_ec_group_simple_order_bits(const EC_GROUP *group)
 }
 
 static int ec_field_inverse_mod_ord(const EC_GROUP *group, BIGNUM *r,
-                                    const BIGNUM *x, BN_CTX *ctx)
+    const BIGNUM *x, BN_CTX *ctx)
 {
     BIGNUM *e = NULL;
     int ret = 0;
@@ -1274,7 +1271,7 @@ static int ec_field_inverse_mod_ord(const EC_GROUP *group, BIGNUM *r,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
     BN_CTX_free(new_ctx);
@@ -1296,7 +1293,7 @@ static int ec_field_inverse_mod_ord(const EC_GROUP *group, BIGNUM *r,
  * other functionality.
  */
 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)
 {
     if (group->meth->field_inverse_mod_ord != NULL)
         return group->meth->field_inverse_mod_ord(group, res, x, ctx);
@@ -1315,7 +1312,7 @@ int ossl_ec_group_do_inverse_ord(const EC_GROUP *group, BIGNUM *res,
  * support coordinate blinding.
  */
 int ossl_ec_point_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
-                                    BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (group->meth->blind_coordinates == NULL)
         return 1; /* ignore if not implemented */
@@ -1333,8 +1330,8 @@ int EC_GROUP_get_basis_type(const EC_GROUP *group)
 
     /* Find the last non-zero element of group->poly[] */
     for (i = 0;
-         i < (int)OSSL_NELEM(group->poly) && group->poly[i] != 0;
-         i++)
+        i < (int)OSSL_NELEM(group->poly) && group->poly[i] != 0;
+        i++)
         continue;
 
     if (i == 4)
@@ -1354,7 +1351,7 @@ int EC_GROUP_get_trinomial_basis(const EC_GROUP *group, unsigned int *k)
 
     if (EC_GROUP_get_field_type(group) != NID_X9_62_characteristic_two_field
         || !((group->poly[0] != 0) && (group->poly[1] != 0)
-             && (group->poly[2] == 0))) {
+            && (group->poly[2] == 0))) {
         ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return 0;
     }
@@ -1366,15 +1363,15 @@ int EC_GROUP_get_trinomial_basis(const EC_GROUP *group, unsigned int *k)
 }
 
 int EC_GROUP_get_pentanomial_basis(const EC_GROUP *group, unsigned int *k1,
-                                   unsigned int *k2, unsigned int *k3)
+    unsigned int *k2, unsigned int *k3)
 {
     if (group == NULL)
         return 0;
 
     if (EC_GROUP_get_field_type(group) != NID_X9_62_characteristic_two_field
         || !((group->poly[0] != 0) && (group->poly[1] != 0)
-             && (group->poly[2] != 0) && (group->poly[3] != 0)
-             && (group->poly[4] == 0))) {
+            && (group->poly[2] != 0) && (group->poly[3] != 0)
+            && (group->poly[4] == 0))) {
         ERR_raise(ERR_LIB_EC, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return 0;
     }
@@ -1403,9 +1400,9 @@ int EC_GROUP_get_pentanomial_basis(const EC_GROUP *group, unsigned int *k1,
  * mathematically wrong anyway and should not be used.
  */
 static EC_GROUP *ec_group_explicit_to_named(const EC_GROUP *group,
-                                            OSSL_LIB_CTX *libctx,
-                                            const char *propq,
-                                            BN_CTX *ctx)
+    OSSL_LIB_CTX *libctx,
+    const char *propq,
+    BN_CTX *ctx)
 {
     EC_GROUP *ret_group = NULL, *dup = NULL;
     int curve_name_nid;
@@ -1415,8 +1412,8 @@ static EC_GROUP *ec_group_explicit_to_named(const EC_GROUP *group,
     int no_seed = (EC_GROUP_get0_seed(group) == NULL);
 
     if ((dup = EC_GROUP_dup(group)) == NULL
-            || EC_GROUP_set_seed(dup, NULL, 0) != 1
-            || !EC_GROUP_set_generator(dup, point, order, NULL))
+        || EC_GROUP_set_seed(dup, NULL, 0) != 1
+        || !EC_GROUP_set_generator(dup, point, order, NULL))
         goto err;
     if ((curve_name_nid = ossl_ec_curve_nid_from_params(dup, ctx)) != NID_undef) {
         /*
@@ -1428,7 +1425,7 @@ static EC_GROUP *ec_group_explicit_to_named(const EC_GROUP *group,
          * parameters with one created from a named group.
          */
 
-# ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
         /*
          * NID_wap_wsg_idm_ecid_wtls12 and NID_secp224r1 are both aliases for
          * the same curve, we prefer the SECP nid when matching explicit
@@ -1436,7 +1433,7 @@ static EC_GROUP *ec_group_explicit_to_named(const EC_GROUP *group,
          */
         if (curve_name_nid == NID_wap_wsg_idm_ecid_wtls12)
             curve_name_nid = NID_secp224r1;
-# endif /* !def(OPENSSL_NO_EC_NISTP_64_GCC_128) */
+#endif /* !def(OPENSSL_NO_EC_NISTP_64_GCC_128) */
 
         ret_group = EC_GROUP_new_by_curve_name_ex(libctx, propq, curve_name_nid);
         if (ret_group == NULL)
@@ -1474,7 +1471,7 @@ static EC_GROUP *ec_group_explicit_to_named(const EC_GROUP *group,
 #endif /* FIPS_MODULE */
 
 static EC_GROUP *group_new_from_name(const OSSL_PARAM *p,
-                                     OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     int ok = 0, nid;
     const char *curve_name = NULL;
@@ -1539,7 +1536,7 @@ int ossl_ec_group_set_params(EC_GROUP *group, const OSSL_PARAM params[])
 }
 
 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)
 {
     const OSSL_PARAM *ptmp;
     EC_GROUP *group = NULL;
@@ -1570,7 +1567,7 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
         }
 
         ptmp = OSSL_PARAM_locate_const(params,
-                                       OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS);
+            OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS);
         if (ptmp != NULL && !OSSL_PARAM_get_int(ptmp, &decoded)) {
             ERR_raise(ERR_LIB_EC, EC_R_WRONG_CURVE_PARAMETERS);
             EC_GROUP_free(group);
@@ -1608,7 +1605,8 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
     if (OPENSSL_strcasecmp(ptmp->data, SN_X9_62_prime_field) == 0) {
         is_prime_field = 1;
     } else if (OPENSSL_strcasecmp(ptmp->data,
-                                  SN_X9_62_characteristic_two_field) == 0) {
+                   SN_X9_62_characteristic_two_field)
+        == 0) {
         is_prime_field = 0;
     } else {
         /* Invalid field */
@@ -1648,10 +1646,10 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
         /* create the EC_GROUP structure */
         group = EC_GROUP_new_curve_GFp(p, a, b, bnctx);
     } else {
-# ifdef OPENSSL_NO_EC2M
+#ifdef OPENSSL_NO_EC2M
         ERR_raise(ERR_LIB_EC, EC_R_GF2M_NOT_SUPPORTED);
         goto err;
-# else
+#else
         /* create the EC_GROUP structure */
         group = EC_GROUP_new_curve_GF2m(p, a, b, NULL);
         if (group != NULL) {
@@ -1661,7 +1659,7 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
                 goto err;
             }
         }
-# endif /* OPENSSL_NO_EC2M */
+#endif /* OPENSSL_NO_EC2M */
     }
 
     if (group == NULL) {
@@ -1691,7 +1689,7 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
     if ((point = EC_POINT_new(group)) == NULL)
         goto err;
     EC_GROUP_set_point_conversion_form(group,
-                                       (point_conversion_form_t)buf[0] & ~0x01);
+        (point_conversion_form_t)buf[0] & ~0x01);
     if (!EC_POINT_oct2point(group, point, buf, ptmp->data_size, bnctx)) {
         ERR_raise(ERR_LIB_EC, EC_R_INVALID_GENERATOR);
         goto err;
@@ -1750,7 +1748,7 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
     /* We've imported the group from explicit parameters, set it so. */
     group->decoded_from_explicit_params = 1;
     ok = 1;
- err:
+err:
     if (!ok) {
         EC_GROUP_free(group);
         group = NULL;
@@ -1764,7 +1762,7 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
 }
 
 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)
 {
     OSSL_PARAM_BLD *tmpl = NULL;
     BN_CTX *new_bnctx = NULL;
@@ -1790,7 +1788,7 @@ OSSL_PARAM *EC_GROUP_to_params(const EC_GROUP *group, OSSL_LIB_CTX *libctx,
 
     params = OSSL_PARAM_BLD_to_param(tmpl);
 
- err:
+err:
     OSSL_PARAM_BLD_free(tmpl);
     OPENSSL_free(gen_buf);
     BN_CTX_end(bnctx);
diff --git a/crypto/ec/ec_local.h b/crypto/ec/ec_local.h
index 91c3a7190299f..2bff820ca868d 100644
--- a/crypto/ec/ec_local.h
+++ b/crypto/ec/ec_local.h
@@ -17,19 +17,19 @@
 #include "crypto/ec.h"
 
 #if defined(__SUNPRO_C)
-# if __SUNPRO_C >= 0x520
-#  pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
-# endif
+#if __SUNPRO_C >= 0x520
+#pragma error_messages(off, E_ARRAY_OF_INCOMPLETE_NONAME, E_ARRAY_OF_INCOMPLETE)
+#endif
 #endif
 
 /* Use default functions for poin2oct, oct2point and compressed coordinates */
-#define EC_FLAGS_DEFAULT_OCT    0x1
+#define EC_FLAGS_DEFAULT_OCT 0x1
 
 /* Use custom formats for EC_GROUP, EC_POINT and EC_KEY */
-#define EC_FLAGS_CUSTOM_CURVE   0x2
+#define EC_FLAGS_CUSTOM_CURVE 0x2
 
 /* Curve does not support signing operations */
-#define EC_FLAGS_NO_SIGN        0x4
+#define EC_FLAGS_NO_SIGN 0x4
 
 #ifdef OPENSSL_NO_DEPRECATED_3_0
 typedef struct ec_method_st EC_METHOD;
@@ -44,33 +44,33 @@ struct ec_method_st {
     /* Various method flags */
     int flags;
     /* used by EC_METHOD_get_field_type: */
-    int field_type;             /* a NID */
+    int field_type; /* a NID */
     /*
      * used by EC_GROUP_new, EC_GROUP_free, EC_GROUP_clear_free,
      * EC_GROUP_copy:
      */
-    int (*group_init) (EC_GROUP *);
-    void (*group_finish) (EC_GROUP *);
-    void (*group_clear_finish) (EC_GROUP *);
-    int (*group_copy) (EC_GROUP *, const EC_GROUP *);
+    int (*group_init)(EC_GROUP *);
+    void (*group_finish)(EC_GROUP *);
+    void (*group_clear_finish)(EC_GROUP *);
+    int (*group_copy)(EC_GROUP *, const EC_GROUP *);
     /* used by EC_GROUP_set_curve, EC_GROUP_get_curve: */
-    int (*group_set_curve) (EC_GROUP *, const BIGNUM *p, const BIGNUM *a,
-                            const BIGNUM *b, BN_CTX *);
-    int (*group_get_curve) (const EC_GROUP *, BIGNUM *p, BIGNUM *a, BIGNUM *b,
-                            BN_CTX *);
+    int (*group_set_curve)(EC_GROUP *, const BIGNUM *p, const BIGNUM *a,
+        const BIGNUM *b, BN_CTX *);
+    int (*group_get_curve)(const EC_GROUP *, BIGNUM *p, BIGNUM *a, BIGNUM *b,
+        BN_CTX *);
     /* used by EC_GROUP_get_degree: */
-    int (*group_get_degree) (const EC_GROUP *);
-    int (*group_order_bits) (const EC_GROUP *);
+    int (*group_get_degree)(const EC_GROUP *);
+    int (*group_order_bits)(const EC_GROUP *);
     /* used by EC_GROUP_check: */
-    int (*group_check_discriminant) (const EC_GROUP *, BN_CTX *);
+    int (*group_check_discriminant)(const EC_GROUP *, BN_CTX *);
     /*
      * used by EC_POINT_new, EC_POINT_free, EC_POINT_clear_free,
      * EC_POINT_copy:
      */
-    int (*point_init) (EC_POINT *);
-    void (*point_finish) (EC_POINT *);
-    void (*point_clear_finish) (EC_POINT *);
-    int (*point_copy) (EC_POINT *, const EC_POINT *);
+    int (*point_init)(EC_POINT *);
+    void (*point_finish)(EC_POINT *);
+    void (*point_clear_finish)(EC_POINT *);
+    int (*point_copy)(EC_POINT *, const EC_POINT *);
     /*-
      * used by EC_POINT_set_to_infinity,
      * EC_POINT_set_Jprojective_coordinates_GFp,
@@ -79,37 +79,37 @@ struct ec_method_st {
      * EC_POINT_get_affine_coordinates,
      * EC_POINT_set_compressed_coordinates:
      */
-    int (*point_set_to_infinity) (const EC_GROUP *, EC_POINT *);
-    int (*point_set_affine_coordinates) (const EC_GROUP *, EC_POINT *,
-                                         const BIGNUM *x, const BIGNUM *y,
-                                         BN_CTX *);
-    int (*point_get_affine_coordinates) (const EC_GROUP *, const EC_POINT *,
-                                         BIGNUM *x, BIGNUM *y, BN_CTX *);
-    int (*point_set_compressed_coordinates) (const EC_GROUP *, EC_POINT *,
-                                             const BIGNUM *x, int y_bit,
-                                             BN_CTX *);
+    int (*point_set_to_infinity)(const EC_GROUP *, EC_POINT *);
+    int (*point_set_affine_coordinates)(const EC_GROUP *, EC_POINT *,
+        const BIGNUM *x, const BIGNUM *y,
+        BN_CTX *);
+    int (*point_get_affine_coordinates)(const EC_GROUP *, const EC_POINT *,
+        BIGNUM *x, BIGNUM *y, BN_CTX *);
+    int (*point_set_compressed_coordinates)(const EC_GROUP *, EC_POINT *,
+        const BIGNUM *x, int y_bit,
+        BN_CTX *);
     /* used by EC_POINT_point2oct, EC_POINT_oct2point: */
-    size_t (*point2oct) (const EC_GROUP *, const EC_POINT *,
-                         point_conversion_form_t form, unsigned char *buf,
-                         size_t len, BN_CTX *);
-    int (*oct2point) (const EC_GROUP *, EC_POINT *, const unsigned char *buf,
-                      size_t len, BN_CTX *);
+    size_t (*point2oct)(const EC_GROUP *, const EC_POINT *,
+        point_conversion_form_t form, unsigned char *buf,
+        size_t len, BN_CTX *);
+    int (*oct2point)(const EC_GROUP *, EC_POINT *, const unsigned char *buf,
+        size_t len, BN_CTX *);
     /* used by EC_POINT_add, EC_POINT_dbl, ECP_POINT_invert: */
-    int (*add) (const EC_GROUP *, EC_POINT *r, const EC_POINT *a,
-                const EC_POINT *b, BN_CTX *);
-    int (*dbl) (const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *);
-    int (*invert) (const EC_GROUP *, EC_POINT *, BN_CTX *);
+    int (*add)(const EC_GROUP *, EC_POINT *r, const EC_POINT *a,
+        const EC_POINT *b, BN_CTX *);
+    int (*dbl)(const EC_GROUP *, EC_POINT *r, const EC_POINT *a, BN_CTX *);
+    int (*invert)(const EC_GROUP *, EC_POINT *, BN_CTX *);
     /*
      * used by EC_POINT_is_at_infinity, EC_POINT_is_on_curve, EC_POINT_cmp:
      */
-    int (*is_at_infinity) (const EC_GROUP *, const EC_POINT *);
-    int (*is_on_curve) (const EC_GROUP *, const EC_POINT *, BN_CTX *);
-    int (*point_cmp) (const EC_GROUP *, const EC_POINT *a, const EC_POINT *b,
-                      BN_CTX *);
+    int (*is_at_infinity)(const EC_GROUP *, const EC_POINT *);
+    int (*is_on_curve)(const EC_GROUP *, const EC_POINT *, BN_CTX *);
+    int (*point_cmp)(const EC_GROUP *, const EC_POINT *a, const EC_POINT *b,
+        BN_CTX *);
     /* used by EC_POINT_make_affine, EC_POINTs_make_affine: */
-    int (*make_affine) (const EC_GROUP *, EC_POINT *, BN_CTX *);
-    int (*points_make_affine) (const EC_GROUP *, size_t num, EC_POINT *[],
-                               BN_CTX *);
+    int (*make_affine)(const EC_GROUP *, EC_POINT *, BN_CTX *);
+    int (*points_make_affine)(const EC_GROUP *, size_t num, EC_POINT *[],
+        BN_CTX *);
     /*
      * used by EC_POINTs_mul, EC_POINT_mul, EC_POINT_precompute_mult,
      * EC_POINT_have_precompute_mult (default implementations are used if the
@@ -132,11 +132,11 @@ struct ec_method_st {
      * may treat it as an unusual input, without any constant-timeness
      * guarantee.
      */
-    int (*mul) (const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
-                size_t num, const EC_POINT *points[], const BIGNUM *scalars[],
-                BN_CTX *);
-    int (*precompute_mult) (EC_GROUP *group, BN_CTX *);
-    int (*have_precompute_mult) (const EC_GROUP *group);
+    int (*mul)(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
+        size_t num, const EC_POINT *points[], const BIGNUM *scalars[],
+        BN_CTX *);
+    int (*precompute_mult)(EC_GROUP *group, BN_CTX *);
+    int (*have_precompute_mult)(const EC_GROUP *group);
     /* internal functions */
     /*
      * 'field_mul', 'field_sqr', and 'field_div' can be used by 'add' and
@@ -144,25 +144,25 @@ struct ec_method_st {
      * with different optimized implementations of expensive field
      * operations:
      */
-    int (*field_mul) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                      const BIGNUM *b, BN_CTX *);
-    int (*field_sqr) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
-    int (*field_div) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                      const BIGNUM *b, BN_CTX *);
+    int (*field_mul)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
+        const BIGNUM *b, BN_CTX *);
+    int (*field_sqr)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
+    int (*field_div)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
+        const BIGNUM *b, BN_CTX *);
     /*-
      * 'field_inv' computes the multiplicative inverse of a in the field,
      * storing the result in r.
      *
      * If 'a' is zero (or equivalent), you'll get an EC_R_CANNOT_INVERT error.
      */
-    int (*field_inv) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
+    int (*field_inv)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);
     /* e.g. to Montgomery */
-    int (*field_encode) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                         BN_CTX *);
+    int (*field_encode)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
+        BN_CTX *);
     /* e.g. from Montgomery */
-    int (*field_decode) (const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                         BN_CTX *);
-    int (*field_set_to_one) (const EC_GROUP *, BIGNUM *r, BN_CTX *);
+    int (*field_decode)(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
+        BN_CTX *);
+    int (*field_set_to_one)(const EC_GROUP *, BIGNUM *r, BN_CTX *);
     /* private key operations */
     size_t (*priv2oct)(const EC_KEY *eckey, unsigned char *buf, size_t len);
     int (*oct2priv)(EC_KEY *eckey, const unsigned char *buf, size_t len);
@@ -174,28 +174,28 @@ struct ec_method_st {
     void (*keyfinish)(EC_KEY *eckey);
     /* custom ECDH operation */
     int (*ecdh_compute_key)(unsigned char **pout, size_t *poutlen,
-                            const EC_POINT *pub_key, const EC_KEY *ecdh);
+        const EC_POINT *pub_key, const EC_KEY *ecdh);
     /* custom ECDSA */
     int (*ecdsa_sign_setup)(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinvp,
-                            BIGNUM **rp);
+        BIGNUM **rp);
     ECDSA_SIG *(*ecdsa_sign_sig)(const unsigned char *dgst, int dgstlen,
-                                 const BIGNUM *kinv, const BIGNUM *r,
-                                 EC_KEY *eckey);
+        const BIGNUM *kinv, const BIGNUM *r,
+        EC_KEY *eckey);
     int (*ecdsa_verify_sig)(const unsigned char *dgst, int dgstlen,
-                            const ECDSA_SIG *sig, EC_KEY *eckey);
+        const ECDSA_SIG *sig, EC_KEY *eckey);
     /* Inverse modulo order */
     int (*field_inverse_mod_ord)(const EC_GROUP *, BIGNUM *r,
-                                 const BIGNUM *x, BN_CTX *);
+        const BIGNUM *x, BN_CTX *);
     int (*blind_coordinates)(const EC_GROUP *group, EC_POINT *p, BN_CTX *ctx);
     int (*ladder_pre)(const EC_GROUP *group,
-                      EC_POINT *r, EC_POINT *s,
-                      EC_POINT *p, BN_CTX *ctx);
+        EC_POINT *r, EC_POINT *s,
+        EC_POINT *p, BN_CTX *ctx);
     int (*ladder_step)(const EC_GROUP *group,
-                       EC_POINT *r, EC_POINT *s,
-                       EC_POINT *p, BN_CTX *ctx);
+        EC_POINT *r, EC_POINT *s,
+        EC_POINT *p, BN_CTX *ctx);
     int (*ladder_post)(const EC_GROUP *group,
-                       EC_POINT *r, EC_POINT *s,
-                       EC_POINT *p, BN_CTX *ctx);
+        EC_POINT *r, EC_POINT *s,
+        EC_POINT *p, BN_CTX *ctx);
     int (*group_full_init)(EC_GROUP *group, const unsigned char *data);
 };
 
@@ -211,15 +211,15 @@ typedef struct ec_pre_comp_st EC_PRE_COMP;
 
 struct ec_group_st {
     const EC_METHOD *meth;
-    EC_POINT *generator;        /* optional */
+    EC_POINT *generator; /* optional */
     BIGNUM *order, *cofactor;
-    int curve_name;             /* optional NID for named curve */
-    int asn1_flag;              /* flag to control the asn1 encoding */
+    int curve_name; /* optional NID for named curve */
+    int asn1_flag; /* flag to control the asn1 encoding */
     int decoded_from_explicit_params; /* set if decoded from explicit
                                        * curve parameters encoding */
     point_conversion_form_t asn1_form;
-    unsigned char *seed;        /* optional seed for parameters (appears in
-                                 * ASN1) */
+    unsigned char *seed; /* optional seed for parameters (appears in
+                          * ASN1) */
     size_t seed_len;
     /*
      * The following members are handled by the method functions, even if
@@ -254,8 +254,8 @@ struct ec_group_st {
     /* method-specific */
     void *field_data2;
     /* method-specific */
-    int (*field_mod_func) (BIGNUM *, const BIGNUM *, const BIGNUM *,
-                           BN_CTX *);
+    int (*field_mod_func)(BIGNUM *, const BIGNUM *, const BIGNUM *,
+        BN_CTX *);
     /* data for ECDSA inverse */
     BN_MONT_CTX *mont_data;
 
@@ -266,7 +266,11 @@ struct ec_group_st {
      */
     enum {
         PCT_none,
-        PCT_nistp224, PCT_nistp256, PCT_nistp384, PCT_nistp521, PCT_nistz256,
+        PCT_nistp224,
+        PCT_nistp256,
+        PCT_nistp384,
+        PCT_nistp521,
+        PCT_nistz256,
         PCT_ec
     } pre_comp_type;
     union {
@@ -318,19 +322,19 @@ struct ec_point_st {
      */
     BIGNUM *X;
     BIGNUM *Y;
-    BIGNUM *Z;                  /* Jacobian projective coordinates: * (X, Y,
-                                 * Z) represents (X/Z^2, Y/Z^3) if Z != 0 */
-    int Z_is_one;               /* enable optimized point arithmetic for
-                                 * special case */
+    BIGNUM *Z; /* Jacobian projective coordinates: * (X, Y,
+                * Z) represents (X/Z^2, Y/Z^3) if Z != 0 */
+    int Z_is_one; /* enable optimized point arithmetic for
+                   * special case */
 };
 
 static ossl_inline int ec_point_is_compat(const EC_POINT *point,
-                                          const EC_GROUP *group)
+    const EC_GROUP *group)
 {
     return group->meth == point->meth
-           && (group->curve_name == 0
-               || point->curve_name == 0
-               || group->curve_name == point->curve_name);
+        && (group->curve_name == 0
+            || point->curve_name == 0
+            || group->curve_name == point->curve_name);
 }
 
 NISTP224_PRE_COMP *EC_nistp224_pre_comp_dup(NISTP224_PRE_COMP *);
@@ -354,8 +358,8 @@ void EC_ec_pre_comp_free(EC_PRE_COMP *);
  * group->method->mul is 0)
  */
 int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
-                     size_t num, const EC_POINT *points[],
-                     const BIGNUM *scalars[], BN_CTX *);
+    size_t num, const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *);
 int ossl_ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *);
 int ossl_ec_wNAF_have_precompute_mult(const EC_GROUP *group);
 
@@ -365,10 +369,10 @@ void ossl_ec_GFp_simple_group_finish(EC_GROUP *);
 void ossl_ec_GFp_simple_group_clear_finish(EC_GROUP *);
 int ossl_ec_GFp_simple_group_copy(EC_GROUP *, const EC_GROUP *);
 int ossl_ec_GFp_simple_group_set_curve(EC_GROUP *, const BIGNUM *p,
-                                       const BIGNUM *a, const BIGNUM *b,
-                                       BN_CTX *);
+    const BIGNUM *a, const BIGNUM *b,
+    BN_CTX *);
 int ossl_ec_GFp_simple_group_get_curve(const EC_GROUP *, BIGNUM *p, BIGNUM *a,
-                                       BIGNUM *b, BN_CTX *);
+    BIGNUM *b, BN_CTX *);
 int ossl_ec_GFp_simple_group_get_degree(const EC_GROUP *);
 int ossl_ec_GFp_simple_group_check_discriminant(const EC_GROUP *, BN_CTX *);
 int ossl_ec_GFp_simple_point_init(EC_POINT *);
@@ -377,88 +381,88 @@ void ossl_ec_GFp_simple_point_clear_finish(EC_POINT *);
 int ossl_ec_GFp_simple_point_copy(EC_POINT *, const EC_POINT *);
 int ossl_ec_GFp_simple_point_set_to_infinity(const EC_GROUP *, EC_POINT *);
 int ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *,
-                                                       EC_POINT *,
-                                                       const BIGNUM *x,
-                                                       const BIGNUM *y,
-                                                       const BIGNUM *z,
-                                                       BN_CTX *);
+    EC_POINT *,
+    const BIGNUM *x,
+    const BIGNUM *y,
+    const BIGNUM *z,
+    BN_CTX *);
 int ossl_ec_GFp_simple_get_Jprojective_coordinates_GFp(const EC_GROUP *,
-                                                       const EC_POINT *,
-                                                       BIGNUM *x,
-                                                       BIGNUM *y, BIGNUM *z,
-                                                       BN_CTX *);
+    const EC_POINT *,
+    BIGNUM *x,
+    BIGNUM *y, BIGNUM *z,
+    BN_CTX *);
 int ossl_ec_GFp_simple_point_set_affine_coordinates(const EC_GROUP *, EC_POINT *,
-                                                    const BIGNUM *x,
-                                                    const BIGNUM *y, BN_CTX *);
+    const BIGNUM *x,
+    const BIGNUM *y, BN_CTX *);
 int ossl_ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *,
-                                                    const EC_POINT *, BIGNUM *x,
-                                                    BIGNUM *y, BN_CTX *);
+    const EC_POINT *, BIGNUM *x,
+    BIGNUM *y, BN_CTX *);
 int ossl_ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *, EC_POINT *,
-                                                  const BIGNUM *x, int y_bit,
-                                                  BN_CTX *);
+    const BIGNUM *x, int y_bit,
+    BN_CTX *);
 size_t ossl_ec_GFp_simple_point2oct(const EC_GROUP *, const EC_POINT *,
-                                    point_conversion_form_t form,
-                                    unsigned char *buf, size_t len, BN_CTX *);
+    point_conversion_form_t form,
+    unsigned char *buf, size_t len, BN_CTX *);
 int ossl_ec_GFp_simple_oct2point(const EC_GROUP *, EC_POINT *,
-                                 const unsigned char *buf, size_t len, BN_CTX *);
+    const unsigned char *buf, size_t len, BN_CTX *);
 int ossl_ec_GFp_simple_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a,
-                           const EC_POINT *b, BN_CTX *);
+    const EC_POINT *b, BN_CTX *);
 int ossl_ec_GFp_simple_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a,
-                           BN_CTX *);
+    BN_CTX *);
 int ossl_ec_GFp_simple_invert(const EC_GROUP *, EC_POINT *, BN_CTX *);
 int ossl_ec_GFp_simple_is_at_infinity(const EC_GROUP *, const EC_POINT *);
 int ossl_ec_GFp_simple_is_on_curve(const EC_GROUP *, const EC_POINT *, BN_CTX *);
 int ossl_ec_GFp_simple_cmp(const EC_GROUP *, const EC_POINT *a,
-                           const EC_POINT *b, BN_CTX *);
+    const EC_POINT *b, BN_CTX *);
 int ossl_ec_GFp_simple_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *);
 int ossl_ec_GFp_simple_points_make_affine(const EC_GROUP *, size_t num,
-                                          EC_POINT *[], BN_CTX *);
+    EC_POINT *[], BN_CTX *);
 int ossl_ec_GFp_simple_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                                 const BIGNUM *b, BN_CTX *);
+    const BIGNUM *b, BN_CTX *);
 int ossl_ec_GFp_simple_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                                 BN_CTX *);
+    BN_CTX *);
 int ossl_ec_GFp_simple_field_inv(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                                 BN_CTX *);
+    BN_CTX *);
 int ossl_ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
-                                         BN_CTX *ctx);
+    BN_CTX *ctx);
 int ossl_ec_GFp_simple_ladder_pre(const EC_GROUP *group,
-                                  EC_POINT *r, EC_POINT *s,
-                                  EC_POINT *p, BN_CTX *ctx);
+    EC_POINT *r, EC_POINT *s,
+    EC_POINT *p, BN_CTX *ctx);
 int ossl_ec_GFp_simple_ladder_step(const EC_GROUP *group,
-                                   EC_POINT *r, EC_POINT *s,
-                                   EC_POINT *p, BN_CTX *ctx);
+    EC_POINT *r, EC_POINT *s,
+    EC_POINT *p, BN_CTX *ctx);
 int ossl_ec_GFp_simple_ladder_post(const EC_GROUP *group,
-                                   EC_POINT *r, EC_POINT *s,
-                                   EC_POINT *p, BN_CTX *ctx);
+    EC_POINT *r, EC_POINT *s,
+    EC_POINT *p, BN_CTX *ctx);
 
 /* method functions in ecp_mont.c */
 int ossl_ec_GFp_mont_group_init(EC_GROUP *);
 int ossl_ec_GFp_mont_group_set_curve(EC_GROUP *, const BIGNUM *p,
-                                     const BIGNUM *a,
-                                     const BIGNUM *b, BN_CTX *);
+    const BIGNUM *a,
+    const BIGNUM *b, BN_CTX *);
 void ossl_ec_GFp_mont_group_finish(EC_GROUP *);
 void ossl_ec_GFp_mont_group_clear_finish(EC_GROUP *);
 int ossl_ec_GFp_mont_group_copy(EC_GROUP *, const EC_GROUP *);
 int ossl_ec_GFp_mont_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                               const BIGNUM *b, BN_CTX *);
+    const BIGNUM *b, BN_CTX *);
 int ossl_ec_GFp_mont_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                               BN_CTX *);
+    BN_CTX *);
 int ossl_ec_GFp_mont_field_inv(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                               BN_CTX *);
+    BN_CTX *);
 int ossl_ec_GFp_mont_field_encode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                                  BN_CTX *);
+    BN_CTX *);
 int ossl_ec_GFp_mont_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                                  BN_CTX *);
+    BN_CTX *);
 int ossl_ec_GFp_mont_field_set_to_one(const EC_GROUP *, BIGNUM *r, BN_CTX *);
 
 /* method functions in ecp_nist.c */
 int ossl_ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src);
 int ossl_ec_GFp_nist_group_set_curve(EC_GROUP *, const BIGNUM *p,
-                                     const BIGNUM *a, const BIGNUM *b, BN_CTX *);
+    const BIGNUM *a, const BIGNUM *b, BN_CTX *);
 int ossl_ec_GFp_nist_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                              const BIGNUM *b, BN_CTX *);
+    const BIGNUM *b, BN_CTX *);
 int ossl_ec_GFp_nist_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                               BN_CTX *);
+    BN_CTX *);
 
 /* method functions in ec2_smpl.c */
 int ossl_ec_GF2m_simple_group_init(EC_GROUP *);
@@ -466,10 +470,10 @@ void ossl_ec_GF2m_simple_group_finish(EC_GROUP *);
 void ossl_ec_GF2m_simple_group_clear_finish(EC_GROUP *);
 int ossl_ec_GF2m_simple_group_copy(EC_GROUP *, const EC_GROUP *);
 int ossl_ec_GF2m_simple_group_set_curve(EC_GROUP *, const BIGNUM *p,
-                                        const BIGNUM *a, const BIGNUM *b,
-                                        BN_CTX *);
+    const BIGNUM *a, const BIGNUM *b,
+    BN_CTX *);
 int ossl_ec_GF2m_simple_group_get_curve(const EC_GROUP *, BIGNUM *p, BIGNUM *a,
-                                        BIGNUM *b, BN_CTX *);
+    BIGNUM *b, BN_CTX *);
 int ossl_ec_GF2m_simple_group_get_degree(const EC_GROUP *);
 int ossl_ec_GF2m_simple_group_check_discriminant(const EC_GROUP *, BN_CTX *);
 int ossl_ec_GF2m_simple_point_init(EC_POINT *);
@@ -478,101 +482,101 @@ void ossl_ec_GF2m_simple_point_clear_finish(EC_POINT *);
 int ossl_ec_GF2m_simple_point_copy(EC_POINT *, const EC_POINT *);
 int ossl_ec_GF2m_simple_point_set_to_infinity(const EC_GROUP *, EC_POINT *);
 int ossl_ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *,
-                                                     EC_POINT *,
-                                                     const BIGNUM *x,
-                                                     const BIGNUM *y, BN_CTX *);
+    EC_POINT *,
+    const BIGNUM *x,
+    const BIGNUM *y, BN_CTX *);
 int ossl_ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *,
-                                                     const EC_POINT *, BIGNUM *x,
-                                                     BIGNUM *y, BN_CTX *);
+    const EC_POINT *, BIGNUM *x,
+    BIGNUM *y, BN_CTX *);
 int ossl_ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *, EC_POINT *,
-                                                   const BIGNUM *x, int y_bit,
-                                                   BN_CTX *);
+    const BIGNUM *x, int y_bit,
+    BN_CTX *);
 size_t ossl_ec_GF2m_simple_point2oct(const EC_GROUP *, const EC_POINT *,
-                                     point_conversion_form_t form,
-                                     unsigned char *buf, size_t len, BN_CTX *);
+    point_conversion_form_t form,
+    unsigned char *buf, size_t len, BN_CTX *);
 int ossl_ec_GF2m_simple_oct2point(const EC_GROUP *, EC_POINT *,
-                                  const unsigned char *buf, size_t len, BN_CTX *);
+    const unsigned char *buf, size_t len, BN_CTX *);
 int ossl_ec_GF2m_simple_add(const EC_GROUP *, EC_POINT *r, const EC_POINT *a,
-                            const EC_POINT *b, BN_CTX *);
+    const EC_POINT *b, BN_CTX *);
 int ossl_ec_GF2m_simple_dbl(const EC_GROUP *, EC_POINT *r, const EC_POINT *a,
-                            BN_CTX *);
+    BN_CTX *);
 int ossl_ec_GF2m_simple_invert(const EC_GROUP *, EC_POINT *, BN_CTX *);
 int ossl_ec_GF2m_simple_is_at_infinity(const EC_GROUP *, const EC_POINT *);
 int ossl_ec_GF2m_simple_is_on_curve(const EC_GROUP *, const EC_POINT *, BN_CTX *);
 int ossl_ec_GF2m_simple_cmp(const EC_GROUP *, const EC_POINT *a,
-                            const EC_POINT *b, BN_CTX *);
+    const EC_POINT *b, BN_CTX *);
 int ossl_ec_GF2m_simple_make_affine(const EC_GROUP *, EC_POINT *, BN_CTX *);
 int ossl_ec_GF2m_simple_points_make_affine(const EC_GROUP *, size_t num,
-                                           EC_POINT *[], BN_CTX *);
+    EC_POINT *[], BN_CTX *);
 int ossl_ec_GF2m_simple_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                                  const BIGNUM *b, BN_CTX *);
+    const BIGNUM *b, BN_CTX *);
 int ossl_ec_GF2m_simple_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                                  BN_CTX *);
+    BN_CTX *);
 int ossl_ec_GF2m_simple_field_div(const EC_GROUP *, BIGNUM *r, const BIGNUM *a,
-                                 const BIGNUM *b, BN_CTX *);
+    const BIGNUM *b, BN_CTX *);
 
 #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-# ifdef B_ENDIAN
-#  error "Can not enable ec_nistp_64_gcc_128 on big-endian systems"
-# endif
+#ifdef B_ENDIAN
+#error "Can not enable ec_nistp_64_gcc_128 on big-endian systems"
+#endif
 
 /* method functions in ecp_nistp224.c */
 int ossl_ec_GFp_nistp224_group_init(EC_GROUP *group);
 int ossl_ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p,
-                                         const BIGNUM *a, const BIGNUM *n,
-                                         BN_CTX *);
+    const BIGNUM *a, const BIGNUM *n,
+    BN_CTX *);
 int ossl_ec_GFp_nistp224_point_get_affine_coordinates(const EC_GROUP *group,
-                                                      const EC_POINT *point,
-                                                      BIGNUM *x, BIGNUM *y,
-                                                      BN_CTX *ctx);
+    const EC_POINT *point,
+    BIGNUM *x, BIGNUM *y,
+    BN_CTX *ctx);
 int ossl_ec_GFp_nistp224_mul(const EC_GROUP *group, EC_POINT *r,
-                             const BIGNUM *scalar, size_t num,
-                             const EC_POINT *points[], const BIGNUM *scalars[],
-                             BN_CTX *);
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[], const BIGNUM *scalars[],
+    BN_CTX *);
 int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
-                                    const BIGNUM *scalar, size_t num,
-                                    const EC_POINT *points[],
-                                    const BIGNUM *scalars[], BN_CTX *ctx);
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *ctx);
 int ossl_ec_GFp_nistp224_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
 int ossl_ec_GFp_nistp224_have_precompute_mult(const EC_GROUP *group);
 
 /* method functions in ecp_nistp256.c */
 int ossl_ec_GFp_nistp256_group_init(EC_GROUP *group);
 int ossl_ec_GFp_nistp256_group_set_curve(EC_GROUP *group, const BIGNUM *p,
-                                         const BIGNUM *a, const BIGNUM *n,
-                                         BN_CTX *);
+    const BIGNUM *a, const BIGNUM *n,
+    BN_CTX *);
 int ossl_ec_GFp_nistp256_point_get_affine_coordinates(const EC_GROUP *group,
-                                                      const EC_POINT *point,
-                                                      BIGNUM *x, BIGNUM *y,
-                                                      BN_CTX *ctx);
+    const EC_POINT *point,
+    BIGNUM *x, BIGNUM *y,
+    BN_CTX *ctx);
 int ossl_ec_GFp_nistp256_mul(const EC_GROUP *group, EC_POINT *r,
-                             const BIGNUM *scalar, size_t num,
-                             const EC_POINT *points[], const BIGNUM *scalars[],
-                             BN_CTX *);
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[], const BIGNUM *scalars[],
+    BN_CTX *);
 int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
-                                    const BIGNUM *scalar, size_t num,
-                                    const EC_POINT *points[],
-                                    const BIGNUM *scalars[], BN_CTX *ctx);
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *ctx);
 int ossl_ec_GFp_nistp256_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
 int ossl_ec_GFp_nistp256_have_precompute_mult(const EC_GROUP *group);
 
 /* method functions in ecp_nistp384.c */
 int ossl_ec_GFp_nistp384_group_init(EC_GROUP *group);
 int ossl_ec_GFp_nistp384_group_set_curve(EC_GROUP *group, const BIGNUM *p,
-                                         const BIGNUM *a, const BIGNUM *n,
-                                         BN_CTX *);
+    const BIGNUM *a, const BIGNUM *n,
+    BN_CTX *);
 int ossl_ec_GFp_nistp384_point_get_affine_coordinates(const EC_GROUP *group,
-                                                      const EC_POINT *point,
-                                                      BIGNUM *x, BIGNUM *y,
-                                                      BN_CTX *ctx);
+    const EC_POINT *point,
+    BIGNUM *x, BIGNUM *y,
+    BN_CTX *ctx);
 int ossl_ec_GFp_nistp384_mul(const EC_GROUP *group, EC_POINT *r,
-                             const BIGNUM *scalar, size_t num,
-                             const EC_POINT *points[], const BIGNUM *scalars[],
-                             BN_CTX *);
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[], const BIGNUM *scalars[],
+    BN_CTX *);
 int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
-                                    const BIGNUM *scalar, size_t num,
-                                    const EC_POINT *points[],
-                                    const BIGNUM *scalars[], BN_CTX *ctx);
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *ctx);
 int ossl_ec_GFp_nistp384_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
 int ossl_ec_GFp_nistp384_have_precompute_mult(const EC_GROUP *group);
 const EC_METHOD *ossl_ec_GFp_nistp384_method(void);
@@ -580,45 +584,39 @@ const EC_METHOD *ossl_ec_GFp_nistp384_method(void);
 /* method functions in ecp_nistp521.c */
 int ossl_ec_GFp_nistp521_group_init(EC_GROUP *group);
 int ossl_ec_GFp_nistp521_group_set_curve(EC_GROUP *group, const BIGNUM *p,
-                                         const BIGNUM *a, const BIGNUM *n,
-                                         BN_CTX *);
+    const BIGNUM *a, const BIGNUM *n,
+    BN_CTX *);
 int ossl_ec_GFp_nistp521_point_get_affine_coordinates(const EC_GROUP *group,
-                                                      const EC_POINT *point,
-                                                      BIGNUM *x, BIGNUM *y,
-                                                      BN_CTX *ctx);
+    const EC_POINT *point,
+    BIGNUM *x, BIGNUM *y,
+    BN_CTX *ctx);
 int ossl_ec_GFp_nistp521_mul(const EC_GROUP *group, EC_POINT *r,
-                             const BIGNUM *scalar, size_t num,
-                             const EC_POINT *points[], const BIGNUM *scalars[],
-                             BN_CTX *);
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[], const BIGNUM *scalars[],
+    BN_CTX *);
 int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
-                                    const BIGNUM *scalar, size_t num,
-                                    const EC_POINT *points[],
-                                    const BIGNUM *scalars[], BN_CTX *ctx);
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *ctx);
 int ossl_ec_GFp_nistp521_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
 int ossl_ec_GFp_nistp521_have_precompute_mult(const EC_GROUP *group);
 
 /* utility functions in ecp_nistputil.c */
 void ossl_ec_GFp_nistp_points_make_affine_internal(size_t num, void *point_array,
-                                                   size_t felem_size,
-                                                   void *tmp_felems,
-                                                   void (*felem_one) (void *out),
-                                                   int (*felem_is_zero)
-                                                       (const void *in),
-                                                   void (*felem_assign)
-                                                       (void *out, const void *in),
-                                                   void (*felem_square)
-                                                       (void *out, const void *in),
-                                                   void (*felem_mul)
-                                                       (void *out,
-                                                        const void *in1,
-                                                        const void *in2),
-                                                   void (*felem_inv)
-                                                       (void *out, const void *in),
-                                                   void (*felem_contract)
-                                                       (void *out, const void *in));
+    size_t felem_size,
+    void *tmp_felems,
+    void (*felem_one)(void *out),
+    int (*felem_is_zero)(const void *in),
+    void (*felem_assign)(void *out, const void *in),
+    void (*felem_square)(void *out, const void *in),
+    void (*felem_mul)(void *out,
+        const void *in1,
+        const void *in2),
+    void (*felem_inv)(void *out, const void *in),
+    void (*felem_contract)(void *out, const void *in));
 void ossl_ec_GFp_nistp_recode_scalar_bits(unsigned char *sign,
-                                          unsigned char *digit,
-                                          unsigned char in);
+    unsigned char *digit,
+    unsigned char in);
 #endif
 int ossl_ec_group_simple_order_bits(const EC_GROUP *group);
 
@@ -631,7 +629,7 @@ int ossl_ec_group_simple_order_bits(const EC_GROUP *group);
  *  \return  newly created EC_GROUP object or NULL in case of an error.
  */
 EC_GROUP *ossl_ec_group_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
-                               const EC_METHOD *meth);
+    const EC_METHOD *meth);
 
 #ifdef ECP_NISTZ256_ASM
 /** Returns GFp methods using montgomery multiplication, with x86-64 optimized
@@ -647,9 +645,9 @@ const EC_METHOD *EC_GFp_s390x_nistp521_method(void);
 #endif
 
 size_t ossl_ec_key_simple_priv2oct(const EC_KEY *eckey,
-                                   unsigned char *buf, size_t len);
+    unsigned char *buf, size_t len);
 int ossl_ec_key_simple_oct2priv(EC_KEY *eckey, const unsigned char *buf,
-                                size_t len);
+    size_t len);
 int ossl_ec_key_simple_generate_key(EC_KEY *eckey);
 int ossl_ec_key_simple_generate_public_key(EC_KEY *eckey);
 int ossl_ec_key_simple_check_key(const EC_KEY *eckey);
@@ -674,32 +672,31 @@ struct ec_key_method_st {
     int (*set_public)(EC_KEY *key, const EC_POINT *pub_key);
     int (*keygen)(EC_KEY *key);
     int (*compute_key)(unsigned char **pout, size_t *poutlen,
-                       const EC_POINT *pub_key, const EC_KEY *ecdh);
-    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);
+        const EC_POINT *pub_key, const EC_KEY *ecdh);
+    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);
+        BIGNUM **rp);
     ECDSA_SIG *(*sign_sig)(const unsigned char *dgst, int dgst_len,
-                           const BIGNUM *in_kinv, const BIGNUM *in_r,
-                           EC_KEY *eckey);
+        const BIGNUM *in_kinv, const BIGNUM *in_r,
+        EC_KEY *eckey);
 
     int (*verify)(int type, const unsigned char *dgst, int dgst_len,
-                  const unsigned char *sigbuf, int sig_len, EC_KEY *eckey);
+        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);
+        const ECDSA_SIG *sig, EC_KEY *eckey);
 };
 
-#define EC_KEY_METHOD_DYNAMIC   1
+#define EC_KEY_METHOD_DYNAMIC 1
 
 EC_KEY *ossl_ec_key_new_method_int(OSSL_LIB_CTX *libctx, const char *propq,
-                                   ENGINE *engine);
+    ENGINE *engine);
 
 int ossl_ec_key_gen(EC_KEY *eckey);
 int ossl_ecdh_compute_key(unsigned char **pout, size_t *poutlen,
-                          const EC_POINT *pub_key, const EC_KEY *ecdh);
+    const EC_POINT *pub_key, const EC_KEY *ecdh);
 int ossl_ecdh_simple_compute_key(unsigned char **pout, size_t *poutlen,
-                                 const EC_POINT *pub_key, const EC_KEY *ecdh);
+    const EC_POINT *pub_key, const EC_KEY *ecdh);
 
 struct ECDSA_SIG_st {
     BIGNUM *r;
@@ -707,25 +704,24 @@ struct ECDSA_SIG_st {
 };
 
 int ossl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
-                          BIGNUM **rp);
+    BIGNUM **rp);
 int ossl_ecdsa_sign(int type, const unsigned char *dgst, int dlen,
-                    unsigned char *sig, unsigned int *siglen,
-                    const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey);
+    unsigned char *sig, unsigned int *siglen,
+    const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey);
 ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len,
-                               const BIGNUM *in_kinv, const BIGNUM *in_r,
-                               EC_KEY *eckey);
+    const BIGNUM *in_kinv, const BIGNUM *in_r,
+    EC_KEY *eckey);
 int ossl_ecdsa_verify(int type, const unsigned char *dgst, int dgst_len,
-                      const unsigned char *sigbuf, int sig_len, EC_KEY *eckey);
+    const unsigned char *sigbuf, int sig_len, EC_KEY *eckey);
 int ossl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len,
-                          const ECDSA_SIG *sig, EC_KEY *eckey);
+    const ECDSA_SIG *sig, EC_KEY *eckey);
 int ossl_ecdsa_simple_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
-                                 BIGNUM **rp);
+    BIGNUM **rp);
 ECDSA_SIG *ossl_ecdsa_simple_sign_sig(const unsigned char *dgst, int dgst_len,
-                                      const BIGNUM *in_kinv, const BIGNUM *in_r,
-                                      EC_KEY *eckey);
+    const BIGNUM *in_kinv, const BIGNUM *in_r,
+    EC_KEY *eckey);
 int ossl_ecdsa_simple_verify_sig(const unsigned char *dgst, int dgst_len,
-                                 const ECDSA_SIG *sig, EC_KEY *eckey);
-
+    const ECDSA_SIG *sig, EC_KEY *eckey);
 
 /*-
  * This functions computes a single point multiplication over the EC group,
@@ -757,15 +753,15 @@ int ossl_ecdsa_simple_verify_sig(const unsigned char *dgst, int dgst_len,
  * Returns 1 on success, 0 otherwise.
  */
 int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
-                              const BIGNUM *scalar, const EC_POINT *point,
-                              BN_CTX *ctx);
+    const BIGNUM *scalar, const EC_POINT *point,
+    BN_CTX *ctx);
 
 int ossl_ec_point_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
-                                    BN_CTX *ctx);
+    BN_CTX *ctx);
 
 static ossl_inline int ec_point_ladder_pre(const EC_GROUP *group,
-                                           EC_POINT *r, EC_POINT *s,
-                                           EC_POINT *p, BN_CTX *ctx)
+    EC_POINT *r, EC_POINT *s,
+    EC_POINT *p, BN_CTX *ctx)
 {
     if (group->meth->ladder_pre != NULL)
         return group->meth->ladder_pre(group, r, s, p, ctx);
@@ -778,8 +774,8 @@ static ossl_inline int ec_point_ladder_pre(const EC_GROUP *group,
 }
 
 static ossl_inline int ec_point_ladder_step(const EC_GROUP *group,
-                                            EC_POINT *r, EC_POINT *s,
-                                            EC_POINT *p, BN_CTX *ctx)
+    EC_POINT *r, EC_POINT *s,
+    EC_POINT *p, BN_CTX *ctx)
 {
     if (group->meth->ladder_step != NULL)
         return group->meth->ladder_step(group, r, s, p, ctx);
@@ -789,12 +785,11 @@ static ossl_inline int ec_point_ladder_step(const EC_GROUP *group,
         return 0;
 
     return 1;
-
 }
 
 static ossl_inline int ec_point_ladder_post(const EC_GROUP *group,
-                                            EC_POINT *r, EC_POINT *s,
-                                            EC_POINT *p, BN_CTX *ctx)
+    EC_POINT *r, EC_POINT *s,
+    EC_POINT *p, BN_CTX *ctx)
 {
     if (group->meth->ladder_post != NULL)
         return group->meth->ladder_post(group, r, s, p, ctx);
diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index e9092a6c9db43..18f3d47d936f2 100644
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -35,15 +35,15 @@
 
 /* structure for precomputed multiples of the generator */
 struct ec_pre_comp_st {
-    const EC_GROUP *group;      /* parent EC_GROUP object */
-    size_t blocksize;           /* block size for wNAF splitting */
-    size_t numblocks;           /* max. number of blocks for which we have
-                                 * precomputation */
-    size_t w;                   /* window size */
-    EC_POINT **points;          /* array with pre-calculated multiples of
-                                 * generator: 'num' pointers to EC_POINT
-                                 * objects followed by a NULL */
-    size_t num;                 /* numblocks * 2^(w-1) */
+    const EC_GROUP *group; /* parent EC_GROUP object */
+    size_t blocksize; /* block size for wNAF splitting */
+    size_t numblocks; /* max. number of blocks for which we have
+                       * precomputation */
+    size_t w; /* window size */
+    EC_POINT **points; /* array with pre-calculated multiples of
+                        * generator: 'num' pointers to EC_POINT
+                        * objects followed by a NULL */
+    size_t num; /* numblocks * 2^(w-1) */
     CRYPTO_REF_COUNT references;
 };
 
@@ -59,8 +59,8 @@ static EC_PRE_COMP *ec_pre_comp_new(const EC_GROUP *group)
         return ret;
 
     ret->group = group;
-    ret->blocksize = 8;         /* default */
-    ret->w = 4;                 /* default */
+    ret->blocksize = 8; /* default */
+    ret->w = 4; /* default */
 
     if (!CRYPTO_NEW_REF(&ret->references, 1)) {
         OPENSSL_free(ret);
@@ -101,11 +101,12 @@ void EC_ec_pre_comp_free(EC_PRE_COMP *pre)
     OPENSSL_free(pre);
 }
 
-#define EC_POINT_BN_set_flags(P, flags) do { \
-    BN_set_flags((P)->X, (flags)); \
-    BN_set_flags((P)->Y, (flags)); \
-    BN_set_flags((P)->Z, (flags)); \
-} while(0)
+#define EC_POINT_BN_set_flags(P, flags) \
+    do {                                \
+        BN_set_flags((P)->X, (flags));  \
+        BN_set_flags((P)->Y, (flags));  \
+        BN_set_flags((P)->Z, (flags));  \
+    } while (0)
 
 /*-
  * This functions computes a single point multiplication over the EC group,
@@ -137,8 +138,8 @@ void EC_ec_pre_comp_free(EC_PRE_COMP *pre)
  * Returns 1 on success, 0 otherwise.
  */
 int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
-                              const BIGNUM *scalar, const EC_POINT *point,
-                              BN_CTX *ctx)
+    const BIGNUM *scalar, const EC_POINT *point,
+    BN_CTX *ctx)
 {
     int i, cardinality_bits, group_top, kbit, pbit, Z_is_one;
     EC_POINT *p = NULL;
@@ -261,10 +262,9 @@ int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
     }
 
     /* ensure input point is in affine coords for ladder step efficiency */
-    if (!p->Z_is_one && (group->meth->make_affine == NULL
-                         || !group->meth->make_affine(group, p, ctx))) {
-            ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
-            goto err;
+    if (!p->Z_is_one && (group->meth->make_affine == NULL || !group->meth->make_affine(group, p, ctx))) {
+        ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
+        goto err;
     }
 
     /* Initialize the Montgomery ladder */
@@ -276,14 +276,15 @@ int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
     /* top bit is a 1, in a fixed pos */
     pbit = 1;
 
-#define EC_POINT_CSWAP(c, a, b, w, t) do {         \
+#define EC_POINT_CSWAP(c, a, b, w, t)              \
+    do {                                           \
         BN_consttime_swap(c, (a)->X, (b)->X, w);   \
         BN_consttime_swap(c, (a)->Y, (b)->Y, w);   \
         BN_consttime_swap(c, (a)->Z, (b)->Z, w);   \
         t = ((a)->Z_is_one ^ (b)->Z_is_one) & (c); \
         (a)->Z_is_one ^= (t);                      \
         (b)->Z_is_one ^= (t);                      \
-} while(0)
+    } while (0)
 
     /*-
      * The ladder step, with branches, is
@@ -370,7 +371,7 @@ int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
 
     ret = 1;
 
- err:
+err:
     EC_POINT_free(p);
     EC_POINT_clear_free(s);
     BN_CTX_end(ctx);
@@ -385,14 +386,12 @@ int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
  * sometimes smaller windows will give better performance (thus the
  * boundaries should be increased)
  */
-#define EC_window_bits_for_scalar_size(b) \
-                ((size_t) \
-                 ((b) >= 2000 ? 6 : \
-                  (b) >=  800 ? 5 : \
-                  (b) >=  300 ? 4 : \
-                  (b) >=   70 ? 3 : \
-                  (b) >=   20 ? 2 : \
-                  1))
+#define EC_window_bits_for_scalar_size(b)      \
+    ((size_t)((b) >= 2000 ? 6 : (b) >= 800 ? 5 \
+            : (b) >= 300                   ? 4 \
+            : (b) >= 70                    ? 3 \
+            : (b) >= 20                    ? 2 \
+                                           : 1))
 
 /*-
  * Compute
@@ -402,8 +401,8 @@ int ossl_ec_scalar_mul_ladder(const EC_GROUP *group, EC_POINT *r,
  * in the addition if scalar != NULL
  */
 int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
-                     size_t num, const EC_POINT *points[],
-                     const BIGNUM *scalars[], BN_CTX *ctx)
+    size_t num, const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *ctx)
 {
     const EC_POINT *generator = NULL;
     EC_POINT *tmp = NULL;
@@ -414,19 +413,19 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
     int k;
     int r_is_inverted = 0;
     int r_is_at_infinity = 1;
-    size_t *wsize = NULL;       /* individual window sizes */
-    signed char **wNAF = NULL;  /* individual wNAFs */
+    size_t *wsize = NULL; /* individual window sizes */
+    signed char **wNAF = NULL; /* individual wNAFs */
     size_t *wNAF_len = NULL;
     size_t max_len = 0;
     size_t num_val;
-    EC_POINT **val = NULL;      /* precomputation */
+    EC_POINT **val = NULL; /* precomputation */
     EC_POINT **v;
     EC_POINT ***val_sub = NULL; /* pointers to sub-arrays of 'val' or
                                  * 'pre_comp->points' */
     const EC_PRE_COMP *pre_comp = NULL;
-    int num_scalar = 0;         /* flag: will be set to 1 if 'scalar' must be
-                                 * treated like other scalars, i.e.
-                                 * precomputation is not available */
+    int num_scalar = 0; /* flag: will be set to 1 if 'scalar' must be
+                         * treated like other scalars, i.e.
+                         * precomputation is not available */
     int ret = 0;
 
     if (!BN_is_zero(group->order) && !BN_is_zero(group->cofactor)) {
@@ -455,7 +454,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
              * actually set and we always call the ladder version.
              */
             return ossl_ec_scalar_mul_ladder(group, r, scalars[0], points[0],
-                                             ctx);
+                ctx);
         }
     }
 
@@ -470,8 +469,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 
         pre_comp = group->pre_comp.ec;
         if (pre_comp && pre_comp->numblocks
-            && (EC_POINT_cmp(group, generator, pre_comp->points[0], ctx) ==
-                0)) {
+            && (EC_POINT_cmp(group, generator, pre_comp->points[0], ctx) == 0)) {
             blocksize = pre_comp->blocksize;
 
             /*
@@ -497,8 +495,8 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
             /* can't use precomputation */
             pre_comp = NULL;
             numblocks = 1;
-            num_scalar = 1;     /* treat 'scalar' like 'num'-th element of
-                                 * 'scalars' */
+            num_scalar = 1; /* treat 'scalar' like 'num'-th element of
+                             * 'scalars' */
         }
     }
 
@@ -512,7 +510,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 
     /* Ensure wNAF is initialised in case we end up going to err */
     if (wNAF != NULL)
-        wNAF[0] = NULL;         /* preliminary pivot */
+        wNAF[0] = NULL; /* preliminary pivot */
 
     if (wsize == NULL || wNAF_len == NULL || wNAF == NULL || val_sub == NULL)
         goto err;
@@ -528,10 +526,9 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
         bits = i < num ? BN_num_bits(scalars[i]) : BN_num_bits(scalar);
         wsize[i] = EC_window_bits_for_scalar_size(bits);
         num_val += (size_t)1 << (wsize[i] - 1);
-        wNAF[i + 1] = NULL;     /* make sure we always have a pivot */
-        wNAF[i] =
-            bn_compute_wNAF((i < num ? scalars[i] : scalar), wsize[i],
-                            &wNAF_len[i]);
+        wNAF[i + 1] = NULL; /* make sure we always have a pivot */
+        wNAF[i] = bn_compute_wNAF((i < num ? scalars[i] : scalar), wsize[i],
+            &wNAF_len[i]);
         if (wNAF[i] == NULL)
             goto err;
         if (wNAF_len[i] > max_len)
@@ -654,7 +651,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
     val = OPENSSL_malloc((num_val + 1) * sizeof(val[0]));
     if (val == NULL)
         goto err;
-    val[num_val] = NULL;        /* pivot element */
+    val[num_val] = NULL; /* pivot element */
 
     /* allocate points for precomputation */
     v = val;
@@ -695,8 +692,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
             if (!EC_POINT_dbl(group, tmp, val_sub[i][0], ctx))
                 goto err;
             for (j = 1; j < ((size_t)1 << (wsize[i] - 1)); j++) {
-                if (!EC_POINT_add
-                    (group, val_sub[i][j], val_sub[i][j - 1], tmp, ctx))
+                if (!EC_POINT_add(group, val_sub[i][j], val_sub[i][j - 1], tmp, ctx))
                     goto err;
             }
         }
@@ -754,8 +750,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 
                         r_is_at_infinity = 0;
                     } else {
-                        if (!EC_POINT_add
-                            (group, r, r, val_sub[i][digit >> 1], ctx))
+                        if (!EC_POINT_add(group, r, r, val_sub[i][digit >> 1], ctx))
                             goto err;
                     }
                 }
@@ -774,7 +769,7 @@ int ossl_ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 
     ret = 1;
 
- err:
+err:
     EC_POINT_free(tmp);
     OPENSSL_free(wsize);
     OPENSSL_free(wNAF_len);
@@ -886,7 +881,7 @@ int ossl_ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
         goto err;
 
     var = points;
-    var[num] = NULL;            /* pivot */
+    var[num] = NULL; /* pivot */
     for (i = 0; i < num; i++) {
         if ((var[i] = EC_POINT_new(group)) == NULL) {
             ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
@@ -956,7 +951,7 @@ int ossl_ec_wNAF_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
     pre_comp = NULL;
     ret = 1;
 
- err:
+err:
     if (used_ctx)
         BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
diff --git a/crypto/ec/ec_oct.c b/crypto/ec/ec_oct.c
index 886e5fd310f45..8055ad6c706a6 100644
--- a/crypto/ec/ec_oct.c
+++ b/crypto/ec/ec_oct.c
@@ -22,7 +22,7 @@
 #include "ec_local.h"
 
 int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
-                                        const BIGNUM *x, int y_bit, BN_CTX *ctx)
+    const BIGNUM *x, int y_bit, BN_CTX *ctx)
 {
     if (group->meth->point_set_compressed_coordinates == NULL
         && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT)) {
@@ -36,7 +36,7 @@ int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
     if (group->meth->flags & EC_FLAGS_DEFAULT_OCT) {
         if (group->meth->field_type == NID_X9_62_prime_field)
             return ossl_ec_GFp_simple_set_compressed_coordinates(group, point, x,
-                                                                 y_bit, ctx);
+                y_bit, ctx);
         else
 #ifdef OPENSSL_NO_EC2M
         {
@@ -45,34 +45,34 @@ int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
         }
 #else
             return ossl_ec_GF2m_simple_set_compressed_coordinates(group, point,
-                                                                  x, y_bit, ctx);
+                x, y_bit, ctx);
 #endif
     }
     return group->meth->point_set_compressed_coordinates(group, point, x,
-                                                         y_bit, ctx);
+        y_bit, ctx);
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
-                                            EC_POINT *point, const BIGNUM *x,
-                                            int y_bit, BN_CTX *ctx)
+    EC_POINT *point, const BIGNUM *x,
+    int y_bit, BN_CTX *ctx)
 {
     return EC_POINT_set_compressed_coordinates(group, point, x, y_bit, ctx);
 }
 
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
 int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group,
-                                             EC_POINT *point, const BIGNUM *x,
-                                             int y_bit, BN_CTX *ctx)
+    EC_POINT *point, const BIGNUM *x,
+    int y_bit, BN_CTX *ctx)
 {
     return EC_POINT_set_compressed_coordinates(group, point, x, y_bit, ctx);
 }
-# endif
+#endif
 #endif
 
 size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,
-                          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)
 {
     if (point == NULL) {
         ERR_raise(ERR_LIB_EC, ERR_R_PASSED_NULL_PARAMETER);
@@ -90,7 +90,7 @@ size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,
     if (group->meth->flags & EC_FLAGS_DEFAULT_OCT) {
         if (group->meth->field_type == NID_X9_62_prime_field)
             return ossl_ec_GFp_simple_point2oct(group, point, form, buf, len,
-                                                ctx);
+                ctx);
         else
 #ifdef OPENSSL_NO_EC2M
         {
@@ -99,7 +99,7 @@ size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,
         }
 #else
             return ossl_ec_GF2m_simple_point2oct(group, point,
-                                                 form, buf, len, ctx);
+                form, buf, len, ctx);
 #endif
     }
 
@@ -107,7 +107,7 @@ size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point,
 }
 
 int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point,
-                       const unsigned char *buf, size_t len, BN_CTX *ctx)
+    const unsigned char *buf, size_t len, BN_CTX *ctx)
 {
     if (group->meth->oct2point == 0
         && !(group->meth->flags & EC_FLAGS_DEFAULT_OCT)) {
@@ -135,8 +135,8 @@ int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point,
 }
 
 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)
 {
     size_t len;
     unsigned char *buf;
diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index 716b1860bbf4c..1ef1743d7819b 100644
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c
@@ -102,7 +102,7 @@ static void pkey_ec_cleanup(EVP_PKEY_CTX *ctx)
 }
 
 static int pkey_ec_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-                        const unsigned char *tbs, size_t tbslen)
+    const unsigned char *tbs, size_t tbslen)
 {
     int ret, type;
     unsigned int sltmp;
@@ -140,8 +140,8 @@ static int pkey_ec_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
 }
 
 static int pkey_ec_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 ret, type;
     EC_PKEY_CTX *dctx = ctx->data;
@@ -211,7 +211,7 @@ static int pkey_ec_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen)
 }
 
 static int pkey_ec_kdf_derive(EVP_PKEY_CTX *ctx,
-                              unsigned char *key, size_t *keylen)
+    unsigned char *key, size_t *keylen)
 {
     EC_PKEY_CTX *dctx = ctx->data;
     unsigned char *ktmp = NULL;
@@ -233,12 +233,12 @@ static int pkey_ec_kdf_derive(EVP_PKEY_CTX *ctx,
         goto err;
     /* Do KDF stuff */
     if (!ossl_ecdh_kdf_X9_63(key, *keylen, ktmp, ktmplen,
-                             dctx->kdf_ukm, dctx->kdf_ukmlen, dctx->kdf_md,
-                             ctx->libctx, ctx->propquery))
+            dctx->kdf_ukm, dctx->kdf_ukmlen, dctx->kdf_md,
+            ctx->libctx, ctx->propquery))
         goto err;
     rv = 1;
 
- err:
+err:
     OPENSSL_clear_free(ktmp, ktmplen);
     return rv;
 }
@@ -351,17 +351,7 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
         return dctx->kdf_ukmlen;
 
     case EVP_PKEY_CTRL_MD:
-        if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_ecdsa_with_SHA1 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha384 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha512 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_224 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_256 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_384 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_512 &&
-            EVP_MD_get_type((const EVP_MD *)p2) != NID_sm3) {
+        if (EVP_MD_get_type((const EVP_MD *)p2) != NID_sha1 && EVP_MD_get_type((const EVP_MD *)p2) != NID_ecdsa_with_SHA1 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha256 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha384 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha512 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_224 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_256 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_384 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sha3_512 && EVP_MD_get_type((const EVP_MD *)p2) != NID_sm3) {
             ERR_raise(ERR_LIB_EC, EC_R_INVALID_DIGEST_TYPE);
             return 0;
         }
@@ -381,12 +371,11 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 
     default:
         return -2;
-
     }
 }
 
 static int pkey_ec_ctrl_str(EVP_PKEY_CTX *ctx,
-                            const char *type, const char *value)
+    const char *type, const char *value)
 {
     if (strcmp(type, "ec_paramgen_curve") == 0) {
         int nid;
diff --git a/crypto/ec/ec_print.c b/crypto/ec/ec_print.c
index e14ffc002c0c0..3c7af3bbd9ea8 100644
--- a/crypto/ec/ec_print.c
+++ b/crypto/ec/ec_print.c
@@ -14,8 +14,8 @@
 
 /* the return value must be freed (using OPENSSL_free()) */
 char *EC_POINT_point2hex(const EC_GROUP *group,
-                         const EC_POINT *point,
-                         point_conversion_form_t form, BN_CTX *ctx)
+    const EC_POINT *point,
+    point_conversion_form_t form, BN_CTX *ctx)
 {
     char *ret, *p;
     size_t buf_len, i;
@@ -35,13 +35,13 @@ char *EC_POINT_point2hex(const EC_GROUP *group,
         p += ossl_to_hex(p, buf[i]);
     *p = '\0';
 
- err:
+err:
     OPENSSL_free(buf);
     return ret;
 }
 
 EC_POINT *EC_POINT_hex2point(const EC_GROUP *group,
-                             const char *hex, EC_POINT *point, BN_CTX *ctx)
+    const char *hex, EC_POINT *point, BN_CTX *ctx)
 {
     int ok = 0;
     unsigned char *oct_buf = NULL;
diff --git a/crypto/ec/ecdh_kdf.c b/crypto/ec/ecdh_kdf.c
index de63bf8500b4f..31f297bff6cb4 100644
--- a/crypto/ec/ecdh_kdf.c
+++ b/crypto/ec/ecdh_kdf.c
@@ -22,10 +22,10 @@
 
 /* Key derivation function from X9.63/SECG */
 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 ret = 0;
     EVP_KDF_CTX *kctx = NULL;
@@ -35,11 +35,11 @@ int ossl_ecdh_kdf_X9_63(unsigned char *out, size_t outlen,
 
     if ((kctx = EVP_KDF_CTX_new(kdf)) != NULL) {
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                                (char *)mdname, 0);
+            (char *)mdname, 0);
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
-                                                 (void *)Z, Zlen);
+            (void *)Z, Zlen);
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO,
-                                                 (void *)sinfo, sinfolen);
+            (void *)sinfo, sinfolen);
         *p = OSSL_PARAM_construct_end();
 
         ret = EVP_KDF_derive(kctx, out, outlen, params) > 0;
@@ -55,11 +55,11 @@ int ossl_ecdh_kdf_X9_63(unsigned char *out, size_t outlen,
  */
 #ifndef OPENSSL_NO_DEPRECATED_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)
 {
     return ossl_ecdh_kdf_X9_63(out, outlen, Z, Zlen, sinfo, sinfolen, md, NULL,
-                               NULL);
+        NULL);
 }
 #endif
diff --git a/crypto/ec/ecdh_ossl.c b/crypto/ec/ecdh_ossl.c
index 41f7e39046145..595cbb8a87766 100644
--- a/crypto/ec/ecdh_ossl.c
+++ b/crypto/ec/ecdh_ossl.c
@@ -26,7 +26,7 @@
 #include "ec_local.h"
 
 int ossl_ecdh_compute_key(unsigned char **psec, size_t *pseclen,
-                          const EC_POINT *pub_key, const EC_KEY *ecdh)
+    const EC_POINT *pub_key, const EC_KEY *ecdh)
 {
     if (ecdh->group->meth->ecdh_compute_key == NULL) {
         ERR_raise(ERR_LIB_EC, EC_R_CURVE_DOES_NOT_SUPPORT_ECDH);
@@ -47,7 +47,7 @@ int ossl_ecdh_compute_key(unsigned char **psec, size_t *pseclen,
  * (ECC CDH) Primitive:". The steps listed below refer to SP800-56A.
  */
 int ossl_ecdh_simple_compute_key(unsigned char **pout, size_t *poutlen,
-                                 const EC_POINT *pub_key, const EC_KEY *ecdh)
+    const EC_POINT *pub_key, const EC_KEY *ecdh)
 {
     BN_CTX *ctx;
     EC_POINT *tmp = NULL;
@@ -136,7 +136,7 @@ int ossl_ecdh_simple_compute_key(unsigned char **pout, size_t *poutlen,
 
     ret = 1;
 
- err:
+err:
     /* Step(4) : Destroy all intermediate calculations */
     BN_clear(x);
     EC_POINT_clear_free(tmp);
diff --git a/crypto/ec/ecdsa_ossl.c b/crypto/ec/ecdsa_ossl.c
index 6104e5cbfc96e..83bb6294b0c75 100644
--- a/crypto/ec/ecdsa_ossl.c
+++ b/crypto/ec/ecdsa_ossl.c
@@ -31,13 +31,13 @@
 #define MAX_ECDSA_SIGN_RETRIES 8
 
 static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
-                            BIGNUM **kinvp, BIGNUM **rp,
-                            const unsigned char *dgst, int dlen,
-                            unsigned int nonce_type, const char *digestname,
-                            OSSL_LIB_CTX *libctx, const char *propq);
+    BIGNUM **kinvp, BIGNUM **rp,
+    const unsigned char *dgst, int dlen,
+    unsigned int nonce_type, const char *digestname,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 int ossl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
-                          BIGNUM **rp)
+    BIGNUM **rp)
 {
     if (eckey->group->meth->ecdsa_sign_setup == NULL) {
         ERR_raise(ERR_LIB_EC, EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA);
@@ -48,8 +48,8 @@ int ossl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
 }
 
 ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len,
-                               const BIGNUM *in_kinv, const BIGNUM *in_r,
-                               EC_KEY *eckey)
+    const BIGNUM *in_kinv, const BIGNUM *in_r,
+    EC_KEY *eckey)
 {
     if (eckey->group->meth->ecdsa_sign_sig == NULL) {
         ERR_raise(ERR_LIB_EC, EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA);
@@ -57,11 +57,11 @@ ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len,
     }
 
     return eckey->group->meth->ecdsa_sign_sig(dgst, dgst_len,
-                                              in_kinv, in_r, eckey);
+        in_kinv, in_r, eckey);
 }
 
 int ossl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len,
-                          const ECDSA_SIG *sig, EC_KEY *eckey)
+    const ECDSA_SIG *sig, EC_KEY *eckey)
 {
     if (eckey->group->meth->ecdsa_verify_sig == NULL) {
         ERR_raise(ERR_LIB_EC, EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA);
@@ -72,8 +72,8 @@ int ossl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len,
 }
 
 int ossl_ecdsa_sign(int type, const unsigned char *dgst, int dlen,
-                    unsigned char *sig, unsigned int *siglen,
-                    const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey)
+    unsigned char *sig, unsigned int *siglen,
+    const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey)
 {
     ECDSA_SIG *s;
 
@@ -93,10 +93,10 @@ int ossl_ecdsa_sign(int type, const unsigned char *dgst, int dlen,
 }
 
 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)
+    unsigned char *sig, unsigned int *siglen,
+    EC_KEY *eckey, unsigned int nonce_type,
+    const char *digestname,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     ECDSA_SIG *s;
     BIGNUM *kinv = NULL, *r = NULL;
@@ -113,7 +113,7 @@ int ossl_ecdsa_deterministic_sign(const unsigned char *dgst, int dlen,
 
     *siglen = 0;
     if (!ecdsa_sign_setup(eckey, NULL, &kinv, &r, dgst, dlen,
-                          nonce_type, digestname, libctx, propq))
+            nonce_type, digestname, libctx, propq))
         return 0;
 
     s = ECDSA_do_sign_ex(dgst, dlen, kinv, r, eckey);
@@ -130,10 +130,10 @@ int ossl_ecdsa_deterministic_sign(const unsigned char *dgst, int dlen,
 }
 
 static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
-                            BIGNUM **kinvp, BIGNUM **rp,
-                            const unsigned char *dgst, int dlen,
-                            unsigned int nonce_type, const char *digestname,
-                            OSSL_LIB_CTX *libctx, const char *propq)
+    BIGNUM **kinvp, BIGNUM **rp,
+    const unsigned char *dgst, int dlen,
+    unsigned int nonce_type, const char *digestname,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     BN_CTX *ctx = NULL;
     BIGNUM *k = NULL, *r = NULL, *X = NULL;
@@ -165,8 +165,8 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
         }
     }
 
-    k = BN_secure_new();        /* this value is later returned in *kinvp */
-    r = BN_new();               /* this value is later returned in *rp */
+    k = BN_secure_new(); /* this value is later returned in *kinvp */
+    r = BN_new(); /* this value is later returned in *rp */
     X = BN_new();
     if (k == NULL || r == NULL || X == NULL) {
         ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
@@ -200,14 +200,14 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
                 if (nonce_type == 1) {
 #ifndef FIPS_MODULE
                     res = ossl_gen_deterministic_nonce_rfc6979(k, order,
-                                                               priv_key,
-                                                               dgst, dlen,
-                                                               digestname,
-                                                               libctx, propq);
+                        priv_key,
+                        dgst, dlen,
+                        digestname,
+                        libctx, propq);
 #endif
                 } else {
                     res = ossl_bn_gen_dsa_nonce_fixed_top(k, order, priv_key,
-                                                          dgst, dlen, ctx);
+                        dgst, dlen, ctx);
                 }
             } else {
                 res = ossl_bn_priv_rand_range_fixed_top(k, order, 0, ctx);
@@ -248,7 +248,7 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
     *rp = r;
     *kinvp = k;
     ret = 1;
- err:
+err:
     if (!ret) {
         BN_clear_free(k);
         BN_clear_free(r);
@@ -261,15 +261,15 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in,
 }
 
 int ossl_ecdsa_simple_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
-                                 BIGNUM **rp)
+    BIGNUM **rp)
 {
     return ecdsa_sign_setup(eckey, ctx_in, kinvp, rp, NULL, 0,
-                            0, NULL, NULL, NULL);
+        0, NULL, NULL, NULL);
 }
 
 ECDSA_SIG *ossl_ecdsa_simple_sign_sig(const unsigned char *dgst, int dgst_len,
-                                      const BIGNUM *in_kinv, const BIGNUM *in_r,
-                                      EC_KEY *eckey)
+    const BIGNUM *in_kinv, const BIGNUM *in_r,
+    EC_KEY *eckey)
 {
     int ok = 0, i;
     int retries = 0;
@@ -339,7 +339,7 @@ ECDSA_SIG *ossl_ecdsa_simple_sign_sig(const unsigned char *dgst, int dgst_len,
     do {
         if (in_kinv == NULL || in_r == NULL) {
             if (!ecdsa_sign_setup(eckey, ctx, &kinv, &ret->r, dgst, dgst_len,
-                                  0, NULL, NULL, NULL)) {
+                    0, NULL, NULL, NULL)) {
                 ERR_raise(ERR_LIB_EC, ERR_R_ECDSA_LIB);
                 goto err;
             }
@@ -399,7 +399,7 @@ ECDSA_SIG *ossl_ecdsa_simple_sign_sig(const unsigned char *dgst, int dgst_len,
     } while (1);
 
     ok = 1;
- err:
+err:
     if (!ok) {
         ECDSA_SIG_free(ret);
         ret = NULL;
@@ -417,7 +417,7 @@ ECDSA_SIG *ossl_ecdsa_simple_sign_sig(const unsigned char *dgst, int dgst_len,
  *     -1: error
  */
 int ossl_ecdsa_verify(int type, const unsigned char *dgst, int dgst_len,
-                      const unsigned char *sigbuf, int sig_len, EC_KEY *eckey)
+    const unsigned char *sigbuf, int sig_len, EC_KEY *eckey)
 {
     ECDSA_SIG *s;
     const unsigned char *p = sigbuf;
@@ -435,14 +435,14 @@ int ossl_ecdsa_verify(int type, const unsigned char *dgst, int dgst_len,
     if (derlen != sig_len || memcmp(sigbuf, der, derlen) != 0)
         goto err;
     ret = ECDSA_do_verify(dgst, dgst_len, s, eckey);
- err:
+err:
     OPENSSL_free(der);
     ECDSA_SIG_free(s);
     return ret;
 }
 
 int ossl_ecdsa_simple_verify_sig(const unsigned char *dgst, int dgst_len,
-                                 const ECDSA_SIG *sig, EC_KEY *eckey)
+    const ECDSA_SIG *sig, EC_KEY *eckey)
 {
     int ret = -1, i;
     BN_CTX *ctx;
@@ -453,8 +453,7 @@ int ossl_ecdsa_simple_verify_sig(const unsigned char *dgst, int dgst_len,
     const EC_POINT *pub_key;
 
     /* check input values */
-    if (eckey == NULL || (group = EC_KEY_get0_group(eckey)) == NULL ||
-        (pub_key = EC_KEY_get0_public_key(eckey)) == NULL || sig == NULL) {
+    if (eckey == NULL || (group = EC_KEY_get0_group(eckey)) == NULL || (pub_key = EC_KEY_get0_public_key(eckey)) == NULL || sig == NULL) {
         ERR_raise(ERR_LIB_EC, EC_R_MISSING_PARAMETERS);
         return -1;
     }
@@ -485,11 +484,9 @@ int ossl_ecdsa_simple_verify_sig(const unsigned char *dgst, int dgst_len,
         goto err;
     }
 
-    if (BN_is_zero(sig->r) || BN_is_negative(sig->r) ||
-        BN_ucmp(sig->r, order) >= 0 || BN_is_zero(sig->s) ||
-        BN_is_negative(sig->s) || BN_ucmp(sig->s, order) >= 0) {
+    if (BN_is_zero(sig->r) || BN_is_negative(sig->r) || BN_ucmp(sig->r, order) >= 0 || BN_is_zero(sig->s) || BN_is_negative(sig->s) || BN_ucmp(sig->s, order) >= 0) {
         ERR_raise(ERR_LIB_EC, EC_R_BAD_SIGNATURE);
-        ret = 0;                /* signature is invalid */
+        ret = 0; /* signature is invalid */
         goto err;
     }
     /* calculate tmp1 = inv(S) mod order */
@@ -544,7 +541,7 @@ int ossl_ecdsa_simple_verify_sig(const unsigned char *dgst, int dgst_len,
     }
     /*  if the signature is correct u1 is equal to sig->r */
     ret = (BN_ucmp(u1, sig->r) == 0);
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     EC_POINT_free(point);
diff --git a/crypto/ec/ecdsa_sign.c b/crypto/ec/ecdsa_sign.c
index 0c0748c84f871..eef54129444f3 100644
--- a/crypto/ec/ecdsa_sign.c
+++ b/crypto/ec/ecdsa_sign.c
@@ -23,8 +23,8 @@ ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey)
 }
 
 ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dlen,
-                            const BIGNUM *kinv, const BIGNUM *rp,
-                            EC_KEY *eckey)
+    const BIGNUM *kinv, const BIGNUM *rp,
+    EC_KEY *eckey)
 {
     if (eckey->meth->sign_sig != NULL)
         return eckey->meth->sign_sig(dgst, dlen, kinv, rp, eckey);
@@ -32,15 +32,14 @@ ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dlen,
     return NULL;
 }
 
-int ECDSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char
-               *sig, unsigned int *siglen, EC_KEY *eckey)
+int ECDSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig, unsigned int *siglen, EC_KEY *eckey)
 {
     return ECDSA_sign_ex(type, dgst, dlen, sig, siglen, NULL, NULL, eckey);
 }
 
 int ECDSA_sign_ex(int type, const unsigned char *dgst, int dlen,
-                  unsigned char *sig, unsigned int *siglen, const BIGNUM *kinv,
-                  const BIGNUM *r, EC_KEY *eckey)
+    unsigned char *sig, unsigned int *siglen, const BIGNUM *kinv,
+    const BIGNUM *r, EC_KEY *eckey)
 {
     if (eckey->meth->sign != NULL)
         return eckey->meth->sign(type, dgst, dlen, sig, siglen, kinv, r, eckey);
@@ -49,7 +48,7 @@ int ECDSA_sign_ex(int type, const unsigned char *dgst, int dlen,
 }
 
 int ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
-                     BIGNUM **rp)
+    BIGNUM **rp)
 {
     if (eckey->meth->sign_setup != NULL)
         return eckey->meth->sign_setup(eckey, ctx_in, kinvp, rp);
diff --git a/crypto/ec/ecdsa_vrf.c b/crypto/ec/ecdsa_vrf.c
index c148ecdb7cf61..4a27b400d7bbe 100644
--- a/crypto/ec/ecdsa_vrf.c
+++ b/crypto/ec/ecdsa_vrf.c
@@ -24,7 +24,7 @@
  *     -1: error
  */
 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)
 {
     if (eckey->meth->verify_sig != NULL)
         return eckey->meth->verify_sig(dgst, dgst_len, sig, eckey);
@@ -39,11 +39,11 @@ int ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
  *     -1: error
  */
 int ECDSA_verify(int type, const unsigned char *dgst, int dgst_len,
-                 const unsigned char *sigbuf, int sig_len, EC_KEY *eckey)
+    const unsigned char *sigbuf, int sig_len, EC_KEY *eckey)
 {
     if (eckey->meth->verify != NULL)
         return eckey->meth->verify(type, dgst, dgst_len, sigbuf, sig_len,
-                                   eckey);
+            eckey);
     ERR_raise(ERR_LIB_EC, EC_R_OPERATION_NOT_SUPPORTED);
     return -1;
 }
diff --git a/crypto/ec/eck_prn.c b/crypto/ec/eck_prn.c
index 1bb58c6f33851..595129c89d651 100644
--- a/crypto/ec/eck_prn.c
+++ b/crypto/ec/eck_prn.c
@@ -17,7 +17,7 @@
 #include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off)
 {
     BIO *b;
@@ -65,7 +65,7 @@ int ECParameters_print_fp(FILE *fp, const EC_KEY *x)
 #endif /* OPENSSL_NO_STDIO */
 
 static int print_bin(BIO *fp, const char *str, const unsigned char *num,
-                     size_t len, int off);
+    size_t len, int off);
 
 int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 {
@@ -125,8 +125,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
         if (tmp_nid == NID_X9_62_characteristic_two_field)
             is_char_two = 1;
 
-        if ((p = BN_new()) == NULL || (a = BN_new()) == NULL ||
-            (b = BN_new()) == NULL) {
+        if ((p = BN_new()) == NULL || (a = BN_new()) == NULL || (b = BN_new()) == NULL) {
             reason = ERR_R_BN_LIB;
             goto err;
         }
@@ -176,12 +175,12 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
                 goto err;
 
             if (BIO_printf(bp, "Basis Type: %s\n",
-                           OBJ_nid2sn(basis_type)) <= 0)
+                    OBJ_nid2sn(basis_type))
+                <= 0)
                 goto err;
 
             /* print the polynomial */
-            if ((p != NULL) && !ASN1_bn_print(bp, "Polynomial:", p, NULL,
-                                              off))
+            if ((p != NULL) && !ASN1_bn_print(bp, "Polynomial:", p, NULL, off))
                 goto err;
         } else {
             if ((p != NULL) && !ASN1_bn_print(bp, "Prime:", p, NULL, off))
@@ -204,14 +203,13 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 
         if ((order != NULL) && !ASN1_bn_print(bp, "Order: ", order, NULL, off))
             goto err;
-        if ((cofactor != NULL) && !ASN1_bn_print(bp, "Cofactor: ", cofactor,
-                                                 NULL, off))
+        if ((cofactor != NULL) && !ASN1_bn_print(bp, "Cofactor: ", cofactor, NULL, off))
             goto err;
         if (seed && !print_bin(bp, "Seed:", seed, seed_len, off))
             goto err;
     }
     ret = 1;
- err:
+err:
     if (!ret)
         ERR_raise(ERR_LIB_EC, reason);
     BN_free(p);
@@ -223,7 +221,7 @@ int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off)
 }
 
 static int print_bin(BIO *fp, const char *name, const unsigned char *buf,
-                     size_t len, int off)
+    size_t len, int off)
 {
     size_t i;
     char str[128 + 1 + 4];
@@ -250,8 +248,7 @@ static int print_bin(BIO *fp, const char *name, const unsigned char *buf,
             if (BIO_write(fp, str, off + 1 + 4) <= 0)
                 return 0;
         }
-        if (BIO_printf(fp, "%02x%s", buf[i], ((i + 1) == len) ? "" : ":") <=
-            0)
+        if (BIO_printf(fp, "%02x%s", buf[i], ((i + 1) == len) ? "" : ":") <= 0)
             return 0;
     }
     if (BIO_write(fp, "\n", 1) <= 0)
diff --git a/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c
index 12750b6003da0..2ed4a6d6c4461 100644
--- a/crypto/ec/ecp_mont.c
+++ b/crypto/ec/ecp_mont.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2025 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -48,12 +48,12 @@ const EC_METHOD *EC_GFp_mont_method(void)
         ossl_ec_GFp_simple_cmp,
         ossl_ec_GFp_simple_make_affine,
         ossl_ec_GFp_simple_points_make_affine,
-        0 /* mul */ ,
-        0 /* precompute_mult */ ,
-        0 /* have_precompute_mult */ ,
+        0 /* mul */,
+        0 /* precompute_mult */,
+        0 /* have_precompute_mult */,
         ossl_ec_GFp_mont_field_mul,
         ossl_ec_GFp_mont_field_sqr,
-        0 /* field_div */ ,
+        0 /* field_div */,
         ossl_ec_GFp_mont_field_inv,
         ossl_ec_GFp_mont_field_encode,
         ossl_ec_GFp_mont_field_decode,
@@ -133,15 +133,15 @@ int ossl_ec_GFp_mont_group_copy(EC_GROUP *dest, const EC_GROUP *src)
 
     return 1;
 
- err:
+err:
     BN_MONT_CTX_free(dest->field_data1);
     dest->field_data1 = NULL;
     return 0;
 }
 
 int ossl_ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p,
-                                     const BIGNUM *a, const BIGNUM *b,
-                                     BN_CTX *ctx)
+    const BIGNUM *a, const BIGNUM *b,
+    BN_CTX *ctx)
 {
     BN_CTX *new_ctx = NULL;
     BN_MONT_CTX *mont = NULL;
@@ -186,7 +186,7 @@ int ossl_ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p,
         group->field_data2 = NULL;
     }
 
- err:
+err:
     BN_free(one);
     BN_CTX_free(new_ctx);
     BN_MONT_CTX_free(mont);
@@ -194,7 +194,7 @@ int ossl_ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p,
 }
 
 int ossl_ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
-                               const BIGNUM *b, BN_CTX *ctx)
+    const BIGNUM *b, BN_CTX *ctx)
 {
     if (group->field_data1 == NULL) {
         ERR_raise(ERR_LIB_EC, EC_R_NOT_INITIALIZED);
@@ -205,7 +205,7 @@ int ossl_ec_GFp_mont_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a
 }
 
 int ossl_ec_GFp_mont_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
-                               BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (group->field_data1 == NULL) {
         ERR_raise(ERR_LIB_EC, EC_R_NOT_INITIALIZED);
@@ -221,7 +221,7 @@ int ossl_ec_GFp_mont_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a
  * We have a Mont structure, so SCA hardening is FLT inversion.
  */
 int ossl_ec_GFp_mont_field_inv(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
-                               BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     BIGNUM *e = NULL;
     BN_CTX *new_ctx = NULL;
@@ -231,7 +231,7 @@ int ossl_ec_GFp_mont_field_inv(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a
         return 0;
 
     if (ctx == NULL
-            && (ctx = new_ctx = BN_CTX_secure_new_ex(group->libctx)) == NULL)
+        && (ctx = new_ctx = BN_CTX_secure_new_ex(group->libctx)) == NULL)
         return 0;
 
     BN_CTX_start(ctx);
@@ -258,14 +258,14 @@ int ossl_ec_GFp_mont_field_inv(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a
 
     ret = 1;
 
-  err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
 }
 
 int ossl_ec_GFp_mont_field_encode(const EC_GROUP *group, BIGNUM *r,
-                                  const BIGNUM *a, BN_CTX *ctx)
+    const BIGNUM *a, BN_CTX *ctx)
 {
     if (group->field_data1 == NULL) {
         ERR_raise(ERR_LIB_EC, EC_R_NOT_INITIALIZED);
@@ -276,7 +276,7 @@ int ossl_ec_GFp_mont_field_encode(const EC_GROUP *group, BIGNUM *r,
 }
 
 int ossl_ec_GFp_mont_field_decode(const EC_GROUP *group, BIGNUM *r,
-                                  const BIGNUM *a, BN_CTX *ctx)
+    const BIGNUM *a, BN_CTX *ctx)
 {
     if (group->field_data1 == NULL) {
         ERR_raise(ERR_LIB_EC, EC_R_NOT_INITIALIZED);
@@ -287,7 +287,7 @@ int ossl_ec_GFp_mont_field_decode(const EC_GROUP *group, BIGNUM *r,
 }
 
 int ossl_ec_GFp_mont_field_set_to_one(const EC_GROUP *group, BIGNUM *r,
-                                      BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (group->field_data2 == NULL) {
         ERR_raise(ERR_LIB_EC, EC_R_NOT_INITIALIZED);
diff --git a/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c
index 3efd43e64c750..9c6e38b4076d7 100644
--- a/crypto/ec/ecp_nist.c
+++ b/crypto/ec/ecp_nist.c
@@ -50,16 +50,16 @@ const EC_METHOD *EC_GFp_nist_method(void)
         ossl_ec_GFp_simple_cmp,
         ossl_ec_GFp_simple_make_affine,
         ossl_ec_GFp_simple_points_make_affine,
-        0 /* mul */ ,
-        0 /* precompute_mult */ ,
-        0 /* have_precompute_mult */ ,
+        0 /* mul */,
+        0 /* precompute_mult */,
+        0 /* have_precompute_mult */,
         ossl_ec_GFp_nist_field_mul,
         ossl_ec_GFp_nist_field_sqr,
-        0 /* field_div */ ,
+        0 /* field_div */,
         ossl_ec_GFp_simple_field_inv,
-        0 /* field_encode */ ,
-        0 /* field_decode */ ,
-        0,                      /* field_set_to_one */
+        0 /* field_encode */,
+        0 /* field_decode */,
+        0, /* field_set_to_one */
         ossl_ec_key_simple_priv2oct,
         ossl_ec_key_simple_oct2priv,
         0, /* set private */
@@ -90,8 +90,8 @@ int ossl_ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)
 }
 
 int ossl_ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
-                                     const BIGNUM *a, const BIGNUM *b,
-                                     BN_CTX *ctx)
+    const BIGNUM *a, const BIGNUM *b,
+    BN_CTX *ctx)
 {
     int ret = 0;
     BN_CTX *new_ctx = NULL;
@@ -119,14 +119,14 @@ int ossl_ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
 
     ret = ossl_ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
 }
 
 int ossl_ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
-                               const BIGNUM *b, BN_CTX *ctx)
+    const BIGNUM *b, BN_CTX *ctx)
 {
     int ret = 0;
     BN_CTX *ctx_new = NULL;
@@ -145,13 +145,13 @@ int ossl_ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a
         goto err;
 
     ret = 1;
- err:
+err:
     BN_CTX_free(ctx_new);
     return ret;
 }
 
 int ossl_ec_GFp_nist_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
-                               BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret = 0;
     BN_CTX *ctx_new = NULL;
@@ -170,7 +170,7 @@ int ossl_ec_GFp_nist_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a
         goto err;
 
     ret = 1;
- err:
+err:
     BN_CTX_free(ctx_new);
     return ret;
 }
diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c
index 6485f46f717c4..553c0c20204b2 100644
--- a/crypto/ec/ecp_nistp224.c
+++ b/crypto/ec/ecp_nistp224.c
@@ -46,7 +46,7 @@
 #include "internal/numbers.h"
 
 #ifndef INT128_MAX
-# error "Your compiler doesn't appear to support 128-bit integer types"
+#error "Your compiler doesn't appear to support 128-bit integer types"
 #endif
 
 typedef uint8_t u8;
@@ -87,21 +87,21 @@ typedef widelimb widefelem[7];
 typedef u8 felem_bytearray[28];
 
 static const felem_bytearray nistp224_curve_params[5] = {
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* p */
-     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* a */
-     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
-     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE},
-    {0xB4, 0x05, 0x0A, 0x85, 0x0C, 0x04, 0xB3, 0xAB, 0xF5, 0x41, /* b */
-     0x32, 0x56, 0x50, 0x44, 0xB0, 0xB7, 0xD7, 0xBF, 0xD8, 0xBA,
-     0x27, 0x0B, 0x39, 0x43, 0x23, 0x55, 0xFF, 0xB4},
-    {0xB7, 0x0E, 0x0C, 0xBD, 0x6B, 0xB4, 0xBF, 0x7F, 0x32, 0x13, /* x */
-     0x90, 0xB9, 0x4A, 0x03, 0xC1, 0xD3, 0x56, 0xC2, 0x11, 0x22,
-     0x34, 0x32, 0x80, 0xD6, 0x11, 0x5C, 0x1D, 0x21},
-    {0xbd, 0x37, 0x63, 0x88, 0xb5, 0xf7, 0x23, 0xfb, 0x4c, 0x22, /* y */
-     0xdf, 0xe6, 0xcd, 0x43, 0x75, 0xa0, 0x5a, 0x07, 0x47, 0x64,
-     0x44, 0xd5, 0x81, 0x99, 0x85, 0x00, 0x7e, 0x34}
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* p */
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* a */
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE },
+    { 0xB4, 0x05, 0x0A, 0x85, 0x0C, 0x04, 0xB3, 0xAB, 0xF5, 0x41, /* b */
+        0x32, 0x56, 0x50, 0x44, 0xB0, 0xB7, 0xD7, 0xBF, 0xD8, 0xBA,
+        0x27, 0x0B, 0x39, 0x43, 0x23, 0x55, 0xFF, 0xB4 },
+    { 0xB7, 0x0E, 0x0C, 0xBD, 0x6B, 0xB4, 0xBF, 0x7F, 0x32, 0x13, /* x */
+        0x90, 0xB9, 0x4A, 0x03, 0xC1, 0xD3, 0x56, 0xC2, 0x11, 0x22,
+        0x34, 0x32, 0x80, 0xD6, 0x11, 0x5C, 0x1D, 0x21 },
+    { 0xbd, 0x37, 0x63, 0x88, 0xb5, 0xf7, 0x23, 0xfb, 0x4c, 0x22, /* y */
+        0xdf, 0xe6, 0xcd, 0x43, 0x75, 0xa0, 0x5a, 0x07, 0x47, 0x64,
+        0x44, 0xd5, 0x81, 0x99, 0x85, 0x00, 0x7e, 0x34 }
 };
 
 /*-
@@ -136,102 +136,102 @@ static const felem_bytearray nistp224_curve_params[5] = {
  * and then another four locations using the second 16 elements.
  */
 static const felem gmul[2][16][3] = {
-{{{0, 0, 0, 0},
-  {0, 0, 0, 0},
-  {0, 0, 0, 0}},
- {{0x3280d6115c1d21, 0xc1d356c2112234, 0x7f321390b94a03, 0xb70e0cbd6bb4bf},
-  {0xd5819985007e34, 0x75a05a07476444, 0xfb4c22dfe6cd43, 0xbd376388b5f723},
-  {1, 0, 0, 0}},
- {{0xfd9675666ebbe9, 0xbca7664d40ce5e, 0x2242df8d8a2a43, 0x1f49bbb0f99bc5},
-  {0x29e0b892dc9c43, 0xece8608436e662, 0xdc858f185310d0, 0x9812dd4eb8d321},
-  {1, 0, 0, 0}},
- {{0x6d3e678d5d8eb8, 0x559eed1cb362f1, 0x16e9a3bbce8a3f, 0xeedcccd8c2a748},
-  {0xf19f90ed50266d, 0xabf2b4bf65f9df, 0x313865468fafec, 0x5cb379ba910a17},
-  {1, 0, 0, 0}},
- {{0x0641966cab26e3, 0x91fb2991fab0a0, 0xefec27a4e13a0b, 0x0499aa8a5f8ebe},
-  {0x7510407766af5d, 0x84d929610d5450, 0x81d77aae82f706, 0x6916f6d4338c5b},
-  {1, 0, 0, 0}},
- {{0xea95ac3b1f15c6, 0x086000905e82d4, 0xdd323ae4d1c8b1, 0x932b56be7685a3},
-  {0x9ef93dea25dbbf, 0x41665960f390f0, 0xfdec76dbe2a8a7, 0x523e80f019062a},
-  {1, 0, 0, 0}},
- {{0x822fdd26732c73, 0xa01c83531b5d0f, 0x363f37347c1ba4, 0xc391b45c84725c},
-  {0xbbd5e1b2d6ad24, 0xddfbcde19dfaec, 0xc393da7e222a7f, 0x1efb7890ede244},
-  {1, 0, 0, 0}},
- {{0x4c9e90ca217da1, 0xd11beca79159bb, 0xff8d33c2c98b7c, 0x2610b39409f849},
-  {0x44d1352ac64da0, 0xcdbb7b2c46b4fb, 0x966c079b753c89, 0xfe67e4e820b112},
-  {1, 0, 0, 0}},
- {{0xe28cae2df5312d, 0xc71b61d16f5c6e, 0x79b7619a3e7c4c, 0x05c73240899b47},
-  {0x9f7f6382c73e3a, 0x18615165c56bda, 0x641fab2116fd56, 0x72855882b08394},
-  {1, 0, 0, 0}},
- {{0x0469182f161c09, 0x74a98ca8d00fb5, 0xb89da93489a3e0, 0x41c98768fb0c1d},
-  {0xe5ea05fb32da81, 0x3dce9ffbca6855, 0x1cfe2d3fbf59e6, 0x0e5e03408738a7},
-  {1, 0, 0, 0}},
- {{0xdab22b2333e87f, 0x4430137a5dd2f6, 0xe03ab9f738beb8, 0xcb0c5d0dc34f24},
-  {0x764a7df0c8fda5, 0x185ba5c3fa2044, 0x9281d688bcbe50, 0xc40331df893881},
-  {1, 0, 0, 0}},
- {{0xb89530796f0f60, 0xade92bd26909a3, 0x1a0c83fb4884da, 0x1765bf22a5a984},
-  {0x772a9ee75db09e, 0x23bc6c67cec16f, 0x4c1edba8b14e2f, 0xe2a215d9611369},
-  {1, 0, 0, 0}},
- {{0x571e509fb5efb3, 0xade88696410552, 0xc8ae85fada74fe, 0x6c7e4be83bbde3},
-  {0xff9f51160f4652, 0xb47ce2495a6539, 0xa2946c53b582f4, 0x286d2db3ee9a60},
-  {1, 0, 0, 0}},
- {{0x40bbd5081a44af, 0x0995183b13926c, 0xbcefba6f47f6d0, 0x215619e9cc0057},
-  {0x8bc94d3b0df45e, 0xf11c54a3694f6f, 0x8631b93cdfe8b5, 0xe7e3f4b0982db9},
-  {1, 0, 0, 0}},
- {{0xb17048ab3e1c7b, 0xac38f36ff8a1d8, 0x1c29819435d2c6, 0xc813132f4c07e9},
-  {0x2891425503b11f, 0x08781030579fea, 0xf5426ba5cc9674, 0x1e28ebf18562bc},
-  {1, 0, 0, 0}},
- {{0x9f31997cc864eb, 0x06cd91d28b5e4c, 0xff17036691a973, 0xf1aef351497c58},
-  {0xdd1f2d600564ff, 0xdead073b1402db, 0x74a684435bd693, 0xeea7471f962558},
-  {1, 0, 0, 0}}},
-{{{0, 0, 0, 0},
-  {0, 0, 0, 0},
-  {0, 0, 0, 0}},
- {{0x9665266dddf554, 0x9613d78b60ef2d, 0xce27a34cdba417, 0xd35ab74d6afc31},
-  {0x85ccdd22deb15e, 0x2137e5783a6aab, 0xa141cffd8c93c6, 0x355a1830e90f2d},
-  {1, 0, 0, 0}},
- {{0x1a494eadaade65, 0xd6da4da77fe53c, 0xe7992996abec86, 0x65c3553c6090e3},
-  {0xfa610b1fb09346, 0xf1c6540b8a4aaf, 0xc51a13ccd3cbab, 0x02995b1b18c28a},
-  {1, 0, 0, 0}},
- {{0x7874568e7295ef, 0x86b419fbe38d04, 0xdc0690a7550d9a, 0xd3966a44beac33},
-  {0x2b7280ec29132f, 0xbeaa3b6a032df3, 0xdc7dd88ae41200, 0xd25e2513e3a100},
-  {1, 0, 0, 0}},
- {{0x924857eb2efafd, 0xac2bce41223190, 0x8edaa1445553fc, 0x825800fd3562d5},
-  {0x8d79148ea96621, 0x23a01c3dd9ed8d, 0xaf8b219f9416b5, 0xd8db0cc277daea},
-  {1, 0, 0, 0}},
- {{0x76a9c3b1a700f0, 0xe9acd29bc7e691, 0x69212d1a6b0327, 0x6322e97fe154be},
-  {0x469fc5465d62aa, 0x8d41ed18883b05, 0x1f8eae66c52b88, 0xe4fcbe9325be51},
-  {1, 0, 0, 0}},
- {{0x825fdf583cac16, 0x020b857c7b023a, 0x683c17744b0165, 0x14ffd0a2daf2f1},
-  {0x323b36184218f9, 0x4944ec4e3b47d4, 0xc15b3080841acf, 0x0bced4b01a28bb},
-  {1, 0, 0, 0}},
- {{0x92ac22230df5c4, 0x52f33b4063eda8, 0xcb3f19870c0c93, 0x40064f2ba65233},
-  {0xfe16f0924f8992, 0x012da25af5b517, 0x1a57bb24f723a6, 0x06f8bc76760def},
-  {1, 0, 0, 0}},
- {{0x4a7084f7817cb9, 0xbcab0738ee9a78, 0x3ec11e11d9c326, 0xdc0fe90e0f1aae},
-  {0xcf639ea5f98390, 0x5c350aa22ffb74, 0x9afae98a4047b7, 0x956ec2d617fc45},
-  {1, 0, 0, 0}},
- {{0x4306d648c1be6a, 0x9247cd8bc9a462, 0xf5595e377d2f2e, 0xbd1c3caff1a52e},
-  {0x045e14472409d0, 0x29f3e17078f773, 0x745a602b2d4f7d, 0x191837685cdfbb},
-  {1, 0, 0, 0}},
- {{0x5b6ee254a8cb79, 0x4953433f5e7026, 0xe21faeb1d1def4, 0xc4c225785c09de},
-  {0x307ce7bba1e518, 0x31b125b1036db8, 0x47e91868839e8f, 0xc765866e33b9f3},
-  {1, 0, 0, 0}},
- {{0x3bfece24f96906, 0x4794da641e5093, 0xde5df64f95db26, 0x297ecd89714b05},
-  {0x701bd3ebb2c3aa, 0x7073b4f53cb1d5, 0x13c5665658af16, 0x9895089d66fe58},
-  {1, 0, 0, 0}},
- {{0x0fef05f78c4790, 0x2d773633b05d2e, 0x94229c3a951c94, 0xbbbd70df4911bb},
-  {0xb2c6963d2c1168, 0x105f47a72b0d73, 0x9fdf6111614080, 0x7b7e94b39e67b0},
-  {1, 0, 0, 0}},
- {{0xad1a7d6efbe2b3, 0xf012482c0da69d, 0x6b3bdf12438345, 0x40d7558d7aa4d9},
-  {0x8a09fffb5c6d3d, 0x9a356e5d9ffd38, 0x5973f15f4f9b1c, 0xdcd5f59f63c3ea},
-  {1, 0, 0, 0}},
- {{0xacf39f4c5ca7ab, 0x4c8071cc5fd737, 0xc64e3602cd1184, 0x0acd4644c9abba},
-  {0x6c011a36d8bf6e, 0xfecd87ba24e32a, 0x19f6f56574fad8, 0x050b204ced9405},
-  {1, 0, 0, 0}},
- {{0xed4f1cae7d9a96, 0x5ceef7ad94c40a, 0x778e4a3bf3ef9b, 0x7405783dc3b55e},
-  {0x32477c61b6e8c6, 0xb46a97570f018b, 0x91176d0a7e95d1, 0x3df90fbc4c7d0e},
-  {1, 0, 0, 0}}}
+    { { { 0, 0, 0, 0 },
+          { 0, 0, 0, 0 },
+          { 0, 0, 0, 0 } },
+        { { 0x3280d6115c1d21, 0xc1d356c2112234, 0x7f321390b94a03, 0xb70e0cbd6bb4bf },
+            { 0xd5819985007e34, 0x75a05a07476444, 0xfb4c22dfe6cd43, 0xbd376388b5f723 },
+            { 1, 0, 0, 0 } },
+        { { 0xfd9675666ebbe9, 0xbca7664d40ce5e, 0x2242df8d8a2a43, 0x1f49bbb0f99bc5 },
+            { 0x29e0b892dc9c43, 0xece8608436e662, 0xdc858f185310d0, 0x9812dd4eb8d321 },
+            { 1, 0, 0, 0 } },
+        { { 0x6d3e678d5d8eb8, 0x559eed1cb362f1, 0x16e9a3bbce8a3f, 0xeedcccd8c2a748 },
+            { 0xf19f90ed50266d, 0xabf2b4bf65f9df, 0x313865468fafec, 0x5cb379ba910a17 },
+            { 1, 0, 0, 0 } },
+        { { 0x0641966cab26e3, 0x91fb2991fab0a0, 0xefec27a4e13a0b, 0x0499aa8a5f8ebe },
+            { 0x7510407766af5d, 0x84d929610d5450, 0x81d77aae82f706, 0x6916f6d4338c5b },
+            { 1, 0, 0, 0 } },
+        { { 0xea95ac3b1f15c6, 0x086000905e82d4, 0xdd323ae4d1c8b1, 0x932b56be7685a3 },
+            { 0x9ef93dea25dbbf, 0x41665960f390f0, 0xfdec76dbe2a8a7, 0x523e80f019062a },
+            { 1, 0, 0, 0 } },
+        { { 0x822fdd26732c73, 0xa01c83531b5d0f, 0x363f37347c1ba4, 0xc391b45c84725c },
+            { 0xbbd5e1b2d6ad24, 0xddfbcde19dfaec, 0xc393da7e222a7f, 0x1efb7890ede244 },
+            { 1, 0, 0, 0 } },
+        { { 0x4c9e90ca217da1, 0xd11beca79159bb, 0xff8d33c2c98b7c, 0x2610b39409f849 },
+            { 0x44d1352ac64da0, 0xcdbb7b2c46b4fb, 0x966c079b753c89, 0xfe67e4e820b112 },
+            { 1, 0, 0, 0 } },
+        { { 0xe28cae2df5312d, 0xc71b61d16f5c6e, 0x79b7619a3e7c4c, 0x05c73240899b47 },
+            { 0x9f7f6382c73e3a, 0x18615165c56bda, 0x641fab2116fd56, 0x72855882b08394 },
+            { 1, 0, 0, 0 } },
+        { { 0x0469182f161c09, 0x74a98ca8d00fb5, 0xb89da93489a3e0, 0x41c98768fb0c1d },
+            { 0xe5ea05fb32da81, 0x3dce9ffbca6855, 0x1cfe2d3fbf59e6, 0x0e5e03408738a7 },
+            { 1, 0, 0, 0 } },
+        { { 0xdab22b2333e87f, 0x4430137a5dd2f6, 0xe03ab9f738beb8, 0xcb0c5d0dc34f24 },
+            { 0x764a7df0c8fda5, 0x185ba5c3fa2044, 0x9281d688bcbe50, 0xc40331df893881 },
+            { 1, 0, 0, 0 } },
+        { { 0xb89530796f0f60, 0xade92bd26909a3, 0x1a0c83fb4884da, 0x1765bf22a5a984 },
+            { 0x772a9ee75db09e, 0x23bc6c67cec16f, 0x4c1edba8b14e2f, 0xe2a215d9611369 },
+            { 1, 0, 0, 0 } },
+        { { 0x571e509fb5efb3, 0xade88696410552, 0xc8ae85fada74fe, 0x6c7e4be83bbde3 },
+            { 0xff9f51160f4652, 0xb47ce2495a6539, 0xa2946c53b582f4, 0x286d2db3ee9a60 },
+            { 1, 0, 0, 0 } },
+        { { 0x40bbd5081a44af, 0x0995183b13926c, 0xbcefba6f47f6d0, 0x215619e9cc0057 },
+            { 0x8bc94d3b0df45e, 0xf11c54a3694f6f, 0x8631b93cdfe8b5, 0xe7e3f4b0982db9 },
+            { 1, 0, 0, 0 } },
+        { { 0xb17048ab3e1c7b, 0xac38f36ff8a1d8, 0x1c29819435d2c6, 0xc813132f4c07e9 },
+            { 0x2891425503b11f, 0x08781030579fea, 0xf5426ba5cc9674, 0x1e28ebf18562bc },
+            { 1, 0, 0, 0 } },
+        { { 0x9f31997cc864eb, 0x06cd91d28b5e4c, 0xff17036691a973, 0xf1aef351497c58 },
+            { 0xdd1f2d600564ff, 0xdead073b1402db, 0x74a684435bd693, 0xeea7471f962558 },
+            { 1, 0, 0, 0 } } },
+    { { { 0, 0, 0, 0 },
+          { 0, 0, 0, 0 },
+          { 0, 0, 0, 0 } },
+        { { 0x9665266dddf554, 0x9613d78b60ef2d, 0xce27a34cdba417, 0xd35ab74d6afc31 },
+            { 0x85ccdd22deb15e, 0x2137e5783a6aab, 0xa141cffd8c93c6, 0x355a1830e90f2d },
+            { 1, 0, 0, 0 } },
+        { { 0x1a494eadaade65, 0xd6da4da77fe53c, 0xe7992996abec86, 0x65c3553c6090e3 },
+            { 0xfa610b1fb09346, 0xf1c6540b8a4aaf, 0xc51a13ccd3cbab, 0x02995b1b18c28a },
+            { 1, 0, 0, 0 } },
+        { { 0x7874568e7295ef, 0x86b419fbe38d04, 0xdc0690a7550d9a, 0xd3966a44beac33 },
+            { 0x2b7280ec29132f, 0xbeaa3b6a032df3, 0xdc7dd88ae41200, 0xd25e2513e3a100 },
+            { 1, 0, 0, 0 } },
+        { { 0x924857eb2efafd, 0xac2bce41223190, 0x8edaa1445553fc, 0x825800fd3562d5 },
+            { 0x8d79148ea96621, 0x23a01c3dd9ed8d, 0xaf8b219f9416b5, 0xd8db0cc277daea },
+            { 1, 0, 0, 0 } },
+        { { 0x76a9c3b1a700f0, 0xe9acd29bc7e691, 0x69212d1a6b0327, 0x6322e97fe154be },
+            { 0x469fc5465d62aa, 0x8d41ed18883b05, 0x1f8eae66c52b88, 0xe4fcbe9325be51 },
+            { 1, 0, 0, 0 } },
+        { { 0x825fdf583cac16, 0x020b857c7b023a, 0x683c17744b0165, 0x14ffd0a2daf2f1 },
+            { 0x323b36184218f9, 0x4944ec4e3b47d4, 0xc15b3080841acf, 0x0bced4b01a28bb },
+            { 1, 0, 0, 0 } },
+        { { 0x92ac22230df5c4, 0x52f33b4063eda8, 0xcb3f19870c0c93, 0x40064f2ba65233 },
+            { 0xfe16f0924f8992, 0x012da25af5b517, 0x1a57bb24f723a6, 0x06f8bc76760def },
+            { 1, 0, 0, 0 } },
+        { { 0x4a7084f7817cb9, 0xbcab0738ee9a78, 0x3ec11e11d9c326, 0xdc0fe90e0f1aae },
+            { 0xcf639ea5f98390, 0x5c350aa22ffb74, 0x9afae98a4047b7, 0x956ec2d617fc45 },
+            { 1, 0, 0, 0 } },
+        { { 0x4306d648c1be6a, 0x9247cd8bc9a462, 0xf5595e377d2f2e, 0xbd1c3caff1a52e },
+            { 0x045e14472409d0, 0x29f3e17078f773, 0x745a602b2d4f7d, 0x191837685cdfbb },
+            { 1, 0, 0, 0 } },
+        { { 0x5b6ee254a8cb79, 0x4953433f5e7026, 0xe21faeb1d1def4, 0xc4c225785c09de },
+            { 0x307ce7bba1e518, 0x31b125b1036db8, 0x47e91868839e8f, 0xc765866e33b9f3 },
+            { 1, 0, 0, 0 } },
+        { { 0x3bfece24f96906, 0x4794da641e5093, 0xde5df64f95db26, 0x297ecd89714b05 },
+            { 0x701bd3ebb2c3aa, 0x7073b4f53cb1d5, 0x13c5665658af16, 0x9895089d66fe58 },
+            { 1, 0, 0, 0 } },
+        { { 0x0fef05f78c4790, 0x2d773633b05d2e, 0x94229c3a951c94, 0xbbbd70df4911bb },
+            { 0xb2c6963d2c1168, 0x105f47a72b0d73, 0x9fdf6111614080, 0x7b7e94b39e67b0 },
+            { 1, 0, 0, 0 } },
+        { { 0xad1a7d6efbe2b3, 0xf012482c0da69d, 0x6b3bdf12438345, 0x40d7558d7aa4d9 },
+            { 0x8a09fffb5c6d3d, 0x9a356e5d9ffd38, 0x5973f15f4f9b1c, 0xdcd5f59f63c3ea },
+            { 1, 0, 0, 0 } },
+        { { 0xacf39f4c5ca7ab, 0x4c8071cc5fd737, 0xc64e3602cd1184, 0x0acd4644c9abba },
+            { 0x6c011a36d8bf6e, 0xfecd87ba24e32a, 0x19f6f56574fad8, 0x050b204ced9405 },
+            { 1, 0, 0, 0 } },
+        { { 0xed4f1cae7d9a96, 0x5ceef7ad94c40a, 0x778e4a3bf3ef9b, 0x7405783dc3b55e },
+            { 0x32477c61b6e8c6, 0xb46a97570f018b, 0x91176d0a7e95d1, 0x3df90fbc4c7d0e },
+            { 1, 0, 0, 0 } } }
 };
 
 /* Precomputation for the group generator. */
@@ -261,9 +261,9 @@ const EC_METHOD *EC_GFp_nistp224_method(void)
         ossl_ec_GFp_simple_point_set_to_infinity,
         ossl_ec_GFp_simple_point_set_affine_coordinates,
         ossl_ec_GFp_nistp224_point_get_affine_coordinates,
-        0 /* point_set_compressed_coordinates */ ,
-        0 /* point2oct */ ,
-        0 /* oct2point */ ,
+        0 /* point_set_compressed_coordinates */,
+        0 /* point2oct */,
+        0 /* oct2point */,
         ossl_ec_GFp_simple_add,
         ossl_ec_GFp_simple_dbl,
         ossl_ec_GFp_simple_invert,
@@ -277,11 +277,11 @@ const EC_METHOD *EC_GFp_nistp224_method(void)
         ossl_ec_GFp_nistp224_have_precompute_mult,
         ossl_ec_GFp_nist_field_mul,
         ossl_ec_GFp_nist_field_sqr,
-        0 /* field_div */ ,
+        0 /* field_div */,
         ossl_ec_GFp_simple_field_inv,
-        0 /* field_encode */ ,
-        0 /* field_decode */ ,
-        0,                      /* field_set_to_one */
+        0 /* field_encode */,
+        0 /* field_decode */,
+        0, /* field_set_to_one */
         ossl_ec_key_simple_priv2oct,
         ossl_ec_key_simple_oct2priv,
         0, /* set private */
@@ -298,7 +298,7 @@ const EC_METHOD *EC_GFp_nistp224_method(void)
         0, /* blind_coordinates */
         0, /* ladder_pre */
         0, /* ladder_step */
-        0  /* ladder_post */
+        0 /* ladder_post */
     };
 
     return &ret;
@@ -393,10 +393,9 @@ static void felem_sum(felem out, const felem in)
 /* Assumes in[i] < 2^57 */
 static void felem_diff(felem out, const felem in)
 {
-    static const limb two58p2 = (((limb) 1) << 58) + (((limb) 1) << 2);
-    static const limb two58m2 = (((limb) 1) << 58) - (((limb) 1) << 2);
-    static const limb two58m42m2 = (((limb) 1) << 58) -
-        (((limb) 1) << 42) - (((limb) 1) << 2);
+    static const limb two58p2 = (((limb)1) << 58) + (((limb)1) << 2);
+    static const limb two58m2 = (((limb)1) << 58) - (((limb)1) << 2);
+    static const limb two58m42m2 = (((limb)1) << 58) - (((limb)1) << 42) - (((limb)1) << 2);
 
     /* Add 0 mod 2^224-2^96+1 to ensure out > in */
     out[0] += two58p2;
@@ -414,11 +413,9 @@ static void felem_diff(felem out, const felem in)
 /* Assumes in[i] < 2^119 */
 static void widefelem_diff(widefelem out, const widefelem in)
 {
-    static const widelimb two120 = ((widelimb) 1) << 120;
-    static const widelimb two120m64 = (((widelimb) 1) << 120) -
-        (((widelimb) 1) << 64);
-    static const widelimb two120m104m64 = (((widelimb) 1) << 120) -
-        (((widelimb) 1) << 104) - (((widelimb) 1) << 64);
+    static const widelimb two120 = ((widelimb)1) << 120;
+    static const widelimb two120m64 = (((widelimb)1) << 120) - (((widelimb)1) << 64);
+    static const widelimb two120m104m64 = (((widelimb)1) << 120) - (((widelimb)1) << 104) - (((widelimb)1) << 64);
 
     /* Add 0 mod 2^224-2^96+1 to ensure out > in */
     out[0] += two120;
@@ -442,12 +439,9 @@ static void widefelem_diff(widefelem out, const widefelem in)
 /* in[i] < 2^63 */
 static void felem_diff_128_64(widefelem out, const felem in)
 {
-    static const widelimb two64p8 = (((widelimb) 1) << 64) +
-        (((widelimb) 1) << 8);
-    static const widelimb two64m8 = (((widelimb) 1) << 64) -
-        (((widelimb) 1) << 8);
-    static const widelimb two64m48m8 = (((widelimb) 1) << 64) -
-        (((widelimb) 1) << 48) - (((widelimb) 1) << 8);
+    static const widelimb two64p8 = (((widelimb)1) << 64) + (((widelimb)1) << 8);
+    static const widelimb two64m8 = (((widelimb)1) << 64) - (((widelimb)1) << 8);
+    static const widelimb two64m48m8 = (((widelimb)1) << 64) - (((widelimb)1) << 48) - (((widelimb)1) << 8);
 
     /* Add 0 mod 2^224-2^96+1 to ensure out > in */
     out[0] += two64p8;
@@ -495,28 +489,25 @@ static void felem_square(widefelem out, const felem in)
     tmp0 = 2 * in[0];
     tmp1 = 2 * in[1];
     tmp2 = 2 * in[2];
-    out[0] = ((widelimb) in[0]) * in[0];
-    out[1] = ((widelimb) in[0]) * tmp1;
-    out[2] = ((widelimb) in[0]) * tmp2 + ((widelimb) in[1]) * in[1];
-    out[3] = ((widelimb) in[3]) * tmp0 + ((widelimb) in[1]) * tmp2;
-    out[4] = ((widelimb) in[3]) * tmp1 + ((widelimb) in[2]) * in[2];
-    out[5] = ((widelimb) in[3]) * tmp2;
-    out[6] = ((widelimb) in[3]) * in[3];
+    out[0] = ((widelimb)in[0]) * in[0];
+    out[1] = ((widelimb)in[0]) * tmp1;
+    out[2] = ((widelimb)in[0]) * tmp2 + ((widelimb)in[1]) * in[1];
+    out[3] = ((widelimb)in[3]) * tmp0 + ((widelimb)in[1]) * tmp2;
+    out[4] = ((widelimb)in[3]) * tmp1 + ((widelimb)in[2]) * in[2];
+    out[5] = ((widelimb)in[3]) * tmp2;
+    out[6] = ((widelimb)in[3]) * in[3];
 }
 
 /* Multiply two field elements: out = in1 * in2 */
 static void felem_mul(widefelem out, const felem in1, const felem in2)
 {
-    out[0] = ((widelimb) in1[0]) * in2[0];
-    out[1] = ((widelimb) in1[0]) * in2[1] + ((widelimb) in1[1]) * in2[0];
-    out[2] = ((widelimb) in1[0]) * in2[2] + ((widelimb) in1[1]) * in2[1] +
-             ((widelimb) in1[2]) * in2[0];
-    out[3] = ((widelimb) in1[0]) * in2[3] + ((widelimb) in1[1]) * in2[2] +
-             ((widelimb) in1[2]) * in2[1] + ((widelimb) in1[3]) * in2[0];
-    out[4] = ((widelimb) in1[1]) * in2[3] + ((widelimb) in1[2]) * in2[2] +
-             ((widelimb) in1[3]) * in2[1];
-    out[5] = ((widelimb) in1[2]) * in2[3] + ((widelimb) in1[3]) * in2[2];
-    out[6] = ((widelimb) in1[3]) * in2[3];
+    out[0] = ((widelimb)in1[0]) * in2[0];
+    out[1] = ((widelimb)in1[0]) * in2[1] + ((widelimb)in1[1]) * in2[0];
+    out[2] = ((widelimb)in1[0]) * in2[2] + ((widelimb)in1[1]) * in2[1] + ((widelimb)in1[2]) * in2[0];
+    out[3] = ((widelimb)in1[0]) * in2[3] + ((widelimb)in1[1]) * in2[2] + ((widelimb)in1[2]) * in2[1] + ((widelimb)in1[3]) * in2[0];
+    out[4] = ((widelimb)in1[1]) * in2[3] + ((widelimb)in1[2]) * in2[2] + ((widelimb)in1[3]) * in2[1];
+    out[5] = ((widelimb)in1[2]) * in2[3] + ((widelimb)in1[3]) * in2[2];
+    out[6] = ((widelimb)in1[3]) * in2[3];
 }
 
 /*-
@@ -525,12 +516,9 @@ static void felem_mul(widefelem out, const felem in1, const felem in2)
  * ensures out[0] < 2^56, out[1] < 2^56, out[2] < 2^56, out[3] <= 2^56 + 2^16 */
 static void felem_reduce(felem out, const widefelem in)
 {
-    static const widelimb two127p15 = (((widelimb) 1) << 127) +
-        (((widelimb) 1) << 15);
-    static const widelimb two127m71 = (((widelimb) 1) << 127) -
-        (((widelimb) 1) << 71);
-    static const widelimb two127m71m55 = (((widelimb) 1) << 127) -
-        (((widelimb) 1) << 71) - (((widelimb) 1) << 55);
+    static const widelimb two127p15 = (((widelimb)1) << 127) + (((widelimb)1) << 15);
+    static const widelimb two127m71 = (((widelimb)1) << 127) - (((widelimb)1) << 71);
+    static const widelimb two127m71m55 = (((widelimb)1) << 127) - (((widelimb)1) << 71) - (((widelimb)1) << 55);
     widelimb output[5];
 
     /* Add 0 mod 2^224-2^96+1 to ensure all differences are positive */
@@ -607,7 +595,7 @@ static void felem_mul_reduce(felem out, const felem in1, const felem in2)
  */
 static void felem_contract(felem out, const felem in)
 {
-    static const int64_t two56 = ((limb) 1) << 56;
+    static const int64_t two56 = ((limb)1) << 56;
     /* 0 <= in < 2*p, p = 2^224 - 2^96 + 1 */
     /* if in > p , reduce in = in - 2^224 + 2^96 - 1 */
     int64_t tmp[4], a;
@@ -624,8 +612,7 @@ static void felem_contract(felem out, const felem in)
      * Case 2: a = 0 iff p <= in < 2^224, i.e., the high 128 bits are all 1
      * and the lower part is non-zero
      */
-    a = ((in[3] & in[2] & (in[1] | 0x000000ffffffffff)) + 1) |
-        (((int64_t) (in[0] + (in[1] & 0x000000ffffffffff)) - 1) >> 63);
+    a = ((in[3] & in[2] & (in[1] | 0x000000ffffffffff)) + 1) | (((int64_t)(in[0] + (in[1] & 0x000000ffffffffff)) - 1) >> 63);
     a &= 0x00ffffffffffffff;
     /* turn a into an all-one mask (if a = 0) or an all-zero mask */
     a = (a - 1) >> 63;
@@ -681,19 +668,19 @@ static limb felem_is_zero(const felem in)
     limb zero, two224m96p1, two225m97p2;
 
     zero = in[0] | in[1] | in[2] | in[3];
-    zero = (((int64_t) (zero) - 1) >> 63) & 1;
+    zero = (((int64_t)(zero)-1) >> 63) & 1;
     two224m96p1 = (in[0] ^ 1) | (in[1] ^ 0x00ffff0000000000)
         | (in[2] ^ 0x00ffffffffffffff) | (in[3] ^ 0x00ffffffffffffff);
-    two224m96p1 = (((int64_t) (two224m96p1) - 1) >> 63) & 1;
+    two224m96p1 = (((int64_t)(two224m96p1)-1) >> 63) & 1;
     two225m97p2 = (in[0] ^ 2) | (in[1] ^ 0x00fffe0000000000)
         | (in[2] ^ 0x00ffffffffffffff) | (in[3] ^ 0x01ffffffffffffff);
-    two225m97p2 = (((int64_t) (two225m97p2) - 1) >> 63) & 1;
+    two225m97p2 = (((int64_t)(two225m97p2)-1) >> 63) & 1;
     return (zero | two224m96p1 | two225m97p2);
 }
 
 static int felem_is_zero_int(const void *in)
 {
-    return (int)(felem_is_zero(in) & ((limb) 1));
+    return (int)(felem_is_zero(in) & ((limb)1));
 }
 
 /* Invert a field element */
@@ -705,77 +692,77 @@ static void felem_inv(felem out, const felem in)
     unsigned i;
 
     felem_square(tmp, in);
-    felem_reduce(ftmp, tmp);    /* 2 */
+    felem_reduce(ftmp, tmp); /* 2 */
     felem_mul(tmp, in, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^2 - 1 */
+    felem_reduce(ftmp, tmp); /* 2^2 - 1 */
     felem_square(tmp, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^3 - 2 */
+    felem_reduce(ftmp, tmp); /* 2^3 - 2 */
     felem_mul(tmp, in, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^3 - 1 */
+    felem_reduce(ftmp, tmp); /* 2^3 - 1 */
     felem_square(tmp, ftmp);
-    felem_reduce(ftmp2, tmp);   /* 2^4 - 2 */
+    felem_reduce(ftmp2, tmp); /* 2^4 - 2 */
     felem_square(tmp, ftmp2);
-    felem_reduce(ftmp2, tmp);   /* 2^5 - 4 */
+    felem_reduce(ftmp2, tmp); /* 2^5 - 4 */
     felem_square(tmp, ftmp2);
-    felem_reduce(ftmp2, tmp);   /* 2^6 - 8 */
+    felem_reduce(ftmp2, tmp); /* 2^6 - 8 */
     felem_mul(tmp, ftmp2, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^6 - 1 */
+    felem_reduce(ftmp, tmp); /* 2^6 - 1 */
     felem_square(tmp, ftmp);
-    felem_reduce(ftmp2, tmp);   /* 2^7 - 2 */
-    for (i = 0; i < 5; ++i) {   /* 2^12 - 2^6 */
+    felem_reduce(ftmp2, tmp); /* 2^7 - 2 */
+    for (i = 0; i < 5; ++i) { /* 2^12 - 2^6 */
         felem_square(tmp, ftmp2);
         felem_reduce(ftmp2, tmp);
     }
     felem_mul(tmp, ftmp2, ftmp);
-    felem_reduce(ftmp2, tmp);   /* 2^12 - 1 */
+    felem_reduce(ftmp2, tmp); /* 2^12 - 1 */
     felem_square(tmp, ftmp2);
-    felem_reduce(ftmp3, tmp);   /* 2^13 - 2 */
-    for (i = 0; i < 11; ++i) {  /* 2^24 - 2^12 */
+    felem_reduce(ftmp3, tmp); /* 2^13 - 2 */
+    for (i = 0; i < 11; ++i) { /* 2^24 - 2^12 */
         felem_square(tmp, ftmp3);
         felem_reduce(ftmp3, tmp);
     }
     felem_mul(tmp, ftmp3, ftmp2);
-    felem_reduce(ftmp2, tmp);   /* 2^24 - 1 */
+    felem_reduce(ftmp2, tmp); /* 2^24 - 1 */
     felem_square(tmp, ftmp2);
-    felem_reduce(ftmp3, tmp);   /* 2^25 - 2 */
-    for (i = 0; i < 23; ++i) {  /* 2^48 - 2^24 */
+    felem_reduce(ftmp3, tmp); /* 2^25 - 2 */
+    for (i = 0; i < 23; ++i) { /* 2^48 - 2^24 */
         felem_square(tmp, ftmp3);
         felem_reduce(ftmp3, tmp);
     }
     felem_mul(tmp, ftmp3, ftmp2);
-    felem_reduce(ftmp3, tmp);   /* 2^48 - 1 */
+    felem_reduce(ftmp3, tmp); /* 2^48 - 1 */
     felem_square(tmp, ftmp3);
-    felem_reduce(ftmp4, tmp);   /* 2^49 - 2 */
-    for (i = 0; i < 47; ++i) {  /* 2^96 - 2^48 */
+    felem_reduce(ftmp4, tmp); /* 2^49 - 2 */
+    for (i = 0; i < 47; ++i) { /* 2^96 - 2^48 */
         felem_square(tmp, ftmp4);
         felem_reduce(ftmp4, tmp);
     }
     felem_mul(tmp, ftmp3, ftmp4);
-    felem_reduce(ftmp3, tmp);   /* 2^96 - 1 */
+    felem_reduce(ftmp3, tmp); /* 2^96 - 1 */
     felem_square(tmp, ftmp3);
-    felem_reduce(ftmp4, tmp);   /* 2^97 - 2 */
-    for (i = 0; i < 23; ++i) {  /* 2^120 - 2^24 */
+    felem_reduce(ftmp4, tmp); /* 2^97 - 2 */
+    for (i = 0; i < 23; ++i) { /* 2^120 - 2^24 */
         felem_square(tmp, ftmp4);
         felem_reduce(ftmp4, tmp);
     }
     felem_mul(tmp, ftmp2, ftmp4);
-    felem_reduce(ftmp2, tmp);   /* 2^120 - 1 */
-    for (i = 0; i < 6; ++i) {   /* 2^126 - 2^6 */
+    felem_reduce(ftmp2, tmp); /* 2^120 - 1 */
+    for (i = 0; i < 6; ++i) { /* 2^126 - 2^6 */
         felem_square(tmp, ftmp2);
         felem_reduce(ftmp2, tmp);
     }
     felem_mul(tmp, ftmp2, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^126 - 1 */
+    felem_reduce(ftmp, tmp); /* 2^126 - 1 */
     felem_square(tmp, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^127 - 2 */
+    felem_reduce(ftmp, tmp); /* 2^127 - 2 */
     felem_mul(tmp, ftmp, in);
-    felem_reduce(ftmp, tmp);    /* 2^127 - 1 */
-    for (i = 0; i < 97; ++i) {  /* 2^224 - 2^97 */
+    felem_reduce(ftmp, tmp); /* 2^127 - 1 */
+    for (i = 0; i < 97; ++i) { /* 2^224 - 2^97 */
         felem_square(tmp, ftmp);
         felem_reduce(ftmp, tmp);
     }
     felem_mul(tmp, ftmp, ftmp3);
-    felem_reduce(out, tmp);     /* 2^224 - 2^96 - 1 */
+    felem_reduce(out, tmp); /* 2^224 - 2^96 - 1 */
 }
 
 /*
@@ -816,7 +803,7 @@ static void copy_conditional(felem out, const felem in, limb icopy)
  */
 static void
 point_double(felem x_out, felem y_out, felem z_out,
-             const felem x_in, const felem y_in, const felem z_in)
+    const felem x_in, const felem y_in, const felem z_in)
 {
     widefelem tmp, tmp2;
     felem delta, gamma, beta, alpha, ftmp, ftmp2;
@@ -904,9 +891,9 @@ point_double(felem x_out, felem y_out, felem z_out,
  * multiplication, so there is no timing leak for ECDH or ECDSA signing.
  */
 static void point_add(felem x3, felem y3, felem z3,
-                      const felem x1, const felem y1, const felem z1,
-                      const int mixed, const felem x2, const felem y2,
-                      const felem z2)
+    const felem x1, const felem y1, const felem z1,
+    const int mixed, const felem x2, const felem y2,
+    const felem z2)
 {
     felem ftmp, ftmp2, ftmp3, ftmp4, ftmp5, x_out, y_out, z_out;
     widefelem tmp, tmp2;
@@ -1101,7 +1088,7 @@ static void point_add(felem x3, felem y3, felem z3,
  * The pre_comp array argument should be size of |size| argument
  */
 static void select_point(const u64 idx, unsigned int size,
-                         const felem pre_comp[][3], felem out[3])
+    const felem pre_comp[][3], felem out[3])
 {
     unsigned i, j;
     limb *outlimbs = &out[0][0];
@@ -1136,10 +1123,10 @@ static char get_bit(const felem_bytearray in, unsigned i)
  * Output point (X, Y, Z) is stored in x_out, y_out, z_out
  */
 static void batch_mul(felem x_out, felem y_out, felem z_out,
-                      const felem_bytearray scalars[],
-                      const unsigned num_points, const u8 *g_scalar,
-                      const int mixed, const felem pre_comp[][17][3],
-                      const felem g_pre_comp[2][16][3])
+    const felem_bytearray scalars[],
+    const unsigned num_points, const u8 *g_scalar,
+    const int mixed, const felem pre_comp[][17][3],
+    const felem g_pre_comp[2][16][3])
 {
     int i, skip;
     unsigned num;
@@ -1156,8 +1143,8 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
      * of the generator (two in each of the last 28 rounds) and additions of
      * other points multiples (every 5th round).
      */
-    skip = 1;                   /* save two point operations in the first
-                                 * round */
+    skip = 1; /* save two point operations in the first
+               * round */
     for (i = (num_points ? 220 : 27); i >= 0; --i) {
         /* double */
         if (!skip)
@@ -1176,7 +1163,7 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
             if (!skip) {
                 /* value 1 below is argument for "mixed" */
                 point_add(nq[0], nq[1], nq[2],
-                          nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
+                    nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
             } else {
                 memcpy(nq, tmp, 3 * sizeof(felem));
                 skip = 0;
@@ -1190,8 +1177,8 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
             /* select the point to add, in constant time */
             select_point(bits, 16, g_pre_comp[0], tmp);
             point_add(nq[0], nq[1], nq[2],
-                      nq[0], nq[1], nq[2],
-                      1 /* mixed */ , tmp[0], tmp[1], tmp[2]);
+                nq[0], nq[1], nq[2],
+                1 /* mixed */, tmp[0], tmp[1], tmp[2]);
         }
 
         /* do other additions every 5 doublings */
@@ -1214,8 +1201,8 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
 
                 if (!skip) {
                     point_add(nq[0], nq[1], nq[2],
-                              nq[0], nq[1], nq[2],
-                              mixed, tmp[0], tmp[1], tmp[2]);
+                        nq[0], nq[1], nq[2],
+                        mixed, tmp[0], tmp[1], tmp[2]);
                 } else {
                     memcpy(nq, tmp, 3 * sizeof(felem));
                     skip = 0;
@@ -1240,7 +1227,6 @@ static NISTP224_PRE_COMP *nistp224_pre_comp_new(void)
     if (ret == NULL)
         return ret;
 
-
     if (!CRYPTO_NEW_REF(&ret->references, 1)) {
         OPENSSL_free(ret);
         return NULL;
@@ -1287,8 +1273,8 @@ int ossl_ec_GFp_nistp224_group_init(EC_GROUP *group)
 }
 
 int ossl_ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p,
-                                         const BIGNUM *a, const BIGNUM *b,
-                                         BN_CTX *ctx)
+    const BIGNUM *a, const BIGNUM *b,
+    BN_CTX *ctx)
 {
     int ret = 0;
     BIGNUM *curve_p, *curve_a, *curve_b;
@@ -1316,7 +1302,7 @@ int ossl_ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p,
     }
     group->field_mod_func = BN_nist_mod_224;
     ret = ossl_ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
- err:
+err:
     BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
     BN_CTX_free(new_ctx);
@@ -1329,9 +1315,9 @@ int ossl_ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p,
  * (X/Z^2, Y/Z^3)
  */
 int ossl_ec_GFp_nistp224_point_get_affine_coordinates(const EC_GROUP *group,
-                                                      const EC_POINT *point,
-                                                      BIGNUM *x, BIGNUM *y,
-                                                      BN_CTX *ctx)
+    const EC_POINT *point,
+    BIGNUM *x, BIGNUM *y,
+    BN_CTX *ctx)
 {
     felem z1, z2, x_in, y_in, x_out, y_out;
     widefelem tmp;
@@ -1340,8 +1326,7 @@ int ossl_ec_GFp_nistp224_point_get_affine_coordinates(const EC_GROUP *group,
         ERR_raise(ERR_LIB_EC, EC_R_POINT_AT_INFINITY);
         return 0;
     }
-    if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) ||
-        (!BN_to_felem(z1, point->Z)))
+    if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) || (!BN_to_felem(z1, point->Z)))
         return 0;
     felem_inv(z2, z1);
     felem_square(tmp, z2);
@@ -1369,33 +1354,33 @@ int ossl_ec_GFp_nistp224_point_get_affine_coordinates(const EC_GROUP *group,
     return 1;
 }
 
-static void make_points_affine(size_t num, felem points[ /* num */ ][3],
-                               felem tmp_felems[ /* num+1 */ ])
+static void make_points_affine(size_t num, felem points[/* num */][3],
+    felem tmp_felems[/* num+1 */])
 {
     /*
      * Runs in constant time, unless an input is the point at infinity (which
      * normally shouldn't happen).
      */
     ossl_ec_GFp_nistp_points_make_affine_internal(num,
-                                                  points,
-                                                  sizeof(felem),
-                                                  tmp_felems,
-                                                  (void (*)(void *))felem_one,
-                                                  felem_is_zero_int,
-                                                  (void (*)(void *, const void *))
-                                                  felem_assign,
-                                                  (void (*)(void *, const void *))
-                                                  felem_square_reduce, (void (*)
-                                                                        (void *,
-                                                                         const void
-                                                                         *,
-                                                                         const void
-                                                                         *))
-                                                  felem_mul_reduce,
-                                                  (void (*)(void *, const void *))
-                                                  felem_inv,
-                                                  (void (*)(void *, const void *))
-                                                  felem_contract);
+        points,
+        sizeof(felem),
+        tmp_felems,
+        (void (*)(void *))felem_one,
+        felem_is_zero_int,
+        (void (*)(void *, const void *))
+            felem_assign,
+        (void (*)(void *, const void *))
+            felem_square_reduce,
+        (void (*)(void *,
+            const void
+                *,
+            const void
+                *))
+            felem_mul_reduce,
+        (void (*)(void *, const void *))
+            felem_inv,
+        (void (*)(void *, const void *))
+            felem_contract);
 }
 
 /*
@@ -1403,9 +1388,9 @@ static void make_points_affine(size_t num, felem points[ /* num */ ][3],
  * values Result is stored in r (r can equal one of the inputs).
  */
 int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
-                                    const BIGNUM *scalar, size_t num,
-                                    const EC_POINT *points[],
-                                    const BIGNUM *scalars[], BN_CTX *ctx)
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *ctx)
 {
     int ret = 0;
     int j;
@@ -1414,7 +1399,7 @@ int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
     BIGNUM *x, *y, *z, *tmp_scalar;
     felem_bytearray g_secret;
     felem_bytearray *secrets = NULL;
-    felem (*pre_comp)[17][3] = NULL;
+    felem(*pre_comp)[17][3] = NULL;
     felem *tmp_felems = NULL;
     int num_bytes;
     int have_pre_comp = 0;
@@ -1446,15 +1431,13 @@ int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
         if (generator == NULL)
             goto err;
         /* get the generator from precomputation */
-        if (!felem_to_BN(x, g_pre_comp[0][1][0]) ||
-            !felem_to_BN(y, g_pre_comp[0][1][1]) ||
-            !felem_to_BN(z, g_pre_comp[0][1][2])) {
+        if (!felem_to_BN(x, g_pre_comp[0][1][0]) || !felem_to_BN(y, g_pre_comp[0][1][1]) || !felem_to_BN(z, g_pre_comp[0][1][2])) {
             ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
             goto err;
         }
         if (!ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group,
-                                                                generator,
-                                                                x, y, z, ctx))
+                generator,
+                x, y, z, ctx))
             goto err;
         if (0 == EC_POINT_cmp(group, generator, group->generator, ctx))
             /* precomputation matches generator */
@@ -1478,8 +1461,7 @@ int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
         secrets = OPENSSL_zalloc(sizeof(*secrets) * num_points);
         pre_comp = OPENSSL_zalloc(sizeof(*pre_comp) * num_points);
         if (mixed)
-            tmp_felems =
-                OPENSSL_malloc(sizeof(felem) * (num_points * 17 + 1));
+            tmp_felems = OPENSSL_malloc(sizeof(felem) * (num_points * 17 + 1));
         if ((secrets == NULL) || (pre_comp == NULL)
             || (mixed && (tmp_felems == NULL)))
             goto err;
@@ -1511,19 +1493,17 @@ int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
                         goto err;
                     }
                     num_bytes = BN_bn2lebinpad(tmp_scalar,
-                                               secrets[i], sizeof(secrets[i]));
+                        secrets[i], sizeof(secrets[i]));
                 } else {
                     num_bytes = BN_bn2lebinpad(p_scalar,
-                                               secrets[i], sizeof(secrets[i]));
+                        secrets[i], sizeof(secrets[i]));
                 }
                 if (num_bytes < 0) {
                     ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
                     goto err;
                 }
                 /* precompute multiples */
-                if ((!BN_to_felem(x_out, p->X)) ||
-                    (!BN_to_felem(y_out, p->Y)) ||
-                    (!BN_to_felem(z_out, p->Z)))
+                if ((!BN_to_felem(x_out, p->X)) || (!BN_to_felem(y_out, p->Y)) || (!BN_to_felem(z_out, p->Z)))
                     goto err;
                 felem_assign(pre_comp[i][1][0], x_out);
                 felem_assign(pre_comp[i][1][1], y_out);
@@ -1531,16 +1511,16 @@ int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
                 for (j = 2; j <= 16; ++j) {
                     if (j & 1) {
                         point_add(pre_comp[i][j][0], pre_comp[i][j][1],
-                                  pre_comp[i][j][2], pre_comp[i][1][0],
-                                  pre_comp[i][1][1], pre_comp[i][1][2], 0,
-                                  pre_comp[i][j - 1][0],
-                                  pre_comp[i][j - 1][1],
-                                  pre_comp[i][j - 1][2]);
+                            pre_comp[i][j][2], pre_comp[i][1][0],
+                            pre_comp[i][1][1], pre_comp[i][1][2], 0,
+                            pre_comp[i][j - 1][0],
+                            pre_comp[i][j - 1][1],
+                            pre_comp[i][j - 1][2]);
                     } else {
                         point_double(pre_comp[i][j][0], pre_comp[i][j][1],
-                                     pre_comp[i][j][2], pre_comp[i][j / 2][0],
-                                     pre_comp[i][j / 2][1],
-                                     pre_comp[i][j / 2][2]);
+                            pre_comp[i][j][2], pre_comp[i][j / 2][0],
+                            pre_comp[i][j / 2][1],
+                            pre_comp[i][j / 2][2]);
                     }
                 }
             }
@@ -1568,28 +1548,27 @@ int ossl_ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r,
         }
         /* do the multiplication with generator precomputation */
         batch_mul(x_out, y_out, z_out,
-                  (const felem_bytearray(*))secrets, num_points,
-                  g_secret,
-                  mixed, (const felem(*)[17][3])pre_comp, g_pre_comp);
+            (const felem_bytearray(*))secrets, num_points,
+            g_secret,
+            mixed, (const felem(*)[17][3])pre_comp, g_pre_comp);
     } else {
         /* do the multiplication without generator precomputation */
         batch_mul(x_out, y_out, z_out,
-                  (const felem_bytearray(*))secrets, num_points,
-                  NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
+            (const felem_bytearray(*))secrets, num_points,
+            NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
     }
     /* reduce the output to its unique minimal representation */
     felem_contract(x_in, x_out);
     felem_contract(y_in, y_out);
     felem_contract(z_in, z_out);
-    if ((!felem_to_BN(x, x_in)) || (!felem_to_BN(y, y_in)) ||
-        (!felem_to_BN(z, z_in))) {
+    if ((!felem_to_BN(x, x_in)) || (!felem_to_BN(y, y_in)) || (!felem_to_BN(z, z_in))) {
         ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
         goto err;
     }
     ret = ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group, r, x, y, z,
-                                                             ctx);
+        ctx);
 
- err:
+err:
     BN_CTX_end(ctx);
     EC_POINT_free(generator);
     OPENSSL_free(secrets);
@@ -1644,9 +1623,7 @@ int ossl_ec_GFp_nistp224_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
         memcpy(pre->g_pre_comp, gmul, sizeof(pre->g_pre_comp));
         goto done;
     }
-    if ((!BN_to_felem(pre->g_pre_comp[0][1][0], group->generator->X)) ||
-        (!BN_to_felem(pre->g_pre_comp[0][1][1], group->generator->Y)) ||
-        (!BN_to_felem(pre->g_pre_comp[0][1][2], group->generator->Z)))
+    if ((!BN_to_felem(pre->g_pre_comp[0][1][0], group->generator->X)) || (!BN_to_felem(pre->g_pre_comp[0][1][1], group->generator->Y)) || (!BN_to_felem(pre->g_pre_comp[0][1][2], group->generator->Z)))
         goto err;
     /*
      * compute 2^56*G, 2^112*G, 2^168*G for the first table, 2^28*G, 2^84*G,
@@ -1654,26 +1631,26 @@ int ossl_ec_GFp_nistp224_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
      */
     for (i = 1; i <= 8; i <<= 1) {
         point_double(pre->g_pre_comp[1][i][0], pre->g_pre_comp[1][i][1],
-                     pre->g_pre_comp[1][i][2], pre->g_pre_comp[0][i][0],
-                     pre->g_pre_comp[0][i][1], pre->g_pre_comp[0][i][2]);
+            pre->g_pre_comp[1][i][2], pre->g_pre_comp[0][i][0],
+            pre->g_pre_comp[0][i][1], pre->g_pre_comp[0][i][2]);
         for (j = 0; j < 27; ++j) {
             point_double(pre->g_pre_comp[1][i][0], pre->g_pre_comp[1][i][1],
-                         pre->g_pre_comp[1][i][2], pre->g_pre_comp[1][i][0],
-                         pre->g_pre_comp[1][i][1], pre->g_pre_comp[1][i][2]);
+                pre->g_pre_comp[1][i][2], pre->g_pre_comp[1][i][0],
+                pre->g_pre_comp[1][i][1], pre->g_pre_comp[1][i][2]);
         }
         if (i == 8)
             break;
         point_double(pre->g_pre_comp[0][2 * i][0],
-                     pre->g_pre_comp[0][2 * i][1],
-                     pre->g_pre_comp[0][2 * i][2], pre->g_pre_comp[1][i][0],
-                     pre->g_pre_comp[1][i][1], pre->g_pre_comp[1][i][2]);
+            pre->g_pre_comp[0][2 * i][1],
+            pre->g_pre_comp[0][2 * i][2], pre->g_pre_comp[1][i][0],
+            pre->g_pre_comp[1][i][1], pre->g_pre_comp[1][i][2]);
         for (j = 0; j < 27; ++j) {
             point_double(pre->g_pre_comp[0][2 * i][0],
-                         pre->g_pre_comp[0][2 * i][1],
-                         pre->g_pre_comp[0][2 * i][2],
-                         pre->g_pre_comp[0][2 * i][0],
-                         pre->g_pre_comp[0][2 * i][1],
-                         pre->g_pre_comp[0][2 * i][2]);
+                pre->g_pre_comp[0][2 * i][1],
+                pre->g_pre_comp[0][2 * i][2],
+                pre->g_pre_comp[0][2 * i][0],
+                pre->g_pre_comp[0][2 * i][1],
+                pre->g_pre_comp[0][2 * i][2]);
         }
     }
     for (i = 0; i < 2; i++) {
@@ -1682,49 +1659,49 @@ int ossl_ec_GFp_nistp224_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
         /* the remaining multiples */
         /* 2^56*G + 2^112*G resp. 2^84*G + 2^140*G */
         point_add(pre->g_pre_comp[i][6][0], pre->g_pre_comp[i][6][1],
-                  pre->g_pre_comp[i][6][2], pre->g_pre_comp[i][4][0],
-                  pre->g_pre_comp[i][4][1], pre->g_pre_comp[i][4][2],
-                  0, pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
-                  pre->g_pre_comp[i][2][2]);
+            pre->g_pre_comp[i][6][2], pre->g_pre_comp[i][4][0],
+            pre->g_pre_comp[i][4][1], pre->g_pre_comp[i][4][2],
+            0, pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
+            pre->g_pre_comp[i][2][2]);
         /* 2^56*G + 2^168*G resp. 2^84*G + 2^196*G */
         point_add(pre->g_pre_comp[i][10][0], pre->g_pre_comp[i][10][1],
-                  pre->g_pre_comp[i][10][2], pre->g_pre_comp[i][8][0],
-                  pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
-                  0, pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
-                  pre->g_pre_comp[i][2][2]);
+            pre->g_pre_comp[i][10][2], pre->g_pre_comp[i][8][0],
+            pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
+            0, pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
+            pre->g_pre_comp[i][2][2]);
         /* 2^112*G + 2^168*G resp. 2^140*G + 2^196*G */
         point_add(pre->g_pre_comp[i][12][0], pre->g_pre_comp[i][12][1],
-                  pre->g_pre_comp[i][12][2], pre->g_pre_comp[i][8][0],
-                  pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
-                  0, pre->g_pre_comp[i][4][0], pre->g_pre_comp[i][4][1],
-                  pre->g_pre_comp[i][4][2]);
+            pre->g_pre_comp[i][12][2], pre->g_pre_comp[i][8][0],
+            pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
+            0, pre->g_pre_comp[i][4][0], pre->g_pre_comp[i][4][1],
+            pre->g_pre_comp[i][4][2]);
         /*
          * 2^56*G + 2^112*G + 2^168*G resp. 2^84*G + 2^140*G + 2^196*G
          */
         point_add(pre->g_pre_comp[i][14][0], pre->g_pre_comp[i][14][1],
-                  pre->g_pre_comp[i][14][2], pre->g_pre_comp[i][12][0],
-                  pre->g_pre_comp[i][12][1], pre->g_pre_comp[i][12][2],
-                  0, pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
-                  pre->g_pre_comp[i][2][2]);
+            pre->g_pre_comp[i][14][2], pre->g_pre_comp[i][12][0],
+            pre->g_pre_comp[i][12][1], pre->g_pre_comp[i][12][2],
+            0, pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
+            pre->g_pre_comp[i][2][2]);
         for (j = 1; j < 8; ++j) {
             /* odd multiples: add G resp. 2^28*G */
             point_add(pre->g_pre_comp[i][2 * j + 1][0],
-                      pre->g_pre_comp[i][2 * j + 1][1],
-                      pre->g_pre_comp[i][2 * j + 1][2],
-                      pre->g_pre_comp[i][2 * j][0],
-                      pre->g_pre_comp[i][2 * j][1],
-                      pre->g_pre_comp[i][2 * j][2], 0,
-                      pre->g_pre_comp[i][1][0], pre->g_pre_comp[i][1][1],
-                      pre->g_pre_comp[i][1][2]);
+                pre->g_pre_comp[i][2 * j + 1][1],
+                pre->g_pre_comp[i][2 * j + 1][2],
+                pre->g_pre_comp[i][2 * j][0],
+                pre->g_pre_comp[i][2 * j][1],
+                pre->g_pre_comp[i][2 * j][2], 0,
+                pre->g_pre_comp[i][1][0], pre->g_pre_comp[i][1][1],
+                pre->g_pre_comp[i][1][2]);
         }
     }
     make_points_affine(31, &(pre->g_pre_comp[0][1]), tmp_felems);
 
- done:
+done:
     SETPRECOMP(group, nistp224, pre);
     pre = NULL;
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     EC_POINT_free(generator);
 #ifndef FIPS_MODULE
diff --git a/crypto/ec/ecp_nistp256.c b/crypto/ec/ecp_nistp256.c
index eaf9dddbc8ec6..9066f2e6b9d8d 100644
--- a/crypto/ec/ecp_nistp256.c
+++ b/crypto/ec/ecp_nistp256.c
@@ -47,7 +47,7 @@
 #include "internal/numbers.h"
 
 #ifndef INT128_MAX
-# error "Your compiler doesn't appear to support 128-bit integer types"
+#error "Your compiler doesn't appear to support 128-bit integer types"
 #endif
 
 typedef uint8_t u8;
@@ -67,26 +67,26 @@ typedef u8 felem_bytearray[32];
  * values are big-endian.
  */
 static const felem_bytearray nistp256_curve_params[5] = {
-    {0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, /* p */
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-     0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, /* a = -3 */
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-     0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc},
-    {0x5a, 0xc6, 0x35, 0xd8, 0xaa, 0x3a, 0x93, 0xe7, /* b */
-     0xb3, 0xeb, 0xbd, 0x55, 0x76, 0x98, 0x86, 0xbc,
-     0x65, 0x1d, 0x06, 0xb0, 0xcc, 0x53, 0xb0, 0xf6,
-     0x3b, 0xce, 0x3c, 0x3e, 0x27, 0xd2, 0x60, 0x4b},
-    {0x6b, 0x17, 0xd1, 0xf2, 0xe1, 0x2c, 0x42, 0x47, /* x */
-     0xf8, 0xbc, 0xe6, 0xe5, 0x63, 0xa4, 0x40, 0xf2,
-     0x77, 0x03, 0x7d, 0x81, 0x2d, 0xeb, 0x33, 0xa0,
-     0xf4, 0xa1, 0x39, 0x45, 0xd8, 0x98, 0xc2, 0x96},
-    {0x4f, 0xe3, 0x42, 0xe2, 0xfe, 0x1a, 0x7f, 0x9b, /* y */
-     0x8e, 0xe7, 0xeb, 0x4a, 0x7c, 0x0f, 0x9e, 0x16,
-     0x2b, 0xce, 0x33, 0x57, 0x6b, 0x31, 0x5e, 0xce,
-     0xcb, 0xb6, 0x40, 0x68, 0x37, 0xbf, 0x51, 0xf5}
+    { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, /* p */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+    { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, /* a = -3 */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc },
+    { 0x5a, 0xc6, 0x35, 0xd8, 0xaa, 0x3a, 0x93, 0xe7, /* b */
+        0xb3, 0xeb, 0xbd, 0x55, 0x76, 0x98, 0x86, 0xbc,
+        0x65, 0x1d, 0x06, 0xb0, 0xcc, 0x53, 0xb0, 0xf6,
+        0x3b, 0xce, 0x3c, 0x3e, 0x27, 0xd2, 0x60, 0x4b },
+    { 0x6b, 0x17, 0xd1, 0xf2, 0xe1, 0x2c, 0x42, 0x47, /* x */
+        0xf8, 0xbc, 0xe6, 0xe5, 0x63, 0xa4, 0x40, 0xf2,
+        0x77, 0x03, 0x7d, 0x81, 0x2d, 0xeb, 0x33, 0xa0,
+        0xf4, 0xa1, 0x39, 0x45, 0xd8, 0x98, 0xc2, 0x96 },
+    { 0x4f, 0xe3, 0x42, 0xe2, 0xfe, 0x1a, 0x7f, 0x9b, /* y */
+        0x8e, 0xe7, 0xeb, 0x4a, 0x7c, 0x0f, 0x9e, 0x16,
+        0x2b, 0xce, 0x33, 0x57, 0x6b, 0x31, 0x5e, 0xce,
+        0xcb, 0xb6, 0x40, 0x68, 0x37, 0xbf, 0x51, 0xf5 }
 };
 
 /*-
@@ -248,8 +248,7 @@ static void longfelem_scalar(longfelem out, const u64 scalar)
 #define two105m41p9 (((limb)1) << 105) - (((limb)1) << 41) + (((limb)1) << 9)
 
 /* zero105 is 0 mod p */
-static const felem zero105 =
-    { two105m41m9, two105, two105m41p9, two105m41p9 };
+static const felem zero105 = { two105m41m9, two105, two105m41p9, two105m41p9 };
 
 /*-
  * smallfelem_neg sets |out| to |-small|
@@ -330,14 +329,11 @@ static void felem_diff_zero107(felem out, const felem in)
  */
 static void longfelem_diff(longfelem out, const longfelem in)
 {
-    static const limb two70m8p6 =
-        (((limb) 1) << 70) - (((limb) 1) << 8) + (((limb) 1) << 6);
-    static const limb two70p40 = (((limb) 1) << 70) + (((limb) 1) << 40);
-    static const limb two70 = (((limb) 1) << 70);
-    static const limb two70m40m38p6 =
-        (((limb) 1) << 70) - (((limb) 1) << 40) - (((limb) 1) << 38) +
-        (((limb) 1) << 6);
-    static const limb two70m6 = (((limb) 1) << 70) - (((limb) 1) << 6);
+    static const limb two70m8p6 = (((limb)1) << 70) - (((limb)1) << 8) + (((limb)1) << 6);
+    static const limb two70p40 = (((limb)1) << 70) + (((limb)1) << 40);
+    static const limb two70 = (((limb)1) << 70);
+    static const limb two70m40m38p6 = (((limb)1) << 70) - (((limb)1) << 40) - (((limb)1) << 38) + (((limb)1) << 6);
+    static const limb two70m6 = (((limb)1) << 70) - (((limb)1) << 6);
 
     /* add 0 mod p to avoid underflow */
     out[0] += two70m8p6;
@@ -397,18 +393,18 @@ static void felem_shrink(smallfelem out, const felem in)
      * We perform two partial reductions where we eliminate the high-word of
      * tmp[3]. We don't update the other words till the end.
      */
-    a = tmp[3] >> 64;           /* a < 2^46 */
+    a = tmp[3] >> 64; /* a < 2^46 */
     tmp[3] = (u64)tmp[3];
     tmp[3] -= a;
-    tmp[3] += ((limb) a) << 32;
+    tmp[3] += ((limb)a) << 32;
     /* tmp[3] < 2^79 */
 
     b = a;
-    a = tmp[3] >> 64;           /* a < 2^15 */
-    b += a;                     /* b < 2^46 + 2^15 < 2^47 */
+    a = tmp[3] >> 64; /* a < 2^15 */
+    b += a; /* b < 2^46 + 2^15 < 2^47 */
     tmp[3] = (u64)tmp[3];
     tmp[3] -= a;
-    tmp[3] += ((limb) a) << 32;
+    tmp[3] += ((limb)a) << 32;
     /* tmp[3] < 2^64 + 2^47 */
 
     /*
@@ -416,7 +412,7 @@ static void felem_shrink(smallfelem out, const felem in)
      * reductions.
      */
     tmp[0] += b;
-    tmp[1] -= (((limb) b) << 32);
+    tmp[1] -= (((limb)b) << 32);
 
     /*
      * In order to make space in tmp[3] for the carry from 2 -> 3, we
@@ -489,53 +485,53 @@ static void smallfelem_square(longfelem out, const smallfelem small)
     limb a;
     u64 high, low;
 
-    a = ((uint128_t) small[0]) * small[0];
+    a = ((uint128_t)small[0]) * small[0];
     low = a;
     high = a >> 64;
     out[0] = low;
     out[1] = high;
 
-    a = ((uint128_t) small[0]) * small[1];
+    a = ((uint128_t)small[0]) * small[1];
     low = a;
     high = a >> 64;
     out[1] += low;
     out[1] += low;
     out[2] = high;
 
-    a = ((uint128_t) small[0]) * small[2];
+    a = ((uint128_t)small[0]) * small[2];
     low = a;
     high = a >> 64;
     out[2] += low;
     out[2] *= 2;
     out[3] = high;
 
-    a = ((uint128_t) small[0]) * small[3];
+    a = ((uint128_t)small[0]) * small[3];
     low = a;
     high = a >> 64;
     out[3] += low;
     out[4] = high;
 
-    a = ((uint128_t) small[1]) * small[2];
+    a = ((uint128_t)small[1]) * small[2];
     low = a;
     high = a >> 64;
     out[3] += low;
     out[3] *= 2;
     out[4] += high;
 
-    a = ((uint128_t) small[1]) * small[1];
+    a = ((uint128_t)small[1]) * small[1];
     low = a;
     high = a >> 64;
     out[2] += low;
     out[3] += high;
 
-    a = ((uint128_t) small[1]) * small[3];
+    a = ((uint128_t)small[1]) * small[3];
     low = a;
     high = a >> 64;
     out[4] += low;
     out[4] *= 2;
     out[5] = high;
 
-    a = ((uint128_t) small[2]) * small[3];
+    a = ((uint128_t)small[2]) * small[3];
     low = a;
     high = a >> 64;
     out[5] += low;
@@ -543,13 +539,13 @@ static void smallfelem_square(longfelem out, const smallfelem small)
     out[6] = high;
     out[6] += high;
 
-    a = ((uint128_t) small[2]) * small[2];
+    a = ((uint128_t)small[2]) * small[2];
     low = a;
     high = a >> 64;
     out[4] += low;
     out[5] += high;
 
-    a = ((uint128_t) small[3]) * small[3];
+    a = ((uint128_t)small[3]) * small[3];
     low = a;
     high = a >> 64;
     out[6] += low;
@@ -579,102 +575,102 @@ static void felem_square(longfelem out, const felem in)
  *   out[i] < 7 * 2^64 < 2^67
  */
 static void smallfelem_mul(longfelem out, const smallfelem small1,
-                           const smallfelem small2)
+    const smallfelem small2)
 {
     limb a;
     u64 high, low;
 
-    a = ((uint128_t) small1[0]) * small2[0];
+    a = ((uint128_t)small1[0]) * small2[0];
     low = a;
     high = a >> 64;
     out[0] = low;
     out[1] = high;
 
-    a = ((uint128_t) small1[0]) * small2[1];
+    a = ((uint128_t)small1[0]) * small2[1];
     low = a;
     high = a >> 64;
     out[1] += low;
     out[2] = high;
 
-    a = ((uint128_t) small1[1]) * small2[0];
+    a = ((uint128_t)small1[1]) * small2[0];
     low = a;
     high = a >> 64;
     out[1] += low;
     out[2] += high;
 
-    a = ((uint128_t) small1[0]) * small2[2];
+    a = ((uint128_t)small1[0]) * small2[2];
     low = a;
     high = a >> 64;
     out[2] += low;
     out[3] = high;
 
-    a = ((uint128_t) small1[1]) * small2[1];
+    a = ((uint128_t)small1[1]) * small2[1];
     low = a;
     high = a >> 64;
     out[2] += low;
     out[3] += high;
 
-    a = ((uint128_t) small1[2]) * small2[0];
+    a = ((uint128_t)small1[2]) * small2[0];
     low = a;
     high = a >> 64;
     out[2] += low;
     out[3] += high;
 
-    a = ((uint128_t) small1[0]) * small2[3];
+    a = ((uint128_t)small1[0]) * small2[3];
     low = a;
     high = a >> 64;
     out[3] += low;
     out[4] = high;
 
-    a = ((uint128_t) small1[1]) * small2[2];
+    a = ((uint128_t)small1[1]) * small2[2];
     low = a;
     high = a >> 64;
     out[3] += low;
     out[4] += high;
 
-    a = ((uint128_t) small1[2]) * small2[1];
+    a = ((uint128_t)small1[2]) * small2[1];
     low = a;
     high = a >> 64;
     out[3] += low;
     out[4] += high;
 
-    a = ((uint128_t) small1[3]) * small2[0];
+    a = ((uint128_t)small1[3]) * small2[0];
     low = a;
     high = a >> 64;
     out[3] += low;
     out[4] += high;
 
-    a = ((uint128_t) small1[1]) * small2[3];
+    a = ((uint128_t)small1[1]) * small2[3];
     low = a;
     high = a >> 64;
     out[4] += low;
     out[5] = high;
 
-    a = ((uint128_t) small1[2]) * small2[2];
+    a = ((uint128_t)small1[2]) * small2[2];
     low = a;
     high = a >> 64;
     out[4] += low;
     out[5] += high;
 
-    a = ((uint128_t) small1[3]) * small2[1];
+    a = ((uint128_t)small1[3]) * small2[1];
     low = a;
     high = a >> 64;
     out[4] += low;
     out[5] += high;
 
-    a = ((uint128_t) small1[2]) * small2[3];
+    a = ((uint128_t)small1[2]) * small2[3];
     low = a;
     high = a >> 64;
     out[5] += low;
     out[6] = high;
 
-    a = ((uint128_t) small1[3]) * small2[2];
+    a = ((uint128_t)small1[3]) * small2[2];
     low = a;
     high = a >> 64;
     out[5] += low;
     out[6] += high;
 
-    a = ((uint128_t) small1[3]) * small2[3];
+    a = ((uint128_t)small1[3]) * small2[3];
     low = a;
     high = a >> 64;
     out[6] += low;
@@ -706,7 +702,7 @@ static void felem_mul(longfelem out, const felem in1, const felem in2)
  *   out[i] < 7 * 2^64 < 2^67
  */
 static void felem_small_mul(longfelem out, const smallfelem small1,
-                            const felem in2)
+    const felem in2)
 {
     smallfelem small2;
     felem_shrink(small2, in2);
@@ -717,8 +713,7 @@ static void felem_small_mul(longfelem out, const smallfelem small1,
 #define two100 (((limb)1) << 100)
 #define two100m36p4 (((limb)1) << 100) - (((limb)1) << 36) + (((limb)1) << 4)
 /* zero100 is 0 mod p */
-static const felem zero100 =
-    { two100m36m4, two100, two100m36p4, two100m36p4 };
+static const felem zero100 = { two100m36m4, two100, two100m36p4, two100m36p4 };
 
 /*-
  * Internal function for the different flavours of felem_reduce.
@@ -861,7 +856,7 @@ static void felem_contract(smallfelem out, const felem in)
      */
     for (i = 3; i < 4; i--) {
         u64 equal;
-        uint128_t a = ((uint128_t) kPrime[i]) - out[i];
+        uint128_t a = ((uint128_t)kPrime[i]) - out[i];
         /*
          * if out[i] > kPrime[i] then a will underflow and the high 64-bits
          * will all be set.
@@ -918,7 +913,7 @@ static void smallfelem_square_contract(smallfelem out, const smallfelem in)
 }
 
 static void smallfelem_mul_contract(smallfelem out, const smallfelem in1,
-                                    const smallfelem in2)
+    const smallfelem in2)
 {
     longfelem longtmp;
     felem tmp;
@@ -949,9 +944,7 @@ static limb smallfelem_is_zero(const smallfelem small)
     is_zero &= is_zero << 1;
     is_zero = 0 - (is_zero >> 63);
 
-    is_p = (small[0] ^ kPrime[0]) |
-        (small[1] ^ kPrime[1]) |
-        (small[2] ^ kPrime[2]) | (small[3] ^ kPrime[3]);
+    is_p = (small[0] ^ kPrime[0]) | (small[1] ^ kPrime[1]) | (small[2] ^ kPrime[2]) | (small[3] ^ kPrime[3]);
     is_p--;
     is_p &= is_p << 32;
     is_p &= is_p << 16;
@@ -964,13 +957,13 @@ static limb smallfelem_is_zero(const smallfelem small)
     is_zero |= is_p;
 
     result = is_zero;
-    result |= ((limb) is_zero) << 64;
+    result |= ((limb)is_zero) << 64;
     return result;
 }
 
 static int smallfelem_is_zero_int(const void *small)
 {
-    return (int)(smallfelem_is_zero(small) & ((limb) 1));
+    return (int)(smallfelem_is_zero(small) & ((limb)1));
 }
 
 /*-
@@ -990,89 +983,89 @@ static void felem_inv(felem out, const felem in)
     unsigned i;
 
     felem_square(tmp, in);
-    felem_reduce(ftmp, tmp);    /* 2^1 */
+    felem_reduce(ftmp, tmp); /* 2^1 */
     felem_mul(tmp, in, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^2 - 2^0 */
+    felem_reduce(ftmp, tmp); /* 2^2 - 2^0 */
     felem_assign(e2, ftmp);
     felem_square(tmp, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^3 - 2^1 */
+    felem_reduce(ftmp, tmp); /* 2^3 - 2^1 */
     felem_square(tmp, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^4 - 2^2 */
+    felem_reduce(ftmp, tmp); /* 2^4 - 2^2 */
     felem_mul(tmp, ftmp, e2);
-    felem_reduce(ftmp, tmp);    /* 2^4 - 2^0 */
+    felem_reduce(ftmp, tmp); /* 2^4 - 2^0 */
     felem_assign(e4, ftmp);
     felem_square(tmp, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^5 - 2^1 */
+    felem_reduce(ftmp, tmp); /* 2^5 - 2^1 */
     felem_square(tmp, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^6 - 2^2 */
+    felem_reduce(ftmp, tmp); /* 2^6 - 2^2 */
     felem_square(tmp, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^7 - 2^3 */
+    felem_reduce(ftmp, tmp); /* 2^7 - 2^3 */
     felem_square(tmp, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^8 - 2^4 */
+    felem_reduce(ftmp, tmp); /* 2^8 - 2^4 */
     felem_mul(tmp, ftmp, e4);
-    felem_reduce(ftmp, tmp);    /* 2^8 - 2^0 */
+    felem_reduce(ftmp, tmp); /* 2^8 - 2^0 */
     felem_assign(e8, ftmp);
     for (i = 0; i < 8; i++) {
         felem_square(tmp, ftmp);
         felem_reduce(ftmp, tmp);
-    }                           /* 2^16 - 2^8 */
+    } /* 2^16 - 2^8 */
     felem_mul(tmp, ftmp, e8);
-    felem_reduce(ftmp, tmp);    /* 2^16 - 2^0 */
+    felem_reduce(ftmp, tmp); /* 2^16 - 2^0 */
     felem_assign(e16, ftmp);
     for (i = 0; i < 16; i++) {
         felem_square(tmp, ftmp);
         felem_reduce(ftmp, tmp);
-    }                           /* 2^32 - 2^16 */
+    } /* 2^32 - 2^16 */
     felem_mul(tmp, ftmp, e16);
-    felem_reduce(ftmp, tmp);    /* 2^32 - 2^0 */
+    felem_reduce(ftmp, tmp); /* 2^32 - 2^0 */
     felem_assign(e32, ftmp);
     for (i = 0; i < 32; i++) {
         felem_square(tmp, ftmp);
         felem_reduce(ftmp, tmp);
-    }                           /* 2^64 - 2^32 */
+    } /* 2^64 - 2^32 */
     felem_assign(e64, ftmp);
     felem_mul(tmp, ftmp, in);
-    felem_reduce(ftmp, tmp);    /* 2^64 - 2^32 + 2^0 */
+    felem_reduce(ftmp, tmp); /* 2^64 - 2^32 + 2^0 */
     for (i = 0; i < 192; i++) {
         felem_square(tmp, ftmp);
         felem_reduce(ftmp, tmp);
-    }                           /* 2^256 - 2^224 + 2^192 */
+    } /* 2^256 - 2^224 + 2^192 */
 
     felem_mul(tmp, e64, e32);
-    felem_reduce(ftmp2, tmp);   /* 2^64 - 2^0 */
+    felem_reduce(ftmp2, tmp); /* 2^64 - 2^0 */
     for (i = 0; i < 16; i++) {
         felem_square(tmp, ftmp2);
         felem_reduce(ftmp2, tmp);
-    }                           /* 2^80 - 2^16 */
+    } /* 2^80 - 2^16 */
     felem_mul(tmp, ftmp2, e16);
-    felem_reduce(ftmp2, tmp);   /* 2^80 - 2^0 */
+    felem_reduce(ftmp2, tmp); /* 2^80 - 2^0 */
     for (i = 0; i < 8; i++) {
         felem_square(tmp, ftmp2);
         felem_reduce(ftmp2, tmp);
-    }                           /* 2^88 - 2^8 */
+    } /* 2^88 - 2^8 */
     felem_mul(tmp, ftmp2, e8);
-    felem_reduce(ftmp2, tmp);   /* 2^88 - 2^0 */
+    felem_reduce(ftmp2, tmp); /* 2^88 - 2^0 */
     for (i = 0; i < 4; i++) {
         felem_square(tmp, ftmp2);
         felem_reduce(ftmp2, tmp);
-    }                           /* 2^92 - 2^4 */
+    } /* 2^92 - 2^4 */
     felem_mul(tmp, ftmp2, e4);
-    felem_reduce(ftmp2, tmp);   /* 2^92 - 2^0 */
+    felem_reduce(ftmp2, tmp); /* 2^92 - 2^0 */
     felem_square(tmp, ftmp2);
-    felem_reduce(ftmp2, tmp);   /* 2^93 - 2^1 */
+    felem_reduce(ftmp2, tmp); /* 2^93 - 2^1 */
     felem_square(tmp, ftmp2);
-    felem_reduce(ftmp2, tmp);   /* 2^94 - 2^2 */
+    felem_reduce(ftmp2, tmp); /* 2^94 - 2^2 */
     felem_mul(tmp, ftmp2, e2);
-    felem_reduce(ftmp2, tmp);   /* 2^94 - 2^0 */
+    felem_reduce(ftmp2, tmp); /* 2^94 - 2^0 */
     felem_square(tmp, ftmp2);
-    felem_reduce(ftmp2, tmp);   /* 2^95 - 2^1 */
+    felem_reduce(ftmp2, tmp); /* 2^95 - 2^1 */
     felem_square(tmp, ftmp2);
-    felem_reduce(ftmp2, tmp);   /* 2^96 - 2^2 */
+    felem_reduce(ftmp2, tmp); /* 2^96 - 2^2 */
     felem_mul(tmp, ftmp2, in);
-    felem_reduce(ftmp2, tmp);   /* 2^96 - 3 */
+    felem_reduce(ftmp2, tmp); /* 2^96 - 3 */
 
     felem_mul(tmp, ftmp2, ftmp);
-    felem_reduce(out, tmp);     /* 2^256 - 2^224 + 2^192 + 2^96 - 3 */
+    felem_reduce(out, tmp); /* 2^256 - 2^224 + 2^192 + 2^96 - 3 */
 }
 
 static void smallfelem_inv_contract(smallfelem out, const smallfelem in)
@@ -1104,7 +1097,7 @@ static void smallfelem_inv_contract(smallfelem out, const smallfelem in)
  */
 static void
 point_double(felem x_out, felem y_out, felem z_out,
-             const felem x_in, const felem y_in, const felem z_in)
+    const felem x_in, const felem y_in, const felem z_in)
 {
     longfelem tmp, tmp2;
     felem delta, gamma, beta, alpha, ftmp, ftmp2;
@@ -1186,8 +1179,8 @@ point_double(felem x_out, felem y_out, felem z_out,
  */
 static void
 point_double_small(smallfelem x_out, smallfelem y_out, smallfelem z_out,
-                   const smallfelem x_in, const smallfelem y_in,
-                   const smallfelem z_in)
+    const smallfelem x_in, const smallfelem y_in,
+    const smallfelem z_in)
 {
     felem felem_x_out, felem_y_out, felem_z_out;
     felem felem_x_in, felem_y_in, felem_z_in;
@@ -1196,7 +1189,7 @@ point_double_small(smallfelem x_out, smallfelem y_out, smallfelem z_out,
     smallfelem_expand(felem_y_in, y_in);
     smallfelem_expand(felem_z_in, z_in);
     point_double(felem_x_out, felem_y_out, felem_z_out,
-                 felem_x_in, felem_y_in, felem_z_in);
+        felem_x_in, felem_y_in, felem_z_in);
     felem_shrink(x_out, felem_x_out);
     felem_shrink(y_out, felem_y_out);
     felem_shrink(z_out, felem_z_out);
@@ -1218,7 +1211,7 @@ static void copy_small_conditional(felem out, const smallfelem in, limb mask)
     unsigned i;
     const u64 mask64 = mask;
     for (i = 0; i < NLIMBS; ++i) {
-        out[i] = ((limb) (in[i] & mask64)) | (out[i] & ~mask);
+        out[i] = ((limb)(in[i] & mask64)) | (out[i] & ~mask);
     }
 }
 
@@ -1235,9 +1228,9 @@ static void copy_small_conditional(felem out, const smallfelem in, limb mask)
  * ECDH or ECDSA signing.
  */
 static void point_add(felem x3, felem y3, felem z3,
-                      const felem x1, const felem y1, const felem z1,
-                      const int mixed, const smallfelem x2,
-                      const smallfelem y2, const smallfelem z2)
+    const felem x1, const felem y1, const felem z1,
+    const int mixed, const smallfelem x2,
+    const smallfelem y2, const smallfelem z2)
 {
     felem ftmp, ftmp2, ftmp3, ftmp4, ftmp5, ftmp6, x_out, y_out, z_out;
     longfelem tmp, tmp2;
@@ -1420,8 +1413,8 @@ static void point_add(felem x3, felem y3, felem z3,
  * smallfelems
  */
 static void point_add_small(smallfelem x3, smallfelem y3, smallfelem z3,
-                            smallfelem x1, smallfelem y1, smallfelem z1,
-                            smallfelem x2, smallfelem y2, smallfelem z2)
+    smallfelem x1, smallfelem y1, smallfelem z1,
+    smallfelem x2, smallfelem y2, smallfelem z2)
 {
     felem felem_x3, felem_y3, felem_z3;
     felem felem_x1, felem_y1, felem_z1;
@@ -1429,7 +1422,7 @@ static void point_add_small(smallfelem x3, smallfelem y3, smallfelem z3,
     smallfelem_expand(felem_y1, y1);
     smallfelem_expand(felem_z1, z1);
     point_add(felem_x3, felem_y3, felem_z3, felem_x1, felem_y1, felem_z1, 0,
-              x2, y2, z2);
+        x2, y2, z2);
     felem_shrink(x3, felem_x3);
     felem_shrink(y3, felem_y3);
     felem_shrink(z3, felem_z3);
@@ -1473,162 +1466,162 @@ static void point_add_small(smallfelem x3, smallfelem y3, smallfelem z3,
 
 /* gmul is the table of precomputed base points */
 static const smallfelem gmul[2][16][3] = {
-    {{{0, 0, 0, 0},
-      {0, 0, 0, 0},
-      {0, 0, 0, 0}},
-     {{0xf4a13945d898c296, 0x77037d812deb33a0, 0xf8bce6e563a440f2,
-       0x6b17d1f2e12c4247},
-      {0xcbb6406837bf51f5, 0x2bce33576b315ece, 0x8ee7eb4a7c0f9e16,
-       0x4fe342e2fe1a7f9b},
-      {1, 0, 0, 0}},
-     {{0x90e75cb48e14db63, 0x29493baaad651f7e, 0x8492592e326e25de,
-       0x0fa822bc2811aaa5},
-      {0xe41124545f462ee7, 0x34b1a65050fe82f5, 0x6f4ad4bcb3df188b,
-       0xbff44ae8f5dba80d},
-      {1, 0, 0, 0}},
-     {{0x93391ce2097992af, 0xe96c98fd0d35f1fa, 0xb257c0de95e02789,
-       0x300a4bbc89d6726f},
-      {0xaa54a291c08127a0, 0x5bb1eeada9d806a5, 0x7f1ddb25ff1e3c6f,
-       0x72aac7e0d09b4644},
-      {1, 0, 0, 0}},
-     {{0x57c84fc9d789bd85, 0xfc35ff7dc297eac3, 0xfb982fd588c6766e,
-       0x447d739beedb5e67},
-      {0x0c7e33c972e25b32, 0x3d349b95a7fae500, 0xe12e9d953a4aaff7,
-       0x2d4825ab834131ee},
-      {1, 0, 0, 0}},
-     {{0x13949c932a1d367f, 0xef7fbd2b1a0a11b7, 0xddc6068bb91dfc60,
-       0xef9519328a9c72ff},
-      {0x196035a77376d8a8, 0x23183b0895ca1740, 0xc1ee9807022c219c,
-       0x611e9fc37dbb2c9b},
-      {1, 0, 0, 0}},
-     {{0xcae2b1920b57f4bc, 0x2936df5ec6c9bc36, 0x7dea6482e11238bf,
-       0x550663797b51f5d8},
-      {0x44ffe216348a964c, 0x9fb3d576dbdefbe1, 0x0afa40018d9d50e5,
-       0x157164848aecb851},
-      {1, 0, 0, 0}},
-     {{0xe48ecafffc5cde01, 0x7ccd84e70d715f26, 0xa2e8f483f43e4391,
-       0xeb5d7745b21141ea},
-      {0xcac917e2731a3479, 0x85f22cfe2844b645, 0x0990e6a158006cee,
-       0xeafd72ebdbecc17b},
-      {1, 0, 0, 0}},
-     {{0x6cf20ffb313728be, 0x96439591a3c6b94a, 0x2736ff8344315fc5,
-       0xa6d39677a7849276},
-      {0xf2bab833c357f5f4, 0x824a920c2284059b, 0x66b8babd2d27ecdf,
-       0x674f84749b0b8816},
-      {1, 0, 0, 0}},
-     {{0x2df48c04677c8a3e, 0x74e02f080203a56b, 0x31855f7db8c7fedb,
-       0x4e769e7672c9ddad},
-      {0xa4c36165b824bbb0, 0xfb9ae16f3b9122a5, 0x1ec0057206947281,
-       0x42b99082de830663},
-      {1, 0, 0, 0}},
-     {{0x6ef95150dda868b9, 0xd1f89e799c0ce131, 0x7fdc1ca008a1c478,
-       0x78878ef61c6ce04d},
-      {0x9c62b9121fe0d976, 0x6ace570ebde08d4f, 0xde53142c12309def,
-       0xb6cb3f5d7b72c321},
-      {1, 0, 0, 0}},
-     {{0x7f991ed2c31a3573, 0x5b82dd5bd54fb496, 0x595c5220812ffcae,
-       0x0c88bc4d716b1287},
-      {0x3a57bf635f48aca8, 0x7c8181f4df2564f3, 0x18d1b5b39c04e6aa,
-       0xdd5ddea3f3901dc6},
-      {1, 0, 0, 0}},
-     {{0xe96a79fb3e72ad0c, 0x43a0a28c42ba792f, 0xefe0a423083e49f3,
-       0x68f344af6b317466},
-      {0xcdfe17db3fb24d4a, 0x668bfc2271f5c626, 0x604ed93c24d67ff3,
-       0x31b9c405f8540a20},
-      {1, 0, 0, 0}},
-     {{0xd36b4789a2582e7f, 0x0d1a10144ec39c28, 0x663c62c3edbad7a0,
-       0x4052bf4b6f461db9},
-      {0x235a27c3188d25eb, 0xe724f33999bfcc5b, 0x862be6bd71d70cc8,
-       0xfecf4d5190b0fc61},
-      {1, 0, 0, 0}},
-     {{0x74346c10a1d4cfac, 0xafdf5cc08526a7a4, 0x123202a8f62bff7a,
-       0x1eddbae2c802e41a},
-      {0x8fa0af2dd603f844, 0x36e06b7e4c701917, 0x0c45f45273db33a0,
-       0x43104d86560ebcfc},
-      {1, 0, 0, 0}},
-     {{0x9615b5110d1d78e5, 0x66b0de3225c4744b, 0x0a4a46fb6aaf363a,
-       0xb48e26b484f7a21c},
-      {0x06ebb0f621a01b2d, 0xc004e4048b7b0f98, 0x64131bcdfed6f668,
-       0xfac015404d4d3dab},
-      {1, 0, 0, 0}}},
-    {{{0, 0, 0, 0},
-      {0, 0, 0, 0},
-      {0, 0, 0, 0}},
-     {{0x3a5a9e22185a5943, 0x1ab919365c65dfb6, 0x21656b32262c71da,
-       0x7fe36b40af22af89},
-      {0xd50d152c699ca101, 0x74b3d5867b8af212, 0x9f09f40407dca6f1,
-       0xe697d45825b63624},
-      {1, 0, 0, 0}},
-     {{0xa84aa9397512218e, 0xe9a521b074ca0141, 0x57880b3a18a2e902,
-       0x4a5b506612a677a6},
-      {0x0beada7a4c4f3840, 0x626db15419e26d9d, 0xc42604fbe1627d40,
-       0xeb13461ceac089f1},
-      {1, 0, 0, 0}},
-     {{0xf9faed0927a43281, 0x5e52c4144103ecbc, 0xc342967aa815c857,
-       0x0781b8291c6a220a},
-      {0x5a8343ceeac55f80, 0x88f80eeee54a05e3, 0x97b2a14f12916434,
-       0x690cde8df0151593},
-      {1, 0, 0, 0}},
-     {{0xaee9c75df7f82f2a, 0x9e4c35874afdf43a, 0xf5622df437371326,
-       0x8a535f566ec73617},
-      {0xc5f9a0ac223094b7, 0xcde533864c8c7669, 0x37e02819085a92bf,
-       0x0455c08468b08bd7},
-      {1, 0, 0, 0}},
-     {{0x0c0a6e2c9477b5d9, 0xf9a4bf62876dc444, 0x5050a949b6cdc279,
-       0x06bada7ab77f8276},
-      {0xc8b4aed1ea48dac9, 0xdebd8a4b7ea1070f, 0x427d49101366eb70,
-       0x5b476dfd0e6cb18a},
-      {1, 0, 0, 0}},
-     {{0x7c5c3e44278c340a, 0x4d54606812d66f3b, 0x29a751b1ae23c5d8,
-       0x3e29864e8a2ec908},
-      {0x142d2a6626dbb850, 0xad1744c4765bd780, 0x1f150e68e322d1ed,
-       0x239b90ea3dc31e7e},
-      {1, 0, 0, 0}},
-     {{0x78c416527a53322a, 0x305dde6709776f8e, 0xdbcab759f8862ed4,
-       0x820f4dd949f72ff7},
-      {0x6cc544a62b5debd4, 0x75be5d937b4e8cc4, 0x1b481b1b215c14d3,
-       0x140406ec783a05ec},
-      {1, 0, 0, 0}},
-     {{0x6a703f10e895df07, 0xfd75f3fa01876bd8, 0xeb5b06e70ce08ffe,
-       0x68f6b8542783dfee},
-      {0x90c76f8a78712655, 0xcf5293d2f310bf7f, 0xfbc8044dfda45028,
-       0xcbe1feba92e40ce6},
-      {1, 0, 0, 0}},
-     {{0xe998ceea4396e4c1, 0xfc82ef0b6acea274, 0x230f729f2250e927,
-       0xd0b2f94d2f420109},
-      {0x4305adddb38d4966, 0x10b838f8624c3b45, 0x7db2636658954e7a,
-       0x971459828b0719e5},
-      {1, 0, 0, 0}},
-     {{0x4bd6b72623369fc9, 0x57f2929e53d0b876, 0xc2d5cba4f2340687,
-       0x961610004a866aba},
-      {0x49997bcd2e407a5e, 0x69ab197d92ddcb24, 0x2cf1f2438fe5131c,
-       0x7acb9fadcee75e44},
-      {1, 0, 0, 0}},
-     {{0x254e839423d2d4c0, 0xf57f0c917aea685b, 0xa60d880f6f75aaea,
-       0x24eb9acca333bf5b},
-      {0xe3de4ccb1cda5dea, 0xfeef9341c51a6b4f, 0x743125f88bac4c4d,
-       0x69f891c5acd079cc},
-      {1, 0, 0, 0}},
-     {{0xeee44b35702476b5, 0x7ed031a0e45c2258, 0xb422d1e7bd6f8514,
-       0xe51f547c5972a107},
-      {0xa25bcd6fc9cf343d, 0x8ca922ee097c184e, 0xa62f98b3a9fe9a06,
-       0x1c309a2b25bb1387},
-      {1, 0, 0, 0}},
-     {{0x9295dbeb1967c459, 0xb00148833472c98e, 0xc504977708011828,
-       0x20b87b8aa2c4e503},
-      {0x3063175de057c277, 0x1bd539338fe582dd, 0x0d11adef5f69a044,
-       0xf5c6fa49919776be},
-      {1, 0, 0, 0}},
-     {{0x8c944e760fd59e11, 0x3876cba1102fad5f, 0xa454c3fad83faa56,
-       0x1ed7d1b9332010b9},
-      {0xa1011a270024b889, 0x05e4d0dcac0cd344, 0x52b520f0eb6a2a24,
-       0x3a2b03f03217257a},
-      {1, 0, 0, 0}},
-     {{0xf20fc2afdf1d043d, 0xf330240db58d5a62, 0xfc7d229ca0058c3b,
-       0x15fee545c78dd9f6},
-      {0x501e82885bc98cda, 0x41ef80e5d046ac04, 0x557d9f49461210fb,
-       0x4ab5b6b2b8753f81},
-      {1, 0, 0, 0}}}
+    { { { 0, 0, 0, 0 },
+          { 0, 0, 0, 0 },
+          { 0, 0, 0, 0 } },
+        { { 0xf4a13945d898c296, 0x77037d812deb33a0, 0xf8bce6e563a440f2,
+              0x6b17d1f2e12c4247 },
+            { 0xcbb6406837bf51f5, 0x2bce33576b315ece, 0x8ee7eb4a7c0f9e16,
+                0x4fe342e2fe1a7f9b },
+            { 1, 0, 0, 0 } },
+        { { 0x90e75cb48e14db63, 0x29493baaad651f7e, 0x8492592e326e25de,
+              0x0fa822bc2811aaa5 },
+            { 0xe41124545f462ee7, 0x34b1a65050fe82f5, 0x6f4ad4bcb3df188b,
+                0xbff44ae8f5dba80d },
+            { 1, 0, 0, 0 } },
+        { { 0x93391ce2097992af, 0xe96c98fd0d35f1fa, 0xb257c0de95e02789,
+              0x300a4bbc89d6726f },
+            { 0xaa54a291c08127a0, 0x5bb1eeada9d806a5, 0x7f1ddb25ff1e3c6f,
+                0x72aac7e0d09b4644 },
+            { 1, 0, 0, 0 } },
+        { { 0x57c84fc9d789bd85, 0xfc35ff7dc297eac3, 0xfb982fd588c6766e,
+              0x447d739beedb5e67 },
+            { 0x0c7e33c972e25b32, 0x3d349b95a7fae500, 0xe12e9d953a4aaff7,
+                0x2d4825ab834131ee },
+            { 1, 0, 0, 0 } },
+        { { 0x13949c932a1d367f, 0xef7fbd2b1a0a11b7, 0xddc6068bb91dfc60,
+              0xef9519328a9c72ff },
+            { 0x196035a77376d8a8, 0x23183b0895ca1740, 0xc1ee9807022c219c,
+                0x611e9fc37dbb2c9b },
+            { 1, 0, 0, 0 } },
+        { { 0xcae2b1920b57f4bc, 0x2936df5ec6c9bc36, 0x7dea6482e11238bf,
+              0x550663797b51f5d8 },
+            { 0x44ffe216348a964c, 0x9fb3d576dbdefbe1, 0x0afa40018d9d50e5,
+                0x157164848aecb851 },
+            { 1, 0, 0, 0 } },
+        { { 0xe48ecafffc5cde01, 0x7ccd84e70d715f26, 0xa2e8f483f43e4391,
+              0xeb5d7745b21141ea },
+            { 0xcac917e2731a3479, 0x85f22cfe2844b645, 0x0990e6a158006cee,
+                0xeafd72ebdbecc17b },
+            { 1, 0, 0, 0 } },
+        { { 0x6cf20ffb313728be, 0x96439591a3c6b94a, 0x2736ff8344315fc5,
+              0xa6d39677a7849276 },
+            { 0xf2bab833c357f5f4, 0x824a920c2284059b, 0x66b8babd2d27ecdf,
+                0x674f84749b0b8816 },
+            { 1, 0, 0, 0 } },
+        { { 0x2df48c04677c8a3e, 0x74e02f080203a56b, 0x31855f7db8c7fedb,
+              0x4e769e7672c9ddad },
+            { 0xa4c36165b824bbb0, 0xfb9ae16f3b9122a5, 0x1ec0057206947281,
+                0x42b99082de830663 },
+            { 1, 0, 0, 0 } },
+        { { 0x6ef95150dda868b9, 0xd1f89e799c0ce131, 0x7fdc1ca008a1c478,
+              0x78878ef61c6ce04d },
+            { 0x9c62b9121fe0d976, 0x6ace570ebde08d4f, 0xde53142c12309def,
+                0xb6cb3f5d7b72c321 },
+            { 1, 0, 0, 0 } },
+        { { 0x7f991ed2c31a3573, 0x5b82dd5bd54fb496, 0x595c5220812ffcae,
+              0x0c88bc4d716b1287 },
+            { 0x3a57bf635f48aca8, 0x7c8181f4df2564f3, 0x18d1b5b39c04e6aa,
+                0xdd5ddea3f3901dc6 },
+            { 1, 0, 0, 0 } },
+        { { 0xe96a79fb3e72ad0c, 0x43a0a28c42ba792f, 0xefe0a423083e49f3,
+              0x68f344af6b317466 },
+            { 0xcdfe17db3fb24d4a, 0x668bfc2271f5c626, 0x604ed93c24d67ff3,
+                0x31b9c405f8540a20 },
+            { 1, 0, 0, 0 } },
+        { { 0xd36b4789a2582e7f, 0x0d1a10144ec39c28, 0x663c62c3edbad7a0,
+              0x4052bf4b6f461db9 },
+            { 0x235a27c3188d25eb, 0xe724f33999bfcc5b, 0x862be6bd71d70cc8,
+                0xfecf4d5190b0fc61 },
+            { 1, 0, 0, 0 } },
+        { { 0x74346c10a1d4cfac, 0xafdf5cc08526a7a4, 0x123202a8f62bff7a,
+              0x1eddbae2c802e41a },
+            { 0x8fa0af2dd603f844, 0x36e06b7e4c701917, 0x0c45f45273db33a0,
+                0x43104d86560ebcfc },
+            { 1, 0, 0, 0 } },
+        { { 0x9615b5110d1d78e5, 0x66b0de3225c4744b, 0x0a4a46fb6aaf363a,
+              0xb48e26b484f7a21c },
+            { 0x06ebb0f621a01b2d, 0xc004e4048b7b0f98, 0x64131bcdfed6f668,
+                0xfac015404d4d3dab },
+            { 1, 0, 0, 0 } } },
+    { { { 0, 0, 0, 0 },
+          { 0, 0, 0, 0 },
+          { 0, 0, 0, 0 } },
+        { { 0x3a5a9e22185a5943, 0x1ab919365c65dfb6, 0x21656b32262c71da,
+              0x7fe36b40af22af89 },
+            { 0xd50d152c699ca101, 0x74b3d5867b8af212, 0x9f09f40407dca6f1,
+                0xe697d45825b63624 },
+            { 1, 0, 0, 0 } },
+        { { 0xa84aa9397512218e, 0xe9a521b074ca0141, 0x57880b3a18a2e902,
+              0x4a5b506612a677a6 },
+            { 0x0beada7a4c4f3840, 0x626db15419e26d9d, 0xc42604fbe1627d40,
+                0xeb13461ceac089f1 },
+            { 1, 0, 0, 0 } },
+        { { 0xf9faed0927a43281, 0x5e52c4144103ecbc, 0xc342967aa815c857,
+              0x0781b8291c6a220a },
+            { 0x5a8343ceeac55f80, 0x88f80eeee54a05e3, 0x97b2a14f12916434,
+                0x690cde8df0151593 },
+            { 1, 0, 0, 0 } },
+        { { 0xaee9c75df7f82f2a, 0x9e4c35874afdf43a, 0xf5622df437371326,
+              0x8a535f566ec73617 },
+            { 0xc5f9a0ac223094b7, 0xcde533864c8c7669, 0x37e02819085a92bf,
+                0x0455c08468b08bd7 },
+            { 1, 0, 0, 0 } },
+        { { 0x0c0a6e2c9477b5d9, 0xf9a4bf62876dc444, 0x5050a949b6cdc279,
+              0x06bada7ab77f8276 },
+            { 0xc8b4aed1ea48dac9, 0xdebd8a4b7ea1070f, 0x427d49101366eb70,
+                0x5b476dfd0e6cb18a },
+            { 1, 0, 0, 0 } },
+        { { 0x7c5c3e44278c340a, 0x4d54606812d66f3b, 0x29a751b1ae23c5d8,
+              0x3e29864e8a2ec908 },
+            { 0x142d2a6626dbb850, 0xad1744c4765bd780, 0x1f150e68e322d1ed,
+                0x239b90ea3dc31e7e },
+            { 1, 0, 0, 0 } },
+        { { 0x78c416527a53322a, 0x305dde6709776f8e, 0xdbcab759f8862ed4,
+              0x820f4dd949f72ff7 },
+            { 0x6cc544a62b5debd4, 0x75be5d937b4e8cc4, 0x1b481b1b215c14d3,
+                0x140406ec783a05ec },
+            { 1, 0, 0, 0 } },
+        { { 0x6a703f10e895df07, 0xfd75f3fa01876bd8, 0xeb5b06e70ce08ffe,
+              0x68f6b8542783dfee },
+            { 0x90c76f8a78712655, 0xcf5293d2f310bf7f, 0xfbc8044dfda45028,
+                0xcbe1feba92e40ce6 },
+            { 1, 0, 0, 0 } },
+        { { 0xe998ceea4396e4c1, 0xfc82ef0b6acea274, 0x230f729f2250e927,
+              0xd0b2f94d2f420109 },
+            { 0x4305adddb38d4966, 0x10b838f8624c3b45, 0x7db2636658954e7a,
+                0x971459828b0719e5 },
+            { 1, 0, 0, 0 } },
+        { { 0x4bd6b72623369fc9, 0x57f2929e53d0b876, 0xc2d5cba4f2340687,
+              0x961610004a866aba },
+            { 0x49997bcd2e407a5e, 0x69ab197d92ddcb24, 0x2cf1f2438fe5131c,
+                0x7acb9fadcee75e44 },
+            { 1, 0, 0, 0 } },
+        { { 0x254e839423d2d4c0, 0xf57f0c917aea685b, 0xa60d880f6f75aaea,
+              0x24eb9acca333bf5b },
+            { 0xe3de4ccb1cda5dea, 0xfeef9341c51a6b4f, 0x743125f88bac4c4d,
+                0x69f891c5acd079cc },
+            { 1, 0, 0, 0 } },
+        { { 0xeee44b35702476b5, 0x7ed031a0e45c2258, 0xb422d1e7bd6f8514,
+              0xe51f547c5972a107 },
+            { 0xa25bcd6fc9cf343d, 0x8ca922ee097c184e, 0xa62f98b3a9fe9a06,
+                0x1c309a2b25bb1387 },
+            { 1, 0, 0, 0 } },
+        { { 0x9295dbeb1967c459, 0xb00148833472c98e, 0xc504977708011828,
+              0x20b87b8aa2c4e503 },
+            { 0x3063175de057c277, 0x1bd539338fe582dd, 0x0d11adef5f69a044,
+                0xf5c6fa49919776be },
+            { 1, 0, 0, 0 } },
+        { { 0x8c944e760fd59e11, 0x3876cba1102fad5f, 0xa454c3fad83faa56,
+              0x1ed7d1b9332010b9 },
+            { 0xa1011a270024b889, 0x05e4d0dcac0cd344, 0x52b520f0eb6a2a24,
+                0x3a2b03f03217257a },
+            { 1, 0, 0, 0 } },
+        { { 0xf20fc2afdf1d043d, 0xf330240db58d5a62, 0xfc7d229ca0058c3b,
+              0x15fee545c78dd9f6 },
+            { 0x501e82885bc98cda, 0x41ef80e5d046ac04, 0x557d9f49461210fb,
+                0x4ab5b6b2b8753f81 },
+            { 1, 0, 0, 0 } } }
 };
 
 /*
@@ -1636,7 +1629,7 @@ static const smallfelem gmul[2][16][3] = {
  * copies it to out.
  */
 static void select_point(const u64 idx, unsigned int size,
-                         const smallfelem pre_comp[16][3], smallfelem out[3])
+    const smallfelem pre_comp[16][3], smallfelem out[3])
 {
     unsigned i, j;
     u64 *outlimbs = &out[0][0];
@@ -1672,10 +1665,10 @@ static char get_bit(const felem_bytearray in, int i)
  * Output point (X, Y, Z) is stored in x_out, y_out, z_out
  */
 static void batch_mul(felem x_out, felem y_out, felem z_out,
-                      const felem_bytearray scalars[],
-                      const unsigned num_points, const u8 *g_scalar,
-                      const int mixed, const smallfelem pre_comp[][17][3],
-                      const smallfelem g_pre_comp[2][16][3])
+    const felem_bytearray scalars[],
+    const unsigned num_points, const u8 *g_scalar,
+    const int mixed, const smallfelem pre_comp[][17][3],
+    const smallfelem g_pre_comp[2][16][3])
 {
     int i, skip;
     unsigned num, gen_mul = (g_scalar != NULL);
@@ -1692,8 +1685,8 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
      * of the generator (two in each of the last 32 rounds) and additions of
      * other points multiples (every 5th round).
      */
-    skip = 1;                   /* save two point operations in the first
-                                 * round */
+    skip = 1; /* save two point operations in the first
+               * round */
     for (i = (num_points ? 255 : 31); i >= 0; --i) {
         /* double */
         if (!skip)
@@ -1712,7 +1705,7 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
             if (!skip) {
                 /* Arg 1 below is for "mixed" */
                 point_add(nq[0], nq[1], nq[2],
-                          nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
+                    nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
             } else {
                 smallfelem_expand(nq[0], tmp[0]);
                 smallfelem_expand(nq[1], tmp[1]);
@@ -1729,7 +1722,7 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
             select_point(bits, 16, g_pre_comp[0], tmp);
             /* Arg 1 below is for "mixed" */
             point_add(nq[0], nq[1], nq[2],
-                      nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
+                nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
         }
 
         /* do other additions every 5 doublings */
@@ -1750,13 +1743,13 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
                 select_point(digit, 17, pre_comp[num], tmp);
                 smallfelem_neg(ftmp, tmp[1]); /* (X, -Y, Z) is the negative
                                                * point */
-                copy_small_conditional(ftmp, tmp[1], (((limb) sign) - 1));
+                copy_small_conditional(ftmp, tmp[1], (((limb)sign) - 1));
                 felem_contract(tmp[1], ftmp);
 
                 if (!skip) {
                     point_add(nq[0], nq[1], nq[2],
-                              nq[0], nq[1], nq[2],
-                              mixed, tmp[0], tmp[1], tmp[2]);
+                        nq[0], nq[1], nq[2],
+                        mixed, tmp[0], tmp[1], tmp[2]);
                 } else {
                     smallfelem_expand(nq[0], tmp[0]);
                     smallfelem_expand(nq[1], tmp[1]);
@@ -1798,9 +1791,9 @@ const EC_METHOD *EC_GFp_nistp256_method(void)
         ossl_ec_GFp_simple_point_set_to_infinity,
         ossl_ec_GFp_simple_point_set_affine_coordinates,
         ossl_ec_GFp_nistp256_point_get_affine_coordinates,
-        0 /* point_set_compressed_coordinates */ ,
-        0 /* point2oct */ ,
-        0 /* oct2point */ ,
+        0 /* point_set_compressed_coordinates */,
+        0 /* point2oct */,
+        0 /* oct2point */,
         ossl_ec_GFp_simple_add,
         ossl_ec_GFp_simple_dbl,
         ossl_ec_GFp_simple_invert,
@@ -1814,11 +1807,11 @@ const EC_METHOD *EC_GFp_nistp256_method(void)
         ossl_ec_GFp_nistp256_have_precompute_mult,
         ossl_ec_GFp_nist_field_mul,
         ossl_ec_GFp_nist_field_sqr,
-        0 /* field_div */ ,
+        0 /* field_div */,
         ossl_ec_GFp_simple_field_inv,
-        0 /* field_encode */ ,
-        0 /* field_decode */ ,
-        0,                      /* field_set_to_one */
+        0 /* field_encode */,
+        0 /* field_decode */,
+        0, /* field_set_to_one */
         ossl_ec_key_simple_priv2oct,
         ossl_ec_key_simple_oct2priv,
         0, /* set private */
@@ -1835,7 +1828,7 @@ const EC_METHOD *EC_GFp_nistp256_method(void)
         0, /* blind_coordinates */
         0, /* ladder_pre */
         0, /* ladder_step */
-        0  /* ladder_post */
+        0 /* ladder_post */
     };
 
     return &ret;
@@ -1899,8 +1892,8 @@ int ossl_ec_GFp_nistp256_group_init(EC_GROUP *group)
 }
 
 int ossl_ec_GFp_nistp256_group_set_curve(EC_GROUP *group, const BIGNUM *p,
-                                         const BIGNUM *a, const BIGNUM *b,
-                                         BN_CTX *ctx)
+    const BIGNUM *a, const BIGNUM *b,
+    BN_CTX *ctx)
 {
     int ret = 0;
     BIGNUM *curve_p, *curve_a, *curve_b;
@@ -1928,7 +1921,7 @@ int ossl_ec_GFp_nistp256_group_set_curve(EC_GROUP *group, const BIGNUM *p,
     }
     group->field_mod_func = BN_nist_mod_256;
     ret = ossl_ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
- err:
+err:
     BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
     BN_CTX_free(new_ctx);
@@ -1941,9 +1934,9 @@ int ossl_ec_GFp_nistp256_group_set_curve(EC_GROUP *group, const BIGNUM *p,
  * (X/Z^2, Y/Z^3)
  */
 int ossl_ec_GFp_nistp256_point_get_affine_coordinates(const EC_GROUP *group,
-                                                      const EC_POINT *point,
-                                                      BIGNUM *x, BIGNUM *y,
-                                                      BN_CTX *ctx)
+    const EC_POINT *point,
+    BIGNUM *x, BIGNUM *y,
+    BN_CTX *ctx)
 {
     felem z1, z2, x_in, y_in;
     smallfelem x_out, y_out;
@@ -1953,8 +1946,7 @@ int ossl_ec_GFp_nistp256_point_get_affine_coordinates(const EC_GROUP *group,
         ERR_raise(ERR_LIB_EC, EC_R_POINT_AT_INFINITY);
         return 0;
     }
-    if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) ||
-        (!BN_to_felem(z1, point->Z)))
+    if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) || (!BN_to_felem(z1, point->Z)))
         return 0;
     felem_inv(z2, z1);
     felem_square(tmp, z2);
@@ -1984,31 +1976,30 @@ int ossl_ec_GFp_nistp256_point_get_affine_coordinates(const EC_GROUP *group,
 
 /* points below is of size |num|, and tmp_smallfelems is of size |num+1| */
 static void make_points_affine(size_t num, smallfelem points[][3],
-                               smallfelem tmp_smallfelems[])
+    smallfelem tmp_smallfelems[])
 {
     /*
      * Runs in constant time, unless an input is the point at infinity (which
      * normally shouldn't happen).
      */
     ossl_ec_GFp_nistp_points_make_affine_internal(num,
-                                                  points,
-                                                  sizeof(smallfelem),
-                                                  tmp_smallfelems,
-                                                  (void (*)(void *))smallfelem_one,
-                                                  smallfelem_is_zero_int,
-                                                  (void (*)(void *, const void *))
-                                                  smallfelem_assign,
-                                                  (void (*)(void *, const void *))
-                                                  smallfelem_square_contract,
-                                                  (void (*)
-                                                   (void *, const void *,
-                                                    const void *))
-                                                  smallfelem_mul_contract,
-                                                  (void (*)(void *, const void *))
-                                                  smallfelem_inv_contract,
-                                                  /* nothing to contract */
-                                                  (void (*)(void *, const void *))
-                                                  smallfelem_assign);
+        points,
+        sizeof(smallfelem),
+        tmp_smallfelems,
+        (void (*)(void *))smallfelem_one,
+        smallfelem_is_zero_int,
+        (void (*)(void *, const void *))
+            smallfelem_assign,
+        (void (*)(void *, const void *))
+            smallfelem_square_contract,
+        (void (*)(void *, const void *,
+            const void *))
+            smallfelem_mul_contract,
+        (void (*)(void *, const void *))
+            smallfelem_inv_contract,
+        /* nothing to contract */
+        (void (*)(void *, const void *))
+            smallfelem_assign);
 }
 
 /*
@@ -2016,9 +2007,9 @@ static void make_points_affine(size_t num, smallfelem points[][3],
  * values Result is stored in r (r can equal one of the inputs).
  */
 int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
-                                    const BIGNUM *scalar, size_t num,
-                                    const EC_POINT *points[],
-                                    const BIGNUM *scalars[], BN_CTX *ctx)
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *ctx)
 {
     int ret = 0;
     int j;
@@ -2026,7 +2017,7 @@ int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
     BIGNUM *x, *y, *z, *tmp_scalar;
     felem_bytearray g_secret;
     felem_bytearray *secrets = NULL;
-    smallfelem (*pre_comp)[17][3] = NULL;
+    smallfelem(*pre_comp)[17][3] = NULL;
     smallfelem *tmp_smallfelems = NULL;
     unsigned i;
     int num_bytes;
@@ -2060,15 +2051,13 @@ int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
         if (generator == NULL)
             goto err;
         /* get the generator from precomputation */
-        if (!smallfelem_to_BN(x, g_pre_comp[0][1][0]) ||
-            !smallfelem_to_BN(y, g_pre_comp[0][1][1]) ||
-            !smallfelem_to_BN(z, g_pre_comp[0][1][2])) {
+        if (!smallfelem_to_BN(x, g_pre_comp[0][1][0]) || !smallfelem_to_BN(y, g_pre_comp[0][1][1]) || !smallfelem_to_BN(z, g_pre_comp[0][1][2])) {
             ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
             goto err;
         }
         if (!ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group,
-                                                                generator,
-                                                                x, y, z, ctx))
+                generator,
+                x, y, z, ctx))
             goto err;
         if (0 == EC_POINT_cmp(group, generator, group->generator, ctx))
             /* precomputation matches generator */
@@ -2091,8 +2080,7 @@ int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
         secrets = OPENSSL_malloc(sizeof(*secrets) * num_points);
         pre_comp = OPENSSL_malloc(sizeof(*pre_comp) * num_points);
         if (mixed)
-            tmp_smallfelems =
-              OPENSSL_malloc(sizeof(*tmp_smallfelems) * (num_points * 17 + 1));
+            tmp_smallfelems = OPENSSL_malloc(sizeof(*tmp_smallfelems) * (num_points * 17 + 1));
         if ((secrets == NULL) || (pre_comp == NULL)
             || (mixed && (tmp_smallfelems == NULL)))
             goto err;
@@ -2129,19 +2117,17 @@ int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
                         goto err;
                     }
                     num_bytes = BN_bn2lebinpad(tmp_scalar,
-                                               secrets[i], sizeof(secrets[i]));
+                        secrets[i], sizeof(secrets[i]));
                 } else {
                     num_bytes = BN_bn2lebinpad(p_scalar,
-                                               secrets[i], sizeof(secrets[i]));
+                        secrets[i], sizeof(secrets[i]));
                 }
                 if (num_bytes < 0) {
                     ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
                     goto err;
                 }
                 /* precompute multiples */
-                if ((!BN_to_felem(x_out, p->X)) ||
-                    (!BN_to_felem(y_out, p->Y)) ||
-                    (!BN_to_felem(z_out, p->Z)))
+                if ((!BN_to_felem(x_out, p->X)) || (!BN_to_felem(y_out, p->Y)) || (!BN_to_felem(z_out, p->Z)))
                     goto err;
                 felem_shrink(pre_comp[i][1][0], x_out);
                 felem_shrink(pre_comp[i][1][1], y_out);
@@ -2149,18 +2135,18 @@ int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
                 for (j = 2; j <= 16; ++j) {
                     if (j & 1) {
                         point_add_small(pre_comp[i][j][0], pre_comp[i][j][1],
-                                        pre_comp[i][j][2], pre_comp[i][1][0],
-                                        pre_comp[i][1][1], pre_comp[i][1][2],
-                                        pre_comp[i][j - 1][0],
-                                        pre_comp[i][j - 1][1],
-                                        pre_comp[i][j - 1][2]);
+                            pre_comp[i][j][2], pre_comp[i][1][0],
+                            pre_comp[i][1][1], pre_comp[i][1][2],
+                            pre_comp[i][j - 1][0],
+                            pre_comp[i][j - 1][1],
+                            pre_comp[i][j - 1][2]);
                     } else {
                         point_double_small(pre_comp[i][j][0],
-                                           pre_comp[i][j][1],
-                                           pre_comp[i][j][2],
-                                           pre_comp[i][j / 2][0],
-                                           pre_comp[i][j / 2][1],
-                                           pre_comp[i][j / 2][2]);
+                            pre_comp[i][j][1],
+                            pre_comp[i][j][2],
+                            pre_comp[i][j / 2][0],
+                            pre_comp[i][j / 2][1],
+                            pre_comp[i][j / 2][2]);
                     }
                 }
             }
@@ -2188,28 +2174,27 @@ int ossl_ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r,
         }
         /* do the multiplication with generator precomputation */
         batch_mul(x_out, y_out, z_out,
-                  (const felem_bytearray(*))secrets, num_points,
-                  g_secret,
-                  mixed, (const smallfelem(*)[17][3])pre_comp, g_pre_comp);
+            (const felem_bytearray(*))secrets, num_points,
+            g_secret,
+            mixed, (const smallfelem(*)[17][3])pre_comp, g_pre_comp);
     } else {
         /* do the multiplication without generator precomputation */
         batch_mul(x_out, y_out, z_out,
-                  (const felem_bytearray(*))secrets, num_points,
-                  NULL, mixed, (const smallfelem(*)[17][3])pre_comp, NULL);
+            (const felem_bytearray(*))secrets, num_points,
+            NULL, mixed, (const smallfelem(*)[17][3])pre_comp, NULL);
     }
     /* reduce the output to its unique minimal representation */
     felem_contract(x_in, x_out);
     felem_contract(y_in, y_out);
     felem_contract(z_in, z_out);
-    if ((!smallfelem_to_BN(x, x_in)) || (!smallfelem_to_BN(y, y_in)) ||
-        (!smallfelem_to_BN(z, z_in))) {
+    if ((!smallfelem_to_BN(x, x_in)) || (!smallfelem_to_BN(y, y_in)) || (!smallfelem_to_BN(z, z_in))) {
         ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
         goto err;
     }
     ret = ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group, r, x, y, z,
-                                                             ctx);
+        ctx);
 
- err:
+err:
     BN_CTX_end(ctx);
     EC_POINT_free(generator);
     OPENSSL_free(secrets);
@@ -2265,9 +2250,7 @@ int ossl_ec_GFp_nistp256_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
         memcpy(pre->g_pre_comp, gmul, sizeof(pre->g_pre_comp));
         goto done;
     }
-    if ((!BN_to_felem(x_tmp, group->generator->X)) ||
-        (!BN_to_felem(y_tmp, group->generator->Y)) ||
-        (!BN_to_felem(z_tmp, group->generator->Z)))
+    if ((!BN_to_felem(x_tmp, group->generator->X)) || (!BN_to_felem(y_tmp, group->generator->Y)) || (!BN_to_felem(z_tmp, group->generator->Z)))
         goto err;
     felem_shrink(pre->g_pre_comp[0][1][0], x_tmp);
     felem_shrink(pre->g_pre_comp[0][1][1], y_tmp);
@@ -2278,31 +2261,31 @@ int ossl_ec_GFp_nistp256_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
      */
     for (i = 1; i <= 8; i <<= 1) {
         point_double_small(pre->g_pre_comp[1][i][0], pre->g_pre_comp[1][i][1],
-                           pre->g_pre_comp[1][i][2], pre->g_pre_comp[0][i][0],
-                           pre->g_pre_comp[0][i][1],
-                           pre->g_pre_comp[0][i][2]);
+            pre->g_pre_comp[1][i][2], pre->g_pre_comp[0][i][0],
+            pre->g_pre_comp[0][i][1],
+            pre->g_pre_comp[0][i][2]);
         for (j = 0; j < 31; ++j) {
             point_double_small(pre->g_pre_comp[1][i][0],
-                               pre->g_pre_comp[1][i][1],
-                               pre->g_pre_comp[1][i][2],
-                               pre->g_pre_comp[1][i][0],
-                               pre->g_pre_comp[1][i][1],
-                               pre->g_pre_comp[1][i][2]);
+                pre->g_pre_comp[1][i][1],
+                pre->g_pre_comp[1][i][2],
+                pre->g_pre_comp[1][i][0],
+                pre->g_pre_comp[1][i][1],
+                pre->g_pre_comp[1][i][2]);
         }
         if (i == 8)
             break;
         point_double_small(pre->g_pre_comp[0][2 * i][0],
-                           pre->g_pre_comp[0][2 * i][1],
-                           pre->g_pre_comp[0][2 * i][2],
-                           pre->g_pre_comp[1][i][0], pre->g_pre_comp[1][i][1],
-                           pre->g_pre_comp[1][i][2]);
+            pre->g_pre_comp[0][2 * i][1],
+            pre->g_pre_comp[0][2 * i][2],
+            pre->g_pre_comp[1][i][0], pre->g_pre_comp[1][i][1],
+            pre->g_pre_comp[1][i][2]);
         for (j = 0; j < 31; ++j) {
             point_double_small(pre->g_pre_comp[0][2 * i][0],
-                               pre->g_pre_comp[0][2 * i][1],
-                               pre->g_pre_comp[0][2 * i][2],
-                               pre->g_pre_comp[0][2 * i][0],
-                               pre->g_pre_comp[0][2 * i][1],
-                               pre->g_pre_comp[0][2 * i][2]);
+                pre->g_pre_comp[0][2 * i][1],
+                pre->g_pre_comp[0][2 * i][2],
+                pre->g_pre_comp[0][2 * i][0],
+                pre->g_pre_comp[0][2 * i][1],
+                pre->g_pre_comp[0][2 * i][2]);
         }
     }
     for (i = 0; i < 2; i++) {
@@ -2311,51 +2294,51 @@ int ossl_ec_GFp_nistp256_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
         /* the remaining multiples */
         /* 2^64*G + 2^128*G resp. 2^96*G + 2^160*G */
         point_add_small(pre->g_pre_comp[i][6][0], pre->g_pre_comp[i][6][1],
-                        pre->g_pre_comp[i][6][2], pre->g_pre_comp[i][4][0],
-                        pre->g_pre_comp[i][4][1], pre->g_pre_comp[i][4][2],
-                        pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
-                        pre->g_pre_comp[i][2][2]);
+            pre->g_pre_comp[i][6][2], pre->g_pre_comp[i][4][0],
+            pre->g_pre_comp[i][4][1], pre->g_pre_comp[i][4][2],
+            pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
+            pre->g_pre_comp[i][2][2]);
         /* 2^64*G + 2^192*G resp. 2^96*G + 2^224*G */
         point_add_small(pre->g_pre_comp[i][10][0], pre->g_pre_comp[i][10][1],
-                        pre->g_pre_comp[i][10][2], pre->g_pre_comp[i][8][0],
-                        pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
-                        pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
-                        pre->g_pre_comp[i][2][2]);
+            pre->g_pre_comp[i][10][2], pre->g_pre_comp[i][8][0],
+            pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
+            pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
+            pre->g_pre_comp[i][2][2]);
         /* 2^128*G + 2^192*G resp. 2^160*G + 2^224*G */
         point_add_small(pre->g_pre_comp[i][12][0], pre->g_pre_comp[i][12][1],
-                        pre->g_pre_comp[i][12][2], pre->g_pre_comp[i][8][0],
-                        pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
-                        pre->g_pre_comp[i][4][0], pre->g_pre_comp[i][4][1],
-                        pre->g_pre_comp[i][4][2]);
+            pre->g_pre_comp[i][12][2], pre->g_pre_comp[i][8][0],
+            pre->g_pre_comp[i][8][1], pre->g_pre_comp[i][8][2],
+            pre->g_pre_comp[i][4][0], pre->g_pre_comp[i][4][1],
+            pre->g_pre_comp[i][4][2]);
         /*
          * 2^64*G + 2^128*G + 2^192*G resp. 2^96*G + 2^160*G + 2^224*G
          */
         point_add_small(pre->g_pre_comp[i][14][0], pre->g_pre_comp[i][14][1],
-                        pre->g_pre_comp[i][14][2], pre->g_pre_comp[i][12][0],
-                        pre->g_pre_comp[i][12][1], pre->g_pre_comp[i][12][2],
-                        pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
-                        pre->g_pre_comp[i][2][2]);
+            pre->g_pre_comp[i][14][2], pre->g_pre_comp[i][12][0],
+            pre->g_pre_comp[i][12][1], pre->g_pre_comp[i][12][2],
+            pre->g_pre_comp[i][2][0], pre->g_pre_comp[i][2][1],
+            pre->g_pre_comp[i][2][2]);
         for (j = 1; j < 8; ++j) {
             /* odd multiples: add G resp. 2^32*G */
             point_add_small(pre->g_pre_comp[i][2 * j + 1][0],
-                            pre->g_pre_comp[i][2 * j + 1][1],
-                            pre->g_pre_comp[i][2 * j + 1][2],
-                            pre->g_pre_comp[i][2 * j][0],
-                            pre->g_pre_comp[i][2 * j][1],
-                            pre->g_pre_comp[i][2 * j][2],
-                            pre->g_pre_comp[i][1][0],
-                            pre->g_pre_comp[i][1][1],
-                            pre->g_pre_comp[i][1][2]);
+                pre->g_pre_comp[i][2 * j + 1][1],
+                pre->g_pre_comp[i][2 * j + 1][2],
+                pre->g_pre_comp[i][2 * j][0],
+                pre->g_pre_comp[i][2 * j][1],
+                pre->g_pre_comp[i][2 * j][2],
+                pre->g_pre_comp[i][1][0],
+                pre->g_pre_comp[i][1][1],
+                pre->g_pre_comp[i][1][2]);
         }
     }
     make_points_affine(31, &(pre->g_pre_comp[0][1]), tmp_smallfelems);
 
- done:
+done:
     SETPRECOMP(group, nistp256, pre);
     pre = NULL;
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     EC_POINT_free(generator);
 #ifndef FIPS_MODULE
diff --git a/crypto/ec/ecp_nistp384.c b/crypto/ec/ecp_nistp384.c
index 44ac1cea3d0c0..110f9badb775a 100644
--- a/crypto/ec/ecp_nistp384.c
+++ b/crypto/ec/ecp_nistp384.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -38,7 +38,7 @@
 #include "internal/numbers.h"
 
 #ifndef INT128_MAX
-# error "Your compiler doesn't appear to support 128-bit integer types"
+#error "Your compiler doesn't appear to support 128-bit integer types"
 #endif
 
 typedef uint8_t u8;
@@ -57,26 +57,26 @@ typedef u8 felem_bytearray[48];
  * These values are big-endian.
  */
 static const felem_bytearray nistp384_curve_params[5] = {
-  {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* p */
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF},
-  {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* a = -3 */
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-   0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFC},
-  {0xB3, 0x31, 0x2F, 0xA7, 0xE2, 0x3E, 0xE7, 0xE4, 0x98, 0x8E, 0x05, 0x6B, /* b */
-   0xE3, 0xF8, 0x2D, 0x19, 0x18, 0x1D, 0x9C, 0x6E, 0xFE, 0x81, 0x41, 0x12,
-   0x03, 0x14, 0x08, 0x8F, 0x50, 0x13, 0x87, 0x5A, 0xC6, 0x56, 0x39, 0x8D,
-   0x8A, 0x2E, 0xD1, 0x9D, 0x2A, 0x85, 0xC8, 0xED, 0xD3, 0xEC, 0x2A, 0xEF},
-  {0xAA, 0x87, 0xCA, 0x22, 0xBE, 0x8B, 0x05, 0x37, 0x8E, 0xB1, 0xC7, 0x1E, /* x */
-   0xF3, 0x20, 0xAD, 0x74, 0x6E, 0x1D, 0x3B, 0x62, 0x8B, 0xA7, 0x9B, 0x98,
-   0x59, 0xF7, 0x41, 0xE0, 0x82, 0x54, 0x2A, 0x38, 0x55, 0x02, 0xF2, 0x5D,
-   0xBF, 0x55, 0x29, 0x6C, 0x3A, 0x54, 0x5E, 0x38, 0x72, 0x76, 0x0A, 0xB7},
-  {0x36, 0x17, 0xDE, 0x4A, 0x96, 0x26, 0x2C, 0x6F, 0x5D, 0x9E, 0x98, 0xBF, /* y */
-   0x92, 0x92, 0xDC, 0x29, 0xF8, 0xF4, 0x1D, 0xBD, 0x28, 0x9A, 0x14, 0x7C,
-   0xE9, 0xDA, 0x31, 0x13, 0xB5, 0xF0, 0xB8, 0xC0, 0x0A, 0x60, 0xB1, 0xCE,
-   0x1D, 0x7E, 0x81, 0x9D, 0x7A, 0x43, 0x1D, 0x7C, 0x90, 0xEA, 0x0E, 0x5F},
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* p */
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /* a = -3 */
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFC },
+    { 0xB3, 0x31, 0x2F, 0xA7, 0xE2, 0x3E, 0xE7, 0xE4, 0x98, 0x8E, 0x05, 0x6B, /* b */
+        0xE3, 0xF8, 0x2D, 0x19, 0x18, 0x1D, 0x9C, 0x6E, 0xFE, 0x81, 0x41, 0x12,
+        0x03, 0x14, 0x08, 0x8F, 0x50, 0x13, 0x87, 0x5A, 0xC6, 0x56, 0x39, 0x8D,
+        0x8A, 0x2E, 0xD1, 0x9D, 0x2A, 0x85, 0xC8, 0xED, 0xD3, 0xEC, 0x2A, 0xEF },
+    { 0xAA, 0x87, 0xCA, 0x22, 0xBE, 0x8B, 0x05, 0x37, 0x8E, 0xB1, 0xC7, 0x1E, /* x */
+        0xF3, 0x20, 0xAD, 0x74, 0x6E, 0x1D, 0x3B, 0x62, 0x8B, 0xA7, 0x9B, 0x98,
+        0x59, 0xF7, 0x41, 0xE0, 0x82, 0x54, 0x2A, 0x38, 0x55, 0x02, 0xF2, 0x5D,
+        0xBF, 0x55, 0x29, 0x6C, 0x3A, 0x54, 0x5E, 0x38, 0x72, 0x76, 0x0A, 0xB7 },
+    { 0x36, 0x17, 0xDE, 0x4A, 0x96, 0x26, 0x2C, 0x6F, 0x5D, 0x9E, 0x98, 0xBF, /* y */
+        0x92, 0x92, 0xDC, 0x29, 0xF8, 0xF4, 0x1D, 0xBD, 0x28, 0x9A, 0x14, 0x7C,
+        0xE9, 0xDA, 0x31, 0x13, 0xB5, 0xF0, 0xB8, 0xC0, 0x0A, 0x60, 0xB1, 0xCE,
+        0x1D, 0x7E, 0x81, 0x9D, 0x7A, 0x43, 0x1D, 0x7C, 0x90, 0xEA, 0x0E, 0x5F },
 };
 
 /*-
@@ -108,7 +108,7 @@ typedef uint64_t limb;
 typedef uint128_t widelimb;
 typedef limb limb_aX __attribute((__aligned__(1)));
 typedef limb felem[NLIMBS];
-typedef widelimb widefelem[2*NLIMBS-1];
+typedef widelimb widefelem[2 * NLIMBS - 1];
 
 static const limb bottom56bits = 0xffffffffffffff;
 
@@ -116,24 +116,24 @@ static const limb bottom56bits = 0xffffffffffffff;
 static void bin48_to_felem(felem out, const u8 in[48])
 {
     memset(out, 0, 56);
-    out[0] = (*((limb *) & in[0])) & bottom56bits;
-    out[1] = (*((limb_aX *) & in[7])) & bottom56bits;
-    out[2] = (*((limb_aX *) & in[14])) & bottom56bits;
-    out[3] = (*((limb_aX *) & in[21])) & bottom56bits;
-    out[4] = (*((limb_aX *) & in[28])) & bottom56bits;
-    out[5] = (*((limb_aX *) & in[35])) & bottom56bits;
+    out[0] = (*((limb *)&in[0])) & bottom56bits;
+    out[1] = (*((limb_aX *)&in[7])) & bottom56bits;
+    out[2] = (*((limb_aX *)&in[14])) & bottom56bits;
+    out[3] = (*((limb_aX *)&in[21])) & bottom56bits;
+    out[4] = (*((limb_aX *)&in[28])) & bottom56bits;
+    out[5] = (*((limb_aX *)&in[35])) & bottom56bits;
     memmove(&out[6], &in[42], 6);
 }
 
 static void felem_to_bin48(u8 out[48], const felem in)
 {
     memset(out, 0, 48);
-    (*((limb *) & out[0]))     |= (in[0] & bottom56bits);
-    (*((limb_aX *) & out[7]))  |= (in[1] & bottom56bits);
-    (*((limb_aX *) & out[14])) |= (in[2] & bottom56bits);
-    (*((limb_aX *) & out[21])) |= (in[3] & bottom56bits);
-    (*((limb_aX *) & out[28])) |= (in[4] & bottom56bits);
-    (*((limb_aX *) & out[35])) |= (in[5] & bottom56bits);
+    (*((limb *)&out[0])) |= (in[0] & bottom56bits);
+    (*((limb_aX *)&out[7])) |= (in[1] & bottom56bits);
+    (*((limb_aX *)&out[14])) |= (in[2] & bottom56bits);
+    (*((limb_aX *)&out[21])) |= (in[3] & bottom56bits);
+    (*((limb_aX *)&out[28])) |= (in[4] & bottom56bits);
+    (*((limb_aX *)&out[35])) |= (in[5] & bottom56bits);
     memmove(&out[42], &in[6], 6);
 }
 
@@ -173,7 +173,7 @@ static BIGNUM *felem_to_BN(BIGNUM *out, const felem in)
 static void felem_one(felem out)
 {
     out[0] = 1;
-    memset(&out[1], 0, sizeof(limb) * (NLIMBS-1));
+    memset(&out[1], 0, sizeof(limb) * (NLIMBS - 1));
 }
 
 static void felem_assign(felem out, const felem in)
@@ -213,7 +213,7 @@ static void felem_scalar128(widefelem out, limb scalar)
 {
     unsigned int i;
 
-    for (i = 0; i < 2*NLIMBS-1; i++)
+    for (i = 0; i < 2 * NLIMBS - 1; i++)
         out[i] *= scalar;
 }
 
@@ -231,17 +231,17 @@ static void felem_neg(felem out, const felem in)
      * Use telescopic sums to represent 2^12 * p redundantly with each limb
      * of the form 2^60 + ...
      */
-    static const limb two60m52m4 = (((limb) 1) << 60)
-                                 - (((limb) 1) << 52)
-                                 - (((limb) 1) << 4);
-    static const limb two60p44m12 = (((limb) 1) << 60)
-                                  + (((limb) 1) << 44)
-                                  - (((limb) 1) << 12);
-    static const limb two60m28m4 = (((limb) 1) << 60)
-                                 - (((limb) 1) << 28)
-                                 - (((limb) 1) << 4);
-    static const limb two60m4 = (((limb) 1) << 60)
-                              - (((limb) 1) << 4);
+    static const limb two60m52m4 = (((limb)1) << 60)
+        - (((limb)1) << 52)
+        - (((limb)1) << 4);
+    static const limb two60p44m12 = (((limb)1) << 60)
+        + (((limb)1) << 44)
+        - (((limb)1) << 12);
+    static const limb two60m28m4 = (((limb)1) << 60)
+        - (((limb)1) << 28)
+        - (((limb)1) << 4);
+    static const limb two60m4 = (((limb)1) << 60)
+        - (((limb)1) << 4);
 
     out[0] = two60p44m12 - in[0];
     out[1] = two60m52m4 - in[1];
@@ -252,6 +252,16 @@ static void felem_neg(felem out, const felem in)
     out[6] = two60m4 - in[6];
 }
 
+#if defined(ECP_NISTP384_ASM)
+void p384_felem_diff64(felem out, const felem in);
+void p384_felem_diff128(widefelem out, const widefelem in);
+void p384_felem_diff_128_64(widefelem out, const felem in);
+
+#define felem_diff64 p384_felem_diff64
+#define felem_diff128 p384_felem_diff128
+#define felem_diff_128_64 p384_felem_diff_128_64
+
+#else
 /*-
  * felem_diff64 subtracts |in| from |out|
  * On entry:
@@ -267,17 +277,17 @@ static void felem_diff64(felem out, const felem in)
      * of the form 2^60 + ...
      */
 
-    static const limb two60m52m4 = (((limb) 1) << 60)
-                                 - (((limb) 1) << 52)
-                                 - (((limb) 1) << 4);
-    static const limb two60p44m12 = (((limb) 1) << 60)
-                                  + (((limb) 1) << 44)
-                                  - (((limb) 1) << 12);
-    static const limb two60m28m4 = (((limb) 1) << 60)
-                                 - (((limb) 1) << 28)
-                                 - (((limb) 1) << 4);
-    static const limb two60m4 = (((limb) 1) << 60)
-                              - (((limb) 1) << 4);
+    static const limb two60m52m4 = (((limb)1) << 60)
+        - (((limb)1) << 52)
+        - (((limb)1) << 4);
+    static const limb two60p44m12 = (((limb)1) << 60)
+        + (((limb)1) << 44)
+        - (((limb)1) << 12);
+    static const limb two60m28m4 = (((limb)1) << 60)
+        - (((limb)1) << 28)
+        - (((limb)1) << 4);
+    static const limb two60m4 = (((limb)1) << 60)
+        - (((limb)1) << 4);
 
     out[0] += two60p44m12 - in[0];
     out[1] += two60m52m4 - in[1];
@@ -300,17 +310,17 @@ static void felem_diff_128_64(widefelem out, const felem in)
      * of the form 2^64 + ...
      */
 
-    static const widelimb two64m56m8 = (((widelimb) 1) << 64)
-                                     - (((widelimb) 1) << 56)
-                                     - (((widelimb) 1) << 8);
-    static const widelimb two64m32m8 = (((widelimb) 1) << 64)
-                                     - (((widelimb) 1) << 32)
-                                     - (((widelimb) 1) << 8);
-    static const widelimb two64m8 = (((widelimb) 1) << 64)
-                                  - (((widelimb) 1) << 8);
-    static const widelimb two64p48m16 = (((widelimb) 1) << 64)
-                                      + (((widelimb) 1) << 48)
-                                      - (((widelimb) 1) << 16);
+    static const widelimb two64m56m8 = (((widelimb)1) << 64)
+        - (((widelimb)1) << 56)
+        - (((widelimb)1) << 8);
+    static const widelimb two64m32m8 = (((widelimb)1) << 64)
+        - (((widelimb)1) << 32)
+        - (((widelimb)1) << 8);
+    static const widelimb two64m8 = (((widelimb)1) << 64)
+        - (((widelimb)1) << 8);
+    static const widelimb two64p48m16 = (((widelimb)1) << 64)
+        + (((widelimb)1) << 48)
+        - (((widelimb)1) << 16);
     unsigned int i;
 
     out[0] += two64p48m16;
@@ -337,149 +347,150 @@ static void felem_diff128(widefelem out, const widefelem in)
      * of the form 2^127 + ...
      */
 
-    static const widelimb two127 = ((widelimb) 1) << 127;
-    static const widelimb two127m71 = (((widelimb) 1) << 127)
-                                    - (((widelimb) 1) << 71);
-    static const widelimb two127p111m79m71 = (((widelimb) 1) << 127)
-                                           + (((widelimb) 1) << 111)
-                                           - (((widelimb) 1) << 79)
-                                           - (((widelimb) 1) << 71);
-    static const widelimb two127m119m71 = (((widelimb) 1) << 127)
-                                        - (((widelimb) 1) << 119)
-                                        - (((widelimb) 1) << 71);
-    static const widelimb two127m95m71 = (((widelimb) 1) << 127)
-                                       - (((widelimb) 1) << 95)
-                                       - (((widelimb) 1) << 71);
+    static const widelimb two127 = ((widelimb)1) << 127;
+    static const widelimb two127m71 = (((widelimb)1) << 127)
+        - (((widelimb)1) << 71);
+    static const widelimb two127p111m79m71 = (((widelimb)1) << 127)
+        + (((widelimb)1) << 111)
+        - (((widelimb)1) << 79)
+        - (((widelimb)1) << 71);
+    static const widelimb two127m119m71 = (((widelimb)1) << 127)
+        - (((widelimb)1) << 119)
+        - (((widelimb)1) << 71);
+    static const widelimb two127m95m71 = (((widelimb)1) << 127)
+        - (((widelimb)1) << 95)
+        - (((widelimb)1) << 71);
     unsigned int i;
 
-    out[0]  += two127;
-    out[1]  += two127m71;
-    out[2]  += two127m71;
-    out[3]  += two127m71;
-    out[4]  += two127m71;
-    out[5]  += two127m71;
-    out[6]  += two127p111m79m71;
-    out[7]  += two127m119m71;
-    out[8]  += two127m95m71;
-    out[9]  += two127m71;
+    out[0] += two127;
+    out[1] += two127m71;
+    out[2] += two127m71;
+    out[3] += two127m71;
+    out[4] += two127m71;
+    out[5] += two127m71;
+    out[6] += two127p111m79m71;
+    out[7] += two127m119m71;
+    out[8] += two127m95m71;
+    out[9] += two127m71;
     out[10] += two127m71;
     out[11] += two127m71;
     out[12] += two127m71;
 
-    for (i = 0; i < 2*NLIMBS-1; i++)
+    for (i = 0; i < 2 * NLIMBS - 1; i++)
         out[i] -= in[i];
 }
+#endif /* ECP_NISTP384_ASM */
 
 static void felem_square_ref(widefelem out, const felem in)
 {
     felem inx2;
     felem_scalar(inx2, in, 2);
 
-    out[0] = ((uint128_t) in[0]) * in[0];
+    out[0] = ((uint128_t)in[0]) * in[0];
 
-    out[1] = ((uint128_t) in[0]) * inx2[1];
+    out[1] = ((uint128_t)in[0]) * inx2[1];
 
-    out[2] = ((uint128_t) in[0]) * inx2[2]
-           + ((uint128_t) in[1]) * in[1];
+    out[2] = ((uint128_t)in[0]) * inx2[2]
+        + ((uint128_t)in[1]) * in[1];
 
-    out[3] = ((uint128_t) in[0]) * inx2[3]
-           + ((uint128_t) in[1]) * inx2[2];
+    out[3] = ((uint128_t)in[0]) * inx2[3]
+        + ((uint128_t)in[1]) * inx2[2];
 
-    out[4] = ((uint128_t) in[0]) * inx2[4]
-           + ((uint128_t) in[1]) * inx2[3]
-           + ((uint128_t) in[2]) * in[2];
+    out[4] = ((uint128_t)in[0]) * inx2[4]
+        + ((uint128_t)in[1]) * inx2[3]
+        + ((uint128_t)in[2]) * in[2];
 
-    out[5] = ((uint128_t) in[0]) * inx2[5]
-           + ((uint128_t) in[1]) * inx2[4]
-           + ((uint128_t) in[2]) * inx2[3];
+    out[5] = ((uint128_t)in[0]) * inx2[5]
+        + ((uint128_t)in[1]) * inx2[4]
+        + ((uint128_t)in[2]) * inx2[3];
 
-    out[6] = ((uint128_t) in[0]) * inx2[6]
-           + ((uint128_t) in[1]) * inx2[5]
-           + ((uint128_t) in[2]) * inx2[4]
-           + ((uint128_t) in[3]) * in[3];
+    out[6] = ((uint128_t)in[0]) * inx2[6]
+        + ((uint128_t)in[1]) * inx2[5]
+        + ((uint128_t)in[2]) * inx2[4]
+        + ((uint128_t)in[3]) * in[3];
 
-    out[7] = ((uint128_t) in[1]) * inx2[6]
-           + ((uint128_t) in[2]) * inx2[5]
-           + ((uint128_t) in[3]) * inx2[4];
+    out[7] = ((uint128_t)in[1]) * inx2[6]
+        + ((uint128_t)in[2]) * inx2[5]
+        + ((uint128_t)in[3]) * inx2[4];
 
-    out[8] = ((uint128_t) in[2]) * inx2[6]
-           + ((uint128_t) in[3]) * inx2[5]
-           + ((uint128_t) in[4]) * in[4];
+    out[8] = ((uint128_t)in[2]) * inx2[6]
+        + ((uint128_t)in[3]) * inx2[5]
+        + ((uint128_t)in[4]) * in[4];
 
-    out[9] = ((uint128_t) in[3]) * inx2[6]
-           + ((uint128_t) in[4]) * inx2[5];
+    out[9] = ((uint128_t)in[3]) * inx2[6]
+        + ((uint128_t)in[4]) * inx2[5];
 
-    out[10] = ((uint128_t) in[4]) * inx2[6]
-            + ((uint128_t) in[5]) * in[5];
+    out[10] = ((uint128_t)in[4]) * inx2[6]
+        + ((uint128_t)in[5]) * in[5];
 
-    out[11] = ((uint128_t) in[5]) * inx2[6];
+    out[11] = ((uint128_t)in[5]) * inx2[6];
 
-    out[12] = ((uint128_t) in[6]) * in[6];
+    out[12] = ((uint128_t)in[6]) * in[6];
 }
 
 static void felem_mul_ref(widefelem out, const felem in1, const felem in2)
 {
-    out[0] = ((uint128_t) in1[0]) * in2[0];
-
-    out[1] = ((uint128_t) in1[0]) * in2[1]
-           + ((uint128_t) in1[1]) * in2[0];
-
-    out[2] = ((uint128_t) in1[0]) * in2[2]
-           + ((uint128_t) in1[1]) * in2[1]
-           + ((uint128_t) in1[2]) * in2[0];
-
-    out[3] = ((uint128_t) in1[0]) * in2[3]
-           + ((uint128_t) in1[1]) * in2[2]
-           + ((uint128_t) in1[2]) * in2[1]
-           + ((uint128_t) in1[3]) * in2[0];
-
-    out[4] = ((uint128_t) in1[0]) * in2[4]
-           + ((uint128_t) in1[1]) * in2[3]
-           + ((uint128_t) in1[2]) * in2[2]
-           + ((uint128_t) in1[3]) * in2[1]
-           + ((uint128_t) in1[4]) * in2[0];
-
-    out[5] = ((uint128_t) in1[0]) * in2[5]
-           + ((uint128_t) in1[1]) * in2[4]
-           + ((uint128_t) in1[2]) * in2[3]
-           + ((uint128_t) in1[3]) * in2[2]
-           + ((uint128_t) in1[4]) * in2[1]
-           + ((uint128_t) in1[5]) * in2[0];
-
-    out[6] = ((uint128_t) in1[0]) * in2[6]
-           + ((uint128_t) in1[1]) * in2[5]
-           + ((uint128_t) in1[2]) * in2[4]
-           + ((uint128_t) in1[3]) * in2[3]
-           + ((uint128_t) in1[4]) * in2[2]
-           + ((uint128_t) in1[5]) * in2[1]
-           + ((uint128_t) in1[6]) * in2[0];
-
-    out[7] = ((uint128_t) in1[1]) * in2[6]
-           + ((uint128_t) in1[2]) * in2[5]
-           + ((uint128_t) in1[3]) * in2[4]
-           + ((uint128_t) in1[4]) * in2[3]
-           + ((uint128_t) in1[5]) * in2[2]
-           + ((uint128_t) in1[6]) * in2[1];
-
-    out[8] = ((uint128_t) in1[2]) * in2[6]
-           + ((uint128_t) in1[3]) * in2[5]
-           + ((uint128_t) in1[4]) * in2[4]
-           + ((uint128_t) in1[5]) * in2[3]
-           + ((uint128_t) in1[6]) * in2[2];
-
-    out[9] = ((uint128_t) in1[3]) * in2[6]
-           + ((uint128_t) in1[4]) * in2[5]
-           + ((uint128_t) in1[5]) * in2[4]
-           + ((uint128_t) in1[6]) * in2[3];
-
-    out[10] = ((uint128_t) in1[4]) * in2[6]
-            + ((uint128_t) in1[5]) * in2[5]
-            + ((uint128_t) in1[6]) * in2[4];
-
-    out[11] = ((uint128_t) in1[5]) * in2[6]
-            + ((uint128_t) in1[6]) * in2[5];
-
-    out[12] = ((uint128_t) in1[6]) * in2[6];
+    out[0] = ((uint128_t)in1[0]) * in2[0];
+
+    out[1] = ((uint128_t)in1[0]) * in2[1]
+        + ((uint128_t)in1[1]) * in2[0];
+
+    out[2] = ((uint128_t)in1[0]) * in2[2]
+        + ((uint128_t)in1[1]) * in2[1]
+        + ((uint128_t)in1[2]) * in2[0];
+
+    out[3] = ((uint128_t)in1[0]) * in2[3]
+        + ((uint128_t)in1[1]) * in2[2]
+        + ((uint128_t)in1[2]) * in2[1]
+        + ((uint128_t)in1[3]) * in2[0];
+
+    out[4] = ((uint128_t)in1[0]) * in2[4]
+        + ((uint128_t)in1[1]) * in2[3]
+        + ((uint128_t)in1[2]) * in2[2]
+        + ((uint128_t)in1[3]) * in2[1]
+        + ((uint128_t)in1[4]) * in2[0];
+
+    out[5] = ((uint128_t)in1[0]) * in2[5]
+        + ((uint128_t)in1[1]) * in2[4]
+        + ((uint128_t)in1[2]) * in2[3]
+        + ((uint128_t)in1[3]) * in2[2]
+        + ((uint128_t)in1[4]) * in2[1]
+        + ((uint128_t)in1[5]) * in2[0];
+
+    out[6] = ((uint128_t)in1[0]) * in2[6]
+        + ((uint128_t)in1[1]) * in2[5]
+        + ((uint128_t)in1[2]) * in2[4]
+        + ((uint128_t)in1[3]) * in2[3]
+        + ((uint128_t)in1[4]) * in2[2]
+        + ((uint128_t)in1[5]) * in2[1]
+        + ((uint128_t)in1[6]) * in2[0];
+
+    out[7] = ((uint128_t)in1[1]) * in2[6]
+        + ((uint128_t)in1[2]) * in2[5]
+        + ((uint128_t)in1[3]) * in2[4]
+        + ((uint128_t)in1[4]) * in2[3]
+        + ((uint128_t)in1[5]) * in2[2]
+        + ((uint128_t)in1[6]) * in2[1];
+
+    out[8] = ((uint128_t)in1[2]) * in2[6]
+        + ((uint128_t)in1[3]) * in2[5]
+        + ((uint128_t)in1[4]) * in2[4]
+        + ((uint128_t)in1[5]) * in2[3]
+        + ((uint128_t)in1[6]) * in2[2];
+
+    out[9] = ((uint128_t)in1[3]) * in2[6]
+        + ((uint128_t)in1[4]) * in2[5]
+        + ((uint128_t)in1[5]) * in2[4]
+        + ((uint128_t)in1[6]) * in2[3];
+
+    out[10] = ((uint128_t)in1[4]) * in2[6]
+        + ((uint128_t)in1[5]) * in2[5]
+        + ((uint128_t)in1[6]) * in2[4];
+
+    out[11] = ((uint128_t)in1[5]) * in2[6]
+        + ((uint128_t)in1[6]) * in2[5];
+
+    out[12] = ((uint128_t)in1[6]) * in2[6];
 }
 
 /*-
@@ -503,24 +514,24 @@ static void felem_mul_ref(widefelem out, const felem in1, const felem in2)
  * [3]: Y = 2^48 (acc[6] >> 48)
  * (Where a | b | c | d = (2^56)^3 a + (2^56)^2 b + (2^56) c + d)
  */
-static void felem_reduce(felem out, const widefelem in)
+static void felem_reduce_ref(felem out, const widefelem in)
 {
     /*
      * In order to prevent underflow, we add a multiple of p before subtracting.
      * Use telescopic sums to represent 2^76 * p redundantly with each limb
      * of the form 2^124 + ...
      */
-    static const widelimb two124m68 = (((widelimb) 1) << 124)
-                                    - (((widelimb) 1) << 68);
-    static const widelimb two124m116m68 = (((widelimb) 1) << 124)
-                                        - (((widelimb) 1) << 116)
-                                        - (((widelimb) 1) << 68);
-    static const widelimb two124p108m76 = (((widelimb) 1) << 124)
-                                        + (((widelimb) 1) << 108)
-                                        - (((widelimb) 1) << 76);
-    static const widelimb two124m92m68 = (((widelimb) 1) << 124)
-                                       - (((widelimb) 1) << 92)
-                                       - (((widelimb) 1) << 68);
+    static const widelimb two124m68 = (((widelimb)1) << 124)
+        - (((widelimb)1) << 68);
+    static const widelimb two124m116m68 = (((widelimb)1) << 124)
+        - (((widelimb)1) << 116)
+        - (((widelimb)1) << 68);
+    static const widelimb two124p108m76 = (((widelimb)1) << 124)
+        + (((widelimb)1) << 108)
+        - (((widelimb)1) << 76);
+    static const widelimb two124m92m68 = (((widelimb)1) << 124)
+        - (((widelimb)1) << 92)
+        - (((widelimb)1) << 68);
     widelimb temp, acc[9];
     unsigned int i;
 
@@ -638,13 +649,13 @@ static void felem_reduce(felem out, const widefelem in)
      */
 
     /* Carry 0 -> 1 -> 2 -> 3 -> 4 -> 5 -> 6 */
-    acc[1] += acc[0] >> 56;   /* acc[1] < acc_old[1] + 2^72 */
+    acc[1] += acc[0] >> 56; /* acc[1] < acc_old[1] + 2^72 */
     acc[0] &= 0x00ffffffffffffff;
 
-    acc[2] += acc[1] >> 56;   /* acc[2] < acc_old[2] + 2^72 + 2^16 */
+    acc[2] += acc[1] >> 56; /* acc[2] < acc_old[2] + 2^72 + 2^16 */
     acc[1] &= 0x00ffffffffffffff;
 
-    acc[3] += acc[2] >> 56;   /* acc[3] < acc_old[3] + 2^72 + 2^16 */
+    acc[3] += acc[2] >> 56; /* acc[3] < acc_old[3] + 2^72 + 2^16 */
     acc[2] &= 0x00ffffffffffffff;
 
     /*-
@@ -654,55 +665,84 @@ static void felem_reduce(felem out, const widefelem in)
      *        < 2^128 , k < 4
      */
 
-    acc[4] += acc[3] >> 56;   /*-
-                               * acc[4] < acc_old[4] + 2^72 + 2^16
-                               *        < 2^72 + 2^56 + 2^16
-                               */
+    acc[4] += acc[3] >> 56; /*-
+                             * acc[4] < acc_old[4] + 2^72 + 2^16
+                             *        < 2^72 + 2^56 + 2^16
+                             */
     acc[3] &= 0x00ffffffffffffff;
 
-    acc[5] += acc[4] >> 56;   /*-
-                               * acc[5] < acc_old[5] + 2^16 + 1
-                               *        < 2^56 + 2^16 + 1
-                               */
+    acc[5] += acc[4] >> 56; /*-
+                             * acc[5] < acc_old[5] + 2^16 + 1
+                             *        < 2^56 + 2^16 + 1
+                             */
     acc[4] &= 0x00ffffffffffffff;
 
-    acc[6] += acc[5] >> 56;   /* acc[6] < 2^48 + 1 <= 2^48 */
+    acc[6] += acc[5] >> 56; /* acc[6] < 2^48 + 1 <= 2^48 */
     acc[5] &= 0x00ffffffffffffff;
 
     for (i = 0; i < NLIMBS; i++)
         out[i] = acc[i];
 }
 
+static ossl_inline void felem_square_reduce_ref(felem out, const felem in)
+{
+    widefelem tmp;
+
+    felem_square_ref(tmp, in);
+    felem_reduce_ref(out, tmp);
+}
+
+static ossl_inline void felem_mul_reduce_ref(felem out, const felem in1, const felem in2)
+{
+    widefelem tmp;
+
+    felem_mul_ref(tmp, in1, in2);
+    felem_reduce_ref(out, tmp);
+}
+
 #if defined(ECP_NISTP384_ASM)
 static void felem_square_wrapper(widefelem out, const felem in);
 static void felem_mul_wrapper(widefelem out, const felem in1, const felem in2);
 
-static void (*felem_square_p)(widefelem out, const felem in) =
-    felem_square_wrapper;
-static void (*felem_mul_p)(widefelem out, const felem in1, const felem in2) =
-    felem_mul_wrapper;
+static void (*felem_square_p)(widefelem out, const felem in) = felem_square_wrapper;
+static void (*felem_mul_p)(widefelem out, const felem in1, const felem in2) = felem_mul_wrapper;
+
+static void (*felem_reduce_p)(felem out, const widefelem in) = felem_reduce_ref;
+
+static void (*felem_square_reduce_p)(felem out, const felem in) = felem_square_reduce_ref;
+static void (*felem_mul_reduce_p)(felem out, const felem in1, const felem in2) = felem_mul_reduce_ref;
 
 void p384_felem_square(widefelem out, const felem in);
 void p384_felem_mul(widefelem out, const felem in1, const felem in2);
+void p384_felem_reduce(felem out, const widefelem in);
 
-# if defined(_ARCH_PPC64)
-#  include "crypto/ppc_arch.h"
-# endif
+void p384_felem_square_reduce(felem out, const felem in);
+void p384_felem_mul_reduce(felem out, const felem in1, const felem in2);
+
+#if defined(_ARCH_PPC64)
+#include "crypto/ppc_arch.h"
+#endif
 
 static void felem_select(void)
 {
-# if defined(_ARCH_PPC64)
+#if defined(_ARCH_PPC64)
     if ((OPENSSL_ppccap_P & PPC_MADD300) && (OPENSSL_ppccap_P & PPC_ALTIVEC)) {
         felem_square_p = p384_felem_square;
         felem_mul_p = p384_felem_mul;
+        felem_reduce_p = p384_felem_reduce;
+        felem_square_reduce_p = p384_felem_square_reduce;
+        felem_mul_reduce_p = p384_felem_mul_reduce;
 
         return;
     }
-# endif
+#endif
 
     /* Default */
     felem_square_p = felem_square_ref;
     felem_mul_p = felem_mul_ref;
+    felem_reduce_p = felem_reduce_ref;
+    felem_square_reduce_p = felem_square_reduce_ref;
+    felem_mul_reduce_p = felem_mul_reduce_ref;
 }
 
 static void felem_square_wrapper(widefelem out, const felem in)
@@ -717,28 +757,20 @@ static void felem_mul_wrapper(widefelem out, const felem in1, const felem in2)
     felem_mul_p(out, in1, in2);
 }
 
-# define felem_square felem_square_p
-# define felem_mul felem_mul_p
-#else
-# define felem_square felem_square_ref
-# define felem_mul felem_mul_ref
-#endif
-
-static ossl_inline void felem_square_reduce(felem out, const felem in)
-{
-    widefelem tmp;
+#define felem_square felem_square_p
+#define felem_mul felem_mul_p
+#define felem_reduce felem_reduce_p
 
-    felem_square(tmp, in);
-    felem_reduce(out, tmp);
-}
-
-static ossl_inline void felem_mul_reduce(felem out, const felem in1, const felem in2)
-{
-    widefelem tmp;
+#define felem_square_reduce felem_square_reduce_p
+#define felem_mul_reduce felem_mul_reduce_p
+#else
+#define felem_square felem_square_ref
+#define felem_mul felem_mul_ref
+#define felem_reduce felem_reduce_ref
 
-    felem_mul(tmp, in1, in2);
-    felem_reduce(out, tmp);
-}
+#define felem_square_reduce felem_square_reduce_ref
+#define felem_mul_reduce felem_mul_reduce_ref
+#endif
 
 /*-
  * felem_inv calculates |out| = |in|^{-1}
@@ -753,12 +785,12 @@ static void felem_inv(felem out, const felem in)
     felem ftmp, ftmp2, ftmp3, ftmp4, ftmp5, ftmp6;
     unsigned int i = 0;
 
-    felem_square_reduce(ftmp, in);      /* 2^1 */
-    felem_mul_reduce(ftmp, ftmp, in);   /* 2^1 + 2^0 */
+    felem_square_reduce(ftmp, in); /* 2^1 */
+    felem_mul_reduce(ftmp, ftmp, in); /* 2^1 + 2^0 */
     felem_assign(ftmp2, ftmp);
 
-    felem_square_reduce(ftmp, ftmp);    /* 2^2 + 2^1 */
-    felem_mul_reduce(ftmp, ftmp, in);   /* 2^2 + 2^1 * 2^0 */
+    felem_square_reduce(ftmp, ftmp); /* 2^2 + 2^1 */
+    felem_mul_reduce(ftmp, ftmp, in); /* 2^2 + 2^1 * 2^0 */
     felem_assign(ftmp3, ftmp);
 
     for (i = 0; i < 3; i++)
@@ -791,7 +823,7 @@ static void felem_inv(felem out, const felem in)
     felem_assign(ftmp4, ftmp);
 
     for (i = 0; i < 120; i++)
-      felem_square_reduce(ftmp, ftmp);   /* 2^239 + ... + 2^120 */
+        felem_square_reduce(ftmp, ftmp); /* 2^239 + ... + 2^120 */
     felem_mul_reduce(ftmp, ftmp4, ftmp); /* 2^239 + ... + 2^0 */
 
     for (i = 0; i < 15; i++)
@@ -812,7 +844,7 @@ static void felem_inv(felem out, const felem in)
 
     for (i = 0; i < 2; i++)
         felem_square_reduce(ftmp, ftmp); /* 2^383 + ... + 2^129 + 2^127 + ... + 2^96 + 2^31 + ... + 2^2 */
-    felem_mul_reduce(ftmp, in, ftmp);    /* 2^383 + ... + 2^129 + 2^127 + ... + 2^96 + 2^31 + ... + 2^2 + 2^0 */
+    felem_mul_reduce(ftmp, in, ftmp); /* 2^383 + ... + 2^129 + 2^127 + ... + 2^96 + 2^31 + ... + 2^2 + 2^0 */
 
     memcpy(out, ftmp, sizeof(felem));
 }
@@ -830,19 +862,19 @@ static limb felem_is_zero(const felem in)
     limb zero, p384;
 
     zero = in[0] | in[1] | in[2] | in[3] | in[4] | in[5] | in[6];
-    zero = ((int64_t) (zero) - 1) >> 63;
+    zero = ((int64_t)(zero)-1) >> 63;
     p384 = (in[0] ^ 0x000000ffffffff) | (in[1] ^ 0xffff0000000000)
-         | (in[2] ^ 0xfffffffffeffff) | (in[3] ^ 0xffffffffffffff)
-         | (in[4] ^ 0xffffffffffffff) | (in[5] ^ 0xffffffffffffff)
-         | (in[6] ^ 0xffffffffffff);
-    p384 = ((int64_t) (p384) - 1) >> 63;
+        | (in[2] ^ 0xfffffffffeffff) | (in[3] ^ 0xffffffffffffff)
+        | (in[4] ^ 0xffffffffffffff) | (in[5] ^ 0xffffffffffffff)
+        | (in[6] ^ 0xffffffffffff);
+    p384 = ((int64_t)(p384)-1) >> 63;
 
     return (zero | p384);
 }
 
 static int felem_is_zero_int(const void *in)
 {
-    return (int)(felem_is_zero(in) & ((limb) 1));
+    return (int)(felem_is_zero(in) & ((limb)1));
 }
 
 /*-
@@ -854,7 +886,7 @@ static int felem_is_zero_int(const void *in)
  */
 static void felem_contract(felem out, const felem in)
 {
-    static const int64_t two56 = ((limb) 1) << 56;
+    static const int64_t two56 = ((limb)1) << 56;
 
     /*
      * We know for a fact that 0 <= |in| < 2*p, for p = 2^384 - 2^128 - 2^96 + 2^32 - 1
@@ -910,7 +942,7 @@ static void felem_contract(felem out, const felem in)
     /* 0 iff (2^96..2^127) bits are all one */
     cond[2] = ((tmp[2] | 0xffffffffff0000) & (tmp[1] | 0x0000ffffffffff)) + 1;
     /* 0 iff (2^32..2^95) bits are all zero */
-    cond[3] = (tmp[1] & ~0xffff0000000000) | (tmp[0] & ~((int64_t) 0x000000ffffffff));
+    cond[3] = (tmp[1] & ~0xffff0000000000) | (tmp[0] & ~((int64_t)0x000000ffffffff));
     /* 0 iff (2^0..2^31) bits are all one */
     cond[4] = (tmp[0] | 0xffffff00000000) + 1;
 
@@ -919,7 +951,7 @@ static void felem_contract(felem out, const felem in)
      * any non-zero value in the low-order 56 bits becomes all 0's
      */
     for (i = 0; i < 5; i++)
-       cond[i] = ((cond[i] & 0x00ffffffffffffff) - 1) >> 63;
+        cond[i] = ((cond[i] & 0x00ffffffffffffff) - 1) >> 63;
 
     /*
      * The condition for determining whether in is greater than our
@@ -942,7 +974,7 @@ static void felem_contract(felem out, const felem in)
     /* subtract 2^128 if that bit is present, and add 2^96 */
     a = cond[0] & cond[1];
     tmp[2] &= ~a | 0xfffffffffeffff;
-    tmp[1] += a & ((int64_t) 1 << 40);
+    tmp[1] += a & ((int64_t)1 << 40);
 
     /* otherwise, clear bits 2^127 .. 2^96  */
     a = cond[0] & ~cond[1] & (cond[2] & (~cond[3] | cond[4]));
@@ -951,7 +983,7 @@ static void felem_contract(felem out, const felem in)
 
     /* finally, subtract the last 2^32 - 1 */
     a = cond[0] & (cond[1] | (cond[2] & (~cond[3] | cond[4])));
-    tmp[0] += a & (-((int64_t) 1 << 32) + 1);
+    tmp[0] += a & (-((int64_t)1 << 32) + 1);
 
     /*
      * eliminate negative coefficients: if tmp[0] is negative, tmp[1] must be
@@ -1000,7 +1032,7 @@ static void felem_contract(felem out, const felem in)
  */
 static void
 point_double(felem x_out, felem y_out, felem z_out,
-             const felem x_in, const felem y_in, const felem z_in)
+    const felem x_in, const felem y_in, const felem z_in)
 {
     widefelem tmp, tmp2;
     felem delta, gamma, beta, alpha, ftmp, ftmp2;
@@ -1009,43 +1041,43 @@ point_double(felem x_out, felem y_out, felem z_out,
     felem_assign(ftmp2, x_in);
 
     /* delta = z^2 */
-    felem_square_reduce(delta, z_in);     /* delta[i] < 2^56 */
+    felem_square_reduce(delta, z_in); /* delta[i] < 2^56 */
 
     /* gamma = y^2 */
-    felem_square_reduce(gamma, y_in);     /* gamma[i] < 2^56 */
+    felem_square_reduce(gamma, y_in); /* gamma[i] < 2^56 */
 
     /* beta = x*gamma */
-    felem_mul_reduce(beta, x_in, gamma);  /* beta[i] < 2^56 */
+    felem_mul_reduce(beta, x_in, gamma); /* beta[i] < 2^56 */
 
     /* alpha = 3*(x-delta)*(x+delta) */
-    felem_diff64(ftmp, delta);            /* ftmp[i] < 2^60 + 2^58 + 2^44 */
-    felem_sum64(ftmp2, delta);            /* ftmp2[i] < 2^59 */
-    felem_scalar64(ftmp2, 3);             /* ftmp2[i] < 2^61 */
+    felem_diff64(ftmp, delta); /* ftmp[i] < 2^60 + 2^58 + 2^44 */
+    felem_sum64(ftmp2, delta); /* ftmp2[i] < 2^59 */
+    felem_scalar64(ftmp2, 3); /* ftmp2[i] < 2^61 */
     felem_mul_reduce(alpha, ftmp, ftmp2); /* alpha[i] < 2^56 */
 
     /* x' = alpha^2 - 8*beta */
-    felem_square(tmp, alpha);             /* tmp[i] < 2^115 */
-    felem_assign(ftmp, beta);             /* ftmp[i] < 2^56 */
-    felem_scalar64(ftmp, 8);              /* ftmp[i] < 2^59 */
-    felem_diff_128_64(tmp, ftmp);         /* tmp[i] < 2^115 + 2^64 + 2^48 */
-    felem_reduce(x_out, tmp);             /* x_out[i] < 2^56 */
+    felem_square(tmp, alpha); /* tmp[i] < 2^115 */
+    felem_assign(ftmp, beta); /* ftmp[i] < 2^56 */
+    felem_scalar64(ftmp, 8); /* ftmp[i] < 2^59 */
+    felem_diff_128_64(tmp, ftmp); /* tmp[i] < 2^115 + 2^64 + 2^48 */
+    felem_reduce(x_out, tmp); /* x_out[i] < 2^56 */
 
     /* z' = (y + z)^2 - gamma - delta */
-    felem_sum64(delta, gamma);     /* delta[i] < 2^57 */
-    felem_assign(ftmp, y_in);      /* ftmp[i] < 2^56 */
-    felem_sum64(ftmp, z_in);       /* ftmp[i] < 2^56 */
-    felem_square(tmp, ftmp);       /* tmp[i] < 2^115 */
+    felem_sum64(delta, gamma); /* delta[i] < 2^57 */
+    felem_assign(ftmp, y_in); /* ftmp[i] < 2^56 */
+    felem_sum64(ftmp, z_in); /* ftmp[i] < 2^56 */
+    felem_square(tmp, ftmp); /* tmp[i] < 2^115 */
     felem_diff_128_64(tmp, delta); /* tmp[i] < 2^115 + 2^64 + 2^48 */
-    felem_reduce(z_out, tmp);      /* z_out[i] < 2^56 */
+    felem_reduce(z_out, tmp); /* z_out[i] < 2^56 */
 
     /* y' = alpha*(4*beta - x') - 8*gamma^2 */
-    felem_scalar64(beta, 4);       /* beta[i] < 2^58 */
-    felem_diff64(beta, x_out);     /* beta[i] < 2^60 + 2^58 + 2^44 */
-    felem_mul(tmp, alpha, beta);   /* tmp[i] < 2^119 */
-    felem_square(tmp2, gamma);     /* tmp2[i] < 2^115 */
-    felem_scalar128(tmp2, 8);      /* tmp2[i] < 2^118 */
-    felem_diff128(tmp, tmp2);      /* tmp[i] < 2^127 + 2^119 + 2^111 */
-    felem_reduce(y_out, tmp);      /* tmp[i] < 2^56 */
+    felem_scalar64(beta, 4); /* beta[i] < 2^58 */
+    felem_diff64(beta, x_out); /* beta[i] < 2^60 + 2^58 + 2^44 */
+    felem_mul(tmp, alpha, beta); /* tmp[i] < 2^119 */
+    felem_square(tmp2, gamma); /* tmp2[i] < 2^115 */
+    felem_scalar128(tmp2, 8); /* tmp2[i] < 2^118 */
+    felem_diff128(tmp, tmp2); /* tmp[i] < 2^127 + 2^119 + 2^111 */
+    felem_reduce(y_out, tmp); /* tmp[i] < 2^56 */
 }
 
 /* copy_conditional copies in to out iff mask is all ones. */
@@ -1069,9 +1101,9 @@ static void copy_conditional(felem out, const felem in, limb mask)
  * on constant-time.
  */
 static void point_add(felem x3, felem y3, felem z3,
-                      const felem x1, const felem y1, const felem z1,
-                      const int mixed, const felem x2, const felem y2,
-                      const felem z2)
+    const felem x1, const felem y1, const felem z1,
+    const int mixed, const felem x2, const felem y2,
+    const felem z2)
 {
     felem ftmp, ftmp2, ftmp3, ftmp4, ftmp5, ftmp6, x_out, y_out, z_out;
     widefelem tmp, tmp2;
@@ -1082,7 +1114,7 @@ static void point_add(felem x3, felem y3, felem z3,
     z2_is_zero = felem_is_zero(z2);
 
     /* ftmp = z1z1 = z1**2 */
-    felem_square_reduce(ftmp, z1);      /* ftmp[i] < 2^56 */
+    felem_square_reduce(ftmp, z1); /* ftmp[i] < 2^56 */
 
     if (!mixed) {
         /* ftmp2 = z2z2 = z2**2 */
@@ -1092,14 +1124,14 @@ static void point_add(felem x3, felem y3, felem z3,
         felem_mul_reduce(ftmp3, x1, ftmp2); /* ftmp3[i] < 2^56 */
 
         /* ftmp5 = z1 + z2 */
-        felem_assign(ftmp5, z1);       /* ftmp5[i] < 2^56 */
-        felem_sum64(ftmp5, z2);        /* ftmp5[i] < 2^57 */
+        felem_assign(ftmp5, z1); /* ftmp5[i] < 2^56 */
+        felem_sum64(ftmp5, z2); /* ftmp5[i] < 2^57 */
 
         /* ftmp5 = (z1 + z2)**2 - z1z1 - z2z2 = 2*z1z2 */
-        felem_square(tmp, ftmp5);      /* tmp[i] < 2^117 */
-        felem_diff_128_64(tmp, ftmp);  /* tmp[i] < 2^117 + 2^64 + 2^48 */
+        felem_square(tmp, ftmp5); /* tmp[i] < 2^117 */
+        felem_diff_128_64(tmp, ftmp); /* tmp[i] < 2^117 + 2^64 + 2^48 */
         felem_diff_128_64(tmp, ftmp2); /* tmp[i] < 2^117 + 2^65 + 2^49 */
-        felem_reduce(ftmp5, tmp);      /* ftmp5[i] < 2^56 */
+        felem_reduce(ftmp5, tmp); /* ftmp5[i] < 2^56 */
 
         /* ftmp2 = z2 * z2z2 */
         felem_mul_reduce(ftmp2, ftmp2, z2); /* ftmp2[i] < 2^56 */
@@ -1112,39 +1144,39 @@ static void point_add(felem x3, felem y3, felem z3,
          */
 
         /* u1 = ftmp3 = x1*z2z2 */
-        felem_assign(ftmp3, x1);     /* ftmp3[i] < 2^56 */
+        felem_assign(ftmp3, x1); /* ftmp3[i] < 2^56 */
 
         /* ftmp5 = 2*z1z2 */
-        felem_scalar(ftmp5, z1, 2);  /* ftmp5[i] < 2^57 */
+        felem_scalar(ftmp5, z1, 2); /* ftmp5[i] < 2^57 */
 
         /* s1 = ftmp6 = y1 * z2**3 */
-        felem_assign(ftmp6, y1);     /* ftmp6[i] < 2^56 */
+        felem_assign(ftmp6, y1); /* ftmp6[i] < 2^56 */
     }
     /* ftmp3[i] < 2^56, ftmp5[i] < 2^57, ftmp6[i] < 2^56 */
 
     /* u2 = x2*z1z1 */
-    felem_mul(tmp, x2, ftmp);        /* tmp[i] < 2^115 */
+    felem_mul(tmp, x2, ftmp); /* tmp[i] < 2^115 */
 
     /* h = ftmp4 = u2 - u1 */
-    felem_diff_128_64(tmp, ftmp3);   /* tmp[i] < 2^115 + 2^64 + 2^48 */
-    felem_reduce(ftmp4, tmp);        /* ftmp[4] < 2^56 */
+    felem_diff_128_64(tmp, ftmp3); /* tmp[i] < 2^115 + 2^64 + 2^48 */
+    felem_reduce(ftmp4, tmp); /* ftmp[4] < 2^56 */
 
     x_equal = felem_is_zero(ftmp4);
 
     /* z_out = ftmp5 * h */
-    felem_mul_reduce(z_out, ftmp5, ftmp4);  /* z_out[i] < 2^56 */
+    felem_mul_reduce(z_out, ftmp5, ftmp4); /* z_out[i] < 2^56 */
 
     /* ftmp = z1 * z1z1 */
-    felem_mul_reduce(ftmp, ftmp, z1);  /* ftmp[i] < 2^56 */
+    felem_mul_reduce(ftmp, ftmp, z1); /* ftmp[i] < 2^56 */
 
     /* s2 = tmp = y2 * z1**3 */
-    felem_mul(tmp, y2, ftmp);      /* tmp[i] < 2^115 */
+    felem_mul(tmp, y2, ftmp); /* tmp[i] < 2^115 */
 
     /* r = ftmp5 = (s2 - s1)*2 */
     felem_diff_128_64(tmp, ftmp6); /* tmp[i] < 2^115 + 2^64 + 2^48 */
-    felem_reduce(ftmp5, tmp);      /* ftmp5[i] < 2^56 */
+    felem_reduce(ftmp5, tmp); /* ftmp5[i] < 2^56 */
     y_equal = felem_is_zero(ftmp5);
-    felem_scalar64(ftmp5, 2);      /* ftmp5[i] < 2^57 */
+    felem_scalar64(ftmp5, 2); /* ftmp5[i] < 2^57 */
 
     /*
      * The formulae are incorrect if the points are equal, in affine coordinates
@@ -1173,9 +1205,9 @@ static void point_add(felem x3, felem y3, felem z3,
     }
 
     /* I = ftmp = (2h)**2 */
-    felem_assign(ftmp, ftmp4);        /* ftmp[i] < 2^56 */
-    felem_scalar64(ftmp, 2);          /* ftmp[i] < 2^57 */
-    felem_square_reduce(ftmp, ftmp);  /* ftmp[i] < 2^56 */
+    felem_assign(ftmp, ftmp4); /* ftmp[i] < 2^56 */
+    felem_scalar64(ftmp, 2); /* ftmp[i] < 2^57 */
+    felem_square_reduce(ftmp, ftmp); /* ftmp[i] < 2^56 */
 
     /* J = ftmp2 = h * I */
     felem_mul_reduce(ftmp2, ftmp4, ftmp); /* ftmp2[i] < 2^56 */
@@ -1184,20 +1216,20 @@ static void point_add(felem x3, felem y3, felem z3,
     felem_mul_reduce(ftmp4, ftmp3, ftmp); /* ftmp4[i] < 2^56 */
 
     /* x_out = r**2 - J - 2V */
-    felem_square(tmp, ftmp5);      /* tmp[i] < 2^117 */
+    felem_square(tmp, ftmp5); /* tmp[i] < 2^117 */
     felem_diff_128_64(tmp, ftmp2); /* tmp[i] < 2^117 + 2^64 + 2^48 */
-    felem_assign(ftmp3, ftmp4);    /* ftmp3[i] < 2^56 */
-    felem_scalar64(ftmp4, 2);      /* ftmp4[i] < 2^57 */
+    felem_assign(ftmp3, ftmp4); /* ftmp3[i] < 2^56 */
+    felem_scalar64(ftmp4, 2); /* ftmp4[i] < 2^57 */
     felem_diff_128_64(tmp, ftmp4); /* tmp[i] < 2^117 + 2^65 + 2^49 */
-    felem_reduce(x_out, tmp);      /* x_out[i] < 2^56 */
+    felem_reduce(x_out, tmp); /* x_out[i] < 2^56 */
 
     /* y_out = r(V-x_out) - 2 * s1 * J */
-    felem_diff64(ftmp3, x_out);    /* ftmp3[i] < 2^60 + 2^56 + 2^44 */
-    felem_mul(tmp, ftmp5, ftmp3);  /* tmp[i] < 2^116 */
+    felem_diff64(ftmp3, x_out); /* ftmp3[i] < 2^60 + 2^56 + 2^44 */
+    felem_mul(tmp, ftmp5, ftmp3); /* tmp[i] < 2^116 */
     felem_mul(tmp2, ftmp6, ftmp2); /* tmp2[i] < 2^115 */
-    felem_scalar128(tmp2, 2);      /* tmp2[i] < 2^116 */
-    felem_diff128(tmp, tmp2);      /* tmp[i] < 2^127 + 2^116 + 2^111 */
-    felem_reduce(y_out, tmp);      /* y_out[i] < 2^56 */
+    felem_scalar128(tmp2, 2); /* tmp2[i] < 2^116 */
+    felem_diff128(tmp, tmp2); /* tmp[i] < 2^127 + 2^116 + 2^111 */
+    felem_reduce(y_out, tmp); /* y_out[i] < 2^56 */
 
     copy_conditional(x_out, x2, z1_is_zero);
     copy_conditional(x_out, x1, z2_is_zero);
@@ -1247,84 +1279,84 @@ static void point_add(felem x3, felem y3, felem z3,
 
 /* gmul is the table of precomputed base points */
 static const felem gmul[16][3] = {
-{{0, 0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0, 0}},
-{{0x00545e3872760ab7, 0x00f25dbf55296c3a, 0x00e082542a385502, 0x008ba79b9859f741,
-  0x0020ad746e1d3b62, 0x0005378eb1c71ef3, 0x0000aa87ca22be8b},
- {0x00431d7c90ea0e5f, 0x00b1ce1d7e819d7a, 0x0013b5f0b8c00a60, 0x00289a147ce9da31,
-  0x0092dc29f8f41dbd, 0x002c6f5d9e98bf92, 0x00003617de4a9626},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00024711cc902a90, 0x00acb2e579ab4fe1, 0x00af818a4b4d57b1, 0x00a17c7bec49c3de,
-  0x004280482d726a8b, 0x00128dd0f0a90f3b, 0x00004387c1c3fa3c},
- {0x002ce76543cf5c3a, 0x00de6cee5ef58f0a, 0x00403e42fa561ca6, 0x00bc54d6f9cb9731,
-  0x007155f925fb4ff1, 0x004a9ce731b7b9bc, 0x00002609076bd7b2},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00e74c9182f0251d, 0x0039bf54bb111974, 0x00b9d2f2eec511d2, 0x0036b1594eb3a6a4,
-  0x00ac3bb82d9d564b, 0x00f9313f4615a100, 0x00006716a9a91b10},
- {0x0046698116e2f15c, 0x00f34347067d3d33, 0x008de4ccfdebd002, 0x00e838c6b8e8c97b,
-  0x006faf0798def346, 0x007349794a57563c, 0x00002629e7e6ad84},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x0075300e34fd163b, 0x0092e9db4e8d0ad3, 0x00254be9f625f760, 0x00512c518c72ae68,
-  0x009bfcf162bede5a, 0x00bf9341566ce311, 0x0000cd6175bd41cf},
- {0x007dfe52af4ac70f, 0x0002159d2d5c4880, 0x00b504d16f0af8d0, 0x0014585e11f5e64c,
-  0x0089c6388e030967, 0x00ffb270cbfa5f71, 0x00009a15d92c3947},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x0033fc1278dc4fe5, 0x00d53088c2caa043, 0x0085558827e2db66, 0x00c192bef387b736,
-  0x00df6405a2225f2c, 0x0075205aa90fd91a, 0x0000137e3f12349d},
- {0x00ce5b115efcb07e, 0x00abc3308410deeb, 0x005dc6fc1de39904, 0x00907c1c496f36b4,
-  0x0008e6ad3926cbe1, 0x00110747b787928c, 0x0000021b9162eb7e},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x008180042cfa26e1, 0x007b826a96254967, 0x0082473694d6b194, 0x007bd6880a45b589,
-  0x00c0a5097072d1a3, 0x0019186555e18b4e, 0x000020278190e5ca},
- {0x00b4bef17de61ac0, 0x009535e3c38ed348, 0x002d4aa8e468ceab, 0x00ef40b431036ad3,
-  0x00defd52f4542857, 0x0086edbf98234266, 0x00002025b3a7814d},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00b238aa97b886be, 0x00ef3192d6dd3a32, 0x0079f9e01fd62df8, 0x00742e890daba6c5,
-  0x008e5289144408ce, 0x0073bbcc8e0171a5, 0x0000c4fd329d3b52},
- {0x00c6f64a15ee23e7, 0x00dcfb7b171cad8b, 0x00039f6cbd805867, 0x00de024e428d4562,
-  0x00be6a594d7c64c5, 0x0078467b70dbcd64, 0x0000251f2ed7079b},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x000e5cc25fc4b872, 0x005ebf10d31ef4e1, 0x0061e0ebd11e8256, 0x0076e026096f5a27,
-  0x0013e6fc44662e9a, 0x0042b00289d3597e, 0x000024f089170d88},
- {0x001604d7e0effbe6, 0x0048d77cba64ec2c, 0x008166b16da19e36, 0x006b0d1a0f28c088,
-  0x000259fcd47754fd, 0x00cc643e4d725f9a, 0x00007b10f3c79c14},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00430155e3b908af, 0x00b801e4fec25226, 0x00b0d4bcfe806d26, 0x009fc4014eb13d37,
-  0x0066c94e44ec07e8, 0x00d16adc03874ba2, 0x000030c917a0d2a7},
- {0x00edac9e21eb891c, 0x00ef0fb768102eff, 0x00c088cef272a5f3, 0x00cbf782134e2964,
-  0x0001044a7ba9a0e3, 0x00e363f5b194cf3c, 0x00009ce85249e372},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x001dd492dda5a7eb, 0x008fd577be539fd1, 0x002ff4b25a5fc3f1, 0x0074a8a1b64df72f,
-  0x002ba3d8c204a76c, 0x009d5cff95c8235a, 0x0000e014b9406e0f},
- {0x008c2e4dbfc98aba, 0x00f30bb89f1a1436, 0x00b46f7aea3e259c, 0x009224454ac02f54,
-  0x00906401f5645fa2, 0x003a1d1940eabc77, 0x00007c9351d680e6},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x005a35d872ef967c, 0x0049f1b7884e1987, 0x0059d46d7e31f552, 0x00ceb4869d2d0fb6,
-  0x00e8e89eee56802a, 0x0049d806a774aaf2, 0x0000147e2af0ae24},
- {0x005fd1bd852c6e5e, 0x00b674b7b3de6885, 0x003b9ea5eb9b6c08, 0x005c9f03babf3ef7,
-  0x00605337fecab3c7, 0x009a3f85b11bbcc8, 0x0000455470f330ec},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x002197ff4d55498d, 0x00383e8916c2d8af, 0x00eb203f34d1c6d2, 0x0080367cbd11b542,
-  0x00769b3be864e4f5, 0x0081a8458521c7bb, 0x0000c531b34d3539},
- {0x00e2a3d775fa2e13, 0x00534fc379573844, 0x00ff237d2a8db54a, 0x00d301b2335a8882,
-  0x000f75ea96103a80, 0x0018fecb3cdd96fa, 0x0000304bf61e94eb},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00b2afc332a73dbd, 0x0029a0d5bb007bc5, 0x002d628eb210f577, 0x009f59a36dd05f50,
-  0x006d339de4eca613, 0x00c75a71addc86bc, 0x000060384c5ea93c},
- {0x00aa9641c32a30b4, 0x00cc73ae8cce565d, 0x00ec911a4df07f61, 0x00aa4b762ea4b264,
-  0x0096d395bb393629, 0x004efacfb7632fe0, 0x00006f252f46fa3f},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00567eec597c7af6, 0x0059ba6795204413, 0x00816d4e6f01196f, 0x004ae6b3eb57951d,
-  0x00420f5abdda2108, 0x003401d1f57ca9d9, 0x0000cf5837b0b67a},
- {0x00eaa64b8aeeabf9, 0x00246ddf16bcb4de, 0x000e7e3c3aecd751, 0x0008449f04fed72e,
-  0x00307b67ccf09183, 0x0017108c3556b7b1, 0x0000229b2483b3bf},
- {1, 0, 0, 0, 0, 0, 0}},
-{{0x00e7c491a7bb78a1, 0x00eafddd1d3049ab, 0x00352c05e2bc7c98, 0x003d6880c165fa5c,
-  0x00b6ac61cc11c97d, 0x00beeb54fcf90ce5, 0x0000dc1f0b455edc},
- {0x002db2e7aee34d60, 0x0073b5f415a2d8c0, 0x00dd84e4193e9a0c, 0x00d02d873467c572,
-  0x0018baaeda60aee5, 0x0013fb11d697c61e, 0x000083aafcc3a973},
- {1, 0, 0, 0, 0, 0, 0}}
+    { { 0, 0, 0, 0, 0, 0, 0 },
+        { 0, 0, 0, 0, 0, 0, 0 },
+        { 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x00545e3872760ab7, 0x00f25dbf55296c3a, 0x00e082542a385502, 0x008ba79b9859f741,
+          0x0020ad746e1d3b62, 0x0005378eb1c71ef3, 0x0000aa87ca22be8b },
+        { 0x00431d7c90ea0e5f, 0x00b1ce1d7e819d7a, 0x0013b5f0b8c00a60, 0x00289a147ce9da31,
+            0x0092dc29f8f41dbd, 0x002c6f5d9e98bf92, 0x00003617de4a9626 },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x00024711cc902a90, 0x00acb2e579ab4fe1, 0x00af818a4b4d57b1, 0x00a17c7bec49c3de,
+          0x004280482d726a8b, 0x00128dd0f0a90f3b, 0x00004387c1c3fa3c },
+        { 0x002ce76543cf5c3a, 0x00de6cee5ef58f0a, 0x00403e42fa561ca6, 0x00bc54d6f9cb9731,
+            0x007155f925fb4ff1, 0x004a9ce731b7b9bc, 0x00002609076bd7b2 },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x00e74c9182f0251d, 0x0039bf54bb111974, 0x00b9d2f2eec511d2, 0x0036b1594eb3a6a4,
+          0x00ac3bb82d9d564b, 0x00f9313f4615a100, 0x00006716a9a91b10 },
+        { 0x0046698116e2f15c, 0x00f34347067d3d33, 0x008de4ccfdebd002, 0x00e838c6b8e8c97b,
+            0x006faf0798def346, 0x007349794a57563c, 0x00002629e7e6ad84 },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x0075300e34fd163b, 0x0092e9db4e8d0ad3, 0x00254be9f625f760, 0x00512c518c72ae68,
+          0x009bfcf162bede5a, 0x00bf9341566ce311, 0x0000cd6175bd41cf },
+        { 0x007dfe52af4ac70f, 0x0002159d2d5c4880, 0x00b504d16f0af8d0, 0x0014585e11f5e64c,
+            0x0089c6388e030967, 0x00ffb270cbfa5f71, 0x00009a15d92c3947 },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x0033fc1278dc4fe5, 0x00d53088c2caa043, 0x0085558827e2db66, 0x00c192bef387b736,
+          0x00df6405a2225f2c, 0x0075205aa90fd91a, 0x0000137e3f12349d },
+        { 0x00ce5b115efcb07e, 0x00abc3308410deeb, 0x005dc6fc1de39904, 0x00907c1c496f36b4,
+            0x0008e6ad3926cbe1, 0x00110747b787928c, 0x0000021b9162eb7e },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x008180042cfa26e1, 0x007b826a96254967, 0x0082473694d6b194, 0x007bd6880a45b589,
+          0x00c0a5097072d1a3, 0x0019186555e18b4e, 0x000020278190e5ca },
+        { 0x00b4bef17de61ac0, 0x009535e3c38ed348, 0x002d4aa8e468ceab, 0x00ef40b431036ad3,
+            0x00defd52f4542857, 0x0086edbf98234266, 0x00002025b3a7814d },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x00b238aa97b886be, 0x00ef3192d6dd3a32, 0x0079f9e01fd62df8, 0x00742e890daba6c5,
+          0x008e5289144408ce, 0x0073bbcc8e0171a5, 0x0000c4fd329d3b52 },
+        { 0x00c6f64a15ee23e7, 0x00dcfb7b171cad8b, 0x00039f6cbd805867, 0x00de024e428d4562,
+            0x00be6a594d7c64c5, 0x0078467b70dbcd64, 0x0000251f2ed7079b },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x000e5cc25fc4b872, 0x005ebf10d31ef4e1, 0x0061e0ebd11e8256, 0x0076e026096f5a27,
+          0x0013e6fc44662e9a, 0x0042b00289d3597e, 0x000024f089170d88 },
+        { 0x001604d7e0effbe6, 0x0048d77cba64ec2c, 0x008166b16da19e36, 0x006b0d1a0f28c088,
+            0x000259fcd47754fd, 0x00cc643e4d725f9a, 0x00007b10f3c79c14 },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x00430155e3b908af, 0x00b801e4fec25226, 0x00b0d4bcfe806d26, 0x009fc4014eb13d37,
+          0x0066c94e44ec07e8, 0x00d16adc03874ba2, 0x000030c917a0d2a7 },
+        { 0x00edac9e21eb891c, 0x00ef0fb768102eff, 0x00c088cef272a5f3, 0x00cbf782134e2964,
+            0x0001044a7ba9a0e3, 0x00e363f5b194cf3c, 0x00009ce85249e372 },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x001dd492dda5a7eb, 0x008fd577be539fd1, 0x002ff4b25a5fc3f1, 0x0074a8a1b64df72f,
+          0x002ba3d8c204a76c, 0x009d5cff95c8235a, 0x0000e014b9406e0f },
+        { 0x008c2e4dbfc98aba, 0x00f30bb89f1a1436, 0x00b46f7aea3e259c, 0x009224454ac02f54,
+            0x00906401f5645fa2, 0x003a1d1940eabc77, 0x00007c9351d680e6 },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x005a35d872ef967c, 0x0049f1b7884e1987, 0x0059d46d7e31f552, 0x00ceb4869d2d0fb6,
+          0x00e8e89eee56802a, 0x0049d806a774aaf2, 0x0000147e2af0ae24 },
+        { 0x005fd1bd852c6e5e, 0x00b674b7b3de6885, 0x003b9ea5eb9b6c08, 0x005c9f03babf3ef7,
+            0x00605337fecab3c7, 0x009a3f85b11bbcc8, 0x0000455470f330ec },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x002197ff4d55498d, 0x00383e8916c2d8af, 0x00eb203f34d1c6d2, 0x0080367cbd11b542,
+          0x00769b3be864e4f5, 0x0081a8458521c7bb, 0x0000c531b34d3539 },
+        { 0x00e2a3d775fa2e13, 0x00534fc379573844, 0x00ff237d2a8db54a, 0x00d301b2335a8882,
+            0x000f75ea96103a80, 0x0018fecb3cdd96fa, 0x0000304bf61e94eb },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x00b2afc332a73dbd, 0x0029a0d5bb007bc5, 0x002d628eb210f577, 0x009f59a36dd05f50,
+          0x006d339de4eca613, 0x00c75a71addc86bc, 0x000060384c5ea93c },
+        { 0x00aa9641c32a30b4, 0x00cc73ae8cce565d, 0x00ec911a4df07f61, 0x00aa4b762ea4b264,
+            0x0096d395bb393629, 0x004efacfb7632fe0, 0x00006f252f46fa3f },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x00567eec597c7af6, 0x0059ba6795204413, 0x00816d4e6f01196f, 0x004ae6b3eb57951d,
+          0x00420f5abdda2108, 0x003401d1f57ca9d9, 0x0000cf5837b0b67a },
+        { 0x00eaa64b8aeeabf9, 0x00246ddf16bcb4de, 0x000e7e3c3aecd751, 0x0008449f04fed72e,
+            0x00307b67ccf09183, 0x0017108c3556b7b1, 0x0000229b2483b3bf },
+        { 1, 0, 0, 0, 0, 0, 0 } },
+    { { 0x00e7c491a7bb78a1, 0x00eafddd1d3049ab, 0x00352c05e2bc7c98, 0x003d6880c165fa5c,
+          0x00b6ac61cc11c97d, 0x00beeb54fcf90ce5, 0x0000dc1f0b455edc },
+        { 0x002db2e7aee34d60, 0x0073b5f415a2d8c0, 0x00dd84e4193e9a0c, 0x00d02d873467c572,
+            0x0018baaeda60aee5, 0x0013fb11d697c61e, 0x000083aafcc3a973 },
+        { 1, 0, 0, 0, 0, 0, 0 } }
 };
 
 /*
@@ -1334,7 +1366,7 @@ static const felem gmul[16][3] = {
  * pre_comp below is of the size provided in |size|.
  */
 static void select_point(const limb idx, unsigned int size,
-                         const felem pre_comp[][3], felem out[3])
+    const felem pre_comp[][3], felem out[3])
 {
     unsigned int i, j;
     limb *outlimbs = &out[0][0];
@@ -1371,10 +1403,10 @@ static char get_bit(const felem_bytearray in, int i)
  * Output point (X, Y, Z) is stored in x_out, y_out, z_out
  */
 static void batch_mul(felem x_out, felem y_out, felem z_out,
-                      const felem_bytearray scalars[],
-                      const unsigned int num_points, const u8 *g_scalar,
-                      const int mixed, const felem pre_comp[][17][3],
-                      const felem g_pre_comp[16][3])
+    const felem_bytearray scalars[],
+    const unsigned int num_points, const u8 *g_scalar,
+    const int mixed, const felem pre_comp[][17][3],
+    const felem g_pre_comp[16][3])
 {
     int i, skip;
     unsigned int num, gen_mul = (g_scalar != NULL);
@@ -1390,8 +1422,8 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
      * of the generator (last quarter of rounds) and additions of other
      * points multiples (every 5th round).
      */
-    skip = 1;                   /* save two point operations in the first
-                                 * round */
+    skip = 1; /* save two point operations in the first
+               * round */
     for (i = (num_points ? 380 : 98); i >= 0; --i) {
         /* double */
         if (!skip)
@@ -1409,9 +1441,9 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
             select_point(bits, 16, g_pre_comp, tmp);
             if (!skip) {
                 /* The 1 argument below is for "mixed" */
-                point_add(nq[0],  nq[1],  nq[2],
-                          nq[0],  nq[1],  nq[2], 1,
-                          tmp[0], tmp[1], tmp[2]);
+                point_add(nq[0], nq[1], nq[2],
+                    nq[0], nq[1], nq[2], 1,
+                    tmp[0], tmp[1], tmp[2]);
             } else {
                 memcpy(nq, tmp, 3 * sizeof(felem));
                 skip = 0;
@@ -1436,12 +1468,12 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
                 select_point(digit, 17, pre_comp[num], tmp);
                 felem_neg(tmp[3], tmp[1]); /* (X, -Y, Z) is the negative
                                             * point */
-                copy_conditional(tmp[1], tmp[3], (-(limb) sign));
+                copy_conditional(tmp[1], tmp[3], (-(limb)sign));
 
                 if (!skip) {
-                    point_add(nq[0],  nq[1],  nq[2],
-                              nq[0],  nq[1],  nq[2], mixed,
-                              tmp[0], tmp[1], tmp[2]);
+                    point_add(nq[0], nq[1], nq[2],
+                        nq[0], nq[1], nq[2], mixed,
+                        tmp[0], tmp[1], tmp[2]);
                 } else {
                     memcpy(nq, tmp, 3 * sizeof(felem));
                     skip = 0;
@@ -1518,7 +1550,7 @@ const EC_METHOD *ossl_ec_GFp_nistp384_method(void)
         0, /* blind_coordinates */
         0, /* ladder_pre */
         0, /* ladder_step */
-        0  /* ladder_post */
+        0 /* ladder_post */
     };
 
     return &ret;
@@ -1584,8 +1616,8 @@ int ossl_ec_GFp_nistp384_group_init(EC_GROUP *group)
 }
 
 int ossl_ec_GFp_nistp384_group_set_curve(EC_GROUP *group, const BIGNUM *p,
-                                         const BIGNUM *a, const BIGNUM *b,
-                                         BN_CTX *ctx)
+    const BIGNUM *a, const BIGNUM *b,
+    BN_CTX *ctx)
 {
     int ret = 0;
     BIGNUM *curve_p, *curve_a, *curve_b;
@@ -1613,7 +1645,7 @@ int ossl_ec_GFp_nistp384_group_set_curve(EC_GROUP *group, const BIGNUM *p,
     }
     group->field_mod_func = BN_nist_mod_384;
     ret = ossl_ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
- err:
+err:
     BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
     BN_CTX_free(new_ctx);
@@ -1626,9 +1658,9 @@ int ossl_ec_GFp_nistp384_group_set_curve(EC_GROUP *group, const BIGNUM *p,
  * (X/Z^2, Y/Z^3)
  */
 int ossl_ec_GFp_nistp384_point_get_affine_coordinates(const EC_GROUP *group,
-                                                      const EC_POINT *point,
-                                                      BIGNUM *x, BIGNUM *y,
-                                                      BN_CTX *ctx)
+    const EC_POINT *point,
+    BIGNUM *x, BIGNUM *y,
+    BN_CTX *ctx)
 {
     felem z1, z2, x_in, y_in, x_out, y_out;
     widefelem tmp;
@@ -1637,8 +1669,7 @@ int ossl_ec_GFp_nistp384_point_get_affine_coordinates(const EC_GROUP *group,
         ERR_raise(ERR_LIB_EC, EC_R_POINT_AT_INFINITY);
         return 0;
     }
-    if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) ||
-        (!BN_to_felem(z1, point->Z)))
+    if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) || (!BN_to_felem(z1, point->Z)))
         return 0;
     felem_inv(z2, z1);
     felem_square(tmp, z2);
@@ -1668,28 +1699,28 @@ int ossl_ec_GFp_nistp384_point_get_affine_coordinates(const EC_GROUP *group,
 
 /* points below is of size |num|, and tmp_felems is of size |num+1/ */
 static void make_points_affine(size_t num, felem points[][3],
-                               felem tmp_felems[])
+    felem tmp_felems[])
 {
     /*
      * Runs in constant time, unless an input is the point at infinity (which
      * normally shouldn't happen).
      */
     ossl_ec_GFp_nistp_points_make_affine_internal(num,
-                                                  points,
-                                                  sizeof(felem),
-                                                  tmp_felems,
-                                                  (void (*)(void *))felem_one,
-                                                  felem_is_zero_int,
-                                                  (void (*)(void *, const void *))
-                                                  felem_assign,
-                                                  (void (*)(void *, const void *))
-                                                  felem_square_reduce,
-                                                  (void (*)(void *, const void *, const void*))
-                                                  felem_mul_reduce,
-                                                  (void (*)(void *, const void *))
-                                                  felem_inv,
-                                                  (void (*)(void *, const void *))
-                                                  felem_contract);
+        points,
+        sizeof(felem),
+        tmp_felems,
+        (void (*)(void *))felem_one,
+        felem_is_zero_int,
+        (void (*)(void *, const void *))
+            felem_assign,
+        (void (*)(void *, const void *))
+            felem_square_reduce,
+        (void (*)(void *, const void *, const void *))
+            felem_mul_reduce,
+        (void (*)(void *, const void *))
+            felem_inv,
+        (void (*)(void *, const void *))
+            felem_contract);
 }
 
 /*
@@ -1697,9 +1728,9 @@ static void make_points_affine(size_t num, felem points[][3],
  * values Result is stored in r (r can equal one of the inputs).
  */
 int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
-                                    const BIGNUM *scalar, size_t num,
-                                    const EC_POINT *points[],
-                                    const BIGNUM *scalars[], BN_CTX *ctx)
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *ctx)
 {
     int ret = 0;
     int j;
@@ -1707,7 +1738,7 @@ int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
     BIGNUM *x, *y, *z, *tmp_scalar;
     felem_bytearray g_secret;
     felem_bytearray *secrets = NULL;
-    felem (*pre_comp)[17][3] = NULL;
+    felem(*pre_comp)[17][3] = NULL;
     felem *tmp_felems = NULL;
     unsigned int i;
     int num_bytes;
@@ -1735,20 +1766,18 @@ int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
             g_pre_comp = &pre->g_pre_comp[0];
         else
             /* try to use the standard precomputation */
-            g_pre_comp = (felem(*)[3]) gmul;
+            g_pre_comp = (felem(*)[3])gmul;
         generator = EC_POINT_new(group);
         if (generator == NULL)
             goto err;
         /* get the generator from precomputation */
-        if (!felem_to_BN(x, g_pre_comp[1][0]) ||
-            !felem_to_BN(y, g_pre_comp[1][1]) ||
-            !felem_to_BN(z, g_pre_comp[1][2])) {
+        if (!felem_to_BN(x, g_pre_comp[1][0]) || !felem_to_BN(y, g_pre_comp[1][1]) || !felem_to_BN(z, g_pre_comp[1][2])) {
             ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
             goto err;
         }
         if (!ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group,
-                                                                generator,
-                                                                x, y, z, ctx))
+                generator,
+                x, y, z, ctx))
             goto err;
         if (0 == EC_POINT_cmp(group, generator, group->generator, ctx))
             /* precomputation matches generator */
@@ -1772,8 +1801,7 @@ int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
         secrets = OPENSSL_zalloc(sizeof(*secrets) * num_points);
         pre_comp = OPENSSL_zalloc(sizeof(*pre_comp) * num_points);
         if (mixed)
-            tmp_felems =
-                OPENSSL_malloc(sizeof(*tmp_felems) * (num_points * 17 + 1));
+            tmp_felems = OPENSSL_malloc(sizeof(*tmp_felems) * (num_points * 17 + 1));
         if ((secrets == NULL) || (pre_comp == NULL)
             || (mixed && (tmp_felems == NULL)))
             goto err;
@@ -1808,31 +1836,29 @@ int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
                         goto err;
                     }
                     num_bytes = BN_bn2lebinpad(tmp_scalar,
-                                               secrets[i], sizeof(secrets[i]));
+                        secrets[i], sizeof(secrets[i]));
                 } else {
                     num_bytes = BN_bn2lebinpad(p_scalar,
-                                               secrets[i], sizeof(secrets[i]));
+                        secrets[i], sizeof(secrets[i]));
                 }
                 if (num_bytes < 0) {
                     ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
                     goto err;
                 }
                 /* precompute multiples */
-                if ((!BN_to_felem(x_out, p->X)) ||
-                    (!BN_to_felem(y_out, p->Y)) ||
-                    (!BN_to_felem(z_out, p->Z)))
+                if ((!BN_to_felem(x_out, p->X)) || (!BN_to_felem(y_out, p->Y)) || (!BN_to_felem(z_out, p->Z)))
                     goto err;
                 memcpy(pre_comp[i][1][0], x_out, sizeof(felem));
                 memcpy(pre_comp[i][1][1], y_out, sizeof(felem));
                 memcpy(pre_comp[i][1][2], z_out, sizeof(felem));
                 for (j = 2; j <= 16; ++j) {
                     if (j & 1) {
-                        point_add(pre_comp[i][j][0],     pre_comp[i][j][1],     pre_comp[i][j][2],
-                                  pre_comp[i][1][0],     pre_comp[i][1][1],     pre_comp[i][1][2], 0,
-                                  pre_comp[i][j - 1][0], pre_comp[i][j - 1][1], pre_comp[i][j - 1][2]);
+                        point_add(pre_comp[i][j][0], pre_comp[i][j][1], pre_comp[i][j][2],
+                            pre_comp[i][1][0], pre_comp[i][1][1], pre_comp[i][1][2], 0,
+                            pre_comp[i][j - 1][0], pre_comp[i][j - 1][1], pre_comp[i][j - 1][2]);
                     } else {
-                        point_double(pre_comp[i][j][0],     pre_comp[i][j][1],     pre_comp[i][j][2],
-                                     pre_comp[i][j / 2][0], pre_comp[i][j / 2][1], pre_comp[i][j / 2][2]);
+                        point_double(pre_comp[i][j][0], pre_comp[i][j][1], pre_comp[i][j][2],
+                            pre_comp[i][j / 2][0], pre_comp[i][j / 2][1], pre_comp[i][j / 2][2]);
                     }
                 }
             }
@@ -1860,29 +1886,28 @@ int ossl_ec_GFp_nistp384_points_mul(const EC_GROUP *group, EC_POINT *r,
         }
         /* do the multiplication with generator precomputation */
         batch_mul(x_out, y_out, z_out,
-                  (const felem_bytearray(*))secrets, num_points,
-                  g_secret,
-                  mixed, (const felem(*)[17][3])pre_comp,
-                  (const felem(*)[3])g_pre_comp);
+            (const felem_bytearray(*))secrets, num_points,
+            g_secret,
+            mixed, (const felem(*)[17][3])pre_comp,
+            (const felem(*)[3])g_pre_comp);
     } else {
         /* do the multiplication without generator precomputation */
         batch_mul(x_out, y_out, z_out,
-                  (const felem_bytearray(*))secrets, num_points,
-                  NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
+            (const felem_bytearray(*))secrets, num_points,
+            NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
     }
     /* reduce the output to its unique minimal representation */
     felem_contract(x_in, x_out);
     felem_contract(y_in, y_out);
     felem_contract(z_in, z_out);
-    if ((!felem_to_BN(x, x_in)) || (!felem_to_BN(y, y_in)) ||
-        (!felem_to_BN(z, z_in))) {
+    if ((!felem_to_BN(x, x_in)) || (!felem_to_BN(y, y_in)) || (!felem_to_BN(z, z_in))) {
         ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
         goto err;
     }
     ret = ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group, r, x, y, z,
-                                                             ctx);
+        ctx);
 
- err:
+err:
     BN_CTX_end(ctx);
     EC_POINT_free(generator);
     OPENSSL_free(secrets);
@@ -1937,51 +1962,49 @@ int ossl_ec_GFp_nistp384_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
         memcpy(pre->g_pre_comp, gmul, sizeof(pre->g_pre_comp));
         goto done;
     }
-    if ((!BN_to_felem(pre->g_pre_comp[1][0], group->generator->X)) ||
-        (!BN_to_felem(pre->g_pre_comp[1][1], group->generator->Y)) ||
-        (!BN_to_felem(pre->g_pre_comp[1][2], group->generator->Z)))
+    if ((!BN_to_felem(pre->g_pre_comp[1][0], group->generator->X)) || (!BN_to_felem(pre->g_pre_comp[1][1], group->generator->Y)) || (!BN_to_felem(pre->g_pre_comp[1][2], group->generator->Z)))
         goto err;
     /* compute 2^95*G, 2^190*G, 2^285*G */
     for (i = 1; i <= 4; i <<= 1) {
         point_double(pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2],
-                     pre->g_pre_comp[i][0],  pre->g_pre_comp[i][1],    pre->g_pre_comp[i][2]);
+            pre->g_pre_comp[i][0], pre->g_pre_comp[i][1], pre->g_pre_comp[i][2]);
         for (j = 0; j < 94; ++j) {
             point_double(pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2],
-                         pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2]);
+                pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2]);
         }
     }
     /* g_pre_comp[0] is the point at infinity */
     memset(pre->g_pre_comp[0], 0, sizeof(pre->g_pre_comp[0]));
     /* the remaining multiples */
     /* 2^95*G + 2^190*G */
-    point_add(pre->g_pre_comp[6][0],  pre->g_pre_comp[6][1],  pre->g_pre_comp[6][2],
-              pre->g_pre_comp[4][0],  pre->g_pre_comp[4][1],  pre->g_pre_comp[4][2], 0,
-              pre->g_pre_comp[2][0],  pre->g_pre_comp[2][1],  pre->g_pre_comp[2][2]);
+    point_add(pre->g_pre_comp[6][0], pre->g_pre_comp[6][1], pre->g_pre_comp[6][2],
+        pre->g_pre_comp[4][0], pre->g_pre_comp[4][1], pre->g_pre_comp[4][2], 0,
+        pre->g_pre_comp[2][0], pre->g_pre_comp[2][1], pre->g_pre_comp[2][2]);
     /* 2^95*G + 2^285*G */
     point_add(pre->g_pre_comp[10][0], pre->g_pre_comp[10][1], pre->g_pre_comp[10][2],
-              pre->g_pre_comp[8][0],  pre->g_pre_comp[8][1],  pre->g_pre_comp[8][2], 0,
-              pre->g_pre_comp[2][0],  pre->g_pre_comp[2][1],  pre->g_pre_comp[2][2]);
+        pre->g_pre_comp[8][0], pre->g_pre_comp[8][1], pre->g_pre_comp[8][2], 0,
+        pre->g_pre_comp[2][0], pre->g_pre_comp[2][1], pre->g_pre_comp[2][2]);
     /* 2^190*G + 2^285*G */
     point_add(pre->g_pre_comp[12][0], pre->g_pre_comp[12][1], pre->g_pre_comp[12][2],
-              pre->g_pre_comp[8][0],  pre->g_pre_comp[8][1],  pre->g_pre_comp[8][2], 0,
-              pre->g_pre_comp[4][0],  pre->g_pre_comp[4][1],  pre->g_pre_comp[4][2]);
+        pre->g_pre_comp[8][0], pre->g_pre_comp[8][1], pre->g_pre_comp[8][2], 0,
+        pre->g_pre_comp[4][0], pre->g_pre_comp[4][1], pre->g_pre_comp[4][2]);
     /* 2^95*G + 2^190*G + 2^285*G */
     point_add(pre->g_pre_comp[14][0], pre->g_pre_comp[14][1], pre->g_pre_comp[14][2],
-              pre->g_pre_comp[12][0], pre->g_pre_comp[12][1], pre->g_pre_comp[12][2], 0,
-              pre->g_pre_comp[2][0],  pre->g_pre_comp[2][1],  pre->g_pre_comp[2][2]);
+        pre->g_pre_comp[12][0], pre->g_pre_comp[12][1], pre->g_pre_comp[12][2], 0,
+        pre->g_pre_comp[2][0], pre->g_pre_comp[2][1], pre->g_pre_comp[2][2]);
     for (i = 1; i < 8; ++i) {
         /* odd multiples: add G */
         point_add(pre->g_pre_comp[2 * i + 1][0], pre->g_pre_comp[2 * i + 1][1], pre->g_pre_comp[2 * i + 1][2],
-                  pre->g_pre_comp[2 * i][0],     pre->g_pre_comp[2 * i][1],     pre->g_pre_comp[2 * i][2], 0,
-                  pre->g_pre_comp[1][0],         pre->g_pre_comp[1][1],         pre->g_pre_comp[1][2]);
+            pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2], 0,
+            pre->g_pre_comp[1][0], pre->g_pre_comp[1][1], pre->g_pre_comp[1][2]);
     }
     make_points_affine(15, &(pre->g_pre_comp[1]), tmp_felems);
 
- done:
+done:
     SETPRECOMP(group, nistp384, pre);
     ret = 1;
     pre = NULL;
- err:
+err:
     BN_CTX_end(ctx);
     EC_POINT_free(generator);
 #ifndef FIPS_MODULE
diff --git a/crypto/ec/ecp_nistp521.c b/crypto/ec/ecp_nistp521.c
index fe6836a147140..ca47c82e7f207 100644
--- a/crypto/ec/ecp_nistp521.c
+++ b/crypto/ec/ecp_nistp521.c
@@ -46,7 +46,7 @@
 #include "internal/numbers.h"
 
 #ifndef INT128_MAX
-# error "Your compiler doesn't appear to support 128-bit integer types"
+#error "Your compiler doesn't appear to support 128-bit integer types"
 #endif
 
 typedef uint8_t u8;
@@ -65,51 +65,51 @@ typedef u8 felem_bytearray[66];
  * These values are big-endian.
  */
 static const felem_bytearray nistp521_curve_params[5] = {
-    {0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* p */
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff},
-    {0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* a = -3 */
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-     0xff, 0xfc},
-    {0x00, 0x51, 0x95, 0x3e, 0xb9, 0x61, 0x8e, 0x1c, /* b */
-     0x9a, 0x1f, 0x92, 0x9a, 0x21, 0xa0, 0xb6, 0x85,
-     0x40, 0xee, 0xa2, 0xda, 0x72, 0x5b, 0x99, 0xb3,
-     0x15, 0xf3, 0xb8, 0xb4, 0x89, 0x91, 0x8e, 0xf1,
-     0x09, 0xe1, 0x56, 0x19, 0x39, 0x51, 0xec, 0x7e,
-     0x93, 0x7b, 0x16, 0x52, 0xc0, 0xbd, 0x3b, 0xb1,
-     0xbf, 0x07, 0x35, 0x73, 0xdf, 0x88, 0x3d, 0x2c,
-     0x34, 0xf1, 0xef, 0x45, 0x1f, 0xd4, 0x6b, 0x50,
-     0x3f, 0x00},
-    {0x00, 0xc6, 0x85, 0x8e, 0x06, 0xb7, 0x04, 0x04, /* x */
-     0xe9, 0xcd, 0x9e, 0x3e, 0xcb, 0x66, 0x23, 0x95,
-     0xb4, 0x42, 0x9c, 0x64, 0x81, 0x39, 0x05, 0x3f,
-     0xb5, 0x21, 0xf8, 0x28, 0xaf, 0x60, 0x6b, 0x4d,
-     0x3d, 0xba, 0xa1, 0x4b, 0x5e, 0x77, 0xef, 0xe7,
-     0x59, 0x28, 0xfe, 0x1d, 0xc1, 0x27, 0xa2, 0xff,
-     0xa8, 0xde, 0x33, 0x48, 0xb3, 0xc1, 0x85, 0x6a,
-     0x42, 0x9b, 0xf9, 0x7e, 0x7e, 0x31, 0xc2, 0xe5,
-     0xbd, 0x66},
-    {0x01, 0x18, 0x39, 0x29, 0x6a, 0x78, 0x9a, 0x3b, /* y */
-     0xc0, 0x04, 0x5c, 0x8a, 0x5f, 0xb4, 0x2c, 0x7d,
-     0x1b, 0xd9, 0x98, 0xf5, 0x44, 0x49, 0x57, 0x9b,
-     0x44, 0x68, 0x17, 0xaf, 0xbd, 0x17, 0x27, 0x3e,
-     0x66, 0x2c, 0x97, 0xee, 0x72, 0x99, 0x5e, 0xf4,
-     0x26, 0x40, 0xc5, 0x50, 0xb9, 0x01, 0x3f, 0xad,
-     0x07, 0x61, 0x35, 0x3c, 0x70, 0x86, 0xa2, 0x72,
-     0xc2, 0x40, 0x88, 0xbe, 0x94, 0x76, 0x9f, 0xd1,
-     0x66, 0x50}
+    { 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* p */
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff },
+    { 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* a = -3 */
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xfc },
+    { 0x00, 0x51, 0x95, 0x3e, 0xb9, 0x61, 0x8e, 0x1c, /* b */
+        0x9a, 0x1f, 0x92, 0x9a, 0x21, 0xa0, 0xb6, 0x85,
+        0x40, 0xee, 0xa2, 0xda, 0x72, 0x5b, 0x99, 0xb3,
+        0x15, 0xf3, 0xb8, 0xb4, 0x89, 0x91, 0x8e, 0xf1,
+        0x09, 0xe1, 0x56, 0x19, 0x39, 0x51, 0xec, 0x7e,
+        0x93, 0x7b, 0x16, 0x52, 0xc0, 0xbd, 0x3b, 0xb1,
+        0xbf, 0x07, 0x35, 0x73, 0xdf, 0x88, 0x3d, 0x2c,
+        0x34, 0xf1, 0xef, 0x45, 0x1f, 0xd4, 0x6b, 0x50,
+        0x3f, 0x00 },
+    { 0x00, 0xc6, 0x85, 0x8e, 0x06, 0xb7, 0x04, 0x04, /* x */
+        0xe9, 0xcd, 0x9e, 0x3e, 0xcb, 0x66, 0x23, 0x95,
+        0xb4, 0x42, 0x9c, 0x64, 0x81, 0x39, 0x05, 0x3f,
+        0xb5, 0x21, 0xf8, 0x28, 0xaf, 0x60, 0x6b, 0x4d,
+        0x3d, 0xba, 0xa1, 0x4b, 0x5e, 0x77, 0xef, 0xe7,
+        0x59, 0x28, 0xfe, 0x1d, 0xc1, 0x27, 0xa2, 0xff,
+        0xa8, 0xde, 0x33, 0x48, 0xb3, 0xc1, 0x85, 0x6a,
+        0x42, 0x9b, 0xf9, 0x7e, 0x7e, 0x31, 0xc2, 0xe5,
+        0xbd, 0x66 },
+    { 0x01, 0x18, 0x39, 0x29, 0x6a, 0x78, 0x9a, 0x3b, /* y */
+        0xc0, 0x04, 0x5c, 0x8a, 0x5f, 0xb4, 0x2c, 0x7d,
+        0x1b, 0xd9, 0x98, 0xf5, 0x44, 0x49, 0x57, 0x9b,
+        0x44, 0x68, 0x17, 0xaf, 0xbd, 0x17, 0x27, 0x3e,
+        0x66, 0x2c, 0x97, 0xee, 0x72, 0x99, 0x5e, 0xf4,
+        0x26, 0x40, 0xc5, 0x50, 0xb9, 0x01, 0x3f, 0xad,
+        0x07, 0x61, 0x35, 0x3c, 0x70, 0x86, 0xa2, 0x72,
+        0xc2, 0x40, 0x88, 0xbe, 0x94, 0x76, 0x9f, 0xd1,
+        0x66, 0x50 }
 };
 
 /*-
@@ -142,15 +142,15 @@ static const limb bottom58bits = 0x3ffffffffffffff;
  */
 static void bin66_to_felem(felem out, const u8 in[66])
 {
-    out[0] = (*((limb *) & in[0])) & bottom58bits;
-    out[1] = (*((limb_aX *) & in[7]) >> 2) & bottom58bits;
-    out[2] = (*((limb_aX *) & in[14]) >> 4) & bottom58bits;
-    out[3] = (*((limb_aX *) & in[21]) >> 6) & bottom58bits;
-    out[4] = (*((limb_aX *) & in[29])) & bottom58bits;
-    out[5] = (*((limb_aX *) & in[36]) >> 2) & bottom58bits;
-    out[6] = (*((limb_aX *) & in[43]) >> 4) & bottom58bits;
-    out[7] = (*((limb_aX *) & in[50]) >> 6) & bottom58bits;
-    out[8] = (*((limb_aX *) & in[58])) & bottom57bits;
+    out[0] = (*((limb *)&in[0])) & bottom58bits;
+    out[1] = (*((limb_aX *)&in[7]) >> 2) & bottom58bits;
+    out[2] = (*((limb_aX *)&in[14]) >> 4) & bottom58bits;
+    out[3] = (*((limb_aX *)&in[21]) >> 6) & bottom58bits;
+    out[4] = (*((limb_aX *)&in[29])) & bottom58bits;
+    out[5] = (*((limb_aX *)&in[36]) >> 2) & bottom58bits;
+    out[6] = (*((limb_aX *)&in[43]) >> 4) & bottom58bits;
+    out[7] = (*((limb_aX *)&in[50]) >> 6) & bottom58bits;
+    out[8] = (*((limb_aX *)&in[58])) & bottom57bits;
 }
 
 /*
@@ -160,15 +160,15 @@ static void bin66_to_felem(felem out, const u8 in[66])
 static void felem_to_bin66(u8 out[66], const felem in)
 {
     memset(out, 0, 66);
-    (*((limb *) & out[0])) = in[0];
-    (*((limb_aX *) & out[7])) |= in[1] << 2;
-    (*((limb_aX *) & out[14])) |= in[2] << 4;
-    (*((limb_aX *) & out[21])) |= in[3] << 6;
-    (*((limb_aX *) & out[29])) = in[4];
-    (*((limb_aX *) & out[36])) |= in[5] << 2;
-    (*((limb_aX *) & out[43])) |= in[6] << 4;
-    (*((limb_aX *) & out[50])) |= in[7] << 6;
-    (*((limb_aX *) & out[58])) = in[8];
+    (*((limb *)&out[0])) = in[0];
+    (*((limb_aX *)&out[7])) |= in[1] << 2;
+    (*((limb_aX *)&out[14])) |= in[2] << 4;
+    (*((limb_aX *)&out[21])) |= in[3] << 6;
+    (*((limb_aX *)&out[29])) = in[4];
+    (*((limb_aX *)&out[36])) |= in[5] << 2;
+    (*((limb_aX *)&out[43])) |= in[6] << 4;
+    (*((limb_aX *)&out[50])) |= in[7] << 6;
+    (*((limb_aX *)&out[58])) = in[8];
 }
 
 /* BN_to_felem converts an OpenSSL BIGNUM into an felem */
@@ -295,8 +295,8 @@ static void felem_scalar128(largefelem out, limb scalar)
 static void felem_neg(felem out, const felem in)
 {
     /* In order to prevent underflow, we subtract from 0 mod p. */
-    static const limb two62m3 = (((limb) 1) << 62) - (((limb) 1) << 5);
-    static const limb two62m2 = (((limb) 1) << 62) - (((limb) 1) << 4);
+    static const limb two62m3 = (((limb)1) << 62) - (((limb)1) << 5);
+    static const limb two62m2 = (((limb)1) << 62) - (((limb)1) << 4);
 
     out[0] = two62m3 - in[0];
     out[1] = two62m2 - in[1];
@@ -321,8 +321,8 @@ static void felem_diff64(felem out, const felem in)
     /*
      * In order to prevent underflow, we add 0 mod p before subtracting.
      */
-    static const limb two62m3 = (((limb) 1) << 62) - (((limb) 1) << 5);
-    static const limb two62m2 = (((limb) 1) << 62) - (((limb) 1) << 4);
+    static const limb two62m3 = (((limb)1) << 62) - (((limb)1) << 5);
+    static const limb two62m2 = (((limb)1) << 62) - (((limb)1) << 4);
 
     out[0] += two62m3 - in[0];
     out[1] += two62m2 - in[1];
@@ -352,8 +352,8 @@ static void felem_diff_128_64(largefelem out, const felem in)
      * represent a number. 64p is represented with 8 limbs containing a number
      * with 58 bits set and one limb with a number with 57 bits set.
      */
-    static const limb two63m6 = (((limb) 1) << 63) - (((limb) 1) << 6);
-    static const limb two63m5 = (((limb) 1) << 63) - (((limb) 1) << 5);
+    static const limb two63m6 = (((limb)1) << 63) - (((limb)1) << 6);
+    static const limb two63m5 = (((limb)1) << 63) - (((limb)1) << 5);
 
     out[0] += two63m6 - in[0];
     out[1] += two63m5 - in[1];
@@ -378,10 +378,8 @@ static void felem_diff128(largefelem out, const largefelem in)
     /*
      * In order to prevent underflow, we add 0 mod p before subtracting.
      */
-    static const uint128_t two127m70 =
-        (((uint128_t) 1) << 127) - (((uint128_t) 1) << 70);
-    static const uint128_t two127m69 =
-        (((uint128_t) 1) << 127) - (((uint128_t) 1) << 69);
+    static const uint128_t two127m70 = (((uint128_t)1) << 127) - (((uint128_t)1) << 70);
+    static const uint128_t two127m69 = (((uint128_t)1) << 127) - (((uint128_t)1) << 69);
 
     out[0] += (two127m70 - in[0]);
     out[1] += (two127m69 - in[1]);
@@ -418,24 +416,15 @@ static void felem_square_ref(largefelem out, const felem in)
      * |inx2|
      */
 
-    out[0] = ((uint128_t) in[0]) * in[0];
-    out[1] = ((uint128_t) in[0]) * inx2[1];
-    out[2] = ((uint128_t) in[0]) * inx2[2] + ((uint128_t) in[1]) * in[1];
-    out[3] = ((uint128_t) in[0]) * inx2[3] + ((uint128_t) in[1]) * inx2[2];
-    out[4] = ((uint128_t) in[0]) * inx2[4] +
-             ((uint128_t) in[1]) * inx2[3] + ((uint128_t) in[2]) * in[2];
-    out[5] = ((uint128_t) in[0]) * inx2[5] +
-             ((uint128_t) in[1]) * inx2[4] + ((uint128_t) in[2]) * inx2[3];
-    out[6] = ((uint128_t) in[0]) * inx2[6] +
-             ((uint128_t) in[1]) * inx2[5] +
-             ((uint128_t) in[2]) * inx2[4] + ((uint128_t) in[3]) * in[3];
-    out[7] = ((uint128_t) in[0]) * inx2[7] +
-             ((uint128_t) in[1]) * inx2[6] +
-             ((uint128_t) in[2]) * inx2[5] + ((uint128_t) in[3]) * inx2[4];
-    out[8] = ((uint128_t) in[0]) * inx2[8] +
-             ((uint128_t) in[1]) * inx2[7] +
-             ((uint128_t) in[2]) * inx2[6] +
-             ((uint128_t) in[3]) * inx2[5] + ((uint128_t) in[4]) * in[4];
+    out[0] = ((uint128_t)in[0]) * in[0];
+    out[1] = ((uint128_t)in[0]) * inx2[1];
+    out[2] = ((uint128_t)in[0]) * inx2[2] + ((uint128_t)in[1]) * in[1];
+    out[3] = ((uint128_t)in[0]) * inx2[3] + ((uint128_t)in[1]) * inx2[2];
+    out[4] = ((uint128_t)in[0]) * inx2[4] + ((uint128_t)in[1]) * inx2[3] + ((uint128_t)in[2]) * in[2];
+    out[5] = ((uint128_t)in[0]) * inx2[5] + ((uint128_t)in[1]) * inx2[4] + ((uint128_t)in[2]) * inx2[3];
+    out[6] = ((uint128_t)in[0]) * inx2[6] + ((uint128_t)in[1]) * inx2[5] + ((uint128_t)in[2]) * inx2[4] + ((uint128_t)in[3]) * in[3];
+    out[7] = ((uint128_t)in[0]) * inx2[7] + ((uint128_t)in[1]) * inx2[6] + ((uint128_t)in[2]) * inx2[5] + ((uint128_t)in[3]) * inx2[4];
+    out[8] = ((uint128_t)in[0]) * inx2[8] + ((uint128_t)in[1]) * inx2[7] + ((uint128_t)in[2]) * inx2[6] + ((uint128_t)in[3]) * inx2[5] + ((uint128_t)in[4]) * in[4];
 
     /*
      * The remaining limbs fall above 2^521, with the first falling at 2^522.
@@ -447,34 +436,28 @@ static void felem_square_ref(largefelem out, const felem in)
      */
 
     /* 9 */
-    out[0] += ((uint128_t) in[1]) * inx4[8] +
-              ((uint128_t) in[2]) * inx4[7] +
-              ((uint128_t) in[3]) * inx4[6] + ((uint128_t) in[4]) * inx4[5];
+    out[0] += ((uint128_t)in[1]) * inx4[8] + ((uint128_t)in[2]) * inx4[7] + ((uint128_t)in[3]) * inx4[6] + ((uint128_t)in[4]) * inx4[5];
 
     /* 10 */
-    out[1] += ((uint128_t) in[2]) * inx4[8] +
-              ((uint128_t) in[3]) * inx4[7] +
-              ((uint128_t) in[4]) * inx4[6] + ((uint128_t) in[5]) * inx2[5];
+    out[1] += ((uint128_t)in[2]) * inx4[8] + ((uint128_t)in[3]) * inx4[7] + ((uint128_t)in[4]) * inx4[6] + ((uint128_t)in[5]) * inx2[5];
 
     /* 11 */
-    out[2] += ((uint128_t) in[3]) * inx4[8] +
-              ((uint128_t) in[4]) * inx4[7] + ((uint128_t) in[5]) * inx4[6];
+    out[2] += ((uint128_t)in[3]) * inx4[8] + ((uint128_t)in[4]) * inx4[7] + ((uint128_t)in[5]) * inx4[6];
 
     /* 12 */
-    out[3] += ((uint128_t) in[4]) * inx4[8] +
-              ((uint128_t) in[5]) * inx4[7] + ((uint128_t) in[6]) * inx2[6];
+    out[3] += ((uint128_t)in[4]) * inx4[8] + ((uint128_t)in[5]) * inx4[7] + ((uint128_t)in[6]) * inx2[6];
 
     /* 13 */
-    out[4] += ((uint128_t) in[5]) * inx4[8] + ((uint128_t) in[6]) * inx4[7];
+    out[4] += ((uint128_t)in[5]) * inx4[8] + ((uint128_t)in[6]) * inx4[7];
 
     /* 14 */
-    out[5] += ((uint128_t) in[6]) * inx4[8] + ((uint128_t) in[7]) * inx2[7];
+    out[5] += ((uint128_t)in[6]) * inx4[8] + ((uint128_t)in[7]) * inx2[7];
 
     /* 15 */
-    out[6] += ((uint128_t) in[7]) * inx4[8];
+    out[6] += ((uint128_t)in[7]) * inx4[8];
 
     /* 16 */
-    out[7] += ((uint128_t) in[8]) * inx2[8];
+    out[7] += ((uint128_t)in[8]) * inx2[8];
 }
 
 /*-
@@ -490,105 +473,41 @@ static void felem_mul_ref(largefelem out, const felem in1, const felem in2)
     felem in2x2;
     felem_scalar(in2x2, in2, 2);
 
-    out[0] = ((uint128_t) in1[0]) * in2[0];
-
-    out[1] = ((uint128_t) in1[0]) * in2[1] +
-             ((uint128_t) in1[1]) * in2[0];
-
-    out[2] = ((uint128_t) in1[0]) * in2[2] +
-             ((uint128_t) in1[1]) * in2[1] +
-             ((uint128_t) in1[2]) * in2[0];
-
-    out[3] = ((uint128_t) in1[0]) * in2[3] +
-             ((uint128_t) in1[1]) * in2[2] +
-             ((uint128_t) in1[2]) * in2[1] +
-             ((uint128_t) in1[3]) * in2[0];
-
-    out[4] = ((uint128_t) in1[0]) * in2[4] +
-             ((uint128_t) in1[1]) * in2[3] +
-             ((uint128_t) in1[2]) * in2[2] +
-             ((uint128_t) in1[3]) * in2[1] +
-             ((uint128_t) in1[4]) * in2[0];
-
-    out[5] = ((uint128_t) in1[0]) * in2[5] +
-             ((uint128_t) in1[1]) * in2[4] +
-             ((uint128_t) in1[2]) * in2[3] +
-             ((uint128_t) in1[3]) * in2[2] +
-             ((uint128_t) in1[4]) * in2[1] +
-             ((uint128_t) in1[5]) * in2[0];
-
-    out[6] = ((uint128_t) in1[0]) * in2[6] +
-             ((uint128_t) in1[1]) * in2[5] +
-             ((uint128_t) in1[2]) * in2[4] +
-             ((uint128_t) in1[3]) * in2[3] +
-             ((uint128_t) in1[4]) * in2[2] +
-             ((uint128_t) in1[5]) * in2[1] +
-             ((uint128_t) in1[6]) * in2[0];
-
-    out[7] = ((uint128_t) in1[0]) * in2[7] +
-             ((uint128_t) in1[1]) * in2[6] +
-             ((uint128_t) in1[2]) * in2[5] +
-             ((uint128_t) in1[3]) * in2[4] +
-             ((uint128_t) in1[4]) * in2[3] +
-             ((uint128_t) in1[5]) * in2[2] +
-             ((uint128_t) in1[6]) * in2[1] +
-             ((uint128_t) in1[7]) * in2[0];
-
-    out[8] = ((uint128_t) in1[0]) * in2[8] +
-             ((uint128_t) in1[1]) * in2[7] +
-             ((uint128_t) in1[2]) * in2[6] +
-             ((uint128_t) in1[3]) * in2[5] +
-             ((uint128_t) in1[4]) * in2[4] +
-             ((uint128_t) in1[5]) * in2[3] +
-             ((uint128_t) in1[6]) * in2[2] +
-             ((uint128_t) in1[7]) * in2[1] +
-             ((uint128_t) in1[8]) * in2[0];
+    out[0] = ((uint128_t)in1[0]) * in2[0];
+
+    out[1] = ((uint128_t)in1[0]) * in2[1] + ((uint128_t)in1[1]) * in2[0];
+
+    out[2] = ((uint128_t)in1[0]) * in2[2] + ((uint128_t)in1[1]) * in2[1] + ((uint128_t)in1[2]) * in2[0];
+
+    out[3] = ((uint128_t)in1[0]) * in2[3] + ((uint128_t)in1[1]) * in2[2] + ((uint128_t)in1[2]) * in2[1] + ((uint128_t)in1[3]) * in2[0];
+
+    out[4] = ((uint128_t)in1[0]) * in2[4] + ((uint128_t)in1[1]) * in2[3] + ((uint128_t)in1[2]) * in2[2] + ((uint128_t)in1[3]) * in2[1] + ((uint128_t)in1[4]) * in2[0];
+
+    out[5] = ((uint128_t)in1[0]) * in2[5] + ((uint128_t)in1[1]) * in2[4] + ((uint128_t)in1[2]) * in2[3] + ((uint128_t)in1[3]) * in2[2] + ((uint128_t)in1[4]) * in2[1] + ((uint128_t)in1[5]) * in2[0];
+
+    out[6] = ((uint128_t)in1[0]) * in2[6] + ((uint128_t)in1[1]) * in2[5] + ((uint128_t)in1[2]) * in2[4] + ((uint128_t)in1[3]) * in2[3] + ((uint128_t)in1[4]) * in2[2] + ((uint128_t)in1[5]) * in2[1] + ((uint128_t)in1[6]) * in2[0];
+
+    out[7] = ((uint128_t)in1[0]) * in2[7] + ((uint128_t)in1[1]) * in2[6] + ((uint128_t)in1[2]) * in2[5] + ((uint128_t)in1[3]) * in2[4] + ((uint128_t)in1[4]) * in2[3] + ((uint128_t)in1[5]) * in2[2] + ((uint128_t)in1[6]) * in2[1] + ((uint128_t)in1[7]) * in2[0];
+
+    out[8] = ((uint128_t)in1[0]) * in2[8] + ((uint128_t)in1[1]) * in2[7] + ((uint128_t)in1[2]) * in2[6] + ((uint128_t)in1[3]) * in2[5] + ((uint128_t)in1[4]) * in2[4] + ((uint128_t)in1[5]) * in2[3] + ((uint128_t)in1[6]) * in2[2] + ((uint128_t)in1[7]) * in2[1] + ((uint128_t)in1[8]) * in2[0];
 
     /* See comment in felem_square about the use of in2x2 here */
 
-    out[0] += ((uint128_t) in1[1]) * in2x2[8] +
-              ((uint128_t) in1[2]) * in2x2[7] +
-              ((uint128_t) in1[3]) * in2x2[6] +
-              ((uint128_t) in1[4]) * in2x2[5] +
-              ((uint128_t) in1[5]) * in2x2[4] +
-              ((uint128_t) in1[6]) * in2x2[3] +
-              ((uint128_t) in1[7]) * in2x2[2] +
-              ((uint128_t) in1[8]) * in2x2[1];
-
-    out[1] += ((uint128_t) in1[2]) * in2x2[8] +
-              ((uint128_t) in1[3]) * in2x2[7] +
-              ((uint128_t) in1[4]) * in2x2[6] +
-              ((uint128_t) in1[5]) * in2x2[5] +
-              ((uint128_t) in1[6]) * in2x2[4] +
-              ((uint128_t) in1[7]) * in2x2[3] +
-              ((uint128_t) in1[8]) * in2x2[2];
-
-    out[2] += ((uint128_t) in1[3]) * in2x2[8] +
-              ((uint128_t) in1[4]) * in2x2[7] +
-              ((uint128_t) in1[5]) * in2x2[6] +
-              ((uint128_t) in1[6]) * in2x2[5] +
-              ((uint128_t) in1[7]) * in2x2[4] +
-              ((uint128_t) in1[8]) * in2x2[3];
-
-    out[3] += ((uint128_t) in1[4]) * in2x2[8] +
-              ((uint128_t) in1[5]) * in2x2[7] +
-              ((uint128_t) in1[6]) * in2x2[6] +
-              ((uint128_t) in1[7]) * in2x2[5] +
-              ((uint128_t) in1[8]) * in2x2[4];
-
-    out[4] += ((uint128_t) in1[5]) * in2x2[8] +
-              ((uint128_t) in1[6]) * in2x2[7] +
-              ((uint128_t) in1[7]) * in2x2[6] +
-              ((uint128_t) in1[8]) * in2x2[5];
-
-    out[5] += ((uint128_t) in1[6]) * in2x2[8] +
-              ((uint128_t) in1[7]) * in2x2[7] +
-              ((uint128_t) in1[8]) * in2x2[6];
-
-    out[6] += ((uint128_t) in1[7]) * in2x2[8] +
-              ((uint128_t) in1[8]) * in2x2[7];
-
-    out[7] += ((uint128_t) in1[8]) * in2x2[8];
+    out[0] += ((uint128_t)in1[1]) * in2x2[8] + ((uint128_t)in1[2]) * in2x2[7] + ((uint128_t)in1[3]) * in2x2[6] + ((uint128_t)in1[4]) * in2x2[5] + ((uint128_t)in1[5]) * in2x2[4] + ((uint128_t)in1[6]) * in2x2[3] + ((uint128_t)in1[7]) * in2x2[2] + ((uint128_t)in1[8]) * in2x2[1];
+
+    out[1] += ((uint128_t)in1[2]) * in2x2[8] + ((uint128_t)in1[3]) * in2x2[7] + ((uint128_t)in1[4]) * in2x2[6] + ((uint128_t)in1[5]) * in2x2[5] + ((uint128_t)in1[6]) * in2x2[4] + ((uint128_t)in1[7]) * in2x2[3] + ((uint128_t)in1[8]) * in2x2[2];
+
+    out[2] += ((uint128_t)in1[3]) * in2x2[8] + ((uint128_t)in1[4]) * in2x2[7] + ((uint128_t)in1[5]) * in2x2[6] + ((uint128_t)in1[6]) * in2x2[5] + ((uint128_t)in1[7]) * in2x2[4] + ((uint128_t)in1[8]) * in2x2[3];
+
+    out[3] += ((uint128_t)in1[4]) * in2x2[8] + ((uint128_t)in1[5]) * in2x2[7] + ((uint128_t)in1[6]) * in2x2[6] + ((uint128_t)in1[7]) * in2x2[5] + ((uint128_t)in1[8]) * in2x2[4];
+
+    out[4] += ((uint128_t)in1[5]) * in2x2[8] + ((uint128_t)in1[6]) * in2x2[7] + ((uint128_t)in1[7]) * in2x2[6] + ((uint128_t)in1[8]) * in2x2[5];
+
+    out[5] += ((uint128_t)in1[6]) * in2x2[8] + ((uint128_t)in1[7]) * in2x2[7] + ((uint128_t)in1[8]) * in2x2[6];
+
+    out[6] += ((uint128_t)in1[7]) * in2x2[8] + ((uint128_t)in1[8]) * in2x2[7];
+
+    out[7] += ((uint128_t)in1[8]) * in2x2[8];
 }
 
 static const limb bottom52bits = 0xfffffffffffff;
@@ -604,67 +523,67 @@ static void felem_reduce(felem out, const largefelem in)
 {
     u64 overflow1, overflow2;
 
-    out[0] = ((limb) in[0]) & bottom58bits;
-    out[1] = ((limb) in[1]) & bottom58bits;
-    out[2] = ((limb) in[2]) & bottom58bits;
-    out[3] = ((limb) in[3]) & bottom58bits;
-    out[4] = ((limb) in[4]) & bottom58bits;
-    out[5] = ((limb) in[5]) & bottom58bits;
-    out[6] = ((limb) in[6]) & bottom58bits;
-    out[7] = ((limb) in[7]) & bottom58bits;
-    out[8] = ((limb) in[8]) & bottom58bits;
+    out[0] = ((limb)in[0]) & bottom58bits;
+    out[1] = ((limb)in[1]) & bottom58bits;
+    out[2] = ((limb)in[2]) & bottom58bits;
+    out[3] = ((limb)in[3]) & bottom58bits;
+    out[4] = ((limb)in[4]) & bottom58bits;
+    out[5] = ((limb)in[5]) & bottom58bits;
+    out[6] = ((limb)in[6]) & bottom58bits;
+    out[7] = ((limb)in[7]) & bottom58bits;
+    out[8] = ((limb)in[8]) & bottom58bits;
 
     /* out[i] < 2^58 */
 
-    out[1] += ((limb) in[0]) >> 58;
-    out[1] += (((limb) (in[0] >> 64)) & bottom52bits) << 6;
+    out[1] += ((limb)in[0]) >> 58;
+    out[1] += (((limb)(in[0] >> 64)) & bottom52bits) << 6;
     /*-
      * out[1] < 2^58 + 2^6 + 2^58
      *        = 2^59 + 2^6
      */
-    out[2] += ((limb) (in[0] >> 64)) >> 52;
+    out[2] += ((limb)(in[0] >> 64)) >> 52;
 
-    out[2] += ((limb) in[1]) >> 58;
-    out[2] += (((limb) (in[1] >> 64)) & bottom52bits) << 6;
-    out[3] += ((limb) (in[1] >> 64)) >> 52;
+    out[2] += ((limb)in[1]) >> 58;
+    out[2] += (((limb)(in[1] >> 64)) & bottom52bits) << 6;
+    out[3] += ((limb)(in[1] >> 64)) >> 52;
 
-    out[3] += ((limb) in[2]) >> 58;
-    out[3] += (((limb) (in[2] >> 64)) & bottom52bits) << 6;
-    out[4] += ((limb) (in[2] >> 64)) >> 52;
+    out[3] += ((limb)in[2]) >> 58;
+    out[3] += (((limb)(in[2] >> 64)) & bottom52bits) << 6;
+    out[4] += ((limb)(in[2] >> 64)) >> 52;
 
-    out[4] += ((limb) in[3]) >> 58;
-    out[4] += (((limb) (in[3] >> 64)) & bottom52bits) << 6;
-    out[5] += ((limb) (in[3] >> 64)) >> 52;
+    out[4] += ((limb)in[3]) >> 58;
+    out[4] += (((limb)(in[3] >> 64)) & bottom52bits) << 6;
+    out[5] += ((limb)(in[3] >> 64)) >> 52;
 
-    out[5] += ((limb) in[4]) >> 58;
-    out[5] += (((limb) (in[4] >> 64)) & bottom52bits) << 6;
-    out[6] += ((limb) (in[4] >> 64)) >> 52;
+    out[5] += ((limb)in[4]) >> 58;
+    out[5] += (((limb)(in[4] >> 64)) & bottom52bits) << 6;
+    out[6] += ((limb)(in[4] >> 64)) >> 52;
 
-    out[6] += ((limb) in[5]) >> 58;
-    out[6] += (((limb) (in[5] >> 64)) & bottom52bits) << 6;
-    out[7] += ((limb) (in[5] >> 64)) >> 52;
+    out[6] += ((limb)in[5]) >> 58;
+    out[6] += (((limb)(in[5] >> 64)) & bottom52bits) << 6;
+    out[7] += ((limb)(in[5] >> 64)) >> 52;
 
-    out[7] += ((limb) in[6]) >> 58;
-    out[7] += (((limb) (in[6] >> 64)) & bottom52bits) << 6;
-    out[8] += ((limb) (in[6] >> 64)) >> 52;
+    out[7] += ((limb)in[6]) >> 58;
+    out[7] += (((limb)(in[6] >> 64)) & bottom52bits) << 6;
+    out[8] += ((limb)(in[6] >> 64)) >> 52;
 
-    out[8] += ((limb) in[7]) >> 58;
-    out[8] += (((limb) (in[7] >> 64)) & bottom52bits) << 6;
+    out[8] += ((limb)in[7]) >> 58;
+    out[8] += (((limb)(in[7] >> 64)) & bottom52bits) << 6;
     /*-
      * out[x > 1] < 2^58 + 2^6 + 2^58 + 2^12
      *            < 2^59 + 2^13
      */
-    overflow1 = ((limb) (in[7] >> 64)) >> 52;
+    overflow1 = ((limb)(in[7] >> 64)) >> 52;
 
-    overflow1 += ((limb) in[8]) >> 58;
-    overflow1 += (((limb) (in[8] >> 64)) & bottom52bits) << 6;
-    overflow2 = ((limb) (in[8] >> 64)) >> 52;
+    overflow1 += ((limb)in[8]) >> 58;
+    overflow1 += (((limb)(in[8] >> 64)) & bottom52bits) << 6;
+    overflow2 = ((limb)(in[8] >> 64)) >> 52;
 
-    overflow1 <<= 1;            /* overflow1 < 2^13 + 2^7 + 2^59 */
-    overflow2 <<= 1;            /* overflow2 < 2^13 */
+    overflow1 <<= 1; /* overflow1 < 2^13 + 2^7 + 2^59 */
+    overflow2 <<= 1; /* overflow2 < 2^13 */
 
-    out[0] += overflow1;        /* out[0] < 2^60 */
-    out[1] += overflow2;        /* out[1] < 2^59 + 2^6 + 2^13 */
+    out[0] += overflow1; /* out[0] < 2^60 */
+    out[1] += overflow2; /* out[1] < 2^59 + 2^6 + 2^13 */
 
     out[1] += out[0] >> 58;
     out[0] &= bottom58bits;
@@ -679,28 +598,26 @@ static void felem_reduce(felem out, const largefelem in)
 static void felem_square_wrapper(largefelem out, const felem in);
 static void felem_mul_wrapper(largefelem out, const felem in1, const felem in2);
 
-static void (*felem_square_p)(largefelem out, const felem in) =
-    felem_square_wrapper;
-static void (*felem_mul_p)(largefelem out, const felem in1, const felem in2) =
-    felem_mul_wrapper;
+static void (*felem_square_p)(largefelem out, const felem in) = felem_square_wrapper;
+static void (*felem_mul_p)(largefelem out, const felem in1, const felem in2) = felem_mul_wrapper;
 
 void p521_felem_square(largefelem out, const felem in);
 void p521_felem_mul(largefelem out, const felem in1, const felem in2);
 
-# if defined(_ARCH_PPC64)
-#  include "crypto/ppc_arch.h"
-# endif
+#if defined(_ARCH_PPC64)
+#include "crypto/ppc_arch.h"
+#endif
 
 static void felem_select(void)
 {
-# if defined(_ARCH_PPC64)
+#if defined(_ARCH_PPC64)
     if ((OPENSSL_ppccap_P & PPC_MADD300) && (OPENSSL_ppccap_P & PPC_ALTIVEC)) {
         felem_square_p = p521_felem_square;
         felem_mul_p = p521_felem_mul;
 
         return;
     }
-# endif
+#endif
 
     /* Default */
     felem_square_p = felem_square_ref;
@@ -719,11 +636,11 @@ static void felem_mul_wrapper(largefelem out, const felem in1, const felem in2)
     felem_mul_p(out, in1, in2);
 }
 
-# define felem_square felem_square_p
-# define felem_mul felem_mul_p
+#define felem_square felem_square_p
+#define felem_mul felem_mul_p
 #else
-# define felem_square felem_square_ref
-# define felem_mul felem_mul_ref
+#define felem_square felem_square_ref
+#define felem_mul felem_mul_ref
 #endif
 
 static void felem_square_reduce(felem out, const felem in)
@@ -755,39 +672,39 @@ static void felem_inv(felem out, const felem in)
     unsigned i;
 
     felem_square(tmp, in);
-    felem_reduce(ftmp, tmp);    /* 2^1 */
+    felem_reduce(ftmp, tmp); /* 2^1 */
     felem_mul(tmp, in, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^2 - 2^0 */
+    felem_reduce(ftmp, tmp); /* 2^2 - 2^0 */
     felem_assign(ftmp2, ftmp);
     felem_square(tmp, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^3 - 2^1 */
+    felem_reduce(ftmp, tmp); /* 2^3 - 2^1 */
     felem_mul(tmp, in, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^3 - 2^0 */
+    felem_reduce(ftmp, tmp); /* 2^3 - 2^0 */
     felem_square(tmp, ftmp);
-    felem_reduce(ftmp, tmp);    /* 2^4 - 2^1 */
+    felem_reduce(ftmp, tmp); /* 2^4 - 2^1 */
 
     felem_square(tmp, ftmp2);
-    felem_reduce(ftmp3, tmp);   /* 2^3 - 2^1 */
+    felem_reduce(ftmp3, tmp); /* 2^3 - 2^1 */
     felem_square(tmp, ftmp3);
-    felem_reduce(ftmp3, tmp);   /* 2^4 - 2^2 */
+    felem_reduce(ftmp3, tmp); /* 2^4 - 2^2 */
     felem_mul(tmp, ftmp3, ftmp2);
-    felem_reduce(ftmp3, tmp);   /* 2^4 - 2^0 */
+    felem_reduce(ftmp3, tmp); /* 2^4 - 2^0 */
 
     felem_assign(ftmp2, ftmp3);
     felem_square(tmp, ftmp3);
-    felem_reduce(ftmp3, tmp);   /* 2^5 - 2^1 */
+    felem_reduce(ftmp3, tmp); /* 2^5 - 2^1 */
     felem_square(tmp, ftmp3);
-    felem_reduce(ftmp3, tmp);   /* 2^6 - 2^2 */
+    felem_reduce(ftmp3, tmp); /* 2^6 - 2^2 */
     felem_square(tmp, ftmp3);
-    felem_reduce(ftmp3, tmp);   /* 2^7 - 2^3 */
+    felem_reduce(ftmp3, tmp); /* 2^7 - 2^3 */
     felem_square(tmp, ftmp3);
-    felem_reduce(ftmp3, tmp);   /* 2^8 - 2^4 */
+    felem_reduce(ftmp3, tmp); /* 2^8 - 2^4 */
     felem_mul(tmp, ftmp3, ftmp);
-    felem_reduce(ftmp4, tmp);   /* 2^8 - 2^1 */
+    felem_reduce(ftmp4, tmp); /* 2^8 - 2^1 */
     felem_square(tmp, ftmp4);
-    felem_reduce(ftmp4, tmp);   /* 2^9 - 2^2 */
+    felem_reduce(ftmp4, tmp); /* 2^9 - 2^2 */
     felem_mul(tmp, ftmp3, ftmp2);
-    felem_reduce(ftmp3, tmp);   /* 2^8 - 2^0 */
+    felem_reduce(ftmp3, tmp); /* 2^8 - 2^0 */
     felem_assign(ftmp2, ftmp3);
 
     for (i = 0; i < 8; i++) {
@@ -795,7 +712,7 @@ static void felem_inv(felem out, const felem in)
         felem_reduce(ftmp3, tmp); /* 2^16 - 2^8 */
     }
     felem_mul(tmp, ftmp3, ftmp2);
-    felem_reduce(ftmp3, tmp);   /* 2^16 - 2^0 */
+    felem_reduce(ftmp3, tmp); /* 2^16 - 2^0 */
     felem_assign(ftmp2, ftmp3);
 
     for (i = 0; i < 16; i++) {
@@ -803,7 +720,7 @@ static void felem_inv(felem out, const felem in)
         felem_reduce(ftmp3, tmp); /* 2^32 - 2^16 */
     }
     felem_mul(tmp, ftmp3, ftmp2);
-    felem_reduce(ftmp3, tmp);   /* 2^32 - 2^0 */
+    felem_reduce(ftmp3, tmp); /* 2^32 - 2^0 */
     felem_assign(ftmp2, ftmp3);
 
     for (i = 0; i < 32; i++) {
@@ -811,7 +728,7 @@ static void felem_inv(felem out, const felem in)
         felem_reduce(ftmp3, tmp); /* 2^64 - 2^32 */
     }
     felem_mul(tmp, ftmp3, ftmp2);
-    felem_reduce(ftmp3, tmp);   /* 2^64 - 2^0 */
+    felem_reduce(ftmp3, tmp); /* 2^64 - 2^0 */
     felem_assign(ftmp2, ftmp3);
 
     for (i = 0; i < 64; i++) {
@@ -819,7 +736,7 @@ static void felem_inv(felem out, const felem in)
         felem_reduce(ftmp3, tmp); /* 2^128 - 2^64 */
     }
     felem_mul(tmp, ftmp3, ftmp2);
-    felem_reduce(ftmp3, tmp);   /* 2^128 - 2^0 */
+    felem_reduce(ftmp3, tmp); /* 2^128 - 2^0 */
     felem_assign(ftmp2, ftmp3);
 
     for (i = 0; i < 128; i++) {
@@ -827,7 +744,7 @@ static void felem_inv(felem out, const felem in)
         felem_reduce(ftmp3, tmp); /* 2^256 - 2^128 */
     }
     felem_mul(tmp, ftmp3, ftmp2);
-    felem_reduce(ftmp3, tmp);   /* 2^256 - 2^0 */
+    felem_reduce(ftmp3, tmp); /* 2^256 - 2^0 */
     felem_assign(ftmp2, ftmp3);
 
     for (i = 0; i < 256; i++) {
@@ -835,16 +752,16 @@ static void felem_inv(felem out, const felem in)
         felem_reduce(ftmp3, tmp); /* 2^512 - 2^256 */
     }
     felem_mul(tmp, ftmp3, ftmp2);
-    felem_reduce(ftmp3, tmp);   /* 2^512 - 2^0 */
+    felem_reduce(ftmp3, tmp); /* 2^512 - 2^0 */
 
     for (i = 0; i < 9; i++) {
         felem_square(tmp, ftmp3);
         felem_reduce(ftmp3, tmp); /* 2^521 - 2^9 */
     }
     felem_mul(tmp, ftmp3, ftmp4);
-    felem_reduce(ftmp3, tmp);   /* 2^521 - 2^2 */
+    felem_reduce(ftmp3, tmp); /* 2^521 - 2^2 */
     felem_mul(tmp, ftmp3, in);
-    felem_reduce(out, tmp);     /* 2^521 - 3 */
+    felem_reduce(out, tmp); /* 2^521 - 3 */
 }
 
 /* This is 2^521-1, expressed as an felem */
@@ -930,7 +847,7 @@ static limb felem_is_zero(const felem in)
 
 static int felem_is_zero_int(const void *in)
 {
-    return (int)(felem_is_zero(in) & ((limb) 1));
+    return (int)(felem_is_zero(in) & ((limb)1));
 }
 
 /*-
@@ -941,7 +858,7 @@ static int felem_is_zero_int(const void *in)
 static void felem_contract(felem out, const felem in)
 {
     limb is_p, is_greater, sign;
-    static const limb two58 = ((limb) 1) << 58;
+    static const limb two58 = ((limb)1) << 58;
 
     felem_assign(out, in);
 
@@ -1085,7 +1002,7 @@ static void felem_contract(felem out, const felem in)
  * while x_out == y_in is not (maybe this works, but it's not tested). */
 static void
 point_double(felem x_out, felem y_out, felem z_out,
-             const felem x_in, const felem y_in, const felem z_in)
+    const felem x_in, const felem y_in, const felem z_in)
 {
     largefelem tmp, tmp2;
     felem delta, gamma, beta, alpha, ftmp, ftmp2;
@@ -1095,15 +1012,15 @@ point_double(felem x_out, felem y_out, felem z_out,
 
     /* delta = z^2 */
     felem_square(tmp, z_in);
-    felem_reduce(delta, tmp);   /* delta[i] < 2^59 + 2^14 */
+    felem_reduce(delta, tmp); /* delta[i] < 2^59 + 2^14 */
 
     /* gamma = y^2 */
     felem_square(tmp, y_in);
-    felem_reduce(gamma, tmp);   /* gamma[i] < 2^59 + 2^14 */
+    felem_reduce(gamma, tmp); /* gamma[i] < 2^59 + 2^14 */
 
     /* beta = x*gamma */
     felem_mul(tmp, x_in, gamma);
-    felem_reduce(beta, tmp);    /* beta[i] < 2^59 + 2^14 */
+    felem_reduce(beta, tmp); /* beta[i] < 2^59 + 2^14 */
 
     /* alpha = 3*(x-delta)*(x+delta) */
     felem_diff64(ftmp, delta);
@@ -1203,9 +1120,9 @@ static void copy_conditional(felem out, const felem in, limb mask)
  * on constant-time.
  */
 static void point_add(felem x3, felem y3, felem z3,
-                      const felem x1, const felem y1, const felem z1,
-                      const int mixed, const felem x2, const felem y2,
-                      const felem z2)
+    const felem x1, const felem y1, const felem z1,
+    const int mixed, const felem x2, const felem y2,
+    const felem z2)
 {
     felem ftmp, ftmp2, ftmp3, ftmp4, ftmp5, ftmp6, x_out, y_out, z_out;
     largefelem tmp, tmp2;
@@ -1373,11 +1290,11 @@ static void point_add(felem x3, felem y3, felem z3,
     felem_scalar128(tmp2, 2);
     /* tmp2[i] < 17*2^121 */
     felem_diff128(tmp, tmp2);
-        /*-
-         * tmp[i] < 2^127 - 2^69 + 17*2^122
-         *        = 2^126 - 2^122 - 2^6 - 2^2 - 1
-         *        < 2^127
-         */
+    /*-
+     * tmp[i] < 2^127 - 2^69 + 17*2^122
+     *        = 2^126 - 2^122 - 2^6 - 2^2 - 1
+     *        < 2^127
+     */
     felem_reduce(y_out, tmp);
 
     copy_conditional(x_out, x2, z1_is_zero);
@@ -1427,123 +1344,123 @@ static void point_add(felem x3, felem y3, felem z3,
 
 /* gmul is the table of precomputed base points */
 static const felem gmul[16][3] = {
-{{0, 0, 0, 0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x017e7e31c2e5bd66, 0x022cf0615a90a6fe, 0x00127a2ffa8de334,
-  0x01dfbf9d64a3f877, 0x006b4d3dbaa14b5e, 0x014fed487e0a2bd8,
-  0x015b4429c6481390, 0x03a73678fb2d988e, 0x00c6858e06b70404},
- {0x00be94769fd16650, 0x031c21a89cb09022, 0x039013fad0761353,
-  0x02657bd099031542, 0x03273e662c97ee72, 0x01e6d11a05ebef45,
-  0x03d1bd998f544495, 0x03001172297ed0b1, 0x011839296a789a3b},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x0373faacbc875bae, 0x00f325023721c671, 0x00f666fd3dbde5ad,
-  0x01a6932363f88ea7, 0x01fc6d9e13f9c47b, 0x03bcbffc2bbf734e,
-  0x013ee3c3647f3a92, 0x029409fefe75d07d, 0x00ef9199963d85e5},
- {0x011173743ad5b178, 0x02499c7c21bf7d46, 0x035beaeabb8b1a58,
-  0x00f989c4752ea0a3, 0x0101e1de48a9c1a3, 0x01a20076be28ba6c,
-  0x02f8052e5eb2de95, 0x01bfe8f82dea117c, 0x0160074d3c36ddb7},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x012f3fc373393b3b, 0x03d3d6172f1419fa, 0x02adc943c0b86873,
-  0x00d475584177952b, 0x012a4d1673750ee2, 0x00512517a0f13b0c,
-  0x02b184671a7b1734, 0x0315b84236f1a50a, 0x00a4afc472edbdb9},
- {0x00152a7077f385c4, 0x03044007d8d1c2ee, 0x0065829d61d52b52,
-  0x00494ff6b6631d0d, 0x00a11d94d5f06bcf, 0x02d2f89474d9282e,
-  0x0241c5727c06eeb9, 0x0386928710fbdb9d, 0x01f883f727b0dfbe},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x019b0c3c9185544d, 0x006243a37c9d97db, 0x02ee3cbe030a2ad2,
-  0x00cfdd946bb51e0d, 0x0271c00932606b91, 0x03f817d1ec68c561,
-  0x03f37009806a369c, 0x03c1f30baf184fd5, 0x01091022d6d2f065},
- {0x0292c583514c45ed, 0x0316fca51f9a286c, 0x00300af507c1489a,
-  0x0295f69008298cf1, 0x02c0ed8274943d7b, 0x016509b9b47a431e,
-  0x02bc9de9634868ce, 0x005b34929bffcb09, 0x000c1a0121681524},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x0286abc0292fb9f2, 0x02665eee9805b3f7, 0x01ed7455f17f26d6,
-  0x0346355b83175d13, 0x006284944cd0a097, 0x0191895bcdec5e51,
-  0x02e288370afda7d9, 0x03b22312bfefa67a, 0x01d104d3fc0613fe},
- {0x0092421a12f7e47f, 0x0077a83fa373c501, 0x03bd25c5f696bd0d,
-  0x035c41e4d5459761, 0x01ca0d1742b24f53, 0x00aaab27863a509c,
-  0x018b6de47df73917, 0x025c0b771705cd01, 0x01fd51d566d760a7},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x01dd92ff6b0d1dbd, 0x039c5e2e8f8afa69, 0x0261ed13242c3b27,
-  0x0382c6e67026e6a0, 0x01d60b10be2089f9, 0x03c15f3dce86723f,
-  0x03c764a32d2a062d, 0x017307eac0fad056, 0x018207c0b96c5256},
- {0x0196a16d60e13154, 0x03e6ce74c0267030, 0x00ddbf2b4e52a5aa,
-  0x012738241bbf31c8, 0x00ebe8dc04685a28, 0x024c2ad6d380d4a2,
-  0x035ee062a6e62d0e, 0x0029ed74af7d3a0f, 0x00eef32aec142ebd},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x00c31ec398993b39, 0x03a9f45bcda68253, 0x00ac733c24c70890,
-  0x00872b111401ff01, 0x01d178c23195eafb, 0x03bca2c816b87f74,
-  0x0261a9af46fbad7a, 0x0324b2a8dd3d28f9, 0x00918121d8f24e23},
- {0x032bc8c1ca983cd7, 0x00d869dfb08fc8c6, 0x01693cb61fce1516,
-  0x012a5ea68f4e88a8, 0x010869cab88d7ae3, 0x009081ad277ceee1,
-  0x033a77166d064cdc, 0x03955235a1fb3a95, 0x01251a4a9b25b65e},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x00148a3a1b27f40b, 0x0123186df1b31fdc, 0x00026e7beaad34ce,
-  0x01db446ac1d3dbba, 0x0299c1a33437eaec, 0x024540610183cbb7,
-  0x0173bb0e9ce92e46, 0x02b937e43921214b, 0x01ab0436a9bf01b5},
- {0x0383381640d46948, 0x008dacbf0e7f330f, 0x03602122bcc3f318,
-  0x01ee596b200620d6, 0x03bd0585fda430b3, 0x014aed77fd123a83,
-  0x005ace749e52f742, 0x0390fe041da2b842, 0x0189a8ceb3299242},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x012a19d6b3282473, 0x00c0915918b423ce, 0x023a954eb94405ae,
-  0x00529f692be26158, 0x0289fa1b6fa4b2aa, 0x0198ae4ceea346ef,
-  0x0047d8cdfbdedd49, 0x00cc8c8953f0f6b8, 0x001424abbff49203},
- {0x0256732a1115a03a, 0x0351bc38665c6733, 0x03f7b950fb4a6447,
-  0x000afffa94c22155, 0x025763d0a4dab540, 0x000511e92d4fc283,
-  0x030a7e9eda0ee96c, 0x004c3cd93a28bf0a, 0x017edb3a8719217f},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x011de5675a88e673, 0x031d7d0f5e567fbe, 0x0016b2062c970ae5,
-  0x03f4a2be49d90aa7, 0x03cef0bd13822866, 0x03f0923dcf774a6c,
-  0x0284bebc4f322f72, 0x016ab2645302bb2c, 0x01793f95dace0e2a},
- {0x010646e13527a28f, 0x01ca1babd59dc5e7, 0x01afedfd9a5595df,
-  0x01f15785212ea6b1, 0x0324e5d64f6ae3f4, 0x02d680f526d00645,
-  0x0127920fadf627a7, 0x03b383f75df4f684, 0x0089e0057e783b0a},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x00f334b9eb3c26c6, 0x0298fdaa98568dce, 0x01c2d24843a82292,
-  0x020bcb24fa1b0711, 0x02cbdb3d2b1875e6, 0x0014907598f89422,
-  0x03abe3aa43b26664, 0x02cbf47f720bc168, 0x0133b5e73014b79b},
- {0x034aab5dab05779d, 0x00cdc5d71fee9abb, 0x0399f16bd4bd9d30,
-  0x03582fa592d82647, 0x02be1cdfb775b0e9, 0x0034f7cea32e94cb,
-  0x0335a7f08f56f286, 0x03b707e9565d1c8b, 0x0015c946ea5b614f},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x024676f6cff72255, 0x00d14625cac96378, 0x00532b6008bc3767,
-  0x01fc16721b985322, 0x023355ea1b091668, 0x029de7afdc0317c3,
-  0x02fc8a7ca2da037c, 0x02de1217d74a6f30, 0x013f7173175b73bf},
- {0x0344913f441490b5, 0x0200f9e272b61eca, 0x0258a246b1dd55d2,
-  0x03753db9ea496f36, 0x025e02937a09c5ef, 0x030cbd3d14012692,
-  0x01793a67e70dc72a, 0x03ec1d37048a662e, 0x006550f700c32a8d},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x00d3f48a347eba27, 0x008e636649b61bd8, 0x00d3b93716778fb3,
-  0x004d1915757bd209, 0x019d5311a3da44e0, 0x016d1afcbbe6aade,
-  0x0241bf5f73265616, 0x0384672e5d50d39b, 0x005009fee522b684},
- {0x029b4fab064435fe, 0x018868ee095bbb07, 0x01ea3d6936cc92b8,
-  0x000608b00f78a2f3, 0x02db911073d1c20f, 0x018205938470100a,
-  0x01f1e4964cbe6ff2, 0x021a19a29eed4663, 0x01414485f42afa81},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x01612b3a17f63e34, 0x03813992885428e6, 0x022b3c215b5a9608,
-  0x029b4057e19f2fcb, 0x0384059a587af7e6, 0x02d6400ace6fe610,
-  0x029354d896e8e331, 0x00c047ee6dfba65e, 0x0037720542e9d49d},
- {0x02ce9eed7c5e9278, 0x0374ed703e79643b, 0x01316c54c4072006,
-  0x005aaa09054b2ee8, 0x002824000c840d57, 0x03d4eba24771ed86,
-  0x0189c50aabc3bdae, 0x0338c01541e15510, 0x00466d56e38eed42},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}},
-{{0x007efd8330ad8bd6, 0x02465ed48047710b, 0x0034c6606b215e0c,
-  0x016ae30c53cbf839, 0x01fa17bd37161216, 0x018ead4e61ce8ab9,
-  0x005482ed5f5dee46, 0x037543755bba1d7f, 0x005e5ac7e70a9d0f},
- {0x0117e1bb2fdcb2a2, 0x03deea36249f40c4, 0x028d09b4a6246cb7,
-  0x03524b8855bcf756, 0x023d7d109d5ceb58, 0x0178e43e3223ef9c,
-  0x0154536a0c6e966a, 0x037964d1286ee9fe, 0x0199bcd90e125055},
- {1, 0, 0, 0, 0, 0, 0, 0, 0}}
+    { { 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+        { 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+        { 0, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x017e7e31c2e5bd66, 0x022cf0615a90a6fe, 0x00127a2ffa8de334,
+          0x01dfbf9d64a3f877, 0x006b4d3dbaa14b5e, 0x014fed487e0a2bd8,
+          0x015b4429c6481390, 0x03a73678fb2d988e, 0x00c6858e06b70404 },
+        { 0x00be94769fd16650, 0x031c21a89cb09022, 0x039013fad0761353,
+            0x02657bd099031542, 0x03273e662c97ee72, 0x01e6d11a05ebef45,
+            0x03d1bd998f544495, 0x03001172297ed0b1, 0x011839296a789a3b },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x0373faacbc875bae, 0x00f325023721c671, 0x00f666fd3dbde5ad,
+          0x01a6932363f88ea7, 0x01fc6d9e13f9c47b, 0x03bcbffc2bbf734e,
+          0x013ee3c3647f3a92, 0x029409fefe75d07d, 0x00ef9199963d85e5 },
+        { 0x011173743ad5b178, 0x02499c7c21bf7d46, 0x035beaeabb8b1a58,
+            0x00f989c4752ea0a3, 0x0101e1de48a9c1a3, 0x01a20076be28ba6c,
+            0x02f8052e5eb2de95, 0x01bfe8f82dea117c, 0x0160074d3c36ddb7 },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x012f3fc373393b3b, 0x03d3d6172f1419fa, 0x02adc943c0b86873,
+          0x00d475584177952b, 0x012a4d1673750ee2, 0x00512517a0f13b0c,
+          0x02b184671a7b1734, 0x0315b84236f1a50a, 0x00a4afc472edbdb9 },
+        { 0x00152a7077f385c4, 0x03044007d8d1c2ee, 0x0065829d61d52b52,
+            0x00494ff6b6631d0d, 0x00a11d94d5f06bcf, 0x02d2f89474d9282e,
+            0x0241c5727c06eeb9, 0x0386928710fbdb9d, 0x01f883f727b0dfbe },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x019b0c3c9185544d, 0x006243a37c9d97db, 0x02ee3cbe030a2ad2,
+          0x00cfdd946bb51e0d, 0x0271c00932606b91, 0x03f817d1ec68c561,
+          0x03f37009806a369c, 0x03c1f30baf184fd5, 0x01091022d6d2f065 },
+        { 0x0292c583514c45ed, 0x0316fca51f9a286c, 0x00300af507c1489a,
+            0x0295f69008298cf1, 0x02c0ed8274943d7b, 0x016509b9b47a431e,
+            0x02bc9de9634868ce, 0x005b34929bffcb09, 0x000c1a0121681524 },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x0286abc0292fb9f2, 0x02665eee9805b3f7, 0x01ed7455f17f26d6,
+          0x0346355b83175d13, 0x006284944cd0a097, 0x0191895bcdec5e51,
+          0x02e288370afda7d9, 0x03b22312bfefa67a, 0x01d104d3fc0613fe },
+        { 0x0092421a12f7e47f, 0x0077a83fa373c501, 0x03bd25c5f696bd0d,
+            0x035c41e4d5459761, 0x01ca0d1742b24f53, 0x00aaab27863a509c,
+            0x018b6de47df73917, 0x025c0b771705cd01, 0x01fd51d566d760a7 },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x01dd92ff6b0d1dbd, 0x039c5e2e8f8afa69, 0x0261ed13242c3b27,
+          0x0382c6e67026e6a0, 0x01d60b10be2089f9, 0x03c15f3dce86723f,
+          0x03c764a32d2a062d, 0x017307eac0fad056, 0x018207c0b96c5256 },
+        { 0x0196a16d60e13154, 0x03e6ce74c0267030, 0x00ddbf2b4e52a5aa,
+            0x012738241bbf31c8, 0x00ebe8dc04685a28, 0x024c2ad6d380d4a2,
+            0x035ee062a6e62d0e, 0x0029ed74af7d3a0f, 0x00eef32aec142ebd },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x00c31ec398993b39, 0x03a9f45bcda68253, 0x00ac733c24c70890,
+          0x00872b111401ff01, 0x01d178c23195eafb, 0x03bca2c816b87f74,
+          0x0261a9af46fbad7a, 0x0324b2a8dd3d28f9, 0x00918121d8f24e23 },
+        { 0x032bc8c1ca983cd7, 0x00d869dfb08fc8c6, 0x01693cb61fce1516,
+            0x012a5ea68f4e88a8, 0x010869cab88d7ae3, 0x009081ad277ceee1,
+            0x033a77166d064cdc, 0x03955235a1fb3a95, 0x01251a4a9b25b65e },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x00148a3a1b27f40b, 0x0123186df1b31fdc, 0x00026e7beaad34ce,
+          0x01db446ac1d3dbba, 0x0299c1a33437eaec, 0x024540610183cbb7,
+          0x0173bb0e9ce92e46, 0x02b937e43921214b, 0x01ab0436a9bf01b5 },
+        { 0x0383381640d46948, 0x008dacbf0e7f330f, 0x03602122bcc3f318,
+            0x01ee596b200620d6, 0x03bd0585fda430b3, 0x014aed77fd123a83,
+            0x005ace749e52f742, 0x0390fe041da2b842, 0x0189a8ceb3299242 },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x012a19d6b3282473, 0x00c0915918b423ce, 0x023a954eb94405ae,
+          0x00529f692be26158, 0x0289fa1b6fa4b2aa, 0x0198ae4ceea346ef,
+          0x0047d8cdfbdedd49, 0x00cc8c8953f0f6b8, 0x001424abbff49203 },
+        { 0x0256732a1115a03a, 0x0351bc38665c6733, 0x03f7b950fb4a6447,
+            0x000afffa94c22155, 0x025763d0a4dab540, 0x000511e92d4fc283,
+            0x030a7e9eda0ee96c, 0x004c3cd93a28bf0a, 0x017edb3a8719217f },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x011de5675a88e673, 0x031d7d0f5e567fbe, 0x0016b2062c970ae5,
+          0x03f4a2be49d90aa7, 0x03cef0bd13822866, 0x03f0923dcf774a6c,
+          0x0284bebc4f322f72, 0x016ab2645302bb2c, 0x01793f95dace0e2a },
+        { 0x010646e13527a28f, 0x01ca1babd59dc5e7, 0x01afedfd9a5595df,
+            0x01f15785212ea6b1, 0x0324e5d64f6ae3f4, 0x02d680f526d00645,
+            0x0127920fadf627a7, 0x03b383f75df4f684, 0x0089e0057e783b0a },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x00f334b9eb3c26c6, 0x0298fdaa98568dce, 0x01c2d24843a82292,
+          0x020bcb24fa1b0711, 0x02cbdb3d2b1875e6, 0x0014907598f89422,
+          0x03abe3aa43b26664, 0x02cbf47f720bc168, 0x0133b5e73014b79b },
+        { 0x034aab5dab05779d, 0x00cdc5d71fee9abb, 0x0399f16bd4bd9d30,
+            0x03582fa592d82647, 0x02be1cdfb775b0e9, 0x0034f7cea32e94cb,
+            0x0335a7f08f56f286, 0x03b707e9565d1c8b, 0x0015c946ea5b614f },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x024676f6cff72255, 0x00d14625cac96378, 0x00532b6008bc3767,
+          0x01fc16721b985322, 0x023355ea1b091668, 0x029de7afdc0317c3,
+          0x02fc8a7ca2da037c, 0x02de1217d74a6f30, 0x013f7173175b73bf },
+        { 0x0344913f441490b5, 0x0200f9e272b61eca, 0x0258a246b1dd55d2,
+            0x03753db9ea496f36, 0x025e02937a09c5ef, 0x030cbd3d14012692,
+            0x01793a67e70dc72a, 0x03ec1d37048a662e, 0x006550f700c32a8d },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x00d3f48a347eba27, 0x008e636649b61bd8, 0x00d3b93716778fb3,
+          0x004d1915757bd209, 0x019d5311a3da44e0, 0x016d1afcbbe6aade,
+          0x0241bf5f73265616, 0x0384672e5d50d39b, 0x005009fee522b684 },
+        { 0x029b4fab064435fe, 0x018868ee095bbb07, 0x01ea3d6936cc92b8,
+            0x000608b00f78a2f3, 0x02db911073d1c20f, 0x018205938470100a,
+            0x01f1e4964cbe6ff2, 0x021a19a29eed4663, 0x01414485f42afa81 },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x01612b3a17f63e34, 0x03813992885428e6, 0x022b3c215b5a9608,
+          0x029b4057e19f2fcb, 0x0384059a587af7e6, 0x02d6400ace6fe610,
+          0x029354d896e8e331, 0x00c047ee6dfba65e, 0x0037720542e9d49d },
+        { 0x02ce9eed7c5e9278, 0x0374ed703e79643b, 0x01316c54c4072006,
+            0x005aaa09054b2ee8, 0x002824000c840d57, 0x03d4eba24771ed86,
+            0x0189c50aabc3bdae, 0x0338c01541e15510, 0x00466d56e38eed42 },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } },
+    { { 0x007efd8330ad8bd6, 0x02465ed48047710b, 0x0034c6606b215e0c,
+          0x016ae30c53cbf839, 0x01fa17bd37161216, 0x018ead4e61ce8ab9,
+          0x005482ed5f5dee46, 0x037543755bba1d7f, 0x005e5ac7e70a9d0f },
+        { 0x0117e1bb2fdcb2a2, 0x03deea36249f40c4, 0x028d09b4a6246cb7,
+            0x03524b8855bcf756, 0x023d7d109d5ceb58, 0x0178e43e3223ef9c,
+            0x0154536a0c6e966a, 0x037964d1286ee9fe, 0x0199bcd90e125055 },
+        { 1, 0, 0, 0, 0, 0, 0, 0, 0 } }
 };
 
 /*
  * select_point selects the |idx|th point from a precomputation table and
  * copies it to out.
  */
- /* pre_comp below is of the size provided in |size| */
+/* pre_comp below is of the size provided in |size| */
 static void select_point(const limb idx, unsigned int size,
-                         const felem pre_comp[][3], felem out[3])
+    const felem pre_comp[][3], felem out[3])
 {
     unsigned i, j;
     limb *outlimbs = &out[0][0];
@@ -1579,10 +1496,10 @@ static char get_bit(const felem_bytearray in, int i)
  * Output point (X, Y, Z) is stored in x_out, y_out, z_out
  */
 static void batch_mul(felem x_out, felem y_out, felem z_out,
-                      const felem_bytearray scalars[],
-                      const unsigned num_points, const u8 *g_scalar,
-                      const int mixed, const felem pre_comp[][17][3],
-                      const felem g_pre_comp[16][3])
+    const felem_bytearray scalars[],
+    const unsigned num_points, const u8 *g_scalar,
+    const int mixed, const felem pre_comp[][17][3],
+    const felem g_pre_comp[16][3])
 {
     int i, skip;
     unsigned num, gen_mul = (g_scalar != NULL);
@@ -1598,8 +1515,8 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
      * of the generator (last quarter of rounds) and additions of other
      * points multiples (every 5th round).
      */
-    skip = 1;                   /* save two point operations in the first
-                                 * round */
+    skip = 1; /* save two point operations in the first
+               * round */
     for (i = (num_points ? 520 : 130); i >= 0; --i) {
         /* double */
         if (!skip)
@@ -1618,7 +1535,7 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
             if (!skip) {
                 /* The 1 argument below is for "mixed" */
                 point_add(nq[0], nq[1], nq[2],
-                          nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
+                    nq[0], nq[1], nq[2], 1, tmp[0], tmp[1], tmp[2]);
             } else {
                 memcpy(nq, tmp, 3 * sizeof(felem));
                 skip = 0;
@@ -1643,12 +1560,12 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
                 select_point(digit, 17, pre_comp[num], tmp);
                 felem_neg(tmp[3], tmp[1]); /* (X, -Y, Z) is the negative
                                             * point */
-                copy_conditional(tmp[1], tmp[3], (-(limb) sign));
+                copy_conditional(tmp[1], tmp[3], (-(limb)sign));
 
                 if (!skip) {
                     point_add(nq[0], nq[1], nq[2],
-                              nq[0], nq[1], nq[2],
-                              mixed, tmp[0], tmp[1], tmp[2]);
+                        nq[0], nq[1], nq[2],
+                        mixed, tmp[0], tmp[1], tmp[2]);
                 } else {
                     memcpy(nq, tmp, 3 * sizeof(felem));
                     skip = 0;
@@ -1688,9 +1605,9 @@ const EC_METHOD *EC_GFp_nistp521_method(void)
         ossl_ec_GFp_simple_point_set_to_infinity,
         ossl_ec_GFp_simple_point_set_affine_coordinates,
         ossl_ec_GFp_nistp521_point_get_affine_coordinates,
-        0 /* point_set_compressed_coordinates */ ,
-        0 /* point2oct */ ,
-        0 /* oct2point */ ,
+        0 /* point_set_compressed_coordinates */,
+        0 /* point2oct */,
+        0 /* oct2point */,
         ossl_ec_GFp_simple_add,
         ossl_ec_GFp_simple_dbl,
         ossl_ec_GFp_simple_invert,
@@ -1704,11 +1621,11 @@ const EC_METHOD *EC_GFp_nistp521_method(void)
         ossl_ec_GFp_nistp521_have_precompute_mult,
         ossl_ec_GFp_nist_field_mul,
         ossl_ec_GFp_nist_field_sqr,
-        0 /* field_div */ ,
+        0 /* field_div */,
         ossl_ec_GFp_simple_field_inv,
-        0 /* field_encode */ ,
-        0 /* field_decode */ ,
-        0,                      /* field_set_to_one */
+        0 /* field_encode */,
+        0 /* field_decode */,
+        0, /* field_set_to_one */
         ossl_ec_key_simple_priv2oct,
         ossl_ec_key_simple_oct2priv,
         0, /* set private */
@@ -1725,7 +1642,7 @@ const EC_METHOD *EC_GFp_nistp521_method(void)
         0, /* blind_coordinates */
         0, /* ladder_pre */
         0, /* ladder_step */
-        0  /* ladder_post */
+        0 /* ladder_post */
     };
 
     return &ret;
@@ -1789,8 +1706,8 @@ int ossl_ec_GFp_nistp521_group_init(EC_GROUP *group)
 }
 
 int ossl_ec_GFp_nistp521_group_set_curve(EC_GROUP *group, const BIGNUM *p,
-                                         const BIGNUM *a, const BIGNUM *b,
-                                         BN_CTX *ctx)
+    const BIGNUM *a, const BIGNUM *b,
+    BN_CTX *ctx)
 {
     int ret = 0;
     BIGNUM *curve_p, *curve_a, *curve_b;
@@ -1818,7 +1735,7 @@ int ossl_ec_GFp_nistp521_group_set_curve(EC_GROUP *group, const BIGNUM *p,
     }
     group->field_mod_func = BN_nist_mod_521;
     ret = ossl_ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
- err:
+err:
     BN_CTX_end(ctx);
 #ifndef FIPS_MODULE
     BN_CTX_free(new_ctx);
@@ -1831,9 +1748,9 @@ int ossl_ec_GFp_nistp521_group_set_curve(EC_GROUP *group, const BIGNUM *p,
  * (X/Z^2, Y/Z^3)
  */
 int ossl_ec_GFp_nistp521_point_get_affine_coordinates(const EC_GROUP *group,
-                                                      const EC_POINT *point,
-                                                      BIGNUM *x, BIGNUM *y,
-                                                      BN_CTX *ctx)
+    const EC_POINT *point,
+    BIGNUM *x, BIGNUM *y,
+    BN_CTX *ctx)
 {
     felem z1, z2, x_in, y_in, x_out, y_out;
     largefelem tmp;
@@ -1842,8 +1759,7 @@ int ossl_ec_GFp_nistp521_point_get_affine_coordinates(const EC_GROUP *group,
         ERR_raise(ERR_LIB_EC, EC_R_POINT_AT_INFINITY);
         return 0;
     }
-    if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) ||
-        (!BN_to_felem(z1, point->Z)))
+    if ((!BN_to_felem(x_in, point->X)) || (!BN_to_felem(y_in, point->Y)) || (!BN_to_felem(z1, point->Z)))
         return 0;
     felem_inv(z2, z1);
     felem_square(tmp, z2);
@@ -1873,32 +1789,32 @@ int ossl_ec_GFp_nistp521_point_get_affine_coordinates(const EC_GROUP *group,
 
 /* points below is of size |num|, and tmp_felems is of size |num+1/ */
 static void make_points_affine(size_t num, felem points[][3],
-                               felem tmp_felems[])
+    felem tmp_felems[])
 {
     /*
      * Runs in constant time, unless an input is the point at infinity (which
      * normally shouldn't happen).
      */
     ossl_ec_GFp_nistp_points_make_affine_internal(num,
-                                                  points,
-                                                  sizeof(felem),
-                                                  tmp_felems,
-                                                  (void (*)(void *))felem_one,
-                                                  felem_is_zero_int,
-                                                  (void (*)(void *, const void *))
-                                                  felem_assign,
-                                                  (void (*)(void *, const void *))
-                                                  felem_square_reduce, (void (*)
-                                                                        (void *,
-                                                                         const void
-                                                                         *,
-                                                                         const void
-                                                                         *))
-                                                  felem_mul_reduce,
-                                                  (void (*)(void *, const void *))
-                                                  felem_inv,
-                                                  (void (*)(void *, const void *))
-                                                  felem_contract);
+        points,
+        sizeof(felem),
+        tmp_felems,
+        (void (*)(void *))felem_one,
+        felem_is_zero_int,
+        (void (*)(void *, const void *))
+            felem_assign,
+        (void (*)(void *, const void *))
+            felem_square_reduce,
+        (void (*)(void *,
+            const void
+                *,
+            const void
+                *))
+            felem_mul_reduce,
+        (void (*)(void *, const void *))
+            felem_inv,
+        (void (*)(void *, const void *))
+            felem_contract);
 }
 
 /*
@@ -1906,9 +1822,9 @@ static void make_points_affine(size_t num, felem points[][3],
  * values Result is stored in r (r can equal one of the inputs).
  */
 int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
-                                    const BIGNUM *scalar, size_t num,
-                                    const EC_POINT *points[],
-                                    const BIGNUM *scalars[], BN_CTX *ctx)
+    const BIGNUM *scalar, size_t num,
+    const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *ctx)
 {
     int ret = 0;
     int j;
@@ -1916,7 +1832,7 @@ int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
     BIGNUM *x, *y, *z, *tmp_scalar;
     felem_bytearray g_secret;
     felem_bytearray *secrets = NULL;
-    felem (*pre_comp)[17][3] = NULL;
+    felem(*pre_comp)[17][3] = NULL;
     felem *tmp_felems = NULL;
     unsigned i;
     int num_bytes;
@@ -1944,20 +1860,18 @@ int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
             g_pre_comp = &pre->g_pre_comp[0];
         else
             /* try to use the standard precomputation */
-            g_pre_comp = (felem(*)[3]) gmul;
+            g_pre_comp = (felem(*)[3])gmul;
         generator = EC_POINT_new(group);
         if (generator == NULL)
             goto err;
         /* get the generator from precomputation */
-        if (!felem_to_BN(x, g_pre_comp[1][0]) ||
-            !felem_to_BN(y, g_pre_comp[1][1]) ||
-            !felem_to_BN(z, g_pre_comp[1][2])) {
+        if (!felem_to_BN(x, g_pre_comp[1][0]) || !felem_to_BN(y, g_pre_comp[1][1]) || !felem_to_BN(z, g_pre_comp[1][2])) {
             ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
             goto err;
         }
         if (!ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group,
-                                                                generator,
-                                                                x, y, z, ctx))
+                generator,
+                x, y, z, ctx))
             goto err;
         if (0 == EC_POINT_cmp(group, generator, group->generator, ctx))
             /* precomputation matches generator */
@@ -1981,8 +1895,7 @@ int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
         secrets = OPENSSL_zalloc(sizeof(*secrets) * num_points);
         pre_comp = OPENSSL_zalloc(sizeof(*pre_comp) * num_points);
         if (mixed)
-            tmp_felems =
-                OPENSSL_malloc(sizeof(*tmp_felems) * (num_points * 17 + 1));
+            tmp_felems = OPENSSL_malloc(sizeof(*tmp_felems) * (num_points * 17 + 1));
         if ((secrets == NULL) || (pre_comp == NULL)
             || (mixed && (tmp_felems == NULL)))
             goto err;
@@ -2017,19 +1930,17 @@ int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
                         goto err;
                     }
                     num_bytes = BN_bn2lebinpad(tmp_scalar,
-                                               secrets[i], sizeof(secrets[i]));
+                        secrets[i], sizeof(secrets[i]));
                 } else {
                     num_bytes = BN_bn2lebinpad(p_scalar,
-                                               secrets[i], sizeof(secrets[i]));
+                        secrets[i], sizeof(secrets[i]));
                 }
                 if (num_bytes < 0) {
                     ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
                     goto err;
                 }
                 /* precompute multiples */
-                if ((!BN_to_felem(x_out, p->X)) ||
-                    (!BN_to_felem(y_out, p->Y)) ||
-                    (!BN_to_felem(z_out, p->Z)))
+                if ((!BN_to_felem(x_out, p->X)) || (!BN_to_felem(y_out, p->Y)) || (!BN_to_felem(z_out, p->Z)))
                     goto err;
                 memcpy(pre_comp[i][1][0], x_out, sizeof(felem));
                 memcpy(pre_comp[i][1][1], y_out, sizeof(felem));
@@ -2037,16 +1948,16 @@ int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
                 for (j = 2; j <= 16; ++j) {
                     if (j & 1) {
                         point_add(pre_comp[i][j][0], pre_comp[i][j][1],
-                                  pre_comp[i][j][2], pre_comp[i][1][0],
-                                  pre_comp[i][1][1], pre_comp[i][1][2], 0,
-                                  pre_comp[i][j - 1][0],
-                                  pre_comp[i][j - 1][1],
-                                  pre_comp[i][j - 1][2]);
+                            pre_comp[i][j][2], pre_comp[i][1][0],
+                            pre_comp[i][1][1], pre_comp[i][1][2], 0,
+                            pre_comp[i][j - 1][0],
+                            pre_comp[i][j - 1][1],
+                            pre_comp[i][j - 1][2]);
                     } else {
                         point_double(pre_comp[i][j][0], pre_comp[i][j][1],
-                                     pre_comp[i][j][2], pre_comp[i][j / 2][0],
-                                     pre_comp[i][j / 2][1],
-                                     pre_comp[i][j / 2][2]);
+                            pre_comp[i][j][2], pre_comp[i][j / 2][0],
+                            pre_comp[i][j / 2][1],
+                            pre_comp[i][j / 2][2]);
                     }
                 }
             }
@@ -2074,29 +1985,28 @@ int ossl_ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r,
         }
         /* do the multiplication with generator precomputation */
         batch_mul(x_out, y_out, z_out,
-                  (const felem_bytearray(*))secrets, num_points,
-                  g_secret,
-                  mixed, (const felem(*)[17][3])pre_comp,
-                  (const felem(*)[3])g_pre_comp);
+            (const felem_bytearray(*))secrets, num_points,
+            g_secret,
+            mixed, (const felem(*)[17][3])pre_comp,
+            (const felem(*)[3])g_pre_comp);
     } else {
         /* do the multiplication without generator precomputation */
         batch_mul(x_out, y_out, z_out,
-                  (const felem_bytearray(*))secrets, num_points,
-                  NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
+            (const felem_bytearray(*))secrets, num_points,
+            NULL, mixed, (const felem(*)[17][3])pre_comp, NULL);
     }
     /* reduce the output to its unique minimal representation */
     felem_contract(x_in, x_out);
     felem_contract(y_in, y_out);
     felem_contract(z_in, z_out);
-    if ((!felem_to_BN(x, x_in)) || (!felem_to_BN(y, y_in)) ||
-        (!felem_to_BN(z, z_in))) {
+    if ((!felem_to_BN(x, x_in)) || (!felem_to_BN(y, y_in)) || (!felem_to_BN(z, z_in))) {
         ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
         goto err;
     }
     ret = ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(group, r, x, y, z,
-                                                             ctx);
+        ctx);
 
- err:
+err:
     BN_CTX_end(ctx);
     EC_POINT_free(generator);
     OPENSSL_free(secrets);
@@ -2151,22 +2061,20 @@ int ossl_ec_GFp_nistp521_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
         memcpy(pre->g_pre_comp, gmul, sizeof(pre->g_pre_comp));
         goto done;
     }
-    if ((!BN_to_felem(pre->g_pre_comp[1][0], group->generator->X)) ||
-        (!BN_to_felem(pre->g_pre_comp[1][1], group->generator->Y)) ||
-        (!BN_to_felem(pre->g_pre_comp[1][2], group->generator->Z)))
+    if ((!BN_to_felem(pre->g_pre_comp[1][0], group->generator->X)) || (!BN_to_felem(pre->g_pre_comp[1][1], group->generator->Y)) || (!BN_to_felem(pre->g_pre_comp[1][2], group->generator->Z)))
         goto err;
     /* compute 2^130*G, 2^260*G, 2^390*G */
     for (i = 1; i <= 4; i <<= 1) {
         point_double(pre->g_pre_comp[2 * i][0], pre->g_pre_comp[2 * i][1],
-                     pre->g_pre_comp[2 * i][2], pre->g_pre_comp[i][0],
-                     pre->g_pre_comp[i][1], pre->g_pre_comp[i][2]);
+            pre->g_pre_comp[2 * i][2], pre->g_pre_comp[i][0],
+            pre->g_pre_comp[i][1], pre->g_pre_comp[i][2]);
         for (j = 0; j < 129; ++j) {
             point_double(pre->g_pre_comp[2 * i][0],
-                         pre->g_pre_comp[2 * i][1],
-                         pre->g_pre_comp[2 * i][2],
-                         pre->g_pre_comp[2 * i][0],
-                         pre->g_pre_comp[2 * i][1],
-                         pre->g_pre_comp[2 * i][2]);
+                pre->g_pre_comp[2 * i][1],
+                pre->g_pre_comp[2 * i][2],
+                pre->g_pre_comp[2 * i][0],
+                pre->g_pre_comp[2 * i][1],
+                pre->g_pre_comp[2 * i][2]);
         }
     }
     /* g_pre_comp[0] is the point at infinity */
@@ -2174,44 +2082,44 @@ int ossl_ec_GFp_nistp521_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
     /* the remaining multiples */
     /* 2^130*G + 2^260*G */
     point_add(pre->g_pre_comp[6][0], pre->g_pre_comp[6][1],
-              pre->g_pre_comp[6][2], pre->g_pre_comp[4][0],
-              pre->g_pre_comp[4][1], pre->g_pre_comp[4][2],
-              0, pre->g_pre_comp[2][0], pre->g_pre_comp[2][1],
-              pre->g_pre_comp[2][2]);
+        pre->g_pre_comp[6][2], pre->g_pre_comp[4][0],
+        pre->g_pre_comp[4][1], pre->g_pre_comp[4][2],
+        0, pre->g_pre_comp[2][0], pre->g_pre_comp[2][1],
+        pre->g_pre_comp[2][2]);
     /* 2^130*G + 2^390*G */
     point_add(pre->g_pre_comp[10][0], pre->g_pre_comp[10][1],
-              pre->g_pre_comp[10][2], pre->g_pre_comp[8][0],
-              pre->g_pre_comp[8][1], pre->g_pre_comp[8][2],
-              0, pre->g_pre_comp[2][0], pre->g_pre_comp[2][1],
-              pre->g_pre_comp[2][2]);
+        pre->g_pre_comp[10][2], pre->g_pre_comp[8][0],
+        pre->g_pre_comp[8][1], pre->g_pre_comp[8][2],
+        0, pre->g_pre_comp[2][0], pre->g_pre_comp[2][1],
+        pre->g_pre_comp[2][2]);
     /* 2^260*G + 2^390*G */
     point_add(pre->g_pre_comp[12][0], pre->g_pre_comp[12][1],
-              pre->g_pre_comp[12][2], pre->g_pre_comp[8][0],
-              pre->g_pre_comp[8][1], pre->g_pre_comp[8][2],
-              0, pre->g_pre_comp[4][0], pre->g_pre_comp[4][1],
-              pre->g_pre_comp[4][2]);
+        pre->g_pre_comp[12][2], pre->g_pre_comp[8][0],
+        pre->g_pre_comp[8][1], pre->g_pre_comp[8][2],
+        0, pre->g_pre_comp[4][0], pre->g_pre_comp[4][1],
+        pre->g_pre_comp[4][2]);
     /* 2^130*G + 2^260*G + 2^390*G */
     point_add(pre->g_pre_comp[14][0], pre->g_pre_comp[14][1],
-              pre->g_pre_comp[14][2], pre->g_pre_comp[12][0],
-              pre->g_pre_comp[12][1], pre->g_pre_comp[12][2],
-              0, pre->g_pre_comp[2][0], pre->g_pre_comp[2][1],
-              pre->g_pre_comp[2][2]);
+        pre->g_pre_comp[14][2], pre->g_pre_comp[12][0],
+        pre->g_pre_comp[12][1], pre->g_pre_comp[12][2],
+        0, pre->g_pre_comp[2][0], pre->g_pre_comp[2][1],
+        pre->g_pre_comp[2][2]);
     for (i = 1; i < 8; ++i) {
         /* odd multiples: add G */
         point_add(pre->g_pre_comp[2 * i + 1][0],
-                  pre->g_pre_comp[2 * i + 1][1],
-                  pre->g_pre_comp[2 * i + 1][2], pre->g_pre_comp[2 * i][0],
-                  pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2], 0,
-                  pre->g_pre_comp[1][0], pre->g_pre_comp[1][1],
-                  pre->g_pre_comp[1][2]);
+            pre->g_pre_comp[2 * i + 1][1],
+            pre->g_pre_comp[2 * i + 1][2], pre->g_pre_comp[2 * i][0],
+            pre->g_pre_comp[2 * i][1], pre->g_pre_comp[2 * i][2], 0,
+            pre->g_pre_comp[1][0], pre->g_pre_comp[1][1],
+            pre->g_pre_comp[1][2]);
     }
     make_points_affine(15, &(pre->g_pre_comp[1]), tmp_felems);
 
- done:
+done:
     SETPRECOMP(group, nistp521, pre);
     ret = 1;
     pre = NULL;
- err:
+err:
     BN_CTX_end(ctx);
     EC_POINT_free(generator);
 #ifndef FIPS_MODULE
diff --git a/crypto/ec/ecp_nistputil.c b/crypto/ec/ecp_nistputil.c
index 4e8c0e2767699..1d7ab55abaa61 100644
--- a/crypto/ec/ecp_nistputil.c
+++ b/crypto/ec/ecp_nistputil.c
@@ -49,39 +49,37 @@
  * of size 'felem_size'. tmp_felems needs to point to a temporary array of
  * 'num'+1 field elements for storage of intermediate values.
  */
-void
-ossl_ec_GFp_nistp_points_make_affine_internal(size_t num, void *point_array,
-                                              size_t felem_size,
-                                              void *tmp_felems,
-                                              void (*felem_one) (void *out),
-                                              int (*felem_is_zero) (const void
-                                                                    *in),
-                                              void (*felem_assign) (void *out,
-                                                                    const void
-                                                                    *in),
-                                              void (*felem_square) (void *out,
-                                                                    const void
-                                                                    *in),
-                                              void (*felem_mul) (void *out,
-                                                                 const void
-                                                                 *in1,
-                                                                 const void
-                                                                 *in2),
-                                              void (*felem_inv) (void *out,
-                                                                 const void
-                                                                 *in),
-                                              void (*felem_contract) (void
-                                                                      *out,
-                                                                      const
-                                                                      void
-                                                                      *in))
+void ossl_ec_GFp_nistp_points_make_affine_internal(size_t num, void *point_array,
+    size_t felem_size,
+    void *tmp_felems,
+    void (*felem_one)(void *out),
+    int (*felem_is_zero)(const void
+            *in),
+    void (*felem_assign)(void *out,
+        const void
+            *in),
+    void (*felem_square)(void *out,
+        const void
+            *in),
+    void (*felem_mul)(void *out,
+        const void
+            *in1,
+        const void
+            *in2),
+    void (*felem_inv)(void *out,
+        const void
+            *in),
+    void (*felem_contract)(void
+                               *out,
+        const void
+            *in))
 {
     int i = 0;
 
 #define tmp_felem(I) (&((char *)tmp_felems)[(I) * felem_size])
-#define X(I) (&((char *)point_array)[3*(I) * felem_size])
-#define Y(I) (&((char *)point_array)[(3*(I) + 1) * felem_size])
-#define Z(I) (&((char *)point_array)[(3*(I) + 2) * felem_size])
+#define X(I) (&((char *)point_array)[3 * (I) * felem_size])
+#define Y(I) (&((char *)point_array)[(3 * (I) + 1) * felem_size])
+#define Z(I) (&((char *)point_array)[(3 * (I) + 2) * felem_size])
 
     if (!felem_is_zero(Z(0)))
         felem_assign(tmp_felem(0), Z(0));
@@ -211,12 +209,12 @@ ossl_ec_GFp_nistp_points_make_affine_internal(size_t num, void *point_array,
  *
  */
 void ossl_ec_GFp_nistp_recode_scalar_bits(unsigned char *sign,
-                                          unsigned char *digit, unsigned char in)
+    unsigned char *digit, unsigned char in)
 {
     unsigned char s, d;
 
-    s = ~((in >> 5) - 1);       /* sets all bits to MSB(in), 'in' seen as
-                                 * 6-bit value */
+    s = ~((in >> 5) - 1); /* sets all bits to MSB(in), 'in' seen as
+                           * 6-bit value */
     d = (1 << 6) - in - 1;
     d = (d & s) | (in & ~s);
     d = (d >> 1) + (d & 1);
diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c
index 36b1d164f4bfe..40054116b6e52 100644
--- a/crypto/ec/ecp_nistz256.c
+++ b/crypto/ec/ecp_nistz256.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-2025 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2014, Intel Corporation. All Rights Reserved.
  * Copyright (c) 2015, CloudFlare, Inc.
  *
@@ -32,13 +32,13 @@
 #include "internal/refcount.h"
 
 #if BN_BITS2 != 64
-# define TOBN(hi,lo)    lo,hi
+#define TOBN(hi, lo) lo, hi
 #else
-# define TOBN(hi,lo)    ((BN_ULONG)hi<<32|lo)
+#define TOBN(hi, lo) ((BN_ULONG)hi << 32 | lo)
 #endif
 
-#define ALIGNPTR(p,N)   ((unsigned char *)p+N-(size_t)p%N)
-#define P256_LIMBS      (256/BN_BITS2)
+#define ALIGNPTR(p, N) ((unsigned char *)p + N - (size_t)p % N)
+#define P256_LIMBS (256 / BN_BITS2)
 
 typedef unsigned short u16;
 
@@ -57,8 +57,8 @@ typedef P256_POINT_AFFINE PRECOMP256_ROW[64];
 
 /* structure for precomputed multiples of the generator */
 struct nistz256_pre_comp_st {
-    const EC_GROUP *group;      /* Parent EC_GROUP object */
-    size_t w;                   /* Window size */
+    const EC_GROUP *group; /* Parent EC_GROUP object */
+    size_t w; /* Window size */
     /*
      * Constant time access to the X and Y coordinates of the pre-computed,
      * generator multiplies, in the Montgomery domain. Pre-calculated
@@ -88,46 +88,46 @@ struct nistz256_pre_comp_st {
  */
 /* Modular add: res = a+b mod P   */
 void ecp_nistz256_add(BN_ULONG res[P256_LIMBS],
-                      const BN_ULONG a[P256_LIMBS],
-                      const BN_ULONG b[P256_LIMBS]);
+    const BN_ULONG a[P256_LIMBS],
+    const BN_ULONG b[P256_LIMBS]);
 /* Modular mul by 2: res = 2*a mod P */
 void ecp_nistz256_mul_by_2(BN_ULONG res[P256_LIMBS],
-                           const BN_ULONG a[P256_LIMBS]);
+    const BN_ULONG a[P256_LIMBS]);
 /* Modular mul by 3: res = 3*a mod P */
 void ecp_nistz256_mul_by_3(BN_ULONG res[P256_LIMBS],
-                           const BN_ULONG a[P256_LIMBS]);
+    const BN_ULONG a[P256_LIMBS]);
 
 /* Modular div by 2: res = a/2 mod P */
 void ecp_nistz256_div_by_2(BN_ULONG res[P256_LIMBS],
-                           const BN_ULONG a[P256_LIMBS]);
+    const BN_ULONG a[P256_LIMBS]);
 /* Modular sub: res = a-b mod P   */
 void ecp_nistz256_sub(BN_ULONG res[P256_LIMBS],
-                      const BN_ULONG a[P256_LIMBS],
-                      const BN_ULONG b[P256_LIMBS]);
+    const BN_ULONG a[P256_LIMBS],
+    const BN_ULONG b[P256_LIMBS]);
 /* Modular neg: res = -a mod P    */
 void ecp_nistz256_neg(BN_ULONG res[P256_LIMBS], const BN_ULONG a[P256_LIMBS]);
 /* Montgomery mul: res = a*b*2^-256 mod P */
 void ecp_nistz256_mul_mont(BN_ULONG res[P256_LIMBS],
-                           const BN_ULONG a[P256_LIMBS],
-                           const BN_ULONG b[P256_LIMBS]);
+    const BN_ULONG a[P256_LIMBS],
+    const BN_ULONG b[P256_LIMBS]);
 /* Montgomery sqr: res = a*a*2^-256 mod P */
 void ecp_nistz256_sqr_mont(BN_ULONG res[P256_LIMBS],
-                           const BN_ULONG a[P256_LIMBS]);
+    const BN_ULONG a[P256_LIMBS]);
 /* Convert a number from Montgomery domain, by multiplying with 1 */
 void ecp_nistz256_from_mont(BN_ULONG res[P256_LIMBS],
-                            const BN_ULONG in[P256_LIMBS]);
+    const BN_ULONG in[P256_LIMBS]);
 /* Convert a number to Montgomery domain, by multiplying with 2^512 mod P*/
 void ecp_nistz256_to_mont(BN_ULONG res[P256_LIMBS],
-                          const BN_ULONG in[P256_LIMBS]);
+    const BN_ULONG in[P256_LIMBS]);
 /* Functions that perform constant time access to the precomputed tables */
 void ecp_nistz256_scatter_w5(P256_POINT *val,
-                             const P256_POINT *in_t, int idx);
+    const P256_POINT *in_t, int idx);
 void ecp_nistz256_gather_w5(P256_POINT *val,
-                            const P256_POINT *in_t, int idx);
+    const P256_POINT *in_t, int idx);
 void ecp_nistz256_scatter_w7(P256_POINT_AFFINE *val,
-                             const P256_POINT_AFFINE *in_t, int idx);
+    const P256_POINT_AFFINE *in_t, int idx);
 void ecp_nistz256_gather_w7(P256_POINT_AFFINE *val,
-                            const P256_POINT_AFFINE *in_t, int idx);
+    const P256_POINT_AFFINE *in_t, int idx);
 
 /* One converted into the Montgomery domain */
 static const BN_ULONG ONE[P256_LIMBS] = {
@@ -166,9 +166,9 @@ static unsigned int _booth_recode_w7(unsigned int in)
 }
 
 static void copy_conditional(BN_ULONG dst[P256_LIMBS],
-                             const BN_ULONG src[P256_LIMBS], BN_ULONG move)
+    const BN_ULONG src[P256_LIMBS], BN_ULONG move)
 {
-    BN_ULONG mask1 = 0-move;
+    BN_ULONG mask1 = 0 - move;
     BN_ULONG mask2 = ~mask1;
 
     dst[0] = (src[0] & mask1) ^ (dst[0] & mask2);
@@ -192,7 +192,7 @@ static BN_ULONG is_zero(BN_ULONG in)
 }
 
 static BN_ULONG is_equal(const BN_ULONG a[P256_LIMBS],
-                         const BN_ULONG b[P256_LIMBS])
+    const BN_ULONG b[P256_LIMBS])
 {
     BN_ULONG res;
 
@@ -248,10 +248,10 @@ static BN_ULONG is_one(const BIGNUM *z)
 #ifndef ECP_NISTZ256_REFERENCE_IMPLEMENTATION
 void ecp_nistz256_point_double(P256_POINT *r, const P256_POINT *a);
 void ecp_nistz256_point_add(P256_POINT *r,
-                            const P256_POINT *a, const P256_POINT *b);
+    const P256_POINT *a, const P256_POINT *b);
 void ecp_nistz256_point_add_affine(P256_POINT *r,
-                                   const P256_POINT *a,
-                                   const P256_POINT_AFFINE *b);
+    const P256_POINT *a,
+    const P256_POINT_AFFINE *b);
 #else
 /* Point double: r = 2*a */
 static void ecp_nistz256_point_double(P256_POINT *r, const P256_POINT *a)
@@ -301,7 +301,7 @@ static void ecp_nistz256_point_double(P256_POINT *r, const P256_POINT *a)
 
 /* Point addition: r = a+b */
 static void ecp_nistz256_point_add(P256_POINT *r,
-                                   const P256_POINT *a, const P256_POINT *b)
+    const P256_POINT *a, const P256_POINT *b)
 {
     BN_ULONG U2[P256_LIMBS], S2[P256_LIMBS];
     BN_ULONG U1[P256_LIMBS], S1[P256_LIMBS];
@@ -340,19 +340,19 @@ static void ecp_nistz256_point_add(P256_POINT *r,
     in1infty = is_zero(in1infty);
     in2infty = is_zero(in2infty);
 
-    ecp_nistz256_sqr_mont(Z2sqr, in2_z);        /* Z2^2 */
-    ecp_nistz256_sqr_mont(Z1sqr, in1_z);        /* Z1^2 */
+    ecp_nistz256_sqr_mont(Z2sqr, in2_z); /* Z2^2 */
+    ecp_nistz256_sqr_mont(Z1sqr, in1_z); /* Z1^2 */
 
-    ecp_nistz256_mul_mont(S1, Z2sqr, in2_z);    /* S1 = Z2^3 */
-    ecp_nistz256_mul_mont(S2, Z1sqr, in1_z);    /* S2 = Z1^3 */
+    ecp_nistz256_mul_mont(S1, Z2sqr, in2_z); /* S1 = Z2^3 */
+    ecp_nistz256_mul_mont(S2, Z1sqr, in1_z); /* S2 = Z1^3 */
 
-    ecp_nistz256_mul_mont(S1, S1, in1_y);       /* S1 = Y1*Z2^3 */
-    ecp_nistz256_mul_mont(S2, S2, in2_y);       /* S2 = Y2*Z1^3 */
-    ecp_nistz256_sub(R, S2, S1);                /* R = S2 - S1 */
+    ecp_nistz256_mul_mont(S1, S1, in1_y); /* S1 = Y1*Z2^3 */
+    ecp_nistz256_mul_mont(S2, S2, in2_y); /* S2 = Y2*Z1^3 */
+    ecp_nistz256_sub(R, S2, S1); /* R = S2 - S1 */
 
-    ecp_nistz256_mul_mont(U1, in1_x, Z2sqr);    /* U1 = X1*Z2^2 */
-    ecp_nistz256_mul_mont(U2, in2_x, Z1sqr);    /* U2 = X2*Z1^2 */
-    ecp_nistz256_sub(H, U2, U1);                /* H = U2 - U1 */
+    ecp_nistz256_mul_mont(U1, in1_x, Z2sqr); /* U1 = X1*Z2^2 */
+    ecp_nistz256_mul_mont(U2, in2_x, Z1sqr); /* U2 = X2*Z1^2 */
+    ecp_nistz256_sub(H, U2, U1); /* H = U2 - U1 */
 
     /*
      * The formulae are incorrect if the points are equal so we check for
@@ -398,14 +398,14 @@ static void ecp_nistz256_point_add(P256_POINT *r,
         return;
     }
 
-    ecp_nistz256_sqr_mont(Rsqr, R);             /* R^2 */
-    ecp_nistz256_mul_mont(res_z, H, in1_z);     /* Z3 = H*Z1*Z2 */
-    ecp_nistz256_sqr_mont(Hsqr, H);             /* H^2 */
+    ecp_nistz256_sqr_mont(Rsqr, R); /* R^2 */
+    ecp_nistz256_mul_mont(res_z, H, in1_z); /* Z3 = H*Z1*Z2 */
+    ecp_nistz256_sqr_mont(Hsqr, H); /* H^2 */
     ecp_nistz256_mul_mont(res_z, res_z, in2_z); /* Z3 = H*Z1*Z2 */
-    ecp_nistz256_mul_mont(Hcub, Hsqr, H);       /* H^3 */
+    ecp_nistz256_mul_mont(Hcub, Hsqr, H); /* H^3 */
 
-    ecp_nistz256_mul_mont(U2, U1, Hsqr);        /* U1*H^2 */
-    ecp_nistz256_mul_by_2(Hsqr, U2);            /* 2*U1*H^2 */
+    ecp_nistz256_mul_mont(U2, U1, Hsqr); /* U1*H^2 */
+    ecp_nistz256_mul_by_2(Hsqr, U2); /* 2*U1*H^2 */
 
     ecp_nistz256_sub(res_x, Rsqr, Hsqr);
     ecp_nistz256_sub(res_x, res_x, Hcub);
@@ -431,8 +431,8 @@ static void ecp_nistz256_point_add(P256_POINT *r,
 
 /* Point addition when b is known to be affine: r = a+b */
 static void ecp_nistz256_point_add_affine(P256_POINT *r,
-                                          const P256_POINT *a,
-                                          const P256_POINT_AFFINE *b)
+    const P256_POINT *a,
+    const P256_POINT_AFFINE *b)
 {
     BN_ULONG U2[P256_LIMBS], S2[P256_LIMBS];
     BN_ULONG Z1sqr[P256_LIMBS];
@@ -465,33 +465,31 @@ static void ecp_nistz256_point_add_affine(P256_POINT *r,
      * In affine representation we encode infinity as (0,0), which is
      * not on the curve, so it is OK
      */
-    in2infty = (in2_x[0] | in2_x[1] | in2_x[2] | in2_x[3] |
-                in2_y[0] | in2_y[1] | in2_y[2] | in2_y[3]);
+    in2infty = (in2_x[0] | in2_x[1] | in2_x[2] | in2_x[3] | in2_y[0] | in2_y[1] | in2_y[2] | in2_y[3]);
     if (P256_LIMBS == 8)
-        in2infty |= (in2_x[4] | in2_x[5] | in2_x[6] | in2_x[7] |
-                     in2_y[4] | in2_y[5] | in2_y[6] | in2_y[7]);
+        in2infty |= (in2_x[4] | in2_x[5] | in2_x[6] | in2_x[7] | in2_y[4] | in2_y[5] | in2_y[6] | in2_y[7]);
 
     in1infty = is_zero(in1infty);
     in2infty = is_zero(in2infty);
 
-    ecp_nistz256_sqr_mont(Z1sqr, in1_z);        /* Z1^2 */
+    ecp_nistz256_sqr_mont(Z1sqr, in1_z); /* Z1^2 */
 
-    ecp_nistz256_mul_mont(U2, in2_x, Z1sqr);    /* U2 = X2*Z1^2 */
-    ecp_nistz256_sub(H, U2, in1_x);             /* H = U2 - U1 */
+    ecp_nistz256_mul_mont(U2, in2_x, Z1sqr); /* U2 = X2*Z1^2 */
+    ecp_nistz256_sub(H, U2, in1_x); /* H = U2 - U1 */
 
-    ecp_nistz256_mul_mont(S2, Z1sqr, in1_z);    /* S2 = Z1^3 */
+    ecp_nistz256_mul_mont(S2, Z1sqr, in1_z); /* S2 = Z1^3 */
 
-    ecp_nistz256_mul_mont(res_z, H, in1_z);     /* Z3 = H*Z1*Z2 */
+    ecp_nistz256_mul_mont(res_z, H, in1_z); /* Z3 = H*Z1*Z2 */
 
-    ecp_nistz256_mul_mont(S2, S2, in2_y);       /* S2 = Y2*Z1^3 */
-    ecp_nistz256_sub(R, S2, in1_y);             /* R = S2 - S1 */
+    ecp_nistz256_mul_mont(S2, S2, in2_y); /* S2 = Y2*Z1^3 */
+    ecp_nistz256_sub(R, S2, in1_y); /* R = S2 - S1 */
 
-    ecp_nistz256_sqr_mont(Hsqr, H);             /* H^2 */
-    ecp_nistz256_sqr_mont(Rsqr, R);             /* R^2 */
-    ecp_nistz256_mul_mont(Hcub, Hsqr, H);       /* H^3 */
+    ecp_nistz256_sqr_mont(Hsqr, H); /* H^2 */
+    ecp_nistz256_sqr_mont(Rsqr, R); /* R^2 */
+    ecp_nistz256_mul_mont(Hcub, Hsqr, H); /* H^3 */
 
-    ecp_nistz256_mul_mont(U2, in1_x, Hsqr);     /* U1*H^2 */
-    ecp_nistz256_mul_by_2(Hsqr, U2);            /* 2*U1*H^2 */
+    ecp_nistz256_mul_mont(U2, in1_x, Hsqr); /* U1*H^2 */
+    ecp_nistz256_mul_by_2(Hsqr, U2); /* 2*U1*H^2 */
 
     ecp_nistz256_sub(res_x, Rsqr, Hsqr);
     ecp_nistz256_sub(res_x, res_x, Hcub);
@@ -518,7 +516,7 @@ static void ecp_nistz256_point_add_affine(P256_POINT *r,
 
 /* r = in^-1 mod p */
 static void ecp_nistz256_mod_inverse(BN_ULONG r[P256_LIMBS],
-                                     const BN_ULONG in[P256_LIMBS])
+    const BN_ULONG in[P256_LIMBS])
 {
     /*
      * The poly is ffffffff 00000001 00000000 00000000 00000000 ffffffff
@@ -533,27 +531,27 @@ static void ecp_nistz256_mod_inverse(BN_ULONG r[P256_LIMBS],
     int i;
 
     ecp_nistz256_sqr_mont(res, in);
-    ecp_nistz256_mul_mont(p2, res, in);         /* 3*p */
+    ecp_nistz256_mul_mont(p2, res, in); /* 3*p */
 
     ecp_nistz256_sqr_mont(res, p2);
     ecp_nistz256_sqr_mont(res, res);
-    ecp_nistz256_mul_mont(p4, res, p2);         /* f*p */
+    ecp_nistz256_mul_mont(p4, res, p2); /* f*p */
 
     ecp_nistz256_sqr_mont(res, p4);
     ecp_nistz256_sqr_mont(res, res);
     ecp_nistz256_sqr_mont(res, res);
     ecp_nistz256_sqr_mont(res, res);
-    ecp_nistz256_mul_mont(p8, res, p4);         /* ff*p */
+    ecp_nistz256_mul_mont(p8, res, p4); /* ff*p */
 
     ecp_nistz256_sqr_mont(res, p8);
     for (i = 0; i < 7; i++)
         ecp_nistz256_sqr_mont(res, res);
-    ecp_nistz256_mul_mont(p16, res, p8);        /* ffff*p */
+    ecp_nistz256_mul_mont(p16, res, p8); /* ffff*p */
 
     ecp_nistz256_sqr_mont(res, p16);
     for (i = 0; i < 15; i++)
         ecp_nistz256_sqr_mont(res, res);
-    ecp_nistz256_mul_mont(p32, res, p16);       /* ffffffff*p */
+    ecp_nistz256_mul_mont(p32, res, p16); /* ffffffff*p */
 
     ecp_nistz256_sqr_mont(res, p32);
     for (i = 0; i < 31; i++)
@@ -598,17 +596,17 @@ static void ecp_nistz256_mod_inverse(BN_ULONG r[P256_LIMBS],
  * returns one if it fits. Otherwise it returns zero.
  */
 __owur static int ecp_nistz256_bignum_to_field_elem(BN_ULONG out[P256_LIMBS],
-                                                    const BIGNUM *in)
+    const BIGNUM *in)
 {
     return bn_copy_words(out, in, P256_LIMBS);
 }
 
 /* r = sum(scalar[i]*point[i]) */
 __owur static int ecp_nistz256_windowed_mul(const EC_GROUP *group,
-                                            P256_POINT *r,
-                                            const BIGNUM **scalar,
-                                            const EC_POINT **point,
-                                            size_t num, BN_CTX *ctx)
+    P256_POINT *r,
+    const BIGNUM **scalar,
+    const EC_POINT **point,
+    size_t num, BN_CTX *ctx)
 {
     size_t i;
     int j, ret = 0;
@@ -617,16 +615,15 @@ __owur static int ecp_nistz256_windowed_mul(const EC_GROUP *group,
     const unsigned int window_size = 5;
     const unsigned int mask = (1 << (window_size + 1)) - 1;
     unsigned int wvalue;
-    P256_POINT *temp;           /* place for 5 temporary points */
+    P256_POINT *temp; /* place for 5 temporary points */
     const BIGNUM **scalars = NULL;
-    P256_POINT (*table)[16] = NULL;
+    P256_POINT(*table)
+    [16] = NULL;
     void *table_storage = NULL;
 
     if ((num * 16 + 6) > OPENSSL_MALLOC_MAX_NELEMS(P256_POINT)
-        || (table_storage =
-            OPENSSL_malloc((num * 16 + 5) * sizeof(P256_POINT) + 64)) == NULL
-        || (p_str =
-            OPENSSL_malloc(num * 33 * sizeof(unsigned char))) == NULL
+        || (table_storage = OPENSSL_malloc((num * 16 + 5) * sizeof(P256_POINT) + 64)) == NULL
+        || (p_str = OPENSSL_malloc(num * 33 * sizeof(unsigned char))) == NULL
         || (scalars = OPENSSL_malloc(num * sizeof(BIGNUM *))) == NULL)
         goto err;
 
@@ -681,37 +678,37 @@ __owur static int ecp_nistz256_windowed_mul(const EC_GROUP *group,
          * of -1 in table.
          */
 
-        ecp_nistz256_scatter_w5  (row, &temp[0], 1);
-        ecp_nistz256_point_double(&temp[1], &temp[0]);              /*1+1=2  */
-        ecp_nistz256_scatter_w5  (row, &temp[1], 2);
-        ecp_nistz256_point_add   (&temp[2], &temp[1], &temp[0]);    /*2+1=3  */
-        ecp_nistz256_scatter_w5  (row, &temp[2], 3);
-        ecp_nistz256_point_double(&temp[1], &temp[1]);              /*2*2=4  */
-        ecp_nistz256_scatter_w5  (row, &temp[1], 4);
-        ecp_nistz256_point_double(&temp[2], &temp[2]);              /*2*3=6  */
-        ecp_nistz256_scatter_w5  (row, &temp[2], 6);
-        ecp_nistz256_point_add   (&temp[3], &temp[1], &temp[0]);    /*4+1=5  */
-        ecp_nistz256_scatter_w5  (row, &temp[3], 5);
-        ecp_nistz256_point_add   (&temp[4], &temp[2], &temp[0]);    /*6+1=7  */
-        ecp_nistz256_scatter_w5  (row, &temp[4], 7);
-        ecp_nistz256_point_double(&temp[1], &temp[1]);              /*2*4=8  */
-        ecp_nistz256_scatter_w5  (row, &temp[1], 8);
-        ecp_nistz256_point_double(&temp[2], &temp[2]);              /*2*6=12 */
-        ecp_nistz256_scatter_w5  (row, &temp[2], 12);
-        ecp_nistz256_point_double(&temp[3], &temp[3]);              /*2*5=10 */
-        ecp_nistz256_scatter_w5  (row, &temp[3], 10);
-        ecp_nistz256_point_double(&temp[4], &temp[4]);              /*2*7=14 */
-        ecp_nistz256_scatter_w5  (row, &temp[4], 14);
-        ecp_nistz256_point_add   (&temp[2], &temp[2], &temp[0]);    /*12+1=13*/
-        ecp_nistz256_scatter_w5  (row, &temp[2], 13);
-        ecp_nistz256_point_add   (&temp[3], &temp[3], &temp[0]);    /*10+1=11*/
-        ecp_nistz256_scatter_w5  (row, &temp[3], 11);
-        ecp_nistz256_point_add   (&temp[4], &temp[4], &temp[0]);    /*14+1=15*/
-        ecp_nistz256_scatter_w5  (row, &temp[4], 15);
-        ecp_nistz256_point_add   (&temp[2], &temp[1], &temp[0]);    /*8+1=9  */
-        ecp_nistz256_scatter_w5  (row, &temp[2], 9);
-        ecp_nistz256_point_double(&temp[1], &temp[1]);              /*2*8=16 */
-        ecp_nistz256_scatter_w5  (row, &temp[1], 16);
+        ecp_nistz256_scatter_w5(row, &temp[0], 1);
+        ecp_nistz256_point_double(&temp[1], &temp[0]); /*1+1=2  */
+        ecp_nistz256_scatter_w5(row, &temp[1], 2);
+        ecp_nistz256_point_add(&temp[2], &temp[1], &temp[0]); /*2+1=3  */
+        ecp_nistz256_scatter_w5(row, &temp[2], 3);
+        ecp_nistz256_point_double(&temp[1], &temp[1]); /*2*2=4  */
+        ecp_nistz256_scatter_w5(row, &temp[1], 4);
+        ecp_nistz256_point_double(&temp[2], &temp[2]); /*2*3=6  */
+        ecp_nistz256_scatter_w5(row, &temp[2], 6);
+        ecp_nistz256_point_add(&temp[3], &temp[1], &temp[0]); /*4+1=5  */
+        ecp_nistz256_scatter_w5(row, &temp[3], 5);
+        ecp_nistz256_point_add(&temp[4], &temp[2], &temp[0]); /*6+1=7  */
+        ecp_nistz256_scatter_w5(row, &temp[4], 7);
+        ecp_nistz256_point_double(&temp[1], &temp[1]); /*2*4=8  */
+        ecp_nistz256_scatter_w5(row, &temp[1], 8);
+        ecp_nistz256_point_double(&temp[2], &temp[2]); /*2*6=12 */
+        ecp_nistz256_scatter_w5(row, &temp[2], 12);
+        ecp_nistz256_point_double(&temp[3], &temp[3]); /*2*5=10 */
+        ecp_nistz256_scatter_w5(row, &temp[3], 10);
+        ecp_nistz256_point_double(&temp[4], &temp[4]); /*2*7=14 */
+        ecp_nistz256_scatter_w5(row, &temp[4], 14);
+        ecp_nistz256_point_add(&temp[2], &temp[2], &temp[0]); /*12+1=13*/
+        ecp_nistz256_scatter_w5(row, &temp[2], 13);
+        ecp_nistz256_point_add(&temp[3], &temp[3], &temp[0]); /*10+1=11*/
+        ecp_nistz256_scatter_w5(row, &temp[3], 11);
+        ecp_nistz256_point_add(&temp[4], &temp[4], &temp[0]); /*14+1=15*/
+        ecp_nistz256_scatter_w5(row, &temp[4], 15);
+        ecp_nistz256_point_add(&temp[2], &temp[1], &temp[0]); /*8+1=9  */
+        ecp_nistz256_scatter_w5(row, &temp[2], 9);
+        ecp_nistz256_point_double(&temp[1], &temp[1]); /*2*8=16 */
+        ecp_nistz256_scatter_w5(row, &temp[1], 16);
     }
 
     idx = 255;
@@ -768,7 +765,7 @@ __owur static int ecp_nistz256_windowed_mul(const EC_GROUP *group,
     }
 
     ret = 1;
- err:
+err:
     OPENSSL_free(table_storage);
     OPENSSL_free(p_str);
     OPENSSL_free(scalars);
@@ -792,11 +789,7 @@ static const BN_ULONG def_yG[P256_LIMBS] = {
  */
 static int ecp_nistz256_is_affine_G(const EC_POINT *generator)
 {
-    return (bn_get_top(generator->X) == P256_LIMBS) &&
-        (bn_get_top(generator->Y) == P256_LIMBS) &&
-        is_equal(bn_get_words(generator->X), def_xG) &&
-        is_equal(bn_get_words(generator->Y), def_yG) &&
-        is_one(generator->Z);
+    return (bn_get_top(generator->X) == P256_LIMBS) && (bn_get_top(generator->Y) == P256_LIMBS) && is_equal(bn_get_words(generator->X), def_xG) && is_equal(bn_get_words(generator->Y), def_yG) && is_one(generator->Z);
 }
 
 __owur static int ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
@@ -856,8 +849,7 @@ __owur static int ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
 
     w = 7;
 
-    if ((precomp_storage =
-         OPENSSL_malloc(37 * 64 * sizeof(P256_POINT_AFFINE) + 64)) == NULL)
+    if ((precomp_storage = OPENSSL_malloc(37 * 64 * sizeof(P256_POINT_AFFINE) + 64)) == NULL)
         goto err;
 
     preComputedTable = (void *)ALIGNPTR(precomp_storage, 64);
@@ -886,8 +878,7 @@ __owur static int ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
             if (group->meth->make_affine == NULL
                 || !group->meth->make_affine(group, P, ctx))
                 goto err;
-            if (!ecp_nistz256_bignum_to_field_elem(temp.X, P->X) ||
-                !ecp_nistz256_bignum_to_field_elem(temp.Y, P->Y)) {
+            if (!ecp_nistz256_bignum_to_field_elem(temp.X, P->X) || !ecp_nistz256_bignum_to_field_elem(temp.Y, P->Y)) {
                 ERR_raise(ERR_LIB_EC, EC_R_COORDINATES_OUT_OF_RANGE);
                 goto err;
             }
@@ -910,7 +901,7 @@ __owur static int ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
     pre_comp = NULL;
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
 
@@ -922,8 +913,8 @@ __owur static int ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
 }
 
 __owur static int ecp_nistz256_set_from_affine(EC_POINT *out, const EC_GROUP *group,
-                                               const P256_POINT_AFFINE *in,
-                                               BN_CTX *ctx)
+    const P256_POINT_AFFINE *in,
+    BN_CTX *ctx)
 {
     int ret = 0;
 
@@ -937,11 +928,11 @@ __owur static int ecp_nistz256_set_from_affine(EC_POINT *out, const EC_GROUP *gr
 
 /* r = scalar*G + sum(scalars[i]*points[i]) */
 __owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
-                                          EC_POINT *r,
-                                          const BIGNUM *scalar,
-                                          size_t num,
-                                          const EC_POINT *points[],
-                                          const BIGNUM *scalars[], BN_CTX *ctx)
+    EC_POINT *r,
+    const BIGNUM *scalar,
+    size_t num,
+    const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *ctx)
 {
     int i = 0, ret = 0, no_precomp_for_generator = 0, p_is_infinity = 0;
     unsigned char p_str[33] = { 0 };
@@ -989,7 +980,7 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
 
             ecp_nistz256_gather_w7(&p.a, pre_comp->precomp[0], 1);
             if (!ecp_nistz256_set_from_affine(pre_comp_generator,
-                                              group, &p.a, ctx)) {
+                    group, &p.a, ctx)) {
                 EC_POINT_free(pre_comp_generator);
                 goto err;
             }
@@ -1051,7 +1042,7 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
             wvalue = _booth_recode_w7(wvalue);
 
             ecp_nistz256_gather_w7(&p.a, preComputedTable[0],
-                                   wvalue >> 1);
+                wvalue >> 1);
 
             ecp_nistz256_neg(p.p.Z, p.p.Y);
             copy_conditional(p.p.Y, p.p.Z, wvalue & 1);
@@ -1061,11 +1052,9 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
              * Jacobian is (,,0), we need to harmonize them
              * by assigning "one" or zero to Z.
              */
-            infty = (p.p.X[0] | p.p.X[1] | p.p.X[2] | p.p.X[3] |
-                     p.p.Y[0] | p.p.Y[1] | p.p.Y[2] | p.p.Y[3]);
+            infty = (p.p.X[0] | p.p.X[1] | p.p.X[2] | p.p.X[3] | p.p.Y[0] | p.p.Y[1] | p.p.Y[2] | p.p.Y[3]);
             if (P256_LIMBS == 8)
-                infty |= (p.p.X[4] | p.p.X[5] | p.p.X[6] | p.p.X[7] |
-                          p.p.Y[4] | p.p.Y[5] | p.p.Y[6] | p.p.Y[7]);
+                infty |= (p.p.X[4] | p.p.X[5] | p.p.X[6] | p.p.X[7] | p.p.Y[4] | p.p.Y[5] | p.p.Y[6] | p.p.Y[7]);
 
             infty = 0 - is_zero(infty);
             infty = ~infty;
@@ -1090,7 +1079,7 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
                 wvalue = _booth_recode_w7(wvalue);
 
                 ecp_nistz256_gather_w7(&t.a,
-                                       preComputedTable[i], wvalue >> 1);
+                    preComputedTable[i], wvalue >> 1);
 
                 ecp_nistz256_neg(t.p.Z, t.a.Y);
                 copy_conditional(t.a.Y, t.p.Z, wvalue & 1);
@@ -1140,9 +1129,7 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
     }
 
     /* Not constant-time, but we're only operating on the public output. */
-    if (!bn_set_words(r->X, p.p.X, P256_LIMBS) ||
-        !bn_set_words(r->Y, p.p.Y, P256_LIMBS) ||
-        !bn_set_words(r->Z, p.p.Z, P256_LIMBS)) {
+    if (!bn_set_words(r->X, p.p.X, P256_LIMBS) || !bn_set_words(r->Y, p.p.Y, P256_LIMBS) || !bn_set_words(r->Z, p.p.Z, P256_LIMBS)) {
         goto err;
     }
     r->Z_is_one = is_one(r->Z) & 1;
@@ -1157,8 +1144,8 @@ __owur static int ecp_nistz256_points_mul(const EC_GROUP *group,
 }
 
 __owur static int ecp_nistz256_get_affine(const EC_GROUP *group,
-                                          const EC_POINT *point,
-                                          BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
+    const EC_POINT *point,
+    BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
 {
     BN_ULONG z_inv2[P256_LIMBS];
     BN_ULONG z_inv3[P256_LIMBS];
@@ -1172,9 +1159,7 @@ __owur static int ecp_nistz256_get_affine(const EC_GROUP *group,
         return 0;
     }
 
-    if (!ecp_nistz256_bignum_to_field_elem(point_x, point->X) ||
-        !ecp_nistz256_bignum_to_field_elem(point_y, point->Y) ||
-        !ecp_nistz256_bignum_to_field_elem(point_z, point->Z)) {
+    if (!ecp_nistz256_bignum_to_field_elem(point_x, point->X) || !ecp_nistz256_bignum_to_field_elem(point_y, point->Y) || !ecp_nistz256_bignum_to_field_elem(point_z, point->Z)) {
         ERR_raise(ERR_LIB_EC, EC_R_COORDINATES_OUT_OF_RANGE);
         return 0;
     }
@@ -1213,7 +1198,7 @@ static NISTZ256_PRE_COMP *ecp_nistz256_pre_comp_new(const EC_GROUP *group)
         return ret;
 
     ret->group = group;
-    ret->w = 6;                 /* default */
+    ret->w = 6; /* default */
 
     if (!CRYPTO_NEW_REF(&ret->references, 1)) {
         OPENSSL_free(ret);
@@ -1248,7 +1233,6 @@ void EC_nistz256_pre_comp_free(NISTZ256_PRE_COMP *pre)
     OPENSSL_free(pre);
 }
 
-
 static int ecp_nistz256_window_have_precompute_mult(const EC_GROUP *group)
 {
     /* There is a hard-coded table for the default generator. */
@@ -1262,31 +1246,28 @@ static int ecp_nistz256_window_have_precompute_mult(const EC_GROUP *group)
     return HAVEPRECOMP(group, nistz256);
 }
 
-#if defined(__x86_64) || defined(__x86_64__) || \
-    defined(_M_AMD64) || defined(_M_X64) || \
-    defined(__powerpc64__) || defined(_ARCH_PP64) || \
-    defined(__aarch64__)
+#if defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) || defined(__powerpc64__) || defined(_ARCH_PP64) || defined(__aarch64__)
 /*
  * Montgomery mul modulo Order(P): res = a*b*2^-256 mod Order(P)
  */
 void ecp_nistz256_ord_mul_mont(BN_ULONG res[P256_LIMBS],
-                               const BN_ULONG a[P256_LIMBS],
-                               const BN_ULONG b[P256_LIMBS]);
+    const BN_ULONG a[P256_LIMBS],
+    const BN_ULONG b[P256_LIMBS]);
 void ecp_nistz256_ord_sqr_mont(BN_ULONG res[P256_LIMBS],
-                               const BN_ULONG a[P256_LIMBS],
-                               BN_ULONG rep);
+    const BN_ULONG a[P256_LIMBS],
+    BN_ULONG rep);
 
 static int ecp_nistz256_inv_mod_ord(const EC_GROUP *group, BIGNUM *r,
-                                    const BIGNUM *x, BN_CTX *ctx)
+    const BIGNUM *x, BN_CTX *ctx)
 {
     /* RR = 2^512 mod ord(p256) */
-    static const BN_ULONG RR[P256_LIMBS]  = {
-        TOBN(0x83244c95,0xbe79eea2), TOBN(0x4699799c,0x49bd6fa6),
-        TOBN(0x2845b239,0x2b6bec59), TOBN(0x66e12d94,0xf3d95620)
+    static const BN_ULONG RR[P256_LIMBS] = {
+        TOBN(0x83244c95, 0xbe79eea2), TOBN(0x4699799c, 0x49bd6fa6),
+        TOBN(0x2845b239, 0x2b6bec59), TOBN(0x66e12d94, 0xf3d95620)
     };
     /* The constant 1 (unlike ONE that is one in Montgomery representation) */
     static const BN_ULONG one[P256_LIMBS] = {
-        TOBN(0,1), TOBN(0,0), TOBN(0,0), TOBN(0,0)
+        TOBN(0, 1), TOBN(0, 0), TOBN(0, 0), TOBN(0, 0)
     };
     /*
      * We don't use entry 0 in the table, so we omit it and address
@@ -1296,8 +1277,20 @@ static int ecp_nistz256_inv_mod_ord(const EC_GROUP *group, BIGNUM *r,
     BN_ULONG out[P256_LIMBS], t[P256_LIMBS];
     int i, ret = 0;
     enum {
-        i_1 = 0, i_10,     i_11,     i_101, i_111, i_1010, i_1111,
-        i_10101, i_101010, i_101111, i_x6,  i_x8,  i_x16,  i_x32
+        i_1 = 0,
+        i_10,
+        i_11,
+        i_101,
+        i_111,
+        i_1010,
+        i_1111,
+        i_10101,
+        i_101010,
+        i_101111,
+        i_x6,
+        i_x8,
+        i_x16,
+        i_x32
     };
 
     /*
@@ -1413,16 +1406,18 @@ static int ecp_nistz256_inv_mod_ord(const EC_GROUP *group, BIGNUM *r,
     ecp_nistz256_ord_mul_mont(out, out, table[i_x32]);
 
     for (i = 0; i < 27; i++) {
-        static const struct { unsigned char p, i; } chain[27] = {
-            { 32, i_x32 }, { 6,  i_101111 }, { 5,  i_111    },
-            { 4,  i_11  }, { 5,  i_1111   }, { 5,  i_10101  },
-            { 4,  i_101 }, { 3,  i_101    }, { 3,  i_101    },
-            { 5,  i_111 }, { 9,  i_101111 }, { 6,  i_1111   },
-            { 2,  i_1   }, { 5,  i_1      }, { 6,  i_1111   },
-            { 5,  i_111 }, { 4,  i_111    }, { 5,  i_111    },
-            { 5,  i_101 }, { 3,  i_11     }, { 10, i_101111 },
-            { 2,  i_11  }, { 5,  i_11     }, { 5,  i_11     },
-            { 3,  i_1   }, { 7,  i_10101  }, { 6,  i_1111   }
+        static const struct {
+            unsigned char p, i;
+        } chain[27] = {
+            { 32, i_x32 }, { 6, i_101111 }, { 5, i_111 },
+            { 4, i_11 }, { 5, i_1111 }, { 5, i_10101 },
+            { 4, i_101 }, { 3, i_101 }, { 3, i_101 },
+            { 5, i_111 }, { 9, i_101111 }, { 6, i_1111 },
+            { 2, i_1 }, { 5, i_1 }, { 6, i_1111 },
+            { 5, i_111 }, { 4, i_111 }, { 5, i_111 },
+            { 5, i_101 }, { 3, i_11 }, { 10, i_101111 },
+            { 2, i_11 }, { 5, i_11 }, { 5, i_11 },
+            { 3, i_1 }, { 7, i_10101 }, { 6, i_1111 }
         };
 
         ecp_nistz256_ord_sqr_mont(out, out, chain[i].p);
@@ -1442,11 +1437,12 @@ static int ecp_nistz256_inv_mod_ord(const EC_GROUP *group, BIGNUM *r,
     return ret;
 }
 #else
-# define ecp_nistz256_inv_mod_ord NULL
+#define ecp_nistz256_inv_mod_ord NULL
 #endif
 
 static int ecp_nistz256group_full_init(EC_GROUP *group,
-                                       const unsigned char *params) {
+    const unsigned char *params)
+{
     BN_CTX *ctx = NULL;
     BN_MONT_CTX *mont = NULL, *ordmont = NULL;
     const int param_len = 32;
@@ -1455,7 +1451,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
     uint32_t hi_order_n = 0xccd1c8aa;
     uint32_t lo_order_n = 0xee00bc4f;
     BIGNUM *p = NULL, *a = NULL, *b = NULL, *x = NULL, *y = NULL, *one = NULL,
-        *order = NULL;
+           *order = NULL;
     EC_POINT *P = NULL;
 
     if ((ctx = BN_CTX_new_ex(group->libctx)) == NULL) {
@@ -1485,7 +1481,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
         goto err;
 
     if (!ossl_bn_mont_ctx_set(mont, p, 256, params + 6 * param_len, param_len,
-                              1, 0))
+            1, 0))
         goto err;
 
     one = BN_new();
@@ -1493,7 +1489,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
         ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
         goto err;
     }
-    if (!BN_to_montgomery(one, BN_value_one(), mont, ctx)){
+    if (!BN_to_montgomery(one, BN_value_one(), mont, ctx)) {
         ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
         goto err;
     }
@@ -1503,7 +1499,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
     one = NULL;
 
     if (!ossl_ec_GFp_simple_group_set_curve(group, p, a, b, ctx)) {
-         ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
+        ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
         goto err;
     }
 
@@ -1522,7 +1518,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
         goto err;
     }
     if ((order = BN_bin2bn(params + 5 * param_len, param_len, NULL)) == NULL
-        || !BN_set_word(x, (BN_ULONG)1)) { // cofactor is 1
+        || !BN_set_word(x, (BN_ULONG)1)) { /* cofactor is 1 */
         ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
         goto err;
     }
@@ -1531,7 +1527,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
      * Set up generator and order and montgomery data
      */
     group->generator = EC_POINT_new(group);
-    if (group->generator == NULL){
+    if (group->generator == NULL) {
         ERR_raise(ERR_LIB_EC, ERR_R_EC_LIB);
         goto err;
     }
@@ -1543,10 +1539,10 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
         goto err;
 
     ordmont = BN_MONT_CTX_new();
-    if (ordmont  == NULL)
+    if (ordmont == NULL)
         goto err;
     if (!ossl_bn_mont_ctx_set(ordmont, order, 256, params + 7 * param_len,
-                              param_len, lo_order_n, hi_order_n))
+            param_len, lo_order_n, hi_order_n))
         goto err;
 
     group->mont_data = ordmont;
@@ -1554,7 +1550,7 @@ static int ecp_nistz256group_full_init(EC_GROUP *group,
 
     ok = 1;
 
- err:
+err:
     EC_POINT_free(P);
     BN_CTX_free(ctx);
     BN_MONT_CTX_free(mont);
@@ -1600,12 +1596,12 @@ const EC_METHOD *EC_GFp_nistz256_method(void)
         ossl_ec_GFp_simple_cmp,
         ossl_ec_GFp_simple_make_affine,
         ossl_ec_GFp_simple_points_make_affine,
-        ecp_nistz256_points_mul,                    /* mul */
-        ecp_nistz256_mult_precompute,               /* precompute_mult */
-        ecp_nistz256_window_have_precompute_mult,   /* have_precompute_mult */
+        ecp_nistz256_points_mul, /* mul */
+        ecp_nistz256_mult_precompute, /* precompute_mult */
+        ecp_nistz256_window_have_precompute_mult, /* have_precompute_mult */
         ossl_ec_GFp_mont_field_mul,
         ossl_ec_GFp_mont_field_sqr,
-        0,                                          /* field_div */
+        0, /* field_div */
         ossl_ec_GFp_mont_field_inv,
         ossl_ec_GFp_mont_field_encode,
         ossl_ec_GFp_mont_field_decode,
@@ -1622,11 +1618,11 @@ const EC_METHOD *EC_GFp_nistz256_method(void)
         ossl_ecdsa_simple_sign_setup,
         ossl_ecdsa_simple_sign_sig,
         ossl_ecdsa_simple_verify_sig,
-        ecp_nistz256_inv_mod_ord,                   /* can be #define-d NULL */
-        0,                                          /* blind_coordinates */
-        0,                                          /* ladder_pre */
-        0,                                          /* ladder_step */
-        0,                                          /* ladder_post */
+        ecp_nistz256_inv_mod_ord, /* can be #define-d NULL */
+        0, /* blind_coordinates */
+        0, /* ladder_pre */
+        0, /* ladder_step */
+        0, /* ladder_post */
         ecp_nistz256group_full_init
     };
 
diff --git a/crypto/ec/ecp_nistz256_table.c b/crypto/ec/ecp_nistz256_table.c
index 71430d4b81421..2c2ee3aca5bb4 100644
--- a/crypto/ec/ecp_nistz256_table.c
+++ b/crypto/ec/ecp_nistz256_table.c
@@ -26,9517 +26,14898 @@ __attribute((aligned(4096)))
 #elif defined(_MSC_VER)
 __declspec(align(4096))
 #elif defined(__SUNPRO_C)
-# pragma align 4096(ecp_nistz256_precomputed)
+#pragma align 4096(ecp_nistz256_precomputed)
 #endif
-static const BN_ULONG ecp_nistz256_precomputed[37][64 *
-                                                   sizeof(P256_POINT_AFFINE) /
-                                                   sizeof(BN_ULONG)] = {
-    {TOBN(0x79e730d4, 0x18a9143c), TOBN(0x75ba95fc, 0x5fedb601),
-     TOBN(0x79fb732b, 0x77622510), TOBN(0x18905f76, 0xa53755c6),
-     TOBN(0xddf25357, 0xce95560a), TOBN(0x8b4ab8e4, 0xba19e45c),
-     TOBN(0xd2e88688, 0xdd21f325), TOBN(0x8571ff18, 0x25885d85),
-     TOBN(0x850046d4, 0x10ddd64d), TOBN(0xaa6ae3c1, 0xa433827d),
-     TOBN(0x73220503, 0x8d1490d9), TOBN(0xf6bb32e4, 0x3dcf3a3b),
-     TOBN(0x2f3648d3, 0x61bee1a5), TOBN(0x152cd7cb, 0xeb236ff8),
-     TOBN(0x19a8fb0e, 0x92042dbe), TOBN(0x78c57751, 0x0a5b8a3b),
-     TOBN(0xffac3f90, 0x4eebc127), TOBN(0xb027f84a, 0x087d81fb),
-     TOBN(0x66ad77dd, 0x87cbbc98), TOBN(0x26936a3f, 0xb6ff747e),
-     TOBN(0xb04c5c1f, 0xc983a7eb), TOBN(0x583e47ad, 0x0861fe1a),
-     TOBN(0x78820831, 0x1a2ee98e), TOBN(0xd5f06a29, 0xe587cc07),
-     TOBN(0x74b0b50d, 0x46918dcc), TOBN(0x4650a6ed, 0xc623c173),
-     TOBN(0x0cdaacac, 0xe8100af2), TOBN(0x577362f5, 0x41b0176b),
-     TOBN(0x2d96f24c, 0xe4cbaba6), TOBN(0x17628471, 0xfad6f447),
-     TOBN(0x6b6c36de, 0xe5ddd22e), TOBN(0x84b14c39, 0x4c5ab863),
-     TOBN(0xbe1b8aae, 0xc45c61f5), TOBN(0x90ec649a, 0x94b9537d),
-     TOBN(0x941cb5aa, 0xd076c20c), TOBN(0xc9079605, 0x890523c8),
-     TOBN(0xeb309b4a, 0xe7ba4f10), TOBN(0x73c568ef, 0xe5eb882b),
-     TOBN(0x3540a987, 0x7e7a1f68), TOBN(0x73a076bb, 0x2dd1e916),
-     TOBN(0x40394737, 0x3e77664a), TOBN(0x55ae744f, 0x346cee3e),
-     TOBN(0xd50a961a, 0x5b17a3ad), TOBN(0x13074b59, 0x54213673),
-     TOBN(0x93d36220, 0xd377e44b), TOBN(0x299c2b53, 0xadff14b5),
-     TOBN(0xf424d44c, 0xef639f11), TOBN(0xa4c9916d, 0x4a07f75f),
-     TOBN(0x0746354e, 0xa0173b4f), TOBN(0x2bd20213, 0xd23c00f7),
-     TOBN(0xf43eaab5, 0x0c23bb08), TOBN(0x13ba5119, 0xc3123e03),
-     TOBN(0x2847d030, 0x3f5b9d4d), TOBN(0x6742f2f2, 0x5da67bdd),
-     TOBN(0xef933bdc, 0x77c94195), TOBN(0xeaedd915, 0x6e240867),
-     TOBN(0x27f14cd1, 0x9499a78f), TOBN(0x462ab5c5, 0x6f9b3455),
-     TOBN(0x8f90f02a, 0xf02cfc6b), TOBN(0xb763891e, 0xb265230d),
-     TOBN(0xf59da3a9, 0x532d4977), TOBN(0x21e3327d, 0xcf9eba15),
-     TOBN(0x123c7b84, 0xbe60bbf0), TOBN(0x56ec12f2, 0x7706df76),
-     TOBN(0x75c96e8f, 0x264e20e8), TOBN(0xabe6bfed, 0x59a7a841),
-     TOBN(0x2cc09c04, 0x44c8eb00), TOBN(0xe05b3080, 0xf0c4e16b),
-     TOBN(0x1eb7777a, 0xa45f3314), TOBN(0x56af7bed, 0xce5d45e3),
-     TOBN(0x2b6e019a, 0x88b12f1a), TOBN(0x086659cd, 0xfd835f9b),
-     TOBN(0x2c18dbd1, 0x9dc21ec8), TOBN(0x98f9868a, 0x0fcf8139),
-     TOBN(0x737d2cd6, 0x48250b49), TOBN(0xcc61c947, 0x24b3428f),
-     TOBN(0x0c2b4078, 0x80dd9e76), TOBN(0xc43a8991, 0x383fbe08),
-     TOBN(0x5f7d2d65, 0x779be5d2), TOBN(0x78719a54, 0xeb3b4ab5),
-     TOBN(0xea7d260a, 0x6245e404), TOBN(0x9de40795, 0x6e7fdfe0),
-     TOBN(0x1ff3a415, 0x8dac1ab5), TOBN(0x3e7090f1, 0x649c9073),
-     TOBN(0x1a768561, 0x2b944e88), TOBN(0x250f939e, 0xe57f61c8),
-     TOBN(0x0c0daa89, 0x1ead643d), TOBN(0x68930023, 0xe125b88e),
-     TOBN(0x04b71aa7, 0xd2697768), TOBN(0xabdedef5, 0xca345a33),
-     TOBN(0x2409d29d, 0xee37385e), TOBN(0x4ee1df77, 0xcb83e156),
-     TOBN(0x0cac12d9, 0x1cbb5b43), TOBN(0x170ed2f6, 0xca895637),
-     TOBN(0x28228cfa, 0x8ade6d66), TOBN(0x7ff57c95, 0x53238aca),
-     TOBN(0xccc42563, 0x4b2ed709), TOBN(0x0e356769, 0x856fd30d),
-     TOBN(0xbcbcd43f, 0x559e9811), TOBN(0x738477ac, 0x5395b759),
-     TOBN(0x35752b90, 0xc00ee17f), TOBN(0x68748390, 0x742ed2e3),
-     TOBN(0x7cd06422, 0xbd1f5bc1), TOBN(0xfbc08769, 0xc9e7b797),
-     TOBN(0xa242a35b, 0xb0cf664a), TOBN(0x126e48f7, 0x7f9707e3),
-     TOBN(0x1717bf54, 0xc6832660), TOBN(0xfaae7332, 0xfd12c72e),
-     TOBN(0x27b52db7, 0x995d586b), TOBN(0xbe29569e, 0x832237c2),
-     TOBN(0xe8e4193e, 0x2a65e7db), TOBN(0x152706dc, 0x2eaa1bbb),
-     TOBN(0x72bcd8b7, 0xbc60055b), TOBN(0x03cc23ee, 0x56e27e4b),
-     TOBN(0xee337424, 0xe4819370), TOBN(0xe2aa0e43, 0x0ad3da09),
-     TOBN(0x40b8524f, 0x6383c45d), TOBN(0xd7663554, 0x42a41b25),
-     TOBN(0x64efa6de, 0x778a4797), TOBN(0x2042170a, 0x7079adf4),
-     TOBN(0x808b0b65, 0x0bc6fb80), TOBN(0x5882e075, 0x3ffe2e6b),
-     TOBN(0xd5ef2f7c, 0x2c83f549), TOBN(0x54d63c80, 0x9103b723),
-     TOBN(0xf2f11bd6, 0x52a23f9b), TOBN(0x3670c319, 0x4b0b6587),
-     TOBN(0x55c4623b, 0xb1580e9e), TOBN(0x64edf7b2, 0x01efe220),
-     TOBN(0x97091dcb, 0xd53c5c9d), TOBN(0xf17624b6, 0xac0a177b),
-     TOBN(0xb0f13975, 0x2cfe2dff), TOBN(0xc1a35c0a, 0x6c7a574e),
-     TOBN(0x227d3146, 0x93e79987), TOBN(0x0575bf30, 0xe89cb80e),
-     TOBN(0x2f4e247f, 0x0d1883bb), TOBN(0xebd51226, 0x3274c3d0),
-     TOBN(0x5f3e51c8, 0x56ada97a), TOBN(0x4afc964d, 0x8f8b403e),
-     TOBN(0xa6f247ab, 0x412e2979), TOBN(0x675abd1b, 0x6f80ebda),
-     TOBN(0x66a2bd72, 0x5e485a1d), TOBN(0x4b2a5caf, 0x8f4f0b3c),
-     TOBN(0x2626927f, 0x1b847bba), TOBN(0x6c6fc7d9, 0x0502394d),
-     TOBN(0xfea912ba, 0xa5659ae8), TOBN(0x68363aba, 0x25e1a16e),
-     TOBN(0xb8842277, 0x752c41ac), TOBN(0xfe545c28, 0x2897c3fc),
-     TOBN(0x2d36e9e7, 0xdc4c696b), TOBN(0x5806244a, 0xfba977c5),
-     TOBN(0x85665e9b, 0xe39508c1), TOBN(0xf720ee25, 0x6d12597b),
-     TOBN(0x8a979129, 0xd2337a31), TOBN(0x5916868f, 0x0f862bdc),
-     TOBN(0x048099d9, 0x5dd283ba), TOBN(0xe2d1eeb6, 0xfe5bfb4e),
-     TOBN(0x82ef1c41, 0x7884005d), TOBN(0xa2d4ec17, 0xffffcbae),
-     TOBN(0x9161c53f, 0x8aa95e66), TOBN(0x5ee104e1, 0xc5fee0d0),
-     TOBN(0x562e4cec, 0xc135b208), TOBN(0x74e1b265, 0x4783f47d),
-     TOBN(0x6d2a506c, 0x5a3f3b30), TOBN(0xecead9f4, 0xc16762fc),
-     TOBN(0xf29dd4b2, 0xe286e5b9), TOBN(0x1b0fadc0, 0x83bb3c61),
-     TOBN(0x7a75023e, 0x7fac29a4), TOBN(0xc086d5f1, 0xc9477fa3),
-     TOBN(0x0fc61135, 0x2f6f3076), TOBN(0xc99ffa23, 0xe3912a9a),
-     TOBN(0x6a0b0685, 0xd2f8ba3d), TOBN(0xfdc777e8, 0xe93358a4),
-     TOBN(0x94a787bb, 0x35415f04), TOBN(0x640c2d6a, 0x4d23fea4),
-     TOBN(0x9de917da, 0x153a35b5), TOBN(0x793e8d07, 0x5d5cd074),
-     TOBN(0xf4f87653, 0x2de45068), TOBN(0x37c7a7e8, 0x9e2e1f6e),
-     TOBN(0xd0825fa2, 0xa3584069), TOBN(0xaf2cea7c, 0x1727bf42),
-     TOBN(0x0360a4fb, 0x9e4785a9), TOBN(0xe5fda49c, 0x27299f4a),
-     TOBN(0x48068e13, 0x71ac2f71), TOBN(0x83d0687b, 0x9077666f),
-     TOBN(0x6d3883b2, 0x15d02819), TOBN(0x6d0d7550, 0x40dd9a35),
-     TOBN(0x61d7cbf9, 0x1d2b469f), TOBN(0xf97b232f, 0x2efc3115),
-     TOBN(0xa551d750, 0xb24bcbc7), TOBN(0x11ea4949, 0x88a1e356),
-     TOBN(0x7669f031, 0x93cb7501), TOBN(0x595dc55e, 0xca737b8a),
-     TOBN(0xa4a319ac, 0xd837879f), TOBN(0x6fc1b49e, 0xed6b67b0),
-     TOBN(0xe3959933, 0x32f1f3af), TOBN(0x966742eb, 0x65432a2e),
-     TOBN(0x4b8dc9fe, 0xb4966228), TOBN(0x96cc6312, 0x43f43950),
-     TOBN(0x12068859, 0xc9b731ee), TOBN(0x7b948dc3, 0x56f79968),
-     TOBN(0x61e4ad32, 0xed1f8008), TOBN(0xe6c9267a, 0xd8b17538),
-     TOBN(0x1ac7c5eb, 0x857ff6fb), TOBN(0x994baaa8, 0x55f2fb10),
-     TOBN(0x84cf14e1, 0x1d248018), TOBN(0x5a39898b, 0x628ac508),
-     TOBN(0x14fde97b, 0x5fa944f5), TOBN(0xed178030, 0xd12e5ac7),
-     TOBN(0x042c2af4, 0x97e2feb4), TOBN(0xd36a42d7, 0xaebf7313),
-     TOBN(0x49d2c9eb, 0x084ffdd7), TOBN(0x9f8aa54b, 0x2ef7c76a),
-     TOBN(0x9200b7ba, 0x09895e70), TOBN(0x3bd0c66f, 0xddb7fb58),
-     TOBN(0x2d97d108, 0x78eb4cbb), TOBN(0x2d431068, 0xd84bde31),
-     TOBN(0x4b523eb7, 0x172ccd1f), TOBN(0x7323cb28, 0x30a6a892),
-     TOBN(0x97082ec0, 0xcfe153eb), TOBN(0xe97f6b6a, 0xf2aadb97),
-     TOBN(0x1d3d393e, 0xd1a83da1), TOBN(0xa6a7f9c7, 0x804b2a68),
-     TOBN(0x4a688b48, 0x2d0cb71e), TOBN(0xa9b4cc5f, 0x40585278),
-     TOBN(0x5e5db46a, 0xcb66e132), TOBN(0xf1be963a, 0x0d925880),
-     TOBN(0x944a7027, 0x0317b9e2), TOBN(0xe266f959, 0x48603d48),
-     TOBN(0x98db6673, 0x5c208899), TOBN(0x90472447, 0xa2fb18a3),
-     TOBN(0x8a966939, 0x777c619f), TOBN(0x3798142a, 0x2a3be21b),
-     TOBN(0xb4241cb1, 0x3298b343), TOBN(0xa3a14e49, 0xb44f65a1),
-     TOBN(0xc5f4d6cd, 0x3ac77acd), TOBN(0xd0288cb5, 0x52b6fc3c),
-     TOBN(0xd5cc8c2f, 0x1c040abc), TOBN(0xb675511e, 0x06bf9b4a),
-     TOBN(0xd667da37, 0x9b3aa441), TOBN(0x460d45ce, 0x51601f72),
-     TOBN(0xe2f73c69, 0x6755ff89), TOBN(0xdd3cf7e7, 0x473017e6),
-     TOBN(0x8ef5689d, 0x3cf7600d), TOBN(0x948dc4f8, 0xb1fc87b4),
-     TOBN(0xd9e9fe81, 0x4ea53299), TOBN(0x2d921ca2, 0x98eb6028),
-     TOBN(0xfaecedfd, 0x0c9803fc), TOBN(0xf38ae891, 0x4d7b4745),
-     TOBN(0xd8c5fccf, 0xc5e3a3d8), TOBN(0xbefd904c, 0x4079dfbf),
-     TOBN(0xbc6d6a58, 0xfead0197), TOBN(0x39227077, 0x695532a4),
-     TOBN(0x09e23e6d, 0xdbef42f5), TOBN(0x7e449b64, 0x480a9908),
-     TOBN(0x7b969c1a, 0xad9a2e40), TOBN(0x6231d792, 0x9591c2a4),
-     TOBN(0x87151456, 0x0f664534), TOBN(0x85ceae7c, 0x4b68f103),
-     TOBN(0xac09c4ae, 0x65578ab9), TOBN(0x33ec6868, 0xf044b10c),
-     TOBN(0x6ac4832b, 0x3a8ec1f1), TOBN(0x5509d128, 0x5847d5ef),
-     TOBN(0xf909604f, 0x763f1574), TOBN(0xb16c4303, 0xc32f63c4),
-     TOBN(0xb6ab2014, 0x7ca23cd3), TOBN(0xcaa7a5c6, 0xa391849d),
-     TOBN(0x5b0673a3, 0x75678d94), TOBN(0xc982ddd4, 0xdd303e64),
-     TOBN(0xfd7b000b, 0x5db6f971), TOBN(0xbba2cb1f, 0x6f876f92),
-     TOBN(0xc77332a3, 0x3c569426), TOBN(0xa159100c, 0x570d74f8),
-     TOBN(0xfd16847f, 0xdec67ef5), TOBN(0x742ee464, 0x233e76b7),
-     TOBN(0x0b8e4134, 0xefc2b4c8), TOBN(0xca640b86, 0x42a3e521),
-     TOBN(0x653a0190, 0x8ceb6aa9), TOBN(0x313c300c, 0x547852d5),
-     TOBN(0x24e4ab12, 0x6b237af7), TOBN(0x2ba90162, 0x8bb47af8),
-     TOBN(0x3d5e58d6, 0xa8219bb7), TOBN(0xc691d0bd, 0x1b06c57f),
-     TOBN(0x0ae4cb10, 0xd257576e), TOBN(0x3569656c, 0xd54a3dc3),
-     TOBN(0xe5ebaebd, 0x94cda03a), TOBN(0x934e82d3, 0x162bfe13),
-     TOBN(0x450ac0ba, 0xe251a0c6), TOBN(0x480b9e11, 0xdd6da526),
-     TOBN(0x00467bc5, 0x8cce08b5), TOBN(0xb636458c, 0x7f178d55),
-     TOBN(0xc5748bae, 0xa677d806), TOBN(0x2763a387, 0xdfa394eb),
-     TOBN(0xa12b448a, 0x7d3cebb6), TOBN(0xe7adda3e, 0x6f20d850),
-     TOBN(0xf63ebce5, 0x1558462c), TOBN(0x58b36143, 0x620088a8),
-     TOBN(0x8a2cc3ca, 0x4d63c0ee), TOBN(0x51233117, 0x0fe948ce),
-     TOBN(0x7463fd85, 0x222ef33b), TOBN(0xadf0c7dc, 0x7c603d6c),
-     TOBN(0x0ec32d3b, 0xfe7765e5), TOBN(0xccaab359, 0xbf380409),
-     TOBN(0xbdaa84d6, 0x8e59319c), TOBN(0xd9a4c280, 0x9c80c34d),
-     TOBN(0xa9d89488, 0xa059c142), TOBN(0x6f5ae714, 0xff0b9346),
-     TOBN(0x068f237d, 0x16fb3664), TOBN(0x5853e4c4, 0x363186ac),
-     TOBN(0xe2d87d23, 0x63c52f98), TOBN(0x2ec4a766, 0x81828876),
-     TOBN(0x47b864fa, 0xe14e7b1c), TOBN(0x0c0bc0e5, 0x69192408),
-     TOBN(0xe4d7681d, 0xb82e9f3e), TOBN(0x83200f0b, 0xdf25e13c),
-     TOBN(0x8909984c, 0x66f27280), TOBN(0x462d7b00, 0x75f73227),
-     TOBN(0xd90ba188, 0xf2651798), TOBN(0x74c6e18c, 0x36ab1c34),
-     TOBN(0xab256ea3, 0x5ef54359), TOBN(0x03466612, 0xd1aa702f),
-     TOBN(0x624d6049, 0x2ed22e91), TOBN(0x6fdfe0b5, 0x6f072822),
-     TOBN(0xeeca1115, 0x39ce2271), TOBN(0x98100a4f, 0xdb01614f),
-     TOBN(0xb6b0daa2, 0xa35c628f), TOBN(0xb6f94d2e, 0xc87e9a47),
-     TOBN(0xc6773259, 0x1d57d9ce), TOBN(0xf70bfeec, 0x03884a7b),
-     TOBN(0x5fb35ccf, 0xed2bad01), TOBN(0xa155cbe3, 0x1da6a5c7),
-     TOBN(0xc2e2594c, 0x30a92f8f), TOBN(0x649c89ce, 0x5bfafe43),
-     TOBN(0xd158667d, 0xe9ff257a), TOBN(0x9b359611, 0xf32c50ae),
-     TOBN(0x4b00b20b, 0x906014cf), TOBN(0xf3a8cfe3, 0x89bc7d3d),
-     TOBN(0x4ff23ffd, 0x248a7d06), TOBN(0x80c5bfb4, 0x878873fa),
-     TOBN(0xb7d9ad90, 0x05745981), TOBN(0x179c85db, 0x3db01994),
-     TOBN(0xba41b062, 0x61a6966c), TOBN(0x4d82d052, 0xeadce5a8),
-     TOBN(0x9e91cd3b, 0xa5e6a318), TOBN(0x47795f4f, 0x95b2dda0),
-     TOBN(0xecfd7c1f, 0xd55a897c), TOBN(0x009194ab, 0xb29110fb),
-     TOBN(0x5f0e2046, 0xe381d3b0), TOBN(0x5f3425f6, 0xa98dd291),
-     TOBN(0xbfa06687, 0x730d50da), TOBN(0x0423446c, 0x4b083b7f),
-     TOBN(0x397a247d, 0xd69d3417), TOBN(0xeb629f90, 0x387ba42a),
-     TOBN(0x1ee426cc, 0xd5cd79bf), TOBN(0x0032940b, 0x946c6e18),
-     TOBN(0x1b1e8ae0, 0x57477f58), TOBN(0xe94f7d34, 0x6d823278),
-     TOBN(0xc747cb96, 0x782ba21a), TOBN(0xc5254469, 0xf72b33a5),
-     TOBN(0x772ef6de, 0xc7f80c81), TOBN(0xd73acbfe, 0x2cd9e6b5),
-     TOBN(0x4075b5b1, 0x49ee90d9), TOBN(0x785c339a, 0xa06e9eba),
-     TOBN(0xa1030d5b, 0xabf825e0), TOBN(0xcec684c3, 0xa42931dc),
-     TOBN(0x42ab62c9, 0xc1586e63), TOBN(0x45431d66, 0x5ab43f2b),
-     TOBN(0x57c8b2c0, 0x55f7835d), TOBN(0x033da338, 0xc1b7f865),
-     TOBN(0x283c7513, 0xcaa76097), TOBN(0x0a624fa9, 0x36c83906),
-     TOBN(0x6b20afec, 0x715af2c7), TOBN(0x4b969974, 0xeba78bfd),
-     TOBN(0x220755cc, 0xd921d60e), TOBN(0x9b944e10, 0x7baeca13),
-     TOBN(0x04819d51, 0x5ded93d4), TOBN(0x9bbff86e, 0x6dddfd27),
-     TOBN(0x6b344130, 0x77adc612), TOBN(0xa7496529, 0xbbd803a0),
-     TOBN(0x1a1baaa7, 0x6d8805bd), TOBN(0xc8403902, 0x470343ad),
-     TOBN(0x39f59f66, 0x175adff1), TOBN(0x0b26d7fb, 0xb7d8c5b7),
-     TOBN(0xa875f5ce, 0x529d75e3), TOBN(0x85efc7e9, 0x41325cc2),
-     TOBN(0x21950b42, 0x1ff6acd3), TOBN(0xffe70484, 0x53dc6909),
-     TOBN(0xff4cd0b2, 0x28766127), TOBN(0xabdbe608, 0x4fb7db2b),
-     TOBN(0x837c9228, 0x5e1109e8), TOBN(0x26147d27, 0xf4645b5a),
-     TOBN(0x4d78f592, 0xf7818ed8), TOBN(0xd394077e, 0xf247fa36),
-     TOBN(0x0fb9c2d0, 0x488c171a), TOBN(0xa78bfbaa, 0x13685278),
-     TOBN(0xedfbe268, 0xd5b1fa6a), TOBN(0x0dceb8db, 0x2b7eaba7),
-     TOBN(0xbf9e8089, 0x9ae2b710), TOBN(0xefde7ae6, 0xa4449c96),
-     TOBN(0x43b7716b, 0xcc143a46), TOBN(0xd7d34194, 0xc3628c13),
-     TOBN(0x508cec1c, 0x3b3f64c9), TOBN(0xe20bc0ba, 0x1e5edf3f),
-     TOBN(0xda1deb85, 0x2f4318d4), TOBN(0xd20ebe0d, 0x5c3fa443),
-     TOBN(0x370b4ea7, 0x73241ea3), TOBN(0x61f1511c, 0x5e1a5f65),
-     TOBN(0x99a5e23d, 0x82681c62), TOBN(0xd731e383, 0xa2f54c2d),
-     TOBN(0x2692f36e, 0x83445904), TOBN(0x2e0ec469, 0xaf45f9c0),
-     TOBN(0x905a3201, 0xc67528b7), TOBN(0x88f77f34, 0xd0e5e542),
-     TOBN(0xf67a8d29, 0x5864687c), TOBN(0x23b92eae, 0x22df3562),
-     TOBN(0x5c27014b, 0x9bbec39e), TOBN(0x7ef2f226, 0x9c0f0f8d),
-     TOBN(0x97359638, 0x546c4d8d), TOBN(0x5f9c3fc4, 0x92f24679),
-     TOBN(0x912e8bed, 0xa8c8acd9), TOBN(0xec3a318d, 0x306634b0),
-     TOBN(0x80167f41, 0xc31cb264), TOBN(0x3db82f6f, 0x522113f2),
-     TOBN(0xb155bcd2, 0xdcafe197), TOBN(0xfba1da59, 0x43465283),
-     TOBN(0xa0425b8e, 0xb212cf53), TOBN(0x4f2e512e, 0xf8557c5f),
-     TOBN(0xc1286ff9, 0x25c4d56c), TOBN(0xbb8a0fea, 0xee26c851),
-     TOBN(0xc28f70d2, 0xe7d6107e), TOBN(0x7ee0c444, 0xe76265aa),
-     TOBN(0x3df277a4, 0x1d1936b1), TOBN(0x1a556e3f, 0xea9595eb),
-     TOBN(0x258bbbf9, 0xe7305683), TOBN(0x31eea5bf, 0x07ef5be6),
-     TOBN(0x0deb0e4a, 0x46c814c1), TOBN(0x5cee8449, 0xa7b730dd),
-     TOBN(0xeab495c5, 0xa0182bde), TOBN(0xee759f87, 0x9e27a6b4),
-     TOBN(0xc2cf6a68, 0x80e518ca), TOBN(0x25e8013f, 0xf14cf3f4),
-     TOBN(0x8fc44140, 0x7e8d7a14), TOBN(0xbb1ff3ca, 0x9556f36a),
-     TOBN(0x6a844385, 0x14600044), TOBN(0xba3f0c4a, 0x7451ae63),
-     TOBN(0xdfcac25b, 0x1f9af32a), TOBN(0x01e0db86, 0xb1f2214b),
-     TOBN(0x4e9a5bc2, 0xa4b596ac), TOBN(0x83927681, 0x026c2c08),
-     TOBN(0x3ec832e7, 0x7acaca28), TOBN(0x1bfeea57, 0xc7385b29),
-     TOBN(0x068212e3, 0xfd1eaf38), TOBN(0xc1329830, 0x6acf8ccc),
-     TOBN(0xb909f2db, 0x2aac9e59), TOBN(0x5748060d, 0xb661782a),
-     TOBN(0xc5ab2632, 0xc79b7a01), TOBN(0xda44c6c6, 0x00017626),
-     TOBN(0xf26c00e8, 0xa7ea82f0), TOBN(0x99cac80d, 0xe4299aaf),
-     TOBN(0xd66fe3b6, 0x7ed78be1), TOBN(0x305f725f, 0x648d02cd),
-     TOBN(0x33ed1bc4, 0x623fb21b), TOBN(0xfa70533e, 0x7a6319ad),
-     TOBN(0x17ab562d, 0xbe5ffb3e), TOBN(0x06374994, 0x56674741),
-     TOBN(0x69d44ed6, 0x5c46aa8e), TOBN(0x2100d5d3, 0xa8d063d1),
-     TOBN(0xcb9727ea, 0xa2d17c36), TOBN(0x4c2bab1b, 0x8add53b7),
-     TOBN(0xa084e90c, 0x15426704), TOBN(0x778afcd3, 0xa837ebea),
-     TOBN(0x6651f701, 0x7ce477f8), TOBN(0xa0624998, 0x46fb7a8b),
-     TOBN(0xdc1e6828, 0xed8a6e19), TOBN(0x33fc2336, 0x4189d9c7),
-     TOBN(0x026f8fe2, 0x671c39bc), TOBN(0xd40c4ccd, 0xbc6f9915),
-     TOBN(0xafa135bb, 0xf80e75ca), TOBN(0x12c651a0, 0x22adff2c),
-     TOBN(0xc40a04bd, 0x4f51ad96), TOBN(0x04820109, 0xbbe4e832),
-     TOBN(0x3667eb1a, 0x7f4c04cc), TOBN(0x59556621, 0xa9404f84),
-     TOBN(0x71cdf653, 0x7eceb50a), TOBN(0x994a44a6, 0x9b8335fa),
-     TOBN(0xd7faf819, 0xdbeb9b69), TOBN(0x473c5680, 0xeed4350d),
-     TOBN(0xb6658466, 0xda44bba2), TOBN(0x0d1bc780, 0x872bdbf3),
-     TOBN(0xe535f175, 0xa1962f91), TOBN(0x6ed7e061, 0xed58f5a7),
-     TOBN(0x177aa4c0, 0x2089a233), TOBN(0x0dbcb03a, 0xe539b413),
-     TOBN(0xe3dc424e, 0xbb32e38e), TOBN(0x6472e5ef, 0x6806701e),
-     TOBN(0xdd47ff98, 0x814be9ee), TOBN(0x6b60cfff, 0x35ace009),
-     TOBN(0xb8d3d931, 0x9ff91fe5), TOBN(0x039c4800, 0xf0518eed),
-     TOBN(0x95c37632, 0x9182cb26), TOBN(0x0763a434, 0x82fc568d),
-     TOBN(0x707c04d5, 0x383e76ba), TOBN(0xac98b930, 0x824e8197),
-     TOBN(0x92bf7c8f, 0x91230de0), TOBN(0x90876a01, 0x40959b70),
-     TOBN(0xdb6d96f3, 0x05968b80), TOBN(0x380a0913, 0x089f73b9),
-     TOBN(0x7da70b83, 0xc2c61e01), TOBN(0x95fb8394, 0x569b38c7),
-     TOBN(0x9a3c6512, 0x80edfe2f), TOBN(0x8f726bb9, 0x8faeaf82),
-     TOBN(0x8010a4a0, 0x78424bf8), TOBN(0x29672044, 0x0e844970)}
-    ,
-    {TOBN(0x63c5cb81, 0x7a2ad62a), TOBN(0x7ef2b6b9, 0xac62ff54),
-     TOBN(0x3749bba4, 0xb3ad9db5), TOBN(0xad311f2c, 0x46d5a617),
-     TOBN(0xb77a8087, 0xc2ff3b6d), TOBN(0xb46feaf3, 0x367834ff),
-     TOBN(0xf8aa266d, 0x75d6b138), TOBN(0xfa38d320, 0xec008188),
-     TOBN(0x486d8ffa, 0x696946fc), TOBN(0x50fbc6d8, 0xb9cba56d),
-     TOBN(0x7e3d423e, 0x90f35a15), TOBN(0x7c3da195, 0xc0dd962c),
-     TOBN(0xe673fdb0, 0x3cfd5d8b), TOBN(0x0704b7c2, 0x889dfca5),
-     TOBN(0xf6ce581f, 0xf52305aa), TOBN(0x399d49eb, 0x914d5e53),
-     TOBN(0x380a496d, 0x6ec293cd), TOBN(0x733dbda7, 0x8e7051f5),
-     TOBN(0x037e388d, 0xb849140a), TOBN(0xee4b32b0, 0x5946dbf6),
-     TOBN(0xb1c4fda9, 0xcae368d1), TOBN(0x5001a7b0, 0xfdb0b2f3),
-     TOBN(0x6df59374, 0x2e3ac46e), TOBN(0x4af675f2, 0x39b3e656),
-     TOBN(0x44e38110, 0x39949296), TOBN(0x5b63827b, 0x361db1b5),
-     TOBN(0x3e5323ed, 0x206eaff5), TOBN(0x942370d2, 0xc21f4290),
-     TOBN(0xf2caaf2e, 0xe0d985a1), TOBN(0x192cc64b, 0x7239846d),
-     TOBN(0x7c0b8f47, 0xae6312f8), TOBN(0x7dc61f91, 0x96620108),
-     TOBN(0xb830fb5b, 0xc2da7de9), TOBN(0xd0e643df, 0x0ff8d3be),
-     TOBN(0x31ee77ba, 0x188a9641), TOBN(0x4e8aa3aa, 0xbcf6d502),
-     TOBN(0xf9fb6532, 0x9a49110f), TOBN(0xd18317f6, 0x2dd6b220),
-     TOBN(0x7e3ced41, 0x52c3ea5a), TOBN(0x0d296a14, 0x7d579c4a),
-     TOBN(0x35d6a53e, 0xed4c3717), TOBN(0x9f8240cf, 0x3d0ed2a3),
-     TOBN(0x8c0d4d05, 0xe5543aa5), TOBN(0x45d5bbfb, 0xdd33b4b4),
-     TOBN(0xfa04cc73, 0x137fd28e), TOBN(0x862ac6ef, 0xc73b3ffd),
-     TOBN(0x403ff9f5, 0x31f51ef2), TOBN(0x34d5e0fc, 0xbc73f5a2),
-     TOBN(0xf2526820, 0x08913f4f), TOBN(0xea20ed61, 0xeac93d95),
-     TOBN(0x51ed38b4, 0x6ca6b26c), TOBN(0x8662dcbc, 0xea4327b0),
-     TOBN(0x6daf295c, 0x725d2aaa), TOBN(0xbad2752f, 0x8e52dcda),
-     TOBN(0x2210e721, 0x0b17dacc), TOBN(0xa37f7912, 0xd51e8232),
-     TOBN(0x4f7081e1, 0x44cc3add), TOBN(0xd5ffa1d6, 0x87be82cf),
-     TOBN(0x89890b6c, 0x0edd6472), TOBN(0xada26e1a, 0x3ed17863),
-     TOBN(0x276f2715, 0x63483caa), TOBN(0xe6924cd9, 0x2f6077fd),
-     TOBN(0x05a7fe98, 0x0a466e3c), TOBN(0xf1c794b0, 0xb1902d1f),
-     TOBN(0xe5213688, 0x82a8042c), TOBN(0xd931cfaf, 0xcd278298),
-     TOBN(0x069a0ae0, 0xf597a740), TOBN(0x0adbb3f3, 0xeb59107c),
-     TOBN(0x983e951e, 0x5eaa8eb8), TOBN(0xe663a8b5, 0x11b48e78),
-     TOBN(0x1631cc0d, 0x8a03f2c5), TOBN(0x7577c11e, 0x11e271e2),
-     TOBN(0x33b2385c, 0x08369a90), TOBN(0x2990c59b, 0x190eb4f8),
-     TOBN(0x819a6145, 0xc68eac80), TOBN(0x7a786d62, 0x2ec4a014),
-     TOBN(0x33faadbe, 0x20ac3a8d), TOBN(0x31a21781, 0x5aba2d30),
-     TOBN(0x209d2742, 0xdba4f565), TOBN(0xdb2ce9e3, 0x55aa0fbb),
-     TOBN(0x8cef334b, 0x168984df), TOBN(0xe81dce17, 0x33879638),
-     TOBN(0xf6e6949c, 0x263720f0), TOBN(0x5c56feaf, 0xf593cbec),
-     TOBN(0x8bff5601, 0xfde58c84), TOBN(0x74e24117, 0x2eccb314),
-     TOBN(0xbcf01b61, 0x4c9a8a78), TOBN(0xa233e35e, 0x544c9868),
-     TOBN(0xb3156bf3, 0x8bd7aff1), TOBN(0x1b5ee4cb, 0x1d81b146),
-     TOBN(0x7ba1ac41, 0xd628a915), TOBN(0x8f3a8f9c, 0xfd89699e),
-     TOBN(0x7329b9c9, 0xa0748be7), TOBN(0x1d391c95, 0xa92e621f),
-     TOBN(0xe51e6b21, 0x4d10a837), TOBN(0xd255f53a, 0x4947b435),
-     TOBN(0x07669e04, 0xf1788ee3), TOBN(0xc14f27af, 0xa86938a2),
-     TOBN(0x8b47a334, 0xe93a01c0), TOBN(0xff627438, 0xd9366808),
-     TOBN(0x7a0985d8, 0xca2a5965), TOBN(0x3d9a5542, 0xd6e9b9b3),
-     TOBN(0xc23eb80b, 0x4cf972e8), TOBN(0x5c1c33bb, 0x4fdf72fd),
-     TOBN(0x0c4a58d4, 0x74a86108), TOBN(0xf8048a8f, 0xee4c5d90),
-     TOBN(0xe3c7c924, 0xe86d4c80), TOBN(0x28c889de, 0x056a1e60),
-     TOBN(0x57e2662e, 0xb214a040), TOBN(0xe8c48e98, 0x37e10347),
-     TOBN(0x87742862, 0x80ac748a), TOBN(0xf1c24022, 0x186b06f2),
-     TOBN(0xac2dd4c3, 0x5f74040a), TOBN(0x409aeb71, 0xfceac957),
-     TOBN(0x4fbad782, 0x55c4ec23), TOBN(0xb359ed61, 0x8a7b76ec),
-     TOBN(0x12744926, 0xed6f4a60), TOBN(0xe21e8d7f, 0x4b912de3),
-     TOBN(0xe2575a59, 0xfc705a59), TOBN(0x72f1d4de, 0xed2dbc0e),
-     TOBN(0x3d2b24b9, 0xeb7926b8), TOBN(0xbff88cb3, 0xcdbe5509),
-     TOBN(0xd0f399af, 0xe4dd640b), TOBN(0x3c5fe130, 0x2f76ed45),
-     TOBN(0x6f3562f4, 0x3764fb3d), TOBN(0x7b5af318, 0x3151b62d),
-     TOBN(0xd5bd0bc7, 0xd79ce5f3), TOBN(0xfdaf6b20, 0xec66890f),
-     TOBN(0x735c67ec, 0x6063540c), TOBN(0x50b259c2, 0xe5f9cb8f),
-     TOBN(0xb8734f9a, 0x3f99c6ab), TOBN(0xf8cc13d5, 0xa3a7bc85),
-     TOBN(0x80c1b305, 0xc5217659), TOBN(0xfe5364d4, 0x4ec12a54),
-     TOBN(0xbd87045e, 0x681345fe), TOBN(0x7f8efeb1, 0x582f897f),
-     TOBN(0xe8cbf1e5, 0xd5923359), TOBN(0xdb0cea9d, 0x539b9fb0),
-     TOBN(0x0c5b34cf, 0x49859b98), TOBN(0x5e583c56, 0xa4403cc6),
-     TOBN(0x11fc1a2d, 0xd48185b7), TOBN(0xc93fbc7e, 0x6e521787),
-     TOBN(0x47e7a058, 0x05105b8b), TOBN(0x7b4d4d58, 0xdb8260c8),
-     TOBN(0xe33930b0, 0x46eb842a), TOBN(0x8e844a9a, 0x7bdae56d),
-     TOBN(0x34ef3a9e, 0x13f7fdfc), TOBN(0xb3768f82, 0x636ca176),
-     TOBN(0x2821f4e0, 0x4e09e61c), TOBN(0x414dc3a1, 0xa0c7cddc),
-     TOBN(0xd5379437, 0x54945fcd), TOBN(0x151b6eef, 0xb3555ff1),
-     TOBN(0xb31bd613, 0x6339c083), TOBN(0x39ff8155, 0xdfb64701),
-     TOBN(0x7c3388d2, 0xe29604ab), TOBN(0x1e19084b, 0xa6b10442),
-     TOBN(0x17cf54c0, 0xeccd47ef), TOBN(0x89693385, 0x4a5dfb30),
-     TOBN(0x69d023fb, 0x47daf9f6), TOBN(0x9222840b, 0x7d91d959),
-     TOBN(0x439108f5, 0x803bac62), TOBN(0x0b7dd91d, 0x379bd45f),
-     TOBN(0xd651e827, 0xca63c581), TOBN(0x5c5d75f6, 0x509c104f),
-     TOBN(0x7d5fc738, 0x1f2dc308), TOBN(0x20faa7bf, 0xd98454be),
-     TOBN(0x95374bee, 0xa517b031), TOBN(0xf036b9b1, 0x642692ac),
-     TOBN(0xc5106109, 0x39842194), TOBN(0xb7e2353e, 0x49d05295),
-     TOBN(0xfc8c1d5c, 0xefb42ee0), TOBN(0xe04884eb, 0x08ce811c),
-     TOBN(0xf1f75d81, 0x7419f40e), TOBN(0x5b0ac162, 0xa995c241),
-     TOBN(0x120921bb, 0xc4c55646), TOBN(0x713520c2, 0x8d33cf97),
-     TOBN(0xb4a65a5c, 0xe98c5100), TOBN(0x6cec871d, 0x2ddd0f5a),
-     TOBN(0x251f0b7f, 0x9ba2e78b), TOBN(0x224a8434, 0xce3a2a5f),
-     TOBN(0x26827f61, 0x25f5c46f), TOBN(0x6a22bedc, 0x48545ec0),
-     TOBN(0x25ae5fa0, 0xb1bb5cdc), TOBN(0xd693682f, 0xfcb9b98f),
-     TOBN(0x32027fe8, 0x91e5d7d3), TOBN(0xf14b7d17, 0x73a07678),
-     TOBN(0xf88497b3, 0xc0dfdd61), TOBN(0xf7c2eec0, 0x2a8c4f48),
-     TOBN(0xaa5573f4, 0x3756e621), TOBN(0xc013a240, 0x1825b948),
-     TOBN(0x1c03b345, 0x63878572), TOBN(0xa0472bea, 0x653a4184),
-     TOBN(0xf4222e27, 0x0ac69a80), TOBN(0x34096d25, 0xf51e54f6),
-     TOBN(0x00a648cb, 0x8fffa591), TOBN(0x4e87acdc, 0x69b6527f),
-     TOBN(0x0575e037, 0xe285ccb4), TOBN(0x188089e4, 0x50ddcf52),
-     TOBN(0xaa96c9a8, 0x870ff719), TOBN(0x74a56cd8, 0x1fc7e369),
-     TOBN(0x41d04ee2, 0x1726931a), TOBN(0x0bbbb2c8, 0x3660ecfd),
-     TOBN(0xa6ef6de5, 0x24818e18), TOBN(0xe421cc51, 0xe7d57887),
-     TOBN(0xf127d208, 0xbea87be6), TOBN(0x16a475d3, 0xb1cdd682),
-     TOBN(0x9db1b684, 0x439b63f7), TOBN(0x5359b3db, 0xf0f113b6),
-     TOBN(0xdfccf1de, 0x8bf06e31), TOBN(0x1fdf8f44, 0xdd383901),
-     TOBN(0x10775cad, 0x5017e7d2), TOBN(0xdfc3a597, 0x58d11eef),
-     TOBN(0x6ec9c8a0, 0xb1ecff10), TOBN(0xee6ed6cc, 0x28400549),
-     TOBN(0xb5ad7bae, 0x1b4f8d73), TOBN(0x61b4f11d, 0xe00aaab9),
-     TOBN(0x7b32d69b, 0xd4eff2d7), TOBN(0x88ae6771, 0x4288b60f),
-     TOBN(0x159461b4, 0x37a1e723), TOBN(0x1f3d4789, 0x570aae8c),
-     TOBN(0x869118c0, 0x7f9871da), TOBN(0x35fbda78, 0xf635e278),
-     TOBN(0x738f3641, 0xe1541dac), TOBN(0x6794b13a, 0xc0dae45f),
-     TOBN(0x065064ac, 0x09cc0917), TOBN(0x27c53729, 0xc68540fd),
-     TOBN(0x0d2d4c8e, 0xef227671), TOBN(0xd23a9f80, 0xa1785a04),
-     TOBN(0x98c59528, 0x52650359), TOBN(0xfa09ad01, 0x74a1acad),
-     TOBN(0x082d5a29, 0x0b55bf5c), TOBN(0xa40f1c67, 0x419b8084),
-     TOBN(0x3a5c752e, 0xdcc18770), TOBN(0x4baf1f2f, 0x8825c3a5),
-     TOBN(0xebd63f74, 0x21b153ed), TOBN(0xa2383e47, 0xb2f64723),
-     TOBN(0xe7bf620a, 0x2646d19a), TOBN(0x56cb44ec, 0x03c83ffd),
-     TOBN(0xaf7267c9, 0x4f6be9f1), TOBN(0x8b2dfd7b, 0xc06bb5e9),
-     TOBN(0xb87072f2, 0xa672c5c7), TOBN(0xeacb11c8, 0x0d53c5e2),
-     TOBN(0x22dac29d, 0xff435932), TOBN(0x37bdb99d, 0x4408693c),
-     TOBN(0xf6e62fb6, 0x2899c20f), TOBN(0x3535d512, 0x447ece24),
-     TOBN(0xfbdc6b88, 0xff577ce3), TOBN(0x726693bd, 0x190575f2),
-     TOBN(0x6772b0e5, 0xab4b35a2), TOBN(0x1d8b6001, 0xf5eeaacf),
-     TOBN(0x728f7ce4, 0x795b9580), TOBN(0x4a20ed2a, 0x41fb81da),
-     TOBN(0x9f685cd4, 0x4fec01e6), TOBN(0x3ed7ddcc, 0xa7ff50ad),
-     TOBN(0x460fd264, 0x0c2d97fd), TOBN(0x3a241426, 0xeb82f4f9),
-     TOBN(0x17d1df2c, 0x6a8ea820), TOBN(0xb2b50d3b, 0xf22cc254),
-     TOBN(0x03856cba, 0xb7291426), TOBN(0x87fd26ae, 0x04f5ee39),
-     TOBN(0x9cb696cc, 0x02bee4ba), TOBN(0x53121804, 0x06820fd6),
-     TOBN(0xa5dfc269, 0x0212e985), TOBN(0x666f7ffa, 0x160f9a09),
-     TOBN(0xc503cd33, 0xbccd9617), TOBN(0x365dede4, 0xba7730a3),
-     TOBN(0x798c6355, 0x5ddb0786), TOBN(0xa6c3200e, 0xfc9cd3bc),
-     TOBN(0x060ffb2c, 0xe5e35efd), TOBN(0x99a4e25b, 0x5555a1c1),
-     TOBN(0x11d95375, 0xf70b3751), TOBN(0x0a57354a, 0x160e1bf6),
-     TOBN(0xecb3ae4b, 0xf8e4b065), TOBN(0x07a834c4, 0x2e53022b),
-     TOBN(0x1cd300b3, 0x8692ed96), TOBN(0x16a6f792, 0x61ee14ec),
-     TOBN(0x8f1063c6, 0x6a8649ed), TOBN(0xfbcdfcfe, 0x869f3e14),
-     TOBN(0x2cfb97c1, 0x00a7b3ec), TOBN(0xcea49b3c, 0x7130c2f1),
-     TOBN(0x462d044f, 0xe9d96488), TOBN(0x4b53d52e, 0x8182a0c1),
-     TOBN(0x84b6ddd3, 0x0391e9e9), TOBN(0x80ab7b48, 0xb1741a09),
-     TOBN(0xec0e15d4, 0x27d3317f), TOBN(0x8dfc1ddb, 0x1a64671e),
-     TOBN(0x93cc5d5f, 0xd49c5b92), TOBN(0xc995d53d, 0x3674a331),
-     TOBN(0x302e41ec, 0x090090ae), TOBN(0x2278a0cc, 0xedb06830),
-     TOBN(0x1d025932, 0xfbc99690), TOBN(0x0c32fbd2, 0xb80d68da),
-     TOBN(0xd79146da, 0xf341a6c1), TOBN(0xae0ba139, 0x1bef68a0),
-     TOBN(0xc6b8a563, 0x8d774b3a), TOBN(0x1cf307bd, 0x880ba4d7),
-     TOBN(0xc033bdc7, 0x19803511), TOBN(0xa9f97b3b, 0x8888c3be),
-     TOBN(0x3d68aebc, 0x85c6d05e), TOBN(0xc3b88a9d, 0x193919eb),
-     TOBN(0x2d300748, 0xc48b0ee3), TOBN(0x7506bc7c, 0x07a746c1),
-     TOBN(0xfc48437c, 0x6e6d57f3), TOBN(0x5bd71587, 0xcfeaa91a),
-     TOBN(0xa4ed0408, 0xc1bc5225), TOBN(0xd0b946db, 0x2719226d),
-     TOBN(0x109ecd62, 0x758d2d43), TOBN(0x75c8485a, 0x2751759b),
-     TOBN(0xb0b75f49, 0x9ce4177a), TOBN(0x4fa61a1e, 0x79c10c3d),
-     TOBN(0xc062d300, 0xa167fcd7), TOBN(0x4df3874c, 0x750f0fa8),
-     TOBN(0x29ae2cf9, 0x83dfedc9), TOBN(0xf8437134, 0x8d87631a),
-     TOBN(0xaf571711, 0x7429c8d2), TOBN(0x18d15867, 0x146d9272),
-     TOBN(0x83053ecf, 0x69769bb7), TOBN(0xc55eb856, 0xc479ab82),
-     TOBN(0x5ef7791c, 0x21b0f4b2), TOBN(0xaa5956ba, 0x3d491525),
-     TOBN(0x407a96c2, 0x9fe20eba), TOBN(0xf27168bb, 0xe52a5ad3),
-     TOBN(0x43b60ab3, 0xbf1d9d89), TOBN(0xe45c51ef, 0x710e727a),
-     TOBN(0xdfca5276, 0x099b4221), TOBN(0x8dc6407c, 0x2557a159),
-     TOBN(0x0ead8335, 0x91035895), TOBN(0x0a9db957, 0x9c55dc32),
-     TOBN(0xe40736d3, 0xdf61bc76), TOBN(0x13a619c0, 0x3f778cdb),
-     TOBN(0x6dd921a4, 0xc56ea28f), TOBN(0x76a52433, 0x2fa647b4),
-     TOBN(0x23591891, 0xac5bdc5d), TOBN(0xff4a1a72, 0xbac7dc01),
-     TOBN(0x9905e261, 0x62df8453), TOBN(0x3ac045df, 0xe63b265f),
-     TOBN(0x8a3f341b, 0xad53dba7), TOBN(0x8ec269cc, 0x837b625a),
-     TOBN(0xd71a2782, 0x3ae31189), TOBN(0x8fb4f9a3, 0x55e96120),
-     TOBN(0x804af823, 0xff9875cf), TOBN(0x23224f57, 0x5d442a9b),
-     TOBN(0x1c4d3b9e, 0xecc62679), TOBN(0x91da22fb, 0xa0e7ddb1),
-     TOBN(0xa370324d, 0x6c04a661), TOBN(0x9710d3b6, 0x5e376d17),
-     TOBN(0xed8c98f0, 0x3044e357), TOBN(0xc364ebbe, 0x6422701c),
-     TOBN(0x347f5d51, 0x7733d61c), TOBN(0xd55644b9, 0xcea826c3),
-     TOBN(0x80c6e0ad, 0x55a25548), TOBN(0x0aa7641d, 0x844220a7),
-     TOBN(0x1438ec81, 0x31810660), TOBN(0x9dfa6507, 0xde4b4043),
-     TOBN(0x10b515d8, 0xcc3e0273), TOBN(0x1b6066dd, 0x28d8cfb2),
-     TOBN(0xd3b04591, 0x9c9efebd), TOBN(0x425d4bdf, 0xa21c1ff4),
-     TOBN(0x5fe5af19, 0xd57607d3), TOBN(0xbbf773f7, 0x54481084),
-     TOBN(0x8435bd69, 0x94b03ed1), TOBN(0xd9ad1de3, 0x634cc546),
-     TOBN(0x2cf423fc, 0x00e420ca), TOBN(0xeed26d80, 0xa03096dd),
-     TOBN(0xd7f60be7, 0xa4db09d2), TOBN(0xf47f569d, 0x960622f7),
-     TOBN(0xe5925fd7, 0x7296c729), TOBN(0xeff2db26, 0x26ca2715),
-     TOBN(0xa6fcd014, 0xb913e759), TOBN(0x53da4786, 0x8ff4de93),
-     TOBN(0x14616d79, 0xc32068e1), TOBN(0xb187d664, 0xccdf352e),
-     TOBN(0xf7afb650, 0x1dc90b59), TOBN(0x8170e943, 0x7daa1b26),
-     TOBN(0xc8e3bdd8, 0x700c0a84), TOBN(0x6e8d345f, 0x6482bdfa),
-     TOBN(0x84cfbfa1, 0xc5c5ea50), TOBN(0xd3baf14c, 0x67960681),
-     TOBN(0x26398403, 0x0dd50942), TOBN(0xe4b7839c, 0x4716a663),
-     TOBN(0xd5f1f794, 0xe7de6dc0), TOBN(0x5cd0f4d4, 0x622aa7ce),
-     TOBN(0x5295f3f1, 0x59acfeec), TOBN(0x8d933552, 0x953e0607),
-     TOBN(0xc7db8ec5, 0x776c5722), TOBN(0xdc467e62, 0x2b5f290c),
-     TOBN(0xd4297e70, 0x4ff425a9), TOBN(0x4be924c1, 0x0cf7bb72),
-     TOBN(0x0d5dc5ae, 0xa1892131), TOBN(0x8bf8a8e3, 0xa705c992),
-     TOBN(0x73a0b064, 0x7a305ac5), TOBN(0x00c9ca4e, 0x9a8c77a8),
-     TOBN(0x5dfee80f, 0x83774bdd), TOBN(0x63131602, 0x85734485),
-     TOBN(0xa1b524ae, 0x914a69a9), TOBN(0xebc2ffaf, 0xd4e300d7),
-     TOBN(0x52c93db7, 0x7cfa46a5), TOBN(0x71e6161f, 0x21653b50),
-     TOBN(0x3574fc57, 0xa4bc580a), TOBN(0xc09015dd, 0xe1bc1253),
-     TOBN(0x4b7b47b2, 0xd174d7aa), TOBN(0x4072d8e8, 0xf3a15d04),
-     TOBN(0xeeb7d47f, 0xd6fa07ed), TOBN(0x6f2b9ff9, 0xedbdafb1),
-     TOBN(0x18c51615, 0x3760fe8a), TOBN(0x7a96e6bf, 0xf06c6c13),
-     TOBN(0x4d7a0410, 0x0ea2d071), TOBN(0xa1914e9b, 0x0be2a5ce),
-     TOBN(0x5726e357, 0xd8a3c5cf), TOBN(0x1197ecc3, 0x2abb2b13),
-     TOBN(0x6c0d7f7f, 0x31ae88dd), TOBN(0x15b20d1a, 0xfdbb3efe),
-     TOBN(0xcd06aa26, 0x70584039), TOBN(0x2277c969, 0xa7dc9747),
-     TOBN(0xbca69587, 0x7855d815), TOBN(0x899ea238, 0x5188b32a),
-     TOBN(0x37d9228b, 0x760c1c9d), TOBN(0xc7efbb11, 0x9b5c18da),
-     TOBN(0x7f0d1bc8, 0x19f6dbc5), TOBN(0x4875384b, 0x07e6905b),
-     TOBN(0xc7c50baa, 0x3ba8cd86), TOBN(0xb0ce40fb, 0xc2905de0),
-     TOBN(0x70840673, 0x7a231952), TOBN(0xa912a262, 0xcf43de26),
-     TOBN(0x9c38ddcc, 0xeb5b76c1), TOBN(0x746f5285, 0x26fc0ab4),
-     TOBN(0x52a63a50, 0xd62c269f), TOBN(0x60049c55, 0x99458621),
-     TOBN(0xe7f48f82, 0x3c2f7c9e), TOBN(0x6bd99043, 0x917d5cf3),
-     TOBN(0xeb1317a8, 0x8701f469), TOBN(0xbd3fe2ed, 0x9a449fe0),
-     TOBN(0x421e79ca, 0x12ef3d36), TOBN(0x9ee3c36c, 0x3e7ea5de),
-     TOBN(0xe48198b5, 0xcdff36f7), TOBN(0xaff4f967, 0xc6b82228),
-     TOBN(0x15e19dd0, 0xc47adb7e), TOBN(0x45699b23, 0x032e7dfa),
-     TOBN(0x40680c8b, 0x1fae026a), TOBN(0x5a347a48, 0x550dbf4d),
-     TOBN(0xe652533b, 0x3cef0d7d), TOBN(0xd94f7b18, 0x2bbb4381),
-     TOBN(0x838752be, 0x0e80f500), TOBN(0x8e6e2488, 0x9e9c9bfb),
-     TOBN(0xc9751697, 0x16caca6a), TOBN(0x866c49d8, 0x38531ad9),
-     TOBN(0xc917e239, 0x7151ade1), TOBN(0x2d016ec1, 0x6037c407),
-     TOBN(0xa407ccc9, 0x00eac3f9), TOBN(0x835f6280, 0xe2ed4748),
-     TOBN(0xcc54c347, 0x1cc98e0d), TOBN(0x0e969937, 0xdcb572eb),
-     TOBN(0x1b16c8e8, 0x8f30c9cb), TOBN(0xa606ae75, 0x373c4661),
-     TOBN(0x47aa689b, 0x35502cab), TOBN(0xf89014ae, 0x4d9bb64f),
-     TOBN(0x202f6a9c, 0x31c71f7b), TOBN(0x01f95aa3, 0x296ffe5c),
-     TOBN(0x5fc06014, 0x53cec3a3), TOBN(0xeb991237, 0x5f498a45),
-     TOBN(0xae9a935e, 0x5d91ba87), TOBN(0xc6ac6281, 0x0b564a19),
-     TOBN(0x8a8fe81c, 0x3bd44e69), TOBN(0x7c8b467f, 0x9dd11d45),
-     TOBN(0xf772251f, 0xea5b8e69), TOBN(0xaeecb3bd, 0xc5b75fbc),
-     TOBN(0x1aca3331, 0x887ff0e5), TOBN(0xbe5d49ff, 0x19f0a131),
-     TOBN(0x582c13aa, 0xe5c8646f), TOBN(0xdbaa12e8, 0x20e19980),
-     TOBN(0x8f40f31a, 0xf7abbd94), TOBN(0x1f13f5a8, 0x1dfc7663),
-     TOBN(0x5d81f1ee, 0xaceb4fc0), TOBN(0x36256002, 0x5e6f0f42),
-     TOBN(0x4b67d6d7, 0x751370c8), TOBN(0x2608b698, 0x03e80589),
-     TOBN(0xcfc0d2fc, 0x05268301), TOBN(0xa6943d39, 0x40309212),
-     TOBN(0x192a90c2, 0x1fd0e1c2), TOBN(0xb209f113, 0x37f1dc76),
-     TOBN(0xefcc5e06, 0x97bf1298), TOBN(0xcbdb6730, 0x219d639e),
-     TOBN(0xd009c116, 0xb81e8c6f), TOBN(0xa3ffdde3, 0x1a7ce2e5),
-     TOBN(0xc53fbaaa, 0xa914d3ba), TOBN(0x836d500f, 0x88df85ee),
-     TOBN(0xd98dc71b, 0x66ee0751), TOBN(0x5a3d7005, 0x714516fd),
-     TOBN(0x21d3634d, 0x39eedbba), TOBN(0x35cd2e68, 0x0455a46d),
-     TOBN(0xc8cafe65, 0xf9d7eb0c), TOBN(0xbda3ce9e, 0x00cefb3e),
-     TOBN(0xddc17a60, 0x2c9cf7a4), TOBN(0x01572ee4, 0x7bcb8773),
-     TOBN(0xa92b2b01, 0x8c7548df), TOBN(0x732fd309, 0xa84600e3),
-     TOBN(0xe22109c7, 0x16543a40), TOBN(0x9acafd36, 0xfede3c6c),
-     TOBN(0xfb206852, 0x6824e614), TOBN(0x2a4544a9, 0xda25dca0),
-     TOBN(0x25985262, 0x91d60b06), TOBN(0x281b7be9, 0x28753545),
-     TOBN(0xec667b1a, 0x90f13b27), TOBN(0x33a83aff, 0x940e2eb4),
-     TOBN(0x80009862, 0xd5d721d5), TOBN(0x0c3357a3, 0x5bd3a182),
-     TOBN(0x27f3a83b, 0x7aa2cda4), TOBN(0xb58ae74e, 0xf6f83085),
-     TOBN(0x2a911a81, 0x2e6dad6b), TOBN(0xde286051, 0xf43d6c5b),
-     TOBN(0x4bdccc41, 0xf996c4d8), TOBN(0xe7312ec0, 0x0ae1e24e)}
-    ,
-    {TOBN(0xf8d112e7, 0x6e6485b3), TOBN(0x4d3e24db, 0x771c52f8),
-     TOBN(0x48e3ee41, 0x684a2f6d), TOBN(0x7161957d, 0x21d95551),
-     TOBN(0x19631283, 0xcdb12a6c), TOBN(0xbf3fa882, 0x2e50e164),
-     TOBN(0xf6254b63, 0x3166cc73), TOBN(0x3aefa7ae, 0xaee8cc38),
-     TOBN(0x79b0fe62, 0x3b36f9fd), TOBN(0x26543b23, 0xfde19fc0),
-     TOBN(0x136e64a0, 0x958482ef), TOBN(0x23f63771, 0x9b095825),
-     TOBN(0x14cfd596, 0xb6a1142e), TOBN(0x5ea6aac6, 0x335aac0b),
-     TOBN(0x86a0e8bd, 0xf3081dd5), TOBN(0x5fb89d79, 0x003dc12a),
-     TOBN(0xf615c33a, 0xf72e34d4), TOBN(0x0bd9ea40, 0x110eec35),
-     TOBN(0x1c12bc5b, 0xc1dea34e), TOBN(0x686584c9, 0x49ae4699),
-     TOBN(0x13ad95d3, 0x8c97b942), TOBN(0x4609561a, 0x4e5c7562),
-     TOBN(0x9e94a4ae, 0xf2737f89), TOBN(0xf57594c6, 0x371c78b6),
-     TOBN(0x0f0165fc, 0xe3779ee3), TOBN(0xe00e7f9d, 0xbd495d9e),
-     TOBN(0x1fa4efa2, 0x20284e7a), TOBN(0x4564bade, 0x47ac6219),
-     TOBN(0x90e6312a, 0xc4708e8e), TOBN(0x4f5725fb, 0xa71e9adf),
-     TOBN(0xe95f55ae, 0x3d684b9f), TOBN(0x47f7ccb1, 0x1e94b415),
-     TOBN(0x7322851b, 0x8d946581), TOBN(0xf0d13133, 0xbdf4a012),
-     TOBN(0xa3510f69, 0x6584dae0), TOBN(0x03a7c171, 0x3c9f6c6d),
-     TOBN(0x5be97f38, 0xe475381a), TOBN(0xca1ba422, 0x85823334),
-     TOBN(0xf83cc5c7, 0x0be17dda), TOBN(0x158b1494, 0x0b918c0f),
-     TOBN(0xda3a77e5, 0x522e6b69), TOBN(0x69c908c3, 0xbbcd6c18),
-     TOBN(0x1f1b9e48, 0xd924fd56), TOBN(0x37c64e36, 0xaa4bb3f7),
-     TOBN(0x5a4fdbdf, 0xee478d7d), TOBN(0xba75c8bc, 0x0193f7a0),
-     TOBN(0x84bc1e84, 0x56cd16df), TOBN(0x1fb08f08, 0x46fad151),
-     TOBN(0x8a7cabf9, 0x842e9f30), TOBN(0xa331d4bf, 0x5eab83af),
-     TOBN(0xd272cfba, 0x017f2a6a), TOBN(0x27560abc, 0x83aba0e3),
-     TOBN(0x94b83387, 0x0e3a6b75), TOBN(0x25c6aea2, 0x6b9f50f5),
-     TOBN(0x803d691d, 0xb5fdf6d0), TOBN(0x03b77509, 0xe6333514),
-     TOBN(0x36178903, 0x61a341c1), TOBN(0x3604dc60, 0x0cfd6142),
-     TOBN(0x022295eb, 0x8533316c), TOBN(0x3dbde4ac, 0x44af2922),
-     TOBN(0x898afc5d, 0x1c7eef69), TOBN(0x58896805, 0xd14f4fa1),
-     TOBN(0x05002160, 0x203c21ca), TOBN(0x6f0d1f30, 0x40ef730b),
-     TOBN(0x8e8c44d4, 0x196224f8), TOBN(0x75a4ab95, 0x374d079d),
-     TOBN(0x79085ecc, 0x7d48f123), TOBN(0x56f04d31, 0x1bf65ad8),
-     TOBN(0xe220bf1c, 0xbda602b2), TOBN(0x73ee1742, 0xf9612c69),
-     TOBN(0x76008fc8, 0x084fd06b), TOBN(0x4000ef9f, 0xf11380d1),
-     TOBN(0x48201b4b, 0x12cfe297), TOBN(0x3eee129c, 0x292f74e5),
-     TOBN(0xe1fe114e, 0xc9e874e8), TOBN(0x899b055c, 0x92c5fc41),
-     TOBN(0x4e477a64, 0x3a39c8cf), TOBN(0x82f09efe, 0x78963cc9),
-     TOBN(0x6fd3fd8f, 0xd333f863), TOBN(0x85132b2a, 0xdc949c63),
-     TOBN(0x7e06a3ab, 0x516eb17b), TOBN(0x73bec06f, 0xd2c7372b),
-     TOBN(0xe4f74f55, 0xba896da6), TOBN(0xbb4afef8, 0x8e9eb40f),
-     TOBN(0x2d75bec8, 0xe61d66b0), TOBN(0x02bda4b4, 0xef29300b),
-     TOBN(0x8bbaa8de, 0x026baa5a), TOBN(0xff54befd, 0xa07f4440),
-     TOBN(0xbd9b8b1d, 0xbe7a2af3), TOBN(0xec51caa9, 0x4fb74a72),
-     TOBN(0xb9937a4b, 0x63879697), TOBN(0x7c9a9d20, 0xec2687d5),
-     TOBN(0x1773e44f, 0x6ef5f014), TOBN(0x8abcf412, 0xe90c6900),
-     TOBN(0x387bd022, 0x8142161e), TOBN(0x50393755, 0xfcb6ff2a),
-     TOBN(0x9813fd56, 0xed6def63), TOBN(0x53cf6482, 0x7d53106c),
-     TOBN(0x991a35bd, 0x431f7ac1), TOBN(0xf1e274dd, 0x63e65faf),
-     TOBN(0xf63ffa3c, 0x44cc7880), TOBN(0x411a426b, 0x7c256981),
-     TOBN(0xb698b9fd, 0x93a420e0), TOBN(0x89fdddc0, 0xae53f8fe),
-     TOBN(0x766e0722, 0x32398baa), TOBN(0x205fee42, 0x5cfca031),
-     TOBN(0xa49f5341, 0x7a029cf2), TOBN(0xa88c68b8, 0x4023890d),
-     TOBN(0xbc275041, 0x7337aaa8), TOBN(0x9ed364ad, 0x0eb384f4),
-     TOBN(0xe0816f85, 0x29aba92f), TOBN(0x2e9e1941, 0x04e38a88),
-     TOBN(0x57eef44a, 0x3dafd2d5), TOBN(0x35d1fae5, 0x97ed98d8),
-     TOBN(0x50628c09, 0x2307f9b1), TOBN(0x09d84aae, 0xd6cba5c6),
-     TOBN(0x67071bc7, 0x88aaa691), TOBN(0x2dea57a9, 0xafe6cb03),
-     TOBN(0xdfe11bb4, 0x3d78ac01), TOBN(0x7286418c, 0x7fd7aa51),
-     TOBN(0xfabf7709, 0x77f7195a), TOBN(0x8ec86167, 0xadeb838f),
-     TOBN(0xea1285a8, 0xbb4f012d), TOBN(0xd6883503, 0x9a3eab3f),
-     TOBN(0xee5d24f8, 0x309004c2), TOBN(0xa96e4b76, 0x13ffe95e),
-     TOBN(0x0cdffe12, 0xbd223ea4), TOBN(0x8f5c2ee5, 0xb6739a53),
-     TOBN(0x5cb4aaa5, 0xdd968198), TOBN(0xfa131c52, 0x72413a6c),
-     TOBN(0x53d46a90, 0x9536d903), TOBN(0xb270f0d3, 0x48606d8e),
-     TOBN(0x518c7564, 0xa053a3bc), TOBN(0x088254b7, 0x1a86caef),
-     TOBN(0xb3ba8cb4, 0x0ab5efd0), TOBN(0x5c59900e, 0x4605945d),
-     TOBN(0xecace1dd, 0xa1887395), TOBN(0x40960f36, 0x932a65de),
-     TOBN(0x9611ff5c, 0x3aa95529), TOBN(0xc58215b0, 0x7c1e5a36),
-     TOBN(0xd48c9b58, 0xf0e1a524), TOBN(0xb406856b, 0xf590dfb8),
-     TOBN(0xc7605e04, 0x9cd95662), TOBN(0x0dd036ee, 0xa33ecf82),
-     TOBN(0xa50171ac, 0xc33156b3), TOBN(0xf09d24ea, 0x4a80172e),
-     TOBN(0x4e1f72c6, 0x76dc8eef), TOBN(0xe60caadc, 0x5e3d44ee),
-     TOBN(0x006ef8a6, 0x979b1d8f), TOBN(0x60908a1c, 0x97788d26),
-     TOBN(0x6e08f95b, 0x266feec0), TOBN(0x618427c2, 0x22e8c94e),
-     TOBN(0x3d613339, 0x59145a65), TOBN(0xcd9bc368, 0xfa406337),
-     TOBN(0x82d11be3, 0x2d8a52a0), TOBN(0xf6877b27, 0x97a1c590),
-     TOBN(0x837a819b, 0xf5cbdb25), TOBN(0x2a4fd1d8, 0xde090249),
-     TOBN(0x622a7de7, 0x74990e5f), TOBN(0x840fa5a0, 0x7945511b),
-     TOBN(0x30b974be, 0x6558842d), TOBN(0x70df8c64, 0x17f3d0a6),
-     TOBN(0x7c803520, 0x7542e46d), TOBN(0x7251fe7f, 0xe4ecc823),
-     TOBN(0xe59134cb, 0x5e9aac9a), TOBN(0x11bb0934, 0xf0045d71),
-     TOBN(0x53e5d9b5, 0xdbcb1d4e), TOBN(0x8d97a905, 0x92defc91),
-     TOBN(0xfe289327, 0x7946d3f9), TOBN(0xe132bd24, 0x07472273),
-     TOBN(0xeeeb510c, 0x1eb6ae86), TOBN(0x777708c5, 0xf0595067),
-     TOBN(0x18e2c8cd, 0x1297029e), TOBN(0x2c61095c, 0xbbf9305e),
-     TOBN(0xe466c258, 0x6b85d6d9), TOBN(0x8ac06c36, 0xda1ea530),
-     TOBN(0xa365dc39, 0xa1304668), TOBN(0xe4a9c885, 0x07f89606),
-     TOBN(0x65a4898f, 0xacc7228d), TOBN(0x3e2347ff, 0x84ca8303),
-     TOBN(0xa5f6fb77, 0xea7d23a3), TOBN(0x2fac257d, 0x672a71cd),
-     TOBN(0x6908bef8, 0x7e6a44d3), TOBN(0x8ff87566, 0x891d3d7a),
-     TOBN(0xe58e90b3, 0x6b0cf82e), TOBN(0x6438d246, 0x2615b5e7),
-     TOBN(0x07b1f8fc, 0x669c145a), TOBN(0xb0d8b2da, 0x36f1e1cb),
-     TOBN(0x54d5dadb, 0xd9184c4d), TOBN(0x3dbb18d5, 0xf93d9976),
-     TOBN(0x0a3e0f56, 0xd1147d47), TOBN(0x2afa8c8d, 0xa0a48609),
-     TOBN(0x275353e8, 0xbc36742c), TOBN(0x898f427e, 0xeea0ed90),
-     TOBN(0x26f4947e, 0x3e477b00), TOBN(0x8ad8848a, 0x308741e3),
-     TOBN(0x6c703c38, 0xd74a2a46), TOBN(0x5e3e05a9, 0x9ba17ba2),
-     TOBN(0xc1fa6f66, 0x4ab9a9e4), TOBN(0x474a2d9a, 0x3841d6ec),
-     TOBN(0x871239ad, 0x653ae326), TOBN(0x14bcf72a, 0xa74cbb43),
-     TOBN(0x8737650e, 0x20d4c083), TOBN(0x3df86536, 0x110ed4af),
-     TOBN(0xd2d86fe7, 0xb53ca555), TOBN(0x688cb00d, 0xabd5d538),
-     TOBN(0xcf81bda3, 0x1ad38468), TOBN(0x7ccfe3cc, 0xf01167b6),
-     TOBN(0xcf4f47e0, 0x6c4c1fe6), TOBN(0x557e1f1a, 0x298bbb79),
-     TOBN(0xf93b974f, 0x30d45a14), TOBN(0x174a1d2d, 0x0baf97c4),
-     TOBN(0x7a003b30, 0xc51fbf53), TOBN(0xd8940991, 0xee68b225),
-     TOBN(0x5b0aa7b7, 0x1c0f4173), TOBN(0x975797c9, 0xa20a7153),
-     TOBN(0x26e08c07, 0xe3533d77), TOBN(0xd7222e6a, 0x2e341c99),
-     TOBN(0x9d60ec3d, 0x8d2dc4ed), TOBN(0xbdfe0d8f, 0x7c476cf8),
-     TOBN(0x1fe59ab6, 0x1d056605), TOBN(0xa9ea9df6, 0x86a8551f),
-     TOBN(0x8489941e, 0x47fb8d8c), TOBN(0xfeb874eb, 0x4a7f1b10),
-     TOBN(0xfe5fea86, 0x7ee0d98f), TOBN(0x201ad34b, 0xdbf61864),
-     TOBN(0x45d8fe47, 0x37c031d4), TOBN(0xd5f49fae, 0x795f0822),
-     TOBN(0xdb0fb291, 0xc7f4a40c), TOBN(0x2e69d9c1, 0x730ddd92),
-     TOBN(0x754e1054, 0x49d76987), TOBN(0x8a24911d, 0x7662db87),
-     TOBN(0x61fc1810, 0x60a71676), TOBN(0xe852d1a8, 0xf66a8ad1),
-     TOBN(0x172bbd65, 0x6417231e), TOBN(0x0d6de7bd, 0x3babb11f),
-     TOBN(0x6fde6f88, 0xc8e347f8), TOBN(0x1c587547, 0x9bd99cc3),
-     TOBN(0x78e54ed0, 0x34076950), TOBN(0x97f0f334, 0x796e83ba),
-     TOBN(0xe4dbe1ce, 0x4924867a), TOBN(0xbd5f51b0, 0x60b84917),
-     TOBN(0x37530040, 0x3cb09a79), TOBN(0xdb3fe0f8, 0xff1743d8),
-     TOBN(0xed7894d8, 0x556fa9db), TOBN(0xfa262169, 0x23412fbf),
-     TOBN(0x563be0db, 0xba7b9291), TOBN(0x6ca8b8c0, 0x0c9fb234),
-     TOBN(0xed406aa9, 0xbd763802), TOBN(0xc21486a0, 0x65303da1),
-     TOBN(0x61ae291e, 0xc7e62ec4), TOBN(0x622a0492, 0xdf99333e),
-     TOBN(0x7fd80c9d, 0xbb7a8ee0), TOBN(0xdc2ed3bc, 0x6c01aedb),
-     TOBN(0x35c35a12, 0x08be74ec), TOBN(0xd540cb1a, 0x469f671f),
-     TOBN(0xd16ced4e, 0xcf84f6c7), TOBN(0x8561fb9c, 0x2d090f43),
-     TOBN(0x7e693d79, 0x6f239db4), TOBN(0xa736f928, 0x77bd0d94),
-     TOBN(0x07b4d929, 0x2c1950ee), TOBN(0xda177543, 0x56dc11b3),
-     TOBN(0xa5dfbbaa, 0x7a6a878e), TOBN(0x1c70cb29, 0x4decb08a),
-     TOBN(0xfba28c8b, 0x6f0f7c50), TOBN(0xa8eba2b8, 0x854dcc6d),
-     TOBN(0x5ff8e89a, 0x36b78642), TOBN(0x070c1c8e, 0xf6873adf),
-     TOBN(0xbbd3c371, 0x6484d2e4), TOBN(0xfb78318f, 0x0d414129),
-     TOBN(0x2621a39c, 0x6ad93b0b), TOBN(0x979d74c2, 0xa9e917f7),
-     TOBN(0xfc195647, 0x61fb0428), TOBN(0x4d78954a, 0xbee624d4),
-     TOBN(0xb94896e0, 0xb8ae86fd), TOBN(0x6667ac0c, 0xc91c8b13),
-     TOBN(0x9f180512, 0x43bcf832), TOBN(0xfbadf8b7, 0xa0010137),
-     TOBN(0xc69b4089, 0xb3ba8aa7), TOBN(0xfac4bacd, 0xe687ce85),
-     TOBN(0x9164088d, 0x977eab40), TOBN(0x51f4c5b6, 0x2760b390),
-     TOBN(0xd238238f, 0x340dd553), TOBN(0x358566c3, 0xdb1d31c9),
-     TOBN(0x3a5ad69e, 0x5068f5ff), TOBN(0xf31435fc, 0xdaff6b06),
-     TOBN(0xae549a5b, 0xd6debff0), TOBN(0x59e5f0b7, 0x75e01331),
-     TOBN(0x5d492fb8, 0x98559acf), TOBN(0x96018c2e, 0x4db79b50),
-     TOBN(0x55f4a48f, 0x609f66aa), TOBN(0x1943b3af, 0x4900a14f),
-     TOBN(0xc22496df, 0x15a40d39), TOBN(0xb2a44684, 0x4c20f7c5),
-     TOBN(0x76a35afa, 0x3b98404c), TOBN(0xbec75725, 0xff5d1b77),
-     TOBN(0xb67aa163, 0xbea06444), TOBN(0x27e95bb2, 0xf724b6f2),
-     TOBN(0x3c20e3e9, 0xd238c8ab), TOBN(0x1213754e, 0xddd6ae17),
-     TOBN(0x8c431020, 0x716e0f74), TOBN(0x6679c82e, 0xffc095c2),
-     TOBN(0x2eb3adf4, 0xd0ac2932), TOBN(0x2cc970d3, 0x01bb7a76),
-     TOBN(0x70c71f2f, 0x740f0e66), TOBN(0x545c616b, 0x2b6b23cc),
-     TOBN(0x4528cfcb, 0xb40a8bd7), TOBN(0xff839633, 0x2ab27722),
-     TOBN(0x049127d9, 0x025ac99a), TOBN(0xd314d4a0, 0x2b63e33b),
-     TOBN(0xc8c310e7, 0x28d84519), TOBN(0x0fcb8983, 0xb3bc84ba),
-     TOBN(0x2cc52261, 0x38634818), TOBN(0x501814f4, 0xb44c2e0b),
-     TOBN(0xf7e181aa, 0x54dfdba3), TOBN(0xcfd58ff0, 0xe759718c),
-     TOBN(0xf90cdb14, 0xd3b507a8), TOBN(0x57bd478e, 0xc50bdad8),
-     TOBN(0x29c197e2, 0x50e5f9aa), TOBN(0x4db6eef8, 0xe40bc855),
-     TOBN(0x2cc8f21a, 0xd1fc0654), TOBN(0xc71cc963, 0x81269d73),
-     TOBN(0xecfbb204, 0x077f49f9), TOBN(0xdde92571, 0xca56b793),
-     TOBN(0x9abed6a3, 0xf97ad8f7), TOBN(0xe6c19d3f, 0x924de3bd),
-     TOBN(0x8dce92f4, 0xa140a800), TOBN(0x85f44d1e, 0x1337af07),
-     TOBN(0x5953c08b, 0x09d64c52), TOBN(0xa1b5e49f, 0xf5df9749),
-     TOBN(0x336a8fb8, 0x52735f7d), TOBN(0xb332b6db, 0x9add676b),
-     TOBN(0x558b88a0, 0xb4511aa4), TOBN(0x09788752, 0xdbd5cc55),
-     TOBN(0x16b43b9c, 0xd8cd52bd), TOBN(0x7f0bc5a0, 0xc2a2696b),
-     TOBN(0x146e12d4, 0xc11f61ef), TOBN(0x9ce10754, 0x3a83e79e),
-     TOBN(0x08ec73d9, 0x6cbfca15), TOBN(0x09ff29ad, 0x5b49653f),
-     TOBN(0xe31b72bd, 0xe7da946e), TOBN(0xebf9eb3b, 0xee80a4f2),
-     TOBN(0xd1aabd08, 0x17598ce4), TOBN(0x18b5fef4, 0x53f37e80),
-     TOBN(0xd5d5cdd3, 0x5958cd79), TOBN(0x3580a1b5, 0x1d373114),
-     TOBN(0xa36e4c91, 0xfa935726), TOBN(0xa38c534d, 0xef20d760),
-     TOBN(0x7088e40a, 0x2ff5845b), TOBN(0xe5bb40bd, 0xbd78177f),
-     TOBN(0x4f06a7a8, 0x857f9920), TOBN(0xe3cc3e50, 0xe968f05d),
-     TOBN(0x1d68b7fe, 0xe5682d26), TOBN(0x5206f76f, 0xaec7f87c),
-     TOBN(0x41110530, 0x041951ab), TOBN(0x58ec52c1, 0xd4b5a71a),
-     TOBN(0xf3488f99, 0x0f75cf9a), TOBN(0xf411951f, 0xba82d0d5),
-     TOBN(0x27ee75be, 0x618895ab), TOBN(0xeae060d4, 0x6d8aab14),
-     TOBN(0x9ae1df73, 0x7fb54dc2), TOBN(0x1f3e391b, 0x25963649),
-     TOBN(0x242ec32a, 0xfe055081), TOBN(0x5bd450ef, 0x8491c9bd),
-     TOBN(0x367efc67, 0x981eb389), TOBN(0xed7e1928, 0x3a0550d5),
-     TOBN(0x362e776b, 0xab3ce75c), TOBN(0xe890e308, 0x1f24c523),
-     TOBN(0xb961b682, 0xfeccef76), TOBN(0x8b8e11f5, 0x8bba6d92),
-     TOBN(0x8f2ccc4c, 0x2b2375c4), TOBN(0x0d7f7a52, 0xe2f86cfa),
-     TOBN(0xfd94d30a, 0x9efe5633), TOBN(0x2d8d246b, 0x5451f934),
-     TOBN(0x2234c6e3, 0x244e6a00), TOBN(0xde2b5b0d, 0xddec8c50),
-     TOBN(0x2ce53c5a, 0xbf776f5b), TOBN(0x6f724071, 0x60357b05),
-     TOBN(0xb2593717, 0x71bf3f7a), TOBN(0x87d2501c, 0x440c4a9f),
-     TOBN(0x440552e1, 0x87b05340), TOBN(0xb7bf7cc8, 0x21624c32),
-     TOBN(0x4155a6ce, 0x22facddb), TOBN(0x5a4228cb, 0x889837ef),
-     TOBN(0xef87d6d6, 0xfd4fd671), TOBN(0xa233687e, 0xc2daa10e),
-     TOBN(0x75622244, 0x03c0eb96), TOBN(0x7632d184, 0x8bf19be6),
-     TOBN(0x05d0f8e9, 0x40735ff4), TOBN(0x3a3e6e13, 0xc00931f1),
-     TOBN(0x31ccde6a, 0xdafe3f18), TOBN(0xf381366a, 0xcfe51207),
-     TOBN(0x24c222a9, 0x60167d92), TOBN(0x62f9d6f8, 0x7529f18c),
-     TOBN(0x412397c0, 0x0353b114), TOBN(0x334d89dc, 0xef808043),
-     TOBN(0xd9ec63ba, 0x2a4383ce), TOBN(0xcec8e937, 0x5cf92ba0),
-     TOBN(0xfb8b4288, 0xc8be74c0), TOBN(0x67d6912f, 0x105d4391),
-     TOBN(0x7b996c46, 0x1b913149), TOBN(0x36aae2ef, 0x3a4e02da),
-     TOBN(0xb68aa003, 0x972de594), TOBN(0x284ec70d, 0x4ec6d545),
-     TOBN(0xf3d2b2d0, 0x61391d54), TOBN(0x69c5d5d6, 0xfe114e92),
-     TOBN(0xbe0f00b5, 0xb4482dff), TOBN(0xe1596fa5, 0xf5bf33c5),
-     TOBN(0x10595b56, 0x96a71cba), TOBN(0x944938b2, 0xfdcadeb7),
-     TOBN(0xa282da4c, 0xfccd8471), TOBN(0x98ec05f3, 0x0d37bfe1),
-     TOBN(0xe171ce1b, 0x0698304a), TOBN(0x2d691444, 0x21bdf79b),
-     TOBN(0xd0cd3b74, 0x1b21dec1), TOBN(0x712ecd8b, 0x16a15f71),
-     TOBN(0x8d4c00a7, 0x00fd56e1), TOBN(0x02ec9692, 0xf9527c18),
-     TOBN(0x21c44937, 0x4a3e42e1), TOBN(0x9176fbab, 0x1392ae0a),
-     TOBN(0x8726f1ba, 0x44b7b618), TOBN(0xb4d7aae9, 0xf1de491c),
-     TOBN(0xf91df7b9, 0x07b582c0), TOBN(0x7e116c30, 0xef60aa3a),
-     TOBN(0x99270f81, 0x466265d7), TOBN(0xb15b6fe2, 0x4df7adf0),
-     TOBN(0xfe33b2d3, 0xf9738f7f), TOBN(0x48553ab9, 0xd6d70f95),
-     TOBN(0x2cc72ac8, 0xc21e94db), TOBN(0x795ac38d, 0xbdc0bbee),
-     TOBN(0x0a1be449, 0x2e40478f), TOBN(0x81bd3394, 0x052bde55),
-     TOBN(0x63c8dbe9, 0x56b3c4f2), TOBN(0x017a99cf, 0x904177cc),
-     TOBN(0x947bbddb, 0x4d010fc1), TOBN(0xacf9b00b, 0xbb2c9b21),
-     TOBN(0x2970bc8d, 0x47173611), TOBN(0x1a4cbe08, 0xac7d756f),
-     TOBN(0x06d9f4aa, 0x67d541a2), TOBN(0xa3e8b689, 0x59c2cf44),
-     TOBN(0xaad066da, 0x4d88f1dd), TOBN(0xc604f165, 0x7ad35dea),
-     TOBN(0x7edc0720, 0x4478ca67), TOBN(0xa10dfae0, 0xba02ce06),
-     TOBN(0xeceb1c76, 0xaf36f4e4), TOBN(0x994b2292, 0xaf3f8f48),
-     TOBN(0xbf9ed77b, 0x77c8a68c), TOBN(0x74f544ea, 0x51744c9d),
-     TOBN(0x82d05bb9, 0x8113a757), TOBN(0x4ef2d2b4, 0x8a9885e4),
-     TOBN(0x1e332be5, 0x1aa7865f), TOBN(0x22b76b18, 0x290d1a52),
-     TOBN(0x308a2310, 0x44351683), TOBN(0x9d861896, 0xa3f22840),
-     TOBN(0x5959ddcd, 0x841ed947), TOBN(0x0def0c94, 0x154b73bf),
-     TOBN(0xf0105417, 0x4c7c15e0), TOBN(0x539bfb02, 0x3a277c32),
-     TOBN(0xe699268e, 0xf9dccf5f), TOBN(0x9f5796a5, 0x0247a3bd),
-     TOBN(0x8b839de8, 0x4f157269), TOBN(0xc825c1e5, 0x7a30196b),
-     TOBN(0x6ef0aabc, 0xdc8a5a91), TOBN(0xf4a8ce6c, 0x498b7fe6),
-     TOBN(0x1cce35a7, 0x70cbac78), TOBN(0x83488e9b, 0xf6b23958),
-     TOBN(0x0341a070, 0xd76cb011), TOBN(0xda6c9d06, 0xae1b2658),
-     TOBN(0xb701fb30, 0xdd648c52), TOBN(0x994ca02c, 0x52fb9fd1),
-     TOBN(0x06933117, 0x6f563086), TOBN(0x3d2b8100, 0x17856bab),
-     TOBN(0xe89f48c8, 0x5963a46e), TOBN(0x658ab875, 0xa99e61c7),
-     TOBN(0x6e296f87, 0x4b8517b4), TOBN(0x36c4fcdc, 0xfc1bc656),
-     TOBN(0xde5227a1, 0xa3906def), TOBN(0x9fe95f57, 0x62418945),
-     TOBN(0x20c91e81, 0xfdd96cde), TOBN(0x5adbe47e, 0xda4480de),
-     TOBN(0xa009370f, 0x396de2b6), TOBN(0x98583d4b, 0xf0ecc7bd),
-     TOBN(0xf44f6b57, 0xe51d0672), TOBN(0x03d6b078, 0x556b1984),
-     TOBN(0x27dbdd93, 0xb0b64912), TOBN(0x9b3a3434, 0x15687b09),
-     TOBN(0x0dba6461, 0x51ec20a9), TOBN(0xec93db7f, 0xff28187c),
-     TOBN(0x00ff8c24, 0x66e48bdd), TOBN(0x2514f2f9, 0x11ccd78e),
-     TOBN(0xeba11f4f, 0xe1250603), TOBN(0x8a22cd41, 0x243fa156),
-     TOBN(0xa4e58df4, 0xb283e4c6), TOBN(0x78c29859, 0x8b39783f),
-     TOBN(0x5235aee2, 0xa5259809), TOBN(0xc16284b5, 0x0e0227dd),
-     TOBN(0xa5f57916, 0x1338830d), TOBN(0x6d4b8a6b, 0xd2123fca),
-     TOBN(0x236ea68a, 0xf9c546f8), TOBN(0xc1d36873, 0xfa608d36),
-     TOBN(0xcd76e495, 0x8d436d13), TOBN(0xd4d9c221, 0x8fb080af),
-     TOBN(0x665c1728, 0xe8ad3fb5), TOBN(0xcf1ebe4d, 0xb3d572e0),
-     TOBN(0xa7a8746a, 0x584c5e20), TOBN(0x267e4ea1, 0xb9dc7035),
-     TOBN(0x593a15cf, 0xb9548c9b), TOBN(0x5e6e2135, 0x4bd012f3),
-     TOBN(0xdf31cc6a, 0x8c8f936e), TOBN(0x8af84d04, 0xb5c241dc),
-     TOBN(0x63990a6f, 0x345efb86), TOBN(0x6fef4e61, 0xb9b962cb)}
-    ,
-    {TOBN(0xf6368f09, 0x25722608), TOBN(0x131260db, 0x131cf5c6),
-     TOBN(0x40eb353b, 0xfab4f7ac), TOBN(0x85c78880, 0x37eee829),
-     TOBN(0x4c1581ff, 0xc3bdf24e), TOBN(0x5bff75cb, 0xf5c3c5a8),
-     TOBN(0x35e8c83f, 0xa14e6f40), TOBN(0xb81d1c0f, 0x0295e0ca),
-     TOBN(0xfcde7cc8, 0xf43a730f), TOBN(0xe89b6f3c, 0x33ab590e),
-     TOBN(0xc823f529, 0xad03240b), TOBN(0x82b79afe, 0x98bea5db),
-     TOBN(0x568f2856, 0x962fe5de), TOBN(0x0c590adb, 0x60c591f3),
-     TOBN(0x1fc74a14, 0x4a28a858), TOBN(0x3b662498, 0xb3203f4c),
-     TOBN(0x91e3cf0d, 0x6c39765a), TOBN(0xa2db3acd, 0xac3cca0b),
-     TOBN(0x288f2f08, 0xcb953b50), TOBN(0x2414582c, 0xcf43cf1a),
-     TOBN(0x8dec8bbc, 0x60eee9a8), TOBN(0x54c79f02, 0x729aa042),
-     TOBN(0xd81cd5ec, 0x6532f5d5), TOBN(0xa672303a, 0xcf82e15f),
-     TOBN(0x376aafa8, 0x719c0563), TOBN(0xcd8ad2dc, 0xbc5fc79f),
-     TOBN(0x303fdb9f, 0xcb750cd3), TOBN(0x14ff052f, 0x4418b08e),
-     TOBN(0xf75084cf, 0x3e2d6520), TOBN(0x7ebdf0f8, 0x144ed509),
-     TOBN(0xf43bf0f2, 0xd3f25b98), TOBN(0x86ad71cf, 0xa354d837),
-     TOBN(0xb827fe92, 0x26f43572), TOBN(0xdfd3ab5b, 0x5d824758),
-     TOBN(0x315dd23a, 0x539094c1), TOBN(0x85c0e37a, 0x66623d68),
-     TOBN(0x575c7972, 0x7be19ae0), TOBN(0x616a3396, 0xdf0d36b5),
-     TOBN(0xa1ebb3c8, 0x26b1ff7e), TOBN(0x635b9485, 0x140ad453),
-     TOBN(0x92bf3cda, 0xda430c0b), TOBN(0x4702850e, 0x3a96dac6),
-     TOBN(0xc91cf0a5, 0x15ac326a), TOBN(0x95de4f49, 0xab8c25e4),
-     TOBN(0xb01bad09, 0xe265c17c), TOBN(0x24e45464, 0x087b3881),
-     TOBN(0xd43e583c, 0xe1fac5ca), TOBN(0xe17cb318, 0x6ead97a6),
-     TOBN(0x6cc39243, 0x74dcec46), TOBN(0x33cfc02d, 0x54c2b73f),
-     TOBN(0x82917844, 0xf26cd99c), TOBN(0x8819dd95, 0xd1773f89),
-     TOBN(0x09572aa6, 0x0871f427), TOBN(0x8e0cf365, 0xf6f01c34),
-     TOBN(0x7fa52988, 0xbff1f5af), TOBN(0x4eb357ea, 0xe75e8e50),
-     TOBN(0xd9d0c8c4, 0x868af75d), TOBN(0xd7325cff, 0x45c8c7ea),
-     TOBN(0xab471996, 0xcc81ecb0), TOBN(0xff5d55f3, 0x611824ed),
-     TOBN(0xbe314541, 0x1977a0ee), TOBN(0x5085c4c5, 0x722038c6),
-     TOBN(0x2d5335bf, 0xf94bb495), TOBN(0x894ad8a6, 0xc8e2a082),
-     TOBN(0x5c3e2341, 0xada35438), TOBN(0xf4a9fc89, 0x049b8c4e),
-     TOBN(0xbeeb355a, 0x9f17cf34), TOBN(0x3f311e0e, 0x6c91fe10),
-     TOBN(0xc2d20038, 0x92ab9891), TOBN(0x257bdcc1, 0x3e8ce9a9),
-     TOBN(0x1b2d9789, 0x88c53bee), TOBN(0x927ce89a, 0xcdba143a),
-     TOBN(0xb0a32cca, 0x523db280), TOBN(0x5c889f8a, 0x50d43783),
-     TOBN(0x503e04b3, 0x4897d16f), TOBN(0x8cdb6e78, 0x08f5f2e8),
-     TOBN(0x6ab91cf0, 0x179c8e74), TOBN(0xd8874e52, 0x48211d60),
-     TOBN(0xf948d4d5, 0xea851200), TOBN(0x4076d41e, 0xe6f9840a),
-     TOBN(0xc20e263c, 0x47b517ea), TOBN(0x79a448fd, 0x30685e5e),
-     TOBN(0xe55f6f78, 0xf90631a0), TOBN(0x88a790b1, 0xa79e6346),
-     TOBN(0x62160c7d, 0x80969fe8), TOBN(0x54f92fd4, 0x41491bb9),
-     TOBN(0xa6645c23, 0x5c957526), TOBN(0xf44cc5ae, 0xbea3ce7b),
-     TOBN(0xf7628327, 0x8b1e68b7), TOBN(0xc731ad7a, 0x303f29d3),
-     TOBN(0xfe5a9ca9, 0x57d03ecb), TOBN(0x96c0d50c, 0x41bc97a7),
-     TOBN(0xc4669fe7, 0x9b4f7f24), TOBN(0xfdd781d8, 0x3d9967ef),
-     TOBN(0x7892c7c3, 0x5d2c208d), TOBN(0x8bf64f7c, 0xae545cb3),
-     TOBN(0xc01f862c, 0x467be912), TOBN(0xf4c85ee9, 0xc73d30cc),
-     TOBN(0x1fa6f4be, 0x6ab83ec7), TOBN(0xa07a3c1c, 0x4e3e3cf9),
-     TOBN(0x87f8ef45, 0x0c00beb3), TOBN(0x30e2c2b3, 0x000d4c3e),
-     TOBN(0x1aa00b94, 0xfe08bf5b), TOBN(0x32c133aa, 0x9224ef52),
-     TOBN(0x38df16bb, 0x32e5685d), TOBN(0x68a9e069, 0x58e6f544),
-     TOBN(0x495aaff7, 0xcdc5ebc6), TOBN(0xf894a645, 0x378b135f),
-     TOBN(0xf316350a, 0x09e27ecf), TOBN(0xeced201e, 0x58f7179d),
-     TOBN(0x2eec273c, 0xe97861ba), TOBN(0x47ec2cae, 0xd693be2e),
-     TOBN(0xfa4c97c4, 0xf68367ce), TOBN(0xe4f47d0b, 0xbe5a5755),
-     TOBN(0x17de815d, 0xb298a979), TOBN(0xd7eca659, 0xc177dc7d),
-     TOBN(0x20fdbb71, 0x49ded0a3), TOBN(0x4cb2aad4, 0xfb34d3c5),
-     TOBN(0x2cf31d28, 0x60858a33), TOBN(0x3b6873ef, 0xa24aa40f),
-     TOBN(0x540234b2, 0x2c11bb37), TOBN(0x2d0366dd, 0xed4c74a3),
-     TOBN(0xf9a968da, 0xeec5f25d), TOBN(0x36601068, 0x67b63142),
-     TOBN(0x07cd6d2c, 0x68d7b6d4), TOBN(0xa8f74f09, 0x0c842942),
-     TOBN(0xe2751404, 0x7768b1ee), TOBN(0x4b5f7e89, 0xfe62aee4),
-     TOBN(0xc6a77177, 0x89070d26), TOBN(0xa1f28e4e, 0xdd1c8bc7),
-     TOBN(0xea5f4f06, 0x469e1f17), TOBN(0x78fc242a, 0xfbdb78e0),
-     TOBN(0xc9c7c592, 0x8b0588f1), TOBN(0xb6b7a0fd, 0x1535921e),
-     TOBN(0xcc5bdb91, 0xbde5ae35), TOBN(0xb42c485e, 0x12ff1864),
-     TOBN(0xa1113e13, 0xdbab98aa), TOBN(0xde9d469b, 0xa17b1024),
-     TOBN(0x23f48b37, 0xc0462d3a), TOBN(0x3752e537, 0x7c5c078d),
-     TOBN(0xe3a86add, 0x15544eb9), TOBN(0xf013aea7, 0x80fba279),
-     TOBN(0x8b5bb76c, 0xf22001b5), TOBN(0xe617ba14, 0xf02891ab),
-     TOBN(0xd39182a6, 0x936219d3), TOBN(0x5ce1f194, 0xae51cb19),
-     TOBN(0xc78f8598, 0xbf07a74c), TOBN(0x6d7158f2, 0x22cbf1bc),
-     TOBN(0x3b846b21, 0xe300ce18), TOBN(0x35fba630, 0x2d11275d),
-     TOBN(0x5fe25c36, 0xa0239b9b), TOBN(0xd8beb35d, 0xdf05d940),
-     TOBN(0x4db02bb0, 0x1f7e320d), TOBN(0x0641c364, 0x6da320ea),
-     TOBN(0x6d95fa5d, 0x821389a3), TOBN(0x92699748, 0x8fcd8e3d),
-     TOBN(0x316fef17, 0xceb6c143), TOBN(0x67fcb841, 0xd933762b),
-     TOBN(0xbb837e35, 0x118b17f8), TOBN(0x4b92552f, 0x9fd24821),
-     TOBN(0xae6bc70e, 0x46aca793), TOBN(0x1cf0b0e4, 0xe579311b),
-     TOBN(0x8dc631be, 0x5802f716), TOBN(0x099bdc6f, 0xbddbee4d),
-     TOBN(0xcc352bb2, 0x0caf8b05), TOBN(0xf74d505a, 0x72d63df2),
-     TOBN(0xb9876d4b, 0x91c4f408), TOBN(0x1ce18473, 0x9e229b2d),
-     TOBN(0x49507597, 0x83abdb4a), TOBN(0x850fbcb6, 0xdee84b18),
-     TOBN(0x6325236e, 0x609e67dc), TOBN(0x04d831d9, 0x9336c6d8),
-     TOBN(0x8deaae3b, 0xfa12d45d), TOBN(0xe425f8ce, 0x4746e246),
-     TOBN(0x8004c175, 0x24f5f31e), TOBN(0xaca16d8f, 0xad62c3b7),
-     TOBN(0x0dc15a6a, 0x9152f934), TOBN(0xf1235e5d, 0xed0e12c1),
-     TOBN(0xc33c06ec, 0xda477dac), TOBN(0x76be8732, 0xb2ea0006),
-     TOBN(0xcf3f7831, 0x0c0cd313), TOBN(0x3c524553, 0xa614260d),
-     TOBN(0x31a756f8, 0xcab22d15), TOBN(0x03ee10d1, 0x77827a20),
-     TOBN(0xd1e059b2, 0x1994ef20), TOBN(0x2a653b69, 0x638ae318),
-     TOBN(0x70d5eb58, 0x2f699010), TOBN(0x279739f7, 0x09f5f84a),
-     TOBN(0x5da4663c, 0x8b799336), TOBN(0xfdfdf14d, 0x203c37eb),
-     TOBN(0x32d8a9dc, 0xa1dbfb2d), TOBN(0xab40cff0, 0x77d48f9b),
-     TOBN(0xc018b383, 0xd20b42d5), TOBN(0xf9a810ef, 0x9f78845f),
-     TOBN(0x40af3753, 0xbdba9df0), TOBN(0xb90bdcfc, 0x131dfdf9),
-     TOBN(0x18720591, 0xf01ab782), TOBN(0xc823f211, 0x6af12a88),
-     TOBN(0xa51b80f3, 0x0dc14401), TOBN(0xde248f77, 0xfb2dfbe3),
-     TOBN(0xef5a44e5, 0x0cafe751), TOBN(0x73997c9c, 0xd4dcd221),
-     TOBN(0x32fd86d1, 0xde854024), TOBN(0xd5b53adc, 0xa09b84bb),
-     TOBN(0x008d7a11, 0xdcedd8d1), TOBN(0x406bd1c8, 0x74b32c84),
-     TOBN(0x5d4472ff, 0x05dde8b1), TOBN(0x2e25f2cd, 0xfce2b32f),
-     TOBN(0xbec0dd5e, 0x29dfc254), TOBN(0x4455fcf6, 0x2b98b267),
-     TOBN(0x0b4d43a5, 0xc72df2ad), TOBN(0xea70e6be, 0x48a75397),
-     TOBN(0x2aad6169, 0x5820f3bf), TOBN(0xf410d2dd, 0x9e37f68f),
-     TOBN(0x70fb7dba, 0x7be5ac83), TOBN(0x636bb645, 0x36ec3eec),
-     TOBN(0x27104ea3, 0x9754e21c), TOBN(0xbc87a3e6, 0x8d63c373),
-     TOBN(0x483351d7, 0x4109db9a), TOBN(0x0fa724e3, 0x60134da7),
-     TOBN(0x9ff44c29, 0xb0720b16), TOBN(0x2dd0cf13, 0x06aceead),
-     TOBN(0x5942758c, 0xe26929a6), TOBN(0x96c5db92, 0xb766a92b),
-     TOBN(0xcec7d4c0, 0x5f18395e), TOBN(0xd3f22744, 0x1f80d032),
-     TOBN(0x7a68b37a, 0xcb86075b), TOBN(0x074764dd, 0xafef92db),
-     TOBN(0xded1e950, 0x7bc7f389), TOBN(0xc580c850, 0xb9756460),
-     TOBN(0xaeeec2a4, 0x7da48157), TOBN(0x3f0b4e7f, 0x82c587b3),
-     TOBN(0x231c6de8, 0xa9f19c53), TOBN(0x5717bd73, 0x6974e34e),
-     TOBN(0xd9e1d216, 0xf1508fa9), TOBN(0x9f112361, 0xdadaa124),
-     TOBN(0x80145e31, 0x823b7348), TOBN(0x4dd8f0d5, 0xac634069),
-     TOBN(0xe3d82fc7, 0x2297c258), TOBN(0x276fcfee, 0x9cee7431),
-     TOBN(0x8eb61b5e, 0x2bc0aea9), TOBN(0x4f668fd5, 0xde329431),
-     TOBN(0x03a32ab1, 0x38e4b87e), TOBN(0xe1374517, 0x73d0ef0b),
-     TOBN(0x1a46f7e6, 0x853ac983), TOBN(0xc3bdf42e, 0x68e78a57),
-     TOBN(0xacf20785, 0x2ea96dd1), TOBN(0xa10649b9, 0xf1638460),
-     TOBN(0xf2369f0b, 0x879fbbed), TOBN(0x0ff0ae86, 0xda9d1869),
-     TOBN(0x5251d759, 0x56766f45), TOBN(0x4984d8c0, 0x2be8d0fc),
-     TOBN(0x7ecc95a6, 0xd21008f0), TOBN(0x29bd54a0, 0x3a1a1c49),
-     TOBN(0xab9828c5, 0xd26c50f3), TOBN(0x32c0087c, 0x51d0d251),
-     TOBN(0x9bac3ce6, 0x0c1cdb26), TOBN(0xcd94d947, 0x557ca205),
-     TOBN(0x1b1bd598, 0x9db1fdcd), TOBN(0x0eda0108, 0xa3d8b149),
-     TOBN(0x95066610, 0x56152fcc), TOBN(0xc2f037e6, 0xe7192b33),
-     TOBN(0xdeffb41a, 0xc92e05a4), TOBN(0x1105f6c2, 0xc2f6c62e),
-     TOBN(0x68e73500, 0x8733913c), TOBN(0xcce86163, 0x3f3adc40),
-     TOBN(0xf407a942, 0x38a278e9), TOBN(0xd13c1b9d, 0x2ab21292),
-     TOBN(0x93ed7ec7, 0x1c74cf5c), TOBN(0x8887dc48, 0xf1a4c1b4),
-     TOBN(0x3830ff30, 0x4b3a11f1), TOBN(0x358c5a3c, 0x58937cb6),
-     TOBN(0x027dc404, 0x89022829), TOBN(0x40e93977, 0x3b798f79),
-     TOBN(0x90ad3337, 0x38be6ead), TOBN(0x9c23f6bc, 0xf34c0a5d),
-     TOBN(0xd1711a35, 0xfbffd8bb), TOBN(0x60fcfb49, 0x1949d3dd),
-     TOBN(0x09c8ef4b, 0x7825d93a), TOBN(0x24233cff, 0xa0a8c968),
-     TOBN(0x67ade46c, 0xe6d982af), TOBN(0xebb6bf3e, 0xe7544d7c),
-     TOBN(0xd6b9ba76, 0x3d8bd087), TOBN(0x46fe382d, 0x4dc61280),
-     TOBN(0xbd39a7e8, 0xb5bdbd75), TOBN(0xab381331, 0xb8f228fe),
-     TOBN(0x0709a77c, 0xce1c4300), TOBN(0x6a247e56, 0xf337ceac),
-     TOBN(0x8f34f21b, 0x636288be), TOBN(0x9dfdca74, 0xc8a7c305),
-     TOBN(0x6decfd1b, 0xea919e04), TOBN(0xcdf2688d, 0x8e1991f8),
-     TOBN(0xe607df44, 0xd0f8a67e), TOBN(0xd985df4b, 0x0b58d010),
-     TOBN(0x57f834c5, 0x0c24f8f4), TOBN(0xe976ef56, 0xa0bf01ae),
-     TOBN(0x536395ac, 0xa1c32373), TOBN(0x351027aa, 0x734c0a13),
-     TOBN(0xd2f1b5d6, 0x5e6bd5bc), TOBN(0x2b539e24, 0x223debed),
-     TOBN(0xd4994cec, 0x0eaa1d71), TOBN(0x2a83381d, 0x661dcf65),
-     TOBN(0x5f1aed2f, 0x7b54c740), TOBN(0x0bea3fa5, 0xd6dda5ee),
-     TOBN(0x9d4fb684, 0x36cc6134), TOBN(0x8eb9bbf3, 0xc0a443dd),
-     TOBN(0xfc500e2e, 0x383b7d2a), TOBN(0x7aad621c, 0x5b775257),
-     TOBN(0x69284d74, 0x0a8f7cc0), TOBN(0xe820c2ce, 0x07562d65),
-     TOBN(0xbf9531b9, 0x499758ee), TOBN(0x73e95ca5, 0x6ee0cc2d),
-     TOBN(0xf61790ab, 0xfbaf50a5), TOBN(0xdf55e76b, 0x684e0750),
-     TOBN(0xec516da7, 0xf176b005), TOBN(0x575553bb, 0x7a2dddc7),
-     TOBN(0x37c87ca3, 0x553afa73), TOBN(0x315f3ffc, 0x4d55c251),
-     TOBN(0xe846442a, 0xaf3e5d35), TOBN(0x61b91149, 0x6495ff28),
-     TOBN(0x23cc95d3, 0xfa326dc3), TOBN(0x1df4da1f, 0x18fc2cea),
-     TOBN(0x24bf9adc, 0xd0a37d59), TOBN(0xb6710053, 0x320d6e1e),
-     TOBN(0x96f9667e, 0x618344d1), TOBN(0xcc7ce042, 0xa06445af),
-     TOBN(0xa02d8514, 0xd68dbc3a), TOBN(0x4ea109e4, 0x280b5a5b),
-     TOBN(0x5741a7ac, 0xb40961bf), TOBN(0x4ada5937, 0x6aa56bfa),
-     TOBN(0x7feb9145, 0x02b765d1), TOBN(0x561e97be, 0xe6ad1582),
-     TOBN(0xbbc4a5b6, 0xda3982f5), TOBN(0x0c2659ed, 0xb546f468),
-     TOBN(0xb8e7e6aa, 0x59612d20), TOBN(0xd83dfe20, 0xac19e8e0),
-     TOBN(0x8530c45f, 0xb835398c), TOBN(0x6106a8bf, 0xb38a41c2),
-     TOBN(0x21e8f9a6, 0x35f5dcdb), TOBN(0x39707137, 0xcae498ed),
-     TOBN(0x70c23834, 0xd8249f00), TOBN(0x9f14b58f, 0xab2537a0),
-     TOBN(0xd043c365, 0x5f61c0c2), TOBN(0xdc5926d6, 0x09a194a7),
-     TOBN(0xddec0339, 0x8e77738a), TOBN(0xd07a63ef, 0xfba46426),
-     TOBN(0x2e58e79c, 0xee7f6e86), TOBN(0xe59b0459, 0xff32d241),
-     TOBN(0xc5ec84e5, 0x20fa0338), TOBN(0x97939ac8, 0xeaff5ace),
-     TOBN(0x0310a4e3, 0xb4a38313), TOBN(0x9115fba2, 0x8f9d9885),
-     TOBN(0x8dd710c2, 0x5fadf8c3), TOBN(0x66be38a2, 0xce19c0e2),
-     TOBN(0xd42a279c, 0x4cfe5022), TOBN(0x597bb530, 0x0e24e1b8),
-     TOBN(0x3cde86b7, 0xc153ca7f), TOBN(0xa8d30fb3, 0x707d63bd),
-     TOBN(0xac905f92, 0xbd60d21e), TOBN(0x98e7ffb6, 0x7b9a54ab),
-     TOBN(0xd7147df8, 0xe9726a30), TOBN(0xb5e216ff, 0xafce3533),
-     TOBN(0xb550b799, 0x2ff1ec40), TOBN(0x6b613b87, 0xa1e953fd),
-     TOBN(0x87b88dba, 0x792d5610), TOBN(0x2ee1270a, 0xa190fbe1),
-     TOBN(0x02f4e2dc, 0x2ef581da), TOBN(0x016530e4, 0xeff82a95),
-     TOBN(0xcbb93dfd, 0x8fd6ee89), TOBN(0x16d3d986, 0x46848fff),
-     TOBN(0x600eff24, 0x1da47adf), TOBN(0x1b9754a0, 0x0ad47a71),
-     TOBN(0x8f9266df, 0x70c33b98), TOBN(0xaadc87ae, 0xdf34186e),
-     TOBN(0x0d2ce8e1, 0x4ad24132), TOBN(0x8a47cbfc, 0x19946eba),
-     TOBN(0x47feeb66, 0x62b5f3af), TOBN(0xcefab561, 0x0abb3734),
-     TOBN(0x449de60e, 0x19f35cb1), TOBN(0x39f8db14, 0x157f0eb9),
-     TOBN(0xffaecc5b, 0x3c61bfd6), TOBN(0xa5a4d41d, 0x41216703),
-     TOBN(0x7f8fabed, 0x224e1cc2), TOBN(0x0d5a8186, 0x871ad953),
-     TOBN(0xf10774f7, 0xd22da9a9), TOBN(0x45b8a678, 0xcc8a9b0d),
-     TOBN(0xd9c2e722, 0xbdc32cff), TOBN(0xbf71b5f5, 0x337202a5),
-     TOBN(0x95c57f2f, 0x69fc4db9), TOBN(0xb6dad34c, 0x765d01e1),
-     TOBN(0x7e0bd13f, 0xcb904635), TOBN(0x61751253, 0x763a588c),
-     TOBN(0xd85c2997, 0x81af2c2d), TOBN(0xc0f7d9c4, 0x81b9d7da),
-     TOBN(0x838a34ae, 0x08533e8d), TOBN(0x15c4cb08, 0x311d8311),
-     TOBN(0x97f83285, 0x8e121e14), TOBN(0xeea7dc1e, 0x85000a5f),
-     TOBN(0x0c6059b6, 0x5d256274), TOBN(0xec9beace, 0xb95075c0),
-     TOBN(0x173daad7, 0x1df97828), TOBN(0xbf851cb5, 0xa8937877),
-     TOBN(0xb083c594, 0x01646f3c), TOBN(0x3bad30cf, 0x50c6d352),
-     TOBN(0xfeb2b202, 0x496bbcea), TOBN(0x3cf9fd4f, 0x18a1e8ba),
-     TOBN(0xd26de7ff, 0x1c066029), TOBN(0x39c81e9e, 0x4e9ed4f8),
-     TOBN(0xd8be0cb9, 0x7b390d35), TOBN(0x01df2bbd, 0x964aab27),
-     TOBN(0x3e8c1a65, 0xc3ef64f8), TOBN(0x567291d1, 0x716ed1dd),
-     TOBN(0x95499c6c, 0x5f5406d3), TOBN(0x71fdda39, 0x5ba8e23f),
-     TOBN(0xcfeb320e, 0xd5096ece), TOBN(0xbe7ba92b, 0xca66dd16),
-     TOBN(0x4608d36b, 0xc6fb5a7d), TOBN(0xe3eea15a, 0x6d2dd0e0),
-     TOBN(0x75b0a3eb, 0x8f97a36a), TOBN(0xf59814cc, 0x1c83de1e),
-     TOBN(0x56c9c5b0, 0x1c33c23f), TOBN(0xa96c1da4, 0x6faa4136),
-     TOBN(0x46bf2074, 0xde316551), TOBN(0x3b866e7b, 0x1f756c8f),
-     TOBN(0x727727d8, 0x1495ed6b), TOBN(0xb2394243, 0xb682dce7),
-     TOBN(0x8ab8454e, 0x758610f3), TOBN(0xc243ce84, 0x857d72a4),
-     TOBN(0x7b320d71, 0xdbbf370f), TOBN(0xff9afa37, 0x78e0f7ca),
-     TOBN(0x0119d1e0, 0xea7b523f), TOBN(0xb997f8cb, 0x058c7d42),
-     TOBN(0x285bcd2a, 0x37bbb184), TOBN(0x51dcec49, 0xa45d1fa6),
-     TOBN(0x6ade3b64, 0xe29634cb), TOBN(0x080c94a7, 0x26b86ef1),
-     TOBN(0xba583db1, 0x2283fbe3), TOBN(0x902bddc8, 0x5a9315ed),
-     TOBN(0x07c1ccb3, 0x86964bec), TOBN(0x78f4eacf, 0xb6258301),
-     TOBN(0x4bdf3a49, 0x56f90823), TOBN(0xba0f5080, 0x741d777b),
-     TOBN(0x091d71c3, 0xf38bf760), TOBN(0x9633d50f, 0x9b625b02),
-     TOBN(0x03ecb743, 0xb8c9de61), TOBN(0xb4751254, 0x5de74720),
-     TOBN(0x9f9defc9, 0x74ce1cb2), TOBN(0x774a4f6a, 0x00bd32ef),
-     TOBN(0xaca385f7, 0x73848f22), TOBN(0x53dad716, 0xf3f8558e),
-     TOBN(0xab7b34b0, 0x93c471f9), TOBN(0xf530e069, 0x19644bc7),
-     TOBN(0x3d9fb1ff, 0xdd59d31a), TOBN(0x4382e0df, 0x08daa795),
-     TOBN(0x165c6f4b, 0xd5cc88d7), TOBN(0xeaa392d5, 0x4a18c900),
-     TOBN(0x94203c67, 0x648024ee), TOBN(0x188763f2, 0x8c2fabcd),
-     TOBN(0xa80f87ac, 0xbbaec835), TOBN(0x632c96e0, 0xf29d8d54),
-     TOBN(0x29b0a60e, 0x4c00a95e), TOBN(0x2ef17f40, 0xe011e9fa),
-     TOBN(0xf6c0e1d1, 0x15b77223), TOBN(0xaaec2c62, 0x14b04e32),
-     TOBN(0xd35688d8, 0x3d84e58c), TOBN(0x2af5094c, 0x958571db),
-     TOBN(0x4fff7e19, 0x760682a6), TOBN(0x4cb27077, 0xe39a407c),
-     TOBN(0x0f59c547, 0x4ff0e321), TOBN(0x169f34a6, 0x1b34c8ff),
-     TOBN(0x2bff1096, 0x52bc1ba7), TOBN(0xa25423b7, 0x83583544),
-     TOBN(0x5d55d5d5, 0x0ac8b782), TOBN(0xff6622ec, 0x2db3c892),
-     TOBN(0x48fce741, 0x6b8bb642), TOBN(0x31d6998c, 0x69d7e3dc),
-     TOBN(0xdbaf8004, 0xcadcaed0), TOBN(0x801b0142, 0xd81d053c),
-     TOBN(0x94b189fc, 0x59630ec6), TOBN(0x120e9934, 0xaf762c8e),
-     TOBN(0x53a29aa4, 0xfdc6a404), TOBN(0x19d8e01e, 0xa1909948),
-     TOBN(0x3cfcabf1, 0xd7e89681), TOBN(0x3321a50d, 0x4e132d37),
-     TOBN(0xd0496863, 0xe9a86111), TOBN(0x8c0cde61, 0x06a3bc65),
-     TOBN(0xaf866c49, 0xfc9f8eef), TOBN(0x2066350e, 0xff7f5141),
-     TOBN(0x4f8a4689, 0xe56ddfbd), TOBN(0xea1b0c07, 0xfe32983a),
-     TOBN(0x2b317462, 0x873cb8cb), TOBN(0x658deddc, 0x2d93229f),
-     TOBN(0x65efaf4d, 0x0f64ef58), TOBN(0xfe43287d, 0x730cc7a8),
-     TOBN(0xaebc0c72, 0x3d047d70), TOBN(0x92efa539, 0xd92d26c9),
-     TOBN(0x06e78457, 0x94b56526), TOBN(0x415cb80f, 0x0961002d),
-     TOBN(0x89e5c565, 0x76dcb10f), TOBN(0x8bbb6982, 0xff9259fe),
-     TOBN(0x4fe8795b, 0x9abc2668), TOBN(0xb5d4f534, 0x1e678fb1),
-     TOBN(0x6601f3be, 0x7b7da2b9), TOBN(0x98da59e2, 0xa13d6805),
-     TOBN(0x190d8ea6, 0x01799a52), TOBN(0xa20cec41, 0xb86d2952),
-     TOBN(0x3062ffb2, 0x7fff2a7c), TOBN(0x741b32e5, 0x79f19d37),
-     TOBN(0xf80d8181, 0x4eb57d47), TOBN(0x7a2d0ed4, 0x16aef06b),
-     TOBN(0x09735fb0, 0x1cecb588), TOBN(0x1641caaa, 0xc6061f5b)}
-    ,
-    {TOBN(0x7f99824f, 0x20151427), TOBN(0x206828b6, 0x92430206),
-     TOBN(0xaa9097d7, 0xe1112357), TOBN(0xacf9a2f2, 0x09e414ec),
-     TOBN(0xdbdac9da, 0x27915356), TOBN(0x7e0734b7, 0x001efee3),
-     TOBN(0x54fab5bb, 0xd2b288e2), TOBN(0x4c630fc4, 0xf62dd09c),
-     TOBN(0x8537107a, 0x1ac2703b), TOBN(0xb49258d8, 0x6bc857b5),
-     TOBN(0x57df14de, 0xbcdaccd1), TOBN(0x24ab68d7, 0xc4ae8529),
-     TOBN(0x7ed8b5d4, 0x734e59d0), TOBN(0x5f8740c8, 0xc495cc80),
-     TOBN(0x84aedd5a, 0x291db9b3), TOBN(0x80b360f8, 0x4fb995be),
-     TOBN(0xae915f5d, 0x5fa067d1), TOBN(0x4134b57f, 0x9668960c),
-     TOBN(0xbd3656d6, 0xa48edaac), TOBN(0xdac1e3e4, 0xfc1d7436),
-     TOBN(0x674ff869, 0xd81fbb26), TOBN(0x449ed3ec, 0xb26c33d4),
-     TOBN(0x85138705, 0xd94203e8), TOBN(0xccde538b, 0xbeeb6f4a),
-     TOBN(0x55d5c68d, 0xa61a76fa), TOBN(0x598b441d, 0xca1554dc),
-     TOBN(0xd39923b9, 0x773b279c), TOBN(0x33331d3c, 0x36bf9efc),
-     TOBN(0x2d4c848e, 0x298de399), TOBN(0xcfdb8e77, 0xa1a27f56),
-     TOBN(0x94c855ea, 0x57b8ab70), TOBN(0xdcdb9dae, 0x6f7879ba),
-     TOBN(0x7bdff8c2, 0x019f2a59), TOBN(0xb3ce5bb3, 0xcb4fbc74),
-     TOBN(0xea907f68, 0x8a9173dd), TOBN(0x6cd3d0d3, 0x95a75439),
-     TOBN(0x92ecc4d6, 0xefed021c), TOBN(0x09a9f9b0, 0x6a77339a),
-     TOBN(0x87ca6b15, 0x7188c64a), TOBN(0x10c29968, 0x44899158),
-     TOBN(0x5859a229, 0xed6e82ef), TOBN(0x16f338e3, 0x65ebaf4e),
-     TOBN(0x0cd31387, 0x5ead67ae), TOBN(0x1c73d228, 0x54ef0bb4),
-     TOBN(0x4cb55131, 0x74a5c8c7), TOBN(0x01cd2970, 0x7f69ad6a),
-     TOBN(0xa04d00dd, 0xe966f87e), TOBN(0xd96fe447, 0x0b7b0321),
-     TOBN(0x342ac06e, 0x88fbd381), TOBN(0x02cd4a84, 0x5c35a493),
-     TOBN(0xe8fa89de, 0x54f1bbcd), TOBN(0x341d6367, 0x2575ed4c),
-     TOBN(0xebe357fb, 0xd238202b), TOBN(0x600b4d1a, 0xa984ead9),
-     TOBN(0xc35c9f44, 0x52436ea0), TOBN(0x96fe0a39, 0xa370751b),
-     TOBN(0x4c4f0736, 0x7f636a38), TOBN(0x9f943fb7, 0x0e76d5cb),
-     TOBN(0xb03510ba, 0xa8b68b8b), TOBN(0xc246780a, 0x9ed07a1f),
-     TOBN(0x3c051415, 0x6d549fc2), TOBN(0xc2953f31, 0x607781ca),
-     TOBN(0x955e2c69, 0xd8d95413), TOBN(0xb300fadc, 0x7bd282e3),
-     TOBN(0x81fe7b50, 0x87e9189f), TOBN(0xdb17375c, 0xf42dda27),
-     TOBN(0x22f7d896, 0xcf0a5904), TOBN(0xa0e57c5a, 0xebe348e6),
-     TOBN(0xa61011d3, 0xf40e3c80), TOBN(0xb1189321, 0x8db705c5),
-     TOBN(0x4ed9309e, 0x50fedec3), TOBN(0xdcf14a10, 0x4d6d5c1d),
-     TOBN(0x056c265b, 0x55691342), TOBN(0xe8e08504, 0x91049dc7),
-     TOBN(0x131329f5, 0xc9bae20a), TOBN(0x96c8b3e8, 0xd9dccdb4),
-     TOBN(0x8c5ff838, 0xfb4ee6b4), TOBN(0xfc5a9aeb, 0x41e8ccf0),
-     TOBN(0x7417b764, 0xfae050c6), TOBN(0x0953c3d7, 0x00452080),
-     TOBN(0x21372682, 0x38dfe7e8), TOBN(0xea417e15, 0x2bb79d4b),
-     TOBN(0x59641f1c, 0x76e7cf2d), TOBN(0x271e3059, 0xea0bcfcc),
-     TOBN(0x624c7dfd, 0x7253ecbd), TOBN(0x2f552e25, 0x4fca6186),
-     TOBN(0xcbf84ecd, 0x4d866e9c), TOBN(0x73967709, 0xf68d4610),
-     TOBN(0xa14b1163, 0xc27901b4), TOBN(0xfd9236e0, 0x899b8bf3),
-     TOBN(0x42b091ec, 0xcbc6da0a), TOBN(0xbb1dac6f, 0x5ad1d297),
-     TOBN(0x80e61d53, 0xa91cf76e), TOBN(0x4110a412, 0xd31f1ee7),
-     TOBN(0x2d87c3ba, 0x13efcf77), TOBN(0x1f374bb4, 0xdf450d76),
-     TOBN(0x5e78e2f2, 0x0d188dab), TOBN(0xe3968ed0, 0xf4b885ef),
-     TOBN(0x46c0568e, 0x7314570f), TOBN(0x31616338, 0x01170521),
-     TOBN(0x18e1e7e2, 0x4f0c8afe), TOBN(0x4caa75ff, 0xdeea78da),
-     TOBN(0x82db67f2, 0x7c5d8a51), TOBN(0x36a44d86, 0x6f505370),
-     TOBN(0xd72c5bda, 0x0333974f), TOBN(0x5db516ae, 0x27a70146),
-     TOBN(0x34705281, 0x210ef921), TOBN(0xbff17a8f, 0x0c9c38e5),
-     TOBN(0x78f4814e, 0x12476da1), TOBN(0xc1e16613, 0x33c16980),
-     TOBN(0x9e5b386f, 0x424d4bca), TOBN(0x4c274e87, 0xc85740de),
-     TOBN(0xb6a9b88d, 0x6c2f5226), TOBN(0x14d1b944, 0x550d7ca8),
-     TOBN(0x580c85fc, 0x1fc41709), TOBN(0xc1da368b, 0x54c6d519),
-     TOBN(0x2b0785ce, 0xd5113cf7), TOBN(0x0670f633, 0x5a34708f),
-     TOBN(0x46e23767, 0x15cc3f88), TOBN(0x1b480cfa, 0x50c72c8f),
-     TOBN(0x20288602, 0x4147519a), TOBN(0xd0981eac, 0x26b372f0),
-     TOBN(0xa9d4a7ca, 0xa785ebc8), TOBN(0xd953c50d, 0xdbdf58e9),
-     TOBN(0x9d6361cc, 0xfd590f8f), TOBN(0x72e9626b, 0x44e6c917),
-     TOBN(0x7fd96110, 0x22eb64cf), TOBN(0x863ebb7e, 0x9eb288f3),
-     TOBN(0x6e6ab761, 0x6aca8ee7), TOBN(0x97d10b39, 0xd7b40358),
-     TOBN(0x1687d377, 0x1e5feb0d), TOBN(0xc83e50e4, 0x8265a27a),
-     TOBN(0x8f75a9fe, 0xc954b313), TOBN(0xcc2e8f47, 0x310d1f61),
-     TOBN(0xf5ba81c5, 0x6557d0e0), TOBN(0x25f9680c, 0x3eaf6207),
-     TOBN(0xf95c6609, 0x4354080b), TOBN(0x5225bfa5, 0x7bf2fe1c),
-     TOBN(0xc5c004e2, 0x5c7d98fa), TOBN(0x3561bf1c, 0x019aaf60),
-     TOBN(0x5e6f9f17, 0xba151474), TOBN(0xdec2f934, 0xb04f6eca),
-     TOBN(0x64e368a1, 0x269acb1e), TOBN(0x1332d9e4, 0x0cdda493),
-     TOBN(0x60d6cf69, 0xdf23de05), TOBN(0x66d17da2, 0x009339a0),
-     TOBN(0x9fcac985, 0x0a693923), TOBN(0xbcf057fc, 0xed7c6a6d),
-     TOBN(0xc3c5c8c5, 0xf0b5662c), TOBN(0x25318dd8, 0xdcba4f24),
-     TOBN(0x60e8cb75, 0x082b69ff), TOBN(0x7c23b3ee, 0x1e728c01),
-     TOBN(0x15e10a0a, 0x097e4403), TOBN(0xcb3d0a86, 0x19854665),
-     TOBN(0x88d8e211, 0xd67d4826), TOBN(0xb39af66e, 0x0b9d2839),
-     TOBN(0xa5f94588, 0xbd475ca8), TOBN(0xe06b7966, 0xc077b80b),
-     TOBN(0xfedb1485, 0xda27c26c), TOBN(0xd290d33a, 0xfe0fd5e0),
-     TOBN(0xa40bcc47, 0xf34fb0fa), TOBN(0xb4760cc8, 0x1fb1ab09),
-     TOBN(0x8fca0993, 0xa273bfe3), TOBN(0x13e4fe07, 0xf70b213c),
-     TOBN(0x3bcdb992, 0xfdb05163), TOBN(0x8c484b11, 0x0c2b19b6),
-     TOBN(0x1acb815f, 0xaaf2e3e2), TOBN(0xc6905935, 0xb89ff1b4),
-     TOBN(0xb2ad6f9d, 0x586e74e1), TOBN(0x488883ad, 0x67b80484),
-     TOBN(0x758aa2c7, 0x369c3ddb), TOBN(0x8ab74e69, 0x9f9afd31),
-     TOBN(0x10fc2d28, 0x5e21beb1), TOBN(0x3484518a, 0x318c42f9),
-     TOBN(0x377427dc, 0x53cf40c3), TOBN(0x9de0781a, 0x391bc1d9),
-     TOBN(0x8faee858, 0x693807e1), TOBN(0xa3865327, 0x4e81ccc7),
-     TOBN(0x02c30ff2, 0x6f835b84), TOBN(0xb604437b, 0x0d3d38d4),
-     TOBN(0xb3fc8a98, 0x5ca1823d), TOBN(0xb82f7ec9, 0x03be0324),
-     TOBN(0xee36d761, 0xcf684a33), TOBN(0x5a01df0e, 0x9f29bf7d),
-     TOBN(0x686202f3, 0x1306583d), TOBN(0x05b10da0, 0x437c622e),
-     TOBN(0xbf9aaa0f, 0x076a7bc8), TOBN(0x25e94efb, 0x8f8f4e43),
-     TOBN(0x8a35c9b7, 0xfa3dc26d), TOBN(0xe0e5fb93, 0x96ff03c5),
-     TOBN(0xa77e3843, 0xebc394ce), TOBN(0xcede6595, 0x8361de60),
-     TOBN(0xd27c22f6, 0xa1993545), TOBN(0xab01cc36, 0x24d671ba),
-     TOBN(0x63fa2877, 0xa169c28e), TOBN(0x925ef904, 0x2eb08376),
-     TOBN(0x3b2fa3cf, 0x53aa0b32), TOBN(0xb27beb5b, 0x71c49d7a),
-     TOBN(0xb60e1834, 0xd105e27f), TOBN(0xd6089788, 0x4f68570d),
-     TOBN(0x23094ce0, 0xd6fbc2ac), TOBN(0x738037a1, 0x815ff551),
-     TOBN(0xda73b1bb, 0x6bef119c), TOBN(0xdcf6c430, 0xeef506ba),
-     TOBN(0x00e4fe7b, 0xe3ef104a), TOBN(0xebdd9a2c, 0x0a065628),
-     TOBN(0x853a81c3, 0x8792043e), TOBN(0x22ad6ece, 0xb3b59108),
-     TOBN(0x9fb813c0, 0x39cd297d), TOBN(0x8ec7e16e, 0x05bda5d9),
-     TOBN(0x2834797c, 0x0d104b96), TOBN(0xcc11a2e7, 0x7c511510),
-     TOBN(0x96ca5a53, 0x96ee6380), TOBN(0x054c8655, 0xcea38742),
-     TOBN(0xb5946852, 0xd54dfa7d), TOBN(0x97c422e7, 0x1f4ab207),
-     TOBN(0xbf907509, 0x0c22b540), TOBN(0x2cde42aa, 0xb7c267d4),
-     TOBN(0xba18f9ed, 0x5ab0d693), TOBN(0x3ba62aa6, 0x6e4660d9),
-     TOBN(0xb24bf97b, 0xab9ea96a), TOBN(0x5d039642, 0xe3b60e32),
-     TOBN(0x4e6a4506, 0x7c4d9bd5), TOBN(0x666c5b9e, 0x7ed4a6a4),
-     TOBN(0xfa3fdcd9, 0x8edbd7cc), TOBN(0x4660bb87, 0xc6ccd753),
-     TOBN(0x9ae90820, 0x21e6b64f), TOBN(0x8a56a713, 0xb36bfb3f),
-     TOBN(0xabfce096, 0x5726d47f), TOBN(0x9eed01b2, 0x0b1a9a7f),
-     TOBN(0x30e9cad4, 0x4eb74a37), TOBN(0x7b2524cc, 0x53e9666d),
-     TOBN(0x6a29683b, 0x8f4b002f), TOBN(0xc2200d7a, 0x41f4fc20),
-     TOBN(0xcf3af47a, 0x3a338acc), TOBN(0x6539a4fb, 0xe7128975),
-     TOBN(0xcec31c14, 0xc33c7fcf), TOBN(0x7eb6799b, 0xc7be322b),
-     TOBN(0x119ef4e9, 0x6646f623), TOBN(0x7b7a26a5, 0x54d7299b),
-     TOBN(0xcb37f08d, 0x403f46f2), TOBN(0x94b8fc43, 0x1a0ec0c7),
-     TOBN(0xbb8514e3, 0xc332142f), TOBN(0xf3ed2c33, 0xe80d2a7a),
-     TOBN(0x8d2080af, 0xb639126c), TOBN(0xf7b6be60, 0xe3553ade),
-     TOBN(0x3950aa9f, 0x1c7e2b09), TOBN(0x847ff958, 0x6410f02b),
-     TOBN(0x877b7cf5, 0x678a31b0), TOBN(0xd50301ae, 0x3998b620),
-     TOBN(0x734257c5, 0xc00fb396), TOBN(0xf9fb18a0, 0x04e672a6),
-     TOBN(0xff8bd8eb, 0xe8758851), TOBN(0x1e64e4c6, 0x5d99ba44),
-     TOBN(0x4b8eaedf, 0x7dfd93b7), TOBN(0xba2f2a98, 0x04e76b8c),
-     TOBN(0x7d790cba, 0xe8053433), TOBN(0xc8e725a0, 0x3d2c9585),
-     TOBN(0x58c5c476, 0xcdd8f5ed), TOBN(0xd106b952, 0xefa9fe1d),
-     TOBN(0x3c5c775b, 0x0eff13a9), TOBN(0x242442ba, 0xe057b930),
-     TOBN(0xe9f458d4, 0xc9b70cbd), TOBN(0x69b71448, 0xa3cdb89a),
-     TOBN(0x41ee46f6, 0x0e2ed742), TOBN(0x573f1045, 0x40067493),
-     TOBN(0xb1e154ff, 0x9d54c304), TOBN(0x2ad0436a, 0x8d3a7502),
-     TOBN(0xee4aaa2d, 0x431a8121), TOBN(0xcd38b3ab, 0x886f11ed),
-     TOBN(0x57d49ea6, 0x034a0eb7), TOBN(0xd2b773bd, 0xf7e85e58),
-     TOBN(0x4a559ac4, 0x9b5c1f14), TOBN(0xc444be1a, 0x3e54df2b),
-     TOBN(0x13aad704, 0xeda41891), TOBN(0xcd927bec, 0x5eb5c788),
-     TOBN(0xeb3c8516, 0xe48c8a34), TOBN(0x1b7ac812, 0x4b546669),
-     TOBN(0x1815f896, 0x594df8ec), TOBN(0x87c6a79c, 0x79227865),
-     TOBN(0xae02a2f0, 0x9b56ddbd), TOBN(0x1339b5ac, 0x8a2f1cf3),
-     TOBN(0xf2b569c7, 0x839dff0d), TOBN(0xb0b9e864, 0xfee9a43d),
-     TOBN(0x4ff8ca41, 0x77bb064e), TOBN(0x145a2812, 0xfd249f63),
-     TOBN(0x3ab7beac, 0xf86f689a), TOBN(0x9bafec27, 0x01d35f5e),
-     TOBN(0x28054c65, 0x4265aa91), TOBN(0xa4b18304, 0x035efe42),
-     TOBN(0x6887b0e6, 0x9639dec7), TOBN(0xf4b8f6ad, 0x3d52aea5),
-     TOBN(0xfb9293cc, 0x971a8a13), TOBN(0x3f159e5d, 0x4c934d07),
-     TOBN(0x2c50e9b1, 0x09acbc29), TOBN(0x08eb65e6, 0x7154d129),
-     TOBN(0x4feff589, 0x30b75c3e), TOBN(0x0bb82fe2, 0x94491c93),
-     TOBN(0xd8ac377a, 0x89af62bb), TOBN(0xd7b51490, 0x9685e49f),
-     TOBN(0xabca9a7b, 0x04497f19), TOBN(0x1b35ed0a, 0x1a7ad13f),
-     TOBN(0x6b601e21, 0x3ec86ed6), TOBN(0xda91fcb9, 0xce0c76f1),
-     TOBN(0x9e28507b, 0xd7ab27e1), TOBN(0x7c19a555, 0x63945b7b),
-     TOBN(0x6b43f0a1, 0xaafc9827), TOBN(0x443b4fbd, 0x3aa55b91),
-     TOBN(0x962b2e65, 0x6962c88f), TOBN(0x139da8d4, 0xce0db0ca),
-     TOBN(0xb93f05dd, 0x1b8d6c4f), TOBN(0x779cdff7, 0x180b9824),
-     TOBN(0xbba23fdd, 0xae57c7b7), TOBN(0x345342f2, 0x1b932522),
-     TOBN(0xfd9c80fe, 0x556d4aa3), TOBN(0xa03907ba, 0x6525bb61),
-     TOBN(0x38b010e1, 0xff218933), TOBN(0xc066b654, 0xaa52117b),
-     TOBN(0x8e141920, 0x94f2e6ea), TOBN(0x66a27dca, 0x0d32f2b2),
-     TOBN(0x69c7f993, 0x048b3717), TOBN(0xbf5a989a, 0xb178ae1c),
-     TOBN(0x49fa9058, 0x564f1d6b), TOBN(0x27ec6e15, 0xd31fde4e),
-     TOBN(0x4cce0373, 0x7276e7fc), TOBN(0x64086d79, 0x89d6bf02),
-     TOBN(0x5a72f046, 0x4ccdd979), TOBN(0x909c3566, 0x47775631),
-     TOBN(0x1c07bc6b, 0x75dd7125), TOBN(0xb4c6bc97, 0x87a0428d),
-     TOBN(0x507ece52, 0xfdeb6b9d), TOBN(0xfca56512, 0xb2c95432),
-     TOBN(0x15d97181, 0xd0e8bd06), TOBN(0x384dd317, 0xc6bb46ea),
-     TOBN(0x5441ea20, 0x3952b624), TOBN(0xbcf70dee, 0x4e7dc2fb),
-     TOBN(0x372b016e, 0x6628e8c3), TOBN(0x07a0d667, 0xb60a7522),
-     TOBN(0xcf05751b, 0x0a344ee2), TOBN(0x0ec09a48, 0x118bdeec),
-     TOBN(0x6e4b3d4e, 0xd83dce46), TOBN(0x43a6316d, 0x99d2fc6e),
-     TOBN(0xa99d8989, 0x56cf044c), TOBN(0x7c7f4454, 0xae3e5fb7),
-     TOBN(0xb2e6b121, 0xfbabbe92), TOBN(0x281850fb, 0xe1330076),
-     TOBN(0x093581ec, 0x97890015), TOBN(0x69b1dded, 0x75ff77f5),
-     TOBN(0x7cf0b18f, 0xab105105), TOBN(0x953ced31, 0xa89ccfef),
-     TOBN(0x3151f85f, 0xeb914009), TOBN(0x3c9f1b87, 0x88ed48ad),
-     TOBN(0xc9aba1a1, 0x4a7eadcb), TOBN(0x928e7501, 0x522e71cf),
-     TOBN(0xeaede727, 0x3a2e4f83), TOBN(0x467e10d1, 0x1ce3bbd3),
-     TOBN(0xf3442ac3, 0xb955dcf0), TOBN(0xba96307d, 0xd3d5e527),
-     TOBN(0xf763a10e, 0xfd77f474), TOBN(0x5d744bd0, 0x6a6e1ff0),
-     TOBN(0xd287282a, 0xa777899e), TOBN(0xe20eda8f, 0xd03f3cde),
-     TOBN(0x6a7e75bb, 0x50b07d31), TOBN(0x0b7e2a94, 0x6f379de4),
-     TOBN(0x31cb64ad, 0x19f593cf), TOBN(0x7b1a9e4f, 0x1e76ef1d),
-     TOBN(0xe18c9c9d, 0xb62d609c), TOBN(0x439bad6d, 0xe779a650),
-     TOBN(0x219d9066, 0xe032f144), TOBN(0x1db632b8, 0xe8b2ec6a),
-     TOBN(0xff0d0fd4, 0xfda12f78), TOBN(0x56fb4c2d, 0x2a25d265),
-     TOBN(0x5f4e2ee1, 0x255a03f1), TOBN(0x61cd6af2, 0xe96af176),
-     TOBN(0xe0317ba8, 0xd068bc97), TOBN(0x927d6bab, 0x264b988e),
-     TOBN(0xa18f07e0, 0xe90fb21e), TOBN(0x00fd2b80, 0xbba7fca1),
-     TOBN(0x20387f27, 0x95cd67b5), TOBN(0x5b89a4e7, 0xd39707f7),
-     TOBN(0x8f83ad3f, 0x894407ce), TOBN(0xa0025b94, 0x6c226132),
-     TOBN(0xc79563c7, 0xf906c13b), TOBN(0x5f548f31, 0x4e7bb025),
-     TOBN(0x2b4c6b8f, 0xeac6d113), TOBN(0xa67e3f9c, 0x0e813c76),
-     TOBN(0x3982717c, 0x3fe1f4b9), TOBN(0x58865819, 0x26d8050e),
-     TOBN(0x99f3640c, 0xf7f06f20), TOBN(0xdc610216, 0x2a66ebc2),
-     TOBN(0x52f2c175, 0x767a1e08), TOBN(0x05660e1a, 0x5999871b),
-     TOBN(0x6b0f1762, 0x6d3c4693), TOBN(0xf0e7d627, 0x37ed7bea),
-     TOBN(0xc51758c7, 0xb75b226d), TOBN(0x40a88628, 0x1f91613b),
-     TOBN(0x889dbaa7, 0xbbb38ce0), TOBN(0xe0404b65, 0xbddcad81),
-     TOBN(0xfebccd3a, 0x8bc9671f), TOBN(0xfbf9a357, 0xee1f5375),
-     TOBN(0x5dc169b0, 0x28f33398), TOBN(0xb07ec11d, 0x72e90f65),
-     TOBN(0xae7f3b4a, 0xfaab1eb1), TOBN(0xd970195e, 0x5f17538a),
-     TOBN(0x52b05cbe, 0x0181e640), TOBN(0xf5debd62, 0x2643313d),
-     TOBN(0x76148154, 0x5df31f82), TOBN(0x23e03b33, 0x3a9e13c5),
-     TOBN(0xff758949, 0x4fde0c1f), TOBN(0xbf8a1abe, 0xe5b6ec20),
-     TOBN(0x702278fb, 0x87e1db6c), TOBN(0xc447ad7a, 0x35ed658f),
-     TOBN(0x48d4aa38, 0x03d0ccf2), TOBN(0x80acb338, 0x819a7c03),
-     TOBN(0x9bc7c89e, 0x6e17cecc), TOBN(0x46736b8b, 0x03be1d82),
-     TOBN(0xd65d7b60, 0xc0432f96), TOBN(0xddebe7a3, 0xdeb5442f),
-     TOBN(0x79a25307, 0x7dff69a2), TOBN(0x37a56d94, 0x02cf3122),
-     TOBN(0x8bab8aed, 0xf2350d0a), TOBN(0x13c3f276, 0x037b0d9a),
-     TOBN(0xc664957c, 0x44c65cae), TOBN(0x88b44089, 0xc2e71a88),
-     TOBN(0xdb88e5a3, 0x5cb02664), TOBN(0x5d4c0bf1, 0x8686c72e),
-     TOBN(0xea3d9b62, 0xa682d53e), TOBN(0x9b605ef4, 0x0b2ad431),
-     TOBN(0x71bac202, 0xc69645d0), TOBN(0xa115f03a, 0x6a1b66e7),
-     TOBN(0xfe2c563a, 0x158f4dc4), TOBN(0xf715b3a0, 0x4d12a78c),
-     TOBN(0x8f7f0a48, 0xd413213a), TOBN(0x2035806d, 0xc04becdb),
-     TOBN(0xecd34a99, 0x5d8587f5), TOBN(0x4d8c3079, 0x9f6d3a71),
-     TOBN(0x1b2a2a67, 0x8d95a8f6), TOBN(0xc58c9d7d, 0xf2110d0d),
-     TOBN(0xdeee81d5, 0xcf8fba3f), TOBN(0xa42be3c0, 0x0c7cdf68),
-     TOBN(0x2126f742, 0xd43b5eaa), TOBN(0x054a0766, 0xdfa59b85),
-     TOBN(0x9d0d5e36, 0x126bfd45), TOBN(0xa1f8fbd7, 0x384f8a8f),
-     TOBN(0x317680f5, 0xd563fccc), TOBN(0x48ca5055, 0xf280a928),
-     TOBN(0xe00b81b2, 0x27b578cf), TOBN(0x10aad918, 0x2994a514),
-     TOBN(0xd9e07b62, 0xb7bdc953), TOBN(0x9f0f6ff2, 0x5bc086dd),
-     TOBN(0x09d1ccff, 0x655eee77), TOBN(0x45475f79, 0x5bef7df1),
-     TOBN(0x3faa28fa, 0x86f702cc), TOBN(0x92e60905, 0x0f021f07),
-     TOBN(0xe9e62968, 0x7f8fa8c6), TOBN(0xbd71419a, 0xf036ea2c),
-     TOBN(0x171ee1cc, 0x6028da9a), TOBN(0x5352fe1a, 0xc251f573),
-     TOBN(0xf8ff236e, 0x3fa997f4), TOBN(0xd831b6c9, 0xa5749d5f),
-     TOBN(0x7c872e1d, 0xe350e2c2), TOBN(0xc56240d9, 0x1e0ce403),
-     TOBN(0xf9deb077, 0x6974f5cb), TOBN(0x7d50ba87, 0x961c3728),
-     TOBN(0xd6f89426, 0x5a3a2518), TOBN(0xcf817799, 0xc6303d43),
-     TOBN(0x510a0471, 0x619e5696), TOBN(0xab049ff6, 0x3a5e307b),
-     TOBN(0xe4cdf9b0, 0xfeb13ec7), TOBN(0xd5e97117, 0x9d8ff90c),
-     TOBN(0xf6f64d06, 0x9afa96af), TOBN(0x00d0bf5e, 0x9d2012a2),
-     TOBN(0xe63f301f, 0x358bcdc0), TOBN(0x07689e99, 0x0a9d47f8),
-     TOBN(0x1f689e2f, 0x4f43d43a), TOBN(0x4d542a16, 0x90920904),
-     TOBN(0xaea293d5, 0x9ca0a707), TOBN(0xd061fe45, 0x8ac68065),
-     TOBN(0x1033bf1b, 0x0090008c), TOBN(0x29749558, 0xc08a6db6),
-     TOBN(0x74b5fc59, 0xc1d5d034), TOBN(0xf712e9f6, 0x67e215e0),
-     TOBN(0xfd520cbd, 0x860200e6), TOBN(0x0229acb4, 0x3ea22588),
-     TOBN(0x9cd1e14c, 0xfff0c82e), TOBN(0x87684b62, 0x59c69e73),
-     TOBN(0xda85e61c, 0x96ccb989), TOBN(0x2d5dbb02, 0xa3d06493),
-     TOBN(0xf22ad33a, 0xe86b173c), TOBN(0xe8e41ea5, 0xa79ff0e3),
-     TOBN(0x01d2d725, 0xdd0d0c10), TOBN(0x31f39088, 0x032d28f9),
-     TOBN(0x7b3f71e1, 0x7829839e), TOBN(0x0cf691b4, 0x4502ae58),
-     TOBN(0xef658dbd, 0xbefc6115), TOBN(0xa5cd6ee5, 0xb3ab5314),
-     TOBN(0x206c8d7b, 0x5f1d2347), TOBN(0x794645ba, 0x4cc2253a),
-     TOBN(0xd517d8ff, 0x58389e08), TOBN(0x4fa20dee, 0x9f847288),
-     TOBN(0xeba072d8, 0xd797770a), TOBN(0x7360c91d, 0xbf429e26),
-     TOBN(0x7200a3b3, 0x80af8279), TOBN(0x6a1c9150, 0x82dadce3),
-     TOBN(0x0ee6d3a7, 0xc35d8794), TOBN(0x042e6558, 0x0356bae5),
-     TOBN(0x9f59698d, 0x643322fd), TOBN(0x9379ae15, 0x50a61967),
-     TOBN(0x64b9ae62, 0xfcc9981e), TOBN(0xaed3d631, 0x6d2934c6),
-     TOBN(0x2454b302, 0x5e4e65eb), TOBN(0xab09f647, 0xf9950428)}
-    ,
-    {TOBN(0xb2083a12, 0x22248acc), TOBN(0x1f6ec0ef, 0x3264e366),
-     TOBN(0x5659b704, 0x5afdee28), TOBN(0x7a823a40, 0xe6430bb5),
-     TOBN(0x24592a04, 0xe1900a79), TOBN(0xcde09d4a, 0xc9ee6576),
-     TOBN(0x52b6463f, 0x4b5ea54a), TOBN(0x1efe9ed3, 0xd3ca65a7),
-     TOBN(0xe27a6dbe, 0x305406dd), TOBN(0x8eb7dc7f, 0xdd5d1957),
-     TOBN(0xf54a6876, 0x387d4d8f), TOBN(0x9c479409, 0xc7762de4),
-     TOBN(0xbe4d5b5d, 0x99b30778), TOBN(0x25380c56, 0x6e793682),
-     TOBN(0x602d37f3, 0xdac740e3), TOBN(0x140deabe, 0x1566e4ae),
-     TOBN(0x4481d067, 0xafd32acf), TOBN(0xd8f0fcca, 0xe1f71ccf),
-     TOBN(0xd208dd0c, 0xb596f2da), TOBN(0xd049d730, 0x9aad93f9),
-     TOBN(0xc79f263d, 0x42ab580e), TOBN(0x09411bb1, 0x23f707b4),
-     TOBN(0x8cfde1ff, 0x835e0eda), TOBN(0x72707490, 0x90f03402),
-     TOBN(0xeaee6126, 0xc49a861e), TOBN(0x024f3b65, 0xe14f0d06),
-     TOBN(0x51a3f1e8, 0xc69bfc17), TOBN(0xc3c3a8e9, 0xa7686381),
-     TOBN(0x3400752c, 0xb103d4c8), TOBN(0x02bc4613, 0x9218b36b),
-     TOBN(0xc67f75eb, 0x7651504a), TOBN(0xd6848b56, 0xd02aebfa),
-     TOBN(0xbd9802e6, 0xc30fa92b), TOBN(0x5a70d96d, 0x9a552784),
-     TOBN(0x9085c4ea, 0x3f83169b), TOBN(0xfa9423bb, 0x06908228),
-     TOBN(0x2ffebe12, 0xfe97a5b9), TOBN(0x85da6049, 0x71b99118),
-     TOBN(0x9cbc2f7f, 0x63178846), TOBN(0xfd96bc70, 0x9153218e),
-     TOBN(0x958381db, 0x1782269b), TOBN(0xae34bf79, 0x2597e550),
-     TOBN(0xbb5c6064, 0x5f385153), TOBN(0x6f0e96af, 0xe3088048),
-     TOBN(0xbf6a0215, 0x77884456), TOBN(0xb3b5688c, 0x69310ea7),
-     TOBN(0x17c94295, 0x04fad2de), TOBN(0xe020f0e5, 0x17896d4d),
-     TOBN(0x730ba0ab, 0x0976505f), TOBN(0x567f6813, 0x095e2ec5),
-     TOBN(0x47062010, 0x6331ab71), TOBN(0x72cfa977, 0x41d22b9f),
-     TOBN(0x33e55ead, 0x8a2373da), TOBN(0xa8d0d5f4, 0x7ba45a68),
-     TOBN(0xba1d8f9c, 0x03029d15), TOBN(0x8f34f1cc, 0xfc55b9f3),
-     TOBN(0xcca4428d, 0xbbe5a1a9), TOBN(0x8187fd5f, 0x3126bd67),
-     TOBN(0x0036973a, 0x48105826), TOBN(0xa39b6663, 0xb8bd61a0),
-     TOBN(0x6d42deef, 0x2d65a808), TOBN(0x4969044f, 0x94636b19),
-     TOBN(0xf611ee47, 0xdd5d564c), TOBN(0x7b2f3a49, 0xd2873077),
-     TOBN(0x94157d45, 0x300eb294), TOBN(0x2b2a656e, 0x169c1494),
-     TOBN(0xc000dd76, 0xd3a47aa9), TOBN(0xa2864e4f, 0xa6243ea4),
-     TOBN(0x82716c47, 0xdb89842e), TOBN(0x12dfd7d7, 0x61479fb7),
-     TOBN(0x3b9a2c56, 0xe0b2f6dc), TOBN(0x46be862a, 0xd7f85d67),
-     TOBN(0x03b0d8dd, 0x0f82b214), TOBN(0x460c34f9, 0xf103cbc6),
-     TOBN(0xf32e5c03, 0x18d79e19), TOBN(0x8b8888ba, 0xa84117f8),
-     TOBN(0x8f3c37dc, 0xc0722677), TOBN(0x10d21be9, 0x1c1c0f27),
-     TOBN(0xd47c8468, 0xe0f7a0c6), TOBN(0x9bf02213, 0xadecc0e0),
-     TOBN(0x0baa7d12, 0x42b48b99), TOBN(0x1bcb665d, 0x48424096),
-     TOBN(0x8b847cd6, 0xebfb5cfb), TOBN(0x87c2ae56, 0x9ad4d10d),
-     TOBN(0xf1cbb122, 0x0de36726), TOBN(0xe7043c68, 0x3fdfbd21),
-     TOBN(0x4bd0826a, 0x4e79d460), TOBN(0x11f5e598, 0x4bd1a2cb),
-     TOBN(0x97554160, 0xb7fe7b6e), TOBN(0x7d16189a, 0x400a3fb2),
-     TOBN(0xd73e9bea, 0xe328ca1e), TOBN(0x0dd04b97, 0xe793d8cc),
-     TOBN(0xa9c83c9b, 0x506db8cc), TOBN(0x5cd47aae, 0xcf38814c),
-     TOBN(0x26fc430d, 0xb64b45e6), TOBN(0x079b5499, 0xd818ea84),
-     TOBN(0xebb01102, 0xc1c24a3b), TOBN(0xca24e568, 0x1c161c1a),
-     TOBN(0x103eea69, 0x36f00a4a), TOBN(0x9ad76ee8, 0x76176c7b),
-     TOBN(0x97451fc2, 0x538e0ff7), TOBN(0x94f89809, 0x6604b3b0),
-     TOBN(0x6311436e, 0x3249cfd7), TOBN(0x27b4a7bd, 0x41224f69),
-     TOBN(0x03b5d21a, 0xe0ac2941), TOBN(0x279b0254, 0xc2d31937),
-     TOBN(0x3307c052, 0xcac992d0), TOBN(0x6aa7cb92, 0xefa8b1f3),
-     TOBN(0x5a182580, 0x0d37c7a5), TOBN(0x13380c37, 0x342d5422),
-     TOBN(0x92ac2d66, 0xd5d2ef92), TOBN(0x035a70c9, 0x030c63c6),
-     TOBN(0xc16025dd, 0x4ce4f152), TOBN(0x1f419a71, 0xf9df7c06),
-     TOBN(0x6d5b2214, 0x91e4bb14), TOBN(0xfc43c6cc, 0x839fb4ce),
-     TOBN(0x49f06591, 0x925d6b2d), TOBN(0x4b37d9d3, 0x62186598),
-     TOBN(0x8c54a971, 0xd01b1629), TOBN(0xe1a9c29f, 0x51d50e05),
-     TOBN(0x5109b785, 0x71ba1861), TOBN(0x48b22d5c, 0xd0c8f93d),
-     TOBN(0xe8fa84a7, 0x8633bb93), TOBN(0x53fba6ba, 0x5aebbd08),
-     TOBN(0x7ff27df3, 0xe5eea7d8), TOBN(0x521c8796, 0x68ca7158),
-     TOBN(0xb9d5133b, 0xce6f1a05), TOBN(0x2d50cd53, 0xfd0ebee4),
-     TOBN(0xc82115d6, 0xc5a3ef16), TOBN(0x993eff9d, 0xba079221),
-     TOBN(0xe4da2c5e, 0x4b5da81c), TOBN(0x9a89dbdb, 0x8033fd85),
-     TOBN(0x60819ebf, 0x2b892891), TOBN(0x53902b21, 0x5d14a4d5),
-     TOBN(0x6ac35051, 0xd7fda421), TOBN(0xcc6ab885, 0x61c83284),
-     TOBN(0x14eba133, 0xf74cff17), TOBN(0x240aaa03, 0xecb813f2),
-     TOBN(0xcfbb6540, 0x6f665bee), TOBN(0x084b1fe4, 0xa425ad73),
-     TOBN(0x009d5d16, 0xd081f6a6), TOBN(0x35304fe8, 0xeef82c90),
-     TOBN(0xf20346d5, 0xaa9eaa22), TOBN(0x0ada9f07, 0xac1c91e3),
-     TOBN(0xa6e21678, 0x968a6144), TOBN(0x54c1f77c, 0x07b31a1e),
-     TOBN(0xd6bb787e, 0x5781fbe1), TOBN(0x61bd2ee0, 0xe31f1c4a),
-     TOBN(0xf25aa1e9, 0x781105fc), TOBN(0x9cf2971f, 0x7b2f8e80),
-     TOBN(0x26d15412, 0xcdff919b), TOBN(0x01db4ebe, 0x34bc896e),
-     TOBN(0x7d9b3e23, 0xb40df1cf), TOBN(0x59337373, 0x94e971b4),
-     TOBN(0xbf57bd14, 0x669cf921), TOBN(0x865daedf, 0x0c1a1064),
-     TOBN(0x3eb70bd3, 0x83279125), TOBN(0xbc3d5b9f, 0x34ecdaab),
-     TOBN(0x91e3ed7e, 0x5f755caf), TOBN(0x49699f54, 0xd41e6f02),
-     TOBN(0x185770e1, 0xd4a7a15b), TOBN(0x08f3587a, 0xeaac87e7),
-     TOBN(0x352018db, 0x473133ea), TOBN(0x674ce719, 0x04fd30fc),
-     TOBN(0x7b8d9835, 0x088b3e0e), TOBN(0x7a0356a9, 0x5d0d47a1),
-     TOBN(0x9d9e7659, 0x6474a3c4), TOBN(0x61ea48a7, 0xff66966c),
-     TOBN(0x30417758, 0x0f3e4834), TOBN(0xfdbb21c2, 0x17a9afcb),
-     TOBN(0x756fa17f, 0x2f9a67b3), TOBN(0x2a6b2421, 0xa245c1a8),
-     TOBN(0x64be2794, 0x4af02291), TOBN(0xade465c6, 0x2a5804fe),
-     TOBN(0x8dffbd39, 0xa6f08fd7), TOBN(0xc4efa84c, 0xaa14403b),
-     TOBN(0xa1b91b2a, 0x442b0f5c), TOBN(0xb748e317, 0xcf997736),
-     TOBN(0x8d1b62bf, 0xcee90e16), TOBN(0x907ae271, 0x0b2078c0),
-     TOBN(0xdf31534b, 0x0c9bcddd), TOBN(0x043fb054, 0x39adce83),
-     TOBN(0x99031043, 0xd826846a), TOBN(0x61a9c0d6, 0xb144f393),
-     TOBN(0xdab48046, 0x47718427), TOBN(0xdf17ff9b, 0x6e830f8b),
-     TOBN(0x408d7ee8, 0xe49a1347), TOBN(0x6ac71e23, 0x91c1d4ae),
-     TOBN(0xc8cbb9fd, 0x1defd73c), TOBN(0x19840657, 0xbbbbfec5),
-     TOBN(0x39db1cb5, 0x9e7ef8ea), TOBN(0x78aa8296, 0x64105f30),
-     TOBN(0xa3d9b7f0, 0xa3738c29), TOBN(0x0a2f235a, 0xbc3250a3),
-     TOBN(0x55e506f6, 0x445e4caf), TOBN(0x0974f73d, 0x33475f7a),
-     TOBN(0xd37dbba3, 0x5ba2f5a8), TOBN(0x542c6e63, 0x6af40066),
-     TOBN(0x26d99b53, 0xc5d73e2c), TOBN(0x06060d7d, 0x6c3ca33e),
-     TOBN(0xcdbef1c2, 0x065fef4a), TOBN(0x77e60f7d, 0xfd5b92e3),
-     TOBN(0xd7c549f0, 0x26708350), TOBN(0x201b3ad0, 0x34f121bf),
-     TOBN(0x5fcac2a1, 0x0334fc14), TOBN(0x8a9a9e09, 0x344552f6),
-     TOBN(0x7dd8a1d3, 0x97653082), TOBN(0x5fc0738f, 0x79d4f289),
-     TOBN(0x787d244d, 0x17d2d8c3), TOBN(0xeffc6345, 0x70830684),
-     TOBN(0x5ddb96dd, 0xe4f73ae5), TOBN(0x8efb14b1, 0x172549a5),
-     TOBN(0x6eb73eee, 0x2245ae7a), TOBN(0xbca4061e, 0xea11f13e),
-     TOBN(0xb577421d, 0x30b01f5d), TOBN(0xaa688b24, 0x782e152c),
-     TOBN(0x67608e71, 0xbd3502ba), TOBN(0x4ef41f24, 0xb4de75a0),
-     TOBN(0xb08dde5e, 0xfd6125e5), TOBN(0xde484825, 0xa409543f),
-     TOBN(0x1f198d98, 0x65cc2295), TOBN(0x428a3771, 0x6e0edfa2),
-     TOBN(0x4f9697a2, 0xadf35fc7), TOBN(0x01a43c79, 0xf7cac3c7),
-     TOBN(0xb05d7059, 0x0fd3659a), TOBN(0x8927f30c, 0xbb7f2d9a),
-     TOBN(0x4023d1ac, 0x8cf984d3), TOBN(0x32125ed3, 0x02897a45),
-     TOBN(0xfb572dad, 0x3d414205), TOBN(0x73000ef2, 0xe3fa82a9),
-     TOBN(0x4c0868e9, 0xf10a5581), TOBN(0x5b61fc67, 0x6b0b3ca5),
-     TOBN(0xc1258d5b, 0x7cae440c), TOBN(0x21c08b41, 0x402b7531),
-     TOBN(0xf61a8955, 0xde932321), TOBN(0x3568faf8, 0x2d1408af),
-     TOBN(0x71b15e99, 0x9ecf965b), TOBN(0xf14ed248, 0xe917276f),
-     TOBN(0xc6f4caa1, 0x820cf9e2), TOBN(0x681b20b2, 0x18d83c7e),
-     TOBN(0x6cde738d, 0xc6c01120), TOBN(0x71db0813, 0xae70e0db),
-     TOBN(0x95fc0644, 0x74afe18c), TOBN(0x34619053, 0x129e2be7),
-     TOBN(0x80615cea, 0xdb2a3b15), TOBN(0x0a49a19e, 0xdb4c7073),
-     TOBN(0x0e1b84c8, 0x8fd2d367), TOBN(0xd74bf462, 0x033fb8aa),
-     TOBN(0x889f6d65, 0x533ef217), TOBN(0x7158c7e4, 0xc3ca2e87),
-     TOBN(0xfb670dfb, 0xdc2b4167), TOBN(0x75910a01, 0x844c257f),
-     TOBN(0xf336bf07, 0xcf88577d), TOBN(0x22245250, 0xe45e2ace),
-     TOBN(0x2ed92e8d, 0x7ca23d85), TOBN(0x29f8be4c, 0x2b812f58),
-     TOBN(0xdd9ebaa7, 0x076fe12b), TOBN(0x3f2400cb, 0xae1537f9),
-     TOBN(0x1aa93528, 0x17bdfb46), TOBN(0xc0f98430, 0x67883b41),
-     TOBN(0x5590ede1, 0x0170911d), TOBN(0x7562f5bb, 0x34d4b17f),
-     TOBN(0xe1fa1df2, 0x1826b8d2), TOBN(0xb40b796a, 0x6bd80d59),
-     TOBN(0xd65bf197, 0x3467ba92), TOBN(0x8c9b46db, 0xf70954b0),
-     TOBN(0x97c8a0f3, 0x0e78f15d), TOBN(0xa8f3a69a, 0x85a4c961),
-     TOBN(0x4242660f, 0x61e4ce9b), TOBN(0xbf06aab3, 0x6ea6790c),
-     TOBN(0xc6706f8e, 0xec986416), TOBN(0x9e56dec1, 0x9a9fc225),
-     TOBN(0x527c46f4, 0x9a9898d9), TOBN(0xd799e77b, 0x5633cdef),
-     TOBN(0x24eacc16, 0x7d9e4297), TOBN(0xabb61cea, 0x6b1cb734),
-     TOBN(0xbee2e8a7, 0xf778443c), TOBN(0x3bb42bf1, 0x29de2fe6),
-     TOBN(0xcbed86a1, 0x3003bb6f), TOBN(0xd3918e6c, 0xd781cdf6),
-     TOBN(0x4bee3271, 0x9a5103f1), TOBN(0x5243efc6, 0xf50eac06),
-     TOBN(0xb8e122cb, 0x6adcc119), TOBN(0x1b7faa84, 0xc0b80a08),
-     TOBN(0x32c3d1bd, 0x6dfcd08c), TOBN(0x129dec4e, 0x0be427de),
-     TOBN(0x98ab679c, 0x1d263c83), TOBN(0xafc83cb7, 0xcef64eff),
-     TOBN(0x85eb6088, 0x2fa6be76), TOBN(0x892585fb, 0x1328cbfe),
-     TOBN(0xc154d3ed, 0xcf618dda), TOBN(0xc44f601b, 0x3abaf26e),
-     TOBN(0x7bf57d0b, 0x2be1fdfd), TOBN(0xa833bd2d, 0x21137fee),
-     TOBN(0x9353af36, 0x2db591a8), TOBN(0xc76f26dc, 0x5562a056),
-     TOBN(0x1d87e47d, 0x3fdf5a51), TOBN(0x7afb5f93, 0x55c9cab0),
-     TOBN(0x91bbf58f, 0x89e0586e), TOBN(0x7c72c018, 0x0d843709),
-     TOBN(0xa9a5aafb, 0x99b5c3dc), TOBN(0xa48a0f1d, 0x3844aeb0),
-     TOBN(0x7178b7dd, 0xb667e482), TOBN(0x453985e9, 0x6e23a59a),
-     TOBN(0x4a54c860, 0x01b25dd8), TOBN(0x0dd37f48, 0xfb897c8a),
-     TOBN(0x5f8aa610, 0x0ea90cd9), TOBN(0xc8892c68, 0x16d5830d),
-     TOBN(0xeb4befc0, 0xef514ca5), TOBN(0x478eb679, 0xe72c9ee6),
-     TOBN(0x9bca20da, 0xdbc40d5f), TOBN(0xf015de21, 0xdde4f64a),
-     TOBN(0xaa6a4de0, 0xeaf4b8a5), TOBN(0x68cfd9ca, 0x4bc60e32),
-     TOBN(0x668a4b01, 0x7fd15e70), TOBN(0xd9f0694a, 0xf27dc09d),
-     TOBN(0xf6c3cad5, 0xba708bcd), TOBN(0x5cd2ba69, 0x5bb95c2a),
-     TOBN(0xaa28c1d3, 0x33c0a58f), TOBN(0x23e274e3, 0xabc77870),
-     TOBN(0x44c3692d, 0xdfd20a4a), TOBN(0x091c5fd3, 0x81a66653),
-     TOBN(0x6c0bb691, 0x09a0757d), TOBN(0x9072e8b9, 0x667343ea),
-     TOBN(0x31d40eb0, 0x80848bec), TOBN(0x95bd480a, 0x79fd36cc),
-     TOBN(0x01a77c61, 0x65ed43f5), TOBN(0xafccd127, 0x2e0d40bf),
-     TOBN(0xeccfc82d, 0x1cc1884b), TOBN(0xc85ac201, 0x5d4753b4),
-     TOBN(0xc7a6caac, 0x658e099f), TOBN(0xcf46369e, 0x04b27390),
-     TOBN(0xe2e7d049, 0x506467ea), TOBN(0x481b63a2, 0x37cdeccc),
-     TOBN(0x4029abd8, 0xed80143a), TOBN(0x28bfe3c7, 0xbcb00b88),
-     TOBN(0x3bec1009, 0x0643d84a), TOBN(0x885f3668, 0xabd11041),
-     TOBN(0xdb02432c, 0xf83a34d6), TOBN(0x32f7b360, 0x719ceebe),
-     TOBN(0xf06c7837, 0xdad1fe7a), TOBN(0x60a157a9, 0x5441a0b0),
-     TOBN(0x704970e9, 0xe2d47550), TOBN(0xcd2bd553, 0x271b9020),
-     TOBN(0xff57f82f, 0x33e24a0b), TOBN(0x9cbee23f, 0xf2565079),
-     TOBN(0x16353427, 0xeb5f5825), TOBN(0x276feec4, 0xe948d662),
-     TOBN(0xd1b62bc6, 0xda10032b), TOBN(0x718351dd, 0xf0e72a53),
-     TOBN(0x93452076, 0x2420e7ba), TOBN(0x96368fff, 0x3a00118d),
-     TOBN(0x00ce2d26, 0x150a49e4), TOBN(0x0c28b636, 0x3f04706b),
-     TOBN(0xbad65a46, 0x58b196d0), TOBN(0x6c8455fc, 0xec9f8b7c),
-     TOBN(0xe90c895f, 0x2d71867e), TOBN(0x5c0be31b, 0xedf9f38c),
-     TOBN(0x2a37a15e, 0xd8f6ec04), TOBN(0x239639e7, 0x8cd85251),
-     TOBN(0xd8975315, 0x9c7c4c6b), TOBN(0x603aa3c0, 0xd7409af7),
-     TOBN(0xb8d53d0c, 0x007132fb), TOBN(0x68d12af7, 0xa6849238),
-     TOBN(0xbe0607e7, 0xbf5d9279), TOBN(0x9aa50055, 0xaada74ce),
-     TOBN(0xe81079cb, 0xba7e8ccb), TOBN(0x610c71d1, 0xa5f4ff5e),
-     TOBN(0x9e2ee1a7, 0x5aa07093), TOBN(0xca84004b, 0xa75da47c),
-     TOBN(0x074d3951, 0x3de75401), TOBN(0xf938f756, 0xbb311592),
-     TOBN(0x96197618, 0x00a43421), TOBN(0x39a25362, 0x07bc78c8),
-     TOBN(0x278f710a, 0x0a171276), TOBN(0xb28446ea, 0x8d1a8f08),
-     TOBN(0x184781bf, 0xe3b6a661), TOBN(0x7751cb1d, 0xe6d279f7),
-     TOBN(0xf8ff95d6, 0xc59eb662), TOBN(0x186d90b7, 0x58d3dea7),
-     TOBN(0x0e4bb6c1, 0xdfb4f754), TOBN(0x5c5cf56b, 0x2b2801dc),
-     TOBN(0xc561e452, 0x1f54564d), TOBN(0xb4fb8c60, 0xf0dd7f13),
-     TOBN(0xf8849630, 0x33ff98c7), TOBN(0x9619fffa, 0xcf17769c),
-     TOBN(0xf8090bf6, 0x1bfdd80a), TOBN(0x14d9a149, 0x422cfe63),
-     TOBN(0xb354c360, 0x6f6df9ea), TOBN(0xdbcf770d, 0x218f17ea),
-     TOBN(0x207db7c8, 0x79eb3480), TOBN(0x213dbda8, 0x559b6a26),
-     TOBN(0xac4c200b, 0x29fc81b3), TOBN(0xebc3e09f, 0x171d87c1),
-     TOBN(0x91799530, 0x1481aa9e), TOBN(0x051b92e1, 0x92e114fa),
-     TOBN(0xdf8f92e9, 0xecb5537f), TOBN(0x44b1b2cc, 0x290c7483),
-     TOBN(0xa711455a, 0x2adeb016), TOBN(0x964b6856, 0x81a10c2c),
-     TOBN(0x4f159d99, 0xcec03623), TOBN(0x05532225, 0xef3271ea),
-     TOBN(0xb231bea3, 0xc5ee4849), TOBN(0x57a54f50, 0x7094f103),
-     TOBN(0x3e2d421d, 0x9598b352), TOBN(0xe865a49c, 0x67412ab4),
-     TOBN(0xd2998a25, 0x1cc3a912), TOBN(0x5d092808, 0x0c74d65d),
-     TOBN(0x73f45908, 0x4088567a), TOBN(0xeb6b280e, 0x1f214a61),
-     TOBN(0x8c9adc34, 0xcaf0c13d), TOBN(0x39d12938, 0xf561fb80),
-     TOBN(0xb2dc3a5e, 0xbc6edfb4), TOBN(0x7485b1b1, 0xfe4d210e),
-     TOBN(0x062e0400, 0xe186ae72), TOBN(0x91e32d5c, 0x6eeb3b88),
-     TOBN(0x6df574d7, 0x4be59224), TOBN(0xebc88ccc, 0x716d55f3),
-     TOBN(0x26c2e6d0, 0xcad6ed33), TOBN(0xc6e21e7d, 0x0d3e8b10),
-     TOBN(0x2cc5840e, 0x5bcc36bb), TOBN(0x9292445e, 0x7da74f69),
-     TOBN(0x8be8d321, 0x4e5193a8), TOBN(0x3ec23629, 0x8df06413),
-     TOBN(0xc7e9ae85, 0xb134defa), TOBN(0x6073b1d0, 0x1bb2d475),
-     TOBN(0xb9ad615e, 0x2863c00d), TOBN(0x9e29493d, 0x525f4ac4),
-     TOBN(0xc32b1dea, 0x4e9acf4f), TOBN(0x3e1f01c8, 0xa50db88d),
-     TOBN(0xb05d70ea, 0x04da916c), TOBN(0x714b0d0a, 0xd865803e),
-     TOBN(0x4bd493fc, 0x9920cb5e), TOBN(0x5b44b1f7, 0x92c7a3ac),
-     TOBN(0xa2a77293, 0xbcec9235), TOBN(0x5ee06e87, 0xcd378553),
-     TOBN(0xceff8173, 0xda621607), TOBN(0x2bb03e4c, 0x99f5d290),
-     TOBN(0x2945106a, 0xa6f734ac), TOBN(0xb5056604, 0xd25c4732),
-     TOBN(0x5945920c, 0xe079afee), TOBN(0x686e17a0, 0x6789831f),
-     TOBN(0x5966bee8, 0xb74a5ae5), TOBN(0x38a673a2, 0x1e258d46),
-     TOBN(0xbd1cc1f2, 0x83141c95), TOBN(0x3b2ecf4f, 0x0e96e486),
-     TOBN(0xcd3aa896, 0x74e5fc78), TOBN(0x415ec10c, 0x2482fa7a),
-     TOBN(0x15234419, 0x80503380), TOBN(0x513d917a, 0xd314b392),
-     TOBN(0xb0b52f4e, 0x63caecae), TOBN(0x07bf22ad, 0x2dc7780b),
-     TOBN(0xe761e8a1, 0xe4306839), TOBN(0x1b3be962, 0x5dd7feaa),
-     TOBN(0x4fe728de, 0x74c778f1), TOBN(0xf1fa0bda, 0x5e0070f6),
-     TOBN(0x85205a31, 0x6ec3f510), TOBN(0x2c7e4a14, 0xd2980475),
-     TOBN(0xde3c19c0, 0x6f30ebfd), TOBN(0xdb1c1f38, 0xd4b7e644),
-     TOBN(0xfe291a75, 0x5dce364a), TOBN(0xb7b22a3c, 0x058f5be3),
-     TOBN(0x2cd2c302, 0x37fea38c), TOBN(0x2930967a, 0x2e17be17),
-     TOBN(0x87f009de, 0x0c061c65), TOBN(0xcb014aac, 0xedc6ed44),
-     TOBN(0x49bd1cb4, 0x3bafb1eb), TOBN(0x81bd8b5c, 0x282d3688),
-     TOBN(0x1cdab87e, 0xf01a17af), TOBN(0x21f37ac4, 0xe710063b),
-     TOBN(0x5a6c5676, 0x42fc8193), TOBN(0xf4753e70, 0x56a6015c),
-     TOBN(0x020f795e, 0xa15b0a44), TOBN(0x8f37c8d7, 0x8958a958),
-     TOBN(0x63b7e89b, 0xa4b675b5), TOBN(0xb4fb0c0c, 0x0fc31aea),
-     TOBN(0xed95e639, 0xa7ff1f2e), TOBN(0x9880f5a3, 0x619614fb),
-     TOBN(0xdeb6ff02, 0x947151ab), TOBN(0x5bc5118c, 0xa868dcdb),
-     TOBN(0xd8da2055, 0x4c20cea5), TOBN(0xcac2776e, 0x14c4d69a),
-     TOBN(0xcccb22c1, 0x622d599b), TOBN(0xa4ddb653, 0x68a9bb50),
-     TOBN(0x2c4ff151, 0x1b4941b4), TOBN(0xe1ff19b4, 0x6efba588),
-     TOBN(0x35034363, 0xc48345e0), TOBN(0x45542e3d, 0x1e29dfc4),
-     TOBN(0xf197cb91, 0x349f7aed), TOBN(0x3b2b5a00, 0x8fca8420),
-     TOBN(0x7c175ee8, 0x23aaf6d8), TOBN(0x54dcf421, 0x35af32b6),
-     TOBN(0x0ba14307, 0x27d6561e), TOBN(0x879d5ee4, 0xd175b1e2),
-     TOBN(0xc7c43673, 0x99807db5), TOBN(0x77a54455, 0x9cd55bcd),
-     TOBN(0xe6c2ff13, 0x0105c072), TOBN(0x18f7a99f, 0x8dda7da4),
-     TOBN(0x4c301820, 0x0e2d35c1), TOBN(0x06a53ca0, 0xd9cc6c82),
-     TOBN(0xaa21cc1e, 0xf1aa1d9e), TOBN(0x32414334, 0x4a75b1e8),
-     TOBN(0x2a6d1328, 0x0ebe9fdc), TOBN(0x16bd173f, 0x98a4755a),
-     TOBN(0xfbb9b245, 0x2133ffd9), TOBN(0x39a8b2f1, 0x830f1a20),
-     TOBN(0x484bc97d, 0xd5a1f52a), TOBN(0xd6aebf56, 0xa40eddf8),
-     TOBN(0x32257acb, 0x76ccdac6), TOBN(0xaf4d36ec, 0x1586ff27),
-     TOBN(0x8eaa8863, 0xf8de7dd1), TOBN(0x0045d5cf, 0x88647c16)}
-    ,
-    {TOBN(0xa6f3d574, 0xc005979d), TOBN(0xc2072b42, 0x6a40e350),
-     TOBN(0xfca5c156, 0x8de2ecf9), TOBN(0xa8c8bf5b, 0xa515344e),
-     TOBN(0x97aee555, 0x114df14a), TOBN(0xd4374a4d, 0xfdc5ec6b),
-     TOBN(0x754cc28f, 0x2ca85418), TOBN(0x71cb9e27, 0xd3c41f78),
-     TOBN(0x89105079, 0x03605c39), TOBN(0xf0843d9e, 0xa142c96c),
-     TOBN(0xf3744934, 0x16923684), TOBN(0x732caa2f, 0xfa0a2893),
-     TOBN(0xb2e8c270, 0x61160170), TOBN(0xc32788cc, 0x437fbaa3),
-     TOBN(0x39cd818e, 0xa6eda3ac), TOBN(0xe2e94239, 0x9e2b2e07),
-     TOBN(0x6967d39b, 0x0260e52a), TOBN(0xd42585cc, 0x90653325),
-     TOBN(0x0d9bd605, 0x21ca7954), TOBN(0x4fa20877, 0x81ed57b3),
-     TOBN(0x60c1eff8, 0xe34a0bbe), TOBN(0x56b0040c, 0x84f6ef64),
-     TOBN(0x28be2b24, 0xb1af8483), TOBN(0xb2278163, 0xf5531614),
-     TOBN(0x8df27545, 0x5922ac1c), TOBN(0xa7b3ef5c, 0xa52b3f63),
-     TOBN(0x8e77b214, 0x71de57c4), TOBN(0x31682c10, 0x834c008b),
-     TOBN(0xc76824f0, 0x4bd55d31), TOBN(0xb6d1c086, 0x17b61c71),
-     TOBN(0x31db0903, 0xc2a5089d), TOBN(0x9c092172, 0x184e5d3f),
-     TOBN(0xdd7ced5b, 0xc00cc638), TOBN(0x1a2015eb, 0x61278fc2),
-     TOBN(0x2e8e5288, 0x6a37f8d6), TOBN(0xc457786f, 0xe79933ad),
-     TOBN(0xb3fe4cce, 0x2c51211a), TOBN(0xad9b10b2, 0x24c20498),
-     TOBN(0x90d87a4f, 0xd28db5e5), TOBN(0x698cd105, 0x3aca2fc3),
-     TOBN(0x4f112d07, 0xe91b536d), TOBN(0xceb982f2, 0x9eba09d6),
-     TOBN(0x3c157b2c, 0x197c396f), TOBN(0xe23c2d41, 0x7b66eb24),
-     TOBN(0x480c57d9, 0x3f330d37), TOBN(0xb3a4c8a1, 0x79108deb),
-     TOBN(0x702388de, 0xcb199ce5), TOBN(0x0b019211, 0xb944a8d4),
-     TOBN(0x24f2a692, 0x840bb336), TOBN(0x7c353bdc, 0xa669fa7b),
-     TOBN(0xda20d6fc, 0xdec9c300), TOBN(0x625fbe2f, 0xa13a4f17),
-     TOBN(0xa2b1b61a, 0xdbc17328), TOBN(0x008965bf, 0xa9515621),
-     TOBN(0x49690939, 0xc620ff46), TOBN(0x182dd27d, 0x8717e91c),
-     TOBN(0x5ace5035, 0xea6c3997), TOBN(0x54259aaa, 0xc2610bef),
-     TOBN(0xef18bb3f, 0x3c80dd39), TOBN(0x6910b95b, 0x5fc3fa39),
-     TOBN(0xfce2f510, 0x43e09aee), TOBN(0xced56c9f, 0xa7675665),
-     TOBN(0x10e265ac, 0xd872db61), TOBN(0x6982812e, 0xae9fce69),
-     TOBN(0x29be11c6, 0xce800998), TOBN(0x72bb1752, 0xb90360d9),
-     TOBN(0x2c193197, 0x5a4ad590), TOBN(0x2ba2f548, 0x9fc1dbc0),
-     TOBN(0x7fe4eebb, 0xe490ebe0), TOBN(0x12a0a4cd, 0x7fae11c0),
-     TOBN(0x7197cf81, 0xe903ba37), TOBN(0xcf7d4aa8, 0xde1c6dd8),
-     TOBN(0x92af6bf4, 0x3fd5684c), TOBN(0x2b26eecf, 0x80360aa1),
-     TOBN(0xbd960f30, 0x00546a82), TOBN(0x407b3c43, 0xf59ad8fe),
-     TOBN(0x86cae5fe, 0x249c82ba), TOBN(0x9e0faec7, 0x2463744c),
-     TOBN(0x87f551e8, 0x94916272), TOBN(0x033f9344, 0x6ceb0615),
-     TOBN(0x1e5eb0d1, 0x8be82e84), TOBN(0x89967f0e, 0x7a582fef),
-     TOBN(0xbcf687d5, 0xa6e921fa), TOBN(0xdfee4cf3, 0xd37a09ba),
-     TOBN(0x94f06965, 0xb493c465), TOBN(0x638b9a1c, 0x7635c030),
-     TOBN(0x76667864, 0x66f05e9f), TOBN(0xccaf6808, 0xc04da725),
-     TOBN(0xca2eb690, 0x768fccfc), TOBN(0xf402d37d, 0xb835b362),
-     TOBN(0x0efac0d0, 0xe2fdfcce), TOBN(0xefc9cdef, 0xb638d990),
-     TOBN(0x2af12b72, 0xd1669a8b), TOBN(0x33c536bc, 0x5774ccbd),
-     TOBN(0x30b21909, 0xfb34870e), TOBN(0xc38fa2f7, 0x7df25aca),
-     TOBN(0x74c5f02b, 0xbf81f3f5), TOBN(0x0525a5ae, 0xaf7e4581),
-     TOBN(0x88d2aaba, 0x433c54ae), TOBN(0xed9775db, 0x806a56c5),
-     TOBN(0xd320738a, 0xc0edb37d), TOBN(0x25fdb6ee, 0x66cc1f51),
-     TOBN(0xac661d17, 0x10600d76), TOBN(0x931ec1f3, 0xbdd1ed76),
-     TOBN(0x65c11d62, 0x19ee43f1), TOBN(0x5cd57c3e, 0x60829d97),
-     TOBN(0xd26c91a3, 0x984be6e8), TOBN(0xf08d9309, 0x8b0c53bd),
-     TOBN(0x94bc9e5b, 0xc016e4ea), TOBN(0xd3916839, 0x11d43d2b),
-     TOBN(0x886c5ad7, 0x73701155), TOBN(0xe0377626, 0x20b00715),
-     TOBN(0x7f01c9ec, 0xaa80ba59), TOBN(0x3083411a, 0x68538e51),
-     TOBN(0x970370f1, 0xe88128af), TOBN(0x625cc3db, 0x91dec14b),
-     TOBN(0xfef9666c, 0x01ac3107), TOBN(0xb2a8d577, 0xd5057ac3),
-     TOBN(0xb0f26299, 0x92be5df7), TOBN(0xf579c8e5, 0x00353924),
-     TOBN(0xb8fa3d93, 0x1341ed7a), TOBN(0x4223272c, 0xa7b59d49),
-     TOBN(0x3dcb1947, 0x83b8c4a4), TOBN(0x4e413c01, 0xed1302e4),
-     TOBN(0x6d999127, 0xe17e44ce), TOBN(0xee86bf75, 0x33b3adfb),
-     TOBN(0xf6902fe6, 0x25aa96ca), TOBN(0xb73540e4, 0xe5aae47d),
-     TOBN(0x32801d7b, 0x1b4a158c), TOBN(0xe571c99e, 0x27e2a369),
-     TOBN(0x40cb76c0, 0x10d9f197), TOBN(0xc308c289, 0x3167c0ae),
-     TOBN(0xa6ef9dd3, 0xeb7958f2), TOBN(0xa7226dfc, 0x300879b1),
-     TOBN(0x6cd0b362, 0x7edf0636), TOBN(0x4efbce6c, 0x7bc37eed),
-     TOBN(0x75f92a05, 0x8d699021), TOBN(0x586d4c79, 0x772566e3),
-     TOBN(0x378ca5f1, 0x761ad23a), TOBN(0x650d86fc, 0x1465a8ac),
-     TOBN(0x7a4ed457, 0x842ba251), TOBN(0x6b65e3e6, 0x42234933),
-     TOBN(0xaf1543b7, 0x31aad657), TOBN(0xa4cefe98, 0xcbfec369),
-     TOBN(0xb587da90, 0x9f47befb), TOBN(0x6562e9fb, 0x41312d13),
-     TOBN(0xa691ea59, 0xeff1cefe), TOBN(0xcc30477a, 0x05fc4cf6),
-     TOBN(0xa1632461, 0x0b0ffd3d), TOBN(0xa1f16f3b, 0x5b355956),
-     TOBN(0x5b148d53, 0x4224ec24), TOBN(0xdc834e7b, 0xf977012a),
-     TOBN(0x7bfc5e75, 0xb2c69dbc), TOBN(0x3aa77a29, 0x03c3da6c),
-     TOBN(0xde0df03c, 0xca910271), TOBN(0xcbd5ca4a, 0x7806dc55),
-     TOBN(0xe1ca5807, 0x6db476cb), TOBN(0xfde15d62, 0x5f37a31e),
-     TOBN(0xf49af520, 0xf41af416), TOBN(0x96c5c5b1, 0x7d342db5),
-     TOBN(0x155c43b7, 0xeb4ceb9b), TOBN(0x2e993010, 0x4e77371a),
-     TOBN(0x1d2987da, 0x675d43af), TOBN(0xef2bc1c0, 0x8599fd72),
-     TOBN(0x96894b7b, 0x9342f6b2), TOBN(0x201eadf2, 0x7c8e71f0),
-     TOBN(0xf3479d9f, 0x4a1f3efc), TOBN(0xe0f8a742, 0x702a9704),
-     TOBN(0xeafd44b6, 0xb3eba40c), TOBN(0xf9739f29, 0xc1c1e0d0),
-     TOBN(0x0091471a, 0x619d505e), TOBN(0xc15f9c96, 0x9d7c263e),
-     TOBN(0x5be47285, 0x83afbe33), TOBN(0xa3b6d6af, 0x04f1e092),
-     TOBN(0xe76526b9, 0x751a9d11), TOBN(0x2ec5b26d, 0x9a4ae4d2),
-     TOBN(0xeb66f4d9, 0x02f6fb8d), TOBN(0x4063c561, 0x96912164),
-     TOBN(0xeb7050c1, 0x80ef3000), TOBN(0x288d1c33, 0xeaa5b3f0),
-     TOBN(0xe87c68d6, 0x07806fd8), TOBN(0xb2f7f9d5, 0x4bbbf50f),
-     TOBN(0x25972f3a, 0xac8d6627), TOBN(0xf8547774, 0x10e8c13b),
-     TOBN(0xcc50ef6c, 0x872b4a60), TOBN(0xab2a34a4, 0x4613521b),
-     TOBN(0x39c5c190, 0x983e15d1), TOBN(0x61dde5df, 0x59905512),
-     TOBN(0xe417f621, 0x9f2275f3), TOBN(0x0750c8b6, 0x451d894b),
-     TOBN(0x75b04ab9, 0x78b0bdaa), TOBN(0x3bfd9fd4, 0x458589bd),
-     TOBN(0xf1013e30, 0xee9120b6), TOBN(0x2b51af93, 0x23a4743e),
-     TOBN(0xea96ffae, 0x48d14d9e), TOBN(0x71dc0dbe, 0x698a1d32),
-     TOBN(0x914962d2, 0x0180cca4), TOBN(0x1ae60677, 0xc3568963),
-     TOBN(0x8cf227b1, 0x437bc444), TOBN(0xc650c83b, 0xc9962c7a),
-     TOBN(0x23c2c7dd, 0xfe7ccfc4), TOBN(0xf925c89d, 0x1b929d48),
-     TOBN(0x4460f74b, 0x06783c33), TOBN(0xac2c8d49, 0xa590475a),
-     TOBN(0xfb40b407, 0xb807bba0), TOBN(0x9d1e362d, 0x69ff8f3a),
-     TOBN(0xa33e9681, 0xcbef64a4), TOBN(0x67ece5fa, 0x332fb4b2),
-     TOBN(0x6900a99b, 0x739f10e3), TOBN(0xc3341ca9, 0xff525925),
-     TOBN(0xee18a626, 0xa9e2d041), TOBN(0xa5a83685, 0x29580ddd),
-     TOBN(0xf3470c81, 0x9d7de3cd), TOBN(0xedf02586, 0x2062cf9c),
-     TOBN(0xf43522fa, 0xc010edb0), TOBN(0x30314135, 0x13a4b1ae),
-     TOBN(0xc792e02a, 0xdb22b94b), TOBN(0x993d8ae9, 0xa1eaa45b),
-     TOBN(0x8aad6cd3, 0xcd1e1c63), TOBN(0x89529ca7, 0xc5ce688a),
-     TOBN(0x2ccee3aa, 0xe572a253), TOBN(0xe02b6438, 0x02a21efb),
-     TOBN(0xa7091b6e, 0xc9430358), TOBN(0x06d1b1fa, 0x9d7db504),
-     TOBN(0x58846d32, 0xc4744733), TOBN(0x40517c71, 0x379f9e34),
-     TOBN(0x2f65655f, 0x130ef6ca), TOBN(0x526e4488, 0xf1f3503f),
-     TOBN(0x8467bd17, 0x7ee4a976), TOBN(0x1d9dc913, 0x921363d1),
-     TOBN(0xd8d24c33, 0xb069e041), TOBN(0x5eb5da0a, 0x2cdf7f51),
-     TOBN(0x1c0f3cb1, 0x197b994f), TOBN(0x3c95a6c5, 0x2843eae9),
-     TOBN(0x7766ffc9, 0xa6097ea5), TOBN(0x7bea4093, 0xd723b867),
-     TOBN(0xb48e1f73, 0x4db378f9), TOBN(0x70025b00, 0xe37b77ac),
-     TOBN(0x943dc8e7, 0xaf24ad46), TOBN(0xb98a15ac, 0x16d00a85),
-     TOBN(0x3adc38ba, 0x2743b004), TOBN(0xb1c7f4f7, 0x334415ee),
-     TOBN(0xea43df8f, 0x1e62d05a), TOBN(0x32618905, 0x9d76a3b6),
-     TOBN(0x2fbd0bb5, 0xa23a0f46), TOBN(0x5bc971db, 0x6a01918c),
-     TOBN(0x7801d94a, 0xb4743f94), TOBN(0xb94df65e, 0x676ae22b),
-     TOBN(0xaafcbfab, 0xaf95894c), TOBN(0x7b9bdc07, 0x276b2241),
-     TOBN(0xeaf98362, 0x5bdda48b), TOBN(0x5977faf2, 0xa3fcb4df),
-     TOBN(0xbed042ef, 0x052c4b5b), TOBN(0x9fe87f71, 0x067591f0),
-     TOBN(0xc89c73ca, 0x22f24ec7), TOBN(0x7d37fa9e, 0xe64a9f1b),
-     TOBN(0x2710841a, 0x15562627), TOBN(0x2c01a613, 0xc243b034),
-     TOBN(0x1d135c56, 0x2bc68609), TOBN(0xc2ca1715, 0x8b03f1f6),
-     TOBN(0xc9966c2d, 0x3eb81d82), TOBN(0xc02abf4a, 0x8f6df13e),
-     TOBN(0x77b34bd7, 0x8f72b43b), TOBN(0xaff6218f, 0x360c82b0),
-     TOBN(0x0aa5726c, 0x8d55b9d2), TOBN(0xdc0adbe9, 0x99e9bffb),
-     TOBN(0x9097549c, 0xefb9e72a), TOBN(0x16755712, 0x9dfb3111),
-     TOBN(0xdd8bf984, 0xf26847f9), TOBN(0xbcb8e387, 0xdfb30cb7),
-     TOBN(0xc1fd32a7, 0x5171ef9c), TOBN(0x977f3fc7, 0x389b363f),
-     TOBN(0x116eaf2b, 0xf4babda0), TOBN(0xfeab68bd, 0xf7113c8e),
-     TOBN(0xd1e3f064, 0xb7def526), TOBN(0x1ac30885, 0xe0b3fa02),
-     TOBN(0x1c5a6e7b, 0x40142d9d), TOBN(0x839b5603, 0x30921c0b),
-     TOBN(0x48f301fa, 0x36a116a3), TOBN(0x380e1107, 0xcfd9ee6d),
-     TOBN(0x7945ead8, 0x58854be1), TOBN(0x4111c12e, 0xcbd4d49d),
-     TOBN(0xece3b1ec, 0x3a29c2ef), TOBN(0x6356d404, 0x8d3616f5),
-     TOBN(0x9f0d6a8f, 0x594d320e), TOBN(0x0989316d, 0xf651ccd2),
-     TOBN(0x6c32117a, 0x0f8fdde4), TOBN(0x9abe5cc5, 0xa26a9bbc),
-     TOBN(0xcff560fb, 0x9723f671), TOBN(0x21b2a12d, 0x7f3d593c),
-     TOBN(0xe4cb18da, 0x24ba0696), TOBN(0x186e2220, 0xc3543384),
-     TOBN(0x722f64e0, 0x88312c29), TOBN(0x94282a99, 0x17dc7752),
-     TOBN(0x62467bbf, 0x5a85ee89), TOBN(0xf435c650, 0xf10076a0),
-     TOBN(0xc9ff1539, 0x43b3a50b), TOBN(0x7132130c, 0x1a53efbc),
-     TOBN(0x31bfe063, 0xf7b0c5b7), TOBN(0xb0179a7d, 0x4ea994cc),
-     TOBN(0x12d064b3, 0xc85f455b), TOBN(0x47259328, 0x8f6e0062),
-     TOBN(0xf64e590b, 0xb875d6d9), TOBN(0x22dd6225, 0xad92bcc7),
-     TOBN(0xb658038e, 0xb9c3bd6d), TOBN(0x00cdb0d6, 0xfbba27c8),
-     TOBN(0x0c681337, 0x1062c45d), TOBN(0xd8515b8c, 0x2d33407d),
-     TOBN(0xcb8f699e, 0x8cbb5ecf), TOBN(0x8c4347f8, 0xc608d7d8),
-     TOBN(0x2c11850a, 0xbb3e00db), TOBN(0x20a8dafd, 0xecb49d19),
-     TOBN(0xbd781480, 0x45ee2f40), TOBN(0x75e354af, 0x416b60cf),
-     TOBN(0xde0b58a1, 0x8d49a8c4), TOBN(0xe40e94e2, 0xfa359536),
-     TOBN(0xbd4fa59f, 0x62accd76), TOBN(0x05cf466a, 0x8c762837),
-     TOBN(0xb5abda99, 0x448c277b), TOBN(0x5a9e01bf, 0x48b13740),
-     TOBN(0x9d457798, 0x326aad8d), TOBN(0xbdef4954, 0xc396f7e7),
-     TOBN(0x6fb274a2, 0xc253e292), TOBN(0x2800bf0a, 0x1cfe53e7),
-     TOBN(0x22426d31, 0x44438fd4), TOBN(0xef233923, 0x5e259f9a),
-     TOBN(0x4188503c, 0x03f66264), TOBN(0x9e5e7f13, 0x7f9fdfab),
-     TOBN(0x565eb76c, 0x5fcc1aba), TOBN(0xea632548, 0x59b5bff8),
-     TOBN(0x5587c087, 0xaab6d3fa), TOBN(0x92b639ea, 0x6ce39c1b),
-     TOBN(0x0706e782, 0x953b135c), TOBN(0x7308912e, 0x425268ef),
-     TOBN(0x599e92c7, 0x090e7469), TOBN(0x83b90f52, 0x9bc35e75),
-     TOBN(0x4750b3d0, 0x244975b3), TOBN(0xf3a44358, 0x11965d72),
-     TOBN(0x179c6774, 0x9c8dc751), TOBN(0xff18cdfe, 0xd23d9ff0),
-     TOBN(0xc4013833, 0x2028e247), TOBN(0x96e280e2, 0xf3bfbc79),
-     TOBN(0xf60417bd, 0xd0880a84), TOBN(0x263c9f3d, 0x2a568151),
-     TOBN(0x36be15b3, 0x2d2ce811), TOBN(0x846dc0c2, 0xf8291d21),
-     TOBN(0x5cfa0ecb, 0x789fcfdb), TOBN(0x45a0beed, 0xd7535b9a),
-     TOBN(0xec8e9f07, 0x96d69af1), TOBN(0x31a7c5b8, 0x599ab6dc),
-     TOBN(0xd36d45ef, 0xf9e2e09f), TOBN(0x3cf49ef1, 0xdcee954b),
-     TOBN(0x6be34cf3, 0x086cff9b), TOBN(0x88dbd491, 0x39a3360f),
-     TOBN(0x1e96b8cc, 0x0dbfbd1d), TOBN(0xc1e5f7bf, 0xcb7e2552),
-     TOBN(0x0547b214, 0x28819d98), TOBN(0xc770dd9c, 0x7aea9dcb),
-     TOBN(0xaef0d4c7, 0x041d68c8), TOBN(0xcc2b9818, 0x13cb9ba8),
-     TOBN(0x7fc7bc76, 0xfe86c607), TOBN(0x6b7b9337, 0x502a9a95),
-     TOBN(0x1948dc27, 0xd14dab63), TOBN(0x249dd198, 0xdae047be),
-     TOBN(0xe8356584, 0xa981a202), TOBN(0x3531dd18, 0x3a893387),
-     TOBN(0x1be11f90, 0xc85c7209), TOBN(0x93d2fe1e, 0xe2a52b5a),
-     TOBN(0x8225bfe2, 0xec6d6b97), TOBN(0x9cf6d6f4, 0xbd0aa5de),
-     TOBN(0x911459cb, 0x54779f5f), TOBN(0x5649cddb, 0x86aeb1f3),
-     TOBN(0x32133579, 0x3f26ce5a), TOBN(0xc289a102, 0x550f431e),
-     TOBN(0x559dcfda, 0x73b84c6f), TOBN(0x84973819, 0xee3ac4d7),
-     TOBN(0xb51e55e6, 0xf2606a82), TOBN(0xe25f7061, 0x90f2fb57),
-     TOBN(0xacef6c2a, 0xb1a4e37c), TOBN(0x864e359d, 0x5dcf2706),
-     TOBN(0x479e6b18, 0x7ce57316), TOBN(0x2cab2500, 0x3a96b23d),
-     TOBN(0xed489862, 0x8ef16df7), TOBN(0x2056538c, 0xef3758b5),
-     TOBN(0xa7df865e, 0xf15d3101), TOBN(0x80c5533a, 0x61b553d7),
-     TOBN(0x366e1997, 0x4ed14294), TOBN(0x6620741f, 0xb3c0bcd6),
-     TOBN(0x21d1d9c4, 0xedc45418), TOBN(0x005b859e, 0xc1cc4a9d),
-     TOBN(0xdf01f630, 0xa1c462f0), TOBN(0x15d06cf3, 0xf26820c7),
-     TOBN(0x9f7f24ee, 0x3484be47), TOBN(0x2ff33e96, 0x4a0c902f),
-     TOBN(0x00bdf457, 0x5a0bc453), TOBN(0x2378dfaf, 0x1aa238db),
-     TOBN(0x272420ec, 0x856720f2), TOBN(0x2ad9d95b, 0x96797291),
-     TOBN(0xd1242cc6, 0x768a1558), TOBN(0x2e287f8b, 0x5cc86aa8),
-     TOBN(0x796873d0, 0x990cecaa), TOBN(0xade55f81, 0x675d4080),
-     TOBN(0x2645eea3, 0x21f0cd84), TOBN(0x7a1efa0f, 0xb4e17d02),
-     TOBN(0xf6858420, 0x037cc061), TOBN(0x682e05f0, 0xd5d43e12),
-     TOBN(0x59c36994, 0x27218710), TOBN(0x85cbba4d, 0x3f7cd2fc),
-     TOBN(0x726f9729, 0x7a3cd22a), TOBN(0x9f8cd5dc, 0x4a628397),
-     TOBN(0x17b93ab9, 0xc23165ed), TOBN(0xff5f5dbf, 0x122823d4),
-     TOBN(0xc1e4e4b5, 0x654a446d), TOBN(0xd1a9496f, 0x677257ba),
-     TOBN(0x6387ba94, 0xde766a56), TOBN(0x23608bc8, 0x521ec74a),
-     TOBN(0x16a522d7, 0x6688c4d4), TOBN(0x9d6b4282, 0x07373abd),
-     TOBN(0xa62f07ac, 0xb42efaa3), TOBN(0xf73e00f7, 0xe3b90180),
-     TOBN(0x36175fec, 0x49421c3e), TOBN(0xc4e44f9b, 0x3dcf2678),
-     TOBN(0x76df436b, 0x7220f09f), TOBN(0x172755fb, 0x3aa8b6cf),
-     TOBN(0xbab89d57, 0x446139cc), TOBN(0x0a0a6e02, 0x5fe0208f),
-     TOBN(0xcdbb63e2, 0x11e5d399), TOBN(0x33ecaa12, 0xa8977f0b),
-     TOBN(0x59598b21, 0xf7c42664), TOBN(0xb3e91b32, 0xab65d08a),
-     TOBN(0x035822ee, 0xf4502526), TOBN(0x1dcf0176, 0x720a82a9),
-     TOBN(0x50f8598f, 0x3d589e02), TOBN(0xdf0478ff, 0xb1d63d2c),
-     TOBN(0x8b8068bd, 0x1571cd07), TOBN(0x30c3aa4f, 0xd79670cd),
-     TOBN(0x25e8fd4b, 0x941ade7f), TOBN(0x3d1debdc, 0x32790011),
-     TOBN(0x65b6dcbd, 0x3a3f9ff0), TOBN(0x282736a4, 0x793de69c),
-     TOBN(0xef69a0c3, 0xd41d3bd3), TOBN(0xb533b8c9, 0x07a26bde),
-     TOBN(0xe2801d97, 0xdb2edf9f), TOBN(0xdc4a8269, 0xe1877af0),
-     TOBN(0x6c1c5851, 0x3d590dbe), TOBN(0x84632f6b, 0xee4e9357),
-     TOBN(0xd36d36b7, 0x79b33374), TOBN(0xb46833e3, 0x9bbca2e6),
-     TOBN(0x37893913, 0xf7fc0586), TOBN(0x385315f7, 0x66bf4719),
-     TOBN(0x72c56293, 0xb31855dc), TOBN(0xd1416d4e, 0x849061fe),
-     TOBN(0xbeb3ab78, 0x51047213), TOBN(0x447f6e61, 0xf040c996),
-     TOBN(0xd06d310d, 0x638b1d0c), TOBN(0xe28a413f, 0xbad1522e),
-     TOBN(0x685a76cb, 0x82003f86), TOBN(0x610d07f7, 0x0bcdbca3),
-     TOBN(0x6ff66021, 0x9ca4c455), TOBN(0x7df39b87, 0xcea10eec),
-     TOBN(0xb9255f96, 0xe22db218), TOBN(0x8cc6d9eb, 0x08a34c44),
-     TOBN(0xcd4ffb86, 0x859f9276), TOBN(0x8fa15eb2, 0x50d07335),
-     TOBN(0xdf553845, 0xcf2c24b5), TOBN(0x89f66a9f, 0x52f9c3ba),
-     TOBN(0x8f22b5b9, 0xe4a7ceb3), TOBN(0xaffef809, 0x0e134686),
-     TOBN(0x3e53e1c6, 0x8eb8fac2), TOBN(0x93c1e4eb, 0x28aec98e),
-     TOBN(0xb6b91ec5, 0x32a43bcb), TOBN(0x2dbfa947, 0xb2d74a51),
-     TOBN(0xe065d190, 0xca84bad7), TOBN(0xfb13919f, 0xad58e65c),
-     TOBN(0x3c41718b, 0xf1cb6e31), TOBN(0x688969f0, 0x06d05c3f),
-     TOBN(0xd4f94ce7, 0x21264d45), TOBN(0xfdfb65e9, 0x7367532b),
-     TOBN(0x5b1be8b1, 0x0945a39d), TOBN(0x229f789c, 0x2b8baf3b),
-     TOBN(0xd8f41f3e, 0x6f49f15d), TOBN(0x678ce828, 0x907f0792),
-     TOBN(0xc69ace82, 0xfca6e867), TOBN(0x106451ae, 0xd01dcc89),
-     TOBN(0x1bb4f7f0, 0x19fc32d2), TOBN(0x64633dfc, 0xb00c52d2),
-     TOBN(0x8f13549a, 0xad9ea445), TOBN(0x99a3bf50, 0xfb323705),
-     TOBN(0x0c9625a2, 0x534d4dbc), TOBN(0x45b8f1d1, 0xc2a2fea3),
-     TOBN(0x76ec21a1, 0xa530fc1a), TOBN(0x4bac9c2a, 0x9e5bd734),
-     TOBN(0x5996d76a, 0x7b4e3587), TOBN(0x0045cdee, 0x1182d9e3),
-     TOBN(0x1aee24b9, 0x1207f13d), TOBN(0x66452e97, 0x97345a41),
-     TOBN(0x16e5b054, 0x9f950cd0), TOBN(0x9cc72fb1, 0xd7fdd075),
-     TOBN(0x6edd61e7, 0x66249663), TOBN(0xde4caa4d, 0xf043cccb),
-     TOBN(0x11b1f57a, 0x55c7ac17), TOBN(0x779cbd44, 0x1a85e24d),
-     TOBN(0x78030f86, 0xe46081e7), TOBN(0xfd4a6032, 0x8e20f643),
-     TOBN(0xcc7a6488, 0x0a750c0f), TOBN(0x39bacfe3, 0x4e548e83),
-     TOBN(0x3d418c76, 0x0c110f05), TOBN(0x3e4daa4c, 0xb1f11588),
-     TOBN(0x2733e7b5, 0x5ffc69ff), TOBN(0x46f147bc, 0x92053127),
-     TOBN(0x885b2434, 0xd722df94), TOBN(0x6a444f65, 0xe6fc6b7c)}
-    ,
-    {TOBN(0x7a1a465a, 0xc3f16ea8), TOBN(0x115a461d, 0xb2f1d11c),
-     TOBN(0x4767dd95, 0x6c68a172), TOBN(0x3392f2eb, 0xd13a4698),
-     TOBN(0xc7a99ccd, 0xe526cdc7), TOBN(0x8e537fdc, 0x22292b81),
-     TOBN(0x76d8cf69, 0xa6d39198), TOBN(0xffc5ff43, 0x2446852d),
-     TOBN(0x97b14f7e, 0xa90567e6), TOBN(0x513257b7, 0xb6ae5cb7),
-     TOBN(0x85454a3c, 0x9f10903d), TOBN(0xd8d2c9ad, 0x69bc3724),
-     TOBN(0x38da9324, 0x6b29cb44), TOBN(0xb540a21d, 0x77c8cbac),
-     TOBN(0x9bbfe435, 0x01918e42), TOBN(0xfffa707a, 0x56c3614e),
-     TOBN(0x0ce4e3f1, 0xd4e353b7), TOBN(0x062d8a14, 0xef46b0a0),
-     TOBN(0x6408d5ab, 0x574b73fd), TOBN(0xbc41d1c9, 0xd3273ffd),
-     TOBN(0x3538e1e7, 0x6be77800), TOBN(0x71fe8b37, 0xc5655031),
-     TOBN(0x1cd91621, 0x6b9b331a), TOBN(0xad825d0b, 0xbb388f73),
-     TOBN(0x56c2e05b, 0x1cb76219), TOBN(0x0ec0bf91, 0x71567e7e),
-     TOBN(0xe7076f86, 0x61c4c910), TOBN(0xd67b085b, 0xbabc04d9),
-     TOBN(0x9fb90459, 0x5e93a96a), TOBN(0x7526c1ea, 0xfbdc249a),
-     TOBN(0x0d44d367, 0xecdd0bb7), TOBN(0x95399917, 0x9dc0d695),
-     TOBN(0x61360ee9, 0x9e240d18), TOBN(0x057cdcac, 0xb4b94466),
-     TOBN(0xe7667cd1, 0x2fe5325c), TOBN(0x1fa297b5, 0x21974e3b),
-     TOBN(0xfa4081e7, 0xdb083d76), TOBN(0x31993be6, 0xf206bd15),
-     TOBN(0x8949269b, 0x14c19f8c), TOBN(0x21468d72, 0xa9d92357),
-     TOBN(0x2ccbc583, 0xa4c506ec), TOBN(0x957ed188, 0xd1acfe97),
-     TOBN(0x8baed833, 0x12f1aea2), TOBN(0xef2a6cb4, 0x8325362d),
-     TOBN(0x130dde42, 0x8e195c43), TOBN(0xc842025a, 0x0e6050c6),
-     TOBN(0x2da972a7, 0x08686a5d), TOBN(0xb52999a1, 0xe508b4a8),
-     TOBN(0xd9f090b9, 0x10a5a8bd), TOBN(0xca91d249, 0x096864da),
-     TOBN(0x8e6a93be, 0x3f67dbc1), TOBN(0xacae6fba, 0xf5f4764c),
-     TOBN(0x1563c6e0, 0xd21411a0), TOBN(0x28fa787f, 0xda0a4ad8),
-     TOBN(0xd524491c, 0x908c8030), TOBN(0x1257ba0e, 0x4c795f07),
-     TOBN(0x83f49167, 0xceca9754), TOBN(0x426d2cf6, 0x4b7939a0),
-     TOBN(0x2555e355, 0x723fd0bf), TOBN(0xa96e6d06, 0xc4f144e2),
-     TOBN(0x4768a8dd, 0x87880e61), TOBN(0x15543815, 0xe508e4d5),
-     TOBN(0x09d7e772, 0xb1b65e15), TOBN(0x63439dd6, 0xac302fa0),
-     TOBN(0xb93f802f, 0xc14e35c2), TOBN(0x71735b7c, 0x4341333c),
-     TOBN(0x03a25104, 0x16d4f362), TOBN(0x3f4d069b, 0xbf433c8e),
-     TOBN(0x0d83ae01, 0xf78f5a7c), TOBN(0x50a8ffbe, 0x7c4eed07),
-     TOBN(0xc74f8906, 0x76e10f83), TOBN(0x7d080966, 0x9ddaf8e1),
-     TOBN(0xb11df8e1, 0x698e04cc), TOBN(0x877be203, 0x169005c8),
-     TOBN(0x32749e8c, 0x4f3c6179), TOBN(0x2dbc9d0a, 0x7853fc05),
-     TOBN(0x187d4f93, 0x9454d937), TOBN(0xe682ce9d, 0xb4800e1b),
-     TOBN(0xa9129ad8, 0x165e68e8), TOBN(0x0fe29735, 0xbe7f785b),
-     TOBN(0x5303f40c, 0x5b9e02b7), TOBN(0xa37c9692, 0x35ee04e8),
-     TOBN(0x5f46cc20, 0x34d6632b), TOBN(0x55ef72b2, 0x96ac545b),
-     TOBN(0xabec5c1f, 0x7b91b062), TOBN(0x0a79e1c7, 0xbb33e821),
-     TOBN(0xbb04b428, 0x3a9f4117), TOBN(0x0de1f28f, 0xfd2a475a),
-     TOBN(0x31019ccf, 0x3a4434b4), TOBN(0xa3458111, 0x1a7954dc),
-     TOBN(0xa9dac80d, 0xe34972a7), TOBN(0xb043d054, 0x74f6b8dd),
-     TOBN(0x021c319e, 0x11137b1a), TOBN(0x00a754ce, 0xed5cc03f),
-     TOBN(0x0aa2c794, 0xcbea5ad4), TOBN(0x093e67f4, 0x70c015b6),
-     TOBN(0x72cdfee9, 0xc97e3f6b), TOBN(0xc10bcab4, 0xb6da7461),
-     TOBN(0x3b02d2fc, 0xb59806b9), TOBN(0x85185e89, 0xa1de6f47),
-     TOBN(0x39e6931f, 0x0eb6c4d4), TOBN(0x4d4440bd, 0xd4fa5b04),
-     TOBN(0x5418786e, 0x34be7eb8), TOBN(0x6380e521, 0x9d7259bc),
-     TOBN(0x20ac0351, 0xd598d710), TOBN(0x272c4166, 0xcb3a4da4),
-     TOBN(0xdb82fe1a, 0xca71de1f), TOBN(0x746e79f2, 0xd8f54b0f),
-     TOBN(0x6e7fc736, 0x4b573e9b), TOBN(0x75d03f46, 0xfd4b5040),
-     TOBN(0x5c1cc36d, 0x0b98d87b), TOBN(0x513ba3f1, 0x1f472da1),
-     TOBN(0x79d0af26, 0xabb177dd), TOBN(0xf82ab568, 0x7891d564),
-     TOBN(0x2b6768a9, 0x72232173), TOBN(0xefbb3bb0, 0x8c1f6619),
-     TOBN(0xb29c11db, 0xa6d18358), TOBN(0x519e2797, 0xb0916d3a),
-     TOBN(0xd4dc18f0, 0x9188e290), TOBN(0x648e86e3, 0x98b0ca7f),
-     TOBN(0x859d3145, 0x983c38b5), TOBN(0xb14f176c, 0x637abc8b),
-     TOBN(0x2793fb9d, 0xcaff7be6), TOBN(0xebe5a55f, 0x35a66a5a),
-     TOBN(0x7cec1dcd, 0x9f87dc59), TOBN(0x7c595cd3, 0xfbdbf560),
-     TOBN(0x5b543b22, 0x26eb3257), TOBN(0x69080646, 0xc4c935fd),
-     TOBN(0x7f2e4403, 0x81e9ede3), TOBN(0x243c3894, 0xcaf6df0a),
-     TOBN(0x7c605bb1, 0x1c073b11), TOBN(0xcd06a541, 0xba6a4a62),
-     TOBN(0x29168949, 0x49d4e2e5), TOBN(0x33649d07, 0x4af66880),
-     TOBN(0xbfc0c885, 0xe9a85035), TOBN(0xb4e52113, 0xfc410f4b),
-     TOBN(0xdca3b706, 0x78a6513b), TOBN(0x92ea4a2a, 0x9edb1943),
-     TOBN(0x02642216, 0xdb6e2dd8), TOBN(0x9b45d0b4, 0x9fd57894),
-     TOBN(0x114e70db, 0xc69d11ae), TOBN(0x1477dd19, 0x4c57595f),
-     TOBN(0xbc2208b4, 0xec77c272), TOBN(0x95c5b4d7, 0xdb68f59c),
-     TOBN(0xb8c4fc63, 0x42e532b7), TOBN(0x386ba422, 0x9ae35290),
-     TOBN(0xfb5dda42, 0xd201ecbc), TOBN(0x2353dc8b, 0xa0e38fd6),
-     TOBN(0x9a0b85ea, 0x68f7e978), TOBN(0x96ec5682, 0x2ad6d11f),
-     TOBN(0x5e279d6c, 0xe5f6886d), TOBN(0xd3fe03cd, 0x3cb1914d),
-     TOBN(0xfe541fa4, 0x7ea67c77), TOBN(0x952bd2af, 0xe3ea810c),
-     TOBN(0x791fef56, 0x8d01d374), TOBN(0xa3a1c621, 0x0f11336e),
-     TOBN(0x5ad0d5a9, 0xc7ec6d79), TOBN(0xff7038af, 0x3225c342),
-     TOBN(0x003c6689, 0xbc69601b), TOBN(0x25059bc7, 0x45e8747d),
-     TOBN(0xfa4965b2, 0xf2086fbf), TOBN(0xf6840ea6, 0x86916078),
-     TOBN(0xd7ac7620, 0x70081d6c), TOBN(0xe600da31, 0xb5328645),
-     TOBN(0x01916f63, 0x529b8a80), TOBN(0xe80e4858, 0x2d7d6f3e),
-     TOBN(0x29eb0fe8, 0xd664ca7c), TOBN(0xf017637b, 0xe7b43b0c),
-     TOBN(0x9a75c806, 0x76cb2566), TOBN(0x8f76acb1, 0xb24892d9),
-     TOBN(0x7ae7b9cc, 0x1f08fe45), TOBN(0x19ef7329, 0x6a4907d8),
-     TOBN(0x2db4ab71, 0x5f228bf0), TOBN(0xf3cdea39, 0x817032d7),
-     TOBN(0x0b1f482e, 0xdcabe3c0), TOBN(0x3baf76b4, 0xbb86325c),
-     TOBN(0xd49065e0, 0x10089465), TOBN(0x3bab5d29, 0x8e77c596),
-     TOBN(0x7636c3a6, 0x193dbd95), TOBN(0xdef5d294, 0xb246e499),
-     TOBN(0xb22c58b9, 0x286b2475), TOBN(0xa0b93939, 0xcd80862b),
-     TOBN(0x3002c83a, 0xf0992388), TOBN(0x6de01f9b, 0xeacbe14c),
-     TOBN(0x6aac688e, 0xadd70482), TOBN(0x708de92a, 0x7b4a4e8a),
-     TOBN(0x75b6dd73, 0x758a6eef), TOBN(0xea4bf352, 0x725b3c43),
-     TOBN(0x10041f2c, 0x87912868), TOBN(0xb1b1be95, 0xef09297a),
-     TOBN(0x19ae23c5, 0xa9f3860a), TOBN(0xc4f0f839, 0x515dcf4b),
-     TOBN(0x3c7ecca3, 0x97f6306a), TOBN(0x744c44ae, 0x68a3a4b0),
-     TOBN(0x69cd13a0, 0xb3a1d8a2), TOBN(0x7cad0a1e, 0x5256b578),
-     TOBN(0xea653fcd, 0x33791d9e), TOBN(0x9cc2a05d, 0x74b2e05f),
-     TOBN(0x73b391dc, 0xfd7affa2), TOBN(0xddb7091e, 0xb6b05442),
-     TOBN(0xc71e27bf, 0x8538a5c6), TOBN(0x195c63dd, 0x89abff17),
-     TOBN(0xfd315285, 0x1b71e3da), TOBN(0x9cbdfda7, 0xfa680fa0),
-     TOBN(0x9db876ca, 0x849d7eab), TOBN(0xebe2764b, 0x3c273271),
-     TOBN(0x663357e3, 0xf208dcea), TOBN(0x8c5bd833, 0x565b1b70),
-     TOBN(0xccc3b4f5, 0x9837fc0d), TOBN(0x9b641ba8, 0xa79cf00f),
-     TOBN(0x7428243d, 0xdfdf3990), TOBN(0x83a594c4, 0x020786b1),
-     TOBN(0xb712451a, 0x526c4502), TOBN(0x9d39438e, 0x6adb3f93),
-     TOBN(0xfdb261e3, 0xe9ff0ccd), TOBN(0x80344e3c, 0xe07af4c3),
-     TOBN(0x75900d7c, 0x2fa4f126), TOBN(0x08a3b865, 0x5c99a232),
-     TOBN(0x2478b6bf, 0xdb25e0c3), TOBN(0x482cc2c2, 0x71db2edf),
-     TOBN(0x37df7e64, 0x5f321bb8), TOBN(0x8a93821b, 0x9a8005b4),
-     TOBN(0x3fa2f10c, 0xcc8c1958), TOBN(0x0d332218, 0x2c269d0a),
-     TOBN(0x20ab8119, 0xe246b0e6), TOBN(0xb39781e4, 0xd349fd17),
-     TOBN(0xd293231e, 0xb31aa100), TOBN(0x4b779c97, 0xbb032168),
-     TOBN(0x4b3f19e1, 0xc8470500), TOBN(0x45b7efe9, 0x0c4c869d),
-     TOBN(0xdb84f38a, 0xa1a6bbcc), TOBN(0x3b59cb15, 0xb2fddbc1),
-     TOBN(0xba5514df, 0x3fd165e8), TOBN(0x499fd6a9, 0x061f8811),
-     TOBN(0x72cd1fe0, 0xbfef9f00), TOBN(0x120a4bb9, 0x79ad7e8a),
-     TOBN(0xf2ffd095, 0x5f4a5ac5), TOBN(0xcfd174f1, 0x95a7a2f0),
-     TOBN(0xd42301ba, 0x9d17baf1), TOBN(0xd2fa487a, 0x77f22089),
-     TOBN(0x9cb09efe, 0xb1dc77e1), TOBN(0xe9566939, 0x21c99682),
-     TOBN(0x8c546901, 0x6c6067bb), TOBN(0xfd378574, 0x61c24456),
-     TOBN(0x2b6a6cbe, 0x81796b33), TOBN(0x62d550f6, 0x58e87f8b),
-     TOBN(0x1b763e1c, 0x7f1b01b4), TOBN(0x4b93cfea, 0x1b1b5e12),
-     TOBN(0xb9345238, 0x1d531696), TOBN(0x57201c00, 0x88cdde69),
-     TOBN(0xdde92251, 0x9a86afc7), TOBN(0xe3043895, 0xbd35cea8),
-     TOBN(0x7608c1e1, 0x8555970d), TOBN(0x8267dfa9, 0x2535935e),
-     TOBN(0xd4c60a57, 0x322ea38b), TOBN(0xe0bf7977, 0x804ef8b5),
-     TOBN(0x1a0dab28, 0xc06fece4), TOBN(0xd405991e, 0x94e7b49d),
-     TOBN(0xc542b6d2, 0x706dab28), TOBN(0xcb228da3, 0xa91618fb),
-     TOBN(0x224e4164, 0x107d1cea), TOBN(0xeb9fdab3, 0xd0f5d8f1),
-     TOBN(0xc02ba386, 0x0d6e41cd), TOBN(0x676a72c5, 0x9b1f7146),
-     TOBN(0xffd6dd98, 0x4d6cb00b), TOBN(0xcef9c5ca, 0xde2e8d7c),
-     TOBN(0xa1bbf5d7, 0x641c7936), TOBN(0x1b95b230, 0xee8f772e),
-     TOBN(0xf765a92e, 0xe8ac25b1), TOBN(0xceb04cfc, 0x3a18b7c6),
-     TOBN(0x27944cef, 0x0acc8966), TOBN(0xcbb3c957, 0x434c1004),
-     TOBN(0x9c9971a1, 0xa43ff93c), TOBN(0x5bc2db17, 0xa1e358a9),
-     TOBN(0x45b4862e, 0xa8d9bc82), TOBN(0x70ebfbfb, 0x2201e052),
-     TOBN(0xafdf64c7, 0x92871591), TOBN(0xea5bcae6, 0xb42d0219),
-     TOBN(0xde536c55, 0x2ad8f03c), TOBN(0xcd6c3f4d, 0xa76aa33c),
-     TOBN(0xbeb5f623, 0x0bca6de3), TOBN(0xdd20dd99, 0xb1e706fd),
-     TOBN(0x90b3ff9d, 0xac9059d4), TOBN(0x2d7b2902, 0x7ccccc4e),
-     TOBN(0x8a090a59, 0xce98840f), TOBN(0xa5d947e0, 0x8410680a),
-     TOBN(0x49ae346a, 0x923379a5), TOBN(0x7dbc84f9, 0xb28a3156),
-     TOBN(0xfd40d916, 0x54a1aff2), TOBN(0xabf318ba, 0x3a78fb9b),
-     TOBN(0x50152ed8, 0x3029f95e), TOBN(0x9fc1dd77, 0xc58ad7fa),
-     TOBN(0x5fa57915, 0x13595c17), TOBN(0xb9504668, 0x8f62b3a9),
-     TOBN(0x907b5b24, 0xff3055b0), TOBN(0x2e995e35, 0x9a84f125),
-     TOBN(0x87dacf69, 0x7e9bbcfb), TOBN(0x95d0c1d6, 0xe86d96e3),
-     TOBN(0x65726e3c, 0x2d95a75c), TOBN(0x2c3c9001, 0xacd27f21),
-     TOBN(0x1deab561, 0x6c973f57), TOBN(0x108b7e2c, 0xa5221643),
-     TOBN(0x5fee9859, 0xc4ef79d4), TOBN(0xbd62b88a, 0x40d4b8c6),
-     TOBN(0xb4dd29c4, 0x197c75d6), TOBN(0x266a6df2, 0xb7076feb),
-     TOBN(0x9512d0ea, 0x4bf2df11), TOBN(0x1320c24f, 0x6b0cc9ec),
-     TOBN(0x6bb1e0e1, 0x01a59596), TOBN(0x8317c5bb, 0xeff9aaac),
-     TOBN(0x65bb405e, 0x385aa6c9), TOBN(0x613439c1, 0x8f07988f),
-     TOBN(0xd730049f, 0x16a66e91), TOBN(0xe97f2820, 0xfa1b0e0d),
-     TOBN(0x4131e003, 0x304c28ea), TOBN(0x820ab732, 0x526bac62),
-     TOBN(0xb2ac9ef9, 0x28714423), TOBN(0x54ecfffa, 0xadb10cb2),
-     TOBN(0x8781476e, 0xf886a4cc), TOBN(0x4b2c87b5, 0xdb2f8d49),
-     TOBN(0xe857cd20, 0x0a44295d), TOBN(0x707d7d21, 0x58c6b044),
-     TOBN(0xae8521f9, 0xf596757c), TOBN(0x87448f03, 0x67b2b714),
-     TOBN(0x13a9bc45, 0x5ebcd58d), TOBN(0x79bcced9, 0x9122d3c1),
-     TOBN(0x3c644247, 0x9e076642), TOBN(0x0cf22778, 0x2df4767d),
-     TOBN(0x5e61aee4, 0x71d444b6), TOBN(0x211236bf, 0xc5084a1d),
-     TOBN(0x7e15bc9a, 0x4fd3eaf6), TOBN(0x68df2c34, 0xab622bf5),
-     TOBN(0x9e674f0f, 0x59bf4f36), TOBN(0xf883669b, 0xd7f34d73),
-     TOBN(0xc48ac1b8, 0x31497b1d), TOBN(0x323b925d, 0x5106703b),
-     TOBN(0x22156f42, 0x74082008), TOBN(0xeffc521a, 0xc8482bcb),
-     TOBN(0x5c6831bf, 0x12173479), TOBN(0xcaa2528f, 0xc4739490),
-     TOBN(0x84d2102a, 0x8f1b3c4d), TOBN(0xcf64dfc1, 0x2d9bec0d),
-     TOBN(0x433febad, 0x78a546ef), TOBN(0x1f621ec3, 0x7b73cef1),
-     TOBN(0x6aecd627, 0x37338615), TOBN(0x162082ab, 0x01d8edf6),
-     TOBN(0x833a8119, 0x19e86b66), TOBN(0x6023a251, 0xd299b5db),
-     TOBN(0xf5bb0c3a, 0xbbf04b89), TOBN(0x6735eb69, 0xae749a44),
-     TOBN(0xd0e058c5, 0x4713de3b), TOBN(0xfdf2593e, 0x2c3d4ccd),
-     TOBN(0x1b8f414e, 0xfdd23667), TOBN(0xdd52aaca, 0xfa2015ee),
-     TOBN(0x3e31b517, 0xbd9625ff), TOBN(0x5ec9322d, 0x8db5918c),
-     TOBN(0xbc73ac85, 0xa96f5294), TOBN(0x82aa5bf3, 0x61a0666a),
-     TOBN(0x49755810, 0xbf08ac42), TOBN(0xd21cdfd5, 0x891cedfc),
-     TOBN(0x918cb57b, 0x67f8be10), TOBN(0x365d1a7c, 0x56ffa726),
-     TOBN(0x2435c504, 0x6532de93), TOBN(0xc0fc5e10, 0x2674cd02),
-     TOBN(0x6e51fcf8, 0x9cbbb142), TOBN(0x1d436e5a, 0xafc50692),
-     TOBN(0x766bffff, 0x3fbcae22), TOBN(0x3148c2fd, 0xfd55d3b8),
-     TOBN(0x52c7fdc9, 0x233222fa), TOBN(0x89ff1092, 0xe419fb6b),
-     TOBN(0x3cd6db99, 0x25254977), TOBN(0x2e85a161, 0x1cf12ca7),
-     TOBN(0xadd2547c, 0xdc810bc9), TOBN(0xea3f458f, 0x9d257c22),
-     TOBN(0x642c1fbe, 0x27d6b19b), TOBN(0xed07e6b5, 0x140481a6),
-     TOBN(0x6ada1d42, 0x86d2e0f8), TOBN(0xe5920122, 0x0e8a9fd5),
-     TOBN(0x02c936af, 0x708c1b49), TOBN(0x60f30fee, 0x2b4bfaff),
-     TOBN(0x6637ad06, 0x858e6a61), TOBN(0xce4c7767, 0x3fd374d0),
-     TOBN(0x39d54b2d, 0x7188defb), TOBN(0xa8c9d250, 0xf56a6b66),
-     TOBN(0x58fc0f5e, 0xb24fe1dc), TOBN(0x9eaf9dee, 0x6b73f24c),
-     TOBN(0xa90d588b, 0x33650705), TOBN(0xde5b62c5, 0xaf2ec729),
-     TOBN(0x5c72cfae, 0xd3c2b36e), TOBN(0x868c19d5, 0x034435da),
-     TOBN(0x88605f93, 0xe17ee145), TOBN(0xaa60c4ee, 0x77a5d5b1),
-     TOBN(0xbcf5bfd2, 0x3b60c472), TOBN(0xaf4ef13c, 0xeb1d3049),
-     TOBN(0x373f44fc, 0xe13895c9), TOBN(0xf29b382f, 0x0cbc9822),
-     TOBN(0x1bfcb853, 0x73efaef6), TOBN(0xcf56ac9c, 0xa8c96f40),
-     TOBN(0xd7adf109, 0x7a191e24), TOBN(0x98035f44, 0xbf8a8dc2),
-     TOBN(0xf40a71b9, 0x1e750c84), TOBN(0xc57f7b0c, 0x5dc6c469),
-     TOBN(0x49a0e79c, 0x6fbc19c1), TOBN(0x6b0f5889, 0xa48ebdb8),
-     TOBN(0x5d3fd084, 0xa07c4e9f), TOBN(0xc3830111, 0xab27de14),
-     TOBN(0x0e4929fe, 0x33e08dcc), TOBN(0xf4a5ad24, 0x40bb73a3),
-     TOBN(0xde86c2bf, 0x490f97ca), TOBN(0x288f09c6, 0x67a1ce18),
-     TOBN(0x364bb886, 0x1844478d), TOBN(0x7840fa42, 0xceedb040),
-     TOBN(0x1269fdd2, 0x5a631b37), TOBN(0x94761f1e, 0xa47c8b7d),
-     TOBN(0xfc0c2e17, 0x481c6266), TOBN(0x85e16ea2, 0x3daa5fa7),
-     TOBN(0xccd86033, 0x92491048), TOBN(0x0c2f6963, 0xf4d402d7),
-     TOBN(0x6336f7df, 0xdf6a865c), TOBN(0x0a2a463c, 0xb5c02a87),
-     TOBN(0xb0e29be7, 0xbf2f12ee), TOBN(0xf0a22002, 0x66bad988),
-     TOBN(0x27f87e03, 0x9123c1d7), TOBN(0x21669c55, 0x328a8c98),
-     TOBN(0x186b9803, 0x92f14529), TOBN(0xd3d056cc, 0x63954df3),
-     TOBN(0x2f03fd58, 0x175a46f6), TOBN(0x63e34ebe, 0x11558558),
-     TOBN(0xe13fedee, 0x5b80cfa5), TOBN(0xe872a120, 0xd401dbd1),
-     TOBN(0x52657616, 0xe8a9d667), TOBN(0xbc8da4b6, 0xe08d6693),
-     TOBN(0x370fb9bb, 0x1b703e75), TOBN(0x6773b186, 0xd4338363),
-     TOBN(0x18dad378, 0xecef7bff), TOBN(0xaac787ed, 0x995677da),
-     TOBN(0x4801ea8b, 0x0437164b), TOBN(0xf430ad20, 0x73fe795e),
-     TOBN(0xb164154d, 0x8ee5eb73), TOBN(0x0884ecd8, 0x108f7c0e),
-     TOBN(0x0e6ec096, 0x5f520698), TOBN(0x640631fe, 0x44f7b8d9),
-     TOBN(0x92fd34fc, 0xa35a68b9), TOBN(0x9c5a4b66, 0x4d40cf4e),
-     TOBN(0x949454bf, 0x80b6783d), TOBN(0x80e701fe, 0x3a320a10),
-     TOBN(0x8d1a564a, 0x1a0a39b2), TOBN(0x1436d53d, 0x320587db),
-     TOBN(0xf5096e6d, 0x6556c362), TOBN(0xbc23a3c0, 0xe2455d7e),
-     TOBN(0x3a7aee54, 0x807230f9), TOBN(0x9ba1cfa6, 0x22ae82fd),
-     TOBN(0x833a057a, 0x99c5d706), TOBN(0x8be85f4b, 0x842315c9),
-     TOBN(0xd083179a, 0x66a72f12), TOBN(0x2fc77d5d, 0xcdcc73cd),
-     TOBN(0x22b88a80, 0x5616ee30), TOBN(0xfb09548f, 0xe7ab1083),
-     TOBN(0x8ad6ab0d, 0x511270cd), TOBN(0x61f6c57a, 0x6924d9ab),
-     TOBN(0xa0f7bf72, 0x90aecb08), TOBN(0x849f87c9, 0x0df784a4),
-     TOBN(0x27c79c15, 0xcfaf1d03), TOBN(0xbbf9f675, 0xc463face),
-     TOBN(0x91502c65, 0x765ba543), TOBN(0x18ce3cac, 0x42ea60dd),
-     TOBN(0xe5cee6ac, 0x6e43ecb3), TOBN(0x63e4e910, 0x68f2aeeb),
-     TOBN(0x26234fa3, 0xc85932ee), TOBN(0x96883e8b, 0x4c90c44d),
-     TOBN(0x29b9e738, 0xa18a50f6), TOBN(0xbfc62b2a, 0x3f0420df),
-     TOBN(0xd22a7d90, 0x6d3e1fa9), TOBN(0x17115618, 0xfe05b8a3),
-     TOBN(0x2a0c9926, 0xbb2b9c01), TOBN(0xc739fcc6, 0xe07e76a2),
-     TOBN(0x540e9157, 0x165e439a), TOBN(0x06353a62, 0x6a9063d8),
-     TOBN(0x84d95594, 0x61e927a3), TOBN(0x013b9b26, 0xe2e0be7f),
-     TOBN(0x4feaec3b, 0x973497f1), TOBN(0x15c0f94e, 0x093ebc2d),
-     TOBN(0x6af5f227, 0x33af0583), TOBN(0x0c2af206, 0xc61f3340),
-     TOBN(0xd25dbdf1, 0x4457397c), TOBN(0x2e8ed017, 0xcabcbae0),
-     TOBN(0xe3010938, 0xc2815306), TOBN(0xbaa99337, 0xe8c6cd68),
-     TOBN(0x08513182, 0x3b0ec7de), TOBN(0x1e1b822b, 0x58df05df),
-     TOBN(0x5c14842f, 0xa5c3b683), TOBN(0x98fe977e, 0x3eba34ce),
-     TOBN(0xfd2316c2, 0x0d5e8873), TOBN(0xe48d839a, 0xbd0d427d),
-     TOBN(0x495b2218, 0x623fc961), TOBN(0x24ee56e7, 0xb46fba5e),
-     TOBN(0x9184a55b, 0x91e4de58), TOBN(0xa7488ca5, 0xdfdea288),
-     TOBN(0xa723862e, 0xa8dcc943), TOBN(0x92d762b2, 0x849dc0fc),
-     TOBN(0x3c444a12, 0x091ff4a9), TOBN(0x581113fa, 0x0cada274),
-     TOBN(0xb9de0a45, 0x30d8eae2), TOBN(0x5e0fcd85, 0xdf6b41ea),
-     TOBN(0x6233ea68, 0xc094dbb5), TOBN(0xb77d062e, 0xd968d410),
-     TOBN(0x3e719bbc, 0x58b3002d), TOBN(0x68e7dd3d, 0x3dc49d58),
-     TOBN(0x8d825740, 0x013a5e58), TOBN(0x21311747, 0x3c9e3c1b),
-     TOBN(0x0cb0a2a7, 0x7c99b6ab), TOBN(0x5c48a3b3, 0xc2f888f2)}
-    ,
-    {TOBN(0xc7913e91, 0x991724f3), TOBN(0x5eda799c, 0x39cbd686),
-     TOBN(0xddb595c7, 0x63d4fc1e), TOBN(0x6b63b80b, 0xac4fed54),
-     TOBN(0x6ea0fc69, 0x7e5fb516), TOBN(0x737708ba, 0xd0f1c964),
-     TOBN(0x9628745f, 0x11a92ca5), TOBN(0x61f37958, 0x9a86967a),
-     TOBN(0x9af39b2c, 0xaa665072), TOBN(0x78322fa4, 0xefd324ef),
-     TOBN(0x3d153394, 0xc327bd31), TOBN(0x81d5f271, 0x3129dab0),
-     TOBN(0xc72e0c42, 0xf48027f5), TOBN(0xaa40cdbc, 0x8536e717),
-     TOBN(0xf45a657a, 0x2d369d0f), TOBN(0xb03bbfc4, 0xea7f74e6),
-     TOBN(0x46a8c418, 0x0d738ded), TOBN(0x6f1a5bb0, 0xe0de5729),
-     TOBN(0xf10230b9, 0x8ba81675), TOBN(0x32c6f30c, 0x112b33d4),
-     TOBN(0x7559129d, 0xd8fffb62), TOBN(0x6a281b47, 0xb459bf05),
-     TOBN(0x77c1bd3a, 0xfa3b6776), TOBN(0x0709b380, 0x7829973a),
-     TOBN(0x8c26b232, 0xa3326505), TOBN(0x38d69272, 0xee1d41bf),
-     TOBN(0x0459453e, 0xffe32afa), TOBN(0xce8143ad, 0x7cb3ea87),
-     TOBN(0x932ec1fa, 0x7e6ab666), TOBN(0x6cd2d230, 0x22286264),
-     TOBN(0x459a46fe, 0x6736f8ed), TOBN(0x50bf0d00, 0x9eca85bb),
-     TOBN(0x0b825852, 0x877a21ec), TOBN(0x300414a7, 0x0f537a94),
-     TOBN(0x3f1cba40, 0x21a9a6a2), TOBN(0x50824eee, 0x76943c00),
-     TOBN(0xa0dbfcec, 0xf83cba5d), TOBN(0xf9538148, 0x93b4f3c0),
-     TOBN(0x61744162, 0x48f24dd7), TOBN(0x5322d64d, 0xe4fb09dd),
-     TOBN(0x57447384, 0x3d9325f3), TOBN(0xa9bef2d0, 0xf371cb84),
-     TOBN(0x77d2188b, 0xa61e36c5), TOBN(0xbbd6a7d7, 0xc602df72),
-     TOBN(0xba3aa902, 0x8f61bc0b), TOBN(0xf49085ed, 0x6ed0b6a1),
-     TOBN(0x8bc625d6, 0xae6e8298), TOBN(0x832b0b1d, 0xa2e9c01d),
-     TOBN(0xa337c447, 0xf1f0ced1), TOBN(0x800cc793, 0x9492dd2b),
-     TOBN(0x4b93151d, 0xbea08efa), TOBN(0x820cf3f8, 0xde0a741e),
-     TOBN(0xff1982dc, 0x1c0f7d13), TOBN(0xef921960, 0x84dde6ca),
-     TOBN(0x1ad7d972, 0x45f96ee3), TOBN(0x319c8dbe, 0x29dea0c7),
-     TOBN(0xd3ea3871, 0x7b82b99b), TOBN(0x75922d4d, 0x470eb624),
-     TOBN(0x8f66ec54, 0x3b95d466), TOBN(0x66e673cc, 0xbee1e346),
-     TOBN(0x6afe67c4, 0xb5f2b89a), TOBN(0x3de9c1e6, 0x290e5cd3),
-     TOBN(0x8c278bb6, 0x310a2ada), TOBN(0x420fa384, 0x0bdb323b),
-     TOBN(0x0ae1d63b, 0x0eb919b0), TOBN(0xd74ee51d, 0xa74b9620),
-     TOBN(0x395458d0, 0xa674290c), TOBN(0x324c930f, 0x4620a510),
-     TOBN(0x2d1f4d19, 0xfbac27d4), TOBN(0x4086e8ca, 0x9bedeeac),
-     TOBN(0x0cdd211b, 0x9b679ab8), TOBN(0x5970167d, 0x7090fec4),
-     TOBN(0x3420f2c9, 0xfaf1fc63), TOBN(0x616d333a, 0x328c8bb4),
-     TOBN(0x7d65364c, 0x57f1fe4a), TOBN(0x9343e877, 0x55e5c73a),
-     TOBN(0x5795176b, 0xe970e78c), TOBN(0xa36ccebf, 0x60533627),
-     TOBN(0xfc7c7380, 0x09cdfc1b), TOBN(0xb39a2afe, 0xb3fec326),
-     TOBN(0xb7ff1ba1, 0x6224408a), TOBN(0xcc856e92, 0x247cfc5e),
-     TOBN(0x01f102e7, 0xc18bc493), TOBN(0x4613ab74, 0x2091c727),
-     TOBN(0xaa25e89c, 0xc420bf2b), TOBN(0x00a53176, 0x90337ec2),
-     TOBN(0xd2be9f43, 0x7d025fc7), TOBN(0x3316fb85, 0x6e6fe3dc),
-     TOBN(0x27520af5, 0x9ac50814), TOBN(0xfdf95e78, 0x9a8e4223),
-     TOBN(0xb7e7df2a, 0x56bec5a0), TOBN(0xf7022f7d, 0xdf159e5d),
-     TOBN(0x93eeeab1, 0xcac1fe8f), TOBN(0x8040188c, 0x37451168),
-     TOBN(0x7ee8aa8a, 0xd967dce6), TOBN(0xfa0e79e7, 0x3abc9299),
-     TOBN(0x67332cfc, 0x2064cfd1), TOBN(0x339c31de, 0xb0651934),
-     TOBN(0x719b28d5, 0x2a3bcbea), TOBN(0xee74c82b, 0x9d6ae5c6),
-     TOBN(0x0927d05e, 0xbaf28ee6), TOBN(0x82cecf2c, 0x9d719028),
-     TOBN(0x0b0d353e, 0xddb30289), TOBN(0xfe4bb977, 0xfddb2e29),
-     TOBN(0xbb5bb990, 0x640bfd9e), TOBN(0xd226e277, 0x82f62108),
-     TOBN(0x4bf00985, 0x02ffdd56), TOBN(0x7756758a, 0x2ca1b1b5),
-     TOBN(0xc32b62a3, 0x5285fe91), TOBN(0xedbc546a, 0x8c9cd140),
-     TOBN(0x1e47a013, 0xaf5cb008), TOBN(0xbca7e720, 0x073ce8f2),
-     TOBN(0xe10b2ab8, 0x17a91cae), TOBN(0xb89aab65, 0x08e27f63),
-     TOBN(0x7b3074a7, 0xdba3ddf9), TOBN(0x1c20ce09, 0x330c2972),
-     TOBN(0x6b9917b4, 0x5fcf7e33), TOBN(0xe6793743, 0x945ceb42),
-     TOBN(0x18fc2215, 0x5c633d19), TOBN(0xad1adb3c, 0xc7485474),
-     TOBN(0x646f9679, 0x6424c49b), TOBN(0xf888dfe8, 0x67c241c9),
-     TOBN(0xe12d4b93, 0x24f68b49), TOBN(0x9a6b62d8, 0xa571df20),
-     TOBN(0x81b4b26d, 0x179483cb), TOBN(0x666f9632, 0x9511fae2),
-     TOBN(0xd281b3e4, 0xd53aa51f), TOBN(0x7f96a765, 0x7f3dbd16),
-     TOBN(0xa7f8b5bf, 0x074a30ce), TOBN(0xd7f52107, 0x005a32e6),
-     TOBN(0x6f9e0907, 0x50237ed4), TOBN(0x2f21da47, 0x8096fa2b),
-     TOBN(0xf3e19cb4, 0xeec863a0), TOBN(0xd18f77fd, 0x9527620a),
-     TOBN(0x9505c81c, 0x407c1cf8), TOBN(0x9998db4e, 0x1b6ec284),
-     TOBN(0x7e3389e5, 0xc247d44d), TOBN(0x12507141, 0x3f4f3d80),
-     TOBN(0xd4ba0110, 0x4a78a6c7), TOBN(0x312874a0, 0x767720be),
-     TOBN(0xded059a6, 0x75944370), TOBN(0xd6123d90, 0x3b2c0bdd),
-     TOBN(0xa56b717b, 0x51c108e3), TOBN(0x9bb7940e, 0x070623e9),
-     TOBN(0x794e2d59, 0x84ac066c), TOBN(0xf5954a92, 0xe68c69a0),
-     TOBN(0x28c52458, 0x4fd99dcc), TOBN(0x60e639fc, 0xb1012517),
-     TOBN(0xc2e60125, 0x7de79248), TOBN(0xe9ef6404, 0xf12fc6d7),
-     TOBN(0x4c4f2808, 0x2a3b5d32), TOBN(0x865ad32e, 0xc768eb8a),
-     TOBN(0xac02331b, 0x13fb70b6), TOBN(0x037b44c1, 0x95599b27),
-     TOBN(0x1a860fc4, 0x60bd082c), TOBN(0xa2e25745, 0xc980cd01),
-     TOBN(0xee3387a8, 0x1da0263e), TOBN(0x931bfb95, 0x2d10f3d6),
-     TOBN(0x5b687270, 0xa1f24a32), TOBN(0xf140e65d, 0xca494b86),
-     TOBN(0x4f4ddf91, 0xb2f1ac7a), TOBN(0xf99eaabb, 0x760fee27),
-     TOBN(0x57f4008a, 0x49c228e5), TOBN(0x090be440, 0x1cf713bb),
-     TOBN(0xac91fbe4, 0x5004f022), TOBN(0xd838c2c2, 0x569e1af6),
-     TOBN(0xd6c7d20b, 0x0f1daaa5), TOBN(0xaa063ac1, 0x1bbb02c0),
-     TOBN(0x0938a422, 0x59558a78), TOBN(0x5343c669, 0x8435da2f),
-     TOBN(0x96f67b18, 0x034410dc), TOBN(0x7cc1e424, 0x84510804),
-     TOBN(0x86a1543f, 0x16dfbb7d), TOBN(0x921fa942, 0x5b5bd592),
-     TOBN(0x9dcccb6e, 0xb33dd03c), TOBN(0x8581ddd9, 0xb843f51e),
-     TOBN(0x54935fcb, 0x81d73c9e), TOBN(0x6d07e979, 0x0a5e97ab),
-     TOBN(0x4dc7b30a, 0xcf3a6bab), TOBN(0x147ab1f3, 0x170bee11),
-     TOBN(0x0aaf8e3d, 0x9fafdee4), TOBN(0xfab3dbcb, 0x538a8b95),
-     TOBN(0x405df4b3, 0x6ef13871), TOBN(0xf1f4e9cb, 0x088d5a49),
-     TOBN(0x9bcd24d3, 0x66b33f1d), TOBN(0x3b97b820, 0x5ce445c0),
-     TOBN(0xe2926549, 0xba93ff61), TOBN(0xd9c341ce, 0x4dafe616),
-     TOBN(0xfb30a76e, 0x16efb6f3), TOBN(0xdf24b8ca, 0x605b953c),
-     TOBN(0x8bd52afe, 0xc2fffb9f), TOBN(0xbbac5ff7, 0xe19d0b96),
-     TOBN(0x43c01b87, 0x459afccd), TOBN(0x6bd45143, 0xb7432652),
-     TOBN(0x84734530, 0x55b5d78e), TOBN(0x81088fdb, 0x1554ba7d),
-     TOBN(0xada0a52c, 0x1e269375), TOBN(0xf9f037c4, 0x2dc5ec10),
-     TOBN(0xc0660607, 0x94bfbc11), TOBN(0xc0a630bb, 0xc9c40d2f),
-     TOBN(0x5efc797e, 0xab64c31e), TOBN(0xffdb1dab, 0x74507144),
-     TOBN(0xf6124287, 0x1ca6790c), TOBN(0xe9609d81, 0xe69bf1bf),
-     TOBN(0xdb898595, 0x00d24fc9), TOBN(0x9c750333, 0xe51fb417),
-     TOBN(0x51830a91, 0xfef7bbde), TOBN(0x0ce67dc8, 0x945f585c),
-     TOBN(0x9a730ed4, 0x4763eb50), TOBN(0x24a0e221, 0xc1ab0d66),
-     TOBN(0x643b6393, 0x648748f3), TOBN(0x1982daa1, 0x6d3c6291),
-     TOBN(0x6f00a9f7, 0x8bbc5549), TOBN(0x7a1783e1, 0x7f36384e),
-     TOBN(0xe8346323, 0xde977f50), TOBN(0x91ab688d, 0xb245502a),
-     TOBN(0x331ab6b5, 0x6d0bdd66), TOBN(0x0a6ef32e, 0x64b71229),
-     TOBN(0x1028150e, 0xfe7c352f), TOBN(0x27e04350, 0xce7b39d3),
-     TOBN(0x2a3c8acd, 0xc1070c82), TOBN(0xfb2034d3, 0x80c9feef),
-     TOBN(0x2d729621, 0x709f3729), TOBN(0x8df290bf, 0x62cb4549),
-     TOBN(0x02f99f33, 0xfc2e4326), TOBN(0x3b30076d, 0x5eddf032),
-     TOBN(0xbb21f8cf, 0x0c652fb5), TOBN(0x314fb49e, 0xed91cf7b),
-     TOBN(0xa013eca5, 0x2f700750), TOBN(0x2b9e3c23, 0x712a4575),
-     TOBN(0xe5355557, 0xaf30fbb0), TOBN(0x1ada3516, 0x7c77e771),
-     TOBN(0x45f6ecb2, 0x7b135670), TOBN(0xe85d19df, 0x7cfc202e),
-     TOBN(0x0f1b50c7, 0x58d1be9f), TOBN(0x5ebf2c0a, 0xead2e344),
-     TOBN(0x1531fe4e, 0xabc199c9), TOBN(0xc7032592, 0x56bab0ae),
-     TOBN(0x16ab2e48, 0x6c1fec54), TOBN(0x0f87fda8, 0x04280188),
-     TOBN(0xdc9f46fc, 0x609e4a74), TOBN(0x2a44a143, 0xba667f91),
-     TOBN(0xbc3d8b95, 0xb4d83436), TOBN(0xa01e4bd0, 0xc7bd2958),
-     TOBN(0x7b182932, 0x73483c90), TOBN(0xa79c6aa1, 0xa7c7b598),
-     TOBN(0xbf3983c6, 0xeaaac07e), TOBN(0x8f18181e, 0x96e0d4e6),
-     TOBN(0x8553d37c, 0x051af62b), TOBN(0xe9a998eb, 0x0bf94496),
-     TOBN(0xe0844f9f, 0xb0d59aa1), TOBN(0x983fd558, 0xe6afb813),
-     TOBN(0x9670c0ca, 0x65d69804), TOBN(0x732b22de, 0x6ea5ff2d),
-     TOBN(0xd7640ba9, 0x5fd8623b), TOBN(0x9f619163, 0xa6351782),
-     TOBN(0x0bfc27ee, 0xacee5043), TOBN(0xae419e73, 0x2eb10f02),
-     TOBN(0x19c028d1, 0x8943fb05), TOBN(0x71f01cf7, 0xff13aa2a),
-     TOBN(0x7790737e, 0x8887a132), TOBN(0x67513309, 0x66318410),
-     TOBN(0x9819e8a3, 0x7ddb795e), TOBN(0xfecb8ef5, 0xdad100b2),
-     TOBN(0x59f74a22, 0x3021926a), TOBN(0xb7c28a49, 0x6f9b4c1c),
-     TOBN(0xed1a733f, 0x912ad0ab), TOBN(0x42a910af, 0x01a5659c),
-     TOBN(0x3842c6e0, 0x7bd68cab), TOBN(0x2b57fa38, 0x76d70ac8),
-     TOBN(0x8a6707a8, 0x3c53aaeb), TOBN(0x62c1c510, 0x65b4db18),
-     TOBN(0x8de2c1fb, 0xb2d09dc7), TOBN(0xc3dfed12, 0x266bd23b),
-     TOBN(0x927d039b, 0xd5b27db6), TOBN(0x2fb2f0f1, 0x103243da),
-     TOBN(0xf855a07b, 0x80be7399), TOBN(0xed9327ce, 0x1f9f27a8),
-     TOBN(0xa0bd99c7, 0x729bdef7), TOBN(0x2b67125e, 0x28250d88),
-     TOBN(0x784b26e8, 0x8670ced7), TOBN(0xe3dfe41f, 0xc31bd3b4),
-     TOBN(0x9e353a06, 0xbcc85cbc), TOBN(0x302e2909, 0x60178a9d),
-     TOBN(0x860abf11, 0xa6eac16e), TOBN(0x76447000, 0xaa2b3aac),
-     TOBN(0x46ff9d19, 0x850afdab), TOBN(0x35bdd6a5, 0xfdb2d4c1),
-     TOBN(0xe82594b0, 0x7e5c9ce9), TOBN(0x0f379e53, 0x20af346e),
-     TOBN(0x608b31e3, 0xbc65ad4a), TOBN(0x710c6b12, 0x267c4826),
-     TOBN(0x51c966f9, 0x71954cf1), TOBN(0xb1cec793, 0x0d0aa215),
-     TOBN(0x1f155989, 0x86bd23a8), TOBN(0xae2ff99c, 0xf9452e86),
-     TOBN(0xd8dd953c, 0x340ceaa2), TOBN(0x26355275, 0x2e2e9333),
-     TOBN(0x15d4e5f9, 0x8586f06d), TOBN(0xd6bf94a8, 0xf7cab546),
-     TOBN(0x33c59a0a, 0xb76a9af0), TOBN(0x52740ab3, 0xba095af7),
-     TOBN(0xc444de8a, 0x24389ca0), TOBN(0xcc6f9863, 0x706da0cb),
-     TOBN(0xb5a741a7, 0x6b2515cf), TOBN(0x71c41601, 0x9585c749),
-     TOBN(0x78350d4f, 0xe683de97), TOBN(0x31d61524, 0x63d0b5f5),
-     TOBN(0x7a0cc5e1, 0xfbce090b), TOBN(0xaac927ed, 0xfbcb2a5b),
-     TOBN(0xe920de49, 0x20d84c35), TOBN(0x8c06a0b6, 0x22b4de26),
-     TOBN(0xd34dd58b, 0xafe7ddf3), TOBN(0x55851fed, 0xc1e6e55b),
-     TOBN(0xd1395616, 0x960696e7), TOBN(0x940304b2, 0x5f22705f),
-     TOBN(0x6f43f861, 0xb0a2a860), TOBN(0xcf121282, 0x0e7cc981),
-     TOBN(0x12186212, 0x0ab64a96), TOBN(0x09215b9a, 0xb789383c),
-     TOBN(0x311eb305, 0x37387c09), TOBN(0xc5832fce, 0xf03ee760),
-     TOBN(0x30358f58, 0x32f7ea19), TOBN(0xe01d3c34, 0x91d53551),
-     TOBN(0x1ca5ee41, 0xda48ea80), TOBN(0x34e71e8e, 0xcf4fa4c1),
-     TOBN(0x312abd25, 0x7af1e1c7), TOBN(0xe3afcdeb, 0x2153f4a5),
-     TOBN(0x9d5c84d7, 0x00235e9a), TOBN(0x0308d3f4, 0x8c4c836f),
-     TOBN(0xc0a66b04, 0x89332de5), TOBN(0x610dd399, 0x89e566ef),
-     TOBN(0xf8eea460, 0xd1ac1635), TOBN(0x84cbb3fb, 0x20a2c0df),
-     TOBN(0x40afb488, 0xe74a48c5), TOBN(0x29738198, 0xd326b150),
-     TOBN(0x2a17747f, 0xa6d74081), TOBN(0x60ea4c05, 0x55a26214),
-     TOBN(0x53514bb4, 0x1f88c5fe), TOBN(0xedd64567, 0x7e83426c),
-     TOBN(0xd5d6cbec, 0x96460b25), TOBN(0xa12fd0ce, 0x68dc115e),
-     TOBN(0xc5bc3ed2, 0x697840ea), TOBN(0x969876a8, 0xa6331e31),
-     TOBN(0x60c36217, 0x472ff580), TOBN(0xf4229705, 0x4ad41393),
-     TOBN(0x4bd99ef0, 0xa03b8b92), TOBN(0x501c7317, 0xc144f4f6),
-     TOBN(0x159009b3, 0x18464945), TOBN(0x6d5e594c, 0x74c5c6be),
-     TOBN(0x2d587011, 0x321a3660), TOBN(0xd1e184b1, 0x3898d022),
-     TOBN(0x5ba04752, 0x4c6a7e04), TOBN(0x47fa1e2b, 0x45550b65),
-     TOBN(0x9419daf0, 0x48c0a9a5), TOBN(0x66362953, 0x7c243236),
-     TOBN(0xcd0744b1, 0x5cb12a88), TOBN(0x561b6f9a, 0x2b646188),
-     TOBN(0x599415a5, 0x66c2c0c0), TOBN(0xbe3f0859, 0x0f83f09a),
-     TOBN(0x9141c5be, 0xb92041b8), TOBN(0x01ae38c7, 0x26477d0d),
-     TOBN(0xca8b71f3, 0xd12c7a94), TOBN(0xfab5b31f, 0x765c70db),
-     TOBN(0x76ae7492, 0x487443e9), TOBN(0x8595a310, 0x990d1349),
-     TOBN(0xf8dbeda8, 0x7d460a37), TOBN(0x7f7ad082, 0x1e45a38f),
-     TOBN(0xed1d4db6, 0x1059705a), TOBN(0xa3dd492a, 0xe6b9c697),
-     TOBN(0x4b92ee3a, 0x6eb38bd5), TOBN(0xbab2609d, 0x67cc0bb7),
-     TOBN(0x7fc4fe89, 0x6e70ee82), TOBN(0xeff2c56e, 0x13e6b7e3),
-     TOBN(0x9b18959e, 0x34d26fca), TOBN(0x2517ab66, 0x889d6b45),
-     TOBN(0xf167b4e0, 0xbdefdd4f), TOBN(0x69958465, 0xf366e401),
-     TOBN(0x5aa368ab, 0xa73bbec0), TOBN(0x12148709, 0x7b240c21),
-     TOBN(0x378c3233, 0x18969006), TOBN(0xcb4d73ce, 0xe1fe53d1),
-     TOBN(0x5f50a80e, 0x130c4361), TOBN(0xd67f5951, 0x7ef5212b),
-     TOBN(0xf145e21e, 0x9e70c72e), TOBN(0xb2e52e29, 0x5566d2fb),
-     TOBN(0x44eaba4a, 0x032397f5), TOBN(0x5e56937b, 0x7e31a7de),
-     TOBN(0x68dcf517, 0x456c61e1), TOBN(0xbc2e954a, 0xa8b0a388),
-     TOBN(0xe3552fa7, 0x60a8b755), TOBN(0x03442dae, 0x73ad0cde),
-     TOBN(0x37ffe747, 0xceb26210), TOBN(0x983545e8, 0x787baef9),
-     TOBN(0x8b8c8535, 0x86a3de31), TOBN(0xc621dbcb, 0xfacd46db),
-     TOBN(0x82e442e9, 0x59266fbb), TOBN(0xa3514c37, 0x339d471c),
-     TOBN(0x3a11b771, 0x62cdad96), TOBN(0xf0cb3b3c, 0xecf9bdf0),
-     TOBN(0x3fcbdbce, 0x478e2135), TOBN(0x7547b5cf, 0xbda35342),
-     TOBN(0xa97e81f1, 0x8a677af6), TOBN(0xc8c2bf83, 0x28817987),
-     TOBN(0xdf07eaaf, 0x45580985), TOBN(0xc68d1f05, 0xc93b45cb),
-     TOBN(0x106aa2fe, 0xc77b4cac), TOBN(0x4c1d8afc, 0x04a7ae86),
-     TOBN(0xdb41c3fd, 0x9eb45ab2), TOBN(0x5b234b5b, 0xd4b22e74),
-     TOBN(0xda253dec, 0xf215958a), TOBN(0x67e0606e, 0xa04edfa0),
-     TOBN(0xabbbf070, 0xef751b11), TOBN(0xf352f175, 0xf6f06dce),
-     TOBN(0xdfc4b6af, 0x6839f6b4), TOBN(0x53ddf9a8, 0x9959848e),
-     TOBN(0xda49c379, 0xc21520b0), TOBN(0x90864ff0, 0xdbd5d1b6),
-     TOBN(0x2f055d23, 0x5f49c7f7), TOBN(0xe51e4e6a, 0xa796b2d8),
-     TOBN(0xc361a67f, 0x5c9dc340), TOBN(0x5ad53c37, 0xbca7c620),
-     TOBN(0xda1d6588, 0x32c756d0), TOBN(0xad60d911, 0x8bb67e13),
-     TOBN(0xd6c47bdf, 0x0eeec8c6), TOBN(0x4a27fec1, 0x078a1821),
-     TOBN(0x081f7415, 0xc3099524), TOBN(0x8effdf0b, 0x82cd8060),
-     TOBN(0xdb70ec1c, 0x65842df8), TOBN(0x8821b358, 0xd319a901),
-     TOBN(0x72ee56ee, 0xde42b529), TOBN(0x5bb39592, 0x236e4286),
-     TOBN(0xd1183316, 0xfd6f7140), TOBN(0xf9fadb5b, 0xbd8e81f7),
-     TOBN(0x701d5e0c, 0x5a02d962), TOBN(0xfdee4dbf, 0x1b601324),
-     TOBN(0xbed17407, 0x35d7620e), TOBN(0x04e3c2c3, 0xf48c0012),
-     TOBN(0x9ee29da7, 0x3455449a), TOBN(0x562cdef4, 0x91a836c4),
-     TOBN(0x8f682a5f, 0x47701097), TOBN(0x617125d8, 0xff88d0c2),
-     TOBN(0x948fda24, 0x57bb86dd), TOBN(0x348abb8f, 0x289f7286),
-     TOBN(0xeb10eab5, 0x99d94bbd), TOBN(0xd51ba28e, 0x4684d160),
-     TOBN(0xabe0e51c, 0x30c8f41a), TOBN(0x66588b45, 0x13254f4a),
-     TOBN(0x147ebf01, 0xfad097a5), TOBN(0x49883ea8, 0x610e815d),
-     TOBN(0xe44d60ba, 0x8a11de56), TOBN(0xa970de6e, 0x827a7a6d),
-     TOBN(0x2be41424, 0x5e17fc19), TOBN(0xd833c657, 0x01214057),
-     TOBN(0x1375813b, 0x363e723f), TOBN(0x6820bb88, 0xe6a52e9b),
-     TOBN(0x7e7f6970, 0xd875d56a), TOBN(0xd6a0a9ac, 0x51fbf6bf),
-     TOBN(0x54ba8790, 0xa3083c12), TOBN(0xebaeb23d, 0x6ae7eb64),
-     TOBN(0xa8685c3a, 0xb99a907a), TOBN(0xf1e74550, 0x026bf40b),
-     TOBN(0x7b73a027, 0xc802cd9e), TOBN(0x9a8a927c, 0x4fef4635),
-     TOBN(0xe1b6f60c, 0x08191224), TOBN(0xc4126ebb, 0xde4ec091),
-     TOBN(0xe1dff4dc, 0x4ae38d84), TOBN(0xde3f57db, 0x4f2ef985),
-     TOBN(0x34964337, 0xd446a1dd), TOBN(0x7bf217a0, 0x859e77f6),
-     TOBN(0x8ff10527, 0x8e1d13f5), TOBN(0xa304ef03, 0x74eeae27),
-     TOBN(0xfc6f5e47, 0xd19dfa5a), TOBN(0xdb007de3, 0x7fad982b),
-     TOBN(0x28205ad1, 0x613715f5), TOBN(0x251e6729, 0x7889529e),
-     TOBN(0x72705184, 0x1ae98e78), TOBN(0xf818537d, 0x271cac32),
-     TOBN(0xc8a15b7e, 0xb7f410f5), TOBN(0xc474356f, 0x81f62393),
-     TOBN(0x92dbdc5a, 0xc242316b), TOBN(0xabe060ac, 0xdbf4aff5),
-     TOBN(0x6e8c38fe, 0x909a8ec6), TOBN(0x43e514e5, 0x6116cb94),
-     TOBN(0x2078fa38, 0x07d784f9), TOBN(0x1161a880, 0xf4b5b357),
-     TOBN(0x5283ce79, 0x13adea3d), TOBN(0x0756c3e6, 0xcc6a910b),
-     TOBN(0x60bcfe01, 0xaaa79697), TOBN(0x04a73b29, 0x56391db1),
-     TOBN(0xdd8dad47, 0x189b45a0), TOBN(0xbfac0dd0, 0x48d5b8d9),
-     TOBN(0x34ab3af5, 0x7d3d2ec2), TOBN(0x6fa2fc2d, 0x207bd3af),
-     TOBN(0x9ff40092, 0x66550ded), TOBN(0x719b3e87, 0x1fd5b913),
-     TOBN(0xa573a496, 0x6d17fbc7), TOBN(0x0cd1a70a, 0x73d2b24e),
-     TOBN(0x34e2c5ca, 0xb2676937), TOBN(0xe7050b06, 0xbf669f21),
-     TOBN(0xfbe948b6, 0x1ede9046), TOBN(0xa0530051, 0x97662659),
-     TOBN(0x58cbd4ed, 0xf10124c5), TOBN(0xde2646e4, 0xdd6c06c8),
-     TOBN(0x332f8108, 0x8cad38c0), TOBN(0x471b7e90, 0x6bd68ae2),
-     TOBN(0x56ac3fb2, 0x0d8e27a3), TOBN(0xb54660db, 0x136b4b0d),
-     TOBN(0x123a1e11, 0xa6fd8de4), TOBN(0x44dbffea, 0xa37799ef),
-     TOBN(0x4540b977, 0xce6ac17c), TOBN(0x495173a8, 0xaf60acef)}
-    ,
-    {TOBN(0x9ebb284d, 0x391c2a82), TOBN(0xbcdd4863, 0x158308e8),
-     TOBN(0x006f16ec, 0x83f1edca), TOBN(0xa13e2c37, 0x695dc6c8),
-     TOBN(0x2ab756f0, 0x4a057a87), TOBN(0xa8765500, 0xa6b48f98),
-     TOBN(0x4252face, 0x68651c44), TOBN(0xa52b540b, 0xe1765e02),
-     TOBN(0x4f922fc5, 0x16a0d2bb), TOBN(0x0d5cc16c, 0x1a623499),
-     TOBN(0x9241cf3a, 0x57c62c8b), TOBN(0x2f5e6961, 0xfd1b667f),
-     TOBN(0x5c15c70b, 0xf5a01797), TOBN(0x3d20b44d, 0x60956192),
-     TOBN(0x04911b37, 0x071fdb52), TOBN(0xf648f916, 0x8d6f0f7b),
-     TOBN(0x6dc1acaf, 0xe60b7cf7), TOBN(0x25860a50, 0x84a9d869),
-     TOBN(0x56fc6f09, 0xe7ba8ac4), TOBN(0x828c5bd0, 0x6148d29e),
-     TOBN(0xac6b435e, 0xdc55ae5f), TOBN(0xa527f56c, 0xc0117411),
-     TOBN(0x94d5045e, 0xfd24342c), TOBN(0x2c4c0a35, 0x70b67c0d),
-     TOBN(0x027cc8b8, 0xfac61d9a), TOBN(0x7d25e062, 0xe3c6fe8a),
-     TOBN(0xe08805bf, 0xe5bff503), TOBN(0x13271e6c, 0x6ff632f7),
-     TOBN(0x55dca6c0, 0x232f76a5), TOBN(0x8957c32d, 0x701ef426),
-     TOBN(0xee728bcb, 0xa10a5178), TOBN(0x5ea60411, 0xb62c5173),
-     TOBN(0xfc4e964e, 0xd0b8892b), TOBN(0x9ea17683, 0x9301bb74),
-     TOBN(0x6265c5ae, 0xfcc48626), TOBN(0xe60cf82e, 0xbb3e9102),
-     TOBN(0x57adf797, 0xd4df5531), TOBN(0x235b59a1, 0x8deeefe2),
-     TOBN(0x60adcf58, 0x3f306eb1), TOBN(0x105c2753, 0x3d09492d),
-     TOBN(0x4090914b, 0xb5def996), TOBN(0x1cb69c83, 0x233dd1e7),
-     TOBN(0xc1e9c1d3, 0x9b3d5e76), TOBN(0x1f3338ed, 0xfccf6012),
-     TOBN(0xb1e95d0d, 0x2f5378a8), TOBN(0xacf4c2c7, 0x2f00cd21),
-     TOBN(0x6e984240, 0xeb5fe290), TOBN(0xd66c038d, 0x248088ae),
-     TOBN(0x804d264a, 0xf94d70cf), TOBN(0xbdb802ef, 0x7314bf7e),
-     TOBN(0x8fb54de2, 0x4333ed02), TOBN(0x740461e0, 0x285635d9),
-     TOBN(0x4113b2c8, 0x365e9383), TOBN(0xea762c83, 0x3fdef652),
-     TOBN(0x4eec6e2e, 0x47b956c1), TOBN(0xa3d814be, 0x65620fa4),
-     TOBN(0x9ad5462b, 0xb4d8bc50), TOBN(0x181c0b16, 0xa9195770),
-     TOBN(0xebd4fe1c, 0x78412a68), TOBN(0xae0341bc, 0xc0dff48c),
-     TOBN(0xb6bc45cf, 0x7003e866), TOBN(0xf11a6dea, 0x8a24a41b),
-     TOBN(0x5407151a, 0xd04c24c2), TOBN(0x62c9d27d, 0xda5b7b68),
-     TOBN(0x2e964235, 0x88cceff6), TOBN(0x8594c54f, 0x8b07ed69),
-     TOBN(0x1578e73c, 0xc84d0d0d), TOBN(0x7b4e1055, 0xff532868),
-     TOBN(0xa348c0d5, 0xb5ec995a), TOBN(0xbf4b9d55, 0x14289a54),
-     TOBN(0x9ba155a6, 0x58fbd777), TOBN(0x186ed7a8, 0x1a84491d),
-     TOBN(0xd4992b30, 0x614c0900), TOBN(0xda98d121, 0xbd00c24b),
-     TOBN(0x7f534dc8, 0x7ec4bfa1), TOBN(0x4a5ff674, 0x37dc34bc),
-     TOBN(0x68c196b8, 0x1d7ea1d7), TOBN(0x38cf2893, 0x80a6d208),
-     TOBN(0xfd56cd09, 0xe3cbbd6e), TOBN(0xec72e27e, 0x4205a5b6),
-     TOBN(0x15ea68f5, 0xa44f77f7), TOBN(0x7aa5f9fd, 0xb43c52bc),
-     TOBN(0x86ff676f, 0x94f0e609), TOBN(0xa4cde963, 0x2e2d432b),
-     TOBN(0x8cafa0c0, 0xeee470af), TOBN(0x84137d0e, 0x8a3f5ec8),
-     TOBN(0xebb40411, 0xfaa31231), TOBN(0xa239c13f, 0x6f7f7ccf),
-     TOBN(0x32865719, 0xa8afd30b), TOBN(0x86798328, 0x8a826dce),
-     TOBN(0xdf04e891, 0xc4a8fbe0), TOBN(0xbb6b6e1b, 0xebf56ad3),
-     TOBN(0x0a695b11, 0x471f1ff0), TOBN(0xd76c3389, 0xbe15baf0),
-     TOBN(0x018edb95, 0xbe96c43e), TOBN(0xf2beaaf4, 0x90794158),
-     TOBN(0x152db09e, 0xc3076a27), TOBN(0x5e82908e, 0xe416545d),
-     TOBN(0xa2c41272, 0x356d6f2e), TOBN(0xdc9c9642, 0x31fd74e1),
-     TOBN(0x66ceb88d, 0x519bf615), TOBN(0xe29ecd76, 0x05a2274e),
-     TOBN(0x3a0473c4, 0xbf5e2fa0), TOBN(0x6b6eb671, 0x64284e67),
-     TOBN(0xe8b97932, 0xb88756dd), TOBN(0xed4e8652, 0xf17e3e61),
-     TOBN(0xc2dd1499, 0x3ee1c4a4), TOBN(0xc0aaee17, 0x597f8c0e),
-     TOBN(0x15c4edb9, 0x6c168af3), TOBN(0x6563c7bf, 0xb39ae875),
-     TOBN(0xadfadb6f, 0x20adb436), TOBN(0xad55e8c9, 0x9a042ac0),
-     TOBN(0x975a1ed8, 0xb76da1f5), TOBN(0x10dfa466, 0xa58acb94),
-     TOBN(0x8dd7f7e3, 0xac060282), TOBN(0x6813e66a, 0x572a051e),
-     TOBN(0xb4ccae1e, 0x350cb901), TOBN(0xb653d656, 0x50cb7822),
-     TOBN(0x42484710, 0xdfab3b87), TOBN(0xcd7ee537, 0x9b670fd0),
-     TOBN(0x0a50b12e, 0x523b8bf6), TOBN(0x8009eb5b, 0x8f910c1b),
-     TOBN(0xf535af82, 0x4a167588), TOBN(0x0f835f9c, 0xfb2a2abd),
-     TOBN(0xf59b2931, 0x2afceb62), TOBN(0xc797df2a, 0x169d383f),
-     TOBN(0xeb3f5fb0, 0x66ac02b0), TOBN(0x029d4c6f, 0xdaa2d0ca),
-     TOBN(0xd4059bc1, 0xafab4bc5), TOBN(0x833f5c6f, 0x56783247),
-     TOBN(0xb5346630, 0x8d2d3605), TOBN(0x83387891, 0xd34d8433),
-     TOBN(0xd973b30f, 0xadd9419a), TOBN(0xbcca1099, 0xafe3fce8),
-     TOBN(0x08178315, 0x0809aac6), TOBN(0x01b7f21a, 0x540f0f11),
-     TOBN(0x65c29219, 0x909523c8), TOBN(0xa62f648f, 0xa3a1c741),
-     TOBN(0x88598d4f, 0x60c9e55a), TOBN(0xbce9141b, 0x0e4f347a),
-     TOBN(0x9af97d84, 0x35f9b988), TOBN(0x0210da62, 0x320475b6),
-     TOBN(0x3c076e22, 0x9191476c), TOBN(0x7520dbd9, 0x44fc7834),
-     TOBN(0x6a6b2cfe, 0xc1ab1bbd), TOBN(0xef8a65be, 0xdc650938),
-     TOBN(0x72855540, 0x805d7bc4), TOBN(0xda389396, 0xed11fdfd),
-     TOBN(0xa9d5bd36, 0x74660876), TOBN(0x11d67c54, 0xb45dff35),
-     TOBN(0x6af7d148, 0xa4f5da94), TOBN(0xbb8d4c3f, 0xc0bbeb31),
-     TOBN(0x87a7ebd1, 0xe0a1b12a), TOBN(0x1e4ef88d, 0x770ba95f),
-     TOBN(0x8c33345c, 0xdc2ae9cb), TOBN(0xcecf1276, 0x01cc8403),
-     TOBN(0x687c012e, 0x1b39b80f), TOBN(0xfd90d0ad, 0x35c33ba4),
-     TOBN(0xa3ef5a67, 0x5c9661c2), TOBN(0x368fc88e, 0xe017429e),
-     TOBN(0xd30c6761, 0x196a2fa2), TOBN(0x931b9817, 0xbd5b312e),
-     TOBN(0xba01000c, 0x72f54a31), TOBN(0xa203d2c8, 0x66eaa541),
-     TOBN(0xf2abdee0, 0x98939db3), TOBN(0xe37d6c2c, 0x3e606c02),
-     TOBN(0xf2921574, 0x521ff643), TOBN(0x2781b3c4, 0xd7e2fca3),
-     TOBN(0x664300b0, 0x7850ec06), TOBN(0xac5a38b9, 0x7d3a10cf),
-     TOBN(0x9233188d, 0xe34ab39d), TOBN(0xe77057e4, 0x5072cbb9),
-     TOBN(0xbcf0c042, 0xb59e78df), TOBN(0x4cfc91e8, 0x1d97de52),
-     TOBN(0x4661a26c, 0x3ee0ca4a), TOBN(0x5620a4c1, 0xfb8507bc),
-     TOBN(0x4b44d4aa, 0x049f842c), TOBN(0xceabc5d5, 0x1540e82b),
-     TOBN(0x306710fd, 0x15c6f156), TOBN(0xbe5ae52b, 0x63db1d72),
-     TOBN(0x06f1e7e6, 0x334957f1), TOBN(0x57e388f0, 0x31144a70),
-     TOBN(0xfb69bb2f, 0xdf96447b), TOBN(0x0f78ebd3, 0x73e38a12),
-     TOBN(0xb8222605, 0x2b7ce542), TOBN(0xe6d4ce99, 0x7472bde1),
-     TOBN(0x53e16ebe, 0x09d2f4da), TOBN(0x180ff42e, 0x53b92b2e),
-     TOBN(0xc59bcc02, 0x2c34a1c6), TOBN(0x3803d6f9, 0x422c46c2),
-     TOBN(0x18aff74f, 0x5c14a8a2), TOBN(0x55aebf80, 0x10a08b28),
-     TOBN(0x66097d58, 0x7135593f), TOBN(0x32e6eff7, 0x2be570cd),
-     TOBN(0x584e6a10, 0x2a8c860d), TOBN(0xcd185890, 0xa2eb4163),
-     TOBN(0x7ceae99d, 0x6d97e134), TOBN(0xd42c6b70, 0xdd8447ce),
-     TOBN(0x59ddbb4a, 0xb8c50273), TOBN(0x03c612df, 0x3cf34e1e),
-     TOBN(0x84b9ca15, 0x04b6c5a0), TOBN(0x35216f39, 0x18f0e3a3),
-     TOBN(0x3ec2d2bc, 0xbd986c00), TOBN(0x8bf546d9, 0xd19228fe),
-     TOBN(0xd1c655a4, 0x4cd623c3), TOBN(0x366ce718, 0x502b8e5a),
-     TOBN(0x2cfc84b4, 0xeea0bfe7), TOBN(0xe01d5cee, 0xcf443e8e),
-     TOBN(0x8ec045d9, 0x036520f8), TOBN(0xdfb3c3d1, 0x92d40e98),
-     TOBN(0x0bac4cce, 0xcc559a04), TOBN(0x35eccae5, 0x240ea6b1),
-     TOBN(0x180b32db, 0xf8a5a0ac), TOBN(0x547972a5, 0xeb699700),
-     TOBN(0xa3765801, 0xca26bca0), TOBN(0x57e09d0e, 0xa647f25a),
-     TOBN(0xb956970e, 0x2fdd23cc), TOBN(0xb80288bc, 0x5682e971),
-     TOBN(0xe6e6d91e, 0x9ae86ebc), TOBN(0x0564c83f, 0x8c9f1939),
-     TOBN(0x551932a2, 0x39560368), TOBN(0xe893752b, 0x049c28e2),
-     TOBN(0x0b03cee5, 0xa6a158c3), TOBN(0xe12d656b, 0x04964263),
-     TOBN(0x4b47554e, 0x63e3bc1d), TOBN(0xc719b6a2, 0x45044ff7),
-     TOBN(0x4f24d30a, 0xe48daa07), TOBN(0xa3f37556, 0xc8c1edc3),
-     TOBN(0x9a47bf76, 0x0700d360), TOBN(0xbb1a1824, 0x822ae4e2),
-     TOBN(0x22e275a3, 0x89f1fb4c), TOBN(0x72b1aa23, 0x9968c5f5),
-     TOBN(0xa75feaca, 0xbe063f64), TOBN(0x9b392f43, 0xbce47a09),
-     TOBN(0xd4241509, 0x1ad07aca), TOBN(0x4b0c591b, 0x8d26cd0f),
-     TOBN(0x2d42ddfd, 0x92f1169a), TOBN(0x63aeb1ac, 0x4cbf2392),
-     TOBN(0x1de9e877, 0x0691a2af), TOBN(0xebe79af7, 0xd98021da),
-     TOBN(0xcfdf2a4e, 0x40e50acf), TOBN(0xf0a98ad7, 0xaf01d665),
-     TOBN(0xefb640bf, 0x1831be1f), TOBN(0x6fe8bd2f, 0x80e9ada0),
-     TOBN(0x94c103a1, 0x6cafbc91), TOBN(0x170f8759, 0x8308e08c),
-     TOBN(0x5de2d2ab, 0x9780ff4f), TOBN(0x666466bc, 0x45b201f2),
-     TOBN(0x58af2010, 0xf5b343bc), TOBN(0x0f2e400a, 0xf2f142fe),
-     TOBN(0x3483bfde, 0xa85f4bdf), TOBN(0xf0b1d093, 0x03bfeaa9),
-     TOBN(0x2ea01b95, 0xc7081603), TOBN(0xe943e4c9, 0x3dba1097),
-     TOBN(0x47be92ad, 0xb438f3a6), TOBN(0x00bb7742, 0xe5bf6636),
-     TOBN(0x136b7083, 0x824297b4), TOBN(0x9d0e5580, 0x5584455f),
-     TOBN(0xab48cedc, 0xf1c7d69e), TOBN(0x53a9e481, 0x2a256e76),
-     TOBN(0x0402b0e0, 0x65eb2413), TOBN(0xdadbbb84, 0x8fc407a7),
-     TOBN(0xa65cd5a4, 0x8d7f5492), TOBN(0x21d44293, 0x74bae294),
-     TOBN(0x66917ce6, 0x3b5f1cc4), TOBN(0x37ae52ea, 0xce872e62),
-     TOBN(0xbb087b72, 0x2905f244), TOBN(0x12077086, 0x1e6af74f),
-     TOBN(0x4b644e49, 0x1058edea), TOBN(0x827510e3, 0xb638ca1d),
-     TOBN(0x8cf2b704, 0x6038591c), TOBN(0xffc8b47a, 0xfe635063),
-     TOBN(0x3ae220e6, 0x1b4d5e63), TOBN(0xbd864742, 0x9d961b4b),
-     TOBN(0x610c107e, 0x9bd16bed), TOBN(0x4270352a, 0x1127147b),
-     TOBN(0x7d17ffe6, 0x64cfc50e), TOBN(0x50dee01a, 0x1e36cb42),
-     TOBN(0x068a7622, 0x35dc5f9a), TOBN(0x9a08d536, 0xdf53f62c),
-     TOBN(0x4ed71457, 0x6be5f7de), TOBN(0xd93006f8, 0xc2263c9e),
-     TOBN(0xe073694c, 0xcacacb36), TOBN(0x2ff7a5b4, 0x3ae118ab),
-     TOBN(0x3cce53f1, 0xcd871236), TOBN(0xf156a39d, 0xc2aa6d52),
-     TOBN(0x9cc5f271, 0xb198d76d), TOBN(0xbc615b6f, 0x81383d39),
-     TOBN(0xa54538e8, 0xde3eee6b), TOBN(0x58c77538, 0xab910d91),
-     TOBN(0x31e5bdbc, 0x58d278bd), TOBN(0x3cde4adf, 0xb963acae),
-     TOBN(0xb1881fd2, 0x5302169c), TOBN(0x8ca60fa0, 0xa989ed8b),
-     TOBN(0xa1999458, 0xff96a0ee), TOBN(0xc1141f03, 0xac6c283d),
-     TOBN(0x7677408d, 0x6dfafed3), TOBN(0x33a01653, 0x39661588),
-     TOBN(0x3c9c15ec, 0x0b726fa0), TOBN(0x090cfd93, 0x6c9b56da),
-     TOBN(0xe34f4bae, 0xa3c40af5), TOBN(0x3469eadb, 0xd21129f1),
-     TOBN(0xcc51674a, 0x1e207ce8), TOBN(0x1e293b24, 0xc83b1ef9),
-     TOBN(0x17173d13, 0x1e6c0bb4), TOBN(0x19004695, 0x90776d35),
-     TOBN(0xe7980e34, 0x6de6f922), TOBN(0x873554cb, 0xf4dd9a22),
-     TOBN(0x0316c627, 0xcbf18a51), TOBN(0x4d93651b, 0x3032c081),
-     TOBN(0x207f2771, 0x3946834d), TOBN(0x2c08d7b4, 0x30cdbf80),
-     TOBN(0x137a4fb4, 0x86df2a61), TOBN(0xa1ed9c07, 0xecf7b4a2),
-     TOBN(0xb2e460e2, 0x7bd042ff), TOBN(0xb7f5e2fa, 0x5f62f5ec),
-     TOBN(0x7aa6ec6b, 0xcc2423b7), TOBN(0x75ce0a7f, 0xba63eea7),
-     TOBN(0x67a45fb1, 0xf250a6e1), TOBN(0x93bc919c, 0xe53cdc9f),
-     TOBN(0x9271f56f, 0x871942df), TOBN(0x2372ff6f, 0x7859ad66),
-     TOBN(0x5f4c2b96, 0x33cb1a78), TOBN(0xe3e29101, 0x5838aa83),
-     TOBN(0xa7ed1611, 0xe4e8110c), TOBN(0x2a2d70d5, 0x330198ce),
-     TOBN(0xbdf132e8, 0x6720efe0), TOBN(0xe61a8962, 0x66a471bf),
-     TOBN(0x796d3a85, 0x825808bd), TOBN(0x51dc3cb7, 0x3fd6e902),
-     TOBN(0x643c768a, 0x916219d1), TOBN(0x36cd7685, 0xa2ad7d32),
-     TOBN(0xe3db9d05, 0xb22922a4), TOBN(0x6494c87e, 0xdba29660),
-     TOBN(0xf0ac91df, 0xbcd2ebc7), TOBN(0x4deb57a0, 0x45107f8d),
-     TOBN(0x42271f59, 0xc3d12a73), TOBN(0x5f71687c, 0xa5c2c51d),
-     TOBN(0xcb1f50c6, 0x05797bcb), TOBN(0x29ed0ed9, 0xd6d34eb0),
-     TOBN(0xe5fe5b47, 0x4683c2eb), TOBN(0x4956eeb5, 0x97447c46),
-     TOBN(0x5b163a43, 0x71207167), TOBN(0x93fa2fed, 0x0248c5ef),
-     TOBN(0x67930af2, 0x31f63950), TOBN(0xa77797c1, 0x14caa2c9),
-     TOBN(0x526e80ee, 0x27ac7e62), TOBN(0xe1e6e626, 0x58b28aec),
-     TOBN(0x636178b0, 0xb3c9fef0), TOBN(0xaf7752e0, 0x6d5f90be),
-     TOBN(0x94ecaf18, 0xeece51cf), TOBN(0x2864d0ed, 0xca806e1f),
-     TOBN(0x6de2e383, 0x97c69134), TOBN(0x5a42c316, 0xeb291293),
-     TOBN(0xc7779219, 0x6a60bae0), TOBN(0xa24de346, 0x6b7599d1),
-     TOBN(0x49d374aa, 0xb75d4941), TOBN(0x98900586, 0x2d501ff0),
-     TOBN(0x9f16d40e, 0xeb7974cf), TOBN(0x1033860b, 0xcdd8c115),
-     TOBN(0xb6c69ac8, 0x2094cec3), TOBN(0x9976fb88, 0x403b770c),
-     TOBN(0x1dea026c, 0x4859590d), TOBN(0xb6acbb46, 0x8562d1fd),
-     TOBN(0x7cd6c461, 0x44569d85), TOBN(0xc3190a36, 0x97f0891d),
-     TOBN(0xc6f53195, 0x48d5a17d), TOBN(0x7d919966, 0xd749abc8),
-     TOBN(0x65104837, 0xdd1c8a20), TOBN(0x7e5410c8, 0x2f683419),
-     TOBN(0x958c3ca8, 0xbe94022e), TOBN(0x605c3197, 0x6145dac2),
-     TOBN(0x3fc07501, 0x01683d54), TOBN(0x1d7127c5, 0x595b1234),
-     TOBN(0x10b8f87c, 0x9481277f), TOBN(0x677db2a8, 0xe65a1adb),
-     TOBN(0xec2fccaa, 0xddce3345), TOBN(0x2a6811b7, 0x012a4350),
-     TOBN(0x96760ff1, 0xac598bdc), TOBN(0x054d652a, 0xd1bf4128),
-     TOBN(0x0a1151d4, 0x92a21005), TOBN(0xad7f3971, 0x33110fdf),
-     TOBN(0x8c95928c, 0x1960100f), TOBN(0x6c91c825, 0x7bf03362),
-     TOBN(0xc8c8b2a2, 0xce309f06), TOBN(0xfdb27b59, 0xca27204b),
-     TOBN(0xd223eaa5, 0x0848e32e), TOBN(0xb93e4b2e, 0xe7bfaf1e),
-     TOBN(0xc5308ae6, 0x44aa3ded), TOBN(0x317a666a, 0xc015d573),
-     TOBN(0xc888ce23, 0x1a979707), TOBN(0xf141c1e6, 0x0d5c4958),
-     TOBN(0xb53b7de5, 0x61906373), TOBN(0x858dbade, 0xeb999595),
-     TOBN(0x8cbb47b2, 0xa59e5c36), TOBN(0x660318b3, 0xdcf4e842),
-     TOBN(0xbd161ccd, 0x12ba4b7a), TOBN(0xf399daab, 0xf8c8282a),
-     TOBN(0x1587633a, 0xeeb2130d), TOBN(0xa465311a, 0xda38dd7d),
-     TOBN(0x5f75eec8, 0x64d3779b), TOBN(0x3c5d0476, 0xad64c171),
-     TOBN(0x87410371, 0x2a914428), TOBN(0x8096a891, 0x90e2fc29),
-     TOBN(0xd3d2ae9d, 0x23b3ebc2), TOBN(0x90bdd6db, 0xa580cfd6),
-     TOBN(0x52dbb7f3, 0xc5b01f6c), TOBN(0xe68eded4, 0xe102a2dc),
-     TOBN(0x17785b77, 0x99eb6df0), TOBN(0x26c3cc51, 0x7386b779),
-     TOBN(0x345ed988, 0x6417a48e), TOBN(0xe990b4e4, 0x07d6ef31),
-     TOBN(0x0f456b7e, 0x2586abba), TOBN(0x239ca6a5, 0x59c96e9a),
-     TOBN(0xe327459c, 0xe2eb4206), TOBN(0x3a4c3313, 0xa002b90a),
-     TOBN(0x2a114806, 0xf6a3f6fb), TOBN(0xad5cad2f, 0x85c251dd),
-     TOBN(0x92c1f613, 0xf5a784d3), TOBN(0xec7bfacf, 0x349766d5),
-     TOBN(0x04b3cd33, 0x3e23cb3b), TOBN(0x3979fe84, 0xc5a64b2d),
-     TOBN(0x192e2720, 0x7e589106), TOBN(0xa60c43d1, 0xa15b527f),
-     TOBN(0x2dae9082, 0xbe7cf3a6), TOBN(0xcc86ba92, 0xbc967274),
-     TOBN(0xf28a2ce8, 0xaea0a8a9), TOBN(0x404ca6d9, 0x6ee988b3),
-     TOBN(0xfd7e9c5d, 0x005921b8), TOBN(0xf56297f1, 0x44e79bf9),
-     TOBN(0xa163b460, 0x0d75ddc2), TOBN(0x30b23616, 0xa1f2be87),
-     TOBN(0x4b070d21, 0xbfe50e2b), TOBN(0x7ef8cfd0, 0xe1bfede1),
-     TOBN(0xadba0011, 0x2aac4ae0), TOBN(0x2a3e7d01, 0xb9ebd033),
-     TOBN(0x995277ec, 0xe38d9d1c), TOBN(0xb500249e, 0x9c5d2de3),
-     TOBN(0x8912b820, 0xf13ca8c9), TOBN(0xc8798114, 0x877793af),
-     TOBN(0x19e6125d, 0xec3f1dec), TOBN(0x07b1f040, 0x911178da),
-     TOBN(0xd93ededa, 0x904a6738), TOBN(0x55187a5a, 0x0bebedcd),
-     TOBN(0xf7d04722, 0xeb329d41), TOBN(0xf449099e, 0xf170b391),
-     TOBN(0xfd317a69, 0xca99f828), TOBN(0x50c3db2b, 0x34a4976d),
-     TOBN(0xe9ba7784, 0x3757b392), TOBN(0x326caefd, 0xaa3ca05a),
-     TOBN(0x78e5293b, 0xf1e593d4), TOBN(0x7842a937, 0x0d98fd13),
-     TOBN(0xe694bf96, 0x5f96b10d), TOBN(0x373a9df6, 0x06a8cd05),
-     TOBN(0x997d1e51, 0xe8f0c7fc), TOBN(0x1d019790, 0x63fd972e),
-     TOBN(0x0064d858, 0x5499fb32), TOBN(0x7b67bad9, 0x77a8aeb7),
-     TOBN(0x1d3eb977, 0x2d08eec5), TOBN(0x5fc047a6, 0xcbabae1d),
-     TOBN(0x0577d159, 0xe54a64bb), TOBN(0x8862201b, 0xc43497e4),
-     TOBN(0xad6b4e28, 0x2ce0608d), TOBN(0x8b687b7d, 0x0b167aac),
-     TOBN(0x6ed4d367, 0x8b2ecfa9), TOBN(0x24dfe62d, 0xa90c3c38),
-     TOBN(0xa1862e10, 0x3fe5c42b), TOBN(0x1ca73dca, 0xd5732a9f),
-     TOBN(0x35f038b7, 0x76bb87ad), TOBN(0x674976ab, 0xf242b81f),
-     TOBN(0x4f2bde7e, 0xb0fd90cd), TOBN(0x6efc172e, 0xa7fdf092),
-     TOBN(0x3806b69b, 0x92222f1f), TOBN(0x5a2459ca, 0x6cf7ae70),
-     TOBN(0x6789f69c, 0xa85217ee), TOBN(0x5f232b5e, 0xe3dc85ac),
-     TOBN(0x660e3ec5, 0x48e9e516), TOBN(0x124b4e47, 0x3197eb31),
-     TOBN(0x10a0cb13, 0xaafcca23), TOBN(0x7bd63ba4, 0x8213224f),
-     TOBN(0xaffad7cc, 0x290a7f4f), TOBN(0x6b409c9e, 0x0286b461),
-     TOBN(0x58ab809f, 0xffa407af), TOBN(0xc3122eed, 0xc68ac073),
-     TOBN(0x17bf9e50, 0x4ef24d7e), TOBN(0x5d929794, 0x3e2a5811),
-     TOBN(0x519bc867, 0x02902e01), TOBN(0x76bba5da, 0x39c8a851),
-     TOBN(0xe9f9669c, 0xda94951e), TOBN(0x4b6af58d, 0x66b8d418),
-     TOBN(0xfa321074, 0x17d426a4), TOBN(0xc78e66a9, 0x9dde6027),
-     TOBN(0x0516c083, 0x4a53b964), TOBN(0xfc659d38, 0xff602330),
-     TOBN(0x0ab55e5c, 0x58c5c897), TOBN(0x985099b2, 0x838bc5df),
-     TOBN(0x061d9efc, 0xc52fc238), TOBN(0x712b2728, 0x6ac1da3f),
-     TOBN(0xfb658149, 0x9283fe08), TOBN(0x4954ac94, 0xb8aaa2f7),
-     TOBN(0x85c0ada4, 0x7fb2e74f), TOBN(0xee8ba98e, 0xb89926b0),
-     TOBN(0xe4f9d37d, 0x23d1af5b), TOBN(0x14ccdbf9, 0xba9b015e),
-     TOBN(0xb674481b, 0x7bfe7178), TOBN(0x4e1debae, 0x65405868),
-     TOBN(0x061b2821, 0xc48c867d), TOBN(0x69c15b35, 0x513b30ea),
-     TOBN(0x3b4a1666, 0x36871088), TOBN(0xe5e29f5d, 0x1220b1ff),
-     TOBN(0x4b82bb35, 0x233d9f4d), TOBN(0x4e076333, 0x18cdc675)}
-    ,
-    {TOBN(0x0d53f5c7, 0xa3e6fced), TOBN(0xe8cbbdd5, 0xf45fbdeb),
-     TOBN(0xf85c01df, 0x13339a70), TOBN(0x0ff71880, 0x142ceb81),
-     TOBN(0x4c4e8774, 0xbd70437a), TOBN(0x5fb32891, 0xba0bda6a),
-     TOBN(0x1cdbebd2, 0xf18bd26e), TOBN(0x2f9526f1, 0x03a9d522),
-     TOBN(0x40ce3051, 0x92c4d684), TOBN(0x8b04d725, 0x7612efcd),
-     TOBN(0xb9dcda36, 0x6f9cae20), TOBN(0x0edc4d24, 0xf058856c),
-     TOBN(0x64f2e6bf, 0x85427900), TOBN(0x3de81295, 0xdc09dfea),
-     TOBN(0xd41b4487, 0x379bf26c), TOBN(0x50b62c6d, 0x6df135a9),
-     TOBN(0xd4f8e3b4, 0xc72dfe67), TOBN(0xc416b0f6, 0x90e19fdf),
-     TOBN(0x18b9098d, 0x4c13bd35), TOBN(0xac11118a, 0x15b8cb9e),
-     TOBN(0xf598a318, 0xf0062841), TOBN(0xbfe0602f, 0x89f356f4),
-     TOBN(0x7ae3637e, 0x30177a0c), TOBN(0x34097747, 0x61136537),
-     TOBN(0x0db2fb5e, 0xd005832a), TOBN(0x5f5efd3b, 0x91042e4f),
-     TOBN(0x8c4ffdc6, 0xed70f8ca), TOBN(0xe4645d0b, 0xb52da9cc),
-     TOBN(0x9596f58b, 0xc9001d1f), TOBN(0x52c8f0bc, 0x4e117205),
-     TOBN(0xfd4aa0d2, 0xe398a084), TOBN(0x815bfe3a, 0x104f49de),
-     TOBN(0x97e5443f, 0x23885e5f), TOBN(0xf72f8f99, 0xe8433aab),
-     TOBN(0xbd00b154, 0xe4d4e604), TOBN(0xd0b35e6a, 0xe5e173ff),
-     TOBN(0x57b2a048, 0x9164722d), TOBN(0x3e3c665b, 0x88761ec8),
-     TOBN(0x6bdd1397, 0x3da83832), TOBN(0x3c8b1a1e, 0x73dafe3b),
-     TOBN(0x4497ace6, 0x54317cac), TOBN(0xbe600ab9, 0x521771b3),
-     TOBN(0xb42e409e, 0xb0dfe8b8), TOBN(0x386a67d7, 0x3942310f),
-     TOBN(0x25548d8d, 0x4431cc28), TOBN(0xa7cff142, 0x985dc524),
-     TOBN(0x4d60f5a1, 0x93c4be32), TOBN(0x83ebd5c8, 0xd071c6e1),
-     TOBN(0xba3a80a7, 0xb1fd2b0b), TOBN(0x9b3ad396, 0x5bec33e8),
-     TOBN(0xb3868d61, 0x79743fb3), TOBN(0xcfd169fc, 0xfdb462fa),
-     TOBN(0xd3b499d7, 0x9ce0a6af), TOBN(0x55dc1cf1, 0xe42d3ff8),
-     TOBN(0x04fb9e6c, 0xc6c3e1b2), TOBN(0x47e6961d, 0x6f69a474),
-     TOBN(0x54eb3acc, 0xe548b37b), TOBN(0xb38e7542, 0x84d40549),
-     TOBN(0x8c3daa51, 0x7b341b4f), TOBN(0x2f6928ec, 0x690bf7fa),
-     TOBN(0x0496b323, 0x86ce6c41), TOBN(0x01be1c55, 0x10adadcd),
-     TOBN(0xc04e67e7, 0x4bb5faf9), TOBN(0x3cbaf678, 0xe15c9985),
-     TOBN(0x8cd12145, 0x50ca4247), TOBN(0xba1aa47a, 0xe7dd30aa),
-     TOBN(0x2f81ddf1, 0xe58fee24), TOBN(0x03452936, 0xeec9b0e8),
-     TOBN(0x8bdc3b81, 0x243aea96), TOBN(0x9a2919af, 0x15c3d0e5),
-     TOBN(0x9ea640ec, 0x10948361), TOBN(0x5ac86d5b, 0x6e0bcccf),
-     TOBN(0xf892d918, 0xc36cf440), TOBN(0xaed3e837, 0xc939719c),
-     TOBN(0xb07b08d2, 0xc0218b64), TOBN(0x6f1bcbba, 0xce9790dd),
-     TOBN(0x4a84d6ed, 0x60919b8e), TOBN(0xd8900791, 0x8ac1f9eb),
-     TOBN(0xf84941aa, 0x0dd5daef), TOBN(0xb22fe40a, 0x67fd62c5),
-     TOBN(0x97e15ba2, 0x157f2db3), TOBN(0xbda2fc8f, 0x8e28ca9c),
-     TOBN(0x5d050da4, 0x37b9f454), TOBN(0x3d57eb57, 0x2379d72e),
-     TOBN(0xe9b5eba2, 0xfb5ee997), TOBN(0x01648ca2, 0xe11538ca),
-     TOBN(0x32bb76f6, 0xf6327974), TOBN(0x338f14b8, 0xff3f4bb7),
-     TOBN(0x524d226a, 0xd7ab9a2d), TOBN(0x9c00090d, 0x7dfae958),
-     TOBN(0x0ba5f539, 0x8751d8c2), TOBN(0x8afcbcdd, 0x3ab8262d),
-     TOBN(0x57392729, 0xe99d043b), TOBN(0xef51263b, 0xaebc943a),
-     TOBN(0x9feace93, 0x20862935), TOBN(0x639efc03, 0xb06c817b),
-     TOBN(0x1fe054b3, 0x66b4be7a), TOBN(0x3f25a9de, 0x84a37a1e),
-     TOBN(0xf39ef1ad, 0x78d75cd9), TOBN(0xd7b58f49, 0x5062c1b5),
-     TOBN(0x6f74f9a9, 0xff563436), TOBN(0xf718ff29, 0xe8af51e7),
-     TOBN(0x5234d313, 0x15e97fec), TOBN(0xb6a8e2b1, 0x292f1c0a),
-     TOBN(0xa7f53aa8, 0x327720c1), TOBN(0x956ca322, 0xba092cc8),
-     TOBN(0x8f03d64a, 0x28746c4d), TOBN(0x51fe1782, 0x66d0d392),
-     TOBN(0xd19b34db, 0x3c832c80), TOBN(0x60dccc5c, 0x6da2e3b4),
-     TOBN(0x245dd62e, 0x0a104ccc), TOBN(0xa7ab1de1, 0x620b21fd),
-     TOBN(0xb293ae0b, 0x3893d123), TOBN(0xf7b75783, 0xb15ee71c),
-     TOBN(0x5aa3c614, 0x42a9468b), TOBN(0xd686123c, 0xdb15d744),
-     TOBN(0x8c616891, 0xa7ab4116), TOBN(0x6fcd72c8, 0xa4e6a459),
-     TOBN(0xac219110, 0x77e5fad7), TOBN(0xfb6a20e7, 0x704fa46b),
-     TOBN(0xe839be7d, 0x341d81dc), TOBN(0xcddb6889, 0x32148379),
-     TOBN(0xda6211a1, 0xf7026ead), TOBN(0xf3b2575f, 0xf4d1cc5e),
-     TOBN(0x40cfc8f6, 0xa7a73ae6), TOBN(0x83879a5e, 0x61d5b483),
-     TOBN(0xc5acb1ed, 0x41a50ebc), TOBN(0x59a60cc8, 0x3c07d8fa),
-     TOBN(0x1b73bdce, 0xb1876262), TOBN(0x2b0d79f0, 0x12af4ee9),
-     TOBN(0x8bcf3b0b, 0xd46e1d07), TOBN(0x17d6af9d, 0xe45d152f),
-     TOBN(0x73520461, 0x6d736451), TOBN(0x43cbbd97, 0x56b0bf5a),
-     TOBN(0xb0833a5b, 0xd5999b9d), TOBN(0x702614f0, 0xeb72e398),
-     TOBN(0x0aadf01a, 0x59c3e9f8), TOBN(0x40200e77, 0xce6b3d16),
-     TOBN(0xda22bdd3, 0xdeddafad), TOBN(0x76dedaf4, 0x310d72e1),
-     TOBN(0x49ef807c, 0x4bc2e88f), TOBN(0x6ba81291, 0x146dd5a5),
-     TOBN(0xa1a4077a, 0x7d8d59e9), TOBN(0x87b6a2e7, 0x802db349),
-     TOBN(0xd5679997, 0x1b4e598e), TOBN(0xf499ef1f, 0x06fe4b1d),
-     TOBN(0x3978d3ae, 0xfcb267c5), TOBN(0xb582b557, 0x235786d0),
-     TOBN(0x32b3b2ca, 0x1715cb07), TOBN(0x4c3de6a2, 0x8480241d),
-     TOBN(0x63b5ffed, 0xcb571ecd), TOBN(0xeaf53900, 0xed2fe9a9),
-     TOBN(0xdec98d4a, 0xc3b81990), TOBN(0x1cb83722, 0x9e0cc8fe),
-     TOBN(0xfe0b0491, 0xd2b427b9), TOBN(0x0f2386ac, 0xe983a66c),
-     TOBN(0x930c4d1e, 0xb3291213), TOBN(0xa2f82b2e, 0x59a62ae4),
-     TOBN(0x77233853, 0xf93e89e3), TOBN(0x7f8063ac, 0x11777c7f),
-     TOBN(0xff0eb567, 0x59ad2877), TOBN(0x6f454642, 0x9865c754),
-     TOBN(0xe6fe701a, 0x236e9a84), TOBN(0xc586ef16, 0x06e40fc3),
-     TOBN(0x3f62b6e0, 0x24bafad9), TOBN(0xc8b42bd2, 0x64da906a),
-     TOBN(0xc98e1eb4, 0xda3276a0), TOBN(0x30d0e5fc, 0x06cbf852),
-     TOBN(0x1b6b2ae1, 0xe8b4dfd4), TOBN(0xd754d5c7, 0x8301cbac),
-     TOBN(0x66097629, 0x112a39ac), TOBN(0xf86b5999, 0x93ba4ab9),
-     TOBN(0x26c9dea7, 0x99f9d581), TOBN(0x0473b1a8, 0xc2fafeaa),
-     TOBN(0x1469af55, 0x3b2505a5), TOBN(0x227d16d7, 0xd6a43323),
-     TOBN(0x3316f73c, 0xad3d97f9), TOBN(0x52bf3bb5, 0x1f137455),
-     TOBN(0x953eafeb, 0x09954e7c), TOBN(0xa721dfed, 0xdd732411),
-     TOBN(0xb4929821, 0x141d4579), TOBN(0x3411321c, 0xaa3bd435),
-     TOBN(0xafb355aa, 0x17fa6015), TOBN(0xb4e7ef4a, 0x18e42f0e),
-     TOBN(0x604ac97c, 0x59371000), TOBN(0xe1c48c70, 0x7f759c18),
-     TOBN(0x3f62ecc5, 0xa5db6b65), TOBN(0x0a78b173, 0x38a21495),
-     TOBN(0x6be1819d, 0xbcc8ad94), TOBN(0x70dc04f6, 0xd89c3400),
-     TOBN(0x462557b4, 0xa6b4840a), TOBN(0x544c6ade, 0x60bd21c0),
-     TOBN(0x6a00f24e, 0x907a544b), TOBN(0xa7520dcb, 0x313da210),
-     TOBN(0xfe939b75, 0x11e4994b), TOBN(0x918b6ba6, 0xbc275d70),
-     TOBN(0xd3e5e0fc, 0x644be892), TOBN(0x707a9816, 0xfdaf6c42),
-     TOBN(0x60145567, 0xf15c13fe), TOBN(0x4818ebaa, 0xe130a54a),
-     TOBN(0x28aad3ad, 0x58d2f767), TOBN(0xdc5267fd, 0xd7e7c773),
-     TOBN(0x4919cc88, 0xc3afcc98), TOBN(0xaa2e6ab0, 0x2db8cd4b),
-     TOBN(0xd46fec04, 0xd0c63eaa), TOBN(0xa1cb92c5, 0x19ffa832),
-     TOBN(0x678dd178, 0xe43a631f), TOBN(0xfb5ae1cd, 0x3dc788b3),
-     TOBN(0x68b4fb90, 0x6e77de04), TOBN(0x7992bcf0, 0xf06dbb97),
-     TOBN(0x896e6a13, 0xc417c01d), TOBN(0x8d96332c, 0xb956be01),
-     TOBN(0x902fc93a, 0x413aa2b9), TOBN(0x99a4d915, 0xfc98c8a5),
-     TOBN(0x52c29407, 0x565f1137), TOBN(0x4072690f, 0x21e4f281),
-     TOBN(0x36e607cf, 0x02ff6072), TOBN(0xa47d2ca9, 0x8ad98cdc),
-     TOBN(0xbf471d1e, 0xf5f56609), TOBN(0xbcf86623, 0xf264ada0),
-     TOBN(0xb70c0687, 0xaa9e5cb6), TOBN(0xc98124f2, 0x17401c6c),
-     TOBN(0x8189635f, 0xd4a61435), TOBN(0xd28fb8af, 0xa9d98ea6),
-     TOBN(0xb9a67c2a, 0x40c251f8), TOBN(0x88cd5d87, 0xa2da44be),
-     TOBN(0x437deb96, 0xe09b5423), TOBN(0x150467db, 0x64287dc1),
-     TOBN(0xe161debb, 0xcdabb839), TOBN(0xa79e9742, 0xf1839a3e),
-     TOBN(0xbb8dd3c2, 0x652d202b), TOBN(0x7b3e67f7, 0xe9f97d96),
-     TOBN(0x5aa5d78f, 0xb1cb6ac9), TOBN(0xffa13e8e, 0xca1d0d45),
-     TOBN(0x369295dd, 0x2ba5bf95), TOBN(0xd68bd1f8, 0x39aff05e),
-     TOBN(0xaf0d86f9, 0x26d783f2), TOBN(0x543a59b3, 0xfc3aafc1),
-     TOBN(0x3fcf81d2, 0x7b7da97c), TOBN(0xc990a056, 0xd25dee46),
-     TOBN(0x3e6775b8, 0x519cce2c), TOBN(0xfc9af71f, 0xae13d863),
-     TOBN(0x774a4a6f, 0x47c1605c), TOBN(0x46ba4245, 0x2fd205e8),
-     TOBN(0xa06feea4, 0xd3fd524d), TOBN(0x1e724641, 0x6de1acc2),
-     TOBN(0xf53816f1, 0x334e2b42), TOBN(0x49e5918e, 0x922f0024),
-     TOBN(0x439530b6, 0x65c7322d), TOBN(0xcf12cc01, 0xb3c1b3fb),
-     TOBN(0xc70b0186, 0x0172f685), TOBN(0xb915ee22, 0x1b58391d),
-     TOBN(0x9afdf03b, 0xa317db24), TOBN(0x87dec659, 0x17b8ffc4),
-     TOBN(0x7f46597b, 0xe4d3d050), TOBN(0x80a1c1ed, 0x006500e7),
-     TOBN(0x84902a96, 0x78bf030e), TOBN(0xfb5e9c9a, 0x50560148),
-     TOBN(0x6dae0a92, 0x63362426), TOBN(0xdcaeecf4, 0xa9e30c40),
-     TOBN(0xc0d887bb, 0x518d0c6b), TOBN(0x99181152, 0xcb985b9d),
-     TOBN(0xad186898, 0xef7bc381), TOBN(0x18168ffb, 0x9ee46201),
-     TOBN(0x9a04cdaa, 0x2502753c), TOBN(0xbb279e26, 0x51407c41),
-     TOBN(0xeacb03aa, 0xf23564e5), TOBN(0x18336582, 0x71e61016),
-     TOBN(0x8684b8c4, 0xeb809877), TOBN(0xb336e18d, 0xea0e672e),
-     TOBN(0xefb601f0, 0x34ee5867), TOBN(0x2733edbe, 0x1341cfd1),
-     TOBN(0xb15e809a, 0x26025c3c), TOBN(0xe6e981a6, 0x9350df88),
-     TOBN(0x92376237, 0x8502fd8e), TOBN(0x4791f216, 0x0c12be9b),
-     TOBN(0xb7256789, 0x25f02425), TOBN(0xec863194, 0x7a974443),
-     TOBN(0x7c0ce882, 0xfb41cc52), TOBN(0xc266ff7e, 0xf25c07f2),
-     TOBN(0x3d4da8c3, 0x017025f3), TOBN(0xefcf628c, 0xfb9579b4),
-     TOBN(0x5c4d0016, 0x1f3716ec), TOBN(0x9c27ebc4, 0x6801116e),
-     TOBN(0x5eba0ea1, 0x1da1767e), TOBN(0xfe151452, 0x47004c57),
-     TOBN(0x3ace6df6, 0x8c2373b7), TOBN(0x75c3dffe, 0x5dbc37ac),
-     TOBN(0x3dc32a73, 0xddc925fc), TOBN(0xb679c841, 0x2f65ee0b),
-     TOBN(0x715a3295, 0x451cbfeb), TOBN(0xd9889768, 0xf76e9a29),
-     TOBN(0xec20ce7f, 0xb28ad247), TOBN(0xe99146c4, 0x00894d79),
-     TOBN(0x71457d7c, 0x9f5e3ea7), TOBN(0x097b2662, 0x38030031),
-     TOBN(0xdb7f6ae6, 0xcf9f82a8), TOBN(0x319decb9, 0x438f473a),
-     TOBN(0xa63ab386, 0x283856c3), TOBN(0x13e3172f, 0xb06a361b),
-     TOBN(0x2959f8dc, 0x7d5a006c), TOBN(0x2dbc27c6, 0x75fba752),
-     TOBN(0xc1227ab2, 0x87c22c9e), TOBN(0x06f61f75, 0x71a268b2),
-     TOBN(0x1b6bb971, 0x04779ce2), TOBN(0xaca83812, 0x0aadcb1d),
-     TOBN(0x297ae0bc, 0xaeaab2d5), TOBN(0xa5c14ee7, 0x5bfb9f13),
-     TOBN(0xaa00c583, 0xf17a62c7), TOBN(0x39eb962c, 0x173759f6),
-     TOBN(0x1eeba1d4, 0x86c9a88f), TOBN(0x0ab6c37a, 0xdf016c5e),
-     TOBN(0xa2a147db, 0xa28a0749), TOBN(0x246c20d6, 0xee519165),
-     TOBN(0x5068d1b1, 0xd3810715), TOBN(0xb1e7018c, 0x748160b9),
-     TOBN(0x03f5b1fa, 0xf380ff62), TOBN(0xef7fb1dd, 0xf3cb2c1e),
-     TOBN(0xeab539a8, 0xfc91a7da), TOBN(0x83ddb707, 0xf3f9b561),
-     TOBN(0xc550e211, 0xfe7df7a4), TOBN(0xa7cd07f2, 0x063f6f40),
-     TOBN(0xb0de3635, 0x2976879c), TOBN(0xb5f83f85, 0xe55741da),
-     TOBN(0x4ea9d25e, 0xf3d8ac3d), TOBN(0x6fe2066f, 0x62819f02),
-     TOBN(0x4ab2b9c2, 0xcef4a564), TOBN(0x1e155d96, 0x5ffa2de3),
-     TOBN(0x0eb0a19b, 0xc3a72d00), TOBN(0x4037665b, 0x8513c31b),
-     TOBN(0x2fb2b6bf, 0x04c64637), TOBN(0x45c34d6e, 0x08cdc639),
-     TOBN(0x56f1e10f, 0xf01fd796), TOBN(0x4dfb8101, 0xfe3667b8),
-     TOBN(0xe0eda253, 0x9021d0c0), TOBN(0x7a94e9ff, 0x8a06c6ab),
-     TOBN(0x2d3bb0d9, 0xbb9aa882), TOBN(0xea20e4e5, 0xec05fd10),
-     TOBN(0xed7eeb5f, 0x1a1ca64e), TOBN(0x2fa6b43c, 0xc6327cbd),
-     TOBN(0xb577e3cf, 0x3aa91121), TOBN(0x8c6bd5ea, 0x3a34079b),
-     TOBN(0xd7e5ba39, 0x60e02fc0), TOBN(0xf16dd2c3, 0x90141bf8),
-     TOBN(0xb57276d9, 0x80101b98), TOBN(0x760883fd, 0xb82f0f66),
-     TOBN(0x89d7de75, 0x4bc3eff3), TOBN(0x03b60643, 0x5dc2ab40),
-     TOBN(0xcd6e53df, 0xe05beeac), TOBN(0xf2f1e862, 0xbc3325cd),
-     TOBN(0xdd0f7921, 0x774f03c3), TOBN(0x97ca7221, 0x4552cc1b),
-     TOBN(0x5a0d6afe, 0x1cd19f72), TOBN(0xa20915dc, 0xf183fbeb),
-     TOBN(0x9fda4b40, 0x832c403c), TOBN(0x32738edd, 0xbe425442),
-     TOBN(0x469a1df6, 0xb5eccf1a), TOBN(0x4b5aff42, 0x28bbe1f0),
-     TOBN(0x31359d7f, 0x570dfc93), TOBN(0xa18be235, 0xf0088628),
-     TOBN(0xa5b30fba, 0xb00ed3a9), TOBN(0x34c61374, 0x73cdf8be),
-     TOBN(0x2c5c5f46, 0xabc56797), TOBN(0x5cecf93d, 0xb82a8ae2),
-     TOBN(0x7d3dbe41, 0xa968fbf0), TOBN(0xd23d4583, 0x1a5c7f3d),
-     TOBN(0xf28f69a0, 0xc087a9c7), TOBN(0xc2d75471, 0x474471ca),
-     TOBN(0x36ec9f4a, 0x4eb732ec), TOBN(0x6c943bbd, 0xb1ca6bed),
-     TOBN(0xd64535e1, 0xf2457892), TOBN(0x8b84a8ea, 0xf7e2ac06),
-     TOBN(0xe0936cd3, 0x2499dd5f), TOBN(0x12053d7e, 0x0ed04e57),
-     TOBN(0x4bdd0076, 0xe4305d9d), TOBN(0x34a527b9, 0x1f67f0a2),
-     TOBN(0xe79a4af0, 0x9cec46ea), TOBN(0xb15347a1, 0x658b9bc7),
-     TOBN(0x6bd2796f, 0x35af2f75), TOBN(0xac957990, 0x4051c435),
-     TOBN(0x2669dda3, 0xc33a655d), TOBN(0x5d503c2e, 0x88514aa3),
-     TOBN(0xdfa11337, 0x3753dd41), TOBN(0x3f054673, 0x0b754f78),
-     TOBN(0xbf185677, 0x496125bd), TOBN(0xfb0023c8, 0x3775006c),
-     TOBN(0xfa0f072f, 0x3a037899), TOBN(0x4222b6eb, 0x0e4aea57),
-     TOBN(0x3dde5e76, 0x7866d25a), TOBN(0xb6eb04f8, 0x4837aa6f),
-     TOBN(0x5315591a, 0x2cf1cdb8), TOBN(0x6dfb4f41, 0x2d4e683c),
-     TOBN(0x7e923ea4, 0x48ee1f3a), TOBN(0x9604d9f7, 0x05a2afd5),
-     TOBN(0xbe1d4a33, 0x40ea4948), TOBN(0x5b45f1f4, 0xb44cbd2f),
-     TOBN(0x5faf8376, 0x4acc757e), TOBN(0xa7cf9ab8, 0x63d68ff7),
-     TOBN(0x8ad62f69, 0xdf0e404b), TOBN(0xd65f33c2, 0x12bdafdf),
-     TOBN(0xc365de15, 0xa377b14e), TOBN(0x6bf5463b, 0x8e39f60c),
-     TOBN(0x62030d2d, 0x2ce68148), TOBN(0xd95867ef, 0xe6f843a8),
-     TOBN(0xd39a0244, 0xef5ab017), TOBN(0x0bd2d8c1, 0x4ab55d12),
-     TOBN(0xc9503db3, 0x41639169), TOBN(0x2d4e25b0, 0xf7660c8a),
-     TOBN(0x760cb3b5, 0xe224c5d7), TOBN(0xfa3baf8c, 0x68616919),
-     TOBN(0x9fbca113, 0x8d142552), TOBN(0x1ab18bf1, 0x7669ebf5),
-     TOBN(0x55e6f53e, 0x9bdf25dd), TOBN(0x04cc0bf3, 0xcb6cd154),
-     TOBN(0x595bef49, 0x95e89080), TOBN(0xfe9459a8, 0x104a9ac1),
-     TOBN(0xad2d89ca, 0xcce9bb32), TOBN(0xddea65e1, 0xf7de8285),
-     TOBN(0x62ed8c35, 0xb351bd4b), TOBN(0x4150ff36, 0x0c0e19a7),
-     TOBN(0x86e3c801, 0x345f4e47), TOBN(0x3bf21f71, 0x203a266c),
-     TOBN(0x7ae110d4, 0x855b1f13), TOBN(0x5d6aaf6a, 0x07262517),
-     TOBN(0x1e0f12e1, 0x813d28f1), TOBN(0x6000e11d, 0x7ad7a523),
-     TOBN(0xc7d8deef, 0xc744a17b), TOBN(0x1e990b48, 0x14c05a00),
-     TOBN(0x68fddaee, 0x93e976d5), TOBN(0x696241d1, 0x46610d63),
-     TOBN(0xb204e7c3, 0x893dda88), TOBN(0x8bccfa65, 0x6a3a6946),
-     TOBN(0xb59425b4, 0xc5cd1411), TOBN(0x701b4042, 0xff3658b1),
-     TOBN(0xe3e56bca, 0x4784cf93), TOBN(0x27de5f15, 0x8fe68d60),
-     TOBN(0x4ab9cfce, 0xf8d53f19), TOBN(0xddb10311, 0xa40a730d),
-     TOBN(0x6fa73cd1, 0x4eee0a8a), TOBN(0xfd548748, 0x5249719d),
-     TOBN(0x49d66316, 0xa8123ef0), TOBN(0x73c32db4, 0xe7f95438),
-     TOBN(0x2e2ed209, 0x0d9e7854), TOBN(0xf98a9329, 0x9d9f0507),
-     TOBN(0xc5d33cf6, 0x0c6aa20a), TOBN(0x9a32ba14, 0x75279bb2),
-     TOBN(0x7e3202cb, 0x774a7307), TOBN(0x64ed4bc4, 0xe8c42dbd),
-     TOBN(0xc20f1a06, 0xd4caed0d), TOBN(0xb8021407, 0x171d22b3),
-     TOBN(0xd426ca04, 0xd13268d7), TOBN(0x92377007, 0x25f4d126),
-     TOBN(0x4204cbc3, 0x71f21a85), TOBN(0x18461b7a, 0xf82369ba),
-     TOBN(0xc0c07d31, 0x3fc858f9), TOBN(0x5deb5a50, 0xe2bab569),
-     TOBN(0xd5959d46, 0xd5eea89e), TOBN(0xfdff8424, 0x08437f4b),
-     TOBN(0xf21071e4, 0x3cfe254f), TOBN(0x72417696, 0x95468321),
-     TOBN(0x5d8288b9, 0x102cae3e), TOBN(0x2d143e3d, 0xf1965dff),
-     TOBN(0x00c9a376, 0xa078d847), TOBN(0x6fc0da31, 0x26028731),
-     TOBN(0xa2baeadf, 0xe45083a2), TOBN(0x66bc7218, 0x5e5b4bcd),
-     TOBN(0x2c826442, 0xd04b8e7f), TOBN(0xc19f5451, 0x6c4b586b),
-     TOBN(0x60182c49, 0x5b7eeed5), TOBN(0xd9954ecd, 0x7aa9dfa1),
-     TOBN(0xa403a8ec, 0xc73884ad), TOBN(0x7fb17de2, 0x9bb39041),
-     TOBN(0x694b64c5, 0xabb020e8), TOBN(0x3d18c184, 0x19c4eec7),
-     TOBN(0x9c4673ef, 0x1c4793e5), TOBN(0xc7b8aeb5, 0x056092e6),
-     TOBN(0x3aa1ca43, 0xf0f8c16b), TOBN(0x224ed5ec, 0xd679b2f6),
-     TOBN(0x0d56eeaf, 0x55a205c9), TOBN(0xbfe115ba, 0x4b8e028b),
-     TOBN(0x97e60849, 0x3927f4fe), TOBN(0xf91fbf94, 0x759aa7c5),
-     TOBN(0x985af769, 0x6be90a51), TOBN(0xc1277b78, 0x78ccb823),
-     TOBN(0x395b656e, 0xe7a75952), TOBN(0x00df7de0, 0x928da5f5),
-     TOBN(0x09c23175, 0x4ca4454f), TOBN(0x4ec971f4, 0x7aa2d3c1),
-     TOBN(0x45c3c507, 0xe75d9ccc), TOBN(0x63b7be8a, 0x3dc90306),
-     TOBN(0x37e09c66, 0x5db44bdc), TOBN(0x50d60da1, 0x6841c6a2),
-     TOBN(0x6f9b65ee, 0x08df1b12), TOBN(0x38734879, 0x7ff089df),
-     TOBN(0x9c331a66, 0x3fe8013d), TOBN(0x017f5de9, 0x5f42fcc8),
-     TOBN(0x43077866, 0xe8e57567), TOBN(0xc9f781ce, 0xf9fcdb18),
-     TOBN(0x38131dda, 0x9b12e174), TOBN(0x25d84aa3, 0x8a03752a),
-     TOBN(0x45e09e09, 0x4d0c0ce2), TOBN(0x1564008b, 0x92bebba5),
-     TOBN(0xf7e8ad31, 0xa87284c7), TOBN(0xb7c4b46c, 0x97e7bbaa),
-     TOBN(0x3e22a7b3, 0x97acf4ec), TOBN(0x0426c400, 0x5ea8b640),
-     TOBN(0x5e3295a6, 0x4e969285), TOBN(0x22aabc59, 0xa6a45670),
-     TOBN(0xb929714c, 0x5f5942bc), TOBN(0x9a6168bd, 0xfa3182ed),
-     TOBN(0x2216a665, 0x104152ba), TOBN(0x46908d03, 0xb6926368)}
-    ,
-    {TOBN(0xa9f5d874, 0x5a1251fb), TOBN(0x967747a8, 0xc72725c7),
-     TOBN(0x195c33e5, 0x31ffe89e), TOBN(0x609d210f, 0xe964935e),
-     TOBN(0xcafd6ca8, 0x2fe12227), TOBN(0xaf9b5b96, 0x0426469d),
-     TOBN(0x2e9ee04c, 0x5693183c), TOBN(0x1084a333, 0xc8146fef),
-     TOBN(0x96649933, 0xaed1d1f7), TOBN(0x566eaff3, 0x50563090),
-     TOBN(0x345057f0, 0xad2e39cf), TOBN(0x148ff65b, 0x1f832124),
-     TOBN(0x042e89d4, 0xcf94cf0d), TOBN(0x319bec84, 0x520c58b3),
-     TOBN(0x2a267626, 0x5361aa0d), TOBN(0xc86fa302, 0x8fbc87ad),
-     TOBN(0xfc83d2ab, 0x5c8b06d5), TOBN(0xb1a785a2, 0xfe4eac46),
-     TOBN(0xb99315bc, 0x846f7779), TOBN(0xcf31d816, 0xef9ea505),
-     TOBN(0x2391fe6a, 0x15d7dc85), TOBN(0x2f132b04, 0xb4016b33),
-     TOBN(0x29547fe3, 0x181cb4c7), TOBN(0xdb66d8a6, 0x650155a1),
-     TOBN(0x6b66d7e1, 0xadc1696f), TOBN(0x98ebe593, 0x0acd72d0),
-     TOBN(0x65f24550, 0xcc1b7435), TOBN(0xce231393, 0xb4b9a5ec),
-     TOBN(0x234a22d4, 0xdb067df9), TOBN(0x98dda095, 0xcaff9b00),
-     TOBN(0x1bbc75a0, 0x6100c9c1), TOBN(0x1560a9c8, 0x939cf695),
-     TOBN(0xcf006d3e, 0x99e0925f), TOBN(0x2dd74a96, 0x6322375a),
-     TOBN(0xc58b446a, 0xb56af5ba), TOBN(0x50292683, 0xe0b9b4f1),
-     TOBN(0xe2c34cb4, 0x1aeaffa3), TOBN(0x8b17203f, 0x9b9587c1),
-     TOBN(0x6d559207, 0xead1350c), TOBN(0x2b66a215, 0xfb7f9604),
-     TOBN(0x0850325e, 0xfe51bf74), TOBN(0x9c4f579e, 0x5e460094),
-     TOBN(0x5c87b92a, 0x76da2f25), TOBN(0x889de4e0, 0x6febef33),
-     TOBN(0x6900ec06, 0x646083ce), TOBN(0xbe2a0335, 0xbfe12773),
-     TOBN(0xadd1da35, 0xc5344110), TOBN(0x757568b7, 0xb802cd20),
-     TOBN(0x75559779, 0x00f7e6c8), TOBN(0x38e8b94f, 0x0facd2f0),
-     TOBN(0xfea1f3af, 0x03fde375), TOBN(0x5e11a1d8, 0x75881dfc),
-     TOBN(0xb3a6b02e, 0xc1e2f2ef), TOBN(0x193d2bbb, 0xc605a6c5),
-     TOBN(0x325ffeee, 0x339a0b2d), TOBN(0x27b6a724, 0x9e0c8846),
-     TOBN(0xe4050f1c, 0xf1c367ca), TOBN(0x9bc85a9b, 0xc90fbc7d),
-     TOBN(0xa373c4a2, 0xe1a11032), TOBN(0xb64232b7, 0xad0393a9),
-     TOBN(0xf5577eb0, 0x167dad29), TOBN(0x1604f301, 0x94b78ab2),
-     TOBN(0x0baa94af, 0xe829348b), TOBN(0x77fbd8dd, 0x41654342),
-     TOBN(0xdab50ea5, 0xb964e39a), TOBN(0xd4c29e3c, 0xd0d3c76e),
-     TOBN(0x80dae67c, 0x56d11964), TOBN(0x7307a8bf, 0xe5ffcc2f),
-     TOBN(0x65bbc1aa, 0x91708c3b), TOBN(0xa151e62c, 0x28bf0eeb),
-     TOBN(0x6cb53381, 0x6fa34db7), TOBN(0x5139e05c, 0xa29403a8),
-     TOBN(0x6ff651b4, 0x94a7cd2e), TOBN(0x5671ffd1, 0x0699336c),
-     TOBN(0x6f5fd2cc, 0x979a896a), TOBN(0x11e893a8, 0xd8148cef),
-     TOBN(0x988906a1, 0x65cf7b10), TOBN(0x81b67178, 0xc50d8485),
-     TOBN(0x7c0deb35, 0x8a35b3de), TOBN(0x423ac855, 0xc1d29799),
-     TOBN(0xaf580d87, 0xdac50b74), TOBN(0x28b2b89f, 0x5869734c),
-     TOBN(0x99a3b936, 0x874e28fb), TOBN(0xbb2c9190, 0x25f3f73a),
-     TOBN(0x199f6918, 0x84a9d5b7), TOBN(0x7ebe2325, 0x7e770374),
-     TOBN(0xf442e107, 0x0738efe2), TOBN(0xcf9f3f56, 0xcf9082d2),
-     TOBN(0x719f69e1, 0x09618708), TOBN(0xcc9e8364, 0xc183f9b1),
-     TOBN(0xec203a95, 0x366a21af), TOBN(0x6aec5d6d, 0x068b141f),
-     TOBN(0xee2df78a, 0x994f04e9), TOBN(0xb39ccae8, 0x271245b0),
-     TOBN(0xb875a4a9, 0x97e43f4f), TOBN(0x507dfe11, 0xdb2cea98),
-     TOBN(0x4fbf81cb, 0x489b03e9), TOBN(0xdb86ec5b, 0x6ec414fa),
-     TOBN(0xfad444f9, 0xf51b3ae5), TOBN(0xca7d33d6, 0x1914e3fe),
-     TOBN(0xa9c32f5c, 0x0ae6c4d0), TOBN(0xa9ca1d1e, 0x73969568),
-     TOBN(0x98043c31, 0x1aa7467e), TOBN(0xe832e75c, 0xe21b5ac6),
-     TOBN(0x314b7aea, 0x5232123d), TOBN(0x08307c8c, 0x65ae86db),
-     TOBN(0x06e7165c, 0xaa4668ed), TOBN(0xb170458b, 0xb4d3ec39),
-     TOBN(0x4d2e3ec6, 0xc19bb986), TOBN(0xc5f34846, 0xae0304ed),
-     TOBN(0x917695a0, 0x6c9f9722), TOBN(0x6c7f7317, 0x4cab1c0a),
-     TOBN(0x6295940e, 0x9d6d2e8b), TOBN(0xd318b8c1, 0x549f7c97),
-     TOBN(0x22453204, 0x97713885), TOBN(0x468d834b, 0xa8a440fe),
-     TOBN(0xd81fe5b2, 0xbfba796e), TOBN(0x152364db, 0x6d71f116),
-     TOBN(0xbb8c7c59, 0xb5b66e53), TOBN(0x0b12c61b, 0x2641a192),
-     TOBN(0x31f14802, 0xfcf0a7fd), TOBN(0x42fd0789, 0x5488b01e),
-     TOBN(0x71d78d6d, 0x9952b498), TOBN(0x8eb572d9, 0x07ac5201),
-     TOBN(0xe0a2a44c, 0x4d194a88), TOBN(0xd2b63fd9, 0xba017e66),
-     TOBN(0x78efc6c8, 0xf888aefc), TOBN(0xb76f6bda, 0x4a881a11),
-     TOBN(0x187f314b, 0xb46c2397), TOBN(0x004cf566, 0x5ded2819),
-     TOBN(0xa9ea5704, 0x38764d34), TOBN(0xbba45217, 0x78084709),
-     TOBN(0x06474571, 0x1171121e), TOBN(0xad7b7eb1, 0xe7c9b671),
-     TOBN(0xdacfbc40, 0x730f7507), TOBN(0x178cd8c6, 0xc7ad7bd1),
-     TOBN(0xbf0be101, 0xb2a67238), TOBN(0x3556d367, 0xaf9c14f2),
-     TOBN(0x104b7831, 0xa5662075), TOBN(0x58ca59bb, 0x79d9e60a),
-     TOBN(0x4bc45392, 0xa569a73b), TOBN(0x517a52e8, 0x5698f6c9),
-     TOBN(0x85643da5, 0xaeadd755), TOBN(0x1aed0cd5, 0x2a581b84),
-     TOBN(0xb9b4ff84, 0x80af1372), TOBN(0x244c3113, 0xf1ba5d1f),
-     TOBN(0x2a5dacbe, 0xf5f98d31), TOBN(0x2c3323e8, 0x4375bc2a),
-     TOBN(0x17a3ab4a, 0x5594b1dd), TOBN(0xa1928bfb, 0xceb4797e),
-     TOBN(0xe83af245, 0xe4886a19), TOBN(0x8979d546, 0x72b5a74a),
-     TOBN(0xa0f726bc, 0x19f9e967), TOBN(0xd9d03152, 0xe8fbbf4e),
-     TOBN(0xcfd6f51d, 0xb7707d40), TOBN(0x633084d9, 0x63f6e6e0),
-     TOBN(0xedcd9cdc, 0x55667eaf), TOBN(0x73b7f92b, 0x2e44d56f),
-     TOBN(0xfb2e39b6, 0x4e962b14), TOBN(0x7d408f6e, 0xf671fcbf),
-     TOBN(0xcc634ddc, 0x164a89bb), TOBN(0x74a42bb2, 0x3ef3bd05),
-     TOBN(0x1280dbb2, 0x428decbb), TOBN(0x6103f6bb, 0x402c8596),
-     TOBN(0xfa2bf581, 0x355a5752), TOBN(0x562f96a8, 0x00946674),
-     TOBN(0x4e4ca16d, 0x6da0223b), TOBN(0xfe47819f, 0x28d3aa25),
-     TOBN(0x9eea3075, 0xf8dfcf8a), TOBN(0xa284f0aa, 0x95669825),
-     TOBN(0xb3fca250, 0x867d3fd8), TOBN(0x20757b5f, 0x269d691e),
-     TOBN(0xf2c24020, 0x93b8a5de), TOBN(0xd3f93359, 0xebc06da6),
-     TOBN(0x1178293e, 0xb2739c33), TOBN(0xd2a3e770, 0xbcd686e5),
-     TOBN(0xa76f49f4, 0xcd941534), TOBN(0x0d37406b, 0xe3c71c0e),
-     TOBN(0x172d9397, 0x3b97f7e3), TOBN(0xec17e239, 0xbd7fd0de),
-     TOBN(0xe3290551, 0x6f496ba2), TOBN(0x6a693172, 0x36ad50e7),
-     TOBN(0xc4e539a2, 0x83e7eff5), TOBN(0x752737e7, 0x18e1b4cf),
-     TOBN(0xa2f7932c, 0x68af43ee), TOBN(0x5502468e, 0x703d00bd),
-     TOBN(0xe5dc978f, 0x2fb061f5), TOBN(0xc9a1904a, 0x28c815ad),
-     TOBN(0xd3af538d, 0x470c56a4), TOBN(0x159abc5f, 0x193d8ced),
-     TOBN(0x2a37245f, 0x20108ef3), TOBN(0xfa17081e, 0x223f7178),
-     TOBN(0x27b0fb2b, 0x10c8c0f5), TOBN(0x2102c3ea, 0x40650547),
-     TOBN(0x594564df, 0x8ac3bfa7), TOBN(0x98102033, 0x509dad96),
-     TOBN(0x6989643f, 0xf1d18a13), TOBN(0x35eebd91, 0xd7fc5af0),
-     TOBN(0x078d096a, 0xfaeaafd8), TOBN(0xb7a89341, 0xdef3de98),
-     TOBN(0x2a206e8d, 0xecf2a73a), TOBN(0x066a6397, 0x8e551994),
-     TOBN(0x3a6a088a, 0xb98d53a2), TOBN(0x0ce7c67c, 0x2d1124aa),
-     TOBN(0x48cec671, 0x759a113c), TOBN(0xe3b373d3, 0x4f6f67fa),
-     TOBN(0x5455d479, 0xfd36727b), TOBN(0xe5a428ee, 0xa13c0d81),
-     TOBN(0xb853dbc8, 0x1c86682b), TOBN(0xb78d2727, 0xb8d02b2a),
-     TOBN(0xaaf69bed, 0x8ebc329a), TOBN(0xdb6b40b3, 0x293b2148),
-     TOBN(0xe42ea77d, 0xb8c4961f), TOBN(0xb1a12f7c, 0x20e5e0ab),
-     TOBN(0xa0ec5274, 0x79e8b05e), TOBN(0x68027391, 0xfab60a80),
-     TOBN(0x6bfeea5f, 0x16b1bd5e), TOBN(0xf957e420, 0x4de30ad3),
-     TOBN(0xcbaf664e, 0x6a353b9e), TOBN(0x5c873312, 0x26d14feb),
-     TOBN(0x4e87f98c, 0xb65f57cb), TOBN(0xdb60a621, 0x5e0cdd41),
-     TOBN(0x67c16865, 0xa6881440), TOBN(0x1093ef1a, 0x46ab52aa),
-     TOBN(0xc095afb5, 0x3f4ece64), TOBN(0x6a6bb02e, 0x7604551a),
-     TOBN(0x55d44b4e, 0x0b26b8cd), TOBN(0xe5f9a999, 0xf971268a),
-     TOBN(0xc08ec425, 0x11a7de84), TOBN(0x83568095, 0xfda469dd),
-     TOBN(0x737bfba1, 0x6c6c90a2), TOBN(0x1cb9c4a0, 0xbe229831),
-     TOBN(0x93bccbba, 0xbb2eec64), TOBN(0xa0c23b64, 0xda03adbe),
-     TOBN(0x5f7aa00a, 0xe0e86ac4), TOBN(0x470b941e, 0xfc1401e6),
-     TOBN(0x5ad8d679, 0x9df43574), TOBN(0x4ccfb8a9, 0x0f65d810),
-     TOBN(0x1bce80e3, 0xaa7fbd81), TOBN(0x273291ad, 0x9508d20a),
-     TOBN(0xf5c4b46b, 0x42a92806), TOBN(0x810684ec, 0xa86ab44a),
-     TOBN(0x4591640b, 0xca0bc9f8), TOBN(0xb5efcdfc, 0x5c4b6054),
-     TOBN(0x16fc8907, 0x6e9edd12), TOBN(0xe29d0b50, 0xd4d792f9),
-     TOBN(0xa45fd01c, 0x9b03116d), TOBN(0x85035235, 0xc81765a4),
-     TOBN(0x1fe2a9b2, 0xb4b4b67c), TOBN(0xc1d10df0, 0xe8020604),
-     TOBN(0x9d64abfc, 0xbc8058d8), TOBN(0x8943b9b2, 0x712a0fbb),
-     TOBN(0x90eed914, 0x3b3def04), TOBN(0x85ab3aa2, 0x4ce775ff),
-     TOBN(0x605fd4ca, 0x7bbc9040), TOBN(0x8b34a564, 0xe2c75dfb),
-     TOBN(0x41ffc94a, 0x10358560), TOBN(0x2d8a5072, 0x9e5c28aa),
-     TOBN(0xe915a0fc, 0x4cc7eb15), TOBN(0xe9efab05, 0x8f6d0f5d),
-     TOBN(0xdbab47a9, 0xd19e9b91), TOBN(0x8cfed745, 0x0276154c),
-     TOBN(0x154357ae, 0x2cfede0d), TOBN(0x520630df, 0x19f5a4ef),
-     TOBN(0x25759f7c, 0xe382360f), TOBN(0xb6db05c9, 0x88bf5857),
-     TOBN(0x2917d61d, 0x6c58d46c), TOBN(0x14f8e491, 0xfd20cb7a),
-     TOBN(0xb68a727a, 0x11c20340), TOBN(0x0386f86f, 0xaf7ccbb6),
-     TOBN(0x5c8bc6cc, 0xfee09a20), TOBN(0x7d76ff4a, 0xbb7eea35),
-     TOBN(0xa7bdebe7, 0xdb15be7a), TOBN(0x67a08054, 0xd89f0302),
-     TOBN(0x56bf0ea9, 0xc1193364), TOBN(0xc8244467, 0x62837ebe),
-     TOBN(0x32bd8e8b, 0x20d841b8), TOBN(0x127a0548, 0xdbb8a54f),
-     TOBN(0x83dd4ca6, 0x63b20236), TOBN(0x87714718, 0x203491fa),
-     TOBN(0x4dabcaaa, 0xaa8a5288), TOBN(0x91cc0c8a, 0xaf23a1c9),
-     TOBN(0x34c72c6a, 0x3f220e0c), TOBN(0xbcc20bdf, 0x1232144a),
-     TOBN(0x6e2f42da, 0xa20ede1b), TOBN(0xc441f00c, 0x74a00515),
-     TOBN(0xbf46a5b6, 0x734b8c4b), TOBN(0x57409503, 0x7b56c9a4),
-     TOBN(0x9f735261, 0xe4585d45), TOBN(0x9231faed, 0x6734e642),
-     TOBN(0x1158a176, 0xbe70ee6c), TOBN(0x35f1068d, 0x7c3501bf),
-     TOBN(0x6beef900, 0xa2d26115), TOBN(0x649406f2, 0xef0afee3),
-     TOBN(0x3f43a60a, 0xbc2420a1), TOBN(0x509002a7, 0xd5aee4ac),
-     TOBN(0xb46836a5, 0x3ff3571b), TOBN(0x24f98b78, 0x837927c1),
-     TOBN(0x6254256a, 0x4533c716), TOBN(0xf27abb0b, 0xd07ee196),
-     TOBN(0xd7cf64fc, 0x5c6d5bfd), TOBN(0x6915c751, 0xf0cd7a77),
-     TOBN(0xd9f59012, 0x8798f534), TOBN(0x772b0da8, 0xf81d8b5f),
-     TOBN(0x1244260c, 0x2e03fa69), TOBN(0x36cf0e3a, 0x3be1a374),
-     TOBN(0x6e7c1633, 0xef06b960), TOBN(0xa71a4c55, 0x671f90f6),
-     TOBN(0x7a941251, 0x33c673db), TOBN(0xc0bea510, 0x73e8c131),
-     TOBN(0x61a8a699, 0xd4f6c734), TOBN(0x25e78c88, 0x341ed001),
-     TOBN(0x5c18acf8, 0x8e2f7d90), TOBN(0xfdbf33d7, 0x77be32cd),
-     TOBN(0x0a085cd7, 0xd2eb5ee9), TOBN(0x2d702cfb, 0xb3201115),
-     TOBN(0xb6e0ebdb, 0x85c88ce8), TOBN(0x23a3ce3c, 0x1e01d617),
-     TOBN(0x3041618e, 0x567333ac), TOBN(0x9dd0fd8f, 0x157edb6b),
-     TOBN(0x27f74702, 0xb57872b8), TOBN(0x2ef26b4f, 0x657d5fe1),
-     TOBN(0x95426f0a, 0x57cf3d40), TOBN(0x847e2ad1, 0x65a6067a),
-     TOBN(0xd474d9a0, 0x09996a74), TOBN(0x16a56acd, 0x2a26115c),
-     TOBN(0x02a615c3, 0xd16f4d43), TOBN(0xcc3fc965, 0xaadb85b7),
-     TOBN(0x386bda73, 0xce07d1b0), TOBN(0xd82910c2, 0x58ad4178),
-     TOBN(0x124f82cf, 0xcd2617f4), TOBN(0xcc2f5e8d, 0xef691770),
-     TOBN(0x82702550, 0xb8c30ccc), TOBN(0x7b856aea, 0x1a8e575a),
-     TOBN(0xbb822fef, 0xb1ab9459), TOBN(0x085928bc, 0xec24e38e),
-     TOBN(0x5d0402ec, 0xba8f4b4d), TOBN(0xc07cd4ba, 0x00b4d58b),
-     TOBN(0x5d8dffd5, 0x29227e7a), TOBN(0x61d44d0c, 0x31bf386f),
-     TOBN(0xe486dc2b, 0x135e6f4d), TOBN(0x680962eb, 0xe79410ef),
-     TOBN(0xa61bd343, 0xf10088b5), TOBN(0x6aa76076, 0xe2e28686),
-     TOBN(0x80463d11, 0x8fb98871), TOBN(0xcb26f5c3, 0xbbc76aff),
-     TOBN(0xd4ab8edd, 0xfbe03614), TOBN(0xc8eb579b, 0xc0cf2dee),
-     TOBN(0xcc004c15, 0xc93bae41), TOBN(0x46fbae5d, 0x3aeca3b2),
-     TOBN(0x671235cf, 0x0f1e9ab1), TOBN(0xadfba934, 0x9ec285c1),
-     TOBN(0x88ded013, 0xf216c980), TOBN(0xc8ac4fb8, 0xf79e0bc1),
-     TOBN(0xa29b89c6, 0xfb97a237), TOBN(0xb697b780, 0x9922d8e7),
-     TOBN(0x3142c639, 0xddb945b5), TOBN(0x447b06c7, 0xe094c3a9),
-     TOBN(0xcdcb3642, 0x72266c90), TOBN(0x633aad08, 0xa9385046),
-     TOBN(0xa36c936b, 0xb57c6477), TOBN(0x871f8b64, 0xe94dbcc6),
-     TOBN(0x28d0fb62, 0xa591a67b), TOBN(0x9d40e081, 0xc1d926f5),
-     TOBN(0x3111eaf6, 0xf2d84b5a), TOBN(0x228993f9, 0xa565b644),
-     TOBN(0x0ccbf592, 0x2c83188b), TOBN(0xf87b30ab, 0x3df3e197),
-     TOBN(0xb8658b31, 0x7642bca8), TOBN(0x1a032d7f, 0x52800f17),
-     TOBN(0x051dcae5, 0x79bf9445), TOBN(0xeba6b8ee, 0x54a2e253),
-     TOBN(0x5c8b9cad, 0xd4485692), TOBN(0x84bda40e, 0x8986e9be),
-     TOBN(0xd16d16a4, 0x2f0db448), TOBN(0x8ec80050, 0xa14d4188),
-     TOBN(0xb2b26107, 0x98fa7aaa), TOBN(0x41209ee4, 0xf073aa4e),
-     TOBN(0xf1570359, 0xf2d6b19b), TOBN(0xcbe6868c, 0xfc577caf),
-     TOBN(0x186c4bdc, 0x32c04dd3), TOBN(0xa6c35fae, 0xcfeee397),
-     TOBN(0xb4a1b312, 0xf086c0cf), TOBN(0xe0a5ccc6, 0xd9461fe2),
-     TOBN(0xc32278aa, 0x1536189f), TOBN(0x1126c55f, 0xba6df571),
-     TOBN(0x0f71a602, 0xb194560e), TOBN(0x8b2d7405, 0x324bd6e1),
-     TOBN(0x8481939e, 0x3738be71), TOBN(0xb5090b1a, 0x1a4d97a9),
-     TOBN(0x116c65a3, 0xf05ba915), TOBN(0x21863ad3, 0xaae448aa),
-     TOBN(0xd24e2679, 0xa7aae5d3), TOBN(0x7076013d, 0x0de5c1c4),
-     TOBN(0x2d50f8ba, 0xbb05b629), TOBN(0x73c1abe2, 0x6e66efbb),
-     TOBN(0xefd4b422, 0xf2488af7), TOBN(0xe4105d02, 0x663ba575),
-     TOBN(0x7eb60a8b, 0x53a69457), TOBN(0x62210008, 0xc945973b),
-     TOBN(0xfb255478, 0x77a50ec6), TOBN(0xbf0392f7, 0x0a37a72c),
-     TOBN(0xa0a7a19c, 0x4be18e7a), TOBN(0x90d8ea16, 0x25b1e0af),
-     TOBN(0x7582a293, 0xef953f57), TOBN(0x90a64d05, 0xbdc5465a),
-     TOBN(0xca79c497, 0xe2510717), TOBN(0x560dbb7c, 0x18cb641f),
-     TOBN(0x1d8e3286, 0x4b66abfb), TOBN(0xd26f52e5, 0x59030900),
-     TOBN(0x1ee3f643, 0x5584941a), TOBN(0x6d3b3730, 0x569f5958),
-     TOBN(0x9ff2a62f, 0x4789dba5), TOBN(0x91fcb815, 0x72b5c9b7),
-     TOBN(0xf446cb7d, 0x6c8f9a0e), TOBN(0x48f625c1, 0x39b7ecb5),
-     TOBN(0xbabae801, 0x1c6219b8), TOBN(0xe7a562d9, 0x28ac2f23),
-     TOBN(0xe1b48732, 0x26e20588), TOBN(0x06ee1cad, 0x775af051),
-     TOBN(0xda29ae43, 0xfaff79f7), TOBN(0xc141a412, 0x652ee9e0),
-     TOBN(0x1e127f6f, 0x195f4bd0), TOBN(0x29c6ab4f, 0x072f34f8),
-     TOBN(0x7b7c1477, 0x30448112), TOBN(0x82b51af1, 0xe4a38656),
-     TOBN(0x2bf2028a, 0x2f315010), TOBN(0xc9a4a01f, 0x6ea88cd4),
-     TOBN(0xf63e95d8, 0x257e5818), TOBN(0xdd8efa10, 0xb4519b16),
-     TOBN(0xed8973e0, 0x0da910bf), TOBN(0xed49d077, 0x5c0fe4a9),
-     TOBN(0xac3aac5e, 0xb7caee1e), TOBN(0x1033898d, 0xa7f4da57),
-     TOBN(0x42145c0e, 0x5c6669b9), TOBN(0x42daa688, 0xc1aa2aa0),
-     TOBN(0x629cc15c, 0x1a1d885a), TOBN(0x25572ec0, 0xf4b76817),
-     TOBN(0x8312e435, 0x9c8f8f28), TOBN(0x8107f8cd, 0x81965490),
-     TOBN(0x516ff3a3, 0x6fa6110c), TOBN(0x74fb1eb1, 0xfb93561f),
-     TOBN(0x6c0c9047, 0x8457522b), TOBN(0xcfd32104, 0x6bb8bdc6),
-     TOBN(0x2d6884a2, 0xcc80ad57), TOBN(0x7c27fc35, 0x86a9b637),
-     TOBN(0x3461baed, 0xadf4e8cd), TOBN(0x1d56251a, 0x617242f0),
-     TOBN(0x0b80d209, 0xc955bef4), TOBN(0xdf02cad2, 0x06adb047),
-     TOBN(0xf0d7cb91, 0x5ec74fee), TOBN(0xd2503375, 0x1111ba44),
-     TOBN(0x9671755e, 0xdf53cb36), TOBN(0x54dcb612, 0x3368551b),
-     TOBN(0x66d69aac, 0xc8a025a4), TOBN(0x6be946c6, 0xe77ef445),
-     TOBN(0x719946d1, 0xa995e094), TOBN(0x65e848f6, 0xe51e04d8),
-     TOBN(0xe62f3300, 0x6a1e3113), TOBN(0x1541c7c1, 0x501de503),
-     TOBN(0x4daac9fa, 0xf4acfade), TOBN(0x0e585897, 0x44cd0b71),
-     TOBN(0x544fd869, 0x0a51cd77), TOBN(0x60fc20ed, 0x0031016d),
-     TOBN(0x58b404ec, 0xa4276867), TOBN(0x46f6c3cc, 0x34f34993),
-     TOBN(0x477ca007, 0xc636e5bd), TOBN(0x8018f5e5, 0x7c458b47),
-     TOBN(0xa1202270, 0xe47b668f), TOBN(0xcef48ccd, 0xee14f203),
-     TOBN(0x23f98bae, 0x62ff9b4d), TOBN(0x55acc035, 0xc589eddd),
-     TOBN(0x3fe712af, 0x64db4444), TOBN(0x19e9d634, 0xbecdd480),
-     TOBN(0xe08bc047, 0xa930978a), TOBN(0x2dbf24ec, 0xa1280733),
-     TOBN(0x3c0ae38c, 0x2cd706b2), TOBN(0x5b012a5b, 0x359017b9),
-     TOBN(0x3943c38c, 0x72e0f5ae), TOBN(0x786167ea, 0x57176fa3),
-     TOBN(0xe5f9897d, 0x594881dc), TOBN(0x6b5efad8, 0xcfb820c1),
-     TOBN(0xb2179093, 0xd55018de), TOBN(0x39ad7d32, 0x0bac56ce),
-     TOBN(0xb55122e0, 0x2cfc0e81), TOBN(0x117c4661, 0xf6d89daa),
-     TOBN(0x362d01e1, 0xcb64fa09), TOBN(0x6a309b4e, 0x3e9c4ddd),
-     TOBN(0xfa979fb7, 0xabea49b1), TOBN(0xb4b1d27d, 0x10e2c6c5),
-     TOBN(0xbd61c2c4, 0x23afde7a), TOBN(0xeb6614f8, 0x9786d358),
-     TOBN(0x4a5d816b, 0x7f6f7459), TOBN(0xe431a44f, 0x09360e7b),
-     TOBN(0x8c27a032, 0xc309914c), TOBN(0xcea5d68a, 0xcaede3d8),
-     TOBN(0x3668f665, 0x3a0a3f95), TOBN(0x89369416, 0x7ceba27b),
-     TOBN(0x89981fad, 0xe4728fe9), TOBN(0x7102c8a0, 0x8a093562),
-     TOBN(0xbb80310e, 0x235d21c8), TOBN(0x505e55d1, 0xbefb7f7b),
-     TOBN(0xa0a90811, 0x12958a67), TOBN(0xd67e106a, 0x4d851fef),
-     TOBN(0xb84011a9, 0x431dd80e), TOBN(0xeb7c7cca, 0x73306cd9),
-     TOBN(0x20fadd29, 0xd1b3b730), TOBN(0x83858b5b, 0xfe37b3d3),
-     TOBN(0xbf4cd193, 0xb6251d5c), TOBN(0x1cca1fd3, 0x1352d952),
-     TOBN(0xc66157a4, 0x90fbc051), TOBN(0x7990a638, 0x89b98636),}
-    ,
-    {TOBN(0xe5aa692a, 0x87dec0e1), TOBN(0x010ded8d, 0xf7b39d00),
-     TOBN(0x7b1b80c8, 0x54cfa0b5), TOBN(0x66beb876, 0xa0f8ea28),
-     TOBN(0x50d7f531, 0x3476cd0e), TOBN(0xa63d0e65, 0xb08d3949),
-     TOBN(0x1a09eea9, 0x53479fc6), TOBN(0x82ae9891, 0xf499e742),
-     TOBN(0xab58b910, 0x5ca7d866), TOBN(0x582967e2, 0x3adb3b34),
-     TOBN(0x89ae4447, 0xcceac0bc), TOBN(0x919c667c, 0x7bf56af5),
-     TOBN(0x9aec17b1, 0x60f5dcd7), TOBN(0xec697b9f, 0xddcaadbc),
-     TOBN(0x0b98f341, 0x463467f5), TOBN(0xb187f1f7, 0xa967132f),
-     TOBN(0x90fe7a1d, 0x214aeb18), TOBN(0x1506af3c, 0x741432f7),
-     TOBN(0xbb5565f9, 0xe591a0c4), TOBN(0x10d41a77, 0xb44f1bc3),
-     TOBN(0xa09d65e4, 0xa84bde96), TOBN(0x42f060d8, 0xf20a6a1c),
-     TOBN(0x652a3bfd, 0xf27f9ce7), TOBN(0xb6bdb65c, 0x3b3d739f),
-     TOBN(0xeb5ddcb6, 0xec7fae9f), TOBN(0x995f2714, 0xefb66e5a),
-     TOBN(0xdee95d8e, 0x69445d52), TOBN(0x1b6c2d46, 0x09e27620),
-     TOBN(0x32621c31, 0x8129d716), TOBN(0xb03909f1, 0x0958c1aa),
-     TOBN(0x8c468ef9, 0x1af4af63), TOBN(0x162c429f, 0xfba5cdf6),
-     TOBN(0x2f682343, 0x753b9371), TOBN(0x29cab45a, 0x5f1f9cd7),
-     TOBN(0x571623ab, 0xb245db96), TOBN(0xc507db09, 0x3fd79999),
-     TOBN(0x4e2ef652, 0xaf036c32), TOBN(0x86f0cc78, 0x05018e5c),
-     TOBN(0xc10a73d4, 0xab8be350), TOBN(0x6519b397, 0x7e826327),
-     TOBN(0xe8cb5eef, 0x9c053df7), TOBN(0x8de25b37, 0xb300ea6f),
-     TOBN(0xdb03fa92, 0xc849cffb), TOBN(0x242e43a7, 0xe84169bb),
-     TOBN(0xe4fa51f4, 0xdd6f958e), TOBN(0x6925a77f, 0xf4445a8d),
-     TOBN(0xe6e72a50, 0xe90d8949), TOBN(0xc66648e3, 0x2b1f6390),
-     TOBN(0xb2ab1957, 0x173e460c), TOBN(0x1bbbce75, 0x30704590),
-     TOBN(0xc0a90dbd, 0xdb1c7162), TOBN(0x505e399e, 0x15cdd65d),
-     TOBN(0x68434dcb, 0x57797ab7), TOBN(0x60ad35ba, 0x6a2ca8e8),
-     TOBN(0x4bfdb1e0, 0xde3336c1), TOBN(0xbbef99eb, 0xd8b39015),
-     TOBN(0x6c3b96f3, 0x1711ebec), TOBN(0x2da40f1f, 0xce98fdc4),
-     TOBN(0xb99774d3, 0x57b4411f), TOBN(0x87c8bdf4, 0x15b65bb6),
-     TOBN(0xda3a89e3, 0xc2eef12d), TOBN(0xde95bb9b, 0x3c7471f3),
-     TOBN(0x600f225b, 0xd812c594), TOBN(0x54907c5d, 0x2b75a56b),
-     TOBN(0xa93cc5f0, 0x8db60e35), TOBN(0x743e3cd6, 0xfa833319),
-     TOBN(0x7dad5c41, 0xf81683c9), TOBN(0x70c1e7d9, 0x9c34107e),
-     TOBN(0x0edc4a39, 0xa6be0907), TOBN(0x36d47035, 0x86d0b7d3),
-     TOBN(0x8c76da03, 0x272bfa60), TOBN(0x0b4a07ea, 0x0f08a414),
-     TOBN(0x699e4d29, 0x45c1dd53), TOBN(0xcadc5898, 0x231debb5),
-     TOBN(0xdf49fcc7, 0xa77f00e0), TOBN(0x93057bbf, 0xa73e5a0e),
-     TOBN(0x2f8b7ecd, 0x027a4cd1), TOBN(0x114734b3, 0xc614011a),
-     TOBN(0xe7a01db7, 0x67677c68), TOBN(0x89d9be5e, 0x7e273f4f),
-     TOBN(0xd225cb2e, 0x089808ef), TOBN(0xf1f7a27d, 0xd59e4107),
-     TOBN(0x53afc761, 0x8211b9c9), TOBN(0x0361bc67, 0xe6819159),
-     TOBN(0x2a865d0b, 0x7f071426), TOBN(0x6a3c1810, 0xe7072567),
-     TOBN(0x3e3bca1e, 0x0d6bcabd), TOBN(0xa1b02bc1, 0x408591bc),
-     TOBN(0xe0deee59, 0x31fba239), TOBN(0xf47424d3, 0x98bd91d1),
-     TOBN(0x0f8886f4, 0x071a3c1d), TOBN(0x3f7d41e8, 0xa819233b),
-     TOBN(0x708623c2, 0xcf6eb998), TOBN(0x86bb49af, 0x609a287f),
-     TOBN(0x942bb249, 0x63c90762), TOBN(0x0ef6eea5, 0x55a9654b),
-     TOBN(0x5f6d2d72, 0x36f5defe), TOBN(0xfa9922dc, 0x56f99176),
-     TOBN(0x6c8c5ece, 0xf78ce0c7), TOBN(0x7b44589d, 0xbe09b55e),
-     TOBN(0xe11b3bca, 0x9ea83770), TOBN(0xd7fa2c7f, 0x2ab71547),
-     TOBN(0x2a3dd6fa, 0x2a1ddcc0), TOBN(0x09acb430, 0x5a7b7707),
-     TOBN(0x4add4a2e, 0x649d4e57), TOBN(0xcd53a2b0, 0x1917526e),
-     TOBN(0xc5262330, 0x20b44ac4), TOBN(0x4028746a, 0xbaa2c31d),
-     TOBN(0x51318390, 0x64291d4c), TOBN(0xbf48f151, 0xee5ad909),
-     TOBN(0xcce57f59, 0x7b185681), TOBN(0x7c3ac1b0, 0x4854d442),
-     TOBN(0x65587dc3, 0xc093c171), TOBN(0xae7acb24, 0x24f42b65),
-     TOBN(0x5a338adb, 0x955996cb), TOBN(0xc8e65675, 0x6051f91b),
-     TOBN(0x66711fba, 0x28b8d0b1), TOBN(0x15d74137, 0xb6c10a90),
-     TOBN(0x70cdd7eb, 0x3a232a80), TOBN(0xc9e2f07f, 0x6191ed24),
-     TOBN(0xa80d1db6, 0xf79588c0), TOBN(0xfa52fc69, 0xb55768cc),
-     TOBN(0x0b4df1ae, 0x7f54438a), TOBN(0x0cadd1a7, 0xf9b46a4f),
-     TOBN(0xb40ea6b3, 0x1803dd6f), TOBN(0x488e4fa5, 0x55eaae35),
-     TOBN(0x9f047d55, 0x382e4e16), TOBN(0xc9b5b7e0, 0x2f6e0c98),
-     TOBN(0x6b1bd2d3, 0x95762649), TOBN(0xa9604ee7, 0xc7aea3f6),
-     TOBN(0x3646ff27, 0x6dc6f896), TOBN(0x9bf0e7f5, 0x2860bad1),
-     TOBN(0x2d92c821, 0x7cb44b92), TOBN(0xa2f5ce63, 0xaea9c182),
-     TOBN(0xd0a2afb1, 0x9154a5fd), TOBN(0x482e474c, 0x95801da6),
-     TOBN(0xc19972d0, 0xb611c24b), TOBN(0x1d468e65, 0x60a8f351),
-     TOBN(0xeb758069, 0x7bcf6421), TOBN(0xec9dd0ee, 0x88fbc491),
-     TOBN(0x5b59d2bf, 0x956c2e32), TOBN(0x73dc6864, 0xdcddf94e),
-     TOBN(0xfd5e2321, 0xbcee7665), TOBN(0xa7b4f8ef, 0x5e9a06c4),
-     TOBN(0xfba918dd, 0x7280f855), TOBN(0xbbaac260, 0x8baec688),
-     TOBN(0xa3b3f00f, 0x33400f42), TOBN(0x3d2dba29, 0x66f2e6e4),
-     TOBN(0xb6f71a94, 0x98509375), TOBN(0x8f33031f, 0xcea423cc),
-     TOBN(0x009b8dd0, 0x4807e6fb), TOBN(0x5163cfe5, 0x5cdb954c),
-     TOBN(0x03cc8f17, 0xcf41c6e8), TOBN(0xf1f03c2a, 0x037b925c),
-     TOBN(0xc39c19cc, 0x66d2427c), TOBN(0x823d24ba, 0x7b6c18e4),
-     TOBN(0x32ef9013, 0x901f0b4f), TOBN(0x684360f1, 0xf8941c2e),
-     TOBN(0x0ebaff52, 0x2c28092e), TOBN(0x7891e4e3, 0x256c932f),
-     TOBN(0x51264319, 0xac445e3d), TOBN(0x553432e7, 0x8ea74381),
-     TOBN(0xe6eeaa69, 0x67e9c50a), TOBN(0x27ced284, 0x62e628c7),
-     TOBN(0x3f96d375, 0x7a4afa57), TOBN(0xde0a14c3, 0xe484c150),
-     TOBN(0x364a24eb, 0x38bd9923), TOBN(0x1df18da0, 0xe5177422),
-     TOBN(0x174e8f82, 0xd8d38a9b), TOBN(0x2e97c600, 0xe7de1391),
-     TOBN(0xc5709850, 0xa1c175dd), TOBN(0x969041a0, 0x32ae5035),
-     TOBN(0xcbfd533b, 0x76a2086b), TOBN(0xd6bba71b, 0xd7c2e8fe),
-     TOBN(0xb2d58ee6, 0x099dfb67), TOBN(0x3a8b342d, 0x064a85d9),
-     TOBN(0x3bc07649, 0x522f9be3), TOBN(0x690c075b, 0xdf1f49a8),
-     TOBN(0x80e1aee8, 0x3854ec42), TOBN(0x2a7dbf44, 0x17689dc7),
-     TOBN(0xc004fc0e, 0x3faf4078), TOBN(0xb2f02e9e, 0xdf11862c),
-     TOBN(0xf10a5e0f, 0xa0a1b7b3), TOBN(0x30aca623, 0x8936ec80),
-     TOBN(0xf83cbf05, 0x02f40d9a), TOBN(0x4681c468, 0x2c318a4d),
-     TOBN(0x98575618, 0x0e9c2674), TOBN(0xbe79d046, 0x1847092e),
-     TOBN(0xaf1e480a, 0x78bd01e0), TOBN(0x6dd359e4, 0x72a51db9),
-     TOBN(0x62ce3821, 0xe3afbab6), TOBN(0xc5cee5b6, 0x17733199),
-     TOBN(0xe08b30d4, 0x6ffd9fbb), TOBN(0x6e5bc699, 0x36c610b7),
-     TOBN(0xf343cff2, 0x9ce262cf), TOBN(0xca2e4e35, 0x68b914c1),
-     TOBN(0x011d64c0, 0x16de36c5), TOBN(0xe0b10fdd, 0x42e2b829),
-     TOBN(0x78942981, 0x6685aaf8), TOBN(0xe7511708, 0x230ede97),
-     TOBN(0x671ed8fc, 0x3b922bf8), TOBN(0xe4d8c0a0, 0x4c29b133),
-     TOBN(0x87eb1239, 0x3b6e99c4), TOBN(0xaff3974c, 0x8793beba),
-     TOBN(0x03749405, 0x2c18df9b), TOBN(0xc5c3a293, 0x91007139),
-     TOBN(0x6a77234f, 0xe37a0b95), TOBN(0x02c29a21, 0xb661c96b),
-     TOBN(0xc3aaf1d6, 0x141ecf61), TOBN(0x9195509e, 0x3bb22f53),
-     TOBN(0x29597404, 0x22d51357), TOBN(0x1b083822, 0x537bed60),
-     TOBN(0xcd7d6e35, 0xe07289f0), TOBN(0x1f94c48c, 0x6dd86eff),
-     TOBN(0xc8bb1f82, 0xeb0f9cfa), TOBN(0x9ee0b7e6, 0x1b2eb97d),
-     TOBN(0x5a52fe2e, 0x34d74e31), TOBN(0xa352c310, 0x3bf79ab6),
-     TOBN(0x97ff6c5a, 0xabfeeb8f), TOBN(0xbfbe8fef, 0xf5c97305),
-     TOBN(0xd6081ce6, 0xa7904608), TOBN(0x1f812f3a, 0xc4fca249),
-     TOBN(0x9b24bc9a, 0xb9e5e200), TOBN(0x91022c67, 0x38012ee8),
-     TOBN(0xe83d9c5d, 0x30a713a1), TOBN(0x4876e3f0, 0x84ef0f93),
-     TOBN(0xc9777029, 0xc1fbf928), TOBN(0xef7a6bb3, 0xbce7d2a4),
-     TOBN(0xb8067228, 0xdfa2a659), TOBN(0xd5cd3398, 0xd877a48f),
-     TOBN(0xbea4fd8f, 0x025d0f3f), TOBN(0xd67d2e35, 0x2eae7c2b),
-     TOBN(0x184de7d7, 0xcc5f4394), TOBN(0xb5551b5c, 0x4536e142),
-     TOBN(0x2e89b212, 0xd34aa60a), TOBN(0x14a96fea, 0xf50051d5),
-     TOBN(0x4e21ef74, 0x0d12bb0b), TOBN(0xc522f020, 0x60b9677e),
-     TOBN(0x8b12e467, 0x2df7731d), TOBN(0x39f80382, 0x7b326d31),
-     TOBN(0xdfb8630c, 0x39024a94), TOBN(0xaacb96a8, 0x97319452),
-     TOBN(0xd68a3961, 0xeda3867c), TOBN(0x0c58e2b0, 0x77c4ffca),
-     TOBN(0x3d545d63, 0x4da919fa), TOBN(0xef79b69a, 0xf15e2289),
-     TOBN(0x54bc3d3d, 0x808bab10), TOBN(0xc8ab3007, 0x45f82c37),
-     TOBN(0xc12738b6, 0x7c4a658a), TOBN(0xb3c47639, 0x40e72182),
-     TOBN(0x3b77be46, 0x8798e44f), TOBN(0xdc047df2, 0x17a7f85f),
-     TOBN(0x2439d4c5, 0x5e59d92d), TOBN(0xcedca475, 0xe8e64d8d),
-     TOBN(0xa724cd0d, 0x87ca9b16), TOBN(0x35e4fd59, 0xa5540dfe),
-     TOBN(0xf8c1ff18, 0xe4bcf6b1), TOBN(0x856d6285, 0x295018fa),
-     TOBN(0x433f665c, 0x3263c949), TOBN(0xa6a76dd6, 0xa1f21409),
-     TOBN(0x17d32334, 0xcc7b4f79), TOBN(0xa1d03122, 0x06720e4a),
-     TOBN(0xadb6661d, 0x81d9bed5), TOBN(0xf0d6fb02, 0x11db15d1),
-     TOBN(0x7fd11ad5, 0x1fb747d2), TOBN(0xab50f959, 0x3033762b),
-     TOBN(0x2a7e711b, 0xfbefaf5a), TOBN(0xc7393278, 0x3fef2bbf),
-     TOBN(0xe29fa244, 0x0df6f9be), TOBN(0x9092757b, 0x71efd215),
-     TOBN(0xee60e311, 0x4f3d6fd9), TOBN(0x338542d4, 0x0acfb78b),
-     TOBN(0x44a23f08, 0x38961a0f), TOBN(0x1426eade, 0x986987ca),
-     TOBN(0x36e6ee2e, 0x4a863cc6), TOBN(0x48059420, 0x628b8b79),
-     TOBN(0x30303ad8, 0x7396e1de), TOBN(0x5c8bdc48, 0x38c5aad1),
-     TOBN(0x3e40e11f, 0x5c8f5066), TOBN(0xabd6e768, 0x8d246bbd),
-     TOBN(0x68aa40bb, 0x23330a01), TOBN(0xd23f5ee4, 0xc34eafa0),
-     TOBN(0x3bbee315, 0x5de02c21), TOBN(0x18dd4397, 0xd1d8dd06),
-     TOBN(0x3ba1939a, 0x122d7b44), TOBN(0xe6d3b40a, 0xa33870d6),
-     TOBN(0x8e620f70, 0x1c4fe3f8), TOBN(0xf6bba1a5, 0xd3a50cbf),
-     TOBN(0x4a78bde5, 0xcfc0aee0), TOBN(0x847edc46, 0xc08c50bd),
-     TOBN(0xbaa2439c, 0xad63c9b2), TOBN(0xceb4a728, 0x10fc2acb),
-     TOBN(0xa419e40e, 0x26da033d), TOBN(0x6cc3889d, 0x03e02683),
-     TOBN(0x1cd28559, 0xfdccf725), TOBN(0x0fd7e0f1, 0x8d13d208),
-     TOBN(0x01b9733b, 0x1f0df9d4), TOBN(0x8cc2c5f3, 0xa2b5e4f3),
-     TOBN(0x43053bfa, 0x3a304fd4), TOBN(0x8e87665c, 0x0a9f1aa7),
-     TOBN(0x087f29ec, 0xd73dc965), TOBN(0x15ace455, 0x3e9023db),
-     TOBN(0x2370e309, 0x2bce28b4), TOBN(0xf9723442, 0xb6b1e84a),
-     TOBN(0xbeee662e, 0xb72d9f26), TOBN(0xb19396de, 0xf0e47109),
-     TOBN(0x85b1fa73, 0xe13289d0), TOBN(0x436cf77e, 0x54e58e32),
-     TOBN(0x0ec833b3, 0xe990ef77), TOBN(0x7373e3ed, 0x1b11fc25),
-     TOBN(0xbe0eda87, 0x0fc332ce), TOBN(0xced04970, 0x8d7ea856),
-     TOBN(0xf85ff785, 0x7e977ca0), TOBN(0xb66ee8da, 0xdfdd5d2b),
-     TOBN(0xf5e37950, 0x905af461), TOBN(0x587b9090, 0x966d487c),
-     TOBN(0x6a198a1b, 0x32ba0127), TOBN(0xa7720e07, 0x141615ac),
-     TOBN(0xa23f3499, 0x996ef2f2), TOBN(0xef5f64b4, 0x470bcb3d),
-     TOBN(0xa526a962, 0x92b8c559), TOBN(0x0c14aac0, 0x69740a0f),
-     TOBN(0x0d41a9e3, 0xa6bdc0a5), TOBN(0x97d52106, 0x9c48aef4),
-     TOBN(0xcf16bd30, 0x3e7c253b), TOBN(0xcc834b1a, 0x47fdedc1),
-     TOBN(0x7362c6e5, 0x373aab2e), TOBN(0x264ed85e, 0xc5f590ff),
-     TOBN(0x7a46d9c0, 0x66d41870), TOBN(0xa50c20b1, 0x4787ba09),
-     TOBN(0x185e7e51, 0xe3d44635), TOBN(0xb3b3e080, 0x31e2d8dc),
-     TOBN(0xbed1e558, 0xa179e9d9), TOBN(0x2daa3f79, 0x74a76781),
-     TOBN(0x4372baf2, 0x3a40864f), TOBN(0x46900c54, 0x4fe75cb5),
-     TOBN(0xb95f171e, 0xf76765d0), TOBN(0x4ad726d2, 0x95c87502),
-     TOBN(0x2ec769da, 0x4d7c99bd), TOBN(0x5e2ddd19, 0xc36cdfa8),
-     TOBN(0xc22117fc, 0xa93e6dea), TOBN(0xe8a2583b, 0x93771123),
-     TOBN(0xbe2f6089, 0xfa08a3a2), TOBN(0x4809d5ed, 0x8f0e1112),
-     TOBN(0x3b414aa3, 0xda7a095e), TOBN(0x9049acf1, 0x26f5aadd),
-     TOBN(0x78d46a4d, 0x6be8b84a), TOBN(0xd66b1963, 0xb732b9b3),
-     TOBN(0x5c2ac2a0, 0xde6e9555), TOBN(0xcf52d098, 0xb5bd8770),
-     TOBN(0x15a15fa6, 0x0fd28921), TOBN(0x56ccb81e, 0x8b27536d),
-     TOBN(0x0f0d8ab8, 0x9f4ccbb8), TOBN(0xed5f44d2, 0xdb221729),
-     TOBN(0x43141988, 0x00bed10c), TOBN(0xc94348a4, 0x1d735b8b),
-     TOBN(0x79f3e9c4, 0x29ef8479), TOBN(0x4c13a4e3, 0x614c693f),
-     TOBN(0x32c9af56, 0x8e143a14), TOBN(0xbc517799, 0xe29ac5c4),
-     TOBN(0x05e17992, 0x2774856f), TOBN(0x6e52fb05, 0x6c1bf55f),
-     TOBN(0xaeda4225, 0xe4f19e16), TOBN(0x70f4728a, 0xaf5ccb26),
-     TOBN(0x5d2118d1, 0xb2947f22), TOBN(0xc827ea16, 0x281d6fb9),
-     TOBN(0x8412328d, 0x8cf0eabd), TOBN(0x45ee9fb2, 0x03ef9dcf),
-     TOBN(0x8e700421, 0xbb937d63), TOBN(0xdf8ff2d5, 0xcc4b37a6),
-     TOBN(0xa4c0d5b2, 0x5ced7b68), TOBN(0x6537c1ef, 0xc7308f59),
-     TOBN(0x25ce6a26, 0x3b37f8e8), TOBN(0x170e9a9b, 0xdeebc6ce),
-     TOBN(0xdd037952, 0x8728d72c), TOBN(0x445b0e55, 0x850154bc),
-     TOBN(0x4b7d0e06, 0x83a7337b), TOBN(0x1e3416d4, 0xffecf249),
-     TOBN(0x24840eff, 0x66a2b71f), TOBN(0xd0d9a50a, 0xb37cc26d),
-     TOBN(0xe2198150, 0x6fe28ef7), TOBN(0x3cc5ef16, 0x23324c7f),
-     TOBN(0x220f3455, 0x769b5263), TOBN(0xe2ade2f1, 0xa10bf475),
-     TOBN(0x28cd20fa, 0x458d3671), TOBN(0x1549722c, 0x2dc4847b),
-     TOBN(0x6dd01e55, 0x591941e3), TOBN(0x0e6fbcea, 0x27128ccb),
-     TOBN(0xae1a1e6b, 0x3bef0262), TOBN(0xfa8c472c, 0x8f54e103),
-     TOBN(0x7539c0a8, 0x72c052ec), TOBN(0xd7b27369, 0x5a3490e9),
-     TOBN(0x143fe1f1, 0x71684349), TOBN(0x36b4722e, 0x32e19b97),
-     TOBN(0xdc059227, 0x90980aff), TOBN(0x175c9c88, 0x9e13d674),
-     TOBN(0xa7de5b22, 0x6e6bfdb1), TOBN(0x5ea5b7b2, 0xbedb4b46),
-     TOBN(0xd5570191, 0xd34a6e44), TOBN(0xfcf60d2e, 0xa24ff7e6),
-     TOBN(0x614a392d, 0x677819e1), TOBN(0x7be74c7e, 0xaa5a29e8),
-     TOBN(0xab50fece, 0x63c85f3f), TOBN(0xaca2e2a9, 0x46cab337),
-     TOBN(0x7f700388, 0x122a6fe3), TOBN(0xdb69f703, 0x882a04a8),
-     TOBN(0x9a77935d, 0xcf7aed57), TOBN(0xdf16207c, 0x8d91c86f),
-     TOBN(0x2fca49ab, 0x63ed9998), TOBN(0xa3125c44, 0xa77ddf96),
-     TOBN(0x05dd8a86, 0x24344072), TOBN(0xa023dda2, 0xfec3fb56),
-     TOBN(0x421b41fc, 0x0c743032), TOBN(0x4f2120c1, 0x5e438639),
-     TOBN(0xfb7cae51, 0xc83c1b07), TOBN(0xb2370caa, 0xcac2171a),
-     TOBN(0x2eb2d962, 0x6cc820fb), TOBN(0x59feee5c, 0xb85a44bf),
-     TOBN(0x94620fca, 0x5b6598f0), TOBN(0x6b922cae, 0x7e314051),
-     TOBN(0xff8745ad, 0x106bed4e), TOBN(0x546e71f5, 0xdfa1e9ab),
-     TOBN(0x935c1e48, 0x1ec29487), TOBN(0x9509216c, 0x4d936530),
-     TOBN(0xc7ca3067, 0x85c9a2db), TOBN(0xd6ae5152, 0x6be8606f),
-     TOBN(0x09dbcae6, 0xe14c651d), TOBN(0xc9536e23, 0x9bc32f96),
-     TOBN(0xa90535a9, 0x34521b03), TOBN(0xf39c526c, 0x878756ff),
-     TOBN(0x383172ec, 0x8aedf03c), TOBN(0x20a8075e, 0xefe0c034),
-     TOBN(0xf22f9c62, 0x64026422), TOBN(0x8dd10780, 0x24b9d076),
-     TOBN(0x944c742a, 0x3bef2950), TOBN(0x55b9502e, 0x88a2b00b),
-     TOBN(0xa59e14b4, 0x86a09817), TOBN(0xa39dd3ac, 0x47bb4071),
-     TOBN(0x55137f66, 0x3be0592f), TOBN(0x07fcafd4, 0xc9e63f5b),
-     TOBN(0x963652ee, 0x346eb226), TOBN(0x7dfab085, 0xec2facb7),
-     TOBN(0x273bf2b8, 0x691add26), TOBN(0x30d74540, 0xf2b46c44),
-     TOBN(0x05e8e73e, 0xf2c2d065), TOBN(0xff9b8a00, 0xd42eeac9),
-     TOBN(0x2fcbd205, 0x97209d22), TOBN(0xeb740ffa, 0xde14ea2c),
-     TOBN(0xc71ff913, 0xa8aef518), TOBN(0x7bfc74bb, 0xfff4cfa2),
-     TOBN(0x1716680c, 0xb6b36048), TOBN(0x121b2cce, 0x9ef79af1),
-     TOBN(0xbff3c836, 0xa01eb3d3), TOBN(0x50eb1c6a, 0x5f79077b),
-     TOBN(0xa48c32d6, 0xa004bbcf), TOBN(0x47a59316, 0x7d64f61d),
-     TOBN(0x6068147f, 0x93102016), TOBN(0x12c5f654, 0x94d12576),
-     TOBN(0xefb071a7, 0xc9bc6b91), TOBN(0x7c2da0c5, 0x6e23ea95),
-     TOBN(0xf4fd45b6, 0xd4a1dd5d), TOBN(0x3e7ad9b6, 0x9122b13c),
-     TOBN(0x342ca118, 0xe6f57a48), TOBN(0x1c2e94a7, 0x06f8288f),
-     TOBN(0x99e68f07, 0x5a97d231), TOBN(0x7c80de97, 0x4d838758),
-     TOBN(0xbce0f5d0, 0x05872727), TOBN(0xbe5d95c2, 0x19c4d016),
-     TOBN(0x921d5cb1, 0x9c2492ee), TOBN(0x42192dc1, 0x404d6fb3),
-     TOBN(0x4c84dcd1, 0x32f988d3), TOBN(0xde26d61f, 0xa17b8e85),
-     TOBN(0xc466dcb6, 0x137c7408), TOBN(0x9a38d7b6, 0x36a266da),
-     TOBN(0x7ef5cb06, 0x83bebf1b), TOBN(0xe5cdcbbf, 0x0fd014e3),
-     TOBN(0x30aa376d, 0xf65965a0), TOBN(0x60fe88c2, 0xebb3e95e),
-     TOBN(0x33fd0b61, 0x66ee6f20), TOBN(0x8827dcdb, 0x3f41f0a0),
-     TOBN(0xbf8a9d24, 0x0c56c690), TOBN(0x40265dad, 0xddb7641d),
-     TOBN(0x522b05bf, 0x3a6b662b), TOBN(0x466d1dfe, 0xb1478c9b),
-     TOBN(0xaa616962, 0x1484469b), TOBN(0x0db60549, 0x02df8f9f),
-     TOBN(0xc37bca02, 0x3cb8bf51), TOBN(0x5effe346, 0x21371ce8),
-     TOBN(0xe8f65264, 0xff112c32), TOBN(0x8a9c736d, 0x7b971fb2),
-     TOBN(0xa4f19470, 0x7b75080d), TOBN(0xfc3f2c5a, 0x8839c59b),
-     TOBN(0x1d6c777e, 0x5aeb49c2), TOBN(0xf3db034d, 0xda1addfe),
-     TOBN(0xd76fee5a, 0x5535affc), TOBN(0x0853ac70, 0xb92251fd),
-     TOBN(0x37e3d594, 0x8b2a29d5), TOBN(0x28f1f457, 0x4de00ddb),
-     TOBN(0x8083c1b5, 0xf42c328b), TOBN(0xd8ef1d8f, 0xe493c73b),
-     TOBN(0x96fb6260, 0x41dc61bd), TOBN(0xf74e8a9d, 0x27ee2f8a),
-     TOBN(0x7c605a80, 0x2c946a5d), TOBN(0xeed48d65, 0x3839ccfd),
-     TOBN(0x9894344f, 0x3a29467a), TOBN(0xde81e949, 0xc51eba6d),
-     TOBN(0xdaea066b, 0xa5e5c2f2), TOBN(0x3fc8a614, 0x08c8c7b3),
-     TOBN(0x7adff88f, 0x06d0de9f), TOBN(0xbbc11cf5, 0x3b75ce0a),
-     TOBN(0x9fbb7acc, 0xfbbc87d5), TOBN(0xa1458e26, 0x7badfde2)}
-    ,
-    {TOBN(0x1cb43668, 0xe039c256), TOBN(0x5f26fb8b, 0x7c17fd5d),
-     TOBN(0xeee426af, 0x79aa062b), TOBN(0x072002d0, 0xd78fbf04),
-     TOBN(0x4c9ca237, 0xe84fb7e3), TOBN(0xb401d8a1, 0x0c82133d),
-     TOBN(0xaaa52592, 0x6d7e4181), TOBN(0xe9430833, 0x73dbb152),
-     TOBN(0xf92dda31, 0xbe24319a), TOBN(0x03f7d28b, 0xe095a8e7),
-     TOBN(0xa52fe840, 0x98782185), TOBN(0x276ddafe, 0x29c24dbc),
-     TOBN(0x80cd5496, 0x1d7a64eb), TOBN(0xe4360889, 0x7f1dbe42),
-     TOBN(0x2f81a877, 0x8438d2d5), TOBN(0x7e4d52a8, 0x85169036),
-     TOBN(0x19e3d5b1, 0x1d59715d), TOBN(0xc7eaa762, 0xd788983e),
-     TOBN(0xe5a730b0, 0xabf1f248), TOBN(0xfbab8084, 0xfae3fd83),
-     TOBN(0x65e50d21, 0x53765b2f), TOBN(0xbdd4e083, 0xfa127f3d),
-     TOBN(0x9cf3c074, 0x397b1b10), TOBN(0x59f8090c, 0xb1b59fd3),
-     TOBN(0x7b15fd9d, 0x615faa8f), TOBN(0x8fa1eb40, 0x968554ed),
-     TOBN(0x7bb4447e, 0x7aa44882), TOBN(0x2bb2d0d1, 0x029fff32),
-     TOBN(0x075e2a64, 0x6caa6d2f), TOBN(0x8eb879de, 0x22e7351b),
-     TOBN(0xbcd5624e, 0x9a506c62), TOBN(0x218eaef0, 0xa87e24dc),
-     TOBN(0x37e56847, 0x44ddfa35), TOBN(0x9ccfc5c5, 0xdab3f747),
-     TOBN(0x9ac1df3f, 0x1ee96cf4), TOBN(0x0c0571a1, 0x3b480b8f),
-     TOBN(0x2fbeb3d5, 0x4b3a7b3c), TOBN(0x35c03669, 0x5dcdbb99),
-     TOBN(0x52a0f5dc, 0xb2415b3a), TOBN(0xd57759b4, 0x4413ed9a),
-     TOBN(0x1fe647d8, 0x3d30a2c5), TOBN(0x0857f77e, 0xf78a81dc),
-     TOBN(0x11d5a334, 0x131a4a9b), TOBN(0xc0a94af9, 0x29d393f5),
-     TOBN(0xbc3a5c0b, 0xdaa6ec1a), TOBN(0xba9fe493, 0x88d2d7ed),
-     TOBN(0xbb4335b4, 0xbb614797), TOBN(0x991c4d68, 0x72f83533),
-     TOBN(0x53258c28, 0xd2f01cb3), TOBN(0x93d6eaa3, 0xd75db0b1),
-     TOBN(0x419a2b0d, 0xe87d0db4), TOBN(0xa1e48f03, 0xd8fe8493),
-     TOBN(0xf747faf6, 0xc508b23a), TOBN(0xf137571a, 0x35d53549),
-     TOBN(0x9f5e58e2, 0xfcf9b838), TOBN(0xc7186cee, 0xa7fd3cf5),
-     TOBN(0x77b868ce, 0xe978a1d3), TOBN(0xe3a68b33, 0x7ab92d04),
-     TOBN(0x51029794, 0x87a5b862), TOBN(0x5f0606c3, 0x3a61d41d),
-     TOBN(0x2814be27, 0x6f9326f1), TOBN(0x2f521c14, 0xc6fe3c2e),
-     TOBN(0x17464d7d, 0xacdf7351), TOBN(0x10f5f9d3, 0x777f7e44),
-     TOBN(0xce8e616b, 0x269fb37d), TOBN(0xaaf73804, 0x7de62de5),
-     TOBN(0xaba11175, 0x4fdd4153), TOBN(0x515759ba, 0x3770b49b),
-     TOBN(0x8b09ebf8, 0xaa423a61), TOBN(0x592245a1, 0xcd41fb92),
-     TOBN(0x1cba8ec1, 0x9b4c8936), TOBN(0xa87e91e3, 0xaf36710e),
-     TOBN(0x1fd84ce4, 0x3d34a2e3), TOBN(0xee3759ce, 0xb43b5d61),
-     TOBN(0x895bc78c, 0x619186c7), TOBN(0xf19c3809, 0xcbb9725a),
-     TOBN(0xc0be21aa, 0xde744b1f), TOBN(0xa7d222b0, 0x60f8056b),
-     TOBN(0x74be6157, 0xb23efe11), TOBN(0x6fab2b4f, 0x0cd68253),
-     TOBN(0xad33ea5f, 0x4bf1d725), TOBN(0x9c1d8ee2, 0x4f6c950f),
-     TOBN(0x544ee78a, 0xa377af06), TOBN(0x54f489bb, 0x94a113e1),
-     TOBN(0x8f11d634, 0x992fb7e8), TOBN(0x0169a7aa, 0xa2a44347),
-     TOBN(0x1d49d4af, 0x95020e00), TOBN(0x95945722, 0xe08e120b),
-     TOBN(0xb6e33878, 0xa4d32282), TOBN(0xe36e029d, 0x48020ae7),
-     TOBN(0xe05847fb, 0x37a9b750), TOBN(0xf876812c, 0xb29e3819),
-     TOBN(0x84ad138e, 0xd23a17f0), TOBN(0x6d7b4480, 0xf0b3950e),
-     TOBN(0xdfa8aef4, 0x2fd67ae0), TOBN(0x8d3eea24, 0x52333af6),
-     TOBN(0x0d052075, 0xb15d5acc), TOBN(0xc6d9c79f, 0xbd815bc4),
-     TOBN(0x8dcafd88, 0xdfa36cf2), TOBN(0x908ccbe2, 0x38aa9070),
-     TOBN(0x638722c4, 0xba35afce), TOBN(0x5a3da8b0, 0xfd6abf0b),
-     TOBN(0x2dce252c, 0xc9c335c1), TOBN(0x84e7f0de, 0x65aa799b),
-     TOBN(0x2101a522, 0xb99a72cb), TOBN(0x06de6e67, 0x87618016),
-     TOBN(0x5ff8c7cd, 0xe6f3653e), TOBN(0x0a821ab5, 0xc7a6754a),
-     TOBN(0x7e3fa52b, 0x7cb0b5a2), TOBN(0xa7fb121c, 0xc9048790),
-     TOBN(0x1a725020, 0x06ce053a), TOBN(0xb490a31f, 0x04e929b0),
-     TOBN(0xe17be47d, 0x62dd61ad), TOBN(0x781a961c, 0x6be01371),
-     TOBN(0x1063bfd3, 0xdae3cbba), TOBN(0x35647406, 0x7f73c9ba),
-     TOBN(0xf50e957b, 0x2736a129), TOBN(0xa6313702, 0xed13f256),
-     TOBN(0x9436ee65, 0x3a19fcc5), TOBN(0xcf2bdb29, 0xe7a4c8b6),
-     TOBN(0xb06b1244, 0xc5f95cd8), TOBN(0xda8c8af0, 0xf4ab95f4),
-     TOBN(0x1bae59c2, 0xb9e5836d), TOBN(0x07d51e7e, 0x3acffffc),
-     TOBN(0x01e15e6a, 0xc2ccbcda), TOBN(0x3bc1923f, 0x8528c3e0),
-     TOBN(0x43324577, 0xa49fead4), TOBN(0x61a1b884, 0x2aa7a711),
-     TOBN(0xf9a86e08, 0x700230ef), TOBN(0x0af585a1, 0xbd19adf8),
-     TOBN(0x7645f361, 0xf55ad8f2), TOBN(0x6e676223, 0x46c3614c),
-     TOBN(0x23cb257c, 0x4e774d3f), TOBN(0x82a38513, 0xac102d1b),
-     TOBN(0x9bcddd88, 0x7b126aa5), TOBN(0xe716998b, 0xeefd3ee4),
-     TOBN(0x4239d571, 0xfb167583), TOBN(0xdd011c78, 0xd16c8f8a),
-     TOBN(0x271c2895, 0x69a27519), TOBN(0x9ce0a3b7, 0xd2d64b6a),
-     TOBN(0x8c977289, 0xd5ec6738), TOBN(0xa3b49f9a, 0x8840ef6b),
-     TOBN(0x808c14c9, 0x9a453419), TOBN(0x5c00295b, 0x0cf0a2d5),
-     TOBN(0x524414fb, 0x1d4bcc76), TOBN(0xb07691d2, 0x459a88f1),
-     TOBN(0x77f43263, 0xf70d110f), TOBN(0x64ada5e0, 0xb7abf9f3),
-     TOBN(0xafd0f94e, 0x5b544cf5), TOBN(0xb4a13a15, 0xfd2713fe),
-     TOBN(0xb99b7d6e, 0x250c74f4), TOBN(0x097f2f73, 0x20324e45),
-     TOBN(0x994b37d8, 0xaffa8208), TOBN(0xc3c31b0b, 0xdc29aafc),
-     TOBN(0x3da74651, 0x7a3a607f), TOBN(0xd8e1b8c1, 0xfe6955d6),
-     TOBN(0x716e1815, 0xc8418682), TOBN(0x541d487f, 0x7dc91d97),
-     TOBN(0x48a04669, 0xc6996982), TOBN(0xf39cab15, 0x83a6502e),
-     TOBN(0x025801a0, 0xe68db055), TOBN(0xf3569758, 0xba3338d5),
-     TOBN(0xb0c8c0aa, 0xee2afa84), TOBN(0x4f6985d3, 0xfb6562d1),
-     TOBN(0x351f1f15, 0x132ed17a), TOBN(0x510ed0b4, 0xc04365fe),
-     TOBN(0xa3f98138, 0xe5b1f066), TOBN(0xbc9d95d6, 0x32df03dc),
-     TOBN(0xa83ccf6e, 0x19abd09e), TOBN(0x0b4097c1, 0x4ff17edb),
-     TOBN(0x58a5c478, 0xd64a06ce), TOBN(0x2ddcc3fd, 0x544a58fd),
-     TOBN(0xd449503d, 0x9e8153b8), TOBN(0x3324fd02, 0x7774179b),
-     TOBN(0xaf5d47c8, 0xdbd9120c), TOBN(0xeb860162, 0x34fa94db),
-     TOBN(0x5817bdd1, 0x972f07f4), TOBN(0xe5579e2e, 0xd27bbceb),
-     TOBN(0x86847a1f, 0x5f11e5a6), TOBN(0xb39ed255, 0x7c3cf048),
-     TOBN(0xe1076417, 0xa2f62e55), TOBN(0x6b9ab38f, 0x1bcf82a2),
-     TOBN(0x4bb7c319, 0x7aeb29f9), TOBN(0xf6d17da3, 0x17227a46),
-     TOBN(0xab53ddbd, 0x0f968c00), TOBN(0xa03da7ec, 0x000c880b),
-     TOBN(0x7b239624, 0x6a9ad24d), TOBN(0x612c0401, 0x01ec60d0),
-     TOBN(0x70d10493, 0x109f5df1), TOBN(0xfbda4030, 0x80af7550),
-     TOBN(0x30b93f95, 0xc6b9a9b3), TOBN(0x0c74ec71, 0x007d9418),
-     TOBN(0x94175564, 0x6edb951f), TOBN(0x5f4a9d78, 0x7f22c282),
-     TOBN(0xb7870895, 0xb38d1196), TOBN(0xbc593df3, 0xa228ce7c),
-     TOBN(0xc78c5bd4, 0x6af3641a), TOBN(0x7802200b, 0x3d9b3dcc),
-     TOBN(0x0dc73f32, 0x8be33304), TOBN(0x847ed87d, 0x61ffb79a),
-     TOBN(0xf85c974e, 0x6d671192), TOBN(0x1e14100a, 0xde16f60f),
-     TOBN(0x45cb0d5a, 0x95c38797), TOBN(0x18923bba, 0x9b022da4),
-     TOBN(0xef2be899, 0xbbe7e86e), TOBN(0x4a1510ee, 0x216067bf),
-     TOBN(0xd98c8154, 0x84d5ce3e), TOBN(0x1af777f0, 0xf92a2b90),
-     TOBN(0x9fbcb400, 0x4ef65724), TOBN(0x3e04a4c9, 0x3c0ca6fe),
-     TOBN(0xfb3e2cb5, 0x55002994), TOBN(0x1f3a93c5, 0x5363ecab),
-     TOBN(0x1fe00efe, 0x3923555b), TOBN(0x744bedd9, 0x1e1751ea),
-     TOBN(0x3fb2db59, 0x6ab69357), TOBN(0x8dbd7365, 0xf5e6618b),
-     TOBN(0x99d53099, 0xdf1ea40e), TOBN(0xb3f24a0b, 0x57d61e64),
-     TOBN(0xd088a198, 0x596eb812), TOBN(0x22c8361b, 0x5762940b),
-     TOBN(0x66f01f97, 0xf9c0d95c), TOBN(0x88461172, 0x8e43cdae),
-     TOBN(0x11599a7f, 0xb72b15c3), TOBN(0x135a7536, 0x420d95cc),
-     TOBN(0x2dcdf0f7, 0x5f7ae2f6), TOBN(0x15fc6e1d, 0xd7fa6da2),
-     TOBN(0x81ca829a, 0xd1d441b6), TOBN(0x84c10cf8, 0x04a106b6),
-     TOBN(0xa9b26c95, 0xa73fbbd0), TOBN(0x7f24e0cb, 0x4d8f6ee8),
-     TOBN(0x48b45937, 0x1e25a043), TOBN(0xf8a74fca, 0x036f3dfe),
-     TOBN(0x1ed46585, 0xc9f84296), TOBN(0x7fbaa8fb, 0x3bc278b0),
-     TOBN(0xa8e96cd4, 0x6c4fcbd0), TOBN(0x940a1202, 0x73b60a5f),
-     TOBN(0x34aae120, 0x55a4aec8), TOBN(0x550e9a74, 0xdbd742f0),
-     TOBN(0x794456d7, 0x228c68ab), TOBN(0x492f8868, 0xa4e25ec6),
-     TOBN(0x682915ad, 0xb2d8f398), TOBN(0xf13b51cc, 0x5b84c953),
-     TOBN(0xcda90ab8, 0x5bb917d6), TOBN(0x4b615560, 0x4ea3dee1),
-     TOBN(0x578b4e85, 0x0a52c1c8), TOBN(0xeab1a695, 0x20b75fc4),
-     TOBN(0x60c14f3c, 0xaa0bb3c6), TOBN(0x220f448a, 0xb8216094),
-     TOBN(0x4fe7ee31, 0xb0e63d34), TOBN(0xf4600572, 0xa9e54fab),
-     TOBN(0xc0493334, 0xd5e7b5a4), TOBN(0x8589fb92, 0x06d54831),
-     TOBN(0xaa70f5cc, 0x6583553a), TOBN(0x0879094a, 0xe25649e5),
-     TOBN(0xcc904507, 0x10044652), TOBN(0xebb0696d, 0x02541c4f),
-     TOBN(0x5a171fde, 0xb9718710), TOBN(0x38f1bed8, 0xf374a9f5),
-     TOBN(0xc8c582e1, 0xba39bdc1), TOBN(0xfc457b0a, 0x908cc0ce),
-     TOBN(0x9a187fd4, 0x883841e2), TOBN(0x8ec25b39, 0x38725381),
-     TOBN(0x2553ed05, 0x96f84395), TOBN(0x095c7661, 0x6f6c6897),
-     TOBN(0x917ac85c, 0x4bdc5610), TOBN(0xb2885fe4, 0x179eb301),
-     TOBN(0x5fc65547, 0x8b78bdcc), TOBN(0x4a9fc893, 0xe59e4699),
-     TOBN(0xbb7ff0cd, 0x3ce299af), TOBN(0x195be9b3, 0xadf38b20),
-     TOBN(0x6a929c87, 0xd38ddb8f), TOBN(0x55fcc99c, 0xb21a51b9),
-     TOBN(0x2b695b4c, 0x721a4593), TOBN(0xed1e9a15, 0x768eaac2),
-     TOBN(0xfb63d71c, 0x7489f914), TOBN(0xf98ba31c, 0x78118910),
-     TOBN(0x80291373, 0x9b128eb4), TOBN(0x7801214e, 0xd448af4a),
-     TOBN(0xdbd2e22b, 0x55418dd3), TOBN(0xeffb3c0d, 0xd3998242),
-     TOBN(0xdfa6077c, 0xc7bf3827), TOBN(0xf2165bcb, 0x47f8238f),
-     TOBN(0xfe37cf68, 0x8564d554), TOBN(0xe5f825c4, 0x0a81fb98),
-     TOBN(0x43cc4f67, 0xffed4d6f), TOBN(0xbc609578, 0xb50a34b0),
-     TOBN(0x8aa8fcf9, 0x5041faf1), TOBN(0x5659f053, 0x651773b6),
-     TOBN(0xe87582c3, 0x6044d63b), TOBN(0xa6089409, 0x0cdb0ca0),
-     TOBN(0x8c993e0f, 0xbfb2bcf6), TOBN(0xfc64a719, 0x45985cfc),
-     TOBN(0x15c4da80, 0x83dbedba), TOBN(0x804ae112, 0x2be67df7),
-     TOBN(0xda4c9658, 0xa23defde), TOBN(0x12002ddd, 0x5156e0d3),
-     TOBN(0xe68eae89, 0x5dd21b96), TOBN(0x8b99f28b, 0xcf44624d),
-     TOBN(0x0ae00808, 0x1ec8897a), TOBN(0xdd0a9303, 0x6712f76e),
-     TOBN(0x96237522, 0x4e233de4), TOBN(0x192445b1, 0x2b36a8a5),
-     TOBN(0xabf9ff74, 0x023993d9), TOBN(0x21f37bf4, 0x2aad4a8f),
-     TOBN(0x340a4349, 0xf8bd2bbd), TOBN(0x1d902cd9, 0x4868195d),
-     TOBN(0x3d27bbf1, 0xe5fdb6f1), TOBN(0x7a5ab088, 0x124f9f1c),
-     TOBN(0xc466ab06, 0xf7a09e03), TOBN(0x2f8a1977, 0x31f2c123),
-     TOBN(0xda355dc7, 0x041b6657), TOBN(0xcb840d12, 0x8ece2a7c),
-     TOBN(0xb600ad9f, 0x7db32675), TOBN(0x78fea133, 0x07a06f1b),
-     TOBN(0x5d032269, 0xb31f6094), TOBN(0x07753ef5, 0x83ec37aa),
-     TOBN(0x03485aed, 0x9c0bea78), TOBN(0x41bb3989, 0xbc3f4524),
-     TOBN(0x09403761, 0x697f726d), TOBN(0x6109beb3, 0xdf394820),
-     TOBN(0x804111ea, 0x3b6d1145), TOBN(0xb6271ea9, 0xa8582654),
-     TOBN(0x619615e6, 0x24e66562), TOBN(0xa2554945, 0xd7b6ad9c),
-     TOBN(0xd9c4985e, 0x99bfe35f), TOBN(0x9770ccc0, 0x7b51cdf6),
-     TOBN(0x7c327013, 0x92881832), TOBN(0x8777d45f, 0x286b26d1),
-     TOBN(0x9bbeda22, 0xd847999d), TOBN(0x03aa33b6, 0xc3525d32),
-     TOBN(0x4b7b96d4, 0x28a959a1), TOBN(0xbb3786e5, 0x31e5d234),
-     TOBN(0xaeb5d3ce, 0x6961f247), TOBN(0x20aa85af, 0x02f93d3f),
-     TOBN(0x9cd1ad3d, 0xd7a7ae4f), TOBN(0xbf6688f0, 0x781adaa8),
-     TOBN(0xb1b40e86, 0x7469cead), TOBN(0x1904c524, 0x309fca48),
-     TOBN(0x9b7312af, 0x4b54bbc7), TOBN(0xbe24bf8f, 0x593affa2),
-     TOBN(0xbe5e0790, 0xbd98764b), TOBN(0xa0f45f17, 0xa26e299e),
-     TOBN(0x4af0d2c2, 0x6b8fe4c7), TOBN(0xef170db1, 0x8ae8a3e6),
-     TOBN(0x0e8d61a0, 0x29e0ccc1), TOBN(0xcd53e87e, 0x60ad36ca),
-     TOBN(0x328c6623, 0xc8173822), TOBN(0x7ee1767d, 0xa496be55),
-     TOBN(0x89f13259, 0x648945af), TOBN(0x9e45a5fd, 0x25c8009c),
-     TOBN(0xaf2febd9, 0x1f61ab8c), TOBN(0x43f6bc86, 0x8a275385),
-     TOBN(0x87792348, 0xf2142e79), TOBN(0x17d89259, 0xc6e6238a),
-     TOBN(0x7536d2f6, 0x4a839d9b), TOBN(0x1f428fce, 0x76a1fbdc),
-     TOBN(0x1c109601, 0x0db06dfe), TOBN(0xbfc16bc1, 0x50a3a3cc),
-     TOBN(0xf9cbd9ec, 0x9b30f41b), TOBN(0x5b5da0d6, 0x00138cce),
-     TOBN(0xec1d0a48, 0x56ef96a7), TOBN(0xb47eb848, 0x982bf842),
-     TOBN(0x66deae32, 0xec3f700d), TOBN(0x4e43c42c, 0xaa1181e0),
-     TOBN(0xa1d72a31, 0xd1a4aa2a), TOBN(0x440d4668, 0xc004f3ce),
-     TOBN(0x0d6a2d3b, 0x45fe8a7a), TOBN(0x820e52e2, 0xfb128365),
-     TOBN(0x29ac5fcf, 0x25e51b09), TOBN(0x180cd2bf, 0x2023d159),
-     TOBN(0xa9892171, 0xa1ebf90e), TOBN(0xf97c4c87, 0x7c132181),
-     TOBN(0x9f1dc724, 0xc03dbb7e), TOBN(0xae043765, 0x018cbbe4),
-     TOBN(0xfb0b2a36, 0x0767d153), TOBN(0xa8e2f4d6, 0x249cbaeb),
-     TOBN(0x172a5247, 0xd95ea168), TOBN(0x1758fada, 0x2970764a),
-     TOBN(0xac803a51, 0x1d978169), TOBN(0x299cfe2e, 0xde77e01b),
-     TOBN(0x652a1e17, 0xb0a98927), TOBN(0x2e26e1d1, 0x20014495),
-     TOBN(0x7ae0af9f, 0x7175b56a), TOBN(0xc2e22a80, 0xd64b9f95),
-     TOBN(0x4d0ff9fb, 0xd90a060a), TOBN(0x496a27db, 0xbaf38085),
-     TOBN(0x32305401, 0xda776bcf), TOBN(0xb8cdcef6, 0x725f209e),
-     TOBN(0x61ba0f37, 0x436a0bba), TOBN(0x263fa108, 0x76860049),
-     TOBN(0x92beb98e, 0xda3542cf), TOBN(0xa2d4d14a, 0xd5849538),
-     TOBN(0x989b9d68, 0x12e9a1bc), TOBN(0x61d9075c, 0x5f6e3268),
-     TOBN(0x352c6aa9, 0x99ace638), TOBN(0xde4e4a55, 0x920f43ff),
-     TOBN(0xe5e4144a, 0xd673c017), TOBN(0x667417ae, 0x6f6e05ea),
-     TOBN(0x613416ae, 0xdcd1bd56), TOBN(0x5eb36201, 0x86693711),
-     TOBN(0x2d7bc504, 0x3a1aa914), TOBN(0x175a1299, 0x76dc5975),
-     TOBN(0xe900e0f2, 0x3fc8125c), TOBN(0x569ef68c, 0x11198875),
-     TOBN(0x9012db63, 0x63a113b4), TOBN(0xe3bd3f56, 0x98835766),
-     TOBN(0xa5c94a52, 0x76412dea), TOBN(0xad9e2a09, 0xaa735e5c),
-     TOBN(0x405a984c, 0x508b65e9), TOBN(0xbde4a1d1, 0x6df1a0d1),
-     TOBN(0x1a9433a1, 0xdfba80da), TOBN(0xe9192ff9, 0x9440ad2e),
-     TOBN(0x9f649696, 0x5099fe92), TOBN(0x25ddb65c, 0x0b27a54a),
-     TOBN(0x178279dd, 0xc590da61), TOBN(0x5479a999, 0xfbde681a),
-     TOBN(0xd0e84e05, 0x013fe162), TOBN(0xbe11dc92, 0x632d471b),
-     TOBN(0xdf0b0c45, 0xfc0e089f), TOBN(0x04fb15b0, 0x4c144025),
-     TOBN(0xa61d5fc2, 0x13c99927), TOBN(0xa033e9e0, 0x3de2eb35),
-     TOBN(0xf8185d5c, 0xb8dacbb4), TOBN(0x9a88e265, 0x8644549d),
-     TOBN(0xf717af62, 0x54671ff6), TOBN(0x4bd4241b, 0x5fa58603),
-     TOBN(0x06fba40b, 0xe67773c0), TOBN(0xc1d933d2, 0x6a2847e9),
-     TOBN(0xf4f5acf3, 0x689e2c70), TOBN(0x92aab0e7, 0x46bafd31),
-     TOBN(0x798d76aa, 0x3473f6e5), TOBN(0xcc6641db, 0x93141934),
-     TOBN(0xcae27757, 0xd31e535e), TOBN(0x04cc43b6, 0x87c2ee11),
-     TOBN(0x8d1f9675, 0x2e029ffa), TOBN(0xc2150672, 0xe4cc7a2c),
-     TOBN(0x3b03c1e0, 0x8d68b013), TOBN(0xa9d6816f, 0xedf298f3),
-     TOBN(0x1bfbb529, 0xa2804464), TOBN(0x95a52fae, 0x5db22125),
-     TOBN(0x55b32160, 0x0e1cb64e), TOBN(0x004828f6, 0x7e7fc9fe),
-     TOBN(0x13394b82, 0x1bb0fb93), TOBN(0xb6293a2d, 0x35f1a920),
-     TOBN(0xde35ef21, 0xd145d2d9), TOBN(0xbe6225b3, 0xbb8fa603),
-     TOBN(0x00fc8f6b, 0x32cf252d), TOBN(0xa28e52e6, 0x117cf8c2),
-     TOBN(0x9d1dc89b, 0x4c371e6d), TOBN(0xcebe0675, 0x36ef0f28),
-     TOBN(0x5de05d09, 0xa4292f81), TOBN(0xa8303593, 0x353e3083),
-     TOBN(0xa1715b0a, 0x7e37a9bb), TOBN(0x8c56f61e, 0x2b8faec3),
-     TOBN(0x52507431, 0x33c9b102), TOBN(0x0130cefc, 0xa44431f0),
-     TOBN(0x56039fa0, 0xbd865cfb), TOBN(0x4b03e578, 0xbc5f1dd7),
-     TOBN(0x40edf2e4, 0xbabe7224), TOBN(0xc752496d, 0x3a1988f6),
-     TOBN(0xd1572d3b, 0x564beb6b), TOBN(0x0db1d110, 0x39a1c608),
-     TOBN(0x568d1934, 0x16f60126), TOBN(0x05ae9668, 0xf354af33),
-     TOBN(0x19de6d37, 0xc92544f2), TOBN(0xcc084353, 0xa35837d5),
-     TOBN(0xcbb6869c, 0x1a514ece), TOBN(0xb633e728, 0x2e1d1066),
-     TOBN(0xf15dd69f, 0x936c581c), TOBN(0x96e7b8ce, 0x7439c4f9),
-     TOBN(0x5e676f48, 0x2e448a5b), TOBN(0xb2ca7d5b, 0xfd916bbb),
-     TOBN(0xd55a2541, 0xf5024025), TOBN(0x47bc5769, 0xe4c2d937),
-     TOBN(0x7d31b92a, 0x0362189f), TOBN(0x83f3086e, 0xef7816f9),
-     TOBN(0xf9f46d94, 0xb587579a), TOBN(0xec2d22d8, 0x30e76c5f),
-     TOBN(0x27d57461, 0xb000ffcf), TOBN(0xbb7e65f9, 0x364ffc2c),
-     TOBN(0x7c7c9477, 0x6652a220), TOBN(0x61618f89, 0xd696c981),
-     TOBN(0x5021701d, 0x89effff3), TOBN(0xf2c8ff8e, 0x7c314163),
-     TOBN(0x2da413ad, 0x8efb4d3e), TOBN(0x937b5adf, 0xce176d95),
-     TOBN(0x22867d34, 0x2a67d51c), TOBN(0x262b9b10, 0x18eb3ac9),
-     TOBN(0x4e314fe4, 0xc43ff28b), TOBN(0x76476627, 0x6a664e7a),
-     TOBN(0x3e90e40b, 0xb7a565c2), TOBN(0x8588993a, 0xc1acf831),
-     TOBN(0xd7b501d6, 0x8f938829), TOBN(0x996627ee, 0x3edd7d4c),
-     TOBN(0x37d44a62, 0x90cd34c7), TOBN(0xa8327499, 0xf3833e8d),
-     TOBN(0x2e18917d, 0x4bf50353), TOBN(0x85dd726b, 0x556765fb),
-     TOBN(0x54fe65d6, 0x93d5ab66), TOBN(0x3ddbaced, 0x915c25fe),
-     TOBN(0xa799d9a4, 0x12f22e85), TOBN(0xe2a24867, 0x6d06f6bc),
-     TOBN(0xf4f1ee56, 0x43ca1637), TOBN(0xfda2828b, 0x61ece30a),
-     TOBN(0x758c1a3e, 0xa2dee7a6), TOBN(0xdcde2f3c, 0x734b2284),
-     TOBN(0xaba445d2, 0x4eaba6ad), TOBN(0x35aaf668, 0x76cee0a7),
-     TOBN(0x7e0b04a9, 0xe5aa049a), TOBN(0xe74083ad, 0x91103e84),
-     TOBN(0xbeb183ce, 0x40afecc3), TOBN(0x6b89de9f, 0xea043f7a),}
-    ,
-    {TOBN(0x0e299d23, 0xfe67ba66), TOBN(0x91450760, 0x93cf2f34),
-     TOBN(0xf45b5ea9, 0x97fcf913), TOBN(0x5be00843, 0x8bd7ddda),
-     TOBN(0x358c3e05, 0xd53ff04d), TOBN(0xbf7ccdc3, 0x5de91ef7),
-     TOBN(0xad684dbf, 0xb69ec1a0), TOBN(0x367e7cf2, 0x801fd997),
-     TOBN(0x0ca1f3b7, 0xb0dc8595), TOBN(0x27de4608, 0x9f1d9f2e),
-     TOBN(0x1af3bf39, 0xbadd82a7), TOBN(0x79356a79, 0x65862448),
-     TOBN(0xc0602345, 0xf5f9a052), TOBN(0x1a8b0f89, 0x139a42f9),
-     TOBN(0xb53eee42, 0x844d40fc), TOBN(0x93b0bfe5, 0x4e5b6368),
-     TOBN(0x5434dd02, 0xc024789c), TOBN(0x90dca9ea, 0x41b57bfc),
-     TOBN(0x8aa898e2, 0x243398df), TOBN(0xf607c834, 0x894a94bb),
-     TOBN(0xbb07be97, 0xc2c99b76), TOBN(0x6576ba67, 0x18c29302),
-     TOBN(0x3d79efcc, 0xe703a88c), TOBN(0xf259ced7, 0xb6a0d106),
-     TOBN(0x0f893a5d, 0xc8de610b), TOBN(0xe8c515fb, 0x67e223ce),
-     TOBN(0x7774bfa6, 0x4ead6dc5), TOBN(0x89d20f95, 0x925c728f),
-     TOBN(0x7a1e0966, 0x098583ce), TOBN(0xa2eedb94, 0x93f2a7d7),
-     TOBN(0x1b282097, 0x4c304d4a), TOBN(0x0842e3da, 0xc077282d),
-     TOBN(0xe4d972a3, 0x3b9e2d7b), TOBN(0x7cc60b27, 0xc48218ff),
-     TOBN(0x8fc70838, 0x84149d91), TOBN(0x5c04346f, 0x2f461ecc),
-     TOBN(0xebe9fdf2, 0x614650a9), TOBN(0x5e35b537, 0xc1f666ac),
-     TOBN(0x645613d1, 0x88babc83), TOBN(0x88cace3a, 0xc5e1c93e),
-     TOBN(0x209ca375, 0x3de92e23), TOBN(0xccb03cc8, 0x5fbbb6e3),
-     TOBN(0xccb90f03, 0xd7b1487e), TOBN(0xfa9c2a38, 0xc710941f),
-     TOBN(0x756c3823, 0x6724ceed), TOBN(0x3a902258, 0x192d0323),
-     TOBN(0xb150e519, 0xea5e038e), TOBN(0xdcba2865, 0xc7427591),
-     TOBN(0xe549237f, 0x78890732), TOBN(0xc443bef9, 0x53fcb4d9),
-     TOBN(0x9884d8a6, 0xeb3480d6), TOBN(0x8a35b6a1, 0x3048b186),
-     TOBN(0xb4e44716, 0x65e9a90a), TOBN(0x45bf380d, 0x653006c0),
-     TOBN(0x8f3f820d, 0x4fe9ae3b), TOBN(0x244a35a0, 0x979a3b71),
-     TOBN(0xa1010e9d, 0x74cd06ff), TOBN(0x9c17c7df, 0xaca3eeac),
-     TOBN(0x74c86cd3, 0x8063aa2b), TOBN(0x8595c4b3, 0x734614ff),
-     TOBN(0xa3de00ca, 0x990f62cc), TOBN(0xd9bed213, 0xca0c3be5),
-     TOBN(0x7886078a, 0xdf8ce9f5), TOBN(0xddb27ce3, 0x5cd44444),
-     TOBN(0xed374a66, 0x58926ddd), TOBN(0x138b2d49, 0x908015b8),
-     TOBN(0x886c6579, 0xde1f7ab8), TOBN(0x888b9aa0, 0xc3020b7a),
-     TOBN(0xd3ec034e, 0x3a96e355), TOBN(0xba65b0b8, 0xf30fbe9a),
-     TOBN(0x064c8e50, 0xff21367a), TOBN(0x1f508ea4, 0x0b04b46e),
-     TOBN(0x98561a49, 0x747c866c), TOBN(0xbbb1e5fe, 0x0518a062),
-     TOBN(0x20ff4e8b, 0xecdc3608), TOBN(0x7f55cded, 0x20184027),
-     TOBN(0x8d73ec95, 0xf38c85f0), TOBN(0x5b589fdf, 0x8bc3b8c3),
-     TOBN(0xbe95dd98, 0x0f12b66f), TOBN(0xf5bd1a09, 0x0e338e01),
-     TOBN(0x65163ae5, 0x5e915918), TOBN(0x6158d6d9, 0x86f8a46b),
-     TOBN(0x8466b538, 0xeeebf99c), TOBN(0xca8761f6, 0xbca477ef),
-     TOBN(0xaf3449c2, 0x9ebbc601), TOBN(0xef3b0f41, 0xe0c3ae2f),
-     TOBN(0xaa6c577d, 0x5de63752), TOBN(0xe9166601, 0x64682a51),
-     TOBN(0x5a3097be, 0xfc15aa1e), TOBN(0x40d12548, 0xb54b0745),
-     TOBN(0x5bad4706, 0x519a5f12), TOBN(0xed03f717, 0xa439dee6),
-     TOBN(0x0794bb6c, 0x4a02c499), TOBN(0xf725083d, 0xcffe71d2),
-     TOBN(0x2cad7519, 0x0f3adcaf), TOBN(0x7f68ea1c, 0x43729310),
-     TOBN(0xe747c8c7, 0xb7ffd977), TOBN(0xec104c35, 0x80761a22),
-     TOBN(0x8395ebaf, 0x5a3ffb83), TOBN(0xfb3261f4, 0xe4b63db7),
-     TOBN(0x53544960, 0xd883e544), TOBN(0x13520d70, 0x8cc2eeb8),
-     TOBN(0x08f6337b, 0xd3d65f99), TOBN(0x83997db2, 0x781cf95b),
-     TOBN(0xce6ff106, 0x0dbd2c01), TOBN(0x4f8eea6b, 0x1f9ce934),
-     TOBN(0x546f7c4b, 0x0e993921), TOBN(0x6236a324, 0x5e753fc7),
-     TOBN(0x65a41f84, 0xa16022e9), TOBN(0x0c18d878, 0x43d1dbb2),
-     TOBN(0x73c55640, 0x2d4cef9c), TOBN(0xa0428108, 0x70444c74),
-     TOBN(0x68e4f15e, 0x9afdfb3c), TOBN(0x49a56143, 0x5bdfb6df),
-     TOBN(0xa9bc1bd4, 0x5f823d97), TOBN(0xbceb5970, 0xea111c2a),
-     TOBN(0x366b455f, 0xb269bbc4), TOBN(0x7cd85e1e, 0xe9bc5d62),
-     TOBN(0xc743c41c, 0x4f18b086), TOBN(0xa4b40990, 0x95294fb9),
-     TOBN(0x9c7c581d, 0x26ee8382), TOBN(0xcf17dcc5, 0x359d638e),
-     TOBN(0xee8273ab, 0xb728ae3d), TOBN(0x1d112926, 0xf821f047),
-     TOBN(0x11498477, 0x50491a74), TOBN(0x687fa761, 0xfde0dfb9),
-     TOBN(0x2c258022, 0x7ea435ab), TOBN(0x6b8bdb94, 0x91ce7e3f),
-     TOBN(0x4c5b5dc9, 0x3bf834aa), TOBN(0x04371819, 0x4f6c7e4b),
-     TOBN(0xc284e00a, 0x3736bcad), TOBN(0x0d881118, 0x21ae8f8d),
-     TOBN(0xf9cf0f82, 0xf48c8e33), TOBN(0xa11fd075, 0xa1bf40db),
-     TOBN(0xdceab0de, 0xdc2733e5), TOBN(0xc560a8b5, 0x8e986bd7),
-     TOBN(0x48dd1fe2, 0x3929d097), TOBN(0x3885b290, 0x92f188f1),
-     TOBN(0x0f2ae613, 0xda6fcdac), TOBN(0x9054303e, 0xb662a46c),
-     TOBN(0xb6871e44, 0x0738042a), TOBN(0x98e6a977, 0xbdaf6449),
-     TOBN(0xd8bc0650, 0xd1c9df1b), TOBN(0xef3d6451, 0x36e098f9),
-     TOBN(0x03fbae82, 0xb6d72d28), TOBN(0x77ca9db1, 0xf5d84080),
-     TOBN(0x8a112cff, 0xa58efc1c), TOBN(0x518d761c, 0xc564cb4a),
-     TOBN(0x69b5740e, 0xf0d1b5ce), TOBN(0x717039cc, 0xe9eb1785),
-     TOBN(0x3fe29f90, 0x22f53382), TOBN(0x8e54ba56, 0x6bc7c95c),
-     TOBN(0x9c806d8a, 0xf7f91d0f), TOBN(0x3b61b0f1, 0xa82a5728),
-     TOBN(0x4640032d, 0x94d76754), TOBN(0x273eb5de, 0x47d834c6),
-     TOBN(0x2988abf7, 0x7b4e4d53), TOBN(0xb7ce66bf, 0xde401777),
-     TOBN(0x9fba6b32, 0x715071b3), TOBN(0x82413c24, 0xad3a1a98),
-     TOBN(0x5b7fc8c4, 0xe0e8ad93), TOBN(0xb5679aee, 0x5fab868d),
-     TOBN(0xb1f9d2fa, 0x2b3946f3), TOBN(0x458897dc, 0x5685b50a),
-     TOBN(0x1e98c930, 0x89d0caf3), TOBN(0x39564c5f, 0x78642e92),
-     TOBN(0x1b77729a, 0x0dbdaf18), TOBN(0xf9170722, 0x579e82e6),
-     TOBN(0x680c0317, 0xe4515fa5), TOBN(0xf85cff84, 0xfb0c790f),
-     TOBN(0xc7a82aab, 0x6d2e0765), TOBN(0x7446bca9, 0x35c82b32),
-     TOBN(0x5de607aa, 0x6d63184f), TOBN(0x7c1a46a8, 0x262803a6),
-     TOBN(0xd218313d, 0xaebe8035), TOBN(0x92113ffd, 0xc73c51f8),
-     TOBN(0x4b38e083, 0x12e7e46c), TOBN(0x69d0a37a, 0x56126bd5),
-     TOBN(0xfb3f324b, 0x73c07e04), TOBN(0xa0c22f67, 0x8fda7267),
-     TOBN(0x8f2c0051, 0x4d2c7d8f), TOBN(0xbc45ced3, 0xcbe2cae5),
-     TOBN(0xe1c6cf07, 0xa8f0f277), TOBN(0xbc392312, 0x1eb99a98),
-     TOBN(0x75537b7e, 0x3cc8ac85), TOBN(0x8d725f57, 0xdd02753b),
-     TOBN(0xfd05ff64, 0xb737df2f), TOBN(0x55fe8712, 0xf6d2531d),
-     TOBN(0x57ce04a9, 0x6ab6b01c), TOBN(0x69a02a89, 0x7cd93724),
-     TOBN(0x4f82ac35, 0xcf86699b), TOBN(0x8242d3ad, 0x9cb4b232),
-     TOBN(0x713d0f65, 0xd62105e5), TOBN(0xbb222bfa, 0x2d29be61),
-     TOBN(0xf2f9a79e, 0x6cfbef09), TOBN(0xfc24d8d3, 0xd5d6782f),
-     TOBN(0x5db77085, 0xd4129967), TOBN(0xdb81c3cc, 0xdc3c2a43),
-     TOBN(0x9d655fc0, 0x05d8d9a3), TOBN(0x3f5d057a, 0x54298026),
-     TOBN(0x1157f56d, 0x88c54694), TOBN(0xb26baba5, 0x9b09573e),
-     TOBN(0x2cab03b0, 0x22adffd1), TOBN(0x60a412c8, 0xdd69f383),
-     TOBN(0xed76e98b, 0x54b25039), TOBN(0xd4ee67d3, 0x687e714d),
-     TOBN(0x87739648, 0x7b00b594), TOBN(0xce419775, 0xc9ef709b),
-     TOBN(0x40f76f85, 0x1c203a40), TOBN(0x30d352d6, 0xeafd8f91),
-     TOBN(0xaf196d3d, 0x95578dd2), TOBN(0xea4bb3d7, 0x77cc3f3d),
-     TOBN(0x42a5bd03, 0xb98e782b), TOBN(0xac958c40, 0x0624920d),
-     TOBN(0xb838134c, 0xfc56fcc8), TOBN(0x86ec4ccf, 0x89572e5e),
-     TOBN(0x69c43526, 0x9be47be0), TOBN(0x323b7dd8, 0xcb28fea1),
-     TOBN(0xfa5538ba, 0x3a6c67e5), TOBN(0xef921d70, 0x1d378e46),
-     TOBN(0xf92961fc, 0x3c4b880e), TOBN(0x3f6f914e, 0x98940a67),
-     TOBN(0xa990eb0a, 0xfef0ff39), TOBN(0xa6c2920f, 0xf0eeff9c),
-     TOBN(0xca804166, 0x51b8d9a3), TOBN(0x42531bc9, 0x0ffb0db1),
-     TOBN(0x72ce4718, 0xaa82e7ce), TOBN(0x6e199913, 0xdf574741),
-     TOBN(0xd5f1b13d, 0xd5d36946), TOBN(0x8255dc65, 0xf68f0194),
-     TOBN(0xdc9df4cd, 0x8710d230), TOBN(0x3453c20f, 0x138c1988),
-     TOBN(0x9af98dc0, 0x89a6ef01), TOBN(0x4dbcc3f0, 0x9857df85),
-     TOBN(0x34805601, 0x5c1ad924), TOBN(0x40448da5, 0xd0493046),
-     TOBN(0xf629926d, 0x4ee343e2), TOBN(0x6343f1bd, 0x90e8a301),
-     TOBN(0xefc93491, 0x40815b3f), TOBN(0xf882a423, 0xde8f66fb),
-     TOBN(0x3a12d5f4, 0xe7db9f57), TOBN(0x7dfba38a, 0x3c384c27),
-     TOBN(0x7a904bfd, 0x6fc660b1), TOBN(0xeb6c5db3, 0x2773b21c),
-     TOBN(0xc350ee66, 0x1cdfe049), TOBN(0x9baac0ce, 0x44540f29),
-     TOBN(0xbc57b6ab, 0xa5ec6aad), TOBN(0x167ce8c3, 0x0a7c1baa),
-     TOBN(0xb23a03a5, 0x53fb2b56), TOBN(0x6ce141e7, 0x4e057f78),
-     TOBN(0x796525c3, 0x89e490d9), TOBN(0x0bc95725, 0xa31a7e75),
-     TOBN(0x1ec56791, 0x1220fd06), TOBN(0x716e3a3c, 0x408b0bd6),
-     TOBN(0x31cd6bf7, 0xe8ebeba9), TOBN(0xa7326ca6, 0xbee6b670),
-     TOBN(0x3d9f851c, 0xcd090c43), TOBN(0x561e8f13, 0xf12c3988),
-     TOBN(0x50490b6a, 0x904b7be4), TOBN(0x61690ce1, 0x0410737b),
-     TOBN(0x299e9a37, 0x0f009052), TOBN(0x258758f0, 0xf026092e),
-     TOBN(0x9fa255f3, 0xfdfcdc0f), TOBN(0xdbc9fb1f, 0xc0e1bcd2),
-     TOBN(0x35f9dd6e, 0x24651840), TOBN(0xdca45a84, 0xa5c59abc),
-     TOBN(0x103d396f, 0xecca4938), TOBN(0x4532da0a, 0xb97b3f29),
-     TOBN(0xc4135ea5, 0x1999a6bf), TOBN(0x3aa9505a, 0x5e6bf2ee),
-     TOBN(0xf77cef06, 0x3f5be093), TOBN(0x97d1a0f8, 0xa943152e),
-     TOBN(0x2cb0ebba, 0x2e1c21dd), TOBN(0xf41b29fc, 0x2c6797c4),
-     TOBN(0xc6e17321, 0xb300101f), TOBN(0x4422b0e9, 0xd0d79a89),
-     TOBN(0x49e4901c, 0x92f1bfc4), TOBN(0x06ab1f8f, 0xe1e10ed9),
-     TOBN(0x84d35577, 0xdb2926b8), TOBN(0xca349d39, 0x356e8ec2),
-     TOBN(0x70b63d32, 0x343bf1a9), TOBN(0x8fd3bd28, 0x37d1a6b1),
-     TOBN(0x0454879c, 0x316865b4), TOBN(0xee959ff6, 0xc458efa2),
-     TOBN(0x0461dcf8, 0x9706dc3f), TOBN(0x737db0e2, 0x164e4b2e),
-     TOBN(0x09262680, 0x2f8843c8), TOBN(0x54498bbc, 0x7745e6f6),
-     TOBN(0x359473fa, 0xa29e24af), TOBN(0xfcc3c454, 0x70aa87a1),
-     TOBN(0xfd2c4bf5, 0x00573ace), TOBN(0xb65b514e, 0x28dd1965),
-     TOBN(0xe46ae7cf, 0x2193e393), TOBN(0x60e9a4e1, 0xf5444d97),
-     TOBN(0xe7594e96, 0x00ff38ed), TOBN(0x43d84d2f, 0x0a0e0f02),
-     TOBN(0x8b6db141, 0xee398a21), TOBN(0xb88a56ae, 0xe3bcc5be),
-     TOBN(0x0a1aa52f, 0x373460ea), TOBN(0x20da1a56, 0x160bb19b),
-     TOBN(0xfb54999d, 0x65bf0384), TOBN(0x71a14d24, 0x5d5a180e),
-     TOBN(0xbc44db7b, 0x21737b04), TOBN(0xd84fcb18, 0x01dd8e92),
-     TOBN(0x80de937b, 0xfa44b479), TOBN(0x53505499, 0x5c98fd4f),
-     TOBN(0x1edb12ab, 0x28f08727), TOBN(0x4c58b582, 0xa5f3ef53),
-     TOBN(0xbfb236d8, 0x8327f246), TOBN(0xc3a3bfaa, 0x4d7df320),
-     TOBN(0xecd96c59, 0xb96024f2), TOBN(0xfc293a53, 0x7f4e0433),
-     TOBN(0x5341352b, 0x5acf6e10), TOBN(0xc50343fd, 0xafe652c3),
-     TOBN(0x4af3792d, 0x18577a7f), TOBN(0xe1a4c617, 0xaf16823d),
-     TOBN(0x9b26d0cd, 0x33425d0a), TOBN(0x306399ed, 0x9b7bc47f),
-     TOBN(0x2a792f33, 0x706bb20b), TOBN(0x31219614, 0x98111055),
-     TOBN(0x864ec064, 0x87f5d28b), TOBN(0x11392d91, 0x962277fd),
-     TOBN(0xb5aa7942, 0xbb6aed5f), TOBN(0x080094dc, 0x47e799d9),
-     TOBN(0x4afa588c, 0x208ba19b), TOBN(0xd3e7570f, 0x8512f284),
-     TOBN(0xcbae64e6, 0x02f5799a), TOBN(0xdeebe7ef, 0x514b9492),
-     TOBN(0x30300f98, 0xe5c298ff), TOBN(0x17f561be, 0x3678361f),
-     TOBN(0xf52ff312, 0x98cb9a16), TOBN(0x6233c3bc, 0x5562d490),
-     TOBN(0x7bfa15a1, 0x92e3a2cb), TOBN(0x961bcfd1, 0xe6365119),
-     TOBN(0x3bdd29bf, 0x2c8c53b1), TOBN(0x739704df, 0x822844ba),
-     TOBN(0x7dacfb58, 0x7e7b754b), TOBN(0x23360791, 0xa806c9b9),
-     TOBN(0xe7eb88c9, 0x23504452), TOBN(0x2983e996, 0x852c1783),
-     TOBN(0xdd4ae529, 0x958d881d), TOBN(0x026bae03, 0x262c7b3c),
-     TOBN(0x3a6f9193, 0x960b52d1), TOBN(0xd0980f90, 0x92696cfb),
-     TOBN(0x4c1f428c, 0xd5f30851), TOBN(0x94dfed27, 0x2a4f6630),
-     TOBN(0x4df53772, 0xfc5d48a4), TOBN(0xdd2d5a2f, 0x933260ce),
-     TOBN(0x574115bd, 0xd44cc7a5), TOBN(0x4ba6b20d, 0xbd12533a),
-     TOBN(0x30e93cb8, 0x243057c9), TOBN(0x794c486a, 0x14de320e),
-     TOBN(0xe925d4ce, 0xf21496e4), TOBN(0xf951d198, 0xec696331),
-     TOBN(0x9810e2de, 0x3e8d812f), TOBN(0xd0a47259, 0x389294ab),
-     TOBN(0x513ba2b5, 0x0e3bab66), TOBN(0x462caff5, 0xabad306f),
-     TOBN(0xe2dc6d59, 0xaf04c49e), TOBN(0x1aeb8750, 0xe0b84b0b),
-     TOBN(0xc034f12f, 0x2f7d0ca2), TOBN(0x6d2e8128, 0xe06acf2f),
-     TOBN(0x801f4f83, 0x21facc2f), TOBN(0xa1170c03, 0xf40ef607),
-     TOBN(0xfe0a1d4f, 0x7805a99c), TOBN(0xbde56a36, 0xcc26aba5),
-     TOBN(0x5b1629d0, 0x35531f40), TOBN(0xac212c2b, 0x9afa6108),
-     TOBN(0x30a06bf3, 0x15697be5), TOBN(0x6f0545dc, 0x2c63c7c1),
-     TOBN(0x5d8cb842, 0x7ccdadaf), TOBN(0xd52e379b, 0xac7015bb),
-     TOBN(0xc4f56147, 0xf462c23e), TOBN(0xd44a4298, 0x46bc24b0),
-     TOBN(0xbc73d23a, 0xe2856d4f), TOBN(0x61cedd8c, 0x0832bcdf),
-     TOBN(0x60953556, 0x99f241d7), TOBN(0xee4adbd7, 0x001a349d),
-     TOBN(0x0b35bf6a, 0xaa89e491), TOBN(0x7f0076f4, 0x136f7546),
-     TOBN(0xd19a18ba, 0x9264da3d), TOBN(0x6eb2d2cd, 0x62a7a28b),
-     TOBN(0xcdba941f, 0x8761c971), TOBN(0x1550518b, 0xa3be4a5d),
-     TOBN(0xd0e8e2f0, 0x57d0b70c), TOBN(0xeea8612e, 0xcd133ba3),
-     TOBN(0x814670f0, 0x44416aec), TOBN(0x424db6c3, 0x30775061),
-     TOBN(0xd96039d1, 0x16213fd1), TOBN(0xc61e7fa5, 0x18a3478f),
-     TOBN(0xa805bdcc, 0xcb0c5021), TOBN(0xbdd6f3a8, 0x0cc616dd),
-     TOBN(0x06009667, 0x5d97f7e2), TOBN(0x31db0fc1, 0xaf0bf4b6),
-     TOBN(0x23680ed4, 0x5491627a), TOBN(0xb99a3c66, 0x7d741fb1),
-     TOBN(0xe9bb5f55, 0x36b1ff92), TOBN(0x29738577, 0x512b388d),
-     TOBN(0xdb8a2ce7, 0x50fcf263), TOBN(0x385346d4, 0x6c4f7b47),
-     TOBN(0xbe86c5ef, 0x31631f9e), TOBN(0xbf91da21, 0x03a57a29),
-     TOBN(0xc3b1f796, 0x7b23f821), TOBN(0x0f7d00d2, 0x770db354),
-     TOBN(0x8ffc6c3b, 0xd8fe79da), TOBN(0xcc5e8c40, 0xd525c996),
-     TOBN(0x4640991d, 0xcfff632a), TOBN(0x64d97e8c, 0x67112528),
-     TOBN(0xc232d973, 0x02f1cd1e), TOBN(0xce87eacb, 0x1dd212a4),
-     TOBN(0x6e4c8c73, 0xe69802f7), TOBN(0x12ef0290, 0x1fffddbd),
-     TOBN(0x941ec74e, 0x1bcea6e2), TOBN(0xd0b54024, 0x3cb92cbb),
-     TOBN(0x809fb9d4, 0x7e8f9d05), TOBN(0x3bf16159, 0xf2992aae),
-     TOBN(0xad40f279, 0xf8a7a838), TOBN(0x11aea631, 0x05615660),
-     TOBN(0xbf52e6f1, 0xa01f6fa1), TOBN(0xef046995, 0x3dc2aec9),
-     TOBN(0x785dbec9, 0xd8080711), TOBN(0xe1aec60a, 0x9fdedf76),
-     TOBN(0xece797b5, 0xfa21c126), TOBN(0xc66e898f, 0x05e52732),
-     TOBN(0x39bb69c4, 0x08811fdb), TOBN(0x8bfe1ef8, 0x2fc7f082),
-     TOBN(0xc8e7a393, 0x174f4138), TOBN(0xfba8ad1d, 0xd58d1f98),
-     TOBN(0xbc21d0ce, 0xbfd2fd5b), TOBN(0x0b839a82, 0x6ee60d61),
-     TOBN(0xaacf7658, 0xafd22253), TOBN(0xb526bed8, 0xaae396b3),
-     TOBN(0xccc1bbc2, 0x38564464), TOBN(0x9e3ff947, 0x8c45bc73),
-     TOBN(0xcde9bca3, 0x58188a78), TOBN(0x138b8ee0, 0xd73bf8f7),
-     TOBN(0x5c7e234c, 0x4123c489), TOBN(0x66e69368, 0xfa643297),
-     TOBN(0x0629eeee, 0x39a15fa3), TOBN(0x95fab881, 0xa9e2a927),
-     TOBN(0xb2497007, 0xeafbb1e1), TOBN(0xd75c9ce6, 0xe75b7a93),
-     TOBN(0x3558352d, 0xefb68d78), TOBN(0xa2f26699, 0x223f6396),
-     TOBN(0xeb911ecf, 0xe469b17a), TOBN(0x62545779, 0xe72d3ec2),
-     TOBN(0x8ea47de7, 0x82cb113f), TOBN(0xebe4b086, 0x4e1fa98d),
-     TOBN(0xec2d5ed7, 0x8cdfedb1), TOBN(0xa535c077, 0xfe211a74),
-     TOBN(0x9678109b, 0x11d244c5), TOBN(0xf17c8bfb, 0xbe299a76),
-     TOBN(0xb651412e, 0xfb11fbc4), TOBN(0xea0b5482, 0x94ab3f65),
-     TOBN(0xd8dffd95, 0x0cf78243), TOBN(0x2e719e57, 0xce0361d4),
-     TOBN(0x9007f085, 0x304ddc5b), TOBN(0x095e8c6d, 0x4daba2ea),
-     TOBN(0x5a33cdb4, 0x3f9d28a9), TOBN(0x85b95cd8, 0xe2283003),
-     TOBN(0xbcd6c819, 0xb9744733), TOBN(0x29c5f538, 0xfc7f5783),
-     TOBN(0x6c49b2fa, 0xd59038e4), TOBN(0x68349cc1, 0x3bbe1018),
-     TOBN(0xcc490c1d, 0x21830ee5), TOBN(0x36f9c4ee, 0xe9bfa297),
-     TOBN(0x58fd7294, 0x48de1a94), TOBN(0xaadb13a8, 0x4e8f2cdc),
-     TOBN(0x515eaaa0, 0x81313dba), TOBN(0xc76bb468, 0xc2152dd8),
-     TOBN(0x357f8d75, 0xa653dbf8), TOBN(0xe4d8c4d1, 0xb14ac143),
-     TOBN(0xbdb8e675, 0xb055cb40), TOBN(0x898f8e7b, 0x977b5167),
-     TOBN(0xecc65651, 0xb82fb863), TOBN(0x56544814, 0x6d88f01f),
-     TOBN(0xb0928e95, 0x263a75a9), TOBN(0xcfb6836f, 0x1a22fcda),
-     TOBN(0x651d14db, 0x3f3bd37c), TOBN(0x1d3837fb, 0xb6ad4664),
-     TOBN(0x7c5fb538, 0xff4f94ab), TOBN(0x7243c712, 0x6d7fb8f2),
-     TOBN(0xef13d60c, 0xa85c5287), TOBN(0x18cfb7c7, 0x4bb8dd1b),
-     TOBN(0x82f9bfe6, 0x72908219), TOBN(0x35c4592b, 0x9d5144ab),
-     TOBN(0x52734f37, 0x9cf4b42f), TOBN(0x6bac55e7, 0x8c60ddc4),
-     TOBN(0xb5cd811e, 0x94dea0f6), TOBN(0x259ecae4, 0xe18cc1a3),
-     TOBN(0x6a0e836e, 0x15e660f8), TOBN(0x6c639ea6, 0x0e02bff2),
-     TOBN(0x8721b8cb, 0x7e1026fd), TOBN(0x9e73b50b, 0x63261942),
-     TOBN(0xb8c70974, 0x77f01da3), TOBN(0x1839e6a6, 0x8268f57f),
-     TOBN(0x571b9415, 0x5150b805), TOBN(0x1892389e, 0xf92c7097),
-     TOBN(0x8d69c18e, 0x4a084b95), TOBN(0x7014c512, 0xbe5b495c),
-     TOBN(0x4780db36, 0x1b07523c), TOBN(0x2f6219ce, 0x2c1c64fa),
-     TOBN(0xc38b81b0, 0x602c105a), TOBN(0xab4f4f20, 0x5dc8e360),
-     TOBN(0x20d3c982, 0xcf7d62d2), TOBN(0x1f36e29d, 0x23ba8150),
-     TOBN(0x48ae0bf0, 0x92763f9e), TOBN(0x7a527e6b, 0x1d3a7007),
-     TOBN(0xb4a89097, 0x581a85e3), TOBN(0x1f1a520f, 0xdc158be5),
-     TOBN(0xf98db37d, 0x167d726e), TOBN(0x8802786e, 0x1113e862)}
-    ,
-    {TOBN(0xefb2149e, 0x36f09ab0), TOBN(0x03f163ca, 0x4a10bb5b),
-     TOBN(0xd0297045, 0x06e20998), TOBN(0x56f0af00, 0x1b5a3bab),
-     TOBN(0x7af4cfec, 0x70880e0d), TOBN(0x7332a66f, 0xbe3d913f),
-     TOBN(0x32e6c84a, 0x7eceb4bd), TOBN(0xedc4a79a, 0x9c228f55),
-     TOBN(0xc37c7dd0, 0xc55c4496), TOBN(0xa6a96357, 0x25bbabd2),
-     TOBN(0x5b7e63f2, 0xadd7f363), TOBN(0x9dce3782, 0x2e73f1df),
-     TOBN(0xe1e5a16a, 0xb2b91f71), TOBN(0xe4489823, 0x5ba0163c),
-     TOBN(0xf2759c32, 0xf6e515ad), TOBN(0xa5e2f1f8, 0x8615eecf),
-     TOBN(0x74519be7, 0xabded551), TOBN(0x03d358b8, 0xc8b74410),
-     TOBN(0x4d00b10b, 0x0e10d9a9), TOBN(0x6392b0b1, 0x28da52b7),
-     TOBN(0x6744a298, 0x0b75c904), TOBN(0xc305b0ae, 0xa8f7f96c),
-     TOBN(0x042e421d, 0x182cf932), TOBN(0xf6fc5d50, 0x9e4636ca),
-     TOBN(0x795847c9, 0xd64cc78c), TOBN(0x6c50621b, 0x9b6cb27b),
-     TOBN(0x07099bf8, 0xdf8022ab), TOBN(0x48f862eb, 0xc04eda1d),
-     TOBN(0xd12732ed, 0xe1603c16), TOBN(0x19a80e0f, 0x5c9a9450),
-     TOBN(0xe2257f54, 0xb429b4fc), TOBN(0x66d3b2c6, 0x45460515),
-     TOBN(0x6ca4f87e, 0x822e37be), TOBN(0x73f237b4, 0x253bda4e),
-     TOBN(0xf747f3a2, 0x41190aeb), TOBN(0xf06fa36f, 0x804cf284),
-     TOBN(0x0a6bbb6e, 0xfc621c12), TOBN(0x5d624b64, 0x40b80ec6),
-     TOBN(0x4b072425, 0x7ba556f3), TOBN(0x7fa0c354, 0x3e2d20a8),
-     TOBN(0xe921fa31, 0xe3229d41), TOBN(0xa929c652, 0x94531bd4),
-     TOBN(0x84156027, 0xa6d38209), TOBN(0xf3d69f73, 0x6bdb97bd),
-     TOBN(0x8906d19a, 0x16833631), TOBN(0x68a34c2e, 0x03d51be3),
-     TOBN(0xcb59583b, 0x0e511cd8), TOBN(0x99ce6bfd, 0xfdc132a8),
-     TOBN(0x3facdaaa, 0xffcdb463), TOBN(0x658bbc1a, 0x34a38b08),
-     TOBN(0x12a801f8, 0xf1a9078d), TOBN(0x1567bcf9, 0x6ab855de),
-     TOBN(0xe08498e0, 0x3572359b), TOBN(0xcf0353e5, 0x8659e68b),
-     TOBN(0xbb86e9c8, 0x7d23807c), TOBN(0xbc08728d, 0x2198e8a2),
-     TOBN(0x8de2b7bc, 0x453cadd6), TOBN(0x203900a7, 0xbc0bc1f8),
-     TOBN(0xbcd86e47, 0xa6abd3af), TOBN(0x911cac12, 0x8502effb),
-     TOBN(0x2d550242, 0xec965469), TOBN(0x0e9f7692, 0x29e0017e),
-     TOBN(0x633f078f, 0x65979885), TOBN(0xfb87d449, 0x4cf751ef),
-     TOBN(0xe1790e4b, 0xfc25419a), TOBN(0x36467203, 0x4bff3cfd),
-     TOBN(0xc8db6386, 0x25b6e83f), TOBN(0x6cc69f23, 0x6cad6fd2),
-     TOBN(0x0219e45a, 0x6bc68bb9), TOBN(0xe43d79b6, 0x297f7334),
-     TOBN(0x7d445368, 0x465dc97c), TOBN(0x4b9eea32, 0x2a0b949a),
-     TOBN(0x1b96c6ba, 0x6102d021), TOBN(0xeaafac78, 0x2f4461ea),
-     TOBN(0xd4b85c41, 0xc49f19a8), TOBN(0x275c28e4, 0xcf538875),
-     TOBN(0x35451a9d, 0xdd2e54e0), TOBN(0x6991adb5, 0x0605618b),
-     TOBN(0x5b8b4bcd, 0x7b36cd24), TOBN(0x372a4f8c, 0x56f37216),
-     TOBN(0xc890bd73, 0xa6a5da60), TOBN(0x6f083da0, 0xdc4c9ff0),
-     TOBN(0xf4e14d94, 0xf0536e57), TOBN(0xf9ee1eda, 0xaaec8243),
-     TOBN(0x571241ec, 0x8bdcf8e7), TOBN(0xa5db8271, 0x0b041e26),
-     TOBN(0x9a0b9a99, 0xe3fff040), TOBN(0xcaaf21dd, 0x7c271202),
-     TOBN(0xb4e2b2e1, 0x4f0dd2e8), TOBN(0xe77e7c4f, 0x0a377ac7),
-     TOBN(0x69202c3f, 0x0d7a2198), TOBN(0xf759b7ff, 0x28200eb8),
-     TOBN(0xc87526ed, 0xdcfe314e), TOBN(0xeb84c524, 0x53d5cf99),
-     TOBN(0xb1b52ace, 0x515138b6), TOBN(0x5aa7ff8c, 0x23fca3f4),
-     TOBN(0xff0b13c3, 0xb9791a26), TOBN(0x960022da, 0xcdd58b16),
-     TOBN(0xdbd55c92, 0x57aad2de), TOBN(0x3baaaaa3, 0xf30fe619),
-     TOBN(0x9a4b2346, 0x0d881efd), TOBN(0x506416c0, 0x46325e2a),
-     TOBN(0x91381e76, 0x035c18d4), TOBN(0xb3bb68be, 0xf27817b0),
-     TOBN(0x15bfb8bf, 0x5116f937), TOBN(0x7c64a586, 0xc1268943),
-     TOBN(0x71e25cc3, 0x8419a2c8), TOBN(0x9fd6b0c4, 0x8335f463),
-     TOBN(0x4bf0ba3c, 0xe8ee0e0e), TOBN(0x6f6fba60, 0x298c21fa),
-     TOBN(0x57d57b39, 0xae66bee0), TOBN(0x292d5130, 0x22672544),
-     TOBN(0xf451105d, 0xbab093b3), TOBN(0x012f59b9, 0x02839986),
-     TOBN(0x8a915802, 0x3474a89c), TOBN(0x048c919c, 0x2de03e97),
-     TOBN(0xc476a2b5, 0x91071cd5), TOBN(0x791ed89a, 0x034970a5),
-     TOBN(0x89bd9042, 0xe1b7994b), TOBN(0x8eaf5179, 0xa1057ffd),
-     TOBN(0x6066e2a2, 0xd551ee10), TOBN(0x87a8f1d8, 0x727e09a6),
-     TOBN(0x00d08bab, 0x2c01148d), TOBN(0x6da8e4f1, 0x424f33fe),
-     TOBN(0x466d17f0, 0xcf9a4e71), TOBN(0xff502010, 0x3bf5cb19),
-     TOBN(0xdccf97d8, 0xd062ecc0), TOBN(0x80c0d9af, 0x81d80ac4),
-     TOBN(0xe87771d8, 0x033f2876), TOBN(0xb0186ec6, 0x7d5cc3db),
-     TOBN(0x58e8bb80, 0x3bc9bc1d), TOBN(0x4d1395cc, 0x6f6ef60e),
-     TOBN(0xa73c62d6, 0x186244a0), TOBN(0x918e5f23, 0x110a5b53),
-     TOBN(0xed4878ca, 0x741b7eab), TOBN(0x3038d71a, 0xdbe03e51),
-     TOBN(0x840204b7, 0xa93c3246), TOBN(0x21ab6069, 0xa0b9b4cd),
-     TOBN(0xf5fa6e2b, 0xb1d64218), TOBN(0x1de6ad0e, 0xf3d56191),
-     TOBN(0x570aaa88, 0xff1929c7), TOBN(0xc6df4c6b, 0x640e87b5),
-     TOBN(0xde8a74f2, 0xc65f0ccc), TOBN(0x8b972fd5, 0xe6f6cc01),
-     TOBN(0x3fff36b6, 0x0b846531), TOBN(0xba7e45e6, 0x10a5e475),
-     TOBN(0x84a1d10e, 0x4145b6c5), TOBN(0xf1f7f91a, 0x5e046d9d),
-     TOBN(0x0317a692, 0x44de90d7), TOBN(0x951a1d4a, 0xf199c15e),
-     TOBN(0x91f78046, 0xc9d73deb), TOBN(0x74c82828, 0xfab8224f),
-     TOBN(0xaa6778fc, 0xe7560b90), TOBN(0xb4073e61, 0xa7e824ce),
-     TOBN(0xff0d693c, 0xd642eba8), TOBN(0x7ce2e57a, 0x5dccef38),
-     TOBN(0x89c2c789, 0x1df1ad46), TOBN(0x83a06922, 0x098346fd),
-     TOBN(0x2d715d72, 0xda2fc177), TOBN(0x7b6dd71d, 0x85b6cf1d),
-     TOBN(0xc60a6d0a, 0x73fa9cb0), TOBN(0xedd3992e, 0x328bf5a9),
-     TOBN(0xc380ddd0, 0x832c8c82), TOBN(0xd182d410, 0xa2a0bf50),
-     TOBN(0x7d9d7438, 0xd9a528db), TOBN(0xe8b1a0e9, 0xcaf53994),
-     TOBN(0xddd6e5fe, 0x0e19987c), TOBN(0xacb8df03, 0x190b059d),
-     TOBN(0x53703a32, 0x8300129f), TOBN(0x1f637662, 0x68c43bfd),
-     TOBN(0xbcbd1913, 0x00e54051), TOBN(0x812fcc62, 0x7bf5a8c5),
-     TOBN(0x3f969d5f, 0x29fb85da), TOBN(0x72f4e00a, 0x694759e8),
-     TOBN(0x426b6e52, 0x790726b7), TOBN(0x617bbc87, 0x3bdbb209),
-     TOBN(0x511f8bb9, 0x97aee317), TOBN(0x812a4096, 0xe81536a8),
-     TOBN(0x137dfe59, 0x3ac09b9b), TOBN(0x0682238f, 0xba8c9a7a),
-     TOBN(0x7072ead6, 0xaeccb4bd), TOBN(0x6a34e9aa, 0x692ba633),
-     TOBN(0xc82eaec2, 0x6fff9d33), TOBN(0xfb753512, 0x1d4d2b62),
-     TOBN(0x1a0445ff, 0x1d7aadab), TOBN(0x65d38260, 0xd5f6a67c),
-     TOBN(0x6e62fb08, 0x91cfb26f), TOBN(0xef1e0fa5, 0x5c7d91d6),
-     TOBN(0x47e7c7ba, 0x33db72cd), TOBN(0x017cbc09, 0xfa7c74b2),
-     TOBN(0x3c931590, 0xf50a503c), TOBN(0xcac54f60, 0x616baa42),
-     TOBN(0x9b6cd380, 0xb2369f0f), TOBN(0x97d3a70d, 0x23c76151),
-     TOBN(0x5f9dd6fc, 0x9862a9c6), TOBN(0x044c4ab2, 0x12312f51),
-     TOBN(0x035ea0fd, 0x834a2ddc), TOBN(0x49e6b862, 0xcc7b826d),
-     TOBN(0xb03d6883, 0x62fce490), TOBN(0x62f2497a, 0xb37e36e9),
-     TOBN(0x04b005b6, 0xc6458293), TOBN(0x36bb5276, 0xe8d10af7),
-     TOBN(0xacf2dc13, 0x8ee617b8), TOBN(0x470d2d35, 0xb004b3d4),
-     TOBN(0x06790832, 0xfeeb1b77), TOBN(0x2bb75c39, 0x85657f9c),
-     TOBN(0xd70bd4ed, 0xc0f60004), TOBN(0xfe797ecc, 0x219b018b),
-     TOBN(0x9b5bec2a, 0x753aebcc), TOBN(0xdaf9f3dc, 0xc939eca5),
-     TOBN(0xd6bc6833, 0xd095ad09), TOBN(0x98abdd51, 0xdaa4d2fc),
-     TOBN(0xd9840a31, 0x8d168be5), TOBN(0xcf7c10e0, 0x2325a23c),
-     TOBN(0xa5c02aa0, 0x7e6ecfaf), TOBN(0x2462e7e6, 0xb5bfdf18),
-     TOBN(0xab2d8a8b, 0xa0cc3f12), TOBN(0x68dd485d, 0xbc672a29),
-     TOBN(0x72039752, 0x596f2cd3), TOBN(0x5d3eea67, 0xa0cf3d8d),
-     TOBN(0x810a1a81, 0xe6602671), TOBN(0x8f144a40, 0x14026c0c),
-     TOBN(0xbc753a6d, 0x76b50f85), TOBN(0xc4dc21e8, 0x645cd4a4),
-     TOBN(0xc5262dea, 0x521d0378), TOBN(0x802b8e0e, 0x05011c6f),
-     TOBN(0x1ba19cbb, 0x0b4c19ea), TOBN(0x21db64b5, 0xebf0aaec),
-     TOBN(0x1f394ee9, 0x70342f9d), TOBN(0x93a10aee, 0x1bc44a14),
-     TOBN(0xa7eed31b, 0x3efd0baa), TOBN(0x6e7c824e, 0x1d154e65),
-     TOBN(0xee23fa81, 0x9966e7ee), TOBN(0x64ec4aa8, 0x05b7920d),
-     TOBN(0x2d44462d, 0x2d90aad4), TOBN(0xf44dd195, 0xdf277ad5),
-     TOBN(0x8d6471f1, 0xbb46b6a1), TOBN(0x1e65d313, 0xfd885090),
-     TOBN(0x33a800f5, 0x13a977b4), TOBN(0xaca9d721, 0x0797e1ef),
-     TOBN(0x9a5a85a0, 0xfcff6a17), TOBN(0x9970a3f3, 0x1eca7cee),
-     TOBN(0xbb9f0d6b, 0xc9504be3), TOBN(0xe0c504be, 0xadd24ee2),
-     TOBN(0x7e09d956, 0x77fcc2f4), TOBN(0xef1a5227, 0x65bb5fc4),
-     TOBN(0x145d4fb1, 0x8b9286aa), TOBN(0x66fd0c5d, 0x6649028b),
-     TOBN(0x98857ceb, 0x1bf4581c), TOBN(0xe635e186, 0xaca7b166),
-     TOBN(0x278ddd22, 0x659722ac), TOBN(0xa0903c4c, 0x1db68007),
-     TOBN(0x366e4589, 0x48f21402), TOBN(0x31b49c14, 0xb96abda2),
-     TOBN(0x329c4b09, 0xe0403190), TOBN(0x97197ca3, 0xd29f43fe),
-     TOBN(0x8073dd1e, 0x274983d8), TOBN(0xda1a3bde, 0x55717c8f),
-     TOBN(0xfd3d4da2, 0x0361f9d1), TOBN(0x1332d081, 0x4c7de1ce),
-     TOBN(0x9b7ef7a3, 0xaa6d0e10), TOBN(0x17db2e73, 0xf54f1c4a),
-     TOBN(0xaf3dffae, 0x4cd35567), TOBN(0xaaa2f406, 0xe56f4e71),
-     TOBN(0x8966759e, 0x7ace3fc7), TOBN(0x9594eacf, 0x45a8d8c6),
-     TOBN(0x8de3bd8b, 0x91834e0e), TOBN(0xafe4ca53, 0x548c0421),
-     TOBN(0xfdd7e856, 0xe6ee81c6), TOBN(0x8f671beb, 0x6b891a3a),
-     TOBN(0xf7a58f2b, 0xfae63829), TOBN(0x9ab186fb, 0x9c11ac9f),
-     TOBN(0x8d6eb369, 0x10b5be76), TOBN(0x046b7739, 0xfb040bcd),
-     TOBN(0xccb4529f, 0xcb73de88), TOBN(0x1df0fefc, 0xcf26be03),
-     TOBN(0xad7757a6, 0xbcfcd027), TOBN(0xa8786c75, 0xbb3165ca),
-     TOBN(0xe9db1e34, 0x7e99a4d9), TOBN(0x99ee86df, 0xb06c504b),
-     TOBN(0x5b7c2ddd, 0xc15c9f0a), TOBN(0xdf87a734, 0x4295989e),
-     TOBN(0x59ece47c, 0x03d08fda), TOBN(0xb074d3dd, 0xad5fc702),
-     TOBN(0x20407903, 0x51a03776), TOBN(0x2bb1f77b, 0x2a608007),
-     TOBN(0x25c58f4f, 0xe1153185), TOBN(0xe6df62f6, 0x766e6447),
-     TOBN(0xefb3d1be, 0xed51275a), TOBN(0x5de47dc7, 0x2f0f483f),
-     TOBN(0x7932d98e, 0x97c2bedf), TOBN(0xd5c11927, 0x0219f8a1),
-     TOBN(0x9d751200, 0xa73a294e), TOBN(0x5f88434a, 0x9dc20172),
-     TOBN(0xd28d9fd3, 0xa26f506a), TOBN(0xa890cd31, 0x9d1dcd48),
-     TOBN(0x0aebaec1, 0x70f4d3b4), TOBN(0xfd1a1369, 0x0ffc8d00),
-     TOBN(0xb9d9c240, 0x57d57838), TOBN(0x45929d26, 0x68bac361),
-     TOBN(0x5a2cd060, 0x25b15ca6), TOBN(0x4b3c83e1, 0x6e474446),
-     TOBN(0x1aac7578, 0xee1e5134), TOBN(0xa418f5d6, 0xc91e2f41),
-     TOBN(0x6936fc8a, 0x213ed68b), TOBN(0x860ae7ed, 0x510a5224),
-     TOBN(0x63660335, 0xdef09b53), TOBN(0x641b2897, 0xcd79c98d),
-     TOBN(0x29bd38e1, 0x01110f35), TOBN(0x79c26f42, 0x648b1937),
-     TOBN(0x64dae519, 0x9d9164f4), TOBN(0xd85a2310, 0x0265c273),
-     TOBN(0x7173dd5d, 0x4b07e2b1), TOBN(0xd144c4cb, 0x8d9ea221),
-     TOBN(0xe8b04ea4, 0x1105ab14), TOBN(0x92dda542, 0xfe80d8f1),
-     TOBN(0xe9982fa8, 0xcf03dce6), TOBN(0x8b5ea965, 0x1a22cffc),
-     TOBN(0xf7f4ea7f, 0x3fad88c4), TOBN(0x62db773e, 0x6a5ba95c),
-     TOBN(0xd20f02fb, 0x93f24567), TOBN(0xfd46c69a, 0x315257ca),
-     TOBN(0x0ac74cc7, 0x8bcab987), TOBN(0x46f31c01, 0x5ceca2f5),
-     TOBN(0x40aedb59, 0x888b219e), TOBN(0xe50ecc37, 0xe1fccd02),
-     TOBN(0x1bcd9dad, 0x911f816c), TOBN(0x583cc1ec, 0x8db9b00c),
-     TOBN(0xf3cd2e66, 0xa483bf11), TOBN(0xfa08a6f5, 0xb1b2c169),
-     TOBN(0xf375e245, 0x4be9fa28), TOBN(0x99a7ffec, 0x5b6d011f),
-     TOBN(0x6a3ebddb, 0xc4ae62da), TOBN(0x6cea00ae, 0x374aef5d),
-     TOBN(0xab5fb98d, 0x9d4d05bc), TOBN(0x7cba1423, 0xd560f252),
-     TOBN(0x49b2cc21, 0x208490de), TOBN(0x1ca66ec3, 0xbcfb2879),
-     TOBN(0x7f1166b7, 0x1b6fb16f), TOBN(0xfff63e08, 0x65fe5db3),
-     TOBN(0xb8345abe, 0x8b2610be), TOBN(0xb732ed80, 0x39de3df4),
-     TOBN(0x0e24ed50, 0x211c32b4), TOBN(0xd10d8a69, 0x848ff27d),
-     TOBN(0xc1074398, 0xed4de248), TOBN(0xd7cedace, 0x10488927),
-     TOBN(0xa4aa6bf8, 0x85673e13), TOBN(0xb46bae91, 0x6daf30af),
-     TOBN(0x07088472, 0xfcef7ad8), TOBN(0x61151608, 0xd4b35e97),
-     TOBN(0xbcfe8f26, 0xdde29986), TOBN(0xeb84c4c7, 0xd5a34c79),
-     TOBN(0xc1eec55c, 0x164e1214), TOBN(0x891be86d, 0xa147bb03),
-     TOBN(0x9fab4d10, 0x0ba96835), TOBN(0xbf01e9b8, 0xa5c1ae9f),
-     TOBN(0x6b4de139, 0xb186ebc0), TOBN(0xd5c74c26, 0x85b91bca),
-     TOBN(0x5086a99c, 0xc2d93854), TOBN(0xeed62a7b, 0xa7a9dfbc),
-     TOBN(0x8778ed6f, 0x76b7618a), TOBN(0xbff750a5, 0x03b66062),
-     TOBN(0x4cb7be22, 0xb65186db), TOBN(0x369dfbf0, 0xcc3a6d13),
-     TOBN(0xc7dab26c, 0x7191a321), TOBN(0x9edac3f9, 0x40ed718e),
-     TOBN(0xbc142b36, 0xd0cfd183), TOBN(0xc8af82f6, 0x7c991693),
-     TOBN(0xb3d1e4d8, 0x97ce0b2a), TOBN(0xe6d7c87f, 0xc3a55cdf),
-     TOBN(0x35846b95, 0x68b81afe), TOBN(0x018d12af, 0xd3c239d8),
-     TOBN(0x2b2c6208, 0x01206e15), TOBN(0xe0e42453, 0xa3b882c6),
-     TOBN(0x854470a3, 0xa50162d5), TOBN(0x08157478, 0x7017a62a),
-     TOBN(0x18bd3fb4, 0x820357c7), TOBN(0x992039ae, 0x6f1458ad),
-     TOBN(0x9a1df3c5, 0x25b44aa1), TOBN(0x2d780357, 0xed3d5281),
-     TOBN(0x58cf7e4d, 0xc77ad4d4), TOBN(0xd49a7998, 0xf9df4fc4),
-     TOBN(0x4465a8b5, 0x1d71205e), TOBN(0xa0ee0ea6, 0x649254aa),
-     TOBN(0x4b5eeecf, 0xab7bd771), TOBN(0x6c873073, 0x35c262b9),
-     TOBN(0xdc5bd648, 0x3c9d61e7), TOBN(0x233d6d54, 0x321460d2),
-     TOBN(0xd20c5626, 0xfc195bcc), TOBN(0x25445958, 0x04d78b63),
-     TOBN(0xe03fcb3d, 0x17ec8ef3), TOBN(0x54b690d1, 0x46b8f781),
-     TOBN(0x82fa2c8a, 0x21230646), TOBN(0xf51aabb9, 0x084f418c),
-     TOBN(0xff4fbec1, 0x1a30ba43), TOBN(0x6a5acf73, 0x743c9df7),
-     TOBN(0x1da2b357, 0xd635b4d5), TOBN(0xc3de68dd, 0xecd5c1da),
-     TOBN(0xa689080b, 0xd61af0dd), TOBN(0xdea5938a, 0xd665bf99),
-     TOBN(0x0231d71a, 0xfe637294), TOBN(0x01968aa6, 0xa5a81cd8),
-     TOBN(0x11252d50, 0x048e63b5), TOBN(0xc446bc52, 0x6ca007e9),
-     TOBN(0xef8c50a6, 0x96d6134b), TOBN(0x9361fbf5, 0x9e09a05c),
-     TOBN(0xf17f85a6, 0xdca3291a), TOBN(0xb178d548, 0xff251a21),
-     TOBN(0x87f6374b, 0xa4df3915), TOBN(0x566ce1bf, 0x2fd5d608),
-     TOBN(0x425cba4d, 0x7de35102), TOBN(0x6b745f8f, 0x58c5d5e2),
-     TOBN(0x88402af6, 0x63122edf), TOBN(0x3190f9ed, 0x3b989a89),
-     TOBN(0x4ad3d387, 0xebba3156), TOBN(0xef385ad9, 0xc7c469a5),
-     TOBN(0xb08281de, 0x3f642c29), TOBN(0x20be0888, 0x910ffb88),
-     TOBN(0xf353dd4a, 0xd5292546), TOBN(0x3f1627de, 0x8377a262),
-     TOBN(0xa5faa013, 0xeefcd638), TOBN(0x8f3bf626, 0x74cc77c3),
-     TOBN(0x32618f65, 0xa348f55e), TOBN(0x5787c0dc, 0x9fefeb9e),
-     TOBN(0xf1673aa2, 0xd9a23e44), TOBN(0x88dfa993, 0x4e10690d),
-     TOBN(0x1ced1b36, 0x2bf91108), TOBN(0x9193ceca, 0x3af48649),
-     TOBN(0xfb34327d, 0x2d738fc5), TOBN(0x6697b037, 0x975fee6c),
-     TOBN(0x2f485da0, 0xc04079a5), TOBN(0x2cdf5735, 0x2feaa1ac),
-     TOBN(0x76944420, 0xbd55659e), TOBN(0x7973e32b, 0x4376090c),
-     TOBN(0x86bb4fe1, 0x163b591a), TOBN(0x10441aed, 0xc196f0ca),
-     TOBN(0x3b431f4a, 0x045ad915), TOBN(0x6c11b437, 0xa4afacb1),
-     TOBN(0x30b0c7db, 0x71fdbbd8), TOBN(0xb642931f, 0xeda65acd),
-     TOBN(0x4baae6e8, 0x9c92b235), TOBN(0xa73bbd0e, 0x6b3993a1),
-     TOBN(0xd06d60ec, 0x693dd031), TOBN(0x03cab91b, 0x7156881c),
-     TOBN(0xd615862f, 0x1db3574b), TOBN(0x485b0185, 0x64bb061a),
-     TOBN(0x27434988, 0xa0181e06), TOBN(0x2cd61ad4, 0xc1c0c757),
-     TOBN(0x3effed5a, 0x2ff9f403), TOBN(0x8dc98d8b, 0x62239029),
-     TOBN(0x2206021e, 0x1f17b70d), TOBN(0xafbec0ca, 0xbf510015),
-     TOBN(0x9fed7164, 0x80130dfa), TOBN(0x306dc2b5, 0x8a02dcf5),
-     TOBN(0x48f06620, 0xfeb10fc0), TOBN(0x78d1e1d5, 0x5a57cf51),
-     TOBN(0xadef8c5a, 0x192ef710), TOBN(0x88afbd4b, 0x3b7431f9),
-     TOBN(0x7e1f7407, 0x64250c9e), TOBN(0x6e31318d, 0xb58bec07),
-     TOBN(0xfd4fc4b8, 0x24f89b4e), TOBN(0x65a5dd88, 0x48c36a2a),
-     TOBN(0x4f1eccff, 0xf024baa7), TOBN(0x22a21cf2, 0xcba94650),
-     TOBN(0x95d29dee, 0x42a554f7), TOBN(0x828983a5, 0x002ec4ba),
-     TOBN(0x8112a1f7, 0x8badb73d), TOBN(0x79ea8897, 0xa27c1839),
-     TOBN(0x8969a5a7, 0xd065fd83), TOBN(0xf49af791, 0xb262a0bc),
-     TOBN(0xfcdea8b6, 0xaf2b5127), TOBN(0x10e913e1, 0x564c2dbc),
-     TOBN(0x51239d14, 0xbc21ef51), TOBN(0xe51c3ceb, 0x4ce57292),
-     TOBN(0x795ff068, 0x47bbcc3b), TOBN(0x86b46e1e, 0xbd7e11e6),
-     TOBN(0x0ea6ba23, 0x80041ef4), TOBN(0xd72fe505, 0x6262342e),
-     TOBN(0x8abc6dfd, 0x31d294d4), TOBN(0xbbe017a2, 0x1278c2c9),
-     TOBN(0xb1fcfa09, 0xb389328a), TOBN(0x322fbc62, 0xd01771b5),
-     TOBN(0x04c0d063, 0x60b045bf), TOBN(0xdb652edc, 0x10e52d01),
-     TOBN(0x50ef932c, 0x03ec6627), TOBN(0xde1b3b2d, 0xc1ee50e3),
-     TOBN(0x5ab7bdc5, 0xdc37a90d), TOBN(0xfea67213, 0x31e33a96),
-     TOBN(0x6482b5cb, 0x4f2999aa), TOBN(0x38476cc6, 0xb8cbf0dd),
-     TOBN(0x93ebfacb, 0x173405bb), TOBN(0x15cdafe7, 0xe52369ec),
-     TOBN(0xd42d5ba4, 0xd935b7db), TOBN(0x648b6004, 0x1c99a4cd),
-     TOBN(0x785101bd, 0xa3b5545b), TOBN(0x4bf2c38a, 0x9dd67faf),
-     TOBN(0xb1aadc63, 0x4442449c), TOBN(0xe0e9921a, 0x33ad4fb8),
-     TOBN(0x5c552313, 0xaa686d82), TOBN(0xdee635fa, 0x465d866c),
-     TOBN(0xbc3c224a, 0x18ee6e8a), TOBN(0xeed748a6, 0xed42e02f),
-     TOBN(0xe70f930a, 0xd474cd08), TOBN(0x774ea6ec, 0xfff24adf),
-     TOBN(0x03e2de1c, 0xf3480d4a), TOBN(0xf0d8edc7, 0xbc8acf1a),
-     TOBN(0xf23e3303, 0x68295a9c), TOBN(0xfadd5f68, 0xc546a97d),
-     TOBN(0x895597ad, 0x96f8acb1), TOBN(0xbddd49d5, 0x671bdae2),
-     TOBN(0x16fcd528, 0x21dd43f4), TOBN(0xa5a45412, 0x6619141a)}
-    ,
-    {TOBN(0x8ce9b6bf, 0xc360e25a), TOBN(0xe6425195, 0x075a1a78),
-     TOBN(0x9dc756a8, 0x481732f4), TOBN(0x83c0440f, 0x5432b57a),
-     TOBN(0xc670b3f1, 0xd720281f), TOBN(0x2205910e, 0xd135e051),
-     TOBN(0xded14b0e, 0xdb052be7), TOBN(0x697b3d27, 0xc568ea39),
-     TOBN(0x2e599b9a, 0xfb3ff9ed), TOBN(0x28c2e0ab, 0x17f6515c),
-     TOBN(0x1cbee4fd, 0x474da449), TOBN(0x071279a4, 0x4f364452),
-     TOBN(0x97abff66, 0x01fbe855), TOBN(0x3ee394e8, 0x5fda51c4),
-     TOBN(0x190385f6, 0x67597c0b), TOBN(0x6e9fccc6, 0xa27ee34b),
-     TOBN(0x0b89de93, 0x14092ebb), TOBN(0xf17256bd, 0x428e240c),
-     TOBN(0xcf89a7f3, 0x93d2f064), TOBN(0x4f57841e, 0xe1ed3b14),
-     TOBN(0x4ee14405, 0xe708d855), TOBN(0x856aae72, 0x03f1c3d0),
-     TOBN(0xc8e5424f, 0xbdd7eed5), TOBN(0x3333e4ef, 0x73ab4270),
-     TOBN(0x3bc77ade, 0xdda492f8), TOBN(0xc11a3aea, 0x78297205),
-     TOBN(0x5e89a3e7, 0x34931b4c), TOBN(0x17512e2e, 0x9f5694bb),
-     TOBN(0x5dc349f3, 0x177bf8b6), TOBN(0x232ea4ba, 0x08c7ff3e),
-     TOBN(0x9c4f9d16, 0xf511145d), TOBN(0xccf109a3, 0x33b379c3),
-     TOBN(0xe75e7a88, 0xa1f25897), TOBN(0x7ac6961f, 0xa1b5d4d8),
-     TOBN(0xe3e10773, 0x08f3ed5c), TOBN(0x208a54ec, 0x0a892dfb),
-     TOBN(0xbe826e19, 0x78660710), TOBN(0x0cf70a97, 0x237df2c8),
-     TOBN(0x418a7340, 0xed704da5), TOBN(0xa3eeb9a9, 0x08ca33fd),
-     TOBN(0x49d96233, 0x169bca96), TOBN(0x04d286d4, 0x2da6aafb),
-     TOBN(0xc09606ec, 0xa0c2fa94), TOBN(0x8869d0d5, 0x23ff0fb3),
-     TOBN(0xa99937e5, 0xd0150d65), TOBN(0xa92e2503, 0x240c14c9),
-     TOBN(0x656bf945, 0x108e2d49), TOBN(0x152a733a, 0xa2f59e2b),
-     TOBN(0xb4323d58, 0x8434a920), TOBN(0xc0af8e93, 0x622103c5),
-     TOBN(0x667518ef, 0x938dbf9a), TOBN(0xa1843073, 0x83a9cdf2),
-     TOBN(0x350a94aa, 0x5447ab80), TOBN(0xe5e5a325, 0xc75a3d61),
-     TOBN(0x74ba507f, 0x68411a9e), TOBN(0x10581fc1, 0x594f70c5),
-     TOBN(0x60e28570, 0x80eb24a9), TOBN(0x7bedfb4d, 0x488e0cfd),
-     TOBN(0x721ebbd7, 0xc259cdb8), TOBN(0x0b0da855, 0xbc6390a9),
-     TOBN(0x2b4d04db, 0xde314c70), TOBN(0xcdbf1fbc, 0x6c32e846),
-     TOBN(0x33833eab, 0xb162fc9e), TOBN(0x9939b48b, 0xb0dd3ab7),
-     TOBN(0x5aaa98a7, 0xcb0c9c8c), TOBN(0x75105f30, 0x81c4375c),
-     TOBN(0xceee5057, 0x5ef1c90f), TOBN(0xb31e065f, 0xc23a17bf),
-     TOBN(0x5364d275, 0xd4b6d45a), TOBN(0xd363f3ad, 0x62ec8996),
-     TOBN(0xb5d21239, 0x4391c65b), TOBN(0x84564765, 0xebb41b47),
-     TOBN(0x20d18ecc, 0x37107c78), TOBN(0xacff3b6b, 0x570c2a66),
-     TOBN(0x22f975d9, 0x9bd0d845), TOBN(0xef0a0c46, 0xba178fa0),
-     TOBN(0x1a419651, 0x76b6028e), TOBN(0xc49ec674, 0x248612d4),
-     TOBN(0x5b6ac4f2, 0x7338af55), TOBN(0x06145e62, 0x7bee5a36),
-     TOBN(0x33e95d07, 0xe75746b5), TOBN(0x1c1e1f6d, 0xc40c78be),
-     TOBN(0x967833ef, 0x222ff8e2), TOBN(0x4bedcf6a, 0xb49180ad),
-     TOBN(0x6b37e9c1, 0x3d7a4c8a), TOBN(0x2748887c, 0x6ddfe760),
-     TOBN(0xf7055123, 0xaa3a5bbc), TOBN(0x954ff225, 0x7bbb8e74),
-     TOBN(0xc42b8ab1, 0x97c3dfb9), TOBN(0x55a549b0, 0xcf168154),
-     TOBN(0xad6748e7, 0xc1b50692), TOBN(0x2775780f, 0x6fc5cbcb),
-     TOBN(0x4eab80b8, 0xe1c9d7c8), TOBN(0x8c69dae1, 0x3fdbcd56),
-     TOBN(0x47e6b4fb, 0x9969eace), TOBN(0x002f1085, 0xa705cb5a),
-     TOBN(0x4e23ca44, 0x6d3fea55), TOBN(0xb4ae9c86, 0xf4810568),
-     TOBN(0x47bfb91b, 0x2a62f27d), TOBN(0x60deb4c9, 0xd9bac28c),
-     TOBN(0xa892d894, 0x7de6c34c), TOBN(0x4ee68259, 0x4494587d),
-     TOBN(0x914ee14e, 0x1a3f8a5b), TOBN(0xbb113eaa, 0x28700385),
-     TOBN(0x81ca03b9, 0x2115b4c9), TOBN(0x7c163d38, 0x8908cad1),
-     TOBN(0xc912a118, 0xaa18179a), TOBN(0xe09ed750, 0x886e3081),
-     TOBN(0xa676e3fa, 0x26f516ca), TOBN(0x753cacf7, 0x8e732f91),
-     TOBN(0x51592aea, 0x833da8b4), TOBN(0xc626f42f, 0x4cbea8aa),
-     TOBN(0xef9dc899, 0xa7b56eaf), TOBN(0x00c0e52c, 0x34ef7316),
-     TOBN(0x5b1e4e24, 0xfe818a86), TOBN(0x9d31e20d, 0xc538be47),
-     TOBN(0x22eb932d, 0x3ed68974), TOBN(0xe44bbc08, 0x7c4e87c4),
-     TOBN(0x4121086e, 0x0dde9aef), TOBN(0x8e6b9cff, 0x134f4345),
-     TOBN(0x96892c1f, 0x711b0eb9), TOBN(0xb905f2c8, 0x780ab954),
-     TOBN(0xace26309, 0xa20792db), TOBN(0xec8ac9b3, 0x0684e126),
-     TOBN(0x486ad8b6, 0xb40a2447), TOBN(0x60121fc1, 0x9fe3fb24),
-     TOBN(0x5626fccf, 0x1a8e3b3f), TOBN(0x4e568622, 0x6ad1f394),
-     TOBN(0xda7aae0d, 0x196aa5a1), TOBN(0xe0df8c77, 0x1041b5fb),
-     TOBN(0x451465d9, 0x26b318b7), TOBN(0xc29b6e55, 0x7ab136e9),
-     TOBN(0x2c2ab48b, 0x71148463), TOBN(0xb5738de3, 0x64454a76),
-     TOBN(0x54ccf9a0, 0x5a03abe4), TOBN(0x377c0296, 0x0427d58e),
-     TOBN(0x73f5f0b9, 0x2bb39c1f), TOBN(0x14373f2c, 0xe608d8c5),
-     TOBN(0xdcbfd314, 0x00fbb805), TOBN(0xdf18fb20, 0x83afdcfb),
-     TOBN(0x81a57f42, 0x42b3523f), TOBN(0xe958532d, 0x87f650fb),
-     TOBN(0xaa8dc8b6, 0x8b0a7d7c), TOBN(0x1b75dfb7, 0x150166be),
-     TOBN(0x90e4f7c9, 0x2d7d1413), TOBN(0x67e2d6b5, 0x9834f597),
-     TOBN(0x4fd4f4f9, 0xa808c3e8), TOBN(0xaf8237e0, 0xd5281ec1),
-     TOBN(0x25ab5fdc, 0x84687cee), TOBN(0xc5ded6b1, 0xa5b26c09),
-     TOBN(0x8e4a5aec, 0xc8ea7650), TOBN(0x23b73e5c, 0x14cc417f),
-     TOBN(0x2bfb4318, 0x3037bf52), TOBN(0xb61e6db5, 0x78c725d7),
-     TOBN(0x8efd4060, 0xbbb3e5d7), TOBN(0x2e014701, 0xdbac488e),
-     TOBN(0xac75cf9a, 0x360aa449), TOBN(0xb70cfd05, 0x79634d08),
-     TOBN(0xa591536d, 0xfffb15ef), TOBN(0xb2c37582, 0xd07c106c),
-     TOBN(0xb4293fdc, 0xf50225f9), TOBN(0xc52e175c, 0xb0e12b03),
-     TOBN(0xf649c3ba, 0xd0a8bf64), TOBN(0x745a8fef, 0xeb8ae3c6),
-     TOBN(0x30d7e5a3, 0x58321bc3), TOBN(0xb1732be7, 0x0bc4df48),
-     TOBN(0x1f217993, 0xe9ea5058), TOBN(0xf7a71cde, 0x3e4fd745),
-     TOBN(0x86cc533e, 0x894c5bbb), TOBN(0x6915c7d9, 0x69d83082),
-     TOBN(0xa6aa2d05, 0x5815c244), TOBN(0xaeeee592, 0x49b22ce5),
-     TOBN(0x89e39d13, 0x78135486), TOBN(0x3a275c1f, 0x16b76f2f),
-     TOBN(0xdb6bcc1b, 0xe036e8f5), TOBN(0x4df69b21, 0x5e4709f5),
-     TOBN(0xa188b250, 0x2d0f39aa), TOBN(0x622118bb, 0x15a85947),
-     TOBN(0x2ebf520f, 0xfde0f4fa), TOBN(0xa40e9f29, 0x4860e539),
-     TOBN(0x7b6a51eb, 0x22b57f0f), TOBN(0x849a33b9, 0x7e80644a),
-     TOBN(0x50e5d16f, 0x1cf095fe), TOBN(0xd754b54e, 0xec55f002),
-     TOBN(0x5cfbbb22, 0x236f4a98), TOBN(0x0b0c59e9, 0x066800bb),
-     TOBN(0x4ac69a8f, 0x5a9a7774), TOBN(0x2b33f804, 0xd6bec948),
-     TOBN(0xb3729295, 0x32e6c466), TOBN(0x68956d0f, 0x4e599c73),
-     TOBN(0xa47a249f, 0x155c31cc), TOBN(0x24d80f0d, 0xe1ce284e),
-     TOBN(0xcd821dfb, 0x988baf01), TOBN(0xe6331a7d, 0xdbb16647),
-     TOBN(0x1eb8ad33, 0x094cb960), TOBN(0x593cca38, 0xc91bbca5),
-     TOBN(0x384aac8d, 0x26567456), TOBN(0x40fa0309, 0xc04b6490),
-     TOBN(0x97834cd6, 0xdab6c8f6), TOBN(0x68a7318d, 0x3f91e55f),
-     TOBN(0xa00fd04e, 0xfc4d3157), TOBN(0xb56f8ab2, 0x2bf3bdea),
-     TOBN(0x014f5648, 0x4fa57172), TOBN(0x948c5860, 0x450abdb3),
-     TOBN(0x342b5df0, 0x0ebd4f08), TOBN(0x3e5168cd, 0x0e82938e),
-     TOBN(0x7aedc1ce, 0xb0df5dd0), TOBN(0x6bbbc6d9, 0xe5732516),
-     TOBN(0xc7bfd486, 0x605daaa6), TOBN(0x46fd72b7, 0xbb9a6c9e),
-     TOBN(0xe4847fb1, 0xa124fb89), TOBN(0x75959cbd, 0xa2d8ffbc),
-     TOBN(0x42579f65, 0xc8a588ee), TOBN(0x368c92e6, 0xb80b499d),
-     TOBN(0xea4ef6cd, 0x999a5df1), TOBN(0xaa73bb7f, 0x936fe604),
-     TOBN(0xf347a70d, 0x6457d188), TOBN(0x86eda86b, 0x8b7a388b),
-     TOBN(0xb7cdff06, 0x0ccd6013), TOBN(0xbeb1b6c7, 0xd0053fb2),
-     TOBN(0x0b022387, 0x99240a9f), TOBN(0x1bbb384f, 0x776189b2),
-     TOBN(0x8695e71e, 0x9066193a), TOBN(0x2eb50097, 0x06ffac7e),
-     TOBN(0x0654a9c0, 0x4a7d2caa), TOBN(0x6f3fb3d1, 0xa5aaa290),
-     TOBN(0x835db041, 0xff476e8f), TOBN(0x540b8b0b, 0xc42295e4),
-     TOBN(0xa5c73ac9, 0x05e214f5), TOBN(0x9a74075a, 0x56a0b638),
-     TOBN(0x2e4b1090, 0xce9e680b), TOBN(0x57a5b479, 0x6b8d9afa),
-     TOBN(0x0dca48e7, 0x26bfe65c), TOBN(0x097e391c, 0x7290c307),
-     TOBN(0x683c462e, 0x6669e72e), TOBN(0xf505be1e, 0x062559ac),
-     TOBN(0x5fbe3ea1, 0xe3a3035a), TOBN(0x6431ebf6, 0x9cd50da8),
-     TOBN(0xfd169d5c, 0x1f6407f2), TOBN(0x8d838a95, 0x60fce6b8),
-     TOBN(0x2a2bfa7f, 0x650006f0), TOBN(0xdfd7dad3, 0x50c0fbb2),
-     TOBN(0x92452495, 0xccf9ad96), TOBN(0x183bf494, 0xd95635f9),
-     TOBN(0x02d5df43, 0x4a7bd989), TOBN(0x505385cc, 0xa5431095),
-     TOBN(0xdd98e67d, 0xfd43f53e), TOBN(0xd61e1a6c, 0x500c34a9),
-     TOBN(0x5a4b46c6, 0x4a8a3d62), TOBN(0x8469c4d0, 0x247743d2),
-     TOBN(0x2bb3a13d, 0x88f7e433), TOBN(0x62b23a10, 0x01be5849),
-     TOBN(0xe83596b4, 0xa63d1a4c), TOBN(0x454e7fea, 0x7d183f3e),
-     TOBN(0x643fce61, 0x17afb01c), TOBN(0x4e65e5e6, 0x1c4c3638),
-     TOBN(0x41d85ea1, 0xef74c45b), TOBN(0x2cfbfa66, 0xae328506),
-     TOBN(0x98b078f5, 0x3ada7da9), TOBN(0xd985fe37, 0xec752fbb),
-     TOBN(0xeece68fe, 0x5a0148b4), TOBN(0x6f9a55c7, 0x2d78136d),
-     TOBN(0x232dccc4, 0xd2b729ce), TOBN(0xa27e0dfd, 0x90aafbc4),
-     TOBN(0x96474452, 0x12b4603e), TOBN(0xa876c551, 0x6b706d14),
-     TOBN(0xdf145fcf, 0x69a9d412), TOBN(0xe2ab75b7, 0x2d479c34),
-     TOBN(0x12df9a76, 0x1a23ff97), TOBN(0xc6138992, 0x5d359d10),
-     TOBN(0x6e51c7ae, 0xfa835f22), TOBN(0x69a79cb1, 0xc0fcc4d9),
-     TOBN(0xf57f350d, 0x594cc7e1), TOBN(0x3079ca63, 0x3350ab79),
-     TOBN(0x226fb614, 0x9aff594a), TOBN(0x35afec02, 0x6d59a62b),
-     TOBN(0x9bee46f4, 0x06ed2c6e), TOBN(0x58da1735, 0x7d939a57),
-     TOBN(0x44c50402, 0x8fd1797e), TOBN(0xd8853e7c, 0x5ccea6ca),
-     TOBN(0x4065508d, 0xa35fcd5f), TOBN(0x8965df8c, 0x495ccaeb),
-     TOBN(0x0f2da850, 0x12e1a962), TOBN(0xee471b94, 0xc1cf1cc4),
-     TOBN(0xcef19bc8, 0x0a08fb75), TOBN(0x704958f5, 0x81de3591),
-     TOBN(0x2867f8b2, 0x3aef4f88), TOBN(0x8d749384, 0xea9f9a5f),
-     TOBN(0x1b385537, 0x8c9049f4), TOBN(0x5be948f3, 0x7b92d8b6),
-     TOBN(0xd96f725d, 0xb6e2bd6b), TOBN(0x37a222bc, 0x958c454d),
-     TOBN(0xe7c61abb, 0x8809bf61), TOBN(0x46f07fbc, 0x1346f18d),
-     TOBN(0xfb567a7a, 0xe87c0d1c), TOBN(0x84a461c8, 0x7ef3d07a),
-     TOBN(0x0a5adce6, 0xd9278d98), TOBN(0x24d94813, 0x9dfc73e1),
-     TOBN(0x4f3528b6, 0x054321c3), TOBN(0x2e03fdde, 0x692ea706),
-     TOBN(0x10e60619, 0x47b533c0), TOBN(0x1a8bc73f, 0x2ca3c055),
-     TOBN(0xae58d4b2, 0x1bb62b8f), TOBN(0xb2045a73, 0x584a24e3),
-     TOBN(0x3ab3d5af, 0xbd76e195), TOBN(0x478dd1ad, 0x6938a810),
-     TOBN(0x6ffab393, 0x6ee3d5cb), TOBN(0xdfb693db, 0x22b361e4),
-     TOBN(0xf9694496, 0x51dbf1a7), TOBN(0xcab4b4ef, 0x08a2e762),
-     TOBN(0xe8c92f25, 0xd39bba9a), TOBN(0x850e61bc, 0xf1464d96),
-     TOBN(0xb7e830e3, 0xdc09508b), TOBN(0xfaf6d2cf, 0x74317655),
-     TOBN(0x72606ceb, 0xdf690355), TOBN(0x48bb92b3, 0xd0c3ded6),
-     TOBN(0x65b75484, 0x5c7cf892), TOBN(0xf6cd7ac9, 0xd5d5f01f),
-     TOBN(0xc2c30a59, 0x96401d69), TOBN(0x91268650, 0xed921878),
-     TOBN(0x380bf913, 0xb78c558f), TOBN(0x43c0baeb, 0xc8afdaa9),
-     TOBN(0x377f61d5, 0x54f169d3), TOBN(0xf8da07e3, 0xae5ff20b),
-     TOBN(0xb676c49d, 0xa8a90ea8), TOBN(0x81c1ff2b, 0x83a29b21),
-     TOBN(0x383297ac, 0x2ad8d276), TOBN(0x3001122f, 0xba89f982),
-     TOBN(0xe1d794be, 0x6718e448), TOBN(0x246c1482, 0x7c3e6e13),
-     TOBN(0x56646ef8, 0x5d26b5ef), TOBN(0x80f5091e, 0x88069cdd),
-     TOBN(0xc5992e2f, 0x724bdd38), TOBN(0x02e915b4, 0x8471e8c7),
-     TOBN(0x96ff320a, 0x0d0ff2a9), TOBN(0xbf886487, 0x4384d1a0),
-     TOBN(0xbbe1e6a6, 0xc93f72d6), TOBN(0xd5f75d12, 0xcad800ea),
-     TOBN(0xfa40a09f, 0xe7acf117), TOBN(0x32c8cdd5, 0x7581a355),
-     TOBN(0x74221992, 0x7023c499), TOBN(0xa8afe5d7, 0x38ec3901),
-     TOBN(0x5691afcb, 0xa90e83f0), TOBN(0x41bcaa03, 0x0b8f8eac),
-     TOBN(0xe38b5ff9, 0x8d2668d5), TOBN(0x0715281a, 0x7ad81965),
-     TOBN(0x1bc8fc7c, 0x03c6ce11), TOBN(0xcbbee6e2, 0x8b650436),
-     TOBN(0x06b00fe8, 0x0cdb9808), TOBN(0x17d6e066, 0xfe3ed315),
-     TOBN(0x2e9d38c6, 0x4d0b5018), TOBN(0xab8bfd56, 0x844dcaef),
-     TOBN(0x42894a59, 0x513aed8b), TOBN(0xf77f3b6d, 0x314bd07a),
-     TOBN(0xbbdecb8f, 0x8e42b582), TOBN(0xf10e2fa8, 0xd2390fe6),
-     TOBN(0xefb95022, 0x62a2f201), TOBN(0x4d59ea50, 0x50ee32b0),
-     TOBN(0xd87f7728, 0x6da789a8), TOBN(0xcf98a2cf, 0xf79492c4),
-     TOBN(0xf9577239, 0x720943c2), TOBN(0xba044cf5, 0x3990b9d0),
-     TOBN(0x5aa8e823, 0x95f2884a), TOBN(0x834de6ed, 0x0278a0af),
-     TOBN(0xc8e1ee9a, 0x5f25bd12), TOBN(0x9259ceaa, 0x6f7ab271),
-     TOBN(0x7e6d97a2, 0x77d00b76), TOBN(0x5c0c6eea, 0xa437832a),
-     TOBN(0x5232c20f, 0x5606b81d), TOBN(0xabd7b375, 0x0d991ee5),
-     TOBN(0x4d2bfe35, 0x8632d951), TOBN(0x78f85146, 0x98ed9364),
-     TOBN(0x951873f0, 0xf30c3282), TOBN(0x0da8ac80, 0xa789230b),
-     TOBN(0x3ac7789c, 0x5398967f), TOBN(0xa69b8f7f, 0xbdda0fb5),
-     TOBN(0xe5db7717, 0x6add8545), TOBN(0x1b71cb66, 0x72c49b66),
-     TOBN(0xd8560739, 0x68421d77), TOBN(0x03840fe8, 0x83e3afea),
-     TOBN(0xb391dad5, 0x1ec69977), TOBN(0xae243fb9, 0x307f6726),
-     TOBN(0xc88ac87b, 0xe8ca160c), TOBN(0x5174cced, 0x4ce355f4),
-     TOBN(0x98a35966, 0xe58ba37d), TOBN(0xfdcc8da2, 0x7817335d),
-     TOBN(0x5b752830, 0x83fbc7bf), TOBN(0x68e419d4, 0xd9c96984),
-     TOBN(0x409a39f4, 0x02a40380), TOBN(0x88940faf, 0x1fe977bc),
-     TOBN(0xc640a94b, 0x8f8edea6), TOBN(0x1e22cd17, 0xed11547d),
-     TOBN(0xe28568ce, 0x59ffc3e2), TOBN(0x60aa1b55, 0xc1dee4e7),
-     TOBN(0xc67497c8, 0x837cb363), TOBN(0x06fb438a, 0x105a2bf2),
-     TOBN(0x30357ec4, 0x500d8e20), TOBN(0x1ad9095d, 0x0670db10),
-     TOBN(0x7f589a05, 0xc73b7cfd), TOBN(0xf544607d, 0x880d6d28),
-     TOBN(0x17ba93b1, 0xa20ef103), TOBN(0xad859130, 0x6ba6577b),
-     TOBN(0x65c91cf6, 0x6fa214a0), TOBN(0xd7d49c6c, 0x27990da5),
-     TOBN(0xecd9ec8d, 0x20bb569d), TOBN(0xbd4b2502, 0xeeffbc33),
-     TOBN(0x2056ca5a, 0x6bed0467), TOBN(0x7916a1f7, 0x5b63728c),
-     TOBN(0xd4f9497d, 0x53a4f566), TOBN(0x89734664, 0x97b56810),
-     TOBN(0xf8e1da74, 0x0494a621), TOBN(0x82546a93, 0x8d011c68),
-     TOBN(0x1f3acb19, 0xc61ac162), TOBN(0x52f8fa9c, 0xabad0d3e),
-     TOBN(0x15356523, 0xb4b7ea43), TOBN(0x5a16ad61, 0xae608125),
-     TOBN(0xb0bcb87f, 0x4faed184), TOBN(0x5f236b1d, 0x5029f45f),
-     TOBN(0xd42c7607, 0x0bc6b1fc), TOBN(0xc644324e, 0x68aefce3),
-     TOBN(0x8e191d59, 0x5c5d8446), TOBN(0xc0208077, 0x13ae1979),
-     TOBN(0xadcaee55, 0x3ba59cc7), TOBN(0x20ed6d6b, 0xa2cb81ba),
-     TOBN(0x0952ba19, 0xb6efcffc), TOBN(0x60f12d68, 0x97c0b87c),
-     TOBN(0x4ee2c7c4, 0x9caa30bc), TOBN(0x767238b7, 0x97fbff4e),
-     TOBN(0xebc73921, 0x501b5d92), TOBN(0x3279e3df, 0xc2a37737),
-     TOBN(0x9fc12bc8, 0x6d197543), TOBN(0xfa94dc6f, 0x0a40db4e),
-     TOBN(0x7392b41a, 0x530ccbbd), TOBN(0x87c82146, 0xea823525),
-     TOBN(0xa52f984c, 0x05d98d0c), TOBN(0x2ae57d73, 0x5ef6974c),
-     TOBN(0x9377f7bf, 0x3042a6dd), TOBN(0xb1a007c0, 0x19647a64),
-     TOBN(0xfaa9079a, 0x0cca9767), TOBN(0x3d81a25b, 0xf68f72d5),
-     TOBN(0x752067f8, 0xff81578e), TOBN(0x78622150, 0x9045447d),
-     TOBN(0xc0c22fcf, 0x0505aa6f), TOBN(0x1030f0a6, 0x6bed1c77),
-     TOBN(0x31f29f15, 0x1f0bd739), TOBN(0x2d7989c7, 0xe6debe85),
-     TOBN(0x5c070e72, 0x8e677e98), TOBN(0x0a817bd3, 0x06e81fd5),
-     TOBN(0xc110d830, 0xb0f2ac95), TOBN(0x48d0995a, 0xab20e64e),
-     TOBN(0x0f3e00e1, 0x7729cd9a), TOBN(0x2a570c20, 0xdd556946),
-     TOBN(0x912dbcfd, 0x4e86214d), TOBN(0x2d014ee2, 0xcf615498),
-     TOBN(0x55e2b1e6, 0x3530d76e), TOBN(0xc5135ae4, 0xfd0fd6d1),
-     TOBN(0x0066273a, 0xd4f3049f), TOBN(0xbb8e9893, 0xe7087477),
-     TOBN(0x2dba1ddb, 0x14c6e5fd), TOBN(0xdba37886, 0x51f57e6c),
-     TOBN(0x5aaee0a6, 0x5a72f2cf), TOBN(0x1208bfbf, 0x7bea5642),
-     TOBN(0xf5c6aa3b, 0x67872c37), TOBN(0xd726e083, 0x43f93224),
-     TOBN(0x1854daa5, 0x061f1658), TOBN(0xc0016df1, 0xdf0cd2b3),
-     TOBN(0xc2a3f23e, 0x833d50de), TOBN(0x73b681d2, 0xbbbd3017),
-     TOBN(0x2f046dc4, 0x3ac343c0), TOBN(0x9c847e7d, 0x85716421),
-     TOBN(0xe1e13c91, 0x0917eed4), TOBN(0x3fc9eebd, 0x63a1b9c6),
-     TOBN(0x0f816a72, 0x7fe02299), TOBN(0x6335ccc2, 0x294f3319),
-     TOBN(0x3820179f, 0x4745c5be), TOBN(0xe647b782, 0x922f066e),
-     TOBN(0xc22e49de, 0x02cafb8a), TOBN(0x299bc2ff, 0xfcc2eccc),
-     TOBN(0x9a8feea2, 0x6e0e8282), TOBN(0xa627278b, 0xfe893205),
-     TOBN(0xa7e19733, 0x7933e47b), TOBN(0xf4ff6b13, 0x2e766402),
-     TOBN(0xa4d8be0a, 0x98440d9f), TOBN(0x658f5c2f, 0x38938808),
-     TOBN(0x90b75677, 0xc95b3b3e), TOBN(0xfa044269, 0x3137b6ff),
-     TOBN(0x077b039b, 0x43c47c29), TOBN(0xcca95dd3, 0x8a6445b2),
-     TOBN(0x0b498ba4, 0x2333fc4c), TOBN(0x274f8e68, 0xf736a1b1),
-     TOBN(0x6ca348fd, 0x5f1d4b2e), TOBN(0x24d3be78, 0xa8f10199),
-     TOBN(0x8535f858, 0xca14f530), TOBN(0xa6e7f163, 0x5b982e51),
-     TOBN(0x847c8512, 0x36e1bf62), TOBN(0xf6a7c58e, 0x03448418),
-     TOBN(0x583f3703, 0xf9374ab6), TOBN(0x864f9195, 0x6e564145),
-     TOBN(0x33bc3f48, 0x22526d50), TOBN(0x9f323c80, 0x1262a496),
-     TOBN(0xaa97a7ae, 0x3f046a9a), TOBN(0x70da183e, 0xdf8a039a),
-     TOBN(0x5b68f71c, 0x52aa0ba6), TOBN(0x9be0fe51, 0x21459c2d),
-     TOBN(0xc1e17eb6, 0xcbc613e5), TOBN(0x33131d55, 0x497ea61c),
-     TOBN(0x2f69d39e, 0xaf7eded5), TOBN(0x73c2f434, 0xde6af11b),
-     TOBN(0x4ca52493, 0xa4a375fa), TOBN(0x5f06787c, 0xb833c5c2),
-     TOBN(0x814e091f, 0x3e6e71cf), TOBN(0x76451f57, 0x8b746666)}
-    ,
-    {TOBN(0x80f9bdef, 0x694db7e0), TOBN(0xedca8787, 0xb9fcddc6),
-     TOBN(0x51981c34, 0x03b8dce1), TOBN(0x4274dcf1, 0x70e10ba1),
-     TOBN(0xf72743b8, 0x6def6d1a), TOBN(0xd25b1670, 0xebdb1866),
-     TOBN(0xc4491e8c, 0x050c6f58), TOBN(0x2be2b2ab, 0x87fbd7f5),
-     TOBN(0x3e0e5c9d, 0xd111f8ec), TOBN(0xbcc33f8d, 0xb7c4e760),
-     TOBN(0x702f9a91, 0xbd392a51), TOBN(0x7da4a795, 0xc132e92d),
-     TOBN(0x1a0b0ae3, 0x0bb1151b), TOBN(0x54febac8, 0x02e32251),
-     TOBN(0xea3a5082, 0x694e9e78), TOBN(0xe58ffec1, 0xe4fe40b8),
-     TOBN(0xf85592fc, 0xd1e0cf9e), TOBN(0xdea75f0d, 0xc0e7b2e8),
-     TOBN(0xc04215cf, 0xc135584e), TOBN(0x174fc727, 0x2f57092a),
-     TOBN(0xe7277877, 0xeb930bea), TOBN(0x504caccb, 0x5eb02a5a),
-     TOBN(0xf9fe08f7, 0xf5241b9b), TOBN(0xe7fb62f4, 0x8d5ca954),
-     TOBN(0xfbb8349d, 0x29c4120b), TOBN(0x9f94391f, 0xc0d0d915),
-     TOBN(0xc4074fa7, 0x5410ba51), TOBN(0xa66adbf6, 0x150a5911),
-     TOBN(0xc164543c, 0x34bfca38), TOBN(0xe0f27560, 0xb9e1ccfc),
-     TOBN(0x99da0f53, 0xe820219c), TOBN(0xe8234498, 0xc6b4997a),
-     TOBN(0xcfb88b76, 0x9d4c5423), TOBN(0x9e56eb10, 0xb0521c49),
-     TOBN(0x418e0b5e, 0xbe8700a1), TOBN(0x00cbaad6, 0xf93cb58a),
-     TOBN(0xe923fbde, 0xd92a5e67), TOBN(0xca4979ac, 0x1f347f11),
-     TOBN(0x89162d85, 0x6bc0585b), TOBN(0xdd6254af, 0xac3c70e3),
-     TOBN(0x7b23c513, 0x516e19e4), TOBN(0x56e2e847, 0xc5c4d593),
-     TOBN(0x9f727d73, 0x5ce71ef6), TOBN(0x5b6304a6, 0xf79a44c5),
-     TOBN(0x6638a736, 0x3ab7e433), TOBN(0x1adea470, 0xfe742f83),
-     TOBN(0xe054b854, 0x5b7fc19f), TOBN(0xf935381a, 0xba1d0698),
-     TOBN(0x546eab2d, 0x799e9a74), TOBN(0x96239e0e, 0xa949f729),
-     TOBN(0xca274c6b, 0x7090055a), TOBN(0x835142c3, 0x9020c9b0),
-     TOBN(0xa405667a, 0xa2e8807f), TOBN(0x29f2c085, 0x1aa3d39e),
-     TOBN(0xcc555d64, 0x42fc72f5), TOBN(0xe856e0e7, 0xfbeacb3c),
-     TOBN(0xb5504f9d, 0x918e4936), TOBN(0x65035ef6, 0xb2513982),
-     TOBN(0x0553a0c2, 0x6f4d9cb9), TOBN(0x6cb10d56, 0xbea85509),
-     TOBN(0x48d957b7, 0xa242da11), TOBN(0x16a4d3dd, 0x672b7268),
-     TOBN(0x3d7e637c, 0x8502a96b), TOBN(0x27c7032b, 0x730d463b),
-     TOBN(0xbdc02b18, 0xe4136a14), TOBN(0xbacf969d, 0x678e32bf),
-     TOBN(0xc98d89a3, 0xdd9c3c03), TOBN(0x7b92420a, 0x23becc4f),
-     TOBN(0xd4b41f78, 0xc64d565c), TOBN(0x9f969d00, 0x10f28295),
-     TOBN(0xec7f7f76, 0xb13d051a), TOBN(0x08945e1e, 0xa92da585),
-     TOBN(0x55366b7d, 0x5846426f), TOBN(0xe7d09e89, 0x247d441d),
-     TOBN(0x510b404d, 0x736fbf48), TOBN(0x7fa003d0, 0xe784bd7d),
-     TOBN(0x25f7614f, 0x17fd9596), TOBN(0x49e0e0a1, 0x35cb98db),
-     TOBN(0x2c65957b, 0x2e83a76a), TOBN(0x5d40da8d, 0xcddbe0f8),
-     TOBN(0xf2b8c405, 0x050bad24), TOBN(0x8918426d, 0xc2aa4823),
-     TOBN(0x2aeab3dd, 0xa38365a7), TOBN(0x72031717, 0x7c91b690),
-     TOBN(0x8b00d699, 0x60a94120), TOBN(0x478a255d, 0xe99eaeec),
-     TOBN(0xbf656a5f, 0x6f60aafd), TOBN(0xdfd7cb75, 0x5dee77b3),
-     TOBN(0x37f68bb4, 0xa595939d), TOBN(0x03556479, 0x28740217),
-     TOBN(0x8e740e7c, 0x84ad7612), TOBN(0xd89bc843, 0x9044695f),
-     TOBN(0xf7f3da5d, 0x85a9184d), TOBN(0x562563bb, 0x9fc0b074),
-     TOBN(0x06d2e6aa, 0xf88a888e), TOBN(0x612d8643, 0x161fbe7c),
-     TOBN(0x465edba7, 0xf64085e7), TOBN(0xb230f304, 0x29aa8511),
-     TOBN(0x53388426, 0xcda2d188), TOBN(0x90885735, 0x4b666649),
-     TOBN(0x6f02ff9a, 0x652f54f6), TOBN(0x65c82294, 0x5fae2bf0),
-     TOBN(0x7816ade0, 0x62f5eee3), TOBN(0xdcdbdf43, 0xfcc56d70),
-     TOBN(0x9fb3bba3, 0x54530bb2), TOBN(0xbde3ef77, 0xcb0869ea),
-     TOBN(0x89bc9046, 0x0b431163), TOBN(0x4d03d7d2, 0xe4819a35),
-     TOBN(0x33ae4f9e, 0x43b6a782), TOBN(0x216db307, 0x9c88a686),
-     TOBN(0x91dd88e0, 0x00ffedd9), TOBN(0xb280da9f, 0x12bd4840),
-     TOBN(0x32a7cb8a, 0x1635e741), TOBN(0xfe14008a, 0x78be02a7),
-     TOBN(0x3fafb334, 0x1b7ae030), TOBN(0x7fd508e7, 0x5add0ce9),
-     TOBN(0x72c83219, 0xd607ad51), TOBN(0x0f229c0a, 0x8d40964a),
-     TOBN(0x1be2c336, 0x1c878da2), TOBN(0xe0c96742, 0xeab2ab86),
-     TOBN(0x458f8691, 0x3e538cd7), TOBN(0xa7001f6c, 0x8e08ad53),
-     TOBN(0x52b8c6e6, 0xbf5d15ff), TOBN(0x548234a4, 0x011215dd),
-     TOBN(0xff5a9d2d, 0x3d5b4045), TOBN(0xb0ffeeb6, 0x4a904190),
-     TOBN(0x55a3aca4, 0x48607f8b), TOBN(0x8cbd665c, 0x30a0672a),
-     TOBN(0x87f834e0, 0x42583068), TOBN(0x02da2aeb, 0xf3f6e683),
-     TOBN(0x6b763e5d, 0x05c12248), TOBN(0x7230378f, 0x65a8aefc),
-     TOBN(0x93bd80b5, 0x71e8e5ca), TOBN(0x53ab041c, 0xb3b62524),
-     TOBN(0x1b860513, 0x6c9c552e), TOBN(0xe84d402c, 0xd5524e66),
-     TOBN(0xa37f3573, 0xf37f5937), TOBN(0xeb0f6c7d, 0xd1e4fca5),
-     TOBN(0x2965a554, 0xac8ab0fc), TOBN(0x17fbf56c, 0x274676ac),
-     TOBN(0x2e2f6bd9, 0xacf7d720), TOBN(0x41fc8f88, 0x10224766),
-     TOBN(0x517a14b3, 0x85d53bef), TOBN(0xdae327a5, 0x7d76a7d1),
-     TOBN(0x6ad0a065, 0xc4818267), TOBN(0x33aa189b, 0x37c1bbc1),
-     TOBN(0x64970b52, 0x27392a92), TOBN(0x21699a1c, 0x2d1535ea),
-     TOBN(0xcd20779c, 0xc2d7a7fd), TOBN(0xe3186059, 0x99c83cf2),
-     TOBN(0x9b69440b, 0x72c0b8c7), TOBN(0xa81497d7, 0x7b9e0e4d),
-     TOBN(0x515d5c89, 0x1f5f82dc), TOBN(0x9a7f67d7, 0x6361079e),
-     TOBN(0xa8da81e3, 0x11a35330), TOBN(0xe44990c4, 0x4b18be1b),
-     TOBN(0xc7d5ed95, 0xaf103e59), TOBN(0xece8aba7, 0x8dac9261),
-     TOBN(0xbe82b099, 0x9394b8d3), TOBN(0x6830f09a, 0x16adfe83),
-     TOBN(0x250a29b4, 0x88172d01), TOBN(0x8b20bd65, 0xcaff9e02),
-     TOBN(0xb8a7661e, 0xe8a6329a), TOBN(0x4520304d, 0xd3fce920),
-     TOBN(0xae45da1f, 0x2b47f7ef), TOBN(0xe07f5288, 0x5bffc540),
-     TOBN(0xf7997009, 0x3464f874), TOBN(0x2244c2cd, 0xa6fa1f38),
-     TOBN(0x43c41ac1, 0x94d7d9b1), TOBN(0x5bafdd82, 0xc82e7f17),
-     TOBN(0xdf0614c1, 0x5fda0fca), TOBN(0x74b043a7, 0xa8ae37ad),
-     TOBN(0x3ba6afa1, 0x9e71734c), TOBN(0x15d5437e, 0x9c450f2e),
-     TOBN(0x4a5883fe, 0x67e242b1), TOBN(0x5143bdc2, 0x2c1953c2),
-     TOBN(0x542b8b53, 0xfc5e8920), TOBN(0x363bf9a8, 0x9a9cee08),
-     TOBN(0x02375f10, 0xc3486e08), TOBN(0x2037543b, 0x8c5e70d2),
-     TOBN(0x7109bccc, 0x625640b4), TOBN(0xcbc1051e, 0x8bc62c3b),
-     TOBN(0xf8455fed, 0x803f26ea), TOBN(0x6badceab, 0xeb372424),
-     TOBN(0xa2a9ce7c, 0x6b53f5f9), TOBN(0x64246595, 0x1b176d99),
-     TOBN(0xb1298d36, 0xb95c081b), TOBN(0x53505bb8, 0x1d9a9ee6),
-     TOBN(0x3f6f9e61, 0xf2ba70b0), TOBN(0xd07e16c9, 0x8afad453),
-     TOBN(0x9f1694bb, 0xe7eb4a6a), TOBN(0xdfebced9, 0x3cb0bc8e),
-     TOBN(0x92d3dcdc, 0x53868c8b), TOBN(0x174311a2, 0x386107a6),
-     TOBN(0x4109e07c, 0x689b4e64), TOBN(0x30e4587f, 0x2df3dcb6),
-     TOBN(0x841aea31, 0x0811b3b2), TOBN(0x6144d41d, 0x0cce43ea),
-     TOBN(0x464c4581, 0x2a9a7803), TOBN(0xd03d371f, 0x3e158930),
-     TOBN(0xc676d7f2, 0xb1f3390b), TOBN(0x9f7a1b8c, 0xa5b61272),
-     TOBN(0x4ebebfc9, 0xc2e127a9), TOBN(0x4602500c, 0x5dd997bf),
-     TOBN(0x7f09771c, 0x4711230f), TOBN(0x058eb37c, 0x020f09c1),
-     TOBN(0xab693d4b, 0xfee5e38b), TOBN(0x9289eb1f, 0x4653cbc0),
-     TOBN(0xbecf46ab, 0xd51b9cf5), TOBN(0xd2aa9c02, 0x9f0121af),
-     TOBN(0x36aaf7d2, 0xe90dc274), TOBN(0x909e4ea0, 0x48b95a3c),
-     TOBN(0xe6b70496, 0x6f32dbdb), TOBN(0x672188a0, 0x8b030b3e),
-     TOBN(0xeeffe5b3, 0xcfb617e2), TOBN(0x87e947de, 0x7c82709e),
-     TOBN(0xa44d2b39, 0x1770f5a7), TOBN(0xe4d4d791, 0x0e44eb82),
-     TOBN(0x42e69d1e, 0x3f69712a), TOBN(0xbf11c4d6, 0xac6a820e),
-     TOBN(0xb5e7f3e5, 0x42c4224c), TOBN(0xd6b4e81c, 0x449d941c),
-     TOBN(0x5d72bd16, 0x5450e878), TOBN(0x6a61e28a, 0xee25ac54),
-     TOBN(0x33272094, 0xe6f1cd95), TOBN(0x7512f30d, 0x0d18673f),
-     TOBN(0x32f7a4ca, 0x5afc1464), TOBN(0x2f095656, 0x6bbb977b),
-     TOBN(0x586f47ca, 0xa8226200), TOBN(0x02c868ad, 0x1ac07369),
-     TOBN(0x4ef2b845, 0xc613acbe), TOBN(0x43d7563e, 0x0386054c),
-     TOBN(0x54da9dc7, 0xab952578), TOBN(0xb5423df2, 0x26e84d0b),
-     TOBN(0xa8b64eeb, 0x9b872042), TOBN(0xac205782, 0x5990f6df),
-     TOBN(0x4ff696eb, 0x21f4c77a), TOBN(0x1a79c3e4, 0xaab273af),
-     TOBN(0x29bc922e, 0x9436b3f1), TOBN(0xff807ef8, 0xd6d9a27a),
-     TOBN(0x82acea3d, 0x778f22a0), TOBN(0xfb10b2e8, 0x5b5e7469),
-     TOBN(0xc0b16980, 0x2818ee7d), TOBN(0x011afff4, 0xc91c1a2f),
-     TOBN(0x95a6d126, 0xad124418), TOBN(0x31c081a5, 0xe72e295f),
-     TOBN(0x36bb283a, 0xf2f4db75), TOBN(0xd115540f, 0x7acef462),
-     TOBN(0xc7f3a8f8, 0x33f6746c), TOBN(0x21e46f65, 0xfea990ca),
-     TOBN(0x915fd5c5, 0xcaddb0a9), TOBN(0xbd41f016, 0x78614555),
-     TOBN(0x346f4434, 0x426ffb58), TOBN(0x80559436, 0x14dbc204),
-     TOBN(0xf3dd20fe, 0x5a969b7f), TOBN(0x9d59e956, 0xe899a39a),
-     TOBN(0xf1b0971c, 0x8ad4cf4b), TOBN(0x03448860, 0x2ffb8fb8),
-     TOBN(0xf071ac3c, 0x65340ba4), TOBN(0x408d0596, 0xb27fd758),
-     TOBN(0xe7c78ea4, 0x98c364b0), TOBN(0xa4aac4a5, 0x051e8ab5),
-     TOBN(0xb9e1d560, 0x485d9002), TOBN(0x9acd518a, 0x88844455),
-     TOBN(0xe4ca688f, 0xd06f56c0), TOBN(0xa48af70d, 0xdf027972),
-     TOBN(0x691f0f04, 0x5e9a609d), TOBN(0xa9dd82cd, 0xee61270e),
-     TOBN(0x8903ca63, 0xa0ef18d3), TOBN(0x9fb7ee35, 0x3d6ca3bd),
-     TOBN(0xa7b4a09c, 0xabf47d03), TOBN(0x4cdada01, 0x1c67de8e),
-     TOBN(0x52003749, 0x9355a244), TOBN(0xe77fd2b6, 0x4f2151a9),
-     TOBN(0x695d6cf6, 0x66b4efcb), TOBN(0xc5a0cacf, 0xda2cfe25),
-     TOBN(0x104efe5c, 0xef811865), TOBN(0xf52813e8, 0x9ea5cc3d),
-     TOBN(0x855683dc, 0x40b58dbc), TOBN(0x0338ecde, 0x175fcb11),
-     TOBN(0xf9a05637, 0x74921592), TOBN(0xb4f1261d, 0xb9bb9d31),
-     TOBN(0x551429b7, 0x4e9c5459), TOBN(0xbe182e6f, 0x6ea71f53),
-     TOBN(0xd3a3b07c, 0xdfc50573), TOBN(0x9ba1afda, 0x62be8d44),
-     TOBN(0x9bcfd2cb, 0x52ab65d3), TOBN(0xdf11d547, 0xa9571802),
-     TOBN(0x099403ee, 0x02a2404a), TOBN(0x497406f4, 0x21088a71),
-     TOBN(0x99479409, 0x5004ae71), TOBN(0xbdb42078, 0xa812c362),
-     TOBN(0x2b72a30f, 0xd8828442), TOBN(0x283add27, 0xfcb5ed1c),
-     TOBN(0xf7c0e200, 0x66a40015), TOBN(0x3e3be641, 0x08b295ef),
-     TOBN(0xac127dc1, 0xe038a675), TOBN(0x729deff3, 0x8c5c6320),
-     TOBN(0xb7df8fd4, 0xa90d2c53), TOBN(0x9b74b0ec, 0x681e7cd3),
-     TOBN(0x5cb5a623, 0xdab407e5), TOBN(0xcdbd3615, 0x76b340c6),
-     TOBN(0xa184415a, 0x7d28392c), TOBN(0xc184c1d8, 0xe96f7830),
-     TOBN(0xc3204f19, 0x81d3a80f), TOBN(0xfde0c841, 0xc8e02432),
-     TOBN(0x78203b3e, 0x8149e0c1), TOBN(0x5904bdbb, 0x08053a73),
-     TOBN(0x30fc1dd1, 0x101b6805), TOBN(0x43c223bc, 0x49aa6d49),
-     TOBN(0x9ed67141, 0x7a174087), TOBN(0x311469a0, 0xd5997008),
-     TOBN(0xb189b684, 0x5e43fc61), TOBN(0xf3282375, 0xe0d3ab57),
-     TOBN(0x4fa34b67, 0xb1181da8), TOBN(0x621ed0b2, 0x99ee52b8),
-     TOBN(0x9b178de1, 0xad990676), TOBN(0xd51de67b, 0x56d54065),
-     TOBN(0x2a2c27c4, 0x7538c201), TOBN(0x33856ec8, 0x38a40f5c),
-     TOBN(0x2522fc15, 0xbe6cdcde), TOBN(0x1e603f33, 0x9f0c6f89),
-     TOBN(0x7994edc3, 0x103e30a6), TOBN(0x033a00db, 0x220c853e),
-     TOBN(0xd3cfa409, 0xf7bb7fd7), TOBN(0x70f8781e, 0x462d18f6),
-     TOBN(0xbbd82980, 0x687fe295), TOBN(0x6eef4c32, 0x595669f3),
-     TOBN(0x86a9303b, 0x2f7e85c3), TOBN(0x5fce4621, 0x71988f9b),
-     TOBN(0x5b935bf6, 0xc138acb5), TOBN(0x30ea7d67, 0x25661212),
-     TOBN(0xef1eb5f4, 0xe51ab9a2), TOBN(0x0587c98a, 0xae067c78),
-     TOBN(0xb3ce1b3c, 0x77ca9ca6), TOBN(0x2a553d4d, 0x54b5f057),
-     TOBN(0xc7898236, 0x4da29ec2), TOBN(0xdbdd5d13, 0xb9c57316),
-     TOBN(0xc57d6e6b, 0x2cd80d47), TOBN(0x80b460cf, 0xfe9e7391),
-     TOBN(0x98648cab, 0xf963c31e), TOBN(0x67f9f633, 0xcc4d32fd),
-     TOBN(0x0af42a9d, 0xfdf7c687), TOBN(0x55f292a3, 0x0b015ea7),
-     TOBN(0x89e468b2, 0xcd21ab3d), TOBN(0xe504f022, 0xc393d392),
-     TOBN(0xab21e1d4, 0xa5013af9), TOBN(0xe3283f78, 0xc2c28acb),
-     TOBN(0xf38b35f6, 0x226bf99f), TOBN(0xe8354274, 0x0e291e69),
-     TOBN(0x61673a15, 0xb20c162d), TOBN(0xc101dc75, 0xb04fbdbe),
-     TOBN(0x8323b4c2, 0x255bd617), TOBN(0x6c969693, 0x6c2a9154),
-     TOBN(0xc6e65860, 0x62679387), TOBN(0x8e01db0c, 0xb8c88e23),
-     TOBN(0x33c42873, 0x893a5559), TOBN(0x7630f04b, 0x47a3e149),
-     TOBN(0xb5d80805, 0xddcf35f8), TOBN(0x582ca080, 0x77dfe732),
-     TOBN(0x2c7156e1, 0x0b1894a0), TOBN(0x92034001, 0xd81c68c0),
-     TOBN(0xed225d00, 0xc8b115b5), TOBN(0x237f9c22, 0x83b907f2),
-     TOBN(0x0ea2f32f, 0x4470e2c0), TOBN(0xb725f7c1, 0x58be4e95),
-     TOBN(0x0f1dcafa, 0xb1ae5463), TOBN(0x59ed5187, 0x1ba2fc04),
-     TOBN(0xf6e0f316, 0xd0115d4d), TOBN(0x5180b12f, 0xd3691599),
-     TOBN(0x157e32c9, 0x527f0a41), TOBN(0x7b0b081d, 0xa8e0ecc0),
-     TOBN(0x6dbaaa8a, 0xbf4f0dd0), TOBN(0x99b289c7, 0x4d252696),
-     TOBN(0x79b7755e, 0xdbf864fe), TOBN(0x6974e2b1, 0x76cad3ab),
-     TOBN(0x35dbbee2, 0x06ddd657), TOBN(0xe7cbdd11, 0x2ff3a96d),
-     TOBN(0x88381968, 0x076be758), TOBN(0x2d737e72, 0x08c91f5d),
-     TOBN(0x5f83ab62, 0x86ec3776), TOBN(0x98aa649d, 0x945fa7a1),
-     TOBN(0xf477ec37, 0x72ef0933), TOBN(0x66f52b1e, 0x098c17b1),
-     TOBN(0x9eec58fb, 0xd803738b), TOBN(0x91aaade7, 0xe4e86aa4),
-     TOBN(0x6b1ae617, 0xa5b51492), TOBN(0x63272121, 0xbbc45974),
-     TOBN(0x7e0e28f0, 0x862c5129), TOBN(0x0a8f79a9, 0x3321a4a0),
-     TOBN(0xe26d1664, 0x5041c88f), TOBN(0x0571b805, 0x53233e3a),
-     TOBN(0xd1b0ccde, 0xc9520711), TOBN(0x55a9e4ed, 0x3c8b84bf),
-     TOBN(0x9426bd39, 0xa1fef314), TOBN(0x4f5f638e, 0x6eb93f2b),
-     TOBN(0xba2a1ed3, 0x2bf9341b), TOBN(0xd63c1321, 0x4d42d5a9),
-     TOBN(0xd2964a89, 0x316dc7c5), TOBN(0xd1759606, 0xca511851),
-     TOBN(0xd8a9201f, 0xf9e6ed35), TOBN(0xb7b5ee45, 0x6736925a),
-     TOBN(0x0a83fbbc, 0x99581af7), TOBN(0x3076bc40, 0x64eeb051),
-     TOBN(0x5511c98c, 0x02dec312), TOBN(0x270de898, 0x238dcb78),
-     TOBN(0x2cf4cf9c, 0x539c08c9), TOBN(0xa70cb65e, 0x38d3b06e),
-     TOBN(0xb12ec10e, 0xcfe57bbd), TOBN(0x82c7b656, 0x35a0c2b5),
-     TOBN(0xddc7d5cd, 0x161c67bd), TOBN(0xe32e8985, 0xae3a32cc),
-     TOBN(0x7aba9444, 0xd11a5529), TOBN(0xe964ed02, 0x2427fa1a),
-     TOBN(0x1528392d, 0x24a1770a), TOBN(0xa152ce2c, 0x12c72fcd),
-     TOBN(0x714553a4, 0x8ec07649), TOBN(0x18b4c290, 0x459dd453),
-     TOBN(0xea32b714, 0x7b64b110), TOBN(0xb871bfa5, 0x2e6f07a2),
-     TOBN(0xb67112e5, 0x9e2e3c9b), TOBN(0xfbf250e5, 0x44aa90f6),
-     TOBN(0xf77aedb8, 0xbd539006), TOBN(0x3b0cdf9a, 0xd172a66f),
-     TOBN(0xedf69fea, 0xf8c51187), TOBN(0x05bb67ec, 0x741e4da7),
-     TOBN(0x47df0f32, 0x08114345), TOBN(0x56facb07, 0xbb9792b1),
-     TOBN(0xf3e007e9, 0x8f6229e4), TOBN(0x62d103f4, 0x526fba0f),
-     TOBN(0x4f33bef7, 0xb0339d79), TOBN(0x9841357b, 0xb59bfec1),
-     TOBN(0xfa8dbb59, 0xc34e6705), TOBN(0xc3c7180b, 0x7fdaa84c),
-     TOBN(0xf95872fc, 0xa4108537), TOBN(0x8750cc3b, 0x932a3e5a),
-     TOBN(0xb61cc69d, 0xb7275d7d), TOBN(0xffa0168b, 0x2e59b2e9),
-     TOBN(0xca032abc, 0x6ecbb493), TOBN(0x1d86dbd3, 0x2c9082d8),
-     TOBN(0xae1e0b67, 0xe28ef5ba), TOBN(0x2c9a4699, 0xcb18e169),
-     TOBN(0x0ecd0e33, 0x1e6bbd20), TOBN(0x571b360e, 0xaf5e81d2),
-     TOBN(0xcd9fea58, 0x101c1d45), TOBN(0x6651788e, 0x18880452),
-     TOBN(0xa9972635, 0x1f8dd446), TOBN(0x44bed022, 0xe37281d0),
-     TOBN(0x094b2b2d, 0x33da525d), TOBN(0xf193678e, 0x13144fd8),
-     TOBN(0xb8ab5ba4, 0xf4c1061d), TOBN(0x4343b5fa, 0xdccbe0f4),
-     TOBN(0xa8702371, 0x63812713), TOBN(0x47bf6d2d, 0xf7611d93),
-     TOBN(0x46729b8c, 0xbd21e1d7), TOBN(0x7484d4e0, 0xd629e77d),
-     TOBN(0x830e6eea, 0x60dbac1f), TOBN(0x23d8c484, 0xda06a2f7),
-     TOBN(0x896714b0, 0x50ca535b), TOBN(0xdc8d3644, 0xebd97a9b),
-     TOBN(0x106ef9fa, 0xb12177b4), TOBN(0xf79bf464, 0x534d5d9c),
-     TOBN(0x2537a349, 0xa6ab360b), TOBN(0xc7c54253, 0xa00c744f),
-     TOBN(0xb3c7a047, 0xe5911a76), TOBN(0x61ffa5c8, 0x647f1ee7),
-     TOBN(0x15aed36f, 0x8f56ab42), TOBN(0x6a0d41b0, 0xa3ff9ac9),
-     TOBN(0x68f469f5, 0xcc30d357), TOBN(0xbe9adf81, 0x6b72be96),
-     TOBN(0x1cd926fe, 0x903ad461), TOBN(0x7e89e38f, 0xcaca441b),
-     TOBN(0xf0f82de5, 0xfacf69d4), TOBN(0x363b7e76, 0x4775344c),
-     TOBN(0x6894f312, 0xb2e36d04), TOBN(0x3c6cb4fe, 0x11d1c9a5),
-     TOBN(0x85d9c339, 0x4008e1f2), TOBN(0x5e9a85ea, 0x249f326c),
-     TOBN(0xdc35c60a, 0x678c5e06), TOBN(0xc08b944f, 0x9f86fba9),
-     TOBN(0xde40c02c, 0x89f71f0f), TOBN(0xad8f3e31, 0xff3da3c0),
-     TOBN(0x3ea5096b, 0x42125ded), TOBN(0x13879cbf, 0xa7379183),
-     TOBN(0x6f4714a5, 0x6b306a0b), TOBN(0x359c2ea6, 0x67646c5e),
-     TOBN(0xfacf8943, 0x07726368), TOBN(0x07a58935, 0x65ff431e),
-     TOBN(0x24d661d1, 0x68754ab0), TOBN(0x801fce1d, 0x6f429a76),
-     TOBN(0xc068a85f, 0xa58ce769), TOBN(0xedc35c54, 0x5d5eca2b),
-     TOBN(0xea31276f, 0xa3f660d1), TOBN(0xa0184ebe, 0xb8fc7167),
-     TOBN(0x0f20f21a, 0x1d8db0ae), TOBN(0xd96d095f, 0x56c35e12),
-     TOBN(0xedf402b5, 0xf8c2a25b), TOBN(0x1bb772b9, 0x059204b6),
-     TOBN(0x50cbeae2, 0x19b4e34c), TOBN(0x93109d80, 0x3fa0845a),
-     TOBN(0x54f7ccf7, 0x8ef59fb5), TOBN(0x3b438fe2, 0x88070963),
-     TOBN(0x9e28c659, 0x31f3ba9b), TOBN(0x9cc31b46, 0xead9da92),
-     TOBN(0x3c2f0ba9, 0xb733aa5f), TOBN(0xdece47cb, 0xf05af235),
-     TOBN(0xf8e3f715, 0xa2ac82a5), TOBN(0xc97ba641, 0x2203f18a),
-     TOBN(0xc3af5504, 0x09c11060), TOBN(0x56ea2c05, 0x46af512d),
-     TOBN(0xfac28daf, 0xf3f28146), TOBN(0x87fab43a, 0x959ef494),}
-    ,
-    {TOBN(0x09891641, 0xd4c5105f), TOBN(0x1ae80f8e, 0x6d7fbd65),
-     TOBN(0x9d67225f, 0xbee6bdb0), TOBN(0x3b433b59, 0x7fc4d860),
-     TOBN(0x44e66db6, 0x93e85638), TOBN(0xf7b59252, 0xe3e9862f),
-     TOBN(0xdb785157, 0x665c32ec), TOBN(0x702fefd7, 0xae362f50),
-     TOBN(0x3754475d, 0x0fefb0c3), TOBN(0xd48fb56b, 0x46d7c35d),
-     TOBN(0xa070b633, 0x363798a4), TOBN(0xae89f3d2, 0x8fdb98e6),
-     TOBN(0x970b89c8, 0x6363d14c), TOBN(0x89817521, 0x67abd27d),
-     TOBN(0x9bf7d474, 0x44d5a021), TOBN(0xb3083baf, 0xcac72aee),
-     TOBN(0x389741de, 0xbe949a44), TOBN(0x638e9388, 0x546a4fa5),
-     TOBN(0x3fe6419c, 0xa0047bdc), TOBN(0x7047f648, 0xaaea57ca),
-     TOBN(0x54e48a90, 0x41fbab17), TOBN(0xda8e0b28, 0x576bdba2),
-     TOBN(0xe807eebc, 0xc72afddc), TOBN(0x07d3336d, 0xf42577bf),
-     TOBN(0x62a8c244, 0xbfe20925), TOBN(0x91c19ac3, 0x8fdce867),
-     TOBN(0x5a96a5d5, 0xdd387063), TOBN(0x61d587d4, 0x21d324f6),
-     TOBN(0xe87673a2, 0xa37173ea), TOBN(0x23848008, 0x53778b65),
-     TOBN(0x10f8441e, 0x05bab43e), TOBN(0xfa11fe12, 0x4621efbe),
-     TOBN(0x047b772e, 0x81685d7b), TOBN(0x23f27d81, 0xbf34a976),
-     TOBN(0xc27608e2, 0x915f48ef), TOBN(0x3b0b43fa, 0xa521d5c3),
-     TOBN(0x7613fb26, 0x63ca7284), TOBN(0x7f5729b4, 0x1d4db837),
-     TOBN(0x87b14898, 0x583b526b), TOBN(0x00b732a6, 0xbbadd3d1),
-     TOBN(0x8e02f426, 0x2048e396), TOBN(0x436b50b6, 0x383d9de4),
-     TOBN(0xf78d3481, 0x471e85ad), TOBN(0x8b01ea6a, 0xd005c8d6),
-     TOBN(0xd3c7afee, 0x97015c07), TOBN(0x46cdf1a9, 0x4e3ba2ae),
-     TOBN(0x7a42e501, 0x83d3a1d2), TOBN(0xd54b5268, 0xb541dff4),
-     TOBN(0x3f24cf30, 0x4e23e9bc), TOBN(0x4387f816, 0x126e3624),
-     TOBN(0x26a46a03, 0x3b0b6d61), TOBN(0xaf1bc845, 0x8b2d777c),
-     TOBN(0x25c401ba, 0x527de79c), TOBN(0x0e1346d4, 0x4261bbb6),
-     TOBN(0x4b96c44b, 0x287b4bc7), TOBN(0x658493c7, 0x5254562f),
-     TOBN(0x23f949fe, 0xb8a24a20), TOBN(0x17ebfed1, 0xf52ca53f),
-     TOBN(0x9b691bbe, 0xbcfb4853), TOBN(0x5617ff6b, 0x6278a05d),
-     TOBN(0x241b34c5, 0xe3c99ebd), TOBN(0xfc64242e, 0x1784156a),
-     TOBN(0x4206482f, 0x695d67df), TOBN(0xb967ce0e, 0xee27c011),
-     TOBN(0x65db3751, 0x21c80b5d), TOBN(0x2e7a563c, 0xa31ecca0),
-     TOBN(0xe56ffc4e, 0x5238a07e), TOBN(0x3d6c2966, 0x32ced854),
-     TOBN(0xe99d7d1a, 0xaf70b885), TOBN(0xafc3bad9, 0x2d686459),
-     TOBN(0x9c78bf46, 0x0cc8ba5b), TOBN(0x5a439519, 0x18955aa3),
-     TOBN(0xf8b517a8, 0x5fe4e314), TOBN(0xe60234d0, 0xfcb8906f),
-     TOBN(0xffe542ac, 0xf2061b23), TOBN(0x287e191f, 0x6b4cb59c),
-     TOBN(0x21857ddc, 0x09d877d8), TOBN(0x1c23478c, 0x14678941),
-     TOBN(0xbbf0c056, 0xb6e05ea4), TOBN(0x82da4b53, 0xb01594fe),
-     TOBN(0xf7526791, 0xfadb8608), TOBN(0x049e832d, 0x7b74cdf6),
-     TOBN(0xa43581cc, 0xc2b90a34), TOBN(0x73639eb8, 0x9360b10c),
-     TOBN(0x4fba331f, 0xe1e4a71b), TOBN(0x6ffd6b93, 0x8072f919),
-     TOBN(0x6e53271c, 0x65679032), TOBN(0x67206444, 0xf14272ce),
-     TOBN(0xc0f734a3, 0xb2335834), TOBN(0x9526205a, 0x90ef6860),
-     TOBN(0xcb8be717, 0x04e2bb0d), TOBN(0x2418871e, 0x02f383fa),
-     TOBN(0xd7177681, 0x4082c157), TOBN(0xcc914ad0, 0x29c20073),
-     TOBN(0xf186c1eb, 0xe587e728), TOBN(0x6fdb3c22, 0x61bcd5fd),
-     TOBN(0x30d014a6, 0xf2f9f8e9), TOBN(0x963ece23, 0x4fec49d2),
-     TOBN(0x862025c5, 0x9605a8d9), TOBN(0x39874445, 0x19f8929a),
-     TOBN(0x01b6ff65, 0x12bf476a), TOBN(0x598a64d8, 0x09cf7d91),
-     TOBN(0xd7ec7749, 0x93be56ca), TOBN(0x10899785, 0xcbb33615),
-     TOBN(0xb8a092fd, 0x02eee3ad), TOBN(0xa86b3d35, 0x30145270),
-     TOBN(0x323d98c6, 0x8512b675), TOBN(0x4b8bc785, 0x62ebb40f),
-     TOBN(0x7d301f54, 0x413f9cde), TOBN(0xa5e4fb4f, 0x2bab5664),
-     TOBN(0x1d2b252d, 0x1cbfec23), TOBN(0xfcd576bb, 0xe177120d),
-     TOBN(0x04427d3e, 0x83731a34), TOBN(0x2bb9028e, 0xed836e8e),
-     TOBN(0xb36acff8, 0xb612ca7c), TOBN(0xb88fe5ef, 0xd3d9c73a),
-     TOBN(0xbe2a6bc6, 0xedea4eb3), TOBN(0x43b93133, 0x488eec77),
-     TOBN(0xf41ff566, 0xb17106e1), TOBN(0x469e9172, 0x654efa32),
-     TOBN(0xb4480f04, 0x41c23fa3), TOBN(0xb4712eb0, 0xc1989a2e),
-     TOBN(0x3ccbba0f, 0x93a29ca7), TOBN(0x6e205c14, 0xd619428c),
-     TOBN(0x90db7957, 0xb3641686), TOBN(0x0432691d, 0x45ac8b4e),
-     TOBN(0x07a759ac, 0xf64e0350), TOBN(0x0514d89c, 0x9c972517),
-     TOBN(0x1701147f, 0xa8e67fc3), TOBN(0x9e2e0b8b, 0xab2085be),
-     TOBN(0xd5651824, 0xac284e57), TOBN(0x890d4325, 0x74893664),
-     TOBN(0x8a7c5e6e, 0xc55e68a3), TOBN(0xbf12e90b, 0x4339c85a),
-     TOBN(0x31846b85, 0xf922b655), TOBN(0x9a54ce4d, 0x0bf4d700),
-     TOBN(0xd7f4e83a, 0xf1a14295), TOBN(0x916f955c, 0xb285d4f9),
-     TOBN(0xe57bb0e0, 0x99ffdaba), TOBN(0x28a43034, 0xeab0d152),
-     TOBN(0x0a36ffa2, 0xb8a9cef8), TOBN(0x5517407e, 0xb9ec051a),
-     TOBN(0x9c796096, 0xea68e672), TOBN(0x853db5fb, 0xfb3c77fb),
-     TOBN(0x21474ba9, 0xe864a51a), TOBN(0x6c267699, 0x6e8a1b8b),
-     TOBN(0x7c823626, 0x94120a28), TOBN(0xe61e9a48, 0x8383a5db),
-     TOBN(0x7dd75003, 0x9f84216d), TOBN(0xab020d07, 0xad43cd85),
-     TOBN(0x9437ae48, 0xda12c659), TOBN(0x6449c2eb, 0xe65452ad),
-     TOBN(0xcc7c4c1c, 0x2cf9d7c1), TOBN(0x1320886a, 0xee95e5ab),
-     TOBN(0xbb7b9056, 0xbeae170c), TOBN(0xc8a5b250, 0xdbc0d662),
-     TOBN(0x4ed81432, 0xc11d2303), TOBN(0x7da66912, 0x1f03769f),
-     TOBN(0x3ac7a5fd, 0x84539828), TOBN(0x14dada94, 0x3bccdd02),
-     TOBN(0x8b84c321, 0x7ef6b0d1), TOBN(0x52a9477a, 0x7c933f22),
-     TOBN(0x5ef6728a, 0xfd440b82), TOBN(0x5c3bd859, 0x6ce4bd5e),
-     TOBN(0x918b80f5, 0xf22c2d3e), TOBN(0x368d5040, 0xb7bb6cc5),
-     TOBN(0xb66142a1, 0x2695a11c), TOBN(0x60ac583a, 0xeb19ea70),
-     TOBN(0x317cbb98, 0x0eab2437), TOBN(0x8cc08c55, 0x5e2654c8),
-     TOBN(0xfe2d6520, 0xe6d8307f), TOBN(0xe9f147f3, 0x57428993),
-     TOBN(0x5f9c7d14, 0xd2fd6cf1), TOBN(0xa3ecd064, 0x2d4fcbb0),
-     TOBN(0xad83fef0, 0x8e7341f7), TOBN(0x643f23a0, 0x3a63115c),
-     TOBN(0xd38a78ab, 0xe65ab743), TOBN(0xbf7c75b1, 0x35edc89c),
-     TOBN(0x3dd8752e, 0x530df568), TOBN(0xf85c4a76, 0xe308c682),
-     TOBN(0x4c9955b2, 0xe68acf37), TOBN(0xa544df3d, 0xab32af85),
-     TOBN(0x4b8ec3f5, 0xa25cf493), TOBN(0x4d8f2764, 0x1a622feb),
-     TOBN(0x7bb4f7aa, 0xf0dcbc49), TOBN(0x7de551f9, 0x70bbb45b),
-     TOBN(0xcfd0f3e4, 0x9f2ca2e5), TOBN(0xece58709, 0x1f5c76ef),
-     TOBN(0x32920edd, 0x167d79ae), TOBN(0x039df8a2, 0xfa7d7ec1),
-     TOBN(0xf46206c0, 0xbb30af91), TOBN(0x1ff5e2f5, 0x22676b59),
-     TOBN(0x11f4a039, 0x6ea51d66), TOBN(0x506c1445, 0x807d7a26),
-     TOBN(0x60da5705, 0x755a9b24), TOBN(0x8fc8cc32, 0x1f1a319e),
-     TOBN(0x83642d4d, 0x9433d67d), TOBN(0x7fa5cb8f, 0x6a7dd296),
-     TOBN(0x576591db, 0x9b7bde07), TOBN(0x13173d25, 0x419716fb),
-     TOBN(0xea30599d, 0xd5b340ff), TOBN(0xfc6b5297, 0xb0fe76c5),
-     TOBN(0x1c6968c8, 0xab8f5adc), TOBN(0xf723c7f5, 0x901c928d),
-     TOBN(0x4203c321, 0x9773d402), TOBN(0xdf7c6aa3, 0x1b51dd47),
-     TOBN(0x3d49e37a, 0x552be23c), TOBN(0x57febee8, 0x0b5a6e87),
-     TOBN(0xc5ecbee4, 0x7bd8e739), TOBN(0x79d44994, 0xae63bf75),
-     TOBN(0x168bd00f, 0x38fb8923), TOBN(0x75d48ee4, 0xd0533130),
-     TOBN(0x554f77aa, 0xdb5cdf33), TOBN(0x3396e896, 0x3c696769),
-     TOBN(0x2fdddbf2, 0xd3fd674e), TOBN(0xbbb8f6ee, 0x99d0e3e5),
-     TOBN(0x51b90651, 0xcbae2f70), TOBN(0xefc4bc05, 0x93aaa8eb),
-     TOBN(0x8ecd8689, 0xdd1df499), TOBN(0x1aee99a8, 0x22f367a5),
-     TOBN(0x95d485b9, 0xae8274c5), TOBN(0x6c14d445, 0x7d30b39c),
-     TOBN(0xbafea90b, 0xbcc1ef81), TOBN(0x7c5f317a, 0xa459a2ed),
-     TOBN(0x01211075, 0x4ef44227), TOBN(0xa17bed6e, 0xdc20f496),
-     TOBN(0x0cdfe424, 0x819853cd), TOBN(0x13793298, 0xf71e2ce7),
-     TOBN(0x3c1f3078, 0xdbbe307b), TOBN(0x6dd1c20e, 0x76ee9936),
-     TOBN(0x23ee4b57, 0x423caa20), TOBN(0x4ac3793b, 0x8efb840e),
-     TOBN(0x934438eb, 0xed1f8ca0), TOBN(0x3e546658, 0x4ebb25a2),
-     TOBN(0xc415af0e, 0xc069896f), TOBN(0xc13eddb0, 0x9a5aa43d),
-     TOBN(0x7a04204f, 0xd49eb8f6), TOBN(0xd0d5bdfc, 0xd74f1670),
-     TOBN(0x3697e286, 0x56fc0558), TOBN(0x10207371, 0x01cebade),
-     TOBN(0x5f87e690, 0x0647a82b), TOBN(0x908e0ed4, 0x8f40054f),
-     TOBN(0xa9f633d4, 0x79853803), TOBN(0x8ed13c9a, 0x4a28b252),
-     TOBN(0x3e2ef676, 0x1f460f64), TOBN(0x53930b9b, 0x36d06336),
-     TOBN(0x347073ac, 0x8fc4979b), TOBN(0x84380e0e, 0x5ecd5597),
-     TOBN(0xe3b22c6b, 0xc4fe3c39), TOBN(0xba4a8153, 0x6c7bebdf),
-     TOBN(0xf23ab6b7, 0x25693459), TOBN(0x53bc3770, 0x14922b11),
-     TOBN(0x4645c8ab, 0x5afc60db), TOBN(0xaa022355, 0x20b9f2a3),
-     TOBN(0x52a2954c, 0xce0fc507), TOBN(0x8c2731bb, 0x7ce1c2e7),
-     TOBN(0xf39608ab, 0x18a0339d), TOBN(0xac7a658d, 0x3735436c),
-     TOBN(0xb22c2b07, 0xcd992b4f), TOBN(0x4e83daec, 0xf40dcfd4),
-     TOBN(0x8a34c7be, 0x2f39ea3e), TOBN(0xef0c005f, 0xb0a56d2e),
-     TOBN(0x62731f6a, 0x6edd8038), TOBN(0x5721d740, 0x4e3cb075),
-     TOBN(0x1ea41511, 0xfbeeee1b), TOBN(0xd1ef5e73, 0xef1d0c05),
-     TOBN(0x42feefd1, 0x73c07d35), TOBN(0xe530a00a, 0x8a329493),
-     TOBN(0x5d55b7fe, 0xf15ebfb0), TOBN(0x549de03c, 0xd322491a),
-     TOBN(0xf7b5f602, 0x745b3237), TOBN(0x3632a3a2, 0x1ab6e2b6),
-     TOBN(0x0d3bba89, 0x0ef59f78), TOBN(0x0dfc6443, 0xc9e52b9a),
-     TOBN(0x1dc79699, 0x72631447), TOBN(0xef033917, 0xb3be20b1),
-     TOBN(0x0c92735d, 0xb1383948), TOBN(0xc1fc29a2, 0xc0dd7d7d),
-     TOBN(0x6485b697, 0x403ed068), TOBN(0x13bfaab3, 0xaac93bdc),
-     TOBN(0x410dc6a9, 0x0deeaf52), TOBN(0xb003fb02, 0x4c641c15),
-     TOBN(0x1384978c, 0x5bc504c4), TOBN(0x37640487, 0x864a6a77),
-     TOBN(0x05991bc6, 0x222a77da), TOBN(0x62260a57, 0x5e47eb11),
-     TOBN(0xc7af6613, 0xf21b432c), TOBN(0x22f3acc9, 0xab4953e9),
-     TOBN(0x52934922, 0x8e41d155), TOBN(0x4d024568, 0x3ac059ef),
-     TOBN(0xb0201755, 0x4d884411), TOBN(0xce8055cf, 0xa59a178f),
-     TOBN(0xcd77d1af, 0xf6204549), TOBN(0xa0a00a3e, 0xc7066759),
-     TOBN(0x471071ef, 0x0272c229), TOBN(0x009bcf6b, 0xd3c4b6b0),
-     TOBN(0x2a2638a8, 0x22305177), TOBN(0xd51d59df, 0x41645bbf),
-     TOBN(0xa81142fd, 0xc0a7a3c0), TOBN(0xa17eca6d, 0x4c7063ee),
-     TOBN(0x0bb887ed, 0x60d9dcec), TOBN(0xd6d28e51, 0x20ad2455),
-     TOBN(0xebed6308, 0xa67102ba), TOBN(0x042c3114, 0x8bffa408),
-     TOBN(0xfd099ac5, 0x8aa68e30), TOBN(0x7a6a3d7c, 0x1483513e),
-     TOBN(0xffcc6b75, 0xba2d8f0c), TOBN(0x54dacf96, 0x1e78b954),
-     TOBN(0xf645696f, 0xa4a9af89), TOBN(0x3a411940, 0x06ac98ec),
-     TOBN(0x41b8b3f6, 0x22a67a20), TOBN(0x2d0b1e0f, 0x99dec626),
-     TOBN(0x27c89192, 0x40be34e8), TOBN(0xc7162b37, 0x91907f35),
-     TOBN(0x90188ec1, 0xa956702b), TOBN(0xca132f7d, 0xdf93769c),
-     TOBN(0x3ece44f9, 0x0e2025b4), TOBN(0x67aaec69, 0x0c62f14c),
-     TOBN(0xad741418, 0x22e3cc11), TOBN(0xcf9b75c3, 0x7ff9a50e),
-     TOBN(0x02fa2b16, 0x4d348272), TOBN(0xbd99d61a, 0x9959d56d),
-     TOBN(0xbc4f19db, 0x18762916), TOBN(0xcc7cce50, 0x49c1ac80),
-     TOBN(0x4d59ebaa, 0xd846bd83), TOBN(0x8775a9dc, 0xa9202849),
-     TOBN(0x07ec4ae1, 0x6e1f4ca9), TOBN(0x27eb5875, 0xba893f11),
-     TOBN(0x00284d51, 0x662cc565), TOBN(0x82353a6b, 0x0db4138d),
-     TOBN(0xd9c7aaaa, 0xaa32a594), TOBN(0xf5528b5e, 0xa5669c47),
-     TOBN(0xf3220231, 0x2f23c5ff), TOBN(0xe3e8147a, 0x6affa3a1),
-     TOBN(0xfb423d5c, 0x202ddda0), TOBN(0x3d6414ac, 0x6b871bd4),
-     TOBN(0x586f82e1, 0xa51a168a), TOBN(0xb712c671, 0x48ae5448),
-     TOBN(0x9a2e4bd1, 0x76233eb8), TOBN(0x0188223a, 0x78811ca9),
-     TOBN(0x553c5e21, 0xf7c18de1), TOBN(0x7682e451, 0xb27bb286),
-     TOBN(0x3ed036b3, 0x0e51e929), TOBN(0xf487211b, 0xec9cb34f),
-     TOBN(0x0d094277, 0x0c24efc8), TOBN(0x0349fd04, 0xbef737a4),
-     TOBN(0x6d1c9dd2, 0x514cdd28), TOBN(0x29c135ff, 0x30da9521),
-     TOBN(0xea6e4508, 0xf78b0b6f), TOBN(0x176f5dd2, 0x678c143c),
-     TOBN(0x08148418, 0x4be21e65), TOBN(0x27f7525c, 0xe7df38c4),
-     TOBN(0x1fb70e09, 0x748ab1a4), TOBN(0x9cba50a0, 0x5efe4433),
-     TOBN(0x7846c7a6, 0x15f75af2), TOBN(0x2a7c2c57, 0x5ee73ea8),
-     TOBN(0x42e566a4, 0x3f0a449a), TOBN(0x45474c3b, 0xad90fc3d),
-     TOBN(0x7447be3d, 0x8b61d057), TOBN(0x3e9d1cf1, 0x3a4ec092),
-     TOBN(0x1603e453, 0xf380a6e6), TOBN(0x0b86e431, 0x9b1437c2),
-     TOBN(0x7a4173f2, 0xef29610a), TOBN(0x8fa729a7, 0xf03d57f7),
-     TOBN(0x3e186f6e, 0x6c9c217e), TOBN(0xbe1d3079, 0x91919524),
-     TOBN(0x92a62a70, 0x153d4fb1), TOBN(0x32ed3e34, 0xd68c2f71),
-     TOBN(0xd785027f, 0x9eb1a8b7), TOBN(0xbc37eb77, 0xc5b22fe8),
-     TOBN(0x466b34f0, 0xb9d6a191), TOBN(0x008a89af, 0x9a05f816),
-     TOBN(0x19b028fb, 0x7d42c10a), TOBN(0x7fe8c92f, 0x49b3f6b8),
-     TOBN(0x58907cc0, 0xa5a0ade3), TOBN(0xb3154f51, 0x559d1a7c),
-     TOBN(0x5066efb6, 0xd9790ed6), TOBN(0xa77a0cbc, 0xa6aa793b),
-     TOBN(0x1a915f3c, 0x223e042e), TOBN(0x1c5def04, 0x69c5874b),
-     TOBN(0x0e830078, 0x73b6c1da), TOBN(0x55cf85d2, 0xfcd8557a),
-     TOBN(0x0f7c7c76, 0x0460f3b1), TOBN(0x87052acb, 0x46e58063),
-     TOBN(0x09212b80, 0x907eae66), TOBN(0x3cb068e0, 0x4d721c89),
-     TOBN(0xa87941ae, 0xdd45ac1c), TOBN(0xde8d5c0d, 0x0daa0dbb),
-     TOBN(0xda421fdc, 0xe3502e6e), TOBN(0xc8944201, 0x4d89a084),
-     TOBN(0x7307ba5e, 0xf0c24bfb), TOBN(0xda212beb, 0x20bde0ef),
-     TOBN(0xea2da24b, 0xf82ce682), TOBN(0x058d3816, 0x07f71fe4),
-     TOBN(0x35a02462, 0x5ffad8de), TOBN(0xcd7b05dc, 0xaadcefab),
-     TOBN(0xd442f8ed, 0x1d9f54ec), TOBN(0x8be3d618, 0xb2d3b5ca),
-     TOBN(0xe2220ed0, 0xe06b2ce2), TOBN(0x82699a5f, 0x1b0da4c0),
-     TOBN(0x3ff106f5, 0x71c0c3a7), TOBN(0x8f580f5a, 0x0d34180c),
-     TOBN(0x4ebb120e, 0x22d7d375), TOBN(0x5e5782cc, 0xe9513675),
-     TOBN(0x2275580c, 0x99c82a70), TOBN(0xe8359fbf, 0x15ea8c4c),
-     TOBN(0x53b48db8, 0x7b415e70), TOBN(0xaacf2240, 0x100c6014),
-     TOBN(0x9faaccf5, 0xe4652f1d), TOBN(0xbd6fdd2a, 0xd56157b2),
-     TOBN(0xa4f4fb1f, 0x6261ec50), TOBN(0x244e55ad, 0x476bcd52),
-     TOBN(0x881c9305, 0x047d320b), TOBN(0x1ca983d5, 0x6181263f),
-     TOBN(0x354e9a44, 0x278fb8ee), TOBN(0xad2dbc0f, 0x396e4964),
-     TOBN(0x723f3aa2, 0x9268b3de), TOBN(0x0d1ca29a, 0xe6e0609a),
-     TOBN(0x794866aa, 0x6cf44252), TOBN(0x0b59f3e3, 0x01af87ed),
-     TOBN(0xe234e5ff, 0x7f4a6c51), TOBN(0xa8768fd2, 0x61dc2f7e),
-     TOBN(0xdafc7332, 0x0a94d81f), TOBN(0xd7f84282, 0x06938ce1),
-     TOBN(0xae0b3c0e, 0x0546063e), TOBN(0x7fbadcb2, 0x5d61abc6),
-     TOBN(0xd5d7a2c9, 0x369ac400), TOBN(0xa5978d09, 0xae67d10c),
-     TOBN(0x290f211e, 0x4f85eaac), TOBN(0xe61e2ad1, 0xfacac681),
-     TOBN(0xae125225, 0x388384cd), TOBN(0xa7fb68e9, 0xccfde30f),
-     TOBN(0x7a59b936, 0x3daed4c2), TOBN(0x80a9aa40, 0x2606f789),
-     TOBN(0xb40c1ea5, 0xf6a6d90a), TOBN(0x948364d3, 0x514d5885),
-     TOBN(0x062ebc60, 0x70985182), TOBN(0xa6db5b0e, 0x33310895),
-     TOBN(0x64a12175, 0xe329c2f5), TOBN(0xc5f25bd2, 0x90ea237e),
-     TOBN(0x7915c524, 0x2d0a4c23), TOBN(0xeb5d26e4, 0x6bb3cc52),
-     TOBN(0x369a9116, 0xc09e2c92), TOBN(0x0c527f92, 0xcf182cf8),
-     TOBN(0x9e591938, 0x2aede0ac), TOBN(0xb2922208, 0x6cc34939),
-     TOBN(0x3c9d8962, 0x99a34361), TOBN(0x3c81836d, 0xc1905fe6),
-     TOBN(0x4bfeb57f, 0xa001ec5a), TOBN(0xe993f5bb, 0xa0dc5dba),
-     TOBN(0x47884109, 0x724a1380), TOBN(0x8a0369ab, 0x32fe9a04),
-     TOBN(0xea068d60, 0x8c927db8), TOBN(0xbf5f37cf, 0x94655741),
-     TOBN(0x47d402a2, 0x04b6c7ea), TOBN(0x4551c295, 0x6af259cb),
-     TOBN(0x698b71e7, 0xed77ee8b), TOBN(0xbddf7bd0, 0xf309d5c7),
-     TOBN(0x6201c22c, 0x34e780ca), TOBN(0xab04f7d8, 0x4c295ef4),
-     TOBN(0x1c947294, 0x4313a8ce), TOBN(0xe532e4ac, 0x92ca4cfe),
-     TOBN(0x89738f80, 0xd0a7a97a), TOBN(0xec088c88, 0xa580fd5b),
-     TOBN(0x612b1ecc, 0x42ce9e51), TOBN(0x8f9840fd, 0xb25fdd2a),
-     TOBN(0x3cda78c0, 0x01e7f839), TOBN(0x546b3d3a, 0xece05480),
-     TOBN(0x271719a9, 0x80d30916), TOBN(0x45497107, 0x584c20c4),
-     TOBN(0xaf8f9478, 0x5bc78608), TOBN(0x28c7d484, 0x277e2a4c),
-     TOBN(0xfce01767, 0x88a2ffe4), TOBN(0xdc506a35, 0x28e169a5),
-     TOBN(0x0ea10861, 0x7af9c93a), TOBN(0x1ed24361, 0x03fa0e08),
-     TOBN(0x96eaaa92, 0xa3d694e7), TOBN(0xc0f43b4d, 0xef50bc74),
-     TOBN(0xce6aa58c, 0x64114db4), TOBN(0x8218e8ea, 0x7c000fd4),
-     TOBN(0xac815dfb, 0x185f8844), TOBN(0xcd7e90cb, 0x1557abfb),
-     TOBN(0x23d16655, 0xafbfecdf), TOBN(0x80f3271f, 0x085cac4a),
-     TOBN(0x7fc39aa7, 0xd0e62f47), TOBN(0x88d519d1, 0x460a48e5),
-     TOBN(0x59559ac4, 0xd28f101e), TOBN(0x7981d9e9, 0xca9ae816),
-     TOBN(0x5c38652c, 0x9ac38203), TOBN(0x86eaf87f, 0x57657fe5),
-     TOBN(0x568fc472, 0xe21f5416), TOBN(0x2afff39c, 0xe7e597b5),
-     TOBN(0x3adbbb07, 0x256d4eab), TOBN(0x22598692, 0x8285ab89),
-     TOBN(0x35f8112a, 0x041caefe), TOBN(0x95df02e3, 0xa5064c8b),
-     TOBN(0x4d63356e, 0xc7004bf3), TOBN(0x230a08f4, 0xdb83c7de),
-     TOBN(0xca27b270, 0x8709a7b7), TOBN(0x0d1c4cc4, 0xcb9abd2d),
-     TOBN(0x8a0bc66e, 0x7550fee8), TOBN(0x369cd4c7, 0x9cf7247e),
-     TOBN(0x75562e84, 0x92b5b7e7), TOBN(0x8fed0da0, 0x5802af7b),
-     TOBN(0x6a7091c2, 0xe48fb889), TOBN(0x26882c13, 0x7b8a9d06),
-     TOBN(0xa2498663, 0x1b82a0e2), TOBN(0x844ed736, 0x3518152d),
-     TOBN(0x282f476f, 0xd86e27c7), TOBN(0xa04edaca, 0x04afefdc),
-     TOBN(0x8b256ebc, 0x6119e34d), TOBN(0x56a413e9, 0x0787d78b),}
-    ,
-    {TOBN(0x82ee061d, 0x5a74be50), TOBN(0xe41781c4, 0xdea16ff5),
-     TOBN(0xe0b0c81e, 0x99bfc8a2), TOBN(0x624f4d69, 0x0b547e2d),
-     TOBN(0x3a83545d, 0xbdcc9ae4), TOBN(0x2573dbb6, 0x409b1e8e),
-     TOBN(0x482960c4, 0xa6c93539), TOBN(0xf01059ad, 0x5ae18798),
-     TOBN(0x715c9f97, 0x3112795f), TOBN(0xe8244437, 0x984e6ee1),
-     TOBN(0x55cb4858, 0xecb66bcd), TOBN(0x7c136735, 0xabaffbee),
-     TOBN(0x54661595, 0x5dbec38e), TOBN(0x51c0782c, 0x388ad153),
-     TOBN(0x9ba4c53a, 0xc6e0952f), TOBN(0x27e6782a, 0x1b21dfa8),
-     TOBN(0x682f903d, 0x4ed2dbc2), TOBN(0x0eba59c8, 0x7c3b2d83),
-     TOBN(0x8e9dc84d, 0x9c7e9335), TOBN(0x5f9b21b0, 0x0eb226d7),
-     TOBN(0xe33bd394, 0xaf267bae), TOBN(0xaa86cc25, 0xbe2e15ae),
-     TOBN(0x4f0bf67d, 0x6a8ec500), TOBN(0x5846aa44, 0xf9630658),
-     TOBN(0xfeb09740, 0xe2c2bf15), TOBN(0x627a2205, 0xa9e99704),
-     TOBN(0xec8d73d0, 0xc2fbc565), TOBN(0x223eed8f, 0xc20c8de8),
-     TOBN(0x1ee32583, 0xa8363b49), TOBN(0x1a0b6cb9, 0xc9c2b0a6),
-     TOBN(0x49f7c3d2, 0x90dbc85c), TOBN(0xa8dfbb97, 0x1ef4c1ac),
-     TOBN(0xafb34d4c, 0x65c7c2ab), TOBN(0x1d4610e7, 0xe2c5ea84),
-     TOBN(0x893f6d1b, 0x973c4ab5), TOBN(0xa3cdd7e9, 0x945ba5c4),
-     TOBN(0x60514983, 0x064417ee), TOBN(0x1459b23c, 0xad6bdf2b),
-     TOBN(0x23b2c341, 0x5cf726c3), TOBN(0x3a829635, 0x32d6354a),
-     TOBN(0x294f901f, 0xab192c18), TOBN(0xec5fcbfe, 0x7030164f),
-     TOBN(0xe2e2fcb7, 0xe2246ba6), TOBN(0x1e7c88b3, 0x221a1a0c),
-     TOBN(0x72c7dd93, 0xc92d88c5), TOBN(0x41c2148e, 0x1106fb59),
-     TOBN(0x547dd4f5, 0xa0f60f14), TOBN(0xed9b52b2, 0x63960f31),
-     TOBN(0x6c8349eb, 0xb0a5b358), TOBN(0xb154c5c2, 0x9e7e2ed6),
-     TOBN(0xcad5eccf, 0xeda462db), TOBN(0xf2d6dbe4, 0x2de66b69),
-     TOBN(0x426aedf3, 0x8665e5b2), TOBN(0x488a8513, 0x7b7f5723),
-     TOBN(0x15cc43b3, 0x8bcbb386), TOBN(0x27ad0af3, 0xd791d879),
-     TOBN(0xc16c236e, 0x846e364f), TOBN(0x7f33527c, 0xdea50ca0),
-     TOBN(0xc4810775, 0x0926b86d), TOBN(0x6c2a3609, 0x0598e70c),
-     TOBN(0xa6755e52, 0xf024e924), TOBN(0xe0fa07a4, 0x9db4afca),
-     TOBN(0x15c3ce7d, 0x66831790), TOBN(0x5b4ef350, 0xa6cbb0d6),
-     TOBN(0x2c4aafc4, 0xb6205969), TOBN(0x42563f02, 0xf6c7854f),
-     TOBN(0x016aced5, 0x1d983b48), TOBN(0xfeb356d8, 0x99949755),
-     TOBN(0x8c2a2c81, 0xd1a39bd7), TOBN(0x8f44340f, 0xe6934ae9),
-     TOBN(0x148cf91c, 0x447904da), TOBN(0x7340185f, 0x0f51a926),
-     TOBN(0x2f8f00fb, 0x7409ab46), TOBN(0x057e78e6, 0x80e289b2),
-     TOBN(0x03e5022c, 0xa888e5d1), TOBN(0x3c87111a, 0x9dede4e2),
-     TOBN(0x5b9b0e1c, 0x7809460b), TOBN(0xe751c852, 0x71c9abc7),
-     TOBN(0x8b944e28, 0xc7cc1dc9), TOBN(0x4f201ffa, 0x1d3cfa08),
-     TOBN(0x02fc905c, 0x3e6721ce), TOBN(0xd52d70da, 0xd0b3674c),
-     TOBN(0x5dc2e5ca, 0x18810da4), TOBN(0xa984b273, 0x5c69dd99),
-     TOBN(0x63b92527, 0x84de5ca4), TOBN(0x2f1c9872, 0xc852dec4),
-     TOBN(0x18b03593, 0xc2e3de09), TOBN(0x19d70b01, 0x9813dc2f),
-     TOBN(0x42806b2d, 0xa6dc1d29), TOBN(0xd3030009, 0xf871e144),
-     TOBN(0xa1feb333, 0xaaf49276), TOBN(0xb5583b9e, 0xc70bc04b),
-     TOBN(0x1db0be78, 0x95695f20), TOBN(0xfc841811, 0x89d012b5),
-     TOBN(0x6409f272, 0x05f61643), TOBN(0x40d34174, 0xd5883128),
-     TOBN(0xd79196f5, 0x67419833), TOBN(0x6059e252, 0x863b7b08),
-     TOBN(0x84da1817, 0x1c56700c), TOBN(0x5758ee56, 0xb28d3ec4),
-     TOBN(0x7da2771d, 0x013b0ea6), TOBN(0xfddf524b, 0x54c5e9b9),
-     TOBN(0x7df4faf8, 0x24305d80), TOBN(0x58f5c1bf, 0x3a97763f),
-     TOBN(0xa5af37f1, 0x7c696042), TOBN(0xd4cba22c, 0x4a2538de),
-     TOBN(0x211cb995, 0x9ea42600), TOBN(0xcd105f41, 0x7b069889),
-     TOBN(0xb1e1cf19, 0xddb81e74), TOBN(0x472f2d89, 0x5157b8ca),
-     TOBN(0x086fb008, 0xee9db885), TOBN(0x365cd570, 0x0f26d131),
-     TOBN(0x284b02bb, 0xa2be7053), TOBN(0xdcbbf7c6, 0x7ab9a6d6),
-     TOBN(0x4425559c, 0x20f7a530), TOBN(0x961f2dfa, 0x188767c8),
-     TOBN(0xe2fd9435, 0x70dc80c4), TOBN(0x104d6b63, 0xf0784120),
-     TOBN(0x7f592bc1, 0x53567122), TOBN(0xf6bc1246, 0xf688ad77),
-     TOBN(0x05214c05, 0x0f15dde9), TOBN(0xa47a76a8, 0x0d5f2b82),
-     TOBN(0xbb254d30, 0x62e82b62), TOBN(0x11a05fe0, 0x3ec955ee),
-     TOBN(0x7eaff46e, 0x9d529b36), TOBN(0x55ab1301, 0x8f9e3df6),
-     TOBN(0xc463e371, 0x99317698), TOBN(0xfd251438, 0xccda47ad),
-     TOBN(0xca9c3547, 0x23d695ea), TOBN(0x48ce626e, 0x16e589b5),
-     TOBN(0x6b5b64c7, 0xb187d086), TOBN(0xd02e1794, 0xb2207948),
-     TOBN(0x8b58e98f, 0x7198111d), TOBN(0x90ca6305, 0xdcf9c3cc),
-     TOBN(0x5691fe72, 0xf34089b0), TOBN(0x60941af1, 0xfc7c80ff),
-     TOBN(0xa09bc0a2, 0x22eb51e5), TOBN(0xc0bb7244, 0xaa9cf09a),
-     TOBN(0x36a8077f, 0x80159f06), TOBN(0x8b5c989e, 0xdddc560e),
-     TOBN(0x19d2f316, 0x512e1f43), TOBN(0x02eac554, 0xad08ff62),
-     TOBN(0x012ab84c, 0x07d20b4e), TOBN(0x37d1e115, 0xd6d4e4e1),
-     TOBN(0xb6443e1a, 0xab7b19a8), TOBN(0xf08d067e, 0xdef8cd45),
-     TOBN(0x63adf3e9, 0x685e03da), TOBN(0xcf15a10e, 0x4792b916),
-     TOBN(0xf44bcce5, 0xb738a425), TOBN(0xebe131d5, 0x9636b2fd),
-     TOBN(0x94068841, 0x7850d605), TOBN(0x09684eaa, 0xb40d749d),
-     TOBN(0x8c3c669c, 0x72ba075b), TOBN(0x89f78b55, 0xba469015),
-     TOBN(0x5706aade, 0x3e9f8ba8), TOBN(0x6d8bd565, 0xb32d7ed7),
-     TOBN(0x25f4e63b, 0x805f08d6), TOBN(0x7f48200d, 0xc3bcc1b5),
-     TOBN(0x4e801968, 0xb025d847), TOBN(0x74afac04, 0x87cbe0a8),
-     TOBN(0x43ed2c2b, 0x7e63d690), TOBN(0xefb6bbf0, 0x0223cdb8),
-     TOBN(0x4fec3cae, 0x2884d3fe), TOBN(0x065ecce6, 0xd75e25a4),
-     TOBN(0x6c2294ce, 0x69f79071), TOBN(0x0d9a8e5f, 0x044b8666),
-     TOBN(0x5009f238, 0x17b69d8f), TOBN(0x3c29f8fe, 0xc5dfdaf7),
-     TOBN(0x9067528f, 0xebae68c4), TOBN(0x5b385632, 0x30c5ba21),
-     TOBN(0x540df119, 0x1fdd1aec), TOBN(0xcf37825b, 0xcfba4c78),
-     TOBN(0x77eff980, 0xbeb11454), TOBN(0x40a1a991, 0x60c1b066),
-     TOBN(0xe8018980, 0xf889a1c7), TOBN(0xb9c52ae9, 0x76c24be0),
-     TOBN(0x05fbbcce, 0x45650ef4), TOBN(0xae000f10, 0x8aa29ac7),
-     TOBN(0x884b7172, 0x4f04c470), TOBN(0x7cd4fde2, 0x19bb5c25),
-     TOBN(0x6477b22a, 0xe8840869), TOBN(0xa8868859, 0x5fbd0686),
-     TOBN(0xf23cc02e, 0x1116dfba), TOBN(0x76cd563f, 0xd87d7776),
-     TOBN(0xe2a37598, 0xa9d82abf), TOBN(0x5f188ccb, 0xe6c170f5),
-     TOBN(0x81682200, 0x5066b087), TOBN(0xda22c212, 0xc7155ada),
-     TOBN(0x151e5d3a, 0xfbddb479), TOBN(0x4b606b84, 0x6d715b99),
-     TOBN(0x4a73b54b, 0xf997cb2e), TOBN(0x9a1bfe43, 0x3ecd8b66),
-     TOBN(0x1c312809, 0x2a67d48a), TOBN(0xcd6a671e, 0x031fa9e2),
-     TOBN(0xbec3312a, 0x0e43a34a), TOBN(0x1d935639, 0x55ef47d3),
-     TOBN(0x5ea02489, 0x8fea73ea), TOBN(0x8247b364, 0xa035afb2),
-     TOBN(0xb58300a6, 0x5265b54c), TOBN(0x3286662f, 0x722c7148),
-     TOBN(0xb77fd76b, 0xb4ec4c20), TOBN(0xf0a12fa7, 0x0f3fe3fd),
-     TOBN(0xf845bbf5, 0x41d8c7e8), TOBN(0xe4d969ca, 0x5ec10aa8),
-     TOBN(0x4c0053b7, 0x43e232a3), TOBN(0xdc7a3fac, 0x37f8a45a),
-     TOBN(0x3c4261c5, 0x20d81c8f), TOBN(0xfd4b3453, 0xb00eab00),
-     TOBN(0x76d48f86, 0xd36e3062), TOBN(0x626c5277, 0xa143ff02),
-     TOBN(0x538174de, 0xaf76f42e), TOBN(0x2267aa86, 0x6407ceac),
-     TOBN(0xfad76351, 0x72e572d5), TOBN(0xab861af7, 0xba7330eb),
-     TOBN(0xa0a1c8c7, 0x418d8657), TOBN(0x988821cb, 0x20289a52),
-     TOBN(0x79732522, 0xcccc18ad), TOBN(0xaadf3f8d, 0xf1a6e027),
-     TOBN(0xf7382c93, 0x17c2354d), TOBN(0x5ce1680c, 0xd818b689),
-     TOBN(0x359ebbfc, 0xd9ecbee9), TOBN(0x4330689c, 0x1cae62ac),
-     TOBN(0xb55ce5b4, 0xc51ac38a), TOBN(0x7921dfea, 0xfe238ee8),
-     TOBN(0x3972bef8, 0x271d1ca5), TOBN(0x3e423bc7, 0xe8aabd18),
-     TOBN(0x57b09f3f, 0x44a3e5e3), TOBN(0x5da886ae, 0x7b444d66),
-     TOBN(0x68206634, 0xa9964375), TOBN(0x356a2fa3, 0x699cd0ff),
-     TOBN(0xaf0faa24, 0xdba515e9), TOBN(0x536e1f5c, 0xb321d79a),
-     TOBN(0xd3b9913a, 0x5c04e4ea), TOBN(0xd549dcfe, 0xd6f11513),
-     TOBN(0xee227bf5, 0x79fd1d94), TOBN(0x9f35afee, 0xb43f2c67),
-     TOBN(0xd2638d24, 0xf1314f53), TOBN(0x62baf948, 0xcabcd822),
-     TOBN(0x5542de29, 0x4ef48db0), TOBN(0xb3eb6a04, 0xfc5f6bb2),
-     TOBN(0x23c110ae, 0x1208e16a), TOBN(0x1a4d15b5, 0xf8363e24),
-     TOBN(0x30716844, 0x164be00b), TOBN(0xa8e24824, 0xf6f4690d),
-     TOBN(0x548773a2, 0x90b170cf), TOBN(0xa1bef331, 0x42f191f4),
-     TOBN(0x70f418d0, 0x9247aa97), TOBN(0xea06028e, 0x48be9147),
-     TOBN(0xe13122f3, 0xdbfb894e), TOBN(0xbe9b79f6, 0xce274b18),
-     TOBN(0x85a49de5, 0xca58aadf), TOBN(0x24957758, 0x11487351),
-     TOBN(0x111def61, 0xbb939099), TOBN(0x1d6a974a, 0x26d13694),
-     TOBN(0x4474b4ce, 0xd3fc253b), TOBN(0x3a1485e6, 0x4c5db15e),
-     TOBN(0xe79667b4, 0x147c15b4), TOBN(0xe34f553b, 0x7bc61301),
-     TOBN(0x032b80f8, 0x17094381), TOBN(0x55d8bafd, 0x723eaa21),
-     TOBN(0x5a987995, 0xf1c0e74e), TOBN(0x5a9b292e, 0xebba289c),
-     TOBN(0x413cd4b2, 0xeb4c8251), TOBN(0x98b5d243, 0xd162db0a),
-     TOBN(0xbb47bf66, 0x68342520), TOBN(0x08d68949, 0xbaa862d1),
-     TOBN(0x11f349c7, 0xe906abcd), TOBN(0x454ce985, 0xed7bf00e),
-     TOBN(0xacab5c9e, 0xb55b803b), TOBN(0xb03468ea, 0x31e3c16d),
-     TOBN(0x5c24213d, 0xd273bf12), TOBN(0x211538eb, 0x71587887),
-     TOBN(0x198e4a2f, 0x731dea2d), TOBN(0xd5856cf2, 0x74ed7b2a),
-     TOBN(0x86a632eb, 0x13a664fe), TOBN(0x932cd909, 0xbda41291),
-     TOBN(0x850e95d4, 0xc0c4ddc0), TOBN(0xc0f422f8, 0x347fc2c9),
-     TOBN(0xe68cbec4, 0x86076bcb), TOBN(0xf9e7c0c0, 0xcd6cd286),
-     TOBN(0x65994ddb, 0x0f5f27ca), TOBN(0xe85461fb, 0xa80d59ff),
-     TOBN(0xff05481a, 0x66601023), TOBN(0xc665427a, 0xfc9ebbfb),
-     TOBN(0xb0571a69, 0x7587fd52), TOBN(0x935289f8, 0x8d49efce),
-     TOBN(0x61becc60, 0xea420688), TOBN(0xb22639d9, 0x13a786af),
-     TOBN(0x1a8e6220, 0x361ecf90), TOBN(0x001f23e0, 0x25506463),
-     TOBN(0xe4ae9b5d, 0x0a5c2b79), TOBN(0xebc9cdad, 0xd8149db5),
-     TOBN(0xb33164a1, 0x934aa728), TOBN(0x750eb00e, 0xae9b60f3),
-     TOBN(0x5a91615b, 0x9b9cfbfd), TOBN(0x97015cbf, 0xef45f7f6),
-     TOBN(0xb462c4a5, 0xbf5151df), TOBN(0x21adcc41, 0xb07118f2),
-     TOBN(0xd60c545b, 0x043fa42c), TOBN(0xfc21aa54, 0xe96be1ab),
-     TOBN(0xe84bc32f, 0x4e51ea80), TOBN(0x3dae45f0, 0x259b5d8d),
-     TOBN(0xbb73c7eb, 0xc38f1b5e), TOBN(0xe405a74a, 0xe8ae617d),
-     TOBN(0xbb1ae9c6, 0x9f1c56bd), TOBN(0x8c176b98, 0x49f196a4),
-     TOBN(0xc448f311, 0x6875092b), TOBN(0xb5afe3de, 0x9f976033),
-     TOBN(0xa8dafd49, 0x145813e5), TOBN(0x687fc4d9, 0xe2b34226),
-     TOBN(0xf2dfc92d, 0x4c7ff57f), TOBN(0x004e3fc1, 0x401f1b46),
-     TOBN(0x5afddab6, 0x1430c9ab), TOBN(0x0bdd41d3, 0x2238e997),
-     TOBN(0xf0947430, 0x418042ae), TOBN(0x71f9adda, 0xcdddc4cb),
-     TOBN(0x7090c016, 0xc52dd907), TOBN(0xd9bdf44d, 0x29e2047f),
-     TOBN(0xe6f1fe80, 0x1b1011a6), TOBN(0xb63accbc, 0xd9acdc78),
-     TOBN(0xcfc7e235, 0x1272a95b), TOBN(0x0c667717, 0xa6276ac8),
-     TOBN(0x3c0d3709, 0xe2d7eef7), TOBN(0x5add2b06, 0x9a685b3e),
-     TOBN(0x363ad32d, 0x14ea5d65), TOBN(0xf8e01f06, 0x8d7dd506),
-     TOBN(0xc9ea2213, 0x75b4aac6), TOBN(0xed2a2bf9, 0x0d353466),
-     TOBN(0x439d79b5, 0xe9d3a7c3), TOBN(0x8e0ee5a6, 0x81b7f34b),
-     TOBN(0xcf3dacf5, 0x1dc4ba75), TOBN(0x1d3d1773, 0xeb3310c7),
-     TOBN(0xa8e67112, 0x7747ae83), TOBN(0x31f43160, 0x197d6b40),
-     TOBN(0x0521ccee, 0xcd961400), TOBN(0x67246f11, 0xf6535768),
-     TOBN(0x702fcc5a, 0xef0c3133), TOBN(0x247cc45d, 0x7e16693b),
-     TOBN(0xfd484e49, 0xc729b749), TOBN(0x522cef7d, 0xb218320f),
-     TOBN(0xe56ef405, 0x59ab93b3), TOBN(0x225fba11, 0x9f181071),
-     TOBN(0x33bd6595, 0x15330ed0), TOBN(0xc4be69d5, 0x1ddb32f7),
-     TOBN(0x264c7668, 0x0448087c), TOBN(0xac30903f, 0x71432dae),
-     TOBN(0x3851b266, 0x00f9bf47), TOBN(0x400ed311, 0x6cdd6d03),
-     TOBN(0x045e79fe, 0xf8fd2424), TOBN(0xfdfd974a, 0xfa6da98b),
-     TOBN(0x45c9f641, 0x0c1e673a), TOBN(0x76f2e733, 0x5b2c5168),
-     TOBN(0x1adaebb5, 0x2a601753), TOBN(0xb286514c, 0xc57c2d49),
-     TOBN(0xd8769670, 0x1e0bfd24), TOBN(0x950c547e, 0x04478922),
-     TOBN(0xd1d41969, 0xe5d32bfe), TOBN(0x30bc1472, 0x750d6c3e),
-     TOBN(0x8f3679fe, 0xe0e27f3a), TOBN(0x8f64a7dc, 0xa4a6ee0c),
-     TOBN(0x2fe59937, 0x633dfb1f), TOBN(0xea82c395, 0x977f2547),
-     TOBN(0xcbdfdf1a, 0x661ea646), TOBN(0xc7ccc591, 0xb9085451),
-     TOBN(0x82177962, 0x81761e13), TOBN(0xda57596f, 0x9196885c),
-     TOBN(0xbc17e849, 0x28ffbd70), TOBN(0x1e6e0a41, 0x2671d36f),
-     TOBN(0x61ae872c, 0x4152fcf5), TOBN(0x441c87b0, 0x9e77e754),
-     TOBN(0xd0799dd5, 0xa34dff09), TOBN(0x766b4e44, 0x88a6b171),
-     TOBN(0xdc06a512, 0x11f1c792), TOBN(0xea02ae93, 0x4be35c3e),
-     TOBN(0xe5ca4d6d, 0xe90c469e), TOBN(0x4df4368e, 0x56e4ff5c),
-     TOBN(0x7817acab, 0x4baef62e), TOBN(0x9f5a2202, 0xa85b91e8),
-     TOBN(0x9666ebe6, 0x6ce57610), TOBN(0x32ad31f3, 0xf73bfe03),
-     TOBN(0x628330a4, 0x25bcf4d6), TOBN(0xea950593, 0x515056e6),
-     TOBN(0x59811c89, 0xe1332156), TOBN(0xc89cf1fe, 0x8c11b2d7),
-     TOBN(0x75b63913, 0x04e60cc0), TOBN(0xce811e8d, 0x4625d375),
-     TOBN(0x030e43fc, 0x2d26e562), TOBN(0xfbb30b4b, 0x608d36a0),
-     TOBN(0x634ff82c, 0x48528118), TOBN(0x7c6fe085, 0xcd285911),
-     TOBN(0x7f2830c0, 0x99358f28), TOBN(0x2e60a95e, 0x665e6c09),
-     TOBN(0x08407d3d, 0x9b785dbf), TOBN(0x530889ab, 0xa759bce7),
-     TOBN(0xf228e0e6, 0x52f61239), TOBN(0x2b6d1461, 0x6879be3c),
-     TOBN(0xe6902c04, 0x51a7bbf7), TOBN(0x30ad99f0, 0x76f24a64),
-     TOBN(0x66d9317a, 0x98bc6da0), TOBN(0xf4f877f3, 0xcb596ac0),
-     TOBN(0xb05ff62d, 0x4c44f119), TOBN(0x4555f536, 0xe9b77416),
-     TOBN(0xc7c0d059, 0x8caed63b), TOBN(0x0cd2b7ce, 0xc358b2a9),
-     TOBN(0x3f33287b, 0x46945fa3), TOBN(0xf8785b20, 0xd67c8791),
-     TOBN(0xc54a7a61, 0x9637bd08), TOBN(0x54d4598c, 0x18be79d7),
-     TOBN(0x889e5acb, 0xc46d7ce1), TOBN(0x9a515bb7, 0x8b085877),
-     TOBN(0xfac1a03d, 0x0b7a5050), TOBN(0x7d3e738a, 0xf2926035),
-     TOBN(0x861cc2ce, 0x2a6cb0eb), TOBN(0x6f2e2955, 0x8f7adc79),
-     TOBN(0x61c4d451, 0x33016376), TOBN(0xd9fd2c80, 0x5ad59090),
-     TOBN(0xe5a83738, 0xb2b836a1), TOBN(0x855b41a0, 0x7c0d6622),
-     TOBN(0x186fe317, 0x7cc19af1), TOBN(0x6465c1ff, 0xfdd99acb),
-     TOBN(0x46e5c23f, 0x6974b99e), TOBN(0x75a7cf8b, 0xa2717cbe),
-     TOBN(0x4d2ebc3f, 0x062be658), TOBN(0x094b4447, 0x5f209c98),
-     TOBN(0x4af285ed, 0xb940cb5a), TOBN(0x6706d792, 0x7cc82f10),
-     TOBN(0xc8c8776c, 0x030526fa), TOBN(0xfa8e6f76, 0xa0da9140),
-     TOBN(0x77ea9d34, 0x591ee4f0), TOBN(0x5f46e337, 0x40274166),
-     TOBN(0x1bdf98bb, 0xea671457), TOBN(0xd7c08b46, 0x862a1fe2),
-     TOBN(0x46cc303c, 0x1c08ad63), TOBN(0x99543440, 0x4c845e7b),
-     TOBN(0x1b8fbdb5, 0x48f36bf7), TOBN(0x5b82c392, 0x8c8273a7),
-     TOBN(0x08f712c4, 0x928435d5), TOBN(0x071cf0f1, 0x79330380),
-     TOBN(0xc74c2d24, 0xa8da054a), TOBN(0xcb0e7201, 0x43c46b5c),
-     TOBN(0x0ad7337a, 0xc0b7eff3), TOBN(0x8552225e, 0xc5e48b3c),
-     TOBN(0xe6f78b0c, 0x73f13a5f), TOBN(0x5e70062e, 0x82349cbe),
-     TOBN(0x6b8d5048, 0xe7073969), TOBN(0x392d2a29, 0xc33cb3d2),
-     TOBN(0xee4f727c, 0x4ecaa20f), TOBN(0xa068c99e, 0x2ccde707),
-     TOBN(0xfcd5651f, 0xb87a2913), TOBN(0xea3e3c15, 0x3cc252f0),
-     TOBN(0x777d92df, 0x3b6cd3e4), TOBN(0x7a414143, 0xc5a732e7),
-     TOBN(0xa895951a, 0xa71ff493), TOBN(0xfe980c92, 0xbbd37cf6),
-     TOBN(0x45bd5e64, 0xdecfeeff), TOBN(0x910dc2a9, 0xa44c43e9),
-     TOBN(0xcb403f26, 0xcca9f54d), TOBN(0x928bbdfb, 0x9303f6db),
-     TOBN(0x3c37951e, 0xa9eee67c), TOBN(0x3bd61a52, 0xf79961c3),
-     TOBN(0x09a238e6, 0x395c9a79), TOBN(0x6940ca2d, 0x61eb352d),
-     TOBN(0x7d1e5c5e, 0xc1875631), TOBN(0x1e19742c, 0x1e1b20d1),
-     TOBN(0x4633d908, 0x23fc2e6e), TOBN(0xa76e29a9, 0x08959149),
-     TOBN(0x61069d9c, 0x84ed7da5), TOBN(0x0baa11cf, 0x5dbcad51),
-     TOBN(0xd01eec64, 0x961849da), TOBN(0x93b75f1f, 0xaf3d8c28),
-     TOBN(0x57bc4f9f, 0x1ca2ee44), TOBN(0x5a26322d, 0x00e00558),
-     TOBN(0x1888d658, 0x61a023ef), TOBN(0x1d72aab4, 0xb9e5246e),
-     TOBN(0xa9a26348, 0xe5563ec0), TOBN(0xa0971963, 0xc3439a43),
-     TOBN(0x567dd54b, 0xadb9b5b7), TOBN(0x73fac1a1, 0xc45a524b),
-     TOBN(0x8fe97ef7, 0xfe38e608), TOBN(0x608748d2, 0x3f384f48),
-     TOBN(0xb0571794, 0xc486094f), TOBN(0x869254a3, 0x8bf3a8d6),
-     TOBN(0x148a8dd1, 0x310b0e25), TOBN(0x99ab9f3f, 0x9aa3f7d8),
-     TOBN(0x0927c68a, 0x6706c02e), TOBN(0x22b5e76c, 0x69790e6c),
-     TOBN(0x6c325260, 0x6c71376c), TOBN(0x53a57690, 0x09ef6657),
-     TOBN(0x8d63f852, 0xedffcf3a), TOBN(0xb4d2ed04, 0x3c0a6f55),
-     TOBN(0xdb3aa8de, 0x12519b9e), TOBN(0x5d38e9c4, 0x1e0a569a),
-     TOBN(0x871528bf, 0x303747e2), TOBN(0xa208e77c, 0xf5b5c18d),
-     TOBN(0x9d129c88, 0xca6bf923), TOBN(0xbcbf197f, 0xbf02839f),
-     TOBN(0x9b9bf030, 0x27323194), TOBN(0x3b055a8b, 0x339ca59d),
-     TOBN(0xb46b2312, 0x0f669520), TOBN(0x19789f1f, 0x497e5f24),
-     TOBN(0x9c499468, 0xaaf01801), TOBN(0x72ee1190, 0x8b69d59c),
-     TOBN(0x8bd39595, 0xacf4c079), TOBN(0x3ee11ece, 0x8e0cd048),
-     TOBN(0xebde86ec, 0x1ed66f18), TOBN(0x225d906b, 0xd61fce43),
-     TOBN(0x5cab07d6, 0xe8bed74d), TOBN(0x16e4617f, 0x27855ab7),
-     TOBN(0x6568aadd, 0xb2fbc3dd), TOBN(0xedb5484f, 0x8aeddf5b),
-     TOBN(0x878f20e8, 0x6dcf2fad), TOBN(0x3516497c, 0x615f5699),}
-    ,
-    {TOBN(0xef0a3fec, 0xfa181e69), TOBN(0x9ea02f81, 0x30d69a98),
-     TOBN(0xb2e9cf8e, 0x66eab95d), TOBN(0x520f2beb, 0x24720021),
-     TOBN(0x621c540a, 0x1df84361), TOBN(0x12037721, 0x71fa6d5d),
-     TOBN(0x6e3c7b51, 0x0ff5f6ff), TOBN(0x817a069b, 0xabb2bef3),
-     TOBN(0x83572fb6, 0xb294cda6), TOBN(0x6ce9bf75, 0xb9039f34),
-     TOBN(0x20e012f0, 0x095cbb21), TOBN(0xa0aecc1b, 0xd063f0da),
-     TOBN(0x57c21c3a, 0xf02909e5), TOBN(0xc7d59ecf, 0x48ce9cdc),
-     TOBN(0x2732b844, 0x8ae336f8), TOBN(0x056e3723, 0x3f4f85f4),
-     TOBN(0x8a10b531, 0x89e800ca), TOBN(0x50fe0c17, 0x145208fd),
-     TOBN(0x9e43c0d3, 0xb714ba37), TOBN(0x427d200e, 0x34189acc),
-     TOBN(0x05dee24f, 0xe616e2c0), TOBN(0x9c25f4c8, 0xee1854c1),
-     TOBN(0x4d3222a5, 0x8f342a73), TOBN(0x0807804f, 0xa027c952),
-     TOBN(0xc222653a, 0x4f0d56f3), TOBN(0x961e4047, 0xca28b805),
-     TOBN(0x2c03f8b0, 0x4a73434b), TOBN(0x4c966787, 0xab712a19),
-     TOBN(0xcc196c42, 0x864fee42), TOBN(0xc1be93da, 0x5b0ece5c),
-     TOBN(0xa87d9f22, 0xc131c159), TOBN(0x2bb6d593, 0xdce45655),
-     TOBN(0x22c49ec9, 0xb809b7ce), TOBN(0x8a41486b, 0xe2c72c2c),
-     TOBN(0x813b9420, 0xfea0bf36), TOBN(0xb3d36ee9, 0xa66dac69),
-     TOBN(0x6fddc08a, 0x328cc987), TOBN(0x0a3bcd2c, 0x3a326461),
-     TOBN(0x7103c49d, 0xd810dbba), TOBN(0xf9d81a28, 0x4b78a4c4),
-     TOBN(0x3de865ad, 0xe4d55941), TOBN(0xdedafa5e, 0x30384087),
-     TOBN(0x6f414abb, 0x4ef18b9b), TOBN(0x9ee9ea42, 0xfaee5268),
-     TOBN(0x260faa16, 0x37a55a4a), TOBN(0xeb19a514, 0x015f93b9),
-     TOBN(0x51d7ebd2, 0x9e9c3598), TOBN(0x523fc56d, 0x1932178e),
-     TOBN(0x501d070c, 0xb98fe684), TOBN(0xd60fbe9a, 0x124a1458),
-     TOBN(0xa45761c8, 0x92bc6b3f), TOBN(0xf5384858, 0xfe6f27cb),
-     TOBN(0x4b0271f7, 0xb59e763b), TOBN(0x3d4606a9, 0x5b5a8e5e),
-     TOBN(0x1eda5d9b, 0x05a48292), TOBN(0xda7731d0, 0xe6fec446),
-     TOBN(0xa3e33693, 0x90d45871), TOBN(0xe9764040, 0x06166d8d),
-     TOBN(0xb5c33682, 0x89a90403), TOBN(0x4bd17983, 0x72f1d637),
-     TOBN(0xa616679e, 0xd5d2c53a), TOBN(0x5ec4bcd8, 0xfdcf3b87),
-     TOBN(0xae6d7613, 0xb66a694e), TOBN(0x7460fc76, 0xe3fc27e5),
-     TOBN(0x70469b82, 0x95caabee), TOBN(0xde024ca5, 0x889501e3),
-     TOBN(0x6bdadc06, 0x076ed265), TOBN(0x0cb1236b, 0x5a0ef8b2),
-     TOBN(0x4065ddbf, 0x0972ebf9), TOBN(0xf1dd3875, 0x22aca432),
-     TOBN(0xa88b97cf, 0x744aff76), TOBN(0xd1359afd, 0xfe8e3d24),
-     TOBN(0x52a3ba2b, 0x91502cf3), TOBN(0x2c3832a8, 0x084db75d),
-     TOBN(0x04a12ddd, 0xde30b1c9), TOBN(0x7802eabc, 0xe31fd60c),
-     TOBN(0x33707327, 0xa37fddab), TOBN(0x65d6f2ab, 0xfaafa973),
-     TOBN(0x3525c5b8, 0x11e6f91a), TOBN(0x76aeb0c9, 0x5f46530b),
-     TOBN(0xe8815ff6, 0x2f93a675), TOBN(0xa6ec9684, 0x05f48679),
-     TOBN(0x6dcbb556, 0x358ae884), TOBN(0x0af61472, 0xe19e3873),
-     TOBN(0x72334372, 0xa5f696be), TOBN(0xc65e57ea, 0x6f22fb70),
-     TOBN(0x268da30c, 0x946cea90), TOBN(0x136a8a87, 0x65681b2a),
-     TOBN(0xad5e81dc, 0x0f9f44d4), TOBN(0xf09a6960, 0x2c46585a),
-     TOBN(0xd1649164, 0xc447d1b1), TOBN(0x3b4b36c8, 0x879dc8b1),
-     TOBN(0x20d4177b, 0x3b6b234c), TOBN(0x096a2505, 0x1730d9d0),
-     TOBN(0x0611b9b8, 0xef80531d), TOBN(0xba904b3b, 0x64bb495d),
-     TOBN(0x1192d9d4, 0x93a3147a), TOBN(0x9f30a5dc, 0x9a565545),
-     TOBN(0x90b1f9cb, 0x6ef07212), TOBN(0x29958546, 0x0d87fc13),
-     TOBN(0xd3323eff, 0xc17db9ba), TOBN(0xcb18548c, 0xcb1644a8),
-     TOBN(0x18a306d4, 0x4f49ffbc), TOBN(0x28d658f1, 0x4c2e8684),
-     TOBN(0x44ba60cd, 0xa99f8c71), TOBN(0x67b7abdb, 0x4bf742ff),
-     TOBN(0x66310f9c, 0x914b3f99), TOBN(0xae430a32, 0xf412c161),
-     TOBN(0x1e6776d3, 0x88ace52f), TOBN(0x4bc0fa24, 0x52d7067d),
-     TOBN(0x03c286aa, 0x8f07cd1b), TOBN(0x4cb8f38c, 0xa985b2c1),
-     TOBN(0x83ccbe80, 0x8c3bff36), TOBN(0x005a0bd2, 0x5263e575),
-     TOBN(0x460d7dda, 0x259bdcd1), TOBN(0x4a1c5642, 0xfa5cab6b),
-     TOBN(0x2b7bdbb9, 0x9fe4fc88), TOBN(0x09418e28, 0xcc97bbb5),
-     TOBN(0xd8274fb4, 0xa12321ae), TOBN(0xb137007d, 0x5c87b64e),
-     TOBN(0x80531fe1, 0xc63c4962), TOBN(0x50541e89, 0x981fdb25),
-     TOBN(0xdc1291a1, 0xfd4c2b6b), TOBN(0xc0693a17, 0xa6df4fca),
-     TOBN(0xb2c4604e, 0x0117f203), TOBN(0x245f1963, 0x0a99b8d0),
-     TOBN(0xaedc20aa, 0xc6212c44), TOBN(0xb1ed4e56, 0x520f52a8),
-     TOBN(0xfe48f575, 0xf8547be3), TOBN(0x0a7033cd, 0xa9e45f98),
-     TOBN(0x4b45d3a9, 0x18c50100), TOBN(0xb2a6cd6a, 0xa61d41da),
-     TOBN(0x60bbb4f5, 0x57933c6b), TOBN(0xa7538ebd, 0x2b0d7ffc),
-     TOBN(0x9ea3ab8d, 0x8cd626b6), TOBN(0x8273a484, 0x3601625a),
-     TOBN(0x88859845, 0x0168e508), TOBN(0x8cbc9bb2, 0x99a94abd),
-     TOBN(0x713ac792, 0xfab0a671), TOBN(0xa3995b19, 0x6c9ebffc),
-     TOBN(0xe711668e, 0x1239e152), TOBN(0x56892558, 0xbbb8dff4),
-     TOBN(0x8bfc7dab, 0xdbf17963), TOBN(0x5b59fe5a, 0xb3de1253),
-     TOBN(0x7e3320eb, 0x34a9f7ae), TOBN(0xe5e8cf72, 0xd751efe4),
-     TOBN(0x7ea003bc, 0xd9be2f37), TOBN(0xc0f551a0, 0xb6c08ef7),
-     TOBN(0x56606268, 0x038f6725), TOBN(0x1dd38e35, 0x6d92d3b6),
-     TOBN(0x07dfce7c, 0xc3cbd686), TOBN(0x4e549e04, 0x651c5da8),
-     TOBN(0x4058f93b, 0x08b19340), TOBN(0xc2fae6f4, 0xcac6d89d),
-     TOBN(0x4bad8a8c, 0x8f159cc7), TOBN(0x0ddba4b3, 0xcb0b601c),
-     TOBN(0xda4fc7b5, 0x1dd95f8c), TOBN(0x1d163cd7, 0xcea5c255),
-     TOBN(0x30707d06, 0x274a8c4c), TOBN(0x79d9e008, 0x2802e9ce),
-     TOBN(0x02a29ebf, 0xe6ddd505), TOBN(0x37064e74, 0xb50bed1a),
-     TOBN(0x3f6bae65, 0xa7327d57), TOBN(0x3846f5f1, 0xf83920bc),
-     TOBN(0x87c37491, 0x60df1b9b), TOBN(0x4cfb2895, 0x2d1da29f),
-     TOBN(0x10a478ca, 0x4ed1743c), TOBN(0x390c6030, 0x3edd47c6),
-     TOBN(0x8f3e5312, 0x8c0a78de), TOBN(0xccd02bda, 0x1e85df70),
-     TOBN(0xd6c75c03, 0xa61b6582), TOBN(0x0762921c, 0xfc0eebd1),
-     TOBN(0xd34d0823, 0xd85010c0), TOBN(0xd73aaacb, 0x0044cf1f),
-     TOBN(0xfb4159bb, 0xa3b5e78a), TOBN(0x2287c7f7, 0xe5826f3f),
-     TOBN(0x4aeaf742, 0x580b1a01), TOBN(0xf080415d, 0x60423b79),
-     TOBN(0xe12622cd, 0xa7dea144), TOBN(0x49ea4996, 0x59d62472),
-     TOBN(0xb42991ef, 0x571f3913), TOBN(0x0610f214, 0xf5b25a8a),
-     TOBN(0x47adc585, 0x30b79e8f), TOBN(0xf90e3df6, 0x07a065a2),
-     TOBN(0x5d0a5deb, 0x43e2e034), TOBN(0x53fb5a34, 0x444024aa),
-     TOBN(0xa8628c68, 0x6b0c9f7f), TOBN(0x9c69c29c, 0xac563656),
-     TOBN(0x5a231feb, 0xbace47b6), TOBN(0xbdce0289, 0x9ea5a2ec),
-     TOBN(0x05da1fac, 0x9463853e), TOBN(0x96812c52, 0x509e78aa),
-     TOBN(0xd3fb5771, 0x57151692), TOBN(0xeb2721f8, 0xd98e1c44),
-     TOBN(0xc0506087, 0x32399be1), TOBN(0xda5a5511, 0xd979d8b8),
-     TOBN(0x737ed55d, 0xc6f56780), TOBN(0xe20d3004, 0x0dc7a7f4),
-     TOBN(0x02ce7301, 0xf5941a03), TOBN(0x91ef5215, 0xed30f83a),
-     TOBN(0x28727fc1, 0x4092d85f), TOBN(0x72d223c6, 0x5c49e41a),
-     TOBN(0xa7cf30a2, 0xba6a4d81), TOBN(0x7c086209, 0xb030d87d),
-     TOBN(0x04844c7d, 0xfc588b09), TOBN(0x728cd499, 0x5874bbb0),
-     TOBN(0xcc1281ee, 0xe84c0495), TOBN(0x0769b5ba, 0xec31958f),
-     TOBN(0x665c228b, 0xf99c2471), TOBN(0xf2d8a11b, 0x191eb110),
-     TOBN(0x4594f494, 0xd36d7024), TOBN(0x482ded8b, 0xcdcb25a1),
-     TOBN(0xc958a9d8, 0xdadd4885), TOBN(0x7004477e, 0xf1d2b547),
-     TOBN(0x0a45f6ef, 0x2a0af550), TOBN(0x4fc739d6, 0x2f8d6351),
-     TOBN(0x75cdaf27, 0x786f08a9), TOBN(0x8700bb26, 0x42c2737f),
-     TOBN(0x855a7141, 0x1c4e2670), TOBN(0x810188c1, 0x15076fef),
-     TOBN(0xc251d0c9, 0xabcd3297), TOBN(0xae4c8967, 0xf48108eb),
-     TOBN(0xbd146de7, 0x18ceed30), TOBN(0xf9d4f07a, 0xc986bced),
-     TOBN(0x5ad98ed5, 0x83fa1e08), TOBN(0x7780d33e, 0xbeabd1fb),
-     TOBN(0xe330513c, 0x903b1196), TOBN(0xba11de9e, 0xa47bc8c4),
-     TOBN(0x684334da, 0x02c2d064), TOBN(0x7ecf360d, 0xa48de23b),
-     TOBN(0x57a1b474, 0x0a9089d8), TOBN(0xf28fa439, 0xff36734c),
-     TOBN(0xf2a482cb, 0xea4570b3), TOBN(0xee65d68b, 0xa5ebcee9),
-     TOBN(0x988d0036, 0xb9694cd5), TOBN(0x53edd0e9, 0x37885d32),
-     TOBN(0xe37e3307, 0xbeb9bc6d), TOBN(0xe9abb907, 0x9f5c6768),
-     TOBN(0x4396ccd5, 0x51f2160f), TOBN(0x2500888c, 0x47336da6),
-     TOBN(0x383f9ed9, 0x926fce43), TOBN(0x809dd1c7, 0x04da2930),
-     TOBN(0x30f6f596, 0x8a4cb227), TOBN(0x0d700c7f, 0x73a56b38),
-     TOBN(0x1825ea33, 0xab64a065), TOBN(0xaab9b735, 0x1338df80),
-     TOBN(0x1516100d, 0x9b63f57f), TOBN(0x2574395a, 0x27a6a634),
-     TOBN(0xb5560fb6, 0x700a1acd), TOBN(0xe823fd73, 0xfd999681),
-     TOBN(0xda915d1f, 0x6cb4e1ba), TOBN(0x0d030118, 0x6ebe00a3),
-     TOBN(0x744fb0c9, 0x89fca8cd), TOBN(0x970d01db, 0xf9da0e0b),
-     TOBN(0x0ad8c564, 0x7931d76f), TOBN(0xb15737bf, 0xf659b96a),
-     TOBN(0xdc9933e8, 0xa8b484e7), TOBN(0xb2fdbdf9, 0x7a26dec7),
-     TOBN(0x2349e9a4, 0x9f1f0136), TOBN(0x7860368e, 0x70fddddb),
-     TOBN(0xd93d2c1c, 0xf9ad3e18), TOBN(0x6d6c5f17, 0x689f4e79),
-     TOBN(0x7a544d91, 0xb24ff1b6), TOBN(0x3e12a5eb, 0xfe16cd8c),
-     TOBN(0x543574e9, 0xa56b872f), TOBN(0xa1ad550c, 0xfcf68ea2),
-     TOBN(0x689e37d2, 0x3f560ef7), TOBN(0x8c54b9ca, 0xc9d47a8b),
-     TOBN(0x46d40a4a, 0x088ac342), TOBN(0xec450c7c, 0x1576c6d0),
-     TOBN(0xb589e31c, 0x1f9689e9), TOBN(0xdacf2602, 0xb8781718),
-     TOBN(0xa89237c6, 0xc8cb6b42), TOBN(0x1326fc93, 0xb96ef381),
-     TOBN(0x55d56c6d, 0xb5f07825), TOBN(0xacba2eea, 0x7449e22d),
-     TOBN(0x74e0887a, 0x633c3000), TOBN(0xcb6cd172, 0xd7cbcf71),
-     TOBN(0x309e81de, 0xc36cf1be), TOBN(0x07a18a6d, 0x60ae399b),
-     TOBN(0xb36c2679, 0x9edce57e), TOBN(0x52b892f4, 0xdf001d41),
-     TOBN(0xd884ae5d, 0x16a1f2c6), TOBN(0x9b329424, 0xefcc370a),
-     TOBN(0x3120daf2, 0xbd2e21df), TOBN(0x55298d2d, 0x02470a99),
-     TOBN(0x0b78af6c, 0xa05db32e), TOBN(0x5c76a331, 0x601f5636),
-     TOBN(0xaae861ff, 0xf8a4f29c), TOBN(0x70dc9240, 0xd68f8d49),
-     TOBN(0x960e649f, 0x81b1321c), TOBN(0x3d2c801b, 0x8792e4ce),
-     TOBN(0xf479f772, 0x42521876), TOBN(0x0bed93bc, 0x416c79b1),
-     TOBN(0xa67fbc05, 0x263e5bc9), TOBN(0x01e8e630, 0x521db049),
-     TOBN(0x76f26738, 0xc6f3431e), TOBN(0xe609cb02, 0xe3267541),
-     TOBN(0xb10cff2d, 0x818c877c), TOBN(0x1f0e75ce, 0x786a13cb),
-     TOBN(0xf4fdca64, 0x1158544d), TOBN(0x5d777e89, 0x6cb71ed0),
-     TOBN(0x3c233737, 0xa9aa4755), TOBN(0x7b453192, 0xe527ab40),
-     TOBN(0xdb59f688, 0x39f05ffe), TOBN(0x8f4f4be0, 0x6d82574e),
-     TOBN(0xcce3450c, 0xee292d1b), TOBN(0xaa448a12, 0x61ccd086),
-     TOBN(0xabce91b3, 0xf7914967), TOBN(0x4537f09b, 0x1908a5ed),
-     TOBN(0xa812421e, 0xf51042e7), TOBN(0xfaf5cebc, 0xec0b3a34),
-     TOBN(0x730ffd87, 0x4ca6b39a), TOBN(0x70fb72ed, 0x02efd342),
-     TOBN(0xeb4735f9, 0xd75c8edb), TOBN(0xc11f2157, 0xc278aa51),
-     TOBN(0xc459f635, 0xbf3bfebf), TOBN(0x3a1ff0b4, 0x6bd9601f),
-     TOBN(0xc9d12823, 0xc420cb73), TOBN(0x3e9af3e2, 0x3c2915a3),
-     TOBN(0xe0c82c72, 0xb41c3440), TOBN(0x175239e5, 0xe3039a5f),
-     TOBN(0xe1084b8a, 0x558795a3), TOBN(0x328d0a1d, 0xd01e5c60),
-     TOBN(0x0a495f2e, 0xd3788a04), TOBN(0x25d8ff16, 0x66c11a9f),
-     TOBN(0xf5155f05, 0x9ed692d6), TOBN(0x954fa107, 0x4f425fe4),
-     TOBN(0xd16aabf2, 0xe98aaa99), TOBN(0x90cd8ba0, 0x96b0f88a),
-     TOBN(0x957f4782, 0xc154026a), TOBN(0x54ee0734, 0x52af56d2),
-     TOBN(0xbcf89e54, 0x45b4147a), TOBN(0x3d102f21, 0x9a52816c),
-     TOBN(0x6808517e, 0x39b62e77), TOBN(0x92e25421, 0x69169ad8),
-     TOBN(0xd721d871, 0xbb608558), TOBN(0x60e4ebae, 0xf6d4ff9b),
-     TOBN(0x0ba10819, 0x41f2763e), TOBN(0xca2e45be, 0x51ee3247),
-     TOBN(0x66d172ec, 0x2bfd7a5f), TOBN(0x528a8f2f, 0x74d0b12d),
-     TOBN(0xe17f1e38, 0xdabe70dc), TOBN(0x1d5d7316, 0x9f93983c),
-     TOBN(0x51b2184a, 0xdf423e31), TOBN(0xcb417291, 0xaedb1a10),
-     TOBN(0x2054ca93, 0x625bcab9), TOBN(0x54396860, 0xa98998f0),
-     TOBN(0x4e53f6c4, 0xa54ae57e), TOBN(0x0ffeb590, 0xee648e9d),
-     TOBN(0xfbbdaadc, 0x6afaf6bc), TOBN(0xf88ae796, 0xaa3bfb8a),
-     TOBN(0x209f1d44, 0xd2359ed9), TOBN(0xac68dd03, 0xf3544ce2),
-     TOBN(0xf378da47, 0xfd51e569), TOBN(0xe1abd860, 0x2cc80097),
-     TOBN(0x23ca18d9, 0x343b6e3a), TOBN(0x480797e8, 0xb40a1bae),
-     TOBN(0xd1f0c717, 0x533f3e67), TOBN(0x44896970, 0x06e6cdfc),
-     TOBN(0x8ca21055, 0x52a82e8d), TOBN(0xb2caf785, 0x78460cdc),
-     TOBN(0x4c1b7b62, 0xe9037178), TOBN(0xefc09d2c, 0xdb514b58),
-     TOBN(0x5f2df9ee, 0x9113be5c), TOBN(0x2fbda78f, 0xb3f9271c),
-     TOBN(0xe09a81af, 0x8f83fc54), TOBN(0x06b13866, 0x8afb5141),
-     TOBN(0x38f6480f, 0x43e3865d), TOBN(0x72dd77a8, 0x1ddf47d9),
-     TOBN(0xf2a8e971, 0x4c205ff7), TOBN(0x46d449d8, 0x9d088ad8),
-     TOBN(0x926619ea, 0x185d706f), TOBN(0xe47e02eb, 0xc7dd7f62),
-     TOBN(0xe7f120a7, 0x8cbc2031), TOBN(0xc18bef00, 0x998d4ac9),
-     TOBN(0x18f37a9c, 0x6bdf22da), TOBN(0xefbc432f, 0x90dc82df),
-     TOBN(0xc52cef8e, 0x5d703651), TOBN(0x82887ba0, 0xd99881a5),
-     TOBN(0x7cec9dda, 0xb920ec1d), TOBN(0xd0d7e8c3, 0xec3e8d3b),
-     TOBN(0x445bc395, 0x4ca88747), TOBN(0xedeaa2e0, 0x9fd53535),
-     TOBN(0x461b1d93, 0x6cc87475), TOBN(0xd92a52e2, 0x6d2383bd),
-     TOBN(0xfabccb59, 0xd7903546), TOBN(0x6111a761, 0x3d14b112),
-     TOBN(0x0ae584fe, 0xb3d5f612), TOBN(0x5ea69b8d, 0x60e828ec),
-     TOBN(0x6c078985, 0x54087030), TOBN(0x649cab04, 0xac4821fe),
-     TOBN(0x25ecedcf, 0x8bdce214), TOBN(0xb5622f72, 0x86af7361),
-     TOBN(0x0e1227aa, 0x7038b9e2), TOBN(0xd0efb273, 0xac20fa77),
-     TOBN(0x817ff88b, 0x79df975b), TOBN(0x856bf286, 0x1999503e),
-     TOBN(0xb4d5351f, 0x5038ec46), TOBN(0x740a52c5, 0xfc42af6e),
-     TOBN(0x2e38bb15, 0x2cbb1a3f), TOBN(0xc3eb99fe, 0x17a83429),
-     TOBN(0xca4fcbf1, 0xdd66bb74), TOBN(0x880784d6, 0xcde5e8fc),
-     TOBN(0xddc84c1c, 0xb4e7a0be), TOBN(0x8780510d, 0xbd15a72f),
-     TOBN(0x44bcf1af, 0x81ec30e1), TOBN(0x141e50a8, 0x0a61073e),
-     TOBN(0x0d955718, 0x47be87ae), TOBN(0x68a61417, 0xf76a4372),
-     TOBN(0xf57e7e87, 0xc607c3d3), TOBN(0x043afaf8, 0x5252f332),
-     TOBN(0xcc14e121, 0x1552a4d2), TOBN(0xb6dee692, 0xbb4d4ab4),
-     TOBN(0xb6ab74c8, 0xa03816a4), TOBN(0x84001ae4, 0x6f394a29),
-     TOBN(0x5bed8344, 0xd795fb45), TOBN(0x57326e7d, 0xb79f55a5),
-     TOBN(0xc9533ce0, 0x4accdffc), TOBN(0x53473caf, 0x3993fa04),
-     TOBN(0x7906eb93, 0xa13df4c8), TOBN(0xa73e51f6, 0x97cbe46f),
-     TOBN(0xd1ab3ae1, 0x0ae4ccf8), TOBN(0x25614508, 0x8a5b3dbc),
-     TOBN(0x61eff962, 0x11a71b27), TOBN(0xdf71412b, 0x6bb7fa39),
-     TOBN(0xb31ba6b8, 0x2bd7f3ef), TOBN(0xb0b9c415, 0x69180d29),
-     TOBN(0xeec14552, 0x014cdde5), TOBN(0x702c624b, 0x227b4bbb),
-     TOBN(0x2b15e8c2, 0xd3e988f3), TOBN(0xee3bcc6d, 0xa4f7fd04),
-     TOBN(0x9d00822a, 0x42ac6c85), TOBN(0x2db0cea6, 0x1df9f2b7),
-     TOBN(0xd7cad2ab, 0x42de1e58), TOBN(0x346ed526, 0x2d6fbb61),
-     TOBN(0xb3962995, 0x1a2faf09), TOBN(0x2fa8a580, 0x7c25612e),
-     TOBN(0x30ae04da, 0x7cf56490), TOBN(0x75662908, 0x0eea3961),
-     TOBN(0x3609f5c5, 0x3d080847), TOBN(0xcb081d39, 0x5241d4f6),
-     TOBN(0xb4fb3810, 0x77961a63), TOBN(0xc20c5984, 0x2abb66fc),
-     TOBN(0x3d40aa7c, 0xf902f245), TOBN(0x9cb12736, 0x4e536b1e),
-     TOBN(0x5eda24da, 0x99b3134f), TOBN(0xafbd9c69, 0x5cd011af),
-     TOBN(0x9a16e30a, 0xc7088c7d), TOBN(0x5ab65710, 0x3207389f),
-     TOBN(0x1b09547f, 0xe7407a53), TOBN(0x2322f9d7, 0x4fdc6eab),
-     TOBN(0xc0f2f22d, 0x7430de4d), TOBN(0x19382696, 0xe68ca9a9),
-     TOBN(0x17f1eff1, 0x918e5868), TOBN(0xe3b5b635, 0x586f4204),
-     TOBN(0x146ef980, 0x3fbc4341), TOBN(0x359f2c80, 0x5b5eed4e),
-     TOBN(0x9f35744e, 0x7482e41d), TOBN(0x9a9ac3ec, 0xf3b224c2),
-     TOBN(0x9161a6fe, 0x91fc50ae), TOBN(0x89ccc66b, 0xc613fa7c),
-     TOBN(0x89268b14, 0xc732f15a), TOBN(0x7cd6f4e2, 0xb467ed03),
-     TOBN(0xfbf79869, 0xce56b40e), TOBN(0xf93e094c, 0xc02dde98),
-     TOBN(0xefe0c3a8, 0xedee2cd7), TOBN(0x90f3ffc0, 0xb268fd42),
-     TOBN(0x81a7fd56, 0x08241aed), TOBN(0x95ab7ad8, 0x00b1afe8),
-     TOBN(0x40127056, 0x3e310d52), TOBN(0xd3ffdeb1, 0x09d9fc43),
-     TOBN(0xc8f85c91, 0xd11a8594), TOBN(0x2e74d258, 0x31cf6db8),
-     TOBN(0x829c7ca3, 0x02b5dfd0), TOBN(0xe389cfbe, 0x69143c86),
-     TOBN(0xd01b6405, 0x941768d8), TOBN(0x45103995, 0x03bf825d),
-     TOBN(0xcc4ee166, 0x56cd17e2), TOBN(0xbea3c283, 0xba037e79),
-     TOBN(0x4e1ac06e, 0xd9a47520), TOBN(0xfbfe18aa, 0xaf852404),
-     TOBN(0x5615f8e2, 0x8087648a), TOBN(0x7301e47e, 0xb9d150d9),
-     TOBN(0x79f9f9dd, 0xb299b977), TOBN(0x76697a7b, 0xa5b78314),
-     TOBN(0x10d67468, 0x7d7c90e7), TOBN(0x7afffe03, 0x937210b5),
-     TOBN(0x5aef3e4b, 0x28c22cee), TOBN(0xefb0ecd8, 0x09fd55ae),
-     TOBN(0x4cea7132, 0x0d2a5d6a), TOBN(0x9cfb5fa1, 0x01db6357),
-     TOBN(0x395e0b57, 0xf36e1ac5), TOBN(0x008fa9ad, 0x36cafb7d),
-     TOBN(0x8f6cdf70, 0x5308c4db), TOBN(0x51527a37, 0x95ed2477),
-     TOBN(0xba0dee30, 0x5bd21311), TOBN(0x6ed41b22, 0x909c90d7),
-     TOBN(0xc5f6b758, 0x7c8696d3), TOBN(0x0db8eaa8, 0x3ce83a80),
-     TOBN(0xd297fe37, 0xb24b4b6f), TOBN(0xfe58afe8, 0x522d1f0d),
-     TOBN(0x97358736, 0x8c98dbd9), TOBN(0x6bc226ca, 0x9454a527),
-     TOBN(0xa12b384e, 0xce53c2d0), TOBN(0x779d897d, 0x5e4606da),
-     TOBN(0xa53e47b0, 0x73ec12b0), TOBN(0x462dbbba, 0x5756f1ad),
-     TOBN(0x69fe09f2, 0xcafe37b6), TOBN(0x273d1ebf, 0xecce2e17),
-     TOBN(0x8ac1d538, 0x3cf607fd), TOBN(0x8035f7ff, 0x12e10c25),}
-    ,
-    {TOBN(0x854d34c7, 0x7e6c5520), TOBN(0xc27df9ef, 0xdcb9ea58),
-     TOBN(0x405f2369, 0xd686666d), TOBN(0x29d1febf, 0x0417aa85),
-     TOBN(0x9846819e, 0x93470afe), TOBN(0x3e6a9669, 0xe2a27f9e),
-     TOBN(0x24d008a2, 0xe31e6504), TOBN(0xdba7cecf, 0x9cb7680a),
-     TOBN(0xecaff541, 0x338d6e43), TOBN(0x56f7dd73, 0x4541d5cc),
-     TOBN(0xb5d426de, 0x96bc88ca), TOBN(0x48d94f6b, 0x9ed3a2c3),
-     TOBN(0x6354a3bb, 0x2ef8279c), TOBN(0xd575465b, 0x0b1867f2),
-     TOBN(0xef99b0ff, 0x95225151), TOBN(0xf3e19d88, 0xf94500d8),
-     TOBN(0x92a83268, 0xe32dd620), TOBN(0x913ec99f, 0x627849a2),
-     TOBN(0xedd8fdfa, 0x2c378882), TOBN(0xaf96f33e, 0xee6f8cfe),
-     TOBN(0xc06737e5, 0xdc3fa8a5), TOBN(0x236bb531, 0xb0b03a1d),
-     TOBN(0x33e59f29, 0x89f037b0), TOBN(0x13f9b5a7, 0xd9a12a53),
-     TOBN(0x0d0df6ce, 0x51efb310), TOBN(0xcb5b2eb4, 0x958df5be),
-     TOBN(0xd6459e29, 0x36158e59), TOBN(0x82aae2b9, 0x1466e336),
-     TOBN(0xfb658a39, 0x411aa636), TOBN(0x7152ecc5, 0xd4c0a933),
-     TOBN(0xf10c758a, 0x49f026b7), TOBN(0xf4837f97, 0xcb09311f),
-     TOBN(0xddfb02c4, 0xc753c45f), TOBN(0x18ca81b6, 0xf9c840fe),
-     TOBN(0x846fd09a, 0xb0f8a3e6), TOBN(0xb1162add, 0xe7733dbc),
-     TOBN(0x7070ad20, 0x236e3ab6), TOBN(0xf88cdaf5, 0xb2a56326),
-     TOBN(0x05fc8719, 0x997cbc7a), TOBN(0x442cd452, 0x4b665272),
-     TOBN(0x7807f364, 0xb71698f5), TOBN(0x6ba418d2, 0x9f7b605e),
-     TOBN(0xfd20b00f, 0xa03b2cbb), TOBN(0x883eca37, 0xda54386f),
-     TOBN(0xff0be43f, 0xf3437f24), TOBN(0xe910b432, 0xa48bb33c),
-     TOBN(0x4963a128, 0x329df765), TOBN(0xac1dd556, 0xbe2fe6f7),
-     TOBN(0x557610f9, 0x24a0a3fc), TOBN(0x38e17bf4, 0xe881c3f9),
-     TOBN(0x6ba84faf, 0xed0dac99), TOBN(0xd4a222c3, 0x59eeb918),
-     TOBN(0xc79c1dbe, 0x13f542b6), TOBN(0x1fc65e0d, 0xe425d457),
-     TOBN(0xeffb754f, 0x1debb779), TOBN(0x638d8fd0, 0x9e08af60),
-     TOBN(0x994f523a, 0x626332d5), TOBN(0x7bc38833, 0x5561bb44),
-     TOBN(0x005ed4b0, 0x3d845ea2), TOBN(0xd39d3ee1, 0xc2a1f08a),
-     TOBN(0x6561fdd3, 0xe7676b0d), TOBN(0x620e35ff, 0xfb706017),
-     TOBN(0x36ce424f, 0xf264f9a8), TOBN(0xc4c3419f, 0xda2681f7),
-     TOBN(0xfb6afd2f, 0x69beb6e8), TOBN(0x3a50b993, 0x6d700d03),
-     TOBN(0xc840b2ad, 0x0c83a14f), TOBN(0x573207be, 0x54085bef),
-     TOBN(0x5af882e3, 0x09fe7e5b), TOBN(0x957678a4, 0x3b40a7e1),
-     TOBN(0x172d4bdd, 0x543056e2), TOBN(0x9c1b26b4, 0x0df13c0a),
-     TOBN(0x1c30861c, 0xf405ff06), TOBN(0xebac86bd, 0x486e828b),
-     TOBN(0xe791a971, 0x636933fc), TOBN(0x50e7c2be, 0x7aeee947),
-     TOBN(0xc3d4a095, 0xfa90d767), TOBN(0xae60eb7b, 0xe670ab7b),
-     TOBN(0x17633a64, 0x397b056d), TOBN(0x93a21f33, 0x105012aa),
-     TOBN(0x663c370b, 0xabb88643), TOBN(0x91df36d7, 0x22e21599),
-     TOBN(0x183ba835, 0x8b761671), TOBN(0x381eea1d, 0x728f3bf1),
-     TOBN(0xb9b2f1ba, 0x39966e6c), TOBN(0x7c464a28, 0xe7295492),
-     TOBN(0x0fd5f70a, 0x09b26b7f), TOBN(0xa9aba1f9, 0xfbe009df),
-     TOBN(0x857c1f22, 0x369b87ad), TOBN(0x3c00e5d9, 0x32fca556),
-     TOBN(0x1ad74cab, 0x90b06466), TOBN(0xa7112386, 0x550faaf2),
-     TOBN(0x7435e198, 0x6d9bd5f5), TOBN(0x2dcc7e38, 0x59c3463f),
-     TOBN(0xdc7df748, 0xca7bd4b2), TOBN(0x13cd4c08, 0x9dec2f31),
-     TOBN(0x0d3b5df8, 0xe3237710), TOBN(0x0dadb26e, 0xcbd2f7b0),
-     TOBN(0x9f5966ab, 0xe4aa082b), TOBN(0x666ec8de, 0x350e966e),
-     TOBN(0x1bfd1ed5, 0xee524216), TOBN(0xcd93c59b, 0x41dab0b6),
-     TOBN(0x658a8435, 0xd186d6ba), TOBN(0x1b7d34d2, 0x159d1195),
-     TOBN(0x5936e460, 0x22caf46b), TOBN(0x6a45dd8f, 0x9a96fe4f),
-     TOBN(0xf7925434, 0xb98f474e), TOBN(0x41410412, 0x0053ef15),
-     TOBN(0x71cf8d12, 0x41de97bf), TOBN(0xb8547b61, 0xbd80bef4),
-     TOBN(0xb47d3970, 0xc4db0037), TOBN(0xf1bcd328, 0xfef20dff),
-     TOBN(0x31a92e09, 0x10caad67), TOBN(0x1f591960, 0x5531a1e1),
-     TOBN(0x3bb852e0, 0x5f4fc840), TOBN(0x63e297ca, 0x93a72c6c),
-     TOBN(0x3c2b0b2e, 0x49abad67), TOBN(0x6ec405fc, 0xed3db0d9),
-     TOBN(0xdc14a530, 0x7fef1d40), TOBN(0xccd19846, 0x280896fc),
-     TOBN(0x00f83176, 0x9bb81648), TOBN(0xd69eb485, 0x653120d0),
-     TOBN(0xd17d75f4, 0x4ccabc62), TOBN(0x34a07f82, 0xb749fcb1),
-     TOBN(0x2c3af787, 0xbbfb5554), TOBN(0xb06ed4d0, 0x62e283f8),
-     TOBN(0x5722889f, 0xa19213a0), TOBN(0x162b085e, 0xdcf3c7b4),
-     TOBN(0xbcaecb31, 0xe0dd3eca), TOBN(0xc6237fbc, 0xe52f13a5),
-     TOBN(0xcc2b6b03, 0x27bac297), TOBN(0x2ae1cac5, 0xb917f54a),
-     TOBN(0x474807d4, 0x7845ae4f), TOBN(0xfec7dd92, 0xce5972e0),
-     TOBN(0xc3bd2541, 0x1d7915bb), TOBN(0x66f85dc4, 0xd94907ca),
-     TOBN(0xd981b888, 0xbdbcf0ca), TOBN(0xd75f5da6, 0xdf279e9f),
-     TOBN(0x128bbf24, 0x7054e934), TOBN(0x3c6ff6e5, 0x81db134b),
-     TOBN(0x795b7cf4, 0x047d26e4), TOBN(0xf370f7b8, 0x5049ec37),
-     TOBN(0xc6712d4d, 0xced945af), TOBN(0xdf30b5ec, 0x095642bc),
-     TOBN(0x9b034c62, 0x4896246e), TOBN(0x5652c016, 0xee90bbd1),
-     TOBN(0xeb38636f, 0x87fedb73), TOBN(0x5e32f847, 0x0135a613),
-     TOBN(0x0703b312, 0xcf933c83), TOBN(0xd05bb76e, 0x1a7f47e6),
-     TOBN(0x825e4f0c, 0x949c2415), TOBN(0x569e5622, 0x7250d6f8),
-     TOBN(0xbbe9eb3a, 0x6568013e), TOBN(0x8dbd203f, 0x22f243fc),
-     TOBN(0x9dbd7694, 0xb342734a), TOBN(0x8f6d12f8, 0x46afa984),
-     TOBN(0xb98610a2, 0xc9eade29), TOBN(0xbab4f323, 0x47dd0f18),
-     TOBN(0x5779737b, 0x671c0d46), TOBN(0x10b6a7c6, 0xd3e0a42a),
-     TOBN(0xfb19ddf3, 0x3035b41c), TOBN(0xd336343f, 0x99c45895),
-     TOBN(0x61fe4938, 0x54c857e5), TOBN(0xc4d506be, 0xae4e57d5),
-     TOBN(0x3cd8c8cb, 0xbbc33f75), TOBN(0x7281f08a, 0x9262c77d),
-     TOBN(0x083f4ea6, 0xf11a2823), TOBN(0x8895041e, 0x9fba2e33),
-     TOBN(0xfcdfea49, 0x9c438edf), TOBN(0x7678dcc3, 0x91edba44),
-     TOBN(0xf07b3b87, 0xe2ba50f0), TOBN(0xc13888ef, 0x43948c1b),
-     TOBN(0xc2135ad4, 0x1140af42), TOBN(0x8e5104f3, 0x926ed1a7),
-     TOBN(0xf24430cb, 0x88f6695f), TOBN(0x0ce0637b, 0x6d73c120),
-     TOBN(0xb2db01e6, 0xfe631e8f), TOBN(0x1c5563d7, 0xd7bdd24b),
-     TOBN(0x8daea3ba, 0x369ad44f), TOBN(0x000c81b6, 0x8187a9f9),
-     TOBN(0x5f48a951, 0xaae1fd9a), TOBN(0xe35626c7, 0x8d5aed8a),
-     TOBN(0x20952763, 0x0498c622), TOBN(0x76d17634, 0x773aa504),
-     TOBN(0x36d90dda, 0xeb300f7a), TOBN(0x9dcf7dfc, 0xedb5e801),
-     TOBN(0x645cb268, 0x74d5244c), TOBN(0xa127ee79, 0x348e3aa2),
-     TOBN(0x488acc53, 0x575f1dbb), TOBN(0x95037e85, 0x80e6161e),
-     TOBN(0x57e59283, 0x292650d0), TOBN(0xabe67d99, 0x14938216),
-     TOBN(0x3c7f944b, 0x3f8e1065), TOBN(0xed908cb6, 0x330e8924),
-     TOBN(0x08ee8fd5, 0x6f530136), TOBN(0x2227b7d5, 0xd7ffc169),
-     TOBN(0x4f55c893, 0xb5cd6dd5), TOBN(0x82225e11, 0xa62796e8),
-     TOBN(0x5c6cead1, 0xcb18e12c), TOBN(0x4381ae0c, 0x84f5a51a),
-     TOBN(0x345913d3, 0x7fafa4c8), TOBN(0x3d918082, 0x0491aac0),
-     TOBN(0x9347871f, 0x3e69264c), TOBN(0xbea9dd3c, 0xb4f4f0cd),
-     TOBN(0xbda5d067, 0x3eadd3e7), TOBN(0x0033c1b8, 0x0573bcd8),
-     TOBN(0x25589379, 0x5da2486c), TOBN(0xcb89ee5b, 0x86abbee7),
-     TOBN(0x8fe0a8f3, 0x22532e5d), TOBN(0xb6410ff0, 0x727dfc4c),
-     TOBN(0x619b9d58, 0x226726db), TOBN(0x5ec25669, 0x7a2b2dc7),
-     TOBN(0xaf4d2e06, 0x4c3beb01), TOBN(0x852123d0, 0x7acea556),
-     TOBN(0x0e9470fa, 0xf783487a), TOBN(0x75a7ea04, 0x5664b3eb),
-     TOBN(0x4ad78f35, 0x6798e4ba), TOBN(0x9214e6e5, 0xc7d0e091),
-     TOBN(0xc420b488, 0xb1290403), TOBN(0x64049e0a, 0xfc295749),
-     TOBN(0x03ef5af1, 0x3ae9841f), TOBN(0xdbe4ca19, 0xb0b662a6),
-     TOBN(0x46845c5f, 0xfa453458), TOBN(0xf8dabf19, 0x10b66722),
-     TOBN(0xb650f0aa, 0xcce2793b), TOBN(0x71db851e, 0xc5ec47c1),
-     TOBN(0x3eb78f3e, 0x3b234fa9), TOBN(0xb0c60f35, 0xfc0106ce),
-     TOBN(0x05427121, 0x774eadbd), TOBN(0x25367faf, 0xce323863),
-     TOBN(0x7541b5c9, 0xcd086976), TOBN(0x4ff069e2, 0xdc507ad1),
-     TOBN(0x74145256, 0x8776e667), TOBN(0x6e76142c, 0xb23c6bb5),
-     TOBN(0xdbf30712, 0x1b3a8a87), TOBN(0x60e7363e, 0x98450836),
-     TOBN(0x5741450e, 0xb7366d80), TOBN(0xe4ee14ca, 0x4837dbdf),
-     TOBN(0xa765eb9b, 0x69d4316f), TOBN(0x04548dca, 0x8ef43825),
-     TOBN(0x9c9f4e4c, 0x5ae888eb), TOBN(0x733abb51, 0x56e9ac99),
-     TOBN(0xdaad3c20, 0xba6ac029), TOBN(0x9b8dd3d3, 0x2ba3e38e),
-     TOBN(0xa9bb4c92, 0x0bc5d11a), TOBN(0xf20127a7, 0x9c5f88a3),
-     TOBN(0x4f52b06e, 0x161d3cb8), TOBN(0x26c1ff09, 0x6afaf0a6),
-     TOBN(0x32670d2f, 0x7189e71f), TOBN(0xc6438748, 0x5ecf91e7),
-     TOBN(0x15758e57, 0xdb757a21), TOBN(0x427d09f8, 0x290a9ce5),
-     TOBN(0x846a308f, 0x38384a7a), TOBN(0xaac3acb4, 0xb0732b99),
-     TOBN(0x9e941009, 0x17845819), TOBN(0x95cba111, 0xa7ce5e03),
-     TOBN(0x6f3d4f7f, 0xb00009c4), TOBN(0xb8396c27, 0x8ff28b5f),
-     TOBN(0xb1a9ae43, 0x1c97975d), TOBN(0x9d7ba8af, 0xe5d9fed5),
-     TOBN(0x338cf09f, 0x34f485b6), TOBN(0xbc0ddacc, 0x64122516),
-     TOBN(0xa450da12, 0x05d471fe), TOBN(0x4c3a6250, 0x628dd8c9),
-     TOBN(0x69c7d103, 0xd1295837), TOBN(0xa2893e50, 0x3807eb2f),
-     TOBN(0xd6e1e1de, 0xbdb41491), TOBN(0xc630745b, 0x5e138235),
-     TOBN(0xc892109e, 0x48661ae1), TOBN(0x8d17e7eb, 0xea2b2674),
-     TOBN(0x00ec0f87, 0xc328d6b5), TOBN(0x6d858645, 0xf079ff9e),
-     TOBN(0x6cdf243e, 0x19115ead), TOBN(0x1ce1393e, 0x4bac4fcf),
-     TOBN(0x2c960ed0, 0x9c29f25b), TOBN(0x59be4d8e, 0x9d388a05),
-     TOBN(0x0d46e06c, 0xd0def72b), TOBN(0xb923db5d, 0xe0342748),
-     TOBN(0xf7d3aacd, 0x936d4a3d), TOBN(0x558519cc, 0x0b0b099e),
-     TOBN(0x3ea8ebf8, 0x827097ef), TOBN(0x259353db, 0xd054f55d),
-     TOBN(0x84c89abc, 0x6d2ed089), TOBN(0x5c548b69, 0x8e096a7c),
-     TOBN(0xd587f616, 0x994b995d), TOBN(0x4d1531f6, 0xa5845601),
-     TOBN(0x792ab31e, 0x451fd9f0), TOBN(0xc8b57bb2, 0x65adf6ca),
-     TOBN(0x68440fcb, 0x1cd5ad73), TOBN(0xb9c860e6, 0x6144da4f),
-     TOBN(0x2ab286aa, 0x8462beb8), TOBN(0xcc6b8fff, 0xef46797f),
-     TOBN(0xac820da4, 0x20c8a471), TOBN(0x69ae05a1, 0x77ff7faf),
-     TOBN(0xb9163f39, 0xbfb5da77), TOBN(0xbd03e590, 0x2c73ab7a),
-     TOBN(0x7e862b5e, 0xb2940d9e), TOBN(0x3c663d86, 0x4b9af564),
-     TOBN(0xd8309031, 0xbde3033d), TOBN(0x298231b2, 0xd42c5bc6),
-     TOBN(0x42090d2c, 0x552ad093), TOBN(0xa4799d1c, 0xff854695),
-     TOBN(0x0a88b5d6, 0xd31f0d00), TOBN(0xf8b40825, 0xa2f26b46),
-     TOBN(0xec29b1ed, 0xf1bd7218), TOBN(0xd491c53b, 0x4b24c86e),
-     TOBN(0xd2fe588f, 0x3395ea65), TOBN(0x6f3764f7, 0x4456ef15),
-     TOBN(0xdb43116d, 0xcdc34800), TOBN(0xcdbcd456, 0xc1e33955),
-     TOBN(0xefdb5540, 0x74ab286b), TOBN(0x948c7a51, 0xd18c5d7c),
-     TOBN(0xeb81aa37, 0x7378058e), TOBN(0x41c746a1, 0x04411154),
-     TOBN(0xa10c73bc, 0xfb828ac7), TOBN(0x6439be91, 0x9d972b29),
-     TOBN(0x4bf3b4b0, 0x43a2fbad), TOBN(0x39e6dadf, 0x82b5e840),
-     TOBN(0x4f716408, 0x6397bd4c), TOBN(0x0f7de568, 0x7f1eeccb),
-     TOBN(0x5865c5a1, 0xd2ffbfc1), TOBN(0xf74211fa, 0x4ccb6451),
-     TOBN(0x66368a88, 0xc0b32558), TOBN(0x5b539dc2, 0x9ad7812e),
-     TOBN(0x579483d0, 0x2f3af6f6), TOBN(0x52132078, 0x99934ece),
-     TOBN(0x50b9650f, 0xdcc9e983), TOBN(0xca989ec9, 0xaee42b8a),
-     TOBN(0x6a44c829, 0xd6f62f99), TOBN(0x8f06a309, 0x4c2a7c0c),
-     TOBN(0x4ea2b3a0, 0x98a0cb0a), TOBN(0x5c547b70, 0xbeee8364),
-     TOBN(0x461d40e1, 0x682afe11), TOBN(0x9e0fc77a, 0x7b41c0a8),
-     TOBN(0x79e4aefd, 0xe20d5d36), TOBN(0x2916e520, 0x32dd9f63),
-     TOBN(0xf59e52e8, 0x3f883faf), TOBN(0x396f9639, 0x2b868d35),
-     TOBN(0xc902a9df, 0x4ca19881), TOBN(0x0fc96822, 0xdb2401a6),
-     TOBN(0x41237587, 0x66f1c68d), TOBN(0x10fc6de3, 0xfb476c0d),
-     TOBN(0xf8b6b579, 0x841f5d90), TOBN(0x2ba8446c, 0xfa24f44a),
-     TOBN(0xa237b920, 0xef4a9975), TOBN(0x60bb6004, 0x2330435f),
-     TOBN(0xd6f4ab5a, 0xcfb7e7b5), TOBN(0xb2ac5097, 0x83435391),
-     TOBN(0xf036ee2f, 0xb0d1ea67), TOBN(0xae779a6a, 0x74c56230),
-     TOBN(0x59bff8c8, 0xab838ae6), TOBN(0xcd83ca99, 0x9b38e6f0),
-     TOBN(0xbb27bef5, 0xe33deed3), TOBN(0xe6356f6f, 0x001892a8),
-     TOBN(0xbf3be6cc, 0x7adfbd3e), TOBN(0xaecbc81c, 0x33d1ac9d),
-     TOBN(0xe4feb909, 0xe6e861dc), TOBN(0x90a247a4, 0x53f5f801),
-     TOBN(0x01c50acb, 0x27346e57), TOBN(0xce29242e, 0x461acc1b),
-     TOBN(0x04dd214a, 0x2f998a91), TOBN(0x271ee9b1, 0xd4baf27b),
-     TOBN(0x7e3027d1, 0xe8c26722), TOBN(0x21d1645c, 0x1820dce5),
-     TOBN(0x086f242c, 0x7501779c), TOBN(0xf0061407, 0xfa0e8009),
-     TOBN(0xf23ce477, 0x60187129), TOBN(0x05bbdedb, 0x0fde9bd0),
-     TOBN(0x682f4832, 0x25d98473), TOBN(0xf207fe85, 0x5c658427),
-     TOBN(0xb6fdd7ba, 0x4166ffa1), TOBN(0x0c314056, 0x9eed799d),
-     TOBN(0x0db8048f, 0x4107e28f), TOBN(0x74ed3871, 0x41216840),
-     TOBN(0x74489f8f, 0x56a3c06e), TOBN(0x1e1c005b, 0x12777134),
-     TOBN(0xdb332a73, 0xf37ec3c3), TOBN(0xc65259bd, 0xdd59eba0),
-     TOBN(0x2291709c, 0xdb4d3257), TOBN(0x9a793b25, 0xbd389390),
-     TOBN(0xf39fe34b, 0xe43756f0), TOBN(0x2f76bdce, 0x9afb56c9),
-     TOBN(0x9f37867a, 0x61208b27), TOBN(0xea1d4307, 0x089972c3),
-     TOBN(0x8c595330, 0x8bdf623a), TOBN(0x5f5accda, 0x8441fb7d),
-     TOBN(0xfafa9418, 0x32ddfd95), TOBN(0x6ad40c5a, 0x0fde9be7),
-     TOBN(0x43faba89, 0xaeca8709), TOBN(0xc64a7cf1, 0x2c248a9d),
-     TOBN(0x16620252, 0x72637a76), TOBN(0xaee1c791, 0x22b8d1bb),
-     TOBN(0xf0f798fd, 0x21a843b2), TOBN(0x56e4ed4d, 0x8d005cb1),
-     TOBN(0x355f7780, 0x1f0d8abe), TOBN(0x197b04cf, 0x34522326),
-     TOBN(0x41f9b31f, 0xfd42c13f), TOBN(0x5ef7feb2, 0xb40f933d),
-     TOBN(0x27326f42, 0x5d60bad4), TOBN(0x027ecdb2, 0x8c92cf89),
-     TOBN(0x04aae4d1, 0x4e3352fe), TOBN(0x08414d2f, 0x73591b90),
-     TOBN(0x5ed6124e, 0xb7da7d60), TOBN(0xb985b931, 0x4d13d4ec),
-     TOBN(0xa592d3ab, 0x96bf36f9), TOBN(0x012dbed5, 0xbbdf51df),
-     TOBN(0xa57963c0, 0xdf6c177d), TOBN(0x010ec869, 0x87ca29cf),
-     TOBN(0xba1700f6, 0xbf926dff), TOBN(0x7c9fdbd1, 0xf4bf6bc2),
-     TOBN(0xdc18dc8f, 0x64da11f5), TOBN(0xa6074b7a, 0xd938ae75),
-     TOBN(0x14270066, 0xe84f44a4), TOBN(0x99998d38, 0xd27b954e),
-     TOBN(0xc1be8ab2, 0xb4f38e9a), TOBN(0x8bb55bbf, 0x15c01016),
-     TOBN(0xf73472b4, 0x0ea2ab30), TOBN(0xd365a340, 0xf73d68dd),
-     TOBN(0xc01a7168, 0x19c2e1eb), TOBN(0x32f49e37, 0x34061719),
-     TOBN(0xb73c57f1, 0x01d8b4d6), TOBN(0x03c8423c, 0x26b47700),
-     TOBN(0x321d0bc8, 0xa4d8826a), TOBN(0x6004213c, 0x4bc0e638),
-     TOBN(0xf78c64a1, 0xc1c06681), TOBN(0x16e0a16f, 0xef018e50),
-     TOBN(0x31cbdf91, 0xdb42b2b3), TOBN(0xf8f4ffce, 0xe0d36f58),
-     TOBN(0xcdcc71cd, 0x4cc5e3e0), TOBN(0xd55c7cfa, 0xa129e3e0),
-     TOBN(0xccdb6ba0, 0x0fb2cbf1), TOBN(0x6aba0005, 0xc4bce3cb),
-     TOBN(0x501cdb30, 0xd232cfc4), TOBN(0x9ddcf12e, 0xd58a3cef),
-     TOBN(0x02d2cf9c, 0x87e09149), TOBN(0xdc5d7ec7, 0x2c976257),
-     TOBN(0x6447986e, 0x0b50d7dd), TOBN(0x88fdbaf7, 0x807f112a),
-     TOBN(0x58c9822a, 0xb00ae9f6), TOBN(0x6abfb950, 0x6d3d27e0),
-     TOBN(0xd0a74487, 0x8a429f4f), TOBN(0x0649712b, 0xdb516609),
-     TOBN(0xb826ba57, 0xe769b5df), TOBN(0x82335df2, 0x1fc7aaf2),
-     TOBN(0x2389f067, 0x5c93d995), TOBN(0x59ac367a, 0x68677be6),
-     TOBN(0xa77985ff, 0x21d9951b), TOBN(0x038956fb, 0x85011cce),
-     TOBN(0x608e48cb, 0xbb734e37), TOBN(0xc08c0bf2, 0x2be5b26f),
-     TOBN(0x17bbdd3b, 0xf9b1a0d9), TOBN(0xeac7d898, 0x10483319),
-     TOBN(0xc95c4baf, 0xbc1a6dea), TOBN(0xfdd0e2bf, 0x172aafdb),
-     TOBN(0x40373cbc, 0x8235c41a), TOBN(0x14303f21, 0xfb6f41d5),
-     TOBN(0xba063621, 0x0408f237), TOBN(0xcad3b09a, 0xecd2d1ed),
-     TOBN(0x4667855a, 0x52abb6a2), TOBN(0xba9157dc, 0xaa8b417b),
-     TOBN(0xfe7f3507, 0x4f013efb), TOBN(0x1b112c4b, 0xaa38c4a2),
-     TOBN(0xa1406a60, 0x9ba64345), TOBN(0xe53cba33, 0x6993c80b),
-     TOBN(0x45466063, 0xded40d23), TOBN(0x3d5f1f4d, 0x54908e25),
-     TOBN(0x9ebefe62, 0x403c3c31), TOBN(0x274ea0b5, 0x0672a624),
-     TOBN(0xff818d99, 0x451d1b71), TOBN(0x80e82643, 0x8f79cf79),
-     TOBN(0xa165df13, 0x73ce37f5), TOBN(0xa744ef4f, 0xfe3a21fd),
-     TOBN(0x73f1e7f5, 0xcf551396), TOBN(0xc616898e, 0x868c676b),
-     TOBN(0x671c28c7, 0x8c442c36), TOBN(0xcfe5e558, 0x5e0a317d),
-     TOBN(0x1242d818, 0x7051f476), TOBN(0x56fad2a6, 0x14f03442),
-     TOBN(0x262068bc, 0x0a44d0f6), TOBN(0xdfa2cd6e, 0xce6edf4e),
-     TOBN(0x0f43813a, 0xd15d1517), TOBN(0x61214cb2, 0x377d44f5),
-     TOBN(0xd399aa29, 0xc639b35f), TOBN(0x42136d71, 0x54c51c19),
-     TOBN(0x9774711b, 0x08417221), TOBN(0x0a5546b3, 0x52545a57),
-     TOBN(0x80624c41, 0x1150582d), TOBN(0x9ec5c418, 0xfbc555bc),
-     TOBN(0x2c87dcad, 0x771849f1), TOBN(0xb0c932c5, 0x01d7bf6f),
-     TOBN(0x6aa5cd3e, 0x89116eb2), TOBN(0xd378c25a, 0x51ca7bd3),
-     TOBN(0xc612a0da, 0x9e6e3e31), TOBN(0x0417a54d, 0xb68ad5d0),
-     TOBN(0x00451e4a, 0x22c6edb8), TOBN(0x9fbfe019, 0xb42827ce),
-     TOBN(0x2fa92505, 0xba9384a2), TOBN(0x21b8596e, 0x64ad69c1),
-     TOBN(0x8f4fcc49, 0x983b35a6), TOBN(0xde093760, 0x72754672),
-     TOBN(0x2f14ccc8, 0xf7bffe6d), TOBN(0x27566bff, 0x5d94263d),
-     TOBN(0xb5b4e9c6, 0x2df3ec30), TOBN(0x94f1d7d5, 0x3e6ea6ba),
-     TOBN(0x97b7851a, 0xaaca5e9b), TOBN(0x518aa521, 0x56713b97),
-     TOBN(0x3357e8c7, 0x150a61f6), TOBN(0x7842e7e2, 0xec2c2b69),
-     TOBN(0x8dffaf65, 0x6868a548), TOBN(0xd963bd82, 0xe068fc81),
-     TOBN(0x64da5c8b, 0x65917733), TOBN(0x927090ff, 0x7b247328),}
-    ,
-    {TOBN(0x214bc9a7, 0xd298c241), TOBN(0xe3b697ba, 0x56807cfd),
-     TOBN(0xef1c7802, 0x4564eadb), TOBN(0xdde8cdcf, 0xb48149c5),
-     TOBN(0x946bf0a7, 0x5a4d2604), TOBN(0x27154d7f, 0x6c1538af),
-     TOBN(0x95cc9230, 0xde5b1fcc), TOBN(0xd88519e9, 0x66864f82),
-     TOBN(0xb828dd1a, 0x7cb1282c), TOBN(0xa08d7626, 0xbe46973a),
-     TOBN(0x6baf8d40, 0xe708d6b2), TOBN(0x72571fa1, 0x4daeb3f3),
-     TOBN(0x85b1732f, 0xf22dfd98), TOBN(0x87ab01a7, 0x0087108d),
-     TOBN(0xaaaafea8, 0x5988207a), TOBN(0xccc832f8, 0x69f00755),
-     TOBN(0x964d950e, 0x36ff3bf0), TOBN(0x8ad20f6f, 0xf0b34638),
-     TOBN(0x4d9177b3, 0xb5d7585f), TOBN(0xcf839760, 0xef3f019f),
-     TOBN(0x582fc5b3, 0x8288c545), TOBN(0x2f8e4e9b, 0x13116bd1),
-     TOBN(0xf91e1b2f, 0x332120ef), TOBN(0xcf568724, 0x2a17dd23),
-     TOBN(0x488f1185, 0xca8d9d1a), TOBN(0xadf2c77d, 0xd987ded2),
-     TOBN(0x5f3039f0, 0x60c46124), TOBN(0xe5d70b75, 0x71e095f4),
-     TOBN(0x82d58650, 0x6260e70f), TOBN(0x39d75ea7, 0xf750d105),
-     TOBN(0x8cf3d0b1, 0x75bac364), TOBN(0xf3a7564d, 0x21d01329),
-     TOBN(0x182f04cd, 0x2f52d2a7), TOBN(0x4fde149a, 0xe2df565a),
-     TOBN(0xb80c5eec, 0xa79fb2f7), TOBN(0xab491d7b, 0x22ddc897),
-     TOBN(0x99d76c18, 0xc6312c7f), TOBN(0xca0d5f3d, 0x6aa41a57),
-     TOBN(0x71207325, 0xd15363a0), TOBN(0xe82aa265, 0xbeb252c2),
-     TOBN(0x94ab4700, 0xec3128c2), TOBN(0x6c76d862, 0x8e383f49),
-     TOBN(0xdc36b150, 0xc03024eb), TOBN(0xfb439477, 0x53daac69),
-     TOBN(0xfc68764a, 0x8dc79623), TOBN(0x5b86995d, 0xb440fbb2),
-     TOBN(0xd66879bf, 0xccc5ee0d), TOBN(0x05228942, 0x95aa8bd3),
-     TOBN(0xb51a40a5, 0x1e6a75c1), TOBN(0x24327c76, 0x0ea7d817),
-     TOBN(0x06630182, 0x07774597), TOBN(0xd6fdbec3, 0x97fa7164),
-     TOBN(0x20c99dfb, 0x13c90f48), TOBN(0xd6ac5273, 0x686ef263),
-     TOBN(0xc6a50bdc, 0xfef64eeb), TOBN(0xcd87b281, 0x86fdfc32),
-     TOBN(0xb24aa43e, 0x3fcd3efc), TOBN(0xdd26c034, 0xb8088e9a),
-     TOBN(0xa5ef4dc9, 0xbd3d46ea), TOBN(0xa2f99d58, 0x8a4c6a6f),
-     TOBN(0xddabd355, 0x2f1da46c), TOBN(0x72c3f8ce, 0x1afacdd1),
-     TOBN(0xd90c4eee, 0x92d40578), TOBN(0xd28bb41f, 0xca623b94),
-     TOBN(0x50fc0711, 0x745edc11), TOBN(0x9dd9ad7d, 0x3dc87558),
-     TOBN(0xce6931fb, 0xb49d1e64), TOBN(0x6c77a0a2, 0xc98bd0f9),
-     TOBN(0x62b9a629, 0x6baf7cb1), TOBN(0xcf065f91, 0xccf72d22),
-     TOBN(0x7203cce9, 0x79639071), TOBN(0x09ae4885, 0xf9cb732f),
-     TOBN(0x5e7c3bec, 0xee8314f3), TOBN(0x1c068aed, 0xdbea298f),
-     TOBN(0x08d381f1, 0x7c80acec), TOBN(0x03b56be8, 0xe330495b),
-     TOBN(0xaeffb8f2, 0x9222882d), TOBN(0x95ff38f6, 0xc4af8bf7),
-     TOBN(0x50e32d35, 0x1fc57d8c), TOBN(0x6635be52, 0x17b444f0),
-     TOBN(0x04d15276, 0xa5177900), TOBN(0x4e1dbb47, 0xf6858752),
-     TOBN(0x5b475622, 0xc615796c), TOBN(0xa6fa0387, 0x691867bf),
-     TOBN(0xed7f5d56, 0x2844c6d0), TOBN(0xc633cf9b, 0x03a2477d),
-     TOBN(0xf6be5c40, 0x2d3721d6), TOBN(0xaf312eb7, 0xe9fd68e6),
-     TOBN(0x242792d2, 0xe7417ce1), TOBN(0xff42bc71, 0x970ee7f5),
-     TOBN(0x1ff4dc6d, 0x5c67a41e), TOBN(0x77709b7b, 0x20882a58),
-     TOBN(0x3554731d, 0xbe217f2c), TOBN(0x2af2a8cd, 0x5bb72177),
-     TOBN(0x58eee769, 0x591dd059), TOBN(0xbb2930c9, 0x4bba6477),
-     TOBN(0x863ee047, 0x7d930cfc), TOBN(0x4c262ad1, 0x396fd1f4),
-     TOBN(0xf4765bc8, 0x039af7e1), TOBN(0x2519834b, 0x5ba104f6),
-     TOBN(0x7cd61b4c, 0xd105f961), TOBN(0xa5415da5, 0xd63bca54),
-     TOBN(0x778280a0, 0x88a1f17c), TOBN(0xc4968949, 0x2329512c),
-     TOBN(0x174a9126, 0xcecdaa7a), TOBN(0xfc8c7e0e, 0x0b13247b),
-     TOBN(0x29c110d2, 0x3484c1c4), TOBN(0xf8eb8757, 0x831dfc3b),
-     TOBN(0x022f0212, 0xc0067452), TOBN(0x3f6f69ee, 0x7b9b926c),
-     TOBN(0x09032da0, 0xef42daf4), TOBN(0x79f00ade, 0x83f80de4),
-     TOBN(0x6210db71, 0x81236c97), TOBN(0x74f7685b, 0x3ee0781f),
-     TOBN(0x4df7da7b, 0xa3e41372), TOBN(0x2aae38b1, 0xb1a1553e),
-     TOBN(0x1688e222, 0xf6dd9d1b), TOBN(0x57695448, 0x5b8b6487),
-     TOBN(0x478d2127, 0x4b2edeaa), TOBN(0xb2818fa5, 0x1e85956a),
-     TOBN(0x1e6addda, 0xf176f2c0), TOBN(0x01ca4604, 0xe2572658),
-     TOBN(0x0a404ded, 0x85342ffb), TOBN(0x8cf60f96, 0x441838d6),
-     TOBN(0x9bbc691c, 0xc9071c4a), TOBN(0xfd588744, 0x34442803),
-     TOBN(0x97101c85, 0x809c0d81), TOBN(0xa7fb754c, 0x8c456f7f),
-     TOBN(0xc95f3c5c, 0xd51805e1), TOBN(0xab4ccd39, 0xb299dca8),
-     TOBN(0x3e03d20b, 0x47eaf500), TOBN(0xfa3165c1, 0xd7b80893),
-     TOBN(0x005e8b54, 0xe160e552), TOBN(0xdc4972ba, 0x9019d11f),
-     TOBN(0x21a6972e, 0x0c9a4a7a), TOBN(0xa52c258f, 0x37840fd7),
-     TOBN(0xf8559ff4, 0xc1e99d81), TOBN(0x08e1a7d6, 0xa3c617c0),
-     TOBN(0xb398fd43, 0x248c6ba7), TOBN(0x6ffedd91, 0xd1283794),
-     TOBN(0x8a6a59d2, 0xd629d208), TOBN(0xa9d141d5, 0x3490530e),
-     TOBN(0x42f6fc18, 0x38505989), TOBN(0x09bf250d, 0x479d94ee),
-     TOBN(0x223ad3b1, 0xb3822790), TOBN(0x6c5926c0, 0x93b8971c),
-     TOBN(0x609efc7e, 0x75f7fa62), TOBN(0x45d66a6d, 0x1ec2d989),
-     TOBN(0x4422d663, 0x987d2792), TOBN(0x4a73caad, 0x3eb31d2b),
-     TOBN(0xf06c2ac1, 0xa32cb9e6), TOBN(0xd9445c5f, 0x91aeba84),
-     TOBN(0x6af7a1d5, 0xaf71013f), TOBN(0xe68216e5, 0x0bedc946),
-     TOBN(0xf4cba30b, 0xd27370a0), TOBN(0x7981afbf, 0x870421cc),
-     TOBN(0x02496a67, 0x9449f0e1), TOBN(0x86cfc4be, 0x0a47edae),
-     TOBN(0x3073c936, 0xb1feca22), TOBN(0xf5694612, 0x03f8f8fb),
-     TOBN(0xd063b723, 0x901515ea), TOBN(0x4c6c77a5, 0x749cf038),
-     TOBN(0x6361e360, 0xab9e5059), TOBN(0x596cf171, 0xa76a37c0),
-     TOBN(0x800f53fa, 0x6530ae7a), TOBN(0x0f5e631e, 0x0792a7a6),
-     TOBN(0x5cc29c24, 0xefdb81c9), TOBN(0xa269e868, 0x3f9c40ba),
-     TOBN(0xec14f9e1, 0x2cb7191e), TOBN(0x78ea1bd8, 0xe5b08ea6),
-     TOBN(0x3c65aa9b, 0x46332bb9), TOBN(0x84cc22b3, 0xbf80ce25),
-     TOBN(0x0098e9e9, 0xd49d5bf1), TOBN(0xcd4ec1c6, 0x19087da4),
-     TOBN(0x3c9d07c5, 0xaef6e357), TOBN(0x839a0268, 0x9f8f64b8),
-     TOBN(0xc5e9eb62, 0xc6d8607f), TOBN(0x759689f5, 0x6aa995e4),
-     TOBN(0x70464669, 0xbbb48317), TOBN(0x921474bf, 0xe402417d),
-     TOBN(0xcabe135b, 0x2a354c8c), TOBN(0xd51e52d2, 0x812fa4b5),
-     TOBN(0xec741096, 0x53311fe8), TOBN(0x4f774535, 0xb864514b),
-     TOBN(0xbcadd671, 0x5bde48f8), TOBN(0xc9703873, 0x2189bc7d),
-     TOBN(0x5d45299e, 0xc709ee8a), TOBN(0xd1287ee2, 0x845aaff8),
-     TOBN(0x7d1f8874, 0xdb1dbf1f), TOBN(0xea46588b, 0x990c88d6),
-     TOBN(0x60ba649a, 0x84368313), TOBN(0xd5fdcbce, 0x60d543ae),
-     TOBN(0x90b46d43, 0x810d5ab0), TOBN(0x6739d8f9, 0x04d7e5cc),
-     TOBN(0x021c1a58, 0x0d337c33), TOBN(0x00a61162, 0x68e67c40),
-     TOBN(0x95ef413b, 0x379f0a1f), TOBN(0xfe126605, 0xe9e2ab95),
-     TOBN(0x67578b85, 0x2f5f199c), TOBN(0xf5c00329, 0x2cb84913),
-     TOBN(0xf7956430, 0x37577dd8), TOBN(0x83b82af4, 0x29c5fe88),
-     TOBN(0x9c1bea26, 0xcdbdc132), TOBN(0x589fa086, 0x9c04339e),
-     TOBN(0x033e9538, 0xb13799df), TOBN(0x85fa8b21, 0xd295d034),
-     TOBN(0xdf17f73f, 0xbd9ddcca), TOBN(0xf32bd122, 0xddb66334),
-     TOBN(0x55ef88a7, 0x858b044c), TOBN(0x1f0d69c2, 0x5aa9e397),
-     TOBN(0x55fd9cc3, 0x40d85559), TOBN(0xc774df72, 0x7785ddb2),
-     TOBN(0x5dcce9f6, 0xd3bd2e1c), TOBN(0xeb30da20, 0xa85dfed0),
-     TOBN(0x5ed7f5bb, 0xd3ed09c4), TOBN(0x7d42a35c, 0x82a9c1bd),
-     TOBN(0xcf3de995, 0x9890272d), TOBN(0x75f3432a, 0x3e713a10),
-     TOBN(0x5e13479f, 0xe28227b8), TOBN(0xb8561ea9, 0xfefacdc8),
-     TOBN(0xa6a297a0, 0x8332aafd), TOBN(0x9b0d8bb5, 0x73809b62),
-     TOBN(0xd2fa1cfd, 0x0c63036f), TOBN(0x7a16eb55, 0xbd64bda8),
-     TOBN(0x3f5cf5f6, 0x78e62ddc), TOBN(0x2267c454, 0x07fd752b),
-     TOBN(0x5e361b6b, 0x5e437bbe), TOBN(0x95c59501, 0x8354e075),
-     TOBN(0xec725f85, 0xf2b254d9), TOBN(0x844b617d, 0x2cb52b4e),
-     TOBN(0xed8554f5, 0xcf425fb5), TOBN(0xab67703e, 0x2af9f312),
-     TOBN(0x4cc34ec1, 0x3cf48283), TOBN(0xb09daa25, 0x9c8a705e),
-     TOBN(0xd1e9d0d0, 0x5b7d4f84), TOBN(0x4df6ef64, 0xdb38929d),
-     TOBN(0xe16b0763, 0xaa21ba46), TOBN(0xc6b1d178, 0xa293f8fb),
-     TOBN(0x0ff5b602, 0xd520aabf), TOBN(0x94d671bd, 0xc339397a),
-     TOBN(0x7c7d98cf, 0x4f5792fa), TOBN(0x7c5e0d67, 0x11215261),
-     TOBN(0x9b19a631, 0xa7c5a6d4), TOBN(0xc8511a62, 0x7a45274d),
-     TOBN(0x0c16621c, 0xa5a60d99), TOBN(0xf7fbab88, 0xcf5e48cb),
-     TOBN(0xab1e6ca2, 0xf7ddee08), TOBN(0x83bd08ce, 0xe7867f3c),
-     TOBN(0xf7e48e8a, 0x2ac13e27), TOBN(0x4494f6df, 0x4eb1a9f5),
-     TOBN(0xedbf84eb, 0x981f0a62), TOBN(0x49badc32, 0x536438f0),
-     TOBN(0x50bea541, 0x004f7571), TOBN(0xbac67d10, 0xdf1c94ee),
-     TOBN(0x253d73a1, 0xb727bc31), TOBN(0xb3d01cf2, 0x30686e28),
-     TOBN(0x51b77b1b, 0x55fd0b8b), TOBN(0xa099d183, 0xfeec3173),
-     TOBN(0x202b1fb7, 0x670e72b7), TOBN(0xadc88b33, 0xa8e1635f),
-     TOBN(0x34e8216a, 0xf989d905), TOBN(0xc2e68d20, 0x29b58d01),
-     TOBN(0x11f81c92, 0x6fe55a93), TOBN(0x15f1462a, 0x8f296f40),
-     TOBN(0x1915d375, 0xea3d62f2), TOBN(0xa17765a3, 0x01c8977d),
-     TOBN(0x7559710a, 0xe47b26f6), TOBN(0xe0bd29c8, 0x535077a5),
-     TOBN(0x615f976d, 0x08d84858), TOBN(0x370dfe85, 0x69ced5c1),
-     TOBN(0xbbc7503c, 0xa734fa56), TOBN(0xfbb9f1ec, 0x91ac4574),
-     TOBN(0x95d7ec53, 0x060dd7ef), TOBN(0xeef2dacd, 0x6e657979),
-     TOBN(0x54511af3, 0xe2a08235), TOBN(0x1e324aa4, 0x1f4aea3d),
-     TOBN(0x550e7e71, 0xe6e67671), TOBN(0xbccd5190, 0xbf52faf7),
-     TOBN(0xf880d316, 0x223cc62a), TOBN(0x0d402c7e, 0x2b32eb5d),
-     TOBN(0xa40bc039, 0x306a5a3b), TOBN(0x4e0a41fd, 0x96783a1b),
-     TOBN(0xa1e8d39a, 0x0253cdd4), TOBN(0x6480be26, 0xc7388638),
-     TOBN(0xee365e1d, 0x2285f382), TOBN(0x188d8d8f, 0xec0b5c36),
-     TOBN(0x34ef1a48, 0x1f0f4d82), TOBN(0x1a8f43e1, 0xa487d29a),
-     TOBN(0x8168226d, 0x77aefb3a), TOBN(0xf69a751e, 0x1e72c253),
-     TOBN(0x8e04359a, 0xe9594df1), TOBN(0x475ffd7d, 0xd14c0467),
-     TOBN(0xb5a2c2b1, 0x3844e95c), TOBN(0x85caf647, 0xdd12ef94),
-     TOBN(0x1ecd2a9f, 0xf1063d00), TOBN(0x1dd2e229, 0x23843311),
-     TOBN(0x38f0e09d, 0x73d17244), TOBN(0x3ede7746, 0x8fc653f1),
-     TOBN(0xae4459f5, 0xdc20e21c), TOBN(0x00db2ffa, 0x6a8599ea),
-     TOBN(0x11682c39, 0x30cfd905), TOBN(0x4934d074, 0xa5c112a6),
-     TOBN(0xbdf063c5, 0x568bfe95), TOBN(0x779a440a, 0x016c441a),
-     TOBN(0x0c23f218, 0x97d6fbdc), TOBN(0xd3a5cd87, 0xe0776aac),
-     TOBN(0xcee37f72, 0xd712e8db), TOBN(0xfb28c70d, 0x26f74e8d),
-     TOBN(0xffe0c728, 0xb61301a0), TOBN(0xa6282168, 0xd3724354),
-     TOBN(0x7ff4cb00, 0x768ffedc), TOBN(0xc51b3088, 0x03b02de9),
-     TOBN(0xa5a8147c, 0x3902dda5), TOBN(0x35d2f706, 0xfe6973b4),
-     TOBN(0x5ac2efcf, 0xc257457e), TOBN(0x933f48d4, 0x8700611b),
-     TOBN(0xc365af88, 0x4912beb2), TOBN(0x7f5a4de6, 0x162edf94),
-     TOBN(0xc646ba7c, 0x0c32f34b), TOBN(0x632c6af3, 0xb2091074),
-     TOBN(0x58d4f2e3, 0x753e43a9), TOBN(0x70e1d217, 0x24d4e23f),
-     TOBN(0xb24bf729, 0xafede6a6), TOBN(0x7f4a94d8, 0x710c8b60),
-     TOBN(0xaad90a96, 0x8d4faa6a), TOBN(0xd9ed0b32, 0xb066b690),
-     TOBN(0x52fcd37b, 0x78b6dbfd), TOBN(0x0b64615e, 0x8bd2b431),
-     TOBN(0x228e2048, 0xcfb9fad5), TOBN(0xbeaa386d, 0x240b76bd),
-     TOBN(0x2d6681c8, 0x90dad7bc), TOBN(0x3e553fc3, 0x06d38f5e),
-     TOBN(0xf27cdb9b, 0x9d5f9750), TOBN(0x3e85c52a, 0xd28c5b0e),
-     TOBN(0x190795af, 0x5247c39b), TOBN(0x547831eb, 0xbddd6828),
-     TOBN(0xf327a227, 0x4a82f424), TOBN(0x36919c78, 0x7e47f89d),
-     TOBN(0xe4783919, 0x43c7392c), TOBN(0xf101b9aa, 0x2316fefe),
-     TOBN(0xbcdc9e9c, 0x1c5009d2), TOBN(0xfb55ea13, 0x9cd18345),
-     TOBN(0xf5b5e231, 0xa3ce77c7), TOBN(0xde6b4527, 0xd2f2cb3d),
-     TOBN(0x10f6a333, 0x9bb26f5f), TOBN(0x1e85db8e, 0x044d85b6),
-     TOBN(0xc3697a08, 0x94197e54), TOBN(0x65e18cc0, 0xa7cb4ea8),
-     TOBN(0xa38c4f50, 0xa471fe6e), TOBN(0xf031747a, 0x2f13439c),
-     TOBN(0x53c4a6ba, 0xc007318b), TOBN(0xa8da3ee5, 0x1deccb3d),
-     TOBN(0x0555b31c, 0x558216b1), TOBN(0x90c7810c, 0x2f79e6c2),
-     TOBN(0x9b669f4d, 0xfe8eed3c), TOBN(0x70398ec8, 0xe0fac126),
-     TOBN(0xa96a449e, 0xf701b235), TOBN(0x0ceecdb3, 0xeb94f395),
-     TOBN(0x285fc368, 0xd0cb7431), TOBN(0x0d37bb52, 0x16a18c64),
-     TOBN(0x05110d38, 0xb880d2dd), TOBN(0xa60f177b, 0x65930d57),
-     TOBN(0x7da34a67, 0xf36235f5), TOBN(0x47f5e17c, 0x183816b9),
-     TOBN(0xc7664b57, 0xdb394af4), TOBN(0x39ba215d, 0x7036f789),
-     TOBN(0x46d2ca0e, 0x2f27b472), TOBN(0xc42647ee, 0xf73a84b7),
-     TOBN(0x44bc7545, 0x64488f1d), TOBN(0xaa922708, 0xf4cf85d5),
-     TOBN(0x721a01d5, 0x53e4df63), TOBN(0x649c0c51, 0x5db46ced),
-     TOBN(0x6bf0d64e, 0x3cffcb6c), TOBN(0xe3bf93fe, 0x50f71d96),
-     TOBN(0x75044558, 0xbcc194a0), TOBN(0x16ae3372, 0x6afdc554),
-     TOBN(0xbfc01adf, 0x5ca48f3f), TOBN(0x64352f06, 0xe22a9b84),
-     TOBN(0xcee54da1, 0xc1099e4a), TOBN(0xbbda54e8, 0xfa1b89c0),
-     TOBN(0x166a3df5, 0x6f6e55fb), TOBN(0x1ca44a24, 0x20176f88),
-     TOBN(0x936afd88, 0xdfb7b5ff), TOBN(0xe34c2437, 0x8611d4a0),
-     TOBN(0x7effbb75, 0x86142103), TOBN(0x6704ba1b, 0x1f34fc4d),
-     TOBN(0x7c2a468f, 0x10c1b122), TOBN(0x36b3a610, 0x8c6aace9),
-     TOBN(0xabfcc0a7, 0x75a0d050), TOBN(0x066f9197, 0x3ce33e32),
-     TOBN(0xce905ef4, 0x29fe09be), TOBN(0x89ee25ba, 0xa8376351),
-     TOBN(0x2a3ede22, 0xfd29dc76), TOBN(0x7fd32ed9, 0x36f17260),
-     TOBN(0x0cadcf68, 0x284b4126), TOBN(0x63422f08, 0xa7951fc8),
-     TOBN(0x562b24f4, 0x0807e199), TOBN(0xfe9ce5d1, 0x22ad4490),
-     TOBN(0xc2f51b10, 0x0db2b1b4), TOBN(0xeb3613ff, 0xe4541d0d),
-     TOBN(0xbd2c4a05, 0x2680813b), TOBN(0x527aa55d, 0x561b08d6),
-     TOBN(0xa9f8a40e, 0xa7205558), TOBN(0xe3eea56f, 0x243d0bec),
-     TOBN(0x7b853817, 0xa0ff58b3), TOBN(0xb67d3f65, 0x1a69e627),
-     TOBN(0x0b76bbb9, 0xa869b5d6), TOBN(0xa3afeb82, 0x546723ed),
-     TOBN(0x5f24416d, 0x3e554892), TOBN(0x8413b53d, 0x430e2a45),
-     TOBN(0x99c56aee, 0x9032a2a0), TOBN(0x09432bf6, 0xeec367b1),
-     TOBN(0x552850c6, 0xdaf0ecc1), TOBN(0x49ebce55, 0x5bc92048),
-     TOBN(0xdfb66ba6, 0x54811307), TOBN(0x1b84f797, 0x6f298597),
-     TOBN(0x79590481, 0x8d1d7a0d), TOBN(0xd9fabe03, 0x3a6fa556),
-     TOBN(0xa40f9c59, 0xba9e5d35), TOBN(0xcb1771c1, 0xf6247577),
-     TOBN(0x542a47ca, 0xe9a6312b), TOBN(0xa34b3560, 0x552dd8c5),
-     TOBN(0xfdf94de0, 0x0d794716), TOBN(0xd46124a9, 0x9c623094),
-     TOBN(0x56b7435d, 0x68afe8b4), TOBN(0x27f20540, 0x6c0d8ea1),
-     TOBN(0x12b77e14, 0x73186898), TOBN(0xdbc3dd46, 0x7479490f),
-     TOBN(0x951a9842, 0xc03b0c05), TOBN(0x8b1b3bb3, 0x7921bc96),
-     TOBN(0xa573b346, 0x2b202e0a), TOBN(0x77e4665d, 0x47254d56),
-     TOBN(0x08b70dfc, 0xd23e3984), TOBN(0xab86e8bc, 0xebd14236),
-     TOBN(0xaa3e07f8, 0x57114ba7), TOBN(0x5ac71689, 0xab0ef4f2),
-     TOBN(0x88fca384, 0x0139d9af), TOBN(0x72733f88, 0x76644af0),
-     TOBN(0xf122f72a, 0x65d74f4a), TOBN(0x13931577, 0xa5626c7a),
-     TOBN(0xd5b5d9eb, 0x70f8d5a4), TOBN(0x375adde7, 0xd7bbb228),
-     TOBN(0x31e88b86, 0x0c1c0b32), TOBN(0xd1f568c4, 0x173edbaa),
-     TOBN(0x1592fc83, 0x5459df02), TOBN(0x2beac0fb, 0x0fcd9a7e),
-     TOBN(0xb0a6fdb8, 0x1b473b0a), TOBN(0xe3224c6f, 0x0fe8fc48),
-     TOBN(0x680bd00e, 0xe87edf5b), TOBN(0x30385f02, 0x20e77cf5),
-     TOBN(0xe9ab98c0, 0x4d42d1b2), TOBN(0x72d191d2, 0xd3816d77),
-     TOBN(0x1564daca, 0x0917d9e5), TOBN(0x394eab59, 0x1f8fed7f),
-     TOBN(0xa209aa8d, 0x7fbb3896), TOBN(0x5564f3b9, 0xbe6ac98e),
-     TOBN(0xead21d05, 0xd73654ef), TOBN(0x68d1a9c4, 0x13d78d74),
-     TOBN(0x61e01708, 0x6d4973a0), TOBN(0x83da3500, 0x46e6d32a),
-     TOBN(0x6a3dfca4, 0x68ae0118), TOBN(0xa1b9a4c9, 0xd02da069),
-     TOBN(0x0b2ff9c7, 0xebab8302), TOBN(0x98af07c3, 0x944ba436),
-     TOBN(0x85997326, 0x995f0f9f), TOBN(0x467fade0, 0x71b58bc6),
-     TOBN(0x47e4495a, 0xbd625a2b), TOBN(0xfdd2d01d, 0x33c3b8cd),
-     TOBN(0x2c38ae28, 0xc693f9fa), TOBN(0x48622329, 0x348f7999),
-     TOBN(0x97bf738e, 0x2161f583), TOBN(0x15ee2fa7, 0x565e8cc9),
-     TOBN(0xa1a5c845, 0x5777e189), TOBN(0xcc10bee0, 0x456f2829),
-     TOBN(0x8ad95c56, 0xda762bd5), TOBN(0x152e2214, 0xe9d91da8),
-     TOBN(0x975b0e72, 0x7cb23c74), TOBN(0xfd5d7670, 0xa90c66df),
-     TOBN(0xb5b5b8ad, 0x225ffc53), TOBN(0xab6dff73, 0xfaded2ae),
-     TOBN(0xebd56781, 0x6f4cbe9d), TOBN(0x0ed8b249, 0x6a574bd7),
-     TOBN(0x41c246fe, 0x81a881fa), TOBN(0x91564805, 0xc3db9c70),
-     TOBN(0xd7c12b08, 0x5b862809), TOBN(0x1facd1f1, 0x55858d7b),
-     TOBN(0x7693747c, 0xaf09e92a), TOBN(0x3b69dcba, 0x189a425f),
-     TOBN(0x0be28e9f, 0x967365ef), TOBN(0x57300eb2, 0xe801f5c9),
-     TOBN(0x93b8ac6a, 0xd583352f), TOBN(0xa2cf1f89, 0xcd05b2b7),
-     TOBN(0x7c0c9b74, 0x4dcc40cc), TOBN(0xfee38c45, 0xada523fb),
-     TOBN(0xb49a4dec, 0x1099cc4d), TOBN(0x325c377f, 0x69f069c6),
-     TOBN(0xe12458ce, 0x476cc9ff), TOBN(0x580e0b6c, 0xc6d4cb63),
-     TOBN(0xd561c8b7, 0x9072289b), TOBN(0x0377f264, 0xa619e6da),
-     TOBN(0x26685362, 0x88e591a5), TOBN(0xa453a7bd, 0x7523ca2b),
-     TOBN(0x8a9536d2, 0xc1df4533), TOBN(0xc8e50f2f, 0xbe972f79),
-     TOBN(0xd433e50f, 0x6d3549cf), TOBN(0x6f33696f, 0xfacd665e),
-     TOBN(0x695bfdac, 0xce11fcb4), TOBN(0x810ee252, 0xaf7c9860),
-     TOBN(0x65450fe1, 0x7159bb2c), TOBN(0xf7dfbebe, 0x758b357b),
-     TOBN(0x2b057e74, 0xd69fea72), TOBN(0xd485717a, 0x92731745),}
-    ,
-    {TOBN(0x896c42e8, 0xee36860c), TOBN(0xdaf04dfd, 0x4113c22d),
-     TOBN(0x1adbb7b7, 0x44104213), TOBN(0xe5fd5fa1, 0x1fd394ea),
-     TOBN(0x68235d94, 0x1a4e0551), TOBN(0x6772cfbe, 0x18d10151),
-     TOBN(0x276071e3, 0x09984523), TOBN(0xe4e879de, 0x5a56ba98),
-     TOBN(0xaaafafb0, 0x285b9491), TOBN(0x01a0be88, 0x1e4c705e),
-     TOBN(0xff1d4f5d, 0x2ad9caab), TOBN(0x6e349a4a, 0xc37a233f),
-     TOBN(0xcf1c1246, 0x4a1c6a16), TOBN(0xd99e6b66, 0x29383260),
-     TOBN(0xea3d4366, 0x5f6d5471), TOBN(0x36974d04, 0xff8cc89b),
-     TOBN(0xc26c49a1, 0xcfe89d80), TOBN(0xb42c026d, 0xda9c8371),
-     TOBN(0xca6c013a, 0xdad066d2), TOBN(0xfb8f7228, 0x56a4f3ee),
-     TOBN(0x08b579ec, 0xd850935b), TOBN(0x34c1a74c, 0xd631e1b3),
-     TOBN(0xcb5fe596, 0xac198534), TOBN(0x39ff21f6, 0xe1f24f25),
-     TOBN(0x27f29e14, 0x8f929057), TOBN(0x7a64ae06, 0xc0c853df),
-     TOBN(0x256cd183, 0x58e9c5ce), TOBN(0x9d9cce82, 0xded092a5),
-     TOBN(0xcc6e5979, 0x6e93b7c7), TOBN(0xe1e47092, 0x31bb9e27),
-     TOBN(0xb70b3083, 0xaa9e29a0), TOBN(0xbf181a75, 0x3785e644),
-     TOBN(0xf53f2c65, 0x8ead09f7), TOBN(0x1335e1d5, 0x9780d14d),
-     TOBN(0x69cc20e0, 0xcd1b66bc), TOBN(0x9b670a37, 0xbbe0bfc8),
-     TOBN(0xce53dc81, 0x28efbeed), TOBN(0x0c74e77c, 0x8326a6e5),
-     TOBN(0x3604e0d2, 0xb88e9a63), TOBN(0xbab38fca, 0x13dc2248),
-     TOBN(0x8ed6e8c8, 0x5c0a3f1e), TOBN(0xbcad2492, 0x7c87c37f),
-     TOBN(0xfdfb62bb, 0x9ee3b78d), TOBN(0xeba8e477, 0xcbceba46),
-     TOBN(0x37d38cb0, 0xeeaede4b), TOBN(0x0bc498e8, 0x7976deb6),
-     TOBN(0xb2944c04, 0x6b6147fb), TOBN(0x8b123f35, 0xf71f9609),
-     TOBN(0xa155dcc7, 0xde79dc24), TOBN(0xf1168a32, 0x558f69cd),
-     TOBN(0xbac21595, 0x0d1850df), TOBN(0x15c8295b, 0xb204c848),
-     TOBN(0xf661aa36, 0x7d8184ff), TOBN(0xc396228e, 0x30447bdb),
-     TOBN(0x11cd5143, 0xbde4a59e), TOBN(0xe3a26e3b, 0x6beab5e6),
-     TOBN(0xd3b3a13f, 0x1402b9d0), TOBN(0x573441c3, 0x2c7bc863),
-     TOBN(0x4b301ec4, 0x578c3e6e), TOBN(0xc26fc9c4, 0x0adaf57e),
-     TOBN(0x96e71bfd, 0x7493cea3), TOBN(0xd05d4b3f, 0x1af81456),
-     TOBN(0xdaca2a8a, 0x6a8c608f), TOBN(0x53ef07f6, 0x0725b276),
-     TOBN(0x07a5fbd2, 0x7824fc56), TOBN(0x34675218, 0x13289077),
-     TOBN(0x5bf69fd5, 0xe0c48349), TOBN(0xa613ddd3, 0xb6aa7875),
-     TOBN(0x7f78c19c, 0x5450d866), TOBN(0x46f4409c, 0x8f84a481),
-     TOBN(0x9f1d1928, 0x90fce239), TOBN(0x016c4168, 0xb2ce44b9),
-     TOBN(0xbae023f0, 0xc7435978), TOBN(0xb152c888, 0x20e30e19),
-     TOBN(0x9c241645, 0xe3fa6faf), TOBN(0x735d95c1, 0x84823e60),
-     TOBN(0x03197573, 0x03955317), TOBN(0x0b4b02a9, 0xf03b4995),
-     TOBN(0x076bf559, 0x70274600), TOBN(0x32c5cc53, 0xaaf57508),
-     TOBN(0xe8af6d1f, 0x60624129), TOBN(0xb7bc5d64, 0x9a5e2b5e),
-     TOBN(0x3814b048, 0x5f082d72), TOBN(0x76f267f2, 0xce19677a),
-     TOBN(0x626c630f, 0xb36eed93), TOBN(0x55230cd7, 0x3bf56803),
-     TOBN(0x78837949, 0xce2736a0), TOBN(0x0d792d60, 0xaa6c55f1),
-     TOBN(0x0318dbfd, 0xd5c7c5d2), TOBN(0xb38f8da7, 0x072b342d),
-     TOBN(0x3569bddc, 0x7b8de38a), TOBN(0xf25b5887, 0xa1c94842),
-     TOBN(0xb2d5b284, 0x2946ad60), TOBN(0x854f29ad, 0xe9d1707e),
-     TOBN(0xaa5159dc, 0x2c6a4509), TOBN(0x899f94c0, 0x57189837),
-     TOBN(0xcf6adc51, 0xf4a55b03), TOBN(0x261762de, 0x35e3b2d5),
-     TOBN(0x4cc43012, 0x04827b51), TOBN(0xcd22a113, 0xc6021442),
-     TOBN(0xce2fd61a, 0x247c9569), TOBN(0x59a50973, 0xd152beca),
-     TOBN(0x6c835a11, 0x63a716d4), TOBN(0xc26455ed, 0x187dedcf),
-     TOBN(0x27f536e0, 0x49ce89e7), TOBN(0x18908539, 0xcc890cb5),
-     TOBN(0x308909ab, 0xd83c2aa1), TOBN(0xecd3142b, 0x1ab73bd3),
-     TOBN(0x6a85bf59, 0xb3f5ab84), TOBN(0x3c320a68, 0xf2bea4c6),
-     TOBN(0xad8dc538, 0x6da4541f), TOBN(0xeaf34eb0, 0xb7c41186),
-     TOBN(0x1c780129, 0x977c97c4), TOBN(0x5ff9beeb, 0xc57eb9fa),
-     TOBN(0xa24d0524, 0xc822c478), TOBN(0xfd8eec2a, 0x461cd415),
-     TOBN(0xfbde194e, 0xf027458c), TOBN(0xb4ff5319, 0x1d1be115),
-     TOBN(0x63f874d9, 0x4866d6f4), TOBN(0x35c75015, 0xb21ad0c9),
-     TOBN(0xa6b5c9d6, 0x46ac49d2), TOBN(0x42c77c0b, 0x83137aa9),
-     TOBN(0x24d000fc, 0x68225a38), TOBN(0x0f63cfc8, 0x2fe1e907),
-     TOBN(0x22d1b01b, 0xc6441f95), TOBN(0x7d38f719, 0xec8e448f),
-     TOBN(0x9b33fa5f, 0x787fb1ba), TOBN(0x94dcfda1, 0x190158df),
-     TOBN(0xc47cb339, 0x5f6d4a09), TOBN(0x6b4f355c, 0xee52b826),
-     TOBN(0x3d100f5d, 0xf51b930a), TOBN(0xf4512fac, 0x9f668f69),
-     TOBN(0x546781d5, 0x206c4c74), TOBN(0xd021d4d4, 0xcb4d2e48),
-     TOBN(0x494a54c2, 0xca085c2d), TOBN(0xf1dbaca4, 0x520850a8),
-     TOBN(0x63c79326, 0x490a1aca), TOBN(0xcb64dd9c, 0x41526b02),
-     TOBN(0xbb772591, 0xa2979258), TOBN(0x3f582970, 0x48d97846),
-     TOBN(0xd66b70d1, 0x7c213ba7), TOBN(0xc28febb5, 0xe8a0ced4),
-     TOBN(0x6b911831, 0xc10338c1), TOBN(0x0d54e389, 0xbf0126f3),
-     TOBN(0x7048d460, 0x4af206ee), TOBN(0x786c88f6, 0x77e97cb9),
-     TOBN(0xd4375ae1, 0xac64802e), TOBN(0x469bcfe1, 0xd53ec11c),
-     TOBN(0xfc9b340d, 0x47062230), TOBN(0xe743bb57, 0xc5b4a3ac),
-     TOBN(0xfe00b4aa, 0x59ef45ac), TOBN(0x29a4ef23, 0x59edf188),
-     TOBN(0x40242efe, 0xb483689b), TOBN(0x2575d3f6, 0x513ac262),
-     TOBN(0xf30037c8, 0x0ca6db72), TOBN(0xc9fcce82, 0x98864be2),
-     TOBN(0x84a112ff, 0x0149362d), TOBN(0x95e57582, 0x1c4ae971),
-     TOBN(0x1fa4b1a8, 0x945cf86c), TOBN(0x4525a734, 0x0b024a2f),
-     TOBN(0xe76c8b62, 0x8f338360), TOBN(0x483ff593, 0x28edf32b),
-     TOBN(0x67e8e90a, 0x298b1aec), TOBN(0x9caab338, 0x736d9a21),
-     TOBN(0x5c09d2fd, 0x66892709), TOBN(0x2496b4dc, 0xb55a1d41),
-     TOBN(0x93f5fb1a, 0xe24a4394), TOBN(0x08c75049, 0x6fa8f6c1),
-     TOBN(0xcaead1c2, 0xc905d85f), TOBN(0xe9d7f790, 0x0733ae57),
-     TOBN(0x24c9a65c, 0xf07cdd94), TOBN(0x7389359c, 0xa4b55931),
-     TOBN(0xf58709b7, 0x367e45f7), TOBN(0x1f203067, 0xcb7e7adc),
-     TOBN(0x82444bff, 0xc7b72818), TOBN(0x07303b35, 0xbaac8033),
-     TOBN(0x1e1ee4e4, 0xd13b7ea1), TOBN(0xe6489b24, 0xe0e74180),
-     TOBN(0xa5f2c610, 0x7e70ef70), TOBN(0xa1655412, 0xbdd10894),
-     TOBN(0x555ebefb, 0x7af4194e), TOBN(0x533c1c3c, 0x8e89bd9c),
-     TOBN(0x735b9b57, 0x89895856), TOBN(0x15fb3cd2, 0x567f5c15),
-     TOBN(0x057fed45, 0x526f09fd), TOBN(0xe8a4f10c, 0x8128240a),
-     TOBN(0x9332efc4, 0xff2bfd8d), TOBN(0x214e77a0, 0xbd35aa31),
-     TOBN(0x32896d73, 0x14faa40e), TOBN(0x767867ec, 0x01e5f186),
-     TOBN(0xc9adf8f1, 0x17a1813e), TOBN(0xcb6cda78, 0x54741795),
-     TOBN(0xb7521b6d, 0x349d51aa), TOBN(0xf56b5a9e, 0xe3c7b8e9),
-     TOBN(0xc6f1e5c9, 0x32a096df), TOBN(0x083667c4, 0xa3635024),
-     TOBN(0x365ea135, 0x18087f2f), TOBN(0xf1b8eaac, 0xd136e45d),
-     TOBN(0xc8a0e484, 0x73aec989), TOBN(0xd75a324b, 0x142c9259),
-     TOBN(0xb7b4d001, 0x01dae185), TOBN(0x45434e0b, 0x9b7a94bc),
-     TOBN(0xf54339af, 0xfbd8cb0b), TOBN(0xdcc4569e, 0xe98ef49e),
-     TOBN(0x7789318a, 0x09a51299), TOBN(0x81b4d206, 0xb2b025d8),
-     TOBN(0xf64aa418, 0xfae85792), TOBN(0x3e50258f, 0xacd7baf7),
-     TOBN(0xdce84cdb, 0x2996864b), TOBN(0xa2e67089, 0x1f485fa4),
-     TOBN(0xb28b2bb6, 0x534c6a5a), TOBN(0x31a7ec6b, 0xc94b9d39),
-     TOBN(0x1d217766, 0xd6bc20da), TOBN(0x4acdb5ec, 0x86761190),
-     TOBN(0x68726328, 0x73701063), TOBN(0x4d24ee7c, 0x2128c29b),
-     TOBN(0xc072ebd3, 0xa19fd868), TOBN(0x612e481c, 0xdb8ddd3b),
-     TOBN(0xb4e1d754, 0x1a64d852), TOBN(0x00ef95ac, 0xc4c6c4ab),
-     TOBN(0x1536d2ed, 0xaa0a6c46), TOBN(0x61294086, 0x43774790),
-     TOBN(0x54af25e8, 0x343fda10), TOBN(0x9ff9d98d, 0xfd25d6f2),
-     TOBN(0x0746af7c, 0x468b8835), TOBN(0x977a31cb, 0x730ecea7),
-     TOBN(0xa5096b80, 0xc2cf4a81), TOBN(0xaa986833, 0x6458c37a),
-     TOBN(0x6af29bf3, 0xa6bd9d34), TOBN(0x6a62fe9b, 0x33c5d854),
-     TOBN(0x50e6c304, 0xb7133b5e), TOBN(0x04b60159, 0x7d6e6848),
-     TOBN(0x4cd296df, 0x5579bea4), TOBN(0x10e35ac8, 0x5ceedaf1),
-     TOBN(0x04c4c5fd, 0xe3bcc5b1), TOBN(0x95f9ee8a, 0x89412cf9),
-     TOBN(0x2c9459ee, 0x82b6eb0f), TOBN(0x2e845765, 0x95c2aadd),
-     TOBN(0x774a84ae, 0xd327fcfe), TOBN(0xd8c93722, 0x0368d476),
-     TOBN(0x0dbd5748, 0xf83e8a3b), TOBN(0xa579aa96, 0x8d2495f3),
-     TOBN(0x535996a0, 0xae496e9b), TOBN(0x07afbfe9, 0xb7f9bcc2),
-     TOBN(0x3ac1dc6d, 0x5b7bd293), TOBN(0x3b592cff, 0x7022323d),
-     TOBN(0xba0deb98, 0x9c0a3e76), TOBN(0x18e78e9f, 0x4b197acb),
-     TOBN(0x211cde10, 0x296c36ef), TOBN(0x7ee89672, 0x82c4da77),
-     TOBN(0xb617d270, 0xa57836da), TOBN(0xf0cd9c31, 0x9cb7560b),
-     TOBN(0x01fdcbf7, 0xe455fe90), TOBN(0x3fb53cbb, 0x7e7334f3),
-     TOBN(0x781e2ea4, 0x4e7de4ec), TOBN(0x8adab3ad, 0x0b384fd0),
-     TOBN(0x129eee2f, 0x53d64829), TOBN(0x7a471e17, 0xa261492b),
-     TOBN(0xe4f9adb9, 0xe4cb4a2c), TOBN(0x3d359f6f, 0x97ba2c2d),
-     TOBN(0x346c6786, 0x0aacd697), TOBN(0x92b444c3, 0x75c2f8a8),
-     TOBN(0xc79fa117, 0xd85df44e), TOBN(0x56782372, 0x398ddf31),
-     TOBN(0x60e690f2, 0xbbbab3b8), TOBN(0x4851f8ae, 0x8b04816b),
-     TOBN(0xc72046ab, 0x9c92e4d2), TOBN(0x518c74a1, 0x7cf3136b),
-     TOBN(0xff4eb50a, 0xf9877d4c), TOBN(0x14578d90, 0xa919cabb),
-     TOBN(0x8218f8c4, 0xac5eb2b6), TOBN(0xa3ccc547, 0x542016e4),
-     TOBN(0x025bf48e, 0x327f8349), TOBN(0xf3e97346, 0xf43cb641),
-     TOBN(0xdc2bafdf, 0x500f1085), TOBN(0x57167876, 0x2f063055),
-     TOBN(0x5bd914b9, 0x411925a6), TOBN(0x7c078d48, 0xa1123de5),
-     TOBN(0xee6bf835, 0x182b165d), TOBN(0xb11b5e5b, 0xba519727),
-     TOBN(0xe33ea76c, 0x1eea7b85), TOBN(0x2352b461, 0x92d4f85e),
-     TOBN(0xf101d334, 0xafe115bb), TOBN(0xfabc1294, 0x889175a3),
-     TOBN(0x7f6bcdc0, 0x5233f925), TOBN(0xe0a802db, 0xe77fec55),
-     TOBN(0xbdb47b75, 0x8069b659), TOBN(0x1c5e12de, 0xf98fbd74),
-     TOBN(0x869c58c6, 0x4b8457ee), TOBN(0xa5360f69, 0x4f7ea9f7),
-     TOBN(0xe576c09f, 0xf460b38f), TOBN(0x6b70d548, 0x22b7fb36),
-     TOBN(0x3fd237f1, 0x3bfae315), TOBN(0x33797852, 0xcbdff369),
-     TOBN(0x97df25f5, 0x25b516f9), TOBN(0x46f388f2, 0xba38ad2d),
-     TOBN(0x656c4658, 0x89d8ddbb), TOBN(0x8830b26e, 0x70f38ee8),
-     TOBN(0x4320fd5c, 0xde1212b0), TOBN(0xc34f30cf, 0xe4a2edb2),
-     TOBN(0xabb131a3, 0x56ab64b8), TOBN(0x7f77f0cc, 0xd99c5d26),
-     TOBN(0x66856a37, 0xbf981d94), TOBN(0x19e76d09, 0x738bd76e),
-     TOBN(0xe76c8ac3, 0x96238f39), TOBN(0xc0a482be, 0xa830b366),
-     TOBN(0xb7b8eaff, 0x0b4eb499), TOBN(0x8ecd83bc, 0x4bfb4865),
-     TOBN(0x971b2cb7, 0xa2f3776f), TOBN(0xb42176a4, 0xf4b88adf),
-     TOBN(0xb9617df5, 0xbe1fa446), TOBN(0x8b32d508, 0xcd031bd2),
-     TOBN(0x1c6bd47d, 0x53b618c0), TOBN(0xc424f46c, 0x6a227923),
-     TOBN(0x7303ffde, 0xdd92d964), TOBN(0xe9712878, 0x71b5abf2),
-     TOBN(0x8f48a632, 0xf815561d), TOBN(0x85f48ff5, 0xd3c055d1),
-     TOBN(0x222a1427, 0x7525684f), TOBN(0xd0d841a0, 0x67360cc3),
-     TOBN(0x4245a926, 0x0b9267c6), TOBN(0xc78913f1, 0xcf07f863),
-     TOBN(0xaa844c8e, 0x4d0d9e24), TOBN(0xa42ad522, 0x3d5f9017),
-     TOBN(0xbd371749, 0xa2c989d5), TOBN(0x928292df, 0xe1f5e78e),
-     TOBN(0x493b383e, 0x0a1ea6da), TOBN(0x5136fd8d, 0x13aee529),
-     TOBN(0x860c44b1, 0xf2c34a99), TOBN(0x3b00aca4, 0xbf5855ac),
-     TOBN(0xabf6aaa0, 0xfaaf37be), TOBN(0x65f43682, 0x2a53ec08),
-     TOBN(0x1d9a5801, 0xa11b12e1), TOBN(0x78a7ab2c, 0xe20ed475),
-     TOBN(0x0de1067e, 0x9a41e0d5), TOBN(0x30473f5f, 0x305023ea),
-     TOBN(0xdd3ae09d, 0x169c7d97), TOBN(0x5cd5baa4, 0xcfaef9cd),
-     TOBN(0x5cd7440b, 0x65a44803), TOBN(0xdc13966a, 0x47f364de),
-     TOBN(0x077b2be8, 0x2b8357c1), TOBN(0x0cb1b4c5, 0xe9d57c2a),
-     TOBN(0x7a4ceb32, 0x05ff363e), TOBN(0xf310fa4d, 0xca35a9ef),
-     TOBN(0xdbb7b352, 0xf97f68c6), TOBN(0x0c773b50, 0x0b02cf58),
-     TOBN(0xea2e4821, 0x3c1f96d9), TOBN(0xffb357b0, 0xeee01815),
-     TOBN(0xb9c924cd, 0xe0f28039), TOBN(0x0b36c95a, 0x46a3fbe4),
-     TOBN(0x1faaaea4, 0x5e46db6c), TOBN(0xcae575c3, 0x1928aaff),
-     TOBN(0x7f671302, 0xa70dab86), TOBN(0xfcbd12a9, 0x71c58cfc),
-     TOBN(0xcbef9acf, 0xbee0cb92), TOBN(0x573da0b9, 0xf8c1b583),
-     TOBN(0x4752fcfe, 0x0d41d550), TOBN(0xe7eec0e3, 0x2155cffe),
-     TOBN(0x0fc39fcb, 0x545ae248), TOBN(0x522cb8d1, 0x8065f44e),
-     TOBN(0x263c962a, 0x70cbb96c), TOBN(0xe034362a, 0xbcd124a9),
-     TOBN(0xf120db28, 0x3c2ae58d), TOBN(0xb9a38d49, 0xfef6d507),
-     TOBN(0xb1fd2a82, 0x1ff140fd), TOBN(0xbd162f30, 0x20aee7e0),
-     TOBN(0x4e17a5d4, 0xcb251949), TOBN(0x2aebcb83, 0x4f7e1c3d),
-     TOBN(0x608eb25f, 0x937b0527), TOBN(0xf42e1e47, 0xeb7d9997),
-     TOBN(0xeba699c4, 0xb8a53a29), TOBN(0x1f921c71, 0xe091b536),
-     TOBN(0xcce29e7b, 0x5b26bbd5), TOBN(0x7a8ef5ed, 0x3b61a680),
-     TOBN(0xe5ef8043, 0xba1f1c7e), TOBN(0x16ea8217, 0x18158dda),
-     TOBN(0x01778a2b, 0x599ff0f9), TOBN(0x68a923d7, 0x8104fc6b),
-     TOBN(0x5bfa44df, 0xda694ff3), TOBN(0x4f7199db, 0xf7667f12),
-     TOBN(0xc06d8ff6, 0xe46f2a79), TOBN(0x08b5dead, 0xe9f8131d),
-     TOBN(0x02519a59, 0xabb4ce7c), TOBN(0xc4f710bc, 0xb42aec3e),
-     TOBN(0x3d77b057, 0x78bde41a), TOBN(0x6474bf80, 0xb4186b5a),
-     TOBN(0x048b3f67, 0x88c65741), TOBN(0xc64519de, 0x03c7c154),
-     TOBN(0xdf073846, 0x0edfcc4f), TOBN(0x319aa737, 0x48f1aa6b),
-     TOBN(0x8b9f8a02, 0xca909f77), TOBN(0x90258139, 0x7580bfef),
-     TOBN(0xd8bfd3ca, 0xc0c22719), TOBN(0xc60209e4, 0xc9ca151e),
-     TOBN(0x7a744ab5, 0xd9a1a69c), TOBN(0x6de5048b, 0x14937f8f),
-     TOBN(0x171938d8, 0xe115ac04), TOBN(0x7df70940, 0x1c6b16d2),
-     TOBN(0xa6aeb663, 0x7f8e94e7), TOBN(0xc130388e, 0x2a2cf094),
-     TOBN(0x1850be84, 0x77f54e6e), TOBN(0x9f258a72, 0x65d60fe5),
-     TOBN(0xff7ff0c0, 0x6c9146d6), TOBN(0x039aaf90, 0xe63a830b),
-     TOBN(0x38f27a73, 0x9460342f), TOBN(0x4703148c, 0x3f795f8a),
-     TOBN(0x1bb5467b, 0x9681a97e), TOBN(0x00931ba5, 0xecaeb594),
-     TOBN(0xcdb6719d, 0x786f337c), TOBN(0xd9c01cd2, 0xe704397d),
-     TOBN(0x0f4a3f20, 0x555c2fef), TOBN(0x00452509, 0x7c0af223),
-     TOBN(0x54a58047, 0x84db8e76), TOBN(0x3bacf1aa, 0x93c8aa06),
-     TOBN(0x11ca957c, 0xf7919422), TOBN(0x50641053, 0x78cdaa40),
-     TOBN(0x7a303874, 0x9f7144ae), TOBN(0x170c963f, 0x43d4acfd),
-     TOBN(0x5e148149, 0x58ddd3ef), TOBN(0xa7bde582, 0x9e72dba8),
-     TOBN(0x0769da8b, 0x6fa68750), TOBN(0xfa64e532, 0x572e0249),
-     TOBN(0xfcaadf9d, 0x2619ad31), TOBN(0x87882daa, 0xa7b349cd),
-     TOBN(0x9f6eb731, 0x6c67a775), TOBN(0xcb10471a, 0xefc5d0b1),
-     TOBN(0xb433750c, 0xe1b806b2), TOBN(0x19c5714d, 0x57b1ae7e),
-     TOBN(0xc0dc8b7b, 0xed03fd3f), TOBN(0xdd03344f, 0x31bc194e),
-     TOBN(0xa66c52a7, 0x8c6320b5), TOBN(0x8bc82ce3, 0xd0b6fd93),
-     TOBN(0xf8e13501, 0xb35f1341), TOBN(0xe53156dd, 0x25a43e42),
-     TOBN(0xd3adf27e, 0x4daeb85c), TOBN(0xb81d8379, 0xbbeddeb5),
-     TOBN(0x1b0b546e, 0x2e435867), TOBN(0x9020eb94, 0xeba5dd60),
-     TOBN(0x37d91161, 0x8210cb9d), TOBN(0x4c596b31, 0x5c91f1cf),
-     TOBN(0xb228a90f, 0x0e0b040d), TOBN(0xbaf02d82, 0x45ff897f),
-     TOBN(0x2aac79e6, 0x00fa6122), TOBN(0x24828817, 0x8e36f557),
-     TOBN(0xb9521d31, 0x113ec356), TOBN(0x9e48861e, 0x15eff1f8),
-     TOBN(0x2aa1d412, 0xe0d41715), TOBN(0x71f86203, 0x53f131b8),
-     TOBN(0xf60da8da, 0x3fd19408), TOBN(0x4aa716dc, 0x278d9d99),
-     TOBN(0x394531f7, 0xa8c51c90), TOBN(0xb560b0e8, 0xf59db51c),
-     TOBN(0xa28fc992, 0xfa34bdad), TOBN(0xf024fa14, 0x9cd4f8bd),
-     TOBN(0x5cf530f7, 0x23a9d0d3), TOBN(0x615ca193, 0xe28c9b56),
-     TOBN(0x6d2a483d, 0x6f73c51e), TOBN(0xa4cb2412, 0xea0dc2dd),
-     TOBN(0x50663c41, 0x1eb917ff), TOBN(0x3d3a74cf, 0xeade299e),
-     TOBN(0x29b3990f, 0x4a7a9202), TOBN(0xa9bccf59, 0xa7b15c3d),
-     TOBN(0x66a3ccdc, 0xa5df9208), TOBN(0x48027c14, 0x43f2f929),
-     TOBN(0xd385377c, 0x40b557f0), TOBN(0xe001c366, 0xcd684660),
-     TOBN(0x1b18ed6b, 0xe2183a27), TOBN(0x879738d8, 0x63210329),
-     TOBN(0xa687c74b, 0xbda94882), TOBN(0xd1bbcc48, 0xa684b299),
-     TOBN(0xaf6f1112, 0x863b3724), TOBN(0x6943d1b4, 0x2c8ce9f8),
-     TOBN(0xe044a3bb, 0x098cafb4), TOBN(0x27ed2310, 0x60d48caf),
-     TOBN(0x542b5675, 0x3a31b84d), TOBN(0xcbf3dd50, 0xfcddbed7),
-     TOBN(0x25031f16, 0x41b1d830), TOBN(0xa7ec851d, 0xcb0c1e27),
-     TOBN(0xac1c8fe0, 0xb5ae75db), TOBN(0xb24c7557, 0x08c52120),
-     TOBN(0x57f811dc, 0x1d4636c3), TOBN(0xf8436526, 0x681a9939),
-     TOBN(0x1f6bc6d9, 0x9c81adb3), TOBN(0x840f8ac3, 0x5b7d80d4),
-     TOBN(0x731a9811, 0xf4387f1a), TOBN(0x7c501cd3, 0xb5156880),
-     TOBN(0xa5ca4a07, 0xdfe68867), TOBN(0xf123d8f0, 0x5fcea120),
-     TOBN(0x1fbb0e71, 0xd607039e), TOBN(0x2b70e215, 0xcd3a4546),
-     TOBN(0x32d2f01d, 0x53324091), TOBN(0xb796ff08, 0x180ab19b),
-     TOBN(0x32d87a86, 0x3c57c4aa), TOBN(0x2aed9caf, 0xb7c49a27),
-     TOBN(0x9fb35eac, 0x31630d98), TOBN(0x338e8cdf, 0x5c3e20a3),
-     TOBN(0x80f16182, 0x66cde8db), TOBN(0x4e159980, 0x2d72fd36),
-     TOBN(0xd7b8f13b, 0x9b6e5072), TOBN(0xf5213907, 0x3b7b5dc1),
-     TOBN(0x4d431f1d, 0x8ce4396e), TOBN(0x37a1a680, 0xa7ed2142),
-     TOBN(0xbf375696, 0xd01aaf6b), TOBN(0xaa1c0c54, 0xe63aab66),
-     TOBN(0x3014368b, 0x4ed80940), TOBN(0x67e6d056, 0x7a6fcedd),
-     TOBN(0x7c208c49, 0xca97579f), TOBN(0xfe3d7a81, 0xa23597f6),
-     TOBN(0x5e203202, 0x7e096ae2), TOBN(0xb1f3e1e7, 0x24b39366),
-     TOBN(0x26da26f3, 0x2fdcdffc), TOBN(0x79422f1d, 0x6097be83),}
-    ,
-    {TOBN(0x263a2cfb, 0x9db3b381), TOBN(0x9c3a2dee, 0xd4df0a4b),
-     TOBN(0x728d06e9, 0x7d04e61f), TOBN(0x8b1adfbc, 0x42449325),
-     TOBN(0x6ec1d939, 0x7e053a1b), TOBN(0xee2be5c7, 0x66daf707),
-     TOBN(0x80ba1e14, 0x810ac7ab), TOBN(0xdd2ae778, 0xf530f174),
-     TOBN(0x0435d97a, 0x205b9d8b), TOBN(0x6eb8f064, 0x056756d4),
-     TOBN(0xd5e88a8b, 0xb6f8210e), TOBN(0x070ef12d, 0xec9fd9ea),
-     TOBN(0x4d849505, 0x3bcc876a), TOBN(0x12a75338, 0xa7404ce3),
-     TOBN(0xd22b49e1, 0xb8a1db5e), TOBN(0xec1f2051, 0x14bfa5ad),
-     TOBN(0xadbaeb79, 0xb6828f36), TOBN(0x9d7a0258, 0x01bd5b9e),
-     TOBN(0xeda01e0d, 0x1e844b0c), TOBN(0x4b625175, 0x887edfc9),
-     TOBN(0x14109fdd, 0x9669b621), TOBN(0x88a2ca56, 0xf6f87b98),
-     TOBN(0xfe2eb788, 0x170df6bc), TOBN(0x0cea06f4, 0xffa473f9),
-     TOBN(0x43ed81b5, 0xc4e83d33), TOBN(0xd9f35879, 0x5efd488b),
-     TOBN(0x164a620f, 0x9deb4d0f), TOBN(0xc6927bdb, 0xac6a7394),
-     TOBN(0x45c28df7, 0x9f9e0f03), TOBN(0x2868661e, 0xfcd7e1a9),
-     TOBN(0x7cf4e8d0, 0xffa348f1), TOBN(0x6bd4c284, 0x398538e0),
-     TOBN(0x2618a091, 0x289a8619), TOBN(0xef796e60, 0x6671b173),
-     TOBN(0x664e46e5, 0x9090c632), TOBN(0xa38062d4, 0x1e66f8fb),
-     TOBN(0x6c744a20, 0x0573274e), TOBN(0xd07b67e4, 0xa9271394),
-     TOBN(0x391223b2, 0x6bdc0e20), TOBN(0xbe2d93f1, 0xeb0a05a7),
-     TOBN(0xf23e2e53, 0x3f36d141), TOBN(0xe84bb3d4, 0x4dfca442),
-     TOBN(0xb804a48d, 0x6b7c023a), TOBN(0x1e16a8fa, 0x76431c3b),
-     TOBN(0x1b5452ad, 0xddd472e0), TOBN(0x7d405ee7, 0x0d1ee127),
-     TOBN(0x50fc6f1d, 0xffa27599), TOBN(0x351ac53c, 0xbf391b35),
-     TOBN(0x7efa14b8, 0x4444896b), TOBN(0x64974d2f, 0xf94027fb),
-     TOBN(0xefdcd0e8, 0xde84487d), TOBN(0x8c45b260, 0x2b48989b),
-     TOBN(0xa8fcbbc2, 0xd8463487), TOBN(0xd1b2b3f7, 0x3fbc476c),
-     TOBN(0x21d005b7, 0xc8f443c0), TOBN(0x518f2e67, 0x40c0139c),
-     TOBN(0x56036e8c, 0x06d75fc1), TOBN(0x2dcf7bb7, 0x3249a89f),
-     TOBN(0x81dd1d3d, 0xe245e7dd), TOBN(0xf578dc4b, 0xebd6e2a7),
-     TOBN(0x4c028903, 0xdf2ce7a0), TOBN(0xaee36288, 0x9c39afac),
-     TOBN(0xdc847c31, 0x146404ab), TOBN(0x6304c0d8, 0xa4e97818),
-     TOBN(0xae51dca2, 0xa91f6791), TOBN(0x2abe4190, 0x9baa9efc),
-     TOBN(0xd9d2e2f4, 0x559c7ac1), TOBN(0xe82f4b51, 0xfc9f773a),
-     TOBN(0xa7713027, 0x4073e81c), TOBN(0xc0276fac, 0xfbb596fc),
-     TOBN(0x1d819fc9, 0xa684f70c), TOBN(0x29b47fdd, 0xc9f7b1e0),
-     TOBN(0x358de103, 0x459b1940), TOBN(0xec881c59, 0x5b013e93),
-     TOBN(0x51574c93, 0x49532ad3), TOBN(0x2db1d445, 0xb37b46de),
-     TOBN(0xc6445b87, 0xdf239fd8), TOBN(0xc718af75, 0x151d24ee),
-     TOBN(0xaea1c4a4, 0xf43c6259), TOBN(0x40c0e5d7, 0x70be02f7),
-     TOBN(0x6a4590f4, 0x721b33f2), TOBN(0x2124f1fb, 0xfedf04ea),
-     TOBN(0xf8e53cde, 0x9745efe7), TOBN(0xe7e10432, 0x65f046d9),
-     TOBN(0xc3fca28e, 0xe4d0c7e6), TOBN(0x847e339a, 0x87253b1b),
-     TOBN(0x9b595348, 0x3743e643), TOBN(0xcb6a0a0b, 0x4fd12fc5),
-     TOBN(0xfb6836c3, 0x27d02dcc), TOBN(0x5ad00982, 0x7a68bcc2),
-     TOBN(0x1b24b44c, 0x005e912d), TOBN(0xcc83d20f, 0x811fdcfe),
-     TOBN(0x36527ec1, 0x666fba0c), TOBN(0x69948197, 0x14754635),
-     TOBN(0xfcdcb1a8, 0x556da9c2), TOBN(0xa5934267, 0x81a732b2),
-     TOBN(0xec1214ed, 0xa714181d), TOBN(0x609ac13b, 0x6067b341),
-     TOBN(0xff4b4c97, 0xa545df1f), TOBN(0xa1240501, 0x34d2076b),
-     TOBN(0x6efa0c23, 0x1409ca97), TOBN(0x254cc1a8, 0x20638c43),
-     TOBN(0xd4e363af, 0xdcfb46cd), TOBN(0x62c2adc3, 0x03942a27),
-     TOBN(0xc67b9df0, 0x56e46483), TOBN(0xa55abb20, 0x63736356),
-     TOBN(0xab93c098, 0xc551bc52), TOBN(0x382b49f9, 0xb15fe64b),
-     TOBN(0x9ec221ad, 0x4dff8d47), TOBN(0x79caf615, 0x437df4d6),
-     TOBN(0x5f13dc64, 0xbb456509), TOBN(0xe4c589d9, 0x191f0714),
-     TOBN(0x27b6a8ab, 0x3fd40e09), TOBN(0xe455842e, 0x77313ea9),
-     TOBN(0x8b51d1e2, 0x1f55988b), TOBN(0x5716dd73, 0x062bbbfc),
-     TOBN(0x633c11e5, 0x4e8bf3de), TOBN(0x9a0e77b6, 0x1b85be3b),
-     TOBN(0x56510729, 0x0911cca6), TOBN(0x27e76495, 0xefa6590f),
-     TOBN(0xe4ac8b33, 0x070d3aab), TOBN(0x2643672b, 0x9a2cd5e5),
-     TOBN(0x52eff79b, 0x1cfc9173), TOBN(0x665ca49b, 0x90a7c13f),
-     TOBN(0x5a8dda59, 0xb3efb998), TOBN(0x8a5b922d, 0x052f1341),
-     TOBN(0xae9ebbab, 0x3cf9a530), TOBN(0x35986e7b, 0xf56da4d7),
-     TOBN(0x3a636b5c, 0xff3513cc), TOBN(0xbb0cf8ba, 0x3198f7dd),
-     TOBN(0xb8d40522, 0x41f16f86), TOBN(0x760575d8, 0xde13a7bf),
-     TOBN(0x36f74e16, 0x9f7aa181), TOBN(0x163a3ecf, 0xf509ed1c),
-     TOBN(0x6aead61f, 0x3c40a491), TOBN(0x158c95fc, 0xdfe8fcaa),
-     TOBN(0xa3991b6e, 0x13cda46f), TOBN(0x79482415, 0x342faed0),
-     TOBN(0xf3ba5bde, 0x666b5970), TOBN(0x1d52e6bc, 0xb26ab6dd),
-     TOBN(0x768ba1e7, 0x8608dd3d), TOBN(0x4930db2a, 0xea076586),
-     TOBN(0xd9575714, 0xe7dc1afa), TOBN(0x1fc7bf7d, 0xf7c58817),
-     TOBN(0x6b47accd, 0xd9eee96c), TOBN(0x0ca277fb, 0xe58cec37),
-     TOBN(0x113fe413, 0xe702c42a), TOBN(0xdd1764ee, 0xc47cbe51),
-     TOBN(0x041e7cde, 0x7b3ed739), TOBN(0x50cb7459, 0x5ce9e1c0),
-     TOBN(0x35568513, 0x2925b212), TOBN(0x7cff95c4, 0x001b081c),
-     TOBN(0x63ee4cbd, 0x8088b454), TOBN(0xdb7f32f7, 0x9a9e0c8a),
-     TOBN(0xb377d418, 0x6b2447cb), TOBN(0xe3e982aa, 0xd370219b),
-     TOBN(0x06ccc1e4, 0xc2a2a593), TOBN(0x72c36865, 0x0773f24f),
-     TOBN(0xa13b4da7, 0x95859423), TOBN(0x8bbf1d33, 0x75040c8f),
-     TOBN(0x726f0973, 0xda50c991), TOBN(0x48afcd5b, 0x822d6ee2),
-     TOBN(0xe5fc718b, 0x20fd7771), TOBN(0xb9e8e77d, 0xfd0807a1),
-     TOBN(0x7f5e0f44, 0x99a7703d), TOBN(0x6972930e, 0x618e36f3),
-     TOBN(0x2b7c77b8, 0x23807bbe), TOBN(0xe5b82405, 0xcb27ff50),
-     TOBN(0xba8b8be3, 0xbd379062), TOBN(0xd64b7a1d, 0x2dce4a92),
-     TOBN(0x040a73c5, 0xb2952e37), TOBN(0x0a9e252e, 0xd438aeca),
-     TOBN(0xdd43956b, 0xc39d3bcb), TOBN(0x1a31ca00, 0xb32b2d63),
-     TOBN(0xd67133b8, 0x5c417a18), TOBN(0xd08e4790, 0x2ef442c8),
-     TOBN(0x98cb1ae9, 0x255c0980), TOBN(0x4bd86381, 0x2b4a739f),
-     TOBN(0x5a5c31e1, 0x1e4a45a1), TOBN(0x1e5d55fe, 0x9cb0db2f),
-     TOBN(0x74661b06, 0x8ff5cc29), TOBN(0x026b389f, 0x0eb8a4f4),
-     TOBN(0x536b21a4, 0x58848c24), TOBN(0x2e5bf8ec, 0x81dc72b0),
-     TOBN(0x03c187d0, 0xad886aac), TOBN(0x5c16878a, 0xb771b645),
-     TOBN(0xb07dfc6f, 0xc74045ab), TOBN(0x2c6360bf, 0x7800caed),
-     TOBN(0x24295bb5, 0xb9c972a3), TOBN(0xc9e6f88e, 0x7c9a6dba),
-     TOBN(0x90ffbf24, 0x92a79aa6), TOBN(0xde29d50a, 0x41c26ac2),
-     TOBN(0x9f0af483, 0xd309cbe6), TOBN(0x5b020d8a, 0xe0bced4f),
-     TOBN(0x606e986d, 0xb38023e3), TOBN(0xad8f2c9d, 0x1abc6933),
-     TOBN(0x19292e1d, 0xe7400e93), TOBN(0xfe3e18a9, 0x52be5e4d),
-     TOBN(0xe8e9771d, 0x2e0680bf), TOBN(0x8c5bec98, 0xc54db063),
-     TOBN(0x2af9662a, 0x74a55d1f), TOBN(0xe3fbf28f, 0x046f66d8),
-     TOBN(0xa3a72ab4, 0xd4dc4794), TOBN(0x09779f45, 0x5c7c2dd8),
-     TOBN(0xd893bdaf, 0xc3d19d8d), TOBN(0xd5a75094, 0x57d6a6df),
-     TOBN(0x8cf8fef9, 0x952e6255), TOBN(0x3da67cfb, 0xda9a8aff),
-     TOBN(0x4c23f62a, 0x2c160dcd), TOBN(0x34e6c5e3, 0x8f90eaef),
-     TOBN(0x35865519, 0xa9a65d5a), TOBN(0x07c48aae, 0x8fd38a3d),
-     TOBN(0xb7e7aeda, 0x50068527), TOBN(0x2c09ef23, 0x1c90936a),
-     TOBN(0x31ecfeb6, 0xe879324c), TOBN(0xa0871f6b, 0xfb0ec938),
-     TOBN(0xb1f0fb68, 0xd84d835d), TOBN(0xc90caf39, 0x861dc1e6),
-     TOBN(0x12e5b046, 0x7594f8d7), TOBN(0x26897ae2, 0x65012b92),
-     TOBN(0xbcf68a08, 0xa4d6755d), TOBN(0x403ee41c, 0x0991fbda),
-     TOBN(0x733e343e, 0x3bbf17e8), TOBN(0xd2c7980d, 0x679b3d65),
-     TOBN(0x33056232, 0xd2e11305), TOBN(0x966be492, 0xf3c07a6f),
-     TOBN(0x6a8878ff, 0xbb15509d), TOBN(0xff221101, 0x0a9b59a4),
-     TOBN(0x6c9f564a, 0xabe30129), TOBN(0xc6f2c940, 0x336e64cf),
-     TOBN(0x0fe75262, 0x8b0c8022), TOBN(0xbe0267e9, 0x6ae8db87),
-     TOBN(0x22e192f1, 0x93bc042b), TOBN(0xf085b534, 0xb237c458),
-     TOBN(0xa0d192bd, 0x832c4168), TOBN(0x7a76e9e3, 0xbdf6271d),
-     TOBN(0x52a882fa, 0xb88911b5), TOBN(0xc85345e4, 0xb4db0eb5),
-     TOBN(0xa3be02a6, 0x81a7c3ff), TOBN(0x51889c8c, 0xf0ec0469),
-     TOBN(0x9d031369, 0xa5e829e5), TOBN(0xcbb4c6fc, 0x1607aa41),
-     TOBN(0x75ac59a6, 0x241d84c1), TOBN(0xc043f2bf, 0x8829e0ee),
-     TOBN(0x82a38f75, 0x8ea5e185), TOBN(0x8bda40b9, 0xd87cbd9f),
-     TOBN(0x9e65e75e, 0x2d8fc601), TOBN(0x3d515f74, 0xa35690b3),
-     TOBN(0x534acf4f, 0xda79e5ac), TOBN(0x68b83b3a, 0x8630215f),
-     TOBN(0x5c748b2e, 0xd085756e), TOBN(0xb0317258, 0xe5d37cb2),
-     TOBN(0x6735841a, 0xc5ccc2c4), TOBN(0x7d7dc96b, 0x3d9d5069),
-     TOBN(0xa147e410, 0xfd1754bd), TOBN(0x65296e94, 0xd399ddd5),
-     TOBN(0xf6b5b2d0, 0xbc8fa5bc), TOBN(0x8a5ead67, 0x500c277b),
-     TOBN(0x214625e6, 0xdfa08a5d), TOBN(0x51fdfedc, 0x959cf047),
-     TOBN(0x6bc9430b, 0x289fca32), TOBN(0xe36ff0cf, 0x9d9bdc3f),
-     TOBN(0x2fe187cb, 0x58ea0ede), TOBN(0xed66af20, 0x5a900b3f),
-     TOBN(0x00e0968b, 0x5fa9f4d6), TOBN(0x2d4066ce, 0x37a362e7),
-     TOBN(0xa99a9748, 0xbd07e772), TOBN(0x710989c0, 0x06a4f1d0),
-     TOBN(0xd5dedf35, 0xce40cbd8), TOBN(0xab55c5f0, 0x1743293d),
-     TOBN(0x766f1144, 0x8aa24e2c), TOBN(0x94d874f8, 0x605fbcb4),
-     TOBN(0xa365f0e8, 0xa518001b), TOBN(0xee605eb6, 0x9d04ef0f),
-     TOBN(0x5a3915cd, 0xba8d4d25), TOBN(0x44c0e1b8, 0xb5113472),
-     TOBN(0xcbb024e8, 0x8b6740dc), TOBN(0x89087a53, 0xee1d4f0c),
-     TOBN(0xa88fa05c, 0x1fc4e372), TOBN(0x8bf395cb, 0xaf8b3af2),
-     TOBN(0x1e71c9a1, 0xdeb8568b), TOBN(0xa35daea0, 0x80fb3d32),
-     TOBN(0xe8b6f266, 0x2cf8fb81), TOBN(0x6d51afe8, 0x9490696a),
-     TOBN(0x81beac6e, 0x51803a19), TOBN(0xe3d24b7f, 0x86219080),
-     TOBN(0x727cfd9d, 0xdf6f463c), TOBN(0x8c6865ca, 0x72284ee8),
-     TOBN(0x32c88b7d, 0xb743f4ef), TOBN(0x3793909b, 0xe7d11dce),
-     TOBN(0xd398f922, 0x2ff2ebe8), TOBN(0x2c70ca44, 0xe5e49796),
-     TOBN(0xdf4d9929, 0xcb1131b1), TOBN(0x7826f298, 0x25888e79),
-     TOBN(0x4d3a112c, 0xf1d8740a), TOBN(0x00384cb6, 0x270afa8b),
-     TOBN(0xcb64125b, 0x3ab48095), TOBN(0x3451c256, 0x62d05106),
-     TOBN(0xd73d577d, 0xa4955845), TOBN(0x39570c16, 0xbf9f4433),
-     TOBN(0xd7dfaad3, 0xadecf263), TOBN(0xf1c3d8d1, 0xdc76e102),
-     TOBN(0x5e774a58, 0x54c6a836), TOBN(0xdad4b672, 0x3e92d47b),
-     TOBN(0xbe7e990f, 0xf0d796a0), TOBN(0x5fc62478, 0xdf0e8b02),
-     TOBN(0x8aae8bf4, 0x030c00ad), TOBN(0x3d2db93b, 0x9004ba0f),
-     TOBN(0xe48c8a79, 0xd85d5ddc), TOBN(0xe907caa7, 0x6bb07f34),
-     TOBN(0x58db343a, 0xa39eaed5), TOBN(0x0ea6e007, 0xadaf5724),
-     TOBN(0xe00df169, 0xd23233f3), TOBN(0x3e322796, 0x77cb637f),
-     TOBN(0x1f897c0e, 0x1da0cf6c), TOBN(0xa651f5d8, 0x31d6bbdd),
-     TOBN(0xdd61af19, 0x1a230c76), TOBN(0xbd527272, 0xcdaa5e4a),
-     TOBN(0xca753636, 0xd0abcd7e), TOBN(0x78bdd37c, 0x370bd8dc),
-     TOBN(0xc23916c2, 0x17cd93fe), TOBN(0x65b97a4d, 0xdadce6e2),
-     TOBN(0xe04ed4eb, 0x174e42f8), TOBN(0x1491ccaa, 0xbb21480a),
-     TOBN(0x145a8280, 0x23196332), TOBN(0x3c3862d7, 0x587b479a),
-     TOBN(0x9f4a88a3, 0x01dcd0ed), TOBN(0x4da2b7ef, 0x3ea12f1f),
-     TOBN(0xf8e7ae33, 0xb126e48e), TOBN(0x404a0b32, 0xf494e237),
-     TOBN(0x9beac474, 0xc55acadb), TOBN(0x4ee5cf3b, 0xcbec9fd9),
-     TOBN(0x336b33b9, 0x7df3c8c3), TOBN(0xbd905fe3, 0xb76808fd),
-     TOBN(0x8f436981, 0xaa45c16a), TOBN(0x255c5bfa, 0x3dd27b62),
-     TOBN(0x71965cbf, 0xc3dd9b4d), TOBN(0xce23edbf, 0xfc068a87),
-     TOBN(0xb78d4725, 0x745b029b), TOBN(0x74610713, 0xcefdd9bd),
-     TOBN(0x7116f75f, 0x1266bf52), TOBN(0x02046722, 0x18e49bb6),
-     TOBN(0xdf43df9f, 0x3d6f19e3), TOBN(0xef1bc7d0, 0xe685cb2f),
-     TOBN(0xcddb27c1, 0x7078c432), TOBN(0xe1961b9c, 0xb77fedb7),
-     TOBN(0x1edc2f5c, 0xc2290570), TOBN(0x2c3fefca, 0x19cbd886),
-     TOBN(0xcf880a36, 0xc2af389a), TOBN(0x96c610fd, 0xbda71cea),
-     TOBN(0xf03977a9, 0x32aa8463), TOBN(0x8eb7763f, 0x8586d90a),
-     TOBN(0x3f342454, 0x2a296e77), TOBN(0xc8718683, 0x42837a35),
-     TOBN(0x7dc71090, 0x6a09c731), TOBN(0x54778ffb, 0x51b816db),
-     TOBN(0x6b33bfec, 0xaf06defd), TOBN(0xfe3c105f, 0x8592b70b),
-     TOBN(0xf937fda4, 0x61da6114), TOBN(0x3c13e651, 0x4c266ad7),
-     TOBN(0xe363a829, 0x855938e8), TOBN(0x2eeb5d9e, 0x9de54b72),
-     TOBN(0xbeb93b0e, 0x20ccfab9), TOBN(0x3dffbb5f, 0x25e61a25),
-     TOBN(0x7f655e43, 0x1acc093d), TOBN(0x0cb6cc3d, 0x3964ce61),
-     TOBN(0x6ab283a1, 0xe5e9b460), TOBN(0x55d787c5, 0xa1c7e72d),
-     TOBN(0x4d2efd47, 0xdeadbf02), TOBN(0x11e80219, 0xac459068),
-     TOBN(0x810c7626, 0x71f311f0), TOBN(0xfa17ef8d, 0x4ab6ef53),
-     TOBN(0xaf47fd25, 0x93e43bff), TOBN(0x5cb5ff3f, 0x0be40632),
-     TOBN(0x54687106, 0x8ee61da3), TOBN(0x7764196e, 0xb08afd0f),
-     TOBN(0x831ab3ed, 0xf0290a8f), TOBN(0xcae81966, 0xcb47c387),
-     TOBN(0xaad7dece, 0x184efb4f), TOBN(0xdcfc53b3, 0x4749110e),
-     TOBN(0x6698f23c, 0x4cb632f9), TOBN(0xc42a1ad6, 0xb91f8067),
-     TOBN(0xb116a81d, 0x6284180a), TOBN(0xebedf5f8, 0xe901326f),
-     TOBN(0xf2274c9f, 0x97e3e044), TOBN(0x42018520, 0x11d09fc9),
-     TOBN(0x56a65f17, 0xd18e6e23), TOBN(0x2ea61e2a, 0x352b683c),
-     TOBN(0x27d291bc, 0x575eaa94), TOBN(0x9e7bc721, 0xb8ff522d),
-     TOBN(0x5f7268bf, 0xa7f04d6f), TOBN(0x5868c73f, 0xaba41748),
-     TOBN(0x9f85c2db, 0x7be0eead), TOBN(0x511e7842, 0xff719135),
-     TOBN(0x5a06b1e9, 0xc5ea90d7), TOBN(0x0c19e283, 0x26fab631),
-     TOBN(0x8af8f0cf, 0xe9206c55), TOBN(0x89389cb4, 0x3553c06a),
-     TOBN(0x39dbed97, 0xf65f8004), TOBN(0x0621b037, 0xc508991d),
-     TOBN(0x1c52e635, 0x96e78cc4), TOBN(0x5385c8b2, 0x0c06b4a8),
-     TOBN(0xd84ddfdb, 0xb0e87d03), TOBN(0xc49dfb66, 0x934bafad),
-     TOBN(0x7071e170, 0x59f70772), TOBN(0x3a073a84, 0x3a1db56b),
-     TOBN(0x03494903, 0x3b8af190), TOBN(0x7d882de3, 0xd32920f0),
-     TOBN(0x91633f0a, 0xb2cf8940), TOBN(0x72b0b178, 0x6f948f51),
-     TOBN(0x2d28dc30, 0x782653c8), TOBN(0x88829849, 0xdb903a05),
-     TOBN(0xb8095d0c, 0x6a19d2bb), TOBN(0x4b9e7f0c, 0x86f782cb),
-     TOBN(0x7af73988, 0x2d907064), TOBN(0xd12be0fe, 0x8b32643c),
-     TOBN(0x358ed23d, 0x0e165dc3), TOBN(0x3d47ce62, 0x4e2378ce),
-     TOBN(0x7e2bb0b9, 0xfeb8a087), TOBN(0x3246e8ae, 0xe29e10b9),
-     TOBN(0x459f4ec7, 0x03ce2b4d), TOBN(0xe9b4ca1b, 0xbbc077cf),
-     TOBN(0x2613b4f2, 0x0e9940c1), TOBN(0xfc598bb9, 0x047d1eb1),
-     TOBN(0x9744c62b, 0x45036099), TOBN(0xa9dee742, 0x167c65d8),
-     TOBN(0x0c511525, 0xdabe1943), TOBN(0xda110554, 0x93c6c624),
-     TOBN(0xae00a52c, 0x651a3be2), TOBN(0xcda5111d, 0x884449a6),
-     TOBN(0x063c06f4, 0xff33bed1), TOBN(0x73baaf9a, 0x0d3d76b4),
-     TOBN(0x52fb0c9d, 0x7fc63668), TOBN(0x6886c9dd, 0x0c039cde),
-     TOBN(0x602bd599, 0x55b22351), TOBN(0xb00cab02, 0x360c7c13),
-     TOBN(0x8cb616bc, 0x81b69442), TOBN(0x41486700, 0xb55c3cee),
-     TOBN(0x71093281, 0xf49ba278), TOBN(0xad956d9c, 0x64a50710),
-     TOBN(0x9561f28b, 0x638a7e81), TOBN(0x54155cdf, 0x5980ddc3),
-     TOBN(0xb2db4a96, 0xd26f247a), TOBN(0x9d774e4e, 0x4787d100),
-     TOBN(0x1a9e6e2e, 0x078637d2), TOBN(0x1c363e2d, 0x5e0ae06a),
-     TOBN(0x7493483e, 0xe9cfa354), TOBN(0x76843cb3, 0x7f74b98d),
-     TOBN(0xbaca6591, 0xd4b66947), TOBN(0xb452ce98, 0x04460a8c),
-     TOBN(0x6830d246, 0x43768f55), TOBN(0xf4197ed8, 0x7dff12df),
-     TOBN(0x6521b472, 0x400dd0f7), TOBN(0x59f5ca8f, 0x4b1e7093),
-     TOBN(0x6feff11b, 0x080338ae), TOBN(0x0ada31f6, 0xa29ca3c6),
-     TOBN(0x24794eb6, 0x94a2c215), TOBN(0xd83a43ab, 0x05a57ab4),
-     TOBN(0x264a543a, 0x2a6f89fe), TOBN(0x2c2a3868, 0xdd5ec7c2),
-     TOBN(0xd3373940, 0x8439d9b2), TOBN(0x715ea672, 0x0acd1f11),
-     TOBN(0x42c1d235, 0xe7e6cc19), TOBN(0x81ce6e96, 0xb990585c),
-     TOBN(0x04e5dfe0, 0xd809c7bd), TOBN(0xd7b2580c, 0x8f1050ab),
-     TOBN(0x6d91ad78, 0xd8a4176f), TOBN(0x0af556ee, 0x4e2e897c),
-     TOBN(0x162a8b73, 0x921de0ac), TOBN(0x52ac9c22, 0x7ea78400),
-     TOBN(0xee2a4eea, 0xefce2174), TOBN(0xbe61844e, 0x6d637f79),
-     TOBN(0x0491f1bc, 0x789a283b), TOBN(0x72d3ac3d, 0x880836f4),
-     TOBN(0xaa1c5ea3, 0x88e5402d), TOBN(0x1b192421, 0xd5cc473d),
-     TOBN(0x5c0b9998, 0x9dc84cac), TOBN(0xb0a8482d, 0x9c6e75b8),
-     TOBN(0x639961d0, 0x3a191ce2), TOBN(0xda3bc865, 0x6d837930),
-     TOBN(0xca990653, 0x056e6f8f), TOBN(0x84861c41, 0x64d133a7),
-     TOBN(0x8b403276, 0x746abe40), TOBN(0xb7b4d51a, 0xebf8e303),
-     TOBN(0x05b43211, 0x220a255d), TOBN(0xc997152c, 0x02419e6e),
-     TOBN(0x76ff47b6, 0x630c2fea), TOBN(0x50518677, 0x281fdade),
-     TOBN(0x3283b8ba, 0xcf902b0b), TOBN(0x8d4b4eb5, 0x37db303b),
-     TOBN(0xcc89f42d, 0x755011bc), TOBN(0xb43d74bb, 0xdd09d19b),
-     TOBN(0x65746bc9, 0x8adba350), TOBN(0x364eaf8c, 0xb51c1927),
-     TOBN(0x13c76596, 0x10ad72ec), TOBN(0x30045121, 0xf8d40c20),
-     TOBN(0x6d2d99b7, 0xea7b979b), TOBN(0xcd78cd74, 0xe6fb3bcd),
-     TOBN(0x11e45a9e, 0x86cffbfe), TOBN(0x78a61cf4, 0x637024f6),
-     TOBN(0xd06bc872, 0x3d502295), TOBN(0xf1376854, 0x458cb288),
-     TOBN(0xb9db26a1, 0x342f8586), TOBN(0xf33effcf, 0x4beee09e),
-     TOBN(0xd7e0c4cd, 0xb30cfb3a), TOBN(0x6d09b8c1, 0x6c9db4c8),
-     TOBN(0x40ba1a42, 0x07c8d9df), TOBN(0x6fd495f7, 0x1c52c66d),
-     TOBN(0xfb0e169f, 0x275264da), TOBN(0x80c2b746, 0xe57d8362),
-     TOBN(0xedd987f7, 0x49ad7222), TOBN(0xfdc229af, 0x4398ec7b),}
-    ,
-    {TOBN(0xb0d1ed84, 0x52666a58), TOBN(0x4bcb6e00, 0xe6a9c3c2),
-     TOBN(0x3c57411c, 0x26906408), TOBN(0xcfc20755, 0x13556400),
-     TOBN(0xa08b1c50, 0x5294dba3), TOBN(0xa30ba286, 0x8b7dd31e),
-     TOBN(0xd70ba90e, 0x991eca74), TOBN(0x094e142c, 0xe762c2b9),
-     TOBN(0xb81d783e, 0x979f3925), TOBN(0x1efd130a, 0xaf4c89a7),
-     TOBN(0x525c2144, 0xfd1bf7fa), TOBN(0x4b296904, 0x1b265a9e),
-     TOBN(0xed8e9634, 0xb9db65b6), TOBN(0x35c82e32, 0x03599d8a),
-     TOBN(0xdaa7a54f, 0x403563f3), TOBN(0x9df088ad, 0x022c38ab),
-     TOBN(0xe5cfb066, 0xbb3fd30a), TOBN(0x429169da, 0xeff0354e),
-     TOBN(0x809cf852, 0x3524e36c), TOBN(0x136f4fb3, 0x0155be1d),
-     TOBN(0x4826af01, 0x1fbba712), TOBN(0x6ef0f0b4, 0x506ba1a1),
-     TOBN(0xd9928b31, 0x77aea73e), TOBN(0xe2bf6af2, 0x5eaa244e),
-     TOBN(0x8d084f12, 0x4237b64b), TOBN(0x688ebe99, 0xe3ecfd07),
-     TOBN(0x57b8a70c, 0xf6845dd8), TOBN(0x808fc59c, 0x5da4a325),
-     TOBN(0xa9032b2b, 0xa3585862), TOBN(0xb66825d5, 0xedf29386),
-     TOBN(0xb5a5a8db, 0x431ec29b), TOBN(0xbb143a98, 0x3a1e8dc8),
-     TOBN(0x35ee94ce, 0x12ae381b), TOBN(0x3a7f176c, 0x86ccda90),
-     TOBN(0xc63a657e, 0x4606eaca), TOBN(0x9ae5a380, 0x43cd04df),
-     TOBN(0x9bec8d15, 0xed251b46), TOBN(0x1f5d6d30, 0xcaca5e64),
-     TOBN(0x347b3b35, 0x9ff20f07), TOBN(0x4d65f034, 0xf7e4b286),
-     TOBN(0x9e93ba24, 0xf111661e), TOBN(0xedced484, 0xb105eb04),
-     TOBN(0x96dc9ba1, 0xf424b578), TOBN(0xbf8f66b7, 0xe83e9069),
-     TOBN(0x872d4df4, 0xd7ed8216), TOBN(0xbf07f377, 0x8e2cbecf),
-     TOBN(0x4281d899, 0x98e73754), TOBN(0xfec85fbb, 0x8aab8708),
-     TOBN(0x9a3c0dee, 0xa5ba5b0b), TOBN(0xe6a116ce, 0x42d05299),
-     TOBN(0xae9775fe, 0xe9b02d42), TOBN(0x72b05200, 0xa1545cb6),
-     TOBN(0xbc506f7d, 0x31a3b4ea), TOBN(0xe5893078, 0x8bbd9b32),
-     TOBN(0xc8bc5f37, 0xe4b12a97), TOBN(0x6b000c06, 0x4a73b671),
-     TOBN(0x13b5bf22, 0x765fa7d0), TOBN(0x59805bf0, 0x1d6a5370),
-     TOBN(0x67a5e29d, 0x4280db98), TOBN(0x4f53916f, 0x776b1ce3),
-     TOBN(0x714ff61f, 0x33ddf626), TOBN(0x4206238e, 0xa085d103),
-     TOBN(0x1c50d4b7, 0xe5809ee3), TOBN(0x999f450d, 0x85f8eb1d),
-     TOBN(0x658a6051, 0xe4c79e9b), TOBN(0x1394cb73, 0xc66a9fea),
-     TOBN(0x27f31ed5, 0xc6be7b23), TOBN(0xf4c88f36, 0x5aa6f8fe),
-     TOBN(0x0fb0721f, 0x4aaa499e), TOBN(0x68b3a7d5, 0xe3fb2a6b),
-     TOBN(0xa788097d, 0x3a92851d), TOBN(0x060e7f8a, 0xe96f4913),
-     TOBN(0x82eebe73, 0x1a3a93bc), TOBN(0x42bbf465, 0xa21adc1a),
-     TOBN(0xc10b6fa4, 0xef030efd), TOBN(0x247aa4c7, 0x87b097bb),
-     TOBN(0x8b8dc632, 0xf60c77da), TOBN(0x6ffbc26a, 0xc223523e),
-     TOBN(0xa4f6ff11, 0x344579cf), TOBN(0x5825653c, 0x980250f6),
-     TOBN(0xb2dd097e, 0xbc1aa2b9), TOBN(0x07889393, 0x37a0333a),
-     TOBN(0x1cf55e71, 0x37a0db38), TOBN(0x2648487f, 0x792c1613),
-     TOBN(0xdad01336, 0x3fcef261), TOBN(0x6239c81d, 0x0eabf129),
-     TOBN(0x8ee761de, 0x9d276be2), TOBN(0x406a7a34, 0x1eda6ad3),
-     TOBN(0x4bf367ba, 0x4a493b31), TOBN(0x54f20a52, 0x9bf7f026),
-     TOBN(0xb696e062, 0x9795914b), TOBN(0xcddab96d, 0x8bf236ac),
-     TOBN(0x4ff2c70a, 0xed25ea13), TOBN(0xfa1d09eb, 0x81cbbbe7),
-     TOBN(0x88fc8c87, 0x468544c5), TOBN(0x847a670d, 0x696b3317),
-     TOBN(0xf133421e, 0x64bcb626), TOBN(0xaea638c8, 0x26dee0b5),
-     TOBN(0xd6e7680b, 0xb310346c), TOBN(0xe06f4097, 0xd5d4ced3),
-     TOBN(0x09961452, 0x7512a30b), TOBN(0xf3d867fd, 0xe589a59a),
-     TOBN(0x2e73254f, 0x52d0c180), TOBN(0x9063d8a3, 0x333c74ac),
-     TOBN(0xeda6c595, 0xd314e7bc), TOBN(0x2ee7464b, 0x467899ed),
-     TOBN(0x1cef423c, 0x0a1ed5d3), TOBN(0x217e76ea, 0x69cc7613),
-     TOBN(0x27ccce1f, 0xe7cda917), TOBN(0x12d8016b, 0x8a893f16),
-     TOBN(0xbcd6de84, 0x9fc74f6b), TOBN(0xfa5817e2, 0xf3144e61),
-     TOBN(0x1f354164, 0x0821ee4c), TOBN(0x1583eab4, 0x0bc61992),
-     TOBN(0x7490caf6, 0x1d72879f), TOBN(0x998ad9f3, 0xf76ae7b2),
-     TOBN(0x1e181950, 0xa41157f7), TOBN(0xa9d7e1e6, 0xe8da3a7e),
-     TOBN(0x963784eb, 0x8426b95f), TOBN(0x0ee4ed6e, 0x542e2a10),
-     TOBN(0xb79d4cc5, 0xac751e7b), TOBN(0x93f96472, 0xfd4211bd),
-     TOBN(0x8c72d3d2, 0xc8de4fc6), TOBN(0x7b69cbf5, 0xdf44f064),
-     TOBN(0x3da90ca2, 0xf4bf94e1), TOBN(0x1a5325f8, 0xf12894e2),
-     TOBN(0x0a437f6c, 0x7917d60b), TOBN(0x9be70486, 0x96c9cb5d),
-     TOBN(0xb4d880bf, 0xe1dc5c05), TOBN(0xd738adda, 0xeebeeb57),
-     TOBN(0x6f0119d3, 0xdf0fe6a3), TOBN(0x5c686e55, 0x66eaaf5a),
-     TOBN(0x9cb10b50, 0xdfd0b7ec), TOBN(0xbdd0264b, 0x6a497c21),
-     TOBN(0xfc093514, 0x8c546c96), TOBN(0x58a947fa, 0x79dbf42a),
-     TOBN(0xc0b48d4e, 0x49ccd6d7), TOBN(0xff8fb02c, 0x88bd5580),
-     TOBN(0xc75235e9, 0x07d473b2), TOBN(0x4fab1ac5, 0xa2188af3),
-     TOBN(0x030fa3bc, 0x97576ec0), TOBN(0xe8c946e8, 0x0b7e7d2f),
-     TOBN(0x40a5c9cc, 0x70305600), TOBN(0x6d8260a9, 0xc8b013b4),
-     TOBN(0x0368304f, 0x70bba85c), TOBN(0xad090da1, 0xa4a0d311),
-     TOBN(0x7170e870, 0x2415eec1), TOBN(0xbfba35fe, 0x8461ea47),
-     TOBN(0x6279019a, 0xc1e91938), TOBN(0xa47638f3, 0x1afc415f),
-     TOBN(0x36c65cbb, 0xbcba0e0f), TOBN(0x02160efb, 0x034e2c48),
-     TOBN(0xe6c51073, 0x615cd9e4), TOBN(0x498ec047, 0xf1243c06),
-     TOBN(0x3e5a8809, 0xb17b3d8c), TOBN(0x5cd99e61, 0x0cc565f1),
-     TOBN(0x81e312df, 0x7851dafe), TOBN(0xf156f5ba, 0xa79061e2),
-     TOBN(0x80d62b71, 0x880c590e), TOBN(0xbec9746f, 0x0a39faa1),
-     TOBN(0x1d98a9c1, 0xc8ed1f7a), TOBN(0x09e43bb5, 0xa81d5ff2),
-     TOBN(0xd5f00f68, 0x0da0794a), TOBN(0x412050d9, 0x661aa836),
-     TOBN(0xa89f7c4e, 0x90747e40), TOBN(0x6dc05ebb, 0xb62a3686),
-     TOBN(0xdf4de847, 0x308e3353), TOBN(0x53868fbb, 0x9fb53bb9),
-     TOBN(0x2b09d2c3, 0xcfdcf7dd), TOBN(0x41a9fce3, 0x723fcab4),
-     TOBN(0x73d905f7, 0x07f57ca3), TOBN(0x080f9fb1, 0xac8e1555),
-     TOBN(0x7c088e84, 0x9ba7a531), TOBN(0x07d35586, 0xed9a147f),
-     TOBN(0x602846ab, 0xaf48c336), TOBN(0x7320fd32, 0x0ccf0e79),
-     TOBN(0xaa780798, 0xb18bd1ff), TOBN(0x52c2e300, 0xafdd2905),
-     TOBN(0xf27ea3d6, 0x434267cd), TOBN(0x8b96d16d, 0x15605b5f),
-     TOBN(0x7bb31049, 0x4b45706b), TOBN(0xe7f58b8e, 0x743d25f8),
-     TOBN(0xe9b5e45b, 0x87f30076), TOBN(0xd19448d6, 0x5d053d5a),
-     TOBN(0x1ecc8cb9, 0xd3210a04), TOBN(0x6bc7d463, 0xdafb5269),
-     TOBN(0x3e59b10a, 0x67c3489f), TOBN(0x1769788c, 0x65641e1b),
-     TOBN(0x8a53b82d, 0xbd6cb838), TOBN(0x7066d6e6, 0x236d5f22),
-     TOBN(0x03aa1c61, 0x6908536e), TOBN(0xc971da0d, 0x66ae9809),
-     TOBN(0x01b3a86b, 0xc49a2fac), TOBN(0x3b8420c0, 0x3092e77a),
-     TOBN(0x02057300, 0x7d6fb556), TOBN(0x6941b2a1, 0xbff40a87),
-     TOBN(0x140b6308, 0x0658ff2a), TOBN(0x87804363, 0x3424ab36),
-     TOBN(0x0253bd51, 0x5751e299), TOBN(0xc75bcd76, 0x449c3e3a),
-     TOBN(0x92eb4090, 0x7f8f875d), TOBN(0x9c9d754e, 0x56c26bbf),
-     TOBN(0x158cea61, 0x8110bbe7), TOBN(0x62a6b802, 0x745f91ea),
-     TOBN(0xa79c41aa, 0xc6e7394b), TOBN(0x445b6a83, 0xad57ef10),
-     TOBN(0x0c5277eb, 0x6ea6f40c), TOBN(0x319fe96b, 0x88633365),
-     TOBN(0x0b0fc61f, 0x385f63cb), TOBN(0x41250c84, 0x22bdd127),
-     TOBN(0x67d153f1, 0x09e942c2), TOBN(0x60920d08, 0xc021ad5d),
-     TOBN(0x229f5746, 0x724d81a5), TOBN(0xb7ffb892, 0x5bba3299),
-     TOBN(0x518c51a1, 0xde413032), TOBN(0x2a9bfe77, 0x3c2fd94c),
-     TOBN(0xcbcde239, 0x3191f4fd), TOBN(0x43093e16, 0xd3d6ada1),
-     TOBN(0x184579f3, 0x58769606), TOBN(0x2c94a8b3, 0xd236625c),
-     TOBN(0x6922b9c0, 0x5c437d8e), TOBN(0x3d4ae423, 0xd8d9f3c8),
-     TOBN(0xf72c31c1, 0x2e7090a2), TOBN(0x4ac3f5f3, 0xd76a55bd),
-     TOBN(0x342508fc, 0x6b6af991), TOBN(0x0d527100, 0x1b5cebbd),
-     TOBN(0xb84740d0, 0xdd440dd7), TOBN(0x748ef841, 0x780162fd),
-     TOBN(0xa8dbfe0e, 0xdfc6fafb), TOBN(0xeadfdf05, 0xf7300f27),
-     TOBN(0x7d06555f, 0xfeba4ec9), TOBN(0x12c56f83, 0x9e25fa97),
-     TOBN(0x77f84203, 0xd39b8c34), TOBN(0xed8b1be6, 0x3125eddb),
-     TOBN(0x5bbf2441, 0xf6e39dc5), TOBN(0xb00f6ee6, 0x6a5d678a),
-     TOBN(0xba456ecf, 0x57d0ea99), TOBN(0xdcae0f58, 0x17e06c43),
-     TOBN(0x01643de4, 0x0f5b4baa), TOBN(0x2c324341, 0xd161b9be),
-     TOBN(0x80177f55, 0xe126d468), TOBN(0xed325f1f, 0x76748e09),
-     TOBN(0x6116004a, 0xcfa9bdc2), TOBN(0x2d8607e6, 0x3a9fb468),
-     TOBN(0x0e573e27, 0x6009d660), TOBN(0x3a525d2e, 0x8d10c5a1),
-     TOBN(0xd26cb45c, 0x3b9009a0), TOBN(0xb6b0cdc0, 0xde9d7448),
-     TOBN(0x949c9976, 0xe1337c26), TOBN(0x6faadebd, 0xd73d68e5),
-     TOBN(0x9e158614, 0xf1b768d9), TOBN(0x22dfa557, 0x9cc4f069),
-     TOBN(0xccd6da17, 0xbe93c6d6), TOBN(0x24866c61, 0xa504f5b9),
-     TOBN(0x2121353c, 0x8d694da1), TOBN(0x1c6ca580, 0x0140b8c6),
-     TOBN(0xc245ad8c, 0xe964021e), TOBN(0xb83bffba, 0x032b82b3),
-     TOBN(0xfaa220c6, 0x47ef9898), TOBN(0x7e8d3ac6, 0x982c948a),
-     TOBN(0x1faa2091, 0xbc2d124a), TOBN(0xbd54c3dd, 0x05b15ff4),
-     TOBN(0x386bf3ab, 0xc87c6fb7), TOBN(0xfb2b0563, 0xfdeb6f66),
-     TOBN(0x4e77c557, 0x5b45afb4), TOBN(0xe9ded649, 0xefb8912d),
-     TOBN(0x7ec9bbf5, 0x42f6e557), TOBN(0x2570dfff, 0x62671f00),
-     TOBN(0x2b3bfb78, 0x88e084bd), TOBN(0xa024b238, 0xf37fe5b4),
-     TOBN(0x44e7dc04, 0x95649aee), TOBN(0x498ca255, 0x5e7ec1d8),
-     TOBN(0x3bc766ea, 0xaaa07e86), TOBN(0x0db6facb, 0xf3608586),
-     TOBN(0xbadd2549, 0xbdc259c8), TOBN(0x95af3c6e, 0x041c649f),
-     TOBN(0xb36a928c, 0x02e30afb), TOBN(0x9b5356ad, 0x008a88b8),
-     TOBN(0x4b67a5f1, 0xcf1d9e9d), TOBN(0xc6542e47, 0xa5d8d8ce),
-     TOBN(0x73061fe8, 0x7adfb6cc), TOBN(0xcc826fd3, 0x98678141),
-     TOBN(0x00e758b1, 0x3c80515a), TOBN(0x6afe3247, 0x41485083),
-     TOBN(0x0fcb08b9, 0xb6ae8a75), TOBN(0xb8cf388d, 0x4acf51e1),
-     TOBN(0x344a5560, 0x6961b9d6), TOBN(0x1a6778b8, 0x6a97fd0c),
-     TOBN(0xd840fdc1, 0xecc4c7e3), TOBN(0xde9fe47d, 0x16db68cc),
-     TOBN(0xe95f89de, 0xa3e216aa), TOBN(0x84f1a6a4, 0x9594a8be),
-     TOBN(0x7ddc7d72, 0x5a7b162b), TOBN(0xc5cfda19, 0xadc817a3),
-     TOBN(0x80a5d350, 0x78b58d46), TOBN(0x93365b13, 0x82978f19),
-     TOBN(0x2e44d225, 0x26a1fc90), TOBN(0x0d6d10d2, 0x4d70705d),
-     TOBN(0xd94b6b10, 0xd70c45f4), TOBN(0x0f201022, 0xb216c079),
-     TOBN(0xcec966c5, 0x658fde41), TOBN(0xa8d2bc7d, 0x7e27601d),
-     TOBN(0xbfcce3e1, 0xff230be7), TOBN(0x3394ff6b, 0x0033ffb5),
-     TOBN(0xd890c509, 0x8132c9af), TOBN(0xaac4b0eb, 0x361e7868),
-     TOBN(0x5194ded3, 0xe82d15aa), TOBN(0x4550bd2e, 0x23ae6b7d),
-     TOBN(0x3fda318e, 0xea5399d4), TOBN(0xd989bffa, 0x91638b80),
-     TOBN(0x5ea124d0, 0xa14aa12d), TOBN(0x1fb1b899, 0x3667b944),
-     TOBN(0x95ec7969, 0x44c44d6a), TOBN(0x91df144a, 0x57e86137),
-     TOBN(0x915fd620, 0x73adac44), TOBN(0x8f01732d, 0x59a83801),
-     TOBN(0xec579d25, 0x3aa0a633), TOBN(0x06de5e7c, 0xc9d6d59c),
-     TOBN(0xc132f958, 0xb1ef8010), TOBN(0x29476f96, 0xe65c1a02),
-     TOBN(0x336a77c0, 0xd34c3565), TOBN(0xef1105b2, 0x1b9f1e9e),
-     TOBN(0x63e6d08b, 0xf9e08002), TOBN(0x9aff2f21, 0xc613809e),
-     TOBN(0xb5754f85, 0x3a80e75d), TOBN(0xde71853e, 0x6bbda681),
-     TOBN(0x86f041df, 0x8197fd7a), TOBN(0x8b332e08, 0x127817fa),
-     TOBN(0x05d99be8, 0xb9c20cda), TOBN(0x89f7aad5, 0xd5cd0c98),
-     TOBN(0x7ef936fe, 0x5bb94183), TOBN(0x92ca0753, 0xb05cd7f2),
-     TOBN(0x9d65db11, 0x74a1e035), TOBN(0x02628cc8, 0x13eaea92),
-     TOBN(0xf2d9e242, 0x49e4fbf2), TOBN(0x94fdfd9b, 0xe384f8b7),
-     TOBN(0x65f56054, 0x63428c6b), TOBN(0x2f7205b2, 0x90b409a5),
-     TOBN(0xf778bb78, 0xff45ae11), TOBN(0xa13045be, 0xc5ee53b2),
-     TOBN(0xe00a14ff, 0x03ef77fe), TOBN(0x689cd59f, 0xffef8bef),
-     TOBN(0x3578f0ed, 0x1e9ade22), TOBN(0xe99f3ec0, 0x6268b6a8),
-     TOBN(0xa2057d91, 0xea1b3c3e), TOBN(0x2d1a7053, 0xb8823a4a),
-     TOBN(0xabbb336a, 0x2cca451e), TOBN(0xcd2466e3, 0x2218bb5d),
-     TOBN(0x3ac1f42f, 0xc8cb762d), TOBN(0x7e312aae, 0x7690211f),
-     TOBN(0xebb9bd73, 0x45d07450), TOBN(0x207c4b82, 0x46c2213f),
-     TOBN(0x99d425c1, 0x375913ec), TOBN(0x94e45e96, 0x67908220),
-     TOBN(0xc08f3087, 0xcd67dbf6), TOBN(0xa5670fbe, 0xc0887056),
-     TOBN(0x6717b64a, 0x66f5b8fc), TOBN(0xd5a56aea, 0x786fec28),
-     TOBN(0xa8c3f55f, 0xc0ff4952), TOBN(0xa77fefae, 0x457ac49b),
-     TOBN(0x29882d7c, 0x98379d44), TOBN(0xd000bdfb, 0x509edc8a),
-     TOBN(0xc6f95979, 0xe66fe464), TOBN(0x504a6115, 0xfa61bde0),
-     TOBN(0x56b3b871, 0xeffea31a), TOBN(0x2d3de26d, 0xf0c21a54),
-     TOBN(0x21dbff31, 0x834753bf), TOBN(0xe67ecf49, 0x69269d86),
-     TOBN(0x7a176952, 0x151fe690), TOBN(0x03515804, 0x7f2adb5f),
-     TOBN(0xee794b15, 0xd1b62a8d), TOBN(0xf004ceec, 0xaae454e6),
-     TOBN(0x0897ea7c, 0xf0386fac), TOBN(0x3b62ff12, 0xd1fca751),
-     TOBN(0x154181df, 0x1b7a04ec), TOBN(0x2008e04a, 0xfb5847ec),
-     TOBN(0xd147148e, 0x41dbd772), TOBN(0x2b419f73, 0x22942654),
-     TOBN(0x669f30d3, 0xe9c544f7), TOBN(0x52a2c223, 0xc8540149),
-     TOBN(0x5da9ee14, 0x634dfb02), TOBN(0x5f074ff0, 0xf47869f3),
-     TOBN(0x74ee878d, 0xa3933acc), TOBN(0xe6510651, 0x4fe35ed1),
-     TOBN(0xb3eb9482, 0xf1012e7a), TOBN(0x51013cc0, 0xa8a566ae),
-     TOBN(0xdd5e9243, 0x47c00d3b), TOBN(0x7fde089d, 0x946bb0e5),
-     TOBN(0x030754fe, 0xc731b4b3), TOBN(0x12a136a4, 0x99fda062),
-     TOBN(0x7c1064b8, 0x5a1a35bc), TOBN(0xbf1f5763, 0x446c84ef),
-     TOBN(0xed29a56d, 0xa16d4b34), TOBN(0x7fba9d09, 0xdca21c4f),
-     TOBN(0x66d7ac00, 0x6d8de486), TOBN(0x60061987, 0x73a2a5e1),
-     TOBN(0x8b400f86, 0x9da28ff0), TOBN(0x3133f708, 0x43c4599c),
-     TOBN(0x9911c9b8, 0xee28cb0d), TOBN(0xcd7e2874, 0x8e0af61d),
-     TOBN(0x5a85f0f2, 0x72ed91fc), TOBN(0x85214f31, 0x9cd4a373),
-     TOBN(0x881fe5be, 0x1925253c), TOBN(0xd8dc98e0, 0x91e8bc76),
-     TOBN(0x7120affe, 0x585cc3a2), TOBN(0x724952ed, 0x735bf97a),
-     TOBN(0x5581e7dc, 0x3eb34581), TOBN(0x5cbff4f2, 0xe52ee57d),
-     TOBN(0x8d320a0e, 0x87d8cc7b), TOBN(0x9beaa7f3, 0xf1d280d0),
-     TOBN(0x7a0b9571, 0x9beec704), TOBN(0x9126332e, 0x5b7f0057),
-     TOBN(0x01fbc1b4, 0x8ed3bd6d), TOBN(0x35bb2c12, 0xd945eb24),
-     TOBN(0x6404694e, 0x9a8ae255), TOBN(0xb6092eec, 0x8d6abfb3),
-     TOBN(0x4d76143f, 0xcc058865), TOBN(0x7b0a5af2, 0x6e249922),
-     TOBN(0x8aef9440, 0x6a50d353), TOBN(0xe11e4bcc, 0x64f0e07a),
-     TOBN(0x4472993a, 0xa14a90fa), TOBN(0x7706e20c, 0xba0c51d4),
-     TOBN(0xf403292f, 0x1532672d), TOBN(0x52573bfa, 0x21829382),
-     TOBN(0x6a7bb6a9, 0x3b5bdb83), TOBN(0x08da65c0, 0xa4a72318),
-     TOBN(0xc58d22aa, 0x63eb065f), TOBN(0x1717596c, 0x1b15d685),
-     TOBN(0x112df0d0, 0xb266d88b), TOBN(0xf688ae97, 0x5941945a),
-     TOBN(0x487386e3, 0x7c292cac), TOBN(0x42f3b50d, 0x57d6985c),
-     TOBN(0x6da4f998, 0x6a90fc34), TOBN(0xc8f257d3, 0x65ca8a8d),
-     TOBN(0xc2feabca, 0x6951f762), TOBN(0xe1bc81d0, 0x74c323ac),
-     TOBN(0x1bc68f67, 0x251a2a12), TOBN(0x10d86587, 0xbe8a70dc),
-     TOBN(0xd648af7f, 0xf0f84d2e), TOBN(0xf0aa9ebc, 0x6a43ac92),
-     TOBN(0x69e3be04, 0x27596893), TOBN(0xb6bb02a6, 0x45bf452b),
-     TOBN(0x0875c11a, 0xf4c698c8), TOBN(0x6652b5c7, 0xbece3794),
-     TOBN(0x7b3755fd, 0x4f5c0499), TOBN(0x6ea16558, 0xb5532b38),
-     TOBN(0xd1c69889, 0xa2e96ef7), TOBN(0x9c773c3a, 0x61ed8f48),
-     TOBN(0x2b653a40, 0x9b323abc), TOBN(0xe26605e1, 0xf0e1d791),
-     TOBN(0x45d41064, 0x4a87157a), TOBN(0x8f9a78b7, 0xcbbce616),
-     TOBN(0xcf1e44aa, 0xc407eddd), TOBN(0x81ddd1d8, 0xa35b964f),
-     TOBN(0x473e339e, 0xfd083999), TOBN(0x6c94bdde, 0x8e796802),
-     TOBN(0x5a304ada, 0x8545d185), TOBN(0x82ae44ea, 0x738bb8cb),
-     TOBN(0x628a35e3, 0xdf87e10e), TOBN(0xd3624f3d, 0xa15b9fe3),
-     TOBN(0xcc44209b, 0x14be4254), TOBN(0x7d0efcbc, 0xbdbc2ea5),
-     TOBN(0x1f603362, 0x04c37bbe), TOBN(0x21f363f5, 0x56a5852c),
-     TOBN(0xa1503d1c, 0xa8501550), TOBN(0x2251e0e1, 0xd8ab10bb),
-     TOBN(0xde129c96, 0x6961c51c), TOBN(0x1f7246a4, 0x81910f68),
-     TOBN(0x2eb744ee, 0x5f2591f2), TOBN(0x3c47d33f, 0x5e627157),
-     TOBN(0x4d6d62c9, 0x22f3bd68), TOBN(0x6120a64b, 0xcb8df856),
-     TOBN(0x3a9ac6c0, 0x7b5d07df), TOBN(0xa92b9558, 0x7ef39783),
-     TOBN(0xe128a134, 0xab3a9b4f), TOBN(0x41c18807, 0xb1252f05),
-     TOBN(0xfc7ed089, 0x80ba9b1c), TOBN(0xac8dc6de, 0xc532a9dd),
-     TOBN(0xbf829cef, 0x55246809), TOBN(0x101b784f, 0x5b4ee80f),
-     TOBN(0xc09945bb, 0xb6f11603), TOBN(0x57b09dbe, 0x41d2801e),
-     TOBN(0xfba5202f, 0xa97534a8), TOBN(0x7fd8ae5f, 0xc17b9614),
-     TOBN(0xa50ba666, 0x78308435), TOBN(0x9572f77c, 0xd3868c4d),
-     TOBN(0x0cef7bfd, 0x2dd7aab0), TOBN(0xe7958e08, 0x2c7c79ff),
-     TOBN(0x81262e42, 0x25346689), TOBN(0x716da290, 0xb07c7004),
-     TOBN(0x35f911ea, 0xb7950ee3), TOBN(0x6fd72969, 0x261d21b5),
-     TOBN(0x52389803, 0x08b640d3), TOBN(0x5b0026ee, 0x887f12a1),
-     TOBN(0x20e21660, 0x742e9311), TOBN(0x0ef6d541, 0x5ff77ff7),
-     TOBN(0x969127f0, 0xf9c41135), TOBN(0xf21d60c9, 0x68a64993),
-     TOBN(0x656e5d0c, 0xe541875c), TOBN(0xf1e0f84e, 0xa1d3c233),
-     TOBN(0x9bcca359, 0x06002d60), TOBN(0xbe2da60c, 0x06191552),
-     TOBN(0x5da8bbae, 0x61181ec3), TOBN(0x9f04b823, 0x65806f19),
-     TOBN(0xf1604a7d, 0xd4b79bb8), TOBN(0xaee806fb, 0x52c878c8),
-     TOBN(0x34144f11, 0x8d47b8e8), TOBN(0x72edf52b, 0x949f9054),
-     TOBN(0xebfca84e, 0x2127015a), TOBN(0x9051d0c0, 0x9cb7cef3),
-     TOBN(0x86e8fe58, 0x296deec8), TOBN(0x33b28188, 0x41010d74),}
-    ,
-    {TOBN(0x01079383, 0x171b445f), TOBN(0x9bcf21e3, 0x8131ad4c),
-     TOBN(0x8cdfe205, 0xc93987e8), TOBN(0xe63f4152, 0xc92e8c8f),
-     TOBN(0x729462a9, 0x30add43d), TOBN(0x62ebb143, 0xc980f05a),
-     TOBN(0x4f3954e5, 0x3b06e968), TOBN(0xfe1d75ad, 0x242cf6b1),
-     TOBN(0x5f95c6c7, 0xaf8685c8), TOBN(0xd4c1c8ce, 0x2f8f01aa),
-     TOBN(0xc44bbe32, 0x2574692a), TOBN(0xb8003478, 0xd4a4a068),
-     TOBN(0x7c8fc6e5, 0x2eca3cdb), TOBN(0xea1db16b, 0xec04d399),
-     TOBN(0xb05bc82e, 0x8f2bc5cf), TOBN(0x763d517f, 0xf44793d2),
-     TOBN(0x4451c1b8, 0x08bd98d0), TOBN(0x644b1cd4, 0x6575f240),
-     TOBN(0x6907eb33, 0x7375d270), TOBN(0x56c8bebd, 0xfa2286bd),
-     TOBN(0xc713d2ac, 0xc4632b46), TOBN(0x17da427a, 0xafd60242),
-     TOBN(0x313065b7, 0xc95c7546), TOBN(0xf8239898, 0xbf17a3de),
-     TOBN(0xf3b7963f, 0x4c830320), TOBN(0x842c7aa0, 0x903203e3),
-     TOBN(0xaf22ca0a, 0xe7327afb), TOBN(0x38e13092, 0x967609b6),
-     TOBN(0x73b8fb62, 0x757558f1), TOBN(0x3cc3e831, 0xf7eca8c1),
-     TOBN(0xe4174474, 0xf6331627), TOBN(0xa77989ca, 0xc3c40234),
-     TOBN(0xe5fd17a1, 0x44a081e0), TOBN(0xd797fb7d, 0xb70e296a),
-     TOBN(0x2b472b30, 0x481f719c), TOBN(0x0e632a98, 0xfe6f8c52),
-     TOBN(0x89ccd116, 0xc5f0c284), TOBN(0xf51088af, 0x2d987c62),
-     TOBN(0x2a2bccda, 0x4c2de6cf), TOBN(0x810f9efe, 0xf679f0f9),
-     TOBN(0xb0f394b9, 0x7ffe4b3e), TOBN(0x0b691d21, 0xe5fa5d21),
-     TOBN(0xb0bd7747, 0x9dfbbc75), TOBN(0xd2830fda, 0xfaf78b00),
-     TOBN(0xf78c249c, 0x52434f57), TOBN(0x4b1f7545, 0x98096dab),
-     TOBN(0x73bf6f94, 0x8ff8c0b3), TOBN(0x34aef03d, 0x454e134c),
-     TOBN(0xf8d151f4, 0xb7ac7ec5), TOBN(0xd6ceb95a, 0xe50da7d5),
-     TOBN(0xa1b492b0, 0xdc3a0eb8), TOBN(0x75157b69, 0xb3dd2863),
-     TOBN(0xe2c4c74e, 0xc5413d62), TOBN(0xbe329ff7, 0xbc5fc4c7),
-     TOBN(0x835a2aea, 0x60fa9dda), TOBN(0xf117f5ad, 0x7445cb87),
-     TOBN(0xae8317f4, 0xb0166f7a), TOBN(0xfbd3e3f7, 0xceec74e6),
-     TOBN(0xfdb516ac, 0xe0874bfd), TOBN(0x3d846019, 0xc681f3a3),
-     TOBN(0x0b12ee5c, 0x7c1620b0), TOBN(0xba68b4dd, 0x2b63c501),
-     TOBN(0xac03cd32, 0x6668c51e), TOBN(0x2a6279f7, 0x4e0bcb5b),
-     TOBN(0x17bd69b0, 0x6ae85c10), TOBN(0x72946979, 0x1dfdd3a6),
-     TOBN(0xd9a03268, 0x2c078bec), TOBN(0x41c6a658, 0xbfd68a52),
-     TOBN(0xcdea1024, 0x0e023900), TOBN(0xbaeec121, 0xb10d144d),
-     TOBN(0x5a600e74, 0x058ab8dc), TOBN(0x1333af21, 0xbb89ccdd),
-     TOBN(0xdf25eae0, 0x3aaba1f1), TOBN(0x2cada16e, 0x3b7144cf),
-     TOBN(0x657ee27d, 0x71ab98bc), TOBN(0x99088b4c, 0x7a6fc96e),
-     TOBN(0x05d5c0a0, 0x3549dbd4), TOBN(0x42cbdf8f, 0xf158c3ac),
-     TOBN(0x3fb6b3b0, 0x87edd685), TOBN(0x22071cf6, 0x86f064d0),
-     TOBN(0xd2d6721f, 0xff2811e5), TOBN(0xdb81b703, 0xfe7fae8c),
-     TOBN(0x3cfb74ef, 0xd3f1f7bb), TOBN(0x0cdbcd76, 0x16cdeb5d),
-     TOBN(0x4f39642a, 0x566a808c), TOBN(0x02b74454, 0x340064d6),
-     TOBN(0xfabbadca, 0x0528fa6f), TOBN(0xe4c3074c, 0xd3fc0bb6),
-     TOBN(0xb32cb8b0, 0xb796d219), TOBN(0xc3e95f4f, 0x34741dd9),
-     TOBN(0x87212125, 0x68edf6f5), TOBN(0x7a03aee4, 0xa2b9cb8e),
-     TOBN(0x0cd3c376, 0xf53a89aa), TOBN(0x0d8af9b1, 0x948a28dc),
-     TOBN(0xcf86a3f4, 0x902ab04f), TOBN(0x8aacb62a, 0x7f42002d),
-     TOBN(0x106985eb, 0xf62ffd52), TOBN(0xe670b54e, 0x5797bf10),
-     TOBN(0x4b405209, 0xc5e30aef), TOBN(0x12c97a20, 0x4365b5e9),
-     TOBN(0x104646ce, 0x1fe32093), TOBN(0x13cb4ff6, 0x3907a8c9),
-     TOBN(0x8b9f30d1, 0xd46e726b), TOBN(0xe1985e21, 0xaba0f499),
-     TOBN(0xc573dea9, 0x10a230cd), TOBN(0x24f46a93, 0xcd30f947),
-     TOBN(0xf2623fcf, 0xabe2010a), TOBN(0x3f278cb2, 0x73f00e4f),
-     TOBN(0xed55c67d, 0x50b920eb), TOBN(0xf1cb9a2d, 0x8e760571),
-     TOBN(0x7c50d109, 0x0895b709), TOBN(0x4207cf07, 0x190d4369),
-     TOBN(0x3b027e81, 0xc4127fe1), TOBN(0xa9f8b9ad, 0x3ae9c566),
-     TOBN(0x5ab10851, 0xacbfbba5), TOBN(0xa747d648, 0x569556f5),
-     TOBN(0xcc172b5c, 0x2ba97bf7), TOBN(0x15e0f77d, 0xbcfa3324),
-     TOBN(0xa345b797, 0x7686279d), TOBN(0x5a723480, 0xe38003d3),
-     TOBN(0xfd8e139f, 0x8f5fcda8), TOBN(0xf3e558c4, 0xbdee5bfd),
-     TOBN(0xd76cbaf4, 0xe33f9f77), TOBN(0x3a4c97a4, 0x71771969),
-     TOBN(0xda27e84b, 0xf6dce6a7), TOBN(0xff373d96, 0x13e6c2d1),
-     TOBN(0xf115193c, 0xd759a6e9), TOBN(0x3f9b7025, 0x63d2262c),
-     TOBN(0xd9764a31, 0x317cd062), TOBN(0x30779d8e, 0x199f8332),
-     TOBN(0xd8074106, 0x16b11b0b), TOBN(0x7917ab9f, 0x78aeaed8),
-     TOBN(0xb67a9cbe, 0x28fb1d8e), TOBN(0x2e313563, 0x136eda33),
-     TOBN(0x010b7069, 0xa371a86c), TOBN(0x44d90fa2, 0x6744e6b7),
-     TOBN(0x68190867, 0xd6b3e243), TOBN(0x9fe6cd9d, 0x59048c48),
-     TOBN(0xb900b028, 0x95731538), TOBN(0xa012062f, 0x32cae04f),
-     TOBN(0x8107c8bc, 0x9399d082), TOBN(0x47e8c54a, 0x41df12e2),
-     TOBN(0x14ba5117, 0xb6ef3f73), TOBN(0x22260bea, 0x81362f0b),
-     TOBN(0x90ea261e, 0x1a18cc20), TOBN(0x2192999f, 0x2321d636),
-     TOBN(0xef64d314, 0xe311b6a0), TOBN(0xd7401e4c, 0x3b54a1f5),
-     TOBN(0x19019983, 0x6fbca2ba), TOBN(0x46ad3293, 0x8fbffc4b),
-     TOBN(0xa142d3f6, 0x3786bf40), TOBN(0xeb5cbc26, 0xb67039fc),
-     TOBN(0x9cb0ae6c, 0x252bd479), TOBN(0x05e0f88a, 0x12b5848f),
-     TOBN(0x78f6d2b2, 0xa5c97663), TOBN(0x6f6e149b, 0xc162225c),
-     TOBN(0xe602235c, 0xde601a89), TOBN(0xd17bbe98, 0xf373be1f),
-     TOBN(0xcaf49a5b, 0xa8471827), TOBN(0x7e1a0a85, 0x18aaa116),
-     TOBN(0x6c833196, 0x270580c3), TOBN(0x1e233839, 0xf1c98a14),
-     TOBN(0x67b2f7b4, 0xae34e0a5), TOBN(0x47ac8745, 0xd8ce7289),
-     TOBN(0x2b74779a, 0x100dd467), TOBN(0x274a4337, 0x4ee50d09),
-     TOBN(0x603dcf13, 0x83608bc9), TOBN(0xcd9da6c3, 0xc89e8388),
-     TOBN(0x2660199f, 0x355116ac), TOBN(0xcc38bb59, 0xb6d18eed),
-     TOBN(0x3075f31f, 0x2f4bc071), TOBN(0x9774457f, 0x265dc57e),
-     TOBN(0x06a6a9c8, 0xc6db88bb), TOBN(0x6429d07f, 0x4ec98e04),
-     TOBN(0x8d05e57b, 0x05ecaa8b), TOBN(0x20f140b1, 0x7872ea7b),
-     TOBN(0xdf8c0f09, 0xca494693), TOBN(0x48d3a020, 0xf252e909),
-     TOBN(0x4c5c29af, 0x57b14b12), TOBN(0x7e6fa37d, 0xbf47ad1c),
-     TOBN(0x66e7b506, 0x49a0c938), TOBN(0xb72c0d48, 0x6be5f41f),
-     TOBN(0x6a6242b8, 0xb2359412), TOBN(0xcd35c774, 0x8e859480),
-     TOBN(0x12536fea, 0x87baa627), TOBN(0x58c1fec1, 0xf72aa680),
-     TOBN(0x6c29b637, 0x601e5dc9), TOBN(0x9e3c3c1c, 0xde9e01b9),
-     TOBN(0xefc8127b, 0x2bcfe0b0), TOBN(0x35107102, 0x2a12f50d),
-     TOBN(0x6ccd6cb1, 0x4879b397), TOBN(0xf792f804, 0xf8a82f21),
-     TOBN(0x509d4804, 0xa9b46402), TOBN(0xedddf85d, 0xc10f0850),
-     TOBN(0x928410dc, 0x4b6208aa), TOBN(0xf6229c46, 0x391012dc),
-     TOBN(0xc5a7c41e, 0x7727b9b6), TOBN(0x289e4e4b, 0xaa444842),
-     TOBN(0x049ba1d9, 0xe9a947ea), TOBN(0x44f9e47f, 0x83c8debc),
-     TOBN(0xfa77a1fe, 0x611f8b8e), TOBN(0xfd2e416a, 0xf518f427),
-     TOBN(0xc5fffa70, 0x114ebac3), TOBN(0xfe57c4e9, 0x5d89697b),
-     TOBN(0xfdd053ac, 0xb1aaf613), TOBN(0x31df210f, 0xea585a45),
-     TOBN(0x318cc10e, 0x24985034), TOBN(0x1a38efd1, 0x5f1d6130),
-     TOBN(0xbf86f237, 0x0b1e9e21), TOBN(0xb258514d, 0x1dbe88aa),
-     TOBN(0x1e38a588, 0x90c1baf9), TOBN(0x2936a01e, 0xbdb9b692),
-     TOBN(0xd576de98, 0x6dd5b20c), TOBN(0xb586bf71, 0x70f98ecf),
-     TOBN(0xcccf0f12, 0xc42d2fd7), TOBN(0x8717e61c, 0xfb35bd7b),
-     TOBN(0x8b1e5722, 0x35e6fc06), TOBN(0x3477728f, 0x0b3e13d5),
-     TOBN(0x150c294d, 0xaa8a7372), TOBN(0xc0291d43, 0x3bfa528a),
-     TOBN(0xc6c8bc67, 0xcec5a196), TOBN(0xdeeb31e4, 0x5c2e8a7c),
-     TOBN(0xba93e244, 0xfb6e1c51), TOBN(0xb9f8b71b, 0x2e28e156),
-     TOBN(0xce65a287, 0x968a2ab9), TOBN(0xe3c5ce69, 0x46bbcb1f),
-     TOBN(0xf8c835b9, 0xe7ae3f30), TOBN(0x16bbee26, 0xff72b82b),
-     TOBN(0x665e2017, 0xfd42cd22), TOBN(0x1e139970, 0xf8b1d2a0),
-     TOBN(0x125cda29, 0x79204932), TOBN(0x7aee94a5, 0x49c3bee5),
-     TOBN(0x68c70160, 0x89821a66), TOBN(0xf7c37678, 0x8f981669),
-     TOBN(0xd90829fc, 0x48cc3645), TOBN(0x346af049, 0xd70addfc),
-     TOBN(0x2057b232, 0x370bf29c), TOBN(0xf90c73ce, 0x42e650ee),
-     TOBN(0xe03386ea, 0xa126ab90), TOBN(0x0e266e7e, 0x975a087b),
-     TOBN(0x80578eb9, 0x0fca65d9), TOBN(0x7e2989ea, 0x16af45b8),
-     TOBN(0x7438212d, 0xcac75a4e), TOBN(0x38c7ca39, 0x4fef36b8),
-     TOBN(0x8650c494, 0xd402676a), TOBN(0x26ab5a66, 0xf72c7c48),
-     TOBN(0x4e6cb426, 0xce3a464e), TOBN(0xf8f99896, 0x2b72f841),
-     TOBN(0x8c318491, 0x1a335cc8), TOBN(0x563459ba, 0x6a5913e4),
-     TOBN(0x1b920d61, 0xc7b32919), TOBN(0x805ab8b6, 0xa02425ad),
-     TOBN(0x2ac512da, 0x8d006086), TOBN(0x6ca4846a, 0xbcf5c0fd),
-     TOBN(0xafea51d8, 0xac2138d7), TOBN(0xcb647545, 0x344cd443),
-     TOBN(0x0429ee8f, 0xbd7d9040), TOBN(0xee66a2de, 0x819b9c96),
-     TOBN(0x54f9ec25, 0xdea7d744), TOBN(0x2ffea642, 0x671721bb),
-     TOBN(0x4f19dbd1, 0x114344ea), TOBN(0x04304536, 0xfd0dbc8b),
-     TOBN(0x014b50aa, 0x29ec7f91), TOBN(0xb5fc22fe, 0xbb06014d),
-     TOBN(0x60d963a9, 0x1ee682e0), TOBN(0xdf48abc0, 0xfe85c727),
-     TOBN(0x0cadba13, 0x2e707c2d), TOBN(0xde608d3a, 0xa645aeff),
-     TOBN(0x05f1c28b, 0xedafd883), TOBN(0x3c362ede, 0xbd94de1f),
-     TOBN(0x8dd0629d, 0x13593e41), TOBN(0x0a5e736f, 0x766d6eaf),
-     TOBN(0xbfa92311, 0xf68cf9d1), TOBN(0xa4f9ef87, 0xc1797556),
-     TOBN(0x10d75a1f, 0x5601c209), TOBN(0x651c374c, 0x09b07361),
-     TOBN(0x49950b58, 0x88b5cead), TOBN(0x0ef00058, 0x6fa9dbaa),
-     TOBN(0xf51ddc26, 0x4e15f33a), TOBN(0x1f8b5ca6, 0x2ef46140),
-     TOBN(0x343ac0a3, 0xee9523f0), TOBN(0xbb75eab2, 0x975ea978),
-     TOBN(0x1bccf332, 0x107387f4), TOBN(0x790f9259, 0x9ab0062e),
-     TOBN(0xf1a363ad, 0x1e4f6a5f), TOBN(0x06e08b84, 0x62519a50),
-     TOBN(0x60915187, 0x7265f1ee), TOBN(0x6a80ca34, 0x93ae985e),
-     TOBN(0x81b29768, 0xaaba4864), TOBN(0xb13cabf2, 0x8d52a7d6),
-     TOBN(0xb5c36348, 0x8ead03f1), TOBN(0xc932ad95, 0x81c7c1c0),
-     TOBN(0x5452708e, 0xcae1e27b), TOBN(0x9dac4269, 0x1b0df648),
-     TOBN(0x233e3f0c, 0xdfcdb8bc), TOBN(0xe6ceccdf, 0xec540174),
-     TOBN(0xbd0d845e, 0x95081181), TOBN(0xcc8a7920, 0x699355d5),
-     TOBN(0x111c0f6d, 0xc3b375a8), TOBN(0xfd95bc6b, 0xfd51e0dc),
-     TOBN(0x4a106a26, 0x6888523a), TOBN(0x4d142bd6, 0xcb01a06d),
-     TOBN(0x79bfd289, 0xadb9b397), TOBN(0x0bdbfb94, 0xe9863914),
-     TOBN(0x29d8a229, 0x1660f6a6), TOBN(0x7f6abcd6, 0x551c042d),
-     TOBN(0x13039deb, 0x0ac3ffe8), TOBN(0xa01be628, 0xec8523fb),
-     TOBN(0x6ea34103, 0x0ca1c328), TOBN(0xc74114bd, 0xb903928e),
-     TOBN(0x8aa4ff4e, 0x9e9144b0), TOBN(0x7064091f, 0x7f9a4b17),
-     TOBN(0xa3f4f521, 0xe447f2c4), TOBN(0x81b8da7a, 0x604291f0),
-     TOBN(0xd680bc46, 0x7d5926de), TOBN(0x84f21fd5, 0x34a1202f),
-     TOBN(0x1d1e3181, 0x4e9df3d8), TOBN(0x1ca4861a, 0x39ab8d34),
-     TOBN(0x809ddeec, 0x5b19aa4a), TOBN(0x59f72f7e, 0x4d329366),
-     TOBN(0xa2f93f41, 0x386d5087), TOBN(0x40bf739c, 0xdd67d64f),
-     TOBN(0xb4494205, 0x66702158), TOBN(0xc33c65be, 0x73b1e178),
-     TOBN(0xcdcd657c, 0x38ca6153), TOBN(0x97f4519a, 0xdc791976),
-     TOBN(0xcc7c7f29, 0xcd6e1f39), TOBN(0x38de9cfb, 0x7e3c3932),
-     TOBN(0xe448eba3, 0x7b793f85), TOBN(0xe9f8dbf9, 0xf067e914),
-     TOBN(0xc0390266, 0xf114ae87), TOBN(0x39ed75a7, 0xcd6a8e2a),
-     TOBN(0xadb14848, 0x7ffba390), TOBN(0x67f8cb8b, 0x6af9bc09),
-     TOBN(0x322c3848, 0x9c7476db), TOBN(0xa320fecf, 0x52a538d6),
-     TOBN(0xe0493002, 0xb2aced2b), TOBN(0xdfba1809, 0x616bd430),
-     TOBN(0x531c4644, 0xc331be70), TOBN(0xbc04d32e, 0x90d2e450),
-     TOBN(0x1805a0d1, 0x0f9f142d), TOBN(0x2c44a0c5, 0x47ee5a23),
-     TOBN(0x31875a43, 0x3989b4e3), TOBN(0x6b1949fd, 0x0c063481),
-     TOBN(0x2dfb9e08, 0xbe0f4492), TOBN(0x3ff0da03, 0xe9d5e517),
-     TOBN(0x03dbe9a1, 0xf79466a8), TOBN(0x0b87bcd0, 0x15ea9932),
-     TOBN(0xeb64fc83, 0xab1f58ab), TOBN(0x6d9598da, 0x817edc8a),
-     TOBN(0x699cff66, 0x1d3b67e5), TOBN(0x645c0f29, 0x92635853),
-     TOBN(0x253cdd82, 0xeabaf21c), TOBN(0x82b9602a, 0x2241659e),
-     TOBN(0x2cae07ec, 0x2d9f7091), TOBN(0xbe4c720c, 0x8b48cd9b),
-     TOBN(0x6ce5bc03, 0x6f08d6c9), TOBN(0x36e8a997, 0xaf10bf40),
-     TOBN(0x83422d21, 0x3e10ff12), TOBN(0x7b26d3eb, 0xbcc12494),
-     TOBN(0xb240d2d0, 0xc9469ad6), TOBN(0xc4a11b4d, 0x30afa05b),
-     TOBN(0x4b604ace, 0xdd6ba286), TOBN(0x18486600, 0x3ee2864c),
-     TOBN(0x5869d6ba, 0x8d9ce5be), TOBN(0x0d8f68c5, 0xff4bfb0d),
-     TOBN(0xb69f210b, 0x5700cf73), TOBN(0x61f6653a, 0x6d37c135),
-     TOBN(0xff3d432b, 0x5aff5a48), TOBN(0x0d81c4b9, 0x72ba3a69),
-     TOBN(0xee879ae9, 0xfa1899ef), TOBN(0xbac7e2a0, 0x2d6acafd),
-     TOBN(0xd6d93f6c, 0x1c664399), TOBN(0x4c288de1, 0x5bcb135d),
-     TOBN(0x83031dab, 0x9dab7cbf), TOBN(0xfe23feb0, 0x3abbf5f0),
-     TOBN(0x9f1b2466, 0xcdedca85), TOBN(0x140bb710, 0x1a09538c),
-     TOBN(0xac8ae851, 0x5e11115d), TOBN(0x0d63ff67, 0x6f03f59e),
-     TOBN(0x755e5551, 0x7d234afb), TOBN(0x61c2db4e, 0x7e208fc1),
-     TOBN(0xaa9859ce, 0xf28a4b5d), TOBN(0xbdd6d4fc, 0x34af030f),
-     TOBN(0xd1c4a26d, 0x3be01cb1), TOBN(0x9ba14ffc, 0x243aa07c),
-     TOBN(0xf95cd3a9, 0xb2503502), TOBN(0xe379bc06, 0x7d2a93ab),
-     TOBN(0x3efc18e9, 0xd4ca8d68), TOBN(0x083558ec, 0x80bb412a),
-     TOBN(0xd903b940, 0x9645a968), TOBN(0xa499f0b6, 0x9ba6054f),
-     TOBN(0x208b573c, 0xb8349abe), TOBN(0x3baab3e5, 0x30b4fc1c),
-     TOBN(0x87e978ba, 0xcb524990), TOBN(0x3524194e, 0xccdf0e80),
-     TOBN(0x62711725, 0x7d4bcc42), TOBN(0xe90a3d9b, 0xb90109ba),
-     TOBN(0x3b1bdd57, 0x1323e1e0), TOBN(0xb78e9bd5, 0x5eae1599),
-     TOBN(0x0794b746, 0x9e03d278), TOBN(0x80178605, 0xd70e6297),
-     TOBN(0x171792f8, 0x99c97855), TOBN(0x11b393ee, 0xf5a86b5c),
-     TOBN(0x48ef6582, 0xd8884f27), TOBN(0xbd44737a, 0xbf19ba5f),
-     TOBN(0x8698de4c, 0xa42062c6), TOBN(0x8975eb80, 0x61ce9c54),
-     TOBN(0xd50e57c7, 0xd7fe71f3), TOBN(0x15342190, 0xbc97ce38),
-     TOBN(0x51bda2de, 0x4df07b63), TOBN(0xba12aeae, 0x200eb87d),
-     TOBN(0xabe135d2, 0xa9b4f8f6), TOBN(0x04619d65, 0xfad6d99c),
-     TOBN(0x4a6683a7, 0x7994937c), TOBN(0x7a778c8b, 0x6f94f09a),
-     TOBN(0x8c508623, 0x20a71b89), TOBN(0x241a2aed, 0x1c229165),
-     TOBN(0x352be595, 0xaaf83a99), TOBN(0x9fbfee7f, 0x1562bac8),
-     TOBN(0xeaf658b9, 0x5c4017e3), TOBN(0x1dc7f9e0, 0x15120b86),
-     TOBN(0xd84f13dd, 0x4c034d6f), TOBN(0x283dd737, 0xeaea3038),
-     TOBN(0x197f2609, 0xcd85d6a2), TOBN(0x6ebbc345, 0xfae60177),
-     TOBN(0xb80f031b, 0x4e12fede), TOBN(0xde55d0c2, 0x07a2186b),
-     TOBN(0x1fb3e37f, 0x24dcdd5a), TOBN(0x8d602da5, 0x7ed191fb),
-     TOBN(0x108fb056, 0x76023e0d), TOBN(0x70178c71, 0x459c20c0),
-     TOBN(0xfad5a386, 0x3fe54cf0), TOBN(0xa4a3ec4f, 0x02bbb475),
-     TOBN(0x1aa5ec20, 0x919d94d7), TOBN(0x5d3b63b5, 0xa81e4ab3),
-     TOBN(0x7fa733d8, 0x5ad3d2af), TOBN(0xfbc586dd, 0xd1ac7a37),
-     TOBN(0x282925de, 0x40779614), TOBN(0xfe0ffffb, 0xe74a242a),
-     TOBN(0x3f39e67f, 0x906151e5), TOBN(0xcea27f5f, 0x55e10649),
-     TOBN(0xdca1d4e1, 0xc17cf7b7), TOBN(0x0c326d12, 0x2fe2362d),
-     TOBN(0x05f7ac33, 0x7dd35df3), TOBN(0x0c3b7639, 0xc396dbdf),
-     TOBN(0x0912f5ac, 0x03b7db1c), TOBN(0x9dea4b70, 0x5c9ed4a9),
-     TOBN(0x475e6e53, 0xaae3f639), TOBN(0xfaba0e7c, 0xfc278bac),
-     TOBN(0x16f9e221, 0x9490375f), TOBN(0xaebf9746, 0xa5a7ed0a),
-     TOBN(0x45f9af3f, 0xf41ad5d6), TOBN(0x03c4623c, 0xb2e99224),
-     TOBN(0x82c5bb5c, 0xb3cf56aa), TOBN(0x64311819, 0x34567ed3),
-     TOBN(0xec57f211, 0x8be489ac), TOBN(0x2821895d, 0xb9a1104b),
-     TOBN(0x610dc875, 0x6064e007), TOBN(0x8e526f3f, 0x5b20d0fe),
-     TOBN(0x6e71ca77, 0x5b645aee), TOBN(0x3d1dcb9f, 0x800e10ff),
-     TOBN(0x36b51162, 0x189cf6de), TOBN(0x2c5a3e30, 0x6bb17353),
-     TOBN(0xc186cd3e, 0x2a6c6fbf), TOBN(0xa74516fa, 0x4bf97906),
-     TOBN(0x5b4b8f4b, 0x279d6901), TOBN(0x0c4e57b4, 0x2b573743),
-     TOBN(0x75fdb229, 0xb6e386b6), TOBN(0xb46793fd, 0x99deac27),
-     TOBN(0xeeec47ea, 0xcf712629), TOBN(0xe965f3c4, 0xcbc3b2dd),
-     TOBN(0x8dd1fb83, 0x425c6559), TOBN(0x7fc00ee6, 0x0af06fda),
-     TOBN(0xe98c9225, 0x33d956df), TOBN(0x0f1ef335, 0x4fbdc8a2),
-     TOBN(0x2abb5145, 0xb79b8ea2), TOBN(0x40fd2945, 0xbdbff288),
-     TOBN(0x6a814ac4, 0xd7185db7), TOBN(0xc4329d6f, 0xc084609a),
-     TOBN(0xc9ba7b52, 0xed1be45d), TOBN(0x891dd20d, 0xe4cd2c74),
-     TOBN(0x5a4d4a7f, 0x824139b1), TOBN(0x66c17716, 0xb873c710),
-     TOBN(0x5e5bc141, 0x2843c4e0), TOBN(0xd5ac4817, 0xb97eb5bf),
-     TOBN(0xc0f8af54, 0x450c95c7), TOBN(0xc91b3fa0, 0x318406c5),
-     TOBN(0x360c340a, 0xab9d97f8), TOBN(0xfb57bd07, 0x90a2d611),
-     TOBN(0x4339ae3c, 0xa6a6f7e5), TOBN(0x9c1fcd2a, 0x2feb8a10),
-     TOBN(0x972bcca9, 0xc7ea7432), TOBN(0x1b0b924c, 0x308076f6),
-     TOBN(0x80b2814a, 0x2a5b4ca5), TOBN(0x2f78f55b, 0x61ef3b29),
-     TOBN(0xf838744a, 0xc18a414f), TOBN(0xc611eaae, 0x903d0a86),
-     TOBN(0x94dabc16, 0x2a453f55), TOBN(0xe6f2e3da, 0x14efb279),
-     TOBN(0x5b7a6017, 0x9320dc3c), TOBN(0x692e382f, 0x8df6b5a4),
-     TOBN(0x3f5e15e0, 0x2d40fa90), TOBN(0xc87883ae, 0x643dd318),
-     TOBN(0x511053e4, 0x53544774), TOBN(0x834d0ecc, 0x3adba2bc),
-     TOBN(0x4215d7f7, 0xbae371f5), TOBN(0xfcfd57bf, 0x6c8663bc),
-     TOBN(0xded2383d, 0xd6901b1d), TOBN(0x3b49fbb4, 0xb5587dc3),
-     TOBN(0xfd44a08d, 0x07625f62), TOBN(0x3ee4d65b, 0x9de9b762),}
-    ,
-    {TOBN(0x64e5137d, 0x0d63d1fa), TOBN(0x658fc052, 0x02a9d89f),
-     TOBN(0x48894874, 0x50436309), TOBN(0xe9ae30f8, 0xd598da61),
-     TOBN(0x2ed710d1, 0x818baf91), TOBN(0xe27e9e06, 0x8b6a0c20),
-     TOBN(0x1e28dcfb, 0x1c1a6b44), TOBN(0x883acb64, 0xd6ac57dc),
-     TOBN(0x8735728d, 0xc2c6ff70), TOBN(0x79d6122f, 0xc5dc2235),
-     TOBN(0x23f5d003, 0x19e277f9), TOBN(0x7ee84e25, 0xdded8cc7),
-     TOBN(0x91a8afb0, 0x63cd880a), TOBN(0x3f3ea7c6, 0x3574af60),
-     TOBN(0x0cfcdc84, 0x02de7f42), TOBN(0x62d0792f, 0xb31aa152),
-     TOBN(0x8e1b4e43, 0x8a5807ce), TOBN(0xad283893, 0xe4109a7e),
-     TOBN(0xc30cc9cb, 0xafd59dda), TOBN(0xf65f36c6, 0x3d8d8093),
-     TOBN(0xdf31469e, 0xa60d32b2), TOBN(0xee93df4b, 0x3e8191c8),
-     TOBN(0x9c1017c5, 0x355bdeb5), TOBN(0xd2623185, 0x8616aa28),
-     TOBN(0xb02c83f9, 0xdec31a21), TOBN(0x988c8b23, 0x6ad9d573),
-     TOBN(0x53e983ae, 0xa57be365), TOBN(0xe968734d, 0x646f834e),
-     TOBN(0x9137ea8f, 0x5da6309b), TOBN(0x10f3a624, 0xc1f1ce16),
-     TOBN(0x782a9ea2, 0xca440921), TOBN(0xdf94739e, 0x5b46f1b5),
-     TOBN(0x9f9be006, 0xcce85c9b), TOBN(0x360e70d6, 0xa4c7c2d3),
-     TOBN(0x2cd5beea, 0xaefa1e60), TOBN(0x64cf63c0, 0x8c3d2b6d),
-     TOBN(0xfb107fa3, 0xe1cf6f90), TOBN(0xb7e937c6, 0xd5e044e6),
-     TOBN(0x74e8ca78, 0xce34db9f), TOBN(0x4f8b36c1, 0x3e210bd0),
-     TOBN(0x1df165a4, 0x34a35ea8), TOBN(0x3418e0f7, 0x4d4412f6),
-     TOBN(0x5af1f8af, 0x518836c3), TOBN(0x42ceef4d, 0x130e1965),
-     TOBN(0x5560ca0b, 0x543a1957), TOBN(0xc33761e5, 0x886cb123),
-     TOBN(0x66624b1f, 0xfe98ed30), TOBN(0xf772f4bf, 0x1090997d),
-     TOBN(0xf4e540bb, 0x4885d410), TOBN(0x7287f810, 0x9ba5f8d7),
-     TOBN(0x22d0d865, 0xde98dfb1), TOBN(0x49ff51a1, 0xbcfbb8a3),
-     TOBN(0xb6b6fa53, 0x6bc3012e), TOBN(0x3d31fd72, 0x170d541d),
-     TOBN(0x8018724f, 0x4b0f4966), TOBN(0x79e7399f, 0x87dbde07),
-     TOBN(0x56f8410e, 0xf4f8b16a), TOBN(0x97241afe, 0xc47b266a),
-     TOBN(0x0a406b8e, 0x6d9c87c1), TOBN(0x803f3e02, 0xcd42ab1b),
-     TOBN(0x7f0309a8, 0x04dbec69), TOBN(0xa83b85f7, 0x3bbad05f),
-     TOBN(0xc6097273, 0xad8e197f), TOBN(0xc097440e, 0x5067adc1),
-     TOBN(0x730eafb6, 0x3524ff16), TOBN(0xd7f9b51e, 0x823fc6ce),
-     TOBN(0x27bd0d32, 0x443e4ac0), TOBN(0x40c59ad9, 0x4d66f217),
-     TOBN(0x6c33136f, 0x17c387a4), TOBN(0x5043b8d5, 0xeb86804d),
-     TOBN(0x74970312, 0x675a73c9), TOBN(0x838fdb31, 0xf16669b6),
-     TOBN(0xc507b6dd, 0x418e7ddd), TOBN(0x39888d93, 0x472f19d6),
-     TOBN(0x7eae26be, 0x0c27eb4d), TOBN(0x17b53ed3, 0xfbabb884),
-     TOBN(0xfc27021b, 0x2b01ae4f), TOBN(0x88462e87, 0xcf488682),
-     TOBN(0xbee096ec, 0x215e2d87), TOBN(0xeb2fea9a, 0xd242e29b),
-     TOBN(0x5d985b5f, 0xb821fc28), TOBN(0x89d2e197, 0xdc1e2ad2),
-     TOBN(0x55b566b8, 0x9030ba62), TOBN(0xe3fd41b5, 0x4f41b1c6),
-     TOBN(0xb738ac2e, 0xb9a96d61), TOBN(0x7f8567ca, 0x369443f4),
-     TOBN(0x8698622d, 0xf803a440), TOBN(0x2b586236, 0x8fe2f4dc),
-     TOBN(0xbbcc00c7, 0x56b95bce), TOBN(0x5ec03906, 0x616da680),
-     TOBN(0x79162ee6, 0x72214252), TOBN(0x43132b63, 0x86a892d2),
-     TOBN(0x4bdd3ff2, 0x2f3263bf), TOBN(0xd5b3733c, 0x9cd0a142),
-     TOBN(0x592eaa82, 0x44415ccb), TOBN(0x663e8924, 0x8d5474ea),
-     TOBN(0x8058a25e, 0x5236344e), TOBN(0x82e8df9d, 0xbda76ee6),
-     TOBN(0xdcf6efd8, 0x11cc3d22), TOBN(0x00089cda, 0x3b4ab529),
-     TOBN(0x91d3a071, 0xbd38a3db), TOBN(0x4ea97fc0, 0xef72b925),
-     TOBN(0x0c9fc15b, 0xea3edf75), TOBN(0x5a6297cd, 0xa4348ed3),
-     TOBN(0x0d38ab35, 0xce7c42d4), TOBN(0x9fd493ef, 0x82feab10),
-     TOBN(0x46056b6d, 0x82111b45), TOBN(0xda11dae1, 0x73efc5c3),
-     TOBN(0xdc740278, 0x5545a7fb), TOBN(0xbdb2601c, 0x40d507e6),
-     TOBN(0x121dfeeb, 0x7066fa58), TOBN(0x214369a8, 0x39ae8c2a),
-     TOBN(0x195709cb, 0x06e0956c), TOBN(0x4c9d254f, 0x010cd34b),
-     TOBN(0xf51e13f7, 0x0471a532), TOBN(0xe19d6791, 0x1e73054d),
-     TOBN(0xf702a628, 0xdb5c7be3), TOBN(0xc7141218, 0xb24dde05),
-     TOBN(0xdc18233c, 0xf29b2e2e), TOBN(0x3a6bd1e8, 0x85342dba),
-     TOBN(0x3f747fa0, 0xb311898c), TOBN(0xe2a272e4, 0xcd0eac65),
-     TOBN(0x4bba5851, 0xf914d0bc), TOBN(0x7a1a9660, 0xc4a43ee3),
-     TOBN(0xe5a367ce, 0xa1c8cde9), TOBN(0x9d958ba9, 0x7271abe3),
-     TOBN(0xf3ff7eb6, 0x3d1615cd), TOBN(0xa2280dce, 0xf5ae20b0),
-     TOBN(0x56dba5c1, 0xcf640147), TOBN(0xea5a2e3d, 0x5e83d118),
-     TOBN(0x04cd6b6d, 0xda24c511), TOBN(0x1c0f4671, 0xe854d214),
-     TOBN(0x91a6b7a9, 0x69565381), TOBN(0xdc966240, 0xdecf1f5b),
-     TOBN(0x1b22d21c, 0xfcf5d009), TOBN(0x2a05f641, 0x9021dbd5),
-     TOBN(0x8c0ed566, 0xd4312483), TOBN(0x5179a95d, 0x643e216f),
-     TOBN(0xcc185fec, 0x17044493), TOBN(0xb3063339, 0x54991a21),
-     TOBN(0xd801ecdb, 0x0081a726), TOBN(0x0149b0c6, 0x4fa89bbb),
-     TOBN(0xafe9065a, 0x4391b6b9), TOBN(0xedc92786, 0xd633f3a3),
-     TOBN(0xe408c24a, 0xae6a8e13), TOBN(0x85833fde, 0x9f3897ab),
-     TOBN(0x43800e7e, 0xd81a0715), TOBN(0xde08e346, 0xb44ffc5f),
-     TOBN(0x7094184c, 0xcdeff2e0), TOBN(0x49f9387b, 0x165eaed1),
-     TOBN(0x635d6129, 0x777c468a), TOBN(0x8c0dcfd1, 0x538c2dd8),
-     TOBN(0xd6d9d9e3, 0x7a6a308b), TOBN(0x62375830, 0x4c2767d3),
-     TOBN(0x874a8bc6, 0xf38cbeb6), TOBN(0xd94d3f1a, 0xccb6fd9e),
-     TOBN(0x92a9735b, 0xba21f248), TOBN(0x272ad0e5, 0x6cd1efb0),
-     TOBN(0x7437b69c, 0x05b03284), TOBN(0xe7f04702, 0x6948c225),
-     TOBN(0x8a56c04a, 0xcba2ecec), TOBN(0x0c181270, 0xe3a73e41),
-     TOBN(0x6cb34e9d, 0x03e93725), TOBN(0xf77c8713, 0x496521a9),
-     TOBN(0x94569183, 0xfa7f9f90), TOBN(0xf2e7aa4c, 0x8c9707ad),
-     TOBN(0xced2c9ba, 0x26c1c9a3), TOBN(0x9109fe96, 0x40197507),
-     TOBN(0x9ae868a9, 0xe9adfe1c), TOBN(0x3984403d, 0x314e39bb),
-     TOBN(0xb5875720, 0xf2fe378f), TOBN(0x33f901e0, 0xba44a628),
-     TOBN(0xea1125fe, 0x3652438c), TOBN(0xae9ec4e6, 0x9dd1f20b),
-     TOBN(0x1e740d9e, 0xbebf7fbd), TOBN(0x6dbd3ddc, 0x42dbe79c),
-     TOBN(0x62082aec, 0xedd36776), TOBN(0xf612c478, 0xe9859039),
-     TOBN(0xa493b201, 0x032f7065), TOBN(0xebd4d8f2, 0x4ff9b211),
-     TOBN(0x3f23a0aa, 0xaac4cb32), TOBN(0xea3aadb7, 0x15ed4005),
-     TOBN(0xacf17ea4, 0xafa27e63), TOBN(0x56125c1a, 0xc11fd66c),
-     TOBN(0x266344a4, 0x3794f8dc), TOBN(0xdcca923a, 0x483c5c36),
-     TOBN(0x2d6b6bbf, 0x3f9d10a0), TOBN(0xb320c5ca, 0x81d9bdf3),
-     TOBN(0x620e28ff, 0x47b50a95), TOBN(0x933e3b01, 0xcef03371),
-     TOBN(0xf081bf85, 0x99100153), TOBN(0x183be9a0, 0xc3a8c8d6),
-     TOBN(0x4e3ddc5a, 0xd6bbe24d), TOBN(0xc6c74630, 0x53843795),
-     TOBN(0x78193dd7, 0x65ec2d4c), TOBN(0xb8df26cc, 0xcd3c89b2),
-     TOBN(0x98dbe399, 0x5a483f8d), TOBN(0x72d8a957, 0x7dd3313a),
-     TOBN(0x65087294, 0xab0bd375), TOBN(0xfcd89248, 0x7c259d16),
-     TOBN(0x8a9443d7, 0x7613aa81), TOBN(0x80100800, 0x85fe6584),
-     TOBN(0x70fc4dbc, 0x7fb10288), TOBN(0xf58280d3, 0xe86beee8),
-     TOBN(0x14fdd82f, 0x7c978c38), TOBN(0xdf1204c1, 0x0de44d7b),
-     TOBN(0xa08a1c84, 0x4160252f), TOBN(0x591554ca, 0xc17646a5),
-     TOBN(0x214a37d6, 0xa05bd525), TOBN(0x48d5f09b, 0x07957b3c),
-     TOBN(0x0247cdcb, 0xd7109bc9), TOBN(0x40f9e4bb, 0x30599ce7),
-     TOBN(0xc325fa03, 0xf46ad2ec), TOBN(0x00f766cf, 0xc3e3f9ee),
-     TOBN(0xab556668, 0xd43a4577), TOBN(0x68d30a61, 0x3ee03b93),
-     TOBN(0x7ddc81ea, 0x77b46a08), TOBN(0xcf5a6477, 0xc7480699),
-     TOBN(0x43a8cb34, 0x6633f683), TOBN(0x1b867e6b, 0x92363c60),
-     TOBN(0x43921114, 0x1f60558e), TOBN(0xcdbcdd63, 0x2f41450e),
-     TOBN(0x7fc04601, 0xcc630e8b), TOBN(0xea7c66d5, 0x97038b43),
-     TOBN(0x7259b8a5, 0x04e99fd8), TOBN(0x98a8dd12, 0x4785549a),
-     TOBN(0x0e459a7c, 0x840552e1), TOBN(0xcdfcf4d0, 0x4bb0909e),
-     TOBN(0x34a86db2, 0x53758da7), TOBN(0xe643bb83, 0xeac997e1),
-     TOBN(0x96400bd7, 0x530c5b7e), TOBN(0x9f97af87, 0xb41c8b52),
-     TOBN(0x34fc8820, 0xfbeee3f9), TOBN(0x93e53490, 0x49091afd),
-     TOBN(0x764b9be5, 0x9a31f35c), TOBN(0x71f37864, 0x57e3d924),
-     TOBN(0x02fb34e0, 0x943aa75e), TOBN(0xa18c9c58, 0xab8ff6e4),
-     TOBN(0x080f31b1, 0x33cf0d19), TOBN(0x5c9682db, 0x083518a7),
-     TOBN(0x873d4ca6, 0xb709c3de), TOBN(0x64a84262, 0x3575b8f0),
-     TOBN(0x6275da1f, 0x020154bb), TOBN(0x97678caa, 0xd17cf1ab),
-     TOBN(0x8779795f, 0x951a95c3), TOBN(0xdd35b163, 0x50fccc08),
-     TOBN(0x32709627, 0x33d8f031), TOBN(0x3c5ab10a, 0x498dd85c),
-     TOBN(0xb6c185c3, 0x41dca566), TOBN(0x7de7feda, 0xd8622aa3),
-     TOBN(0x99e84d92, 0x901b6dfb), TOBN(0x30a02b0e, 0x7c4ad288),
-     TOBN(0xc7c81daa, 0x2fd3cf36), TOBN(0xd1319547, 0xdf89e59f),
-     TOBN(0xb2be8184, 0xcd496733), TOBN(0xd5f449eb, 0x93d3412b),
-     TOBN(0x7ea41b1b, 0x25fe531d), TOBN(0xf9797432, 0x6a1d5646),
-     TOBN(0x86067f72, 0x2bde501a), TOBN(0xf91481c0, 0x0c85e89c),
-     TOBN(0xca8ee465, 0xf8b05bc6), TOBN(0x1844e1cf, 0x02e83cda),
-     TOBN(0xca82114a, 0xb4dbe33b), TOBN(0x0f9f8769, 0x4eabfde2),
-     TOBN(0x4936b1c0, 0x38b27fe2), TOBN(0x63b6359b, 0xaba402df),
-     TOBN(0x40c0ea2f, 0x656bdbab), TOBN(0x9c992a89, 0x6580c39c),
-     TOBN(0x600e8f15, 0x2a60aed1), TOBN(0xeb089ca4, 0xe0bf49df),
-     TOBN(0x9c233d7d, 0x2d42d99a), TOBN(0x648d3f95, 0x4c6bc2fa),
-     TOBN(0xdcc383a8, 0xe1add3f3), TOBN(0xf42c0c6a, 0x4f64a348),
-     TOBN(0x2abd176f, 0x0030dbdb), TOBN(0x4de501a3, 0x7d6c215e),
-     TOBN(0x4a107c1f, 0x4b9a64bc), TOBN(0xa77f0ad3, 0x2496cd59),
-     TOBN(0xfb78ac62, 0x7688dffb), TOBN(0x7025a2ca, 0x67937d8e),
-     TOBN(0xfde8b2d1, 0xd1a8f4e7), TOBN(0xf5b3da47, 0x7354927c),
-     TOBN(0xe48606a3, 0xd9205735), TOBN(0xac477cc6, 0xe177b917),
-     TOBN(0xfb1f73d2, 0xa883239a), TOBN(0xe12572f6, 0xcc8b8357),
-     TOBN(0x9d355e9c, 0xfb1f4f86), TOBN(0x89b795f8, 0xd9f3ec6e),
-     TOBN(0x27be56f1, 0xb54398dc), TOBN(0x1890efd7, 0x3fedeed5),
-     TOBN(0x62f77f1f, 0x9c6d0140), TOBN(0x7ef0e314, 0x596f0ee4),
-     TOBN(0x50ca6631, 0xcc61dab3), TOBN(0x4a39801d, 0xf4866e4f),
-     TOBN(0x66c8d032, 0xae363b39), TOBN(0x22c591e5, 0x2ead66aa),
-     TOBN(0x954ba308, 0xde02a53e), TOBN(0x2a6c060f, 0xd389f357),
-     TOBN(0xe6cfcde8, 0xfbf40b66), TOBN(0x8e02fc56, 0xc6340ce1),
-     TOBN(0xe4957795, 0x73adb4ba), TOBN(0x7b86122c, 0xa7b03805),
-     TOBN(0x63f83512, 0x0c8e6fa6), TOBN(0x83660ea0, 0x057d7804),
-     TOBN(0xbad79105, 0x21ba473c), TOBN(0xb6c50bee, 0xded5389d),
-     TOBN(0xee2caf4d, 0xaa7c9bc0), TOBN(0xd97b8de4, 0x8c4e98a7),
-     TOBN(0xa9f63e70, 0xab3bbddb), TOBN(0x3898aabf, 0x2597815a),
-     TOBN(0x7659af89, 0xac15b3d9), TOBN(0xedf7725b, 0x703ce784),
-     TOBN(0x25470fab, 0xe085116b), TOBN(0x04a43375, 0x87285310),
-     TOBN(0x4e39187e, 0xe2bfd52f), TOBN(0x36166b44, 0x7d9ebc74),
-     TOBN(0x92ad433c, 0xfd4b322c), TOBN(0x726aa817, 0xba79ab51),
-     TOBN(0xf96eacd8, 0xc1db15eb), TOBN(0xfaf71e91, 0x0476be63),
-     TOBN(0xdd69a640, 0x641fad98), TOBN(0xb7995918, 0x29622559),
-     TOBN(0x03c6daa5, 0xde4199dc), TOBN(0x92cadc97, 0xad545eb4),
-     TOBN(0x1028238b, 0x256534e4), TOBN(0x73e80ce6, 0x8595409a),
-     TOBN(0x690d4c66, 0xd05dc59b), TOBN(0xc95f7b8f, 0x981dee80),
-     TOBN(0xf4337014, 0xd856ac25), TOBN(0x441bd9dd, 0xac524dca),
-     TOBN(0x640b3d85, 0x5f0499f5), TOBN(0x39cf84a9, 0xd5fda182),
-     TOBN(0x04e7b055, 0xb2aa95a0), TOBN(0x29e33f0a, 0x0ddf1860),
-     TOBN(0x082e74b5, 0x423f6b43), TOBN(0x217edeb9, 0x0aaa2b0f),
-     TOBN(0x58b83f35, 0x83cbea55), TOBN(0xc485ee4d, 0xbc185d70),
-     TOBN(0x833ff03b, 0x1e5f6992), TOBN(0xb5b9b9cc, 0xcf0c0dd5),
-     TOBN(0x7caaee8e, 0x4e9e8a50), TOBN(0x462e907b, 0x6269dafd),
-     TOBN(0x6ed5cee9, 0xfbe791c6), TOBN(0x68ca3259, 0xed430790),
-     TOBN(0x2b72bdf2, 0x13b5ba88), TOBN(0x60294c8a, 0x35ef0ac4),
-     TOBN(0x9c3230ed, 0x19b99b08), TOBN(0x560fff17, 0x6c2589aa),
-     TOBN(0x552b8487, 0xd6770374), TOBN(0xa373202d, 0x9a56f685),
-     TOBN(0xd3e7f907, 0x45f175d9), TOBN(0x3c2f315f, 0xd080d810),
-     TOBN(0x1130e9dd, 0x7b9520e8), TOBN(0xc078f9e2, 0x0af037b5),
-     TOBN(0x38cd2ec7, 0x1e9c104c), TOBN(0x0f684368, 0xc472fe92),
-     TOBN(0xd3f1b5ed, 0x6247e7ef), TOBN(0xb32d33a9, 0x396dfe21),
-     TOBN(0x46f59cf4, 0x4a9aa2c2), TOBN(0x69cd5168, 0xff0f7e41),
-     TOBN(0x3f59da0f, 0x4b3234da), TOBN(0xcf0b0235, 0xb4579ebe),
-     TOBN(0x6d1cbb25, 0x6d2476c7), TOBN(0x4f0837e6, 0x9dc30f08),
-     TOBN(0x9a4075bb, 0x906f6e98), TOBN(0x253bb434, 0xc761e7d1),
-     TOBN(0xde2e645f, 0x6e73af10), TOBN(0xb89a4060, 0x0c5f131c),
-     TOBN(0xd12840c5, 0xb8cc037f), TOBN(0x3d093a5b, 0x7405bb47),
-     TOBN(0x6202c253, 0x206348b8), TOBN(0xbf5d57fc, 0xc55a3ca7),
-     TOBN(0x89f6c90c, 0x8c3bef48), TOBN(0x23ac7623, 0x5a0a960a),
-     TOBN(0xdfbd3d6b, 0x552b42ab), TOBN(0x3ef22458, 0x132061f6),
-     TOBN(0xd74e9bda, 0xc97e6516), TOBN(0x88779360, 0xc230f49e),
-     TOBN(0xa6ec1de3, 0x1e74ea49), TOBN(0x581dcee5, 0x3fb645a2),
-     TOBN(0xbaef2391, 0x8f483f14), TOBN(0x6d2dddfc, 0xd137d13b),
-     TOBN(0x54cde50e, 0xd2743a42), TOBN(0x89a34fc5, 0xe4d97e67),
-     TOBN(0x13f1f5b3, 0x12e08ce5), TOBN(0xa80540b8, 0xa7f0b2ca),
-     TOBN(0x854bcf77, 0x01982805), TOBN(0xb8653ffd, 0x233bea04),
-     TOBN(0x8e7b8787, 0x02b0b4c9), TOBN(0x2675261f, 0x9acb170a),
-     TOBN(0x061a9d90, 0x930c14e5), TOBN(0xb59b30e0, 0xdef0abea),
-     TOBN(0x1dc19ea6, 0x0200ec7d), TOBN(0xb6f4a3f9, 0x0bce132b),
-     TOBN(0xb8d5de90, 0xf13e27e0), TOBN(0xbaee5ef0, 0x1fade16f),
-     TOBN(0x6f406aaa, 0xe4c6cf38), TOBN(0xab4cfe06, 0xd1369815),
-     TOBN(0x0dcffe87, 0xefd550c6), TOBN(0x9d4f59c7, 0x75ff7d39),
-     TOBN(0xb02553b1, 0x51deb6ad), TOBN(0x812399a4, 0xb1877749),
-     TOBN(0xce90f71f, 0xca6006e1), TOBN(0xc32363a6, 0xb02b6e77),
-     TOBN(0x02284fbe, 0xdc36c64d), TOBN(0x86c81e31, 0xa7e1ae61),
-     TOBN(0x2576c7e5, 0xb909d94a), TOBN(0x8b6f7d02, 0x818b2bb0),
-     TOBN(0xeca3ed07, 0x56faa38a), TOBN(0xa3790e6c, 0x9305bb54),
-     TOBN(0xd784eeda, 0x7bc73061), TOBN(0xbd56d369, 0x6dd50614),
-     TOBN(0xd6575949, 0x229a8aa9), TOBN(0xdcca8f47, 0x4595ec28),
-     TOBN(0x814305c1, 0x06ab4fe6), TOBN(0xc8c39768, 0x24f43f16),
-     TOBN(0xe2a45f36, 0x523f2b36), TOBN(0x995c6493, 0x920d93bb),
-     TOBN(0xf8afdab7, 0x90f1632b), TOBN(0x79ebbecd, 0x1c295954),
-     TOBN(0xc7bb3ddb, 0x79592f48), TOBN(0x67216a7b, 0x5f88e998),
-     TOBN(0xd91f098b, 0xbc01193e), TOBN(0xf7d928a5, 0xb1db83fc),
-     TOBN(0x55e38417, 0xe991f600), TOBN(0x2a91113e, 0x2981a934),
-     TOBN(0xcbc9d648, 0x06b13bde), TOBN(0xb011b6ac, 0x0755ff44),
-     TOBN(0x6f4cb518, 0x045ec613), TOBN(0x522d2d31, 0xc2f5930a),
-     TOBN(0x5acae1af, 0x382e65de), TOBN(0x57643067, 0x27bc966f),
-     TOBN(0x5e12705d, 0x1c7193f0), TOBN(0xf0f32f47, 0x3be8858e),
-     TOBN(0x785c3d7d, 0x96c6dfc7), TOBN(0xd75b4a20, 0xbf31795d),
-     TOBN(0x91acf17b, 0x342659d4), TOBN(0xe596ea34, 0x44f0378f),
-     TOBN(0x4515708f, 0xce52129d), TOBN(0x17387e1e, 0x79f2f585),
-     TOBN(0x72cfd2e9, 0x49dee168), TOBN(0x1ae05223, 0x3e2af239),
-     TOBN(0x009e75be, 0x1d94066a), TOBN(0x6cca31c7, 0x38abf413),
-     TOBN(0xb50bd61d, 0x9bc49908), TOBN(0x4a9b4a8c, 0xf5e2bc1e),
-     TOBN(0xeb6cc5f7, 0x946f83ac), TOBN(0x27da93fc, 0xebffab28),
-     TOBN(0xea314c96, 0x4821c8c5), TOBN(0x8de49ded, 0xa83c15f4),
-     TOBN(0x7a64cf20, 0x7af33004), TOBN(0x45f1bfeb, 0xc9627e10),
-     TOBN(0x878b0626, 0x54b9df60), TOBN(0x5e4fdc3c, 0xa95c0b33),
-     TOBN(0xe54a37ca, 0xc2035d8e), TOBN(0x9087cda9, 0x80f20b8c),
-     TOBN(0x36f61c23, 0x8319ade4), TOBN(0x766f287a, 0xde8cfdf8),
-     TOBN(0x48821948, 0x346f3705), TOBN(0x49a7b853, 0x16e4f4a2),
-     TOBN(0xb9b3f8a7, 0x5cedadfd), TOBN(0x8f562815, 0x8db2a815),
-     TOBN(0xc0b7d554, 0x01f68f95), TOBN(0x12971e27, 0x688a208e),
-     TOBN(0xc9f8b696, 0xd0ff34fc), TOBN(0x20824de2, 0x1222718c),
-     TOBN(0x7213cf9f, 0x0c95284d), TOBN(0xe2ad741b, 0xdc158240),
-     TOBN(0x0ee3a6df, 0x54043ccf), TOBN(0x16ff479b, 0xd84412b3),
-     TOBN(0xf6c74ee0, 0xdfc98af0), TOBN(0xa78a169f, 0x52fcd2fb),
-     TOBN(0xd8ae8746, 0x99c930e9), TOBN(0x1d33e858, 0x49e117a5),
-     TOBN(0x7581fcb4, 0x6624759f), TOBN(0xde50644f, 0x5bedc01d),
-     TOBN(0xbeec5d00, 0xcaf3155e), TOBN(0x672d66ac, 0xbc73e75f),
-     TOBN(0x86b9d8c6, 0x270b01db), TOBN(0xd249ef83, 0x50f55b79),
-     TOBN(0x6131d6d4, 0x73978fe3), TOBN(0xcc4e4542, 0x754b00a1),
-     TOBN(0x4e05df05, 0x57dfcfe9), TOBN(0x94b29cdd, 0x51ef6bf0),
-     TOBN(0xe4530cff, 0x9bc7edf2), TOBN(0x8ac236fd, 0xd3da65f3),
-     TOBN(0x0faf7d5f, 0xc8eb0b48), TOBN(0x4d2de14c, 0x660eb039),
-     TOBN(0xc006bba7, 0x60430e54), TOBN(0x10a2d0d6, 0xda3289ab),
-     TOBN(0x9c037a5d, 0xd7979c59), TOBN(0x04d1f3d3, 0xa116d944),
-     TOBN(0x9ff22473, 0x8a0983cd), TOBN(0x28e25b38, 0xc883cabb),
-     TOBN(0xe968dba5, 0x47a58995), TOBN(0x2c80b505, 0x774eebdf),
-     TOBN(0xee763b71, 0x4a953beb), TOBN(0x502e223f, 0x1642e7f6),
-     TOBN(0x6fe4b641, 0x61d5e722), TOBN(0x9d37c5b0, 0xdbef5316),
-     TOBN(0x0115ed70, 0xf8330bc7), TOBN(0x139850e6, 0x75a72789),
-     TOBN(0x27d7faec, 0xffceccc2), TOBN(0x3016a860, 0x4fd9f7f6),
-     TOBN(0xc492ec64, 0x4cd8f64c), TOBN(0x58a2d790, 0x279d7b51),
-     TOBN(0x0ced1fc5, 0x1fc75256), TOBN(0x3e658aed, 0x8f433017),
-     TOBN(0x0b61942e, 0x05da59eb), TOBN(0xba3d60a3, 0x0ddc3722),
-     TOBN(0x7c311cd1, 0x742e7f87), TOBN(0x6473ffee, 0xf6b01b6e),}
-    ,
-    {TOBN(0x8303604f, 0x692ac542), TOBN(0xf079ffe1, 0x227b91d3),
-     TOBN(0x19f63e63, 0x15aaf9bd), TOBN(0xf99ee565, 0xf1f344fb),
-     TOBN(0x8a1d661f, 0xd6219199), TOBN(0x8c883bc6, 0xd48ce41c),
-     TOBN(0x1065118f, 0x3c74d904), TOBN(0x713889ee, 0x0faf8b1b),
-     TOBN(0x972b3f8f, 0x81a1b3be), TOBN(0x4f3ce145, 0xce2764a0),
-     TOBN(0xe2d0f1cc, 0x28c4f5f7), TOBN(0xdeee0c0d, 0xc7f3985b),
-     TOBN(0x7df4adc0, 0xd39e25c3), TOBN(0x40619820, 0xc467a080),
-     TOBN(0x440ebc93, 0x61cf5a58), TOBN(0x527729a6, 0x422ad600),
-     TOBN(0xca6c0937, 0xb1b76ba6), TOBN(0x1a2eab85, 0x4d2026dc),
-     TOBN(0xb1715e15, 0x19d9ae0a), TOBN(0xf1ad9199, 0xbac4a026),
-     TOBN(0x35b3dfb8, 0x07ea7b0e), TOBN(0xedf5496f, 0x3ed9eb89),
-     TOBN(0x8932e5ff, 0x2d6d08ab), TOBN(0xf314874e, 0x25bd2731),
-     TOBN(0xefb26a75, 0x3f73f449), TOBN(0x1d1c94f8, 0x8d44fc79),
-     TOBN(0x49f0fbc5, 0x3bc0dc4d), TOBN(0xb747ea0b, 0x3698a0d0),
-     TOBN(0x5218c3fe, 0x228d291e), TOBN(0x35b804b5, 0x43c129d6),
-     TOBN(0xfac859b8, 0xd1acc516), TOBN(0x6c10697d, 0x95d6e668),
-     TOBN(0xc38e438f, 0x0876fd4e), TOBN(0x45f0c307, 0x83d2f383),
-     TOBN(0x203cc2ec, 0xb10934cb), TOBN(0x6a8f2439, 0x2c9d46ee),
-     TOBN(0xf16b431b, 0x65ccde7b), TOBN(0x41e2cd18, 0x27e76a6f),
-     TOBN(0xb9c8cf8f, 0x4e3484d7), TOBN(0x64426efd, 0x8315244a),
-     TOBN(0x1c0a8e44, 0xfc94dea3), TOBN(0x34c8cdbf, 0xdad6a0b0),
-     TOBN(0x919c3840, 0x04113cef), TOBN(0xfd32fba4, 0x15490ffa),
-     TOBN(0x58d190f6, 0x795dcfb7), TOBN(0xfef01b03, 0x83588baf),
-     TOBN(0x9e6d1d63, 0xca1fc1c0), TOBN(0x53173f96, 0xf0a41ac9),
-     TOBN(0x2b1d402a, 0xba16f73b), TOBN(0x2fb31014, 0x8cf9b9fc),
-     TOBN(0x2d51e60e, 0x446ef7bf), TOBN(0xc731021b, 0xb91e1745),
-     TOBN(0x9d3b4724, 0x4fee99d4), TOBN(0x4bca48b6, 0xfac5c1ea),
-     TOBN(0x70f5f514, 0xbbea9af7), TOBN(0x751f55a5, 0x974c283a),
-     TOBN(0x6e30251a, 0xcb452fdb), TOBN(0x31ee6965, 0x50f30650),
-     TOBN(0xb0b3e508, 0x933548d9), TOBN(0xb8949a4f, 0xf4b0ef5b),
-     TOBN(0x208b8326, 0x3c88f3bd), TOBN(0xab147c30, 0xdb1d9989),
-     TOBN(0xed6515fd, 0x44d4df03), TOBN(0x17a12f75, 0xe72eb0c5),
-     TOBN(0x3b59796d, 0x36cf69db), TOBN(0x1219eee9, 0x56670c18),
-     TOBN(0xfe3341f7, 0x7a070d8e), TOBN(0x9b70130b, 0xa327f90c),
-     TOBN(0x36a32462, 0x0ae18e0e), TOBN(0x2021a623, 0x46c0a638),
-     TOBN(0x251b5817, 0xc62eb0d4), TOBN(0x87bfbcdf, 0x4c762293),
-     TOBN(0xf78ab505, 0xcdd61d64), TOBN(0x8c7a53fc, 0xc8c18857),
-     TOBN(0xa653ce6f, 0x16147515), TOBN(0x9c923aa5, 0xea7d52d5),
-     TOBN(0xc24709cb, 0x5c18871f), TOBN(0x7d53bec8, 0x73b3cc74),
-     TOBN(0x59264aff, 0xfdd1d4c4), TOBN(0x5555917e, 0x240da582),
-     TOBN(0xcae8bbda, 0x548f5a0e), TOBN(0x1910eaba, 0x3bbfbbe1),
-     TOBN(0xae579685, 0x7677afc3), TOBN(0x49ea61f1, 0x73ff0b5c),
-     TOBN(0x78655478, 0x4f7c3922), TOBN(0x95d337cd, 0x20c68eef),
-     TOBN(0x68f1e1e5, 0xdf779ab9), TOBN(0x14b491b0, 0xb5cf69a8),
-     TOBN(0x7a6cbbe0, 0x28e3fe89), TOBN(0xe7e1fee4, 0xc5aac0eb),
-     TOBN(0x7f47eda5, 0x697e5140), TOBN(0x4f450137, 0xb454921f),
-     TOBN(0xdb625f84, 0x95cd8185), TOBN(0x74be0ba1, 0xcdb2e583),
-     TOBN(0xaee4fd7c, 0xdd5e6de4), TOBN(0x4251437d, 0xe8101739),
-     TOBN(0x686d72a0, 0xac620366), TOBN(0x4be3fb9c, 0xb6d59344),
-     TOBN(0x6e8b44e7, 0xa1eb75b9), TOBN(0x84e39da3, 0x91a5c10c),
-     TOBN(0x37cc1490, 0xb38f0409), TOBN(0x02951943, 0x2c2ade82),
-     TOBN(0x9b688783, 0x1190a2d8), TOBN(0x25627d14, 0x231182ba),
-     TOBN(0x6eb550aa, 0x658a6d87), TOBN(0x1405aaa7, 0xcf9c7325),
-     TOBN(0xd147142e, 0x5c8748c9), TOBN(0x7f637e4f, 0x53ede0e0),
-     TOBN(0xf8ca2776, 0x14ffad2c), TOBN(0xe58fb1bd, 0xbafb6791),
-     TOBN(0x17158c23, 0xbf8f93fc), TOBN(0x7f15b373, 0x0a4a4655),
-     TOBN(0x39d4add2, 0xd842ca72), TOBN(0xa71e4391, 0x3ed96305),
-     TOBN(0x5bb09cbe, 0x6700be14), TOBN(0x68d69d54, 0xd8befcf6),
-     TOBN(0xa45f5367, 0x37183bcf), TOBN(0x7152b7bb, 0x3370dff7),
-     TOBN(0xcf887baa, 0xbf12525b), TOBN(0xe7ac7bdd, 0xd6d1e3cd),
-     TOBN(0x25914f78, 0x81fdad90), TOBN(0xcf638f56, 0x0d2cf6ab),
-     TOBN(0xb90bc03f, 0xcc054de5), TOBN(0x932811a7, 0x18b06350),
-     TOBN(0x2f00b330, 0x9bbd11ff), TOBN(0x76108a6f, 0xb4044974),
-     TOBN(0x801bb9e0, 0xa851d266), TOBN(0x0dd099be, 0xbf8990c1),
-     TOBN(0x58c5aaaa, 0xabe32986), TOBN(0x0fe9dd2a, 0x50d59c27),
-     TOBN(0x84951ff4, 0x8d307305), TOBN(0x6c23f829, 0x86529b78),
-     TOBN(0x50bb2218, 0x0b136a79), TOBN(0x7e2174de, 0x77a20996),
-     TOBN(0x6f00a4b9, 0xc0bb4da6), TOBN(0x89a25a17, 0xefdde8da),
-     TOBN(0xf728a27e, 0xc11ee01d), TOBN(0xf900553a, 0xe5f10dfb),
-     TOBN(0x189a83c8, 0x02ec893c), TOBN(0x3ca5bdc1, 0x23f66d77),
-     TOBN(0x98781537, 0x97eada9f), TOBN(0x59c50ab3, 0x10256230),
-     TOBN(0x346042d9, 0x323c69b3), TOBN(0x1b715a6d, 0x2c460449),
-     TOBN(0xa41dd476, 0x6ae06e0b), TOBN(0xcdd7888e, 0x9d42e25f),
-     TOBN(0x0f395f74, 0x56b25a20), TOBN(0xeadfe0ae, 0x8700e27e),
-     TOBN(0xb09d52a9, 0x69950093), TOBN(0x3525d9cb, 0x327f8d40),
-     TOBN(0xb8235a94, 0x67df886a), TOBN(0x77e4b0dd, 0x035faec2),
-     TOBN(0x115eb20a, 0x517d7061), TOBN(0x77fe3433, 0x6c2df683),
-     TOBN(0x6870ddc7, 0xcdc6fc67), TOBN(0xb1610588, 0x0b87de83),
-     TOBN(0x343584ca, 0xd9c4ddbe), TOBN(0xb3164f1c, 0x3d754be2),
-     TOBN(0x0731ed3a, 0xc1e6c894), TOBN(0x26327dec, 0x4f6b904c),
-     TOBN(0x9d49c6de, 0x97b5cd32), TOBN(0x40835dae, 0xb5eceecd),
-     TOBN(0xc66350ed, 0xd9ded7fe), TOBN(0x8aeebb5c, 0x7a678804),
-     TOBN(0x51d42fb7, 0x5b8ee9ec), TOBN(0xd7a17bdd, 0x8e3ca118),
-     TOBN(0x40d7511a, 0x2ef4400e), TOBN(0xc48990ac, 0x875a66f4),
-     TOBN(0x8de07d2a, 0x2199e347), TOBN(0xbee75556, 0x2a39e051),
-     TOBN(0x56918786, 0x916e51dc), TOBN(0xeb191313, 0x4a2d89ec),
-     TOBN(0x6679610d, 0x37d341ed), TOBN(0x434fbb41, 0x56d51c2b),
-     TOBN(0xe54b7ee7, 0xd7492dba), TOBN(0xaa33a79a, 0x59021493),
-     TOBN(0x49fc5054, 0xe4bd6d3d), TOBN(0x09540f04, 0x5ab551d0),
-     TOBN(0x8acc9085, 0x4942d3a6), TOBN(0x231af02f, 0x2d28323b),
-     TOBN(0x93458cac, 0x0992c163), TOBN(0x1fef8e71, 0x888e3bb4),
-     TOBN(0x27578da5, 0xbe8c268c), TOBN(0xcc8be792, 0xe805ec00),
-     TOBN(0x29267bae, 0xc61c3855), TOBN(0xebff429d, 0x58c1fd3b),
-     TOBN(0x22d886c0, 0x8c0b93b8), TOBN(0xca5e00b2, 0x2ddb8953),
-     TOBN(0xcf330117, 0xc3fed8b7), TOBN(0xd49ac6fa, 0x819c01f6),
-     TOBN(0x6ddaa6bd, 0x3c0fbd54), TOBN(0x91743068, 0x8049a2cf),
-     TOBN(0xd67f981e, 0xaff2ef81), TOBN(0xc3654d35, 0x2818ae80),
-     TOBN(0x81d05044, 0x1b2aa892), TOBN(0x2db067bf, 0x3d099328),
-     TOBN(0xe7c79e86, 0x703dcc97), TOBN(0xe66f9b37, 0xe133e215),
-     TOBN(0xcdf119a6, 0xe39a7a5c), TOBN(0x47c60de3, 0x876f1b61),
-     TOBN(0x6e405939, 0xd860f1b2), TOBN(0x3e9a1dbc, 0xf5ed4d4a),
-     TOBN(0x3f23619e, 0xc9b6bcbd), TOBN(0x5ee790cf, 0x734e4497),
-     TOBN(0xf0a834b1, 0x5bdaf9bb), TOBN(0x02cedda7, 0x4ca295f0),
-     TOBN(0x4619aa2b, 0xcb8e378c), TOBN(0xe5613244, 0xcc987ea4),
-     TOBN(0x0bc022cc, 0x76b23a50), TOBN(0x4a2793ad, 0x0a6c21ce),
-     TOBN(0x38328780, 0x89cac3f5), TOBN(0x29176f1b, 0xcba26d56),
-     TOBN(0x06296187, 0x4f6f59eb), TOBN(0x86e9bca9, 0x8bdc658e),
-     TOBN(0x2ca9c4d3, 0x57e30402), TOBN(0x5438b216, 0x516a09bb),
-     TOBN(0x0a6a063c, 0x7672765a), TOBN(0x37a3ce64, 0x0547b9bf),
-     TOBN(0x42c099c8, 0x98b1a633), TOBN(0xb5ab800d, 0x05ee6961),
-     TOBN(0xf1963f59, 0x11a5acd6), TOBN(0xbaee6157, 0x46201063),
-     TOBN(0x36d9a649, 0xa596210a), TOBN(0xaed04363, 0x1ba7138c),
-     TOBN(0xcf817d1c, 0xa4a82b76), TOBN(0x5586960e, 0xf3806be9),
-     TOBN(0x7ab67c89, 0x09dc6bb5), TOBN(0x52ace7a0, 0x114fe7eb),
-     TOBN(0xcd987618, 0xcbbc9b70), TOBN(0x4f06fd5a, 0x604ca5e1),
-     TOBN(0x90af14ca, 0x6dbde133), TOBN(0x1afe4322, 0x948a3264),
-     TOBN(0xa70d2ca6, 0xc44b2c6c), TOBN(0xab726799, 0x0ef87dfe),
-     TOBN(0x310f64dc, 0x2e696377), TOBN(0x49b42e68, 0x4c8126a0),
-     TOBN(0x0ea444c3, 0xcea0b176), TOBN(0x53a8ddf7, 0xcb269182),
-     TOBN(0xf3e674eb, 0xbbba9dcb), TOBN(0x0d2878a8, 0xd8669d33),
-     TOBN(0x04b935d5, 0xd019b6a3), TOBN(0xbb5cf88e, 0x406f1e46),
-     TOBN(0xa1912d16, 0x5b57c111), TOBN(0x9803fc21, 0x19ebfd78),
-     TOBN(0x4f231c9e, 0xc07764a9), TOBN(0xd93286ee, 0xb75bd055),
-     TOBN(0x83a9457d, 0x8ee6c9de), TOBN(0x04695915, 0x6087ec90),
-     TOBN(0x14c6dd8a, 0x58d6cd46), TOBN(0x9cb633b5, 0x8e6634d2),
-     TOBN(0xc1305047, 0xf81bc328), TOBN(0x12ede0e2, 0x26a177e5),
-     TOBN(0x332cca62, 0x065a6f4f), TOBN(0xc3a47ecd, 0x67be487b),
-     TOBN(0x741eb187, 0x0f47ed1c), TOBN(0x99e66e58, 0xe7598b14),
-     TOBN(0x6f0544ca, 0x63d0ff12), TOBN(0xe5efc784, 0xb610a05f),
-     TOBN(0xf72917b1, 0x7cad7b47), TOBN(0x3ff6ea20, 0xf2cac0c0),
-     TOBN(0xcc23791b, 0xf21db8b7), TOBN(0x7dac70b1, 0xd7d93565),
-     TOBN(0x682cda1d, 0x694bdaad), TOBN(0xeb88bb8c, 0x1023516d),
-     TOBN(0xc4c634b4, 0xdfdbeb1b), TOBN(0x22f5ca72, 0xb4ee4dea),
-     TOBN(0x1045a368, 0xe6524821), TOBN(0xed9e8a3f, 0x052b18b2),
-     TOBN(0x9b7f2cb1, 0xb961f49a), TOBN(0x7fee2ec1, 0x7b009670),
-     TOBN(0x350d8754, 0x22507a6d), TOBN(0x561bd711, 0x4db55f1d),
-     TOBN(0x4c189ccc, 0x320bbcaf), TOBN(0x568434cf, 0xdf1de48c),
-     TOBN(0x6af1b00e, 0x0fa8f128), TOBN(0xf0ba9d02, 0x8907583c),
-     TOBN(0x735a4004, 0x32ff9f60), TOBN(0x3dd8e4b6, 0xc25dcf33),
-     TOBN(0xf2230f16, 0x42c74cef), TOBN(0xd8117623, 0x013fa8ad),
-     TOBN(0x36822876, 0xf51fe76e), TOBN(0x8a6811cc, 0x11d62589),
-     TOBN(0xc3fc7e65, 0x46225718), TOBN(0xb7df2c9f, 0xc82fdbcd),
-     TOBN(0x3b1d4e52, 0xdd7b205b), TOBN(0xb6959478, 0x47a2e414),
-     TOBN(0x05e4d793, 0xefa91148), TOBN(0xb47ed446, 0xfd2e9675),
-     TOBN(0x1a7098b9, 0x04c9d9bf), TOBN(0x661e2881, 0x1b793048),
-     TOBN(0xb1a16966, 0xb01ee461), TOBN(0xbc521308, 0x2954746f),
-     TOBN(0xc909a0fc, 0x2477de50), TOBN(0xd80bb41c, 0x7dbd51ef),
-     TOBN(0xa85be7ec, 0x53294905), TOBN(0x6d465b18, 0x83958f97),
-     TOBN(0x16f6f330, 0xfb6840fd), TOBN(0xfaaeb214, 0x3401e6c8),
-     TOBN(0xaf83d30f, 0xccb5b4f8), TOBN(0x22885739, 0x266dec4b),
-     TOBN(0x51b4367c, 0x7bc467df), TOBN(0x926562e3, 0xd842d27a),
-     TOBN(0xdfcb6614, 0x0fea14a6), TOBN(0xeb394dae, 0xf2734cd9),
-     TOBN(0x3eeae5d2, 0x11c0be98), TOBN(0xb1e6ed11, 0x814e8165),
-     TOBN(0x191086bc, 0xe52bce1c), TOBN(0x14b74cc6, 0xa75a04da),
-     TOBN(0x63cf1186, 0x8c060985), TOBN(0x071047de, 0x2dbd7f7c),
-     TOBN(0x4e433b8b, 0xce0942ca), TOBN(0xecbac447, 0xd8fec61d),
-     TOBN(0x8f0ed0e2, 0xebf3232f), TOBN(0xfff80f9e, 0xc52a2edd),
-     TOBN(0xad9ab433, 0x75b55fdb), TOBN(0x73ca7820, 0xe42e0c11),
-     TOBN(0x6dace0a0, 0xe6251b46), TOBN(0x89bc6b5c, 0x4c0d932d),
-     TOBN(0x3438cd77, 0x095da19a), TOBN(0x2f24a939, 0x8d48bdfb),
-     TOBN(0x99b47e46, 0x766561b7), TOBN(0x736600e6, 0x0ed0322a),
-     TOBN(0x06a47cb1, 0x638e1865), TOBN(0x927c1c2d, 0xcb136000),
-     TOBN(0x29542337, 0x0cc5df69), TOBN(0x99b37c02, 0x09d649a9),
-     TOBN(0xc5f0043c, 0x6aefdb27), TOBN(0x6cdd9987, 0x1be95c27),
-     TOBN(0x69850931, 0x390420d2), TOBN(0x299c40ac, 0x0983efa4),
-     TOBN(0x3a05e778, 0xaf39aead), TOBN(0x84274408, 0x43a45193),
-     TOBN(0x6bcd0fb9, 0x91a711a0), TOBN(0x461592c8, 0x9f52ab17),
-     TOBN(0xb49302b4, 0xda3c6ed6), TOBN(0xc51fddc7, 0x330d7067),
-     TOBN(0x94babeb6, 0xda50d531), TOBN(0x521b840d, 0xa6a7b9da),
-     TOBN(0x5305151e, 0x404bdc89), TOBN(0x1bcde201, 0xd0d07449),
-     TOBN(0xf427a78b, 0x3b76a59a), TOBN(0xf84841ce, 0x07791a1b),
-     TOBN(0xebd314be, 0xbf91ed1c), TOBN(0x8e61d34c, 0xbf172943),
-     TOBN(0x1d5dc451, 0x5541b892), TOBN(0xb186ee41, 0xfc9d9e54),
-     TOBN(0x9d9f345e, 0xd5bf610d), TOBN(0x3e7ba65d, 0xf6acca9f),
-     TOBN(0x9dda787a, 0xa8369486), TOBN(0x09f9dab7, 0x8eb5ba53),
-     TOBN(0x5afb2033, 0xd6481bc3), TOBN(0x76f4ce30, 0xafa62104),
-     TOBN(0xa8fa00cf, 0xf4f066b5), TOBN(0x89ab5143, 0x461dafc2),
-     TOBN(0x44339ed7, 0xa3389998), TOBN(0x2ff862f1, 0xbc214903),
-     TOBN(0x2c88f985, 0xb05556e3), TOBN(0xcd96058e, 0x3467081e),
-     TOBN(0x7d6a4176, 0xedc637ea), TOBN(0xe1743d09, 0x36a5acdc),
-     TOBN(0x66fd72e2, 0x7eb37726), TOBN(0xf7fa264e, 0x1481a037),
-     TOBN(0x9fbd3bde, 0x45f4aa79), TOBN(0xed1e0147, 0x767c3e22),
-     TOBN(0x7621f979, 0x82e7abe2), TOBN(0x19eedc72, 0x45f633f8),
-     TOBN(0xe69b155e, 0x6137bf3a), TOBN(0xa0ad13ce, 0x414ee94e),
-     TOBN(0x93e3d524, 0x1c0e651a), TOBN(0xab1a6e2a, 0x02ce227e),
-     TOBN(0xe7af1797, 0x4ab27eca), TOBN(0x245446de, 0xbd444f39),
-     TOBN(0x59e22a21, 0x56c07613), TOBN(0x43deafce, 0xf4275498),
-     TOBN(0x10834ccb, 0x67fd0946), TOBN(0xa75841e5, 0x47406edf),
-     TOBN(0xebd6a677, 0x7b0ac93d), TOBN(0xa6e37b0d, 0x78f5e0d7),
-     TOBN(0x2516c096, 0x76f5492b), TOBN(0x1e4bf888, 0x9ac05f3a),
-     TOBN(0xcdb42ce0, 0x4df0ba2b), TOBN(0x935d5cfd, 0x5062341b),
-     TOBN(0x8a303333, 0x82acac20), TOBN(0x429438c4, 0x5198b00e),
-     TOBN(0x1d083bc9, 0x049d33fa), TOBN(0x58b82dda, 0x946f67ff),
-     TOBN(0xac3e2db8, 0x67a1d6a3), TOBN(0x62e6bead, 0x1798aac8),
-     TOBN(0xfc85980f, 0xde46c58c), TOBN(0xa7f69379, 0x69c8d7be),
-     TOBN(0x23557927, 0x837b35ec), TOBN(0x06a933d8, 0xe0790c0c),
-     TOBN(0x827c0e9b, 0x077ff55d), TOBN(0x53977798, 0xbb26e680),
-     TOBN(0x59530874, 0x1d9cb54f), TOBN(0xcca3f449, 0x4aac53ef),
-     TOBN(0x11dc5c87, 0xa07eda0f), TOBN(0xc138bccf, 0xfd6400c8),
-     TOBN(0x549680d3, 0x13e5da72), TOBN(0xc93eed82, 0x4540617e),
-     TOBN(0xfd3db157, 0x4d0b75c0), TOBN(0x9716eb42, 0x6386075b),
-     TOBN(0x0639605c, 0x817b2c16), TOBN(0x09915109, 0xf1e4f201),
-     TOBN(0x35c9a928, 0x5cca6c3b), TOBN(0xb25f7d1a, 0x3505c900),
-     TOBN(0xeb9f7d20, 0x630480c4), TOBN(0xc3c7b8c6, 0x2a1a501c),
-     TOBN(0x3f99183c, 0x5a1f8e24), TOBN(0xfdb118fa, 0x9dd255f0),
-     TOBN(0xb9b18b90, 0xc27f62a6), TOBN(0xe8f732f7, 0x396ec191),
-     TOBN(0x524a2d91, 0x0be786ab), TOBN(0x5d32adef, 0x0ac5a0f5),
-     TOBN(0x9b53d4d6, 0x9725f694), TOBN(0x032a76c6, 0x0510ba89),
-     TOBN(0x840391a3, 0xebeb1544), TOBN(0x44b7b88c, 0x3ed73ac3),
-     TOBN(0xd24bae7a, 0x256cb8b3), TOBN(0x7ceb151a, 0xe394cb12),
-     TOBN(0xbd6b66d0, 0x5bc1e6a8), TOBN(0xec70cecb, 0x090f07bf),
-     TOBN(0x270644ed, 0x7d937589), TOBN(0xee9e1a3d, 0x5f1dccfe),
-     TOBN(0xb0d40a84, 0x745b98d2), TOBN(0xda429a21, 0x2556ed40),
-     TOBN(0xf676eced, 0x85148cb9), TOBN(0x5a22d40c, 0xded18936),
-     TOBN(0x3bc4b9e5, 0x70e8a4ce), TOBN(0xbfd1445b, 0x9eae0379),
-     TOBN(0xf23f2c0c, 0x1a0bd47e), TOBN(0xa9c0bb31, 0xe1845531),
-     TOBN(0x9ddc4d60, 0x0a4c3f6b), TOBN(0xbdfaad79, 0x2c15ef44),
-     TOBN(0xce55a236, 0x7f484acc), TOBN(0x08653ca7, 0x055b1f15),
-     TOBN(0x2efa8724, 0x538873a3), TOBN(0x09299e5d, 0xace1c7e7),
-     TOBN(0x07afab66, 0xade332ba), TOBN(0x9be1fdf6, 0x92dd71b7),
-     TOBN(0xa49b5d59, 0x5758b11c), TOBN(0x0b852893, 0xc8654f40),
-     TOBN(0xb63ef6f4, 0x52379447), TOBN(0xd4957d29, 0x105e690c),
-     TOBN(0x7d484363, 0x646559b0), TOBN(0xf4a8273c, 0x49788a8e),
-     TOBN(0xee406cb8, 0x34ce54a9), TOBN(0x1e1c260f, 0xf86fda9b),
-     TOBN(0xe150e228, 0xcf6a4a81), TOBN(0x1fa3b6a3, 0x1b488772),
-     TOBN(0x1e6ff110, 0xc5a9c15b), TOBN(0xc6133b91, 0x8ad6aa47),
-     TOBN(0x8ac5d55c, 0x9dffa978), TOBN(0xba1d1c1d, 0x5f3965f2),
-     TOBN(0xf969f4e0, 0x7732b52f), TOBN(0xfceecdb5, 0xa5172a07),
-     TOBN(0xb0120a5f, 0x10f2b8f5), TOBN(0xc83a6cdf, 0x5c4c2f63),
-     TOBN(0x4d47a491, 0xf8f9c213), TOBN(0xd9e1cce5, 0xd3f1bbd5),
-     TOBN(0x0d91bc7c, 0xaba7e372), TOBN(0xfcdc74c8, 0xdfd1a2db),
-     TOBN(0x05efa800, 0x374618e5), TOBN(0x11216969, 0x15a7925e),
-     TOBN(0xd4c89823, 0xf6021c5d), TOBN(0x880d5e84, 0xeff14423),
-     TOBN(0x6523bc5a, 0x6dcd1396), TOBN(0xd1acfdfc, 0x113c978b),
-     TOBN(0xb0c164e8, 0xbbb66840), TOBN(0xf7f4301e, 0x72b58459),
-     TOBN(0xc29ad4a6, 0xa638e8ec), TOBN(0xf5ab8961, 0x46b78699),
-     TOBN(0x9dbd7974, 0x0e954750), TOBN(0x0121de88, 0x64f9d2c6),
-     TOBN(0x2e597b42, 0xd985232e), TOBN(0x55b6c3c5, 0x53451777),
-     TOBN(0xbb53e547, 0x519cb9fb), TOBN(0xf134019f, 0x8428600d),
-     TOBN(0x5a473176, 0xe081791a), TOBN(0x2f3e2263, 0x35fb0c08),
-     TOBN(0xb28c3017, 0x73d273b0), TOBN(0xccd21076, 0x7721ef9a),
-     TOBN(0x054cc292, 0xb650dc39), TOBN(0x662246de, 0x6188045e),
-     TOBN(0x904b52fa, 0x6b83c0d1), TOBN(0xa72df267, 0x97e9cd46),
-     TOBN(0x886b43cd, 0x899725e4), TOBN(0x2b651688, 0xd849ff22),
-     TOBN(0x60479b79, 0x02f34533), TOBN(0x5e354c14, 0x0c77c148),
-     TOBN(0xb4bb7581, 0xa8537c78), TOBN(0x188043d7, 0xefe1495f),
-     TOBN(0x9ba12f42, 0x8c1d5026), TOBN(0x2e0c8a26, 0x93d4aaab),
-     TOBN(0xbdba7b8b, 0xaa57c450), TOBN(0x140c9ad6, 0x9bbdafef),
-     TOBN(0x2067aa42, 0x25ac0f18), TOBN(0xf7b1295b, 0x04d1fbf3),
-     TOBN(0x14829111, 0xa4b04824), TOBN(0x2ce3f192, 0x33bd5e91),
-     TOBN(0x9c7a1d55, 0x8f2e1b72), TOBN(0xfe932286, 0x302aa243),
-     TOBN(0x497ca7b4, 0xd4be9554), TOBN(0xb8e821b8, 0xe0547a6e),
-     TOBN(0xfb2838be, 0x67e573e0), TOBN(0x05891db9, 0x4084c44b),
-     TOBN(0x91311373, 0x96c1c2c5), TOBN(0x6aebfa3f, 0xd958444b),
-     TOBN(0xac9cdce9, 0xe56e55c1), TOBN(0x7148ced3, 0x2caa46d0),
-     TOBN(0x2e10c7ef, 0xb61fe8eb), TOBN(0x9fd835da, 0xff97cf4d),}
-    ,
-    {TOBN(0xa36da109, 0x081e9387), TOBN(0xfb9780d7, 0x8c935828),
-     TOBN(0xd5940332, 0xe540b015), TOBN(0xc9d7b51b, 0xe0f466fa),
-     TOBN(0xfaadcd41, 0xd6d9f671), TOBN(0xba6c1e28, 0xb1a2ac17),
-     TOBN(0x066a7833, 0xed201e5f), TOBN(0x19d99719, 0xf90f462b),
-     TOBN(0xf431f462, 0x060b5f61), TOBN(0xa56f46b4, 0x7bd057c2),
-     TOBN(0x348dca6c, 0x47e1bf65), TOBN(0x9a38783e, 0x41bcf1ff),
-     TOBN(0x7a5d33a9, 0xda710718), TOBN(0x5a779987, 0x2e0aeaf6),
-     TOBN(0xca87314d, 0x2d29d187), TOBN(0xfa0edc3e, 0xc687d733),
-     TOBN(0x9df33621, 0x6a31e09b), TOBN(0xde89e44d, 0xc1350e35),
-     TOBN(0x29214871, 0x4ca0cf52), TOBN(0xdf379672, 0x0b88a538),
-     TOBN(0xc92a510a, 0x2591d61b), TOBN(0x79aa87d7, 0x585b447b),
-     TOBN(0xf67db604, 0xe5287f77), TOBN(0x1697c8bf, 0x5efe7a80),
-     TOBN(0x1c894849, 0xcb198ac7), TOBN(0xa884a93d, 0x0f264665),
-     TOBN(0x2da964ef, 0x9b200678), TOBN(0x3c351b87, 0x009834e6),
-     TOBN(0xafb2ef9f, 0xe2c4b44b), TOBN(0x580f6c47, 0x3326790c),
-     TOBN(0xb8480521, 0x0b02264a), TOBN(0x8ba6f9e2, 0x42a194e2),
-     TOBN(0xfc87975f, 0x8fb54738), TOBN(0x35160788, 0x27c3ead3),
-     TOBN(0x834116d2, 0xb74a085a), TOBN(0x53c99a73, 0xa62fe996),
-     TOBN(0x87585be0, 0x5b81c51b), TOBN(0x925bafa8, 0xbe0852b7),
-     TOBN(0x76a4fafd, 0xa84d19a7), TOBN(0x39a45982, 0x585206d4),
-     TOBN(0x499b6ab6, 0x5eb03c0e), TOBN(0xf19b7954, 0x72bc3fde),
-     TOBN(0xa86b5b9c, 0x6e3a80d2), TOBN(0xe4377508, 0x6d42819f),
-     TOBN(0xc1663650, 0xbb3ee8a3), TOBN(0x75eb14fc, 0xb132075f),
-     TOBN(0xa8ccc906, 0x7ad834f6), TOBN(0xea6a2474, 0xe6e92ffd),
-     TOBN(0x9d72fd95, 0x0f8d6758), TOBN(0xcb84e101, 0x408c07dd),
-     TOBN(0xb9114bfd, 0xa5e23221), TOBN(0x358b5fe2, 0xe94e742c),
-     TOBN(0x1c0577ec, 0x95f40e75), TOBN(0xf0155451, 0x3d73f3d6),
-     TOBN(0x9d55cd67, 0xbd1b9b66), TOBN(0x63e86e78, 0xaf8d63c7),
-     TOBN(0x39d934ab, 0xd3c095f1), TOBN(0x04b261be, 0xe4b76d71),
-     TOBN(0x1d2e6970, 0xe73e6984), TOBN(0x879fb23b, 0x5e5fcb11),
-     TOBN(0x11506c72, 0xdfd75490), TOBN(0x3a97d085, 0x61bcf1c1),
-     TOBN(0x43201d82, 0xbf5e7007), TOBN(0x7f0ac52f, 0x798232a7),
-     TOBN(0x2715cbc4, 0x6eb564d4), TOBN(0x8d6c752c, 0x9e570e29),
-     TOBN(0xf80247c8, 0x9ef5fd5d), TOBN(0xc3c66b46, 0xd53eb514),
-     TOBN(0x9666b401, 0x0f87de56), TOBN(0xce62c06f, 0xc6c603b5),
-     TOBN(0xae7b4c60, 0x7e4fc942), TOBN(0x38ac0b77, 0x663a9c19),
-     TOBN(0xcb4d20ee, 0x4b049136), TOBN(0x8b63bf12, 0x356a4613),
-     TOBN(0x1221aef6, 0x70e08128), TOBN(0xe62d8c51, 0x4acb6b16),
-     TOBN(0x71f64a67, 0x379e7896), TOBN(0xb25237a2, 0xcafd7fa5),
-     TOBN(0xf077bd98, 0x3841ba6a), TOBN(0xc4ac0244, 0x3cd16e7e),
-     TOBN(0x548ba869, 0x21fea4ca), TOBN(0xd36d0817, 0xf3dfdac1),
-     TOBN(0x09d8d71f, 0xf4685faf), TOBN(0x8eff66be, 0xc52c459a),
-     TOBN(0x182faee7, 0x0b57235e), TOBN(0xee3c39b1, 0x0106712b),
-     TOBN(0x5107331f, 0xc0fcdcb0), TOBN(0x669fb9dc, 0xa51054ba),
-     TOBN(0xb25101fb, 0x319d7682), TOBN(0xb0293129, 0x0a982fee),
-     TOBN(0x51c1c9b9, 0x0261b344), TOBN(0x0e008c5b, 0xbfd371fa),
-     TOBN(0xd866dd1c, 0x0278ca33), TOBN(0x666f76a6, 0xe5aa53b1),
-     TOBN(0xe5cfb779, 0x6013a2cf), TOBN(0x1d3a1aad, 0xa3521836),
-     TOBN(0xcedd2531, 0x73faa485), TOBN(0xc8ee6c4f, 0xc0a76878),
-     TOBN(0xddbccfc9, 0x2a11667d), TOBN(0x1a418ea9, 0x1c2f695a),
-     TOBN(0xdb11bd92, 0x51f73971), TOBN(0x3e4b3c82, 0xda2ed89f),
-     TOBN(0x9a44f3f4, 0xe73e0319), TOBN(0xd1e3de0f, 0x303431af),
-     TOBN(0x3c5604ff, 0x50f75f9c), TOBN(0x1d8eddf3, 0x7e752b22),
-     TOBN(0x0ef074dd, 0x3c9a1118), TOBN(0xd0ffc172, 0xccb86d7b),
-     TOBN(0xabd1ece3, 0x037d90f2), TOBN(0xe3f307d6, 0x6055856c),
-     TOBN(0x422f9328, 0x7e4c6daf), TOBN(0x902aac66, 0x334879a0),
-     TOBN(0xb6a1e7bf, 0x94cdfade), TOBN(0x6c97e1ed, 0x7fc6d634),
-     TOBN(0x662ad24d, 0xa2fb63f8), TOBN(0xf81be1b9, 0xa5928405),
-     TOBN(0x86d765e4, 0xd14b4206), TOBN(0xbecc2e0e, 0x8fa0db65),
-     TOBN(0xa28838e0, 0xb17fc76c), TOBN(0xe49a602a, 0xe37cf24e),
-     TOBN(0x76b4131a, 0x567193ec), TOBN(0xaf3c305a, 0xe5f6e70b),
-     TOBN(0x9587bd39, 0x031eebdd), TOBN(0x5709def8, 0x71bbe831),
-     TOBN(0x57059983, 0x0eb2b669), TOBN(0x4d80ce1b, 0x875b7029),
-     TOBN(0x838a7da8, 0x0364ac16), TOBN(0x2f431d23, 0xbe1c83ab),
-     TOBN(0xe56812a6, 0xf9294dd3), TOBN(0xb448d01f, 0x9b4b0d77),
-     TOBN(0xf3ae6061, 0x04e8305c), TOBN(0x2bead645, 0x94d8c63e),
-     TOBN(0x0a85434d, 0x84fd8b07), TOBN(0x537b983f, 0xf7a9dee5),
-     TOBN(0xedcc5f18, 0xef55bd85), TOBN(0x2041af62, 0x21c6cf8b),
-     TOBN(0x8e52874c, 0xb940c71e), TOBN(0x211935a9, 0xdb5f4b3a),
-     TOBN(0x94350492, 0x301b1dc3), TOBN(0x33d2646d, 0x29958620),
-     TOBN(0x16b0d64b, 0xef911404), TOBN(0x9d1f25ea, 0x9a3c5ef4),
-     TOBN(0x20f200eb, 0x4a352c78), TOBN(0x43929f2c, 0x4bd0b428),
-     TOBN(0xa5656667, 0xc7196e29), TOBN(0x7992c2f0, 0x9391be48),
-     TOBN(0xaaa97cbd, 0x9ee0cd6e), TOBN(0x51b0310c, 0x3dc8c9bf),
-     TOBN(0x237f8acf, 0xdd9f22cb), TOBN(0xbb1d81a1, 0xb585d584),
-     TOBN(0x8d5d85f5, 0x8c416388), TOBN(0x0d6e5a5a, 0x42fe474f),
-     TOBN(0xe7812766, 0x38235d4e), TOBN(0x1c62bd67, 0x496e3298),
-     TOBN(0x8378660c, 0x3f175bc8), TOBN(0x4d04e189, 0x17afdd4d),
-     TOBN(0x32a81601, 0x85a8068c), TOBN(0xdb58e4e1, 0x92b29a85),
-     TOBN(0xe8a65b86, 0xc70d8a3b), TOBN(0x5f0e6f4e, 0x98a0403b),
-     TOBN(0x08129684, 0x69ed2370), TOBN(0x34dc30bd, 0x0871ee26),
-     TOBN(0x3a5ce948, 0x7c9c5b05), TOBN(0x7d487b80, 0x43a90c87),
-     TOBN(0x4089ba37, 0xdd0e7179), TOBN(0x45f80191, 0xb4041811),
-     TOBN(0x1c3e1058, 0x98747ba5), TOBN(0x98c4e13a, 0x6e1ae592),
-     TOBN(0xd44636e6, 0xe82c9f9e), TOBN(0x711db87c, 0xc33a1043),
-     TOBN(0x6f431263, 0xaa8aec05), TOBN(0x43ff120d, 0x2744a4aa),
-     TOBN(0xd3bd892f, 0xae77779b), TOBN(0xf0fe0cc9, 0x8cdc9f82),
-     TOBN(0xca5f7fe6, 0xf1c5b1bc), TOBN(0xcc63a682, 0x44929a72),
-     TOBN(0xc7eaba0c, 0x09dbe19a), TOBN(0x2f3585ad, 0x6b5c73c2),
-     TOBN(0x8ab8924b, 0x0ae50c30), TOBN(0x17fcd27a, 0x638b30ba),
-     TOBN(0xaf414d34, 0x10b3d5a5), TOBN(0x09c107d2, 0x2a9accf1),
-     TOBN(0x15dac49f, 0x946a6242), TOBN(0xaec3df2a, 0xd707d642),
-     TOBN(0x2c2492b7, 0x3f894ae0), TOBN(0xf59df3e5, 0xb75f18ce),
-     TOBN(0x7cb740d2, 0x8f53cad0), TOBN(0x3eb585fb, 0xc4f01294),
-     TOBN(0x17da0c86, 0x32c7f717), TOBN(0xeb8c795b, 0xaf943f4c),
-     TOBN(0x4ee23fb5, 0xf67c51d2), TOBN(0xef187575, 0x68889949),
-     TOBN(0xa6b4bdb2, 0x0389168b), TOBN(0xc4ecd258, 0xea577d03),
-     TOBN(0x3a63782b, 0x55743082), TOBN(0x6f678f4c, 0xc72f08cd),
-     TOBN(0x553511cf, 0x65e58dd8), TOBN(0xd53b4e3e, 0xd402c0cd),
-     TOBN(0x37de3e29, 0xa037c14c), TOBN(0x86b6c516, 0xc05712aa),
-     TOBN(0x2834da3e, 0xb38dff6f), TOBN(0xbe012c52, 0xea636be8),
-     TOBN(0x292d238c, 0x61dd37f8), TOBN(0x0e54523f, 0x8f8142db),
-     TOBN(0xe31eb436, 0x036a05d8), TOBN(0x83e3cdff, 0x1e93c0ff),
-     TOBN(0x3fd2fe0f, 0x50821ddf), TOBN(0xc8e19b0d, 0xff9eb33b),
-     TOBN(0xc8cc943f, 0xb569a5fe), TOBN(0xad0090d4, 0xd4342d75),
-     TOBN(0x82090b4b, 0xcaeca000), TOBN(0xca39687f, 0x1bd410eb),
-     TOBN(0xe7bb0df7, 0x65959d77), TOBN(0x39d78218, 0x9c964999),
-     TOBN(0xd87f62e8, 0xb2415451), TOBN(0xe5efb774, 0xbed76108),
-     TOBN(0x3ea011a4, 0xe822f0d0), TOBN(0xbc647ad1, 0x5a8704f8),
-     TOBN(0xbb315b35, 0x50c6820f), TOBN(0x863dec3d, 0xb7e76bec),
-     TOBN(0x01ff5d3a, 0xf017bfc7), TOBN(0x20054439, 0x976b8229),
-     TOBN(0x067fca37, 0x0bbd0d3b), TOBN(0xf63dde64, 0x7f5e3d0f),
-     TOBN(0x22dbefb3, 0x2a4c94e9), TOBN(0xafbff0fe, 0x96f8278a),
-     TOBN(0x80aea0b1, 0x3503793d), TOBN(0xb2238029, 0x5f06cd29),
-     TOBN(0x65703e57, 0x8ec3feca), TOBN(0x06c38314, 0x393e7053),
-     TOBN(0xa0b751eb, 0x7c6734c4), TOBN(0xd2e8a435, 0xc59f0f1e),
-     TOBN(0x147d9052, 0x5e9ca895), TOBN(0x2f4dd31e, 0x972072df),
-     TOBN(0xa16fda8e, 0xe6c6755c), TOBN(0xc66826ff, 0xcf196558),
-     TOBN(0x1f1a76a3, 0x0cf43895), TOBN(0xa9d604e0, 0x83c3097b),
-     TOBN(0xe1908309, 0x66390e0e), TOBN(0xa50bf753, 0xb3c85eff),
-     TOBN(0x0696bdde, 0xf6a70251), TOBN(0x548b801b, 0x3c6ab16a),
-     TOBN(0x37fcf704, 0xa4d08762), TOBN(0x090b3def, 0xdff76c4e),
-     TOBN(0x87e8cb89, 0x69cb9158), TOBN(0x44a90744, 0x995ece43),
-     TOBN(0xf85395f4, 0x0ad9fbf5), TOBN(0x49b0f6c5, 0x4fb0c82d),
-     TOBN(0x75d9bc15, 0xadf7cccf), TOBN(0x81a3e5d6, 0xdfa1e1b0),
-     TOBN(0x8c39e444, 0x249bc17e), TOBN(0xf37dccb2, 0x8ea7fd43),
-     TOBN(0xda654873, 0x907fba12), TOBN(0x35daa6da, 0x4a372904),
-     TOBN(0x0564cfc6, 0x6283a6c5), TOBN(0xd09fa4f6, 0x4a9395bf),
-     TOBN(0x688e9ec9, 0xaeb19a36), TOBN(0xd913f1ce, 0xc7bfbfb4),
-     TOBN(0x797b9a3c, 0x61c2faa6), TOBN(0x2f979bec, 0x6a0a9c12),
-     TOBN(0xb5969d0f, 0x359679ec), TOBN(0xebcf523d, 0x079b0460),
-     TOBN(0xfd6b0008, 0x10fab870), TOBN(0x3f2edcda, 0x9373a39c),
-     TOBN(0x0d64f9a7, 0x6f568431), TOBN(0xf848c27c, 0x02f8898c),
-     TOBN(0xf418ade1, 0x260b5bd5), TOBN(0xc1f3e323, 0x6973dee8),
-     TOBN(0x46e9319c, 0x26c185dd), TOBN(0x6d85b7d8, 0x546f0ac4),
-     TOBN(0x427965f2, 0x247f9d57), TOBN(0xb519b636, 0xb0035f48),
-     TOBN(0x6b6163a9, 0xab87d59c), TOBN(0xff9f58c3, 0x39caaa11),
-     TOBN(0x4ac39cde, 0x3177387b), TOBN(0x5f6557c2, 0x873e77f9),
-     TOBN(0x67504006, 0x36a83041), TOBN(0x9b1c96ca, 0x75ef196c),
-     TOBN(0xf34283de, 0xb08c7940), TOBN(0x7ea09644, 0x1128c316),
-     TOBN(0xb510b3b5, 0x6aa39dff), TOBN(0x59b43da2, 0x9f8e4d8c),
-     TOBN(0xa8ce31fd, 0x9e4c4b9f), TOBN(0x0e20be26, 0xc1303c01),
-     TOBN(0x18187182, 0xe8ee47c9), TOBN(0xd9687cdb, 0x7db98101),
-     TOBN(0x7a520e4d, 0xa1e14ff6), TOBN(0x429808ba, 0x8836d572),
-     TOBN(0xa37ca60d, 0x4944b663), TOBN(0xf901f7a9, 0xa3f91ae5),
-     TOBN(0xe4e3e76e, 0x9e36e3b1), TOBN(0x9aa219cf, 0x29d93250),
-     TOBN(0x347fe275, 0x056a2512), TOBN(0xa4d643d9, 0xde65d95c),
-     TOBN(0x9669d396, 0x699fc3ed), TOBN(0xb598dee2, 0xcf8c6bbe),
-     TOBN(0x682ac1e5, 0xdda9e5c6), TOBN(0x4e0d3c72, 0xcaa9fc95),
-     TOBN(0x17faaade, 0x772bea44), TOBN(0x5ef8428c, 0xab0009c8),
-     TOBN(0xcc4ce47a, 0x460ff016), TOBN(0xda6d12bf, 0x725281cb),
-     TOBN(0x44c67848, 0x0223aad2), TOBN(0x6e342afa, 0x36256e28),
-     TOBN(0x1400bb0b, 0x93a37c04), TOBN(0x62b1bc9b, 0xdd10bd96),
-     TOBN(0x7251adeb, 0x0dac46b7), TOBN(0x7d33b92e, 0x7be4ef51),
-     TOBN(0x28b2a94b, 0xe61fa29a), TOBN(0x4b2be13f, 0x06422233),
-     TOBN(0x36d6d062, 0x330d8d37), TOBN(0x5ef80e1e, 0xb28ca005),
-     TOBN(0x174d4699, 0x6d16768e), TOBN(0x9fc4ff6a, 0x628bf217),
-     TOBN(0x77705a94, 0x154e490d), TOBN(0x9d96dd28, 0x8d2d997a),
-     TOBN(0x77e2d9d8, 0xce5d72c4), TOBN(0x9d06c5a4, 0xc11c714f),
-     TOBN(0x02aa5136, 0x79e4a03e), TOBN(0x1386b3c2, 0x030ff28b),
-     TOBN(0xfe82e8a6, 0xfb283f61), TOBN(0x7df203e5, 0xf3abc3fb),
-     TOBN(0xeec7c351, 0x3a4d3622), TOBN(0xf7d17dbf, 0xdf762761),
-     TOBN(0xc3956e44, 0x522055f0), TOBN(0xde3012db, 0x8fa748db),
-     TOBN(0xca9fcb63, 0xbf1dcc14), TOBN(0xa56d9dcf, 0xbe4e2f3a),
-     TOBN(0xb86186b6, 0x8bcec9c2), TOBN(0x7cf24df9, 0x680b9f06),
-     TOBN(0xc46b45ea, 0xc0d29281), TOBN(0xfff42bc5, 0x07b10e12),
-     TOBN(0x12263c40, 0x4d289427), TOBN(0x3d5f1899, 0xb4848ec4),
-     TOBN(0x11f97010, 0xd040800c), TOBN(0xb4c5f529, 0x300feb20),
-     TOBN(0xcc543f8f, 0xde94fdcb), TOBN(0xe96af739, 0xc7c2f05e),
-     TOBN(0xaa5e0036, 0x882692e1), TOBN(0x09c75b68, 0x950d4ae9),
-     TOBN(0x62f63df2, 0xb5932a7a), TOBN(0x2658252e, 0xde0979ad),
-     TOBN(0x2a19343f, 0xb5e69631), TOBN(0x718c7501, 0x525b666b),
-     TOBN(0x26a42d69, 0xea40dc3a), TOBN(0xdc84ad22, 0xaecc018f),
-     TOBN(0x25c36c7b, 0x3270f04a), TOBN(0x46ba6d47, 0x50fa72ed),
-     TOBN(0x6c37d1c5, 0x93e58a8e), TOBN(0xa2394731, 0x120c088c),
-     TOBN(0xc3be4263, 0xcb6e86da), TOBN(0x2c417d36, 0x7126d038),
-     TOBN(0x5b70f9c5, 0x8b6f8efa), TOBN(0x671a2faa, 0x37718536),
-     TOBN(0xd3ced3c6, 0xb539c92b), TOBN(0xe56f1bd9, 0xa31203c2),
-     TOBN(0x8b096ec4, 0x9ff3c8eb), TOBN(0x2deae432, 0x43491cea),
-     TOBN(0x2465c6eb, 0x17943794), TOBN(0x5d267e66, 0x20586843),
-     TOBN(0x9d3d116d, 0xb07159d0), TOBN(0xae07a67f, 0xc1896210),
-     TOBN(0x8fc84d87, 0xbb961579), TOBN(0x30009e49, 0x1c1f8dd6),
-     TOBN(0x8a8caf22, 0xe3132819), TOBN(0xcffa197c, 0xf23ab4ff),
-     TOBN(0x58103a44, 0x205dd687), TOBN(0x57b796c3, 0x0ded67a2),
-     TOBN(0x0b9c3a6c, 0xa1779ad7), TOBN(0xa33cfe2e, 0x357c09c5),
-     TOBN(0x2ea29315, 0x3db4a57e), TOBN(0x91959695, 0x8ebeb52e),
-     TOBN(0x118db9a6, 0xe546c879), TOBN(0x8e996df4, 0x6295c8d6),
-     TOBN(0xdd990484, 0x55ec806b), TOBN(0x24f291ca, 0x165c1035),
-     TOBN(0xcca523bb, 0x440e2229), TOBN(0x324673a2, 0x73ef4d04),
-     TOBN(0xaf3adf34, 0x3e11ec39), TOBN(0x6136d7f1, 0xdc5968d3),
-     TOBN(0x7a7b2899, 0xb053a927), TOBN(0x3eaa2661, 0xae067ecd),
-     TOBN(0x8549b9c8, 0x02779cd9), TOBN(0x061d7940, 0xc53385ea),
-     TOBN(0x3e0ba883, 0xf06d18bd), TOBN(0x4ba6de53, 0xb2700843),
-     TOBN(0xb966b668, 0x591a9e4d), TOBN(0x93f67567, 0x7f4fa0ed),
-     TOBN(0x5a02711b, 0x4347237b), TOBN(0xbc041e2f, 0xe794608e),
-     TOBN(0x55af10f5, 0x70f73d8c), TOBN(0xd2d4d4f7, 0xbb7564f7),
-     TOBN(0xd7d27a89, 0xb3e93ce7), TOBN(0xf7b5a875, 0x5d3a2c1b),
-     TOBN(0xb29e68a0, 0x255b218a), TOBN(0xb533837e, 0x8af76754),
-     TOBN(0xd1b05a73, 0x579fab2e), TOBN(0xb41055a1, 0xecd74385),
-     TOBN(0xb2369274, 0x445e9115), TOBN(0x2972a7c4, 0xf520274e),
-     TOBN(0x6c08334e, 0xf678e68a), TOBN(0x4e4160f0, 0x99b057ed),
-     TOBN(0x3cfe11b8, 0x52ccb69a), TOBN(0x2fd1823a, 0x21c8f772),
-     TOBN(0xdf7f072f, 0x3298f055), TOBN(0x8c0566f9, 0xfec74a6e),
-     TOBN(0xe549e019, 0x5bb4d041), TOBN(0x7c3930ba, 0x9208d850),
-     TOBN(0xe07141fc, 0xaaa2902b), TOBN(0x539ad799, 0xe4f69ad3),
-     TOBN(0xa6453f94, 0x813f9ffd), TOBN(0xc58d3c48, 0x375bc2f7),
-     TOBN(0xb3326fad, 0x5dc64e96), TOBN(0x3aafcaa9, 0xb240e354),
-     TOBN(0x1d1b0903, 0xaca1e7a9), TOBN(0x4ceb9767, 0x1211b8a0),
-     TOBN(0xeca83e49, 0xe32a858e), TOBN(0x4c32892e, 0xae907bad),
-     TOBN(0xd5b42ab6, 0x2eb9b494), TOBN(0x7fde3ee2, 0x1eabae1b),
-     TOBN(0x13b5ab09, 0xcaf54957), TOBN(0xbfb028be, 0xe5f5d5d5),
-     TOBN(0x928a0650, 0x2003e2c0), TOBN(0x90793aac, 0x67476843),
-     TOBN(0x5e942e79, 0xc81710a0), TOBN(0x557e4a36, 0x27ccadd4),
-     TOBN(0x72a2bc56, 0x4bcf6d0c), TOBN(0x09ee5f43, 0x26d7b80c),
-     TOBN(0x6b70dbe9, 0xd4292f19), TOBN(0x56f74c26, 0x63f16b18),
-     TOBN(0xc23db0f7, 0x35fbb42a), TOBN(0xb606bdf6, 0x6ae10040),
-     TOBN(0x1eb15d4d, 0x044573ac), TOBN(0x7dc3cf86, 0x556b0ba4),
-     TOBN(0x97af9a33, 0xc60df6f7), TOBN(0x0b1ef85c, 0xa716ce8c),
-     TOBN(0x2922f884, 0xc96958be), TOBN(0x7c32fa94, 0x35690963),
-     TOBN(0x2d7f667c, 0xeaa00061), TOBN(0xeaaf7c17, 0x3547365c),
-     TOBN(0x1eb4de46, 0x87032d58), TOBN(0xc54f3d83, 0x5e2c79e0),
-     TOBN(0x07818df4, 0x5d04ef23), TOBN(0x55faa9c8, 0x673d41b4),
-     TOBN(0xced64f6f, 0x89b95355), TOBN(0x4860d2ea, 0xb7415c84),
-     TOBN(0x5fdb9bd2, 0x050ebad3), TOBN(0xdb53e0cc, 0x6685a5bf),
-     TOBN(0xb830c031, 0x9feb6593), TOBN(0xdd87f310, 0x6accff17),
-     TOBN(0x2303ebab, 0x9f555c10), TOBN(0x94603695, 0x287e7065),
-     TOBN(0xf88311c3, 0x2e83358c), TOBN(0x508dd9b4, 0xeefb0178),
-     TOBN(0x7ca23706, 0x2dba8652), TOBN(0x62aac5a3, 0x0047abe5),
-     TOBN(0x9a61d2a0, 0x8b1ea7b3), TOBN(0xd495ab63, 0xae8b1485),
-     TOBN(0x38740f84, 0x87052f99), TOBN(0x178ebe5b, 0xb2974eea),
-     TOBN(0x030bbcca, 0x5b36d17f), TOBN(0xb5e4cce3, 0xaaf86eea),
-     TOBN(0xb51a0220, 0x68f8e9e0), TOBN(0xa4348796, 0x09eb3e75),
-     TOBN(0xbe592309, 0xeef1a752), TOBN(0x5d7162d7, 0x6f2aa1ed),
-     TOBN(0xaebfb5ed, 0x0f007dd2), TOBN(0x255e14b2, 0xc89edd22),
-     TOBN(0xba85e072, 0x0303b697), TOBN(0xc5d17e25, 0xf05720ff),
-     TOBN(0x02b58d6e, 0x5128ebb6), TOBN(0x2c80242d, 0xd754e113),
-     TOBN(0x919fca5f, 0xabfae1ca), TOBN(0x937afaac, 0x1a21459b),
-     TOBN(0x9e0ca91c, 0x1f66a4d2), TOBN(0x194cc7f3, 0x23ec1331),
-     TOBN(0xad25143a, 0x8aa11690), TOBN(0xbe40ad8d, 0x09b59e08),
-     TOBN(0x37d60d9b, 0xe750860a), TOBN(0x6c53b008, 0xc6bf434c),
-     TOBN(0xb572415d, 0x1356eb80), TOBN(0xb8bf9da3, 0x9578ded8),
-     TOBN(0x22658e36, 0x5e8fb38b), TOBN(0x9b70ce22, 0x5af8cb22),
-     TOBN(0x7c00018a, 0x829a8180), TOBN(0x84329f93, 0xb81ed295),
-     TOBN(0x7c343ea2, 0x5f3cea83), TOBN(0x38f8655f, 0x67586536),
-     TOBN(0xa661a0d0, 0x1d3ec517), TOBN(0x98744652, 0x512321ae),
-     TOBN(0x084ca591, 0xeca92598), TOBN(0xa9bb9dc9, 0x1dcb3feb),
-     TOBN(0x14c54355, 0x78b4c240), TOBN(0x5ed62a3b, 0x610cafdc),
-     TOBN(0x07512f37, 0x1b38846b), TOBN(0x571bb70a, 0xb0e38161),
-     TOBN(0xb556b95b, 0x2da705d2), TOBN(0x3ef8ada6, 0xb1a08f98),
-     TOBN(0x85302ca7, 0xddecfbe5), TOBN(0x0e530573, 0x943105cd),
-     TOBN(0x60554d55, 0x21a9255d), TOBN(0x63a32fa1, 0xf2f3802a),
-     TOBN(0x35c8c5b0, 0xcd477875), TOBN(0x97f458ea, 0x6ad42da1),
-     TOBN(0x832d7080, 0xeb6b242d), TOBN(0xd30bd023, 0x3b71e246),
-     TOBN(0x7027991b, 0xbe31139d), TOBN(0x68797e91, 0x462e4e53),
-     TOBN(0x423fe20a, 0x6b4e185a), TOBN(0x82f2c67e, 0x42d9b707),
-     TOBN(0x25c81768, 0x4cf7811b), TOBN(0xbd53005e, 0x045bb95d),}
-    ,
-    {TOBN(0xe5f649be, 0x9d8e68fd), TOBN(0xdb0f0533, 0x1b044320),
-     TOBN(0xf6fde9b3, 0xe0c33398), TOBN(0x92f4209b, 0x66c8cfae),
-     TOBN(0xe9d1afcc, 0x1a739d4b), TOBN(0x09aea75f, 0xa28ab8de),
-     TOBN(0x14375fb5, 0xeac6f1d0), TOBN(0x6420b560, 0x708f7aa5),
-     TOBN(0x9eae499c, 0x6254dc41), TOBN(0x7e293924, 0x7a837e7e),
-     TOBN(0x74aec08c, 0x090524a7), TOBN(0xf82b9219, 0x8d6f55f2),
-     TOBN(0x493c962e, 0x1402cec5), TOBN(0x9f17ca17, 0xfa2f30e7),
-     TOBN(0xbcd783e8, 0xe9b879cb), TOBN(0xea3d8c14, 0x5a6f145f),
-     TOBN(0xdede15e7, 0x5e0dee6e), TOBN(0x74f24872, 0xdc628aa2),
-     TOBN(0xd3e9c4fe, 0x7861bb93), TOBN(0x56d4822a, 0x6187b2e0),
-     TOBN(0xb66417cf, 0xc59826f9), TOBN(0xca260969, 0x2408169e),
-     TOBN(0xedf69d06, 0xc79ef885), TOBN(0x00031f8a, 0xdc7d138f),
-     TOBN(0x103c46e6, 0x0ebcf726), TOBN(0x4482b831, 0x6231470e),
-     TOBN(0x6f6dfaca, 0x487c2109), TOBN(0x2e0ace97, 0x62e666ef),
-     TOBN(0x3246a9d3, 0x1f8d1f42), TOBN(0x1b1e83f1, 0x574944d2),
-     TOBN(0x13dfa63a, 0xa57f334b), TOBN(0x0cf8daed, 0x9f025d81),
-     TOBN(0x30d78ea8, 0x00ee11c1), TOBN(0xeb053cd4, 0xb5e3dd75),
-     TOBN(0x9b65b13e, 0xd58c43c5), TOBN(0xc3ad49bd, 0xbd151663),
-     TOBN(0x99fd8e41, 0xb6427990), TOBN(0x12cf15bd, 0x707eae1e),
-     TOBN(0x29ad4f1b, 0x1aabb71e), TOBN(0x5143e74d, 0x07545d0e),
-     TOBN(0x30266336, 0xc88bdee1), TOBN(0x25f29306, 0x5876767c),
-     TOBN(0x9c078571, 0xc6731996), TOBN(0xc88690b2, 0xed552951),
-     TOBN(0x274f2c2d, 0x852705b4), TOBN(0xb0bf8d44, 0x4e09552d),
-     TOBN(0x7628beeb, 0x986575d1), TOBN(0x407be238, 0x7f864651),
-     TOBN(0x0e5e3049, 0xa639fc6b), TOBN(0xe75c35d9, 0x86003625),
-     TOBN(0x0cf35bd8, 0x5dcc1646), TOBN(0x8bcaced2, 0x6c26273a),
-     TOBN(0xe22ecf1d, 0xb5536742), TOBN(0x013dd897, 0x1a9e068b),
-     TOBN(0x17f411cb, 0x8a7909c5), TOBN(0x5757ac98, 0x861dd506),
-     TOBN(0x85de1f0d, 0x1e935abb), TOBN(0xdefd10b4, 0x154de37a),
-     TOBN(0xb8d9e392, 0x369cebb5), TOBN(0x54d5ef9b, 0x761324be),
-     TOBN(0x4d6341ba, 0x74f17e26), TOBN(0xc0a0e3c8, 0x78c1dde4),
-     TOBN(0xa6d77581, 0x87d918fd), TOBN(0x66876015, 0x02ca3a13),
-     TOBN(0xc7313e9c, 0xf36658f0), TOBN(0xc433ef1c, 0x71f8057e),
-     TOBN(0x85326246, 0x1b6a835a), TOBN(0xc8f05398, 0x7c86394c),
-     TOBN(0xff398cdf, 0xe983c4a1), TOBN(0xbf5e8162, 0x03b7b931),
-     TOBN(0x93193c46, 0xb7b9045b), TOBN(0x1e4ebf5d, 0xa4a6e46b),
-     TOBN(0xf9942a60, 0x43a24fe7), TOBN(0x29c1191e, 0xffb3492b),
-     TOBN(0x9f662449, 0x902fde05), TOBN(0xc792a7ac, 0x6713c32d),
-     TOBN(0x2fd88ad8, 0xb737982c), TOBN(0x7e3a0319, 0xa21e60e3),
-     TOBN(0x09b0de44, 0x7383591a), TOBN(0x6df141ee, 0x8310a456),
-     TOBN(0xaec1a039, 0xe6d6f471), TOBN(0x14b2ba0f, 0x1198d12e),
-     TOBN(0xebc1a160, 0x3aeee5ac), TOBN(0x401f4836, 0xe0b964ce),
-     TOBN(0x2ee43796, 0x4fd03f66), TOBN(0x3fdb4e49, 0xdd8f3f12),
-     TOBN(0x6ef267f6, 0x29380f18), TOBN(0x3e8e9670, 0x8da64d16),
-     TOBN(0xbc19180c, 0x207674f1), TOBN(0x112e09a7, 0x33ae8fdb),
-     TOBN(0x99667554, 0x6aaeb71e), TOBN(0x79432af1, 0xe101b1c7),
-     TOBN(0xd5eb558f, 0xde2ddec6), TOBN(0x81392d1f, 0x5357753f),
-     TOBN(0xa7a76b97, 0x3ae1158a), TOBN(0x416fbbff, 0x4a899991),
-     TOBN(0x9e65fdfd, 0x0d4a9dcf), TOBN(0x7bc29e48, 0x944ddf12),
-     TOBN(0xbc1a92d9, 0x3c856866), TOBN(0x273c6905, 0x6e98dfe2),
-     TOBN(0x69fce418, 0xcdfaa6b8), TOBN(0x606bd823, 0x5061c69f),
-     TOBN(0x42d495a0, 0x6af75e27), TOBN(0x8ed3d505, 0x6d873a1f),
-     TOBN(0xaf552841, 0x6ab25b6a), TOBN(0xc6c0ffc7, 0x2b1a4523),
-     TOBN(0xab18827b, 0x21c99e03), TOBN(0x060e8648, 0x9034691b),
-     TOBN(0x5207f90f, 0x93c7f398), TOBN(0x9f4a96cb, 0x82f8d10b),
-     TOBN(0xdd71cd79, 0x3ad0f9e3), TOBN(0x84f435d2, 0xfc3a54f5),
-     TOBN(0x4b03c55b, 0x8e33787f), TOBN(0xef42f975, 0xa6384673),
-     TOBN(0xff7304f7, 0x5051b9f0), TOBN(0x18aca1dc, 0x741c87c2),
-     TOBN(0x56f120a7, 0x2d4bfe80), TOBN(0xfd823b3d, 0x053e732c),
-     TOBN(0x11bccfe4, 0x7537ca16), TOBN(0xdf6c9c74, 0x1b5a996b),
-     TOBN(0xee7332c7, 0x904fc3fa), TOBN(0x14a23f45, 0xc7e3636a),
-     TOBN(0xc38659c3, 0xf091d9aa), TOBN(0x4a995e5d, 0xb12d8540),
-     TOBN(0x20a53bec, 0xf3a5598a), TOBN(0x56534b17, 0xb1eaa995),
-     TOBN(0x9ed3dca4, 0xbf04e03c), TOBN(0x716c563a, 0xd8d56268),
-     TOBN(0x27ba77a4, 0x1d6178e7), TOBN(0xe4c80c40, 0x68a1ff8e),
-     TOBN(0x75011099, 0x0a13f63d), TOBN(0x7bf33521, 0xa61d46f3),
-     TOBN(0x0aff218e, 0x10b365bb), TOBN(0x81021804, 0x0fd7ea75),
-     TOBN(0x05a3fd8a, 0xa4b3a925), TOBN(0xb829e75f, 0x9b3db4e6),
-     TOBN(0x6bdc75a5, 0x4d53e5fb), TOBN(0x04a5dc02, 0xd52717e3),
-     TOBN(0x86af502f, 0xe9a42ec2), TOBN(0x8867e8fb, 0x2630e382),
-     TOBN(0xbf845c6e, 0xbec9889b), TOBN(0x54f491f2, 0xcb47c98d),
-     TOBN(0xa3091fba, 0x790c2a12), TOBN(0xd7f6fd78, 0xc20f708b),
-     TOBN(0xa569ac30, 0xacde5e17), TOBN(0xd0f996d0, 0x6852b4d7),
-     TOBN(0xe51d4bb5, 0x4609ae54), TOBN(0x3fa37d17, 0x0daed061),
-     TOBN(0x62a88684, 0x34b8fb41), TOBN(0x99a2acbd, 0x9efb64f1),
-     TOBN(0xb75c1a5e, 0x6448e1f2), TOBN(0xfa99951a, 0x42b5a069),
-     TOBN(0x6d956e89, 0x2f3b26e7), TOBN(0xf4709860, 0xda875247),
-     TOBN(0x3ad15179, 0x2482dda3), TOBN(0xd64110e3, 0x017d82f0),
-     TOBN(0x14928d2c, 0xfad414e4), TOBN(0x2b155f58, 0x2ed02b24),
-     TOBN(0x481a141b, 0xcb821bf1), TOBN(0x12e3c770, 0x4f81f5da),
-     TOBN(0xe49c5de5, 0x9fff8381), TOBN(0x11053232, 0x5bbec894),
-     TOBN(0xa0d051cc, 0x454d88c4), TOBN(0x4f6db89c, 0x1f8e531b),
-     TOBN(0x34fe3fd6, 0xca563a44), TOBN(0x7f5c2215, 0x58da8ab9),
-     TOBN(0x8445016d, 0x9474f0a1), TOBN(0x17d34d61, 0xcb7d8a0a),
-     TOBN(0x8e9d3910, 0x1c474019), TOBN(0xcaff2629, 0xd52ceefb),
-     TOBN(0xf9cf3e32, 0xc1622c2b), TOBN(0xd4b95e3c, 0xe9071a05),
-     TOBN(0xfbbca61f, 0x1594438c), TOBN(0x1eb6e6a6, 0x04aadedf),
-     TOBN(0x853027f4, 0x68e14940), TOBN(0x221d322a, 0xdfabda9c),
-     TOBN(0xed8ea9f6, 0xb7cb179a), TOBN(0xdc7b764d, 0xb7934dcc),
-     TOBN(0xfcb13940, 0x5e09180d), TOBN(0x6629a6bf, 0xb47dc2dd),
-     TOBN(0xbfc55e4e, 0x9f5a915e), TOBN(0xb1db9d37, 0x6204441e),
-     TOBN(0xf82d68cf, 0x930c5f53), TOBN(0x17d3a142, 0xcbb605b1),
-     TOBN(0xdd5944ea, 0x308780f2), TOBN(0xdc8de761, 0x3845f5e4),
-     TOBN(0x6beaba7d, 0x7624d7a3), TOBN(0x1e709afd, 0x304df11e),
-     TOBN(0x95364376, 0x02170456), TOBN(0xbf204b3a, 0xc8f94b64),
-     TOBN(0x4e53af7c, 0x5680ca68), TOBN(0x0526074a, 0xe0c67574),
-     TOBN(0x95d8cef8, 0xecd92af6), TOBN(0xe6b9fa7a, 0x6cd1745a),
-     TOBN(0x3d546d3d, 0xa325c3e4), TOBN(0x1f57691d, 0x9ae93aae),
-     TOBN(0xe891f3fe, 0x9d2e1a33), TOBN(0xd430093f, 0xac063d35),
-     TOBN(0xeda59b12, 0x5513a327), TOBN(0xdc2134f3, 0x5536f18f),
-     TOBN(0xaa51fe2c, 0x5c210286), TOBN(0x3f68aaee, 0x1cab658c),
-     TOBN(0x5a23a00b, 0xf9357292), TOBN(0x9a626f39, 0x7efdabed),
-     TOBN(0xfe2b3bf3, 0x199d78e3), TOBN(0xb7a2af77, 0x71bbc345),
-     TOBN(0x3d19827a, 0x1e59802c), TOBN(0x823bbc15, 0xb487a51c),
-     TOBN(0x856139f2, 0x99d0a422), TOBN(0x9ac3df65, 0xf456c6fb),
-     TOBN(0xaddf65c6, 0x701f8bd6), TOBN(0x149f321e, 0x3758df87),
-     TOBN(0xb1ecf714, 0x721b7eba), TOBN(0xe17df098, 0x31a3312a),
-     TOBN(0xdb2fd6ec, 0xd5c4d581), TOBN(0xfd02996f, 0x8fcea1b3),
-     TOBN(0xe29fa63e, 0x7882f14f), TOBN(0xc9f6dc35, 0x07c6cadc),
-     TOBN(0x46f22d6f, 0xb882bed0), TOBN(0x1a45755b, 0xd118e52c),
-     TOBN(0x9f2c7c27, 0x7c4608cf), TOBN(0x7ccbdf32, 0x568012c2),
-     TOBN(0xfcb0aedd, 0x61729b0e), TOBN(0x7ca2ca9e, 0xf7d75dbf),
-     TOBN(0xf58fecb1, 0x6f640f62), TOBN(0xe274b92b, 0x39f51946),
-     TOBN(0x7f4dfc04, 0x6288af44), TOBN(0x0a91f32a, 0xeac329e5),
-     TOBN(0x43ad274b, 0xd6aaba31), TOBN(0x719a1640, 0x0f6884f9),
-     TOBN(0x685d29f6, 0xdaf91e20), TOBN(0x5ec1cc33, 0x27e49d52),
-     TOBN(0x38f4de96, 0x3b54a059), TOBN(0x0e0015e5, 0xefbcfdb3),
-     TOBN(0x177d23d9, 0x4dbb8da6), TOBN(0x98724aa2, 0x97a617ad),
-     TOBN(0x30f0885b, 0xfdb6558e), TOBN(0xf9f7a28a, 0xc7899a96),
-     TOBN(0xd2ae8ac8, 0x872dc112), TOBN(0xfa0642ca, 0x73c3c459),
-     TOBN(0x15296981, 0xe7dfc8d6), TOBN(0x67cd4450, 0x1fb5b94a),
-     TOBN(0x0ec71cf1, 0x0eddfd37), TOBN(0xc7e5eeb3, 0x9a8eddc7),
-     TOBN(0x02ac8e3d, 0x81d95028), TOBN(0x0088f172, 0x70b0e35d),
-     TOBN(0xec041fab, 0xe1881fe3), TOBN(0x62cf71b8, 0xd99e7faa),
-     TOBN(0x5043dea7, 0xe0f222c2), TOBN(0x309d42ac, 0x72e65142),
-     TOBN(0x94fe9ddd, 0x9216cd30), TOBN(0xd6539c7d, 0x0f87feec),
-     TOBN(0x03c5a57c, 0x432ac7d7), TOBN(0x72692cf0, 0x327fda10),
-     TOBN(0xec28c85f, 0x280698de), TOBN(0x2331fb46, 0x7ec283b1),
-     TOBN(0xd34bfa32, 0x2867e633), TOBN(0x78709a82, 0x0a9cc815),
-     TOBN(0xb7fe6964, 0x875e2fa5), TOBN(0x25cc064f, 0x9e98bfb5),
-     TOBN(0x9eb0151c, 0x493a65c5), TOBN(0x5fb5d941, 0x53182464),
-     TOBN(0x69e6f130, 0xf04618e2), TOBN(0xa8ecec22, 0xf89c8ab6),
-     TOBN(0xcd6ac88b, 0xb96209bd), TOBN(0x65fa8cdb, 0xb3e1c9e0),
-     TOBN(0xa47d22f5, 0x4a8d8eac), TOBN(0x83895cdf, 0x8d33f963),
-     TOBN(0xa8adca59, 0xb56cd3d1), TOBN(0x10c8350b, 0xdaf38232),
-     TOBN(0x2b161fb3, 0xa5080a9f), TOBN(0xbe7f5c64, 0x3af65b3a),
-     TOBN(0x2c754039, 0x97403a11), TOBN(0x94626cf7, 0x121b96af),
-     TOBN(0x431de7c4, 0x6a983ec2), TOBN(0x3780dd3a, 0x52cc3df7),
-     TOBN(0xe28a0e46, 0x2baf8e3b), TOBN(0xabe68aad, 0x51d299ae),
-     TOBN(0x603eb8f9, 0x647a2408), TOBN(0x14c61ed6, 0x5c750981),
-     TOBN(0x88b34414, 0xc53352e7), TOBN(0x5a34889c, 0x1337d46e),
-     TOBN(0x612c1560, 0xf95f2bc8), TOBN(0x8a3f8441, 0xd4807a3a),
-     TOBN(0x680d9e97, 0x5224da68), TOBN(0x60cd6e88, 0xc3eb00e9),
-     TOBN(0x3875a98e, 0x9a6bc375), TOBN(0xdc80f924, 0x4fd554c2),
-     TOBN(0x6c4b3415, 0x6ac77407), TOBN(0xa1e5ea8f, 0x25420681),
-     TOBN(0x541bfa14, 0x4607a458), TOBN(0x5dbc7e7a, 0x96d7fbf9),
-     TOBN(0x646a851b, 0x31590a47), TOBN(0x039e85ba, 0x15ee6df8),
-     TOBN(0xd19fa231, 0xd7b43fc0), TOBN(0x84bc8be8, 0x299a0e04),
-     TOBN(0x2b9d2936, 0xf20df03a), TOBN(0x24054382, 0x8608d472),
-     TOBN(0x76b6ba04, 0x9149202a), TOBN(0xb21c3831, 0x3670e7b7),
-     TOBN(0xddd93059, 0xd6fdee10), TOBN(0x9da47ad3, 0x78488e71),
-     TOBN(0x99cc1dfd, 0xa0fcfb25), TOBN(0x42abde10, 0x64696954),
-     TOBN(0x14cc15fc, 0x17eab9fe), TOBN(0xd6e863e4, 0xd3e70972),
-     TOBN(0x29a7765c, 0x6432112c), TOBN(0x88660001, 0x5b0774d8),
-     TOBN(0x3729175a, 0x2c088eae), TOBN(0x13afbcae, 0x8230b8d4),
-     TOBN(0x44768151, 0x915f4379), TOBN(0xf086431a, 0xd8d22812),
-     TOBN(0x37461955, 0xc298b974), TOBN(0x905fb5f0, 0xf8711e04),
-     TOBN(0x787abf3a, 0xfe969d18), TOBN(0x392167c2, 0x6f6a494e),
-     TOBN(0xfc7a0d2d, 0x28c511da), TOBN(0xf127c7dc, 0xb66a262d),
-     TOBN(0xf9c4bb95, 0xfd63fdf0), TOBN(0x90016589, 0x3913ef46),
-     TOBN(0x74d2a73c, 0x11aa600d), TOBN(0x2f5379bd, 0x9fb5ab52),
-     TOBN(0xe49e53a4, 0x7fb70068), TOBN(0x68dd39e5, 0x404aa9a7),
-     TOBN(0xb9b0cf57, 0x2ecaa9c3), TOBN(0xba0e103b, 0xe824826b),
-     TOBN(0x60c2198b, 0x4631a3c4), TOBN(0xc5ff84ab, 0xfa8966a2),
-     TOBN(0x2d6ebe22, 0xac95aff8), TOBN(0x1c9bb6db, 0xb5a46d09),
-     TOBN(0x419062da, 0x53ee4f8d), TOBN(0x7b9042d0, 0xbb97efef),
-     TOBN(0x0f87f080, 0x830cf6bd), TOBN(0x4861d19a, 0x6ec8a6c6),
-     TOBN(0xd3a0daa1, 0x202f01aa), TOBN(0xb0111674, 0xf25afbd5),
-     TOBN(0x6d00d6cf, 0x1afb20d9), TOBN(0x13695000, 0x40671bc5),
-     TOBN(0x913ab0dc, 0x2485ea9b), TOBN(0x1f2bed06, 0x9eef61ac),
-     TOBN(0x850c8217, 0x6d799e20), TOBN(0x93415f37, 0x3271c2de),
-     TOBN(0x5afb06e9, 0x6c4f5910), TOBN(0x688a52df, 0xc4e9e421),
-     TOBN(0x30495ba3, 0xe2a9a6db), TOBN(0x4601303d, 0x58f9268b),
-     TOBN(0xbe3b0dad, 0x7eb0f04f), TOBN(0x4ea47250, 0x4456936d),
-     TOBN(0x8caf8798, 0xd33fd3e7), TOBN(0x1ccd8a89, 0xeb433708),
-     TOBN(0x9effe3e8, 0x87fd50ad), TOBN(0xbe240a56, 0x6b29c4df),
-     TOBN(0xec4ffd98, 0xca0e7ebd), TOBN(0xf586783a, 0xe748616e),
-     TOBN(0xa5b00d8f, 0xc77baa99), TOBN(0x0acada29, 0xb4f34c9c),
-     TOBN(0x36dad67d, 0x0fe723ac), TOBN(0x1d8e53a5, 0x39c36c1e),
-     TOBN(0xe4dd342d, 0x1f4bea41), TOBN(0x64fd5e35, 0xebc9e4e0),
-     TOBN(0x96f01f90, 0x57908805), TOBN(0xb5b9ea3d, 0x5ed480dd),
-     TOBN(0x366c5dc2, 0x3efd2dd0), TOBN(0xed2fe305, 0x6e9dfa27),
-     TOBN(0x4575e892, 0x6e9197e2), TOBN(0x11719c09, 0xab502a5d),
-     TOBN(0x264c7bec, 0xe81f213f), TOBN(0x741b9241, 0x55f5c457),
-     TOBN(0x78ac7b68, 0x49a5f4f4), TOBN(0xf91d70a2, 0x9fc45b7d),
-     TOBN(0x39b05544, 0xb0f5f355), TOBN(0x11f06bce, 0xeef930d9),
-     TOBN(0xdb84d25d, 0x038d05e1), TOBN(0x04838ee5, 0xbacc1d51),
-     TOBN(0x9da3ce86, 0x9e8ee00b), TOBN(0xc3412057, 0xc36eda1f),
-     TOBN(0xae80b913, 0x64d9c2f4), TOBN(0x7468bac3, 0xa010a8ff),
-     TOBN(0xdfd20037, 0x37359d41), TOBN(0x1a0f5ab8, 0x15efeacc),
-     TOBN(0x7c25ad2f, 0x659d0ce0), TOBN(0x4011bcbb, 0x6785cff1),
-     TOBN(0x128b9912, 0x7e2192c7), TOBN(0xa549d8e1, 0x13ccb0e8),
-     TOBN(0x805588d8, 0xc85438b1), TOBN(0x5680332d, 0xbc25cb27),
-     TOBN(0xdcd1bc96, 0x1a4bfdf4), TOBN(0x779ff428, 0x706f6566),
-     TOBN(0x8bbee998, 0xf059987a), TOBN(0xf6ce8cf2, 0xcc686de7),
-     TOBN(0xf8ad3c4a, 0x953cfdb2), TOBN(0xd1d426d9, 0x2205da36),
-     TOBN(0xb3c0f13f, 0xc781a241), TOBN(0x3e89360e, 0xd75362a8),
-     TOBN(0xccd05863, 0xc8a91184), TOBN(0x9bd0c9b7, 0xefa8a7f4),
-     TOBN(0x97ee4d53, 0x8a912a4b), TOBN(0xde5e15f8, 0xbcf518fd),
-     TOBN(0x6a055bf8, 0xc467e1e0), TOBN(0x10be4b4b, 0x1587e256),
-     TOBN(0xd90c14f2, 0x668621c9), TOBN(0xd5518f51, 0xab9c92c1),
-     TOBN(0x8e6a0100, 0xd6d47b3c), TOBN(0xcbe980dd, 0x66716175),
-     TOBN(0x500d3f10, 0xddd83683), TOBN(0x3b6cb35d, 0x99cac73c),
-     TOBN(0x53730c8b, 0x6083d550), TOBN(0xcf159767, 0xdf0a1987),
-     TOBN(0x84bfcf53, 0x43ad73b3), TOBN(0x1b528c20, 0x4f035a94),
-     TOBN(0x4294edf7, 0x33eeac69), TOBN(0xb6283e83, 0x817f3240),
-     TOBN(0xc3fdc959, 0x0a5f25b1), TOBN(0xefaf8aa5, 0x5844ee22),
-     TOBN(0xde269ba5, 0xdbdde4de), TOBN(0xe3347160, 0xc56133bf),
-     TOBN(0xc1184219, 0x8d9ea9f8), TOBN(0x090de5db, 0xf3fc1ab5),
-     TOBN(0x404c37b1, 0x0bf22cda), TOBN(0x7de20ec8, 0xf5618894),
-     TOBN(0x754c588e, 0xecdaecab), TOBN(0x6ca4b0ed, 0x88342743),
-     TOBN(0x76f08bdd, 0xf4a938ec), TOBN(0xd182de89, 0x91493ccb),
-     TOBN(0xd652c53e, 0xc8a4186a), TOBN(0xb3e878db, 0x946d8e33),
-     TOBN(0x088453c0, 0x5f37663c), TOBN(0x5cd9daaa, 0xb407748b),
-     TOBN(0xa1f5197f, 0x586d5e72), TOBN(0x47500be8, 0xc443ca59),
-     TOBN(0x78ef35b2, 0xe2652424), TOBN(0x09c5d26f, 0x6dd7767d),
-     TOBN(0x7175a79a, 0xa74d3f7b), TOBN(0x0428fd8d, 0xcf5ea459),
-     TOBN(0x511cb97c, 0xa5d1746d), TOBN(0x36363939, 0xe71d1278),
-     TOBN(0xcf2df955, 0x10350bf4), TOBN(0xb3817439, 0x60aae782),
-     TOBN(0xa748c0e4, 0x3e688809), TOBN(0x98021fbf, 0xd7a5a006),
-     TOBN(0x9076a70c, 0x0e367a98), TOBN(0xbea1bc15, 0x0f62b7c2),
-     TOBN(0x2645a68c, 0x30fe0343), TOBN(0xacaffa78, 0x699dc14f),
-     TOBN(0xf4469964, 0x457bf9c4), TOBN(0x0db6407b, 0x0d2ead83),
-     TOBN(0x68d56cad, 0xb2c6f3eb), TOBN(0x3b512e73, 0xf376356c),
-     TOBN(0xe43b0e1f, 0xfce10408), TOBN(0x89ddc003, 0x5a5e257d),
-     TOBN(0xb0ae0d12, 0x0362e5b3), TOBN(0x07f983c7, 0xb0519161),
-     TOBN(0xc2e94d15, 0x5d5231e7), TOBN(0xcff22aed, 0x0b4f9513),
-     TOBN(0xb02588dd, 0x6ad0b0b5), TOBN(0xb967d1ac, 0x11d0dcd5),
-     TOBN(0x8dac6bc6, 0xcf777b6c), TOBN(0x0062bdbd, 0x4c6d1959),
-     TOBN(0x53da71b5, 0x0ef5cc85), TOBN(0x07012c7d, 0x4006f14f),
-     TOBN(0x4617f962, 0xac47800d), TOBN(0x53365f2b, 0xc102ed75),
-     TOBN(0xb422efcb, 0x4ab8c9d3), TOBN(0x195cb26b, 0x34af31c9),
-     TOBN(0x3a926e29, 0x05f2c4ce), TOBN(0xbd2bdecb, 0x9856966c),
-     TOBN(0x5d16ab3a, 0x85527015), TOBN(0x9f81609e, 0x4486c231),
-     TOBN(0xd8b96b2c, 0xda350002), TOBN(0xbd054690, 0xfa1b7d36),
-     TOBN(0xdc90ebf5, 0xe71d79bc), TOBN(0xf241b6f9, 0x08964e4e),
-     TOBN(0x7c838643, 0x2fe3cd4c), TOBN(0xe0f33acb, 0xb4bc633c),
-     TOBN(0xb4a9ecec, 0x3d139f1f), TOBN(0x05ce69cd, 0xdc4a1f49),
-     TOBN(0xa19d1b16, 0xf5f98aaf), TOBN(0x45bb71d6, 0x6f23e0ef),
-     TOBN(0x33789fcd, 0x46cdfdd3), TOBN(0x9b8e2978, 0xcee040ca),
-     TOBN(0x9c69b246, 0xae0a6828), TOBN(0xba533d24, 0x7078d5aa),
-     TOBN(0x7a2e42c0, 0x7bb4fbdb), TOBN(0xcfb4879a, 0x7035385c),
-     TOBN(0x8c3dd30b, 0x3281705b), TOBN(0x7e361c6c, 0x404fe081),
-     TOBN(0x7b21649c, 0x3f604edf), TOBN(0x5dbf6a3f, 0xe52ffe47),
-     TOBN(0xc41b7c23, 0x4b54d9bf), TOBN(0x1374e681, 0x3511c3d9),
-     TOBN(0x1863bf16, 0xc1b2b758), TOBN(0x90e78507, 0x1e9e6a96),
-     TOBN(0xab4bf98d, 0x5d86f174), TOBN(0xd74e0bd3, 0x85e96fe4),
-     TOBN(0x8afde39f, 0xcac5d344), TOBN(0x90946dbc, 0xbd91b847),
-     TOBN(0xf5b42358, 0xfe1a838c), TOBN(0x05aae6c5, 0x620ac9d8),
-     TOBN(0x8e193bd8, 0xa1ce5a0b), TOBN(0x8f710571, 0x4dabfd72),
-     TOBN(0x8d8fdd48, 0x182caaac), TOBN(0x8c4aeefa, 0x040745cf),
-     TOBN(0x73c6c30a, 0xf3b93e6d), TOBN(0x991241f3, 0x16f42011),
-     TOBN(0xa0158eea, 0xe457a477), TOBN(0xd19857db, 0xee6ddc05),
-     TOBN(0xb3265224, 0x18c41671), TOBN(0x3ffdfc7e, 0x3c2c0d58),
-     TOBN(0x3a3a5254, 0x26ee7cda), TOBN(0x341b0869, 0xdf02c3a8),
-     TOBN(0xa023bf42, 0x723bbfc8), TOBN(0x3d15002a, 0x14452691),}
-    ,
-    {TOBN(0x5ef7324c, 0x85edfa30), TOBN(0x25976554, 0x87d4f3da),
-     TOBN(0x352f5bc0, 0xdcb50c86), TOBN(0x8f6927b0, 0x4832a96c),
-     TOBN(0xd08ee1ba, 0x55f2f94c), TOBN(0x6a996f99, 0x344b45fa),
-     TOBN(0xe133cb8d, 0xa8aa455d), TOBN(0x5d0721ec, 0x758dc1f7),
-     TOBN(0x6ba7a920, 0x79e5fb67), TOBN(0xe1331feb, 0x70aa725e),
-     TOBN(0x5080ccf5, 0x7df5d837), TOBN(0xe4cae01d, 0x7ff72e21),
-     TOBN(0xd9243ee6, 0x0412a77d), TOBN(0x06ff7cac, 0xdf449025),
-     TOBN(0xbe75f7cd, 0x23ef5a31), TOBN(0xbc957822, 0x0ddef7a8),
-     TOBN(0x8cf7230c, 0xb0ce1c55), TOBN(0x5b534d05, 0x0bbfb607),
-     TOBN(0xee1ef113, 0x0e16363b), TOBN(0x27e0aa7a, 0xb4999e82),
-     TOBN(0xce1dac2d, 0x79362c41), TOBN(0x67920c90, 0x91bb6cb0),
-     TOBN(0x1e648d63, 0x2223df24), TOBN(0x0f7d9eef, 0xe32e8f28),
-     TOBN(0x6943f39a, 0xfa833834), TOBN(0x22951722, 0xa6328562),
-     TOBN(0x81d63dd5, 0x4170fc10), TOBN(0x9f5fa58f, 0xaecc2e6d),
-     TOBN(0xb66c8725, 0xe77d9a3b), TOBN(0x11235cea, 0x6384ebe0),
-     TOBN(0x06a8c118, 0x5845e24a), TOBN(0x0137b286, 0xebd093b1),
-     TOBN(0xc589e1ce, 0x44ace150), TOBN(0xe0f8d3d9, 0x4381e97c),
-     TOBN(0x59e99b11, 0x62c5a4b8), TOBN(0x90d262f7, 0xfd0ec9f9),
-     TOBN(0xfbc854c9, 0x283e13c9), TOBN(0x2d04fde7, 0xaedc7085),
-     TOBN(0x057d7765, 0x47dcbecb), TOBN(0x8dbdf591, 0x9a76fa5f),
-     TOBN(0xd0150695, 0x0de1e578), TOBN(0x2e1463e7, 0xe9f72bc6),
-     TOBN(0xffa68441, 0x1b39eca5), TOBN(0x673c8530, 0x7c037f2f),
-     TOBN(0xd0d6a600, 0x747f91da), TOBN(0xb08d43e1, 0xc9cb78e9),
-     TOBN(0x0fc0c644, 0x27b5cef5), TOBN(0x5c1d160a, 0xa60a2fd6),
-     TOBN(0xf98cae53, 0x28c8e13b), TOBN(0x375f10c4, 0xb2eddcd1),
-     TOBN(0xd4eb8b7f, 0x5cce06ad), TOBN(0xb4669f45, 0x80a2e1ef),
-     TOBN(0xd593f9d0, 0x5bbd8699), TOBN(0x5528a4c9, 0xe7976d13),
-     TOBN(0x3923e095, 0x1c7e28d3), TOBN(0xb9293790, 0x3f6bb577),
-     TOBN(0xdb567d6a, 0xc42bd6d2), TOBN(0x6df86468, 0xbb1f96ae),
-     TOBN(0x0efe5b1a, 0x4843b28e), TOBN(0x961bbb05, 0x6379b240),
-     TOBN(0xb6caf5f0, 0x70a6a26b), TOBN(0x70686c0d, 0x328e6e39),
-     TOBN(0x80da06cf, 0x895fc8d3), TOBN(0x804d8810, 0xb363fdc9),
-     TOBN(0xbe22877b, 0x207f1670), TOBN(0x9b0dd188, 0x4e615291),
-     TOBN(0x625ae8dc, 0x97a3c2bf), TOBN(0x08584ef7, 0x439b86e8),
-     TOBN(0xde7190a5, 0xdcd898ff), TOBN(0x26286c40, 0x2058ee3d),
-     TOBN(0x3db0b217, 0x5f87b1c1), TOBN(0xcc334771, 0x102a6db5),
-     TOBN(0xd99de954, 0x2f770fb1), TOBN(0x97c1c620, 0x4cd7535e),
-     TOBN(0xd3b6c448, 0x3f09cefc), TOBN(0xd725af15, 0x5a63b4f8),
-     TOBN(0x0c95d24f, 0xc01e20ec), TOBN(0xdfd37494, 0x9ae7121f),
-     TOBN(0x7d6ddb72, 0xec77b7ec), TOBN(0xfe079d3b, 0x0353a4ae),
-     TOBN(0x3066e70a, 0x2e6ac8d2), TOBN(0x9c6b5a43, 0x106e5c05),
-     TOBN(0x52d3c6f5, 0xede59b8c), TOBN(0x30d6a5c3, 0xfccec9ae),
-     TOBN(0xedec7c22, 0x4fc0a9ef), TOBN(0x190ff083, 0x95c16ced),
-     TOBN(0xbe12ec8f, 0x94de0fde), TOBN(0x0d131ab8, 0x852d3433),
-     TOBN(0x42ace07e, 0x85701291), TOBN(0x94793ed9, 0x194061a8),
-     TOBN(0x30e83ed6, 0xd7f4a485), TOBN(0x9eec7269, 0xf9eeff4d),
-     TOBN(0x90acba59, 0x0c9d8005), TOBN(0x5feca458, 0x1e79b9d1),
-     TOBN(0x8fbe5427, 0x1d506a1e), TOBN(0xa32b2c8e, 0x2439cfa7),
-     TOBN(0x1671c173, 0x73dd0b4e), TOBN(0x37a28214, 0x44a054c6),
-     TOBN(0x81760a1b, 0x4e8b53f1), TOBN(0xa6c04224, 0xf9f93b9e),
-     TOBN(0x18784b34, 0xcf671e3c), TOBN(0x81bbecd2, 0xcda9b994),
-     TOBN(0x38831979, 0xb2ab3848), TOBN(0xef54feb7, 0xf2e03c2d),
-     TOBN(0xcf197ca7, 0xfb8088fa), TOBN(0x01427247, 0x4ddc96c5),
-     TOBN(0xa2d2550a, 0x30777176), TOBN(0x53469898, 0x4d0cf71d),
-     TOBN(0x6ce937b8, 0x3a2aaac6), TOBN(0xe9f91dc3, 0x5af38d9b),
-     TOBN(0x2598ad83, 0xc8bf2899), TOBN(0x8e706ac9, 0xb5536c16),
-     TOBN(0x40dc7495, 0xf688dc98), TOBN(0x26490cd7, 0x124c4afc),
-     TOBN(0xe651ec84, 0x1f18775c), TOBN(0x393ea6c3, 0xb4fdaf4a),
-     TOBN(0x1e1f3343, 0x7f338e0d), TOBN(0x39fb832b, 0x6053e7b5),
-     TOBN(0x46e702da, 0x619e14d5), TOBN(0x859cacd1, 0xcdeef6e0),
-     TOBN(0x63b99ce7, 0x4462007d), TOBN(0xb8ab48a5, 0x4cb5f5b7),
-     TOBN(0x9ec673d2, 0xf55edde7), TOBN(0xd1567f74, 0x8cfaefda),
-     TOBN(0x46381b6b, 0x0887bcec), TOBN(0x694497ce, 0xe178f3c2),
-     TOBN(0x5e6525e3, 0x1e6266cb), TOBN(0x5931de26, 0x697d6413),
-     TOBN(0x87f8df7c, 0x0e58d493), TOBN(0xb1ae5ed0, 0x58b73f12),
-     TOBN(0xc368f784, 0xdea0c34d), TOBN(0x9bd0a120, 0x859a91a0),
-     TOBN(0xb00d88b7, 0xcc863c68), TOBN(0x3a1cc11e, 0x3d1f4d65),
-     TOBN(0xea38e0e7, 0x0aa85593), TOBN(0x37f13e98, 0x7dc4aee8),
-     TOBN(0x10d38667, 0xbc947bad), TOBN(0x738e07ce, 0x2a36ee2e),
-     TOBN(0xc93470cd, 0xc577fcac), TOBN(0xdee1b616, 0x2782470d),
-     TOBN(0x36a25e67, 0x2e793d12), TOBN(0xd6aa6cae, 0xe0f186da),
-     TOBN(0x474d0fd9, 0x80e07af7), TOBN(0xf7cdc47d, 0xba8a5cd4),
-     TOBN(0x28af6d9d, 0xab15247f), TOBN(0x7c789c10, 0x493a537f),
-     TOBN(0x7ac9b110, 0x23a334e7), TOBN(0x0236ac09, 0x12c9c277),
-     TOBN(0xa7e5bd25, 0x1d7a5144), TOBN(0x098b9c2a, 0xf13ec4ec),
-     TOBN(0x3639daca, 0xd3f0abca), TOBN(0x642da81a, 0xa23960f9),
-     TOBN(0x7d2e5c05, 0x4f7269b1), TOBN(0xfcf30777, 0xe287c385),
-     TOBN(0x10edc84f, 0xf2a46f21), TOBN(0x35441757, 0x4f43fa36),
-     TOBN(0xf1327899, 0xfd703431), TOBN(0xa438d7a6, 0x16dd587a),
-     TOBN(0x65c34c57, 0xe9c8352d), TOBN(0xa728edab, 0x5cc5a24e),
-     TOBN(0xaed78abc, 0x42531689), TOBN(0x0a51a0e8, 0x010963ef),
-     TOBN(0x5776fa0a, 0xd717d9b3), TOBN(0xf356c239, 0x7dd3428b),
-     TOBN(0x29903fff, 0x8d3a3dac), TOBN(0x409597fa, 0x3d94491f),
-     TOBN(0x4cd7a5ff, 0xbf4a56a4), TOBN(0xe5096474, 0x8adab462),
-     TOBN(0xa97b5126, 0x5c3427b0), TOBN(0x6401405c, 0xd282c9bd),
-     TOBN(0x3629f8d7, 0x222c5c45), TOBN(0xb1c02c16, 0xe8d50aed),
-     TOBN(0xbea2ed75, 0xd9635bc9), TOBN(0x226790c7, 0x6e24552f),
-     TOBN(0x3c33f2a3, 0x65f1d066), TOBN(0x2a43463e, 0x6dfccc2e),
-     TOBN(0x8cc3453a, 0xdb483761), TOBN(0xe7cc6085, 0x65d5672b),
-     TOBN(0x277ed6cb, 0xde3efc87), TOBN(0x19f2f368, 0x69234eaf),
-     TOBN(0x9aaf4317, 0x5c0b800b), TOBN(0x1f1e7c89, 0x8b6da6e2),
-     TOBN(0x6cfb4715, 0xb94ec75e), TOBN(0xd590dd5f, 0x453118c2),
-     TOBN(0x14e49da1, 0x1f17a34c), TOBN(0x5420ab39, 0x235a1456),
-     TOBN(0xb7637241, 0x2f50363b), TOBN(0x7b15d623, 0xc3fabb6e),
-     TOBN(0xa0ef40b1, 0xe274e49c), TOBN(0x5cf50744, 0x96b1860a),
-     TOBN(0xd6583fbf, 0x66afe5a4), TOBN(0x44240510, 0xf47e3e9a),
-     TOBN(0x99254343, 0x11b2d595), TOBN(0xf1367499, 0xeec8df57),
-     TOBN(0x3cb12c61, 0x3e73dd05), TOBN(0xd248c033, 0x7dac102a),
-     TOBN(0xcf154f13, 0xa77739f5), TOBN(0xbf4288cb, 0x23d2af42),
-     TOBN(0xaa64c9b6, 0x32e4a1cf), TOBN(0xee8c07a8, 0xc8a208f3),
-     TOBN(0xe10d4999, 0x6fe8393f), TOBN(0x0f809a3f, 0xe91f3a32),
-     TOBN(0x61096d1c, 0x802f63c8), TOBN(0x289e1462, 0x57750d3d),
-     TOBN(0xed06167e, 0x9889feea), TOBN(0xd5c9c0e2, 0xe0993909),
-     TOBN(0x46fca0d8, 0x56508ac6), TOBN(0x91826047, 0x4f1b8e83),
-     TOBN(0x4f2c877a, 0x9a4a2751), TOBN(0x71bd0072, 0xcae6fead),
-     TOBN(0x38df8dcc, 0x06aa1941), TOBN(0x5a074b4c, 0x63beeaa8),
-     TOBN(0xd6d65934, 0xc1cec8ed), TOBN(0xa6ecb49e, 0xaabc03bd),
-     TOBN(0xaade91c2, 0xde8a8415), TOBN(0xcfb0efdf, 0x691136e0),
-     TOBN(0x11af45ee, 0x23ab3495), TOBN(0xa132df88, 0x0b77463d),
-     TOBN(0x8923c15c, 0x815d06f4), TOBN(0xc3ceb3f5, 0x0d61a436),
-     TOBN(0xaf52291d, 0xe88fb1da), TOBN(0xea057974, 0x1da12179),
-     TOBN(0xb0d7218c, 0xd2fef720), TOBN(0x6c0899c9, 0x8e1d8845),
-     TOBN(0x98157504, 0x752ddad7), TOBN(0xd60bd74f, 0xa1a68a97),
-     TOBN(0x7047a3a9, 0xf658fb99), TOBN(0x1f5d86d6, 0x5f8511e4),
-     TOBN(0xb8a4bc42, 0x4b5a6d88), TOBN(0x69eb2c33, 0x1abefa7d),
-     TOBN(0x95bf39e8, 0x13c9c510), TOBN(0xf571960a, 0xd48aab43),
-     TOBN(0x7e8cfbcf, 0x704e23c6), TOBN(0xc71b7d22, 0x28aaa65b),
-     TOBN(0xa041b2bd, 0x245e3c83), TOBN(0x69b98834, 0xd21854ff),
-     TOBN(0x89d227a3, 0x963bfeec), TOBN(0x99947aaa, 0xde7da7cb),
-     TOBN(0x1d9ee9db, 0xee68a9b1), TOBN(0x0a08f003, 0x698ec368),
-     TOBN(0xe9ea4094, 0x78ef2487), TOBN(0xc8d2d415, 0x02cfec26),
-     TOBN(0xc52f9a6e, 0xb7dcf328), TOBN(0x0ed489e3, 0x85b6a937),
-     TOBN(0x9b94986b, 0xbef3366e), TOBN(0x0de59c70, 0xedddddb8),
-     TOBN(0xffdb748c, 0xeadddbe2), TOBN(0x9b9784bb, 0x8266ea40),
-     TOBN(0x142b5502, 0x1a93507a), TOBN(0xb4cd1187, 0x8d3c06cf),
-     TOBN(0xdf70e76a, 0x91ec3f40), TOBN(0x484e81ad, 0x4e7553c2),
-     TOBN(0x830f87b5, 0x272e9d6e), TOBN(0xea1c93e5, 0xc6ff514a),
-     TOBN(0x67cc2adc, 0xc4192a8e), TOBN(0xc77e27e2, 0x42f4535a),
-     TOBN(0x9cdbab36, 0xd2b713c5), TOBN(0x86274ea0, 0xcf7b0cd3),
-     TOBN(0x784680f3, 0x09af826b), TOBN(0xbfcc837a, 0x0c72dea3),
-     TOBN(0xa8bdfe9d, 0xd6529b73), TOBN(0x708aa228, 0x63a88002),
-     TOBN(0x6c7a9a54, 0xc91d45b9), TOBN(0xdf1a38bb, 0xfd004f56),
-     TOBN(0x2e8c9a26, 0xb8bad853), TOBN(0x2d52cea3, 0x3723eae7),
-     TOBN(0x054d6d81, 0x56ca2830), TOBN(0xa3317d14, 0x9a8dc411),
-     TOBN(0xa08662fe, 0xfd4ddeda), TOBN(0xed2a153a, 0xb55d792b),
-     TOBN(0x7035c16a, 0xbfc6e944), TOBN(0xb6bc5834, 0x00171cf3),
-     TOBN(0xe27152b3, 0x83d102b6), TOBN(0xfe695a47, 0x0646b848),
-     TOBN(0xa5bb09d8, 0x916e6d37), TOBN(0xb4269d64, 0x0d17015e),
-     TOBN(0x8d8156a1, 0x0a1d2285), TOBN(0xfeef6c51, 0x46d26d72),
-     TOBN(0x9dac57c8, 0x4c5434a7), TOBN(0x0282e5be, 0x59d39e31),
-     TOBN(0xedfff181, 0x721c486d), TOBN(0x301baf10, 0xbc58824e),
-     TOBN(0x8136a6aa, 0x00570031), TOBN(0x55aaf78c, 0x1cddde68),
-     TOBN(0x26829371, 0x59c63952), TOBN(0x3a3bd274, 0x8bc25baf),
-     TOBN(0xecdf8657, 0xb7e52dc3), TOBN(0x2dd8c087, 0xfd78e6c8),
-     TOBN(0x20553274, 0xf5531461), TOBN(0x8b4a1281, 0x5d95499b),
-     TOBN(0xe2c8763a, 0x1a80f9d2), TOBN(0xd1dbe32b, 0x4ddec758),
-     TOBN(0xaf12210d, 0x30c34169), TOBN(0xba74a953, 0x78baa533),
-     TOBN(0x3d133c6e, 0xa438f254), TOBN(0xa431531a, 0x201bef5b),
-     TOBN(0x15295e22, 0xf669d7ec), TOBN(0xca374f64, 0x357fb515),
-     TOBN(0x8a8406ff, 0xeaa3fdb3), TOBN(0x106ae448, 0xdf3f2da8),
-     TOBN(0x8f9b0a90, 0x33c8e9a1), TOBN(0x234645e2, 0x71ad5885),
-     TOBN(0x3d083224, 0x1c0aed14), TOBN(0xf10a7d3e, 0x7a942d46),
-     TOBN(0x7c11deee, 0x40d5c9be), TOBN(0xb2bae7ff, 0xba84ed98),
-     TOBN(0x93e97139, 0xaad58ddd), TOBN(0x3d872796, 0x3f6d1fa3),
-     TOBN(0x483aca81, 0x8569ff13), TOBN(0x8b89a5fb, 0x9a600f72),
-     TOBN(0x4cbc27c3, 0xc06f2b86), TOBN(0x22130713, 0x63ad9c0b),
-     TOBN(0xb5358b1e, 0x48ac2840), TOBN(0x18311294, 0xecba9477),
-     TOBN(0xda58f990, 0xa6946b43), TOBN(0x3098baf9, 0x9ab41819),
-     TOBN(0x66c4c158, 0x4198da52), TOBN(0xab4fc17c, 0x146bfd1b),
-     TOBN(0x2f0a4c3c, 0xbf36a908), TOBN(0x2ae9e34b, 0x58cf7838),
-     TOBN(0xf411529e, 0x3fa11b1f), TOBN(0x21e43677, 0x974af2b4),
-     TOBN(0x7c20958e, 0xc230793b), TOBN(0x710ea885, 0x16e840f3),
-     TOBN(0xfc0b21fc, 0xc5dc67cf), TOBN(0x08d51647, 0x88405718),
-     TOBN(0xd955c21f, 0xcfe49eb7), TOBN(0x9722a5d5, 0x56dd4a1f),
-     TOBN(0xc9ef50e2, 0xc861baa5), TOBN(0xc0c21a5d, 0x9505ac3e),
-     TOBN(0xaf6b9a33, 0x8b7c063f), TOBN(0xc6370339, 0x2f4779c1),
-     TOBN(0x22df99c7, 0x638167c3), TOBN(0xfe6ffe76, 0x795db30c),
-     TOBN(0x2b822d33, 0xa4854989), TOBN(0xfef031dd, 0x30563aa5),
-     TOBN(0x16b09f82, 0xd57c667f), TOBN(0xc70312ce, 0xcc0b76f1),
-     TOBN(0xbf04a9e6, 0xc9118aec), TOBN(0x82fcb419, 0x3409d133),
-     TOBN(0x1a8ab385, 0xab45d44d), TOBN(0xfba07222, 0x617b83a3),
-     TOBN(0xb05f50dd, 0x58e81b52), TOBN(0x1d8db553, 0x21ce5aff),
-     TOBN(0x3097b8d4, 0xe344a873), TOBN(0x7d8d116d, 0xfe36d53e),
-     TOBN(0x6db22f58, 0x7875e750), TOBN(0x2dc5e373, 0x43e144ea),
-     TOBN(0xc05f32e6, 0xe799eb95), TOBN(0xe9e5f4df, 0x6899e6ec),
-     TOBN(0xbdc3bd68, 0x1fab23d5), TOBN(0xb72b8ab7, 0x73af60e6),
-     TOBN(0x8db27ae0, 0x2cecc84a), TOBN(0x600016d8, 0x7bdb871c),
-     TOBN(0x42a44b13, 0xd7c46f58), TOBN(0xb8919727, 0xc3a77d39),
-     TOBN(0xcfc6bbbd, 0xdafd6088), TOBN(0x1a740146, 0x6bd20d39),
-     TOBN(0x8c747abd, 0x98c41072), TOBN(0x4c91e765, 0xbdf68ea1),
-     TOBN(0x7c95e5ca, 0x08819a78), TOBN(0xcf48b729, 0xc9587921),
-     TOBN(0x091c7c5f, 0xdebbcc7d), TOBN(0x6f287404, 0xf0e05149),
-     TOBN(0xf83b5ac2, 0x26cd44ec), TOBN(0x88ae32a6, 0xcfea250e),
-     TOBN(0x6ac5047a, 0x1d06ebc5), TOBN(0xc7e550b4, 0xd434f781),
-     TOBN(0x61ab1cf2, 0x5c727bd2), TOBN(0x2e4badb1, 0x1cf915b0),
-     TOBN(0x1b4dadec, 0xf69d3920), TOBN(0xe61b1ca6, 0xf14c1dfe),
-     TOBN(0x90b479cc, 0xbd6bd51f), TOBN(0x8024e401, 0x8045ec30),
-     TOBN(0xcab29ca3, 0x25ef0e62), TOBN(0x4f2e9416, 0x49e4ebc0),
-     TOBN(0x45eb40ec, 0x0ccced58), TOBN(0x25cd4b9c, 0x0da44f98),
-     TOBN(0x43e06458, 0x871812c6), TOBN(0x99f80d55, 0x16cef651),
-     TOBN(0x571340c9, 0xce6dc153), TOBN(0x138d5117, 0xd8665521),
-     TOBN(0xacdb45bc, 0x4e07014d), TOBN(0x2f34bb38, 0x84b60b91),
-     TOBN(0xf44a4fd2, 0x2ae8921e), TOBN(0xb039288e, 0x892ba1e2),
-     TOBN(0x9da50174, 0xb1c180b2), TOBN(0x6b70ab66, 0x1693dc87),
-     TOBN(0x7e9babc9, 0xe7057481), TOBN(0x4581ddef, 0x9c80dc41),
-     TOBN(0x0c890da9, 0x51294682), TOBN(0x0b5629d3, 0x3f4736e5),
-     TOBN(0x2340c79e, 0xb06f5b41), TOBN(0xa42e84ce, 0x4e243469),
-     TOBN(0xf9a20135, 0x045a71a9), TOBN(0xefbfb415, 0xd27b6fb6),
-     TOBN(0x25ebea23, 0x9d33cd6f), TOBN(0x9caedb88, 0xaa6c0af8),
-     TOBN(0x53dc7e9a, 0xd9ce6f96), TOBN(0x3897f9fd, 0x51e0b15a),
-     TOBN(0xf51cb1f8, 0x8e5d788e), TOBN(0x1aec7ba8, 0xe1d490ee),
-     TOBN(0x265991e0, 0xcc58cb3c), TOBN(0x9f306e8c, 0x9fc3ad31),
-     TOBN(0x5fed006e, 0x5040a0ac), TOBN(0xca9d5043, 0xfb476f2e),
-     TOBN(0xa19c06e8, 0xbeea7a23), TOBN(0xd2865801, 0x0edabb63),
-     TOBN(0xdb92293f, 0x6967469a), TOBN(0x2894d839, 0x8d8a8ed8),
-     TOBN(0x87c9e406, 0xbbc77122), TOBN(0x8671c6f1, 0x2ea3a26a),
-     TOBN(0xe42df8d6, 0xd7de9853), TOBN(0x2e3ce346, 0xb1f2bcc7),
-     TOBN(0xda601dfc, 0x899d50cf), TOBN(0xbfc913de, 0xfb1b598f),
-     TOBN(0x81c4909f, 0xe61f7908), TOBN(0x192e304f, 0x9bbc7b29),
-     TOBN(0xc3ed8738, 0xc104b338), TOBN(0xedbe9e47, 0x783f5d61),
-     TOBN(0x0c06e9be, 0x2db30660), TOBN(0xda3e613f, 0xc0eb7d8e),
-     TOBN(0xd8fa3e97, 0x322e096e), TOBN(0xfebd91e8, 0xd336e247),
-     TOBN(0x8f13ccc4, 0xdf655a49), TOBN(0xa9e00dfc, 0x5eb20210),
-     TOBN(0x84631d0f, 0xc656b6ea), TOBN(0x93a058cd, 0xd8c0d947),
-     TOBN(0x6846904a, 0x67bd3448), TOBN(0x4a3d4e1a, 0xf394fd5c),
-     TOBN(0xc102c1a5, 0xdb225f52), TOBN(0xe3455bba, 0xfc4f5e9a),
-     TOBN(0x6b36985b, 0x4b9ad1ce), TOBN(0xa9818536, 0x5bb7f793),
-     TOBN(0x6c25e1d0, 0x48b1a416), TOBN(0x1381dd53, 0x3c81bee7),
-     TOBN(0xd2a30d61, 0x7a4a7620), TOBN(0xc8412926, 0x39b8944c),
-     TOBN(0x3c1c6fbe, 0x7a97c33a), TOBN(0x941e541d, 0x938664e7),
-     TOBN(0x417499e8, 0x4a34f239), TOBN(0x15fdb83c, 0xb90402d5),
-     TOBN(0xb75f46bf, 0x433aa832), TOBN(0xb61e15af, 0x63215db1),
-     TOBN(0xaabe59d4, 0xa127f89a), TOBN(0x5d541e0c, 0x07e816da),
-     TOBN(0xaaba0659, 0xa618b692), TOBN(0x55327733, 0x17266026),
-     TOBN(0xaf53a0fc, 0x95f57552), TOBN(0x32947650, 0x6cacb0c9),
-     TOBN(0x253ff58d, 0xc821be01), TOBN(0xb0309531, 0xa06f1146),
-     TOBN(0x59bbbdf5, 0x05c2e54d), TOBN(0x158f27ad, 0x26e8dd22),
-     TOBN(0xcc5b7ffb, 0x397e1e53), TOBN(0xae03f65b, 0x7fc1e50d),
-     TOBN(0xa9784ebd, 0x9c95f0f9), TOBN(0x5ed9deb2, 0x24640771),
-     TOBN(0x31244af7, 0x035561c4), TOBN(0x87332f3a, 0x7ee857de),
-     TOBN(0x09e16e9e, 0x2b9e0d88), TOBN(0x52d910f4, 0x56a06049),
-     TOBN(0x507ed477, 0xa9592f48), TOBN(0x85cb917b, 0x2365d678),
-     TOBN(0xf8511c93, 0x4c8998d1), TOBN(0x2186a3f1, 0x730ea58f),
-     TOBN(0x50189626, 0xb2029db0), TOBN(0x9137a6d9, 0x02ceb75a),
-     TOBN(0x2fe17f37, 0x748bc82c), TOBN(0x87c2e931, 0x80469f8c),
-     TOBN(0x850f71cd, 0xbf891aa2), TOBN(0x0ca1b89b, 0x75ec3d8d),
-     TOBN(0x516c43aa, 0x5e1cd3cd), TOBN(0x89397808, 0x9a887c28),
-     TOBN(0x0059c699, 0xddea1f9f), TOBN(0x7737d6fa, 0x8e6868f7),
-     TOBN(0x6d93746a, 0x60f1524b), TOBN(0x36985e55, 0xba052aa7),
-     TOBN(0x41b1d322, 0xed923ea5), TOBN(0x3429759f, 0x25852a11),
-     TOBN(0xbeca6ec3, 0x092e9f41), TOBN(0x3a238c66, 0x62256bbd),
-     TOBN(0xd82958ea, 0x70ad487d), TOBN(0x4ac8aaf9, 0x65610d93),
-     TOBN(0x3fa101b1, 0x5e4ccab0), TOBN(0x9bf430f2, 0x9de14bfb),
-     TOBN(0xa10f5cc6, 0x6531899d), TOBN(0x590005fb, 0xea8ce17d),
-     TOBN(0xc437912f, 0x24544cb6), TOBN(0x9987b71a, 0xd79ac2e3),
-     TOBN(0x13e3d9dd, 0xc058a212), TOBN(0x00075aac, 0xd2de9606),
-     TOBN(0x80ab508b, 0x6cac8369), TOBN(0x87842be7, 0xf54f6c89),
-     TOBN(0xa7ad663d, 0x6bc532a4), TOBN(0x67813de7, 0x78a91bc8),
-     TOBN(0x5dcb61ce, 0xc3427239), TOBN(0x5f3c7cf0, 0xc56934d9),
-     TOBN(0xc079e0fb, 0xe3191591), TOBN(0xe40896bd, 0xb01aada7),
-     TOBN(0x8d466791, 0x0492d25f), TOBN(0x8aeb30c9, 0xe7408276),
-     TOBN(0xe9437495, 0x9287aacc), TOBN(0x23d4708d, 0x79fe03d4),
-     TOBN(0x8cda9cf2, 0xd0c05199), TOBN(0x502fbc22, 0xfae78454),
-     TOBN(0xc0bda9df, 0xf572a182), TOBN(0x5f9b71b8, 0x6158b372),
-     TOBN(0xe0f33a59, 0x2b82dd07), TOBN(0x76302735, 0x9523032e),
-     TOBN(0x7fe1a721, 0xc4505a32), TOBN(0x7b6e3e82, 0xf796409f),}
-    ,
-    {TOBN(0xe3417bc0, 0x35d0b34a), TOBN(0x440b386b, 0x8327c0a7),
-     TOBN(0x8fb7262d, 0xac0362d1), TOBN(0x2c41114c, 0xe0cdf943),
-     TOBN(0x2ba5cef1, 0xad95a0b1), TOBN(0xc09b37a8, 0x67d54362),
-     TOBN(0x26d6cdd2, 0x01e486c9), TOBN(0x20477abf, 0x42ff9297),
-     TOBN(0xa004dcb3, 0x292a9287), TOBN(0xddc15cf6, 0x77b092c7),
-     TOBN(0x083a8464, 0x806c0605), TOBN(0x4a68df70, 0x3db997b0),
-     TOBN(0x9c134e45, 0x05bf7dd0), TOBN(0xa4e63d39, 0x8ccf7f8c),
-     TOBN(0xa6e6517f, 0x41b5f8af), TOBN(0xaa8b9342, 0xad7bc1cc),
-     TOBN(0x126f35b5, 0x1e706ad9), TOBN(0xb99cebb4, 0xc3a9ebdf),
-     TOBN(0xa75389af, 0xbf608d90), TOBN(0x76113c4f, 0xc6c89858),
-     TOBN(0x80de8eb0, 0x97e2b5aa), TOBN(0x7e1022cc, 0x63b91304),
-     TOBN(0x3bdab605, 0x6ccc066c), TOBN(0x33cbb144, 0xb2edf900),
-     TOBN(0xc4176471, 0x7af715d2), TOBN(0xe2f7f594, 0xd0134a96),
-     TOBN(0x2c1873ef, 0xa41ec956), TOBN(0xe4e7b4f6, 0x77821304),
-     TOBN(0xe5c8ff97, 0x88d5374a), TOBN(0x2b915e63, 0x80823d5b),
-     TOBN(0xea6bc755, 0xb2ee8fe2), TOBN(0x6657624c, 0xe7112651),
-     TOBN(0x157af101, 0xdace5aca), TOBN(0xc4fdbcf2, 0x11a6a267),
-     TOBN(0xdaddf340, 0xc49c8609), TOBN(0x97e49f52, 0xe9604a65),
-     TOBN(0x9be8e790, 0x937e2ad5), TOBN(0x846e2508, 0x326e17f1),
-     TOBN(0x3f38007a, 0x0bbbc0dc), TOBN(0xcf03603f, 0xb11e16d6),
-     TOBN(0xd6f800e0, 0x7442f1d5), TOBN(0x475607d1, 0x66e0e3ab),
-     TOBN(0x82807f16, 0xb7c64047), TOBN(0x8858e1e3, 0xa749883d),
-     TOBN(0x5859120b, 0x8231ee10), TOBN(0x1b80e7eb, 0x638a1ece),
-     TOBN(0xcb72525a, 0xc6aa73a4), TOBN(0xa7cdea3d, 0x844423ac),
-     TOBN(0x5ed0c007, 0xf8ae7c38), TOBN(0x6db07a5c, 0x3d740192),
-     TOBN(0xbe5e9c2a, 0x5fe36db3), TOBN(0xd5b9d57a, 0x76e95046),
-     TOBN(0x54ac32e7, 0x8eba20f2), TOBN(0xef11ca8f, 0x71b9a352),
-     TOBN(0x305e373e, 0xff98a658), TOBN(0xffe5a100, 0x823eb667),
-     TOBN(0x57477b11, 0xe51732d2), TOBN(0xdfd6eb28, 0x2538fc0e),
-     TOBN(0x5c43b0cc, 0x3b39eec5), TOBN(0x6af12778, 0xcb36cc57),
-     TOBN(0x70b0852d, 0x06c425ae), TOBN(0x6df92f8c, 0x5c221b9b),
-     TOBN(0x6c8d4f9e, 0xce826d9c), TOBN(0xf59aba7b, 0xb49359c3),
-     TOBN(0x5c8ed8d5, 0xda64309d), TOBN(0x61a6de56, 0x91b30704),
-     TOBN(0xd6b52f6a, 0x2f9b5808), TOBN(0x0eee4194, 0x98c958a7),
-     TOBN(0xcddd9aab, 0x771e4caa), TOBN(0x83965dfd, 0x78bc21be),
-     TOBN(0x02affce3, 0xb3b504f5), TOBN(0x30847a21, 0x561c8291),
-     TOBN(0xd2eb2cf1, 0x52bfda05), TOBN(0xe0e4c4e9, 0x6197b98c),
-     TOBN(0x1d35076c, 0xf8a1726f), TOBN(0x6c06085b, 0x2db11e3d),
-     TOBN(0x15c0c4d7, 0x4463ba14), TOBN(0x9d292f83, 0x0030238c),
-     TOBN(0x1311ee8b, 0x3727536d), TOBN(0xfeea86ef, 0xbeaedc1e),
-     TOBN(0xb9d18cd3, 0x66131e2e), TOBN(0xf31d974f, 0x80fe2682),
-     TOBN(0xb6e49e0f, 0xe4160289), TOBN(0x7c48ec0b, 0x08e92799),
-     TOBN(0x818111d8, 0xd1989aa7), TOBN(0xb34fa0aa, 0xebf926f9),
-     TOBN(0xdb5fe2f5, 0xa245474a), TOBN(0xf80a6ebb, 0x3c7ca756),
-     TOBN(0xa7f96054, 0xafa05dd8), TOBN(0x26dfcf21, 0xfcaf119e),
-     TOBN(0xe20ef2e3, 0x0564bb59), TOBN(0xef4dca50, 0x61cb02b8),
-     TOBN(0xcda7838a, 0x65d30672), TOBN(0x8b08d534, 0xfd657e86),
-     TOBN(0x4c5b4395, 0x46d595c8), TOBN(0x39b58725, 0x425cb836),
-     TOBN(0x8ea61059, 0x3de9abe3), TOBN(0x40434881, 0x9cdc03be),
-     TOBN(0x9b261245, 0xcfedce8c), TOBN(0x78c318b4, 0xcf5234a1),
-     TOBN(0x510bcf16, 0xfde24c99), TOBN(0x2a77cb75, 0xa2c2ff5d),
-     TOBN(0x9c895c2b, 0x27960fb4), TOBN(0xd30ce975, 0xb0eda42b),
-     TOBN(0xfda85393, 0x1a62cc26), TOBN(0x23c69b96, 0x50c0e052),
-     TOBN(0xa227df15, 0xbfc633f3), TOBN(0x2ac78848, 0x1bae7d48),
-     TOBN(0x487878f9, 0x187d073d), TOBN(0x6c2be919, 0x967f807d),
-     TOBN(0x765861d8, 0x336e6d8f), TOBN(0x88b8974c, 0xce528a43),
-     TOBN(0x09521177, 0xff57d051), TOBN(0x2ff38037, 0xfb6a1961),
-     TOBN(0xfc0aba74, 0xa3d76ad4), TOBN(0x7c764803, 0x25a7ec17),
-     TOBN(0x7532d75f, 0x48879bc8), TOBN(0xea7eacc0, 0x58ce6bc1),
-     TOBN(0xc82176b4, 0x8e896c16), TOBN(0x9a30e0b2, 0x2c750fed),
-     TOBN(0xc37e2c2e, 0x421d3aa4), TOBN(0xf926407c, 0xe84fa840),
-     TOBN(0x18abc03d, 0x1454e41c), TOBN(0x26605ecd, 0x3f7af644),
-     TOBN(0x242341a6, 0xd6a5eabf), TOBN(0x1edb84f4, 0x216b668e),
-     TOBN(0xd836edb8, 0x04010102), TOBN(0x5b337ce7, 0x945e1d8c),
-     TOBN(0xd2075c77, 0xc055dc14), TOBN(0x2a0ffa25, 0x81d89cdf),
-     TOBN(0x8ce815ea, 0x6ffdcbaf), TOBN(0xa3428878, 0xfb648867),
-     TOBN(0x277699cf, 0x884655fb), TOBN(0xfa5b5bd6, 0x364d3e41),
-     TOBN(0x01f680c6, 0x441e1cb7), TOBN(0x3fd61e66, 0xb70a7d67),
-     TOBN(0x666ba2dc, 0xcc78cf66), TOBN(0xb3018174, 0x6fdbff77),
-     TOBN(0x8d4dd0db, 0x168d4668), TOBN(0x259455d0, 0x1dab3a2a),
-     TOBN(0xf58564c5, 0xcde3acec), TOBN(0x77141925, 0x13adb276),
-     TOBN(0x527d725d, 0x8a303f65), TOBN(0x55deb6c9, 0xe6f38f7b),
-     TOBN(0xfd5bb657, 0xb1fa70fb), TOBN(0xfa07f50f, 0xd8073a00),
-     TOBN(0xf72e3aa7, 0xbca02500), TOBN(0xf68f895d, 0x9975740d),
-     TOBN(0x30112060, 0x5cae2a6a), TOBN(0x01bd7218, 0x02874842),
-     TOBN(0x3d423891, 0x7ce47bd3), TOBN(0xa66663c1, 0x789544f6),
-     TOBN(0x864d05d7, 0x3272d838), TOBN(0xe22924f9, 0xfa6295c5),
-     TOBN(0x8189593f, 0x6c2fda32), TOBN(0x330d7189, 0xb184b544),
-     TOBN(0x79efa62c, 0xbde1f714), TOBN(0x35771c94, 0xe5cb1a63),
-     TOBN(0x2f4826b8, 0x641c8332), TOBN(0x00a894fb, 0xc8cee854),
-     TOBN(0xb4b9a39b, 0x36194d40), TOBN(0xe857a7c5, 0x77612601),
-     TOBN(0xf4209dd2, 0x4ecf2f58), TOBN(0x82b9e66d, 0x5a033487),
-     TOBN(0xc1e36934, 0xe4e8b9dd), TOBN(0xd2372c9d, 0xa42377d7),
-     TOBN(0x51dc94c7, 0x0e3ae43b), TOBN(0x4c57761e, 0x04474f6f),
-     TOBN(0xdcdacd0a, 0x1058a318), TOBN(0x369cf3f5, 0x78053a9a),
-     TOBN(0xc6c3de50, 0x31c68de2), TOBN(0x4653a576, 0x3c4b6d9f),
-     TOBN(0x1688dd5a, 0xaa4e5c97), TOBN(0x5be80aa1, 0xb7ab3c74),
-     TOBN(0x70cefe7c, 0xbc65c283), TOBN(0x57f95f13, 0x06867091),
-     TOBN(0xa39114e2, 0x4415503b), TOBN(0xc08ff7c6, 0x4cbb17e9),
-     TOBN(0x1eff674d, 0xd7dec966), TOBN(0x6d4690af, 0x53376f63),
-     TOBN(0xff6fe32e, 0xea74237b), TOBN(0xc436d17e, 0xcd57508e),
-     TOBN(0x15aa28e1, 0xedcc40fe), TOBN(0x0d769c04, 0x581bbb44),
-     TOBN(0xc240b6de, 0x34eaacda), TOBN(0xd9e116e8, 0x2ba0f1de),
-     TOBN(0xcbe45ec7, 0x79438e55), TOBN(0x91787c9d, 0x96f752d7),
-     TOBN(0x897f532b, 0xf129ac2f), TOBN(0xd307b7c8, 0x5a36e22c),
-     TOBN(0x91940675, 0x749fb8f3), TOBN(0xd14f95d0, 0x157fdb28),
-     TOBN(0xfe51d029, 0x6ae55043), TOBN(0x8931e98f, 0x44a87de1),
-     TOBN(0xe57f1cc6, 0x09e4fee2), TOBN(0x0d063b67, 0x4e072d92),
-     TOBN(0x70a998b9, 0xed0e4316), TOBN(0xe74a736b, 0x306aca46),
-     TOBN(0xecf0fbf2, 0x4fda97c7), TOBN(0xa40f65cb, 0x3e178d93),
-     TOBN(0x16253604, 0x16df4285), TOBN(0xb0c9babb, 0xd0c56ae2),
-     TOBN(0x73032b19, 0xcfc5cfc3), TOBN(0xe497e5c3, 0x09752056),
-     TOBN(0x12096bb4, 0x164bda96), TOBN(0x1ee42419, 0xa0b74da1),
-     TOBN(0x8fc36243, 0x403826ba), TOBN(0x0c8f0069, 0xdc09e660),
-     TOBN(0x8667e981, 0xc27253c9), TOBN(0x05a6aefb, 0x92b36a45),
-     TOBN(0xa62c4b36, 0x9cb7bb46), TOBN(0x8394f375, 0x11f7027b),
-     TOBN(0x747bc79c, 0x5f109d0f), TOBN(0xcad88a76, 0x5b8cc60a),
-     TOBN(0x80c5a66b, 0x58f09e68), TOBN(0xe753d451, 0xf6127eac),
-     TOBN(0xc44b74a1, 0x5b0ec6f5), TOBN(0x47989fe4, 0x5289b2b8),
-     TOBN(0x745f8484, 0x58d6fc73), TOBN(0xec362a6f, 0xf61c70ab),
-     TOBN(0x070c98a7, 0xb3a8ad41), TOBN(0x73a20fc0, 0x7b63db51),
-     TOBN(0xed2c2173, 0xf44c35f4), TOBN(0x8a56149d, 0x9acc9dca),
-     TOBN(0x98f17881, 0x9ac6e0f4), TOBN(0x360fdeaf, 0xa413b5ed),
-     TOBN(0x0625b8f4, 0xa300b0fd), TOBN(0xf1f4d76a, 0x5b3222d3),
-     TOBN(0x9d6f5109, 0x587f76b8), TOBN(0x8b4ee08d, 0x2317fdb5),
-     TOBN(0x88089bb7, 0x8c68b095), TOBN(0x95570e9a, 0x5808d9b9),
-     TOBN(0xa395c36f, 0x35d33ae7), TOBN(0x200ea123, 0x50bb5a94),
-     TOBN(0x20c789bd, 0x0bafe84b), TOBN(0x243ef52d, 0x0919276a),
-     TOBN(0x3934c577, 0xe23ae233), TOBN(0xb93807af, 0xa460d1ec),
-     TOBN(0xb72a53b1, 0xf8fa76a4), TOBN(0xd8914cb0, 0xc3ca4491),
-     TOBN(0x2e128494, 0x3fb42622), TOBN(0x3b2700ac, 0x500907d5),
-     TOBN(0xf370fb09, 0x1a95ec63), TOBN(0xf8f30be2, 0x31b6dfbd),
-     TOBN(0xf2b2f8d2, 0x69e55f15), TOBN(0x1fead851, 0xcc1323e9),
-     TOBN(0xfa366010, 0xd9e5eef6), TOBN(0x64d487b0, 0xe316107e),
-     TOBN(0x4c076b86, 0xd23ddc82), TOBN(0x03fd344c, 0x7e0143f0),
-     TOBN(0xa95362ff, 0x317af2c5), TOBN(0x0add3db7, 0xe18b7a4f),
-     TOBN(0x9c673e3f, 0x8260e01b), TOBN(0xfbeb49e5, 0x54a1cc91),
-     TOBN(0x91351bf2, 0x92f2e433), TOBN(0xc755e7ec, 0x851141eb),
-     TOBN(0xc9a95139, 0x29607745), TOBN(0x0ca07420, 0xa26f2b28),
-     TOBN(0xcb2790e7, 0x4bc6f9dd), TOBN(0x345bbb58, 0xadcaffc0),
-     TOBN(0xc65ea38c, 0xbe0f27a2), TOBN(0x67c24d7c, 0x641fcb56),
-     TOBN(0x2c25f0a7, 0xa9e2c757), TOBN(0x93f5cdb0, 0x16f16c49),
-     TOBN(0x2ca5a9d7, 0xc5ee30a1), TOBN(0xd1593635, 0xb909b729),
-     TOBN(0x804ce9f3, 0xdadeff48), TOBN(0xec464751, 0xb07c30c3),
-     TOBN(0x89d65ff3, 0x9e49af6a), TOBN(0xf2d6238a, 0x6f3d01bc),
-     TOBN(0x1095561e, 0x0bced843), TOBN(0x51789e12, 0xc8a13fd8),
-     TOBN(0xd633f929, 0x763231df), TOBN(0x46df9f7d, 0xe7cbddef),
-     TOBN(0x01c889c0, 0xcb265da8), TOBN(0xfce1ad10, 0xaf4336d2),
-     TOBN(0x8d110df6, 0xfc6a0a7e), TOBN(0xdd431b98, 0x6da425dc),
-     TOBN(0xcdc4aeab, 0x1834aabe), TOBN(0x84deb124, 0x8439b7fc),
-     TOBN(0x8796f169, 0x3c2a5998), TOBN(0x9b9247b4, 0x7947190d),
-     TOBN(0x55b9d9a5, 0x11597014), TOBN(0x7e9dd70d, 0x7b1566ee),
-     TOBN(0x94ad78f7, 0xcbcd5e64), TOBN(0x0359ac17, 0x9bd4c032),
-     TOBN(0x3b11baaf, 0x7cc222ae), TOBN(0xa6a6e284, 0xba78e812),
-     TOBN(0x8392053f, 0x24cea1a0), TOBN(0xc97bce4a, 0x33621491),
-     TOBN(0x7eb1db34, 0x35399ee9), TOBN(0x473f78ef, 0xece81ad1),
-     TOBN(0x41d72fe0, 0xf63d3d0d), TOBN(0xe620b880, 0xafab62fc),
-     TOBN(0x92096bc9, 0x93158383), TOBN(0x41a21357, 0x8f896f6c),
-     TOBN(0x1b5ee2fa, 0xc7dcfcab), TOBN(0x650acfde, 0x9546e007),
-     TOBN(0xc081b749, 0xb1b02e07), TOBN(0xda9e41a0, 0xf9eca03d),
-     TOBN(0x013ba727, 0x175a54ab), TOBN(0xca0cd190, 0xea5d8d10),
-     TOBN(0x85ea52c0, 0x95fd96a9), TOBN(0x2c591b9f, 0xbc5c3940),
-     TOBN(0x6fb4d4e4, 0x2bad4d5f), TOBN(0xfa4c3590, 0xfef0059b),
-     TOBN(0x6a10218a, 0xf5122294), TOBN(0x9a78a81a, 0xa85751d1),
-     TOBN(0x04f20579, 0xa98e84e7), TOBN(0xfe1242c0, 0x4997e5b5),
-     TOBN(0xe77a273b, 0xca21e1e4), TOBN(0xfcc8b1ef, 0x9411939d),
-     TOBN(0xe20ea302, 0x92d0487a), TOBN(0x1442dbec, 0x294b91fe),
-     TOBN(0x1f7a4afe, 0xbb6b0e8f), TOBN(0x1700ef74, 0x6889c318),
-     TOBN(0xf5bbffc3, 0x70f1fc62), TOBN(0x3b31d4b6, 0x69c79cca),
-     TOBN(0xe8bc2aab, 0xa7f6340d), TOBN(0xb0b08ab4, 0xa725e10a),
-     TOBN(0x44f05701, 0xae340050), TOBN(0xba4b3016, 0x1cf0c569),
-     TOBN(0x5aa29f83, 0xfbe19a51), TOBN(0x1b9ed428, 0xb71d752e),
-     TOBN(0x1666e54e, 0xeb4819f5), TOBN(0x616cdfed, 0x9e18b75b),
-     TOBN(0x112ed5be, 0x3ee27b0b), TOBN(0xfbf28319, 0x44c7de4d),
-     TOBN(0xd685ec85, 0xe0e60d84), TOBN(0x68037e30, 0x1db7ee78),
-     TOBN(0x5b65bdcd, 0x003c4d6e), TOBN(0x33e7363a, 0x93e29a6a),
-     TOBN(0x995b3a61, 0x08d0756c), TOBN(0xd727f85c, 0x2faf134b),
-     TOBN(0xfac6edf7, 0x1d337823), TOBN(0x99b9aa50, 0x0439b8b4),
-     TOBN(0x722eb104, 0xe2b4e075), TOBN(0x49987295, 0x437c4926),
-     TOBN(0xb1e4c0e4, 0x46a9b82d), TOBN(0xd0cb3197, 0x57a006f5),
-     TOBN(0xf3de0f7d, 0xd7808c56), TOBN(0xb5c54d8f, 0x51f89772),
-     TOBN(0x500a114a, 0xadbd31aa), TOBN(0x9afaaaa6, 0x295f6cab),
-     TOBN(0x94705e21, 0x04cf667a), TOBN(0xfc2a811b, 0x9d3935d7),
-     TOBN(0x560b0280, 0x6d09267c), TOBN(0xf19ed119, 0xf780e53b),
-     TOBN(0xf0227c09, 0x067b6269), TOBN(0x967b8533, 0x5caef599),
-     TOBN(0x155b9243, 0x68efeebc), TOBN(0xcd6d34f5, 0xc497bae6),
-     TOBN(0x1dd8d5d3, 0x6cceb370), TOBN(0x2aeac579, 0xa78d7bf9),
-     TOBN(0x5d65017d, 0x70b67a62), TOBN(0x70c8e44f, 0x17c53f67),
-     TOBN(0xd1fc0950, 0x86a34d09), TOBN(0xe0fca256, 0xe7134907),
-     TOBN(0xe24fa29c, 0x80fdd315), TOBN(0x2c4acd03, 0xd87499ad),
-     TOBN(0xbaaf7517, 0x3b5a9ba6), TOBN(0xb9cbe1f6, 0x12e51a51),
-     TOBN(0xd88edae3, 0x5e154897), TOBN(0xe4309c3c, 0x77b66ca0),
-     TOBN(0xf5555805, 0xf67f3746), TOBN(0x85fc37ba, 0xa36401ff),
-     TOBN(0xdf86e2ca, 0xd9499a53), TOBN(0x6270b2a3, 0xecbc955b),
-     TOBN(0xafae64f5, 0x974ad33b), TOBN(0x04d85977, 0xfe7b2df1),
-     TOBN(0x2a3db3ff, 0x4ab03f73), TOBN(0x0b87878a, 0x8702740a),
-     TOBN(0x6d263f01, 0x5a061732), TOBN(0xc25430ce, 0xa32a1901),
-     TOBN(0xf7ebab3d, 0xdb155018), TOBN(0x3a86f693, 0x63a9b78e),
-     TOBN(0x349ae368, 0xda9f3804), TOBN(0x470f07fe, 0xa164349c),
-     TOBN(0xd52f4cc9, 0x8562baa5), TOBN(0xc74a9e86, 0x2b290df3),
-     TOBN(0xd3a1aa35, 0x43471a24), TOBN(0x239446be, 0xb8194511),
-     TOBN(0xbec2dd00, 0x81dcd44d), TOBN(0xca3d7f0f, 0xc42ac82d),
-     TOBN(0x1f3db085, 0xfdaf4520), TOBN(0xbb6d3e80, 0x4549daf2),
-     TOBN(0xf5969d8a, 0x19ad5c42), TOBN(0x7052b13d, 0xdbfd1511),
-     TOBN(0x11890d1b, 0x682b9060), TOBN(0xa71d3883, 0xac34452c),
-     TOBN(0xa438055b, 0x783805b4), TOBN(0x43241277, 0x4725b23e),
-     TOBN(0xf20cf96e, 0x4901bbed), TOBN(0x6419c710, 0xf432a2bb),
-     TOBN(0x57a0fbb9, 0xdfa9cd7d), TOBN(0x589111e4, 0x00daa249),
-     TOBN(0x19809a33, 0x7b60554e), TOBN(0xea5f8887, 0xede283a4),
-     TOBN(0x2d713802, 0x503bfd35), TOBN(0x151bb0af, 0x585d2a53),
-     TOBN(0x40b08f74, 0x43b30ca8), TOBN(0xe10b5bba, 0xd9934583),
-     TOBN(0xe8a546d6, 0xb51110ad), TOBN(0x1dd50e66, 0x28e0b6c5),
-     TOBN(0x292e9d54, 0xcff2b821), TOBN(0x3882555d, 0x47281760),
-     TOBN(0x134838f8, 0x3724d6e3), TOBN(0xf2c679e0, 0x22ddcda1),
-     TOBN(0x40ee8815, 0x6d2a5768), TOBN(0x7f227bd2, 0x1c1e7e2d),
-     TOBN(0x487ba134, 0xd04ff443), TOBN(0x76e2ff3d, 0xc614e54b),
-     TOBN(0x36b88d6f, 0xa3177ec7), TOBN(0xbf731d51, 0x2328fff5),
-     TOBN(0x758caea2, 0x49ba158e), TOBN(0x5ab8ff4c, 0x02938188),
-     TOBN(0x33e16056, 0x35edc56d), TOBN(0x5a69d349, 0x7e940d79),
-     TOBN(0x6c4fd001, 0x03866dcb), TOBN(0x20a38f57, 0x4893cdef),
-     TOBN(0xfbf3e790, 0xfac3a15b), TOBN(0x6ed7ea2e, 0x7a4f8e6b),
-     TOBN(0xa663eb4f, 0xbc3aca86), TOBN(0x22061ea5, 0x080d53f7),
-     TOBN(0x2480dfe6, 0xf546783f), TOBN(0xd38bc6da, 0x5a0a641e),
-     TOBN(0xfb093cd1, 0x2ede8965), TOBN(0x89654db4, 0xacb455cf),
-     TOBN(0x413cbf9a, 0x26e1adee), TOBN(0x291f3764, 0x373294d4),
-     TOBN(0x00797257, 0x648083fe), TOBN(0x25f504d3, 0x208cc341),
-     TOBN(0x635a8e5e, 0xc3a0ee43), TOBN(0x70aaebca, 0x679898ff),
-     TOBN(0x9ee9f547, 0x5dc63d56), TOBN(0xce987966, 0xffb34d00),
-     TOBN(0xf9f86b19, 0x5e26310a), TOBN(0x9e435484, 0x382a8ca8),
-     TOBN(0x253bcb81, 0xc2352fe4), TOBN(0xa4eac8b0, 0x4474b571),
-     TOBN(0xc1b97512, 0xc1ad8cf8), TOBN(0x193b4e9e, 0x99e0b697),
-     TOBN(0x939d2716, 0x01e85df0), TOBN(0x4fb265b3, 0xcd44eafd),
-     TOBN(0x321e7dcd, 0xe51e1ae2), TOBN(0x8e3a8ca6, 0xe3d8b096),
-     TOBN(0x8de46cb0, 0x52604998), TOBN(0x91099ad8, 0x39072aa7),
-     TOBN(0x2617f91c, 0x93aa96b8), TOBN(0x0fc8716b, 0x7fca2e13),
-     TOBN(0xa7106f5e, 0x95328723), TOBN(0xd1c9c40b, 0x262e6522),
-     TOBN(0xb9bafe86, 0x42b7c094), TOBN(0x1873439d, 0x1543c021),
-     TOBN(0xe1baa5de, 0x5cbefd5d), TOBN(0xa363fc5e, 0x521e8aff),
-     TOBN(0xefe6320d, 0xf862eaac), TOBN(0x14419c63, 0x22c647dc),
-     TOBN(0x0e06707c, 0x4e46d428), TOBN(0xcb6c834f, 0x4a178f8f),
-     TOBN(0x0f993a45, 0xd30f917c), TOBN(0xd4c4b049, 0x9879afee),
-     TOBN(0xb6142a1e, 0x70500063), TOBN(0x7c9b41c3, 0xa5d9d605),
-     TOBN(0xbc00fc2f, 0x2f8ba2c7), TOBN(0x0966eb2f, 0x7c67aa28),
-     TOBN(0x13f7b516, 0x5a786972), TOBN(0x3bfb7557, 0x8a2fbba0),
-     TOBN(0x131c4f23, 0x5a2b9620), TOBN(0xbff3ed27, 0x6faf46be),
-     TOBN(0x9b4473d1, 0x7e172323), TOBN(0x421e8878, 0x339f6246),
-     TOBN(0x0fa8587a, 0x25a41632), TOBN(0xc0814124, 0xa35b6c93),
-     TOBN(0x2b18a9f5, 0x59ebb8db), TOBN(0x264e3357, 0x76edb29c),
-     TOBN(0xaf245ccd, 0xc87c51e2), TOBN(0x16b3015b, 0x501e6214),
-     TOBN(0xbb31c560, 0x0a3882ce), TOBN(0x6961bb94, 0xfec11e04),
-     TOBN(0x3b825b8d, 0xeff7a3a0), TOBN(0xbec33738, 0xb1df7326),
-     TOBN(0x68ad747c, 0x99604a1f), TOBN(0xd154c934, 0x9a3bd499),
-     TOBN(0xac33506f, 0x1cc7a906), TOBN(0x73bb5392, 0x6c560e8f),
-     TOBN(0x6428fcbe, 0x263e3944), TOBN(0xc11828d5, 0x1c387434),
-     TOBN(0x3cd04be1, 0x3e4b12ff), TOBN(0xc3aad9f9, 0x2d88667c),
-     TOBN(0xc52ddcf8, 0x248120cf), TOBN(0x985a892e, 0x2a389532),
-     TOBN(0xfbb4b21b, 0x3bb85fa0), TOBN(0xf95375e0, 0x8dfc6269),
-     TOBN(0xfb4fb06c, 0x7ee2acea), TOBN(0x6785426e, 0x309c4d1f),
-     TOBN(0x659b17c8, 0xd8ceb147), TOBN(0x9b649eee, 0xb70a5554),
-     TOBN(0x6b7fa0b5, 0xac6bc634), TOBN(0xd99fe2c7, 0x1d6e732f),
-     TOBN(0x30e6e762, 0x8d3abba2), TOBN(0x18fee6e7, 0xa797b799),
-     TOBN(0x5c9d360d, 0xc696464d), TOBN(0xe3baeb48, 0x27bfde12),
-     TOBN(0x2bf5db47, 0xf23206d5), TOBN(0x2f6d3420, 0x1d260152),
-     TOBN(0x17b87653, 0x3f8ff89a), TOBN(0x5157c30c, 0x378fa458),
-     TOBN(0x7517c5c5, 0x2d4fb936), TOBN(0xef22f7ac, 0xe6518cdc),
-     TOBN(0xdeb483e6, 0xbf847a64), TOBN(0xf5084558, 0x92e0fa89),}
-    ,
-    {TOBN(0xab9659d8, 0xdf7304d4), TOBN(0xb71bcf1b, 0xff210e8e),
-     TOBN(0xa9a2438b, 0xd73fbd60), TOBN(0x4595cd1f, 0x5d11b4de),
-     TOBN(0x9c0d329a, 0x4835859d), TOBN(0x4a0f0d2d, 0x7dbb6e56),
-     TOBN(0xc6038e5e, 0xdf928a4e), TOBN(0xc9429621, 0x8f5ad154),
-     TOBN(0x91213462, 0xf23f2d92), TOBN(0x6cab71bd, 0x60b94078),
-     TOBN(0x6bdd0a63, 0x176cde20), TOBN(0x54c9b20c, 0xee4d54bc),
-     TOBN(0x3cd2d8aa, 0x9f2ac02f), TOBN(0x03f8e617, 0x206eedb0),
-     TOBN(0xc7f68e16, 0x93086434), TOBN(0x831469c5, 0x92dd3db9),
-     TOBN(0x8521df24, 0x8f981354), TOBN(0x587e23ec, 0x3588a259),
-     TOBN(0xcbedf281, 0xd7a0992c), TOBN(0x06930a55, 0x38961407),
-     TOBN(0x09320deb, 0xbe5bbe21), TOBN(0xa7ffa5b5, 0x2491817f),
-     TOBN(0xe6c8b4d9, 0x09065160), TOBN(0xac4f3992, 0xfff6d2a9),
-     TOBN(0x7aa7a158, 0x3ae9c1bd), TOBN(0xe0af6d98, 0xe37ce240),
-     TOBN(0xe54342d9, 0x28ab38b4), TOBN(0xe8b75007, 0x0a1c98ca),
-     TOBN(0xefce86af, 0xe02358f2), TOBN(0x31b8b856, 0xea921228),
-     TOBN(0x052a1912, 0x0a1c67fc), TOBN(0xb4069ea4, 0xe3aead59),
-     TOBN(0x3232d6e2, 0x7fa03cb3), TOBN(0xdb938e5b, 0x0fdd7d88),
-     TOBN(0x04c1d2cd, 0x2ccbfc5d), TOBN(0xd2f45c12, 0xaf3a580f),
-     TOBN(0x592620b5, 0x7883e614), TOBN(0x5fd27e68, 0xbe7c5f26),
-     TOBN(0x139e45a9, 0x1567e1e3), TOBN(0x2cc71d2d, 0x44d8aaaf),
-     TOBN(0x4a9090cd, 0xe36d0757), TOBN(0xf722d7b1, 0xd9a29382),
-     TOBN(0xfb7fb04c, 0x04b48ddf), TOBN(0x628ad2a7, 0xebe16f43),
-     TOBN(0xcd3fbfb5, 0x20226040), TOBN(0x6c34ecb1, 0x5104b6c4),
-     TOBN(0x30c0754e, 0xc903c188), TOBN(0xec336b08, 0x2d23cab0),
-     TOBN(0x473d62a2, 0x1e206ee5), TOBN(0xf1e27480, 0x8c49a633),
-     TOBN(0x87ab956c, 0xe9f6b2c3), TOBN(0x61830b48, 0x62b606ea),
-     TOBN(0x67cd6846, 0xe78e815f), TOBN(0xfe40139f, 0x4c02082a),
-     TOBN(0x52bbbfcb, 0x952ec365), TOBN(0x74c11642, 0x6b9836ab),
-     TOBN(0x9f51439e, 0x558df019), TOBN(0x230da4ba, 0xac712b27),
-     TOBN(0x518919e3, 0x55185a24), TOBN(0x4dcefcdd, 0x84b78f50),
-     TOBN(0xa7d90fb2, 0xa47d4c5a), TOBN(0x55ac9abf, 0xb30e009e),
-     TOBN(0xfd2fc359, 0x74eed273), TOBN(0xb72d824c, 0xdbea8faf),
-     TOBN(0xce721a74, 0x4513e2ca), TOBN(0x0b418612, 0x38240b2c),
-     TOBN(0x05199968, 0xd5baa450), TOBN(0xeb1757ed, 0x2b0e8c25),
-     TOBN(0x6ebc3e28, 0x3dfac6d5), TOBN(0xb2431e2e, 0x48a237f5),
-     TOBN(0x2acb5e23, 0x52f61499), TOBN(0x5558a2a7, 0xe06c936b),
-     TOBN(0xd213f923, 0xcbb13d1b), TOBN(0x98799f42, 0x5bfb9bfe),
-     TOBN(0x1ae8ddc9, 0x701144a9), TOBN(0x0b8b3bb6, 0x4c5595ee),
-     TOBN(0x0ea9ef2e, 0x3ecebb21), TOBN(0x17cb6c4b, 0x3671f9a7),
-     TOBN(0x47ef464f, 0x726f1d1f), TOBN(0x171b9484, 0x6943a276),
-     TOBN(0x51a4ae2d, 0x7ef0329c), TOBN(0x08509222, 0x91c4402a),
-     TOBN(0x64a61d35, 0xafd45bbc), TOBN(0x38f096fe, 0x3035a851),
-     TOBN(0xc7468b74, 0xa1dec027), TOBN(0xe8cf10e7, 0x4fc7dcba),
-     TOBN(0xea35ff40, 0xf4a06353), TOBN(0x0b4c0dfa, 0x8b77dd66),
-     TOBN(0x779b8552, 0xde7e5c19), TOBN(0xfab28609, 0xc1c0256c),
-     TOBN(0x64f58eee, 0xabd4743d), TOBN(0x4e8ef838, 0x7b6cc93b),
-     TOBN(0xee650d26, 0x4cb1bf3d), TOBN(0x4c1f9d09, 0x73dedf61),
-     TOBN(0xaef7c9d7, 0xbfb70ced), TOBN(0x1ec0507e, 0x1641de1e),
-     TOBN(0xcd7e5cc7, 0xcde45079), TOBN(0xde173c9a, 0x516ac9e4),
-     TOBN(0x517a8494, 0xc170315c), TOBN(0x438fd905, 0x91d8e8fb),
-     TOBN(0x5145c506, 0xc7d9630b), TOBN(0x6457a87b, 0xf47d4d75),
-     TOBN(0xd31646bf, 0x0d9a80e8), TOBN(0x453add2b, 0xcef3aabe),
-     TOBN(0xc9941109, 0xa607419d), TOBN(0xfaa71e62, 0xbb6bca80),
-     TOBN(0x34158c13, 0x07c431f3), TOBN(0x594abebc, 0x992bc47a),
-     TOBN(0x6dfea691, 0xeb78399f), TOBN(0x48aafb35, 0x3f42cba4),
-     TOBN(0xedcd65af, 0x077c04f0), TOBN(0x1a29a366, 0xe884491a),
-     TOBN(0x023a40e5, 0x1c21f2bf), TOBN(0xf99a513c, 0xa5057aee),
-     TOBN(0xa3fe7e25, 0xbcab072e), TOBN(0x8568d2e1, 0x40e32bcf),
-     TOBN(0x904594eb, 0xd3f69d9f), TOBN(0x181a9733, 0x07affab1),
-     TOBN(0xe4d68d76, 0xb6e330f4), TOBN(0x87a6dafb, 0xc75a7fc1),
-     TOBN(0x549db2b5, 0xef7d9289), TOBN(0x2480d4a8, 0x197f015a),
-     TOBN(0x61d5590b, 0xc40493b6), TOBN(0x3a55b52e, 0x6f780331),
-     TOBN(0x40eb8115, 0x309eadb0), TOBN(0xdea7de5a, 0x92e5c625),
-     TOBN(0x64d631f0, 0xcc6a3d5a), TOBN(0x9d5e9d7c, 0x93e8dd61),
-     TOBN(0xf297bef5, 0x206d3ffc), TOBN(0x23d5e033, 0x7d808bd4),
-     TOBN(0x4a4f6912, 0xd24cf5ba), TOBN(0xe4d8163b, 0x09cdaa8a),
-     TOBN(0x0e0de9ef, 0xd3082e8e), TOBN(0x4fe1246c, 0x0192f360),
-     TOBN(0x1f900150, 0x4b8eee0a), TOBN(0x5219da81, 0xf1da391b),
-     TOBN(0x7bf6a5c1, 0xf7ea25aa), TOBN(0xd165e6bf, 0xfbb07d5f),
-     TOBN(0xe3539361, 0x89e78671), TOBN(0xa3fcac89, 0x2bac4219),
-     TOBN(0xdfab6fd4, 0xf0baa8ab), TOBN(0x5a4adac1, 0xe2c1c2e5),
-     TOBN(0x6cd75e31, 0x40d85849), TOBN(0xce263fea, 0x19b39181),
-     TOBN(0xcb6803d3, 0x07032c72), TOBN(0x7f40d5ce, 0x790968c8),
-     TOBN(0xa6de86bd, 0xdce978f0), TOBN(0x25547c4f, 0x368f751c),
-     TOBN(0xb1e685fd, 0x65fb2a9e), TOBN(0xce69336f, 0x1eb9179c),
-     TOBN(0xb15d1c27, 0x12504442), TOBN(0xb7df465c, 0xb911a06b),
-     TOBN(0xb8d804a3, 0x315980cd), TOBN(0x693bc492, 0xfa3bebf7),
-     TOBN(0x3578aeee, 0x2253c504), TOBN(0x158de498, 0xcd2474a2),
-     TOBN(0x1331f5c7, 0xcfda8368), TOBN(0xd2d7bbb3, 0x78d7177e),
-     TOBN(0xdf61133a, 0xf3c1e46e), TOBN(0x5836ce7d, 0xd30e7be8),
-     TOBN(0x83084f19, 0x94f834cb), TOBN(0xd35653d4, 0x429ed782),
-     TOBN(0xa542f16f, 0x59e58243), TOBN(0xc2b52f65, 0x0470a22d),
-     TOBN(0xe3b6221b, 0x18f23d96), TOBN(0xcb05abac, 0x3f5252b4),
-     TOBN(0xca00938b, 0x87d61402), TOBN(0x2f186cdd, 0x411933e4),
-     TOBN(0xe042ece5, 0x9a29a5c5), TOBN(0xb19b3c07, 0x3b6c8402),
-     TOBN(0xc97667c7, 0x19d92684), TOBN(0xb5624622, 0xebc66372),
-     TOBN(0x0cb96e65, 0x3c04fa02), TOBN(0x83a7176c, 0x8eaa39aa),
-     TOBN(0x2033561d, 0xeaa1633f), TOBN(0x45a9d086, 0x4533df73),
-     TOBN(0xe0542c1d, 0x3dc090bc), TOBN(0x82c996ef, 0xaa59c167),
-     TOBN(0xe3f735e8, 0x0ee7fc4d), TOBN(0x7b179393, 0x7c35db79),
-     TOBN(0xb6419e25, 0xf8c5dbfd), TOBN(0x4d9d7a1e, 0x1f327b04),
-     TOBN(0x979f6f9b, 0x298dfca8), TOBN(0xc7c5dff1, 0x8de9366a),
-     TOBN(0x1b7a588d, 0x04c82bdd), TOBN(0x68005534, 0xf8319dfd),
-     TOBN(0xde8a55b5, 0xd8eb9580), TOBN(0x5ea886da, 0x8d5bca81),
-     TOBN(0xe8530a01, 0x252a0b4d), TOBN(0x1bffb4fe, 0x35eaa0a1),
-     TOBN(0x2ad828b1, 0xd8e99563), TOBN(0x7de96ef5, 0x95f9cd87),
-     TOBN(0x4abb2d0c, 0xd77d970c), TOBN(0x03cfb933, 0xd33ef9cb),
-     TOBN(0xb0547c01, 0x8b211fe9), TOBN(0x2fe64809, 0xa56ed1c6),
-     TOBN(0xcb7d5624, 0xc2ac98cc), TOBN(0x2a1372c0, 0x1a393e33),
-     TOBN(0xc8d1ec1c, 0x29660521), TOBN(0xf3d31b04, 0xb37ac3e9),
-     TOBN(0xa29ae9df, 0x5ece6e7c), TOBN(0x0603ac8f, 0x0facfb55),
-     TOBN(0xcfe85b7a, 0xdda233a5), TOBN(0xe618919f, 0xbd75f0b8),
-     TOBN(0xf555a3d2, 0x99bf1603), TOBN(0x1f43afc9, 0xf184255a),
-     TOBN(0xdcdaf341, 0x319a3e02), TOBN(0xd3b117ef, 0x03903a39),
-     TOBN(0xe095da13, 0x65d1d131), TOBN(0x86f16367, 0xc37ad03e),
-     TOBN(0x5f37389e, 0x462cd8dd), TOBN(0xc103fa04, 0xd67a60e6),
-     TOBN(0x57c34344, 0xf4b478f0), TOBN(0xce91edd8, 0xe117c98d),
-     TOBN(0x001777b0, 0x231fc12e), TOBN(0x11ae47f2, 0xb207bccb),
-     TOBN(0xd983cf8d, 0x20f8a242), TOBN(0x7aff5b1d, 0xf22e1ad8),
-     TOBN(0x68fd11d0, 0x7fc4feb3), TOBN(0x5d53ae90, 0xb0f1c3e1),
-     TOBN(0x50fb7905, 0xec041803), TOBN(0x85e3c977, 0x14404888),
-     TOBN(0x0e67faed, 0xac628d8f), TOBN(0x2e865150, 0x6668532c),
-     TOBN(0x15acaaa4, 0x6a67a6b0), TOBN(0xf4cdee25, 0xb25cec41),
-     TOBN(0x49ee565a, 0xe4c6701e), TOBN(0x2a04ca66, 0xfc7d63d8),
-     TOBN(0xeb105018, 0xef0543fb), TOBN(0xf709a4f5, 0xd1b0d81d),
-     TOBN(0x5b906ee6, 0x2915d333), TOBN(0xf4a87412, 0x96f1f0ab),
-     TOBN(0xb6b82fa7, 0x4d82f4c2), TOBN(0x90725a60, 0x6804efb3),
-     TOBN(0xbc82ec46, 0xadc3425e), TOBN(0xb7b80581, 0x2787843e),
-     TOBN(0xdf46d91c, 0xdd1fc74c), TOBN(0xdc1c62cb, 0xe783a6c4),
-     TOBN(0x59d1b9f3, 0x1a04cbba), TOBN(0xd87f6f72, 0x95e40764),
-     TOBN(0x02b4cfc1, 0x317f4a76), TOBN(0x8d2703eb, 0x91036bce),
-     TOBN(0x98206cc6, 0xa5e72a56), TOBN(0x57be9ed1, 0xcf53fb0f),
-     TOBN(0x09374571, 0xef0b17ac), TOBN(0x74b2655e, 0xd9181b38),
-     TOBN(0xc8f80ea8, 0x89935d0e), TOBN(0xc0d9e942, 0x91529936),
-     TOBN(0x19686041, 0x1e84e0e5), TOBN(0xa5db84d3, 0xaea34c93),
-     TOBN(0xf9d5bb19, 0x7073a732), TOBN(0xb8d2fe56, 0x6bcfd7c0),
-     TOBN(0x45775f36, 0xf3eb82fa), TOBN(0x8cb20ccc, 0xfdff8b58),
-     TOBN(0x1659b65f, 0x8374c110), TOBN(0xb8b4a422, 0x330c789a),
-     TOBN(0x75e3c3ea, 0x6fe8208b), TOBN(0xbd74b9e4, 0x286e78fe),
-     TOBN(0x0be2e81b, 0xd7d93a1a), TOBN(0x7ed06e27, 0xdd0a5aae),
-     TOBN(0x721f5a58, 0x6be8b800), TOBN(0x428299d1, 0xd846db28),
-     TOBN(0x95cb8e6b, 0x5be88ed3), TOBN(0xc3186b23, 0x1c034e11),
-     TOBN(0xa6312c9e, 0x8977d99b), TOBN(0xbe944331, 0x83f531e7),
-     TOBN(0x8232c0c2, 0x18d3b1d4), TOBN(0x617aae8b, 0xe1247b73),
-     TOBN(0x40153fc4, 0x282aec3b), TOBN(0xc6063d2f, 0xf7b8f823),
-     TOBN(0x68f10e58, 0x3304f94c), TOBN(0x31efae74, 0xee676346),
-     TOBN(0xbadb6c6d, 0x40a9b97c), TOBN(0x14702c63, 0x4f666256),
-     TOBN(0xdeb954f1, 0x5184b2e3), TOBN(0x5184a526, 0x94b6ca40),
-     TOBN(0xfff05337, 0x003c32ea), TOBN(0x5aa374dd, 0x205974c7),
-     TOBN(0x9a763854, 0x4b0dd71a), TOBN(0x459cd27f, 0xdeb947ec),
-     TOBN(0xa6e28161, 0x459c2b92), TOBN(0x2f020fa8, 0x75ee8ef5),
-     TOBN(0xb132ec2d, 0x30b06310), TOBN(0xc3e15899, 0xbc6a4530),
-     TOBN(0xdc5f53fe, 0xaa3f451a), TOBN(0x3a3c7f23, 0xc2d9acac),
-     TOBN(0x2ec2f892, 0x6b27e58b), TOBN(0x68466ee7, 0xd742799f),
-     TOBN(0x98324dd4, 0x1fa26613), TOBN(0xa2dc6dab, 0xbdc29d63),
-     TOBN(0xf9675faa, 0xd712d657), TOBN(0x813994be, 0x21fd8d15),
-     TOBN(0x5ccbb722, 0xfd4f7553), TOBN(0x5135ff8b, 0xf3a36b20),
-     TOBN(0x44be28af, 0x69559df5), TOBN(0x40b65bed, 0x9d41bf30),
-     TOBN(0xd98bf2a4, 0x3734e520), TOBN(0x5e3abbe3, 0x209bdcba),
-     TOBN(0x77c76553, 0xbc945b35), TOBN(0x5331c093, 0xc6ef14aa),
-     TOBN(0x518ffe29, 0x76b60c80), TOBN(0x2285593b, 0x7ace16f8),
-     TOBN(0xab1f64cc, 0xbe2b9784), TOBN(0xe8f2c0d9, 0xab2421b6),
-     TOBN(0x617d7174, 0xc1df065c), TOBN(0xafeeb5ab, 0x5f6578fa),
-     TOBN(0x16ff1329, 0x263b54a8), TOBN(0x45c55808, 0xc990dce3),
-     TOBN(0x42eab6c0, 0xecc8c177), TOBN(0x799ea9b5, 0x5982ecaa),
-     TOBN(0xf65da244, 0xb607ef8e), TOBN(0x8ab226ce, 0x32a3fc2c),
-     TOBN(0x745741e5, 0x7ea973dc), TOBN(0x5c00ca70, 0x20888f2e),
-     TOBN(0x7cdce3cf, 0x45fd9cf1), TOBN(0x8a741ef1, 0x5507f872),
-     TOBN(0x47c51c2f, 0x196b4cec), TOBN(0x70d08e43, 0xc97ea618),
-     TOBN(0x930da15c, 0x15b18a2b), TOBN(0x33b6c678, 0x2f610514),
-     TOBN(0xc662e4f8, 0x07ac9794), TOBN(0x1eccf050, 0xba06cb79),
-     TOBN(0x1ff08623, 0xe7d954e5), TOBN(0x6ef2c5fb, 0x24cf71c3),
-     TOBN(0xb2c063d2, 0x67978453), TOBN(0xa0cf3796, 0x1d654af8),
-     TOBN(0x7cb242ea, 0x7ebdaa37), TOBN(0x206e0b10, 0xb86747e0),
-     TOBN(0x481dae5f, 0xd5ecfefc), TOBN(0x07084fd8, 0xc2bff8fc),
-     TOBN(0x8040a01a, 0xea324596), TOBN(0x4c646980, 0xd4de4036),
-     TOBN(0x9eb8ab4e, 0xd65abfc3), TOBN(0xe01cb91f, 0x13541ec7),
-     TOBN(0x8f029adb, 0xfd695012), TOBN(0x9ae28483, 0x3c7569ec),
-     TOBN(0xa5614c9e, 0xa66d80a1), TOBN(0x680a3e44, 0x75f5f911),
-     TOBN(0x0c07b14d, 0xceba4fc1), TOBN(0x891c285b, 0xa13071c1),
-     TOBN(0xcac67ceb, 0x799ece3c), TOBN(0x29b910a9, 0x41e07e27),
-     TOBN(0x66bdb409, 0xf2e43123), TOBN(0x06f8b137, 0x7ac9ecbe),
-     TOBN(0x5981fafd, 0x38547090), TOBN(0x19ab8b9f, 0x85e3415d),
-     TOBN(0xfc28c194, 0xc7e31b27), TOBN(0x843be0aa, 0x6fbcbb42),
-     TOBN(0xf3b1ed43, 0xa6db836c), TOBN(0x2a1330e4, 0x01a45c05),
-     TOBN(0x4f19f3c5, 0x95c1a377), TOBN(0xa85f39d0, 0x44b5ee33),
-     TOBN(0x3da18e6d, 0x4ae52834), TOBN(0x5a403b39, 0x7423dcb0),
-     TOBN(0xbb555e0a, 0xf2374aef), TOBN(0x2ad599c4, 0x1e8ca111),
-     TOBN(0x1b3a2fb9, 0x014b3bf8), TOBN(0x73092684, 0xf66d5007),
-     TOBN(0x079f1426, 0xc4340102), TOBN(0x1827cf81, 0x8fddf4de),
-     TOBN(0xc83605f6, 0xf10ff927), TOBN(0xd3871451, 0x23739fc6),
-     TOBN(0x6d163450, 0xcac1c2cc), TOBN(0x6b521296, 0xa2ec1ac5),
-     TOBN(0x0606c4f9, 0x6e3cb4a5), TOBN(0xe47d3f41, 0x778abff7),
-     TOBN(0x425a8d5e, 0xbe8e3a45), TOBN(0x53ea9e97, 0xa6102160),
-     TOBN(0x477a106e, 0x39cbb688), TOBN(0x532401d2, 0xf3386d32),
-     TOBN(0x8e564f64, 0xb1b9b421), TOBN(0xca9b8388, 0x81dad33f),
-     TOBN(0xb1422b4e, 0x2093913e), TOBN(0x533d2f92, 0x69bc8112),
-     TOBN(0x3fa017be, 0xebe7b2c7), TOBN(0xb2767c4a, 0xcaf197c6),
-     TOBN(0xc925ff87, 0xaedbae9f), TOBN(0x7daf0eb9, 0x36880a54),
-     TOBN(0x9284ddf5, 0x9c4d0e71), TOBN(0x1581cf93, 0x316f8cf5),
-     TOBN(0x3eeca887, 0x3ac1f452), TOBN(0xb417fce9, 0xfb6aeffe),
-     TOBN(0xa5918046, 0xeefb8dc3), TOBN(0x73d318ac, 0x02209400),
-     TOBN(0xe800400f, 0x728693e5), TOBN(0xe87d814b, 0x339927ed),
-     TOBN(0x93e94d3b, 0x57ea9910), TOBN(0xff8a35b6, 0x2245fb69),
-     TOBN(0x043853d7, 0x7f200d34), TOBN(0x470f1e68, 0x0f653ce1),
-     TOBN(0x81ac05bd, 0x59a06379), TOBN(0xa14052c2, 0x03930c29),
-     TOBN(0x6b72fab5, 0x26bc2797), TOBN(0x13670d16, 0x99f16771),
-     TOBN(0x00170052, 0x1e3e48d1), TOBN(0x978fe401, 0xb7adf678),
-     TOBN(0x55ecfb92, 0xd41c5dd4), TOBN(0x5ff8e247, 0xc7b27da5),
-     TOBN(0xe7518272, 0x013fb606), TOBN(0x5768d7e5, 0x2f547a3c),
-     TOBN(0xbb24eaa3, 0x60017a5f), TOBN(0x6b18e6e4, 0x9c64ce9b),
-     TOBN(0xc225c655, 0x103dde07), TOBN(0xfc3672ae, 0x7592f7ea),
-     TOBN(0x9606ad77, 0xd06283a1), TOBN(0x542fc650, 0xe4d59d99),
-     TOBN(0xabb57c49, 0x2a40e7c2), TOBN(0xac948f13, 0xa8db9f55),
-     TOBN(0x6d4c9682, 0xb04465c3), TOBN(0xe3d062fa, 0x6468bd15),
-     TOBN(0xa51729ac, 0x5f318d7e), TOBN(0x1fc87df6, 0x9eb6fc95),
-     TOBN(0x63d146a8, 0x0591f652), TOBN(0xa861b8f7, 0x589621aa),
-     TOBN(0x59f5f15a, 0xce31348c), TOBN(0x8f663391, 0x440da6da),
-     TOBN(0xcfa778ac, 0xb591ffa3), TOBN(0x027ca9c5, 0x4cdfebce),
-     TOBN(0xbe8e05a5, 0x444ea6b3), TOBN(0x8aab4e69, 0xa78d8254),
-     TOBN(0x2437f04f, 0xb474d6b8), TOBN(0x6597ffd4, 0x045b3855),
-     TOBN(0xbb0aea4e, 0xca47ecaa), TOBN(0x568aae83, 0x85c7ebfc),
-     TOBN(0x0e966e64, 0xc73b2383), TOBN(0x49eb3447, 0xd17d8762),
-     TOBN(0xde107821, 0x8da05dab), TOBN(0x443d8baa, 0x016b7236),
-     TOBN(0x163b63a5, 0xea7610d6), TOBN(0xe47e4185, 0xce1ca979),
-     TOBN(0xae648b65, 0x80baa132), TOBN(0xebf53de2, 0x0e0d5b64),
-     TOBN(0x8d3bfcb4, 0xd3c8c1ca), TOBN(0x0d914ef3, 0x5d04b309),
-     TOBN(0x55ef6415, 0x3de7d395), TOBN(0xbde1666f, 0x26b850e8),
-     TOBN(0xdbe1ca6e, 0xd449ab19), TOBN(0x8902b322, 0xe89a2672),
-     TOBN(0xb1674b7e, 0xdacb7a53), TOBN(0x8e9faf6e, 0xf52523ff),
-     TOBN(0x6ba535da, 0x9a85788b), TOBN(0xd21f03ae, 0xbd0626d4),
-     TOBN(0x099f8c47, 0xe873dc64), TOBN(0xcda8564d, 0x018ec97e),
-     TOBN(0x3e8d7a5c, 0xde92c68c), TOBN(0x78e035a1, 0x73323cc4),
-     TOBN(0x3ef26275, 0xf880ff7c), TOBN(0xa4ee3dff, 0x273eedaa),
-     TOBN(0x58823507, 0xaf4e18f8), TOBN(0x967ec9b5, 0x0672f328),
-     TOBN(0x9ded19d9, 0x559d3186), TOBN(0x5e2ab3de, 0x6cdce39c),
-     TOBN(0xabad6e4d, 0x11c226df), TOBN(0xf9783f43, 0x87723014),
-     TOBN(0x9a49a0cf, 0x1a885719), TOBN(0xfc0c1a5a, 0x90da9dbf),
-     TOBN(0x8bbaec49, 0x571d92ac), TOBN(0x569e85fe, 0x4692517f),
-     TOBN(0x8333b014, 0xa14ea4af), TOBN(0x32f2a62f, 0x12e5c5ad),
-     TOBN(0x98c2ce3a, 0x06d89b85), TOBN(0xb90741aa, 0x2ff77a08),
-     TOBN(0x2530defc, 0x01f795a2), TOBN(0xd6e5ba0b, 0x84b3c199),
-     TOBN(0x7d8e8451, 0x12e4c936), TOBN(0xae419f7d, 0xbd0be17b),
-     TOBN(0xa583fc8c, 0x22262bc9), TOBN(0x6b842ac7, 0x91bfe2bd),
-     TOBN(0x33cef4e9, 0x440d6827), TOBN(0x5f69f4de, 0xef81fb14),
-     TOBN(0xf16cf6f6, 0x234fbb92), TOBN(0x76ae3fc3, 0xd9e7e158),
-     TOBN(0x4e89f6c2, 0xe9740b33), TOBN(0x677bc85d, 0x4962d6a1),
-     TOBN(0x6c6d8a7f, 0x68d10d15), TOBN(0x5f9a7224, 0x0257b1cd),
-     TOBN(0x7096b916, 0x4ad85961), TOBN(0x5f8c47f7, 0xe657ab4a),
-     TOBN(0xde57d7d0, 0xf7461d7e), TOBN(0x7eb6094d, 0x80ce5ee2),
-     TOBN(0x0b1e1dfd, 0x34190547), TOBN(0x8a394f43, 0xf05dd150),
-     TOBN(0x0a9eb24d, 0x97df44e6), TOBN(0x78ca06bf, 0x87675719),
-     TOBN(0x6f0b3462, 0x6ffeec22), TOBN(0x9d91bcea, 0x36cdd8fb),
-     TOBN(0xac83363c, 0xa105be47), TOBN(0x81ba76c1, 0x069710e3),
-     TOBN(0x3d1b24cb, 0x28c682c6), TOBN(0x27f25228, 0x8612575b),
-     TOBN(0xb587c779, 0xe8e66e98), TOBN(0x7b0c03e9, 0x405eb1fe),
-     TOBN(0xfdf0d030, 0x15b548e7), TOBN(0xa8be76e0, 0x38b36af7),
-     TOBN(0x4cdab04a, 0x4f310c40), TOBN(0x6287223e, 0xf47ecaec),
-     TOBN(0x678e6055, 0x8b399320), TOBN(0x61fe3fa6, 0xc01e4646),
-     TOBN(0xc482866b, 0x03261a5e), TOBN(0xdfcf45b8, 0x5c2f244a),
-     TOBN(0x8fab9a51, 0x2f684b43), TOBN(0xf796c654, 0xc7220a66),
-     TOBN(0x1d90707e, 0xf5afa58f), TOBN(0x2c421d97, 0x4fdbe0de),
-     TOBN(0xc4f4cda3, 0xaf2ebc2f), TOBN(0xa0af843d, 0xcb4efe24),
-     TOBN(0x53b857c1, 0x9ccd10b1), TOBN(0xddc9d1eb, 0x914d3e04),
-     TOBN(0x7bdec8bb, 0x62771deb), TOBN(0x829277aa, 0x91c5aa81),
-     TOBN(0x7af18dd6, 0x832391ae), TOBN(0x1740f316, 0xc71a84ca),}
-    ,
-    {TOBN(0x8928e99a, 0xeeaf8c49), TOBN(0xee7aa73d, 0x6e24d728),
-     TOBN(0x4c5007c2, 0xe72b156c), TOBN(0x5fcf57c5, 0xed408a1d),
-     TOBN(0x9f719e39, 0xb6057604), TOBN(0x7d343c01, 0xc2868bbf),
-     TOBN(0x2cca254b, 0x7e103e2d), TOBN(0xe6eb38a9, 0xf131bea2),
-     TOBN(0xb33e624f, 0x8be762b4), TOBN(0x2a9ee4d1, 0x058e3413),
-     TOBN(0x968e6369, 0x67d805fa), TOBN(0x9848949b, 0x7db8bfd7),
-     TOBN(0x5308d7e5, 0xd23a8417), TOBN(0x892f3b1d, 0xf3e29da5),
-     TOBN(0xc95c139e, 0x3dee471f), TOBN(0x8631594d, 0xd757e089),
-     TOBN(0xe0c82a3c, 0xde918dcc), TOBN(0x2e7b5994, 0x26fdcf4b),
-     TOBN(0x82c50249, 0x32cb1b2d), TOBN(0xea613a9d, 0x7657ae07),
-     TOBN(0xc2eb5f6c, 0xf1fdc9f7), TOBN(0xb6eae8b8, 0x879fe682),
-     TOBN(0x253dfee0, 0x591cbc7f), TOBN(0x000da713, 0x3e1290e6),
-     TOBN(0x1083e2ea, 0x1f095615), TOBN(0x0a28ad77, 0x14e68c33),
-     TOBN(0x6bfc0252, 0x3d8818be), TOBN(0xb585113a, 0xf35850cd),
-     TOBN(0x7d935f0b, 0x30df8aa1), TOBN(0xaddda07c, 0x4ab7e3ac),
-     TOBN(0x92c34299, 0x552f00cb), TOBN(0xc33ed1de, 0x2909df6c),
-     TOBN(0x22c2195d, 0x80e87766), TOBN(0x9e99e6d8, 0x9ddf4ac0),
-     TOBN(0x09642e4e, 0x65e74934), TOBN(0x2610ffa2, 0xff1ff241),
-     TOBN(0x4d1d47d4, 0x751c8159), TOBN(0x697b4985, 0xaf3a9363),
-     TOBN(0x0318ca46, 0x87477c33), TOBN(0xa90cb565, 0x9441eff3),
-     TOBN(0x58bb3848, 0x36f024cb), TOBN(0x85be1f77, 0x36016168),
-     TOBN(0x6c59587c, 0xdc7e07f1), TOBN(0x191be071, 0xaf1d8f02),
-     TOBN(0xbf169fa5, 0xcca5e55c), TOBN(0x3864ba3c, 0xf7d04eac),
-     TOBN(0x915e367f, 0x8d7d05db), TOBN(0xb48a876d, 0xa6549e5d),
-     TOBN(0xef89c656, 0x580e40a2), TOBN(0xf194ed8c, 0x728068bc),
-     TOBN(0x74528045, 0xa47990c9), TOBN(0xf53fc7d7, 0x5e1a4649),
-     TOBN(0xbec5ae9b, 0x78593e7d), TOBN(0x2cac4ee3, 0x41db65d7),
-     TOBN(0xa8c1eb24, 0x04a3d39b), TOBN(0x53b7d634, 0x03f8f3ef),
-     TOBN(0x2dc40d48, 0x3e07113c), TOBN(0x6e4a5d39, 0x7d8b63ae),
-     TOBN(0x5582a94b, 0x79684c2b), TOBN(0x932b33d4, 0x622da26c),
-     TOBN(0xf534f651, 0x0dbbf08d), TOBN(0x211d07c9, 0x64c23a52),
-     TOBN(0x0eeece0f, 0xee5bdc9b), TOBN(0xdf178168, 0xf7015558),
-     TOBN(0xd4294635, 0x0a712229), TOBN(0x93cbe448, 0x09273f8c),
-     TOBN(0x00b095ef, 0x8f13bc83), TOBN(0xbb741972, 0x8798978c),
-     TOBN(0x9d7309a2, 0x56dbe6e7), TOBN(0xe578ec56, 0x5a5d39ec),
-     TOBN(0x3961151b, 0x851f9a31), TOBN(0x2da7715d, 0xe5709eb4),
-     TOBN(0x867f3017, 0x53dfabf0), TOBN(0x728d2078, 0xb8e39259),
-     TOBN(0x5c75a0cd, 0x815d9958), TOBN(0xf84867a6, 0x16603be1),
-     TOBN(0xc865b13d, 0x70e35b1c), TOBN(0x02414468, 0x19b03e2c),
-     TOBN(0xe46041da, 0xac1f3121), TOBN(0x7c9017ad, 0x6f028a7c),
-     TOBN(0xabc96de9, 0x0a482873), TOBN(0x4265d6b1, 0xb77e54d4),
-     TOBN(0x68c38e79, 0xa57d88e7), TOBN(0xd461d766, 0x9ce82de3),
-     TOBN(0x817a9ec5, 0x64a7e489), TOBN(0xcc5675cd, 0xa0def5f2),
-     TOBN(0x9a00e785, 0x985d494e), TOBN(0xc626833f, 0x1b03514a),
-     TOBN(0xabe7905a, 0x83cdd60e), TOBN(0x50602fb5, 0xa1170184),
-     TOBN(0x689886cd, 0xb023642a), TOBN(0xd568d090, 0xa6e1fb00),
-     TOBN(0x5b1922c7, 0x0259217f), TOBN(0x93831cd9, 0xc43141e4),
-     TOBN(0xdfca3587, 0x0c95f86e), TOBN(0xdec2057a, 0x568ae828),
-     TOBN(0xc44ea599, 0xf98a759a), TOBN(0x55a0a7a2, 0xf7c23c1d),
-     TOBN(0xd5ffb6e6, 0x94c4f687), TOBN(0x3563cce2, 0x12848478),
-     TOBN(0x812b3517, 0xe7b1fbe1), TOBN(0x8a7dc979, 0x4f7338e0),
-     TOBN(0x211ecee9, 0x52d048db), TOBN(0x2eea4056, 0xc86ea3b8),
-     TOBN(0xd8cb68a7, 0xba772b34), TOBN(0xe16ed341, 0x5f4e2541),
-     TOBN(0x9b32f6a6, 0x0fec14db), TOBN(0xeee376f7, 0x391698be),
-     TOBN(0xe9a7aa17, 0x83674c02), TOBN(0x65832f97, 0x5843022a),
-     TOBN(0x29f3a8da, 0x5ba4990f), TOBN(0x79a59c3a, 0xfb8e3216),
-     TOBN(0x9cdc4d2e, 0xbd19bb16), TOBN(0xc6c7cfd0, 0xb3262d86),
-     TOBN(0xd4ce14d0, 0x969c0b47), TOBN(0x1fa352b7, 0x13e56128),
-     TOBN(0x383d55b8, 0x973db6d3), TOBN(0x71836850, 0xe8e5b7bf),
-     TOBN(0xc7714596, 0xe6bb571f), TOBN(0x259df31f, 0x2d5b2dd2),
-     TOBN(0x568f8925, 0x913cc16d), TOBN(0x18bc5b6d, 0xe1a26f5a),
-     TOBN(0xdfa413be, 0xf5f499ae), TOBN(0xf8835dec, 0xc3f0ae84),
-     TOBN(0xb6e60bd8, 0x65a40ab0), TOBN(0x65596439, 0x194b377e),
-     TOBN(0xbcd85625, 0x92084a69), TOBN(0x5ce433b9, 0x4f23ede0),
-     TOBN(0xe8e8f04f, 0x6ad65143), TOBN(0x11511827, 0xd6e14af6),
-     TOBN(0x3d390a10, 0x8295c0c7), TOBN(0x71e29ee4, 0x621eba16),
-     TOBN(0xa588fc09, 0x63717b46), TOBN(0x02be02fe, 0xe06ad4a2),
-     TOBN(0x931558c6, 0x04c22b22), TOBN(0xbb4d4bd6, 0x12f3c849),
-     TOBN(0x54a4f496, 0x20efd662), TOBN(0x92ba6d20, 0xc5952d14),
-     TOBN(0x2db8ea1e, 0xcc9784c2), TOBN(0x81cc10ca, 0x4b353644),
-     TOBN(0x40b570ad, 0x4b4d7f6c), TOBN(0x5c9f1d96, 0x84a1dcd2),
-     TOBN(0x01379f81, 0x3147e797), TOBN(0xe5c6097b, 0x2bd499f5),
-     TOBN(0x40dcafa6, 0x328e5e20), TOBN(0xf7b5244a, 0x54815550),
-     TOBN(0xb9a4f118, 0x47bfc978), TOBN(0x0ea0e79f, 0xd25825b1),
-     TOBN(0xa50f96eb, 0x646c7ecf), TOBN(0xeb811493, 0x446dea9d),
-     TOBN(0x2af04677, 0xdfabcf69), TOBN(0xbe3a068f, 0xc713f6e8),
-     TOBN(0x860d523d, 0x42e06189), TOBN(0xbf077941, 0x4e3aff13),
-     TOBN(0x0b616dca, 0xc1b20650), TOBN(0xe66dd6d1, 0x2131300d),
-     TOBN(0xd4a0fd67, 0xff99abde), TOBN(0xc9903550, 0xc7aac50d),
-     TOBN(0x022ecf8b, 0x7c46b2d7), TOBN(0x3333b1e8, 0x3abf92af),
-     TOBN(0x11cc113c, 0x6c491c14), TOBN(0x05976688, 0x80dd3f88),
-     TOBN(0xf5b4d9e7, 0x29d932ed), TOBN(0xe982aad8, 0xa2c38b6d),
-     TOBN(0x6f925347, 0x8be0dcf0), TOBN(0x700080ae, 0x65ca53f2),
-     TOBN(0xd8131156, 0x443ca77f), TOBN(0xe92d6942, 0xec51f984),
-     TOBN(0xd2a08af8, 0x85dfe9ae), TOBN(0xd825d9a5, 0x4d2a86ca),
-     TOBN(0x2c53988d, 0x39dff020), TOBN(0xf38b135a, 0x430cdc40),
-     TOBN(0x0c918ae0, 0x62a7150b), TOBN(0xf31fd8de, 0x0c340e9b),
-     TOBN(0xafa0e7ae, 0x4dbbf02e), TOBN(0x5847fb2a, 0x5eba6239),
-     TOBN(0x6b1647dc, 0xdccbac8b), TOBN(0xb642aa78, 0x06f485c8),
-     TOBN(0x873f3765, 0x7038ecdf), TOBN(0x2ce5e865, 0xfa49d3fe),
-     TOBN(0xea223788, 0xc98c4400), TOBN(0x8104a8cd, 0xf1fa5279),
-     TOBN(0xbcf7cc7a, 0x06becfd7), TOBN(0x49424316, 0xc8f974ae),
-     TOBN(0xc0da65e7, 0x84d6365d), TOBN(0xbcb7443f, 0x8f759fb8),
-     TOBN(0x35c712b1, 0x7ae81930), TOBN(0x80428dff, 0x4c6e08ab),
-     TOBN(0xf19dafef, 0xa4faf843), TOBN(0xced8538d, 0xffa9855f),
-     TOBN(0x20ac409c, 0xbe3ac7ce), TOBN(0x358c1fb6, 0x882da71e),
-     TOBN(0xafa9c0e5, 0xfd349961), TOBN(0x2b2cfa51, 0x8421c2fc),
-     TOBN(0x2a80db17, 0xf3a28d38), TOBN(0xa8aba539, 0x5d138e7e),
-     TOBN(0x52012d1d, 0x6e96eb8d), TOBN(0x65d8dea0, 0xcbaf9622),
-     TOBN(0x57735447, 0xb264f56c), TOBN(0xbeebef3f, 0x1b6c8da2),
-     TOBN(0xfc346d98, 0xce785254), TOBN(0xd50e8d72, 0xbb64a161),
-     TOBN(0xc03567c7, 0x49794add), TOBN(0x15a76065, 0x752c7ef6),
-     TOBN(0x59f3a222, 0x961f23d6), TOBN(0x378e4438, 0x73ecc0b0),
-     TOBN(0xc74be434, 0x5a82fde4), TOBN(0xae509af2, 0xd8b9cf34),
-     TOBN(0x4a61ee46, 0x577f44a1), TOBN(0xe09b748c, 0xb611deeb),
-     TOBN(0xc0481b2c, 0xf5f7b884), TOBN(0x35626678, 0x61acfa6b),
-     TOBN(0x37f4c518, 0xbf8d21e6), TOBN(0x22d96531, 0xb205a76d),
-     TOBN(0x37fb85e1, 0x954073c0), TOBN(0xbceafe4f, 0x65b3a567),
-     TOBN(0xefecdef7, 0xbe42a582), TOBN(0xd3fc6080, 0x65046be6),
-     TOBN(0xc9af13c8, 0x09e8dba9), TOBN(0x1e6c9847, 0x641491ff),
-     TOBN(0x3b574925, 0xd30c31f7), TOBN(0xb7eb72ba, 0xac2a2122),
-     TOBN(0x776a0dac, 0xef0859e7), TOBN(0x06fec314, 0x21900942),
-     TOBN(0x2464bc10, 0xf8c22049), TOBN(0x9bfbcce7, 0x875ebf69),
-     TOBN(0xd7a88e2a, 0x4336326b), TOBN(0xda05261c, 0x5bc2acfa),
-     TOBN(0xc29f5bdc, 0xeba7efc8), TOBN(0x471237ca, 0x25dbbf2e),
-     TOBN(0xa72773f2, 0x2975f127), TOBN(0xdc744e8e, 0x04d0b326),
-     TOBN(0x38a7ed16, 0xa56edb73), TOBN(0x64357e37, 0x2c007e70),
-     TOBN(0xa167d15b, 0x5080b400), TOBN(0x07b41164, 0x23de4be1),
-     TOBN(0xb2d91e32, 0x74c89883), TOBN(0x3c162821, 0x2882e7ed),
-     TOBN(0xad6b36ba, 0x7503e482), TOBN(0x48434e8e, 0x0ea34331),
-     TOBN(0x79f4f24f, 0x2c7ae0b9), TOBN(0xc46fbf81, 0x1939b44a),
-     TOBN(0x76fefae8, 0x56595eb1), TOBN(0x417b66ab, 0xcd5f29c7),
-     TOBN(0x5f2332b2, 0xc5ceec20), TOBN(0xd69661ff, 0xe1a1cae2),
-     TOBN(0x5ede7e52, 0x9b0286e6), TOBN(0x9d062529, 0xe276b993),
-     TOBN(0x324794b0, 0x7e50122b), TOBN(0xdd744f8b, 0x4af07ca5),
-     TOBN(0x30a12f08, 0xd63fc97b), TOBN(0x39650f1a, 0x76626d9d),
-     TOBN(0x101b47f7, 0x1fa38477), TOBN(0x3d815f19, 0xd4dc124f),
-     TOBN(0x1569ae95, 0xb26eb58a), TOBN(0xc3cde188, 0x95fb1887),
-     TOBN(0x54e9f37b, 0xf9539a48), TOBN(0xb0100e06, 0x7408c1a5),
-     TOBN(0x821d9811, 0xea580cbb), TOBN(0x8af52d35, 0x86e50c56),
-     TOBN(0xdfbd9d47, 0xdbbf698b), TOBN(0x2961a1ea, 0x03dc1c73),
-     TOBN(0x203d38f8, 0xe76a5df8), TOBN(0x08a53a68, 0x6def707a),
-     TOBN(0x26eefb48, 0x1bee45d4), TOBN(0xb3cee346, 0x3c688036),
-     TOBN(0x463c5315, 0xc42f2469), TOBN(0x19d84d2e, 0x81378162),
-     TOBN(0x22d7c3c5, 0x1c4d349f), TOBN(0x65965844, 0x163d59c5),
-     TOBN(0xcf198c56, 0xb8abceae), TOBN(0x6fb1fb1b, 0x628559d5),
-     TOBN(0x8bbffd06, 0x07bf8fe3), TOBN(0x46259c58, 0x3467734b),
-     TOBN(0xd8953cea, 0x35f7f0d3), TOBN(0x1f0bece2, 0xd65b0ff1),
-     TOBN(0xf7d5b4b3, 0xf3c72914), TOBN(0x29e8ea95, 0x3cb53389),
-     TOBN(0x4a365626, 0x836b6d46), TOBN(0xe849f910, 0xea174fde),
-     TOBN(0x7ec62fbb, 0xf4737f21), TOBN(0xd8dba5ab, 0x6209f5ac),
-     TOBN(0x24b5d7a9, 0xa5f9adbe), TOBN(0x707d28f7, 0xa61dc768),
-     TOBN(0x7711460b, 0xcaa999ea), TOBN(0xba7b174d, 0x1c92e4cc),
-     TOBN(0x3c4bab66, 0x18d4bf2d), TOBN(0xb8f0c980, 0xeb8bd279),
-     TOBN(0x024bea9a, 0x324b4737), TOBN(0xfba9e423, 0x32a83bca),
-     TOBN(0x6e635643, 0xa232dced), TOBN(0x99619367, 0x2571c8ba),
-     TOBN(0xe8c9f357, 0x54b7032b), TOBN(0xf936b3ba, 0x2442d54a),
-     TOBN(0x2263f0f0, 0x8290c65a), TOBN(0x48989780, 0xee2c7fdb),
-     TOBN(0xadc5d55a, 0x13d4f95e), TOBN(0x737cff85, 0xad9b8500),
-     TOBN(0x271c557b, 0x8a73f43d), TOBN(0xbed617a4, 0xe18bc476),
-     TOBN(0x66245401, 0x7dfd8ab2), TOBN(0xae7b89ae, 0x3a2870aa),
-     TOBN(0x1b555f53, 0x23a7e545), TOBN(0x6791e247, 0xbe057e4c),
-     TOBN(0x860136ad, 0x324fa34d), TOBN(0xea111447, 0x4cbeae28),
-     TOBN(0x023a4270, 0xbedd3299), TOBN(0x3d5c3a7f, 0xc1c35c34),
-     TOBN(0xb0f6db67, 0x8d0412d2), TOBN(0xd92625e2, 0xfcdc6b9a),
-     TOBN(0x92ae5ccc, 0x4e28a982), TOBN(0xea251c36, 0x47a3ce7e),
-     TOBN(0x9d658932, 0x790691bf), TOBN(0xed610589, 0x06b736ae),
-     TOBN(0x712c2f04, 0xc0d63b6e), TOBN(0x5cf06fd5, 0xc63d488f),
-     TOBN(0x97363fac, 0xd9588e41), TOBN(0x1f9bf762, 0x2b93257e),
-     TOBN(0xa9d1ffc4, 0x667acace), TOBN(0x1cf4a1aa, 0x0a061ecf),
-     TOBN(0x40e48a49, 0xdc1818d0), TOBN(0x0643ff39, 0xa3621ab0),
-     TOBN(0x5768640c, 0xe39ef639), TOBN(0x1fc099ea, 0x04d86854),
-     TOBN(0x9130b9c3, 0xeccd28fd), TOBN(0xd743cbd2, 0x7eec54ab),
-     TOBN(0x052b146f, 0xe5b475b6), TOBN(0x058d9a82, 0x900a7d1f),
-     TOBN(0x65e02292, 0x91262b72), TOBN(0x96f924f9, 0xbb0edf03),
-     TOBN(0x5cfa59c8, 0xfe206842), TOBN(0xf6037004, 0x5eafa720),
-     TOBN(0x5f30699e, 0x18d7dd96), TOBN(0x381e8782, 0xcbab2495),
-     TOBN(0x91669b46, 0xdd8be949), TOBN(0xb40606f5, 0x26aae8ef),
-     TOBN(0x2812b839, 0xfc6751a4), TOBN(0x16196214, 0xfba800ef),
-     TOBN(0x4398d5ca, 0x4c1a2875), TOBN(0x720c00ee, 0x653d8349),
-     TOBN(0xc2699eb0, 0xd820007c), TOBN(0x880ee660, 0xa39b5825),
-     TOBN(0x70694694, 0x471f6984), TOBN(0xf7d16ea8, 0xe3dda99a),
-     TOBN(0x28d675b2, 0xc0519a23), TOBN(0x9ebf94fe, 0x4f6952e3),
-     TOBN(0xf28bb767, 0xa2294a8a), TOBN(0x85512b4d, 0xfe0af3f5),
-     TOBN(0x18958ba8, 0x99b16a0d), TOBN(0x95c2430c, 0xba7548a7),
-     TOBN(0xb30d1b10, 0xa16be615), TOBN(0xe3ebbb97, 0x85bfb74c),
-     TOBN(0xa3273cfe, 0x18549fdb), TOBN(0xf6e200bf, 0x4fcdb792),
-     TOBN(0x54a76e18, 0x83aba56c), TOBN(0x73ec66f6, 0x89ef6aa2),
-     TOBN(0x8d17add7, 0xd1b9a305), TOBN(0xa959c5b9, 0xb7ae1b9d),
-     TOBN(0x88643522, 0x6bcc094a), TOBN(0xcc5616c4, 0xd7d429b9),
-     TOBN(0xa6dada01, 0xe6a33f7c), TOBN(0xc6217a07, 0x9d4e70ad),
-     TOBN(0xd619a818, 0x09c15b7c), TOBN(0xea06b329, 0x0e80c854),
-     TOBN(0x174811ce, 0xa5f5e7b9), TOBN(0x66dfc310, 0x787c65f4),
-     TOBN(0x4ea7bd69, 0x3316ab54), TOBN(0xc12c4acb, 0x1dcc0f70),
-     TOBN(0xe4308d1a, 0x1e407dd9), TOBN(0xe8a3587c, 0x91afa997),
-     TOBN(0xea296c12, 0xab77b7a5), TOBN(0xb5ad49e4, 0x673c0d52),
-     TOBN(0x40f9b2b2, 0x7006085a), TOBN(0xa88ff340, 0x87bf6ec2),
-     TOBN(0x978603b1, 0x4e3066a6), TOBN(0xb3f99fc2, 0xb5e486e2),
-     TOBN(0x07b53f5e, 0xb2e63645), TOBN(0xbe57e547, 0x84c84232),
-     TOBN(0xd779c216, 0x7214d5cf), TOBN(0x617969cd, 0x029a3aca),
-     TOBN(0xd17668cd, 0x8a7017a0), TOBN(0x77b4d19a, 0xbe9b7ee8),
-     TOBN(0x58fd0e93, 0x9c161776), TOBN(0xa8c4f4ef, 0xd5968a72),
-     TOBN(0x296071cc, 0x67b3de77), TOBN(0xae3c0b8e, 0x634f7905),
-     TOBN(0x67e440c2, 0x8a7100c9), TOBN(0xbb8c3c1b, 0xeb4b9b42),
-     TOBN(0x6d71e8ea, 0xc51b3583), TOBN(0x7591f5af, 0x9525e642),
-     TOBN(0xf73a2f7b, 0x13f509f3), TOBN(0x618487aa, 0x5619ac9b),
-     TOBN(0x3a72e5f7, 0x9d61718a), TOBN(0x00413bcc, 0x7592d28c),
-     TOBN(0x7d9b11d3, 0x963c35cf), TOBN(0x77623bcf, 0xb90a46ed),
-     TOBN(0xdeef273b, 0xdcdd2a50), TOBN(0x4a741f9b, 0x0601846e),
-     TOBN(0x33b89e51, 0x0ec6e929), TOBN(0xcb02319f, 0x8b7f22cd),
-     TOBN(0xbbe1500d, 0x084bae24), TOBN(0x2f0ae8d7, 0x343d2693),
-     TOBN(0xacffb5f2, 0x7cdef811), TOBN(0xaa0c030a, 0x263fb94f),
-     TOBN(0x6eef0d61, 0xa0f442de), TOBN(0xf92e1817, 0x27b139d3),
-     TOBN(0x1ae6deb7, 0x0ad8bc28), TOBN(0xa89e38dc, 0xc0514130),
-     TOBN(0x81eeb865, 0xd2fdca23), TOBN(0x5a15ee08, 0xcc8ef895),
-     TOBN(0x768fa10a, 0x01905614), TOBN(0xeff5b8ef, 0x880ee19b),
-     TOBN(0xf0c0cabb, 0xcb1c8a0e), TOBN(0x2e1ee9cd, 0xb8c838f9),
-     TOBN(0x0587d8b8, 0x8a4a14c0), TOBN(0xf6f27896, 0x2ff698e5),
-     TOBN(0xed38ef1c, 0x89ee6256), TOBN(0xf44ee1fe, 0x6b353b45),
-     TOBN(0x9115c0c7, 0x70e903b3), TOBN(0xc78ec0a1, 0x818f31df),
-     TOBN(0x6c003324, 0xb7dccbc6), TOBN(0xd96dd1f3, 0x163bbc25),
-     TOBN(0x33aa82dd, 0x5cedd805), TOBN(0x123aae4f, 0x7f7eb2f1),
-     TOBN(0x1723fcf5, 0xa26262cd), TOBN(0x1f7f4d5d, 0x0060ebd5),
-     TOBN(0xf19c5c01, 0xb2eaa3af), TOBN(0x2ccb9b14, 0x9790accf),
-     TOBN(0x1f9c1cad, 0x52324aa6), TOBN(0x63200526, 0x7247df54),
-     TOBN(0x5732fe42, 0xbac96f82), TOBN(0x52fe771f, 0x01a1c384),
-     TOBN(0x546ca13d, 0xb1001684), TOBN(0xb56b4eee, 0xa1709f75),
-     TOBN(0x266545a9, 0xd5db8672), TOBN(0xed971c90, 0x1e8f3cfb),
-     TOBN(0x4e7d8691, 0xe3a07b29), TOBN(0x7570d9ec, 0xe4b696b9),
-     TOBN(0xdc5fa067, 0x7bc7e9ae), TOBN(0x68b44caf, 0xc82c4844),
-     TOBN(0x519d34b3, 0xbf44da80), TOBN(0x283834f9, 0x5ab32e66),
-     TOBN(0x6e608797, 0x6278a000), TOBN(0x1e62960e, 0x627312f6),
-     TOBN(0x9b87b27b, 0xe6901c55), TOBN(0x80e78538, 0x24fdbc1f),
-     TOBN(0xbbbc0951, 0x2facc27d), TOBN(0x06394239, 0xac143b5a),
-     TOBN(0x35bb4a40, 0x376c1944), TOBN(0x7cb62694, 0x63da1511),
-     TOBN(0xafd29161, 0xb7148a3b), TOBN(0xa6f9d9ed, 0x4e2ea2ee),
-     TOBN(0x15dc2ca2, 0x880dd212), TOBN(0x903c3813, 0xa61139a9),
-     TOBN(0x2aa7b46d, 0x6c0f8785), TOBN(0x36ce2871, 0x901c60ff),
-     TOBN(0xc683b028, 0xe10d9c12), TOBN(0x7573baa2, 0x032f33d3),
-     TOBN(0x87a9b1f6, 0x67a31b58), TOBN(0xfd3ed11a, 0xf4ffae12),
-     TOBN(0x83dcaa9a, 0x0cb2748e), TOBN(0x8239f018, 0x5d6fdf16),
-     TOBN(0xba67b49c, 0x72753941), TOBN(0x2beec455, 0xc321cb36),
-     TOBN(0x88015606, 0x3f8b84ce), TOBN(0x76417083, 0x8d38c86f),
-     TOBN(0x054f1ca7, 0x598953dd), TOBN(0xc939e110, 0x4e8e7429),
-     TOBN(0x9b1ac2b3, 0x5a914f2f), TOBN(0x39e35ed3, 0xe74b8f9c),
-     TOBN(0xd0debdb2, 0x781b2fb0), TOBN(0x1585638f, 0x2d997ba2),
-     TOBN(0x9c4b646e, 0x9e2fce99), TOBN(0x68a21081, 0x1e80857f),
-     TOBN(0x06d54e44, 0x3643b52a), TOBN(0xde8d6d63, 0x0d8eb843),
-     TOBN(0x70321563, 0x42146a0a), TOBN(0x8ba826f2, 0x5eaa3622),
-     TOBN(0x227a58bd, 0x86138787), TOBN(0x43b6c03c, 0x10281d37),
-     TOBN(0x6326afbb, 0xb54dde39), TOBN(0x744e5e8a, 0xdb6f2d5f),
-     TOBN(0x48b2a99a, 0xcff158e1), TOBN(0xa93c8fa0, 0xef87918f),
-     TOBN(0x2182f956, 0xde058c5c), TOBN(0x216235d2, 0x936f9e7a),
-     TOBN(0xace0c0db, 0xd2e31e67), TOBN(0xc96449bf, 0xf23ac3e7),
-     TOBN(0x7e9a2874, 0x170693bd), TOBN(0xa28e14fd, 0xa45e6335),
-     TOBN(0x5757f6b3, 0x56427344), TOBN(0x822e4556, 0xacf8edf9),
-     TOBN(0x2b7a6ee2, 0xe6a285cd), TOBN(0x5866f211, 0xa9df3af0),
-     TOBN(0x40dde2dd, 0xf845b844), TOBN(0x986c3726, 0x110e5e49),
-     TOBN(0x73680c2a, 0xf7172277), TOBN(0x57b94f0f, 0x0cccb244),
-     TOBN(0xbdff7267, 0x2d438ca7), TOBN(0xbad1ce11, 0xcf4663fd),
-     TOBN(0x9813ed9d, 0xd8f71cae), TOBN(0xf43272a6, 0x961fdaa6),
-     TOBN(0xbeff0119, 0xbd6d1637), TOBN(0xfebc4f91, 0x30361978),
-     TOBN(0x02b37a95, 0x2f41deff), TOBN(0x0e44a59a, 0xe63b89b7),
-     TOBN(0x673257dc, 0x143ff951), TOBN(0x19c02205, 0xd752baf4),
-     TOBN(0x46c23069, 0xc4b7d692), TOBN(0x2e6392c3, 0xfd1502ac),
-     TOBN(0x6057b1a2, 0x1b220846), TOBN(0xe51ff946, 0x0c1b5b63),}
-    ,
-    {TOBN(0x6e85cb51, 0x566c5c43), TOBN(0xcff9c919, 0x3597f046),
-     TOBN(0x9354e90c, 0x4994d94a), TOBN(0xe0a39332, 0x2147927d),
-     TOBN(0x8427fac1, 0x0dc1eb2b), TOBN(0x88cfd8c2, 0x2ff319fa),
-     TOBN(0xe2d4e684, 0x01965274), TOBN(0xfa2e067d, 0x67aaa746),
-     TOBN(0xb6d92a7f, 0x3e5f9f11), TOBN(0x9afe153a, 0xd6cb3b8e),
-     TOBN(0x4d1a6dd7, 0xddf800bd), TOBN(0xf6c13cc0, 0xcaf17e19),
-     TOBN(0x15f6c58e, 0x325fc3ee), TOBN(0x71095400, 0xa31dc3b2),
-     TOBN(0x168e7c07, 0xafa3d3e7), TOBN(0x3f8417a1, 0x94c7ae2d),
-     TOBN(0xec234772, 0x813b230d), TOBN(0x634d0f5f, 0x17344427),
-     TOBN(0x11548ab1, 0xd77fc56a), TOBN(0x7fab1750, 0xce06af77),
-     TOBN(0xb62c10a7, 0x4f7c4f83), TOBN(0xa7d2edc4, 0x220a67d9),
-     TOBN(0x1c404170, 0x921209a0), TOBN(0x0b9815a0, 0xface59f0),
-     TOBN(0x2842589b, 0x319540c3), TOBN(0x18490f59, 0xa283d6f8),
-     TOBN(0xa2731f84, 0xdaae9fcb), TOBN(0x3db6d960, 0xc3683ba0),
-     TOBN(0xc85c63bb, 0x14611069), TOBN(0xb19436af, 0x0788bf05),
-     TOBN(0x905459df, 0x347460d2), TOBN(0x73f6e094, 0xe11a7db1),
-     TOBN(0xdc7f938e, 0xb6357f37), TOBN(0xc5d00f79, 0x2bd8aa62),
-     TOBN(0xc878dcb9, 0x2ca979fc), TOBN(0x37e83ed9, 0xeb023a99),
-     TOBN(0x6b23e273, 0x1560bf3d), TOBN(0x1086e459, 0x1d0fae61),
-     TOBN(0x78248316, 0x9a9414bd), TOBN(0x1b956bc0, 0xf0ea9ea1),
-     TOBN(0x7b85bb91, 0xc31b9c38), TOBN(0x0c5aa90b, 0x48ef57b5),
-     TOBN(0xdedeb169, 0xaf3bab6f), TOBN(0xe610ad73, 0x2d373685),
-     TOBN(0xf13870df, 0x02ba8e15), TOBN(0x0337edb6, 0x8ca7f771),
-     TOBN(0xe4acf747, 0xb62c036c), TOBN(0xd921d576, 0xb6b94e81),
-     TOBN(0xdbc86439, 0x2c422f7a), TOBN(0xfb635362, 0xed348898),
-     TOBN(0x83084668, 0xc45bfcd1), TOBN(0xc357c9e3, 0x2b315e11),
-     TOBN(0xb173b540, 0x5b2e5b8c), TOBN(0x7e946931, 0xe102b9a4),
-     TOBN(0x17c890eb, 0x7b0fb199), TOBN(0xec225a83, 0xd61b662b),
-     TOBN(0xf306a3c8, 0xee3c76cb), TOBN(0x3cf11623, 0xd32a1f6e),
-     TOBN(0xe6d5ab64, 0x6863e956), TOBN(0x3b8a4cbe, 0x5c005c26),
-     TOBN(0xdcd529a5, 0x9ce6bb27), TOBN(0xc4afaa52, 0x04d4b16f),
-     TOBN(0xb0624a26, 0x7923798d), TOBN(0x85e56df6, 0x6b307fab),
-     TOBN(0x0281893c, 0x2bf29698), TOBN(0x91fc19a4, 0xd7ce7603),
-     TOBN(0x75a5dca3, 0xad9a558f), TOBN(0x40ceb3fa, 0x4d50bf77),
-     TOBN(0x1baf6060, 0xbc9ba369), TOBN(0x927e1037, 0x597888c2),
-     TOBN(0xd936bf19, 0x86a34c07), TOBN(0xd4cf10c1, 0xc34ae980),
-     TOBN(0x3a3e5334, 0x859dd614), TOBN(0x9c475b5b, 0x18d0c8ee),
-     TOBN(0x63080d1f, 0x07cd51d5), TOBN(0xc9c0d0a6, 0xb88b4326),
-     TOBN(0x1ac98691, 0xc234296f), TOBN(0x2a0a83a4, 0x94887fb6),
-     TOBN(0x56511427, 0x0cea9cf2), TOBN(0x5230a6e8, 0xa24802f5),
-     TOBN(0xf7a2bf0f, 0x72e3d5c1), TOBN(0x37717446, 0x4f21439e),
-     TOBN(0xfedcbf25, 0x9ce30334), TOBN(0xe0030a78, 0x7ce202f9),
-     TOBN(0x6f2d9ebf, 0x1202e9ca), TOBN(0xe79dde6c, 0x75e6e591),
-     TOBN(0xf52072af, 0xf1dac4f8), TOBN(0x6c8d087e, 0xbb9b404d),
-     TOBN(0xad0fc73d, 0xbce913af), TOBN(0x909e587b, 0x458a07cb),
-     TOBN(0x1300da84, 0xd4f00c8a), TOBN(0x425cd048, 0xb54466ac),
-     TOBN(0xb59cb9be, 0x90e9d8bf), TOBN(0x991616db, 0x3e431b0e),
-     TOBN(0xd3aa117a, 0x531aecff), TOBN(0x91af92d3, 0x59f4dc3b),
-     TOBN(0x9b1ec292, 0xe93fda29), TOBN(0x76bb6c17, 0xe97d91bc),
-     TOBN(0x7509d95f, 0xaface1e6), TOBN(0x3653fe47, 0xbe855ae3),
-     TOBN(0x73180b28, 0x0f680e75), TOBN(0x75eefd1b, 0xeeb6c26c),
-     TOBN(0xa4cdf29f, 0xb66d4236), TOBN(0x2d70a997, 0x6b5821d8),
-     TOBN(0x7a3ee207, 0x20445c36), TOBN(0x71d1ac82, 0x59877174),
-     TOBN(0x0fc539f7, 0x949f73e9), TOBN(0xd05cf3d7, 0x982e3081),
-     TOBN(0x8758e20b, 0x7b1c7129), TOBN(0xffadcc20, 0x569e61f2),
-     TOBN(0xb05d3a2f, 0x59544c2d), TOBN(0xbe16f5c1, 0x9fff5e53),
-     TOBN(0x73cf65b8, 0xaad58135), TOBN(0x622c2119, 0x037aa5be),
-     TOBN(0x79373b3f, 0x646fd6a0), TOBN(0x0e029db5, 0x0d3978cf),
-     TOBN(0x8bdfc437, 0x94fba037), TOBN(0xaefbd687, 0x620797a6),
-     TOBN(0x3fa5382b, 0xbd30d38e), TOBN(0x7627cfbf, 0x585d7464),
-     TOBN(0xb2330fef, 0x4e4ca463), TOBN(0xbcef7287, 0x3566cc63),
-     TOBN(0xd161d2ca, 0xcf780900), TOBN(0x135dc539, 0x5b54827d),
-     TOBN(0x638f052e, 0x27bf1bc6), TOBN(0x10a224f0, 0x07dfa06c),
-     TOBN(0xe973586d, 0x6d3321da), TOBN(0x8b0c5738, 0x26152c8f),
-     TOBN(0x07ef4f2a, 0x34606074), TOBN(0x80fe7fe8, 0xa0f7047a),
-     TOBN(0x3d1a8152, 0xe1a0e306), TOBN(0x32cf43d8, 0x88da5222),
-     TOBN(0xbf89a95f, 0x5f02ffe6), TOBN(0x3d9eb9a4, 0x806ad3ea),
-     TOBN(0x012c17bb, 0x79c8e55e), TOBN(0xfdcd1a74, 0x99c81dac),
-     TOBN(0x7043178b, 0xb9556098), TOBN(0x4090a1df, 0x801c3886),
-     TOBN(0x759800ff, 0x9b67b912), TOBN(0x3e5c0304, 0x232620c8),
-     TOBN(0x4b9d3c4b, 0x70dceeca), TOBN(0xbb2d3c15, 0x181f648e),
-     TOBN(0xf981d837, 0x6e33345c), TOBN(0xb626289b, 0x0cf2297a),
-     TOBN(0x766ac659, 0x8baebdcf), TOBN(0x1a28ae09, 0x75df01e5),
-     TOBN(0xb71283da, 0x375876d8), TOBN(0x4865a96d, 0x607b9800),
-     TOBN(0x25dd1bcd, 0x237936b2), TOBN(0x332f4f4b, 0x60417494),
-     TOBN(0xd0923d68, 0x370a2147), TOBN(0x497f5dfb, 0xdc842203),
-     TOBN(0x9dc74cbd, 0x32be5e0f), TOBN(0x7475bcb7, 0x17a01375),
-     TOBN(0x438477c9, 0x50d872b1), TOBN(0xcec67879, 0xffe1d63d),
-     TOBN(0x9b006014, 0xd8578c70), TOBN(0xc9ad99a8, 0x78bb6b8b),
-     TOBN(0x6799008e, 0x11fb3806), TOBN(0xcfe81435, 0xcd44cab3),
-     TOBN(0xa2ee1582, 0x2f4fb344), TOBN(0xb8823450, 0x483fa6eb),
-     TOBN(0x622d323d, 0x652c7749), TOBN(0xd8474a98, 0xbeb0a15b),
-     TOBN(0xe43c154d, 0x5d1c00d0), TOBN(0x7fd581d9, 0x0e3e7aac),
-     TOBN(0x2b44c619, 0x2525ddf8), TOBN(0x67a033eb, 0xb8ae9739),
-     TOBN(0x113ffec1, 0x9ef2d2e4), TOBN(0x1bf6767e, 0xd5a0ea7f),
-     TOBN(0x57fff75e, 0x03714c0a), TOBN(0xa23c422e, 0x0a23e9ee),
-     TOBN(0xdd5f6b2d, 0x540f83af), TOBN(0xc2c2c27e, 0x55ea46a7),
-     TOBN(0xeb6b4246, 0x672a1208), TOBN(0xd13599f7, 0xae634f7a),
-     TOBN(0xcf914b5c, 0xd7b32c6e), TOBN(0x61a5a640, 0xeaf61814),
-     TOBN(0x8dc3df8b, 0x208a1bbb), TOBN(0xef627fd6, 0xb6d79aa5),
-     TOBN(0x44232ffc, 0xc4c86bc8), TOBN(0xe6f9231b, 0x061539fe),
-     TOBN(0x1d04f25a, 0x958b9533), TOBN(0x180cf934, 0x49e8c885),
-     TOBN(0x89689595, 0x9884aaf7), TOBN(0xb1959be3, 0x07b348a6),
-     TOBN(0x96250e57, 0x3c147c87), TOBN(0xae0efb3a, 0xdd0c61f8),
-     TOBN(0xed00745e, 0xca8c325e), TOBN(0x3c911696, 0xecff3f70),
-     TOBN(0x73acbc65, 0x319ad41d), TOBN(0x7b01a020, 0xf0b1c7ef),
-     TOBN(0xea32b293, 0x63a1483f), TOBN(0x89eabe71, 0x7a248f96),
-     TOBN(0x9c6231d3, 0x343157e5), TOBN(0x93a375e5, 0xdf3c546d),
-     TOBN(0xe76e9343, 0x6a2afe69), TOBN(0xc4f89100, 0xe166c88e),
-     TOBN(0x248efd0d, 0x4f872093), TOBN(0xae0eb3ea, 0x8fe0ea61),
-     TOBN(0xaf89790d, 0x9d79046e), TOBN(0x4d650f2d, 0x6cee0976),
-     TOBN(0xa3935d9a, 0x43071eca), TOBN(0x66fcd2c9, 0x283b0bfe),
-     TOBN(0x0e665eb5, 0x696605f1), TOBN(0xe77e5d07, 0xa54cd38d),
-     TOBN(0x90ee050a, 0x43d950cf), TOBN(0x86ddebda, 0xd32e69b5),
-     TOBN(0x6ad94a3d, 0xfddf7415), TOBN(0xf7fa1309, 0x3f6e8d5a),
-     TOBN(0xc4831d1d, 0xe9957f75), TOBN(0x7de28501, 0xd5817447),
-     TOBN(0x6f1d7078, 0x9e2aeb6b), TOBN(0xba2b9ff4, 0xf67a53c2),
-     TOBN(0x36963767, 0xdf9defc3), TOBN(0x479deed3, 0x0d38022c),
-     TOBN(0xd2edb89b, 0x3a8631e8), TOBN(0x8de855de, 0x7a213746),
-     TOBN(0xb2056cb7, 0xb00c5f11), TOBN(0xdeaefbd0, 0x2c9b85e4),
-     TOBN(0x03f39a8d, 0xd150892d), TOBN(0x37b84686, 0x218b7985),
-     TOBN(0x36296dd8, 0xb7375f1a), TOBN(0x472cd4b1, 0xb78e898e),
-     TOBN(0x15dff651, 0xe9f05de9), TOBN(0xd4045069, 0x2ce98ba9),
-     TOBN(0x8466a7ae, 0x9b38024c), TOBN(0xb910e700, 0xe5a6b5ef),
-     TOBN(0xae1c56ea, 0xb3aa8f0d), TOBN(0xbab2a507, 0x7eee74a6),
-     TOBN(0x0dca11e2, 0x4b4c4620), TOBN(0xfd896e2e, 0x4c47d1f4),
-     TOBN(0xeb45ae53, 0x308fbd93), TOBN(0x46cd5a2e, 0x02c36fda),
-     TOBN(0x6a3d4e90, 0xbaa48385), TOBN(0xdd55e62e, 0x9dbe9960),
-     TOBN(0xa1406aa0, 0x2a81ede7), TOBN(0x6860dd14, 0xf9274ea7),
-     TOBN(0xcfdcb0c2, 0x80414f86), TOBN(0xff410b10, 0x22f94327),
-     TOBN(0x5a33cc38, 0x49ad467b), TOBN(0xefb48b6c, 0x0a7335f1),
-     TOBN(0x14fb54a4, 0xb153a360), TOBN(0x604aa9d2, 0xb52469cc),
-     TOBN(0x5e9dc486, 0x754e48e9), TOBN(0x693cb455, 0x37471e8e),
-     TOBN(0xfb2fd7cd, 0x8d3b37b6), TOBN(0x63345e16, 0xcf09ff07),
-     TOBN(0x9910ba6b, 0x23a5d896), TOBN(0x1fe19e35, 0x7fe4364e),
-     TOBN(0x6e1da8c3, 0x9a33c677), TOBN(0x15b4488b, 0x29fd9fd0),
-     TOBN(0x1f439254, 0x1a1f22bf), TOBN(0x920a8a70, 0xab8163e8),
-     TOBN(0x3fd1b249, 0x07e5658e), TOBN(0xf2c4f79c, 0xb6ec839b),
-     TOBN(0x1abbc3d0, 0x4aa38d1b), TOBN(0x3b0db35c, 0xb5d9510e),
-     TOBN(0x1754ac78, 0x3e60dec0), TOBN(0x53272fd7, 0xea099b33),
-     TOBN(0x5fb0494f, 0x07a8e107), TOBN(0x4a89e137, 0x6a8191fa),
-     TOBN(0xa113b7f6, 0x3c4ad544), TOBN(0x88a2e909, 0x6cb9897b),
-     TOBN(0x17d55de3, 0xb44a3f84), TOBN(0xacb2f344, 0x17c6c690),
-     TOBN(0x32088168, 0x10232390), TOBN(0xf2e8a61f, 0x6c733bf7),
-     TOBN(0xa774aab6, 0x9c2d7652), TOBN(0xfb5307e3, 0xed95c5bc),
-     TOBN(0xa05c73c2, 0x4981f110), TOBN(0x1baae31c, 0xa39458c9),
-     TOBN(0x1def185b, 0xcbea62e7), TOBN(0xe8ac9eae, 0xeaf63059),
-     TOBN(0x098a8cfd, 0x9921851c), TOBN(0xd959c3f1, 0x3abe2f5b),
-     TOBN(0xa4f19525, 0x20e40ae5), TOBN(0x320789e3, 0x07a24aa1),
-     TOBN(0x259e6927, 0x7392b2bc), TOBN(0x58f6c667, 0x1918668b),
-     TOBN(0xce1db2bb, 0xc55d2d8b), TOBN(0x41d58bb7, 0xf4f6ca56),
-     TOBN(0x7650b680, 0x8f877614), TOBN(0x905e16ba, 0xf4c349ed),
-     TOBN(0xed415140, 0xf661acac), TOBN(0x3b8784f0, 0xcb2270af),
-     TOBN(0x3bc280ac, 0x8a402cba), TOBN(0xd53f7146, 0x0937921a),
-     TOBN(0xc03c8ee5, 0xe5681e83), TOBN(0x62126105, 0xf6ac9e4a),
-     TOBN(0x9503a53f, 0x936b1a38), TOBN(0x3d45e2d4, 0x782fecbd),
-     TOBN(0x69a5c439, 0x76e8ae98), TOBN(0xb53b2eeb, 0xbfb4b00e),
-     TOBN(0xf1674712, 0x72386c89), TOBN(0x30ca34a2, 0x4268bce4),
-     TOBN(0x7f1ed86c, 0x78341730), TOBN(0x8ef5beb8, 0xb525e248),
-     TOBN(0xbbc489fd, 0xb74fbf38), TOBN(0x38a92a0e, 0x91a0b382),
-     TOBN(0x7a77ba3f, 0x22433ccf), TOBN(0xde8362d6, 0xa29f05a9),
-     TOBN(0x7f6a30ea, 0x61189afc), TOBN(0x693b5505, 0x59ef114f),
-     TOBN(0x50266bc0, 0xcd1797a1), TOBN(0xea17b47e, 0xf4b7af2d),
-     TOBN(0xd6c4025c, 0x3df9483e), TOBN(0x8cbb9d9f, 0xa37b18c9),
-     TOBN(0x91cbfd9c, 0x4d8424cf), TOBN(0xdb7048f1, 0xab1c3506),
-     TOBN(0x9eaf641f, 0x028206a3), TOBN(0xf986f3f9, 0x25bdf6ce),
-     TOBN(0x262143b5, 0x224c08dc), TOBN(0x2bbb09b4, 0x81b50c91),
-     TOBN(0xc16ed709, 0xaca8c84f), TOBN(0xa6210d9d, 0xb2850ca8),
-     TOBN(0x6d8df67a, 0x09cb54d6), TOBN(0x91eef6e0, 0x500919a4),
-     TOBN(0x90f61381, 0x0f132857), TOBN(0x9acede47, 0xf8d5028b),
-     TOBN(0x844d1b71, 0x90b771c3), TOBN(0x563b71e4, 0xba6426be),
-     TOBN(0x2efa2e83, 0xbdb802ff), TOBN(0x3410cbab, 0xab5b4a41),
-     TOBN(0x555b2d26, 0x30da84dd), TOBN(0xd0711ae9, 0xee1cc29a),
-     TOBN(0xcf3e8c60, 0x2f547792), TOBN(0x03d7d5de, 0xdc678b35),
-     TOBN(0x071a2fa8, 0xced806b8), TOBN(0x222e6134, 0x697f1478),
-     TOBN(0xdc16fd5d, 0xabfcdbbf), TOBN(0x44912ebf, 0x121b53b8),
-     TOBN(0xac943674, 0x2496c27c), TOBN(0x8ea3176c, 0x1ffc26b0),
-     TOBN(0xb6e224ac, 0x13debf2c), TOBN(0x524cc235, 0xf372a832),
-     TOBN(0xd706e1d8, 0x9f6f1b18), TOBN(0x2552f005, 0x44cce35b),
-     TOBN(0x8c8326c2, 0xa88e31fc), TOBN(0xb5468b2c, 0xf9552047),
-     TOBN(0xce683e88, 0x3ff90f2b), TOBN(0x77947bdf, 0x2f0a5423),
-     TOBN(0xd0a1b28b, 0xed56e328), TOBN(0xaee35253, 0xc20134ac),
-     TOBN(0x7e98367d, 0x3567962f), TOBN(0x379ed61f, 0x8188bffb),
-     TOBN(0x73bba348, 0xfaf130a1), TOBN(0x6c1f75e1, 0x904ed734),
-     TOBN(0x18956642, 0x3b4a79fc), TOBN(0xf20bc83d, 0x54ef4493),
-     TOBN(0x836d425d, 0x9111eca1), TOBN(0xe5b5c318, 0x009a8dcf),
-     TOBN(0x3360b25d, 0x13221bc5), TOBN(0x707baad2, 0x6b3eeaf7),
-     TOBN(0xd7279ed8, 0x743a95a1), TOBN(0x7450a875, 0x969e809f),
-     TOBN(0x32b6bd53, 0xe5d0338f), TOBN(0x1e77f7af, 0x2b883bbc),
-     TOBN(0x90da12cc, 0x1063ecd0), TOBN(0xe2697b58, 0xc315be47),
-     TOBN(0x2771a5bd, 0xda85d534), TOBN(0x53e78c1f, 0xff980eea),
-     TOBN(0xadf1cf84, 0x900385e7), TOBN(0x7d3b14f6, 0xc9387b62),
-     TOBN(0x170e74b0, 0xcb8f2bd2), TOBN(0x2d50b486, 0x827fa993),
-     TOBN(0xcdbe8c9a, 0xf6f32bab), TOBN(0x55e906b0, 0xc3b93ab8),
-     TOBN(0x747f22fc, 0x8fe280d1), TOBN(0xcd8e0de5, 0xb2e114ab),
-     TOBN(0x5ab7dbeb, 0xe10b68b0), TOBN(0x9dc63a9c, 0xa480d4b2),
-     TOBN(0x78d4bc3b, 0x4be1495f), TOBN(0x25eb3db8, 0x9359122d),
-     TOBN(0x3f8ac05b, 0x0809cbdc), TOBN(0xbf4187bb, 0xd37c702f),
-     TOBN(0x84cea069, 0x1416a6a5), TOBN(0x8f860c79, 0x43ef881c),
-     TOBN(0x41311f8a, 0x38038a5d), TOBN(0xe78c2ec0, 0xfc612067),
-     TOBN(0x494d2e81, 0x5ad73581), TOBN(0xb4cc9e00, 0x59604097),
-     TOBN(0xff558aec, 0xf3612cba), TOBN(0x35beef7a, 0x9e36c39e),
-     TOBN(0x1845c7cf, 0xdbcf41b9), TOBN(0x5703662a, 0xaea997c0),
-     TOBN(0x8b925afe, 0xe402f6d8), TOBN(0xd0a1b1ae, 0x4dd72162),
-     TOBN(0x9f47b375, 0x03c41c4b), TOBN(0xa023829b, 0x0391d042),
-     TOBN(0x5f5045c3, 0x503b8b0a), TOBN(0x123c2688, 0x98c010e5),
-     TOBN(0x324ec0cc, 0x36ba06ee), TOBN(0xface3115, 0x3dd2cc0c),
-     TOBN(0xb364f3be, 0xf333e91f), TOBN(0xef8aff73, 0x28e832b0),
-     TOBN(0x1e9bad04, 0x2d05841b), TOBN(0x42f0e3df, 0x356a21e2),
-     TOBN(0xa3270bcb, 0x4add627e), TOBN(0xb09a8158, 0xd322e711),
-     TOBN(0x86e326a1, 0x0fee104a), TOBN(0xad7788f8, 0x3703f65d),
-     TOBN(0x7e765430, 0x47bc4833), TOBN(0x6cee582b, 0x2b9b893a),
-     TOBN(0x9cd2a167, 0xe8f55a7b), TOBN(0xefbee3c6, 0xd9e4190d),
-     TOBN(0x33ee7185, 0xd40c2e9d), TOBN(0x844cc9c5, 0xa380b548),
-     TOBN(0x323f8ecd, 0x66926e04), TOBN(0x0001e38f, 0x8110c1ba),
-     TOBN(0x8dbcac12, 0xfc6a7f07), TOBN(0xd65e1d58, 0x0cec0827),
-     TOBN(0xd2cd4141, 0xbe76ca2d), TOBN(0x7895cf5c, 0xe892f33a),
-     TOBN(0x956d230d, 0x367139d2), TOBN(0xa91abd3e, 0xd012c4c1),
-     TOBN(0x34fa4883, 0x87eb36bf), TOBN(0xc5f07102, 0x914b8fb4),
-     TOBN(0x90f0e579, 0xadb9c95f), TOBN(0xfe6ea8cb, 0x28888195),
-     TOBN(0x7b9b5065, 0xedfa9284), TOBN(0x6c510bd2, 0x2b8c8d65),
-     TOBN(0xd7b8ebef, 0xcbe8aafd), TOBN(0xedb3af98, 0x96b1da07),
-     TOBN(0x28ff779d, 0x6295d426), TOBN(0x0c4f6ac7, 0x3fa3ad7b),
-     TOBN(0xec44d054, 0x8b8e2604), TOBN(0x9b32a66d, 0x8b0050e1),
-     TOBN(0x1f943366, 0xf0476ce2), TOBN(0x7554d953, 0xa602c7b4),
-     TOBN(0xbe35aca6, 0x524f2809), TOBN(0xb6881229, 0xfd4edbea),
-     TOBN(0xe8cd0c8f, 0x508efb63), TOBN(0x9eb5b5c8, 0x6abcefc7),
-     TOBN(0xf5621f5f, 0xb441ab4f), TOBN(0x79e6c046, 0xb76a2b22),
-     TOBN(0x74a4792c, 0xe37a1f69), TOBN(0xcbd252cb, 0x03542b60),
-     TOBN(0x785f65d5, 0xb3c20bd3), TOBN(0x8dea6143, 0x4fabc60c),
-     TOBN(0x45e21446, 0xde673629), TOBN(0x57f7aa1e, 0x703c2d21),
-     TOBN(0xa0e99b7f, 0x98c868c7), TOBN(0x4e42f66d, 0x8b641676),
-     TOBN(0x602884dc, 0x91077896), TOBN(0xa0d690cf, 0xc2c9885b),
-     TOBN(0xfeb4da33, 0x3b9a5187), TOBN(0x5f789598, 0x153c87ee),
-     TOBN(0x2192dd47, 0x52b16dba), TOBN(0xdeefc0e6, 0x3524c1b1),
-     TOBN(0x465ea76e, 0xe4383693), TOBN(0x79401711, 0x361b8d98),
-     TOBN(0xa5f9ace9, 0xf21a15cb), TOBN(0x73d26163, 0xefee9aeb),
-     TOBN(0xcca844b3, 0xe677016c), TOBN(0x6c122b07, 0x57eaee06),
-     TOBN(0xb782dce7, 0x15f09690), TOBN(0x508b9b12, 0x2dfc0fc9),
-     TOBN(0x9015ab4b, 0x65d89fc6), TOBN(0x5e79dab7, 0xd6d5bb0f),
-     TOBN(0x64f021f0, 0x6c775aa2), TOBN(0xdf09d8cc, 0x37c7eca1),
-     TOBN(0x9a761367, 0xef2fa506), TOBN(0xed4ca476, 0x5b81eec6),
-     TOBN(0x262ede36, 0x10bbb8b5), TOBN(0x0737ce83, 0x0641ada3),
-     TOBN(0x4c94288a, 0xe9831ccc), TOBN(0x487fc1ce, 0x8065e635),
-     TOBN(0xb13d7ab3, 0xb8bb3659), TOBN(0xdea5df3e, 0x855e4120),
-     TOBN(0xb9a18573, 0x85eb0244), TOBN(0x1a1b8ea3, 0xa7cfe0a3),
-     TOBN(0x3b837119, 0x67b0867c), TOBN(0x8d5e0d08, 0x9d364520),
-     TOBN(0x52dccc1e, 0xd930f0e3), TOBN(0xefbbcec7, 0xbf20bbaf),
-     TOBN(0x99cffcab, 0x0263ad10), TOBN(0xd8199e6d, 0xfcd18f8a),
-     TOBN(0x64e2773f, 0xe9f10617), TOBN(0x0079e8e1, 0x08704848),
-     TOBN(0x1169989f, 0x8a342283), TOBN(0x8097799c, 0xa83012e6),
-     TOBN(0xece966cb, 0x8a6a9001), TOBN(0x93b3afef, 0x072ac7fc),
-     TOBN(0xe6893a2a, 0x2db3d5ba), TOBN(0x263dc462, 0x89bf4fdc),
-     TOBN(0x8852dfc9, 0xe0396673), TOBN(0x7ac70895, 0x3af362b6),
-     TOBN(0xbb9cce4d, 0x5c2f342b), TOBN(0xbf80907a, 0xb52d7aae),
-     TOBN(0x97f3d3cd, 0x2161bcd0), TOBN(0xb25b0834, 0x0962744d),
-     TOBN(0xc5b18ea5, 0x6c3a1dda), TOBN(0xfe4ec7eb, 0x06c92317),
-     TOBN(0xb787b890, 0xad1c4afe), TOBN(0xdccd9a92, 0x0ede801a),
-     TOBN(0x9ac6ddda, 0xdb58da1f), TOBN(0x22bbc12f, 0xb8cae6ee),
-     TOBN(0xc6f8bced, 0x815c4a43), TOBN(0x8105a92c, 0xf96480c7),
-     TOBN(0x0dc3dbf3, 0x7a859d51), TOBN(0xe3ec7ce6, 0x3041196b),
-     TOBN(0xd9f64b25, 0x0d1067c9), TOBN(0xf2321321, 0x3d1f8dd8),
-     TOBN(0x8b5c619c, 0x76497ee8), TOBN(0x5d2b0ac6, 0xc717370e),
-     TOBN(0x98204cb6, 0x4fcf68e1), TOBN(0x0bdec211, 0x62bc6792),
-     TOBN(0x6973ccef, 0xa63b1011), TOBN(0xf9e3fa97, 0xe0de1ac5),
-     TOBN(0x5efb693e, 0x3d0e0c8b), TOBN(0x037248e9, 0xd2d4fcb4),}
-    ,
-    {TOBN(0x80802dc9, 0x1ec34f9e), TOBN(0xd8772d35, 0x33810603),
-     TOBN(0x3f06d66c, 0x530cb4f3), TOBN(0x7be5ed0d, 0xc475c129),
-     TOBN(0xcb9e3c19, 0x31e82b10), TOBN(0xc63d2857, 0xc9ff6b4c),
-     TOBN(0xb92118c6, 0x92a1b45e), TOBN(0x0aec4414, 0x7285bbca),
-     TOBN(0xfc189ae7, 0x1e29a3ef), TOBN(0xcbe906f0, 0x4c93302e),
-     TOBN(0xd0107914, 0xceaae10e), TOBN(0xb7a23f34, 0xb68e19f8),
-     TOBN(0xe9d875c2, 0xefd2119d), TOBN(0x03198c6e, 0xfcadc9c8),
-     TOBN(0x65591bf6, 0x4da17113), TOBN(0x3cf0bbf8, 0x3d443038),
-     TOBN(0xae485bb7, 0x2b724759), TOBN(0x945353e1, 0xb2d4c63a),
-     TOBN(0x82159d07, 0xde7d6f2c), TOBN(0x389caef3, 0x4ec5b109),
-     TOBN(0x4a8ebb53, 0xdb65ef14), TOBN(0x2dc2cb7e, 0xdd99de43),
-     TOBN(0x816fa3ed, 0x83f2405f), TOBN(0x73429bb9, 0xc14208a3),
-     TOBN(0xb618d590, 0xb01e6e27), TOBN(0x047e2ccd, 0xe180b2dc),
-     TOBN(0xd1b299b5, 0x04aea4a9), TOBN(0x412c9e1e, 0x9fa403a4),
-     TOBN(0x88d28a36, 0x79407552), TOBN(0x49c50136, 0xf332b8e3),
-     TOBN(0x3a1b6fcc, 0xe668de19), TOBN(0x178851bc, 0x75122b97),
-     TOBN(0xb1e13752, 0xfb85fa4c), TOBN(0xd61257ce, 0x383c8ce9),
-     TOBN(0xd43da670, 0xd2f74dae), TOBN(0xa35aa23f, 0xbf846bbb),
-     TOBN(0x5e74235d, 0x4421fc83), TOBN(0xf6df8ee0, 0xc363473b),
-     TOBN(0x34d7f52a, 0x3c4aa158), TOBN(0x50d05aab, 0x9bc6d22e),
-     TOBN(0x8c56e735, 0xa64785f4), TOBN(0xbc56637b, 0x5f29cd07),
-     TOBN(0x53b2bb80, 0x3ee35067), TOBN(0x50235a0f, 0xdc919270),
-     TOBN(0x191ab6d8, 0xf2c4aa65), TOBN(0xc3475831, 0x8396023b),
-     TOBN(0x80400ba5, 0xf0f805ba), TOBN(0x8881065b, 0x5ec0f80f),
-     TOBN(0xc370e522, 0xcc1b5e83), TOBN(0xde2d4ad1, 0x860b8bfb),
-     TOBN(0xad364df0, 0x67b256df), TOBN(0x8f12502e, 0xe0138997),
-     TOBN(0x503fa0dc, 0x7783920a), TOBN(0xe80014ad, 0xc0bc866a),
-     TOBN(0x3f89b744, 0xd3064ba6), TOBN(0x03511dcd, 0xcba5dba5),
-     TOBN(0x197dd46d, 0x95a7b1a2), TOBN(0x9c4e7ad6, 0x3c6341fb),
-     TOBN(0x426eca29, 0x484c2ece), TOBN(0x9211e489, 0xde7f4f8a),
-     TOBN(0x14997f6e, 0xc78ef1f4), TOBN(0x2b2c0910, 0x06574586),
-     TOBN(0x17286a6e, 0x1c3eede8), TOBN(0x25f92e47, 0x0f60e018),
-     TOBN(0x805c5646, 0x31890a36), TOBN(0x703ef600, 0x57feea5b),
-     TOBN(0x389f747c, 0xaf3c3030), TOBN(0xe0e5daeb, 0x54dd3739),
-     TOBN(0xfe24a4c3, 0xc9c9f155), TOBN(0x7e4bf176, 0xb5393962),
-     TOBN(0x37183de2, 0xaf20bf29), TOBN(0x4a1bd7b5, 0xf95a8c3b),
-     TOBN(0xa83b9699, 0x46191d3d), TOBN(0x281fc8dd, 0x7b87f257),
-     TOBN(0xb18e2c13, 0x54107588), TOBN(0x6372def7, 0x9b2bafe8),
-     TOBN(0xdaf4bb48, 0x0d8972ca), TOBN(0x3f2dd4b7, 0x56167a3f),
-     TOBN(0x1eace32d, 0x84310cf4), TOBN(0xe3bcefaf, 0xe42700aa),
-     TOBN(0x5fe5691e, 0xd785e73d), TOBN(0xa5db5ab6, 0x2ea60467),
-     TOBN(0x02e23d41, 0xdfc6514a), TOBN(0x35e8048e, 0xe03c3665),
-     TOBN(0x3f8b118f, 0x1adaa0f8), TOBN(0x28ec3b45, 0x84ce1a5a),
-     TOBN(0xe8cacc6e, 0x2c6646b8), TOBN(0x1343d185, 0xdbd0e40f),
-     TOBN(0xe5d7f844, 0xcaaa358c), TOBN(0x1a1db7e4, 0x9924182a),
-     TOBN(0xd64cd42d, 0x9c875d9a), TOBN(0xb37b515f, 0x042eeec8),
-     TOBN(0x4d4dd409, 0x7b165fbe), TOBN(0xfc322ed9, 0xe206eff3),
-     TOBN(0x7dee4102, 0x59b7e17e), TOBN(0x55a481c0, 0x8236ca00),
-     TOBN(0x8c885312, 0xc23fc975), TOBN(0x15715806, 0x05d6297b),
-     TOBN(0xa078868e, 0xf78edd39), TOBN(0x956b31e0, 0x03c45e52),
-     TOBN(0x470275d5, 0xff7b33a6), TOBN(0xc8d5dc3a, 0x0c7e673f),
-     TOBN(0x419227b4, 0x7e2f2598), TOBN(0x8b37b634, 0x4c14a975),
-     TOBN(0xd0667ed6, 0x8b11888c), TOBN(0x5e0e8c3e, 0x803e25dc),
-     TOBN(0x34e5d0dc, 0xb987a24a), TOBN(0x9f40ac3b, 0xae920323),
-     TOBN(0x5463de95, 0x34e0f63a), TOBN(0xa128bf92, 0x6b6328f9),
-     TOBN(0x491ccd7c, 0xda64f1b7), TOBN(0x7ef1ec27, 0xc47bde35),
-     TOBN(0xa857240f, 0xa36a2737), TOBN(0x35dc1366, 0x63621bc1),
-     TOBN(0x7a3a6453, 0xd4fb6897), TOBN(0x80f1a439, 0xc929319d),
-     TOBN(0xfc18274b, 0xf8cb0ba0), TOBN(0xb0b53766, 0x8078c5eb),
-     TOBN(0xfb0d4924, 0x1e01d0ef), TOBN(0x50d7c67d, 0x372ab09c),
-     TOBN(0xb4e370af, 0x3aeac968), TOBN(0xe4f7fee9, 0xc4b63266),
-     TOBN(0xb4acd4c2, 0xe3ac5664), TOBN(0xf8910bd2, 0xceb38cbf),
-     TOBN(0x1c3ae50c, 0xc9c0726e), TOBN(0x15309569, 0xd97b40bf),
-     TOBN(0x70884b7f, 0xfd5a5a1b), TOBN(0x3890896a, 0xef8314cd),
-     TOBN(0x58e1515c, 0xa5618c93), TOBN(0xe665432b, 0x77d942d1),
-     TOBN(0xb32181bf, 0xb6f767a8), TOBN(0x753794e8, 0x3a604110),
-     TOBN(0x09afeb7c, 0xe8c0dbcc), TOBN(0x31e02613, 0x598673a3),
-     TOBN(0x5d98e557, 0x7d46db00), TOBN(0xfc21fb8c, 0x9d985b28),
-     TOBN(0xc9040116, 0xb0843e0b), TOBN(0x53b1b3a8, 0x69b04531),
-     TOBN(0xdd1649f0, 0x85d7d830), TOBN(0xbb3bcc87, 0xcb7427e8),
-     TOBN(0x77261100, 0xc93dce83), TOBN(0x7e79da61, 0xa1922a2a),
-     TOBN(0x587a2b02, 0xf3149ce8), TOBN(0x147e1384, 0xde92ec83),
-     TOBN(0x484c83d3, 0xaf077f30), TOBN(0xea78f844, 0x0658b53a),
-     TOBN(0x912076c2, 0x027aec53), TOBN(0xf34714e3, 0x93c8177d),
-     TOBN(0x37ef5d15, 0xc2376c84), TOBN(0x8315b659, 0x3d1aa783),
-     TOBN(0x3a75c484, 0xef852a90), TOBN(0x0ba0c58a, 0x16086bd4),
-     TOBN(0x29688d7a, 0x529a6d48), TOBN(0x9c7f250d, 0xc2f19203),
-     TOBN(0x123042fb, 0x682e2df9), TOBN(0x2b7587e7, 0xad8121bc),
-     TOBN(0x30fc0233, 0xe0182a65), TOBN(0xb82ecf87, 0xe3e1128a),
-     TOBN(0x71682861, 0x93fb098f), TOBN(0x043e21ae, 0x85e9e6a7),
-     TOBN(0xab5b49d6, 0x66c834ea), TOBN(0x3be43e18, 0x47414287),
-     TOBN(0xf40fb859, 0x219a2a47), TOBN(0x0e6559e9, 0xcc58df3c),
-     TOBN(0xfe1dfe8e, 0x0c6615b4), TOBN(0x14abc8fd, 0x56459d70),
-     TOBN(0x7be0fa8e, 0x05de0386), TOBN(0x8e63ef68, 0xe9035c7c),
-     TOBN(0x116401b4, 0x53b31e91), TOBN(0x0cba7ad4, 0x4436b4d8),
-     TOBN(0x9151f9a0, 0x107afd66), TOBN(0xafaca8d0, 0x1f0ee4c4),
-     TOBN(0x75fe5c1d, 0x9ee9761c), TOBN(0x3497a16b, 0xf0c0588f),
-     TOBN(0x3ee2bebd, 0x0304804c), TOBN(0xa8fb9a60, 0xc2c990b9),
-     TOBN(0xd14d32fe, 0x39251114), TOBN(0x36bf25bc, 0xcac73366),
-     TOBN(0xc9562c66, 0xdba7495c), TOBN(0x324d301b, 0x46ad348b),
-     TOBN(0x9f46620c, 0xd670407e), TOBN(0x0ea8d4f1, 0xe3733a01),
-     TOBN(0xd396d532, 0xb0c324e0), TOBN(0x5b211a0e, 0x03c317cd),
-     TOBN(0x090d7d20, 0x5ffe7b37), TOBN(0x3b7f3efb, 0x1747d2da),
-     TOBN(0xa2cb525f, 0xb54fc519), TOBN(0x6e220932, 0xf66a971e),
-     TOBN(0xddc160df, 0xb486d440), TOBN(0x7fcfec46, 0x3fe13465),
-     TOBN(0x83da7e4e, 0x76e4c151), TOBN(0xd6fa48a1, 0xd8d302b5),
-     TOBN(0xc6304f26, 0x5872cd88), TOBN(0x806c1d3c, 0x278b90a1),
-     TOBN(0x3553e725, 0xcaf0bc1c), TOBN(0xff59e603, 0xbb9d8d5c),
-     TOBN(0xa4550f32, 0x7a0b85dd), TOBN(0xdec5720a, 0x93ecc217),
-     TOBN(0x0b88b741, 0x69d62213), TOBN(0x7212f245, 0x5b365955),
-     TOBN(0x20764111, 0xb5cae787), TOBN(0x13cb7f58, 0x1dfd3124),
-     TOBN(0x2dca77da, 0x1175aefb), TOBN(0xeb75466b, 0xffaae775),
-     TOBN(0x74d76f3b, 0xdb6cff32), TOBN(0x7440f37a, 0x61fcda9a),
-     TOBN(0x1bb3ac92, 0xb525028b), TOBN(0x20fbf8f7, 0xa1975f29),
-     TOBN(0x982692e1, 0xdf83097f), TOBN(0x28738f6c, 0x554b0800),
-     TOBN(0xdc703717, 0xa2ce2f2f), TOBN(0x7913b93c, 0x40814194),
-     TOBN(0x04924593, 0x1fe89636), TOBN(0x7b98443f, 0xf78834a6),
-     TOBN(0x11c6ab01, 0x5114a5a1), TOBN(0x60deb383, 0xffba5f4c),
-     TOBN(0x4caa54c6, 0x01a982e6), TOBN(0x1dd35e11, 0x3491cd26),
-     TOBN(0x973c315f, 0x7cbd6b05), TOBN(0xcab00775, 0x52494724),
-     TOBN(0x04659b1f, 0x6565e15a), TOBN(0xbf30f529, 0x8c8fb026),
-     TOBN(0xfc21641b, 0xa8a0de37), TOBN(0xe9c7a366, 0xfa5e5114),
-     TOBN(0xdb849ca5, 0x52f03ad8), TOBN(0xc7e8dbe9, 0x024e35c0),
-     TOBN(0xa1a2bbac, 0xcfc3c789), TOBN(0xbf733e7d, 0x9c26f262),
-     TOBN(0x882ffbf5, 0xb8444823), TOBN(0xb7224e88, 0x6bf8483b),
-     TOBN(0x53023b8b, 0x65bef640), TOBN(0xaabfec91, 0xd4d5f8cd),
-     TOBN(0xa40e1510, 0x079ea1bd), TOBN(0x1ad9addc, 0xd05d5d26),
-     TOBN(0xdb3f2eab, 0x13e68d4f), TOBN(0x1cff1ae2, 0x640f803f),
-     TOBN(0xe0e7b749, 0xd4cee117), TOBN(0x8e9f275b, 0x4036d909),
-     TOBN(0xce34e31d, 0x8f4d4c38), TOBN(0x22b37f69, 0xd75130fc),
-     TOBN(0x83e0f1fd, 0xb4014604), TOBN(0xa8ce9919, 0x89415078),
-     TOBN(0x82375b75, 0x41792efe), TOBN(0x4f59bf5c, 0x97d4515b),
-     TOBN(0xac4f324f, 0x923a277d), TOBN(0xd9bc9b7d, 0x650f3406),
-     TOBN(0xc6fa87d1, 0x8a39bc51), TOBN(0x82588530, 0x5ccc108f),
-     TOBN(0x5ced3c9f, 0x82e4c634), TOBN(0x8efb8314, 0x3a4464f8),
-     TOBN(0xe706381b, 0x7a1dca25), TOBN(0x6cd15a3c, 0x5a2a412b),
-     TOBN(0x9347a8fd, 0xbfcd8fb5), TOBN(0x31db2eef, 0x6e54cd22),
-     TOBN(0xc4aeb11e, 0xf8d8932f), TOBN(0x11e7c1ed, 0x344411af),
-     TOBN(0x2653050c, 0xdc9a151e), TOBN(0x9edbfc08, 0x3bb0a859),
-     TOBN(0x926c81c7, 0xfd5691e7), TOBN(0x9c1b2342, 0x6f39019a),
-     TOBN(0x64a81c8b, 0x7f8474b9), TOBN(0x90657c07, 0x01761819),
-     TOBN(0x390b3331, 0x55e0375a), TOBN(0xc676c626, 0xb6ebc47d),
-     TOBN(0x51623247, 0xb7d6dee8), TOBN(0x0948d927, 0x79659313),
-     TOBN(0x99700161, 0xe9ab35ed), TOBN(0x06cc32b4, 0x8ddde408),
-     TOBN(0x6f2fd664, 0x061ef338), TOBN(0x1606fa02, 0xc202e9ed),
-     TOBN(0x55388bc1, 0x929ba99b), TOBN(0xc4428c5e, 0x1e81df69),
-     TOBN(0xce2028ae, 0xf91b0b2a), TOBN(0xce870a23, 0xf03dfd3f),
-     TOBN(0x66ec2c87, 0x0affe8ed), TOBN(0xb205fb46, 0x284d0c00),
-     TOBN(0xbf5dffe7, 0x44cefa48), TOBN(0xb6fc37a8, 0xa19876d7),
-     TOBN(0xbecfa84c, 0x08b72863), TOBN(0xd7205ff5, 0x2576374f),
-     TOBN(0x80330d32, 0x8887de41), TOBN(0x5de0df0c, 0x869ea534),
-     TOBN(0x13f42753, 0x3c56ea17), TOBN(0xeb1f6069, 0x452b1a78),
-     TOBN(0x50474396, 0xe30ea15c), TOBN(0x575816a1, 0xc1494125),
-     TOBN(0xbe1ce55b, 0xfe6bb38f), TOBN(0xb901a948, 0x96ae30f7),
-     TOBN(0xe5af0f08, 0xd8fc3548), TOBN(0x5010b5d0, 0xd73bfd08),
-     TOBN(0x993d2880, 0x53fe655a), TOBN(0x99f2630b, 0x1c1309fd),
-     TOBN(0xd8677baf, 0xb4e3b76f), TOBN(0x14e51ddc, 0xb840784b),
-     TOBN(0x326c750c, 0xbf0092ce), TOBN(0xc83d306b, 0xf528320f),
-     TOBN(0xc4456715, 0x77d4715c), TOBN(0xd30019f9, 0x6b703235),
-     TOBN(0x207ccb2e, 0xd669e986), TOBN(0x57c824af, 0xf6dbfc28),
-     TOBN(0xf0eb532f, 0xd8f92a23), TOBN(0x4a557fd4, 0x9bb98fd2),
-     TOBN(0xa57acea7, 0xc1e6199a), TOBN(0x0c663820, 0x8b94b1ed),
-     TOBN(0x9b42be8f, 0xf83a9266), TOBN(0xc7741c97, 0x0101bd45),
-     TOBN(0x95770c11, 0x07bd9ceb), TOBN(0x1f50250a, 0x8b2e0744),
-     TOBN(0xf762eec8, 0x1477b654), TOBN(0xc65b900e, 0x15efe59a),
-     TOBN(0x88c96148, 0x9546a897), TOBN(0x7e8025b3, 0xc30b4d7c),
-     TOBN(0xae4065ef, 0x12045cf9), TOBN(0x6fcb2caf, 0x9ccce8bd),
-     TOBN(0x1fa0ba4e, 0xf2cf6525), TOBN(0xf683125d, 0xcb72c312),
-     TOBN(0xa01da4ea, 0xe312410e), TOBN(0x67e28677, 0x6cd8e830),
-     TOBN(0xabd95752, 0x98fb3f07), TOBN(0x05f11e11, 0xeef649a5),
-     TOBN(0xba47faef, 0x9d3472c2), TOBN(0x3adff697, 0xc77d1345),
-     TOBN(0x4761fa04, 0xdd15afee), TOBN(0x64f1f61a, 0xb9e69462),
-     TOBN(0xfa691fab, 0x9bfb9093), TOBN(0x3df8ae8f, 0xa1133dfe),
-     TOBN(0xcd5f8967, 0x58cc710d), TOBN(0xfbb88d50, 0x16c7fe79),
-     TOBN(0x8e011b4c, 0xe88c50d1), TOBN(0x7532e807, 0xa8771c4f),
-     TOBN(0x64c78a48, 0xe2278ee4), TOBN(0x0b283e83, 0x3845072a),
-     TOBN(0x98a6f291, 0x49e69274), TOBN(0xb96e9668, 0x1868b21c),
-     TOBN(0x38f0adc2, 0xb1a8908e), TOBN(0x90afcff7, 0x1feb829d),
-     TOBN(0x9915a383, 0x210b0856), TOBN(0xa5a80602, 0xdef04889),
-     TOBN(0x800e9af9, 0x7c64d509), TOBN(0x81382d0b, 0xb8996f6f),
-     TOBN(0x490eba53, 0x81927e27), TOBN(0x46c63b32, 0x4af50182),
-     TOBN(0x784c5fd9, 0xd3ad62ce), TOBN(0xe4fa1870, 0xf8ae8736),
-     TOBN(0x4ec9d0bc, 0xd7466b25), TOBN(0x84ddbe1a, 0xdb235c65),
-     TOBN(0x5e2645ee, 0x163c1688), TOBN(0x570bd00e, 0x00eba747),
-     TOBN(0xfa51b629, 0x128bfa0f), TOBN(0x92fce1bd, 0x6c1d3b68),
-     TOBN(0x3e7361dc, 0xb66778b1), TOBN(0x9c7d249d, 0x5561d2bb),
-     TOBN(0xa40b28bf, 0x0bbc6229), TOBN(0x1c83c05e, 0xdfd91497),
-     TOBN(0x5f9f5154, 0xf083df05), TOBN(0xbac38b3c, 0xeee66c9d),
-     TOBN(0xf71db7e3, 0xec0dfcfd), TOBN(0xf2ecda8e, 0x8b0a8416),
-     TOBN(0x52fddd86, 0x7812aa66), TOBN(0x2896ef10, 0x4e6f4272),
-     TOBN(0xff27186a, 0x0fe9a745), TOBN(0x08249fcd, 0x49ca70db),
-     TOBN(0x7425a2e6, 0x441cac49), TOBN(0xf4a0885a, 0xece5ff57),
-     TOBN(0x6e2cb731, 0x7d7ead58), TOBN(0xf96cf7d6, 0x1898d104),
-     TOBN(0xafe67c9d, 0x4f2c9a89), TOBN(0x89895a50, 0x1c7bf5bc),
-     TOBN(0xdc7cb8e5, 0x573cecfa), TOBN(0x66497eae, 0xd15f03e6),
-     TOBN(0x6bc0de69, 0x3f084420), TOBN(0x323b9b36, 0xacd532b0),
-     TOBN(0xcfed390a, 0x0115a3c1), TOBN(0x9414c40b, 0x2d65ca0e),
-     TOBN(0x641406bd, 0x2f530c78), TOBN(0x29369a44, 0x833438f2),
-     TOBN(0x996884f5, 0x903fa271), TOBN(0xe6da0fd2, 0xb9da921e),
-     TOBN(0xa6f2f269, 0x5db01e54), TOBN(0x1ee3e9bd, 0x6876214e),
-     TOBN(0xa26e181c, 0xe27a9497), TOBN(0x36d254e4, 0x8e215e04),
-     TOBN(0x42f32a6c, 0x252cabca), TOBN(0x99481487, 0x80b57614),
-     TOBN(0x4c4dfe69, 0x40d9cae1), TOBN(0x05869580, 0x11a10f09),
-     TOBN(0xca287b57, 0x3491b64b), TOBN(0x77862d5d, 0x3fd4a53b),
-     TOBN(0xbf94856e, 0x50349126), TOBN(0x2be30bd1, 0x71c5268f),
-     TOBN(0x10393f19, 0xcbb650a6), TOBN(0x639531fe, 0x778cf9fd),
-     TOBN(0x02556a11, 0xb2935359), TOBN(0xda38aa96, 0xaf8c126e),
-     TOBN(0x47dbe6c2, 0x0960167f), TOBN(0x37bbabb6, 0x501901cd),
-     TOBN(0xb6e979e0, 0x2c947778), TOBN(0xd69a5175, 0x7a1a1dc6),
-     TOBN(0xc3ed5095, 0x9d9faf0c), TOBN(0x4dd9c096, 0x1d5fa5f0),
-     TOBN(0xa0c4304d, 0x64f16ea8), TOBN(0x8b1cac16, 0x7e718623),
-     TOBN(0x0b576546, 0x7c67f03e), TOBN(0x559cf5ad, 0xcbd88c01),
-     TOBN(0x074877bb, 0x0e2af19a), TOBN(0x1f717ec1, 0xa1228c92),
-     TOBN(0x70bcb800, 0x326e8920), TOBN(0xec6e2c5c, 0x4f312804),
-     TOBN(0x426aea7d, 0x3fca4752), TOBN(0xf12c0949, 0x2211f62a),
-     TOBN(0x24beecd8, 0x7be7b6b5), TOBN(0xb77eaf4c, 0x36d7a27d),
-     TOBN(0x154c2781, 0xfda78fd3), TOBN(0x848a83b0, 0x264eeabe),
-     TOBN(0x81287ef0, 0x4ffe2bc4), TOBN(0x7b6d88c6, 0xb6b6fc2a),
-     TOBN(0x805fb947, 0xce417d99), TOBN(0x4b93dcc3, 0x8b916cc4),
-     TOBN(0x72e65bb3, 0x21273323), TOBN(0xbcc1badd, 0x6ea9886e),
-     TOBN(0x0e223011, 0x4bc5ee85), TOBN(0xa561be74, 0xc18ee1e4),
-     TOBN(0x762fd2d4, 0xa6bcf1f1), TOBN(0x50e6a5a4, 0x95231489),
-     TOBN(0xca96001f, 0xa00b500b), TOBN(0x5c098cfc, 0x5d7dcdf5),
-     TOBN(0xa64e2d2e, 0x8c446a85), TOBN(0xbae9bcf1, 0x971f3c62),
-     TOBN(0x4ec22683, 0x8435a2c5), TOBN(0x8ceaed6c, 0x4bad4643),
-     TOBN(0xe9f8fb47, 0xccccf4e3), TOBN(0xbd4f3fa4, 0x1ce3b21e),
-     TOBN(0xd79fb110, 0xa3db3292), TOBN(0xe28a37da, 0xb536c66a),
-     TOBN(0x279ce87b, 0x8e49e6a9), TOBN(0x70ccfe8d, 0xfdcec8e3),
-     TOBN(0x2193e4e0, 0x3ba464b2), TOBN(0x0f39d60e, 0xaca9a398),
-     TOBN(0x7d7932af, 0xf82c12ab), TOBN(0xd8ff50ed, 0x91e7e0f7),
-     TOBN(0xea961058, 0xfa28a7e0), TOBN(0xc726cf25, 0x0bf5ec74),
-     TOBN(0xe74d55c8, 0xdb229666), TOBN(0x0bd9abbf, 0xa57f5799),
-     TOBN(0x7479ef07, 0x4dfc47b3), TOBN(0xd9c65fc3, 0x0c52f91d),
-     TOBN(0x8e0283fe, 0x36a8bde2), TOBN(0xa32a8b5e, 0x7d4b7280),
-     TOBN(0x6a677c61, 0x12e83233), TOBN(0x0fbb3512, 0xdcc9bf28),
-     TOBN(0x562e8ea5, 0x0d780f61), TOBN(0x0db8b22b, 0x1dc4e89c),
-     TOBN(0x0a6fd1fb, 0x89be0144), TOBN(0x8c77d246, 0xca57113b),
-     TOBN(0x4639075d, 0xff09c91c), TOBN(0x5b47b17f, 0x5060824c),
-     TOBN(0x58aea2b0, 0x16287b52), TOBN(0xa1343520, 0xd0cd8eb0),
-     TOBN(0x6148b4d0, 0xc5d58573), TOBN(0xdd2b6170, 0x291c68ae),
-     TOBN(0xa61b3929, 0x1da3b3b7), TOBN(0x5f946d79, 0x08c4ac10),
-     TOBN(0x4105d4a5, 0x7217d583), TOBN(0x5061da3d, 0x25e6de5e),
-     TOBN(0x3113940d, 0xec1b4991), TOBN(0xf12195e1, 0x36f485ae),
-     TOBN(0xa7507fb2, 0x731a2ee0), TOBN(0x95057a8e, 0x6e9e196e),
-     TOBN(0xa3c2c911, 0x2e130136), TOBN(0x97dfbb36, 0x33c60d15),
-     TOBN(0xcaf3c581, 0xb300ee2b), TOBN(0x77f25d90, 0xf4bac8b8),
-     TOBN(0xdb1c4f98, 0x6d840cd6), TOBN(0x471d62c0, 0xe634288c),
-     TOBN(0x8ec2f85e, 0xcec8a161), TOBN(0x41f37cbc, 0xfa6f4ae2),
-     TOBN(0x6793a20f, 0x4b709985), TOBN(0x7a7bd33b, 0xefa8985b),
-     TOBN(0x2c6a3fbd, 0x938e6446), TOBN(0x19042619, 0x2a8d47c1),
-     TOBN(0x16848667, 0xcc36975f), TOBN(0x02acf168, 0x9d5f1dfb),
-     TOBN(0x62d41ad4, 0x613baa94), TOBN(0xb56fbb92, 0x9f684670),
-     TOBN(0xce610d0d, 0xe9e40569), TOBN(0x7b99c65f, 0x35489fef),
-     TOBN(0x0c88ad1b, 0x3df18b97), TOBN(0x81b7d9be, 0x5d0e9edb),
-     TOBN(0xd85218c0, 0xc716cc0a), TOBN(0xf4b5ff90, 0x85691c49),
-     TOBN(0xa4fd666b, 0xce356ac6), TOBN(0x17c72895, 0x4b327a7a),
-     TOBN(0xf93d5085, 0xda6be7de), TOBN(0xff71530e, 0x3301d34e),
-     TOBN(0x4cd96442, 0xd8f448e8), TOBN(0x9283d331, 0x2ed18ffa),
-     TOBN(0x4d33dd99, 0x2a849870), TOBN(0xa716964b, 0x41576335),
-     TOBN(0xff5e3a9b, 0x179be0e5), TOBN(0x5b9d6b1b, 0x83b13632),
-     TOBN(0x3b8bd7d4, 0xa52f313b), TOBN(0xc9dd95a0, 0x637a4660),
-     TOBN(0x30035962, 0x0b3e218f), TOBN(0xce1481a3, 0xc7b28a3c),
-     TOBN(0xab41b43a, 0x43228d83), TOBN(0x24ae1c30, 0x4ad63f99),
-     TOBN(0x8e525f1a, 0x46a51229), TOBN(0x14af860f, 0xcd26d2b4),
-     TOBN(0xd6baef61, 0x3f714aa1), TOBN(0xf51865ad, 0xeb78795e),
-     TOBN(0xd3e21fce, 0xe6a9d694), TOBN(0x82ceb1dd, 0x8a37b527)}
-};
+static const BN_ULONG ecp_nistz256_precomputed[37][64 * sizeof(P256_POINT_AFFINE) / sizeof(BN_ULONG)]
+    = {
+          { TOBN(0x79e730d4, 0x18a9143c), TOBN(0x75ba95fc, 0x5fedb601),
+              TOBN(0x79fb732b, 0x77622510), TOBN(0x18905f76, 0xa53755c6),
+              TOBN(0xddf25357, 0xce95560a), TOBN(0x8b4ab8e4, 0xba19e45c),
+              TOBN(0xd2e88688, 0xdd21f325), TOBN(0x8571ff18, 0x25885d85),
+              TOBN(0x850046d4, 0x10ddd64d), TOBN(0xaa6ae3c1, 0xa433827d),
+              TOBN(0x73220503, 0x8d1490d9), TOBN(0xf6bb32e4, 0x3dcf3a3b),
+              TOBN(0x2f3648d3, 0x61bee1a5), TOBN(0x152cd7cb, 0xeb236ff8),
+              TOBN(0x19a8fb0e, 0x92042dbe), TOBN(0x78c57751, 0x0a5b8a3b),
+              TOBN(0xffac3f90, 0x4eebc127), TOBN(0xb027f84a, 0x087d81fb),
+              TOBN(0x66ad77dd, 0x87cbbc98), TOBN(0x26936a3f, 0xb6ff747e),
+              TOBN(0xb04c5c1f, 0xc983a7eb), TOBN(0x583e47ad, 0x0861fe1a),
+              TOBN(0x78820831, 0x1a2ee98e), TOBN(0xd5f06a29, 0xe587cc07),
+              TOBN(0x74b0b50d, 0x46918dcc), TOBN(0x4650a6ed, 0xc623c173),
+              TOBN(0x0cdaacac, 0xe8100af2), TOBN(0x577362f5, 0x41b0176b),
+              TOBN(0x2d96f24c, 0xe4cbaba6), TOBN(0x17628471, 0xfad6f447),
+              TOBN(0x6b6c36de, 0xe5ddd22e), TOBN(0x84b14c39, 0x4c5ab863),
+              TOBN(0xbe1b8aae, 0xc45c61f5), TOBN(0x90ec649a, 0x94b9537d),
+              TOBN(0x941cb5aa, 0xd076c20c), TOBN(0xc9079605, 0x890523c8),
+              TOBN(0xeb309b4a, 0xe7ba4f10), TOBN(0x73c568ef, 0xe5eb882b),
+              TOBN(0x3540a987, 0x7e7a1f68), TOBN(0x73a076bb, 0x2dd1e916),
+              TOBN(0x40394737, 0x3e77664a), TOBN(0x55ae744f, 0x346cee3e),
+              TOBN(0xd50a961a, 0x5b17a3ad), TOBN(0x13074b59, 0x54213673),
+              TOBN(0x93d36220, 0xd377e44b), TOBN(0x299c2b53, 0xadff14b5),
+              TOBN(0xf424d44c, 0xef639f11), TOBN(0xa4c9916d, 0x4a07f75f),
+              TOBN(0x0746354e, 0xa0173b4f), TOBN(0x2bd20213, 0xd23c00f7),
+              TOBN(0xf43eaab5, 0x0c23bb08), TOBN(0x13ba5119, 0xc3123e03),
+              TOBN(0x2847d030, 0x3f5b9d4d), TOBN(0x6742f2f2, 0x5da67bdd),
+              TOBN(0xef933bdc, 0x77c94195), TOBN(0xeaedd915, 0x6e240867),
+              TOBN(0x27f14cd1, 0x9499a78f), TOBN(0x462ab5c5, 0x6f9b3455),
+              TOBN(0x8f90f02a, 0xf02cfc6b), TOBN(0xb763891e, 0xb265230d),
+              TOBN(0xf59da3a9, 0x532d4977), TOBN(0x21e3327d, 0xcf9eba15),
+              TOBN(0x123c7b84, 0xbe60bbf0), TOBN(0x56ec12f2, 0x7706df76),
+              TOBN(0x75c96e8f, 0x264e20e8), TOBN(0xabe6bfed, 0x59a7a841),
+              TOBN(0x2cc09c04, 0x44c8eb00), TOBN(0xe05b3080, 0xf0c4e16b),
+              TOBN(0x1eb7777a, 0xa45f3314), TOBN(0x56af7bed, 0xce5d45e3),
+              TOBN(0x2b6e019a, 0x88b12f1a), TOBN(0x086659cd, 0xfd835f9b),
+              TOBN(0x2c18dbd1, 0x9dc21ec8), TOBN(0x98f9868a, 0x0fcf8139),
+              TOBN(0x737d2cd6, 0x48250b49), TOBN(0xcc61c947, 0x24b3428f),
+              TOBN(0x0c2b4078, 0x80dd9e76), TOBN(0xc43a8991, 0x383fbe08),
+              TOBN(0x5f7d2d65, 0x779be5d2), TOBN(0x78719a54, 0xeb3b4ab5),
+              TOBN(0xea7d260a, 0x6245e404), TOBN(0x9de40795, 0x6e7fdfe0),
+              TOBN(0x1ff3a415, 0x8dac1ab5), TOBN(0x3e7090f1, 0x649c9073),
+              TOBN(0x1a768561, 0x2b944e88), TOBN(0x250f939e, 0xe57f61c8),
+              TOBN(0x0c0daa89, 0x1ead643d), TOBN(0x68930023, 0xe125b88e),
+              TOBN(0x04b71aa7, 0xd2697768), TOBN(0xabdedef5, 0xca345a33),
+              TOBN(0x2409d29d, 0xee37385e), TOBN(0x4ee1df77, 0xcb83e156),
+              TOBN(0x0cac12d9, 0x1cbb5b43), TOBN(0x170ed2f6, 0xca895637),
+              TOBN(0x28228cfa, 0x8ade6d66), TOBN(0x7ff57c95, 0x53238aca),
+              TOBN(0xccc42563, 0x4b2ed709), TOBN(0x0e356769, 0x856fd30d),
+              TOBN(0xbcbcd43f, 0x559e9811), TOBN(0x738477ac, 0x5395b759),
+              TOBN(0x35752b90, 0xc00ee17f), TOBN(0x68748390, 0x742ed2e3),
+              TOBN(0x7cd06422, 0xbd1f5bc1), TOBN(0xfbc08769, 0xc9e7b797),
+              TOBN(0xa242a35b, 0xb0cf664a), TOBN(0x126e48f7, 0x7f9707e3),
+              TOBN(0x1717bf54, 0xc6832660), TOBN(0xfaae7332, 0xfd12c72e),
+              TOBN(0x27b52db7, 0x995d586b), TOBN(0xbe29569e, 0x832237c2),
+              TOBN(0xe8e4193e, 0x2a65e7db), TOBN(0x152706dc, 0x2eaa1bbb),
+              TOBN(0x72bcd8b7, 0xbc60055b), TOBN(0x03cc23ee, 0x56e27e4b),
+              TOBN(0xee337424, 0xe4819370), TOBN(0xe2aa0e43, 0x0ad3da09),
+              TOBN(0x40b8524f, 0x6383c45d), TOBN(0xd7663554, 0x42a41b25),
+              TOBN(0x64efa6de, 0x778a4797), TOBN(0x2042170a, 0x7079adf4),
+              TOBN(0x808b0b65, 0x0bc6fb80), TOBN(0x5882e075, 0x3ffe2e6b),
+              TOBN(0xd5ef2f7c, 0x2c83f549), TOBN(0x54d63c80, 0x9103b723),
+              TOBN(0xf2f11bd6, 0x52a23f9b), TOBN(0x3670c319, 0x4b0b6587),
+              TOBN(0x55c4623b, 0xb1580e9e), TOBN(0x64edf7b2, 0x01efe220),
+              TOBN(0x97091dcb, 0xd53c5c9d), TOBN(0xf17624b6, 0xac0a177b),
+              TOBN(0xb0f13975, 0x2cfe2dff), TOBN(0xc1a35c0a, 0x6c7a574e),
+              TOBN(0x227d3146, 0x93e79987), TOBN(0x0575bf30, 0xe89cb80e),
+              TOBN(0x2f4e247f, 0x0d1883bb), TOBN(0xebd51226, 0x3274c3d0),
+              TOBN(0x5f3e51c8, 0x56ada97a), TOBN(0x4afc964d, 0x8f8b403e),
+              TOBN(0xa6f247ab, 0x412e2979), TOBN(0x675abd1b, 0x6f80ebda),
+              TOBN(0x66a2bd72, 0x5e485a1d), TOBN(0x4b2a5caf, 0x8f4f0b3c),
+              TOBN(0x2626927f, 0x1b847bba), TOBN(0x6c6fc7d9, 0x0502394d),
+              TOBN(0xfea912ba, 0xa5659ae8), TOBN(0x68363aba, 0x25e1a16e),
+              TOBN(0xb8842277, 0x752c41ac), TOBN(0xfe545c28, 0x2897c3fc),
+              TOBN(0x2d36e9e7, 0xdc4c696b), TOBN(0x5806244a, 0xfba977c5),
+              TOBN(0x85665e9b, 0xe39508c1), TOBN(0xf720ee25, 0x6d12597b),
+              TOBN(0x8a979129, 0xd2337a31), TOBN(0x5916868f, 0x0f862bdc),
+              TOBN(0x048099d9, 0x5dd283ba), TOBN(0xe2d1eeb6, 0xfe5bfb4e),
+              TOBN(0x82ef1c41, 0x7884005d), TOBN(0xa2d4ec17, 0xffffcbae),
+              TOBN(0x9161c53f, 0x8aa95e66), TOBN(0x5ee104e1, 0xc5fee0d0),
+              TOBN(0x562e4cec, 0xc135b208), TOBN(0x74e1b265, 0x4783f47d),
+              TOBN(0x6d2a506c, 0x5a3f3b30), TOBN(0xecead9f4, 0xc16762fc),
+              TOBN(0xf29dd4b2, 0xe286e5b9), TOBN(0x1b0fadc0, 0x83bb3c61),
+              TOBN(0x7a75023e, 0x7fac29a4), TOBN(0xc086d5f1, 0xc9477fa3),
+              TOBN(0x0fc61135, 0x2f6f3076), TOBN(0xc99ffa23, 0xe3912a9a),
+              TOBN(0x6a0b0685, 0xd2f8ba3d), TOBN(0xfdc777e8, 0xe93358a4),
+              TOBN(0x94a787bb, 0x35415f04), TOBN(0x640c2d6a, 0x4d23fea4),
+              TOBN(0x9de917da, 0x153a35b5), TOBN(0x793e8d07, 0x5d5cd074),
+              TOBN(0xf4f87653, 0x2de45068), TOBN(0x37c7a7e8, 0x9e2e1f6e),
+              TOBN(0xd0825fa2, 0xa3584069), TOBN(0xaf2cea7c, 0x1727bf42),
+              TOBN(0x0360a4fb, 0x9e4785a9), TOBN(0xe5fda49c, 0x27299f4a),
+              TOBN(0x48068e13, 0x71ac2f71), TOBN(0x83d0687b, 0x9077666f),
+              TOBN(0x6d3883b2, 0x15d02819), TOBN(0x6d0d7550, 0x40dd9a35),
+              TOBN(0x61d7cbf9, 0x1d2b469f), TOBN(0xf97b232f, 0x2efc3115),
+              TOBN(0xa551d750, 0xb24bcbc7), TOBN(0x11ea4949, 0x88a1e356),
+              TOBN(0x7669f031, 0x93cb7501), TOBN(0x595dc55e, 0xca737b8a),
+              TOBN(0xa4a319ac, 0xd837879f), TOBN(0x6fc1b49e, 0xed6b67b0),
+              TOBN(0xe3959933, 0x32f1f3af), TOBN(0x966742eb, 0x65432a2e),
+              TOBN(0x4b8dc9fe, 0xb4966228), TOBN(0x96cc6312, 0x43f43950),
+              TOBN(0x12068859, 0xc9b731ee), TOBN(0x7b948dc3, 0x56f79968),
+              TOBN(0x61e4ad32, 0xed1f8008), TOBN(0xe6c9267a, 0xd8b17538),
+              TOBN(0x1ac7c5eb, 0x857ff6fb), TOBN(0x994baaa8, 0x55f2fb10),
+              TOBN(0x84cf14e1, 0x1d248018), TOBN(0x5a39898b, 0x628ac508),
+              TOBN(0x14fde97b, 0x5fa944f5), TOBN(0xed178030, 0xd12e5ac7),
+              TOBN(0x042c2af4, 0x97e2feb4), TOBN(0xd36a42d7, 0xaebf7313),
+              TOBN(0x49d2c9eb, 0x084ffdd7), TOBN(0x9f8aa54b, 0x2ef7c76a),
+              TOBN(0x9200b7ba, 0x09895e70), TOBN(0x3bd0c66f, 0xddb7fb58),
+              TOBN(0x2d97d108, 0x78eb4cbb), TOBN(0x2d431068, 0xd84bde31),
+              TOBN(0x4b523eb7, 0x172ccd1f), TOBN(0x7323cb28, 0x30a6a892),
+              TOBN(0x97082ec0, 0xcfe153eb), TOBN(0xe97f6b6a, 0xf2aadb97),
+              TOBN(0x1d3d393e, 0xd1a83da1), TOBN(0xa6a7f9c7, 0x804b2a68),
+              TOBN(0x4a688b48, 0x2d0cb71e), TOBN(0xa9b4cc5f, 0x40585278),
+              TOBN(0x5e5db46a, 0xcb66e132), TOBN(0xf1be963a, 0x0d925880),
+              TOBN(0x944a7027, 0x0317b9e2), TOBN(0xe266f959, 0x48603d48),
+              TOBN(0x98db6673, 0x5c208899), TOBN(0x90472447, 0xa2fb18a3),
+              TOBN(0x8a966939, 0x777c619f), TOBN(0x3798142a, 0x2a3be21b),
+              TOBN(0xb4241cb1, 0x3298b343), TOBN(0xa3a14e49, 0xb44f65a1),
+              TOBN(0xc5f4d6cd, 0x3ac77acd), TOBN(0xd0288cb5, 0x52b6fc3c),
+              TOBN(0xd5cc8c2f, 0x1c040abc), TOBN(0xb675511e, 0x06bf9b4a),
+              TOBN(0xd667da37, 0x9b3aa441), TOBN(0x460d45ce, 0x51601f72),
+              TOBN(0xe2f73c69, 0x6755ff89), TOBN(0xdd3cf7e7, 0x473017e6),
+              TOBN(0x8ef5689d, 0x3cf7600d), TOBN(0x948dc4f8, 0xb1fc87b4),
+              TOBN(0xd9e9fe81, 0x4ea53299), TOBN(0x2d921ca2, 0x98eb6028),
+              TOBN(0xfaecedfd, 0x0c9803fc), TOBN(0xf38ae891, 0x4d7b4745),
+              TOBN(0xd8c5fccf, 0xc5e3a3d8), TOBN(0xbefd904c, 0x4079dfbf),
+              TOBN(0xbc6d6a58, 0xfead0197), TOBN(0x39227077, 0x695532a4),
+              TOBN(0x09e23e6d, 0xdbef42f5), TOBN(0x7e449b64, 0x480a9908),
+              TOBN(0x7b969c1a, 0xad9a2e40), TOBN(0x6231d792, 0x9591c2a4),
+              TOBN(0x87151456, 0x0f664534), TOBN(0x85ceae7c, 0x4b68f103),
+              TOBN(0xac09c4ae, 0x65578ab9), TOBN(0x33ec6868, 0xf044b10c),
+              TOBN(0x6ac4832b, 0x3a8ec1f1), TOBN(0x5509d128, 0x5847d5ef),
+              TOBN(0xf909604f, 0x763f1574), TOBN(0xb16c4303, 0xc32f63c4),
+              TOBN(0xb6ab2014, 0x7ca23cd3), TOBN(0xcaa7a5c6, 0xa391849d),
+              TOBN(0x5b0673a3, 0x75678d94), TOBN(0xc982ddd4, 0xdd303e64),
+              TOBN(0xfd7b000b, 0x5db6f971), TOBN(0xbba2cb1f, 0x6f876f92),
+              TOBN(0xc77332a3, 0x3c569426), TOBN(0xa159100c, 0x570d74f8),
+              TOBN(0xfd16847f, 0xdec67ef5), TOBN(0x742ee464, 0x233e76b7),
+              TOBN(0x0b8e4134, 0xefc2b4c8), TOBN(0xca640b86, 0x42a3e521),
+              TOBN(0x653a0190, 0x8ceb6aa9), TOBN(0x313c300c, 0x547852d5),
+              TOBN(0x24e4ab12, 0x6b237af7), TOBN(0x2ba90162, 0x8bb47af8),
+              TOBN(0x3d5e58d6, 0xa8219bb7), TOBN(0xc691d0bd, 0x1b06c57f),
+              TOBN(0x0ae4cb10, 0xd257576e), TOBN(0x3569656c, 0xd54a3dc3),
+              TOBN(0xe5ebaebd, 0x94cda03a), TOBN(0x934e82d3, 0x162bfe13),
+              TOBN(0x450ac0ba, 0xe251a0c6), TOBN(0x480b9e11, 0xdd6da526),
+              TOBN(0x00467bc5, 0x8cce08b5), TOBN(0xb636458c, 0x7f178d55),
+              TOBN(0xc5748bae, 0xa677d806), TOBN(0x2763a387, 0xdfa394eb),
+              TOBN(0xa12b448a, 0x7d3cebb6), TOBN(0xe7adda3e, 0x6f20d850),
+              TOBN(0xf63ebce5, 0x1558462c), TOBN(0x58b36143, 0x620088a8),
+              TOBN(0x8a2cc3ca, 0x4d63c0ee), TOBN(0x51233117, 0x0fe948ce),
+              TOBN(0x7463fd85, 0x222ef33b), TOBN(0xadf0c7dc, 0x7c603d6c),
+              TOBN(0x0ec32d3b, 0xfe7765e5), TOBN(0xccaab359, 0xbf380409),
+              TOBN(0xbdaa84d6, 0x8e59319c), TOBN(0xd9a4c280, 0x9c80c34d),
+              TOBN(0xa9d89488, 0xa059c142), TOBN(0x6f5ae714, 0xff0b9346),
+              TOBN(0x068f237d, 0x16fb3664), TOBN(0x5853e4c4, 0x363186ac),
+              TOBN(0xe2d87d23, 0x63c52f98), TOBN(0x2ec4a766, 0x81828876),
+              TOBN(0x47b864fa, 0xe14e7b1c), TOBN(0x0c0bc0e5, 0x69192408),
+              TOBN(0xe4d7681d, 0xb82e9f3e), TOBN(0x83200f0b, 0xdf25e13c),
+              TOBN(0x8909984c, 0x66f27280), TOBN(0x462d7b00, 0x75f73227),
+              TOBN(0xd90ba188, 0xf2651798), TOBN(0x74c6e18c, 0x36ab1c34),
+              TOBN(0xab256ea3, 0x5ef54359), TOBN(0x03466612, 0xd1aa702f),
+              TOBN(0x624d6049, 0x2ed22e91), TOBN(0x6fdfe0b5, 0x6f072822),
+              TOBN(0xeeca1115, 0x39ce2271), TOBN(0x98100a4f, 0xdb01614f),
+              TOBN(0xb6b0daa2, 0xa35c628f), TOBN(0xb6f94d2e, 0xc87e9a47),
+              TOBN(0xc6773259, 0x1d57d9ce), TOBN(0xf70bfeec, 0x03884a7b),
+              TOBN(0x5fb35ccf, 0xed2bad01), TOBN(0xa155cbe3, 0x1da6a5c7),
+              TOBN(0xc2e2594c, 0x30a92f8f), TOBN(0x649c89ce, 0x5bfafe43),
+              TOBN(0xd158667d, 0xe9ff257a), TOBN(0x9b359611, 0xf32c50ae),
+              TOBN(0x4b00b20b, 0x906014cf), TOBN(0xf3a8cfe3, 0x89bc7d3d),
+              TOBN(0x4ff23ffd, 0x248a7d06), TOBN(0x80c5bfb4, 0x878873fa),
+              TOBN(0xb7d9ad90, 0x05745981), TOBN(0x179c85db, 0x3db01994),
+              TOBN(0xba41b062, 0x61a6966c), TOBN(0x4d82d052, 0xeadce5a8),
+              TOBN(0x9e91cd3b, 0xa5e6a318), TOBN(0x47795f4f, 0x95b2dda0),
+              TOBN(0xecfd7c1f, 0xd55a897c), TOBN(0x009194ab, 0xb29110fb),
+              TOBN(0x5f0e2046, 0xe381d3b0), TOBN(0x5f3425f6, 0xa98dd291),
+              TOBN(0xbfa06687, 0x730d50da), TOBN(0x0423446c, 0x4b083b7f),
+              TOBN(0x397a247d, 0xd69d3417), TOBN(0xeb629f90, 0x387ba42a),
+              TOBN(0x1ee426cc, 0xd5cd79bf), TOBN(0x0032940b, 0x946c6e18),
+              TOBN(0x1b1e8ae0, 0x57477f58), TOBN(0xe94f7d34, 0x6d823278),
+              TOBN(0xc747cb96, 0x782ba21a), TOBN(0xc5254469, 0xf72b33a5),
+              TOBN(0x772ef6de, 0xc7f80c81), TOBN(0xd73acbfe, 0x2cd9e6b5),
+              TOBN(0x4075b5b1, 0x49ee90d9), TOBN(0x785c339a, 0xa06e9eba),
+              TOBN(0xa1030d5b, 0xabf825e0), TOBN(0xcec684c3, 0xa42931dc),
+              TOBN(0x42ab62c9, 0xc1586e63), TOBN(0x45431d66, 0x5ab43f2b),
+              TOBN(0x57c8b2c0, 0x55f7835d), TOBN(0x033da338, 0xc1b7f865),
+              TOBN(0x283c7513, 0xcaa76097), TOBN(0x0a624fa9, 0x36c83906),
+              TOBN(0x6b20afec, 0x715af2c7), TOBN(0x4b969974, 0xeba78bfd),
+              TOBN(0x220755cc, 0xd921d60e), TOBN(0x9b944e10, 0x7baeca13),
+              TOBN(0x04819d51, 0x5ded93d4), TOBN(0x9bbff86e, 0x6dddfd27),
+              TOBN(0x6b344130, 0x77adc612), TOBN(0xa7496529, 0xbbd803a0),
+              TOBN(0x1a1baaa7, 0x6d8805bd), TOBN(0xc8403902, 0x470343ad),
+              TOBN(0x39f59f66, 0x175adff1), TOBN(0x0b26d7fb, 0xb7d8c5b7),
+              TOBN(0xa875f5ce, 0x529d75e3), TOBN(0x85efc7e9, 0x41325cc2),
+              TOBN(0x21950b42, 0x1ff6acd3), TOBN(0xffe70484, 0x53dc6909),
+              TOBN(0xff4cd0b2, 0x28766127), TOBN(0xabdbe608, 0x4fb7db2b),
+              TOBN(0x837c9228, 0x5e1109e8), TOBN(0x26147d27, 0xf4645b5a),
+              TOBN(0x4d78f592, 0xf7818ed8), TOBN(0xd394077e, 0xf247fa36),
+              TOBN(0x0fb9c2d0, 0x488c171a), TOBN(0xa78bfbaa, 0x13685278),
+              TOBN(0xedfbe268, 0xd5b1fa6a), TOBN(0x0dceb8db, 0x2b7eaba7),
+              TOBN(0xbf9e8089, 0x9ae2b710), TOBN(0xefde7ae6, 0xa4449c96),
+              TOBN(0x43b7716b, 0xcc143a46), TOBN(0xd7d34194, 0xc3628c13),
+              TOBN(0x508cec1c, 0x3b3f64c9), TOBN(0xe20bc0ba, 0x1e5edf3f),
+              TOBN(0xda1deb85, 0x2f4318d4), TOBN(0xd20ebe0d, 0x5c3fa443),
+              TOBN(0x370b4ea7, 0x73241ea3), TOBN(0x61f1511c, 0x5e1a5f65),
+              TOBN(0x99a5e23d, 0x82681c62), TOBN(0xd731e383, 0xa2f54c2d),
+              TOBN(0x2692f36e, 0x83445904), TOBN(0x2e0ec469, 0xaf45f9c0),
+              TOBN(0x905a3201, 0xc67528b7), TOBN(0x88f77f34, 0xd0e5e542),
+              TOBN(0xf67a8d29, 0x5864687c), TOBN(0x23b92eae, 0x22df3562),
+              TOBN(0x5c27014b, 0x9bbec39e), TOBN(0x7ef2f226, 0x9c0f0f8d),
+              TOBN(0x97359638, 0x546c4d8d), TOBN(0x5f9c3fc4, 0x92f24679),
+              TOBN(0x912e8bed, 0xa8c8acd9), TOBN(0xec3a318d, 0x306634b0),
+              TOBN(0x80167f41, 0xc31cb264), TOBN(0x3db82f6f, 0x522113f2),
+              TOBN(0xb155bcd2, 0xdcafe197), TOBN(0xfba1da59, 0x43465283),
+              TOBN(0xa0425b8e, 0xb212cf53), TOBN(0x4f2e512e, 0xf8557c5f),
+              TOBN(0xc1286ff9, 0x25c4d56c), TOBN(0xbb8a0fea, 0xee26c851),
+              TOBN(0xc28f70d2, 0xe7d6107e), TOBN(0x7ee0c444, 0xe76265aa),
+              TOBN(0x3df277a4, 0x1d1936b1), TOBN(0x1a556e3f, 0xea9595eb),
+              TOBN(0x258bbbf9, 0xe7305683), TOBN(0x31eea5bf, 0x07ef5be6),
+              TOBN(0x0deb0e4a, 0x46c814c1), TOBN(0x5cee8449, 0xa7b730dd),
+              TOBN(0xeab495c5, 0xa0182bde), TOBN(0xee759f87, 0x9e27a6b4),
+              TOBN(0xc2cf6a68, 0x80e518ca), TOBN(0x25e8013f, 0xf14cf3f4),
+              TOBN(0x8fc44140, 0x7e8d7a14), TOBN(0xbb1ff3ca, 0x9556f36a),
+              TOBN(0x6a844385, 0x14600044), TOBN(0xba3f0c4a, 0x7451ae63),
+              TOBN(0xdfcac25b, 0x1f9af32a), TOBN(0x01e0db86, 0xb1f2214b),
+              TOBN(0x4e9a5bc2, 0xa4b596ac), TOBN(0x83927681, 0x026c2c08),
+              TOBN(0x3ec832e7, 0x7acaca28), TOBN(0x1bfeea57, 0xc7385b29),
+              TOBN(0x068212e3, 0xfd1eaf38), TOBN(0xc1329830, 0x6acf8ccc),
+              TOBN(0xb909f2db, 0x2aac9e59), TOBN(0x5748060d, 0xb661782a),
+              TOBN(0xc5ab2632, 0xc79b7a01), TOBN(0xda44c6c6, 0x00017626),
+              TOBN(0xf26c00e8, 0xa7ea82f0), TOBN(0x99cac80d, 0xe4299aaf),
+              TOBN(0xd66fe3b6, 0x7ed78be1), TOBN(0x305f725f, 0x648d02cd),
+              TOBN(0x33ed1bc4, 0x623fb21b), TOBN(0xfa70533e, 0x7a6319ad),
+              TOBN(0x17ab562d, 0xbe5ffb3e), TOBN(0x06374994, 0x56674741),
+              TOBN(0x69d44ed6, 0x5c46aa8e), TOBN(0x2100d5d3, 0xa8d063d1),
+              TOBN(0xcb9727ea, 0xa2d17c36), TOBN(0x4c2bab1b, 0x8add53b7),
+              TOBN(0xa084e90c, 0x15426704), TOBN(0x778afcd3, 0xa837ebea),
+              TOBN(0x6651f701, 0x7ce477f8), TOBN(0xa0624998, 0x46fb7a8b),
+              TOBN(0xdc1e6828, 0xed8a6e19), TOBN(0x33fc2336, 0x4189d9c7),
+              TOBN(0x026f8fe2, 0x671c39bc), TOBN(0xd40c4ccd, 0xbc6f9915),
+              TOBN(0xafa135bb, 0xf80e75ca), TOBN(0x12c651a0, 0x22adff2c),
+              TOBN(0xc40a04bd, 0x4f51ad96), TOBN(0x04820109, 0xbbe4e832),
+              TOBN(0x3667eb1a, 0x7f4c04cc), TOBN(0x59556621, 0xa9404f84),
+              TOBN(0x71cdf653, 0x7eceb50a), TOBN(0x994a44a6, 0x9b8335fa),
+              TOBN(0xd7faf819, 0xdbeb9b69), TOBN(0x473c5680, 0xeed4350d),
+              TOBN(0xb6658466, 0xda44bba2), TOBN(0x0d1bc780, 0x872bdbf3),
+              TOBN(0xe535f175, 0xa1962f91), TOBN(0x6ed7e061, 0xed58f5a7),
+              TOBN(0x177aa4c0, 0x2089a233), TOBN(0x0dbcb03a, 0xe539b413),
+              TOBN(0xe3dc424e, 0xbb32e38e), TOBN(0x6472e5ef, 0x6806701e),
+              TOBN(0xdd47ff98, 0x814be9ee), TOBN(0x6b60cfff, 0x35ace009),
+              TOBN(0xb8d3d931, 0x9ff91fe5), TOBN(0x039c4800, 0xf0518eed),
+              TOBN(0x95c37632, 0x9182cb26), TOBN(0x0763a434, 0x82fc568d),
+              TOBN(0x707c04d5, 0x383e76ba), TOBN(0xac98b930, 0x824e8197),
+              TOBN(0x92bf7c8f, 0x91230de0), TOBN(0x90876a01, 0x40959b70),
+              TOBN(0xdb6d96f3, 0x05968b80), TOBN(0x380a0913, 0x089f73b9),
+              TOBN(0x7da70b83, 0xc2c61e01), TOBN(0x95fb8394, 0x569b38c7),
+              TOBN(0x9a3c6512, 0x80edfe2f), TOBN(0x8f726bb9, 0x8faeaf82),
+              TOBN(0x8010a4a0, 0x78424bf8), TOBN(0x29672044, 0x0e844970) },
+          { TOBN(0x63c5cb81, 0x7a2ad62a), TOBN(0x7ef2b6b9, 0xac62ff54),
+              TOBN(0x3749bba4, 0xb3ad9db5), TOBN(0xad311f2c, 0x46d5a617),
+              TOBN(0xb77a8087, 0xc2ff3b6d), TOBN(0xb46feaf3, 0x367834ff),
+              TOBN(0xf8aa266d, 0x75d6b138), TOBN(0xfa38d320, 0xec008188),
+              TOBN(0x486d8ffa, 0x696946fc), TOBN(0x50fbc6d8, 0xb9cba56d),
+              TOBN(0x7e3d423e, 0x90f35a15), TOBN(0x7c3da195, 0xc0dd962c),
+              TOBN(0xe673fdb0, 0x3cfd5d8b), TOBN(0x0704b7c2, 0x889dfca5),
+              TOBN(0xf6ce581f, 0xf52305aa), TOBN(0x399d49eb, 0x914d5e53),
+              TOBN(0x380a496d, 0x6ec293cd), TOBN(0x733dbda7, 0x8e7051f5),
+              TOBN(0x037e388d, 0xb849140a), TOBN(0xee4b32b0, 0x5946dbf6),
+              TOBN(0xb1c4fda9, 0xcae368d1), TOBN(0x5001a7b0, 0xfdb0b2f3),
+              TOBN(0x6df59374, 0x2e3ac46e), TOBN(0x4af675f2, 0x39b3e656),
+              TOBN(0x44e38110, 0x39949296), TOBN(0x5b63827b, 0x361db1b5),
+              TOBN(0x3e5323ed, 0x206eaff5), TOBN(0x942370d2, 0xc21f4290),
+              TOBN(0xf2caaf2e, 0xe0d985a1), TOBN(0x192cc64b, 0x7239846d),
+              TOBN(0x7c0b8f47, 0xae6312f8), TOBN(0x7dc61f91, 0x96620108),
+              TOBN(0xb830fb5b, 0xc2da7de9), TOBN(0xd0e643df, 0x0ff8d3be),
+              TOBN(0x31ee77ba, 0x188a9641), TOBN(0x4e8aa3aa, 0xbcf6d502),
+              TOBN(0xf9fb6532, 0x9a49110f), TOBN(0xd18317f6, 0x2dd6b220),
+              TOBN(0x7e3ced41, 0x52c3ea5a), TOBN(0x0d296a14, 0x7d579c4a),
+              TOBN(0x35d6a53e, 0xed4c3717), TOBN(0x9f8240cf, 0x3d0ed2a3),
+              TOBN(0x8c0d4d05, 0xe5543aa5), TOBN(0x45d5bbfb, 0xdd33b4b4),
+              TOBN(0xfa04cc73, 0x137fd28e), TOBN(0x862ac6ef, 0xc73b3ffd),
+              TOBN(0x403ff9f5, 0x31f51ef2), TOBN(0x34d5e0fc, 0xbc73f5a2),
+              TOBN(0xf2526820, 0x08913f4f), TOBN(0xea20ed61, 0xeac93d95),
+              TOBN(0x51ed38b4, 0x6ca6b26c), TOBN(0x8662dcbc, 0xea4327b0),
+              TOBN(0x6daf295c, 0x725d2aaa), TOBN(0xbad2752f, 0x8e52dcda),
+              TOBN(0x2210e721, 0x0b17dacc), TOBN(0xa37f7912, 0xd51e8232),
+              TOBN(0x4f7081e1, 0x44cc3add), TOBN(0xd5ffa1d6, 0x87be82cf),
+              TOBN(0x89890b6c, 0x0edd6472), TOBN(0xada26e1a, 0x3ed17863),
+              TOBN(0x276f2715, 0x63483caa), TOBN(0xe6924cd9, 0x2f6077fd),
+              TOBN(0x05a7fe98, 0x0a466e3c), TOBN(0xf1c794b0, 0xb1902d1f),
+              TOBN(0xe5213688, 0x82a8042c), TOBN(0xd931cfaf, 0xcd278298),
+              TOBN(0x069a0ae0, 0xf597a740), TOBN(0x0adbb3f3, 0xeb59107c),
+              TOBN(0x983e951e, 0x5eaa8eb8), TOBN(0xe663a8b5, 0x11b48e78),
+              TOBN(0x1631cc0d, 0x8a03f2c5), TOBN(0x7577c11e, 0x11e271e2),
+              TOBN(0x33b2385c, 0x08369a90), TOBN(0x2990c59b, 0x190eb4f8),
+              TOBN(0x819a6145, 0xc68eac80), TOBN(0x7a786d62, 0x2ec4a014),
+              TOBN(0x33faadbe, 0x20ac3a8d), TOBN(0x31a21781, 0x5aba2d30),
+              TOBN(0x209d2742, 0xdba4f565), TOBN(0xdb2ce9e3, 0x55aa0fbb),
+              TOBN(0x8cef334b, 0x168984df), TOBN(0xe81dce17, 0x33879638),
+              TOBN(0xf6e6949c, 0x263720f0), TOBN(0x5c56feaf, 0xf593cbec),
+              TOBN(0x8bff5601, 0xfde58c84), TOBN(0x74e24117, 0x2eccb314),
+              TOBN(0xbcf01b61, 0x4c9a8a78), TOBN(0xa233e35e, 0x544c9868),
+              TOBN(0xb3156bf3, 0x8bd7aff1), TOBN(0x1b5ee4cb, 0x1d81b146),
+              TOBN(0x7ba1ac41, 0xd628a915), TOBN(0x8f3a8f9c, 0xfd89699e),
+              TOBN(0x7329b9c9, 0xa0748be7), TOBN(0x1d391c95, 0xa92e621f),
+              TOBN(0xe51e6b21, 0x4d10a837), TOBN(0xd255f53a, 0x4947b435),
+              TOBN(0x07669e04, 0xf1788ee3), TOBN(0xc14f27af, 0xa86938a2),
+              TOBN(0x8b47a334, 0xe93a01c0), TOBN(0xff627438, 0xd9366808),
+              TOBN(0x7a0985d8, 0xca2a5965), TOBN(0x3d9a5542, 0xd6e9b9b3),
+              TOBN(0xc23eb80b, 0x4cf972e8), TOBN(0x5c1c33bb, 0x4fdf72fd),
+              TOBN(0x0c4a58d4, 0x74a86108), TOBN(0xf8048a8f, 0xee4c5d90),
+              TOBN(0xe3c7c924, 0xe86d4c80), TOBN(0x28c889de, 0x056a1e60),
+              TOBN(0x57e2662e, 0xb214a040), TOBN(0xe8c48e98, 0x37e10347),
+              TOBN(0x87742862, 0x80ac748a), TOBN(0xf1c24022, 0x186b06f2),
+              TOBN(0xac2dd4c3, 0x5f74040a), TOBN(0x409aeb71, 0xfceac957),
+              TOBN(0x4fbad782, 0x55c4ec23), TOBN(0xb359ed61, 0x8a7b76ec),
+              TOBN(0x12744926, 0xed6f4a60), TOBN(0xe21e8d7f, 0x4b912de3),
+              TOBN(0xe2575a59, 0xfc705a59), TOBN(0x72f1d4de, 0xed2dbc0e),
+              TOBN(0x3d2b24b9, 0xeb7926b8), TOBN(0xbff88cb3, 0xcdbe5509),
+              TOBN(0xd0f399af, 0xe4dd640b), TOBN(0x3c5fe130, 0x2f76ed45),
+              TOBN(0x6f3562f4, 0x3764fb3d), TOBN(0x7b5af318, 0x3151b62d),
+              TOBN(0xd5bd0bc7, 0xd79ce5f3), TOBN(0xfdaf6b20, 0xec66890f),
+              TOBN(0x735c67ec, 0x6063540c), TOBN(0x50b259c2, 0xe5f9cb8f),
+              TOBN(0xb8734f9a, 0x3f99c6ab), TOBN(0xf8cc13d5, 0xa3a7bc85),
+              TOBN(0x80c1b305, 0xc5217659), TOBN(0xfe5364d4, 0x4ec12a54),
+              TOBN(0xbd87045e, 0x681345fe), TOBN(0x7f8efeb1, 0x582f897f),
+              TOBN(0xe8cbf1e5, 0xd5923359), TOBN(0xdb0cea9d, 0x539b9fb0),
+              TOBN(0x0c5b34cf, 0x49859b98), TOBN(0x5e583c56, 0xa4403cc6),
+              TOBN(0x11fc1a2d, 0xd48185b7), TOBN(0xc93fbc7e, 0x6e521787),
+              TOBN(0x47e7a058, 0x05105b8b), TOBN(0x7b4d4d58, 0xdb8260c8),
+              TOBN(0xe33930b0, 0x46eb842a), TOBN(0x8e844a9a, 0x7bdae56d),
+              TOBN(0x34ef3a9e, 0x13f7fdfc), TOBN(0xb3768f82, 0x636ca176),
+              TOBN(0x2821f4e0, 0x4e09e61c), TOBN(0x414dc3a1, 0xa0c7cddc),
+              TOBN(0xd5379437, 0x54945fcd), TOBN(0x151b6eef, 0xb3555ff1),
+              TOBN(0xb31bd613, 0x6339c083), TOBN(0x39ff8155, 0xdfb64701),
+              TOBN(0x7c3388d2, 0xe29604ab), TOBN(0x1e19084b, 0xa6b10442),
+              TOBN(0x17cf54c0, 0xeccd47ef), TOBN(0x89693385, 0x4a5dfb30),
+              TOBN(0x69d023fb, 0x47daf9f6), TOBN(0x9222840b, 0x7d91d959),
+              TOBN(0x439108f5, 0x803bac62), TOBN(0x0b7dd91d, 0x379bd45f),
+              TOBN(0xd651e827, 0xca63c581), TOBN(0x5c5d75f6, 0x509c104f),
+              TOBN(0x7d5fc738, 0x1f2dc308), TOBN(0x20faa7bf, 0xd98454be),
+              TOBN(0x95374bee, 0xa517b031), TOBN(0xf036b9b1, 0x642692ac),
+              TOBN(0xc5106109, 0x39842194), TOBN(0xb7e2353e, 0x49d05295),
+              TOBN(0xfc8c1d5c, 0xefb42ee0), TOBN(0xe04884eb, 0x08ce811c),
+              TOBN(0xf1f75d81, 0x7419f40e), TOBN(0x5b0ac162, 0xa995c241),
+              TOBN(0x120921bb, 0xc4c55646), TOBN(0x713520c2, 0x8d33cf97),
+              TOBN(0xb4a65a5c, 0xe98c5100), TOBN(0x6cec871d, 0x2ddd0f5a),
+              TOBN(0x251f0b7f, 0x9ba2e78b), TOBN(0x224a8434, 0xce3a2a5f),
+              TOBN(0x26827f61, 0x25f5c46f), TOBN(0x6a22bedc, 0x48545ec0),
+              TOBN(0x25ae5fa0, 0xb1bb5cdc), TOBN(0xd693682f, 0xfcb9b98f),
+              TOBN(0x32027fe8, 0x91e5d7d3), TOBN(0xf14b7d17, 0x73a07678),
+              TOBN(0xf88497b3, 0xc0dfdd61), TOBN(0xf7c2eec0, 0x2a8c4f48),
+              TOBN(0xaa5573f4, 0x3756e621), TOBN(0xc013a240, 0x1825b948),
+              TOBN(0x1c03b345, 0x63878572), TOBN(0xa0472bea, 0x653a4184),
+              TOBN(0xf4222e27, 0x0ac69a80), TOBN(0x34096d25, 0xf51e54f6),
+              TOBN(0x00a648cb, 0x8fffa591), TOBN(0x4e87acdc, 0x69b6527f),
+              TOBN(0x0575e037, 0xe285ccb4), TOBN(0x188089e4, 0x50ddcf52),
+              TOBN(0xaa96c9a8, 0x870ff719), TOBN(0x74a56cd8, 0x1fc7e369),
+              TOBN(0x41d04ee2, 0x1726931a), TOBN(0x0bbbb2c8, 0x3660ecfd),
+              TOBN(0xa6ef6de5, 0x24818e18), TOBN(0xe421cc51, 0xe7d57887),
+              TOBN(0xf127d208, 0xbea87be6), TOBN(0x16a475d3, 0xb1cdd682),
+              TOBN(0x9db1b684, 0x439b63f7), TOBN(0x5359b3db, 0xf0f113b6),
+              TOBN(0xdfccf1de, 0x8bf06e31), TOBN(0x1fdf8f44, 0xdd383901),
+              TOBN(0x10775cad, 0x5017e7d2), TOBN(0xdfc3a597, 0x58d11eef),
+              TOBN(0x6ec9c8a0, 0xb1ecff10), TOBN(0xee6ed6cc, 0x28400549),
+              TOBN(0xb5ad7bae, 0x1b4f8d73), TOBN(0x61b4f11d, 0xe00aaab9),
+              TOBN(0x7b32d69b, 0xd4eff2d7), TOBN(0x88ae6771, 0x4288b60f),
+              TOBN(0x159461b4, 0x37a1e723), TOBN(0x1f3d4789, 0x570aae8c),
+              TOBN(0x869118c0, 0x7f9871da), TOBN(0x35fbda78, 0xf635e278),
+              TOBN(0x738f3641, 0xe1541dac), TOBN(0x6794b13a, 0xc0dae45f),
+              TOBN(0x065064ac, 0x09cc0917), TOBN(0x27c53729, 0xc68540fd),
+              TOBN(0x0d2d4c8e, 0xef227671), TOBN(0xd23a9f80, 0xa1785a04),
+              TOBN(0x98c59528, 0x52650359), TOBN(0xfa09ad01, 0x74a1acad),
+              TOBN(0x082d5a29, 0x0b55bf5c), TOBN(0xa40f1c67, 0x419b8084),
+              TOBN(0x3a5c752e, 0xdcc18770), TOBN(0x4baf1f2f, 0x8825c3a5),
+              TOBN(0xebd63f74, 0x21b153ed), TOBN(0xa2383e47, 0xb2f64723),
+              TOBN(0xe7bf620a, 0x2646d19a), TOBN(0x56cb44ec, 0x03c83ffd),
+              TOBN(0xaf7267c9, 0x4f6be9f1), TOBN(0x8b2dfd7b, 0xc06bb5e9),
+              TOBN(0xb87072f2, 0xa672c5c7), TOBN(0xeacb11c8, 0x0d53c5e2),
+              TOBN(0x22dac29d, 0xff435932), TOBN(0x37bdb99d, 0x4408693c),
+              TOBN(0xf6e62fb6, 0x2899c20f), TOBN(0x3535d512, 0x447ece24),
+              TOBN(0xfbdc6b88, 0xff577ce3), TOBN(0x726693bd, 0x190575f2),
+              TOBN(0x6772b0e5, 0xab4b35a2), TOBN(0x1d8b6001, 0xf5eeaacf),
+              TOBN(0x728f7ce4, 0x795b9580), TOBN(0x4a20ed2a, 0x41fb81da),
+              TOBN(0x9f685cd4, 0x4fec01e6), TOBN(0x3ed7ddcc, 0xa7ff50ad),
+              TOBN(0x460fd264, 0x0c2d97fd), TOBN(0x3a241426, 0xeb82f4f9),
+              TOBN(0x17d1df2c, 0x6a8ea820), TOBN(0xb2b50d3b, 0xf22cc254),
+              TOBN(0x03856cba, 0xb7291426), TOBN(0x87fd26ae, 0x04f5ee39),
+              TOBN(0x9cb696cc, 0x02bee4ba), TOBN(0x53121804, 0x06820fd6),
+              TOBN(0xa5dfc269, 0x0212e985), TOBN(0x666f7ffa, 0x160f9a09),
+              TOBN(0xc503cd33, 0xbccd9617), TOBN(0x365dede4, 0xba7730a3),
+              TOBN(0x798c6355, 0x5ddb0786), TOBN(0xa6c3200e, 0xfc9cd3bc),
+              TOBN(0x060ffb2c, 0xe5e35efd), TOBN(0x99a4e25b, 0x5555a1c1),
+              TOBN(0x11d95375, 0xf70b3751), TOBN(0x0a57354a, 0x160e1bf6),
+              TOBN(0xecb3ae4b, 0xf8e4b065), TOBN(0x07a834c4, 0x2e53022b),
+              TOBN(0x1cd300b3, 0x8692ed96), TOBN(0x16a6f792, 0x61ee14ec),
+              TOBN(0x8f1063c6, 0x6a8649ed), TOBN(0xfbcdfcfe, 0x869f3e14),
+              TOBN(0x2cfb97c1, 0x00a7b3ec), TOBN(0xcea49b3c, 0x7130c2f1),
+              TOBN(0x462d044f, 0xe9d96488), TOBN(0x4b53d52e, 0x8182a0c1),
+              TOBN(0x84b6ddd3, 0x0391e9e9), TOBN(0x80ab7b48, 0xb1741a09),
+              TOBN(0xec0e15d4, 0x27d3317f), TOBN(0x8dfc1ddb, 0x1a64671e),
+              TOBN(0x93cc5d5f, 0xd49c5b92), TOBN(0xc995d53d, 0x3674a331),
+              TOBN(0x302e41ec, 0x090090ae), TOBN(0x2278a0cc, 0xedb06830),
+              TOBN(0x1d025932, 0xfbc99690), TOBN(0x0c32fbd2, 0xb80d68da),
+              TOBN(0xd79146da, 0xf341a6c1), TOBN(0xae0ba139, 0x1bef68a0),
+              TOBN(0xc6b8a563, 0x8d774b3a), TOBN(0x1cf307bd, 0x880ba4d7),
+              TOBN(0xc033bdc7, 0x19803511), TOBN(0xa9f97b3b, 0x8888c3be),
+              TOBN(0x3d68aebc, 0x85c6d05e), TOBN(0xc3b88a9d, 0x193919eb),
+              TOBN(0x2d300748, 0xc48b0ee3), TOBN(0x7506bc7c, 0x07a746c1),
+              TOBN(0xfc48437c, 0x6e6d57f3), TOBN(0x5bd71587, 0xcfeaa91a),
+              TOBN(0xa4ed0408, 0xc1bc5225), TOBN(0xd0b946db, 0x2719226d),
+              TOBN(0x109ecd62, 0x758d2d43), TOBN(0x75c8485a, 0x2751759b),
+              TOBN(0xb0b75f49, 0x9ce4177a), TOBN(0x4fa61a1e, 0x79c10c3d),
+              TOBN(0xc062d300, 0xa167fcd7), TOBN(0x4df3874c, 0x750f0fa8),
+              TOBN(0x29ae2cf9, 0x83dfedc9), TOBN(0xf8437134, 0x8d87631a),
+              TOBN(0xaf571711, 0x7429c8d2), TOBN(0x18d15867, 0x146d9272),
+              TOBN(0x83053ecf, 0x69769bb7), TOBN(0xc55eb856, 0xc479ab82),
+              TOBN(0x5ef7791c, 0x21b0f4b2), TOBN(0xaa5956ba, 0x3d491525),
+              TOBN(0x407a96c2, 0x9fe20eba), TOBN(0xf27168bb, 0xe52a5ad3),
+              TOBN(0x43b60ab3, 0xbf1d9d89), TOBN(0xe45c51ef, 0x710e727a),
+              TOBN(0xdfca5276, 0x099b4221), TOBN(0x8dc6407c, 0x2557a159),
+              TOBN(0x0ead8335, 0x91035895), TOBN(0x0a9db957, 0x9c55dc32),
+              TOBN(0xe40736d3, 0xdf61bc76), TOBN(0x13a619c0, 0x3f778cdb),
+              TOBN(0x6dd921a4, 0xc56ea28f), TOBN(0x76a52433, 0x2fa647b4),
+              TOBN(0x23591891, 0xac5bdc5d), TOBN(0xff4a1a72, 0xbac7dc01),
+              TOBN(0x9905e261, 0x62df8453), TOBN(0x3ac045df, 0xe63b265f),
+              TOBN(0x8a3f341b, 0xad53dba7), TOBN(0x8ec269cc, 0x837b625a),
+              TOBN(0xd71a2782, 0x3ae31189), TOBN(0x8fb4f9a3, 0x55e96120),
+              TOBN(0x804af823, 0xff9875cf), TOBN(0x23224f57, 0x5d442a9b),
+              TOBN(0x1c4d3b9e, 0xecc62679), TOBN(0x91da22fb, 0xa0e7ddb1),
+              TOBN(0xa370324d, 0x6c04a661), TOBN(0x9710d3b6, 0x5e376d17),
+              TOBN(0xed8c98f0, 0x3044e357), TOBN(0xc364ebbe, 0x6422701c),
+              TOBN(0x347f5d51, 0x7733d61c), TOBN(0xd55644b9, 0xcea826c3),
+              TOBN(0x80c6e0ad, 0x55a25548), TOBN(0x0aa7641d, 0x844220a7),
+              TOBN(0x1438ec81, 0x31810660), TOBN(0x9dfa6507, 0xde4b4043),
+              TOBN(0x10b515d8, 0xcc3e0273), TOBN(0x1b6066dd, 0x28d8cfb2),
+              TOBN(0xd3b04591, 0x9c9efebd), TOBN(0x425d4bdf, 0xa21c1ff4),
+              TOBN(0x5fe5af19, 0xd57607d3), TOBN(0xbbf773f7, 0x54481084),
+              TOBN(0x8435bd69, 0x94b03ed1), TOBN(0xd9ad1de3, 0x634cc546),
+              TOBN(0x2cf423fc, 0x00e420ca), TOBN(0xeed26d80, 0xa03096dd),
+              TOBN(0xd7f60be7, 0xa4db09d2), TOBN(0xf47f569d, 0x960622f7),
+              TOBN(0xe5925fd7, 0x7296c729), TOBN(0xeff2db26, 0x26ca2715),
+              TOBN(0xa6fcd014, 0xb913e759), TOBN(0x53da4786, 0x8ff4de93),
+              TOBN(0x14616d79, 0xc32068e1), TOBN(0xb187d664, 0xccdf352e),
+              TOBN(0xf7afb650, 0x1dc90b59), TOBN(0x8170e943, 0x7daa1b26),
+              TOBN(0xc8e3bdd8, 0x700c0a84), TOBN(0x6e8d345f, 0x6482bdfa),
+              TOBN(0x84cfbfa1, 0xc5c5ea50), TOBN(0xd3baf14c, 0x67960681),
+              TOBN(0x26398403, 0x0dd50942), TOBN(0xe4b7839c, 0x4716a663),
+              TOBN(0xd5f1f794, 0xe7de6dc0), TOBN(0x5cd0f4d4, 0x622aa7ce),
+              TOBN(0x5295f3f1, 0x59acfeec), TOBN(0x8d933552, 0x953e0607),
+              TOBN(0xc7db8ec5, 0x776c5722), TOBN(0xdc467e62, 0x2b5f290c),
+              TOBN(0xd4297e70, 0x4ff425a9), TOBN(0x4be924c1, 0x0cf7bb72),
+              TOBN(0x0d5dc5ae, 0xa1892131), TOBN(0x8bf8a8e3, 0xa705c992),
+              TOBN(0x73a0b064, 0x7a305ac5), TOBN(0x00c9ca4e, 0x9a8c77a8),
+              TOBN(0x5dfee80f, 0x83774bdd), TOBN(0x63131602, 0x85734485),
+              TOBN(0xa1b524ae, 0x914a69a9), TOBN(0xebc2ffaf, 0xd4e300d7),
+              TOBN(0x52c93db7, 0x7cfa46a5), TOBN(0x71e6161f, 0x21653b50),
+              TOBN(0x3574fc57, 0xa4bc580a), TOBN(0xc09015dd, 0xe1bc1253),
+              TOBN(0x4b7b47b2, 0xd174d7aa), TOBN(0x4072d8e8, 0xf3a15d04),
+              TOBN(0xeeb7d47f, 0xd6fa07ed), TOBN(0x6f2b9ff9, 0xedbdafb1),
+              TOBN(0x18c51615, 0x3760fe8a), TOBN(0x7a96e6bf, 0xf06c6c13),
+              TOBN(0x4d7a0410, 0x0ea2d071), TOBN(0xa1914e9b, 0x0be2a5ce),
+              TOBN(0x5726e357, 0xd8a3c5cf), TOBN(0x1197ecc3, 0x2abb2b13),
+              TOBN(0x6c0d7f7f, 0x31ae88dd), TOBN(0x15b20d1a, 0xfdbb3efe),
+              TOBN(0xcd06aa26, 0x70584039), TOBN(0x2277c969, 0xa7dc9747),
+              TOBN(0xbca69587, 0x7855d815), TOBN(0x899ea238, 0x5188b32a),
+              TOBN(0x37d9228b, 0x760c1c9d), TOBN(0xc7efbb11, 0x9b5c18da),
+              TOBN(0x7f0d1bc8, 0x19f6dbc5), TOBN(0x4875384b, 0x07e6905b),
+              TOBN(0xc7c50baa, 0x3ba8cd86), TOBN(0xb0ce40fb, 0xc2905de0),
+              TOBN(0x70840673, 0x7a231952), TOBN(0xa912a262, 0xcf43de26),
+              TOBN(0x9c38ddcc, 0xeb5b76c1), TOBN(0x746f5285, 0x26fc0ab4),
+              TOBN(0x52a63a50, 0xd62c269f), TOBN(0x60049c55, 0x99458621),
+              TOBN(0xe7f48f82, 0x3c2f7c9e), TOBN(0x6bd99043, 0x917d5cf3),
+              TOBN(0xeb1317a8, 0x8701f469), TOBN(0xbd3fe2ed, 0x9a449fe0),
+              TOBN(0x421e79ca, 0x12ef3d36), TOBN(0x9ee3c36c, 0x3e7ea5de),
+              TOBN(0xe48198b5, 0xcdff36f7), TOBN(0xaff4f967, 0xc6b82228),
+              TOBN(0x15e19dd0, 0xc47adb7e), TOBN(0x45699b23, 0x032e7dfa),
+              TOBN(0x40680c8b, 0x1fae026a), TOBN(0x5a347a48, 0x550dbf4d),
+              TOBN(0xe652533b, 0x3cef0d7d), TOBN(0xd94f7b18, 0x2bbb4381),
+              TOBN(0x838752be, 0x0e80f500), TOBN(0x8e6e2488, 0x9e9c9bfb),
+              TOBN(0xc9751697, 0x16caca6a), TOBN(0x866c49d8, 0x38531ad9),
+              TOBN(0xc917e239, 0x7151ade1), TOBN(0x2d016ec1, 0x6037c407),
+              TOBN(0xa407ccc9, 0x00eac3f9), TOBN(0x835f6280, 0xe2ed4748),
+              TOBN(0xcc54c347, 0x1cc98e0d), TOBN(0x0e969937, 0xdcb572eb),
+              TOBN(0x1b16c8e8, 0x8f30c9cb), TOBN(0xa606ae75, 0x373c4661),
+              TOBN(0x47aa689b, 0x35502cab), TOBN(0xf89014ae, 0x4d9bb64f),
+              TOBN(0x202f6a9c, 0x31c71f7b), TOBN(0x01f95aa3, 0x296ffe5c),
+              TOBN(0x5fc06014, 0x53cec3a3), TOBN(0xeb991237, 0x5f498a45),
+              TOBN(0xae9a935e, 0x5d91ba87), TOBN(0xc6ac6281, 0x0b564a19),
+              TOBN(0x8a8fe81c, 0x3bd44e69), TOBN(0x7c8b467f, 0x9dd11d45),
+              TOBN(0xf772251f, 0xea5b8e69), TOBN(0xaeecb3bd, 0xc5b75fbc),
+              TOBN(0x1aca3331, 0x887ff0e5), TOBN(0xbe5d49ff, 0x19f0a131),
+              TOBN(0x582c13aa, 0xe5c8646f), TOBN(0xdbaa12e8, 0x20e19980),
+              TOBN(0x8f40f31a, 0xf7abbd94), TOBN(0x1f13f5a8, 0x1dfc7663),
+              TOBN(0x5d81f1ee, 0xaceb4fc0), TOBN(0x36256002, 0x5e6f0f42),
+              TOBN(0x4b67d6d7, 0x751370c8), TOBN(0x2608b698, 0x03e80589),
+              TOBN(0xcfc0d2fc, 0x05268301), TOBN(0xa6943d39, 0x40309212),
+              TOBN(0x192a90c2, 0x1fd0e1c2), TOBN(0xb209f113, 0x37f1dc76),
+              TOBN(0xefcc5e06, 0x97bf1298), TOBN(0xcbdb6730, 0x219d639e),
+              TOBN(0xd009c116, 0xb81e8c6f), TOBN(0xa3ffdde3, 0x1a7ce2e5),
+              TOBN(0xc53fbaaa, 0xa914d3ba), TOBN(0x836d500f, 0x88df85ee),
+              TOBN(0xd98dc71b, 0x66ee0751), TOBN(0x5a3d7005, 0x714516fd),
+              TOBN(0x21d3634d, 0x39eedbba), TOBN(0x35cd2e68, 0x0455a46d),
+              TOBN(0xc8cafe65, 0xf9d7eb0c), TOBN(0xbda3ce9e, 0x00cefb3e),
+              TOBN(0xddc17a60, 0x2c9cf7a4), TOBN(0x01572ee4, 0x7bcb8773),
+              TOBN(0xa92b2b01, 0x8c7548df), TOBN(0x732fd309, 0xa84600e3),
+              TOBN(0xe22109c7, 0x16543a40), TOBN(0x9acafd36, 0xfede3c6c),
+              TOBN(0xfb206852, 0x6824e614), TOBN(0x2a4544a9, 0xda25dca0),
+              TOBN(0x25985262, 0x91d60b06), TOBN(0x281b7be9, 0x28753545),
+              TOBN(0xec667b1a, 0x90f13b27), TOBN(0x33a83aff, 0x940e2eb4),
+              TOBN(0x80009862, 0xd5d721d5), TOBN(0x0c3357a3, 0x5bd3a182),
+              TOBN(0x27f3a83b, 0x7aa2cda4), TOBN(0xb58ae74e, 0xf6f83085),
+              TOBN(0x2a911a81, 0x2e6dad6b), TOBN(0xde286051, 0xf43d6c5b),
+              TOBN(0x4bdccc41, 0xf996c4d8), TOBN(0xe7312ec0, 0x0ae1e24e) },
+          { TOBN(0xf8d112e7, 0x6e6485b3), TOBN(0x4d3e24db, 0x771c52f8),
+              TOBN(0x48e3ee41, 0x684a2f6d), TOBN(0x7161957d, 0x21d95551),
+              TOBN(0x19631283, 0xcdb12a6c), TOBN(0xbf3fa882, 0x2e50e164),
+              TOBN(0xf6254b63, 0x3166cc73), TOBN(0x3aefa7ae, 0xaee8cc38),
+              TOBN(0x79b0fe62, 0x3b36f9fd), TOBN(0x26543b23, 0xfde19fc0),
+              TOBN(0x136e64a0, 0x958482ef), TOBN(0x23f63771, 0x9b095825),
+              TOBN(0x14cfd596, 0xb6a1142e), TOBN(0x5ea6aac6, 0x335aac0b),
+              TOBN(0x86a0e8bd, 0xf3081dd5), TOBN(0x5fb89d79, 0x003dc12a),
+              TOBN(0xf615c33a, 0xf72e34d4), TOBN(0x0bd9ea40, 0x110eec35),
+              TOBN(0x1c12bc5b, 0xc1dea34e), TOBN(0x686584c9, 0x49ae4699),
+              TOBN(0x13ad95d3, 0x8c97b942), TOBN(0x4609561a, 0x4e5c7562),
+              TOBN(0x9e94a4ae, 0xf2737f89), TOBN(0xf57594c6, 0x371c78b6),
+              TOBN(0x0f0165fc, 0xe3779ee3), TOBN(0xe00e7f9d, 0xbd495d9e),
+              TOBN(0x1fa4efa2, 0x20284e7a), TOBN(0x4564bade, 0x47ac6219),
+              TOBN(0x90e6312a, 0xc4708e8e), TOBN(0x4f5725fb, 0xa71e9adf),
+              TOBN(0xe95f55ae, 0x3d684b9f), TOBN(0x47f7ccb1, 0x1e94b415),
+              TOBN(0x7322851b, 0x8d946581), TOBN(0xf0d13133, 0xbdf4a012),
+              TOBN(0xa3510f69, 0x6584dae0), TOBN(0x03a7c171, 0x3c9f6c6d),
+              TOBN(0x5be97f38, 0xe475381a), TOBN(0xca1ba422, 0x85823334),
+              TOBN(0xf83cc5c7, 0x0be17dda), TOBN(0x158b1494, 0x0b918c0f),
+              TOBN(0xda3a77e5, 0x522e6b69), TOBN(0x69c908c3, 0xbbcd6c18),
+              TOBN(0x1f1b9e48, 0xd924fd56), TOBN(0x37c64e36, 0xaa4bb3f7),
+              TOBN(0x5a4fdbdf, 0xee478d7d), TOBN(0xba75c8bc, 0x0193f7a0),
+              TOBN(0x84bc1e84, 0x56cd16df), TOBN(0x1fb08f08, 0x46fad151),
+              TOBN(0x8a7cabf9, 0x842e9f30), TOBN(0xa331d4bf, 0x5eab83af),
+              TOBN(0xd272cfba, 0x017f2a6a), TOBN(0x27560abc, 0x83aba0e3),
+              TOBN(0x94b83387, 0x0e3a6b75), TOBN(0x25c6aea2, 0x6b9f50f5),
+              TOBN(0x803d691d, 0xb5fdf6d0), TOBN(0x03b77509, 0xe6333514),
+              TOBN(0x36178903, 0x61a341c1), TOBN(0x3604dc60, 0x0cfd6142),
+              TOBN(0x022295eb, 0x8533316c), TOBN(0x3dbde4ac, 0x44af2922),
+              TOBN(0x898afc5d, 0x1c7eef69), TOBN(0x58896805, 0xd14f4fa1),
+              TOBN(0x05002160, 0x203c21ca), TOBN(0x6f0d1f30, 0x40ef730b),
+              TOBN(0x8e8c44d4, 0x196224f8), TOBN(0x75a4ab95, 0x374d079d),
+              TOBN(0x79085ecc, 0x7d48f123), TOBN(0x56f04d31, 0x1bf65ad8),
+              TOBN(0xe220bf1c, 0xbda602b2), TOBN(0x73ee1742, 0xf9612c69),
+              TOBN(0x76008fc8, 0x084fd06b), TOBN(0x4000ef9f, 0xf11380d1),
+              TOBN(0x48201b4b, 0x12cfe297), TOBN(0x3eee129c, 0x292f74e5),
+              TOBN(0xe1fe114e, 0xc9e874e8), TOBN(0x899b055c, 0x92c5fc41),
+              TOBN(0x4e477a64, 0x3a39c8cf), TOBN(0x82f09efe, 0x78963cc9),
+              TOBN(0x6fd3fd8f, 0xd333f863), TOBN(0x85132b2a, 0xdc949c63),
+              TOBN(0x7e06a3ab, 0x516eb17b), TOBN(0x73bec06f, 0xd2c7372b),
+              TOBN(0xe4f74f55, 0xba896da6), TOBN(0xbb4afef8, 0x8e9eb40f),
+              TOBN(0x2d75bec8, 0xe61d66b0), TOBN(0x02bda4b4, 0xef29300b),
+              TOBN(0x8bbaa8de, 0x026baa5a), TOBN(0xff54befd, 0xa07f4440),
+              TOBN(0xbd9b8b1d, 0xbe7a2af3), TOBN(0xec51caa9, 0x4fb74a72),
+              TOBN(0xb9937a4b, 0x63879697), TOBN(0x7c9a9d20, 0xec2687d5),
+              TOBN(0x1773e44f, 0x6ef5f014), TOBN(0x8abcf412, 0xe90c6900),
+              TOBN(0x387bd022, 0x8142161e), TOBN(0x50393755, 0xfcb6ff2a),
+              TOBN(0x9813fd56, 0xed6def63), TOBN(0x53cf6482, 0x7d53106c),
+              TOBN(0x991a35bd, 0x431f7ac1), TOBN(0xf1e274dd, 0x63e65faf),
+              TOBN(0xf63ffa3c, 0x44cc7880), TOBN(0x411a426b, 0x7c256981),
+              TOBN(0xb698b9fd, 0x93a420e0), TOBN(0x89fdddc0, 0xae53f8fe),
+              TOBN(0x766e0722, 0x32398baa), TOBN(0x205fee42, 0x5cfca031),
+              TOBN(0xa49f5341, 0x7a029cf2), TOBN(0xa88c68b8, 0x4023890d),
+              TOBN(0xbc275041, 0x7337aaa8), TOBN(0x9ed364ad, 0x0eb384f4),
+              TOBN(0xe0816f85, 0x29aba92f), TOBN(0x2e9e1941, 0x04e38a88),
+              TOBN(0x57eef44a, 0x3dafd2d5), TOBN(0x35d1fae5, 0x97ed98d8),
+              TOBN(0x50628c09, 0x2307f9b1), TOBN(0x09d84aae, 0xd6cba5c6),
+              TOBN(0x67071bc7, 0x88aaa691), TOBN(0x2dea57a9, 0xafe6cb03),
+              TOBN(0xdfe11bb4, 0x3d78ac01), TOBN(0x7286418c, 0x7fd7aa51),
+              TOBN(0xfabf7709, 0x77f7195a), TOBN(0x8ec86167, 0xadeb838f),
+              TOBN(0xea1285a8, 0xbb4f012d), TOBN(0xd6883503, 0x9a3eab3f),
+              TOBN(0xee5d24f8, 0x309004c2), TOBN(0xa96e4b76, 0x13ffe95e),
+              TOBN(0x0cdffe12, 0xbd223ea4), TOBN(0x8f5c2ee5, 0xb6739a53),
+              TOBN(0x5cb4aaa5, 0xdd968198), TOBN(0xfa131c52, 0x72413a6c),
+              TOBN(0x53d46a90, 0x9536d903), TOBN(0xb270f0d3, 0x48606d8e),
+              TOBN(0x518c7564, 0xa053a3bc), TOBN(0x088254b7, 0x1a86caef),
+              TOBN(0xb3ba8cb4, 0x0ab5efd0), TOBN(0x5c59900e, 0x4605945d),
+              TOBN(0xecace1dd, 0xa1887395), TOBN(0x40960f36, 0x932a65de),
+              TOBN(0x9611ff5c, 0x3aa95529), TOBN(0xc58215b0, 0x7c1e5a36),
+              TOBN(0xd48c9b58, 0xf0e1a524), TOBN(0xb406856b, 0xf590dfb8),
+              TOBN(0xc7605e04, 0x9cd95662), TOBN(0x0dd036ee, 0xa33ecf82),
+              TOBN(0xa50171ac, 0xc33156b3), TOBN(0xf09d24ea, 0x4a80172e),
+              TOBN(0x4e1f72c6, 0x76dc8eef), TOBN(0xe60caadc, 0x5e3d44ee),
+              TOBN(0x006ef8a6, 0x979b1d8f), TOBN(0x60908a1c, 0x97788d26),
+              TOBN(0x6e08f95b, 0x266feec0), TOBN(0x618427c2, 0x22e8c94e),
+              TOBN(0x3d613339, 0x59145a65), TOBN(0xcd9bc368, 0xfa406337),
+              TOBN(0x82d11be3, 0x2d8a52a0), TOBN(0xf6877b27, 0x97a1c590),
+              TOBN(0x837a819b, 0xf5cbdb25), TOBN(0x2a4fd1d8, 0xde090249),
+              TOBN(0x622a7de7, 0x74990e5f), TOBN(0x840fa5a0, 0x7945511b),
+              TOBN(0x30b974be, 0x6558842d), TOBN(0x70df8c64, 0x17f3d0a6),
+              TOBN(0x7c803520, 0x7542e46d), TOBN(0x7251fe7f, 0xe4ecc823),
+              TOBN(0xe59134cb, 0x5e9aac9a), TOBN(0x11bb0934, 0xf0045d71),
+              TOBN(0x53e5d9b5, 0xdbcb1d4e), TOBN(0x8d97a905, 0x92defc91),
+              TOBN(0xfe289327, 0x7946d3f9), TOBN(0xe132bd24, 0x07472273),
+              TOBN(0xeeeb510c, 0x1eb6ae86), TOBN(0x777708c5, 0xf0595067),
+              TOBN(0x18e2c8cd, 0x1297029e), TOBN(0x2c61095c, 0xbbf9305e),
+              TOBN(0xe466c258, 0x6b85d6d9), TOBN(0x8ac06c36, 0xda1ea530),
+              TOBN(0xa365dc39, 0xa1304668), TOBN(0xe4a9c885, 0x07f89606),
+              TOBN(0x65a4898f, 0xacc7228d), TOBN(0x3e2347ff, 0x84ca8303),
+              TOBN(0xa5f6fb77, 0xea7d23a3), TOBN(0x2fac257d, 0x672a71cd),
+              TOBN(0x6908bef8, 0x7e6a44d3), TOBN(0x8ff87566, 0x891d3d7a),
+              TOBN(0xe58e90b3, 0x6b0cf82e), TOBN(0x6438d246, 0x2615b5e7),
+              TOBN(0x07b1f8fc, 0x669c145a), TOBN(0xb0d8b2da, 0x36f1e1cb),
+              TOBN(0x54d5dadb, 0xd9184c4d), TOBN(0x3dbb18d5, 0xf93d9976),
+              TOBN(0x0a3e0f56, 0xd1147d47), TOBN(0x2afa8c8d, 0xa0a48609),
+              TOBN(0x275353e8, 0xbc36742c), TOBN(0x898f427e, 0xeea0ed90),
+              TOBN(0x26f4947e, 0x3e477b00), TOBN(0x8ad8848a, 0x308741e3),
+              TOBN(0x6c703c38, 0xd74a2a46), TOBN(0x5e3e05a9, 0x9ba17ba2),
+              TOBN(0xc1fa6f66, 0x4ab9a9e4), TOBN(0x474a2d9a, 0x3841d6ec),
+              TOBN(0x871239ad, 0x653ae326), TOBN(0x14bcf72a, 0xa74cbb43),
+              TOBN(0x8737650e, 0x20d4c083), TOBN(0x3df86536, 0x110ed4af),
+              TOBN(0xd2d86fe7, 0xb53ca555), TOBN(0x688cb00d, 0xabd5d538),
+              TOBN(0xcf81bda3, 0x1ad38468), TOBN(0x7ccfe3cc, 0xf01167b6),
+              TOBN(0xcf4f47e0, 0x6c4c1fe6), TOBN(0x557e1f1a, 0x298bbb79),
+              TOBN(0xf93b974f, 0x30d45a14), TOBN(0x174a1d2d, 0x0baf97c4),
+              TOBN(0x7a003b30, 0xc51fbf53), TOBN(0xd8940991, 0xee68b225),
+              TOBN(0x5b0aa7b7, 0x1c0f4173), TOBN(0x975797c9, 0xa20a7153),
+              TOBN(0x26e08c07, 0xe3533d77), TOBN(0xd7222e6a, 0x2e341c99),
+              TOBN(0x9d60ec3d, 0x8d2dc4ed), TOBN(0xbdfe0d8f, 0x7c476cf8),
+              TOBN(0x1fe59ab6, 0x1d056605), TOBN(0xa9ea9df6, 0x86a8551f),
+              TOBN(0x8489941e, 0x47fb8d8c), TOBN(0xfeb874eb, 0x4a7f1b10),
+              TOBN(0xfe5fea86, 0x7ee0d98f), TOBN(0x201ad34b, 0xdbf61864),
+              TOBN(0x45d8fe47, 0x37c031d4), TOBN(0xd5f49fae, 0x795f0822),
+              TOBN(0xdb0fb291, 0xc7f4a40c), TOBN(0x2e69d9c1, 0x730ddd92),
+              TOBN(0x754e1054, 0x49d76987), TOBN(0x8a24911d, 0x7662db87),
+              TOBN(0x61fc1810, 0x60a71676), TOBN(0xe852d1a8, 0xf66a8ad1),
+              TOBN(0x172bbd65, 0x6417231e), TOBN(0x0d6de7bd, 0x3babb11f),
+              TOBN(0x6fde6f88, 0xc8e347f8), TOBN(0x1c587547, 0x9bd99cc3),
+              TOBN(0x78e54ed0, 0x34076950), TOBN(0x97f0f334, 0x796e83ba),
+              TOBN(0xe4dbe1ce, 0x4924867a), TOBN(0xbd5f51b0, 0x60b84917),
+              TOBN(0x37530040, 0x3cb09a79), TOBN(0xdb3fe0f8, 0xff1743d8),
+              TOBN(0xed7894d8, 0x556fa9db), TOBN(0xfa262169, 0x23412fbf),
+              TOBN(0x563be0db, 0xba7b9291), TOBN(0x6ca8b8c0, 0x0c9fb234),
+              TOBN(0xed406aa9, 0xbd763802), TOBN(0xc21486a0, 0x65303da1),
+              TOBN(0x61ae291e, 0xc7e62ec4), TOBN(0x622a0492, 0xdf99333e),
+              TOBN(0x7fd80c9d, 0xbb7a8ee0), TOBN(0xdc2ed3bc, 0x6c01aedb),
+              TOBN(0x35c35a12, 0x08be74ec), TOBN(0xd540cb1a, 0x469f671f),
+              TOBN(0xd16ced4e, 0xcf84f6c7), TOBN(0x8561fb9c, 0x2d090f43),
+              TOBN(0x7e693d79, 0x6f239db4), TOBN(0xa736f928, 0x77bd0d94),
+              TOBN(0x07b4d929, 0x2c1950ee), TOBN(0xda177543, 0x56dc11b3),
+              TOBN(0xa5dfbbaa, 0x7a6a878e), TOBN(0x1c70cb29, 0x4decb08a),
+              TOBN(0xfba28c8b, 0x6f0f7c50), TOBN(0xa8eba2b8, 0x854dcc6d),
+              TOBN(0x5ff8e89a, 0x36b78642), TOBN(0x070c1c8e, 0xf6873adf),
+              TOBN(0xbbd3c371, 0x6484d2e4), TOBN(0xfb78318f, 0x0d414129),
+              TOBN(0x2621a39c, 0x6ad93b0b), TOBN(0x979d74c2, 0xa9e917f7),
+              TOBN(0xfc195647, 0x61fb0428), TOBN(0x4d78954a, 0xbee624d4),
+              TOBN(0xb94896e0, 0xb8ae86fd), TOBN(0x6667ac0c, 0xc91c8b13),
+              TOBN(0x9f180512, 0x43bcf832), TOBN(0xfbadf8b7, 0xa0010137),
+              TOBN(0xc69b4089, 0xb3ba8aa7), TOBN(0xfac4bacd, 0xe687ce85),
+              TOBN(0x9164088d, 0x977eab40), TOBN(0x51f4c5b6, 0x2760b390),
+              TOBN(0xd238238f, 0x340dd553), TOBN(0x358566c3, 0xdb1d31c9),
+              TOBN(0x3a5ad69e, 0x5068f5ff), TOBN(0xf31435fc, 0xdaff6b06),
+              TOBN(0xae549a5b, 0xd6debff0), TOBN(0x59e5f0b7, 0x75e01331),
+              TOBN(0x5d492fb8, 0x98559acf), TOBN(0x96018c2e, 0x4db79b50),
+              TOBN(0x55f4a48f, 0x609f66aa), TOBN(0x1943b3af, 0x4900a14f),
+              TOBN(0xc22496df, 0x15a40d39), TOBN(0xb2a44684, 0x4c20f7c5),
+              TOBN(0x76a35afa, 0x3b98404c), TOBN(0xbec75725, 0xff5d1b77),
+              TOBN(0xb67aa163, 0xbea06444), TOBN(0x27e95bb2, 0xf724b6f2),
+              TOBN(0x3c20e3e9, 0xd238c8ab), TOBN(0x1213754e, 0xddd6ae17),
+              TOBN(0x8c431020, 0x716e0f74), TOBN(0x6679c82e, 0xffc095c2),
+              TOBN(0x2eb3adf4, 0xd0ac2932), TOBN(0x2cc970d3, 0x01bb7a76),
+              TOBN(0x70c71f2f, 0x740f0e66), TOBN(0x545c616b, 0x2b6b23cc),
+              TOBN(0x4528cfcb, 0xb40a8bd7), TOBN(0xff839633, 0x2ab27722),
+              TOBN(0x049127d9, 0x025ac99a), TOBN(0xd314d4a0, 0x2b63e33b),
+              TOBN(0xc8c310e7, 0x28d84519), TOBN(0x0fcb8983, 0xb3bc84ba),
+              TOBN(0x2cc52261, 0x38634818), TOBN(0x501814f4, 0xb44c2e0b),
+              TOBN(0xf7e181aa, 0x54dfdba3), TOBN(0xcfd58ff0, 0xe759718c),
+              TOBN(0xf90cdb14, 0xd3b507a8), TOBN(0x57bd478e, 0xc50bdad8),
+              TOBN(0x29c197e2, 0x50e5f9aa), TOBN(0x4db6eef8, 0xe40bc855),
+              TOBN(0x2cc8f21a, 0xd1fc0654), TOBN(0xc71cc963, 0x81269d73),
+              TOBN(0xecfbb204, 0x077f49f9), TOBN(0xdde92571, 0xca56b793),
+              TOBN(0x9abed6a3, 0xf97ad8f7), TOBN(0xe6c19d3f, 0x924de3bd),
+              TOBN(0x8dce92f4, 0xa140a800), TOBN(0x85f44d1e, 0x1337af07),
+              TOBN(0x5953c08b, 0x09d64c52), TOBN(0xa1b5e49f, 0xf5df9749),
+              TOBN(0x336a8fb8, 0x52735f7d), TOBN(0xb332b6db, 0x9add676b),
+              TOBN(0x558b88a0, 0xb4511aa4), TOBN(0x09788752, 0xdbd5cc55),
+              TOBN(0x16b43b9c, 0xd8cd52bd), TOBN(0x7f0bc5a0, 0xc2a2696b),
+              TOBN(0x146e12d4, 0xc11f61ef), TOBN(0x9ce10754, 0x3a83e79e),
+              TOBN(0x08ec73d9, 0x6cbfca15), TOBN(0x09ff29ad, 0x5b49653f),
+              TOBN(0xe31b72bd, 0xe7da946e), TOBN(0xebf9eb3b, 0xee80a4f2),
+              TOBN(0xd1aabd08, 0x17598ce4), TOBN(0x18b5fef4, 0x53f37e80),
+              TOBN(0xd5d5cdd3, 0x5958cd79), TOBN(0x3580a1b5, 0x1d373114),
+              TOBN(0xa36e4c91, 0xfa935726), TOBN(0xa38c534d, 0xef20d760),
+              TOBN(0x7088e40a, 0x2ff5845b), TOBN(0xe5bb40bd, 0xbd78177f),
+              TOBN(0x4f06a7a8, 0x857f9920), TOBN(0xe3cc3e50, 0xe968f05d),
+              TOBN(0x1d68b7fe, 0xe5682d26), TOBN(0x5206f76f, 0xaec7f87c),
+              TOBN(0x41110530, 0x041951ab), TOBN(0x58ec52c1, 0xd4b5a71a),
+              TOBN(0xf3488f99, 0x0f75cf9a), TOBN(0xf411951f, 0xba82d0d5),
+              TOBN(0x27ee75be, 0x618895ab), TOBN(0xeae060d4, 0x6d8aab14),
+              TOBN(0x9ae1df73, 0x7fb54dc2), TOBN(0x1f3e391b, 0x25963649),
+              TOBN(0x242ec32a, 0xfe055081), TOBN(0x5bd450ef, 0x8491c9bd),
+              TOBN(0x367efc67, 0x981eb389), TOBN(0xed7e1928, 0x3a0550d5),
+              TOBN(0x362e776b, 0xab3ce75c), TOBN(0xe890e308, 0x1f24c523),
+              TOBN(0xb961b682, 0xfeccef76), TOBN(0x8b8e11f5, 0x8bba6d92),
+              TOBN(0x8f2ccc4c, 0x2b2375c4), TOBN(0x0d7f7a52, 0xe2f86cfa),
+              TOBN(0xfd94d30a, 0x9efe5633), TOBN(0x2d8d246b, 0x5451f934),
+              TOBN(0x2234c6e3, 0x244e6a00), TOBN(0xde2b5b0d, 0xddec8c50),
+              TOBN(0x2ce53c5a, 0xbf776f5b), TOBN(0x6f724071, 0x60357b05),
+              TOBN(0xb2593717, 0x71bf3f7a), TOBN(0x87d2501c, 0x440c4a9f),
+              TOBN(0x440552e1, 0x87b05340), TOBN(0xb7bf7cc8, 0x21624c32),
+              TOBN(0x4155a6ce, 0x22facddb), TOBN(0x5a4228cb, 0x889837ef),
+              TOBN(0xef87d6d6, 0xfd4fd671), TOBN(0xa233687e, 0xc2daa10e),
+              TOBN(0x75622244, 0x03c0eb96), TOBN(0x7632d184, 0x8bf19be6),
+              TOBN(0x05d0f8e9, 0x40735ff4), TOBN(0x3a3e6e13, 0xc00931f1),
+              TOBN(0x31ccde6a, 0xdafe3f18), TOBN(0xf381366a, 0xcfe51207),
+              TOBN(0x24c222a9, 0x60167d92), TOBN(0x62f9d6f8, 0x7529f18c),
+              TOBN(0x412397c0, 0x0353b114), TOBN(0x334d89dc, 0xef808043),
+              TOBN(0xd9ec63ba, 0x2a4383ce), TOBN(0xcec8e937, 0x5cf92ba0),
+              TOBN(0xfb8b4288, 0xc8be74c0), TOBN(0x67d6912f, 0x105d4391),
+              TOBN(0x7b996c46, 0x1b913149), TOBN(0x36aae2ef, 0x3a4e02da),
+              TOBN(0xb68aa003, 0x972de594), TOBN(0x284ec70d, 0x4ec6d545),
+              TOBN(0xf3d2b2d0, 0x61391d54), TOBN(0x69c5d5d6, 0xfe114e92),
+              TOBN(0xbe0f00b5, 0xb4482dff), TOBN(0xe1596fa5, 0xf5bf33c5),
+              TOBN(0x10595b56, 0x96a71cba), TOBN(0x944938b2, 0xfdcadeb7),
+              TOBN(0xa282da4c, 0xfccd8471), TOBN(0x98ec05f3, 0x0d37bfe1),
+              TOBN(0xe171ce1b, 0x0698304a), TOBN(0x2d691444, 0x21bdf79b),
+              TOBN(0xd0cd3b74, 0x1b21dec1), TOBN(0x712ecd8b, 0x16a15f71),
+              TOBN(0x8d4c00a7, 0x00fd56e1), TOBN(0x02ec9692, 0xf9527c18),
+              TOBN(0x21c44937, 0x4a3e42e1), TOBN(0x9176fbab, 0x1392ae0a),
+              TOBN(0x8726f1ba, 0x44b7b618), TOBN(0xb4d7aae9, 0xf1de491c),
+              TOBN(0xf91df7b9, 0x07b582c0), TOBN(0x7e116c30, 0xef60aa3a),
+              TOBN(0x99270f81, 0x466265d7), TOBN(0xb15b6fe2, 0x4df7adf0),
+              TOBN(0xfe33b2d3, 0xf9738f7f), TOBN(0x48553ab9, 0xd6d70f95),
+              TOBN(0x2cc72ac8, 0xc21e94db), TOBN(0x795ac38d, 0xbdc0bbee),
+              TOBN(0x0a1be449, 0x2e40478f), TOBN(0x81bd3394, 0x052bde55),
+              TOBN(0x63c8dbe9, 0x56b3c4f2), TOBN(0x017a99cf, 0x904177cc),
+              TOBN(0x947bbddb, 0x4d010fc1), TOBN(0xacf9b00b, 0xbb2c9b21),
+              TOBN(0x2970bc8d, 0x47173611), TOBN(0x1a4cbe08, 0xac7d756f),
+              TOBN(0x06d9f4aa, 0x67d541a2), TOBN(0xa3e8b689, 0x59c2cf44),
+              TOBN(0xaad066da, 0x4d88f1dd), TOBN(0xc604f165, 0x7ad35dea),
+              TOBN(0x7edc0720, 0x4478ca67), TOBN(0xa10dfae0, 0xba02ce06),
+              TOBN(0xeceb1c76, 0xaf36f4e4), TOBN(0x994b2292, 0xaf3f8f48),
+              TOBN(0xbf9ed77b, 0x77c8a68c), TOBN(0x74f544ea, 0x51744c9d),
+              TOBN(0x82d05bb9, 0x8113a757), TOBN(0x4ef2d2b4, 0x8a9885e4),
+              TOBN(0x1e332be5, 0x1aa7865f), TOBN(0x22b76b18, 0x290d1a52),
+              TOBN(0x308a2310, 0x44351683), TOBN(0x9d861896, 0xa3f22840),
+              TOBN(0x5959ddcd, 0x841ed947), TOBN(0x0def0c94, 0x154b73bf),
+              TOBN(0xf0105417, 0x4c7c15e0), TOBN(0x539bfb02, 0x3a277c32),
+              TOBN(0xe699268e, 0xf9dccf5f), TOBN(0x9f5796a5, 0x0247a3bd),
+              TOBN(0x8b839de8, 0x4f157269), TOBN(0xc825c1e5, 0x7a30196b),
+              TOBN(0x6ef0aabc, 0xdc8a5a91), TOBN(0xf4a8ce6c, 0x498b7fe6),
+              TOBN(0x1cce35a7, 0x70cbac78), TOBN(0x83488e9b, 0xf6b23958),
+              TOBN(0x0341a070, 0xd76cb011), TOBN(0xda6c9d06, 0xae1b2658),
+              TOBN(0xb701fb30, 0xdd648c52), TOBN(0x994ca02c, 0x52fb9fd1),
+              TOBN(0x06933117, 0x6f563086), TOBN(0x3d2b8100, 0x17856bab),
+              TOBN(0xe89f48c8, 0x5963a46e), TOBN(0x658ab875, 0xa99e61c7),
+              TOBN(0x6e296f87, 0x4b8517b4), TOBN(0x36c4fcdc, 0xfc1bc656),
+              TOBN(0xde5227a1, 0xa3906def), TOBN(0x9fe95f57, 0x62418945),
+              TOBN(0x20c91e81, 0xfdd96cde), TOBN(0x5adbe47e, 0xda4480de),
+              TOBN(0xa009370f, 0x396de2b6), TOBN(0x98583d4b, 0xf0ecc7bd),
+              TOBN(0xf44f6b57, 0xe51d0672), TOBN(0x03d6b078, 0x556b1984),
+              TOBN(0x27dbdd93, 0xb0b64912), TOBN(0x9b3a3434, 0x15687b09),
+              TOBN(0x0dba6461, 0x51ec20a9), TOBN(0xec93db7f, 0xff28187c),
+              TOBN(0x00ff8c24, 0x66e48bdd), TOBN(0x2514f2f9, 0x11ccd78e),
+              TOBN(0xeba11f4f, 0xe1250603), TOBN(0x8a22cd41, 0x243fa156),
+              TOBN(0xa4e58df4, 0xb283e4c6), TOBN(0x78c29859, 0x8b39783f),
+              TOBN(0x5235aee2, 0xa5259809), TOBN(0xc16284b5, 0x0e0227dd),
+              TOBN(0xa5f57916, 0x1338830d), TOBN(0x6d4b8a6b, 0xd2123fca),
+              TOBN(0x236ea68a, 0xf9c546f8), TOBN(0xc1d36873, 0xfa608d36),
+              TOBN(0xcd76e495, 0x8d436d13), TOBN(0xd4d9c221, 0x8fb080af),
+              TOBN(0x665c1728, 0xe8ad3fb5), TOBN(0xcf1ebe4d, 0xb3d572e0),
+              TOBN(0xa7a8746a, 0x584c5e20), TOBN(0x267e4ea1, 0xb9dc7035),
+              TOBN(0x593a15cf, 0xb9548c9b), TOBN(0x5e6e2135, 0x4bd012f3),
+              TOBN(0xdf31cc6a, 0x8c8f936e), TOBN(0x8af84d04, 0xb5c241dc),
+              TOBN(0x63990a6f, 0x345efb86), TOBN(0x6fef4e61, 0xb9b962cb) },
+          { TOBN(0xf6368f09, 0x25722608), TOBN(0x131260db, 0x131cf5c6),
+              TOBN(0x40eb353b, 0xfab4f7ac), TOBN(0x85c78880, 0x37eee829),
+              TOBN(0x4c1581ff, 0xc3bdf24e), TOBN(0x5bff75cb, 0xf5c3c5a8),
+              TOBN(0x35e8c83f, 0xa14e6f40), TOBN(0xb81d1c0f, 0x0295e0ca),
+              TOBN(0xfcde7cc8, 0xf43a730f), TOBN(0xe89b6f3c, 0x33ab590e),
+              TOBN(0xc823f529, 0xad03240b), TOBN(0x82b79afe, 0x98bea5db),
+              TOBN(0x568f2856, 0x962fe5de), TOBN(0x0c590adb, 0x60c591f3),
+              TOBN(0x1fc74a14, 0x4a28a858), TOBN(0x3b662498, 0xb3203f4c),
+              TOBN(0x91e3cf0d, 0x6c39765a), TOBN(0xa2db3acd, 0xac3cca0b),
+              TOBN(0x288f2f08, 0xcb953b50), TOBN(0x2414582c, 0xcf43cf1a),
+              TOBN(0x8dec8bbc, 0x60eee9a8), TOBN(0x54c79f02, 0x729aa042),
+              TOBN(0xd81cd5ec, 0x6532f5d5), TOBN(0xa672303a, 0xcf82e15f),
+              TOBN(0x376aafa8, 0x719c0563), TOBN(0xcd8ad2dc, 0xbc5fc79f),
+              TOBN(0x303fdb9f, 0xcb750cd3), TOBN(0x14ff052f, 0x4418b08e),
+              TOBN(0xf75084cf, 0x3e2d6520), TOBN(0x7ebdf0f8, 0x144ed509),
+              TOBN(0xf43bf0f2, 0xd3f25b98), TOBN(0x86ad71cf, 0xa354d837),
+              TOBN(0xb827fe92, 0x26f43572), TOBN(0xdfd3ab5b, 0x5d824758),
+              TOBN(0x315dd23a, 0x539094c1), TOBN(0x85c0e37a, 0x66623d68),
+              TOBN(0x575c7972, 0x7be19ae0), TOBN(0x616a3396, 0xdf0d36b5),
+              TOBN(0xa1ebb3c8, 0x26b1ff7e), TOBN(0x635b9485, 0x140ad453),
+              TOBN(0x92bf3cda, 0xda430c0b), TOBN(0x4702850e, 0x3a96dac6),
+              TOBN(0xc91cf0a5, 0x15ac326a), TOBN(0x95de4f49, 0xab8c25e4),
+              TOBN(0xb01bad09, 0xe265c17c), TOBN(0x24e45464, 0x087b3881),
+              TOBN(0xd43e583c, 0xe1fac5ca), TOBN(0xe17cb318, 0x6ead97a6),
+              TOBN(0x6cc39243, 0x74dcec46), TOBN(0x33cfc02d, 0x54c2b73f),
+              TOBN(0x82917844, 0xf26cd99c), TOBN(0x8819dd95, 0xd1773f89),
+              TOBN(0x09572aa6, 0x0871f427), TOBN(0x8e0cf365, 0xf6f01c34),
+              TOBN(0x7fa52988, 0xbff1f5af), TOBN(0x4eb357ea, 0xe75e8e50),
+              TOBN(0xd9d0c8c4, 0x868af75d), TOBN(0xd7325cff, 0x45c8c7ea),
+              TOBN(0xab471996, 0xcc81ecb0), TOBN(0xff5d55f3, 0x611824ed),
+              TOBN(0xbe314541, 0x1977a0ee), TOBN(0x5085c4c5, 0x722038c6),
+              TOBN(0x2d5335bf, 0xf94bb495), TOBN(0x894ad8a6, 0xc8e2a082),
+              TOBN(0x5c3e2341, 0xada35438), TOBN(0xf4a9fc89, 0x049b8c4e),
+              TOBN(0xbeeb355a, 0x9f17cf34), TOBN(0x3f311e0e, 0x6c91fe10),
+              TOBN(0xc2d20038, 0x92ab9891), TOBN(0x257bdcc1, 0x3e8ce9a9),
+              TOBN(0x1b2d9789, 0x88c53bee), TOBN(0x927ce89a, 0xcdba143a),
+              TOBN(0xb0a32cca, 0x523db280), TOBN(0x5c889f8a, 0x50d43783),
+              TOBN(0x503e04b3, 0x4897d16f), TOBN(0x8cdb6e78, 0x08f5f2e8),
+              TOBN(0x6ab91cf0, 0x179c8e74), TOBN(0xd8874e52, 0x48211d60),
+              TOBN(0xf948d4d5, 0xea851200), TOBN(0x4076d41e, 0xe6f9840a),
+              TOBN(0xc20e263c, 0x47b517ea), TOBN(0x79a448fd, 0x30685e5e),
+              TOBN(0xe55f6f78, 0xf90631a0), TOBN(0x88a790b1, 0xa79e6346),
+              TOBN(0x62160c7d, 0x80969fe8), TOBN(0x54f92fd4, 0x41491bb9),
+              TOBN(0xa6645c23, 0x5c957526), TOBN(0xf44cc5ae, 0xbea3ce7b),
+              TOBN(0xf7628327, 0x8b1e68b7), TOBN(0xc731ad7a, 0x303f29d3),
+              TOBN(0xfe5a9ca9, 0x57d03ecb), TOBN(0x96c0d50c, 0x41bc97a7),
+              TOBN(0xc4669fe7, 0x9b4f7f24), TOBN(0xfdd781d8, 0x3d9967ef),
+              TOBN(0x7892c7c3, 0x5d2c208d), TOBN(0x8bf64f7c, 0xae545cb3),
+              TOBN(0xc01f862c, 0x467be912), TOBN(0xf4c85ee9, 0xc73d30cc),
+              TOBN(0x1fa6f4be, 0x6ab83ec7), TOBN(0xa07a3c1c, 0x4e3e3cf9),
+              TOBN(0x87f8ef45, 0x0c00beb3), TOBN(0x30e2c2b3, 0x000d4c3e),
+              TOBN(0x1aa00b94, 0xfe08bf5b), TOBN(0x32c133aa, 0x9224ef52),
+              TOBN(0x38df16bb, 0x32e5685d), TOBN(0x68a9e069, 0x58e6f544),
+              TOBN(0x495aaff7, 0xcdc5ebc6), TOBN(0xf894a645, 0x378b135f),
+              TOBN(0xf316350a, 0x09e27ecf), TOBN(0xeced201e, 0x58f7179d),
+              TOBN(0x2eec273c, 0xe97861ba), TOBN(0x47ec2cae, 0xd693be2e),
+              TOBN(0xfa4c97c4, 0xf68367ce), TOBN(0xe4f47d0b, 0xbe5a5755),
+              TOBN(0x17de815d, 0xb298a979), TOBN(0xd7eca659, 0xc177dc7d),
+              TOBN(0x20fdbb71, 0x49ded0a3), TOBN(0x4cb2aad4, 0xfb34d3c5),
+              TOBN(0x2cf31d28, 0x60858a33), TOBN(0x3b6873ef, 0xa24aa40f),
+              TOBN(0x540234b2, 0x2c11bb37), TOBN(0x2d0366dd, 0xed4c74a3),
+              TOBN(0xf9a968da, 0xeec5f25d), TOBN(0x36601068, 0x67b63142),
+              TOBN(0x07cd6d2c, 0x68d7b6d4), TOBN(0xa8f74f09, 0x0c842942),
+              TOBN(0xe2751404, 0x7768b1ee), TOBN(0x4b5f7e89, 0xfe62aee4),
+              TOBN(0xc6a77177, 0x89070d26), TOBN(0xa1f28e4e, 0xdd1c8bc7),
+              TOBN(0xea5f4f06, 0x469e1f17), TOBN(0x78fc242a, 0xfbdb78e0),
+              TOBN(0xc9c7c592, 0x8b0588f1), TOBN(0xb6b7a0fd, 0x1535921e),
+              TOBN(0xcc5bdb91, 0xbde5ae35), TOBN(0xb42c485e, 0x12ff1864),
+              TOBN(0xa1113e13, 0xdbab98aa), TOBN(0xde9d469b, 0xa17b1024),
+              TOBN(0x23f48b37, 0xc0462d3a), TOBN(0x3752e537, 0x7c5c078d),
+              TOBN(0xe3a86add, 0x15544eb9), TOBN(0xf013aea7, 0x80fba279),
+              TOBN(0x8b5bb76c, 0xf22001b5), TOBN(0xe617ba14, 0xf02891ab),
+              TOBN(0xd39182a6, 0x936219d3), TOBN(0x5ce1f194, 0xae51cb19),
+              TOBN(0xc78f8598, 0xbf07a74c), TOBN(0x6d7158f2, 0x22cbf1bc),
+              TOBN(0x3b846b21, 0xe300ce18), TOBN(0x35fba630, 0x2d11275d),
+              TOBN(0x5fe25c36, 0xa0239b9b), TOBN(0xd8beb35d, 0xdf05d940),
+              TOBN(0x4db02bb0, 0x1f7e320d), TOBN(0x0641c364, 0x6da320ea),
+              TOBN(0x6d95fa5d, 0x821389a3), TOBN(0x92699748, 0x8fcd8e3d),
+              TOBN(0x316fef17, 0xceb6c143), TOBN(0x67fcb841, 0xd933762b),
+              TOBN(0xbb837e35, 0x118b17f8), TOBN(0x4b92552f, 0x9fd24821),
+              TOBN(0xae6bc70e, 0x46aca793), TOBN(0x1cf0b0e4, 0xe579311b),
+              TOBN(0x8dc631be, 0x5802f716), TOBN(0x099bdc6f, 0xbddbee4d),
+              TOBN(0xcc352bb2, 0x0caf8b05), TOBN(0xf74d505a, 0x72d63df2),
+              TOBN(0xb9876d4b, 0x91c4f408), TOBN(0x1ce18473, 0x9e229b2d),
+              TOBN(0x49507597, 0x83abdb4a), TOBN(0x850fbcb6, 0xdee84b18),
+              TOBN(0x6325236e, 0x609e67dc), TOBN(0x04d831d9, 0x9336c6d8),
+              TOBN(0x8deaae3b, 0xfa12d45d), TOBN(0xe425f8ce, 0x4746e246),
+              TOBN(0x8004c175, 0x24f5f31e), TOBN(0xaca16d8f, 0xad62c3b7),
+              TOBN(0x0dc15a6a, 0x9152f934), TOBN(0xf1235e5d, 0xed0e12c1),
+              TOBN(0xc33c06ec, 0xda477dac), TOBN(0x76be8732, 0xb2ea0006),
+              TOBN(0xcf3f7831, 0x0c0cd313), TOBN(0x3c524553, 0xa614260d),
+              TOBN(0x31a756f8, 0xcab22d15), TOBN(0x03ee10d1, 0x77827a20),
+              TOBN(0xd1e059b2, 0x1994ef20), TOBN(0x2a653b69, 0x638ae318),
+              TOBN(0x70d5eb58, 0x2f699010), TOBN(0x279739f7, 0x09f5f84a),
+              TOBN(0x5da4663c, 0x8b799336), TOBN(0xfdfdf14d, 0x203c37eb),
+              TOBN(0x32d8a9dc, 0xa1dbfb2d), TOBN(0xab40cff0, 0x77d48f9b),
+              TOBN(0xc018b383, 0xd20b42d5), TOBN(0xf9a810ef, 0x9f78845f),
+              TOBN(0x40af3753, 0xbdba9df0), TOBN(0xb90bdcfc, 0x131dfdf9),
+              TOBN(0x18720591, 0xf01ab782), TOBN(0xc823f211, 0x6af12a88),
+              TOBN(0xa51b80f3, 0x0dc14401), TOBN(0xde248f77, 0xfb2dfbe3),
+              TOBN(0xef5a44e5, 0x0cafe751), TOBN(0x73997c9c, 0xd4dcd221),
+              TOBN(0x32fd86d1, 0xde854024), TOBN(0xd5b53adc, 0xa09b84bb),
+              TOBN(0x008d7a11, 0xdcedd8d1), TOBN(0x406bd1c8, 0x74b32c84),
+              TOBN(0x5d4472ff, 0x05dde8b1), TOBN(0x2e25f2cd, 0xfce2b32f),
+              TOBN(0xbec0dd5e, 0x29dfc254), TOBN(0x4455fcf6, 0x2b98b267),
+              TOBN(0x0b4d43a5, 0xc72df2ad), TOBN(0xea70e6be, 0x48a75397),
+              TOBN(0x2aad6169, 0x5820f3bf), TOBN(0xf410d2dd, 0x9e37f68f),
+              TOBN(0x70fb7dba, 0x7be5ac83), TOBN(0x636bb645, 0x36ec3eec),
+              TOBN(0x27104ea3, 0x9754e21c), TOBN(0xbc87a3e6, 0x8d63c373),
+              TOBN(0x483351d7, 0x4109db9a), TOBN(0x0fa724e3, 0x60134da7),
+              TOBN(0x9ff44c29, 0xb0720b16), TOBN(0x2dd0cf13, 0x06aceead),
+              TOBN(0x5942758c, 0xe26929a6), TOBN(0x96c5db92, 0xb766a92b),
+              TOBN(0xcec7d4c0, 0x5f18395e), TOBN(0xd3f22744, 0x1f80d032),
+              TOBN(0x7a68b37a, 0xcb86075b), TOBN(0x074764dd, 0xafef92db),
+              TOBN(0xded1e950, 0x7bc7f389), TOBN(0xc580c850, 0xb9756460),
+              TOBN(0xaeeec2a4, 0x7da48157), TOBN(0x3f0b4e7f, 0x82c587b3),
+              TOBN(0x231c6de8, 0xa9f19c53), TOBN(0x5717bd73, 0x6974e34e),
+              TOBN(0xd9e1d216, 0xf1508fa9), TOBN(0x9f112361, 0xdadaa124),
+              TOBN(0x80145e31, 0x823b7348), TOBN(0x4dd8f0d5, 0xac634069),
+              TOBN(0xe3d82fc7, 0x2297c258), TOBN(0x276fcfee, 0x9cee7431),
+              TOBN(0x8eb61b5e, 0x2bc0aea9), TOBN(0x4f668fd5, 0xde329431),
+              TOBN(0x03a32ab1, 0x38e4b87e), TOBN(0xe1374517, 0x73d0ef0b),
+              TOBN(0x1a46f7e6, 0x853ac983), TOBN(0xc3bdf42e, 0x68e78a57),
+              TOBN(0xacf20785, 0x2ea96dd1), TOBN(0xa10649b9, 0xf1638460),
+              TOBN(0xf2369f0b, 0x879fbbed), TOBN(0x0ff0ae86, 0xda9d1869),
+              TOBN(0x5251d759, 0x56766f45), TOBN(0x4984d8c0, 0x2be8d0fc),
+              TOBN(0x7ecc95a6, 0xd21008f0), TOBN(0x29bd54a0, 0x3a1a1c49),
+              TOBN(0xab9828c5, 0xd26c50f3), TOBN(0x32c0087c, 0x51d0d251),
+              TOBN(0x9bac3ce6, 0x0c1cdb26), TOBN(0xcd94d947, 0x557ca205),
+              TOBN(0x1b1bd598, 0x9db1fdcd), TOBN(0x0eda0108, 0xa3d8b149),
+              TOBN(0x95066610, 0x56152fcc), TOBN(0xc2f037e6, 0xe7192b33),
+              TOBN(0xdeffb41a, 0xc92e05a4), TOBN(0x1105f6c2, 0xc2f6c62e),
+              TOBN(0x68e73500, 0x8733913c), TOBN(0xcce86163, 0x3f3adc40),
+              TOBN(0xf407a942, 0x38a278e9), TOBN(0xd13c1b9d, 0x2ab21292),
+              TOBN(0x93ed7ec7, 0x1c74cf5c), TOBN(0x8887dc48, 0xf1a4c1b4),
+              TOBN(0x3830ff30, 0x4b3a11f1), TOBN(0x358c5a3c, 0x58937cb6),
+              TOBN(0x027dc404, 0x89022829), TOBN(0x40e93977, 0x3b798f79),
+              TOBN(0x90ad3337, 0x38be6ead), TOBN(0x9c23f6bc, 0xf34c0a5d),
+              TOBN(0xd1711a35, 0xfbffd8bb), TOBN(0x60fcfb49, 0x1949d3dd),
+              TOBN(0x09c8ef4b, 0x7825d93a), TOBN(0x24233cff, 0xa0a8c968),
+              TOBN(0x67ade46c, 0xe6d982af), TOBN(0xebb6bf3e, 0xe7544d7c),
+              TOBN(0xd6b9ba76, 0x3d8bd087), TOBN(0x46fe382d, 0x4dc61280),
+              TOBN(0xbd39a7e8, 0xb5bdbd75), TOBN(0xab381331, 0xb8f228fe),
+              TOBN(0x0709a77c, 0xce1c4300), TOBN(0x6a247e56, 0xf337ceac),
+              TOBN(0x8f34f21b, 0x636288be), TOBN(0x9dfdca74, 0xc8a7c305),
+              TOBN(0x6decfd1b, 0xea919e04), TOBN(0xcdf2688d, 0x8e1991f8),
+              TOBN(0xe607df44, 0xd0f8a67e), TOBN(0xd985df4b, 0x0b58d010),
+              TOBN(0x57f834c5, 0x0c24f8f4), TOBN(0xe976ef56, 0xa0bf01ae),
+              TOBN(0x536395ac, 0xa1c32373), TOBN(0x351027aa, 0x734c0a13),
+              TOBN(0xd2f1b5d6, 0x5e6bd5bc), TOBN(0x2b539e24, 0x223debed),
+              TOBN(0xd4994cec, 0x0eaa1d71), TOBN(0x2a83381d, 0x661dcf65),
+              TOBN(0x5f1aed2f, 0x7b54c740), TOBN(0x0bea3fa5, 0xd6dda5ee),
+              TOBN(0x9d4fb684, 0x36cc6134), TOBN(0x8eb9bbf3, 0xc0a443dd),
+              TOBN(0xfc500e2e, 0x383b7d2a), TOBN(0x7aad621c, 0x5b775257),
+              TOBN(0x69284d74, 0x0a8f7cc0), TOBN(0xe820c2ce, 0x07562d65),
+              TOBN(0xbf9531b9, 0x499758ee), TOBN(0x73e95ca5, 0x6ee0cc2d),
+              TOBN(0xf61790ab, 0xfbaf50a5), TOBN(0xdf55e76b, 0x684e0750),
+              TOBN(0xec516da7, 0xf176b005), TOBN(0x575553bb, 0x7a2dddc7),
+              TOBN(0x37c87ca3, 0x553afa73), TOBN(0x315f3ffc, 0x4d55c251),
+              TOBN(0xe846442a, 0xaf3e5d35), TOBN(0x61b91149, 0x6495ff28),
+              TOBN(0x23cc95d3, 0xfa326dc3), TOBN(0x1df4da1f, 0x18fc2cea),
+              TOBN(0x24bf9adc, 0xd0a37d59), TOBN(0xb6710053, 0x320d6e1e),
+              TOBN(0x96f9667e, 0x618344d1), TOBN(0xcc7ce042, 0xa06445af),
+              TOBN(0xa02d8514, 0xd68dbc3a), TOBN(0x4ea109e4, 0x280b5a5b),
+              TOBN(0x5741a7ac, 0xb40961bf), TOBN(0x4ada5937, 0x6aa56bfa),
+              TOBN(0x7feb9145, 0x02b765d1), TOBN(0x561e97be, 0xe6ad1582),
+              TOBN(0xbbc4a5b6, 0xda3982f5), TOBN(0x0c2659ed, 0xb546f468),
+              TOBN(0xb8e7e6aa, 0x59612d20), TOBN(0xd83dfe20, 0xac19e8e0),
+              TOBN(0x8530c45f, 0xb835398c), TOBN(0x6106a8bf, 0xb38a41c2),
+              TOBN(0x21e8f9a6, 0x35f5dcdb), TOBN(0x39707137, 0xcae498ed),
+              TOBN(0x70c23834, 0xd8249f00), TOBN(0x9f14b58f, 0xab2537a0),
+              TOBN(0xd043c365, 0x5f61c0c2), TOBN(0xdc5926d6, 0x09a194a7),
+              TOBN(0xddec0339, 0x8e77738a), TOBN(0xd07a63ef, 0xfba46426),
+              TOBN(0x2e58e79c, 0xee7f6e86), TOBN(0xe59b0459, 0xff32d241),
+              TOBN(0xc5ec84e5, 0x20fa0338), TOBN(0x97939ac8, 0xeaff5ace),
+              TOBN(0x0310a4e3, 0xb4a38313), TOBN(0x9115fba2, 0x8f9d9885),
+              TOBN(0x8dd710c2, 0x5fadf8c3), TOBN(0x66be38a2, 0xce19c0e2),
+              TOBN(0xd42a279c, 0x4cfe5022), TOBN(0x597bb530, 0x0e24e1b8),
+              TOBN(0x3cde86b7, 0xc153ca7f), TOBN(0xa8d30fb3, 0x707d63bd),
+              TOBN(0xac905f92, 0xbd60d21e), TOBN(0x98e7ffb6, 0x7b9a54ab),
+              TOBN(0xd7147df8, 0xe9726a30), TOBN(0xb5e216ff, 0xafce3533),
+              TOBN(0xb550b799, 0x2ff1ec40), TOBN(0x6b613b87, 0xa1e953fd),
+              TOBN(0x87b88dba, 0x792d5610), TOBN(0x2ee1270a, 0xa190fbe1),
+              TOBN(0x02f4e2dc, 0x2ef581da), TOBN(0x016530e4, 0xeff82a95),
+              TOBN(0xcbb93dfd, 0x8fd6ee89), TOBN(0x16d3d986, 0x46848fff),
+              TOBN(0x600eff24, 0x1da47adf), TOBN(0x1b9754a0, 0x0ad47a71),
+              TOBN(0x8f9266df, 0x70c33b98), TOBN(0xaadc87ae, 0xdf34186e),
+              TOBN(0x0d2ce8e1, 0x4ad24132), TOBN(0x8a47cbfc, 0x19946eba),
+              TOBN(0x47feeb66, 0x62b5f3af), TOBN(0xcefab561, 0x0abb3734),
+              TOBN(0x449de60e, 0x19f35cb1), TOBN(0x39f8db14, 0x157f0eb9),
+              TOBN(0xffaecc5b, 0x3c61bfd6), TOBN(0xa5a4d41d, 0x41216703),
+              TOBN(0x7f8fabed, 0x224e1cc2), TOBN(0x0d5a8186, 0x871ad953),
+              TOBN(0xf10774f7, 0xd22da9a9), TOBN(0x45b8a678, 0xcc8a9b0d),
+              TOBN(0xd9c2e722, 0xbdc32cff), TOBN(0xbf71b5f5, 0x337202a5),
+              TOBN(0x95c57f2f, 0x69fc4db9), TOBN(0xb6dad34c, 0x765d01e1),
+              TOBN(0x7e0bd13f, 0xcb904635), TOBN(0x61751253, 0x763a588c),
+              TOBN(0xd85c2997, 0x81af2c2d), TOBN(0xc0f7d9c4, 0x81b9d7da),
+              TOBN(0x838a34ae, 0x08533e8d), TOBN(0x15c4cb08, 0x311d8311),
+              TOBN(0x97f83285, 0x8e121e14), TOBN(0xeea7dc1e, 0x85000a5f),
+              TOBN(0x0c6059b6, 0x5d256274), TOBN(0xec9beace, 0xb95075c0),
+              TOBN(0x173daad7, 0x1df97828), TOBN(0xbf851cb5, 0xa8937877),
+              TOBN(0xb083c594, 0x01646f3c), TOBN(0x3bad30cf, 0x50c6d352),
+              TOBN(0xfeb2b202, 0x496bbcea), TOBN(0x3cf9fd4f, 0x18a1e8ba),
+              TOBN(0xd26de7ff, 0x1c066029), TOBN(0x39c81e9e, 0x4e9ed4f8),
+              TOBN(0xd8be0cb9, 0x7b390d35), TOBN(0x01df2bbd, 0x964aab27),
+              TOBN(0x3e8c1a65, 0xc3ef64f8), TOBN(0x567291d1, 0x716ed1dd),
+              TOBN(0x95499c6c, 0x5f5406d3), TOBN(0x71fdda39, 0x5ba8e23f),
+              TOBN(0xcfeb320e, 0xd5096ece), TOBN(0xbe7ba92b, 0xca66dd16),
+              TOBN(0x4608d36b, 0xc6fb5a7d), TOBN(0xe3eea15a, 0x6d2dd0e0),
+              TOBN(0x75b0a3eb, 0x8f97a36a), TOBN(0xf59814cc, 0x1c83de1e),
+              TOBN(0x56c9c5b0, 0x1c33c23f), TOBN(0xa96c1da4, 0x6faa4136),
+              TOBN(0x46bf2074, 0xde316551), TOBN(0x3b866e7b, 0x1f756c8f),
+              TOBN(0x727727d8, 0x1495ed6b), TOBN(0xb2394243, 0xb682dce7),
+              TOBN(0x8ab8454e, 0x758610f3), TOBN(0xc243ce84, 0x857d72a4),
+              TOBN(0x7b320d71, 0xdbbf370f), TOBN(0xff9afa37, 0x78e0f7ca),
+              TOBN(0x0119d1e0, 0xea7b523f), TOBN(0xb997f8cb, 0x058c7d42),
+              TOBN(0x285bcd2a, 0x37bbb184), TOBN(0x51dcec49, 0xa45d1fa6),
+              TOBN(0x6ade3b64, 0xe29634cb), TOBN(0x080c94a7, 0x26b86ef1),
+              TOBN(0xba583db1, 0x2283fbe3), TOBN(0x902bddc8, 0x5a9315ed),
+              TOBN(0x07c1ccb3, 0x86964bec), TOBN(0x78f4eacf, 0xb6258301),
+              TOBN(0x4bdf3a49, 0x56f90823), TOBN(0xba0f5080, 0x741d777b),
+              TOBN(0x091d71c3, 0xf38bf760), TOBN(0x9633d50f, 0x9b625b02),
+              TOBN(0x03ecb743, 0xb8c9de61), TOBN(0xb4751254, 0x5de74720),
+              TOBN(0x9f9defc9, 0x74ce1cb2), TOBN(0x774a4f6a, 0x00bd32ef),
+              TOBN(0xaca385f7, 0x73848f22), TOBN(0x53dad716, 0xf3f8558e),
+              TOBN(0xab7b34b0, 0x93c471f9), TOBN(0xf530e069, 0x19644bc7),
+              TOBN(0x3d9fb1ff, 0xdd59d31a), TOBN(0x4382e0df, 0x08daa795),
+              TOBN(0x165c6f4b, 0xd5cc88d7), TOBN(0xeaa392d5, 0x4a18c900),
+              TOBN(0x94203c67, 0x648024ee), TOBN(0x188763f2, 0x8c2fabcd),
+              TOBN(0xa80f87ac, 0xbbaec835), TOBN(0x632c96e0, 0xf29d8d54),
+              TOBN(0x29b0a60e, 0x4c00a95e), TOBN(0x2ef17f40, 0xe011e9fa),
+              TOBN(0xf6c0e1d1, 0x15b77223), TOBN(0xaaec2c62, 0x14b04e32),
+              TOBN(0xd35688d8, 0x3d84e58c), TOBN(0x2af5094c, 0x958571db),
+              TOBN(0x4fff7e19, 0x760682a6), TOBN(0x4cb27077, 0xe39a407c),
+              TOBN(0x0f59c547, 0x4ff0e321), TOBN(0x169f34a6, 0x1b34c8ff),
+              TOBN(0x2bff1096, 0x52bc1ba7), TOBN(0xa25423b7, 0x83583544),
+              TOBN(0x5d55d5d5, 0x0ac8b782), TOBN(0xff6622ec, 0x2db3c892),
+              TOBN(0x48fce741, 0x6b8bb642), TOBN(0x31d6998c, 0x69d7e3dc),
+              TOBN(0xdbaf8004, 0xcadcaed0), TOBN(0x801b0142, 0xd81d053c),
+              TOBN(0x94b189fc, 0x59630ec6), TOBN(0x120e9934, 0xaf762c8e),
+              TOBN(0x53a29aa4, 0xfdc6a404), TOBN(0x19d8e01e, 0xa1909948),
+              TOBN(0x3cfcabf1, 0xd7e89681), TOBN(0x3321a50d, 0x4e132d37),
+              TOBN(0xd0496863, 0xe9a86111), TOBN(0x8c0cde61, 0x06a3bc65),
+              TOBN(0xaf866c49, 0xfc9f8eef), TOBN(0x2066350e, 0xff7f5141),
+              TOBN(0x4f8a4689, 0xe56ddfbd), TOBN(0xea1b0c07, 0xfe32983a),
+              TOBN(0x2b317462, 0x873cb8cb), TOBN(0x658deddc, 0x2d93229f),
+              TOBN(0x65efaf4d, 0x0f64ef58), TOBN(0xfe43287d, 0x730cc7a8),
+              TOBN(0xaebc0c72, 0x3d047d70), TOBN(0x92efa539, 0xd92d26c9),
+              TOBN(0x06e78457, 0x94b56526), TOBN(0x415cb80f, 0x0961002d),
+              TOBN(0x89e5c565, 0x76dcb10f), TOBN(0x8bbb6982, 0xff9259fe),
+              TOBN(0x4fe8795b, 0x9abc2668), TOBN(0xb5d4f534, 0x1e678fb1),
+              TOBN(0x6601f3be, 0x7b7da2b9), TOBN(0x98da59e2, 0xa13d6805),
+              TOBN(0x190d8ea6, 0x01799a52), TOBN(0xa20cec41, 0xb86d2952),
+              TOBN(0x3062ffb2, 0x7fff2a7c), TOBN(0x741b32e5, 0x79f19d37),
+              TOBN(0xf80d8181, 0x4eb57d47), TOBN(0x7a2d0ed4, 0x16aef06b),
+              TOBN(0x09735fb0, 0x1cecb588), TOBN(0x1641caaa, 0xc6061f5b) },
+          { TOBN(0x7f99824f, 0x20151427), TOBN(0x206828b6, 0x92430206),
+              TOBN(0xaa9097d7, 0xe1112357), TOBN(0xacf9a2f2, 0x09e414ec),
+              TOBN(0xdbdac9da, 0x27915356), TOBN(0x7e0734b7, 0x001efee3),
+              TOBN(0x54fab5bb, 0xd2b288e2), TOBN(0x4c630fc4, 0xf62dd09c),
+              TOBN(0x8537107a, 0x1ac2703b), TOBN(0xb49258d8, 0x6bc857b5),
+              TOBN(0x57df14de, 0xbcdaccd1), TOBN(0x24ab68d7, 0xc4ae8529),
+              TOBN(0x7ed8b5d4, 0x734e59d0), TOBN(0x5f8740c8, 0xc495cc80),
+              TOBN(0x84aedd5a, 0x291db9b3), TOBN(0x80b360f8, 0x4fb995be),
+              TOBN(0xae915f5d, 0x5fa067d1), TOBN(0x4134b57f, 0x9668960c),
+              TOBN(0xbd3656d6, 0xa48edaac), TOBN(0xdac1e3e4, 0xfc1d7436),
+              TOBN(0x674ff869, 0xd81fbb26), TOBN(0x449ed3ec, 0xb26c33d4),
+              TOBN(0x85138705, 0xd94203e8), TOBN(0xccde538b, 0xbeeb6f4a),
+              TOBN(0x55d5c68d, 0xa61a76fa), TOBN(0x598b441d, 0xca1554dc),
+              TOBN(0xd39923b9, 0x773b279c), TOBN(0x33331d3c, 0x36bf9efc),
+              TOBN(0x2d4c848e, 0x298de399), TOBN(0xcfdb8e77, 0xa1a27f56),
+              TOBN(0x94c855ea, 0x57b8ab70), TOBN(0xdcdb9dae, 0x6f7879ba),
+              TOBN(0x7bdff8c2, 0x019f2a59), TOBN(0xb3ce5bb3, 0xcb4fbc74),
+              TOBN(0xea907f68, 0x8a9173dd), TOBN(0x6cd3d0d3, 0x95a75439),
+              TOBN(0x92ecc4d6, 0xefed021c), TOBN(0x09a9f9b0, 0x6a77339a),
+              TOBN(0x87ca6b15, 0x7188c64a), TOBN(0x10c29968, 0x44899158),
+              TOBN(0x5859a229, 0xed6e82ef), TOBN(0x16f338e3, 0x65ebaf4e),
+              TOBN(0x0cd31387, 0x5ead67ae), TOBN(0x1c73d228, 0x54ef0bb4),
+              TOBN(0x4cb55131, 0x74a5c8c7), TOBN(0x01cd2970, 0x7f69ad6a),
+              TOBN(0xa04d00dd, 0xe966f87e), TOBN(0xd96fe447, 0x0b7b0321),
+              TOBN(0x342ac06e, 0x88fbd381), TOBN(0x02cd4a84, 0x5c35a493),
+              TOBN(0xe8fa89de, 0x54f1bbcd), TOBN(0x341d6367, 0x2575ed4c),
+              TOBN(0xebe357fb, 0xd238202b), TOBN(0x600b4d1a, 0xa984ead9),
+              TOBN(0xc35c9f44, 0x52436ea0), TOBN(0x96fe0a39, 0xa370751b),
+              TOBN(0x4c4f0736, 0x7f636a38), TOBN(0x9f943fb7, 0x0e76d5cb),
+              TOBN(0xb03510ba, 0xa8b68b8b), TOBN(0xc246780a, 0x9ed07a1f),
+              TOBN(0x3c051415, 0x6d549fc2), TOBN(0xc2953f31, 0x607781ca),
+              TOBN(0x955e2c69, 0xd8d95413), TOBN(0xb300fadc, 0x7bd282e3),
+              TOBN(0x81fe7b50, 0x87e9189f), TOBN(0xdb17375c, 0xf42dda27),
+              TOBN(0x22f7d896, 0xcf0a5904), TOBN(0xa0e57c5a, 0xebe348e6),
+              TOBN(0xa61011d3, 0xf40e3c80), TOBN(0xb1189321, 0x8db705c5),
+              TOBN(0x4ed9309e, 0x50fedec3), TOBN(0xdcf14a10, 0x4d6d5c1d),
+              TOBN(0x056c265b, 0x55691342), TOBN(0xe8e08504, 0x91049dc7),
+              TOBN(0x131329f5, 0xc9bae20a), TOBN(0x96c8b3e8, 0xd9dccdb4),
+              TOBN(0x8c5ff838, 0xfb4ee6b4), TOBN(0xfc5a9aeb, 0x41e8ccf0),
+              TOBN(0x7417b764, 0xfae050c6), TOBN(0x0953c3d7, 0x00452080),
+              TOBN(0x21372682, 0x38dfe7e8), TOBN(0xea417e15, 0x2bb79d4b),
+              TOBN(0x59641f1c, 0x76e7cf2d), TOBN(0x271e3059, 0xea0bcfcc),
+              TOBN(0x624c7dfd, 0x7253ecbd), TOBN(0x2f552e25, 0x4fca6186),
+              TOBN(0xcbf84ecd, 0x4d866e9c), TOBN(0x73967709, 0xf68d4610),
+              TOBN(0xa14b1163, 0xc27901b4), TOBN(0xfd9236e0, 0x899b8bf3),
+              TOBN(0x42b091ec, 0xcbc6da0a), TOBN(0xbb1dac6f, 0x5ad1d297),
+              TOBN(0x80e61d53, 0xa91cf76e), TOBN(0x4110a412, 0xd31f1ee7),
+              TOBN(0x2d87c3ba, 0x13efcf77), TOBN(0x1f374bb4, 0xdf450d76),
+              TOBN(0x5e78e2f2, 0x0d188dab), TOBN(0xe3968ed0, 0xf4b885ef),
+              TOBN(0x46c0568e, 0x7314570f), TOBN(0x31616338, 0x01170521),
+              TOBN(0x18e1e7e2, 0x4f0c8afe), TOBN(0x4caa75ff, 0xdeea78da),
+              TOBN(0x82db67f2, 0x7c5d8a51), TOBN(0x36a44d86, 0x6f505370),
+              TOBN(0xd72c5bda, 0x0333974f), TOBN(0x5db516ae, 0x27a70146),
+              TOBN(0x34705281, 0x210ef921), TOBN(0xbff17a8f, 0x0c9c38e5),
+              TOBN(0x78f4814e, 0x12476da1), TOBN(0xc1e16613, 0x33c16980),
+              TOBN(0x9e5b386f, 0x424d4bca), TOBN(0x4c274e87, 0xc85740de),
+              TOBN(0xb6a9b88d, 0x6c2f5226), TOBN(0x14d1b944, 0x550d7ca8),
+              TOBN(0x580c85fc, 0x1fc41709), TOBN(0xc1da368b, 0x54c6d519),
+              TOBN(0x2b0785ce, 0xd5113cf7), TOBN(0x0670f633, 0x5a34708f),
+              TOBN(0x46e23767, 0x15cc3f88), TOBN(0x1b480cfa, 0x50c72c8f),
+              TOBN(0x20288602, 0x4147519a), TOBN(0xd0981eac, 0x26b372f0),
+              TOBN(0xa9d4a7ca, 0xa785ebc8), TOBN(0xd953c50d, 0xdbdf58e9),
+              TOBN(0x9d6361cc, 0xfd590f8f), TOBN(0x72e9626b, 0x44e6c917),
+              TOBN(0x7fd96110, 0x22eb64cf), TOBN(0x863ebb7e, 0x9eb288f3),
+              TOBN(0x6e6ab761, 0x6aca8ee7), TOBN(0x97d10b39, 0xd7b40358),
+              TOBN(0x1687d377, 0x1e5feb0d), TOBN(0xc83e50e4, 0x8265a27a),
+              TOBN(0x8f75a9fe, 0xc954b313), TOBN(0xcc2e8f47, 0x310d1f61),
+              TOBN(0xf5ba81c5, 0x6557d0e0), TOBN(0x25f9680c, 0x3eaf6207),
+              TOBN(0xf95c6609, 0x4354080b), TOBN(0x5225bfa5, 0x7bf2fe1c),
+              TOBN(0xc5c004e2, 0x5c7d98fa), TOBN(0x3561bf1c, 0x019aaf60),
+              TOBN(0x5e6f9f17, 0xba151474), TOBN(0xdec2f934, 0xb04f6eca),
+              TOBN(0x64e368a1, 0x269acb1e), TOBN(0x1332d9e4, 0x0cdda493),
+              TOBN(0x60d6cf69, 0xdf23de05), TOBN(0x66d17da2, 0x009339a0),
+              TOBN(0x9fcac985, 0x0a693923), TOBN(0xbcf057fc, 0xed7c6a6d),
+              TOBN(0xc3c5c8c5, 0xf0b5662c), TOBN(0x25318dd8, 0xdcba4f24),
+              TOBN(0x60e8cb75, 0x082b69ff), TOBN(0x7c23b3ee, 0x1e728c01),
+              TOBN(0x15e10a0a, 0x097e4403), TOBN(0xcb3d0a86, 0x19854665),
+              TOBN(0x88d8e211, 0xd67d4826), TOBN(0xb39af66e, 0x0b9d2839),
+              TOBN(0xa5f94588, 0xbd475ca8), TOBN(0xe06b7966, 0xc077b80b),
+              TOBN(0xfedb1485, 0xda27c26c), TOBN(0xd290d33a, 0xfe0fd5e0),
+              TOBN(0xa40bcc47, 0xf34fb0fa), TOBN(0xb4760cc8, 0x1fb1ab09),
+              TOBN(0x8fca0993, 0xa273bfe3), TOBN(0x13e4fe07, 0xf70b213c),
+              TOBN(0x3bcdb992, 0xfdb05163), TOBN(0x8c484b11, 0x0c2b19b6),
+              TOBN(0x1acb815f, 0xaaf2e3e2), TOBN(0xc6905935, 0xb89ff1b4),
+              TOBN(0xb2ad6f9d, 0x586e74e1), TOBN(0x488883ad, 0x67b80484),
+              TOBN(0x758aa2c7, 0x369c3ddb), TOBN(0x8ab74e69, 0x9f9afd31),
+              TOBN(0x10fc2d28, 0x5e21beb1), TOBN(0x3484518a, 0x318c42f9),
+              TOBN(0x377427dc, 0x53cf40c3), TOBN(0x9de0781a, 0x391bc1d9),
+              TOBN(0x8faee858, 0x693807e1), TOBN(0xa3865327, 0x4e81ccc7),
+              TOBN(0x02c30ff2, 0x6f835b84), TOBN(0xb604437b, 0x0d3d38d4),
+              TOBN(0xb3fc8a98, 0x5ca1823d), TOBN(0xb82f7ec9, 0x03be0324),
+              TOBN(0xee36d761, 0xcf684a33), TOBN(0x5a01df0e, 0x9f29bf7d),
+              TOBN(0x686202f3, 0x1306583d), TOBN(0x05b10da0, 0x437c622e),
+              TOBN(0xbf9aaa0f, 0x076a7bc8), TOBN(0x25e94efb, 0x8f8f4e43),
+              TOBN(0x8a35c9b7, 0xfa3dc26d), TOBN(0xe0e5fb93, 0x96ff03c5),
+              TOBN(0xa77e3843, 0xebc394ce), TOBN(0xcede6595, 0x8361de60),
+              TOBN(0xd27c22f6, 0xa1993545), TOBN(0xab01cc36, 0x24d671ba),
+              TOBN(0x63fa2877, 0xa169c28e), TOBN(0x925ef904, 0x2eb08376),
+              TOBN(0x3b2fa3cf, 0x53aa0b32), TOBN(0xb27beb5b, 0x71c49d7a),
+              TOBN(0xb60e1834, 0xd105e27f), TOBN(0xd6089788, 0x4f68570d),
+              TOBN(0x23094ce0, 0xd6fbc2ac), TOBN(0x738037a1, 0x815ff551),
+              TOBN(0xda73b1bb, 0x6bef119c), TOBN(0xdcf6c430, 0xeef506ba),
+              TOBN(0x00e4fe7b, 0xe3ef104a), TOBN(0xebdd9a2c, 0x0a065628),
+              TOBN(0x853a81c3, 0x8792043e), TOBN(0x22ad6ece, 0xb3b59108),
+              TOBN(0x9fb813c0, 0x39cd297d), TOBN(0x8ec7e16e, 0x05bda5d9),
+              TOBN(0x2834797c, 0x0d104b96), TOBN(0xcc11a2e7, 0x7c511510),
+              TOBN(0x96ca5a53, 0x96ee6380), TOBN(0x054c8655, 0xcea38742),
+              TOBN(0xb5946852, 0xd54dfa7d), TOBN(0x97c422e7, 0x1f4ab207),
+              TOBN(0xbf907509, 0x0c22b540), TOBN(0x2cde42aa, 0xb7c267d4),
+              TOBN(0xba18f9ed, 0x5ab0d693), TOBN(0x3ba62aa6, 0x6e4660d9),
+              TOBN(0xb24bf97b, 0xab9ea96a), TOBN(0x5d039642, 0xe3b60e32),
+              TOBN(0x4e6a4506, 0x7c4d9bd5), TOBN(0x666c5b9e, 0x7ed4a6a4),
+              TOBN(0xfa3fdcd9, 0x8edbd7cc), TOBN(0x4660bb87, 0xc6ccd753),
+              TOBN(0x9ae90820, 0x21e6b64f), TOBN(0x8a56a713, 0xb36bfb3f),
+              TOBN(0xabfce096, 0x5726d47f), TOBN(0x9eed01b2, 0x0b1a9a7f),
+              TOBN(0x30e9cad4, 0x4eb74a37), TOBN(0x7b2524cc, 0x53e9666d),
+              TOBN(0x6a29683b, 0x8f4b002f), TOBN(0xc2200d7a, 0x41f4fc20),
+              TOBN(0xcf3af47a, 0x3a338acc), TOBN(0x6539a4fb, 0xe7128975),
+              TOBN(0xcec31c14, 0xc33c7fcf), TOBN(0x7eb6799b, 0xc7be322b),
+              TOBN(0x119ef4e9, 0x6646f623), TOBN(0x7b7a26a5, 0x54d7299b),
+              TOBN(0xcb37f08d, 0x403f46f2), TOBN(0x94b8fc43, 0x1a0ec0c7),
+              TOBN(0xbb8514e3, 0xc332142f), TOBN(0xf3ed2c33, 0xe80d2a7a),
+              TOBN(0x8d2080af, 0xb639126c), TOBN(0xf7b6be60, 0xe3553ade),
+              TOBN(0x3950aa9f, 0x1c7e2b09), TOBN(0x847ff958, 0x6410f02b),
+              TOBN(0x877b7cf5, 0x678a31b0), TOBN(0xd50301ae, 0x3998b620),
+              TOBN(0x734257c5, 0xc00fb396), TOBN(0xf9fb18a0, 0x04e672a6),
+              TOBN(0xff8bd8eb, 0xe8758851), TOBN(0x1e64e4c6, 0x5d99ba44),
+              TOBN(0x4b8eaedf, 0x7dfd93b7), TOBN(0xba2f2a98, 0x04e76b8c),
+              TOBN(0x7d790cba, 0xe8053433), TOBN(0xc8e725a0, 0x3d2c9585),
+              TOBN(0x58c5c476, 0xcdd8f5ed), TOBN(0xd106b952, 0xefa9fe1d),
+              TOBN(0x3c5c775b, 0x0eff13a9), TOBN(0x242442ba, 0xe057b930),
+              TOBN(0xe9f458d4, 0xc9b70cbd), TOBN(0x69b71448, 0xa3cdb89a),
+              TOBN(0x41ee46f6, 0x0e2ed742), TOBN(0x573f1045, 0x40067493),
+              TOBN(0xb1e154ff, 0x9d54c304), TOBN(0x2ad0436a, 0x8d3a7502),
+              TOBN(0xee4aaa2d, 0x431a8121), TOBN(0xcd38b3ab, 0x886f11ed),
+              TOBN(0x57d49ea6, 0x034a0eb7), TOBN(0xd2b773bd, 0xf7e85e58),
+              TOBN(0x4a559ac4, 0x9b5c1f14), TOBN(0xc444be1a, 0x3e54df2b),
+              TOBN(0x13aad704, 0xeda41891), TOBN(0xcd927bec, 0x5eb5c788),
+              TOBN(0xeb3c8516, 0xe48c8a34), TOBN(0x1b7ac812, 0x4b546669),
+              TOBN(0x1815f896, 0x594df8ec), TOBN(0x87c6a79c, 0x79227865),
+              TOBN(0xae02a2f0, 0x9b56ddbd), TOBN(0x1339b5ac, 0x8a2f1cf3),
+              TOBN(0xf2b569c7, 0x839dff0d), TOBN(0xb0b9e864, 0xfee9a43d),
+              TOBN(0x4ff8ca41, 0x77bb064e), TOBN(0x145a2812, 0xfd249f63),
+              TOBN(0x3ab7beac, 0xf86f689a), TOBN(0x9bafec27, 0x01d35f5e),
+              TOBN(0x28054c65, 0x4265aa91), TOBN(0xa4b18304, 0x035efe42),
+              TOBN(0x6887b0e6, 0x9639dec7), TOBN(0xf4b8f6ad, 0x3d52aea5),
+              TOBN(0xfb9293cc, 0x971a8a13), TOBN(0x3f159e5d, 0x4c934d07),
+              TOBN(0x2c50e9b1, 0x09acbc29), TOBN(0x08eb65e6, 0x7154d129),
+              TOBN(0x4feff589, 0x30b75c3e), TOBN(0x0bb82fe2, 0x94491c93),
+              TOBN(0xd8ac377a, 0x89af62bb), TOBN(0xd7b51490, 0x9685e49f),
+              TOBN(0xabca9a7b, 0x04497f19), TOBN(0x1b35ed0a, 0x1a7ad13f),
+              TOBN(0x6b601e21, 0x3ec86ed6), TOBN(0xda91fcb9, 0xce0c76f1),
+              TOBN(0x9e28507b, 0xd7ab27e1), TOBN(0x7c19a555, 0x63945b7b),
+              TOBN(0x6b43f0a1, 0xaafc9827), TOBN(0x443b4fbd, 0x3aa55b91),
+              TOBN(0x962b2e65, 0x6962c88f), TOBN(0x139da8d4, 0xce0db0ca),
+              TOBN(0xb93f05dd, 0x1b8d6c4f), TOBN(0x779cdff7, 0x180b9824),
+              TOBN(0xbba23fdd, 0xae57c7b7), TOBN(0x345342f2, 0x1b932522),
+              TOBN(0xfd9c80fe, 0x556d4aa3), TOBN(0xa03907ba, 0x6525bb61),
+              TOBN(0x38b010e1, 0xff218933), TOBN(0xc066b654, 0xaa52117b),
+              TOBN(0x8e141920, 0x94f2e6ea), TOBN(0x66a27dca, 0x0d32f2b2),
+              TOBN(0x69c7f993, 0x048b3717), TOBN(0xbf5a989a, 0xb178ae1c),
+              TOBN(0x49fa9058, 0x564f1d6b), TOBN(0x27ec6e15, 0xd31fde4e),
+              TOBN(0x4cce0373, 0x7276e7fc), TOBN(0x64086d79, 0x89d6bf02),
+              TOBN(0x5a72f046, 0x4ccdd979), TOBN(0x909c3566, 0x47775631),
+              TOBN(0x1c07bc6b, 0x75dd7125), TOBN(0xb4c6bc97, 0x87a0428d),
+              TOBN(0x507ece52, 0xfdeb6b9d), TOBN(0xfca56512, 0xb2c95432),
+              TOBN(0x15d97181, 0xd0e8bd06), TOBN(0x384dd317, 0xc6bb46ea),
+              TOBN(0x5441ea20, 0x3952b624), TOBN(0xbcf70dee, 0x4e7dc2fb),
+              TOBN(0x372b016e, 0x6628e8c3), TOBN(0x07a0d667, 0xb60a7522),
+              TOBN(0xcf05751b, 0x0a344ee2), TOBN(0x0ec09a48, 0x118bdeec),
+              TOBN(0x6e4b3d4e, 0xd83dce46), TOBN(0x43a6316d, 0x99d2fc6e),
+              TOBN(0xa99d8989, 0x56cf044c), TOBN(0x7c7f4454, 0xae3e5fb7),
+              TOBN(0xb2e6b121, 0xfbabbe92), TOBN(0x281850fb, 0xe1330076),
+              TOBN(0x093581ec, 0x97890015), TOBN(0x69b1dded, 0x75ff77f5),
+              TOBN(0x7cf0b18f, 0xab105105), TOBN(0x953ced31, 0xa89ccfef),
+              TOBN(0x3151f85f, 0xeb914009), TOBN(0x3c9f1b87, 0x88ed48ad),
+              TOBN(0xc9aba1a1, 0x4a7eadcb), TOBN(0x928e7501, 0x522e71cf),
+              TOBN(0xeaede727, 0x3a2e4f83), TOBN(0x467e10d1, 0x1ce3bbd3),
+              TOBN(0xf3442ac3, 0xb955dcf0), TOBN(0xba96307d, 0xd3d5e527),
+              TOBN(0xf763a10e, 0xfd77f474), TOBN(0x5d744bd0, 0x6a6e1ff0),
+              TOBN(0xd287282a, 0xa777899e), TOBN(0xe20eda8f, 0xd03f3cde),
+              TOBN(0x6a7e75bb, 0x50b07d31), TOBN(0x0b7e2a94, 0x6f379de4),
+              TOBN(0x31cb64ad, 0x19f593cf), TOBN(0x7b1a9e4f, 0x1e76ef1d),
+              TOBN(0xe18c9c9d, 0xb62d609c), TOBN(0x439bad6d, 0xe779a650),
+              TOBN(0x219d9066, 0xe032f144), TOBN(0x1db632b8, 0xe8b2ec6a),
+              TOBN(0xff0d0fd4, 0xfda12f78), TOBN(0x56fb4c2d, 0x2a25d265),
+              TOBN(0x5f4e2ee1, 0x255a03f1), TOBN(0x61cd6af2, 0xe96af176),
+              TOBN(0xe0317ba8, 0xd068bc97), TOBN(0x927d6bab, 0x264b988e),
+              TOBN(0xa18f07e0, 0xe90fb21e), TOBN(0x00fd2b80, 0xbba7fca1),
+              TOBN(0x20387f27, 0x95cd67b5), TOBN(0x5b89a4e7, 0xd39707f7),
+              TOBN(0x8f83ad3f, 0x894407ce), TOBN(0xa0025b94, 0x6c226132),
+              TOBN(0xc79563c7, 0xf906c13b), TOBN(0x5f548f31, 0x4e7bb025),
+              TOBN(0x2b4c6b8f, 0xeac6d113), TOBN(0xa67e3f9c, 0x0e813c76),
+              TOBN(0x3982717c, 0x3fe1f4b9), TOBN(0x58865819, 0x26d8050e),
+              TOBN(0x99f3640c, 0xf7f06f20), TOBN(0xdc610216, 0x2a66ebc2),
+              TOBN(0x52f2c175, 0x767a1e08), TOBN(0x05660e1a, 0x5999871b),
+              TOBN(0x6b0f1762, 0x6d3c4693), TOBN(0xf0e7d627, 0x37ed7bea),
+              TOBN(0xc51758c7, 0xb75b226d), TOBN(0x40a88628, 0x1f91613b),
+              TOBN(0x889dbaa7, 0xbbb38ce0), TOBN(0xe0404b65, 0xbddcad81),
+              TOBN(0xfebccd3a, 0x8bc9671f), TOBN(0xfbf9a357, 0xee1f5375),
+              TOBN(0x5dc169b0, 0x28f33398), TOBN(0xb07ec11d, 0x72e90f65),
+              TOBN(0xae7f3b4a, 0xfaab1eb1), TOBN(0xd970195e, 0x5f17538a),
+              TOBN(0x52b05cbe, 0x0181e640), TOBN(0xf5debd62, 0x2643313d),
+              TOBN(0x76148154, 0x5df31f82), TOBN(0x23e03b33, 0x3a9e13c5),
+              TOBN(0xff758949, 0x4fde0c1f), TOBN(0xbf8a1abe, 0xe5b6ec20),
+              TOBN(0x702278fb, 0x87e1db6c), TOBN(0xc447ad7a, 0x35ed658f),
+              TOBN(0x48d4aa38, 0x03d0ccf2), TOBN(0x80acb338, 0x819a7c03),
+              TOBN(0x9bc7c89e, 0x6e17cecc), TOBN(0x46736b8b, 0x03be1d82),
+              TOBN(0xd65d7b60, 0xc0432f96), TOBN(0xddebe7a3, 0xdeb5442f),
+              TOBN(0x79a25307, 0x7dff69a2), TOBN(0x37a56d94, 0x02cf3122),
+              TOBN(0x8bab8aed, 0xf2350d0a), TOBN(0x13c3f276, 0x037b0d9a),
+              TOBN(0xc664957c, 0x44c65cae), TOBN(0x88b44089, 0xc2e71a88),
+              TOBN(0xdb88e5a3, 0x5cb02664), TOBN(0x5d4c0bf1, 0x8686c72e),
+              TOBN(0xea3d9b62, 0xa682d53e), TOBN(0x9b605ef4, 0x0b2ad431),
+              TOBN(0x71bac202, 0xc69645d0), TOBN(0xa115f03a, 0x6a1b66e7),
+              TOBN(0xfe2c563a, 0x158f4dc4), TOBN(0xf715b3a0, 0x4d12a78c),
+              TOBN(0x8f7f0a48, 0xd413213a), TOBN(0x2035806d, 0xc04becdb),
+              TOBN(0xecd34a99, 0x5d8587f5), TOBN(0x4d8c3079, 0x9f6d3a71),
+              TOBN(0x1b2a2a67, 0x8d95a8f6), TOBN(0xc58c9d7d, 0xf2110d0d),
+              TOBN(0xdeee81d5, 0xcf8fba3f), TOBN(0xa42be3c0, 0x0c7cdf68),
+              TOBN(0x2126f742, 0xd43b5eaa), TOBN(0x054a0766, 0xdfa59b85),
+              TOBN(0x9d0d5e36, 0x126bfd45), TOBN(0xa1f8fbd7, 0x384f8a8f),
+              TOBN(0x317680f5, 0xd563fccc), TOBN(0x48ca5055, 0xf280a928),
+              TOBN(0xe00b81b2, 0x27b578cf), TOBN(0x10aad918, 0x2994a514),
+              TOBN(0xd9e07b62, 0xb7bdc953), TOBN(0x9f0f6ff2, 0x5bc086dd),
+              TOBN(0x09d1ccff, 0x655eee77), TOBN(0x45475f79, 0x5bef7df1),
+              TOBN(0x3faa28fa, 0x86f702cc), TOBN(0x92e60905, 0x0f021f07),
+              TOBN(0xe9e62968, 0x7f8fa8c6), TOBN(0xbd71419a, 0xf036ea2c),
+              TOBN(0x171ee1cc, 0x6028da9a), TOBN(0x5352fe1a, 0xc251f573),
+              TOBN(0xf8ff236e, 0x3fa997f4), TOBN(0xd831b6c9, 0xa5749d5f),
+              TOBN(0x7c872e1d, 0xe350e2c2), TOBN(0xc56240d9, 0x1e0ce403),
+              TOBN(0xf9deb077, 0x6974f5cb), TOBN(0x7d50ba87, 0x961c3728),
+              TOBN(0xd6f89426, 0x5a3a2518), TOBN(0xcf817799, 0xc6303d43),
+              TOBN(0x510a0471, 0x619e5696), TOBN(0xab049ff6, 0x3a5e307b),
+              TOBN(0xe4cdf9b0, 0xfeb13ec7), TOBN(0xd5e97117, 0x9d8ff90c),
+              TOBN(0xf6f64d06, 0x9afa96af), TOBN(0x00d0bf5e, 0x9d2012a2),
+              TOBN(0xe63f301f, 0x358bcdc0), TOBN(0x07689e99, 0x0a9d47f8),
+              TOBN(0x1f689e2f, 0x4f43d43a), TOBN(0x4d542a16, 0x90920904),
+              TOBN(0xaea293d5, 0x9ca0a707), TOBN(0xd061fe45, 0x8ac68065),
+              TOBN(0x1033bf1b, 0x0090008c), TOBN(0x29749558, 0xc08a6db6),
+              TOBN(0x74b5fc59, 0xc1d5d034), TOBN(0xf712e9f6, 0x67e215e0),
+              TOBN(0xfd520cbd, 0x860200e6), TOBN(0x0229acb4, 0x3ea22588),
+              TOBN(0x9cd1e14c, 0xfff0c82e), TOBN(0x87684b62, 0x59c69e73),
+              TOBN(0xda85e61c, 0x96ccb989), TOBN(0x2d5dbb02, 0xa3d06493),
+              TOBN(0xf22ad33a, 0xe86b173c), TOBN(0xe8e41ea5, 0xa79ff0e3),
+              TOBN(0x01d2d725, 0xdd0d0c10), TOBN(0x31f39088, 0x032d28f9),
+              TOBN(0x7b3f71e1, 0x7829839e), TOBN(0x0cf691b4, 0x4502ae58),
+              TOBN(0xef658dbd, 0xbefc6115), TOBN(0xa5cd6ee5, 0xb3ab5314),
+              TOBN(0x206c8d7b, 0x5f1d2347), TOBN(0x794645ba, 0x4cc2253a),
+              TOBN(0xd517d8ff, 0x58389e08), TOBN(0x4fa20dee, 0x9f847288),
+              TOBN(0xeba072d8, 0xd797770a), TOBN(0x7360c91d, 0xbf429e26),
+              TOBN(0x7200a3b3, 0x80af8279), TOBN(0x6a1c9150, 0x82dadce3),
+              TOBN(0x0ee6d3a7, 0xc35d8794), TOBN(0x042e6558, 0x0356bae5),
+              TOBN(0x9f59698d, 0x643322fd), TOBN(0x9379ae15, 0x50a61967),
+              TOBN(0x64b9ae62, 0xfcc9981e), TOBN(0xaed3d631, 0x6d2934c6),
+              TOBN(0x2454b302, 0x5e4e65eb), TOBN(0xab09f647, 0xf9950428) },
+          { TOBN(0xb2083a12, 0x22248acc), TOBN(0x1f6ec0ef, 0x3264e366),
+              TOBN(0x5659b704, 0x5afdee28), TOBN(0x7a823a40, 0xe6430bb5),
+              TOBN(0x24592a04, 0xe1900a79), TOBN(0xcde09d4a, 0xc9ee6576),
+              TOBN(0x52b6463f, 0x4b5ea54a), TOBN(0x1efe9ed3, 0xd3ca65a7),
+              TOBN(0xe27a6dbe, 0x305406dd), TOBN(0x8eb7dc7f, 0xdd5d1957),
+              TOBN(0xf54a6876, 0x387d4d8f), TOBN(0x9c479409, 0xc7762de4),
+              TOBN(0xbe4d5b5d, 0x99b30778), TOBN(0x25380c56, 0x6e793682),
+              TOBN(0x602d37f3, 0xdac740e3), TOBN(0x140deabe, 0x1566e4ae),
+              TOBN(0x4481d067, 0xafd32acf), TOBN(0xd8f0fcca, 0xe1f71ccf),
+              TOBN(0xd208dd0c, 0xb596f2da), TOBN(0xd049d730, 0x9aad93f9),
+              TOBN(0xc79f263d, 0x42ab580e), TOBN(0x09411bb1, 0x23f707b4),
+              TOBN(0x8cfde1ff, 0x835e0eda), TOBN(0x72707490, 0x90f03402),
+              TOBN(0xeaee6126, 0xc49a861e), TOBN(0x024f3b65, 0xe14f0d06),
+              TOBN(0x51a3f1e8, 0xc69bfc17), TOBN(0xc3c3a8e9, 0xa7686381),
+              TOBN(0x3400752c, 0xb103d4c8), TOBN(0x02bc4613, 0x9218b36b),
+              TOBN(0xc67f75eb, 0x7651504a), TOBN(0xd6848b56, 0xd02aebfa),
+              TOBN(0xbd9802e6, 0xc30fa92b), TOBN(0x5a70d96d, 0x9a552784),
+              TOBN(0x9085c4ea, 0x3f83169b), TOBN(0xfa9423bb, 0x06908228),
+              TOBN(0x2ffebe12, 0xfe97a5b9), TOBN(0x85da6049, 0x71b99118),
+              TOBN(0x9cbc2f7f, 0x63178846), TOBN(0xfd96bc70, 0x9153218e),
+              TOBN(0x958381db, 0x1782269b), TOBN(0xae34bf79, 0x2597e550),
+              TOBN(0xbb5c6064, 0x5f385153), TOBN(0x6f0e96af, 0xe3088048),
+              TOBN(0xbf6a0215, 0x77884456), TOBN(0xb3b5688c, 0x69310ea7),
+              TOBN(0x17c94295, 0x04fad2de), TOBN(0xe020f0e5, 0x17896d4d),
+              TOBN(0x730ba0ab, 0x0976505f), TOBN(0x567f6813, 0x095e2ec5),
+              TOBN(0x47062010, 0x6331ab71), TOBN(0x72cfa977, 0x41d22b9f),
+              TOBN(0x33e55ead, 0x8a2373da), TOBN(0xa8d0d5f4, 0x7ba45a68),
+              TOBN(0xba1d8f9c, 0x03029d15), TOBN(0x8f34f1cc, 0xfc55b9f3),
+              TOBN(0xcca4428d, 0xbbe5a1a9), TOBN(0x8187fd5f, 0x3126bd67),
+              TOBN(0x0036973a, 0x48105826), TOBN(0xa39b6663, 0xb8bd61a0),
+              TOBN(0x6d42deef, 0x2d65a808), TOBN(0x4969044f, 0x94636b19),
+              TOBN(0xf611ee47, 0xdd5d564c), TOBN(0x7b2f3a49, 0xd2873077),
+              TOBN(0x94157d45, 0x300eb294), TOBN(0x2b2a656e, 0x169c1494),
+              TOBN(0xc000dd76, 0xd3a47aa9), TOBN(0xa2864e4f, 0xa6243ea4),
+              TOBN(0x82716c47, 0xdb89842e), TOBN(0x12dfd7d7, 0x61479fb7),
+              TOBN(0x3b9a2c56, 0xe0b2f6dc), TOBN(0x46be862a, 0xd7f85d67),
+              TOBN(0x03b0d8dd, 0x0f82b214), TOBN(0x460c34f9, 0xf103cbc6),
+              TOBN(0xf32e5c03, 0x18d79e19), TOBN(0x8b8888ba, 0xa84117f8),
+              TOBN(0x8f3c37dc, 0xc0722677), TOBN(0x10d21be9, 0x1c1c0f27),
+              TOBN(0xd47c8468, 0xe0f7a0c6), TOBN(0x9bf02213, 0xadecc0e0),
+              TOBN(0x0baa7d12, 0x42b48b99), TOBN(0x1bcb665d, 0x48424096),
+              TOBN(0x8b847cd6, 0xebfb5cfb), TOBN(0x87c2ae56, 0x9ad4d10d),
+              TOBN(0xf1cbb122, 0x0de36726), TOBN(0xe7043c68, 0x3fdfbd21),
+              TOBN(0x4bd0826a, 0x4e79d460), TOBN(0x11f5e598, 0x4bd1a2cb),
+              TOBN(0x97554160, 0xb7fe7b6e), TOBN(0x7d16189a, 0x400a3fb2),
+              TOBN(0xd73e9bea, 0xe328ca1e), TOBN(0x0dd04b97, 0xe793d8cc),
+              TOBN(0xa9c83c9b, 0x506db8cc), TOBN(0x5cd47aae, 0xcf38814c),
+              TOBN(0x26fc430d, 0xb64b45e6), TOBN(0x079b5499, 0xd818ea84),
+              TOBN(0xebb01102, 0xc1c24a3b), TOBN(0xca24e568, 0x1c161c1a),
+              TOBN(0x103eea69, 0x36f00a4a), TOBN(0x9ad76ee8, 0x76176c7b),
+              TOBN(0x97451fc2, 0x538e0ff7), TOBN(0x94f89809, 0x6604b3b0),
+              TOBN(0x6311436e, 0x3249cfd7), TOBN(0x27b4a7bd, 0x41224f69),
+              TOBN(0x03b5d21a, 0xe0ac2941), TOBN(0x279b0254, 0xc2d31937),
+              TOBN(0x3307c052, 0xcac992d0), TOBN(0x6aa7cb92, 0xefa8b1f3),
+              TOBN(0x5a182580, 0x0d37c7a5), TOBN(0x13380c37, 0x342d5422),
+              TOBN(0x92ac2d66, 0xd5d2ef92), TOBN(0x035a70c9, 0x030c63c6),
+              TOBN(0xc16025dd, 0x4ce4f152), TOBN(0x1f419a71, 0xf9df7c06),
+              TOBN(0x6d5b2214, 0x91e4bb14), TOBN(0xfc43c6cc, 0x839fb4ce),
+              TOBN(0x49f06591, 0x925d6b2d), TOBN(0x4b37d9d3, 0x62186598),
+              TOBN(0x8c54a971, 0xd01b1629), TOBN(0xe1a9c29f, 0x51d50e05),
+              TOBN(0x5109b785, 0x71ba1861), TOBN(0x48b22d5c, 0xd0c8f93d),
+              TOBN(0xe8fa84a7, 0x8633bb93), TOBN(0x53fba6ba, 0x5aebbd08),
+              TOBN(0x7ff27df3, 0xe5eea7d8), TOBN(0x521c8796, 0x68ca7158),
+              TOBN(0xb9d5133b, 0xce6f1a05), TOBN(0x2d50cd53, 0xfd0ebee4),
+              TOBN(0xc82115d6, 0xc5a3ef16), TOBN(0x993eff9d, 0xba079221),
+              TOBN(0xe4da2c5e, 0x4b5da81c), TOBN(0x9a89dbdb, 0x8033fd85),
+              TOBN(0x60819ebf, 0x2b892891), TOBN(0x53902b21, 0x5d14a4d5),
+              TOBN(0x6ac35051, 0xd7fda421), TOBN(0xcc6ab885, 0x61c83284),
+              TOBN(0x14eba133, 0xf74cff17), TOBN(0x240aaa03, 0xecb813f2),
+              TOBN(0xcfbb6540, 0x6f665bee), TOBN(0x084b1fe4, 0xa425ad73),
+              TOBN(0x009d5d16, 0xd081f6a6), TOBN(0x35304fe8, 0xeef82c90),
+              TOBN(0xf20346d5, 0xaa9eaa22), TOBN(0x0ada9f07, 0xac1c91e3),
+              TOBN(0xa6e21678, 0x968a6144), TOBN(0x54c1f77c, 0x07b31a1e),
+              TOBN(0xd6bb787e, 0x5781fbe1), TOBN(0x61bd2ee0, 0xe31f1c4a),
+              TOBN(0xf25aa1e9, 0x781105fc), TOBN(0x9cf2971f, 0x7b2f8e80),
+              TOBN(0x26d15412, 0xcdff919b), TOBN(0x01db4ebe, 0x34bc896e),
+              TOBN(0x7d9b3e23, 0xb40df1cf), TOBN(0x59337373, 0x94e971b4),
+              TOBN(0xbf57bd14, 0x669cf921), TOBN(0x865daedf, 0x0c1a1064),
+              TOBN(0x3eb70bd3, 0x83279125), TOBN(0xbc3d5b9f, 0x34ecdaab),
+              TOBN(0x91e3ed7e, 0x5f755caf), TOBN(0x49699f54, 0xd41e6f02),
+              TOBN(0x185770e1, 0xd4a7a15b), TOBN(0x08f3587a, 0xeaac87e7),
+              TOBN(0x352018db, 0x473133ea), TOBN(0x674ce719, 0x04fd30fc),
+              TOBN(0x7b8d9835, 0x088b3e0e), TOBN(0x7a0356a9, 0x5d0d47a1),
+              TOBN(0x9d9e7659, 0x6474a3c4), TOBN(0x61ea48a7, 0xff66966c),
+              TOBN(0x30417758, 0x0f3e4834), TOBN(0xfdbb21c2, 0x17a9afcb),
+              TOBN(0x756fa17f, 0x2f9a67b3), TOBN(0x2a6b2421, 0xa245c1a8),
+              TOBN(0x64be2794, 0x4af02291), TOBN(0xade465c6, 0x2a5804fe),
+              TOBN(0x8dffbd39, 0xa6f08fd7), TOBN(0xc4efa84c, 0xaa14403b),
+              TOBN(0xa1b91b2a, 0x442b0f5c), TOBN(0xb748e317, 0xcf997736),
+              TOBN(0x8d1b62bf, 0xcee90e16), TOBN(0x907ae271, 0x0b2078c0),
+              TOBN(0xdf31534b, 0x0c9bcddd), TOBN(0x043fb054, 0x39adce83),
+              TOBN(0x99031043, 0xd826846a), TOBN(0x61a9c0d6, 0xb144f393),
+              TOBN(0xdab48046, 0x47718427), TOBN(0xdf17ff9b, 0x6e830f8b),
+              TOBN(0x408d7ee8, 0xe49a1347), TOBN(0x6ac71e23, 0x91c1d4ae),
+              TOBN(0xc8cbb9fd, 0x1defd73c), TOBN(0x19840657, 0xbbbbfec5),
+              TOBN(0x39db1cb5, 0x9e7ef8ea), TOBN(0x78aa8296, 0x64105f30),
+              TOBN(0xa3d9b7f0, 0xa3738c29), TOBN(0x0a2f235a, 0xbc3250a3),
+              TOBN(0x55e506f6, 0x445e4caf), TOBN(0x0974f73d, 0x33475f7a),
+              TOBN(0xd37dbba3, 0x5ba2f5a8), TOBN(0x542c6e63, 0x6af40066),
+              TOBN(0x26d99b53, 0xc5d73e2c), TOBN(0x06060d7d, 0x6c3ca33e),
+              TOBN(0xcdbef1c2, 0x065fef4a), TOBN(0x77e60f7d, 0xfd5b92e3),
+              TOBN(0xd7c549f0, 0x26708350), TOBN(0x201b3ad0, 0x34f121bf),
+              TOBN(0x5fcac2a1, 0x0334fc14), TOBN(0x8a9a9e09, 0x344552f6),
+              TOBN(0x7dd8a1d3, 0x97653082), TOBN(0x5fc0738f, 0x79d4f289),
+              TOBN(0x787d244d, 0x17d2d8c3), TOBN(0xeffc6345, 0x70830684),
+              TOBN(0x5ddb96dd, 0xe4f73ae5), TOBN(0x8efb14b1, 0x172549a5),
+              TOBN(0x6eb73eee, 0x2245ae7a), TOBN(0xbca4061e, 0xea11f13e),
+              TOBN(0xb577421d, 0x30b01f5d), TOBN(0xaa688b24, 0x782e152c),
+              TOBN(0x67608e71, 0xbd3502ba), TOBN(0x4ef41f24, 0xb4de75a0),
+              TOBN(0xb08dde5e, 0xfd6125e5), TOBN(0xde484825, 0xa409543f),
+              TOBN(0x1f198d98, 0x65cc2295), TOBN(0x428a3771, 0x6e0edfa2),
+              TOBN(0x4f9697a2, 0xadf35fc7), TOBN(0x01a43c79, 0xf7cac3c7),
+              TOBN(0xb05d7059, 0x0fd3659a), TOBN(0x8927f30c, 0xbb7f2d9a),
+              TOBN(0x4023d1ac, 0x8cf984d3), TOBN(0x32125ed3, 0x02897a45),
+              TOBN(0xfb572dad, 0x3d414205), TOBN(0x73000ef2, 0xe3fa82a9),
+              TOBN(0x4c0868e9, 0xf10a5581), TOBN(0x5b61fc67, 0x6b0b3ca5),
+              TOBN(0xc1258d5b, 0x7cae440c), TOBN(0x21c08b41, 0x402b7531),
+              TOBN(0xf61a8955, 0xde932321), TOBN(0x3568faf8, 0x2d1408af),
+              TOBN(0x71b15e99, 0x9ecf965b), TOBN(0xf14ed248, 0xe917276f),
+              TOBN(0xc6f4caa1, 0x820cf9e2), TOBN(0x681b20b2, 0x18d83c7e),
+              TOBN(0x6cde738d, 0xc6c01120), TOBN(0x71db0813, 0xae70e0db),
+              TOBN(0x95fc0644, 0x74afe18c), TOBN(0x34619053, 0x129e2be7),
+              TOBN(0x80615cea, 0xdb2a3b15), TOBN(0x0a49a19e, 0xdb4c7073),
+              TOBN(0x0e1b84c8, 0x8fd2d367), TOBN(0xd74bf462, 0x033fb8aa),
+              TOBN(0x889f6d65, 0x533ef217), TOBN(0x7158c7e4, 0xc3ca2e87),
+              TOBN(0xfb670dfb, 0xdc2b4167), TOBN(0x75910a01, 0x844c257f),
+              TOBN(0xf336bf07, 0xcf88577d), TOBN(0x22245250, 0xe45e2ace),
+              TOBN(0x2ed92e8d, 0x7ca23d85), TOBN(0x29f8be4c, 0x2b812f58),
+              TOBN(0xdd9ebaa7, 0x076fe12b), TOBN(0x3f2400cb, 0xae1537f9),
+              TOBN(0x1aa93528, 0x17bdfb46), TOBN(0xc0f98430, 0x67883b41),
+              TOBN(0x5590ede1, 0x0170911d), TOBN(0x7562f5bb, 0x34d4b17f),
+              TOBN(0xe1fa1df2, 0x1826b8d2), TOBN(0xb40b796a, 0x6bd80d59),
+              TOBN(0xd65bf197, 0x3467ba92), TOBN(0x8c9b46db, 0xf70954b0),
+              TOBN(0x97c8a0f3, 0x0e78f15d), TOBN(0xa8f3a69a, 0x85a4c961),
+              TOBN(0x4242660f, 0x61e4ce9b), TOBN(0xbf06aab3, 0x6ea6790c),
+              TOBN(0xc6706f8e, 0xec986416), TOBN(0x9e56dec1, 0x9a9fc225),
+              TOBN(0x527c46f4, 0x9a9898d9), TOBN(0xd799e77b, 0x5633cdef),
+              TOBN(0x24eacc16, 0x7d9e4297), TOBN(0xabb61cea, 0x6b1cb734),
+              TOBN(0xbee2e8a7, 0xf778443c), TOBN(0x3bb42bf1, 0x29de2fe6),
+              TOBN(0xcbed86a1, 0x3003bb6f), TOBN(0xd3918e6c, 0xd781cdf6),
+              TOBN(0x4bee3271, 0x9a5103f1), TOBN(0x5243efc6, 0xf50eac06),
+              TOBN(0xb8e122cb, 0x6adcc119), TOBN(0x1b7faa84, 0xc0b80a08),
+              TOBN(0x32c3d1bd, 0x6dfcd08c), TOBN(0x129dec4e, 0x0be427de),
+              TOBN(0x98ab679c, 0x1d263c83), TOBN(0xafc83cb7, 0xcef64eff),
+              TOBN(0x85eb6088, 0x2fa6be76), TOBN(0x892585fb, 0x1328cbfe),
+              TOBN(0xc154d3ed, 0xcf618dda), TOBN(0xc44f601b, 0x3abaf26e),
+              TOBN(0x7bf57d0b, 0x2be1fdfd), TOBN(0xa833bd2d, 0x21137fee),
+              TOBN(0x9353af36, 0x2db591a8), TOBN(0xc76f26dc, 0x5562a056),
+              TOBN(0x1d87e47d, 0x3fdf5a51), TOBN(0x7afb5f93, 0x55c9cab0),
+              TOBN(0x91bbf58f, 0x89e0586e), TOBN(0x7c72c018, 0x0d843709),
+              TOBN(0xa9a5aafb, 0x99b5c3dc), TOBN(0xa48a0f1d, 0x3844aeb0),
+              TOBN(0x7178b7dd, 0xb667e482), TOBN(0x453985e9, 0x6e23a59a),
+              TOBN(0x4a54c860, 0x01b25dd8), TOBN(0x0dd37f48, 0xfb897c8a),
+              TOBN(0x5f8aa610, 0x0ea90cd9), TOBN(0xc8892c68, 0x16d5830d),
+              TOBN(0xeb4befc0, 0xef514ca5), TOBN(0x478eb679, 0xe72c9ee6),
+              TOBN(0x9bca20da, 0xdbc40d5f), TOBN(0xf015de21, 0xdde4f64a),
+              TOBN(0xaa6a4de0, 0xeaf4b8a5), TOBN(0x68cfd9ca, 0x4bc60e32),
+              TOBN(0x668a4b01, 0x7fd15e70), TOBN(0xd9f0694a, 0xf27dc09d),
+              TOBN(0xf6c3cad5, 0xba708bcd), TOBN(0x5cd2ba69, 0x5bb95c2a),
+              TOBN(0xaa28c1d3, 0x33c0a58f), TOBN(0x23e274e3, 0xabc77870),
+              TOBN(0x44c3692d, 0xdfd20a4a), TOBN(0x091c5fd3, 0x81a66653),
+              TOBN(0x6c0bb691, 0x09a0757d), TOBN(0x9072e8b9, 0x667343ea),
+              TOBN(0x31d40eb0, 0x80848bec), TOBN(0x95bd480a, 0x79fd36cc),
+              TOBN(0x01a77c61, 0x65ed43f5), TOBN(0xafccd127, 0x2e0d40bf),
+              TOBN(0xeccfc82d, 0x1cc1884b), TOBN(0xc85ac201, 0x5d4753b4),
+              TOBN(0xc7a6caac, 0x658e099f), TOBN(0xcf46369e, 0x04b27390),
+              TOBN(0xe2e7d049, 0x506467ea), TOBN(0x481b63a2, 0x37cdeccc),
+              TOBN(0x4029abd8, 0xed80143a), TOBN(0x28bfe3c7, 0xbcb00b88),
+              TOBN(0x3bec1009, 0x0643d84a), TOBN(0x885f3668, 0xabd11041),
+              TOBN(0xdb02432c, 0xf83a34d6), TOBN(0x32f7b360, 0x719ceebe),
+              TOBN(0xf06c7837, 0xdad1fe7a), TOBN(0x60a157a9, 0x5441a0b0),
+              TOBN(0x704970e9, 0xe2d47550), TOBN(0xcd2bd553, 0x271b9020),
+              TOBN(0xff57f82f, 0x33e24a0b), TOBN(0x9cbee23f, 0xf2565079),
+              TOBN(0x16353427, 0xeb5f5825), TOBN(0x276feec4, 0xe948d662),
+              TOBN(0xd1b62bc6, 0xda10032b), TOBN(0x718351dd, 0xf0e72a53),
+              TOBN(0x93452076, 0x2420e7ba), TOBN(0x96368fff, 0x3a00118d),
+              TOBN(0x00ce2d26, 0x150a49e4), TOBN(0x0c28b636, 0x3f04706b),
+              TOBN(0xbad65a46, 0x58b196d0), TOBN(0x6c8455fc, 0xec9f8b7c),
+              TOBN(0xe90c895f, 0x2d71867e), TOBN(0x5c0be31b, 0xedf9f38c),
+              TOBN(0x2a37a15e, 0xd8f6ec04), TOBN(0x239639e7, 0x8cd85251),
+              TOBN(0xd8975315, 0x9c7c4c6b), TOBN(0x603aa3c0, 0xd7409af7),
+              TOBN(0xb8d53d0c, 0x007132fb), TOBN(0x68d12af7, 0xa6849238),
+              TOBN(0xbe0607e7, 0xbf5d9279), TOBN(0x9aa50055, 0xaada74ce),
+              TOBN(0xe81079cb, 0xba7e8ccb), TOBN(0x610c71d1, 0xa5f4ff5e),
+              TOBN(0x9e2ee1a7, 0x5aa07093), TOBN(0xca84004b, 0xa75da47c),
+              TOBN(0x074d3951, 0x3de75401), TOBN(0xf938f756, 0xbb311592),
+              TOBN(0x96197618, 0x00a43421), TOBN(0x39a25362, 0x07bc78c8),
+              TOBN(0x278f710a, 0x0a171276), TOBN(0xb28446ea, 0x8d1a8f08),
+              TOBN(0x184781bf, 0xe3b6a661), TOBN(0x7751cb1d, 0xe6d279f7),
+              TOBN(0xf8ff95d6, 0xc59eb662), TOBN(0x186d90b7, 0x58d3dea7),
+              TOBN(0x0e4bb6c1, 0xdfb4f754), TOBN(0x5c5cf56b, 0x2b2801dc),
+              TOBN(0xc561e452, 0x1f54564d), TOBN(0xb4fb8c60, 0xf0dd7f13),
+              TOBN(0xf8849630, 0x33ff98c7), TOBN(0x9619fffa, 0xcf17769c),
+              TOBN(0xf8090bf6, 0x1bfdd80a), TOBN(0x14d9a149, 0x422cfe63),
+              TOBN(0xb354c360, 0x6f6df9ea), TOBN(0xdbcf770d, 0x218f17ea),
+              TOBN(0x207db7c8, 0x79eb3480), TOBN(0x213dbda8, 0x559b6a26),
+              TOBN(0xac4c200b, 0x29fc81b3), TOBN(0xebc3e09f, 0x171d87c1),
+              TOBN(0x91799530, 0x1481aa9e), TOBN(0x051b92e1, 0x92e114fa),
+              TOBN(0xdf8f92e9, 0xecb5537f), TOBN(0x44b1b2cc, 0x290c7483),
+              TOBN(0xa711455a, 0x2adeb016), TOBN(0x964b6856, 0x81a10c2c),
+              TOBN(0x4f159d99, 0xcec03623), TOBN(0x05532225, 0xef3271ea),
+              TOBN(0xb231bea3, 0xc5ee4849), TOBN(0x57a54f50, 0x7094f103),
+              TOBN(0x3e2d421d, 0x9598b352), TOBN(0xe865a49c, 0x67412ab4),
+              TOBN(0xd2998a25, 0x1cc3a912), TOBN(0x5d092808, 0x0c74d65d),
+              TOBN(0x73f45908, 0x4088567a), TOBN(0xeb6b280e, 0x1f214a61),
+              TOBN(0x8c9adc34, 0xcaf0c13d), TOBN(0x39d12938, 0xf561fb80),
+              TOBN(0xb2dc3a5e, 0xbc6edfb4), TOBN(0x7485b1b1, 0xfe4d210e),
+              TOBN(0x062e0400, 0xe186ae72), TOBN(0x91e32d5c, 0x6eeb3b88),
+              TOBN(0x6df574d7, 0x4be59224), TOBN(0xebc88ccc, 0x716d55f3),
+              TOBN(0x26c2e6d0, 0xcad6ed33), TOBN(0xc6e21e7d, 0x0d3e8b10),
+              TOBN(0x2cc5840e, 0x5bcc36bb), TOBN(0x9292445e, 0x7da74f69),
+              TOBN(0x8be8d321, 0x4e5193a8), TOBN(0x3ec23629, 0x8df06413),
+              TOBN(0xc7e9ae85, 0xb134defa), TOBN(0x6073b1d0, 0x1bb2d475),
+              TOBN(0xb9ad615e, 0x2863c00d), TOBN(0x9e29493d, 0x525f4ac4),
+              TOBN(0xc32b1dea, 0x4e9acf4f), TOBN(0x3e1f01c8, 0xa50db88d),
+              TOBN(0xb05d70ea, 0x04da916c), TOBN(0x714b0d0a, 0xd865803e),
+              TOBN(0x4bd493fc, 0x9920cb5e), TOBN(0x5b44b1f7, 0x92c7a3ac),
+              TOBN(0xa2a77293, 0xbcec9235), TOBN(0x5ee06e87, 0xcd378553),
+              TOBN(0xceff8173, 0xda621607), TOBN(0x2bb03e4c, 0x99f5d290),
+              TOBN(0x2945106a, 0xa6f734ac), TOBN(0xb5056604, 0xd25c4732),
+              TOBN(0x5945920c, 0xe079afee), TOBN(0x686e17a0, 0x6789831f),
+              TOBN(0x5966bee8, 0xb74a5ae5), TOBN(0x38a673a2, 0x1e258d46),
+              TOBN(0xbd1cc1f2, 0x83141c95), TOBN(0x3b2ecf4f, 0x0e96e486),
+              TOBN(0xcd3aa896, 0x74e5fc78), TOBN(0x415ec10c, 0x2482fa7a),
+              TOBN(0x15234419, 0x80503380), TOBN(0x513d917a, 0xd314b392),
+              TOBN(0xb0b52f4e, 0x63caecae), TOBN(0x07bf22ad, 0x2dc7780b),
+              TOBN(0xe761e8a1, 0xe4306839), TOBN(0x1b3be962, 0x5dd7feaa),
+              TOBN(0x4fe728de, 0x74c778f1), TOBN(0xf1fa0bda, 0x5e0070f6),
+              TOBN(0x85205a31, 0x6ec3f510), TOBN(0x2c7e4a14, 0xd2980475),
+              TOBN(0xde3c19c0, 0x6f30ebfd), TOBN(0xdb1c1f38, 0xd4b7e644),
+              TOBN(0xfe291a75, 0x5dce364a), TOBN(0xb7b22a3c, 0x058f5be3),
+              TOBN(0x2cd2c302, 0x37fea38c), TOBN(0x2930967a, 0x2e17be17),
+              TOBN(0x87f009de, 0x0c061c65), TOBN(0xcb014aac, 0xedc6ed44),
+              TOBN(0x49bd1cb4, 0x3bafb1eb), TOBN(0x81bd8b5c, 0x282d3688),
+              TOBN(0x1cdab87e, 0xf01a17af), TOBN(0x21f37ac4, 0xe710063b),
+              TOBN(0x5a6c5676, 0x42fc8193), TOBN(0xf4753e70, 0x56a6015c),
+              TOBN(0x020f795e, 0xa15b0a44), TOBN(0x8f37c8d7, 0x8958a958),
+              TOBN(0x63b7e89b, 0xa4b675b5), TOBN(0xb4fb0c0c, 0x0fc31aea),
+              TOBN(0xed95e639, 0xa7ff1f2e), TOBN(0x9880f5a3, 0x619614fb),
+              TOBN(0xdeb6ff02, 0x947151ab), TOBN(0x5bc5118c, 0xa868dcdb),
+              TOBN(0xd8da2055, 0x4c20cea5), TOBN(0xcac2776e, 0x14c4d69a),
+              TOBN(0xcccb22c1, 0x622d599b), TOBN(0xa4ddb653, 0x68a9bb50),
+              TOBN(0x2c4ff151, 0x1b4941b4), TOBN(0xe1ff19b4, 0x6efba588),
+              TOBN(0x35034363, 0xc48345e0), TOBN(0x45542e3d, 0x1e29dfc4),
+              TOBN(0xf197cb91, 0x349f7aed), TOBN(0x3b2b5a00, 0x8fca8420),
+              TOBN(0x7c175ee8, 0x23aaf6d8), TOBN(0x54dcf421, 0x35af32b6),
+              TOBN(0x0ba14307, 0x27d6561e), TOBN(0x879d5ee4, 0xd175b1e2),
+              TOBN(0xc7c43673, 0x99807db5), TOBN(0x77a54455, 0x9cd55bcd),
+              TOBN(0xe6c2ff13, 0x0105c072), TOBN(0x18f7a99f, 0x8dda7da4),
+              TOBN(0x4c301820, 0x0e2d35c1), TOBN(0x06a53ca0, 0xd9cc6c82),
+              TOBN(0xaa21cc1e, 0xf1aa1d9e), TOBN(0x32414334, 0x4a75b1e8),
+              TOBN(0x2a6d1328, 0x0ebe9fdc), TOBN(0x16bd173f, 0x98a4755a),
+              TOBN(0xfbb9b245, 0x2133ffd9), TOBN(0x39a8b2f1, 0x830f1a20),
+              TOBN(0x484bc97d, 0xd5a1f52a), TOBN(0xd6aebf56, 0xa40eddf8),
+              TOBN(0x32257acb, 0x76ccdac6), TOBN(0xaf4d36ec, 0x1586ff27),
+              TOBN(0x8eaa8863, 0xf8de7dd1), TOBN(0x0045d5cf, 0x88647c16) },
+          { TOBN(0xa6f3d574, 0xc005979d), TOBN(0xc2072b42, 0x6a40e350),
+              TOBN(0xfca5c156, 0x8de2ecf9), TOBN(0xa8c8bf5b, 0xa515344e),
+              TOBN(0x97aee555, 0x114df14a), TOBN(0xd4374a4d, 0xfdc5ec6b),
+              TOBN(0x754cc28f, 0x2ca85418), TOBN(0x71cb9e27, 0xd3c41f78),
+              TOBN(0x89105079, 0x03605c39), TOBN(0xf0843d9e, 0xa142c96c),
+              TOBN(0xf3744934, 0x16923684), TOBN(0x732caa2f, 0xfa0a2893),
+              TOBN(0xb2e8c270, 0x61160170), TOBN(0xc32788cc, 0x437fbaa3),
+              TOBN(0x39cd818e, 0xa6eda3ac), TOBN(0xe2e94239, 0x9e2b2e07),
+              TOBN(0x6967d39b, 0x0260e52a), TOBN(0xd42585cc, 0x90653325),
+              TOBN(0x0d9bd605, 0x21ca7954), TOBN(0x4fa20877, 0x81ed57b3),
+              TOBN(0x60c1eff8, 0xe34a0bbe), TOBN(0x56b0040c, 0x84f6ef64),
+              TOBN(0x28be2b24, 0xb1af8483), TOBN(0xb2278163, 0xf5531614),
+              TOBN(0x8df27545, 0x5922ac1c), TOBN(0xa7b3ef5c, 0xa52b3f63),
+              TOBN(0x8e77b214, 0x71de57c4), TOBN(0x31682c10, 0x834c008b),
+              TOBN(0xc76824f0, 0x4bd55d31), TOBN(0xb6d1c086, 0x17b61c71),
+              TOBN(0x31db0903, 0xc2a5089d), TOBN(0x9c092172, 0x184e5d3f),
+              TOBN(0xdd7ced5b, 0xc00cc638), TOBN(0x1a2015eb, 0x61278fc2),
+              TOBN(0x2e8e5288, 0x6a37f8d6), TOBN(0xc457786f, 0xe79933ad),
+              TOBN(0xb3fe4cce, 0x2c51211a), TOBN(0xad9b10b2, 0x24c20498),
+              TOBN(0x90d87a4f, 0xd28db5e5), TOBN(0x698cd105, 0x3aca2fc3),
+              TOBN(0x4f112d07, 0xe91b536d), TOBN(0xceb982f2, 0x9eba09d6),
+              TOBN(0x3c157b2c, 0x197c396f), TOBN(0xe23c2d41, 0x7b66eb24),
+              TOBN(0x480c57d9, 0x3f330d37), TOBN(0xb3a4c8a1, 0x79108deb),
+              TOBN(0x702388de, 0xcb199ce5), TOBN(0x0b019211, 0xb944a8d4),
+              TOBN(0x24f2a692, 0x840bb336), TOBN(0x7c353bdc, 0xa669fa7b),
+              TOBN(0xda20d6fc, 0xdec9c300), TOBN(0x625fbe2f, 0xa13a4f17),
+              TOBN(0xa2b1b61a, 0xdbc17328), TOBN(0x008965bf, 0xa9515621),
+              TOBN(0x49690939, 0xc620ff46), TOBN(0x182dd27d, 0x8717e91c),
+              TOBN(0x5ace5035, 0xea6c3997), TOBN(0x54259aaa, 0xc2610bef),
+              TOBN(0xef18bb3f, 0x3c80dd39), TOBN(0x6910b95b, 0x5fc3fa39),
+              TOBN(0xfce2f510, 0x43e09aee), TOBN(0xced56c9f, 0xa7675665),
+              TOBN(0x10e265ac, 0xd872db61), TOBN(0x6982812e, 0xae9fce69),
+              TOBN(0x29be11c6, 0xce800998), TOBN(0x72bb1752, 0xb90360d9),
+              TOBN(0x2c193197, 0x5a4ad590), TOBN(0x2ba2f548, 0x9fc1dbc0),
+              TOBN(0x7fe4eebb, 0xe490ebe0), TOBN(0x12a0a4cd, 0x7fae11c0),
+              TOBN(0x7197cf81, 0xe903ba37), TOBN(0xcf7d4aa8, 0xde1c6dd8),
+              TOBN(0x92af6bf4, 0x3fd5684c), TOBN(0x2b26eecf, 0x80360aa1),
+              TOBN(0xbd960f30, 0x00546a82), TOBN(0x407b3c43, 0xf59ad8fe),
+              TOBN(0x86cae5fe, 0x249c82ba), TOBN(0x9e0faec7, 0x2463744c),
+              TOBN(0x87f551e8, 0x94916272), TOBN(0x033f9344, 0x6ceb0615),
+              TOBN(0x1e5eb0d1, 0x8be82e84), TOBN(0x89967f0e, 0x7a582fef),
+              TOBN(0xbcf687d5, 0xa6e921fa), TOBN(0xdfee4cf3, 0xd37a09ba),
+              TOBN(0x94f06965, 0xb493c465), TOBN(0x638b9a1c, 0x7635c030),
+              TOBN(0x76667864, 0x66f05e9f), TOBN(0xccaf6808, 0xc04da725),
+              TOBN(0xca2eb690, 0x768fccfc), TOBN(0xf402d37d, 0xb835b362),
+              TOBN(0x0efac0d0, 0xe2fdfcce), TOBN(0xefc9cdef, 0xb638d990),
+              TOBN(0x2af12b72, 0xd1669a8b), TOBN(0x33c536bc, 0x5774ccbd),
+              TOBN(0x30b21909, 0xfb34870e), TOBN(0xc38fa2f7, 0x7df25aca),
+              TOBN(0x74c5f02b, 0xbf81f3f5), TOBN(0x0525a5ae, 0xaf7e4581),
+              TOBN(0x88d2aaba, 0x433c54ae), TOBN(0xed9775db, 0x806a56c5),
+              TOBN(0xd320738a, 0xc0edb37d), TOBN(0x25fdb6ee, 0x66cc1f51),
+              TOBN(0xac661d17, 0x10600d76), TOBN(0x931ec1f3, 0xbdd1ed76),
+              TOBN(0x65c11d62, 0x19ee43f1), TOBN(0x5cd57c3e, 0x60829d97),
+              TOBN(0xd26c91a3, 0x984be6e8), TOBN(0xf08d9309, 0x8b0c53bd),
+              TOBN(0x94bc9e5b, 0xc016e4ea), TOBN(0xd3916839, 0x11d43d2b),
+              TOBN(0x886c5ad7, 0x73701155), TOBN(0xe0377626, 0x20b00715),
+              TOBN(0x7f01c9ec, 0xaa80ba59), TOBN(0x3083411a, 0x68538e51),
+              TOBN(0x970370f1, 0xe88128af), TOBN(0x625cc3db, 0x91dec14b),
+              TOBN(0xfef9666c, 0x01ac3107), TOBN(0xb2a8d577, 0xd5057ac3),
+              TOBN(0xb0f26299, 0x92be5df7), TOBN(0xf579c8e5, 0x00353924),
+              TOBN(0xb8fa3d93, 0x1341ed7a), TOBN(0x4223272c, 0xa7b59d49),
+              TOBN(0x3dcb1947, 0x83b8c4a4), TOBN(0x4e413c01, 0xed1302e4),
+              TOBN(0x6d999127, 0xe17e44ce), TOBN(0xee86bf75, 0x33b3adfb),
+              TOBN(0xf6902fe6, 0x25aa96ca), TOBN(0xb73540e4, 0xe5aae47d),
+              TOBN(0x32801d7b, 0x1b4a158c), TOBN(0xe571c99e, 0x27e2a369),
+              TOBN(0x40cb76c0, 0x10d9f197), TOBN(0xc308c289, 0x3167c0ae),
+              TOBN(0xa6ef9dd3, 0xeb7958f2), TOBN(0xa7226dfc, 0x300879b1),
+              TOBN(0x6cd0b362, 0x7edf0636), TOBN(0x4efbce6c, 0x7bc37eed),
+              TOBN(0x75f92a05, 0x8d699021), TOBN(0x586d4c79, 0x772566e3),
+              TOBN(0x378ca5f1, 0x761ad23a), TOBN(0x650d86fc, 0x1465a8ac),
+              TOBN(0x7a4ed457, 0x842ba251), TOBN(0x6b65e3e6, 0x42234933),
+              TOBN(0xaf1543b7, 0x31aad657), TOBN(0xa4cefe98, 0xcbfec369),
+              TOBN(0xb587da90, 0x9f47befb), TOBN(0x6562e9fb, 0x41312d13),
+              TOBN(0xa691ea59, 0xeff1cefe), TOBN(0xcc30477a, 0x05fc4cf6),
+              TOBN(0xa1632461, 0x0b0ffd3d), TOBN(0xa1f16f3b, 0x5b355956),
+              TOBN(0x5b148d53, 0x4224ec24), TOBN(0xdc834e7b, 0xf977012a),
+              TOBN(0x7bfc5e75, 0xb2c69dbc), TOBN(0x3aa77a29, 0x03c3da6c),
+              TOBN(0xde0df03c, 0xca910271), TOBN(0xcbd5ca4a, 0x7806dc55),
+              TOBN(0xe1ca5807, 0x6db476cb), TOBN(0xfde15d62, 0x5f37a31e),
+              TOBN(0xf49af520, 0xf41af416), TOBN(0x96c5c5b1, 0x7d342db5),
+              TOBN(0x155c43b7, 0xeb4ceb9b), TOBN(0x2e993010, 0x4e77371a),
+              TOBN(0x1d2987da, 0x675d43af), TOBN(0xef2bc1c0, 0x8599fd72),
+              TOBN(0x96894b7b, 0x9342f6b2), TOBN(0x201eadf2, 0x7c8e71f0),
+              TOBN(0xf3479d9f, 0x4a1f3efc), TOBN(0xe0f8a742, 0x702a9704),
+              TOBN(0xeafd44b6, 0xb3eba40c), TOBN(0xf9739f29, 0xc1c1e0d0),
+              TOBN(0x0091471a, 0x619d505e), TOBN(0xc15f9c96, 0x9d7c263e),
+              TOBN(0x5be47285, 0x83afbe33), TOBN(0xa3b6d6af, 0x04f1e092),
+              TOBN(0xe76526b9, 0x751a9d11), TOBN(0x2ec5b26d, 0x9a4ae4d2),
+              TOBN(0xeb66f4d9, 0x02f6fb8d), TOBN(0x4063c561, 0x96912164),
+              TOBN(0xeb7050c1, 0x80ef3000), TOBN(0x288d1c33, 0xeaa5b3f0),
+              TOBN(0xe87c68d6, 0x07806fd8), TOBN(0xb2f7f9d5, 0x4bbbf50f),
+              TOBN(0x25972f3a, 0xac8d6627), TOBN(0xf8547774, 0x10e8c13b),
+              TOBN(0xcc50ef6c, 0x872b4a60), TOBN(0xab2a34a4, 0x4613521b),
+              TOBN(0x39c5c190, 0x983e15d1), TOBN(0x61dde5df, 0x59905512),
+              TOBN(0xe417f621, 0x9f2275f3), TOBN(0x0750c8b6, 0x451d894b),
+              TOBN(0x75b04ab9, 0x78b0bdaa), TOBN(0x3bfd9fd4, 0x458589bd),
+              TOBN(0xf1013e30, 0xee9120b6), TOBN(0x2b51af93, 0x23a4743e),
+              TOBN(0xea96ffae, 0x48d14d9e), TOBN(0x71dc0dbe, 0x698a1d32),
+              TOBN(0x914962d2, 0x0180cca4), TOBN(0x1ae60677, 0xc3568963),
+              TOBN(0x8cf227b1, 0x437bc444), TOBN(0xc650c83b, 0xc9962c7a),
+              TOBN(0x23c2c7dd, 0xfe7ccfc4), TOBN(0xf925c89d, 0x1b929d48),
+              TOBN(0x4460f74b, 0x06783c33), TOBN(0xac2c8d49, 0xa590475a),
+              TOBN(0xfb40b407, 0xb807bba0), TOBN(0x9d1e362d, 0x69ff8f3a),
+              TOBN(0xa33e9681, 0xcbef64a4), TOBN(0x67ece5fa, 0x332fb4b2),
+              TOBN(0x6900a99b, 0x739f10e3), TOBN(0xc3341ca9, 0xff525925),
+              TOBN(0xee18a626, 0xa9e2d041), TOBN(0xa5a83685, 0x29580ddd),
+              TOBN(0xf3470c81, 0x9d7de3cd), TOBN(0xedf02586, 0x2062cf9c),
+              TOBN(0xf43522fa, 0xc010edb0), TOBN(0x30314135, 0x13a4b1ae),
+              TOBN(0xc792e02a, 0xdb22b94b), TOBN(0x993d8ae9, 0xa1eaa45b),
+              TOBN(0x8aad6cd3, 0xcd1e1c63), TOBN(0x89529ca7, 0xc5ce688a),
+              TOBN(0x2ccee3aa, 0xe572a253), TOBN(0xe02b6438, 0x02a21efb),
+              TOBN(0xa7091b6e, 0xc9430358), TOBN(0x06d1b1fa, 0x9d7db504),
+              TOBN(0x58846d32, 0xc4744733), TOBN(0x40517c71, 0x379f9e34),
+              TOBN(0x2f65655f, 0x130ef6ca), TOBN(0x526e4488, 0xf1f3503f),
+              TOBN(0x8467bd17, 0x7ee4a976), TOBN(0x1d9dc913, 0x921363d1),
+              TOBN(0xd8d24c33, 0xb069e041), TOBN(0x5eb5da0a, 0x2cdf7f51),
+              TOBN(0x1c0f3cb1, 0x197b994f), TOBN(0x3c95a6c5, 0x2843eae9),
+              TOBN(0x7766ffc9, 0xa6097ea5), TOBN(0x7bea4093, 0xd723b867),
+              TOBN(0xb48e1f73, 0x4db378f9), TOBN(0x70025b00, 0xe37b77ac),
+              TOBN(0x943dc8e7, 0xaf24ad46), TOBN(0xb98a15ac, 0x16d00a85),
+              TOBN(0x3adc38ba, 0x2743b004), TOBN(0xb1c7f4f7, 0x334415ee),
+              TOBN(0xea43df8f, 0x1e62d05a), TOBN(0x32618905, 0x9d76a3b6),
+              TOBN(0x2fbd0bb5, 0xa23a0f46), TOBN(0x5bc971db, 0x6a01918c),
+              TOBN(0x7801d94a, 0xb4743f94), TOBN(0xb94df65e, 0x676ae22b),
+              TOBN(0xaafcbfab, 0xaf95894c), TOBN(0x7b9bdc07, 0x276b2241),
+              TOBN(0xeaf98362, 0x5bdda48b), TOBN(0x5977faf2, 0xa3fcb4df),
+              TOBN(0xbed042ef, 0x052c4b5b), TOBN(0x9fe87f71, 0x067591f0),
+              TOBN(0xc89c73ca, 0x22f24ec7), TOBN(0x7d37fa9e, 0xe64a9f1b),
+              TOBN(0x2710841a, 0x15562627), TOBN(0x2c01a613, 0xc243b034),
+              TOBN(0x1d135c56, 0x2bc68609), TOBN(0xc2ca1715, 0x8b03f1f6),
+              TOBN(0xc9966c2d, 0x3eb81d82), TOBN(0xc02abf4a, 0x8f6df13e),
+              TOBN(0x77b34bd7, 0x8f72b43b), TOBN(0xaff6218f, 0x360c82b0),
+              TOBN(0x0aa5726c, 0x8d55b9d2), TOBN(0xdc0adbe9, 0x99e9bffb),
+              TOBN(0x9097549c, 0xefb9e72a), TOBN(0x16755712, 0x9dfb3111),
+              TOBN(0xdd8bf984, 0xf26847f9), TOBN(0xbcb8e387, 0xdfb30cb7),
+              TOBN(0xc1fd32a7, 0x5171ef9c), TOBN(0x977f3fc7, 0x389b363f),
+              TOBN(0x116eaf2b, 0xf4babda0), TOBN(0xfeab68bd, 0xf7113c8e),
+              TOBN(0xd1e3f064, 0xb7def526), TOBN(0x1ac30885, 0xe0b3fa02),
+              TOBN(0x1c5a6e7b, 0x40142d9d), TOBN(0x839b5603, 0x30921c0b),
+              TOBN(0x48f301fa, 0x36a116a3), TOBN(0x380e1107, 0xcfd9ee6d),
+              TOBN(0x7945ead8, 0x58854be1), TOBN(0x4111c12e, 0xcbd4d49d),
+              TOBN(0xece3b1ec, 0x3a29c2ef), TOBN(0x6356d404, 0x8d3616f5),
+              TOBN(0x9f0d6a8f, 0x594d320e), TOBN(0x0989316d, 0xf651ccd2),
+              TOBN(0x6c32117a, 0x0f8fdde4), TOBN(0x9abe5cc5, 0xa26a9bbc),
+              TOBN(0xcff560fb, 0x9723f671), TOBN(0x21b2a12d, 0x7f3d593c),
+              TOBN(0xe4cb18da, 0x24ba0696), TOBN(0x186e2220, 0xc3543384),
+              TOBN(0x722f64e0, 0x88312c29), TOBN(0x94282a99, 0x17dc7752),
+              TOBN(0x62467bbf, 0x5a85ee89), TOBN(0xf435c650, 0xf10076a0),
+              TOBN(0xc9ff1539, 0x43b3a50b), TOBN(0x7132130c, 0x1a53efbc),
+              TOBN(0x31bfe063, 0xf7b0c5b7), TOBN(0xb0179a7d, 0x4ea994cc),
+              TOBN(0x12d064b3, 0xc85f455b), TOBN(0x47259328, 0x8f6e0062),
+              TOBN(0xf64e590b, 0xb875d6d9), TOBN(0x22dd6225, 0xad92bcc7),
+              TOBN(0xb658038e, 0xb9c3bd6d), TOBN(0x00cdb0d6, 0xfbba27c8),
+              TOBN(0x0c681337, 0x1062c45d), TOBN(0xd8515b8c, 0x2d33407d),
+              TOBN(0xcb8f699e, 0x8cbb5ecf), TOBN(0x8c4347f8, 0xc608d7d8),
+              TOBN(0x2c11850a, 0xbb3e00db), TOBN(0x20a8dafd, 0xecb49d19),
+              TOBN(0xbd781480, 0x45ee2f40), TOBN(0x75e354af, 0x416b60cf),
+              TOBN(0xde0b58a1, 0x8d49a8c4), TOBN(0xe40e94e2, 0xfa359536),
+              TOBN(0xbd4fa59f, 0x62accd76), TOBN(0x05cf466a, 0x8c762837),
+              TOBN(0xb5abda99, 0x448c277b), TOBN(0x5a9e01bf, 0x48b13740),
+              TOBN(0x9d457798, 0x326aad8d), TOBN(0xbdef4954, 0xc396f7e7),
+              TOBN(0x6fb274a2, 0xc253e292), TOBN(0x2800bf0a, 0x1cfe53e7),
+              TOBN(0x22426d31, 0x44438fd4), TOBN(0xef233923, 0x5e259f9a),
+              TOBN(0x4188503c, 0x03f66264), TOBN(0x9e5e7f13, 0x7f9fdfab),
+              TOBN(0x565eb76c, 0x5fcc1aba), TOBN(0xea632548, 0x59b5bff8),
+              TOBN(0x5587c087, 0xaab6d3fa), TOBN(0x92b639ea, 0x6ce39c1b),
+              TOBN(0x0706e782, 0x953b135c), TOBN(0x7308912e, 0x425268ef),
+              TOBN(0x599e92c7, 0x090e7469), TOBN(0x83b90f52, 0x9bc35e75),
+              TOBN(0x4750b3d0, 0x244975b3), TOBN(0xf3a44358, 0x11965d72),
+              TOBN(0x179c6774, 0x9c8dc751), TOBN(0xff18cdfe, 0xd23d9ff0),
+              TOBN(0xc4013833, 0x2028e247), TOBN(0x96e280e2, 0xf3bfbc79),
+              TOBN(0xf60417bd, 0xd0880a84), TOBN(0x263c9f3d, 0x2a568151),
+              TOBN(0x36be15b3, 0x2d2ce811), TOBN(0x846dc0c2, 0xf8291d21),
+              TOBN(0x5cfa0ecb, 0x789fcfdb), TOBN(0x45a0beed, 0xd7535b9a),
+              TOBN(0xec8e9f07, 0x96d69af1), TOBN(0x31a7c5b8, 0x599ab6dc),
+              TOBN(0xd36d45ef, 0xf9e2e09f), TOBN(0x3cf49ef1, 0xdcee954b),
+              TOBN(0x6be34cf3, 0x086cff9b), TOBN(0x88dbd491, 0x39a3360f),
+              TOBN(0x1e96b8cc, 0x0dbfbd1d), TOBN(0xc1e5f7bf, 0xcb7e2552),
+              TOBN(0x0547b214, 0x28819d98), TOBN(0xc770dd9c, 0x7aea9dcb),
+              TOBN(0xaef0d4c7, 0x041d68c8), TOBN(0xcc2b9818, 0x13cb9ba8),
+              TOBN(0x7fc7bc76, 0xfe86c607), TOBN(0x6b7b9337, 0x502a9a95),
+              TOBN(0x1948dc27, 0xd14dab63), TOBN(0x249dd198, 0xdae047be),
+              TOBN(0xe8356584, 0xa981a202), TOBN(0x3531dd18, 0x3a893387),
+              TOBN(0x1be11f90, 0xc85c7209), TOBN(0x93d2fe1e, 0xe2a52b5a),
+              TOBN(0x8225bfe2, 0xec6d6b97), TOBN(0x9cf6d6f4, 0xbd0aa5de),
+              TOBN(0x911459cb, 0x54779f5f), TOBN(0x5649cddb, 0x86aeb1f3),
+              TOBN(0x32133579, 0x3f26ce5a), TOBN(0xc289a102, 0x550f431e),
+              TOBN(0x559dcfda, 0x73b84c6f), TOBN(0x84973819, 0xee3ac4d7),
+              TOBN(0xb51e55e6, 0xf2606a82), TOBN(0xe25f7061, 0x90f2fb57),
+              TOBN(0xacef6c2a, 0xb1a4e37c), TOBN(0x864e359d, 0x5dcf2706),
+              TOBN(0x479e6b18, 0x7ce57316), TOBN(0x2cab2500, 0x3a96b23d),
+              TOBN(0xed489862, 0x8ef16df7), TOBN(0x2056538c, 0xef3758b5),
+              TOBN(0xa7df865e, 0xf15d3101), TOBN(0x80c5533a, 0x61b553d7),
+              TOBN(0x366e1997, 0x4ed14294), TOBN(0x6620741f, 0xb3c0bcd6),
+              TOBN(0x21d1d9c4, 0xedc45418), TOBN(0x005b859e, 0xc1cc4a9d),
+              TOBN(0xdf01f630, 0xa1c462f0), TOBN(0x15d06cf3, 0xf26820c7),
+              TOBN(0x9f7f24ee, 0x3484be47), TOBN(0x2ff33e96, 0x4a0c902f),
+              TOBN(0x00bdf457, 0x5a0bc453), TOBN(0x2378dfaf, 0x1aa238db),
+              TOBN(0x272420ec, 0x856720f2), TOBN(0x2ad9d95b, 0x96797291),
+              TOBN(0xd1242cc6, 0x768a1558), TOBN(0x2e287f8b, 0x5cc86aa8),
+              TOBN(0x796873d0, 0x990cecaa), TOBN(0xade55f81, 0x675d4080),
+              TOBN(0x2645eea3, 0x21f0cd84), TOBN(0x7a1efa0f, 0xb4e17d02),
+              TOBN(0xf6858420, 0x037cc061), TOBN(0x682e05f0, 0xd5d43e12),
+              TOBN(0x59c36994, 0x27218710), TOBN(0x85cbba4d, 0x3f7cd2fc),
+              TOBN(0x726f9729, 0x7a3cd22a), TOBN(0x9f8cd5dc, 0x4a628397),
+              TOBN(0x17b93ab9, 0xc23165ed), TOBN(0xff5f5dbf, 0x122823d4),
+              TOBN(0xc1e4e4b5, 0x654a446d), TOBN(0xd1a9496f, 0x677257ba),
+              TOBN(0x6387ba94, 0xde766a56), TOBN(0x23608bc8, 0x521ec74a),
+              TOBN(0x16a522d7, 0x6688c4d4), TOBN(0x9d6b4282, 0x07373abd),
+              TOBN(0xa62f07ac, 0xb42efaa3), TOBN(0xf73e00f7, 0xe3b90180),
+              TOBN(0x36175fec, 0x49421c3e), TOBN(0xc4e44f9b, 0x3dcf2678),
+              TOBN(0x76df436b, 0x7220f09f), TOBN(0x172755fb, 0x3aa8b6cf),
+              TOBN(0xbab89d57, 0x446139cc), TOBN(0x0a0a6e02, 0x5fe0208f),
+              TOBN(0xcdbb63e2, 0x11e5d399), TOBN(0x33ecaa12, 0xa8977f0b),
+              TOBN(0x59598b21, 0xf7c42664), TOBN(0xb3e91b32, 0xab65d08a),
+              TOBN(0x035822ee, 0xf4502526), TOBN(0x1dcf0176, 0x720a82a9),
+              TOBN(0x50f8598f, 0x3d589e02), TOBN(0xdf0478ff, 0xb1d63d2c),
+              TOBN(0x8b8068bd, 0x1571cd07), TOBN(0x30c3aa4f, 0xd79670cd),
+              TOBN(0x25e8fd4b, 0x941ade7f), TOBN(0x3d1debdc, 0x32790011),
+              TOBN(0x65b6dcbd, 0x3a3f9ff0), TOBN(0x282736a4, 0x793de69c),
+              TOBN(0xef69a0c3, 0xd41d3bd3), TOBN(0xb533b8c9, 0x07a26bde),
+              TOBN(0xe2801d97, 0xdb2edf9f), TOBN(0xdc4a8269, 0xe1877af0),
+              TOBN(0x6c1c5851, 0x3d590dbe), TOBN(0x84632f6b, 0xee4e9357),
+              TOBN(0xd36d36b7, 0x79b33374), TOBN(0xb46833e3, 0x9bbca2e6),
+              TOBN(0x37893913, 0xf7fc0586), TOBN(0x385315f7, 0x66bf4719),
+              TOBN(0x72c56293, 0xb31855dc), TOBN(0xd1416d4e, 0x849061fe),
+              TOBN(0xbeb3ab78, 0x51047213), TOBN(0x447f6e61, 0xf040c996),
+              TOBN(0xd06d310d, 0x638b1d0c), TOBN(0xe28a413f, 0xbad1522e),
+              TOBN(0x685a76cb, 0x82003f86), TOBN(0x610d07f7, 0x0bcdbca3),
+              TOBN(0x6ff66021, 0x9ca4c455), TOBN(0x7df39b87, 0xcea10eec),
+              TOBN(0xb9255f96, 0xe22db218), TOBN(0x8cc6d9eb, 0x08a34c44),
+              TOBN(0xcd4ffb86, 0x859f9276), TOBN(0x8fa15eb2, 0x50d07335),
+              TOBN(0xdf553845, 0xcf2c24b5), TOBN(0x89f66a9f, 0x52f9c3ba),
+              TOBN(0x8f22b5b9, 0xe4a7ceb3), TOBN(0xaffef809, 0x0e134686),
+              TOBN(0x3e53e1c6, 0x8eb8fac2), TOBN(0x93c1e4eb, 0x28aec98e),
+              TOBN(0xb6b91ec5, 0x32a43bcb), TOBN(0x2dbfa947, 0xb2d74a51),
+              TOBN(0xe065d190, 0xca84bad7), TOBN(0xfb13919f, 0xad58e65c),
+              TOBN(0x3c41718b, 0xf1cb6e31), TOBN(0x688969f0, 0x06d05c3f),
+              TOBN(0xd4f94ce7, 0x21264d45), TOBN(0xfdfb65e9, 0x7367532b),
+              TOBN(0x5b1be8b1, 0x0945a39d), TOBN(0x229f789c, 0x2b8baf3b),
+              TOBN(0xd8f41f3e, 0x6f49f15d), TOBN(0x678ce828, 0x907f0792),
+              TOBN(0xc69ace82, 0xfca6e867), TOBN(0x106451ae, 0xd01dcc89),
+              TOBN(0x1bb4f7f0, 0x19fc32d2), TOBN(0x64633dfc, 0xb00c52d2),
+              TOBN(0x8f13549a, 0xad9ea445), TOBN(0x99a3bf50, 0xfb323705),
+              TOBN(0x0c9625a2, 0x534d4dbc), TOBN(0x45b8f1d1, 0xc2a2fea3),
+              TOBN(0x76ec21a1, 0xa530fc1a), TOBN(0x4bac9c2a, 0x9e5bd734),
+              TOBN(0x5996d76a, 0x7b4e3587), TOBN(0x0045cdee, 0x1182d9e3),
+              TOBN(0x1aee24b9, 0x1207f13d), TOBN(0x66452e97, 0x97345a41),
+              TOBN(0x16e5b054, 0x9f950cd0), TOBN(0x9cc72fb1, 0xd7fdd075),
+              TOBN(0x6edd61e7, 0x66249663), TOBN(0xde4caa4d, 0xf043cccb),
+              TOBN(0x11b1f57a, 0x55c7ac17), TOBN(0x779cbd44, 0x1a85e24d),
+              TOBN(0x78030f86, 0xe46081e7), TOBN(0xfd4a6032, 0x8e20f643),
+              TOBN(0xcc7a6488, 0x0a750c0f), TOBN(0x39bacfe3, 0x4e548e83),
+              TOBN(0x3d418c76, 0x0c110f05), TOBN(0x3e4daa4c, 0xb1f11588),
+              TOBN(0x2733e7b5, 0x5ffc69ff), TOBN(0x46f147bc, 0x92053127),
+              TOBN(0x885b2434, 0xd722df94), TOBN(0x6a444f65, 0xe6fc6b7c) },
+          { TOBN(0x7a1a465a, 0xc3f16ea8), TOBN(0x115a461d, 0xb2f1d11c),
+              TOBN(0x4767dd95, 0x6c68a172), TOBN(0x3392f2eb, 0xd13a4698),
+              TOBN(0xc7a99ccd, 0xe526cdc7), TOBN(0x8e537fdc, 0x22292b81),
+              TOBN(0x76d8cf69, 0xa6d39198), TOBN(0xffc5ff43, 0x2446852d),
+              TOBN(0x97b14f7e, 0xa90567e6), TOBN(0x513257b7, 0xb6ae5cb7),
+              TOBN(0x85454a3c, 0x9f10903d), TOBN(0xd8d2c9ad, 0x69bc3724),
+              TOBN(0x38da9324, 0x6b29cb44), TOBN(0xb540a21d, 0x77c8cbac),
+              TOBN(0x9bbfe435, 0x01918e42), TOBN(0xfffa707a, 0x56c3614e),
+              TOBN(0x0ce4e3f1, 0xd4e353b7), TOBN(0x062d8a14, 0xef46b0a0),
+              TOBN(0x6408d5ab, 0x574b73fd), TOBN(0xbc41d1c9, 0xd3273ffd),
+              TOBN(0x3538e1e7, 0x6be77800), TOBN(0x71fe8b37, 0xc5655031),
+              TOBN(0x1cd91621, 0x6b9b331a), TOBN(0xad825d0b, 0xbb388f73),
+              TOBN(0x56c2e05b, 0x1cb76219), TOBN(0x0ec0bf91, 0x71567e7e),
+              TOBN(0xe7076f86, 0x61c4c910), TOBN(0xd67b085b, 0xbabc04d9),
+              TOBN(0x9fb90459, 0x5e93a96a), TOBN(0x7526c1ea, 0xfbdc249a),
+              TOBN(0x0d44d367, 0xecdd0bb7), TOBN(0x95399917, 0x9dc0d695),
+              TOBN(0x61360ee9, 0x9e240d18), TOBN(0x057cdcac, 0xb4b94466),
+              TOBN(0xe7667cd1, 0x2fe5325c), TOBN(0x1fa297b5, 0x21974e3b),
+              TOBN(0xfa4081e7, 0xdb083d76), TOBN(0x31993be6, 0xf206bd15),
+              TOBN(0x8949269b, 0x14c19f8c), TOBN(0x21468d72, 0xa9d92357),
+              TOBN(0x2ccbc583, 0xa4c506ec), TOBN(0x957ed188, 0xd1acfe97),
+              TOBN(0x8baed833, 0x12f1aea2), TOBN(0xef2a6cb4, 0x8325362d),
+              TOBN(0x130dde42, 0x8e195c43), TOBN(0xc842025a, 0x0e6050c6),
+              TOBN(0x2da972a7, 0x08686a5d), TOBN(0xb52999a1, 0xe508b4a8),
+              TOBN(0xd9f090b9, 0x10a5a8bd), TOBN(0xca91d249, 0x096864da),
+              TOBN(0x8e6a93be, 0x3f67dbc1), TOBN(0xacae6fba, 0xf5f4764c),
+              TOBN(0x1563c6e0, 0xd21411a0), TOBN(0x28fa787f, 0xda0a4ad8),
+              TOBN(0xd524491c, 0x908c8030), TOBN(0x1257ba0e, 0x4c795f07),
+              TOBN(0x83f49167, 0xceca9754), TOBN(0x426d2cf6, 0x4b7939a0),
+              TOBN(0x2555e355, 0x723fd0bf), TOBN(0xa96e6d06, 0xc4f144e2),
+              TOBN(0x4768a8dd, 0x87880e61), TOBN(0x15543815, 0xe508e4d5),
+              TOBN(0x09d7e772, 0xb1b65e15), TOBN(0x63439dd6, 0xac302fa0),
+              TOBN(0xb93f802f, 0xc14e35c2), TOBN(0x71735b7c, 0x4341333c),
+              TOBN(0x03a25104, 0x16d4f362), TOBN(0x3f4d069b, 0xbf433c8e),
+              TOBN(0x0d83ae01, 0xf78f5a7c), TOBN(0x50a8ffbe, 0x7c4eed07),
+              TOBN(0xc74f8906, 0x76e10f83), TOBN(0x7d080966, 0x9ddaf8e1),
+              TOBN(0xb11df8e1, 0x698e04cc), TOBN(0x877be203, 0x169005c8),
+              TOBN(0x32749e8c, 0x4f3c6179), TOBN(0x2dbc9d0a, 0x7853fc05),
+              TOBN(0x187d4f93, 0x9454d937), TOBN(0xe682ce9d, 0xb4800e1b),
+              TOBN(0xa9129ad8, 0x165e68e8), TOBN(0x0fe29735, 0xbe7f785b),
+              TOBN(0x5303f40c, 0x5b9e02b7), TOBN(0xa37c9692, 0x35ee04e8),
+              TOBN(0x5f46cc20, 0x34d6632b), TOBN(0x55ef72b2, 0x96ac545b),
+              TOBN(0xabec5c1f, 0x7b91b062), TOBN(0x0a79e1c7, 0xbb33e821),
+              TOBN(0xbb04b428, 0x3a9f4117), TOBN(0x0de1f28f, 0xfd2a475a),
+              TOBN(0x31019ccf, 0x3a4434b4), TOBN(0xa3458111, 0x1a7954dc),
+              TOBN(0xa9dac80d, 0xe34972a7), TOBN(0xb043d054, 0x74f6b8dd),
+              TOBN(0x021c319e, 0x11137b1a), TOBN(0x00a754ce, 0xed5cc03f),
+              TOBN(0x0aa2c794, 0xcbea5ad4), TOBN(0x093e67f4, 0x70c015b6),
+              TOBN(0x72cdfee9, 0xc97e3f6b), TOBN(0xc10bcab4, 0xb6da7461),
+              TOBN(0x3b02d2fc, 0xb59806b9), TOBN(0x85185e89, 0xa1de6f47),
+              TOBN(0x39e6931f, 0x0eb6c4d4), TOBN(0x4d4440bd, 0xd4fa5b04),
+              TOBN(0x5418786e, 0x34be7eb8), TOBN(0x6380e521, 0x9d7259bc),
+              TOBN(0x20ac0351, 0xd598d710), TOBN(0x272c4166, 0xcb3a4da4),
+              TOBN(0xdb82fe1a, 0xca71de1f), TOBN(0x746e79f2, 0xd8f54b0f),
+              TOBN(0x6e7fc736, 0x4b573e9b), TOBN(0x75d03f46, 0xfd4b5040),
+              TOBN(0x5c1cc36d, 0x0b98d87b), TOBN(0x513ba3f1, 0x1f472da1),
+              TOBN(0x79d0af26, 0xabb177dd), TOBN(0xf82ab568, 0x7891d564),
+              TOBN(0x2b6768a9, 0x72232173), TOBN(0xefbb3bb0, 0x8c1f6619),
+              TOBN(0xb29c11db, 0xa6d18358), TOBN(0x519e2797, 0xb0916d3a),
+              TOBN(0xd4dc18f0, 0x9188e290), TOBN(0x648e86e3, 0x98b0ca7f),
+              TOBN(0x859d3145, 0x983c38b5), TOBN(0xb14f176c, 0x637abc8b),
+              TOBN(0x2793fb9d, 0xcaff7be6), TOBN(0xebe5a55f, 0x35a66a5a),
+              TOBN(0x7cec1dcd, 0x9f87dc59), TOBN(0x7c595cd3, 0xfbdbf560),
+              TOBN(0x5b543b22, 0x26eb3257), TOBN(0x69080646, 0xc4c935fd),
+              TOBN(0x7f2e4403, 0x81e9ede3), TOBN(0x243c3894, 0xcaf6df0a),
+              TOBN(0x7c605bb1, 0x1c073b11), TOBN(0xcd06a541, 0xba6a4a62),
+              TOBN(0x29168949, 0x49d4e2e5), TOBN(0x33649d07, 0x4af66880),
+              TOBN(0xbfc0c885, 0xe9a85035), TOBN(0xb4e52113, 0xfc410f4b),
+              TOBN(0xdca3b706, 0x78a6513b), TOBN(0x92ea4a2a, 0x9edb1943),
+              TOBN(0x02642216, 0xdb6e2dd8), TOBN(0x9b45d0b4, 0x9fd57894),
+              TOBN(0x114e70db, 0xc69d11ae), TOBN(0x1477dd19, 0x4c57595f),
+              TOBN(0xbc2208b4, 0xec77c272), TOBN(0x95c5b4d7, 0xdb68f59c),
+              TOBN(0xb8c4fc63, 0x42e532b7), TOBN(0x386ba422, 0x9ae35290),
+              TOBN(0xfb5dda42, 0xd201ecbc), TOBN(0x2353dc8b, 0xa0e38fd6),
+              TOBN(0x9a0b85ea, 0x68f7e978), TOBN(0x96ec5682, 0x2ad6d11f),
+              TOBN(0x5e279d6c, 0xe5f6886d), TOBN(0xd3fe03cd, 0x3cb1914d),
+              TOBN(0xfe541fa4, 0x7ea67c77), TOBN(0x952bd2af, 0xe3ea810c),
+              TOBN(0x791fef56, 0x8d01d374), TOBN(0xa3a1c621, 0x0f11336e),
+              TOBN(0x5ad0d5a9, 0xc7ec6d79), TOBN(0xff7038af, 0x3225c342),
+              TOBN(0x003c6689, 0xbc69601b), TOBN(0x25059bc7, 0x45e8747d),
+              TOBN(0xfa4965b2, 0xf2086fbf), TOBN(0xf6840ea6, 0x86916078),
+              TOBN(0xd7ac7620, 0x70081d6c), TOBN(0xe600da31, 0xb5328645),
+              TOBN(0x01916f63, 0x529b8a80), TOBN(0xe80e4858, 0x2d7d6f3e),
+              TOBN(0x29eb0fe8, 0xd664ca7c), TOBN(0xf017637b, 0xe7b43b0c),
+              TOBN(0x9a75c806, 0x76cb2566), TOBN(0x8f76acb1, 0xb24892d9),
+              TOBN(0x7ae7b9cc, 0x1f08fe45), TOBN(0x19ef7329, 0x6a4907d8),
+              TOBN(0x2db4ab71, 0x5f228bf0), TOBN(0xf3cdea39, 0x817032d7),
+              TOBN(0x0b1f482e, 0xdcabe3c0), TOBN(0x3baf76b4, 0xbb86325c),
+              TOBN(0xd49065e0, 0x10089465), TOBN(0x3bab5d29, 0x8e77c596),
+              TOBN(0x7636c3a6, 0x193dbd95), TOBN(0xdef5d294, 0xb246e499),
+              TOBN(0xb22c58b9, 0x286b2475), TOBN(0xa0b93939, 0xcd80862b),
+              TOBN(0x3002c83a, 0xf0992388), TOBN(0x6de01f9b, 0xeacbe14c),
+              TOBN(0x6aac688e, 0xadd70482), TOBN(0x708de92a, 0x7b4a4e8a),
+              TOBN(0x75b6dd73, 0x758a6eef), TOBN(0xea4bf352, 0x725b3c43),
+              TOBN(0x10041f2c, 0x87912868), TOBN(0xb1b1be95, 0xef09297a),
+              TOBN(0x19ae23c5, 0xa9f3860a), TOBN(0xc4f0f839, 0x515dcf4b),
+              TOBN(0x3c7ecca3, 0x97f6306a), TOBN(0x744c44ae, 0x68a3a4b0),
+              TOBN(0x69cd13a0, 0xb3a1d8a2), TOBN(0x7cad0a1e, 0x5256b578),
+              TOBN(0xea653fcd, 0x33791d9e), TOBN(0x9cc2a05d, 0x74b2e05f),
+              TOBN(0x73b391dc, 0xfd7affa2), TOBN(0xddb7091e, 0xb6b05442),
+              TOBN(0xc71e27bf, 0x8538a5c6), TOBN(0x195c63dd, 0x89abff17),
+              TOBN(0xfd315285, 0x1b71e3da), TOBN(0x9cbdfda7, 0xfa680fa0),
+              TOBN(0x9db876ca, 0x849d7eab), TOBN(0xebe2764b, 0x3c273271),
+              TOBN(0x663357e3, 0xf208dcea), TOBN(0x8c5bd833, 0x565b1b70),
+              TOBN(0xccc3b4f5, 0x9837fc0d), TOBN(0x9b641ba8, 0xa79cf00f),
+              TOBN(0x7428243d, 0xdfdf3990), TOBN(0x83a594c4, 0x020786b1),
+              TOBN(0xb712451a, 0x526c4502), TOBN(0x9d39438e, 0x6adb3f93),
+              TOBN(0xfdb261e3, 0xe9ff0ccd), TOBN(0x80344e3c, 0xe07af4c3),
+              TOBN(0x75900d7c, 0x2fa4f126), TOBN(0x08a3b865, 0x5c99a232),
+              TOBN(0x2478b6bf, 0xdb25e0c3), TOBN(0x482cc2c2, 0x71db2edf),
+              TOBN(0x37df7e64, 0x5f321bb8), TOBN(0x8a93821b, 0x9a8005b4),
+              TOBN(0x3fa2f10c, 0xcc8c1958), TOBN(0x0d332218, 0x2c269d0a),
+              TOBN(0x20ab8119, 0xe246b0e6), TOBN(0xb39781e4, 0xd349fd17),
+              TOBN(0xd293231e, 0xb31aa100), TOBN(0x4b779c97, 0xbb032168),
+              TOBN(0x4b3f19e1, 0xc8470500), TOBN(0x45b7efe9, 0x0c4c869d),
+              TOBN(0xdb84f38a, 0xa1a6bbcc), TOBN(0x3b59cb15, 0xb2fddbc1),
+              TOBN(0xba5514df, 0x3fd165e8), TOBN(0x499fd6a9, 0x061f8811),
+              TOBN(0x72cd1fe0, 0xbfef9f00), TOBN(0x120a4bb9, 0x79ad7e8a),
+              TOBN(0xf2ffd095, 0x5f4a5ac5), TOBN(0xcfd174f1, 0x95a7a2f0),
+              TOBN(0xd42301ba, 0x9d17baf1), TOBN(0xd2fa487a, 0x77f22089),
+              TOBN(0x9cb09efe, 0xb1dc77e1), TOBN(0xe9566939, 0x21c99682),
+              TOBN(0x8c546901, 0x6c6067bb), TOBN(0xfd378574, 0x61c24456),
+              TOBN(0x2b6a6cbe, 0x81796b33), TOBN(0x62d550f6, 0x58e87f8b),
+              TOBN(0x1b763e1c, 0x7f1b01b4), TOBN(0x4b93cfea, 0x1b1b5e12),
+              TOBN(0xb9345238, 0x1d531696), TOBN(0x57201c00, 0x88cdde69),
+              TOBN(0xdde92251, 0x9a86afc7), TOBN(0xe3043895, 0xbd35cea8),
+              TOBN(0x7608c1e1, 0x8555970d), TOBN(0x8267dfa9, 0x2535935e),
+              TOBN(0xd4c60a57, 0x322ea38b), TOBN(0xe0bf7977, 0x804ef8b5),
+              TOBN(0x1a0dab28, 0xc06fece4), TOBN(0xd405991e, 0x94e7b49d),
+              TOBN(0xc542b6d2, 0x706dab28), TOBN(0xcb228da3, 0xa91618fb),
+              TOBN(0x224e4164, 0x107d1cea), TOBN(0xeb9fdab3, 0xd0f5d8f1),
+              TOBN(0xc02ba386, 0x0d6e41cd), TOBN(0x676a72c5, 0x9b1f7146),
+              TOBN(0xffd6dd98, 0x4d6cb00b), TOBN(0xcef9c5ca, 0xde2e8d7c),
+              TOBN(0xa1bbf5d7, 0x641c7936), TOBN(0x1b95b230, 0xee8f772e),
+              TOBN(0xf765a92e, 0xe8ac25b1), TOBN(0xceb04cfc, 0x3a18b7c6),
+              TOBN(0x27944cef, 0x0acc8966), TOBN(0xcbb3c957, 0x434c1004),
+              TOBN(0x9c9971a1, 0xa43ff93c), TOBN(0x5bc2db17, 0xa1e358a9),
+              TOBN(0x45b4862e, 0xa8d9bc82), TOBN(0x70ebfbfb, 0x2201e052),
+              TOBN(0xafdf64c7, 0x92871591), TOBN(0xea5bcae6, 0xb42d0219),
+              TOBN(0xde536c55, 0x2ad8f03c), TOBN(0xcd6c3f4d, 0xa76aa33c),
+              TOBN(0xbeb5f623, 0x0bca6de3), TOBN(0xdd20dd99, 0xb1e706fd),
+              TOBN(0x90b3ff9d, 0xac9059d4), TOBN(0x2d7b2902, 0x7ccccc4e),
+              TOBN(0x8a090a59, 0xce98840f), TOBN(0xa5d947e0, 0x8410680a),
+              TOBN(0x49ae346a, 0x923379a5), TOBN(0x7dbc84f9, 0xb28a3156),
+              TOBN(0xfd40d916, 0x54a1aff2), TOBN(0xabf318ba, 0x3a78fb9b),
+              TOBN(0x50152ed8, 0x3029f95e), TOBN(0x9fc1dd77, 0xc58ad7fa),
+              TOBN(0x5fa57915, 0x13595c17), TOBN(0xb9504668, 0x8f62b3a9),
+              TOBN(0x907b5b24, 0xff3055b0), TOBN(0x2e995e35, 0x9a84f125),
+              TOBN(0x87dacf69, 0x7e9bbcfb), TOBN(0x95d0c1d6, 0xe86d96e3),
+              TOBN(0x65726e3c, 0x2d95a75c), TOBN(0x2c3c9001, 0xacd27f21),
+              TOBN(0x1deab561, 0x6c973f57), TOBN(0x108b7e2c, 0xa5221643),
+              TOBN(0x5fee9859, 0xc4ef79d4), TOBN(0xbd62b88a, 0x40d4b8c6),
+              TOBN(0xb4dd29c4, 0x197c75d6), TOBN(0x266a6df2, 0xb7076feb),
+              TOBN(0x9512d0ea, 0x4bf2df11), TOBN(0x1320c24f, 0x6b0cc9ec),
+              TOBN(0x6bb1e0e1, 0x01a59596), TOBN(0x8317c5bb, 0xeff9aaac),
+              TOBN(0x65bb405e, 0x385aa6c9), TOBN(0x613439c1, 0x8f07988f),
+              TOBN(0xd730049f, 0x16a66e91), TOBN(0xe97f2820, 0xfa1b0e0d),
+              TOBN(0x4131e003, 0x304c28ea), TOBN(0x820ab732, 0x526bac62),
+              TOBN(0xb2ac9ef9, 0x28714423), TOBN(0x54ecfffa, 0xadb10cb2),
+              TOBN(0x8781476e, 0xf886a4cc), TOBN(0x4b2c87b5, 0xdb2f8d49),
+              TOBN(0xe857cd20, 0x0a44295d), TOBN(0x707d7d21, 0x58c6b044),
+              TOBN(0xae8521f9, 0xf596757c), TOBN(0x87448f03, 0x67b2b714),
+              TOBN(0x13a9bc45, 0x5ebcd58d), TOBN(0x79bcced9, 0x9122d3c1),
+              TOBN(0x3c644247, 0x9e076642), TOBN(0x0cf22778, 0x2df4767d),
+              TOBN(0x5e61aee4, 0x71d444b6), TOBN(0x211236bf, 0xc5084a1d),
+              TOBN(0x7e15bc9a, 0x4fd3eaf6), TOBN(0x68df2c34, 0xab622bf5),
+              TOBN(0x9e674f0f, 0x59bf4f36), TOBN(0xf883669b, 0xd7f34d73),
+              TOBN(0xc48ac1b8, 0x31497b1d), TOBN(0x323b925d, 0x5106703b),
+              TOBN(0x22156f42, 0x74082008), TOBN(0xeffc521a, 0xc8482bcb),
+              TOBN(0x5c6831bf, 0x12173479), TOBN(0xcaa2528f, 0xc4739490),
+              TOBN(0x84d2102a, 0x8f1b3c4d), TOBN(0xcf64dfc1, 0x2d9bec0d),
+              TOBN(0x433febad, 0x78a546ef), TOBN(0x1f621ec3, 0x7b73cef1),
+              TOBN(0x6aecd627, 0x37338615), TOBN(0x162082ab, 0x01d8edf6),
+              TOBN(0x833a8119, 0x19e86b66), TOBN(0x6023a251, 0xd299b5db),
+              TOBN(0xf5bb0c3a, 0xbbf04b89), TOBN(0x6735eb69, 0xae749a44),
+              TOBN(0xd0e058c5, 0x4713de3b), TOBN(0xfdf2593e, 0x2c3d4ccd),
+              TOBN(0x1b8f414e, 0xfdd23667), TOBN(0xdd52aaca, 0xfa2015ee),
+              TOBN(0x3e31b517, 0xbd9625ff), TOBN(0x5ec9322d, 0x8db5918c),
+              TOBN(0xbc73ac85, 0xa96f5294), TOBN(0x82aa5bf3, 0x61a0666a),
+              TOBN(0x49755810, 0xbf08ac42), TOBN(0xd21cdfd5, 0x891cedfc),
+              TOBN(0x918cb57b, 0x67f8be10), TOBN(0x365d1a7c, 0x56ffa726),
+              TOBN(0x2435c504, 0x6532de93), TOBN(0xc0fc5e10, 0x2674cd02),
+              TOBN(0x6e51fcf8, 0x9cbbb142), TOBN(0x1d436e5a, 0xafc50692),
+              TOBN(0x766bffff, 0x3fbcae22), TOBN(0x3148c2fd, 0xfd55d3b8),
+              TOBN(0x52c7fdc9, 0x233222fa), TOBN(0x89ff1092, 0xe419fb6b),
+              TOBN(0x3cd6db99, 0x25254977), TOBN(0x2e85a161, 0x1cf12ca7),
+              TOBN(0xadd2547c, 0xdc810bc9), TOBN(0xea3f458f, 0x9d257c22),
+              TOBN(0x642c1fbe, 0x27d6b19b), TOBN(0xed07e6b5, 0x140481a6),
+              TOBN(0x6ada1d42, 0x86d2e0f8), TOBN(0xe5920122, 0x0e8a9fd5),
+              TOBN(0x02c936af, 0x708c1b49), TOBN(0x60f30fee, 0x2b4bfaff),
+              TOBN(0x6637ad06, 0x858e6a61), TOBN(0xce4c7767, 0x3fd374d0),
+              TOBN(0x39d54b2d, 0x7188defb), TOBN(0xa8c9d250, 0xf56a6b66),
+              TOBN(0x58fc0f5e, 0xb24fe1dc), TOBN(0x9eaf9dee, 0x6b73f24c),
+              TOBN(0xa90d588b, 0x33650705), TOBN(0xde5b62c5, 0xaf2ec729),
+              TOBN(0x5c72cfae, 0xd3c2b36e), TOBN(0x868c19d5, 0x034435da),
+              TOBN(0x88605f93, 0xe17ee145), TOBN(0xaa60c4ee, 0x77a5d5b1),
+              TOBN(0xbcf5bfd2, 0x3b60c472), TOBN(0xaf4ef13c, 0xeb1d3049),
+              TOBN(0x373f44fc, 0xe13895c9), TOBN(0xf29b382f, 0x0cbc9822),
+              TOBN(0x1bfcb853, 0x73efaef6), TOBN(0xcf56ac9c, 0xa8c96f40),
+              TOBN(0xd7adf109, 0x7a191e24), TOBN(0x98035f44, 0xbf8a8dc2),
+              TOBN(0xf40a71b9, 0x1e750c84), TOBN(0xc57f7b0c, 0x5dc6c469),
+              TOBN(0x49a0e79c, 0x6fbc19c1), TOBN(0x6b0f5889, 0xa48ebdb8),
+              TOBN(0x5d3fd084, 0xa07c4e9f), TOBN(0xc3830111, 0xab27de14),
+              TOBN(0x0e4929fe, 0x33e08dcc), TOBN(0xf4a5ad24, 0x40bb73a3),
+              TOBN(0xde86c2bf, 0x490f97ca), TOBN(0x288f09c6, 0x67a1ce18),
+              TOBN(0x364bb886, 0x1844478d), TOBN(0x7840fa42, 0xceedb040),
+              TOBN(0x1269fdd2, 0x5a631b37), TOBN(0x94761f1e, 0xa47c8b7d),
+              TOBN(0xfc0c2e17, 0x481c6266), TOBN(0x85e16ea2, 0x3daa5fa7),
+              TOBN(0xccd86033, 0x92491048), TOBN(0x0c2f6963, 0xf4d402d7),
+              TOBN(0x6336f7df, 0xdf6a865c), TOBN(0x0a2a463c, 0xb5c02a87),
+              TOBN(0xb0e29be7, 0xbf2f12ee), TOBN(0xf0a22002, 0x66bad988),
+              TOBN(0x27f87e03, 0x9123c1d7), TOBN(0x21669c55, 0x328a8c98),
+              TOBN(0x186b9803, 0x92f14529), TOBN(0xd3d056cc, 0x63954df3),
+              TOBN(0x2f03fd58, 0x175a46f6), TOBN(0x63e34ebe, 0x11558558),
+              TOBN(0xe13fedee, 0x5b80cfa5), TOBN(0xe872a120, 0xd401dbd1),
+              TOBN(0x52657616, 0xe8a9d667), TOBN(0xbc8da4b6, 0xe08d6693),
+              TOBN(0x370fb9bb, 0x1b703e75), TOBN(0x6773b186, 0xd4338363),
+              TOBN(0x18dad378, 0xecef7bff), TOBN(0xaac787ed, 0x995677da),
+              TOBN(0x4801ea8b, 0x0437164b), TOBN(0xf430ad20, 0x73fe795e),
+              TOBN(0xb164154d, 0x8ee5eb73), TOBN(0x0884ecd8, 0x108f7c0e),
+              TOBN(0x0e6ec096, 0x5f520698), TOBN(0x640631fe, 0x44f7b8d9),
+              TOBN(0x92fd34fc, 0xa35a68b9), TOBN(0x9c5a4b66, 0x4d40cf4e),
+              TOBN(0x949454bf, 0x80b6783d), TOBN(0x80e701fe, 0x3a320a10),
+              TOBN(0x8d1a564a, 0x1a0a39b2), TOBN(0x1436d53d, 0x320587db),
+              TOBN(0xf5096e6d, 0x6556c362), TOBN(0xbc23a3c0, 0xe2455d7e),
+              TOBN(0x3a7aee54, 0x807230f9), TOBN(0x9ba1cfa6, 0x22ae82fd),
+              TOBN(0x833a057a, 0x99c5d706), TOBN(0x8be85f4b, 0x842315c9),
+              TOBN(0xd083179a, 0x66a72f12), TOBN(0x2fc77d5d, 0xcdcc73cd),
+              TOBN(0x22b88a80, 0x5616ee30), TOBN(0xfb09548f, 0xe7ab1083),
+              TOBN(0x8ad6ab0d, 0x511270cd), TOBN(0x61f6c57a, 0x6924d9ab),
+              TOBN(0xa0f7bf72, 0x90aecb08), TOBN(0x849f87c9, 0x0df784a4),
+              TOBN(0x27c79c15, 0xcfaf1d03), TOBN(0xbbf9f675, 0xc463face),
+              TOBN(0x91502c65, 0x765ba543), TOBN(0x18ce3cac, 0x42ea60dd),
+              TOBN(0xe5cee6ac, 0x6e43ecb3), TOBN(0x63e4e910, 0x68f2aeeb),
+              TOBN(0x26234fa3, 0xc85932ee), TOBN(0x96883e8b, 0x4c90c44d),
+              TOBN(0x29b9e738, 0xa18a50f6), TOBN(0xbfc62b2a, 0x3f0420df),
+              TOBN(0xd22a7d90, 0x6d3e1fa9), TOBN(0x17115618, 0xfe05b8a3),
+              TOBN(0x2a0c9926, 0xbb2b9c01), TOBN(0xc739fcc6, 0xe07e76a2),
+              TOBN(0x540e9157, 0x165e439a), TOBN(0x06353a62, 0x6a9063d8),
+              TOBN(0x84d95594, 0x61e927a3), TOBN(0x013b9b26, 0xe2e0be7f),
+              TOBN(0x4feaec3b, 0x973497f1), TOBN(0x15c0f94e, 0x093ebc2d),
+              TOBN(0x6af5f227, 0x33af0583), TOBN(0x0c2af206, 0xc61f3340),
+              TOBN(0xd25dbdf1, 0x4457397c), TOBN(0x2e8ed017, 0xcabcbae0),
+              TOBN(0xe3010938, 0xc2815306), TOBN(0xbaa99337, 0xe8c6cd68),
+              TOBN(0x08513182, 0x3b0ec7de), TOBN(0x1e1b822b, 0x58df05df),
+              TOBN(0x5c14842f, 0xa5c3b683), TOBN(0x98fe977e, 0x3eba34ce),
+              TOBN(0xfd2316c2, 0x0d5e8873), TOBN(0xe48d839a, 0xbd0d427d),
+              TOBN(0x495b2218, 0x623fc961), TOBN(0x24ee56e7, 0xb46fba5e),
+              TOBN(0x9184a55b, 0x91e4de58), TOBN(0xa7488ca5, 0xdfdea288),
+              TOBN(0xa723862e, 0xa8dcc943), TOBN(0x92d762b2, 0x849dc0fc),
+              TOBN(0x3c444a12, 0x091ff4a9), TOBN(0x581113fa, 0x0cada274),
+              TOBN(0xb9de0a45, 0x30d8eae2), TOBN(0x5e0fcd85, 0xdf6b41ea),
+              TOBN(0x6233ea68, 0xc094dbb5), TOBN(0xb77d062e, 0xd968d410),
+              TOBN(0x3e719bbc, 0x58b3002d), TOBN(0x68e7dd3d, 0x3dc49d58),
+              TOBN(0x8d825740, 0x013a5e58), TOBN(0x21311747, 0x3c9e3c1b),
+              TOBN(0x0cb0a2a7, 0x7c99b6ab), TOBN(0x5c48a3b3, 0xc2f888f2) },
+          { TOBN(0xc7913e91, 0x991724f3), TOBN(0x5eda799c, 0x39cbd686),
+              TOBN(0xddb595c7, 0x63d4fc1e), TOBN(0x6b63b80b, 0xac4fed54),
+              TOBN(0x6ea0fc69, 0x7e5fb516), TOBN(0x737708ba, 0xd0f1c964),
+              TOBN(0x9628745f, 0x11a92ca5), TOBN(0x61f37958, 0x9a86967a),
+              TOBN(0x9af39b2c, 0xaa665072), TOBN(0x78322fa4, 0xefd324ef),
+              TOBN(0x3d153394, 0xc327bd31), TOBN(0x81d5f271, 0x3129dab0),
+              TOBN(0xc72e0c42, 0xf48027f5), TOBN(0xaa40cdbc, 0x8536e717),
+              TOBN(0xf45a657a, 0x2d369d0f), TOBN(0xb03bbfc4, 0xea7f74e6),
+              TOBN(0x46a8c418, 0x0d738ded), TOBN(0x6f1a5bb0, 0xe0de5729),
+              TOBN(0xf10230b9, 0x8ba81675), TOBN(0x32c6f30c, 0x112b33d4),
+              TOBN(0x7559129d, 0xd8fffb62), TOBN(0x6a281b47, 0xb459bf05),
+              TOBN(0x77c1bd3a, 0xfa3b6776), TOBN(0x0709b380, 0x7829973a),
+              TOBN(0x8c26b232, 0xa3326505), TOBN(0x38d69272, 0xee1d41bf),
+              TOBN(0x0459453e, 0xffe32afa), TOBN(0xce8143ad, 0x7cb3ea87),
+              TOBN(0x932ec1fa, 0x7e6ab666), TOBN(0x6cd2d230, 0x22286264),
+              TOBN(0x459a46fe, 0x6736f8ed), TOBN(0x50bf0d00, 0x9eca85bb),
+              TOBN(0x0b825852, 0x877a21ec), TOBN(0x300414a7, 0x0f537a94),
+              TOBN(0x3f1cba40, 0x21a9a6a2), TOBN(0x50824eee, 0x76943c00),
+              TOBN(0xa0dbfcec, 0xf83cba5d), TOBN(0xf9538148, 0x93b4f3c0),
+              TOBN(0x61744162, 0x48f24dd7), TOBN(0x5322d64d, 0xe4fb09dd),
+              TOBN(0x57447384, 0x3d9325f3), TOBN(0xa9bef2d0, 0xf371cb84),
+              TOBN(0x77d2188b, 0xa61e36c5), TOBN(0xbbd6a7d7, 0xc602df72),
+              TOBN(0xba3aa902, 0x8f61bc0b), TOBN(0xf49085ed, 0x6ed0b6a1),
+              TOBN(0x8bc625d6, 0xae6e8298), TOBN(0x832b0b1d, 0xa2e9c01d),
+              TOBN(0xa337c447, 0xf1f0ced1), TOBN(0x800cc793, 0x9492dd2b),
+              TOBN(0x4b93151d, 0xbea08efa), TOBN(0x820cf3f8, 0xde0a741e),
+              TOBN(0xff1982dc, 0x1c0f7d13), TOBN(0xef921960, 0x84dde6ca),
+              TOBN(0x1ad7d972, 0x45f96ee3), TOBN(0x319c8dbe, 0x29dea0c7),
+              TOBN(0xd3ea3871, 0x7b82b99b), TOBN(0x75922d4d, 0x470eb624),
+              TOBN(0x8f66ec54, 0x3b95d466), TOBN(0x66e673cc, 0xbee1e346),
+              TOBN(0x6afe67c4, 0xb5f2b89a), TOBN(0x3de9c1e6, 0x290e5cd3),
+              TOBN(0x8c278bb6, 0x310a2ada), TOBN(0x420fa384, 0x0bdb323b),
+              TOBN(0x0ae1d63b, 0x0eb919b0), TOBN(0xd74ee51d, 0xa74b9620),
+              TOBN(0x395458d0, 0xa674290c), TOBN(0x324c930f, 0x4620a510),
+              TOBN(0x2d1f4d19, 0xfbac27d4), TOBN(0x4086e8ca, 0x9bedeeac),
+              TOBN(0x0cdd211b, 0x9b679ab8), TOBN(0x5970167d, 0x7090fec4),
+              TOBN(0x3420f2c9, 0xfaf1fc63), TOBN(0x616d333a, 0x328c8bb4),
+              TOBN(0x7d65364c, 0x57f1fe4a), TOBN(0x9343e877, 0x55e5c73a),
+              TOBN(0x5795176b, 0xe970e78c), TOBN(0xa36ccebf, 0x60533627),
+              TOBN(0xfc7c7380, 0x09cdfc1b), TOBN(0xb39a2afe, 0xb3fec326),
+              TOBN(0xb7ff1ba1, 0x6224408a), TOBN(0xcc856e92, 0x247cfc5e),
+              TOBN(0x01f102e7, 0xc18bc493), TOBN(0x4613ab74, 0x2091c727),
+              TOBN(0xaa25e89c, 0xc420bf2b), TOBN(0x00a53176, 0x90337ec2),
+              TOBN(0xd2be9f43, 0x7d025fc7), TOBN(0x3316fb85, 0x6e6fe3dc),
+              TOBN(0x27520af5, 0x9ac50814), TOBN(0xfdf95e78, 0x9a8e4223),
+              TOBN(0xb7e7df2a, 0x56bec5a0), TOBN(0xf7022f7d, 0xdf159e5d),
+              TOBN(0x93eeeab1, 0xcac1fe8f), TOBN(0x8040188c, 0x37451168),
+              TOBN(0x7ee8aa8a, 0xd967dce6), TOBN(0xfa0e79e7, 0x3abc9299),
+              TOBN(0x67332cfc, 0x2064cfd1), TOBN(0x339c31de, 0xb0651934),
+              TOBN(0x719b28d5, 0x2a3bcbea), TOBN(0xee74c82b, 0x9d6ae5c6),
+              TOBN(0x0927d05e, 0xbaf28ee6), TOBN(0x82cecf2c, 0x9d719028),
+              TOBN(0x0b0d353e, 0xddb30289), TOBN(0xfe4bb977, 0xfddb2e29),
+              TOBN(0xbb5bb990, 0x640bfd9e), TOBN(0xd226e277, 0x82f62108),
+              TOBN(0x4bf00985, 0x02ffdd56), TOBN(0x7756758a, 0x2ca1b1b5),
+              TOBN(0xc32b62a3, 0x5285fe91), TOBN(0xedbc546a, 0x8c9cd140),
+              TOBN(0x1e47a013, 0xaf5cb008), TOBN(0xbca7e720, 0x073ce8f2),
+              TOBN(0xe10b2ab8, 0x17a91cae), TOBN(0xb89aab65, 0x08e27f63),
+              TOBN(0x7b3074a7, 0xdba3ddf9), TOBN(0x1c20ce09, 0x330c2972),
+              TOBN(0x6b9917b4, 0x5fcf7e33), TOBN(0xe6793743, 0x945ceb42),
+              TOBN(0x18fc2215, 0x5c633d19), TOBN(0xad1adb3c, 0xc7485474),
+              TOBN(0x646f9679, 0x6424c49b), TOBN(0xf888dfe8, 0x67c241c9),
+              TOBN(0xe12d4b93, 0x24f68b49), TOBN(0x9a6b62d8, 0xa571df20),
+              TOBN(0x81b4b26d, 0x179483cb), TOBN(0x666f9632, 0x9511fae2),
+              TOBN(0xd281b3e4, 0xd53aa51f), TOBN(0x7f96a765, 0x7f3dbd16),
+              TOBN(0xa7f8b5bf, 0x074a30ce), TOBN(0xd7f52107, 0x005a32e6),
+              TOBN(0x6f9e0907, 0x50237ed4), TOBN(0x2f21da47, 0x8096fa2b),
+              TOBN(0xf3e19cb4, 0xeec863a0), TOBN(0xd18f77fd, 0x9527620a),
+              TOBN(0x9505c81c, 0x407c1cf8), TOBN(0x9998db4e, 0x1b6ec284),
+              TOBN(0x7e3389e5, 0xc247d44d), TOBN(0x12507141, 0x3f4f3d80),
+              TOBN(0xd4ba0110, 0x4a78a6c7), TOBN(0x312874a0, 0x767720be),
+              TOBN(0xded059a6, 0x75944370), TOBN(0xd6123d90, 0x3b2c0bdd),
+              TOBN(0xa56b717b, 0x51c108e3), TOBN(0x9bb7940e, 0x070623e9),
+              TOBN(0x794e2d59, 0x84ac066c), TOBN(0xf5954a92, 0xe68c69a0),
+              TOBN(0x28c52458, 0x4fd99dcc), TOBN(0x60e639fc, 0xb1012517),
+              TOBN(0xc2e60125, 0x7de79248), TOBN(0xe9ef6404, 0xf12fc6d7),
+              TOBN(0x4c4f2808, 0x2a3b5d32), TOBN(0x865ad32e, 0xc768eb8a),
+              TOBN(0xac02331b, 0x13fb70b6), TOBN(0x037b44c1, 0x95599b27),
+              TOBN(0x1a860fc4, 0x60bd082c), TOBN(0xa2e25745, 0xc980cd01),
+              TOBN(0xee3387a8, 0x1da0263e), TOBN(0x931bfb95, 0x2d10f3d6),
+              TOBN(0x5b687270, 0xa1f24a32), TOBN(0xf140e65d, 0xca494b86),
+              TOBN(0x4f4ddf91, 0xb2f1ac7a), TOBN(0xf99eaabb, 0x760fee27),
+              TOBN(0x57f4008a, 0x49c228e5), TOBN(0x090be440, 0x1cf713bb),
+              TOBN(0xac91fbe4, 0x5004f022), TOBN(0xd838c2c2, 0x569e1af6),
+              TOBN(0xd6c7d20b, 0x0f1daaa5), TOBN(0xaa063ac1, 0x1bbb02c0),
+              TOBN(0x0938a422, 0x59558a78), TOBN(0x5343c669, 0x8435da2f),
+              TOBN(0x96f67b18, 0x034410dc), TOBN(0x7cc1e424, 0x84510804),
+              TOBN(0x86a1543f, 0x16dfbb7d), TOBN(0x921fa942, 0x5b5bd592),
+              TOBN(0x9dcccb6e, 0xb33dd03c), TOBN(0x8581ddd9, 0xb843f51e),
+              TOBN(0x54935fcb, 0x81d73c9e), TOBN(0x6d07e979, 0x0a5e97ab),
+              TOBN(0x4dc7b30a, 0xcf3a6bab), TOBN(0x147ab1f3, 0x170bee11),
+              TOBN(0x0aaf8e3d, 0x9fafdee4), TOBN(0xfab3dbcb, 0x538a8b95),
+              TOBN(0x405df4b3, 0x6ef13871), TOBN(0xf1f4e9cb, 0x088d5a49),
+              TOBN(0x9bcd24d3, 0x66b33f1d), TOBN(0x3b97b820, 0x5ce445c0),
+              TOBN(0xe2926549, 0xba93ff61), TOBN(0xd9c341ce, 0x4dafe616),
+              TOBN(0xfb30a76e, 0x16efb6f3), TOBN(0xdf24b8ca, 0x605b953c),
+              TOBN(0x8bd52afe, 0xc2fffb9f), TOBN(0xbbac5ff7, 0xe19d0b96),
+              TOBN(0x43c01b87, 0x459afccd), TOBN(0x6bd45143, 0xb7432652),
+              TOBN(0x84734530, 0x55b5d78e), TOBN(0x81088fdb, 0x1554ba7d),
+              TOBN(0xada0a52c, 0x1e269375), TOBN(0xf9f037c4, 0x2dc5ec10),
+              TOBN(0xc0660607, 0x94bfbc11), TOBN(0xc0a630bb, 0xc9c40d2f),
+              TOBN(0x5efc797e, 0xab64c31e), TOBN(0xffdb1dab, 0x74507144),
+              TOBN(0xf6124287, 0x1ca6790c), TOBN(0xe9609d81, 0xe69bf1bf),
+              TOBN(0xdb898595, 0x00d24fc9), TOBN(0x9c750333, 0xe51fb417),
+              TOBN(0x51830a91, 0xfef7bbde), TOBN(0x0ce67dc8, 0x945f585c),
+              TOBN(0x9a730ed4, 0x4763eb50), TOBN(0x24a0e221, 0xc1ab0d66),
+              TOBN(0x643b6393, 0x648748f3), TOBN(0x1982daa1, 0x6d3c6291),
+              TOBN(0x6f00a9f7, 0x8bbc5549), TOBN(0x7a1783e1, 0x7f36384e),
+              TOBN(0xe8346323, 0xde977f50), TOBN(0x91ab688d, 0xb245502a),
+              TOBN(0x331ab6b5, 0x6d0bdd66), TOBN(0x0a6ef32e, 0x64b71229),
+              TOBN(0x1028150e, 0xfe7c352f), TOBN(0x27e04350, 0xce7b39d3),
+              TOBN(0x2a3c8acd, 0xc1070c82), TOBN(0xfb2034d3, 0x80c9feef),
+              TOBN(0x2d729621, 0x709f3729), TOBN(0x8df290bf, 0x62cb4549),
+              TOBN(0x02f99f33, 0xfc2e4326), TOBN(0x3b30076d, 0x5eddf032),
+              TOBN(0xbb21f8cf, 0x0c652fb5), TOBN(0x314fb49e, 0xed91cf7b),
+              TOBN(0xa013eca5, 0x2f700750), TOBN(0x2b9e3c23, 0x712a4575),
+              TOBN(0xe5355557, 0xaf30fbb0), TOBN(0x1ada3516, 0x7c77e771),
+              TOBN(0x45f6ecb2, 0x7b135670), TOBN(0xe85d19df, 0x7cfc202e),
+              TOBN(0x0f1b50c7, 0x58d1be9f), TOBN(0x5ebf2c0a, 0xead2e344),
+              TOBN(0x1531fe4e, 0xabc199c9), TOBN(0xc7032592, 0x56bab0ae),
+              TOBN(0x16ab2e48, 0x6c1fec54), TOBN(0x0f87fda8, 0x04280188),
+              TOBN(0xdc9f46fc, 0x609e4a74), TOBN(0x2a44a143, 0xba667f91),
+              TOBN(0xbc3d8b95, 0xb4d83436), TOBN(0xa01e4bd0, 0xc7bd2958),
+              TOBN(0x7b182932, 0x73483c90), TOBN(0xa79c6aa1, 0xa7c7b598),
+              TOBN(0xbf3983c6, 0xeaaac07e), TOBN(0x8f18181e, 0x96e0d4e6),
+              TOBN(0x8553d37c, 0x051af62b), TOBN(0xe9a998eb, 0x0bf94496),
+              TOBN(0xe0844f9f, 0xb0d59aa1), TOBN(0x983fd558, 0xe6afb813),
+              TOBN(0x9670c0ca, 0x65d69804), TOBN(0x732b22de, 0x6ea5ff2d),
+              TOBN(0xd7640ba9, 0x5fd8623b), TOBN(0x9f619163, 0xa6351782),
+              TOBN(0x0bfc27ee, 0xacee5043), TOBN(0xae419e73, 0x2eb10f02),
+              TOBN(0x19c028d1, 0x8943fb05), TOBN(0x71f01cf7, 0xff13aa2a),
+              TOBN(0x7790737e, 0x8887a132), TOBN(0x67513309, 0x66318410),
+              TOBN(0x9819e8a3, 0x7ddb795e), TOBN(0xfecb8ef5, 0xdad100b2),
+              TOBN(0x59f74a22, 0x3021926a), TOBN(0xb7c28a49, 0x6f9b4c1c),
+              TOBN(0xed1a733f, 0x912ad0ab), TOBN(0x42a910af, 0x01a5659c),
+              TOBN(0x3842c6e0, 0x7bd68cab), TOBN(0x2b57fa38, 0x76d70ac8),
+              TOBN(0x8a6707a8, 0x3c53aaeb), TOBN(0x62c1c510, 0x65b4db18),
+              TOBN(0x8de2c1fb, 0xb2d09dc7), TOBN(0xc3dfed12, 0x266bd23b),
+              TOBN(0x927d039b, 0xd5b27db6), TOBN(0x2fb2f0f1, 0x103243da),
+              TOBN(0xf855a07b, 0x80be7399), TOBN(0xed9327ce, 0x1f9f27a8),
+              TOBN(0xa0bd99c7, 0x729bdef7), TOBN(0x2b67125e, 0x28250d88),
+              TOBN(0x784b26e8, 0x8670ced7), TOBN(0xe3dfe41f, 0xc31bd3b4),
+              TOBN(0x9e353a06, 0xbcc85cbc), TOBN(0x302e2909, 0x60178a9d),
+              TOBN(0x860abf11, 0xa6eac16e), TOBN(0x76447000, 0xaa2b3aac),
+              TOBN(0x46ff9d19, 0x850afdab), TOBN(0x35bdd6a5, 0xfdb2d4c1),
+              TOBN(0xe82594b0, 0x7e5c9ce9), TOBN(0x0f379e53, 0x20af346e),
+              TOBN(0x608b31e3, 0xbc65ad4a), TOBN(0x710c6b12, 0x267c4826),
+              TOBN(0x51c966f9, 0x71954cf1), TOBN(0xb1cec793, 0x0d0aa215),
+              TOBN(0x1f155989, 0x86bd23a8), TOBN(0xae2ff99c, 0xf9452e86),
+              TOBN(0xd8dd953c, 0x340ceaa2), TOBN(0x26355275, 0x2e2e9333),
+              TOBN(0x15d4e5f9, 0x8586f06d), TOBN(0xd6bf94a8, 0xf7cab546),
+              TOBN(0x33c59a0a, 0xb76a9af0), TOBN(0x52740ab3, 0xba095af7),
+              TOBN(0xc444de8a, 0x24389ca0), TOBN(0xcc6f9863, 0x706da0cb),
+              TOBN(0xb5a741a7, 0x6b2515cf), TOBN(0x71c41601, 0x9585c749),
+              TOBN(0x78350d4f, 0xe683de97), TOBN(0x31d61524, 0x63d0b5f5),
+              TOBN(0x7a0cc5e1, 0xfbce090b), TOBN(0xaac927ed, 0xfbcb2a5b),
+              TOBN(0xe920de49, 0x20d84c35), TOBN(0x8c06a0b6, 0x22b4de26),
+              TOBN(0xd34dd58b, 0xafe7ddf3), TOBN(0x55851fed, 0xc1e6e55b),
+              TOBN(0xd1395616, 0x960696e7), TOBN(0x940304b2, 0x5f22705f),
+              TOBN(0x6f43f861, 0xb0a2a860), TOBN(0xcf121282, 0x0e7cc981),
+              TOBN(0x12186212, 0x0ab64a96), TOBN(0x09215b9a, 0xb789383c),
+              TOBN(0x311eb305, 0x37387c09), TOBN(0xc5832fce, 0xf03ee760),
+              TOBN(0x30358f58, 0x32f7ea19), TOBN(0xe01d3c34, 0x91d53551),
+              TOBN(0x1ca5ee41, 0xda48ea80), TOBN(0x34e71e8e, 0xcf4fa4c1),
+              TOBN(0x312abd25, 0x7af1e1c7), TOBN(0xe3afcdeb, 0x2153f4a5),
+              TOBN(0x9d5c84d7, 0x00235e9a), TOBN(0x0308d3f4, 0x8c4c836f),
+              TOBN(0xc0a66b04, 0x89332de5), TOBN(0x610dd399, 0x89e566ef),
+              TOBN(0xf8eea460, 0xd1ac1635), TOBN(0x84cbb3fb, 0x20a2c0df),
+              TOBN(0x40afb488, 0xe74a48c5), TOBN(0x29738198, 0xd326b150),
+              TOBN(0x2a17747f, 0xa6d74081), TOBN(0x60ea4c05, 0x55a26214),
+              TOBN(0x53514bb4, 0x1f88c5fe), TOBN(0xedd64567, 0x7e83426c),
+              TOBN(0xd5d6cbec, 0x96460b25), TOBN(0xa12fd0ce, 0x68dc115e),
+              TOBN(0xc5bc3ed2, 0x697840ea), TOBN(0x969876a8, 0xa6331e31),
+              TOBN(0x60c36217, 0x472ff580), TOBN(0xf4229705, 0x4ad41393),
+              TOBN(0x4bd99ef0, 0xa03b8b92), TOBN(0x501c7317, 0xc144f4f6),
+              TOBN(0x159009b3, 0x18464945), TOBN(0x6d5e594c, 0x74c5c6be),
+              TOBN(0x2d587011, 0x321a3660), TOBN(0xd1e184b1, 0x3898d022),
+              TOBN(0x5ba04752, 0x4c6a7e04), TOBN(0x47fa1e2b, 0x45550b65),
+              TOBN(0x9419daf0, 0x48c0a9a5), TOBN(0x66362953, 0x7c243236),
+              TOBN(0xcd0744b1, 0x5cb12a88), TOBN(0x561b6f9a, 0x2b646188),
+              TOBN(0x599415a5, 0x66c2c0c0), TOBN(0xbe3f0859, 0x0f83f09a),
+              TOBN(0x9141c5be, 0xb92041b8), TOBN(0x01ae38c7, 0x26477d0d),
+              TOBN(0xca8b71f3, 0xd12c7a94), TOBN(0xfab5b31f, 0x765c70db),
+              TOBN(0x76ae7492, 0x487443e9), TOBN(0x8595a310, 0x990d1349),
+              TOBN(0xf8dbeda8, 0x7d460a37), TOBN(0x7f7ad082, 0x1e45a38f),
+              TOBN(0xed1d4db6, 0x1059705a), TOBN(0xa3dd492a, 0xe6b9c697),
+              TOBN(0x4b92ee3a, 0x6eb38bd5), TOBN(0xbab2609d, 0x67cc0bb7),
+              TOBN(0x7fc4fe89, 0x6e70ee82), TOBN(0xeff2c56e, 0x13e6b7e3),
+              TOBN(0x9b18959e, 0x34d26fca), TOBN(0x2517ab66, 0x889d6b45),
+              TOBN(0xf167b4e0, 0xbdefdd4f), TOBN(0x69958465, 0xf366e401),
+              TOBN(0x5aa368ab, 0xa73bbec0), TOBN(0x12148709, 0x7b240c21),
+              TOBN(0x378c3233, 0x18969006), TOBN(0xcb4d73ce, 0xe1fe53d1),
+              TOBN(0x5f50a80e, 0x130c4361), TOBN(0xd67f5951, 0x7ef5212b),
+              TOBN(0xf145e21e, 0x9e70c72e), TOBN(0xb2e52e29, 0x5566d2fb),
+              TOBN(0x44eaba4a, 0x032397f5), TOBN(0x5e56937b, 0x7e31a7de),
+              TOBN(0x68dcf517, 0x456c61e1), TOBN(0xbc2e954a, 0xa8b0a388),
+              TOBN(0xe3552fa7, 0x60a8b755), TOBN(0x03442dae, 0x73ad0cde),
+              TOBN(0x37ffe747, 0xceb26210), TOBN(0x983545e8, 0x787baef9),
+              TOBN(0x8b8c8535, 0x86a3de31), TOBN(0xc621dbcb, 0xfacd46db),
+              TOBN(0x82e442e9, 0x59266fbb), TOBN(0xa3514c37, 0x339d471c),
+              TOBN(0x3a11b771, 0x62cdad96), TOBN(0xf0cb3b3c, 0xecf9bdf0),
+              TOBN(0x3fcbdbce, 0x478e2135), TOBN(0x7547b5cf, 0xbda35342),
+              TOBN(0xa97e81f1, 0x8a677af6), TOBN(0xc8c2bf83, 0x28817987),
+              TOBN(0xdf07eaaf, 0x45580985), TOBN(0xc68d1f05, 0xc93b45cb),
+              TOBN(0x106aa2fe, 0xc77b4cac), TOBN(0x4c1d8afc, 0x04a7ae86),
+              TOBN(0xdb41c3fd, 0x9eb45ab2), TOBN(0x5b234b5b, 0xd4b22e74),
+              TOBN(0xda253dec, 0xf215958a), TOBN(0x67e0606e, 0xa04edfa0),
+              TOBN(0xabbbf070, 0xef751b11), TOBN(0xf352f175, 0xf6f06dce),
+              TOBN(0xdfc4b6af, 0x6839f6b4), TOBN(0x53ddf9a8, 0x9959848e),
+              TOBN(0xda49c379, 0xc21520b0), TOBN(0x90864ff0, 0xdbd5d1b6),
+              TOBN(0x2f055d23, 0x5f49c7f7), TOBN(0xe51e4e6a, 0xa796b2d8),
+              TOBN(0xc361a67f, 0x5c9dc340), TOBN(0x5ad53c37, 0xbca7c620),
+              TOBN(0xda1d6588, 0x32c756d0), TOBN(0xad60d911, 0x8bb67e13),
+              TOBN(0xd6c47bdf, 0x0eeec8c6), TOBN(0x4a27fec1, 0x078a1821),
+              TOBN(0x081f7415, 0xc3099524), TOBN(0x8effdf0b, 0x82cd8060),
+              TOBN(0xdb70ec1c, 0x65842df8), TOBN(0x8821b358, 0xd319a901),
+              TOBN(0x72ee56ee, 0xde42b529), TOBN(0x5bb39592, 0x236e4286),
+              TOBN(0xd1183316, 0xfd6f7140), TOBN(0xf9fadb5b, 0xbd8e81f7),
+              TOBN(0x701d5e0c, 0x5a02d962), TOBN(0xfdee4dbf, 0x1b601324),
+              TOBN(0xbed17407, 0x35d7620e), TOBN(0x04e3c2c3, 0xf48c0012),
+              TOBN(0x9ee29da7, 0x3455449a), TOBN(0x562cdef4, 0x91a836c4),
+              TOBN(0x8f682a5f, 0x47701097), TOBN(0x617125d8, 0xff88d0c2),
+              TOBN(0x948fda24, 0x57bb86dd), TOBN(0x348abb8f, 0x289f7286),
+              TOBN(0xeb10eab5, 0x99d94bbd), TOBN(0xd51ba28e, 0x4684d160),
+              TOBN(0xabe0e51c, 0x30c8f41a), TOBN(0x66588b45, 0x13254f4a),
+              TOBN(0x147ebf01, 0xfad097a5), TOBN(0x49883ea8, 0x610e815d),
+              TOBN(0xe44d60ba, 0x8a11de56), TOBN(0xa970de6e, 0x827a7a6d),
+              TOBN(0x2be41424, 0x5e17fc19), TOBN(0xd833c657, 0x01214057),
+              TOBN(0x1375813b, 0x363e723f), TOBN(0x6820bb88, 0xe6a52e9b),
+              TOBN(0x7e7f6970, 0xd875d56a), TOBN(0xd6a0a9ac, 0x51fbf6bf),
+              TOBN(0x54ba8790, 0xa3083c12), TOBN(0xebaeb23d, 0x6ae7eb64),
+              TOBN(0xa8685c3a, 0xb99a907a), TOBN(0xf1e74550, 0x026bf40b),
+              TOBN(0x7b73a027, 0xc802cd9e), TOBN(0x9a8a927c, 0x4fef4635),
+              TOBN(0xe1b6f60c, 0x08191224), TOBN(0xc4126ebb, 0xde4ec091),
+              TOBN(0xe1dff4dc, 0x4ae38d84), TOBN(0xde3f57db, 0x4f2ef985),
+              TOBN(0x34964337, 0xd446a1dd), TOBN(0x7bf217a0, 0x859e77f6),
+              TOBN(0x8ff10527, 0x8e1d13f5), TOBN(0xa304ef03, 0x74eeae27),
+              TOBN(0xfc6f5e47, 0xd19dfa5a), TOBN(0xdb007de3, 0x7fad982b),
+              TOBN(0x28205ad1, 0x613715f5), TOBN(0x251e6729, 0x7889529e),
+              TOBN(0x72705184, 0x1ae98e78), TOBN(0xf818537d, 0x271cac32),
+              TOBN(0xc8a15b7e, 0xb7f410f5), TOBN(0xc474356f, 0x81f62393),
+              TOBN(0x92dbdc5a, 0xc242316b), TOBN(0xabe060ac, 0xdbf4aff5),
+              TOBN(0x6e8c38fe, 0x909a8ec6), TOBN(0x43e514e5, 0x6116cb94),
+              TOBN(0x2078fa38, 0x07d784f9), TOBN(0x1161a880, 0xf4b5b357),
+              TOBN(0x5283ce79, 0x13adea3d), TOBN(0x0756c3e6, 0xcc6a910b),
+              TOBN(0x60bcfe01, 0xaaa79697), TOBN(0x04a73b29, 0x56391db1),
+              TOBN(0xdd8dad47, 0x189b45a0), TOBN(0xbfac0dd0, 0x48d5b8d9),
+              TOBN(0x34ab3af5, 0x7d3d2ec2), TOBN(0x6fa2fc2d, 0x207bd3af),
+              TOBN(0x9ff40092, 0x66550ded), TOBN(0x719b3e87, 0x1fd5b913),
+              TOBN(0xa573a496, 0x6d17fbc7), TOBN(0x0cd1a70a, 0x73d2b24e),
+              TOBN(0x34e2c5ca, 0xb2676937), TOBN(0xe7050b06, 0xbf669f21),
+              TOBN(0xfbe948b6, 0x1ede9046), TOBN(0xa0530051, 0x97662659),
+              TOBN(0x58cbd4ed, 0xf10124c5), TOBN(0xde2646e4, 0xdd6c06c8),
+              TOBN(0x332f8108, 0x8cad38c0), TOBN(0x471b7e90, 0x6bd68ae2),
+              TOBN(0x56ac3fb2, 0x0d8e27a3), TOBN(0xb54660db, 0x136b4b0d),
+              TOBN(0x123a1e11, 0xa6fd8de4), TOBN(0x44dbffea, 0xa37799ef),
+              TOBN(0x4540b977, 0xce6ac17c), TOBN(0x495173a8, 0xaf60acef) },
+          { TOBN(0x9ebb284d, 0x391c2a82), TOBN(0xbcdd4863, 0x158308e8),
+              TOBN(0x006f16ec, 0x83f1edca), TOBN(0xa13e2c37, 0x695dc6c8),
+              TOBN(0x2ab756f0, 0x4a057a87), TOBN(0xa8765500, 0xa6b48f98),
+              TOBN(0x4252face, 0x68651c44), TOBN(0xa52b540b, 0xe1765e02),
+              TOBN(0x4f922fc5, 0x16a0d2bb), TOBN(0x0d5cc16c, 0x1a623499),
+              TOBN(0x9241cf3a, 0x57c62c8b), TOBN(0x2f5e6961, 0xfd1b667f),
+              TOBN(0x5c15c70b, 0xf5a01797), TOBN(0x3d20b44d, 0x60956192),
+              TOBN(0x04911b37, 0x071fdb52), TOBN(0xf648f916, 0x8d6f0f7b),
+              TOBN(0x6dc1acaf, 0xe60b7cf7), TOBN(0x25860a50, 0x84a9d869),
+              TOBN(0x56fc6f09, 0xe7ba8ac4), TOBN(0x828c5bd0, 0x6148d29e),
+              TOBN(0xac6b435e, 0xdc55ae5f), TOBN(0xa527f56c, 0xc0117411),
+              TOBN(0x94d5045e, 0xfd24342c), TOBN(0x2c4c0a35, 0x70b67c0d),
+              TOBN(0x027cc8b8, 0xfac61d9a), TOBN(0x7d25e062, 0xe3c6fe8a),
+              TOBN(0xe08805bf, 0xe5bff503), TOBN(0x13271e6c, 0x6ff632f7),
+              TOBN(0x55dca6c0, 0x232f76a5), TOBN(0x8957c32d, 0x701ef426),
+              TOBN(0xee728bcb, 0xa10a5178), TOBN(0x5ea60411, 0xb62c5173),
+              TOBN(0xfc4e964e, 0xd0b8892b), TOBN(0x9ea17683, 0x9301bb74),
+              TOBN(0x6265c5ae, 0xfcc48626), TOBN(0xe60cf82e, 0xbb3e9102),
+              TOBN(0x57adf797, 0xd4df5531), TOBN(0x235b59a1, 0x8deeefe2),
+              TOBN(0x60adcf58, 0x3f306eb1), TOBN(0x105c2753, 0x3d09492d),
+              TOBN(0x4090914b, 0xb5def996), TOBN(0x1cb69c83, 0x233dd1e7),
+              TOBN(0xc1e9c1d3, 0x9b3d5e76), TOBN(0x1f3338ed, 0xfccf6012),
+              TOBN(0xb1e95d0d, 0x2f5378a8), TOBN(0xacf4c2c7, 0x2f00cd21),
+              TOBN(0x6e984240, 0xeb5fe290), TOBN(0xd66c038d, 0x248088ae),
+              TOBN(0x804d264a, 0xf94d70cf), TOBN(0xbdb802ef, 0x7314bf7e),
+              TOBN(0x8fb54de2, 0x4333ed02), TOBN(0x740461e0, 0x285635d9),
+              TOBN(0x4113b2c8, 0x365e9383), TOBN(0xea762c83, 0x3fdef652),
+              TOBN(0x4eec6e2e, 0x47b956c1), TOBN(0xa3d814be, 0x65620fa4),
+              TOBN(0x9ad5462b, 0xb4d8bc50), TOBN(0x181c0b16, 0xa9195770),
+              TOBN(0xebd4fe1c, 0x78412a68), TOBN(0xae0341bc, 0xc0dff48c),
+              TOBN(0xb6bc45cf, 0x7003e866), TOBN(0xf11a6dea, 0x8a24a41b),
+              TOBN(0x5407151a, 0xd04c24c2), TOBN(0x62c9d27d, 0xda5b7b68),
+              TOBN(0x2e964235, 0x88cceff6), TOBN(0x8594c54f, 0x8b07ed69),
+              TOBN(0x1578e73c, 0xc84d0d0d), TOBN(0x7b4e1055, 0xff532868),
+              TOBN(0xa348c0d5, 0xb5ec995a), TOBN(0xbf4b9d55, 0x14289a54),
+              TOBN(0x9ba155a6, 0x58fbd777), TOBN(0x186ed7a8, 0x1a84491d),
+              TOBN(0xd4992b30, 0x614c0900), TOBN(0xda98d121, 0xbd00c24b),
+              TOBN(0x7f534dc8, 0x7ec4bfa1), TOBN(0x4a5ff674, 0x37dc34bc),
+              TOBN(0x68c196b8, 0x1d7ea1d7), TOBN(0x38cf2893, 0x80a6d208),
+              TOBN(0xfd56cd09, 0xe3cbbd6e), TOBN(0xec72e27e, 0x4205a5b6),
+              TOBN(0x15ea68f5, 0xa44f77f7), TOBN(0x7aa5f9fd, 0xb43c52bc),
+              TOBN(0x86ff676f, 0x94f0e609), TOBN(0xa4cde963, 0x2e2d432b),
+              TOBN(0x8cafa0c0, 0xeee470af), TOBN(0x84137d0e, 0x8a3f5ec8),
+              TOBN(0xebb40411, 0xfaa31231), TOBN(0xa239c13f, 0x6f7f7ccf),
+              TOBN(0x32865719, 0xa8afd30b), TOBN(0x86798328, 0x8a826dce),
+              TOBN(0xdf04e891, 0xc4a8fbe0), TOBN(0xbb6b6e1b, 0xebf56ad3),
+              TOBN(0x0a695b11, 0x471f1ff0), TOBN(0xd76c3389, 0xbe15baf0),
+              TOBN(0x018edb95, 0xbe96c43e), TOBN(0xf2beaaf4, 0x90794158),
+              TOBN(0x152db09e, 0xc3076a27), TOBN(0x5e82908e, 0xe416545d),
+              TOBN(0xa2c41272, 0x356d6f2e), TOBN(0xdc9c9642, 0x31fd74e1),
+              TOBN(0x66ceb88d, 0x519bf615), TOBN(0xe29ecd76, 0x05a2274e),
+              TOBN(0x3a0473c4, 0xbf5e2fa0), TOBN(0x6b6eb671, 0x64284e67),
+              TOBN(0xe8b97932, 0xb88756dd), TOBN(0xed4e8652, 0xf17e3e61),
+              TOBN(0xc2dd1499, 0x3ee1c4a4), TOBN(0xc0aaee17, 0x597f8c0e),
+              TOBN(0x15c4edb9, 0x6c168af3), TOBN(0x6563c7bf, 0xb39ae875),
+              TOBN(0xadfadb6f, 0x20adb436), TOBN(0xad55e8c9, 0x9a042ac0),
+              TOBN(0x975a1ed8, 0xb76da1f5), TOBN(0x10dfa466, 0xa58acb94),
+              TOBN(0x8dd7f7e3, 0xac060282), TOBN(0x6813e66a, 0x572a051e),
+              TOBN(0xb4ccae1e, 0x350cb901), TOBN(0xb653d656, 0x50cb7822),
+              TOBN(0x42484710, 0xdfab3b87), TOBN(0xcd7ee537, 0x9b670fd0),
+              TOBN(0x0a50b12e, 0x523b8bf6), TOBN(0x8009eb5b, 0x8f910c1b),
+              TOBN(0xf535af82, 0x4a167588), TOBN(0x0f835f9c, 0xfb2a2abd),
+              TOBN(0xf59b2931, 0x2afceb62), TOBN(0xc797df2a, 0x169d383f),
+              TOBN(0xeb3f5fb0, 0x66ac02b0), TOBN(0x029d4c6f, 0xdaa2d0ca),
+              TOBN(0xd4059bc1, 0xafab4bc5), TOBN(0x833f5c6f, 0x56783247),
+              TOBN(0xb5346630, 0x8d2d3605), TOBN(0x83387891, 0xd34d8433),
+              TOBN(0xd973b30f, 0xadd9419a), TOBN(0xbcca1099, 0xafe3fce8),
+              TOBN(0x08178315, 0x0809aac6), TOBN(0x01b7f21a, 0x540f0f11),
+              TOBN(0x65c29219, 0x909523c8), TOBN(0xa62f648f, 0xa3a1c741),
+              TOBN(0x88598d4f, 0x60c9e55a), TOBN(0xbce9141b, 0x0e4f347a),
+              TOBN(0x9af97d84, 0x35f9b988), TOBN(0x0210da62, 0x320475b6),
+              TOBN(0x3c076e22, 0x9191476c), TOBN(0x7520dbd9, 0x44fc7834),
+              TOBN(0x6a6b2cfe, 0xc1ab1bbd), TOBN(0xef8a65be, 0xdc650938),
+              TOBN(0x72855540, 0x805d7bc4), TOBN(0xda389396, 0xed11fdfd),
+              TOBN(0xa9d5bd36, 0x74660876), TOBN(0x11d67c54, 0xb45dff35),
+              TOBN(0x6af7d148, 0xa4f5da94), TOBN(0xbb8d4c3f, 0xc0bbeb31),
+              TOBN(0x87a7ebd1, 0xe0a1b12a), TOBN(0x1e4ef88d, 0x770ba95f),
+              TOBN(0x8c33345c, 0xdc2ae9cb), TOBN(0xcecf1276, 0x01cc8403),
+              TOBN(0x687c012e, 0x1b39b80f), TOBN(0xfd90d0ad, 0x35c33ba4),
+              TOBN(0xa3ef5a67, 0x5c9661c2), TOBN(0x368fc88e, 0xe017429e),
+              TOBN(0xd30c6761, 0x196a2fa2), TOBN(0x931b9817, 0xbd5b312e),
+              TOBN(0xba01000c, 0x72f54a31), TOBN(0xa203d2c8, 0x66eaa541),
+              TOBN(0xf2abdee0, 0x98939db3), TOBN(0xe37d6c2c, 0x3e606c02),
+              TOBN(0xf2921574, 0x521ff643), TOBN(0x2781b3c4, 0xd7e2fca3),
+              TOBN(0x664300b0, 0x7850ec06), TOBN(0xac5a38b9, 0x7d3a10cf),
+              TOBN(0x9233188d, 0xe34ab39d), TOBN(0xe77057e4, 0x5072cbb9),
+              TOBN(0xbcf0c042, 0xb59e78df), TOBN(0x4cfc91e8, 0x1d97de52),
+              TOBN(0x4661a26c, 0x3ee0ca4a), TOBN(0x5620a4c1, 0xfb8507bc),
+              TOBN(0x4b44d4aa, 0x049f842c), TOBN(0xceabc5d5, 0x1540e82b),
+              TOBN(0x306710fd, 0x15c6f156), TOBN(0xbe5ae52b, 0x63db1d72),
+              TOBN(0x06f1e7e6, 0x334957f1), TOBN(0x57e388f0, 0x31144a70),
+              TOBN(0xfb69bb2f, 0xdf96447b), TOBN(0x0f78ebd3, 0x73e38a12),
+              TOBN(0xb8222605, 0x2b7ce542), TOBN(0xe6d4ce99, 0x7472bde1),
+              TOBN(0x53e16ebe, 0x09d2f4da), TOBN(0x180ff42e, 0x53b92b2e),
+              TOBN(0xc59bcc02, 0x2c34a1c6), TOBN(0x3803d6f9, 0x422c46c2),
+              TOBN(0x18aff74f, 0x5c14a8a2), TOBN(0x55aebf80, 0x10a08b28),
+              TOBN(0x66097d58, 0x7135593f), TOBN(0x32e6eff7, 0x2be570cd),
+              TOBN(0x584e6a10, 0x2a8c860d), TOBN(0xcd185890, 0xa2eb4163),
+              TOBN(0x7ceae99d, 0x6d97e134), TOBN(0xd42c6b70, 0xdd8447ce),
+              TOBN(0x59ddbb4a, 0xb8c50273), TOBN(0x03c612df, 0x3cf34e1e),
+              TOBN(0x84b9ca15, 0x04b6c5a0), TOBN(0x35216f39, 0x18f0e3a3),
+              TOBN(0x3ec2d2bc, 0xbd986c00), TOBN(0x8bf546d9, 0xd19228fe),
+              TOBN(0xd1c655a4, 0x4cd623c3), TOBN(0x366ce718, 0x502b8e5a),
+              TOBN(0x2cfc84b4, 0xeea0bfe7), TOBN(0xe01d5cee, 0xcf443e8e),
+              TOBN(0x8ec045d9, 0x036520f8), TOBN(0xdfb3c3d1, 0x92d40e98),
+              TOBN(0x0bac4cce, 0xcc559a04), TOBN(0x35eccae5, 0x240ea6b1),
+              TOBN(0x180b32db, 0xf8a5a0ac), TOBN(0x547972a5, 0xeb699700),
+              TOBN(0xa3765801, 0xca26bca0), TOBN(0x57e09d0e, 0xa647f25a),
+              TOBN(0xb956970e, 0x2fdd23cc), TOBN(0xb80288bc, 0x5682e971),
+              TOBN(0xe6e6d91e, 0x9ae86ebc), TOBN(0x0564c83f, 0x8c9f1939),
+              TOBN(0x551932a2, 0x39560368), TOBN(0xe893752b, 0x049c28e2),
+              TOBN(0x0b03cee5, 0xa6a158c3), TOBN(0xe12d656b, 0x04964263),
+              TOBN(0x4b47554e, 0x63e3bc1d), TOBN(0xc719b6a2, 0x45044ff7),
+              TOBN(0x4f24d30a, 0xe48daa07), TOBN(0xa3f37556, 0xc8c1edc3),
+              TOBN(0x9a47bf76, 0x0700d360), TOBN(0xbb1a1824, 0x822ae4e2),
+              TOBN(0x22e275a3, 0x89f1fb4c), TOBN(0x72b1aa23, 0x9968c5f5),
+              TOBN(0xa75feaca, 0xbe063f64), TOBN(0x9b392f43, 0xbce47a09),
+              TOBN(0xd4241509, 0x1ad07aca), TOBN(0x4b0c591b, 0x8d26cd0f),
+              TOBN(0x2d42ddfd, 0x92f1169a), TOBN(0x63aeb1ac, 0x4cbf2392),
+              TOBN(0x1de9e877, 0x0691a2af), TOBN(0xebe79af7, 0xd98021da),
+              TOBN(0xcfdf2a4e, 0x40e50acf), TOBN(0xf0a98ad7, 0xaf01d665),
+              TOBN(0xefb640bf, 0x1831be1f), TOBN(0x6fe8bd2f, 0x80e9ada0),
+              TOBN(0x94c103a1, 0x6cafbc91), TOBN(0x170f8759, 0x8308e08c),
+              TOBN(0x5de2d2ab, 0x9780ff4f), TOBN(0x666466bc, 0x45b201f2),
+              TOBN(0x58af2010, 0xf5b343bc), TOBN(0x0f2e400a, 0xf2f142fe),
+              TOBN(0x3483bfde, 0xa85f4bdf), TOBN(0xf0b1d093, 0x03bfeaa9),
+              TOBN(0x2ea01b95, 0xc7081603), TOBN(0xe943e4c9, 0x3dba1097),
+              TOBN(0x47be92ad, 0xb438f3a6), TOBN(0x00bb7742, 0xe5bf6636),
+              TOBN(0x136b7083, 0x824297b4), TOBN(0x9d0e5580, 0x5584455f),
+              TOBN(0xab48cedc, 0xf1c7d69e), TOBN(0x53a9e481, 0x2a256e76),
+              TOBN(0x0402b0e0, 0x65eb2413), TOBN(0xdadbbb84, 0x8fc407a7),
+              TOBN(0xa65cd5a4, 0x8d7f5492), TOBN(0x21d44293, 0x74bae294),
+              TOBN(0x66917ce6, 0x3b5f1cc4), TOBN(0x37ae52ea, 0xce872e62),
+              TOBN(0xbb087b72, 0x2905f244), TOBN(0x12077086, 0x1e6af74f),
+              TOBN(0x4b644e49, 0x1058edea), TOBN(0x827510e3, 0xb638ca1d),
+              TOBN(0x8cf2b704, 0x6038591c), TOBN(0xffc8b47a, 0xfe635063),
+              TOBN(0x3ae220e6, 0x1b4d5e63), TOBN(0xbd864742, 0x9d961b4b),
+              TOBN(0x610c107e, 0x9bd16bed), TOBN(0x4270352a, 0x1127147b),
+              TOBN(0x7d17ffe6, 0x64cfc50e), TOBN(0x50dee01a, 0x1e36cb42),
+              TOBN(0x068a7622, 0x35dc5f9a), TOBN(0x9a08d536, 0xdf53f62c),
+              TOBN(0x4ed71457, 0x6be5f7de), TOBN(0xd93006f8, 0xc2263c9e),
+              TOBN(0xe073694c, 0xcacacb36), TOBN(0x2ff7a5b4, 0x3ae118ab),
+              TOBN(0x3cce53f1, 0xcd871236), TOBN(0xf156a39d, 0xc2aa6d52),
+              TOBN(0x9cc5f271, 0xb198d76d), TOBN(0xbc615b6f, 0x81383d39),
+              TOBN(0xa54538e8, 0xde3eee6b), TOBN(0x58c77538, 0xab910d91),
+              TOBN(0x31e5bdbc, 0x58d278bd), TOBN(0x3cde4adf, 0xb963acae),
+              TOBN(0xb1881fd2, 0x5302169c), TOBN(0x8ca60fa0, 0xa989ed8b),
+              TOBN(0xa1999458, 0xff96a0ee), TOBN(0xc1141f03, 0xac6c283d),
+              TOBN(0x7677408d, 0x6dfafed3), TOBN(0x33a01653, 0x39661588),
+              TOBN(0x3c9c15ec, 0x0b726fa0), TOBN(0x090cfd93, 0x6c9b56da),
+              TOBN(0xe34f4bae, 0xa3c40af5), TOBN(0x3469eadb, 0xd21129f1),
+              TOBN(0xcc51674a, 0x1e207ce8), TOBN(0x1e293b24, 0xc83b1ef9),
+              TOBN(0x17173d13, 0x1e6c0bb4), TOBN(0x19004695, 0x90776d35),
+              TOBN(0xe7980e34, 0x6de6f922), TOBN(0x873554cb, 0xf4dd9a22),
+              TOBN(0x0316c627, 0xcbf18a51), TOBN(0x4d93651b, 0x3032c081),
+              TOBN(0x207f2771, 0x3946834d), TOBN(0x2c08d7b4, 0x30cdbf80),
+              TOBN(0x137a4fb4, 0x86df2a61), TOBN(0xa1ed9c07, 0xecf7b4a2),
+              TOBN(0xb2e460e2, 0x7bd042ff), TOBN(0xb7f5e2fa, 0x5f62f5ec),
+              TOBN(0x7aa6ec6b, 0xcc2423b7), TOBN(0x75ce0a7f, 0xba63eea7),
+              TOBN(0x67a45fb1, 0xf250a6e1), TOBN(0x93bc919c, 0xe53cdc9f),
+              TOBN(0x9271f56f, 0x871942df), TOBN(0x2372ff6f, 0x7859ad66),
+              TOBN(0x5f4c2b96, 0x33cb1a78), TOBN(0xe3e29101, 0x5838aa83),
+              TOBN(0xa7ed1611, 0xe4e8110c), TOBN(0x2a2d70d5, 0x330198ce),
+              TOBN(0xbdf132e8, 0x6720efe0), TOBN(0xe61a8962, 0x66a471bf),
+              TOBN(0x796d3a85, 0x825808bd), TOBN(0x51dc3cb7, 0x3fd6e902),
+              TOBN(0x643c768a, 0x916219d1), TOBN(0x36cd7685, 0xa2ad7d32),
+              TOBN(0xe3db9d05, 0xb22922a4), TOBN(0x6494c87e, 0xdba29660),
+              TOBN(0xf0ac91df, 0xbcd2ebc7), TOBN(0x4deb57a0, 0x45107f8d),
+              TOBN(0x42271f59, 0xc3d12a73), TOBN(0x5f71687c, 0xa5c2c51d),
+              TOBN(0xcb1f50c6, 0x05797bcb), TOBN(0x29ed0ed9, 0xd6d34eb0),
+              TOBN(0xe5fe5b47, 0x4683c2eb), TOBN(0x4956eeb5, 0x97447c46),
+              TOBN(0x5b163a43, 0x71207167), TOBN(0x93fa2fed, 0x0248c5ef),
+              TOBN(0x67930af2, 0x31f63950), TOBN(0xa77797c1, 0x14caa2c9),
+              TOBN(0x526e80ee, 0x27ac7e62), TOBN(0xe1e6e626, 0x58b28aec),
+              TOBN(0x636178b0, 0xb3c9fef0), TOBN(0xaf7752e0, 0x6d5f90be),
+              TOBN(0x94ecaf18, 0xeece51cf), TOBN(0x2864d0ed, 0xca806e1f),
+              TOBN(0x6de2e383, 0x97c69134), TOBN(0x5a42c316, 0xeb291293),
+              TOBN(0xc7779219, 0x6a60bae0), TOBN(0xa24de346, 0x6b7599d1),
+              TOBN(0x49d374aa, 0xb75d4941), TOBN(0x98900586, 0x2d501ff0),
+              TOBN(0x9f16d40e, 0xeb7974cf), TOBN(0x1033860b, 0xcdd8c115),
+              TOBN(0xb6c69ac8, 0x2094cec3), TOBN(0x9976fb88, 0x403b770c),
+              TOBN(0x1dea026c, 0x4859590d), TOBN(0xb6acbb46, 0x8562d1fd),
+              TOBN(0x7cd6c461, 0x44569d85), TOBN(0xc3190a36, 0x97f0891d),
+              TOBN(0xc6f53195, 0x48d5a17d), TOBN(0x7d919966, 0xd749abc8),
+              TOBN(0x65104837, 0xdd1c8a20), TOBN(0x7e5410c8, 0x2f683419),
+              TOBN(0x958c3ca8, 0xbe94022e), TOBN(0x605c3197, 0x6145dac2),
+              TOBN(0x3fc07501, 0x01683d54), TOBN(0x1d7127c5, 0x595b1234),
+              TOBN(0x10b8f87c, 0x9481277f), TOBN(0x677db2a8, 0xe65a1adb),
+              TOBN(0xec2fccaa, 0xddce3345), TOBN(0x2a6811b7, 0x012a4350),
+              TOBN(0x96760ff1, 0xac598bdc), TOBN(0x054d652a, 0xd1bf4128),
+              TOBN(0x0a1151d4, 0x92a21005), TOBN(0xad7f3971, 0x33110fdf),
+              TOBN(0x8c95928c, 0x1960100f), TOBN(0x6c91c825, 0x7bf03362),
+              TOBN(0xc8c8b2a2, 0xce309f06), TOBN(0xfdb27b59, 0xca27204b),
+              TOBN(0xd223eaa5, 0x0848e32e), TOBN(0xb93e4b2e, 0xe7bfaf1e),
+              TOBN(0xc5308ae6, 0x44aa3ded), TOBN(0x317a666a, 0xc015d573),
+              TOBN(0xc888ce23, 0x1a979707), TOBN(0xf141c1e6, 0x0d5c4958),
+              TOBN(0xb53b7de5, 0x61906373), TOBN(0x858dbade, 0xeb999595),
+              TOBN(0x8cbb47b2, 0xa59e5c36), TOBN(0x660318b3, 0xdcf4e842),
+              TOBN(0xbd161ccd, 0x12ba4b7a), TOBN(0xf399daab, 0xf8c8282a),
+              TOBN(0x1587633a, 0xeeb2130d), TOBN(0xa465311a, 0xda38dd7d),
+              TOBN(0x5f75eec8, 0x64d3779b), TOBN(0x3c5d0476, 0xad64c171),
+              TOBN(0x87410371, 0x2a914428), TOBN(0x8096a891, 0x90e2fc29),
+              TOBN(0xd3d2ae9d, 0x23b3ebc2), TOBN(0x90bdd6db, 0xa580cfd6),
+              TOBN(0x52dbb7f3, 0xc5b01f6c), TOBN(0xe68eded4, 0xe102a2dc),
+              TOBN(0x17785b77, 0x99eb6df0), TOBN(0x26c3cc51, 0x7386b779),
+              TOBN(0x345ed988, 0x6417a48e), TOBN(0xe990b4e4, 0x07d6ef31),
+              TOBN(0x0f456b7e, 0x2586abba), TOBN(0x239ca6a5, 0x59c96e9a),
+              TOBN(0xe327459c, 0xe2eb4206), TOBN(0x3a4c3313, 0xa002b90a),
+              TOBN(0x2a114806, 0xf6a3f6fb), TOBN(0xad5cad2f, 0x85c251dd),
+              TOBN(0x92c1f613, 0xf5a784d3), TOBN(0xec7bfacf, 0x349766d5),
+              TOBN(0x04b3cd33, 0x3e23cb3b), TOBN(0x3979fe84, 0xc5a64b2d),
+              TOBN(0x192e2720, 0x7e589106), TOBN(0xa60c43d1, 0xa15b527f),
+              TOBN(0x2dae9082, 0xbe7cf3a6), TOBN(0xcc86ba92, 0xbc967274),
+              TOBN(0xf28a2ce8, 0xaea0a8a9), TOBN(0x404ca6d9, 0x6ee988b3),
+              TOBN(0xfd7e9c5d, 0x005921b8), TOBN(0xf56297f1, 0x44e79bf9),
+              TOBN(0xa163b460, 0x0d75ddc2), TOBN(0x30b23616, 0xa1f2be87),
+              TOBN(0x4b070d21, 0xbfe50e2b), TOBN(0x7ef8cfd0, 0xe1bfede1),
+              TOBN(0xadba0011, 0x2aac4ae0), TOBN(0x2a3e7d01, 0xb9ebd033),
+              TOBN(0x995277ec, 0xe38d9d1c), TOBN(0xb500249e, 0x9c5d2de3),
+              TOBN(0x8912b820, 0xf13ca8c9), TOBN(0xc8798114, 0x877793af),
+              TOBN(0x19e6125d, 0xec3f1dec), TOBN(0x07b1f040, 0x911178da),
+              TOBN(0xd93ededa, 0x904a6738), TOBN(0x55187a5a, 0x0bebedcd),
+              TOBN(0xf7d04722, 0xeb329d41), TOBN(0xf449099e, 0xf170b391),
+              TOBN(0xfd317a69, 0xca99f828), TOBN(0x50c3db2b, 0x34a4976d),
+              TOBN(0xe9ba7784, 0x3757b392), TOBN(0x326caefd, 0xaa3ca05a),
+              TOBN(0x78e5293b, 0xf1e593d4), TOBN(0x7842a937, 0x0d98fd13),
+              TOBN(0xe694bf96, 0x5f96b10d), TOBN(0x373a9df6, 0x06a8cd05),
+              TOBN(0x997d1e51, 0xe8f0c7fc), TOBN(0x1d019790, 0x63fd972e),
+              TOBN(0x0064d858, 0x5499fb32), TOBN(0x7b67bad9, 0x77a8aeb7),
+              TOBN(0x1d3eb977, 0x2d08eec5), TOBN(0x5fc047a6, 0xcbabae1d),
+              TOBN(0x0577d159, 0xe54a64bb), TOBN(0x8862201b, 0xc43497e4),
+              TOBN(0xad6b4e28, 0x2ce0608d), TOBN(0x8b687b7d, 0x0b167aac),
+              TOBN(0x6ed4d367, 0x8b2ecfa9), TOBN(0x24dfe62d, 0xa90c3c38),
+              TOBN(0xa1862e10, 0x3fe5c42b), TOBN(0x1ca73dca, 0xd5732a9f),
+              TOBN(0x35f038b7, 0x76bb87ad), TOBN(0x674976ab, 0xf242b81f),
+              TOBN(0x4f2bde7e, 0xb0fd90cd), TOBN(0x6efc172e, 0xa7fdf092),
+              TOBN(0x3806b69b, 0x92222f1f), TOBN(0x5a2459ca, 0x6cf7ae70),
+              TOBN(0x6789f69c, 0xa85217ee), TOBN(0x5f232b5e, 0xe3dc85ac),
+              TOBN(0x660e3ec5, 0x48e9e516), TOBN(0x124b4e47, 0x3197eb31),
+              TOBN(0x10a0cb13, 0xaafcca23), TOBN(0x7bd63ba4, 0x8213224f),
+              TOBN(0xaffad7cc, 0x290a7f4f), TOBN(0x6b409c9e, 0x0286b461),
+              TOBN(0x58ab809f, 0xffa407af), TOBN(0xc3122eed, 0xc68ac073),
+              TOBN(0x17bf9e50, 0x4ef24d7e), TOBN(0x5d929794, 0x3e2a5811),
+              TOBN(0x519bc867, 0x02902e01), TOBN(0x76bba5da, 0x39c8a851),
+              TOBN(0xe9f9669c, 0xda94951e), TOBN(0x4b6af58d, 0x66b8d418),
+              TOBN(0xfa321074, 0x17d426a4), TOBN(0xc78e66a9, 0x9dde6027),
+              TOBN(0x0516c083, 0x4a53b964), TOBN(0xfc659d38, 0xff602330),
+              TOBN(0x0ab55e5c, 0x58c5c897), TOBN(0x985099b2, 0x838bc5df),
+              TOBN(0x061d9efc, 0xc52fc238), TOBN(0x712b2728, 0x6ac1da3f),
+              TOBN(0xfb658149, 0x9283fe08), TOBN(0x4954ac94, 0xb8aaa2f7),
+              TOBN(0x85c0ada4, 0x7fb2e74f), TOBN(0xee8ba98e, 0xb89926b0),
+              TOBN(0xe4f9d37d, 0x23d1af5b), TOBN(0x14ccdbf9, 0xba9b015e),
+              TOBN(0xb674481b, 0x7bfe7178), TOBN(0x4e1debae, 0x65405868),
+              TOBN(0x061b2821, 0xc48c867d), TOBN(0x69c15b35, 0x513b30ea),
+              TOBN(0x3b4a1666, 0x36871088), TOBN(0xe5e29f5d, 0x1220b1ff),
+              TOBN(0x4b82bb35, 0x233d9f4d), TOBN(0x4e076333, 0x18cdc675) },
+          { TOBN(0x0d53f5c7, 0xa3e6fced), TOBN(0xe8cbbdd5, 0xf45fbdeb),
+              TOBN(0xf85c01df, 0x13339a70), TOBN(0x0ff71880, 0x142ceb81),
+              TOBN(0x4c4e8774, 0xbd70437a), TOBN(0x5fb32891, 0xba0bda6a),
+              TOBN(0x1cdbebd2, 0xf18bd26e), TOBN(0x2f9526f1, 0x03a9d522),
+              TOBN(0x40ce3051, 0x92c4d684), TOBN(0x8b04d725, 0x7612efcd),
+              TOBN(0xb9dcda36, 0x6f9cae20), TOBN(0x0edc4d24, 0xf058856c),
+              TOBN(0x64f2e6bf, 0x85427900), TOBN(0x3de81295, 0xdc09dfea),
+              TOBN(0xd41b4487, 0x379bf26c), TOBN(0x50b62c6d, 0x6df135a9),
+              TOBN(0xd4f8e3b4, 0xc72dfe67), TOBN(0xc416b0f6, 0x90e19fdf),
+              TOBN(0x18b9098d, 0x4c13bd35), TOBN(0xac11118a, 0x15b8cb9e),
+              TOBN(0xf598a318, 0xf0062841), TOBN(0xbfe0602f, 0x89f356f4),
+              TOBN(0x7ae3637e, 0x30177a0c), TOBN(0x34097747, 0x61136537),
+              TOBN(0x0db2fb5e, 0xd005832a), TOBN(0x5f5efd3b, 0x91042e4f),
+              TOBN(0x8c4ffdc6, 0xed70f8ca), TOBN(0xe4645d0b, 0xb52da9cc),
+              TOBN(0x9596f58b, 0xc9001d1f), TOBN(0x52c8f0bc, 0x4e117205),
+              TOBN(0xfd4aa0d2, 0xe398a084), TOBN(0x815bfe3a, 0x104f49de),
+              TOBN(0x97e5443f, 0x23885e5f), TOBN(0xf72f8f99, 0xe8433aab),
+              TOBN(0xbd00b154, 0xe4d4e604), TOBN(0xd0b35e6a, 0xe5e173ff),
+              TOBN(0x57b2a048, 0x9164722d), TOBN(0x3e3c665b, 0x88761ec8),
+              TOBN(0x6bdd1397, 0x3da83832), TOBN(0x3c8b1a1e, 0x73dafe3b),
+              TOBN(0x4497ace6, 0x54317cac), TOBN(0xbe600ab9, 0x521771b3),
+              TOBN(0xb42e409e, 0xb0dfe8b8), TOBN(0x386a67d7, 0x3942310f),
+              TOBN(0x25548d8d, 0x4431cc28), TOBN(0xa7cff142, 0x985dc524),
+              TOBN(0x4d60f5a1, 0x93c4be32), TOBN(0x83ebd5c8, 0xd071c6e1),
+              TOBN(0xba3a80a7, 0xb1fd2b0b), TOBN(0x9b3ad396, 0x5bec33e8),
+              TOBN(0xb3868d61, 0x79743fb3), TOBN(0xcfd169fc, 0xfdb462fa),
+              TOBN(0xd3b499d7, 0x9ce0a6af), TOBN(0x55dc1cf1, 0xe42d3ff8),
+              TOBN(0x04fb9e6c, 0xc6c3e1b2), TOBN(0x47e6961d, 0x6f69a474),
+              TOBN(0x54eb3acc, 0xe548b37b), TOBN(0xb38e7542, 0x84d40549),
+              TOBN(0x8c3daa51, 0x7b341b4f), TOBN(0x2f6928ec, 0x690bf7fa),
+              TOBN(0x0496b323, 0x86ce6c41), TOBN(0x01be1c55, 0x10adadcd),
+              TOBN(0xc04e67e7, 0x4bb5faf9), TOBN(0x3cbaf678, 0xe15c9985),
+              TOBN(0x8cd12145, 0x50ca4247), TOBN(0xba1aa47a, 0xe7dd30aa),
+              TOBN(0x2f81ddf1, 0xe58fee24), TOBN(0x03452936, 0xeec9b0e8),
+              TOBN(0x8bdc3b81, 0x243aea96), TOBN(0x9a2919af, 0x15c3d0e5),
+              TOBN(0x9ea640ec, 0x10948361), TOBN(0x5ac86d5b, 0x6e0bcccf),
+              TOBN(0xf892d918, 0xc36cf440), TOBN(0xaed3e837, 0xc939719c),
+              TOBN(0xb07b08d2, 0xc0218b64), TOBN(0x6f1bcbba, 0xce9790dd),
+              TOBN(0x4a84d6ed, 0x60919b8e), TOBN(0xd8900791, 0x8ac1f9eb),
+              TOBN(0xf84941aa, 0x0dd5daef), TOBN(0xb22fe40a, 0x67fd62c5),
+              TOBN(0x97e15ba2, 0x157f2db3), TOBN(0xbda2fc8f, 0x8e28ca9c),
+              TOBN(0x5d050da4, 0x37b9f454), TOBN(0x3d57eb57, 0x2379d72e),
+              TOBN(0xe9b5eba2, 0xfb5ee997), TOBN(0x01648ca2, 0xe11538ca),
+              TOBN(0x32bb76f6, 0xf6327974), TOBN(0x338f14b8, 0xff3f4bb7),
+              TOBN(0x524d226a, 0xd7ab9a2d), TOBN(0x9c00090d, 0x7dfae958),
+              TOBN(0x0ba5f539, 0x8751d8c2), TOBN(0x8afcbcdd, 0x3ab8262d),
+              TOBN(0x57392729, 0xe99d043b), TOBN(0xef51263b, 0xaebc943a),
+              TOBN(0x9feace93, 0x20862935), TOBN(0x639efc03, 0xb06c817b),
+              TOBN(0x1fe054b3, 0x66b4be7a), TOBN(0x3f25a9de, 0x84a37a1e),
+              TOBN(0xf39ef1ad, 0x78d75cd9), TOBN(0xd7b58f49, 0x5062c1b5),
+              TOBN(0x6f74f9a9, 0xff563436), TOBN(0xf718ff29, 0xe8af51e7),
+              TOBN(0x5234d313, 0x15e97fec), TOBN(0xb6a8e2b1, 0x292f1c0a),
+              TOBN(0xa7f53aa8, 0x327720c1), TOBN(0x956ca322, 0xba092cc8),
+              TOBN(0x8f03d64a, 0x28746c4d), TOBN(0x51fe1782, 0x66d0d392),
+              TOBN(0xd19b34db, 0x3c832c80), TOBN(0x60dccc5c, 0x6da2e3b4),
+              TOBN(0x245dd62e, 0x0a104ccc), TOBN(0xa7ab1de1, 0x620b21fd),
+              TOBN(0xb293ae0b, 0x3893d123), TOBN(0xf7b75783, 0xb15ee71c),
+              TOBN(0x5aa3c614, 0x42a9468b), TOBN(0xd686123c, 0xdb15d744),
+              TOBN(0x8c616891, 0xa7ab4116), TOBN(0x6fcd72c8, 0xa4e6a459),
+              TOBN(0xac219110, 0x77e5fad7), TOBN(0xfb6a20e7, 0x704fa46b),
+              TOBN(0xe839be7d, 0x341d81dc), TOBN(0xcddb6889, 0x32148379),
+              TOBN(0xda6211a1, 0xf7026ead), TOBN(0xf3b2575f, 0xf4d1cc5e),
+              TOBN(0x40cfc8f6, 0xa7a73ae6), TOBN(0x83879a5e, 0x61d5b483),
+              TOBN(0xc5acb1ed, 0x41a50ebc), TOBN(0x59a60cc8, 0x3c07d8fa),
+              TOBN(0x1b73bdce, 0xb1876262), TOBN(0x2b0d79f0, 0x12af4ee9),
+              TOBN(0x8bcf3b0b, 0xd46e1d07), TOBN(0x17d6af9d, 0xe45d152f),
+              TOBN(0x73520461, 0x6d736451), TOBN(0x43cbbd97, 0x56b0bf5a),
+              TOBN(0xb0833a5b, 0xd5999b9d), TOBN(0x702614f0, 0xeb72e398),
+              TOBN(0x0aadf01a, 0x59c3e9f8), TOBN(0x40200e77, 0xce6b3d16),
+              TOBN(0xda22bdd3, 0xdeddafad), TOBN(0x76dedaf4, 0x310d72e1),
+              TOBN(0x49ef807c, 0x4bc2e88f), TOBN(0x6ba81291, 0x146dd5a5),
+              TOBN(0xa1a4077a, 0x7d8d59e9), TOBN(0x87b6a2e7, 0x802db349),
+              TOBN(0xd5679997, 0x1b4e598e), TOBN(0xf499ef1f, 0x06fe4b1d),
+              TOBN(0x3978d3ae, 0xfcb267c5), TOBN(0xb582b557, 0x235786d0),
+              TOBN(0x32b3b2ca, 0x1715cb07), TOBN(0x4c3de6a2, 0x8480241d),
+              TOBN(0x63b5ffed, 0xcb571ecd), TOBN(0xeaf53900, 0xed2fe9a9),
+              TOBN(0xdec98d4a, 0xc3b81990), TOBN(0x1cb83722, 0x9e0cc8fe),
+              TOBN(0xfe0b0491, 0xd2b427b9), TOBN(0x0f2386ac, 0xe983a66c),
+              TOBN(0x930c4d1e, 0xb3291213), TOBN(0xa2f82b2e, 0x59a62ae4),
+              TOBN(0x77233853, 0xf93e89e3), TOBN(0x7f8063ac, 0x11777c7f),
+              TOBN(0xff0eb567, 0x59ad2877), TOBN(0x6f454642, 0x9865c754),
+              TOBN(0xe6fe701a, 0x236e9a84), TOBN(0xc586ef16, 0x06e40fc3),
+              TOBN(0x3f62b6e0, 0x24bafad9), TOBN(0xc8b42bd2, 0x64da906a),
+              TOBN(0xc98e1eb4, 0xda3276a0), TOBN(0x30d0e5fc, 0x06cbf852),
+              TOBN(0x1b6b2ae1, 0xe8b4dfd4), TOBN(0xd754d5c7, 0x8301cbac),
+              TOBN(0x66097629, 0x112a39ac), TOBN(0xf86b5999, 0x93ba4ab9),
+              TOBN(0x26c9dea7, 0x99f9d581), TOBN(0x0473b1a8, 0xc2fafeaa),
+              TOBN(0x1469af55, 0x3b2505a5), TOBN(0x227d16d7, 0xd6a43323),
+              TOBN(0x3316f73c, 0xad3d97f9), TOBN(0x52bf3bb5, 0x1f137455),
+              TOBN(0x953eafeb, 0x09954e7c), TOBN(0xa721dfed, 0xdd732411),
+              TOBN(0xb4929821, 0x141d4579), TOBN(0x3411321c, 0xaa3bd435),
+              TOBN(0xafb355aa, 0x17fa6015), TOBN(0xb4e7ef4a, 0x18e42f0e),
+              TOBN(0x604ac97c, 0x59371000), TOBN(0xe1c48c70, 0x7f759c18),
+              TOBN(0x3f62ecc5, 0xa5db6b65), TOBN(0x0a78b173, 0x38a21495),
+              TOBN(0x6be1819d, 0xbcc8ad94), TOBN(0x70dc04f6, 0xd89c3400),
+              TOBN(0x462557b4, 0xa6b4840a), TOBN(0x544c6ade, 0x60bd21c0),
+              TOBN(0x6a00f24e, 0x907a544b), TOBN(0xa7520dcb, 0x313da210),
+              TOBN(0xfe939b75, 0x11e4994b), TOBN(0x918b6ba6, 0xbc275d70),
+              TOBN(0xd3e5e0fc, 0x644be892), TOBN(0x707a9816, 0xfdaf6c42),
+              TOBN(0x60145567, 0xf15c13fe), TOBN(0x4818ebaa, 0xe130a54a),
+              TOBN(0x28aad3ad, 0x58d2f767), TOBN(0xdc5267fd, 0xd7e7c773),
+              TOBN(0x4919cc88, 0xc3afcc98), TOBN(0xaa2e6ab0, 0x2db8cd4b),
+              TOBN(0xd46fec04, 0xd0c63eaa), TOBN(0xa1cb92c5, 0x19ffa832),
+              TOBN(0x678dd178, 0xe43a631f), TOBN(0xfb5ae1cd, 0x3dc788b3),
+              TOBN(0x68b4fb90, 0x6e77de04), TOBN(0x7992bcf0, 0xf06dbb97),
+              TOBN(0x896e6a13, 0xc417c01d), TOBN(0x8d96332c, 0xb956be01),
+              TOBN(0x902fc93a, 0x413aa2b9), TOBN(0x99a4d915, 0xfc98c8a5),
+              TOBN(0x52c29407, 0x565f1137), TOBN(0x4072690f, 0x21e4f281),
+              TOBN(0x36e607cf, 0x02ff6072), TOBN(0xa47d2ca9, 0x8ad98cdc),
+              TOBN(0xbf471d1e, 0xf5f56609), TOBN(0xbcf86623, 0xf264ada0),
+              TOBN(0xb70c0687, 0xaa9e5cb6), TOBN(0xc98124f2, 0x17401c6c),
+              TOBN(0x8189635f, 0xd4a61435), TOBN(0xd28fb8af, 0xa9d98ea6),
+              TOBN(0xb9a67c2a, 0x40c251f8), TOBN(0x88cd5d87, 0xa2da44be),
+              TOBN(0x437deb96, 0xe09b5423), TOBN(0x150467db, 0x64287dc1),
+              TOBN(0xe161debb, 0xcdabb839), TOBN(0xa79e9742, 0xf1839a3e),
+              TOBN(0xbb8dd3c2, 0x652d202b), TOBN(0x7b3e67f7, 0xe9f97d96),
+              TOBN(0x5aa5d78f, 0xb1cb6ac9), TOBN(0xffa13e8e, 0xca1d0d45),
+              TOBN(0x369295dd, 0x2ba5bf95), TOBN(0xd68bd1f8, 0x39aff05e),
+              TOBN(0xaf0d86f9, 0x26d783f2), TOBN(0x543a59b3, 0xfc3aafc1),
+              TOBN(0x3fcf81d2, 0x7b7da97c), TOBN(0xc990a056, 0xd25dee46),
+              TOBN(0x3e6775b8, 0x519cce2c), TOBN(0xfc9af71f, 0xae13d863),
+              TOBN(0x774a4a6f, 0x47c1605c), TOBN(0x46ba4245, 0x2fd205e8),
+              TOBN(0xa06feea4, 0xd3fd524d), TOBN(0x1e724641, 0x6de1acc2),
+              TOBN(0xf53816f1, 0x334e2b42), TOBN(0x49e5918e, 0x922f0024),
+              TOBN(0x439530b6, 0x65c7322d), TOBN(0xcf12cc01, 0xb3c1b3fb),
+              TOBN(0xc70b0186, 0x0172f685), TOBN(0xb915ee22, 0x1b58391d),
+              TOBN(0x9afdf03b, 0xa317db24), TOBN(0x87dec659, 0x17b8ffc4),
+              TOBN(0x7f46597b, 0xe4d3d050), TOBN(0x80a1c1ed, 0x006500e7),
+              TOBN(0x84902a96, 0x78bf030e), TOBN(0xfb5e9c9a, 0x50560148),
+              TOBN(0x6dae0a92, 0x63362426), TOBN(0xdcaeecf4, 0xa9e30c40),
+              TOBN(0xc0d887bb, 0x518d0c6b), TOBN(0x99181152, 0xcb985b9d),
+              TOBN(0xad186898, 0xef7bc381), TOBN(0x18168ffb, 0x9ee46201),
+              TOBN(0x9a04cdaa, 0x2502753c), TOBN(0xbb279e26, 0x51407c41),
+              TOBN(0xeacb03aa, 0xf23564e5), TOBN(0x18336582, 0x71e61016),
+              TOBN(0x8684b8c4, 0xeb809877), TOBN(0xb336e18d, 0xea0e672e),
+              TOBN(0xefb601f0, 0x34ee5867), TOBN(0x2733edbe, 0x1341cfd1),
+              TOBN(0xb15e809a, 0x26025c3c), TOBN(0xe6e981a6, 0x9350df88),
+              TOBN(0x92376237, 0x8502fd8e), TOBN(0x4791f216, 0x0c12be9b),
+              TOBN(0xb7256789, 0x25f02425), TOBN(0xec863194, 0x7a974443),
+              TOBN(0x7c0ce882, 0xfb41cc52), TOBN(0xc266ff7e, 0xf25c07f2),
+              TOBN(0x3d4da8c3, 0x017025f3), TOBN(0xefcf628c, 0xfb9579b4),
+              TOBN(0x5c4d0016, 0x1f3716ec), TOBN(0x9c27ebc4, 0x6801116e),
+              TOBN(0x5eba0ea1, 0x1da1767e), TOBN(0xfe151452, 0x47004c57),
+              TOBN(0x3ace6df6, 0x8c2373b7), TOBN(0x75c3dffe, 0x5dbc37ac),
+              TOBN(0x3dc32a73, 0xddc925fc), TOBN(0xb679c841, 0x2f65ee0b),
+              TOBN(0x715a3295, 0x451cbfeb), TOBN(0xd9889768, 0xf76e9a29),
+              TOBN(0xec20ce7f, 0xb28ad247), TOBN(0xe99146c4, 0x00894d79),
+              TOBN(0x71457d7c, 0x9f5e3ea7), TOBN(0x097b2662, 0x38030031),
+              TOBN(0xdb7f6ae6, 0xcf9f82a8), TOBN(0x319decb9, 0x438f473a),
+              TOBN(0xa63ab386, 0x283856c3), TOBN(0x13e3172f, 0xb06a361b),
+              TOBN(0x2959f8dc, 0x7d5a006c), TOBN(0x2dbc27c6, 0x75fba752),
+              TOBN(0xc1227ab2, 0x87c22c9e), TOBN(0x06f61f75, 0x71a268b2),
+              TOBN(0x1b6bb971, 0x04779ce2), TOBN(0xaca83812, 0x0aadcb1d),
+              TOBN(0x297ae0bc, 0xaeaab2d5), TOBN(0xa5c14ee7, 0x5bfb9f13),
+              TOBN(0xaa00c583, 0xf17a62c7), TOBN(0x39eb962c, 0x173759f6),
+              TOBN(0x1eeba1d4, 0x86c9a88f), TOBN(0x0ab6c37a, 0xdf016c5e),
+              TOBN(0xa2a147db, 0xa28a0749), TOBN(0x246c20d6, 0xee519165),
+              TOBN(0x5068d1b1, 0xd3810715), TOBN(0xb1e7018c, 0x748160b9),
+              TOBN(0x03f5b1fa, 0xf380ff62), TOBN(0xef7fb1dd, 0xf3cb2c1e),
+              TOBN(0xeab539a8, 0xfc91a7da), TOBN(0x83ddb707, 0xf3f9b561),
+              TOBN(0xc550e211, 0xfe7df7a4), TOBN(0xa7cd07f2, 0x063f6f40),
+              TOBN(0xb0de3635, 0x2976879c), TOBN(0xb5f83f85, 0xe55741da),
+              TOBN(0x4ea9d25e, 0xf3d8ac3d), TOBN(0x6fe2066f, 0x62819f02),
+              TOBN(0x4ab2b9c2, 0xcef4a564), TOBN(0x1e155d96, 0x5ffa2de3),
+              TOBN(0x0eb0a19b, 0xc3a72d00), TOBN(0x4037665b, 0x8513c31b),
+              TOBN(0x2fb2b6bf, 0x04c64637), TOBN(0x45c34d6e, 0x08cdc639),
+              TOBN(0x56f1e10f, 0xf01fd796), TOBN(0x4dfb8101, 0xfe3667b8),
+              TOBN(0xe0eda253, 0x9021d0c0), TOBN(0x7a94e9ff, 0x8a06c6ab),
+              TOBN(0x2d3bb0d9, 0xbb9aa882), TOBN(0xea20e4e5, 0xec05fd10),
+              TOBN(0xed7eeb5f, 0x1a1ca64e), TOBN(0x2fa6b43c, 0xc6327cbd),
+              TOBN(0xb577e3cf, 0x3aa91121), TOBN(0x8c6bd5ea, 0x3a34079b),
+              TOBN(0xd7e5ba39, 0x60e02fc0), TOBN(0xf16dd2c3, 0x90141bf8),
+              TOBN(0xb57276d9, 0x80101b98), TOBN(0x760883fd, 0xb82f0f66),
+              TOBN(0x89d7de75, 0x4bc3eff3), TOBN(0x03b60643, 0x5dc2ab40),
+              TOBN(0xcd6e53df, 0xe05beeac), TOBN(0xf2f1e862, 0xbc3325cd),
+              TOBN(0xdd0f7921, 0x774f03c3), TOBN(0x97ca7221, 0x4552cc1b),
+              TOBN(0x5a0d6afe, 0x1cd19f72), TOBN(0xa20915dc, 0xf183fbeb),
+              TOBN(0x9fda4b40, 0x832c403c), TOBN(0x32738edd, 0xbe425442),
+              TOBN(0x469a1df6, 0xb5eccf1a), TOBN(0x4b5aff42, 0x28bbe1f0),
+              TOBN(0x31359d7f, 0x570dfc93), TOBN(0xa18be235, 0xf0088628),
+              TOBN(0xa5b30fba, 0xb00ed3a9), TOBN(0x34c61374, 0x73cdf8be),
+              TOBN(0x2c5c5f46, 0xabc56797), TOBN(0x5cecf93d, 0xb82a8ae2),
+              TOBN(0x7d3dbe41, 0xa968fbf0), TOBN(0xd23d4583, 0x1a5c7f3d),
+              TOBN(0xf28f69a0, 0xc087a9c7), TOBN(0xc2d75471, 0x474471ca),
+              TOBN(0x36ec9f4a, 0x4eb732ec), TOBN(0x6c943bbd, 0xb1ca6bed),
+              TOBN(0xd64535e1, 0xf2457892), TOBN(0x8b84a8ea, 0xf7e2ac06),
+              TOBN(0xe0936cd3, 0x2499dd5f), TOBN(0x12053d7e, 0x0ed04e57),
+              TOBN(0x4bdd0076, 0xe4305d9d), TOBN(0x34a527b9, 0x1f67f0a2),
+              TOBN(0xe79a4af0, 0x9cec46ea), TOBN(0xb15347a1, 0x658b9bc7),
+              TOBN(0x6bd2796f, 0x35af2f75), TOBN(0xac957990, 0x4051c435),
+              TOBN(0x2669dda3, 0xc33a655d), TOBN(0x5d503c2e, 0x88514aa3),
+              TOBN(0xdfa11337, 0x3753dd41), TOBN(0x3f054673, 0x0b754f78),
+              TOBN(0xbf185677, 0x496125bd), TOBN(0xfb0023c8, 0x3775006c),
+              TOBN(0xfa0f072f, 0x3a037899), TOBN(0x4222b6eb, 0x0e4aea57),
+              TOBN(0x3dde5e76, 0x7866d25a), TOBN(0xb6eb04f8, 0x4837aa6f),
+              TOBN(0x5315591a, 0x2cf1cdb8), TOBN(0x6dfb4f41, 0x2d4e683c),
+              TOBN(0x7e923ea4, 0x48ee1f3a), TOBN(0x9604d9f7, 0x05a2afd5),
+              TOBN(0xbe1d4a33, 0x40ea4948), TOBN(0x5b45f1f4, 0xb44cbd2f),
+              TOBN(0x5faf8376, 0x4acc757e), TOBN(0xa7cf9ab8, 0x63d68ff7),
+              TOBN(0x8ad62f69, 0xdf0e404b), TOBN(0xd65f33c2, 0x12bdafdf),
+              TOBN(0xc365de15, 0xa377b14e), TOBN(0x6bf5463b, 0x8e39f60c),
+              TOBN(0x62030d2d, 0x2ce68148), TOBN(0xd95867ef, 0xe6f843a8),
+              TOBN(0xd39a0244, 0xef5ab017), TOBN(0x0bd2d8c1, 0x4ab55d12),
+              TOBN(0xc9503db3, 0x41639169), TOBN(0x2d4e25b0, 0xf7660c8a),
+              TOBN(0x760cb3b5, 0xe224c5d7), TOBN(0xfa3baf8c, 0x68616919),
+              TOBN(0x9fbca113, 0x8d142552), TOBN(0x1ab18bf1, 0x7669ebf5),
+              TOBN(0x55e6f53e, 0x9bdf25dd), TOBN(0x04cc0bf3, 0xcb6cd154),
+              TOBN(0x595bef49, 0x95e89080), TOBN(0xfe9459a8, 0x104a9ac1),
+              TOBN(0xad2d89ca, 0xcce9bb32), TOBN(0xddea65e1, 0xf7de8285),
+              TOBN(0x62ed8c35, 0xb351bd4b), TOBN(0x4150ff36, 0x0c0e19a7),
+              TOBN(0x86e3c801, 0x345f4e47), TOBN(0x3bf21f71, 0x203a266c),
+              TOBN(0x7ae110d4, 0x855b1f13), TOBN(0x5d6aaf6a, 0x07262517),
+              TOBN(0x1e0f12e1, 0x813d28f1), TOBN(0x6000e11d, 0x7ad7a523),
+              TOBN(0xc7d8deef, 0xc744a17b), TOBN(0x1e990b48, 0x14c05a00),
+              TOBN(0x68fddaee, 0x93e976d5), TOBN(0x696241d1, 0x46610d63),
+              TOBN(0xb204e7c3, 0x893dda88), TOBN(0x8bccfa65, 0x6a3a6946),
+              TOBN(0xb59425b4, 0xc5cd1411), TOBN(0x701b4042, 0xff3658b1),
+              TOBN(0xe3e56bca, 0x4784cf93), TOBN(0x27de5f15, 0x8fe68d60),
+              TOBN(0x4ab9cfce, 0xf8d53f19), TOBN(0xddb10311, 0xa40a730d),
+              TOBN(0x6fa73cd1, 0x4eee0a8a), TOBN(0xfd548748, 0x5249719d),
+              TOBN(0x49d66316, 0xa8123ef0), TOBN(0x73c32db4, 0xe7f95438),
+              TOBN(0x2e2ed209, 0x0d9e7854), TOBN(0xf98a9329, 0x9d9f0507),
+              TOBN(0xc5d33cf6, 0x0c6aa20a), TOBN(0x9a32ba14, 0x75279bb2),
+              TOBN(0x7e3202cb, 0x774a7307), TOBN(0x64ed4bc4, 0xe8c42dbd),
+              TOBN(0xc20f1a06, 0xd4caed0d), TOBN(0xb8021407, 0x171d22b3),
+              TOBN(0xd426ca04, 0xd13268d7), TOBN(0x92377007, 0x25f4d126),
+              TOBN(0x4204cbc3, 0x71f21a85), TOBN(0x18461b7a, 0xf82369ba),
+              TOBN(0xc0c07d31, 0x3fc858f9), TOBN(0x5deb5a50, 0xe2bab569),
+              TOBN(0xd5959d46, 0xd5eea89e), TOBN(0xfdff8424, 0x08437f4b),
+              TOBN(0xf21071e4, 0x3cfe254f), TOBN(0x72417696, 0x95468321),
+              TOBN(0x5d8288b9, 0x102cae3e), TOBN(0x2d143e3d, 0xf1965dff),
+              TOBN(0x00c9a376, 0xa078d847), TOBN(0x6fc0da31, 0x26028731),
+              TOBN(0xa2baeadf, 0xe45083a2), TOBN(0x66bc7218, 0x5e5b4bcd),
+              TOBN(0x2c826442, 0xd04b8e7f), TOBN(0xc19f5451, 0x6c4b586b),
+              TOBN(0x60182c49, 0x5b7eeed5), TOBN(0xd9954ecd, 0x7aa9dfa1),
+              TOBN(0xa403a8ec, 0xc73884ad), TOBN(0x7fb17de2, 0x9bb39041),
+              TOBN(0x694b64c5, 0xabb020e8), TOBN(0x3d18c184, 0x19c4eec7),
+              TOBN(0x9c4673ef, 0x1c4793e5), TOBN(0xc7b8aeb5, 0x056092e6),
+              TOBN(0x3aa1ca43, 0xf0f8c16b), TOBN(0x224ed5ec, 0xd679b2f6),
+              TOBN(0x0d56eeaf, 0x55a205c9), TOBN(0xbfe115ba, 0x4b8e028b),
+              TOBN(0x97e60849, 0x3927f4fe), TOBN(0xf91fbf94, 0x759aa7c5),
+              TOBN(0x985af769, 0x6be90a51), TOBN(0xc1277b78, 0x78ccb823),
+              TOBN(0x395b656e, 0xe7a75952), TOBN(0x00df7de0, 0x928da5f5),
+              TOBN(0x09c23175, 0x4ca4454f), TOBN(0x4ec971f4, 0x7aa2d3c1),
+              TOBN(0x45c3c507, 0xe75d9ccc), TOBN(0x63b7be8a, 0x3dc90306),
+              TOBN(0x37e09c66, 0x5db44bdc), TOBN(0x50d60da1, 0x6841c6a2),
+              TOBN(0x6f9b65ee, 0x08df1b12), TOBN(0x38734879, 0x7ff089df),
+              TOBN(0x9c331a66, 0x3fe8013d), TOBN(0x017f5de9, 0x5f42fcc8),
+              TOBN(0x43077866, 0xe8e57567), TOBN(0xc9f781ce, 0xf9fcdb18),
+              TOBN(0x38131dda, 0x9b12e174), TOBN(0x25d84aa3, 0x8a03752a),
+              TOBN(0x45e09e09, 0x4d0c0ce2), TOBN(0x1564008b, 0x92bebba5),
+              TOBN(0xf7e8ad31, 0xa87284c7), TOBN(0xb7c4b46c, 0x97e7bbaa),
+              TOBN(0x3e22a7b3, 0x97acf4ec), TOBN(0x0426c400, 0x5ea8b640),
+              TOBN(0x5e3295a6, 0x4e969285), TOBN(0x22aabc59, 0xa6a45670),
+              TOBN(0xb929714c, 0x5f5942bc), TOBN(0x9a6168bd, 0xfa3182ed),
+              TOBN(0x2216a665, 0x104152ba), TOBN(0x46908d03, 0xb6926368) },
+          {
+              TOBN(0xa9f5d874, 0x5a1251fb),
+              TOBN(0x967747a8, 0xc72725c7),
+              TOBN(0x195c33e5, 0x31ffe89e),
+              TOBN(0x609d210f, 0xe964935e),
+              TOBN(0xcafd6ca8, 0x2fe12227),
+              TOBN(0xaf9b5b96, 0x0426469d),
+              TOBN(0x2e9ee04c, 0x5693183c),
+              TOBN(0x1084a333, 0xc8146fef),
+              TOBN(0x96649933, 0xaed1d1f7),
+              TOBN(0x566eaff3, 0x50563090),
+              TOBN(0x345057f0, 0xad2e39cf),
+              TOBN(0x148ff65b, 0x1f832124),
+              TOBN(0x042e89d4, 0xcf94cf0d),
+              TOBN(0x319bec84, 0x520c58b3),
+              TOBN(0x2a267626, 0x5361aa0d),
+              TOBN(0xc86fa302, 0x8fbc87ad),
+              TOBN(0xfc83d2ab, 0x5c8b06d5),
+              TOBN(0xb1a785a2, 0xfe4eac46),
+              TOBN(0xb99315bc, 0x846f7779),
+              TOBN(0xcf31d816, 0xef9ea505),
+              TOBN(0x2391fe6a, 0x15d7dc85),
+              TOBN(0x2f132b04, 0xb4016b33),
+              TOBN(0x29547fe3, 0x181cb4c7),
+              TOBN(0xdb66d8a6, 0x650155a1),
+              TOBN(0x6b66d7e1, 0xadc1696f),
+              TOBN(0x98ebe593, 0x0acd72d0),
+              TOBN(0x65f24550, 0xcc1b7435),
+              TOBN(0xce231393, 0xb4b9a5ec),
+              TOBN(0x234a22d4, 0xdb067df9),
+              TOBN(0x98dda095, 0xcaff9b00),
+              TOBN(0x1bbc75a0, 0x6100c9c1),
+              TOBN(0x1560a9c8, 0x939cf695),
+              TOBN(0xcf006d3e, 0x99e0925f),
+              TOBN(0x2dd74a96, 0x6322375a),
+              TOBN(0xc58b446a, 0xb56af5ba),
+              TOBN(0x50292683, 0xe0b9b4f1),
+              TOBN(0xe2c34cb4, 0x1aeaffa3),
+              TOBN(0x8b17203f, 0x9b9587c1),
+              TOBN(0x6d559207, 0xead1350c),
+              TOBN(0x2b66a215, 0xfb7f9604),
+              TOBN(0x0850325e, 0xfe51bf74),
+              TOBN(0x9c4f579e, 0x5e460094),
+              TOBN(0x5c87b92a, 0x76da2f25),
+              TOBN(0x889de4e0, 0x6febef33),
+              TOBN(0x6900ec06, 0x646083ce),
+              TOBN(0xbe2a0335, 0xbfe12773),
+              TOBN(0xadd1da35, 0xc5344110),
+              TOBN(0x757568b7, 0xb802cd20),
+              TOBN(0x75559779, 0x00f7e6c8),
+              TOBN(0x38e8b94f, 0x0facd2f0),
+              TOBN(0xfea1f3af, 0x03fde375),
+              TOBN(0x5e11a1d8, 0x75881dfc),
+              TOBN(0xb3a6b02e, 0xc1e2f2ef),
+              TOBN(0x193d2bbb, 0xc605a6c5),
+              TOBN(0x325ffeee, 0x339a0b2d),
+              TOBN(0x27b6a724, 0x9e0c8846),
+              TOBN(0xe4050f1c, 0xf1c367ca),
+              TOBN(0x9bc85a9b, 0xc90fbc7d),
+              TOBN(0xa373c4a2, 0xe1a11032),
+              TOBN(0xb64232b7, 0xad0393a9),
+              TOBN(0xf5577eb0, 0x167dad29),
+              TOBN(0x1604f301, 0x94b78ab2),
+              TOBN(0x0baa94af, 0xe829348b),
+              TOBN(0x77fbd8dd, 0x41654342),
+              TOBN(0xdab50ea5, 0xb964e39a),
+              TOBN(0xd4c29e3c, 0xd0d3c76e),
+              TOBN(0x80dae67c, 0x56d11964),
+              TOBN(0x7307a8bf, 0xe5ffcc2f),
+              TOBN(0x65bbc1aa, 0x91708c3b),
+              TOBN(0xa151e62c, 0x28bf0eeb),
+              TOBN(0x6cb53381, 0x6fa34db7),
+              TOBN(0x5139e05c, 0xa29403a8),
+              TOBN(0x6ff651b4, 0x94a7cd2e),
+              TOBN(0x5671ffd1, 0x0699336c),
+              TOBN(0x6f5fd2cc, 0x979a896a),
+              TOBN(0x11e893a8, 0xd8148cef),
+              TOBN(0x988906a1, 0x65cf7b10),
+              TOBN(0x81b67178, 0xc50d8485),
+              TOBN(0x7c0deb35, 0x8a35b3de),
+              TOBN(0x423ac855, 0xc1d29799),
+              TOBN(0xaf580d87, 0xdac50b74),
+              TOBN(0x28b2b89f, 0x5869734c),
+              TOBN(0x99a3b936, 0x874e28fb),
+              TOBN(0xbb2c9190, 0x25f3f73a),
+              TOBN(0x199f6918, 0x84a9d5b7),
+              TOBN(0x7ebe2325, 0x7e770374),
+              TOBN(0xf442e107, 0x0738efe2),
+              TOBN(0xcf9f3f56, 0xcf9082d2),
+              TOBN(0x719f69e1, 0x09618708),
+              TOBN(0xcc9e8364, 0xc183f9b1),
+              TOBN(0xec203a95, 0x366a21af),
+              TOBN(0x6aec5d6d, 0x068b141f),
+              TOBN(0xee2df78a, 0x994f04e9),
+              TOBN(0xb39ccae8, 0x271245b0),
+              TOBN(0xb875a4a9, 0x97e43f4f),
+              TOBN(0x507dfe11, 0xdb2cea98),
+              TOBN(0x4fbf81cb, 0x489b03e9),
+              TOBN(0xdb86ec5b, 0x6ec414fa),
+              TOBN(0xfad444f9, 0xf51b3ae5),
+              TOBN(0xca7d33d6, 0x1914e3fe),
+              TOBN(0xa9c32f5c, 0x0ae6c4d0),
+              TOBN(0xa9ca1d1e, 0x73969568),
+              TOBN(0x98043c31, 0x1aa7467e),
+              TOBN(0xe832e75c, 0xe21b5ac6),
+              TOBN(0x314b7aea, 0x5232123d),
+              TOBN(0x08307c8c, 0x65ae86db),
+              TOBN(0x06e7165c, 0xaa4668ed),
+              TOBN(0xb170458b, 0xb4d3ec39),
+              TOBN(0x4d2e3ec6, 0xc19bb986),
+              TOBN(0xc5f34846, 0xae0304ed),
+              TOBN(0x917695a0, 0x6c9f9722),
+              TOBN(0x6c7f7317, 0x4cab1c0a),
+              TOBN(0x6295940e, 0x9d6d2e8b),
+              TOBN(0xd318b8c1, 0x549f7c97),
+              TOBN(0x22453204, 0x97713885),
+              TOBN(0x468d834b, 0xa8a440fe),
+              TOBN(0xd81fe5b2, 0xbfba796e),
+              TOBN(0x152364db, 0x6d71f116),
+              TOBN(0xbb8c7c59, 0xb5b66e53),
+              TOBN(0x0b12c61b, 0x2641a192),
+              TOBN(0x31f14802, 0xfcf0a7fd),
+              TOBN(0x42fd0789, 0x5488b01e),
+              TOBN(0x71d78d6d, 0x9952b498),
+              TOBN(0x8eb572d9, 0x07ac5201),
+              TOBN(0xe0a2a44c, 0x4d194a88),
+              TOBN(0xd2b63fd9, 0xba017e66),
+              TOBN(0x78efc6c8, 0xf888aefc),
+              TOBN(0xb76f6bda, 0x4a881a11),
+              TOBN(0x187f314b, 0xb46c2397),
+              TOBN(0x004cf566, 0x5ded2819),
+              TOBN(0xa9ea5704, 0x38764d34),
+              TOBN(0xbba45217, 0x78084709),
+              TOBN(0x06474571, 0x1171121e),
+              TOBN(0xad7b7eb1, 0xe7c9b671),
+              TOBN(0xdacfbc40, 0x730f7507),
+              TOBN(0x178cd8c6, 0xc7ad7bd1),
+              TOBN(0xbf0be101, 0xb2a67238),
+              TOBN(0x3556d367, 0xaf9c14f2),
+              TOBN(0x104b7831, 0xa5662075),
+              TOBN(0x58ca59bb, 0x79d9e60a),
+              TOBN(0x4bc45392, 0xa569a73b),
+              TOBN(0x517a52e8, 0x5698f6c9),
+              TOBN(0x85643da5, 0xaeadd755),
+              TOBN(0x1aed0cd5, 0x2a581b84),
+              TOBN(0xb9b4ff84, 0x80af1372),
+              TOBN(0x244c3113, 0xf1ba5d1f),
+              TOBN(0x2a5dacbe, 0xf5f98d31),
+              TOBN(0x2c3323e8, 0x4375bc2a),
+              TOBN(0x17a3ab4a, 0x5594b1dd),
+              TOBN(0xa1928bfb, 0xceb4797e),
+              TOBN(0xe83af245, 0xe4886a19),
+              TOBN(0x8979d546, 0x72b5a74a),
+              TOBN(0xa0f726bc, 0x19f9e967),
+              TOBN(0xd9d03152, 0xe8fbbf4e),
+              TOBN(0xcfd6f51d, 0xb7707d40),
+              TOBN(0x633084d9, 0x63f6e6e0),
+              TOBN(0xedcd9cdc, 0x55667eaf),
+              TOBN(0x73b7f92b, 0x2e44d56f),
+              TOBN(0xfb2e39b6, 0x4e962b14),
+              TOBN(0x7d408f6e, 0xf671fcbf),
+              TOBN(0xcc634ddc, 0x164a89bb),
+              TOBN(0x74a42bb2, 0x3ef3bd05),
+              TOBN(0x1280dbb2, 0x428decbb),
+              TOBN(0x6103f6bb, 0x402c8596),
+              TOBN(0xfa2bf581, 0x355a5752),
+              TOBN(0x562f96a8, 0x00946674),
+              TOBN(0x4e4ca16d, 0x6da0223b),
+              TOBN(0xfe47819f, 0x28d3aa25),
+              TOBN(0x9eea3075, 0xf8dfcf8a),
+              TOBN(0xa284f0aa, 0x95669825),
+              TOBN(0xb3fca250, 0x867d3fd8),
+              TOBN(0x20757b5f, 0x269d691e),
+              TOBN(0xf2c24020, 0x93b8a5de),
+              TOBN(0xd3f93359, 0xebc06da6),
+              TOBN(0x1178293e, 0xb2739c33),
+              TOBN(0xd2a3e770, 0xbcd686e5),
+              TOBN(0xa76f49f4, 0xcd941534),
+              TOBN(0x0d37406b, 0xe3c71c0e),
+              TOBN(0x172d9397, 0x3b97f7e3),
+              TOBN(0xec17e239, 0xbd7fd0de),
+              TOBN(0xe3290551, 0x6f496ba2),
+              TOBN(0x6a693172, 0x36ad50e7),
+              TOBN(0xc4e539a2, 0x83e7eff5),
+              TOBN(0x752737e7, 0x18e1b4cf),
+              TOBN(0xa2f7932c, 0x68af43ee),
+              TOBN(0x5502468e, 0x703d00bd),
+              TOBN(0xe5dc978f, 0x2fb061f5),
+              TOBN(0xc9a1904a, 0x28c815ad),
+              TOBN(0xd3af538d, 0x470c56a4),
+              TOBN(0x159abc5f, 0x193d8ced),
+              TOBN(0x2a37245f, 0x20108ef3),
+              TOBN(0xfa17081e, 0x223f7178),
+              TOBN(0x27b0fb2b, 0x10c8c0f5),
+              TOBN(0x2102c3ea, 0x40650547),
+              TOBN(0x594564df, 0x8ac3bfa7),
+              TOBN(0x98102033, 0x509dad96),
+              TOBN(0x6989643f, 0xf1d18a13),
+              TOBN(0x35eebd91, 0xd7fc5af0),
+              TOBN(0x078d096a, 0xfaeaafd8),
+              TOBN(0xb7a89341, 0xdef3de98),
+              TOBN(0x2a206e8d, 0xecf2a73a),
+              TOBN(0x066a6397, 0x8e551994),
+              TOBN(0x3a6a088a, 0xb98d53a2),
+              TOBN(0x0ce7c67c, 0x2d1124aa),
+              TOBN(0x48cec671, 0x759a113c),
+              TOBN(0xe3b373d3, 0x4f6f67fa),
+              TOBN(0x5455d479, 0xfd36727b),
+              TOBN(0xe5a428ee, 0xa13c0d81),
+              TOBN(0xb853dbc8, 0x1c86682b),
+              TOBN(0xb78d2727, 0xb8d02b2a),
+              TOBN(0xaaf69bed, 0x8ebc329a),
+              TOBN(0xdb6b40b3, 0x293b2148),
+              TOBN(0xe42ea77d, 0xb8c4961f),
+              TOBN(0xb1a12f7c, 0x20e5e0ab),
+              TOBN(0xa0ec5274, 0x79e8b05e),
+              TOBN(0x68027391, 0xfab60a80),
+              TOBN(0x6bfeea5f, 0x16b1bd5e),
+              TOBN(0xf957e420, 0x4de30ad3),
+              TOBN(0xcbaf664e, 0x6a353b9e),
+              TOBN(0x5c873312, 0x26d14feb),
+              TOBN(0x4e87f98c, 0xb65f57cb),
+              TOBN(0xdb60a621, 0x5e0cdd41),
+              TOBN(0x67c16865, 0xa6881440),
+              TOBN(0x1093ef1a, 0x46ab52aa),
+              TOBN(0xc095afb5, 0x3f4ece64),
+              TOBN(0x6a6bb02e, 0x7604551a),
+              TOBN(0x55d44b4e, 0x0b26b8cd),
+              TOBN(0xe5f9a999, 0xf971268a),
+              TOBN(0xc08ec425, 0x11a7de84),
+              TOBN(0x83568095, 0xfda469dd),
+              TOBN(0x737bfba1, 0x6c6c90a2),
+              TOBN(0x1cb9c4a0, 0xbe229831),
+              TOBN(0x93bccbba, 0xbb2eec64),
+              TOBN(0xa0c23b64, 0xda03adbe),
+              TOBN(0x5f7aa00a, 0xe0e86ac4),
+              TOBN(0x470b941e, 0xfc1401e6),
+              TOBN(0x5ad8d679, 0x9df43574),
+              TOBN(0x4ccfb8a9, 0x0f65d810),
+              TOBN(0x1bce80e3, 0xaa7fbd81),
+              TOBN(0x273291ad, 0x9508d20a),
+              TOBN(0xf5c4b46b, 0x42a92806),
+              TOBN(0x810684ec, 0xa86ab44a),
+              TOBN(0x4591640b, 0xca0bc9f8),
+              TOBN(0xb5efcdfc, 0x5c4b6054),
+              TOBN(0x16fc8907, 0x6e9edd12),
+              TOBN(0xe29d0b50, 0xd4d792f9),
+              TOBN(0xa45fd01c, 0x9b03116d),
+              TOBN(0x85035235, 0xc81765a4),
+              TOBN(0x1fe2a9b2, 0xb4b4b67c),
+              TOBN(0xc1d10df0, 0xe8020604),
+              TOBN(0x9d64abfc, 0xbc8058d8),
+              TOBN(0x8943b9b2, 0x712a0fbb),
+              TOBN(0x90eed914, 0x3b3def04),
+              TOBN(0x85ab3aa2, 0x4ce775ff),
+              TOBN(0x605fd4ca, 0x7bbc9040),
+              TOBN(0x8b34a564, 0xe2c75dfb),
+              TOBN(0x41ffc94a, 0x10358560),
+              TOBN(0x2d8a5072, 0x9e5c28aa),
+              TOBN(0xe915a0fc, 0x4cc7eb15),
+              TOBN(0xe9efab05, 0x8f6d0f5d),
+              TOBN(0xdbab47a9, 0xd19e9b91),
+              TOBN(0x8cfed745, 0x0276154c),
+              TOBN(0x154357ae, 0x2cfede0d),
+              TOBN(0x520630df, 0x19f5a4ef),
+              TOBN(0x25759f7c, 0xe382360f),
+              TOBN(0xb6db05c9, 0x88bf5857),
+              TOBN(0x2917d61d, 0x6c58d46c),
+              TOBN(0x14f8e491, 0xfd20cb7a),
+              TOBN(0xb68a727a, 0x11c20340),
+              TOBN(0x0386f86f, 0xaf7ccbb6),
+              TOBN(0x5c8bc6cc, 0xfee09a20),
+              TOBN(0x7d76ff4a, 0xbb7eea35),
+              TOBN(0xa7bdebe7, 0xdb15be7a),
+              TOBN(0x67a08054, 0xd89f0302),
+              TOBN(0x56bf0ea9, 0xc1193364),
+              TOBN(0xc8244467, 0x62837ebe),
+              TOBN(0x32bd8e8b, 0x20d841b8),
+              TOBN(0x127a0548, 0xdbb8a54f),
+              TOBN(0x83dd4ca6, 0x63b20236),
+              TOBN(0x87714718, 0x203491fa),
+              TOBN(0x4dabcaaa, 0xaa8a5288),
+              TOBN(0x91cc0c8a, 0xaf23a1c9),
+              TOBN(0x34c72c6a, 0x3f220e0c),
+              TOBN(0xbcc20bdf, 0x1232144a),
+              TOBN(0x6e2f42da, 0xa20ede1b),
+              TOBN(0xc441f00c, 0x74a00515),
+              TOBN(0xbf46a5b6, 0x734b8c4b),
+              TOBN(0x57409503, 0x7b56c9a4),
+              TOBN(0x9f735261, 0xe4585d45),
+              TOBN(0x9231faed, 0x6734e642),
+              TOBN(0x1158a176, 0xbe70ee6c),
+              TOBN(0x35f1068d, 0x7c3501bf),
+              TOBN(0x6beef900, 0xa2d26115),
+              TOBN(0x649406f2, 0xef0afee3),
+              TOBN(0x3f43a60a, 0xbc2420a1),
+              TOBN(0x509002a7, 0xd5aee4ac),
+              TOBN(0xb46836a5, 0x3ff3571b),
+              TOBN(0x24f98b78, 0x837927c1),
+              TOBN(0x6254256a, 0x4533c716),
+              TOBN(0xf27abb0b, 0xd07ee196),
+              TOBN(0xd7cf64fc, 0x5c6d5bfd),
+              TOBN(0x6915c751, 0xf0cd7a77),
+              TOBN(0xd9f59012, 0x8798f534),
+              TOBN(0x772b0da8, 0xf81d8b5f),
+              TOBN(0x1244260c, 0x2e03fa69),
+              TOBN(0x36cf0e3a, 0x3be1a374),
+              TOBN(0x6e7c1633, 0xef06b960),
+              TOBN(0xa71a4c55, 0x671f90f6),
+              TOBN(0x7a941251, 0x33c673db),
+              TOBN(0xc0bea510, 0x73e8c131),
+              TOBN(0x61a8a699, 0xd4f6c734),
+              TOBN(0x25e78c88, 0x341ed001),
+              TOBN(0x5c18acf8, 0x8e2f7d90),
+              TOBN(0xfdbf33d7, 0x77be32cd),
+              TOBN(0x0a085cd7, 0xd2eb5ee9),
+              TOBN(0x2d702cfb, 0xb3201115),
+              TOBN(0xb6e0ebdb, 0x85c88ce8),
+              TOBN(0x23a3ce3c, 0x1e01d617),
+              TOBN(0x3041618e, 0x567333ac),
+              TOBN(0x9dd0fd8f, 0x157edb6b),
+              TOBN(0x27f74702, 0xb57872b8),
+              TOBN(0x2ef26b4f, 0x657d5fe1),
+              TOBN(0x95426f0a, 0x57cf3d40),
+              TOBN(0x847e2ad1, 0x65a6067a),
+              TOBN(0xd474d9a0, 0x09996a74),
+              TOBN(0x16a56acd, 0x2a26115c),
+              TOBN(0x02a615c3, 0xd16f4d43),
+              TOBN(0xcc3fc965, 0xaadb85b7),
+              TOBN(0x386bda73, 0xce07d1b0),
+              TOBN(0xd82910c2, 0x58ad4178),
+              TOBN(0x124f82cf, 0xcd2617f4),
+              TOBN(0xcc2f5e8d, 0xef691770),
+              TOBN(0x82702550, 0xb8c30ccc),
+              TOBN(0x7b856aea, 0x1a8e575a),
+              TOBN(0xbb822fef, 0xb1ab9459),
+              TOBN(0x085928bc, 0xec24e38e),
+              TOBN(0x5d0402ec, 0xba8f4b4d),
+              TOBN(0xc07cd4ba, 0x00b4d58b),
+              TOBN(0x5d8dffd5, 0x29227e7a),
+              TOBN(0x61d44d0c, 0x31bf386f),
+              TOBN(0xe486dc2b, 0x135e6f4d),
+              TOBN(0x680962eb, 0xe79410ef),
+              TOBN(0xa61bd343, 0xf10088b5),
+              TOBN(0x6aa76076, 0xe2e28686),
+              TOBN(0x80463d11, 0x8fb98871),
+              TOBN(0xcb26f5c3, 0xbbc76aff),
+              TOBN(0xd4ab8edd, 0xfbe03614),
+              TOBN(0xc8eb579b, 0xc0cf2dee),
+              TOBN(0xcc004c15, 0xc93bae41),
+              TOBN(0x46fbae5d, 0x3aeca3b2),
+              TOBN(0x671235cf, 0x0f1e9ab1),
+              TOBN(0xadfba934, 0x9ec285c1),
+              TOBN(0x88ded013, 0xf216c980),
+              TOBN(0xc8ac4fb8, 0xf79e0bc1),
+              TOBN(0xa29b89c6, 0xfb97a237),
+              TOBN(0xb697b780, 0x9922d8e7),
+              TOBN(0x3142c639, 0xddb945b5),
+              TOBN(0x447b06c7, 0xe094c3a9),
+              TOBN(0xcdcb3642, 0x72266c90),
+              TOBN(0x633aad08, 0xa9385046),
+              TOBN(0xa36c936b, 0xb57c6477),
+              TOBN(0x871f8b64, 0xe94dbcc6),
+              TOBN(0x28d0fb62, 0xa591a67b),
+              TOBN(0x9d40e081, 0xc1d926f5),
+              TOBN(0x3111eaf6, 0xf2d84b5a),
+              TOBN(0x228993f9, 0xa565b644),
+              TOBN(0x0ccbf592, 0x2c83188b),
+              TOBN(0xf87b30ab, 0x3df3e197),
+              TOBN(0xb8658b31, 0x7642bca8),
+              TOBN(0x1a032d7f, 0x52800f17),
+              TOBN(0x051dcae5, 0x79bf9445),
+              TOBN(0xeba6b8ee, 0x54a2e253),
+              TOBN(0x5c8b9cad, 0xd4485692),
+              TOBN(0x84bda40e, 0x8986e9be),
+              TOBN(0xd16d16a4, 0x2f0db448),
+              TOBN(0x8ec80050, 0xa14d4188),
+              TOBN(0xb2b26107, 0x98fa7aaa),
+              TOBN(0x41209ee4, 0xf073aa4e),
+              TOBN(0xf1570359, 0xf2d6b19b),
+              TOBN(0xcbe6868c, 0xfc577caf),
+              TOBN(0x186c4bdc, 0x32c04dd3),
+              TOBN(0xa6c35fae, 0xcfeee397),
+              TOBN(0xb4a1b312, 0xf086c0cf),
+              TOBN(0xe0a5ccc6, 0xd9461fe2),
+              TOBN(0xc32278aa, 0x1536189f),
+              TOBN(0x1126c55f, 0xba6df571),
+              TOBN(0x0f71a602, 0xb194560e),
+              TOBN(0x8b2d7405, 0x324bd6e1),
+              TOBN(0x8481939e, 0x3738be71),
+              TOBN(0xb5090b1a, 0x1a4d97a9),
+              TOBN(0x116c65a3, 0xf05ba915),
+              TOBN(0x21863ad3, 0xaae448aa),
+              TOBN(0xd24e2679, 0xa7aae5d3),
+              TOBN(0x7076013d, 0x0de5c1c4),
+              TOBN(0x2d50f8ba, 0xbb05b629),
+              TOBN(0x73c1abe2, 0x6e66efbb),
+              TOBN(0xefd4b422, 0xf2488af7),
+              TOBN(0xe4105d02, 0x663ba575),
+              TOBN(0x7eb60a8b, 0x53a69457),
+              TOBN(0x62210008, 0xc945973b),
+              TOBN(0xfb255478, 0x77a50ec6),
+              TOBN(0xbf0392f7, 0x0a37a72c),
+              TOBN(0xa0a7a19c, 0x4be18e7a),
+              TOBN(0x90d8ea16, 0x25b1e0af),
+              TOBN(0x7582a293, 0xef953f57),
+              TOBN(0x90a64d05, 0xbdc5465a),
+              TOBN(0xca79c497, 0xe2510717),
+              TOBN(0x560dbb7c, 0x18cb641f),
+              TOBN(0x1d8e3286, 0x4b66abfb),
+              TOBN(0xd26f52e5, 0x59030900),
+              TOBN(0x1ee3f643, 0x5584941a),
+              TOBN(0x6d3b3730, 0x569f5958),
+              TOBN(0x9ff2a62f, 0x4789dba5),
+              TOBN(0x91fcb815, 0x72b5c9b7),
+              TOBN(0xf446cb7d, 0x6c8f9a0e),
+              TOBN(0x48f625c1, 0x39b7ecb5),
+              TOBN(0xbabae801, 0x1c6219b8),
+              TOBN(0xe7a562d9, 0x28ac2f23),
+              TOBN(0xe1b48732, 0x26e20588),
+              TOBN(0x06ee1cad, 0x775af051),
+              TOBN(0xda29ae43, 0xfaff79f7),
+              TOBN(0xc141a412, 0x652ee9e0),
+              TOBN(0x1e127f6f, 0x195f4bd0),
+              TOBN(0x29c6ab4f, 0x072f34f8),
+              TOBN(0x7b7c1477, 0x30448112),
+              TOBN(0x82b51af1, 0xe4a38656),
+              TOBN(0x2bf2028a, 0x2f315010),
+              TOBN(0xc9a4a01f, 0x6ea88cd4),
+              TOBN(0xf63e95d8, 0x257e5818),
+              TOBN(0xdd8efa10, 0xb4519b16),
+              TOBN(0xed8973e0, 0x0da910bf),
+              TOBN(0xed49d077, 0x5c0fe4a9),
+              TOBN(0xac3aac5e, 0xb7caee1e),
+              TOBN(0x1033898d, 0xa7f4da57),
+              TOBN(0x42145c0e, 0x5c6669b9),
+              TOBN(0x42daa688, 0xc1aa2aa0),
+              TOBN(0x629cc15c, 0x1a1d885a),
+              TOBN(0x25572ec0, 0xf4b76817),
+              TOBN(0x8312e435, 0x9c8f8f28),
+              TOBN(0x8107f8cd, 0x81965490),
+              TOBN(0x516ff3a3, 0x6fa6110c),
+              TOBN(0x74fb1eb1, 0xfb93561f),
+              TOBN(0x6c0c9047, 0x8457522b),
+              TOBN(0xcfd32104, 0x6bb8bdc6),
+              TOBN(0x2d6884a2, 0xcc80ad57),
+              TOBN(0x7c27fc35, 0x86a9b637),
+              TOBN(0x3461baed, 0xadf4e8cd),
+              TOBN(0x1d56251a, 0x617242f0),
+              TOBN(0x0b80d209, 0xc955bef4),
+              TOBN(0xdf02cad2, 0x06adb047),
+              TOBN(0xf0d7cb91, 0x5ec74fee),
+              TOBN(0xd2503375, 0x1111ba44),
+              TOBN(0x9671755e, 0xdf53cb36),
+              TOBN(0x54dcb612, 0x3368551b),
+              TOBN(0x66d69aac, 0xc8a025a4),
+              TOBN(0x6be946c6, 0xe77ef445),
+              TOBN(0x719946d1, 0xa995e094),
+              TOBN(0x65e848f6, 0xe51e04d8),
+              TOBN(0xe62f3300, 0x6a1e3113),
+              TOBN(0x1541c7c1, 0x501de503),
+              TOBN(0x4daac9fa, 0xf4acfade),
+              TOBN(0x0e585897, 0x44cd0b71),
+              TOBN(0x544fd869, 0x0a51cd77),
+              TOBN(0x60fc20ed, 0x0031016d),
+              TOBN(0x58b404ec, 0xa4276867),
+              TOBN(0x46f6c3cc, 0x34f34993),
+              TOBN(0x477ca007, 0xc636e5bd),
+              TOBN(0x8018f5e5, 0x7c458b47),
+              TOBN(0xa1202270, 0xe47b668f),
+              TOBN(0xcef48ccd, 0xee14f203),
+              TOBN(0x23f98bae, 0x62ff9b4d),
+              TOBN(0x55acc035, 0xc589eddd),
+              TOBN(0x3fe712af, 0x64db4444),
+              TOBN(0x19e9d634, 0xbecdd480),
+              TOBN(0xe08bc047, 0xa930978a),
+              TOBN(0x2dbf24ec, 0xa1280733),
+              TOBN(0x3c0ae38c, 0x2cd706b2),
+              TOBN(0x5b012a5b, 0x359017b9),
+              TOBN(0x3943c38c, 0x72e0f5ae),
+              TOBN(0x786167ea, 0x57176fa3),
+              TOBN(0xe5f9897d, 0x594881dc),
+              TOBN(0x6b5efad8, 0xcfb820c1),
+              TOBN(0xb2179093, 0xd55018de),
+              TOBN(0x39ad7d32, 0x0bac56ce),
+              TOBN(0xb55122e0, 0x2cfc0e81),
+              TOBN(0x117c4661, 0xf6d89daa),
+              TOBN(0x362d01e1, 0xcb64fa09),
+              TOBN(0x6a309b4e, 0x3e9c4ddd),
+              TOBN(0xfa979fb7, 0xabea49b1),
+              TOBN(0xb4b1d27d, 0x10e2c6c5),
+              TOBN(0xbd61c2c4, 0x23afde7a),
+              TOBN(0xeb6614f8, 0x9786d358),
+              TOBN(0x4a5d816b, 0x7f6f7459),
+              TOBN(0xe431a44f, 0x09360e7b),
+              TOBN(0x8c27a032, 0xc309914c),
+              TOBN(0xcea5d68a, 0xcaede3d8),
+              TOBN(0x3668f665, 0x3a0a3f95),
+              TOBN(0x89369416, 0x7ceba27b),
+              TOBN(0x89981fad, 0xe4728fe9),
+              TOBN(0x7102c8a0, 0x8a093562),
+              TOBN(0xbb80310e, 0x235d21c8),
+              TOBN(0x505e55d1, 0xbefb7f7b),
+              TOBN(0xa0a90811, 0x12958a67),
+              TOBN(0xd67e106a, 0x4d851fef),
+              TOBN(0xb84011a9, 0x431dd80e),
+              TOBN(0xeb7c7cca, 0x73306cd9),
+              TOBN(0x20fadd29, 0xd1b3b730),
+              TOBN(0x83858b5b, 0xfe37b3d3),
+              TOBN(0xbf4cd193, 0xb6251d5c),
+              TOBN(0x1cca1fd3, 0x1352d952),
+              TOBN(0xc66157a4, 0x90fbc051),
+              TOBN(0x7990a638, 0x89b98636),
+          },
+          { TOBN(0xe5aa692a, 0x87dec0e1), TOBN(0x010ded8d, 0xf7b39d00),
+              TOBN(0x7b1b80c8, 0x54cfa0b5), TOBN(0x66beb876, 0xa0f8ea28),
+              TOBN(0x50d7f531, 0x3476cd0e), TOBN(0xa63d0e65, 0xb08d3949),
+              TOBN(0x1a09eea9, 0x53479fc6), TOBN(0x82ae9891, 0xf499e742),
+              TOBN(0xab58b910, 0x5ca7d866), TOBN(0x582967e2, 0x3adb3b34),
+              TOBN(0x89ae4447, 0xcceac0bc), TOBN(0x919c667c, 0x7bf56af5),
+              TOBN(0x9aec17b1, 0x60f5dcd7), TOBN(0xec697b9f, 0xddcaadbc),
+              TOBN(0x0b98f341, 0x463467f5), TOBN(0xb187f1f7, 0xa967132f),
+              TOBN(0x90fe7a1d, 0x214aeb18), TOBN(0x1506af3c, 0x741432f7),
+              TOBN(0xbb5565f9, 0xe591a0c4), TOBN(0x10d41a77, 0xb44f1bc3),
+              TOBN(0xa09d65e4, 0xa84bde96), TOBN(0x42f060d8, 0xf20a6a1c),
+              TOBN(0x652a3bfd, 0xf27f9ce7), TOBN(0xb6bdb65c, 0x3b3d739f),
+              TOBN(0xeb5ddcb6, 0xec7fae9f), TOBN(0x995f2714, 0xefb66e5a),
+              TOBN(0xdee95d8e, 0x69445d52), TOBN(0x1b6c2d46, 0x09e27620),
+              TOBN(0x32621c31, 0x8129d716), TOBN(0xb03909f1, 0x0958c1aa),
+              TOBN(0x8c468ef9, 0x1af4af63), TOBN(0x162c429f, 0xfba5cdf6),
+              TOBN(0x2f682343, 0x753b9371), TOBN(0x29cab45a, 0x5f1f9cd7),
+              TOBN(0x571623ab, 0xb245db96), TOBN(0xc507db09, 0x3fd79999),
+              TOBN(0x4e2ef652, 0xaf036c32), TOBN(0x86f0cc78, 0x05018e5c),
+              TOBN(0xc10a73d4, 0xab8be350), TOBN(0x6519b397, 0x7e826327),
+              TOBN(0xe8cb5eef, 0x9c053df7), TOBN(0x8de25b37, 0xb300ea6f),
+              TOBN(0xdb03fa92, 0xc849cffb), TOBN(0x242e43a7, 0xe84169bb),
+              TOBN(0xe4fa51f4, 0xdd6f958e), TOBN(0x6925a77f, 0xf4445a8d),
+              TOBN(0xe6e72a50, 0xe90d8949), TOBN(0xc66648e3, 0x2b1f6390),
+              TOBN(0xb2ab1957, 0x173e460c), TOBN(0x1bbbce75, 0x30704590),
+              TOBN(0xc0a90dbd, 0xdb1c7162), TOBN(0x505e399e, 0x15cdd65d),
+              TOBN(0x68434dcb, 0x57797ab7), TOBN(0x60ad35ba, 0x6a2ca8e8),
+              TOBN(0x4bfdb1e0, 0xde3336c1), TOBN(0xbbef99eb, 0xd8b39015),
+              TOBN(0x6c3b96f3, 0x1711ebec), TOBN(0x2da40f1f, 0xce98fdc4),
+              TOBN(0xb99774d3, 0x57b4411f), TOBN(0x87c8bdf4, 0x15b65bb6),
+              TOBN(0xda3a89e3, 0xc2eef12d), TOBN(0xde95bb9b, 0x3c7471f3),
+              TOBN(0x600f225b, 0xd812c594), TOBN(0x54907c5d, 0x2b75a56b),
+              TOBN(0xa93cc5f0, 0x8db60e35), TOBN(0x743e3cd6, 0xfa833319),
+              TOBN(0x7dad5c41, 0xf81683c9), TOBN(0x70c1e7d9, 0x9c34107e),
+              TOBN(0x0edc4a39, 0xa6be0907), TOBN(0x36d47035, 0x86d0b7d3),
+              TOBN(0x8c76da03, 0x272bfa60), TOBN(0x0b4a07ea, 0x0f08a414),
+              TOBN(0x699e4d29, 0x45c1dd53), TOBN(0xcadc5898, 0x231debb5),
+              TOBN(0xdf49fcc7, 0xa77f00e0), TOBN(0x93057bbf, 0xa73e5a0e),
+              TOBN(0x2f8b7ecd, 0x027a4cd1), TOBN(0x114734b3, 0xc614011a),
+              TOBN(0xe7a01db7, 0x67677c68), TOBN(0x89d9be5e, 0x7e273f4f),
+              TOBN(0xd225cb2e, 0x089808ef), TOBN(0xf1f7a27d, 0xd59e4107),
+              TOBN(0x53afc761, 0x8211b9c9), TOBN(0x0361bc67, 0xe6819159),
+              TOBN(0x2a865d0b, 0x7f071426), TOBN(0x6a3c1810, 0xe7072567),
+              TOBN(0x3e3bca1e, 0x0d6bcabd), TOBN(0xa1b02bc1, 0x408591bc),
+              TOBN(0xe0deee59, 0x31fba239), TOBN(0xf47424d3, 0x98bd91d1),
+              TOBN(0x0f8886f4, 0x071a3c1d), TOBN(0x3f7d41e8, 0xa819233b),
+              TOBN(0x708623c2, 0xcf6eb998), TOBN(0x86bb49af, 0x609a287f),
+              TOBN(0x942bb249, 0x63c90762), TOBN(0x0ef6eea5, 0x55a9654b),
+              TOBN(0x5f6d2d72, 0x36f5defe), TOBN(0xfa9922dc, 0x56f99176),
+              TOBN(0x6c8c5ece, 0xf78ce0c7), TOBN(0x7b44589d, 0xbe09b55e),
+              TOBN(0xe11b3bca, 0x9ea83770), TOBN(0xd7fa2c7f, 0x2ab71547),
+              TOBN(0x2a3dd6fa, 0x2a1ddcc0), TOBN(0x09acb430, 0x5a7b7707),
+              TOBN(0x4add4a2e, 0x649d4e57), TOBN(0xcd53a2b0, 0x1917526e),
+              TOBN(0xc5262330, 0x20b44ac4), TOBN(0x4028746a, 0xbaa2c31d),
+              TOBN(0x51318390, 0x64291d4c), TOBN(0xbf48f151, 0xee5ad909),
+              TOBN(0xcce57f59, 0x7b185681), TOBN(0x7c3ac1b0, 0x4854d442),
+              TOBN(0x65587dc3, 0xc093c171), TOBN(0xae7acb24, 0x24f42b65),
+              TOBN(0x5a338adb, 0x955996cb), TOBN(0xc8e65675, 0x6051f91b),
+              TOBN(0x66711fba, 0x28b8d0b1), TOBN(0x15d74137, 0xb6c10a90),
+              TOBN(0x70cdd7eb, 0x3a232a80), TOBN(0xc9e2f07f, 0x6191ed24),
+              TOBN(0xa80d1db6, 0xf79588c0), TOBN(0xfa52fc69, 0xb55768cc),
+              TOBN(0x0b4df1ae, 0x7f54438a), TOBN(0x0cadd1a7, 0xf9b46a4f),
+              TOBN(0xb40ea6b3, 0x1803dd6f), TOBN(0x488e4fa5, 0x55eaae35),
+              TOBN(0x9f047d55, 0x382e4e16), TOBN(0xc9b5b7e0, 0x2f6e0c98),
+              TOBN(0x6b1bd2d3, 0x95762649), TOBN(0xa9604ee7, 0xc7aea3f6),
+              TOBN(0x3646ff27, 0x6dc6f896), TOBN(0x9bf0e7f5, 0x2860bad1),
+              TOBN(0x2d92c821, 0x7cb44b92), TOBN(0xa2f5ce63, 0xaea9c182),
+              TOBN(0xd0a2afb1, 0x9154a5fd), TOBN(0x482e474c, 0x95801da6),
+              TOBN(0xc19972d0, 0xb611c24b), TOBN(0x1d468e65, 0x60a8f351),
+              TOBN(0xeb758069, 0x7bcf6421), TOBN(0xec9dd0ee, 0x88fbc491),
+              TOBN(0x5b59d2bf, 0x956c2e32), TOBN(0x73dc6864, 0xdcddf94e),
+              TOBN(0xfd5e2321, 0xbcee7665), TOBN(0xa7b4f8ef, 0x5e9a06c4),
+              TOBN(0xfba918dd, 0x7280f855), TOBN(0xbbaac260, 0x8baec688),
+              TOBN(0xa3b3f00f, 0x33400f42), TOBN(0x3d2dba29, 0x66f2e6e4),
+              TOBN(0xb6f71a94, 0x98509375), TOBN(0x8f33031f, 0xcea423cc),
+              TOBN(0x009b8dd0, 0x4807e6fb), TOBN(0x5163cfe5, 0x5cdb954c),
+              TOBN(0x03cc8f17, 0xcf41c6e8), TOBN(0xf1f03c2a, 0x037b925c),
+              TOBN(0xc39c19cc, 0x66d2427c), TOBN(0x823d24ba, 0x7b6c18e4),
+              TOBN(0x32ef9013, 0x901f0b4f), TOBN(0x684360f1, 0xf8941c2e),
+              TOBN(0x0ebaff52, 0x2c28092e), TOBN(0x7891e4e3, 0x256c932f),
+              TOBN(0x51264319, 0xac445e3d), TOBN(0x553432e7, 0x8ea74381),
+              TOBN(0xe6eeaa69, 0x67e9c50a), TOBN(0x27ced284, 0x62e628c7),
+              TOBN(0x3f96d375, 0x7a4afa57), TOBN(0xde0a14c3, 0xe484c150),
+              TOBN(0x364a24eb, 0x38bd9923), TOBN(0x1df18da0, 0xe5177422),
+              TOBN(0x174e8f82, 0xd8d38a9b), TOBN(0x2e97c600, 0xe7de1391),
+              TOBN(0xc5709850, 0xa1c175dd), TOBN(0x969041a0, 0x32ae5035),
+              TOBN(0xcbfd533b, 0x76a2086b), TOBN(0xd6bba71b, 0xd7c2e8fe),
+              TOBN(0xb2d58ee6, 0x099dfb67), TOBN(0x3a8b342d, 0x064a85d9),
+              TOBN(0x3bc07649, 0x522f9be3), TOBN(0x690c075b, 0xdf1f49a8),
+              TOBN(0x80e1aee8, 0x3854ec42), TOBN(0x2a7dbf44, 0x17689dc7),
+              TOBN(0xc004fc0e, 0x3faf4078), TOBN(0xb2f02e9e, 0xdf11862c),
+              TOBN(0xf10a5e0f, 0xa0a1b7b3), TOBN(0x30aca623, 0x8936ec80),
+              TOBN(0xf83cbf05, 0x02f40d9a), TOBN(0x4681c468, 0x2c318a4d),
+              TOBN(0x98575618, 0x0e9c2674), TOBN(0xbe79d046, 0x1847092e),
+              TOBN(0xaf1e480a, 0x78bd01e0), TOBN(0x6dd359e4, 0x72a51db9),
+              TOBN(0x62ce3821, 0xe3afbab6), TOBN(0xc5cee5b6, 0x17733199),
+              TOBN(0xe08b30d4, 0x6ffd9fbb), TOBN(0x6e5bc699, 0x36c610b7),
+              TOBN(0xf343cff2, 0x9ce262cf), TOBN(0xca2e4e35, 0x68b914c1),
+              TOBN(0x011d64c0, 0x16de36c5), TOBN(0xe0b10fdd, 0x42e2b829),
+              TOBN(0x78942981, 0x6685aaf8), TOBN(0xe7511708, 0x230ede97),
+              TOBN(0x671ed8fc, 0x3b922bf8), TOBN(0xe4d8c0a0, 0x4c29b133),
+              TOBN(0x87eb1239, 0x3b6e99c4), TOBN(0xaff3974c, 0x8793beba),
+              TOBN(0x03749405, 0x2c18df9b), TOBN(0xc5c3a293, 0x91007139),
+              TOBN(0x6a77234f, 0xe37a0b95), TOBN(0x02c29a21, 0xb661c96b),
+              TOBN(0xc3aaf1d6, 0x141ecf61), TOBN(0x9195509e, 0x3bb22f53),
+              TOBN(0x29597404, 0x22d51357), TOBN(0x1b083822, 0x537bed60),
+              TOBN(0xcd7d6e35, 0xe07289f0), TOBN(0x1f94c48c, 0x6dd86eff),
+              TOBN(0xc8bb1f82, 0xeb0f9cfa), TOBN(0x9ee0b7e6, 0x1b2eb97d),
+              TOBN(0x5a52fe2e, 0x34d74e31), TOBN(0xa352c310, 0x3bf79ab6),
+              TOBN(0x97ff6c5a, 0xabfeeb8f), TOBN(0xbfbe8fef, 0xf5c97305),
+              TOBN(0xd6081ce6, 0xa7904608), TOBN(0x1f812f3a, 0xc4fca249),
+              TOBN(0x9b24bc9a, 0xb9e5e200), TOBN(0x91022c67, 0x38012ee8),
+              TOBN(0xe83d9c5d, 0x30a713a1), TOBN(0x4876e3f0, 0x84ef0f93),
+              TOBN(0xc9777029, 0xc1fbf928), TOBN(0xef7a6bb3, 0xbce7d2a4),
+              TOBN(0xb8067228, 0xdfa2a659), TOBN(0xd5cd3398, 0xd877a48f),
+              TOBN(0xbea4fd8f, 0x025d0f3f), TOBN(0xd67d2e35, 0x2eae7c2b),
+              TOBN(0x184de7d7, 0xcc5f4394), TOBN(0xb5551b5c, 0x4536e142),
+              TOBN(0x2e89b212, 0xd34aa60a), TOBN(0x14a96fea, 0xf50051d5),
+              TOBN(0x4e21ef74, 0x0d12bb0b), TOBN(0xc522f020, 0x60b9677e),
+              TOBN(0x8b12e467, 0x2df7731d), TOBN(0x39f80382, 0x7b326d31),
+              TOBN(0xdfb8630c, 0x39024a94), TOBN(0xaacb96a8, 0x97319452),
+              TOBN(0xd68a3961, 0xeda3867c), TOBN(0x0c58e2b0, 0x77c4ffca),
+              TOBN(0x3d545d63, 0x4da919fa), TOBN(0xef79b69a, 0xf15e2289),
+              TOBN(0x54bc3d3d, 0x808bab10), TOBN(0xc8ab3007, 0x45f82c37),
+              TOBN(0xc12738b6, 0x7c4a658a), TOBN(0xb3c47639, 0x40e72182),
+              TOBN(0x3b77be46, 0x8798e44f), TOBN(0xdc047df2, 0x17a7f85f),
+              TOBN(0x2439d4c5, 0x5e59d92d), TOBN(0xcedca475, 0xe8e64d8d),
+              TOBN(0xa724cd0d, 0x87ca9b16), TOBN(0x35e4fd59, 0xa5540dfe),
+              TOBN(0xf8c1ff18, 0xe4bcf6b1), TOBN(0x856d6285, 0x295018fa),
+              TOBN(0x433f665c, 0x3263c949), TOBN(0xa6a76dd6, 0xa1f21409),
+              TOBN(0x17d32334, 0xcc7b4f79), TOBN(0xa1d03122, 0x06720e4a),
+              TOBN(0xadb6661d, 0x81d9bed5), TOBN(0xf0d6fb02, 0x11db15d1),
+              TOBN(0x7fd11ad5, 0x1fb747d2), TOBN(0xab50f959, 0x3033762b),
+              TOBN(0x2a7e711b, 0xfbefaf5a), TOBN(0xc7393278, 0x3fef2bbf),
+              TOBN(0xe29fa244, 0x0df6f9be), TOBN(0x9092757b, 0x71efd215),
+              TOBN(0xee60e311, 0x4f3d6fd9), TOBN(0x338542d4, 0x0acfb78b),
+              TOBN(0x44a23f08, 0x38961a0f), TOBN(0x1426eade, 0x986987ca),
+              TOBN(0x36e6ee2e, 0x4a863cc6), TOBN(0x48059420, 0x628b8b79),
+              TOBN(0x30303ad8, 0x7396e1de), TOBN(0x5c8bdc48, 0x38c5aad1),
+              TOBN(0x3e40e11f, 0x5c8f5066), TOBN(0xabd6e768, 0x8d246bbd),
+              TOBN(0x68aa40bb, 0x23330a01), TOBN(0xd23f5ee4, 0xc34eafa0),
+              TOBN(0x3bbee315, 0x5de02c21), TOBN(0x18dd4397, 0xd1d8dd06),
+              TOBN(0x3ba1939a, 0x122d7b44), TOBN(0xe6d3b40a, 0xa33870d6),
+              TOBN(0x8e620f70, 0x1c4fe3f8), TOBN(0xf6bba1a5, 0xd3a50cbf),
+              TOBN(0x4a78bde5, 0xcfc0aee0), TOBN(0x847edc46, 0xc08c50bd),
+              TOBN(0xbaa2439c, 0xad63c9b2), TOBN(0xceb4a728, 0x10fc2acb),
+              TOBN(0xa419e40e, 0x26da033d), TOBN(0x6cc3889d, 0x03e02683),
+              TOBN(0x1cd28559, 0xfdccf725), TOBN(0x0fd7e0f1, 0x8d13d208),
+              TOBN(0x01b9733b, 0x1f0df9d4), TOBN(0x8cc2c5f3, 0xa2b5e4f3),
+              TOBN(0x43053bfa, 0x3a304fd4), TOBN(0x8e87665c, 0x0a9f1aa7),
+              TOBN(0x087f29ec, 0xd73dc965), TOBN(0x15ace455, 0x3e9023db),
+              TOBN(0x2370e309, 0x2bce28b4), TOBN(0xf9723442, 0xb6b1e84a),
+              TOBN(0xbeee662e, 0xb72d9f26), TOBN(0xb19396de, 0xf0e47109),
+              TOBN(0x85b1fa73, 0xe13289d0), TOBN(0x436cf77e, 0x54e58e32),
+              TOBN(0x0ec833b3, 0xe990ef77), TOBN(0x7373e3ed, 0x1b11fc25),
+              TOBN(0xbe0eda87, 0x0fc332ce), TOBN(0xced04970, 0x8d7ea856),
+              TOBN(0xf85ff785, 0x7e977ca0), TOBN(0xb66ee8da, 0xdfdd5d2b),
+              TOBN(0xf5e37950, 0x905af461), TOBN(0x587b9090, 0x966d487c),
+              TOBN(0x6a198a1b, 0x32ba0127), TOBN(0xa7720e07, 0x141615ac),
+              TOBN(0xa23f3499, 0x996ef2f2), TOBN(0xef5f64b4, 0x470bcb3d),
+              TOBN(0xa526a962, 0x92b8c559), TOBN(0x0c14aac0, 0x69740a0f),
+              TOBN(0x0d41a9e3, 0xa6bdc0a5), TOBN(0x97d52106, 0x9c48aef4),
+              TOBN(0xcf16bd30, 0x3e7c253b), TOBN(0xcc834b1a, 0x47fdedc1),
+              TOBN(0x7362c6e5, 0x373aab2e), TOBN(0x264ed85e, 0xc5f590ff),
+              TOBN(0x7a46d9c0, 0x66d41870), TOBN(0xa50c20b1, 0x4787ba09),
+              TOBN(0x185e7e51, 0xe3d44635), TOBN(0xb3b3e080, 0x31e2d8dc),
+              TOBN(0xbed1e558, 0xa179e9d9), TOBN(0x2daa3f79, 0x74a76781),
+              TOBN(0x4372baf2, 0x3a40864f), TOBN(0x46900c54, 0x4fe75cb5),
+              TOBN(0xb95f171e, 0xf76765d0), TOBN(0x4ad726d2, 0x95c87502),
+              TOBN(0x2ec769da, 0x4d7c99bd), TOBN(0x5e2ddd19, 0xc36cdfa8),
+              TOBN(0xc22117fc, 0xa93e6dea), TOBN(0xe8a2583b, 0x93771123),
+              TOBN(0xbe2f6089, 0xfa08a3a2), TOBN(0x4809d5ed, 0x8f0e1112),
+              TOBN(0x3b414aa3, 0xda7a095e), TOBN(0x9049acf1, 0x26f5aadd),
+              TOBN(0x78d46a4d, 0x6be8b84a), TOBN(0xd66b1963, 0xb732b9b3),
+              TOBN(0x5c2ac2a0, 0xde6e9555), TOBN(0xcf52d098, 0xb5bd8770),
+              TOBN(0x15a15fa6, 0x0fd28921), TOBN(0x56ccb81e, 0x8b27536d),
+              TOBN(0x0f0d8ab8, 0x9f4ccbb8), TOBN(0xed5f44d2, 0xdb221729),
+              TOBN(0x43141988, 0x00bed10c), TOBN(0xc94348a4, 0x1d735b8b),
+              TOBN(0x79f3e9c4, 0x29ef8479), TOBN(0x4c13a4e3, 0x614c693f),
+              TOBN(0x32c9af56, 0x8e143a14), TOBN(0xbc517799, 0xe29ac5c4),
+              TOBN(0x05e17992, 0x2774856f), TOBN(0x6e52fb05, 0x6c1bf55f),
+              TOBN(0xaeda4225, 0xe4f19e16), TOBN(0x70f4728a, 0xaf5ccb26),
+              TOBN(0x5d2118d1, 0xb2947f22), TOBN(0xc827ea16, 0x281d6fb9),
+              TOBN(0x8412328d, 0x8cf0eabd), TOBN(0x45ee9fb2, 0x03ef9dcf),
+              TOBN(0x8e700421, 0xbb937d63), TOBN(0xdf8ff2d5, 0xcc4b37a6),
+              TOBN(0xa4c0d5b2, 0x5ced7b68), TOBN(0x6537c1ef, 0xc7308f59),
+              TOBN(0x25ce6a26, 0x3b37f8e8), TOBN(0x170e9a9b, 0xdeebc6ce),
+              TOBN(0xdd037952, 0x8728d72c), TOBN(0x445b0e55, 0x850154bc),
+              TOBN(0x4b7d0e06, 0x83a7337b), TOBN(0x1e3416d4, 0xffecf249),
+              TOBN(0x24840eff, 0x66a2b71f), TOBN(0xd0d9a50a, 0xb37cc26d),
+              TOBN(0xe2198150, 0x6fe28ef7), TOBN(0x3cc5ef16, 0x23324c7f),
+              TOBN(0x220f3455, 0x769b5263), TOBN(0xe2ade2f1, 0xa10bf475),
+              TOBN(0x28cd20fa, 0x458d3671), TOBN(0x1549722c, 0x2dc4847b),
+              TOBN(0x6dd01e55, 0x591941e3), TOBN(0x0e6fbcea, 0x27128ccb),
+              TOBN(0xae1a1e6b, 0x3bef0262), TOBN(0xfa8c472c, 0x8f54e103),
+              TOBN(0x7539c0a8, 0x72c052ec), TOBN(0xd7b27369, 0x5a3490e9),
+              TOBN(0x143fe1f1, 0x71684349), TOBN(0x36b4722e, 0x32e19b97),
+              TOBN(0xdc059227, 0x90980aff), TOBN(0x175c9c88, 0x9e13d674),
+              TOBN(0xa7de5b22, 0x6e6bfdb1), TOBN(0x5ea5b7b2, 0xbedb4b46),
+              TOBN(0xd5570191, 0xd34a6e44), TOBN(0xfcf60d2e, 0xa24ff7e6),
+              TOBN(0x614a392d, 0x677819e1), TOBN(0x7be74c7e, 0xaa5a29e8),
+              TOBN(0xab50fece, 0x63c85f3f), TOBN(0xaca2e2a9, 0x46cab337),
+              TOBN(0x7f700388, 0x122a6fe3), TOBN(0xdb69f703, 0x882a04a8),
+              TOBN(0x9a77935d, 0xcf7aed57), TOBN(0xdf16207c, 0x8d91c86f),
+              TOBN(0x2fca49ab, 0x63ed9998), TOBN(0xa3125c44, 0xa77ddf96),
+              TOBN(0x05dd8a86, 0x24344072), TOBN(0xa023dda2, 0xfec3fb56),
+              TOBN(0x421b41fc, 0x0c743032), TOBN(0x4f2120c1, 0x5e438639),
+              TOBN(0xfb7cae51, 0xc83c1b07), TOBN(0xb2370caa, 0xcac2171a),
+              TOBN(0x2eb2d962, 0x6cc820fb), TOBN(0x59feee5c, 0xb85a44bf),
+              TOBN(0x94620fca, 0x5b6598f0), TOBN(0x6b922cae, 0x7e314051),
+              TOBN(0xff8745ad, 0x106bed4e), TOBN(0x546e71f5, 0xdfa1e9ab),
+              TOBN(0x935c1e48, 0x1ec29487), TOBN(0x9509216c, 0x4d936530),
+              TOBN(0xc7ca3067, 0x85c9a2db), TOBN(0xd6ae5152, 0x6be8606f),
+              TOBN(0x09dbcae6, 0xe14c651d), TOBN(0xc9536e23, 0x9bc32f96),
+              TOBN(0xa90535a9, 0x34521b03), TOBN(0xf39c526c, 0x878756ff),
+              TOBN(0x383172ec, 0x8aedf03c), TOBN(0x20a8075e, 0xefe0c034),
+              TOBN(0xf22f9c62, 0x64026422), TOBN(0x8dd10780, 0x24b9d076),
+              TOBN(0x944c742a, 0x3bef2950), TOBN(0x55b9502e, 0x88a2b00b),
+              TOBN(0xa59e14b4, 0x86a09817), TOBN(0xa39dd3ac, 0x47bb4071),
+              TOBN(0x55137f66, 0x3be0592f), TOBN(0x07fcafd4, 0xc9e63f5b),
+              TOBN(0x963652ee, 0x346eb226), TOBN(0x7dfab085, 0xec2facb7),
+              TOBN(0x273bf2b8, 0x691add26), TOBN(0x30d74540, 0xf2b46c44),
+              TOBN(0x05e8e73e, 0xf2c2d065), TOBN(0xff9b8a00, 0xd42eeac9),
+              TOBN(0x2fcbd205, 0x97209d22), TOBN(0xeb740ffa, 0xde14ea2c),
+              TOBN(0xc71ff913, 0xa8aef518), TOBN(0x7bfc74bb, 0xfff4cfa2),
+              TOBN(0x1716680c, 0xb6b36048), TOBN(0x121b2cce, 0x9ef79af1),
+              TOBN(0xbff3c836, 0xa01eb3d3), TOBN(0x50eb1c6a, 0x5f79077b),
+              TOBN(0xa48c32d6, 0xa004bbcf), TOBN(0x47a59316, 0x7d64f61d),
+              TOBN(0x6068147f, 0x93102016), TOBN(0x12c5f654, 0x94d12576),
+              TOBN(0xefb071a7, 0xc9bc6b91), TOBN(0x7c2da0c5, 0x6e23ea95),
+              TOBN(0xf4fd45b6, 0xd4a1dd5d), TOBN(0x3e7ad9b6, 0x9122b13c),
+              TOBN(0x342ca118, 0xe6f57a48), TOBN(0x1c2e94a7, 0x06f8288f),
+              TOBN(0x99e68f07, 0x5a97d231), TOBN(0x7c80de97, 0x4d838758),
+              TOBN(0xbce0f5d0, 0x05872727), TOBN(0xbe5d95c2, 0x19c4d016),
+              TOBN(0x921d5cb1, 0x9c2492ee), TOBN(0x42192dc1, 0x404d6fb3),
+              TOBN(0x4c84dcd1, 0x32f988d3), TOBN(0xde26d61f, 0xa17b8e85),
+              TOBN(0xc466dcb6, 0x137c7408), TOBN(0x9a38d7b6, 0x36a266da),
+              TOBN(0x7ef5cb06, 0x83bebf1b), TOBN(0xe5cdcbbf, 0x0fd014e3),
+              TOBN(0x30aa376d, 0xf65965a0), TOBN(0x60fe88c2, 0xebb3e95e),
+              TOBN(0x33fd0b61, 0x66ee6f20), TOBN(0x8827dcdb, 0x3f41f0a0),
+              TOBN(0xbf8a9d24, 0x0c56c690), TOBN(0x40265dad, 0xddb7641d),
+              TOBN(0x522b05bf, 0x3a6b662b), TOBN(0x466d1dfe, 0xb1478c9b),
+              TOBN(0xaa616962, 0x1484469b), TOBN(0x0db60549, 0x02df8f9f),
+              TOBN(0xc37bca02, 0x3cb8bf51), TOBN(0x5effe346, 0x21371ce8),
+              TOBN(0xe8f65264, 0xff112c32), TOBN(0x8a9c736d, 0x7b971fb2),
+              TOBN(0xa4f19470, 0x7b75080d), TOBN(0xfc3f2c5a, 0x8839c59b),
+              TOBN(0x1d6c777e, 0x5aeb49c2), TOBN(0xf3db034d, 0xda1addfe),
+              TOBN(0xd76fee5a, 0x5535affc), TOBN(0x0853ac70, 0xb92251fd),
+              TOBN(0x37e3d594, 0x8b2a29d5), TOBN(0x28f1f457, 0x4de00ddb),
+              TOBN(0x8083c1b5, 0xf42c328b), TOBN(0xd8ef1d8f, 0xe493c73b),
+              TOBN(0x96fb6260, 0x41dc61bd), TOBN(0xf74e8a9d, 0x27ee2f8a),
+              TOBN(0x7c605a80, 0x2c946a5d), TOBN(0xeed48d65, 0x3839ccfd),
+              TOBN(0x9894344f, 0x3a29467a), TOBN(0xde81e949, 0xc51eba6d),
+              TOBN(0xdaea066b, 0xa5e5c2f2), TOBN(0x3fc8a614, 0x08c8c7b3),
+              TOBN(0x7adff88f, 0x06d0de9f), TOBN(0xbbc11cf5, 0x3b75ce0a),
+              TOBN(0x9fbb7acc, 0xfbbc87d5), TOBN(0xa1458e26, 0x7badfde2) },
+          {
+              TOBN(0x1cb43668, 0xe039c256),
+              TOBN(0x5f26fb8b, 0x7c17fd5d),
+              TOBN(0xeee426af, 0x79aa062b),
+              TOBN(0x072002d0, 0xd78fbf04),
+              TOBN(0x4c9ca237, 0xe84fb7e3),
+              TOBN(0xb401d8a1, 0x0c82133d),
+              TOBN(0xaaa52592, 0x6d7e4181),
+              TOBN(0xe9430833, 0x73dbb152),
+              TOBN(0xf92dda31, 0xbe24319a),
+              TOBN(0x03f7d28b, 0xe095a8e7),
+              TOBN(0xa52fe840, 0x98782185),
+              TOBN(0x276ddafe, 0x29c24dbc),
+              TOBN(0x80cd5496, 0x1d7a64eb),
+              TOBN(0xe4360889, 0x7f1dbe42),
+              TOBN(0x2f81a877, 0x8438d2d5),
+              TOBN(0x7e4d52a8, 0x85169036),
+              TOBN(0x19e3d5b1, 0x1d59715d),
+              TOBN(0xc7eaa762, 0xd788983e),
+              TOBN(0xe5a730b0, 0xabf1f248),
+              TOBN(0xfbab8084, 0xfae3fd83),
+              TOBN(0x65e50d21, 0x53765b2f),
+              TOBN(0xbdd4e083, 0xfa127f3d),
+              TOBN(0x9cf3c074, 0x397b1b10),
+              TOBN(0x59f8090c, 0xb1b59fd3),
+              TOBN(0x7b15fd9d, 0x615faa8f),
+              TOBN(0x8fa1eb40, 0x968554ed),
+              TOBN(0x7bb4447e, 0x7aa44882),
+              TOBN(0x2bb2d0d1, 0x029fff32),
+              TOBN(0x075e2a64, 0x6caa6d2f),
+              TOBN(0x8eb879de, 0x22e7351b),
+              TOBN(0xbcd5624e, 0x9a506c62),
+              TOBN(0x218eaef0, 0xa87e24dc),
+              TOBN(0x37e56847, 0x44ddfa35),
+              TOBN(0x9ccfc5c5, 0xdab3f747),
+              TOBN(0x9ac1df3f, 0x1ee96cf4),
+              TOBN(0x0c0571a1, 0x3b480b8f),
+              TOBN(0x2fbeb3d5, 0x4b3a7b3c),
+              TOBN(0x35c03669, 0x5dcdbb99),
+              TOBN(0x52a0f5dc, 0xb2415b3a),
+              TOBN(0xd57759b4, 0x4413ed9a),
+              TOBN(0x1fe647d8, 0x3d30a2c5),
+              TOBN(0x0857f77e, 0xf78a81dc),
+              TOBN(0x11d5a334, 0x131a4a9b),
+              TOBN(0xc0a94af9, 0x29d393f5),
+              TOBN(0xbc3a5c0b, 0xdaa6ec1a),
+              TOBN(0xba9fe493, 0x88d2d7ed),
+              TOBN(0xbb4335b4, 0xbb614797),
+              TOBN(0x991c4d68, 0x72f83533),
+              TOBN(0x53258c28, 0xd2f01cb3),
+              TOBN(0x93d6eaa3, 0xd75db0b1),
+              TOBN(0x419a2b0d, 0xe87d0db4),
+              TOBN(0xa1e48f03, 0xd8fe8493),
+              TOBN(0xf747faf6, 0xc508b23a),
+              TOBN(0xf137571a, 0x35d53549),
+              TOBN(0x9f5e58e2, 0xfcf9b838),
+              TOBN(0xc7186cee, 0xa7fd3cf5),
+              TOBN(0x77b868ce, 0xe978a1d3),
+              TOBN(0xe3a68b33, 0x7ab92d04),
+              TOBN(0x51029794, 0x87a5b862),
+              TOBN(0x5f0606c3, 0x3a61d41d),
+              TOBN(0x2814be27, 0x6f9326f1),
+              TOBN(0x2f521c14, 0xc6fe3c2e),
+              TOBN(0x17464d7d, 0xacdf7351),
+              TOBN(0x10f5f9d3, 0x777f7e44),
+              TOBN(0xce8e616b, 0x269fb37d),
+              TOBN(0xaaf73804, 0x7de62de5),
+              TOBN(0xaba11175, 0x4fdd4153),
+              TOBN(0x515759ba, 0x3770b49b),
+              TOBN(0x8b09ebf8, 0xaa423a61),
+              TOBN(0x592245a1, 0xcd41fb92),
+              TOBN(0x1cba8ec1, 0x9b4c8936),
+              TOBN(0xa87e91e3, 0xaf36710e),
+              TOBN(0x1fd84ce4, 0x3d34a2e3),
+              TOBN(0xee3759ce, 0xb43b5d61),
+              TOBN(0x895bc78c, 0x619186c7),
+              TOBN(0xf19c3809, 0xcbb9725a),
+              TOBN(0xc0be21aa, 0xde744b1f),
+              TOBN(0xa7d222b0, 0x60f8056b),
+              TOBN(0x74be6157, 0xb23efe11),
+              TOBN(0x6fab2b4f, 0x0cd68253),
+              TOBN(0xad33ea5f, 0x4bf1d725),
+              TOBN(0x9c1d8ee2, 0x4f6c950f),
+              TOBN(0x544ee78a, 0xa377af06),
+              TOBN(0x54f489bb, 0x94a113e1),
+              TOBN(0x8f11d634, 0x992fb7e8),
+              TOBN(0x0169a7aa, 0xa2a44347),
+              TOBN(0x1d49d4af, 0x95020e00),
+              TOBN(0x95945722, 0xe08e120b),
+              TOBN(0xb6e33878, 0xa4d32282),
+              TOBN(0xe36e029d, 0x48020ae7),
+              TOBN(0xe05847fb, 0x37a9b750),
+              TOBN(0xf876812c, 0xb29e3819),
+              TOBN(0x84ad138e, 0xd23a17f0),
+              TOBN(0x6d7b4480, 0xf0b3950e),
+              TOBN(0xdfa8aef4, 0x2fd67ae0),
+              TOBN(0x8d3eea24, 0x52333af6),
+              TOBN(0x0d052075, 0xb15d5acc),
+              TOBN(0xc6d9c79f, 0xbd815bc4),
+              TOBN(0x8dcafd88, 0xdfa36cf2),
+              TOBN(0x908ccbe2, 0x38aa9070),
+              TOBN(0x638722c4, 0xba35afce),
+              TOBN(0x5a3da8b0, 0xfd6abf0b),
+              TOBN(0x2dce252c, 0xc9c335c1),
+              TOBN(0x84e7f0de, 0x65aa799b),
+              TOBN(0x2101a522, 0xb99a72cb),
+              TOBN(0x06de6e67, 0x87618016),
+              TOBN(0x5ff8c7cd, 0xe6f3653e),
+              TOBN(0x0a821ab5, 0xc7a6754a),
+              TOBN(0x7e3fa52b, 0x7cb0b5a2),
+              TOBN(0xa7fb121c, 0xc9048790),
+              TOBN(0x1a725020, 0x06ce053a),
+              TOBN(0xb490a31f, 0x04e929b0),
+              TOBN(0xe17be47d, 0x62dd61ad),
+              TOBN(0x781a961c, 0x6be01371),
+              TOBN(0x1063bfd3, 0xdae3cbba),
+              TOBN(0x35647406, 0x7f73c9ba),
+              TOBN(0xf50e957b, 0x2736a129),
+              TOBN(0xa6313702, 0xed13f256),
+              TOBN(0x9436ee65, 0x3a19fcc5),
+              TOBN(0xcf2bdb29, 0xe7a4c8b6),
+              TOBN(0xb06b1244, 0xc5f95cd8),
+              TOBN(0xda8c8af0, 0xf4ab95f4),
+              TOBN(0x1bae59c2, 0xb9e5836d),
+              TOBN(0x07d51e7e, 0x3acffffc),
+              TOBN(0x01e15e6a, 0xc2ccbcda),
+              TOBN(0x3bc1923f, 0x8528c3e0),
+              TOBN(0x43324577, 0xa49fead4),
+              TOBN(0x61a1b884, 0x2aa7a711),
+              TOBN(0xf9a86e08, 0x700230ef),
+              TOBN(0x0af585a1, 0xbd19adf8),
+              TOBN(0x7645f361, 0xf55ad8f2),
+              TOBN(0x6e676223, 0x46c3614c),
+              TOBN(0x23cb257c, 0x4e774d3f),
+              TOBN(0x82a38513, 0xac102d1b),
+              TOBN(0x9bcddd88, 0x7b126aa5),
+              TOBN(0xe716998b, 0xeefd3ee4),
+              TOBN(0x4239d571, 0xfb167583),
+              TOBN(0xdd011c78, 0xd16c8f8a),
+              TOBN(0x271c2895, 0x69a27519),
+              TOBN(0x9ce0a3b7, 0xd2d64b6a),
+              TOBN(0x8c977289, 0xd5ec6738),
+              TOBN(0xa3b49f9a, 0x8840ef6b),
+              TOBN(0x808c14c9, 0x9a453419),
+              TOBN(0x5c00295b, 0x0cf0a2d5),
+              TOBN(0x524414fb, 0x1d4bcc76),
+              TOBN(0xb07691d2, 0x459a88f1),
+              TOBN(0x77f43263, 0xf70d110f),
+              TOBN(0x64ada5e0, 0xb7abf9f3),
+              TOBN(0xafd0f94e, 0x5b544cf5),
+              TOBN(0xb4a13a15, 0xfd2713fe),
+              TOBN(0xb99b7d6e, 0x250c74f4),
+              TOBN(0x097f2f73, 0x20324e45),
+              TOBN(0x994b37d8, 0xaffa8208),
+              TOBN(0xc3c31b0b, 0xdc29aafc),
+              TOBN(0x3da74651, 0x7a3a607f),
+              TOBN(0xd8e1b8c1, 0xfe6955d6),
+              TOBN(0x716e1815, 0xc8418682),
+              TOBN(0x541d487f, 0x7dc91d97),
+              TOBN(0x48a04669, 0xc6996982),
+              TOBN(0xf39cab15, 0x83a6502e),
+              TOBN(0x025801a0, 0xe68db055),
+              TOBN(0xf3569758, 0xba3338d5),
+              TOBN(0xb0c8c0aa, 0xee2afa84),
+              TOBN(0x4f6985d3, 0xfb6562d1),
+              TOBN(0x351f1f15, 0x132ed17a),
+              TOBN(0x510ed0b4, 0xc04365fe),
+              TOBN(0xa3f98138, 0xe5b1f066),
+              TOBN(0xbc9d95d6, 0x32df03dc),
+              TOBN(0xa83ccf6e, 0x19abd09e),
+              TOBN(0x0b4097c1, 0x4ff17edb),
+              TOBN(0x58a5c478, 0xd64a06ce),
+              TOBN(0x2ddcc3fd, 0x544a58fd),
+              TOBN(0xd449503d, 0x9e8153b8),
+              TOBN(0x3324fd02, 0x7774179b),
+              TOBN(0xaf5d47c8, 0xdbd9120c),
+              TOBN(0xeb860162, 0x34fa94db),
+              TOBN(0x5817bdd1, 0x972f07f4),
+              TOBN(0xe5579e2e, 0xd27bbceb),
+              TOBN(0x86847a1f, 0x5f11e5a6),
+              TOBN(0xb39ed255, 0x7c3cf048),
+              TOBN(0xe1076417, 0xa2f62e55),
+              TOBN(0x6b9ab38f, 0x1bcf82a2),
+              TOBN(0x4bb7c319, 0x7aeb29f9),
+              TOBN(0xf6d17da3, 0x17227a46),
+              TOBN(0xab53ddbd, 0x0f968c00),
+              TOBN(0xa03da7ec, 0x000c880b),
+              TOBN(0x7b239624, 0x6a9ad24d),
+              TOBN(0x612c0401, 0x01ec60d0),
+              TOBN(0x70d10493, 0x109f5df1),
+              TOBN(0xfbda4030, 0x80af7550),
+              TOBN(0x30b93f95, 0xc6b9a9b3),
+              TOBN(0x0c74ec71, 0x007d9418),
+              TOBN(0x94175564, 0x6edb951f),
+              TOBN(0x5f4a9d78, 0x7f22c282),
+              TOBN(0xb7870895, 0xb38d1196),
+              TOBN(0xbc593df3, 0xa228ce7c),
+              TOBN(0xc78c5bd4, 0x6af3641a),
+              TOBN(0x7802200b, 0x3d9b3dcc),
+              TOBN(0x0dc73f32, 0x8be33304),
+              TOBN(0x847ed87d, 0x61ffb79a),
+              TOBN(0xf85c974e, 0x6d671192),
+              TOBN(0x1e14100a, 0xde16f60f),
+              TOBN(0x45cb0d5a, 0x95c38797),
+              TOBN(0x18923bba, 0x9b022da4),
+              TOBN(0xef2be899, 0xbbe7e86e),
+              TOBN(0x4a1510ee, 0x216067bf),
+              TOBN(0xd98c8154, 0x84d5ce3e),
+              TOBN(0x1af777f0, 0xf92a2b90),
+              TOBN(0x9fbcb400, 0x4ef65724),
+              TOBN(0x3e04a4c9, 0x3c0ca6fe),
+              TOBN(0xfb3e2cb5, 0x55002994),
+              TOBN(0x1f3a93c5, 0x5363ecab),
+              TOBN(0x1fe00efe, 0x3923555b),
+              TOBN(0x744bedd9, 0x1e1751ea),
+              TOBN(0x3fb2db59, 0x6ab69357),
+              TOBN(0x8dbd7365, 0xf5e6618b),
+              TOBN(0x99d53099, 0xdf1ea40e),
+              TOBN(0xb3f24a0b, 0x57d61e64),
+              TOBN(0xd088a198, 0x596eb812),
+              TOBN(0x22c8361b, 0x5762940b),
+              TOBN(0x66f01f97, 0xf9c0d95c),
+              TOBN(0x88461172, 0x8e43cdae),
+              TOBN(0x11599a7f, 0xb72b15c3),
+              TOBN(0x135a7536, 0x420d95cc),
+              TOBN(0x2dcdf0f7, 0x5f7ae2f6),
+              TOBN(0x15fc6e1d, 0xd7fa6da2),
+              TOBN(0x81ca829a, 0xd1d441b6),
+              TOBN(0x84c10cf8, 0x04a106b6),
+              TOBN(0xa9b26c95, 0xa73fbbd0),
+              TOBN(0x7f24e0cb, 0x4d8f6ee8),
+              TOBN(0x48b45937, 0x1e25a043),
+              TOBN(0xf8a74fca, 0x036f3dfe),
+              TOBN(0x1ed46585, 0xc9f84296),
+              TOBN(0x7fbaa8fb, 0x3bc278b0),
+              TOBN(0xa8e96cd4, 0x6c4fcbd0),
+              TOBN(0x940a1202, 0x73b60a5f),
+              TOBN(0x34aae120, 0x55a4aec8),
+              TOBN(0x550e9a74, 0xdbd742f0),
+              TOBN(0x794456d7, 0x228c68ab),
+              TOBN(0x492f8868, 0xa4e25ec6),
+              TOBN(0x682915ad, 0xb2d8f398),
+              TOBN(0xf13b51cc, 0x5b84c953),
+              TOBN(0xcda90ab8, 0x5bb917d6),
+              TOBN(0x4b615560, 0x4ea3dee1),
+              TOBN(0x578b4e85, 0x0a52c1c8),
+              TOBN(0xeab1a695, 0x20b75fc4),
+              TOBN(0x60c14f3c, 0xaa0bb3c6),
+              TOBN(0x220f448a, 0xb8216094),
+              TOBN(0x4fe7ee31, 0xb0e63d34),
+              TOBN(0xf4600572, 0xa9e54fab),
+              TOBN(0xc0493334, 0xd5e7b5a4),
+              TOBN(0x8589fb92, 0x06d54831),
+              TOBN(0xaa70f5cc, 0x6583553a),
+              TOBN(0x0879094a, 0xe25649e5),
+              TOBN(0xcc904507, 0x10044652),
+              TOBN(0xebb0696d, 0x02541c4f),
+              TOBN(0x5a171fde, 0xb9718710),
+              TOBN(0x38f1bed8, 0xf374a9f5),
+              TOBN(0xc8c582e1, 0xba39bdc1),
+              TOBN(0xfc457b0a, 0x908cc0ce),
+              TOBN(0x9a187fd4, 0x883841e2),
+              TOBN(0x8ec25b39, 0x38725381),
+              TOBN(0x2553ed05, 0x96f84395),
+              TOBN(0x095c7661, 0x6f6c6897),
+              TOBN(0x917ac85c, 0x4bdc5610),
+              TOBN(0xb2885fe4, 0x179eb301),
+              TOBN(0x5fc65547, 0x8b78bdcc),
+              TOBN(0x4a9fc893, 0xe59e4699),
+              TOBN(0xbb7ff0cd, 0x3ce299af),
+              TOBN(0x195be9b3, 0xadf38b20),
+              TOBN(0x6a929c87, 0xd38ddb8f),
+              TOBN(0x55fcc99c, 0xb21a51b9),
+              TOBN(0x2b695b4c, 0x721a4593),
+              TOBN(0xed1e9a15, 0x768eaac2),
+              TOBN(0xfb63d71c, 0x7489f914),
+              TOBN(0xf98ba31c, 0x78118910),
+              TOBN(0x80291373, 0x9b128eb4),
+              TOBN(0x7801214e, 0xd448af4a),
+              TOBN(0xdbd2e22b, 0x55418dd3),
+              TOBN(0xeffb3c0d, 0xd3998242),
+              TOBN(0xdfa6077c, 0xc7bf3827),
+              TOBN(0xf2165bcb, 0x47f8238f),
+              TOBN(0xfe37cf68, 0x8564d554),
+              TOBN(0xe5f825c4, 0x0a81fb98),
+              TOBN(0x43cc4f67, 0xffed4d6f),
+              TOBN(0xbc609578, 0xb50a34b0),
+              TOBN(0x8aa8fcf9, 0x5041faf1),
+              TOBN(0x5659f053, 0x651773b6),
+              TOBN(0xe87582c3, 0x6044d63b),
+              TOBN(0xa6089409, 0x0cdb0ca0),
+              TOBN(0x8c993e0f, 0xbfb2bcf6),
+              TOBN(0xfc64a719, 0x45985cfc),
+              TOBN(0x15c4da80, 0x83dbedba),
+              TOBN(0x804ae112, 0x2be67df7),
+              TOBN(0xda4c9658, 0xa23defde),
+              TOBN(0x12002ddd, 0x5156e0d3),
+              TOBN(0xe68eae89, 0x5dd21b96),
+              TOBN(0x8b99f28b, 0xcf44624d),
+              TOBN(0x0ae00808, 0x1ec8897a),
+              TOBN(0xdd0a9303, 0x6712f76e),
+              TOBN(0x96237522, 0x4e233de4),
+              TOBN(0x192445b1, 0x2b36a8a5),
+              TOBN(0xabf9ff74, 0x023993d9),
+              TOBN(0x21f37bf4, 0x2aad4a8f),
+              TOBN(0x340a4349, 0xf8bd2bbd),
+              TOBN(0x1d902cd9, 0x4868195d),
+              TOBN(0x3d27bbf1, 0xe5fdb6f1),
+              TOBN(0x7a5ab088, 0x124f9f1c),
+              TOBN(0xc466ab06, 0xf7a09e03),
+              TOBN(0x2f8a1977, 0x31f2c123),
+              TOBN(0xda355dc7, 0x041b6657),
+              TOBN(0xcb840d12, 0x8ece2a7c),
+              TOBN(0xb600ad9f, 0x7db32675),
+              TOBN(0x78fea133, 0x07a06f1b),
+              TOBN(0x5d032269, 0xb31f6094),
+              TOBN(0x07753ef5, 0x83ec37aa),
+              TOBN(0x03485aed, 0x9c0bea78),
+              TOBN(0x41bb3989, 0xbc3f4524),
+              TOBN(0x09403761, 0x697f726d),
+              TOBN(0x6109beb3, 0xdf394820),
+              TOBN(0x804111ea, 0x3b6d1145),
+              TOBN(0xb6271ea9, 0xa8582654),
+              TOBN(0x619615e6, 0x24e66562),
+              TOBN(0xa2554945, 0xd7b6ad9c),
+              TOBN(0xd9c4985e, 0x99bfe35f),
+              TOBN(0x9770ccc0, 0x7b51cdf6),
+              TOBN(0x7c327013, 0x92881832),
+              TOBN(0x8777d45f, 0x286b26d1),
+              TOBN(0x9bbeda22, 0xd847999d),
+              TOBN(0x03aa33b6, 0xc3525d32),
+              TOBN(0x4b7b96d4, 0x28a959a1),
+              TOBN(0xbb3786e5, 0x31e5d234),
+              TOBN(0xaeb5d3ce, 0x6961f247),
+              TOBN(0x20aa85af, 0x02f93d3f),
+              TOBN(0x9cd1ad3d, 0xd7a7ae4f),
+              TOBN(0xbf6688f0, 0x781adaa8),
+              TOBN(0xb1b40e86, 0x7469cead),
+              TOBN(0x1904c524, 0x309fca48),
+              TOBN(0x9b7312af, 0x4b54bbc7),
+              TOBN(0xbe24bf8f, 0x593affa2),
+              TOBN(0xbe5e0790, 0xbd98764b),
+              TOBN(0xa0f45f17, 0xa26e299e),
+              TOBN(0x4af0d2c2, 0x6b8fe4c7),
+              TOBN(0xef170db1, 0x8ae8a3e6),
+              TOBN(0x0e8d61a0, 0x29e0ccc1),
+              TOBN(0xcd53e87e, 0x60ad36ca),
+              TOBN(0x328c6623, 0xc8173822),
+              TOBN(0x7ee1767d, 0xa496be55),
+              TOBN(0x89f13259, 0x648945af),
+              TOBN(0x9e45a5fd, 0x25c8009c),
+              TOBN(0xaf2febd9, 0x1f61ab8c),
+              TOBN(0x43f6bc86, 0x8a275385),
+              TOBN(0x87792348, 0xf2142e79),
+              TOBN(0x17d89259, 0xc6e6238a),
+              TOBN(0x7536d2f6, 0x4a839d9b),
+              TOBN(0x1f428fce, 0x76a1fbdc),
+              TOBN(0x1c109601, 0x0db06dfe),
+              TOBN(0xbfc16bc1, 0x50a3a3cc),
+              TOBN(0xf9cbd9ec, 0x9b30f41b),
+              TOBN(0x5b5da0d6, 0x00138cce),
+              TOBN(0xec1d0a48, 0x56ef96a7),
+              TOBN(0xb47eb848, 0x982bf842),
+              TOBN(0x66deae32, 0xec3f700d),
+              TOBN(0x4e43c42c, 0xaa1181e0),
+              TOBN(0xa1d72a31, 0xd1a4aa2a),
+              TOBN(0x440d4668, 0xc004f3ce),
+              TOBN(0x0d6a2d3b, 0x45fe8a7a),
+              TOBN(0x820e52e2, 0xfb128365),
+              TOBN(0x29ac5fcf, 0x25e51b09),
+              TOBN(0x180cd2bf, 0x2023d159),
+              TOBN(0xa9892171, 0xa1ebf90e),
+              TOBN(0xf97c4c87, 0x7c132181),
+              TOBN(0x9f1dc724, 0xc03dbb7e),
+              TOBN(0xae043765, 0x018cbbe4),
+              TOBN(0xfb0b2a36, 0x0767d153),
+              TOBN(0xa8e2f4d6, 0x249cbaeb),
+              TOBN(0x172a5247, 0xd95ea168),
+              TOBN(0x1758fada, 0x2970764a),
+              TOBN(0xac803a51, 0x1d978169),
+              TOBN(0x299cfe2e, 0xde77e01b),
+              TOBN(0x652a1e17, 0xb0a98927),
+              TOBN(0x2e26e1d1, 0x20014495),
+              TOBN(0x7ae0af9f, 0x7175b56a),
+              TOBN(0xc2e22a80, 0xd64b9f95),
+              TOBN(0x4d0ff9fb, 0xd90a060a),
+              TOBN(0x496a27db, 0xbaf38085),
+              TOBN(0x32305401, 0xda776bcf),
+              TOBN(0xb8cdcef6, 0x725f209e),
+              TOBN(0x61ba0f37, 0x436a0bba),
+              TOBN(0x263fa108, 0x76860049),
+              TOBN(0x92beb98e, 0xda3542cf),
+              TOBN(0xa2d4d14a, 0xd5849538),
+              TOBN(0x989b9d68, 0x12e9a1bc),
+              TOBN(0x61d9075c, 0x5f6e3268),
+              TOBN(0x352c6aa9, 0x99ace638),
+              TOBN(0xde4e4a55, 0x920f43ff),
+              TOBN(0xe5e4144a, 0xd673c017),
+              TOBN(0x667417ae, 0x6f6e05ea),
+              TOBN(0x613416ae, 0xdcd1bd56),
+              TOBN(0x5eb36201, 0x86693711),
+              TOBN(0x2d7bc504, 0x3a1aa914),
+              TOBN(0x175a1299, 0x76dc5975),
+              TOBN(0xe900e0f2, 0x3fc8125c),
+              TOBN(0x569ef68c, 0x11198875),
+              TOBN(0x9012db63, 0x63a113b4),
+              TOBN(0xe3bd3f56, 0x98835766),
+              TOBN(0xa5c94a52, 0x76412dea),
+              TOBN(0xad9e2a09, 0xaa735e5c),
+              TOBN(0x405a984c, 0x508b65e9),
+              TOBN(0xbde4a1d1, 0x6df1a0d1),
+              TOBN(0x1a9433a1, 0xdfba80da),
+              TOBN(0xe9192ff9, 0x9440ad2e),
+              TOBN(0x9f649696, 0x5099fe92),
+              TOBN(0x25ddb65c, 0x0b27a54a),
+              TOBN(0x178279dd, 0xc590da61),
+              TOBN(0x5479a999, 0xfbde681a),
+              TOBN(0xd0e84e05, 0x013fe162),
+              TOBN(0xbe11dc92, 0x632d471b),
+              TOBN(0xdf0b0c45, 0xfc0e089f),
+              TOBN(0x04fb15b0, 0x4c144025),
+              TOBN(0xa61d5fc2, 0x13c99927),
+              TOBN(0xa033e9e0, 0x3de2eb35),
+              TOBN(0xf8185d5c, 0xb8dacbb4),
+              TOBN(0x9a88e265, 0x8644549d),
+              TOBN(0xf717af62, 0x54671ff6),
+              TOBN(0x4bd4241b, 0x5fa58603),
+              TOBN(0x06fba40b, 0xe67773c0),
+              TOBN(0xc1d933d2, 0x6a2847e9),
+              TOBN(0xf4f5acf3, 0x689e2c70),
+              TOBN(0x92aab0e7, 0x46bafd31),
+              TOBN(0x798d76aa, 0x3473f6e5),
+              TOBN(0xcc6641db, 0x93141934),
+              TOBN(0xcae27757, 0xd31e535e),
+              TOBN(0x04cc43b6, 0x87c2ee11),
+              TOBN(0x8d1f9675, 0x2e029ffa),
+              TOBN(0xc2150672, 0xe4cc7a2c),
+              TOBN(0x3b03c1e0, 0x8d68b013),
+              TOBN(0xa9d6816f, 0xedf298f3),
+              TOBN(0x1bfbb529, 0xa2804464),
+              TOBN(0x95a52fae, 0x5db22125),
+              TOBN(0x55b32160, 0x0e1cb64e),
+              TOBN(0x004828f6, 0x7e7fc9fe),
+              TOBN(0x13394b82, 0x1bb0fb93),
+              TOBN(0xb6293a2d, 0x35f1a920),
+              TOBN(0xde35ef21, 0xd145d2d9),
+              TOBN(0xbe6225b3, 0xbb8fa603),
+              TOBN(0x00fc8f6b, 0x32cf252d),
+              TOBN(0xa28e52e6, 0x117cf8c2),
+              TOBN(0x9d1dc89b, 0x4c371e6d),
+              TOBN(0xcebe0675, 0x36ef0f28),
+              TOBN(0x5de05d09, 0xa4292f81),
+              TOBN(0xa8303593, 0x353e3083),
+              TOBN(0xa1715b0a, 0x7e37a9bb),
+              TOBN(0x8c56f61e, 0x2b8faec3),
+              TOBN(0x52507431, 0x33c9b102),
+              TOBN(0x0130cefc, 0xa44431f0),
+              TOBN(0x56039fa0, 0xbd865cfb),
+              TOBN(0x4b03e578, 0xbc5f1dd7),
+              TOBN(0x40edf2e4, 0xbabe7224),
+              TOBN(0xc752496d, 0x3a1988f6),
+              TOBN(0xd1572d3b, 0x564beb6b),
+              TOBN(0x0db1d110, 0x39a1c608),
+              TOBN(0x568d1934, 0x16f60126),
+              TOBN(0x05ae9668, 0xf354af33),
+              TOBN(0x19de6d37, 0xc92544f2),
+              TOBN(0xcc084353, 0xa35837d5),
+              TOBN(0xcbb6869c, 0x1a514ece),
+              TOBN(0xb633e728, 0x2e1d1066),
+              TOBN(0xf15dd69f, 0x936c581c),
+              TOBN(0x96e7b8ce, 0x7439c4f9),
+              TOBN(0x5e676f48, 0x2e448a5b),
+              TOBN(0xb2ca7d5b, 0xfd916bbb),
+              TOBN(0xd55a2541, 0xf5024025),
+              TOBN(0x47bc5769, 0xe4c2d937),
+              TOBN(0x7d31b92a, 0x0362189f),
+              TOBN(0x83f3086e, 0xef7816f9),
+              TOBN(0xf9f46d94, 0xb587579a),
+              TOBN(0xec2d22d8, 0x30e76c5f),
+              TOBN(0x27d57461, 0xb000ffcf),
+              TOBN(0xbb7e65f9, 0x364ffc2c),
+              TOBN(0x7c7c9477, 0x6652a220),
+              TOBN(0x61618f89, 0xd696c981),
+              TOBN(0x5021701d, 0x89effff3),
+              TOBN(0xf2c8ff8e, 0x7c314163),
+              TOBN(0x2da413ad, 0x8efb4d3e),
+              TOBN(0x937b5adf, 0xce176d95),
+              TOBN(0x22867d34, 0x2a67d51c),
+              TOBN(0x262b9b10, 0x18eb3ac9),
+              TOBN(0x4e314fe4, 0xc43ff28b),
+              TOBN(0x76476627, 0x6a664e7a),
+              TOBN(0x3e90e40b, 0xb7a565c2),
+              TOBN(0x8588993a, 0xc1acf831),
+              TOBN(0xd7b501d6, 0x8f938829),
+              TOBN(0x996627ee, 0x3edd7d4c),
+              TOBN(0x37d44a62, 0x90cd34c7),
+              TOBN(0xa8327499, 0xf3833e8d),
+              TOBN(0x2e18917d, 0x4bf50353),
+              TOBN(0x85dd726b, 0x556765fb),
+              TOBN(0x54fe65d6, 0x93d5ab66),
+              TOBN(0x3ddbaced, 0x915c25fe),
+              TOBN(0xa799d9a4, 0x12f22e85),
+              TOBN(0xe2a24867, 0x6d06f6bc),
+              TOBN(0xf4f1ee56, 0x43ca1637),
+              TOBN(0xfda2828b, 0x61ece30a),
+              TOBN(0x758c1a3e, 0xa2dee7a6),
+              TOBN(0xdcde2f3c, 0x734b2284),
+              TOBN(0xaba445d2, 0x4eaba6ad),
+              TOBN(0x35aaf668, 0x76cee0a7),
+              TOBN(0x7e0b04a9, 0xe5aa049a),
+              TOBN(0xe74083ad, 0x91103e84),
+              TOBN(0xbeb183ce, 0x40afecc3),
+              TOBN(0x6b89de9f, 0xea043f7a),
+          },
+          { TOBN(0x0e299d23, 0xfe67ba66), TOBN(0x91450760, 0x93cf2f34),
+              TOBN(0xf45b5ea9, 0x97fcf913), TOBN(0x5be00843, 0x8bd7ddda),
+              TOBN(0x358c3e05, 0xd53ff04d), TOBN(0xbf7ccdc3, 0x5de91ef7),
+              TOBN(0xad684dbf, 0xb69ec1a0), TOBN(0x367e7cf2, 0x801fd997),
+              TOBN(0x0ca1f3b7, 0xb0dc8595), TOBN(0x27de4608, 0x9f1d9f2e),
+              TOBN(0x1af3bf39, 0xbadd82a7), TOBN(0x79356a79, 0x65862448),
+              TOBN(0xc0602345, 0xf5f9a052), TOBN(0x1a8b0f89, 0x139a42f9),
+              TOBN(0xb53eee42, 0x844d40fc), TOBN(0x93b0bfe5, 0x4e5b6368),
+              TOBN(0x5434dd02, 0xc024789c), TOBN(0x90dca9ea, 0x41b57bfc),
+              TOBN(0x8aa898e2, 0x243398df), TOBN(0xf607c834, 0x894a94bb),
+              TOBN(0xbb07be97, 0xc2c99b76), TOBN(0x6576ba67, 0x18c29302),
+              TOBN(0x3d79efcc, 0xe703a88c), TOBN(0xf259ced7, 0xb6a0d106),
+              TOBN(0x0f893a5d, 0xc8de610b), TOBN(0xe8c515fb, 0x67e223ce),
+              TOBN(0x7774bfa6, 0x4ead6dc5), TOBN(0x89d20f95, 0x925c728f),
+              TOBN(0x7a1e0966, 0x098583ce), TOBN(0xa2eedb94, 0x93f2a7d7),
+              TOBN(0x1b282097, 0x4c304d4a), TOBN(0x0842e3da, 0xc077282d),
+              TOBN(0xe4d972a3, 0x3b9e2d7b), TOBN(0x7cc60b27, 0xc48218ff),
+              TOBN(0x8fc70838, 0x84149d91), TOBN(0x5c04346f, 0x2f461ecc),
+              TOBN(0xebe9fdf2, 0x614650a9), TOBN(0x5e35b537, 0xc1f666ac),
+              TOBN(0x645613d1, 0x88babc83), TOBN(0x88cace3a, 0xc5e1c93e),
+              TOBN(0x209ca375, 0x3de92e23), TOBN(0xccb03cc8, 0x5fbbb6e3),
+              TOBN(0xccb90f03, 0xd7b1487e), TOBN(0xfa9c2a38, 0xc710941f),
+              TOBN(0x756c3823, 0x6724ceed), TOBN(0x3a902258, 0x192d0323),
+              TOBN(0xb150e519, 0xea5e038e), TOBN(0xdcba2865, 0xc7427591),
+              TOBN(0xe549237f, 0x78890732), TOBN(0xc443bef9, 0x53fcb4d9),
+              TOBN(0x9884d8a6, 0xeb3480d6), TOBN(0x8a35b6a1, 0x3048b186),
+              TOBN(0xb4e44716, 0x65e9a90a), TOBN(0x45bf380d, 0x653006c0),
+              TOBN(0x8f3f820d, 0x4fe9ae3b), TOBN(0x244a35a0, 0x979a3b71),
+              TOBN(0xa1010e9d, 0x74cd06ff), TOBN(0x9c17c7df, 0xaca3eeac),
+              TOBN(0x74c86cd3, 0x8063aa2b), TOBN(0x8595c4b3, 0x734614ff),
+              TOBN(0xa3de00ca, 0x990f62cc), TOBN(0xd9bed213, 0xca0c3be5),
+              TOBN(0x7886078a, 0xdf8ce9f5), TOBN(0xddb27ce3, 0x5cd44444),
+              TOBN(0xed374a66, 0x58926ddd), TOBN(0x138b2d49, 0x908015b8),
+              TOBN(0x886c6579, 0xde1f7ab8), TOBN(0x888b9aa0, 0xc3020b7a),
+              TOBN(0xd3ec034e, 0x3a96e355), TOBN(0xba65b0b8, 0xf30fbe9a),
+              TOBN(0x064c8e50, 0xff21367a), TOBN(0x1f508ea4, 0x0b04b46e),
+              TOBN(0x98561a49, 0x747c866c), TOBN(0xbbb1e5fe, 0x0518a062),
+              TOBN(0x20ff4e8b, 0xecdc3608), TOBN(0x7f55cded, 0x20184027),
+              TOBN(0x8d73ec95, 0xf38c85f0), TOBN(0x5b589fdf, 0x8bc3b8c3),
+              TOBN(0xbe95dd98, 0x0f12b66f), TOBN(0xf5bd1a09, 0x0e338e01),
+              TOBN(0x65163ae5, 0x5e915918), TOBN(0x6158d6d9, 0x86f8a46b),
+              TOBN(0x8466b538, 0xeeebf99c), TOBN(0xca8761f6, 0xbca477ef),
+              TOBN(0xaf3449c2, 0x9ebbc601), TOBN(0xef3b0f41, 0xe0c3ae2f),
+              TOBN(0xaa6c577d, 0x5de63752), TOBN(0xe9166601, 0x64682a51),
+              TOBN(0x5a3097be, 0xfc15aa1e), TOBN(0x40d12548, 0xb54b0745),
+              TOBN(0x5bad4706, 0x519a5f12), TOBN(0xed03f717, 0xa439dee6),
+              TOBN(0x0794bb6c, 0x4a02c499), TOBN(0xf725083d, 0xcffe71d2),
+              TOBN(0x2cad7519, 0x0f3adcaf), TOBN(0x7f68ea1c, 0x43729310),
+              TOBN(0xe747c8c7, 0xb7ffd977), TOBN(0xec104c35, 0x80761a22),
+              TOBN(0x8395ebaf, 0x5a3ffb83), TOBN(0xfb3261f4, 0xe4b63db7),
+              TOBN(0x53544960, 0xd883e544), TOBN(0x13520d70, 0x8cc2eeb8),
+              TOBN(0x08f6337b, 0xd3d65f99), TOBN(0x83997db2, 0x781cf95b),
+              TOBN(0xce6ff106, 0x0dbd2c01), TOBN(0x4f8eea6b, 0x1f9ce934),
+              TOBN(0x546f7c4b, 0x0e993921), TOBN(0x6236a324, 0x5e753fc7),
+              TOBN(0x65a41f84, 0xa16022e9), TOBN(0x0c18d878, 0x43d1dbb2),
+              TOBN(0x73c55640, 0x2d4cef9c), TOBN(0xa0428108, 0x70444c74),
+              TOBN(0x68e4f15e, 0x9afdfb3c), TOBN(0x49a56143, 0x5bdfb6df),
+              TOBN(0xa9bc1bd4, 0x5f823d97), TOBN(0xbceb5970, 0xea111c2a),
+              TOBN(0x366b455f, 0xb269bbc4), TOBN(0x7cd85e1e, 0xe9bc5d62),
+              TOBN(0xc743c41c, 0x4f18b086), TOBN(0xa4b40990, 0x95294fb9),
+              TOBN(0x9c7c581d, 0x26ee8382), TOBN(0xcf17dcc5, 0x359d638e),
+              TOBN(0xee8273ab, 0xb728ae3d), TOBN(0x1d112926, 0xf821f047),
+              TOBN(0x11498477, 0x50491a74), TOBN(0x687fa761, 0xfde0dfb9),
+              TOBN(0x2c258022, 0x7ea435ab), TOBN(0x6b8bdb94, 0x91ce7e3f),
+              TOBN(0x4c5b5dc9, 0x3bf834aa), TOBN(0x04371819, 0x4f6c7e4b),
+              TOBN(0xc284e00a, 0x3736bcad), TOBN(0x0d881118, 0x21ae8f8d),
+              TOBN(0xf9cf0f82, 0xf48c8e33), TOBN(0xa11fd075, 0xa1bf40db),
+              TOBN(0xdceab0de, 0xdc2733e5), TOBN(0xc560a8b5, 0x8e986bd7),
+              TOBN(0x48dd1fe2, 0x3929d097), TOBN(0x3885b290, 0x92f188f1),
+              TOBN(0x0f2ae613, 0xda6fcdac), TOBN(0x9054303e, 0xb662a46c),
+              TOBN(0xb6871e44, 0x0738042a), TOBN(0x98e6a977, 0xbdaf6449),
+              TOBN(0xd8bc0650, 0xd1c9df1b), TOBN(0xef3d6451, 0x36e098f9),
+              TOBN(0x03fbae82, 0xb6d72d28), TOBN(0x77ca9db1, 0xf5d84080),
+              TOBN(0x8a112cff, 0xa58efc1c), TOBN(0x518d761c, 0xc564cb4a),
+              TOBN(0x69b5740e, 0xf0d1b5ce), TOBN(0x717039cc, 0xe9eb1785),
+              TOBN(0x3fe29f90, 0x22f53382), TOBN(0x8e54ba56, 0x6bc7c95c),
+              TOBN(0x9c806d8a, 0xf7f91d0f), TOBN(0x3b61b0f1, 0xa82a5728),
+              TOBN(0x4640032d, 0x94d76754), TOBN(0x273eb5de, 0x47d834c6),
+              TOBN(0x2988abf7, 0x7b4e4d53), TOBN(0xb7ce66bf, 0xde401777),
+              TOBN(0x9fba6b32, 0x715071b3), TOBN(0x82413c24, 0xad3a1a98),
+              TOBN(0x5b7fc8c4, 0xe0e8ad93), TOBN(0xb5679aee, 0x5fab868d),
+              TOBN(0xb1f9d2fa, 0x2b3946f3), TOBN(0x458897dc, 0x5685b50a),
+              TOBN(0x1e98c930, 0x89d0caf3), TOBN(0x39564c5f, 0x78642e92),
+              TOBN(0x1b77729a, 0x0dbdaf18), TOBN(0xf9170722, 0x579e82e6),
+              TOBN(0x680c0317, 0xe4515fa5), TOBN(0xf85cff84, 0xfb0c790f),
+              TOBN(0xc7a82aab, 0x6d2e0765), TOBN(0x7446bca9, 0x35c82b32),
+              TOBN(0x5de607aa, 0x6d63184f), TOBN(0x7c1a46a8, 0x262803a6),
+              TOBN(0xd218313d, 0xaebe8035), TOBN(0x92113ffd, 0xc73c51f8),
+              TOBN(0x4b38e083, 0x12e7e46c), TOBN(0x69d0a37a, 0x56126bd5),
+              TOBN(0xfb3f324b, 0x73c07e04), TOBN(0xa0c22f67, 0x8fda7267),
+              TOBN(0x8f2c0051, 0x4d2c7d8f), TOBN(0xbc45ced3, 0xcbe2cae5),
+              TOBN(0xe1c6cf07, 0xa8f0f277), TOBN(0xbc392312, 0x1eb99a98),
+              TOBN(0x75537b7e, 0x3cc8ac85), TOBN(0x8d725f57, 0xdd02753b),
+              TOBN(0xfd05ff64, 0xb737df2f), TOBN(0x55fe8712, 0xf6d2531d),
+              TOBN(0x57ce04a9, 0x6ab6b01c), TOBN(0x69a02a89, 0x7cd93724),
+              TOBN(0x4f82ac35, 0xcf86699b), TOBN(0x8242d3ad, 0x9cb4b232),
+              TOBN(0x713d0f65, 0xd62105e5), TOBN(0xbb222bfa, 0x2d29be61),
+              TOBN(0xf2f9a79e, 0x6cfbef09), TOBN(0xfc24d8d3, 0xd5d6782f),
+              TOBN(0x5db77085, 0xd4129967), TOBN(0xdb81c3cc, 0xdc3c2a43),
+              TOBN(0x9d655fc0, 0x05d8d9a3), TOBN(0x3f5d057a, 0x54298026),
+              TOBN(0x1157f56d, 0x88c54694), TOBN(0xb26baba5, 0x9b09573e),
+              TOBN(0x2cab03b0, 0x22adffd1), TOBN(0x60a412c8, 0xdd69f383),
+              TOBN(0xed76e98b, 0x54b25039), TOBN(0xd4ee67d3, 0x687e714d),
+              TOBN(0x87739648, 0x7b00b594), TOBN(0xce419775, 0xc9ef709b),
+              TOBN(0x40f76f85, 0x1c203a40), TOBN(0x30d352d6, 0xeafd8f91),
+              TOBN(0xaf196d3d, 0x95578dd2), TOBN(0xea4bb3d7, 0x77cc3f3d),
+              TOBN(0x42a5bd03, 0xb98e782b), TOBN(0xac958c40, 0x0624920d),
+              TOBN(0xb838134c, 0xfc56fcc8), TOBN(0x86ec4ccf, 0x89572e5e),
+              TOBN(0x69c43526, 0x9be47be0), TOBN(0x323b7dd8, 0xcb28fea1),
+              TOBN(0xfa5538ba, 0x3a6c67e5), TOBN(0xef921d70, 0x1d378e46),
+              TOBN(0xf92961fc, 0x3c4b880e), TOBN(0x3f6f914e, 0x98940a67),
+              TOBN(0xa990eb0a, 0xfef0ff39), TOBN(0xa6c2920f, 0xf0eeff9c),
+              TOBN(0xca804166, 0x51b8d9a3), TOBN(0x42531bc9, 0x0ffb0db1),
+              TOBN(0x72ce4718, 0xaa82e7ce), TOBN(0x6e199913, 0xdf574741),
+              TOBN(0xd5f1b13d, 0xd5d36946), TOBN(0x8255dc65, 0xf68f0194),
+              TOBN(0xdc9df4cd, 0x8710d230), TOBN(0x3453c20f, 0x138c1988),
+              TOBN(0x9af98dc0, 0x89a6ef01), TOBN(0x4dbcc3f0, 0x9857df85),
+              TOBN(0x34805601, 0x5c1ad924), TOBN(0x40448da5, 0xd0493046),
+              TOBN(0xf629926d, 0x4ee343e2), TOBN(0x6343f1bd, 0x90e8a301),
+              TOBN(0xefc93491, 0x40815b3f), TOBN(0xf882a423, 0xde8f66fb),
+              TOBN(0x3a12d5f4, 0xe7db9f57), TOBN(0x7dfba38a, 0x3c384c27),
+              TOBN(0x7a904bfd, 0x6fc660b1), TOBN(0xeb6c5db3, 0x2773b21c),
+              TOBN(0xc350ee66, 0x1cdfe049), TOBN(0x9baac0ce, 0x44540f29),
+              TOBN(0xbc57b6ab, 0xa5ec6aad), TOBN(0x167ce8c3, 0x0a7c1baa),
+              TOBN(0xb23a03a5, 0x53fb2b56), TOBN(0x6ce141e7, 0x4e057f78),
+              TOBN(0x796525c3, 0x89e490d9), TOBN(0x0bc95725, 0xa31a7e75),
+              TOBN(0x1ec56791, 0x1220fd06), TOBN(0x716e3a3c, 0x408b0bd6),
+              TOBN(0x31cd6bf7, 0xe8ebeba9), TOBN(0xa7326ca6, 0xbee6b670),
+              TOBN(0x3d9f851c, 0xcd090c43), TOBN(0x561e8f13, 0xf12c3988),
+              TOBN(0x50490b6a, 0x904b7be4), TOBN(0x61690ce1, 0x0410737b),
+              TOBN(0x299e9a37, 0x0f009052), TOBN(0x258758f0, 0xf026092e),
+              TOBN(0x9fa255f3, 0xfdfcdc0f), TOBN(0xdbc9fb1f, 0xc0e1bcd2),
+              TOBN(0x35f9dd6e, 0x24651840), TOBN(0xdca45a84, 0xa5c59abc),
+              TOBN(0x103d396f, 0xecca4938), TOBN(0x4532da0a, 0xb97b3f29),
+              TOBN(0xc4135ea5, 0x1999a6bf), TOBN(0x3aa9505a, 0x5e6bf2ee),
+              TOBN(0xf77cef06, 0x3f5be093), TOBN(0x97d1a0f8, 0xa943152e),
+              TOBN(0x2cb0ebba, 0x2e1c21dd), TOBN(0xf41b29fc, 0x2c6797c4),
+              TOBN(0xc6e17321, 0xb300101f), TOBN(0x4422b0e9, 0xd0d79a89),
+              TOBN(0x49e4901c, 0x92f1bfc4), TOBN(0x06ab1f8f, 0xe1e10ed9),
+              TOBN(0x84d35577, 0xdb2926b8), TOBN(0xca349d39, 0x356e8ec2),
+              TOBN(0x70b63d32, 0x343bf1a9), TOBN(0x8fd3bd28, 0x37d1a6b1),
+              TOBN(0x0454879c, 0x316865b4), TOBN(0xee959ff6, 0xc458efa2),
+              TOBN(0x0461dcf8, 0x9706dc3f), TOBN(0x737db0e2, 0x164e4b2e),
+              TOBN(0x09262680, 0x2f8843c8), TOBN(0x54498bbc, 0x7745e6f6),
+              TOBN(0x359473fa, 0xa29e24af), TOBN(0xfcc3c454, 0x70aa87a1),
+              TOBN(0xfd2c4bf5, 0x00573ace), TOBN(0xb65b514e, 0x28dd1965),
+              TOBN(0xe46ae7cf, 0x2193e393), TOBN(0x60e9a4e1, 0xf5444d97),
+              TOBN(0xe7594e96, 0x00ff38ed), TOBN(0x43d84d2f, 0x0a0e0f02),
+              TOBN(0x8b6db141, 0xee398a21), TOBN(0xb88a56ae, 0xe3bcc5be),
+              TOBN(0x0a1aa52f, 0x373460ea), TOBN(0x20da1a56, 0x160bb19b),
+              TOBN(0xfb54999d, 0x65bf0384), TOBN(0x71a14d24, 0x5d5a180e),
+              TOBN(0xbc44db7b, 0x21737b04), TOBN(0xd84fcb18, 0x01dd8e92),
+              TOBN(0x80de937b, 0xfa44b479), TOBN(0x53505499, 0x5c98fd4f),
+              TOBN(0x1edb12ab, 0x28f08727), TOBN(0x4c58b582, 0xa5f3ef53),
+              TOBN(0xbfb236d8, 0x8327f246), TOBN(0xc3a3bfaa, 0x4d7df320),
+              TOBN(0xecd96c59, 0xb96024f2), TOBN(0xfc293a53, 0x7f4e0433),
+              TOBN(0x5341352b, 0x5acf6e10), TOBN(0xc50343fd, 0xafe652c3),
+              TOBN(0x4af3792d, 0x18577a7f), TOBN(0xe1a4c617, 0xaf16823d),
+              TOBN(0x9b26d0cd, 0x33425d0a), TOBN(0x306399ed, 0x9b7bc47f),
+              TOBN(0x2a792f33, 0x706bb20b), TOBN(0x31219614, 0x98111055),
+              TOBN(0x864ec064, 0x87f5d28b), TOBN(0x11392d91, 0x962277fd),
+              TOBN(0xb5aa7942, 0xbb6aed5f), TOBN(0x080094dc, 0x47e799d9),
+              TOBN(0x4afa588c, 0x208ba19b), TOBN(0xd3e7570f, 0x8512f284),
+              TOBN(0xcbae64e6, 0x02f5799a), TOBN(0xdeebe7ef, 0x514b9492),
+              TOBN(0x30300f98, 0xe5c298ff), TOBN(0x17f561be, 0x3678361f),
+              TOBN(0xf52ff312, 0x98cb9a16), TOBN(0x6233c3bc, 0x5562d490),
+              TOBN(0x7bfa15a1, 0x92e3a2cb), TOBN(0x961bcfd1, 0xe6365119),
+              TOBN(0x3bdd29bf, 0x2c8c53b1), TOBN(0x739704df, 0x822844ba),
+              TOBN(0x7dacfb58, 0x7e7b754b), TOBN(0x23360791, 0xa806c9b9),
+              TOBN(0xe7eb88c9, 0x23504452), TOBN(0x2983e996, 0x852c1783),
+              TOBN(0xdd4ae529, 0x958d881d), TOBN(0x026bae03, 0x262c7b3c),
+              TOBN(0x3a6f9193, 0x960b52d1), TOBN(0xd0980f90, 0x92696cfb),
+              TOBN(0x4c1f428c, 0xd5f30851), TOBN(0x94dfed27, 0x2a4f6630),
+              TOBN(0x4df53772, 0xfc5d48a4), TOBN(0xdd2d5a2f, 0x933260ce),
+              TOBN(0x574115bd, 0xd44cc7a5), TOBN(0x4ba6b20d, 0xbd12533a),
+              TOBN(0x30e93cb8, 0x243057c9), TOBN(0x794c486a, 0x14de320e),
+              TOBN(0xe925d4ce, 0xf21496e4), TOBN(0xf951d198, 0xec696331),
+              TOBN(0x9810e2de, 0x3e8d812f), TOBN(0xd0a47259, 0x389294ab),
+              TOBN(0x513ba2b5, 0x0e3bab66), TOBN(0x462caff5, 0xabad306f),
+              TOBN(0xe2dc6d59, 0xaf04c49e), TOBN(0x1aeb8750, 0xe0b84b0b),
+              TOBN(0xc034f12f, 0x2f7d0ca2), TOBN(0x6d2e8128, 0xe06acf2f),
+              TOBN(0x801f4f83, 0x21facc2f), TOBN(0xa1170c03, 0xf40ef607),
+              TOBN(0xfe0a1d4f, 0x7805a99c), TOBN(0xbde56a36, 0xcc26aba5),
+              TOBN(0x5b1629d0, 0x35531f40), TOBN(0xac212c2b, 0x9afa6108),
+              TOBN(0x30a06bf3, 0x15697be5), TOBN(0x6f0545dc, 0x2c63c7c1),
+              TOBN(0x5d8cb842, 0x7ccdadaf), TOBN(0xd52e379b, 0xac7015bb),
+              TOBN(0xc4f56147, 0xf462c23e), TOBN(0xd44a4298, 0x46bc24b0),
+              TOBN(0xbc73d23a, 0xe2856d4f), TOBN(0x61cedd8c, 0x0832bcdf),
+              TOBN(0x60953556, 0x99f241d7), TOBN(0xee4adbd7, 0x001a349d),
+              TOBN(0x0b35bf6a, 0xaa89e491), TOBN(0x7f0076f4, 0x136f7546),
+              TOBN(0xd19a18ba, 0x9264da3d), TOBN(0x6eb2d2cd, 0x62a7a28b),
+              TOBN(0xcdba941f, 0x8761c971), TOBN(0x1550518b, 0xa3be4a5d),
+              TOBN(0xd0e8e2f0, 0x57d0b70c), TOBN(0xeea8612e, 0xcd133ba3),
+              TOBN(0x814670f0, 0x44416aec), TOBN(0x424db6c3, 0x30775061),
+              TOBN(0xd96039d1, 0x16213fd1), TOBN(0xc61e7fa5, 0x18a3478f),
+              TOBN(0xa805bdcc, 0xcb0c5021), TOBN(0xbdd6f3a8, 0x0cc616dd),
+              TOBN(0x06009667, 0x5d97f7e2), TOBN(0x31db0fc1, 0xaf0bf4b6),
+              TOBN(0x23680ed4, 0x5491627a), TOBN(0xb99a3c66, 0x7d741fb1),
+              TOBN(0xe9bb5f55, 0x36b1ff92), TOBN(0x29738577, 0x512b388d),
+              TOBN(0xdb8a2ce7, 0x50fcf263), TOBN(0x385346d4, 0x6c4f7b47),
+              TOBN(0xbe86c5ef, 0x31631f9e), TOBN(0xbf91da21, 0x03a57a29),
+              TOBN(0xc3b1f796, 0x7b23f821), TOBN(0x0f7d00d2, 0x770db354),
+              TOBN(0x8ffc6c3b, 0xd8fe79da), TOBN(0xcc5e8c40, 0xd525c996),
+              TOBN(0x4640991d, 0xcfff632a), TOBN(0x64d97e8c, 0x67112528),
+              TOBN(0xc232d973, 0x02f1cd1e), TOBN(0xce87eacb, 0x1dd212a4),
+              TOBN(0x6e4c8c73, 0xe69802f7), TOBN(0x12ef0290, 0x1fffddbd),
+              TOBN(0x941ec74e, 0x1bcea6e2), TOBN(0xd0b54024, 0x3cb92cbb),
+              TOBN(0x809fb9d4, 0x7e8f9d05), TOBN(0x3bf16159, 0xf2992aae),
+              TOBN(0xad40f279, 0xf8a7a838), TOBN(0x11aea631, 0x05615660),
+              TOBN(0xbf52e6f1, 0xa01f6fa1), TOBN(0xef046995, 0x3dc2aec9),
+              TOBN(0x785dbec9, 0xd8080711), TOBN(0xe1aec60a, 0x9fdedf76),
+              TOBN(0xece797b5, 0xfa21c126), TOBN(0xc66e898f, 0x05e52732),
+              TOBN(0x39bb69c4, 0x08811fdb), TOBN(0x8bfe1ef8, 0x2fc7f082),
+              TOBN(0xc8e7a393, 0x174f4138), TOBN(0xfba8ad1d, 0xd58d1f98),
+              TOBN(0xbc21d0ce, 0xbfd2fd5b), TOBN(0x0b839a82, 0x6ee60d61),
+              TOBN(0xaacf7658, 0xafd22253), TOBN(0xb526bed8, 0xaae396b3),
+              TOBN(0xccc1bbc2, 0x38564464), TOBN(0x9e3ff947, 0x8c45bc73),
+              TOBN(0xcde9bca3, 0x58188a78), TOBN(0x138b8ee0, 0xd73bf8f7),
+              TOBN(0x5c7e234c, 0x4123c489), TOBN(0x66e69368, 0xfa643297),
+              TOBN(0x0629eeee, 0x39a15fa3), TOBN(0x95fab881, 0xa9e2a927),
+              TOBN(0xb2497007, 0xeafbb1e1), TOBN(0xd75c9ce6, 0xe75b7a93),
+              TOBN(0x3558352d, 0xefb68d78), TOBN(0xa2f26699, 0x223f6396),
+              TOBN(0xeb911ecf, 0xe469b17a), TOBN(0x62545779, 0xe72d3ec2),
+              TOBN(0x8ea47de7, 0x82cb113f), TOBN(0xebe4b086, 0x4e1fa98d),
+              TOBN(0xec2d5ed7, 0x8cdfedb1), TOBN(0xa535c077, 0xfe211a74),
+              TOBN(0x9678109b, 0x11d244c5), TOBN(0xf17c8bfb, 0xbe299a76),
+              TOBN(0xb651412e, 0xfb11fbc4), TOBN(0xea0b5482, 0x94ab3f65),
+              TOBN(0xd8dffd95, 0x0cf78243), TOBN(0x2e719e57, 0xce0361d4),
+              TOBN(0x9007f085, 0x304ddc5b), TOBN(0x095e8c6d, 0x4daba2ea),
+              TOBN(0x5a33cdb4, 0x3f9d28a9), TOBN(0x85b95cd8, 0xe2283003),
+              TOBN(0xbcd6c819, 0xb9744733), TOBN(0x29c5f538, 0xfc7f5783),
+              TOBN(0x6c49b2fa, 0xd59038e4), TOBN(0x68349cc1, 0x3bbe1018),
+              TOBN(0xcc490c1d, 0x21830ee5), TOBN(0x36f9c4ee, 0xe9bfa297),
+              TOBN(0x58fd7294, 0x48de1a94), TOBN(0xaadb13a8, 0x4e8f2cdc),
+              TOBN(0x515eaaa0, 0x81313dba), TOBN(0xc76bb468, 0xc2152dd8),
+              TOBN(0x357f8d75, 0xa653dbf8), TOBN(0xe4d8c4d1, 0xb14ac143),
+              TOBN(0xbdb8e675, 0xb055cb40), TOBN(0x898f8e7b, 0x977b5167),
+              TOBN(0xecc65651, 0xb82fb863), TOBN(0x56544814, 0x6d88f01f),
+              TOBN(0xb0928e95, 0x263a75a9), TOBN(0xcfb6836f, 0x1a22fcda),
+              TOBN(0x651d14db, 0x3f3bd37c), TOBN(0x1d3837fb, 0xb6ad4664),
+              TOBN(0x7c5fb538, 0xff4f94ab), TOBN(0x7243c712, 0x6d7fb8f2),
+              TOBN(0xef13d60c, 0xa85c5287), TOBN(0x18cfb7c7, 0x4bb8dd1b),
+              TOBN(0x82f9bfe6, 0x72908219), TOBN(0x35c4592b, 0x9d5144ab),
+              TOBN(0x52734f37, 0x9cf4b42f), TOBN(0x6bac55e7, 0x8c60ddc4),
+              TOBN(0xb5cd811e, 0x94dea0f6), TOBN(0x259ecae4, 0xe18cc1a3),
+              TOBN(0x6a0e836e, 0x15e660f8), TOBN(0x6c639ea6, 0x0e02bff2),
+              TOBN(0x8721b8cb, 0x7e1026fd), TOBN(0x9e73b50b, 0x63261942),
+              TOBN(0xb8c70974, 0x77f01da3), TOBN(0x1839e6a6, 0x8268f57f),
+              TOBN(0x571b9415, 0x5150b805), TOBN(0x1892389e, 0xf92c7097),
+              TOBN(0x8d69c18e, 0x4a084b95), TOBN(0x7014c512, 0xbe5b495c),
+              TOBN(0x4780db36, 0x1b07523c), TOBN(0x2f6219ce, 0x2c1c64fa),
+              TOBN(0xc38b81b0, 0x602c105a), TOBN(0xab4f4f20, 0x5dc8e360),
+              TOBN(0x20d3c982, 0xcf7d62d2), TOBN(0x1f36e29d, 0x23ba8150),
+              TOBN(0x48ae0bf0, 0x92763f9e), TOBN(0x7a527e6b, 0x1d3a7007),
+              TOBN(0xb4a89097, 0x581a85e3), TOBN(0x1f1a520f, 0xdc158be5),
+              TOBN(0xf98db37d, 0x167d726e), TOBN(0x8802786e, 0x1113e862) },
+          { TOBN(0xefb2149e, 0x36f09ab0), TOBN(0x03f163ca, 0x4a10bb5b),
+              TOBN(0xd0297045, 0x06e20998), TOBN(0x56f0af00, 0x1b5a3bab),
+              TOBN(0x7af4cfec, 0x70880e0d), TOBN(0x7332a66f, 0xbe3d913f),
+              TOBN(0x32e6c84a, 0x7eceb4bd), TOBN(0xedc4a79a, 0x9c228f55),
+              TOBN(0xc37c7dd0, 0xc55c4496), TOBN(0xa6a96357, 0x25bbabd2),
+              TOBN(0x5b7e63f2, 0xadd7f363), TOBN(0x9dce3782, 0x2e73f1df),
+              TOBN(0xe1e5a16a, 0xb2b91f71), TOBN(0xe4489823, 0x5ba0163c),
+              TOBN(0xf2759c32, 0xf6e515ad), TOBN(0xa5e2f1f8, 0x8615eecf),
+              TOBN(0x74519be7, 0xabded551), TOBN(0x03d358b8, 0xc8b74410),
+              TOBN(0x4d00b10b, 0x0e10d9a9), TOBN(0x6392b0b1, 0x28da52b7),
+              TOBN(0x6744a298, 0x0b75c904), TOBN(0xc305b0ae, 0xa8f7f96c),
+              TOBN(0x042e421d, 0x182cf932), TOBN(0xf6fc5d50, 0x9e4636ca),
+              TOBN(0x795847c9, 0xd64cc78c), TOBN(0x6c50621b, 0x9b6cb27b),
+              TOBN(0x07099bf8, 0xdf8022ab), TOBN(0x48f862eb, 0xc04eda1d),
+              TOBN(0xd12732ed, 0xe1603c16), TOBN(0x19a80e0f, 0x5c9a9450),
+              TOBN(0xe2257f54, 0xb429b4fc), TOBN(0x66d3b2c6, 0x45460515),
+              TOBN(0x6ca4f87e, 0x822e37be), TOBN(0x73f237b4, 0x253bda4e),
+              TOBN(0xf747f3a2, 0x41190aeb), TOBN(0xf06fa36f, 0x804cf284),
+              TOBN(0x0a6bbb6e, 0xfc621c12), TOBN(0x5d624b64, 0x40b80ec6),
+              TOBN(0x4b072425, 0x7ba556f3), TOBN(0x7fa0c354, 0x3e2d20a8),
+              TOBN(0xe921fa31, 0xe3229d41), TOBN(0xa929c652, 0x94531bd4),
+              TOBN(0x84156027, 0xa6d38209), TOBN(0xf3d69f73, 0x6bdb97bd),
+              TOBN(0x8906d19a, 0x16833631), TOBN(0x68a34c2e, 0x03d51be3),
+              TOBN(0xcb59583b, 0x0e511cd8), TOBN(0x99ce6bfd, 0xfdc132a8),
+              TOBN(0x3facdaaa, 0xffcdb463), TOBN(0x658bbc1a, 0x34a38b08),
+              TOBN(0x12a801f8, 0xf1a9078d), TOBN(0x1567bcf9, 0x6ab855de),
+              TOBN(0xe08498e0, 0x3572359b), TOBN(0xcf0353e5, 0x8659e68b),
+              TOBN(0xbb86e9c8, 0x7d23807c), TOBN(0xbc08728d, 0x2198e8a2),
+              TOBN(0x8de2b7bc, 0x453cadd6), TOBN(0x203900a7, 0xbc0bc1f8),
+              TOBN(0xbcd86e47, 0xa6abd3af), TOBN(0x911cac12, 0x8502effb),
+              TOBN(0x2d550242, 0xec965469), TOBN(0x0e9f7692, 0x29e0017e),
+              TOBN(0x633f078f, 0x65979885), TOBN(0xfb87d449, 0x4cf751ef),
+              TOBN(0xe1790e4b, 0xfc25419a), TOBN(0x36467203, 0x4bff3cfd),
+              TOBN(0xc8db6386, 0x25b6e83f), TOBN(0x6cc69f23, 0x6cad6fd2),
+              TOBN(0x0219e45a, 0x6bc68bb9), TOBN(0xe43d79b6, 0x297f7334),
+              TOBN(0x7d445368, 0x465dc97c), TOBN(0x4b9eea32, 0x2a0b949a),
+              TOBN(0x1b96c6ba, 0x6102d021), TOBN(0xeaafac78, 0x2f4461ea),
+              TOBN(0xd4b85c41, 0xc49f19a8), TOBN(0x275c28e4, 0xcf538875),
+              TOBN(0x35451a9d, 0xdd2e54e0), TOBN(0x6991adb5, 0x0605618b),
+              TOBN(0x5b8b4bcd, 0x7b36cd24), TOBN(0x372a4f8c, 0x56f37216),
+              TOBN(0xc890bd73, 0xa6a5da60), TOBN(0x6f083da0, 0xdc4c9ff0),
+              TOBN(0xf4e14d94, 0xf0536e57), TOBN(0xf9ee1eda, 0xaaec8243),
+              TOBN(0x571241ec, 0x8bdcf8e7), TOBN(0xa5db8271, 0x0b041e26),
+              TOBN(0x9a0b9a99, 0xe3fff040), TOBN(0xcaaf21dd, 0x7c271202),
+              TOBN(0xb4e2b2e1, 0x4f0dd2e8), TOBN(0xe77e7c4f, 0x0a377ac7),
+              TOBN(0x69202c3f, 0x0d7a2198), TOBN(0xf759b7ff, 0x28200eb8),
+              TOBN(0xc87526ed, 0xdcfe314e), TOBN(0xeb84c524, 0x53d5cf99),
+              TOBN(0xb1b52ace, 0x515138b6), TOBN(0x5aa7ff8c, 0x23fca3f4),
+              TOBN(0xff0b13c3, 0xb9791a26), TOBN(0x960022da, 0xcdd58b16),
+              TOBN(0xdbd55c92, 0x57aad2de), TOBN(0x3baaaaa3, 0xf30fe619),
+              TOBN(0x9a4b2346, 0x0d881efd), TOBN(0x506416c0, 0x46325e2a),
+              TOBN(0x91381e76, 0x035c18d4), TOBN(0xb3bb68be, 0xf27817b0),
+              TOBN(0x15bfb8bf, 0x5116f937), TOBN(0x7c64a586, 0xc1268943),
+              TOBN(0x71e25cc3, 0x8419a2c8), TOBN(0x9fd6b0c4, 0x8335f463),
+              TOBN(0x4bf0ba3c, 0xe8ee0e0e), TOBN(0x6f6fba60, 0x298c21fa),
+              TOBN(0x57d57b39, 0xae66bee0), TOBN(0x292d5130, 0x22672544),
+              TOBN(0xf451105d, 0xbab093b3), TOBN(0x012f59b9, 0x02839986),
+              TOBN(0x8a915802, 0x3474a89c), TOBN(0x048c919c, 0x2de03e97),
+              TOBN(0xc476a2b5, 0x91071cd5), TOBN(0x791ed89a, 0x034970a5),
+              TOBN(0x89bd9042, 0xe1b7994b), TOBN(0x8eaf5179, 0xa1057ffd),
+              TOBN(0x6066e2a2, 0xd551ee10), TOBN(0x87a8f1d8, 0x727e09a6),
+              TOBN(0x00d08bab, 0x2c01148d), TOBN(0x6da8e4f1, 0x424f33fe),
+              TOBN(0x466d17f0, 0xcf9a4e71), TOBN(0xff502010, 0x3bf5cb19),
+              TOBN(0xdccf97d8, 0xd062ecc0), TOBN(0x80c0d9af, 0x81d80ac4),
+              TOBN(0xe87771d8, 0x033f2876), TOBN(0xb0186ec6, 0x7d5cc3db),
+              TOBN(0x58e8bb80, 0x3bc9bc1d), TOBN(0x4d1395cc, 0x6f6ef60e),
+              TOBN(0xa73c62d6, 0x186244a0), TOBN(0x918e5f23, 0x110a5b53),
+              TOBN(0xed4878ca, 0x741b7eab), TOBN(0x3038d71a, 0xdbe03e51),
+              TOBN(0x840204b7, 0xa93c3246), TOBN(0x21ab6069, 0xa0b9b4cd),
+              TOBN(0xf5fa6e2b, 0xb1d64218), TOBN(0x1de6ad0e, 0xf3d56191),
+              TOBN(0x570aaa88, 0xff1929c7), TOBN(0xc6df4c6b, 0x640e87b5),
+              TOBN(0xde8a74f2, 0xc65f0ccc), TOBN(0x8b972fd5, 0xe6f6cc01),
+              TOBN(0x3fff36b6, 0x0b846531), TOBN(0xba7e45e6, 0x10a5e475),
+              TOBN(0x84a1d10e, 0x4145b6c5), TOBN(0xf1f7f91a, 0x5e046d9d),
+              TOBN(0x0317a692, 0x44de90d7), TOBN(0x951a1d4a, 0xf199c15e),
+              TOBN(0x91f78046, 0xc9d73deb), TOBN(0x74c82828, 0xfab8224f),
+              TOBN(0xaa6778fc, 0xe7560b90), TOBN(0xb4073e61, 0xa7e824ce),
+              TOBN(0xff0d693c, 0xd642eba8), TOBN(0x7ce2e57a, 0x5dccef38),
+              TOBN(0x89c2c789, 0x1df1ad46), TOBN(0x83a06922, 0x098346fd),
+              TOBN(0x2d715d72, 0xda2fc177), TOBN(0x7b6dd71d, 0x85b6cf1d),
+              TOBN(0xc60a6d0a, 0x73fa9cb0), TOBN(0xedd3992e, 0x328bf5a9),
+              TOBN(0xc380ddd0, 0x832c8c82), TOBN(0xd182d410, 0xa2a0bf50),
+              TOBN(0x7d9d7438, 0xd9a528db), TOBN(0xe8b1a0e9, 0xcaf53994),
+              TOBN(0xddd6e5fe, 0x0e19987c), TOBN(0xacb8df03, 0x190b059d),
+              TOBN(0x53703a32, 0x8300129f), TOBN(0x1f637662, 0x68c43bfd),
+              TOBN(0xbcbd1913, 0x00e54051), TOBN(0x812fcc62, 0x7bf5a8c5),
+              TOBN(0x3f969d5f, 0x29fb85da), TOBN(0x72f4e00a, 0x694759e8),
+              TOBN(0x426b6e52, 0x790726b7), TOBN(0x617bbc87, 0x3bdbb209),
+              TOBN(0x511f8bb9, 0x97aee317), TOBN(0x812a4096, 0xe81536a8),
+              TOBN(0x137dfe59, 0x3ac09b9b), TOBN(0x0682238f, 0xba8c9a7a),
+              TOBN(0x7072ead6, 0xaeccb4bd), TOBN(0x6a34e9aa, 0x692ba633),
+              TOBN(0xc82eaec2, 0x6fff9d33), TOBN(0xfb753512, 0x1d4d2b62),
+              TOBN(0x1a0445ff, 0x1d7aadab), TOBN(0x65d38260, 0xd5f6a67c),
+              TOBN(0x6e62fb08, 0x91cfb26f), TOBN(0xef1e0fa5, 0x5c7d91d6),
+              TOBN(0x47e7c7ba, 0x33db72cd), TOBN(0x017cbc09, 0xfa7c74b2),
+              TOBN(0x3c931590, 0xf50a503c), TOBN(0xcac54f60, 0x616baa42),
+              TOBN(0x9b6cd380, 0xb2369f0f), TOBN(0x97d3a70d, 0x23c76151),
+              TOBN(0x5f9dd6fc, 0x9862a9c6), TOBN(0x044c4ab2, 0x12312f51),
+              TOBN(0x035ea0fd, 0x834a2ddc), TOBN(0x49e6b862, 0xcc7b826d),
+              TOBN(0xb03d6883, 0x62fce490), TOBN(0x62f2497a, 0xb37e36e9),
+              TOBN(0x04b005b6, 0xc6458293), TOBN(0x36bb5276, 0xe8d10af7),
+              TOBN(0xacf2dc13, 0x8ee617b8), TOBN(0x470d2d35, 0xb004b3d4),
+              TOBN(0x06790832, 0xfeeb1b77), TOBN(0x2bb75c39, 0x85657f9c),
+              TOBN(0xd70bd4ed, 0xc0f60004), TOBN(0xfe797ecc, 0x219b018b),
+              TOBN(0x9b5bec2a, 0x753aebcc), TOBN(0xdaf9f3dc, 0xc939eca5),
+              TOBN(0xd6bc6833, 0xd095ad09), TOBN(0x98abdd51, 0xdaa4d2fc),
+              TOBN(0xd9840a31, 0x8d168be5), TOBN(0xcf7c10e0, 0x2325a23c),
+              TOBN(0xa5c02aa0, 0x7e6ecfaf), TOBN(0x2462e7e6, 0xb5bfdf18),
+              TOBN(0xab2d8a8b, 0xa0cc3f12), TOBN(0x68dd485d, 0xbc672a29),
+              TOBN(0x72039752, 0x596f2cd3), TOBN(0x5d3eea67, 0xa0cf3d8d),
+              TOBN(0x810a1a81, 0xe6602671), TOBN(0x8f144a40, 0x14026c0c),
+              TOBN(0xbc753a6d, 0x76b50f85), TOBN(0xc4dc21e8, 0x645cd4a4),
+              TOBN(0xc5262dea, 0x521d0378), TOBN(0x802b8e0e, 0x05011c6f),
+              TOBN(0x1ba19cbb, 0x0b4c19ea), TOBN(0x21db64b5, 0xebf0aaec),
+              TOBN(0x1f394ee9, 0x70342f9d), TOBN(0x93a10aee, 0x1bc44a14),
+              TOBN(0xa7eed31b, 0x3efd0baa), TOBN(0x6e7c824e, 0x1d154e65),
+              TOBN(0xee23fa81, 0x9966e7ee), TOBN(0x64ec4aa8, 0x05b7920d),
+              TOBN(0x2d44462d, 0x2d90aad4), TOBN(0xf44dd195, 0xdf277ad5),
+              TOBN(0x8d6471f1, 0xbb46b6a1), TOBN(0x1e65d313, 0xfd885090),
+              TOBN(0x33a800f5, 0x13a977b4), TOBN(0xaca9d721, 0x0797e1ef),
+              TOBN(0x9a5a85a0, 0xfcff6a17), TOBN(0x9970a3f3, 0x1eca7cee),
+              TOBN(0xbb9f0d6b, 0xc9504be3), TOBN(0xe0c504be, 0xadd24ee2),
+              TOBN(0x7e09d956, 0x77fcc2f4), TOBN(0xef1a5227, 0x65bb5fc4),
+              TOBN(0x145d4fb1, 0x8b9286aa), TOBN(0x66fd0c5d, 0x6649028b),
+              TOBN(0x98857ceb, 0x1bf4581c), TOBN(0xe635e186, 0xaca7b166),
+              TOBN(0x278ddd22, 0x659722ac), TOBN(0xa0903c4c, 0x1db68007),
+              TOBN(0x366e4589, 0x48f21402), TOBN(0x31b49c14, 0xb96abda2),
+              TOBN(0x329c4b09, 0xe0403190), TOBN(0x97197ca3, 0xd29f43fe),
+              TOBN(0x8073dd1e, 0x274983d8), TOBN(0xda1a3bde, 0x55717c8f),
+              TOBN(0xfd3d4da2, 0x0361f9d1), TOBN(0x1332d081, 0x4c7de1ce),
+              TOBN(0x9b7ef7a3, 0xaa6d0e10), TOBN(0x17db2e73, 0xf54f1c4a),
+              TOBN(0xaf3dffae, 0x4cd35567), TOBN(0xaaa2f406, 0xe56f4e71),
+              TOBN(0x8966759e, 0x7ace3fc7), TOBN(0x9594eacf, 0x45a8d8c6),
+              TOBN(0x8de3bd8b, 0x91834e0e), TOBN(0xafe4ca53, 0x548c0421),
+              TOBN(0xfdd7e856, 0xe6ee81c6), TOBN(0x8f671beb, 0x6b891a3a),
+              TOBN(0xf7a58f2b, 0xfae63829), TOBN(0x9ab186fb, 0x9c11ac9f),
+              TOBN(0x8d6eb369, 0x10b5be76), TOBN(0x046b7739, 0xfb040bcd),
+              TOBN(0xccb4529f, 0xcb73de88), TOBN(0x1df0fefc, 0xcf26be03),
+              TOBN(0xad7757a6, 0xbcfcd027), TOBN(0xa8786c75, 0xbb3165ca),
+              TOBN(0xe9db1e34, 0x7e99a4d9), TOBN(0x99ee86df, 0xb06c504b),
+              TOBN(0x5b7c2ddd, 0xc15c9f0a), TOBN(0xdf87a734, 0x4295989e),
+              TOBN(0x59ece47c, 0x03d08fda), TOBN(0xb074d3dd, 0xad5fc702),
+              TOBN(0x20407903, 0x51a03776), TOBN(0x2bb1f77b, 0x2a608007),
+              TOBN(0x25c58f4f, 0xe1153185), TOBN(0xe6df62f6, 0x766e6447),
+              TOBN(0xefb3d1be, 0xed51275a), TOBN(0x5de47dc7, 0x2f0f483f),
+              TOBN(0x7932d98e, 0x97c2bedf), TOBN(0xd5c11927, 0x0219f8a1),
+              TOBN(0x9d751200, 0xa73a294e), TOBN(0x5f88434a, 0x9dc20172),
+              TOBN(0xd28d9fd3, 0xa26f506a), TOBN(0xa890cd31, 0x9d1dcd48),
+              TOBN(0x0aebaec1, 0x70f4d3b4), TOBN(0xfd1a1369, 0x0ffc8d00),
+              TOBN(0xb9d9c240, 0x57d57838), TOBN(0x45929d26, 0x68bac361),
+              TOBN(0x5a2cd060, 0x25b15ca6), TOBN(0x4b3c83e1, 0x6e474446),
+              TOBN(0x1aac7578, 0xee1e5134), TOBN(0xa418f5d6, 0xc91e2f41),
+              TOBN(0x6936fc8a, 0x213ed68b), TOBN(0x860ae7ed, 0x510a5224),
+              TOBN(0x63660335, 0xdef09b53), TOBN(0x641b2897, 0xcd79c98d),
+              TOBN(0x29bd38e1, 0x01110f35), TOBN(0x79c26f42, 0x648b1937),
+              TOBN(0x64dae519, 0x9d9164f4), TOBN(0xd85a2310, 0x0265c273),
+              TOBN(0x7173dd5d, 0x4b07e2b1), TOBN(0xd144c4cb, 0x8d9ea221),
+              TOBN(0xe8b04ea4, 0x1105ab14), TOBN(0x92dda542, 0xfe80d8f1),
+              TOBN(0xe9982fa8, 0xcf03dce6), TOBN(0x8b5ea965, 0x1a22cffc),
+              TOBN(0xf7f4ea7f, 0x3fad88c4), TOBN(0x62db773e, 0x6a5ba95c),
+              TOBN(0xd20f02fb, 0x93f24567), TOBN(0xfd46c69a, 0x315257ca),
+              TOBN(0x0ac74cc7, 0x8bcab987), TOBN(0x46f31c01, 0x5ceca2f5),
+              TOBN(0x40aedb59, 0x888b219e), TOBN(0xe50ecc37, 0xe1fccd02),
+              TOBN(0x1bcd9dad, 0x911f816c), TOBN(0x583cc1ec, 0x8db9b00c),
+              TOBN(0xf3cd2e66, 0xa483bf11), TOBN(0xfa08a6f5, 0xb1b2c169),
+              TOBN(0xf375e245, 0x4be9fa28), TOBN(0x99a7ffec, 0x5b6d011f),
+              TOBN(0x6a3ebddb, 0xc4ae62da), TOBN(0x6cea00ae, 0x374aef5d),
+              TOBN(0xab5fb98d, 0x9d4d05bc), TOBN(0x7cba1423, 0xd560f252),
+              TOBN(0x49b2cc21, 0x208490de), TOBN(0x1ca66ec3, 0xbcfb2879),
+              TOBN(0x7f1166b7, 0x1b6fb16f), TOBN(0xfff63e08, 0x65fe5db3),
+              TOBN(0xb8345abe, 0x8b2610be), TOBN(0xb732ed80, 0x39de3df4),
+              TOBN(0x0e24ed50, 0x211c32b4), TOBN(0xd10d8a69, 0x848ff27d),
+              TOBN(0xc1074398, 0xed4de248), TOBN(0xd7cedace, 0x10488927),
+              TOBN(0xa4aa6bf8, 0x85673e13), TOBN(0xb46bae91, 0x6daf30af),
+              TOBN(0x07088472, 0xfcef7ad8), TOBN(0x61151608, 0xd4b35e97),
+              TOBN(0xbcfe8f26, 0xdde29986), TOBN(0xeb84c4c7, 0xd5a34c79),
+              TOBN(0xc1eec55c, 0x164e1214), TOBN(0x891be86d, 0xa147bb03),
+              TOBN(0x9fab4d10, 0x0ba96835), TOBN(0xbf01e9b8, 0xa5c1ae9f),
+              TOBN(0x6b4de139, 0xb186ebc0), TOBN(0xd5c74c26, 0x85b91bca),
+              TOBN(0x5086a99c, 0xc2d93854), TOBN(0xeed62a7b, 0xa7a9dfbc),
+              TOBN(0x8778ed6f, 0x76b7618a), TOBN(0xbff750a5, 0x03b66062),
+              TOBN(0x4cb7be22, 0xb65186db), TOBN(0x369dfbf0, 0xcc3a6d13),
+              TOBN(0xc7dab26c, 0x7191a321), TOBN(0x9edac3f9, 0x40ed718e),
+              TOBN(0xbc142b36, 0xd0cfd183), TOBN(0xc8af82f6, 0x7c991693),
+              TOBN(0xb3d1e4d8, 0x97ce0b2a), TOBN(0xe6d7c87f, 0xc3a55cdf),
+              TOBN(0x35846b95, 0x68b81afe), TOBN(0x018d12af, 0xd3c239d8),
+              TOBN(0x2b2c6208, 0x01206e15), TOBN(0xe0e42453, 0xa3b882c6),
+              TOBN(0x854470a3, 0xa50162d5), TOBN(0x08157478, 0x7017a62a),
+              TOBN(0x18bd3fb4, 0x820357c7), TOBN(0x992039ae, 0x6f1458ad),
+              TOBN(0x9a1df3c5, 0x25b44aa1), TOBN(0x2d780357, 0xed3d5281),
+              TOBN(0x58cf7e4d, 0xc77ad4d4), TOBN(0xd49a7998, 0xf9df4fc4),
+              TOBN(0x4465a8b5, 0x1d71205e), TOBN(0xa0ee0ea6, 0x649254aa),
+              TOBN(0x4b5eeecf, 0xab7bd771), TOBN(0x6c873073, 0x35c262b9),
+              TOBN(0xdc5bd648, 0x3c9d61e7), TOBN(0x233d6d54, 0x321460d2),
+              TOBN(0xd20c5626, 0xfc195bcc), TOBN(0x25445958, 0x04d78b63),
+              TOBN(0xe03fcb3d, 0x17ec8ef3), TOBN(0x54b690d1, 0x46b8f781),
+              TOBN(0x82fa2c8a, 0x21230646), TOBN(0xf51aabb9, 0x084f418c),
+              TOBN(0xff4fbec1, 0x1a30ba43), TOBN(0x6a5acf73, 0x743c9df7),
+              TOBN(0x1da2b357, 0xd635b4d5), TOBN(0xc3de68dd, 0xecd5c1da),
+              TOBN(0xa689080b, 0xd61af0dd), TOBN(0xdea5938a, 0xd665bf99),
+              TOBN(0x0231d71a, 0xfe637294), TOBN(0x01968aa6, 0xa5a81cd8),
+              TOBN(0x11252d50, 0x048e63b5), TOBN(0xc446bc52, 0x6ca007e9),
+              TOBN(0xef8c50a6, 0x96d6134b), TOBN(0x9361fbf5, 0x9e09a05c),
+              TOBN(0xf17f85a6, 0xdca3291a), TOBN(0xb178d548, 0xff251a21),
+              TOBN(0x87f6374b, 0xa4df3915), TOBN(0x566ce1bf, 0x2fd5d608),
+              TOBN(0x425cba4d, 0x7de35102), TOBN(0x6b745f8f, 0x58c5d5e2),
+              TOBN(0x88402af6, 0x63122edf), TOBN(0x3190f9ed, 0x3b989a89),
+              TOBN(0x4ad3d387, 0xebba3156), TOBN(0xef385ad9, 0xc7c469a5),
+              TOBN(0xb08281de, 0x3f642c29), TOBN(0x20be0888, 0x910ffb88),
+              TOBN(0xf353dd4a, 0xd5292546), TOBN(0x3f1627de, 0x8377a262),
+              TOBN(0xa5faa013, 0xeefcd638), TOBN(0x8f3bf626, 0x74cc77c3),
+              TOBN(0x32618f65, 0xa348f55e), TOBN(0x5787c0dc, 0x9fefeb9e),
+              TOBN(0xf1673aa2, 0xd9a23e44), TOBN(0x88dfa993, 0x4e10690d),
+              TOBN(0x1ced1b36, 0x2bf91108), TOBN(0x9193ceca, 0x3af48649),
+              TOBN(0xfb34327d, 0x2d738fc5), TOBN(0x6697b037, 0x975fee6c),
+              TOBN(0x2f485da0, 0xc04079a5), TOBN(0x2cdf5735, 0x2feaa1ac),
+              TOBN(0x76944420, 0xbd55659e), TOBN(0x7973e32b, 0x4376090c),
+              TOBN(0x86bb4fe1, 0x163b591a), TOBN(0x10441aed, 0xc196f0ca),
+              TOBN(0x3b431f4a, 0x045ad915), TOBN(0x6c11b437, 0xa4afacb1),
+              TOBN(0x30b0c7db, 0x71fdbbd8), TOBN(0xb642931f, 0xeda65acd),
+              TOBN(0x4baae6e8, 0x9c92b235), TOBN(0xa73bbd0e, 0x6b3993a1),
+              TOBN(0xd06d60ec, 0x693dd031), TOBN(0x03cab91b, 0x7156881c),
+              TOBN(0xd615862f, 0x1db3574b), TOBN(0x485b0185, 0x64bb061a),
+              TOBN(0x27434988, 0xa0181e06), TOBN(0x2cd61ad4, 0xc1c0c757),
+              TOBN(0x3effed5a, 0x2ff9f403), TOBN(0x8dc98d8b, 0x62239029),
+              TOBN(0x2206021e, 0x1f17b70d), TOBN(0xafbec0ca, 0xbf510015),
+              TOBN(0x9fed7164, 0x80130dfa), TOBN(0x306dc2b5, 0x8a02dcf5),
+              TOBN(0x48f06620, 0xfeb10fc0), TOBN(0x78d1e1d5, 0x5a57cf51),
+              TOBN(0xadef8c5a, 0x192ef710), TOBN(0x88afbd4b, 0x3b7431f9),
+              TOBN(0x7e1f7407, 0x64250c9e), TOBN(0x6e31318d, 0xb58bec07),
+              TOBN(0xfd4fc4b8, 0x24f89b4e), TOBN(0x65a5dd88, 0x48c36a2a),
+              TOBN(0x4f1eccff, 0xf024baa7), TOBN(0x22a21cf2, 0xcba94650),
+              TOBN(0x95d29dee, 0x42a554f7), TOBN(0x828983a5, 0x002ec4ba),
+              TOBN(0x8112a1f7, 0x8badb73d), TOBN(0x79ea8897, 0xa27c1839),
+              TOBN(0x8969a5a7, 0xd065fd83), TOBN(0xf49af791, 0xb262a0bc),
+              TOBN(0xfcdea8b6, 0xaf2b5127), TOBN(0x10e913e1, 0x564c2dbc),
+              TOBN(0x51239d14, 0xbc21ef51), TOBN(0xe51c3ceb, 0x4ce57292),
+              TOBN(0x795ff068, 0x47bbcc3b), TOBN(0x86b46e1e, 0xbd7e11e6),
+              TOBN(0x0ea6ba23, 0x80041ef4), TOBN(0xd72fe505, 0x6262342e),
+              TOBN(0x8abc6dfd, 0x31d294d4), TOBN(0xbbe017a2, 0x1278c2c9),
+              TOBN(0xb1fcfa09, 0xb389328a), TOBN(0x322fbc62, 0xd01771b5),
+              TOBN(0x04c0d063, 0x60b045bf), TOBN(0xdb652edc, 0x10e52d01),
+              TOBN(0x50ef932c, 0x03ec6627), TOBN(0xde1b3b2d, 0xc1ee50e3),
+              TOBN(0x5ab7bdc5, 0xdc37a90d), TOBN(0xfea67213, 0x31e33a96),
+              TOBN(0x6482b5cb, 0x4f2999aa), TOBN(0x38476cc6, 0xb8cbf0dd),
+              TOBN(0x93ebfacb, 0x173405bb), TOBN(0x15cdafe7, 0xe52369ec),
+              TOBN(0xd42d5ba4, 0xd935b7db), TOBN(0x648b6004, 0x1c99a4cd),
+              TOBN(0x785101bd, 0xa3b5545b), TOBN(0x4bf2c38a, 0x9dd67faf),
+              TOBN(0xb1aadc63, 0x4442449c), TOBN(0xe0e9921a, 0x33ad4fb8),
+              TOBN(0x5c552313, 0xaa686d82), TOBN(0xdee635fa, 0x465d866c),
+              TOBN(0xbc3c224a, 0x18ee6e8a), TOBN(0xeed748a6, 0xed42e02f),
+              TOBN(0xe70f930a, 0xd474cd08), TOBN(0x774ea6ec, 0xfff24adf),
+              TOBN(0x03e2de1c, 0xf3480d4a), TOBN(0xf0d8edc7, 0xbc8acf1a),
+              TOBN(0xf23e3303, 0x68295a9c), TOBN(0xfadd5f68, 0xc546a97d),
+              TOBN(0x895597ad, 0x96f8acb1), TOBN(0xbddd49d5, 0x671bdae2),
+              TOBN(0x16fcd528, 0x21dd43f4), TOBN(0xa5a45412, 0x6619141a) },
+          { TOBN(0x8ce9b6bf, 0xc360e25a), TOBN(0xe6425195, 0x075a1a78),
+              TOBN(0x9dc756a8, 0x481732f4), TOBN(0x83c0440f, 0x5432b57a),
+              TOBN(0xc670b3f1, 0xd720281f), TOBN(0x2205910e, 0xd135e051),
+              TOBN(0xded14b0e, 0xdb052be7), TOBN(0x697b3d27, 0xc568ea39),
+              TOBN(0x2e599b9a, 0xfb3ff9ed), TOBN(0x28c2e0ab, 0x17f6515c),
+              TOBN(0x1cbee4fd, 0x474da449), TOBN(0x071279a4, 0x4f364452),
+              TOBN(0x97abff66, 0x01fbe855), TOBN(0x3ee394e8, 0x5fda51c4),
+              TOBN(0x190385f6, 0x67597c0b), TOBN(0x6e9fccc6, 0xa27ee34b),
+              TOBN(0x0b89de93, 0x14092ebb), TOBN(0xf17256bd, 0x428e240c),
+              TOBN(0xcf89a7f3, 0x93d2f064), TOBN(0x4f57841e, 0xe1ed3b14),
+              TOBN(0x4ee14405, 0xe708d855), TOBN(0x856aae72, 0x03f1c3d0),
+              TOBN(0xc8e5424f, 0xbdd7eed5), TOBN(0x3333e4ef, 0x73ab4270),
+              TOBN(0x3bc77ade, 0xdda492f8), TOBN(0xc11a3aea, 0x78297205),
+              TOBN(0x5e89a3e7, 0x34931b4c), TOBN(0x17512e2e, 0x9f5694bb),
+              TOBN(0x5dc349f3, 0x177bf8b6), TOBN(0x232ea4ba, 0x08c7ff3e),
+              TOBN(0x9c4f9d16, 0xf511145d), TOBN(0xccf109a3, 0x33b379c3),
+              TOBN(0xe75e7a88, 0xa1f25897), TOBN(0x7ac6961f, 0xa1b5d4d8),
+              TOBN(0xe3e10773, 0x08f3ed5c), TOBN(0x208a54ec, 0x0a892dfb),
+              TOBN(0xbe826e19, 0x78660710), TOBN(0x0cf70a97, 0x237df2c8),
+              TOBN(0x418a7340, 0xed704da5), TOBN(0xa3eeb9a9, 0x08ca33fd),
+              TOBN(0x49d96233, 0x169bca96), TOBN(0x04d286d4, 0x2da6aafb),
+              TOBN(0xc09606ec, 0xa0c2fa94), TOBN(0x8869d0d5, 0x23ff0fb3),
+              TOBN(0xa99937e5, 0xd0150d65), TOBN(0xa92e2503, 0x240c14c9),
+              TOBN(0x656bf945, 0x108e2d49), TOBN(0x152a733a, 0xa2f59e2b),
+              TOBN(0xb4323d58, 0x8434a920), TOBN(0xc0af8e93, 0x622103c5),
+              TOBN(0x667518ef, 0x938dbf9a), TOBN(0xa1843073, 0x83a9cdf2),
+              TOBN(0x350a94aa, 0x5447ab80), TOBN(0xe5e5a325, 0xc75a3d61),
+              TOBN(0x74ba507f, 0x68411a9e), TOBN(0x10581fc1, 0x594f70c5),
+              TOBN(0x60e28570, 0x80eb24a9), TOBN(0x7bedfb4d, 0x488e0cfd),
+              TOBN(0x721ebbd7, 0xc259cdb8), TOBN(0x0b0da855, 0xbc6390a9),
+              TOBN(0x2b4d04db, 0xde314c70), TOBN(0xcdbf1fbc, 0x6c32e846),
+              TOBN(0x33833eab, 0xb162fc9e), TOBN(0x9939b48b, 0xb0dd3ab7),
+              TOBN(0x5aaa98a7, 0xcb0c9c8c), TOBN(0x75105f30, 0x81c4375c),
+              TOBN(0xceee5057, 0x5ef1c90f), TOBN(0xb31e065f, 0xc23a17bf),
+              TOBN(0x5364d275, 0xd4b6d45a), TOBN(0xd363f3ad, 0x62ec8996),
+              TOBN(0xb5d21239, 0x4391c65b), TOBN(0x84564765, 0xebb41b47),
+              TOBN(0x20d18ecc, 0x37107c78), TOBN(0xacff3b6b, 0x570c2a66),
+              TOBN(0x22f975d9, 0x9bd0d845), TOBN(0xef0a0c46, 0xba178fa0),
+              TOBN(0x1a419651, 0x76b6028e), TOBN(0xc49ec674, 0x248612d4),
+              TOBN(0x5b6ac4f2, 0x7338af55), TOBN(0x06145e62, 0x7bee5a36),
+              TOBN(0x33e95d07, 0xe75746b5), TOBN(0x1c1e1f6d, 0xc40c78be),
+              TOBN(0x967833ef, 0x222ff8e2), TOBN(0x4bedcf6a, 0xb49180ad),
+              TOBN(0x6b37e9c1, 0x3d7a4c8a), TOBN(0x2748887c, 0x6ddfe760),
+              TOBN(0xf7055123, 0xaa3a5bbc), TOBN(0x954ff225, 0x7bbb8e74),
+              TOBN(0xc42b8ab1, 0x97c3dfb9), TOBN(0x55a549b0, 0xcf168154),
+              TOBN(0xad6748e7, 0xc1b50692), TOBN(0x2775780f, 0x6fc5cbcb),
+              TOBN(0x4eab80b8, 0xe1c9d7c8), TOBN(0x8c69dae1, 0x3fdbcd56),
+              TOBN(0x47e6b4fb, 0x9969eace), TOBN(0x002f1085, 0xa705cb5a),
+              TOBN(0x4e23ca44, 0x6d3fea55), TOBN(0xb4ae9c86, 0xf4810568),
+              TOBN(0x47bfb91b, 0x2a62f27d), TOBN(0x60deb4c9, 0xd9bac28c),
+              TOBN(0xa892d894, 0x7de6c34c), TOBN(0x4ee68259, 0x4494587d),
+              TOBN(0x914ee14e, 0x1a3f8a5b), TOBN(0xbb113eaa, 0x28700385),
+              TOBN(0x81ca03b9, 0x2115b4c9), TOBN(0x7c163d38, 0x8908cad1),
+              TOBN(0xc912a118, 0xaa18179a), TOBN(0xe09ed750, 0x886e3081),
+              TOBN(0xa676e3fa, 0x26f516ca), TOBN(0x753cacf7, 0x8e732f91),
+              TOBN(0x51592aea, 0x833da8b4), TOBN(0xc626f42f, 0x4cbea8aa),
+              TOBN(0xef9dc899, 0xa7b56eaf), TOBN(0x00c0e52c, 0x34ef7316),
+              TOBN(0x5b1e4e24, 0xfe818a86), TOBN(0x9d31e20d, 0xc538be47),
+              TOBN(0x22eb932d, 0x3ed68974), TOBN(0xe44bbc08, 0x7c4e87c4),
+              TOBN(0x4121086e, 0x0dde9aef), TOBN(0x8e6b9cff, 0x134f4345),
+              TOBN(0x96892c1f, 0x711b0eb9), TOBN(0xb905f2c8, 0x780ab954),
+              TOBN(0xace26309, 0xa20792db), TOBN(0xec8ac9b3, 0x0684e126),
+              TOBN(0x486ad8b6, 0xb40a2447), TOBN(0x60121fc1, 0x9fe3fb24),
+              TOBN(0x5626fccf, 0x1a8e3b3f), TOBN(0x4e568622, 0x6ad1f394),
+              TOBN(0xda7aae0d, 0x196aa5a1), TOBN(0xe0df8c77, 0x1041b5fb),
+              TOBN(0x451465d9, 0x26b318b7), TOBN(0xc29b6e55, 0x7ab136e9),
+              TOBN(0x2c2ab48b, 0x71148463), TOBN(0xb5738de3, 0x64454a76),
+              TOBN(0x54ccf9a0, 0x5a03abe4), TOBN(0x377c0296, 0x0427d58e),
+              TOBN(0x73f5f0b9, 0x2bb39c1f), TOBN(0x14373f2c, 0xe608d8c5),
+              TOBN(0xdcbfd314, 0x00fbb805), TOBN(0xdf18fb20, 0x83afdcfb),
+              TOBN(0x81a57f42, 0x42b3523f), TOBN(0xe958532d, 0x87f650fb),
+              TOBN(0xaa8dc8b6, 0x8b0a7d7c), TOBN(0x1b75dfb7, 0x150166be),
+              TOBN(0x90e4f7c9, 0x2d7d1413), TOBN(0x67e2d6b5, 0x9834f597),
+              TOBN(0x4fd4f4f9, 0xa808c3e8), TOBN(0xaf8237e0, 0xd5281ec1),
+              TOBN(0x25ab5fdc, 0x84687cee), TOBN(0xc5ded6b1, 0xa5b26c09),
+              TOBN(0x8e4a5aec, 0xc8ea7650), TOBN(0x23b73e5c, 0x14cc417f),
+              TOBN(0x2bfb4318, 0x3037bf52), TOBN(0xb61e6db5, 0x78c725d7),
+              TOBN(0x8efd4060, 0xbbb3e5d7), TOBN(0x2e014701, 0xdbac488e),
+              TOBN(0xac75cf9a, 0x360aa449), TOBN(0xb70cfd05, 0x79634d08),
+              TOBN(0xa591536d, 0xfffb15ef), TOBN(0xb2c37582, 0xd07c106c),
+              TOBN(0xb4293fdc, 0xf50225f9), TOBN(0xc52e175c, 0xb0e12b03),
+              TOBN(0xf649c3ba, 0xd0a8bf64), TOBN(0x745a8fef, 0xeb8ae3c6),
+              TOBN(0x30d7e5a3, 0x58321bc3), TOBN(0xb1732be7, 0x0bc4df48),
+              TOBN(0x1f217993, 0xe9ea5058), TOBN(0xf7a71cde, 0x3e4fd745),
+              TOBN(0x86cc533e, 0x894c5bbb), TOBN(0x6915c7d9, 0x69d83082),
+              TOBN(0xa6aa2d05, 0x5815c244), TOBN(0xaeeee592, 0x49b22ce5),
+              TOBN(0x89e39d13, 0x78135486), TOBN(0x3a275c1f, 0x16b76f2f),
+              TOBN(0xdb6bcc1b, 0xe036e8f5), TOBN(0x4df69b21, 0x5e4709f5),
+              TOBN(0xa188b250, 0x2d0f39aa), TOBN(0x622118bb, 0x15a85947),
+              TOBN(0x2ebf520f, 0xfde0f4fa), TOBN(0xa40e9f29, 0x4860e539),
+              TOBN(0x7b6a51eb, 0x22b57f0f), TOBN(0x849a33b9, 0x7e80644a),
+              TOBN(0x50e5d16f, 0x1cf095fe), TOBN(0xd754b54e, 0xec55f002),
+              TOBN(0x5cfbbb22, 0x236f4a98), TOBN(0x0b0c59e9, 0x066800bb),
+              TOBN(0x4ac69a8f, 0x5a9a7774), TOBN(0x2b33f804, 0xd6bec948),
+              TOBN(0xb3729295, 0x32e6c466), TOBN(0x68956d0f, 0x4e599c73),
+              TOBN(0xa47a249f, 0x155c31cc), TOBN(0x24d80f0d, 0xe1ce284e),
+              TOBN(0xcd821dfb, 0x988baf01), TOBN(0xe6331a7d, 0xdbb16647),
+              TOBN(0x1eb8ad33, 0x094cb960), TOBN(0x593cca38, 0xc91bbca5),
+              TOBN(0x384aac8d, 0x26567456), TOBN(0x40fa0309, 0xc04b6490),
+              TOBN(0x97834cd6, 0xdab6c8f6), TOBN(0x68a7318d, 0x3f91e55f),
+              TOBN(0xa00fd04e, 0xfc4d3157), TOBN(0xb56f8ab2, 0x2bf3bdea),
+              TOBN(0x014f5648, 0x4fa57172), TOBN(0x948c5860, 0x450abdb3),
+              TOBN(0x342b5df0, 0x0ebd4f08), TOBN(0x3e5168cd, 0x0e82938e),
+              TOBN(0x7aedc1ce, 0xb0df5dd0), TOBN(0x6bbbc6d9, 0xe5732516),
+              TOBN(0xc7bfd486, 0x605daaa6), TOBN(0x46fd72b7, 0xbb9a6c9e),
+              TOBN(0xe4847fb1, 0xa124fb89), TOBN(0x75959cbd, 0xa2d8ffbc),
+              TOBN(0x42579f65, 0xc8a588ee), TOBN(0x368c92e6, 0xb80b499d),
+              TOBN(0xea4ef6cd, 0x999a5df1), TOBN(0xaa73bb7f, 0x936fe604),
+              TOBN(0xf347a70d, 0x6457d188), TOBN(0x86eda86b, 0x8b7a388b),
+              TOBN(0xb7cdff06, 0x0ccd6013), TOBN(0xbeb1b6c7, 0xd0053fb2),
+              TOBN(0x0b022387, 0x99240a9f), TOBN(0x1bbb384f, 0x776189b2),
+              TOBN(0x8695e71e, 0x9066193a), TOBN(0x2eb50097, 0x06ffac7e),
+              TOBN(0x0654a9c0, 0x4a7d2caa), TOBN(0x6f3fb3d1, 0xa5aaa290),
+              TOBN(0x835db041, 0xff476e8f), TOBN(0x540b8b0b, 0xc42295e4),
+              TOBN(0xa5c73ac9, 0x05e214f5), TOBN(0x9a74075a, 0x56a0b638),
+              TOBN(0x2e4b1090, 0xce9e680b), TOBN(0x57a5b479, 0x6b8d9afa),
+              TOBN(0x0dca48e7, 0x26bfe65c), TOBN(0x097e391c, 0x7290c307),
+              TOBN(0x683c462e, 0x6669e72e), TOBN(0xf505be1e, 0x062559ac),
+              TOBN(0x5fbe3ea1, 0xe3a3035a), TOBN(0x6431ebf6, 0x9cd50da8),
+              TOBN(0xfd169d5c, 0x1f6407f2), TOBN(0x8d838a95, 0x60fce6b8),
+              TOBN(0x2a2bfa7f, 0x650006f0), TOBN(0xdfd7dad3, 0x50c0fbb2),
+              TOBN(0x92452495, 0xccf9ad96), TOBN(0x183bf494, 0xd95635f9),
+              TOBN(0x02d5df43, 0x4a7bd989), TOBN(0x505385cc, 0xa5431095),
+              TOBN(0xdd98e67d, 0xfd43f53e), TOBN(0xd61e1a6c, 0x500c34a9),
+              TOBN(0x5a4b46c6, 0x4a8a3d62), TOBN(0x8469c4d0, 0x247743d2),
+              TOBN(0x2bb3a13d, 0x88f7e433), TOBN(0x62b23a10, 0x01be5849),
+              TOBN(0xe83596b4, 0xa63d1a4c), TOBN(0x454e7fea, 0x7d183f3e),
+              TOBN(0x643fce61, 0x17afb01c), TOBN(0x4e65e5e6, 0x1c4c3638),
+              TOBN(0x41d85ea1, 0xef74c45b), TOBN(0x2cfbfa66, 0xae328506),
+              TOBN(0x98b078f5, 0x3ada7da9), TOBN(0xd985fe37, 0xec752fbb),
+              TOBN(0xeece68fe, 0x5a0148b4), TOBN(0x6f9a55c7, 0x2d78136d),
+              TOBN(0x232dccc4, 0xd2b729ce), TOBN(0xa27e0dfd, 0x90aafbc4),
+              TOBN(0x96474452, 0x12b4603e), TOBN(0xa876c551, 0x6b706d14),
+              TOBN(0xdf145fcf, 0x69a9d412), TOBN(0xe2ab75b7, 0x2d479c34),
+              TOBN(0x12df9a76, 0x1a23ff97), TOBN(0xc6138992, 0x5d359d10),
+              TOBN(0x6e51c7ae, 0xfa835f22), TOBN(0x69a79cb1, 0xc0fcc4d9),
+              TOBN(0xf57f350d, 0x594cc7e1), TOBN(0x3079ca63, 0x3350ab79),
+              TOBN(0x226fb614, 0x9aff594a), TOBN(0x35afec02, 0x6d59a62b),
+              TOBN(0x9bee46f4, 0x06ed2c6e), TOBN(0x58da1735, 0x7d939a57),
+              TOBN(0x44c50402, 0x8fd1797e), TOBN(0xd8853e7c, 0x5ccea6ca),
+              TOBN(0x4065508d, 0xa35fcd5f), TOBN(0x8965df8c, 0x495ccaeb),
+              TOBN(0x0f2da850, 0x12e1a962), TOBN(0xee471b94, 0xc1cf1cc4),
+              TOBN(0xcef19bc8, 0x0a08fb75), TOBN(0x704958f5, 0x81de3591),
+              TOBN(0x2867f8b2, 0x3aef4f88), TOBN(0x8d749384, 0xea9f9a5f),
+              TOBN(0x1b385537, 0x8c9049f4), TOBN(0x5be948f3, 0x7b92d8b6),
+              TOBN(0xd96f725d, 0xb6e2bd6b), TOBN(0x37a222bc, 0x958c454d),
+              TOBN(0xe7c61abb, 0x8809bf61), TOBN(0x46f07fbc, 0x1346f18d),
+              TOBN(0xfb567a7a, 0xe87c0d1c), TOBN(0x84a461c8, 0x7ef3d07a),
+              TOBN(0x0a5adce6, 0xd9278d98), TOBN(0x24d94813, 0x9dfc73e1),
+              TOBN(0x4f3528b6, 0x054321c3), TOBN(0x2e03fdde, 0x692ea706),
+              TOBN(0x10e60619, 0x47b533c0), TOBN(0x1a8bc73f, 0x2ca3c055),
+              TOBN(0xae58d4b2, 0x1bb62b8f), TOBN(0xb2045a73, 0x584a24e3),
+              TOBN(0x3ab3d5af, 0xbd76e195), TOBN(0x478dd1ad, 0x6938a810),
+              TOBN(0x6ffab393, 0x6ee3d5cb), TOBN(0xdfb693db, 0x22b361e4),
+              TOBN(0xf9694496, 0x51dbf1a7), TOBN(0xcab4b4ef, 0x08a2e762),
+              TOBN(0xe8c92f25, 0xd39bba9a), TOBN(0x850e61bc, 0xf1464d96),
+              TOBN(0xb7e830e3, 0xdc09508b), TOBN(0xfaf6d2cf, 0x74317655),
+              TOBN(0x72606ceb, 0xdf690355), TOBN(0x48bb92b3, 0xd0c3ded6),
+              TOBN(0x65b75484, 0x5c7cf892), TOBN(0xf6cd7ac9, 0xd5d5f01f),
+              TOBN(0xc2c30a59, 0x96401d69), TOBN(0x91268650, 0xed921878),
+              TOBN(0x380bf913, 0xb78c558f), TOBN(0x43c0baeb, 0xc8afdaa9),
+              TOBN(0x377f61d5, 0x54f169d3), TOBN(0xf8da07e3, 0xae5ff20b),
+              TOBN(0xb676c49d, 0xa8a90ea8), TOBN(0x81c1ff2b, 0x83a29b21),
+              TOBN(0x383297ac, 0x2ad8d276), TOBN(0x3001122f, 0xba89f982),
+              TOBN(0xe1d794be, 0x6718e448), TOBN(0x246c1482, 0x7c3e6e13),
+              TOBN(0x56646ef8, 0x5d26b5ef), TOBN(0x80f5091e, 0x88069cdd),
+              TOBN(0xc5992e2f, 0x724bdd38), TOBN(0x02e915b4, 0x8471e8c7),
+              TOBN(0x96ff320a, 0x0d0ff2a9), TOBN(0xbf886487, 0x4384d1a0),
+              TOBN(0xbbe1e6a6, 0xc93f72d6), TOBN(0xd5f75d12, 0xcad800ea),
+              TOBN(0xfa40a09f, 0xe7acf117), TOBN(0x32c8cdd5, 0x7581a355),
+              TOBN(0x74221992, 0x7023c499), TOBN(0xa8afe5d7, 0x38ec3901),
+              TOBN(0x5691afcb, 0xa90e83f0), TOBN(0x41bcaa03, 0x0b8f8eac),
+              TOBN(0xe38b5ff9, 0x8d2668d5), TOBN(0x0715281a, 0x7ad81965),
+              TOBN(0x1bc8fc7c, 0x03c6ce11), TOBN(0xcbbee6e2, 0x8b650436),
+              TOBN(0x06b00fe8, 0x0cdb9808), TOBN(0x17d6e066, 0xfe3ed315),
+              TOBN(0x2e9d38c6, 0x4d0b5018), TOBN(0xab8bfd56, 0x844dcaef),
+              TOBN(0x42894a59, 0x513aed8b), TOBN(0xf77f3b6d, 0x314bd07a),
+              TOBN(0xbbdecb8f, 0x8e42b582), TOBN(0xf10e2fa8, 0xd2390fe6),
+              TOBN(0xefb95022, 0x62a2f201), TOBN(0x4d59ea50, 0x50ee32b0),
+              TOBN(0xd87f7728, 0x6da789a8), TOBN(0xcf98a2cf, 0xf79492c4),
+              TOBN(0xf9577239, 0x720943c2), TOBN(0xba044cf5, 0x3990b9d0),
+              TOBN(0x5aa8e823, 0x95f2884a), TOBN(0x834de6ed, 0x0278a0af),
+              TOBN(0xc8e1ee9a, 0x5f25bd12), TOBN(0x9259ceaa, 0x6f7ab271),
+              TOBN(0x7e6d97a2, 0x77d00b76), TOBN(0x5c0c6eea, 0xa437832a),
+              TOBN(0x5232c20f, 0x5606b81d), TOBN(0xabd7b375, 0x0d991ee5),
+              TOBN(0x4d2bfe35, 0x8632d951), TOBN(0x78f85146, 0x98ed9364),
+              TOBN(0x951873f0, 0xf30c3282), TOBN(0x0da8ac80, 0xa789230b),
+              TOBN(0x3ac7789c, 0x5398967f), TOBN(0xa69b8f7f, 0xbdda0fb5),
+              TOBN(0xe5db7717, 0x6add8545), TOBN(0x1b71cb66, 0x72c49b66),
+              TOBN(0xd8560739, 0x68421d77), TOBN(0x03840fe8, 0x83e3afea),
+              TOBN(0xb391dad5, 0x1ec69977), TOBN(0xae243fb9, 0x307f6726),
+              TOBN(0xc88ac87b, 0xe8ca160c), TOBN(0x5174cced, 0x4ce355f4),
+              TOBN(0x98a35966, 0xe58ba37d), TOBN(0xfdcc8da2, 0x7817335d),
+              TOBN(0x5b752830, 0x83fbc7bf), TOBN(0x68e419d4, 0xd9c96984),
+              TOBN(0x409a39f4, 0x02a40380), TOBN(0x88940faf, 0x1fe977bc),
+              TOBN(0xc640a94b, 0x8f8edea6), TOBN(0x1e22cd17, 0xed11547d),
+              TOBN(0xe28568ce, 0x59ffc3e2), TOBN(0x60aa1b55, 0xc1dee4e7),
+              TOBN(0xc67497c8, 0x837cb363), TOBN(0x06fb438a, 0x105a2bf2),
+              TOBN(0x30357ec4, 0x500d8e20), TOBN(0x1ad9095d, 0x0670db10),
+              TOBN(0x7f589a05, 0xc73b7cfd), TOBN(0xf544607d, 0x880d6d28),
+              TOBN(0x17ba93b1, 0xa20ef103), TOBN(0xad859130, 0x6ba6577b),
+              TOBN(0x65c91cf6, 0x6fa214a0), TOBN(0xd7d49c6c, 0x27990da5),
+              TOBN(0xecd9ec8d, 0x20bb569d), TOBN(0xbd4b2502, 0xeeffbc33),
+              TOBN(0x2056ca5a, 0x6bed0467), TOBN(0x7916a1f7, 0x5b63728c),
+              TOBN(0xd4f9497d, 0x53a4f566), TOBN(0x89734664, 0x97b56810),
+              TOBN(0xf8e1da74, 0x0494a621), TOBN(0x82546a93, 0x8d011c68),
+              TOBN(0x1f3acb19, 0xc61ac162), TOBN(0x52f8fa9c, 0xabad0d3e),
+              TOBN(0x15356523, 0xb4b7ea43), TOBN(0x5a16ad61, 0xae608125),
+              TOBN(0xb0bcb87f, 0x4faed184), TOBN(0x5f236b1d, 0x5029f45f),
+              TOBN(0xd42c7607, 0x0bc6b1fc), TOBN(0xc644324e, 0x68aefce3),
+              TOBN(0x8e191d59, 0x5c5d8446), TOBN(0xc0208077, 0x13ae1979),
+              TOBN(0xadcaee55, 0x3ba59cc7), TOBN(0x20ed6d6b, 0xa2cb81ba),
+              TOBN(0x0952ba19, 0xb6efcffc), TOBN(0x60f12d68, 0x97c0b87c),
+              TOBN(0x4ee2c7c4, 0x9caa30bc), TOBN(0x767238b7, 0x97fbff4e),
+              TOBN(0xebc73921, 0x501b5d92), TOBN(0x3279e3df, 0xc2a37737),
+              TOBN(0x9fc12bc8, 0x6d197543), TOBN(0xfa94dc6f, 0x0a40db4e),
+              TOBN(0x7392b41a, 0x530ccbbd), TOBN(0x87c82146, 0xea823525),
+              TOBN(0xa52f984c, 0x05d98d0c), TOBN(0x2ae57d73, 0x5ef6974c),
+              TOBN(0x9377f7bf, 0x3042a6dd), TOBN(0xb1a007c0, 0x19647a64),
+              TOBN(0xfaa9079a, 0x0cca9767), TOBN(0x3d81a25b, 0xf68f72d5),
+              TOBN(0x752067f8, 0xff81578e), TOBN(0x78622150, 0x9045447d),
+              TOBN(0xc0c22fcf, 0x0505aa6f), TOBN(0x1030f0a6, 0x6bed1c77),
+              TOBN(0x31f29f15, 0x1f0bd739), TOBN(0x2d7989c7, 0xe6debe85),
+              TOBN(0x5c070e72, 0x8e677e98), TOBN(0x0a817bd3, 0x06e81fd5),
+              TOBN(0xc110d830, 0xb0f2ac95), TOBN(0x48d0995a, 0xab20e64e),
+              TOBN(0x0f3e00e1, 0x7729cd9a), TOBN(0x2a570c20, 0xdd556946),
+              TOBN(0x912dbcfd, 0x4e86214d), TOBN(0x2d014ee2, 0xcf615498),
+              TOBN(0x55e2b1e6, 0x3530d76e), TOBN(0xc5135ae4, 0xfd0fd6d1),
+              TOBN(0x0066273a, 0xd4f3049f), TOBN(0xbb8e9893, 0xe7087477),
+              TOBN(0x2dba1ddb, 0x14c6e5fd), TOBN(0xdba37886, 0x51f57e6c),
+              TOBN(0x5aaee0a6, 0x5a72f2cf), TOBN(0x1208bfbf, 0x7bea5642),
+              TOBN(0xf5c6aa3b, 0x67872c37), TOBN(0xd726e083, 0x43f93224),
+              TOBN(0x1854daa5, 0x061f1658), TOBN(0xc0016df1, 0xdf0cd2b3),
+              TOBN(0xc2a3f23e, 0x833d50de), TOBN(0x73b681d2, 0xbbbd3017),
+              TOBN(0x2f046dc4, 0x3ac343c0), TOBN(0x9c847e7d, 0x85716421),
+              TOBN(0xe1e13c91, 0x0917eed4), TOBN(0x3fc9eebd, 0x63a1b9c6),
+              TOBN(0x0f816a72, 0x7fe02299), TOBN(0x6335ccc2, 0x294f3319),
+              TOBN(0x3820179f, 0x4745c5be), TOBN(0xe647b782, 0x922f066e),
+              TOBN(0xc22e49de, 0x02cafb8a), TOBN(0x299bc2ff, 0xfcc2eccc),
+              TOBN(0x9a8feea2, 0x6e0e8282), TOBN(0xa627278b, 0xfe893205),
+              TOBN(0xa7e19733, 0x7933e47b), TOBN(0xf4ff6b13, 0x2e766402),
+              TOBN(0xa4d8be0a, 0x98440d9f), TOBN(0x658f5c2f, 0x38938808),
+              TOBN(0x90b75677, 0xc95b3b3e), TOBN(0xfa044269, 0x3137b6ff),
+              TOBN(0x077b039b, 0x43c47c29), TOBN(0xcca95dd3, 0x8a6445b2),
+              TOBN(0x0b498ba4, 0x2333fc4c), TOBN(0x274f8e68, 0xf736a1b1),
+              TOBN(0x6ca348fd, 0x5f1d4b2e), TOBN(0x24d3be78, 0xa8f10199),
+              TOBN(0x8535f858, 0xca14f530), TOBN(0xa6e7f163, 0x5b982e51),
+              TOBN(0x847c8512, 0x36e1bf62), TOBN(0xf6a7c58e, 0x03448418),
+              TOBN(0x583f3703, 0xf9374ab6), TOBN(0x864f9195, 0x6e564145),
+              TOBN(0x33bc3f48, 0x22526d50), TOBN(0x9f323c80, 0x1262a496),
+              TOBN(0xaa97a7ae, 0x3f046a9a), TOBN(0x70da183e, 0xdf8a039a),
+              TOBN(0x5b68f71c, 0x52aa0ba6), TOBN(0x9be0fe51, 0x21459c2d),
+              TOBN(0xc1e17eb6, 0xcbc613e5), TOBN(0x33131d55, 0x497ea61c),
+              TOBN(0x2f69d39e, 0xaf7eded5), TOBN(0x73c2f434, 0xde6af11b),
+              TOBN(0x4ca52493, 0xa4a375fa), TOBN(0x5f06787c, 0xb833c5c2),
+              TOBN(0x814e091f, 0x3e6e71cf), TOBN(0x76451f57, 0x8b746666) },
+          {
+              TOBN(0x80f9bdef, 0x694db7e0),
+              TOBN(0xedca8787, 0xb9fcddc6),
+              TOBN(0x51981c34, 0x03b8dce1),
+              TOBN(0x4274dcf1, 0x70e10ba1),
+              TOBN(0xf72743b8, 0x6def6d1a),
+              TOBN(0xd25b1670, 0xebdb1866),
+              TOBN(0xc4491e8c, 0x050c6f58),
+              TOBN(0x2be2b2ab, 0x87fbd7f5),
+              TOBN(0x3e0e5c9d, 0xd111f8ec),
+              TOBN(0xbcc33f8d, 0xb7c4e760),
+              TOBN(0x702f9a91, 0xbd392a51),
+              TOBN(0x7da4a795, 0xc132e92d),
+              TOBN(0x1a0b0ae3, 0x0bb1151b),
+              TOBN(0x54febac8, 0x02e32251),
+              TOBN(0xea3a5082, 0x694e9e78),
+              TOBN(0xe58ffec1, 0xe4fe40b8),
+              TOBN(0xf85592fc, 0xd1e0cf9e),
+              TOBN(0xdea75f0d, 0xc0e7b2e8),
+              TOBN(0xc04215cf, 0xc135584e),
+              TOBN(0x174fc727, 0x2f57092a),
+              TOBN(0xe7277877, 0xeb930bea),
+              TOBN(0x504caccb, 0x5eb02a5a),
+              TOBN(0xf9fe08f7, 0xf5241b9b),
+              TOBN(0xe7fb62f4, 0x8d5ca954),
+              TOBN(0xfbb8349d, 0x29c4120b),
+              TOBN(0x9f94391f, 0xc0d0d915),
+              TOBN(0xc4074fa7, 0x5410ba51),
+              TOBN(0xa66adbf6, 0x150a5911),
+              TOBN(0xc164543c, 0x34bfca38),
+              TOBN(0xe0f27560, 0xb9e1ccfc),
+              TOBN(0x99da0f53, 0xe820219c),
+              TOBN(0xe8234498, 0xc6b4997a),
+              TOBN(0xcfb88b76, 0x9d4c5423),
+              TOBN(0x9e56eb10, 0xb0521c49),
+              TOBN(0x418e0b5e, 0xbe8700a1),
+              TOBN(0x00cbaad6, 0xf93cb58a),
+              TOBN(0xe923fbde, 0xd92a5e67),
+              TOBN(0xca4979ac, 0x1f347f11),
+              TOBN(0x89162d85, 0x6bc0585b),
+              TOBN(0xdd6254af, 0xac3c70e3),
+              TOBN(0x7b23c513, 0x516e19e4),
+              TOBN(0x56e2e847, 0xc5c4d593),
+              TOBN(0x9f727d73, 0x5ce71ef6),
+              TOBN(0x5b6304a6, 0xf79a44c5),
+              TOBN(0x6638a736, 0x3ab7e433),
+              TOBN(0x1adea470, 0xfe742f83),
+              TOBN(0xe054b854, 0x5b7fc19f),
+              TOBN(0xf935381a, 0xba1d0698),
+              TOBN(0x546eab2d, 0x799e9a74),
+              TOBN(0x96239e0e, 0xa949f729),
+              TOBN(0xca274c6b, 0x7090055a),
+              TOBN(0x835142c3, 0x9020c9b0),
+              TOBN(0xa405667a, 0xa2e8807f),
+              TOBN(0x29f2c085, 0x1aa3d39e),
+              TOBN(0xcc555d64, 0x42fc72f5),
+              TOBN(0xe856e0e7, 0xfbeacb3c),
+              TOBN(0xb5504f9d, 0x918e4936),
+              TOBN(0x65035ef6, 0xb2513982),
+              TOBN(0x0553a0c2, 0x6f4d9cb9),
+              TOBN(0x6cb10d56, 0xbea85509),
+              TOBN(0x48d957b7, 0xa242da11),
+              TOBN(0x16a4d3dd, 0x672b7268),
+              TOBN(0x3d7e637c, 0x8502a96b),
+              TOBN(0x27c7032b, 0x730d463b),
+              TOBN(0xbdc02b18, 0xe4136a14),
+              TOBN(0xbacf969d, 0x678e32bf),
+              TOBN(0xc98d89a3, 0xdd9c3c03),
+              TOBN(0x7b92420a, 0x23becc4f),
+              TOBN(0xd4b41f78, 0xc64d565c),
+              TOBN(0x9f969d00, 0x10f28295),
+              TOBN(0xec7f7f76, 0xb13d051a),
+              TOBN(0x08945e1e, 0xa92da585),
+              TOBN(0x55366b7d, 0x5846426f),
+              TOBN(0xe7d09e89, 0x247d441d),
+              TOBN(0x510b404d, 0x736fbf48),
+              TOBN(0x7fa003d0, 0xe784bd7d),
+              TOBN(0x25f7614f, 0x17fd9596),
+              TOBN(0x49e0e0a1, 0x35cb98db),
+              TOBN(0x2c65957b, 0x2e83a76a),
+              TOBN(0x5d40da8d, 0xcddbe0f8),
+              TOBN(0xf2b8c405, 0x050bad24),
+              TOBN(0x8918426d, 0xc2aa4823),
+              TOBN(0x2aeab3dd, 0xa38365a7),
+              TOBN(0x72031717, 0x7c91b690),
+              TOBN(0x8b00d699, 0x60a94120),
+              TOBN(0x478a255d, 0xe99eaeec),
+              TOBN(0xbf656a5f, 0x6f60aafd),
+              TOBN(0xdfd7cb75, 0x5dee77b3),
+              TOBN(0x37f68bb4, 0xa595939d),
+              TOBN(0x03556479, 0x28740217),
+              TOBN(0x8e740e7c, 0x84ad7612),
+              TOBN(0xd89bc843, 0x9044695f),
+              TOBN(0xf7f3da5d, 0x85a9184d),
+              TOBN(0x562563bb, 0x9fc0b074),
+              TOBN(0x06d2e6aa, 0xf88a888e),
+              TOBN(0x612d8643, 0x161fbe7c),
+              TOBN(0x465edba7, 0xf64085e7),
+              TOBN(0xb230f304, 0x29aa8511),
+              TOBN(0x53388426, 0xcda2d188),
+              TOBN(0x90885735, 0x4b666649),
+              TOBN(0x6f02ff9a, 0x652f54f6),
+              TOBN(0x65c82294, 0x5fae2bf0),
+              TOBN(0x7816ade0, 0x62f5eee3),
+              TOBN(0xdcdbdf43, 0xfcc56d70),
+              TOBN(0x9fb3bba3, 0x54530bb2),
+              TOBN(0xbde3ef77, 0xcb0869ea),
+              TOBN(0x89bc9046, 0x0b431163),
+              TOBN(0x4d03d7d2, 0xe4819a35),
+              TOBN(0x33ae4f9e, 0x43b6a782),
+              TOBN(0x216db307, 0x9c88a686),
+              TOBN(0x91dd88e0, 0x00ffedd9),
+              TOBN(0xb280da9f, 0x12bd4840),
+              TOBN(0x32a7cb8a, 0x1635e741),
+              TOBN(0xfe14008a, 0x78be02a7),
+              TOBN(0x3fafb334, 0x1b7ae030),
+              TOBN(0x7fd508e7, 0x5add0ce9),
+              TOBN(0x72c83219, 0xd607ad51),
+              TOBN(0x0f229c0a, 0x8d40964a),
+              TOBN(0x1be2c336, 0x1c878da2),
+              TOBN(0xe0c96742, 0xeab2ab86),
+              TOBN(0x458f8691, 0x3e538cd7),
+              TOBN(0xa7001f6c, 0x8e08ad53),
+              TOBN(0x52b8c6e6, 0xbf5d15ff),
+              TOBN(0x548234a4, 0x011215dd),
+              TOBN(0xff5a9d2d, 0x3d5b4045),
+              TOBN(0xb0ffeeb6, 0x4a904190),
+              TOBN(0x55a3aca4, 0x48607f8b),
+              TOBN(0x8cbd665c, 0x30a0672a),
+              TOBN(0x87f834e0, 0x42583068),
+              TOBN(0x02da2aeb, 0xf3f6e683),
+              TOBN(0x6b763e5d, 0x05c12248),
+              TOBN(0x7230378f, 0x65a8aefc),
+              TOBN(0x93bd80b5, 0x71e8e5ca),
+              TOBN(0x53ab041c, 0xb3b62524),
+              TOBN(0x1b860513, 0x6c9c552e),
+              TOBN(0xe84d402c, 0xd5524e66),
+              TOBN(0xa37f3573, 0xf37f5937),
+              TOBN(0xeb0f6c7d, 0xd1e4fca5),
+              TOBN(0x2965a554, 0xac8ab0fc),
+              TOBN(0x17fbf56c, 0x274676ac),
+              TOBN(0x2e2f6bd9, 0xacf7d720),
+              TOBN(0x41fc8f88, 0x10224766),
+              TOBN(0x517a14b3, 0x85d53bef),
+              TOBN(0xdae327a5, 0x7d76a7d1),
+              TOBN(0x6ad0a065, 0xc4818267),
+              TOBN(0x33aa189b, 0x37c1bbc1),
+              TOBN(0x64970b52, 0x27392a92),
+              TOBN(0x21699a1c, 0x2d1535ea),
+              TOBN(0xcd20779c, 0xc2d7a7fd),
+              TOBN(0xe3186059, 0x99c83cf2),
+              TOBN(0x9b69440b, 0x72c0b8c7),
+              TOBN(0xa81497d7, 0x7b9e0e4d),
+              TOBN(0x515d5c89, 0x1f5f82dc),
+              TOBN(0x9a7f67d7, 0x6361079e),
+              TOBN(0xa8da81e3, 0x11a35330),
+              TOBN(0xe44990c4, 0x4b18be1b),
+              TOBN(0xc7d5ed95, 0xaf103e59),
+              TOBN(0xece8aba7, 0x8dac9261),
+              TOBN(0xbe82b099, 0x9394b8d3),
+              TOBN(0x6830f09a, 0x16adfe83),
+              TOBN(0x250a29b4, 0x88172d01),
+              TOBN(0x8b20bd65, 0xcaff9e02),
+              TOBN(0xb8a7661e, 0xe8a6329a),
+              TOBN(0x4520304d, 0xd3fce920),
+              TOBN(0xae45da1f, 0x2b47f7ef),
+              TOBN(0xe07f5288, 0x5bffc540),
+              TOBN(0xf7997009, 0x3464f874),
+              TOBN(0x2244c2cd, 0xa6fa1f38),
+              TOBN(0x43c41ac1, 0x94d7d9b1),
+              TOBN(0x5bafdd82, 0xc82e7f17),
+              TOBN(0xdf0614c1, 0x5fda0fca),
+              TOBN(0x74b043a7, 0xa8ae37ad),
+              TOBN(0x3ba6afa1, 0x9e71734c),
+              TOBN(0x15d5437e, 0x9c450f2e),
+              TOBN(0x4a5883fe, 0x67e242b1),
+              TOBN(0x5143bdc2, 0x2c1953c2),
+              TOBN(0x542b8b53, 0xfc5e8920),
+              TOBN(0x363bf9a8, 0x9a9cee08),
+              TOBN(0x02375f10, 0xc3486e08),
+              TOBN(0x2037543b, 0x8c5e70d2),
+              TOBN(0x7109bccc, 0x625640b4),
+              TOBN(0xcbc1051e, 0x8bc62c3b),
+              TOBN(0xf8455fed, 0x803f26ea),
+              TOBN(0x6badceab, 0xeb372424),
+              TOBN(0xa2a9ce7c, 0x6b53f5f9),
+              TOBN(0x64246595, 0x1b176d99),
+              TOBN(0xb1298d36, 0xb95c081b),
+              TOBN(0x53505bb8, 0x1d9a9ee6),
+              TOBN(0x3f6f9e61, 0xf2ba70b0),
+              TOBN(0xd07e16c9, 0x8afad453),
+              TOBN(0x9f1694bb, 0xe7eb4a6a),
+              TOBN(0xdfebced9, 0x3cb0bc8e),
+              TOBN(0x92d3dcdc, 0x53868c8b),
+              TOBN(0x174311a2, 0x386107a6),
+              TOBN(0x4109e07c, 0x689b4e64),
+              TOBN(0x30e4587f, 0x2df3dcb6),
+              TOBN(0x841aea31, 0x0811b3b2),
+              TOBN(0x6144d41d, 0x0cce43ea),
+              TOBN(0x464c4581, 0x2a9a7803),
+              TOBN(0xd03d371f, 0x3e158930),
+              TOBN(0xc676d7f2, 0xb1f3390b),
+              TOBN(0x9f7a1b8c, 0xa5b61272),
+              TOBN(0x4ebebfc9, 0xc2e127a9),
+              TOBN(0x4602500c, 0x5dd997bf),
+              TOBN(0x7f09771c, 0x4711230f),
+              TOBN(0x058eb37c, 0x020f09c1),
+              TOBN(0xab693d4b, 0xfee5e38b),
+              TOBN(0x9289eb1f, 0x4653cbc0),
+              TOBN(0xbecf46ab, 0xd51b9cf5),
+              TOBN(0xd2aa9c02, 0x9f0121af),
+              TOBN(0x36aaf7d2, 0xe90dc274),
+              TOBN(0x909e4ea0, 0x48b95a3c),
+              TOBN(0xe6b70496, 0x6f32dbdb),
+              TOBN(0x672188a0, 0x8b030b3e),
+              TOBN(0xeeffe5b3, 0xcfb617e2),
+              TOBN(0x87e947de, 0x7c82709e),
+              TOBN(0xa44d2b39, 0x1770f5a7),
+              TOBN(0xe4d4d791, 0x0e44eb82),
+              TOBN(0x42e69d1e, 0x3f69712a),
+              TOBN(0xbf11c4d6, 0xac6a820e),
+              TOBN(0xb5e7f3e5, 0x42c4224c),
+              TOBN(0xd6b4e81c, 0x449d941c),
+              TOBN(0x5d72bd16, 0x5450e878),
+              TOBN(0x6a61e28a, 0xee25ac54),
+              TOBN(0x33272094, 0xe6f1cd95),
+              TOBN(0x7512f30d, 0x0d18673f),
+              TOBN(0x32f7a4ca, 0x5afc1464),
+              TOBN(0x2f095656, 0x6bbb977b),
+              TOBN(0x586f47ca, 0xa8226200),
+              TOBN(0x02c868ad, 0x1ac07369),
+              TOBN(0x4ef2b845, 0xc613acbe),
+              TOBN(0x43d7563e, 0x0386054c),
+              TOBN(0x54da9dc7, 0xab952578),
+              TOBN(0xb5423df2, 0x26e84d0b),
+              TOBN(0xa8b64eeb, 0x9b872042),
+              TOBN(0xac205782, 0x5990f6df),
+              TOBN(0x4ff696eb, 0x21f4c77a),
+              TOBN(0x1a79c3e4, 0xaab273af),
+              TOBN(0x29bc922e, 0x9436b3f1),
+              TOBN(0xff807ef8, 0xd6d9a27a),
+              TOBN(0x82acea3d, 0x778f22a0),
+              TOBN(0xfb10b2e8, 0x5b5e7469),
+              TOBN(0xc0b16980, 0x2818ee7d),
+              TOBN(0x011afff4, 0xc91c1a2f),
+              TOBN(0x95a6d126, 0xad124418),
+              TOBN(0x31c081a5, 0xe72e295f),
+              TOBN(0x36bb283a, 0xf2f4db75),
+              TOBN(0xd115540f, 0x7acef462),
+              TOBN(0xc7f3a8f8, 0x33f6746c),
+              TOBN(0x21e46f65, 0xfea990ca),
+              TOBN(0x915fd5c5, 0xcaddb0a9),
+              TOBN(0xbd41f016, 0x78614555),
+              TOBN(0x346f4434, 0x426ffb58),
+              TOBN(0x80559436, 0x14dbc204),
+              TOBN(0xf3dd20fe, 0x5a969b7f),
+              TOBN(0x9d59e956, 0xe899a39a),
+              TOBN(0xf1b0971c, 0x8ad4cf4b),
+              TOBN(0x03448860, 0x2ffb8fb8),
+              TOBN(0xf071ac3c, 0x65340ba4),
+              TOBN(0x408d0596, 0xb27fd758),
+              TOBN(0xe7c78ea4, 0x98c364b0),
+              TOBN(0xa4aac4a5, 0x051e8ab5),
+              TOBN(0xb9e1d560, 0x485d9002),
+              TOBN(0x9acd518a, 0x88844455),
+              TOBN(0xe4ca688f, 0xd06f56c0),
+              TOBN(0xa48af70d, 0xdf027972),
+              TOBN(0x691f0f04, 0x5e9a609d),
+              TOBN(0xa9dd82cd, 0xee61270e),
+              TOBN(0x8903ca63, 0xa0ef18d3),
+              TOBN(0x9fb7ee35, 0x3d6ca3bd),
+              TOBN(0xa7b4a09c, 0xabf47d03),
+              TOBN(0x4cdada01, 0x1c67de8e),
+              TOBN(0x52003749, 0x9355a244),
+              TOBN(0xe77fd2b6, 0x4f2151a9),
+              TOBN(0x695d6cf6, 0x66b4efcb),
+              TOBN(0xc5a0cacf, 0xda2cfe25),
+              TOBN(0x104efe5c, 0xef811865),
+              TOBN(0xf52813e8, 0x9ea5cc3d),
+              TOBN(0x855683dc, 0x40b58dbc),
+              TOBN(0x0338ecde, 0x175fcb11),
+              TOBN(0xf9a05637, 0x74921592),
+              TOBN(0xb4f1261d, 0xb9bb9d31),
+              TOBN(0x551429b7, 0x4e9c5459),
+              TOBN(0xbe182e6f, 0x6ea71f53),
+              TOBN(0xd3a3b07c, 0xdfc50573),
+              TOBN(0x9ba1afda, 0x62be8d44),
+              TOBN(0x9bcfd2cb, 0x52ab65d3),
+              TOBN(0xdf11d547, 0xa9571802),
+              TOBN(0x099403ee, 0x02a2404a),
+              TOBN(0x497406f4, 0x21088a71),
+              TOBN(0x99479409, 0x5004ae71),
+              TOBN(0xbdb42078, 0xa812c362),
+              TOBN(0x2b72a30f, 0xd8828442),
+              TOBN(0x283add27, 0xfcb5ed1c),
+              TOBN(0xf7c0e200, 0x66a40015),
+              TOBN(0x3e3be641, 0x08b295ef),
+              TOBN(0xac127dc1, 0xe038a675),
+              TOBN(0x729deff3, 0x8c5c6320),
+              TOBN(0xb7df8fd4, 0xa90d2c53),
+              TOBN(0x9b74b0ec, 0x681e7cd3),
+              TOBN(0x5cb5a623, 0xdab407e5),
+              TOBN(0xcdbd3615, 0x76b340c6),
+              TOBN(0xa184415a, 0x7d28392c),
+              TOBN(0xc184c1d8, 0xe96f7830),
+              TOBN(0xc3204f19, 0x81d3a80f),
+              TOBN(0xfde0c841, 0xc8e02432),
+              TOBN(0x78203b3e, 0x8149e0c1),
+              TOBN(0x5904bdbb, 0x08053a73),
+              TOBN(0x30fc1dd1, 0x101b6805),
+              TOBN(0x43c223bc, 0x49aa6d49),
+              TOBN(0x9ed67141, 0x7a174087),
+              TOBN(0x311469a0, 0xd5997008),
+              TOBN(0xb189b684, 0x5e43fc61),
+              TOBN(0xf3282375, 0xe0d3ab57),
+              TOBN(0x4fa34b67, 0xb1181da8),
+              TOBN(0x621ed0b2, 0x99ee52b8),
+              TOBN(0x9b178de1, 0xad990676),
+              TOBN(0xd51de67b, 0x56d54065),
+              TOBN(0x2a2c27c4, 0x7538c201),
+              TOBN(0x33856ec8, 0x38a40f5c),
+              TOBN(0x2522fc15, 0xbe6cdcde),
+              TOBN(0x1e603f33, 0x9f0c6f89),
+              TOBN(0x7994edc3, 0x103e30a6),
+              TOBN(0x033a00db, 0x220c853e),
+              TOBN(0xd3cfa409, 0xf7bb7fd7),
+              TOBN(0x70f8781e, 0x462d18f6),
+              TOBN(0xbbd82980, 0x687fe295),
+              TOBN(0x6eef4c32, 0x595669f3),
+              TOBN(0x86a9303b, 0x2f7e85c3),
+              TOBN(0x5fce4621, 0x71988f9b),
+              TOBN(0x5b935bf6, 0xc138acb5),
+              TOBN(0x30ea7d67, 0x25661212),
+              TOBN(0xef1eb5f4, 0xe51ab9a2),
+              TOBN(0x0587c98a, 0xae067c78),
+              TOBN(0xb3ce1b3c, 0x77ca9ca6),
+              TOBN(0x2a553d4d, 0x54b5f057),
+              TOBN(0xc7898236, 0x4da29ec2),
+              TOBN(0xdbdd5d13, 0xb9c57316),
+              TOBN(0xc57d6e6b, 0x2cd80d47),
+              TOBN(0x80b460cf, 0xfe9e7391),
+              TOBN(0x98648cab, 0xf963c31e),
+              TOBN(0x67f9f633, 0xcc4d32fd),
+              TOBN(0x0af42a9d, 0xfdf7c687),
+              TOBN(0x55f292a3, 0x0b015ea7),
+              TOBN(0x89e468b2, 0xcd21ab3d),
+              TOBN(0xe504f022, 0xc393d392),
+              TOBN(0xab21e1d4, 0xa5013af9),
+              TOBN(0xe3283f78, 0xc2c28acb),
+              TOBN(0xf38b35f6, 0x226bf99f),
+              TOBN(0xe8354274, 0x0e291e69),
+              TOBN(0x61673a15, 0xb20c162d),
+              TOBN(0xc101dc75, 0xb04fbdbe),
+              TOBN(0x8323b4c2, 0x255bd617),
+              TOBN(0x6c969693, 0x6c2a9154),
+              TOBN(0xc6e65860, 0x62679387),
+              TOBN(0x8e01db0c, 0xb8c88e23),
+              TOBN(0x33c42873, 0x893a5559),
+              TOBN(0x7630f04b, 0x47a3e149),
+              TOBN(0xb5d80805, 0xddcf35f8),
+              TOBN(0x582ca080, 0x77dfe732),
+              TOBN(0x2c7156e1, 0x0b1894a0),
+              TOBN(0x92034001, 0xd81c68c0),
+              TOBN(0xed225d00, 0xc8b115b5),
+              TOBN(0x237f9c22, 0x83b907f2),
+              TOBN(0x0ea2f32f, 0x4470e2c0),
+              TOBN(0xb725f7c1, 0x58be4e95),
+              TOBN(0x0f1dcafa, 0xb1ae5463),
+              TOBN(0x59ed5187, 0x1ba2fc04),
+              TOBN(0xf6e0f316, 0xd0115d4d),
+              TOBN(0x5180b12f, 0xd3691599),
+              TOBN(0x157e32c9, 0x527f0a41),
+              TOBN(0x7b0b081d, 0xa8e0ecc0),
+              TOBN(0x6dbaaa8a, 0xbf4f0dd0),
+              TOBN(0x99b289c7, 0x4d252696),
+              TOBN(0x79b7755e, 0xdbf864fe),
+              TOBN(0x6974e2b1, 0x76cad3ab),
+              TOBN(0x35dbbee2, 0x06ddd657),
+              TOBN(0xe7cbdd11, 0x2ff3a96d),
+              TOBN(0x88381968, 0x076be758),
+              TOBN(0x2d737e72, 0x08c91f5d),
+              TOBN(0x5f83ab62, 0x86ec3776),
+              TOBN(0x98aa649d, 0x945fa7a1),
+              TOBN(0xf477ec37, 0x72ef0933),
+              TOBN(0x66f52b1e, 0x098c17b1),
+              TOBN(0x9eec58fb, 0xd803738b),
+              TOBN(0x91aaade7, 0xe4e86aa4),
+              TOBN(0x6b1ae617, 0xa5b51492),
+              TOBN(0x63272121, 0xbbc45974),
+              TOBN(0x7e0e28f0, 0x862c5129),
+              TOBN(0x0a8f79a9, 0x3321a4a0),
+              TOBN(0xe26d1664, 0x5041c88f),
+              TOBN(0x0571b805, 0x53233e3a),
+              TOBN(0xd1b0ccde, 0xc9520711),
+              TOBN(0x55a9e4ed, 0x3c8b84bf),
+              TOBN(0x9426bd39, 0xa1fef314),
+              TOBN(0x4f5f638e, 0x6eb93f2b),
+              TOBN(0xba2a1ed3, 0x2bf9341b),
+              TOBN(0xd63c1321, 0x4d42d5a9),
+              TOBN(0xd2964a89, 0x316dc7c5),
+              TOBN(0xd1759606, 0xca511851),
+              TOBN(0xd8a9201f, 0xf9e6ed35),
+              TOBN(0xb7b5ee45, 0x6736925a),
+              TOBN(0x0a83fbbc, 0x99581af7),
+              TOBN(0x3076bc40, 0x64eeb051),
+              TOBN(0x5511c98c, 0x02dec312),
+              TOBN(0x270de898, 0x238dcb78),
+              TOBN(0x2cf4cf9c, 0x539c08c9),
+              TOBN(0xa70cb65e, 0x38d3b06e),
+              TOBN(0xb12ec10e, 0xcfe57bbd),
+              TOBN(0x82c7b656, 0x35a0c2b5),
+              TOBN(0xddc7d5cd, 0x161c67bd),
+              TOBN(0xe32e8985, 0xae3a32cc),
+              TOBN(0x7aba9444, 0xd11a5529),
+              TOBN(0xe964ed02, 0x2427fa1a),
+              TOBN(0x1528392d, 0x24a1770a),
+              TOBN(0xa152ce2c, 0x12c72fcd),
+              TOBN(0x714553a4, 0x8ec07649),
+              TOBN(0x18b4c290, 0x459dd453),
+              TOBN(0xea32b714, 0x7b64b110),
+              TOBN(0xb871bfa5, 0x2e6f07a2),
+              TOBN(0xb67112e5, 0x9e2e3c9b),
+              TOBN(0xfbf250e5, 0x44aa90f6),
+              TOBN(0xf77aedb8, 0xbd539006),
+              TOBN(0x3b0cdf9a, 0xd172a66f),
+              TOBN(0xedf69fea, 0xf8c51187),
+              TOBN(0x05bb67ec, 0x741e4da7),
+              TOBN(0x47df0f32, 0x08114345),
+              TOBN(0x56facb07, 0xbb9792b1),
+              TOBN(0xf3e007e9, 0x8f6229e4),
+              TOBN(0x62d103f4, 0x526fba0f),
+              TOBN(0x4f33bef7, 0xb0339d79),
+              TOBN(0x9841357b, 0xb59bfec1),
+              TOBN(0xfa8dbb59, 0xc34e6705),
+              TOBN(0xc3c7180b, 0x7fdaa84c),
+              TOBN(0xf95872fc, 0xa4108537),
+              TOBN(0x8750cc3b, 0x932a3e5a),
+              TOBN(0xb61cc69d, 0xb7275d7d),
+              TOBN(0xffa0168b, 0x2e59b2e9),
+              TOBN(0xca032abc, 0x6ecbb493),
+              TOBN(0x1d86dbd3, 0x2c9082d8),
+              TOBN(0xae1e0b67, 0xe28ef5ba),
+              TOBN(0x2c9a4699, 0xcb18e169),
+              TOBN(0x0ecd0e33, 0x1e6bbd20),
+              TOBN(0x571b360e, 0xaf5e81d2),
+              TOBN(0xcd9fea58, 0x101c1d45),
+              TOBN(0x6651788e, 0x18880452),
+              TOBN(0xa9972635, 0x1f8dd446),
+              TOBN(0x44bed022, 0xe37281d0),
+              TOBN(0x094b2b2d, 0x33da525d),
+              TOBN(0xf193678e, 0x13144fd8),
+              TOBN(0xb8ab5ba4, 0xf4c1061d),
+              TOBN(0x4343b5fa, 0xdccbe0f4),
+              TOBN(0xa8702371, 0x63812713),
+              TOBN(0x47bf6d2d, 0xf7611d93),
+              TOBN(0x46729b8c, 0xbd21e1d7),
+              TOBN(0x7484d4e0, 0xd629e77d),
+              TOBN(0x830e6eea, 0x60dbac1f),
+              TOBN(0x23d8c484, 0xda06a2f7),
+              TOBN(0x896714b0, 0x50ca535b),
+              TOBN(0xdc8d3644, 0xebd97a9b),
+              TOBN(0x106ef9fa, 0xb12177b4),
+              TOBN(0xf79bf464, 0x534d5d9c),
+              TOBN(0x2537a349, 0xa6ab360b),
+              TOBN(0xc7c54253, 0xa00c744f),
+              TOBN(0xb3c7a047, 0xe5911a76),
+              TOBN(0x61ffa5c8, 0x647f1ee7),
+              TOBN(0x15aed36f, 0x8f56ab42),
+              TOBN(0x6a0d41b0, 0xa3ff9ac9),
+              TOBN(0x68f469f5, 0xcc30d357),
+              TOBN(0xbe9adf81, 0x6b72be96),
+              TOBN(0x1cd926fe, 0x903ad461),
+              TOBN(0x7e89e38f, 0xcaca441b),
+              TOBN(0xf0f82de5, 0xfacf69d4),
+              TOBN(0x363b7e76, 0x4775344c),
+              TOBN(0x6894f312, 0xb2e36d04),
+              TOBN(0x3c6cb4fe, 0x11d1c9a5),
+              TOBN(0x85d9c339, 0x4008e1f2),
+              TOBN(0x5e9a85ea, 0x249f326c),
+              TOBN(0xdc35c60a, 0x678c5e06),
+              TOBN(0xc08b944f, 0x9f86fba9),
+              TOBN(0xde40c02c, 0x89f71f0f),
+              TOBN(0xad8f3e31, 0xff3da3c0),
+              TOBN(0x3ea5096b, 0x42125ded),
+              TOBN(0x13879cbf, 0xa7379183),
+              TOBN(0x6f4714a5, 0x6b306a0b),
+              TOBN(0x359c2ea6, 0x67646c5e),
+              TOBN(0xfacf8943, 0x07726368),
+              TOBN(0x07a58935, 0x65ff431e),
+              TOBN(0x24d661d1, 0x68754ab0),
+              TOBN(0x801fce1d, 0x6f429a76),
+              TOBN(0xc068a85f, 0xa58ce769),
+              TOBN(0xedc35c54, 0x5d5eca2b),
+              TOBN(0xea31276f, 0xa3f660d1),
+              TOBN(0xa0184ebe, 0xb8fc7167),
+              TOBN(0x0f20f21a, 0x1d8db0ae),
+              TOBN(0xd96d095f, 0x56c35e12),
+              TOBN(0xedf402b5, 0xf8c2a25b),
+              TOBN(0x1bb772b9, 0x059204b6),
+              TOBN(0x50cbeae2, 0x19b4e34c),
+              TOBN(0x93109d80, 0x3fa0845a),
+              TOBN(0x54f7ccf7, 0x8ef59fb5),
+              TOBN(0x3b438fe2, 0x88070963),
+              TOBN(0x9e28c659, 0x31f3ba9b),
+              TOBN(0x9cc31b46, 0xead9da92),
+              TOBN(0x3c2f0ba9, 0xb733aa5f),
+              TOBN(0xdece47cb, 0xf05af235),
+              TOBN(0xf8e3f715, 0xa2ac82a5),
+              TOBN(0xc97ba641, 0x2203f18a),
+              TOBN(0xc3af5504, 0x09c11060),
+              TOBN(0x56ea2c05, 0x46af512d),
+              TOBN(0xfac28daf, 0xf3f28146),
+              TOBN(0x87fab43a, 0x959ef494),
+          },
+          {
+              TOBN(0x09891641, 0xd4c5105f),
+              TOBN(0x1ae80f8e, 0x6d7fbd65),
+              TOBN(0x9d67225f, 0xbee6bdb0),
+              TOBN(0x3b433b59, 0x7fc4d860),
+              TOBN(0x44e66db6, 0x93e85638),
+              TOBN(0xf7b59252, 0xe3e9862f),
+              TOBN(0xdb785157, 0x665c32ec),
+              TOBN(0x702fefd7, 0xae362f50),
+              TOBN(0x3754475d, 0x0fefb0c3),
+              TOBN(0xd48fb56b, 0x46d7c35d),
+              TOBN(0xa070b633, 0x363798a4),
+              TOBN(0xae89f3d2, 0x8fdb98e6),
+              TOBN(0x970b89c8, 0x6363d14c),
+              TOBN(0x89817521, 0x67abd27d),
+              TOBN(0x9bf7d474, 0x44d5a021),
+              TOBN(0xb3083baf, 0xcac72aee),
+              TOBN(0x389741de, 0xbe949a44),
+              TOBN(0x638e9388, 0x546a4fa5),
+              TOBN(0x3fe6419c, 0xa0047bdc),
+              TOBN(0x7047f648, 0xaaea57ca),
+              TOBN(0x54e48a90, 0x41fbab17),
+              TOBN(0xda8e0b28, 0x576bdba2),
+              TOBN(0xe807eebc, 0xc72afddc),
+              TOBN(0x07d3336d, 0xf42577bf),
+              TOBN(0x62a8c244, 0xbfe20925),
+              TOBN(0x91c19ac3, 0x8fdce867),
+              TOBN(0x5a96a5d5, 0xdd387063),
+              TOBN(0x61d587d4, 0x21d324f6),
+              TOBN(0xe87673a2, 0xa37173ea),
+              TOBN(0x23848008, 0x53778b65),
+              TOBN(0x10f8441e, 0x05bab43e),
+              TOBN(0xfa11fe12, 0x4621efbe),
+              TOBN(0x047b772e, 0x81685d7b),
+              TOBN(0x23f27d81, 0xbf34a976),
+              TOBN(0xc27608e2, 0x915f48ef),
+              TOBN(0x3b0b43fa, 0xa521d5c3),
+              TOBN(0x7613fb26, 0x63ca7284),
+              TOBN(0x7f5729b4, 0x1d4db837),
+              TOBN(0x87b14898, 0x583b526b),
+              TOBN(0x00b732a6, 0xbbadd3d1),
+              TOBN(0x8e02f426, 0x2048e396),
+              TOBN(0x436b50b6, 0x383d9de4),
+              TOBN(0xf78d3481, 0x471e85ad),
+              TOBN(0x8b01ea6a, 0xd005c8d6),
+              TOBN(0xd3c7afee, 0x97015c07),
+              TOBN(0x46cdf1a9, 0x4e3ba2ae),
+              TOBN(0x7a42e501, 0x83d3a1d2),
+              TOBN(0xd54b5268, 0xb541dff4),
+              TOBN(0x3f24cf30, 0x4e23e9bc),
+              TOBN(0x4387f816, 0x126e3624),
+              TOBN(0x26a46a03, 0x3b0b6d61),
+              TOBN(0xaf1bc845, 0x8b2d777c),
+              TOBN(0x25c401ba, 0x527de79c),
+              TOBN(0x0e1346d4, 0x4261bbb6),
+              TOBN(0x4b96c44b, 0x287b4bc7),
+              TOBN(0x658493c7, 0x5254562f),
+              TOBN(0x23f949fe, 0xb8a24a20),
+              TOBN(0x17ebfed1, 0xf52ca53f),
+              TOBN(0x9b691bbe, 0xbcfb4853),
+              TOBN(0x5617ff6b, 0x6278a05d),
+              TOBN(0x241b34c5, 0xe3c99ebd),
+              TOBN(0xfc64242e, 0x1784156a),
+              TOBN(0x4206482f, 0x695d67df),
+              TOBN(0xb967ce0e, 0xee27c011),
+              TOBN(0x65db3751, 0x21c80b5d),
+              TOBN(0x2e7a563c, 0xa31ecca0),
+              TOBN(0xe56ffc4e, 0x5238a07e),
+              TOBN(0x3d6c2966, 0x32ced854),
+              TOBN(0xe99d7d1a, 0xaf70b885),
+              TOBN(0xafc3bad9, 0x2d686459),
+              TOBN(0x9c78bf46, 0x0cc8ba5b),
+              TOBN(0x5a439519, 0x18955aa3),
+              TOBN(0xf8b517a8, 0x5fe4e314),
+              TOBN(0xe60234d0, 0xfcb8906f),
+              TOBN(0xffe542ac, 0xf2061b23),
+              TOBN(0x287e191f, 0x6b4cb59c),
+              TOBN(0x21857ddc, 0x09d877d8),
+              TOBN(0x1c23478c, 0x14678941),
+              TOBN(0xbbf0c056, 0xb6e05ea4),
+              TOBN(0x82da4b53, 0xb01594fe),
+              TOBN(0xf7526791, 0xfadb8608),
+              TOBN(0x049e832d, 0x7b74cdf6),
+              TOBN(0xa43581cc, 0xc2b90a34),
+              TOBN(0x73639eb8, 0x9360b10c),
+              TOBN(0x4fba331f, 0xe1e4a71b),
+              TOBN(0x6ffd6b93, 0x8072f919),
+              TOBN(0x6e53271c, 0x65679032),
+              TOBN(0x67206444, 0xf14272ce),
+              TOBN(0xc0f734a3, 0xb2335834),
+              TOBN(0x9526205a, 0x90ef6860),
+              TOBN(0xcb8be717, 0x04e2bb0d),
+              TOBN(0x2418871e, 0x02f383fa),
+              TOBN(0xd7177681, 0x4082c157),
+              TOBN(0xcc914ad0, 0x29c20073),
+              TOBN(0xf186c1eb, 0xe587e728),
+              TOBN(0x6fdb3c22, 0x61bcd5fd),
+              TOBN(0x30d014a6, 0xf2f9f8e9),
+              TOBN(0x963ece23, 0x4fec49d2),
+              TOBN(0x862025c5, 0x9605a8d9),
+              TOBN(0x39874445, 0x19f8929a),
+              TOBN(0x01b6ff65, 0x12bf476a),
+              TOBN(0x598a64d8, 0x09cf7d91),
+              TOBN(0xd7ec7749, 0x93be56ca),
+              TOBN(0x10899785, 0xcbb33615),
+              TOBN(0xb8a092fd, 0x02eee3ad),
+              TOBN(0xa86b3d35, 0x30145270),
+              TOBN(0x323d98c6, 0x8512b675),
+              TOBN(0x4b8bc785, 0x62ebb40f),
+              TOBN(0x7d301f54, 0x413f9cde),
+              TOBN(0xa5e4fb4f, 0x2bab5664),
+              TOBN(0x1d2b252d, 0x1cbfec23),
+              TOBN(0xfcd576bb, 0xe177120d),
+              TOBN(0x04427d3e, 0x83731a34),
+              TOBN(0x2bb9028e, 0xed836e8e),
+              TOBN(0xb36acff8, 0xb612ca7c),
+              TOBN(0xb88fe5ef, 0xd3d9c73a),
+              TOBN(0xbe2a6bc6, 0xedea4eb3),
+              TOBN(0x43b93133, 0x488eec77),
+              TOBN(0xf41ff566, 0xb17106e1),
+              TOBN(0x469e9172, 0x654efa32),
+              TOBN(0xb4480f04, 0x41c23fa3),
+              TOBN(0xb4712eb0, 0xc1989a2e),
+              TOBN(0x3ccbba0f, 0x93a29ca7),
+              TOBN(0x6e205c14, 0xd619428c),
+              TOBN(0x90db7957, 0xb3641686),
+              TOBN(0x0432691d, 0x45ac8b4e),
+              TOBN(0x07a759ac, 0xf64e0350),
+              TOBN(0x0514d89c, 0x9c972517),
+              TOBN(0x1701147f, 0xa8e67fc3),
+              TOBN(0x9e2e0b8b, 0xab2085be),
+              TOBN(0xd5651824, 0xac284e57),
+              TOBN(0x890d4325, 0x74893664),
+              TOBN(0x8a7c5e6e, 0xc55e68a3),
+              TOBN(0xbf12e90b, 0x4339c85a),
+              TOBN(0x31846b85, 0xf922b655),
+              TOBN(0x9a54ce4d, 0x0bf4d700),
+              TOBN(0xd7f4e83a, 0xf1a14295),
+              TOBN(0x916f955c, 0xb285d4f9),
+              TOBN(0xe57bb0e0, 0x99ffdaba),
+              TOBN(0x28a43034, 0xeab0d152),
+              TOBN(0x0a36ffa2, 0xb8a9cef8),
+              TOBN(0x5517407e, 0xb9ec051a),
+              TOBN(0x9c796096, 0xea68e672),
+              TOBN(0x853db5fb, 0xfb3c77fb),
+              TOBN(0x21474ba9, 0xe864a51a),
+              TOBN(0x6c267699, 0x6e8a1b8b),
+              TOBN(0x7c823626, 0x94120a28),
+              TOBN(0xe61e9a48, 0x8383a5db),
+              TOBN(0x7dd75003, 0x9f84216d),
+              TOBN(0xab020d07, 0xad43cd85),
+              TOBN(0x9437ae48, 0xda12c659),
+              TOBN(0x6449c2eb, 0xe65452ad),
+              TOBN(0xcc7c4c1c, 0x2cf9d7c1),
+              TOBN(0x1320886a, 0xee95e5ab),
+              TOBN(0xbb7b9056, 0xbeae170c),
+              TOBN(0xc8a5b250, 0xdbc0d662),
+              TOBN(0x4ed81432, 0xc11d2303),
+              TOBN(0x7da66912, 0x1f03769f),
+              TOBN(0x3ac7a5fd, 0x84539828),
+              TOBN(0x14dada94, 0x3bccdd02),
+              TOBN(0x8b84c321, 0x7ef6b0d1),
+              TOBN(0x52a9477a, 0x7c933f22),
+              TOBN(0x5ef6728a, 0xfd440b82),
+              TOBN(0x5c3bd859, 0x6ce4bd5e),
+              TOBN(0x918b80f5, 0xf22c2d3e),
+              TOBN(0x368d5040, 0xb7bb6cc5),
+              TOBN(0xb66142a1, 0x2695a11c),
+              TOBN(0x60ac583a, 0xeb19ea70),
+              TOBN(0x317cbb98, 0x0eab2437),
+              TOBN(0x8cc08c55, 0x5e2654c8),
+              TOBN(0xfe2d6520, 0xe6d8307f),
+              TOBN(0xe9f147f3, 0x57428993),
+              TOBN(0x5f9c7d14, 0xd2fd6cf1),
+              TOBN(0xa3ecd064, 0x2d4fcbb0),
+              TOBN(0xad83fef0, 0x8e7341f7),
+              TOBN(0x643f23a0, 0x3a63115c),
+              TOBN(0xd38a78ab, 0xe65ab743),
+              TOBN(0xbf7c75b1, 0x35edc89c),
+              TOBN(0x3dd8752e, 0x530df568),
+              TOBN(0xf85c4a76, 0xe308c682),
+              TOBN(0x4c9955b2, 0xe68acf37),
+              TOBN(0xa544df3d, 0xab32af85),
+              TOBN(0x4b8ec3f5, 0xa25cf493),
+              TOBN(0x4d8f2764, 0x1a622feb),
+              TOBN(0x7bb4f7aa, 0xf0dcbc49),
+              TOBN(0x7de551f9, 0x70bbb45b),
+              TOBN(0xcfd0f3e4, 0x9f2ca2e5),
+              TOBN(0xece58709, 0x1f5c76ef),
+              TOBN(0x32920edd, 0x167d79ae),
+              TOBN(0x039df8a2, 0xfa7d7ec1),
+              TOBN(0xf46206c0, 0xbb30af91),
+              TOBN(0x1ff5e2f5, 0x22676b59),
+              TOBN(0x11f4a039, 0x6ea51d66),
+              TOBN(0x506c1445, 0x807d7a26),
+              TOBN(0x60da5705, 0x755a9b24),
+              TOBN(0x8fc8cc32, 0x1f1a319e),
+              TOBN(0x83642d4d, 0x9433d67d),
+              TOBN(0x7fa5cb8f, 0x6a7dd296),
+              TOBN(0x576591db, 0x9b7bde07),
+              TOBN(0x13173d25, 0x419716fb),
+              TOBN(0xea30599d, 0xd5b340ff),
+              TOBN(0xfc6b5297, 0xb0fe76c5),
+              TOBN(0x1c6968c8, 0xab8f5adc),
+              TOBN(0xf723c7f5, 0x901c928d),
+              TOBN(0x4203c321, 0x9773d402),
+              TOBN(0xdf7c6aa3, 0x1b51dd47),
+              TOBN(0x3d49e37a, 0x552be23c),
+              TOBN(0x57febee8, 0x0b5a6e87),
+              TOBN(0xc5ecbee4, 0x7bd8e739),
+              TOBN(0x79d44994, 0xae63bf75),
+              TOBN(0x168bd00f, 0x38fb8923),
+              TOBN(0x75d48ee4, 0xd0533130),
+              TOBN(0x554f77aa, 0xdb5cdf33),
+              TOBN(0x3396e896, 0x3c696769),
+              TOBN(0x2fdddbf2, 0xd3fd674e),
+              TOBN(0xbbb8f6ee, 0x99d0e3e5),
+              TOBN(0x51b90651, 0xcbae2f70),
+              TOBN(0xefc4bc05, 0x93aaa8eb),
+              TOBN(0x8ecd8689, 0xdd1df499),
+              TOBN(0x1aee99a8, 0x22f367a5),
+              TOBN(0x95d485b9, 0xae8274c5),
+              TOBN(0x6c14d445, 0x7d30b39c),
+              TOBN(0xbafea90b, 0xbcc1ef81),
+              TOBN(0x7c5f317a, 0xa459a2ed),
+              TOBN(0x01211075, 0x4ef44227),
+              TOBN(0xa17bed6e, 0xdc20f496),
+              TOBN(0x0cdfe424, 0x819853cd),
+              TOBN(0x13793298, 0xf71e2ce7),
+              TOBN(0x3c1f3078, 0xdbbe307b),
+              TOBN(0x6dd1c20e, 0x76ee9936),
+              TOBN(0x23ee4b57, 0x423caa20),
+              TOBN(0x4ac3793b, 0x8efb840e),
+              TOBN(0x934438eb, 0xed1f8ca0),
+              TOBN(0x3e546658, 0x4ebb25a2),
+              TOBN(0xc415af0e, 0xc069896f),
+              TOBN(0xc13eddb0, 0x9a5aa43d),
+              TOBN(0x7a04204f, 0xd49eb8f6),
+              TOBN(0xd0d5bdfc, 0xd74f1670),
+              TOBN(0x3697e286, 0x56fc0558),
+              TOBN(0x10207371, 0x01cebade),
+              TOBN(0x5f87e690, 0x0647a82b),
+              TOBN(0x908e0ed4, 0x8f40054f),
+              TOBN(0xa9f633d4, 0x79853803),
+              TOBN(0x8ed13c9a, 0x4a28b252),
+              TOBN(0x3e2ef676, 0x1f460f64),
+              TOBN(0x53930b9b, 0x36d06336),
+              TOBN(0x347073ac, 0x8fc4979b),
+              TOBN(0x84380e0e, 0x5ecd5597),
+              TOBN(0xe3b22c6b, 0xc4fe3c39),
+              TOBN(0xba4a8153, 0x6c7bebdf),
+              TOBN(0xf23ab6b7, 0x25693459),
+              TOBN(0x53bc3770, 0x14922b11),
+              TOBN(0x4645c8ab, 0x5afc60db),
+              TOBN(0xaa022355, 0x20b9f2a3),
+              TOBN(0x52a2954c, 0xce0fc507),
+              TOBN(0x8c2731bb, 0x7ce1c2e7),
+              TOBN(0xf39608ab, 0x18a0339d),
+              TOBN(0xac7a658d, 0x3735436c),
+              TOBN(0xb22c2b07, 0xcd992b4f),
+              TOBN(0x4e83daec, 0xf40dcfd4),
+              TOBN(0x8a34c7be, 0x2f39ea3e),
+              TOBN(0xef0c005f, 0xb0a56d2e),
+              TOBN(0x62731f6a, 0x6edd8038),
+              TOBN(0x5721d740, 0x4e3cb075),
+              TOBN(0x1ea41511, 0xfbeeee1b),
+              TOBN(0xd1ef5e73, 0xef1d0c05),
+              TOBN(0x42feefd1, 0x73c07d35),
+              TOBN(0xe530a00a, 0x8a329493),
+              TOBN(0x5d55b7fe, 0xf15ebfb0),
+              TOBN(0x549de03c, 0xd322491a),
+              TOBN(0xf7b5f602, 0x745b3237),
+              TOBN(0x3632a3a2, 0x1ab6e2b6),
+              TOBN(0x0d3bba89, 0x0ef59f78),
+              TOBN(0x0dfc6443, 0xc9e52b9a),
+              TOBN(0x1dc79699, 0x72631447),
+              TOBN(0xef033917, 0xb3be20b1),
+              TOBN(0x0c92735d, 0xb1383948),
+              TOBN(0xc1fc29a2, 0xc0dd7d7d),
+              TOBN(0x6485b697, 0x403ed068),
+              TOBN(0x13bfaab3, 0xaac93bdc),
+              TOBN(0x410dc6a9, 0x0deeaf52),
+              TOBN(0xb003fb02, 0x4c641c15),
+              TOBN(0x1384978c, 0x5bc504c4),
+              TOBN(0x37640487, 0x864a6a77),
+              TOBN(0x05991bc6, 0x222a77da),
+              TOBN(0x62260a57, 0x5e47eb11),
+              TOBN(0xc7af6613, 0xf21b432c),
+              TOBN(0x22f3acc9, 0xab4953e9),
+              TOBN(0x52934922, 0x8e41d155),
+              TOBN(0x4d024568, 0x3ac059ef),
+              TOBN(0xb0201755, 0x4d884411),
+              TOBN(0xce8055cf, 0xa59a178f),
+              TOBN(0xcd77d1af, 0xf6204549),
+              TOBN(0xa0a00a3e, 0xc7066759),
+              TOBN(0x471071ef, 0x0272c229),
+              TOBN(0x009bcf6b, 0xd3c4b6b0),
+              TOBN(0x2a2638a8, 0x22305177),
+              TOBN(0xd51d59df, 0x41645bbf),
+              TOBN(0xa81142fd, 0xc0a7a3c0),
+              TOBN(0xa17eca6d, 0x4c7063ee),
+              TOBN(0x0bb887ed, 0x60d9dcec),
+              TOBN(0xd6d28e51, 0x20ad2455),
+              TOBN(0xebed6308, 0xa67102ba),
+              TOBN(0x042c3114, 0x8bffa408),
+              TOBN(0xfd099ac5, 0x8aa68e30),
+              TOBN(0x7a6a3d7c, 0x1483513e),
+              TOBN(0xffcc6b75, 0xba2d8f0c),
+              TOBN(0x54dacf96, 0x1e78b954),
+              TOBN(0xf645696f, 0xa4a9af89),
+              TOBN(0x3a411940, 0x06ac98ec),
+              TOBN(0x41b8b3f6, 0x22a67a20),
+              TOBN(0x2d0b1e0f, 0x99dec626),
+              TOBN(0x27c89192, 0x40be34e8),
+              TOBN(0xc7162b37, 0x91907f35),
+              TOBN(0x90188ec1, 0xa956702b),
+              TOBN(0xca132f7d, 0xdf93769c),
+              TOBN(0x3ece44f9, 0x0e2025b4),
+              TOBN(0x67aaec69, 0x0c62f14c),
+              TOBN(0xad741418, 0x22e3cc11),
+              TOBN(0xcf9b75c3, 0x7ff9a50e),
+              TOBN(0x02fa2b16, 0x4d348272),
+              TOBN(0xbd99d61a, 0x9959d56d),
+              TOBN(0xbc4f19db, 0x18762916),
+              TOBN(0xcc7cce50, 0x49c1ac80),
+              TOBN(0x4d59ebaa, 0xd846bd83),
+              TOBN(0x8775a9dc, 0xa9202849),
+              TOBN(0x07ec4ae1, 0x6e1f4ca9),
+              TOBN(0x27eb5875, 0xba893f11),
+              TOBN(0x00284d51, 0x662cc565),
+              TOBN(0x82353a6b, 0x0db4138d),
+              TOBN(0xd9c7aaaa, 0xaa32a594),
+              TOBN(0xf5528b5e, 0xa5669c47),
+              TOBN(0xf3220231, 0x2f23c5ff),
+              TOBN(0xe3e8147a, 0x6affa3a1),
+              TOBN(0xfb423d5c, 0x202ddda0),
+              TOBN(0x3d6414ac, 0x6b871bd4),
+              TOBN(0x586f82e1, 0xa51a168a),
+              TOBN(0xb712c671, 0x48ae5448),
+              TOBN(0x9a2e4bd1, 0x76233eb8),
+              TOBN(0x0188223a, 0x78811ca9),
+              TOBN(0x553c5e21, 0xf7c18de1),
+              TOBN(0x7682e451, 0xb27bb286),
+              TOBN(0x3ed036b3, 0x0e51e929),
+              TOBN(0xf487211b, 0xec9cb34f),
+              TOBN(0x0d094277, 0x0c24efc8),
+              TOBN(0x0349fd04, 0xbef737a4),
+              TOBN(0x6d1c9dd2, 0x514cdd28),
+              TOBN(0x29c135ff, 0x30da9521),
+              TOBN(0xea6e4508, 0xf78b0b6f),
+              TOBN(0x176f5dd2, 0x678c143c),
+              TOBN(0x08148418, 0x4be21e65),
+              TOBN(0x27f7525c, 0xe7df38c4),
+              TOBN(0x1fb70e09, 0x748ab1a4),
+              TOBN(0x9cba50a0, 0x5efe4433),
+              TOBN(0x7846c7a6, 0x15f75af2),
+              TOBN(0x2a7c2c57, 0x5ee73ea8),
+              TOBN(0x42e566a4, 0x3f0a449a),
+              TOBN(0x45474c3b, 0xad90fc3d),
+              TOBN(0x7447be3d, 0x8b61d057),
+              TOBN(0x3e9d1cf1, 0x3a4ec092),
+              TOBN(0x1603e453, 0xf380a6e6),
+              TOBN(0x0b86e431, 0x9b1437c2),
+              TOBN(0x7a4173f2, 0xef29610a),
+              TOBN(0x8fa729a7, 0xf03d57f7),
+              TOBN(0x3e186f6e, 0x6c9c217e),
+              TOBN(0xbe1d3079, 0x91919524),
+              TOBN(0x92a62a70, 0x153d4fb1),
+              TOBN(0x32ed3e34, 0xd68c2f71),
+              TOBN(0xd785027f, 0x9eb1a8b7),
+              TOBN(0xbc37eb77, 0xc5b22fe8),
+              TOBN(0x466b34f0, 0xb9d6a191),
+              TOBN(0x008a89af, 0x9a05f816),
+              TOBN(0x19b028fb, 0x7d42c10a),
+              TOBN(0x7fe8c92f, 0x49b3f6b8),
+              TOBN(0x58907cc0, 0xa5a0ade3),
+              TOBN(0xb3154f51, 0x559d1a7c),
+              TOBN(0x5066efb6, 0xd9790ed6),
+              TOBN(0xa77a0cbc, 0xa6aa793b),
+              TOBN(0x1a915f3c, 0x223e042e),
+              TOBN(0x1c5def04, 0x69c5874b),
+              TOBN(0x0e830078, 0x73b6c1da),
+              TOBN(0x55cf85d2, 0xfcd8557a),
+              TOBN(0x0f7c7c76, 0x0460f3b1),
+              TOBN(0x87052acb, 0x46e58063),
+              TOBN(0x09212b80, 0x907eae66),
+              TOBN(0x3cb068e0, 0x4d721c89),
+              TOBN(0xa87941ae, 0xdd45ac1c),
+              TOBN(0xde8d5c0d, 0x0daa0dbb),
+              TOBN(0xda421fdc, 0xe3502e6e),
+              TOBN(0xc8944201, 0x4d89a084),
+              TOBN(0x7307ba5e, 0xf0c24bfb),
+              TOBN(0xda212beb, 0x20bde0ef),
+              TOBN(0xea2da24b, 0xf82ce682),
+              TOBN(0x058d3816, 0x07f71fe4),
+              TOBN(0x35a02462, 0x5ffad8de),
+              TOBN(0xcd7b05dc, 0xaadcefab),
+              TOBN(0xd442f8ed, 0x1d9f54ec),
+              TOBN(0x8be3d618, 0xb2d3b5ca),
+              TOBN(0xe2220ed0, 0xe06b2ce2),
+              TOBN(0x82699a5f, 0x1b0da4c0),
+              TOBN(0x3ff106f5, 0x71c0c3a7),
+              TOBN(0x8f580f5a, 0x0d34180c),
+              TOBN(0x4ebb120e, 0x22d7d375),
+              TOBN(0x5e5782cc, 0xe9513675),
+              TOBN(0x2275580c, 0x99c82a70),
+              TOBN(0xe8359fbf, 0x15ea8c4c),
+              TOBN(0x53b48db8, 0x7b415e70),
+              TOBN(0xaacf2240, 0x100c6014),
+              TOBN(0x9faaccf5, 0xe4652f1d),
+              TOBN(0xbd6fdd2a, 0xd56157b2),
+              TOBN(0xa4f4fb1f, 0x6261ec50),
+              TOBN(0x244e55ad, 0x476bcd52),
+              TOBN(0x881c9305, 0x047d320b),
+              TOBN(0x1ca983d5, 0x6181263f),
+              TOBN(0x354e9a44, 0x278fb8ee),
+              TOBN(0xad2dbc0f, 0x396e4964),
+              TOBN(0x723f3aa2, 0x9268b3de),
+              TOBN(0x0d1ca29a, 0xe6e0609a),
+              TOBN(0x794866aa, 0x6cf44252),
+              TOBN(0x0b59f3e3, 0x01af87ed),
+              TOBN(0xe234e5ff, 0x7f4a6c51),
+              TOBN(0xa8768fd2, 0x61dc2f7e),
+              TOBN(0xdafc7332, 0x0a94d81f),
+              TOBN(0xd7f84282, 0x06938ce1),
+              TOBN(0xae0b3c0e, 0x0546063e),
+              TOBN(0x7fbadcb2, 0x5d61abc6),
+              TOBN(0xd5d7a2c9, 0x369ac400),
+              TOBN(0xa5978d09, 0xae67d10c),
+              TOBN(0x290f211e, 0x4f85eaac),
+              TOBN(0xe61e2ad1, 0xfacac681),
+              TOBN(0xae125225, 0x388384cd),
+              TOBN(0xa7fb68e9, 0xccfde30f),
+              TOBN(0x7a59b936, 0x3daed4c2),
+              TOBN(0x80a9aa40, 0x2606f789),
+              TOBN(0xb40c1ea5, 0xf6a6d90a),
+              TOBN(0x948364d3, 0x514d5885),
+              TOBN(0x062ebc60, 0x70985182),
+              TOBN(0xa6db5b0e, 0x33310895),
+              TOBN(0x64a12175, 0xe329c2f5),
+              TOBN(0xc5f25bd2, 0x90ea237e),
+              TOBN(0x7915c524, 0x2d0a4c23),
+              TOBN(0xeb5d26e4, 0x6bb3cc52),
+              TOBN(0x369a9116, 0xc09e2c92),
+              TOBN(0x0c527f92, 0xcf182cf8),
+              TOBN(0x9e591938, 0x2aede0ac),
+              TOBN(0xb2922208, 0x6cc34939),
+              TOBN(0x3c9d8962, 0x99a34361),
+              TOBN(0x3c81836d, 0xc1905fe6),
+              TOBN(0x4bfeb57f, 0xa001ec5a),
+              TOBN(0xe993f5bb, 0xa0dc5dba),
+              TOBN(0x47884109, 0x724a1380),
+              TOBN(0x8a0369ab, 0x32fe9a04),
+              TOBN(0xea068d60, 0x8c927db8),
+              TOBN(0xbf5f37cf, 0x94655741),
+              TOBN(0x47d402a2, 0x04b6c7ea),
+              TOBN(0x4551c295, 0x6af259cb),
+              TOBN(0x698b71e7, 0xed77ee8b),
+              TOBN(0xbddf7bd0, 0xf309d5c7),
+              TOBN(0x6201c22c, 0x34e780ca),
+              TOBN(0xab04f7d8, 0x4c295ef4),
+              TOBN(0x1c947294, 0x4313a8ce),
+              TOBN(0xe532e4ac, 0x92ca4cfe),
+              TOBN(0x89738f80, 0xd0a7a97a),
+              TOBN(0xec088c88, 0xa580fd5b),
+              TOBN(0x612b1ecc, 0x42ce9e51),
+              TOBN(0x8f9840fd, 0xb25fdd2a),
+              TOBN(0x3cda78c0, 0x01e7f839),
+              TOBN(0x546b3d3a, 0xece05480),
+              TOBN(0x271719a9, 0x80d30916),
+              TOBN(0x45497107, 0x584c20c4),
+              TOBN(0xaf8f9478, 0x5bc78608),
+              TOBN(0x28c7d484, 0x277e2a4c),
+              TOBN(0xfce01767, 0x88a2ffe4),
+              TOBN(0xdc506a35, 0x28e169a5),
+              TOBN(0x0ea10861, 0x7af9c93a),
+              TOBN(0x1ed24361, 0x03fa0e08),
+              TOBN(0x96eaaa92, 0xa3d694e7),
+              TOBN(0xc0f43b4d, 0xef50bc74),
+              TOBN(0xce6aa58c, 0x64114db4),
+              TOBN(0x8218e8ea, 0x7c000fd4),
+              TOBN(0xac815dfb, 0x185f8844),
+              TOBN(0xcd7e90cb, 0x1557abfb),
+              TOBN(0x23d16655, 0xafbfecdf),
+              TOBN(0x80f3271f, 0x085cac4a),
+              TOBN(0x7fc39aa7, 0xd0e62f47),
+              TOBN(0x88d519d1, 0x460a48e5),
+              TOBN(0x59559ac4, 0xd28f101e),
+              TOBN(0x7981d9e9, 0xca9ae816),
+              TOBN(0x5c38652c, 0x9ac38203),
+              TOBN(0x86eaf87f, 0x57657fe5),
+              TOBN(0x568fc472, 0xe21f5416),
+              TOBN(0x2afff39c, 0xe7e597b5),
+              TOBN(0x3adbbb07, 0x256d4eab),
+              TOBN(0x22598692, 0x8285ab89),
+              TOBN(0x35f8112a, 0x041caefe),
+              TOBN(0x95df02e3, 0xa5064c8b),
+              TOBN(0x4d63356e, 0xc7004bf3),
+              TOBN(0x230a08f4, 0xdb83c7de),
+              TOBN(0xca27b270, 0x8709a7b7),
+              TOBN(0x0d1c4cc4, 0xcb9abd2d),
+              TOBN(0x8a0bc66e, 0x7550fee8),
+              TOBN(0x369cd4c7, 0x9cf7247e),
+              TOBN(0x75562e84, 0x92b5b7e7),
+              TOBN(0x8fed0da0, 0x5802af7b),
+              TOBN(0x6a7091c2, 0xe48fb889),
+              TOBN(0x26882c13, 0x7b8a9d06),
+              TOBN(0xa2498663, 0x1b82a0e2),
+              TOBN(0x844ed736, 0x3518152d),
+              TOBN(0x282f476f, 0xd86e27c7),
+              TOBN(0xa04edaca, 0x04afefdc),
+              TOBN(0x8b256ebc, 0x6119e34d),
+              TOBN(0x56a413e9, 0x0787d78b),
+          },
+          {
+              TOBN(0x82ee061d, 0x5a74be50),
+              TOBN(0xe41781c4, 0xdea16ff5),
+              TOBN(0xe0b0c81e, 0x99bfc8a2),
+              TOBN(0x624f4d69, 0x0b547e2d),
+              TOBN(0x3a83545d, 0xbdcc9ae4),
+              TOBN(0x2573dbb6, 0x409b1e8e),
+              TOBN(0x482960c4, 0xa6c93539),
+              TOBN(0xf01059ad, 0x5ae18798),
+              TOBN(0x715c9f97, 0x3112795f),
+              TOBN(0xe8244437, 0x984e6ee1),
+              TOBN(0x55cb4858, 0xecb66bcd),
+              TOBN(0x7c136735, 0xabaffbee),
+              TOBN(0x54661595, 0x5dbec38e),
+              TOBN(0x51c0782c, 0x388ad153),
+              TOBN(0x9ba4c53a, 0xc6e0952f),
+              TOBN(0x27e6782a, 0x1b21dfa8),
+              TOBN(0x682f903d, 0x4ed2dbc2),
+              TOBN(0x0eba59c8, 0x7c3b2d83),
+              TOBN(0x8e9dc84d, 0x9c7e9335),
+              TOBN(0x5f9b21b0, 0x0eb226d7),
+              TOBN(0xe33bd394, 0xaf267bae),
+              TOBN(0xaa86cc25, 0xbe2e15ae),
+              TOBN(0x4f0bf67d, 0x6a8ec500),
+              TOBN(0x5846aa44, 0xf9630658),
+              TOBN(0xfeb09740, 0xe2c2bf15),
+              TOBN(0x627a2205, 0xa9e99704),
+              TOBN(0xec8d73d0, 0xc2fbc565),
+              TOBN(0x223eed8f, 0xc20c8de8),
+              TOBN(0x1ee32583, 0xa8363b49),
+              TOBN(0x1a0b6cb9, 0xc9c2b0a6),
+              TOBN(0x49f7c3d2, 0x90dbc85c),
+              TOBN(0xa8dfbb97, 0x1ef4c1ac),
+              TOBN(0xafb34d4c, 0x65c7c2ab),
+              TOBN(0x1d4610e7, 0xe2c5ea84),
+              TOBN(0x893f6d1b, 0x973c4ab5),
+              TOBN(0xa3cdd7e9, 0x945ba5c4),
+              TOBN(0x60514983, 0x064417ee),
+              TOBN(0x1459b23c, 0xad6bdf2b),
+              TOBN(0x23b2c341, 0x5cf726c3),
+              TOBN(0x3a829635, 0x32d6354a),
+              TOBN(0x294f901f, 0xab192c18),
+              TOBN(0xec5fcbfe, 0x7030164f),
+              TOBN(0xe2e2fcb7, 0xe2246ba6),
+              TOBN(0x1e7c88b3, 0x221a1a0c),
+              TOBN(0x72c7dd93, 0xc92d88c5),
+              TOBN(0x41c2148e, 0x1106fb59),
+              TOBN(0x547dd4f5, 0xa0f60f14),
+              TOBN(0xed9b52b2, 0x63960f31),
+              TOBN(0x6c8349eb, 0xb0a5b358),
+              TOBN(0xb154c5c2, 0x9e7e2ed6),
+              TOBN(0xcad5eccf, 0xeda462db),
+              TOBN(0xf2d6dbe4, 0x2de66b69),
+              TOBN(0x426aedf3, 0x8665e5b2),
+              TOBN(0x488a8513, 0x7b7f5723),
+              TOBN(0x15cc43b3, 0x8bcbb386),
+              TOBN(0x27ad0af3, 0xd791d879),
+              TOBN(0xc16c236e, 0x846e364f),
+              TOBN(0x7f33527c, 0xdea50ca0),
+              TOBN(0xc4810775, 0x0926b86d),
+              TOBN(0x6c2a3609, 0x0598e70c),
+              TOBN(0xa6755e52, 0xf024e924),
+              TOBN(0xe0fa07a4, 0x9db4afca),
+              TOBN(0x15c3ce7d, 0x66831790),
+              TOBN(0x5b4ef350, 0xa6cbb0d6),
+              TOBN(0x2c4aafc4, 0xb6205969),
+              TOBN(0x42563f02, 0xf6c7854f),
+              TOBN(0x016aced5, 0x1d983b48),
+              TOBN(0xfeb356d8, 0x99949755),
+              TOBN(0x8c2a2c81, 0xd1a39bd7),
+              TOBN(0x8f44340f, 0xe6934ae9),
+              TOBN(0x148cf91c, 0x447904da),
+              TOBN(0x7340185f, 0x0f51a926),
+              TOBN(0x2f8f00fb, 0x7409ab46),
+              TOBN(0x057e78e6, 0x80e289b2),
+              TOBN(0x03e5022c, 0xa888e5d1),
+              TOBN(0x3c87111a, 0x9dede4e2),
+              TOBN(0x5b9b0e1c, 0x7809460b),
+              TOBN(0xe751c852, 0x71c9abc7),
+              TOBN(0x8b944e28, 0xc7cc1dc9),
+              TOBN(0x4f201ffa, 0x1d3cfa08),
+              TOBN(0x02fc905c, 0x3e6721ce),
+              TOBN(0xd52d70da, 0xd0b3674c),
+              TOBN(0x5dc2e5ca, 0x18810da4),
+              TOBN(0xa984b273, 0x5c69dd99),
+              TOBN(0x63b92527, 0x84de5ca4),
+              TOBN(0x2f1c9872, 0xc852dec4),
+              TOBN(0x18b03593, 0xc2e3de09),
+              TOBN(0x19d70b01, 0x9813dc2f),
+              TOBN(0x42806b2d, 0xa6dc1d29),
+              TOBN(0xd3030009, 0xf871e144),
+              TOBN(0xa1feb333, 0xaaf49276),
+              TOBN(0xb5583b9e, 0xc70bc04b),
+              TOBN(0x1db0be78, 0x95695f20),
+              TOBN(0xfc841811, 0x89d012b5),
+              TOBN(0x6409f272, 0x05f61643),
+              TOBN(0x40d34174, 0xd5883128),
+              TOBN(0xd79196f5, 0x67419833),
+              TOBN(0x6059e252, 0x863b7b08),
+              TOBN(0x84da1817, 0x1c56700c),
+              TOBN(0x5758ee56, 0xb28d3ec4),
+              TOBN(0x7da2771d, 0x013b0ea6),
+              TOBN(0xfddf524b, 0x54c5e9b9),
+              TOBN(0x7df4faf8, 0x24305d80),
+              TOBN(0x58f5c1bf, 0x3a97763f),
+              TOBN(0xa5af37f1, 0x7c696042),
+              TOBN(0xd4cba22c, 0x4a2538de),
+              TOBN(0x211cb995, 0x9ea42600),
+              TOBN(0xcd105f41, 0x7b069889),
+              TOBN(0xb1e1cf19, 0xddb81e74),
+              TOBN(0x472f2d89, 0x5157b8ca),
+              TOBN(0x086fb008, 0xee9db885),
+              TOBN(0x365cd570, 0x0f26d131),
+              TOBN(0x284b02bb, 0xa2be7053),
+              TOBN(0xdcbbf7c6, 0x7ab9a6d6),
+              TOBN(0x4425559c, 0x20f7a530),
+              TOBN(0x961f2dfa, 0x188767c8),
+              TOBN(0xe2fd9435, 0x70dc80c4),
+              TOBN(0x104d6b63, 0xf0784120),
+              TOBN(0x7f592bc1, 0x53567122),
+              TOBN(0xf6bc1246, 0xf688ad77),
+              TOBN(0x05214c05, 0x0f15dde9),
+              TOBN(0xa47a76a8, 0x0d5f2b82),
+              TOBN(0xbb254d30, 0x62e82b62),
+              TOBN(0x11a05fe0, 0x3ec955ee),
+              TOBN(0x7eaff46e, 0x9d529b36),
+              TOBN(0x55ab1301, 0x8f9e3df6),
+              TOBN(0xc463e371, 0x99317698),
+              TOBN(0xfd251438, 0xccda47ad),
+              TOBN(0xca9c3547, 0x23d695ea),
+              TOBN(0x48ce626e, 0x16e589b5),
+              TOBN(0x6b5b64c7, 0xb187d086),
+              TOBN(0xd02e1794, 0xb2207948),
+              TOBN(0x8b58e98f, 0x7198111d),
+              TOBN(0x90ca6305, 0xdcf9c3cc),
+              TOBN(0x5691fe72, 0xf34089b0),
+              TOBN(0x60941af1, 0xfc7c80ff),
+              TOBN(0xa09bc0a2, 0x22eb51e5),
+              TOBN(0xc0bb7244, 0xaa9cf09a),
+              TOBN(0x36a8077f, 0x80159f06),
+              TOBN(0x8b5c989e, 0xdddc560e),
+              TOBN(0x19d2f316, 0x512e1f43),
+              TOBN(0x02eac554, 0xad08ff62),
+              TOBN(0x012ab84c, 0x07d20b4e),
+              TOBN(0x37d1e115, 0xd6d4e4e1),
+              TOBN(0xb6443e1a, 0xab7b19a8),
+              TOBN(0xf08d067e, 0xdef8cd45),
+              TOBN(0x63adf3e9, 0x685e03da),
+              TOBN(0xcf15a10e, 0x4792b916),
+              TOBN(0xf44bcce5, 0xb738a425),
+              TOBN(0xebe131d5, 0x9636b2fd),
+              TOBN(0x94068841, 0x7850d605),
+              TOBN(0x09684eaa, 0xb40d749d),
+              TOBN(0x8c3c669c, 0x72ba075b),
+              TOBN(0x89f78b55, 0xba469015),
+              TOBN(0x5706aade, 0x3e9f8ba8),
+              TOBN(0x6d8bd565, 0xb32d7ed7),
+              TOBN(0x25f4e63b, 0x805f08d6),
+              TOBN(0x7f48200d, 0xc3bcc1b5),
+              TOBN(0x4e801968, 0xb025d847),
+              TOBN(0x74afac04, 0x87cbe0a8),
+              TOBN(0x43ed2c2b, 0x7e63d690),
+              TOBN(0xefb6bbf0, 0x0223cdb8),
+              TOBN(0x4fec3cae, 0x2884d3fe),
+              TOBN(0x065ecce6, 0xd75e25a4),
+              TOBN(0x6c2294ce, 0x69f79071),
+              TOBN(0x0d9a8e5f, 0x044b8666),
+              TOBN(0x5009f238, 0x17b69d8f),
+              TOBN(0x3c29f8fe, 0xc5dfdaf7),
+              TOBN(0x9067528f, 0xebae68c4),
+              TOBN(0x5b385632, 0x30c5ba21),
+              TOBN(0x540df119, 0x1fdd1aec),
+              TOBN(0xcf37825b, 0xcfba4c78),
+              TOBN(0x77eff980, 0xbeb11454),
+              TOBN(0x40a1a991, 0x60c1b066),
+              TOBN(0xe8018980, 0xf889a1c7),
+              TOBN(0xb9c52ae9, 0x76c24be0),
+              TOBN(0x05fbbcce, 0x45650ef4),
+              TOBN(0xae000f10, 0x8aa29ac7),
+              TOBN(0x884b7172, 0x4f04c470),
+              TOBN(0x7cd4fde2, 0x19bb5c25),
+              TOBN(0x6477b22a, 0xe8840869),
+              TOBN(0xa8868859, 0x5fbd0686),
+              TOBN(0xf23cc02e, 0x1116dfba),
+              TOBN(0x76cd563f, 0xd87d7776),
+              TOBN(0xe2a37598, 0xa9d82abf),
+              TOBN(0x5f188ccb, 0xe6c170f5),
+              TOBN(0x81682200, 0x5066b087),
+              TOBN(0xda22c212, 0xc7155ada),
+              TOBN(0x151e5d3a, 0xfbddb479),
+              TOBN(0x4b606b84, 0x6d715b99),
+              TOBN(0x4a73b54b, 0xf997cb2e),
+              TOBN(0x9a1bfe43, 0x3ecd8b66),
+              TOBN(0x1c312809, 0x2a67d48a),
+              TOBN(0xcd6a671e, 0x031fa9e2),
+              TOBN(0xbec3312a, 0x0e43a34a),
+              TOBN(0x1d935639, 0x55ef47d3),
+              TOBN(0x5ea02489, 0x8fea73ea),
+              TOBN(0x8247b364, 0xa035afb2),
+              TOBN(0xb58300a6, 0x5265b54c),
+              TOBN(0x3286662f, 0x722c7148),
+              TOBN(0xb77fd76b, 0xb4ec4c20),
+              TOBN(0xf0a12fa7, 0x0f3fe3fd),
+              TOBN(0xf845bbf5, 0x41d8c7e8),
+              TOBN(0xe4d969ca, 0x5ec10aa8),
+              TOBN(0x4c0053b7, 0x43e232a3),
+              TOBN(0xdc7a3fac, 0x37f8a45a),
+              TOBN(0x3c4261c5, 0x20d81c8f),
+              TOBN(0xfd4b3453, 0xb00eab00),
+              TOBN(0x76d48f86, 0xd36e3062),
+              TOBN(0x626c5277, 0xa143ff02),
+              TOBN(0x538174de, 0xaf76f42e),
+              TOBN(0x2267aa86, 0x6407ceac),
+              TOBN(0xfad76351, 0x72e572d5),
+              TOBN(0xab861af7, 0xba7330eb),
+              TOBN(0xa0a1c8c7, 0x418d8657),
+              TOBN(0x988821cb, 0x20289a52),
+              TOBN(0x79732522, 0xcccc18ad),
+              TOBN(0xaadf3f8d, 0xf1a6e027),
+              TOBN(0xf7382c93, 0x17c2354d),
+              TOBN(0x5ce1680c, 0xd818b689),
+              TOBN(0x359ebbfc, 0xd9ecbee9),
+              TOBN(0x4330689c, 0x1cae62ac),
+              TOBN(0xb55ce5b4, 0xc51ac38a),
+              TOBN(0x7921dfea, 0xfe238ee8),
+              TOBN(0x3972bef8, 0x271d1ca5),
+              TOBN(0x3e423bc7, 0xe8aabd18),
+              TOBN(0x57b09f3f, 0x44a3e5e3),
+              TOBN(0x5da886ae, 0x7b444d66),
+              TOBN(0x68206634, 0xa9964375),
+              TOBN(0x356a2fa3, 0x699cd0ff),
+              TOBN(0xaf0faa24, 0xdba515e9),
+              TOBN(0x536e1f5c, 0xb321d79a),
+              TOBN(0xd3b9913a, 0x5c04e4ea),
+              TOBN(0xd549dcfe, 0xd6f11513),
+              TOBN(0xee227bf5, 0x79fd1d94),
+              TOBN(0x9f35afee, 0xb43f2c67),
+              TOBN(0xd2638d24, 0xf1314f53),
+              TOBN(0x62baf948, 0xcabcd822),
+              TOBN(0x5542de29, 0x4ef48db0),
+              TOBN(0xb3eb6a04, 0xfc5f6bb2),
+              TOBN(0x23c110ae, 0x1208e16a),
+              TOBN(0x1a4d15b5, 0xf8363e24),
+              TOBN(0x30716844, 0x164be00b),
+              TOBN(0xa8e24824, 0xf6f4690d),
+              TOBN(0x548773a2, 0x90b170cf),
+              TOBN(0xa1bef331, 0x42f191f4),
+              TOBN(0x70f418d0, 0x9247aa97),
+              TOBN(0xea06028e, 0x48be9147),
+              TOBN(0xe13122f3, 0xdbfb894e),
+              TOBN(0xbe9b79f6, 0xce274b18),
+              TOBN(0x85a49de5, 0xca58aadf),
+              TOBN(0x24957758, 0x11487351),
+              TOBN(0x111def61, 0xbb939099),
+              TOBN(0x1d6a974a, 0x26d13694),
+              TOBN(0x4474b4ce, 0xd3fc253b),
+              TOBN(0x3a1485e6, 0x4c5db15e),
+              TOBN(0xe79667b4, 0x147c15b4),
+              TOBN(0xe34f553b, 0x7bc61301),
+              TOBN(0x032b80f8, 0x17094381),
+              TOBN(0x55d8bafd, 0x723eaa21),
+              TOBN(0x5a987995, 0xf1c0e74e),
+              TOBN(0x5a9b292e, 0xebba289c),
+              TOBN(0x413cd4b2, 0xeb4c8251),
+              TOBN(0x98b5d243, 0xd162db0a),
+              TOBN(0xbb47bf66, 0x68342520),
+              TOBN(0x08d68949, 0xbaa862d1),
+              TOBN(0x11f349c7, 0xe906abcd),
+              TOBN(0x454ce985, 0xed7bf00e),
+              TOBN(0xacab5c9e, 0xb55b803b),
+              TOBN(0xb03468ea, 0x31e3c16d),
+              TOBN(0x5c24213d, 0xd273bf12),
+              TOBN(0x211538eb, 0x71587887),
+              TOBN(0x198e4a2f, 0x731dea2d),
+              TOBN(0xd5856cf2, 0x74ed7b2a),
+              TOBN(0x86a632eb, 0x13a664fe),
+              TOBN(0x932cd909, 0xbda41291),
+              TOBN(0x850e95d4, 0xc0c4ddc0),
+              TOBN(0xc0f422f8, 0x347fc2c9),
+              TOBN(0xe68cbec4, 0x86076bcb),
+              TOBN(0xf9e7c0c0, 0xcd6cd286),
+              TOBN(0x65994ddb, 0x0f5f27ca),
+              TOBN(0xe85461fb, 0xa80d59ff),
+              TOBN(0xff05481a, 0x66601023),
+              TOBN(0xc665427a, 0xfc9ebbfb),
+              TOBN(0xb0571a69, 0x7587fd52),
+              TOBN(0x935289f8, 0x8d49efce),
+              TOBN(0x61becc60, 0xea420688),
+              TOBN(0xb22639d9, 0x13a786af),
+              TOBN(0x1a8e6220, 0x361ecf90),
+              TOBN(0x001f23e0, 0x25506463),
+              TOBN(0xe4ae9b5d, 0x0a5c2b79),
+              TOBN(0xebc9cdad, 0xd8149db5),
+              TOBN(0xb33164a1, 0x934aa728),
+              TOBN(0x750eb00e, 0xae9b60f3),
+              TOBN(0x5a91615b, 0x9b9cfbfd),
+              TOBN(0x97015cbf, 0xef45f7f6),
+              TOBN(0xb462c4a5, 0xbf5151df),
+              TOBN(0x21adcc41, 0xb07118f2),
+              TOBN(0xd60c545b, 0x043fa42c),
+              TOBN(0xfc21aa54, 0xe96be1ab),
+              TOBN(0xe84bc32f, 0x4e51ea80),
+              TOBN(0x3dae45f0, 0x259b5d8d),
+              TOBN(0xbb73c7eb, 0xc38f1b5e),
+              TOBN(0xe405a74a, 0xe8ae617d),
+              TOBN(0xbb1ae9c6, 0x9f1c56bd),
+              TOBN(0x8c176b98, 0x49f196a4),
+              TOBN(0xc448f311, 0x6875092b),
+              TOBN(0xb5afe3de, 0x9f976033),
+              TOBN(0xa8dafd49, 0x145813e5),
+              TOBN(0x687fc4d9, 0xe2b34226),
+              TOBN(0xf2dfc92d, 0x4c7ff57f),
+              TOBN(0x004e3fc1, 0x401f1b46),
+              TOBN(0x5afddab6, 0x1430c9ab),
+              TOBN(0x0bdd41d3, 0x2238e997),
+              TOBN(0xf0947430, 0x418042ae),
+              TOBN(0x71f9adda, 0xcdddc4cb),
+              TOBN(0x7090c016, 0xc52dd907),
+              TOBN(0xd9bdf44d, 0x29e2047f),
+              TOBN(0xe6f1fe80, 0x1b1011a6),
+              TOBN(0xb63accbc, 0xd9acdc78),
+              TOBN(0xcfc7e235, 0x1272a95b),
+              TOBN(0x0c667717, 0xa6276ac8),
+              TOBN(0x3c0d3709, 0xe2d7eef7),
+              TOBN(0x5add2b06, 0x9a685b3e),
+              TOBN(0x363ad32d, 0x14ea5d65),
+              TOBN(0xf8e01f06, 0x8d7dd506),
+              TOBN(0xc9ea2213, 0x75b4aac6),
+              TOBN(0xed2a2bf9, 0x0d353466),
+              TOBN(0x439d79b5, 0xe9d3a7c3),
+              TOBN(0x8e0ee5a6, 0x81b7f34b),
+              TOBN(0xcf3dacf5, 0x1dc4ba75),
+              TOBN(0x1d3d1773, 0xeb3310c7),
+              TOBN(0xa8e67112, 0x7747ae83),
+              TOBN(0x31f43160, 0x197d6b40),
+              TOBN(0x0521ccee, 0xcd961400),
+              TOBN(0x67246f11, 0xf6535768),
+              TOBN(0x702fcc5a, 0xef0c3133),
+              TOBN(0x247cc45d, 0x7e16693b),
+              TOBN(0xfd484e49, 0xc729b749),
+              TOBN(0x522cef7d, 0xb218320f),
+              TOBN(0xe56ef405, 0x59ab93b3),
+              TOBN(0x225fba11, 0x9f181071),
+              TOBN(0x33bd6595, 0x15330ed0),
+              TOBN(0xc4be69d5, 0x1ddb32f7),
+              TOBN(0x264c7668, 0x0448087c),
+              TOBN(0xac30903f, 0x71432dae),
+              TOBN(0x3851b266, 0x00f9bf47),
+              TOBN(0x400ed311, 0x6cdd6d03),
+              TOBN(0x045e79fe, 0xf8fd2424),
+              TOBN(0xfdfd974a, 0xfa6da98b),
+              TOBN(0x45c9f641, 0x0c1e673a),
+              TOBN(0x76f2e733, 0x5b2c5168),
+              TOBN(0x1adaebb5, 0x2a601753),
+              TOBN(0xb286514c, 0xc57c2d49),
+              TOBN(0xd8769670, 0x1e0bfd24),
+              TOBN(0x950c547e, 0x04478922),
+              TOBN(0xd1d41969, 0xe5d32bfe),
+              TOBN(0x30bc1472, 0x750d6c3e),
+              TOBN(0x8f3679fe, 0xe0e27f3a),
+              TOBN(0x8f64a7dc, 0xa4a6ee0c),
+              TOBN(0x2fe59937, 0x633dfb1f),
+              TOBN(0xea82c395, 0x977f2547),
+              TOBN(0xcbdfdf1a, 0x661ea646),
+              TOBN(0xc7ccc591, 0xb9085451),
+              TOBN(0x82177962, 0x81761e13),
+              TOBN(0xda57596f, 0x9196885c),
+              TOBN(0xbc17e849, 0x28ffbd70),
+              TOBN(0x1e6e0a41, 0x2671d36f),
+              TOBN(0x61ae872c, 0x4152fcf5),
+              TOBN(0x441c87b0, 0x9e77e754),
+              TOBN(0xd0799dd5, 0xa34dff09),
+              TOBN(0x766b4e44, 0x88a6b171),
+              TOBN(0xdc06a512, 0x11f1c792),
+              TOBN(0xea02ae93, 0x4be35c3e),
+              TOBN(0xe5ca4d6d, 0xe90c469e),
+              TOBN(0x4df4368e, 0x56e4ff5c),
+              TOBN(0x7817acab, 0x4baef62e),
+              TOBN(0x9f5a2202, 0xa85b91e8),
+              TOBN(0x9666ebe6, 0x6ce57610),
+              TOBN(0x32ad31f3, 0xf73bfe03),
+              TOBN(0x628330a4, 0x25bcf4d6),
+              TOBN(0xea950593, 0x515056e6),
+              TOBN(0x59811c89, 0xe1332156),
+              TOBN(0xc89cf1fe, 0x8c11b2d7),
+              TOBN(0x75b63913, 0x04e60cc0),
+              TOBN(0xce811e8d, 0x4625d375),
+              TOBN(0x030e43fc, 0x2d26e562),
+              TOBN(0xfbb30b4b, 0x608d36a0),
+              TOBN(0x634ff82c, 0x48528118),
+              TOBN(0x7c6fe085, 0xcd285911),
+              TOBN(0x7f2830c0, 0x99358f28),
+              TOBN(0x2e60a95e, 0x665e6c09),
+              TOBN(0x08407d3d, 0x9b785dbf),
+              TOBN(0x530889ab, 0xa759bce7),
+              TOBN(0xf228e0e6, 0x52f61239),
+              TOBN(0x2b6d1461, 0x6879be3c),
+              TOBN(0xe6902c04, 0x51a7bbf7),
+              TOBN(0x30ad99f0, 0x76f24a64),
+              TOBN(0x66d9317a, 0x98bc6da0),
+              TOBN(0xf4f877f3, 0xcb596ac0),
+              TOBN(0xb05ff62d, 0x4c44f119),
+              TOBN(0x4555f536, 0xe9b77416),
+              TOBN(0xc7c0d059, 0x8caed63b),
+              TOBN(0x0cd2b7ce, 0xc358b2a9),
+              TOBN(0x3f33287b, 0x46945fa3),
+              TOBN(0xf8785b20, 0xd67c8791),
+              TOBN(0xc54a7a61, 0x9637bd08),
+              TOBN(0x54d4598c, 0x18be79d7),
+              TOBN(0x889e5acb, 0xc46d7ce1),
+              TOBN(0x9a515bb7, 0x8b085877),
+              TOBN(0xfac1a03d, 0x0b7a5050),
+              TOBN(0x7d3e738a, 0xf2926035),
+              TOBN(0x861cc2ce, 0x2a6cb0eb),
+              TOBN(0x6f2e2955, 0x8f7adc79),
+              TOBN(0x61c4d451, 0x33016376),
+              TOBN(0xd9fd2c80, 0x5ad59090),
+              TOBN(0xe5a83738, 0xb2b836a1),
+              TOBN(0x855b41a0, 0x7c0d6622),
+              TOBN(0x186fe317, 0x7cc19af1),
+              TOBN(0x6465c1ff, 0xfdd99acb),
+              TOBN(0x46e5c23f, 0x6974b99e),
+              TOBN(0x75a7cf8b, 0xa2717cbe),
+              TOBN(0x4d2ebc3f, 0x062be658),
+              TOBN(0x094b4447, 0x5f209c98),
+              TOBN(0x4af285ed, 0xb940cb5a),
+              TOBN(0x6706d792, 0x7cc82f10),
+              TOBN(0xc8c8776c, 0x030526fa),
+              TOBN(0xfa8e6f76, 0xa0da9140),
+              TOBN(0x77ea9d34, 0x591ee4f0),
+              TOBN(0x5f46e337, 0x40274166),
+              TOBN(0x1bdf98bb, 0xea671457),
+              TOBN(0xd7c08b46, 0x862a1fe2),
+              TOBN(0x46cc303c, 0x1c08ad63),
+              TOBN(0x99543440, 0x4c845e7b),
+              TOBN(0x1b8fbdb5, 0x48f36bf7),
+              TOBN(0x5b82c392, 0x8c8273a7),
+              TOBN(0x08f712c4, 0x928435d5),
+              TOBN(0x071cf0f1, 0x79330380),
+              TOBN(0xc74c2d24, 0xa8da054a),
+              TOBN(0xcb0e7201, 0x43c46b5c),
+              TOBN(0x0ad7337a, 0xc0b7eff3),
+              TOBN(0x8552225e, 0xc5e48b3c),
+              TOBN(0xe6f78b0c, 0x73f13a5f),
+              TOBN(0x5e70062e, 0x82349cbe),
+              TOBN(0x6b8d5048, 0xe7073969),
+              TOBN(0x392d2a29, 0xc33cb3d2),
+              TOBN(0xee4f727c, 0x4ecaa20f),
+              TOBN(0xa068c99e, 0x2ccde707),
+              TOBN(0xfcd5651f, 0xb87a2913),
+              TOBN(0xea3e3c15, 0x3cc252f0),
+              TOBN(0x777d92df, 0x3b6cd3e4),
+              TOBN(0x7a414143, 0xc5a732e7),
+              TOBN(0xa895951a, 0xa71ff493),
+              TOBN(0xfe980c92, 0xbbd37cf6),
+              TOBN(0x45bd5e64, 0xdecfeeff),
+              TOBN(0x910dc2a9, 0xa44c43e9),
+              TOBN(0xcb403f26, 0xcca9f54d),
+              TOBN(0x928bbdfb, 0x9303f6db),
+              TOBN(0x3c37951e, 0xa9eee67c),
+              TOBN(0x3bd61a52, 0xf79961c3),
+              TOBN(0x09a238e6, 0x395c9a79),
+              TOBN(0x6940ca2d, 0x61eb352d),
+              TOBN(0x7d1e5c5e, 0xc1875631),
+              TOBN(0x1e19742c, 0x1e1b20d1),
+              TOBN(0x4633d908, 0x23fc2e6e),
+              TOBN(0xa76e29a9, 0x08959149),
+              TOBN(0x61069d9c, 0x84ed7da5),
+              TOBN(0x0baa11cf, 0x5dbcad51),
+              TOBN(0xd01eec64, 0x961849da),
+              TOBN(0x93b75f1f, 0xaf3d8c28),
+              TOBN(0x57bc4f9f, 0x1ca2ee44),
+              TOBN(0x5a26322d, 0x00e00558),
+              TOBN(0x1888d658, 0x61a023ef),
+              TOBN(0x1d72aab4, 0xb9e5246e),
+              TOBN(0xa9a26348, 0xe5563ec0),
+              TOBN(0xa0971963, 0xc3439a43),
+              TOBN(0x567dd54b, 0xadb9b5b7),
+              TOBN(0x73fac1a1, 0xc45a524b),
+              TOBN(0x8fe97ef7, 0xfe38e608),
+              TOBN(0x608748d2, 0x3f384f48),
+              TOBN(0xb0571794, 0xc486094f),
+              TOBN(0x869254a3, 0x8bf3a8d6),
+              TOBN(0x148a8dd1, 0x310b0e25),
+              TOBN(0x99ab9f3f, 0x9aa3f7d8),
+              TOBN(0x0927c68a, 0x6706c02e),
+              TOBN(0x22b5e76c, 0x69790e6c),
+              TOBN(0x6c325260, 0x6c71376c),
+              TOBN(0x53a57690, 0x09ef6657),
+              TOBN(0x8d63f852, 0xedffcf3a),
+              TOBN(0xb4d2ed04, 0x3c0a6f55),
+              TOBN(0xdb3aa8de, 0x12519b9e),
+              TOBN(0x5d38e9c4, 0x1e0a569a),
+              TOBN(0x871528bf, 0x303747e2),
+              TOBN(0xa208e77c, 0xf5b5c18d),
+              TOBN(0x9d129c88, 0xca6bf923),
+              TOBN(0xbcbf197f, 0xbf02839f),
+              TOBN(0x9b9bf030, 0x27323194),
+              TOBN(0x3b055a8b, 0x339ca59d),
+              TOBN(0xb46b2312, 0x0f669520),
+              TOBN(0x19789f1f, 0x497e5f24),
+              TOBN(0x9c499468, 0xaaf01801),
+              TOBN(0x72ee1190, 0x8b69d59c),
+              TOBN(0x8bd39595, 0xacf4c079),
+              TOBN(0x3ee11ece, 0x8e0cd048),
+              TOBN(0xebde86ec, 0x1ed66f18),
+              TOBN(0x225d906b, 0xd61fce43),
+              TOBN(0x5cab07d6, 0xe8bed74d),
+              TOBN(0x16e4617f, 0x27855ab7),
+              TOBN(0x6568aadd, 0xb2fbc3dd),
+              TOBN(0xedb5484f, 0x8aeddf5b),
+              TOBN(0x878f20e8, 0x6dcf2fad),
+              TOBN(0x3516497c, 0x615f5699),
+          },
+          {
+              TOBN(0xef0a3fec, 0xfa181e69),
+              TOBN(0x9ea02f81, 0x30d69a98),
+              TOBN(0xb2e9cf8e, 0x66eab95d),
+              TOBN(0x520f2beb, 0x24720021),
+              TOBN(0x621c540a, 0x1df84361),
+              TOBN(0x12037721, 0x71fa6d5d),
+              TOBN(0x6e3c7b51, 0x0ff5f6ff),
+              TOBN(0x817a069b, 0xabb2bef3),
+              TOBN(0x83572fb6, 0xb294cda6),
+              TOBN(0x6ce9bf75, 0xb9039f34),
+              TOBN(0x20e012f0, 0x095cbb21),
+              TOBN(0xa0aecc1b, 0xd063f0da),
+              TOBN(0x57c21c3a, 0xf02909e5),
+              TOBN(0xc7d59ecf, 0x48ce9cdc),
+              TOBN(0x2732b844, 0x8ae336f8),
+              TOBN(0x056e3723, 0x3f4f85f4),
+              TOBN(0x8a10b531, 0x89e800ca),
+              TOBN(0x50fe0c17, 0x145208fd),
+              TOBN(0x9e43c0d3, 0xb714ba37),
+              TOBN(0x427d200e, 0x34189acc),
+              TOBN(0x05dee24f, 0xe616e2c0),
+              TOBN(0x9c25f4c8, 0xee1854c1),
+              TOBN(0x4d3222a5, 0x8f342a73),
+              TOBN(0x0807804f, 0xa027c952),
+              TOBN(0xc222653a, 0x4f0d56f3),
+              TOBN(0x961e4047, 0xca28b805),
+              TOBN(0x2c03f8b0, 0x4a73434b),
+              TOBN(0x4c966787, 0xab712a19),
+              TOBN(0xcc196c42, 0x864fee42),
+              TOBN(0xc1be93da, 0x5b0ece5c),
+              TOBN(0xa87d9f22, 0xc131c159),
+              TOBN(0x2bb6d593, 0xdce45655),
+              TOBN(0x22c49ec9, 0xb809b7ce),
+              TOBN(0x8a41486b, 0xe2c72c2c),
+              TOBN(0x813b9420, 0xfea0bf36),
+              TOBN(0xb3d36ee9, 0xa66dac69),
+              TOBN(0x6fddc08a, 0x328cc987),
+              TOBN(0x0a3bcd2c, 0x3a326461),
+              TOBN(0x7103c49d, 0xd810dbba),
+              TOBN(0xf9d81a28, 0x4b78a4c4),
+              TOBN(0x3de865ad, 0xe4d55941),
+              TOBN(0xdedafa5e, 0x30384087),
+              TOBN(0x6f414abb, 0x4ef18b9b),
+              TOBN(0x9ee9ea42, 0xfaee5268),
+              TOBN(0x260faa16, 0x37a55a4a),
+              TOBN(0xeb19a514, 0x015f93b9),
+              TOBN(0x51d7ebd2, 0x9e9c3598),
+              TOBN(0x523fc56d, 0x1932178e),
+              TOBN(0x501d070c, 0xb98fe684),
+              TOBN(0xd60fbe9a, 0x124a1458),
+              TOBN(0xa45761c8, 0x92bc6b3f),
+              TOBN(0xf5384858, 0xfe6f27cb),
+              TOBN(0x4b0271f7, 0xb59e763b),
+              TOBN(0x3d4606a9, 0x5b5a8e5e),
+              TOBN(0x1eda5d9b, 0x05a48292),
+              TOBN(0xda7731d0, 0xe6fec446),
+              TOBN(0xa3e33693, 0x90d45871),
+              TOBN(0xe9764040, 0x06166d8d),
+              TOBN(0xb5c33682, 0x89a90403),
+              TOBN(0x4bd17983, 0x72f1d637),
+              TOBN(0xa616679e, 0xd5d2c53a),
+              TOBN(0x5ec4bcd8, 0xfdcf3b87),
+              TOBN(0xae6d7613, 0xb66a694e),
+              TOBN(0x7460fc76, 0xe3fc27e5),
+              TOBN(0x70469b82, 0x95caabee),
+              TOBN(0xde024ca5, 0x889501e3),
+              TOBN(0x6bdadc06, 0x076ed265),
+              TOBN(0x0cb1236b, 0x5a0ef8b2),
+              TOBN(0x4065ddbf, 0x0972ebf9),
+              TOBN(0xf1dd3875, 0x22aca432),
+              TOBN(0xa88b97cf, 0x744aff76),
+              TOBN(0xd1359afd, 0xfe8e3d24),
+              TOBN(0x52a3ba2b, 0x91502cf3),
+              TOBN(0x2c3832a8, 0x084db75d),
+              TOBN(0x04a12ddd, 0xde30b1c9),
+              TOBN(0x7802eabc, 0xe31fd60c),
+              TOBN(0x33707327, 0xa37fddab),
+              TOBN(0x65d6f2ab, 0xfaafa973),
+              TOBN(0x3525c5b8, 0x11e6f91a),
+              TOBN(0x76aeb0c9, 0x5f46530b),
+              TOBN(0xe8815ff6, 0x2f93a675),
+              TOBN(0xa6ec9684, 0x05f48679),
+              TOBN(0x6dcbb556, 0x358ae884),
+              TOBN(0x0af61472, 0xe19e3873),
+              TOBN(0x72334372, 0xa5f696be),
+              TOBN(0xc65e57ea, 0x6f22fb70),
+              TOBN(0x268da30c, 0x946cea90),
+              TOBN(0x136a8a87, 0x65681b2a),
+              TOBN(0xad5e81dc, 0x0f9f44d4),
+              TOBN(0xf09a6960, 0x2c46585a),
+              TOBN(0xd1649164, 0xc447d1b1),
+              TOBN(0x3b4b36c8, 0x879dc8b1),
+              TOBN(0x20d4177b, 0x3b6b234c),
+              TOBN(0x096a2505, 0x1730d9d0),
+              TOBN(0x0611b9b8, 0xef80531d),
+              TOBN(0xba904b3b, 0x64bb495d),
+              TOBN(0x1192d9d4, 0x93a3147a),
+              TOBN(0x9f30a5dc, 0x9a565545),
+              TOBN(0x90b1f9cb, 0x6ef07212),
+              TOBN(0x29958546, 0x0d87fc13),
+              TOBN(0xd3323eff, 0xc17db9ba),
+              TOBN(0xcb18548c, 0xcb1644a8),
+              TOBN(0x18a306d4, 0x4f49ffbc),
+              TOBN(0x28d658f1, 0x4c2e8684),
+              TOBN(0x44ba60cd, 0xa99f8c71),
+              TOBN(0x67b7abdb, 0x4bf742ff),
+              TOBN(0x66310f9c, 0x914b3f99),
+              TOBN(0xae430a32, 0xf412c161),
+              TOBN(0x1e6776d3, 0x88ace52f),
+              TOBN(0x4bc0fa24, 0x52d7067d),
+              TOBN(0x03c286aa, 0x8f07cd1b),
+              TOBN(0x4cb8f38c, 0xa985b2c1),
+              TOBN(0x83ccbe80, 0x8c3bff36),
+              TOBN(0x005a0bd2, 0x5263e575),
+              TOBN(0x460d7dda, 0x259bdcd1),
+              TOBN(0x4a1c5642, 0xfa5cab6b),
+              TOBN(0x2b7bdbb9, 0x9fe4fc88),
+              TOBN(0x09418e28, 0xcc97bbb5),
+              TOBN(0xd8274fb4, 0xa12321ae),
+              TOBN(0xb137007d, 0x5c87b64e),
+              TOBN(0x80531fe1, 0xc63c4962),
+              TOBN(0x50541e89, 0x981fdb25),
+              TOBN(0xdc1291a1, 0xfd4c2b6b),
+              TOBN(0xc0693a17, 0xa6df4fca),
+              TOBN(0xb2c4604e, 0x0117f203),
+              TOBN(0x245f1963, 0x0a99b8d0),
+              TOBN(0xaedc20aa, 0xc6212c44),
+              TOBN(0xb1ed4e56, 0x520f52a8),
+              TOBN(0xfe48f575, 0xf8547be3),
+              TOBN(0x0a7033cd, 0xa9e45f98),
+              TOBN(0x4b45d3a9, 0x18c50100),
+              TOBN(0xb2a6cd6a, 0xa61d41da),
+              TOBN(0x60bbb4f5, 0x57933c6b),
+              TOBN(0xa7538ebd, 0x2b0d7ffc),
+              TOBN(0x9ea3ab8d, 0x8cd626b6),
+              TOBN(0x8273a484, 0x3601625a),
+              TOBN(0x88859845, 0x0168e508),
+              TOBN(0x8cbc9bb2, 0x99a94abd),
+              TOBN(0x713ac792, 0xfab0a671),
+              TOBN(0xa3995b19, 0x6c9ebffc),
+              TOBN(0xe711668e, 0x1239e152),
+              TOBN(0x56892558, 0xbbb8dff4),
+              TOBN(0x8bfc7dab, 0xdbf17963),
+              TOBN(0x5b59fe5a, 0xb3de1253),
+              TOBN(0x7e3320eb, 0x34a9f7ae),
+              TOBN(0xe5e8cf72, 0xd751efe4),
+              TOBN(0x7ea003bc, 0xd9be2f37),
+              TOBN(0xc0f551a0, 0xb6c08ef7),
+              TOBN(0x56606268, 0x038f6725),
+              TOBN(0x1dd38e35, 0x6d92d3b6),
+              TOBN(0x07dfce7c, 0xc3cbd686),
+              TOBN(0x4e549e04, 0x651c5da8),
+              TOBN(0x4058f93b, 0x08b19340),
+              TOBN(0xc2fae6f4, 0xcac6d89d),
+              TOBN(0x4bad8a8c, 0x8f159cc7),
+              TOBN(0x0ddba4b3, 0xcb0b601c),
+              TOBN(0xda4fc7b5, 0x1dd95f8c),
+              TOBN(0x1d163cd7, 0xcea5c255),
+              TOBN(0x30707d06, 0x274a8c4c),
+              TOBN(0x79d9e008, 0x2802e9ce),
+              TOBN(0x02a29ebf, 0xe6ddd505),
+              TOBN(0x37064e74, 0xb50bed1a),
+              TOBN(0x3f6bae65, 0xa7327d57),
+              TOBN(0x3846f5f1, 0xf83920bc),
+              TOBN(0x87c37491, 0x60df1b9b),
+              TOBN(0x4cfb2895, 0x2d1da29f),
+              TOBN(0x10a478ca, 0x4ed1743c),
+              TOBN(0x390c6030, 0x3edd47c6),
+              TOBN(0x8f3e5312, 0x8c0a78de),
+              TOBN(0xccd02bda, 0x1e85df70),
+              TOBN(0xd6c75c03, 0xa61b6582),
+              TOBN(0x0762921c, 0xfc0eebd1),
+              TOBN(0xd34d0823, 0xd85010c0),
+              TOBN(0xd73aaacb, 0x0044cf1f),
+              TOBN(0xfb4159bb, 0xa3b5e78a),
+              TOBN(0x2287c7f7, 0xe5826f3f),
+              TOBN(0x4aeaf742, 0x580b1a01),
+              TOBN(0xf080415d, 0x60423b79),
+              TOBN(0xe12622cd, 0xa7dea144),
+              TOBN(0x49ea4996, 0x59d62472),
+              TOBN(0xb42991ef, 0x571f3913),
+              TOBN(0x0610f214, 0xf5b25a8a),
+              TOBN(0x47adc585, 0x30b79e8f),
+              TOBN(0xf90e3df6, 0x07a065a2),
+              TOBN(0x5d0a5deb, 0x43e2e034),
+              TOBN(0x53fb5a34, 0x444024aa),
+              TOBN(0xa8628c68, 0x6b0c9f7f),
+              TOBN(0x9c69c29c, 0xac563656),
+              TOBN(0x5a231feb, 0xbace47b6),
+              TOBN(0xbdce0289, 0x9ea5a2ec),
+              TOBN(0x05da1fac, 0x9463853e),
+              TOBN(0x96812c52, 0x509e78aa),
+              TOBN(0xd3fb5771, 0x57151692),
+              TOBN(0xeb2721f8, 0xd98e1c44),
+              TOBN(0xc0506087, 0x32399be1),
+              TOBN(0xda5a5511, 0xd979d8b8),
+              TOBN(0x737ed55d, 0xc6f56780),
+              TOBN(0xe20d3004, 0x0dc7a7f4),
+              TOBN(0x02ce7301, 0xf5941a03),
+              TOBN(0x91ef5215, 0xed30f83a),
+              TOBN(0x28727fc1, 0x4092d85f),
+              TOBN(0x72d223c6, 0x5c49e41a),
+              TOBN(0xa7cf30a2, 0xba6a4d81),
+              TOBN(0x7c086209, 0xb030d87d),
+              TOBN(0x04844c7d, 0xfc588b09),
+              TOBN(0x728cd499, 0x5874bbb0),
+              TOBN(0xcc1281ee, 0xe84c0495),
+              TOBN(0x0769b5ba, 0xec31958f),
+              TOBN(0x665c228b, 0xf99c2471),
+              TOBN(0xf2d8a11b, 0x191eb110),
+              TOBN(0x4594f494, 0xd36d7024),
+              TOBN(0x482ded8b, 0xcdcb25a1),
+              TOBN(0xc958a9d8, 0xdadd4885),
+              TOBN(0x7004477e, 0xf1d2b547),
+              TOBN(0x0a45f6ef, 0x2a0af550),
+              TOBN(0x4fc739d6, 0x2f8d6351),
+              TOBN(0x75cdaf27, 0x786f08a9),
+              TOBN(0x8700bb26, 0x42c2737f),
+              TOBN(0x855a7141, 0x1c4e2670),
+              TOBN(0x810188c1, 0x15076fef),
+              TOBN(0xc251d0c9, 0xabcd3297),
+              TOBN(0xae4c8967, 0xf48108eb),
+              TOBN(0xbd146de7, 0x18ceed30),
+              TOBN(0xf9d4f07a, 0xc986bced),
+              TOBN(0x5ad98ed5, 0x83fa1e08),
+              TOBN(0x7780d33e, 0xbeabd1fb),
+              TOBN(0xe330513c, 0x903b1196),
+              TOBN(0xba11de9e, 0xa47bc8c4),
+              TOBN(0x684334da, 0x02c2d064),
+              TOBN(0x7ecf360d, 0xa48de23b),
+              TOBN(0x57a1b474, 0x0a9089d8),
+              TOBN(0xf28fa439, 0xff36734c),
+              TOBN(0xf2a482cb, 0xea4570b3),
+              TOBN(0xee65d68b, 0xa5ebcee9),
+              TOBN(0x988d0036, 0xb9694cd5),
+              TOBN(0x53edd0e9, 0x37885d32),
+              TOBN(0xe37e3307, 0xbeb9bc6d),
+              TOBN(0xe9abb907, 0x9f5c6768),
+              TOBN(0x4396ccd5, 0x51f2160f),
+              TOBN(0x2500888c, 0x47336da6),
+              TOBN(0x383f9ed9, 0x926fce43),
+              TOBN(0x809dd1c7, 0x04da2930),
+              TOBN(0x30f6f596, 0x8a4cb227),
+              TOBN(0x0d700c7f, 0x73a56b38),
+              TOBN(0x1825ea33, 0xab64a065),
+              TOBN(0xaab9b735, 0x1338df80),
+              TOBN(0x1516100d, 0x9b63f57f),
+              TOBN(0x2574395a, 0x27a6a634),
+              TOBN(0xb5560fb6, 0x700a1acd),
+              TOBN(0xe823fd73, 0xfd999681),
+              TOBN(0xda915d1f, 0x6cb4e1ba),
+              TOBN(0x0d030118, 0x6ebe00a3),
+              TOBN(0x744fb0c9, 0x89fca8cd),
+              TOBN(0x970d01db, 0xf9da0e0b),
+              TOBN(0x0ad8c564, 0x7931d76f),
+              TOBN(0xb15737bf, 0xf659b96a),
+              TOBN(0xdc9933e8, 0xa8b484e7),
+              TOBN(0xb2fdbdf9, 0x7a26dec7),
+              TOBN(0x2349e9a4, 0x9f1f0136),
+              TOBN(0x7860368e, 0x70fddddb),
+              TOBN(0xd93d2c1c, 0xf9ad3e18),
+              TOBN(0x6d6c5f17, 0x689f4e79),
+              TOBN(0x7a544d91, 0xb24ff1b6),
+              TOBN(0x3e12a5eb, 0xfe16cd8c),
+              TOBN(0x543574e9, 0xa56b872f),
+              TOBN(0xa1ad550c, 0xfcf68ea2),
+              TOBN(0x689e37d2, 0x3f560ef7),
+              TOBN(0x8c54b9ca, 0xc9d47a8b),
+              TOBN(0x46d40a4a, 0x088ac342),
+              TOBN(0xec450c7c, 0x1576c6d0),
+              TOBN(0xb589e31c, 0x1f9689e9),
+              TOBN(0xdacf2602, 0xb8781718),
+              TOBN(0xa89237c6, 0xc8cb6b42),
+              TOBN(0x1326fc93, 0xb96ef381),
+              TOBN(0x55d56c6d, 0xb5f07825),
+              TOBN(0xacba2eea, 0x7449e22d),
+              TOBN(0x74e0887a, 0x633c3000),
+              TOBN(0xcb6cd172, 0xd7cbcf71),
+              TOBN(0x309e81de, 0xc36cf1be),
+              TOBN(0x07a18a6d, 0x60ae399b),
+              TOBN(0xb36c2679, 0x9edce57e),
+              TOBN(0x52b892f4, 0xdf001d41),
+              TOBN(0xd884ae5d, 0x16a1f2c6),
+              TOBN(0x9b329424, 0xefcc370a),
+              TOBN(0x3120daf2, 0xbd2e21df),
+              TOBN(0x55298d2d, 0x02470a99),
+              TOBN(0x0b78af6c, 0xa05db32e),
+              TOBN(0x5c76a331, 0x601f5636),
+              TOBN(0xaae861ff, 0xf8a4f29c),
+              TOBN(0x70dc9240, 0xd68f8d49),
+              TOBN(0x960e649f, 0x81b1321c),
+              TOBN(0x3d2c801b, 0x8792e4ce),
+              TOBN(0xf479f772, 0x42521876),
+              TOBN(0x0bed93bc, 0x416c79b1),
+              TOBN(0xa67fbc05, 0x263e5bc9),
+              TOBN(0x01e8e630, 0x521db049),
+              TOBN(0x76f26738, 0xc6f3431e),
+              TOBN(0xe609cb02, 0xe3267541),
+              TOBN(0xb10cff2d, 0x818c877c),
+              TOBN(0x1f0e75ce, 0x786a13cb),
+              TOBN(0xf4fdca64, 0x1158544d),
+              TOBN(0x5d777e89, 0x6cb71ed0),
+              TOBN(0x3c233737, 0xa9aa4755),
+              TOBN(0x7b453192, 0xe527ab40),
+              TOBN(0xdb59f688, 0x39f05ffe),
+              TOBN(0x8f4f4be0, 0x6d82574e),
+              TOBN(0xcce3450c, 0xee292d1b),
+              TOBN(0xaa448a12, 0x61ccd086),
+              TOBN(0xabce91b3, 0xf7914967),
+              TOBN(0x4537f09b, 0x1908a5ed),
+              TOBN(0xa812421e, 0xf51042e7),
+              TOBN(0xfaf5cebc, 0xec0b3a34),
+              TOBN(0x730ffd87, 0x4ca6b39a),
+              TOBN(0x70fb72ed, 0x02efd342),
+              TOBN(0xeb4735f9, 0xd75c8edb),
+              TOBN(0xc11f2157, 0xc278aa51),
+              TOBN(0xc459f635, 0xbf3bfebf),
+              TOBN(0x3a1ff0b4, 0x6bd9601f),
+              TOBN(0xc9d12823, 0xc420cb73),
+              TOBN(0x3e9af3e2, 0x3c2915a3),
+              TOBN(0xe0c82c72, 0xb41c3440),
+              TOBN(0x175239e5, 0xe3039a5f),
+              TOBN(0xe1084b8a, 0x558795a3),
+              TOBN(0x328d0a1d, 0xd01e5c60),
+              TOBN(0x0a495f2e, 0xd3788a04),
+              TOBN(0x25d8ff16, 0x66c11a9f),
+              TOBN(0xf5155f05, 0x9ed692d6),
+              TOBN(0x954fa107, 0x4f425fe4),
+              TOBN(0xd16aabf2, 0xe98aaa99),
+              TOBN(0x90cd8ba0, 0x96b0f88a),
+              TOBN(0x957f4782, 0xc154026a),
+              TOBN(0x54ee0734, 0x52af56d2),
+              TOBN(0xbcf89e54, 0x45b4147a),
+              TOBN(0x3d102f21, 0x9a52816c),
+              TOBN(0x6808517e, 0x39b62e77),
+              TOBN(0x92e25421, 0x69169ad8),
+              TOBN(0xd721d871, 0xbb608558),
+              TOBN(0x60e4ebae, 0xf6d4ff9b),
+              TOBN(0x0ba10819, 0x41f2763e),
+              TOBN(0xca2e45be, 0x51ee3247),
+              TOBN(0x66d172ec, 0x2bfd7a5f),
+              TOBN(0x528a8f2f, 0x74d0b12d),
+              TOBN(0xe17f1e38, 0xdabe70dc),
+              TOBN(0x1d5d7316, 0x9f93983c),
+              TOBN(0x51b2184a, 0xdf423e31),
+              TOBN(0xcb417291, 0xaedb1a10),
+              TOBN(0x2054ca93, 0x625bcab9),
+              TOBN(0x54396860, 0xa98998f0),
+              TOBN(0x4e53f6c4, 0xa54ae57e),
+              TOBN(0x0ffeb590, 0xee648e9d),
+              TOBN(0xfbbdaadc, 0x6afaf6bc),
+              TOBN(0xf88ae796, 0xaa3bfb8a),
+              TOBN(0x209f1d44, 0xd2359ed9),
+              TOBN(0xac68dd03, 0xf3544ce2),
+              TOBN(0xf378da47, 0xfd51e569),
+              TOBN(0xe1abd860, 0x2cc80097),
+              TOBN(0x23ca18d9, 0x343b6e3a),
+              TOBN(0x480797e8, 0xb40a1bae),
+              TOBN(0xd1f0c717, 0x533f3e67),
+              TOBN(0x44896970, 0x06e6cdfc),
+              TOBN(0x8ca21055, 0x52a82e8d),
+              TOBN(0xb2caf785, 0x78460cdc),
+              TOBN(0x4c1b7b62, 0xe9037178),
+              TOBN(0xefc09d2c, 0xdb514b58),
+              TOBN(0x5f2df9ee, 0x9113be5c),
+              TOBN(0x2fbda78f, 0xb3f9271c),
+              TOBN(0xe09a81af, 0x8f83fc54),
+              TOBN(0x06b13866, 0x8afb5141),
+              TOBN(0x38f6480f, 0x43e3865d),
+              TOBN(0x72dd77a8, 0x1ddf47d9),
+              TOBN(0xf2a8e971, 0x4c205ff7),
+              TOBN(0x46d449d8, 0x9d088ad8),
+              TOBN(0x926619ea, 0x185d706f),
+              TOBN(0xe47e02eb, 0xc7dd7f62),
+              TOBN(0xe7f120a7, 0x8cbc2031),
+              TOBN(0xc18bef00, 0x998d4ac9),
+              TOBN(0x18f37a9c, 0x6bdf22da),
+              TOBN(0xefbc432f, 0x90dc82df),
+              TOBN(0xc52cef8e, 0x5d703651),
+              TOBN(0x82887ba0, 0xd99881a5),
+              TOBN(0x7cec9dda, 0xb920ec1d),
+              TOBN(0xd0d7e8c3, 0xec3e8d3b),
+              TOBN(0x445bc395, 0x4ca88747),
+              TOBN(0xedeaa2e0, 0x9fd53535),
+              TOBN(0x461b1d93, 0x6cc87475),
+              TOBN(0xd92a52e2, 0x6d2383bd),
+              TOBN(0xfabccb59, 0xd7903546),
+              TOBN(0x6111a761, 0x3d14b112),
+              TOBN(0x0ae584fe, 0xb3d5f612),
+              TOBN(0x5ea69b8d, 0x60e828ec),
+              TOBN(0x6c078985, 0x54087030),
+              TOBN(0x649cab04, 0xac4821fe),
+              TOBN(0x25ecedcf, 0x8bdce214),
+              TOBN(0xb5622f72, 0x86af7361),
+              TOBN(0x0e1227aa, 0x7038b9e2),
+              TOBN(0xd0efb273, 0xac20fa77),
+              TOBN(0x817ff88b, 0x79df975b),
+              TOBN(0x856bf286, 0x1999503e),
+              TOBN(0xb4d5351f, 0x5038ec46),
+              TOBN(0x740a52c5, 0xfc42af6e),
+              TOBN(0x2e38bb15, 0x2cbb1a3f),
+              TOBN(0xc3eb99fe, 0x17a83429),
+              TOBN(0xca4fcbf1, 0xdd66bb74),
+              TOBN(0x880784d6, 0xcde5e8fc),
+              TOBN(0xddc84c1c, 0xb4e7a0be),
+              TOBN(0x8780510d, 0xbd15a72f),
+              TOBN(0x44bcf1af, 0x81ec30e1),
+              TOBN(0x141e50a8, 0x0a61073e),
+              TOBN(0x0d955718, 0x47be87ae),
+              TOBN(0x68a61417, 0xf76a4372),
+              TOBN(0xf57e7e87, 0xc607c3d3),
+              TOBN(0x043afaf8, 0x5252f332),
+              TOBN(0xcc14e121, 0x1552a4d2),
+              TOBN(0xb6dee692, 0xbb4d4ab4),
+              TOBN(0xb6ab74c8, 0xa03816a4),
+              TOBN(0x84001ae4, 0x6f394a29),
+              TOBN(0x5bed8344, 0xd795fb45),
+              TOBN(0x57326e7d, 0xb79f55a5),
+              TOBN(0xc9533ce0, 0x4accdffc),
+              TOBN(0x53473caf, 0x3993fa04),
+              TOBN(0x7906eb93, 0xa13df4c8),
+              TOBN(0xa73e51f6, 0x97cbe46f),
+              TOBN(0xd1ab3ae1, 0x0ae4ccf8),
+              TOBN(0x25614508, 0x8a5b3dbc),
+              TOBN(0x61eff962, 0x11a71b27),
+              TOBN(0xdf71412b, 0x6bb7fa39),
+              TOBN(0xb31ba6b8, 0x2bd7f3ef),
+              TOBN(0xb0b9c415, 0x69180d29),
+              TOBN(0xeec14552, 0x014cdde5),
+              TOBN(0x702c624b, 0x227b4bbb),
+              TOBN(0x2b15e8c2, 0xd3e988f3),
+              TOBN(0xee3bcc6d, 0xa4f7fd04),
+              TOBN(0x9d00822a, 0x42ac6c85),
+              TOBN(0x2db0cea6, 0x1df9f2b7),
+              TOBN(0xd7cad2ab, 0x42de1e58),
+              TOBN(0x346ed526, 0x2d6fbb61),
+              TOBN(0xb3962995, 0x1a2faf09),
+              TOBN(0x2fa8a580, 0x7c25612e),
+              TOBN(0x30ae04da, 0x7cf56490),
+              TOBN(0x75662908, 0x0eea3961),
+              TOBN(0x3609f5c5, 0x3d080847),
+              TOBN(0xcb081d39, 0x5241d4f6),
+              TOBN(0xb4fb3810, 0x77961a63),
+              TOBN(0xc20c5984, 0x2abb66fc),
+              TOBN(0x3d40aa7c, 0xf902f245),
+              TOBN(0x9cb12736, 0x4e536b1e),
+              TOBN(0x5eda24da, 0x99b3134f),
+              TOBN(0xafbd9c69, 0x5cd011af),
+              TOBN(0x9a16e30a, 0xc7088c7d),
+              TOBN(0x5ab65710, 0x3207389f),
+              TOBN(0x1b09547f, 0xe7407a53),
+              TOBN(0x2322f9d7, 0x4fdc6eab),
+              TOBN(0xc0f2f22d, 0x7430de4d),
+              TOBN(0x19382696, 0xe68ca9a9),
+              TOBN(0x17f1eff1, 0x918e5868),
+              TOBN(0xe3b5b635, 0x586f4204),
+              TOBN(0x146ef980, 0x3fbc4341),
+              TOBN(0x359f2c80, 0x5b5eed4e),
+              TOBN(0x9f35744e, 0x7482e41d),
+              TOBN(0x9a9ac3ec, 0xf3b224c2),
+              TOBN(0x9161a6fe, 0x91fc50ae),
+              TOBN(0x89ccc66b, 0xc613fa7c),
+              TOBN(0x89268b14, 0xc732f15a),
+              TOBN(0x7cd6f4e2, 0xb467ed03),
+              TOBN(0xfbf79869, 0xce56b40e),
+              TOBN(0xf93e094c, 0xc02dde98),
+              TOBN(0xefe0c3a8, 0xedee2cd7),
+              TOBN(0x90f3ffc0, 0xb268fd42),
+              TOBN(0x81a7fd56, 0x08241aed),
+              TOBN(0x95ab7ad8, 0x00b1afe8),
+              TOBN(0x40127056, 0x3e310d52),
+              TOBN(0xd3ffdeb1, 0x09d9fc43),
+              TOBN(0xc8f85c91, 0xd11a8594),
+              TOBN(0x2e74d258, 0x31cf6db8),
+              TOBN(0x829c7ca3, 0x02b5dfd0),
+              TOBN(0xe389cfbe, 0x69143c86),
+              TOBN(0xd01b6405, 0x941768d8),
+              TOBN(0x45103995, 0x03bf825d),
+              TOBN(0xcc4ee166, 0x56cd17e2),
+              TOBN(0xbea3c283, 0xba037e79),
+              TOBN(0x4e1ac06e, 0xd9a47520),
+              TOBN(0xfbfe18aa, 0xaf852404),
+              TOBN(0x5615f8e2, 0x8087648a),
+              TOBN(0x7301e47e, 0xb9d150d9),
+              TOBN(0x79f9f9dd, 0xb299b977),
+              TOBN(0x76697a7b, 0xa5b78314),
+              TOBN(0x10d67468, 0x7d7c90e7),
+              TOBN(0x7afffe03, 0x937210b5),
+              TOBN(0x5aef3e4b, 0x28c22cee),
+              TOBN(0xefb0ecd8, 0x09fd55ae),
+              TOBN(0x4cea7132, 0x0d2a5d6a),
+              TOBN(0x9cfb5fa1, 0x01db6357),
+              TOBN(0x395e0b57, 0xf36e1ac5),
+              TOBN(0x008fa9ad, 0x36cafb7d),
+              TOBN(0x8f6cdf70, 0x5308c4db),
+              TOBN(0x51527a37, 0x95ed2477),
+              TOBN(0xba0dee30, 0x5bd21311),
+              TOBN(0x6ed41b22, 0x909c90d7),
+              TOBN(0xc5f6b758, 0x7c8696d3),
+              TOBN(0x0db8eaa8, 0x3ce83a80),
+              TOBN(0xd297fe37, 0xb24b4b6f),
+              TOBN(0xfe58afe8, 0x522d1f0d),
+              TOBN(0x97358736, 0x8c98dbd9),
+              TOBN(0x6bc226ca, 0x9454a527),
+              TOBN(0xa12b384e, 0xce53c2d0),
+              TOBN(0x779d897d, 0x5e4606da),
+              TOBN(0xa53e47b0, 0x73ec12b0),
+              TOBN(0x462dbbba, 0x5756f1ad),
+              TOBN(0x69fe09f2, 0xcafe37b6),
+              TOBN(0x273d1ebf, 0xecce2e17),
+              TOBN(0x8ac1d538, 0x3cf607fd),
+              TOBN(0x8035f7ff, 0x12e10c25),
+          },
+          {
+              TOBN(0x854d34c7, 0x7e6c5520),
+              TOBN(0xc27df9ef, 0xdcb9ea58),
+              TOBN(0x405f2369, 0xd686666d),
+              TOBN(0x29d1febf, 0x0417aa85),
+              TOBN(0x9846819e, 0x93470afe),
+              TOBN(0x3e6a9669, 0xe2a27f9e),
+              TOBN(0x24d008a2, 0xe31e6504),
+              TOBN(0xdba7cecf, 0x9cb7680a),
+              TOBN(0xecaff541, 0x338d6e43),
+              TOBN(0x56f7dd73, 0x4541d5cc),
+              TOBN(0xb5d426de, 0x96bc88ca),
+              TOBN(0x48d94f6b, 0x9ed3a2c3),
+              TOBN(0x6354a3bb, 0x2ef8279c),
+              TOBN(0xd575465b, 0x0b1867f2),
+              TOBN(0xef99b0ff, 0x95225151),
+              TOBN(0xf3e19d88, 0xf94500d8),
+              TOBN(0x92a83268, 0xe32dd620),
+              TOBN(0x913ec99f, 0x627849a2),
+              TOBN(0xedd8fdfa, 0x2c378882),
+              TOBN(0xaf96f33e, 0xee6f8cfe),
+              TOBN(0xc06737e5, 0xdc3fa8a5),
+              TOBN(0x236bb531, 0xb0b03a1d),
+              TOBN(0x33e59f29, 0x89f037b0),
+              TOBN(0x13f9b5a7, 0xd9a12a53),
+              TOBN(0x0d0df6ce, 0x51efb310),
+              TOBN(0xcb5b2eb4, 0x958df5be),
+              TOBN(0xd6459e29, 0x36158e59),
+              TOBN(0x82aae2b9, 0x1466e336),
+              TOBN(0xfb658a39, 0x411aa636),
+              TOBN(0x7152ecc5, 0xd4c0a933),
+              TOBN(0xf10c758a, 0x49f026b7),
+              TOBN(0xf4837f97, 0xcb09311f),
+              TOBN(0xddfb02c4, 0xc753c45f),
+              TOBN(0x18ca81b6, 0xf9c840fe),
+              TOBN(0x846fd09a, 0xb0f8a3e6),
+              TOBN(0xb1162add, 0xe7733dbc),
+              TOBN(0x7070ad20, 0x236e3ab6),
+              TOBN(0xf88cdaf5, 0xb2a56326),
+              TOBN(0x05fc8719, 0x997cbc7a),
+              TOBN(0x442cd452, 0x4b665272),
+              TOBN(0x7807f364, 0xb71698f5),
+              TOBN(0x6ba418d2, 0x9f7b605e),
+              TOBN(0xfd20b00f, 0xa03b2cbb),
+              TOBN(0x883eca37, 0xda54386f),
+              TOBN(0xff0be43f, 0xf3437f24),
+              TOBN(0xe910b432, 0xa48bb33c),
+              TOBN(0x4963a128, 0x329df765),
+              TOBN(0xac1dd556, 0xbe2fe6f7),
+              TOBN(0x557610f9, 0x24a0a3fc),
+              TOBN(0x38e17bf4, 0xe881c3f9),
+              TOBN(0x6ba84faf, 0xed0dac99),
+              TOBN(0xd4a222c3, 0x59eeb918),
+              TOBN(0xc79c1dbe, 0x13f542b6),
+              TOBN(0x1fc65e0d, 0xe425d457),
+              TOBN(0xeffb754f, 0x1debb779),
+              TOBN(0x638d8fd0, 0x9e08af60),
+              TOBN(0x994f523a, 0x626332d5),
+              TOBN(0x7bc38833, 0x5561bb44),
+              TOBN(0x005ed4b0, 0x3d845ea2),
+              TOBN(0xd39d3ee1, 0xc2a1f08a),
+              TOBN(0x6561fdd3, 0xe7676b0d),
+              TOBN(0x620e35ff, 0xfb706017),
+              TOBN(0x36ce424f, 0xf264f9a8),
+              TOBN(0xc4c3419f, 0xda2681f7),
+              TOBN(0xfb6afd2f, 0x69beb6e8),
+              TOBN(0x3a50b993, 0x6d700d03),
+              TOBN(0xc840b2ad, 0x0c83a14f),
+              TOBN(0x573207be, 0x54085bef),
+              TOBN(0x5af882e3, 0x09fe7e5b),
+              TOBN(0x957678a4, 0x3b40a7e1),
+              TOBN(0x172d4bdd, 0x543056e2),
+              TOBN(0x9c1b26b4, 0x0df13c0a),
+              TOBN(0x1c30861c, 0xf405ff06),
+              TOBN(0xebac86bd, 0x486e828b),
+              TOBN(0xe791a971, 0x636933fc),
+              TOBN(0x50e7c2be, 0x7aeee947),
+              TOBN(0xc3d4a095, 0xfa90d767),
+              TOBN(0xae60eb7b, 0xe670ab7b),
+              TOBN(0x17633a64, 0x397b056d),
+              TOBN(0x93a21f33, 0x105012aa),
+              TOBN(0x663c370b, 0xabb88643),
+              TOBN(0x91df36d7, 0x22e21599),
+              TOBN(0x183ba835, 0x8b761671),
+              TOBN(0x381eea1d, 0x728f3bf1),
+              TOBN(0xb9b2f1ba, 0x39966e6c),
+              TOBN(0x7c464a28, 0xe7295492),
+              TOBN(0x0fd5f70a, 0x09b26b7f),
+              TOBN(0xa9aba1f9, 0xfbe009df),
+              TOBN(0x857c1f22, 0x369b87ad),
+              TOBN(0x3c00e5d9, 0x32fca556),
+              TOBN(0x1ad74cab, 0x90b06466),
+              TOBN(0xa7112386, 0x550faaf2),
+              TOBN(0x7435e198, 0x6d9bd5f5),
+              TOBN(0x2dcc7e38, 0x59c3463f),
+              TOBN(0xdc7df748, 0xca7bd4b2),
+              TOBN(0x13cd4c08, 0x9dec2f31),
+              TOBN(0x0d3b5df8, 0xe3237710),
+              TOBN(0x0dadb26e, 0xcbd2f7b0),
+              TOBN(0x9f5966ab, 0xe4aa082b),
+              TOBN(0x666ec8de, 0x350e966e),
+              TOBN(0x1bfd1ed5, 0xee524216),
+              TOBN(0xcd93c59b, 0x41dab0b6),
+              TOBN(0x658a8435, 0xd186d6ba),
+              TOBN(0x1b7d34d2, 0x159d1195),
+              TOBN(0x5936e460, 0x22caf46b),
+              TOBN(0x6a45dd8f, 0x9a96fe4f),
+              TOBN(0xf7925434, 0xb98f474e),
+              TOBN(0x41410412, 0x0053ef15),
+              TOBN(0x71cf8d12, 0x41de97bf),
+              TOBN(0xb8547b61, 0xbd80bef4),
+              TOBN(0xb47d3970, 0xc4db0037),
+              TOBN(0xf1bcd328, 0xfef20dff),
+              TOBN(0x31a92e09, 0x10caad67),
+              TOBN(0x1f591960, 0x5531a1e1),
+              TOBN(0x3bb852e0, 0x5f4fc840),
+              TOBN(0x63e297ca, 0x93a72c6c),
+              TOBN(0x3c2b0b2e, 0x49abad67),
+              TOBN(0x6ec405fc, 0xed3db0d9),
+              TOBN(0xdc14a530, 0x7fef1d40),
+              TOBN(0xccd19846, 0x280896fc),
+              TOBN(0x00f83176, 0x9bb81648),
+              TOBN(0xd69eb485, 0x653120d0),
+              TOBN(0xd17d75f4, 0x4ccabc62),
+              TOBN(0x34a07f82, 0xb749fcb1),
+              TOBN(0x2c3af787, 0xbbfb5554),
+              TOBN(0xb06ed4d0, 0x62e283f8),
+              TOBN(0x5722889f, 0xa19213a0),
+              TOBN(0x162b085e, 0xdcf3c7b4),
+              TOBN(0xbcaecb31, 0xe0dd3eca),
+              TOBN(0xc6237fbc, 0xe52f13a5),
+              TOBN(0xcc2b6b03, 0x27bac297),
+              TOBN(0x2ae1cac5, 0xb917f54a),
+              TOBN(0x474807d4, 0x7845ae4f),
+              TOBN(0xfec7dd92, 0xce5972e0),
+              TOBN(0xc3bd2541, 0x1d7915bb),
+              TOBN(0x66f85dc4, 0xd94907ca),
+              TOBN(0xd981b888, 0xbdbcf0ca),
+              TOBN(0xd75f5da6, 0xdf279e9f),
+              TOBN(0x128bbf24, 0x7054e934),
+              TOBN(0x3c6ff6e5, 0x81db134b),
+              TOBN(0x795b7cf4, 0x047d26e4),
+              TOBN(0xf370f7b8, 0x5049ec37),
+              TOBN(0xc6712d4d, 0xced945af),
+              TOBN(0xdf30b5ec, 0x095642bc),
+              TOBN(0x9b034c62, 0x4896246e),
+              TOBN(0x5652c016, 0xee90bbd1),
+              TOBN(0xeb38636f, 0x87fedb73),
+              TOBN(0x5e32f847, 0x0135a613),
+              TOBN(0x0703b312, 0xcf933c83),
+              TOBN(0xd05bb76e, 0x1a7f47e6),
+              TOBN(0x825e4f0c, 0x949c2415),
+              TOBN(0x569e5622, 0x7250d6f8),
+              TOBN(0xbbe9eb3a, 0x6568013e),
+              TOBN(0x8dbd203f, 0x22f243fc),
+              TOBN(0x9dbd7694, 0xb342734a),
+              TOBN(0x8f6d12f8, 0x46afa984),
+              TOBN(0xb98610a2, 0xc9eade29),
+              TOBN(0xbab4f323, 0x47dd0f18),
+              TOBN(0x5779737b, 0x671c0d46),
+              TOBN(0x10b6a7c6, 0xd3e0a42a),
+              TOBN(0xfb19ddf3, 0x3035b41c),
+              TOBN(0xd336343f, 0x99c45895),
+              TOBN(0x61fe4938, 0x54c857e5),
+              TOBN(0xc4d506be, 0xae4e57d5),
+              TOBN(0x3cd8c8cb, 0xbbc33f75),
+              TOBN(0x7281f08a, 0x9262c77d),
+              TOBN(0x083f4ea6, 0xf11a2823),
+              TOBN(0x8895041e, 0x9fba2e33),
+              TOBN(0xfcdfea49, 0x9c438edf),
+              TOBN(0x7678dcc3, 0x91edba44),
+              TOBN(0xf07b3b87, 0xe2ba50f0),
+              TOBN(0xc13888ef, 0x43948c1b),
+              TOBN(0xc2135ad4, 0x1140af42),
+              TOBN(0x8e5104f3, 0x926ed1a7),
+              TOBN(0xf24430cb, 0x88f6695f),
+              TOBN(0x0ce0637b, 0x6d73c120),
+              TOBN(0xb2db01e6, 0xfe631e8f),
+              TOBN(0x1c5563d7, 0xd7bdd24b),
+              TOBN(0x8daea3ba, 0x369ad44f),
+              TOBN(0x000c81b6, 0x8187a9f9),
+              TOBN(0x5f48a951, 0xaae1fd9a),
+              TOBN(0xe35626c7, 0x8d5aed8a),
+              TOBN(0x20952763, 0x0498c622),
+              TOBN(0x76d17634, 0x773aa504),
+              TOBN(0x36d90dda, 0xeb300f7a),
+              TOBN(0x9dcf7dfc, 0xedb5e801),
+              TOBN(0x645cb268, 0x74d5244c),
+              TOBN(0xa127ee79, 0x348e3aa2),
+              TOBN(0x488acc53, 0x575f1dbb),
+              TOBN(0x95037e85, 0x80e6161e),
+              TOBN(0x57e59283, 0x292650d0),
+              TOBN(0xabe67d99, 0x14938216),
+              TOBN(0x3c7f944b, 0x3f8e1065),
+              TOBN(0xed908cb6, 0x330e8924),
+              TOBN(0x08ee8fd5, 0x6f530136),
+              TOBN(0x2227b7d5, 0xd7ffc169),
+              TOBN(0x4f55c893, 0xb5cd6dd5),
+              TOBN(0x82225e11, 0xa62796e8),
+              TOBN(0x5c6cead1, 0xcb18e12c),
+              TOBN(0x4381ae0c, 0x84f5a51a),
+              TOBN(0x345913d3, 0x7fafa4c8),
+              TOBN(0x3d918082, 0x0491aac0),
+              TOBN(0x9347871f, 0x3e69264c),
+              TOBN(0xbea9dd3c, 0xb4f4f0cd),
+              TOBN(0xbda5d067, 0x3eadd3e7),
+              TOBN(0x0033c1b8, 0x0573bcd8),
+              TOBN(0x25589379, 0x5da2486c),
+              TOBN(0xcb89ee5b, 0x86abbee7),
+              TOBN(0x8fe0a8f3, 0x22532e5d),
+              TOBN(0xb6410ff0, 0x727dfc4c),
+              TOBN(0x619b9d58, 0x226726db),
+              TOBN(0x5ec25669, 0x7a2b2dc7),
+              TOBN(0xaf4d2e06, 0x4c3beb01),
+              TOBN(0x852123d0, 0x7acea556),
+              TOBN(0x0e9470fa, 0xf783487a),
+              TOBN(0x75a7ea04, 0x5664b3eb),
+              TOBN(0x4ad78f35, 0x6798e4ba),
+              TOBN(0x9214e6e5, 0xc7d0e091),
+              TOBN(0xc420b488, 0xb1290403),
+              TOBN(0x64049e0a, 0xfc295749),
+              TOBN(0x03ef5af1, 0x3ae9841f),
+              TOBN(0xdbe4ca19, 0xb0b662a6),
+              TOBN(0x46845c5f, 0xfa453458),
+              TOBN(0xf8dabf19, 0x10b66722),
+              TOBN(0xb650f0aa, 0xcce2793b),
+              TOBN(0x71db851e, 0xc5ec47c1),
+              TOBN(0x3eb78f3e, 0x3b234fa9),
+              TOBN(0xb0c60f35, 0xfc0106ce),
+              TOBN(0x05427121, 0x774eadbd),
+              TOBN(0x25367faf, 0xce323863),
+              TOBN(0x7541b5c9, 0xcd086976),
+              TOBN(0x4ff069e2, 0xdc507ad1),
+              TOBN(0x74145256, 0x8776e667),
+              TOBN(0x6e76142c, 0xb23c6bb5),
+              TOBN(0xdbf30712, 0x1b3a8a87),
+              TOBN(0x60e7363e, 0x98450836),
+              TOBN(0x5741450e, 0xb7366d80),
+              TOBN(0xe4ee14ca, 0x4837dbdf),
+              TOBN(0xa765eb9b, 0x69d4316f),
+              TOBN(0x04548dca, 0x8ef43825),
+              TOBN(0x9c9f4e4c, 0x5ae888eb),
+              TOBN(0x733abb51, 0x56e9ac99),
+              TOBN(0xdaad3c20, 0xba6ac029),
+              TOBN(0x9b8dd3d3, 0x2ba3e38e),
+              TOBN(0xa9bb4c92, 0x0bc5d11a),
+              TOBN(0xf20127a7, 0x9c5f88a3),
+              TOBN(0x4f52b06e, 0x161d3cb8),
+              TOBN(0x26c1ff09, 0x6afaf0a6),
+              TOBN(0x32670d2f, 0x7189e71f),
+              TOBN(0xc6438748, 0x5ecf91e7),
+              TOBN(0x15758e57, 0xdb757a21),
+              TOBN(0x427d09f8, 0x290a9ce5),
+              TOBN(0x846a308f, 0x38384a7a),
+              TOBN(0xaac3acb4, 0xb0732b99),
+              TOBN(0x9e941009, 0x17845819),
+              TOBN(0x95cba111, 0xa7ce5e03),
+              TOBN(0x6f3d4f7f, 0xb00009c4),
+              TOBN(0xb8396c27, 0x8ff28b5f),
+              TOBN(0xb1a9ae43, 0x1c97975d),
+              TOBN(0x9d7ba8af, 0xe5d9fed5),
+              TOBN(0x338cf09f, 0x34f485b6),
+              TOBN(0xbc0ddacc, 0x64122516),
+              TOBN(0xa450da12, 0x05d471fe),
+              TOBN(0x4c3a6250, 0x628dd8c9),
+              TOBN(0x69c7d103, 0xd1295837),
+              TOBN(0xa2893e50, 0x3807eb2f),
+              TOBN(0xd6e1e1de, 0xbdb41491),
+              TOBN(0xc630745b, 0x5e138235),
+              TOBN(0xc892109e, 0x48661ae1),
+              TOBN(0x8d17e7eb, 0xea2b2674),
+              TOBN(0x00ec0f87, 0xc328d6b5),
+              TOBN(0x6d858645, 0xf079ff9e),
+              TOBN(0x6cdf243e, 0x19115ead),
+              TOBN(0x1ce1393e, 0x4bac4fcf),
+              TOBN(0x2c960ed0, 0x9c29f25b),
+              TOBN(0x59be4d8e, 0x9d388a05),
+              TOBN(0x0d46e06c, 0xd0def72b),
+              TOBN(0xb923db5d, 0xe0342748),
+              TOBN(0xf7d3aacd, 0x936d4a3d),
+              TOBN(0x558519cc, 0x0b0b099e),
+              TOBN(0x3ea8ebf8, 0x827097ef),
+              TOBN(0x259353db, 0xd054f55d),
+              TOBN(0x84c89abc, 0x6d2ed089),
+              TOBN(0x5c548b69, 0x8e096a7c),
+              TOBN(0xd587f616, 0x994b995d),
+              TOBN(0x4d1531f6, 0xa5845601),
+              TOBN(0x792ab31e, 0x451fd9f0),
+              TOBN(0xc8b57bb2, 0x65adf6ca),
+              TOBN(0x68440fcb, 0x1cd5ad73),
+              TOBN(0xb9c860e6, 0x6144da4f),
+              TOBN(0x2ab286aa, 0x8462beb8),
+              TOBN(0xcc6b8fff, 0xef46797f),
+              TOBN(0xac820da4, 0x20c8a471),
+              TOBN(0x69ae05a1, 0x77ff7faf),
+              TOBN(0xb9163f39, 0xbfb5da77),
+              TOBN(0xbd03e590, 0x2c73ab7a),
+              TOBN(0x7e862b5e, 0xb2940d9e),
+              TOBN(0x3c663d86, 0x4b9af564),
+              TOBN(0xd8309031, 0xbde3033d),
+              TOBN(0x298231b2, 0xd42c5bc6),
+              TOBN(0x42090d2c, 0x552ad093),
+              TOBN(0xa4799d1c, 0xff854695),
+              TOBN(0x0a88b5d6, 0xd31f0d00),
+              TOBN(0xf8b40825, 0xa2f26b46),
+              TOBN(0xec29b1ed, 0xf1bd7218),
+              TOBN(0xd491c53b, 0x4b24c86e),
+              TOBN(0xd2fe588f, 0x3395ea65),
+              TOBN(0x6f3764f7, 0x4456ef15),
+              TOBN(0xdb43116d, 0xcdc34800),
+              TOBN(0xcdbcd456, 0xc1e33955),
+              TOBN(0xefdb5540, 0x74ab286b),
+              TOBN(0x948c7a51, 0xd18c5d7c),
+              TOBN(0xeb81aa37, 0x7378058e),
+              TOBN(0x41c746a1, 0x04411154),
+              TOBN(0xa10c73bc, 0xfb828ac7),
+              TOBN(0x6439be91, 0x9d972b29),
+              TOBN(0x4bf3b4b0, 0x43a2fbad),
+              TOBN(0x39e6dadf, 0x82b5e840),
+              TOBN(0x4f716408, 0x6397bd4c),
+              TOBN(0x0f7de568, 0x7f1eeccb),
+              TOBN(0x5865c5a1, 0xd2ffbfc1),
+              TOBN(0xf74211fa, 0x4ccb6451),
+              TOBN(0x66368a88, 0xc0b32558),
+              TOBN(0x5b539dc2, 0x9ad7812e),
+              TOBN(0x579483d0, 0x2f3af6f6),
+              TOBN(0x52132078, 0x99934ece),
+              TOBN(0x50b9650f, 0xdcc9e983),
+              TOBN(0xca989ec9, 0xaee42b8a),
+              TOBN(0x6a44c829, 0xd6f62f99),
+              TOBN(0x8f06a309, 0x4c2a7c0c),
+              TOBN(0x4ea2b3a0, 0x98a0cb0a),
+              TOBN(0x5c547b70, 0xbeee8364),
+              TOBN(0x461d40e1, 0x682afe11),
+              TOBN(0x9e0fc77a, 0x7b41c0a8),
+              TOBN(0x79e4aefd, 0xe20d5d36),
+              TOBN(0x2916e520, 0x32dd9f63),
+              TOBN(0xf59e52e8, 0x3f883faf),
+              TOBN(0x396f9639, 0x2b868d35),
+              TOBN(0xc902a9df, 0x4ca19881),
+              TOBN(0x0fc96822, 0xdb2401a6),
+              TOBN(0x41237587, 0x66f1c68d),
+              TOBN(0x10fc6de3, 0xfb476c0d),
+              TOBN(0xf8b6b579, 0x841f5d90),
+              TOBN(0x2ba8446c, 0xfa24f44a),
+              TOBN(0xa237b920, 0xef4a9975),
+              TOBN(0x60bb6004, 0x2330435f),
+              TOBN(0xd6f4ab5a, 0xcfb7e7b5),
+              TOBN(0xb2ac5097, 0x83435391),
+              TOBN(0xf036ee2f, 0xb0d1ea67),
+              TOBN(0xae779a6a, 0x74c56230),
+              TOBN(0x59bff8c8, 0xab838ae6),
+              TOBN(0xcd83ca99, 0x9b38e6f0),
+              TOBN(0xbb27bef5, 0xe33deed3),
+              TOBN(0xe6356f6f, 0x001892a8),
+              TOBN(0xbf3be6cc, 0x7adfbd3e),
+              TOBN(0xaecbc81c, 0x33d1ac9d),
+              TOBN(0xe4feb909, 0xe6e861dc),
+              TOBN(0x90a247a4, 0x53f5f801),
+              TOBN(0x01c50acb, 0x27346e57),
+              TOBN(0xce29242e, 0x461acc1b),
+              TOBN(0x04dd214a, 0x2f998a91),
+              TOBN(0x271ee9b1, 0xd4baf27b),
+              TOBN(0x7e3027d1, 0xe8c26722),
+              TOBN(0x21d1645c, 0x1820dce5),
+              TOBN(0x086f242c, 0x7501779c),
+              TOBN(0xf0061407, 0xfa0e8009),
+              TOBN(0xf23ce477, 0x60187129),
+              TOBN(0x05bbdedb, 0x0fde9bd0),
+              TOBN(0x682f4832, 0x25d98473),
+              TOBN(0xf207fe85, 0x5c658427),
+              TOBN(0xb6fdd7ba, 0x4166ffa1),
+              TOBN(0x0c314056, 0x9eed799d),
+              TOBN(0x0db8048f, 0x4107e28f),
+              TOBN(0x74ed3871, 0x41216840),
+              TOBN(0x74489f8f, 0x56a3c06e),
+              TOBN(0x1e1c005b, 0x12777134),
+              TOBN(0xdb332a73, 0xf37ec3c3),
+              TOBN(0xc65259bd, 0xdd59eba0),
+              TOBN(0x2291709c, 0xdb4d3257),
+              TOBN(0x9a793b25, 0xbd389390),
+              TOBN(0xf39fe34b, 0xe43756f0),
+              TOBN(0x2f76bdce, 0x9afb56c9),
+              TOBN(0x9f37867a, 0x61208b27),
+              TOBN(0xea1d4307, 0x089972c3),
+              TOBN(0x8c595330, 0x8bdf623a),
+              TOBN(0x5f5accda, 0x8441fb7d),
+              TOBN(0xfafa9418, 0x32ddfd95),
+              TOBN(0x6ad40c5a, 0x0fde9be7),
+              TOBN(0x43faba89, 0xaeca8709),
+              TOBN(0xc64a7cf1, 0x2c248a9d),
+              TOBN(0x16620252, 0x72637a76),
+              TOBN(0xaee1c791, 0x22b8d1bb),
+              TOBN(0xf0f798fd, 0x21a843b2),
+              TOBN(0x56e4ed4d, 0x8d005cb1),
+              TOBN(0x355f7780, 0x1f0d8abe),
+              TOBN(0x197b04cf, 0x34522326),
+              TOBN(0x41f9b31f, 0xfd42c13f),
+              TOBN(0x5ef7feb2, 0xb40f933d),
+              TOBN(0x27326f42, 0x5d60bad4),
+              TOBN(0x027ecdb2, 0x8c92cf89),
+              TOBN(0x04aae4d1, 0x4e3352fe),
+              TOBN(0x08414d2f, 0x73591b90),
+              TOBN(0x5ed6124e, 0xb7da7d60),
+              TOBN(0xb985b931, 0x4d13d4ec),
+              TOBN(0xa592d3ab, 0x96bf36f9),
+              TOBN(0x012dbed5, 0xbbdf51df),
+              TOBN(0xa57963c0, 0xdf6c177d),
+              TOBN(0x010ec869, 0x87ca29cf),
+              TOBN(0xba1700f6, 0xbf926dff),
+              TOBN(0x7c9fdbd1, 0xf4bf6bc2),
+              TOBN(0xdc18dc8f, 0x64da11f5),
+              TOBN(0xa6074b7a, 0xd938ae75),
+              TOBN(0x14270066, 0xe84f44a4),
+              TOBN(0x99998d38, 0xd27b954e),
+              TOBN(0xc1be8ab2, 0xb4f38e9a),
+              TOBN(0x8bb55bbf, 0x15c01016),
+              TOBN(0xf73472b4, 0x0ea2ab30),
+              TOBN(0xd365a340, 0xf73d68dd),
+              TOBN(0xc01a7168, 0x19c2e1eb),
+              TOBN(0x32f49e37, 0x34061719),
+              TOBN(0xb73c57f1, 0x01d8b4d6),
+              TOBN(0x03c8423c, 0x26b47700),
+              TOBN(0x321d0bc8, 0xa4d8826a),
+              TOBN(0x6004213c, 0x4bc0e638),
+              TOBN(0xf78c64a1, 0xc1c06681),
+              TOBN(0x16e0a16f, 0xef018e50),
+              TOBN(0x31cbdf91, 0xdb42b2b3),
+              TOBN(0xf8f4ffce, 0xe0d36f58),
+              TOBN(0xcdcc71cd, 0x4cc5e3e0),
+              TOBN(0xd55c7cfa, 0xa129e3e0),
+              TOBN(0xccdb6ba0, 0x0fb2cbf1),
+              TOBN(0x6aba0005, 0xc4bce3cb),
+              TOBN(0x501cdb30, 0xd232cfc4),
+              TOBN(0x9ddcf12e, 0xd58a3cef),
+              TOBN(0x02d2cf9c, 0x87e09149),
+              TOBN(0xdc5d7ec7, 0x2c976257),
+              TOBN(0x6447986e, 0x0b50d7dd),
+              TOBN(0x88fdbaf7, 0x807f112a),
+              TOBN(0x58c9822a, 0xb00ae9f6),
+              TOBN(0x6abfb950, 0x6d3d27e0),
+              TOBN(0xd0a74487, 0x8a429f4f),
+              TOBN(0x0649712b, 0xdb516609),
+              TOBN(0xb826ba57, 0xe769b5df),
+              TOBN(0x82335df2, 0x1fc7aaf2),
+              TOBN(0x2389f067, 0x5c93d995),
+              TOBN(0x59ac367a, 0x68677be6),
+              TOBN(0xa77985ff, 0x21d9951b),
+              TOBN(0x038956fb, 0x85011cce),
+              TOBN(0x608e48cb, 0xbb734e37),
+              TOBN(0xc08c0bf2, 0x2be5b26f),
+              TOBN(0x17bbdd3b, 0xf9b1a0d9),
+              TOBN(0xeac7d898, 0x10483319),
+              TOBN(0xc95c4baf, 0xbc1a6dea),
+              TOBN(0xfdd0e2bf, 0x172aafdb),
+              TOBN(0x40373cbc, 0x8235c41a),
+              TOBN(0x14303f21, 0xfb6f41d5),
+              TOBN(0xba063621, 0x0408f237),
+              TOBN(0xcad3b09a, 0xecd2d1ed),
+              TOBN(0x4667855a, 0x52abb6a2),
+              TOBN(0xba9157dc, 0xaa8b417b),
+              TOBN(0xfe7f3507, 0x4f013efb),
+              TOBN(0x1b112c4b, 0xaa38c4a2),
+              TOBN(0xa1406a60, 0x9ba64345),
+              TOBN(0xe53cba33, 0x6993c80b),
+              TOBN(0x45466063, 0xded40d23),
+              TOBN(0x3d5f1f4d, 0x54908e25),
+              TOBN(0x9ebefe62, 0x403c3c31),
+              TOBN(0x274ea0b5, 0x0672a624),
+              TOBN(0xff818d99, 0x451d1b71),
+              TOBN(0x80e82643, 0x8f79cf79),
+              TOBN(0xa165df13, 0x73ce37f5),
+              TOBN(0xa744ef4f, 0xfe3a21fd),
+              TOBN(0x73f1e7f5, 0xcf551396),
+              TOBN(0xc616898e, 0x868c676b),
+              TOBN(0x671c28c7, 0x8c442c36),
+              TOBN(0xcfe5e558, 0x5e0a317d),
+              TOBN(0x1242d818, 0x7051f476),
+              TOBN(0x56fad2a6, 0x14f03442),
+              TOBN(0x262068bc, 0x0a44d0f6),
+              TOBN(0xdfa2cd6e, 0xce6edf4e),
+              TOBN(0x0f43813a, 0xd15d1517),
+              TOBN(0x61214cb2, 0x377d44f5),
+              TOBN(0xd399aa29, 0xc639b35f),
+              TOBN(0x42136d71, 0x54c51c19),
+              TOBN(0x9774711b, 0x08417221),
+              TOBN(0x0a5546b3, 0x52545a57),
+              TOBN(0x80624c41, 0x1150582d),
+              TOBN(0x9ec5c418, 0xfbc555bc),
+              TOBN(0x2c87dcad, 0x771849f1),
+              TOBN(0xb0c932c5, 0x01d7bf6f),
+              TOBN(0x6aa5cd3e, 0x89116eb2),
+              TOBN(0xd378c25a, 0x51ca7bd3),
+              TOBN(0xc612a0da, 0x9e6e3e31),
+              TOBN(0x0417a54d, 0xb68ad5d0),
+              TOBN(0x00451e4a, 0x22c6edb8),
+              TOBN(0x9fbfe019, 0xb42827ce),
+              TOBN(0x2fa92505, 0xba9384a2),
+              TOBN(0x21b8596e, 0x64ad69c1),
+              TOBN(0x8f4fcc49, 0x983b35a6),
+              TOBN(0xde093760, 0x72754672),
+              TOBN(0x2f14ccc8, 0xf7bffe6d),
+              TOBN(0x27566bff, 0x5d94263d),
+              TOBN(0xb5b4e9c6, 0x2df3ec30),
+              TOBN(0x94f1d7d5, 0x3e6ea6ba),
+              TOBN(0x97b7851a, 0xaaca5e9b),
+              TOBN(0x518aa521, 0x56713b97),
+              TOBN(0x3357e8c7, 0x150a61f6),
+              TOBN(0x7842e7e2, 0xec2c2b69),
+              TOBN(0x8dffaf65, 0x6868a548),
+              TOBN(0xd963bd82, 0xe068fc81),
+              TOBN(0x64da5c8b, 0x65917733),
+              TOBN(0x927090ff, 0x7b247328),
+          },
+          {
+              TOBN(0x214bc9a7, 0xd298c241),
+              TOBN(0xe3b697ba, 0x56807cfd),
+              TOBN(0xef1c7802, 0x4564eadb),
+              TOBN(0xdde8cdcf, 0xb48149c5),
+              TOBN(0x946bf0a7, 0x5a4d2604),
+              TOBN(0x27154d7f, 0x6c1538af),
+              TOBN(0x95cc9230, 0xde5b1fcc),
+              TOBN(0xd88519e9, 0x66864f82),
+              TOBN(0xb828dd1a, 0x7cb1282c),
+              TOBN(0xa08d7626, 0xbe46973a),
+              TOBN(0x6baf8d40, 0xe708d6b2),
+              TOBN(0x72571fa1, 0x4daeb3f3),
+              TOBN(0x85b1732f, 0xf22dfd98),
+              TOBN(0x87ab01a7, 0x0087108d),
+              TOBN(0xaaaafea8, 0x5988207a),
+              TOBN(0xccc832f8, 0x69f00755),
+              TOBN(0x964d950e, 0x36ff3bf0),
+              TOBN(0x8ad20f6f, 0xf0b34638),
+              TOBN(0x4d9177b3, 0xb5d7585f),
+              TOBN(0xcf839760, 0xef3f019f),
+              TOBN(0x582fc5b3, 0x8288c545),
+              TOBN(0x2f8e4e9b, 0x13116bd1),
+              TOBN(0xf91e1b2f, 0x332120ef),
+              TOBN(0xcf568724, 0x2a17dd23),
+              TOBN(0x488f1185, 0xca8d9d1a),
+              TOBN(0xadf2c77d, 0xd987ded2),
+              TOBN(0x5f3039f0, 0x60c46124),
+              TOBN(0xe5d70b75, 0x71e095f4),
+              TOBN(0x82d58650, 0x6260e70f),
+              TOBN(0x39d75ea7, 0xf750d105),
+              TOBN(0x8cf3d0b1, 0x75bac364),
+              TOBN(0xf3a7564d, 0x21d01329),
+              TOBN(0x182f04cd, 0x2f52d2a7),
+              TOBN(0x4fde149a, 0xe2df565a),
+              TOBN(0xb80c5eec, 0xa79fb2f7),
+              TOBN(0xab491d7b, 0x22ddc897),
+              TOBN(0x99d76c18, 0xc6312c7f),
+              TOBN(0xca0d5f3d, 0x6aa41a57),
+              TOBN(0x71207325, 0xd15363a0),
+              TOBN(0xe82aa265, 0xbeb252c2),
+              TOBN(0x94ab4700, 0xec3128c2),
+              TOBN(0x6c76d862, 0x8e383f49),
+              TOBN(0xdc36b150, 0xc03024eb),
+              TOBN(0xfb439477, 0x53daac69),
+              TOBN(0xfc68764a, 0x8dc79623),
+              TOBN(0x5b86995d, 0xb440fbb2),
+              TOBN(0xd66879bf, 0xccc5ee0d),
+              TOBN(0x05228942, 0x95aa8bd3),
+              TOBN(0xb51a40a5, 0x1e6a75c1),
+              TOBN(0x24327c76, 0x0ea7d817),
+              TOBN(0x06630182, 0x07774597),
+              TOBN(0xd6fdbec3, 0x97fa7164),
+              TOBN(0x20c99dfb, 0x13c90f48),
+              TOBN(0xd6ac5273, 0x686ef263),
+              TOBN(0xc6a50bdc, 0xfef64eeb),
+              TOBN(0xcd87b281, 0x86fdfc32),
+              TOBN(0xb24aa43e, 0x3fcd3efc),
+              TOBN(0xdd26c034, 0xb8088e9a),
+              TOBN(0xa5ef4dc9, 0xbd3d46ea),
+              TOBN(0xa2f99d58, 0x8a4c6a6f),
+              TOBN(0xddabd355, 0x2f1da46c),
+              TOBN(0x72c3f8ce, 0x1afacdd1),
+              TOBN(0xd90c4eee, 0x92d40578),
+              TOBN(0xd28bb41f, 0xca623b94),
+              TOBN(0x50fc0711, 0x745edc11),
+              TOBN(0x9dd9ad7d, 0x3dc87558),
+              TOBN(0xce6931fb, 0xb49d1e64),
+              TOBN(0x6c77a0a2, 0xc98bd0f9),
+              TOBN(0x62b9a629, 0x6baf7cb1),
+              TOBN(0xcf065f91, 0xccf72d22),
+              TOBN(0x7203cce9, 0x79639071),
+              TOBN(0x09ae4885, 0xf9cb732f),
+              TOBN(0x5e7c3bec, 0xee8314f3),
+              TOBN(0x1c068aed, 0xdbea298f),
+              TOBN(0x08d381f1, 0x7c80acec),
+              TOBN(0x03b56be8, 0xe330495b),
+              TOBN(0xaeffb8f2, 0x9222882d),
+              TOBN(0x95ff38f6, 0xc4af8bf7),
+              TOBN(0x50e32d35, 0x1fc57d8c),
+              TOBN(0x6635be52, 0x17b444f0),
+              TOBN(0x04d15276, 0xa5177900),
+              TOBN(0x4e1dbb47, 0xf6858752),
+              TOBN(0x5b475622, 0xc615796c),
+              TOBN(0xa6fa0387, 0x691867bf),
+              TOBN(0xed7f5d56, 0x2844c6d0),
+              TOBN(0xc633cf9b, 0x03a2477d),
+              TOBN(0xf6be5c40, 0x2d3721d6),
+              TOBN(0xaf312eb7, 0xe9fd68e6),
+              TOBN(0x242792d2, 0xe7417ce1),
+              TOBN(0xff42bc71, 0x970ee7f5),
+              TOBN(0x1ff4dc6d, 0x5c67a41e),
+              TOBN(0x77709b7b, 0x20882a58),
+              TOBN(0x3554731d, 0xbe217f2c),
+              TOBN(0x2af2a8cd, 0x5bb72177),
+              TOBN(0x58eee769, 0x591dd059),
+              TOBN(0xbb2930c9, 0x4bba6477),
+              TOBN(0x863ee047, 0x7d930cfc),
+              TOBN(0x4c262ad1, 0x396fd1f4),
+              TOBN(0xf4765bc8, 0x039af7e1),
+              TOBN(0x2519834b, 0x5ba104f6),
+              TOBN(0x7cd61b4c, 0xd105f961),
+              TOBN(0xa5415da5, 0xd63bca54),
+              TOBN(0x778280a0, 0x88a1f17c),
+              TOBN(0xc4968949, 0x2329512c),
+              TOBN(0x174a9126, 0xcecdaa7a),
+              TOBN(0xfc8c7e0e, 0x0b13247b),
+              TOBN(0x29c110d2, 0x3484c1c4),
+              TOBN(0xf8eb8757, 0x831dfc3b),
+              TOBN(0x022f0212, 0xc0067452),
+              TOBN(0x3f6f69ee, 0x7b9b926c),
+              TOBN(0x09032da0, 0xef42daf4),
+              TOBN(0x79f00ade, 0x83f80de4),
+              TOBN(0x6210db71, 0x81236c97),
+              TOBN(0x74f7685b, 0x3ee0781f),
+              TOBN(0x4df7da7b, 0xa3e41372),
+              TOBN(0x2aae38b1, 0xb1a1553e),
+              TOBN(0x1688e222, 0xf6dd9d1b),
+              TOBN(0x57695448, 0x5b8b6487),
+              TOBN(0x478d2127, 0x4b2edeaa),
+              TOBN(0xb2818fa5, 0x1e85956a),
+              TOBN(0x1e6addda, 0xf176f2c0),
+              TOBN(0x01ca4604, 0xe2572658),
+              TOBN(0x0a404ded, 0x85342ffb),
+              TOBN(0x8cf60f96, 0x441838d6),
+              TOBN(0x9bbc691c, 0xc9071c4a),
+              TOBN(0xfd588744, 0x34442803),
+              TOBN(0x97101c85, 0x809c0d81),
+              TOBN(0xa7fb754c, 0x8c456f7f),
+              TOBN(0xc95f3c5c, 0xd51805e1),
+              TOBN(0xab4ccd39, 0xb299dca8),
+              TOBN(0x3e03d20b, 0x47eaf500),
+              TOBN(0xfa3165c1, 0xd7b80893),
+              TOBN(0x005e8b54, 0xe160e552),
+              TOBN(0xdc4972ba, 0x9019d11f),
+              TOBN(0x21a6972e, 0x0c9a4a7a),
+              TOBN(0xa52c258f, 0x37840fd7),
+              TOBN(0xf8559ff4, 0xc1e99d81),
+              TOBN(0x08e1a7d6, 0xa3c617c0),
+              TOBN(0xb398fd43, 0x248c6ba7),
+              TOBN(0x6ffedd91, 0xd1283794),
+              TOBN(0x8a6a59d2, 0xd629d208),
+              TOBN(0xa9d141d5, 0x3490530e),
+              TOBN(0x42f6fc18, 0x38505989),
+              TOBN(0x09bf250d, 0x479d94ee),
+              TOBN(0x223ad3b1, 0xb3822790),
+              TOBN(0x6c5926c0, 0x93b8971c),
+              TOBN(0x609efc7e, 0x75f7fa62),
+              TOBN(0x45d66a6d, 0x1ec2d989),
+              TOBN(0x4422d663, 0x987d2792),
+              TOBN(0x4a73caad, 0x3eb31d2b),
+              TOBN(0xf06c2ac1, 0xa32cb9e6),
+              TOBN(0xd9445c5f, 0x91aeba84),
+              TOBN(0x6af7a1d5, 0xaf71013f),
+              TOBN(0xe68216e5, 0x0bedc946),
+              TOBN(0xf4cba30b, 0xd27370a0),
+              TOBN(0x7981afbf, 0x870421cc),
+              TOBN(0x02496a67, 0x9449f0e1),
+              TOBN(0x86cfc4be, 0x0a47edae),
+              TOBN(0x3073c936, 0xb1feca22),
+              TOBN(0xf5694612, 0x03f8f8fb),
+              TOBN(0xd063b723, 0x901515ea),
+              TOBN(0x4c6c77a5, 0x749cf038),
+              TOBN(0x6361e360, 0xab9e5059),
+              TOBN(0x596cf171, 0xa76a37c0),
+              TOBN(0x800f53fa, 0x6530ae7a),
+              TOBN(0x0f5e631e, 0x0792a7a6),
+              TOBN(0x5cc29c24, 0xefdb81c9),
+              TOBN(0xa269e868, 0x3f9c40ba),
+              TOBN(0xec14f9e1, 0x2cb7191e),
+              TOBN(0x78ea1bd8, 0xe5b08ea6),
+              TOBN(0x3c65aa9b, 0x46332bb9),
+              TOBN(0x84cc22b3, 0xbf80ce25),
+              TOBN(0x0098e9e9, 0xd49d5bf1),
+              TOBN(0xcd4ec1c6, 0x19087da4),
+              TOBN(0x3c9d07c5, 0xaef6e357),
+              TOBN(0x839a0268, 0x9f8f64b8),
+              TOBN(0xc5e9eb62, 0xc6d8607f),
+              TOBN(0x759689f5, 0x6aa995e4),
+              TOBN(0x70464669, 0xbbb48317),
+              TOBN(0x921474bf, 0xe402417d),
+              TOBN(0xcabe135b, 0x2a354c8c),
+              TOBN(0xd51e52d2, 0x812fa4b5),
+              TOBN(0xec741096, 0x53311fe8),
+              TOBN(0x4f774535, 0xb864514b),
+              TOBN(0xbcadd671, 0x5bde48f8),
+              TOBN(0xc9703873, 0x2189bc7d),
+              TOBN(0x5d45299e, 0xc709ee8a),
+              TOBN(0xd1287ee2, 0x845aaff8),
+              TOBN(0x7d1f8874, 0xdb1dbf1f),
+              TOBN(0xea46588b, 0x990c88d6),
+              TOBN(0x60ba649a, 0x84368313),
+              TOBN(0xd5fdcbce, 0x60d543ae),
+              TOBN(0x90b46d43, 0x810d5ab0),
+              TOBN(0x6739d8f9, 0x04d7e5cc),
+              TOBN(0x021c1a58, 0x0d337c33),
+              TOBN(0x00a61162, 0x68e67c40),
+              TOBN(0x95ef413b, 0x379f0a1f),
+              TOBN(0xfe126605, 0xe9e2ab95),
+              TOBN(0x67578b85, 0x2f5f199c),
+              TOBN(0xf5c00329, 0x2cb84913),
+              TOBN(0xf7956430, 0x37577dd8),
+              TOBN(0x83b82af4, 0x29c5fe88),
+              TOBN(0x9c1bea26, 0xcdbdc132),
+              TOBN(0x589fa086, 0x9c04339e),
+              TOBN(0x033e9538, 0xb13799df),
+              TOBN(0x85fa8b21, 0xd295d034),
+              TOBN(0xdf17f73f, 0xbd9ddcca),
+              TOBN(0xf32bd122, 0xddb66334),
+              TOBN(0x55ef88a7, 0x858b044c),
+              TOBN(0x1f0d69c2, 0x5aa9e397),
+              TOBN(0x55fd9cc3, 0x40d85559),
+              TOBN(0xc774df72, 0x7785ddb2),
+              TOBN(0x5dcce9f6, 0xd3bd2e1c),
+              TOBN(0xeb30da20, 0xa85dfed0),
+              TOBN(0x5ed7f5bb, 0xd3ed09c4),
+              TOBN(0x7d42a35c, 0x82a9c1bd),
+              TOBN(0xcf3de995, 0x9890272d),
+              TOBN(0x75f3432a, 0x3e713a10),
+              TOBN(0x5e13479f, 0xe28227b8),
+              TOBN(0xb8561ea9, 0xfefacdc8),
+              TOBN(0xa6a297a0, 0x8332aafd),
+              TOBN(0x9b0d8bb5, 0x73809b62),
+              TOBN(0xd2fa1cfd, 0x0c63036f),
+              TOBN(0x7a16eb55, 0xbd64bda8),
+              TOBN(0x3f5cf5f6, 0x78e62ddc),
+              TOBN(0x2267c454, 0x07fd752b),
+              TOBN(0x5e361b6b, 0x5e437bbe),
+              TOBN(0x95c59501, 0x8354e075),
+              TOBN(0xec725f85, 0xf2b254d9),
+              TOBN(0x844b617d, 0x2cb52b4e),
+              TOBN(0xed8554f5, 0xcf425fb5),
+              TOBN(0xab67703e, 0x2af9f312),
+              TOBN(0x4cc34ec1, 0x3cf48283),
+              TOBN(0xb09daa25, 0x9c8a705e),
+              TOBN(0xd1e9d0d0, 0x5b7d4f84),
+              TOBN(0x4df6ef64, 0xdb38929d),
+              TOBN(0xe16b0763, 0xaa21ba46),
+              TOBN(0xc6b1d178, 0xa293f8fb),
+              TOBN(0x0ff5b602, 0xd520aabf),
+              TOBN(0x94d671bd, 0xc339397a),
+              TOBN(0x7c7d98cf, 0x4f5792fa),
+              TOBN(0x7c5e0d67, 0x11215261),
+              TOBN(0x9b19a631, 0xa7c5a6d4),
+              TOBN(0xc8511a62, 0x7a45274d),
+              TOBN(0x0c16621c, 0xa5a60d99),
+              TOBN(0xf7fbab88, 0xcf5e48cb),
+              TOBN(0xab1e6ca2, 0xf7ddee08),
+              TOBN(0x83bd08ce, 0xe7867f3c),
+              TOBN(0xf7e48e8a, 0x2ac13e27),
+              TOBN(0x4494f6df, 0x4eb1a9f5),
+              TOBN(0xedbf84eb, 0x981f0a62),
+              TOBN(0x49badc32, 0x536438f0),
+              TOBN(0x50bea541, 0x004f7571),
+              TOBN(0xbac67d10, 0xdf1c94ee),
+              TOBN(0x253d73a1, 0xb727bc31),
+              TOBN(0xb3d01cf2, 0x30686e28),
+              TOBN(0x51b77b1b, 0x55fd0b8b),
+              TOBN(0xa099d183, 0xfeec3173),
+              TOBN(0x202b1fb7, 0x670e72b7),
+              TOBN(0xadc88b33, 0xa8e1635f),
+              TOBN(0x34e8216a, 0xf989d905),
+              TOBN(0xc2e68d20, 0x29b58d01),
+              TOBN(0x11f81c92, 0x6fe55a93),
+              TOBN(0x15f1462a, 0x8f296f40),
+              TOBN(0x1915d375, 0xea3d62f2),
+              TOBN(0xa17765a3, 0x01c8977d),
+              TOBN(0x7559710a, 0xe47b26f6),
+              TOBN(0xe0bd29c8, 0x535077a5),
+              TOBN(0x615f976d, 0x08d84858),
+              TOBN(0x370dfe85, 0x69ced5c1),
+              TOBN(0xbbc7503c, 0xa734fa56),
+              TOBN(0xfbb9f1ec, 0x91ac4574),
+              TOBN(0x95d7ec53, 0x060dd7ef),
+              TOBN(0xeef2dacd, 0x6e657979),
+              TOBN(0x54511af3, 0xe2a08235),
+              TOBN(0x1e324aa4, 0x1f4aea3d),
+              TOBN(0x550e7e71, 0xe6e67671),
+              TOBN(0xbccd5190, 0xbf52faf7),
+              TOBN(0xf880d316, 0x223cc62a),
+              TOBN(0x0d402c7e, 0x2b32eb5d),
+              TOBN(0xa40bc039, 0x306a5a3b),
+              TOBN(0x4e0a41fd, 0x96783a1b),
+              TOBN(0xa1e8d39a, 0x0253cdd4),
+              TOBN(0x6480be26, 0xc7388638),
+              TOBN(0xee365e1d, 0x2285f382),
+              TOBN(0x188d8d8f, 0xec0b5c36),
+              TOBN(0x34ef1a48, 0x1f0f4d82),
+              TOBN(0x1a8f43e1, 0xa487d29a),
+              TOBN(0x8168226d, 0x77aefb3a),
+              TOBN(0xf69a751e, 0x1e72c253),
+              TOBN(0x8e04359a, 0xe9594df1),
+              TOBN(0x475ffd7d, 0xd14c0467),
+              TOBN(0xb5a2c2b1, 0x3844e95c),
+              TOBN(0x85caf647, 0xdd12ef94),
+              TOBN(0x1ecd2a9f, 0xf1063d00),
+              TOBN(0x1dd2e229, 0x23843311),
+              TOBN(0x38f0e09d, 0x73d17244),
+              TOBN(0x3ede7746, 0x8fc653f1),
+              TOBN(0xae4459f5, 0xdc20e21c),
+              TOBN(0x00db2ffa, 0x6a8599ea),
+              TOBN(0x11682c39, 0x30cfd905),
+              TOBN(0x4934d074, 0xa5c112a6),
+              TOBN(0xbdf063c5, 0x568bfe95),
+              TOBN(0x779a440a, 0x016c441a),
+              TOBN(0x0c23f218, 0x97d6fbdc),
+              TOBN(0xd3a5cd87, 0xe0776aac),
+              TOBN(0xcee37f72, 0xd712e8db),
+              TOBN(0xfb28c70d, 0x26f74e8d),
+              TOBN(0xffe0c728, 0xb61301a0),
+              TOBN(0xa6282168, 0xd3724354),
+              TOBN(0x7ff4cb00, 0x768ffedc),
+              TOBN(0xc51b3088, 0x03b02de9),
+              TOBN(0xa5a8147c, 0x3902dda5),
+              TOBN(0x35d2f706, 0xfe6973b4),
+              TOBN(0x5ac2efcf, 0xc257457e),
+              TOBN(0x933f48d4, 0x8700611b),
+              TOBN(0xc365af88, 0x4912beb2),
+              TOBN(0x7f5a4de6, 0x162edf94),
+              TOBN(0xc646ba7c, 0x0c32f34b),
+              TOBN(0x632c6af3, 0xb2091074),
+              TOBN(0x58d4f2e3, 0x753e43a9),
+              TOBN(0x70e1d217, 0x24d4e23f),
+              TOBN(0xb24bf729, 0xafede6a6),
+              TOBN(0x7f4a94d8, 0x710c8b60),
+              TOBN(0xaad90a96, 0x8d4faa6a),
+              TOBN(0xd9ed0b32, 0xb066b690),
+              TOBN(0x52fcd37b, 0x78b6dbfd),
+              TOBN(0x0b64615e, 0x8bd2b431),
+              TOBN(0x228e2048, 0xcfb9fad5),
+              TOBN(0xbeaa386d, 0x240b76bd),
+              TOBN(0x2d6681c8, 0x90dad7bc),
+              TOBN(0x3e553fc3, 0x06d38f5e),
+              TOBN(0xf27cdb9b, 0x9d5f9750),
+              TOBN(0x3e85c52a, 0xd28c5b0e),
+              TOBN(0x190795af, 0x5247c39b),
+              TOBN(0x547831eb, 0xbddd6828),
+              TOBN(0xf327a227, 0x4a82f424),
+              TOBN(0x36919c78, 0x7e47f89d),
+              TOBN(0xe4783919, 0x43c7392c),
+              TOBN(0xf101b9aa, 0x2316fefe),
+              TOBN(0xbcdc9e9c, 0x1c5009d2),
+              TOBN(0xfb55ea13, 0x9cd18345),
+              TOBN(0xf5b5e231, 0xa3ce77c7),
+              TOBN(0xde6b4527, 0xd2f2cb3d),
+              TOBN(0x10f6a333, 0x9bb26f5f),
+              TOBN(0x1e85db8e, 0x044d85b6),
+              TOBN(0xc3697a08, 0x94197e54),
+              TOBN(0x65e18cc0, 0xa7cb4ea8),
+              TOBN(0xa38c4f50, 0xa471fe6e),
+              TOBN(0xf031747a, 0x2f13439c),
+              TOBN(0x53c4a6ba, 0xc007318b),
+              TOBN(0xa8da3ee5, 0x1deccb3d),
+              TOBN(0x0555b31c, 0x558216b1),
+              TOBN(0x90c7810c, 0x2f79e6c2),
+              TOBN(0x9b669f4d, 0xfe8eed3c),
+              TOBN(0x70398ec8, 0xe0fac126),
+              TOBN(0xa96a449e, 0xf701b235),
+              TOBN(0x0ceecdb3, 0xeb94f395),
+              TOBN(0x285fc368, 0xd0cb7431),
+              TOBN(0x0d37bb52, 0x16a18c64),
+              TOBN(0x05110d38, 0xb880d2dd),
+              TOBN(0xa60f177b, 0x65930d57),
+              TOBN(0x7da34a67, 0xf36235f5),
+              TOBN(0x47f5e17c, 0x183816b9),
+              TOBN(0xc7664b57, 0xdb394af4),
+              TOBN(0x39ba215d, 0x7036f789),
+              TOBN(0x46d2ca0e, 0x2f27b472),
+              TOBN(0xc42647ee, 0xf73a84b7),
+              TOBN(0x44bc7545, 0x64488f1d),
+              TOBN(0xaa922708, 0xf4cf85d5),
+              TOBN(0x721a01d5, 0x53e4df63),
+              TOBN(0x649c0c51, 0x5db46ced),
+              TOBN(0x6bf0d64e, 0x3cffcb6c),
+              TOBN(0xe3bf93fe, 0x50f71d96),
+              TOBN(0x75044558, 0xbcc194a0),
+              TOBN(0x16ae3372, 0x6afdc554),
+              TOBN(0xbfc01adf, 0x5ca48f3f),
+              TOBN(0x64352f06, 0xe22a9b84),
+              TOBN(0xcee54da1, 0xc1099e4a),
+              TOBN(0xbbda54e8, 0xfa1b89c0),
+              TOBN(0x166a3df5, 0x6f6e55fb),
+              TOBN(0x1ca44a24, 0x20176f88),
+              TOBN(0x936afd88, 0xdfb7b5ff),
+              TOBN(0xe34c2437, 0x8611d4a0),
+              TOBN(0x7effbb75, 0x86142103),
+              TOBN(0x6704ba1b, 0x1f34fc4d),
+              TOBN(0x7c2a468f, 0x10c1b122),
+              TOBN(0x36b3a610, 0x8c6aace9),
+              TOBN(0xabfcc0a7, 0x75a0d050),
+              TOBN(0x066f9197, 0x3ce33e32),
+              TOBN(0xce905ef4, 0x29fe09be),
+              TOBN(0x89ee25ba, 0xa8376351),
+              TOBN(0x2a3ede22, 0xfd29dc76),
+              TOBN(0x7fd32ed9, 0x36f17260),
+              TOBN(0x0cadcf68, 0x284b4126),
+              TOBN(0x63422f08, 0xa7951fc8),
+              TOBN(0x562b24f4, 0x0807e199),
+              TOBN(0xfe9ce5d1, 0x22ad4490),
+              TOBN(0xc2f51b10, 0x0db2b1b4),
+              TOBN(0xeb3613ff, 0xe4541d0d),
+              TOBN(0xbd2c4a05, 0x2680813b),
+              TOBN(0x527aa55d, 0x561b08d6),
+              TOBN(0xa9f8a40e, 0xa7205558),
+              TOBN(0xe3eea56f, 0x243d0bec),
+              TOBN(0x7b853817, 0xa0ff58b3),
+              TOBN(0xb67d3f65, 0x1a69e627),
+              TOBN(0x0b76bbb9, 0xa869b5d6),
+              TOBN(0xa3afeb82, 0x546723ed),
+              TOBN(0x5f24416d, 0x3e554892),
+              TOBN(0x8413b53d, 0x430e2a45),
+              TOBN(0x99c56aee, 0x9032a2a0),
+              TOBN(0x09432bf6, 0xeec367b1),
+              TOBN(0x552850c6, 0xdaf0ecc1),
+              TOBN(0x49ebce55, 0x5bc92048),
+              TOBN(0xdfb66ba6, 0x54811307),
+              TOBN(0x1b84f797, 0x6f298597),
+              TOBN(0x79590481, 0x8d1d7a0d),
+              TOBN(0xd9fabe03, 0x3a6fa556),
+              TOBN(0xa40f9c59, 0xba9e5d35),
+              TOBN(0xcb1771c1, 0xf6247577),
+              TOBN(0x542a47ca, 0xe9a6312b),
+              TOBN(0xa34b3560, 0x552dd8c5),
+              TOBN(0xfdf94de0, 0x0d794716),
+              TOBN(0xd46124a9, 0x9c623094),
+              TOBN(0x56b7435d, 0x68afe8b4),
+              TOBN(0x27f20540, 0x6c0d8ea1),
+              TOBN(0x12b77e14, 0x73186898),
+              TOBN(0xdbc3dd46, 0x7479490f),
+              TOBN(0x951a9842, 0xc03b0c05),
+              TOBN(0x8b1b3bb3, 0x7921bc96),
+              TOBN(0xa573b346, 0x2b202e0a),
+              TOBN(0x77e4665d, 0x47254d56),
+              TOBN(0x08b70dfc, 0xd23e3984),
+              TOBN(0xab86e8bc, 0xebd14236),
+              TOBN(0xaa3e07f8, 0x57114ba7),
+              TOBN(0x5ac71689, 0xab0ef4f2),
+              TOBN(0x88fca384, 0x0139d9af),
+              TOBN(0x72733f88, 0x76644af0),
+              TOBN(0xf122f72a, 0x65d74f4a),
+              TOBN(0x13931577, 0xa5626c7a),
+              TOBN(0xd5b5d9eb, 0x70f8d5a4),
+              TOBN(0x375adde7, 0xd7bbb228),
+              TOBN(0x31e88b86, 0x0c1c0b32),
+              TOBN(0xd1f568c4, 0x173edbaa),
+              TOBN(0x1592fc83, 0x5459df02),
+              TOBN(0x2beac0fb, 0x0fcd9a7e),
+              TOBN(0xb0a6fdb8, 0x1b473b0a),
+              TOBN(0xe3224c6f, 0x0fe8fc48),
+              TOBN(0x680bd00e, 0xe87edf5b),
+              TOBN(0x30385f02, 0x20e77cf5),
+              TOBN(0xe9ab98c0, 0x4d42d1b2),
+              TOBN(0x72d191d2, 0xd3816d77),
+              TOBN(0x1564daca, 0x0917d9e5),
+              TOBN(0x394eab59, 0x1f8fed7f),
+              TOBN(0xa209aa8d, 0x7fbb3896),
+              TOBN(0x5564f3b9, 0xbe6ac98e),
+              TOBN(0xead21d05, 0xd73654ef),
+              TOBN(0x68d1a9c4, 0x13d78d74),
+              TOBN(0x61e01708, 0x6d4973a0),
+              TOBN(0x83da3500, 0x46e6d32a),
+              TOBN(0x6a3dfca4, 0x68ae0118),
+              TOBN(0xa1b9a4c9, 0xd02da069),
+              TOBN(0x0b2ff9c7, 0xebab8302),
+              TOBN(0x98af07c3, 0x944ba436),
+              TOBN(0x85997326, 0x995f0f9f),
+              TOBN(0x467fade0, 0x71b58bc6),
+              TOBN(0x47e4495a, 0xbd625a2b),
+              TOBN(0xfdd2d01d, 0x33c3b8cd),
+              TOBN(0x2c38ae28, 0xc693f9fa),
+              TOBN(0x48622329, 0x348f7999),
+              TOBN(0x97bf738e, 0x2161f583),
+              TOBN(0x15ee2fa7, 0x565e8cc9),
+              TOBN(0xa1a5c845, 0x5777e189),
+              TOBN(0xcc10bee0, 0x456f2829),
+              TOBN(0x8ad95c56, 0xda762bd5),
+              TOBN(0x152e2214, 0xe9d91da8),
+              TOBN(0x975b0e72, 0x7cb23c74),
+              TOBN(0xfd5d7670, 0xa90c66df),
+              TOBN(0xb5b5b8ad, 0x225ffc53),
+              TOBN(0xab6dff73, 0xfaded2ae),
+              TOBN(0xebd56781, 0x6f4cbe9d),
+              TOBN(0x0ed8b249, 0x6a574bd7),
+              TOBN(0x41c246fe, 0x81a881fa),
+              TOBN(0x91564805, 0xc3db9c70),
+              TOBN(0xd7c12b08, 0x5b862809),
+              TOBN(0x1facd1f1, 0x55858d7b),
+              TOBN(0x7693747c, 0xaf09e92a),
+              TOBN(0x3b69dcba, 0x189a425f),
+              TOBN(0x0be28e9f, 0x967365ef),
+              TOBN(0x57300eb2, 0xe801f5c9),
+              TOBN(0x93b8ac6a, 0xd583352f),
+              TOBN(0xa2cf1f89, 0xcd05b2b7),
+              TOBN(0x7c0c9b74, 0x4dcc40cc),
+              TOBN(0xfee38c45, 0xada523fb),
+              TOBN(0xb49a4dec, 0x1099cc4d),
+              TOBN(0x325c377f, 0x69f069c6),
+              TOBN(0xe12458ce, 0x476cc9ff),
+              TOBN(0x580e0b6c, 0xc6d4cb63),
+              TOBN(0xd561c8b7, 0x9072289b),
+              TOBN(0x0377f264, 0xa619e6da),
+              TOBN(0x26685362, 0x88e591a5),
+              TOBN(0xa453a7bd, 0x7523ca2b),
+              TOBN(0x8a9536d2, 0xc1df4533),
+              TOBN(0xc8e50f2f, 0xbe972f79),
+              TOBN(0xd433e50f, 0x6d3549cf),
+              TOBN(0x6f33696f, 0xfacd665e),
+              TOBN(0x695bfdac, 0xce11fcb4),
+              TOBN(0x810ee252, 0xaf7c9860),
+              TOBN(0x65450fe1, 0x7159bb2c),
+              TOBN(0xf7dfbebe, 0x758b357b),
+              TOBN(0x2b057e74, 0xd69fea72),
+              TOBN(0xd485717a, 0x92731745),
+          },
+          {
+              TOBN(0x896c42e8, 0xee36860c),
+              TOBN(0xdaf04dfd, 0x4113c22d),
+              TOBN(0x1adbb7b7, 0x44104213),
+              TOBN(0xe5fd5fa1, 0x1fd394ea),
+              TOBN(0x68235d94, 0x1a4e0551),
+              TOBN(0x6772cfbe, 0x18d10151),
+              TOBN(0x276071e3, 0x09984523),
+              TOBN(0xe4e879de, 0x5a56ba98),
+              TOBN(0xaaafafb0, 0x285b9491),
+              TOBN(0x01a0be88, 0x1e4c705e),
+              TOBN(0xff1d4f5d, 0x2ad9caab),
+              TOBN(0x6e349a4a, 0xc37a233f),
+              TOBN(0xcf1c1246, 0x4a1c6a16),
+              TOBN(0xd99e6b66, 0x29383260),
+              TOBN(0xea3d4366, 0x5f6d5471),
+              TOBN(0x36974d04, 0xff8cc89b),
+              TOBN(0xc26c49a1, 0xcfe89d80),
+              TOBN(0xb42c026d, 0xda9c8371),
+              TOBN(0xca6c013a, 0xdad066d2),
+              TOBN(0xfb8f7228, 0x56a4f3ee),
+              TOBN(0x08b579ec, 0xd850935b),
+              TOBN(0x34c1a74c, 0xd631e1b3),
+              TOBN(0xcb5fe596, 0xac198534),
+              TOBN(0x39ff21f6, 0xe1f24f25),
+              TOBN(0x27f29e14, 0x8f929057),
+              TOBN(0x7a64ae06, 0xc0c853df),
+              TOBN(0x256cd183, 0x58e9c5ce),
+              TOBN(0x9d9cce82, 0xded092a5),
+              TOBN(0xcc6e5979, 0x6e93b7c7),
+              TOBN(0xe1e47092, 0x31bb9e27),
+              TOBN(0xb70b3083, 0xaa9e29a0),
+              TOBN(0xbf181a75, 0x3785e644),
+              TOBN(0xf53f2c65, 0x8ead09f7),
+              TOBN(0x1335e1d5, 0x9780d14d),
+              TOBN(0x69cc20e0, 0xcd1b66bc),
+              TOBN(0x9b670a37, 0xbbe0bfc8),
+              TOBN(0xce53dc81, 0x28efbeed),
+              TOBN(0x0c74e77c, 0x8326a6e5),
+              TOBN(0x3604e0d2, 0xb88e9a63),
+              TOBN(0xbab38fca, 0x13dc2248),
+              TOBN(0x8ed6e8c8, 0x5c0a3f1e),
+              TOBN(0xbcad2492, 0x7c87c37f),
+              TOBN(0xfdfb62bb, 0x9ee3b78d),
+              TOBN(0xeba8e477, 0xcbceba46),
+              TOBN(0x37d38cb0, 0xeeaede4b),
+              TOBN(0x0bc498e8, 0x7976deb6),
+              TOBN(0xb2944c04, 0x6b6147fb),
+              TOBN(0x8b123f35, 0xf71f9609),
+              TOBN(0xa155dcc7, 0xde79dc24),
+              TOBN(0xf1168a32, 0x558f69cd),
+              TOBN(0xbac21595, 0x0d1850df),
+              TOBN(0x15c8295b, 0xb204c848),
+              TOBN(0xf661aa36, 0x7d8184ff),
+              TOBN(0xc396228e, 0x30447bdb),
+              TOBN(0x11cd5143, 0xbde4a59e),
+              TOBN(0xe3a26e3b, 0x6beab5e6),
+              TOBN(0xd3b3a13f, 0x1402b9d0),
+              TOBN(0x573441c3, 0x2c7bc863),
+              TOBN(0x4b301ec4, 0x578c3e6e),
+              TOBN(0xc26fc9c4, 0x0adaf57e),
+              TOBN(0x96e71bfd, 0x7493cea3),
+              TOBN(0xd05d4b3f, 0x1af81456),
+              TOBN(0xdaca2a8a, 0x6a8c608f),
+              TOBN(0x53ef07f6, 0x0725b276),
+              TOBN(0x07a5fbd2, 0x7824fc56),
+              TOBN(0x34675218, 0x13289077),
+              TOBN(0x5bf69fd5, 0xe0c48349),
+              TOBN(0xa613ddd3, 0xb6aa7875),
+              TOBN(0x7f78c19c, 0x5450d866),
+              TOBN(0x46f4409c, 0x8f84a481),
+              TOBN(0x9f1d1928, 0x90fce239),
+              TOBN(0x016c4168, 0xb2ce44b9),
+              TOBN(0xbae023f0, 0xc7435978),
+              TOBN(0xb152c888, 0x20e30e19),
+              TOBN(0x9c241645, 0xe3fa6faf),
+              TOBN(0x735d95c1, 0x84823e60),
+              TOBN(0x03197573, 0x03955317),
+              TOBN(0x0b4b02a9, 0xf03b4995),
+              TOBN(0x076bf559, 0x70274600),
+              TOBN(0x32c5cc53, 0xaaf57508),
+              TOBN(0xe8af6d1f, 0x60624129),
+              TOBN(0xb7bc5d64, 0x9a5e2b5e),
+              TOBN(0x3814b048, 0x5f082d72),
+              TOBN(0x76f267f2, 0xce19677a),
+              TOBN(0x626c630f, 0xb36eed93),
+              TOBN(0x55230cd7, 0x3bf56803),
+              TOBN(0x78837949, 0xce2736a0),
+              TOBN(0x0d792d60, 0xaa6c55f1),
+              TOBN(0x0318dbfd, 0xd5c7c5d2),
+              TOBN(0xb38f8da7, 0x072b342d),
+              TOBN(0x3569bddc, 0x7b8de38a),
+              TOBN(0xf25b5887, 0xa1c94842),
+              TOBN(0xb2d5b284, 0x2946ad60),
+              TOBN(0x854f29ad, 0xe9d1707e),
+              TOBN(0xaa5159dc, 0x2c6a4509),
+              TOBN(0x899f94c0, 0x57189837),
+              TOBN(0xcf6adc51, 0xf4a55b03),
+              TOBN(0x261762de, 0x35e3b2d5),
+              TOBN(0x4cc43012, 0x04827b51),
+              TOBN(0xcd22a113, 0xc6021442),
+              TOBN(0xce2fd61a, 0x247c9569),
+              TOBN(0x59a50973, 0xd152beca),
+              TOBN(0x6c835a11, 0x63a716d4),
+              TOBN(0xc26455ed, 0x187dedcf),
+              TOBN(0x27f536e0, 0x49ce89e7),
+              TOBN(0x18908539, 0xcc890cb5),
+              TOBN(0x308909ab, 0xd83c2aa1),
+              TOBN(0xecd3142b, 0x1ab73bd3),
+              TOBN(0x6a85bf59, 0xb3f5ab84),
+              TOBN(0x3c320a68, 0xf2bea4c6),
+              TOBN(0xad8dc538, 0x6da4541f),
+              TOBN(0xeaf34eb0, 0xb7c41186),
+              TOBN(0x1c780129, 0x977c97c4),
+              TOBN(0x5ff9beeb, 0xc57eb9fa),
+              TOBN(0xa24d0524, 0xc822c478),
+              TOBN(0xfd8eec2a, 0x461cd415),
+              TOBN(0xfbde194e, 0xf027458c),
+              TOBN(0xb4ff5319, 0x1d1be115),
+              TOBN(0x63f874d9, 0x4866d6f4),
+              TOBN(0x35c75015, 0xb21ad0c9),
+              TOBN(0xa6b5c9d6, 0x46ac49d2),
+              TOBN(0x42c77c0b, 0x83137aa9),
+              TOBN(0x24d000fc, 0x68225a38),
+              TOBN(0x0f63cfc8, 0x2fe1e907),
+              TOBN(0x22d1b01b, 0xc6441f95),
+              TOBN(0x7d38f719, 0xec8e448f),
+              TOBN(0x9b33fa5f, 0x787fb1ba),
+              TOBN(0x94dcfda1, 0x190158df),
+              TOBN(0xc47cb339, 0x5f6d4a09),
+              TOBN(0x6b4f355c, 0xee52b826),
+              TOBN(0x3d100f5d, 0xf51b930a),
+              TOBN(0xf4512fac, 0x9f668f69),
+              TOBN(0x546781d5, 0x206c4c74),
+              TOBN(0xd021d4d4, 0xcb4d2e48),
+              TOBN(0x494a54c2, 0xca085c2d),
+              TOBN(0xf1dbaca4, 0x520850a8),
+              TOBN(0x63c79326, 0x490a1aca),
+              TOBN(0xcb64dd9c, 0x41526b02),
+              TOBN(0xbb772591, 0xa2979258),
+              TOBN(0x3f582970, 0x48d97846),
+              TOBN(0xd66b70d1, 0x7c213ba7),
+              TOBN(0xc28febb5, 0xe8a0ced4),
+              TOBN(0x6b911831, 0xc10338c1),
+              TOBN(0x0d54e389, 0xbf0126f3),
+              TOBN(0x7048d460, 0x4af206ee),
+              TOBN(0x786c88f6, 0x77e97cb9),
+              TOBN(0xd4375ae1, 0xac64802e),
+              TOBN(0x469bcfe1, 0xd53ec11c),
+              TOBN(0xfc9b340d, 0x47062230),
+              TOBN(0xe743bb57, 0xc5b4a3ac),
+              TOBN(0xfe00b4aa, 0x59ef45ac),
+              TOBN(0x29a4ef23, 0x59edf188),
+              TOBN(0x40242efe, 0xb483689b),
+              TOBN(0x2575d3f6, 0x513ac262),
+              TOBN(0xf30037c8, 0x0ca6db72),
+              TOBN(0xc9fcce82, 0x98864be2),
+              TOBN(0x84a112ff, 0x0149362d),
+              TOBN(0x95e57582, 0x1c4ae971),
+              TOBN(0x1fa4b1a8, 0x945cf86c),
+              TOBN(0x4525a734, 0x0b024a2f),
+              TOBN(0xe76c8b62, 0x8f338360),
+              TOBN(0x483ff593, 0x28edf32b),
+              TOBN(0x67e8e90a, 0x298b1aec),
+              TOBN(0x9caab338, 0x736d9a21),
+              TOBN(0x5c09d2fd, 0x66892709),
+              TOBN(0x2496b4dc, 0xb55a1d41),
+              TOBN(0x93f5fb1a, 0xe24a4394),
+              TOBN(0x08c75049, 0x6fa8f6c1),
+              TOBN(0xcaead1c2, 0xc905d85f),
+              TOBN(0xe9d7f790, 0x0733ae57),
+              TOBN(0x24c9a65c, 0xf07cdd94),
+              TOBN(0x7389359c, 0xa4b55931),
+              TOBN(0xf58709b7, 0x367e45f7),
+              TOBN(0x1f203067, 0xcb7e7adc),
+              TOBN(0x82444bff, 0xc7b72818),
+              TOBN(0x07303b35, 0xbaac8033),
+              TOBN(0x1e1ee4e4, 0xd13b7ea1),
+              TOBN(0xe6489b24, 0xe0e74180),
+              TOBN(0xa5f2c610, 0x7e70ef70),
+              TOBN(0xa1655412, 0xbdd10894),
+              TOBN(0x555ebefb, 0x7af4194e),
+              TOBN(0x533c1c3c, 0x8e89bd9c),
+              TOBN(0x735b9b57, 0x89895856),
+              TOBN(0x15fb3cd2, 0x567f5c15),
+              TOBN(0x057fed45, 0x526f09fd),
+              TOBN(0xe8a4f10c, 0x8128240a),
+              TOBN(0x9332efc4, 0xff2bfd8d),
+              TOBN(0x214e77a0, 0xbd35aa31),
+              TOBN(0x32896d73, 0x14faa40e),
+              TOBN(0x767867ec, 0x01e5f186),
+              TOBN(0xc9adf8f1, 0x17a1813e),
+              TOBN(0xcb6cda78, 0x54741795),
+              TOBN(0xb7521b6d, 0x349d51aa),
+              TOBN(0xf56b5a9e, 0xe3c7b8e9),
+              TOBN(0xc6f1e5c9, 0x32a096df),
+              TOBN(0x083667c4, 0xa3635024),
+              TOBN(0x365ea135, 0x18087f2f),
+              TOBN(0xf1b8eaac, 0xd136e45d),
+              TOBN(0xc8a0e484, 0x73aec989),
+              TOBN(0xd75a324b, 0x142c9259),
+              TOBN(0xb7b4d001, 0x01dae185),
+              TOBN(0x45434e0b, 0x9b7a94bc),
+              TOBN(0xf54339af, 0xfbd8cb0b),
+              TOBN(0xdcc4569e, 0xe98ef49e),
+              TOBN(0x7789318a, 0x09a51299),
+              TOBN(0x81b4d206, 0xb2b025d8),
+              TOBN(0xf64aa418, 0xfae85792),
+              TOBN(0x3e50258f, 0xacd7baf7),
+              TOBN(0xdce84cdb, 0x2996864b),
+              TOBN(0xa2e67089, 0x1f485fa4),
+              TOBN(0xb28b2bb6, 0x534c6a5a),
+              TOBN(0x31a7ec6b, 0xc94b9d39),
+              TOBN(0x1d217766, 0xd6bc20da),
+              TOBN(0x4acdb5ec, 0x86761190),
+              TOBN(0x68726328, 0x73701063),
+              TOBN(0x4d24ee7c, 0x2128c29b),
+              TOBN(0xc072ebd3, 0xa19fd868),
+              TOBN(0x612e481c, 0xdb8ddd3b),
+              TOBN(0xb4e1d754, 0x1a64d852),
+              TOBN(0x00ef95ac, 0xc4c6c4ab),
+              TOBN(0x1536d2ed, 0xaa0a6c46),
+              TOBN(0x61294086, 0x43774790),
+              TOBN(0x54af25e8, 0x343fda10),
+              TOBN(0x9ff9d98d, 0xfd25d6f2),
+              TOBN(0x0746af7c, 0x468b8835),
+              TOBN(0x977a31cb, 0x730ecea7),
+              TOBN(0xa5096b80, 0xc2cf4a81),
+              TOBN(0xaa986833, 0x6458c37a),
+              TOBN(0x6af29bf3, 0xa6bd9d34),
+              TOBN(0x6a62fe9b, 0x33c5d854),
+              TOBN(0x50e6c304, 0xb7133b5e),
+              TOBN(0x04b60159, 0x7d6e6848),
+              TOBN(0x4cd296df, 0x5579bea4),
+              TOBN(0x10e35ac8, 0x5ceedaf1),
+              TOBN(0x04c4c5fd, 0xe3bcc5b1),
+              TOBN(0x95f9ee8a, 0x89412cf9),
+              TOBN(0x2c9459ee, 0x82b6eb0f),
+              TOBN(0x2e845765, 0x95c2aadd),
+              TOBN(0x774a84ae, 0xd327fcfe),
+              TOBN(0xd8c93722, 0x0368d476),
+              TOBN(0x0dbd5748, 0xf83e8a3b),
+              TOBN(0xa579aa96, 0x8d2495f3),
+              TOBN(0x535996a0, 0xae496e9b),
+              TOBN(0x07afbfe9, 0xb7f9bcc2),
+              TOBN(0x3ac1dc6d, 0x5b7bd293),
+              TOBN(0x3b592cff, 0x7022323d),
+              TOBN(0xba0deb98, 0x9c0a3e76),
+              TOBN(0x18e78e9f, 0x4b197acb),
+              TOBN(0x211cde10, 0x296c36ef),
+              TOBN(0x7ee89672, 0x82c4da77),
+              TOBN(0xb617d270, 0xa57836da),
+              TOBN(0xf0cd9c31, 0x9cb7560b),
+              TOBN(0x01fdcbf7, 0xe455fe90),
+              TOBN(0x3fb53cbb, 0x7e7334f3),
+              TOBN(0x781e2ea4, 0x4e7de4ec),
+              TOBN(0x8adab3ad, 0x0b384fd0),
+              TOBN(0x129eee2f, 0x53d64829),
+              TOBN(0x7a471e17, 0xa261492b),
+              TOBN(0xe4f9adb9, 0xe4cb4a2c),
+              TOBN(0x3d359f6f, 0x97ba2c2d),
+              TOBN(0x346c6786, 0x0aacd697),
+              TOBN(0x92b444c3, 0x75c2f8a8),
+              TOBN(0xc79fa117, 0xd85df44e),
+              TOBN(0x56782372, 0x398ddf31),
+              TOBN(0x60e690f2, 0xbbbab3b8),
+              TOBN(0x4851f8ae, 0x8b04816b),
+              TOBN(0xc72046ab, 0x9c92e4d2),
+              TOBN(0x518c74a1, 0x7cf3136b),
+              TOBN(0xff4eb50a, 0xf9877d4c),
+              TOBN(0x14578d90, 0xa919cabb),
+              TOBN(0x8218f8c4, 0xac5eb2b6),
+              TOBN(0xa3ccc547, 0x542016e4),
+              TOBN(0x025bf48e, 0x327f8349),
+              TOBN(0xf3e97346, 0xf43cb641),
+              TOBN(0xdc2bafdf, 0x500f1085),
+              TOBN(0x57167876, 0x2f063055),
+              TOBN(0x5bd914b9, 0x411925a6),
+              TOBN(0x7c078d48, 0xa1123de5),
+              TOBN(0xee6bf835, 0x182b165d),
+              TOBN(0xb11b5e5b, 0xba519727),
+              TOBN(0xe33ea76c, 0x1eea7b85),
+              TOBN(0x2352b461, 0x92d4f85e),
+              TOBN(0xf101d334, 0xafe115bb),
+              TOBN(0xfabc1294, 0x889175a3),
+              TOBN(0x7f6bcdc0, 0x5233f925),
+              TOBN(0xe0a802db, 0xe77fec55),
+              TOBN(0xbdb47b75, 0x8069b659),
+              TOBN(0x1c5e12de, 0xf98fbd74),
+              TOBN(0x869c58c6, 0x4b8457ee),
+              TOBN(0xa5360f69, 0x4f7ea9f7),
+              TOBN(0xe576c09f, 0xf460b38f),
+              TOBN(0x6b70d548, 0x22b7fb36),
+              TOBN(0x3fd237f1, 0x3bfae315),
+              TOBN(0x33797852, 0xcbdff369),
+              TOBN(0x97df25f5, 0x25b516f9),
+              TOBN(0x46f388f2, 0xba38ad2d),
+              TOBN(0x656c4658, 0x89d8ddbb),
+              TOBN(0x8830b26e, 0x70f38ee8),
+              TOBN(0x4320fd5c, 0xde1212b0),
+              TOBN(0xc34f30cf, 0xe4a2edb2),
+              TOBN(0xabb131a3, 0x56ab64b8),
+              TOBN(0x7f77f0cc, 0xd99c5d26),
+              TOBN(0x66856a37, 0xbf981d94),
+              TOBN(0x19e76d09, 0x738bd76e),
+              TOBN(0xe76c8ac3, 0x96238f39),
+              TOBN(0xc0a482be, 0xa830b366),
+              TOBN(0xb7b8eaff, 0x0b4eb499),
+              TOBN(0x8ecd83bc, 0x4bfb4865),
+              TOBN(0x971b2cb7, 0xa2f3776f),
+              TOBN(0xb42176a4, 0xf4b88adf),
+              TOBN(0xb9617df5, 0xbe1fa446),
+              TOBN(0x8b32d508, 0xcd031bd2),
+              TOBN(0x1c6bd47d, 0x53b618c0),
+              TOBN(0xc424f46c, 0x6a227923),
+              TOBN(0x7303ffde, 0xdd92d964),
+              TOBN(0xe9712878, 0x71b5abf2),
+              TOBN(0x8f48a632, 0xf815561d),
+              TOBN(0x85f48ff5, 0xd3c055d1),
+              TOBN(0x222a1427, 0x7525684f),
+              TOBN(0xd0d841a0, 0x67360cc3),
+              TOBN(0x4245a926, 0x0b9267c6),
+              TOBN(0xc78913f1, 0xcf07f863),
+              TOBN(0xaa844c8e, 0x4d0d9e24),
+              TOBN(0xa42ad522, 0x3d5f9017),
+              TOBN(0xbd371749, 0xa2c989d5),
+              TOBN(0x928292df, 0xe1f5e78e),
+              TOBN(0x493b383e, 0x0a1ea6da),
+              TOBN(0x5136fd8d, 0x13aee529),
+              TOBN(0x860c44b1, 0xf2c34a99),
+              TOBN(0x3b00aca4, 0xbf5855ac),
+              TOBN(0xabf6aaa0, 0xfaaf37be),
+              TOBN(0x65f43682, 0x2a53ec08),
+              TOBN(0x1d9a5801, 0xa11b12e1),
+              TOBN(0x78a7ab2c, 0xe20ed475),
+              TOBN(0x0de1067e, 0x9a41e0d5),
+              TOBN(0x30473f5f, 0x305023ea),
+              TOBN(0xdd3ae09d, 0x169c7d97),
+              TOBN(0x5cd5baa4, 0xcfaef9cd),
+              TOBN(0x5cd7440b, 0x65a44803),
+              TOBN(0xdc13966a, 0x47f364de),
+              TOBN(0x077b2be8, 0x2b8357c1),
+              TOBN(0x0cb1b4c5, 0xe9d57c2a),
+              TOBN(0x7a4ceb32, 0x05ff363e),
+              TOBN(0xf310fa4d, 0xca35a9ef),
+              TOBN(0xdbb7b352, 0xf97f68c6),
+              TOBN(0x0c773b50, 0x0b02cf58),
+              TOBN(0xea2e4821, 0x3c1f96d9),
+              TOBN(0xffb357b0, 0xeee01815),
+              TOBN(0xb9c924cd, 0xe0f28039),
+              TOBN(0x0b36c95a, 0x46a3fbe4),
+              TOBN(0x1faaaea4, 0x5e46db6c),
+              TOBN(0xcae575c3, 0x1928aaff),
+              TOBN(0x7f671302, 0xa70dab86),
+              TOBN(0xfcbd12a9, 0x71c58cfc),
+              TOBN(0xcbef9acf, 0xbee0cb92),
+              TOBN(0x573da0b9, 0xf8c1b583),
+              TOBN(0x4752fcfe, 0x0d41d550),
+              TOBN(0xe7eec0e3, 0x2155cffe),
+              TOBN(0x0fc39fcb, 0x545ae248),
+              TOBN(0x522cb8d1, 0x8065f44e),
+              TOBN(0x263c962a, 0x70cbb96c),
+              TOBN(0xe034362a, 0xbcd124a9),
+              TOBN(0xf120db28, 0x3c2ae58d),
+              TOBN(0xb9a38d49, 0xfef6d507),
+              TOBN(0xb1fd2a82, 0x1ff140fd),
+              TOBN(0xbd162f30, 0x20aee7e0),
+              TOBN(0x4e17a5d4, 0xcb251949),
+              TOBN(0x2aebcb83, 0x4f7e1c3d),
+              TOBN(0x608eb25f, 0x937b0527),
+              TOBN(0xf42e1e47, 0xeb7d9997),
+              TOBN(0xeba699c4, 0xb8a53a29),
+              TOBN(0x1f921c71, 0xe091b536),
+              TOBN(0xcce29e7b, 0x5b26bbd5),
+              TOBN(0x7a8ef5ed, 0x3b61a680),
+              TOBN(0xe5ef8043, 0xba1f1c7e),
+              TOBN(0x16ea8217, 0x18158dda),
+              TOBN(0x01778a2b, 0x599ff0f9),
+              TOBN(0x68a923d7, 0x8104fc6b),
+              TOBN(0x5bfa44df, 0xda694ff3),
+              TOBN(0x4f7199db, 0xf7667f12),
+              TOBN(0xc06d8ff6, 0xe46f2a79),
+              TOBN(0x08b5dead, 0xe9f8131d),
+              TOBN(0x02519a59, 0xabb4ce7c),
+              TOBN(0xc4f710bc, 0xb42aec3e),
+              TOBN(0x3d77b057, 0x78bde41a),
+              TOBN(0x6474bf80, 0xb4186b5a),
+              TOBN(0x048b3f67, 0x88c65741),
+              TOBN(0xc64519de, 0x03c7c154),
+              TOBN(0xdf073846, 0x0edfcc4f),
+              TOBN(0x319aa737, 0x48f1aa6b),
+              TOBN(0x8b9f8a02, 0xca909f77),
+              TOBN(0x90258139, 0x7580bfef),
+              TOBN(0xd8bfd3ca, 0xc0c22719),
+              TOBN(0xc60209e4, 0xc9ca151e),
+              TOBN(0x7a744ab5, 0xd9a1a69c),
+              TOBN(0x6de5048b, 0x14937f8f),
+              TOBN(0x171938d8, 0xe115ac04),
+              TOBN(0x7df70940, 0x1c6b16d2),
+              TOBN(0xa6aeb663, 0x7f8e94e7),
+              TOBN(0xc130388e, 0x2a2cf094),
+              TOBN(0x1850be84, 0x77f54e6e),
+              TOBN(0x9f258a72, 0x65d60fe5),
+              TOBN(0xff7ff0c0, 0x6c9146d6),
+              TOBN(0x039aaf90, 0xe63a830b),
+              TOBN(0x38f27a73, 0x9460342f),
+              TOBN(0x4703148c, 0x3f795f8a),
+              TOBN(0x1bb5467b, 0x9681a97e),
+              TOBN(0x00931ba5, 0xecaeb594),
+              TOBN(0xcdb6719d, 0x786f337c),
+              TOBN(0xd9c01cd2, 0xe704397d),
+              TOBN(0x0f4a3f20, 0x555c2fef),
+              TOBN(0x00452509, 0x7c0af223),
+              TOBN(0x54a58047, 0x84db8e76),
+              TOBN(0x3bacf1aa, 0x93c8aa06),
+              TOBN(0x11ca957c, 0xf7919422),
+              TOBN(0x50641053, 0x78cdaa40),
+              TOBN(0x7a303874, 0x9f7144ae),
+              TOBN(0x170c963f, 0x43d4acfd),
+              TOBN(0x5e148149, 0x58ddd3ef),
+              TOBN(0xa7bde582, 0x9e72dba8),
+              TOBN(0x0769da8b, 0x6fa68750),
+              TOBN(0xfa64e532, 0x572e0249),
+              TOBN(0xfcaadf9d, 0x2619ad31),
+              TOBN(0x87882daa, 0xa7b349cd),
+              TOBN(0x9f6eb731, 0x6c67a775),
+              TOBN(0xcb10471a, 0xefc5d0b1),
+              TOBN(0xb433750c, 0xe1b806b2),
+              TOBN(0x19c5714d, 0x57b1ae7e),
+              TOBN(0xc0dc8b7b, 0xed03fd3f),
+              TOBN(0xdd03344f, 0x31bc194e),
+              TOBN(0xa66c52a7, 0x8c6320b5),
+              TOBN(0x8bc82ce3, 0xd0b6fd93),
+              TOBN(0xf8e13501, 0xb35f1341),
+              TOBN(0xe53156dd, 0x25a43e42),
+              TOBN(0xd3adf27e, 0x4daeb85c),
+              TOBN(0xb81d8379, 0xbbeddeb5),
+              TOBN(0x1b0b546e, 0x2e435867),
+              TOBN(0x9020eb94, 0xeba5dd60),
+              TOBN(0x37d91161, 0x8210cb9d),
+              TOBN(0x4c596b31, 0x5c91f1cf),
+              TOBN(0xb228a90f, 0x0e0b040d),
+              TOBN(0xbaf02d82, 0x45ff897f),
+              TOBN(0x2aac79e6, 0x00fa6122),
+              TOBN(0x24828817, 0x8e36f557),
+              TOBN(0xb9521d31, 0x113ec356),
+              TOBN(0x9e48861e, 0x15eff1f8),
+              TOBN(0x2aa1d412, 0xe0d41715),
+              TOBN(0x71f86203, 0x53f131b8),
+              TOBN(0xf60da8da, 0x3fd19408),
+              TOBN(0x4aa716dc, 0x278d9d99),
+              TOBN(0x394531f7, 0xa8c51c90),
+              TOBN(0xb560b0e8, 0xf59db51c),
+              TOBN(0xa28fc992, 0xfa34bdad),
+              TOBN(0xf024fa14, 0x9cd4f8bd),
+              TOBN(0x5cf530f7, 0x23a9d0d3),
+              TOBN(0x615ca193, 0xe28c9b56),
+              TOBN(0x6d2a483d, 0x6f73c51e),
+              TOBN(0xa4cb2412, 0xea0dc2dd),
+              TOBN(0x50663c41, 0x1eb917ff),
+              TOBN(0x3d3a74cf, 0xeade299e),
+              TOBN(0x29b3990f, 0x4a7a9202),
+              TOBN(0xa9bccf59, 0xa7b15c3d),
+              TOBN(0x66a3ccdc, 0xa5df9208),
+              TOBN(0x48027c14, 0x43f2f929),
+              TOBN(0xd385377c, 0x40b557f0),
+              TOBN(0xe001c366, 0xcd684660),
+              TOBN(0x1b18ed6b, 0xe2183a27),
+              TOBN(0x879738d8, 0x63210329),
+              TOBN(0xa687c74b, 0xbda94882),
+              TOBN(0xd1bbcc48, 0xa684b299),
+              TOBN(0xaf6f1112, 0x863b3724),
+              TOBN(0x6943d1b4, 0x2c8ce9f8),
+              TOBN(0xe044a3bb, 0x098cafb4),
+              TOBN(0x27ed2310, 0x60d48caf),
+              TOBN(0x542b5675, 0x3a31b84d),
+              TOBN(0xcbf3dd50, 0xfcddbed7),
+              TOBN(0x25031f16, 0x41b1d830),
+              TOBN(0xa7ec851d, 0xcb0c1e27),
+              TOBN(0xac1c8fe0, 0xb5ae75db),
+              TOBN(0xb24c7557, 0x08c52120),
+              TOBN(0x57f811dc, 0x1d4636c3),
+              TOBN(0xf8436526, 0x681a9939),
+              TOBN(0x1f6bc6d9, 0x9c81adb3),
+              TOBN(0x840f8ac3, 0x5b7d80d4),
+              TOBN(0x731a9811, 0xf4387f1a),
+              TOBN(0x7c501cd3, 0xb5156880),
+              TOBN(0xa5ca4a07, 0xdfe68867),
+              TOBN(0xf123d8f0, 0x5fcea120),
+              TOBN(0x1fbb0e71, 0xd607039e),
+              TOBN(0x2b70e215, 0xcd3a4546),
+              TOBN(0x32d2f01d, 0x53324091),
+              TOBN(0xb796ff08, 0x180ab19b),
+              TOBN(0x32d87a86, 0x3c57c4aa),
+              TOBN(0x2aed9caf, 0xb7c49a27),
+              TOBN(0x9fb35eac, 0x31630d98),
+              TOBN(0x338e8cdf, 0x5c3e20a3),
+              TOBN(0x80f16182, 0x66cde8db),
+              TOBN(0x4e159980, 0x2d72fd36),
+              TOBN(0xd7b8f13b, 0x9b6e5072),
+              TOBN(0xf5213907, 0x3b7b5dc1),
+              TOBN(0x4d431f1d, 0x8ce4396e),
+              TOBN(0x37a1a680, 0xa7ed2142),
+              TOBN(0xbf375696, 0xd01aaf6b),
+              TOBN(0xaa1c0c54, 0xe63aab66),
+              TOBN(0x3014368b, 0x4ed80940),
+              TOBN(0x67e6d056, 0x7a6fcedd),
+              TOBN(0x7c208c49, 0xca97579f),
+              TOBN(0xfe3d7a81, 0xa23597f6),
+              TOBN(0x5e203202, 0x7e096ae2),
+              TOBN(0xb1f3e1e7, 0x24b39366),
+              TOBN(0x26da26f3, 0x2fdcdffc),
+              TOBN(0x79422f1d, 0x6097be83),
+          },
+          {
+              TOBN(0x263a2cfb, 0x9db3b381),
+              TOBN(0x9c3a2dee, 0xd4df0a4b),
+              TOBN(0x728d06e9, 0x7d04e61f),
+              TOBN(0x8b1adfbc, 0x42449325),
+              TOBN(0x6ec1d939, 0x7e053a1b),
+              TOBN(0xee2be5c7, 0x66daf707),
+              TOBN(0x80ba1e14, 0x810ac7ab),
+              TOBN(0xdd2ae778, 0xf530f174),
+              TOBN(0x0435d97a, 0x205b9d8b),
+              TOBN(0x6eb8f064, 0x056756d4),
+              TOBN(0xd5e88a8b, 0xb6f8210e),
+              TOBN(0x070ef12d, 0xec9fd9ea),
+              TOBN(0x4d849505, 0x3bcc876a),
+              TOBN(0x12a75338, 0xa7404ce3),
+              TOBN(0xd22b49e1, 0xb8a1db5e),
+              TOBN(0xec1f2051, 0x14bfa5ad),
+              TOBN(0xadbaeb79, 0xb6828f36),
+              TOBN(0x9d7a0258, 0x01bd5b9e),
+              TOBN(0xeda01e0d, 0x1e844b0c),
+              TOBN(0x4b625175, 0x887edfc9),
+              TOBN(0x14109fdd, 0x9669b621),
+              TOBN(0x88a2ca56, 0xf6f87b98),
+              TOBN(0xfe2eb788, 0x170df6bc),
+              TOBN(0x0cea06f4, 0xffa473f9),
+              TOBN(0x43ed81b5, 0xc4e83d33),
+              TOBN(0xd9f35879, 0x5efd488b),
+              TOBN(0x164a620f, 0x9deb4d0f),
+              TOBN(0xc6927bdb, 0xac6a7394),
+              TOBN(0x45c28df7, 0x9f9e0f03),
+              TOBN(0x2868661e, 0xfcd7e1a9),
+              TOBN(0x7cf4e8d0, 0xffa348f1),
+              TOBN(0x6bd4c284, 0x398538e0),
+              TOBN(0x2618a091, 0x289a8619),
+              TOBN(0xef796e60, 0x6671b173),
+              TOBN(0x664e46e5, 0x9090c632),
+              TOBN(0xa38062d4, 0x1e66f8fb),
+              TOBN(0x6c744a20, 0x0573274e),
+              TOBN(0xd07b67e4, 0xa9271394),
+              TOBN(0x391223b2, 0x6bdc0e20),
+              TOBN(0xbe2d93f1, 0xeb0a05a7),
+              TOBN(0xf23e2e53, 0x3f36d141),
+              TOBN(0xe84bb3d4, 0x4dfca442),
+              TOBN(0xb804a48d, 0x6b7c023a),
+              TOBN(0x1e16a8fa, 0x76431c3b),
+              TOBN(0x1b5452ad, 0xddd472e0),
+              TOBN(0x7d405ee7, 0x0d1ee127),
+              TOBN(0x50fc6f1d, 0xffa27599),
+              TOBN(0x351ac53c, 0xbf391b35),
+              TOBN(0x7efa14b8, 0x4444896b),
+              TOBN(0x64974d2f, 0xf94027fb),
+              TOBN(0xefdcd0e8, 0xde84487d),
+              TOBN(0x8c45b260, 0x2b48989b),
+              TOBN(0xa8fcbbc2, 0xd8463487),
+              TOBN(0xd1b2b3f7, 0x3fbc476c),
+              TOBN(0x21d005b7, 0xc8f443c0),
+              TOBN(0x518f2e67, 0x40c0139c),
+              TOBN(0x56036e8c, 0x06d75fc1),
+              TOBN(0x2dcf7bb7, 0x3249a89f),
+              TOBN(0x81dd1d3d, 0xe245e7dd),
+              TOBN(0xf578dc4b, 0xebd6e2a7),
+              TOBN(0x4c028903, 0xdf2ce7a0),
+              TOBN(0xaee36288, 0x9c39afac),
+              TOBN(0xdc847c31, 0x146404ab),
+              TOBN(0x6304c0d8, 0xa4e97818),
+              TOBN(0xae51dca2, 0xa91f6791),
+              TOBN(0x2abe4190, 0x9baa9efc),
+              TOBN(0xd9d2e2f4, 0x559c7ac1),
+              TOBN(0xe82f4b51, 0xfc9f773a),
+              TOBN(0xa7713027, 0x4073e81c),
+              TOBN(0xc0276fac, 0xfbb596fc),
+              TOBN(0x1d819fc9, 0xa684f70c),
+              TOBN(0x29b47fdd, 0xc9f7b1e0),
+              TOBN(0x358de103, 0x459b1940),
+              TOBN(0xec881c59, 0x5b013e93),
+              TOBN(0x51574c93, 0x49532ad3),
+              TOBN(0x2db1d445, 0xb37b46de),
+              TOBN(0xc6445b87, 0xdf239fd8),
+              TOBN(0xc718af75, 0x151d24ee),
+              TOBN(0xaea1c4a4, 0xf43c6259),
+              TOBN(0x40c0e5d7, 0x70be02f7),
+              TOBN(0x6a4590f4, 0x721b33f2),
+              TOBN(0x2124f1fb, 0xfedf04ea),
+              TOBN(0xf8e53cde, 0x9745efe7),
+              TOBN(0xe7e10432, 0x65f046d9),
+              TOBN(0xc3fca28e, 0xe4d0c7e6),
+              TOBN(0x847e339a, 0x87253b1b),
+              TOBN(0x9b595348, 0x3743e643),
+              TOBN(0xcb6a0a0b, 0x4fd12fc5),
+              TOBN(0xfb6836c3, 0x27d02dcc),
+              TOBN(0x5ad00982, 0x7a68bcc2),
+              TOBN(0x1b24b44c, 0x005e912d),
+              TOBN(0xcc83d20f, 0x811fdcfe),
+              TOBN(0x36527ec1, 0x666fba0c),
+              TOBN(0x69948197, 0x14754635),
+              TOBN(0xfcdcb1a8, 0x556da9c2),
+              TOBN(0xa5934267, 0x81a732b2),
+              TOBN(0xec1214ed, 0xa714181d),
+              TOBN(0x609ac13b, 0x6067b341),
+              TOBN(0xff4b4c97, 0xa545df1f),
+              TOBN(0xa1240501, 0x34d2076b),
+              TOBN(0x6efa0c23, 0x1409ca97),
+              TOBN(0x254cc1a8, 0x20638c43),
+              TOBN(0xd4e363af, 0xdcfb46cd),
+              TOBN(0x62c2adc3, 0x03942a27),
+              TOBN(0xc67b9df0, 0x56e46483),
+              TOBN(0xa55abb20, 0x63736356),
+              TOBN(0xab93c098, 0xc551bc52),
+              TOBN(0x382b49f9, 0xb15fe64b),
+              TOBN(0x9ec221ad, 0x4dff8d47),
+              TOBN(0x79caf615, 0x437df4d6),
+              TOBN(0x5f13dc64, 0xbb456509),
+              TOBN(0xe4c589d9, 0x191f0714),
+              TOBN(0x27b6a8ab, 0x3fd40e09),
+              TOBN(0xe455842e, 0x77313ea9),
+              TOBN(0x8b51d1e2, 0x1f55988b),
+              TOBN(0x5716dd73, 0x062bbbfc),
+              TOBN(0x633c11e5, 0x4e8bf3de),
+              TOBN(0x9a0e77b6, 0x1b85be3b),
+              TOBN(0x56510729, 0x0911cca6),
+              TOBN(0x27e76495, 0xefa6590f),
+              TOBN(0xe4ac8b33, 0x070d3aab),
+              TOBN(0x2643672b, 0x9a2cd5e5),
+              TOBN(0x52eff79b, 0x1cfc9173),
+              TOBN(0x665ca49b, 0x90a7c13f),
+              TOBN(0x5a8dda59, 0xb3efb998),
+              TOBN(0x8a5b922d, 0x052f1341),
+              TOBN(0xae9ebbab, 0x3cf9a530),
+              TOBN(0x35986e7b, 0xf56da4d7),
+              TOBN(0x3a636b5c, 0xff3513cc),
+              TOBN(0xbb0cf8ba, 0x3198f7dd),
+              TOBN(0xb8d40522, 0x41f16f86),
+              TOBN(0x760575d8, 0xde13a7bf),
+              TOBN(0x36f74e16, 0x9f7aa181),
+              TOBN(0x163a3ecf, 0xf509ed1c),
+              TOBN(0x6aead61f, 0x3c40a491),
+              TOBN(0x158c95fc, 0xdfe8fcaa),
+              TOBN(0xa3991b6e, 0x13cda46f),
+              TOBN(0x79482415, 0x342faed0),
+              TOBN(0xf3ba5bde, 0x666b5970),
+              TOBN(0x1d52e6bc, 0xb26ab6dd),
+              TOBN(0x768ba1e7, 0x8608dd3d),
+              TOBN(0x4930db2a, 0xea076586),
+              TOBN(0xd9575714, 0xe7dc1afa),
+              TOBN(0x1fc7bf7d, 0xf7c58817),
+              TOBN(0x6b47accd, 0xd9eee96c),
+              TOBN(0x0ca277fb, 0xe58cec37),
+              TOBN(0x113fe413, 0xe702c42a),
+              TOBN(0xdd1764ee, 0xc47cbe51),
+              TOBN(0x041e7cde, 0x7b3ed739),
+              TOBN(0x50cb7459, 0x5ce9e1c0),
+              TOBN(0x35568513, 0x2925b212),
+              TOBN(0x7cff95c4, 0x001b081c),
+              TOBN(0x63ee4cbd, 0x8088b454),
+              TOBN(0xdb7f32f7, 0x9a9e0c8a),
+              TOBN(0xb377d418, 0x6b2447cb),
+              TOBN(0xe3e982aa, 0xd370219b),
+              TOBN(0x06ccc1e4, 0xc2a2a593),
+              TOBN(0x72c36865, 0x0773f24f),
+              TOBN(0xa13b4da7, 0x95859423),
+              TOBN(0x8bbf1d33, 0x75040c8f),
+              TOBN(0x726f0973, 0xda50c991),
+              TOBN(0x48afcd5b, 0x822d6ee2),
+              TOBN(0xe5fc718b, 0x20fd7771),
+              TOBN(0xb9e8e77d, 0xfd0807a1),
+              TOBN(0x7f5e0f44, 0x99a7703d),
+              TOBN(0x6972930e, 0x618e36f3),
+              TOBN(0x2b7c77b8, 0x23807bbe),
+              TOBN(0xe5b82405, 0xcb27ff50),
+              TOBN(0xba8b8be3, 0xbd379062),
+              TOBN(0xd64b7a1d, 0x2dce4a92),
+              TOBN(0x040a73c5, 0xb2952e37),
+              TOBN(0x0a9e252e, 0xd438aeca),
+              TOBN(0xdd43956b, 0xc39d3bcb),
+              TOBN(0x1a31ca00, 0xb32b2d63),
+              TOBN(0xd67133b8, 0x5c417a18),
+              TOBN(0xd08e4790, 0x2ef442c8),
+              TOBN(0x98cb1ae9, 0x255c0980),
+              TOBN(0x4bd86381, 0x2b4a739f),
+              TOBN(0x5a5c31e1, 0x1e4a45a1),
+              TOBN(0x1e5d55fe, 0x9cb0db2f),
+              TOBN(0x74661b06, 0x8ff5cc29),
+              TOBN(0x026b389f, 0x0eb8a4f4),
+              TOBN(0x536b21a4, 0x58848c24),
+              TOBN(0x2e5bf8ec, 0x81dc72b0),
+              TOBN(0x03c187d0, 0xad886aac),
+              TOBN(0x5c16878a, 0xb771b645),
+              TOBN(0xb07dfc6f, 0xc74045ab),
+              TOBN(0x2c6360bf, 0x7800caed),
+              TOBN(0x24295bb5, 0xb9c972a3),
+              TOBN(0xc9e6f88e, 0x7c9a6dba),
+              TOBN(0x90ffbf24, 0x92a79aa6),
+              TOBN(0xde29d50a, 0x41c26ac2),
+              TOBN(0x9f0af483, 0xd309cbe6),
+              TOBN(0x5b020d8a, 0xe0bced4f),
+              TOBN(0x606e986d, 0xb38023e3),
+              TOBN(0xad8f2c9d, 0x1abc6933),
+              TOBN(0x19292e1d, 0xe7400e93),
+              TOBN(0xfe3e18a9, 0x52be5e4d),
+              TOBN(0xe8e9771d, 0x2e0680bf),
+              TOBN(0x8c5bec98, 0xc54db063),
+              TOBN(0x2af9662a, 0x74a55d1f),
+              TOBN(0xe3fbf28f, 0x046f66d8),
+              TOBN(0xa3a72ab4, 0xd4dc4794),
+              TOBN(0x09779f45, 0x5c7c2dd8),
+              TOBN(0xd893bdaf, 0xc3d19d8d),
+              TOBN(0xd5a75094, 0x57d6a6df),
+              TOBN(0x8cf8fef9, 0x952e6255),
+              TOBN(0x3da67cfb, 0xda9a8aff),
+              TOBN(0x4c23f62a, 0x2c160dcd),
+              TOBN(0x34e6c5e3, 0x8f90eaef),
+              TOBN(0x35865519, 0xa9a65d5a),
+              TOBN(0x07c48aae, 0x8fd38a3d),
+              TOBN(0xb7e7aeda, 0x50068527),
+              TOBN(0x2c09ef23, 0x1c90936a),
+              TOBN(0x31ecfeb6, 0xe879324c),
+              TOBN(0xa0871f6b, 0xfb0ec938),
+              TOBN(0xb1f0fb68, 0xd84d835d),
+              TOBN(0xc90caf39, 0x861dc1e6),
+              TOBN(0x12e5b046, 0x7594f8d7),
+              TOBN(0x26897ae2, 0x65012b92),
+              TOBN(0xbcf68a08, 0xa4d6755d),
+              TOBN(0x403ee41c, 0x0991fbda),
+              TOBN(0x733e343e, 0x3bbf17e8),
+              TOBN(0xd2c7980d, 0x679b3d65),
+              TOBN(0x33056232, 0xd2e11305),
+              TOBN(0x966be492, 0xf3c07a6f),
+              TOBN(0x6a8878ff, 0xbb15509d),
+              TOBN(0xff221101, 0x0a9b59a4),
+              TOBN(0x6c9f564a, 0xabe30129),
+              TOBN(0xc6f2c940, 0x336e64cf),
+              TOBN(0x0fe75262, 0x8b0c8022),
+              TOBN(0xbe0267e9, 0x6ae8db87),
+              TOBN(0x22e192f1, 0x93bc042b),
+              TOBN(0xf085b534, 0xb237c458),
+              TOBN(0xa0d192bd, 0x832c4168),
+              TOBN(0x7a76e9e3, 0xbdf6271d),
+              TOBN(0x52a882fa, 0xb88911b5),
+              TOBN(0xc85345e4, 0xb4db0eb5),
+              TOBN(0xa3be02a6, 0x81a7c3ff),
+              TOBN(0x51889c8c, 0xf0ec0469),
+              TOBN(0x9d031369, 0xa5e829e5),
+              TOBN(0xcbb4c6fc, 0x1607aa41),
+              TOBN(0x75ac59a6, 0x241d84c1),
+              TOBN(0xc043f2bf, 0x8829e0ee),
+              TOBN(0x82a38f75, 0x8ea5e185),
+              TOBN(0x8bda40b9, 0xd87cbd9f),
+              TOBN(0x9e65e75e, 0x2d8fc601),
+              TOBN(0x3d515f74, 0xa35690b3),
+              TOBN(0x534acf4f, 0xda79e5ac),
+              TOBN(0x68b83b3a, 0x8630215f),
+              TOBN(0x5c748b2e, 0xd085756e),
+              TOBN(0xb0317258, 0xe5d37cb2),
+              TOBN(0x6735841a, 0xc5ccc2c4),
+              TOBN(0x7d7dc96b, 0x3d9d5069),
+              TOBN(0xa147e410, 0xfd1754bd),
+              TOBN(0x65296e94, 0xd399ddd5),
+              TOBN(0xf6b5b2d0, 0xbc8fa5bc),
+              TOBN(0x8a5ead67, 0x500c277b),
+              TOBN(0x214625e6, 0xdfa08a5d),
+              TOBN(0x51fdfedc, 0x959cf047),
+              TOBN(0x6bc9430b, 0x289fca32),
+              TOBN(0xe36ff0cf, 0x9d9bdc3f),
+              TOBN(0x2fe187cb, 0x58ea0ede),
+              TOBN(0xed66af20, 0x5a900b3f),
+              TOBN(0x00e0968b, 0x5fa9f4d6),
+              TOBN(0x2d4066ce, 0x37a362e7),
+              TOBN(0xa99a9748, 0xbd07e772),
+              TOBN(0x710989c0, 0x06a4f1d0),
+              TOBN(0xd5dedf35, 0xce40cbd8),
+              TOBN(0xab55c5f0, 0x1743293d),
+              TOBN(0x766f1144, 0x8aa24e2c),
+              TOBN(0x94d874f8, 0x605fbcb4),
+              TOBN(0xa365f0e8, 0xa518001b),
+              TOBN(0xee605eb6, 0x9d04ef0f),
+              TOBN(0x5a3915cd, 0xba8d4d25),
+              TOBN(0x44c0e1b8, 0xb5113472),
+              TOBN(0xcbb024e8, 0x8b6740dc),
+              TOBN(0x89087a53, 0xee1d4f0c),
+              TOBN(0xa88fa05c, 0x1fc4e372),
+              TOBN(0x8bf395cb, 0xaf8b3af2),
+              TOBN(0x1e71c9a1, 0xdeb8568b),
+              TOBN(0xa35daea0, 0x80fb3d32),
+              TOBN(0xe8b6f266, 0x2cf8fb81),
+              TOBN(0x6d51afe8, 0x9490696a),
+              TOBN(0x81beac6e, 0x51803a19),
+              TOBN(0xe3d24b7f, 0x86219080),
+              TOBN(0x727cfd9d, 0xdf6f463c),
+              TOBN(0x8c6865ca, 0x72284ee8),
+              TOBN(0x32c88b7d, 0xb743f4ef),
+              TOBN(0x3793909b, 0xe7d11dce),
+              TOBN(0xd398f922, 0x2ff2ebe8),
+              TOBN(0x2c70ca44, 0xe5e49796),
+              TOBN(0xdf4d9929, 0xcb1131b1),
+              TOBN(0x7826f298, 0x25888e79),
+              TOBN(0x4d3a112c, 0xf1d8740a),
+              TOBN(0x00384cb6, 0x270afa8b),
+              TOBN(0xcb64125b, 0x3ab48095),
+              TOBN(0x3451c256, 0x62d05106),
+              TOBN(0xd73d577d, 0xa4955845),
+              TOBN(0x39570c16, 0xbf9f4433),
+              TOBN(0xd7dfaad3, 0xadecf263),
+              TOBN(0xf1c3d8d1, 0xdc76e102),
+              TOBN(0x5e774a58, 0x54c6a836),
+              TOBN(0xdad4b672, 0x3e92d47b),
+              TOBN(0xbe7e990f, 0xf0d796a0),
+              TOBN(0x5fc62478, 0xdf0e8b02),
+              TOBN(0x8aae8bf4, 0x030c00ad),
+              TOBN(0x3d2db93b, 0x9004ba0f),
+              TOBN(0xe48c8a79, 0xd85d5ddc),
+              TOBN(0xe907caa7, 0x6bb07f34),
+              TOBN(0x58db343a, 0xa39eaed5),
+              TOBN(0x0ea6e007, 0xadaf5724),
+              TOBN(0xe00df169, 0xd23233f3),
+              TOBN(0x3e322796, 0x77cb637f),
+              TOBN(0x1f897c0e, 0x1da0cf6c),
+              TOBN(0xa651f5d8, 0x31d6bbdd),
+              TOBN(0xdd61af19, 0x1a230c76),
+              TOBN(0xbd527272, 0xcdaa5e4a),
+              TOBN(0xca753636, 0xd0abcd7e),
+              TOBN(0x78bdd37c, 0x370bd8dc),
+              TOBN(0xc23916c2, 0x17cd93fe),
+              TOBN(0x65b97a4d, 0xdadce6e2),
+              TOBN(0xe04ed4eb, 0x174e42f8),
+              TOBN(0x1491ccaa, 0xbb21480a),
+              TOBN(0x145a8280, 0x23196332),
+              TOBN(0x3c3862d7, 0x587b479a),
+              TOBN(0x9f4a88a3, 0x01dcd0ed),
+              TOBN(0x4da2b7ef, 0x3ea12f1f),
+              TOBN(0xf8e7ae33, 0xb126e48e),
+              TOBN(0x404a0b32, 0xf494e237),
+              TOBN(0x9beac474, 0xc55acadb),
+              TOBN(0x4ee5cf3b, 0xcbec9fd9),
+              TOBN(0x336b33b9, 0x7df3c8c3),
+              TOBN(0xbd905fe3, 0xb76808fd),
+              TOBN(0x8f436981, 0xaa45c16a),
+              TOBN(0x255c5bfa, 0x3dd27b62),
+              TOBN(0x71965cbf, 0xc3dd9b4d),
+              TOBN(0xce23edbf, 0xfc068a87),
+              TOBN(0xb78d4725, 0x745b029b),
+              TOBN(0x74610713, 0xcefdd9bd),
+              TOBN(0x7116f75f, 0x1266bf52),
+              TOBN(0x02046722, 0x18e49bb6),
+              TOBN(0xdf43df9f, 0x3d6f19e3),
+              TOBN(0xef1bc7d0, 0xe685cb2f),
+              TOBN(0xcddb27c1, 0x7078c432),
+              TOBN(0xe1961b9c, 0xb77fedb7),
+              TOBN(0x1edc2f5c, 0xc2290570),
+              TOBN(0x2c3fefca, 0x19cbd886),
+              TOBN(0xcf880a36, 0xc2af389a),
+              TOBN(0x96c610fd, 0xbda71cea),
+              TOBN(0xf03977a9, 0x32aa8463),
+              TOBN(0x8eb7763f, 0x8586d90a),
+              TOBN(0x3f342454, 0x2a296e77),
+              TOBN(0xc8718683, 0x42837a35),
+              TOBN(0x7dc71090, 0x6a09c731),
+              TOBN(0x54778ffb, 0x51b816db),
+              TOBN(0x6b33bfec, 0xaf06defd),
+              TOBN(0xfe3c105f, 0x8592b70b),
+              TOBN(0xf937fda4, 0x61da6114),
+              TOBN(0x3c13e651, 0x4c266ad7),
+              TOBN(0xe363a829, 0x855938e8),
+              TOBN(0x2eeb5d9e, 0x9de54b72),
+              TOBN(0xbeb93b0e, 0x20ccfab9),
+              TOBN(0x3dffbb5f, 0x25e61a25),
+              TOBN(0x7f655e43, 0x1acc093d),
+              TOBN(0x0cb6cc3d, 0x3964ce61),
+              TOBN(0x6ab283a1, 0xe5e9b460),
+              TOBN(0x55d787c5, 0xa1c7e72d),
+              TOBN(0x4d2efd47, 0xdeadbf02),
+              TOBN(0x11e80219, 0xac459068),
+              TOBN(0x810c7626, 0x71f311f0),
+              TOBN(0xfa17ef8d, 0x4ab6ef53),
+              TOBN(0xaf47fd25, 0x93e43bff),
+              TOBN(0x5cb5ff3f, 0x0be40632),
+              TOBN(0x54687106, 0x8ee61da3),
+              TOBN(0x7764196e, 0xb08afd0f),
+              TOBN(0x831ab3ed, 0xf0290a8f),
+              TOBN(0xcae81966, 0xcb47c387),
+              TOBN(0xaad7dece, 0x184efb4f),
+              TOBN(0xdcfc53b3, 0x4749110e),
+              TOBN(0x6698f23c, 0x4cb632f9),
+              TOBN(0xc42a1ad6, 0xb91f8067),
+              TOBN(0xb116a81d, 0x6284180a),
+              TOBN(0xebedf5f8, 0xe901326f),
+              TOBN(0xf2274c9f, 0x97e3e044),
+              TOBN(0x42018520, 0x11d09fc9),
+              TOBN(0x56a65f17, 0xd18e6e23),
+              TOBN(0x2ea61e2a, 0x352b683c),
+              TOBN(0x27d291bc, 0x575eaa94),
+              TOBN(0x9e7bc721, 0xb8ff522d),
+              TOBN(0x5f7268bf, 0xa7f04d6f),
+              TOBN(0x5868c73f, 0xaba41748),
+              TOBN(0x9f85c2db, 0x7be0eead),
+              TOBN(0x511e7842, 0xff719135),
+              TOBN(0x5a06b1e9, 0xc5ea90d7),
+              TOBN(0x0c19e283, 0x26fab631),
+              TOBN(0x8af8f0cf, 0xe9206c55),
+              TOBN(0x89389cb4, 0x3553c06a),
+              TOBN(0x39dbed97, 0xf65f8004),
+              TOBN(0x0621b037, 0xc508991d),
+              TOBN(0x1c52e635, 0x96e78cc4),
+              TOBN(0x5385c8b2, 0x0c06b4a8),
+              TOBN(0xd84ddfdb, 0xb0e87d03),
+              TOBN(0xc49dfb66, 0x934bafad),
+              TOBN(0x7071e170, 0x59f70772),
+              TOBN(0x3a073a84, 0x3a1db56b),
+              TOBN(0x03494903, 0x3b8af190),
+              TOBN(0x7d882de3, 0xd32920f0),
+              TOBN(0x91633f0a, 0xb2cf8940),
+              TOBN(0x72b0b178, 0x6f948f51),
+              TOBN(0x2d28dc30, 0x782653c8),
+              TOBN(0x88829849, 0xdb903a05),
+              TOBN(0xb8095d0c, 0x6a19d2bb),
+              TOBN(0x4b9e7f0c, 0x86f782cb),
+              TOBN(0x7af73988, 0x2d907064),
+              TOBN(0xd12be0fe, 0x8b32643c),
+              TOBN(0x358ed23d, 0x0e165dc3),
+              TOBN(0x3d47ce62, 0x4e2378ce),
+              TOBN(0x7e2bb0b9, 0xfeb8a087),
+              TOBN(0x3246e8ae, 0xe29e10b9),
+              TOBN(0x459f4ec7, 0x03ce2b4d),
+              TOBN(0xe9b4ca1b, 0xbbc077cf),
+              TOBN(0x2613b4f2, 0x0e9940c1),
+              TOBN(0xfc598bb9, 0x047d1eb1),
+              TOBN(0x9744c62b, 0x45036099),
+              TOBN(0xa9dee742, 0x167c65d8),
+              TOBN(0x0c511525, 0xdabe1943),
+              TOBN(0xda110554, 0x93c6c624),
+              TOBN(0xae00a52c, 0x651a3be2),
+              TOBN(0xcda5111d, 0x884449a6),
+              TOBN(0x063c06f4, 0xff33bed1),
+              TOBN(0x73baaf9a, 0x0d3d76b4),
+              TOBN(0x52fb0c9d, 0x7fc63668),
+              TOBN(0x6886c9dd, 0x0c039cde),
+              TOBN(0x602bd599, 0x55b22351),
+              TOBN(0xb00cab02, 0x360c7c13),
+              TOBN(0x8cb616bc, 0x81b69442),
+              TOBN(0x41486700, 0xb55c3cee),
+              TOBN(0x71093281, 0xf49ba278),
+              TOBN(0xad956d9c, 0x64a50710),
+              TOBN(0x9561f28b, 0x638a7e81),
+              TOBN(0x54155cdf, 0x5980ddc3),
+              TOBN(0xb2db4a96, 0xd26f247a),
+              TOBN(0x9d774e4e, 0x4787d100),
+              TOBN(0x1a9e6e2e, 0x078637d2),
+              TOBN(0x1c363e2d, 0x5e0ae06a),
+              TOBN(0x7493483e, 0xe9cfa354),
+              TOBN(0x76843cb3, 0x7f74b98d),
+              TOBN(0xbaca6591, 0xd4b66947),
+              TOBN(0xb452ce98, 0x04460a8c),
+              TOBN(0x6830d246, 0x43768f55),
+              TOBN(0xf4197ed8, 0x7dff12df),
+              TOBN(0x6521b472, 0x400dd0f7),
+              TOBN(0x59f5ca8f, 0x4b1e7093),
+              TOBN(0x6feff11b, 0x080338ae),
+              TOBN(0x0ada31f6, 0xa29ca3c6),
+              TOBN(0x24794eb6, 0x94a2c215),
+              TOBN(0xd83a43ab, 0x05a57ab4),
+              TOBN(0x264a543a, 0x2a6f89fe),
+              TOBN(0x2c2a3868, 0xdd5ec7c2),
+              TOBN(0xd3373940, 0x8439d9b2),
+              TOBN(0x715ea672, 0x0acd1f11),
+              TOBN(0x42c1d235, 0xe7e6cc19),
+              TOBN(0x81ce6e96, 0xb990585c),
+              TOBN(0x04e5dfe0, 0xd809c7bd),
+              TOBN(0xd7b2580c, 0x8f1050ab),
+              TOBN(0x6d91ad78, 0xd8a4176f),
+              TOBN(0x0af556ee, 0x4e2e897c),
+              TOBN(0x162a8b73, 0x921de0ac),
+              TOBN(0x52ac9c22, 0x7ea78400),
+              TOBN(0xee2a4eea, 0xefce2174),
+              TOBN(0xbe61844e, 0x6d637f79),
+              TOBN(0x0491f1bc, 0x789a283b),
+              TOBN(0x72d3ac3d, 0x880836f4),
+              TOBN(0xaa1c5ea3, 0x88e5402d),
+              TOBN(0x1b192421, 0xd5cc473d),
+              TOBN(0x5c0b9998, 0x9dc84cac),
+              TOBN(0xb0a8482d, 0x9c6e75b8),
+              TOBN(0x639961d0, 0x3a191ce2),
+              TOBN(0xda3bc865, 0x6d837930),
+              TOBN(0xca990653, 0x056e6f8f),
+              TOBN(0x84861c41, 0x64d133a7),
+              TOBN(0x8b403276, 0x746abe40),
+              TOBN(0xb7b4d51a, 0xebf8e303),
+              TOBN(0x05b43211, 0x220a255d),
+              TOBN(0xc997152c, 0x02419e6e),
+              TOBN(0x76ff47b6, 0x630c2fea),
+              TOBN(0x50518677, 0x281fdade),
+              TOBN(0x3283b8ba, 0xcf902b0b),
+              TOBN(0x8d4b4eb5, 0x37db303b),
+              TOBN(0xcc89f42d, 0x755011bc),
+              TOBN(0xb43d74bb, 0xdd09d19b),
+              TOBN(0x65746bc9, 0x8adba350),
+              TOBN(0x364eaf8c, 0xb51c1927),
+              TOBN(0x13c76596, 0x10ad72ec),
+              TOBN(0x30045121, 0xf8d40c20),
+              TOBN(0x6d2d99b7, 0xea7b979b),
+              TOBN(0xcd78cd74, 0xe6fb3bcd),
+              TOBN(0x11e45a9e, 0x86cffbfe),
+              TOBN(0x78a61cf4, 0x637024f6),
+              TOBN(0xd06bc872, 0x3d502295),
+              TOBN(0xf1376854, 0x458cb288),
+              TOBN(0xb9db26a1, 0x342f8586),
+              TOBN(0xf33effcf, 0x4beee09e),
+              TOBN(0xd7e0c4cd, 0xb30cfb3a),
+              TOBN(0x6d09b8c1, 0x6c9db4c8),
+              TOBN(0x40ba1a42, 0x07c8d9df),
+              TOBN(0x6fd495f7, 0x1c52c66d),
+              TOBN(0xfb0e169f, 0x275264da),
+              TOBN(0x80c2b746, 0xe57d8362),
+              TOBN(0xedd987f7, 0x49ad7222),
+              TOBN(0xfdc229af, 0x4398ec7b),
+          },
+          {
+              TOBN(0xb0d1ed84, 0x52666a58),
+              TOBN(0x4bcb6e00, 0xe6a9c3c2),
+              TOBN(0x3c57411c, 0x26906408),
+              TOBN(0xcfc20755, 0x13556400),
+              TOBN(0xa08b1c50, 0x5294dba3),
+              TOBN(0xa30ba286, 0x8b7dd31e),
+              TOBN(0xd70ba90e, 0x991eca74),
+              TOBN(0x094e142c, 0xe762c2b9),
+              TOBN(0xb81d783e, 0x979f3925),
+              TOBN(0x1efd130a, 0xaf4c89a7),
+              TOBN(0x525c2144, 0xfd1bf7fa),
+              TOBN(0x4b296904, 0x1b265a9e),
+              TOBN(0xed8e9634, 0xb9db65b6),
+              TOBN(0x35c82e32, 0x03599d8a),
+              TOBN(0xdaa7a54f, 0x403563f3),
+              TOBN(0x9df088ad, 0x022c38ab),
+              TOBN(0xe5cfb066, 0xbb3fd30a),
+              TOBN(0x429169da, 0xeff0354e),
+              TOBN(0x809cf852, 0x3524e36c),
+              TOBN(0x136f4fb3, 0x0155be1d),
+              TOBN(0x4826af01, 0x1fbba712),
+              TOBN(0x6ef0f0b4, 0x506ba1a1),
+              TOBN(0xd9928b31, 0x77aea73e),
+              TOBN(0xe2bf6af2, 0x5eaa244e),
+              TOBN(0x8d084f12, 0x4237b64b),
+              TOBN(0x688ebe99, 0xe3ecfd07),
+              TOBN(0x57b8a70c, 0xf6845dd8),
+              TOBN(0x808fc59c, 0x5da4a325),
+              TOBN(0xa9032b2b, 0xa3585862),
+              TOBN(0xb66825d5, 0xedf29386),
+              TOBN(0xb5a5a8db, 0x431ec29b),
+              TOBN(0xbb143a98, 0x3a1e8dc8),
+              TOBN(0x35ee94ce, 0x12ae381b),
+              TOBN(0x3a7f176c, 0x86ccda90),
+              TOBN(0xc63a657e, 0x4606eaca),
+              TOBN(0x9ae5a380, 0x43cd04df),
+              TOBN(0x9bec8d15, 0xed251b46),
+              TOBN(0x1f5d6d30, 0xcaca5e64),
+              TOBN(0x347b3b35, 0x9ff20f07),
+              TOBN(0x4d65f034, 0xf7e4b286),
+              TOBN(0x9e93ba24, 0xf111661e),
+              TOBN(0xedced484, 0xb105eb04),
+              TOBN(0x96dc9ba1, 0xf424b578),
+              TOBN(0xbf8f66b7, 0xe83e9069),
+              TOBN(0x872d4df4, 0xd7ed8216),
+              TOBN(0xbf07f377, 0x8e2cbecf),
+              TOBN(0x4281d899, 0x98e73754),
+              TOBN(0xfec85fbb, 0x8aab8708),
+              TOBN(0x9a3c0dee, 0xa5ba5b0b),
+              TOBN(0xe6a116ce, 0x42d05299),
+              TOBN(0xae9775fe, 0xe9b02d42),
+              TOBN(0x72b05200, 0xa1545cb6),
+              TOBN(0xbc506f7d, 0x31a3b4ea),
+              TOBN(0xe5893078, 0x8bbd9b32),
+              TOBN(0xc8bc5f37, 0xe4b12a97),
+              TOBN(0x6b000c06, 0x4a73b671),
+              TOBN(0x13b5bf22, 0x765fa7d0),
+              TOBN(0x59805bf0, 0x1d6a5370),
+              TOBN(0x67a5e29d, 0x4280db98),
+              TOBN(0x4f53916f, 0x776b1ce3),
+              TOBN(0x714ff61f, 0x33ddf626),
+              TOBN(0x4206238e, 0xa085d103),
+              TOBN(0x1c50d4b7, 0xe5809ee3),
+              TOBN(0x999f450d, 0x85f8eb1d),
+              TOBN(0x658a6051, 0xe4c79e9b),
+              TOBN(0x1394cb73, 0xc66a9fea),
+              TOBN(0x27f31ed5, 0xc6be7b23),
+              TOBN(0xf4c88f36, 0x5aa6f8fe),
+              TOBN(0x0fb0721f, 0x4aaa499e),
+              TOBN(0x68b3a7d5, 0xe3fb2a6b),
+              TOBN(0xa788097d, 0x3a92851d),
+              TOBN(0x060e7f8a, 0xe96f4913),
+              TOBN(0x82eebe73, 0x1a3a93bc),
+              TOBN(0x42bbf465, 0xa21adc1a),
+              TOBN(0xc10b6fa4, 0xef030efd),
+              TOBN(0x247aa4c7, 0x87b097bb),
+              TOBN(0x8b8dc632, 0xf60c77da),
+              TOBN(0x6ffbc26a, 0xc223523e),
+              TOBN(0xa4f6ff11, 0x344579cf),
+              TOBN(0x5825653c, 0x980250f6),
+              TOBN(0xb2dd097e, 0xbc1aa2b9),
+              TOBN(0x07889393, 0x37a0333a),
+              TOBN(0x1cf55e71, 0x37a0db38),
+              TOBN(0x2648487f, 0x792c1613),
+              TOBN(0xdad01336, 0x3fcef261),
+              TOBN(0x6239c81d, 0x0eabf129),
+              TOBN(0x8ee761de, 0x9d276be2),
+              TOBN(0x406a7a34, 0x1eda6ad3),
+              TOBN(0x4bf367ba, 0x4a493b31),
+              TOBN(0x54f20a52, 0x9bf7f026),
+              TOBN(0xb696e062, 0x9795914b),
+              TOBN(0xcddab96d, 0x8bf236ac),
+              TOBN(0x4ff2c70a, 0xed25ea13),
+              TOBN(0xfa1d09eb, 0x81cbbbe7),
+              TOBN(0x88fc8c87, 0x468544c5),
+              TOBN(0x847a670d, 0x696b3317),
+              TOBN(0xf133421e, 0x64bcb626),
+              TOBN(0xaea638c8, 0x26dee0b5),
+              TOBN(0xd6e7680b, 0xb310346c),
+              TOBN(0xe06f4097, 0xd5d4ced3),
+              TOBN(0x09961452, 0x7512a30b),
+              TOBN(0xf3d867fd, 0xe589a59a),
+              TOBN(0x2e73254f, 0x52d0c180),
+              TOBN(0x9063d8a3, 0x333c74ac),
+              TOBN(0xeda6c595, 0xd314e7bc),
+              TOBN(0x2ee7464b, 0x467899ed),
+              TOBN(0x1cef423c, 0x0a1ed5d3),
+              TOBN(0x217e76ea, 0x69cc7613),
+              TOBN(0x27ccce1f, 0xe7cda917),
+              TOBN(0x12d8016b, 0x8a893f16),
+              TOBN(0xbcd6de84, 0x9fc74f6b),
+              TOBN(0xfa5817e2, 0xf3144e61),
+              TOBN(0x1f354164, 0x0821ee4c),
+              TOBN(0x1583eab4, 0x0bc61992),
+              TOBN(0x7490caf6, 0x1d72879f),
+              TOBN(0x998ad9f3, 0xf76ae7b2),
+              TOBN(0x1e181950, 0xa41157f7),
+              TOBN(0xa9d7e1e6, 0xe8da3a7e),
+              TOBN(0x963784eb, 0x8426b95f),
+              TOBN(0x0ee4ed6e, 0x542e2a10),
+              TOBN(0xb79d4cc5, 0xac751e7b),
+              TOBN(0x93f96472, 0xfd4211bd),
+              TOBN(0x8c72d3d2, 0xc8de4fc6),
+              TOBN(0x7b69cbf5, 0xdf44f064),
+              TOBN(0x3da90ca2, 0xf4bf94e1),
+              TOBN(0x1a5325f8, 0xf12894e2),
+              TOBN(0x0a437f6c, 0x7917d60b),
+              TOBN(0x9be70486, 0x96c9cb5d),
+              TOBN(0xb4d880bf, 0xe1dc5c05),
+              TOBN(0xd738adda, 0xeebeeb57),
+              TOBN(0x6f0119d3, 0xdf0fe6a3),
+              TOBN(0x5c686e55, 0x66eaaf5a),
+              TOBN(0x9cb10b50, 0xdfd0b7ec),
+              TOBN(0xbdd0264b, 0x6a497c21),
+              TOBN(0xfc093514, 0x8c546c96),
+              TOBN(0x58a947fa, 0x79dbf42a),
+              TOBN(0xc0b48d4e, 0x49ccd6d7),
+              TOBN(0xff8fb02c, 0x88bd5580),
+              TOBN(0xc75235e9, 0x07d473b2),
+              TOBN(0x4fab1ac5, 0xa2188af3),
+              TOBN(0x030fa3bc, 0x97576ec0),
+              TOBN(0xe8c946e8, 0x0b7e7d2f),
+              TOBN(0x40a5c9cc, 0x70305600),
+              TOBN(0x6d8260a9, 0xc8b013b4),
+              TOBN(0x0368304f, 0x70bba85c),
+              TOBN(0xad090da1, 0xa4a0d311),
+              TOBN(0x7170e870, 0x2415eec1),
+              TOBN(0xbfba35fe, 0x8461ea47),
+              TOBN(0x6279019a, 0xc1e91938),
+              TOBN(0xa47638f3, 0x1afc415f),
+              TOBN(0x36c65cbb, 0xbcba0e0f),
+              TOBN(0x02160efb, 0x034e2c48),
+              TOBN(0xe6c51073, 0x615cd9e4),
+              TOBN(0x498ec047, 0xf1243c06),
+              TOBN(0x3e5a8809, 0xb17b3d8c),
+              TOBN(0x5cd99e61, 0x0cc565f1),
+              TOBN(0x81e312df, 0x7851dafe),
+              TOBN(0xf156f5ba, 0xa79061e2),
+              TOBN(0x80d62b71, 0x880c590e),
+              TOBN(0xbec9746f, 0x0a39faa1),
+              TOBN(0x1d98a9c1, 0xc8ed1f7a),
+              TOBN(0x09e43bb5, 0xa81d5ff2),
+              TOBN(0xd5f00f68, 0x0da0794a),
+              TOBN(0x412050d9, 0x661aa836),
+              TOBN(0xa89f7c4e, 0x90747e40),
+              TOBN(0x6dc05ebb, 0xb62a3686),
+              TOBN(0xdf4de847, 0x308e3353),
+              TOBN(0x53868fbb, 0x9fb53bb9),
+              TOBN(0x2b09d2c3, 0xcfdcf7dd),
+              TOBN(0x41a9fce3, 0x723fcab4),
+              TOBN(0x73d905f7, 0x07f57ca3),
+              TOBN(0x080f9fb1, 0xac8e1555),
+              TOBN(0x7c088e84, 0x9ba7a531),
+              TOBN(0x07d35586, 0xed9a147f),
+              TOBN(0x602846ab, 0xaf48c336),
+              TOBN(0x7320fd32, 0x0ccf0e79),
+              TOBN(0xaa780798, 0xb18bd1ff),
+              TOBN(0x52c2e300, 0xafdd2905),
+              TOBN(0xf27ea3d6, 0x434267cd),
+              TOBN(0x8b96d16d, 0x15605b5f),
+              TOBN(0x7bb31049, 0x4b45706b),
+              TOBN(0xe7f58b8e, 0x743d25f8),
+              TOBN(0xe9b5e45b, 0x87f30076),
+              TOBN(0xd19448d6, 0x5d053d5a),
+              TOBN(0x1ecc8cb9, 0xd3210a04),
+              TOBN(0x6bc7d463, 0xdafb5269),
+              TOBN(0x3e59b10a, 0x67c3489f),
+              TOBN(0x1769788c, 0x65641e1b),
+              TOBN(0x8a53b82d, 0xbd6cb838),
+              TOBN(0x7066d6e6, 0x236d5f22),
+              TOBN(0x03aa1c61, 0x6908536e),
+              TOBN(0xc971da0d, 0x66ae9809),
+              TOBN(0x01b3a86b, 0xc49a2fac),
+              TOBN(0x3b8420c0, 0x3092e77a),
+              TOBN(0x02057300, 0x7d6fb556),
+              TOBN(0x6941b2a1, 0xbff40a87),
+              TOBN(0x140b6308, 0x0658ff2a),
+              TOBN(0x87804363, 0x3424ab36),
+              TOBN(0x0253bd51, 0x5751e299),
+              TOBN(0xc75bcd76, 0x449c3e3a),
+              TOBN(0x92eb4090, 0x7f8f875d),
+              TOBN(0x9c9d754e, 0x56c26bbf),
+              TOBN(0x158cea61, 0x8110bbe7),
+              TOBN(0x62a6b802, 0x745f91ea),
+              TOBN(0xa79c41aa, 0xc6e7394b),
+              TOBN(0x445b6a83, 0xad57ef10),
+              TOBN(0x0c5277eb, 0x6ea6f40c),
+              TOBN(0x319fe96b, 0x88633365),
+              TOBN(0x0b0fc61f, 0x385f63cb),
+              TOBN(0x41250c84, 0x22bdd127),
+              TOBN(0x67d153f1, 0x09e942c2),
+              TOBN(0x60920d08, 0xc021ad5d),
+              TOBN(0x229f5746, 0x724d81a5),
+              TOBN(0xb7ffb892, 0x5bba3299),
+              TOBN(0x518c51a1, 0xde413032),
+              TOBN(0x2a9bfe77, 0x3c2fd94c),
+              TOBN(0xcbcde239, 0x3191f4fd),
+              TOBN(0x43093e16, 0xd3d6ada1),
+              TOBN(0x184579f3, 0x58769606),
+              TOBN(0x2c94a8b3, 0xd236625c),
+              TOBN(0x6922b9c0, 0x5c437d8e),
+              TOBN(0x3d4ae423, 0xd8d9f3c8),
+              TOBN(0xf72c31c1, 0x2e7090a2),
+              TOBN(0x4ac3f5f3, 0xd76a55bd),
+              TOBN(0x342508fc, 0x6b6af991),
+              TOBN(0x0d527100, 0x1b5cebbd),
+              TOBN(0xb84740d0, 0xdd440dd7),
+              TOBN(0x748ef841, 0x780162fd),
+              TOBN(0xa8dbfe0e, 0xdfc6fafb),
+              TOBN(0xeadfdf05, 0xf7300f27),
+              TOBN(0x7d06555f, 0xfeba4ec9),
+              TOBN(0x12c56f83, 0x9e25fa97),
+              TOBN(0x77f84203, 0xd39b8c34),
+              TOBN(0xed8b1be6, 0x3125eddb),
+              TOBN(0x5bbf2441, 0xf6e39dc5),
+              TOBN(0xb00f6ee6, 0x6a5d678a),
+              TOBN(0xba456ecf, 0x57d0ea99),
+              TOBN(0xdcae0f58, 0x17e06c43),
+              TOBN(0x01643de4, 0x0f5b4baa),
+              TOBN(0x2c324341, 0xd161b9be),
+              TOBN(0x80177f55, 0xe126d468),
+              TOBN(0xed325f1f, 0x76748e09),
+              TOBN(0x6116004a, 0xcfa9bdc2),
+              TOBN(0x2d8607e6, 0x3a9fb468),
+              TOBN(0x0e573e27, 0x6009d660),
+              TOBN(0x3a525d2e, 0x8d10c5a1),
+              TOBN(0xd26cb45c, 0x3b9009a0),
+              TOBN(0xb6b0cdc0, 0xde9d7448),
+              TOBN(0x949c9976, 0xe1337c26),
+              TOBN(0x6faadebd, 0xd73d68e5),
+              TOBN(0x9e158614, 0xf1b768d9),
+              TOBN(0x22dfa557, 0x9cc4f069),
+              TOBN(0xccd6da17, 0xbe93c6d6),
+              TOBN(0x24866c61, 0xa504f5b9),
+              TOBN(0x2121353c, 0x8d694da1),
+              TOBN(0x1c6ca580, 0x0140b8c6),
+              TOBN(0xc245ad8c, 0xe964021e),
+              TOBN(0xb83bffba, 0x032b82b3),
+              TOBN(0xfaa220c6, 0x47ef9898),
+              TOBN(0x7e8d3ac6, 0x982c948a),
+              TOBN(0x1faa2091, 0xbc2d124a),
+              TOBN(0xbd54c3dd, 0x05b15ff4),
+              TOBN(0x386bf3ab, 0xc87c6fb7),
+              TOBN(0xfb2b0563, 0xfdeb6f66),
+              TOBN(0x4e77c557, 0x5b45afb4),
+              TOBN(0xe9ded649, 0xefb8912d),
+              TOBN(0x7ec9bbf5, 0x42f6e557),
+              TOBN(0x2570dfff, 0x62671f00),
+              TOBN(0x2b3bfb78, 0x88e084bd),
+              TOBN(0xa024b238, 0xf37fe5b4),
+              TOBN(0x44e7dc04, 0x95649aee),
+              TOBN(0x498ca255, 0x5e7ec1d8),
+              TOBN(0x3bc766ea, 0xaaa07e86),
+              TOBN(0x0db6facb, 0xf3608586),
+              TOBN(0xbadd2549, 0xbdc259c8),
+              TOBN(0x95af3c6e, 0x041c649f),
+              TOBN(0xb36a928c, 0x02e30afb),
+              TOBN(0x9b5356ad, 0x008a88b8),
+              TOBN(0x4b67a5f1, 0xcf1d9e9d),
+              TOBN(0xc6542e47, 0xa5d8d8ce),
+              TOBN(0x73061fe8, 0x7adfb6cc),
+              TOBN(0xcc826fd3, 0x98678141),
+              TOBN(0x00e758b1, 0x3c80515a),
+              TOBN(0x6afe3247, 0x41485083),
+              TOBN(0x0fcb08b9, 0xb6ae8a75),
+              TOBN(0xb8cf388d, 0x4acf51e1),
+              TOBN(0x344a5560, 0x6961b9d6),
+              TOBN(0x1a6778b8, 0x6a97fd0c),
+              TOBN(0xd840fdc1, 0xecc4c7e3),
+              TOBN(0xde9fe47d, 0x16db68cc),
+              TOBN(0xe95f89de, 0xa3e216aa),
+              TOBN(0x84f1a6a4, 0x9594a8be),
+              TOBN(0x7ddc7d72, 0x5a7b162b),
+              TOBN(0xc5cfda19, 0xadc817a3),
+              TOBN(0x80a5d350, 0x78b58d46),
+              TOBN(0x93365b13, 0x82978f19),
+              TOBN(0x2e44d225, 0x26a1fc90),
+              TOBN(0x0d6d10d2, 0x4d70705d),
+              TOBN(0xd94b6b10, 0xd70c45f4),
+              TOBN(0x0f201022, 0xb216c079),
+              TOBN(0xcec966c5, 0x658fde41),
+              TOBN(0xa8d2bc7d, 0x7e27601d),
+              TOBN(0xbfcce3e1, 0xff230be7),
+              TOBN(0x3394ff6b, 0x0033ffb5),
+              TOBN(0xd890c509, 0x8132c9af),
+              TOBN(0xaac4b0eb, 0x361e7868),
+              TOBN(0x5194ded3, 0xe82d15aa),
+              TOBN(0x4550bd2e, 0x23ae6b7d),
+              TOBN(0x3fda318e, 0xea5399d4),
+              TOBN(0xd989bffa, 0x91638b80),
+              TOBN(0x5ea124d0, 0xa14aa12d),
+              TOBN(0x1fb1b899, 0x3667b944),
+              TOBN(0x95ec7969, 0x44c44d6a),
+              TOBN(0x91df144a, 0x57e86137),
+              TOBN(0x915fd620, 0x73adac44),
+              TOBN(0x8f01732d, 0x59a83801),
+              TOBN(0xec579d25, 0x3aa0a633),
+              TOBN(0x06de5e7c, 0xc9d6d59c),
+              TOBN(0xc132f958, 0xb1ef8010),
+              TOBN(0x29476f96, 0xe65c1a02),
+              TOBN(0x336a77c0, 0xd34c3565),
+              TOBN(0xef1105b2, 0x1b9f1e9e),
+              TOBN(0x63e6d08b, 0xf9e08002),
+              TOBN(0x9aff2f21, 0xc613809e),
+              TOBN(0xb5754f85, 0x3a80e75d),
+              TOBN(0xde71853e, 0x6bbda681),
+              TOBN(0x86f041df, 0x8197fd7a),
+              TOBN(0x8b332e08, 0x127817fa),
+              TOBN(0x05d99be8, 0xb9c20cda),
+              TOBN(0x89f7aad5, 0xd5cd0c98),
+              TOBN(0x7ef936fe, 0x5bb94183),
+              TOBN(0x92ca0753, 0xb05cd7f2),
+              TOBN(0x9d65db11, 0x74a1e035),
+              TOBN(0x02628cc8, 0x13eaea92),
+              TOBN(0xf2d9e242, 0x49e4fbf2),
+              TOBN(0x94fdfd9b, 0xe384f8b7),
+              TOBN(0x65f56054, 0x63428c6b),
+              TOBN(0x2f7205b2, 0x90b409a5),
+              TOBN(0xf778bb78, 0xff45ae11),
+              TOBN(0xa13045be, 0xc5ee53b2),
+              TOBN(0xe00a14ff, 0x03ef77fe),
+              TOBN(0x689cd59f, 0xffef8bef),
+              TOBN(0x3578f0ed, 0x1e9ade22),
+              TOBN(0xe99f3ec0, 0x6268b6a8),
+              TOBN(0xa2057d91, 0xea1b3c3e),
+              TOBN(0x2d1a7053, 0xb8823a4a),
+              TOBN(0xabbb336a, 0x2cca451e),
+              TOBN(0xcd2466e3, 0x2218bb5d),
+              TOBN(0x3ac1f42f, 0xc8cb762d),
+              TOBN(0x7e312aae, 0x7690211f),
+              TOBN(0xebb9bd73, 0x45d07450),
+              TOBN(0x207c4b82, 0x46c2213f),
+              TOBN(0x99d425c1, 0x375913ec),
+              TOBN(0x94e45e96, 0x67908220),
+              TOBN(0xc08f3087, 0xcd67dbf6),
+              TOBN(0xa5670fbe, 0xc0887056),
+              TOBN(0x6717b64a, 0x66f5b8fc),
+              TOBN(0xd5a56aea, 0x786fec28),
+              TOBN(0xa8c3f55f, 0xc0ff4952),
+              TOBN(0xa77fefae, 0x457ac49b),
+              TOBN(0x29882d7c, 0x98379d44),
+              TOBN(0xd000bdfb, 0x509edc8a),
+              TOBN(0xc6f95979, 0xe66fe464),
+              TOBN(0x504a6115, 0xfa61bde0),
+              TOBN(0x56b3b871, 0xeffea31a),
+              TOBN(0x2d3de26d, 0xf0c21a54),
+              TOBN(0x21dbff31, 0x834753bf),
+              TOBN(0xe67ecf49, 0x69269d86),
+              TOBN(0x7a176952, 0x151fe690),
+              TOBN(0x03515804, 0x7f2adb5f),
+              TOBN(0xee794b15, 0xd1b62a8d),
+              TOBN(0xf004ceec, 0xaae454e6),
+              TOBN(0x0897ea7c, 0xf0386fac),
+              TOBN(0x3b62ff12, 0xd1fca751),
+              TOBN(0x154181df, 0x1b7a04ec),
+              TOBN(0x2008e04a, 0xfb5847ec),
+              TOBN(0xd147148e, 0x41dbd772),
+              TOBN(0x2b419f73, 0x22942654),
+              TOBN(0x669f30d3, 0xe9c544f7),
+              TOBN(0x52a2c223, 0xc8540149),
+              TOBN(0x5da9ee14, 0x634dfb02),
+              TOBN(0x5f074ff0, 0xf47869f3),
+              TOBN(0x74ee878d, 0xa3933acc),
+              TOBN(0xe6510651, 0x4fe35ed1),
+              TOBN(0xb3eb9482, 0xf1012e7a),
+              TOBN(0x51013cc0, 0xa8a566ae),
+              TOBN(0xdd5e9243, 0x47c00d3b),
+              TOBN(0x7fde089d, 0x946bb0e5),
+              TOBN(0x030754fe, 0xc731b4b3),
+              TOBN(0x12a136a4, 0x99fda062),
+              TOBN(0x7c1064b8, 0x5a1a35bc),
+              TOBN(0xbf1f5763, 0x446c84ef),
+              TOBN(0xed29a56d, 0xa16d4b34),
+              TOBN(0x7fba9d09, 0xdca21c4f),
+              TOBN(0x66d7ac00, 0x6d8de486),
+              TOBN(0x60061987, 0x73a2a5e1),
+              TOBN(0x8b400f86, 0x9da28ff0),
+              TOBN(0x3133f708, 0x43c4599c),
+              TOBN(0x9911c9b8, 0xee28cb0d),
+              TOBN(0xcd7e2874, 0x8e0af61d),
+              TOBN(0x5a85f0f2, 0x72ed91fc),
+              TOBN(0x85214f31, 0x9cd4a373),
+              TOBN(0x881fe5be, 0x1925253c),
+              TOBN(0xd8dc98e0, 0x91e8bc76),
+              TOBN(0x7120affe, 0x585cc3a2),
+              TOBN(0x724952ed, 0x735bf97a),
+              TOBN(0x5581e7dc, 0x3eb34581),
+              TOBN(0x5cbff4f2, 0xe52ee57d),
+              TOBN(0x8d320a0e, 0x87d8cc7b),
+              TOBN(0x9beaa7f3, 0xf1d280d0),
+              TOBN(0x7a0b9571, 0x9beec704),
+              TOBN(0x9126332e, 0x5b7f0057),
+              TOBN(0x01fbc1b4, 0x8ed3bd6d),
+              TOBN(0x35bb2c12, 0xd945eb24),
+              TOBN(0x6404694e, 0x9a8ae255),
+              TOBN(0xb6092eec, 0x8d6abfb3),
+              TOBN(0x4d76143f, 0xcc058865),
+              TOBN(0x7b0a5af2, 0x6e249922),
+              TOBN(0x8aef9440, 0x6a50d353),
+              TOBN(0xe11e4bcc, 0x64f0e07a),
+              TOBN(0x4472993a, 0xa14a90fa),
+              TOBN(0x7706e20c, 0xba0c51d4),
+              TOBN(0xf403292f, 0x1532672d),
+              TOBN(0x52573bfa, 0x21829382),
+              TOBN(0x6a7bb6a9, 0x3b5bdb83),
+              TOBN(0x08da65c0, 0xa4a72318),
+              TOBN(0xc58d22aa, 0x63eb065f),
+              TOBN(0x1717596c, 0x1b15d685),
+              TOBN(0x112df0d0, 0xb266d88b),
+              TOBN(0xf688ae97, 0x5941945a),
+              TOBN(0x487386e3, 0x7c292cac),
+              TOBN(0x42f3b50d, 0x57d6985c),
+              TOBN(0x6da4f998, 0x6a90fc34),
+              TOBN(0xc8f257d3, 0x65ca8a8d),
+              TOBN(0xc2feabca, 0x6951f762),
+              TOBN(0xe1bc81d0, 0x74c323ac),
+              TOBN(0x1bc68f67, 0x251a2a12),
+              TOBN(0x10d86587, 0xbe8a70dc),
+              TOBN(0xd648af7f, 0xf0f84d2e),
+              TOBN(0xf0aa9ebc, 0x6a43ac92),
+              TOBN(0x69e3be04, 0x27596893),
+              TOBN(0xb6bb02a6, 0x45bf452b),
+              TOBN(0x0875c11a, 0xf4c698c8),
+              TOBN(0x6652b5c7, 0xbece3794),
+              TOBN(0x7b3755fd, 0x4f5c0499),
+              TOBN(0x6ea16558, 0xb5532b38),
+              TOBN(0xd1c69889, 0xa2e96ef7),
+              TOBN(0x9c773c3a, 0x61ed8f48),
+              TOBN(0x2b653a40, 0x9b323abc),
+              TOBN(0xe26605e1, 0xf0e1d791),
+              TOBN(0x45d41064, 0x4a87157a),
+              TOBN(0x8f9a78b7, 0xcbbce616),
+              TOBN(0xcf1e44aa, 0xc407eddd),
+              TOBN(0x81ddd1d8, 0xa35b964f),
+              TOBN(0x473e339e, 0xfd083999),
+              TOBN(0x6c94bdde, 0x8e796802),
+              TOBN(0x5a304ada, 0x8545d185),
+              TOBN(0x82ae44ea, 0x738bb8cb),
+              TOBN(0x628a35e3, 0xdf87e10e),
+              TOBN(0xd3624f3d, 0xa15b9fe3),
+              TOBN(0xcc44209b, 0x14be4254),
+              TOBN(0x7d0efcbc, 0xbdbc2ea5),
+              TOBN(0x1f603362, 0x04c37bbe),
+              TOBN(0x21f363f5, 0x56a5852c),
+              TOBN(0xa1503d1c, 0xa8501550),
+              TOBN(0x2251e0e1, 0xd8ab10bb),
+              TOBN(0xde129c96, 0x6961c51c),
+              TOBN(0x1f7246a4, 0x81910f68),
+              TOBN(0x2eb744ee, 0x5f2591f2),
+              TOBN(0x3c47d33f, 0x5e627157),
+              TOBN(0x4d6d62c9, 0x22f3bd68),
+              TOBN(0x6120a64b, 0xcb8df856),
+              TOBN(0x3a9ac6c0, 0x7b5d07df),
+              TOBN(0xa92b9558, 0x7ef39783),
+              TOBN(0xe128a134, 0xab3a9b4f),
+              TOBN(0x41c18807, 0xb1252f05),
+              TOBN(0xfc7ed089, 0x80ba9b1c),
+              TOBN(0xac8dc6de, 0xc532a9dd),
+              TOBN(0xbf829cef, 0x55246809),
+              TOBN(0x101b784f, 0x5b4ee80f),
+              TOBN(0xc09945bb, 0xb6f11603),
+              TOBN(0x57b09dbe, 0x41d2801e),
+              TOBN(0xfba5202f, 0xa97534a8),
+              TOBN(0x7fd8ae5f, 0xc17b9614),
+              TOBN(0xa50ba666, 0x78308435),
+              TOBN(0x9572f77c, 0xd3868c4d),
+              TOBN(0x0cef7bfd, 0x2dd7aab0),
+              TOBN(0xe7958e08, 0x2c7c79ff),
+              TOBN(0x81262e42, 0x25346689),
+              TOBN(0x716da290, 0xb07c7004),
+              TOBN(0x35f911ea, 0xb7950ee3),
+              TOBN(0x6fd72969, 0x261d21b5),
+              TOBN(0x52389803, 0x08b640d3),
+              TOBN(0x5b0026ee, 0x887f12a1),
+              TOBN(0x20e21660, 0x742e9311),
+              TOBN(0x0ef6d541, 0x5ff77ff7),
+              TOBN(0x969127f0, 0xf9c41135),
+              TOBN(0xf21d60c9, 0x68a64993),
+              TOBN(0x656e5d0c, 0xe541875c),
+              TOBN(0xf1e0f84e, 0xa1d3c233),
+              TOBN(0x9bcca359, 0x06002d60),
+              TOBN(0xbe2da60c, 0x06191552),
+              TOBN(0x5da8bbae, 0x61181ec3),
+              TOBN(0x9f04b823, 0x65806f19),
+              TOBN(0xf1604a7d, 0xd4b79bb8),
+              TOBN(0xaee806fb, 0x52c878c8),
+              TOBN(0x34144f11, 0x8d47b8e8),
+              TOBN(0x72edf52b, 0x949f9054),
+              TOBN(0xebfca84e, 0x2127015a),
+              TOBN(0x9051d0c0, 0x9cb7cef3),
+              TOBN(0x86e8fe58, 0x296deec8),
+              TOBN(0x33b28188, 0x41010d74),
+          },
+          {
+              TOBN(0x01079383, 0x171b445f),
+              TOBN(0x9bcf21e3, 0x8131ad4c),
+              TOBN(0x8cdfe205, 0xc93987e8),
+              TOBN(0xe63f4152, 0xc92e8c8f),
+              TOBN(0x729462a9, 0x30add43d),
+              TOBN(0x62ebb143, 0xc980f05a),
+              TOBN(0x4f3954e5, 0x3b06e968),
+              TOBN(0xfe1d75ad, 0x242cf6b1),
+              TOBN(0x5f95c6c7, 0xaf8685c8),
+              TOBN(0xd4c1c8ce, 0x2f8f01aa),
+              TOBN(0xc44bbe32, 0x2574692a),
+              TOBN(0xb8003478, 0xd4a4a068),
+              TOBN(0x7c8fc6e5, 0x2eca3cdb),
+              TOBN(0xea1db16b, 0xec04d399),
+              TOBN(0xb05bc82e, 0x8f2bc5cf),
+              TOBN(0x763d517f, 0xf44793d2),
+              TOBN(0x4451c1b8, 0x08bd98d0),
+              TOBN(0x644b1cd4, 0x6575f240),
+              TOBN(0x6907eb33, 0x7375d270),
+              TOBN(0x56c8bebd, 0xfa2286bd),
+              TOBN(0xc713d2ac, 0xc4632b46),
+              TOBN(0x17da427a, 0xafd60242),
+              TOBN(0x313065b7, 0xc95c7546),
+              TOBN(0xf8239898, 0xbf17a3de),
+              TOBN(0xf3b7963f, 0x4c830320),
+              TOBN(0x842c7aa0, 0x903203e3),
+              TOBN(0xaf22ca0a, 0xe7327afb),
+              TOBN(0x38e13092, 0x967609b6),
+              TOBN(0x73b8fb62, 0x757558f1),
+              TOBN(0x3cc3e831, 0xf7eca8c1),
+              TOBN(0xe4174474, 0xf6331627),
+              TOBN(0xa77989ca, 0xc3c40234),
+              TOBN(0xe5fd17a1, 0x44a081e0),
+              TOBN(0xd797fb7d, 0xb70e296a),
+              TOBN(0x2b472b30, 0x481f719c),
+              TOBN(0x0e632a98, 0xfe6f8c52),
+              TOBN(0x89ccd116, 0xc5f0c284),
+              TOBN(0xf51088af, 0x2d987c62),
+              TOBN(0x2a2bccda, 0x4c2de6cf),
+              TOBN(0x810f9efe, 0xf679f0f9),
+              TOBN(0xb0f394b9, 0x7ffe4b3e),
+              TOBN(0x0b691d21, 0xe5fa5d21),
+              TOBN(0xb0bd7747, 0x9dfbbc75),
+              TOBN(0xd2830fda, 0xfaf78b00),
+              TOBN(0xf78c249c, 0x52434f57),
+              TOBN(0x4b1f7545, 0x98096dab),
+              TOBN(0x73bf6f94, 0x8ff8c0b3),
+              TOBN(0x34aef03d, 0x454e134c),
+              TOBN(0xf8d151f4, 0xb7ac7ec5),
+              TOBN(0xd6ceb95a, 0xe50da7d5),
+              TOBN(0xa1b492b0, 0xdc3a0eb8),
+              TOBN(0x75157b69, 0xb3dd2863),
+              TOBN(0xe2c4c74e, 0xc5413d62),
+              TOBN(0xbe329ff7, 0xbc5fc4c7),
+              TOBN(0x835a2aea, 0x60fa9dda),
+              TOBN(0xf117f5ad, 0x7445cb87),
+              TOBN(0xae8317f4, 0xb0166f7a),
+              TOBN(0xfbd3e3f7, 0xceec74e6),
+              TOBN(0xfdb516ac, 0xe0874bfd),
+              TOBN(0x3d846019, 0xc681f3a3),
+              TOBN(0x0b12ee5c, 0x7c1620b0),
+              TOBN(0xba68b4dd, 0x2b63c501),
+              TOBN(0xac03cd32, 0x6668c51e),
+              TOBN(0x2a6279f7, 0x4e0bcb5b),
+              TOBN(0x17bd69b0, 0x6ae85c10),
+              TOBN(0x72946979, 0x1dfdd3a6),
+              TOBN(0xd9a03268, 0x2c078bec),
+              TOBN(0x41c6a658, 0xbfd68a52),
+              TOBN(0xcdea1024, 0x0e023900),
+              TOBN(0xbaeec121, 0xb10d144d),
+              TOBN(0x5a600e74, 0x058ab8dc),
+              TOBN(0x1333af21, 0xbb89ccdd),
+              TOBN(0xdf25eae0, 0x3aaba1f1),
+              TOBN(0x2cada16e, 0x3b7144cf),
+              TOBN(0x657ee27d, 0x71ab98bc),
+              TOBN(0x99088b4c, 0x7a6fc96e),
+              TOBN(0x05d5c0a0, 0x3549dbd4),
+              TOBN(0x42cbdf8f, 0xf158c3ac),
+              TOBN(0x3fb6b3b0, 0x87edd685),
+              TOBN(0x22071cf6, 0x86f064d0),
+              TOBN(0xd2d6721f, 0xff2811e5),
+              TOBN(0xdb81b703, 0xfe7fae8c),
+              TOBN(0x3cfb74ef, 0xd3f1f7bb),
+              TOBN(0x0cdbcd76, 0x16cdeb5d),
+              TOBN(0x4f39642a, 0x566a808c),
+              TOBN(0x02b74454, 0x340064d6),
+              TOBN(0xfabbadca, 0x0528fa6f),
+              TOBN(0xe4c3074c, 0xd3fc0bb6),
+              TOBN(0xb32cb8b0, 0xb796d219),
+              TOBN(0xc3e95f4f, 0x34741dd9),
+              TOBN(0x87212125, 0x68edf6f5),
+              TOBN(0x7a03aee4, 0xa2b9cb8e),
+              TOBN(0x0cd3c376, 0xf53a89aa),
+              TOBN(0x0d8af9b1, 0x948a28dc),
+              TOBN(0xcf86a3f4, 0x902ab04f),
+              TOBN(0x8aacb62a, 0x7f42002d),
+              TOBN(0x106985eb, 0xf62ffd52),
+              TOBN(0xe670b54e, 0x5797bf10),
+              TOBN(0x4b405209, 0xc5e30aef),
+              TOBN(0x12c97a20, 0x4365b5e9),
+              TOBN(0x104646ce, 0x1fe32093),
+              TOBN(0x13cb4ff6, 0x3907a8c9),
+              TOBN(0x8b9f30d1, 0xd46e726b),
+              TOBN(0xe1985e21, 0xaba0f499),
+              TOBN(0xc573dea9, 0x10a230cd),
+              TOBN(0x24f46a93, 0xcd30f947),
+              TOBN(0xf2623fcf, 0xabe2010a),
+              TOBN(0x3f278cb2, 0x73f00e4f),
+              TOBN(0xed55c67d, 0x50b920eb),
+              TOBN(0xf1cb9a2d, 0x8e760571),
+              TOBN(0x7c50d109, 0x0895b709),
+              TOBN(0x4207cf07, 0x190d4369),
+              TOBN(0x3b027e81, 0xc4127fe1),
+              TOBN(0xa9f8b9ad, 0x3ae9c566),
+              TOBN(0x5ab10851, 0xacbfbba5),
+              TOBN(0xa747d648, 0x569556f5),
+              TOBN(0xcc172b5c, 0x2ba97bf7),
+              TOBN(0x15e0f77d, 0xbcfa3324),
+              TOBN(0xa345b797, 0x7686279d),
+              TOBN(0x5a723480, 0xe38003d3),
+              TOBN(0xfd8e139f, 0x8f5fcda8),
+              TOBN(0xf3e558c4, 0xbdee5bfd),
+              TOBN(0xd76cbaf4, 0xe33f9f77),
+              TOBN(0x3a4c97a4, 0x71771969),
+              TOBN(0xda27e84b, 0xf6dce6a7),
+              TOBN(0xff373d96, 0x13e6c2d1),
+              TOBN(0xf115193c, 0xd759a6e9),
+              TOBN(0x3f9b7025, 0x63d2262c),
+              TOBN(0xd9764a31, 0x317cd062),
+              TOBN(0x30779d8e, 0x199f8332),
+              TOBN(0xd8074106, 0x16b11b0b),
+              TOBN(0x7917ab9f, 0x78aeaed8),
+              TOBN(0xb67a9cbe, 0x28fb1d8e),
+              TOBN(0x2e313563, 0x136eda33),
+              TOBN(0x010b7069, 0xa371a86c),
+              TOBN(0x44d90fa2, 0x6744e6b7),
+              TOBN(0x68190867, 0xd6b3e243),
+              TOBN(0x9fe6cd9d, 0x59048c48),
+              TOBN(0xb900b028, 0x95731538),
+              TOBN(0xa012062f, 0x32cae04f),
+              TOBN(0x8107c8bc, 0x9399d082),
+              TOBN(0x47e8c54a, 0x41df12e2),
+              TOBN(0x14ba5117, 0xb6ef3f73),
+              TOBN(0x22260bea, 0x81362f0b),
+              TOBN(0x90ea261e, 0x1a18cc20),
+              TOBN(0x2192999f, 0x2321d636),
+              TOBN(0xef64d314, 0xe311b6a0),
+              TOBN(0xd7401e4c, 0x3b54a1f5),
+              TOBN(0x19019983, 0x6fbca2ba),
+              TOBN(0x46ad3293, 0x8fbffc4b),
+              TOBN(0xa142d3f6, 0x3786bf40),
+              TOBN(0xeb5cbc26, 0xb67039fc),
+              TOBN(0x9cb0ae6c, 0x252bd479),
+              TOBN(0x05e0f88a, 0x12b5848f),
+              TOBN(0x78f6d2b2, 0xa5c97663),
+              TOBN(0x6f6e149b, 0xc162225c),
+              TOBN(0xe602235c, 0xde601a89),
+              TOBN(0xd17bbe98, 0xf373be1f),
+              TOBN(0xcaf49a5b, 0xa8471827),
+              TOBN(0x7e1a0a85, 0x18aaa116),
+              TOBN(0x6c833196, 0x270580c3),
+              TOBN(0x1e233839, 0xf1c98a14),
+              TOBN(0x67b2f7b4, 0xae34e0a5),
+              TOBN(0x47ac8745, 0xd8ce7289),
+              TOBN(0x2b74779a, 0x100dd467),
+              TOBN(0x274a4337, 0x4ee50d09),
+              TOBN(0x603dcf13, 0x83608bc9),
+              TOBN(0xcd9da6c3, 0xc89e8388),
+              TOBN(0x2660199f, 0x355116ac),
+              TOBN(0xcc38bb59, 0xb6d18eed),
+              TOBN(0x3075f31f, 0x2f4bc071),
+              TOBN(0x9774457f, 0x265dc57e),
+              TOBN(0x06a6a9c8, 0xc6db88bb),
+              TOBN(0x6429d07f, 0x4ec98e04),
+              TOBN(0x8d05e57b, 0x05ecaa8b),
+              TOBN(0x20f140b1, 0x7872ea7b),
+              TOBN(0xdf8c0f09, 0xca494693),
+              TOBN(0x48d3a020, 0xf252e909),
+              TOBN(0x4c5c29af, 0x57b14b12),
+              TOBN(0x7e6fa37d, 0xbf47ad1c),
+              TOBN(0x66e7b506, 0x49a0c938),
+              TOBN(0xb72c0d48, 0x6be5f41f),
+              TOBN(0x6a6242b8, 0xb2359412),
+              TOBN(0xcd35c774, 0x8e859480),
+              TOBN(0x12536fea, 0x87baa627),
+              TOBN(0x58c1fec1, 0xf72aa680),
+              TOBN(0x6c29b637, 0x601e5dc9),
+              TOBN(0x9e3c3c1c, 0xde9e01b9),
+              TOBN(0xefc8127b, 0x2bcfe0b0),
+              TOBN(0x35107102, 0x2a12f50d),
+              TOBN(0x6ccd6cb1, 0x4879b397),
+              TOBN(0xf792f804, 0xf8a82f21),
+              TOBN(0x509d4804, 0xa9b46402),
+              TOBN(0xedddf85d, 0xc10f0850),
+              TOBN(0x928410dc, 0x4b6208aa),
+              TOBN(0xf6229c46, 0x391012dc),
+              TOBN(0xc5a7c41e, 0x7727b9b6),
+              TOBN(0x289e4e4b, 0xaa444842),
+              TOBN(0x049ba1d9, 0xe9a947ea),
+              TOBN(0x44f9e47f, 0x83c8debc),
+              TOBN(0xfa77a1fe, 0x611f8b8e),
+              TOBN(0xfd2e416a, 0xf518f427),
+              TOBN(0xc5fffa70, 0x114ebac3),
+              TOBN(0xfe57c4e9, 0x5d89697b),
+              TOBN(0xfdd053ac, 0xb1aaf613),
+              TOBN(0x31df210f, 0xea585a45),
+              TOBN(0x318cc10e, 0x24985034),
+              TOBN(0x1a38efd1, 0x5f1d6130),
+              TOBN(0xbf86f237, 0x0b1e9e21),
+              TOBN(0xb258514d, 0x1dbe88aa),
+              TOBN(0x1e38a588, 0x90c1baf9),
+              TOBN(0x2936a01e, 0xbdb9b692),
+              TOBN(0xd576de98, 0x6dd5b20c),
+              TOBN(0xb586bf71, 0x70f98ecf),
+              TOBN(0xcccf0f12, 0xc42d2fd7),
+              TOBN(0x8717e61c, 0xfb35bd7b),
+              TOBN(0x8b1e5722, 0x35e6fc06),
+              TOBN(0x3477728f, 0x0b3e13d5),
+              TOBN(0x150c294d, 0xaa8a7372),
+              TOBN(0xc0291d43, 0x3bfa528a),
+              TOBN(0xc6c8bc67, 0xcec5a196),
+              TOBN(0xdeeb31e4, 0x5c2e8a7c),
+              TOBN(0xba93e244, 0xfb6e1c51),
+              TOBN(0xb9f8b71b, 0x2e28e156),
+              TOBN(0xce65a287, 0x968a2ab9),
+              TOBN(0xe3c5ce69, 0x46bbcb1f),
+              TOBN(0xf8c835b9, 0xe7ae3f30),
+              TOBN(0x16bbee26, 0xff72b82b),
+              TOBN(0x665e2017, 0xfd42cd22),
+              TOBN(0x1e139970, 0xf8b1d2a0),
+              TOBN(0x125cda29, 0x79204932),
+              TOBN(0x7aee94a5, 0x49c3bee5),
+              TOBN(0x68c70160, 0x89821a66),
+              TOBN(0xf7c37678, 0x8f981669),
+              TOBN(0xd90829fc, 0x48cc3645),
+              TOBN(0x346af049, 0xd70addfc),
+              TOBN(0x2057b232, 0x370bf29c),
+              TOBN(0xf90c73ce, 0x42e650ee),
+              TOBN(0xe03386ea, 0xa126ab90),
+              TOBN(0x0e266e7e, 0x975a087b),
+              TOBN(0x80578eb9, 0x0fca65d9),
+              TOBN(0x7e2989ea, 0x16af45b8),
+              TOBN(0x7438212d, 0xcac75a4e),
+              TOBN(0x38c7ca39, 0x4fef36b8),
+              TOBN(0x8650c494, 0xd402676a),
+              TOBN(0x26ab5a66, 0xf72c7c48),
+              TOBN(0x4e6cb426, 0xce3a464e),
+              TOBN(0xf8f99896, 0x2b72f841),
+              TOBN(0x8c318491, 0x1a335cc8),
+              TOBN(0x563459ba, 0x6a5913e4),
+              TOBN(0x1b920d61, 0xc7b32919),
+              TOBN(0x805ab8b6, 0xa02425ad),
+              TOBN(0x2ac512da, 0x8d006086),
+              TOBN(0x6ca4846a, 0xbcf5c0fd),
+              TOBN(0xafea51d8, 0xac2138d7),
+              TOBN(0xcb647545, 0x344cd443),
+              TOBN(0x0429ee8f, 0xbd7d9040),
+              TOBN(0xee66a2de, 0x819b9c96),
+              TOBN(0x54f9ec25, 0xdea7d744),
+              TOBN(0x2ffea642, 0x671721bb),
+              TOBN(0x4f19dbd1, 0x114344ea),
+              TOBN(0x04304536, 0xfd0dbc8b),
+              TOBN(0x014b50aa, 0x29ec7f91),
+              TOBN(0xb5fc22fe, 0xbb06014d),
+              TOBN(0x60d963a9, 0x1ee682e0),
+              TOBN(0xdf48abc0, 0xfe85c727),
+              TOBN(0x0cadba13, 0x2e707c2d),
+              TOBN(0xde608d3a, 0xa645aeff),
+              TOBN(0x05f1c28b, 0xedafd883),
+              TOBN(0x3c362ede, 0xbd94de1f),
+              TOBN(0x8dd0629d, 0x13593e41),
+              TOBN(0x0a5e736f, 0x766d6eaf),
+              TOBN(0xbfa92311, 0xf68cf9d1),
+              TOBN(0xa4f9ef87, 0xc1797556),
+              TOBN(0x10d75a1f, 0x5601c209),
+              TOBN(0x651c374c, 0x09b07361),
+              TOBN(0x49950b58, 0x88b5cead),
+              TOBN(0x0ef00058, 0x6fa9dbaa),
+              TOBN(0xf51ddc26, 0x4e15f33a),
+              TOBN(0x1f8b5ca6, 0x2ef46140),
+              TOBN(0x343ac0a3, 0xee9523f0),
+              TOBN(0xbb75eab2, 0x975ea978),
+              TOBN(0x1bccf332, 0x107387f4),
+              TOBN(0x790f9259, 0x9ab0062e),
+              TOBN(0xf1a363ad, 0x1e4f6a5f),
+              TOBN(0x06e08b84, 0x62519a50),
+              TOBN(0x60915187, 0x7265f1ee),
+              TOBN(0x6a80ca34, 0x93ae985e),
+              TOBN(0x81b29768, 0xaaba4864),
+              TOBN(0xb13cabf2, 0x8d52a7d6),
+              TOBN(0xb5c36348, 0x8ead03f1),
+              TOBN(0xc932ad95, 0x81c7c1c0),
+              TOBN(0x5452708e, 0xcae1e27b),
+              TOBN(0x9dac4269, 0x1b0df648),
+              TOBN(0x233e3f0c, 0xdfcdb8bc),
+              TOBN(0xe6ceccdf, 0xec540174),
+              TOBN(0xbd0d845e, 0x95081181),
+              TOBN(0xcc8a7920, 0x699355d5),
+              TOBN(0x111c0f6d, 0xc3b375a8),
+              TOBN(0xfd95bc6b, 0xfd51e0dc),
+              TOBN(0x4a106a26, 0x6888523a),
+              TOBN(0x4d142bd6, 0xcb01a06d),
+              TOBN(0x79bfd289, 0xadb9b397),
+              TOBN(0x0bdbfb94, 0xe9863914),
+              TOBN(0x29d8a229, 0x1660f6a6),
+              TOBN(0x7f6abcd6, 0x551c042d),
+              TOBN(0x13039deb, 0x0ac3ffe8),
+              TOBN(0xa01be628, 0xec8523fb),
+              TOBN(0x6ea34103, 0x0ca1c328),
+              TOBN(0xc74114bd, 0xb903928e),
+              TOBN(0x8aa4ff4e, 0x9e9144b0),
+              TOBN(0x7064091f, 0x7f9a4b17),
+              TOBN(0xa3f4f521, 0xe447f2c4),
+              TOBN(0x81b8da7a, 0x604291f0),
+              TOBN(0xd680bc46, 0x7d5926de),
+              TOBN(0x84f21fd5, 0x34a1202f),
+              TOBN(0x1d1e3181, 0x4e9df3d8),
+              TOBN(0x1ca4861a, 0x39ab8d34),
+              TOBN(0x809ddeec, 0x5b19aa4a),
+              TOBN(0x59f72f7e, 0x4d329366),
+              TOBN(0xa2f93f41, 0x386d5087),
+              TOBN(0x40bf739c, 0xdd67d64f),
+              TOBN(0xb4494205, 0x66702158),
+              TOBN(0xc33c65be, 0x73b1e178),
+              TOBN(0xcdcd657c, 0x38ca6153),
+              TOBN(0x97f4519a, 0xdc791976),
+              TOBN(0xcc7c7f29, 0xcd6e1f39),
+              TOBN(0x38de9cfb, 0x7e3c3932),
+              TOBN(0xe448eba3, 0x7b793f85),
+              TOBN(0xe9f8dbf9, 0xf067e914),
+              TOBN(0xc0390266, 0xf114ae87),
+              TOBN(0x39ed75a7, 0xcd6a8e2a),
+              TOBN(0xadb14848, 0x7ffba390),
+              TOBN(0x67f8cb8b, 0x6af9bc09),
+              TOBN(0x322c3848, 0x9c7476db),
+              TOBN(0xa320fecf, 0x52a538d6),
+              TOBN(0xe0493002, 0xb2aced2b),
+              TOBN(0xdfba1809, 0x616bd430),
+              TOBN(0x531c4644, 0xc331be70),
+              TOBN(0xbc04d32e, 0x90d2e450),
+              TOBN(0x1805a0d1, 0x0f9f142d),
+              TOBN(0x2c44a0c5, 0x47ee5a23),
+              TOBN(0x31875a43, 0x3989b4e3),
+              TOBN(0x6b1949fd, 0x0c063481),
+              TOBN(0x2dfb9e08, 0xbe0f4492),
+              TOBN(0x3ff0da03, 0xe9d5e517),
+              TOBN(0x03dbe9a1, 0xf79466a8),
+              TOBN(0x0b87bcd0, 0x15ea9932),
+              TOBN(0xeb64fc83, 0xab1f58ab),
+              TOBN(0x6d9598da, 0x817edc8a),
+              TOBN(0x699cff66, 0x1d3b67e5),
+              TOBN(0x645c0f29, 0x92635853),
+              TOBN(0x253cdd82, 0xeabaf21c),
+              TOBN(0x82b9602a, 0x2241659e),
+              TOBN(0x2cae07ec, 0x2d9f7091),
+              TOBN(0xbe4c720c, 0x8b48cd9b),
+              TOBN(0x6ce5bc03, 0x6f08d6c9),
+              TOBN(0x36e8a997, 0xaf10bf40),
+              TOBN(0x83422d21, 0x3e10ff12),
+              TOBN(0x7b26d3eb, 0xbcc12494),
+              TOBN(0xb240d2d0, 0xc9469ad6),
+              TOBN(0xc4a11b4d, 0x30afa05b),
+              TOBN(0x4b604ace, 0xdd6ba286),
+              TOBN(0x18486600, 0x3ee2864c),
+              TOBN(0x5869d6ba, 0x8d9ce5be),
+              TOBN(0x0d8f68c5, 0xff4bfb0d),
+              TOBN(0xb69f210b, 0x5700cf73),
+              TOBN(0x61f6653a, 0x6d37c135),
+              TOBN(0xff3d432b, 0x5aff5a48),
+              TOBN(0x0d81c4b9, 0x72ba3a69),
+              TOBN(0xee879ae9, 0xfa1899ef),
+              TOBN(0xbac7e2a0, 0x2d6acafd),
+              TOBN(0xd6d93f6c, 0x1c664399),
+              TOBN(0x4c288de1, 0x5bcb135d),
+              TOBN(0x83031dab, 0x9dab7cbf),
+              TOBN(0xfe23feb0, 0x3abbf5f0),
+              TOBN(0x9f1b2466, 0xcdedca85),
+              TOBN(0x140bb710, 0x1a09538c),
+              TOBN(0xac8ae851, 0x5e11115d),
+              TOBN(0x0d63ff67, 0x6f03f59e),
+              TOBN(0x755e5551, 0x7d234afb),
+              TOBN(0x61c2db4e, 0x7e208fc1),
+              TOBN(0xaa9859ce, 0xf28a4b5d),
+              TOBN(0xbdd6d4fc, 0x34af030f),
+              TOBN(0xd1c4a26d, 0x3be01cb1),
+              TOBN(0x9ba14ffc, 0x243aa07c),
+              TOBN(0xf95cd3a9, 0xb2503502),
+              TOBN(0xe379bc06, 0x7d2a93ab),
+              TOBN(0x3efc18e9, 0xd4ca8d68),
+              TOBN(0x083558ec, 0x80bb412a),
+              TOBN(0xd903b940, 0x9645a968),
+              TOBN(0xa499f0b6, 0x9ba6054f),
+              TOBN(0x208b573c, 0xb8349abe),
+              TOBN(0x3baab3e5, 0x30b4fc1c),
+              TOBN(0x87e978ba, 0xcb524990),
+              TOBN(0x3524194e, 0xccdf0e80),
+              TOBN(0x62711725, 0x7d4bcc42),
+              TOBN(0xe90a3d9b, 0xb90109ba),
+              TOBN(0x3b1bdd57, 0x1323e1e0),
+              TOBN(0xb78e9bd5, 0x5eae1599),
+              TOBN(0x0794b746, 0x9e03d278),
+              TOBN(0x80178605, 0xd70e6297),
+              TOBN(0x171792f8, 0x99c97855),
+              TOBN(0x11b393ee, 0xf5a86b5c),
+              TOBN(0x48ef6582, 0xd8884f27),
+              TOBN(0xbd44737a, 0xbf19ba5f),
+              TOBN(0x8698de4c, 0xa42062c6),
+              TOBN(0x8975eb80, 0x61ce9c54),
+              TOBN(0xd50e57c7, 0xd7fe71f3),
+              TOBN(0x15342190, 0xbc97ce38),
+              TOBN(0x51bda2de, 0x4df07b63),
+              TOBN(0xba12aeae, 0x200eb87d),
+              TOBN(0xabe135d2, 0xa9b4f8f6),
+              TOBN(0x04619d65, 0xfad6d99c),
+              TOBN(0x4a6683a7, 0x7994937c),
+              TOBN(0x7a778c8b, 0x6f94f09a),
+              TOBN(0x8c508623, 0x20a71b89),
+              TOBN(0x241a2aed, 0x1c229165),
+              TOBN(0x352be595, 0xaaf83a99),
+              TOBN(0x9fbfee7f, 0x1562bac8),
+              TOBN(0xeaf658b9, 0x5c4017e3),
+              TOBN(0x1dc7f9e0, 0x15120b86),
+              TOBN(0xd84f13dd, 0x4c034d6f),
+              TOBN(0x283dd737, 0xeaea3038),
+              TOBN(0x197f2609, 0xcd85d6a2),
+              TOBN(0x6ebbc345, 0xfae60177),
+              TOBN(0xb80f031b, 0x4e12fede),
+              TOBN(0xde55d0c2, 0x07a2186b),
+              TOBN(0x1fb3e37f, 0x24dcdd5a),
+              TOBN(0x8d602da5, 0x7ed191fb),
+              TOBN(0x108fb056, 0x76023e0d),
+              TOBN(0x70178c71, 0x459c20c0),
+              TOBN(0xfad5a386, 0x3fe54cf0),
+              TOBN(0xa4a3ec4f, 0x02bbb475),
+              TOBN(0x1aa5ec20, 0x919d94d7),
+              TOBN(0x5d3b63b5, 0xa81e4ab3),
+              TOBN(0x7fa733d8, 0x5ad3d2af),
+              TOBN(0xfbc586dd, 0xd1ac7a37),
+              TOBN(0x282925de, 0x40779614),
+              TOBN(0xfe0ffffb, 0xe74a242a),
+              TOBN(0x3f39e67f, 0x906151e5),
+              TOBN(0xcea27f5f, 0x55e10649),
+              TOBN(0xdca1d4e1, 0xc17cf7b7),
+              TOBN(0x0c326d12, 0x2fe2362d),
+              TOBN(0x05f7ac33, 0x7dd35df3),
+              TOBN(0x0c3b7639, 0xc396dbdf),
+              TOBN(0x0912f5ac, 0x03b7db1c),
+              TOBN(0x9dea4b70, 0x5c9ed4a9),
+              TOBN(0x475e6e53, 0xaae3f639),
+              TOBN(0xfaba0e7c, 0xfc278bac),
+              TOBN(0x16f9e221, 0x9490375f),
+              TOBN(0xaebf9746, 0xa5a7ed0a),
+              TOBN(0x45f9af3f, 0xf41ad5d6),
+              TOBN(0x03c4623c, 0xb2e99224),
+              TOBN(0x82c5bb5c, 0xb3cf56aa),
+              TOBN(0x64311819, 0x34567ed3),
+              TOBN(0xec57f211, 0x8be489ac),
+              TOBN(0x2821895d, 0xb9a1104b),
+              TOBN(0x610dc875, 0x6064e007),
+              TOBN(0x8e526f3f, 0x5b20d0fe),
+              TOBN(0x6e71ca77, 0x5b645aee),
+              TOBN(0x3d1dcb9f, 0x800e10ff),
+              TOBN(0x36b51162, 0x189cf6de),
+              TOBN(0x2c5a3e30, 0x6bb17353),
+              TOBN(0xc186cd3e, 0x2a6c6fbf),
+              TOBN(0xa74516fa, 0x4bf97906),
+              TOBN(0x5b4b8f4b, 0x279d6901),
+              TOBN(0x0c4e57b4, 0x2b573743),
+              TOBN(0x75fdb229, 0xb6e386b6),
+              TOBN(0xb46793fd, 0x99deac27),
+              TOBN(0xeeec47ea, 0xcf712629),
+              TOBN(0xe965f3c4, 0xcbc3b2dd),
+              TOBN(0x8dd1fb83, 0x425c6559),
+              TOBN(0x7fc00ee6, 0x0af06fda),
+              TOBN(0xe98c9225, 0x33d956df),
+              TOBN(0x0f1ef335, 0x4fbdc8a2),
+              TOBN(0x2abb5145, 0xb79b8ea2),
+              TOBN(0x40fd2945, 0xbdbff288),
+              TOBN(0x6a814ac4, 0xd7185db7),
+              TOBN(0xc4329d6f, 0xc084609a),
+              TOBN(0xc9ba7b52, 0xed1be45d),
+              TOBN(0x891dd20d, 0xe4cd2c74),
+              TOBN(0x5a4d4a7f, 0x824139b1),
+              TOBN(0x66c17716, 0xb873c710),
+              TOBN(0x5e5bc141, 0x2843c4e0),
+              TOBN(0xd5ac4817, 0xb97eb5bf),
+              TOBN(0xc0f8af54, 0x450c95c7),
+              TOBN(0xc91b3fa0, 0x318406c5),
+              TOBN(0x360c340a, 0xab9d97f8),
+              TOBN(0xfb57bd07, 0x90a2d611),
+              TOBN(0x4339ae3c, 0xa6a6f7e5),
+              TOBN(0x9c1fcd2a, 0x2feb8a10),
+              TOBN(0x972bcca9, 0xc7ea7432),
+              TOBN(0x1b0b924c, 0x308076f6),
+              TOBN(0x80b2814a, 0x2a5b4ca5),
+              TOBN(0x2f78f55b, 0x61ef3b29),
+              TOBN(0xf838744a, 0xc18a414f),
+              TOBN(0xc611eaae, 0x903d0a86),
+              TOBN(0x94dabc16, 0x2a453f55),
+              TOBN(0xe6f2e3da, 0x14efb279),
+              TOBN(0x5b7a6017, 0x9320dc3c),
+              TOBN(0x692e382f, 0x8df6b5a4),
+              TOBN(0x3f5e15e0, 0x2d40fa90),
+              TOBN(0xc87883ae, 0x643dd318),
+              TOBN(0x511053e4, 0x53544774),
+              TOBN(0x834d0ecc, 0x3adba2bc),
+              TOBN(0x4215d7f7, 0xbae371f5),
+              TOBN(0xfcfd57bf, 0x6c8663bc),
+              TOBN(0xded2383d, 0xd6901b1d),
+              TOBN(0x3b49fbb4, 0xb5587dc3),
+              TOBN(0xfd44a08d, 0x07625f62),
+              TOBN(0x3ee4d65b, 0x9de9b762),
+          },
+          {
+              TOBN(0x64e5137d, 0x0d63d1fa),
+              TOBN(0x658fc052, 0x02a9d89f),
+              TOBN(0x48894874, 0x50436309),
+              TOBN(0xe9ae30f8, 0xd598da61),
+              TOBN(0x2ed710d1, 0x818baf91),
+              TOBN(0xe27e9e06, 0x8b6a0c20),
+              TOBN(0x1e28dcfb, 0x1c1a6b44),
+              TOBN(0x883acb64, 0xd6ac57dc),
+              TOBN(0x8735728d, 0xc2c6ff70),
+              TOBN(0x79d6122f, 0xc5dc2235),
+              TOBN(0x23f5d003, 0x19e277f9),
+              TOBN(0x7ee84e25, 0xdded8cc7),
+              TOBN(0x91a8afb0, 0x63cd880a),
+              TOBN(0x3f3ea7c6, 0x3574af60),
+              TOBN(0x0cfcdc84, 0x02de7f42),
+              TOBN(0x62d0792f, 0xb31aa152),
+              TOBN(0x8e1b4e43, 0x8a5807ce),
+              TOBN(0xad283893, 0xe4109a7e),
+              TOBN(0xc30cc9cb, 0xafd59dda),
+              TOBN(0xf65f36c6, 0x3d8d8093),
+              TOBN(0xdf31469e, 0xa60d32b2),
+              TOBN(0xee93df4b, 0x3e8191c8),
+              TOBN(0x9c1017c5, 0x355bdeb5),
+              TOBN(0xd2623185, 0x8616aa28),
+              TOBN(0xb02c83f9, 0xdec31a21),
+              TOBN(0x988c8b23, 0x6ad9d573),
+              TOBN(0x53e983ae, 0xa57be365),
+              TOBN(0xe968734d, 0x646f834e),
+              TOBN(0x9137ea8f, 0x5da6309b),
+              TOBN(0x10f3a624, 0xc1f1ce16),
+              TOBN(0x782a9ea2, 0xca440921),
+              TOBN(0xdf94739e, 0x5b46f1b5),
+              TOBN(0x9f9be006, 0xcce85c9b),
+              TOBN(0x360e70d6, 0xa4c7c2d3),
+              TOBN(0x2cd5beea, 0xaefa1e60),
+              TOBN(0x64cf63c0, 0x8c3d2b6d),
+              TOBN(0xfb107fa3, 0xe1cf6f90),
+              TOBN(0xb7e937c6, 0xd5e044e6),
+              TOBN(0x74e8ca78, 0xce34db9f),
+              TOBN(0x4f8b36c1, 0x3e210bd0),
+              TOBN(0x1df165a4, 0x34a35ea8),
+              TOBN(0x3418e0f7, 0x4d4412f6),
+              TOBN(0x5af1f8af, 0x518836c3),
+              TOBN(0x42ceef4d, 0x130e1965),
+              TOBN(0x5560ca0b, 0x543a1957),
+              TOBN(0xc33761e5, 0x886cb123),
+              TOBN(0x66624b1f, 0xfe98ed30),
+              TOBN(0xf772f4bf, 0x1090997d),
+              TOBN(0xf4e540bb, 0x4885d410),
+              TOBN(0x7287f810, 0x9ba5f8d7),
+              TOBN(0x22d0d865, 0xde98dfb1),
+              TOBN(0x49ff51a1, 0xbcfbb8a3),
+              TOBN(0xb6b6fa53, 0x6bc3012e),
+              TOBN(0x3d31fd72, 0x170d541d),
+              TOBN(0x8018724f, 0x4b0f4966),
+              TOBN(0x79e7399f, 0x87dbde07),
+              TOBN(0x56f8410e, 0xf4f8b16a),
+              TOBN(0x97241afe, 0xc47b266a),
+              TOBN(0x0a406b8e, 0x6d9c87c1),
+              TOBN(0x803f3e02, 0xcd42ab1b),
+              TOBN(0x7f0309a8, 0x04dbec69),
+              TOBN(0xa83b85f7, 0x3bbad05f),
+              TOBN(0xc6097273, 0xad8e197f),
+              TOBN(0xc097440e, 0x5067adc1),
+              TOBN(0x730eafb6, 0x3524ff16),
+              TOBN(0xd7f9b51e, 0x823fc6ce),
+              TOBN(0x27bd0d32, 0x443e4ac0),
+              TOBN(0x40c59ad9, 0x4d66f217),
+              TOBN(0x6c33136f, 0x17c387a4),
+              TOBN(0x5043b8d5, 0xeb86804d),
+              TOBN(0x74970312, 0x675a73c9),
+              TOBN(0x838fdb31, 0xf16669b6),
+              TOBN(0xc507b6dd, 0x418e7ddd),
+              TOBN(0x39888d93, 0x472f19d6),
+              TOBN(0x7eae26be, 0x0c27eb4d),
+              TOBN(0x17b53ed3, 0xfbabb884),
+              TOBN(0xfc27021b, 0x2b01ae4f),
+              TOBN(0x88462e87, 0xcf488682),
+              TOBN(0xbee096ec, 0x215e2d87),
+              TOBN(0xeb2fea9a, 0xd242e29b),
+              TOBN(0x5d985b5f, 0xb821fc28),
+              TOBN(0x89d2e197, 0xdc1e2ad2),
+              TOBN(0x55b566b8, 0x9030ba62),
+              TOBN(0xe3fd41b5, 0x4f41b1c6),
+              TOBN(0xb738ac2e, 0xb9a96d61),
+              TOBN(0x7f8567ca, 0x369443f4),
+              TOBN(0x8698622d, 0xf803a440),
+              TOBN(0x2b586236, 0x8fe2f4dc),
+              TOBN(0xbbcc00c7, 0x56b95bce),
+              TOBN(0x5ec03906, 0x616da680),
+              TOBN(0x79162ee6, 0x72214252),
+              TOBN(0x43132b63, 0x86a892d2),
+              TOBN(0x4bdd3ff2, 0x2f3263bf),
+              TOBN(0xd5b3733c, 0x9cd0a142),
+              TOBN(0x592eaa82, 0x44415ccb),
+              TOBN(0x663e8924, 0x8d5474ea),
+              TOBN(0x8058a25e, 0x5236344e),
+              TOBN(0x82e8df9d, 0xbda76ee6),
+              TOBN(0xdcf6efd8, 0x11cc3d22),
+              TOBN(0x00089cda, 0x3b4ab529),
+              TOBN(0x91d3a071, 0xbd38a3db),
+              TOBN(0x4ea97fc0, 0xef72b925),
+              TOBN(0x0c9fc15b, 0xea3edf75),
+              TOBN(0x5a6297cd, 0xa4348ed3),
+              TOBN(0x0d38ab35, 0xce7c42d4),
+              TOBN(0x9fd493ef, 0x82feab10),
+              TOBN(0x46056b6d, 0x82111b45),
+              TOBN(0xda11dae1, 0x73efc5c3),
+              TOBN(0xdc740278, 0x5545a7fb),
+              TOBN(0xbdb2601c, 0x40d507e6),
+              TOBN(0x121dfeeb, 0x7066fa58),
+              TOBN(0x214369a8, 0x39ae8c2a),
+              TOBN(0x195709cb, 0x06e0956c),
+              TOBN(0x4c9d254f, 0x010cd34b),
+              TOBN(0xf51e13f7, 0x0471a532),
+              TOBN(0xe19d6791, 0x1e73054d),
+              TOBN(0xf702a628, 0xdb5c7be3),
+              TOBN(0xc7141218, 0xb24dde05),
+              TOBN(0xdc18233c, 0xf29b2e2e),
+              TOBN(0x3a6bd1e8, 0x85342dba),
+              TOBN(0x3f747fa0, 0xb311898c),
+              TOBN(0xe2a272e4, 0xcd0eac65),
+              TOBN(0x4bba5851, 0xf914d0bc),
+              TOBN(0x7a1a9660, 0xc4a43ee3),
+              TOBN(0xe5a367ce, 0xa1c8cde9),
+              TOBN(0x9d958ba9, 0x7271abe3),
+              TOBN(0xf3ff7eb6, 0x3d1615cd),
+              TOBN(0xa2280dce, 0xf5ae20b0),
+              TOBN(0x56dba5c1, 0xcf640147),
+              TOBN(0xea5a2e3d, 0x5e83d118),
+              TOBN(0x04cd6b6d, 0xda24c511),
+              TOBN(0x1c0f4671, 0xe854d214),
+              TOBN(0x91a6b7a9, 0x69565381),
+              TOBN(0xdc966240, 0xdecf1f5b),
+              TOBN(0x1b22d21c, 0xfcf5d009),
+              TOBN(0x2a05f641, 0x9021dbd5),
+              TOBN(0x8c0ed566, 0xd4312483),
+              TOBN(0x5179a95d, 0x643e216f),
+              TOBN(0xcc185fec, 0x17044493),
+              TOBN(0xb3063339, 0x54991a21),
+              TOBN(0xd801ecdb, 0x0081a726),
+              TOBN(0x0149b0c6, 0x4fa89bbb),
+              TOBN(0xafe9065a, 0x4391b6b9),
+              TOBN(0xedc92786, 0xd633f3a3),
+              TOBN(0xe408c24a, 0xae6a8e13),
+              TOBN(0x85833fde, 0x9f3897ab),
+              TOBN(0x43800e7e, 0xd81a0715),
+              TOBN(0xde08e346, 0xb44ffc5f),
+              TOBN(0x7094184c, 0xcdeff2e0),
+              TOBN(0x49f9387b, 0x165eaed1),
+              TOBN(0x635d6129, 0x777c468a),
+              TOBN(0x8c0dcfd1, 0x538c2dd8),
+              TOBN(0xd6d9d9e3, 0x7a6a308b),
+              TOBN(0x62375830, 0x4c2767d3),
+              TOBN(0x874a8bc6, 0xf38cbeb6),
+              TOBN(0xd94d3f1a, 0xccb6fd9e),
+              TOBN(0x92a9735b, 0xba21f248),
+              TOBN(0x272ad0e5, 0x6cd1efb0),
+              TOBN(0x7437b69c, 0x05b03284),
+              TOBN(0xe7f04702, 0x6948c225),
+              TOBN(0x8a56c04a, 0xcba2ecec),
+              TOBN(0x0c181270, 0xe3a73e41),
+              TOBN(0x6cb34e9d, 0x03e93725),
+              TOBN(0xf77c8713, 0x496521a9),
+              TOBN(0x94569183, 0xfa7f9f90),
+              TOBN(0xf2e7aa4c, 0x8c9707ad),
+              TOBN(0xced2c9ba, 0x26c1c9a3),
+              TOBN(0x9109fe96, 0x40197507),
+              TOBN(0x9ae868a9, 0xe9adfe1c),
+              TOBN(0x3984403d, 0x314e39bb),
+              TOBN(0xb5875720, 0xf2fe378f),
+              TOBN(0x33f901e0, 0xba44a628),
+              TOBN(0xea1125fe, 0x3652438c),
+              TOBN(0xae9ec4e6, 0x9dd1f20b),
+              TOBN(0x1e740d9e, 0xbebf7fbd),
+              TOBN(0x6dbd3ddc, 0x42dbe79c),
+              TOBN(0x62082aec, 0xedd36776),
+              TOBN(0xf612c478, 0xe9859039),
+              TOBN(0xa493b201, 0x032f7065),
+              TOBN(0xebd4d8f2, 0x4ff9b211),
+              TOBN(0x3f23a0aa, 0xaac4cb32),
+              TOBN(0xea3aadb7, 0x15ed4005),
+              TOBN(0xacf17ea4, 0xafa27e63),
+              TOBN(0x56125c1a, 0xc11fd66c),
+              TOBN(0x266344a4, 0x3794f8dc),
+              TOBN(0xdcca923a, 0x483c5c36),
+              TOBN(0x2d6b6bbf, 0x3f9d10a0),
+              TOBN(0xb320c5ca, 0x81d9bdf3),
+              TOBN(0x620e28ff, 0x47b50a95),
+              TOBN(0x933e3b01, 0xcef03371),
+              TOBN(0xf081bf85, 0x99100153),
+              TOBN(0x183be9a0, 0xc3a8c8d6),
+              TOBN(0x4e3ddc5a, 0xd6bbe24d),
+              TOBN(0xc6c74630, 0x53843795),
+              TOBN(0x78193dd7, 0x65ec2d4c),
+              TOBN(0xb8df26cc, 0xcd3c89b2),
+              TOBN(0x98dbe399, 0x5a483f8d),
+              TOBN(0x72d8a957, 0x7dd3313a),
+              TOBN(0x65087294, 0xab0bd375),
+              TOBN(0xfcd89248, 0x7c259d16),
+              TOBN(0x8a9443d7, 0x7613aa81),
+              TOBN(0x80100800, 0x85fe6584),
+              TOBN(0x70fc4dbc, 0x7fb10288),
+              TOBN(0xf58280d3, 0xe86beee8),
+              TOBN(0x14fdd82f, 0x7c978c38),
+              TOBN(0xdf1204c1, 0x0de44d7b),
+              TOBN(0xa08a1c84, 0x4160252f),
+              TOBN(0x591554ca, 0xc17646a5),
+              TOBN(0x214a37d6, 0xa05bd525),
+              TOBN(0x48d5f09b, 0x07957b3c),
+              TOBN(0x0247cdcb, 0xd7109bc9),
+              TOBN(0x40f9e4bb, 0x30599ce7),
+              TOBN(0xc325fa03, 0xf46ad2ec),
+              TOBN(0x00f766cf, 0xc3e3f9ee),
+              TOBN(0xab556668, 0xd43a4577),
+              TOBN(0x68d30a61, 0x3ee03b93),
+              TOBN(0x7ddc81ea, 0x77b46a08),
+              TOBN(0xcf5a6477, 0xc7480699),
+              TOBN(0x43a8cb34, 0x6633f683),
+              TOBN(0x1b867e6b, 0x92363c60),
+              TOBN(0x43921114, 0x1f60558e),
+              TOBN(0xcdbcdd63, 0x2f41450e),
+              TOBN(0x7fc04601, 0xcc630e8b),
+              TOBN(0xea7c66d5, 0x97038b43),
+              TOBN(0x7259b8a5, 0x04e99fd8),
+              TOBN(0x98a8dd12, 0x4785549a),
+              TOBN(0x0e459a7c, 0x840552e1),
+              TOBN(0xcdfcf4d0, 0x4bb0909e),
+              TOBN(0x34a86db2, 0x53758da7),
+              TOBN(0xe643bb83, 0xeac997e1),
+              TOBN(0x96400bd7, 0x530c5b7e),
+              TOBN(0x9f97af87, 0xb41c8b52),
+              TOBN(0x34fc8820, 0xfbeee3f9),
+              TOBN(0x93e53490, 0x49091afd),
+              TOBN(0x764b9be5, 0x9a31f35c),
+              TOBN(0x71f37864, 0x57e3d924),
+              TOBN(0x02fb34e0, 0x943aa75e),
+              TOBN(0xa18c9c58, 0xab8ff6e4),
+              TOBN(0x080f31b1, 0x33cf0d19),
+              TOBN(0x5c9682db, 0x083518a7),
+              TOBN(0x873d4ca6, 0xb709c3de),
+              TOBN(0x64a84262, 0x3575b8f0),
+              TOBN(0x6275da1f, 0x020154bb),
+              TOBN(0x97678caa, 0xd17cf1ab),
+              TOBN(0x8779795f, 0x951a95c3),
+              TOBN(0xdd35b163, 0x50fccc08),
+              TOBN(0x32709627, 0x33d8f031),
+              TOBN(0x3c5ab10a, 0x498dd85c),
+              TOBN(0xb6c185c3, 0x41dca566),
+              TOBN(0x7de7feda, 0xd8622aa3),
+              TOBN(0x99e84d92, 0x901b6dfb),
+              TOBN(0x30a02b0e, 0x7c4ad288),
+              TOBN(0xc7c81daa, 0x2fd3cf36),
+              TOBN(0xd1319547, 0xdf89e59f),
+              TOBN(0xb2be8184, 0xcd496733),
+              TOBN(0xd5f449eb, 0x93d3412b),
+              TOBN(0x7ea41b1b, 0x25fe531d),
+              TOBN(0xf9797432, 0x6a1d5646),
+              TOBN(0x86067f72, 0x2bde501a),
+              TOBN(0xf91481c0, 0x0c85e89c),
+              TOBN(0xca8ee465, 0xf8b05bc6),
+              TOBN(0x1844e1cf, 0x02e83cda),
+              TOBN(0xca82114a, 0xb4dbe33b),
+              TOBN(0x0f9f8769, 0x4eabfde2),
+              TOBN(0x4936b1c0, 0x38b27fe2),
+              TOBN(0x63b6359b, 0xaba402df),
+              TOBN(0x40c0ea2f, 0x656bdbab),
+              TOBN(0x9c992a89, 0x6580c39c),
+              TOBN(0x600e8f15, 0x2a60aed1),
+              TOBN(0xeb089ca4, 0xe0bf49df),
+              TOBN(0x9c233d7d, 0x2d42d99a),
+              TOBN(0x648d3f95, 0x4c6bc2fa),
+              TOBN(0xdcc383a8, 0xe1add3f3),
+              TOBN(0xf42c0c6a, 0x4f64a348),
+              TOBN(0x2abd176f, 0x0030dbdb),
+              TOBN(0x4de501a3, 0x7d6c215e),
+              TOBN(0x4a107c1f, 0x4b9a64bc),
+              TOBN(0xa77f0ad3, 0x2496cd59),
+              TOBN(0xfb78ac62, 0x7688dffb),
+              TOBN(0x7025a2ca, 0x67937d8e),
+              TOBN(0xfde8b2d1, 0xd1a8f4e7),
+              TOBN(0xf5b3da47, 0x7354927c),
+              TOBN(0xe48606a3, 0xd9205735),
+              TOBN(0xac477cc6, 0xe177b917),
+              TOBN(0xfb1f73d2, 0xa883239a),
+              TOBN(0xe12572f6, 0xcc8b8357),
+              TOBN(0x9d355e9c, 0xfb1f4f86),
+              TOBN(0x89b795f8, 0xd9f3ec6e),
+              TOBN(0x27be56f1, 0xb54398dc),
+              TOBN(0x1890efd7, 0x3fedeed5),
+              TOBN(0x62f77f1f, 0x9c6d0140),
+              TOBN(0x7ef0e314, 0x596f0ee4),
+              TOBN(0x50ca6631, 0xcc61dab3),
+              TOBN(0x4a39801d, 0xf4866e4f),
+              TOBN(0x66c8d032, 0xae363b39),
+              TOBN(0x22c591e5, 0x2ead66aa),
+              TOBN(0x954ba308, 0xde02a53e),
+              TOBN(0x2a6c060f, 0xd389f357),
+              TOBN(0xe6cfcde8, 0xfbf40b66),
+              TOBN(0x8e02fc56, 0xc6340ce1),
+              TOBN(0xe4957795, 0x73adb4ba),
+              TOBN(0x7b86122c, 0xa7b03805),
+              TOBN(0x63f83512, 0x0c8e6fa6),
+              TOBN(0x83660ea0, 0x057d7804),
+              TOBN(0xbad79105, 0x21ba473c),
+              TOBN(0xb6c50bee, 0xded5389d),
+              TOBN(0xee2caf4d, 0xaa7c9bc0),
+              TOBN(0xd97b8de4, 0x8c4e98a7),
+              TOBN(0xa9f63e70, 0xab3bbddb),
+              TOBN(0x3898aabf, 0x2597815a),
+              TOBN(0x7659af89, 0xac15b3d9),
+              TOBN(0xedf7725b, 0x703ce784),
+              TOBN(0x25470fab, 0xe085116b),
+              TOBN(0x04a43375, 0x87285310),
+              TOBN(0x4e39187e, 0xe2bfd52f),
+              TOBN(0x36166b44, 0x7d9ebc74),
+              TOBN(0x92ad433c, 0xfd4b322c),
+              TOBN(0x726aa817, 0xba79ab51),
+              TOBN(0xf96eacd8, 0xc1db15eb),
+              TOBN(0xfaf71e91, 0x0476be63),
+              TOBN(0xdd69a640, 0x641fad98),
+              TOBN(0xb7995918, 0x29622559),
+              TOBN(0x03c6daa5, 0xde4199dc),
+              TOBN(0x92cadc97, 0xad545eb4),
+              TOBN(0x1028238b, 0x256534e4),
+              TOBN(0x73e80ce6, 0x8595409a),
+              TOBN(0x690d4c66, 0xd05dc59b),
+              TOBN(0xc95f7b8f, 0x981dee80),
+              TOBN(0xf4337014, 0xd856ac25),
+              TOBN(0x441bd9dd, 0xac524dca),
+              TOBN(0x640b3d85, 0x5f0499f5),
+              TOBN(0x39cf84a9, 0xd5fda182),
+              TOBN(0x04e7b055, 0xb2aa95a0),
+              TOBN(0x29e33f0a, 0x0ddf1860),
+              TOBN(0x082e74b5, 0x423f6b43),
+              TOBN(0x217edeb9, 0x0aaa2b0f),
+              TOBN(0x58b83f35, 0x83cbea55),
+              TOBN(0xc485ee4d, 0xbc185d70),
+              TOBN(0x833ff03b, 0x1e5f6992),
+              TOBN(0xb5b9b9cc, 0xcf0c0dd5),
+              TOBN(0x7caaee8e, 0x4e9e8a50),
+              TOBN(0x462e907b, 0x6269dafd),
+              TOBN(0x6ed5cee9, 0xfbe791c6),
+              TOBN(0x68ca3259, 0xed430790),
+              TOBN(0x2b72bdf2, 0x13b5ba88),
+              TOBN(0x60294c8a, 0x35ef0ac4),
+              TOBN(0x9c3230ed, 0x19b99b08),
+              TOBN(0x560fff17, 0x6c2589aa),
+              TOBN(0x552b8487, 0xd6770374),
+              TOBN(0xa373202d, 0x9a56f685),
+              TOBN(0xd3e7f907, 0x45f175d9),
+              TOBN(0x3c2f315f, 0xd080d810),
+              TOBN(0x1130e9dd, 0x7b9520e8),
+              TOBN(0xc078f9e2, 0x0af037b5),
+              TOBN(0x38cd2ec7, 0x1e9c104c),
+              TOBN(0x0f684368, 0xc472fe92),
+              TOBN(0xd3f1b5ed, 0x6247e7ef),
+              TOBN(0xb32d33a9, 0x396dfe21),
+              TOBN(0x46f59cf4, 0x4a9aa2c2),
+              TOBN(0x69cd5168, 0xff0f7e41),
+              TOBN(0x3f59da0f, 0x4b3234da),
+              TOBN(0xcf0b0235, 0xb4579ebe),
+              TOBN(0x6d1cbb25, 0x6d2476c7),
+              TOBN(0x4f0837e6, 0x9dc30f08),
+              TOBN(0x9a4075bb, 0x906f6e98),
+              TOBN(0x253bb434, 0xc761e7d1),
+              TOBN(0xde2e645f, 0x6e73af10),
+              TOBN(0xb89a4060, 0x0c5f131c),
+              TOBN(0xd12840c5, 0xb8cc037f),
+              TOBN(0x3d093a5b, 0x7405bb47),
+              TOBN(0x6202c253, 0x206348b8),
+              TOBN(0xbf5d57fc, 0xc55a3ca7),
+              TOBN(0x89f6c90c, 0x8c3bef48),
+              TOBN(0x23ac7623, 0x5a0a960a),
+              TOBN(0xdfbd3d6b, 0x552b42ab),
+              TOBN(0x3ef22458, 0x132061f6),
+              TOBN(0xd74e9bda, 0xc97e6516),
+              TOBN(0x88779360, 0xc230f49e),
+              TOBN(0xa6ec1de3, 0x1e74ea49),
+              TOBN(0x581dcee5, 0x3fb645a2),
+              TOBN(0xbaef2391, 0x8f483f14),
+              TOBN(0x6d2dddfc, 0xd137d13b),
+              TOBN(0x54cde50e, 0xd2743a42),
+              TOBN(0x89a34fc5, 0xe4d97e67),
+              TOBN(0x13f1f5b3, 0x12e08ce5),
+              TOBN(0xa80540b8, 0xa7f0b2ca),
+              TOBN(0x854bcf77, 0x01982805),
+              TOBN(0xb8653ffd, 0x233bea04),
+              TOBN(0x8e7b8787, 0x02b0b4c9),
+              TOBN(0x2675261f, 0x9acb170a),
+              TOBN(0x061a9d90, 0x930c14e5),
+              TOBN(0xb59b30e0, 0xdef0abea),
+              TOBN(0x1dc19ea6, 0x0200ec7d),
+              TOBN(0xb6f4a3f9, 0x0bce132b),
+              TOBN(0xb8d5de90, 0xf13e27e0),
+              TOBN(0xbaee5ef0, 0x1fade16f),
+              TOBN(0x6f406aaa, 0xe4c6cf38),
+              TOBN(0xab4cfe06, 0xd1369815),
+              TOBN(0x0dcffe87, 0xefd550c6),
+              TOBN(0x9d4f59c7, 0x75ff7d39),
+              TOBN(0xb02553b1, 0x51deb6ad),
+              TOBN(0x812399a4, 0xb1877749),
+              TOBN(0xce90f71f, 0xca6006e1),
+              TOBN(0xc32363a6, 0xb02b6e77),
+              TOBN(0x02284fbe, 0xdc36c64d),
+              TOBN(0x86c81e31, 0xa7e1ae61),
+              TOBN(0x2576c7e5, 0xb909d94a),
+              TOBN(0x8b6f7d02, 0x818b2bb0),
+              TOBN(0xeca3ed07, 0x56faa38a),
+              TOBN(0xa3790e6c, 0x9305bb54),
+              TOBN(0xd784eeda, 0x7bc73061),
+              TOBN(0xbd56d369, 0x6dd50614),
+              TOBN(0xd6575949, 0x229a8aa9),
+              TOBN(0xdcca8f47, 0x4595ec28),
+              TOBN(0x814305c1, 0x06ab4fe6),
+              TOBN(0xc8c39768, 0x24f43f16),
+              TOBN(0xe2a45f36, 0x523f2b36),
+              TOBN(0x995c6493, 0x920d93bb),
+              TOBN(0xf8afdab7, 0x90f1632b),
+              TOBN(0x79ebbecd, 0x1c295954),
+              TOBN(0xc7bb3ddb, 0x79592f48),
+              TOBN(0x67216a7b, 0x5f88e998),
+              TOBN(0xd91f098b, 0xbc01193e),
+              TOBN(0xf7d928a5, 0xb1db83fc),
+              TOBN(0x55e38417, 0xe991f600),
+              TOBN(0x2a91113e, 0x2981a934),
+              TOBN(0xcbc9d648, 0x06b13bde),
+              TOBN(0xb011b6ac, 0x0755ff44),
+              TOBN(0x6f4cb518, 0x045ec613),
+              TOBN(0x522d2d31, 0xc2f5930a),
+              TOBN(0x5acae1af, 0x382e65de),
+              TOBN(0x57643067, 0x27bc966f),
+              TOBN(0x5e12705d, 0x1c7193f0),
+              TOBN(0xf0f32f47, 0x3be8858e),
+              TOBN(0x785c3d7d, 0x96c6dfc7),
+              TOBN(0xd75b4a20, 0xbf31795d),
+              TOBN(0x91acf17b, 0x342659d4),
+              TOBN(0xe596ea34, 0x44f0378f),
+              TOBN(0x4515708f, 0xce52129d),
+              TOBN(0x17387e1e, 0x79f2f585),
+              TOBN(0x72cfd2e9, 0x49dee168),
+              TOBN(0x1ae05223, 0x3e2af239),
+              TOBN(0x009e75be, 0x1d94066a),
+              TOBN(0x6cca31c7, 0x38abf413),
+              TOBN(0xb50bd61d, 0x9bc49908),
+              TOBN(0x4a9b4a8c, 0xf5e2bc1e),
+              TOBN(0xeb6cc5f7, 0x946f83ac),
+              TOBN(0x27da93fc, 0xebffab28),
+              TOBN(0xea314c96, 0x4821c8c5),
+              TOBN(0x8de49ded, 0xa83c15f4),
+              TOBN(0x7a64cf20, 0x7af33004),
+              TOBN(0x45f1bfeb, 0xc9627e10),
+              TOBN(0x878b0626, 0x54b9df60),
+              TOBN(0x5e4fdc3c, 0xa95c0b33),
+              TOBN(0xe54a37ca, 0xc2035d8e),
+              TOBN(0x9087cda9, 0x80f20b8c),
+              TOBN(0x36f61c23, 0x8319ade4),
+              TOBN(0x766f287a, 0xde8cfdf8),
+              TOBN(0x48821948, 0x346f3705),
+              TOBN(0x49a7b853, 0x16e4f4a2),
+              TOBN(0xb9b3f8a7, 0x5cedadfd),
+              TOBN(0x8f562815, 0x8db2a815),
+              TOBN(0xc0b7d554, 0x01f68f95),
+              TOBN(0x12971e27, 0x688a208e),
+              TOBN(0xc9f8b696, 0xd0ff34fc),
+              TOBN(0x20824de2, 0x1222718c),
+              TOBN(0x7213cf9f, 0x0c95284d),
+              TOBN(0xe2ad741b, 0xdc158240),
+              TOBN(0x0ee3a6df, 0x54043ccf),
+              TOBN(0x16ff479b, 0xd84412b3),
+              TOBN(0xf6c74ee0, 0xdfc98af0),
+              TOBN(0xa78a169f, 0x52fcd2fb),
+              TOBN(0xd8ae8746, 0x99c930e9),
+              TOBN(0x1d33e858, 0x49e117a5),
+              TOBN(0x7581fcb4, 0x6624759f),
+              TOBN(0xde50644f, 0x5bedc01d),
+              TOBN(0xbeec5d00, 0xcaf3155e),
+              TOBN(0x672d66ac, 0xbc73e75f),
+              TOBN(0x86b9d8c6, 0x270b01db),
+              TOBN(0xd249ef83, 0x50f55b79),
+              TOBN(0x6131d6d4, 0x73978fe3),
+              TOBN(0xcc4e4542, 0x754b00a1),
+              TOBN(0x4e05df05, 0x57dfcfe9),
+              TOBN(0x94b29cdd, 0x51ef6bf0),
+              TOBN(0xe4530cff, 0x9bc7edf2),
+              TOBN(0x8ac236fd, 0xd3da65f3),
+              TOBN(0x0faf7d5f, 0xc8eb0b48),
+              TOBN(0x4d2de14c, 0x660eb039),
+              TOBN(0xc006bba7, 0x60430e54),
+              TOBN(0x10a2d0d6, 0xda3289ab),
+              TOBN(0x9c037a5d, 0xd7979c59),
+              TOBN(0x04d1f3d3, 0xa116d944),
+              TOBN(0x9ff22473, 0x8a0983cd),
+              TOBN(0x28e25b38, 0xc883cabb),
+              TOBN(0xe968dba5, 0x47a58995),
+              TOBN(0x2c80b505, 0x774eebdf),
+              TOBN(0xee763b71, 0x4a953beb),
+              TOBN(0x502e223f, 0x1642e7f6),
+              TOBN(0x6fe4b641, 0x61d5e722),
+              TOBN(0x9d37c5b0, 0xdbef5316),
+              TOBN(0x0115ed70, 0xf8330bc7),
+              TOBN(0x139850e6, 0x75a72789),
+              TOBN(0x27d7faec, 0xffceccc2),
+              TOBN(0x3016a860, 0x4fd9f7f6),
+              TOBN(0xc492ec64, 0x4cd8f64c),
+              TOBN(0x58a2d790, 0x279d7b51),
+              TOBN(0x0ced1fc5, 0x1fc75256),
+              TOBN(0x3e658aed, 0x8f433017),
+              TOBN(0x0b61942e, 0x05da59eb),
+              TOBN(0xba3d60a3, 0x0ddc3722),
+              TOBN(0x7c311cd1, 0x742e7f87),
+              TOBN(0x6473ffee, 0xf6b01b6e),
+          },
+          {
+              TOBN(0x8303604f, 0x692ac542),
+              TOBN(0xf079ffe1, 0x227b91d3),
+              TOBN(0x19f63e63, 0x15aaf9bd),
+              TOBN(0xf99ee565, 0xf1f344fb),
+              TOBN(0x8a1d661f, 0xd6219199),
+              TOBN(0x8c883bc6, 0xd48ce41c),
+              TOBN(0x1065118f, 0x3c74d904),
+              TOBN(0x713889ee, 0x0faf8b1b),
+              TOBN(0x972b3f8f, 0x81a1b3be),
+              TOBN(0x4f3ce145, 0xce2764a0),
+              TOBN(0xe2d0f1cc, 0x28c4f5f7),
+              TOBN(0xdeee0c0d, 0xc7f3985b),
+              TOBN(0x7df4adc0, 0xd39e25c3),
+              TOBN(0x40619820, 0xc467a080),
+              TOBN(0x440ebc93, 0x61cf5a58),
+              TOBN(0x527729a6, 0x422ad600),
+              TOBN(0xca6c0937, 0xb1b76ba6),
+              TOBN(0x1a2eab85, 0x4d2026dc),
+              TOBN(0xb1715e15, 0x19d9ae0a),
+              TOBN(0xf1ad9199, 0xbac4a026),
+              TOBN(0x35b3dfb8, 0x07ea7b0e),
+              TOBN(0xedf5496f, 0x3ed9eb89),
+              TOBN(0x8932e5ff, 0x2d6d08ab),
+              TOBN(0xf314874e, 0x25bd2731),
+              TOBN(0xefb26a75, 0x3f73f449),
+              TOBN(0x1d1c94f8, 0x8d44fc79),
+              TOBN(0x49f0fbc5, 0x3bc0dc4d),
+              TOBN(0xb747ea0b, 0x3698a0d0),
+              TOBN(0x5218c3fe, 0x228d291e),
+              TOBN(0x35b804b5, 0x43c129d6),
+              TOBN(0xfac859b8, 0xd1acc516),
+              TOBN(0x6c10697d, 0x95d6e668),
+              TOBN(0xc38e438f, 0x0876fd4e),
+              TOBN(0x45f0c307, 0x83d2f383),
+              TOBN(0x203cc2ec, 0xb10934cb),
+              TOBN(0x6a8f2439, 0x2c9d46ee),
+              TOBN(0xf16b431b, 0x65ccde7b),
+              TOBN(0x41e2cd18, 0x27e76a6f),
+              TOBN(0xb9c8cf8f, 0x4e3484d7),
+              TOBN(0x64426efd, 0x8315244a),
+              TOBN(0x1c0a8e44, 0xfc94dea3),
+              TOBN(0x34c8cdbf, 0xdad6a0b0),
+              TOBN(0x919c3840, 0x04113cef),
+              TOBN(0xfd32fba4, 0x15490ffa),
+              TOBN(0x58d190f6, 0x795dcfb7),
+              TOBN(0xfef01b03, 0x83588baf),
+              TOBN(0x9e6d1d63, 0xca1fc1c0),
+              TOBN(0x53173f96, 0xf0a41ac9),
+              TOBN(0x2b1d402a, 0xba16f73b),
+              TOBN(0x2fb31014, 0x8cf9b9fc),
+              TOBN(0x2d51e60e, 0x446ef7bf),
+              TOBN(0xc731021b, 0xb91e1745),
+              TOBN(0x9d3b4724, 0x4fee99d4),
+              TOBN(0x4bca48b6, 0xfac5c1ea),
+              TOBN(0x70f5f514, 0xbbea9af7),
+              TOBN(0x751f55a5, 0x974c283a),
+              TOBN(0x6e30251a, 0xcb452fdb),
+              TOBN(0x31ee6965, 0x50f30650),
+              TOBN(0xb0b3e508, 0x933548d9),
+              TOBN(0xb8949a4f, 0xf4b0ef5b),
+              TOBN(0x208b8326, 0x3c88f3bd),
+              TOBN(0xab147c30, 0xdb1d9989),
+              TOBN(0xed6515fd, 0x44d4df03),
+              TOBN(0x17a12f75, 0xe72eb0c5),
+              TOBN(0x3b59796d, 0x36cf69db),
+              TOBN(0x1219eee9, 0x56670c18),
+              TOBN(0xfe3341f7, 0x7a070d8e),
+              TOBN(0x9b70130b, 0xa327f90c),
+              TOBN(0x36a32462, 0x0ae18e0e),
+              TOBN(0x2021a623, 0x46c0a638),
+              TOBN(0x251b5817, 0xc62eb0d4),
+              TOBN(0x87bfbcdf, 0x4c762293),
+              TOBN(0xf78ab505, 0xcdd61d64),
+              TOBN(0x8c7a53fc, 0xc8c18857),
+              TOBN(0xa653ce6f, 0x16147515),
+              TOBN(0x9c923aa5, 0xea7d52d5),
+              TOBN(0xc24709cb, 0x5c18871f),
+              TOBN(0x7d53bec8, 0x73b3cc74),
+              TOBN(0x59264aff, 0xfdd1d4c4),
+              TOBN(0x5555917e, 0x240da582),
+              TOBN(0xcae8bbda, 0x548f5a0e),
+              TOBN(0x1910eaba, 0x3bbfbbe1),
+              TOBN(0xae579685, 0x7677afc3),
+              TOBN(0x49ea61f1, 0x73ff0b5c),
+              TOBN(0x78655478, 0x4f7c3922),
+              TOBN(0x95d337cd, 0x20c68eef),
+              TOBN(0x68f1e1e5, 0xdf779ab9),
+              TOBN(0x14b491b0, 0xb5cf69a8),
+              TOBN(0x7a6cbbe0, 0x28e3fe89),
+              TOBN(0xe7e1fee4, 0xc5aac0eb),
+              TOBN(0x7f47eda5, 0x697e5140),
+              TOBN(0x4f450137, 0xb454921f),
+              TOBN(0xdb625f84, 0x95cd8185),
+              TOBN(0x74be0ba1, 0xcdb2e583),
+              TOBN(0xaee4fd7c, 0xdd5e6de4),
+              TOBN(0x4251437d, 0xe8101739),
+              TOBN(0x686d72a0, 0xac620366),
+              TOBN(0x4be3fb9c, 0xb6d59344),
+              TOBN(0x6e8b44e7, 0xa1eb75b9),
+              TOBN(0x84e39da3, 0x91a5c10c),
+              TOBN(0x37cc1490, 0xb38f0409),
+              TOBN(0x02951943, 0x2c2ade82),
+              TOBN(0x9b688783, 0x1190a2d8),
+              TOBN(0x25627d14, 0x231182ba),
+              TOBN(0x6eb550aa, 0x658a6d87),
+              TOBN(0x1405aaa7, 0xcf9c7325),
+              TOBN(0xd147142e, 0x5c8748c9),
+              TOBN(0x7f637e4f, 0x53ede0e0),
+              TOBN(0xf8ca2776, 0x14ffad2c),
+              TOBN(0xe58fb1bd, 0xbafb6791),
+              TOBN(0x17158c23, 0xbf8f93fc),
+              TOBN(0x7f15b373, 0x0a4a4655),
+              TOBN(0x39d4add2, 0xd842ca72),
+              TOBN(0xa71e4391, 0x3ed96305),
+              TOBN(0x5bb09cbe, 0x6700be14),
+              TOBN(0x68d69d54, 0xd8befcf6),
+              TOBN(0xa45f5367, 0x37183bcf),
+              TOBN(0x7152b7bb, 0x3370dff7),
+              TOBN(0xcf887baa, 0xbf12525b),
+              TOBN(0xe7ac7bdd, 0xd6d1e3cd),
+              TOBN(0x25914f78, 0x81fdad90),
+              TOBN(0xcf638f56, 0x0d2cf6ab),
+              TOBN(0xb90bc03f, 0xcc054de5),
+              TOBN(0x932811a7, 0x18b06350),
+              TOBN(0x2f00b330, 0x9bbd11ff),
+              TOBN(0x76108a6f, 0xb4044974),
+              TOBN(0x801bb9e0, 0xa851d266),
+              TOBN(0x0dd099be, 0xbf8990c1),
+              TOBN(0x58c5aaaa, 0xabe32986),
+              TOBN(0x0fe9dd2a, 0x50d59c27),
+              TOBN(0x84951ff4, 0x8d307305),
+              TOBN(0x6c23f829, 0x86529b78),
+              TOBN(0x50bb2218, 0x0b136a79),
+              TOBN(0x7e2174de, 0x77a20996),
+              TOBN(0x6f00a4b9, 0xc0bb4da6),
+              TOBN(0x89a25a17, 0xefdde8da),
+              TOBN(0xf728a27e, 0xc11ee01d),
+              TOBN(0xf900553a, 0xe5f10dfb),
+              TOBN(0x189a83c8, 0x02ec893c),
+              TOBN(0x3ca5bdc1, 0x23f66d77),
+              TOBN(0x98781537, 0x97eada9f),
+              TOBN(0x59c50ab3, 0x10256230),
+              TOBN(0x346042d9, 0x323c69b3),
+              TOBN(0x1b715a6d, 0x2c460449),
+              TOBN(0xa41dd476, 0x6ae06e0b),
+              TOBN(0xcdd7888e, 0x9d42e25f),
+              TOBN(0x0f395f74, 0x56b25a20),
+              TOBN(0xeadfe0ae, 0x8700e27e),
+              TOBN(0xb09d52a9, 0x69950093),
+              TOBN(0x3525d9cb, 0x327f8d40),
+              TOBN(0xb8235a94, 0x67df886a),
+              TOBN(0x77e4b0dd, 0x035faec2),
+              TOBN(0x115eb20a, 0x517d7061),
+              TOBN(0x77fe3433, 0x6c2df683),
+              TOBN(0x6870ddc7, 0xcdc6fc67),
+              TOBN(0xb1610588, 0x0b87de83),
+              TOBN(0x343584ca, 0xd9c4ddbe),
+              TOBN(0xb3164f1c, 0x3d754be2),
+              TOBN(0x0731ed3a, 0xc1e6c894),
+              TOBN(0x26327dec, 0x4f6b904c),
+              TOBN(0x9d49c6de, 0x97b5cd32),
+              TOBN(0x40835dae, 0xb5eceecd),
+              TOBN(0xc66350ed, 0xd9ded7fe),
+              TOBN(0x8aeebb5c, 0x7a678804),
+              TOBN(0x51d42fb7, 0x5b8ee9ec),
+              TOBN(0xd7a17bdd, 0x8e3ca118),
+              TOBN(0x40d7511a, 0x2ef4400e),
+              TOBN(0xc48990ac, 0x875a66f4),
+              TOBN(0x8de07d2a, 0x2199e347),
+              TOBN(0xbee75556, 0x2a39e051),
+              TOBN(0x56918786, 0x916e51dc),
+              TOBN(0xeb191313, 0x4a2d89ec),
+              TOBN(0x6679610d, 0x37d341ed),
+              TOBN(0x434fbb41, 0x56d51c2b),
+              TOBN(0xe54b7ee7, 0xd7492dba),
+              TOBN(0xaa33a79a, 0x59021493),
+              TOBN(0x49fc5054, 0xe4bd6d3d),
+              TOBN(0x09540f04, 0x5ab551d0),
+              TOBN(0x8acc9085, 0x4942d3a6),
+              TOBN(0x231af02f, 0x2d28323b),
+              TOBN(0x93458cac, 0x0992c163),
+              TOBN(0x1fef8e71, 0x888e3bb4),
+              TOBN(0x27578da5, 0xbe8c268c),
+              TOBN(0xcc8be792, 0xe805ec00),
+              TOBN(0x29267bae, 0xc61c3855),
+              TOBN(0xebff429d, 0x58c1fd3b),
+              TOBN(0x22d886c0, 0x8c0b93b8),
+              TOBN(0xca5e00b2, 0x2ddb8953),
+              TOBN(0xcf330117, 0xc3fed8b7),
+              TOBN(0xd49ac6fa, 0x819c01f6),
+              TOBN(0x6ddaa6bd, 0x3c0fbd54),
+              TOBN(0x91743068, 0x8049a2cf),
+              TOBN(0xd67f981e, 0xaff2ef81),
+              TOBN(0xc3654d35, 0x2818ae80),
+              TOBN(0x81d05044, 0x1b2aa892),
+              TOBN(0x2db067bf, 0x3d099328),
+              TOBN(0xe7c79e86, 0x703dcc97),
+              TOBN(0xe66f9b37, 0xe133e215),
+              TOBN(0xcdf119a6, 0xe39a7a5c),
+              TOBN(0x47c60de3, 0x876f1b61),
+              TOBN(0x6e405939, 0xd860f1b2),
+              TOBN(0x3e9a1dbc, 0xf5ed4d4a),
+              TOBN(0x3f23619e, 0xc9b6bcbd),
+              TOBN(0x5ee790cf, 0x734e4497),
+              TOBN(0xf0a834b1, 0x5bdaf9bb),
+              TOBN(0x02cedda7, 0x4ca295f0),
+              TOBN(0x4619aa2b, 0xcb8e378c),
+              TOBN(0xe5613244, 0xcc987ea4),
+              TOBN(0x0bc022cc, 0x76b23a50),
+              TOBN(0x4a2793ad, 0x0a6c21ce),
+              TOBN(0x38328780, 0x89cac3f5),
+              TOBN(0x29176f1b, 0xcba26d56),
+              TOBN(0x06296187, 0x4f6f59eb),
+              TOBN(0x86e9bca9, 0x8bdc658e),
+              TOBN(0x2ca9c4d3, 0x57e30402),
+              TOBN(0x5438b216, 0x516a09bb),
+              TOBN(0x0a6a063c, 0x7672765a),
+              TOBN(0x37a3ce64, 0x0547b9bf),
+              TOBN(0x42c099c8, 0x98b1a633),
+              TOBN(0xb5ab800d, 0x05ee6961),
+              TOBN(0xf1963f59, 0x11a5acd6),
+              TOBN(0xbaee6157, 0x46201063),
+              TOBN(0x36d9a649, 0xa596210a),
+              TOBN(0xaed04363, 0x1ba7138c),
+              TOBN(0xcf817d1c, 0xa4a82b76),
+              TOBN(0x5586960e, 0xf3806be9),
+              TOBN(0x7ab67c89, 0x09dc6bb5),
+              TOBN(0x52ace7a0, 0x114fe7eb),
+              TOBN(0xcd987618, 0xcbbc9b70),
+              TOBN(0x4f06fd5a, 0x604ca5e1),
+              TOBN(0x90af14ca, 0x6dbde133),
+              TOBN(0x1afe4322, 0x948a3264),
+              TOBN(0xa70d2ca6, 0xc44b2c6c),
+              TOBN(0xab726799, 0x0ef87dfe),
+              TOBN(0x310f64dc, 0x2e696377),
+              TOBN(0x49b42e68, 0x4c8126a0),
+              TOBN(0x0ea444c3, 0xcea0b176),
+              TOBN(0x53a8ddf7, 0xcb269182),
+              TOBN(0xf3e674eb, 0xbbba9dcb),
+              TOBN(0x0d2878a8, 0xd8669d33),
+              TOBN(0x04b935d5, 0xd019b6a3),
+              TOBN(0xbb5cf88e, 0x406f1e46),
+              TOBN(0xa1912d16, 0x5b57c111),
+              TOBN(0x9803fc21, 0x19ebfd78),
+              TOBN(0x4f231c9e, 0xc07764a9),
+              TOBN(0xd93286ee, 0xb75bd055),
+              TOBN(0x83a9457d, 0x8ee6c9de),
+              TOBN(0x04695915, 0x6087ec90),
+              TOBN(0x14c6dd8a, 0x58d6cd46),
+              TOBN(0x9cb633b5, 0x8e6634d2),
+              TOBN(0xc1305047, 0xf81bc328),
+              TOBN(0x12ede0e2, 0x26a177e5),
+              TOBN(0x332cca62, 0x065a6f4f),
+              TOBN(0xc3a47ecd, 0x67be487b),
+              TOBN(0x741eb187, 0x0f47ed1c),
+              TOBN(0x99e66e58, 0xe7598b14),
+              TOBN(0x6f0544ca, 0x63d0ff12),
+              TOBN(0xe5efc784, 0xb610a05f),
+              TOBN(0xf72917b1, 0x7cad7b47),
+              TOBN(0x3ff6ea20, 0xf2cac0c0),
+              TOBN(0xcc23791b, 0xf21db8b7),
+              TOBN(0x7dac70b1, 0xd7d93565),
+              TOBN(0x682cda1d, 0x694bdaad),
+              TOBN(0xeb88bb8c, 0x1023516d),
+              TOBN(0xc4c634b4, 0xdfdbeb1b),
+              TOBN(0x22f5ca72, 0xb4ee4dea),
+              TOBN(0x1045a368, 0xe6524821),
+              TOBN(0xed9e8a3f, 0x052b18b2),
+              TOBN(0x9b7f2cb1, 0xb961f49a),
+              TOBN(0x7fee2ec1, 0x7b009670),
+              TOBN(0x350d8754, 0x22507a6d),
+              TOBN(0x561bd711, 0x4db55f1d),
+              TOBN(0x4c189ccc, 0x320bbcaf),
+              TOBN(0x568434cf, 0xdf1de48c),
+              TOBN(0x6af1b00e, 0x0fa8f128),
+              TOBN(0xf0ba9d02, 0x8907583c),
+              TOBN(0x735a4004, 0x32ff9f60),
+              TOBN(0x3dd8e4b6, 0xc25dcf33),
+              TOBN(0xf2230f16, 0x42c74cef),
+              TOBN(0xd8117623, 0x013fa8ad),
+              TOBN(0x36822876, 0xf51fe76e),
+              TOBN(0x8a6811cc, 0x11d62589),
+              TOBN(0xc3fc7e65, 0x46225718),
+              TOBN(0xb7df2c9f, 0xc82fdbcd),
+              TOBN(0x3b1d4e52, 0xdd7b205b),
+              TOBN(0xb6959478, 0x47a2e414),
+              TOBN(0x05e4d793, 0xefa91148),
+              TOBN(0xb47ed446, 0xfd2e9675),
+              TOBN(0x1a7098b9, 0x04c9d9bf),
+              TOBN(0x661e2881, 0x1b793048),
+              TOBN(0xb1a16966, 0xb01ee461),
+              TOBN(0xbc521308, 0x2954746f),
+              TOBN(0xc909a0fc, 0x2477de50),
+              TOBN(0xd80bb41c, 0x7dbd51ef),
+              TOBN(0xa85be7ec, 0x53294905),
+              TOBN(0x6d465b18, 0x83958f97),
+              TOBN(0x16f6f330, 0xfb6840fd),
+              TOBN(0xfaaeb214, 0x3401e6c8),
+              TOBN(0xaf83d30f, 0xccb5b4f8),
+              TOBN(0x22885739, 0x266dec4b),
+              TOBN(0x51b4367c, 0x7bc467df),
+              TOBN(0x926562e3, 0xd842d27a),
+              TOBN(0xdfcb6614, 0x0fea14a6),
+              TOBN(0xeb394dae, 0xf2734cd9),
+              TOBN(0x3eeae5d2, 0x11c0be98),
+              TOBN(0xb1e6ed11, 0x814e8165),
+              TOBN(0x191086bc, 0xe52bce1c),
+              TOBN(0x14b74cc6, 0xa75a04da),
+              TOBN(0x63cf1186, 0x8c060985),
+              TOBN(0x071047de, 0x2dbd7f7c),
+              TOBN(0x4e433b8b, 0xce0942ca),
+              TOBN(0xecbac447, 0xd8fec61d),
+              TOBN(0x8f0ed0e2, 0xebf3232f),
+              TOBN(0xfff80f9e, 0xc52a2edd),
+              TOBN(0xad9ab433, 0x75b55fdb),
+              TOBN(0x73ca7820, 0xe42e0c11),
+              TOBN(0x6dace0a0, 0xe6251b46),
+              TOBN(0x89bc6b5c, 0x4c0d932d),
+              TOBN(0x3438cd77, 0x095da19a),
+              TOBN(0x2f24a939, 0x8d48bdfb),
+              TOBN(0x99b47e46, 0x766561b7),
+              TOBN(0x736600e6, 0x0ed0322a),
+              TOBN(0x06a47cb1, 0x638e1865),
+              TOBN(0x927c1c2d, 0xcb136000),
+              TOBN(0x29542337, 0x0cc5df69),
+              TOBN(0x99b37c02, 0x09d649a9),
+              TOBN(0xc5f0043c, 0x6aefdb27),
+              TOBN(0x6cdd9987, 0x1be95c27),
+              TOBN(0x69850931, 0x390420d2),
+              TOBN(0x299c40ac, 0x0983efa4),
+              TOBN(0x3a05e778, 0xaf39aead),
+              TOBN(0x84274408, 0x43a45193),
+              TOBN(0x6bcd0fb9, 0x91a711a0),
+              TOBN(0x461592c8, 0x9f52ab17),
+              TOBN(0xb49302b4, 0xda3c6ed6),
+              TOBN(0xc51fddc7, 0x330d7067),
+              TOBN(0x94babeb6, 0xda50d531),
+              TOBN(0x521b840d, 0xa6a7b9da),
+              TOBN(0x5305151e, 0x404bdc89),
+              TOBN(0x1bcde201, 0xd0d07449),
+              TOBN(0xf427a78b, 0x3b76a59a),
+              TOBN(0xf84841ce, 0x07791a1b),
+              TOBN(0xebd314be, 0xbf91ed1c),
+              TOBN(0x8e61d34c, 0xbf172943),
+              TOBN(0x1d5dc451, 0x5541b892),
+              TOBN(0xb186ee41, 0xfc9d9e54),
+              TOBN(0x9d9f345e, 0xd5bf610d),
+              TOBN(0x3e7ba65d, 0xf6acca9f),
+              TOBN(0x9dda787a, 0xa8369486),
+              TOBN(0x09f9dab7, 0x8eb5ba53),
+              TOBN(0x5afb2033, 0xd6481bc3),
+              TOBN(0x76f4ce30, 0xafa62104),
+              TOBN(0xa8fa00cf, 0xf4f066b5),
+              TOBN(0x89ab5143, 0x461dafc2),
+              TOBN(0x44339ed7, 0xa3389998),
+              TOBN(0x2ff862f1, 0xbc214903),
+              TOBN(0x2c88f985, 0xb05556e3),
+              TOBN(0xcd96058e, 0x3467081e),
+              TOBN(0x7d6a4176, 0xedc637ea),
+              TOBN(0xe1743d09, 0x36a5acdc),
+              TOBN(0x66fd72e2, 0x7eb37726),
+              TOBN(0xf7fa264e, 0x1481a037),
+              TOBN(0x9fbd3bde, 0x45f4aa79),
+              TOBN(0xed1e0147, 0x767c3e22),
+              TOBN(0x7621f979, 0x82e7abe2),
+              TOBN(0x19eedc72, 0x45f633f8),
+              TOBN(0xe69b155e, 0x6137bf3a),
+              TOBN(0xa0ad13ce, 0x414ee94e),
+              TOBN(0x93e3d524, 0x1c0e651a),
+              TOBN(0xab1a6e2a, 0x02ce227e),
+              TOBN(0xe7af1797, 0x4ab27eca),
+              TOBN(0x245446de, 0xbd444f39),
+              TOBN(0x59e22a21, 0x56c07613),
+              TOBN(0x43deafce, 0xf4275498),
+              TOBN(0x10834ccb, 0x67fd0946),
+              TOBN(0xa75841e5, 0x47406edf),
+              TOBN(0xebd6a677, 0x7b0ac93d),
+              TOBN(0xa6e37b0d, 0x78f5e0d7),
+              TOBN(0x2516c096, 0x76f5492b),
+              TOBN(0x1e4bf888, 0x9ac05f3a),
+              TOBN(0xcdb42ce0, 0x4df0ba2b),
+              TOBN(0x935d5cfd, 0x5062341b),
+              TOBN(0x8a303333, 0x82acac20),
+              TOBN(0x429438c4, 0x5198b00e),
+              TOBN(0x1d083bc9, 0x049d33fa),
+              TOBN(0x58b82dda, 0x946f67ff),
+              TOBN(0xac3e2db8, 0x67a1d6a3),
+              TOBN(0x62e6bead, 0x1798aac8),
+              TOBN(0xfc85980f, 0xde46c58c),
+              TOBN(0xa7f69379, 0x69c8d7be),
+              TOBN(0x23557927, 0x837b35ec),
+              TOBN(0x06a933d8, 0xe0790c0c),
+              TOBN(0x827c0e9b, 0x077ff55d),
+              TOBN(0x53977798, 0xbb26e680),
+              TOBN(0x59530874, 0x1d9cb54f),
+              TOBN(0xcca3f449, 0x4aac53ef),
+              TOBN(0x11dc5c87, 0xa07eda0f),
+              TOBN(0xc138bccf, 0xfd6400c8),
+              TOBN(0x549680d3, 0x13e5da72),
+              TOBN(0xc93eed82, 0x4540617e),
+              TOBN(0xfd3db157, 0x4d0b75c0),
+              TOBN(0x9716eb42, 0x6386075b),
+              TOBN(0x0639605c, 0x817b2c16),
+              TOBN(0x09915109, 0xf1e4f201),
+              TOBN(0x35c9a928, 0x5cca6c3b),
+              TOBN(0xb25f7d1a, 0x3505c900),
+              TOBN(0xeb9f7d20, 0x630480c4),
+              TOBN(0xc3c7b8c6, 0x2a1a501c),
+              TOBN(0x3f99183c, 0x5a1f8e24),
+              TOBN(0xfdb118fa, 0x9dd255f0),
+              TOBN(0xb9b18b90, 0xc27f62a6),
+              TOBN(0xe8f732f7, 0x396ec191),
+              TOBN(0x524a2d91, 0x0be786ab),
+              TOBN(0x5d32adef, 0x0ac5a0f5),
+              TOBN(0x9b53d4d6, 0x9725f694),
+              TOBN(0x032a76c6, 0x0510ba89),
+              TOBN(0x840391a3, 0xebeb1544),
+              TOBN(0x44b7b88c, 0x3ed73ac3),
+              TOBN(0xd24bae7a, 0x256cb8b3),
+              TOBN(0x7ceb151a, 0xe394cb12),
+              TOBN(0xbd6b66d0, 0x5bc1e6a8),
+              TOBN(0xec70cecb, 0x090f07bf),
+              TOBN(0x270644ed, 0x7d937589),
+              TOBN(0xee9e1a3d, 0x5f1dccfe),
+              TOBN(0xb0d40a84, 0x745b98d2),
+              TOBN(0xda429a21, 0x2556ed40),
+              TOBN(0xf676eced, 0x85148cb9),
+              TOBN(0x5a22d40c, 0xded18936),
+              TOBN(0x3bc4b9e5, 0x70e8a4ce),
+              TOBN(0xbfd1445b, 0x9eae0379),
+              TOBN(0xf23f2c0c, 0x1a0bd47e),
+              TOBN(0xa9c0bb31, 0xe1845531),
+              TOBN(0x9ddc4d60, 0x0a4c3f6b),
+              TOBN(0xbdfaad79, 0x2c15ef44),
+              TOBN(0xce55a236, 0x7f484acc),
+              TOBN(0x08653ca7, 0x055b1f15),
+              TOBN(0x2efa8724, 0x538873a3),
+              TOBN(0x09299e5d, 0xace1c7e7),
+              TOBN(0x07afab66, 0xade332ba),
+              TOBN(0x9be1fdf6, 0x92dd71b7),
+              TOBN(0xa49b5d59, 0x5758b11c),
+              TOBN(0x0b852893, 0xc8654f40),
+              TOBN(0xb63ef6f4, 0x52379447),
+              TOBN(0xd4957d29, 0x105e690c),
+              TOBN(0x7d484363, 0x646559b0),
+              TOBN(0xf4a8273c, 0x49788a8e),
+              TOBN(0xee406cb8, 0x34ce54a9),
+              TOBN(0x1e1c260f, 0xf86fda9b),
+              TOBN(0xe150e228, 0xcf6a4a81),
+              TOBN(0x1fa3b6a3, 0x1b488772),
+              TOBN(0x1e6ff110, 0xc5a9c15b),
+              TOBN(0xc6133b91, 0x8ad6aa47),
+              TOBN(0x8ac5d55c, 0x9dffa978),
+              TOBN(0xba1d1c1d, 0x5f3965f2),
+              TOBN(0xf969f4e0, 0x7732b52f),
+              TOBN(0xfceecdb5, 0xa5172a07),
+              TOBN(0xb0120a5f, 0x10f2b8f5),
+              TOBN(0xc83a6cdf, 0x5c4c2f63),
+              TOBN(0x4d47a491, 0xf8f9c213),
+              TOBN(0xd9e1cce5, 0xd3f1bbd5),
+              TOBN(0x0d91bc7c, 0xaba7e372),
+              TOBN(0xfcdc74c8, 0xdfd1a2db),
+              TOBN(0x05efa800, 0x374618e5),
+              TOBN(0x11216969, 0x15a7925e),
+              TOBN(0xd4c89823, 0xf6021c5d),
+              TOBN(0x880d5e84, 0xeff14423),
+              TOBN(0x6523bc5a, 0x6dcd1396),
+              TOBN(0xd1acfdfc, 0x113c978b),
+              TOBN(0xb0c164e8, 0xbbb66840),
+              TOBN(0xf7f4301e, 0x72b58459),
+              TOBN(0xc29ad4a6, 0xa638e8ec),
+              TOBN(0xf5ab8961, 0x46b78699),
+              TOBN(0x9dbd7974, 0x0e954750),
+              TOBN(0x0121de88, 0x64f9d2c6),
+              TOBN(0x2e597b42, 0xd985232e),
+              TOBN(0x55b6c3c5, 0x53451777),
+              TOBN(0xbb53e547, 0x519cb9fb),
+              TOBN(0xf134019f, 0x8428600d),
+              TOBN(0x5a473176, 0xe081791a),
+              TOBN(0x2f3e2263, 0x35fb0c08),
+              TOBN(0xb28c3017, 0x73d273b0),
+              TOBN(0xccd21076, 0x7721ef9a),
+              TOBN(0x054cc292, 0xb650dc39),
+              TOBN(0x662246de, 0x6188045e),
+              TOBN(0x904b52fa, 0x6b83c0d1),
+              TOBN(0xa72df267, 0x97e9cd46),
+              TOBN(0x886b43cd, 0x899725e4),
+              TOBN(0x2b651688, 0xd849ff22),
+              TOBN(0x60479b79, 0x02f34533),
+              TOBN(0x5e354c14, 0x0c77c148),
+              TOBN(0xb4bb7581, 0xa8537c78),
+              TOBN(0x188043d7, 0xefe1495f),
+              TOBN(0x9ba12f42, 0x8c1d5026),
+              TOBN(0x2e0c8a26, 0x93d4aaab),
+              TOBN(0xbdba7b8b, 0xaa57c450),
+              TOBN(0x140c9ad6, 0x9bbdafef),
+              TOBN(0x2067aa42, 0x25ac0f18),
+              TOBN(0xf7b1295b, 0x04d1fbf3),
+              TOBN(0x14829111, 0xa4b04824),
+              TOBN(0x2ce3f192, 0x33bd5e91),
+              TOBN(0x9c7a1d55, 0x8f2e1b72),
+              TOBN(0xfe932286, 0x302aa243),
+              TOBN(0x497ca7b4, 0xd4be9554),
+              TOBN(0xb8e821b8, 0xe0547a6e),
+              TOBN(0xfb2838be, 0x67e573e0),
+              TOBN(0x05891db9, 0x4084c44b),
+              TOBN(0x91311373, 0x96c1c2c5),
+              TOBN(0x6aebfa3f, 0xd958444b),
+              TOBN(0xac9cdce9, 0xe56e55c1),
+              TOBN(0x7148ced3, 0x2caa46d0),
+              TOBN(0x2e10c7ef, 0xb61fe8eb),
+              TOBN(0x9fd835da, 0xff97cf4d),
+          },
+          {
+              TOBN(0xa36da109, 0x081e9387),
+              TOBN(0xfb9780d7, 0x8c935828),
+              TOBN(0xd5940332, 0xe540b015),
+              TOBN(0xc9d7b51b, 0xe0f466fa),
+              TOBN(0xfaadcd41, 0xd6d9f671),
+              TOBN(0xba6c1e28, 0xb1a2ac17),
+              TOBN(0x066a7833, 0xed201e5f),
+              TOBN(0x19d99719, 0xf90f462b),
+              TOBN(0xf431f462, 0x060b5f61),
+              TOBN(0xa56f46b4, 0x7bd057c2),
+              TOBN(0x348dca6c, 0x47e1bf65),
+              TOBN(0x9a38783e, 0x41bcf1ff),
+              TOBN(0x7a5d33a9, 0xda710718),
+              TOBN(0x5a779987, 0x2e0aeaf6),
+              TOBN(0xca87314d, 0x2d29d187),
+              TOBN(0xfa0edc3e, 0xc687d733),
+              TOBN(0x9df33621, 0x6a31e09b),
+              TOBN(0xde89e44d, 0xc1350e35),
+              TOBN(0x29214871, 0x4ca0cf52),
+              TOBN(0xdf379672, 0x0b88a538),
+              TOBN(0xc92a510a, 0x2591d61b),
+              TOBN(0x79aa87d7, 0x585b447b),
+              TOBN(0xf67db604, 0xe5287f77),
+              TOBN(0x1697c8bf, 0x5efe7a80),
+              TOBN(0x1c894849, 0xcb198ac7),
+              TOBN(0xa884a93d, 0x0f264665),
+              TOBN(0x2da964ef, 0x9b200678),
+              TOBN(0x3c351b87, 0x009834e6),
+              TOBN(0xafb2ef9f, 0xe2c4b44b),
+              TOBN(0x580f6c47, 0x3326790c),
+              TOBN(0xb8480521, 0x0b02264a),
+              TOBN(0x8ba6f9e2, 0x42a194e2),
+              TOBN(0xfc87975f, 0x8fb54738),
+              TOBN(0x35160788, 0x27c3ead3),
+              TOBN(0x834116d2, 0xb74a085a),
+              TOBN(0x53c99a73, 0xa62fe996),
+              TOBN(0x87585be0, 0x5b81c51b),
+              TOBN(0x925bafa8, 0xbe0852b7),
+              TOBN(0x76a4fafd, 0xa84d19a7),
+              TOBN(0x39a45982, 0x585206d4),
+              TOBN(0x499b6ab6, 0x5eb03c0e),
+              TOBN(0xf19b7954, 0x72bc3fde),
+              TOBN(0xa86b5b9c, 0x6e3a80d2),
+              TOBN(0xe4377508, 0x6d42819f),
+              TOBN(0xc1663650, 0xbb3ee8a3),
+              TOBN(0x75eb14fc, 0xb132075f),
+              TOBN(0xa8ccc906, 0x7ad834f6),
+              TOBN(0xea6a2474, 0xe6e92ffd),
+              TOBN(0x9d72fd95, 0x0f8d6758),
+              TOBN(0xcb84e101, 0x408c07dd),
+              TOBN(0xb9114bfd, 0xa5e23221),
+              TOBN(0x358b5fe2, 0xe94e742c),
+              TOBN(0x1c0577ec, 0x95f40e75),
+              TOBN(0xf0155451, 0x3d73f3d6),
+              TOBN(0x9d55cd67, 0xbd1b9b66),
+              TOBN(0x63e86e78, 0xaf8d63c7),
+              TOBN(0x39d934ab, 0xd3c095f1),
+              TOBN(0x04b261be, 0xe4b76d71),
+              TOBN(0x1d2e6970, 0xe73e6984),
+              TOBN(0x879fb23b, 0x5e5fcb11),
+              TOBN(0x11506c72, 0xdfd75490),
+              TOBN(0x3a97d085, 0x61bcf1c1),
+              TOBN(0x43201d82, 0xbf5e7007),
+              TOBN(0x7f0ac52f, 0x798232a7),
+              TOBN(0x2715cbc4, 0x6eb564d4),
+              TOBN(0x8d6c752c, 0x9e570e29),
+              TOBN(0xf80247c8, 0x9ef5fd5d),
+              TOBN(0xc3c66b46, 0xd53eb514),
+              TOBN(0x9666b401, 0x0f87de56),
+              TOBN(0xce62c06f, 0xc6c603b5),
+              TOBN(0xae7b4c60, 0x7e4fc942),
+              TOBN(0x38ac0b77, 0x663a9c19),
+              TOBN(0xcb4d20ee, 0x4b049136),
+              TOBN(0x8b63bf12, 0x356a4613),
+              TOBN(0x1221aef6, 0x70e08128),
+              TOBN(0xe62d8c51, 0x4acb6b16),
+              TOBN(0x71f64a67, 0x379e7896),
+              TOBN(0xb25237a2, 0xcafd7fa5),
+              TOBN(0xf077bd98, 0x3841ba6a),
+              TOBN(0xc4ac0244, 0x3cd16e7e),
+              TOBN(0x548ba869, 0x21fea4ca),
+              TOBN(0xd36d0817, 0xf3dfdac1),
+              TOBN(0x09d8d71f, 0xf4685faf),
+              TOBN(0x8eff66be, 0xc52c459a),
+              TOBN(0x182faee7, 0x0b57235e),
+              TOBN(0xee3c39b1, 0x0106712b),
+              TOBN(0x5107331f, 0xc0fcdcb0),
+              TOBN(0x669fb9dc, 0xa51054ba),
+              TOBN(0xb25101fb, 0x319d7682),
+              TOBN(0xb0293129, 0x0a982fee),
+              TOBN(0x51c1c9b9, 0x0261b344),
+              TOBN(0x0e008c5b, 0xbfd371fa),
+              TOBN(0xd866dd1c, 0x0278ca33),
+              TOBN(0x666f76a6, 0xe5aa53b1),
+              TOBN(0xe5cfb779, 0x6013a2cf),
+              TOBN(0x1d3a1aad, 0xa3521836),
+              TOBN(0xcedd2531, 0x73faa485),
+              TOBN(0xc8ee6c4f, 0xc0a76878),
+              TOBN(0xddbccfc9, 0x2a11667d),
+              TOBN(0x1a418ea9, 0x1c2f695a),
+              TOBN(0xdb11bd92, 0x51f73971),
+              TOBN(0x3e4b3c82, 0xda2ed89f),
+              TOBN(0x9a44f3f4, 0xe73e0319),
+              TOBN(0xd1e3de0f, 0x303431af),
+              TOBN(0x3c5604ff, 0x50f75f9c),
+              TOBN(0x1d8eddf3, 0x7e752b22),
+              TOBN(0x0ef074dd, 0x3c9a1118),
+              TOBN(0xd0ffc172, 0xccb86d7b),
+              TOBN(0xabd1ece3, 0x037d90f2),
+              TOBN(0xe3f307d6, 0x6055856c),
+              TOBN(0x422f9328, 0x7e4c6daf),
+              TOBN(0x902aac66, 0x334879a0),
+              TOBN(0xb6a1e7bf, 0x94cdfade),
+              TOBN(0x6c97e1ed, 0x7fc6d634),
+              TOBN(0x662ad24d, 0xa2fb63f8),
+              TOBN(0xf81be1b9, 0xa5928405),
+              TOBN(0x86d765e4, 0xd14b4206),
+              TOBN(0xbecc2e0e, 0x8fa0db65),
+              TOBN(0xa28838e0, 0xb17fc76c),
+              TOBN(0xe49a602a, 0xe37cf24e),
+              TOBN(0x76b4131a, 0x567193ec),
+              TOBN(0xaf3c305a, 0xe5f6e70b),
+              TOBN(0x9587bd39, 0x031eebdd),
+              TOBN(0x5709def8, 0x71bbe831),
+              TOBN(0x57059983, 0x0eb2b669),
+              TOBN(0x4d80ce1b, 0x875b7029),
+              TOBN(0x838a7da8, 0x0364ac16),
+              TOBN(0x2f431d23, 0xbe1c83ab),
+              TOBN(0xe56812a6, 0xf9294dd3),
+              TOBN(0xb448d01f, 0x9b4b0d77),
+              TOBN(0xf3ae6061, 0x04e8305c),
+              TOBN(0x2bead645, 0x94d8c63e),
+              TOBN(0x0a85434d, 0x84fd8b07),
+              TOBN(0x537b983f, 0xf7a9dee5),
+              TOBN(0xedcc5f18, 0xef55bd85),
+              TOBN(0x2041af62, 0x21c6cf8b),
+              TOBN(0x8e52874c, 0xb940c71e),
+              TOBN(0x211935a9, 0xdb5f4b3a),
+              TOBN(0x94350492, 0x301b1dc3),
+              TOBN(0x33d2646d, 0x29958620),
+              TOBN(0x16b0d64b, 0xef911404),
+              TOBN(0x9d1f25ea, 0x9a3c5ef4),
+              TOBN(0x20f200eb, 0x4a352c78),
+              TOBN(0x43929f2c, 0x4bd0b428),
+              TOBN(0xa5656667, 0xc7196e29),
+              TOBN(0x7992c2f0, 0x9391be48),
+              TOBN(0xaaa97cbd, 0x9ee0cd6e),
+              TOBN(0x51b0310c, 0x3dc8c9bf),
+              TOBN(0x237f8acf, 0xdd9f22cb),
+              TOBN(0xbb1d81a1, 0xb585d584),
+              TOBN(0x8d5d85f5, 0x8c416388),
+              TOBN(0x0d6e5a5a, 0x42fe474f),
+              TOBN(0xe7812766, 0x38235d4e),
+              TOBN(0x1c62bd67, 0x496e3298),
+              TOBN(0x8378660c, 0x3f175bc8),
+              TOBN(0x4d04e189, 0x17afdd4d),
+              TOBN(0x32a81601, 0x85a8068c),
+              TOBN(0xdb58e4e1, 0x92b29a85),
+              TOBN(0xe8a65b86, 0xc70d8a3b),
+              TOBN(0x5f0e6f4e, 0x98a0403b),
+              TOBN(0x08129684, 0x69ed2370),
+              TOBN(0x34dc30bd, 0x0871ee26),
+              TOBN(0x3a5ce948, 0x7c9c5b05),
+              TOBN(0x7d487b80, 0x43a90c87),
+              TOBN(0x4089ba37, 0xdd0e7179),
+              TOBN(0x45f80191, 0xb4041811),
+              TOBN(0x1c3e1058, 0x98747ba5),
+              TOBN(0x98c4e13a, 0x6e1ae592),
+              TOBN(0xd44636e6, 0xe82c9f9e),
+              TOBN(0x711db87c, 0xc33a1043),
+              TOBN(0x6f431263, 0xaa8aec05),
+              TOBN(0x43ff120d, 0x2744a4aa),
+              TOBN(0xd3bd892f, 0xae77779b),
+              TOBN(0xf0fe0cc9, 0x8cdc9f82),
+              TOBN(0xca5f7fe6, 0xf1c5b1bc),
+              TOBN(0xcc63a682, 0x44929a72),
+              TOBN(0xc7eaba0c, 0x09dbe19a),
+              TOBN(0x2f3585ad, 0x6b5c73c2),
+              TOBN(0x8ab8924b, 0x0ae50c30),
+              TOBN(0x17fcd27a, 0x638b30ba),
+              TOBN(0xaf414d34, 0x10b3d5a5),
+              TOBN(0x09c107d2, 0x2a9accf1),
+              TOBN(0x15dac49f, 0x946a6242),
+              TOBN(0xaec3df2a, 0xd707d642),
+              TOBN(0x2c2492b7, 0x3f894ae0),
+              TOBN(0xf59df3e5, 0xb75f18ce),
+              TOBN(0x7cb740d2, 0x8f53cad0),
+              TOBN(0x3eb585fb, 0xc4f01294),
+              TOBN(0x17da0c86, 0x32c7f717),
+              TOBN(0xeb8c795b, 0xaf943f4c),
+              TOBN(0x4ee23fb5, 0xf67c51d2),
+              TOBN(0xef187575, 0x68889949),
+              TOBN(0xa6b4bdb2, 0x0389168b),
+              TOBN(0xc4ecd258, 0xea577d03),
+              TOBN(0x3a63782b, 0x55743082),
+              TOBN(0x6f678f4c, 0xc72f08cd),
+              TOBN(0x553511cf, 0x65e58dd8),
+              TOBN(0xd53b4e3e, 0xd402c0cd),
+              TOBN(0x37de3e29, 0xa037c14c),
+              TOBN(0x86b6c516, 0xc05712aa),
+              TOBN(0x2834da3e, 0xb38dff6f),
+              TOBN(0xbe012c52, 0xea636be8),
+              TOBN(0x292d238c, 0x61dd37f8),
+              TOBN(0x0e54523f, 0x8f8142db),
+              TOBN(0xe31eb436, 0x036a05d8),
+              TOBN(0x83e3cdff, 0x1e93c0ff),
+              TOBN(0x3fd2fe0f, 0x50821ddf),
+              TOBN(0xc8e19b0d, 0xff9eb33b),
+              TOBN(0xc8cc943f, 0xb569a5fe),
+              TOBN(0xad0090d4, 0xd4342d75),
+              TOBN(0x82090b4b, 0xcaeca000),
+              TOBN(0xca39687f, 0x1bd410eb),
+              TOBN(0xe7bb0df7, 0x65959d77),
+              TOBN(0x39d78218, 0x9c964999),
+              TOBN(0xd87f62e8, 0xb2415451),
+              TOBN(0xe5efb774, 0xbed76108),
+              TOBN(0x3ea011a4, 0xe822f0d0),
+              TOBN(0xbc647ad1, 0x5a8704f8),
+              TOBN(0xbb315b35, 0x50c6820f),
+              TOBN(0x863dec3d, 0xb7e76bec),
+              TOBN(0x01ff5d3a, 0xf017bfc7),
+              TOBN(0x20054439, 0x976b8229),
+              TOBN(0x067fca37, 0x0bbd0d3b),
+              TOBN(0xf63dde64, 0x7f5e3d0f),
+              TOBN(0x22dbefb3, 0x2a4c94e9),
+              TOBN(0xafbff0fe, 0x96f8278a),
+              TOBN(0x80aea0b1, 0x3503793d),
+              TOBN(0xb2238029, 0x5f06cd29),
+              TOBN(0x65703e57, 0x8ec3feca),
+              TOBN(0x06c38314, 0x393e7053),
+              TOBN(0xa0b751eb, 0x7c6734c4),
+              TOBN(0xd2e8a435, 0xc59f0f1e),
+              TOBN(0x147d9052, 0x5e9ca895),
+              TOBN(0x2f4dd31e, 0x972072df),
+              TOBN(0xa16fda8e, 0xe6c6755c),
+              TOBN(0xc66826ff, 0xcf196558),
+              TOBN(0x1f1a76a3, 0x0cf43895),
+              TOBN(0xa9d604e0, 0x83c3097b),
+              TOBN(0xe1908309, 0x66390e0e),
+              TOBN(0xa50bf753, 0xb3c85eff),
+              TOBN(0x0696bdde, 0xf6a70251),
+              TOBN(0x548b801b, 0x3c6ab16a),
+              TOBN(0x37fcf704, 0xa4d08762),
+              TOBN(0x090b3def, 0xdff76c4e),
+              TOBN(0x87e8cb89, 0x69cb9158),
+              TOBN(0x44a90744, 0x995ece43),
+              TOBN(0xf85395f4, 0x0ad9fbf5),
+              TOBN(0x49b0f6c5, 0x4fb0c82d),
+              TOBN(0x75d9bc15, 0xadf7cccf),
+              TOBN(0x81a3e5d6, 0xdfa1e1b0),
+              TOBN(0x8c39e444, 0x249bc17e),
+              TOBN(0xf37dccb2, 0x8ea7fd43),
+              TOBN(0xda654873, 0x907fba12),
+              TOBN(0x35daa6da, 0x4a372904),
+              TOBN(0x0564cfc6, 0x6283a6c5),
+              TOBN(0xd09fa4f6, 0x4a9395bf),
+              TOBN(0x688e9ec9, 0xaeb19a36),
+              TOBN(0xd913f1ce, 0xc7bfbfb4),
+              TOBN(0x797b9a3c, 0x61c2faa6),
+              TOBN(0x2f979bec, 0x6a0a9c12),
+              TOBN(0xb5969d0f, 0x359679ec),
+              TOBN(0xebcf523d, 0x079b0460),
+              TOBN(0xfd6b0008, 0x10fab870),
+              TOBN(0x3f2edcda, 0x9373a39c),
+              TOBN(0x0d64f9a7, 0x6f568431),
+              TOBN(0xf848c27c, 0x02f8898c),
+              TOBN(0xf418ade1, 0x260b5bd5),
+              TOBN(0xc1f3e323, 0x6973dee8),
+              TOBN(0x46e9319c, 0x26c185dd),
+              TOBN(0x6d85b7d8, 0x546f0ac4),
+              TOBN(0x427965f2, 0x247f9d57),
+              TOBN(0xb519b636, 0xb0035f48),
+              TOBN(0x6b6163a9, 0xab87d59c),
+              TOBN(0xff9f58c3, 0x39caaa11),
+              TOBN(0x4ac39cde, 0x3177387b),
+              TOBN(0x5f6557c2, 0x873e77f9),
+              TOBN(0x67504006, 0x36a83041),
+              TOBN(0x9b1c96ca, 0x75ef196c),
+              TOBN(0xf34283de, 0xb08c7940),
+              TOBN(0x7ea09644, 0x1128c316),
+              TOBN(0xb510b3b5, 0x6aa39dff),
+              TOBN(0x59b43da2, 0x9f8e4d8c),
+              TOBN(0xa8ce31fd, 0x9e4c4b9f),
+              TOBN(0x0e20be26, 0xc1303c01),
+              TOBN(0x18187182, 0xe8ee47c9),
+              TOBN(0xd9687cdb, 0x7db98101),
+              TOBN(0x7a520e4d, 0xa1e14ff6),
+              TOBN(0x429808ba, 0x8836d572),
+              TOBN(0xa37ca60d, 0x4944b663),
+              TOBN(0xf901f7a9, 0xa3f91ae5),
+              TOBN(0xe4e3e76e, 0x9e36e3b1),
+              TOBN(0x9aa219cf, 0x29d93250),
+              TOBN(0x347fe275, 0x056a2512),
+              TOBN(0xa4d643d9, 0xde65d95c),
+              TOBN(0x9669d396, 0x699fc3ed),
+              TOBN(0xb598dee2, 0xcf8c6bbe),
+              TOBN(0x682ac1e5, 0xdda9e5c6),
+              TOBN(0x4e0d3c72, 0xcaa9fc95),
+              TOBN(0x17faaade, 0x772bea44),
+              TOBN(0x5ef8428c, 0xab0009c8),
+              TOBN(0xcc4ce47a, 0x460ff016),
+              TOBN(0xda6d12bf, 0x725281cb),
+              TOBN(0x44c67848, 0x0223aad2),
+              TOBN(0x6e342afa, 0x36256e28),
+              TOBN(0x1400bb0b, 0x93a37c04),
+              TOBN(0x62b1bc9b, 0xdd10bd96),
+              TOBN(0x7251adeb, 0x0dac46b7),
+              TOBN(0x7d33b92e, 0x7be4ef51),
+              TOBN(0x28b2a94b, 0xe61fa29a),
+              TOBN(0x4b2be13f, 0x06422233),
+              TOBN(0x36d6d062, 0x330d8d37),
+              TOBN(0x5ef80e1e, 0xb28ca005),
+              TOBN(0x174d4699, 0x6d16768e),
+              TOBN(0x9fc4ff6a, 0x628bf217),
+              TOBN(0x77705a94, 0x154e490d),
+              TOBN(0x9d96dd28, 0x8d2d997a),
+              TOBN(0x77e2d9d8, 0xce5d72c4),
+              TOBN(0x9d06c5a4, 0xc11c714f),
+              TOBN(0x02aa5136, 0x79e4a03e),
+              TOBN(0x1386b3c2, 0x030ff28b),
+              TOBN(0xfe82e8a6, 0xfb283f61),
+              TOBN(0x7df203e5, 0xf3abc3fb),
+              TOBN(0xeec7c351, 0x3a4d3622),
+              TOBN(0xf7d17dbf, 0xdf762761),
+              TOBN(0xc3956e44, 0x522055f0),
+              TOBN(0xde3012db, 0x8fa748db),
+              TOBN(0xca9fcb63, 0xbf1dcc14),
+              TOBN(0xa56d9dcf, 0xbe4e2f3a),
+              TOBN(0xb86186b6, 0x8bcec9c2),
+              TOBN(0x7cf24df9, 0x680b9f06),
+              TOBN(0xc46b45ea, 0xc0d29281),
+              TOBN(0xfff42bc5, 0x07b10e12),
+              TOBN(0x12263c40, 0x4d289427),
+              TOBN(0x3d5f1899, 0xb4848ec4),
+              TOBN(0x11f97010, 0xd040800c),
+              TOBN(0xb4c5f529, 0x300feb20),
+              TOBN(0xcc543f8f, 0xde94fdcb),
+              TOBN(0xe96af739, 0xc7c2f05e),
+              TOBN(0xaa5e0036, 0x882692e1),
+              TOBN(0x09c75b68, 0x950d4ae9),
+              TOBN(0x62f63df2, 0xb5932a7a),
+              TOBN(0x2658252e, 0xde0979ad),
+              TOBN(0x2a19343f, 0xb5e69631),
+              TOBN(0x718c7501, 0x525b666b),
+              TOBN(0x26a42d69, 0xea40dc3a),
+              TOBN(0xdc84ad22, 0xaecc018f),
+              TOBN(0x25c36c7b, 0x3270f04a),
+              TOBN(0x46ba6d47, 0x50fa72ed),
+              TOBN(0x6c37d1c5, 0x93e58a8e),
+              TOBN(0xa2394731, 0x120c088c),
+              TOBN(0xc3be4263, 0xcb6e86da),
+              TOBN(0x2c417d36, 0x7126d038),
+              TOBN(0x5b70f9c5, 0x8b6f8efa),
+              TOBN(0x671a2faa, 0x37718536),
+              TOBN(0xd3ced3c6, 0xb539c92b),
+              TOBN(0xe56f1bd9, 0xa31203c2),
+              TOBN(0x8b096ec4, 0x9ff3c8eb),
+              TOBN(0x2deae432, 0x43491cea),
+              TOBN(0x2465c6eb, 0x17943794),
+              TOBN(0x5d267e66, 0x20586843),
+              TOBN(0x9d3d116d, 0xb07159d0),
+              TOBN(0xae07a67f, 0xc1896210),
+              TOBN(0x8fc84d87, 0xbb961579),
+              TOBN(0x30009e49, 0x1c1f8dd6),
+              TOBN(0x8a8caf22, 0xe3132819),
+              TOBN(0xcffa197c, 0xf23ab4ff),
+              TOBN(0x58103a44, 0x205dd687),
+              TOBN(0x57b796c3, 0x0ded67a2),
+              TOBN(0x0b9c3a6c, 0xa1779ad7),
+              TOBN(0xa33cfe2e, 0x357c09c5),
+              TOBN(0x2ea29315, 0x3db4a57e),
+              TOBN(0x91959695, 0x8ebeb52e),
+              TOBN(0x118db9a6, 0xe546c879),
+              TOBN(0x8e996df4, 0x6295c8d6),
+              TOBN(0xdd990484, 0x55ec806b),
+              TOBN(0x24f291ca, 0x165c1035),
+              TOBN(0xcca523bb, 0x440e2229),
+              TOBN(0x324673a2, 0x73ef4d04),
+              TOBN(0xaf3adf34, 0x3e11ec39),
+              TOBN(0x6136d7f1, 0xdc5968d3),
+              TOBN(0x7a7b2899, 0xb053a927),
+              TOBN(0x3eaa2661, 0xae067ecd),
+              TOBN(0x8549b9c8, 0x02779cd9),
+              TOBN(0x061d7940, 0xc53385ea),
+              TOBN(0x3e0ba883, 0xf06d18bd),
+              TOBN(0x4ba6de53, 0xb2700843),
+              TOBN(0xb966b668, 0x591a9e4d),
+              TOBN(0x93f67567, 0x7f4fa0ed),
+              TOBN(0x5a02711b, 0x4347237b),
+              TOBN(0xbc041e2f, 0xe794608e),
+              TOBN(0x55af10f5, 0x70f73d8c),
+              TOBN(0xd2d4d4f7, 0xbb7564f7),
+              TOBN(0xd7d27a89, 0xb3e93ce7),
+              TOBN(0xf7b5a875, 0x5d3a2c1b),
+              TOBN(0xb29e68a0, 0x255b218a),
+              TOBN(0xb533837e, 0x8af76754),
+              TOBN(0xd1b05a73, 0x579fab2e),
+              TOBN(0xb41055a1, 0xecd74385),
+              TOBN(0xb2369274, 0x445e9115),
+              TOBN(0x2972a7c4, 0xf520274e),
+              TOBN(0x6c08334e, 0xf678e68a),
+              TOBN(0x4e4160f0, 0x99b057ed),
+              TOBN(0x3cfe11b8, 0x52ccb69a),
+              TOBN(0x2fd1823a, 0x21c8f772),
+              TOBN(0xdf7f072f, 0x3298f055),
+              TOBN(0x8c0566f9, 0xfec74a6e),
+              TOBN(0xe549e019, 0x5bb4d041),
+              TOBN(0x7c3930ba, 0x9208d850),
+              TOBN(0xe07141fc, 0xaaa2902b),
+              TOBN(0x539ad799, 0xe4f69ad3),
+              TOBN(0xa6453f94, 0x813f9ffd),
+              TOBN(0xc58d3c48, 0x375bc2f7),
+              TOBN(0xb3326fad, 0x5dc64e96),
+              TOBN(0x3aafcaa9, 0xb240e354),
+              TOBN(0x1d1b0903, 0xaca1e7a9),
+              TOBN(0x4ceb9767, 0x1211b8a0),
+              TOBN(0xeca83e49, 0xe32a858e),
+              TOBN(0x4c32892e, 0xae907bad),
+              TOBN(0xd5b42ab6, 0x2eb9b494),
+              TOBN(0x7fde3ee2, 0x1eabae1b),
+              TOBN(0x13b5ab09, 0xcaf54957),
+              TOBN(0xbfb028be, 0xe5f5d5d5),
+              TOBN(0x928a0650, 0x2003e2c0),
+              TOBN(0x90793aac, 0x67476843),
+              TOBN(0x5e942e79, 0xc81710a0),
+              TOBN(0x557e4a36, 0x27ccadd4),
+              TOBN(0x72a2bc56, 0x4bcf6d0c),
+              TOBN(0x09ee5f43, 0x26d7b80c),
+              TOBN(0x6b70dbe9, 0xd4292f19),
+              TOBN(0x56f74c26, 0x63f16b18),
+              TOBN(0xc23db0f7, 0x35fbb42a),
+              TOBN(0xb606bdf6, 0x6ae10040),
+              TOBN(0x1eb15d4d, 0x044573ac),
+              TOBN(0x7dc3cf86, 0x556b0ba4),
+              TOBN(0x97af9a33, 0xc60df6f7),
+              TOBN(0x0b1ef85c, 0xa716ce8c),
+              TOBN(0x2922f884, 0xc96958be),
+              TOBN(0x7c32fa94, 0x35690963),
+              TOBN(0x2d7f667c, 0xeaa00061),
+              TOBN(0xeaaf7c17, 0x3547365c),
+              TOBN(0x1eb4de46, 0x87032d58),
+              TOBN(0xc54f3d83, 0x5e2c79e0),
+              TOBN(0x07818df4, 0x5d04ef23),
+              TOBN(0x55faa9c8, 0x673d41b4),
+              TOBN(0xced64f6f, 0x89b95355),
+              TOBN(0x4860d2ea, 0xb7415c84),
+              TOBN(0x5fdb9bd2, 0x050ebad3),
+              TOBN(0xdb53e0cc, 0x6685a5bf),
+              TOBN(0xb830c031, 0x9feb6593),
+              TOBN(0xdd87f310, 0x6accff17),
+              TOBN(0x2303ebab, 0x9f555c10),
+              TOBN(0x94603695, 0x287e7065),
+              TOBN(0xf88311c3, 0x2e83358c),
+              TOBN(0x508dd9b4, 0xeefb0178),
+              TOBN(0x7ca23706, 0x2dba8652),
+              TOBN(0x62aac5a3, 0x0047abe5),
+              TOBN(0x9a61d2a0, 0x8b1ea7b3),
+              TOBN(0xd495ab63, 0xae8b1485),
+              TOBN(0x38740f84, 0x87052f99),
+              TOBN(0x178ebe5b, 0xb2974eea),
+              TOBN(0x030bbcca, 0x5b36d17f),
+              TOBN(0xb5e4cce3, 0xaaf86eea),
+              TOBN(0xb51a0220, 0x68f8e9e0),
+              TOBN(0xa4348796, 0x09eb3e75),
+              TOBN(0xbe592309, 0xeef1a752),
+              TOBN(0x5d7162d7, 0x6f2aa1ed),
+              TOBN(0xaebfb5ed, 0x0f007dd2),
+              TOBN(0x255e14b2, 0xc89edd22),
+              TOBN(0xba85e072, 0x0303b697),
+              TOBN(0xc5d17e25, 0xf05720ff),
+              TOBN(0x02b58d6e, 0x5128ebb6),
+              TOBN(0x2c80242d, 0xd754e113),
+              TOBN(0x919fca5f, 0xabfae1ca),
+              TOBN(0x937afaac, 0x1a21459b),
+              TOBN(0x9e0ca91c, 0x1f66a4d2),
+              TOBN(0x194cc7f3, 0x23ec1331),
+              TOBN(0xad25143a, 0x8aa11690),
+              TOBN(0xbe40ad8d, 0x09b59e08),
+              TOBN(0x37d60d9b, 0xe750860a),
+              TOBN(0x6c53b008, 0xc6bf434c),
+              TOBN(0xb572415d, 0x1356eb80),
+              TOBN(0xb8bf9da3, 0x9578ded8),
+              TOBN(0x22658e36, 0x5e8fb38b),
+              TOBN(0x9b70ce22, 0x5af8cb22),
+              TOBN(0x7c00018a, 0x829a8180),
+              TOBN(0x84329f93, 0xb81ed295),
+              TOBN(0x7c343ea2, 0x5f3cea83),
+              TOBN(0x38f8655f, 0x67586536),
+              TOBN(0xa661a0d0, 0x1d3ec517),
+              TOBN(0x98744652, 0x512321ae),
+              TOBN(0x084ca591, 0xeca92598),
+              TOBN(0xa9bb9dc9, 0x1dcb3feb),
+              TOBN(0x14c54355, 0x78b4c240),
+              TOBN(0x5ed62a3b, 0x610cafdc),
+              TOBN(0x07512f37, 0x1b38846b),
+              TOBN(0x571bb70a, 0xb0e38161),
+              TOBN(0xb556b95b, 0x2da705d2),
+              TOBN(0x3ef8ada6, 0xb1a08f98),
+              TOBN(0x85302ca7, 0xddecfbe5),
+              TOBN(0x0e530573, 0x943105cd),
+              TOBN(0x60554d55, 0x21a9255d),
+              TOBN(0x63a32fa1, 0xf2f3802a),
+              TOBN(0x35c8c5b0, 0xcd477875),
+              TOBN(0x97f458ea, 0x6ad42da1),
+              TOBN(0x832d7080, 0xeb6b242d),
+              TOBN(0xd30bd023, 0x3b71e246),
+              TOBN(0x7027991b, 0xbe31139d),
+              TOBN(0x68797e91, 0x462e4e53),
+              TOBN(0x423fe20a, 0x6b4e185a),
+              TOBN(0x82f2c67e, 0x42d9b707),
+              TOBN(0x25c81768, 0x4cf7811b),
+              TOBN(0xbd53005e, 0x045bb95d),
+          },
+          {
+              TOBN(0xe5f649be, 0x9d8e68fd),
+              TOBN(0xdb0f0533, 0x1b044320),
+              TOBN(0xf6fde9b3, 0xe0c33398),
+              TOBN(0x92f4209b, 0x66c8cfae),
+              TOBN(0xe9d1afcc, 0x1a739d4b),
+              TOBN(0x09aea75f, 0xa28ab8de),
+              TOBN(0x14375fb5, 0xeac6f1d0),
+              TOBN(0x6420b560, 0x708f7aa5),
+              TOBN(0x9eae499c, 0x6254dc41),
+              TOBN(0x7e293924, 0x7a837e7e),
+              TOBN(0x74aec08c, 0x090524a7),
+              TOBN(0xf82b9219, 0x8d6f55f2),
+              TOBN(0x493c962e, 0x1402cec5),
+              TOBN(0x9f17ca17, 0xfa2f30e7),
+              TOBN(0xbcd783e8, 0xe9b879cb),
+              TOBN(0xea3d8c14, 0x5a6f145f),
+              TOBN(0xdede15e7, 0x5e0dee6e),
+              TOBN(0x74f24872, 0xdc628aa2),
+              TOBN(0xd3e9c4fe, 0x7861bb93),
+              TOBN(0x56d4822a, 0x6187b2e0),
+              TOBN(0xb66417cf, 0xc59826f9),
+              TOBN(0xca260969, 0x2408169e),
+              TOBN(0xedf69d06, 0xc79ef885),
+              TOBN(0x00031f8a, 0xdc7d138f),
+              TOBN(0x103c46e6, 0x0ebcf726),
+              TOBN(0x4482b831, 0x6231470e),
+              TOBN(0x6f6dfaca, 0x487c2109),
+              TOBN(0x2e0ace97, 0x62e666ef),
+              TOBN(0x3246a9d3, 0x1f8d1f42),
+              TOBN(0x1b1e83f1, 0x574944d2),
+              TOBN(0x13dfa63a, 0xa57f334b),
+              TOBN(0x0cf8daed, 0x9f025d81),
+              TOBN(0x30d78ea8, 0x00ee11c1),
+              TOBN(0xeb053cd4, 0xb5e3dd75),
+              TOBN(0x9b65b13e, 0xd58c43c5),
+              TOBN(0xc3ad49bd, 0xbd151663),
+              TOBN(0x99fd8e41, 0xb6427990),
+              TOBN(0x12cf15bd, 0x707eae1e),
+              TOBN(0x29ad4f1b, 0x1aabb71e),
+              TOBN(0x5143e74d, 0x07545d0e),
+              TOBN(0x30266336, 0xc88bdee1),
+              TOBN(0x25f29306, 0x5876767c),
+              TOBN(0x9c078571, 0xc6731996),
+              TOBN(0xc88690b2, 0xed552951),
+              TOBN(0x274f2c2d, 0x852705b4),
+              TOBN(0xb0bf8d44, 0x4e09552d),
+              TOBN(0x7628beeb, 0x986575d1),
+              TOBN(0x407be238, 0x7f864651),
+              TOBN(0x0e5e3049, 0xa639fc6b),
+              TOBN(0xe75c35d9, 0x86003625),
+              TOBN(0x0cf35bd8, 0x5dcc1646),
+              TOBN(0x8bcaced2, 0x6c26273a),
+              TOBN(0xe22ecf1d, 0xb5536742),
+              TOBN(0x013dd897, 0x1a9e068b),
+              TOBN(0x17f411cb, 0x8a7909c5),
+              TOBN(0x5757ac98, 0x861dd506),
+              TOBN(0x85de1f0d, 0x1e935abb),
+              TOBN(0xdefd10b4, 0x154de37a),
+              TOBN(0xb8d9e392, 0x369cebb5),
+              TOBN(0x54d5ef9b, 0x761324be),
+              TOBN(0x4d6341ba, 0x74f17e26),
+              TOBN(0xc0a0e3c8, 0x78c1dde4),
+              TOBN(0xa6d77581, 0x87d918fd),
+              TOBN(0x66876015, 0x02ca3a13),
+              TOBN(0xc7313e9c, 0xf36658f0),
+              TOBN(0xc433ef1c, 0x71f8057e),
+              TOBN(0x85326246, 0x1b6a835a),
+              TOBN(0xc8f05398, 0x7c86394c),
+              TOBN(0xff398cdf, 0xe983c4a1),
+              TOBN(0xbf5e8162, 0x03b7b931),
+              TOBN(0x93193c46, 0xb7b9045b),
+              TOBN(0x1e4ebf5d, 0xa4a6e46b),
+              TOBN(0xf9942a60, 0x43a24fe7),
+              TOBN(0x29c1191e, 0xffb3492b),
+              TOBN(0x9f662449, 0x902fde05),
+              TOBN(0xc792a7ac, 0x6713c32d),
+              TOBN(0x2fd88ad8, 0xb737982c),
+              TOBN(0x7e3a0319, 0xa21e60e3),
+              TOBN(0x09b0de44, 0x7383591a),
+              TOBN(0x6df141ee, 0x8310a456),
+              TOBN(0xaec1a039, 0xe6d6f471),
+              TOBN(0x14b2ba0f, 0x1198d12e),
+              TOBN(0xebc1a160, 0x3aeee5ac),
+              TOBN(0x401f4836, 0xe0b964ce),
+              TOBN(0x2ee43796, 0x4fd03f66),
+              TOBN(0x3fdb4e49, 0xdd8f3f12),
+              TOBN(0x6ef267f6, 0x29380f18),
+              TOBN(0x3e8e9670, 0x8da64d16),
+              TOBN(0xbc19180c, 0x207674f1),
+              TOBN(0x112e09a7, 0x33ae8fdb),
+              TOBN(0x99667554, 0x6aaeb71e),
+              TOBN(0x79432af1, 0xe101b1c7),
+              TOBN(0xd5eb558f, 0xde2ddec6),
+              TOBN(0x81392d1f, 0x5357753f),
+              TOBN(0xa7a76b97, 0x3ae1158a),
+              TOBN(0x416fbbff, 0x4a899991),
+              TOBN(0x9e65fdfd, 0x0d4a9dcf),
+              TOBN(0x7bc29e48, 0x944ddf12),
+              TOBN(0xbc1a92d9, 0x3c856866),
+              TOBN(0x273c6905, 0x6e98dfe2),
+              TOBN(0x69fce418, 0xcdfaa6b8),
+              TOBN(0x606bd823, 0x5061c69f),
+              TOBN(0x42d495a0, 0x6af75e27),
+              TOBN(0x8ed3d505, 0x6d873a1f),
+              TOBN(0xaf552841, 0x6ab25b6a),
+              TOBN(0xc6c0ffc7, 0x2b1a4523),
+              TOBN(0xab18827b, 0x21c99e03),
+              TOBN(0x060e8648, 0x9034691b),
+              TOBN(0x5207f90f, 0x93c7f398),
+              TOBN(0x9f4a96cb, 0x82f8d10b),
+              TOBN(0xdd71cd79, 0x3ad0f9e3),
+              TOBN(0x84f435d2, 0xfc3a54f5),
+              TOBN(0x4b03c55b, 0x8e33787f),
+              TOBN(0xef42f975, 0xa6384673),
+              TOBN(0xff7304f7, 0x5051b9f0),
+              TOBN(0x18aca1dc, 0x741c87c2),
+              TOBN(0x56f120a7, 0x2d4bfe80),
+              TOBN(0xfd823b3d, 0x053e732c),
+              TOBN(0x11bccfe4, 0x7537ca16),
+              TOBN(0xdf6c9c74, 0x1b5a996b),
+              TOBN(0xee7332c7, 0x904fc3fa),
+              TOBN(0x14a23f45, 0xc7e3636a),
+              TOBN(0xc38659c3, 0xf091d9aa),
+              TOBN(0x4a995e5d, 0xb12d8540),
+              TOBN(0x20a53bec, 0xf3a5598a),
+              TOBN(0x56534b17, 0xb1eaa995),
+              TOBN(0x9ed3dca4, 0xbf04e03c),
+              TOBN(0x716c563a, 0xd8d56268),
+              TOBN(0x27ba77a4, 0x1d6178e7),
+              TOBN(0xe4c80c40, 0x68a1ff8e),
+              TOBN(0x75011099, 0x0a13f63d),
+              TOBN(0x7bf33521, 0xa61d46f3),
+              TOBN(0x0aff218e, 0x10b365bb),
+              TOBN(0x81021804, 0x0fd7ea75),
+              TOBN(0x05a3fd8a, 0xa4b3a925),
+              TOBN(0xb829e75f, 0x9b3db4e6),
+              TOBN(0x6bdc75a5, 0x4d53e5fb),
+              TOBN(0x04a5dc02, 0xd52717e3),
+              TOBN(0x86af502f, 0xe9a42ec2),
+              TOBN(0x8867e8fb, 0x2630e382),
+              TOBN(0xbf845c6e, 0xbec9889b),
+              TOBN(0x54f491f2, 0xcb47c98d),
+              TOBN(0xa3091fba, 0x790c2a12),
+              TOBN(0xd7f6fd78, 0xc20f708b),
+              TOBN(0xa569ac30, 0xacde5e17),
+              TOBN(0xd0f996d0, 0x6852b4d7),
+              TOBN(0xe51d4bb5, 0x4609ae54),
+              TOBN(0x3fa37d17, 0x0daed061),
+              TOBN(0x62a88684, 0x34b8fb41),
+              TOBN(0x99a2acbd, 0x9efb64f1),
+              TOBN(0xb75c1a5e, 0x6448e1f2),
+              TOBN(0xfa99951a, 0x42b5a069),
+              TOBN(0x6d956e89, 0x2f3b26e7),
+              TOBN(0xf4709860, 0xda875247),
+              TOBN(0x3ad15179, 0x2482dda3),
+              TOBN(0xd64110e3, 0x017d82f0),
+              TOBN(0x14928d2c, 0xfad414e4),
+              TOBN(0x2b155f58, 0x2ed02b24),
+              TOBN(0x481a141b, 0xcb821bf1),
+              TOBN(0x12e3c770, 0x4f81f5da),
+              TOBN(0xe49c5de5, 0x9fff8381),
+              TOBN(0x11053232, 0x5bbec894),
+              TOBN(0xa0d051cc, 0x454d88c4),
+              TOBN(0x4f6db89c, 0x1f8e531b),
+              TOBN(0x34fe3fd6, 0xca563a44),
+              TOBN(0x7f5c2215, 0x58da8ab9),
+              TOBN(0x8445016d, 0x9474f0a1),
+              TOBN(0x17d34d61, 0xcb7d8a0a),
+              TOBN(0x8e9d3910, 0x1c474019),
+              TOBN(0xcaff2629, 0xd52ceefb),
+              TOBN(0xf9cf3e32, 0xc1622c2b),
+              TOBN(0xd4b95e3c, 0xe9071a05),
+              TOBN(0xfbbca61f, 0x1594438c),
+              TOBN(0x1eb6e6a6, 0x04aadedf),
+              TOBN(0x853027f4, 0x68e14940),
+              TOBN(0x221d322a, 0xdfabda9c),
+              TOBN(0xed8ea9f6, 0xb7cb179a),
+              TOBN(0xdc7b764d, 0xb7934dcc),
+              TOBN(0xfcb13940, 0x5e09180d),
+              TOBN(0x6629a6bf, 0xb47dc2dd),
+              TOBN(0xbfc55e4e, 0x9f5a915e),
+              TOBN(0xb1db9d37, 0x6204441e),
+              TOBN(0xf82d68cf, 0x930c5f53),
+              TOBN(0x17d3a142, 0xcbb605b1),
+              TOBN(0xdd5944ea, 0x308780f2),
+              TOBN(0xdc8de761, 0x3845f5e4),
+              TOBN(0x6beaba7d, 0x7624d7a3),
+              TOBN(0x1e709afd, 0x304df11e),
+              TOBN(0x95364376, 0x02170456),
+              TOBN(0xbf204b3a, 0xc8f94b64),
+              TOBN(0x4e53af7c, 0x5680ca68),
+              TOBN(0x0526074a, 0xe0c67574),
+              TOBN(0x95d8cef8, 0xecd92af6),
+              TOBN(0xe6b9fa7a, 0x6cd1745a),
+              TOBN(0x3d546d3d, 0xa325c3e4),
+              TOBN(0x1f57691d, 0x9ae93aae),
+              TOBN(0xe891f3fe, 0x9d2e1a33),
+              TOBN(0xd430093f, 0xac063d35),
+              TOBN(0xeda59b12, 0x5513a327),
+              TOBN(0xdc2134f3, 0x5536f18f),
+              TOBN(0xaa51fe2c, 0x5c210286),
+              TOBN(0x3f68aaee, 0x1cab658c),
+              TOBN(0x5a23a00b, 0xf9357292),
+              TOBN(0x9a626f39, 0x7efdabed),
+              TOBN(0xfe2b3bf3, 0x199d78e3),
+              TOBN(0xb7a2af77, 0x71bbc345),
+              TOBN(0x3d19827a, 0x1e59802c),
+              TOBN(0x823bbc15, 0xb487a51c),
+              TOBN(0x856139f2, 0x99d0a422),
+              TOBN(0x9ac3df65, 0xf456c6fb),
+              TOBN(0xaddf65c6, 0x701f8bd6),
+              TOBN(0x149f321e, 0x3758df87),
+              TOBN(0xb1ecf714, 0x721b7eba),
+              TOBN(0xe17df098, 0x31a3312a),
+              TOBN(0xdb2fd6ec, 0xd5c4d581),
+              TOBN(0xfd02996f, 0x8fcea1b3),
+              TOBN(0xe29fa63e, 0x7882f14f),
+              TOBN(0xc9f6dc35, 0x07c6cadc),
+              TOBN(0x46f22d6f, 0xb882bed0),
+              TOBN(0x1a45755b, 0xd118e52c),
+              TOBN(0x9f2c7c27, 0x7c4608cf),
+              TOBN(0x7ccbdf32, 0x568012c2),
+              TOBN(0xfcb0aedd, 0x61729b0e),
+              TOBN(0x7ca2ca9e, 0xf7d75dbf),
+              TOBN(0xf58fecb1, 0x6f640f62),
+              TOBN(0xe274b92b, 0x39f51946),
+              TOBN(0x7f4dfc04, 0x6288af44),
+              TOBN(0x0a91f32a, 0xeac329e5),
+              TOBN(0x43ad274b, 0xd6aaba31),
+              TOBN(0x719a1640, 0x0f6884f9),
+              TOBN(0x685d29f6, 0xdaf91e20),
+              TOBN(0x5ec1cc33, 0x27e49d52),
+              TOBN(0x38f4de96, 0x3b54a059),
+              TOBN(0x0e0015e5, 0xefbcfdb3),
+              TOBN(0x177d23d9, 0x4dbb8da6),
+              TOBN(0x98724aa2, 0x97a617ad),
+              TOBN(0x30f0885b, 0xfdb6558e),
+              TOBN(0xf9f7a28a, 0xc7899a96),
+              TOBN(0xd2ae8ac8, 0x872dc112),
+              TOBN(0xfa0642ca, 0x73c3c459),
+              TOBN(0x15296981, 0xe7dfc8d6),
+              TOBN(0x67cd4450, 0x1fb5b94a),
+              TOBN(0x0ec71cf1, 0x0eddfd37),
+              TOBN(0xc7e5eeb3, 0x9a8eddc7),
+              TOBN(0x02ac8e3d, 0x81d95028),
+              TOBN(0x0088f172, 0x70b0e35d),
+              TOBN(0xec041fab, 0xe1881fe3),
+              TOBN(0x62cf71b8, 0xd99e7faa),
+              TOBN(0x5043dea7, 0xe0f222c2),
+              TOBN(0x309d42ac, 0x72e65142),
+              TOBN(0x94fe9ddd, 0x9216cd30),
+              TOBN(0xd6539c7d, 0x0f87feec),
+              TOBN(0x03c5a57c, 0x432ac7d7),
+              TOBN(0x72692cf0, 0x327fda10),
+              TOBN(0xec28c85f, 0x280698de),
+              TOBN(0x2331fb46, 0x7ec283b1),
+              TOBN(0xd34bfa32, 0x2867e633),
+              TOBN(0x78709a82, 0x0a9cc815),
+              TOBN(0xb7fe6964, 0x875e2fa5),
+              TOBN(0x25cc064f, 0x9e98bfb5),
+              TOBN(0x9eb0151c, 0x493a65c5),
+              TOBN(0x5fb5d941, 0x53182464),
+              TOBN(0x69e6f130, 0xf04618e2),
+              TOBN(0xa8ecec22, 0xf89c8ab6),
+              TOBN(0xcd6ac88b, 0xb96209bd),
+              TOBN(0x65fa8cdb, 0xb3e1c9e0),
+              TOBN(0xa47d22f5, 0x4a8d8eac),
+              TOBN(0x83895cdf, 0x8d33f963),
+              TOBN(0xa8adca59, 0xb56cd3d1),
+              TOBN(0x10c8350b, 0xdaf38232),
+              TOBN(0x2b161fb3, 0xa5080a9f),
+              TOBN(0xbe7f5c64, 0x3af65b3a),
+              TOBN(0x2c754039, 0x97403a11),
+              TOBN(0x94626cf7, 0x121b96af),
+              TOBN(0x431de7c4, 0x6a983ec2),
+              TOBN(0x3780dd3a, 0x52cc3df7),
+              TOBN(0xe28a0e46, 0x2baf8e3b),
+              TOBN(0xabe68aad, 0x51d299ae),
+              TOBN(0x603eb8f9, 0x647a2408),
+              TOBN(0x14c61ed6, 0x5c750981),
+              TOBN(0x88b34414, 0xc53352e7),
+              TOBN(0x5a34889c, 0x1337d46e),
+              TOBN(0x612c1560, 0xf95f2bc8),
+              TOBN(0x8a3f8441, 0xd4807a3a),
+              TOBN(0x680d9e97, 0x5224da68),
+              TOBN(0x60cd6e88, 0xc3eb00e9),
+              TOBN(0x3875a98e, 0x9a6bc375),
+              TOBN(0xdc80f924, 0x4fd554c2),
+              TOBN(0x6c4b3415, 0x6ac77407),
+              TOBN(0xa1e5ea8f, 0x25420681),
+              TOBN(0x541bfa14, 0x4607a458),
+              TOBN(0x5dbc7e7a, 0x96d7fbf9),
+              TOBN(0x646a851b, 0x31590a47),
+              TOBN(0x039e85ba, 0x15ee6df8),
+              TOBN(0xd19fa231, 0xd7b43fc0),
+              TOBN(0x84bc8be8, 0x299a0e04),
+              TOBN(0x2b9d2936, 0xf20df03a),
+              TOBN(0x24054382, 0x8608d472),
+              TOBN(0x76b6ba04, 0x9149202a),
+              TOBN(0xb21c3831, 0x3670e7b7),
+              TOBN(0xddd93059, 0xd6fdee10),
+              TOBN(0x9da47ad3, 0x78488e71),
+              TOBN(0x99cc1dfd, 0xa0fcfb25),
+              TOBN(0x42abde10, 0x64696954),
+              TOBN(0x14cc15fc, 0x17eab9fe),
+              TOBN(0xd6e863e4, 0xd3e70972),
+              TOBN(0x29a7765c, 0x6432112c),
+              TOBN(0x88660001, 0x5b0774d8),
+              TOBN(0x3729175a, 0x2c088eae),
+              TOBN(0x13afbcae, 0x8230b8d4),
+              TOBN(0x44768151, 0x915f4379),
+              TOBN(0xf086431a, 0xd8d22812),
+              TOBN(0x37461955, 0xc298b974),
+              TOBN(0x905fb5f0, 0xf8711e04),
+              TOBN(0x787abf3a, 0xfe969d18),
+              TOBN(0x392167c2, 0x6f6a494e),
+              TOBN(0xfc7a0d2d, 0x28c511da),
+              TOBN(0xf127c7dc, 0xb66a262d),
+              TOBN(0xf9c4bb95, 0xfd63fdf0),
+              TOBN(0x90016589, 0x3913ef46),
+              TOBN(0x74d2a73c, 0x11aa600d),
+              TOBN(0x2f5379bd, 0x9fb5ab52),
+              TOBN(0xe49e53a4, 0x7fb70068),
+              TOBN(0x68dd39e5, 0x404aa9a7),
+              TOBN(0xb9b0cf57, 0x2ecaa9c3),
+              TOBN(0xba0e103b, 0xe824826b),
+              TOBN(0x60c2198b, 0x4631a3c4),
+              TOBN(0xc5ff84ab, 0xfa8966a2),
+              TOBN(0x2d6ebe22, 0xac95aff8),
+              TOBN(0x1c9bb6db, 0xb5a46d09),
+              TOBN(0x419062da, 0x53ee4f8d),
+              TOBN(0x7b9042d0, 0xbb97efef),
+              TOBN(0x0f87f080, 0x830cf6bd),
+              TOBN(0x4861d19a, 0x6ec8a6c6),
+              TOBN(0xd3a0daa1, 0x202f01aa),
+              TOBN(0xb0111674, 0xf25afbd5),
+              TOBN(0x6d00d6cf, 0x1afb20d9),
+              TOBN(0x13695000, 0x40671bc5),
+              TOBN(0x913ab0dc, 0x2485ea9b),
+              TOBN(0x1f2bed06, 0x9eef61ac),
+              TOBN(0x850c8217, 0x6d799e20),
+              TOBN(0x93415f37, 0x3271c2de),
+              TOBN(0x5afb06e9, 0x6c4f5910),
+              TOBN(0x688a52df, 0xc4e9e421),
+              TOBN(0x30495ba3, 0xe2a9a6db),
+              TOBN(0x4601303d, 0x58f9268b),
+              TOBN(0xbe3b0dad, 0x7eb0f04f),
+              TOBN(0x4ea47250, 0x4456936d),
+              TOBN(0x8caf8798, 0xd33fd3e7),
+              TOBN(0x1ccd8a89, 0xeb433708),
+              TOBN(0x9effe3e8, 0x87fd50ad),
+              TOBN(0xbe240a56, 0x6b29c4df),
+              TOBN(0xec4ffd98, 0xca0e7ebd),
+              TOBN(0xf586783a, 0xe748616e),
+              TOBN(0xa5b00d8f, 0xc77baa99),
+              TOBN(0x0acada29, 0xb4f34c9c),
+              TOBN(0x36dad67d, 0x0fe723ac),
+              TOBN(0x1d8e53a5, 0x39c36c1e),
+              TOBN(0xe4dd342d, 0x1f4bea41),
+              TOBN(0x64fd5e35, 0xebc9e4e0),
+              TOBN(0x96f01f90, 0x57908805),
+              TOBN(0xb5b9ea3d, 0x5ed480dd),
+              TOBN(0x366c5dc2, 0x3efd2dd0),
+              TOBN(0xed2fe305, 0x6e9dfa27),
+              TOBN(0x4575e892, 0x6e9197e2),
+              TOBN(0x11719c09, 0xab502a5d),
+              TOBN(0x264c7bec, 0xe81f213f),
+              TOBN(0x741b9241, 0x55f5c457),
+              TOBN(0x78ac7b68, 0x49a5f4f4),
+              TOBN(0xf91d70a2, 0x9fc45b7d),
+              TOBN(0x39b05544, 0xb0f5f355),
+              TOBN(0x11f06bce, 0xeef930d9),
+              TOBN(0xdb84d25d, 0x038d05e1),
+              TOBN(0x04838ee5, 0xbacc1d51),
+              TOBN(0x9da3ce86, 0x9e8ee00b),
+              TOBN(0xc3412057, 0xc36eda1f),
+              TOBN(0xae80b913, 0x64d9c2f4),
+              TOBN(0x7468bac3, 0xa010a8ff),
+              TOBN(0xdfd20037, 0x37359d41),
+              TOBN(0x1a0f5ab8, 0x15efeacc),
+              TOBN(0x7c25ad2f, 0x659d0ce0),
+              TOBN(0x4011bcbb, 0x6785cff1),
+              TOBN(0x128b9912, 0x7e2192c7),
+              TOBN(0xa549d8e1, 0x13ccb0e8),
+              TOBN(0x805588d8, 0xc85438b1),
+              TOBN(0x5680332d, 0xbc25cb27),
+              TOBN(0xdcd1bc96, 0x1a4bfdf4),
+              TOBN(0x779ff428, 0x706f6566),
+              TOBN(0x8bbee998, 0xf059987a),
+              TOBN(0xf6ce8cf2, 0xcc686de7),
+              TOBN(0xf8ad3c4a, 0x953cfdb2),
+              TOBN(0xd1d426d9, 0x2205da36),
+              TOBN(0xb3c0f13f, 0xc781a241),
+              TOBN(0x3e89360e, 0xd75362a8),
+              TOBN(0xccd05863, 0xc8a91184),
+              TOBN(0x9bd0c9b7, 0xefa8a7f4),
+              TOBN(0x97ee4d53, 0x8a912a4b),
+              TOBN(0xde5e15f8, 0xbcf518fd),
+              TOBN(0x6a055bf8, 0xc467e1e0),
+              TOBN(0x10be4b4b, 0x1587e256),
+              TOBN(0xd90c14f2, 0x668621c9),
+              TOBN(0xd5518f51, 0xab9c92c1),
+              TOBN(0x8e6a0100, 0xd6d47b3c),
+              TOBN(0xcbe980dd, 0x66716175),
+              TOBN(0x500d3f10, 0xddd83683),
+              TOBN(0x3b6cb35d, 0x99cac73c),
+              TOBN(0x53730c8b, 0x6083d550),
+              TOBN(0xcf159767, 0xdf0a1987),
+              TOBN(0x84bfcf53, 0x43ad73b3),
+              TOBN(0x1b528c20, 0x4f035a94),
+              TOBN(0x4294edf7, 0x33eeac69),
+              TOBN(0xb6283e83, 0x817f3240),
+              TOBN(0xc3fdc959, 0x0a5f25b1),
+              TOBN(0xefaf8aa5, 0x5844ee22),
+              TOBN(0xde269ba5, 0xdbdde4de),
+              TOBN(0xe3347160, 0xc56133bf),
+              TOBN(0xc1184219, 0x8d9ea9f8),
+              TOBN(0x090de5db, 0xf3fc1ab5),
+              TOBN(0x404c37b1, 0x0bf22cda),
+              TOBN(0x7de20ec8, 0xf5618894),
+              TOBN(0x754c588e, 0xecdaecab),
+              TOBN(0x6ca4b0ed, 0x88342743),
+              TOBN(0x76f08bdd, 0xf4a938ec),
+              TOBN(0xd182de89, 0x91493ccb),
+              TOBN(0xd652c53e, 0xc8a4186a),
+              TOBN(0xb3e878db, 0x946d8e33),
+              TOBN(0x088453c0, 0x5f37663c),
+              TOBN(0x5cd9daaa, 0xb407748b),
+              TOBN(0xa1f5197f, 0x586d5e72),
+              TOBN(0x47500be8, 0xc443ca59),
+              TOBN(0x78ef35b2, 0xe2652424),
+              TOBN(0x09c5d26f, 0x6dd7767d),
+              TOBN(0x7175a79a, 0xa74d3f7b),
+              TOBN(0x0428fd8d, 0xcf5ea459),
+              TOBN(0x511cb97c, 0xa5d1746d),
+              TOBN(0x36363939, 0xe71d1278),
+              TOBN(0xcf2df955, 0x10350bf4),
+              TOBN(0xb3817439, 0x60aae782),
+              TOBN(0xa748c0e4, 0x3e688809),
+              TOBN(0x98021fbf, 0xd7a5a006),
+              TOBN(0x9076a70c, 0x0e367a98),
+              TOBN(0xbea1bc15, 0x0f62b7c2),
+              TOBN(0x2645a68c, 0x30fe0343),
+              TOBN(0xacaffa78, 0x699dc14f),
+              TOBN(0xf4469964, 0x457bf9c4),
+              TOBN(0x0db6407b, 0x0d2ead83),
+              TOBN(0x68d56cad, 0xb2c6f3eb),
+              TOBN(0x3b512e73, 0xf376356c),
+              TOBN(0xe43b0e1f, 0xfce10408),
+              TOBN(0x89ddc003, 0x5a5e257d),
+              TOBN(0xb0ae0d12, 0x0362e5b3),
+              TOBN(0x07f983c7, 0xb0519161),
+              TOBN(0xc2e94d15, 0x5d5231e7),
+              TOBN(0xcff22aed, 0x0b4f9513),
+              TOBN(0xb02588dd, 0x6ad0b0b5),
+              TOBN(0xb967d1ac, 0x11d0dcd5),
+              TOBN(0x8dac6bc6, 0xcf777b6c),
+              TOBN(0x0062bdbd, 0x4c6d1959),
+              TOBN(0x53da71b5, 0x0ef5cc85),
+              TOBN(0x07012c7d, 0x4006f14f),
+              TOBN(0x4617f962, 0xac47800d),
+              TOBN(0x53365f2b, 0xc102ed75),
+              TOBN(0xb422efcb, 0x4ab8c9d3),
+              TOBN(0x195cb26b, 0x34af31c9),
+              TOBN(0x3a926e29, 0x05f2c4ce),
+              TOBN(0xbd2bdecb, 0x9856966c),
+              TOBN(0x5d16ab3a, 0x85527015),
+              TOBN(0x9f81609e, 0x4486c231),
+              TOBN(0xd8b96b2c, 0xda350002),
+              TOBN(0xbd054690, 0xfa1b7d36),
+              TOBN(0xdc90ebf5, 0xe71d79bc),
+              TOBN(0xf241b6f9, 0x08964e4e),
+              TOBN(0x7c838643, 0x2fe3cd4c),
+              TOBN(0xe0f33acb, 0xb4bc633c),
+              TOBN(0xb4a9ecec, 0x3d139f1f),
+              TOBN(0x05ce69cd, 0xdc4a1f49),
+              TOBN(0xa19d1b16, 0xf5f98aaf),
+              TOBN(0x45bb71d6, 0x6f23e0ef),
+              TOBN(0x33789fcd, 0x46cdfdd3),
+              TOBN(0x9b8e2978, 0xcee040ca),
+              TOBN(0x9c69b246, 0xae0a6828),
+              TOBN(0xba533d24, 0x7078d5aa),
+              TOBN(0x7a2e42c0, 0x7bb4fbdb),
+              TOBN(0xcfb4879a, 0x7035385c),
+              TOBN(0x8c3dd30b, 0x3281705b),
+              TOBN(0x7e361c6c, 0x404fe081),
+              TOBN(0x7b21649c, 0x3f604edf),
+              TOBN(0x5dbf6a3f, 0xe52ffe47),
+              TOBN(0xc41b7c23, 0x4b54d9bf),
+              TOBN(0x1374e681, 0x3511c3d9),
+              TOBN(0x1863bf16, 0xc1b2b758),
+              TOBN(0x90e78507, 0x1e9e6a96),
+              TOBN(0xab4bf98d, 0x5d86f174),
+              TOBN(0xd74e0bd3, 0x85e96fe4),
+              TOBN(0x8afde39f, 0xcac5d344),
+              TOBN(0x90946dbc, 0xbd91b847),
+              TOBN(0xf5b42358, 0xfe1a838c),
+              TOBN(0x05aae6c5, 0x620ac9d8),
+              TOBN(0x8e193bd8, 0xa1ce5a0b),
+              TOBN(0x8f710571, 0x4dabfd72),
+              TOBN(0x8d8fdd48, 0x182caaac),
+              TOBN(0x8c4aeefa, 0x040745cf),
+              TOBN(0x73c6c30a, 0xf3b93e6d),
+              TOBN(0x991241f3, 0x16f42011),
+              TOBN(0xa0158eea, 0xe457a477),
+              TOBN(0xd19857db, 0xee6ddc05),
+              TOBN(0xb3265224, 0x18c41671),
+              TOBN(0x3ffdfc7e, 0x3c2c0d58),
+              TOBN(0x3a3a5254, 0x26ee7cda),
+              TOBN(0x341b0869, 0xdf02c3a8),
+              TOBN(0xa023bf42, 0x723bbfc8),
+              TOBN(0x3d15002a, 0x14452691),
+          },
+          {
+              TOBN(0x5ef7324c, 0x85edfa30),
+              TOBN(0x25976554, 0x87d4f3da),
+              TOBN(0x352f5bc0, 0xdcb50c86),
+              TOBN(0x8f6927b0, 0x4832a96c),
+              TOBN(0xd08ee1ba, 0x55f2f94c),
+              TOBN(0x6a996f99, 0x344b45fa),
+              TOBN(0xe133cb8d, 0xa8aa455d),
+              TOBN(0x5d0721ec, 0x758dc1f7),
+              TOBN(0x6ba7a920, 0x79e5fb67),
+              TOBN(0xe1331feb, 0x70aa725e),
+              TOBN(0x5080ccf5, 0x7df5d837),
+              TOBN(0xe4cae01d, 0x7ff72e21),
+              TOBN(0xd9243ee6, 0x0412a77d),
+              TOBN(0x06ff7cac, 0xdf449025),
+              TOBN(0xbe75f7cd, 0x23ef5a31),
+              TOBN(0xbc957822, 0x0ddef7a8),
+              TOBN(0x8cf7230c, 0xb0ce1c55),
+              TOBN(0x5b534d05, 0x0bbfb607),
+              TOBN(0xee1ef113, 0x0e16363b),
+              TOBN(0x27e0aa7a, 0xb4999e82),
+              TOBN(0xce1dac2d, 0x79362c41),
+              TOBN(0x67920c90, 0x91bb6cb0),
+              TOBN(0x1e648d63, 0x2223df24),
+              TOBN(0x0f7d9eef, 0xe32e8f28),
+              TOBN(0x6943f39a, 0xfa833834),
+              TOBN(0x22951722, 0xa6328562),
+              TOBN(0x81d63dd5, 0x4170fc10),
+              TOBN(0x9f5fa58f, 0xaecc2e6d),
+              TOBN(0xb66c8725, 0xe77d9a3b),
+              TOBN(0x11235cea, 0x6384ebe0),
+              TOBN(0x06a8c118, 0x5845e24a),
+              TOBN(0x0137b286, 0xebd093b1),
+              TOBN(0xc589e1ce, 0x44ace150),
+              TOBN(0xe0f8d3d9, 0x4381e97c),
+              TOBN(0x59e99b11, 0x62c5a4b8),
+              TOBN(0x90d262f7, 0xfd0ec9f9),
+              TOBN(0xfbc854c9, 0x283e13c9),
+              TOBN(0x2d04fde7, 0xaedc7085),
+              TOBN(0x057d7765, 0x47dcbecb),
+              TOBN(0x8dbdf591, 0x9a76fa5f),
+              TOBN(0xd0150695, 0x0de1e578),
+              TOBN(0x2e1463e7, 0xe9f72bc6),
+              TOBN(0xffa68441, 0x1b39eca5),
+              TOBN(0x673c8530, 0x7c037f2f),
+              TOBN(0xd0d6a600, 0x747f91da),
+              TOBN(0xb08d43e1, 0xc9cb78e9),
+              TOBN(0x0fc0c644, 0x27b5cef5),
+              TOBN(0x5c1d160a, 0xa60a2fd6),
+              TOBN(0xf98cae53, 0x28c8e13b),
+              TOBN(0x375f10c4, 0xb2eddcd1),
+              TOBN(0xd4eb8b7f, 0x5cce06ad),
+              TOBN(0xb4669f45, 0x80a2e1ef),
+              TOBN(0xd593f9d0, 0x5bbd8699),
+              TOBN(0x5528a4c9, 0xe7976d13),
+              TOBN(0x3923e095, 0x1c7e28d3),
+              TOBN(0xb9293790, 0x3f6bb577),
+              TOBN(0xdb567d6a, 0xc42bd6d2),
+              TOBN(0x6df86468, 0xbb1f96ae),
+              TOBN(0x0efe5b1a, 0x4843b28e),
+              TOBN(0x961bbb05, 0x6379b240),
+              TOBN(0xb6caf5f0, 0x70a6a26b),
+              TOBN(0x70686c0d, 0x328e6e39),
+              TOBN(0x80da06cf, 0x895fc8d3),
+              TOBN(0x804d8810, 0xb363fdc9),
+              TOBN(0xbe22877b, 0x207f1670),
+              TOBN(0x9b0dd188, 0x4e615291),
+              TOBN(0x625ae8dc, 0x97a3c2bf),
+              TOBN(0x08584ef7, 0x439b86e8),
+              TOBN(0xde7190a5, 0xdcd898ff),
+              TOBN(0x26286c40, 0x2058ee3d),
+              TOBN(0x3db0b217, 0x5f87b1c1),
+              TOBN(0xcc334771, 0x102a6db5),
+              TOBN(0xd99de954, 0x2f770fb1),
+              TOBN(0x97c1c620, 0x4cd7535e),
+              TOBN(0xd3b6c448, 0x3f09cefc),
+              TOBN(0xd725af15, 0x5a63b4f8),
+              TOBN(0x0c95d24f, 0xc01e20ec),
+              TOBN(0xdfd37494, 0x9ae7121f),
+              TOBN(0x7d6ddb72, 0xec77b7ec),
+              TOBN(0xfe079d3b, 0x0353a4ae),
+              TOBN(0x3066e70a, 0x2e6ac8d2),
+              TOBN(0x9c6b5a43, 0x106e5c05),
+              TOBN(0x52d3c6f5, 0xede59b8c),
+              TOBN(0x30d6a5c3, 0xfccec9ae),
+              TOBN(0xedec7c22, 0x4fc0a9ef),
+              TOBN(0x190ff083, 0x95c16ced),
+              TOBN(0xbe12ec8f, 0x94de0fde),
+              TOBN(0x0d131ab8, 0x852d3433),
+              TOBN(0x42ace07e, 0x85701291),
+              TOBN(0x94793ed9, 0x194061a8),
+              TOBN(0x30e83ed6, 0xd7f4a485),
+              TOBN(0x9eec7269, 0xf9eeff4d),
+              TOBN(0x90acba59, 0x0c9d8005),
+              TOBN(0x5feca458, 0x1e79b9d1),
+              TOBN(0x8fbe5427, 0x1d506a1e),
+              TOBN(0xa32b2c8e, 0x2439cfa7),
+              TOBN(0x1671c173, 0x73dd0b4e),
+              TOBN(0x37a28214, 0x44a054c6),
+              TOBN(0x81760a1b, 0x4e8b53f1),
+              TOBN(0xa6c04224, 0xf9f93b9e),
+              TOBN(0x18784b34, 0xcf671e3c),
+              TOBN(0x81bbecd2, 0xcda9b994),
+              TOBN(0x38831979, 0xb2ab3848),
+              TOBN(0xef54feb7, 0xf2e03c2d),
+              TOBN(0xcf197ca7, 0xfb8088fa),
+              TOBN(0x01427247, 0x4ddc96c5),
+              TOBN(0xa2d2550a, 0x30777176),
+              TOBN(0x53469898, 0x4d0cf71d),
+              TOBN(0x6ce937b8, 0x3a2aaac6),
+              TOBN(0xe9f91dc3, 0x5af38d9b),
+              TOBN(0x2598ad83, 0xc8bf2899),
+              TOBN(0x8e706ac9, 0xb5536c16),
+              TOBN(0x40dc7495, 0xf688dc98),
+              TOBN(0x26490cd7, 0x124c4afc),
+              TOBN(0xe651ec84, 0x1f18775c),
+              TOBN(0x393ea6c3, 0xb4fdaf4a),
+              TOBN(0x1e1f3343, 0x7f338e0d),
+              TOBN(0x39fb832b, 0x6053e7b5),
+              TOBN(0x46e702da, 0x619e14d5),
+              TOBN(0x859cacd1, 0xcdeef6e0),
+              TOBN(0x63b99ce7, 0x4462007d),
+              TOBN(0xb8ab48a5, 0x4cb5f5b7),
+              TOBN(0x9ec673d2, 0xf55edde7),
+              TOBN(0xd1567f74, 0x8cfaefda),
+              TOBN(0x46381b6b, 0x0887bcec),
+              TOBN(0x694497ce, 0xe178f3c2),
+              TOBN(0x5e6525e3, 0x1e6266cb),
+              TOBN(0x5931de26, 0x697d6413),
+              TOBN(0x87f8df7c, 0x0e58d493),
+              TOBN(0xb1ae5ed0, 0x58b73f12),
+              TOBN(0xc368f784, 0xdea0c34d),
+              TOBN(0x9bd0a120, 0x859a91a0),
+              TOBN(0xb00d88b7, 0xcc863c68),
+              TOBN(0x3a1cc11e, 0x3d1f4d65),
+              TOBN(0xea38e0e7, 0x0aa85593),
+              TOBN(0x37f13e98, 0x7dc4aee8),
+              TOBN(0x10d38667, 0xbc947bad),
+              TOBN(0x738e07ce, 0x2a36ee2e),
+              TOBN(0xc93470cd, 0xc577fcac),
+              TOBN(0xdee1b616, 0x2782470d),
+              TOBN(0x36a25e67, 0x2e793d12),
+              TOBN(0xd6aa6cae, 0xe0f186da),
+              TOBN(0x474d0fd9, 0x80e07af7),
+              TOBN(0xf7cdc47d, 0xba8a5cd4),
+              TOBN(0x28af6d9d, 0xab15247f),
+              TOBN(0x7c789c10, 0x493a537f),
+              TOBN(0x7ac9b110, 0x23a334e7),
+              TOBN(0x0236ac09, 0x12c9c277),
+              TOBN(0xa7e5bd25, 0x1d7a5144),
+              TOBN(0x098b9c2a, 0xf13ec4ec),
+              TOBN(0x3639daca, 0xd3f0abca),
+              TOBN(0x642da81a, 0xa23960f9),
+              TOBN(0x7d2e5c05, 0x4f7269b1),
+              TOBN(0xfcf30777, 0xe287c385),
+              TOBN(0x10edc84f, 0xf2a46f21),
+              TOBN(0x35441757, 0x4f43fa36),
+              TOBN(0xf1327899, 0xfd703431),
+              TOBN(0xa438d7a6, 0x16dd587a),
+              TOBN(0x65c34c57, 0xe9c8352d),
+              TOBN(0xa728edab, 0x5cc5a24e),
+              TOBN(0xaed78abc, 0x42531689),
+              TOBN(0x0a51a0e8, 0x010963ef),
+              TOBN(0x5776fa0a, 0xd717d9b3),
+              TOBN(0xf356c239, 0x7dd3428b),
+              TOBN(0x29903fff, 0x8d3a3dac),
+              TOBN(0x409597fa, 0x3d94491f),
+              TOBN(0x4cd7a5ff, 0xbf4a56a4),
+              TOBN(0xe5096474, 0x8adab462),
+              TOBN(0xa97b5126, 0x5c3427b0),
+              TOBN(0x6401405c, 0xd282c9bd),
+              TOBN(0x3629f8d7, 0x222c5c45),
+              TOBN(0xb1c02c16, 0xe8d50aed),
+              TOBN(0xbea2ed75, 0xd9635bc9),
+              TOBN(0x226790c7, 0x6e24552f),
+              TOBN(0x3c33f2a3, 0x65f1d066),
+              TOBN(0x2a43463e, 0x6dfccc2e),
+              TOBN(0x8cc3453a, 0xdb483761),
+              TOBN(0xe7cc6085, 0x65d5672b),
+              TOBN(0x277ed6cb, 0xde3efc87),
+              TOBN(0x19f2f368, 0x69234eaf),
+              TOBN(0x9aaf4317, 0x5c0b800b),
+              TOBN(0x1f1e7c89, 0x8b6da6e2),
+              TOBN(0x6cfb4715, 0xb94ec75e),
+              TOBN(0xd590dd5f, 0x453118c2),
+              TOBN(0x14e49da1, 0x1f17a34c),
+              TOBN(0x5420ab39, 0x235a1456),
+              TOBN(0xb7637241, 0x2f50363b),
+              TOBN(0x7b15d623, 0xc3fabb6e),
+              TOBN(0xa0ef40b1, 0xe274e49c),
+              TOBN(0x5cf50744, 0x96b1860a),
+              TOBN(0xd6583fbf, 0x66afe5a4),
+              TOBN(0x44240510, 0xf47e3e9a),
+              TOBN(0x99254343, 0x11b2d595),
+              TOBN(0xf1367499, 0xeec8df57),
+              TOBN(0x3cb12c61, 0x3e73dd05),
+              TOBN(0xd248c033, 0x7dac102a),
+              TOBN(0xcf154f13, 0xa77739f5),
+              TOBN(0xbf4288cb, 0x23d2af42),
+              TOBN(0xaa64c9b6, 0x32e4a1cf),
+              TOBN(0xee8c07a8, 0xc8a208f3),
+              TOBN(0xe10d4999, 0x6fe8393f),
+              TOBN(0x0f809a3f, 0xe91f3a32),
+              TOBN(0x61096d1c, 0x802f63c8),
+              TOBN(0x289e1462, 0x57750d3d),
+              TOBN(0xed06167e, 0x9889feea),
+              TOBN(0xd5c9c0e2, 0xe0993909),
+              TOBN(0x46fca0d8, 0x56508ac6),
+              TOBN(0x91826047, 0x4f1b8e83),
+              TOBN(0x4f2c877a, 0x9a4a2751),
+              TOBN(0x71bd0072, 0xcae6fead),
+              TOBN(0x38df8dcc, 0x06aa1941),
+              TOBN(0x5a074b4c, 0x63beeaa8),
+              TOBN(0xd6d65934, 0xc1cec8ed),
+              TOBN(0xa6ecb49e, 0xaabc03bd),
+              TOBN(0xaade91c2, 0xde8a8415),
+              TOBN(0xcfb0efdf, 0x691136e0),
+              TOBN(0x11af45ee, 0x23ab3495),
+              TOBN(0xa132df88, 0x0b77463d),
+              TOBN(0x8923c15c, 0x815d06f4),
+              TOBN(0xc3ceb3f5, 0x0d61a436),
+              TOBN(0xaf52291d, 0xe88fb1da),
+              TOBN(0xea057974, 0x1da12179),
+              TOBN(0xb0d7218c, 0xd2fef720),
+              TOBN(0x6c0899c9, 0x8e1d8845),
+              TOBN(0x98157504, 0x752ddad7),
+              TOBN(0xd60bd74f, 0xa1a68a97),
+              TOBN(0x7047a3a9, 0xf658fb99),
+              TOBN(0x1f5d86d6, 0x5f8511e4),
+              TOBN(0xb8a4bc42, 0x4b5a6d88),
+              TOBN(0x69eb2c33, 0x1abefa7d),
+              TOBN(0x95bf39e8, 0x13c9c510),
+              TOBN(0xf571960a, 0xd48aab43),
+              TOBN(0x7e8cfbcf, 0x704e23c6),
+              TOBN(0xc71b7d22, 0x28aaa65b),
+              TOBN(0xa041b2bd, 0x245e3c83),
+              TOBN(0x69b98834, 0xd21854ff),
+              TOBN(0x89d227a3, 0x963bfeec),
+              TOBN(0x99947aaa, 0xde7da7cb),
+              TOBN(0x1d9ee9db, 0xee68a9b1),
+              TOBN(0x0a08f003, 0x698ec368),
+              TOBN(0xe9ea4094, 0x78ef2487),
+              TOBN(0xc8d2d415, 0x02cfec26),
+              TOBN(0xc52f9a6e, 0xb7dcf328),
+              TOBN(0x0ed489e3, 0x85b6a937),
+              TOBN(0x9b94986b, 0xbef3366e),
+              TOBN(0x0de59c70, 0xedddddb8),
+              TOBN(0xffdb748c, 0xeadddbe2),
+              TOBN(0x9b9784bb, 0x8266ea40),
+              TOBN(0x142b5502, 0x1a93507a),
+              TOBN(0xb4cd1187, 0x8d3c06cf),
+              TOBN(0xdf70e76a, 0x91ec3f40),
+              TOBN(0x484e81ad, 0x4e7553c2),
+              TOBN(0x830f87b5, 0x272e9d6e),
+              TOBN(0xea1c93e5, 0xc6ff514a),
+              TOBN(0x67cc2adc, 0xc4192a8e),
+              TOBN(0xc77e27e2, 0x42f4535a),
+              TOBN(0x9cdbab36, 0xd2b713c5),
+              TOBN(0x86274ea0, 0xcf7b0cd3),
+              TOBN(0x784680f3, 0x09af826b),
+              TOBN(0xbfcc837a, 0x0c72dea3),
+              TOBN(0xa8bdfe9d, 0xd6529b73),
+              TOBN(0x708aa228, 0x63a88002),
+              TOBN(0x6c7a9a54, 0xc91d45b9),
+              TOBN(0xdf1a38bb, 0xfd004f56),
+              TOBN(0x2e8c9a26, 0xb8bad853),
+              TOBN(0x2d52cea3, 0x3723eae7),
+              TOBN(0x054d6d81, 0x56ca2830),
+              TOBN(0xa3317d14, 0x9a8dc411),
+              TOBN(0xa08662fe, 0xfd4ddeda),
+              TOBN(0xed2a153a, 0xb55d792b),
+              TOBN(0x7035c16a, 0xbfc6e944),
+              TOBN(0xb6bc5834, 0x00171cf3),
+              TOBN(0xe27152b3, 0x83d102b6),
+              TOBN(0xfe695a47, 0x0646b848),
+              TOBN(0xa5bb09d8, 0x916e6d37),
+              TOBN(0xb4269d64, 0x0d17015e),
+              TOBN(0x8d8156a1, 0x0a1d2285),
+              TOBN(0xfeef6c51, 0x46d26d72),
+              TOBN(0x9dac57c8, 0x4c5434a7),
+              TOBN(0x0282e5be, 0x59d39e31),
+              TOBN(0xedfff181, 0x721c486d),
+              TOBN(0x301baf10, 0xbc58824e),
+              TOBN(0x8136a6aa, 0x00570031),
+              TOBN(0x55aaf78c, 0x1cddde68),
+              TOBN(0x26829371, 0x59c63952),
+              TOBN(0x3a3bd274, 0x8bc25baf),
+              TOBN(0xecdf8657, 0xb7e52dc3),
+              TOBN(0x2dd8c087, 0xfd78e6c8),
+              TOBN(0x20553274, 0xf5531461),
+              TOBN(0x8b4a1281, 0x5d95499b),
+              TOBN(0xe2c8763a, 0x1a80f9d2),
+              TOBN(0xd1dbe32b, 0x4ddec758),
+              TOBN(0xaf12210d, 0x30c34169),
+              TOBN(0xba74a953, 0x78baa533),
+              TOBN(0x3d133c6e, 0xa438f254),
+              TOBN(0xa431531a, 0x201bef5b),
+              TOBN(0x15295e22, 0xf669d7ec),
+              TOBN(0xca374f64, 0x357fb515),
+              TOBN(0x8a8406ff, 0xeaa3fdb3),
+              TOBN(0x106ae448, 0xdf3f2da8),
+              TOBN(0x8f9b0a90, 0x33c8e9a1),
+              TOBN(0x234645e2, 0x71ad5885),
+              TOBN(0x3d083224, 0x1c0aed14),
+              TOBN(0xf10a7d3e, 0x7a942d46),
+              TOBN(0x7c11deee, 0x40d5c9be),
+              TOBN(0xb2bae7ff, 0xba84ed98),
+              TOBN(0x93e97139, 0xaad58ddd),
+              TOBN(0x3d872796, 0x3f6d1fa3),
+              TOBN(0x483aca81, 0x8569ff13),
+              TOBN(0x8b89a5fb, 0x9a600f72),
+              TOBN(0x4cbc27c3, 0xc06f2b86),
+              TOBN(0x22130713, 0x63ad9c0b),
+              TOBN(0xb5358b1e, 0x48ac2840),
+              TOBN(0x18311294, 0xecba9477),
+              TOBN(0xda58f990, 0xa6946b43),
+              TOBN(0x3098baf9, 0x9ab41819),
+              TOBN(0x66c4c158, 0x4198da52),
+              TOBN(0xab4fc17c, 0x146bfd1b),
+              TOBN(0x2f0a4c3c, 0xbf36a908),
+              TOBN(0x2ae9e34b, 0x58cf7838),
+              TOBN(0xf411529e, 0x3fa11b1f),
+              TOBN(0x21e43677, 0x974af2b4),
+              TOBN(0x7c20958e, 0xc230793b),
+              TOBN(0x710ea885, 0x16e840f3),
+              TOBN(0xfc0b21fc, 0xc5dc67cf),
+              TOBN(0x08d51647, 0x88405718),
+              TOBN(0xd955c21f, 0xcfe49eb7),
+              TOBN(0x9722a5d5, 0x56dd4a1f),
+              TOBN(0xc9ef50e2, 0xc861baa5),
+              TOBN(0xc0c21a5d, 0x9505ac3e),
+              TOBN(0xaf6b9a33, 0x8b7c063f),
+              TOBN(0xc6370339, 0x2f4779c1),
+              TOBN(0x22df99c7, 0x638167c3),
+              TOBN(0xfe6ffe76, 0x795db30c),
+              TOBN(0x2b822d33, 0xa4854989),
+              TOBN(0xfef031dd, 0x30563aa5),
+              TOBN(0x16b09f82, 0xd57c667f),
+              TOBN(0xc70312ce, 0xcc0b76f1),
+              TOBN(0xbf04a9e6, 0xc9118aec),
+              TOBN(0x82fcb419, 0x3409d133),
+              TOBN(0x1a8ab385, 0xab45d44d),
+              TOBN(0xfba07222, 0x617b83a3),
+              TOBN(0xb05f50dd, 0x58e81b52),
+              TOBN(0x1d8db553, 0x21ce5aff),
+              TOBN(0x3097b8d4, 0xe344a873),
+              TOBN(0x7d8d116d, 0xfe36d53e),
+              TOBN(0x6db22f58, 0x7875e750),
+              TOBN(0x2dc5e373, 0x43e144ea),
+              TOBN(0xc05f32e6, 0xe799eb95),
+              TOBN(0xe9e5f4df, 0x6899e6ec),
+              TOBN(0xbdc3bd68, 0x1fab23d5),
+              TOBN(0xb72b8ab7, 0x73af60e6),
+              TOBN(0x8db27ae0, 0x2cecc84a),
+              TOBN(0x600016d8, 0x7bdb871c),
+              TOBN(0x42a44b13, 0xd7c46f58),
+              TOBN(0xb8919727, 0xc3a77d39),
+              TOBN(0xcfc6bbbd, 0xdafd6088),
+              TOBN(0x1a740146, 0x6bd20d39),
+              TOBN(0x8c747abd, 0x98c41072),
+              TOBN(0x4c91e765, 0xbdf68ea1),
+              TOBN(0x7c95e5ca, 0x08819a78),
+              TOBN(0xcf48b729, 0xc9587921),
+              TOBN(0x091c7c5f, 0xdebbcc7d),
+              TOBN(0x6f287404, 0xf0e05149),
+              TOBN(0xf83b5ac2, 0x26cd44ec),
+              TOBN(0x88ae32a6, 0xcfea250e),
+              TOBN(0x6ac5047a, 0x1d06ebc5),
+              TOBN(0xc7e550b4, 0xd434f781),
+              TOBN(0x61ab1cf2, 0x5c727bd2),
+              TOBN(0x2e4badb1, 0x1cf915b0),
+              TOBN(0x1b4dadec, 0xf69d3920),
+              TOBN(0xe61b1ca6, 0xf14c1dfe),
+              TOBN(0x90b479cc, 0xbd6bd51f),
+              TOBN(0x8024e401, 0x8045ec30),
+              TOBN(0xcab29ca3, 0x25ef0e62),
+              TOBN(0x4f2e9416, 0x49e4ebc0),
+              TOBN(0x45eb40ec, 0x0ccced58),
+              TOBN(0x25cd4b9c, 0x0da44f98),
+              TOBN(0x43e06458, 0x871812c6),
+              TOBN(0x99f80d55, 0x16cef651),
+              TOBN(0x571340c9, 0xce6dc153),
+              TOBN(0x138d5117, 0xd8665521),
+              TOBN(0xacdb45bc, 0x4e07014d),
+              TOBN(0x2f34bb38, 0x84b60b91),
+              TOBN(0xf44a4fd2, 0x2ae8921e),
+              TOBN(0xb039288e, 0x892ba1e2),
+              TOBN(0x9da50174, 0xb1c180b2),
+              TOBN(0x6b70ab66, 0x1693dc87),
+              TOBN(0x7e9babc9, 0xe7057481),
+              TOBN(0x4581ddef, 0x9c80dc41),
+              TOBN(0x0c890da9, 0x51294682),
+              TOBN(0x0b5629d3, 0x3f4736e5),
+              TOBN(0x2340c79e, 0xb06f5b41),
+              TOBN(0xa42e84ce, 0x4e243469),
+              TOBN(0xf9a20135, 0x045a71a9),
+              TOBN(0xefbfb415, 0xd27b6fb6),
+              TOBN(0x25ebea23, 0x9d33cd6f),
+              TOBN(0x9caedb88, 0xaa6c0af8),
+              TOBN(0x53dc7e9a, 0xd9ce6f96),
+              TOBN(0x3897f9fd, 0x51e0b15a),
+              TOBN(0xf51cb1f8, 0x8e5d788e),
+              TOBN(0x1aec7ba8, 0xe1d490ee),
+              TOBN(0x265991e0, 0xcc58cb3c),
+              TOBN(0x9f306e8c, 0x9fc3ad31),
+              TOBN(0x5fed006e, 0x5040a0ac),
+              TOBN(0xca9d5043, 0xfb476f2e),
+              TOBN(0xa19c06e8, 0xbeea7a23),
+              TOBN(0xd2865801, 0x0edabb63),
+              TOBN(0xdb92293f, 0x6967469a),
+              TOBN(0x2894d839, 0x8d8a8ed8),
+              TOBN(0x87c9e406, 0xbbc77122),
+              TOBN(0x8671c6f1, 0x2ea3a26a),
+              TOBN(0xe42df8d6, 0xd7de9853),
+              TOBN(0x2e3ce346, 0xb1f2bcc7),
+              TOBN(0xda601dfc, 0x899d50cf),
+              TOBN(0xbfc913de, 0xfb1b598f),
+              TOBN(0x81c4909f, 0xe61f7908),
+              TOBN(0x192e304f, 0x9bbc7b29),
+              TOBN(0xc3ed8738, 0xc104b338),
+              TOBN(0xedbe9e47, 0x783f5d61),
+              TOBN(0x0c06e9be, 0x2db30660),
+              TOBN(0xda3e613f, 0xc0eb7d8e),
+              TOBN(0xd8fa3e97, 0x322e096e),
+              TOBN(0xfebd91e8, 0xd336e247),
+              TOBN(0x8f13ccc4, 0xdf655a49),
+              TOBN(0xa9e00dfc, 0x5eb20210),
+              TOBN(0x84631d0f, 0xc656b6ea),
+              TOBN(0x93a058cd, 0xd8c0d947),
+              TOBN(0x6846904a, 0x67bd3448),
+              TOBN(0x4a3d4e1a, 0xf394fd5c),
+              TOBN(0xc102c1a5, 0xdb225f52),
+              TOBN(0xe3455bba, 0xfc4f5e9a),
+              TOBN(0x6b36985b, 0x4b9ad1ce),
+              TOBN(0xa9818536, 0x5bb7f793),
+              TOBN(0x6c25e1d0, 0x48b1a416),
+              TOBN(0x1381dd53, 0x3c81bee7),
+              TOBN(0xd2a30d61, 0x7a4a7620),
+              TOBN(0xc8412926, 0x39b8944c),
+              TOBN(0x3c1c6fbe, 0x7a97c33a),
+              TOBN(0x941e541d, 0x938664e7),
+              TOBN(0x417499e8, 0x4a34f239),
+              TOBN(0x15fdb83c, 0xb90402d5),
+              TOBN(0xb75f46bf, 0x433aa832),
+              TOBN(0xb61e15af, 0x63215db1),
+              TOBN(0xaabe59d4, 0xa127f89a),
+              TOBN(0x5d541e0c, 0x07e816da),
+              TOBN(0xaaba0659, 0xa618b692),
+              TOBN(0x55327733, 0x17266026),
+              TOBN(0xaf53a0fc, 0x95f57552),
+              TOBN(0x32947650, 0x6cacb0c9),
+              TOBN(0x253ff58d, 0xc821be01),
+              TOBN(0xb0309531, 0xa06f1146),
+              TOBN(0x59bbbdf5, 0x05c2e54d),
+              TOBN(0x158f27ad, 0x26e8dd22),
+              TOBN(0xcc5b7ffb, 0x397e1e53),
+              TOBN(0xae03f65b, 0x7fc1e50d),
+              TOBN(0xa9784ebd, 0x9c95f0f9),
+              TOBN(0x5ed9deb2, 0x24640771),
+              TOBN(0x31244af7, 0x035561c4),
+              TOBN(0x87332f3a, 0x7ee857de),
+              TOBN(0x09e16e9e, 0x2b9e0d88),
+              TOBN(0x52d910f4, 0x56a06049),
+              TOBN(0x507ed477, 0xa9592f48),
+              TOBN(0x85cb917b, 0x2365d678),
+              TOBN(0xf8511c93, 0x4c8998d1),
+              TOBN(0x2186a3f1, 0x730ea58f),
+              TOBN(0x50189626, 0xb2029db0),
+              TOBN(0x9137a6d9, 0x02ceb75a),
+              TOBN(0x2fe17f37, 0x748bc82c),
+              TOBN(0x87c2e931, 0x80469f8c),
+              TOBN(0x850f71cd, 0xbf891aa2),
+              TOBN(0x0ca1b89b, 0x75ec3d8d),
+              TOBN(0x516c43aa, 0x5e1cd3cd),
+              TOBN(0x89397808, 0x9a887c28),
+              TOBN(0x0059c699, 0xddea1f9f),
+              TOBN(0x7737d6fa, 0x8e6868f7),
+              TOBN(0x6d93746a, 0x60f1524b),
+              TOBN(0x36985e55, 0xba052aa7),
+              TOBN(0x41b1d322, 0xed923ea5),
+              TOBN(0x3429759f, 0x25852a11),
+              TOBN(0xbeca6ec3, 0x092e9f41),
+              TOBN(0x3a238c66, 0x62256bbd),
+              TOBN(0xd82958ea, 0x70ad487d),
+              TOBN(0x4ac8aaf9, 0x65610d93),
+              TOBN(0x3fa101b1, 0x5e4ccab0),
+              TOBN(0x9bf430f2, 0x9de14bfb),
+              TOBN(0xa10f5cc6, 0x6531899d),
+              TOBN(0x590005fb, 0xea8ce17d),
+              TOBN(0xc437912f, 0x24544cb6),
+              TOBN(0x9987b71a, 0xd79ac2e3),
+              TOBN(0x13e3d9dd, 0xc058a212),
+              TOBN(0x00075aac, 0xd2de9606),
+              TOBN(0x80ab508b, 0x6cac8369),
+              TOBN(0x87842be7, 0xf54f6c89),
+              TOBN(0xa7ad663d, 0x6bc532a4),
+              TOBN(0x67813de7, 0x78a91bc8),
+              TOBN(0x5dcb61ce, 0xc3427239),
+              TOBN(0x5f3c7cf0, 0xc56934d9),
+              TOBN(0xc079e0fb, 0xe3191591),
+              TOBN(0xe40896bd, 0xb01aada7),
+              TOBN(0x8d466791, 0x0492d25f),
+              TOBN(0x8aeb30c9, 0xe7408276),
+              TOBN(0xe9437495, 0x9287aacc),
+              TOBN(0x23d4708d, 0x79fe03d4),
+              TOBN(0x8cda9cf2, 0xd0c05199),
+              TOBN(0x502fbc22, 0xfae78454),
+              TOBN(0xc0bda9df, 0xf572a182),
+              TOBN(0x5f9b71b8, 0x6158b372),
+              TOBN(0xe0f33a59, 0x2b82dd07),
+              TOBN(0x76302735, 0x9523032e),
+              TOBN(0x7fe1a721, 0xc4505a32),
+              TOBN(0x7b6e3e82, 0xf796409f),
+          },
+          {
+              TOBN(0xe3417bc0, 0x35d0b34a),
+              TOBN(0x440b386b, 0x8327c0a7),
+              TOBN(0x8fb7262d, 0xac0362d1),
+              TOBN(0x2c41114c, 0xe0cdf943),
+              TOBN(0x2ba5cef1, 0xad95a0b1),
+              TOBN(0xc09b37a8, 0x67d54362),
+              TOBN(0x26d6cdd2, 0x01e486c9),
+              TOBN(0x20477abf, 0x42ff9297),
+              TOBN(0xa004dcb3, 0x292a9287),
+              TOBN(0xddc15cf6, 0x77b092c7),
+              TOBN(0x083a8464, 0x806c0605),
+              TOBN(0x4a68df70, 0x3db997b0),
+              TOBN(0x9c134e45, 0x05bf7dd0),
+              TOBN(0xa4e63d39, 0x8ccf7f8c),
+              TOBN(0xa6e6517f, 0x41b5f8af),
+              TOBN(0xaa8b9342, 0xad7bc1cc),
+              TOBN(0x126f35b5, 0x1e706ad9),
+              TOBN(0xb99cebb4, 0xc3a9ebdf),
+              TOBN(0xa75389af, 0xbf608d90),
+              TOBN(0x76113c4f, 0xc6c89858),
+              TOBN(0x80de8eb0, 0x97e2b5aa),
+              TOBN(0x7e1022cc, 0x63b91304),
+              TOBN(0x3bdab605, 0x6ccc066c),
+              TOBN(0x33cbb144, 0xb2edf900),
+              TOBN(0xc4176471, 0x7af715d2),
+              TOBN(0xe2f7f594, 0xd0134a96),
+              TOBN(0x2c1873ef, 0xa41ec956),
+              TOBN(0xe4e7b4f6, 0x77821304),
+              TOBN(0xe5c8ff97, 0x88d5374a),
+              TOBN(0x2b915e63, 0x80823d5b),
+              TOBN(0xea6bc755, 0xb2ee8fe2),
+              TOBN(0x6657624c, 0xe7112651),
+              TOBN(0x157af101, 0xdace5aca),
+              TOBN(0xc4fdbcf2, 0x11a6a267),
+              TOBN(0xdaddf340, 0xc49c8609),
+              TOBN(0x97e49f52, 0xe9604a65),
+              TOBN(0x9be8e790, 0x937e2ad5),
+              TOBN(0x846e2508, 0x326e17f1),
+              TOBN(0x3f38007a, 0x0bbbc0dc),
+              TOBN(0xcf03603f, 0xb11e16d6),
+              TOBN(0xd6f800e0, 0x7442f1d5),
+              TOBN(0x475607d1, 0x66e0e3ab),
+              TOBN(0x82807f16, 0xb7c64047),
+              TOBN(0x8858e1e3, 0xa749883d),
+              TOBN(0x5859120b, 0x8231ee10),
+              TOBN(0x1b80e7eb, 0x638a1ece),
+              TOBN(0xcb72525a, 0xc6aa73a4),
+              TOBN(0xa7cdea3d, 0x844423ac),
+              TOBN(0x5ed0c007, 0xf8ae7c38),
+              TOBN(0x6db07a5c, 0x3d740192),
+              TOBN(0xbe5e9c2a, 0x5fe36db3),
+              TOBN(0xd5b9d57a, 0x76e95046),
+              TOBN(0x54ac32e7, 0x8eba20f2),
+              TOBN(0xef11ca8f, 0x71b9a352),
+              TOBN(0x305e373e, 0xff98a658),
+              TOBN(0xffe5a100, 0x823eb667),
+              TOBN(0x57477b11, 0xe51732d2),
+              TOBN(0xdfd6eb28, 0x2538fc0e),
+              TOBN(0x5c43b0cc, 0x3b39eec5),
+              TOBN(0x6af12778, 0xcb36cc57),
+              TOBN(0x70b0852d, 0x06c425ae),
+              TOBN(0x6df92f8c, 0x5c221b9b),
+              TOBN(0x6c8d4f9e, 0xce826d9c),
+              TOBN(0xf59aba7b, 0xb49359c3),
+              TOBN(0x5c8ed8d5, 0xda64309d),
+              TOBN(0x61a6de56, 0x91b30704),
+              TOBN(0xd6b52f6a, 0x2f9b5808),
+              TOBN(0x0eee4194, 0x98c958a7),
+              TOBN(0xcddd9aab, 0x771e4caa),
+              TOBN(0x83965dfd, 0x78bc21be),
+              TOBN(0x02affce3, 0xb3b504f5),
+              TOBN(0x30847a21, 0x561c8291),
+              TOBN(0xd2eb2cf1, 0x52bfda05),
+              TOBN(0xe0e4c4e9, 0x6197b98c),
+              TOBN(0x1d35076c, 0xf8a1726f),
+              TOBN(0x6c06085b, 0x2db11e3d),
+              TOBN(0x15c0c4d7, 0x4463ba14),
+              TOBN(0x9d292f83, 0x0030238c),
+              TOBN(0x1311ee8b, 0x3727536d),
+              TOBN(0xfeea86ef, 0xbeaedc1e),
+              TOBN(0xb9d18cd3, 0x66131e2e),
+              TOBN(0xf31d974f, 0x80fe2682),
+              TOBN(0xb6e49e0f, 0xe4160289),
+              TOBN(0x7c48ec0b, 0x08e92799),
+              TOBN(0x818111d8, 0xd1989aa7),
+              TOBN(0xb34fa0aa, 0xebf926f9),
+              TOBN(0xdb5fe2f5, 0xa245474a),
+              TOBN(0xf80a6ebb, 0x3c7ca756),
+              TOBN(0xa7f96054, 0xafa05dd8),
+              TOBN(0x26dfcf21, 0xfcaf119e),
+              TOBN(0xe20ef2e3, 0x0564bb59),
+              TOBN(0xef4dca50, 0x61cb02b8),
+              TOBN(0xcda7838a, 0x65d30672),
+              TOBN(0x8b08d534, 0xfd657e86),
+              TOBN(0x4c5b4395, 0x46d595c8),
+              TOBN(0x39b58725, 0x425cb836),
+              TOBN(0x8ea61059, 0x3de9abe3),
+              TOBN(0x40434881, 0x9cdc03be),
+              TOBN(0x9b261245, 0xcfedce8c),
+              TOBN(0x78c318b4, 0xcf5234a1),
+              TOBN(0x510bcf16, 0xfde24c99),
+              TOBN(0x2a77cb75, 0xa2c2ff5d),
+              TOBN(0x9c895c2b, 0x27960fb4),
+              TOBN(0xd30ce975, 0xb0eda42b),
+              TOBN(0xfda85393, 0x1a62cc26),
+              TOBN(0x23c69b96, 0x50c0e052),
+              TOBN(0xa227df15, 0xbfc633f3),
+              TOBN(0x2ac78848, 0x1bae7d48),
+              TOBN(0x487878f9, 0x187d073d),
+              TOBN(0x6c2be919, 0x967f807d),
+              TOBN(0x765861d8, 0x336e6d8f),
+              TOBN(0x88b8974c, 0xce528a43),
+              TOBN(0x09521177, 0xff57d051),
+              TOBN(0x2ff38037, 0xfb6a1961),
+              TOBN(0xfc0aba74, 0xa3d76ad4),
+              TOBN(0x7c764803, 0x25a7ec17),
+              TOBN(0x7532d75f, 0x48879bc8),
+              TOBN(0xea7eacc0, 0x58ce6bc1),
+              TOBN(0xc82176b4, 0x8e896c16),
+              TOBN(0x9a30e0b2, 0x2c750fed),
+              TOBN(0xc37e2c2e, 0x421d3aa4),
+              TOBN(0xf926407c, 0xe84fa840),
+              TOBN(0x18abc03d, 0x1454e41c),
+              TOBN(0x26605ecd, 0x3f7af644),
+              TOBN(0x242341a6, 0xd6a5eabf),
+              TOBN(0x1edb84f4, 0x216b668e),
+              TOBN(0xd836edb8, 0x04010102),
+              TOBN(0x5b337ce7, 0x945e1d8c),
+              TOBN(0xd2075c77, 0xc055dc14),
+              TOBN(0x2a0ffa25, 0x81d89cdf),
+              TOBN(0x8ce815ea, 0x6ffdcbaf),
+              TOBN(0xa3428878, 0xfb648867),
+              TOBN(0x277699cf, 0x884655fb),
+              TOBN(0xfa5b5bd6, 0x364d3e41),
+              TOBN(0x01f680c6, 0x441e1cb7),
+              TOBN(0x3fd61e66, 0xb70a7d67),
+              TOBN(0x666ba2dc, 0xcc78cf66),
+              TOBN(0xb3018174, 0x6fdbff77),
+              TOBN(0x8d4dd0db, 0x168d4668),
+              TOBN(0x259455d0, 0x1dab3a2a),
+              TOBN(0xf58564c5, 0xcde3acec),
+              TOBN(0x77141925, 0x13adb276),
+              TOBN(0x527d725d, 0x8a303f65),
+              TOBN(0x55deb6c9, 0xe6f38f7b),
+              TOBN(0xfd5bb657, 0xb1fa70fb),
+              TOBN(0xfa07f50f, 0xd8073a00),
+              TOBN(0xf72e3aa7, 0xbca02500),
+              TOBN(0xf68f895d, 0x9975740d),
+              TOBN(0x30112060, 0x5cae2a6a),
+              TOBN(0x01bd7218, 0x02874842),
+              TOBN(0x3d423891, 0x7ce47bd3),
+              TOBN(0xa66663c1, 0x789544f6),
+              TOBN(0x864d05d7, 0x3272d838),
+              TOBN(0xe22924f9, 0xfa6295c5),
+              TOBN(0x8189593f, 0x6c2fda32),
+              TOBN(0x330d7189, 0xb184b544),
+              TOBN(0x79efa62c, 0xbde1f714),
+              TOBN(0x35771c94, 0xe5cb1a63),
+              TOBN(0x2f4826b8, 0x641c8332),
+              TOBN(0x00a894fb, 0xc8cee854),
+              TOBN(0xb4b9a39b, 0x36194d40),
+              TOBN(0xe857a7c5, 0x77612601),
+              TOBN(0xf4209dd2, 0x4ecf2f58),
+              TOBN(0x82b9e66d, 0x5a033487),
+              TOBN(0xc1e36934, 0xe4e8b9dd),
+              TOBN(0xd2372c9d, 0xa42377d7),
+              TOBN(0x51dc94c7, 0x0e3ae43b),
+              TOBN(0x4c57761e, 0x04474f6f),
+              TOBN(0xdcdacd0a, 0x1058a318),
+              TOBN(0x369cf3f5, 0x78053a9a),
+              TOBN(0xc6c3de50, 0x31c68de2),
+              TOBN(0x4653a576, 0x3c4b6d9f),
+              TOBN(0x1688dd5a, 0xaa4e5c97),
+              TOBN(0x5be80aa1, 0xb7ab3c74),
+              TOBN(0x70cefe7c, 0xbc65c283),
+              TOBN(0x57f95f13, 0x06867091),
+              TOBN(0xa39114e2, 0x4415503b),
+              TOBN(0xc08ff7c6, 0x4cbb17e9),
+              TOBN(0x1eff674d, 0xd7dec966),
+              TOBN(0x6d4690af, 0x53376f63),
+              TOBN(0xff6fe32e, 0xea74237b),
+              TOBN(0xc436d17e, 0xcd57508e),
+              TOBN(0x15aa28e1, 0xedcc40fe),
+              TOBN(0x0d769c04, 0x581bbb44),
+              TOBN(0xc240b6de, 0x34eaacda),
+              TOBN(0xd9e116e8, 0x2ba0f1de),
+              TOBN(0xcbe45ec7, 0x79438e55),
+              TOBN(0x91787c9d, 0x96f752d7),
+              TOBN(0x897f532b, 0xf129ac2f),
+              TOBN(0xd307b7c8, 0x5a36e22c),
+              TOBN(0x91940675, 0x749fb8f3),
+              TOBN(0xd14f95d0, 0x157fdb28),
+              TOBN(0xfe51d029, 0x6ae55043),
+              TOBN(0x8931e98f, 0x44a87de1),
+              TOBN(0xe57f1cc6, 0x09e4fee2),
+              TOBN(0x0d063b67, 0x4e072d92),
+              TOBN(0x70a998b9, 0xed0e4316),
+              TOBN(0xe74a736b, 0x306aca46),
+              TOBN(0xecf0fbf2, 0x4fda97c7),
+              TOBN(0xa40f65cb, 0x3e178d93),
+              TOBN(0x16253604, 0x16df4285),
+              TOBN(0xb0c9babb, 0xd0c56ae2),
+              TOBN(0x73032b19, 0xcfc5cfc3),
+              TOBN(0xe497e5c3, 0x09752056),
+              TOBN(0x12096bb4, 0x164bda96),
+              TOBN(0x1ee42419, 0xa0b74da1),
+              TOBN(0x8fc36243, 0x403826ba),
+              TOBN(0x0c8f0069, 0xdc09e660),
+              TOBN(0x8667e981, 0xc27253c9),
+              TOBN(0x05a6aefb, 0x92b36a45),
+              TOBN(0xa62c4b36, 0x9cb7bb46),
+              TOBN(0x8394f375, 0x11f7027b),
+              TOBN(0x747bc79c, 0x5f109d0f),
+              TOBN(0xcad88a76, 0x5b8cc60a),
+              TOBN(0x80c5a66b, 0x58f09e68),
+              TOBN(0xe753d451, 0xf6127eac),
+              TOBN(0xc44b74a1, 0x5b0ec6f5),
+              TOBN(0x47989fe4, 0x5289b2b8),
+              TOBN(0x745f8484, 0x58d6fc73),
+              TOBN(0xec362a6f, 0xf61c70ab),
+              TOBN(0x070c98a7, 0xb3a8ad41),
+              TOBN(0x73a20fc0, 0x7b63db51),
+              TOBN(0xed2c2173, 0xf44c35f4),
+              TOBN(0x8a56149d, 0x9acc9dca),
+              TOBN(0x98f17881, 0x9ac6e0f4),
+              TOBN(0x360fdeaf, 0xa413b5ed),
+              TOBN(0x0625b8f4, 0xa300b0fd),
+              TOBN(0xf1f4d76a, 0x5b3222d3),
+              TOBN(0x9d6f5109, 0x587f76b8),
+              TOBN(0x8b4ee08d, 0x2317fdb5),
+              TOBN(0x88089bb7, 0x8c68b095),
+              TOBN(0x95570e9a, 0x5808d9b9),
+              TOBN(0xa395c36f, 0x35d33ae7),
+              TOBN(0x200ea123, 0x50bb5a94),
+              TOBN(0x20c789bd, 0x0bafe84b),
+              TOBN(0x243ef52d, 0x0919276a),
+              TOBN(0x3934c577, 0xe23ae233),
+              TOBN(0xb93807af, 0xa460d1ec),
+              TOBN(0xb72a53b1, 0xf8fa76a4),
+              TOBN(0xd8914cb0, 0xc3ca4491),
+              TOBN(0x2e128494, 0x3fb42622),
+              TOBN(0x3b2700ac, 0x500907d5),
+              TOBN(0xf370fb09, 0x1a95ec63),
+              TOBN(0xf8f30be2, 0x31b6dfbd),
+              TOBN(0xf2b2f8d2, 0x69e55f15),
+              TOBN(0x1fead851, 0xcc1323e9),
+              TOBN(0xfa366010, 0xd9e5eef6),
+              TOBN(0x64d487b0, 0xe316107e),
+              TOBN(0x4c076b86, 0xd23ddc82),
+              TOBN(0x03fd344c, 0x7e0143f0),
+              TOBN(0xa95362ff, 0x317af2c5),
+              TOBN(0x0add3db7, 0xe18b7a4f),
+              TOBN(0x9c673e3f, 0x8260e01b),
+              TOBN(0xfbeb49e5, 0x54a1cc91),
+              TOBN(0x91351bf2, 0x92f2e433),
+              TOBN(0xc755e7ec, 0x851141eb),
+              TOBN(0xc9a95139, 0x29607745),
+              TOBN(0x0ca07420, 0xa26f2b28),
+              TOBN(0xcb2790e7, 0x4bc6f9dd),
+              TOBN(0x345bbb58, 0xadcaffc0),
+              TOBN(0xc65ea38c, 0xbe0f27a2),
+              TOBN(0x67c24d7c, 0x641fcb56),
+              TOBN(0x2c25f0a7, 0xa9e2c757),
+              TOBN(0x93f5cdb0, 0x16f16c49),
+              TOBN(0x2ca5a9d7, 0xc5ee30a1),
+              TOBN(0xd1593635, 0xb909b729),
+              TOBN(0x804ce9f3, 0xdadeff48),
+              TOBN(0xec464751, 0xb07c30c3),
+              TOBN(0x89d65ff3, 0x9e49af6a),
+              TOBN(0xf2d6238a, 0x6f3d01bc),
+              TOBN(0x1095561e, 0x0bced843),
+              TOBN(0x51789e12, 0xc8a13fd8),
+              TOBN(0xd633f929, 0x763231df),
+              TOBN(0x46df9f7d, 0xe7cbddef),
+              TOBN(0x01c889c0, 0xcb265da8),
+              TOBN(0xfce1ad10, 0xaf4336d2),
+              TOBN(0x8d110df6, 0xfc6a0a7e),
+              TOBN(0xdd431b98, 0x6da425dc),
+              TOBN(0xcdc4aeab, 0x1834aabe),
+              TOBN(0x84deb124, 0x8439b7fc),
+              TOBN(0x8796f169, 0x3c2a5998),
+              TOBN(0x9b9247b4, 0x7947190d),
+              TOBN(0x55b9d9a5, 0x11597014),
+              TOBN(0x7e9dd70d, 0x7b1566ee),
+              TOBN(0x94ad78f7, 0xcbcd5e64),
+              TOBN(0x0359ac17, 0x9bd4c032),
+              TOBN(0x3b11baaf, 0x7cc222ae),
+              TOBN(0xa6a6e284, 0xba78e812),
+              TOBN(0x8392053f, 0x24cea1a0),
+              TOBN(0xc97bce4a, 0x33621491),
+              TOBN(0x7eb1db34, 0x35399ee9),
+              TOBN(0x473f78ef, 0xece81ad1),
+              TOBN(0x41d72fe0, 0xf63d3d0d),
+              TOBN(0xe620b880, 0xafab62fc),
+              TOBN(0x92096bc9, 0x93158383),
+              TOBN(0x41a21357, 0x8f896f6c),
+              TOBN(0x1b5ee2fa, 0xc7dcfcab),
+              TOBN(0x650acfde, 0x9546e007),
+              TOBN(0xc081b749, 0xb1b02e07),
+              TOBN(0xda9e41a0, 0xf9eca03d),
+              TOBN(0x013ba727, 0x175a54ab),
+              TOBN(0xca0cd190, 0xea5d8d10),
+              TOBN(0x85ea52c0, 0x95fd96a9),
+              TOBN(0x2c591b9f, 0xbc5c3940),
+              TOBN(0x6fb4d4e4, 0x2bad4d5f),
+              TOBN(0xfa4c3590, 0xfef0059b),
+              TOBN(0x6a10218a, 0xf5122294),
+              TOBN(0x9a78a81a, 0xa85751d1),
+              TOBN(0x04f20579, 0xa98e84e7),
+              TOBN(0xfe1242c0, 0x4997e5b5),
+              TOBN(0xe77a273b, 0xca21e1e4),
+              TOBN(0xfcc8b1ef, 0x9411939d),
+              TOBN(0xe20ea302, 0x92d0487a),
+              TOBN(0x1442dbec, 0x294b91fe),
+              TOBN(0x1f7a4afe, 0xbb6b0e8f),
+              TOBN(0x1700ef74, 0x6889c318),
+              TOBN(0xf5bbffc3, 0x70f1fc62),
+              TOBN(0x3b31d4b6, 0x69c79cca),
+              TOBN(0xe8bc2aab, 0xa7f6340d),
+              TOBN(0xb0b08ab4, 0xa725e10a),
+              TOBN(0x44f05701, 0xae340050),
+              TOBN(0xba4b3016, 0x1cf0c569),
+              TOBN(0x5aa29f83, 0xfbe19a51),
+              TOBN(0x1b9ed428, 0xb71d752e),
+              TOBN(0x1666e54e, 0xeb4819f5),
+              TOBN(0x616cdfed, 0x9e18b75b),
+              TOBN(0x112ed5be, 0x3ee27b0b),
+              TOBN(0xfbf28319, 0x44c7de4d),
+              TOBN(0xd685ec85, 0xe0e60d84),
+              TOBN(0x68037e30, 0x1db7ee78),
+              TOBN(0x5b65bdcd, 0x003c4d6e),
+              TOBN(0x33e7363a, 0x93e29a6a),
+              TOBN(0x995b3a61, 0x08d0756c),
+              TOBN(0xd727f85c, 0x2faf134b),
+              TOBN(0xfac6edf7, 0x1d337823),
+              TOBN(0x99b9aa50, 0x0439b8b4),
+              TOBN(0x722eb104, 0xe2b4e075),
+              TOBN(0x49987295, 0x437c4926),
+              TOBN(0xb1e4c0e4, 0x46a9b82d),
+              TOBN(0xd0cb3197, 0x57a006f5),
+              TOBN(0xf3de0f7d, 0xd7808c56),
+              TOBN(0xb5c54d8f, 0x51f89772),
+              TOBN(0x500a114a, 0xadbd31aa),
+              TOBN(0x9afaaaa6, 0x295f6cab),
+              TOBN(0x94705e21, 0x04cf667a),
+              TOBN(0xfc2a811b, 0x9d3935d7),
+              TOBN(0x560b0280, 0x6d09267c),
+              TOBN(0xf19ed119, 0xf780e53b),
+              TOBN(0xf0227c09, 0x067b6269),
+              TOBN(0x967b8533, 0x5caef599),
+              TOBN(0x155b9243, 0x68efeebc),
+              TOBN(0xcd6d34f5, 0xc497bae6),
+              TOBN(0x1dd8d5d3, 0x6cceb370),
+              TOBN(0x2aeac579, 0xa78d7bf9),
+              TOBN(0x5d65017d, 0x70b67a62),
+              TOBN(0x70c8e44f, 0x17c53f67),
+              TOBN(0xd1fc0950, 0x86a34d09),
+              TOBN(0xe0fca256, 0xe7134907),
+              TOBN(0xe24fa29c, 0x80fdd315),
+              TOBN(0x2c4acd03, 0xd87499ad),
+              TOBN(0xbaaf7517, 0x3b5a9ba6),
+              TOBN(0xb9cbe1f6, 0x12e51a51),
+              TOBN(0xd88edae3, 0x5e154897),
+              TOBN(0xe4309c3c, 0x77b66ca0),
+              TOBN(0xf5555805, 0xf67f3746),
+              TOBN(0x85fc37ba, 0xa36401ff),
+              TOBN(0xdf86e2ca, 0xd9499a53),
+              TOBN(0x6270b2a3, 0xecbc955b),
+              TOBN(0xafae64f5, 0x974ad33b),
+              TOBN(0x04d85977, 0xfe7b2df1),
+              TOBN(0x2a3db3ff, 0x4ab03f73),
+              TOBN(0x0b87878a, 0x8702740a),
+              TOBN(0x6d263f01, 0x5a061732),
+              TOBN(0xc25430ce, 0xa32a1901),
+              TOBN(0xf7ebab3d, 0xdb155018),
+              TOBN(0x3a86f693, 0x63a9b78e),
+              TOBN(0x349ae368, 0xda9f3804),
+              TOBN(0x470f07fe, 0xa164349c),
+              TOBN(0xd52f4cc9, 0x8562baa5),
+              TOBN(0xc74a9e86, 0x2b290df3),
+              TOBN(0xd3a1aa35, 0x43471a24),
+              TOBN(0x239446be, 0xb8194511),
+              TOBN(0xbec2dd00, 0x81dcd44d),
+              TOBN(0xca3d7f0f, 0xc42ac82d),
+              TOBN(0x1f3db085, 0xfdaf4520),
+              TOBN(0xbb6d3e80, 0x4549daf2),
+              TOBN(0xf5969d8a, 0x19ad5c42),
+              TOBN(0x7052b13d, 0xdbfd1511),
+              TOBN(0x11890d1b, 0x682b9060),
+              TOBN(0xa71d3883, 0xac34452c),
+              TOBN(0xa438055b, 0x783805b4),
+              TOBN(0x43241277, 0x4725b23e),
+              TOBN(0xf20cf96e, 0x4901bbed),
+              TOBN(0x6419c710, 0xf432a2bb),
+              TOBN(0x57a0fbb9, 0xdfa9cd7d),
+              TOBN(0x589111e4, 0x00daa249),
+              TOBN(0x19809a33, 0x7b60554e),
+              TOBN(0xea5f8887, 0xede283a4),
+              TOBN(0x2d713802, 0x503bfd35),
+              TOBN(0x151bb0af, 0x585d2a53),
+              TOBN(0x40b08f74, 0x43b30ca8),
+              TOBN(0xe10b5bba, 0xd9934583),
+              TOBN(0xe8a546d6, 0xb51110ad),
+              TOBN(0x1dd50e66, 0x28e0b6c5),
+              TOBN(0x292e9d54, 0xcff2b821),
+              TOBN(0x3882555d, 0x47281760),
+              TOBN(0x134838f8, 0x3724d6e3),
+              TOBN(0xf2c679e0, 0x22ddcda1),
+              TOBN(0x40ee8815, 0x6d2a5768),
+              TOBN(0x7f227bd2, 0x1c1e7e2d),
+              TOBN(0x487ba134, 0xd04ff443),
+              TOBN(0x76e2ff3d, 0xc614e54b),
+              TOBN(0x36b88d6f, 0xa3177ec7),
+              TOBN(0xbf731d51, 0x2328fff5),
+              TOBN(0x758caea2, 0x49ba158e),
+              TOBN(0x5ab8ff4c, 0x02938188),
+              TOBN(0x33e16056, 0x35edc56d),
+              TOBN(0x5a69d349, 0x7e940d79),
+              TOBN(0x6c4fd001, 0x03866dcb),
+              TOBN(0x20a38f57, 0x4893cdef),
+              TOBN(0xfbf3e790, 0xfac3a15b),
+              TOBN(0x6ed7ea2e, 0x7a4f8e6b),
+              TOBN(0xa663eb4f, 0xbc3aca86),
+              TOBN(0x22061ea5, 0x080d53f7),
+              TOBN(0x2480dfe6, 0xf546783f),
+              TOBN(0xd38bc6da, 0x5a0a641e),
+              TOBN(0xfb093cd1, 0x2ede8965),
+              TOBN(0x89654db4, 0xacb455cf),
+              TOBN(0x413cbf9a, 0x26e1adee),
+              TOBN(0x291f3764, 0x373294d4),
+              TOBN(0x00797257, 0x648083fe),
+              TOBN(0x25f504d3, 0x208cc341),
+              TOBN(0x635a8e5e, 0xc3a0ee43),
+              TOBN(0x70aaebca, 0x679898ff),
+              TOBN(0x9ee9f547, 0x5dc63d56),
+              TOBN(0xce987966, 0xffb34d00),
+              TOBN(0xf9f86b19, 0x5e26310a),
+              TOBN(0x9e435484, 0x382a8ca8),
+              TOBN(0x253bcb81, 0xc2352fe4),
+              TOBN(0xa4eac8b0, 0x4474b571),
+              TOBN(0xc1b97512, 0xc1ad8cf8),
+              TOBN(0x193b4e9e, 0x99e0b697),
+              TOBN(0x939d2716, 0x01e85df0),
+              TOBN(0x4fb265b3, 0xcd44eafd),
+              TOBN(0x321e7dcd, 0xe51e1ae2),
+              TOBN(0x8e3a8ca6, 0xe3d8b096),
+              TOBN(0x8de46cb0, 0x52604998),
+              TOBN(0x91099ad8, 0x39072aa7),
+              TOBN(0x2617f91c, 0x93aa96b8),
+              TOBN(0x0fc8716b, 0x7fca2e13),
+              TOBN(0xa7106f5e, 0x95328723),
+              TOBN(0xd1c9c40b, 0x262e6522),
+              TOBN(0xb9bafe86, 0x42b7c094),
+              TOBN(0x1873439d, 0x1543c021),
+              TOBN(0xe1baa5de, 0x5cbefd5d),
+              TOBN(0xa363fc5e, 0x521e8aff),
+              TOBN(0xefe6320d, 0xf862eaac),
+              TOBN(0x14419c63, 0x22c647dc),
+              TOBN(0x0e06707c, 0x4e46d428),
+              TOBN(0xcb6c834f, 0x4a178f8f),
+              TOBN(0x0f993a45, 0xd30f917c),
+              TOBN(0xd4c4b049, 0x9879afee),
+              TOBN(0xb6142a1e, 0x70500063),
+              TOBN(0x7c9b41c3, 0xa5d9d605),
+              TOBN(0xbc00fc2f, 0x2f8ba2c7),
+              TOBN(0x0966eb2f, 0x7c67aa28),
+              TOBN(0x13f7b516, 0x5a786972),
+              TOBN(0x3bfb7557, 0x8a2fbba0),
+              TOBN(0x131c4f23, 0x5a2b9620),
+              TOBN(0xbff3ed27, 0x6faf46be),
+              TOBN(0x9b4473d1, 0x7e172323),
+              TOBN(0x421e8878, 0x339f6246),
+              TOBN(0x0fa8587a, 0x25a41632),
+              TOBN(0xc0814124, 0xa35b6c93),
+              TOBN(0x2b18a9f5, 0x59ebb8db),
+              TOBN(0x264e3357, 0x76edb29c),
+              TOBN(0xaf245ccd, 0xc87c51e2),
+              TOBN(0x16b3015b, 0x501e6214),
+              TOBN(0xbb31c560, 0x0a3882ce),
+              TOBN(0x6961bb94, 0xfec11e04),
+              TOBN(0x3b825b8d, 0xeff7a3a0),
+              TOBN(0xbec33738, 0xb1df7326),
+              TOBN(0x68ad747c, 0x99604a1f),
+              TOBN(0xd154c934, 0x9a3bd499),
+              TOBN(0xac33506f, 0x1cc7a906),
+              TOBN(0x73bb5392, 0x6c560e8f),
+              TOBN(0x6428fcbe, 0x263e3944),
+              TOBN(0xc11828d5, 0x1c387434),
+              TOBN(0x3cd04be1, 0x3e4b12ff),
+              TOBN(0xc3aad9f9, 0x2d88667c),
+              TOBN(0xc52ddcf8, 0x248120cf),
+              TOBN(0x985a892e, 0x2a389532),
+              TOBN(0xfbb4b21b, 0x3bb85fa0),
+              TOBN(0xf95375e0, 0x8dfc6269),
+              TOBN(0xfb4fb06c, 0x7ee2acea),
+              TOBN(0x6785426e, 0x309c4d1f),
+              TOBN(0x659b17c8, 0xd8ceb147),
+              TOBN(0x9b649eee, 0xb70a5554),
+              TOBN(0x6b7fa0b5, 0xac6bc634),
+              TOBN(0xd99fe2c7, 0x1d6e732f),
+              TOBN(0x30e6e762, 0x8d3abba2),
+              TOBN(0x18fee6e7, 0xa797b799),
+              TOBN(0x5c9d360d, 0xc696464d),
+              TOBN(0xe3baeb48, 0x27bfde12),
+              TOBN(0x2bf5db47, 0xf23206d5),
+              TOBN(0x2f6d3420, 0x1d260152),
+              TOBN(0x17b87653, 0x3f8ff89a),
+              TOBN(0x5157c30c, 0x378fa458),
+              TOBN(0x7517c5c5, 0x2d4fb936),
+              TOBN(0xef22f7ac, 0xe6518cdc),
+              TOBN(0xdeb483e6, 0xbf847a64),
+              TOBN(0xf5084558, 0x92e0fa89),
+          },
+          {
+              TOBN(0xab9659d8, 0xdf7304d4),
+              TOBN(0xb71bcf1b, 0xff210e8e),
+              TOBN(0xa9a2438b, 0xd73fbd60),
+              TOBN(0x4595cd1f, 0x5d11b4de),
+              TOBN(0x9c0d329a, 0x4835859d),
+              TOBN(0x4a0f0d2d, 0x7dbb6e56),
+              TOBN(0xc6038e5e, 0xdf928a4e),
+              TOBN(0xc9429621, 0x8f5ad154),
+              TOBN(0x91213462, 0xf23f2d92),
+              TOBN(0x6cab71bd, 0x60b94078),
+              TOBN(0x6bdd0a63, 0x176cde20),
+              TOBN(0x54c9b20c, 0xee4d54bc),
+              TOBN(0x3cd2d8aa, 0x9f2ac02f),
+              TOBN(0x03f8e617, 0x206eedb0),
+              TOBN(0xc7f68e16, 0x93086434),
+              TOBN(0x831469c5, 0x92dd3db9),
+              TOBN(0x8521df24, 0x8f981354),
+              TOBN(0x587e23ec, 0x3588a259),
+              TOBN(0xcbedf281, 0xd7a0992c),
+              TOBN(0x06930a55, 0x38961407),
+              TOBN(0x09320deb, 0xbe5bbe21),
+              TOBN(0xa7ffa5b5, 0x2491817f),
+              TOBN(0xe6c8b4d9, 0x09065160),
+              TOBN(0xac4f3992, 0xfff6d2a9),
+              TOBN(0x7aa7a158, 0x3ae9c1bd),
+              TOBN(0xe0af6d98, 0xe37ce240),
+              TOBN(0xe54342d9, 0x28ab38b4),
+              TOBN(0xe8b75007, 0x0a1c98ca),
+              TOBN(0xefce86af, 0xe02358f2),
+              TOBN(0x31b8b856, 0xea921228),
+              TOBN(0x052a1912, 0x0a1c67fc),
+              TOBN(0xb4069ea4, 0xe3aead59),
+              TOBN(0x3232d6e2, 0x7fa03cb3),
+              TOBN(0xdb938e5b, 0x0fdd7d88),
+              TOBN(0x04c1d2cd, 0x2ccbfc5d),
+              TOBN(0xd2f45c12, 0xaf3a580f),
+              TOBN(0x592620b5, 0x7883e614),
+              TOBN(0x5fd27e68, 0xbe7c5f26),
+              TOBN(0x139e45a9, 0x1567e1e3),
+              TOBN(0x2cc71d2d, 0x44d8aaaf),
+              TOBN(0x4a9090cd, 0xe36d0757),
+              TOBN(0xf722d7b1, 0xd9a29382),
+              TOBN(0xfb7fb04c, 0x04b48ddf),
+              TOBN(0x628ad2a7, 0xebe16f43),
+              TOBN(0xcd3fbfb5, 0x20226040),
+              TOBN(0x6c34ecb1, 0x5104b6c4),
+              TOBN(0x30c0754e, 0xc903c188),
+              TOBN(0xec336b08, 0x2d23cab0),
+              TOBN(0x473d62a2, 0x1e206ee5),
+              TOBN(0xf1e27480, 0x8c49a633),
+              TOBN(0x87ab956c, 0xe9f6b2c3),
+              TOBN(0x61830b48, 0x62b606ea),
+              TOBN(0x67cd6846, 0xe78e815f),
+              TOBN(0xfe40139f, 0x4c02082a),
+              TOBN(0x52bbbfcb, 0x952ec365),
+              TOBN(0x74c11642, 0x6b9836ab),
+              TOBN(0x9f51439e, 0x558df019),
+              TOBN(0x230da4ba, 0xac712b27),
+              TOBN(0x518919e3, 0x55185a24),
+              TOBN(0x4dcefcdd, 0x84b78f50),
+              TOBN(0xa7d90fb2, 0xa47d4c5a),
+              TOBN(0x55ac9abf, 0xb30e009e),
+              TOBN(0xfd2fc359, 0x74eed273),
+              TOBN(0xb72d824c, 0xdbea8faf),
+              TOBN(0xce721a74, 0x4513e2ca),
+              TOBN(0x0b418612, 0x38240b2c),
+              TOBN(0x05199968, 0xd5baa450),
+              TOBN(0xeb1757ed, 0x2b0e8c25),
+              TOBN(0x6ebc3e28, 0x3dfac6d5),
+              TOBN(0xb2431e2e, 0x48a237f5),
+              TOBN(0x2acb5e23, 0x52f61499),
+              TOBN(0x5558a2a7, 0xe06c936b),
+              TOBN(0xd213f923, 0xcbb13d1b),
+              TOBN(0x98799f42, 0x5bfb9bfe),
+              TOBN(0x1ae8ddc9, 0x701144a9),
+              TOBN(0x0b8b3bb6, 0x4c5595ee),
+              TOBN(0x0ea9ef2e, 0x3ecebb21),
+              TOBN(0x17cb6c4b, 0x3671f9a7),
+              TOBN(0x47ef464f, 0x726f1d1f),
+              TOBN(0x171b9484, 0x6943a276),
+              TOBN(0x51a4ae2d, 0x7ef0329c),
+              TOBN(0x08509222, 0x91c4402a),
+              TOBN(0x64a61d35, 0xafd45bbc),
+              TOBN(0x38f096fe, 0x3035a851),
+              TOBN(0xc7468b74, 0xa1dec027),
+              TOBN(0xe8cf10e7, 0x4fc7dcba),
+              TOBN(0xea35ff40, 0xf4a06353),
+              TOBN(0x0b4c0dfa, 0x8b77dd66),
+              TOBN(0x779b8552, 0xde7e5c19),
+              TOBN(0xfab28609, 0xc1c0256c),
+              TOBN(0x64f58eee, 0xabd4743d),
+              TOBN(0x4e8ef838, 0x7b6cc93b),
+              TOBN(0xee650d26, 0x4cb1bf3d),
+              TOBN(0x4c1f9d09, 0x73dedf61),
+              TOBN(0xaef7c9d7, 0xbfb70ced),
+              TOBN(0x1ec0507e, 0x1641de1e),
+              TOBN(0xcd7e5cc7, 0xcde45079),
+              TOBN(0xde173c9a, 0x516ac9e4),
+              TOBN(0x517a8494, 0xc170315c),
+              TOBN(0x438fd905, 0x91d8e8fb),
+              TOBN(0x5145c506, 0xc7d9630b),
+              TOBN(0x6457a87b, 0xf47d4d75),
+              TOBN(0xd31646bf, 0x0d9a80e8),
+              TOBN(0x453add2b, 0xcef3aabe),
+              TOBN(0xc9941109, 0xa607419d),
+              TOBN(0xfaa71e62, 0xbb6bca80),
+              TOBN(0x34158c13, 0x07c431f3),
+              TOBN(0x594abebc, 0x992bc47a),
+              TOBN(0x6dfea691, 0xeb78399f),
+              TOBN(0x48aafb35, 0x3f42cba4),
+              TOBN(0xedcd65af, 0x077c04f0),
+              TOBN(0x1a29a366, 0xe884491a),
+              TOBN(0x023a40e5, 0x1c21f2bf),
+              TOBN(0xf99a513c, 0xa5057aee),
+              TOBN(0xa3fe7e25, 0xbcab072e),
+              TOBN(0x8568d2e1, 0x40e32bcf),
+              TOBN(0x904594eb, 0xd3f69d9f),
+              TOBN(0x181a9733, 0x07affab1),
+              TOBN(0xe4d68d76, 0xb6e330f4),
+              TOBN(0x87a6dafb, 0xc75a7fc1),
+              TOBN(0x549db2b5, 0xef7d9289),
+              TOBN(0x2480d4a8, 0x197f015a),
+              TOBN(0x61d5590b, 0xc40493b6),
+              TOBN(0x3a55b52e, 0x6f780331),
+              TOBN(0x40eb8115, 0x309eadb0),
+              TOBN(0xdea7de5a, 0x92e5c625),
+              TOBN(0x64d631f0, 0xcc6a3d5a),
+              TOBN(0x9d5e9d7c, 0x93e8dd61),
+              TOBN(0xf297bef5, 0x206d3ffc),
+              TOBN(0x23d5e033, 0x7d808bd4),
+              TOBN(0x4a4f6912, 0xd24cf5ba),
+              TOBN(0xe4d8163b, 0x09cdaa8a),
+              TOBN(0x0e0de9ef, 0xd3082e8e),
+              TOBN(0x4fe1246c, 0x0192f360),
+              TOBN(0x1f900150, 0x4b8eee0a),
+              TOBN(0x5219da81, 0xf1da391b),
+              TOBN(0x7bf6a5c1, 0xf7ea25aa),
+              TOBN(0xd165e6bf, 0xfbb07d5f),
+              TOBN(0xe3539361, 0x89e78671),
+              TOBN(0xa3fcac89, 0x2bac4219),
+              TOBN(0xdfab6fd4, 0xf0baa8ab),
+              TOBN(0x5a4adac1, 0xe2c1c2e5),
+              TOBN(0x6cd75e31, 0x40d85849),
+              TOBN(0xce263fea, 0x19b39181),
+              TOBN(0xcb6803d3, 0x07032c72),
+              TOBN(0x7f40d5ce, 0x790968c8),
+              TOBN(0xa6de86bd, 0xdce978f0),
+              TOBN(0x25547c4f, 0x368f751c),
+              TOBN(0xb1e685fd, 0x65fb2a9e),
+              TOBN(0xce69336f, 0x1eb9179c),
+              TOBN(0xb15d1c27, 0x12504442),
+              TOBN(0xb7df465c, 0xb911a06b),
+              TOBN(0xb8d804a3, 0x315980cd),
+              TOBN(0x693bc492, 0xfa3bebf7),
+              TOBN(0x3578aeee, 0x2253c504),
+              TOBN(0x158de498, 0xcd2474a2),
+              TOBN(0x1331f5c7, 0xcfda8368),
+              TOBN(0xd2d7bbb3, 0x78d7177e),
+              TOBN(0xdf61133a, 0xf3c1e46e),
+              TOBN(0x5836ce7d, 0xd30e7be8),
+              TOBN(0x83084f19, 0x94f834cb),
+              TOBN(0xd35653d4, 0x429ed782),
+              TOBN(0xa542f16f, 0x59e58243),
+              TOBN(0xc2b52f65, 0x0470a22d),
+              TOBN(0xe3b6221b, 0x18f23d96),
+              TOBN(0xcb05abac, 0x3f5252b4),
+              TOBN(0xca00938b, 0x87d61402),
+              TOBN(0x2f186cdd, 0x411933e4),
+              TOBN(0xe042ece5, 0x9a29a5c5),
+              TOBN(0xb19b3c07, 0x3b6c8402),
+              TOBN(0xc97667c7, 0x19d92684),
+              TOBN(0xb5624622, 0xebc66372),
+              TOBN(0x0cb96e65, 0x3c04fa02),
+              TOBN(0x83a7176c, 0x8eaa39aa),
+              TOBN(0x2033561d, 0xeaa1633f),
+              TOBN(0x45a9d086, 0x4533df73),
+              TOBN(0xe0542c1d, 0x3dc090bc),
+              TOBN(0x82c996ef, 0xaa59c167),
+              TOBN(0xe3f735e8, 0x0ee7fc4d),
+              TOBN(0x7b179393, 0x7c35db79),
+              TOBN(0xb6419e25, 0xf8c5dbfd),
+              TOBN(0x4d9d7a1e, 0x1f327b04),
+              TOBN(0x979f6f9b, 0x298dfca8),
+              TOBN(0xc7c5dff1, 0x8de9366a),
+              TOBN(0x1b7a588d, 0x04c82bdd),
+              TOBN(0x68005534, 0xf8319dfd),
+              TOBN(0xde8a55b5, 0xd8eb9580),
+              TOBN(0x5ea886da, 0x8d5bca81),
+              TOBN(0xe8530a01, 0x252a0b4d),
+              TOBN(0x1bffb4fe, 0x35eaa0a1),
+              TOBN(0x2ad828b1, 0xd8e99563),
+              TOBN(0x7de96ef5, 0x95f9cd87),
+              TOBN(0x4abb2d0c, 0xd77d970c),
+              TOBN(0x03cfb933, 0xd33ef9cb),
+              TOBN(0xb0547c01, 0x8b211fe9),
+              TOBN(0x2fe64809, 0xa56ed1c6),
+              TOBN(0xcb7d5624, 0xc2ac98cc),
+              TOBN(0x2a1372c0, 0x1a393e33),
+              TOBN(0xc8d1ec1c, 0x29660521),
+              TOBN(0xf3d31b04, 0xb37ac3e9),
+              TOBN(0xa29ae9df, 0x5ece6e7c),
+              TOBN(0x0603ac8f, 0x0facfb55),
+              TOBN(0xcfe85b7a, 0xdda233a5),
+              TOBN(0xe618919f, 0xbd75f0b8),
+              TOBN(0xf555a3d2, 0x99bf1603),
+              TOBN(0x1f43afc9, 0xf184255a),
+              TOBN(0xdcdaf341, 0x319a3e02),
+              TOBN(0xd3b117ef, 0x03903a39),
+              TOBN(0xe095da13, 0x65d1d131),
+              TOBN(0x86f16367, 0xc37ad03e),
+              TOBN(0x5f37389e, 0x462cd8dd),
+              TOBN(0xc103fa04, 0xd67a60e6),
+              TOBN(0x57c34344, 0xf4b478f0),
+              TOBN(0xce91edd8, 0xe117c98d),
+              TOBN(0x001777b0, 0x231fc12e),
+              TOBN(0x11ae47f2, 0xb207bccb),
+              TOBN(0xd983cf8d, 0x20f8a242),
+              TOBN(0x7aff5b1d, 0xf22e1ad8),
+              TOBN(0x68fd11d0, 0x7fc4feb3),
+              TOBN(0x5d53ae90, 0xb0f1c3e1),
+              TOBN(0x50fb7905, 0xec041803),
+              TOBN(0x85e3c977, 0x14404888),
+              TOBN(0x0e67faed, 0xac628d8f),
+              TOBN(0x2e865150, 0x6668532c),
+              TOBN(0x15acaaa4, 0x6a67a6b0),
+              TOBN(0xf4cdee25, 0xb25cec41),
+              TOBN(0x49ee565a, 0xe4c6701e),
+              TOBN(0x2a04ca66, 0xfc7d63d8),
+              TOBN(0xeb105018, 0xef0543fb),
+              TOBN(0xf709a4f5, 0xd1b0d81d),
+              TOBN(0x5b906ee6, 0x2915d333),
+              TOBN(0xf4a87412, 0x96f1f0ab),
+              TOBN(0xb6b82fa7, 0x4d82f4c2),
+              TOBN(0x90725a60, 0x6804efb3),
+              TOBN(0xbc82ec46, 0xadc3425e),
+              TOBN(0xb7b80581, 0x2787843e),
+              TOBN(0xdf46d91c, 0xdd1fc74c),
+              TOBN(0xdc1c62cb, 0xe783a6c4),
+              TOBN(0x59d1b9f3, 0x1a04cbba),
+              TOBN(0xd87f6f72, 0x95e40764),
+              TOBN(0x02b4cfc1, 0x317f4a76),
+              TOBN(0x8d2703eb, 0x91036bce),
+              TOBN(0x98206cc6, 0xa5e72a56),
+              TOBN(0x57be9ed1, 0xcf53fb0f),
+              TOBN(0x09374571, 0xef0b17ac),
+              TOBN(0x74b2655e, 0xd9181b38),
+              TOBN(0xc8f80ea8, 0x89935d0e),
+              TOBN(0xc0d9e942, 0x91529936),
+              TOBN(0x19686041, 0x1e84e0e5),
+              TOBN(0xa5db84d3, 0xaea34c93),
+              TOBN(0xf9d5bb19, 0x7073a732),
+              TOBN(0xb8d2fe56, 0x6bcfd7c0),
+              TOBN(0x45775f36, 0xf3eb82fa),
+              TOBN(0x8cb20ccc, 0xfdff8b58),
+              TOBN(0x1659b65f, 0x8374c110),
+              TOBN(0xb8b4a422, 0x330c789a),
+              TOBN(0x75e3c3ea, 0x6fe8208b),
+              TOBN(0xbd74b9e4, 0x286e78fe),
+              TOBN(0x0be2e81b, 0xd7d93a1a),
+              TOBN(0x7ed06e27, 0xdd0a5aae),
+              TOBN(0x721f5a58, 0x6be8b800),
+              TOBN(0x428299d1, 0xd846db28),
+              TOBN(0x95cb8e6b, 0x5be88ed3),
+              TOBN(0xc3186b23, 0x1c034e11),
+              TOBN(0xa6312c9e, 0x8977d99b),
+              TOBN(0xbe944331, 0x83f531e7),
+              TOBN(0x8232c0c2, 0x18d3b1d4),
+              TOBN(0x617aae8b, 0xe1247b73),
+              TOBN(0x40153fc4, 0x282aec3b),
+              TOBN(0xc6063d2f, 0xf7b8f823),
+              TOBN(0x68f10e58, 0x3304f94c),
+              TOBN(0x31efae74, 0xee676346),
+              TOBN(0xbadb6c6d, 0x40a9b97c),
+              TOBN(0x14702c63, 0x4f666256),
+              TOBN(0xdeb954f1, 0x5184b2e3),
+              TOBN(0x5184a526, 0x94b6ca40),
+              TOBN(0xfff05337, 0x003c32ea),
+              TOBN(0x5aa374dd, 0x205974c7),
+              TOBN(0x9a763854, 0x4b0dd71a),
+              TOBN(0x459cd27f, 0xdeb947ec),
+              TOBN(0xa6e28161, 0x459c2b92),
+              TOBN(0x2f020fa8, 0x75ee8ef5),
+              TOBN(0xb132ec2d, 0x30b06310),
+              TOBN(0xc3e15899, 0xbc6a4530),
+              TOBN(0xdc5f53fe, 0xaa3f451a),
+              TOBN(0x3a3c7f23, 0xc2d9acac),
+              TOBN(0x2ec2f892, 0x6b27e58b),
+              TOBN(0x68466ee7, 0xd742799f),
+              TOBN(0x98324dd4, 0x1fa26613),
+              TOBN(0xa2dc6dab, 0xbdc29d63),
+              TOBN(0xf9675faa, 0xd712d657),
+              TOBN(0x813994be, 0x21fd8d15),
+              TOBN(0x5ccbb722, 0xfd4f7553),
+              TOBN(0x5135ff8b, 0xf3a36b20),
+              TOBN(0x44be28af, 0x69559df5),
+              TOBN(0x40b65bed, 0x9d41bf30),
+              TOBN(0xd98bf2a4, 0x3734e520),
+              TOBN(0x5e3abbe3, 0x209bdcba),
+              TOBN(0x77c76553, 0xbc945b35),
+              TOBN(0x5331c093, 0xc6ef14aa),
+              TOBN(0x518ffe29, 0x76b60c80),
+              TOBN(0x2285593b, 0x7ace16f8),
+              TOBN(0xab1f64cc, 0xbe2b9784),
+              TOBN(0xe8f2c0d9, 0xab2421b6),
+              TOBN(0x617d7174, 0xc1df065c),
+              TOBN(0xafeeb5ab, 0x5f6578fa),
+              TOBN(0x16ff1329, 0x263b54a8),
+              TOBN(0x45c55808, 0xc990dce3),
+              TOBN(0x42eab6c0, 0xecc8c177),
+              TOBN(0x799ea9b5, 0x5982ecaa),
+              TOBN(0xf65da244, 0xb607ef8e),
+              TOBN(0x8ab226ce, 0x32a3fc2c),
+              TOBN(0x745741e5, 0x7ea973dc),
+              TOBN(0x5c00ca70, 0x20888f2e),
+              TOBN(0x7cdce3cf, 0x45fd9cf1),
+              TOBN(0x8a741ef1, 0x5507f872),
+              TOBN(0x47c51c2f, 0x196b4cec),
+              TOBN(0x70d08e43, 0xc97ea618),
+              TOBN(0x930da15c, 0x15b18a2b),
+              TOBN(0x33b6c678, 0x2f610514),
+              TOBN(0xc662e4f8, 0x07ac9794),
+              TOBN(0x1eccf050, 0xba06cb79),
+              TOBN(0x1ff08623, 0xe7d954e5),
+              TOBN(0x6ef2c5fb, 0x24cf71c3),
+              TOBN(0xb2c063d2, 0x67978453),
+              TOBN(0xa0cf3796, 0x1d654af8),
+              TOBN(0x7cb242ea, 0x7ebdaa37),
+              TOBN(0x206e0b10, 0xb86747e0),
+              TOBN(0x481dae5f, 0xd5ecfefc),
+              TOBN(0x07084fd8, 0xc2bff8fc),
+              TOBN(0x8040a01a, 0xea324596),
+              TOBN(0x4c646980, 0xd4de4036),
+              TOBN(0x9eb8ab4e, 0xd65abfc3),
+              TOBN(0xe01cb91f, 0x13541ec7),
+              TOBN(0x8f029adb, 0xfd695012),
+              TOBN(0x9ae28483, 0x3c7569ec),
+              TOBN(0xa5614c9e, 0xa66d80a1),
+              TOBN(0x680a3e44, 0x75f5f911),
+              TOBN(0x0c07b14d, 0xceba4fc1),
+              TOBN(0x891c285b, 0xa13071c1),
+              TOBN(0xcac67ceb, 0x799ece3c),
+              TOBN(0x29b910a9, 0x41e07e27),
+              TOBN(0x66bdb409, 0xf2e43123),
+              TOBN(0x06f8b137, 0x7ac9ecbe),
+              TOBN(0x5981fafd, 0x38547090),
+              TOBN(0x19ab8b9f, 0x85e3415d),
+              TOBN(0xfc28c194, 0xc7e31b27),
+              TOBN(0x843be0aa, 0x6fbcbb42),
+              TOBN(0xf3b1ed43, 0xa6db836c),
+              TOBN(0x2a1330e4, 0x01a45c05),
+              TOBN(0x4f19f3c5, 0x95c1a377),
+              TOBN(0xa85f39d0, 0x44b5ee33),
+              TOBN(0x3da18e6d, 0x4ae52834),
+              TOBN(0x5a403b39, 0x7423dcb0),
+              TOBN(0xbb555e0a, 0xf2374aef),
+              TOBN(0x2ad599c4, 0x1e8ca111),
+              TOBN(0x1b3a2fb9, 0x014b3bf8),
+              TOBN(0x73092684, 0xf66d5007),
+              TOBN(0x079f1426, 0xc4340102),
+              TOBN(0x1827cf81, 0x8fddf4de),
+              TOBN(0xc83605f6, 0xf10ff927),
+              TOBN(0xd3871451, 0x23739fc6),
+              TOBN(0x6d163450, 0xcac1c2cc),
+              TOBN(0x6b521296, 0xa2ec1ac5),
+              TOBN(0x0606c4f9, 0x6e3cb4a5),
+              TOBN(0xe47d3f41, 0x778abff7),
+              TOBN(0x425a8d5e, 0xbe8e3a45),
+              TOBN(0x53ea9e97, 0xa6102160),
+              TOBN(0x477a106e, 0x39cbb688),
+              TOBN(0x532401d2, 0xf3386d32),
+              TOBN(0x8e564f64, 0xb1b9b421),
+              TOBN(0xca9b8388, 0x81dad33f),
+              TOBN(0xb1422b4e, 0x2093913e),
+              TOBN(0x533d2f92, 0x69bc8112),
+              TOBN(0x3fa017be, 0xebe7b2c7),
+              TOBN(0xb2767c4a, 0xcaf197c6),
+              TOBN(0xc925ff87, 0xaedbae9f),
+              TOBN(0x7daf0eb9, 0x36880a54),
+              TOBN(0x9284ddf5, 0x9c4d0e71),
+              TOBN(0x1581cf93, 0x316f8cf5),
+              TOBN(0x3eeca887, 0x3ac1f452),
+              TOBN(0xb417fce9, 0xfb6aeffe),
+              TOBN(0xa5918046, 0xeefb8dc3),
+              TOBN(0x73d318ac, 0x02209400),
+              TOBN(0xe800400f, 0x728693e5),
+              TOBN(0xe87d814b, 0x339927ed),
+              TOBN(0x93e94d3b, 0x57ea9910),
+              TOBN(0xff8a35b6, 0x2245fb69),
+              TOBN(0x043853d7, 0x7f200d34),
+              TOBN(0x470f1e68, 0x0f653ce1),
+              TOBN(0x81ac05bd, 0x59a06379),
+              TOBN(0xa14052c2, 0x03930c29),
+              TOBN(0x6b72fab5, 0x26bc2797),
+              TOBN(0x13670d16, 0x99f16771),
+              TOBN(0x00170052, 0x1e3e48d1),
+              TOBN(0x978fe401, 0xb7adf678),
+              TOBN(0x55ecfb92, 0xd41c5dd4),
+              TOBN(0x5ff8e247, 0xc7b27da5),
+              TOBN(0xe7518272, 0x013fb606),
+              TOBN(0x5768d7e5, 0x2f547a3c),
+              TOBN(0xbb24eaa3, 0x60017a5f),
+              TOBN(0x6b18e6e4, 0x9c64ce9b),
+              TOBN(0xc225c655, 0x103dde07),
+              TOBN(0xfc3672ae, 0x7592f7ea),
+              TOBN(0x9606ad77, 0xd06283a1),
+              TOBN(0x542fc650, 0xe4d59d99),
+              TOBN(0xabb57c49, 0x2a40e7c2),
+              TOBN(0xac948f13, 0xa8db9f55),
+              TOBN(0x6d4c9682, 0xb04465c3),
+              TOBN(0xe3d062fa, 0x6468bd15),
+              TOBN(0xa51729ac, 0x5f318d7e),
+              TOBN(0x1fc87df6, 0x9eb6fc95),
+              TOBN(0x63d146a8, 0x0591f652),
+              TOBN(0xa861b8f7, 0x589621aa),
+              TOBN(0x59f5f15a, 0xce31348c),
+              TOBN(0x8f663391, 0x440da6da),
+              TOBN(0xcfa778ac, 0xb591ffa3),
+              TOBN(0x027ca9c5, 0x4cdfebce),
+              TOBN(0xbe8e05a5, 0x444ea6b3),
+              TOBN(0x8aab4e69, 0xa78d8254),
+              TOBN(0x2437f04f, 0xb474d6b8),
+              TOBN(0x6597ffd4, 0x045b3855),
+              TOBN(0xbb0aea4e, 0xca47ecaa),
+              TOBN(0x568aae83, 0x85c7ebfc),
+              TOBN(0x0e966e64, 0xc73b2383),
+              TOBN(0x49eb3447, 0xd17d8762),
+              TOBN(0xde107821, 0x8da05dab),
+              TOBN(0x443d8baa, 0x016b7236),
+              TOBN(0x163b63a5, 0xea7610d6),
+              TOBN(0xe47e4185, 0xce1ca979),
+              TOBN(0xae648b65, 0x80baa132),
+              TOBN(0xebf53de2, 0x0e0d5b64),
+              TOBN(0x8d3bfcb4, 0xd3c8c1ca),
+              TOBN(0x0d914ef3, 0x5d04b309),
+              TOBN(0x55ef6415, 0x3de7d395),
+              TOBN(0xbde1666f, 0x26b850e8),
+              TOBN(0xdbe1ca6e, 0xd449ab19),
+              TOBN(0x8902b322, 0xe89a2672),
+              TOBN(0xb1674b7e, 0xdacb7a53),
+              TOBN(0x8e9faf6e, 0xf52523ff),
+              TOBN(0x6ba535da, 0x9a85788b),
+              TOBN(0xd21f03ae, 0xbd0626d4),
+              TOBN(0x099f8c47, 0xe873dc64),
+              TOBN(0xcda8564d, 0x018ec97e),
+              TOBN(0x3e8d7a5c, 0xde92c68c),
+              TOBN(0x78e035a1, 0x73323cc4),
+              TOBN(0x3ef26275, 0xf880ff7c),
+              TOBN(0xa4ee3dff, 0x273eedaa),
+              TOBN(0x58823507, 0xaf4e18f8),
+              TOBN(0x967ec9b5, 0x0672f328),
+              TOBN(0x9ded19d9, 0x559d3186),
+              TOBN(0x5e2ab3de, 0x6cdce39c),
+              TOBN(0xabad6e4d, 0x11c226df),
+              TOBN(0xf9783f43, 0x87723014),
+              TOBN(0x9a49a0cf, 0x1a885719),
+              TOBN(0xfc0c1a5a, 0x90da9dbf),
+              TOBN(0x8bbaec49, 0x571d92ac),
+              TOBN(0x569e85fe, 0x4692517f),
+              TOBN(0x8333b014, 0xa14ea4af),
+              TOBN(0x32f2a62f, 0x12e5c5ad),
+              TOBN(0x98c2ce3a, 0x06d89b85),
+              TOBN(0xb90741aa, 0x2ff77a08),
+              TOBN(0x2530defc, 0x01f795a2),
+              TOBN(0xd6e5ba0b, 0x84b3c199),
+              TOBN(0x7d8e8451, 0x12e4c936),
+              TOBN(0xae419f7d, 0xbd0be17b),
+              TOBN(0xa583fc8c, 0x22262bc9),
+              TOBN(0x6b842ac7, 0x91bfe2bd),
+              TOBN(0x33cef4e9, 0x440d6827),
+              TOBN(0x5f69f4de, 0xef81fb14),
+              TOBN(0xf16cf6f6, 0x234fbb92),
+              TOBN(0x76ae3fc3, 0xd9e7e158),
+              TOBN(0x4e89f6c2, 0xe9740b33),
+              TOBN(0x677bc85d, 0x4962d6a1),
+              TOBN(0x6c6d8a7f, 0x68d10d15),
+              TOBN(0x5f9a7224, 0x0257b1cd),
+              TOBN(0x7096b916, 0x4ad85961),
+              TOBN(0x5f8c47f7, 0xe657ab4a),
+              TOBN(0xde57d7d0, 0xf7461d7e),
+              TOBN(0x7eb6094d, 0x80ce5ee2),
+              TOBN(0x0b1e1dfd, 0x34190547),
+              TOBN(0x8a394f43, 0xf05dd150),
+              TOBN(0x0a9eb24d, 0x97df44e6),
+              TOBN(0x78ca06bf, 0x87675719),
+              TOBN(0x6f0b3462, 0x6ffeec22),
+              TOBN(0x9d91bcea, 0x36cdd8fb),
+              TOBN(0xac83363c, 0xa105be47),
+              TOBN(0x81ba76c1, 0x069710e3),
+              TOBN(0x3d1b24cb, 0x28c682c6),
+              TOBN(0x27f25228, 0x8612575b),
+              TOBN(0xb587c779, 0xe8e66e98),
+              TOBN(0x7b0c03e9, 0x405eb1fe),
+              TOBN(0xfdf0d030, 0x15b548e7),
+              TOBN(0xa8be76e0, 0x38b36af7),
+              TOBN(0x4cdab04a, 0x4f310c40),
+              TOBN(0x6287223e, 0xf47ecaec),
+              TOBN(0x678e6055, 0x8b399320),
+              TOBN(0x61fe3fa6, 0xc01e4646),
+              TOBN(0xc482866b, 0x03261a5e),
+              TOBN(0xdfcf45b8, 0x5c2f244a),
+              TOBN(0x8fab9a51, 0x2f684b43),
+              TOBN(0xf796c654, 0xc7220a66),
+              TOBN(0x1d90707e, 0xf5afa58f),
+              TOBN(0x2c421d97, 0x4fdbe0de),
+              TOBN(0xc4f4cda3, 0xaf2ebc2f),
+              TOBN(0xa0af843d, 0xcb4efe24),
+              TOBN(0x53b857c1, 0x9ccd10b1),
+              TOBN(0xddc9d1eb, 0x914d3e04),
+              TOBN(0x7bdec8bb, 0x62771deb),
+              TOBN(0x829277aa, 0x91c5aa81),
+              TOBN(0x7af18dd6, 0x832391ae),
+              TOBN(0x1740f316, 0xc71a84ca),
+          },
+          {
+              TOBN(0x8928e99a, 0xeeaf8c49),
+              TOBN(0xee7aa73d, 0x6e24d728),
+              TOBN(0x4c5007c2, 0xe72b156c),
+              TOBN(0x5fcf57c5, 0xed408a1d),
+              TOBN(0x9f719e39, 0xb6057604),
+              TOBN(0x7d343c01, 0xc2868bbf),
+              TOBN(0x2cca254b, 0x7e103e2d),
+              TOBN(0xe6eb38a9, 0xf131bea2),
+              TOBN(0xb33e624f, 0x8be762b4),
+              TOBN(0x2a9ee4d1, 0x058e3413),
+              TOBN(0x968e6369, 0x67d805fa),
+              TOBN(0x9848949b, 0x7db8bfd7),
+              TOBN(0x5308d7e5, 0xd23a8417),
+              TOBN(0x892f3b1d, 0xf3e29da5),
+              TOBN(0xc95c139e, 0x3dee471f),
+              TOBN(0x8631594d, 0xd757e089),
+              TOBN(0xe0c82a3c, 0xde918dcc),
+              TOBN(0x2e7b5994, 0x26fdcf4b),
+              TOBN(0x82c50249, 0x32cb1b2d),
+              TOBN(0xea613a9d, 0x7657ae07),
+              TOBN(0xc2eb5f6c, 0xf1fdc9f7),
+              TOBN(0xb6eae8b8, 0x879fe682),
+              TOBN(0x253dfee0, 0x591cbc7f),
+              TOBN(0x000da713, 0x3e1290e6),
+              TOBN(0x1083e2ea, 0x1f095615),
+              TOBN(0x0a28ad77, 0x14e68c33),
+              TOBN(0x6bfc0252, 0x3d8818be),
+              TOBN(0xb585113a, 0xf35850cd),
+              TOBN(0x7d935f0b, 0x30df8aa1),
+              TOBN(0xaddda07c, 0x4ab7e3ac),
+              TOBN(0x92c34299, 0x552f00cb),
+              TOBN(0xc33ed1de, 0x2909df6c),
+              TOBN(0x22c2195d, 0x80e87766),
+              TOBN(0x9e99e6d8, 0x9ddf4ac0),
+              TOBN(0x09642e4e, 0x65e74934),
+              TOBN(0x2610ffa2, 0xff1ff241),
+              TOBN(0x4d1d47d4, 0x751c8159),
+              TOBN(0x697b4985, 0xaf3a9363),
+              TOBN(0x0318ca46, 0x87477c33),
+              TOBN(0xa90cb565, 0x9441eff3),
+              TOBN(0x58bb3848, 0x36f024cb),
+              TOBN(0x85be1f77, 0x36016168),
+              TOBN(0x6c59587c, 0xdc7e07f1),
+              TOBN(0x191be071, 0xaf1d8f02),
+              TOBN(0xbf169fa5, 0xcca5e55c),
+              TOBN(0x3864ba3c, 0xf7d04eac),
+              TOBN(0x915e367f, 0x8d7d05db),
+              TOBN(0xb48a876d, 0xa6549e5d),
+              TOBN(0xef89c656, 0x580e40a2),
+              TOBN(0xf194ed8c, 0x728068bc),
+              TOBN(0x74528045, 0xa47990c9),
+              TOBN(0xf53fc7d7, 0x5e1a4649),
+              TOBN(0xbec5ae9b, 0x78593e7d),
+              TOBN(0x2cac4ee3, 0x41db65d7),
+              TOBN(0xa8c1eb24, 0x04a3d39b),
+              TOBN(0x53b7d634, 0x03f8f3ef),
+              TOBN(0x2dc40d48, 0x3e07113c),
+              TOBN(0x6e4a5d39, 0x7d8b63ae),
+              TOBN(0x5582a94b, 0x79684c2b),
+              TOBN(0x932b33d4, 0x622da26c),
+              TOBN(0xf534f651, 0x0dbbf08d),
+              TOBN(0x211d07c9, 0x64c23a52),
+              TOBN(0x0eeece0f, 0xee5bdc9b),
+              TOBN(0xdf178168, 0xf7015558),
+              TOBN(0xd4294635, 0x0a712229),
+              TOBN(0x93cbe448, 0x09273f8c),
+              TOBN(0x00b095ef, 0x8f13bc83),
+              TOBN(0xbb741972, 0x8798978c),
+              TOBN(0x9d7309a2, 0x56dbe6e7),
+              TOBN(0xe578ec56, 0x5a5d39ec),
+              TOBN(0x3961151b, 0x851f9a31),
+              TOBN(0x2da7715d, 0xe5709eb4),
+              TOBN(0x867f3017, 0x53dfabf0),
+              TOBN(0x728d2078, 0xb8e39259),
+              TOBN(0x5c75a0cd, 0x815d9958),
+              TOBN(0xf84867a6, 0x16603be1),
+              TOBN(0xc865b13d, 0x70e35b1c),
+              TOBN(0x02414468, 0x19b03e2c),
+              TOBN(0xe46041da, 0xac1f3121),
+              TOBN(0x7c9017ad, 0x6f028a7c),
+              TOBN(0xabc96de9, 0x0a482873),
+              TOBN(0x4265d6b1, 0xb77e54d4),
+              TOBN(0x68c38e79, 0xa57d88e7),
+              TOBN(0xd461d766, 0x9ce82de3),
+              TOBN(0x817a9ec5, 0x64a7e489),
+              TOBN(0xcc5675cd, 0xa0def5f2),
+              TOBN(0x9a00e785, 0x985d494e),
+              TOBN(0xc626833f, 0x1b03514a),
+              TOBN(0xabe7905a, 0x83cdd60e),
+              TOBN(0x50602fb5, 0xa1170184),
+              TOBN(0x689886cd, 0xb023642a),
+              TOBN(0xd568d090, 0xa6e1fb00),
+              TOBN(0x5b1922c7, 0x0259217f),
+              TOBN(0x93831cd9, 0xc43141e4),
+              TOBN(0xdfca3587, 0x0c95f86e),
+              TOBN(0xdec2057a, 0x568ae828),
+              TOBN(0xc44ea599, 0xf98a759a),
+              TOBN(0x55a0a7a2, 0xf7c23c1d),
+              TOBN(0xd5ffb6e6, 0x94c4f687),
+              TOBN(0x3563cce2, 0x12848478),
+              TOBN(0x812b3517, 0xe7b1fbe1),
+              TOBN(0x8a7dc979, 0x4f7338e0),
+              TOBN(0x211ecee9, 0x52d048db),
+              TOBN(0x2eea4056, 0xc86ea3b8),
+              TOBN(0xd8cb68a7, 0xba772b34),
+              TOBN(0xe16ed341, 0x5f4e2541),
+              TOBN(0x9b32f6a6, 0x0fec14db),
+              TOBN(0xeee376f7, 0x391698be),
+              TOBN(0xe9a7aa17, 0x83674c02),
+              TOBN(0x65832f97, 0x5843022a),
+              TOBN(0x29f3a8da, 0x5ba4990f),
+              TOBN(0x79a59c3a, 0xfb8e3216),
+              TOBN(0x9cdc4d2e, 0xbd19bb16),
+              TOBN(0xc6c7cfd0, 0xb3262d86),
+              TOBN(0xd4ce14d0, 0x969c0b47),
+              TOBN(0x1fa352b7, 0x13e56128),
+              TOBN(0x383d55b8, 0x973db6d3),
+              TOBN(0x71836850, 0xe8e5b7bf),
+              TOBN(0xc7714596, 0xe6bb571f),
+              TOBN(0x259df31f, 0x2d5b2dd2),
+              TOBN(0x568f8925, 0x913cc16d),
+              TOBN(0x18bc5b6d, 0xe1a26f5a),
+              TOBN(0xdfa413be, 0xf5f499ae),
+              TOBN(0xf8835dec, 0xc3f0ae84),
+              TOBN(0xb6e60bd8, 0x65a40ab0),
+              TOBN(0x65596439, 0x194b377e),
+              TOBN(0xbcd85625, 0x92084a69),
+              TOBN(0x5ce433b9, 0x4f23ede0),
+              TOBN(0xe8e8f04f, 0x6ad65143),
+              TOBN(0x11511827, 0xd6e14af6),
+              TOBN(0x3d390a10, 0x8295c0c7),
+              TOBN(0x71e29ee4, 0x621eba16),
+              TOBN(0xa588fc09, 0x63717b46),
+              TOBN(0x02be02fe, 0xe06ad4a2),
+              TOBN(0x931558c6, 0x04c22b22),
+              TOBN(0xbb4d4bd6, 0x12f3c849),
+              TOBN(0x54a4f496, 0x20efd662),
+              TOBN(0x92ba6d20, 0xc5952d14),
+              TOBN(0x2db8ea1e, 0xcc9784c2),
+              TOBN(0x81cc10ca, 0x4b353644),
+              TOBN(0x40b570ad, 0x4b4d7f6c),
+              TOBN(0x5c9f1d96, 0x84a1dcd2),
+              TOBN(0x01379f81, 0x3147e797),
+              TOBN(0xe5c6097b, 0x2bd499f5),
+              TOBN(0x40dcafa6, 0x328e5e20),
+              TOBN(0xf7b5244a, 0x54815550),
+              TOBN(0xb9a4f118, 0x47bfc978),
+              TOBN(0x0ea0e79f, 0xd25825b1),
+              TOBN(0xa50f96eb, 0x646c7ecf),
+              TOBN(0xeb811493, 0x446dea9d),
+              TOBN(0x2af04677, 0xdfabcf69),
+              TOBN(0xbe3a068f, 0xc713f6e8),
+              TOBN(0x860d523d, 0x42e06189),
+              TOBN(0xbf077941, 0x4e3aff13),
+              TOBN(0x0b616dca, 0xc1b20650),
+              TOBN(0xe66dd6d1, 0x2131300d),
+              TOBN(0xd4a0fd67, 0xff99abde),
+              TOBN(0xc9903550, 0xc7aac50d),
+              TOBN(0x022ecf8b, 0x7c46b2d7),
+              TOBN(0x3333b1e8, 0x3abf92af),
+              TOBN(0x11cc113c, 0x6c491c14),
+              TOBN(0x05976688, 0x80dd3f88),
+              TOBN(0xf5b4d9e7, 0x29d932ed),
+              TOBN(0xe982aad8, 0xa2c38b6d),
+              TOBN(0x6f925347, 0x8be0dcf0),
+              TOBN(0x700080ae, 0x65ca53f2),
+              TOBN(0xd8131156, 0x443ca77f),
+              TOBN(0xe92d6942, 0xec51f984),
+              TOBN(0xd2a08af8, 0x85dfe9ae),
+              TOBN(0xd825d9a5, 0x4d2a86ca),
+              TOBN(0x2c53988d, 0x39dff020),
+              TOBN(0xf38b135a, 0x430cdc40),
+              TOBN(0x0c918ae0, 0x62a7150b),
+              TOBN(0xf31fd8de, 0x0c340e9b),
+              TOBN(0xafa0e7ae, 0x4dbbf02e),
+              TOBN(0x5847fb2a, 0x5eba6239),
+              TOBN(0x6b1647dc, 0xdccbac8b),
+              TOBN(0xb642aa78, 0x06f485c8),
+              TOBN(0x873f3765, 0x7038ecdf),
+              TOBN(0x2ce5e865, 0xfa49d3fe),
+              TOBN(0xea223788, 0xc98c4400),
+              TOBN(0x8104a8cd, 0xf1fa5279),
+              TOBN(0xbcf7cc7a, 0x06becfd7),
+              TOBN(0x49424316, 0xc8f974ae),
+              TOBN(0xc0da65e7, 0x84d6365d),
+              TOBN(0xbcb7443f, 0x8f759fb8),
+              TOBN(0x35c712b1, 0x7ae81930),
+              TOBN(0x80428dff, 0x4c6e08ab),
+              TOBN(0xf19dafef, 0xa4faf843),
+              TOBN(0xced8538d, 0xffa9855f),
+              TOBN(0x20ac409c, 0xbe3ac7ce),
+              TOBN(0x358c1fb6, 0x882da71e),
+              TOBN(0xafa9c0e5, 0xfd349961),
+              TOBN(0x2b2cfa51, 0x8421c2fc),
+              TOBN(0x2a80db17, 0xf3a28d38),
+              TOBN(0xa8aba539, 0x5d138e7e),
+              TOBN(0x52012d1d, 0x6e96eb8d),
+              TOBN(0x65d8dea0, 0xcbaf9622),
+              TOBN(0x57735447, 0xb264f56c),
+              TOBN(0xbeebef3f, 0x1b6c8da2),
+              TOBN(0xfc346d98, 0xce785254),
+              TOBN(0xd50e8d72, 0xbb64a161),
+              TOBN(0xc03567c7, 0x49794add),
+              TOBN(0x15a76065, 0x752c7ef6),
+              TOBN(0x59f3a222, 0x961f23d6),
+              TOBN(0x378e4438, 0x73ecc0b0),
+              TOBN(0xc74be434, 0x5a82fde4),
+              TOBN(0xae509af2, 0xd8b9cf34),
+              TOBN(0x4a61ee46, 0x577f44a1),
+              TOBN(0xe09b748c, 0xb611deeb),
+              TOBN(0xc0481b2c, 0xf5f7b884),
+              TOBN(0x35626678, 0x61acfa6b),
+              TOBN(0x37f4c518, 0xbf8d21e6),
+              TOBN(0x22d96531, 0xb205a76d),
+              TOBN(0x37fb85e1, 0x954073c0),
+              TOBN(0xbceafe4f, 0x65b3a567),
+              TOBN(0xefecdef7, 0xbe42a582),
+              TOBN(0xd3fc6080, 0x65046be6),
+              TOBN(0xc9af13c8, 0x09e8dba9),
+              TOBN(0x1e6c9847, 0x641491ff),
+              TOBN(0x3b574925, 0xd30c31f7),
+              TOBN(0xb7eb72ba, 0xac2a2122),
+              TOBN(0x776a0dac, 0xef0859e7),
+              TOBN(0x06fec314, 0x21900942),
+              TOBN(0x2464bc10, 0xf8c22049),
+              TOBN(0x9bfbcce7, 0x875ebf69),
+              TOBN(0xd7a88e2a, 0x4336326b),
+              TOBN(0xda05261c, 0x5bc2acfa),
+              TOBN(0xc29f5bdc, 0xeba7efc8),
+              TOBN(0x471237ca, 0x25dbbf2e),
+              TOBN(0xa72773f2, 0x2975f127),
+              TOBN(0xdc744e8e, 0x04d0b326),
+              TOBN(0x38a7ed16, 0xa56edb73),
+              TOBN(0x64357e37, 0x2c007e70),
+              TOBN(0xa167d15b, 0x5080b400),
+              TOBN(0x07b41164, 0x23de4be1),
+              TOBN(0xb2d91e32, 0x74c89883),
+              TOBN(0x3c162821, 0x2882e7ed),
+              TOBN(0xad6b36ba, 0x7503e482),
+              TOBN(0x48434e8e, 0x0ea34331),
+              TOBN(0x79f4f24f, 0x2c7ae0b9),
+              TOBN(0xc46fbf81, 0x1939b44a),
+              TOBN(0x76fefae8, 0x56595eb1),
+              TOBN(0x417b66ab, 0xcd5f29c7),
+              TOBN(0x5f2332b2, 0xc5ceec20),
+              TOBN(0xd69661ff, 0xe1a1cae2),
+              TOBN(0x5ede7e52, 0x9b0286e6),
+              TOBN(0x9d062529, 0xe276b993),
+              TOBN(0x324794b0, 0x7e50122b),
+              TOBN(0xdd744f8b, 0x4af07ca5),
+              TOBN(0x30a12f08, 0xd63fc97b),
+              TOBN(0x39650f1a, 0x76626d9d),
+              TOBN(0x101b47f7, 0x1fa38477),
+              TOBN(0x3d815f19, 0xd4dc124f),
+              TOBN(0x1569ae95, 0xb26eb58a),
+              TOBN(0xc3cde188, 0x95fb1887),
+              TOBN(0x54e9f37b, 0xf9539a48),
+              TOBN(0xb0100e06, 0x7408c1a5),
+              TOBN(0x821d9811, 0xea580cbb),
+              TOBN(0x8af52d35, 0x86e50c56),
+              TOBN(0xdfbd9d47, 0xdbbf698b),
+              TOBN(0x2961a1ea, 0x03dc1c73),
+              TOBN(0x203d38f8, 0xe76a5df8),
+              TOBN(0x08a53a68, 0x6def707a),
+              TOBN(0x26eefb48, 0x1bee45d4),
+              TOBN(0xb3cee346, 0x3c688036),
+              TOBN(0x463c5315, 0xc42f2469),
+              TOBN(0x19d84d2e, 0x81378162),
+              TOBN(0x22d7c3c5, 0x1c4d349f),
+              TOBN(0x65965844, 0x163d59c5),
+              TOBN(0xcf198c56, 0xb8abceae),
+              TOBN(0x6fb1fb1b, 0x628559d5),
+              TOBN(0x8bbffd06, 0x07bf8fe3),
+              TOBN(0x46259c58, 0x3467734b),
+              TOBN(0xd8953cea, 0x35f7f0d3),
+              TOBN(0x1f0bece2, 0xd65b0ff1),
+              TOBN(0xf7d5b4b3, 0xf3c72914),
+              TOBN(0x29e8ea95, 0x3cb53389),
+              TOBN(0x4a365626, 0x836b6d46),
+              TOBN(0xe849f910, 0xea174fde),
+              TOBN(0x7ec62fbb, 0xf4737f21),
+              TOBN(0xd8dba5ab, 0x6209f5ac),
+              TOBN(0x24b5d7a9, 0xa5f9adbe),
+              TOBN(0x707d28f7, 0xa61dc768),
+              TOBN(0x7711460b, 0xcaa999ea),
+              TOBN(0xba7b174d, 0x1c92e4cc),
+              TOBN(0x3c4bab66, 0x18d4bf2d),
+              TOBN(0xb8f0c980, 0xeb8bd279),
+              TOBN(0x024bea9a, 0x324b4737),
+              TOBN(0xfba9e423, 0x32a83bca),
+              TOBN(0x6e635643, 0xa232dced),
+              TOBN(0x99619367, 0x2571c8ba),
+              TOBN(0xe8c9f357, 0x54b7032b),
+              TOBN(0xf936b3ba, 0x2442d54a),
+              TOBN(0x2263f0f0, 0x8290c65a),
+              TOBN(0x48989780, 0xee2c7fdb),
+              TOBN(0xadc5d55a, 0x13d4f95e),
+              TOBN(0x737cff85, 0xad9b8500),
+              TOBN(0x271c557b, 0x8a73f43d),
+              TOBN(0xbed617a4, 0xe18bc476),
+              TOBN(0x66245401, 0x7dfd8ab2),
+              TOBN(0xae7b89ae, 0x3a2870aa),
+              TOBN(0x1b555f53, 0x23a7e545),
+              TOBN(0x6791e247, 0xbe057e4c),
+              TOBN(0x860136ad, 0x324fa34d),
+              TOBN(0xea111447, 0x4cbeae28),
+              TOBN(0x023a4270, 0xbedd3299),
+              TOBN(0x3d5c3a7f, 0xc1c35c34),
+              TOBN(0xb0f6db67, 0x8d0412d2),
+              TOBN(0xd92625e2, 0xfcdc6b9a),
+              TOBN(0x92ae5ccc, 0x4e28a982),
+              TOBN(0xea251c36, 0x47a3ce7e),
+              TOBN(0x9d658932, 0x790691bf),
+              TOBN(0xed610589, 0x06b736ae),
+              TOBN(0x712c2f04, 0xc0d63b6e),
+              TOBN(0x5cf06fd5, 0xc63d488f),
+              TOBN(0x97363fac, 0xd9588e41),
+              TOBN(0x1f9bf762, 0x2b93257e),
+              TOBN(0xa9d1ffc4, 0x667acace),
+              TOBN(0x1cf4a1aa, 0x0a061ecf),
+              TOBN(0x40e48a49, 0xdc1818d0),
+              TOBN(0x0643ff39, 0xa3621ab0),
+              TOBN(0x5768640c, 0xe39ef639),
+              TOBN(0x1fc099ea, 0x04d86854),
+              TOBN(0x9130b9c3, 0xeccd28fd),
+              TOBN(0xd743cbd2, 0x7eec54ab),
+              TOBN(0x052b146f, 0xe5b475b6),
+              TOBN(0x058d9a82, 0x900a7d1f),
+              TOBN(0x65e02292, 0x91262b72),
+              TOBN(0x96f924f9, 0xbb0edf03),
+              TOBN(0x5cfa59c8, 0xfe206842),
+              TOBN(0xf6037004, 0x5eafa720),
+              TOBN(0x5f30699e, 0x18d7dd96),
+              TOBN(0x381e8782, 0xcbab2495),
+              TOBN(0x91669b46, 0xdd8be949),
+              TOBN(0xb40606f5, 0x26aae8ef),
+              TOBN(0x2812b839, 0xfc6751a4),
+              TOBN(0x16196214, 0xfba800ef),
+              TOBN(0x4398d5ca, 0x4c1a2875),
+              TOBN(0x720c00ee, 0x653d8349),
+              TOBN(0xc2699eb0, 0xd820007c),
+              TOBN(0x880ee660, 0xa39b5825),
+              TOBN(0x70694694, 0x471f6984),
+              TOBN(0xf7d16ea8, 0xe3dda99a),
+              TOBN(0x28d675b2, 0xc0519a23),
+              TOBN(0x9ebf94fe, 0x4f6952e3),
+              TOBN(0xf28bb767, 0xa2294a8a),
+              TOBN(0x85512b4d, 0xfe0af3f5),
+              TOBN(0x18958ba8, 0x99b16a0d),
+              TOBN(0x95c2430c, 0xba7548a7),
+              TOBN(0xb30d1b10, 0xa16be615),
+              TOBN(0xe3ebbb97, 0x85bfb74c),
+              TOBN(0xa3273cfe, 0x18549fdb),
+              TOBN(0xf6e200bf, 0x4fcdb792),
+              TOBN(0x54a76e18, 0x83aba56c),
+              TOBN(0x73ec66f6, 0x89ef6aa2),
+              TOBN(0x8d17add7, 0xd1b9a305),
+              TOBN(0xa959c5b9, 0xb7ae1b9d),
+              TOBN(0x88643522, 0x6bcc094a),
+              TOBN(0xcc5616c4, 0xd7d429b9),
+              TOBN(0xa6dada01, 0xe6a33f7c),
+              TOBN(0xc6217a07, 0x9d4e70ad),
+              TOBN(0xd619a818, 0x09c15b7c),
+              TOBN(0xea06b329, 0x0e80c854),
+              TOBN(0x174811ce, 0xa5f5e7b9),
+              TOBN(0x66dfc310, 0x787c65f4),
+              TOBN(0x4ea7bd69, 0x3316ab54),
+              TOBN(0xc12c4acb, 0x1dcc0f70),
+              TOBN(0xe4308d1a, 0x1e407dd9),
+              TOBN(0xe8a3587c, 0x91afa997),
+              TOBN(0xea296c12, 0xab77b7a5),
+              TOBN(0xb5ad49e4, 0x673c0d52),
+              TOBN(0x40f9b2b2, 0x7006085a),
+              TOBN(0xa88ff340, 0x87bf6ec2),
+              TOBN(0x978603b1, 0x4e3066a6),
+              TOBN(0xb3f99fc2, 0xb5e486e2),
+              TOBN(0x07b53f5e, 0xb2e63645),
+              TOBN(0xbe57e547, 0x84c84232),
+              TOBN(0xd779c216, 0x7214d5cf),
+              TOBN(0x617969cd, 0x029a3aca),
+              TOBN(0xd17668cd, 0x8a7017a0),
+              TOBN(0x77b4d19a, 0xbe9b7ee8),
+              TOBN(0x58fd0e93, 0x9c161776),
+              TOBN(0xa8c4f4ef, 0xd5968a72),
+              TOBN(0x296071cc, 0x67b3de77),
+              TOBN(0xae3c0b8e, 0x634f7905),
+              TOBN(0x67e440c2, 0x8a7100c9),
+              TOBN(0xbb8c3c1b, 0xeb4b9b42),
+              TOBN(0x6d71e8ea, 0xc51b3583),
+              TOBN(0x7591f5af, 0x9525e642),
+              TOBN(0xf73a2f7b, 0x13f509f3),
+              TOBN(0x618487aa, 0x5619ac9b),
+              TOBN(0x3a72e5f7, 0x9d61718a),
+              TOBN(0x00413bcc, 0x7592d28c),
+              TOBN(0x7d9b11d3, 0x963c35cf),
+              TOBN(0x77623bcf, 0xb90a46ed),
+              TOBN(0xdeef273b, 0xdcdd2a50),
+              TOBN(0x4a741f9b, 0x0601846e),
+              TOBN(0x33b89e51, 0x0ec6e929),
+              TOBN(0xcb02319f, 0x8b7f22cd),
+              TOBN(0xbbe1500d, 0x084bae24),
+              TOBN(0x2f0ae8d7, 0x343d2693),
+              TOBN(0xacffb5f2, 0x7cdef811),
+              TOBN(0xaa0c030a, 0x263fb94f),
+              TOBN(0x6eef0d61, 0xa0f442de),
+              TOBN(0xf92e1817, 0x27b139d3),
+              TOBN(0x1ae6deb7, 0x0ad8bc28),
+              TOBN(0xa89e38dc, 0xc0514130),
+              TOBN(0x81eeb865, 0xd2fdca23),
+              TOBN(0x5a15ee08, 0xcc8ef895),
+              TOBN(0x768fa10a, 0x01905614),
+              TOBN(0xeff5b8ef, 0x880ee19b),
+              TOBN(0xf0c0cabb, 0xcb1c8a0e),
+              TOBN(0x2e1ee9cd, 0xb8c838f9),
+              TOBN(0x0587d8b8, 0x8a4a14c0),
+              TOBN(0xf6f27896, 0x2ff698e5),
+              TOBN(0xed38ef1c, 0x89ee6256),
+              TOBN(0xf44ee1fe, 0x6b353b45),
+              TOBN(0x9115c0c7, 0x70e903b3),
+              TOBN(0xc78ec0a1, 0x818f31df),
+              TOBN(0x6c003324, 0xb7dccbc6),
+              TOBN(0xd96dd1f3, 0x163bbc25),
+              TOBN(0x33aa82dd, 0x5cedd805),
+              TOBN(0x123aae4f, 0x7f7eb2f1),
+              TOBN(0x1723fcf5, 0xa26262cd),
+              TOBN(0x1f7f4d5d, 0x0060ebd5),
+              TOBN(0xf19c5c01, 0xb2eaa3af),
+              TOBN(0x2ccb9b14, 0x9790accf),
+              TOBN(0x1f9c1cad, 0x52324aa6),
+              TOBN(0x63200526, 0x7247df54),
+              TOBN(0x5732fe42, 0xbac96f82),
+              TOBN(0x52fe771f, 0x01a1c384),
+              TOBN(0x546ca13d, 0xb1001684),
+              TOBN(0xb56b4eee, 0xa1709f75),
+              TOBN(0x266545a9, 0xd5db8672),
+              TOBN(0xed971c90, 0x1e8f3cfb),
+              TOBN(0x4e7d8691, 0xe3a07b29),
+              TOBN(0x7570d9ec, 0xe4b696b9),
+              TOBN(0xdc5fa067, 0x7bc7e9ae),
+              TOBN(0x68b44caf, 0xc82c4844),
+              TOBN(0x519d34b3, 0xbf44da80),
+              TOBN(0x283834f9, 0x5ab32e66),
+              TOBN(0x6e608797, 0x6278a000),
+              TOBN(0x1e62960e, 0x627312f6),
+              TOBN(0x9b87b27b, 0xe6901c55),
+              TOBN(0x80e78538, 0x24fdbc1f),
+              TOBN(0xbbbc0951, 0x2facc27d),
+              TOBN(0x06394239, 0xac143b5a),
+              TOBN(0x35bb4a40, 0x376c1944),
+              TOBN(0x7cb62694, 0x63da1511),
+              TOBN(0xafd29161, 0xb7148a3b),
+              TOBN(0xa6f9d9ed, 0x4e2ea2ee),
+              TOBN(0x15dc2ca2, 0x880dd212),
+              TOBN(0x903c3813, 0xa61139a9),
+              TOBN(0x2aa7b46d, 0x6c0f8785),
+              TOBN(0x36ce2871, 0x901c60ff),
+              TOBN(0xc683b028, 0xe10d9c12),
+              TOBN(0x7573baa2, 0x032f33d3),
+              TOBN(0x87a9b1f6, 0x67a31b58),
+              TOBN(0xfd3ed11a, 0xf4ffae12),
+              TOBN(0x83dcaa9a, 0x0cb2748e),
+              TOBN(0x8239f018, 0x5d6fdf16),
+              TOBN(0xba67b49c, 0x72753941),
+              TOBN(0x2beec455, 0xc321cb36),
+              TOBN(0x88015606, 0x3f8b84ce),
+              TOBN(0x76417083, 0x8d38c86f),
+              TOBN(0x054f1ca7, 0x598953dd),
+              TOBN(0xc939e110, 0x4e8e7429),
+              TOBN(0x9b1ac2b3, 0x5a914f2f),
+              TOBN(0x39e35ed3, 0xe74b8f9c),
+              TOBN(0xd0debdb2, 0x781b2fb0),
+              TOBN(0x1585638f, 0x2d997ba2),
+              TOBN(0x9c4b646e, 0x9e2fce99),
+              TOBN(0x68a21081, 0x1e80857f),
+              TOBN(0x06d54e44, 0x3643b52a),
+              TOBN(0xde8d6d63, 0x0d8eb843),
+              TOBN(0x70321563, 0x42146a0a),
+              TOBN(0x8ba826f2, 0x5eaa3622),
+              TOBN(0x227a58bd, 0x86138787),
+              TOBN(0x43b6c03c, 0x10281d37),
+              TOBN(0x6326afbb, 0xb54dde39),
+              TOBN(0x744e5e8a, 0xdb6f2d5f),
+              TOBN(0x48b2a99a, 0xcff158e1),
+              TOBN(0xa93c8fa0, 0xef87918f),
+              TOBN(0x2182f956, 0xde058c5c),
+              TOBN(0x216235d2, 0x936f9e7a),
+              TOBN(0xace0c0db, 0xd2e31e67),
+              TOBN(0xc96449bf, 0xf23ac3e7),
+              TOBN(0x7e9a2874, 0x170693bd),
+              TOBN(0xa28e14fd, 0xa45e6335),
+              TOBN(0x5757f6b3, 0x56427344),
+              TOBN(0x822e4556, 0xacf8edf9),
+              TOBN(0x2b7a6ee2, 0xe6a285cd),
+              TOBN(0x5866f211, 0xa9df3af0),
+              TOBN(0x40dde2dd, 0xf845b844),
+              TOBN(0x986c3726, 0x110e5e49),
+              TOBN(0x73680c2a, 0xf7172277),
+              TOBN(0x57b94f0f, 0x0cccb244),
+              TOBN(0xbdff7267, 0x2d438ca7),
+              TOBN(0xbad1ce11, 0xcf4663fd),
+              TOBN(0x9813ed9d, 0xd8f71cae),
+              TOBN(0xf43272a6, 0x961fdaa6),
+              TOBN(0xbeff0119, 0xbd6d1637),
+              TOBN(0xfebc4f91, 0x30361978),
+              TOBN(0x02b37a95, 0x2f41deff),
+              TOBN(0x0e44a59a, 0xe63b89b7),
+              TOBN(0x673257dc, 0x143ff951),
+              TOBN(0x19c02205, 0xd752baf4),
+              TOBN(0x46c23069, 0xc4b7d692),
+              TOBN(0x2e6392c3, 0xfd1502ac),
+              TOBN(0x6057b1a2, 0x1b220846),
+              TOBN(0xe51ff946, 0x0c1b5b63),
+          },
+          {
+              TOBN(0x6e85cb51, 0x566c5c43),
+              TOBN(0xcff9c919, 0x3597f046),
+              TOBN(0x9354e90c, 0x4994d94a),
+              TOBN(0xe0a39332, 0x2147927d),
+              TOBN(0x8427fac1, 0x0dc1eb2b),
+              TOBN(0x88cfd8c2, 0x2ff319fa),
+              TOBN(0xe2d4e684, 0x01965274),
+              TOBN(0xfa2e067d, 0x67aaa746),
+              TOBN(0xb6d92a7f, 0x3e5f9f11),
+              TOBN(0x9afe153a, 0xd6cb3b8e),
+              TOBN(0x4d1a6dd7, 0xddf800bd),
+              TOBN(0xf6c13cc0, 0xcaf17e19),
+              TOBN(0x15f6c58e, 0x325fc3ee),
+              TOBN(0x71095400, 0xa31dc3b2),
+              TOBN(0x168e7c07, 0xafa3d3e7),
+              TOBN(0x3f8417a1, 0x94c7ae2d),
+              TOBN(0xec234772, 0x813b230d),
+              TOBN(0x634d0f5f, 0x17344427),
+              TOBN(0x11548ab1, 0xd77fc56a),
+              TOBN(0x7fab1750, 0xce06af77),
+              TOBN(0xb62c10a7, 0x4f7c4f83),
+              TOBN(0xa7d2edc4, 0x220a67d9),
+              TOBN(0x1c404170, 0x921209a0),
+              TOBN(0x0b9815a0, 0xface59f0),
+              TOBN(0x2842589b, 0x319540c3),
+              TOBN(0x18490f59, 0xa283d6f8),
+              TOBN(0xa2731f84, 0xdaae9fcb),
+              TOBN(0x3db6d960, 0xc3683ba0),
+              TOBN(0xc85c63bb, 0x14611069),
+              TOBN(0xb19436af, 0x0788bf05),
+              TOBN(0x905459df, 0x347460d2),
+              TOBN(0x73f6e094, 0xe11a7db1),
+              TOBN(0xdc7f938e, 0xb6357f37),
+              TOBN(0xc5d00f79, 0x2bd8aa62),
+              TOBN(0xc878dcb9, 0x2ca979fc),
+              TOBN(0x37e83ed9, 0xeb023a99),
+              TOBN(0x6b23e273, 0x1560bf3d),
+              TOBN(0x1086e459, 0x1d0fae61),
+              TOBN(0x78248316, 0x9a9414bd),
+              TOBN(0x1b956bc0, 0xf0ea9ea1),
+              TOBN(0x7b85bb91, 0xc31b9c38),
+              TOBN(0x0c5aa90b, 0x48ef57b5),
+              TOBN(0xdedeb169, 0xaf3bab6f),
+              TOBN(0xe610ad73, 0x2d373685),
+              TOBN(0xf13870df, 0x02ba8e15),
+              TOBN(0x0337edb6, 0x8ca7f771),
+              TOBN(0xe4acf747, 0xb62c036c),
+              TOBN(0xd921d576, 0xb6b94e81),
+              TOBN(0xdbc86439, 0x2c422f7a),
+              TOBN(0xfb635362, 0xed348898),
+              TOBN(0x83084668, 0xc45bfcd1),
+              TOBN(0xc357c9e3, 0x2b315e11),
+              TOBN(0xb173b540, 0x5b2e5b8c),
+              TOBN(0x7e946931, 0xe102b9a4),
+              TOBN(0x17c890eb, 0x7b0fb199),
+              TOBN(0xec225a83, 0xd61b662b),
+              TOBN(0xf306a3c8, 0xee3c76cb),
+              TOBN(0x3cf11623, 0xd32a1f6e),
+              TOBN(0xe6d5ab64, 0x6863e956),
+              TOBN(0x3b8a4cbe, 0x5c005c26),
+              TOBN(0xdcd529a5, 0x9ce6bb27),
+              TOBN(0xc4afaa52, 0x04d4b16f),
+              TOBN(0xb0624a26, 0x7923798d),
+              TOBN(0x85e56df6, 0x6b307fab),
+              TOBN(0x0281893c, 0x2bf29698),
+              TOBN(0x91fc19a4, 0xd7ce7603),
+              TOBN(0x75a5dca3, 0xad9a558f),
+              TOBN(0x40ceb3fa, 0x4d50bf77),
+              TOBN(0x1baf6060, 0xbc9ba369),
+              TOBN(0x927e1037, 0x597888c2),
+              TOBN(0xd936bf19, 0x86a34c07),
+              TOBN(0xd4cf10c1, 0xc34ae980),
+              TOBN(0x3a3e5334, 0x859dd614),
+              TOBN(0x9c475b5b, 0x18d0c8ee),
+              TOBN(0x63080d1f, 0x07cd51d5),
+              TOBN(0xc9c0d0a6, 0xb88b4326),
+              TOBN(0x1ac98691, 0xc234296f),
+              TOBN(0x2a0a83a4, 0x94887fb6),
+              TOBN(0x56511427, 0x0cea9cf2),
+              TOBN(0x5230a6e8, 0xa24802f5),
+              TOBN(0xf7a2bf0f, 0x72e3d5c1),
+              TOBN(0x37717446, 0x4f21439e),
+              TOBN(0xfedcbf25, 0x9ce30334),
+              TOBN(0xe0030a78, 0x7ce202f9),
+              TOBN(0x6f2d9ebf, 0x1202e9ca),
+              TOBN(0xe79dde6c, 0x75e6e591),
+              TOBN(0xf52072af, 0xf1dac4f8),
+              TOBN(0x6c8d087e, 0xbb9b404d),
+              TOBN(0xad0fc73d, 0xbce913af),
+              TOBN(0x909e587b, 0x458a07cb),
+              TOBN(0x1300da84, 0xd4f00c8a),
+              TOBN(0x425cd048, 0xb54466ac),
+              TOBN(0xb59cb9be, 0x90e9d8bf),
+              TOBN(0x991616db, 0x3e431b0e),
+              TOBN(0xd3aa117a, 0x531aecff),
+              TOBN(0x91af92d3, 0x59f4dc3b),
+              TOBN(0x9b1ec292, 0xe93fda29),
+              TOBN(0x76bb6c17, 0xe97d91bc),
+              TOBN(0x7509d95f, 0xaface1e6),
+              TOBN(0x3653fe47, 0xbe855ae3),
+              TOBN(0x73180b28, 0x0f680e75),
+              TOBN(0x75eefd1b, 0xeeb6c26c),
+              TOBN(0xa4cdf29f, 0xb66d4236),
+              TOBN(0x2d70a997, 0x6b5821d8),
+              TOBN(0x7a3ee207, 0x20445c36),
+              TOBN(0x71d1ac82, 0x59877174),
+              TOBN(0x0fc539f7, 0x949f73e9),
+              TOBN(0xd05cf3d7, 0x982e3081),
+              TOBN(0x8758e20b, 0x7b1c7129),
+              TOBN(0xffadcc20, 0x569e61f2),
+              TOBN(0xb05d3a2f, 0x59544c2d),
+              TOBN(0xbe16f5c1, 0x9fff5e53),
+              TOBN(0x73cf65b8, 0xaad58135),
+              TOBN(0x622c2119, 0x037aa5be),
+              TOBN(0x79373b3f, 0x646fd6a0),
+              TOBN(0x0e029db5, 0x0d3978cf),
+              TOBN(0x8bdfc437, 0x94fba037),
+              TOBN(0xaefbd687, 0x620797a6),
+              TOBN(0x3fa5382b, 0xbd30d38e),
+              TOBN(0x7627cfbf, 0x585d7464),
+              TOBN(0xb2330fef, 0x4e4ca463),
+              TOBN(0xbcef7287, 0x3566cc63),
+              TOBN(0xd161d2ca, 0xcf780900),
+              TOBN(0x135dc539, 0x5b54827d),
+              TOBN(0x638f052e, 0x27bf1bc6),
+              TOBN(0x10a224f0, 0x07dfa06c),
+              TOBN(0xe973586d, 0x6d3321da),
+              TOBN(0x8b0c5738, 0x26152c8f),
+              TOBN(0x07ef4f2a, 0x34606074),
+              TOBN(0x80fe7fe8, 0xa0f7047a),
+              TOBN(0x3d1a8152, 0xe1a0e306),
+              TOBN(0x32cf43d8, 0x88da5222),
+              TOBN(0xbf89a95f, 0x5f02ffe6),
+              TOBN(0x3d9eb9a4, 0x806ad3ea),
+              TOBN(0x012c17bb, 0x79c8e55e),
+              TOBN(0xfdcd1a74, 0x99c81dac),
+              TOBN(0x7043178b, 0xb9556098),
+              TOBN(0x4090a1df, 0x801c3886),
+              TOBN(0x759800ff, 0x9b67b912),
+              TOBN(0x3e5c0304, 0x232620c8),
+              TOBN(0x4b9d3c4b, 0x70dceeca),
+              TOBN(0xbb2d3c15, 0x181f648e),
+              TOBN(0xf981d837, 0x6e33345c),
+              TOBN(0xb626289b, 0x0cf2297a),
+              TOBN(0x766ac659, 0x8baebdcf),
+              TOBN(0x1a28ae09, 0x75df01e5),
+              TOBN(0xb71283da, 0x375876d8),
+              TOBN(0x4865a96d, 0x607b9800),
+              TOBN(0x25dd1bcd, 0x237936b2),
+              TOBN(0x332f4f4b, 0x60417494),
+              TOBN(0xd0923d68, 0x370a2147),
+              TOBN(0x497f5dfb, 0xdc842203),
+              TOBN(0x9dc74cbd, 0x32be5e0f),
+              TOBN(0x7475bcb7, 0x17a01375),
+              TOBN(0x438477c9, 0x50d872b1),
+              TOBN(0xcec67879, 0xffe1d63d),
+              TOBN(0x9b006014, 0xd8578c70),
+              TOBN(0xc9ad99a8, 0x78bb6b8b),
+              TOBN(0x6799008e, 0x11fb3806),
+              TOBN(0xcfe81435, 0xcd44cab3),
+              TOBN(0xa2ee1582, 0x2f4fb344),
+              TOBN(0xb8823450, 0x483fa6eb),
+              TOBN(0x622d323d, 0x652c7749),
+              TOBN(0xd8474a98, 0xbeb0a15b),
+              TOBN(0xe43c154d, 0x5d1c00d0),
+              TOBN(0x7fd581d9, 0x0e3e7aac),
+              TOBN(0x2b44c619, 0x2525ddf8),
+              TOBN(0x67a033eb, 0xb8ae9739),
+              TOBN(0x113ffec1, 0x9ef2d2e4),
+              TOBN(0x1bf6767e, 0xd5a0ea7f),
+              TOBN(0x57fff75e, 0x03714c0a),
+              TOBN(0xa23c422e, 0x0a23e9ee),
+              TOBN(0xdd5f6b2d, 0x540f83af),
+              TOBN(0xc2c2c27e, 0x55ea46a7),
+              TOBN(0xeb6b4246, 0x672a1208),
+              TOBN(0xd13599f7, 0xae634f7a),
+              TOBN(0xcf914b5c, 0xd7b32c6e),
+              TOBN(0x61a5a640, 0xeaf61814),
+              TOBN(0x8dc3df8b, 0x208a1bbb),
+              TOBN(0xef627fd6, 0xb6d79aa5),
+              TOBN(0x44232ffc, 0xc4c86bc8),
+              TOBN(0xe6f9231b, 0x061539fe),
+              TOBN(0x1d04f25a, 0x958b9533),
+              TOBN(0x180cf934, 0x49e8c885),
+              TOBN(0x89689595, 0x9884aaf7),
+              TOBN(0xb1959be3, 0x07b348a6),
+              TOBN(0x96250e57, 0x3c147c87),
+              TOBN(0xae0efb3a, 0xdd0c61f8),
+              TOBN(0xed00745e, 0xca8c325e),
+              TOBN(0x3c911696, 0xecff3f70),
+              TOBN(0x73acbc65, 0x319ad41d),
+              TOBN(0x7b01a020, 0xf0b1c7ef),
+              TOBN(0xea32b293, 0x63a1483f),
+              TOBN(0x89eabe71, 0x7a248f96),
+              TOBN(0x9c6231d3, 0x343157e5),
+              TOBN(0x93a375e5, 0xdf3c546d),
+              TOBN(0xe76e9343, 0x6a2afe69),
+              TOBN(0xc4f89100, 0xe166c88e),
+              TOBN(0x248efd0d, 0x4f872093),
+              TOBN(0xae0eb3ea, 0x8fe0ea61),
+              TOBN(0xaf89790d, 0x9d79046e),
+              TOBN(0x4d650f2d, 0x6cee0976),
+              TOBN(0xa3935d9a, 0x43071eca),
+              TOBN(0x66fcd2c9, 0x283b0bfe),
+              TOBN(0x0e665eb5, 0x696605f1),
+              TOBN(0xe77e5d07, 0xa54cd38d),
+              TOBN(0x90ee050a, 0x43d950cf),
+              TOBN(0x86ddebda, 0xd32e69b5),
+              TOBN(0x6ad94a3d, 0xfddf7415),
+              TOBN(0xf7fa1309, 0x3f6e8d5a),
+              TOBN(0xc4831d1d, 0xe9957f75),
+              TOBN(0x7de28501, 0xd5817447),
+              TOBN(0x6f1d7078, 0x9e2aeb6b),
+              TOBN(0xba2b9ff4, 0xf67a53c2),
+              TOBN(0x36963767, 0xdf9defc3),
+              TOBN(0x479deed3, 0x0d38022c),
+              TOBN(0xd2edb89b, 0x3a8631e8),
+              TOBN(0x8de855de, 0x7a213746),
+              TOBN(0xb2056cb7, 0xb00c5f11),
+              TOBN(0xdeaefbd0, 0x2c9b85e4),
+              TOBN(0x03f39a8d, 0xd150892d),
+              TOBN(0x37b84686, 0x218b7985),
+              TOBN(0x36296dd8, 0xb7375f1a),
+              TOBN(0x472cd4b1, 0xb78e898e),
+              TOBN(0x15dff651, 0xe9f05de9),
+              TOBN(0xd4045069, 0x2ce98ba9),
+              TOBN(0x8466a7ae, 0x9b38024c),
+              TOBN(0xb910e700, 0xe5a6b5ef),
+              TOBN(0xae1c56ea, 0xb3aa8f0d),
+              TOBN(0xbab2a507, 0x7eee74a6),
+              TOBN(0x0dca11e2, 0x4b4c4620),
+              TOBN(0xfd896e2e, 0x4c47d1f4),
+              TOBN(0xeb45ae53, 0x308fbd93),
+              TOBN(0x46cd5a2e, 0x02c36fda),
+              TOBN(0x6a3d4e90, 0xbaa48385),
+              TOBN(0xdd55e62e, 0x9dbe9960),
+              TOBN(0xa1406aa0, 0x2a81ede7),
+              TOBN(0x6860dd14, 0xf9274ea7),
+              TOBN(0xcfdcb0c2, 0x80414f86),
+              TOBN(0xff410b10, 0x22f94327),
+              TOBN(0x5a33cc38, 0x49ad467b),
+              TOBN(0xefb48b6c, 0x0a7335f1),
+              TOBN(0x14fb54a4, 0xb153a360),
+              TOBN(0x604aa9d2, 0xb52469cc),
+              TOBN(0x5e9dc486, 0x754e48e9),
+              TOBN(0x693cb455, 0x37471e8e),
+              TOBN(0xfb2fd7cd, 0x8d3b37b6),
+              TOBN(0x63345e16, 0xcf09ff07),
+              TOBN(0x9910ba6b, 0x23a5d896),
+              TOBN(0x1fe19e35, 0x7fe4364e),
+              TOBN(0x6e1da8c3, 0x9a33c677),
+              TOBN(0x15b4488b, 0x29fd9fd0),
+              TOBN(0x1f439254, 0x1a1f22bf),
+              TOBN(0x920a8a70, 0xab8163e8),
+              TOBN(0x3fd1b249, 0x07e5658e),
+              TOBN(0xf2c4f79c, 0xb6ec839b),
+              TOBN(0x1abbc3d0, 0x4aa38d1b),
+              TOBN(0x3b0db35c, 0xb5d9510e),
+              TOBN(0x1754ac78, 0x3e60dec0),
+              TOBN(0x53272fd7, 0xea099b33),
+              TOBN(0x5fb0494f, 0x07a8e107),
+              TOBN(0x4a89e137, 0x6a8191fa),
+              TOBN(0xa113b7f6, 0x3c4ad544),
+              TOBN(0x88a2e909, 0x6cb9897b),
+              TOBN(0x17d55de3, 0xb44a3f84),
+              TOBN(0xacb2f344, 0x17c6c690),
+              TOBN(0x32088168, 0x10232390),
+              TOBN(0xf2e8a61f, 0x6c733bf7),
+              TOBN(0xa774aab6, 0x9c2d7652),
+              TOBN(0xfb5307e3, 0xed95c5bc),
+              TOBN(0xa05c73c2, 0x4981f110),
+              TOBN(0x1baae31c, 0xa39458c9),
+              TOBN(0x1def185b, 0xcbea62e7),
+              TOBN(0xe8ac9eae, 0xeaf63059),
+              TOBN(0x098a8cfd, 0x9921851c),
+              TOBN(0xd959c3f1, 0x3abe2f5b),
+              TOBN(0xa4f19525, 0x20e40ae5),
+              TOBN(0x320789e3, 0x07a24aa1),
+              TOBN(0x259e6927, 0x7392b2bc),
+              TOBN(0x58f6c667, 0x1918668b),
+              TOBN(0xce1db2bb, 0xc55d2d8b),
+              TOBN(0x41d58bb7, 0xf4f6ca56),
+              TOBN(0x7650b680, 0x8f877614),
+              TOBN(0x905e16ba, 0xf4c349ed),
+              TOBN(0xed415140, 0xf661acac),
+              TOBN(0x3b8784f0, 0xcb2270af),
+              TOBN(0x3bc280ac, 0x8a402cba),
+              TOBN(0xd53f7146, 0x0937921a),
+              TOBN(0xc03c8ee5, 0xe5681e83),
+              TOBN(0x62126105, 0xf6ac9e4a),
+              TOBN(0x9503a53f, 0x936b1a38),
+              TOBN(0x3d45e2d4, 0x782fecbd),
+              TOBN(0x69a5c439, 0x76e8ae98),
+              TOBN(0xb53b2eeb, 0xbfb4b00e),
+              TOBN(0xf1674712, 0x72386c89),
+              TOBN(0x30ca34a2, 0x4268bce4),
+              TOBN(0x7f1ed86c, 0x78341730),
+              TOBN(0x8ef5beb8, 0xb525e248),
+              TOBN(0xbbc489fd, 0xb74fbf38),
+              TOBN(0x38a92a0e, 0x91a0b382),
+              TOBN(0x7a77ba3f, 0x22433ccf),
+              TOBN(0xde8362d6, 0xa29f05a9),
+              TOBN(0x7f6a30ea, 0x61189afc),
+              TOBN(0x693b5505, 0x59ef114f),
+              TOBN(0x50266bc0, 0xcd1797a1),
+              TOBN(0xea17b47e, 0xf4b7af2d),
+              TOBN(0xd6c4025c, 0x3df9483e),
+              TOBN(0x8cbb9d9f, 0xa37b18c9),
+              TOBN(0x91cbfd9c, 0x4d8424cf),
+              TOBN(0xdb7048f1, 0xab1c3506),
+              TOBN(0x9eaf641f, 0x028206a3),
+              TOBN(0xf986f3f9, 0x25bdf6ce),
+              TOBN(0x262143b5, 0x224c08dc),
+              TOBN(0x2bbb09b4, 0x81b50c91),
+              TOBN(0xc16ed709, 0xaca8c84f),
+              TOBN(0xa6210d9d, 0xb2850ca8),
+              TOBN(0x6d8df67a, 0x09cb54d6),
+              TOBN(0x91eef6e0, 0x500919a4),
+              TOBN(0x90f61381, 0x0f132857),
+              TOBN(0x9acede47, 0xf8d5028b),
+              TOBN(0x844d1b71, 0x90b771c3),
+              TOBN(0x563b71e4, 0xba6426be),
+              TOBN(0x2efa2e83, 0xbdb802ff),
+              TOBN(0x3410cbab, 0xab5b4a41),
+              TOBN(0x555b2d26, 0x30da84dd),
+              TOBN(0xd0711ae9, 0xee1cc29a),
+              TOBN(0xcf3e8c60, 0x2f547792),
+              TOBN(0x03d7d5de, 0xdc678b35),
+              TOBN(0x071a2fa8, 0xced806b8),
+              TOBN(0x222e6134, 0x697f1478),
+              TOBN(0xdc16fd5d, 0xabfcdbbf),
+              TOBN(0x44912ebf, 0x121b53b8),
+              TOBN(0xac943674, 0x2496c27c),
+              TOBN(0x8ea3176c, 0x1ffc26b0),
+              TOBN(0xb6e224ac, 0x13debf2c),
+              TOBN(0x524cc235, 0xf372a832),
+              TOBN(0xd706e1d8, 0x9f6f1b18),
+              TOBN(0x2552f005, 0x44cce35b),
+              TOBN(0x8c8326c2, 0xa88e31fc),
+              TOBN(0xb5468b2c, 0xf9552047),
+              TOBN(0xce683e88, 0x3ff90f2b),
+              TOBN(0x77947bdf, 0x2f0a5423),
+              TOBN(0xd0a1b28b, 0xed56e328),
+              TOBN(0xaee35253, 0xc20134ac),
+              TOBN(0x7e98367d, 0x3567962f),
+              TOBN(0x379ed61f, 0x8188bffb),
+              TOBN(0x73bba348, 0xfaf130a1),
+              TOBN(0x6c1f75e1, 0x904ed734),
+              TOBN(0x18956642, 0x3b4a79fc),
+              TOBN(0xf20bc83d, 0x54ef4493),
+              TOBN(0x836d425d, 0x9111eca1),
+              TOBN(0xe5b5c318, 0x009a8dcf),
+              TOBN(0x3360b25d, 0x13221bc5),
+              TOBN(0x707baad2, 0x6b3eeaf7),
+              TOBN(0xd7279ed8, 0x743a95a1),
+              TOBN(0x7450a875, 0x969e809f),
+              TOBN(0x32b6bd53, 0xe5d0338f),
+              TOBN(0x1e77f7af, 0x2b883bbc),
+              TOBN(0x90da12cc, 0x1063ecd0),
+              TOBN(0xe2697b58, 0xc315be47),
+              TOBN(0x2771a5bd, 0xda85d534),
+              TOBN(0x53e78c1f, 0xff980eea),
+              TOBN(0xadf1cf84, 0x900385e7),
+              TOBN(0x7d3b14f6, 0xc9387b62),
+              TOBN(0x170e74b0, 0xcb8f2bd2),
+              TOBN(0x2d50b486, 0x827fa993),
+              TOBN(0xcdbe8c9a, 0xf6f32bab),
+              TOBN(0x55e906b0, 0xc3b93ab8),
+              TOBN(0x747f22fc, 0x8fe280d1),
+              TOBN(0xcd8e0de5, 0xb2e114ab),
+              TOBN(0x5ab7dbeb, 0xe10b68b0),
+              TOBN(0x9dc63a9c, 0xa480d4b2),
+              TOBN(0x78d4bc3b, 0x4be1495f),
+              TOBN(0x25eb3db8, 0x9359122d),
+              TOBN(0x3f8ac05b, 0x0809cbdc),
+              TOBN(0xbf4187bb, 0xd37c702f),
+              TOBN(0x84cea069, 0x1416a6a5),
+              TOBN(0x8f860c79, 0x43ef881c),
+              TOBN(0x41311f8a, 0x38038a5d),
+              TOBN(0xe78c2ec0, 0xfc612067),
+              TOBN(0x494d2e81, 0x5ad73581),
+              TOBN(0xb4cc9e00, 0x59604097),
+              TOBN(0xff558aec, 0xf3612cba),
+              TOBN(0x35beef7a, 0x9e36c39e),
+              TOBN(0x1845c7cf, 0xdbcf41b9),
+              TOBN(0x5703662a, 0xaea997c0),
+              TOBN(0x8b925afe, 0xe402f6d8),
+              TOBN(0xd0a1b1ae, 0x4dd72162),
+              TOBN(0x9f47b375, 0x03c41c4b),
+              TOBN(0xa023829b, 0x0391d042),
+              TOBN(0x5f5045c3, 0x503b8b0a),
+              TOBN(0x123c2688, 0x98c010e5),
+              TOBN(0x324ec0cc, 0x36ba06ee),
+              TOBN(0xface3115, 0x3dd2cc0c),
+              TOBN(0xb364f3be, 0xf333e91f),
+              TOBN(0xef8aff73, 0x28e832b0),
+              TOBN(0x1e9bad04, 0x2d05841b),
+              TOBN(0x42f0e3df, 0x356a21e2),
+              TOBN(0xa3270bcb, 0x4add627e),
+              TOBN(0xb09a8158, 0xd322e711),
+              TOBN(0x86e326a1, 0x0fee104a),
+              TOBN(0xad7788f8, 0x3703f65d),
+              TOBN(0x7e765430, 0x47bc4833),
+              TOBN(0x6cee582b, 0x2b9b893a),
+              TOBN(0x9cd2a167, 0xe8f55a7b),
+              TOBN(0xefbee3c6, 0xd9e4190d),
+              TOBN(0x33ee7185, 0xd40c2e9d),
+              TOBN(0x844cc9c5, 0xa380b548),
+              TOBN(0x323f8ecd, 0x66926e04),
+              TOBN(0x0001e38f, 0x8110c1ba),
+              TOBN(0x8dbcac12, 0xfc6a7f07),
+              TOBN(0xd65e1d58, 0x0cec0827),
+              TOBN(0xd2cd4141, 0xbe76ca2d),
+              TOBN(0x7895cf5c, 0xe892f33a),
+              TOBN(0x956d230d, 0x367139d2),
+              TOBN(0xa91abd3e, 0xd012c4c1),
+              TOBN(0x34fa4883, 0x87eb36bf),
+              TOBN(0xc5f07102, 0x914b8fb4),
+              TOBN(0x90f0e579, 0xadb9c95f),
+              TOBN(0xfe6ea8cb, 0x28888195),
+              TOBN(0x7b9b5065, 0xedfa9284),
+              TOBN(0x6c510bd2, 0x2b8c8d65),
+              TOBN(0xd7b8ebef, 0xcbe8aafd),
+              TOBN(0xedb3af98, 0x96b1da07),
+              TOBN(0x28ff779d, 0x6295d426),
+              TOBN(0x0c4f6ac7, 0x3fa3ad7b),
+              TOBN(0xec44d054, 0x8b8e2604),
+              TOBN(0x9b32a66d, 0x8b0050e1),
+              TOBN(0x1f943366, 0xf0476ce2),
+              TOBN(0x7554d953, 0xa602c7b4),
+              TOBN(0xbe35aca6, 0x524f2809),
+              TOBN(0xb6881229, 0xfd4edbea),
+              TOBN(0xe8cd0c8f, 0x508efb63),
+              TOBN(0x9eb5b5c8, 0x6abcefc7),
+              TOBN(0xf5621f5f, 0xb441ab4f),
+              TOBN(0x79e6c046, 0xb76a2b22),
+              TOBN(0x74a4792c, 0xe37a1f69),
+              TOBN(0xcbd252cb, 0x03542b60),
+              TOBN(0x785f65d5, 0xb3c20bd3),
+              TOBN(0x8dea6143, 0x4fabc60c),
+              TOBN(0x45e21446, 0xde673629),
+              TOBN(0x57f7aa1e, 0x703c2d21),
+              TOBN(0xa0e99b7f, 0x98c868c7),
+              TOBN(0x4e42f66d, 0x8b641676),
+              TOBN(0x602884dc, 0x91077896),
+              TOBN(0xa0d690cf, 0xc2c9885b),
+              TOBN(0xfeb4da33, 0x3b9a5187),
+              TOBN(0x5f789598, 0x153c87ee),
+              TOBN(0x2192dd47, 0x52b16dba),
+              TOBN(0xdeefc0e6, 0x3524c1b1),
+              TOBN(0x465ea76e, 0xe4383693),
+              TOBN(0x79401711, 0x361b8d98),
+              TOBN(0xa5f9ace9, 0xf21a15cb),
+              TOBN(0x73d26163, 0xefee9aeb),
+              TOBN(0xcca844b3, 0xe677016c),
+              TOBN(0x6c122b07, 0x57eaee06),
+              TOBN(0xb782dce7, 0x15f09690),
+              TOBN(0x508b9b12, 0x2dfc0fc9),
+              TOBN(0x9015ab4b, 0x65d89fc6),
+              TOBN(0x5e79dab7, 0xd6d5bb0f),
+              TOBN(0x64f021f0, 0x6c775aa2),
+              TOBN(0xdf09d8cc, 0x37c7eca1),
+              TOBN(0x9a761367, 0xef2fa506),
+              TOBN(0xed4ca476, 0x5b81eec6),
+              TOBN(0x262ede36, 0x10bbb8b5),
+              TOBN(0x0737ce83, 0x0641ada3),
+              TOBN(0x4c94288a, 0xe9831ccc),
+              TOBN(0x487fc1ce, 0x8065e635),
+              TOBN(0xb13d7ab3, 0xb8bb3659),
+              TOBN(0xdea5df3e, 0x855e4120),
+              TOBN(0xb9a18573, 0x85eb0244),
+              TOBN(0x1a1b8ea3, 0xa7cfe0a3),
+              TOBN(0x3b837119, 0x67b0867c),
+              TOBN(0x8d5e0d08, 0x9d364520),
+              TOBN(0x52dccc1e, 0xd930f0e3),
+              TOBN(0xefbbcec7, 0xbf20bbaf),
+              TOBN(0x99cffcab, 0x0263ad10),
+              TOBN(0xd8199e6d, 0xfcd18f8a),
+              TOBN(0x64e2773f, 0xe9f10617),
+              TOBN(0x0079e8e1, 0x08704848),
+              TOBN(0x1169989f, 0x8a342283),
+              TOBN(0x8097799c, 0xa83012e6),
+              TOBN(0xece966cb, 0x8a6a9001),
+              TOBN(0x93b3afef, 0x072ac7fc),
+              TOBN(0xe6893a2a, 0x2db3d5ba),
+              TOBN(0x263dc462, 0x89bf4fdc),
+              TOBN(0x8852dfc9, 0xe0396673),
+              TOBN(0x7ac70895, 0x3af362b6),
+              TOBN(0xbb9cce4d, 0x5c2f342b),
+              TOBN(0xbf80907a, 0xb52d7aae),
+              TOBN(0x97f3d3cd, 0x2161bcd0),
+              TOBN(0xb25b0834, 0x0962744d),
+              TOBN(0xc5b18ea5, 0x6c3a1dda),
+              TOBN(0xfe4ec7eb, 0x06c92317),
+              TOBN(0xb787b890, 0xad1c4afe),
+              TOBN(0xdccd9a92, 0x0ede801a),
+              TOBN(0x9ac6ddda, 0xdb58da1f),
+              TOBN(0x22bbc12f, 0xb8cae6ee),
+              TOBN(0xc6f8bced, 0x815c4a43),
+              TOBN(0x8105a92c, 0xf96480c7),
+              TOBN(0x0dc3dbf3, 0x7a859d51),
+              TOBN(0xe3ec7ce6, 0x3041196b),
+              TOBN(0xd9f64b25, 0x0d1067c9),
+              TOBN(0xf2321321, 0x3d1f8dd8),
+              TOBN(0x8b5c619c, 0x76497ee8),
+              TOBN(0x5d2b0ac6, 0xc717370e),
+              TOBN(0x98204cb6, 0x4fcf68e1),
+              TOBN(0x0bdec211, 0x62bc6792),
+              TOBN(0x6973ccef, 0xa63b1011),
+              TOBN(0xf9e3fa97, 0xe0de1ac5),
+              TOBN(0x5efb693e, 0x3d0e0c8b),
+              TOBN(0x037248e9, 0xd2d4fcb4),
+          },
+          { TOBN(0x80802dc9, 0x1ec34f9e), TOBN(0xd8772d35, 0x33810603),
+              TOBN(0x3f06d66c, 0x530cb4f3), TOBN(0x7be5ed0d, 0xc475c129),
+              TOBN(0xcb9e3c19, 0x31e82b10), TOBN(0xc63d2857, 0xc9ff6b4c),
+              TOBN(0xb92118c6, 0x92a1b45e), TOBN(0x0aec4414, 0x7285bbca),
+              TOBN(0xfc189ae7, 0x1e29a3ef), TOBN(0xcbe906f0, 0x4c93302e),
+              TOBN(0xd0107914, 0xceaae10e), TOBN(0xb7a23f34, 0xb68e19f8),
+              TOBN(0xe9d875c2, 0xefd2119d), TOBN(0x03198c6e, 0xfcadc9c8),
+              TOBN(0x65591bf6, 0x4da17113), TOBN(0x3cf0bbf8, 0x3d443038),
+              TOBN(0xae485bb7, 0x2b724759), TOBN(0x945353e1, 0xb2d4c63a),
+              TOBN(0x82159d07, 0xde7d6f2c), TOBN(0x389caef3, 0x4ec5b109),
+              TOBN(0x4a8ebb53, 0xdb65ef14), TOBN(0x2dc2cb7e, 0xdd99de43),
+              TOBN(0x816fa3ed, 0x83f2405f), TOBN(0x73429bb9, 0xc14208a3),
+              TOBN(0xb618d590, 0xb01e6e27), TOBN(0x047e2ccd, 0xe180b2dc),
+              TOBN(0xd1b299b5, 0x04aea4a9), TOBN(0x412c9e1e, 0x9fa403a4),
+              TOBN(0x88d28a36, 0x79407552), TOBN(0x49c50136, 0xf332b8e3),
+              TOBN(0x3a1b6fcc, 0xe668de19), TOBN(0x178851bc, 0x75122b97),
+              TOBN(0xb1e13752, 0xfb85fa4c), TOBN(0xd61257ce, 0x383c8ce9),
+              TOBN(0xd43da670, 0xd2f74dae), TOBN(0xa35aa23f, 0xbf846bbb),
+              TOBN(0x5e74235d, 0x4421fc83), TOBN(0xf6df8ee0, 0xc363473b),
+              TOBN(0x34d7f52a, 0x3c4aa158), TOBN(0x50d05aab, 0x9bc6d22e),
+              TOBN(0x8c56e735, 0xa64785f4), TOBN(0xbc56637b, 0x5f29cd07),
+              TOBN(0x53b2bb80, 0x3ee35067), TOBN(0x50235a0f, 0xdc919270),
+              TOBN(0x191ab6d8, 0xf2c4aa65), TOBN(0xc3475831, 0x8396023b),
+              TOBN(0x80400ba5, 0xf0f805ba), TOBN(0x8881065b, 0x5ec0f80f),
+              TOBN(0xc370e522, 0xcc1b5e83), TOBN(0xde2d4ad1, 0x860b8bfb),
+              TOBN(0xad364df0, 0x67b256df), TOBN(0x8f12502e, 0xe0138997),
+              TOBN(0x503fa0dc, 0x7783920a), TOBN(0xe80014ad, 0xc0bc866a),
+              TOBN(0x3f89b744, 0xd3064ba6), TOBN(0x03511dcd, 0xcba5dba5),
+              TOBN(0x197dd46d, 0x95a7b1a2), TOBN(0x9c4e7ad6, 0x3c6341fb),
+              TOBN(0x426eca29, 0x484c2ece), TOBN(0x9211e489, 0xde7f4f8a),
+              TOBN(0x14997f6e, 0xc78ef1f4), TOBN(0x2b2c0910, 0x06574586),
+              TOBN(0x17286a6e, 0x1c3eede8), TOBN(0x25f92e47, 0x0f60e018),
+              TOBN(0x805c5646, 0x31890a36), TOBN(0x703ef600, 0x57feea5b),
+              TOBN(0x389f747c, 0xaf3c3030), TOBN(0xe0e5daeb, 0x54dd3739),
+              TOBN(0xfe24a4c3, 0xc9c9f155), TOBN(0x7e4bf176, 0xb5393962),
+              TOBN(0x37183de2, 0xaf20bf29), TOBN(0x4a1bd7b5, 0xf95a8c3b),
+              TOBN(0xa83b9699, 0x46191d3d), TOBN(0x281fc8dd, 0x7b87f257),
+              TOBN(0xb18e2c13, 0x54107588), TOBN(0x6372def7, 0x9b2bafe8),
+              TOBN(0xdaf4bb48, 0x0d8972ca), TOBN(0x3f2dd4b7, 0x56167a3f),
+              TOBN(0x1eace32d, 0x84310cf4), TOBN(0xe3bcefaf, 0xe42700aa),
+              TOBN(0x5fe5691e, 0xd785e73d), TOBN(0xa5db5ab6, 0x2ea60467),
+              TOBN(0x02e23d41, 0xdfc6514a), TOBN(0x35e8048e, 0xe03c3665),
+              TOBN(0x3f8b118f, 0x1adaa0f8), TOBN(0x28ec3b45, 0x84ce1a5a),
+              TOBN(0xe8cacc6e, 0x2c6646b8), TOBN(0x1343d185, 0xdbd0e40f),
+              TOBN(0xe5d7f844, 0xcaaa358c), TOBN(0x1a1db7e4, 0x9924182a),
+              TOBN(0xd64cd42d, 0x9c875d9a), TOBN(0xb37b515f, 0x042eeec8),
+              TOBN(0x4d4dd409, 0x7b165fbe), TOBN(0xfc322ed9, 0xe206eff3),
+              TOBN(0x7dee4102, 0x59b7e17e), TOBN(0x55a481c0, 0x8236ca00),
+              TOBN(0x8c885312, 0xc23fc975), TOBN(0x15715806, 0x05d6297b),
+              TOBN(0xa078868e, 0xf78edd39), TOBN(0x956b31e0, 0x03c45e52),
+              TOBN(0x470275d5, 0xff7b33a6), TOBN(0xc8d5dc3a, 0x0c7e673f),
+              TOBN(0x419227b4, 0x7e2f2598), TOBN(0x8b37b634, 0x4c14a975),
+              TOBN(0xd0667ed6, 0x8b11888c), TOBN(0x5e0e8c3e, 0x803e25dc),
+              TOBN(0x34e5d0dc, 0xb987a24a), TOBN(0x9f40ac3b, 0xae920323),
+              TOBN(0x5463de95, 0x34e0f63a), TOBN(0xa128bf92, 0x6b6328f9),
+              TOBN(0x491ccd7c, 0xda64f1b7), TOBN(0x7ef1ec27, 0xc47bde35),
+              TOBN(0xa857240f, 0xa36a2737), TOBN(0x35dc1366, 0x63621bc1),
+              TOBN(0x7a3a6453, 0xd4fb6897), TOBN(0x80f1a439, 0xc929319d),
+              TOBN(0xfc18274b, 0xf8cb0ba0), TOBN(0xb0b53766, 0x8078c5eb),
+              TOBN(0xfb0d4924, 0x1e01d0ef), TOBN(0x50d7c67d, 0x372ab09c),
+              TOBN(0xb4e370af, 0x3aeac968), TOBN(0xe4f7fee9, 0xc4b63266),
+              TOBN(0xb4acd4c2, 0xe3ac5664), TOBN(0xf8910bd2, 0xceb38cbf),
+              TOBN(0x1c3ae50c, 0xc9c0726e), TOBN(0x15309569, 0xd97b40bf),
+              TOBN(0x70884b7f, 0xfd5a5a1b), TOBN(0x3890896a, 0xef8314cd),
+              TOBN(0x58e1515c, 0xa5618c93), TOBN(0xe665432b, 0x77d942d1),
+              TOBN(0xb32181bf, 0xb6f767a8), TOBN(0x753794e8, 0x3a604110),
+              TOBN(0x09afeb7c, 0xe8c0dbcc), TOBN(0x31e02613, 0x598673a3),
+              TOBN(0x5d98e557, 0x7d46db00), TOBN(0xfc21fb8c, 0x9d985b28),
+              TOBN(0xc9040116, 0xb0843e0b), TOBN(0x53b1b3a8, 0x69b04531),
+              TOBN(0xdd1649f0, 0x85d7d830), TOBN(0xbb3bcc87, 0xcb7427e8),
+              TOBN(0x77261100, 0xc93dce83), TOBN(0x7e79da61, 0xa1922a2a),
+              TOBN(0x587a2b02, 0xf3149ce8), TOBN(0x147e1384, 0xde92ec83),
+              TOBN(0x484c83d3, 0xaf077f30), TOBN(0xea78f844, 0x0658b53a),
+              TOBN(0x912076c2, 0x027aec53), TOBN(0xf34714e3, 0x93c8177d),
+              TOBN(0x37ef5d15, 0xc2376c84), TOBN(0x8315b659, 0x3d1aa783),
+              TOBN(0x3a75c484, 0xef852a90), TOBN(0x0ba0c58a, 0x16086bd4),
+              TOBN(0x29688d7a, 0x529a6d48), TOBN(0x9c7f250d, 0xc2f19203),
+              TOBN(0x123042fb, 0x682e2df9), TOBN(0x2b7587e7, 0xad8121bc),
+              TOBN(0x30fc0233, 0xe0182a65), TOBN(0xb82ecf87, 0xe3e1128a),
+              TOBN(0x71682861, 0x93fb098f), TOBN(0x043e21ae, 0x85e9e6a7),
+              TOBN(0xab5b49d6, 0x66c834ea), TOBN(0x3be43e18, 0x47414287),
+              TOBN(0xf40fb859, 0x219a2a47), TOBN(0x0e6559e9, 0xcc58df3c),
+              TOBN(0xfe1dfe8e, 0x0c6615b4), TOBN(0x14abc8fd, 0x56459d70),
+              TOBN(0x7be0fa8e, 0x05de0386), TOBN(0x8e63ef68, 0xe9035c7c),
+              TOBN(0x116401b4, 0x53b31e91), TOBN(0x0cba7ad4, 0x4436b4d8),
+              TOBN(0x9151f9a0, 0x107afd66), TOBN(0xafaca8d0, 0x1f0ee4c4),
+              TOBN(0x75fe5c1d, 0x9ee9761c), TOBN(0x3497a16b, 0xf0c0588f),
+              TOBN(0x3ee2bebd, 0x0304804c), TOBN(0xa8fb9a60, 0xc2c990b9),
+              TOBN(0xd14d32fe, 0x39251114), TOBN(0x36bf25bc, 0xcac73366),
+              TOBN(0xc9562c66, 0xdba7495c), TOBN(0x324d301b, 0x46ad348b),
+              TOBN(0x9f46620c, 0xd670407e), TOBN(0x0ea8d4f1, 0xe3733a01),
+              TOBN(0xd396d532, 0xb0c324e0), TOBN(0x5b211a0e, 0x03c317cd),
+              TOBN(0x090d7d20, 0x5ffe7b37), TOBN(0x3b7f3efb, 0x1747d2da),
+              TOBN(0xa2cb525f, 0xb54fc519), TOBN(0x6e220932, 0xf66a971e),
+              TOBN(0xddc160df, 0xb486d440), TOBN(0x7fcfec46, 0x3fe13465),
+              TOBN(0x83da7e4e, 0x76e4c151), TOBN(0xd6fa48a1, 0xd8d302b5),
+              TOBN(0xc6304f26, 0x5872cd88), TOBN(0x806c1d3c, 0x278b90a1),
+              TOBN(0x3553e725, 0xcaf0bc1c), TOBN(0xff59e603, 0xbb9d8d5c),
+              TOBN(0xa4550f32, 0x7a0b85dd), TOBN(0xdec5720a, 0x93ecc217),
+              TOBN(0x0b88b741, 0x69d62213), TOBN(0x7212f245, 0x5b365955),
+              TOBN(0x20764111, 0xb5cae787), TOBN(0x13cb7f58, 0x1dfd3124),
+              TOBN(0x2dca77da, 0x1175aefb), TOBN(0xeb75466b, 0xffaae775),
+              TOBN(0x74d76f3b, 0xdb6cff32), TOBN(0x7440f37a, 0x61fcda9a),
+              TOBN(0x1bb3ac92, 0xb525028b), TOBN(0x20fbf8f7, 0xa1975f29),
+              TOBN(0x982692e1, 0xdf83097f), TOBN(0x28738f6c, 0x554b0800),
+              TOBN(0xdc703717, 0xa2ce2f2f), TOBN(0x7913b93c, 0x40814194),
+              TOBN(0x04924593, 0x1fe89636), TOBN(0x7b98443f, 0xf78834a6),
+              TOBN(0x11c6ab01, 0x5114a5a1), TOBN(0x60deb383, 0xffba5f4c),
+              TOBN(0x4caa54c6, 0x01a982e6), TOBN(0x1dd35e11, 0x3491cd26),
+              TOBN(0x973c315f, 0x7cbd6b05), TOBN(0xcab00775, 0x52494724),
+              TOBN(0x04659b1f, 0x6565e15a), TOBN(0xbf30f529, 0x8c8fb026),
+              TOBN(0xfc21641b, 0xa8a0de37), TOBN(0xe9c7a366, 0xfa5e5114),
+              TOBN(0xdb849ca5, 0x52f03ad8), TOBN(0xc7e8dbe9, 0x024e35c0),
+              TOBN(0xa1a2bbac, 0xcfc3c789), TOBN(0xbf733e7d, 0x9c26f262),
+              TOBN(0x882ffbf5, 0xb8444823), TOBN(0xb7224e88, 0x6bf8483b),
+              TOBN(0x53023b8b, 0x65bef640), TOBN(0xaabfec91, 0xd4d5f8cd),
+              TOBN(0xa40e1510, 0x079ea1bd), TOBN(0x1ad9addc, 0xd05d5d26),
+              TOBN(0xdb3f2eab, 0x13e68d4f), TOBN(0x1cff1ae2, 0x640f803f),
+              TOBN(0xe0e7b749, 0xd4cee117), TOBN(0x8e9f275b, 0x4036d909),
+              TOBN(0xce34e31d, 0x8f4d4c38), TOBN(0x22b37f69, 0xd75130fc),
+              TOBN(0x83e0f1fd, 0xb4014604), TOBN(0xa8ce9919, 0x89415078),
+              TOBN(0x82375b75, 0x41792efe), TOBN(0x4f59bf5c, 0x97d4515b),
+              TOBN(0xac4f324f, 0x923a277d), TOBN(0xd9bc9b7d, 0x650f3406),
+              TOBN(0xc6fa87d1, 0x8a39bc51), TOBN(0x82588530, 0x5ccc108f),
+              TOBN(0x5ced3c9f, 0x82e4c634), TOBN(0x8efb8314, 0x3a4464f8),
+              TOBN(0xe706381b, 0x7a1dca25), TOBN(0x6cd15a3c, 0x5a2a412b),
+              TOBN(0x9347a8fd, 0xbfcd8fb5), TOBN(0x31db2eef, 0x6e54cd22),
+              TOBN(0xc4aeb11e, 0xf8d8932f), TOBN(0x11e7c1ed, 0x344411af),
+              TOBN(0x2653050c, 0xdc9a151e), TOBN(0x9edbfc08, 0x3bb0a859),
+              TOBN(0x926c81c7, 0xfd5691e7), TOBN(0x9c1b2342, 0x6f39019a),
+              TOBN(0x64a81c8b, 0x7f8474b9), TOBN(0x90657c07, 0x01761819),
+              TOBN(0x390b3331, 0x55e0375a), TOBN(0xc676c626, 0xb6ebc47d),
+              TOBN(0x51623247, 0xb7d6dee8), TOBN(0x0948d927, 0x79659313),
+              TOBN(0x99700161, 0xe9ab35ed), TOBN(0x06cc32b4, 0x8ddde408),
+              TOBN(0x6f2fd664, 0x061ef338), TOBN(0x1606fa02, 0xc202e9ed),
+              TOBN(0x55388bc1, 0x929ba99b), TOBN(0xc4428c5e, 0x1e81df69),
+              TOBN(0xce2028ae, 0xf91b0b2a), TOBN(0xce870a23, 0xf03dfd3f),
+              TOBN(0x66ec2c87, 0x0affe8ed), TOBN(0xb205fb46, 0x284d0c00),
+              TOBN(0xbf5dffe7, 0x44cefa48), TOBN(0xb6fc37a8, 0xa19876d7),
+              TOBN(0xbecfa84c, 0x08b72863), TOBN(0xd7205ff5, 0x2576374f),
+              TOBN(0x80330d32, 0x8887de41), TOBN(0x5de0df0c, 0x869ea534),
+              TOBN(0x13f42753, 0x3c56ea17), TOBN(0xeb1f6069, 0x452b1a78),
+              TOBN(0x50474396, 0xe30ea15c), TOBN(0x575816a1, 0xc1494125),
+              TOBN(0xbe1ce55b, 0xfe6bb38f), TOBN(0xb901a948, 0x96ae30f7),
+              TOBN(0xe5af0f08, 0xd8fc3548), TOBN(0x5010b5d0, 0xd73bfd08),
+              TOBN(0x993d2880, 0x53fe655a), TOBN(0x99f2630b, 0x1c1309fd),
+              TOBN(0xd8677baf, 0xb4e3b76f), TOBN(0x14e51ddc, 0xb840784b),
+              TOBN(0x326c750c, 0xbf0092ce), TOBN(0xc83d306b, 0xf528320f),
+              TOBN(0xc4456715, 0x77d4715c), TOBN(0xd30019f9, 0x6b703235),
+              TOBN(0x207ccb2e, 0xd669e986), TOBN(0x57c824af, 0xf6dbfc28),
+              TOBN(0xf0eb532f, 0xd8f92a23), TOBN(0x4a557fd4, 0x9bb98fd2),
+              TOBN(0xa57acea7, 0xc1e6199a), TOBN(0x0c663820, 0x8b94b1ed),
+              TOBN(0x9b42be8f, 0xf83a9266), TOBN(0xc7741c97, 0x0101bd45),
+              TOBN(0x95770c11, 0x07bd9ceb), TOBN(0x1f50250a, 0x8b2e0744),
+              TOBN(0xf762eec8, 0x1477b654), TOBN(0xc65b900e, 0x15efe59a),
+              TOBN(0x88c96148, 0x9546a897), TOBN(0x7e8025b3, 0xc30b4d7c),
+              TOBN(0xae4065ef, 0x12045cf9), TOBN(0x6fcb2caf, 0x9ccce8bd),
+              TOBN(0x1fa0ba4e, 0xf2cf6525), TOBN(0xf683125d, 0xcb72c312),
+              TOBN(0xa01da4ea, 0xe312410e), TOBN(0x67e28677, 0x6cd8e830),
+              TOBN(0xabd95752, 0x98fb3f07), TOBN(0x05f11e11, 0xeef649a5),
+              TOBN(0xba47faef, 0x9d3472c2), TOBN(0x3adff697, 0xc77d1345),
+              TOBN(0x4761fa04, 0xdd15afee), TOBN(0x64f1f61a, 0xb9e69462),
+              TOBN(0xfa691fab, 0x9bfb9093), TOBN(0x3df8ae8f, 0xa1133dfe),
+              TOBN(0xcd5f8967, 0x58cc710d), TOBN(0xfbb88d50, 0x16c7fe79),
+              TOBN(0x8e011b4c, 0xe88c50d1), TOBN(0x7532e807, 0xa8771c4f),
+              TOBN(0x64c78a48, 0xe2278ee4), TOBN(0x0b283e83, 0x3845072a),
+              TOBN(0x98a6f291, 0x49e69274), TOBN(0xb96e9668, 0x1868b21c),
+              TOBN(0x38f0adc2, 0xb1a8908e), TOBN(0x90afcff7, 0x1feb829d),
+              TOBN(0x9915a383, 0x210b0856), TOBN(0xa5a80602, 0xdef04889),
+              TOBN(0x800e9af9, 0x7c64d509), TOBN(0x81382d0b, 0xb8996f6f),
+              TOBN(0x490eba53, 0x81927e27), TOBN(0x46c63b32, 0x4af50182),
+              TOBN(0x784c5fd9, 0xd3ad62ce), TOBN(0xe4fa1870, 0xf8ae8736),
+              TOBN(0x4ec9d0bc, 0xd7466b25), TOBN(0x84ddbe1a, 0xdb235c65),
+              TOBN(0x5e2645ee, 0x163c1688), TOBN(0x570bd00e, 0x00eba747),
+              TOBN(0xfa51b629, 0x128bfa0f), TOBN(0x92fce1bd, 0x6c1d3b68),
+              TOBN(0x3e7361dc, 0xb66778b1), TOBN(0x9c7d249d, 0x5561d2bb),
+              TOBN(0xa40b28bf, 0x0bbc6229), TOBN(0x1c83c05e, 0xdfd91497),
+              TOBN(0x5f9f5154, 0xf083df05), TOBN(0xbac38b3c, 0xeee66c9d),
+              TOBN(0xf71db7e3, 0xec0dfcfd), TOBN(0xf2ecda8e, 0x8b0a8416),
+              TOBN(0x52fddd86, 0x7812aa66), TOBN(0x2896ef10, 0x4e6f4272),
+              TOBN(0xff27186a, 0x0fe9a745), TOBN(0x08249fcd, 0x49ca70db),
+              TOBN(0x7425a2e6, 0x441cac49), TOBN(0xf4a0885a, 0xece5ff57),
+              TOBN(0x6e2cb731, 0x7d7ead58), TOBN(0xf96cf7d6, 0x1898d104),
+              TOBN(0xafe67c9d, 0x4f2c9a89), TOBN(0x89895a50, 0x1c7bf5bc),
+              TOBN(0xdc7cb8e5, 0x573cecfa), TOBN(0x66497eae, 0xd15f03e6),
+              TOBN(0x6bc0de69, 0x3f084420), TOBN(0x323b9b36, 0xacd532b0),
+              TOBN(0xcfed390a, 0x0115a3c1), TOBN(0x9414c40b, 0x2d65ca0e),
+              TOBN(0x641406bd, 0x2f530c78), TOBN(0x29369a44, 0x833438f2),
+              TOBN(0x996884f5, 0x903fa271), TOBN(0xe6da0fd2, 0xb9da921e),
+              TOBN(0xa6f2f269, 0x5db01e54), TOBN(0x1ee3e9bd, 0x6876214e),
+              TOBN(0xa26e181c, 0xe27a9497), TOBN(0x36d254e4, 0x8e215e04),
+              TOBN(0x42f32a6c, 0x252cabca), TOBN(0x99481487, 0x80b57614),
+              TOBN(0x4c4dfe69, 0x40d9cae1), TOBN(0x05869580, 0x11a10f09),
+              TOBN(0xca287b57, 0x3491b64b), TOBN(0x77862d5d, 0x3fd4a53b),
+              TOBN(0xbf94856e, 0x50349126), TOBN(0x2be30bd1, 0x71c5268f),
+              TOBN(0x10393f19, 0xcbb650a6), TOBN(0x639531fe, 0x778cf9fd),
+              TOBN(0x02556a11, 0xb2935359), TOBN(0xda38aa96, 0xaf8c126e),
+              TOBN(0x47dbe6c2, 0x0960167f), TOBN(0x37bbabb6, 0x501901cd),
+              TOBN(0xb6e979e0, 0x2c947778), TOBN(0xd69a5175, 0x7a1a1dc6),
+              TOBN(0xc3ed5095, 0x9d9faf0c), TOBN(0x4dd9c096, 0x1d5fa5f0),
+              TOBN(0xa0c4304d, 0x64f16ea8), TOBN(0x8b1cac16, 0x7e718623),
+              TOBN(0x0b576546, 0x7c67f03e), TOBN(0x559cf5ad, 0xcbd88c01),
+              TOBN(0x074877bb, 0x0e2af19a), TOBN(0x1f717ec1, 0xa1228c92),
+              TOBN(0x70bcb800, 0x326e8920), TOBN(0xec6e2c5c, 0x4f312804),
+              TOBN(0x426aea7d, 0x3fca4752), TOBN(0xf12c0949, 0x2211f62a),
+              TOBN(0x24beecd8, 0x7be7b6b5), TOBN(0xb77eaf4c, 0x36d7a27d),
+              TOBN(0x154c2781, 0xfda78fd3), TOBN(0x848a83b0, 0x264eeabe),
+              TOBN(0x81287ef0, 0x4ffe2bc4), TOBN(0x7b6d88c6, 0xb6b6fc2a),
+              TOBN(0x805fb947, 0xce417d99), TOBN(0x4b93dcc3, 0x8b916cc4),
+              TOBN(0x72e65bb3, 0x21273323), TOBN(0xbcc1badd, 0x6ea9886e),
+              TOBN(0x0e223011, 0x4bc5ee85), TOBN(0xa561be74, 0xc18ee1e4),
+              TOBN(0x762fd2d4, 0xa6bcf1f1), TOBN(0x50e6a5a4, 0x95231489),
+              TOBN(0xca96001f, 0xa00b500b), TOBN(0x5c098cfc, 0x5d7dcdf5),
+              TOBN(0xa64e2d2e, 0x8c446a85), TOBN(0xbae9bcf1, 0x971f3c62),
+              TOBN(0x4ec22683, 0x8435a2c5), TOBN(0x8ceaed6c, 0x4bad4643),
+              TOBN(0xe9f8fb47, 0xccccf4e3), TOBN(0xbd4f3fa4, 0x1ce3b21e),
+              TOBN(0xd79fb110, 0xa3db3292), TOBN(0xe28a37da, 0xb536c66a),
+              TOBN(0x279ce87b, 0x8e49e6a9), TOBN(0x70ccfe8d, 0xfdcec8e3),
+              TOBN(0x2193e4e0, 0x3ba464b2), TOBN(0x0f39d60e, 0xaca9a398),
+              TOBN(0x7d7932af, 0xf82c12ab), TOBN(0xd8ff50ed, 0x91e7e0f7),
+              TOBN(0xea961058, 0xfa28a7e0), TOBN(0xc726cf25, 0x0bf5ec74),
+              TOBN(0xe74d55c8, 0xdb229666), TOBN(0x0bd9abbf, 0xa57f5799),
+              TOBN(0x7479ef07, 0x4dfc47b3), TOBN(0xd9c65fc3, 0x0c52f91d),
+              TOBN(0x8e0283fe, 0x36a8bde2), TOBN(0xa32a8b5e, 0x7d4b7280),
+              TOBN(0x6a677c61, 0x12e83233), TOBN(0x0fbb3512, 0xdcc9bf28),
+              TOBN(0x562e8ea5, 0x0d780f61), TOBN(0x0db8b22b, 0x1dc4e89c),
+              TOBN(0x0a6fd1fb, 0x89be0144), TOBN(0x8c77d246, 0xca57113b),
+              TOBN(0x4639075d, 0xff09c91c), TOBN(0x5b47b17f, 0x5060824c),
+              TOBN(0x58aea2b0, 0x16287b52), TOBN(0xa1343520, 0xd0cd8eb0),
+              TOBN(0x6148b4d0, 0xc5d58573), TOBN(0xdd2b6170, 0x291c68ae),
+              TOBN(0xa61b3929, 0x1da3b3b7), TOBN(0x5f946d79, 0x08c4ac10),
+              TOBN(0x4105d4a5, 0x7217d583), TOBN(0x5061da3d, 0x25e6de5e),
+              TOBN(0x3113940d, 0xec1b4991), TOBN(0xf12195e1, 0x36f485ae),
+              TOBN(0xa7507fb2, 0x731a2ee0), TOBN(0x95057a8e, 0x6e9e196e),
+              TOBN(0xa3c2c911, 0x2e130136), TOBN(0x97dfbb36, 0x33c60d15),
+              TOBN(0xcaf3c581, 0xb300ee2b), TOBN(0x77f25d90, 0xf4bac8b8),
+              TOBN(0xdb1c4f98, 0x6d840cd6), TOBN(0x471d62c0, 0xe634288c),
+              TOBN(0x8ec2f85e, 0xcec8a161), TOBN(0x41f37cbc, 0xfa6f4ae2),
+              TOBN(0x6793a20f, 0x4b709985), TOBN(0x7a7bd33b, 0xefa8985b),
+              TOBN(0x2c6a3fbd, 0x938e6446), TOBN(0x19042619, 0x2a8d47c1),
+              TOBN(0x16848667, 0xcc36975f), TOBN(0x02acf168, 0x9d5f1dfb),
+              TOBN(0x62d41ad4, 0x613baa94), TOBN(0xb56fbb92, 0x9f684670),
+              TOBN(0xce610d0d, 0xe9e40569), TOBN(0x7b99c65f, 0x35489fef),
+              TOBN(0x0c88ad1b, 0x3df18b97), TOBN(0x81b7d9be, 0x5d0e9edb),
+              TOBN(0xd85218c0, 0xc716cc0a), TOBN(0xf4b5ff90, 0x85691c49),
+              TOBN(0xa4fd666b, 0xce356ac6), TOBN(0x17c72895, 0x4b327a7a),
+              TOBN(0xf93d5085, 0xda6be7de), TOBN(0xff71530e, 0x3301d34e),
+              TOBN(0x4cd96442, 0xd8f448e8), TOBN(0x9283d331, 0x2ed18ffa),
+              TOBN(0x4d33dd99, 0x2a849870), TOBN(0xa716964b, 0x41576335),
+              TOBN(0xff5e3a9b, 0x179be0e5), TOBN(0x5b9d6b1b, 0x83b13632),
+              TOBN(0x3b8bd7d4, 0xa52f313b), TOBN(0xc9dd95a0, 0x637a4660),
+              TOBN(0x30035962, 0x0b3e218f), TOBN(0xce1481a3, 0xc7b28a3c),
+              TOBN(0xab41b43a, 0x43228d83), TOBN(0x24ae1c30, 0x4ad63f99),
+              TOBN(0x8e525f1a, 0x46a51229), TOBN(0x14af860f, 0xcd26d2b4),
+              TOBN(0xd6baef61, 0x3f714aa1), TOBN(0xf51865ad, 0xeb78795e),
+              TOBN(0xd3e21fce, 0xe6a9d694), TOBN(0x82ceb1dd, 0x8a37b527) }
+      };
diff --git a/crypto/ec/ecp_oct.c b/crypto/ec/ecp_oct.c
index 68943e521e8a8..05a28fde83733 100644
--- a/crypto/ec/ecp_oct.c
+++ b/crypto/ec/ecp_oct.c
@@ -20,9 +20,9 @@
 #include "ec_local.h"
 
 int ossl_ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group,
-                                                  EC_POINT *point,
-                                                  const BIGNUM *x_, int y_bit,
-                                                  BN_CTX *ctx)
+    EC_POINT *point,
+    const BIGNUM *x_, int y_bit,
+    BN_CTX *ctx)
 {
     BN_CTX *new_ctx = NULL;
     BIGNUM *tmp1, *tmp2, *x, *y;
@@ -150,15 +150,15 @@ int ossl_ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
 }
 
 size_t ossl_ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point,
-                                    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)
 {
     size_t ret;
     BN_CTX *new_ctx = NULL;
@@ -187,9 +187,7 @@ size_t ossl_ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point
 
     /* ret := required output buffer length */
     field_len = BN_num_bytes(group->field);
-    ret =
-        (form ==
-         POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
+    ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
 
     /* if 'buf' is NULL, just return required length */
     if (buf != NULL) {
@@ -215,7 +213,8 @@ size_t ossl_ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point
             goto err;
 
         if ((form == POINT_CONVERSION_COMPRESSED
-             || form == POINT_CONVERSION_HYBRID) && BN_is_odd(y))
+                || form == POINT_CONVERSION_HYBRID)
+            && BN_is_odd(y))
             buf[0] = form + 1;
         else
             buf[0] = form;
@@ -264,7 +263,7 @@ size_t ossl_ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point
     BN_CTX_free(new_ctx);
     return ret;
 
- err:
+err:
     if (used_ctx)
         BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
@@ -272,8 +271,8 @@ size_t ossl_ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point
 }
 
 int ossl_ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
-                                 const unsigned char *buf, size_t len,
-                                 BN_CTX *ctx)
+    const unsigned char *buf, size_t len,
+    BN_CTX *ctx)
 {
     point_conversion_form_t form;
     int y_bit;
@@ -310,9 +309,7 @@ int ossl_ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
     }
 
     field_len = BN_num_bytes(group->field);
-    enc_len =
-        (form ==
-         POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
+    enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2 * field_len;
 
     if (len != enc_len) {
         ERR_raise(ERR_LIB_EC, EC_R_INVALID_ENCODING);
@@ -365,7 +362,7 @@ int ossl_ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
diff --git a/crypto/ec/ecp_ppc.c b/crypto/ec/ecp_ppc.c
index b2b9f772b87bf..e038a0747551e 100644
--- a/crypto/ec/ecp_ppc.c
+++ b/crypto/ec/ecp_ppc.c
@@ -12,15 +12,15 @@
 #include "ec_local.h"
 
 void ecp_nistz256_mul_mont(unsigned long res[4], const unsigned long a[4],
-                           const unsigned long b[4]);
+    const unsigned long b[4]);
 
 void ecp_nistz256_to_mont(unsigned long res[4], const unsigned long in[4]);
 void ecp_nistz256_to_mont(unsigned long res[4], const unsigned long in[4])
 {
     static const unsigned long RR[] = { 0x0000000000000003U,
-                                        0xfffffffbffffffffU,
-                                        0xfffffffffffffffeU,
-                                        0x00000004fffffffdU };
+        0xfffffffbffffffffU,
+        0xfffffffffffffffeU,
+        0x00000004fffffffdU };
 
     ecp_nistz256_mul_mont(res, in, RR);
 }
diff --git a/crypto/ec/ecp_s390x_nistp.c b/crypto/ec/ecp_s390x_nistp.c
index f13f8bed242d9..85f986090540f 100644
--- a/crypto/ec/ecp_s390x_nistp.c
+++ b/crypto/ec/ecp_s390x_nistp.c
@@ -21,34 +21,36 @@
 #include "s390x_arch.h"
 
 /* Size of parameter blocks */
-#define S390X_SIZE_PARAM                4096
+#define S390X_SIZE_PARAM 4096
 
 /* Size of fields in parameter blocks */
-#define S390X_SIZE_P256                 32
-#define S390X_SIZE_P384                 48
-#define S390X_SIZE_P521                 80
+#define S390X_SIZE_P256 32
+#define S390X_SIZE_P384 48
+#define S390X_SIZE_P521 80
 
 /* Offsets of fields in PCC parameter blocks */
-#define S390X_OFF_RES_X(n)              (0 * n)
-#define S390X_OFF_RES_Y(n)              (1 * n)
-#define S390X_OFF_SRC_X(n)              (2 * n)
-#define S390X_OFF_SRC_Y(n)              (3 * n)
-#define S390X_OFF_SCALAR(n)             (4 * n)
+#define S390X_OFF_RES_X(n) (0 * n)
+#define S390X_OFF_RES_Y(n) (1 * n)
+#define S390X_OFF_SRC_X(n) (2 * n)
+#define S390X_OFF_SRC_Y(n) (3 * n)
+#define S390X_OFF_SCALAR(n) (4 * n)
 
 /* Offsets of fields in KDSA parameter blocks */
-#define S390X_OFF_R(n)                  (0 * n)
-#define S390X_OFF_S(n)                  (1 * n)
-#define S390X_OFF_H(n)                  (2 * n)
-#define S390X_OFF_K(n)                  (3 * n)
-#define S390X_OFF_X(n)                  (3 * n)
-#define S390X_OFF_RN(n)                 (4 * n)
-#define S390X_OFF_Y(n)                  (4 * n)
+#define S390X_OFF_R(n) (0 * n)
+#define S390X_OFF_S(n) (1 * n)
+#define S390X_OFF_H(n) (2 * n)
+#define S390X_OFF_K(n) (3 * n)
+#define S390X_OFF_X(n) (3 * n)
+#define S390X_OFF_RN(n) (4 * n)
+#define S390X_OFF_Y(n) (4 * n)
+
+#define S390X_PAD(n) (n == 80 ? 14 : 0)
 
 static int ec_GFp_s390x_nistp_mul(const EC_GROUP *group, EC_POINT *r,
-                                  const BIGNUM *scalar,
-                                  size_t num, const EC_POINT *points[],
-                                  const BIGNUM *scalars[],
-                                  BN_CTX *ctx, unsigned int fc, int len)
+    const BIGNUM *scalar,
+    size_t num, const EC_POINT *points[],
+    const BIGNUM *scalars[],
+    BN_CTX *ctx, unsigned int fc, int len)
 {
     unsigned char param[S390X_SIZE_PARAM];
     BIGNUM *x, *y;
@@ -97,16 +99,19 @@ static int ec_GFp_s390x_nistp_mul(const EC_GROUP *group, EC_POINT *r,
         memset(&param, 0, sizeof(param));
 
         if (group->meth->point_get_affine_coordinates(group, point_ptr,
-                                                      x, y, ctx) != 1
+                x, y, ctx)
+                != 1
             || BN_bn2binpad(x, param + S390X_OFF_SRC_X(len), len) == -1
             || BN_bn2binpad(y, param + S390X_OFF_SRC_Y(len), len) == -1
             || BN_bn2binpad(scalar_ptr,
-                            param + S390X_OFF_SCALAR(len), len) == -1
+                   param + S390X_OFF_SCALAR(len), len)
+                == -1
             || s390x_pcc(fc, param) != 0
             || BN_bin2bn(param + S390X_OFF_RES_X(len), len, x) == NULL
             || BN_bin2bn(param + S390X_OFF_RES_Y(len), len, y) == NULL
             || group->meth->point_set_affine_coordinates(group, r,
-                                                         x, y, ctx) != 1)
+                   x, y, ctx)
+                != 1)
             goto ret;
 
         rc = 1;
@@ -123,11 +128,11 @@ static int ec_GFp_s390x_nistp_mul(const EC_GROUP *group, EC_POINT *r,
 }
 
 static ECDSA_SIG *ecdsa_s390x_nistp_sign_sig(const unsigned char *dgst,
-                                             int dgstlen,
-                                             const BIGNUM *kinv,
-                                             const BIGNUM *r,
-                                             EC_KEY *eckey,
-                                             unsigned int fc, int len)
+    int dgstlen,
+    const BIGNUM *kinv,
+    const BIGNUM *r,
+    EC_KEY *eckey,
+    unsigned int fc, int len)
 {
     unsigned char param[S390X_SIZE_PARAM];
     int ok = 0;
@@ -183,11 +188,12 @@ static ECDSA_SIG *ecdsa_s390x_nistp_sign_sig(const unsigned char *dgst,
          * because kdsa instruction constructs an in-range, invertible nonce
          * internally implementing counter-measures for RNG weakness.
          */
-         if (RAND_priv_bytes_ex(eckey->libctx, param + S390X_OFF_RN(len),
-                                (size_t)len, 0) != 1) {
-             ERR_raise(ERR_LIB_EC, EC_R_RANDOM_NUMBER_GENERATION_FAILED);
-             goto ret;
-         }
+        if (RAND_priv_bytes_ex(eckey->libctx, param + S390X_OFF_RN(len),
+                (size_t)len, 0)
+            != 1) {
+            ERR_raise(ERR_LIB_EC, EC_R_RANDOM_NUMBER_GENERATION_FAILED);
+            goto ret;
+        }
     } else {
         /* Reconstruct k = (k^-1)^-1. */
         if (ossl_ec_group_do_inverse_ord(group, k, kinv, NULL) == 0
@@ -222,8 +228,8 @@ static ECDSA_SIG *ecdsa_s390x_nistp_sign_sig(const unsigned char *dgst,
 }
 
 static int ecdsa_s390x_nistp_verify_sig(const unsigned char *dgst, int dgstlen,
-                                        const ECDSA_SIG *sig, EC_KEY *eckey,
-                                        unsigned int fc, int len)
+    const ECDSA_SIG *sig, EC_KEY *eckey,
+    unsigned int fc, int len)
 {
     unsigned char param[S390X_SIZE_PARAM];
     int rc = -1;
@@ -264,136 +270,149 @@ static int ecdsa_s390x_nistp_verify_sig(const unsigned char *dgst, int dgstlen,
     off = len - (dgstlen > len ? len : dgstlen);
     memcpy(param + S390X_OFF_H(len) + off, dgst, len - off);
 
+    /* Check for invalid malformed signatures (r/s negative or too large) */
+    if (BN_is_negative(sig->r) || BN_is_negative(sig->s)
+        || BN_bn2binpad(sig->r, param + S390X_OFF_R(len) + S390X_PAD(len),
+               len - S390X_PAD(len))
+            == -1
+        || BN_bn2binpad(sig->s, param + S390X_OFF_S(len) + S390X_PAD(len),
+               len - S390X_PAD(len))
+            == -1) {
+        ERR_raise(ERR_LIB_EC, EC_R_BAD_SIGNATURE);
+        rc = 0;
+        goto ret;
+    }
+
     if (group->meth->point_get_affine_coordinates(group, pubkey,
-                                                  x, y, ctx) != 1
-        || BN_bn2binpad(sig->r, param + S390X_OFF_R(len), len) == -1
-        || BN_bn2binpad(sig->s, param + S390X_OFF_S(len), len) == -1
+            x, y, ctx)
+            != 1
         || BN_bn2binpad(x, param + S390X_OFF_X(len), len) == -1
         || BN_bn2binpad(y, param + S390X_OFF_Y(len), len) == -1) {
         ERR_raise(ERR_LIB_EC, ERR_R_BN_LIB);
         goto ret;
     }
 
-    rc = s390x_kdsa(fc, param, NULL, 0) == 0 ? 1 : 0;
+    rc = s390x_kdsa(fc, param, NULL, 0);
+    if (rc == 2)
+        ERR_raise(ERR_LIB_EC, EC_R_BAD_SIGNATURE);
+    rc = rc == 0 ? 1 : 0;
 ret:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     return rc;
 }
 
-#define EC_GFP_S390X_NISTP_METHOD(bits)                                 \
-                                                                        \
-static int ec_GFp_s390x_nistp##bits##_mul(const EC_GROUP *group,        \
-                                          EC_POINT *r,                  \
-                                          const BIGNUM *scalar,         \
-                                          size_t num,                   \
-                                          const EC_POINT *points[],     \
-                                          const BIGNUM *scalars[],      \
-                                          BN_CTX *ctx)                  \
-{                                                                       \
-    return ec_GFp_s390x_nistp_mul(group, r, scalar, num, points,        \
-                                  scalars, ctx,                         \
-                                  S390X_SCALAR_MULTIPLY_P##bits,        \
-                                  S390X_SIZE_P##bits);                  \
-}                                                                       \
-                                                                        \
-static ECDSA_SIG *ecdsa_s390x_nistp##bits##_sign_sig(const unsigned     \
-                                                     char *dgst,        \
-                                                     int dgstlen,       \
-                                                     const BIGNUM *kinv,\
-                                                     const BIGNUM *r,   \
-                                                     EC_KEY *eckey)     \
-{                                                                       \
-    return ecdsa_s390x_nistp_sign_sig(dgst, dgstlen, kinv, r, eckey,    \
-                                      S390X_ECDSA_SIGN_P##bits,         \
-                                      S390X_SIZE_P##bits);              \
-}                                                                       \
-                                                                        \
-static int ecdsa_s390x_nistp##bits##_verify_sig(const                   \
-                                                unsigned char *dgst,    \
-                                                int dgstlen,            \
-                                                const ECDSA_SIG *sig,   \
-                                                EC_KEY *eckey)          \
-{                                                                       \
-    return ecdsa_s390x_nistp_verify_sig(dgst, dgstlen, sig, eckey,      \
-                                        S390X_ECDSA_VERIFY_P##bits,     \
-                                        S390X_SIZE_P##bits);            \
-}                                                                       \
-                                                                        \
-const EC_METHOD *EC_GFp_s390x_nistp##bits##_method(void)                \
-{                                                                       \
-    static const EC_METHOD EC_GFp_s390x_nistp##bits##_meth = {          \
-        EC_FLAGS_DEFAULT_OCT,                                           \
-        NID_X9_62_prime_field,                                          \
-        ossl_ec_GFp_simple_group_init,                                  \
-        ossl_ec_GFp_simple_group_finish,                                \
-        ossl_ec_GFp_simple_group_clear_finish,                          \
-        ossl_ec_GFp_simple_group_copy,                                  \
-        ossl_ec_GFp_simple_group_set_curve,                             \
-        ossl_ec_GFp_simple_group_get_curve,                             \
-        ossl_ec_GFp_simple_group_get_degree,                            \
-        ossl_ec_group_simple_order_bits,                                \
-        ossl_ec_GFp_simple_group_check_discriminant,                    \
-        ossl_ec_GFp_simple_point_init,                                  \
-        ossl_ec_GFp_simple_point_finish,                                \
-        ossl_ec_GFp_simple_point_clear_finish,                          \
-        ossl_ec_GFp_simple_point_copy,                                  \
-        ossl_ec_GFp_simple_point_set_to_infinity,                       \
-        ossl_ec_GFp_simple_point_set_affine_coordinates,                \
-        ossl_ec_GFp_simple_point_get_affine_coordinates,                \
-        NULL, /* point_set_compressed_coordinates */                    \
-        NULL, /* point2oct */                                           \
-        NULL, /* oct2point */                                           \
-        ossl_ec_GFp_simple_add,                                         \
-        ossl_ec_GFp_simple_dbl,                                         \
-        ossl_ec_GFp_simple_invert,                                      \
-        ossl_ec_GFp_simple_is_at_infinity,                              \
-        ossl_ec_GFp_simple_is_on_curve,                                 \
-        ossl_ec_GFp_simple_cmp,                                         \
-        ossl_ec_GFp_simple_make_affine,                                 \
-        ossl_ec_GFp_simple_points_make_affine,                          \
-        ec_GFp_s390x_nistp##bits##_mul,                                 \
-        NULL, /* precompute_mult */                                     \
-        NULL, /* have_precompute_mult */                                \
-        ossl_ec_GFp_simple_field_mul,                                   \
-        ossl_ec_GFp_simple_field_sqr,                                   \
-        NULL, /* field_div */                                           \
-        ossl_ec_GFp_simple_field_inv,                                   \
-        NULL, /* field_encode */                                        \
-        NULL, /* field_decode */                                        \
-        NULL, /* field_set_to_one */                                    \
-        ossl_ec_key_simple_priv2oct,                                    \
-        ossl_ec_key_simple_oct2priv,                                    \
-        NULL, /* set_private */                                         \
-        ossl_ec_key_simple_generate_key,                                \
-        ossl_ec_key_simple_check_key,                                   \
-        ossl_ec_key_simple_generate_public_key,                         \
-        NULL, /* keycopy */                                             \
-        NULL, /* keyfinish */                                           \
-        ossl_ecdh_simple_compute_key,                                   \
-        ossl_ecdsa_simple_sign_setup,                                   \
-        ecdsa_s390x_nistp##bits##_sign_sig,                             \
-        ecdsa_s390x_nistp##bits##_verify_sig,                           \
-        NULL, /* field_inverse_mod_ord */                               \
-        ossl_ec_GFp_simple_blind_coordinates,                           \
-        ossl_ec_GFp_simple_ladder_pre,                                  \
-        ossl_ec_GFp_simple_ladder_step,                                 \
-        ossl_ec_GFp_simple_ladder_post                                  \
-    };                                                                  \
-    static const EC_METHOD *ret;                                        \
-                                                                        \
-    if ((OPENSSL_s390xcap_P.pcc[1]                                      \
-         & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P##bits))                 \
-        && (OPENSSL_s390xcap_P.kdsa[0]                                  \
-            & S390X_CAPBIT(S390X_ECDSA_VERIFY_P##bits))                 \
-        && (OPENSSL_s390xcap_P.kdsa[0]                                  \
-            & S390X_CAPBIT(S390X_ECDSA_SIGN_P##bits)))                  \
-        ret = &EC_GFp_s390x_nistp##bits##_meth;                         \
-    else                                                                \
-        ret = EC_GFp_mont_method();                                     \
-                                                                        \
-    return ret;                                                         \
-}
+#define EC_GFP_S390X_NISTP_METHOD(bits)                                             \
+                                                                                    \
+    static int ec_GFp_s390x_nistp##bits##_mul(const EC_GROUP *group,                \
+        EC_POINT *r,                                                                \
+        const BIGNUM *scalar,                                                       \
+        size_t num,                                                                 \
+        const EC_POINT *points[],                                                   \
+        const BIGNUM *scalars[],                                                    \
+        BN_CTX *ctx)                                                                \
+    {                                                                               \
+        return ec_GFp_s390x_nistp_mul(group, r, scalar, num, points,                \
+            scalars, ctx,                                                           \
+            S390X_SCALAR_MULTIPLY_P##bits,                                          \
+            S390X_SIZE_P##bits);                                                    \
+    }                                                                               \
+                                                                                    \
+    static ECDSA_SIG *ecdsa_s390x_nistp##bits##_sign_sig(const unsigned char *dgst, \
+        int dgstlen,                                                                \
+        const BIGNUM *kinv,                                                         \
+        const BIGNUM *r,                                                            \
+        EC_KEY *eckey)                                                              \
+    {                                                                               \
+        return ecdsa_s390x_nistp_sign_sig(dgst, dgstlen, kinv, r, eckey,            \
+            S390X_ECDSA_SIGN_P##bits,                                               \
+            S390X_SIZE_P##bits);                                                    \
+    }                                                                               \
+                                                                                    \
+    static int ecdsa_s390x_nistp##bits##_verify_sig(const unsigned char *dgst,      \
+        int dgstlen,                                                                \
+        const ECDSA_SIG *sig,                                                       \
+        EC_KEY *eckey)                                                              \
+    {                                                                               \
+        return ecdsa_s390x_nistp_verify_sig(dgst, dgstlen, sig, eckey,              \
+            S390X_ECDSA_VERIFY_P##bits,                                             \
+            S390X_SIZE_P##bits);                                                    \
+    }                                                                               \
+                                                                                    \
+    const EC_METHOD *EC_GFp_s390x_nistp##bits##_method(void)                        \
+    {                                                                               \
+        static const EC_METHOD EC_GFp_s390x_nistp##bits##_meth = {                  \
+            EC_FLAGS_DEFAULT_OCT,                                                   \
+            NID_X9_62_prime_field,                                                  \
+            ossl_ec_GFp_simple_group_init,                                          \
+            ossl_ec_GFp_simple_group_finish,                                        \
+            ossl_ec_GFp_simple_group_clear_finish,                                  \
+            ossl_ec_GFp_simple_group_copy,                                          \
+            ossl_ec_GFp_simple_group_set_curve,                                     \
+            ossl_ec_GFp_simple_group_get_curve,                                     \
+            ossl_ec_GFp_simple_group_get_degree,                                    \
+            ossl_ec_group_simple_order_bits,                                        \
+            ossl_ec_GFp_simple_group_check_discriminant,                            \
+            ossl_ec_GFp_simple_point_init,                                          \
+            ossl_ec_GFp_simple_point_finish,                                        \
+            ossl_ec_GFp_simple_point_clear_finish,                                  \
+            ossl_ec_GFp_simple_point_copy,                                          \
+            ossl_ec_GFp_simple_point_set_to_infinity,                               \
+            ossl_ec_GFp_simple_point_set_affine_coordinates,                        \
+            ossl_ec_GFp_simple_point_get_affine_coordinates,                        \
+            NULL, /* point_set_compressed_coordinates */                            \
+            NULL, /* point2oct */                                                   \
+            NULL, /* oct2point */                                                   \
+            ossl_ec_GFp_simple_add,                                                 \
+            ossl_ec_GFp_simple_dbl,                                                 \
+            ossl_ec_GFp_simple_invert,                                              \
+            ossl_ec_GFp_simple_is_at_infinity,                                      \
+            ossl_ec_GFp_simple_is_on_curve,                                         \
+            ossl_ec_GFp_simple_cmp,                                                 \
+            ossl_ec_GFp_simple_make_affine,                                         \
+            ossl_ec_GFp_simple_points_make_affine,                                  \
+            ec_GFp_s390x_nistp##bits##_mul,                                         \
+            NULL, /* precompute_mult */                                             \
+            NULL, /* have_precompute_mult */                                        \
+            ossl_ec_GFp_simple_field_mul,                                           \
+            ossl_ec_GFp_simple_field_sqr,                                           \
+            NULL, /* field_div */                                                   \
+            ossl_ec_GFp_simple_field_inv,                                           \
+            NULL, /* field_encode */                                                \
+            NULL, /* field_decode */                                                \
+            NULL, /* field_set_to_one */                                            \
+            ossl_ec_key_simple_priv2oct,                                            \
+            ossl_ec_key_simple_oct2priv,                                            \
+            NULL, /* set_private */                                                 \
+            ossl_ec_key_simple_generate_key,                                        \
+            ossl_ec_key_simple_check_key,                                           \
+            ossl_ec_key_simple_generate_public_key,                                 \
+            NULL, /* keycopy */                                                     \
+            NULL, /* keyfinish */                                                   \
+            ossl_ecdh_simple_compute_key,                                           \
+            ossl_ecdsa_simple_sign_setup,                                           \
+            ecdsa_s390x_nistp##bits##_sign_sig,                                     \
+            ecdsa_s390x_nistp##bits##_verify_sig,                                   \
+            NULL, /* field_inverse_mod_ord */                                       \
+            ossl_ec_GFp_simple_blind_coordinates,                                   \
+            ossl_ec_GFp_simple_ladder_pre,                                          \
+            ossl_ec_GFp_simple_ladder_step,                                         \
+            ossl_ec_GFp_simple_ladder_post                                          \
+        };                                                                          \
+        static const EC_METHOD *ret;                                                \
+                                                                                    \
+        if ((OPENSSL_s390xcap_P.pcc[1]                                              \
+                & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P##bits))                      \
+            && (OPENSSL_s390xcap_P.kdsa[0]                                          \
+                & S390X_CAPBIT(S390X_ECDSA_VERIFY_P##bits))                         \
+            && (OPENSSL_s390xcap_P.kdsa[0]                                          \
+                & S390X_CAPBIT(S390X_ECDSA_SIGN_P##bits)))                          \
+            ret = &EC_GFp_s390x_nistp##bits##_meth;                                 \
+        else                                                                        \
+            ret = EC_GFp_mont_method();                                             \
+                                                                                    \
+        return ret;                                                                 \
+    }
 
 EC_GFP_S390X_NISTP_METHOD(256)
 EC_GFP_S390X_NISTP_METHOD(384)
diff --git a/crypto/ec/ecp_sm2p256.c b/crypto/ec/ecp_sm2p256.c
index 7668b61378b62..37020c49beb7a 100644
--- a/crypto/ec/ecp_sm2p256.c
+++ b/crypto/ec/ecp_sm2p256.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -46,8 +46,10 @@ ALIGN32 static const BN_ULONG def_xG[P256_LIMBS] = {
 };
 
 ALIGN32 static const BN_ULONG def_yG[P256_LIMBS] = {
-    0x02df32e52139f0a0, 0xd0a9877cc62a4740,
-    0x59bdcee36b692153, 0xbc3736a2f4f6779c,
+    0x02df32e52139f0a0,
+    0xd0a9877cc62a4740,
+    0x59bdcee36b692153,
+    0xbc3736a2f4f6779c,
 };
 #endif
 
@@ -56,12 +58,8 @@ ALIGN32 static const BN_ULONG def_p[P256_LIMBS] = {
     0xffffffffffffffff, 0xffffffff00000000,
     0xffffffffffffffff, 0xfffffffeffffffff
 };
-ALIGN32 static const BN_ULONG def_ord[P256_LIMBS] = {
-    0x53bbf40939d54123, 0x7203df6b21c6052b,
-    0xffffffffffffffff, 0xfffffffeffffffff
-};
 
-ALIGN32 static const BN_ULONG ONE[P256_LIMBS] = {1, 0, 0, 0};
+ALIGN32 static const BN_ULONG ONE[P256_LIMBS] = { 1, 0, 0, 0 };
 
 /* Functions implemented in assembly */
 /*
@@ -127,10 +125,8 @@ static ossl_inline int is_greater(const BN_ULONG *a, const BN_ULONG *b)
 
 #define is_one(a) is_equal(a, ONE)
 #define is_even(a) !(a[0] & 1)
-#define is_point_equal(a, b)     \
-    is_equal(a->X, b->X) &&      \
-    is_equal(a->Y, b->Y) &&      \
-    is_equal(a->Z, b->Z)
+#define is_point_equal(a, b) \
+    is_equal(a->X, b->X) && is_equal(a->Y, b->Y) && is_equal(a->Z, b->Z)
 
 /* Bignum and field elements conversion */
 #define ecp_sm2p256_bignum_field_elem(out, in) \
@@ -141,8 +137,8 @@ static ossl_inline int is_greater(const BN_ULONG *a, const BN_ULONG *b)
     do {                                           \
         ALIGN32 BN_ULONG u[4];                     \
         ALIGN32 BN_ULONG v[4];                     \
-        ALIGN32 BN_ULONG x1[4] = {1, 0, 0, 0};     \
-        ALIGN32 BN_ULONG x2[4] = {0};              \
+        ALIGN32 BN_ULONG x1[4] = { 1, 0, 0, 0 };   \
+        ALIGN32 BN_ULONG x2[4] = { 0 };            \
                                                    \
         if (is_zeros(in))                          \
             return;                                \
@@ -172,18 +168,12 @@ static ossl_inline int is_greater(const BN_ULONG *a, const BN_ULONG *b)
     } while (0)
 
 /* Modular inverse |out| = |in|^(-1) mod |p|. */
-static ossl_inline void ecp_sm2p256_mod_inverse(BN_ULONG* out,
-                                                const BN_ULONG* in) {
+static ossl_inline void ecp_sm2p256_mod_inverse(BN_ULONG *out,
+    const BN_ULONG *in)
+{
     BN_MOD_INV(out, in, ecp_sm2p256_div_by_2, ecp_sm2p256_sub, def_p);
 }
 
-/* Modular inverse mod order |out| = |in|^(-1) % |ord|. */
-static ossl_inline void ecp_sm2p256_mod_ord_inverse(BN_ULONG* out,
-                                                    const BN_ULONG* in) {
-    BN_MOD_INV(out, in, ecp_sm2p256_div_by_2_mod_ord, ecp_sm2p256_sub_mod_ord,
-               def_ord);
-}
-
 /* Point double: R <- P + P */
 static void ecp_sm2p256_point_double(P256_POINT *R, const P256_POINT *P)
 {
@@ -222,13 +212,13 @@ static void ecp_sm2p256_point_double(P256_POINT *R, const P256_POINT *P)
 
 /* Point add affine: R <- P + Q */
 static void ecp_sm2p256_point_add_affine(P256_POINT *R, const P256_POINT *P,
-                                         const P256_POINT_AFFINE *Q)
+    const P256_POINT_AFFINE *Q)
 {
     unsigned int i;
-    ALIGN32 BN_ULONG tmp0[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG tmp1[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG tmp2[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG tmp3[P256_LIMBS] = {0};
+    ALIGN32 BN_ULONG tmp0[P256_LIMBS] = { 0 };
+    ALIGN32 BN_ULONG tmp1[P256_LIMBS] = { 0 };
+    ALIGN32 BN_ULONG tmp2[P256_LIMBS] = { 0 };
+    ALIGN32 BN_ULONG tmp3[P256_LIMBS] = { 0 };
 
     /* zero-check P->Z */
     if (is_zeros(P->Z)) {
@@ -285,12 +275,12 @@ static void ecp_sm2p256_point_add_affine(P256_POINT *R, const P256_POINT *P,
 
 /* Point add: R <- P + Q */
 static void ecp_sm2p256_point_add(P256_POINT *R, const P256_POINT *P,
-                                  const P256_POINT *Q)
+    const P256_POINT *Q)
 {
     unsigned int i;
-    ALIGN32 BN_ULONG tmp0[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG tmp1[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG tmp2[P256_LIMBS] = {0};
+    ALIGN32 BN_ULONG tmp0[P256_LIMBS] = { 0 };
+    ALIGN32 BN_ULONG tmp1[P256_LIMBS] = { 0 };
+    ALIGN32 BN_ULONG tmp2[P256_LIMBS] = { 0 };
 
     /* zero-check P | Q ->Z */
     if (is_zeros(P->Z)) {
@@ -378,7 +368,7 @@ static void ecp_sm2p256_point_G_mul_by_scalar(P256_POINT *R, const BN_ULONG *k)
  * Affine point mul by scalar: k - scalar, P - affine point
  */
 static void ecp_sm2p256_point_P_mul_by_scalar(P256_POINT *R, const BN_ULONG *k,
-                                              P256_POINT_AFFINE P)
+    P256_POINT_AFFINE P)
 {
     int i, init = 0;
     unsigned int index, mask = 0x0f;
@@ -425,10 +415,10 @@ static void ecp_sm2p256_point_P_mul_by_scalar(P256_POINT *R, const BN_ULONG *k,
 
 /* Get affine point */
 static void ecp_sm2p256_point_get_affine(P256_POINT_AFFINE *R,
-                                         const P256_POINT *P)
+    const P256_POINT *P)
 {
-    ALIGN32 BN_ULONG z_inv3[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG z_inv2[P256_LIMBS] = {0};
+    ALIGN32 BN_ULONG z_inv3[P256_LIMBS] = { 0 };
+    ALIGN32 BN_ULONG z_inv2[P256_LIMBS] = { 0 };
 
     if (is_one(P->Z)) {
         memcpy(R->X, P->X, 32);
@@ -447,70 +437,24 @@ static void ecp_sm2p256_point_get_affine(P256_POINT_AFFINE *R,
 static int ecp_sm2p256_is_affine_G(const EC_POINT *generator)
 {
     return (bn_get_top(generator->X) == P256_LIMBS)
-            && (bn_get_top(generator->Y) == P256_LIMBS)
-            && is_equal(bn_get_words(generator->X), def_xG)
-            && is_equal(bn_get_words(generator->Y), def_yG)
-            && (generator->Z_is_one == 1);
+        && (bn_get_top(generator->Y) == P256_LIMBS)
+        && is_equal(bn_get_words(generator->X), def_xG)
+        && is_equal(bn_get_words(generator->Y), def_yG)
+        && (generator->Z_is_one == 1);
 }
 #endif
 
-/*
- * Convert Jacobian coordinate point into affine coordinate (x,y)
- */
-static int ecp_sm2p256_get_affine(const EC_GROUP *group,
-                                  const EC_POINT *point,
-                                  BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
-{
-    ALIGN32 BN_ULONG z_inv2[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG z_inv3[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG x_aff[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG y_aff[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG point_x[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG point_y[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG point_z[P256_LIMBS] = {0};
-
-    if (EC_POINT_is_at_infinity(group, point)) {
-        ECerr(ERR_LIB_EC, EC_R_POINT_AT_INFINITY);
-        return 0;
-    }
-
-    if (ecp_sm2p256_bignum_field_elem(point_x, point->X) <= 0
-        || ecp_sm2p256_bignum_field_elem(point_y, point->Y) <= 0
-        || ecp_sm2p256_bignum_field_elem(point_z, point->Z) <= 0) {
-        ECerr(ERR_LIB_EC, EC_R_COORDINATES_OUT_OF_RANGE);
-        return 0;
-    }
-
-    ecp_sm2p256_mod_inverse(z_inv3, point_z);
-    ecp_sm2p256_sqr(z_inv2, z_inv3);
-
-    if (x != NULL) {
-        ecp_sm2p256_mul(x_aff, point_x, z_inv2);
-        if (!bn_set_words(x, x_aff, P256_LIMBS))
-            return 0;
-    }
-
-    if (y != NULL) {
-        ecp_sm2p256_mul(z_inv3, z_inv3, z_inv2);
-        ecp_sm2p256_mul(y_aff, point_y, z_inv3);
-        if (!bn_set_words(y, y_aff, P256_LIMBS))
-            return 0;
-    }
-
-    return 1;
-}
-
 /* r = sum(scalar[i]*point[i]) */
 static int ecp_sm2p256_windowed_mul(const EC_GROUP *group,
-                                    P256_POINT *r,
-                                    const BIGNUM **scalar,
-                                    const EC_POINT **point,
-                                    size_t num, BN_CTX *ctx)
+    P256_POINT *r,
+    const BIGNUM **scalar,
+    const EC_POINT **point,
+    size_t num, BN_CTX *ctx)
 {
     unsigned int i;
     int ret = 0;
     const BIGNUM **scalars = NULL;
-    ALIGN32 BN_ULONG k[P256_LIMBS] = {0};
+    ALIGN32 BN_ULONG k[P256_LIMBS] = { 0 };
     P256_POINT kP;
     ALIGN32 union {
         P256_POINT p;
@@ -564,15 +508,15 @@ static int ecp_sm2p256_windowed_mul(const EC_GROUP *group,
 
 /* r = scalar*G + sum(scalars[i]*points[i]) */
 static int ecp_sm2p256_points_mul(const EC_GROUP *group,
-                                  EC_POINT *r,
-                                  const BIGNUM *scalar,
-                                  size_t num,
-                                  const EC_POINT *points[],
-                                  const BIGNUM *scalars[], BN_CTX *ctx)
+    EC_POINT *r,
+    const BIGNUM *scalar,
+    size_t num,
+    const EC_POINT *points[],
+    const BIGNUM *scalars[], BN_CTX *ctx)
 {
     int ret = 0, p_is_infinity = 0;
     const EC_POINT *generator = NULL;
-    ALIGN32 BN_ULONG k[P256_LIMBS] = {0};
+    ALIGN32 BN_ULONG k[P256_LIMBS] = { 0 };
     ALIGN32 union {
         P256_POINT p;
         P256_POINT_AFFINE a;
@@ -610,8 +554,9 @@ static int ecp_sm2p256_points_mul(const EC_GROUP *group,
             g_scalars[0] = scalar;
 
             if (!ecp_sm2p256_windowed_mul(group, &p.p, g_scalars, new_generator,
-                                          (new_generator[0] != NULL
-                                           && g_scalars[0] != NULL), ctx))
+                    (new_generator[0] != NULL
+                        && g_scalars[0] != NULL),
+                    ctx))
                 goto err;
         }
     } else {
@@ -644,11 +589,11 @@ static int ecp_sm2p256_points_mul(const EC_GROUP *group,
 }
 
 static int ecp_sm2p256_field_mul(const EC_GROUP *group, BIGNUM *r,
-                                 const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+    const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
 {
-    ALIGN32 BN_ULONG a_fe[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG b_fe[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG r_fe[P256_LIMBS] = {0};
+    ALIGN32 BN_ULONG a_fe[P256_LIMBS] = { 0 };
+    ALIGN32 BN_ULONG b_fe[P256_LIMBS] = { 0 };
+    ALIGN32 BN_ULONG r_fe[P256_LIMBS] = { 0 };
 
     if (a == NULL || b == NULL || r == NULL)
         return 0;
@@ -668,10 +613,10 @@ static int ecp_sm2p256_field_mul(const EC_GROUP *group, BIGNUM *r,
 }
 
 static int ecp_sm2p256_field_sqr(const EC_GROUP *group, BIGNUM *r,
-                                 const BIGNUM *a, BN_CTX *ctx)
+    const BIGNUM *a, BN_CTX *ctx)
 {
-    ALIGN32 BN_ULONG a_fe[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG r_fe[P256_LIMBS] = {0};
+    ALIGN32 BN_ULONG a_fe[P256_LIMBS] = { 0 };
+    ALIGN32 BN_ULONG r_fe[P256_LIMBS] = { 0 };
 
     if (a == NULL || r == NULL)
         return 0;
@@ -689,44 +634,6 @@ static int ecp_sm2p256_field_sqr(const EC_GROUP *group, BIGNUM *r,
     return 1;
 }
 
-static int ecp_sm2p256_inv_mod_ord(const EC_GROUP *group, BIGNUM *r,
-                                             const BIGNUM *x, BN_CTX *ctx)
-{
-    int ret = 0;
-    ALIGN32 BN_ULONG t[P256_LIMBS] = {0};
-    ALIGN32 BN_ULONG out[P256_LIMBS] = {0};
-
-    if (bn_wexpand(r, P256_LIMBS) == NULL) {
-        ECerr(ERR_LIB_EC, ERR_R_BN_LIB);
-        goto err;
-    }
-
-    if ((BN_num_bits(x) > 256) || BN_is_negative(x)) {
-        BIGNUM *tmp;
-
-        if ((tmp = BN_CTX_get(ctx)) == NULL
-            || !BN_nnmod(tmp, x, group->order, ctx)) {
-            ECerr(ERR_LIB_EC, ERR_R_BN_LIB);
-            goto err;
-        }
-        x = tmp;
-    }
-
-    if (!ecp_sm2p256_bignum_field_elem(t, x)) {
-        ECerr(ERR_LIB_EC, EC_R_COORDINATES_OUT_OF_RANGE);
-        goto err;
-    }
-
-    ecp_sm2p256_mod_ord_inverse(out, t);
-
-    if (!bn_set_words(r, out, P256_LIMBS))
-        goto err;
-
-    ret = 1;
-err:
-    return ret;
-}
-
 const EC_METHOD *EC_GFp_sm2p256_method(void)
 {
     static const EC_METHOD ret = {
@@ -747,7 +654,7 @@ const EC_METHOD *EC_GFp_sm2p256_method(void)
         ossl_ec_GFp_simple_point_copy,
         ossl_ec_GFp_simple_point_set_to_infinity,
         ossl_ec_GFp_simple_point_set_affine_coordinates,
-        ecp_sm2p256_get_affine,
+        ossl_ec_GFp_simple_point_get_affine_coordinates,
         0, 0, 0,
         ossl_ec_GFp_simple_add,
         ossl_ec_GFp_simple_dbl,
@@ -763,7 +670,7 @@ const EC_METHOD *EC_GFp_sm2p256_method(void)
         ecp_sm2p256_field_mul,
         ecp_sm2p256_field_sqr,
         0 /* field_div */,
-        0 /* field_inv */,
+        ossl_ec_GFp_simple_field_inv,
         0 /* field_encode */,
         0 /* field_decode */,
         0 /* field_set_to_one */,
@@ -779,11 +686,11 @@ const EC_METHOD *EC_GFp_sm2p256_method(void)
         ossl_ecdsa_simple_sign_setup,
         ossl_ecdsa_simple_sign_sig,
         ossl_ecdsa_simple_verify_sig,
-        ecp_sm2p256_inv_mod_ord,
+        0, /* use constant‑time fallback for inverse mod order */
         0, /* blind_coordinates */
         0, /* ladder_pre */
         0, /* ladder_step */
-        0  /* ladder_post */
+        0 /* ladder_post */
     };
 
     return &ret;
diff --git a/crypto/ec/ecp_sm2p256_table.c b/crypto/ec/ecp_sm2p256_table.c
index e19df48f551dc..0eff5dae6bd78 100644
--- a/crypto/ec/ecp_sm2p256_table.c
+++ b/crypto/ec/ecp_sm2p256_table.c
@@ -28,7 +28,7 @@ __attribute((aligned(4096)))
 #elif defined(_MSC_VER)
 __declspec(align(4096))
 #elif defined(__SUNPRO_C)
-# pragma align 4096(ecp_sm2p256_precomputed)
+#pragma align 4096(ecp_sm2p256_precomputed)
 #endif
 extern const BN_ULONG ecp_sm2p256_precomputed[8 * 32 * 256];
 const BN_ULONG ecp_sm2p256_precomputed[8 * 32 * 256] = {
diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c
index 112a4f0a2f4dc..3542eb11f169f 100644
--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c
@@ -49,16 +49,16 @@ const EC_METHOD *EC_GFp_simple_method(void)
         ossl_ec_GFp_simple_cmp,
         ossl_ec_GFp_simple_make_affine,
         ossl_ec_GFp_simple_points_make_affine,
-        0 /* mul */ ,
-        0 /* precompute_mult */ ,
-        0 /* have_precompute_mult */ ,
+        0 /* mul */,
+        0 /* precompute_mult */,
+        0 /* have_precompute_mult */,
         ossl_ec_GFp_simple_field_mul,
         ossl_ec_GFp_simple_field_sqr,
-        0 /* field_div */ ,
+        0 /* field_div */,
         ossl_ec_GFp_simple_field_inv,
-        0 /* field_encode */ ,
-        0 /* field_decode */ ,
-        0,                      /* field_set_to_one */
+        0 /* field_encode */,
+        0 /* field_decode */,
+        0, /* field_set_to_one */
         ossl_ec_key_simple_priv2oct,
         ossl_ec_key_simple_oct2priv,
         0, /* set private */
@@ -139,8 +139,8 @@ int ossl_ec_GFp_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
 }
 
 int ossl_ec_GFp_simple_group_set_curve(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)
 {
     int ret = 0;
     BN_CTX *new_ctx = NULL;
@@ -191,14 +191,14 @@ int ossl_ec_GFp_simple_group_set_curve(EC_GROUP *group,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
 }
 
 int ossl_ec_GFp_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p,
-                                       BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
+    BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
 {
     int ret = 0;
     BN_CTX *new_ctx = NULL;
@@ -237,7 +237,7 @@ int ossl_ec_GFp_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_free(new_ctx);
     return ret;
 }
@@ -248,7 +248,7 @@ int ossl_ec_GFp_simple_group_get_degree(const EC_GROUP *group)
 }
 
 int ossl_ec_GFp_simple_group_check_discriminant(const EC_GROUP *group,
-                                                BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret = 0;
     BIGNUM *a, *b, *order, *tmp_1, *tmp_2;
@@ -313,7 +313,7 @@ int ossl_ec_GFp_simple_group_check_discriminant(const EC_GROUP *group,
     }
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
@@ -365,7 +365,7 @@ int ossl_ec_GFp_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
 }
 
 int ossl_ec_GFp_simple_point_set_to_infinity(const EC_GROUP *group,
-                                             EC_POINT *point)
+    EC_POINT *point)
 {
     point->Z_is_one = 0;
     BN_zero(point->Z);
@@ -373,11 +373,11 @@ int ossl_ec_GFp_simple_point_set_to_infinity(const EC_GROUP *group,
 }
 
 int ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
-                                                       EC_POINT *point,
-                                                       const BIGNUM *x,
-                                                       const BIGNUM *y,
-                                                       const BIGNUM *z,
-                                                       BN_CTX *ctx)
+    EC_POINT *point,
+    const BIGNUM *x,
+    const BIGNUM *y,
+    const BIGNUM *z,
+    BN_CTX *ctx)
 {
     BN_CTX *new_ctx = NULL;
     int ret = 0;
@@ -417,8 +417,7 @@ int ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
                 if (!group->meth->field_set_to_one(group, point->Z, ctx))
                     goto err;
             } else {
-                if (!group->
-                    meth->field_encode(group, point->Z, point->Z, ctx))
+                if (!group->meth->field_encode(group, point->Z, point->Z, ctx))
                     goto err;
             }
         }
@@ -427,15 +426,15 @@ int ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_free(new_ctx);
     return ret;
 }
 
 int ossl_ec_GFp_simple_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
-                                                       const EC_POINT *point,
-                                                       BIGNUM *x, BIGNUM *y,
-                                                       BIGNUM *z, BN_CTX *ctx)
+    const EC_POINT *point,
+    BIGNUM *x, BIGNUM *y,
+    BIGNUM *z, BN_CTX *ctx)
 {
     BN_CTX *new_ctx = NULL;
     int ret = 0;
@@ -476,15 +475,15 @@ int ossl_ec_GFp_simple_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_free(new_ctx);
     return ret;
 }
 
 int ossl_ec_GFp_simple_point_set_affine_coordinates(const EC_GROUP *group,
-                                                    EC_POINT *point,
-                                                    const BIGNUM *x,
-                                                    const BIGNUM *y, BN_CTX *ctx)
+    EC_POINT *point,
+    const BIGNUM *x,
+    const BIGNUM *y, BN_CTX *ctx)
 {
     if (x == NULL || y == NULL) {
         /*
@@ -495,13 +494,13 @@ int ossl_ec_GFp_simple_point_set_affine_coordinates(const EC_GROUP *group,
     }
 
     return EC_POINT_set_Jprojective_coordinates_GFp(group, point, x, y,
-                                                    BN_value_one(), ctx);
+        BN_value_one(), ctx);
 }
 
 int ossl_ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group,
-                                                    const EC_POINT *point,
-                                                    BIGNUM *x, BIGNUM *y,
-                                                    BN_CTX *ctx)
+    const EC_POINT *point,
+    BIGNUM *x, BIGNUM *y,
+    BN_CTX *ctx)
 {
     BN_CTX *new_ctx = NULL;
     BIGNUM *Z, *Z_1, *Z_2, *Z_3;
@@ -604,18 +603,18 @@ int ossl_ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
 }
 
 int ossl_ec_GFp_simple_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)
 {
-    int (*field_mul) (const EC_GROUP *, BIGNUM *, const BIGNUM *,
-                      const BIGNUM *, BN_CTX *);
-    int (*field_sqr) (const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
+    int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *,
+        const BIGNUM *, BN_CTX *);
+    int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
     const BIGNUM *p;
     BN_CTX *new_ctx = NULL;
     BIGNUM *n0, *n1, *n2, *n3, *n4, *n5, *n6;
@@ -774,7 +773,7 @@ int ossl_ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a
     if (!field_mul(group, n0, n0, n6, ctx))
         goto end;
     if (!field_mul(group, n5, n4, n5, ctx))
-        goto end;               /* now n5 is n5^3 */
+        goto end; /* now n5 is n5^3 */
     if (!field_mul(group, n1, n2, n5, ctx))
         goto end;
     if (!BN_mod_sub_quick(n0, n0, n1, p))
@@ -789,18 +788,18 @@ int ossl_ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a
 
     ret = 1;
 
- end:
+end:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
 }
 
 int ossl_ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
-                           BN_CTX *ctx)
+    BN_CTX *ctx)
 {
-    int (*field_mul) (const EC_GROUP *, BIGNUM *, const BIGNUM *,
-                      const BIGNUM *, BN_CTX *);
-    int (*field_sqr) (const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
+    int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *,
+        const BIGNUM *, BN_CTX *);
+    int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
     const BIGNUM *p;
     BN_CTX *new_ctx = NULL;
     BIGNUM *n0, *n1, *n2, *n3;
@@ -931,14 +930,14 @@ int ossl_ec_GFp_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
 }
 
 int ossl_ec_GFp_simple_invert(const EC_GROUP *group, EC_POINT *point,
-                              BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (EC_POINT_is_at_infinity(group, point) || BN_is_zero(point->Y))
         /* point is its own inverse */
@@ -948,17 +947,17 @@ int ossl_ec_GFp_simple_invert(const EC_GROUP *group, EC_POINT *point,
 }
 
 int ossl_ec_GFp_simple_is_at_infinity(const EC_GROUP *group,
-                                      const EC_POINT *point)
+    const EC_POINT *point)
 {
     return BN_is_zero(point->Z);
 }
 
 int ossl_ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
-                                   BN_CTX *ctx)
+    BN_CTX *ctx)
 {
-    int (*field_mul) (const EC_GROUP *, BIGNUM *, const BIGNUM *,
-                      const BIGNUM *, BN_CTX *);
-    int (*field_sqr) (const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
+    int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *,
+        const BIGNUM *, BN_CTX *);
+    int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
     const BIGNUM *p;
     BN_CTX *new_ctx = NULL;
     BIGNUM *rh, *tmp, *Z4, *Z6;
@@ -1050,14 +1049,14 @@ int ossl_ec_GFp_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
 
     ret = (0 == BN_ucmp(tmp, rh));
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
 }
 
 int ossl_ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
-                           const EC_POINT *b, BN_CTX *ctx)
+    const EC_POINT *b, BN_CTX *ctx)
 {
     /*-
      * return values:
@@ -1066,9 +1065,9 @@ int ossl_ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
      *   1   not equal
      */
 
-    int (*field_mul) (const EC_GROUP *, BIGNUM *, const BIGNUM *,
-                      const BIGNUM *, BN_CTX *);
-    int (*field_sqr) (const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
+    int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *,
+        const BIGNUM *, BN_CTX *);
+    int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
     BN_CTX *new_ctx = NULL;
     BIGNUM *tmp1, *tmp2, *Za23, *Zb23;
     const BIGNUM *tmp1_, *tmp2_;
@@ -1128,7 +1127,7 @@ int ossl_ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
 
     /* compare  X_a*Z_b^2  with  X_b*Z_a^2 */
     if (BN_cmp(tmp1_, tmp2_) != 0) {
-        ret = 1;                /* points differ */
+        ret = 1; /* points differ */
         goto end;
     }
 
@@ -1151,21 +1150,21 @@ int ossl_ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
 
     /* compare  Y_a*Z_b^3  with  Y_b*Z_a^3 */
     if (BN_cmp(tmp1_, tmp2_) != 0) {
-        ret = 1;                /* points differ */
+        ret = 1; /* points differ */
         goto end;
     }
 
     /* points are equal */
     ret = 0;
 
- end:
+end:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
 }
 
 int ossl_ec_GFp_simple_make_affine(const EC_GROUP *group, EC_POINT *point,
-                                   BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     BN_CTX *new_ctx = NULL;
     BIGNUM *x, *y;
@@ -1197,14 +1196,14 @@ int ossl_ec_GFp_simple_make_affine(const EC_GROUP *group, EC_POINT *point,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
 }
 
 int ossl_ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
-                                          EC_POINT *points[], BN_CTX *ctx)
+    EC_POINT *points[], BN_CTX *ctx)
 {
     BN_CTX *new_ctx = NULL;
     BIGNUM *tmp, *tmp_Z;
@@ -1256,9 +1255,8 @@ int ossl_ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
 
     for (i = 1; i < num; i++) {
         if (!BN_is_zero(points[i]->Z)) {
-            if (!group->
-                meth->field_mul(group, prod_Z[i], prod_Z[i - 1], points[i]->Z,
-                                ctx))
+            if (!group->meth->field_mul(group, prod_Z[i], prod_Z[i - 1], points[i]->Z,
+                    ctx))
                 goto err;
         } else {
             if (!BN_copy(prod_Z[i], prod_Z[i - 1]))
@@ -1297,8 +1295,7 @@ int ossl_ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
              * Set tmp_Z to the inverse of points[i]->Z (as product of Z
              * inverses 0 .. i, Z values 0 .. i - 1).
              */
-            if (!group->
-                meth->field_mul(group, tmp_Z, prod_Z[i - 1], tmp, ctx))
+            if (!group->meth->field_mul(group, tmp_Z, prod_Z[i - 1], tmp, ctx))
                 goto err;
             /*
              * Update tmp to satisfy the loop invariant for i - 1.
@@ -1348,7 +1345,7 @@ int ossl_ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     if (prod_Z != NULL) {
@@ -1363,13 +1360,13 @@ int ossl_ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
 }
 
 int ossl_ec_GFp_simple_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
-                                 const BIGNUM *b, BN_CTX *ctx)
+    const BIGNUM *b, BN_CTX *ctx)
 {
     return BN_mod_mul(r, a, b, group->field, ctx);
 }
 
 int ossl_ec_GFp_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
-                                 BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     return BN_mod_sqr(r, a, group->field, ctx);
 }
@@ -1381,14 +1378,14 @@ int ossl_ec_GFp_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM
  * NB: "a" must be in _decoded_ form. (i.e. field_decode must precede.)
  */
 int ossl_ec_GFp_simple_field_inv(const EC_GROUP *group, BIGNUM *r,
-                                 const BIGNUM *a, BN_CTX *ctx)
+    const BIGNUM *a, BN_CTX *ctx)
 {
     BIGNUM *e = NULL;
     BN_CTX *new_ctx = NULL;
     int ret = 0;
 
     if (ctx == NULL
-            && (ctx = new_ctx = BN_CTX_secure_new_ex(group->libctx)) == NULL)
+        && (ctx = new_ctx = BN_CTX_secure_new_ex(group->libctx)) == NULL)
         return 0;
 
     BN_CTX_start(ctx);
@@ -1397,7 +1394,7 @@ int ossl_ec_GFp_simple_field_inv(const EC_GROUP *group, BIGNUM *r,
 
     do {
         if (!BN_priv_rand_range_ex(e, group->field, 0, ctx))
-        goto err;
+            goto err;
     } while (BN_is_zero(e));
 
     /* r := a * e */
@@ -1414,7 +1411,7 @@ int ossl_ec_GFp_simple_field_inv(const EC_GROUP *group, BIGNUM *r,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(new_ctx);
     return ret;
@@ -1428,7 +1425,7 @@ int ossl_ec_GFp_simple_field_inv(const EC_GROUP *group, BIGNUM *r,
  *
  */
 int ossl_ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
-                                         BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret = 0;
     BIGNUM *lambda = NULL;
@@ -1459,7 +1456,7 @@ int ossl_ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
 
     /* if field_encode defined convert between representations */
     if ((group->meth->field_encode != NULL
-         && !group->meth->field_encode(group, lambda, lambda, ctx))
+            && !group->meth->field_encode(group, lambda, lambda, ctx))
         || !group->meth->field_mul(group, p->Z, p->Z, lambda, ctx)
         || !group->meth->field_sqr(group, temp, lambda, ctx)
         || !group->meth->field_mul(group, p->X, p->X, temp, ctx)
@@ -1470,7 +1467,7 @@ int ossl_ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
     p->Z_is_one = 0;
     ret = 1;
 
- end:
+end:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -1491,8 +1488,8 @@ int ossl_ec_GFp_simple_blind_coordinates(const EC_GROUP *group, EC_POINT *p,
  * for any non-zero \lambda that holds for projective (homogeneous) coords.
  */
 int ossl_ec_GFp_simple_ladder_pre(const EC_GROUP *group,
-                                  EC_POINT *r, EC_POINT *s,
-                                  EC_POINT *p, BN_CTX *ctx)
+    EC_POINT *r, EC_POINT *s,
+    EC_POINT *p, BN_CTX *ctx)
 {
     BIGNUM *t1, *t2, *t3, *t4, *t5 = NULL;
 
@@ -1561,8 +1558,8 @@ int ossl_ec_GFp_simple_ladder_pre(const EC_GROUP *group,
  * https://hyperelliptic.org/EFD/g1p/auto-shortw-xz.html#ladder-mladd-2002-it-4
  */
 int ossl_ec_GFp_simple_ladder_step(const EC_GROUP *group,
-                                   EC_POINT *r, EC_POINT *s,
-                                   EC_POINT *p, BN_CTX *ctx)
+    EC_POINT *r, EC_POINT *s,
+    EC_POINT *p, BN_CTX *ctx)
 {
     int ret = 0;
     BIGNUM *t0, *t1, *t2, *t3, *t4, *t5, *t6 = NULL;
@@ -1620,7 +1617,7 @@ int ossl_ec_GFp_simple_ladder_step(const EC_GROUP *group,
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -1649,8 +1646,8 @@ int ossl_ec_GFp_simple_ladder_step(const EC_GROUP *group,
  *    one of the BN_is_zero(...) branches.
  */
 int ossl_ec_GFp_simple_ladder_post(const EC_GROUP *group,
-                                   EC_POINT *r, EC_POINT *s,
-                                   EC_POINT *p, BN_CTX *ctx)
+    EC_POINT *r, EC_POINT *s,
+    EC_POINT *p, BN_CTX *ctx)
 {
     int ret = 0;
     BIGNUM *t0, *t1, *t2, *t3, *t4, *t5, *t6 = NULL;
@@ -1717,7 +1714,7 @@ int ossl_ec_GFp_simple_ladder_post(const EC_GROUP *group,
     r->Z_is_one = 1;
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
diff --git a/crypto/ec/ecx_backend.c b/crypto/ec/ecx_backend.c
index d21c037841aec..194dc2d7e3386 100644
--- a/crypto/ec/ecx_backend.c
+++ b/crypto/ec/ecx_backend.c
@@ -14,7 +14,7 @@
 #include <openssl/rand.h>
 #include <openssl/err.h>
 #ifndef FIPS_MODULE
-# include <openssl/x509.h>
+#include <openssl/x509.h>
 #endif
 #include "crypto/ecx.h"
 #include "ecx_backend.h"
@@ -33,7 +33,7 @@ int ossl_ecx_public_from_private(ECX_KEY *key)
         break;
     case ECX_KEY_TYPE_ED25519:
         if (!ossl_ed25519_public_from_private(key->libctx, key->pubkey,
-                                              key->privkey, key->propq)) {
+                key->privkey, key->propq)) {
             ERR_raise(ERR_LIB_EC, EC_R_FAILED_MAKING_PUBLIC_KEY);
             return 0;
         }
@@ -43,7 +43,7 @@ int ossl_ecx_public_from_private(ECX_KEY *key)
         break;
     case ECX_KEY_TYPE_ED448:
         if (!ossl_ed448_public_from_private(key->libctx, key->pubkey,
-                                            key->privkey, key->propq)) {
+                key->privkey, key->propq)) {
             ERR_raise(ERR_LIB_EC, EC_R_FAILED_MAKING_PUBLIC_KEY);
             return 0;
         }
@@ -53,7 +53,7 @@ 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)
 {
     size_t privkeylen = 0, pubkeylen = 0;
     const OSSL_PARAM *param_priv_key = NULL, *param_pub_key;
@@ -64,16 +64,15 @@ int ossl_ecx_key_fromdata(ECX_KEY *ecx, const OSSL_PARAM params[],
 
     param_pub_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
     if (include_private)
-        param_priv_key =
-            OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
+        param_priv_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
 
     if (param_pub_key == NULL && param_priv_key == NULL)
         return 0;
 
     if (param_priv_key != NULL) {
         if (!OSSL_PARAM_get_octet_string(param_priv_key,
-                                         (void **)&ecx->privkey, ecx->keylen,
-                                         &privkeylen))
+                (void **)&ecx->privkey, ecx->keylen,
+                &privkeylen))
             return 0;
         if (privkeylen != ecx->keylen) {
             /*
@@ -87,12 +86,11 @@ int ossl_ecx_key_fromdata(ECX_KEY *ecx, const OSSL_PARAM params[],
         }
     }
 
-
     pubkey = ecx->pubkey;
     if (param_pub_key != NULL
         && !OSSL_PARAM_get_octet_string(param_pub_key,
-                                        (void **)&pubkey,
-                                         sizeof(ecx->pubkey), &pubkeylen))
+            (void **)&pubkey,
+            sizeof(ecx->pubkey), &pubkeylen))
         return 0;
 
     if ((param_pub_key != NULL && pubkeylen != ecx->keylen))
@@ -152,9 +150,9 @@ ECX_KEY *ossl_ecx_key_dup(const ECX_KEY *key, int selection)
 
 #ifndef FIPS_MODULE
 ECX_KEY *ossl_ecx_key_op(const X509_ALGOR *palg,
-                         const unsigned char *p, int plen,
-                         int id, ecx_key_op_t op,
-                         OSSL_LIB_CTX *libctx, const char *propq)
+    const unsigned char *p, int plen,
+    int id, ecx_key_op_t op,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     ECX_KEY *key = NULL;
     unsigned char *privkey, *pubkey;
@@ -221,13 +219,13 @@ ECX_KEY *ossl_ecx_key_op(const X509_ALGOR *palg,
     }
 
     return key;
- err:
+err:
     ossl_ecx_key_free(key);
     return NULL;
 }
 
 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 *ecx = NULL;
     const unsigned char *p;
@@ -252,7 +250,7 @@ ECX_KEY *ossl_ecx_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
      * on its own.
      */
     ecx = ossl_ecx_key_op(palg, p, plen, EVP_PKEY_NONE, KEY_OP_PRIVATE,
-                          libctx, propq);
+        libctx, propq);
     ASN1_OCTET_STRING_free(oct);
     return ecx;
 }
diff --git a/crypto/ec/ecx_backend.h b/crypto/ec/ecx_backend.h
index 2c01294789b3f..d3d889c3a5762 100644
--- a/crypto/ec/ecx_backend.h
+++ b/crypto/ec/ecx_backend.h
@@ -7,14 +7,14 @@
  * https://www.openssl.org/source/license.html
  */
 
-#define ISX448(id)      ((id) == EVP_PKEY_X448)
-#define IS25519(id)     ((id) == EVP_PKEY_X25519 || (id) == EVP_PKEY_ED25519)
-#define KEYLENID(id)    (IS25519(id) ? X25519_KEYLEN \
-                                     : ((id) == EVP_PKEY_X448 ? X448_KEYLEN \
-                                                              : ED448_KEYLEN))
-#define KEYNID2TYPE(id) \
-    (IS25519(id) ? ((id) == EVP_PKEY_X25519 ? ECX_KEY_TYPE_X25519 \
+#define ISX448(id) ((id) == EVP_PKEY_X448)
+#define IS25519(id) ((id) == EVP_PKEY_X25519 || (id) == EVP_PKEY_ED25519)
+#define KEYLENID(id) (IS25519(id) ? X25519_KEYLEN                        \
+                                  : ((id) == EVP_PKEY_X448 ? X448_KEYLEN \
+                                                           : ED448_KEYLEN))
+#define KEYNID2TYPE(id)                                             \
+    (IS25519(id) ? ((id) == EVP_PKEY_X25519 ? ECX_KEY_TYPE_X25519   \
                                             : ECX_KEY_TYPE_ED25519) \
-                 : ((id) == EVP_PKEY_X448 ? ECX_KEY_TYPE_X448 \
+                 : ((id) == EVP_PKEY_X448 ? ECX_KEY_TYPE_X448       \
                                           : ECX_KEY_TYPE_ED448))
-#define KEYLEN(p)       KEYLENID((p)->ameth->pkey_id)
+#define KEYLEN(p) KEYLENID((p)->ameth->pkey_id)
diff --git a/crypto/ec/ecx_key.c b/crypto/ec/ecx_key.c
index 7b094949126f6..2fed62c361008 100644
--- a/crypto/ec/ecx_key.c
+++ b/crypto/ec/ecx_key.c
@@ -14,11 +14,11 @@
 #include "internal/common.h" /* for ossl_assert() */
 
 #ifdef S390X_EC_ASM
-# include "s390x_arch.h"
+#include "s390x_arch.h"
 #endif
 
 ECX_KEY *ossl_ecx_key_new(OSSL_LIB_CTX *libctx, ECX_KEY_TYPE type, int haspubkey,
-                          const char *propq)
+    const char *propq)
 {
     ECX_KEY *ret = OPENSSL_zalloc(sizeof(*ret));
 
@@ -108,11 +108,11 @@ unsigned char *ossl_ecx_key_allocate_privkey(ECX_KEY *key)
 }
 
 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)
 {
     if (priv == NULL
-            || priv->privkey == NULL
-            || peer == NULL) {
+        || priv->privkey == NULL
+        || peer == NULL) {
         ERR_raise(ERR_LIB_PROV, PROV_R_MISSING_KEY);
         return 0;
     }
@@ -135,28 +135,28 @@ int ossl_ecx_compute_key(ECX_KEY *peer, ECX_KEY *priv, size_t keylen,
     if (keylen == X25519_KEYLEN) {
 #ifdef S390X_EC_ASM
         if (OPENSSL_s390xcap_P.pcc[1]
-                & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519)) {
+            & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519)) {
             if (s390x_x25519_mul(secret, peer->pubkey, priv->privkey) == 0) {
                 ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_DURING_DERIVATION);
                 return 0;
             }
         } else
 #endif
-        if (ossl_x25519(secret, priv->privkey, peer->pubkey) == 0) {
+            if (ossl_x25519(secret, priv->privkey, peer->pubkey) == 0) {
             ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_DURING_DERIVATION);
             return 0;
         }
     } else {
 #ifdef S390X_EC_ASM
         if (OPENSSL_s390xcap_P.pcc[1]
-                & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448)) {
+            & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448)) {
             if (s390x_x448_mul(secret, peer->pubkey, priv->privkey) == 0) {
                 ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_DURING_DERIVATION);
                 return 0;
             }
         } else
 #endif
-        if (ossl_x448(secret, priv->privkey, peer->pubkey) == 0) {
+            if (ossl_x448(secret, priv->privkey, peer->pubkey) == 0) {
             ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_DURING_DERIVATION);
             return 0;
         }
diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c
index 6c445f9121b6f..bc5cb0ed147d4 100644
--- a/crypto/ec/ecx_meth.c
+++ b/crypto/ec/ecx_meth.c
@@ -43,7 +43,7 @@ static int ecx_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
         return 0;
 
     if (!X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),
-                                V_ASN1_UNDEF, NULL, penc, KEYLEN(pkey))) {
+            V_ASN1_UNDEF, NULL, penc, KEYLEN(pkey))) {
         OPENSSL_free(penc);
         ERR_raise(ERR_LIB_EC, ERR_R_X509_LIB);
         return 0;
@@ -62,7 +62,7 @@ static int ecx_pub_decode(EVP_PKEY *pkey, const X509_PUBKEY *pubkey)
     if (!X509_PUBKEY_get0_param(NULL, &p, &pklen, &palg, pubkey))
         return 0;
     ecx = ossl_ecx_key_op(palg, p, pklen, pkey->ameth->pkey_id,
-                          KEY_OP_PUBLIC, NULL, NULL);
+        KEY_OP_PUBLIC, NULL, NULL);
     if (ecx != NULL) {
         ret = 1;
         EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, ecx);
@@ -82,7 +82,7 @@ static int ecx_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
 }
 
 static int ecx_priv_decode_ex(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8,
-                              OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     int ret = 0;
     ECX_KEY *ecx = ossl_ecx_key_from_pkcs8(p8, libctx, propq);
@@ -118,7 +118,7 @@ static int ecx_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     }
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(pkey->ameth->pkey_id), 0,
-                         V_ASN1_UNDEF, NULL, penc, penclen)) {
+            V_ASN1_UNDEF, NULL, penc, penclen)) {
         OPENSSL_clear_free(penc, penclen);
         ERR_raise(ERR_LIB_EC, ERR_R_ASN1_LIB);
         return 0;
@@ -164,7 +164,7 @@ static int ecx_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
 }
 
 static int ecx_key_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                         ASN1_PCTX *ctx, ecx_key_op_t op)
+    ASN1_PCTX *ctx, ecx_key_op_t op)
 {
     const ECX_KEY *ecxkey = pkey->pkey.ecx;
     const char *nm = OBJ_nid2ln(pkey->ameth->pkey_id);
@@ -180,7 +180,8 @@ static int ecx_key_print(BIO *bp, const EVP_PKEY *pkey, int indent,
         if (BIO_printf(bp, "%*spriv:\n", indent, "") <= 0)
             return 0;
         if (ASN1_buf_print(bp, ecxkey->privkey, KEYLEN(pkey),
-                           indent + 4) == 0)
+                indent + 4)
+            == 0)
             return 0;
     } else {
         if (ecxkey == NULL) {
@@ -195,19 +196,20 @@ static int ecx_key_print(BIO *bp, const EVP_PKEY *pkey, int indent,
         return 0;
 
     if (ASN1_buf_print(bp, ecxkey->pubkey, KEYLEN(pkey),
-                       indent + 4) == 0)
+            indent + 4)
+        == 0)
         return 0;
     return 1;
 }
 
 static int ecx_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                          ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return ecx_key_print(bp, pkey, indent, ctx, KEY_OP_PRIVATE);
 }
 
 static int ecx_pub_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                         ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return ecx_key_print(bp, pkey, indent, ctx, KEY_OP_PUBLIC);
 }
@@ -218,7 +220,7 @@ static int ecx_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
 
     case ASN1_PKEY_CTRL_SET1_TLS_ENCPT: {
         ECX_KEY *ecx = ossl_ecx_key_op(NULL, arg2, arg1, pkey->ameth->pkey_id,
-                                       KEY_OP_PUBLIC, NULL, NULL);
+            KEY_OP_PUBLIC, NULL, NULL);
 
         if (ecx != NULL) {
             EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, ecx);
@@ -238,7 +240,6 @@ static int ecx_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
 
     default:
         return -2;
-
     }
 }
 
@@ -252,12 +253,11 @@ static int ecd_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
 
     default:
         return -2;
-
     }
 }
 
 static int ecx_set_priv_key(EVP_PKEY *pkey, const unsigned char *priv,
-                            size_t len)
+    size_t len)
 {
     OSSL_LIB_CTX *libctx = NULL;
     ECX_KEY *ecx = NULL;
@@ -266,7 +266,7 @@ static int ecx_set_priv_key(EVP_PKEY *pkey, const unsigned char *priv,
         libctx = ossl_provider_libctx(EVP_KEYMGMT_get0_provider(pkey->keymgmt));
 
     ecx = ossl_ecx_key_op(NULL, priv, len, pkey->ameth->pkey_id,
-                          KEY_OP_PRIVATE, libctx, NULL);
+        KEY_OP_PRIVATE, libctx, NULL);
 
     if (ecx != NULL) {
         EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, ecx);
@@ -284,7 +284,7 @@ static int ecx_set_pub_key(EVP_PKEY *pkey, const unsigned char *pub, size_t len)
         libctx = ossl_provider_libctx(EVP_KEYMGMT_get0_provider(pkey->keymgmt));
 
     ecx = ossl_ecx_key_op(NULL, pub, len, pkey->ameth->pkey_id,
-                          KEY_OP_PUBLIC, libctx, NULL);
+        KEY_OP_PUBLIC, libctx, NULL);
 
     if (ecx != NULL) {
         EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, ecx);
@@ -294,7 +294,7 @@ static int ecx_set_pub_key(EVP_PKEY *pkey, const unsigned char *pub, size_t len)
 }
 
 static int ecx_get_priv_key(const EVP_PKEY *pkey, unsigned char *priv,
-                            size_t *len)
+    size_t *len)
 {
     const ECX_KEY *key = pkey->pkey.ecx;
 
@@ -304,8 +304,8 @@ static int ecx_get_priv_key(const EVP_PKEY *pkey, unsigned char *priv,
     }
 
     if (key == NULL
-            || key->privkey == NULL
-            || *len < (size_t)KEYLENID(pkey->ameth->pkey_id))
+        || key->privkey == NULL
+        || *len < (size_t)KEYLENID(pkey->ameth->pkey_id))
         return 0;
 
     *len = KEYLENID(pkey->ameth->pkey_id);
@@ -315,7 +315,7 @@ static int ecx_get_priv_key(const EVP_PKEY *pkey, unsigned char *priv,
 }
 
 static int ecx_get_pub_key(const EVP_PKEY *pkey, unsigned char *pub,
-                           size_t *len)
+    size_t *len)
 {
     const ECX_KEY *key = pkey->pkey.ecx;
 
@@ -325,7 +325,7 @@ static int ecx_get_pub_key(const EVP_PKEY *pkey, unsigned char *pub,
     }
 
     if (key == NULL
-            || *len < (size_t)KEYLENID(pkey->ameth->pkey_id))
+        || *len < (size_t)KEYLENID(pkey->ameth->pkey_id))
         return 0;
 
     *len = KEYLENID(pkey->ameth->pkey_id);
@@ -344,8 +344,8 @@ static size_t ecx_pkey_dirty_cnt(const EVP_PKEY *pkey)
 }
 
 static int ecx_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
-                              OSSL_FUNC_keymgmt_import_fn *importer,
-                              OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_FUNC_keymgmt_import_fn *importer,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     const ECX_KEY *key = from->pkey.ecx;
     OSSL_PARAM_BLD *tmpl = OSSL_PARAM_BLD_new();
@@ -358,14 +358,14 @@ static int ecx_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
 
     /* A key must at least have a public part */
     if (!OSSL_PARAM_BLD_push_octet_string(tmpl, OSSL_PKEY_PARAM_PUB_KEY,
-                                          key->pubkey, key->keylen))
+            key->pubkey, key->keylen))
         goto err;
     selection |= OSSL_KEYMGMT_SELECT_PUBLIC_KEY;
 
     if (key->privkey != NULL) {
         if (!OSSL_PARAM_BLD_push_octet_string(tmpl,
-                                              OSSL_PKEY_PARAM_PRIV_KEY,
-                                              key->privkey, key->keylen))
+                OSSL_PKEY_PARAM_PRIV_KEY,
+                key->privkey, key->keylen))
             goto err;
         selection |= OSSL_KEYMGMT_SELECT_PRIVATE_KEY;
     }
@@ -375,19 +375,19 @@ static int ecx_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
     /* We export, the provider imports */
     rv = importer(to_keydata, selection, params);
 
- err:
+err:
     OSSL_PARAM_BLD_free(tmpl);
     OSSL_PARAM_free(params);
     return rv;
 }
 
 static int ecx_generic_import_from(const OSSL_PARAM params[], void *vpctx,
-                                   int keytype)
+    int keytype)
 {
     EVP_PKEY_CTX *pctx = vpctx;
     EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(pctx);
     ECX_KEY *ecx = ossl_ecx_key_new(pctx->libctx, KEYNID2TYPE(keytype), 0,
-                                    pctx->propquery);
+        pctx->propquery);
 
     if (ecx == NULL) {
         ERR_raise(ERR_LIB_DH, ERR_R_EC_LIB);
@@ -538,8 +538,8 @@ static int ecd_size448(const EVP_PKEY *pkey)
 }
 
 static int ecd_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it,
-                           const void *asn, const X509_ALGOR *sigalg,
-                           const ASN1_BIT_STRING *str, EVP_PKEY *pkey)
+    const void *asn, const X509_ALGOR *sigalg,
+    const ASN1_BIT_STRING *str, EVP_PKEY *pkey)
 {
     const ASN1_OBJECT *obj;
     int ptype;
@@ -571,34 +571,34 @@ static int ecd_item_sign(X509_ALGOR *alg1, X509_ALGOR *alg2, int nid)
 }
 
 static int ecd_item_sign25519(EVP_MD_CTX *ctx, const ASN1_ITEM *it,
-                              const void *asn,
-                              X509_ALGOR *alg1, X509_ALGOR *alg2,
-                              ASN1_BIT_STRING *str)
+    const void *asn,
+    X509_ALGOR *alg1, X509_ALGOR *alg2,
+    ASN1_BIT_STRING *str)
 {
     return ecd_item_sign(alg1, alg2, NID_ED25519);
 }
 
 static int ecd_sig_info_set25519(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
-                                 const ASN1_STRING *sig)
+    const ASN1_STRING *sig)
 {
     X509_SIG_INFO_set(siginf, NID_undef, NID_ED25519, X25519_SECURITY_BITS,
-                      X509_SIG_INFO_TLS);
+        X509_SIG_INFO_TLS);
     return 1;
 }
 
 static int ecd_item_sign448(EVP_MD_CTX *ctx, const ASN1_ITEM *it,
-                            const void *asn,
-                            X509_ALGOR *alg1, X509_ALGOR *alg2,
-                            ASN1_BIT_STRING *str)
+    const void *asn,
+    X509_ALGOR *alg1, X509_ALGOR *alg2,
+    ASN1_BIT_STRING *str)
 {
     return ecd_item_sign(alg1, alg2, NID_ED448);
 }
 
 static int ecd_sig_info_set448(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
-                               const ASN1_STRING *sig)
+    const ASN1_STRING *sig)
 {
     X509_SIG_INFO_set(siginf, NID_undef, NID_ED448, X448_SECURITY_BITS,
-                      X509_SIG_INFO_TLS);
+        X509_SIG_INFO_TLS);
     return 1;
 }
 
@@ -711,7 +711,7 @@ const EVP_PKEY_ASN1_METHOD ossl_ed448_asn1_meth = {
 static int pkey_ecx_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
 {
     ECX_KEY *ecx = ossl_ecx_key_op(NULL, NULL, 0, ctx->pmeth->pkey_id,
-                                   KEY_OP_KEYGEN, NULL, NULL);
+        KEY_OP_KEYGEN, NULL, NULL);
 
     if (ecx != NULL) {
         EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, ecx);
@@ -721,9 +721,9 @@ static int pkey_ecx_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
 }
 
 static int validate_ecx_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
-                                          size_t *keylen,
-                                          const unsigned char **privkey,
-                                          const unsigned char **pubkey)
+    size_t *keylen,
+    const unsigned char **privkey,
+    const unsigned char **pubkey)
 {
     const ECX_KEY *ecxkey, *peerkey;
 
@@ -748,26 +748,26 @@ static int validate_ecx_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
 }
 
 static int pkey_ecx_derive25519(EVP_PKEY_CTX *ctx, unsigned char *key,
-                                size_t *keylen)
+    size_t *keylen)
 {
     const unsigned char *privkey, *pubkey;
 
     if (!validate_ecx_derive(ctx, key, keylen, &privkey, &pubkey)
-            || (key != NULL
-                && ossl_x25519(key, privkey, pubkey) == 0))
+        || (key != NULL
+            && ossl_x25519(key, privkey, pubkey) == 0))
         return 0;
     *keylen = X25519_KEYLEN;
     return 1;
 }
 
 static int pkey_ecx_derive448(EVP_PKEY_CTX *ctx, unsigned char *key,
-                              size_t *keylen)
+    size_t *keylen)
 {
     const unsigned char *privkey, *pubkey;
 
     if (!validate_ecx_derive(ctx, key, keylen, &privkey, &pubkey)
-            || (key != NULL
-                && ossl_x448(key, privkey, pubkey) == 0))
+        || (key != NULL
+            && ossl_x448(key, privkey, pubkey) == 0))
         return 0;
     *keylen = X448_KEYLEN;
     return 1;
@@ -802,8 +802,8 @@ static const EVP_PKEY_METHOD ecx448_pkey_meth = {
 };
 
 static int pkey_ecd_digestsign25519(EVP_MD_CTX *ctx, unsigned char *sig,
-                                    size_t *siglen, const unsigned char *tbs,
-                                    size_t tbslen)
+    size_t *siglen, const unsigned char *tbs,
+    size_t tbslen)
 {
     const ECX_KEY *edkey = evp_pkey_get_legacy(EVP_MD_CTX_get_pkey_ctx(ctx)->pkey);
 
@@ -822,17 +822,18 @@ static int pkey_ecd_digestsign25519(EVP_MD_CTX *ctx, unsigned char *sig,
     }
 
     if (ossl_ed25519_sign(sig, tbs, tbslen, edkey->pubkey, edkey->privkey,
-                          0, 0, 0,
-                          NULL, 0,
-                          NULL, NULL) == 0)
+            0, 0, 0,
+            NULL, 0,
+            NULL, NULL)
+        == 0)
         return 0;
     *siglen = ED25519_SIGSIZE;
     return 1;
 }
 
 static int pkey_ecd_digestsign448(EVP_MD_CTX *ctx, unsigned char *sig,
-                                  size_t *siglen, const unsigned char *tbs,
-                                  size_t tbslen)
+    size_t *siglen, const unsigned char *tbs,
+    size_t tbslen)
 {
     const ECX_KEY *edkey = evp_pkey_get_legacy(EVP_MD_CTX_get_pkey_ctx(ctx)->pkey);
 
@@ -851,15 +852,16 @@ static int pkey_ecd_digestsign448(EVP_MD_CTX *ctx, unsigned char *sig,
     }
 
     if (ossl_ed448_sign(edkey->libctx, sig, tbs, tbslen, edkey->pubkey,
-                        edkey->privkey, NULL, 0, 0, edkey->propq) == 0)
+            edkey->privkey, NULL, 0, 0, edkey->propq)
+        == 0)
         return 0;
     *siglen = ED448_SIGSIZE;
     return 1;
 }
 
 static int pkey_ecd_digestverify25519(EVP_MD_CTX *ctx, const unsigned char *sig,
-                                      size_t siglen, const unsigned char *tbs,
-                                      size_t tbslen)
+    size_t siglen, const unsigned char *tbs,
+    size_t tbslen)
 {
     const ECX_KEY *edkey = evp_pkey_get_legacy(EVP_MD_CTX_get_pkey_ctx(ctx)->pkey);
 
@@ -872,14 +874,14 @@ static int pkey_ecd_digestverify25519(EVP_MD_CTX *ctx, const unsigned char *sig,
         return 0;
 
     return ossl_ed25519_verify(tbs, tbslen, sig, edkey->pubkey,
-                               0, 0, 0,
-                               NULL, 0,
-                               edkey->libctx, edkey->propq);
+        0, 0, 0,
+        NULL, 0,
+        edkey->libctx, edkey->propq);
 }
 
 static int pkey_ecd_digestverify448(EVP_MD_CTX *ctx, const unsigned char *sig,
-                                    size_t siglen, const unsigned char *tbs,
-                                    size_t tbslen)
+    size_t siglen, const unsigned char *tbs,
+    size_t tbslen)
 {
     const ECX_KEY *edkey = evp_pkey_get_legacy(EVP_MD_CTX_get_pkey_ctx(ctx)->pkey);
 
@@ -892,7 +894,7 @@ static int pkey_ecd_digestverify448(EVP_MD_CTX *ctx, const unsigned char *sig,
         return 0;
 
     return ossl_ed448_verify(edkey->libctx, tbs, tbslen, sig, edkey->pubkey,
-                             NULL, 0, 0, edkey->propq);
+        NULL, 0, 0, edkey->propq);
 }
 
 static int pkey_ecd_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
@@ -934,7 +936,7 @@ static const EVP_PKEY_METHOD ed448_pkey_meth = {
 };
 
 #ifdef S390X_EC_ASM
-# include "s390x_arch.h"
+#include "s390x_arch.h"
 
 static int s390x_pkey_ecx_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
 {
@@ -944,7 +946,7 @@ static int s390x_pkey_ecx_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     };
     ECX_KEY *key = ossl_ecx_key_new(ctx->libctx, ECX_KEY_TYPE_X25519, 1,
-                                    ctx->propquery);
+        ctx->propquery);
     unsigned char *privkey = NULL, *pubkey;
 
     if (key == NULL) {
@@ -972,7 +974,7 @@ static int s390x_pkey_ecx_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
 
     EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, key);
     return 1;
- err:
+err:
     ossl_ecx_key_free(key);
     return 0;
 }
@@ -987,7 +989,7 @@ static int s390x_pkey_ecx_keygen448(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     };
     ECX_KEY *key = ossl_ecx_key_new(ctx->libctx, ECX_KEY_TYPE_X448, 1,
-                                    ctx->propquery);
+        ctx->propquery);
     unsigned char *privkey = NULL, *pubkey;
 
     if (key == NULL) {
@@ -1014,7 +1016,7 @@ static int s390x_pkey_ecx_keygen448(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
 
     EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, key);
     return 1;
- err:
+err:
     ossl_ecx_key_free(key);
     return 0;
 }
@@ -1027,13 +1029,42 @@ static int s390x_pkey_ecd_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
         0xfe, 0x53, 0x6e, 0xcd, 0xd3, 0x36, 0x69, 0x21
     };
     static const unsigned char generator_y[] = {
-        0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-        0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-        0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+        0x58,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
     };
     unsigned char x_dst[32], buff[SHA512_DIGEST_LENGTH];
     ECX_KEY *key = ossl_ecx_key_new(ctx->libctx, ECX_KEY_TYPE_ED25519, 1,
-                                    ctx->propquery);
+        ctx->propquery);
     unsigned char *privkey = NULL, *pubkey;
     unsigned int sz;
     EVP_MD *md = NULL;
@@ -1069,14 +1100,15 @@ static int s390x_pkey_ecd_keygen25519(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
     buff[31] |= 64;
 
     if (s390x_ed25519_mul(x_dst, pubkey,
-                          generator_x, generator_y, buff) != 1)
+            generator_x, generator_y, buff)
+        != 1)
         goto err;
 
     pubkey[31] |= ((x_dst[0] & 0x01) << 7);
 
     EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, key);
     return 1;
- err:
+err:
     ossl_ecx_key_free(key);
     return 0;
 }
@@ -1099,7 +1131,7 @@ static int s390x_pkey_ecd_keygen448(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
     };
     unsigned char x_dst[57], buff[114];
     ECX_KEY *key = ossl_ecx_key_new(ctx->libctx, ECX_KEY_TYPE_ED448, 1,
-                                    ctx->propquery);
+        ctx->propquery);
     unsigned char *privkey = NULL, *pubkey;
     EVP_MD_CTX *hashctx = NULL;
     EVP_MD *md = NULL;
@@ -1144,7 +1176,8 @@ static int s390x_pkey_ecd_keygen448(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
     buff[56] = 0;
 
     if (s390x_ed448_mul(x_dst, pubkey,
-                        generator_x, generator_y, buff) != 1)
+            generator_x, generator_y, buff)
+        != 1)
         goto err;
 
     pubkey[56] |= ((x_dst[0] & 0x01) << 7);
@@ -1152,14 +1185,14 @@ static int s390x_pkey_ecd_keygen448(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
     EVP_PKEY_assign(pkey, ctx->pmeth->pkey_id, key);
     EVP_MD_CTX_free(hashctx);
     return 1;
- err:
+err:
     ossl_ecx_key_free(key);
     EVP_MD_CTX_free(hashctx);
     return 0;
 }
 
 static int s390x_pkey_ecx_derive25519(EVP_PKEY_CTX *ctx, unsigned char *key,
-                                      size_t *keylen)
+    size_t *keylen)
 {
     const unsigned char *privkey, *pubkey;
 
@@ -1172,7 +1205,7 @@ static int s390x_pkey_ecx_derive25519(EVP_PKEY_CTX *ctx, unsigned char *key,
 }
 
 static int s390x_pkey_ecx_derive448(EVP_PKEY_CTX *ctx, unsigned char *key,
-                                      size_t *keylen)
+    size_t *keylen)
 {
     const unsigned char *privkey, *pubkey;
 
@@ -1185,9 +1218,9 @@ static int s390x_pkey_ecx_derive448(EVP_PKEY_CTX *ctx, unsigned char *key,
 }
 
 static int s390x_pkey_ecd_digestsign25519(EVP_MD_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)
 {
     union {
         struct {
@@ -1230,9 +1263,9 @@ static int s390x_pkey_ecd_digestsign25519(EVP_MD_CTX *ctx,
 }
 
 static int s390x_pkey_ecd_digestsign448(EVP_MD_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)
 {
     union {
         struct {
@@ -1277,10 +1310,10 @@ static int s390x_pkey_ecd_digestsign448(EVP_MD_CTX *ctx,
 }
 
 static int s390x_pkey_ecd_digestverify25519(EVP_MD_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)
 {
     union {
         struct {
@@ -1305,14 +1338,17 @@ static int s390x_pkey_ecd_digestverify25519(EVP_MD_CTX *ctx,
     s390x_flip_endian32(param.ed25519.pub, edkey->pubkey);
 
     return s390x_kdsa(S390X_EDDSA_VERIFY_ED25519,
-                      &param.ed25519, tbs, tbslen) == 0 ? 1 : 0;
+               &param.ed25519, tbs, tbslen)
+            == 0
+        ? 1
+        : 0;
 }
 
 static int s390x_pkey_ecd_digestverify448(EVP_MD_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)
 {
     union {
         struct {
@@ -1340,7 +1376,10 @@ static int s390x_pkey_ecd_digestverify448(EVP_MD_CTX *ctx,
     s390x_flip_endian64(param.ed448.pub, param.ed448.pub);
 
     return s390x_kdsa(S390X_EDDSA_VERIFY_ED448,
-                      &param.ed448, tbs, tbslen) == 0 ? 1 : 0;
+               &param.ed448, tbs, tbslen)
+            == 0
+        ? 1
+        : 0;
 }
 
 static const EVP_PKEY_METHOD ecx25519_s390x_pkey_meth = {
diff --git a/crypto/ec/ecx_s390x.c b/crypto/ec/ecx_s390x.c
index d424d6252dcff..4b9514084aec2 100644
--- a/crypto/ec/ecx_s390x.c
+++ b/crypto/ec/ecx_s390x.c
@@ -39,7 +39,7 @@ static void s390x_x25519_mod_p(unsigned char u[32])
     c = (u_red[0] & 0x80) >> 7;
     u_red[0] &= 0x7f;
     constant_time_cond_swap_buff(0 - (unsigned char)c,
-                                 u, u_red, sizeof(u_red));
+        u, u_red, sizeof(u_red));
 }
 
 static void s390x_x448_mod_p(unsigned char u[56])
@@ -71,12 +71,12 @@ static void s390x_x448_mod_p(unsigned char u[56])
     }
 
     constant_time_cond_swap_buff(0 - (unsigned char)c,
-                                 u, u_red, sizeof(u_red));
+        u, u_red, sizeof(u_red));
 }
 
 int s390x_x25519_mul(unsigned char u_dst[32],
-                     const unsigned char u_src[32],
-                     const unsigned char d_src[32])
+    const unsigned char u_src[32],
+    const unsigned char d_src[32])
 {
     union {
         struct {
@@ -108,8 +108,8 @@ int s390x_x25519_mul(unsigned char u_dst[32],
 }
 
 int s390x_x448_mul(unsigned char u_dst[56],
-                   const unsigned char u_src[56],
-                   const unsigned char d_src[56])
+    const unsigned char u_src[56],
+    const unsigned char d_src[56])
 {
     union {
         struct {
@@ -144,10 +144,10 @@ int s390x_x448_mul(unsigned char u_dst[56],
 }
 
 int s390x_ed25519_mul(unsigned char x_dst[32],
-                      unsigned char y_dst[32],
-                      const unsigned char x_src[32],
-                      const unsigned char y_src[32],
-                      const unsigned char d_src[32])
+    unsigned char y_dst[32],
+    const unsigned char x_src[32],
+    const unsigned char y_src[32],
+    const unsigned char d_src[32])
 {
     union {
         struct {
@@ -178,10 +178,10 @@ int s390x_ed25519_mul(unsigned char x_dst[32],
 }
 
 int s390x_ed448_mul(unsigned char x_dst[57],
-                    unsigned char y_dst[57],
-                    const unsigned char x_src[57],
-                    const unsigned char y_src[57],
-                    const unsigned char d_src[57])
+    unsigned char y_dst[57],
+    const unsigned char x_src[57],
+    const unsigned char y_src[57],
+    const unsigned char d_src[57])
 {
     union {
         struct {
diff --git a/crypto/encode_decode/decoder_err.c b/crypto/encode_decode/decoder_err.c
index 88324a1d50788..9e6556a1467d3 100644
--- a/crypto/encode_decode/decoder_err.c
+++ b/crypto/encode_decode/decoder_err.c
@@ -15,13 +15,13 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA OSSL_DECODER_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_COULD_NOT_DECODE_OBJECT),
-    "could not decode object"},
-    {ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_DECODER_NOT_FOUND),
-    "decoder not found"},
-    {ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_MISSING_GET_PARAMS),
-    "missing get params"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_COULD_NOT_DECODE_OBJECT),
+        "could not decode object" },
+    { ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_DECODER_NOT_FOUND),
+        "decoder not found" },
+    { ERR_PACK(ERR_LIB_OSSL_DECODER, 0, OSSL_DECODER_R_MISSING_GET_PARAMS),
+        "missing get params" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/encode_decode/decoder_lib.c b/crypto/encode_decode/decoder_lib.c
index ffcf3cde11558..c0b32d7d9c426 100644
--- a/crypto/encode_decode/decoder_lib.c
+++ b/crypto/encode_decode/decoder_lib.c
@@ -58,9 +58,9 @@ int OSSL_DECODER_from_bio(OSSL_DECODER_CTX *ctx, BIO *in)
 
     if (OSSL_DECODER_CTX_get_num_decoders(ctx) == 0) {
         ERR_raise_data(ERR_LIB_OSSL_DECODER, OSSL_DECODER_R_DECODER_NOT_FOUND,
-                       "No decoders were found. For standard decoders you need "
-                       "at least one of the default or base providers "
-                       "available. Did you forget to load them?");
+            "No decoders were found. For standard decoders you need "
+            "at least one of the default or base providers "
+            "available. Did you forget to load them?");
         return 0;
     }
 
@@ -84,14 +84,16 @@ int OSSL_DECODER_from_bio(OSSL_DECODER_CTX *ctx, BIO *in)
     if (!data.flag_construct_called) {
         const char *spaces
             = ctx->start_input_type != NULL && ctx->input_structure != NULL
-            ? " " : "";
+            ? " "
+            : "";
         const char *input_type_label
             = ctx->start_input_type != NULL ? "Input type: " : "";
         const char *input_structure_label
             = ctx->input_structure != NULL ? "Input structure: " : "";
         const char *comma
             = ctx->start_input_type != NULL && ctx->input_structure != NULL
-            ? ", " : "";
+            ? ", "
+            : "";
         const char *input_type
             = ctx->start_input_type != NULL ? ctx->start_input_type : "";
         const char *input_structure
@@ -100,9 +102,9 @@ int OSSL_DECODER_from_bio(OSSL_DECODER_CTX *ctx, BIO *in)
         if (ERR_peek_last_error() == lasterr || ERR_peek_error() == 0)
             /* Prevent spurious decoding error but add at least something */
             ERR_raise_data(ERR_LIB_OSSL_DECODER, ERR_R_UNSUPPORTED,
-                           "No supported data to decode. %s%s%s%s%s%s",
-                           spaces, input_type_label, input_type, comma,
-                           input_structure_label, input_structure);
+                "No supported data to decode. %s%s%s%s%s%s",
+                spaces, input_type_label, input_type, comma,
+                input_structure_label, input_structure);
         ok = 0;
     }
 
@@ -143,7 +145,7 @@ int OSSL_DECODER_from_fp(OSSL_DECODER_CTX *ctx, FILE *fp)
 #endif
 
 int OSSL_DECODER_from_data(OSSL_DECODER_CTX *ctx, const unsigned char **pdata,
-                           size_t *pdata_len)
+    size_t *pdata_len)
 {
     BIO *membio;
     int ret = 0;
@@ -179,7 +181,7 @@ 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)
 {
     if (!ossl_assert(ctx != NULL)) {
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -195,7 +197,7 @@ int OSSL_DECODER_CTX_set_input_type(OSSL_DECODER_CTX *ctx,
 }
 
 int OSSL_DECODER_CTX_set_input_structure(OSSL_DECODER_CTX *ctx,
-                                         const char *input_structure)
+    const char *input_structure)
 {
     if (!ossl_assert(ctx != NULL)) {
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -212,7 +214,7 @@ int OSSL_DECODER_CTX_set_input_structure(OSSL_DECODER_CTX *ctx,
 
 OSSL_DECODER_INSTANCE *
 ossl_decoder_instance_new_forprov(OSSL_DECODER *decoder, void *provctx,
-                                  const char *input_structure)
+    const char *input_structure)
 {
     void *decoderctx;
 
@@ -227,9 +229,8 @@ ossl_decoder_instance_new_forprov(OSSL_DECODER *decoder, void *provctx,
     if (input_structure != NULL && decoder->set_ctx_params != NULL) {
         OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END };
 
-        params[0] =
-            OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
-                                             (char *)input_structure, 0);
+        params[0] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
+            (char *)input_structure, 0);
         if (!decoder->set_ctx_params(decoderctx, params)) {
             decoder->freectx(decoderctx);
             return 0;
@@ -239,7 +240,7 @@ ossl_decoder_instance_new_forprov(OSSL_DECODER *decoder, void *provctx,
 }
 
 OSSL_DECODER_INSTANCE *ossl_decoder_instance_new(OSSL_DECODER *decoder,
-                                                 void *decoderctx)
+    void *decoderctx)
 {
     OSSL_DECODER_INSTANCE *decoder_inst = NULL;
     const OSSL_PROVIDER *prov;
@@ -260,8 +261,8 @@ OSSL_DECODER_INSTANCE *ossl_decoder_instance_new(OSSL_DECODER *decoder,
     props = ossl_decoder_parsed_properties(decoder);
     if (props == NULL) {
         ERR_raise_data(ERR_LIB_OSSL_DECODER, ERR_R_INVALID_PROPERTY_DEFINITION,
-                       "there are no property definitions with decoder %s",
-                       OSSL_DECODER_get0_name(decoder));
+            "there are no property definitions with decoder %s",
+            OSSL_DECODER_get0_name(decoder));
         goto err;
     }
 
@@ -271,10 +272,10 @@ OSSL_DECODER_INSTANCE *ossl_decoder_instance_new(OSSL_DECODER *decoder,
     decoder_inst->input_type_id = 0;
     if (decoder_inst->input_type == NULL) {
         ERR_raise_data(ERR_LIB_OSSL_DECODER, ERR_R_INVALID_PROPERTY_DEFINITION,
-                       "the mandatory 'input' property is missing "
-                       "for decoder %s (properties: %s)",
-                       OSSL_DECODER_get0_name(decoder),
-                       OSSL_DECODER_get0_properties(decoder));
+            "the mandatory 'input' property is missing "
+            "for decoder %s (properties: %s)",
+            OSSL_DECODER_get0_name(decoder),
+            OSSL_DECODER_get0_properties(decoder));
         goto err;
     }
 
@@ -292,7 +293,7 @@ OSSL_DECODER_INSTANCE *ossl_decoder_instance_new(OSSL_DECODER *decoder,
     decoder_inst->decoder = decoder;
     decoder_inst->decoderctx = decoderctx;
     return decoder_inst;
- err:
+err:
     ossl_decoder_instance_free(decoder_inst);
     return NULL;
 }
@@ -335,7 +336,7 @@ OSSL_DECODER_INSTANCE *ossl_decoder_instance_dup(const OSSL_DECODER_INSTANCE *sr
 
     return dest;
 
- err:
+err:
     OPENSSL_free(dest);
     return NULL;
 }
@@ -351,27 +352,28 @@ int ossl_decoder_ctx_get_harderr(const OSSL_DECODER_CTX *ctx)
 }
 
 int ossl_decoder_ctx_add_decoder_inst(OSSL_DECODER_CTX *ctx,
-                                      OSSL_DECODER_INSTANCE *di)
+    OSSL_DECODER_INSTANCE *di)
 {
     int ok;
 
     if (ctx->decoder_insts == NULL
-        && (ctx->decoder_insts =
-            sk_OSSL_DECODER_INSTANCE_new_null()) == NULL) {
+        && (ctx->decoder_insts = sk_OSSL_DECODER_INSTANCE_new_null()) == NULL) {
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_CRYPTO_LIB);
         return 0;
     }
 
     ok = (sk_OSSL_DECODER_INSTANCE_push(ctx->decoder_insts, di) > 0);
     if (ok) {
-        OSSL_TRACE_BEGIN(DECODER) {
+        OSSL_TRACE_BEGIN(DECODER)
+        {
             BIO_printf(trc_out,
-                       "(ctx %p) Added decoder instance %p for decoder %p\n"
-                       "    %s with %s\n",
-                       (void *)ctx, (void *)di, (void *)di->decoder,
-                       OSSL_DECODER_get0_name(di->decoder),
-                       OSSL_DECODER_get0_properties(di->decoder));
-        } OSSL_TRACE_END(DECODER);
+                "(ctx %p) Added decoder instance %p for decoder %p\n"
+                "    %s with %s\n",
+                (void *)ctx, (void *)di, (void *)di->decoder,
+                OSSL_DECODER_get0_name(di->decoder),
+                OSSL_DECODER_get0_properties(di->decoder));
+        }
+        OSSL_TRACE_END(DECODER);
     }
     return ok;
 }
@@ -392,8 +394,7 @@ int OSSL_DECODER_CTX_add_decoder(OSSL_DECODER_CTX *ctx, OSSL_DECODER *decoder)
     provctx = OSSL_PROVIDER_get0_provider_ctx(prov);
 
     if ((decoderctx = decoder->newctx(provctx)) == NULL
-        || (decoder_inst =
-            ossl_decoder_instance_new(decoder, decoderctx)) == NULL)
+        || (decoder_inst = ossl_decoder_instance_new(decoder, decoderctx)) == NULL)
         goto err;
     /* Avoid double free of decoderctx on further errors */
     decoderctx = NULL;
@@ -402,7 +403,7 @@ int OSSL_DECODER_CTX_add_decoder(OSSL_DECODER_CTX *ctx, OSSL_DECODER *decoder)
         goto err;
 
     return 1;
- err:
+err:
     ossl_decoder_instance_free(decoder_inst);
     if (decoderctx != NULL)
         decoder->freectx(decoderctx);
@@ -418,9 +419,10 @@ struct collect_extra_decoder_data_st {
      * 0 to check that the decoder's input type is the same as the decoder name
      * 1 to check that the decoder's input type differs from the decoder name
      */
-    enum { IS_SAME = 0, IS_DIFFERENT = 1 } type_check;
+    enum { IS_SAME = 0,
+        IS_DIFFERENT = 1 } type_check;
     size_t w_prev_start, w_prev_end; /* "previous" decoders */
-    size_t w_new_start, w_new_end;   /* "new" decoders */
+    size_t w_new_start, w_new_end; /* "new" decoders */
 };
 
 DEFINE_STACK_OF(OSSL_DECODER)
@@ -430,7 +432,7 @@ static void collect_all_decoders(OSSL_DECODER *decoder, void *arg)
     STACK_OF(OSSL_DECODER) *skdecoders = arg;
 
     if (OSSL_DECODER_up_ref(decoder)
-            && !sk_OSSL_DECODER_push(skdecoders, decoder))
+        && !sk_OSSL_DECODER_push(skdecoders, decoder))
         OSSL_DECODER_free(decoder);
 }
 
@@ -445,14 +447,16 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg)
         void *decoderctx = NULL;
         OSSL_DECODER_INSTANCE *di = NULL;
 
-        OSSL_TRACE_BEGIN(DECODER) {
+        OSSL_TRACE_BEGIN(DECODER)
+        {
             BIO_printf(trc_out,
-                       "(ctx %p) [%d] Checking out decoder %p:\n"
-                       "    %s with %s\n",
-                       (void *)data->ctx, data->type_check, (void *)decoder,
-                       OSSL_DECODER_get0_name(decoder),
-                       OSSL_DECODER_get0_properties(decoder));
-        } OSSL_TRACE_END(DECODER);
+                "(ctx %p) [%d] Checking out decoder %p:\n"
+                "    %s with %s\n",
+                (void *)data->ctx, data->type_check, (void *)decoder,
+                OSSL_DECODER_get0_name(decoder),
+                OSSL_DECODER_get0_properties(decoder));
+        }
+        OSSL_TRACE_END(DECODER);
 
         /*
          * Check that we don't already have this decoder in our stack,
@@ -460,15 +464,16 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg)
          * we have added in the current window.
          */
         for (j = data->w_prev_start; j < data->w_new_end; j++) {
-            OSSL_DECODER_INSTANCE *check_inst =
-                sk_OSSL_DECODER_INSTANCE_value(data->ctx->decoder_insts, j);
+            OSSL_DECODER_INSTANCE *check_inst = sk_OSSL_DECODER_INSTANCE_value(data->ctx->decoder_insts, j);
 
             if (decoder->base.algodef == check_inst->decoder->base.algodef) {
                 /* We found it, so don't do anything more */
-                OSSL_TRACE_BEGIN(DECODER) {
+                OSSL_TRACE_BEGIN(DECODER)
+                {
                     BIO_printf(trc_out,
-                               "    REJECTED: already exists in the chain\n");
-                } OSSL_TRACE_END(DECODER);
+                        "    REJECTED: already exists in the chain\n");
+                }
+                OSSL_TRACE_END(DECODER);
                 return;
             }
         }
@@ -481,9 +486,8 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg)
             OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END };
             const char *str = data->ctx->input_structure;
 
-            params[0] =
-                OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
-                                                 (char *)str, 0);
+            params[0] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
+                (char *)str, 0);
             if (!decoder->set_ctx_params(decoderctx, params)) {
                 decoder->freectx(decoderctx);
                 return;
@@ -499,26 +503,30 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg)
         case IS_SAME:
             /* If it differs, this is not a decoder to add for now. */
             if (!ossl_decoder_fast_is_a(decoder,
-                                        OSSL_DECODER_INSTANCE_get_input_type(di),
-                                        &di->input_type_id)) {
+                    OSSL_DECODER_INSTANCE_get_input_type(di),
+                    &di->input_type_id)) {
                 ossl_decoder_instance_free(di);
-                OSSL_TRACE_BEGIN(DECODER) {
+                OSSL_TRACE_BEGIN(DECODER)
+                {
                     BIO_printf(trc_out,
-                               "    REJECTED: input type doesn't match output type\n");
-                } OSSL_TRACE_END(DECODER);
+                        "    REJECTED: input type doesn't match output type\n");
+                }
+                OSSL_TRACE_END(DECODER);
                 return;
             }
             break;
         case IS_DIFFERENT:
             /* If it's the same, this is not a decoder to add for now. */
             if (ossl_decoder_fast_is_a(decoder,
-                                       OSSL_DECODER_INSTANCE_get_input_type(di),
-                                       &di->input_type_id)) {
+                    OSSL_DECODER_INSTANCE_get_input_type(di),
+                    &di->input_type_id)) {
                 ossl_decoder_instance_free(di);
-                OSSL_TRACE_BEGIN(DECODER) {
+                OSSL_TRACE_BEGIN(DECODER)
+                {
                     BIO_printf(trc_out,
-                               "    REJECTED: input type matches output type\n");
-                } OSSL_TRACE_END(DECODER);
+                        "    REJECTED: input type matches output type\n");
+                }
+                OSSL_TRACE_END(DECODER);
                 return;
             }
             break;
@@ -537,8 +545,16 @@ static void collect_extra_decoder(OSSL_DECODER *decoder, void *arg)
     }
 }
 
+static int decoder_sk_cmp(const OSSL_DECODER_INSTANCE *const *a,
+    const OSSL_DECODER_INSTANCE *const *b)
+{
+    if ((*a)->score == (*b)->score)
+        return (*a)->order - (*b)->order;
+    return (*a)->score - (*b)->score;
+}
+
 int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx,
-                               OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     /*
      * This function goes through existing decoder methods in
@@ -581,11 +597,12 @@ int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx,
     if (ctx->decoder_insts == NULL)
         return 1;
 
-    OSSL_TRACE_BEGIN(DECODER) {
+    OSSL_TRACE_BEGIN(DECODER)
+    {
         BIO_printf(trc_out, "(ctx %p) Looking for extra decoders\n",
-                   (void *)ctx);
-    } OSSL_TRACE_END(DECODER);
-
+            (void *)ctx);
+    }
+    OSSL_TRACE_END(DECODER);
 
     skdecoders = sk_OSSL_DECODER_new_null();
     if (skdecoders == NULL) {
@@ -595,6 +612,25 @@ int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx,
     OSSL_DECODER_do_all_provided(libctx, collect_all_decoders, skdecoders);
     numdecoders = sk_OSSL_DECODER_num(skdecoders);
 
+    /*
+     * If there are provided or default properties, sort the initial decoder list
+     * by property matching score so that the highest scored provider is selected
+     * first.
+     */
+    if (propq != NULL || ossl_ctx_global_properties(libctx, 0) != NULL) {
+        int num_decoder_insts = sk_OSSL_DECODER_INSTANCE_num(ctx->decoder_insts);
+        int i;
+        OSSL_DECODER_INSTANCE *di;
+        sk_OSSL_DECODER_INSTANCE_compfunc old_cmp = sk_OSSL_DECODER_INSTANCE_set_cmp_func(ctx->decoder_insts, decoder_sk_cmp);
+
+        for (i = 0; i < num_decoder_insts; i++) {
+            di = sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
+            di->order = i;
+        }
+        sk_OSSL_DECODER_INSTANCE_sort(ctx->decoder_insts);
+        sk_OSSL_DECODER_INSTANCE_set_cmp_func(ctx->decoder_insts, old_cmp);
+    }
+
     memset(&data, 0, sizeof(data));
     data.ctx = ctx;
     data.w_prev_start = 0;
@@ -612,11 +648,10 @@ int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx,
          * 1.  All decoders that a different name than their input type.
          */
         for (data.type_check = IS_SAME;
-             data.type_check <= IS_DIFFERENT;
-             data.type_check++) {
+            data.type_check <= IS_DIFFERENT;
+            data.type_check++) {
             for (i = data.w_prev_start; i < data.w_prev_end; i++) {
-                OSSL_DECODER_INSTANCE *decoder_inst =
-                    sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
+                OSSL_DECODER_INSTANCE *decoder_inst = sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
 
                 data.output_type
                     = OSSL_DECODER_INSTANCE_get_input_type(decoder_inst);
@@ -625,7 +660,7 @@ int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx,
 
                 for (j = 0; j < numdecoders; j++)
                     collect_extra_decoder(sk_OSSL_DECODER_value(skdecoders, j),
-                                          &data);
+                        &data);
             }
         }
         /* How many were added in this iteration */
@@ -650,7 +685,7 @@ int OSSL_DECODER_CTX_get_num_decoders(OSSL_DECODER_CTX *ctx)
 }
 
 int OSSL_DECODER_CTX_set_construct(OSSL_DECODER_CTX *ctx,
-                                   OSSL_DECODER_CONSTRUCT *construct)
+    OSSL_DECODER_CONSTRUCT *construct)
 {
     if (!ossl_assert(ctx != NULL)) {
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -661,7 +696,7 @@ int OSSL_DECODER_CTX_set_construct(OSSL_DECODER_CTX *ctx,
 }
 
 int OSSL_DECODER_CTX_set_construct_data(OSSL_DECODER_CTX *ctx,
-                                        void *construct_data)
+    void *construct_data)
 {
     if (!ossl_assert(ctx != NULL)) {
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -672,7 +707,7 @@ int OSSL_DECODER_CTX_set_construct_data(OSSL_DECODER_CTX *ctx,
 }
 
 int OSSL_DECODER_CTX_set_cleanup(OSSL_DECODER_CTX *ctx,
-                                 OSSL_DECODER_CLEANUP *cleanup)
+    OSSL_DECODER_CLEANUP *cleanup)
 {
     if (!ossl_assert(ctx != NULL)) {
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -706,16 +741,16 @@ 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)
 {
     OSSL_DECODER *decoder = NULL;
     void *decoderctx = NULL;
 
     if (!(ossl_assert(decoder_inst != NULL)
-          && ossl_assert(reference != NULL)
-          && ossl_assert(export_cb != NULL)
-          && ossl_assert(export_cbarg != NULL))) {
+            && ossl_assert(reference != NULL)
+            && ossl_assert(export_cb != NULL)
+            && ossl_assert(export_cbarg != NULL))) {
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
         return 0;
     }
@@ -723,7 +758,7 @@ int OSSL_DECODER_export(OSSL_DECODER_INSTANCE *decoder_inst,
     decoder = OSSL_DECODER_INSTANCE_get_decoder(decoder_inst);
     decoderctx = OSSL_DECODER_INSTANCE_get_decoder_ctx(decoder_inst);
     return decoder->export_object(decoderctx, reference, reference_sz,
-                                  export_cb, export_cbarg);
+        export_cb, export_cbarg);
 }
 
 OSSL_DECODER *
@@ -752,7 +787,7 @@ 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)
 {
     if (decoder_inst == NULL)
         return NULL;
@@ -789,49 +824,53 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
     new_data.recursion = data->recursion + 1;
 
 #define LEVEL_STR ">>>>>>>>>>>>>>>>"
-#define LEVEL (new_data.recursion < sizeof(LEVEL_STR)                   \
-               ? &LEVEL_STR[sizeof(LEVEL_STR) - new_data.recursion - 1] \
-               : LEVEL_STR "...")
+#define LEVEL (new_data.recursion < sizeof(LEVEL_STR)            \
+        ? &LEVEL_STR[sizeof(LEVEL_STR) - new_data.recursion - 1] \
+        : LEVEL_STR "...")
 
     if (params == NULL) {
         /* First iteration, where we prepare for what is to come */
 
-        OSSL_TRACE_BEGIN(DECODER) {
+        OSSL_TRACE_BEGIN(DECODER)
+        {
             BIO_printf(trc_out,
-                       "(ctx %p) starting to walk the decoder chain\n",
-                       (void *)new_data.ctx);
-        } OSSL_TRACE_END(DECODER);
+                "(ctx %p) starting to walk the decoder chain\n",
+                (void *)new_data.ctx);
+        }
+        OSSL_TRACE_END(DECODER);
 
-        data->current_decoder_inst_index =
-            OSSL_DECODER_CTX_get_num_decoders(ctx);
+        data->current_decoder_inst_index = OSSL_DECODER_CTX_get_num_decoders(ctx);
 
         bio = data->bio;
     } else {
         const OSSL_PARAM *p;
         const char *trace_data_structure;
 
-        decoder_inst =
-            sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts,
-                                           data->current_decoder_inst_index);
+        decoder_inst = sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts,
+            data->current_decoder_inst_index);
         decoder = OSSL_DECODER_INSTANCE_get_decoder(decoder_inst);
 
         data->flag_construct_called = 0;
         if (ctx->construct != NULL) {
             int rv;
 
-            OSSL_TRACE_BEGIN(DECODER) {
+            OSSL_TRACE_BEGIN(DECODER)
+            {
                 BIO_printf(trc_out,
-                           "(ctx %p) %s Running constructor\n",
-                           (void *)new_data.ctx, LEVEL);
-            } OSSL_TRACE_END(DECODER);
+                    "(ctx %p) %s Running constructor\n",
+                    (void *)new_data.ctx, LEVEL);
+            }
+            OSSL_TRACE_END(DECODER);
 
             rv = ctx->construct(decoder_inst, params, ctx->construct_data);
 
-            OSSL_TRACE_BEGIN(DECODER) {
+            OSSL_TRACE_BEGIN(DECODER)
+            {
                 BIO_printf(trc_out,
-                           "(ctx %p) %s Running constructor => %d\n",
-                           (void *)new_data.ctx, LEVEL, rv);
-            } OSSL_TRACE_END(DECODER);
+                    "(ctx %p) %s Running constructor => %d\n",
+                    (void *)new_data.ctx, LEVEL, rv);
+            }
+            OSSL_TRACE_END(DECODER);
 
             ok = (rv > 0);
             if (ok) {
@@ -901,15 +940,18 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
             && OPENSSL_strcasecmp(data_structure, "type-specific") == 0)
             data_structure = NULL;
 
-        OSSL_TRACE_BEGIN(DECODER) {
+        OSSL_TRACE_BEGIN(DECODER)
+        {
             BIO_printf(trc_out,
-                       "(ctx %p) %s incoming from previous decoder (%p):\n"
-                       "    data type: %s, data structure: %s%s\n",
-                       (void *)new_data.ctx, LEVEL, (void *)decoder,
-                       data_type, trace_data_structure,
-                       (trace_data_structure == data_structure
-                        ? "" : " (dropped)"));
-        } OSSL_TRACE_END(DECODER);
+                "(ctx %p) %s incoming from previous decoder (%p):\n"
+                "    data type: %s, data structure: %s%s\n",
+                (void *)new_data.ctx, LEVEL, (void *)decoder,
+                data_type, trace_data_structure,
+                (trace_data_structure == data_structure
+                        ? ""
+                        : " (dropped)"));
+        }
+        OSSL_TRACE_END(DECODER);
     }
 
     /*
@@ -930,30 +972,27 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
     }
 
     for (i = data->current_decoder_inst_index; i-- > 0;) {
-        OSSL_DECODER_INSTANCE *new_decoder_inst =
-            sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
-        OSSL_DECODER *new_decoder =
-            OSSL_DECODER_INSTANCE_get_decoder(new_decoder_inst);
+        OSSL_DECODER_INSTANCE *new_decoder_inst = sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
+        OSSL_DECODER *new_decoder = OSSL_DECODER_INSTANCE_get_decoder(new_decoder_inst);
         const char *new_decoder_name = NULL;
-        void *new_decoderctx =
-            OSSL_DECODER_INSTANCE_get_decoder_ctx(new_decoder_inst);
-        const char *new_input_type =
-            OSSL_DECODER_INSTANCE_get_input_type(new_decoder_inst);
-        int n_i_s_was_set = 0;   /* We don't care here */
-        const char *new_input_structure =
-            OSSL_DECODER_INSTANCE_get_input_structure(new_decoder_inst,
-                                                      &n_i_s_was_set);
-
-        OSSL_TRACE_BEGIN(DECODER) {
+        void *new_decoderctx = OSSL_DECODER_INSTANCE_get_decoder_ctx(new_decoder_inst);
+        const char *new_input_type = OSSL_DECODER_INSTANCE_get_input_type(new_decoder_inst);
+        int n_i_s_was_set = 0; /* We don't care here */
+        const char *new_input_structure = OSSL_DECODER_INSTANCE_get_input_structure(new_decoder_inst,
+            &n_i_s_was_set);
+
+        OSSL_TRACE_BEGIN(DECODER)
+        {
             new_decoder_name = OSSL_DECODER_get0_name(new_decoder);
             BIO_printf(trc_out,
-                       "(ctx %p) %s [%u] Considering decoder instance %p (decoder %p):\n"
-                       "    %s with %s\n",
-                       (void *)new_data.ctx, LEVEL, (unsigned int)i,
-                       (void *)new_decoder_inst, (void *)new_decoder,
-                       new_decoder_name,
-                       OSSL_DECODER_get0_properties(new_decoder));
-        } OSSL_TRACE_END(DECODER);
+                "(ctx %p) %s [%u] Considering decoder instance %p (decoder %p):\n"
+                "    %s with %s\n",
+                (void *)new_data.ctx, LEVEL, (unsigned int)i,
+                (void *)new_decoder_inst, (void *)new_decoder,
+                new_decoder_name,
+                OSSL_DECODER_get0_properties(new_decoder));
+        }
+        OSSL_TRACE_END(DECODER);
 
         /*
          * If |decoder| is NULL, it means we've just started, and the caller
@@ -962,12 +1001,14 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
          */
         if (decoder == NULL && ctx->start_input_type != NULL
             && OPENSSL_strcasecmp(ctx->start_input_type, new_input_type) != 0) {
-            OSSL_TRACE_BEGIN(DECODER) {
+            OSSL_TRACE_BEGIN(DECODER)
+            {
                 BIO_printf(trc_out,
-                           "(ctx %p) %s [%u] the start input type '%s' doesn't match the input type of the considered decoder, skipping...\n",
-                           (void *)new_data.ctx, LEVEL, (unsigned int)i,
-                           ctx->start_input_type);
-            } OSSL_TRACE_END(DECODER);
+                    "(ctx %p) %s [%u] the start input type '%s' doesn't match the input type of the considered decoder, skipping...\n",
+                    (void *)new_data.ctx, LEVEL, (unsigned int)i,
+                    ctx->start_input_type);
+            }
+            OSSL_TRACE_END(DECODER);
             continue;
         }
 
@@ -977,14 +1018,15 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
          * |new_input_type| holds the value of the "input-type" parameter
          * for the decoder we're currently considering.
          */
-        if (decoder != NULL && !ossl_decoder_fast_is_a(decoder, new_input_type,
-                                                       &new_decoder_inst->input_type_id)) {
-            OSSL_TRACE_BEGIN(DECODER) {
+        if (decoder != NULL && !ossl_decoder_fast_is_a(decoder, new_input_type, &new_decoder_inst->input_type_id)) {
+            OSSL_TRACE_BEGIN(DECODER)
+            {
                 BIO_printf(trc_out,
-                           "(ctx %p) %s [%u] the input type doesn't match the name of the previous decoder (%p), skipping...\n",
-                           (void *)new_data.ctx, LEVEL, (unsigned int)i,
-                           (void *)decoder);
-            } OSSL_TRACE_END(DECODER);
+                    "(ctx %p) %s [%u] the input type doesn't match the name of the previous decoder (%p), skipping...\n",
+                    (void *)new_data.ctx, LEVEL, (unsigned int)i,
+                    (void *)decoder);
+            }
+            OSSL_TRACE_END(DECODER);
             continue;
         }
 
@@ -993,11 +1035,13 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
          * if that matches the decoder we're currently considering.
          */
         if (data_type != NULL && !OSSL_DECODER_is_a(new_decoder, data_type)) {
-            OSSL_TRACE_BEGIN(DECODER) {
+            OSSL_TRACE_BEGIN(DECODER)
+            {
                 BIO_printf(trc_out,
-                           "(ctx %p) %s [%u] the previous decoder's data type doesn't match the name of the considered decoder, skipping...\n",
-                           (void *)new_data.ctx, LEVEL, (unsigned int)i);
-            } OSSL_TRACE_END(DECODER);
+                    "(ctx %p) %s [%u] the previous decoder's data type doesn't match the name of the considered decoder, skipping...\n",
+                    (void *)new_data.ctx, LEVEL, (unsigned int)i);
+            }
+            OSSL_TRACE_END(DECODER);
             continue;
         }
 
@@ -1009,12 +1053,15 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
         if (data_structure != NULL
             && (new_input_structure == NULL
                 || OPENSSL_strcasecmp(data_structure,
-                                      new_input_structure) != 0)) {
-            OSSL_TRACE_BEGIN(DECODER) {
+                       new_input_structure)
+                    != 0)) {
+            OSSL_TRACE_BEGIN(DECODER)
+            {
                 BIO_printf(trc_out,
-                           "(ctx %p) %s [%u] the previous decoder's data structure doesn't match the input structure of the considered decoder, skipping...\n",
-                           (void *)new_data.ctx, LEVEL, (unsigned int)i);
-            } OSSL_TRACE_END(DECODER);
+                    "(ctx %p) %s [%u] the previous decoder's data structure doesn't match the input structure of the considered decoder, skipping...\n",
+                    (void *)new_data.ctx, LEVEL, (unsigned int)i);
+            }
+            OSSL_TRACE_END(DECODER);
             continue;
         }
 
@@ -1029,12 +1076,15 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
             && new_input_structure != NULL) {
             data->flag_input_structure_checked = 1;
             if (OPENSSL_strcasecmp(new_input_structure,
-                                   ctx->input_structure) != 0) {
-                OSSL_TRACE_BEGIN(DECODER) {
+                    ctx->input_structure)
+                != 0) {
+                OSSL_TRACE_BEGIN(DECODER)
+                {
                     BIO_printf(trc_out,
-                               "(ctx %p) %s [%u] the previous decoder's data structure doesn't match the input structure given by the user, skipping...\n",
-                               (void *)new_data.ctx, LEVEL, (unsigned int)i);
-                } OSSL_TRACE_END(DECODER);
+                        "(ctx %p) %s [%u] the previous decoder's data structure doesn't match the input structure given by the user, skipping...\n",
+                        (void *)new_data.ctx, LEVEL, (unsigned int)i);
+                }
+                OSSL_TRACE_END(DECODER);
                 continue;
             }
         }
@@ -1054,12 +1104,14 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
             goto end;
 
         /* Recurse */
-        OSSL_TRACE_BEGIN(DECODER) {
+        OSSL_TRACE_BEGIN(DECODER)
+        {
             BIO_printf(trc_out,
-                       "(ctx %p) %s [%u] Running decoder instance %s (%p)\n",
-                       (void *)new_data.ctx, LEVEL, (unsigned int)i,
-                       new_decoder_name, (void *)new_decoder_inst);
-        } OSSL_TRACE_END(DECODER);
+                "(ctx %p) %s [%u] Running decoder instance %s (%p)\n",
+                (void *)new_data.ctx, LEVEL, (unsigned int)i,
+                new_decoder_name, (void *)new_decoder_inst);
+        }
+        OSSL_TRACE_END(DECODER);
 
         /*
          * We only care about errors reported from decoder implementations
@@ -1071,20 +1123,22 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
         new_data.flag_input_structure_checked
             = data->flag_input_structure_checked;
         ok = new_decoder->decode(new_decoderctx, cbio,
-                                 new_data.ctx->selection,
-                                 decoder_process, &new_data,
-                                 ossl_pw_passphrase_callback_dec,
-                                 &new_data.ctx->pwdata);
+            new_data.ctx->selection,
+            decoder_process, &new_data,
+            ossl_pw_passphrase_callback_dec,
+            &new_data.ctx->pwdata);
 
-        OSSL_TRACE_BEGIN(DECODER) {
+        OSSL_TRACE_BEGIN(DECODER)
+        {
             BIO_printf(trc_out,
-                       "(ctx %p) %s [%u] Running decoder instance %s (%p) => %d"
-                       " (recursed further: %s, construct called: %s)\n",
-                       (void *)new_data.ctx, LEVEL, (unsigned int)i,
-                       new_decoder_name, (void *)new_decoder_inst, ok,
-                       new_data.flag_next_level_called ? "yes" : "no",
-                       new_data.flag_construct_called ? "yes" : "no");
-        } OSSL_TRACE_END(DECODER);
+                "(ctx %p) %s [%u] Running decoder instance %s (%p) => %d"
+                " (recursed further: %s, construct called: %s)\n",
+                (void *)new_data.ctx, LEVEL, (unsigned int)i,
+                new_decoder_name, (void *)new_decoder_inst, ok,
+                new_data.flag_next_level_called ? "yes" : "no",
+                new_data.flag_construct_called ? "yes" : "no");
+        }
+        OSSL_TRACE_END(DECODER);
 
         data->flag_construct_called = new_data.flag_construct_called;
 
@@ -1103,7 +1157,7 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
             break;
     }
 
- end:
+end:
     ossl_core_bio_free(cbio);
     BIO_free(new_data.bio);
     ctx->start_input_type = start_input_type;
diff --git a/crypto/encode_decode/decoder_meth.c b/crypto/encode_decode/decoder_meth.c
index 85ab3b5286738..110581f764f7c 100644
--- a/crypto/encode_decode/decoder_meth.c
+++ b/crypto/encode_decode/decoder_meth.c
@@ -77,9 +77,9 @@ void OSSL_DECODER_free(OSSL_DECODER *decoder)
 /* Data to be passed through ossl_method_construct() */
 struct decoder_data_st {
     OSSL_LIB_CTX *libctx;
-    int id;                      /* For get_decoder_from_store() */
-    const char *names;           /* For get_decoder_from_store() */
-    const char *propquery;       /* For get_decoder_from_store() */
+    int id; /* For get_decoder_from_store() */
+    const char *names; /* For get_decoder_from_store() */
+    const char *propquery; /* For get_decoder_from_store() */
 
     OSSL_METHOD_STORE *tmp_store; /* For get_tmp_decoder_store() */
 
@@ -137,7 +137,7 @@ static int unreserve_decoder_store(void *store, void *data)
 
 /* Get decoder methods from a store, or put one in */
 static void *get_decoder_from_store(void *store, const OSSL_PROVIDER **prov,
-                                    void *data)
+    void *data)
 {
     struct decoder_data_st *methdata = data;
     void *method = NULL;
@@ -172,9 +172,9 @@ static void *get_decoder_from_store(void *store, const OSSL_PROVIDER **prov,
 }
 
 static int put_decoder_in_store(void *store, void *method,
-                                const OSSL_PROVIDER *prov,
-                                const char *names, const char *propdef,
-                                void *data)
+    const OSSL_PROVIDER *prov,
+    const char *names, const char *propdef,
+    void *data)
 {
     struct decoder_data_st *methdata = data;
     OSSL_NAMEMAP *namemap;
@@ -201,13 +201,13 @@ static int put_decoder_in_store(void *store, void *method,
         return 0;
 
     return ossl_method_store_add(store, prov, id, propdef, method,
-                                 ossl_decoder_up_ref,
-                                 ossl_decoder_free);
+        ossl_decoder_up_ref,
+        ossl_decoder_free);
 }
 
 /* Create and populate a decoder method */
 void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
-                                  OSSL_PROVIDER *prov)
+    OSSL_PROVIDER *prov)
 {
     OSSL_DECODER *decoder = NULL;
     const OSSL_DISPATCH *fns = algodef->implementation;
@@ -222,7 +222,8 @@ void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
     }
     decoder->base.algodef = algodef;
     if ((decoder->base.parsed_propdef
-         = ossl_parse_property(libctx, algodef->property_definition)) == NULL) {
+            = ossl_parse_property(libctx, algodef->property_definition))
+        == NULL) {
         OSSL_DECODER_free(decoder);
         return NULL;
     }
@@ -239,28 +240,23 @@ void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
             break;
         case OSSL_FUNC_DECODER_GET_PARAMS:
             if (decoder->get_params == NULL)
-                decoder->get_params =
-                    OSSL_FUNC_decoder_get_params(fns);
+                decoder->get_params = OSSL_FUNC_decoder_get_params(fns);
             break;
         case OSSL_FUNC_DECODER_GETTABLE_PARAMS:
             if (decoder->gettable_params == NULL)
-                decoder->gettable_params =
-                    OSSL_FUNC_decoder_gettable_params(fns);
+                decoder->gettable_params = OSSL_FUNC_decoder_gettable_params(fns);
             break;
         case OSSL_FUNC_DECODER_SET_CTX_PARAMS:
             if (decoder->set_ctx_params == NULL)
-                decoder->set_ctx_params =
-                    OSSL_FUNC_decoder_set_ctx_params(fns);
+                decoder->set_ctx_params = OSSL_FUNC_decoder_set_ctx_params(fns);
             break;
         case OSSL_FUNC_DECODER_SETTABLE_CTX_PARAMS:
             if (decoder->settable_ctx_params == NULL)
-                decoder->settable_ctx_params =
-                    OSSL_FUNC_decoder_settable_ctx_params(fns);
+                decoder->settable_ctx_params = OSSL_FUNC_decoder_settable_ctx_params(fns);
             break;
         case OSSL_FUNC_DECODER_DOES_SELECTION:
             if (decoder->does_selection == NULL)
-                decoder->does_selection =
-                    OSSL_FUNC_decoder_does_selection(fns);
+                decoder->does_selection = OSSL_FUNC_decoder_does_selection(fns);
             break;
         case OSSL_FUNC_DECODER_DECODE:
             if (decoder->decode == NULL)
@@ -278,7 +274,7 @@ void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
      * You must have at least one of the encoding driver functions.
      */
     if (!((decoder->newctx == NULL && decoder->freectx == NULL)
-          || (decoder->newctx != NULL && decoder->freectx != NULL))
+            || (decoder->newctx != NULL && decoder->freectx != NULL))
         || decoder->decode == NULL) {
         OSSL_DECODER_free(decoder);
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_INVALID_PROVIDER_FUNCTIONS);
@@ -294,14 +290,13 @@ void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
     return decoder;
 }
 
-
 /*
  * The core fetching functionality passes the names of the implementation.
  * This function is responsible to getting an identity number for them,
  * then call ossl_decoder_from_algorithm() with that identity number.
  */
 static void *construct_decoder(const OSSL_ALGORITHM *algodef,
-                               OSSL_PROVIDER *prov, void *data)
+    OSSL_PROVIDER *prov, void *data)
 {
     /*
      * This function is only called if get_decoder_from_store() returned
@@ -349,7 +344,7 @@ static void free_decoder(void *method)
 /* Fetching support.  Can fetch by numeric identity or by name */
 static OSSL_DECODER *
 inner_ossl_decoder_fetch(struct decoder_data_st *methdata,
-                         const char *name, const char *properties)
+    const char *name, const char *properties)
 {
     OSSL_METHOD_STORE *store = get_decoder_store(methdata->libctx);
     OSSL_NAMEMAP *namemap = ossl_namemap_stored(methdata->libctx);
@@ -388,8 +383,9 @@ inner_ossl_decoder_fetch(struct decoder_data_st *methdata,
         methdata->propquery = propq;
         methdata->flag_construct_error_occurred = 0;
         if ((method = ossl_method_construct(methdata->libctx, OSSL_OP_DECODER,
-                                            &prov, 0 /* !force_cache */,
-                                            &mcm, methdata)) != NULL) {
+                 &prov, 0 /* !force_cache */,
+                 &mcm, methdata))
+            != NULL) {
             /*
              * If construction did create a method for us, we know that
              * there is a correct name_id and meth_id, since those have
@@ -400,7 +396,7 @@ inner_ossl_decoder_fetch(struct decoder_data_st *methdata,
                 id = ossl_namemap_name2num(namemap, name);
             if (id != 0)
                 ossl_method_store_cache_set(store, prov, id, propq, method,
-                                            up_ref_decoder, free_decoder);
+                    up_ref_decoder, free_decoder);
         }
 
         /*
@@ -416,17 +412,17 @@ inner_ossl_decoder_fetch(struct decoder_data_st *methdata,
         if (name == NULL)
             name = ossl_namemap_num2name(namemap, id, 0);
         ERR_raise_data(ERR_LIB_OSSL_DECODER, code,
-                       "%s, Name (%s : %d), Properties (%s)",
-                       ossl_lib_ctx_get_descriptor(methdata->libctx),
-                       name == NULL ? "<null>" : name, id,
-                       properties == NULL ? "<null>" : properties);
+            "%s, Name (%s : %d), Properties (%s)",
+            ossl_lib_ctx_get_descriptor(methdata->libctx),
+            name == NULL ? "<null>" : name, id,
+            properties == NULL ? "<null>" : properties);
     }
 
     return method;
 }
 
 OSSL_DECODER *OSSL_DECODER_fetch(OSSL_LIB_CTX *libctx, const char *name,
-                                 const char *properties)
+    const char *properties)
 {
     struct decoder_data_st methdata;
     void *method;
@@ -554,9 +550,9 @@ static void do_one(ossl_unused int id, void *method, void *arg)
 }
 
 void OSSL_DECODER_do_all_provided(OSSL_LIB_CTX *libctx,
-                                  void (*user_fn)(OSSL_DECODER *decoder,
-                                                  void *arg),
-                                  void *user_arg)
+    void (*user_fn)(OSSL_DECODER *decoder,
+        void *arg),
+    void *user_arg)
 {
     struct decoder_data_st methdata;
     struct do_one_data_st data;
@@ -574,8 +570,8 @@ void OSSL_DECODER_do_all_provided(OSSL_LIB_CTX *libctx,
 }
 
 int OSSL_DECODER_names_do_all(const OSSL_DECODER *decoder,
-                              void (*fn)(const char *name, void *data),
-                              void *data)
+    void (*fn)(const char *name, void *data),
+    void *data)
 {
     if (decoder == NULL)
         return 0;
@@ -638,7 +634,7 @@ 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[])
 {
     int ok = 1;
     size_t i;
@@ -654,12 +650,9 @@ int OSSL_DECODER_CTX_set_params(OSSL_DECODER_CTX *ctx,
 
     l = OSSL_DECODER_CTX_get_num_decoders(ctx);
     for (i = 0; i < l; i++) {
-        OSSL_DECODER_INSTANCE *decoder_inst =
-            sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
-        OSSL_DECODER *decoder =
-            OSSL_DECODER_INSTANCE_get_decoder(decoder_inst);
-        OSSL_DECODER *decoderctx =
-            OSSL_DECODER_INSTANCE_get_decoder_ctx(decoder_inst);
+        OSSL_DECODER_INSTANCE *decoder_inst = sk_OSSL_DECODER_INSTANCE_value(ctx->decoder_insts, i);
+        OSSL_DECODER *decoder = OSSL_DECODER_INSTANCE_get_decoder(decoder_inst);
+        OSSL_DECODER *decoderctx = OSSL_DECODER_INSTANCE_get_decoder_ctx(decoder_inst);
 
         if (decoderctx == NULL || decoder->set_ctx_params == NULL)
             continue;
@@ -675,7 +668,7 @@ void OSSL_DECODER_CTX_free(OSSL_DECODER_CTX *ctx)
         if (ctx->cleanup != NULL)
             ctx->cleanup(ctx->construct_data);
         sk_OSSL_DECODER_INSTANCE_pop_free(ctx->decoder_insts,
-                                          ossl_decoder_instance_free);
+            ossl_decoder_instance_free);
         ossl_pw_clear_passphrase_data(&ctx->pwdata);
         OPENSSL_free(ctx);
     }
diff --git a/crypto/encode_decode/decoder_pkey.c b/crypto/encode_decode/decoder_pkey.c
index f99566bde7441..a578e6a13532a 100644
--- a/crypto/encode_decode/decoder_pkey.c
+++ b/crypto/encode_decode/decoder_pkey.c
@@ -24,28 +24,28 @@
 #include "internal/sizes.h"
 
 int OSSL_DECODER_CTX_set_passphrase(OSSL_DECODER_CTX *ctx,
-                                    const unsigned char *kstr,
-                                    size_t klen)
+    const unsigned char *kstr,
+    size_t klen)
 {
     return ossl_pw_set_passphrase(&ctx->pwdata, kstr, klen);
 }
 
 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)
 {
     return ossl_pw_set_ui_method(&ctx->pwdata, ui_method, ui_data);
 }
 
 int OSSL_DECODER_CTX_set_pem_password_cb(OSSL_DECODER_CTX *ctx,
-                                         pem_password_cb *cb, void *cbarg)
+    pem_password_cb *cb, void *cbarg)
 {
     return ossl_pw_set_pem_password_cb(&ctx->pwdata, cb, cbarg);
 }
 
 int OSSL_DECODER_CTX_set_passphrase_cb(OSSL_DECODER_CTX *ctx,
-                                       OSSL_PASSPHRASE_CALLBACK *cb,
-                                       void *cbarg)
+    OSSL_PASSPHRASE_CALLBACK *cb,
+    void *cbarg)
 {
     return ossl_pw_set_ossl_passphrase_cb(&ctx->pwdata, cb, cbarg);
 }
@@ -63,14 +63,14 @@ struct decoder_pkey_data_st {
     int selection;
 
     STACK_OF(EVP_KEYMGMT) *keymgmts;
-    char *object_type;           /* recorded object data type, may be NULL */
-    void **object;               /* Where the result should end up */
-    OSSL_DECODER_CTX *ctx;       /* The parent decoder context */
+    char *object_type; /* recorded object data type, may be NULL */
+    void **object; /* Where the result should end up */
+    OSSL_DECODER_CTX *ctx; /* The parent decoder context */
 };
 
 static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst,
-                                  const OSSL_PARAM *params,
-                                  void *construct_data)
+    const OSSL_PARAM *params,
+    void *construct_data)
 {
     struct decoder_pkey_data_st *data = construct_data;
     OSSL_DECODER *decoder = OSSL_DECODER_INSTANCE_get_decoder(decoder_inst);
@@ -131,8 +131,9 @@ static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst,
         if (!EVP_KEYMGMT_up_ref(keymgmt))
             return 0;
     } else if ((keymgmt = EVP_KEYMGMT_fetch(data->libctx,
-                                            data->object_type,
-                                            data->propq)) != NULL) {
+                    data->object_type,
+                    data->propq))
+        != NULL) {
         keymgmt_prov = EVP_KEYMGMT_get0_provider(keymgmt);
     }
 
@@ -166,9 +167,9 @@ static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst,
              * |import_data.keydata| is as much an indicator.
              */
             (void)decoder->export_object(decoderctx,
-                                         object_ref, object_ref_sz,
-                                         &evp_keymgmt_util_try_import,
-                                         &import_data);
+                object_ref, object_ref_sz,
+                &evp_keymgmt_util_try_import,
+                &import_data);
             keydata = import_data.keydata;
             import_data.keydata = NULL;
         }
@@ -218,19 +219,25 @@ struct collect_data_st {
 
     const char *keytype; /* the keytype requested, if any */
     int keytype_id; /* if keytype_resolved is set, keymgmt name_id; else 0 */
-    int sm2_id;     /* if keytype_resolved is set and EC, SM2 name_id; else 0 */
-    int total;      /* number of matching results */
+    int sm2_id; /* if keytype_resolved is set and EC, SM2 name_id; else 0 */
+    int total; /* number of matching results */
     char error_occurred;
     char keytype_resolved;
+    OSSL_PROPERTY_LIST *pq;
 
     STACK_OF(EVP_KEYMGMT) *keymgmts;
 };
 
-static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder,
-                                    void *provctx, struct collect_data_st *data)
+/*
+ * Add decoder instance to the decoder context if it is compatible. Returns 1
+ * if a decoder was added, 0 otherwise.
+ */
+static int collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder,
+    void *provctx, struct collect_data_st *data)
 {
     void *decoderctx = NULL;
     OSSL_DECODER_INSTANCE *di = NULL;
+    const OSSL_PROPERTY_LIST *props;
 
     /*
      * We already checked the EVP_KEYMGMT is applicable in check_keymgmt so we
@@ -239,17 +246,17 @@ static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder,
 
     if (keymgmt->name_id != decoder->base.id)
         /* Mismatch is not an error, continue. */
-        return;
+        return 0;
 
     if ((decoderctx = decoder->newctx(provctx)) == NULL) {
         data->error_occurred = 1;
-        return;
+        return 0;
     }
 
     if ((di = ossl_decoder_instance_new(decoder, decoderctx)) == NULL) {
         decoder->freectx(decoderctx);
         data->error_occurred = 1;
-        return;
+        return 0;
     }
 
     /*
@@ -263,25 +270,44 @@ static void collect_decoder_keymgmt(EVP_KEYMGMT *keymgmt, OSSL_DECODER *decoder,
             || OPENSSL_strcasecmp(data->ctx->start_input_type, "PEM") != 0)) {
         /* Mismatch is not an error, continue. */
         ossl_decoder_instance_free(di);
-        return;
+        return 0;
     }
 
-    OSSL_TRACE_BEGIN(DECODER) {
+    OSSL_TRACE_BEGIN(DECODER)
+    {
         BIO_printf(trc_out,
-                   "(ctx %p) Checking out decoder %p:\n"
-                   "    %s with %s\n",
-                   (void *)data->ctx, (void *)decoder,
-                   OSSL_DECODER_get0_name(decoder),
-                   OSSL_DECODER_get0_properties(decoder));
-    } OSSL_TRACE_END(DECODER);
+            "(ctx %p) Checking out decoder %p:\n"
+            "    %s with %s\n",
+            (void *)data->ctx, (void *)decoder,
+            OSSL_DECODER_get0_name(decoder),
+            OSSL_DECODER_get0_properties(decoder));
+    }
+    OSSL_TRACE_END(DECODER);
+
+    /*
+     * Get the property match score so the decoders can be prioritized later.
+     */
+    props = ossl_decoder_parsed_properties(decoder);
+    if (data->pq != NULL && props != NULL) {
+        di->score = ossl_property_match_count(data->pq, props);
+        /*
+         * Mismatch of mandatory properties is not an error, the decoder is just
+         * ignored, continue.
+         */
+        if (di->score < 0) {
+            ossl_decoder_instance_free(di);
+            return 0;
+        }
+    }
 
     if (!ossl_decoder_ctx_add_decoder_inst(data->ctx, di)) {
         ossl_decoder_instance_free(di);
         data->error_occurred = 1;
-        return;
+        return 0;
     }
 
     ++data->total;
+    return 1;
 }
 
 static void collect_decoder(OSSL_DECODER *decoder, void *arg)
@@ -305,23 +331,27 @@ static void collect_decoder(OSSL_DECODER *decoder, void *arg)
      * doesn't have |does_selection|, it's seen as taking anything.
      */
     if (decoder->does_selection != NULL
-            && !decoder->does_selection(provctx, data->ctx->selection))
+        && !decoder->does_selection(provctx, data->ctx->selection))
         return;
 
-    OSSL_TRACE_BEGIN(DECODER) {
+    OSSL_TRACE_BEGIN(DECODER)
+    {
         BIO_printf(trc_out,
-                   "(ctx %p) Checking out decoder %p:\n"
-                   "    %s with %s\n",
-                   (void *)data->ctx, (void *)decoder,
-                   OSSL_DECODER_get0_name(decoder),
-                   OSSL_DECODER_get0_properties(decoder));
-    } OSSL_TRACE_END(DECODER);
+            "(ctx %p) Checking out decoder %p:\n"
+            "    %s with %s\n",
+            (void *)data->ctx, (void *)decoder,
+            OSSL_DECODER_get0_name(decoder),
+            OSSL_DECODER_get0_properties(decoder));
+    }
+    OSSL_TRACE_END(DECODER);
 
     end_i = sk_EVP_KEYMGMT_num(keymgmts);
     for (i = 0; i < end_i; ++i) {
         keymgmt = sk_EVP_KEYMGMT_value(keymgmts, i);
 
-        collect_decoder_keymgmt(keymgmt, decoder, provctx, data);
+        /* Only add this decoder once */
+        if (collect_decoder_keymgmt(keymgmt, decoder, provctx, data))
+            break;
         if (data->error_occurred)
             return;
     }
@@ -399,29 +429,33 @@ static void collect_keymgmt(EVP_KEYMGMT *keymgmt, void *arg)
  * etc. If 'keytype' is NULL, decoders for all keytypes are bound.
  */
 static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
-                                           const char *keytype,
-                                           OSSL_LIB_CTX *libctx,
-                                           const char *propquery)
+    const char *keytype,
+    OSSL_LIB_CTX *libctx,
+    const char *propquery)
 {
     int ok = 0;
     struct decoder_pkey_data_st *process_data = NULL;
     struct collect_data_st collect_data = { NULL };
     STACK_OF(EVP_KEYMGMT) *keymgmts = NULL;
+    OSSL_PROPERTY_LIST **plp;
+    OSSL_PROPERTY_LIST *pq = NULL, *p2 = NULL;
 
-    OSSL_TRACE_BEGIN(DECODER) {
+    OSSL_TRACE_BEGIN(DECODER)
+    {
         const char *input_type = ctx->start_input_type;
         const char *input_structure = ctx->input_structure;
 
         BIO_printf(trc_out,
-                   "(ctx %p) Looking for decoders producing %s%s%s%s%s%s\n",
-                   (void *)ctx,
-                   keytype != NULL ? keytype : "",
-                   keytype != NULL ? " keys" : "keys of any type",
-                   input_type != NULL ? " from " : "",
-                   input_type != NULL ? input_type : "",
-                   input_structure != NULL ? " with " : "",
-                   input_structure != NULL ? input_structure : "");
-    } OSSL_TRACE_END(DECODER);
+            "(ctx %p) Looking for decoders producing %s%s%s%s%s%s\n",
+            (void *)ctx,
+            keytype != NULL ? keytype : "",
+            keytype != NULL ? " keys" : "keys of any type",
+            input_type != NULL ? " from " : "",
+            input_type != NULL ? input_type : "",
+            input_structure != NULL ? " with " : "",
+            input_structure != NULL ? input_structure : "");
+    }
+    OSSL_TRACE_END(DECODER);
 
     /* Allocate data. */
     if ((process_data = OPENSSL_zalloc(sizeof(*process_data))) == NULL)
@@ -437,10 +471,29 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
         goto err;
     }
 
-    process_data->object    = NULL;
-    process_data->libctx    = libctx;
+    process_data->object = NULL;
+    process_data->libctx = libctx;
     process_data->selection = ctx->selection;
-    process_data->keymgmts  = keymgmts;
+    process_data->keymgmts = keymgmts;
+
+    /*
+     * Collect passed and default properties to prioritize the decoders.
+     */
+    if (propquery != NULL)
+        p2 = pq = ossl_parse_query(libctx, propquery, 1);
+
+    plp = ossl_ctx_global_properties(libctx, 0);
+    if (plp != NULL && *plp != NULL) {
+        if (pq == NULL) {
+            pq = *plp;
+        } else {
+            p2 = ossl_property_merge(pq, *plp);
+            ossl_property_free(pq);
+            if (p2 == NULL)
+                goto err;
+            pq = p2;
+        }
+    }
 
     /*
      * Enumerate all keymgmts into a stack.
@@ -457,10 +510,11 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
      * upfront, as this ensures that the names for all loaded providers have
      * been registered by the time we try to resolve the keytype string.
      */
-    collect_data.ctx        = ctx;
-    collect_data.libctx     = libctx;
-    collect_data.keymgmts   = keymgmts;
-    collect_data.keytype    = keytype;
+    collect_data.ctx = ctx;
+    collect_data.libctx = libctx;
+    collect_data.keymgmts = keymgmts;
+    collect_data.keytype = keytype;
+    collect_data.pq = pq;
     EVP_KEYMGMT_do_all_provided(libctx, collect_keymgmt, &collect_data);
 
     if (collect_data.error_occurred)
@@ -472,11 +526,13 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
     if (collect_data.error_occurred)
         goto err;
 
-    OSSL_TRACE_BEGIN(DECODER) {
+    OSSL_TRACE_BEGIN(DECODER)
+    {
         BIO_printf(trc_out,
-                   "(ctx %p) Got %d decoders producing keys\n",
-                   (void *)ctx, collect_data.total);
-    } OSSL_TRACE_END(DECODER);
+            "(ctx %p) Got %d decoders producing keys\n",
+            (void *)ctx, collect_data.total);
+    }
+    OSSL_TRACE_END(DECODER);
 
     /*
      * Finish initializing the decoder context. If one or more decoders matched
@@ -487,15 +543,16 @@ static int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx,
         if (!OSSL_DECODER_CTX_set_construct(ctx, decoder_construct_pkey)
             || !OSSL_DECODER_CTX_set_construct_data(ctx, process_data)
             || !OSSL_DECODER_CTX_set_cleanup(ctx,
-                                             decoder_clean_pkey_construct_arg))
+                decoder_clean_pkey_construct_arg))
             goto err;
 
         process_data = NULL; /* Avoid it being freed */
     }
 
     ok = 1;
- err:
+err:
     decoder_clean_pkey_construct_arg(process_data);
+    ossl_property_free(p2);
     return ok;
 }
 
@@ -516,9 +573,9 @@ static EVP_KEYMGMT *keymgmt_dup(const EVP_KEYMGMT *keymgmt)
  */
 static OSSL_DECODER_CTX *
 ossl_decoder_ctx_for_pkey_dup(OSSL_DECODER_CTX *src,
-                              EVP_PKEY **pkey,
-                              const char *input_type,
-                              const char *input_structure)
+    EVP_PKEY **pkey,
+    const char *input_type,
+    const char *input_structure)
 {
     OSSL_DECODER_CTX *dest;
     struct decoder_pkey_data_st *process_data_src, *process_data_dest = NULL;
@@ -532,7 +589,7 @@ ossl_decoder_ctx_for_pkey_dup(OSSL_DECODER_CTX *src,
     }
 
     if (!OSSL_DECODER_CTX_set_input_type(dest, input_type)
-            || !OSSL_DECODER_CTX_set_input_structure(dest, input_structure)) {
+        || !OSSL_DECODER_CTX_set_input_structure(dest, input_structure)) {
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
         goto err;
     }
@@ -541,8 +598,8 @@ ossl_decoder_ctx_for_pkey_dup(OSSL_DECODER_CTX *src,
     if (src->decoder_insts != NULL) {
         dest->decoder_insts
             = sk_OSSL_DECODER_INSTANCE_deep_copy(src->decoder_insts,
-                                                 ossl_decoder_instance_dup,
-                                                 ossl_decoder_instance_free);
+                ossl_decoder_instance_dup,
+                ossl_decoder_instance_free);
         if (dest->decoder_insts == NULL) {
             ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
             goto err;
@@ -550,7 +607,7 @@ ossl_decoder_ctx_for_pkey_dup(OSSL_DECODER_CTX *src,
     }
 
     if (!OSSL_DECODER_CTX_set_construct(dest,
-                                        OSSL_DECODER_CTX_get_construct(src))) {
+            OSSL_DECODER_CTX_get_construct(src))) {
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
         goto err;
     }
@@ -573,18 +630,18 @@ ossl_decoder_ctx_for_pkey_dup(OSSL_DECODER_CTX *src,
         if (process_data_src->keymgmts != NULL) {
             process_data_dest->keymgmts
                 = sk_EVP_KEYMGMT_deep_copy(process_data_src->keymgmts,
-                                           keymgmt_dup,
-                                           EVP_KEYMGMT_free);
+                    keymgmt_dup,
+                    EVP_KEYMGMT_free);
             if (process_data_dest->keymgmts == NULL) {
                 ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_EVP_LIB);
                 goto err;
             }
         }
 
-        process_data_dest->object    = (void **)pkey;
-        process_data_dest->libctx    = process_data_src->libctx;
+        process_data_dest->object = (void **)pkey;
+        process_data_dest->libctx = process_data_src->libctx;
         process_data_dest->selection = process_data_src->selection;
-        process_data_dest->ctx       = dest;
+        process_data_dest->ctx = dest;
         if (!OSSL_DECODER_CTX_set_construct_data(dest, process_data_dest)) {
             ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
             goto err;
@@ -593,13 +650,13 @@ ossl_decoder_ctx_for_pkey_dup(OSSL_DECODER_CTX *src,
     }
 
     if (!OSSL_DECODER_CTX_set_cleanup(dest,
-                                      OSSL_DECODER_CTX_get_cleanup(src))) {
+            OSSL_DECODER_CTX_get_cleanup(src))) {
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
         goto err;
     }
 
     return dest;
- err:
+err:
     decoder_clean_pkey_construct_arg(process_data_dest);
     OSSL_DECODER_CTX_free(dest);
     return NULL;
@@ -638,17 +695,21 @@ static unsigned long decoder_cache_entry_hash(const DECODER_CACHE_ENTRY *cache)
     unsigned long hash = 17;
 
     hash = (hash * 23)
-           + (cache->propquery == NULL
-              ? 0 : ossl_lh_strcasehash(cache->propquery));
+        + (cache->propquery == NULL
+                ? 0
+                : ossl_lh_strcasehash(cache->propquery));
     hash = (hash * 23)
-           + (cache->input_structure == NULL
-              ? 0  : ossl_lh_strcasehash(cache->input_structure));
+        + (cache->input_structure == NULL
+                ? 0
+                : ossl_lh_strcasehash(cache->input_structure));
     hash = (hash * 23)
-           + (cache->input_type == NULL
-              ? 0  : ossl_lh_strcasehash(cache->input_type));
+        + (cache->input_type == NULL
+                ? 0
+                : ossl_lh_strcasehash(cache->input_type));
     hash = (hash * 23)
-           + (cache->keytype == NULL
-              ? 0  : ossl_lh_strcasehash(cache->keytype));
+        + (cache->keytype == NULL
+                ? 0
+                : ossl_lh_strcasehash(cache->keytype));
 
     hash ^= cache->selection;
 
@@ -675,7 +736,7 @@ static ossl_inline int nullstrcmp(const char *a, const char *b, int casecmp)
 }
 
 static int decoder_cache_entry_cmp(const DECODER_CACHE_ENTRY *a,
-                                   const DECODER_CACHE_ENTRY *b)
+    const DECODER_CACHE_ENTRY *b)
 {
     int cmp;
 
@@ -712,7 +773,7 @@ void *ossl_decoder_cache_new(OSSL_LIB_CTX *ctx)
         return NULL;
     }
     cache->hashtable = lh_DECODER_CACHE_ENTRY_new(decoder_cache_entry_hash,
-                                                  decoder_cache_entry_cmp);
+        decoder_cache_entry_cmp);
     if (cache->hashtable == NULL) {
         CRYPTO_THREAD_lock_free(cache->lock);
         OPENSSL_free(cache);
@@ -744,7 +805,6 @@ int ossl_decoder_cache_flush(OSSL_LIB_CTX *libctx)
     if (cache == NULL)
         return 0;
 
-
     if (!CRYPTO_THREAD_write_lock(cache->lock)) {
         ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
         return 0;
@@ -759,10 +819,10 @@ int ossl_decoder_cache_flush(OSSL_LIB_CTX *libctx)
 
 OSSL_DECODER_CTX *
 OSSL_DECODER_CTX_new_for_pkey(EVP_PKEY **pkey,
-                              const char *input_type,
-                              const char *input_structure,
-                              const char *keytype, int selection,
-                              OSSL_LIB_CTX *libctx, const char *propquery)
+    const char *input_type,
+    const char *input_structure,
+    const char *keytype, int selection,
+    OSSL_LIB_CTX *libctx, const char *propquery)
 {
     OSSL_DECODER_CTX *ctx = NULL;
     OSSL_PARAM decoder_params[] = {
@@ -780,13 +840,11 @@ OSSL_DECODER_CTX_new_for_pkey(EVP_PKEY **pkey,
         return NULL;
     }
     if (input_structure != NULL)
-        decoder_params[i++] =
-            OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
-                                             (char *)input_structure, 0);
+        decoder_params[i++] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
+            (char *)input_structure, 0);
     if (propquery != NULL)
-        decoder_params[i++] =
-            OSSL_PARAM_construct_utf8_string(OSSL_DECODER_PARAM_PROPERTIES,
-                                             (char *)propquery, 0);
+        decoder_params[i++] = OSSL_PARAM_construct_utf8_string(OSSL_DECODER_PARAM_PROPERTIES,
+            (char *)propquery, 0);
 
     /* It is safe to cast away the const here */
     cacheent.input_type = (char *)input_type;
@@ -816,13 +874,15 @@ OSSL_DECODER_CTX_new_for_pkey(EVP_PKEY **pkey,
             return NULL;
         }
 
-        OSSL_TRACE_BEGIN(DECODER) {
+        OSSL_TRACE_BEGIN(DECODER)
+        {
             BIO_printf(trc_out,
-                    "(ctx %p) Looking for %s decoders with selection %d\n",
-                    (void *)ctx, keytype, selection);
+                "(ctx %p) Looking for %s decoders with selection %d\n",
+                (void *)ctx, keytype, selection);
             BIO_printf(trc_out, "    input type: %s, input structure: %s\n",
-                    input_type, input_structure);
-        } OSSL_TRACE_END(DECODER);
+                input_type, input_structure);
+        }
+        OSSL_TRACE_END(DECODER);
 
         if (OSSL_DECODER_CTX_set_input_type(ctx, input_type)
             && OSSL_DECODER_CTX_set_input_structure(ctx, input_structure)
@@ -831,10 +891,12 @@ OSSL_DECODER_CTX_new_for_pkey(EVP_PKEY **pkey,
             && OSSL_DECODER_CTX_add_extra(ctx, libctx, propquery)
             && (propquery == NULL
                 || OSSL_DECODER_CTX_set_params(ctx, decoder_params))) {
-            OSSL_TRACE_BEGIN(DECODER) {
+            OSSL_TRACE_BEGIN(DECODER)
+            {
                 BIO_printf(trc_out, "(ctx %p) Got %d decoders\n",
-                        (void *)ctx, OSSL_DECODER_CTX_get_num_decoders(ctx));
-            } OSSL_TRACE_END(DECODER);
+                    (void *)ctx, OSSL_DECODER_CTX_get_num_decoders(ctx));
+            }
+            OSSL_TRACE_END(DECODER);
         } else {
             ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_OSSL_DECODER_LIB);
             OSSL_DECODER_CTX_free(ctx);
@@ -899,7 +961,7 @@ OSSL_DECODER_CTX_new_for_pkey(EVP_PKEY **pkey,
     CRYPTO_THREAD_unlock(cache->lock);
 
     return ctx;
- err:
+err:
     decoder_cache_entry_free(newcache);
     OSSL_DECODER_CTX_free(ctx);
     return NULL;
diff --git a/crypto/encode_decode/encoder_err.c b/crypto/encode_decode/encoder_err.c
index a904e87ef2e7c..79b12f9c31df2 100644
--- a/crypto/encode_decode/encoder_err.c
+++ b/crypto/encode_decode/encoder_err.c
@@ -15,13 +15,13 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA OSSL_ENCODER_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, OSSL_ENCODER_R_ENCODER_NOT_FOUND),
-    "encoder not found"},
-    {ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, OSSL_ENCODER_R_INCORRECT_PROPERTY_QUERY),
-    "incorrect property query"},
-    {ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, OSSL_ENCODER_R_MISSING_GET_PARAMS),
-    "missing get params"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, OSSL_ENCODER_R_ENCODER_NOT_FOUND),
+        "encoder not found" },
+    { ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, OSSL_ENCODER_R_INCORRECT_PROPERTY_QUERY),
+        "incorrect property query" },
+    { ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, OSSL_ENCODER_R_MISSING_GET_PARAMS),
+        "missing get params" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/encode_decode/encoder_lib.c b/crypto/encode_decode/encoder_lib.c
index 59d0c885a3e4c..753db526209cf 100644
--- a/crypto/encode_decode/encoder_lib.c
+++ b/crypto/encode_decode/encoder_lib.c
@@ -24,22 +24,22 @@
 #include "encoder_local.h"
 
 /* Number of octets per line */
-#define LABELED_BUF_PRINT_WIDTH    15
+#define LABELED_BUF_PRINT_WIDTH 15
 
-# ifdef SIXTY_FOUR_BIT_LONG
-#  define BN_FMTu "%lu"
-#  define BN_FMTx "%lx"
-# endif
+#ifdef SIXTY_FOUR_BIT_LONG
+#define BN_FMTu "%lu"
+#define BN_FMTx "%lx"
+#endif
 
-# ifdef SIXTY_FOUR_BIT
-#  define BN_FMTu "%llu"
-#  define BN_FMTx "%llx"
-# endif
+#ifdef SIXTY_FOUR_BIT
+#define BN_FMTu "%llu"
+#define BN_FMTx "%llx"
+#endif
 
-# ifdef THIRTY_TWO_BIT
-#  define BN_FMTu "%u"
-#  define BN_FMTx "%x"
-# endif
+#ifdef THIRTY_TWO_BIT
+#define BN_FMTu "%u"
+#define BN_FMTx "%x"
+#endif
 
 struct encoder_process_data_st {
     OSSL_ENCODER_CTX *ctx;
@@ -51,7 +51,7 @@ struct encoder_process_data_st {
     int current_encoder_inst_index;
 
     /* Processing data passed down through recursion */
-    int level;                   /* Recursion level */
+    int level; /* Recursion level */
     OSSL_ENCODER_INSTANCE *next_encoder_inst;
     int count_output_structure;
 
@@ -76,9 +76,9 @@ int OSSL_ENCODER_to_bio(OSSL_ENCODER_CTX *ctx, BIO *out)
 
     if (data.current_encoder_inst_index == 0) {
         ERR_raise_data(ERR_LIB_OSSL_ENCODER, OSSL_ENCODER_R_ENCODER_NOT_FOUND,
-                       "No encoders were found. For standard encoders you need "
-                       "at least one of the default or base providers "
-                       "available. Did you forget to load them?");
+            "No encoders were found. For standard encoders you need "
+            "at least one of the default or base providers "
+            "available. Did you forget to load them?");
         return 0;
     }
 
@@ -117,7 +117,7 @@ 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)
 {
     BIO *out;
     BUF_MEM *buf = NULL;
@@ -184,7 +184,7 @@ 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)
 {
     if (!ossl_assert(ctx != NULL) || !ossl_assert(output_type != NULL)) {
         ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -196,7 +196,7 @@ int OSSL_ENCODER_CTX_set_output_type(OSSL_ENCODER_CTX *ctx,
 }
 
 int OSSL_ENCODER_CTX_set_output_structure(OSSL_ENCODER_CTX *ctx,
-                                          const char *output_structure)
+    const char *output_structure)
 {
     if (!ossl_assert(ctx != NULL) || !ossl_assert(output_structure != NULL)) {
         ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -208,7 +208,7 @@ int OSSL_ENCODER_CTX_set_output_structure(OSSL_ENCODER_CTX *ctx,
 }
 
 static OSSL_ENCODER_INSTANCE *ossl_encoder_instance_new(OSSL_ENCODER *encoder,
-                                                        void *encoderctx)
+    void *encoderctx)
 {
     OSSL_ENCODER_INSTANCE *encoder_inst = NULL;
     const OSSL_PROVIDER *prov;
@@ -234,8 +234,8 @@ static OSSL_ENCODER_INSTANCE *ossl_encoder_instance_new(OSSL_ENCODER *encoder,
     props = ossl_encoder_parsed_properties(encoder);
     if (props == NULL) {
         ERR_raise_data(ERR_LIB_OSSL_DECODER, ERR_R_INVALID_PROPERTY_DEFINITION,
-                       "there are no property definitions with encoder %s",
-                       OSSL_ENCODER_get0_name(encoder));
+            "there are no property definitions with encoder %s",
+            OSSL_ENCODER_get0_name(encoder));
         goto err;
     }
 
@@ -244,10 +244,10 @@ static OSSL_ENCODER_INSTANCE *ossl_encoder_instance_new(OSSL_ENCODER *encoder,
     encoder_inst->output_type = ossl_property_get_string_value(libctx, prop);
     if (encoder_inst->output_type == NULL) {
         ERR_raise_data(ERR_LIB_OSSL_DECODER, ERR_R_INVALID_PROPERTY_DEFINITION,
-                       "the mandatory 'output' property is missing "
-                       "for encoder %s (properties: %s)",
-                       OSSL_ENCODER_get0_name(encoder),
-                       OSSL_ENCODER_get0_properties(encoder));
+            "the mandatory 'output' property is missing "
+            "for encoder %s (properties: %s)",
+            OSSL_ENCODER_get0_name(encoder),
+            OSSL_ENCODER_get0_properties(encoder));
         goto err;
     }
 
@@ -260,7 +260,7 @@ static OSSL_ENCODER_INSTANCE *ossl_encoder_instance_new(OSSL_ENCODER *encoder,
     encoder_inst->encoder = encoder;
     encoder_inst->encoderctx = encoderctx;
     return encoder_inst;
- err:
+err:
     ossl_encoder_instance_free(encoder_inst);
     return NULL;
 }
@@ -278,27 +278,28 @@ void ossl_encoder_instance_free(OSSL_ENCODER_INSTANCE *encoder_inst)
 }
 
 static int ossl_encoder_ctx_add_encoder_inst(OSSL_ENCODER_CTX *ctx,
-                                             OSSL_ENCODER_INSTANCE *ei)
+    OSSL_ENCODER_INSTANCE *ei)
 {
     int ok;
 
     if (ctx->encoder_insts == NULL
-        && (ctx->encoder_insts =
-            sk_OSSL_ENCODER_INSTANCE_new_null()) == NULL) {
+        && (ctx->encoder_insts = sk_OSSL_ENCODER_INSTANCE_new_null()) == NULL) {
         ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_CRYPTO_LIB);
         return 0;
     }
 
     ok = (sk_OSSL_ENCODER_INSTANCE_push(ctx->encoder_insts, ei) > 0);
     if (ok) {
-        OSSL_TRACE_BEGIN(ENCODER) {
+        OSSL_TRACE_BEGIN(ENCODER)
+        {
             BIO_printf(trc_out,
-                       "(ctx %p) Added encoder instance %p (encoder %p):\n"
-                       "    %s with %s\n",
-                       (void *)ctx, (void *)ei, (void *)ei->encoder,
-                       OSSL_ENCODER_get0_name(ei->encoder),
-                       OSSL_ENCODER_get0_properties(ei->encoder));
-        } OSSL_TRACE_END(ENCODER);
+                "(ctx %p) Added encoder instance %p (encoder %p):\n"
+                "    %s with %s\n",
+                (void *)ctx, (void *)ei, (void *)ei->encoder,
+                OSSL_ENCODER_get0_name(ei->encoder),
+                OSSL_ENCODER_get0_properties(ei->encoder));
+        }
+        OSSL_TRACE_END(ENCODER);
     }
     return ok;
 }
@@ -319,8 +320,7 @@ int OSSL_ENCODER_CTX_add_encoder(OSSL_ENCODER_CTX *ctx, OSSL_ENCODER *encoder)
     provctx = OSSL_PROVIDER_get0_provider_ctx(prov);
 
     if ((encoderctx = encoder->newctx(provctx)) == NULL
-        || (encoder_inst =
-            ossl_encoder_instance_new(encoder, encoderctx)) == NULL)
+        || (encoder_inst = ossl_encoder_instance_new(encoder, encoderctx)) == NULL)
         goto err;
     /* Avoid double free of encoderctx on further errors */
     encoderctx = NULL;
@@ -329,7 +329,7 @@ int OSSL_ENCODER_CTX_add_encoder(OSSL_ENCODER_CTX *ctx, OSSL_ENCODER *encoder)
         goto err;
 
     return 1;
- err:
+err:
     ossl_encoder_instance_free(encoder_inst);
     if (encoderctx != NULL)
         encoder->freectx(encoderctx);
@@ -337,7 +337,7 @@ 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)
 {
     return 1;
 }
@@ -350,7 +350,7 @@ int OSSL_ENCODER_CTX_get_num_encoders(OSSL_ENCODER_CTX *ctx)
 }
 
 int OSSL_ENCODER_CTX_set_construct(OSSL_ENCODER_CTX *ctx,
-                                   OSSL_ENCODER_CONSTRUCT *construct)
+    OSSL_ENCODER_CONSTRUCT *construct)
 {
     if (!ossl_assert(ctx != NULL)) {
         ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -361,7 +361,7 @@ int OSSL_ENCODER_CTX_set_construct(OSSL_ENCODER_CTX *ctx,
 }
 
 int OSSL_ENCODER_CTX_set_construct_data(OSSL_ENCODER_CTX *ctx,
-                                        void *construct_data)
+    void *construct_data)
 {
     if (!ossl_assert(ctx != NULL)) {
         ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -372,7 +372,7 @@ int OSSL_ENCODER_CTX_set_construct_data(OSSL_ENCODER_CTX *ctx,
 }
 
 int OSSL_ENCODER_CTX_set_cleanup(OSSL_ENCODER_CTX *ctx,
-                                 OSSL_ENCODER_CLEANUP *cleanup)
+    OSSL_ENCODER_CLEANUP *cleanup)
 {
     if (!ossl_assert(ctx != NULL)) {
         ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_NULL_PARAMETER);
@@ -424,14 +424,13 @@ static int encoder_process(struct encoder_process_data_st *data)
     OSSL_PARAM abstract[10];
     const OSSL_PARAM *current_abstract = NULL;
     int i;
-    int ok = -1;  /* -1 signifies that the lookup loop gave nothing */
+    int ok = -1; /* -1 signifies that the lookup loop gave nothing */
     int top = 0;
 
     if (data->next_encoder_inst == NULL) {
         /* First iteration, where we prepare for what is to come */
 
-        data->count_output_structure =
-            data->ctx->output_structure == NULL ? -1 : 0;
+        data->count_output_structure = data->ctx->output_structure == NULL ? -1 : 0;
         top = 1;
     }
 
@@ -442,19 +441,13 @@ static int encoder_process(struct encoder_process_data_st *data)
         struct encoder_process_data_st new_data;
 
         if (!top)
-            next_encoder =
-                OSSL_ENCODER_INSTANCE_get_encoder(data->next_encoder_inst);
-
-        current_encoder_inst =
-            sk_OSSL_ENCODER_INSTANCE_value(data->ctx->encoder_insts, i);
-        current_encoder =
-            OSSL_ENCODER_INSTANCE_get_encoder(current_encoder_inst);
-        current_encoder_ctx =
-            OSSL_ENCODER_INSTANCE_get_encoder_ctx(current_encoder_inst);
-        current_output_type =
-            OSSL_ENCODER_INSTANCE_get_output_type(current_encoder_inst);
-        current_output_structure =
-            OSSL_ENCODER_INSTANCE_get_output_structure(current_encoder_inst);
+            next_encoder = OSSL_ENCODER_INSTANCE_get_encoder(data->next_encoder_inst);
+
+        current_encoder_inst = sk_OSSL_ENCODER_INSTANCE_value(data->ctx->encoder_insts, i);
+        current_encoder = OSSL_ENCODER_INSTANCE_get_encoder(current_encoder_inst);
+        current_encoder_ctx = OSSL_ENCODER_INSTANCE_get_encoder_ctx(current_encoder_inst);
+        current_output_type = OSSL_ENCODER_INSTANCE_get_output_type(current_encoder_inst);
+        current_output_structure = OSSL_ENCODER_INSTANCE_get_output_structure(current_encoder_inst);
         memset(&new_data, 0, sizeof(new_data));
         new_data.ctx = data->ctx;
         new_data.current_encoder_inst_index = i;
@@ -462,12 +455,14 @@ static int encoder_process(struct encoder_process_data_st *data)
         new_data.count_output_structure = data->count_output_structure;
         new_data.level = data->level + 1;
 
-        OSSL_TRACE_BEGIN(ENCODER) {
+        OSSL_TRACE_BEGIN(ENCODER)
+        {
             BIO_printf(trc_out,
-                       "[%d] (ctx %p) Considering encoder instance %p (encoder %p)\n",
-                       data->level, (void *)data->ctx,
-                       (void *)current_encoder_inst, (void *)current_encoder);
-        } OSSL_TRACE_END(ENCODER);
+                "[%d] (ctx %p) Considering encoder instance %p (encoder %p)\n",
+                data->level, (void *)data->ctx,
+                (void *)current_encoder_inst, (void *)current_encoder);
+        }
+        OSSL_TRACE_END(ENCODER);
 
         /*
          * If this is the top call, we check if the output type of the current
@@ -479,23 +474,28 @@ static int encoder_process(struct encoder_process_data_st *data)
         if (top) {
             if (data->ctx->output_type != NULL
                 && OPENSSL_strcasecmp(current_output_type,
-                                      data->ctx->output_type) != 0) {
-                OSSL_TRACE_BEGIN(ENCODER) {
+                       data->ctx->output_type)
+                    != 0) {
+                OSSL_TRACE_BEGIN(ENCODER)
+                {
                     BIO_printf(trc_out,
-                               "[%d]    Skipping because current encoder output type (%s) != desired output type (%s)\n",
-                               data->level,
-                               current_output_type, data->ctx->output_type);
-                } OSSL_TRACE_END(ENCODER);
+                        "[%d]    Skipping because current encoder output type (%s) != desired output type (%s)\n",
+                        data->level,
+                        current_output_type, data->ctx->output_type);
+                }
+                OSSL_TRACE_END(ENCODER);
                 continue;
             }
         } else {
             if (!OSSL_ENCODER_is_a(next_encoder, current_output_type)) {
-                OSSL_TRACE_BEGIN(ENCODER) {
+                OSSL_TRACE_BEGIN(ENCODER)
+                {
                     BIO_printf(trc_out,
-                               "[%d]    Skipping because current encoder output type (%s) != name of encoder %p\n",
-                               data->level,
-                               current_output_type, (void *)next_encoder);
-                } OSSL_TRACE_END(ENCODER);
+                        "[%d]    Skipping because current encoder output type (%s) != name of encoder %p\n",
+                        data->level,
+                        current_output_type, (void *)next_encoder);
+                }
+                OSSL_TRACE_END(ENCODER);
                 continue;
             }
         }
@@ -508,14 +508,17 @@ static int encoder_process(struct encoder_process_data_st *data)
         if (data->ctx->output_structure != NULL
             && current_output_structure != NULL) {
             if (OPENSSL_strcasecmp(data->ctx->output_structure,
-                                   current_output_structure) != 0) {
-                OSSL_TRACE_BEGIN(ENCODER) {
+                    current_output_structure)
+                != 0) {
+                OSSL_TRACE_BEGIN(ENCODER)
+                {
                     BIO_printf(trc_out,
-                               "[%d]    Skipping because current encoder output structure (%s) != ctx output structure (%s)\n",
-                               data->level,
-                               current_output_structure,
-                               data->ctx->output_structure);
-                } OSSL_TRACE_END(ENCODER);
+                        "[%d]    Skipping because current encoder output structure (%s) != ctx output structure (%s)\n",
+                        data->level,
+                        current_output_structure,
+                        data->ctx->output_structure);
+                }
+                OSSL_TRACE_END(ENCODER);
                 continue;
             }
 
@@ -546,11 +549,13 @@ static int encoder_process(struct encoder_process_data_st *data)
         if (ok != 0)
             break;
 
-        OSSL_TRACE_BEGIN(ENCODER) {
+        OSSL_TRACE_BEGIN(ENCODER)
+        {
             BIO_printf(trc_out,
-                       "[%d]    Skipping because recursion level %d failed\n",
-                       data->level, new_data.level);
-        } OSSL_TRACE_END(ENCODER);
+                "[%d]    Skipping because recursion level %d failed\n",
+                data->level, new_data.level);
+        }
+        OSSL_TRACE_END(ENCODER);
     }
 
     /*
@@ -560,11 +565,13 @@ static int encoder_process(struct encoder_process_data_st *data)
     if (i < 0) {
         ok = -1;
 
-        OSSL_TRACE_BEGIN(ENCODER) {
+        OSSL_TRACE_BEGIN(ENCODER)
+        {
             BIO_printf(trc_out,
-                       "[%d] (ctx %p) No suitable encoder found\n",
-                       data->level, (void *)data->ctx);
-        } OSSL_TRACE_END(ENCODER);
+                "[%d] (ctx %p) No suitable encoder found\n",
+                data->level, (void *)data->ctx);
+        }
+        OSSL_TRACE_END(ENCODER);
     } else {
         /* Preparations */
 
@@ -590,9 +597,8 @@ static int encoder_process(struct encoder_process_data_st *data)
             if (data->count_output_structure == 0)
                 return 0;
 
-            original_data =
-                data->ctx->construct(current_encoder_inst,
-                                     data->ctx->construct_data);
+            original_data = data->ctx->construct(current_encoder_inst,
+                data->ctx->construct_data);
 
             /* Also set the data type, using the encoder implementation name */
             data->data_type = OSSL_ENCODER_get0_name(current_encoder);
@@ -617,21 +623,17 @@ static int encoder_process(struct encoder_process_data_st *data)
                  */
 
                 OSSL_PARAM *abstract_p = abstract;
-                const char *prev_output_structure =
-                    OSSL_ENCODER_INSTANCE_get_output_structure(data->prev_encoder_inst);
+                const char *prev_output_structure = OSSL_ENCODER_INSTANCE_get_output_structure(data->prev_encoder_inst);
 
-                *abstract_p++ =
-                    OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
-                                                     (char *)data->data_type, 0);
+                *abstract_p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
+                    (char *)data->data_type, 0);
                 if (prev_output_structure != NULL)
-                    *abstract_p++ =
-                        OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
-                                                         (char *)prev_output_structure,
-                                                         0);
-                *abstract_p++ =
-                    OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_DATA,
-                                                      data->running_output,
-                                                      data->running_output_length);
+                    *abstract_p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
+                        (char *)prev_output_structure,
+                        0);
+                *abstract_p++ = OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_DATA,
+                    data->running_output,
+                    data->running_output_length);
                 *abstract_p = OSSL_PARAM_construct_end();
                 current_abstract = abstract;
             }
@@ -651,23 +653,25 @@ static int encoder_process(struct encoder_process_data_st *data)
             if (top)
                 current_out = data->bio;
             else if ((current_out = allocated_out = BIO_new(BIO_s_mem()))
-                     == NULL)
-                ok = 0;     /* Assume BIO_new() recorded an error */
+                == NULL)
+                ok = 0; /* Assume BIO_new() recorded an error */
 
             if (ok)
                 ok = (cbio = ossl_core_bio_new_from_bio(current_out)) != NULL;
             if (ok) {
                 ok = current_encoder->encode(current_encoder_ctx, cbio,
-                                             original_data, current_abstract,
-                                             data->ctx->selection,
-                                             ossl_pw_passphrase_callback_enc,
-                                             &data->ctx->pwdata);
-                OSSL_TRACE_BEGIN(ENCODER) {
+                    original_data, current_abstract,
+                    data->ctx->selection,
+                    ossl_pw_passphrase_callback_enc,
+                    &data->ctx->pwdata);
+                OSSL_TRACE_BEGIN(ENCODER)
+                {
                     BIO_printf(trc_out,
-                               "[%d] (ctx %p) Running encoder instance %p => %d\n",
-                               data->level, (void *)data->ctx,
-                               (void *)current_encoder_inst, ok);
-                } OSSL_TRACE_END(ENCODER);
+                        "[%d] (ctx %p) Running encoder instance %p => %d\n",
+                        data->level, (void *)data->ctx,
+                        (void *)current_encoder_inst, ok);
+                }
+                OSSL_TRACE_END(ENCODER);
             }
 
             ossl_core_bio_free(cbio);
@@ -726,7 +730,7 @@ int ossl_bio_print_labeled_bignum(BIO *out, const char *label, const BIGNUM *bn)
             neg = "-";
 
         return BIO_printf(out, "%s%s%s" BN_FMTu " (%s0x" BN_FMTx ")\n",
-                          label, post_label_spc, neg, words[0], neg, words[0]);
+            label, post_label_spc, neg, words[0], neg, words[0]);
     }
 
     hex_str = BN_bn2hex(bn);
@@ -762,8 +766,9 @@ int ossl_bio_print_labeled_bignum(BIO *out, const char *label, const BIGNUM *bn)
             use_sep = 0; /* The first byte on the next line doesn't have a : */
         }
         if (BIO_printf(out, "%s%c%c", use_sep ? ":" : "",
-                       tolower((unsigned char)p[0]),
-                       tolower((unsigned char)p[1])) <= 0)
+                tolower((unsigned char)p[0]),
+                tolower((unsigned char)p[1]))
+            <= 0)
             goto err;
         ++bytes;
         p += 2;
@@ -778,7 +783,7 @@ int ossl_bio_print_labeled_bignum(BIO *out, const char *label, const BIGNUM *bn)
 }
 
 int ossl_bio_print_labeled_buf(BIO *out, const char *label,
-                           const unsigned char *buf, size_t buflen)
+    const unsigned char *buf, size_t buflen)
 {
     size_t i;
 
@@ -794,7 +799,8 @@ int ossl_bio_print_labeled_buf(BIO *out, const char *label,
         }
 
         if (BIO_printf(out, "%02x%s", buf[i],
-                                 (i == buflen - 1) ? "" : ":") <= 0)
+                (i == buflen - 1) ? "" : ":")
+            <= 0)
             return 0;
     }
     if (BIO_printf(out, "\n") <= 0)
diff --git a/crypto/encode_decode/encoder_local.h b/crypto/encode_decode/encoder_local.h
index a2846d309ea8a..439bd085f9369 100644
--- a/crypto/encode_decode/encoder_local.h
+++ b/crypto/encode_decode/encoder_local.h
@@ -56,9 +56,9 @@ struct ossl_decoder_st {
 };
 
 struct ossl_encoder_instance_st {
-    OSSL_ENCODER *encoder;        /* Never NULL */
-    void *encoderctx;             /* Never NULL */
-    const char *output_type;      /* Never NULL */
+    OSSL_ENCODER *encoder; /* Never NULL */
+    void *encoderctx; /* Never NULL */
+    const char *output_type; /* Never NULL */
     const char *output_structure; /* May be NULL */
 };
 
@@ -104,11 +104,13 @@ struct ossl_encoder_ctx_st {
 };
 
 struct ossl_decoder_instance_st {
-    OSSL_DECODER *decoder;       /* Never NULL */
-    void *decoderctx;            /* Never NULL */
-    const char *input_type;      /* Never NULL */
+    OSSL_DECODER *decoder; /* Never NULL */
+    void *decoderctx; /* Never NULL */
+    const char *input_type; /* Never NULL */
     const char *input_structure; /* May be NULL */
     int input_type_id;
+    int order; /* For stable ordering of decoders wrt proqs */
+    int score; /* For ordering decoders wrt proqs */
 
     unsigned int flag_input_structure_was_set : 1;
 };
@@ -168,4 +170,4 @@ const OSSL_PROPERTY_LIST *
 ossl_encoder_parsed_properties(const OSSL_ENCODER *encoder);
 
 int ossl_decoder_fast_is_a(OSSL_DECODER *decoder,
-                           const char *name, int *id_cache);
+    const char *name, int *id_cache);
diff --git a/crypto/encode_decode/encoder_meth.c b/crypto/encode_decode/encoder_meth.c
index e99eaecbfb393..89c3d7b887cca 100644
--- a/crypto/encode_decode/encoder_meth.c
+++ b/crypto/encode_decode/encoder_meth.c
@@ -77,9 +77,9 @@ void OSSL_ENCODER_free(OSSL_ENCODER *encoder)
 /* Data to be passed through ossl_method_construct() */
 struct encoder_data_st {
     OSSL_LIB_CTX *libctx;
-    int id;                      /* For get_encoder_from_store() */
-    const char *names;           /* For get_encoder_from_store() */
-    const char *propquery;       /* For get_encoder_from_store() */
+    int id; /* For get_encoder_from_store() */
+    const char *names; /* For get_encoder_from_store() */
+    const char *propquery; /* For get_encoder_from_store() */
 
     OSSL_METHOD_STORE *tmp_store; /* For get_tmp_encoder_store() */
 
@@ -137,7 +137,7 @@ static int unreserve_encoder_store(void *store, void *data)
 
 /* Get encoder methods from a store, or put one in */
 static void *get_encoder_from_store(void *store, const OSSL_PROVIDER **prov,
-                                    void *data)
+    void *data)
 {
     struct encoder_data_st *methdata = data;
     void *method = NULL;
@@ -172,9 +172,9 @@ static void *get_encoder_from_store(void *store, const OSSL_PROVIDER **prov,
 }
 
 static int put_encoder_in_store(void *store, void *method,
-                                const OSSL_PROVIDER *prov,
-                                const char *names, const char *propdef,
-                                void *data)
+    const OSSL_PROVIDER *prov,
+    const char *names, const char *propdef,
+    void *data)
 {
     struct encoder_data_st *methdata = data;
     OSSL_NAMEMAP *namemap;
@@ -201,13 +201,13 @@ static int put_encoder_in_store(void *store, void *method,
         return 0;
 
     return ossl_method_store_add(store, prov, id, propdef, method,
-                                 ossl_encoder_up_ref,
-                                 ossl_encoder_free);
+        ossl_encoder_up_ref,
+        ossl_encoder_free);
 }
 
 /* Create and populate a encoder method */
 static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
-                                    OSSL_PROVIDER *prov)
+    OSSL_PROVIDER *prov)
 {
     OSSL_ENCODER *encoder = NULL;
     const OSSL_DISPATCH *fns = algodef->implementation;
@@ -222,7 +222,8 @@ static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
     }
     encoder->base.algodef = algodef;
     if ((encoder->base.parsed_propdef
-         = ossl_parse_property(libctx, algodef->property_definition)) == NULL) {
+            = ossl_parse_property(libctx, algodef->property_definition))
+        == NULL) {
         OSSL_ENCODER_free(encoder);
         return NULL;
     }
@@ -231,38 +232,31 @@ static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
         switch (fns->function_id) {
         case OSSL_FUNC_ENCODER_NEWCTX:
             if (encoder->newctx == NULL)
-                encoder->newctx =
-                    OSSL_FUNC_encoder_newctx(fns);
+                encoder->newctx = OSSL_FUNC_encoder_newctx(fns);
             break;
         case OSSL_FUNC_ENCODER_FREECTX:
             if (encoder->freectx == NULL)
-                encoder->freectx =
-                    OSSL_FUNC_encoder_freectx(fns);
+                encoder->freectx = OSSL_FUNC_encoder_freectx(fns);
             break;
         case OSSL_FUNC_ENCODER_GET_PARAMS:
             if (encoder->get_params == NULL)
-                encoder->get_params =
-                    OSSL_FUNC_encoder_get_params(fns);
+                encoder->get_params = OSSL_FUNC_encoder_get_params(fns);
             break;
         case OSSL_FUNC_ENCODER_GETTABLE_PARAMS:
             if (encoder->gettable_params == NULL)
-                encoder->gettable_params =
-                    OSSL_FUNC_encoder_gettable_params(fns);
+                encoder->gettable_params = OSSL_FUNC_encoder_gettable_params(fns);
             break;
         case OSSL_FUNC_ENCODER_SET_CTX_PARAMS:
             if (encoder->set_ctx_params == NULL)
-                encoder->set_ctx_params =
-                    OSSL_FUNC_encoder_set_ctx_params(fns);
+                encoder->set_ctx_params = OSSL_FUNC_encoder_set_ctx_params(fns);
             break;
         case OSSL_FUNC_ENCODER_SETTABLE_CTX_PARAMS:
             if (encoder->settable_ctx_params == NULL)
-                encoder->settable_ctx_params =
-                    OSSL_FUNC_encoder_settable_ctx_params(fns);
+                encoder->settable_ctx_params = OSSL_FUNC_encoder_settable_ctx_params(fns);
             break;
         case OSSL_FUNC_ENCODER_DOES_SELECTION:
             if (encoder->does_selection == NULL)
-                encoder->does_selection =
-                    OSSL_FUNC_encoder_does_selection(fns);
+                encoder->does_selection = OSSL_FUNC_encoder_does_selection(fns);
             break;
         case OSSL_FUNC_ENCODER_ENCODE:
             if (encoder->encode == NULL)
@@ -270,13 +264,11 @@ static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
             break;
         case OSSL_FUNC_ENCODER_IMPORT_OBJECT:
             if (encoder->import_object == NULL)
-                encoder->import_object =
-                    OSSL_FUNC_encoder_import_object(fns);
+                encoder->import_object = OSSL_FUNC_encoder_import_object(fns);
             break;
         case OSSL_FUNC_ENCODER_FREE_OBJECT:
             if (encoder->free_object == NULL)
-                encoder->free_object =
-                    OSSL_FUNC_encoder_free_object(fns);
+                encoder->free_object = OSSL_FUNC_encoder_free_object(fns);
             break;
         }
     }
@@ -286,9 +278,9 @@ static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
      * You must have the encoding driver functions.
      */
     if (!((encoder->newctx == NULL && encoder->freectx == NULL)
-          || (encoder->newctx != NULL && encoder->freectx != NULL)
-          || (encoder->import_object != NULL && encoder->free_object != NULL)
-          || (encoder->import_object == NULL && encoder->free_object == NULL))
+            || (encoder->newctx != NULL && encoder->freectx != NULL)
+            || (encoder->import_object != NULL && encoder->free_object != NULL)
+            || (encoder->import_object == NULL && encoder->free_object == NULL))
         || encoder->encode == NULL) {
         OSSL_ENCODER_free(encoder);
         ERR_raise(ERR_LIB_OSSL_ENCODER, ERR_R_INVALID_PROVIDER_FUNCTIONS);
@@ -304,14 +296,13 @@ static void *encoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
     return encoder;
 }
 
-
 /*
  * The core fetching functionality passes the names of the implementation.
  * This function is responsible to getting an identity number for them,
  * then call encoder_from_algorithm() with that identity number.
  */
 static void *construct_encoder(const OSSL_ALGORITHM *algodef,
-                               OSSL_PROVIDER *prov, void *data)
+    OSSL_PROVIDER *prov, void *data)
 {
     /*
      * This function is only called if get_encoder_from_store() returned
@@ -359,7 +350,7 @@ static void free_encoder(void *method)
 /* Fetching support.  Can fetch by numeric identity or by name */
 static OSSL_ENCODER *
 inner_ossl_encoder_fetch(struct encoder_data_st *methdata,
-                         const char *name, const char *properties)
+    const char *name, const char *properties)
 {
     OSSL_METHOD_STORE *store = get_encoder_store(methdata->libctx);
     OSSL_NAMEMAP *namemap = ossl_namemap_stored(methdata->libctx);
@@ -398,8 +389,9 @@ inner_ossl_encoder_fetch(struct encoder_data_st *methdata,
         methdata->propquery = propq;
         methdata->flag_construct_error_occurred = 0;
         if ((method = ossl_method_construct(methdata->libctx, OSSL_OP_ENCODER,
-                                            &prov, 0 /* !force_cache */,
-                                            &mcm, methdata)) != NULL) {
+                 &prov, 0 /* !force_cache */,
+                 &mcm, methdata))
+            != NULL) {
             /*
              * If construction did create a method for us, we know that
              * there is a correct name_id and meth_id, since those have
@@ -409,7 +401,7 @@ inner_ossl_encoder_fetch(struct encoder_data_st *methdata,
             if (id == 0)
                 id = ossl_namemap_name2num(namemap, name);
             ossl_method_store_cache_set(store, prov, id, propq, method,
-                                        up_ref_encoder, free_encoder);
+                up_ref_encoder, free_encoder);
         }
 
         /*
@@ -425,17 +417,17 @@ inner_ossl_encoder_fetch(struct encoder_data_st *methdata,
         if (name == NULL)
             name = ossl_namemap_num2name(namemap, id, 0);
         ERR_raise_data(ERR_LIB_OSSL_ENCODER, code,
-                       "%s, Name (%s : %d), Properties (%s)",
-                       ossl_lib_ctx_get_descriptor(methdata->libctx),
-                       name == NULL ? "<null>" : name, id,
-                       properties == NULL ? "<null>" : properties);
+            "%s, Name (%s : %d), Properties (%s)",
+            ossl_lib_ctx_get_descriptor(methdata->libctx),
+            name == NULL ? "<null>" : name, id,
+            properties == NULL ? "<null>" : properties);
     }
 
     return method;
 }
 
 OSSL_ENCODER *OSSL_ENCODER_fetch(OSSL_LIB_CTX *libctx, const char *name,
-                                 const char *properties)
+    const char *properties)
 {
     struct encoder_data_st methdata;
     void *method;
@@ -545,9 +537,9 @@ static void do_one(ossl_unused int id, void *method, void *arg)
 }
 
 void OSSL_ENCODER_do_all_provided(OSSL_LIB_CTX *libctx,
-                                  void (*user_fn)(OSSL_ENCODER *encoder,
-                                                  void *arg),
-                                  void *user_arg)
+    void (*user_fn)(OSSL_ENCODER *encoder,
+        void *arg),
+    void *user_arg)
 {
     struct encoder_data_st methdata;
     struct do_one_data_st data;
@@ -565,8 +557,8 @@ void OSSL_ENCODER_do_all_provided(OSSL_LIB_CTX *libctx,
 }
 
 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)
 {
     if (encoder == NULL)
         return 0;
@@ -622,7 +614,7 @@ 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[])
 {
     int ok = 1;
     size_t i;
@@ -638,8 +630,7 @@ int OSSL_ENCODER_CTX_set_params(OSSL_ENCODER_CTX *ctx,
 
     l = OSSL_ENCODER_CTX_get_num_encoders(ctx);
     for (i = 0; i < l; i++) {
-        OSSL_ENCODER_INSTANCE *encoder_inst =
-            sk_OSSL_ENCODER_INSTANCE_value(ctx->encoder_insts, i);
+        OSSL_ENCODER_INSTANCE *encoder_inst = sk_OSSL_ENCODER_INSTANCE_value(ctx->encoder_insts, i);
         OSSL_ENCODER *encoder = OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst);
         void *encoderctx = OSSL_ENCODER_INSTANCE_get_encoder_ctx(encoder_inst);
 
@@ -655,7 +646,7 @@ void OSSL_ENCODER_CTX_free(OSSL_ENCODER_CTX *ctx)
 {
     if (ctx != NULL) {
         sk_OSSL_ENCODER_INSTANCE_pop_free(ctx->encoder_insts,
-                                          ossl_encoder_instance_free);
+            ossl_encoder_instance_free);
         OPENSSL_free(ctx->construct_data);
         ossl_pw_clear_passphrase_data(&ctx->pwdata);
         OPENSSL_free(ctx);
diff --git a/crypto/encode_decode/encoder_pkey.c b/crypto/encode_decode/encoder_pkey.c
index 97aad88202290..10635337b79ef 100644
--- a/crypto/encode_decode/encoder_pkey.c
+++ b/crypto/encode_decode/encoder_pkey.c
@@ -24,44 +24,42 @@
 DEFINE_STACK_OF(OSSL_ENCODER)
 
 int OSSL_ENCODER_CTX_set_cipher(OSSL_ENCODER_CTX *ctx,
-                                const char *cipher_name,
-                                const char *propquery)
+    const char *cipher_name,
+    const char *propquery)
 {
     OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END, OSSL_PARAM_END };
 
-    params[0] =
-        OSSL_PARAM_construct_utf8_string(OSSL_ENCODER_PARAM_CIPHER,
-                                         (void *)cipher_name, 0);
-    params[1] =
-        OSSL_PARAM_construct_utf8_string(OSSL_ENCODER_PARAM_PROPERTIES,
-                                         (void *)propquery, 0);
+    params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ENCODER_PARAM_CIPHER,
+        (void *)cipher_name, 0);
+    params[1] = OSSL_PARAM_construct_utf8_string(OSSL_ENCODER_PARAM_PROPERTIES,
+        (void *)propquery, 0);
 
     return OSSL_ENCODER_CTX_set_params(ctx, params);
 }
 
 int OSSL_ENCODER_CTX_set_passphrase(OSSL_ENCODER_CTX *ctx,
-                                    const unsigned char *kstr,
-                                    size_t klen)
+    const unsigned char *kstr,
+    size_t klen)
 {
     return ossl_pw_set_passphrase(&ctx->pwdata, kstr, klen);
 }
 
 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)
 {
     return ossl_pw_set_ui_method(&ctx->pwdata, ui_method, ui_data);
 }
 
 int OSSL_ENCODER_CTX_set_pem_password_cb(OSSL_ENCODER_CTX *ctx,
-                                         pem_password_cb *cb, void *cbarg)
+    pem_password_cb *cb, void *cbarg)
 {
     return ossl_pw_set_pem_password_cb(&ctx->pwdata, cb, cbarg);
 }
 
 int OSSL_ENCODER_CTX_set_passphrase_cb(OSSL_ENCODER_CTX *ctx,
-                                       OSSL_PASSPHRASE_CALLBACK *cb,
-                                       void *cbarg)
+    OSSL_PASSPHRASE_CALLBACK *cb,
+    void *cbarg)
 {
     return ossl_pw_set_ossl_passphrase_cb(&ctx->pwdata, cb, cbarg);
 }
@@ -79,7 +77,7 @@ struct collected_encoder_st {
 
     const OSSL_PROVIDER *keymgmt_prov;
     OSSL_ENCODER_CTX *ctx;
-    unsigned int flag_find_same_provider:1;
+    unsigned int flag_find_same_provider : 1;
 
     int error_occurred;
 };
@@ -92,7 +90,7 @@ static void collect_encoder(OSSL_ENCODER *encoder, void *arg)
     if (data->error_occurred)
         return;
 
-    data->error_occurred = 1;     /* Assume the worst */
+    data->error_occurred = 1; /* Assume the worst */
 
     prov = OSSL_ENCODER_get0_provider(encoder);
     /*
@@ -111,7 +109,7 @@ static void collect_encoder(OSSL_ENCODER *encoder, void *arg)
                 match = (data->id_names[i] == encoder->base.id);
             else
                 match = OSSL_ENCODER_is_a(encoder,
-                                          sk_OPENSSL_CSTRING_value(data->names, i));
+                    sk_OPENSSL_CSTRING_value(data->names, i));
             if (!match
                 || (encoder->does_selection != NULL
                     && !encoder->does_selection(provctx, data->ctx->selection))
@@ -125,12 +123,12 @@ static void collect_encoder(OSSL_ENCODER *encoder, void *arg)
         }
     }
 
-    data->error_occurred = 0;         /* All is good now */
+    data->error_occurred = 0; /* All is good now */
 }
 
 struct collected_names_st {
     STACK_OF(OPENSSL_CSTRING) *names;
-    unsigned int error_occurred:1;
+    unsigned int error_occurred : 1;
 };
 
 static void collect_name(const char *name, void *arg)
@@ -140,12 +138,12 @@ static void collect_name(const char *name, void *arg)
     if (data->error_occurred)
         return;
 
-    data->error_occurred = 1;         /* Assume the worst */
+    data->error_occurred = 1; /* Assume the worst */
 
     if (sk_OPENSSL_CSTRING_push(data->names, name) <= 0)
         return;
 
-    data->error_occurred = 0;         /* All is good now */
+    data->error_occurred = 0; /* All is good now */
 }
 
 /*
@@ -170,8 +168,7 @@ static int encoder_import_cb(const OSSL_PARAM params[], void *arg)
     OSSL_ENCODER *encoder = OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst);
     void *encoderctx = OSSL_ENCODER_INSTANCE_get_encoder_ctx(encoder_inst);
 
-    construct_data->constructed_obj =
-        encoder->import_object(encoderctx, construct_data->selection, params);
+    construct_data->constructed_obj = encoder->import_object(encoderctx, construct_data->selection, params);
 
     return (construct_data->constructed_obj != NULL);
 }
@@ -182,8 +179,7 @@ encoder_construct_pkey(OSSL_ENCODER_INSTANCE *encoder_inst, void *arg)
     struct construct_data_st *data = arg;
 
     if (data->obj == NULL) {
-        OSSL_ENCODER *encoder =
-            OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst);
+        OSSL_ENCODER *encoder = OSSL_ENCODER_INSTANCE_get_encoder(encoder_inst);
         const EVP_PKEY *pk = data->pk;
         const OSSL_PROVIDER *k_prov = EVP_KEYMGMT_get0_provider(pk->keymgmt);
         const OSSL_PROVIDER *e_prov = OSSL_ENCODER_get0_provider(encoder);
@@ -196,7 +192,7 @@ encoder_construct_pkey(OSSL_ENCODER_INSTANCE *encoder_inst, void *arg)
             data->encoder_inst = encoder_inst;
 
             if (!evp_keymgmt_export(pk->keymgmt, pk->keydata, selection,
-                                    &encoder_import_cb, data))
+                    &encoder_import_cb, data))
                 return NULL;
             data->obj = data->constructed_obj;
         } else {
@@ -213,8 +209,7 @@ static void encoder_destruct_pkey(void *arg)
     int match = (data->obj == data->constructed_obj);
 
     if (data->encoder_inst != NULL) {
-        OSSL_ENCODER *encoder =
-            OSSL_ENCODER_INSTANCE_get_encoder(data->encoder_inst);
+        OSSL_ENCODER *encoder = OSSL_ENCODER_INSTANCE_get_encoder(data->encoder_inst);
 
         encoder->free_object(data->constructed_obj);
     }
@@ -230,9 +225,9 @@ static void encoder_destruct_pkey(void *arg)
  * and to use fallback methods if the result is NULL.
  */
 static int ossl_encoder_ctx_setup_for_pkey(OSSL_ENCODER_CTX *ctx,
-                                           const EVP_PKEY *pkey,
-                                           int selection,
-                                           const char *propquery)
+    const EVP_PKEY *pkey,
+    int selection,
+    const char *propquery)
 {
     struct construct_data_st *data = NULL;
     const OSSL_PROVIDER *prov = NULL;
@@ -332,11 +327,11 @@ static int ossl_encoder_ctx_setup_for_pkey(OSSL_ENCODER_CTX *ctx,
         data->pk = pkey;
         data->selection = selection;
 
-        data = NULL;             /* Avoid it being freed */
+        data = NULL; /* Avoid it being freed */
     }
 
     ok = 1;
- err:
+err:
     if (data != NULL) {
         OSSL_ENCODER_CTX_set_construct_data(ctx, NULL);
         OPENSSL_free(data);
@@ -345,10 +340,10 @@ static int ossl_encoder_ctx_setup_for_pkey(OSSL_ENCODER_CTX *ctx,
 }
 
 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)
 {
     OSSL_ENCODER_CTX *ctx = NULL;
     OSSL_LIB_CTX *libctx = NULL;
@@ -360,7 +355,7 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
 
     if (!evp_pkey_is_assigned(pkey)) {
         ERR_raise_data(ERR_LIB_OSSL_ENCODER, ERR_R_PASSED_INVALID_ARGUMENT,
-                       "The passed EVP_PKEY must be assigned a key");
+            "The passed EVP_PKEY must be assigned a key");
         return NULL;
     }
 
@@ -375,13 +370,15 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
         libctx = ossl_provider_libctx(prov);
     }
 
-    OSSL_TRACE_BEGIN(ENCODER) {
+    OSSL_TRACE_BEGIN(ENCODER)
+    {
         BIO_printf(trc_out,
-                   "(ctx %p) Looking for %s encoders with selection %d\n",
-                   (void *)ctx, EVP_PKEY_get0_type_name(pkey), selection);
+            "(ctx %p) Looking for %s encoders with selection %d\n",
+            (void *)ctx, EVP_PKEY_get0_type_name(pkey), selection);
         BIO_printf(trc_out, "    output type: %s, output structure: %s\n",
-                   output_type, output_struct);
-    } OSSL_TRACE_END(ENCODER);
+            output_type, output_struct);
+    }
+    OSSL_TRACE_END(ENCODER);
 
     if (OSSL_ENCODER_CTX_set_output_type(ctx, output_type)
         && (output_struct == NULL
@@ -393,14 +390,16 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
         int save_parameters = pkey->save_parameters;
 
         params[0] = OSSL_PARAM_construct_int(OSSL_ENCODER_PARAM_SAVE_PARAMETERS,
-                                             &save_parameters);
+            &save_parameters);
         /* ignoring error as this is only auxiliary parameter */
         (void)OSSL_ENCODER_CTX_set_params(ctx, params);
 
-        OSSL_TRACE_BEGIN(ENCODER) {
+        OSSL_TRACE_BEGIN(ENCODER)
+        {
             BIO_printf(trc_out, "(ctx %p) Got %d encoders\n",
-                       (void *)ctx, OSSL_ENCODER_CTX_get_num_encoders(ctx));
-        } OSSL_TRACE_END(ENCODER);
+                (void *)ctx, OSSL_ENCODER_CTX_get_num_encoders(ctx));
+        }
+        OSSL_TRACE_END(ENCODER);
         return ctx;
     }
 
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 2f83b2ec182f8..12a4f8832a189 100644
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -16,9 +16,9 @@ void ENGINE_load_builtin_engines(void)
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_1_1_0
-# if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__))
+#if (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__))
 void ENGINE_setup_bsd_cryptodev(void)
 {
 }
-# endif
+#endif
 #endif
diff --git a/crypto/engine/eng_cnf.c b/crypto/engine/eng_cnf.c
index 14744bb7f55bd..2d1a1d54a54ba 100644
--- a/crypto/engine/eng_cnf.c
+++ b/crypto/engine/eng_cnf.c
@@ -66,7 +66,7 @@ static int int_engine_configure(const char *name, const char *value, const CONF
         ctrlname = skip_dot(ecmd->name);
         ctrlvalue = ecmd->value;
         OSSL_TRACE2(CONF, "ENGINE: doing ctrl(%s,%s)\n",
-                    ctrlname, ctrlvalue);
+            ctrlname, ctrlvalue);
 
         /* First handle some special pseudo ctrls */
 
@@ -124,21 +124,20 @@ static int int_engine_configure(const char *name, const char *value, const CONF
             } else if (!ENGINE_ctrl_cmd_string(e, ctrlname, ctrlvalue, 0))
                 goto err;
         }
-
     }
     if (e && (do_init == -1) && !int_engine_init(e)) {
         ecmd = NULL;
         goto err;
     }
     ret = 1;
- err:
+err:
     if (ret != 1) {
         if (ecmd == NULL)
             ERR_raise(ERR_LIB_ENGINE, ENGINE_R_ENGINE_CONFIGURATION_ERROR);
         else
             ERR_raise_data(ERR_LIB_ENGINE, ENGINE_R_ENGINE_CONFIGURATION_ERROR,
-                           "section=%s, name=%s, value=%s",
-                           ecmd->section, ecmd->name, ecmd->value);
+                "section=%s, name=%s, value=%s",
+                ecmd->section, ecmd->name, ecmd->value);
     }
     ENGINE_free(e);
     return ret;
@@ -150,7 +149,7 @@ static int int_engine_module_init(CONF_IMODULE *md, const CONF *cnf)
     CONF_VALUE *cval;
     int i;
     OSSL_TRACE2(CONF, "Called engine module: name %s, value %s\n",
-                CONF_imodule_get_name(md), CONF_imodule_get_value(md));
+        CONF_imodule_get_name(md), CONF_imodule_get_value(md));
     /* Value is a section containing ENGINEs to configure */
     elist = NCONF_get_section(cnf, CONF_imodule_get_value(md));
 
@@ -181,5 +180,5 @@ static void int_engine_module_finish(CONF_IMODULE *md)
 void ENGINE_add_conf_module(void)
 {
     CONF_module_add("engines",
-                    int_engine_module_init, int_engine_module_finish);
+        int_engine_module_init, int_engine_module_finish);
 }
diff --git a/crypto/engine/eng_ctrl.c b/crypto/engine/eng_ctrl.c
index f1da9b23bb58a..8fc29321b75a1 100644
--- a/crypto/engine/eng_ctrl.c
+++ b/crypto/engine/eng_ctrl.c
@@ -62,7 +62,7 @@ static int int_ctrl_cmd_by_num(const ENGINE_CMD_DEFN *defn, unsigned int num)
 }
 
 static int int_ctrl_helper(ENGINE *e, int cmd, long i, void *p,
-                           void (*f) (void))
+    void (*f)(void))
 {
     int idx;
     char *s = (char *)p;
@@ -75,9 +75,7 @@ static int int_ctrl_helper(ENGINE *e, int cmd, long i, void *p,
         return e->cmd_defns->cmd_num;
     }
     /* One or two commands require that "p" be a valid string buffer */
-    if ((cmd == ENGINE_CTRL_GET_CMD_FROM_NAME) ||
-        (cmd == ENGINE_CTRL_GET_NAME_FROM_CMD) ||
-        (cmd == ENGINE_CTRL_GET_DESC_FROM_CMD)) {
+    if ((cmd == ENGINE_CTRL_GET_CMD_FROM_NAME) || (cmd == ENGINE_CTRL_GET_NAME_FROM_CMD) || (cmd == ENGINE_CTRL_GET_DESC_FROM_CMD)) {
         if (s == NULL) {
             ERR_raise(ERR_LIB_ENGINE, ERR_R_PASSED_NULL_PARAMETER);
             return -1;
@@ -115,8 +113,7 @@ static int int_ctrl_helper(ENGINE *e, int cmd, long i, void *p,
         return strlen(cdp->cmd_desc == NULL ? int_no_description
                                             : cdp->cmd_desc);
     case ENGINE_CTRL_GET_DESC_FROM_CMD:
-        return strlen(strcpy(s, cdp->cmd_desc == NULL ? int_no_description
-                                                      : cdp->cmd_desc));
+        return strlen(strcpy(s, cdp->cmd_desc == NULL ? int_no_description : cdp->cmd_desc));
     case ENGINE_CTRL_GET_CMD_FLAGS:
         return cdp->cmd_flags;
     }
@@ -125,7 +122,7 @@ static int int_ctrl_helper(ENGINE *e, int cmd, long i, void *p,
     return -1;
 }
 
-int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
+int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 {
     int ctrl_exists;
 
@@ -176,20 +173,17 @@ int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
 int ENGINE_cmd_is_executable(ENGINE *e, int cmd)
 {
     int flags;
-    if ((flags =
-         ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, cmd, NULL, NULL)) < 0) {
+    if ((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, cmd, NULL, NULL)) < 0) {
         ERR_raise(ERR_LIB_ENGINE, ENGINE_R_INVALID_CMD_NUMBER);
         return 0;
     }
-    if (!(flags & ENGINE_CMD_FLAG_NO_INPUT) &&
-        !(flags & ENGINE_CMD_FLAG_NUMERIC) &&
-        !(flags & ENGINE_CMD_FLAG_STRING))
+    if (!(flags & ENGINE_CMD_FLAG_NO_INPUT) && !(flags & ENGINE_CMD_FLAG_NUMERIC) && !(flags & ENGINE_CMD_FLAG_STRING))
         return 0;
     return 1;
 }
 
 int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
-                    long i, void *p, void (*f) (void), int cmd_optional)
+    long i, void *p, void (*f)(void), int cmd_optional)
 {
     int num;
 
@@ -199,7 +193,8 @@ int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
     }
     if (e->ctrl == NULL
         || (num = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FROM_NAME,
-                              0, (void *)cmd_name, NULL)) <= 0) {
+                0, (void *)cmd_name, NULL))
+            <= 0) {
         /*
          * If the command didn't *have* to be supported, we fake success.
          * This allows certain settings to be specified for multiple ENGINEs
@@ -225,7 +220,7 @@ int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
 }
 
 int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
-                           int cmd_optional)
+    int cmd_optional)
 {
     int num, flags;
     long l;
@@ -237,7 +232,8 @@ int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
     }
     if (e->ctrl == NULL
         || (num = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FROM_NAME,
-                              0, (void *)cmd_name, NULL)) <= 0) {
+                0, (void *)cmd_name, NULL))
+            <= 0) {
         /*
          * If the command didn't *have* to be supported, we fake success.
          * This allows certain settings to be specified for multiple ENGINEs
diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c
index cc3a2b0aa3131..72a373efcd31f 100644
--- a/crypto/engine/eng_dyn.c
+++ b/crypto/engine/eng_dyn.c
@@ -24,53 +24,53 @@
 static int dynamic_init(ENGINE *e);
 static int dynamic_finish(ENGINE *e);
 static int dynamic_ctrl(ENGINE *e, int cmd, long i, void *p,
-                        void (*f) (void));
+    void (*f)(void));
 /* Predeclare our context type */
 typedef struct st_dynamic_data_ctx dynamic_data_ctx;
 /* The implementation for the important control command */
 static int dynamic_load(ENGINE *e, dynamic_data_ctx *ctx);
 
-#define DYNAMIC_CMD_SO_PATH             ENGINE_CMD_BASE
-#define DYNAMIC_CMD_NO_VCHECK           (ENGINE_CMD_BASE + 1)
-#define DYNAMIC_CMD_ID                  (ENGINE_CMD_BASE + 2)
-#define DYNAMIC_CMD_LIST_ADD            (ENGINE_CMD_BASE + 3)
-#define DYNAMIC_CMD_DIR_LOAD            (ENGINE_CMD_BASE + 4)
-#define DYNAMIC_CMD_DIR_ADD             (ENGINE_CMD_BASE + 5)
-#define DYNAMIC_CMD_LOAD                (ENGINE_CMD_BASE + 6)
+#define DYNAMIC_CMD_SO_PATH ENGINE_CMD_BASE
+#define DYNAMIC_CMD_NO_VCHECK (ENGINE_CMD_BASE + 1)
+#define DYNAMIC_CMD_ID (ENGINE_CMD_BASE + 2)
+#define DYNAMIC_CMD_LIST_ADD (ENGINE_CMD_BASE + 3)
+#define DYNAMIC_CMD_DIR_LOAD (ENGINE_CMD_BASE + 4)
+#define DYNAMIC_CMD_DIR_ADD (ENGINE_CMD_BASE + 5)
+#define DYNAMIC_CMD_LOAD (ENGINE_CMD_BASE + 6)
 
 /* The constants used when creating the ENGINE */
 static const char *engine_dynamic_id = "dynamic";
 static const char *engine_dynamic_name = "Dynamic engine loading support";
 static const ENGINE_CMD_DEFN dynamic_cmd_defns[] = {
-    {DYNAMIC_CMD_SO_PATH,
-     "SO_PATH",
-     "Specifies the path to the new ENGINE shared library",
-     ENGINE_CMD_FLAG_STRING},
-    {DYNAMIC_CMD_NO_VCHECK,
-     "NO_VCHECK",
-     "Specifies to continue even if version checking fails (boolean)",
-     ENGINE_CMD_FLAG_NUMERIC},
-    {DYNAMIC_CMD_ID,
-     "ID",
-     "Specifies an ENGINE id name for loading",
-     ENGINE_CMD_FLAG_STRING},
-    {DYNAMIC_CMD_LIST_ADD,
-     "LIST_ADD",
-     "Whether to add a loaded ENGINE to the internal list (0=no,1=yes,2=mandatory)",
-     ENGINE_CMD_FLAG_NUMERIC},
-    {DYNAMIC_CMD_DIR_LOAD,
-     "DIR_LOAD",
-     "Specifies whether to load from 'DIR_ADD' directories (0=no,1=yes,2=mandatory)",
-     ENGINE_CMD_FLAG_NUMERIC},
-    {DYNAMIC_CMD_DIR_ADD,
-     "DIR_ADD",
-     "Adds a directory from which ENGINEs can be loaded",
-     ENGINE_CMD_FLAG_STRING},
-    {DYNAMIC_CMD_LOAD,
-     "LOAD",
-     "Load up the ENGINE specified by other settings",
-     ENGINE_CMD_FLAG_NO_INPUT},
-    {0, NULL, NULL, 0}
+    { DYNAMIC_CMD_SO_PATH,
+        "SO_PATH",
+        "Specifies the path to the new ENGINE shared library",
+        ENGINE_CMD_FLAG_STRING },
+    { DYNAMIC_CMD_NO_VCHECK,
+        "NO_VCHECK",
+        "Specifies to continue even if version checking fails (boolean)",
+        ENGINE_CMD_FLAG_NUMERIC },
+    { DYNAMIC_CMD_ID,
+        "ID",
+        "Specifies an ENGINE id name for loading",
+        ENGINE_CMD_FLAG_STRING },
+    { DYNAMIC_CMD_LIST_ADD,
+        "LIST_ADD",
+        "Whether to add a loaded ENGINE to the internal list (0=no,1=yes,2=mandatory)",
+        ENGINE_CMD_FLAG_NUMERIC },
+    { DYNAMIC_CMD_DIR_LOAD,
+        "DIR_LOAD",
+        "Specifies whether to load from 'DIR_ADD' directories (0=no,1=yes,2=mandatory)",
+        ENGINE_CMD_FLAG_NUMERIC },
+    { DYNAMIC_CMD_DIR_ADD,
+        "DIR_ADD",
+        "Adds a directory from which ENGINEs can be loaded",
+        ENGINE_CMD_FLAG_STRING },
+    { DYNAMIC_CMD_LOAD,
+        "LOAD",
+        "Load up the ENGINE specified by other settings",
+        ENGINE_CMD_FLAG_NO_INPUT },
+    { 0, NULL, NULL, 0 }
 };
 
 /*
@@ -135,8 +135,8 @@ static void int_free_str(char *s)
  * and there was an ex_data element corresponding to our context type.
  */
 static void dynamic_data_ctx_free_func(void *parent, void *ptr,
-                                       CRYPTO_EX_DATA *ad, int idx, long argl,
-                                       void *argp)
+    CRYPTO_EX_DATA *ad, int idx, long argl,
+    void *argp)
 {
     if (ptr) {
         dynamic_data_ctx *ctx = (dynamic_data_ctx *)ptr;
@@ -172,7 +172,7 @@ static int dynamic_set_data_ctx(ENGINE *e, dynamic_data_ctx **ctx)
     if (!CRYPTO_THREAD_write_lock(global_engine_lock))
         goto end;
     if ((*ctx = (dynamic_data_ctx *)ENGINE_get_ex_data(e,
-                                                       dynamic_ex_data_idx))
+             dynamic_ex_data_idx))
         == NULL) {
         /* Good, we're the first */
         ret = ENGINE_set_ex_data(e, dynamic_ex_data_idx, c);
@@ -208,7 +208,7 @@ static dynamic_data_ctx *dynamic_get_data_ctx(ENGINE *e)
          * an ENGINE goes underground.
          */
         int new_idx = ENGINE_get_ex_new_index(0, NULL, NULL, NULL,
-                                              dynamic_data_ctx_free_func);
+            dynamic_data_ctx_free_func);
         if (new_idx == -1) {
             ERR_raise(ERR_LIB_ENGINE, ENGINE_R_NO_INDEX);
             return NULL;
@@ -240,13 +240,7 @@ static ENGINE *engine_dynamic(void)
     ENGINE *ret = ENGINE_new();
     if (ret == NULL)
         return NULL;
-    if (!ENGINE_set_id(ret, engine_dynamic_id) ||
-        !ENGINE_set_name(ret, engine_dynamic_name) ||
-        !ENGINE_set_init_function(ret, dynamic_init) ||
-        !ENGINE_set_finish_function(ret, dynamic_finish) ||
-        !ENGINE_set_ctrl_function(ret, dynamic_ctrl) ||
-        !ENGINE_set_flags(ret, ENGINE_FLAGS_BY_ID_COPY) ||
-        !ENGINE_set_cmd_defns(ret, dynamic_cmd_defns)) {
+    if (!ENGINE_set_id(ret, engine_dynamic_id) || !ENGINE_set_name(ret, engine_dynamic_name) || !ENGINE_set_init_function(ret, dynamic_init) || !ENGINE_set_finish_function(ret, dynamic_finish) || !ENGINE_set_ctrl_function(ret, dynamic_ctrl) || !ENGINE_set_flags(ret, ENGINE_FLAGS_BY_ID_COPY) || !ENGINE_set_cmd_defns(ret, dynamic_cmd_defns)) {
         ENGINE_free(ret);
         return NULL;
     }
@@ -292,7 +286,7 @@ static int dynamic_finish(ENGINE *e)
     return 0;
 }
 
-static int dynamic_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
+static int dynamic_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 {
     dynamic_data_ctx *ctx = dynamic_get_data_ctx(e);
     int initialised;
@@ -375,9 +369,7 @@ static int int_load(dynamic_data_ctx *ctx)
 {
     int num, loop;
     /* Unless told not to, try a direct load */
-    if ((ctx->dir_load != 2) && (DSO_load(ctx->dynamic_dso,
-                                          ctx->DYNAMIC_LIBNAME, NULL,
-                                          0)) != NULL)
+    if ((ctx->dir_load != 2) && (DSO_load(ctx->dynamic_dso, ctx->DYNAMIC_LIBNAME, NULL, 0)) != NULL)
         return 1;
     /* If we're not allowed to use 'dirs' or we have none, fail */
     if (!ctx->dir_load || (num = sk_OPENSSL_STRING_num(ctx->dirs)) < 1)
@@ -430,9 +422,8 @@ static int dynamic_load(ENGINE *e, dynamic_data_ctx *ctx)
         if (!ctx->engine_id)
             return 0;
         DSO_ctrl(ctx->dynamic_dso, DSO_CTRL_SET_FLAGS,
-                 DSO_FLAG_NAME_TRANSLATION_EXT_ONLY, NULL);
-        ctx->DYNAMIC_LIBNAME =
-            DSO_convert_filename(ctx->dynamic_dso, ctx->engine_id);
+            DSO_FLAG_NAME_TRANSLATION_EXT_ONLY, NULL);
+        ctx->DYNAMIC_LIBNAME = DSO_convert_filename(ctx->dynamic_dso, ctx->engine_id);
     }
     if (!int_load(ctx)) {
         ERR_raise(ERR_LIB_ENGINE, ENGINE_R_DSO_NOT_FOUND);
@@ -441,10 +432,8 @@ static int dynamic_load(ENGINE *e, dynamic_data_ctx *ctx)
         return 0;
     }
     /* We have to find a bind function otherwise it'll always end badly */
-    if (!
-        (ctx->bind_engine =
-         (dynamic_bind_engine) DSO_bind_func(ctx->dynamic_dso,
-                                             ctx->DYNAMIC_F2))) {
+    if (!(ctx->bind_engine = (dynamic_bind_engine)DSO_bind_func(ctx->dynamic_dso,
+              ctx->DYNAMIC_F2))) {
         ctx->bind_engine = NULL;
         DSO_free(ctx->dynamic_dso);
         ctx->dynamic_dso = NULL;
@@ -458,9 +447,8 @@ static int dynamic_load(ENGINE *e, dynamic_data_ctx *ctx)
          * Now we try to find a version checking function and decide how to
          * cope with failure if/when it fails.
          */
-        ctx->v_check =
-            (dynamic_v_check_fn) DSO_bind_func(ctx->dynamic_dso,
-                                               ctx->DYNAMIC_F1);
+        ctx->v_check = (dynamic_v_check_fn)DSO_bind_func(ctx->dynamic_dso,
+            ctx->DYNAMIC_F1);
         if (ctx->v_check)
             vcheck_res = ctx->v_check(OSSL_DYNAMIC_VERSION);
         /*
@@ -492,7 +480,7 @@ static int dynamic_load(ENGINE *e, dynamic_data_ctx *ctx)
      */
     fns.static_state = ENGINE_get_static_state();
     CRYPTO_get_mem_functions(&fns.mem_fns.malloc_fn, &fns.mem_fns.realloc_fn,
-                             &fns.mem_fns.free_fn);
+        &fns.mem_fns.free_fn);
     /*
      * Now that we've loaded the dynamic engine, make sure no "dynamic"
      * ENGINE elements will show through.
@@ -501,7 +489,7 @@ static int dynamic_load(ENGINE *e, dynamic_data_ctx *ctx)
 
     /* Try to bind the ENGINE onto our own ENGINE structure */
     if (!engine_add_dynamic_id(e, (ENGINE_DYNAMIC_ID)ctx->bind_engine, 1)
-            || !ctx->bind_engine(e, ctx->engine_id, &fns)) {
+        || !ctx->bind_engine(e, ctx->engine_id, &fns)) {
         engine_remove_dynamic_id(e, 1);
         ctx->bind_engine = NULL;
         ctx->v_check = NULL;
diff --git a/crypto/engine/eng_err.c b/crypto/engine/eng_err.c
index 17c1b7d008ee3..8f5e023864c81 100644
--- a/crypto/engine/eng_err.c
+++ b/crypto/engine/eng_err.c
@@ -14,79 +14,79 @@
 
 #ifndef OPENSSL_NO_ENGINE
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA ENGINE_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ALREADY_LOADED), "already loaded"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER),
-    "argument is not a number"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_CMD_NOT_EXECUTABLE),
-    "cmd not executable"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_COMMAND_TAKES_INPUT),
-    "command takes input"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_COMMAND_TAKES_NO_INPUT),
-    "command takes no input"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_CONFLICTING_ENGINE_ID),
-    "conflicting engine id"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED),
-    "ctrl command not implemented"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_DSO_FAILURE), "DSO failure"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_DSO_NOT_FOUND), "dso not found"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ENGINES_SECTION_ERROR),
-    "engines section error"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ENGINE_CONFIGURATION_ERROR),
-    "engine configuration error"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ENGINE_IS_NOT_IN_LIST),
-    "engine is not in the list"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ENGINE_SECTION_ERROR),
-    "engine section error"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_FAILED_LOADING_PRIVATE_KEY),
-    "failed loading private key"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_FAILED_LOADING_PUBLIC_KEY),
-    "failed loading public key"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_FINISH_FAILED), "finish failed"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ID_OR_NAME_MISSING),
-    "'id' or 'name' missing"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INIT_FAILED), "init failed"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INTERNAL_LIST_ERROR),
-    "internal list error"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INVALID_ARGUMENT),
-    "invalid argument"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INVALID_CMD_NAME),
-    "invalid cmd name"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INVALID_CMD_NUMBER),
-    "invalid cmd number"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INVALID_INIT_VALUE),
-    "invalid init value"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INVALID_STRING), "invalid string"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NOT_INITIALISED), "not initialised"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NOT_LOADED), "not loaded"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NO_CONTROL_FUNCTION),
-    "no control function"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NO_INDEX), "no index"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NO_LOAD_FUNCTION),
-    "no load function"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NO_REFERENCE), "no reference"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NO_SUCH_ENGINE), "no such engine"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_UNIMPLEMENTED_CIPHER),
-    "unimplemented cipher"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_UNIMPLEMENTED_DIGEST),
-    "unimplemented digest"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD),
-    "unimplemented public key method"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_VERSION_INCOMPATIBILITY),
-    "version incompatibility"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ALREADY_LOADED), "already loaded" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER),
+        "argument is not a number" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_CMD_NOT_EXECUTABLE),
+        "cmd not executable" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_COMMAND_TAKES_INPUT),
+        "command takes input" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_COMMAND_TAKES_NO_INPUT),
+        "command takes no input" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_CONFLICTING_ENGINE_ID),
+        "conflicting engine id" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED),
+        "ctrl command not implemented" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_DSO_FAILURE), "DSO failure" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_DSO_NOT_FOUND), "dso not found" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ENGINES_SECTION_ERROR),
+        "engines section error" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ENGINE_CONFIGURATION_ERROR),
+        "engine configuration error" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ENGINE_IS_NOT_IN_LIST),
+        "engine is not in the list" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ENGINE_SECTION_ERROR),
+        "engine section error" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_FAILED_LOADING_PRIVATE_KEY),
+        "failed loading private key" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_FAILED_LOADING_PUBLIC_KEY),
+        "failed loading public key" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_FINISH_FAILED), "finish failed" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_ID_OR_NAME_MISSING),
+        "'id' or 'name' missing" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INIT_FAILED), "init failed" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INTERNAL_LIST_ERROR),
+        "internal list error" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INVALID_ARGUMENT),
+        "invalid argument" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INVALID_CMD_NAME),
+        "invalid cmd name" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INVALID_CMD_NUMBER),
+        "invalid cmd number" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INVALID_INIT_VALUE),
+        "invalid init value" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_INVALID_STRING), "invalid string" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NOT_INITIALISED), "not initialised" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NOT_LOADED), "not loaded" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NO_CONTROL_FUNCTION),
+        "no control function" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NO_INDEX), "no index" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NO_LOAD_FUNCTION),
+        "no load function" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NO_REFERENCE), "no reference" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_NO_SUCH_ENGINE), "no such engine" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_UNIMPLEMENTED_CIPHER),
+        "unimplemented cipher" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_UNIMPLEMENTED_DIGEST),
+        "unimplemented digest" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD),
+        "unimplemented public key method" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, ENGINE_R_VERSION_INCOMPATIBILITY),
+        "version incompatibility" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_ENGINE_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(ENGINE_str_reasons[0].error) == NULL)
         ERR_load_strings_const(ENGINE_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index 0cf27715c5ccd..06166cacf2522 100644
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.c
@@ -84,7 +84,7 @@ int ENGINE_set_default_string(ENGINE *e, const char *def_list)
     unsigned int flags = 0;
     if (!CONF_parse_list(def_list, ',', 1, int_def_cb, &flags)) {
         ERR_raise_data(ERR_LIB_ENGINE, ENGINE_R_INVALID_STRING,
-                       "str=%s", def_list);
+            "str=%s", def_list);
         return 0;
     }
     return ENGINE_set_default(e, flags);
diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c
index 412363fa371e3..04a2602ed2d8c 100644
--- a/crypto/engine/eng_lib.c
+++ b/crypto/engine/eng_lib.c
@@ -168,7 +168,7 @@ int engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb)
 /* The API function that performs all cleanup */
 static void engine_cleanup_cb_free(ENGINE_CLEANUP_ITEM *item)
 {
-    (*(item->cb)) ();
+    (*(item->cb))();
     OPENSSL_free(item);
 }
 
@@ -176,7 +176,7 @@ void engine_cleanup_int(void)
 {
     if (int_cleanup_check(0)) {
         sk_ENGINE_CLEANUP_ITEM_pop_free(cleanup_stack,
-                                        engine_cleanup_cb_free);
+            engine_cleanup_cb_free);
         cleanup_stack = NULL;
     }
     CRYPTO_THREAD_lock_free(global_engine_lock);
diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c
index 0f24f2f4504cb..917fa84a40c95 100644
--- a/crypto/engine/eng_list.c
+++ b/crypto/engine/eng_list.c
@@ -78,8 +78,8 @@ static int engine_list_add(ENGINE *e)
      * Having the engine in the list assumes a structural reference.
      */
     if (!CRYPTO_UP_REF(&e->struct_ref, &ref)) {
-            ERR_raise(ERR_LIB_ENGINE, ENGINE_R_INTERNAL_LIST_ERROR);
-            return 0;
+        ERR_raise(ERR_LIB_ENGINE, ENGINE_R_INTERNAL_LIST_ERROR);
+        return 0;
     }
     ENGINE_REF_PRINT(e, 0, 1);
     if (engine_list_head == NULL) {
@@ -148,7 +148,7 @@ static int engine_list_remove(ENGINE *e)
 
 /* Add engine to dynamic engine list. */
 int engine_add_dynamic_id(ENGINE *e, ENGINE_DYNAMIC_ID dynamic_id,
-                          int not_locked)
+    int not_locked)
 {
     int result = 0;
     ENGINE *iterator = NULL;
@@ -193,7 +193,7 @@ int engine_add_dynamic_id(ENGINE *e, ENGINE_DYNAMIC_ID dynamic_id,
     e->next_dyn = NULL;
     result = 1;
 
- err:
+err:
     if (not_locked)
         CRYPTO_THREAD_unlock(global_engine_lock);
     return result;
@@ -461,16 +461,11 @@ ENGINE *ENGINE_by_id(const char *id)
         if ((load_dir = ossl_safe_getenv("OPENSSL_ENGINES")) == NULL)
             load_dir = ossl_get_enginesdir();
         iterator = ENGINE_by_id("dynamic");
-        if (!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||
-            !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) ||
-            !ENGINE_ctrl_cmd_string(iterator, "DIR_ADD",
-                                    load_dir, 0) ||
-            !ENGINE_ctrl_cmd_string(iterator, "LIST_ADD", "1", 0) ||
-            !ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0))
+        if (!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) || !ENGINE_ctrl_cmd_string(iterator, "DIR_LOAD", "2", 0) || !ENGINE_ctrl_cmd_string(iterator, "DIR_ADD", load_dir, 0) || !ENGINE_ctrl_cmd_string(iterator, "LIST_ADD", "1", 0) || !ENGINE_ctrl_cmd_string(iterator, "LOAD", NULL, 0))
             goto notfound;
         return iterator;
     }
- notfound:
+notfound:
     ENGINE_free(iterator);
     ERR_raise_data(ERR_LIB_ENGINE, ENGINE_R_NO_SUCH_ENGINE, "id=%s", id);
     return NULL;
diff --git a/crypto/engine/eng_local.h b/crypto/engine/eng_local.h
index 24920973e7b53..d69b621b6d7fe 100644
--- a/crypto/engine/eng_local.h
+++ b/crypto/engine/eng_local.h
@@ -9,13 +9,13 @@
  */
 
 #ifndef OSSL_CRYPTO_ENGINE_ENG_LOCAL_H
-# define OSSL_CRYPTO_ENGINE_ENG_LOCAL_H
+#define OSSL_CRYPTO_ENGINE_ENG_LOCAL_H
 
-# include <openssl/trace.h>
-# include "internal/cryptlib.h"
-# include "crypto/engine.h"
-# include "internal/thread_once.h"
-# include "internal/refcount.h"
+#include <openssl/trace.h>
+#include "internal/cryptlib.h"
+#include "crypto/engine.h"
+#include "internal/thread_once.h"
+#include "internal/refcount.h"
 
 extern CRYPTO_RWLOCK *global_engine_lock;
 
@@ -25,15 +25,15 @@ extern CRYPTO_RWLOCK *global_engine_lock;
  * the file:line-number pair. The "ENGINE_REF_PRINT" statements must come
  * *after* the change.
  */
-# define ENGINE_REF_PRINT(e, isfunct, diff)                             \
-    OSSL_TRACE6(ENGINE_REF_COUNT,                                       \
-               "engine: %p %s from %d to %d (%s:%d)\n",                 \
-               (void *)(e), (isfunct ? "funct" : "struct"),             \
-               ((isfunct)                                               \
-                ? ((e)->funct_ref - (diff))                             \
-                : (eng_struct_ref(e) - (diff))),                        \
-               ((isfunct) ? (e)->funct_ref : eng_struct_ref(e)),        \
-               (OPENSSL_FILE), (OPENSSL_LINE))
+#define ENGINE_REF_PRINT(e, isfunct, diff)                \
+    OSSL_TRACE6(ENGINE_REF_COUNT,                         \
+        "engine: %p %s from %d to %d (%s:%d)\n",          \
+        (void *)(e), (isfunct ? "funct" : "struct"),      \
+        ((isfunct)                                        \
+                ? ((e)->funct_ref - (diff))               \
+                : (eng_struct_ref(e) - (diff))),          \
+        ((isfunct) ? (e)->funct_ref : eng_struct_ref(e)), \
+        (OPENSSL_FILE), (OPENSSL_LINE))
 
 /*
  * Any code that will need cleanup operations should use these functions to
@@ -41,7 +41,7 @@ extern CRYPTO_RWLOCK *global_engine_lock;
  * callbacks in order. NB: both the "add" functions assume the engine lock to
  * already be held (in "write" mode).
  */
-typedef void (ENGINE_CLEANUP_CB) (void);
+typedef void(ENGINE_CLEANUP_CB)(void);
 typedef struct st_engine_cleanup_item {
     ENGINE_CLEANUP_CB *cb;
 } ENGINE_CLEANUP_ITEM;
@@ -58,16 +58,16 @@ DEFINE_STACK_OF(ENGINE)
  */
 typedef struct st_engine_table ENGINE_TABLE;
 int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup,
-                          ENGINE *e, const int *nids, int num_nids,
-                          int setdefault);
+    ENGINE *e, const int *nids, int num_nids,
+    int setdefault);
 void engine_table_unregister(ENGINE_TABLE **table, ENGINE *e);
 void engine_table_cleanup(ENGINE_TABLE **table);
 ENGINE *ossl_engine_table_select(ENGINE_TABLE **table, int nid,
-                                 const char *f, int l);
-typedef void (engine_table_doall_cb) (int nid, STACK_OF(ENGINE) *sk,
-                                      ENGINE *def, void *arg);
+    const char *f, int l);
+typedef void(engine_table_doall_cb)(int nid, STACK_OF(ENGINE) *sk,
+    ENGINE *def, void *arg);
 void engine_table_doall(ENGINE_TABLE *table, engine_table_doall_cb *cb,
-                        void *arg);
+    void *arg);
 
 /*
  * Internal versions of API functions that have control over locking. These
@@ -101,7 +101,7 @@ DECLARE_RUN_ONCE(do_engine_lock_init)
 
 typedef void (*ENGINE_DYNAMIC_ID)(void);
 int engine_add_dynamic_id(ENGINE *e, ENGINE_DYNAMIC_ID dynamic_id,
-                          int not_locked);
+    int not_locked);
 void engine_remove_dynamic_id(ENGINE *e, int not_locked);
 
 /*
@@ -166,4 +166,4 @@ static ossl_unused ossl_inline int eng_struct_ref(ENGINE *e)
     return res;
 }
 
-#endif                          /* OSSL_CRYPTO_ENGINE_ENG_LOCAL_H */
+#endif /* OSSL_CRYPTO_ENGINE_ENG_LOCAL_H */
diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
index cc4fe96218eb7..b6cfb5dd1b86d 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -38,13 +38,13 @@
  */
 #define TEST_ENG_OPENSSL_RC4
 #ifndef OPENSSL_NO_STDIO
-# define TEST_ENG_OPENSSL_PKEY
+#define TEST_ENG_OPENSSL_PKEY
 #endif
 /* #define TEST_ENG_OPENSSL_HMAC */
 /* #define TEST_ENG_OPENSSL_HMAC_INIT */
 /* #define TEST_ENG_OPENSSL_RC4_OTHERS */
 #ifndef OPENSSL_NO_STDIO
-# define TEST_ENG_OPENSSL_RC4_P_INIT
+#define TEST_ENG_OPENSSL_RC4_P_INIT
 #endif
 /* #define TEST_ENG_OPENSSL_RC4_P_CIPHER */
 #define TEST_ENG_OPENSSL_SHA
@@ -55,33 +55,33 @@
 
 /* Now check what of those algorithms are actually enabled */
 #ifdef OPENSSL_NO_RC4
-# undef TEST_ENG_OPENSSL_RC4
-# undef TEST_ENG_OPENSSL_RC4_OTHERS
-# undef TEST_ENG_OPENSSL_RC4_P_INIT
-# undef TEST_ENG_OPENSSL_RC4_P_CIPHER
+#undef TEST_ENG_OPENSSL_RC4
+#undef TEST_ENG_OPENSSL_RC4_OTHERS
+#undef TEST_ENG_OPENSSL_RC4_P_INIT
+#undef TEST_ENG_OPENSSL_RC4_P_CIPHER
 #endif
 
 static int openssl_destroy(ENGINE *e);
 
 #ifdef TEST_ENG_OPENSSL_RC4
 static int openssl_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-                           const int **nids, int nid);
+    const int **nids, int nid);
 #endif
 #ifdef TEST_ENG_OPENSSL_SHA
 static int openssl_digests(ENGINE *e, const EVP_MD **digest,
-                           const int **nids, int nid);
+    const int **nids, int nid);
 #endif
 
 #ifdef TEST_ENG_OPENSSL_PKEY
 static EVP_PKEY *openssl_load_privkey(ENGINE *eng, const char *key_id,
-                                      UI_METHOD *ui_method,
-                                      void *callback_data);
+    UI_METHOD *ui_method,
+    void *callback_data);
 #endif
 
 #ifdef TEST_ENG_OPENSSL_HMAC
 static int ossl_register_hmac_meth(void);
 static int ossl_pkey_meths(ENGINE *e, EVP_PKEY_METHOD **pmeth,
-                           const int **nids, int nid);
+    const int **nids, int nid);
 #endif
 
 /* The constants used when creating the ENGINE */
@@ -99,22 +99,22 @@ static int bind_helper(ENGINE *e)
         || !ENGINE_set_destroy_function(e, openssl_destroy)
 #ifndef TEST_ENG_OPENSSL_NO_ALGORITHMS
         || !ENGINE_set_RSA(e, RSA_get_default_method())
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
         || !ENGINE_set_DSA(e, DSA_get_default_method())
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
         || !ENGINE_set_EC(e, EC_KEY_OpenSSL())
-# endif
-# ifndef OPENSSL_NO_DH
+#endif
+#ifndef OPENSSL_NO_DH
         || !ENGINE_set_DH(e, DH_get_default_method())
-# endif
+#endif
         || !ENGINE_set_RAND(e, RAND_OpenSSL())
-# ifdef TEST_ENG_OPENSSL_RC4
+#ifdef TEST_ENG_OPENSSL_RC4
         || !ENGINE_set_ciphers(e, openssl_ciphers)
-# endif
-# ifdef TEST_ENG_OPENSSL_SHA
+#endif
+#ifdef TEST_ENG_OPENSSL_SHA
         || !ENGINE_set_digests(e, openssl_digests)
-# endif
+#endif
 #endif
 #ifdef TEST_ENG_OPENSSL_PKEY
         || !ENGINE_set_load_privkey_function(e, openssl_load_privkey)
@@ -123,7 +123,7 @@ static int bind_helper(ENGINE *e)
         || !ossl_register_hmac_meth()
         || !ENGINE_set_pkey_meths(e, ossl_pkey_meths)
 #endif
-        )
+    )
         return 0;
     /*
      * If we add errors to this ENGINE, ensure the error handling is setup
@@ -181,8 +181,8 @@ static int bind_fn(ENGINE *e, const char *id)
 }
 
 IMPLEMENT_DYNAMIC_CHECK_FN()
-    IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif                          /* ENGINE_DYNAMIC_SUPPORT */
+IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
+#endif /* ENGINE_DYNAMIC_SUPPORT */
 #ifdef TEST_ENG_OPENSSL_RC4
 /*-
  * This section of code compiles an "alternative implementation" of two modes of
@@ -195,21 +195,21 @@ IMPLEMENT_DYNAMIC_CHECK_FN()
  *        the "init_key" handler is called.
  *    TEST_ENG_OPENSSL_RC4_P_CIPHER - ditto for the "cipher" handler.
  */
-# include <openssl/rc4.h>
-# define TEST_RC4_KEY_SIZE               16
+#include <openssl/rc4.h>
+#define TEST_RC4_KEY_SIZE 16
 typedef struct {
     unsigned char key[TEST_RC4_KEY_SIZE];
     RC4_KEY ks;
 } TEST_RC4_KEY;
-# define test(ctx) ((TEST_RC4_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx))
+#define test(ctx) ((TEST_RC4_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx))
 static int test_rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     const int n = EVP_CIPHER_CTX_get_key_length(ctx);
 
-# ifdef TEST_ENG_OPENSSL_RC4_P_INIT
+#ifdef TEST_ENG_OPENSSL_RC4_P_INIT
     fprintf(stderr, "(TEST_ENG_OPENSSL_RC4) test_init_key() called\n");
-# endif
+#endif
     if (n <= 0)
         return n;
     memcpy(&test(ctx)->key[0], key, n);
@@ -218,11 +218,11 @@ static int test_rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static int test_rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
-# ifdef TEST_ENG_OPENSSL_RC4_P_CIPHER
+#ifdef TEST_ENG_OPENSSL_RC4_P_CIPHER
     fprintf(stderr, "(TEST_ENG_OPENSSL_RC4) test_cipher() called\n");
-# endif
+#endif
     RC4(&test(ctx)->ks, inl, in, out);
     return 1;
 }
@@ -296,7 +296,7 @@ static int test_cipher_nids(const int **nids)
 }
 
 static int openssl_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-                           const int **nids, int nid)
+    const int **nids, int nid)
 {
     if (!cipher) {
         /* We are returning a list of supported nids */
@@ -308,10 +308,11 @@ static int openssl_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
     else if (nid == NID_rc4_40)
         *cipher = test_r4_40_cipher();
     else {
-# ifdef TEST_ENG_OPENSSL_RC4_OTHERS
+#ifdef TEST_ENG_OPENSSL_RC4_OTHERS
         fprintf(stderr, "(TEST_ENG_OPENSSL_RC4) returning NULL for "
-                "nid %d\n", nid);
-# endif
+                        "nid %d\n",
+            nid);
+#endif
         *cipher = NULL;
         return 0;
     }
@@ -321,29 +322,29 @@ static int openssl_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
 
 #ifdef TEST_ENG_OPENSSL_SHA
 /* Much the same sort of comment as for TEST_ENG_OPENSSL_RC4 */
-# include <openssl/sha.h>
+#include <openssl/sha.h>
 
 static int test_sha1_init(EVP_MD_CTX *ctx)
 {
-# ifdef TEST_ENG_OPENSSL_SHA_P_INIT
+#ifdef TEST_ENG_OPENSSL_SHA_P_INIT
     fprintf(stderr, "(TEST_ENG_OPENSSL_SHA) test_sha1_init() called\n");
-# endif
+#endif
     return SHA1_Init(EVP_MD_CTX_get0_md_data(ctx));
 }
 
 static int test_sha1_update(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
-# ifdef TEST_ENG_OPENSSL_SHA_P_UPDATE
+#ifdef TEST_ENG_OPENSSL_SHA_P_UPDATE
     fprintf(stderr, "(TEST_ENG_OPENSSL_SHA) test_sha1_update() called\n");
-# endif
+#endif
     return SHA1_Update(EVP_MD_CTX_get0_md_data(ctx), data, count);
 }
 
 static int test_sha1_final(EVP_MD_CTX *ctx, unsigned char *md)
 {
-# ifdef TEST_ENG_OPENSSL_SHA_P_FINAL
+#ifdef TEST_ENG_OPENSSL_SHA_P_FINAL
     fprintf(stderr, "(TEST_ENG_OPENSSL_SHA) test_sha1_final() called\n");
-# endif
+#endif
     return SHA1_Final(md, EVP_MD_CTX_get0_md_data(ctx));
 }
 
@@ -357,7 +358,7 @@ static const EVP_MD *test_sha_md(void)
             || !EVP_MD_meth_set_result_size(md, SHA_DIGEST_LENGTH)
             || !EVP_MD_meth_set_input_blocksize(md, SHA_CBLOCK)
             || !EVP_MD_meth_set_app_datasize(md,
-                                             sizeof(EVP_MD *) + sizeof(SHA_CTX))
+                sizeof(EVP_MD *) + sizeof(SHA_CTX))
             || !EVP_MD_meth_set_flags(md, 0)
             || !EVP_MD_meth_set_init(md, test_sha1_init)
             || !EVP_MD_meth_set_update(md, test_sha1_update)
@@ -392,7 +393,7 @@ static int test_digest_nids(const int **nids)
 }
 
 static int openssl_digests(ENGINE *e, const EVP_MD **digest,
-                           const int **nids, int nid)
+    const int **nids, int nid)
 {
     if (!digest) {
         /* We are returning a list of supported nids */
@@ -402,10 +403,11 @@ static int openssl_digests(ENGINE *e, const EVP_MD **digest,
     if (nid == NID_sha1)
         *digest = test_sha_md();
     else {
-# ifdef TEST_ENG_OPENSSL_SHA_OTHERS
+#ifdef TEST_ENG_OPENSSL_SHA_OTHERS
         fprintf(stderr, "(TEST_ENG_OPENSSL_SHA) returning NULL for "
-                "nid %d\n", nid);
-# endif
+                        "nid %d\n",
+            nid);
+#endif
         *digest = NULL;
         return 0;
     }
@@ -415,18 +417,18 @@ static int openssl_digests(ENGINE *e, const EVP_MD **digest,
 
 #ifdef TEST_ENG_OPENSSL_PKEY
 static EVP_PKEY *openssl_load_privkey(ENGINE *eng, const char *key_id,
-                                      UI_METHOD *ui_method,
-                                      void *callback_data)
+    UI_METHOD *ui_method,
+    void *callback_data)
 {
     BIO *in;
     EVP_PKEY *key;
     fprintf(stderr, "(TEST_ENG_OPENSSL_PKEY)Loading Private key %s\n",
-            key_id);
-# if defined(OPENSSL_SYS_WINDOWS)
+        key_id);
+#if defined(OPENSSL_SYS_WINDOWS)
     in = BIO_new_file(key_id, "rb");
-# else
+#else
     in = BIO_new_file(key_id, "r");
-# endif
+#endif
     if (!in)
         return NULL;
     key = PEM_read_bio_PrivateKey(in, NULL, 0, NULL);
@@ -445,8 +447,8 @@ static EVP_PKEY *openssl_load_privkey(ENGINE *eng, const char *key_id,
 /* HMAC pkey context structure */
 
 typedef struct {
-    const EVP_MD *md;           /* MD for HMAC use */
-    ASN1_OCTET_STRING ktmp;     /* Temp storage for key */
+    const EVP_MD *md; /* MD for HMAC use */
+    ASN1_OCTET_STRING ktmp; /* Temp storage for key */
     HMAC_CTX *ctx;
 } OSSL_HMAC_PKEY_CTX;
 
@@ -464,9 +466,9 @@ static int ossl_hmac_init(EVP_PKEY_CTX *ctx)
     }
     EVP_PKEY_CTX_set_data(ctx, hctx);
     EVP_PKEY_CTX_set0_keygen_info(ctx, NULL, 0);
-# ifdef TEST_ENG_OPENSSL_HMAC_INIT
+#ifdef TEST_ENG_OPENSSL_HMAC_INIT
     fprintf(stderr, "(TEST_ENG_OPENSSL_HMAC) ossl_hmac_init() called\n");
-# endif
+#endif
     return 1;
 }
 
@@ -486,7 +488,7 @@ static int ossl_hmac_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
         goto err;
     if (sctx->ktmp.data) {
         if (!ASN1_OCTET_STRING_set(&dctx->ktmp,
-                                   sctx->ktmp.data, sctx->ktmp.length))
+                sctx->ktmp.data, sctx->ktmp.length))
             goto err;
     }
     return 1;
@@ -538,7 +540,7 @@ static int ossl_hmac_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx)
 }
 
 static int ossl_hmac_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig,
-                             size_t *siglen, EVP_MD_CTX *mctx)
+    size_t *siglen, EVP_MD_CTX *mctx)
 {
     unsigned int hlen;
     OSSL_HMAC_PKEY_CTX *hctx = EVP_PKEY_CTX_get_data(ctx);
@@ -583,13 +585,12 @@ static int ossl_hmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 
     default:
         return -2;
-
     }
     return 1;
 }
 
 static int ossl_hmac_ctrl_str(EVP_PKEY_CTX *ctx,
-                              const char *type, const char *value)
+    const char *type, const char *value)
 {
     if (!value) {
         return 0;
@@ -627,7 +628,7 @@ static int ossl_register_hmac_meth(void)
     EVP_PKEY_meth_set_keygen(meth, 0, ossl_hmac_keygen);
 
     EVP_PKEY_meth_set_signctx(meth, ossl_hmac_signctx_init,
-                              ossl_hmac_signctx);
+        ossl_hmac_signctx);
 
     EVP_PKEY_meth_set_ctrl(meth, ossl_hmac_ctrl, ossl_hmac_ctrl_str);
     ossl_hmac_meth = meth;
@@ -635,7 +636,7 @@ static int ossl_register_hmac_meth(void)
 }
 
 static int ossl_pkey_meths(ENGINE *e, EVP_PKEY_METHOD **pmeth,
-                           const int **nids, int nid)
+    const int **nids, int nid)
 {
     static int ossl_pkey_nids[] = {
         EVP_PKEY_HMAC,
@@ -667,4 +668,3 @@ int openssl_destroy(ENGINE *e)
 #endif
     return 1;
 }
-
diff --git a/crypto/engine/eng_pkey.c b/crypto/engine/eng_pkey.c
index d18d837e625c0..8ab30afc70397 100644
--- a/crypto/engine/eng_pkey.c
+++ b/crypto/engine/eng_pkey.c
@@ -15,7 +15,7 @@
 /* Basic get/set stuff */
 
 int ENGINE_set_load_privkey_function(ENGINE *e,
-                                     ENGINE_LOAD_KEY_PTR loadpriv_f)
+    ENGINE_LOAD_KEY_PTR loadpriv_f)
 {
     e->load_privkey = loadpriv_f;
     return 1;
@@ -28,8 +28,8 @@ int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f)
 }
 
 int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
-                                             ENGINE_SSL_CLIENT_CERT_PTR
-                                             loadssl_f)
+    ENGINE_SSL_CLIENT_CERT_PTR
+        loadssl_f)
 {
     e->load_ssl_client_cert = loadssl_f;
     return 1;
@@ -46,7 +46,7 @@ ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e)
 }
 
 ENGINE_SSL_CLIENT_CERT_PTR ENGINE_get_ssl_client_cert_function(const ENGINE
-                                                               *e)
+        *e)
 {
     return e->load_ssl_client_cert;
 }
@@ -54,7 +54,7 @@ ENGINE_SSL_CLIENT_CERT_PTR ENGINE_get_ssl_client_cert_function(const ENGINE
 /* API functions to load public/private keys */
 
 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)
 {
     EVP_PKEY *pkey;
 
@@ -83,7 +83,7 @@ EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
 }
 
 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)
 {
     EVP_PKEY *pkey;
 
@@ -112,9 +112,9 @@ EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
 }
 
 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)
+    STACK_OF(X509_NAME) *ca_dn, X509 **pcert,
+    EVP_PKEY **ppkey, STACK_OF(X509) **pother,
+    UI_METHOD *ui_method, void *callback_data)
 {
 
     if (e == NULL) {
@@ -134,5 +134,5 @@ int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,
         return 0;
     }
     return e->load_ssl_client_cert(e, s, ca_dn, pcert, ppkey, pother,
-                                   ui_method, callback_data);
+        ui_method, callback_data);
 }
diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c
index b3ece7bd91237..8672944ff0727 100644
--- a/crypto/engine/eng_rdrand.c
+++ b/crypto/engine/eng_rdrand.c
@@ -21,14 +21,12 @@
 #include <openssl/crypto.h>
 
 #if defined(__has_feature)
-# if __has_feature(memory_sanitizer)
-#  include <sanitizer/msan_interface.h>
-# endif
+#if __has_feature(memory_sanitizer)
+#include <sanitizer/msan_interface.h>
+#endif
 #endif
 
-#if (defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
-     defined(__x86_64) || defined(__x86_64__) || \
-     defined(_M_AMD64) || defined (_M_X64)) && defined(OPENSSL_CPUID_OBJ)
+#if (defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)) && defined(OPENSSL_CPUID_OBJ)
 
 size_t OPENSSL_ia32_rdrand_bytes(unsigned char *buf, size_t len);
 
@@ -38,15 +36,15 @@ static int get_random_bytes(unsigned char *buf, int num)
         return 0;
     }
 
-# if defined(__has_feature)
-#  if __has_feature(memory_sanitizer)
+#if defined(__has_feature)
+#if __has_feature(memory_sanitizer)
     /*
      * MemorySanitizer fails to understand asm and produces false positive
      * use-of-uninitialized-value warnings.
      */
     __msan_unpoison(buf, num);
-#  endif
-# endif
+#endif
+#endif
 
     return (size_t)num == OPENSSL_ia32_rdrand_bytes(buf, (size_t)num);
 }
@@ -57,10 +55,10 @@ static int random_status(void)
 }
 
 static RAND_METHOD rdrand_meth = {
-    NULL,                       /* seed */
+    NULL, /* seed */
     get_random_bytes,
-    NULL,                       /* cleanup */
-    NULL,                       /* add */
+    NULL, /* cleanup */
+    NULL, /* add */
     get_random_bytes,
     random_status,
 };
@@ -75,11 +73,7 @@ static const char *engine_e_rdrand_name = "Intel RDRAND engine";
 
 static int bind_helper(ENGINE *e)
 {
-    if (!ENGINE_set_id(e, engine_e_rdrand_id) ||
-        !ENGINE_set_name(e, engine_e_rdrand_name) ||
-        !ENGINE_set_flags(e, ENGINE_FLAGS_NO_REGISTER_ALL) ||
-        !ENGINE_set_init_function(e, rdrand_init) ||
-        !ENGINE_set_RAND(e, &rdrand_meth))
+    if (!ENGINE_set_id(e, engine_e_rdrand_id) || !ENGINE_set_name(e, engine_e_rdrand_name) || !ENGINE_set_flags(e, ENGINE_FLAGS_NO_REGISTER_ALL) || !ENGINE_set_init_function(e, rdrand_init) || !ENGINE_set_RAND(e, &rdrand_meth))
         return 0;
 
     return 1;
@@ -106,15 +100,15 @@ void engine_load_rdrand_int(void)
         ERR_set_mark();
         ENGINE_add(toadd);
         /*
-        * If the "add" worked, it gets a structural reference. So either way, we
-        * release our just-created reference.
-        */
+         * If the "add" worked, it gets a structural reference. So either way, we
+         * release our just-created reference.
+         */
         ENGINE_free(toadd);
         /*
-        * If the "add" didn't work, it was probably a conflict because it was
-        * already added (eg. someone calling ENGINE_load_blah then calling
-        * ENGINE_load_builtin_engines() perhaps).
-        */
+         * If the "add" didn't work, it was probably a conflict because it was
+         * already added (eg. someone calling ENGINE_load_blah then calling
+         * ENGINE_load_builtin_engines() perhaps).
+         */
         ERR_pop_to_mark();
     }
 }
diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c
index 6280965cc0265..3e91743fc9e3a 100644
--- a/crypto/engine/eng_table.c
+++ b/crypto/engine/eng_table.c
@@ -30,7 +30,7 @@ struct st_engine_pile {
 /* The type exposed in eng_local.h */
 struct st_engine_table {
     LHASH_OF(ENGINE_PILE) piles;
-};                              /* ENGINE_TABLE */
+}; /* ENGINE_TABLE */
 
 typedef struct st_engine_pile_doall {
     engine_table_doall_cb *cb;
@@ -81,8 +81,8 @@ static int int_table_check(ENGINE_TABLE **t, int create)
  * ENGINEs from the implementation table
  */
 int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup,
-                          ENGINE *e, const int *nids, int num_nids,
-                          int setdefault)
+    ENGINE *e, const int *nids, int num_nids,
+    int setdefault)
 {
     int ret = 0, added = 0;
     ENGINE_PILE tmplate, *fnd;
@@ -143,7 +143,7 @@ int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup,
         nids++;
     }
     ret = 1;
- end:
+end:
     CRYPTO_THREAD_unlock(global_engine_lock);
     return ret;
 }
@@ -198,7 +198,7 @@ void engine_table_cleanup(ENGINE_TABLE **table)
 
 /* return a functional reference for a given 'nid' */
 ENGINE *ossl_engine_table_select(ENGINE_TABLE **table, int nid,
-                                 const char *f, int l)
+    const char *f, int l)
 {
     ENGINE *ret = NULL;
     ENGINE_PILE tmplate, *fnd = NULL;
@@ -211,8 +211,8 @@ ENGINE *ossl_engine_table_select(ENGINE_TABLE **table, int nid,
 
     if (!(*table)) {
         OSSL_TRACE3(ENGINE_TABLE,
-                   "%s:%d, nid=%d, nothing registered!\n",
-                   f, l, nid);
+            "%s:%d, nid=%d, nothing registered!\n",
+            f, l, nid);
         return NULL;
     }
 
@@ -232,8 +232,8 @@ ENGINE *ossl_engine_table_select(ENGINE_TABLE **table, int nid,
         goto end;
     if (fnd->funct && engine_unlocked_init(fnd->funct)) {
         OSSL_TRACE4(ENGINE_TABLE,
-                   "%s:%d, nid=%d, using ENGINE '%s' cached\n",
-                   f, l, nid, fnd->funct->id);
+            "%s:%d, nid=%d, using ENGINE '%s' cached\n",
+            f, l, nid, fnd->funct->id);
         ret = fnd->funct;
         goto end;
     }
@@ -241,13 +241,13 @@ ENGINE *ossl_engine_table_select(ENGINE_TABLE **table, int nid,
         ret = fnd->funct;
         goto end;
     }
- trynext:
+trynext:
     ret = sk_ENGINE_value(fnd->sk, loop++);
     if (!ret) {
         OSSL_TRACE3(ENGINE_TABLE,
-                    "%s:%d, nid=%d, "
-                    "no registered implementations would initialise\n",
-                    f, l, nid);
+            "%s:%d, nid=%d, "
+            "no registered implementations would initialise\n",
+            f, l, nid);
         goto end;
     }
     /* Try to initialise the ENGINE? */
@@ -263,16 +263,16 @@ ENGINE *ossl_engine_table_select(ENGINE_TABLE **table, int nid,
                 engine_unlocked_finish(fnd->funct, 0);
             fnd->funct = ret;
             OSSL_TRACE4(ENGINE_TABLE,
-                        "%s:%d, nid=%d, setting default to '%s'\n",
-                        f, l, nid, ret->id);
+                "%s:%d, nid=%d, setting default to '%s'\n",
+                f, l, nid, ret->id);
         }
         OSSL_TRACE4(ENGINE_TABLE,
-                    "%s:%d, nid=%d, using newly initialised '%s'\n",
-                    f, l, nid, ret->id);
+            "%s:%d, nid=%d, using newly initialised '%s'\n",
+            f, l, nid, ret->id);
         goto end;
     }
     goto trynext;
- end:
+end:
     /*
      * If it failed, it is unlikely to succeed again until some future
      * registrations have taken place. In all cases, we cache.
@@ -281,12 +281,12 @@ ENGINE *ossl_engine_table_select(ENGINE_TABLE **table, int nid,
         fnd->uptodate = 1;
     if (ret)
         OSSL_TRACE4(ENGINE_TABLE,
-                   "%s:%d, nid=%d, caching ENGINE '%s'\n",
-                   f, l, nid, ret->id);
+            "%s:%d, nid=%d, caching ENGINE '%s'\n",
+            f, l, nid, ret->id);
     else
         OSSL_TRACE3(ENGINE_TABLE,
-                    "%s:%d, nid=%d, caching 'no matching ENGINE'\n",
-                    f, l, nid);
+            "%s:%d, nid=%d, caching 'no matching ENGINE'\n",
+            f, l, nid);
     CRYPTO_THREAD_unlock(global_engine_lock);
     /*
      * Whatever happened, any failed init()s are not failures in this
@@ -306,7 +306,7 @@ static void int_dall(const ENGINE_PILE *pile, ENGINE_PILE_DOALL *dall)
 IMPLEMENT_LHASH_DOALL_ARG_CONST(ENGINE_PILE, ENGINE_PILE_DOALL);
 
 void engine_table_doall(ENGINE_TABLE *table, engine_table_doall_cb *cb,
-                        void *arg)
+    void *arg)
 {
     ENGINE_PILE_DOALL dall;
     dall.cb = cb;
diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index c74fc4700b4fb..1929de86aaf4c 100644
--- a/crypto/engine/tb_asnmth.c
+++ b/crypto/engine/tb_asnmth.c
@@ -42,8 +42,8 @@ int ENGINE_register_pkey_asn1_meths(ENGINE *e)
         int num_nids = e->pkey_asn1_meths(e, NULL, &nids, 0);
         if (num_nids > 0)
             return engine_table_register(&pkey_asn1_meth_table,
-                                         engine_unregister_all_pkey_asn1_meths,
-                                         e, nids, num_nids, 0);
+                engine_unregister_all_pkey_asn1_meths,
+                e, nids, num_nids, 0);
     }
     return 1;
 }
@@ -63,8 +63,8 @@ int ENGINE_set_default_pkey_asn1_meths(ENGINE *e)
         int num_nids = e->pkey_asn1_meths(e, NULL, &nids, 0);
         if (num_nids > 0)
             return engine_table_register(&pkey_asn1_meth_table,
-                                         engine_unregister_all_pkey_asn1_meths,
-                                         e, nids, num_nids, 1);
+                engine_unregister_all_pkey_asn1_meths,
+                e, nids, num_nids, 1);
     }
     return 1;
 }
@@ -77,7 +77,7 @@ int ENGINE_set_default_pkey_asn1_meths(ENGINE *e)
 ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid)
 {
     return ossl_engine_table_select(&pkey_asn1_meth_table, nid,
-                                    OPENSSL_FILE, OPENSSL_LINE);
+        OPENSSL_FILE, OPENSSL_LINE);
 }
 
 /*
@@ -137,8 +137,8 @@ void engine_pkey_asn1_meths_free(ENGINE *e)
  */
 
 const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,
-                                                          const char *str,
-                                                          int len)
+    const char *str,
+    int len)
 {
     int i, nidcount;
     const int *nids;
@@ -176,8 +176,8 @@ static void look_str_cb(int nid, STACK_OF(ENGINE) *sk, ENGINE *def, void *arg)
         EVP_PKEY_ASN1_METHOD *ameth;
         e->pkey_asn1_meths(e, &ameth, NULL, nid);
         if (ameth != NULL
-                && ((int)strlen(ameth->pem_str) == lk->len)
-                && OPENSSL_strncasecmp(ameth->pem_str, lk->str, lk->len) == 0) {
+            && ((int)strlen(ameth->pem_str) == lk->len)
+            && OPENSSL_strncasecmp(ameth->pem_str, lk->str, lk->len) == 0) {
             lk->e = e;
             lk->ameth = ameth;
             return;
@@ -186,8 +186,8 @@ static void look_str_cb(int nid, STACK_OF(ENGINE) *sk, ENGINE *def, void *arg)
 }
 
 const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe,
-                                                      const char *str,
-                                                      int len)
+    const char *str,
+    int len)
 {
     ENGINE_FIND_STR fstr;
     fstr.e = NULL;
diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c
index 037f5687524fb..c0aacb06df09b 100644
--- a/crypto/engine/tb_cipher.c
+++ b/crypto/engine/tb_cipher.c
@@ -31,8 +31,8 @@ int ENGINE_register_ciphers(ENGINE *e)
         int num_nids = e->ciphers(e, NULL, &nids, 0);
         if (num_nids > 0)
             return engine_table_register(&cipher_table,
-                                         engine_unregister_all_ciphers, e,
-                                         nids, num_nids, 0);
+                engine_unregister_all_ciphers, e,
+                nids, num_nids, 0);
     }
     return 1;
 }
@@ -52,8 +52,8 @@ int ENGINE_set_default_ciphers(ENGINE *e)
         int num_nids = e->ciphers(e, NULL, &nids, 0);
         if (num_nids > 0)
             return engine_table_register(&cipher_table,
-                                         engine_unregister_all_ciphers, e,
-                                         nids, num_nids, 1);
+                engine_unregister_all_ciphers, e,
+                nids, num_nids, 1);
     }
     return 1;
 }
@@ -66,7 +66,7 @@ int ENGINE_set_default_ciphers(ENGINE *e)
 ENGINE *ENGINE_get_cipher_engine(int nid)
 {
     return ossl_engine_table_select(&cipher_table, nid,
-                                    OPENSSL_FILE, OPENSSL_LINE);
+        OPENSSL_FILE, OPENSSL_LINE);
 }
 
 /* Obtains a cipher implementation from an ENGINE functional reference */
diff --git a/crypto/engine/tb_dh.c b/crypto/engine/tb_dh.c
index e1fa45685b11f..8f7ee1266f504 100644
--- a/crypto/engine/tb_dh.c
+++ b/crypto/engine/tb_dh.c
@@ -29,8 +29,8 @@ int ENGINE_register_DH(ENGINE *e)
 {
     if (e->dh_meth)
         return engine_table_register(&dh_table,
-                                     engine_unregister_all_DH, e, &dummy_nid,
-                                     1, 0);
+            engine_unregister_all_DH, e, &dummy_nid,
+            1, 0);
     return 1;
 }
 
@@ -46,8 +46,8 @@ int ENGINE_set_default_DH(ENGINE *e)
 {
     if (e->dh_meth)
         return engine_table_register(&dh_table,
-                                     engine_unregister_all_DH, e, &dummy_nid,
-                                     1, 1);
+            engine_unregister_all_DH, e, &dummy_nid,
+            1, 1);
     return 1;
 }
 
@@ -59,7 +59,7 @@ int ENGINE_set_default_DH(ENGINE *e)
 ENGINE *ENGINE_get_default_DH(void)
 {
     return ossl_engine_table_select(&dh_table, dummy_nid,
-                                    OPENSSL_FILE, OPENSSL_LINE);
+        OPENSSL_FILE, OPENSSL_LINE);
 }
 
 /* Obtains an DH implementation from an ENGINE functional reference */
diff --git a/crypto/engine/tb_digest.c b/crypto/engine/tb_digest.c
index dcc70eca45877..60c44cfb017cd 100644
--- a/crypto/engine/tb_digest.c
+++ b/crypto/engine/tb_digest.c
@@ -31,8 +31,8 @@ int ENGINE_register_digests(ENGINE *e)
         int num_nids = e->digests(e, NULL, &nids, 0);
         if (num_nids > 0)
             return engine_table_register(&digest_table,
-                                         engine_unregister_all_digests, e,
-                                         nids, num_nids, 0);
+                engine_unregister_all_digests, e,
+                nids, num_nids, 0);
     }
     return 1;
 }
@@ -52,8 +52,8 @@ int ENGINE_set_default_digests(ENGINE *e)
         int num_nids = e->digests(e, NULL, &nids, 0);
         if (num_nids > 0)
             return engine_table_register(&digest_table,
-                                         engine_unregister_all_digests, e,
-                                         nids, num_nids, 1);
+                engine_unregister_all_digests, e,
+                nids, num_nids, 1);
     }
     return 1;
 }
@@ -66,7 +66,7 @@ int ENGINE_set_default_digests(ENGINE *e)
 ENGINE *ENGINE_get_digest_engine(int nid)
 {
     return ossl_engine_table_select(&digest_table, nid,
-                                    OPENSSL_FILE, OPENSSL_LINE);
+        OPENSSL_FILE, OPENSSL_LINE);
 }
 
 /* Obtains a digest implementation from an ENGINE functional reference */
diff --git a/crypto/engine/tb_dsa.c b/crypto/engine/tb_dsa.c
index 6de314b7fcbe8..f7175d03f4273 100644
--- a/crypto/engine/tb_dsa.c
+++ b/crypto/engine/tb_dsa.c
@@ -29,8 +29,8 @@ int ENGINE_register_DSA(ENGINE *e)
 {
     if (e->dsa_meth)
         return engine_table_register(&dsa_table,
-                                     engine_unregister_all_DSA, e, &dummy_nid,
-                                     1, 0);
+            engine_unregister_all_DSA, e, &dummy_nid,
+            1, 0);
     return 1;
 }
 
@@ -46,8 +46,8 @@ int ENGINE_set_default_DSA(ENGINE *e)
 {
     if (e->dsa_meth)
         return engine_table_register(&dsa_table,
-                                     engine_unregister_all_DSA, e, &dummy_nid,
-                                     1, 1);
+            engine_unregister_all_DSA, e, &dummy_nid,
+            1, 1);
     return 1;
 }
 
@@ -59,7 +59,7 @@ int ENGINE_set_default_DSA(ENGINE *e)
 ENGINE *ENGINE_get_default_DSA(void)
 {
     return ossl_engine_table_select(&dsa_table, dummy_nid,
-                                    OPENSSL_FILE, OPENSSL_LINE);
+        OPENSSL_FILE, OPENSSL_LINE);
 }
 
 /* Obtains an DSA implementation from an ENGINE functional reference */
diff --git a/crypto/engine/tb_eckey.c b/crypto/engine/tb_eckey.c
index 0394a5bc220a8..66e3c088298c1 100644
--- a/crypto/engine/tb_eckey.c
+++ b/crypto/engine/tb_eckey.c
@@ -29,8 +29,8 @@ int ENGINE_register_EC(ENGINE *e)
 {
     if (e->ec_meth != NULL)
         return engine_table_register(&dh_table,
-                                     engine_unregister_all_EC, e, &dummy_nid,
-                                     1, 0);
+            engine_unregister_all_EC, e, &dummy_nid,
+            1, 0);
     return 1;
 }
 
@@ -46,8 +46,8 @@ int ENGINE_set_default_EC(ENGINE *e)
 {
     if (e->ec_meth != NULL)
         return engine_table_register(&dh_table,
-                                     engine_unregister_all_EC, e, &dummy_nid,
-                                     1, 1);
+            engine_unregister_all_EC, e, &dummy_nid,
+            1, 1);
     return 1;
 }
 
@@ -59,7 +59,7 @@ int ENGINE_set_default_EC(ENGINE *e)
 ENGINE *ENGINE_get_default_EC(void)
 {
     return ossl_engine_table_select(&dh_table, dummy_nid,
-                                    OPENSSL_FILE, OPENSSL_LINE);
+        OPENSSL_FILE, OPENSSL_LINE);
 }
 
 /* Obtains an EC_KEY implementation from an ENGINE functional reference */
diff --git a/crypto/engine/tb_pkmeth.c b/crypto/engine/tb_pkmeth.c
index 5c3da1136d2b8..2f384a2fe3299 100644
--- a/crypto/engine/tb_pkmeth.c
+++ b/crypto/engine/tb_pkmeth.c
@@ -32,8 +32,8 @@ int ENGINE_register_pkey_meths(ENGINE *e)
         int num_nids = e->pkey_meths(e, NULL, &nids, 0);
         if (num_nids > 0)
             return engine_table_register(&pkey_meth_table,
-                                         engine_unregister_all_pkey_meths, e,
-                                         nids, num_nids, 0);
+                engine_unregister_all_pkey_meths, e,
+                nids, num_nids, 0);
     }
     return 1;
 }
@@ -53,8 +53,8 @@ int ENGINE_set_default_pkey_meths(ENGINE *e)
         int num_nids = e->pkey_meths(e, NULL, &nids, 0);
         if (num_nids > 0)
             return engine_table_register(&pkey_meth_table,
-                                         engine_unregister_all_pkey_meths, e,
-                                         nids, num_nids, 1);
+                engine_unregister_all_pkey_meths, e,
+                nids, num_nids, 1);
     }
     return 1;
 }
@@ -67,7 +67,7 @@ int ENGINE_set_default_pkey_meths(ENGINE *e)
 ENGINE *ENGINE_get_pkey_meth_engine(int nid)
 {
     return ossl_engine_table_select(&pkey_meth_table, nid,
-                                    OPENSSL_FILE, OPENSSL_LINE);
+        OPENSSL_FILE, OPENSSL_LINE);
 }
 
 /* Obtains a pkey_meth implementation from an ENGINE functional reference */
diff --git a/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c
index 991a4914eafe4..3e2edc4d9f03c 100644
--- a/crypto/engine/tb_rand.c
+++ b/crypto/engine/tb_rand.c
@@ -29,8 +29,8 @@ int ENGINE_register_RAND(ENGINE *e)
 {
     if (e->rand_meth)
         return engine_table_register(&rand_table,
-                                     engine_unregister_all_RAND, e,
-                                     &dummy_nid, 1, 0);
+            engine_unregister_all_RAND, e,
+            &dummy_nid, 1, 0);
     return 1;
 }
 
@@ -46,8 +46,8 @@ int ENGINE_set_default_RAND(ENGINE *e)
 {
     if (e->rand_meth)
         return engine_table_register(&rand_table,
-                                     engine_unregister_all_RAND, e,
-                                     &dummy_nid, 1, 1);
+            engine_unregister_all_RAND, e,
+            &dummy_nid, 1, 1);
     return 1;
 }
 
@@ -59,7 +59,7 @@ int ENGINE_set_default_RAND(ENGINE *e)
 ENGINE *ENGINE_get_default_RAND(void)
 {
     return ossl_engine_table_select(&rand_table, dummy_nid,
-                                    OPENSSL_FILE, OPENSSL_LINE);
+        OPENSSL_FILE, OPENSSL_LINE);
 }
 
 /* Obtains an RAND implementation from an ENGINE functional reference */
diff --git a/crypto/engine/tb_rsa.c b/crypto/engine/tb_rsa.c
index b68b8f0ca74e2..9fe0476ca4e05 100644
--- a/crypto/engine/tb_rsa.c
+++ b/crypto/engine/tb_rsa.c
@@ -29,8 +29,8 @@ int ENGINE_register_RSA(ENGINE *e)
 {
     if (e->rsa_meth)
         return engine_table_register(&rsa_table,
-                                     engine_unregister_all_RSA, e, &dummy_nid,
-                                     1, 0);
+            engine_unregister_all_RSA, e, &dummy_nid,
+            1, 0);
     return 1;
 }
 
@@ -46,8 +46,8 @@ int ENGINE_set_default_RSA(ENGINE *e)
 {
     if (e->rsa_meth)
         return engine_table_register(&rsa_table,
-                                     engine_unregister_all_RSA, e, &dummy_nid,
-                                     1, 1);
+            engine_unregister_all_RSA, e, &dummy_nid,
+            1, 1);
     return 1;
 }
 
@@ -59,7 +59,7 @@ int ENGINE_set_default_RSA(ENGINE *e)
 ENGINE *ENGINE_get_default_RSA(void)
 {
     return ossl_engine_table_select(&rsa_table, dummy_nid,
-                                    OPENSSL_FILE, OPENSSL_LINE);
+        OPENSSL_FILE, OPENSSL_LINE);
 }
 
 /* Obtains an RSA implementation from an ENGINE functional reference */
diff --git a/crypto/err/err.c b/crypto/err/err.c
index b95182d7029a2..a995c4e2422de 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -35,50 +35,50 @@ static int err_load_strings(const ERR_STRING_DATA *str);
 
 #ifndef OPENSSL_NO_ERR
 static ERR_STRING_DATA ERR_str_libraries[] = {
-    {ERR_PACK(ERR_LIB_NONE, 0, 0), "unknown library"},
-    {ERR_PACK(ERR_LIB_SYS, 0, 0), "system library"},
-    {ERR_PACK(ERR_LIB_BN, 0, 0), "bignum routines"},
-    {ERR_PACK(ERR_LIB_RSA, 0, 0), "rsa routines"},
-    {ERR_PACK(ERR_LIB_DH, 0, 0), "Diffie-Hellman routines"},
-    {ERR_PACK(ERR_LIB_EVP, 0, 0), "digital envelope routines"},
-    {ERR_PACK(ERR_LIB_BUF, 0, 0), "memory buffer routines"},
-    {ERR_PACK(ERR_LIB_OBJ, 0, 0), "object identifier routines"},
-    {ERR_PACK(ERR_LIB_PEM, 0, 0), "PEM routines"},
-    {ERR_PACK(ERR_LIB_DSA, 0, 0), "dsa routines"},
-    {ERR_PACK(ERR_LIB_X509, 0, 0), "x509 certificate routines"},
-    {ERR_PACK(ERR_LIB_ASN1, 0, 0), "asn1 encoding routines"},
-    {ERR_PACK(ERR_LIB_CONF, 0, 0), "configuration file routines"},
-    {ERR_PACK(ERR_LIB_CRYPTO, 0, 0), "common libcrypto routines"},
-    {ERR_PACK(ERR_LIB_EC, 0, 0), "elliptic curve routines"},
-    {ERR_PACK(ERR_LIB_ECDSA, 0, 0), "ECDSA routines"},
-    {ERR_PACK(ERR_LIB_ECDH, 0, 0), "ECDH routines"},
-    {ERR_PACK(ERR_LIB_SSL, 0, 0), "SSL routines"},
-    {ERR_PACK(ERR_LIB_BIO, 0, 0), "BIO routines"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, 0), "PKCS7 routines"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, 0), "X509 V3 routines"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, 0), "PKCS12 routines"},
-    {ERR_PACK(ERR_LIB_RAND, 0, 0), "random number generator"},
-    {ERR_PACK(ERR_LIB_DSO, 0, 0), "DSO support routines"},
-    {ERR_PACK(ERR_LIB_TS, 0, 0), "time stamp routines"},
-    {ERR_PACK(ERR_LIB_ENGINE, 0, 0), "engine routines"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, 0), "OCSP routines"},
-    {ERR_PACK(ERR_LIB_UI, 0, 0), "UI routines"},
-    {ERR_PACK(ERR_LIB_FIPS, 0, 0), "FIPS routines"},
-    {ERR_PACK(ERR_LIB_CMS, 0, 0), "CMS routines"},
-    {ERR_PACK(ERR_LIB_CRMF, 0, 0), "CRMF routines"},
-    {ERR_PACK(ERR_LIB_CMP, 0, 0), "CMP routines"},
-    {ERR_PACK(ERR_LIB_HMAC, 0, 0), "HMAC routines"},
-    {ERR_PACK(ERR_LIB_CT, 0, 0), "CT routines"},
-    {ERR_PACK(ERR_LIB_ASYNC, 0, 0), "ASYNC routines"},
-    {ERR_PACK(ERR_LIB_KDF, 0, 0), "KDF routines"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, 0), "STORE routines"},
-    {ERR_PACK(ERR_LIB_SM2, 0, 0), "SM2 routines"},
-    {ERR_PACK(ERR_LIB_ESS, 0, 0), "ESS routines"},
-    {ERR_PACK(ERR_LIB_PROV, 0, 0), "Provider routines"},
-    {ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, 0), "ENCODER routines"},
-    {ERR_PACK(ERR_LIB_OSSL_DECODER, 0, 0), "DECODER routines"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, 0), "HTTP routines"},
-    {0, NULL},
+    { ERR_PACK(ERR_LIB_NONE, 0, 0), "unknown library" },
+    { ERR_PACK(ERR_LIB_SYS, 0, 0), "system library" },
+    { ERR_PACK(ERR_LIB_BN, 0, 0), "bignum routines" },
+    { ERR_PACK(ERR_LIB_RSA, 0, 0), "rsa routines" },
+    { ERR_PACK(ERR_LIB_DH, 0, 0), "Diffie-Hellman routines" },
+    { ERR_PACK(ERR_LIB_EVP, 0, 0), "digital envelope routines" },
+    { ERR_PACK(ERR_LIB_BUF, 0, 0), "memory buffer routines" },
+    { ERR_PACK(ERR_LIB_OBJ, 0, 0), "object identifier routines" },
+    { ERR_PACK(ERR_LIB_PEM, 0, 0), "PEM routines" },
+    { ERR_PACK(ERR_LIB_DSA, 0, 0), "dsa routines" },
+    { ERR_PACK(ERR_LIB_X509, 0, 0), "x509 certificate routines" },
+    { ERR_PACK(ERR_LIB_ASN1, 0, 0), "asn1 encoding routines" },
+    { ERR_PACK(ERR_LIB_CONF, 0, 0), "configuration file routines" },
+    { ERR_PACK(ERR_LIB_CRYPTO, 0, 0), "common libcrypto routines" },
+    { ERR_PACK(ERR_LIB_EC, 0, 0), "elliptic curve routines" },
+    { ERR_PACK(ERR_LIB_ECDSA, 0, 0), "ECDSA routines" },
+    { ERR_PACK(ERR_LIB_ECDH, 0, 0), "ECDH routines" },
+    { ERR_PACK(ERR_LIB_SSL, 0, 0), "SSL routines" },
+    { ERR_PACK(ERR_LIB_BIO, 0, 0), "BIO routines" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, 0), "PKCS7 routines" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, 0), "X509 V3 routines" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, 0), "PKCS12 routines" },
+    { ERR_PACK(ERR_LIB_RAND, 0, 0), "random number generator" },
+    { ERR_PACK(ERR_LIB_DSO, 0, 0), "DSO support routines" },
+    { ERR_PACK(ERR_LIB_TS, 0, 0), "time stamp routines" },
+    { ERR_PACK(ERR_LIB_ENGINE, 0, 0), "engine routines" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, 0), "OCSP routines" },
+    { ERR_PACK(ERR_LIB_UI, 0, 0), "UI routines" },
+    { ERR_PACK(ERR_LIB_FIPS, 0, 0), "FIPS routines" },
+    { ERR_PACK(ERR_LIB_CMS, 0, 0), "CMS routines" },
+    { ERR_PACK(ERR_LIB_CRMF, 0, 0), "CRMF routines" },
+    { ERR_PACK(ERR_LIB_CMP, 0, 0), "CMP routines" },
+    { ERR_PACK(ERR_LIB_HMAC, 0, 0), "HMAC routines" },
+    { ERR_PACK(ERR_LIB_CT, 0, 0), "CT routines" },
+    { ERR_PACK(ERR_LIB_ASYNC, 0, 0), "ASYNC routines" },
+    { ERR_PACK(ERR_LIB_KDF, 0, 0), "KDF routines" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, 0), "STORE routines" },
+    { ERR_PACK(ERR_LIB_SM2, 0, 0), "SM2 routines" },
+    { ERR_PACK(ERR_LIB_ESS, 0, 0), "ESS routines" },
+    { ERR_PACK(ERR_LIB_PROV, 0, 0), "Provider routines" },
+    { ERR_PACK(ERR_LIB_OSSL_ENCODER, 0, 0), "ENCODER routines" },
+    { ERR_PACK(ERR_LIB_OSSL_DECODER, 0, 0), "DECODER routines" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, 0), "HTTP routines" },
+    { 0, NULL },
 };
 
 /*
@@ -86,55 +86,55 @@ static ERR_STRING_DATA ERR_str_libraries[] = {
  * are listed.  For maintainability, please keep all reasons in the same order.
  */
 static ERR_STRING_DATA ERR_str_reasons[] = {
-    {ERR_R_SYS_LIB, "system lib"},
-    {ERR_R_BN_LIB, "BN lib"},
-    {ERR_R_RSA_LIB, "RSA lib"},
-    {ERR_R_DH_LIB, "DH lib"},
-    {ERR_R_EVP_LIB, "EVP lib"},
-    {ERR_R_BUF_LIB, "BUF lib"},
-    {ERR_R_OBJ_LIB, "OBJ lib"},
-    {ERR_R_PEM_LIB, "PEM lib"},
-    {ERR_R_DSA_LIB, "DSA lib"},
-    {ERR_R_X509_LIB, "X509 lib"},
-    {ERR_R_ASN1_LIB, "ASN1 lib"},
-    {ERR_R_CRYPTO_LIB, "CRYPTO lib"},
-    {ERR_R_EC_LIB, "EC lib"},
-    {ERR_R_BIO_LIB, "BIO lib"},
-    {ERR_R_PKCS7_LIB, "PKCS7 lib"},
-    {ERR_R_X509V3_LIB, "X509V3 lib"},
-    {ERR_R_ENGINE_LIB, "ENGINE lib"},
-    {ERR_R_UI_LIB, "UI lib"},
-    {ERR_R_ECDSA_LIB, "ECDSA lib"},
-    {ERR_R_OSSL_STORE_LIB, "OSSL_STORE lib"},
-    {ERR_R_OSSL_DECODER_LIB, "OSSL_DECODER lib"},
-
-    {ERR_R_FATAL, "fatal"},
-    {ERR_R_MALLOC_FAILURE, "malloc failure"},
-    {ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED,
-     "called a function you should not call"},
-    {ERR_R_PASSED_NULL_PARAMETER, "passed a null parameter"},
-    {ERR_R_INTERNAL_ERROR, "internal error"},
-    {ERR_R_DISABLED, "called a function that was disabled at compile-time"},
-    {ERR_R_INIT_FAIL, "init fail"},
-    {ERR_R_PASSED_INVALID_ARGUMENT, "passed invalid argument"},
-    {ERR_R_OPERATION_FAIL, "operation fail"},
-    {ERR_R_INVALID_PROVIDER_FUNCTIONS, "invalid provider functions"},
-    {ERR_R_INTERRUPTED_OR_CANCELLED, "interrupted or cancelled"},
-    {ERR_R_NESTED_ASN1_ERROR, "nested asn1 error"},
-    {ERR_R_MISSING_ASN1_EOS, "missing asn1 eos"},
+    { ERR_R_SYS_LIB, "system lib" },
+    { ERR_R_BN_LIB, "BN lib" },
+    { ERR_R_RSA_LIB, "RSA lib" },
+    { ERR_R_DH_LIB, "DH lib" },
+    { ERR_R_EVP_LIB, "EVP lib" },
+    { ERR_R_BUF_LIB, "BUF lib" },
+    { ERR_R_OBJ_LIB, "OBJ lib" },
+    { ERR_R_PEM_LIB, "PEM lib" },
+    { ERR_R_DSA_LIB, "DSA lib" },
+    { ERR_R_X509_LIB, "X509 lib" },
+    { ERR_R_ASN1_LIB, "ASN1 lib" },
+    { ERR_R_CRYPTO_LIB, "CRYPTO lib" },
+    { ERR_R_EC_LIB, "EC lib" },
+    { ERR_R_BIO_LIB, "BIO lib" },
+    { ERR_R_PKCS7_LIB, "PKCS7 lib" },
+    { ERR_R_X509V3_LIB, "X509V3 lib" },
+    { ERR_R_ENGINE_LIB, "ENGINE lib" },
+    { ERR_R_UI_LIB, "UI lib" },
+    { ERR_R_ECDSA_LIB, "ECDSA lib" },
+    { ERR_R_OSSL_STORE_LIB, "OSSL_STORE lib" },
+    { ERR_R_OSSL_DECODER_LIB, "OSSL_DECODER lib" },
+
+    { ERR_R_FATAL, "fatal" },
+    { ERR_R_MALLOC_FAILURE, "malloc failure" },
+    { ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED,
+        "called a function you should not call" },
+    { ERR_R_PASSED_NULL_PARAMETER, "passed a null parameter" },
+    { ERR_R_INTERNAL_ERROR, "internal error" },
+    { ERR_R_DISABLED, "called a function that was disabled at compile-time" },
+    { ERR_R_INIT_FAIL, "init fail" },
+    { ERR_R_PASSED_INVALID_ARGUMENT, "passed invalid argument" },
+    { ERR_R_OPERATION_FAIL, "operation fail" },
+    { ERR_R_INVALID_PROVIDER_FUNCTIONS, "invalid provider functions" },
+    { ERR_R_INTERRUPTED_OR_CANCELLED, "interrupted or cancelled" },
+    { ERR_R_NESTED_ASN1_ERROR, "nested asn1 error" },
+    { ERR_R_MISSING_ASN1_EOS, "missing asn1 eos" },
     /*
      * Something is unsupported, exactly what is expressed with additional data
      */
-    {ERR_R_UNSUPPORTED, "unsupported"},
+    { ERR_R_UNSUPPORTED, "unsupported" },
     /*
      * A fetch failed for other reasons than the name to be fetched being
      * unsupported.
      */
-    {ERR_R_FETCH_FAILED, "fetch failed"},
-    {ERR_R_INVALID_PROPERTY_DEFINITION, "invalid property definition"},
-    {ERR_R_UNABLE_TO_GET_READ_LOCK, "unable to get read lock"},
-    {ERR_R_UNABLE_TO_GET_WRITE_LOCK, "unable to get write lock"},
-    {0, NULL},
+    { ERR_R_FETCH_FAILED, "fetch failed" },
+    { ERR_R_INVALID_PROPERTY_DEFINITION, "invalid property definition" },
+    { ERR_R_UNABLE_TO_GET_READ_LOCK, "unable to get read lock" },
+    { ERR_R_UNABLE_TO_GET_WRITE_LOCK, "unable to get write lock" },
+    { 0, NULL },
 };
 #endif
 
@@ -159,13 +159,15 @@ static LHASH_OF(ERR_STRING_DATA) *int_error_hash = NULL;
 static int int_err_library_number = ERR_LIB_USER;
 
 typedef enum ERR_GET_ACTION_e {
-    EV_POP, EV_PEEK, EV_PEEK_LAST
+    EV_POP,
+    EV_PEEK,
+    EV_PEEK_LAST
 } ERR_GET_ACTION;
 
 static unsigned long get_error_values(ERR_GET_ACTION g,
-                                      const char **file, int *line,
-                                      const char **func, const char **data,
-                                      int *flags);
+    const char **file, int *line,
+    const char **func, const char **data,
+    int *flags);
 
 #ifndef OPENSSL_NO_ERR
 static unsigned long err_string_data_hash(const ERR_STRING_DATA *a)
@@ -178,7 +180,7 @@ static unsigned long err_string_data_hash(const ERR_STRING_DATA *a)
 }
 
 static int err_string_data_cmp(const ERR_STRING_DATA *a,
-                               const ERR_STRING_DATA *b)
+    const ERR_STRING_DATA *b)
 {
     if (a->error == b->error)
         return 0;
@@ -219,7 +221,7 @@ DEFINE_RUN_ONCE_STATIC(do_err_strings_init)
         return 0;
 #ifndef OPENSSL_NO_ERR
     int_error_hash = lh_ERR_STRING_DATA_new(err_string_data_hash,
-                                            err_string_data_cmp);
+        err_string_data_cmp);
     if (int_error_hash == NULL) {
         CRYPTO_THREAD_lock_free(err_string_lock);
         err_string_lock = NULL;
@@ -262,7 +264,7 @@ static int err_load_strings(const ERR_STRING_DATA *str)
         return 0;
     for (; str->error; str++)
         (void)lh_ERR_STRING_DATA_insert(int_error_hash,
-                                       (ERR_STRING_DATA *)str);
+            (ERR_STRING_DATA *)str);
     CRYPTO_THREAD_unlock(err_string_lock);
     return 1;
 }
@@ -352,8 +354,8 @@ 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)
+    const char **func,
+    const char **data, int *flags)
 {
     return get_error_values(EV_POP, file, line, func, data, flags);
 }
@@ -365,7 +367,7 @@ unsigned long ERR_get_error_line(const char **file, int *line)
 }
 
 unsigned long ERR_get_error_line_data(const char **file, int *line,
-                                      const char **data, int *flags)
+    const char **data, int *flags)
 {
     return get_error_values(EV_POP, file, line, NULL, data, flags);
 }
@@ -392,15 +394,15 @@ 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)
+    const char **func,
+    const char **data, int *flags)
 {
     return get_error_values(EV_PEEK, file, line, func, data, flags);
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 unsigned long ERR_peek_error_line_data(const char **file, int *line,
-                                       const char **data, int *flags)
+    const char **data, int *flags)
 {
     return get_error_values(EV_PEEK, file, line, NULL, data, flags);
 }
@@ -427,24 +429,24 @@ 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)
+    const char **func,
+    const char **data, int *flags)
 {
     return get_error_values(EV_PEEK_LAST, file, line, func, data, flags);
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 unsigned long ERR_peek_last_error_line_data(const char **file, int *line,
-                                            const char **data, int *flags)
+    const char **data, int *flags)
 {
     return get_error_values(EV_PEEK_LAST, file, line, NULL, data, flags);
 }
 #endif
 
 static unsigned long get_error_values(ERR_GET_ACTION g,
-                                      const char **file, int *line,
-                                      const char **func,
-                                      const char **data, int *flags)
+    const char **file, int *line,
+    const char **func,
+    const char **data, int *flags)
 {
     int i = 0;
     ERR_STATE *es;
@@ -519,7 +521,7 @@ static unsigned long get_error_values(ERR_GET_ACTION g,
 }
 
 void ossl_err_string_int(unsigned long e, const char *func,
-                         char *buf, size_t len)
+    char *buf, size_t len)
 {
     char lsbuf[64], rsbuf[256];
     const char *ls, *rs = NULL;
@@ -552,7 +554,7 @@ void ossl_err_string_int(unsigned long e, const char *func,
 #endif
     if (rs == NULL) {
         BIO_snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)",
-                     r & ~(ERR_RFLAGS_MASK << ERR_RFLAGS_OFFSET));
+            r & ~(ERR_RFLAGS_MASK << ERR_RFLAGS_OFFSET));
         rs = rsbuf;
     }
 
@@ -563,7 +565,6 @@ void ossl_err_string_int(unsigned long e, const char *func,
     }
 }
 
-
 void ERR_error_string_n(unsigned long e, char *buf, size_t len)
 {
     ossl_err_string_int(e, "", buf, len);
@@ -681,11 +682,11 @@ ERR_STATE *ossl_err_get_state_int(void)
         return NULL;
 
     state = CRYPTO_THREAD_get_local(&err_thread_local);
-    if (state == (ERR_STATE*)-1)
+    if (state == (ERR_STATE *)-1)
         return NULL;
 
     if (state == NULL) {
-        if (!CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)-1))
+        if (!CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE *)-1))
             return NULL;
 
         state = OSSL_ERR_STATE_new();
@@ -695,7 +696,7 @@ ERR_STATE *ossl_err_get_state_int(void)
         }
 
         if (!ossl_init_thread_start(NULL, NULL, err_delete_thread_state)
-                || !CRYPTO_THREAD_set_local(&err_thread_local, state)) {
+            || !CRYPTO_THREAD_set_local(&err_thread_local, state)) {
             OSSL_ERR_STATE_free(state);
             CRYPTO_THREAD_set_local(&err_thread_local, NULL);
             return NULL;
@@ -716,7 +717,6 @@ ERR_STATE *ERR_get_state(void)
 }
 #endif
 
-
 /*
  * err_shelve_state returns the current thread local error state
  * and freezes the error module until err_unshelve_state is called.
@@ -744,7 +744,7 @@ int err_shelve_state(void **state)
         return 0;
 
     *state = CRYPTO_THREAD_get_local(&err_thread_local);
-    if (!CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)-1))
+    if (!CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE *)-1))
         return 0;
 
     set_sys_error(saveerrno);
@@ -755,10 +755,10 @@ int err_shelve_state(void **state)
  * err_unshelve_state restores the error state that was returned
  * by err_shelve_state previously.
  */
-void err_unshelve_state(void* state)
+void err_unshelve_state(void *state)
 {
-    if (state != (void*)-1)
-        CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)state);
+    if (state != (void *)-1)
+        CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE *)state);
 }
 
 int ERR_get_next_error_library(void)
@@ -776,7 +776,7 @@ int ERR_get_next_error_library(void)
 }
 
 static int err_set_error_data_int(char *data, size_t size, int flags,
-                                  int deallocate)
+    int deallocate)
 {
     ERR_STATE *es;
 
@@ -835,7 +835,7 @@ void ERR_add_error_vdata(int num, va_list args)
      * Otherwise, allocate a small new buffer.
      */
     if ((es->err_data_flags[i] & flags) == flags
-            && ossl_assert(es->err_data[i] != NULL)) {
+        && ossl_assert(es->err_data[i] != NULL)) {
         str = es->err_data[i];
         size = es->err_data_size[i];
 
@@ -893,6 +893,6 @@ void err_clear_last_constant_time(int clear)
      * accessing the same error stack location, revealing timing information.
      */
     clear = constant_time_select_int(constant_time_eq_int(clear, 0),
-                                     0, ERR_FLAG_CLEAR);
+        0, ERR_FLAG_CLEAR);
     es->err_flags[top] |= clear;
 }
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 86b609a555f02..789ba9b87a4f6 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -52,26 +52,26 @@ int ossl_err_load_crypto_strings(void)
         || ossl_err_load_ERR_strings() == 0 /* include error strings for SYSerr */
         || ossl_err_load_BN_strings() == 0
         || ossl_err_load_RSA_strings() == 0
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
         || ossl_err_load_DH_strings() == 0
-# endif
+#endif
         || ossl_err_load_EVP_strings() == 0
         || ossl_err_load_BUF_strings() == 0
         || ossl_err_load_OBJ_strings() == 0
         || ossl_err_load_PEM_strings() == 0
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
         || ossl_err_load_DSA_strings() == 0
-# endif
+#endif
         || ossl_err_load_X509_strings() == 0
         || ossl_err_load_ASN1_strings() == 0
         || ossl_err_load_CONF_strings() == 0
         || ossl_err_load_CRYPTO_strings() == 0
-# ifndef OPENSSL_NO_COMP
+#ifndef OPENSSL_NO_COMP
         || ossl_err_load_COMP_strings() == 0
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
         || ossl_err_load_EC_strings() == 0
-# endif
+#endif
         /* skip ossl_err_load_SSL_strings() because it is not in this library */
         || ossl_err_load_BIO_strings() == 0
         || ossl_err_load_PKCS7_strings() == 0
@@ -79,36 +79,36 @@ int ossl_err_load_crypto_strings(void)
         || ossl_err_load_PKCS12_strings() == 0
         || ossl_err_load_RAND_strings() == 0
         || ossl_err_load_DSO_strings() == 0
-# ifndef OPENSSL_NO_TS
+#ifndef OPENSSL_NO_TS
         || ossl_err_load_TS_strings() == 0
-# endif
-# ifndef OPENSSL_NO_ENGINE
+#endif
+#ifndef OPENSSL_NO_ENGINE
         || ossl_err_load_ENGINE_strings() == 0
-# endif
-# ifndef OPENSSL_NO_HTTP
+#endif
+#ifndef OPENSSL_NO_HTTP
         || ossl_err_load_HTTP_strings() == 0
-# endif
-# ifndef OPENSSL_NO_OCSP
+#endif
+#ifndef OPENSSL_NO_OCSP
         || ossl_err_load_OCSP_strings() == 0
-# endif
+#endif
         || ossl_err_load_UI_strings() == 0
-# ifndef OPENSSL_NO_CMS
+#ifndef OPENSSL_NO_CMS
         || ossl_err_load_CMS_strings() == 0
-# endif
-# ifndef OPENSSL_NO_CRMF
+#endif
+#ifndef OPENSSL_NO_CRMF
         || ossl_err_load_CRMF_strings() == 0
         || ossl_err_load_CMP_strings() == 0
-# endif
-# ifndef OPENSSL_NO_CT
+#endif
+#ifndef OPENSSL_NO_CT
         || ossl_err_load_CT_strings() == 0
-# endif
+#endif
         || ossl_err_load_ESS_strings() == 0
         || ossl_err_load_ASYNC_strings() == 0
         || ossl_err_load_OSSL_STORE_strings() == 0
         || ossl_err_load_PROP_strings() == 0
         || ossl_err_load_PROV_strings() == 0
 #endif
-        )
+    )
         return 0;
 
     return 1;
diff --git a/crypto/err/err_all_legacy.c b/crypto/err/err_all_legacy.c
index 64dd61867d6d4..34031237c7556 100644
--- a/crypto/err/err_all_legacy.c
+++ b/crypto/err/err_all_legacy.c
@@ -12,94 +12,94 @@
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 
-# include "crypto/err.h"
-# include "crypto/asn1err.h"
-# include "crypto/asyncerr.h"
-# include "crypto/bnerr.h"
-# include "crypto/buffererr.h"
-# include "crypto/bioerr.h"
-# include "crypto/cmserr.h"
-# include "crypto/comperr.h"
-# include "crypto/conferr.h"
-# include "crypto/cryptoerr.h"
-# include "crypto/cterr.h"
-# include "crypto/dherr.h"
-# include "crypto/dsaerr.h"
-# include "internal/dsoerr.h"
-# include "crypto/ecerr.h"
-# include "crypto/engineerr.h"
-# include "crypto/evperr.h"
-# include "crypto/httperr.h"
-# include "crypto/objectserr.h"
-# include "crypto/ocsperr.h"
-# include "crypto/pemerr.h"
-# include "crypto/pkcs12err.h"
-# include "crypto/pkcs7err.h"
-# include "crypto/randerr.h"
-# include "crypto/rsaerr.h"
-# include "crypto/storeerr.h"
-# include "crypto/tserr.h"
-# include "crypto/uierr.h"
-# include "crypto/x509err.h"
-# include "crypto/x509v3err.h"
+#include "crypto/err.h"
+#include "crypto/asn1err.h"
+#include "crypto/asyncerr.h"
+#include "crypto/bnerr.h"
+#include "crypto/buffererr.h"
+#include "crypto/bioerr.h"
+#include "crypto/cmserr.h"
+#include "crypto/comperr.h"
+#include "crypto/conferr.h"
+#include "crypto/cryptoerr.h"
+#include "crypto/cterr.h"
+#include "crypto/dherr.h"
+#include "crypto/dsaerr.h"
+#include "internal/dsoerr.h"
+#include "crypto/ecerr.h"
+#include "crypto/engineerr.h"
+#include "crypto/evperr.h"
+#include "crypto/httperr.h"
+#include "crypto/objectserr.h"
+#include "crypto/ocsperr.h"
+#include "crypto/pemerr.h"
+#include "crypto/pkcs12err.h"
+#include "crypto/pkcs7err.h"
+#include "crypto/randerr.h"
+#include "crypto/rsaerr.h"
+#include "crypto/storeerr.h"
+#include "crypto/tserr.h"
+#include "crypto/uierr.h"
+#include "crypto/x509err.h"
+#include "crypto/x509v3err.h"
 
-# ifdef OPENSSL_NO_ERR
-#  define IMPLEMENT_LEGACY_ERR_LOAD(lib)        \
-    int ERR_load_##lib##_strings(void)          \
-    {                                           \
-        return 1;                               \
+#ifdef OPENSSL_NO_ERR
+#define IMPLEMENT_LEGACY_ERR_LOAD(lib) \
+    int ERR_load_##lib##_strings(void) \
+    {                                  \
+        return 1;                      \
     }
-# else
-#  define IMPLEMENT_LEGACY_ERR_LOAD(lib)        \
+#else
+#define IMPLEMENT_LEGACY_ERR_LOAD(lib)          \
     int ERR_load_##lib##_strings(void)          \
     {                                           \
         return ossl_err_load_##lib##_strings(); \
     }
-# endif
+#endif
 
 IMPLEMENT_LEGACY_ERR_LOAD(ASN1)
 IMPLEMENT_LEGACY_ERR_LOAD(ASYNC)
 IMPLEMENT_LEGACY_ERR_LOAD(BIO)
 IMPLEMENT_LEGACY_ERR_LOAD(BN)
 IMPLEMENT_LEGACY_ERR_LOAD(BUF)
-# ifndef OPENSSL_NO_CMS
+#ifndef OPENSSL_NO_CMS
 IMPLEMENT_LEGACY_ERR_LOAD(CMS)
-# endif
-# ifndef OPENSSL_NO_COMP
+#endif
+#ifndef OPENSSL_NO_COMP
 IMPLEMENT_LEGACY_ERR_LOAD(COMP)
-# endif
+#endif
 IMPLEMENT_LEGACY_ERR_LOAD(CONF)
 IMPLEMENT_LEGACY_ERR_LOAD(CRYPTO)
-# ifndef OPENSSL_NO_CT
+#ifndef OPENSSL_NO_CT
 IMPLEMENT_LEGACY_ERR_LOAD(CT)
-# endif
-# ifndef OPENSSL_NO_DH
+#endif
+#ifndef OPENSSL_NO_DH
 IMPLEMENT_LEGACY_ERR_LOAD(DH)
-# endif
-# ifndef OPENSSL_NO_DSA
+#endif
+#ifndef OPENSSL_NO_DSA
 IMPLEMENT_LEGACY_ERR_LOAD(DSA)
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
 IMPLEMENT_LEGACY_ERR_LOAD(EC)
-# endif
-# ifndef OPENSSL_NO_ENGINE
+#endif
+#ifndef OPENSSL_NO_ENGINE
 IMPLEMENT_LEGACY_ERR_LOAD(ENGINE)
-# endif
+#endif
 IMPLEMENT_LEGACY_ERR_LOAD(ERR)
 IMPLEMENT_LEGACY_ERR_LOAD(EVP)
 IMPLEMENT_LEGACY_ERR_LOAD(OBJ)
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
 IMPLEMENT_LEGACY_ERR_LOAD(OCSP)
-# endif
+#endif
 IMPLEMENT_LEGACY_ERR_LOAD(PEM)
 IMPLEMENT_LEGACY_ERR_LOAD(PKCS12)
 IMPLEMENT_LEGACY_ERR_LOAD(PKCS7)
 IMPLEMENT_LEGACY_ERR_LOAD(RAND)
 IMPLEMENT_LEGACY_ERR_LOAD(RSA)
 IMPLEMENT_LEGACY_ERR_LOAD(OSSL_STORE)
-# ifndef OPENSSL_NO_TS
+#ifndef OPENSSL_NO_TS
 IMPLEMENT_LEGACY_ERR_LOAD(TS)
-# endif
+#endif
 IMPLEMENT_LEGACY_ERR_LOAD(UI)
 IMPLEMENT_LEGACY_ERR_LOAD(X509)
 IMPLEMENT_LEGACY_ERR_LOAD(X509V3)
diff --git a/crypto/err/err_local.h b/crypto/err/err_local.h
index c5c5bf45ba5ce..4d300593861c0 100644
--- a/crypto/err/err_local.h
+++ b/crypto/err/err_local.h
@@ -38,17 +38,16 @@ static ossl_inline void err_clear_data(ERR_STATE *es, size_t i, int deall)
 }
 
 static ossl_inline void err_set_error(ERR_STATE *es, size_t i,
-                                      int lib, int reason)
+    int lib, int reason)
 {
-    es->err_buffer[i] =
-        lib == ERR_LIB_SYS
-        ? (unsigned int)(ERR_SYSTEM_FLAG |  reason)
+    es->err_buffer[i] = lib == ERR_LIB_SYS
+        ? (unsigned int)(ERR_SYSTEM_FLAG | reason)
         : ERR_PACK(lib, 0, reason);
 }
 
 static ossl_inline void err_set_debug(ERR_STATE *es, size_t i,
-                                      const char *file, int line,
-                                      const char *fn)
+    const char *file, int line,
+    const char *fn)
 {
     /*
      * We dup the file and fn strings because they may be provider owned. If the
@@ -58,7 +57,8 @@ static ossl_inline void err_set_debug(ERR_STATE *es, size_t i,
     if (file == NULL || file[0] == '\0')
         es->err_file[i] = NULL;
     else if ((es->err_file[i] = CRYPTO_malloc(strlen(file) + 1,
-                                              NULL, 0)) != NULL)
+                  NULL, 0))
+        != NULL)
         /* We cannot use OPENSSL_strdup due to possible recursion */
         strcpy(es->err_file[i], file);
 
@@ -67,12 +67,13 @@ static ossl_inline void err_set_debug(ERR_STATE *es, size_t i,
     if (fn == NULL || fn[0] == '\0')
         es->err_func[i] = NULL;
     else if ((es->err_func[i] = CRYPTO_malloc(strlen(fn) + 1,
-                                              NULL, 0)) != NULL)
+                  NULL, 0))
+        != NULL)
         strcpy(es->err_func[i], fn);
 }
 
 static ossl_inline void err_set_data(ERR_STATE *es, size_t i,
-                                     void *data, size_t datasz, int flags)
+    void *data, size_t datasz, int flags)
 {
     if ((es->err_data_flags[i] & ERR_TXT_MALLOCED) != 0)
         OPENSSL_free(es->err_data[i]);
@@ -96,4 +97,4 @@ static ossl_inline void err_clear(ERR_STATE *es, size_t i, int deall)
 
 ERR_STATE *ossl_err_get_state_int(void);
 void ossl_err_string_int(unsigned long e, const char *func,
-                         char *buf, size_t len);
+    char *buf, size_t len);
diff --git a/crypto/err/err_mark.c b/crypto/err/err_mark.c
index cb01a1f4f699a..33fa6b21278f9 100644
--- a/crypto/err/err_mark.c
+++ b/crypto/err/err_mark.c
@@ -48,7 +48,7 @@ int ERR_pop_to_mark(void)
         return 0;
 
     while (es->bottom != es->top
-           && es->err_marks[es->top] == 0) {
+        && es->err_marks[es->top] == 0) {
         err_clear(es, es->top, 0);
         es->top = es->top > 0 ? es->top - 1 : ERR_NUM_ERRORS - 1;
     }
@@ -70,7 +70,7 @@ int ERR_count_to_mark(void)
 
     top = es->top;
     while (es->bottom != top
-           && es->err_marks[top] == 0) {
+        && es->err_marks[top] == 0) {
         ++count;
         top = top > 0 ? top - 1 : ERR_NUM_ERRORS - 1;
     }
@@ -89,7 +89,7 @@ int ERR_clear_last_mark(void)
 
     top = es->top;
     while (es->bottom != top
-           && es->err_marks[top] == 0) {
+        && es->err_marks[top] == 0) {
         top = top > 0 ? top - 1 : ERR_NUM_ERRORS - 1;
     }
 
@@ -98,4 +98,3 @@ int ERR_clear_last_mark(void)
     es->err_marks[top]--;
     return 1;
 }
-
diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c
index 028811eedeee3..a6311098e3cb1 100644
--- a/crypto/err/err_prn.c
+++ b/crypto/err/err_prn.c
@@ -17,8 +17,8 @@
 #include "err_local.h"
 
 #define ERR_PRINT_BUF_SIZE 4096
-void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u),
-                         void *u)
+void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
+    void *u)
 {
     CRYPTO_THREAD_ID tid = CRYPTO_THREAD_get_current_id();
     unsigned long l;
@@ -39,16 +39,16 @@ void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u),
         ossl_err_string_int(l, func, buf + offset, sizeof(buf) - offset);
         offset += strlen(buf + offset);
         BIO_snprintf(buf + offset, sizeof(buf) - offset, ":%s:%d:%s\n",
-                     file, line, data);
+            file, line, data);
         OPENSSL_free(hex);
         if (cb(buf, strlen(buf), u) <= 0)
-            break;              /* abort outputting the error report */
+            break; /* abort outputting the error report */
     }
 }
 
 /* auxiliary function for incrementally reporting texts via the error queue */
 static void put_error(int lib, const char *func, int reason,
-                      const char *file, int line)
+    const char *file, int line)
 {
     ERR_new();
     ERR_set_debug(file, line, func);
@@ -87,7 +87,7 @@ void ERR_add_error_txt(const char *separator, const char *txt)
 
         /* workaround for limit of ERR_print_errors_cb() */
         if (data_len >= MAX_DATA_LEN
-                || strlen(separator) >= (size_t)(MAX_DATA_LEN - data_len))
+            || strlen(separator) >= (size_t)(MAX_DATA_LEN - data_len))
             available_len = 0;
         else
             available_len = MAX_DATA_LEN - data_len - strlen(separator) - 1;
diff --git a/crypto/err/err_save.c b/crypto/err/err_save.c
index 1994c26ceef0c..5781810315fd1 100644
--- a/crypto/err/err_save.c
+++ b/crypto/err/err_save.c
@@ -63,9 +63,9 @@ void OSSL_ERR_STATE_save_to_mark(ERR_STATE *es)
 
     /* Determine number of errors we are going to move. */
     for (count = 0, top = thread_es->top;
-         thread_es->bottom != top
-         && thread_es->err_marks[top] == 0;
-         ++count)
+        thread_es->bottom != top
+        && thread_es->err_marks[top] == 0;
+        ++count)
         top = top > 0 ? top - 1 : ERR_NUM_ERRORS - 1;
 
     /* Move the errors, preserving order. */
@@ -75,31 +75,31 @@ void OSSL_ERR_STATE_save_to_mark(ERR_STATE *es)
         err_clear(es, i, 1);
 
         /* Move the error entry to the given ERR_STATE. */
-        es->err_flags[i]        = thread_es->err_flags[j];
-        es->err_marks[i]        = 0;
-        es->err_buffer[i]       = thread_es->err_buffer[j];
-        es->err_data[i]         = thread_es->err_data[j];
-        es->err_data_size[i]    = thread_es->err_data_size[j];
-        es->err_data_flags[i]   = thread_es->err_data_flags[j];
-        es->err_file[i]         = thread_es->err_file[j];
-        es->err_line[i]         = thread_es->err_line[j];
-        es->err_func[i]         = thread_es->err_func[j];
-
-        thread_es->err_flags[j]      = 0;
-        thread_es->err_buffer[j]     = 0;
-        thread_es->err_data[j]       = NULL;
-        thread_es->err_data_size[j]  = 0;
+        es->err_flags[i] = thread_es->err_flags[j];
+        es->err_marks[i] = 0;
+        es->err_buffer[i] = thread_es->err_buffer[j];
+        es->err_data[i] = thread_es->err_data[j];
+        es->err_data_size[i] = thread_es->err_data_size[j];
+        es->err_data_flags[i] = thread_es->err_data_flags[j];
+        es->err_file[i] = thread_es->err_file[j];
+        es->err_line[i] = thread_es->err_line[j];
+        es->err_func[i] = thread_es->err_func[j];
+
+        thread_es->err_flags[j] = 0;
+        thread_es->err_buffer[j] = 0;
+        thread_es->err_data[j] = NULL;
+        thread_es->err_data_size[j] = 0;
         thread_es->err_data_flags[j] = 0;
-        thread_es->err_file[j]       = NULL;
-        thread_es->err_line[j]       = 0;
-        thread_es->err_func[j]       = NULL;
+        thread_es->err_file[j] = NULL;
+        thread_es->err_line[j] = 0;
+        thread_es->err_func[j] = NULL;
     }
 
     if (i > 0) {
         thread_es->top = top;
         /* If we moved anything, es's stack always starts at [0]. */
-        es->top     = i - 1;
-        es->bottom  = ERR_NUM_ERRORS - 1;
+        es->top = i - 1;
+        es->bottom = ERR_NUM_ERRORS - 1;
     } else {
         /* Didn't move anything - empty stack */
         es->top = es->bottom = 0;
@@ -137,7 +137,7 @@ void OSSL_ERR_STATE_restore(const ERR_STATE *es)
         thread_es->err_buffer[top] = es->err_buffer[i];
 
         err_set_debug(thread_es, top, es->err_file[i], es->err_line[i],
-                      es->err_func[i]);
+            es->err_func[i]);
 
         if (es->err_data[i] != NULL && es->err_data_size[i] != 0) {
             void *data;
@@ -147,7 +147,7 @@ void OSSL_ERR_STATE_restore(const ERR_STATE *es)
             if (data != NULL) {
                 memcpy(data, es->err_data[i], data_sz);
                 err_set_data(thread_es, top, data, data_sz,
-                             es->err_data_flags[i] | ERR_TXT_MALLOCED);
+                    es->err_data_flags[i] | ERR_TXT_MALLOCED);
             }
         } else {
             err_clear_data(thread_es, top, 0);
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index 17981605c0286..1c362d15f3c86 100644
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -311,6 +311,7 @@ CMS_R_ATTRIBUTE_ERROR:161:attribute error
 CMS_R_CERTIFICATE_ALREADY_PRESENT:175:certificate already present
 CMS_R_CERTIFICATE_HAS_NO_KEYID:160:certificate has no keyid
 CMS_R_CERTIFICATE_VERIFY_ERROR:100:certificate verify error
+CMS_R_CIPHER_AEAD_IN_ENVELOPED_DATA:200:cipher aead in enveloped data
 CMS_R_CIPHER_AEAD_SET_TAG_ERROR:184:cipher aead set tag error
 CMS_R_CIPHER_GET_TAG:185:cipher get tag
 CMS_R_CIPHER_INITIALISATION_ERROR:101:cipher initialisation error
@@ -803,6 +804,12 @@ EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED:179:\
 	pkey application asn1 method already registered
 EVP_R_PRIVATE_KEY_DECODE_ERROR:145:private key decode error
 EVP_R_PRIVATE_KEY_ENCODE_ERROR:146:private key encode error
+EVP_R_PROVIDER_ASYM_CIPHER_FAILURE:232:provider asym cipher failure
+EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED:235:provider asym cipher not supported
+EVP_R_PROVIDER_KEYMGMT_FAILURE:233:provider keymgmt failure
+EVP_R_PROVIDER_KEYMGMT_NOT_SUPPORTED:236:provider keymgmt not supported
+EVP_R_PROVIDER_SIGNATURE_FAILURE:234:provider signature failure
+EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED:237:provider signature not supported
 EVP_R_PUBLIC_KEY_NOT_RSA:106:public key not rsa
 EVP_R_SETTING_XOF_FAILED:227:setting xof failed
 EVP_R_SET_DEFAULT_PROPERTY_FAILURE:209:set default property failure
@@ -1070,6 +1077,7 @@ PROV_R_FAILED_TO_SIGN:175:failed to sign
 PROV_R_FINAL_CALL_OUT_OF_ORDER:237:final call out of order
 PROV_R_FIPS_MODULE_CONDITIONAL_ERROR:227:fips module conditional error
 PROV_R_FIPS_MODULE_ENTERING_ERROR_STATE:224:fips module entering error state
+PROV_R_FIPS_MODULE_IMPORT_PCT_ERROR:253:fips module import pct error
 PROV_R_FIPS_MODULE_IN_ERROR_STATE:225:fips module in error state
 PROV_R_GENERATE_ERROR:191:generate error
 PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE:165:\
diff --git a/crypto/ess/ess_asn1.c b/crypto/ess/ess_asn1.c
index 68bc854c99bb2..297f2cead02a1 100644
--- a/crypto/ess/ess_asn1.c
+++ b/crypto/ess/ess_asn1.c
@@ -17,41 +17,41 @@
 /* ASN1 stuff for ESS Structure */
 
 ASN1_SEQUENCE(ESS_ISSUER_SERIAL) = {
-        ASN1_SEQUENCE_OF(ESS_ISSUER_SERIAL, issuer, GENERAL_NAME),
-        ASN1_SIMPLE(ESS_ISSUER_SERIAL, serial, ASN1_INTEGER)
+    ASN1_SEQUENCE_OF(ESS_ISSUER_SERIAL, issuer, GENERAL_NAME),
+    ASN1_SIMPLE(ESS_ISSUER_SERIAL, serial, ASN1_INTEGER)
 } static_ASN1_SEQUENCE_END(ESS_ISSUER_SERIAL)
 
-IMPLEMENT_ASN1_FUNCTIONS(ESS_ISSUER_SERIAL)
+    IMPLEMENT_ASN1_FUNCTIONS(ESS_ISSUER_SERIAL)
 IMPLEMENT_ASN1_DUP_FUNCTION(ESS_ISSUER_SERIAL)
 
 ASN1_SEQUENCE(ESS_CERT_ID) = {
-        ASN1_SIMPLE(ESS_CERT_ID, hash, ASN1_OCTET_STRING),
-        ASN1_OPT(ESS_CERT_ID, issuer_serial, ESS_ISSUER_SERIAL)
+    ASN1_SIMPLE(ESS_CERT_ID, hash, ASN1_OCTET_STRING),
+    ASN1_OPT(ESS_CERT_ID, issuer_serial, ESS_ISSUER_SERIAL)
 } static_ASN1_SEQUENCE_END(ESS_CERT_ID)
 
-IMPLEMENT_ASN1_FUNCTIONS(ESS_CERT_ID)
+    IMPLEMENT_ASN1_FUNCTIONS(ESS_CERT_ID)
 IMPLEMENT_ASN1_DUP_FUNCTION(ESS_CERT_ID)
 
 ASN1_SEQUENCE(ESS_SIGNING_CERT) = {
-        ASN1_SEQUENCE_OF(ESS_SIGNING_CERT, cert_ids, ESS_CERT_ID),
-        ASN1_SEQUENCE_OF_OPT(ESS_SIGNING_CERT, policy_info, POLICYINFO)
+    ASN1_SEQUENCE_OF(ESS_SIGNING_CERT, cert_ids, ESS_CERT_ID),
+    ASN1_SEQUENCE_OF_OPT(ESS_SIGNING_CERT, policy_info, POLICYINFO)
 } ASN1_SEQUENCE_END(ESS_SIGNING_CERT)
 
 IMPLEMENT_ASN1_FUNCTIONS(ESS_SIGNING_CERT)
 IMPLEMENT_ASN1_DUP_FUNCTION(ESS_SIGNING_CERT)
 
 ASN1_SEQUENCE(ESS_CERT_ID_V2) = {
-        ASN1_OPT(ESS_CERT_ID_V2, hash_alg, X509_ALGOR),
-        ASN1_SIMPLE(ESS_CERT_ID_V2, hash, ASN1_OCTET_STRING),
-        ASN1_OPT(ESS_CERT_ID_V2, issuer_serial, ESS_ISSUER_SERIAL)
+    ASN1_OPT(ESS_CERT_ID_V2, hash_alg, X509_ALGOR),
+    ASN1_SIMPLE(ESS_CERT_ID_V2, hash, ASN1_OCTET_STRING),
+    ASN1_OPT(ESS_CERT_ID_V2, issuer_serial, ESS_ISSUER_SERIAL)
 } static_ASN1_SEQUENCE_END(ESS_CERT_ID_V2)
 
-IMPLEMENT_ASN1_FUNCTIONS(ESS_CERT_ID_V2)
+    IMPLEMENT_ASN1_FUNCTIONS(ESS_CERT_ID_V2)
 IMPLEMENT_ASN1_DUP_FUNCTION(ESS_CERT_ID_V2)
 
 ASN1_SEQUENCE(ESS_SIGNING_CERT_V2) = {
-        ASN1_SEQUENCE_OF(ESS_SIGNING_CERT_V2, cert_ids, ESS_CERT_ID_V2),
-        ASN1_SEQUENCE_OF_OPT(ESS_SIGNING_CERT_V2, policy_info, POLICYINFO)
+    ASN1_SEQUENCE_OF(ESS_SIGNING_CERT_V2, cert_ids, ESS_CERT_ID_V2),
+    ASN1_SEQUENCE_OF_OPT(ESS_SIGNING_CERT_V2, policy_info, POLICYINFO)
 } ASN1_SEQUENCE_END(ESS_SIGNING_CERT_V2)
 
 IMPLEMENT_ASN1_FUNCTIONS(ESS_SIGNING_CERT_V2)
diff --git a/crypto/ess/ess_err.c b/crypto/ess/ess_err.c
index eb76dfe7cc8f4..cd232d8934f71 100644
--- a/crypto/ess/ess_err.c
+++ b/crypto/ess/ess_err.c
@@ -15,25 +15,25 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA ESS_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_EMPTY_ESS_CERT_ID_LIST),
-    "empty ess cert id list"},
-    {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_CERT_DIGEST_ERROR),
-    "ess cert digest error"},
-    {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_CERT_ID_NOT_FOUND),
-    "ess cert id not found"},
-    {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_CERT_ID_WRONG_ORDER),
-    "ess cert id wrong order"},
-    {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_DIGEST_ALG_UNKNOWN),
-    "ess digest alg unknown"},
-    {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_SIGNING_CERTIFICATE_ERROR),
-    "ess signing certificate error"},
-    {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_SIGNING_CERT_ADD_ERROR),
-    "ess signing cert add error"},
-    {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_SIGNING_CERT_V2_ADD_ERROR),
-    "ess signing cert v2 add error"},
-    {ERR_PACK(ERR_LIB_ESS, 0, ESS_R_MISSING_SIGNING_CERTIFICATE_ATTRIBUTE),
-    "missing signing certificate attribute"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_EMPTY_ESS_CERT_ID_LIST),
+        "empty ess cert id list" },
+    { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_CERT_DIGEST_ERROR),
+        "ess cert digest error" },
+    { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_CERT_ID_NOT_FOUND),
+        "ess cert id not found" },
+    { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_CERT_ID_WRONG_ORDER),
+        "ess cert id wrong order" },
+    { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_DIGEST_ALG_UNKNOWN),
+        "ess digest alg unknown" },
+    { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_SIGNING_CERTIFICATE_ERROR),
+        "ess signing certificate error" },
+    { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_SIGNING_CERT_ADD_ERROR),
+        "ess signing cert add error" },
+    { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_ESS_SIGNING_CERT_V2_ADD_ERROR),
+        "ess signing cert v2 add error" },
+    { ERR_PACK(ERR_LIB_ESS, 0, ESS_R_MISSING_SIGNING_CERTIFICATE_ATTRIBUTE),
+        "missing signing certificate attribute" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/ess/ess_lib.c b/crypto/ess/ess_lib.c
index ff174470da760..0486beffc40fe 100644
--- a/crypto/ess/ess_lib.c
+++ b/crypto/ess/ess_lib.c
@@ -16,14 +16,14 @@
 #include "crypto/x509.h"
 
 static ESS_CERT_ID *ESS_CERT_ID_new_init(const X509 *cert,
-                                         int set_issuer_serial);
+    int set_issuer_serial);
 static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg,
-                                               const X509 *cert,
-                                               int set_issuer_serial);
+    const X509 *cert,
+    int set_issuer_serial);
 
 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_CERT_ID *cid = NULL;
     ESS_SIGNING_CERT *sc;
@@ -58,14 +58,14 @@ ESS_SIGNING_CERT *OSSL_ESS_signing_cert_new_init(const X509 *signcert,
     }
 
     return sc;
- err:
+err:
     ESS_SIGNING_CERT_free(sc);
     ESS_CERT_ID_free(cid);
     return NULL;
 }
 
 static ESS_CERT_ID *ESS_CERT_ID_new_init(const X509 *cert,
-                                         int set_issuer_serial)
+    int set_issuer_serial)
 {
     ESS_CERT_ID *cid = NULL;
     GENERAL_NAME *name = NULL;
@@ -106,26 +106,26 @@ static ESS_CERT_ID *ESS_CERT_ID_new_init(const X509 *cert,
         ERR_raise(ERR_LIB_ESS, ERR_R_CRYPTO_LIB);
         goto err;
     }
-    name = NULL;            /* Ownership is lost. */
+    name = NULL; /* Ownership is lost. */
     ASN1_INTEGER_free(cid->issuer_serial->serial);
     if ((cid->issuer_serial->serial
-         = ASN1_INTEGER_dup(X509_get0_serialNumber(cert))) == NULL) {
+            = ASN1_INTEGER_dup(X509_get0_serialNumber(cert)))
+        == NULL) {
         ERR_raise(ERR_LIB_ESS, ERR_R_ASN1_LIB);
         goto err;
     }
 
     return cid;
- err:
+err:
     GENERAL_NAME_free(name);
     ESS_CERT_ID_free(cid);
     return NULL;
 }
 
 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)
 {
     ESS_CERT_ID_V2 *cid = NULL;
     ESS_SIGNING_CERT_V2 *sc;
@@ -161,15 +161,15 @@ ESS_SIGNING_CERT_V2 *OSSL_ESS_signing_cert_v2_new_init(const EVP_MD *hash_alg,
     }
 
     return sc;
- err:
+err:
     ESS_SIGNING_CERT_V2_free(sc);
     ESS_CERT_ID_V2_free(cid);
     return NULL;
 }
 
 static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg,
-                                               const X509 *cert,
-                                               int set_issuer_serial)
+    const X509 *cert,
+    int set_issuer_serial)
 {
     ESS_CERT_ID_V2 *cid;
     GENERAL_NAME *name = NULL;
@@ -231,7 +231,7 @@ static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg,
         ERR_raise(ERR_LIB_ESS, ERR_R_CRYPTO_LIB);
         goto err;
     }
-    name = NULL;            /* Ownership is lost. */
+    name = NULL; /* Ownership is lost. */
     ASN1_INTEGER_free(cid->issuer_serial->serial);
     cid->issuer_serial->serial = ASN1_INTEGER_dup(X509_get0_serialNumber(cert));
     if (cid->issuer_serial->serial == NULL) {
@@ -240,7 +240,7 @@ static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg,
     }
 
     return cid;
- err:
+err:
     X509_ALGOR_free(alg);
     GENERAL_NAME_free(name);
     ESS_CERT_ID_V2_free(cid);
@@ -268,7 +268,7 @@ static int ess_issuer_serial_cmp(const ESS_ISSUER_SERIAL *is, const X509 *cert)
  * Return 0 on not found, -1 on error, else 1 + the position in |certs|.
  */
 static int find(const ESS_CERT_ID *cid, const ESS_CERT_ID_V2 *cid_v2,
-                int index, const STACK_OF(X509) *certs)
+    int index, const STACK_OF(X509) *certs)
 {
     const X509 *cert;
     EVP_MD *md = NULL;
@@ -309,13 +309,14 @@ static int find(const ESS_CERT_ID *cid, const ESS_CERT_ID_V2 *cid_v2,
 
         cid_hash_len = cid != NULL ? cid->hash->length : cid_v2->hash->length;
         if (!X509_digest(cert, md, cert_digest, &len)
-                || cid_hash_len != len) {
+            || cid_hash_len != len) {
             ERR_raise(ERR_LIB_ESS, ESS_R_ESS_CERT_DIGEST_ERROR);
             goto end;
         }
 
         if (memcmp(cid != NULL ? cid->hash->data : cid_v2->hash->data,
-                   cert_digest, len) == 0) {
+                cert_digest, len)
+            == 0) {
             is = cid != NULL ? cid->issuer_serial : cid_v2->issuer_serial;
             /* Well, it's not really required to match the serial numbers. */
             if (is == NULL || ess_issuer_serial_cmp(is, cert) == 0) {
@@ -337,9 +338,9 @@ static int find(const ESS_CERT_ID *cid, const ESS_CERT_ID_V2 *cid_v2,
 }
 
 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)
 {
     int n_v1 = ss == NULL ? -1 : sk_ESS_CERT_ID_num(ss->cert_ids);
     int n_v2 = ssv2 == NULL ? -1 : sk_ESS_CERT_ID_V2_num(ssv2->cert_ids);
diff --git a/crypto/evp/asymcipher.c b/crypto/evp/asymcipher.c
index ded0a9245121f..652303483d043 100644
--- a/crypto/evp/asymcipher.c
+++ b/crypto/evp/asymcipher.c
@@ -28,11 +28,12 @@ static int evp_asym_cipher_up_ref(void *data)
 }
 
 static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
-                                     const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     int ret = 0;
     void *provkey = NULL;
     EVP_ASYM_CIPHER *cipher = NULL;
+    const char *desc;
     EVP_KEYMGMT *tmp_keymgmt = NULL;
     const OSSL_PROVIDER *tmp_prov = NULL;
     const char *supported_ciph = NULL;
@@ -61,14 +62,14 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
      * Try to derive the supported asym cipher from |ctx->keymgmt|.
      */
     if (!ossl_assert(ctx->pkey->keymgmt == NULL
-                     || ctx->pkey->keymgmt == ctx->keymgmt)) {
+            || ctx->pkey->keymgmt == ctx->keymgmt)) {
         ERR_clear_last_mark();
         ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
         goto err;
     }
     supported_ciph
         = evp_keymgmt_util_query_operation_name(ctx->keymgmt,
-                                                OSSL_OP_ASYM_CIPHER);
+            OSSL_OP_ASYM_CIPHER);
     if (supported_ciph == NULL) {
         ERR_clear_last_mark();
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -106,15 +107,14 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
         switch (iter) {
         case 1:
             cipher = EVP_ASYM_CIPHER_fetch(ctx->libctx, supported_ciph,
-                                           ctx->propquery);
+                ctx->propquery);
             if (cipher != NULL)
                 tmp_prov = EVP_ASYM_CIPHER_get0_provider(cipher);
             break;
         case 2:
             tmp_prov = EVP_KEYMGMT_get0_provider(ctx->keymgmt);
-            cipher =
-                evp_asym_cipher_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
-                                                supported_ciph, ctx->propquery);
+            cipher = evp_asym_cipher_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+                supported_ciph, ctx->propquery);
             if (cipher == NULL)
                 goto legacy;
             break;
@@ -133,11 +133,11 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
          */
         tmp_keymgmt_tofree = tmp_keymgmt
             = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
-                                          EVP_KEYMGMT_get0_name(ctx->keymgmt),
-                                          ctx->propquery);
+                EVP_KEYMGMT_get0_name(ctx->keymgmt),
+                ctx->propquery);
         if (tmp_keymgmt != NULL)
             provkey = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
-                                                  &tmp_keymgmt, ctx->propquery);
+                &tmp_keymgmt, ctx->propquery);
         if (tmp_keymgmt == NULL)
             EVP_KEYMGMT_free(tmp_keymgmt_tofree);
     }
@@ -159,10 +159,12 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
         goto err;
     }
 
+    desc = cipher->description != NULL ? cipher->description : "";
     switch (operation) {
     case EVP_PKEY_OP_ENCRYPT:
         if (cipher->encrypt_init == NULL) {
-            ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+            ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED,
+                "%s encrypt_init:%s", cipher->type_name, desc);
             ret = -2;
             goto err;
         }
@@ -170,7 +172,8 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
         break;
     case EVP_PKEY_OP_DECRYPT:
         if (cipher->decrypt_init == NULL) {
-            ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+            ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED,
+                "%s decrypt_init:%s", cipher->type_name, desc);
             ret = -2;
             goto err;
         }
@@ -186,7 +189,7 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
     EVP_KEYMGMT_free(tmp_keymgmt);
     return 1;
 
- legacy:
+legacy:
     /*
      * If we don't have the full support we need with provided methods,
      * let's go see if legacy does.
@@ -215,7 +218,7 @@ static int evp_pkey_asym_cipher_init(EVP_PKEY_CTX *ctx, int operation,
         ret = -1;
     }
 
- err:
+err:
     if (ret <= 0) {
         evp_pkey_ctx_free_old_ops(ctx);
         ctx->operation = EVP_PKEY_OP_UNDEFINED;
@@ -235,9 +238,11 @@ 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)
 {
+    EVP_ASYM_CIPHER *cipher;
+    const char *desc;
     int ret;
 
     if (ctx == NULL) {
@@ -253,17 +258,22 @@ int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
     if (ctx->op.ciph.algctx == NULL)
         goto legacy;
 
-    ret = ctx->op.ciph.cipher->encrypt(ctx->op.ciph.algctx, out, outlen,
-                                       (out == NULL ? 0 : *outlen), in, inlen);
+    cipher = ctx->op.ciph.cipher;
+    desc = cipher->description != NULL ? cipher->description : "";
+    ERR_set_mark();
+    ret = cipher->encrypt(ctx->op.ciph.algctx, out, outlen, (out == NULL ? 0 : *outlen), in, inlen);
+    if (ret <= 0 && ERR_count_to_mark() == 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_ASYM_CIPHER_FAILURE,
+            "%s encrypt:%s", cipher->type_name, desc);
+    ERR_clear_last_mark();
     return ret;
 
- legacy:
+legacy:
     if (ctx->pmeth == NULL || ctx->pmeth->encrypt == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
         return -2;
     }
-    M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_ENCRYPT)
-        return ctx->pmeth->encrypt(ctx, out, outlen, in, inlen);
+    M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_ENCRYPT) return ctx->pmeth->encrypt(ctx, out, outlen, in, inlen);
 }
 
 int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx)
@@ -277,9 +287,11 @@ 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)
 {
+    EVP_ASYM_CIPHER *cipher;
+    const char *desc;
     int ret;
 
     if (ctx == NULL) {
@@ -295,30 +307,36 @@ int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
     if (ctx->op.ciph.algctx == NULL)
         goto legacy;
 
-    ret = ctx->op.ciph.cipher->decrypt(ctx->op.ciph.algctx, out, outlen,
-                                       (out == NULL ? 0 : *outlen), in, inlen);
+    cipher = ctx->op.ciph.cipher;
+    desc = cipher->description != NULL ? cipher->description : "";
+    ERR_set_mark();
+    ret = cipher->decrypt(ctx->op.ciph.algctx, out, outlen, (out == NULL ? 0 : *outlen), in, inlen);
+    if (ret <= 0 && ERR_count_to_mark() == 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_ASYM_CIPHER_FAILURE,
+            "%s decrypt:%s", cipher->type_name, desc);
+    ERR_clear_last_mark();
+
     return ret;
 
- legacy:
+legacy:
     if (ctx->pmeth == NULL || ctx->pmeth->decrypt == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
         return -2;
     }
-    M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_DECRYPT)
-        return ctx->pmeth->decrypt(ctx, out, outlen, in, inlen);
+    M_check_autoarg(ctx, out, outlen, EVP_F_EVP_PKEY_DECRYPT) return ctx->pmeth->decrypt(ctx, out, outlen, in, inlen);
 }
 
 /* decrypt to new buffer of dynamic size, checking any pre-determined size */
 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)
 {
     if (EVP_PKEY_decrypt(ctx, NULL, outlenp, in, inlen) <= 0
-            || (*outp = OPENSSL_malloc(*outlenp)) == NULL)
+        || (*outp = OPENSSL_malloc(*outlenp)) == NULL)
         return -1;
     if (EVP_PKEY_decrypt(ctx, *outp, outlenp, in, inlen) <= 0
-            || *outlenp == 0
-            || (expected_outlen != 0 && *outlenp != expected_outlen)) {
+        || *outlenp == 0
+        || (expected_outlen != 0 && *outlenp != expected_outlen)) {
         ERR_raise(ERR_LIB_EVP, ERR_R_EVP_LIB);
         OPENSSL_clear_free(*outp, *outlenp);
         *outp = NULL;
@@ -335,7 +353,7 @@ static EVP_ASYM_CIPHER *evp_asym_cipher_new(OSSL_PROVIDER *prov)
         return NULL;
 
     if (!CRYPTO_NEW_REF(&cipher->refcnt, 1)
-            || !ossl_provider_up_ref(prov)) {
+        || !ossl_provider_up_ref(prov)) {
         CRYPTO_FREE_REF(&cipher->refcnt);
         OPENSSL_free(cipher);
         return NULL;
@@ -346,8 +364,8 @@ static EVP_ASYM_CIPHER *evp_asym_cipher_new(OSSL_PROVIDER *prov)
 }
 
 static void *evp_asym_cipher_from_algorithm(int name_id,
-                                            const OSSL_ALGORITHM *algodef,
-                                            OSSL_PROVIDER *prov)
+    const OSSL_ALGORITHM *algodef,
+    OSSL_PROVIDER *prov)
 {
     const OSSL_DISPATCH *fns = algodef->implementation;
     EVP_ASYM_CIPHER *cipher = NULL;
@@ -457,7 +475,7 @@ static void *evp_asym_cipher_from_algorithm(int name_id,
     }
 
     return cipher;
- err:
+err:
     EVP_ASYM_CIPHER_free(cipher);
     return NULL;
 }
@@ -491,23 +509,23 @@ 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)
 {
     return evp_generic_fetch(ctx, OSSL_OP_ASYM_CIPHER, algorithm, properties,
-                             evp_asym_cipher_from_algorithm,
-                             evp_asym_cipher_up_ref,
-                             evp_asym_cipher_free);
+        evp_asym_cipher_from_algorithm,
+        evp_asym_cipher_up_ref,
+        evp_asym_cipher_free);
 }
 
 EVP_ASYM_CIPHER *evp_asym_cipher_fetch_from_prov(OSSL_PROVIDER *prov,
-                                                 const char *algorithm,
-                                                 const char *properties)
+    const char *algorithm,
+    const char *properties)
 {
     return evp_generic_fetch_from_prov(prov, OSSL_OP_ASYM_CIPHER,
-                                       algorithm, properties,
-                                       evp_asym_cipher_from_algorithm,
-                                       evp_asym_cipher_up_ref,
-                                       evp_asym_cipher_free);
+        algorithm, properties,
+        evp_asym_cipher_from_algorithm,
+        evp_asym_cipher_up_ref,
+        evp_asym_cipher_free);
 }
 
 int EVP_ASYM_CIPHER_is_a(const EVP_ASYM_CIPHER *cipher, const char *name)
@@ -531,21 +549,20 @@ 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)
 {
     evp_generic_do_all(libctx, OSSL_OP_ASYM_CIPHER,
-                       (void (*)(void *, void *))fn, arg,
-                       evp_asym_cipher_from_algorithm,
-                       evp_asym_cipher_up_ref,
-                       evp_asym_cipher_free);
+        (void (*)(void *, void *))fn, arg,
+        evp_asym_cipher_from_algorithm,
+        evp_asym_cipher_up_ref,
+        evp_asym_cipher_free);
 }
 
-
 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)
 {
     if (cipher->prov != NULL)
         return evp_names_do_all(cipher->prov, cipher->name_id, fn, data);
diff --git a/crypto/evp/bio_b64.c b/crypto/evp/bio_b64.c
index 98a8fa5525698..b4c3816a52496 100644
--- a/crypto/evp/bio_b64.c
+++ b/crypto/evp/bio_b64.c
@@ -21,11 +21,11 @@ static long b64_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int b64_new(BIO *h);
 static int b64_free(BIO *data);
 static long b64_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
-#define B64_BLOCK_SIZE  1024
+#define B64_BLOCK_SIZE 1024
 #define B64_BLOCK_SIZE2 768
-#define B64_NONE        0
-#define B64_ENCODE      1
-#define B64_DECODE      2
+#define B64_NONE 0
+#define B64_ENCODE 1
+#define B64_DECODE 2
 
 typedef struct b64_struct {
     /*
@@ -33,11 +33,11 @@ typedef struct b64_struct {
      */
     int buf_len;
     int buf_off;
-    int tmp_len;                /* used to find the start when decoding */
-    int tmp_nl;                 /* If true, scan until '\n' */
+    int tmp_len; /* used to find the start when decoding */
+    int tmp_nl; /* If true, scan until '\n' */
     int encode;
-    int start;                  /* have we started decoding yet? */
-    int cont;                   /* <= 0 when finished */
+    int start; /* have we started decoding yet? */
+    int cont; /* <= 0 when finished */
     EVP_ENCODE_CTX *base64;
     unsigned char buf[EVP_ENCODE_LENGTH(B64_BLOCK_SIZE) + 10];
     unsigned char tmp[B64_BLOCK_SIZE];
@@ -51,7 +51,7 @@ static const BIO_METHOD methods_b64 = {
     bread_conv,
     b64_read,
     b64_puts,
-    NULL,                       /* b64_gets, */
+    NULL, /* b64_gets, */
     b64_ctrl,
     b64_new,
     b64_free,
@@ -168,7 +168,7 @@ static int b64_read(BIO *b, char *out, int outl)
             break;
 
         i = BIO_read(next, &(ctx->tmp[ctx->tmp_len]),
-                     B64_BLOCK_SIZE - ctx->tmp_len);
+            B64_BLOCK_SIZE - ctx->tmp_len);
 
         if (i <= 0) {
             ret_code = i;
@@ -277,7 +277,7 @@ static int b64_read(BIO *b, char *out, int outl)
         }
 
         i = EVP_DecodeUpdate(ctx->base64, ctx->buf, &ctx->buf_len,
-                             ctx->tmp, i);
+            ctx->tmp, i);
         ctx->tmp_len = 0;
         /*
          * If eof or an error was signalled, then the condition
@@ -377,8 +377,7 @@ static int b64_write(BIO *b, const char *in, int inl)
                 ret += n;
                 if (ctx->tmp_len < 3)
                     break;
-                ctx->buf_len =
-                    EVP_EncodeBlock(ctx->buf, ctx->tmp, ctx->tmp_len);
+                ctx->buf_len = EVP_EncodeBlock(ctx->buf, ctx->tmp, ctx->tmp_len);
                 OPENSSL_assert(ctx->buf_len <= (int)sizeof(ctx->buf));
                 OPENSSL_assert(ctx->buf_len >= ctx->buf_off);
                 /*
@@ -394,15 +393,14 @@ static int b64_write(BIO *b, const char *in, int inl)
                     break;
                 }
                 n -= n % 3;
-                ctx->buf_len =
-                    EVP_EncodeBlock(ctx->buf, (unsigned char *)in, n);
+                ctx->buf_len = EVP_EncodeBlock(ctx->buf, (unsigned char *)in, n);
                 OPENSSL_assert(ctx->buf_len <= (int)sizeof(ctx->buf));
                 OPENSSL_assert(ctx->buf_len >= ctx->buf_off);
                 ret += n;
             }
         } else {
             if (!EVP_EncodeUpdate(ctx->base64, ctx->buf, &ctx->buf_len,
-                                  (unsigned char *)in, n))
+                    (unsigned char *)in, n))
                 return ret == 0 ? -1 : ret;
             OPENSSL_assert(ctx->buf_len <= (int)sizeof(ctx->buf));
             OPENSSL_assert(ctx->buf_len >= ctx->buf_off);
@@ -450,13 +448,13 @@ static long b64_ctrl(BIO *b, int cmd, long num, void *ptr)
         ctx->encode = B64_NONE;
         ret = BIO_ctrl(next, cmd, num, ptr);
         break;
-    case BIO_CTRL_EOF:         /* More to read */
+    case BIO_CTRL_EOF: /* More to read */
         if (ctx->cont <= 0)
             ret = 1;
         else
             ret = BIO_ctrl(next, cmd, num, ptr);
         break;
-    case BIO_CTRL_WPENDING:    /* More to write in buffer */
+    case BIO_CTRL_WPENDING: /* More to write in buffer */
         OPENSSL_assert(ctx->buf_len >= ctx->buf_off);
         ret = ctx->buf_len - ctx->buf_off;
         if (ret == 0 && ctx->encode != B64_NONE
@@ -465,7 +463,7 @@ static long b64_ctrl(BIO *b, int cmd, long num, void *ptr)
         else if (ret <= 0)
             ret = BIO_ctrl(next, cmd, num, ptr);
         break;
-    case BIO_CTRL_PENDING:     /* More to read in buffer */
+    case BIO_CTRL_PENDING: /* More to read in buffer */
         OPENSSL_assert(ctx->buf_len >= ctx->buf_off);
         ret = ctx->buf_len - ctx->buf_off;
         if (ret <= 0)
@@ -473,7 +471,7 @@ static long b64_ctrl(BIO *b, int cmd, long num, void *ptr)
         break;
     case BIO_CTRL_FLUSH:
         /* do a final write */
- again:
+    again:
         while (ctx->buf_len != ctx->buf_off) {
             i = b64_write(b, NULL, 0);
             if (i < 0)
@@ -482,13 +480,13 @@ static long b64_ctrl(BIO *b, int cmd, long num, void *ptr)
         if (BIO_get_flags(b) & BIO_FLAGS_BASE64_NO_NL) {
             if (ctx->tmp_len != 0) {
                 ctx->buf_len = EVP_EncodeBlock(ctx->buf,
-                                               ctx->tmp, ctx->tmp_len);
+                    ctx->tmp, ctx->tmp_len);
                 ctx->buf_off = 0;
                 ctx->tmp_len = 0;
                 goto again;
             }
         } else if (ctx->encode != B64_NONE
-                   && EVP_ENCODE_CTX_num(ctx->base64) != 0) {
+            && EVP_ENCODE_CTX_num(ctx->base64) != 0) {
             ctx->buf_off = 0;
             EVP_EncodeFinal(ctx->base64, ctx->buf, &(ctx->buf_len));
             /* push out the bytes */
diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c
index ffe4b5bb02e35..861f7457ca6ff 100644
--- a/crypto/evp/bio_enc.c
+++ b/crypto/evp/bio_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -22,16 +22,16 @@ static long enc_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int enc_new(BIO *h);
 static int enc_free(BIO *data);
 static long enc_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fps);
-#define ENC_BLOCK_SIZE  (1024*4)
-#define ENC_MIN_CHUNK   (256)
-#define BUF_OFFSET      (ENC_MIN_CHUNK + EVP_MAX_BLOCK_LENGTH)
+#define ENC_BLOCK_SIZE (1024 * 4)
+#define ENC_MIN_CHUNK (256)
+#define BUF_OFFSET (ENC_MIN_CHUNK + EVP_MAX_BLOCK_LENGTH)
 
 typedef struct enc_struct {
     int buf_len;
     int buf_off;
-    int cont;                   /* <= 0 when finished */
+    int cont; /* <= 0 when finished */
     int finished;
-    int ok;                     /* bad decrypt */
+    int ok; /* bad decrypt */
     EVP_CIPHER_CTX *cipher;
     unsigned char *read_start, *read_end;
     /*
@@ -48,8 +48,8 @@ static const BIO_METHOD methods_enc = {
     enc_write,
     bread_conv,
     enc_read,
-    NULL,                       /* enc_puts, */
-    NULL,                       /* enc_gets, */
+    NULL, /* enc_puts, */
+    NULL, /* enc_gets, */
     enc_ctrl,
     enc_new,
     enc_free,
@@ -161,8 +161,9 @@ static int enc_read(BIO *b, char *out, int outl)
             /* Should be continue next time we are called? */
             if (!BIO_should_retry(next)) {
                 ctx->cont = i;
+                ctx->finished = 1;
                 i = EVP_CipherFinal_ex(ctx->cipher,
-                                       ctx->buf, &(ctx->buf_len));
+                    ctx->buf, &(ctx->buf_len));
                 ctx->ok = i;
                 ctx->buf_off = 0;
             } else {
@@ -179,8 +180,8 @@ static int enc_read(BIO *b, char *out, int outl)
                 int j = outl - blocksize, buf_len;
 
                 if (!EVP_CipherUpdate(ctx->cipher,
-                                      (unsigned char *)out, &buf_len,
-                                      ctx->read_start, i > j ? j : i)) {
+                        (unsigned char *)out, &buf_len,
+                        ctx->read_start, i > j ? j : i)) {
                     BIO_clear_retry_flags(b);
                     return 0;
                 }
@@ -197,8 +198,8 @@ static int enc_read(BIO *b, char *out, int outl)
             if (i > ENC_MIN_CHUNK)
                 i = ENC_MIN_CHUNK;
             if (!EVP_CipherUpdate(ctx->cipher,
-                                  ctx->buf, &ctx->buf_len,
-                                  ctx->read_start, i)) {
+                    ctx->buf, &ctx->buf_len,
+                    ctx->read_start, i)) {
                 BIO_clear_retry_flags(b);
                 ctx->ok = 0;
                 return 0;
@@ -266,8 +267,8 @@ static int enc_write(BIO *b, const char *in, int inl)
     while (inl > 0) {
         n = (inl > ENC_BLOCK_SIZE) ? ENC_BLOCK_SIZE : inl;
         if (!EVP_CipherUpdate(ctx->cipher,
-                              ctx->buf, &ctx->buf_len,
-                              (const unsigned char *)in, n)) {
+                ctx->buf, &ctx->buf_len,
+                (const unsigned char *)in, n)) {
             BIO_clear_retry_flags(b);
             ctx->ok = 0;
             return 0;
@@ -313,11 +314,11 @@ static long enc_ctrl(BIO *b, int cmd, long num, void *ptr)
         ctx->ok = 1;
         ctx->finished = 0;
         if (!EVP_CipherInit_ex(ctx->cipher, NULL, NULL, NULL, NULL,
-                               EVP_CIPHER_CTX_is_encrypting(ctx->cipher)))
+                EVP_CIPHER_CTX_is_encrypting(ctx->cipher)))
             return 0;
         ret = BIO_ctrl(next, cmd, num, ptr);
         break;
-    case BIO_CTRL_EOF:         /* More to read */
+    case BIO_CTRL_EOF: /* More to read */
         if (ctx->cont <= 0)
             ret = 1;
         else
@@ -328,14 +329,14 @@ static long enc_ctrl(BIO *b, int cmd, long num, void *ptr)
         if (ret <= 0)
             ret = BIO_ctrl(next, cmd, num, ptr);
         break;
-    case BIO_CTRL_PENDING:     /* More to read in buffer */
+    case BIO_CTRL_PENDING: /* More to read in buffer */
         ret = ctx->buf_len - ctx->buf_off;
         if (ret <= 0)
             ret = BIO_ctrl(next, cmd, num, ptr);
         break;
     case BIO_CTRL_FLUSH:
         /* do a final write */
- again:
+    again:
         while (ctx->buf_len != ctx->buf_off) {
             pend = ctx->buf_len - ctx->buf_off;
             i = enc_write(b, NULL, 0);
@@ -352,8 +353,8 @@ static long enc_ctrl(BIO *b, int cmd, long num, void *ptr)
             ctx->finished = 1;
             ctx->buf_off = 0;
             ret = EVP_CipherFinal_ex(ctx->cipher,
-                                     (unsigned char *)ctx->buf,
-                                     &(ctx->buf_len));
+                (unsigned char *)ctx->buf,
+                &(ctx->buf_len));
             ctx->ok = (int)ret;
             if (ret <= 0)
                 break;
@@ -407,12 +408,12 @@ static long enc_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 }
 
 int BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
-                   const unsigned char *i, int e)
+    const unsigned char *i, int e)
 {
     BIO_ENC_CTX *ctx;
     BIO_callback_fn_ex callback_ex;
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-    long (*callback) (struct bio_st *, int, const char *, int, long, long) = NULL;
+    long (*callback)(struct bio_st *, int, const char *, int, long, long) = NULL;
 #endif
 
     ctx = BIO_get_data(b);
@@ -421,16 +422,15 @@ int BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
 
     if ((callback_ex = BIO_get_callback_ex(b)) != NULL) {
         if (callback_ex(b, BIO_CB_CTRL, (const char *)c, 0, BIO_CTRL_SET,
-                        e, 1, NULL) <= 0)
+                e, 1, NULL)
+            <= 0)
             return 0;
     }
 #ifndef OPENSSL_NO_DEPRECATED_3_0
     else {
         callback = BIO_get_callback(b);
 
-        if ((callback != NULL) &&
-            (callback(b, BIO_CB_CTRL, (const char *)c, BIO_CTRL_SET, e,
-                      0L) <= 0))
+        if ((callback != NULL) && (callback(b, BIO_CB_CTRL, (const char *)c, BIO_CTRL_SET, e, 0L) <= 0))
             return 0;
     }
 #endif
@@ -442,7 +442,7 @@ int BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
 
     if (callback_ex != NULL)
         return callback_ex(b, BIO_CB_CTRL | BIO_CB_RETURN, (const char *)c, 0,
-                           BIO_CTRL_SET, e, 1, NULL);
+            BIO_CTRL_SET, e, 1, NULL);
 #ifndef OPENSSL_NO_DEPRECATED_3_0
     else if (callback != NULL)
         return callback(b, BIO_CB_CTRL, (const char *)c, BIO_CTRL_SET, e, 1L);
diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c
index 1a85be18118b3..a2d9afcf0e1e5 100644
--- a/crypto/evp/bio_md.c
+++ b/crypto/evp/bio_md.c
@@ -32,7 +32,7 @@ static const BIO_METHOD methods_md = {
     md_write,
     bread_conv,
     md_read,
-    NULL,                       /* md_puts, */
+    NULL, /* md_puts, */
     md_gets,
     md_ctrl,
     md_new,
@@ -89,7 +89,8 @@ static int md_read(BIO *b, char *out, int outl)
     if (BIO_get_init(b)) {
         if (ret > 0) {
             if (EVP_DigestUpdate(ctx, (unsigned char *)out,
-                                 (unsigned int)ret) <= 0)
+                    (unsigned int)ret)
+                <= 0)
                 return -1;
         }
     }
@@ -115,7 +116,7 @@ static int md_write(BIO *b, const char *in, int inl)
     if (BIO_get_init(b)) {
         if (ret > 0) {
             if (!EVP_DigestUpdate(ctx, (const unsigned char *)in,
-                                  (unsigned int)ret)) {
+                    (unsigned int)ret)) {
                 BIO_clear_retry_flags(b);
                 return 0;
             }
@@ -136,7 +137,6 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr)
     long ret = 1;
     BIO *dbio, *next;
 
-
     ctx = BIO_get_data(b);
     next = BIO_next(b);
 
diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index 20811ffded6f5..41cadea1cc3b9 100644
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -77,6 +77,7 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #include "internal/endian.h"
+#include "internal/numbers.h" /* includes SIZE_MAX */
 #include "crypto/evp.h"
 
 static int ok_write(BIO *h, const char *buf, int num);
@@ -90,9 +91,9 @@ static __owur int sig_out(BIO *b);
 static __owur int sig_in(BIO *b);
 static __owur int block_out(BIO *b);
 static __owur int block_in(BIO *b);
-#define OK_BLOCK_SIZE   (1024*4)
-#define OK_BLOCK_BLOCK  4
-#define IOBS            (OK_BLOCK_SIZE+ OK_BLOCK_BLOCK+ 3*EVP_MAX_MD_SIZE)
+#define OK_BLOCK_SIZE (1024 * 4)
+#define OK_BLOCK_BLOCK 4
+#define IOBS (OK_BLOCK_SIZE + OK_BLOCK_BLOCK + 3 * EVP_MAX_MD_SIZE)
 #define WELLKNOWN "The quick brown fox jumped over the lazy dog's back."
 
 typedef struct ok_struct {
@@ -100,11 +101,11 @@ typedef struct ok_struct {
     size_t buf_off;
     size_t buf_len_save;
     size_t buf_off_save;
-    int cont;                   /* <= 0 when finished */
+    int cont; /* <= 0 when finished */
     int finished;
     EVP_MD_CTX *md;
-    int blockout;               /* output block is ready */
-    int sigio;                  /* must process signature */
+    int blockout; /* output block is ready */
+    int sigio; /* must process signature */
     unsigned char buf[IOBS];
 } BIO_OK_CTX;
 
@@ -115,8 +116,8 @@ static const BIO_METHOD methods_ok = {
     ok_write,
     bread_conv,
     ok_read,
-    NULL,                       /* ok_puts, */
-    NULL,                       /* ok_gets, */
+    NULL, /* ok_puts, */
+    NULL, /* ok_gets, */
     ok_ctrl,
     ok_new,
     ok_free,
@@ -203,7 +204,7 @@ static int ok_read(BIO *b, char *out, int outl)
                 if (ctx->buf_len_save > ctx->buf_off_save) {
                     ctx->buf_len = ctx->buf_len_save - ctx->buf_off_save;
                     memmove(ctx->buf, &(ctx->buf[ctx->buf_off_save]),
-                            ctx->buf_len);
+                        ctx->buf_len);
                 } else {
                     ctx->buf_len = 0;
                 }
@@ -220,7 +221,7 @@ static int ok_read(BIO *b, char *out, int outl)
         i = BIO_read(next, &(ctx->buf[ctx->buf_len]), n);
 
         if (i <= 0)
-            break;              /* nothing new */
+            break; /* nothing new */
 
         ctx->buf_len += i;
 
@@ -243,7 +244,6 @@ static int ok_read(BIO *b, char *out, int outl)
         /* invalid block -- cancel */
         if (ctx->cont <= 0)
             break;
-
     }
 
     BIO_clear_retry_flags(b);
@@ -295,8 +295,7 @@ static int ok_write(BIO *b, const char *in, int inl)
         if ((in == NULL) || (inl <= 0))
             return 0;
 
-        n = (inl + ctx->buf_len > OK_BLOCK_SIZE + OK_BLOCK_BLOCK) ?
-            (int)(OK_BLOCK_SIZE + OK_BLOCK_BLOCK - ctx->buf_len) : inl;
+        n = (inl + ctx->buf_len > OK_BLOCK_SIZE + OK_BLOCK_BLOCK) ? (int)(OK_BLOCK_SIZE + OK_BLOCK_BLOCK - ctx->buf_len) : inl;
 
         memcpy(&ctx->buf[ctx->buf_len], in, n);
         ctx->buf_len += n;
@@ -340,14 +339,14 @@ static long ok_ctrl(BIO *b, int cmd, long num, void *ptr)
         ctx->sigio = 1;
         ret = BIO_ctrl(next, cmd, num, ptr);
         break;
-    case BIO_CTRL_EOF:         /* More to read */
+    case BIO_CTRL_EOF: /* More to read */
         if (ctx->cont <= 0)
             ret = 1;
         else
             ret = BIO_ctrl(next, cmd, num, ptr);
         break;
-    case BIO_CTRL_PENDING:     /* More to read in buffer */
-    case BIO_CTRL_WPENDING:    /* More to read in buffer */
+    case BIO_CTRL_PENDING: /* More to read in buffer */
+    case BIO_CTRL_WPENDING: /* More to read in buffer */
         ret = ctx->blockout ? ctx->buf_len - ctx->buf_off : 0;
         if (ret <= 0)
             ret = BIO_ctrl(next, cmd, num, ptr);
@@ -468,7 +467,7 @@ static int sig_out(BIO *b)
     ctx->blockout = 1;
     ctx->sigio = 0;
     return 1;
- berr:
+berr:
     BIO_clear_retry_flags(b);
     return 0;
 }
@@ -510,7 +509,7 @@ static int sig_in(BIO *b)
         ctx->sigio = 0;
         if (ctx->buf_len != ctx->buf_off) {
             memmove(ctx->buf, &(ctx->buf[ctx->buf_off]),
-                    ctx->buf_len - ctx->buf_off);
+                ctx->buf_len - ctx->buf_off);
         }
         ctx->buf_len -= ctx->buf_off;
         ctx->buf_off = 0;
@@ -518,7 +517,7 @@ static int sig_in(BIO *b)
         ctx->cont = 0;
     }
     return 1;
- berr:
+berr:
     BIO_clear_retry_flags(b);
     return 0;
 }
@@ -544,14 +543,14 @@ static int block_out(BIO *b)
     ctx->buf[2] = (unsigned char)(tl >> 8);
     ctx->buf[3] = (unsigned char)(tl);
     if (!EVP_DigestUpdate(md,
-                          (unsigned char *)&(ctx->buf[OK_BLOCK_BLOCK]), tl))
+            (unsigned char *)&(ctx->buf[OK_BLOCK_BLOCK]), tl))
         goto berr;
     if (!EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL))
         goto berr;
     ctx->buf_len += md_size;
     ctx->blockout = 1;
     return 1;
- berr:
+berr:
     BIO_clear_retry_flags(b);
     return 0;
 }
@@ -560,7 +559,7 @@ static int block_in(BIO *b)
 {
     BIO_OK_CTX *ctx;
     EVP_MD_CTX *md;
-    unsigned long tl = 0;
+    size_t tl = 0;
     unsigned char tmp[EVP_MAX_MD_SIZE];
     int md_size;
 
@@ -571,23 +570,26 @@ static int block_in(BIO *b)
         goto berr;
 
     assert(sizeof(tl) >= OK_BLOCK_BLOCK); /* always true */
-    tl = ctx->buf[0];
-    tl <<= 8;
-    tl |= ctx->buf[1];
-    tl <<= 8;
-    tl |= ctx->buf[2];
-    tl <<= 8;
-    tl |= ctx->buf[3];
-
-    if (ctx->buf_len < tl + OK_BLOCK_BLOCK + md_size)
+    tl = ((size_t)ctx->buf[0] << 24)
+        | ((size_t)ctx->buf[1] << 16)
+        | ((size_t)ctx->buf[2] << 8)
+        | ((size_t)ctx->buf[3]);
+
+    if (tl > OK_BLOCK_SIZE)
+        goto berr;
+
+    if (tl > SIZE_MAX - OK_BLOCK_BLOCK - (size_t)md_size)
+        goto berr;
+
+    if (ctx->buf_len < tl + OK_BLOCK_BLOCK + (size_t)md_size)
         return 1;
 
     if (!EVP_DigestUpdate(md,
-                          (unsigned char *)&(ctx->buf[OK_BLOCK_BLOCK]), tl))
+            (unsigned char *)&(ctx->buf[OK_BLOCK_BLOCK]), tl))
         goto berr;
     if (!EVP_DigestFinal_ex(md, tmp, NULL))
         goto berr;
-    if (memcmp(&(ctx->buf[tl + OK_BLOCK_BLOCK]), tmp, md_size) == 0) {
+    if (memcmp(&(ctx->buf[tl + OK_BLOCK_BLOCK]), tmp, (size_t)md_size) == 0) {
         /* there might be parts from next block lurking around ! */
         ctx->buf_off_save = tl + OK_BLOCK_BLOCK + md_size;
         ctx->buf_len_save = ctx->buf_len;
@@ -598,7 +600,7 @@ static int block_in(BIO *b)
         ctx->cont = 0;
     }
     return 1;
- berr:
+berr:
     BIO_clear_retry_flags(b);
     return 0;
 }
diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c
index c74b3dcd753a6..16cf6403bfd49 100644
--- a/crypto/evp/c_allc.c
+++ b/crypto/evp/c_allc.c
@@ -56,9 +56,9 @@ void openssl_add_all_ciphers_int(void)
 #ifndef OPENSSL_NO_RC4
     EVP_add_cipher(EVP_rc4());
     EVP_add_cipher(EVP_rc4_40());
-# ifndef OPENSSL_NO_MD5
+#ifndef OPENSSL_NO_MD5
     EVP_add_cipher(EVP_rc4_hmac_md5());
-# endif
+#endif
 #endif
 
 #ifndef OPENSSL_NO_IDEA
@@ -261,8 +261,8 @@ void openssl_add_all_ciphers_int(void)
 
 #ifndef OPENSSL_NO_CHACHA
     EVP_add_cipher(EVP_chacha20());
-# ifndef OPENSSL_NO_POLY1305
+#ifndef OPENSSL_NO_POLY1305
     EVP_add_cipher(EVP_chacha20_poly1305());
-# endif
+#endif
 #endif
 }
diff --git a/crypto/evp/cmeth_lib.c b/crypto/evp/cmeth_lib.c
index 41a1bade2c445..5e71d0061cf4b 100644
--- a/crypto/evp/cmeth_lib.c
+++ b/crypto/evp/cmeth_lib.c
@@ -45,7 +45,8 @@ EVP_CIPHER *EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher)
         return NULL;
 
     if ((to = EVP_CIPHER_meth_new(cipher->nid, cipher->block_size,
-                                  cipher->key_len)) != NULL) {
+             cipher->key_len))
+        != NULL) {
         CRYPTO_REF_COUNT refcnt = to->refcnt;
 
         memcpy(to, cipher, sizeof(*to));
@@ -58,7 +59,7 @@ EVP_CIPHER *EVP_CIPHER_meth_dup(const EVP_CIPHER *cipher)
 void EVP_CIPHER_meth_free(EVP_CIPHER *cipher)
 {
     if (cipher == NULL || cipher->origin != EVP_ORIG_METH)
-       return;
+        return;
 
     evp_cipher_free_int(cipher);
 }
@@ -91,10 +92,10 @@ int EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size)
 }
 
 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))
 {
     if (cipher->init != NULL)
         return 0;
@@ -104,10 +105,10 @@ int EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
 }
 
 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))
 {
     if (cipher->do_cipher != NULL)
         return 0;
@@ -117,7 +118,7 @@ int EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,
 }
 
 int EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
-                                int (*cleanup) (EVP_CIPHER_CTX *))
+    int (*cleanup)(EVP_CIPHER_CTX *))
 {
     if (cipher->cleanup != NULL)
         return 0;
@@ -127,8 +128,8 @@ int EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
 }
 
 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 *))
 {
     if (cipher->set_asn1_parameters != NULL)
         return 0;
@@ -138,8 +139,8 @@ int EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,
 }
 
 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 *))
 {
     if (cipher->get_asn1_parameters != NULL)
         return 0;
@@ -149,8 +150,8 @@ int EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,
 }
 
 int EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
-                             int (*ctrl) (EVP_CIPHER_CTX *, int type,
-                                          int arg, void *ptr))
+    int (*ctrl)(EVP_CIPHER_CTX *, int type,
+        int arg, void *ptr))
 {
     if (cipher->ctrl != NULL)
         return 0;
@@ -159,18 +160,17 @@ int EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
     return 1;
 }
 
-
 int (*EVP_CIPHER_meth_get_init(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,
-                                                          const unsigned char *key,
-                                                          const unsigned char *iv,
-                                                          int enc)
+    const unsigned char *key,
+    const unsigned char *iv,
+    int enc)
 {
     return cipher->init;
 }
 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)
+    unsigned char *out,
+    const unsigned char *in,
+    size_t inl)
 {
     return cipher->do_cipher;
 }
@@ -181,21 +181,20 @@ int (*EVP_CIPHER_meth_get_cleanup(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *)
 }
 
 int (*EVP_CIPHER_meth_get_set_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
-                                                                     ASN1_TYPE *)
+    ASN1_TYPE *)
 {
     return cipher->set_asn1_parameters;
 }
 
 int (*EVP_CIPHER_meth_get_get_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
-                                                               ASN1_TYPE *)
+    ASN1_TYPE *)
 {
     return cipher->get_asn1_parameters;
 }
 
 int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
-                                                          int type, int arg,
-                                                          void *ptr)
+    int type, int arg,
+    void *ptr)
 {
     return cipher->ctrl;
 }
-
diff --git a/crypto/evp/ctrl_params_translate.c b/crypto/evp/ctrl_params_translate.c
index a932d38c06085..388b5e0bddee5 100644
--- a/crypto/evp/ctrl_params_translate.c
+++ b/crypto/evp/ctrl_params_translate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-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
@@ -37,8 +37,8 @@
 #include "crypto/dh.h"
 #include "crypto/ec.h"
 
-struct translation_ctx_st;       /* Forwarding */
-struct translation_st;           /* Forwarding */
+struct translation_ctx_st; /* Forwarding */
+struct translation_st; /* Forwarding */
 
 /*
  * The fixup_args functions are called with the following parameters:
@@ -78,11 +78,11 @@ struct translation_st;           /* Forwarding */
  *                              With the PRE_CTRL_TO_PARAMS state, the
  *                              fixup_args function is expected to modify
  *                              the passed |*params| in whatever way
- *                              necessary, when |action_type == SET|.
+ *                              necessary, when |action_type == OSSL_ACTION_SET|.
  *                              With the POST_CTRL_TO_PARAMS state, the
  *                              fixup_args function is expected to modify
  *                              the passed |p2| in whatever way necessary,
- *                              when |action_type == GET|.
+ *                              when |action_type == OSSL_ACTION_GET|.
  *
  *                              The return value from the fixup_args call
  *                              with the POST_CTRL_TO_PARAMS state becomes
@@ -107,7 +107,7 @@ struct translation_st;           /* Forwarding */
  *                              With the PRE_CTRL_STR_TO_PARAMS state,
  *                              the fixup_args function is expected to
  *                              modify the passed |*params| in whatever
- *                              way necessary, when |action_type == SET|.
+ *                              way necessary, when |action_type == OSSL_ACTION_SET|.
  *                              With the POST_CTRL_STR_TO_PARAMS state,
  *                              the fixup_args function is only expected
  *                              to return a value.
@@ -132,11 +132,11 @@ struct translation_st;           /* Forwarding */
  *                              With the PRE_PARAMS_TO_CTRL state, the
  *                              fixup_args function is expected to modify
  *                              the passed |p1| and |p2| in whatever way
- *                              necessary, when |action_type == SET|.
+ *                              necessary, when |action_type == OSSL_ACTION_SET|.
  *                              With the POST_PARAMS_TO_CTRL state, the
  *                              fixup_args function is expected to
  *                              modify the passed |*params| in whatever
- *                              way necessary, when |action_type == GET|.
+ *                              way necessary, when |action_type == OSSL_ACTION_GET|.
  *
  * CLEANUP_PARAMS_TO_CTRL       The cleanup_args functions has been called
  *                              from EVP_PKEY_CTX_get_params() or
@@ -145,19 +145,27 @@ struct translation_st;           /* Forwarding */
  */
 enum state {
     PKEY,
-    PRE_CTRL_TO_PARAMS, POST_CTRL_TO_PARAMS, CLEANUP_CTRL_TO_PARAMS,
-    PRE_CTRL_STR_TO_PARAMS, POST_CTRL_STR_TO_PARAMS, CLEANUP_CTRL_STR_TO_PARAMS,
-    PRE_PARAMS_TO_CTRL, POST_PARAMS_TO_CTRL, CLEANUP_PARAMS_TO_CTRL
+    PRE_CTRL_TO_PARAMS,
+    POST_CTRL_TO_PARAMS,
+    CLEANUP_CTRL_TO_PARAMS,
+    PRE_CTRL_STR_TO_PARAMS,
+    POST_CTRL_STR_TO_PARAMS,
+    CLEANUP_CTRL_STR_TO_PARAMS,
+    PRE_PARAMS_TO_CTRL,
+    POST_PARAMS_TO_CTRL,
+    CLEANUP_PARAMS_TO_CTRL
 };
 enum action {
-    NONE = 0, GET = 1, SET = 2
+    OSSL_ACTION_NONE = 0,
+    OSSL_ACTION_GET = 1,
+    OSSL_ACTION_SET = 2
 };
 typedef int fixup_args_fn(enum state state,
-                          const struct translation_st *translation,
-                          struct translation_ctx_st *ctx);
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx);
 typedef int cleanup_args_fn(enum state state,
-                            const struct translation_st *translation,
-                            struct translation_ctx_st *ctx);
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx);
 
 struct translation_ctx_st {
     /*
@@ -166,7 +174,7 @@ struct translation_ctx_st {
      */
     EVP_PKEY_CTX *pctx;
     /*
-     * The action type (GET or SET).  This may be 0 in some cases, and should
+     * The action type (OSSL_ACTION_GET or OSSL_ACTION_SET). This may be 0 in some cases, and should
      * be modified by the fixup_args function in the PRE states.  It should
      * otherwise remain untouched once set.
      */
@@ -215,7 +223,7 @@ struct translation_st {
     /*-
      * What this table item does.
      *
-     * If the item has this set to 0, it means that both GET and SET are
+     * If the item has this set to 0, it means that both OSSL_ACTION_GET and OSSL_ACTION_SET are
      * supported, and |fixup_args| will determine which it is.  This is to
      * support translations of ctrls where the action type depends on the
      * value of |p1| or |p2| (ctrls are really bi-directional, but are
@@ -234,9 +242,9 @@ struct translation_st {
      * will check and return an error if it's not supported).
      * Any of these may be set to 0 to indicate that they are unset.
      */
-    int keytype1;    /* The EVP_PKEY_XXX type, i.e. NIDs. #legacy */
-    int keytype2;    /* Another EVP_PKEY_XXX type, used for aliases */
-    int optype;      /* The operation type */
+    int keytype1; /* The EVP_PKEY_XXX type, i.e. NIDs. #legacy */
+    int keytype2; /* Another EVP_PKEY_XXX type, used for aliases */
+    int optype; /* The operation type */
 
     /*
      * Lookup and translation attributes
@@ -256,10 +264,10 @@ struct translation_st {
      * to |ctrl_str|.  That will signal to default_fixup_args() that the
      * value must always be interpreted as hex.
      */
-    int ctrl_num;            /* EVP_PKEY_CTRL_xxx */
-    const char *ctrl_str;    /* The corresponding ctrl string */
+    int ctrl_num; /* EVP_PKEY_CTRL_xxx */
+    const char *ctrl_str; /* The corresponding ctrl string */
     const char *ctrl_hexstr; /* The alternative "hex{str}" ctrl string */
-    const char *param_key;   /* The corresponding OSSL_PARAM key */
+    const char *param_key; /* The corresponding OSSL_PARAM key */
     /*
      * The appropriate OSSL_PARAM data type.  This may be 0 to indicate that
      * this OSSL_PARAM may have more than one data type, depending on input
@@ -271,7 +279,7 @@ struct translation_st {
     /*
      * Fixer functions
      *
-     * |fixup_args| is always called before (for SET) or after (for GET)
+     * |fixup_args| is always called before (for OSSL_ACTION_SET) or after (for OSSL_ACTION_GET)
      * the actual ctrl / OSSL_PARAM function.
      */
     fixup_args_fn *fixup_args;
@@ -287,8 +295,8 @@ struct translation_st {
  * perform certain standard checks.
  */
 static int default_check(enum state state,
-                         const struct translation_st *translation,
-                         const struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    const struct translation_ctx_st *ctx)
 {
     switch (state) {
     default:
@@ -312,7 +320,7 @@ static int default_check(enum state state,
          * function will have to deal with it carefully.
          */
         if (translation != NULL) {
-            if (!ossl_assert(translation->action_type != GET)) {
+            if (!ossl_assert(translation->action_type != OSSL_ACTION_GET)) {
                 ERR_raise(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED);
                 return -2;
             }
@@ -344,7 +352,7 @@ static int default_check(enum state state,
  * default_fixup_args fixes up all sorts of arguments, governed by the
  * diverse attributes in the translation item.  It covers all "standard"
  * base ctrl functionality, meaning it can handle basic conversion of
- * data between p1+p2 (SET) or return value+p2 (GET) as long as the values
+ * data between p1+p2 (OSSL_ACTION_SET) or return value+p2 (OSSL_ACTION_GET) as long as the values
  * don't have extra semantics (such as NIDs, OIDs, that sort of stuff).
  * Extra semantics must be handled via specific fixup_args functions.
  *
@@ -353,37 +361,40 @@ static int default_check(enum state state,
  *
  * PRE_CTRL_TO_PARAMS, 0                - ERROR.  action type must be
  *                                        determined by a fixup function.
- * PRE_CTRL_TO_PARAMS, SET | GET        - |p1| and |p2| are converted to an
+ * PRE_CTRL_TO_PARAMS, OSSL_ACTION_SET
+ *                   | OSSL_ACTION_GET  - |p1| and |p2| are converted to an
  *                                        OSSL_PARAM according to the data
  *                                        type given in |translattion|.
  *                                        For OSSL_PARAM_UNSIGNED_INTEGER,
  *                                        a BIGNUM passed as |p2| is accepted.
- * POST_CTRL_TO_PARAMS, GET             - If the OSSL_PARAM data type is a
+ * POST_CTRL_TO_PARAMS, OSSL_ACTION_GET - If the OSSL_PARAM data type is a
  *                                        STRING or PTR type, |p1| is set
  *                                        to the OSSL_PARAM return size, and
  *                                        |p2| is set to the string.
- * PRE_CTRL_STR_TO_PARAMS, !SET         - ERROR.  That combination is not
+ * PRE_CTRL_STR_TO_PARAMS,
+ *                     !OSSL_ACTION_SET - ERROR.  That combination is not
  *                                        supported.
- * PRE_CTRL_STR_TO_PARAMS, SET          - |p2| is taken as a string, and is
+ * PRE_CTRL_STR_TO_PARAMS,
+ *                      OSSL_ACTION_SET - |p2| is taken as a string, and is
  *                                        converted to an OSSL_PARAM in a
  *                                        standard manner, guided by the
  *                                        param key and data type from
  *                                        |translation|.
- * PRE_PARAMS_TO_CTRL, SET              - the OSSL_PARAM is converted to
+ * PRE_PARAMS_TO_CTRL, OSSL_ACTION_SET  - the OSSL_PARAM is converted to
  *                                        |p1| and |p2| according to the
  *                                        data type given in |translation|
  *                                        For OSSL_PARAM_UNSIGNED_INTEGER,
  *                                        if |p2| is non-NULL, then |*p2|
  *                                        is assigned a BIGNUM, otherwise
  *                                        |p1| is assigned an unsigned int.
- * POST_PARAMS_TO_CTRL, GET             - |p1| and |p2| are converted to
+ * POST_PARAMS_TO_CTRL, OSSL_ACTION_GET - |p1| and |p2| are converted to
  *                                        an OSSL_PARAM, in the same manner
  *                                        as for the combination of
- *                                        PRE_CTRL_TO_PARAMS, SET.
+ *                                        PRE_CTRL_TO_PARAMS, OSSL_ACTION_SET.
  */
 static int default_fixup_args(enum state state,
-                              const struct translation_st *translation,
-                              struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     int ret;
 
@@ -394,7 +405,7 @@ static int default_fixup_args(enum state state,
     default:
         /* For states this function should never have been called with */
         ERR_raise_data(ERR_LIB_EVP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED,
-                       "[action:%d, state:%d]", ctx->action_type, state);
+            "[action:%d, state:%d]", ctx->action_type, state);
         return 0;
 
     /*
@@ -405,19 +416,19 @@ static int default_fixup_args(enum state state,
      */
     case PRE_CTRL_TO_PARAMS:
         /* This is ctrl to params translation, so we need an OSSL_PARAM key */
-        if (ctx->action_type == NONE) {
+        if (ctx->action_type == OSSL_ACTION_NONE) {
             /*
              * No action type is an error here.  That's a case for a
              * special fixup function.
              */
             ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED,
-                           "[action:%d, state:%d]", ctx->action_type, state);
+                "[action:%d, state:%d]", ctx->action_type, state);
             return 0;
         }
 
         if (translation->optype != 0) {
             if ((EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
-                 && ctx->pctx->op.sig.algctx == NULL)
+                    && ctx->pctx->op.sig.algctx == NULL)
                 || (EVP_PKEY_CTX_IS_DERIVE_OP(ctx->pctx)
                     && ctx->pctx->op.kex.algctx == NULL)
                 || (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx->pctx)
@@ -439,12 +450,12 @@ static int default_fixup_args(enum state state,
         }
 
         /*
-         * OSSL_PARAM_construct_TYPE() works equally well for both SET and GET.
+         * OSSL_PARAM_construct_TYPE() works equally well for OSSL_ACTION_SET and OSSL_ACTION_GET.
          */
         switch (translation->param_data_type) {
         case OSSL_PARAM_INTEGER:
             *ctx->params = OSSL_PARAM_construct_int(translation->param_key,
-                                                    &ctx->p1);
+                &ctx->p1);
             break;
         case OSSL_PARAM_UNSIGNED_INTEGER:
             /*
@@ -456,57 +467,53 @@ static int default_fixup_args(enum state state,
              * must deallocate.
              */
             if (ctx->p2 != NULL) {
-                if (ctx->action_type == SET) {
+                if (ctx->action_type == OSSL_ACTION_SET) {
                     ctx->buflen = BN_num_bytes(ctx->p2);
                     if ((ctx->allocated_buf
-                         = OPENSSL_malloc(ctx->buflen)) == NULL)
+                            = OPENSSL_malloc(ctx->buflen))
+                        == NULL)
                         return 0;
                     if (BN_bn2nativepad(ctx->p2,
-                                         ctx->allocated_buf, ctx->buflen) < 0) {
+                            ctx->allocated_buf, ctx->buflen)
+                        < 0) {
                         OPENSSL_free(ctx->allocated_buf);
                         ctx->allocated_buf = NULL;
                         return 0;
                     }
-                    *ctx->params =
-                        OSSL_PARAM_construct_BN(translation->param_key,
-                                                ctx->allocated_buf,
-                                                ctx->buflen);
+                    *ctx->params = OSSL_PARAM_construct_BN(translation->param_key,
+                        ctx->allocated_buf,
+                        ctx->buflen);
                 } else {
                     /*
                      * No support for getting a BIGNUM by ctrl, this needs
                      * fixup_args function support.
                      */
                     ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED,
-                                   "[action:%d, state:%d] trying to get a "
-                                   "BIGNUM via ctrl call",
-                                   ctx->action_type, state);
+                        "[action:%d, state:%d] trying to get a "
+                        "BIGNUM via ctrl call",
+                        ctx->action_type, state);
                     return 0;
                 }
             } else {
-                *ctx->params =
-                    OSSL_PARAM_construct_uint(translation->param_key,
-                                              (unsigned int *)&ctx->p1);
+                *ctx->params = OSSL_PARAM_construct_uint(translation->param_key,
+                    (unsigned int *)&ctx->p1);
             }
             break;
         case OSSL_PARAM_UTF8_STRING:
-            *ctx->params =
-                OSSL_PARAM_construct_utf8_string(translation->param_key,
-                                                 ctx->p2, (size_t)ctx->p1);
+            *ctx->params = OSSL_PARAM_construct_utf8_string(translation->param_key,
+                ctx->p2, (size_t)ctx->p1);
             break;
         case OSSL_PARAM_UTF8_PTR:
-            *ctx->params =
-                OSSL_PARAM_construct_utf8_ptr(translation->param_key,
-                                              ctx->p2, (size_t)ctx->p1);
+            *ctx->params = OSSL_PARAM_construct_utf8_ptr(translation->param_key,
+                ctx->p2, (size_t)ctx->p1);
             break;
         case OSSL_PARAM_OCTET_STRING:
-            *ctx->params =
-                OSSL_PARAM_construct_octet_string(translation->param_key,
-                                                  ctx->p2, (size_t)ctx->p1);
+            *ctx->params = OSSL_PARAM_construct_octet_string(translation->param_key,
+                ctx->p2, (size_t)ctx->p1);
             break;
         case OSSL_PARAM_OCTET_PTR:
-            *ctx->params =
-                OSSL_PARAM_construct_octet_ptr(translation->param_key,
-                                               ctx->p2, (size_t)ctx->p1);
+            *ctx->params = OSSL_PARAM_construct_octet_ptr(translation->param_key,
+                ctx->p2, (size_t)ctx->p1);
             break;
         }
         break;
@@ -516,7 +523,7 @@ static int default_fixup_args(enum state state,
          * as its return value, we need to ensure that we do it here as well,
          * for the OSSL_PARAM data types where this makes sense.
          */
-        if (ctx->action_type == GET) {
+        if (ctx->action_type == OSSL_ACTION_GET) {
             switch (translation->param_data_type) {
             case OSSL_PARAM_UTF8_STRING:
             case OSSL_PARAM_UTF8_PTR:
@@ -534,59 +541,58 @@ static int default_fixup_args(enum state state,
      * |*params|, and POST_CTRL_TO_PARAMS currently has nothing to do, since
      * there's no support for getting data via ctrl_str calls.
      */
-    case PRE_CTRL_STR_TO_PARAMS:
-        {
-            /* This is ctrl_str to params translation */
-            const char *tmp_ctrl_str = ctx->ctrl_str;
-            const char *orig_ctrl_str = ctx->ctrl_str;
-            const char *orig_value = ctx->p2;
-            const OSSL_PARAM *settable = NULL;
-            int exists = 0;
-
-            /* Only setting is supported here */
-            if (ctx->action_type != SET) {
-                ERR_raise_data(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED,
-                                   "[action:%d, state:%d] only setting allowed",
-                                   ctx->action_type, state);
-                return 0;
-            }
+    case PRE_CTRL_STR_TO_PARAMS: {
+        /* This is ctrl_str to params translation */
+        const char *tmp_ctrl_str = ctx->ctrl_str;
+        const char *orig_ctrl_str = ctx->ctrl_str;
+        const char *orig_value = ctx->p2;
+        const OSSL_PARAM *settable = NULL;
+        int exists = 0;
+
+        /* Only setting is supported here */
+        if (ctx->action_type != OSSL_ACTION_SET) {
+            ERR_raise_data(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED,
+                "[action:%d, state:%d] only setting allowed",
+                ctx->action_type, state);
+            return 0;
+        }
 
-            /*
-             * If no translation exists, we simply pass the control string
-             * unmodified.
-             */
-            if (translation != NULL) {
-                tmp_ctrl_str = ctx->ctrl_str = translation->param_key;
-
-                if (ctx->ishex) {
-                    strcpy(ctx->name_buf, "hex");
-                    if (OPENSSL_strlcat(ctx->name_buf, tmp_ctrl_str,
-                                        sizeof(ctx->name_buf)) <= 3) {
-                        ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
-                        return -1;
-                    }
-                    tmp_ctrl_str = ctx->name_buf;
+        /*
+         * If no translation exists, we simply pass the control string
+         * unmodified.
+         */
+        if (translation != NULL) {
+            tmp_ctrl_str = ctx->ctrl_str = translation->param_key;
+
+            if (ctx->ishex) {
+                strcpy(ctx->name_buf, "hex");
+                if (OPENSSL_strlcat(ctx->name_buf, tmp_ctrl_str,
+                        sizeof(ctx->name_buf))
+                    <= 3) {
+                    ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
+                    return -1;
                 }
+                tmp_ctrl_str = ctx->name_buf;
             }
+        }
 
-            settable = EVP_PKEY_CTX_settable_params(ctx->pctx);
-            if (!OSSL_PARAM_allocate_from_text(ctx->params, settable,
-                                               tmp_ctrl_str,
-                                               ctx->p2, strlen(ctx->p2),
-                                               &exists)) {
-                if (!exists) {
-                    ERR_raise_data(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED,
-                                   "[action:%d, state:%d] name=%s, value=%s",
-                                   ctx->action_type, state,
-                                   orig_ctrl_str, orig_value);
-                    return -2;
-                }
-                return 0;
+        settable = EVP_PKEY_CTX_settable_params(ctx->pctx);
+        if (!OSSL_PARAM_allocate_from_text(ctx->params, settable,
+                tmp_ctrl_str,
+                ctx->p2, strlen(ctx->p2),
+                &exists)) {
+            if (!exists) {
+                ERR_raise_data(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED,
+                    "[action:%d, state:%d] name=%s, value=%s",
+                    ctx->action_type, state,
+                    orig_ctrl_str, orig_value);
+                return -2;
             }
-            ctx->allocated_buf = ctx->params->data;
-            ctx->buflen = ctx->params->data_size;
+            return 0;
         }
-        break;
+        ctx->allocated_buf = ctx->params->data;
+        ctx->buflen = ctx->params->data_size;
+    } break;
     case POST_CTRL_STR_TO_PARAMS:
         /* Nothing to be done */
         break;
@@ -607,107 +613,106 @@ static int default_fixup_args(enum state state,
     case POST_PARAMS_TO_CTRL:
         ret = ctx->p1;
         /* FALLTHRU */
-    case PRE_PARAMS_TO_CTRL:
-        {
-            /* This is params to ctrl translation */
-            if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == SET) {
-                /* For the PRE state, only setting needs some work to be done */
-
-                /* When setting, we populate |p1| and |p2| from |*params| */
-                switch (translation->param_data_type) {
-                case OSSL_PARAM_INTEGER:
-                    return OSSL_PARAM_get_int(ctx->params, &ctx->p1);
-                case OSSL_PARAM_UNSIGNED_INTEGER:
-                    if (ctx->p2 != NULL) {
-                        /* BIGNUM passed down with p2 */
-                        if (!OSSL_PARAM_get_BN(ctx->params, ctx->p2))
-                            return 0;
-                    } else {
-                        /* Normal C unsigned int passed down */
-                        if (!OSSL_PARAM_get_uint(ctx->params,
-                                                 (unsigned int *)&ctx->p1))
-                            return 0;
-                    }
-                    return 1;
-                case OSSL_PARAM_UTF8_STRING:
-                    return OSSL_PARAM_get_utf8_string(ctx->params,
-                                                      ctx->p2, ctx->sz);
-                case OSSL_PARAM_OCTET_STRING:
-                    return OSSL_PARAM_get_octet_string(ctx->params,
-                                                       &ctx->p2, ctx->sz,
-                                                       (size_t *)&ctx->p1);
-                case OSSL_PARAM_OCTET_PTR:
-                    return OSSL_PARAM_get_octet_ptr(ctx->params,
-                                                    ctx->p2, &ctx->sz);
-                default:
-                    ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED,
-                                   "[action:%d, state:%d] "
-                                   "unknown OSSL_PARAM data type %d",
-                                   ctx->action_type, state,
-                                   translation->param_data_type);
-                    return 0;
-                }
-            } else if ((state == POST_PARAMS_TO_CTRL || state == PKEY)
-                       && ctx->action_type == GET) {
-                /* For the POST state, only getting needs some work to be done */
-                unsigned int param_data_type = translation->param_data_type;
-                size_t size = (size_t)ctx->p1;
-
-                if (state == PKEY)
-                    size = ctx->sz;
-                if (param_data_type == 0) {
-                    /* we must have a fixup_args function to work */
-                    if (!ossl_assert(translation->fixup_args != NULL)) {
-                        ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
+    case PRE_PARAMS_TO_CTRL: {
+        /* This is params to ctrl translation */
+        if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_SET) {
+            /* For the PRE state, only setting needs some work to be done */
+
+            /* When setting, we populate |p1| and |p2| from |*params| */
+            switch (translation->param_data_type) {
+            case OSSL_PARAM_INTEGER:
+                return OSSL_PARAM_get_int(ctx->params, &ctx->p1);
+            case OSSL_PARAM_UNSIGNED_INTEGER:
+                if (ctx->p2 != NULL) {
+                    /* BIGNUM passed down with p2 */
+                    if (!OSSL_PARAM_get_BN(ctx->params, ctx->p2))
+                        return 0;
+                } else {
+                    /* Normal C unsigned int passed down */
+                    if (!OSSL_PARAM_get_uint(ctx->params,
+                            (unsigned int *)&ctx->p1))
                         return 0;
-                    }
-                    param_data_type = ctx->params->data_type;
                 }
-                /* When getting, we populate |*params| from |p1| and |p2| */
-                switch (param_data_type) {
-                case OSSL_PARAM_INTEGER:
-                    return OSSL_PARAM_set_int(ctx->params, ctx->p1);
-                case OSSL_PARAM_UNSIGNED_INTEGER:
-                    if (ctx->p2 != NULL) {
-                        /* BIGNUM passed back */
-                        return OSSL_PARAM_set_BN(ctx->params, ctx->p2);
-                    } else {
-                        /* Normal C unsigned int passed back */
-                        return OSSL_PARAM_set_uint(ctx->params,
-                                                   (unsigned int)ctx->p1);
-                    }
-                    return 0;
-                case OSSL_PARAM_UTF8_STRING:
-                    return OSSL_PARAM_set_utf8_string(ctx->params, ctx->p2);
-                case OSSL_PARAM_OCTET_STRING:
-                    return OSSL_PARAM_set_octet_string(ctx->params, ctx->p2,
-                                                       size);
-                case OSSL_PARAM_OCTET_PTR:
-                    return OSSL_PARAM_set_octet_ptr(ctx->params, *(void **)ctx->p2,
-                                                    size);
-                default:
-                    ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED,
-                                   "[action:%d, state:%d] "
-                                   "unsupported OSSL_PARAM data type %d",
-                                   ctx->action_type, state,
-                                   translation->param_data_type);
+                return 1;
+            case OSSL_PARAM_UTF8_STRING:
+                return OSSL_PARAM_get_utf8_string(ctx->params,
+                    ctx->p2, ctx->sz);
+            case OSSL_PARAM_OCTET_STRING:
+                return OSSL_PARAM_get_octet_string(ctx->params,
+                    &ctx->p2, ctx->sz,
+                    (size_t *)&ctx->p1);
+            case OSSL_PARAM_OCTET_PTR:
+                return OSSL_PARAM_get_octet_ptr(ctx->params,
+                    ctx->p2, &ctx->sz);
+            default:
+                ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED,
+                    "[action:%d, state:%d] "
+                    "unknown OSSL_PARAM data type %d",
+                    ctx->action_type, state,
+                    translation->param_data_type);
+                return 0;
+            }
+        } else if ((state == POST_PARAMS_TO_CTRL || state == PKEY)
+            && ctx->action_type == OSSL_ACTION_GET) {
+            /* For the POST state, only getting needs some work to be done */
+            unsigned int param_data_type = translation->param_data_type;
+            size_t size = (size_t)ctx->p1;
+
+            if (state == PKEY)
+                size = ctx->sz;
+            if (param_data_type == 0) {
+                /* we must have a fixup_args function to work */
+                if (!ossl_assert(translation->fixup_args != NULL)) {
+                    ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
                     return 0;
                 }
-            } else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == GET) {
-                if (translation->param_data_type == OSSL_PARAM_OCTET_PTR)
-                    ctx->p2 = &ctx->bufp;
+                param_data_type = ctx->params->data_type;
+            }
+            /* When getting, we populate |*params| from |p1| and |p2| */
+            switch (param_data_type) {
+            case OSSL_PARAM_INTEGER:
+                return OSSL_PARAM_set_int(ctx->params, ctx->p1);
+            case OSSL_PARAM_UNSIGNED_INTEGER:
+                if (ctx->p2 != NULL) {
+                    /* BIGNUM passed back */
+                    return OSSL_PARAM_set_BN(ctx->params, ctx->p2);
+                } else {
+                    /* Normal C unsigned int passed back */
+                    return OSSL_PARAM_set_uint(ctx->params,
+                        (unsigned int)ctx->p1);
+                }
+                return 0;
+            case OSSL_PARAM_UTF8_STRING:
+                return OSSL_PARAM_set_utf8_string(ctx->params, ctx->p2);
+            case OSSL_PARAM_OCTET_STRING:
+                return OSSL_PARAM_set_octet_string(ctx->params, ctx->p2,
+                    size);
+            case OSSL_PARAM_OCTET_PTR:
+                return OSSL_PARAM_set_octet_ptr(ctx->params, *(void **)ctx->p2,
+                    size);
+            default:
+                ERR_raise_data(ERR_LIB_EVP, ERR_R_UNSUPPORTED,
+                    "[action:%d, state:%d] "
+                    "unsupported OSSL_PARAM data type %d",
+                    ctx->action_type, state,
+                    translation->param_data_type);
+                return 0;
             }
+        } else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET) {
+            if (translation->param_data_type == OSSL_PARAM_OCTET_PTR)
+                ctx->p2 = &ctx->bufp;
         }
-        /* Any other combination is simply pass-through */
-        break;
+    }
+    /* Any other combination is simply pass-through */
+    break;
     }
     return ret;
 }
 
 static int
 cleanup_translation_ctx(enum state state,
-                        const struct translation_st *translation,
-                        struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     if (ctx->allocated_buf != NULL)
         OPENSSL_free(ctx->allocated_buf);
@@ -716,8 +721,8 @@ cleanup_translation_ctx(enum state state,
 }
 
 /*
- * fix_cipher_md fixes up an EVP_CIPHER / EVP_MD to its name on SET,
- * and cipher / md name to EVP_MD on GET.
+ * fix_cipher_md fixes up an EVP_CIPHER / EVP_MD to its name on OSSL_ACTION_SET,
+ * and cipher / md name to EVP_MD on OSSL_ACTION_GET.
  */
 static const char *get_cipher_name(void *cipher)
 {
@@ -740,18 +745,18 @@ static const void *get_md_by_name(OSSL_LIB_CTX *libctx, const char *name)
 }
 
 static int fix_cipher_md(enum state state,
-                         const struct translation_st *translation,
-                         struct translation_ctx_st *ctx,
-                         const char *(*get_name)(void *algo),
-                         const void *(*get_algo_by_name)(OSSL_LIB_CTX *libctx,
-                                                         const char *name))
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx,
+    const char *(*get_name)(void *algo),
+    const void *(*get_algo_by_name)(OSSL_LIB_CTX *libctx,
+        const char *name))
 {
     int ret = 1;
 
     if ((ret = default_check(state, translation, ctx)) <= 0)
         return ret;
 
-    if (state == PRE_CTRL_TO_PARAMS && ctx->action_type == GET) {
+    if (state == PRE_CTRL_TO_PARAMS && ctx->action_type == OSSL_ACTION_GET) {
         /*
          * |ctx->p2| contains the address to an EVP_CIPHER or EVP_MD pointer
          * to be filled in.  We need to remember it, then make |ctx->p2|
@@ -762,17 +767,17 @@ static int fix_cipher_md(enum state state,
         ctx->orig_p2 = ctx->p2;
         ctx->p2 = ctx->name_buf;
         ctx->p1 = sizeof(ctx->name_buf);
-    } else if (state == PRE_CTRL_TO_PARAMS && ctx->action_type == SET) {
+    } else if (state == PRE_CTRL_TO_PARAMS && ctx->action_type == OSSL_ACTION_SET) {
         /*
          * In different parts of OpenSSL, this ctrl command is used
          * differently.  Some calls pass a NID as p1, others pass an
          * EVP_CIPHER pointer as p2...
          */
         ctx->p2 = (char *)(ctx->p2 == NULL
-                           ? OBJ_nid2sn(ctx->p1)
-                           : get_name(ctx->p2));
+                ? OBJ_nid2sn(ctx->p1)
+                : get_name(ctx->p2));
         ctx->p1 = strlen(ctx->p2);
-    } else if (state == POST_PARAMS_TO_CTRL && ctx->action_type == GET) {
+    } else if (state == POST_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET) {
         ctx->p2 = (ctx->p2 == NULL ? "" : (char *)get_name(ctx->p2));
         ctx->p1 = strlen(ctx->p2);
     }
@@ -780,15 +785,14 @@ static int fix_cipher_md(enum state state,
     if ((ret = default_fixup_args(state, translation, ctx)) <= 0)
         return ret;
 
-    if (state == POST_CTRL_TO_PARAMS && ctx->action_type == GET) {
+    if (state == POST_CTRL_TO_PARAMS && ctx->action_type == OSSL_ACTION_GET) {
         /*
          * Here's how we reuse |ctx->orig_p2| that was set in the
          * PRE_CTRL_TO_PARAMS state above.
          */
-        *(void **)ctx->orig_p2 =
-            (void *)get_algo_by_name(ctx->pctx->libctx, ctx->p2);
+        *(void **)ctx->orig_p2 = (void *)get_algo_by_name(ctx->pctx->libctx, ctx->p2);
         ctx->p1 = 1;
-    } else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == SET) {
+    } else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_SET) {
         ctx->p2 = (void *)get_algo_by_name(ctx->pctx->libctx, ctx->p2);
         ctx->p1 = 0;
     }
@@ -797,31 +801,32 @@ static int fix_cipher_md(enum state state,
 }
 
 static int fix_cipher(enum state state,
-                      const struct translation_st *translation,
-                      struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     return fix_cipher_md(state, translation, ctx,
-                         get_cipher_name, get_cipher_by_name);
+        get_cipher_name, get_cipher_by_name);
 }
 
 static int fix_md(enum state state,
-                  const struct translation_st *translation,
-                  struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     return fix_cipher_md(state, translation, ctx,
-                         get_md_name, get_md_by_name);
+        get_md_name, get_md_by_name);
 }
 
 static int fix_distid_len(enum state state,
-                          const struct translation_st *translation,
-                          struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     int ret = default_fixup_args(state, translation, ctx);
 
     if (ret > 0) {
         ret = 0;
         if ((state == POST_CTRL_TO_PARAMS
-             || state == POST_CTRL_STR_TO_PARAMS) && ctx->action_type == GET) {
+                || state == POST_CTRL_STR_TO_PARAMS)
+            && ctx->action_type == OSSL_ACTION_GET) {
             *(size_t *)ctx->p2 = ctx->sz;
             ret = 1;
         }
@@ -835,9 +840,9 @@ struct kdf_type_map_st {
 };
 
 static int fix_kdf_type(enum state state,
-                        const struct translation_st *translation,
-                        struct translation_ctx_st *ctx,
-                        const struct kdf_type_map_st *kdf_type_map)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx,
+    const struct kdf_type_map_st *kdf_type_map)
 {
     /*
      * The EVP_PKEY_CTRL_DH_KDF_TYPE ctrl command is a bit special, in
@@ -854,9 +859,9 @@ static int fix_kdf_type(enum state state,
     if (state == PRE_CTRL_TO_PARAMS) {
         /*
          * In |translations|, the initial value for |ctx->action_type| must
-         * be NONE.
+         * be OSSL_ACTION_NONE.
          */
-        if (!ossl_assert(ctx->action_type == NONE))
+        if (!ossl_assert(ctx->action_type == OSSL_ACTION_NONE))
             return 0;
 
         /* The action type depends on the value of *p1 */
@@ -871,17 +876,17 @@ static int fix_kdf_type(enum state state,
              */
             ctx->p2 = ctx->name_buf;
             ctx->p1 = sizeof(ctx->name_buf);
-            ctx->action_type = GET;
+            ctx->action_type = OSSL_ACTION_GET;
         } else {
-            ctx->action_type = SET;
+            ctx->action_type = OSSL_ACTION_SET;
         }
     }
 
     if ((ret = default_check(state, translation, ctx)) <= 0)
         return ret;
 
-    if ((state == PRE_CTRL_TO_PARAMS && ctx->action_type == SET)
-        || (state == POST_PARAMS_TO_CTRL && ctx->action_type == GET)) {
+    if ((state == PRE_CTRL_TO_PARAMS && ctx->action_type == OSSL_ACTION_SET)
+        || (state == POST_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET)) {
         ret = -2;
         /* Convert KDF type numbers to strings */
         for (; kdf_type_map->kdf_type_str != NULL; kdf_type_map++)
@@ -898,8 +903,8 @@ static int fix_kdf_type(enum state state,
     if ((ret = default_fixup_args(state, translation, ctx)) <= 0)
         return ret;
 
-    if ((state == POST_CTRL_TO_PARAMS && ctx->action_type == GET)
-        || (state == PRE_PARAMS_TO_CTRL && ctx->action_type == SET)) {
+    if ((state == POST_CTRL_TO_PARAMS && ctx->action_type == OSSL_ACTION_GET)
+        || (state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_SET)) {
         ctx->p1 = ret = -1;
 
         /* Convert KDF type strings to numbers */
@@ -910,17 +915,17 @@ static int fix_kdf_type(enum state state,
                 break;
             }
         ctx->p2 = NULL;
-    } else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == GET) {
+    } else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET) {
         ctx->p1 = -2;
     }
- end:
+end:
     return ret;
 }
 
 /* EVP_PKEY_CTRL_DH_KDF_TYPE */
 static int fix_dh_kdf_type(enum state state,
-                           const struct translation_st *translation,
-                           struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     static const struct kdf_type_map_st kdf_type_map[] = {
         { EVP_PKEY_DH_KDF_NONE, "" },
@@ -933,8 +938,8 @@ static int fix_dh_kdf_type(enum state state,
 
 /* EVP_PKEY_CTRL_EC_KDF_TYPE */
 static int fix_ec_kdf_type(enum state state,
-                           const struct translation_st *translation,
-                           struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     static const struct kdf_type_map_st kdf_type_map[] = {
         { EVP_PKEY_ECDH_KDF_NONE, "" },
@@ -947,16 +952,16 @@ static int fix_ec_kdf_type(enum state state,
 
 /* EVP_PKEY_CTRL_DH_KDF_OID, EVP_PKEY_CTRL_GET_DH_KDF_OID, ...??? */
 static int fix_oid(enum state state,
-                   const struct translation_st *translation,
-                   struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     int ret;
 
     if ((ret = default_check(state, translation, ctx)) <= 0)
         return ret;
 
-    if ((state == PRE_CTRL_TO_PARAMS && ctx->action_type == SET)
-        || (state == POST_PARAMS_TO_CTRL && ctx->action_type == GET)) {
+    if ((state == PRE_CTRL_TO_PARAMS && ctx->action_type == OSSL_ACTION_SET)
+        || (state == POST_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET)) {
         /*
          * We're translating from ctrl to params and setting the OID, or
          * we're translating from params to ctrl and getting the OID.
@@ -973,8 +978,8 @@ static int fix_oid(enum state state,
     if ((ret = default_fixup_args(state, translation, ctx)) <= 0)
         return ret;
 
-    if ((state == PRE_PARAMS_TO_CTRL && ctx->action_type == SET)
-        || (state == POST_CTRL_TO_PARAMS && ctx->action_type == GET)) {
+    if ((state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_SET)
+        || (state == POST_CTRL_TO_PARAMS && ctx->action_type == OSSL_ACTION_GET)) {
         /*
          * We're translating from ctrl to params and setting the OID name,
          * or we're translating from params to ctrl and getting the OID
@@ -990,8 +995,8 @@ static int fix_oid(enum state state,
 
 /* EVP_PKEY_CTRL_DH_NID */
 static int fix_dh_nid(enum state state,
-                      const struct translation_st *translation,
-                      struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     int ret;
 
@@ -999,12 +1004,11 @@ static int fix_dh_nid(enum state state,
         return ret;
 
     /* This is only settable */
-    if (ctx->action_type != SET)
+    if (ctx->action_type != OSSL_ACTION_SET)
         return 0;
 
     if (state == PRE_CTRL_TO_PARAMS) {
-        if ((ctx->p2 = (char *)ossl_ffc_named_group_get_name
-             (ossl_ffc_uid_to_dh_named_group(ctx->p1))) == NULL) {
+        if ((ctx->p2 = (char *)ossl_ffc_named_group_get_name(ossl_ffc_uid_to_dh_named_group(ctx->p1))) == NULL) {
             ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_VALUE);
             return 0;
         }
@@ -1016,8 +1020,8 @@ static int fix_dh_nid(enum state state,
 
 /* EVP_PKEY_CTRL_DH_RFC5114 */
 static int fix_dh_nid5114(enum state state,
-                          const struct translation_st *translation,
-                          struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     int ret;
 
@@ -1025,13 +1029,12 @@ static int fix_dh_nid5114(enum state state,
         return ret;
 
     /* This is only settable */
-    if (ctx->action_type != SET)
+    if (ctx->action_type != OSSL_ACTION_SET)
         return 0;
 
     switch (state) {
     case PRE_CTRL_TO_PARAMS:
-        if ((ctx->p2 = (char *)ossl_ffc_named_group_get_name
-             (ossl_ffc_uid_to_dh_named_group(ctx->p1))) == NULL) {
+        if ((ctx->p2 = (char *)ossl_ffc_named_group_get_name(ossl_ffc_uid_to_dh_named_group(ctx->p1))) == NULL) {
             ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_VALUE);
             return 0;
         }
@@ -1042,8 +1045,7 @@ static int fix_dh_nid5114(enum state state,
     case PRE_CTRL_STR_TO_PARAMS:
         if (ctx->p2 == NULL)
             return 0;
-        if ((ctx->p2 = (char *)ossl_ffc_named_group_get_name
-             (ossl_ffc_uid_to_dh_named_group(atoi(ctx->p2)))) == NULL) {
+        if ((ctx->p2 = (char *)ossl_ffc_named_group_get_name(ossl_ffc_uid_to_dh_named_group(atoi(ctx->p2)))) == NULL) {
             ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_VALUE);
             return 0;
         }
@@ -1060,8 +1062,8 @@ static int fix_dh_nid5114(enum state state,
 
 /* EVP_PKEY_CTRL_DH_PARAMGEN_TYPE */
 static int fix_dh_paramgen_type(enum state state,
-                                const struct translation_st *translation,
-                                struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     int ret;
 
@@ -1069,12 +1071,12 @@ static int fix_dh_paramgen_type(enum state state,
         return ret;
 
     /* This is only settable */
-    if (ctx->action_type != SET)
+    if (ctx->action_type != OSSL_ACTION_SET)
         return 0;
 
     if (state == PRE_CTRL_STR_TO_PARAMS) {
         if ((ctx->p2 = (char *)ossl_dh_gen_type_id2name(atoi(ctx->p2)))
-             == NULL) {
+            == NULL) {
             ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_VALUE);
             return 0;
         }
@@ -1086,8 +1088,8 @@ static int fix_dh_paramgen_type(enum state state,
 
 /* EVP_PKEY_CTRL_EC_PARAM_ENC */
 static int fix_ec_param_enc(enum state state,
-                            const struct translation_st *translation,
-                            struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     int ret;
 
@@ -1095,7 +1097,7 @@ static int fix_ec_param_enc(enum state state,
         return ret;
 
     /* This is currently only settable */
-    if (ctx->action_type != SET)
+    if (ctx->action_type != OSSL_ACTION_SET)
         return 0;
 
     if (state == PRE_CTRL_TO_PARAMS) {
@@ -1126,7 +1128,7 @@ static int fix_ec_param_enc(enum state state,
         ctx->p2 = NULL;
     }
 
- end:
+end:
     if (ret == -2)
         ERR_raise(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED);
     return ret;
@@ -1134,8 +1136,8 @@ static int fix_ec_param_enc(enum state state,
 
 /* EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID */
 static int fix_ec_paramgen_curve_nid(enum state state,
-                                     const struct translation_st *translation,
-                                     struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     char *p2 = NULL;
     int ret;
@@ -1144,7 +1146,7 @@ static int fix_ec_paramgen_curve_nid(enum state state,
         return ret;
 
     /* This is currently only settable */
-    if (ctx->action_type != SET)
+    if (ctx->action_type != OSSL_ACTION_SET)
         return 0;
 
     if (state == PRE_CTRL_TO_PARAMS) {
@@ -1177,8 +1179,8 @@ static int fix_ec_paramgen_curve_nid(enum state state,
 
 /* EVP_PKEY_CTRL_EC_ECDH_COFACTOR */
 static int fix_ecdh_cofactor(enum state state,
-                             const struct translation_st *translation,
-                             struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     /*
      * The EVP_PKEY_CTRL_EC_ECDH_COFACTOR ctrl command is a bit special, in
@@ -1194,28 +1196,28 @@ static int fix_ecdh_cofactor(enum state state,
          * The initial value for |ctx->action_type| must be zero.
          * evp_pkey_ctrl_to_params() takes it from the translation item.
          */
-        if (!ossl_assert(ctx->action_type == NONE))
+        if (!ossl_assert(ctx->action_type == OSSL_ACTION_NONE))
             return 0;
 
         /* The action type depends on the value of ctx->p1 */
         if (ctx->p1 == -2)
-            ctx->action_type = GET;
+            ctx->action_type = OSSL_ACTION_GET;
         else
-            ctx->action_type = SET;
+            ctx->action_type = OSSL_ACTION_SET;
     } else if (state == PRE_CTRL_STR_TO_PARAMS) {
-        ctx->action_type = SET;
+        ctx->action_type = OSSL_ACTION_SET;
     } else if (state == PRE_PARAMS_TO_CTRL) {
         /* The initial value for |ctx->action_type| must not be zero. */
-        if (!ossl_assert(ctx->action_type != NONE))
+        if (!ossl_assert(ctx->action_type != OSSL_ACTION_NONE))
             return 0;
-    } else if (state == POST_PARAMS_TO_CTRL && ctx->action_type == NONE) {
-        ctx->action_type = GET;
+    } else if (state == POST_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_NONE) {
+        ctx->action_type = OSSL_ACTION_GET;
     }
 
     if ((ret = default_check(state, translation, ctx)) <= 0)
         return ret;
 
-    if (state == PRE_CTRL_TO_PARAMS && ctx->action_type == SET) {
+    if (state == PRE_CTRL_TO_PARAMS && ctx->action_type == OSSL_ACTION_SET) {
         if (ctx->p1 < -1 || ctx->p1 > 1) {
             /* Uses the same return value of pkey_ec_ctrl() */
             return -2;
@@ -1225,7 +1227,7 @@ static int fix_ecdh_cofactor(enum state state,
     if ((ret = default_fixup_args(state, translation, ctx)) <= 0)
         return ret;
 
-    if (state == POST_CTRL_TO_PARAMS && ctx->action_type == GET) {
+    if (state == POST_CTRL_TO_PARAMS && ctx->action_type == OSSL_ACTION_GET) {
         if (ctx->p1 < 0 || ctx->p1 > 1) {
             /*
              * The provider should return either 0 or 1, any other value is a
@@ -1233,9 +1235,9 @@ static int fix_ecdh_cofactor(enum state state,
              */
             ctx->p1 = ret = -1;
         }
-    } else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == GET) {
+    } else if (state == PRE_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET) {
         ctx->p1 = -2;
-    } else if (state == POST_PARAMS_TO_CTRL && ctx->action_type == GET) {
+    } else if (state == POST_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET) {
         ctx->p1 = ret;
     }
 
@@ -1244,25 +1246,25 @@ static int fix_ecdh_cofactor(enum state state,
 
 /* EVP_PKEY_CTRL_RSA_PADDING, EVP_PKEY_CTRL_GET_RSA_PADDING */
 static int fix_rsa_padding_mode(enum state state,
-                                const struct translation_st *translation,
-                                struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     static const OSSL_ITEM str_value_map[] = {
-        { RSA_PKCS1_PADDING,            "pkcs1"  },
-        { RSA_NO_PADDING,               "none"   },
-        { RSA_PKCS1_OAEP_PADDING,       "oaep"   },
-        { RSA_PKCS1_OAEP_PADDING,       "oeap"   },
-        { RSA_X931_PADDING,             "x931"   },
-        { RSA_PKCS1_PSS_PADDING,        "pss"    },
+        { RSA_PKCS1_PADDING, "pkcs1" },
+        { RSA_NO_PADDING, "none" },
+        { RSA_PKCS1_OAEP_PADDING, "oaep" },
+        { RSA_PKCS1_OAEP_PADDING, "oeap" },
+        { RSA_X931_PADDING, "x931" },
+        { RSA_PKCS1_PSS_PADDING, "pss" },
         /* Special case, will pass directly as an integer */
-        { RSA_PKCS1_WITH_TLS_PADDING,   NULL     }
+        { RSA_PKCS1_WITH_TLS_PADDING, NULL }
     };
     int ret;
 
     if ((ret = default_check(state, translation, ctx)) <= 0)
         return ret;
 
-    if (state == PRE_CTRL_TO_PARAMS && ctx->action_type == GET) {
+    if (state == PRE_CTRL_TO_PARAMS && ctx->action_type == OSSL_ACTION_GET) {
         /*
          * EVP_PKEY_CTRL_GET_RSA_PADDING returns the padding mode in the
          * weirdest way for a ctrl.  Instead of doing like all other ctrls
@@ -1271,13 +1273,13 @@ static int fix_rsa_padding_mode(enum state state,
          * returned.  We must therefore remember |ctx->p2|, then make
          * |ctx->p2| point at a buffer to be filled in with the name, and
          * |ctx->p1| with its size.  default_fixup_args() will take care
-         * of the rest for us, along with the POST_CTRL_TO_PARAMS && GET
+         * of the rest for us, along with the POST_CTRL_TO_PARAMS && OSSL_ACTION_GET
          * code section further down.
          */
         ctx->orig_p2 = ctx->p2;
         ctx->p2 = ctx->name_buf;
         ctx->p1 = sizeof(ctx->name_buf);
-    } else if (state == PRE_CTRL_TO_PARAMS && ctx->action_type == SET) {
+    } else if (state == PRE_CTRL_TO_PARAMS && ctx->action_type == OSSL_ACTION_SET) {
         /*
          * Ideally, we should use utf8 strings for the diverse padding modes.
          * We only came here because someone called EVP_PKEY_CTX_ctrl(),
@@ -1296,9 +1298,9 @@ static int fix_rsa_padding_mode(enum state state,
          * build the OSSL_PARAM item ourselves and return immediately.
          */
         ctx->params[0] = OSSL_PARAM_construct_int(translation->param_key,
-                                                  &ctx->p1);
+            &ctx->p1);
         return 1;
-    } else if (state == POST_PARAMS_TO_CTRL && ctx->action_type == GET) {
+    } else if (state == POST_PARAMS_TO_CTRL && ctx->action_type == OSSL_ACTION_GET) {
         size_t i;
 
         /*
@@ -1322,8 +1324,8 @@ static int fix_rsa_padding_mode(enum state state,
         }
         if (i == OSSL_NELEM(str_value_map)) {
             ERR_raise_data(ERR_LIB_RSA, RSA_R_UNKNOWN_PADDING_TYPE,
-                           "[action:%d, state:%d] padding number %d",
-                           ctx->action_type, state, ctx->p1);
+                "[action:%d, state:%d] padding number %d",
+                ctx->action_type, state, ctx->p1);
             return -2;
         }
         /*
@@ -1341,8 +1343,8 @@ static int fix_rsa_padding_mode(enum state state,
     if ((ret = default_fixup_args(state, translation, ctx)) <= 0)
         return ret;
 
-    if ((ctx->action_type == SET && state == PRE_PARAMS_TO_CTRL)
-        || (ctx->action_type == GET && state == POST_CTRL_TO_PARAMS)) {
+    if ((ctx->action_type == OSSL_ACTION_SET && state == PRE_PARAMS_TO_CTRL)
+        || (ctx->action_type == OSSL_ACTION_GET && state == POST_CTRL_TO_PARAMS)) {
         size_t i;
 
         for (i = 0; i < OSSL_NELEM(str_value_map); i++) {
@@ -1352,8 +1354,8 @@ static int fix_rsa_padding_mode(enum state state,
 
         if (i == OSSL_NELEM(str_value_map)) {
             ERR_raise_data(ERR_LIB_RSA, RSA_R_UNKNOWN_PADDING_TYPE,
-                           "[action:%d, state:%d] padding name %s",
-                           ctx->action_type, state, ctx->p1);
+                "[action:%d, state:%d] padding name %s",
+                ctx->action_type, state, (const char *)ctx->p2);
             ctx->p1 = ret = -2;
         } else if (state == POST_CTRL_TO_PARAMS) {
             /* EVP_PKEY_CTRL_GET_RSA_PADDING weirdness explained further up */
@@ -1369,20 +1371,20 @@ static int fix_rsa_padding_mode(enum state state,
 
 /* EVP_PKEY_CTRL_RSA_PSS_SALTLEN, EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN */
 static int fix_rsa_pss_saltlen(enum state state,
-                               const struct translation_st *translation,
-                               struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     static const OSSL_ITEM str_value_map[] = {
         { (unsigned int)RSA_PSS_SALTLEN_DIGEST, "digest" },
-        { (unsigned int)RSA_PSS_SALTLEN_MAX,    "max"    },
-        { (unsigned int)RSA_PSS_SALTLEN_AUTO,   "auto"   }
+        { (unsigned int)RSA_PSS_SALTLEN_MAX, "max" },
+        { (unsigned int)RSA_PSS_SALTLEN_AUTO, "auto" }
     };
     int ret;
 
     if ((ret = default_check(state, translation, ctx)) <= 0)
         return ret;
 
-    if (state == PRE_CTRL_TO_PARAMS && ctx->action_type == GET) {
+    if (state == PRE_CTRL_TO_PARAMS && ctx->action_type == OSSL_ACTION_GET) {
         /*
          * EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN returns the saltlen by filling
          * in the int pointed at by p2.  This is potentially as weird as
@@ -1392,14 +1394,14 @@ static int fix_rsa_pss_saltlen(enum state state,
          * In any case, we must therefore remember |ctx->p2|, then make
          * |ctx->p2| point at a buffer to be filled in with the name, and
          * |ctx->p1| with its size.  default_fixup_args() will take care
-         * of the rest for us, along with the POST_CTRL_TO_PARAMS && GET
+         * of the rest for us, along with the POST_CTRL_TO_PARAMS && OSSL_ACTION_GET
          * code section further down.
          */
         ctx->orig_p2 = ctx->p2;
         ctx->p2 = ctx->name_buf;
         ctx->p1 = sizeof(ctx->name_buf);
-    } else if ((ctx->action_type == SET && state == PRE_CTRL_TO_PARAMS)
-        || (ctx->action_type == GET && state == POST_PARAMS_TO_CTRL)) {
+    } else if ((ctx->action_type == OSSL_ACTION_SET && state == PRE_CTRL_TO_PARAMS)
+        || (ctx->action_type == OSSL_ACTION_GET && state == POST_PARAMS_TO_CTRL)) {
         size_t i;
 
         for (i = 0; i < OSSL_NELEM(str_value_map); i++) {
@@ -1420,8 +1422,8 @@ static int fix_rsa_pss_saltlen(enum state state,
     if ((ret = default_fixup_args(state, translation, ctx)) <= 0)
         return ret;
 
-    if ((ctx->action_type == SET && state == PRE_PARAMS_TO_CTRL)
-        || (ctx->action_type == GET && state == POST_CTRL_TO_PARAMS)) {
+    if ((ctx->action_type == OSSL_ACTION_SET && state == PRE_PARAMS_TO_CTRL)
+        || (ctx->action_type == OSSL_ACTION_GET && state == POST_CTRL_TO_PARAMS)) {
         size_t i;
         int val;
 
@@ -1449,21 +1451,21 @@ static int fix_rsa_pss_saltlen(enum state state,
 
 /* EVP_PKEY_CTRL_HKDF_MODE */
 static int fix_hkdf_mode(enum state state,
-                         const struct translation_st *translation,
-                         struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     static const OSSL_ITEM str_value_map[] = {
         { EVP_KDF_HKDF_MODE_EXTRACT_AND_EXPAND, "EXTRACT_AND_EXPAND" },
-        { EVP_KDF_HKDF_MODE_EXTRACT_ONLY,       "EXTRACT_ONLY"       },
-        { EVP_KDF_HKDF_MODE_EXPAND_ONLY,        "EXPAND_ONLY"        }
+        { EVP_KDF_HKDF_MODE_EXTRACT_ONLY, "EXTRACT_ONLY" },
+        { EVP_KDF_HKDF_MODE_EXPAND_ONLY, "EXPAND_ONLY" }
     };
     int ret;
 
     if ((ret = default_check(state, translation, ctx)) <= 0)
         return ret;
 
-    if ((ctx->action_type == SET && state == PRE_CTRL_TO_PARAMS)
-        || (ctx->action_type == GET && state == POST_PARAMS_TO_CTRL)) {
+    if ((ctx->action_type == OSSL_ACTION_SET && state == PRE_CTRL_TO_PARAMS)
+        || (ctx->action_type == OSSL_ACTION_GET && state == POST_PARAMS_TO_CTRL)) {
         size_t i;
 
         for (i = 0; i < OSSL_NELEM(str_value_map); i++) {
@@ -1479,8 +1481,8 @@ static int fix_hkdf_mode(enum state state,
     if ((ret = default_fixup_args(state, translation, ctx)) <= 0)
         return ret;
 
-    if ((ctx->action_type == SET && state == PRE_PARAMS_TO_CTRL)
-        || (ctx->action_type == GET && state == POST_CTRL_TO_PARAMS)) {
+    if ((ctx->action_type == OSSL_ACTION_SET && state == PRE_PARAMS_TO_CTRL)
+        || (ctx->action_type == OSSL_ACTION_GET && state == POST_CTRL_TO_PARAMS)) {
         size_t i;
 
         for (i = 0; i < OSSL_NELEM(str_value_map); i++) {
@@ -1504,47 +1506,41 @@ static int fix_hkdf_mode(enum state state,
  * ===============
  *
  * These all get the data they want, then call default_fixup_args() as
- * a post-ctrl GET fixup.  They all get NULL ctx, ctrl_cmd, ctrl_str,
+ * a post-ctrl OSSL_ACTION_GET fixup.  They all get NULL ctx, ctrl_cmd, ctrl_str,
  * p1, sz
  */
 
 /* Pilfering DH, DSA and EC_KEY */
 static int get_payload_group_name(enum state state,
-                                  const struct translation_st *translation,
-                                  struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     EVP_PKEY *pkey = ctx->p2;
 
     ctx->p2 = NULL;
     switch (EVP_PKEY_get_base_id(pkey)) {
 #ifndef OPENSSL_NO_DH
-    case EVP_PKEY_DH:
-        {
-            const DH *dh = EVP_PKEY_get0_DH(pkey);
-            int uid = DH_get_nid(dh);
+    case EVP_PKEY_DH: {
+        const DH *dh = EVP_PKEY_get0_DH(pkey);
+        int uid = DH_get_nid(dh);
 
-            if (uid != NID_undef) {
-                const DH_NAMED_GROUP *dh_group =
-                    ossl_ffc_uid_to_dh_named_group(uid);
+        if (uid != NID_undef) {
+            const DH_NAMED_GROUP *dh_group = ossl_ffc_uid_to_dh_named_group(uid);
 
-                ctx->p2 = (char *)ossl_ffc_named_group_get_name(dh_group);
-            }
+            ctx->p2 = (char *)ossl_ffc_named_group_get_name(dh_group);
         }
-        break;
+    } break;
 #endif
 #ifndef OPENSSL_NO_EC
-    case EVP_PKEY_EC:
-        {
-            const EC_GROUP *grp =
-                EC_KEY_get0_group(EVP_PKEY_get0_EC_KEY(pkey));
-            int nid = NID_undef;
-
-            if (grp != NULL)
-                nid = EC_GROUP_get_curve_name(grp);
-            if (nid != NID_undef)
-                ctx->p2 = (char *)OSSL_EC_curve_nid2name(nid);
-        }
-        break;
+    case EVP_PKEY_EC: {
+        const EC_GROUP *grp = EC_KEY_get0_group(EVP_PKEY_get0_EC_KEY(pkey));
+        int nid = NID_undef;
+
+        if (grp != NULL)
+            nid = EC_GROUP_get_curve_name(grp);
+        if (nid != NID_undef)
+            ctx->p2 = (char *)OSSL_EC_curve_nid2name(nid);
+    } break;
 #endif
     default:
         ERR_raise(ERR_LIB_EVP, EVP_R_UNSUPPORTED_KEY_TYPE);
@@ -1563,8 +1559,8 @@ static int get_payload_group_name(enum state state,
 }
 
 static int get_payload_private_key(enum state state,
-                                   const struct translation_st *translation,
-                                   struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     EVP_PKEY *pkey = ctx->p2;
 
@@ -1574,22 +1570,18 @@ static int get_payload_private_key(enum state state,
 
     switch (EVP_PKEY_get_base_id(pkey)) {
 #ifndef OPENSSL_NO_DH
-    case EVP_PKEY_DH:
-        {
-            const DH *dh = EVP_PKEY_get0_DH(pkey);
+    case EVP_PKEY_DH: {
+        const DH *dh = EVP_PKEY_get0_DH(pkey);
 
-            ctx->p2 = (BIGNUM *)DH_get0_priv_key(dh);
-        }
-        break;
+        ctx->p2 = (BIGNUM *)DH_get0_priv_key(dh);
+    } break;
 #endif
 #ifndef OPENSSL_NO_EC
-    case EVP_PKEY_EC:
-        {
-            const EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey);
+    case EVP_PKEY_EC: {
+        const EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey);
 
-            ctx->p2 = (BIGNUM *)EC_KEY_get0_private_key(ec);
-        }
-        break;
+        ctx->p2 = (BIGNUM *)EC_KEY_get0_private_key(ec);
+    } break;
 #endif
     default:
         ERR_raise(ERR_LIB_EVP, EVP_R_UNSUPPORTED_KEY_TYPE);
@@ -1600,8 +1592,8 @@ static int get_payload_private_key(enum state state,
 }
 
 static int get_payload_public_key(enum state state,
-                                  const struct translation_st *translation,
-                                  struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     EVP_PKEY *pkey = ctx->p2;
     unsigned char *buf = NULL;
@@ -1644,8 +1636,8 @@ static int get_payload_public_key(enum state state,
             if (bnctx == NULL)
                 return 0;
             ctx->sz = EC_POINT_point2buf(ecg, point,
-                                         POINT_CONVERSION_COMPRESSED,
-                                         &buf, bnctx);
+                POINT_CONVERSION_COMPRESSED,
+                &buf, bnctx);
             ctx->p2 = buf;
             BN_CTX_free(bnctx);
             break;
@@ -1663,8 +1655,8 @@ static int get_payload_public_key(enum state state,
 }
 
 static int get_payload_public_key_ec(enum state state,
-                                     const struct translation_st *translation,
-                                     struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
 #ifndef OPENSSL_NO_EC
     EVP_PKEY *pkey = ctx->p2;
@@ -1721,8 +1713,8 @@ static int get_payload_public_key_ec(enum state state,
 }
 
 static int get_payload_bn(enum state state,
-                          const struct translation_st *translation,
-                          struct translation_ctx_st *ctx, const BIGNUM *bn)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx, const BIGNUM *bn)
 {
     if (bn == NULL)
         return 0;
@@ -1734,8 +1726,8 @@ static int get_payload_bn(enum state state,
 }
 
 static int get_dh_dsa_payload_p(enum state state,
-                                const struct translation_st *translation,
-                                struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     const BIGNUM *bn = NULL;
     EVP_PKEY *pkey = ctx->p2;
@@ -1759,8 +1751,8 @@ static int get_dh_dsa_payload_p(enum state state,
 }
 
 static int get_dh_dsa_payload_q(enum state state,
-                                const struct translation_st *translation,
-                                struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     const BIGNUM *bn = NULL;
 
@@ -1781,8 +1773,8 @@ static int get_dh_dsa_payload_q(enum state state,
 }
 
 static int get_dh_dsa_payload_g(enum state state,
-                                const struct translation_st *translation,
-                                struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     const BIGNUM *bn = NULL;
 
@@ -1803,9 +1795,9 @@ static int get_dh_dsa_payload_g(enum state state,
 }
 
 static int get_payload_int(enum state state,
-                           const struct translation_st *translation,
-                           struct translation_ctx_st *ctx,
-                           const int val)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx,
+    const int val)
 {
     if (ctx->params->data_type != OSSL_PARAM_INTEGER)
         return 0;
@@ -1816,8 +1808,8 @@ static int get_payload_int(enum state state,
 }
 
 static int get_ec_decoded_from_explicit_params(enum state state,
-                                               const struct translation_st *translation,
-                                               struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     int val = 0;
     EVP_PKEY *pkey = ctx->p2;
@@ -1841,8 +1833,8 @@ static int get_ec_decoded_from_explicit_params(enum state state,
 }
 
 static int get_rsa_payload_n(enum state state,
-                             const struct translation_st *translation,
-                             struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     const BIGNUM *bn = NULL;
 
@@ -1855,8 +1847,8 @@ static int get_rsa_payload_n(enum state state,
 }
 
 static int get_rsa_payload_e(enum state state,
-                             const struct translation_st *translation,
-                             struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     const BIGNUM *bn = NULL;
 
@@ -1869,8 +1861,8 @@ static int get_rsa_payload_e(enum state state,
 }
 
 static int get_rsa_payload_d(enum state state,
-                             const struct translation_st *translation,
-                             struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     const BIGNUM *bn = NULL;
 
@@ -1883,9 +1875,9 @@ static int get_rsa_payload_d(enum state state,
 }
 
 static int get_rsa_payload_factor(enum state state,
-                                  const struct translation_st *translation,
-                                  struct translation_ctx_st *ctx,
-                                  size_t factornum)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx,
+    size_t factornum)
 {
     const RSA *r = EVP_PKEY_get0_RSA(ctx->p2);
     const BIGNUM *bn = NULL;
@@ -1897,25 +1889,23 @@ static int get_rsa_payload_factor(enum state state,
     case 1:
         bn = RSA_get0_q(r);
         break;
-    default:
-        {
-            size_t pnum = RSA_get_multi_prime_extra_count(r);
-            const BIGNUM *factors[10];
-
-            if (factornum - 2 < pnum
-                && RSA_get0_multi_prime_factors(r, factors))
-                bn = factors[factornum - 2];
-        }
-        break;
+    default: {
+        size_t pnum = RSA_get_multi_prime_extra_count(r);
+        const BIGNUM *factors[10];
+
+        if (factornum - 2 < pnum
+            && RSA_get0_multi_prime_factors(r, factors))
+            bn = factors[factornum - 2];
+    } break;
     }
 
     return get_payload_bn(state, translation, ctx, bn);
 }
 
 static int get_rsa_payload_exponent(enum state state,
-                                    const struct translation_st *translation,
-                                    struct translation_ctx_st *ctx,
-                                    size_t exponentnum)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx,
+    size_t exponentnum)
 {
     const RSA *r = EVP_PKEY_get0_RSA(ctx->p2);
     const BIGNUM *bn = NULL;
@@ -1927,25 +1917,23 @@ static int get_rsa_payload_exponent(enum state state,
     case 1:
         bn = RSA_get0_dmq1(r);
         break;
-    default:
-        {
-            size_t pnum = RSA_get_multi_prime_extra_count(r);
-            const BIGNUM *exps[10], *coeffs[10];
-
-            if (exponentnum - 2 < pnum
-                && RSA_get0_multi_prime_crt_params(r, exps, coeffs))
-                bn = exps[exponentnum - 2];
-        }
-        break;
+    default: {
+        size_t pnum = RSA_get_multi_prime_extra_count(r);
+        const BIGNUM *exps[10], *coeffs[10];
+
+        if (exponentnum - 2 < pnum
+            && RSA_get0_multi_prime_crt_params(r, exps, coeffs))
+            bn = exps[exponentnum - 2];
+    } break;
     }
 
     return get_payload_bn(state, translation, ctx, bn);
 }
 
 static int get_rsa_payload_coefficient(enum state state,
-                                       const struct translation_st *translation,
-                                       struct translation_ctx_st *ctx,
-                                       size_t coefficientnum)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx,
+    size_t coefficientnum)
 {
     const RSA *r = EVP_PKEY_get0_RSA(ctx->p2);
     const BIGNUM *bn = NULL;
@@ -1954,57 +1942,55 @@ static int get_rsa_payload_coefficient(enum state state,
     case 0:
         bn = RSA_get0_iqmp(r);
         break;
-    default:
-        {
-            size_t pnum = RSA_get_multi_prime_extra_count(r);
-            const BIGNUM *exps[10], *coeffs[10];
-
-            if (coefficientnum - 1 < pnum
-                && RSA_get0_multi_prime_crt_params(r, exps, coeffs))
-                bn = coeffs[coefficientnum - 1];
-        }
-        break;
+    default: {
+        size_t pnum = RSA_get_multi_prime_extra_count(r);
+        const BIGNUM *exps[10], *coeffs[10];
+
+        if (coefficientnum - 1 < pnum
+            && RSA_get0_multi_prime_crt_params(r, exps, coeffs))
+            bn = coeffs[coefficientnum - 1];
+    } break;
     }
 
     return get_payload_bn(state, translation, ctx, bn);
 }
 
-#define IMPL_GET_RSA_PAYLOAD_FACTOR(n)                                  \
-    static int                                                          \
-    get_rsa_payload_f##n(enum state state,                              \
-                         const struct translation_st *translation,      \
-                         struct translation_ctx_st *ctx)                \
-    {                                                                   \
-        if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA               \
-            && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS)       \
-            return 0;                                                   \
-        return get_rsa_payload_factor(state, translation, ctx, n - 1);  \
+#define IMPL_GET_RSA_PAYLOAD_FACTOR(n)                                 \
+    static int                                                         \
+    get_rsa_payload_f##n(enum state state,                             \
+        const struct translation_st *translation,                      \
+        struct translation_ctx_st *ctx)                                \
+    {                                                                  \
+        if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA              \
+            && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS)      \
+            return 0;                                                  \
+        return get_rsa_payload_factor(state, translation, ctx, n - 1); \
     }
 
-#define IMPL_GET_RSA_PAYLOAD_EXPONENT(n)                                \
-    static int                                                          \
-    get_rsa_payload_e##n(enum state state,                              \
-                         const struct translation_st *translation,      \
-                         struct translation_ctx_st *ctx)                \
-    {                                                                   \
-        if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA               \
-            && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS)       \
-            return 0;                                                   \
-        return get_rsa_payload_exponent(state, translation, ctx,        \
-                                        n - 1);                         \
+#define IMPL_GET_RSA_PAYLOAD_EXPONENT(n)                          \
+    static int                                                    \
+    get_rsa_payload_e##n(enum state state,                        \
+        const struct translation_st *translation,                 \
+        struct translation_ctx_st *ctx)                           \
+    {                                                             \
+        if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA         \
+            && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS) \
+            return 0;                                             \
+        return get_rsa_payload_exponent(state, translation, ctx,  \
+            n - 1);                                               \
     }
 
-#define IMPL_GET_RSA_PAYLOAD_COEFFICIENT(n)                             \
-    static int                                                          \
-    get_rsa_payload_c##n(enum state state,                              \
-                         const struct translation_st *translation,      \
-                         struct translation_ctx_st *ctx)                \
-    {                                                                   \
-        if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA               \
-            && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS)       \
-            return 0;                                                   \
-        return get_rsa_payload_coefficient(state, translation, ctx,     \
-                                           n - 1);                      \
+#define IMPL_GET_RSA_PAYLOAD_COEFFICIENT(n)                         \
+    static int                                                      \
+    get_rsa_payload_c##n(enum state state,                          \
+        const struct translation_st *translation,                   \
+        struct translation_ctx_st *ctx)                             \
+    {                                                               \
+        if (EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA           \
+            && EVP_PKEY_get_base_id(ctx->p2) != EVP_PKEY_RSA_PSS)   \
+            return 0;                                               \
+        return get_rsa_payload_coefficient(state, translation, ctx, \
+            n - 1);                                                 \
     }
 
 IMPL_GET_RSA_PAYLOAD_FACTOR(1)
@@ -2038,8 +2024,8 @@ IMPL_GET_RSA_PAYLOAD_COEFFICIENT(8)
 IMPL_GET_RSA_PAYLOAD_COEFFICIENT(9)
 
 static int fix_group_ecx(enum state state,
-                         const struct translation_st *translation,
-                         struct translation_ctx_st *ctx)
+    const struct translation_st *translation,
+    struct translation_ctx_st *ctx)
 {
     const char *value = NULL;
 
@@ -2047,11 +2033,10 @@ static int fix_group_ecx(enum state state,
     case PRE_PARAMS_TO_CTRL:
         if (!EVP_PKEY_CTX_IS_GEN_OP(ctx->pctx))
             return 0;
-        ctx->action_type = NONE;
+        ctx->action_type = OSSL_ACTION_NONE;
         return 1;
     case POST_PARAMS_TO_CTRL:
-        if (OSSL_PARAM_get_utf8_string_ptr(ctx->params, &value) == 0 ||
-            OPENSSL_strcasecmp(ctx->pctx->keytype, value) != 0) {
+        if (OSSL_PARAM_get_utf8_string_ptr(ctx->params, &value) == 0 || OPENSSL_strcasecmp(ctx->pctx->keytype, value) != 0) {
             ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_INVALID_ARGUMENT);
             ctx->p1 = 0;
             return 0;
@@ -2077,15 +2062,15 @@ static const struct translation_st evp_pkey_ctx_translations[] = {
      * that has no separate counterpart in OSSL_PARAM terms, since we get
      * the length of the DistID automatically when getting the DistID itself.
      */
-    { SET, -1, -1, EVP_PKEY_OP_TYPE_SIG,
-      EVP_PKEY_CTRL_SET1_ID, "distid", "hexdistid",
-      OSSL_PKEY_PARAM_DIST_ID, OSSL_PARAM_OCTET_STRING, NULL },
-    { GET, -1, -1, -1,
-      EVP_PKEY_CTRL_GET1_ID, "distid", "hexdistid",
-      OSSL_PKEY_PARAM_DIST_ID, OSSL_PARAM_OCTET_PTR, NULL },
-    { GET, -1, -1, -1,
-      EVP_PKEY_CTRL_GET1_ID_LEN, NULL, NULL,
-      OSSL_PKEY_PARAM_DIST_ID, OSSL_PARAM_OCTET_PTR, fix_distid_len },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_TYPE_SIG,
+        EVP_PKEY_CTRL_SET1_ID, "distid", "hexdistid",
+        OSSL_PKEY_PARAM_DIST_ID, OSSL_PARAM_OCTET_STRING, NULL },
+    { OSSL_ACTION_GET, -1, -1, -1,
+        EVP_PKEY_CTRL_GET1_ID, "distid", "hexdistid",
+        OSSL_PKEY_PARAM_DIST_ID, OSSL_PARAM_OCTET_PTR, NULL },
+    { OSSL_ACTION_GET, -1, -1, -1,
+        EVP_PKEY_CTRL_GET1_ID_LEN, NULL, NULL,
+        OSSL_PKEY_PARAM_DIST_ID, OSSL_PARAM_OCTET_PTR, fix_distid_len },
 
     /*-
      * DH & DHX
@@ -2096,172 +2081,172 @@ static const struct translation_st evp_pkey_ctx_translations[] = {
      * EVP_PKEY_CTRL_DH_KDF_TYPE is used both for setting and getting.  The
      * fixup function has to handle this...
      */
-    { NONE, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_DH_KDF_TYPE, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_TYPE, OSSL_PARAM_UTF8_STRING,
-      fix_dh_kdf_type },
-    { SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_DH_KDF_MD, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { GET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_GET_DH_KDF_MD, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_DH_KDF_OUTLEN, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { GET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_DH_KDF_UKM, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_STRING, NULL },
-    { GET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_GET_DH_KDF_UKM, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR, NULL },
-    { SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_DH_KDF_OID, NULL, NULL,
-      OSSL_KDF_PARAM_CEK_ALG, OSSL_PARAM_UTF8_STRING, fix_oid },
-    { GET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_GET_DH_KDF_OID, NULL, NULL,
-      OSSL_KDF_PARAM_CEK_ALG, OSSL_PARAM_UTF8_STRING, fix_oid },
+    { OSSL_ACTION_NONE, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_DH_KDF_TYPE, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_TYPE, OSSL_PARAM_UTF8_STRING,
+        fix_dh_kdf_type },
+    { OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_DH_KDF_MD, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_GET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_GET_DH_KDF_MD, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_DH_KDF_OUTLEN, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_GET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_DH_KDF_UKM, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_STRING, NULL },
+    { OSSL_ACTION_GET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_GET_DH_KDF_UKM, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_DH_KDF_OID, NULL, NULL,
+        OSSL_KDF_PARAM_CEK_ALG, OSSL_PARAM_UTF8_STRING, fix_oid },
+    { OSSL_ACTION_GET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_GET_DH_KDF_OID, NULL, NULL,
+        OSSL_KDF_PARAM_CEK_ALG, OSSL_PARAM_UTF8_STRING, fix_oid },
 
     /* DHX Keygen Parameters that are shared with DH */
-    { SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN,
-      EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, "dh_paramgen_type", NULL,
-      OSSL_PKEY_PARAM_FFC_TYPE, OSSL_PARAM_UTF8_STRING, fix_dh_paramgen_type },
-    { SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN,
-      EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, "dh_paramgen_prime_len", NULL,
-      OSSL_PKEY_PARAM_FFC_PBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN  | EVP_PKEY_OP_KEYGEN,
-      EVP_PKEY_CTRL_DH_NID, "dh_param", NULL,
-      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, NULL },
-    { SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN  | EVP_PKEY_OP_KEYGEN,
-      EVP_PKEY_CTRL_DH_RFC5114, "dh_rfc5114", NULL,
-      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_dh_nid5114 },
+    { OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN,
+        EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, "dh_paramgen_type", NULL,
+        OSSL_PKEY_PARAM_FFC_TYPE, OSSL_PARAM_UTF8_STRING, fix_dh_paramgen_type },
+    { OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN,
+        EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, "dh_paramgen_prime_len", NULL,
+        OSSL_PKEY_PARAM_FFC_PBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_DH_NID, "dh_param", NULL,
+        OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_DH_RFC5114, "dh_rfc5114", NULL,
+        OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_dh_nid5114 },
 
     /* DH Keygen Parameters that are shared with DHX */
-    { SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN,
-      EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, "dh_paramgen_type", NULL,
-      OSSL_PKEY_PARAM_FFC_TYPE, OSSL_PARAM_UTF8_STRING, fix_dh_paramgen_type },
-    { SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN,
-      EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, "dh_paramgen_prime_len", NULL,
-      OSSL_PKEY_PARAM_FFC_PBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
-      EVP_PKEY_CTRL_DH_NID, "dh_param", NULL,
-      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_dh_nid },
-    { SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN  | EVP_PKEY_OP_KEYGEN,
-      EVP_PKEY_CTRL_DH_RFC5114, "dh_rfc5114", NULL,
-      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_dh_nid5114 },
+    { OSSL_ACTION_SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN,
+        EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, "dh_paramgen_type", NULL,
+        OSSL_PKEY_PARAM_FFC_TYPE, OSSL_PARAM_UTF8_STRING, fix_dh_paramgen_type },
+    { OSSL_ACTION_SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN,
+        EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, "dh_paramgen_prime_len", NULL,
+        OSSL_PKEY_PARAM_FFC_PBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_DH_NID, "dh_param", NULL,
+        OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_dh_nid },
+    { OSSL_ACTION_SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_DH_RFC5114, "dh_rfc5114", NULL,
+        OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_dh_nid5114 },
 
     /* DH specific Keygen Parameters */
-    { SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN,
-      EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR, "dh_paramgen_generator", NULL,
-      OSSL_PKEY_PARAM_DH_GENERATOR, OSSL_PARAM_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_PARAMGEN,
+        EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR, "dh_paramgen_generator", NULL,
+        OSSL_PKEY_PARAM_DH_GENERATOR, OSSL_PARAM_INTEGER, NULL },
 
     /* DHX specific Keygen Parameters */
-    { SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN,
-      EVP_PKEY_CTRL_DH_PARAMGEN_SUBPRIME_LEN, "dh_paramgen_subprime_len", NULL,
-      OSSL_PKEY_PARAM_FFC_QBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_DHX, 0, EVP_PKEY_OP_PARAMGEN,
+        EVP_PKEY_CTRL_DH_PARAMGEN_SUBPRIME_LEN, "dh_paramgen_subprime_len", NULL,
+        OSSL_PKEY_PARAM_FFC_QBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
 
-    { SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_DH_PAD, "dh_pad", NULL,
-      OSSL_EXCHANGE_PARAM_PAD, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_DH, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_DH_PAD, "dh_pad", NULL,
+        OSSL_EXCHANGE_PARAM_PAD, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
 
     /*-
      * DSA
      * ===
      */
-    { SET, EVP_PKEY_DSA, 0, EVP_PKEY_OP_PARAMGEN,
-      EVP_PKEY_CTRL_DSA_PARAMGEN_BITS, "dsa_paramgen_bits", NULL,
-      OSSL_PKEY_PARAM_FFC_PBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, EVP_PKEY_DSA, 0, EVP_PKEY_OP_PARAMGEN,
-      EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS, "dsa_paramgen_q_bits", NULL,
-      OSSL_PKEY_PARAM_FFC_QBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, EVP_PKEY_DSA, 0, EVP_PKEY_OP_PARAMGEN,
-      EVP_PKEY_CTRL_DSA_PARAMGEN_MD, "dsa_paramgen_md", NULL,
-      OSSL_PKEY_PARAM_FFC_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_SET, EVP_PKEY_DSA, 0, EVP_PKEY_OP_PARAMGEN,
+        EVP_PKEY_CTRL_DSA_PARAMGEN_BITS, "dsa_paramgen_bits", NULL,
+        OSSL_PKEY_PARAM_FFC_PBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_DSA, 0, EVP_PKEY_OP_PARAMGEN,
+        EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS, "dsa_paramgen_q_bits", NULL,
+        OSSL_PKEY_PARAM_FFC_QBITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_DSA, 0, EVP_PKEY_OP_PARAMGEN,
+        EVP_PKEY_CTRL_DSA_PARAMGEN_MD, "dsa_paramgen_md", NULL,
+        OSSL_PKEY_PARAM_FFC_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
 
     /*-
      * EC
      * ==
      */
-    { SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
-      EVP_PKEY_CTRL_EC_PARAM_ENC, "ec_param_enc", NULL,
-      OSSL_PKEY_PARAM_EC_ENCODING, OSSL_PARAM_UTF8_STRING, fix_ec_param_enc },
-    { SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
-      EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, "ec_paramgen_curve", NULL,
-      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING,
-      fix_ec_paramgen_curve_nid },
+    { OSSL_ACTION_SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_EC_PARAM_ENC, "ec_param_enc", NULL,
+        OSSL_PKEY_PARAM_EC_ENCODING, OSSL_PARAM_UTF8_STRING, fix_ec_param_enc },
+    { OSSL_ACTION_SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, "ec_paramgen_curve", NULL,
+        OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING,
+        fix_ec_paramgen_curve_nid },
     /*
      * EVP_PKEY_CTRL_EC_ECDH_COFACTOR and EVP_PKEY_CTRL_EC_KDF_TYPE are used
      * both for setting and getting.  The fixup function has to handle this...
      */
-    { NONE, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_EC_ECDH_COFACTOR, "ecdh_cofactor_mode", NULL,
-      OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE, OSSL_PARAM_INTEGER,
-      fix_ecdh_cofactor },
-    { NONE, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_EC_KDF_TYPE, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_TYPE, OSSL_PARAM_UTF8_STRING, fix_ec_kdf_type },
-    { SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_EC_KDF_MD, "ecdh_kdf_md", NULL,
-      OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { GET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_GET_EC_KDF_MD, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_EC_KDF_OUTLEN, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { GET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_EC_KDF_UKM, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_STRING, NULL },
-    { GET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_GET_EC_KDF_UKM, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR, NULL },
+    { OSSL_ACTION_NONE, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_EC_ECDH_COFACTOR, "ecdh_cofactor_mode", NULL,
+        OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE, OSSL_PARAM_INTEGER,
+        fix_ecdh_cofactor },
+    { OSSL_ACTION_NONE, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_EC_KDF_TYPE, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_TYPE, OSSL_PARAM_UTF8_STRING, fix_ec_kdf_type },
+    { OSSL_ACTION_SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_EC_KDF_MD, "ecdh_kdf_md", NULL,
+        OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_GET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_GET_EC_KDF_MD, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_EC_KDF_OUTLEN, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_GET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_EC_KDF_UKM, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_STRING, NULL },
+    { OSSL_ACTION_GET, EVP_PKEY_EC, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_GET_EC_KDF_UKM, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR, NULL },
 
     /*-
      * SM2
      * ==
      */
-    { SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
-      EVP_PKEY_CTRL_EC_PARAM_ENC, "ec_param_enc", NULL,
-      OSSL_PKEY_PARAM_EC_ENCODING, OSSL_PARAM_UTF8_STRING, fix_ec_param_enc },
-    { SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
-      EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, "ec_paramgen_curve", NULL,
-      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING,
-      fix_ec_paramgen_curve_nid },
+    { OSSL_ACTION_SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_EC_PARAM_ENC, "ec_param_enc", NULL,
+        OSSL_PKEY_PARAM_EC_ENCODING, OSSL_PARAM_UTF8_STRING, fix_ec_param_enc },
+    { OSSL_ACTION_SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, "ec_paramgen_curve", NULL,
+        OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING,
+        fix_ec_paramgen_curve_nid },
     /*
      * EVP_PKEY_CTRL_EC_ECDH_COFACTOR and EVP_PKEY_CTRL_EC_KDF_TYPE are used
      * both for setting and getting.  The fixup function has to handle this...
      */
-    { NONE, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_EC_ECDH_COFACTOR, "ecdh_cofactor_mode", NULL,
-      OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE, OSSL_PARAM_INTEGER,
-      fix_ecdh_cofactor },
-    { NONE, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_EC_KDF_TYPE, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_TYPE, OSSL_PARAM_UTF8_STRING, fix_ec_kdf_type },
-    { SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_EC_KDF_MD, "ecdh_kdf_md", NULL,
-      OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { GET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_GET_EC_KDF_MD, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_EC_KDF_OUTLEN, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { GET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_EC_KDF_UKM, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_STRING, NULL },
-    { GET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_GET_EC_KDF_UKM, NULL, NULL,
-      OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR, NULL },
+    { OSSL_ACTION_NONE, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_EC_ECDH_COFACTOR, "ecdh_cofactor_mode", NULL,
+        OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE, OSSL_PARAM_INTEGER,
+        fix_ecdh_cofactor },
+    { OSSL_ACTION_NONE, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_EC_KDF_TYPE, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_TYPE, OSSL_PARAM_UTF8_STRING, fix_ec_kdf_type },
+    { OSSL_ACTION_SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_EC_KDF_MD, "ecdh_kdf_md", NULL,
+        OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_GET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_GET_EC_KDF_MD, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_EC_KDF_OUTLEN, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_GET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_OUTLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_EC_KDF_UKM, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_STRING, NULL },
+    { OSSL_ACTION_GET, EVP_PKEY_SM2, 0, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_GET_EC_KDF_UKM, NULL, NULL,
+        OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR, NULL },
     /*-
      * RSA
      * ===
@@ -2273,23 +2258,23 @@ static const struct translation_st evp_pkey_ctx_translations[] = {
      * fix_rsa_padding_mode() does the work when the caller has a different
      * idea.
      */
-    { SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS,
-      EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
-      EVP_PKEY_CTRL_RSA_PADDING, "rsa_padding_mode", NULL,
-      OSSL_PKEY_PARAM_PAD_MODE, OSSL_PARAM_UTF8_STRING, fix_rsa_padding_mode },
-    { GET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS,
-      EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
-      EVP_PKEY_CTRL_GET_RSA_PADDING, NULL, NULL,
-      OSSL_PKEY_PARAM_PAD_MODE, OSSL_PARAM_UTF8_STRING, fix_rsa_padding_mode },
-
-    { SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS,
-      EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
-      EVP_PKEY_CTRL_RSA_MGF1_MD, "rsa_mgf1_md", NULL,
-      OSSL_PKEY_PARAM_MGF1_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { GET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS,
-      EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
-      EVP_PKEY_CTRL_GET_RSA_MGF1_MD, NULL, NULL,
-      OSSL_PKEY_PARAM_MGF1_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS,
+        EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
+        EVP_PKEY_CTRL_RSA_PADDING, "rsa_padding_mode", NULL,
+        OSSL_PKEY_PARAM_PAD_MODE, OSSL_PARAM_UTF8_STRING, fix_rsa_padding_mode },
+    { OSSL_ACTION_GET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS,
+        EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
+        EVP_PKEY_CTRL_GET_RSA_PADDING, NULL, NULL,
+        OSSL_PKEY_PARAM_PAD_MODE, OSSL_PARAM_UTF8_STRING, fix_rsa_padding_mode },
+
+    { OSSL_ACTION_SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS,
+        EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
+        EVP_PKEY_CTRL_RSA_MGF1_MD, "rsa_mgf1_md", NULL,
+        OSSL_PKEY_PARAM_MGF1_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_GET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS,
+        EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
+        EVP_PKEY_CTRL_GET_RSA_MGF1_MD, NULL, NULL,
+        OSSL_PKEY_PARAM_MGF1_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
 
     /*
      * RSA-PSS saltlen is essentially numeric, but certain values can be
@@ -2297,150 +2282,150 @@ static const struct translation_st evp_pkey_ctx_translations[] = {
      * OSSL_PARAM allows both forms.
      * fix_rsa_pss_saltlen() takes care of the distinction.
      */
-    { SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_TYPE_SIG,
-      EVP_PKEY_CTRL_RSA_PSS_SALTLEN, "rsa_pss_saltlen", NULL,
-      OSSL_PKEY_PARAM_RSA_PSS_SALTLEN, OSSL_PARAM_UTF8_STRING,
-      fix_rsa_pss_saltlen },
-    { GET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_TYPE_SIG,
-      EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_PSS_SALTLEN, OSSL_PARAM_UTF8_STRING,
-      fix_rsa_pss_saltlen },
-
-    { SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
-      EVP_PKEY_CTRL_RSA_OAEP_MD, "rsa_oaep_md", NULL,
-      OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { GET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
-      EVP_PKEY_CTRL_GET_RSA_OAEP_MD, NULL, NULL,
-      OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_TYPE_SIG,
+        EVP_PKEY_CTRL_RSA_PSS_SALTLEN, "rsa_pss_saltlen", NULL,
+        OSSL_PKEY_PARAM_RSA_PSS_SALTLEN, OSSL_PARAM_UTF8_STRING,
+        fix_rsa_pss_saltlen },
+    { OSSL_ACTION_GET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_TYPE_SIG,
+        EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_PSS_SALTLEN, OSSL_PARAM_UTF8_STRING,
+        fix_rsa_pss_saltlen },
+
+    { OSSL_ACTION_SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
+        EVP_PKEY_CTRL_RSA_OAEP_MD, "rsa_oaep_md", NULL,
+        OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_GET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
+        EVP_PKEY_CTRL_GET_RSA_OAEP_MD, NULL, NULL,
+        OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
     /*
      * The "rsa_oaep_label" ctrl_str expects the value to always be hex.
      * This is accommodated by default_fixup_args() above, which mimics that
      * expectation for any translation item where |ctrl_str| is NULL and
      * |ctrl_hexstr| is non-NULL.
      */
-    { SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
-      EVP_PKEY_CTRL_RSA_OAEP_LABEL, NULL, "rsa_oaep_label",
-      OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, OSSL_PARAM_OCTET_STRING, NULL },
-    { GET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
-      EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL, NULL, NULL,
-      OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, OSSL_PARAM_OCTET_PTR, NULL },
-
-    { SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
-      EVP_PKEY_CTRL_RSA_IMPLICIT_REJECTION, NULL,
-      "rsa_pkcs1_implicit_rejection",
-      OSSL_ASYM_CIPHER_PARAM_IMPLICIT_REJECTION, OSSL_PARAM_UNSIGNED_INTEGER,
-      NULL },
-
-    { SET, EVP_PKEY_RSA_PSS, 0, EVP_PKEY_OP_TYPE_GEN,
-      EVP_PKEY_CTRL_MD, "rsa_pss_keygen_md", NULL,
-      OSSL_ALG_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { SET, EVP_PKEY_RSA_PSS, 0, EVP_PKEY_OP_TYPE_GEN,
-      EVP_PKEY_CTRL_RSA_MGF1_MD, "rsa_pss_keygen_mgf1_md", NULL,
-      OSSL_PKEY_PARAM_MGF1_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { SET, EVP_PKEY_RSA_PSS, 0, EVP_PKEY_OP_TYPE_GEN,
-      EVP_PKEY_CTRL_RSA_PSS_SALTLEN, "rsa_pss_keygen_saltlen", NULL,
-      OSSL_SIGNATURE_PARAM_PSS_SALTLEN, OSSL_PARAM_INTEGER, NULL },
-    { SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
-      EVP_PKEY_CTRL_RSA_KEYGEN_BITS, "rsa_keygen_bits", NULL,
-      OSSL_PKEY_PARAM_RSA_BITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
-      EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, "rsa_keygen_pubexp", NULL,
-      OSSL_PKEY_PARAM_RSA_E, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
-      EVP_PKEY_CTRL_RSA_KEYGEN_PRIMES, "rsa_keygen_primes", NULL,
-      OSSL_PKEY_PARAM_RSA_PRIMES, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
+        EVP_PKEY_CTRL_RSA_OAEP_LABEL, NULL, "rsa_oaep_label",
+        OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, OSSL_PARAM_OCTET_STRING, NULL },
+    { OSSL_ACTION_GET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
+        EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL, NULL, NULL,
+        OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, OSSL_PARAM_OCTET_PTR, NULL },
+
+    { OSSL_ACTION_SET, EVP_PKEY_RSA, 0, EVP_PKEY_OP_TYPE_CRYPT,
+        EVP_PKEY_CTRL_RSA_IMPLICIT_REJECTION, NULL,
+        "rsa_pkcs1_implicit_rejection",
+        OSSL_ASYM_CIPHER_PARAM_IMPLICIT_REJECTION, OSSL_PARAM_UNSIGNED_INTEGER,
+        NULL },
+
+    { OSSL_ACTION_SET, EVP_PKEY_RSA_PSS, 0, EVP_PKEY_OP_TYPE_GEN,
+        EVP_PKEY_CTRL_MD, "rsa_pss_keygen_md", NULL,
+        OSSL_ALG_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_SET, EVP_PKEY_RSA_PSS, 0, EVP_PKEY_OP_TYPE_GEN,
+        EVP_PKEY_CTRL_RSA_MGF1_MD, "rsa_pss_keygen_mgf1_md", NULL,
+        OSSL_PKEY_PARAM_MGF1_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_SET, EVP_PKEY_RSA_PSS, 0, EVP_PKEY_OP_TYPE_GEN,
+        EVP_PKEY_CTRL_RSA_PSS_SALTLEN, "rsa_pss_keygen_saltlen", NULL,
+        OSSL_SIGNATURE_PARAM_PSS_SALTLEN, OSSL_PARAM_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_RSA_KEYGEN_BITS, "rsa_keygen_bits", NULL,
+        OSSL_PKEY_PARAM_RSA_BITS, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, "rsa_keygen_pubexp", NULL,
+        OSSL_PKEY_PARAM_RSA_E, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, EVP_PKEY_RSA, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_RSA_KEYGEN_PRIMES, "rsa_keygen_primes", NULL,
+        OSSL_PKEY_PARAM_RSA_PRIMES, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
 
     /*-
      * SipHash
      * ======
      */
-    { SET, -1, -1, EVP_PKEY_OP_TYPE_SIG,
-      EVP_PKEY_CTRL_SET_DIGEST_SIZE, "digestsize", NULL,
-      OSSL_MAC_PARAM_SIZE, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_TYPE_SIG,
+        EVP_PKEY_CTRL_SET_DIGEST_SIZE, "digestsize", NULL,
+        OSSL_MAC_PARAM_SIZE, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
 
     /*-
      * TLS1-PRF
      * ========
      */
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_TLS_MD, "md", NULL,
-      OSSL_KDF_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_TLS_SECRET, "secret", "hexsecret",
-      OSSL_KDF_PARAM_SECRET, OSSL_PARAM_OCTET_STRING, NULL },
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_TLS_SEED, "seed", "hexseed",
-      OSSL_KDF_PARAM_SEED, OSSL_PARAM_OCTET_STRING, NULL },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_TLS_MD, "md", NULL,
+        OSSL_KDF_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_TLS_SECRET, "secret", "hexsecret",
+        OSSL_KDF_PARAM_SECRET, OSSL_PARAM_OCTET_STRING, NULL },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_TLS_SEED, "seed", "hexseed",
+        OSSL_KDF_PARAM_SEED, OSSL_PARAM_OCTET_STRING, NULL },
 
     /*-
      * HKDF
      * ====
      */
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_HKDF_MD, "md", NULL,
-      OSSL_KDF_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_HKDF_SALT, "salt", "hexsalt",
-      OSSL_KDF_PARAM_SALT, OSSL_PARAM_OCTET_STRING, NULL },
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_HKDF_KEY, "key", "hexkey",
-      OSSL_KDF_PARAM_KEY, OSSL_PARAM_OCTET_STRING, NULL },
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_HKDF_INFO, "info", "hexinfo",
-      OSSL_KDF_PARAM_INFO, OSSL_PARAM_OCTET_STRING, NULL },
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_HKDF_MODE, "mode", NULL,
-      OSSL_KDF_PARAM_MODE, OSSL_PARAM_INTEGER, fix_hkdf_mode },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_HKDF_MD, "md", NULL,
+        OSSL_KDF_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_HKDF_SALT, "salt", "hexsalt",
+        OSSL_KDF_PARAM_SALT, OSSL_PARAM_OCTET_STRING, NULL },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_HKDF_KEY, "key", "hexkey",
+        OSSL_KDF_PARAM_KEY, OSSL_PARAM_OCTET_STRING, NULL },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_HKDF_INFO, "info", "hexinfo",
+        OSSL_KDF_PARAM_INFO, OSSL_PARAM_OCTET_STRING, NULL },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_HKDF_MODE, "mode", NULL,
+        OSSL_KDF_PARAM_MODE, OSSL_PARAM_INTEGER, fix_hkdf_mode },
 
     /*-
      * Scrypt
      * ======
      */
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_PASS, "pass", "hexpass",
-      OSSL_KDF_PARAM_PASSWORD, OSSL_PARAM_OCTET_STRING, NULL },
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_SCRYPT_SALT, "salt", "hexsalt",
-      OSSL_KDF_PARAM_SALT, OSSL_PARAM_OCTET_STRING, NULL },
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_SCRYPT_N, "N", NULL,
-      OSSL_KDF_PARAM_SCRYPT_N, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_SCRYPT_R, "r", NULL,
-      OSSL_KDF_PARAM_SCRYPT_R, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_SCRYPT_P, "p", NULL,
-      OSSL_KDF_PARAM_SCRYPT_P, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-    { SET, -1, -1, EVP_PKEY_OP_DERIVE,
-      EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES, "maxmem_bytes", NULL,
-      OSSL_KDF_PARAM_SCRYPT_MAXMEM, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
-
-    { SET, -1, -1, EVP_PKEY_OP_KEYGEN | EVP_PKEY_OP_TYPE_CRYPT,
-      EVP_PKEY_CTRL_CIPHER, NULL, NULL,
-      OSSL_PKEY_PARAM_CIPHER, OSSL_PARAM_UTF8_STRING, fix_cipher },
-    { SET, -1, -1, EVP_PKEY_OP_KEYGEN,
-      EVP_PKEY_CTRL_SET_MAC_KEY, "key", "hexkey",
-      OSSL_PKEY_PARAM_PRIV_KEY, OSSL_PARAM_OCTET_STRING, NULL },
-
-    { SET, -1, -1, EVP_PKEY_OP_TYPE_SIG,
-      EVP_PKEY_CTRL_MD, NULL, NULL,
-      OSSL_SIGNATURE_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
-    { GET, -1, -1, EVP_PKEY_OP_TYPE_SIG,
-      EVP_PKEY_CTRL_GET_MD, NULL, NULL,
-      OSSL_SIGNATURE_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_PASS, "pass", "hexpass",
+        OSSL_KDF_PARAM_PASSWORD, OSSL_PARAM_OCTET_STRING, NULL },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_SCRYPT_SALT, "salt", "hexsalt",
+        OSSL_KDF_PARAM_SALT, OSSL_PARAM_OCTET_STRING, NULL },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_SCRYPT_N, "N", NULL,
+        OSSL_KDF_PARAM_SCRYPT_N, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_SCRYPT_R, "r", NULL,
+        OSSL_KDF_PARAM_SCRYPT_R, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_SCRYPT_P, "p", NULL,
+        OSSL_KDF_PARAM_SCRYPT_P, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES, "maxmem_bytes", NULL,
+        OSSL_KDF_PARAM_SCRYPT_MAXMEM, OSSL_PARAM_UNSIGNED_INTEGER, NULL },
+
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_KEYGEN | EVP_PKEY_OP_TYPE_CRYPT,
+        EVP_PKEY_CTRL_CIPHER, NULL, NULL,
+        OSSL_PKEY_PARAM_CIPHER, OSSL_PARAM_UTF8_STRING, fix_cipher },
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_SET_MAC_KEY, "key", "hexkey",
+        OSSL_PKEY_PARAM_PRIV_KEY, OSSL_PARAM_OCTET_STRING, NULL },
+
+    { OSSL_ACTION_SET, -1, -1, EVP_PKEY_OP_TYPE_SIG,
+        EVP_PKEY_CTRL_MD, NULL, NULL,
+        OSSL_SIGNATURE_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
+    { OSSL_ACTION_GET, -1, -1, EVP_PKEY_OP_TYPE_SIG,
+        EVP_PKEY_CTRL_GET_MD, NULL, NULL,
+        OSSL_SIGNATURE_PARAM_DIGEST, OSSL_PARAM_UTF8_STRING, fix_md },
 
     /*-
      * ECX
      * ===
      */
-    { SET, EVP_PKEY_X25519, EVP_PKEY_X25519, EVP_PKEY_OP_KEYGEN, -1, NULL, NULL,
-      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
-    { SET, EVP_PKEY_X25519, EVP_PKEY_X25519, EVP_PKEY_OP_PARAMGEN, -1, NULL, NULL,
-      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
-    { SET, EVP_PKEY_X448, EVP_PKEY_X448, EVP_PKEY_OP_KEYGEN, -1, NULL, NULL,
-      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
-    { SET, EVP_PKEY_X448, EVP_PKEY_X448, EVP_PKEY_OP_PARAMGEN, -1, NULL, NULL,
-      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
+    { OSSL_ACTION_SET, EVP_PKEY_X25519, EVP_PKEY_X25519, EVP_PKEY_OP_KEYGEN, -1, NULL, NULL,
+        OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
+    { OSSL_ACTION_SET, EVP_PKEY_X25519, EVP_PKEY_X25519, EVP_PKEY_OP_PARAMGEN, -1, NULL, NULL,
+        OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
+    { OSSL_ACTION_SET, EVP_PKEY_X448, EVP_PKEY_X448, EVP_PKEY_OP_KEYGEN, -1, NULL, NULL,
+        OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
+    { OSSL_ACTION_SET, EVP_PKEY_X448, EVP_PKEY_X448, EVP_PKEY_OP_PARAMGEN, -1, NULL, NULL,
+        OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING, fix_group_ecx },
 };
 
 static const struct translation_st evp_pkey_translations[] = {
@@ -2452,142 +2437,142 @@ static const struct translation_st evp_pkey_translations[] = {
      */
 
     /* DH, DSA & EC */
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING,
-      get_payload_group_name },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_PRIV_KEY, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_payload_private_key },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_PUB_KEY,
-      0 /* no data type, let get_payload_public_key() handle that */,
-      get_payload_public_key },
-    { GET, -1, -1, -1, 0, NULL, NULL,
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_GROUP_NAME, OSSL_PARAM_UTF8_STRING,
+        get_payload_group_name },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_PRIV_KEY, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_payload_private_key },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_PUB_KEY,
+        0 /* no data type, let get_payload_public_key() handle that */,
+        get_payload_public_key },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
         OSSL_PKEY_PARAM_EC_PUB_X, OSSL_PARAM_UNSIGNED_INTEGER,
         get_payload_public_key_ec },
-    { GET, -1, -1, -1, 0, NULL, NULL,
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
         OSSL_PKEY_PARAM_EC_PUB_Y, OSSL_PARAM_UNSIGNED_INTEGER,
         get_payload_public_key_ec },
 
     /* DH and DSA */
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_FFC_P, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_dh_dsa_payload_p },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_FFC_G, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_dh_dsa_payload_g },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_FFC_Q, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_dh_dsa_payload_q },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_FFC_P, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_dh_dsa_payload_p },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_FFC_G, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_dh_dsa_payload_g },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_FFC_Q, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_dh_dsa_payload_q },
 
     /* RSA */
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_N, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_n },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_E, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_e },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_D, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_d },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_FACTOR1, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_f1 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_FACTOR2, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_f2 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_FACTOR3, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_f3 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_FACTOR4, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_f4 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_FACTOR5, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_f5 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_FACTOR6, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_f6 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_FACTOR7, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_f7 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_FACTOR8, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_f8 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_FACTOR9, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_f9 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_FACTOR10, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_f10 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_EXPONENT1, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_e1 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_EXPONENT2, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_e2 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_EXPONENT3, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_e3 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_EXPONENT4, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_e4 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_EXPONENT5, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_e5 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_EXPONENT6, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_e6 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_EXPONENT7, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_e7 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_EXPONENT8, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_e8 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_EXPONENT9, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_e9 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_EXPONENT10, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_e10 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_COEFFICIENT1, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_c1 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_COEFFICIENT2, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_c2 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_COEFFICIENT3, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_c3 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_COEFFICIENT4, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_c4 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_COEFFICIENT5, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_c5 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_COEFFICIENT6, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_c6 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_COEFFICIENT7, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_c7 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_COEFFICIENT8, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_c8 },
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_RSA_COEFFICIENT9, OSSL_PARAM_UNSIGNED_INTEGER,
-      get_rsa_payload_c9 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_N, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_n },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_E, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_e },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_D, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_d },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_FACTOR1, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_f1 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_FACTOR2, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_f2 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_FACTOR3, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_f3 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_FACTOR4, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_f4 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_FACTOR5, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_f5 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_FACTOR6, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_f6 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_FACTOR7, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_f7 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_FACTOR8, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_f8 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_FACTOR9, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_f9 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_FACTOR10, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_f10 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_EXPONENT1, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_e1 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_EXPONENT2, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_e2 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_EXPONENT3, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_e3 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_EXPONENT4, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_e4 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_EXPONENT5, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_e5 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_EXPONENT6, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_e6 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_EXPONENT7, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_e7 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_EXPONENT8, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_e8 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_EXPONENT9, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_e9 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_EXPONENT10, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_e10 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_COEFFICIENT1, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_c1 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_COEFFICIENT2, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_c2 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_COEFFICIENT3, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_c3 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_COEFFICIENT4, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_c4 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_COEFFICIENT5, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_c5 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_COEFFICIENT6, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_c6 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_COEFFICIENT7, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_c7 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_COEFFICIENT8, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_c8 },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_RSA_COEFFICIENT9, OSSL_PARAM_UNSIGNED_INTEGER,
+        get_rsa_payload_c9 },
 
     /* EC */
-    { GET, -1, -1, -1, 0, NULL, NULL,
-      OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS, OSSL_PARAM_INTEGER,
-      get_ec_decoded_from_explicit_params },
+    { OSSL_ACTION_GET, -1, -1, -1, 0, NULL, NULL,
+        OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS, OSSL_PARAM_INTEGER,
+        get_ec_decoded_from_explicit_params },
 };
 
 static const struct translation_st *
 lookup_translation(struct translation_st *tmpl,
-                   const struct translation_st *translations,
-                   size_t translations_num)
+    const struct translation_st *translations,
+    size_t translations_num)
 {
     size_t i;
 
@@ -2603,7 +2588,6 @@ lookup_translation(struct translation_st *tmpl,
         if (!ossl_assert((item->keytype1 == -1) == (item->keytype2 == -1)))
             continue;
 
-
         /*
          * Base search criteria: check that the optype and keytypes match,
          * if relevant.  All callers must synthesise these bits somehow.
@@ -2636,8 +2620,8 @@ lookup_translation(struct translation_st *tmpl,
              * for setting, never for getting.  Therefore, we only look at
              * the setter items.
              */
-            if (item->action_type != NONE
-                && item->action_type != SET)
+            if (item->action_type != OSSL_ACTION_NONE
+                && item->action_type != OSSL_ACTION_SET)
                 continue;
             /*
              * At least one of the ctrl cmd names must be match the ctrl
@@ -2647,8 +2631,9 @@ lookup_translation(struct translation_st *tmpl,
                 && OPENSSL_strcasecmp(tmpl->ctrl_str, item->ctrl_str) == 0)
                 ctrl_str = tmpl->ctrl_str;
             else if (item->ctrl_hexstr != NULL
-                     && OPENSSL_strcasecmp(tmpl->ctrl_hexstr,
-                                           item->ctrl_hexstr) == 0)
+                && OPENSSL_strcasecmp(tmpl->ctrl_hexstr,
+                       item->ctrl_hexstr)
+                    == 0)
                 ctrl_hexstr = tmpl->ctrl_hexstr;
             else
                 continue;
@@ -2673,11 +2658,12 @@ lookup_translation(struct translation_st *tmpl,
              * key name can therefore be used in both directions.  We must
              * therefore take the action type into account in this case.
              */
-            if ((item->action_type != NONE
-                 && tmpl->action_type != item->action_type)
+            if ((item->action_type != OSSL_ACTION_NONE
+                    && tmpl->action_type != item->action_type)
                 || (item->param_key != NULL
                     && OPENSSL_strcasecmp(tmpl->param_key,
-                                          item->param_key) != 0))
+                           item->param_key)
+                        != 0))
                 continue;
         } else {
             return NULL;
@@ -2693,23 +2679,27 @@ static const struct translation_st *
 lookup_evp_pkey_ctx_translation(struct translation_st *tmpl)
 {
     return lookup_translation(tmpl, evp_pkey_ctx_translations,
-                              OSSL_NELEM(evp_pkey_ctx_translations));
+        OSSL_NELEM(evp_pkey_ctx_translations));
 }
 
 static const struct translation_st *
 lookup_evp_pkey_translation(struct translation_st *tmpl)
 {
     return lookup_translation(tmpl, evp_pkey_translations,
-                              OSSL_NELEM(evp_pkey_translations));
+        OSSL_NELEM(evp_pkey_translations));
 }
 
 /* This must ONLY be called for provider side operations */
 int evp_pkey_ctx_ctrl_to_param(EVP_PKEY_CTX *pctx,
-                               int keytype, int optype,
-                               int cmd, int p1, void *p2)
+    int keytype, int optype,
+    int cmd, int p1, void *p2)
 {
-    struct translation_ctx_st ctx = { 0, };
-    struct translation_st tmpl = { 0, };
+    struct translation_ctx_st ctx = {
+        0,
+    };
+    struct translation_st tmpl = {
+        0,
+    };
     const struct translation_st *translation = NULL;
     OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
     int ret;
@@ -2748,10 +2738,10 @@ int evp_pkey_ctx_ctrl_to_param(EVP_PKEY_CTX *pctx,
         default:
             /* fixup_args is expected to make sure this is dead code */
             break;
-        case GET:
+        case OSSL_ACTION_GET:
             ret = evp_pkey_ctx_get_params_strict(pctx, ctx.params);
             break;
-        case SET:
+        case OSSL_ACTION_SET:
             ret = evp_pkey_ctx_set_params_strict(pctx, ctx.params);
             break;
         }
@@ -2774,10 +2764,14 @@ int evp_pkey_ctx_ctrl_to_param(EVP_PKEY_CTX *pctx,
 
 /* This must ONLY be called for provider side operations */
 int evp_pkey_ctx_ctrl_str_to_param(EVP_PKEY_CTX *pctx,
-                                   const char *name, const char *value)
+    const char *name, const char *value)
 {
-    struct translation_ctx_st ctx = { 0, };
-    struct translation_st tmpl = { 0, };
+    struct translation_ctx_st ctx = {
+        0,
+    };
+    struct translation_st tmpl = {
+        0,
+    };
     const struct translation_st *translation = NULL;
     OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
     int keytype = pctx->legacy_keytype;
@@ -2785,7 +2779,7 @@ int evp_pkey_ctx_ctrl_str_to_param(EVP_PKEY_CTX *pctx,
     int ret;
     fixup_args_fn *fixup = default_fixup_args;
 
-    tmpl.action_type = SET;
+    tmpl.action_type = OSSL_ACTION_SET;
     tmpl.keytype1 = tmpl.keytype2 = keytype;
     tmpl.optype = optype;
     tmpl.ctrl_str = name;
@@ -2799,7 +2793,7 @@ int evp_pkey_ctx_ctrl_str_to_param(EVP_PKEY_CTX *pctx,
         ctx.ishex = (tmpl.ctrl_hexstr != NULL);
     } else {
         /* String controls really only support setting */
-        ctx.action_type = SET;
+        ctx.action_type = OSSL_ACTION_SET;
     }
     ctx.ctrl_str = name;
     ctx.p1 = (int)strlen(value);
@@ -2814,13 +2808,13 @@ int evp_pkey_ctx_ctrl_str_to_param(EVP_PKEY_CTX *pctx,
         default:
             /* fixup_args is expected to make sure this is dead code */
             break;
-        case GET:
+        case OSSL_ACTION_GET:
             /*
              * this is dead code, but must be present, or some compilers
              * will complain
              */
             break;
-        case SET:
+        case OSSL_ACTION_SET:
             ret = evp_pkey_ctx_set_params_strict(pctx, ctx.params);
             break;
         }
@@ -2836,15 +2830,19 @@ int evp_pkey_ctx_ctrl_str_to_param(EVP_PKEY_CTX *pctx,
 
 /* This must ONLY be called for legacy operations */
 static int evp_pkey_ctx_setget_params_to_ctrl(EVP_PKEY_CTX *pctx,
-                                              enum action action_type,
-                                              OSSL_PARAM *params)
+    enum action action_type,
+    OSSL_PARAM *params)
 {
     int keytype = pctx->legacy_keytype;
     int optype = pctx->operation == 0 ? -1 : pctx->operation;
 
     for (; params != NULL && params->key != NULL; params++) {
-        struct translation_ctx_st ctx = { 0, };
-        struct translation_st tmpl = { 0, };
+        struct translation_ctx_st ctx = {
+            0,
+        };
+        struct translation_st tmpl = {
+            0,
+        };
         const struct translation_st *translation = NULL;
         fixup_args_fn *fixup = default_fixup_args;
         int ret;
@@ -2865,16 +2863,16 @@ static int evp_pkey_ctx_setget_params_to_ctrl(EVP_PKEY_CTX *pctx,
 
         ret = fixup(PRE_PARAMS_TO_CTRL, translation, &ctx);
 
-        if (ret > 0 && ctx.action_type != NONE)
+        if (ret > 0 && ctx.action_type != OSSL_ACTION_NONE)
             ret = EVP_PKEY_CTX_ctrl(pctx, keytype, optype,
-                                    ctx.ctrl_cmd, ctx.p1, ctx.p2);
+                ctx.ctrl_cmd, ctx.p1, ctx.p2);
 
         /*
          * In POST, we pass the return value as p1, allowing the fixup_args
          * function to put it to good use, or maybe affect it.
          *
          * NOTE: even though EVP_PKEY_CTX_ctrl return value is documented
-         * as return positive on Success and 0 or negative on falure. There
+         * as return positive on Success and 0 or negative on failure. There
          * maybe parameters (e.g. ecdh_cofactor), which actually return 0
          * as success value. That is why we do POST_PARAMS_TO_CTRL for 0
          * value as well
@@ -2895,24 +2893,32 @@ static int evp_pkey_ctx_setget_params_to_ctrl(EVP_PKEY_CTX *pctx,
 
 int evp_pkey_ctx_set_params_to_ctrl(EVP_PKEY_CTX *ctx, const OSSL_PARAM *params)
 {
-    return evp_pkey_ctx_setget_params_to_ctrl(ctx, SET, (OSSL_PARAM *)params);
+    if (ctx->keymgmt != NULL)
+        return 0;
+    return evp_pkey_ctx_setget_params_to_ctrl(ctx, OSSL_ACTION_SET, (OSSL_PARAM *)params);
 }
 
 int evp_pkey_ctx_get_params_to_ctrl(EVP_PKEY_CTX *ctx, OSSL_PARAM *params)
 {
-    return evp_pkey_ctx_setget_params_to_ctrl(ctx, GET, params);
+    if (ctx->keymgmt != NULL)
+        return 0;
+    return evp_pkey_ctx_setget_params_to_ctrl(ctx, OSSL_ACTION_GET, params);
 }
 
 /* This must ONLY be called for legacy EVP_PKEYs */
 static int evp_pkey_setget_params_to_ctrl(const EVP_PKEY *pkey,
-                                          enum action action_type,
-                                          OSSL_PARAM *params)
+    enum action action_type,
+    OSSL_PARAM *params)
 {
     int ret = 1;
 
     for (; params != NULL && params->key != NULL; params++) {
-        struct translation_ctx_st ctx = { 0, };
-        struct translation_st tmpl = { 0, };
+        struct translation_ctx_st ctx = {
+            0,
+        };
+        struct translation_st tmpl = {
+            0,
+        };
         const struct translation_st *translation = NULL;
         fixup_args_fn *fixup = default_fixup_args;
 
@@ -2934,7 +2940,7 @@ static int evp_pkey_setget_params_to_ctrl(const EVP_PKEY *pkey,
          * support getting.
          */
         if (!ossl_assert(translation != NULL)
-            || !ossl_assert(translation->action_type == GET)
+            || !ossl_assert(translation->action_type == OSSL_ACTION_GET)
             || !ossl_assert(translation->fixup_args != NULL)) {
             return -2;
         }
@@ -2948,5 +2954,5 @@ static int evp_pkey_setget_params_to_ctrl(const EVP_PKEY *pkey,
 
 int evp_pkey_get_params_to_ctrl(const EVP_PKEY *pkey, OSSL_PARAM *params)
 {
-    return evp_pkey_setget_params_to_ctrl(pkey, GET, params);
+    return evp_pkey_setget_params_to_ctrl(pkey, OSSL_ACTION_GET, params);
 }
diff --git a/crypto/evp/dh_ctrl.c b/crypto/evp/dh_ctrl.c
index fee7757d9aee8..48f454cee2636 100644
--- a/crypto/evp/dh_ctrl.c
+++ b/crypto/evp/dh_ctrl.c
@@ -61,8 +61,8 @@ 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 ret;
     OSSL_PARAM params[2], *p = params;
@@ -71,7 +71,7 @@ int EVP_PKEY_CTX_set_dh_paramgen_seed(EVP_PKEY_CTX *ctx,
         return ret;
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_FFC_SEED,
-                                             (void *)seed, seedlen);
+        (void *)seed, seedlen);
     *p = OSSL_PARAM_construct_end();
 
     return evp_pkey_ctx_set_params_strict(ctx, params);
@@ -84,7 +84,7 @@ int EVP_PKEY_CTX_set_dh_paramgen_seed(EVP_PKEY_CTX *ctx,
 int EVP_PKEY_CTX_set_dh_paramgen_type(EVP_PKEY_CTX *ctx, int typ)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN,
-                             EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, typ, NULL);
+        EVP_PKEY_CTRL_DH_PARAMGEN_TYPE, typ, NULL);
 }
 
 int EVP_PKEY_CTX_set_dh_paramgen_prime_len(EVP_PKEY_CTX *ctx, int pbits)
@@ -137,7 +137,7 @@ int EVP_PKEY_CTX_set_dh_paramgen_generator(EVP_PKEY_CTX *ctx, int gen)
 int EVP_PKEY_CTX_set_dh_rfc5114(EVP_PKEY_CTX *ctx, int gen)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_PARAMGEN,
-                             EVP_PKEY_CTRL_DH_RFC5114, gen, NULL);
+        EVP_PKEY_CTRL_DH_RFC5114, gen, NULL);
 }
 
 int EVP_PKEY_CTX_set_dhx_rfc5114(EVP_PKEY_CTX *ctx, int gen)
@@ -152,8 +152,8 @@ int EVP_PKEY_CTX_set_dhx_rfc5114(EVP_PKEY_CTX *ctx, int gen)
 int EVP_PKEY_CTX_set_dh_nid(EVP_PKEY_CTX *ctx, int nid)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH,
-                             EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
-                             EVP_PKEY_CTRL_DH_NID, nid, NULL);
+        EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_DH_NID, nid, NULL);
 }
 
 int EVP_PKEY_CTX_set_dh_pad(EVP_PKEY_CTX *ctx, int pad)
@@ -180,7 +180,7 @@ int EVP_PKEY_CTX_set_dh_pad(EVP_PKEY_CTX *ctx, int pad)
 int EVP_PKEY_CTX_set_dh_kdf_type(EVP_PKEY_CTX *ctx, int kdf)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
-                             EVP_PKEY_CTRL_DH_KDF_TYPE, kdf, NULL);
+        EVP_PKEY_CTRL_DH_KDF_TYPE, kdf, NULL);
 }
 
 /*
@@ -190,7 +190,7 @@ int EVP_PKEY_CTX_set_dh_kdf_type(EVP_PKEY_CTX *ctx, int kdf)
 int EVP_PKEY_CTX_get_dh_kdf_type(EVP_PKEY_CTX *ctx)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
-                             EVP_PKEY_CTRL_DH_KDF_TYPE, -2, NULL);
+        EVP_PKEY_CTRL_DH_KDF_TYPE, -2, NULL);
 }
 
 /*
@@ -200,7 +200,7 @@ int EVP_PKEY_CTX_get_dh_kdf_type(EVP_PKEY_CTX *ctx)
 int EVP_PKEY_CTX_set0_dh_kdf_oid(EVP_PKEY_CTX *ctx, ASN1_OBJECT *oid)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
-                             EVP_PKEY_CTRL_DH_KDF_OID, 0, (void *)(oid));
+        EVP_PKEY_CTRL_DH_KDF_OID, 0, (void *)(oid));
 }
 
 /*
@@ -210,7 +210,7 @@ int EVP_PKEY_CTX_set0_dh_kdf_oid(EVP_PKEY_CTX *ctx, ASN1_OBJECT *oid)
 int EVP_PKEY_CTX_get0_dh_kdf_oid(EVP_PKEY_CTX *ctx, ASN1_OBJECT **oid)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
-                             EVP_PKEY_CTRL_GET_DH_KDF_OID, 0, (void *)(oid));
+        EVP_PKEY_CTRL_GET_DH_KDF_OID, 0, (void *)(oid));
 }
 
 /*
@@ -220,7 +220,7 @@ int EVP_PKEY_CTX_get0_dh_kdf_oid(EVP_PKEY_CTX *ctx, ASN1_OBJECT **oid)
 int EVP_PKEY_CTX_set_dh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
-                             EVP_PKEY_CTRL_DH_KDF_MD, 0, (void *)(md));
+        EVP_PKEY_CTRL_DH_KDF_MD, 0, (void *)(md));
 }
 
 /*
@@ -229,8 +229,8 @@ int EVP_PKEY_CTX_set_dh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
  */
 int EVP_PKEY_CTX_get_dh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD **pmd)
 {
-        return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
-                                 EVP_PKEY_CTRL_GET_DH_KDF_MD, 0, (void *)(pmd));
+    return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_GET_DH_KDF_MD, 0, (void *)(pmd));
 }
 
 int EVP_PKEY_CTX_set_dh_kdf_outlen(EVP_PKEY_CTX *ctx, int outlen)
@@ -253,7 +253,7 @@ int EVP_PKEY_CTX_set_dh_kdf_outlen(EVP_PKEY_CTX *ctx, int outlen)
     }
 
     *p++ = OSSL_PARAM_construct_size_t(OSSL_EXCHANGE_PARAM_KDF_OUTLEN,
-                                       &len);
+        &len);
     *p = OSSL_PARAM_construct_end();
 
     ret = evp_pkey_ctx_set_params_strict(ctx, params);
@@ -273,7 +273,7 @@ int EVP_PKEY_CTX_get_dh_kdf_outlen(EVP_PKEY_CTX *ctx, int *plen)
         return ret;
 
     *p++ = OSSL_PARAM_construct_size_t(OSSL_EXCHANGE_PARAM_KDF_OUTLEN,
-                                       &len);
+        &len);
     *p = OSSL_PARAM_construct_end();
 
     ret = evp_pkey_ctx_get_params_strict(ctx, params);
@@ -300,12 +300,12 @@ int EVP_PKEY_CTX_set0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char *ukm, int len)
         return ret;
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_EXCHANGE_PARAM_KDF_UKM,
-                                            /*
-                                             * Cast away the const. This is read
-                                             * only so should be safe
-                                             */
-                                            (void *)ukm,
-                                            (size_t)len);
+        /*
+         * Cast away the const. This is read
+         * only so should be safe
+         */
+        (void *)ukm,
+        (size_t)len);
     *p = OSSL_PARAM_construct_end();
 
     ret = evp_pkey_ctx_set_params_strict(ctx, params);
@@ -328,7 +328,7 @@ int EVP_PKEY_CTX_get0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **pukm)
         return ret;
 
     *p++ = OSSL_PARAM_construct_octet_ptr(OSSL_EXCHANGE_PARAM_KDF_UKM,
-                                          (void **)pukm, 0);
+        (void **)pukm, 0);
     *p = OSSL_PARAM_construct_end();
 
     ret = evp_pkey_ctx_get_params_strict(ctx, params);
diff --git a/crypto/evp/dh_support.c b/crypto/evp/dh_support.c
index d2472874221a4..257a83b58e4f3 100644
--- a/crypto/evp/dh_support.c
+++ b/crypto/evp/dh_support.c
@@ -21,11 +21,11 @@ typedef struct dh_name2id_st {
 /* Indicates that the paramgen_type can be used for either DH or DHX */
 #define TYPE_ANY -1
 #ifndef OPENSSL_NO_DH
-# define TYPE_DH    DH_FLAG_TYPE_DH
-# define TYPE_DHX   DH_FLAG_TYPE_DHX
+#define TYPE_DH DH_FLAG_TYPE_DH
+#define TYPE_DHX DH_FLAG_TYPE_DHX
 #else
-# define TYPE_DH    0
-# define TYPE_DHX   0
+#define TYPE_DH 0
+#define TYPE_DHX 0
 #endif
 
 static const DH_GENTYPE_NAME2ID dhtype2id[] = {
@@ -53,7 +53,7 @@ int ossl_dh_gen_type_name2id(const char *name, int type)
 
     for (i = 0; i < OSSL_NELEM(dhtype2id); ++i) {
         if ((dhtype2id[i].type == TYPE_ANY
-             || type == dhtype2id[i].type)
+                || type == dhtype2id[i].type)
             && strcmp(dhtype2id[i].name, name) == 0)
             return dhtype2id[i].id;
     }
diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index 6fc201bcfe25b..4b1c95c4abe3b 100644
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -15,7 +15,7 @@
 #include <openssl/evp.h>
 #include <openssl/ec.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include <openssl/params.h>
 #include <openssl/core_names.h>
@@ -30,11 +30,11 @@ static void cleanup_old_md_data(EVP_MD_CTX *ctx, int force)
 {
     if (ctx->digest != NULL) {
         if (ctx->digest->cleanup != NULL
-                && !EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_CLEANED))
+            && !EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_CLEANED))
             ctx->digest->cleanup(ctx);
         if (ctx->md_data != NULL && ctx->digest->ctx_size > 0
-                && (!EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_REUSE)
-                    || force)) {
+            && (!EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_REUSE)
+                || force)) {
             OPENSSL_clear_free(ctx->md_data, ctx->digest->ctx_size);
             ctx->md_data = NULL;
         }
@@ -102,7 +102,7 @@ int EVP_MD_CTX_reset(EVP_MD_CTX *ctx)
 
 #ifndef FIPS_MODULE
 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)
 {
     EVP_MD_CTX *ctx;
     EVP_PKEY_CTX *pctx = NULL;
@@ -119,7 +119,7 @@ EVP_MD_CTX *evp_md_ctx_new_ex(EVP_PKEY *pkey, const ASN1_OCTET_STRING *id,
     EVP_MD_CTX_set_pkey_ctx(ctx, pctx);
     return ctx;
 
- err:
+err:
     EVP_PKEY_CTX_free(pctx);
     EVP_MD_CTX_free(ctx);
     return NULL;
@@ -155,7 +155,7 @@ int evp_md_ctx_free_algctx(EVP_MD_CTX *ctx)
 }
 
 static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
-                                const OSSL_PARAM params[], ENGINE *impl)
+    const OSSL_PARAM params[], ENGINE *impl)
 {
 #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
     ENGINE *tmpimpl = NULL;
@@ -163,8 +163,8 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
 
 #if !defined(FIPS_MODULE)
     if (ctx->pctx != NULL
-            && EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
-            && ctx->pctx->op.sig.algctx != NULL) {
+        && EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
+        && ctx->pctx->op.sig.algctx != NULL) {
         /*
          * Prior to OpenSSL 3.0 calling EVP_DigestInit_ex() on an mdctx
          * previously initialised with EVP_DigestSignInit() would retain
@@ -180,8 +180,7 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
     }
 #endif
 
-    EVP_MD_CTX_clear_flags(ctx, EVP_MD_CTX_FLAG_CLEANED
-                                | EVP_MD_CTX_FLAG_FINALISED);
+    EVP_MD_CTX_clear_flags(ctx, EVP_MD_CTX_FLAG_CLEANED | EVP_MD_CTX_FLAG_FINALISED);
 
     if (type != NULL) {
         ctx->reqdigest = type;
@@ -202,8 +201,8 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
      * reinitialisation, when it may all be unnecessary.
      */
     if (ctx->engine != NULL
-            && ctx->digest != NULL
-            && type->type == ctx->digest->type)
+        && ctx->digest != NULL
+        && type->type == ctx->digest->type)
         goto skip_to_init;
 
     /*
@@ -224,15 +223,15 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
      */
     if (impl != NULL
 #if !defined(OPENSSL_NO_ENGINE)
-            || ctx->engine != NULL
-# if !defined(FIPS_MODULE)
-            || tmpimpl != NULL
-# endif
+        || ctx->engine != NULL
+#if !defined(FIPS_MODULE)
+        || tmpimpl != NULL
+#endif
 #endif
-            || (ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0
-            || (type != NULL && type->origin == EVP_ORIG_METH)
-            || (type == NULL && ctx->digest != NULL
-                             && ctx->digest->origin == EVP_ORIG_METH)) {
+        || (ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0
+        || (type != NULL && type->origin == EVP_ORIG_METH)
+        || (type == NULL && ctx->digest != NULL
+            && ctx->digest->origin == EVP_ORIG_METH)) {
         /* If we were using provided hash before, cleanup algctx */
         if (!evp_md_ctx_free_algctx(ctx))
             return 0;
@@ -264,8 +263,9 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
 #else
         /* The NULL digest is a special case */
         EVP_MD *provmd = EVP_MD_fetch(NULL,
-                                      type->type != NID_undef ? OBJ_nid2sn(type->type)
-                                                              : "NULL", "");
+            type->type != NID_undef ? OBJ_nid2sn(type->type)
+                                    : "NULL",
+            "");
 
         if (provmd == NULL) {
             ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -302,7 +302,7 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
     return ctx->digest->dinit(ctx->algctx, params);
 
     /* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
 
 #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
     if (type) {
@@ -347,15 +347,15 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
         }
     }
 #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
- skip_to_init:
+skip_to_init:
 #endif
 #ifndef FIPS_MODULE
     if (ctx->pctx != NULL
-            && (!EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
-                 || ctx->pctx->op.sig.signature == NULL)) {
+        && (!EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
+            || ctx->pctx->op.sig.signature == NULL)) {
         int r;
         r = EVP_PKEY_CTX_ctrl(ctx->pctx, -1, EVP_PKEY_OP_TYPE_SIG,
-                              EVP_PKEY_CTRL_DIGESTINIT, 0, ctx);
+            EVP_PKEY_CTRL_DIGESTINIT, 0, ctx);
         if (r <= 0 && (r != -2))
             return 0;
     }
@@ -366,7 +366,7 @@ static int evp_md_init_internal(EVP_MD_CTX *ctx, const EVP_MD *type,
 }
 
 int EVP_DigestInit_ex2(EVP_MD_CTX *ctx, const EVP_MD *type,
-                       const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return evp_md_init_internal(ctx, type, params, NULL);
 }
@@ -393,8 +393,8 @@ int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data, size_t count)
     }
 
     if (ctx->pctx != NULL
-            && EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
-            && ctx->pctx->op.sig.algctx != NULL) {
+        && EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx->pctx)
+        && ctx->pctx->op.sig.algctx != NULL) {
 #ifndef FIPS_MODULE
         /*
          * Prior to OpenSSL 3.0 EVP_DigestSignUpdate() and
@@ -414,8 +414,8 @@ int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data, size_t count)
     }
 
     if (ctx->digest == NULL
-            || ctx->digest->prov == NULL
-            || (ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0)
+        || ctx->digest->prov == NULL
+        || (ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0)
         goto legacy;
 
     if (ctx->digest->dupdate == NULL) {
@@ -425,7 +425,7 @@ int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data, size_t count)
     return ctx->digest->dupdate(ctx->algctx, data, count);
 
     /* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
     return ctx->update != NULL ? ctx->update(ctx, data, count) : 0;
 }
 
@@ -481,7 +481,7 @@ int EVP_DigestFinal_ex(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *isize)
     return ret;
 
     /* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
     OPENSSL_assert(mdsize <= EVP_MAX_MD_SIZE);
     ret = ctx->digest->final(ctx, md);
     if (isize != NULL)
@@ -609,7 +609,7 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
     }
 
     if (in->digest->prov == NULL
-            || (in->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0)
+        || (in->flags & EVP_MD_CTX_FLAG_NO_INIT) != 0)
         goto legacy;
 
     if (in->digest->dupctx == NULL) {
@@ -650,7 +650,7 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
         }
     }
 
- clone_pkey:
+clone_pkey:
     /* copied EVP_MD_CTX should free the copied EVP_PKEY_CTX */
     EVP_MD_CTX_clear_flags(out, EVP_MD_CTX_FLAG_KEEP_PKEY_CTX);
 #ifndef FIPS_MODULE
@@ -667,7 +667,7 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
     return 1;
 
     /* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
 #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
     /* Make sure it's safe to copy a digest context using an ENGINE */
     if (in->engine && !ENGINE_init(in->engine)) {
@@ -724,8 +724,8 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in)
 }
 
 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)
 {
     EVP_MD_CTX *ctx = EVP_MD_CTX_new();
     int ret;
@@ -742,8 +742,8 @@ int EVP_Digest(const void *data, size_t count,
 }
 
 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 void *data, size_t datalen,
+    unsigned char *md, size_t *mdlen)
 {
     EVP_MD *digest = EVP_MD_fetch(libctx, name, propq);
     unsigned int temp = 0;
@@ -769,7 +769,7 @@ const OSSL_PARAM *EVP_MD_gettable_params(const EVP_MD *digest)
 {
     if (digest != NULL && digest->gettable_params != NULL)
         return digest->gettable_params(
-                           ossl_provider_ctx(EVP_MD_get0_provider(digest)));
+            ossl_provider_ctx(EVP_MD_get0_provider(digest)));
     return NULL;
 }
 
@@ -779,12 +779,12 @@ int EVP_MD_CTX_set_params(EVP_MD_CTX *ctx, const OSSL_PARAM params[])
 
     /* If we have a pctx then we should try that first */
     if (pctx != NULL
-            && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
-                || pctx->operation == EVP_PKEY_OP_SIGNCTX)
-            && pctx->op.sig.algctx != NULL
-            && pctx->op.sig.signature->set_ctx_md_params != NULL)
+        && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
+            || pctx->operation == EVP_PKEY_OP_SIGNCTX)
+        && pctx->op.sig.algctx != NULL
+        && pctx->op.sig.signature->set_ctx_md_params != NULL)
         return pctx->op.sig.signature->set_ctx_md_params(pctx->op.sig.algctx,
-                                                         params);
+            params);
 
     if (ctx->digest != NULL && ctx->digest->set_ctx_params != NULL)
         return ctx->digest->set_ctx_params(ctx->algctx, params);
@@ -814,12 +814,12 @@ const OSSL_PARAM *EVP_MD_CTX_settable_params(EVP_MD_CTX *ctx)
     /* If we have a pctx then we should try that first */
     pctx = ctx->pctx;
     if (pctx != NULL
-            && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
-                || pctx->operation == EVP_PKEY_OP_SIGNCTX)
-            && pctx->op.sig.algctx != NULL
-            && pctx->op.sig.signature->settable_ctx_md_params != NULL)
+        && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
+            || pctx->operation == EVP_PKEY_OP_SIGNCTX)
+        && pctx->op.sig.algctx != NULL
+        && pctx->op.sig.signature->settable_ctx_md_params != NULL)
         return pctx->op.sig.signature->settable_ctx_md_params(
-                   pctx->op.sig.algctx);
+            pctx->op.sig.algctx);
 
     if (ctx->digest != NULL && ctx->digest->settable_ctx_params != NULL) {
         alg = ossl_provider_ctx(EVP_MD_get0_provider(ctx->digest));
@@ -835,12 +835,12 @@ int EVP_MD_CTX_get_params(EVP_MD_CTX *ctx, OSSL_PARAM params[])
 
     /* If we have a pctx then we should try that first */
     if (pctx != NULL
-            && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
-                || pctx->operation == EVP_PKEY_OP_SIGNCTX)
-            && pctx->op.sig.algctx != NULL
-            && pctx->op.sig.signature->get_ctx_md_params != NULL)
+        && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
+            || pctx->operation == EVP_PKEY_OP_SIGNCTX)
+        && pctx->op.sig.algctx != NULL
+        && pctx->op.sig.signature->get_ctx_md_params != NULL)
         return pctx->op.sig.signature->get_ctx_md_params(pctx->op.sig.algctx,
-                                                         params);
+            params);
 
     if (ctx->digest != NULL && ctx->digest->get_ctx_params != NULL)
         return ctx->digest->get_ctx_params(ctx->algctx, params);
@@ -870,12 +870,12 @@ const OSSL_PARAM *EVP_MD_CTX_gettable_params(EVP_MD_CTX *ctx)
     /* If we have a pctx then we should try that first */
     pctx = ctx->pctx;
     if (pctx != NULL
-            && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
-                || pctx->operation == EVP_PKEY_OP_SIGNCTX)
-            && pctx->op.sig.algctx != NULL
-            && pctx->op.sig.signature->gettable_ctx_md_params != NULL)
+        && (pctx->operation == EVP_PKEY_OP_VERIFYCTX
+            || pctx->operation == EVP_PKEY_OP_SIGNCTX)
+        && pctx->op.sig.algctx != NULL
+        && pctx->op.sig.signature->gettable_ctx_md_params != NULL)
         return pctx->op.sig.signature->gettable_ctx_md_params(
-                    pctx->op.sig.algctx);
+            pctx->op.sig.algctx);
 
     if (ctx->digest != NULL && ctx->digest->gettable_ctx_params != NULL) {
         provctx = ossl_provider_ctx(EVP_MD_get0_provider(ctx->digest));
@@ -907,11 +907,11 @@ int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
     case EVP_MD_CTRL_MICALG:
         set_params = 0;
         params[0] = OSSL_PARAM_construct_utf8_string(OSSL_DIGEST_PARAM_MICALG,
-                                                     p2, p1 ? p1 : 9999);
+            p2, p1 ? p1 : 9999);
         break;
     case EVP_CTRL_SSL3_MASTER_SECRET:
         params[0] = OSSL_PARAM_construct_octet_string(OSSL_DIGEST_PARAM_SSL3_MS,
-                                                      p2, p1);
+            p2, p1);
         break;
     default:
         goto conclude;
@@ -923,16 +923,15 @@ int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
         ret = EVP_MD_CTX_get_params(ctx, params);
     goto conclude;
 
-
     /* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
     if (ctx->digest->md_ctrl == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_CTRL_NOT_IMPLEMENTED);
         return 0;
     }
 
     ret = ctx->digest->md_ctrl(ctx, cmd, p1, p2);
- conclude:
+conclude:
     if (ret <= 0)
         return 0;
     return ret;
@@ -966,7 +965,7 @@ static void set_legacy_nid(const char *name, void *vlegacy_nid)
      */
     const void *legacy_method = OBJ_NAME_get(name, OBJ_NAME_TYPE_MD_METH);
 
-    if (*legacy_nid == -1)       /* We found a clash already */
+    if (*legacy_nid == -1) /* We found a clash already */
         return;
 
     if (legacy_method == NULL)
@@ -996,7 +995,7 @@ static int evp_md_cache_constants(EVP_MD *md)
     params[1] = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_SIZE, &mdsize);
     params[2] = OSSL_PARAM_construct_int(OSSL_DIGEST_PARAM_XOF, &xof);
     params[3] = OSSL_PARAM_construct_int(OSSL_DIGEST_PARAM_ALGID_ABSENT,
-                                         &algid_absent);
+        &algid_absent);
     params[4] = OSSL_PARAM_construct_end();
     ok = evp_do_md_getparams(md, params) > 0;
     if (mdsize > INT_MAX || blksz > INT_MAX)
@@ -1013,8 +1012,8 @@ static int evp_md_cache_constants(EVP_MD *md)
 }
 
 static void *evp_md_from_algorithm(int name_id,
-                                   const OSSL_ALGORITHM *algodef,
-                                   OSSL_PROVIDER *prov)
+    const OSSL_ALGORITHM *algodef,
+    OSSL_PROVIDER *prov)
 {
     const OSSL_DISPATCH *fns = algodef->implementation;
     EVP_MD *md = NULL;
@@ -1029,7 +1028,7 @@ static void *evp_md_from_algorithm(int name_id,
 #ifndef FIPS_MODULE
     md->type = NID_undef;
     if (!evp_names_do_all(prov, name_id, set_legacy_nid, &md->type)
-            || md->type == -1) {
+        || md->type == -1) {
         ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -1106,18 +1105,15 @@ static void *evp_md_from_algorithm(int name_id,
             break;
         case OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS:
             if (md->settable_ctx_params == NULL)
-                md->settable_ctx_params =
-                    OSSL_FUNC_digest_settable_ctx_params(fns);
+                md->settable_ctx_params = OSSL_FUNC_digest_settable_ctx_params(fns);
             break;
         case OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS:
             if (md->gettable_ctx_params == NULL)
-                md->gettable_ctx_params =
-                    OSSL_FUNC_digest_gettable_ctx_params(fns);
+                md->gettable_ctx_params = OSSL_FUNC_digest_gettable_ctx_params(fns);
             break;
         case OSSL_FUNC_DIGEST_COPYCTX:
             if (md->copyctx == NULL)
-                md->copyctx =
-                    OSSL_FUNC_digest_copyctx(fns);
+                md->copyctx = OSSL_FUNC_digest_copyctx(fns);
             break;
         }
     }
@@ -1160,11 +1156,10 @@ static void evp_md_free(void *md)
 }
 
 EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                     const char *properties)
+    const char *properties)
 {
-    EVP_MD *md =
-        evp_generic_fetch(ctx, OSSL_OP_DIGEST, algorithm, properties,
-                          evp_md_from_algorithm, evp_md_up_ref, evp_md_free);
+    EVP_MD *md = evp_generic_fetch(ctx, OSSL_OP_DIGEST, algorithm, properties,
+        evp_md_from_algorithm, evp_md_up_ref, evp_md_free);
 
     return md;
 }
@@ -1192,23 +1187,23 @@ void EVP_MD_free(EVP_MD *md)
 }
 
 void EVP_MD_do_all_provided(OSSL_LIB_CTX *libctx,
-                            void (*fn)(EVP_MD *mac, void *arg),
-                            void *arg)
+    void (*fn)(EVP_MD *mac, void *arg),
+    void *arg)
 {
     evp_generic_do_all(libctx, OSSL_OP_DIGEST,
-                       (void (*)(void *, void *))fn, arg,
-                       evp_md_from_algorithm, evp_md_up_ref, evp_md_free);
+        (void (*)(void *, void *))fn, arg,
+        evp_md_from_algorithm, evp_md_up_ref, evp_md_free);
 }
 
 EVP_MD *evp_digest_fetch_from_prov(OSSL_PROVIDER *prov,
-                                   const char *algorithm,
-                                   const char *properties)
+    const char *algorithm,
+    const char *properties)
 {
     return evp_generic_fetch_from_prov(prov, OSSL_OP_DIGEST,
-                                       algorithm, properties,
-                                       evp_md_from_algorithm,
-                                       evp_md_up_ref,
-                                       evp_md_free);
+        algorithm, properties,
+        evp_md_from_algorithm,
+        evp_md_up_ref,
+        evp_md_free);
 }
 
 typedef struct {
@@ -1217,21 +1212,21 @@ typedef struct {
 } ossl_hmacmd_pair;
 
 static const ossl_hmacmd_pair ossl_hmacmd_pairs[] = {
-    {NID_sha1, NID_hmacWithSHA1},
-    {NID_md5, NID_hmacWithMD5},
-    {NID_sha224, NID_hmacWithSHA224},
-    {NID_sha256, NID_hmacWithSHA256},
-    {NID_sha384, NID_hmacWithSHA384},
-    {NID_sha512, NID_hmacWithSHA512},
-    {NID_id_GostR3411_94, NID_id_HMACGostR3411_94},
-    {NID_id_GostR3411_2012_256, NID_id_tc26_hmac_gost_3411_2012_256},
-    {NID_id_GostR3411_2012_512, NID_id_tc26_hmac_gost_3411_2012_512},
-    {NID_sha3_224, NID_hmac_sha3_224},
-    {NID_sha3_256, NID_hmac_sha3_256},
-    {NID_sha3_384, NID_hmac_sha3_384},
-    {NID_sha3_512, NID_hmac_sha3_512},
-    {NID_sha512_224, NID_hmacWithSHA512_224},
-    {NID_sha512_256, NID_hmacWithSHA512_256}
+    { NID_sha1, NID_hmacWithSHA1 },
+    { NID_md5, NID_hmacWithMD5 },
+    { NID_sha224, NID_hmacWithSHA224 },
+    { NID_sha256, NID_hmacWithSHA256 },
+    { NID_sha384, NID_hmacWithSHA384 },
+    { NID_sha512, NID_hmacWithSHA512 },
+    { NID_id_GostR3411_94, NID_id_HMACGostR3411_94 },
+    { NID_id_GostR3411_2012_256, NID_id_tc26_hmac_gost_3411_2012_256 },
+    { NID_id_GostR3411_2012_512, NID_id_tc26_hmac_gost_3411_2012_512 },
+    { NID_sha3_224, NID_hmac_sha3_224 },
+    { NID_sha3_256, NID_hmac_sha3_256 },
+    { NID_sha3_384, NID_hmac_sha3_384 },
+    { NID_sha3_512, NID_hmac_sha3_512 },
+    { NID_sha512_224, NID_hmacWithSHA512_224 },
+    { NID_sha512_256, NID_hmacWithSHA512_256 }
 };
 
 int ossl_hmac2mdnid(int hmac_nid)
diff --git a/crypto/evp/dsa_ctrl.c b/crypto/evp/dsa_ctrl.c
index 531a21fa8d4d1..af1b055ee44e4 100644
--- a/crypto/evp/dsa_ctrl.c
+++ b/crypto/evp/dsa_ctrl.c
@@ -36,7 +36,7 @@ int EVP_PKEY_CTX_set_dsa_paramgen_type(EVP_PKEY_CTX *ctx, const char *name)
         return ret;
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_TYPE,
-                                            (char *)name, 0);
+        (char *)name, 0);
     *p++ = OSSL_PARAM_construct_end();
 
     return EVP_PKEY_CTX_set_params(ctx, params);
@@ -57,8 +57,8 @@ int EVP_PKEY_CTX_set_dsa_paramgen_gindex(EVP_PKEY_CTX *ctx, int gindex)
 }
 
 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 ret;
     OSSL_PARAM params[2], *p = params;
@@ -67,7 +67,7 @@ int EVP_PKEY_CTX_set_dsa_paramgen_seed(EVP_PKEY_CTX *ctx,
         return ret;
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_FFC_SEED,
-                                             (void *)seed, seedlen);
+        (void *)seed, seedlen);
     *p++ = OSSL_PARAM_construct_end();
 
     return EVP_PKEY_CTX_set_params(ctx, params);
@@ -104,8 +104,8 @@ 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 ret;
     OSSL_PARAM params[3], *p = params;
@@ -114,10 +114,10 @@ int EVP_PKEY_CTX_set_dsa_paramgen_md_props(EVP_PKEY_CTX *ctx,
         return ret;
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_DIGEST,
-                                            (char *)md_name, 0);
+        (char *)md_name, 0);
     if (md_properties != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_DIGEST_PROPS,
-                                                (char *)md_properties, 0);
+            (char *)md_properties, 0);
     *p++ = OSSL_PARAM_construct_end();
 
     return EVP_PKEY_CTX_set_params(ctx, params);
@@ -127,6 +127,6 @@ int EVP_PKEY_CTX_set_dsa_paramgen_md_props(EVP_PKEY_CTX *ctx,
 int EVP_PKEY_CTX_set_dsa_paramgen_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN,
-                             EVP_PKEY_CTRL_DSA_PARAMGEN_MD, 0, (void *)(md));
+        EVP_PKEY_CTRL_DSA_PARAMGEN_MD, 0, (void *)(md));
 }
 #endif
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 10abb7d52cfad..5ce981958eb45 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -45,17 +45,17 @@ typedef struct {
     union {
         OSSL_UNION_ALIGN;
         AES_KEY ks;
-    } ks;                       /* AES key schedule to use */
-    int key_set;                /* Set if key initialised */
-    int iv_set;                 /* Set if an iv is set */
+    } ks; /* AES key schedule to use */
+    int key_set; /* Set if key initialised */
+    int iv_set; /* Set if an iv is set */
     GCM128_CONTEXT gcm;
-    unsigned char *iv;          /* Temporary IV store */
-    int ivlen;                  /* IV length */
+    unsigned char *iv; /* Temporary IV store */
+    int ivlen; /* IV length */
     int taglen;
-    int iv_gen;                 /* It is OK to generate IVs */
-    int iv_gen_rand;            /* No IV was specified, so generate a rand IV */
-    int tls_aad_len;            /* TLS AAD length */
-    uint64_t tls_enc_records;   /* Number of TLS records encrypted */
+    int iv_gen; /* It is OK to generate IVs */
+    int iv_gen_rand; /* No IV was specified, so generate a rand IV */
+    int tls_aad_len; /* TLS AAD length */
+    uint64_t tls_enc_records; /* Number of TLS records encrypted */
     ctr128_f ctr;
 } EVP_AES_GCM_CTX;
 
@@ -63,12 +63,12 @@ typedef struct {
     union {
         OSSL_UNION_ALIGN;
         AES_KEY ks;
-    } ks1, ks2;                 /* AES key schedules to use */
+    } ks1, ks2; /* AES key schedules to use */
     XTS128_CONTEXT xts;
-    void (*stream) (const unsigned char *in,
-                    unsigned char *out, size_t length,
-                    const AES_KEY *key1, const AES_KEY *key2,
-                    const unsigned char iv[16]);
+    void (*stream)(const unsigned char *in,
+        unsigned char *out, size_t length,
+        const AES_KEY *key1, const AES_KEY *key2,
+        const unsigned char iv[16]);
 } EVP_AES_XTS_CTX;
 
 #ifdef FIPS_MODULE
@@ -81,13 +81,13 @@ typedef struct {
     union {
         OSSL_UNION_ALIGN;
         AES_KEY ks;
-    } ks;                       /* AES key schedule to use */
-    int key_set;                /* Set if key initialised */
-    int iv_set;                 /* Set if an iv is set */
-    int tag_set;                /* Set if tag is valid */
-    int len_set;                /* Set if message length set */
-    int L, M;                   /* L and M parameters from RFC3610 */
-    int tls_aad_len;            /* TLS AAD length */
+    } ks; /* AES key schedule to use */
+    int key_set; /* Set if key initialised */
+    int iv_set; /* Set if an iv is set */
+    int tag_set; /* Set if tag is valid */
+    int len_set; /* Set if message length set */
+    int L, M; /* L and M parameters from RFC3610 */
+    int tls_aad_len; /* TLS AAD length */
     CCM128_CONTEXT ccm;
     ccm128_f str;
 } EVP_AES_CCM_CTX;
@@ -97,26 +97,26 @@ typedef struct {
     union {
         OSSL_UNION_ALIGN;
         AES_KEY ks;
-    } ksenc;                    /* AES key schedule to use for encryption */
+    } ksenc; /* AES key schedule to use for encryption */
     union {
         OSSL_UNION_ALIGN;
         AES_KEY ks;
-    } ksdec;                    /* AES key schedule to use for decryption */
-    int key_set;                /* Set if key initialised */
-    int iv_set;                 /* Set if an iv is set */
+    } ksdec; /* AES key schedule to use for decryption */
+    int key_set; /* Set if key initialised */
+    int iv_set; /* Set if an iv is set */
     OCB128_CONTEXT ocb;
-    unsigned char *iv;          /* Temporary IV store */
+    unsigned char *iv; /* Temporary IV store */
     unsigned char tag[16];
     unsigned char data_buf[16]; /* Store partial data blocks */
-    unsigned char aad_buf[16];  /* Store partial AAD blocks */
+    unsigned char aad_buf[16]; /* Store partial AAD blocks */
     int data_buf_len;
     int aad_buf_len;
-    int ivlen;                  /* IV length */
+    int ivlen; /* IV length */
     int taglen;
 } EVP_AES_OCB_CTX;
 #endif
 
-#define MAXBITCHUNK     ((size_t)1<<(sizeof(size_t)*8-4))
+#define MAXBITCHUNK ((size_t)1 << (sizeof(size_t) * 8 - 4))
 
 /* increment counter (64-bit int) by 1 */
 static void ctr64_inc(unsigned char *counter)
@@ -135,17 +135,16 @@ static void ctr64_inc(unsigned char *counter)
 }
 
 #if defined(AESNI_CAPABLE)
-# if defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
-#  define AES_GCM_ASM2(gctx)      (gctx->gcm.block==(block128_f)aesni_encrypt && \
-                                 gctx->gcm.ghash==gcm_ghash_avx)
-#  undef AES_GCM_ASM2          /* minor size optimization */
-# endif
+#if defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
+#define AES_GCM_ASM2(gctx) (gctx->gcm.block == (block128_f)aesni_encrypt && gctx->gcm.ghash == gcm_ghash_avx)
+#undef AES_GCM_ASM2 /* minor size optimization */
+#endif
 
 static int aesni_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                          const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int ret, mode;
-    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
     const int keylen = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
 
     if (keylen <= 0) {
@@ -156,16 +155,15 @@ static int aesni_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
         && !enc) {
         ret = aesni_set_decrypt_key(key, keylen, &dat->ks.ks);
-        dat->block = (block128_f) aesni_decrypt;
-        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-            (cbc128_f) aesni_cbc_encrypt : NULL;
+        dat->block = (block128_f)aesni_decrypt;
+        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)aesni_cbc_encrypt : NULL;
     } else {
         ret = aesni_set_encrypt_key(key, keylen, &dat->ks.ks);
-        dat->block = (block128_f) aesni_encrypt;
+        dat->block = (block128_f)aesni_encrypt;
         if (mode == EVP_CIPH_CBC_MODE)
-            dat->stream.cbc = (cbc128_f) aesni_cbc_encrypt;
+            dat->stream.cbc = (cbc128_f)aesni_cbc_encrypt;
         else if (mode == EVP_CIPH_CTR_MODE)
-            dat->stream.ctr = (ctr128_f) aesni_ctr32_encrypt_blocks;
+            dat->stream.ctr = (ctr128_f)aesni_ctr32_encrypt_blocks;
         else
             dat->stream.cbc = NULL;
     }
@@ -179,50 +177,50 @@ static int aesni_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static int aesni_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    aesni_cbc_encrypt(in, out, len, &EVP_C_DATA(EVP_AES_KEY,ctx)->ks.ks,
-                      ctx->iv, EVP_CIPHER_CTX_is_encrypting(ctx));
+    aesni_cbc_encrypt(in, out, len, &EVP_C_DATA(EVP_AES_KEY, ctx)->ks.ks,
+        ctx->iv, EVP_CIPHER_CTX_is_encrypting(ctx));
 
     return 1;
 }
 
 static int aesni_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     size_t bl = EVP_CIPHER_CTX_get_block_size(ctx);
 
     if (len < bl)
         return 1;
 
-    aesni_ecb_encrypt(in, out, len, &EVP_C_DATA(EVP_AES_KEY,ctx)->ks.ks,
-                      EVP_CIPHER_CTX_is_encrypting(ctx));
+    aesni_ecb_encrypt(in, out, len, &EVP_C_DATA(EVP_AES_KEY, ctx)->ks.ks,
+        EVP_CIPHER_CTX_is_encrypting(ctx));
 
     return 1;
 }
 
-# define aesni_ofb_cipher aes_ofb_cipher
+#define aesni_ofb_cipher aes_ofb_cipher
 static int aesni_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define aesni_cfb_cipher aes_cfb_cipher
+#define aesni_cfb_cipher aes_cfb_cipher
 static int aesni_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define aesni_cfb8_cipher aes_cfb8_cipher
+#define aesni_cfb8_cipher aes_cfb8_cipher
 static int aesni_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                             const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define aesni_cfb1_cipher aes_cfb1_cipher
+#define aesni_cfb1_cipher aes_cfb1_cipher
 static int aesni_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                             const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define aesni_ctr_cipher aes_ctr_cipher
+#define aesni_ctr_cipher aes_ctr_cipher
 static int aesni_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
 static int aesni_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                              const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, ctx);
 
@@ -237,8 +235,8 @@ static int aesni_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
             return 0;
         }
         aesni_set_encrypt_key(key, keylen, &gctx->ks.ks);
-        CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f) aesni_encrypt);
-        gctx->ctr = (ctr128_f) aesni_ctr32_encrypt_blocks;
+        CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f)aesni_encrypt);
+        gctx->ctr = (ctr128_f)aesni_ctr32_encrypt_blocks;
         /*
          * If we have an iv can set it directly, otherwise use saved IV.
          */
@@ -261,14 +259,14 @@ static int aesni_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     return 1;
 }
 
-# define aesni_gcm_cipher aes_gcm_cipher
+#define aesni_gcm_cipher aes_gcm_cipher
 static int aesni_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
 static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                              const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
-    EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX,ctx);
+    EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX, ctx);
 
     if (iv == NULL && key == NULL)
         return 1;
@@ -290,7 +288,7 @@ static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
          * See comment in aes_xts_init_key() below.
          */
         if ((!allow_insecure_decrypt || enc)
-                && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
+            && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
             ERR_raise(ERR_LIB_EVP, EVP_R_XTS_DUPLICATED_KEYS);
             return 0;
         }
@@ -298,16 +296,16 @@ static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         /* key_len is two AES keys */
         if (enc) {
             aesni_set_encrypt_key(key, bits, &xctx->ks1.ks);
-            xctx->xts.block1 = (block128_f) aesni_encrypt;
+            xctx->xts.block1 = (block128_f)aesni_encrypt;
             xctx->stream = aesni_xts_encrypt;
         } else {
             aesni_set_decrypt_key(key, bits, &xctx->ks1.ks);
-            xctx->xts.block1 = (block128_f) aesni_decrypt;
+            xctx->xts.block1 = (block128_f)aesni_decrypt;
             xctx->stream = aesni_xts_decrypt;
         }
 
         aesni_set_encrypt_key(key + bytes, bits, &xctx->ks2.ks);
-        xctx->xts.block2 = (block128_f) aesni_encrypt;
+        xctx->xts.block2 = (block128_f)aesni_encrypt;
 
         xctx->xts.key1 = &xctx->ks1;
     }
@@ -320,14 +318,14 @@ static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     return 1;
 }
 
-# define aesni_xts_cipher aes_xts_cipher
+#define aesni_xts_cipher aes_xts_cipher
 static int aesni_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
 static int aesni_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                              const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
-    EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX,ctx);
+    EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX, ctx);
 
     if (iv == NULL && key == NULL)
         return 1;
@@ -341,9 +339,8 @@ static int aesni_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         }
         aesni_set_encrypt_key(key, keylen, &cctx->ks.ks);
         CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
-                           &cctx->ks, (block128_f) aesni_encrypt);
-        cctx->str = enc ? (ccm128_f) aesni_ccm64_encrypt_blocks :
-            (ccm128_f) aesni_ccm64_decrypt_blocks;
+            &cctx->ks, (block128_f)aesni_encrypt);
+        cctx->str = enc ? (ccm128_f)aesni_ccm64_encrypt_blocks : (ccm128_f)aesni_ccm64_decrypt_blocks;
         cctx->key_set = 1;
     }
     if (iv) {
@@ -353,15 +350,15 @@ static int aesni_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     return 1;
 }
 
-# define aesni_ccm_cipher aes_ccm_cipher
+#define aesni_ccm_cipher aes_ccm_cipher
 static int aesni_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# ifndef OPENSSL_NO_OCB
+#ifndef OPENSSL_NO_OCB
 static int aesni_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                              const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
-    EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX,ctx);
+    EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX, ctx);
 
     if (iv == NULL && key == NULL)
         return 1;
@@ -382,14 +379,13 @@ static int aesni_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
             aesni_set_encrypt_key(key, keylen, &octx->ksenc.ks);
             aesni_set_decrypt_key(key, keylen, &octx->ksdec.ks);
             if (!CRYPTO_ocb128_init(&octx->ocb,
-                                    &octx->ksenc.ks, &octx->ksdec.ks,
-                                    (block128_f) aesni_encrypt,
-                                    (block128_f) aesni_decrypt,
-                                    enc ? aesni_ocb_encrypt
-                                        : aesni_ocb_decrypt))
+                    &octx->ksenc.ks, &octx->ksdec.ks,
+                    (block128_f)aesni_encrypt,
+                    (block128_f)aesni_decrypt,
+                    enc ? aesni_ocb_encrypt
+                        : aesni_ocb_decrypt))
                 return 0;
-        }
-        while (0);
+        } while (0);
 
         /*
          * If we have an iv we can set it directly, otherwise use saved IV.
@@ -414,67 +410,75 @@ static int aesni_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     return 1;
 }
 
-#  define aesni_ocb_cipher aes_ocb_cipher
+#define aesni_ocb_cipher aes_ocb_cipher
 static int aesni_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t len);
-# endif                        /* OPENSSL_NO_OCB */
-
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER aesni_##keylen##_##mode = { \
-        nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        aesni_init_key,                 \
-        aesni_##mode##_cipher,          \
-        NULL,                           \
-        sizeof(EVP_AES_KEY),            \
-        NULL,NULL,NULL,NULL }; \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
-        nid##_##keylen##_##nmode,blocksize,     \
-        keylen/8,ivlen,                 \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                 \
-        aes_init_key,                   \
-        aes_##mode##_cipher,            \
-        NULL,                           \
-        sizeof(EVP_AES_KEY),            \
-        NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ return AESNI_CAPABLE?&aesni_##keylen##_##mode:&aes_##keylen##_##mode; }
-
-# define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \
-static const EVP_CIPHER aesni_##keylen##_##mode = { \
-        nid##_##keylen##_##mode,blocksize, \
-        (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE?2:1)*keylen/8, \
-        ivlen,                          \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        aesni_##mode##_init_key,        \
-        aesni_##mode##_cipher,          \
-        aes_##mode##_cleanup,           \
-        sizeof(EVP_AES_##MODE##_CTX),   \
-        NULL,NULL,aes_##mode##_ctrl,NULL }; \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
-        nid##_##keylen##_##mode,blocksize, \
-        (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE?2:1)*keylen/8, \
-        ivlen,                          \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        aes_##mode##_init_key,          \
-        aes_##mode##_cipher,            \
-        aes_##mode##_cleanup,           \
-        sizeof(EVP_AES_##MODE##_CTX),   \
-        NULL,NULL,aes_##mode##_ctrl,NULL }; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ return AESNI_CAPABLE?&aesni_##keylen##_##mode:&aes_##keylen##_##mode; }
+    const unsigned char *in, size_t len);
+#endif /* OPENSSL_NO_OCB */
+
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, MODE, flags) \
+    static const EVP_CIPHER aesni_##keylen##_##mode = {                               \
+        nid##_##keylen##_##nmode, blocksize, keylen / 8, ivlen,                       \
+        flags | EVP_CIPH_##MODE##_MODE,                                               \
+        EVP_ORIG_GLOBAL,                                                              \
+        aesni_init_key,                                                               \
+        aesni_##mode##_cipher,                                                        \
+        NULL,                                                                         \
+        sizeof(EVP_AES_KEY),                                                          \
+        NULL, NULL, NULL, NULL                                                        \
+    };                                                                                \
+    static const EVP_CIPHER aes_##keylen##_##mode = {                                 \
+        nid##_##keylen##_##nmode, blocksize,                                          \
+        keylen / 8, ivlen,                                                            \
+        flags | EVP_CIPH_##MODE##_MODE,                                               \
+        EVP_ORIG_GLOBAL,                                                              \
+        aes_init_key,                                                                 \
+        aes_##mode##_cipher,                                                          \
+        NULL,                                                                         \
+        sizeof(EVP_AES_KEY),                                                          \
+        NULL, NULL, NULL, NULL                                                        \
+    };                                                                                \
+    const EVP_CIPHER *EVP_aes_##keylen##_##mode(void)                                 \
+    {                                                                                 \
+        return AESNI_CAPABLE ? &aesni_##keylen##_##mode : &aes_##keylen##_##mode;     \
+    }
+
+#define BLOCK_CIPHER_custom(nid, keylen, blocksize, ivlen, mode, MODE, flags)                                              \
+    static const EVP_CIPHER aesni_##keylen##_##mode = {                                                                    \
+        nid##_##keylen##_##mode, blocksize,                                                                                \
+        (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+        ivlen,                                                                                                             \
+        flags | EVP_CIPH_##MODE##_MODE,                                                                                    \
+        EVP_ORIG_GLOBAL,                                                                                                   \
+        aesni_##mode##_init_key,                                                                                           \
+        aesni_##mode##_cipher,                                                                                             \
+        aes_##mode##_cleanup,                                                                                              \
+        sizeof(EVP_AES_##MODE##_CTX),                                                                                      \
+        NULL, NULL, aes_##mode##_ctrl, NULL                                                                                \
+    };                                                                                                                     \
+    static const EVP_CIPHER aes_##keylen##_##mode = {                                                                      \
+        nid##_##keylen##_##mode, blocksize,                                                                                \
+        (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+        ivlen,                                                                                                             \
+        flags | EVP_CIPH_##MODE##_MODE,                                                                                    \
+        EVP_ORIG_GLOBAL,                                                                                                   \
+        aes_##mode##_init_key,                                                                                             \
+        aes_##mode##_cipher,                                                                                               \
+        aes_##mode##_cleanup,                                                                                              \
+        sizeof(EVP_AES_##MODE##_CTX),                                                                                      \
+        NULL, NULL, aes_##mode##_ctrl, NULL                                                                                \
+    };                                                                                                                     \
+    const EVP_CIPHER *EVP_aes_##keylen##_##mode(void)                                                                      \
+    {                                                                                                                      \
+        return AESNI_CAPABLE ? &aesni_##keylen##_##mode : &aes_##keylen##_##mode;                                          \
+    }
 
 #elif defined(SPARC_AES_CAPABLE)
 
 static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                           const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int ret, mode, bits;
-    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
 
     mode = EVP_CIPHER_CTX_get_mode(ctx);
     bits = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
@@ -486,19 +490,16 @@ static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         && !enc) {
         ret = 0;
         aes_t4_set_decrypt_key(key, bits, &dat->ks.ks);
-        dat->block = (block128_f) aes_t4_decrypt;
+        dat->block = (block128_f)aes_t4_decrypt;
         switch (bits) {
         case 128:
-            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-                (cbc128_f) aes128_t4_cbc_decrypt : NULL;
+            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)aes128_t4_cbc_decrypt : NULL;
             break;
         case 192:
-            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-                (cbc128_f) aes192_t4_cbc_decrypt : NULL;
+            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)aes192_t4_cbc_decrypt : NULL;
             break;
         case 256:
-            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-                (cbc128_f) aes256_t4_cbc_decrypt : NULL;
+            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)aes256_t4_cbc_decrypt : NULL;
             break;
         default:
             ret = -1;
@@ -506,29 +507,29 @@ static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     } else {
         ret = 0;
         aes_t4_set_encrypt_key(key, bits, &dat->ks.ks);
-        dat->block = (block128_f) aes_t4_encrypt;
+        dat->block = (block128_f)aes_t4_encrypt;
         switch (bits) {
         case 128:
             if (mode == EVP_CIPH_CBC_MODE)
-                dat->stream.cbc = (cbc128_f) aes128_t4_cbc_encrypt;
+                dat->stream.cbc = (cbc128_f)aes128_t4_cbc_encrypt;
             else if (mode == EVP_CIPH_CTR_MODE)
-                dat->stream.ctr = (ctr128_f) aes128_t4_ctr32_encrypt;
+                dat->stream.ctr = (ctr128_f)aes128_t4_ctr32_encrypt;
             else
                 dat->stream.cbc = NULL;
             break;
         case 192:
             if (mode == EVP_CIPH_CBC_MODE)
-                dat->stream.cbc = (cbc128_f) aes192_t4_cbc_encrypt;
+                dat->stream.cbc = (cbc128_f)aes192_t4_cbc_encrypt;
             else if (mode == EVP_CIPH_CTR_MODE)
-                dat->stream.ctr = (ctr128_f) aes192_t4_ctr32_encrypt;
+                dat->stream.ctr = (ctr128_f)aes192_t4_ctr32_encrypt;
             else
                 dat->stream.cbc = NULL;
             break;
         case 256:
             if (mode == EVP_CIPH_CBC_MODE)
-                dat->stream.cbc = (cbc128_f) aes256_t4_cbc_encrypt;
+                dat->stream.cbc = (cbc128_f)aes256_t4_cbc_encrypt;
             else if (mode == EVP_CIPH_CTR_MODE)
-                dat->stream.ctr = (ctr128_f) aes256_t4_ctr32_encrypt;
+                dat->stream.ctr = (ctr128_f)aes256_t4_ctr32_encrypt;
             else
                 dat->stream.cbc = NULL;
             break;
@@ -545,38 +546,38 @@ static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     return 1;
 }
 
-# define aes_t4_cbc_cipher aes_cbc_cipher
+#define aes_t4_cbc_cipher aes_cbc_cipher
 static int aes_t4_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                             const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define aes_t4_ecb_cipher aes_ecb_cipher
+#define aes_t4_ecb_cipher aes_ecb_cipher
 static int aes_t4_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                             const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define aes_t4_ofb_cipher aes_ofb_cipher
+#define aes_t4_ofb_cipher aes_ofb_cipher
 static int aes_t4_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                             const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define aes_t4_cfb_cipher aes_cfb_cipher
+#define aes_t4_cfb_cipher aes_cfb_cipher
 static int aes_t4_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                             const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define aes_t4_cfb8_cipher aes_cfb8_cipher
+#define aes_t4_cfb8_cipher aes_cfb8_cipher
 static int aes_t4_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define aes_t4_cfb1_cipher aes_cfb1_cipher
+#define aes_t4_cfb1_cipher aes_cfb1_cipher
 static int aes_t4_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define aes_t4_ctr_cipher aes_ctr_cipher
+#define aes_t4_ctr_cipher aes_ctr_cipher
 static int aes_t4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                             const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
 static int aes_t4_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                               const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
-    EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX,ctx);
+    EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, ctx);
 
     if (iv == NULL && key == NULL)
         return 1;
@@ -589,16 +590,16 @@ static int aes_t4_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         }
         aes_t4_set_encrypt_key(key, bits, &gctx->ks.ks);
         CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
-                           (block128_f) aes_t4_encrypt);
+            (block128_f)aes_t4_encrypt);
         switch (bits) {
         case 128:
-            gctx->ctr = (ctr128_f) aes128_t4_ctr32_encrypt;
+            gctx->ctr = (ctr128_f)aes128_t4_ctr32_encrypt;
             break;
         case 192:
-            gctx->ctr = (ctr128_f) aes192_t4_ctr32_encrypt;
+            gctx->ctr = (ctr128_f)aes192_t4_ctr32_encrypt;
             break;
         case 256:
-            gctx->ctr = (ctr128_f) aes256_t4_ctr32_encrypt;
+            gctx->ctr = (ctr128_f)aes256_t4_ctr32_encrypt;
             break;
         default:
             return 0;
@@ -625,14 +626,14 @@ static int aes_t4_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     return 1;
 }
 
-# define aes_t4_gcm_cipher aes_gcm_cipher
+#define aes_t4_gcm_cipher aes_gcm_cipher
 static int aes_t4_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                             const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
 static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                               const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
-    EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX,ctx);
+    EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX, ctx);
 
     if (!iv && !key)
         return 1;
@@ -654,7 +655,7 @@ static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
          * See comment in aes_xts_init_key() below.
          */
         if ((!allow_insecure_decrypt || enc)
-                && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
+            && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
             ERR_raise(ERR_LIB_EVP, EVP_R_XTS_DUPLICATED_KEYS);
             return 0;
         }
@@ -663,7 +664,7 @@ static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         /* key_len is two AES keys */
         if (enc) {
             aes_t4_set_encrypt_key(key, bits, &xctx->ks1.ks);
-            xctx->xts.block1 = (block128_f) aes_t4_encrypt;
+            xctx->xts.block1 = (block128_f)aes_t4_encrypt;
             switch (bits) {
             case 128:
                 xctx->stream = aes128_t4_xts_encrypt;
@@ -676,7 +677,7 @@ static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
             }
         } else {
             aes_t4_set_decrypt_key(key, bits, &xctx->ks1.ks);
-            xctx->xts.block1 = (block128_f) aes_t4_decrypt;
+            xctx->xts.block1 = (block128_f)aes_t4_decrypt;
             switch (bits) {
             case 128:
                 xctx->stream = aes128_t4_xts_decrypt;
@@ -690,7 +691,7 @@ static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         }
 
         aes_t4_set_encrypt_key(key + bytes, bits, &xctx->ks2.ks);
-        xctx->xts.block2 = (block128_f) aes_t4_encrypt;
+        xctx->xts.block2 = (block128_f)aes_t4_encrypt;
 
         xctx->xts.key1 = &xctx->ks1;
     }
@@ -703,14 +704,14 @@ static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     return 1;
 }
 
-# define aes_t4_xts_cipher aes_xts_cipher
+#define aes_t4_xts_cipher aes_xts_cipher
 static int aes_t4_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                             const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
 static int aes_t4_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                               const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
-    EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX,ctx);
+    EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX, ctx);
 
     if (iv == NULL && key == NULL)
         return 1;
@@ -724,7 +725,7 @@ static int aes_t4_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         }
         aes_t4_set_encrypt_key(key, bits, &cctx->ks.ks);
         CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
-                           &cctx->ks, (block128_f) aes_t4_encrypt);
+            &cctx->ks, (block128_f)aes_t4_encrypt);
         cctx->str = NULL;
         cctx->key_set = 1;
     }
@@ -735,15 +736,15 @@ static int aes_t4_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     return 1;
 }
 
-# define aes_t4_ccm_cipher aes_ccm_cipher
+#define aes_t4_ccm_cipher aes_ccm_cipher
 static int aes_t4_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                             const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# ifndef OPENSSL_NO_OCB
+#ifndef OPENSSL_NO_OCB
 static int aes_t4_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                               const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
-    EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX,ctx);
+    EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX, ctx);
 
     if (iv == NULL && key == NULL)
         return 1;
@@ -764,13 +765,12 @@ static int aes_t4_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
             aes_t4_set_encrypt_key(key, keylen, &octx->ksenc.ks);
             aes_t4_set_decrypt_key(key, keylen, &octx->ksdec.ks);
             if (!CRYPTO_ocb128_init(&octx->ocb,
-                                    &octx->ksenc.ks, &octx->ksdec.ks,
-                                    (block128_f) aes_t4_encrypt,
-                                    (block128_f) aes_t4_decrypt,
-                                    NULL))
+                    &octx->ksenc.ks, &octx->ksdec.ks,
+                    (block128_f)aes_t4_encrypt,
+                    (block128_f)aes_t4_decrypt,
+                    NULL))
                 return 0;
-        }
-        while (0);
+        } while (0);
 
         /*
          * If we have an iv we can set it directly, otherwise use saved IV.
@@ -795,64 +795,72 @@ static int aes_t4_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     return 1;
 }
 
-#  define aes_t4_ocb_cipher aes_ocb_cipher
+#define aes_t4_ocb_cipher aes_ocb_cipher
 static int aes_t4_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                             const unsigned char *in, size_t len);
-# endif                        /* OPENSSL_NO_OCB */
-
-# ifndef OPENSSL_NO_SIV
-#  define aes_t4_siv_init_key aes_siv_init_key
-#  define aes_t4_siv_cipher aes_siv_cipher
-# endif /* OPENSSL_NO_SIV */
-
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER aes_t4_##keylen##_##mode = { \
-        nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        aes_t4_init_key,                \
-        aes_t4_##mode##_cipher,         \
-        NULL,                           \
-        sizeof(EVP_AES_KEY),            \
-        NULL,NULL,NULL,NULL }; \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
-        nid##_##keylen##_##nmode,blocksize,     \
-        keylen/8,ivlen, \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        aes_init_key,                   \
-        aes_##mode##_cipher,            \
-        NULL,                           \
-        sizeof(EVP_AES_KEY),            \
-        NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ return SPARC_AES_CAPABLE?&aes_t4_##keylen##_##mode:&aes_##keylen##_##mode; }
-
-# define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \
-static const EVP_CIPHER aes_t4_##keylen##_##mode = { \
-        nid##_##keylen##_##mode,blocksize, \
-        (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE?2:1)*keylen/8, \
-        ivlen,                          \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        aes_t4_##mode##_init_key,       \
-        aes_t4_##mode##_cipher,         \
-        aes_##mode##_cleanup,           \
-        sizeof(EVP_AES_##MODE##_CTX),   \
-        NULL,NULL,aes_##mode##_ctrl,NULL }; \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
-        nid##_##keylen##_##mode,blocksize, \
-        (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE?2:1)*keylen/8, \
-        ivlen,                          \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        aes_##mode##_init_key,          \
-        aes_##mode##_cipher,            \
-        aes_##mode##_cleanup,           \
-        sizeof(EVP_AES_##MODE##_CTX),   \
-        NULL,NULL,aes_##mode##_ctrl,NULL }; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ return SPARC_AES_CAPABLE?&aes_t4_##keylen##_##mode:&aes_##keylen##_##mode; }
+    const unsigned char *in, size_t len);
+#endif /* OPENSSL_NO_OCB */
+
+#ifndef OPENSSL_NO_SIV
+#define aes_t4_siv_init_key aes_siv_init_key
+#define aes_t4_siv_cipher aes_siv_cipher
+#endif /* OPENSSL_NO_SIV */
+
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, MODE, flags)  \
+    static const EVP_CIPHER aes_t4_##keylen##_##mode = {                               \
+        nid##_##keylen##_##nmode, blocksize, keylen / 8, ivlen,                        \
+        flags | EVP_CIPH_##MODE##_MODE,                                                \
+        EVP_ORIG_GLOBAL,                                                               \
+        aes_t4_init_key,                                                               \
+        aes_t4_##mode##_cipher,                                                        \
+        NULL,                                                                          \
+        sizeof(EVP_AES_KEY),                                                           \
+        NULL, NULL, NULL, NULL                                                         \
+    };                                                                                 \
+    static const EVP_CIPHER aes_##keylen##_##mode = {                                  \
+        nid##_##keylen##_##nmode, blocksize,                                           \
+        keylen / 8, ivlen,                                                             \
+        flags | EVP_CIPH_##MODE##_MODE,                                                \
+        EVP_ORIG_GLOBAL,                                                               \
+        aes_init_key,                                                                  \
+        aes_##mode##_cipher,                                                           \
+        NULL,                                                                          \
+        sizeof(EVP_AES_KEY),                                                           \
+        NULL, NULL, NULL, NULL                                                         \
+    };                                                                                 \
+    const EVP_CIPHER *EVP_aes_##keylen##_##mode(void)                                  \
+    {                                                                                  \
+        return SPARC_AES_CAPABLE ? &aes_t4_##keylen##_##mode : &aes_##keylen##_##mode; \
+    }
+
+#define BLOCK_CIPHER_custom(nid, keylen, blocksize, ivlen, mode, MODE, flags)                                              \
+    static const EVP_CIPHER aes_t4_##keylen##_##mode = {                                                                   \
+        nid##_##keylen##_##mode, blocksize,                                                                                \
+        (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+        ivlen,                                                                                                             \
+        flags | EVP_CIPH_##MODE##_MODE,                                                                                    \
+        EVP_ORIG_GLOBAL,                                                                                                   \
+        aes_t4_##mode##_init_key,                                                                                          \
+        aes_t4_##mode##_cipher,                                                                                            \
+        aes_##mode##_cleanup,                                                                                              \
+        sizeof(EVP_AES_##MODE##_CTX),                                                                                      \
+        NULL, NULL, aes_##mode##_ctrl, NULL                                                                                \
+    };                                                                                                                     \
+    static const EVP_CIPHER aes_##keylen##_##mode = {                                                                      \
+        nid##_##keylen##_##mode, blocksize,                                                                                \
+        (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+        ivlen,                                                                                                             \
+        flags | EVP_CIPH_##MODE##_MODE,                                                                                    \
+        EVP_ORIG_GLOBAL,                                                                                                   \
+        aes_##mode##_init_key,                                                                                             \
+        aes_##mode##_cipher,                                                                                               \
+        aes_##mode##_cleanup,                                                                                              \
+        sizeof(EVP_AES_##MODE##_CTX),                                                                                      \
+        NULL, NULL, aes_##mode##_ctrl, NULL                                                                                \
+    };                                                                                                                     \
+    const EVP_CIPHER *EVP_aes_##keylen##_##mode(void)                                                                      \
+    {                                                                                                                      \
+        return SPARC_AES_CAPABLE ? &aes_t4_##keylen##_##mode : &aes_##keylen##_##mode;                                     \
+    }
 
 #elif defined(S390X_aes_128_CAPABLE)
 /* IBM S390X support */
@@ -949,7 +957,7 @@ typedef struct {
     int kreslen;
 
     int tls_aad_len;
-    uint64_t tls_enc_records;   /* Number of TLS records encrypted */
+    uint64_t tls_enc_records; /* Number of TLS records encrypted */
 } S390X_AES_GCM_CTX;
 
 typedef struct {
@@ -1004,21 +1012,21 @@ typedef struct {
     } aes;
 } S390X_AES_CCM_CTX;
 
-# define s390x_aes_init_key aes_init_key
+#define s390x_aes_init_key aes_init_key
 static int s390x_aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                              const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 
-# define S390X_AES_CBC_CTX              EVP_AES_KEY
+#define S390X_AES_CBC_CTX EVP_AES_KEY
 
-# define s390x_aes_cbc_init_key aes_init_key
+#define s390x_aes_cbc_init_key aes_init_key
 
-# define s390x_aes_cbc_cipher aes_cbc_cipher
+#define s390x_aes_cbc_cipher aes_cbc_cipher
 static int s390x_aes_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
 static int s390x_aes_ecb_init_key(EVP_CIPHER_CTX *ctx,
-                                  const unsigned char *key,
-                                  const unsigned char *iv, int enc)
+    const unsigned char *key,
+    const unsigned char *iv, int enc)
 {
     S390X_AES_ECB_CTX *cctx = EVP_C_DATA(S390X_AES_ECB_CTX, ctx);
     const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
@@ -1036,7 +1044,7 @@ static int s390x_aes_ecb_init_key(EVP_CIPHER_CTX *ctx,
 }
 
 static int s390x_aes_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     S390X_AES_ECB_CTX *cctx = EVP_C_DATA(S390X_AES_ECB_CTX, ctx);
 
@@ -1045,8 +1053,8 @@ static int s390x_aes_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int s390x_aes_ofb_init_key(EVP_CIPHER_CTX *ctx,
-                                  const unsigned char *key,
-                                  const unsigned char *ivec, int enc)
+    const unsigned char *key,
+    const unsigned char *ivec, int enc)
 {
     S390X_AES_OFB_CTX *cctx = EVP_C_DATA(S390X_AES_OFB_CTX, ctx);
     const unsigned char *iv = ctx->oiv;
@@ -1068,7 +1076,7 @@ static int s390x_aes_ofb_init_key(EVP_CIPHER_CTX *ctx,
 }
 
 static int s390x_aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     S390X_AES_OFB_CTX *cctx = EVP_C_DATA(S390X_AES_OFB_CTX, ctx);
     const int ivlen = EVP_CIPHER_CTX_get_iv_length(ctx);
@@ -1097,7 +1105,7 @@ static int s390x_aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
     if (rem) {
         s390x_km(cctx->kmo.param.cv, 16, cctx->kmo.param.cv, cctx->fc,
-                 cctx->kmo.param.k);
+            cctx->kmo.param.k);
 
         while (rem--) {
             out[n] = in[n] ^ cctx->kmo.param.cv[n];
@@ -1111,8 +1119,8 @@ static int s390x_aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int s390x_aes_cfb_init_key(EVP_CIPHER_CTX *ctx,
-                                  const unsigned char *key,
-                                  const unsigned char *ivec, int enc)
+    const unsigned char *key,
+    const unsigned char *ivec, int enc)
 {
     S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
     const unsigned char *iv = ctx->oiv;
@@ -1128,7 +1136,7 @@ static int s390x_aes_cfb_init_key(EVP_CIPHER_CTX *ctx,
         return 0;
     }
     cctx->fc = S390X_AES_FC(keylen);
-    cctx->fc |= 16 << 24;   /* 16 bytes cipher feedback */
+    cctx->fc |= 16 << 24; /* 16 bytes cipher feedback */
     if (!enc)
         cctx->fc |= S390X_DECRYPT;
 
@@ -1138,7 +1146,7 @@ static int s390x_aes_cfb_init_key(EVP_CIPHER_CTX *ctx,
 }
 
 static int s390x_aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
     const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
@@ -1180,7 +1188,7 @@ static int s390x_aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
     if (rem) {
         s390x_km(cctx->kmf.param.cv, 16, cctx->kmf.param.cv,
-                 S390X_AES_FC(keylen), cctx->kmf.param.k);
+            S390X_AES_FC(keylen), cctx->kmf.param.k);
 
         while (rem--) {
             tmp = in[n];
@@ -1196,8 +1204,8 @@ static int s390x_aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int s390x_aes_cfb8_init_key(EVP_CIPHER_CTX *ctx,
-                                   const unsigned char *key,
-                                   const unsigned char *ivec, int enc)
+    const unsigned char *key,
+    const unsigned char *ivec, int enc)
 {
     S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
     const unsigned char *iv = ctx->oiv;
@@ -1213,7 +1221,7 @@ static int s390x_aes_cfb8_init_key(EVP_CIPHER_CTX *ctx,
         return 0;
     }
     cctx->fc = S390X_AES_FC(keylen);
-    cctx->fc |= 1 << 24;   /* 1 byte cipher feedback */
+    cctx->fc |= 1 << 24; /* 1 byte cipher feedback */
     if (!enc)
         cctx->fc |= S390X_DECRYPT;
 
@@ -1223,7 +1231,7 @@ static int s390x_aes_cfb8_init_key(EVP_CIPHER_CTX *ctx,
 }
 
 static int s390x_aes_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                 const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     S390X_AES_CFB_CTX *cctx = EVP_C_DATA(S390X_AES_CFB_CTX, ctx);
     const int ivlen = EVP_CIPHER_CTX_get_iv_length(ctx);
@@ -1235,29 +1243,29 @@ static int s390x_aes_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     return 1;
 }
 
-# define s390x_aes_cfb1_init_key aes_init_key
+#define s390x_aes_cfb1_init_key aes_init_key
 
-# define s390x_aes_cfb1_cipher aes_cfb1_cipher
+#define s390x_aes_cfb1_cipher aes_cfb1_cipher
 static int s390x_aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                 const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define S390X_AES_CTR_CTX              EVP_AES_KEY
+#define S390X_AES_CTR_CTX EVP_AES_KEY
 
-# define s390x_aes_ctr_init_key aes_init_key
+#define s390x_aes_ctr_init_key aes_init_key
 
-# define s390x_aes_ctr_cipher aes_ctr_cipher
+#define s390x_aes_ctr_cipher aes_ctr_cipher
 static int s390x_aes_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
 /* iv + padding length for iv lengths != 12 */
-# define S390X_gcm_ivpadlen(i)  ((((i) + 15) >> 4 << 4) + 16)
+#define S390X_gcm_ivpadlen(i) ((((i) + 15) >> 4 << 4) + 16)
 
 /*-
  * Process additional authenticated data. Returns 0 on success. Code is
  * big-endian.
  */
 static int s390x_aes_gcm_aad(S390X_AES_GCM_CTX *ctx, const unsigned char *aad,
-                             size_t len)
+    size_t len)
 {
     unsigned long long alen;
     int n, rem;
@@ -1311,7 +1319,7 @@ static int s390x_aes_gcm_aad(S390X_AES_GCM_CTX *ctx, const unsigned char *aad,
  * success. Code is big-endian.
  */
 static int s390x_aes_gcm(S390X_AES_GCM_CTX *ctx, const unsigned char *in,
-                         unsigned char *out, size_t len)
+    unsigned char *out, size_t len)
 {
     const unsigned char *inptr;
     unsigned long long mlen;
@@ -1340,7 +1348,7 @@ static int s390x_aes_gcm(S390X_AES_GCM_CTX *ctx, const unsigned char *in,
         /* ctx->mres contains a complete block if offset has wrapped around */
         if (!n) {
             s390x_kma(ctx->ares, ctx->areslen, ctx->mres, 16, buf.b,
-                      ctx->fc | S390X_KMA_LAAD, &ctx->kma.param);
+                ctx->fc | S390X_KMA_LAAD, &ctx->kma.param);
             ctx->fc |= S390X_KMA_HS;
             ctx->areslen = 0;
 
@@ -1363,7 +1371,7 @@ static int s390x_aes_gcm(S390X_AES_GCM_CTX *ctx, const unsigned char *in,
     len &= ~(size_t)0xf;
     if (len) {
         s390x_kma(ctx->ares, ctx->areslen, in, len, out,
-                  ctx->fc | S390X_KMA_LAAD, &ctx->kma.param);
+            ctx->fc | S390X_KMA_LAAD, &ctx->kma.param);
         in += len;
         out += len;
         ctx->fc |= S390X_KMA_HS;
@@ -1399,7 +1407,7 @@ static int s390x_aes_gcm(S390X_AES_GCM_CTX *ctx, const unsigned char *in,
  * Initialize context structure. Code is big-endian.
  */
 static void s390x_aes_gcm_setiv(S390X_AES_GCM_CTX *ctx,
-                                const unsigned char *iv)
+    const unsigned char *iv)
 {
     ctx->kma.param.t.g[0] = 0;
     ctx->kma.param.t.g[1] = 0;
@@ -1417,7 +1425,7 @@ static void s390x_aes_gcm_setiv(S390X_AES_GCM_CTX *ctx,
         /* ctx->iv has the right size and is already padded. */
         memcpy(ctx->iv, iv, ctx->ivlen);
         s390x_kma(ctx->iv, S390X_gcm_ivpadlen(ctx->ivlen), NULL, 0, NULL,
-                  ctx->fc, &ctx->kma.param);
+            ctx->fc, &ctx->kma.param);
         ctx->fc |= S390X_KMA_HS;
 
         ctx->kma.param.j0.g[0] = ctx->kma.param.t.g[0];
@@ -1602,8 +1610,8 @@ static int s390x_aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
  * Set key and/or iv. Returns 1 on success. Otherwise 0 is returned.
  */
 static int s390x_aes_gcm_init_key(EVP_CIPHER_CTX *ctx,
-                                  const unsigned char *key,
-                                  const unsigned char *iv, int enc)
+    const unsigned char *key,
+    const unsigned char *iv, int enc)
 {
     S390X_AES_GCM_CTX *gctx = EVP_C_DATA(S390X_AES_GCM_CTX, ctx);
     int keylen;
@@ -1649,7 +1657,7 @@ static int s390x_aes_gcm_init_key(EVP_CIPHER_CTX *ctx,
  * if successful. Otherwise -1 is returned. Code is big-endian.
  */
 static int s390x_aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                    const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     S390X_AES_GCM_CTX *gctx = EVP_C_DATA(S390X_AES_GCM_CTX, ctx);
     const unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx);
@@ -1670,9 +1678,9 @@ static int s390x_aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         goto err;
     }
 
-    if (EVP_CIPHER_CTX_ctrl(ctx, enc ? EVP_CTRL_GCM_IV_GEN
-                                     : EVP_CTRL_GCM_SET_IV_INV,
-                            EVP_GCM_TLS_EXPLICIT_IV_LEN, out) <= 0)
+    if (EVP_CIPHER_CTX_ctrl(ctx, enc ? EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
+            EVP_GCM_TLS_EXPLICIT_IV_LEN, out)
+        <= 0)
         goto err;
 
     in += EVP_GCM_TLS_EXPLICIT_IV_LEN;
@@ -1682,14 +1690,14 @@ static int s390x_aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     gctx->kma.param.taadl = gctx->tls_aad_len << 3;
     gctx->kma.param.tpcl = len << 3;
     s390x_kma(buf, gctx->tls_aad_len, in, len, out,
-              gctx->fc | S390X_KMA_LAAD | S390X_KMA_LPC, &gctx->kma.param);
+        gctx->fc | S390X_KMA_LAAD | S390X_KMA_LPC, &gctx->kma.param);
 
     if (enc) {
         memcpy(out + len, gctx->kma.param.t.b, EVP_GCM_TLS_TAG_LEN);
         rv = len + EVP_GCM_TLS_EXPLICIT_IV_LEN + EVP_GCM_TLS_TAG_LEN;
     } else {
         if (CRYPTO_memcmp(gctx->kma.param.t.b, in + len,
-                          EVP_GCM_TLS_TAG_LEN)) {
+                EVP_GCM_TLS_TAG_LEN)) {
             OPENSSL_cleanse(out, len);
             goto err;
         }
@@ -1708,7 +1716,7 @@ static int s390x_aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
  * written on success. Otherwise -1 is returned. Code is big-endian.
  */
 static int s390x_aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     S390X_AES_GCM_CTX *gctx = EVP_C_DATA(S390X_AES_GCM_CTX, ctx);
     unsigned char *buf, tmp[16];
@@ -1736,7 +1744,7 @@ static int s390x_aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         gctx->kma.param.taadl <<= 3;
         gctx->kma.param.tpcl <<= 3;
         s390x_kma(gctx->ares, gctx->areslen, gctx->mres, gctx->mreslen, tmp,
-                  gctx->fc | S390X_KMA_LAAD | S390X_KMA_LPC, &gctx->kma.param);
+            gctx->fc | S390X_KMA_LAAD | S390X_KMA_LPC, &gctx->kma.param);
         /* recall that we already did en-/decrypt gctx->mres
          * and returned it to caller... */
         OPENSSL_cleanse(tmp, gctx->mreslen);
@@ -1771,25 +1779,25 @@ static int s390x_aes_gcm_cleanup(EVP_CIPHER_CTX *c)
     return 1;
 }
 
-# define S390X_AES_XTS_CTX              EVP_AES_XTS_CTX
+#define S390X_AES_XTS_CTX EVP_AES_XTS_CTX
 
-# define s390x_aes_xts_init_key aes_xts_init_key
+#define s390x_aes_xts_init_key aes_xts_init_key
 static int s390x_aes_xts_init_key(EVP_CIPHER_CTX *ctx,
-                                  const unsigned char *key,
-                                  const unsigned char *iv, int enc);
-# define s390x_aes_xts_cipher aes_xts_cipher
+    const unsigned char *key,
+    const unsigned char *iv, int enc);
+#define s390x_aes_xts_cipher aes_xts_cipher
 static int s390x_aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t len);
-# define s390x_aes_xts_ctrl aes_xts_ctrl
+    const unsigned char *in, size_t len);
+#define s390x_aes_xts_ctrl aes_xts_ctrl
 static int s390x_aes_xts_ctrl(EVP_CIPHER_CTX *, int type, int arg, void *ptr);
-# define s390x_aes_xts_cleanup aes_xts_cleanup
+#define s390x_aes_xts_cleanup aes_xts_cleanup
 
 /*-
  * Set nonce and length fields. Code is big-endian.
  */
 static inline void s390x_aes_ccm_setiv(S390X_AES_CCM_CTX *ctx,
-                                          const unsigned char *nonce,
-                                          size_t mlen)
+    const unsigned char *nonce,
+    size_t mlen)
 {
     ctx->aes.ccm.nonce.b[0] &= ~S390X_CCM_AAD_FLAG;
     ctx->aes.ccm.nonce.g[1] = mlen;
@@ -1800,7 +1808,7 @@ static inline void s390x_aes_ccm_setiv(S390X_AES_CCM_CTX *ctx,
  * Process additional authenticated data. Code is big-endian.
  */
 static void s390x_aes_ccm_aad(S390X_AES_CCM_CTX *ctx, const unsigned char *aad,
-                              size_t alen)
+    size_t alen)
 {
     unsigned char *ptr;
     int i, rem;
@@ -1817,7 +1825,7 @@ static void s390x_aes_ccm_aad(S390X_AES_CCM_CTX *ctx, const unsigned char *aad,
         *(uint16_t *)ptr = alen;
         i = 2;
     } else if (sizeof(alen) == 8
-               && alen >= (size_t)1 << (32 % (sizeof(alen) * 8))) {
+        && alen >= (size_t)1 << (32 % (sizeof(alen) * 8))) {
         *(uint16_t *)ptr = 0xffff;
         *(uint64_t *)(ptr + 2) = alen;
         i = 10;
@@ -1841,7 +1849,7 @@ static void s390x_aes_ccm_aad(S390X_AES_CCM_CTX *ctx, const unsigned char *aad,
     ctx->aes.ccm.kmac_param.icv.g[0] = 0;
     ctx->aes.ccm.kmac_param.icv.g[1] = 0;
     s390x_kmac(ctx->aes.ccm.nonce.b, 32, ctx->aes.ccm.fc,
-               &ctx->aes.ccm.kmac_param);
+        &ctx->aes.ccm.kmac_param);
     ctx->aes.ccm.blocks += 2;
 
     rem = alen & 0xf;
@@ -1856,8 +1864,8 @@ static void s390x_aes_ccm_aad(S390X_AES_CCM_CTX *ctx, const unsigned char *aad,
             ctx->aes.ccm.kmac_param.icv.b[i] ^= aad[i];
 
         s390x_km(ctx->aes.ccm.kmac_param.icv.b, 16,
-                 ctx->aes.ccm.kmac_param.icv.b, ctx->aes.ccm.fc,
-                 ctx->aes.ccm.kmac_param.k);
+            ctx->aes.ccm.kmac_param.icv.b, ctx->aes.ccm.fc,
+            ctx->aes.ccm.kmac_param.k);
         ctx->aes.ccm.blocks++;
     }
 }
@@ -1867,7 +1875,7 @@ static void s390x_aes_ccm_aad(S390X_AES_CCM_CTX *ctx, const unsigned char *aad,
  * success.
  */
 static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
-                         unsigned char *out, size_t len, int enc)
+    unsigned char *out, size_t len, int enc)
 {
     size_t n, rem;
     unsigned int i, l, num;
@@ -1876,7 +1884,7 @@ static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
     flags = ctx->aes.ccm.nonce.b[0];
     if (!(flags & S390X_CCM_AAD_FLAG)) {
         s390x_km(ctx->aes.ccm.nonce.b, 16, ctx->aes.ccm.kmac_param.icv.b,
-                 ctx->aes.ccm.fc, ctx->aes.ccm.kmac_param.k);
+            ctx->aes.ccm.fc, ctx->aes.ccm.kmac_param.k);
         ctx->aes.ccm.blocks++;
     }
     l = flags & 0x7;
@@ -1896,13 +1904,13 @@ static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
     ctx->aes.ccm.nonce.b[15] = 1;
 
     if (n != len)
-        return -1;              /* length mismatch */
+        return -1; /* length mismatch */
 
     if (enc) {
         /* Two operations per block plus one for tag encryption */
         ctx->aes.ccm.blocks += (((len + 15) >> 4) << 1) + 1;
         if (ctx->aes.ccm.blocks > (1ULL << 61))
-            return -2;          /* too much data */
+            return -2; /* too much data */
     }
 
     num = 0;
@@ -1918,18 +1926,18 @@ static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
                 ctx->aes.ccm.kmac_param.icv.b[i] ^= in[len + i];
 
             s390x_km(ctx->aes.ccm.kmac_param.icv.b, 16,
-                     ctx->aes.ccm.kmac_param.icv.b, ctx->aes.ccm.fc,
-                     ctx->aes.ccm.kmac_param.k);
+                ctx->aes.ccm.kmac_param.icv.b, ctx->aes.ccm.fc,
+                ctx->aes.ccm.kmac_param.k);
         }
 
         CRYPTO_ctr128_encrypt_ctr32(in, out, len + rem, &ctx->aes.key.k,
-                                    ctx->aes.ccm.nonce.b, ctx->aes.ccm.buf.b,
-                                    &num, (ctr128_f)AES_ctr32_encrypt);
+            ctx->aes.ccm.nonce.b, ctx->aes.ccm.buf.b,
+            &num, (ctr128_f)AES_ctr32_encrypt);
     } else {
         /* decrypt-then-mac */
         CRYPTO_ctr128_encrypt_ctr32(in, out, len + rem, &ctx->aes.key.k,
-                                    ctx->aes.ccm.nonce.b, ctx->aes.ccm.buf.b,
-                                    &num, (ctr128_f)AES_ctr32_encrypt);
+            ctx->aes.ccm.nonce.b, ctx->aes.ccm.buf.b,
+            &num, (ctr128_f)AES_ctr32_encrypt);
 
         if (len)
             s390x_kmac(out, len, ctx->aes.ccm.fc, &ctx->aes.ccm.kmac_param);
@@ -1938,8 +1946,8 @@ static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
                 ctx->aes.ccm.kmac_param.icv.b[i] ^= out[len + i];
 
             s390x_km(ctx->aes.ccm.kmac_param.icv.b, 16,
-                     ctx->aes.ccm.kmac_param.icv.b, ctx->aes.ccm.fc,
-                     ctx->aes.ccm.kmac_param.k);
+                ctx->aes.ccm.kmac_param.icv.b, ctx->aes.ccm.fc,
+                ctx->aes.ccm.kmac_param.k);
         }
     }
     /* encrypt tag */
@@ -1947,11 +1955,11 @@ static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
         ctx->aes.ccm.nonce.b[i] = 0;
 
     s390x_km(ctx->aes.ccm.nonce.b, 16, ctx->aes.ccm.buf.b, ctx->aes.ccm.fc,
-             ctx->aes.ccm.kmac_param.k);
+        ctx->aes.ccm.kmac_param.k);
     ctx->aes.ccm.kmac_param.icv.g[0] ^= ctx->aes.ccm.buf.g[0];
     ctx->aes.ccm.kmac_param.icv.g[1] ^= ctx->aes.ccm.buf.g[1];
 
-    ctx->aes.ccm.nonce.b[0] = flags;    /* restore flags field */
+    ctx->aes.ccm.nonce.b[0] = flags; /* restore flags field */
     return 0;
 }
 
@@ -1960,7 +1968,7 @@ static int s390x_aes_ccm(S390X_AES_CCM_CTX *ctx, const unsigned char *in,
  * if successful. Otherwise -1 is returned.
  */
 static int s390x_aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                    const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
     unsigned char *ivec = ctx->iv;
@@ -1968,7 +1976,7 @@ static int s390x_aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     const int enc = EVP_CIPHER_CTX_is_encrypting(ctx);
 
     if (out != in
-            || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->aes.ccm.m))
+        || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->aes.ccm.m))
         return -1;
 
     if (enc) {
@@ -1999,7 +2007,7 @@ static int s390x_aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     } else {
         if (!s390x_aes_ccm(cctx, in, out, len, enc)) {
             if (!CRYPTO_memcmp(cctx->aes.ccm.kmac_param.icv.b, in + len,
-                               cctx->aes.ccm.m))
+                    cctx->aes.ccm.m))
                 return len;
         }
 
@@ -2013,8 +2021,8 @@ static int s390x_aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
  * returned.
  */
 static int s390x_aes_ccm_init_key(EVP_CIPHER_CTX *ctx,
-                                  const unsigned char *key,
-                                  const unsigned char *iv, int enc)
+    const unsigned char *key,
+    const unsigned char *iv, int enc)
 {
     S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
     int keylen;
@@ -2034,9 +2042,9 @@ static int s390x_aes_ccm_init_key(EVP_CIPHER_CTX *ctx,
 
         /* Store encoded m and l. */
         cctx->aes.ccm.nonce.b[0] = ((cctx->aes.ccm.l - 1) & 0x7)
-                                 | (((cctx->aes.ccm.m - 2) >> 1) & 0x7) << 3;
+            | (((cctx->aes.ccm.m - 2) >> 1) & 0x7) << 3;
         memset(cctx->aes.ccm.nonce.b + 1, 0,
-               sizeof(cctx->aes.ccm.nonce.b));
+            sizeof(cctx->aes.ccm.nonce.b));
         cctx->aes.ccm.blocks = 0;
 
         cctx->aes.ccm.key_set = 1;
@@ -2058,7 +2066,7 @@ static int s390x_aes_ccm_init_key(EVP_CIPHER_CTX *ctx,
  * written on success. Otherwise -1 is returned.
  */
 static int s390x_aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     S390X_AES_CCM_CTX *cctx = EVP_C_DATA(S390X_AES_CCM_CTX, ctx);
     const int enc = EVP_CIPHER_CTX_is_encrypting(ctx);
@@ -2127,7 +2135,7 @@ static int s390x_aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         if (!s390x_aes_ccm(cctx, in, out, len, enc)) {
             buf = EVP_CIPHER_CTX_buf_noconst(ctx);
             if (!CRYPTO_memcmp(cctx->aes.ccm.kmac_param.icv.b, buf,
-                               cctx->aes.ccm.m))
+                    cctx->aes.ccm.m))
                 rv = len;
         }
 
@@ -2256,155 +2264,159 @@ static int s390x_aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
     }
 }
 
-# define s390x_aes_ccm_cleanup aes_ccm_cleanup
+#define s390x_aes_ccm_cleanup aes_ccm_cleanup
 
-# ifndef OPENSSL_NO_OCB
-#  define S390X_AES_OCB_CTX             EVP_AES_OCB_CTX
+#ifndef OPENSSL_NO_OCB
+#define S390X_AES_OCB_CTX EVP_AES_OCB_CTX
 
-#  define s390x_aes_ocb_init_key aes_ocb_init_key
+#define s390x_aes_ocb_init_key aes_ocb_init_key
 static int s390x_aes_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                                  const unsigned char *iv, int enc);
-#  define s390x_aes_ocb_cipher aes_ocb_cipher
+    const unsigned char *iv, int enc);
+#define s390x_aes_ocb_cipher aes_ocb_cipher
 static int s390x_aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t len);
-#  define s390x_aes_ocb_cleanup aes_ocb_cleanup
+    const unsigned char *in, size_t len);
+#define s390x_aes_ocb_cleanup aes_ocb_cleanup
 static int s390x_aes_ocb_cleanup(EVP_CIPHER_CTX *);
-#  define s390x_aes_ocb_ctrl aes_ocb_ctrl
+#define s390x_aes_ocb_ctrl aes_ocb_ctrl
 static int s390x_aes_ocb_ctrl(EVP_CIPHER_CTX *, int type, int arg, void *ptr);
-# endif
-
-# ifndef OPENSSL_NO_SIV
-#  define S390X_AES_SIV_CTX             EVP_AES_SIV_CTX
-
-#  define s390x_aes_siv_init_key aes_siv_init_key
-#  define s390x_aes_siv_cipher aes_siv_cipher
-#  define s390x_aes_siv_cleanup aes_siv_cleanup
-#  define s390x_aes_siv_ctrl aes_siv_ctrl
-# endif
-
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,    \
-                              MODE,flags)                               \
-static const EVP_CIPHER s390x_aes_##keylen##_##mode = {                 \
-    nid##_##keylen##_##nmode,blocksize,                                 \
-    keylen / 8,                                                         \
-    ivlen,                                                              \
-    flags | EVP_CIPH_##MODE##_MODE,                                     \
-    EVP_ORIG_GLOBAL,                                                    \
-    s390x_aes_##mode##_init_key,                                        \
-    s390x_aes_##mode##_cipher,                                          \
-    NULL,                                                               \
-    sizeof(S390X_AES_##MODE##_CTX),                                     \
-    NULL,                                                               \
-    NULL,                                                               \
-    NULL,                                                               \
-    NULL                                                                \
-};                                                                      \
-static const EVP_CIPHER aes_##keylen##_##mode = {                       \
-    nid##_##keylen##_##nmode,                                           \
-    blocksize,                                                          \
-    keylen / 8,                                                         \
-    ivlen,                                                              \
-    flags | EVP_CIPH_##MODE##_MODE,                                     \
-    EVP_ORIG_GLOBAL,                                                    \
-    aes_init_key,                                                       \
-    aes_##mode##_cipher,                                                \
-    NULL,                                                               \
-    sizeof(EVP_AES_KEY),                                                \
-    NULL,                                                               \
-    NULL,                                                               \
-    NULL,                                                               \
-    NULL                                                                \
-};                                                                      \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void)                       \
-{                                                                       \
-    return S390X_aes_##keylen##_##mode##_CAPABLE ?                      \
-           &s390x_aes_##keylen##_##mode : &aes_##keylen##_##mode;       \
-}
+#endif
 
-# define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags)\
-static const EVP_CIPHER s390x_aes_##keylen##_##mode = {                 \
-    nid##_##keylen##_##mode,                                            \
-    blocksize,                                                          \
-    (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8,        \
-    ivlen,                                                              \
-    flags | EVP_CIPH_##MODE##_MODE,                                     \
-    EVP_ORIG_GLOBAL,                                                    \
-    s390x_aes_##mode##_init_key,                                        \
-    s390x_aes_##mode##_cipher,                                          \
-    s390x_aes_##mode##_cleanup,                                         \
-    sizeof(S390X_AES_##MODE##_CTX),                                     \
-    NULL,                                                               \
-    NULL,                                                               \
-    s390x_aes_##mode##_ctrl,                                            \
-    NULL                                                                \
-};                                                                      \
-static const EVP_CIPHER aes_##keylen##_##mode = {                       \
-    nid##_##keylen##_##mode,blocksize,                                  \
-    (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8,        \
-    ivlen,                                                              \
-    flags | EVP_CIPH_##MODE##_MODE,                                     \
-    EVP_ORIG_GLOBAL,                                                    \
-    aes_##mode##_init_key,                                              \
-    aes_##mode##_cipher,                                                \
-    aes_##mode##_cleanup,                                               \
-    sizeof(EVP_AES_##MODE##_CTX),                                       \
-    NULL,                                                               \
-    NULL,                                                               \
-    aes_##mode##_ctrl,                                                  \
-    NULL                                                                \
-};                                                                      \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void)                       \
-{                                                                       \
-    return S390X_aes_##keylen##_##mode##_CAPABLE ?                      \
-           &s390x_aes_##keylen##_##mode : &aes_##keylen##_##mode;       \
-}
+#ifndef OPENSSL_NO_SIV
+#define S390X_AES_SIV_CTX EVP_AES_SIV_CTX
+
+#define s390x_aes_siv_init_key aes_siv_init_key
+#define s390x_aes_siv_cipher aes_siv_cipher
+#define s390x_aes_siv_cleanup aes_siv_cleanup
+#define s390x_aes_siv_ctrl aes_siv_ctrl
+#endif
+
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode,                                      \
+    MODE, flags)                                                                                              \
+    static const EVP_CIPHER s390x_aes_##keylen##_##mode = {                                                   \
+        nid##_##keylen##_##nmode, blocksize,                                                                  \
+        keylen / 8,                                                                                           \
+        ivlen,                                                                                                \
+        flags | EVP_CIPH_##MODE##_MODE,                                                                       \
+        EVP_ORIG_GLOBAL,                                                                                      \
+        s390x_aes_##mode##_init_key,                                                                          \
+        s390x_aes_##mode##_cipher,                                                                            \
+        NULL,                                                                                                 \
+        sizeof(S390X_AES_##MODE##_CTX),                                                                       \
+        NULL,                                                                                                 \
+        NULL,                                                                                                 \
+        NULL,                                                                                                 \
+        NULL                                                                                                  \
+    };                                                                                                        \
+    static const EVP_CIPHER aes_##keylen##_##mode = {                                                         \
+        nid##_##keylen##_##nmode,                                                                             \
+        blocksize,                                                                                            \
+        keylen / 8,                                                                                           \
+        ivlen,                                                                                                \
+        flags | EVP_CIPH_##MODE##_MODE,                                                                       \
+        EVP_ORIG_GLOBAL,                                                                                      \
+        aes_init_key,                                                                                         \
+        aes_##mode##_cipher,                                                                                  \
+        NULL,                                                                                                 \
+        sizeof(EVP_AES_KEY),                                                                                  \
+        NULL,                                                                                                 \
+        NULL,                                                                                                 \
+        NULL,                                                                                                 \
+        NULL                                                                                                  \
+    };                                                                                                        \
+    const EVP_CIPHER *EVP_aes_##keylen##_##mode(void)                                                         \
+    {                                                                                                         \
+        return S390X_aes_##keylen##_##mode##_CAPABLE ? &s390x_aes_##keylen##_##mode : &aes_##keylen##_##mode; \
+    }
+
+#define BLOCK_CIPHER_custom(nid, keylen, blocksize, ivlen, mode, MODE, flags)                                              \
+    static const EVP_CIPHER s390x_aes_##keylen##_##mode = {                                                                \
+        nid##_##keylen##_##mode,                                                                                           \
+        blocksize,                                                                                                         \
+        (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+        ivlen,                                                                                                             \
+        flags | EVP_CIPH_##MODE##_MODE,                                                                                    \
+        EVP_ORIG_GLOBAL,                                                                                                   \
+        s390x_aes_##mode##_init_key,                                                                                       \
+        s390x_aes_##mode##_cipher,                                                                                         \
+        s390x_aes_##mode##_cleanup,                                                                                        \
+        sizeof(S390X_AES_##MODE##_CTX),                                                                                    \
+        NULL,                                                                                                              \
+        NULL,                                                                                                              \
+        s390x_aes_##mode##_ctrl,                                                                                           \
+        NULL                                                                                                               \
+    };                                                                                                                     \
+    static const EVP_CIPHER aes_##keylen##_##mode = {                                                                      \
+        nid##_##keylen##_##mode, blocksize,                                                                                \
+        (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+        ivlen,                                                                                                             \
+        flags | EVP_CIPH_##MODE##_MODE,                                                                                    \
+        EVP_ORIG_GLOBAL,                                                                                                   \
+        aes_##mode##_init_key,                                                                                             \
+        aes_##mode##_cipher,                                                                                               \
+        aes_##mode##_cleanup,                                                                                              \
+        sizeof(EVP_AES_##MODE##_CTX),                                                                                      \
+        NULL,                                                                                                              \
+        NULL,                                                                                                              \
+        aes_##mode##_ctrl,                                                                                                 \
+        NULL                                                                                                               \
+    };                                                                                                                     \
+    const EVP_CIPHER *EVP_aes_##keylen##_##mode(void)                                                                      \
+    {                                                                                                                      \
+        return S390X_aes_##keylen##_##mode##_CAPABLE ? &s390x_aes_##keylen##_##mode : &aes_##keylen##_##mode;              \
+    }
 
 #else
 
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
-        nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        aes_init_key,                   \
-        aes_##mode##_cipher,            \
-        NULL,                           \
-        sizeof(EVP_AES_KEY),            \
-        NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ return &aes_##keylen##_##mode; }
-
-# define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \
-static const EVP_CIPHER aes_##keylen##_##mode = { \
-        nid##_##keylen##_##mode,blocksize, \
-        (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE?2:1)*keylen/8, \
-        ivlen,                          \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        aes_##mode##_init_key,          \
-        aes_##mode##_cipher,            \
-        aes_##mode##_cleanup,           \
-        sizeof(EVP_AES_##MODE##_CTX),   \
-        NULL,NULL,aes_##mode##_ctrl,NULL }; \
-const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
-{ return &aes_##keylen##_##mode; }
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, MODE, flags) \
+    static const EVP_CIPHER aes_##keylen##_##mode = {                                 \
+        nid##_##keylen##_##nmode, blocksize, keylen / 8, ivlen,                       \
+        flags | EVP_CIPH_##MODE##_MODE,                                               \
+        EVP_ORIG_GLOBAL,                                                              \
+        aes_init_key,                                                                 \
+        aes_##mode##_cipher,                                                          \
+        NULL,                                                                         \
+        sizeof(EVP_AES_KEY),                                                          \
+        NULL, NULL, NULL, NULL                                                        \
+    };                                                                                \
+    const EVP_CIPHER *EVP_aes_##keylen##_##mode(void)                                 \
+    {                                                                                 \
+        return &aes_##keylen##_##mode;                                                \
+    }
+
+#define BLOCK_CIPHER_custom(nid, keylen, blocksize, ivlen, mode, MODE, flags)                                              \
+    static const EVP_CIPHER aes_##keylen##_##mode = {                                                                      \
+        nid##_##keylen##_##mode, blocksize,                                                                                \
+        (EVP_CIPH_##MODE##_MODE == EVP_CIPH_XTS_MODE || EVP_CIPH_##MODE##_MODE == EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8, \
+        ivlen,                                                                                                             \
+        flags | EVP_CIPH_##MODE##_MODE,                                                                                    \
+        EVP_ORIG_GLOBAL,                                                                                                   \
+        aes_##mode##_init_key,                                                                                             \
+        aes_##mode##_cipher,                                                                                               \
+        aes_##mode##_cleanup,                                                                                              \
+        sizeof(EVP_AES_##MODE##_CTX),                                                                                      \
+        NULL, NULL, aes_##mode##_ctrl, NULL                                                                                \
+    };                                                                                                                     \
+    const EVP_CIPHER *EVP_aes_##keylen##_##mode(void)                                                                      \
+    {                                                                                                                      \
+        return &aes_##keylen##_##mode;                                                                                     \
+    }
 
 #endif
 
-#define BLOCK_CIPHER_generic_pack(nid,keylen,flags)             \
-        BLOCK_CIPHER_generic(nid,keylen,16,16,cbc,cbc,CBC,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)     \
-        BLOCK_CIPHER_generic(nid,keylen,16,0,ecb,ecb,ECB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)      \
-        BLOCK_CIPHER_generic(nid,keylen,1,16,ofb128,ofb,OFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
-        BLOCK_CIPHER_generic(nid,keylen,1,16,cfb128,cfb,CFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
-        BLOCK_CIPHER_generic(nid,keylen,1,16,cfb1,cfb1,CFB,flags)       \
-        BLOCK_CIPHER_generic(nid,keylen,1,16,cfb8,cfb8,CFB,flags)       \
-        BLOCK_CIPHER_generic(nid,keylen,1,16,ctr,ctr,CTR,flags)
+#define BLOCK_CIPHER_generic_pack(nid, keylen, flags)                                                          \
+    BLOCK_CIPHER_generic(nid, keylen, 16, 16, cbc, cbc, CBC, flags | EVP_CIPH_FLAG_DEFAULT_ASN1)               \
+        BLOCK_CIPHER_generic(nid, keylen, 16, 0, ecb, ecb, ECB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1)            \
+            BLOCK_CIPHER_generic(nid, keylen, 1, 16, ofb128, ofb, OFB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1)     \
+                BLOCK_CIPHER_generic(nid, keylen, 1, 16, cfb128, cfb, CFB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+                    BLOCK_CIPHER_generic(nid, keylen, 1, 16, cfb1, cfb1, CFB, flags)                           \
+                        BLOCK_CIPHER_generic(nid, keylen, 1, 16, cfb8, cfb8, CFB, flags)                       \
+                            BLOCK_CIPHER_generic(nid, keylen, 1, 16, ctr, ctr, CTR, flags)
 
 static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                        const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int ret, mode;
-    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
     const int keylen = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
 
     if (keylen <= 0) {
@@ -2418,77 +2430,73 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 #ifdef HWAES_CAPABLE
         if (HWAES_CAPABLE) {
             ret = HWAES_set_decrypt_key(key, keylen, &dat->ks.ks);
-            dat->block = (block128_f) HWAES_decrypt;
+            dat->block = (block128_f)HWAES_decrypt;
             dat->stream.cbc = NULL;
-# ifdef HWAES_cbc_encrypt
+#ifdef HWAES_cbc_encrypt
             if (mode == EVP_CIPH_CBC_MODE)
-                dat->stream.cbc = (cbc128_f) HWAES_cbc_encrypt;
-# endif
+                dat->stream.cbc = (cbc128_f)HWAES_cbc_encrypt;
+#endif
         } else
 #endif
 #ifdef BSAES_CAPABLE
-        if (BSAES_CAPABLE && mode == EVP_CIPH_CBC_MODE) {
+            if (BSAES_CAPABLE && mode == EVP_CIPH_CBC_MODE) {
             ret = AES_set_decrypt_key(key, keylen, &dat->ks.ks);
-            dat->block = (block128_f) AES_decrypt;
-            dat->stream.cbc = (cbc128_f) ossl_bsaes_cbc_encrypt;
+            dat->block = (block128_f)AES_decrypt;
+            dat->stream.cbc = (cbc128_f)ossl_bsaes_cbc_encrypt;
         } else
 #endif
 #ifdef VPAES_CAPABLE
-        if (VPAES_CAPABLE) {
+            if (VPAES_CAPABLE) {
             ret = vpaes_set_decrypt_key(key, keylen, &dat->ks.ks);
-            dat->block = (block128_f) vpaes_decrypt;
-            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-                (cbc128_f) vpaes_cbc_encrypt : NULL;
+            dat->block = (block128_f)vpaes_decrypt;
+            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)vpaes_cbc_encrypt : NULL;
         } else
 #endif
         {
             ret = AES_set_decrypt_key(key, keylen, &dat->ks.ks);
-            dat->block = (block128_f) AES_decrypt;
-            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-                (cbc128_f) AES_cbc_encrypt : NULL;
+            dat->block = (block128_f)AES_decrypt;
+            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)AES_cbc_encrypt : NULL;
         }
     } else
 #ifdef HWAES_CAPABLE
-    if (HWAES_CAPABLE) {
+        if (HWAES_CAPABLE) {
         ret = HWAES_set_encrypt_key(key, keylen, &dat->ks.ks);
-        dat->block = (block128_f) HWAES_encrypt;
+        dat->block = (block128_f)HWAES_encrypt;
         dat->stream.cbc = NULL;
-# ifdef HWAES_cbc_encrypt
+#ifdef HWAES_cbc_encrypt
         if (mode == EVP_CIPH_CBC_MODE)
-            dat->stream.cbc = (cbc128_f) HWAES_cbc_encrypt;
+            dat->stream.cbc = (cbc128_f)HWAES_cbc_encrypt;
         else
-# endif
-# ifdef HWAES_ctr32_encrypt_blocks
-        if (mode == EVP_CIPH_CTR_MODE)
-            dat->stream.ctr = (ctr128_f) HWAES_ctr32_encrypt_blocks;
+#endif
+#ifdef HWAES_ctr32_encrypt_blocks
+            if (mode == EVP_CIPH_CTR_MODE)
+            dat->stream.ctr = (ctr128_f)HWAES_ctr32_encrypt_blocks;
         else
-# endif
-            (void)0;            /* terminate potentially open 'else' */
+#endif
+            (void)0; /* terminate potentially open 'else' */
     } else
 #endif
 #ifdef BSAES_CAPABLE
-    if (BSAES_CAPABLE && mode == EVP_CIPH_CTR_MODE) {
+        if (BSAES_CAPABLE && mode == EVP_CIPH_CTR_MODE) {
         ret = AES_set_encrypt_key(key, keylen, &dat->ks.ks);
-        dat->block = (block128_f) AES_encrypt;
-        dat->stream.ctr = (ctr128_f) ossl_bsaes_ctr32_encrypt_blocks;
+        dat->block = (block128_f)AES_encrypt;
+        dat->stream.ctr = (ctr128_f)ossl_bsaes_ctr32_encrypt_blocks;
     } else
 #endif
 #ifdef VPAES_CAPABLE
-    if (VPAES_CAPABLE) {
+        if (VPAES_CAPABLE) {
         ret = vpaes_set_encrypt_key(key, keylen, &dat->ks.ks);
-        dat->block = (block128_f) vpaes_encrypt;
-        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-            (cbc128_f) vpaes_cbc_encrypt : NULL;
+        dat->block = (block128_f)vpaes_encrypt;
+        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)vpaes_cbc_encrypt : NULL;
     } else
 #endif
     {
         ret = AES_set_encrypt_key(key, keylen, &dat->ks.ks);
-        dat->block = (block128_f) AES_encrypt;
-        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-            (cbc128_f) AES_cbc_encrypt : NULL;
+        dat->block = (block128_f)AES_encrypt;
+        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)AES_cbc_encrypt : NULL;
 #ifdef AES_CTR_ASM
         if (mode == EVP_CIPH_CTR_MODE)
-            dat->stream.ctr = (ctr128_f) AES_ctr32_encrypt;
+            dat->stream.ctr = (ctr128_f)AES_ctr32_encrypt;
 #endif
     }
 
@@ -2501,87 +2509,87 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static int aes_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
 
     if (dat->stream.cbc)
-        (*dat->stream.cbc) (in, out, len, &dat->ks, ctx->iv,
-                            EVP_CIPHER_CTX_is_encrypting(ctx));
+        (*dat->stream.cbc)(in, out, len, &dat->ks, ctx->iv,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
     else if (EVP_CIPHER_CTX_is_encrypting(ctx))
         CRYPTO_cbc128_encrypt(in, out, len, &dat->ks, ctx->iv,
-                              dat->block);
+            dat->block);
     else
         CRYPTO_cbc128_decrypt(in, out, len, &dat->ks,
-                              ctx->iv, dat->block);
+            ctx->iv, dat->block);
 
     return 1;
 }
 
 static int aes_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     size_t bl = EVP_CIPHER_CTX_get_block_size(ctx);
     size_t i;
-    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
 
     if (len < bl)
         return 1;
 
     for (i = 0, len -= bl; i <= len; i += bl)
-        (*dat->block) (in + i, out + i, &dat->ks);
+        (*dat->block)(in + i, out + i, &dat->ks);
 
     return 1;
 }
 
 static int aes_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
 
     int num = EVP_CIPHER_CTX_get_num(ctx);
     CRYPTO_ofb128_encrypt(in, out, len, &dat->ks,
-                          ctx->iv, &num, dat->block);
+        ctx->iv, &num, dat->block);
     EVP_CIPHER_CTX_set_num(ctx, num);
     return 1;
 }
 
 static int aes_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
 
     int num = EVP_CIPHER_CTX_get_num(ctx);
     CRYPTO_cfb128_encrypt(in, out, len, &dat->ks,
-                          ctx->iv, &num,
-                          EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+        ctx->iv, &num,
+        EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
     EVP_CIPHER_CTX_set_num(ctx, num);
     return 1;
 }
 
 static int aes_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
 
     int num = EVP_CIPHER_CTX_get_num(ctx);
     CRYPTO_cfb128_8_encrypt(in, out, len, &dat->ks,
-                            ctx->iv, &num,
-                            EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+        ctx->iv, &num,
+        EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
     EVP_CIPHER_CTX_set_num(ctx, num);
     return 1;
 }
 
 static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
 
     if (EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS)) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         CRYPTO_cfb128_1_encrypt(in, out, len, &dat->ks,
-                                ctx->iv, &num,
-                                EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+            ctx->iv, &num,
+            EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
         EVP_CIPHER_CTX_set_num(ctx, num);
         return 1;
     }
@@ -2589,18 +2597,18 @@ static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     while (len >= MAXBITCHUNK) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         CRYPTO_cfb128_1_encrypt(in, out, MAXBITCHUNK * 8, &dat->ks,
-                                ctx->iv, &num,
-                                EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+            ctx->iv, &num,
+            EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
         EVP_CIPHER_CTX_set_num(ctx, num);
         len -= MAXBITCHUNK;
         out += MAXBITCHUNK;
-        in  += MAXBITCHUNK;
+        in += MAXBITCHUNK;
     }
     if (len) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         CRYPTO_cfb128_1_encrypt(in, out, len * 8, &dat->ks,
-                                ctx->iv, &num,
-                                EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+            ctx->iv, &num,
+            EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
         EVP_CIPHER_CTX_set_num(ctx, num);
     }
 
@@ -2608,11 +2616,11 @@ static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int aes_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     int n = EVP_CIPHER_CTX_get_num(ctx);
     unsigned int num;
-    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY,ctx);
+    EVP_AES_KEY *dat = EVP_C_DATA(EVP_AES_KEY, ctx);
 
     if (n < 0)
         return 0;
@@ -2620,25 +2628,25 @@ static int aes_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
     if (dat->stream.ctr)
         CRYPTO_ctr128_encrypt_ctr32(in, out, len, &dat->ks,
-                                    ctx->iv,
-                                    EVP_CIPHER_CTX_buf_noconst(ctx),
-                                    &num, dat->stream.ctr);
+            ctx->iv,
+            EVP_CIPHER_CTX_buf_noconst(ctx),
+            &num, dat->stream.ctr);
     else
         CRYPTO_ctr128_encrypt(in, out, len, &dat->ks,
-                              ctx->iv,
-                              EVP_CIPHER_CTX_buf_noconst(ctx), &num,
-                              dat->block);
+            ctx->iv,
+            EVP_CIPHER_CTX_buf_noconst(ctx), &num,
+            dat->block);
     EVP_CIPHER_CTX_set_num(ctx, num);
     return 1;
 }
 
 BLOCK_CIPHER_generic_pack(NID_aes, 128, 0)
     BLOCK_CIPHER_generic_pack(NID_aes, 192, 0)
-    BLOCK_CIPHER_generic_pack(NID_aes, 256, 0)
+        BLOCK_CIPHER_generic_pack(NID_aes, 256, 0)
 
-static int aes_gcm_cleanup(EVP_CIPHER_CTX *c)
+            static int aes_gcm_cleanup(EVP_CIPHER_CTX *c)
 {
-    EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX,c);
+    EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, c);
     if (gctx == NULL)
         return 0;
     OPENSSL_cleanse(&gctx->gcm, sizeof(gctx->gcm));
@@ -2649,7 +2657,7 @@ static int aes_gcm_cleanup(EVP_CIPHER_CTX *c)
 
 static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 {
-    EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX,c);
+    EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, c);
     switch (type) {
     case EVP_CTRL_INIT:
         gctx->key_set = 0;
@@ -2760,35 +2768,33 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
         /* Extra padding: tag appended to record */
         return EVP_GCM_TLS_TAG_LEN;
 
-    case EVP_CTRL_COPY:
-        {
-            EVP_CIPHER_CTX *out = ptr;
-            EVP_AES_GCM_CTX *gctx_out = EVP_C_DATA(EVP_AES_GCM_CTX,out);
-            if (gctx->gcm.key) {
-                if (gctx->gcm.key != &gctx->ks)
-                    return 0;
-                gctx_out->gcm.key = &gctx_out->ks;
-            }
-            if (gctx->iv == c->iv)
-                gctx_out->iv = out->iv;
-            else {
-                if ((gctx_out->iv = OPENSSL_malloc(gctx->ivlen)) == NULL)
-                    return 0;
-                memcpy(gctx_out->iv, gctx->iv, gctx->ivlen);
-            }
-            return 1;
+    case EVP_CTRL_COPY: {
+        EVP_CIPHER_CTX *out = ptr;
+        EVP_AES_GCM_CTX *gctx_out = EVP_C_DATA(EVP_AES_GCM_CTX, out);
+        if (gctx->gcm.key) {
+            if (gctx->gcm.key != &gctx->ks)
+                return 0;
+            gctx_out->gcm.key = &gctx_out->ks;
+        }
+        if (gctx->iv == c->iv)
+            gctx_out->iv = out->iv;
+        else {
+            if ((gctx_out->iv = OPENSSL_malloc(gctx->ivlen)) == NULL)
+                return 0;
+            memcpy(gctx_out->iv, gctx->iv, gctx->ivlen);
         }
+        return 1;
+    }
 
     default:
         return -1;
-
     }
 }
 
 static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                            const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
-    EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX,ctx);
+    EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, ctx);
 
     if (iv == NULL && key == NULL)
         return 1;
@@ -2805,40 +2811,40 @@ static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
             if (HWAES_CAPABLE) {
                 HWAES_set_encrypt_key(key, keylen, &gctx->ks.ks);
                 CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
-                                   (block128_f) HWAES_encrypt);
-# ifdef HWAES_ctr32_encrypt_blocks
-                gctx->ctr = (ctr128_f) HWAES_ctr32_encrypt_blocks;
-# else
+                    (block128_f)HWAES_encrypt);
+#ifdef HWAES_ctr32_encrypt_blocks
+                gctx->ctr = (ctr128_f)HWAES_ctr32_encrypt_blocks;
+#else
                 gctx->ctr = NULL;
-# endif
+#endif
                 break;
             } else
 #endif
 #ifdef BSAES_CAPABLE
-            if (BSAES_CAPABLE) {
+                if (BSAES_CAPABLE) {
                 AES_set_encrypt_key(key, keylen, &gctx->ks.ks);
                 CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
-                                   (block128_f) AES_encrypt);
-                gctx->ctr = (ctr128_f) ossl_bsaes_ctr32_encrypt_blocks;
+                    (block128_f)AES_encrypt);
+                gctx->ctr = (ctr128_f)ossl_bsaes_ctr32_encrypt_blocks;
                 break;
             } else
 #endif
 #ifdef VPAES_CAPABLE
-            if (VPAES_CAPABLE) {
+                if (VPAES_CAPABLE) {
                 vpaes_set_encrypt_key(key, keylen, &gctx->ks.ks);
                 CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
-                                   (block128_f) vpaes_encrypt);
+                    (block128_f)vpaes_encrypt);
                 gctx->ctr = NULL;
                 break;
             } else
 #endif
-                (void)0;        /* terminate potentially open 'else' */
+                (void)0; /* terminate potentially open 'else' */
 
             AES_set_encrypt_key(key, keylen, &gctx->ks.ks);
             CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
-                               (block128_f) AES_encrypt);
+                (block128_f)AES_encrypt);
 #ifdef AES_CTR_ASM
-            gctx->ctr = (ctr128_f) AES_ctr32_encrypt;
+            gctx->ctr = (ctr128_f)AES_ctr32_encrypt;
 #else
             gctx->ctr = NULL;
 #endif
@@ -2874,9 +2880,9 @@ static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
  */
 
 static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX,ctx);
+    EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, ctx);
     int rv = -1;
     /* Encrypt/decrypt must be performed in place */
     if (out != in
@@ -2899,13 +2905,13 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
      * buffer.
      */
     if (EVP_CIPHER_CTX_ctrl(ctx,
-                            EVP_CIPHER_CTX_is_encrypting(ctx) ?
-                                EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
-                            EVP_GCM_TLS_EXPLICIT_IV_LEN, out) <= 0)
+            EVP_CIPHER_CTX_is_encrypting(ctx) ? EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
+            EVP_GCM_TLS_EXPLICIT_IV_LEN, out)
+        <= 0)
         goto err;
     /* Use saved AAD */
     if (CRYPTO_gcm128_aad(&gctx->gcm, EVP_CIPHER_CTX_buf_noconst(ctx),
-                          gctx->tls_aad_len))
+            gctx->tls_aad_len))
         goto err;
     /* Fix buffer and length to point to payload */
     in += EVP_GCM_TLS_EXPLICIT_IV_LEN;
@@ -2921,15 +2927,15 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                     return -1;
 
                 bulk = AES_gcm_encrypt(in, out, len,
-                                       gctx->gcm.key,
-                                       gctx->gcm.Yi.c, gctx->gcm.Xi.u);
+                    gctx->gcm.key,
+                    gctx->gcm.Yi.c, gctx->gcm.Xi.u);
                 gctx->gcm.len.u[1] += bulk;
             }
 #endif
             if (CRYPTO_gcm128_encrypt_ctr32(&gctx->gcm,
-                                            in + bulk,
-                                            out + bulk,
-                                            len - bulk, gctx->ctr))
+                    in + bulk,
+                    out + bulk,
+                    len - bulk, gctx->ctr))
                 goto err;
         } else {
             size_t bulk = 0;
@@ -2939,13 +2945,13 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                     return -1;
 
                 bulk = AES_gcm_encrypt(in, out, len,
-                                       gctx->gcm.key,
-                                       gctx->gcm.Yi.c, gctx->gcm.Xi.u);
+                    gctx->gcm.key,
+                    gctx->gcm.Yi.c, gctx->gcm.Xi.u);
                 gctx->gcm.len.u[1] += bulk;
             }
 #endif
             if (CRYPTO_gcm128_encrypt(&gctx->gcm,
-                                      in + bulk, out + bulk, len - bulk))
+                    in + bulk, out + bulk, len - bulk))
                 goto err;
         }
         out += len;
@@ -2962,15 +2968,15 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                     return -1;
 
                 bulk = AES_gcm_decrypt(in, out, len,
-                                       gctx->gcm.key,
-                                       gctx->gcm.Yi.c, gctx->gcm.Xi.u);
+                    gctx->gcm.key,
+                    gctx->gcm.Yi.c, gctx->gcm.Xi.u);
                 gctx->gcm.len.u[1] += bulk;
             }
 #endif
             if (CRYPTO_gcm128_decrypt_ctr32(&gctx->gcm,
-                                            in + bulk,
-                                            out + bulk,
-                                            len - bulk, gctx->ctr))
+                    in + bulk,
+                    out + bulk,
+                    len - bulk, gctx->ctr))
                 goto err;
         } else {
             size_t bulk = 0;
@@ -2980,28 +2986,28 @@ static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                     return -1;
 
                 bulk = AES_gcm_decrypt(in, out, len,
-                                       gctx->gcm.key,
-                                       gctx->gcm.Yi.c, gctx->gcm.Xi.u);
+                    gctx->gcm.key,
+                    gctx->gcm.Yi.c, gctx->gcm.Xi.u);
                 gctx->gcm.len.u[1] += bulk;
             }
 #endif
             if (CRYPTO_gcm128_decrypt(&gctx->gcm,
-                                      in + bulk, out + bulk, len - bulk))
+                    in + bulk, out + bulk, len - bulk))
                 goto err;
         }
         /* Retrieve tag */
         CRYPTO_gcm128_tag(&gctx->gcm, EVP_CIPHER_CTX_buf_noconst(ctx),
-                          EVP_GCM_TLS_TAG_LEN);
+            EVP_GCM_TLS_TAG_LEN);
         /* If tag mismatch wipe buffer */
         if (CRYPTO_memcmp(EVP_CIPHER_CTX_buf_noconst(ctx), in + len,
-                          EVP_GCM_TLS_TAG_LEN)) {
+                EVP_GCM_TLS_TAG_LEN)) {
             OPENSSL_cleanse(out, len);
             goto err;
         }
         rv = len;
     }
 
- err:
+err:
     gctx->iv_set = 0;
     gctx->tls_aad_len = -1;
     return rv;
@@ -3032,9 +3038,9 @@ static int aes_gcm_iv_generate(EVP_AES_GCM_CTX *gctx, int offset)
 #endif /* FIPS_MODULE */
 
 static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX,ctx);
+    EVP_AES_GCM_CTX *gctx = EVP_C_DATA(EVP_AES_GCM_CTX, ctx);
 
     /* If not set up, return error */
     if (!gctx->key_set)
@@ -3077,17 +3083,17 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                         return -1;
 
                     bulk = AES_gcm_encrypt(in + res,
-                                           out + res, len - res,
-                                           gctx->gcm.key, gctx->gcm.Yi.c,
-                                           gctx->gcm.Xi.u);
+                        out + res, len - res,
+                        gctx->gcm.key, gctx->gcm.Yi.c,
+                        gctx->gcm.Xi.u);
                     gctx->gcm.len.u[1] += bulk;
                     bulk += res;
                 }
 #endif
                 if (CRYPTO_gcm128_encrypt_ctr32(&gctx->gcm,
-                                                in + bulk,
-                                                out + bulk,
-                                                len - bulk, gctx->ctr))
+                        in + bulk,
+                        out + bulk,
+                        len - bulk, gctx->ctr))
                     return -1;
             } else {
                 size_t bulk = 0;
@@ -3099,15 +3105,15 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                         return -1;
 
                     bulk = AES_gcm_encrypt(in + res,
-                                           out + res, len - res,
-                                           gctx->gcm.key, gctx->gcm.Yi.c,
-                                           gctx->gcm.Xi.u);
+                        out + res, len - res,
+                        gctx->gcm.key, gctx->gcm.Yi.c,
+                        gctx->gcm.Xi.u);
                     gctx->gcm.len.u[1] += bulk;
                     bulk += res;
                 }
 #endif
                 if (CRYPTO_gcm128_encrypt(&gctx->gcm,
-                                          in + bulk, out + bulk, len - bulk))
+                        in + bulk, out + bulk, len - bulk))
                     return -1;
             }
         } else {
@@ -3121,17 +3127,17 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                         return -1;
 
                     bulk = AES_gcm_decrypt(in + res,
-                                           out + res, len - res,
-                                           gctx->gcm.key,
-                                           gctx->gcm.Yi.c, gctx->gcm.Xi.u);
+                        out + res, len - res,
+                        gctx->gcm.key,
+                        gctx->gcm.Yi.c, gctx->gcm.Xi.u);
                     gctx->gcm.len.u[1] += bulk;
                     bulk += res;
                 }
 #endif
                 if (CRYPTO_gcm128_decrypt_ctr32(&gctx->gcm,
-                                                in + bulk,
-                                                out + bulk,
-                                                len - bulk, gctx->ctr))
+                        in + bulk,
+                        out + bulk,
+                        len - bulk, gctx->ctr))
                     return -1;
             } else {
                 size_t bulk = 0;
@@ -3143,15 +3149,15 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                         return -1;
 
                     bulk = AES_gcm_decrypt(in + res,
-                                           out + res, len - res,
-                                           gctx->gcm.key,
-                                           gctx->gcm.Yi.c, gctx->gcm.Xi.u);
+                        out + res, len - res,
+                        gctx->gcm.key,
+                        gctx->gcm.Yi.c, gctx->gcm.Xi.u);
                     gctx->gcm.len.u[1] += bulk;
                     bulk += res;
                 }
 #endif
                 if (CRYPTO_gcm128_decrypt(&gctx->gcm,
-                                          in + bulk, out + bulk, len - bulk))
+                        in + bulk, out + bulk, len - bulk))
                     return -1;
             }
         }
@@ -3161,8 +3167,9 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             if (gctx->taglen < 0)
                 return -1;
             if (CRYPTO_gcm128_finish(&gctx->gcm,
-                                     EVP_CIPHER_CTX_buf_noconst(ctx),
-                                     gctx->taglen) != 0)
+                    EVP_CIPHER_CTX_buf_noconst(ctx),
+                    gctx->taglen)
+                != 0)
                 return -1;
             gctx->iv_set = 0;
             return 0;
@@ -3173,28 +3180,27 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         gctx->iv_set = 0;
         return 0;
     }
-
 }
 
-#define CUSTOM_FLAGS    (EVP_CIPH_FLAG_DEFAULT_ASN1 \
-                | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
-                | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
-                | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_CUSTOM_IV_LENGTH)
+#define CUSTOM_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1       \
+    | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
+    | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT   \
+    | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_CUSTOM_IV_LENGTH)
 
 BLOCK_CIPHER_custom(NID_aes, 128, 1, 12, gcm, GCM,
-                    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 192, 1, 12, gcm, GCM,
-                    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 256, 1, 12, gcm, GCM,
-                    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+    BLOCK_CIPHER_custom(NID_aes, 192, 1, 12, gcm, GCM,
+        EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+        BLOCK_CIPHER_custom(NID_aes, 256, 1, 12, gcm, GCM,
+            EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
 
-static int aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
+            static int aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 {
     EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX, c);
 
     if (type == EVP_CTRL_COPY) {
         EVP_CIPHER_CTX *out = ptr;
-        EVP_AES_XTS_CTX *xctx_out = EVP_C_DATA(EVP_AES_XTS_CTX,out);
+        EVP_AES_XTS_CTX *xctx_out = EVP_C_DATA(EVP_AES_XTS_CTX, out);
 
         if (xctx->xts.key1) {
             if (xctx->xts.key1 != &xctx->ks1)
@@ -3216,9 +3222,9 @@ static int aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 }
 
 static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                            const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
-    EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX,ctx);
+    EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX, ctx);
 
     if (iv == NULL && key == NULL)
         return 1;
@@ -3251,7 +3257,7 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
              *       data with them."
              */
             if ((!allow_insecure_decrypt || enc)
-                    && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
+                && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
                 ERR_raise(ERR_LIB_EVP, EVP_R_XTS_DUPLICATED_KEYS);
                 return 0;
             }
@@ -3266,59 +3272,59 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
             if (HWAES_CAPABLE) {
                 if (enc) {
                     HWAES_set_encrypt_key(key, bits, &xctx->ks1.ks);
-                    xctx->xts.block1 = (block128_f) HWAES_encrypt;
-# ifdef HWAES_xts_encrypt
+                    xctx->xts.block1 = (block128_f)HWAES_encrypt;
+#ifdef HWAES_xts_encrypt
                     xctx->stream = HWAES_xts_encrypt;
-# endif
+#endif
                 } else {
                     HWAES_set_decrypt_key(key, bits, &xctx->ks1.ks);
-                    xctx->xts.block1 = (block128_f) HWAES_decrypt;
-# ifdef HWAES_xts_decrypt
+                    xctx->xts.block1 = (block128_f)HWAES_decrypt;
+#ifdef HWAES_xts_decrypt
                     xctx->stream = HWAES_xts_decrypt;
 #endif
                 }
 
                 HWAES_set_encrypt_key(key + bytes, bits, &xctx->ks2.ks);
-                xctx->xts.block2 = (block128_f) HWAES_encrypt;
+                xctx->xts.block2 = (block128_f)HWAES_encrypt;
 
                 xctx->xts.key1 = &xctx->ks1;
                 break;
             } else
 #endif
 #ifdef BSAES_CAPABLE
-            if (BSAES_CAPABLE)
+                if (BSAES_CAPABLE)
                 xctx->stream = enc ? ossl_bsaes_xts_encrypt : ossl_bsaes_xts_decrypt;
             else
 #endif
 #ifdef VPAES_CAPABLE
-            if (VPAES_CAPABLE) {
+                if (VPAES_CAPABLE) {
                 if (enc) {
                     vpaes_set_encrypt_key(key, bits, &xctx->ks1.ks);
-                    xctx->xts.block1 = (block128_f) vpaes_encrypt;
+                    xctx->xts.block1 = (block128_f)vpaes_encrypt;
                 } else {
                     vpaes_set_decrypt_key(key, bits, &xctx->ks1.ks);
-                    xctx->xts.block1 = (block128_f) vpaes_decrypt;
+                    xctx->xts.block1 = (block128_f)vpaes_decrypt;
                 }
 
                 vpaes_set_encrypt_key(key + bytes, bits, &xctx->ks2.ks);
-                xctx->xts.block2 = (block128_f) vpaes_encrypt;
+                xctx->xts.block2 = (block128_f)vpaes_encrypt;
 
                 xctx->xts.key1 = &xctx->ks1;
                 break;
             } else
 #endif
-                (void)0;        /* terminate potentially open 'else' */
+                (void)0; /* terminate potentially open 'else' */
 
             if (enc) {
                 AES_set_encrypt_key(key, bits, &xctx->ks1.ks);
-                xctx->xts.block1 = (block128_f) AES_encrypt;
+                xctx->xts.block1 = (block128_f)AES_encrypt;
             } else {
                 AES_set_decrypt_key(key, bits, &xctx->ks1.ks);
-                xctx->xts.block1 = (block128_f) AES_decrypt;
+                xctx->xts.block1 = (block128_f)AES_decrypt;
             }
 
             AES_set_encrypt_key(key + bytes, bits, &xctx->ks2.ks);
-            xctx->xts.block2 = (block128_f) AES_encrypt;
+            xctx->xts.block2 = (block128_f)AES_encrypt;
 
             xctx->xts.key1 = &xctx->ks1;
         } while (0);
@@ -3333,15 +3339,15 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX,ctx);
+    EVP_AES_XTS_CTX *xctx = EVP_C_DATA(EVP_AES_XTS_CTX, ctx);
 
     if (xctx->xts.key1 == NULL
-            || xctx->xts.key2 == NULL
-            || out == NULL
-            || in == NULL
-            || len < AES_BLOCK_SIZE)
+        || xctx->xts.key2 == NULL
+        || out == NULL
+        || in == NULL
+        || len < AES_BLOCK_SIZE)
         return 0;
 
     /*
@@ -3356,27 +3362,27 @@ static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     }
 
     if (xctx->stream)
-        (*xctx->stream) (in, out, len,
-                         xctx->xts.key1, xctx->xts.key2,
-                         ctx->iv);
+        (*xctx->stream)(in, out, len,
+            xctx->xts.key1, xctx->xts.key2,
+            ctx->iv);
     else if (CRYPTO_xts128_encrypt(&xctx->xts, ctx->iv, in, out, len,
-                                   EVP_CIPHER_CTX_is_encrypting(ctx)))
+                 EVP_CIPHER_CTX_is_encrypting(ctx)))
         return 0;
     return 1;
 }
 
 #define aes_xts_cleanup NULL
 
-#define XTS_FLAGS       (EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV \
-                         | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
-                         | EVP_CIPH_CUSTOM_COPY)
+#define XTS_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV \
+    | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT               \
+    | EVP_CIPH_CUSTOM_COPY)
 
 BLOCK_CIPHER_custom(NID_aes, 128, 1, 16, xts, XTS, XTS_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 256, 1, 16, xts, XTS, XTS_FLAGS)
+    BLOCK_CIPHER_custom(NID_aes, 256, 1, 16, xts, XTS, XTS_FLAGS)
 
-static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
+        static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 {
-    EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX,c);
+    EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX, c);
     switch (type) {
     case EVP_CTRL_INIT:
         cctx->key_set = 0;
@@ -3399,8 +3405,7 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
         memcpy(EVP_CIPHER_CTX_buf_noconst(c), ptr, arg);
         cctx->tls_aad_len = arg;
         {
-            uint16_t len =
-                EVP_CIPHER_CTX_buf_noconst(c)[arg - 2] << 8
+            uint16_t len = EVP_CIPHER_CTX_buf_noconst(c)[arg - 2] << 8
                 | EVP_CIPHER_CTX_buf_noconst(c)[arg - 1];
             /* Correct length for explicit IV */
             if (len < EVP_CCM_TLS_EXPLICIT_IV_LEN)
@@ -3457,28 +3462,26 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
         cctx->len_set = 0;
         return 1;
 
-    case EVP_CTRL_COPY:
-        {
-            EVP_CIPHER_CTX *out = ptr;
-            EVP_AES_CCM_CTX *cctx_out = EVP_C_DATA(EVP_AES_CCM_CTX,out);
-            if (cctx->ccm.key) {
-                if (cctx->ccm.key != &cctx->ks)
-                    return 0;
-                cctx_out->ccm.key = &cctx_out->ks;
-            }
-            return 1;
+    case EVP_CTRL_COPY: {
+        EVP_CIPHER_CTX *out = ptr;
+        EVP_AES_CCM_CTX *cctx_out = EVP_C_DATA(EVP_AES_CCM_CTX, out);
+        if (cctx->ccm.key) {
+            if (cctx->ccm.key != &cctx->ks)
+                return 0;
+            cctx_out->ccm.key = &cctx_out->ks;
         }
+        return 1;
+    }
 
     default:
         return -1;
-
     }
 }
 
 static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                            const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
-    EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX,ctx);
+    EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX, ctx);
 
     if (iv == NULL && key == NULL)
         return 1;
@@ -3496,17 +3499,17 @@ static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                 HWAES_set_encrypt_key(key, keylen, &cctx->ks.ks);
 
                 CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
-                                   &cctx->ks, (block128_f) HWAES_encrypt);
+                    &cctx->ks, (block128_f)HWAES_encrypt);
                 cctx->str = NULL;
                 cctx->key_set = 1;
                 break;
             } else
 #endif
 #ifdef VPAES_CAPABLE
-            if (VPAES_CAPABLE) {
+                if (VPAES_CAPABLE) {
                 vpaes_set_encrypt_key(key, keylen, &cctx->ks.ks);
                 CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
-                                   &cctx->ks, (block128_f) vpaes_encrypt);
+                    &cctx->ks, (block128_f)vpaes_encrypt);
                 cctx->str = NULL;
                 cctx->key_set = 1;
                 break;
@@ -3514,7 +3517,7 @@ static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 #endif
             AES_set_encrypt_key(key, keylen, &cctx->ks.ks);
             CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
-                               &cctx->ks, (block128_f) AES_encrypt);
+                &cctx->ks, (block128_f)AES_encrypt);
             cctx->str = NULL;
             cctx->key_set = 1;
         } while (0);
@@ -3527,9 +3530,9 @@ static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static int aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX,ctx);
+    EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX, ctx);
     CCM128_CONTEXT *ccm = &cctx->ccm;
     /* Encrypt/decrypt must be performed in place */
     if (out != in || len < (EVP_CCM_TLS_EXPLICIT_IV_LEN + (size_t)cctx->M))
@@ -3537,33 +3540,33 @@ static int aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     /* If encrypting set explicit IV from sequence number (start of AAD) */
     if (EVP_CIPHER_CTX_is_encrypting(ctx))
         memcpy(out, EVP_CIPHER_CTX_buf_noconst(ctx),
-               EVP_CCM_TLS_EXPLICIT_IV_LEN);
+            EVP_CCM_TLS_EXPLICIT_IV_LEN);
     /* Get rest of IV from explicit IV */
     memcpy(ctx->iv + EVP_CCM_TLS_FIXED_IV_LEN, in,
-           EVP_CCM_TLS_EXPLICIT_IV_LEN);
+        EVP_CCM_TLS_EXPLICIT_IV_LEN);
     /* Correct length value */
     len -= EVP_CCM_TLS_EXPLICIT_IV_LEN + cctx->M;
     if (CRYPTO_ccm128_setiv(ccm, ctx->iv, 15 - cctx->L,
-                            len))
-            return -1;
+            len))
+        return -1;
     /* Use saved AAD */
     CRYPTO_ccm128_aad(ccm, EVP_CIPHER_CTX_buf_noconst(ctx),
-                      cctx->tls_aad_len);
+        cctx->tls_aad_len);
     /* Fix buffer to point to payload */
     in += EVP_CCM_TLS_EXPLICIT_IV_LEN;
     out += EVP_CCM_TLS_EXPLICIT_IV_LEN;
     if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
         if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len,
-                                                    cctx->str) :
-            CRYPTO_ccm128_encrypt(ccm, in, out, len))
+                            cctx->str)
+                      : CRYPTO_ccm128_encrypt(ccm, in, out, len))
             return -1;
         if (!CRYPTO_ccm128_tag(ccm, out + len, cctx->M))
             return -1;
         return len + EVP_CCM_TLS_EXPLICIT_IV_LEN + cctx->M;
     } else {
         if (cctx->str ? !CRYPTO_ccm128_decrypt_ccm64(ccm, in, out, len,
-                                                     cctx->str) :
-            !CRYPTO_ccm128_decrypt(ccm, in, out, len)) {
+                            cctx->str)
+                      : !CRYPTO_ccm128_decrypt(ccm, in, out, len)) {
             unsigned char tag[16];
             if (CRYPTO_ccm128_tag(ccm, tag, cctx->M)) {
                 if (!CRYPTO_memcmp(tag, in + len, cctx->M))
@@ -3576,9 +3579,9 @@ static int aes_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX,ctx);
+    EVP_AES_CCM_CTX *cctx = EVP_C_DATA(EVP_AES_CCM_CTX, ctx);
     CCM128_CONTEXT *ccm = &cctx->ccm;
     /* If not set up, return error */
     if (!cctx->key_set)
@@ -3597,7 +3600,7 @@ static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     if (!out) {
         if (!in) {
             if (CRYPTO_ccm128_setiv(ccm, ctx->iv,
-                                    15 - cctx->L, len))
+                    15 - cctx->L, len))
                 return -1;
             cctx->len_set = 1;
             return len;
@@ -3621,20 +3624,20 @@ static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     }
     if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
         if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len,
-                                                    cctx->str) :
-            CRYPTO_ccm128_encrypt(ccm, in, out, len))
+                            cctx->str)
+                      : CRYPTO_ccm128_encrypt(ccm, in, out, len))
             return -1;
         cctx->tag_set = 1;
         return len;
     } else {
         int rv = -1;
         if (cctx->str ? !CRYPTO_ccm128_decrypt_ccm64(ccm, in, out, len,
-                                                     cctx->str) :
-            !CRYPTO_ccm128_decrypt(ccm, in, out, len)) {
+                            cctx->str)
+                      : !CRYPTO_ccm128_decrypt(ccm, in, out, len)) {
             unsigned char tag[16];
             if (CRYPTO_ccm128_tag(ccm, tag, cctx->M)) {
                 if (!CRYPTO_memcmp(tag, EVP_CIPHER_CTX_buf_noconst(ctx),
-                                   cctx->M))
+                        cctx->M))
                     rv = len;
             }
         }
@@ -3650,13 +3653,13 @@ static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 #define aes_ccm_cleanup NULL
 
 BLOCK_CIPHER_custom(NID_aes, 128, 1, 12, ccm, CCM,
-                    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 192, 1, 12, ccm, CCM,
-                    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 256, 1, 12, ccm, CCM,
-                    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+    BLOCK_CIPHER_custom(NID_aes, 192, 1, 12, ccm, CCM,
+        EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+        BLOCK_CIPHER_custom(NID_aes, 256, 1, 12, ccm, CCM,
+            EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
 
-typedef struct {
+            typedef struct {
     union {
         OSSL_UNION_ALIGN;
         AES_KEY ks;
@@ -3666,10 +3669,10 @@ typedef struct {
 } EVP_AES_WRAP_CTX;
 
 static int aes_wrap_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int len;
-    EVP_AES_WRAP_CTX *wctx = EVP_C_DATA(EVP_AES_WRAP_CTX,ctx);
+    EVP_AES_WRAP_CTX *wctx = EVP_C_DATA(EVP_AES_WRAP_CTX, ctx);
 
     if (iv == NULL && key == NULL)
         return 1;
@@ -3697,9 +3700,9 @@ static int aes_wrap_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inlen)
+    const unsigned char *in, size_t inlen)
 {
-    EVP_AES_WRAP_CTX *wctx = EVP_C_DATA(EVP_AES_WRAP_CTX,ctx);
+    EVP_AES_WRAP_CTX *wctx = EVP_C_DATA(EVP_AES_WRAP_CTX, ctx);
     size_t rv;
     /* AES wrap with padding has IV length of 4, without padding 8 */
     int pad = EVP_CIPHER_CTX_get_iv_length(ctx) == 4;
@@ -3738,26 +3741,26 @@ static int aes_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     if (pad) {
         if (EVP_CIPHER_CTX_is_encrypting(ctx))
             rv = CRYPTO_128_wrap_pad(&wctx->ks.ks, wctx->iv,
-                                     out, in, inlen,
-                                     (block128_f) AES_encrypt);
+                out, in, inlen,
+                (block128_f)AES_encrypt);
         else
             rv = CRYPTO_128_unwrap_pad(&wctx->ks.ks, wctx->iv,
-                                       out, in, inlen,
-                                       (block128_f) AES_decrypt);
+                out, in, inlen,
+                (block128_f)AES_decrypt);
     } else {
         if (EVP_CIPHER_CTX_is_encrypting(ctx))
             rv = CRYPTO_128_wrap(&wctx->ks.ks, wctx->iv,
-                                 out, in, inlen, (block128_f) AES_encrypt);
+                out, in, inlen, (block128_f)AES_encrypt);
         else
             rv = CRYPTO_128_unwrap(&wctx->ks.ks, wctx->iv,
-                                   out, in, inlen, (block128_f) AES_decrypt);
+                out, in, inlen, (block128_f)AES_decrypt);
     }
     return rv ? (int)rv : -1;
 }
 
-#define WRAP_FLAGS      (EVP_CIPH_WRAP_MODE \
-                | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
-                | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_FLAG_DEFAULT_ASN1)
+#define WRAP_FLAGS (EVP_CIPH_WRAP_MODE                 \
+    | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
+    | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_FLAG_DEFAULT_ASN1)
 
 static const EVP_CIPHER aes_128_wrap = {
     NID_id_aes128_wrap,
@@ -3846,7 +3849,7 @@ const EVP_CIPHER *EVP_aes_256_wrap_pad(void)
 #ifndef OPENSSL_NO_OCB
 static int aes_ocb_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 {
-    EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX,c);
+    EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX, c);
     EVP_CIPHER_CTX *newc;
     EVP_AES_OCB_CTX *new_octx;
 
@@ -3896,27 +3899,26 @@ static int aes_ocb_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 
     case EVP_CTRL_COPY:
         newc = (EVP_CIPHER_CTX *)ptr;
-        new_octx = EVP_C_DATA(EVP_AES_OCB_CTX,newc);
+        new_octx = EVP_C_DATA(EVP_AES_OCB_CTX, newc);
         return CRYPTO_ocb128_copy_ctx(&new_octx->ocb, &octx->ocb,
-                                      &new_octx->ksenc.ks,
-                                      &new_octx->ksdec.ks);
+            &new_octx->ksenc.ks,
+            &new_octx->ksdec.ks);
 
     default:
         return -1;
-
     }
 }
 
 static int aes_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                            const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
-    EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX,ctx);
+    EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX, ctx);
 
     if (iv == NULL && key == NULL)
         return 1;
 
     if (key != NULL) {
-       const int keylen = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
+        const int keylen = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
 
         if (keylen <= 0) {
             ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY_LENGTH);
@@ -3928,43 +3930,42 @@ static int aes_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
              * needs both. We could possibly optimise to remove setting the
              * decrypt for an encryption operation.
              */
-# ifdef HWAES_CAPABLE
+#ifdef HWAES_CAPABLE
             if (HWAES_CAPABLE) {
                 HWAES_set_encrypt_key(key, keylen, &octx->ksenc.ks);
                 HWAES_set_decrypt_key(key, keylen, &octx->ksdec.ks);
                 if (!CRYPTO_ocb128_init(&octx->ocb,
-                                        &octx->ksenc.ks, &octx->ksdec.ks,
-                                        (block128_f) HWAES_encrypt,
-                                        (block128_f) HWAES_decrypt,
-                                        enc ? HWAES_ocb_encrypt
-                                            : HWAES_ocb_decrypt))
+                        &octx->ksenc.ks, &octx->ksdec.ks,
+                        (block128_f)HWAES_encrypt,
+                        (block128_f)HWAES_decrypt,
+                        enc ? HWAES_ocb_encrypt
+                            : HWAES_ocb_decrypt))
                     return 0;
                 break;
             }
-# endif
-# ifdef VPAES_CAPABLE
+#endif
+#ifdef VPAES_CAPABLE
             if (VPAES_CAPABLE) {
                 vpaes_set_encrypt_key(key, keylen, &octx->ksenc.ks);
                 vpaes_set_decrypt_key(key, keylen, &octx->ksdec.ks);
                 if (!CRYPTO_ocb128_init(&octx->ocb,
-                                        &octx->ksenc.ks, &octx->ksdec.ks,
-                                        (block128_f) vpaes_encrypt,
-                                        (block128_f) vpaes_decrypt,
-                                        NULL))
+                        &octx->ksenc.ks, &octx->ksdec.ks,
+                        (block128_f)vpaes_encrypt,
+                        (block128_f)vpaes_decrypt,
+                        NULL))
                     return 0;
                 break;
             }
-# endif
+#endif
             AES_set_encrypt_key(key, keylen, &octx->ksenc.ks);
             AES_set_decrypt_key(key, keylen, &octx->ksdec.ks);
             if (!CRYPTO_ocb128_init(&octx->ocb,
-                                    &octx->ksenc.ks, &octx->ksdec.ks,
-                                    (block128_f) AES_encrypt,
-                                    (block128_f) AES_decrypt,
-                                    NULL))
+                    &octx->ksenc.ks, &octx->ksdec.ks,
+                    (block128_f)AES_encrypt,
+                    (block128_f)AES_decrypt,
+                    NULL))
                 return 0;
-        }
-        while (0);
+        } while (0);
 
         /*
          * If we have an iv we can set it directly, otherwise use saved IV.
@@ -3990,13 +3991,13 @@ static int aes_ocb_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     unsigned char *buf;
     int *buf_len;
     int written_len = 0;
     size_t trailing_len;
-    EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX,ctx);
+    EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX, ctx);
 
     /* If IV or Key not set then return error */
     if (!octx->iv_set)
@@ -4052,11 +4053,11 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                     return -1;
             } else if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
                 if (!CRYPTO_ocb128_encrypt(&octx->ocb, buf, out,
-                                           AES_BLOCK_SIZE))
+                        AES_BLOCK_SIZE))
                     return -1;
             } else {
                 if (!CRYPTO_ocb128_decrypt(&octx->ocb, buf, out,
-                                           AES_BLOCK_SIZE))
+                        AES_BLOCK_SIZE))
                     return -1;
             }
             written_len = AES_BLOCK_SIZE;
@@ -4076,12 +4077,10 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                 if (!CRYPTO_ocb128_aad(&octx->ocb, in, len - trailing_len))
                     return -1;
             } else if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
-                if (!CRYPTO_ocb128_encrypt
-                    (&octx->ocb, in, out, len - trailing_len))
+                if (!CRYPTO_ocb128_encrypt(&octx->ocb, in, out, len - trailing_len))
                     return -1;
             } else {
-                if (!CRYPTO_ocb128_decrypt
-                    (&octx->ocb, in, out, len - trailing_len))
+                if (!CRYPTO_ocb128_decrypt(&octx->ocb, in, out, len - trailing_len))
                     return -1;
             }
             written_len += len - trailing_len;
@@ -4103,19 +4102,18 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         if (octx->data_buf_len > 0) {
             if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
                 if (!CRYPTO_ocb128_encrypt(&octx->ocb, octx->data_buf, out,
-                                           octx->data_buf_len))
+                        octx->data_buf_len))
                     return -1;
             } else {
                 if (!CRYPTO_ocb128_decrypt(&octx->ocb, octx->data_buf, out,
-                                           octx->data_buf_len))
+                        octx->data_buf_len))
                     return -1;
             }
             written_len = octx->data_buf_len;
             octx->data_buf_len = 0;
         }
         if (octx->aad_buf_len > 0) {
-            if (!CRYPTO_ocb128_aad
-                (&octx->ocb, octx->aad_buf, octx->aad_buf_len))
+            if (!CRYPTO_ocb128_aad(&octx->ocb, octx->aad_buf, octx->aad_buf_len))
                 return -1;
             octx->aad_buf_len = 0;
         }
@@ -4124,7 +4122,8 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             if (octx->taglen < 0)
                 return -1;
             if (CRYPTO_ocb128_finish(&octx->ocb,
-                                     octx->tag, octx->taglen) != 0)
+                    octx->tag, octx->taglen)
+                != 0)
                 return -1;
             octx->iv_set = 0;
             return written_len;
@@ -4140,15 +4139,15 @@ static int aes_ocb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
 static int aes_ocb_cleanup(EVP_CIPHER_CTX *c)
 {
-    EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX,c);
+    EVP_AES_OCB_CTX *octx = EVP_C_DATA(EVP_AES_OCB_CTX, c);
     CRYPTO_ocb128_cleanup(&octx->ocb);
     return 1;
 }
 
 BLOCK_CIPHER_custom(NID_aes, 128, 16, 12, ocb, OCB,
-                    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 192, 16, 12, ocb, OCB,
-                    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes, 256, 16, 12, ocb, OCB,
-                    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
-#endif                         /* OPENSSL_NO_OCB */
+    EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+    BLOCK_CIPHER_custom(NID_aes, 192, 16, 12, ocb, OCB,
+        EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+        BLOCK_CIPHER_custom(NID_aes, 256, 16, 12, ocb, OCB,
+            EVP_CIPH_FLAG_AEAD_CIPHER | CUSTOM_FLAGS)
+#endif /* OPENSSL_NO_OCB */
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index 8843c8ae119f5..3ff7126b29ef4 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
@@ -31,44 +31,42 @@
 typedef struct {
     AES_KEY ks;
     SHA_CTX head, tail, md;
-    size_t payload_length;      /* AAD length in decrypt case */
+    size_t payload_length; /* AAD length in decrypt case */
     union {
         unsigned int tls_ver;
         unsigned char tls_aad[16]; /* 13 used */
     } aux;
 } EVP_AES_HMAC_SHA1;
 
-#define NO_PAYLOAD_LENGTH       ((size_t)-1)
+#define NO_PAYLOAD_LENGTH ((size_t)-1)
 
-#if     defined(AES_ASM) &&     ( \
-        defined(__x86_64)       || defined(__x86_64__)  || \
-        defined(_M_AMD64)       || defined(_M_X64)      )
+#if defined(AES_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
 
-# define AESNI_CAPABLE   (1<<(57-32))
+#define AESNI_CAPABLE (1 << (57 - 32))
 
 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_cbc_encrypt(const unsigned char *in,
-                       unsigned char *out,
-                       size_t length,
-                       const AES_KEY *key, unsigned char *ivec, int enc);
+    unsigned char *out,
+    size_t length,
+    const AES_KEY *key, unsigned char *ivec, int enc);
 
 void aesni_cbc_sha1_enc(const void *inp, void *out, size_t blocks,
-                        const AES_KEY *key, unsigned char iv[16],
-                        SHA_CTX *ctx, const void *in0);
+    const AES_KEY *key, unsigned char iv[16],
+    SHA_CTX *ctx, const void *in0);
 
 void aesni256_cbc_sha1_dec(const void *inp, void *out, size_t blocks,
-                           const AES_KEY *key, unsigned char iv[16],
-                           SHA_CTX *ctx, const void *in0);
+    const AES_KEY *key, unsigned char iv[16],
+    SHA_CTX *ctx, const void *in0);
 
-# define data(ctx) ((EVP_AES_HMAC_SHA1 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
+#define data(ctx) ((EVP_AES_HMAC_SHA1 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
 
 static int aesni_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
-                                        const unsigned char *inkey,
-                                        const unsigned char *iv, int enc)
+    const unsigned char *inkey,
+    const unsigned char *iv, int enc)
 {
     EVP_AES_HMAC_SHA1 *key = data(ctx);
     int ret;
@@ -83,7 +81,7 @@ static int aesni_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
     else
         ret = aesni_set_decrypt_key(inkey, keylen, &key->ks);
 
-    SHA1_Init(&key->head);      /* handy when benchmarking */
+    SHA1_Init(&key->head); /* handy when benchmarking */
     key->tail = key->head;
     key->md = key->head;
 
@@ -92,12 +90,12 @@ static int aesni_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
     return ret < 0 ? 0 : 1;
 }
 
-# define STITCHED_CALL
-# undef  STITCHED_DECRYPT_CALL
+#define STITCHED_CALL
+#undef STITCHED_DECRYPT_CALL
 
-# if !defined(STITCHED_CALL)
-#  define aes_off 0
-# endif
+#if !defined(STITCHED_CALL)
+#define aes_off 0
+#endif
 
 void sha1_block_data_order(void *c, const void *p, size_t len);
 
@@ -132,12 +130,12 @@ static void sha1_update(SHA_CTX *c, const void *data, size_t len)
         SHA1_Update(c, ptr, res);
 }
 
-# ifdef SHA1_Update
-#  undef SHA1_Update
-# endif
-# define SHA1_Update sha1_update
+#ifdef SHA1_Update
+#undef SHA1_Update
+#endif
+#define SHA1_Update sha1_update
 
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
 
 typedef struct {
     unsigned int A[8], B[8], C[8], D[8], E[8];
@@ -159,10 +157,10 @@ typedef struct {
 void aesni_multi_cbc_encrypt(CIPH_DESC *, void *, int);
 
 static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
-                                         unsigned char *out,
-                                         const unsigned char *inp,
-                                         size_t inp_len, int n4x)
-{                               /* n4x is 1 or 2 */
+    unsigned char *out,
+    const unsigned char *inp,
+    size_t inp_len, int n4x)
+{ /* n4x is 1 or 2 */
     HASH_DESC hash_d[8], edges[8];
     CIPH_DESC ciph_d[8];
     unsigned char storage[sizeof(SHA1_MB_CTX) + 32];
@@ -172,19 +170,18 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
         u8 c[128];
     } blocks[8];
     SHA1_MB_CTX *ctx;
-    unsigned int frag, last, packlen, i, x4 = 4 * n4x, minblocks, processed =
-        0;
+    unsigned int frag, last, packlen, i, x4 = 4 * n4x, minblocks, processed = 0;
     size_t ret = 0;
     u8 *IVs;
-#  if defined(BSWAP8)
+#if defined(BSWAP8)
     u64 seqnum;
-#  endif
+#endif
 
     /* ask for IVs in bulk */
     if (RAND_bytes((IVs = blocks[0].c), 16 * x4) <= 0)
         return 0;
 
-    ctx = (SHA1_MB_CTX *) (storage + 32 - ((size_t)storage % 32)); /* align */
+    ctx = (SHA1_MB_CTX *)(storage + 32 - ((size_t)storage % 32)); /* align */
 
     frag = (unsigned int)inp_len >> (1 + n4x);
     last = (unsigned int)inp_len + frag - (frag << (1 + n4x));
@@ -212,15 +209,15 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
         IVs += 16;
     }
 
-#  if defined(BSWAP8)
+#if defined(BSWAP8)
     memcpy(blocks[0].c, key->md.data, 8);
     seqnum = BSWAP8(blocks[0].q[0]);
-#  endif
+#endif
     for (i = 0; i < x4; i++) {
         unsigned int len = (i == (x4 - 1) ? last : frag);
-#  if !defined(BSWAP8)
+#if !defined(BSWAP8)
         unsigned int carry, j;
-#  endif
+#endif
 
         ctx->A[i] = key->md.h0;
         ctx->B[i] = key->md.h1;
@@ -229,14 +226,14 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
         ctx->E[i] = key->md.h4;
 
         /* fix seqnum */
-#  if defined(BSWAP8)
+#if defined(BSWAP8)
         blocks[i].q[0] = BSWAP8(seqnum + i);
-#  else
+#else
         for (carry = i, j = 8; j--;) {
             blocks[i].c[j] = ((u8 *)key->md.data)[j] + carry;
             carry = (blocks[i].c[j] - carry) >> (sizeof(carry) * 8 - 1);
         }
-#  endif
+#endif
         blocks[i].c[8] = ((u8 *)key->md.data)[8];
         blocks[i].c[9] = ((u8 *)key->md.data)[9];
         blocks[i].c[10] = ((u8 *)key->md.data)[10];
@@ -255,10 +252,10 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
     /* hash 13-byte headers and first 64-13 bytes of inputs */
     sha1_multi_block(ctx, edges, n4x);
     /* hash bulk inputs */
-#  define MAXCHUNKSIZE    2048
-#  if     MAXCHUNKSIZE%64
-#   error  "MAXCHUNKSIZE is not divisible by 64"
-#  elif   MAXCHUNKSIZE
+#define MAXCHUNKSIZE 2048
+#if MAXCHUNKSIZE % 64
+#error "MAXCHUNKSIZE is not divisible by 64"
+#elif MAXCHUNKSIZE
     /*
      * goal is to minimize pressure on L1 cache by moving in shorter steps,
      * so that hashed data is still in the cache by the time we encrypt it
@@ -287,34 +284,34 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
             minblocks -= MAXCHUNKSIZE / 64;
         } while (minblocks > MAXCHUNKSIZE / 64);
     }
-#  endif
-#  undef  MAXCHUNKSIZE
+#endif
+#undef MAXCHUNKSIZE
     sha1_multi_block(ctx, hash_d, n4x);
 
     memset(blocks, 0, sizeof(blocks));
     for (i = 0; i < x4; i++) {
         unsigned int len = (i == (x4 - 1) ? last : frag),
-            off = hash_d[i].blocks * 64;
+                     off = hash_d[i].blocks * 64;
         const unsigned char *ptr = hash_d[i].ptr + off;
 
         off = (len - processed) - (64 - 13) - off; /* remainder actually */
         memcpy(blocks[i].c, ptr, off);
         blocks[i].c[off] = 0x80;
-        len += 64 + 13;         /* 64 is HMAC header */
-        len *= 8;               /* convert to bits */
+        len += 64 + 13; /* 64 is HMAC header */
+        len *= 8; /* convert to bits */
         if (off < (64 - 8)) {
-#  ifdef BSWAP4
+#ifdef BSWAP4
             blocks[i].d[15] = BSWAP4(len);
-#  else
+#else
             PUTU32(blocks[i].c + 60, len);
-#  endif
+#endif
             edges[i].blocks = 1;
         } else {
-#  ifdef BSWAP4
+#ifdef BSWAP4
             blocks[i].d[31] = BSWAP4(len);
-#  else
+#else
             PUTU32(blocks[i].c + 124, len);
-#  endif
+#endif
             edges[i].blocks = 2;
         }
         edges[i].ptr = blocks[i].c;
@@ -325,7 +322,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
 
     memset(blocks, 0, sizeof(blocks));
     for (i = 0; i < x4; i++) {
-#  ifdef BSWAP4
+#ifdef BSWAP4
         blocks[i].d[0] = BSWAP4(ctx->A[i]);
         ctx->A[i] = key->tail.h0;
         blocks[i].d[1] = BSWAP4(ctx->B[i]);
@@ -338,7 +335,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
         ctx->E[i] = key->tail.h4;
         blocks[i].c[20] = 0x80;
         blocks[i].d[15] = BSWAP4((64 + 20) * 8);
-#  else
+#else
         PUTU32(blocks[i].c + 0, ctx->A[i]);
         ctx->A[i] = key->tail.h0;
         PUTU32(blocks[i].c + 4, ctx->B[i]);
@@ -351,7 +348,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
         ctx->E[i] = key->tail.h4;
         blocks[i].c[20] = 0x80;
         PUTU32(blocks[i].c + 60, (64 + 20) * 8);
-#  endif
+#endif
         edges[i].ptr = blocks[i].c;
         edges[i].blocks = 1;
     }
@@ -384,7 +381,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
         len += pad + 1;
 
         ciph_d[i].blocks = (len - processed) / 16;
-        len += 16;              /* account for explicit iv */
+        len += 16; /* account for explicit iv */
 
         /* arrange header */
         out0[0] = ((u8 *)key->md.data)[8];
@@ -404,21 +401,21 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
 
     return ret;
 }
-# endif
+#endif
 
 static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                      const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_AES_HMAC_SHA1 *key = data(ctx);
     unsigned int l;
     size_t plen = key->payload_length, iv = 0, /* explicit IV in TLS 1.1 and
                                                 * later */
         sha_off = 0;
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
     size_t aes_off = 0, blocks;
 
     sha_off = SHA_CBLOCK - key->md.num;
-# endif
+#endif
 
     key->payload_length = NO_PAYLOAD_LENGTH;
 
@@ -428,20 +425,18 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
         if (plen == NO_PAYLOAD_LENGTH)
             plen = len;
-        else if (len !=
-                 ((plen + SHA_DIGEST_LENGTH +
-                   AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
+        else if (len != ((plen + SHA_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
             return 0;
         else if (key->aux.tls_ver >= TLS1_1_VERSION)
             iv = AES_BLOCK_SIZE;
 
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
         if (plen > (sha_off + iv)
             && (blocks = (plen - (sha_off + iv)) / SHA_CBLOCK)) {
             SHA1_Update(&key->md, in + iv, sha_off);
 
             aesni_cbc_sha1_enc(in, out, blocks, &key->ks, ctx->iv,
-                               &key->md, in + iv + sha_off);
+                &key->md, in + iv + sha_off);
             blocks *= SHA_CBLOCK;
             aes_off += blocks;
             sha_off += blocks;
@@ -452,11 +447,11 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         } else {
             sha_off = 0;
         }
-# endif
+#endif
         sha_off += iv;
         SHA1_Update(&key->md, in + sha_off, plen - sha_off);
 
-        if (plen != len) {      /* "TLS" mode of operation */
+        if (plen != len) { /* "TLS" mode of operation */
             if (in != out)
                 memcpy(out + aes_off, in + aes_off, plen - aes_off);
 
@@ -472,10 +467,10 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                 out[plen] = l;
             /* encrypt HMAC|padding at once */
             aesni_cbc_encrypt(out + aes_off, out + aes_off, len - aes_off,
-                              &key->ks, ctx->iv, 1);
+                &key->ks, ctx->iv, 1);
         } else {
             aesni_cbc_encrypt(in + aes_off, out + aes_off, len - aes_off,
-                              &key->ks, ctx->iv, 1);
+                &key->ks, ctx->iv, 1);
         }
     } else {
         union {
@@ -494,7 +489,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                 unsigned int u[SHA_LBLOCK];
                 unsigned char c[SHA_CBLOCK];
             } *data = (void *)key->md.data;
-# if defined(STITCHED_DECRYPT_CALL)
+#if defined(STITCHED_DECRYPT_CALL)
             unsigned char tail_iv[AES_BLOCK_SIZE];
             int stitch = 0;
             const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
@@ -503,7 +498,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                 ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY_LENGTH);
                 return 0;
             }
-# endif
+#endif
 
             if ((key->aux.tls_aad[plen - 4] << 8 | key->aux.tls_aad[plen - 3])
                 >= TLS1_1_VERSION) {
@@ -519,20 +514,20 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             } else if (len < (SHA_DIGEST_LENGTH + 1))
                 return 0;
 
-# if defined(STITCHED_DECRYPT_CALL)
+#if defined(STITCHED_DECRYPT_CALL)
             if (len >= 1024 && keylen == 32) {
                 /* decrypt last block */
                 memcpy(tail_iv, in + len - 2 * AES_BLOCK_SIZE,
-                       AES_BLOCK_SIZE);
+                    AES_BLOCK_SIZE);
                 aesni_cbc_encrypt(in + len - AES_BLOCK_SIZE,
-                                  out + len - AES_BLOCK_SIZE, AES_BLOCK_SIZE,
-                                  &key->ks, tail_iv, 0);
+                    out + len - AES_BLOCK_SIZE, AES_BLOCK_SIZE,
+                    &key->ks, tail_iv, 0);
                 stitch = 1;
             } else
-# endif
+#endif
                 /* decrypt HMAC|padding at once */
                 aesni_cbc_encrypt(in, out, len, &key->ks,
-                                  ctx->iv, 0);
+                    ctx->iv, 0);
 
             /* figure out payload length */
             pad = out[len - 1];
@@ -559,7 +554,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             key->md = key->head;
             SHA1_Update(&key->md, key->aux.tls_aad, plen);
 
-# if defined(STITCHED_DECRYPT_CALL)
+#if defined(STITCHED_DECRYPT_CALL)
             if (stitch) {
                 blocks = (len - (256 + 32 + SHA_CBLOCK)) / SHA_CBLOCK;
                 aes_off = len - AES_BLOCK_SIZE - blocks * SHA_CBLOCK;
@@ -569,8 +564,8 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
                 SHA1_Update(&key->md, out, sha_off);
                 aesni256_cbc_sha1_dec(in + aes_off,
-                                      out + aes_off, blocks, &key->ks,
-                                      ctx->iv, &key->md, out + sha_off);
+                    out + aes_off, blocks, &key->ks,
+                    ctx->iv, &key->md, out + sha_off);
 
                 sha_off += blocks *= SHA_CBLOCK;
                 out += sha_off;
@@ -580,9 +575,9 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                 key->md.Nl += (blocks << 3); /* at most 18 bits */
                 memcpy(ctx->iv, tail_iv, AES_BLOCK_SIZE);
             }
-# endif
+#endif
 
-# if 1      /* see original reference version in #else */
+#if 1 /* see original reference version in #else */
             len -= SHA_DIGEST_LENGTH; /* amend mac */
             if (len >= (256 + SHA_CBLOCK)) {
                 j = (len - (256 + SHA_CBLOCK)) & (0 - SHA_CBLOCK);
@@ -595,15 +590,15 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
             /* but pretend as if we hashed padded payload */
             bitlen = key->md.Nl + (inp_len << 3); /* at most 18 bits */
-#  ifdef BSWAP4
+#ifdef BSWAP4
             bitlen = BSWAP4(bitlen);
-#  else
+#else
             mac.c[0] = 0;
             mac.c[1] = (unsigned char)(bitlen >> 16);
             mac.c[2] = (unsigned char)(bitlen >> 8);
             mac.c[3] = (unsigned char)bitlen;
             bitlen = mac.u[0];
-#  endif
+#endif
 
             pmac->u[0] = 0;
             pmac->u[1] = 0;
@@ -660,13 +655,13 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             pmac->u[3] |= key->md.h3 & mask;
             pmac->u[4] |= key->md.h4 & mask;
 
-#  ifdef BSWAP4
+#ifdef BSWAP4
             pmac->u[0] = BSWAP4(pmac->u[0]);
             pmac->u[1] = BSWAP4(pmac->u[1]);
             pmac->u[2] = BSWAP4(pmac->u[2]);
             pmac->u[3] = BSWAP4(pmac->u[3]);
             pmac->u[4] = BSWAP4(pmac->u[4]);
-#  else
+#else
             for (i = 0; i < 5; i++) {
                 res = pmac->u[i];
                 pmac->c[4 * i + 0] = (unsigned char)(res >> 24);
@@ -674,9 +669,9 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                 pmac->c[4 * i + 2] = (unsigned char)(res >> 8);
                 pmac->c[4 * i + 3] = (unsigned char)res;
             }
-#  endif
+#endif
             len += SHA_DIGEST_LENGTH;
-# else      /* pre-lucky-13 reference version of above */
+#else /* pre-lucky-13 reference version of above */
             SHA1_Update(&key->md, out, inp_len);
             res = key->md.num;
             SHA1_Final(pmac->c, &key->md);
@@ -685,17 +680,15 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                 unsigned int inp_blocks, pad_blocks;
 
                 /* but pretend as if we hashed padded payload */
-                inp_blocks =
-                    1 + ((SHA_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
+                inp_blocks = 1 + ((SHA_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
                 res += (unsigned int)(len - inp_len);
                 pad_blocks = res / SHA_CBLOCK;
                 res %= SHA_CBLOCK;
-                pad_blocks +=
-                    1 + ((SHA_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
+                pad_blocks += 1 + ((SHA_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
                 for (; inp_blocks < pad_blocks; inp_blocks++)
                     sha1_block_data_order(&key->md, data, 1);
             }
-# endif
+#endif
             key->md = key->tail;
             SHA1_Update(&key->md, pmac->c, SHA_DIGEST_LENGTH);
             SHA1_Final(pmac->c, &key->md);
@@ -703,7 +696,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             /* verify HMAC */
             out += inp_len;
             len -= inp_len;
-# if 1      /* see original reference version in #else */
+#if 1 /* see original reference version in #else */
             {
                 unsigned char *p = out + len - 1 - maxpad - SHA_DIGEST_LENGTH;
                 size_t off = out - p;
@@ -711,9 +704,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
                 for (res = 0, i = 0, j = 0; j < maxpad + SHA_DIGEST_LENGTH; j++) {
                     c = p[j];
-                    cmask =
-                        ((int)(j - off - SHA_DIGEST_LENGTH)) >> (sizeof(int) *
-                                                                 8 - 1);
+                    cmask = ((int)(j - off - SHA_DIGEST_LENGTH)) >> (sizeof(int) * 8 - 1);
                     res |= (c ^ pad) & ~cmask; /* ... and padding */
                     cmask &= ((int)(off - 1 - j)) >> (sizeof(int) * 8 - 1);
                     res |= (c ^ pmac->c[i]) & cmask;
@@ -723,7 +714,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                 res = 0 - ((0 - res) >> (sizeof(res) * 8 - 1));
                 ret &= (int)~res;
             }
-# else      /* pre-lucky-13 reference version of above */
+#else /* pre-lucky-13 reference version of above */
             for (res = 0, i = 0; i < SHA_DIGEST_LENGTH; i++)
                 res |= out[i] ^ pmac->c[i];
             res = 0 - ((0 - res) >> (sizeof(res) * 8 - 1));
@@ -737,10 +728,10 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
             res = (0 - res) >> (sizeof(res) * 8 - 1);
             ret &= (int)~res;
-# endif
+#endif
             return ret;
         } else {
-# if defined(STITCHED_DECRYPT_CALL)
+#if defined(STITCHED_DECRYPT_CALL)
             if (len >= 1024 && keylen == 32) {
                 if (sha_off %= SHA_CBLOCK)
                     blocks = (len - 3 * SHA_CBLOCK) / SHA_CBLOCK;
@@ -751,8 +742,8 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                 aesni_cbc_encrypt(in, out, aes_off, &key->ks, ctx->iv, 0);
                 SHA1_Update(&key->md, out, sha_off);
                 aesni256_cbc_sha1_dec(in + aes_off,
-                                      out + aes_off, blocks, &key->ks,
-                                      ctx->iv, &key->md, out + sha_off);
+                    out + aes_off, blocks, &key->ks,
+                    ctx->iv, &key->md, out + sha_off);
 
                 sha_off += blocks *= SHA_CBLOCK;
                 out += sha_off;
@@ -763,10 +754,10 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                 if (key->md.Nl < (unsigned int)blocks)
                     key->md.Nh++;
             } else
-# endif
+#endif
                 /* decrypt HMAC|padding at once */
                 aesni_cbc_encrypt(in, out, len, &key->ks,
-                                  ctx->iv, 0);
+                    ctx->iv, 0);
 
             SHA1_Update(&key->md, out, len);
         }
@@ -776,151 +767,142 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int aesni_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
-                                    void *ptr)
+    void *ptr)
 {
     EVP_AES_HMAC_SHA1 *key = data(ctx);
 
     switch (type) {
-    case EVP_CTRL_AEAD_SET_MAC_KEY:
-        {
-            unsigned int i;
-            unsigned char hmac_key[64];
-
-            memset(hmac_key, 0, sizeof(hmac_key));
-
-            if (arg > (int)sizeof(hmac_key)) {
-                SHA1_Init(&key->head);
-                SHA1_Update(&key->head, ptr, arg);
-                SHA1_Final(hmac_key, &key->head);
-            } else {
-                memcpy(hmac_key, ptr, arg);
-            }
+    case EVP_CTRL_AEAD_SET_MAC_KEY: {
+        unsigned int i;
+        unsigned char hmac_key[64];
 
-            for (i = 0; i < sizeof(hmac_key); i++)
-                hmac_key[i] ^= 0x36; /* ipad */
+        memset(hmac_key, 0, sizeof(hmac_key));
+
+        if (arg > (int)sizeof(hmac_key)) {
             SHA1_Init(&key->head);
-            SHA1_Update(&key->head, hmac_key, sizeof(hmac_key));
+            SHA1_Update(&key->head, ptr, arg);
+            SHA1_Final(hmac_key, &key->head);
+        } else {
+            memcpy(hmac_key, ptr, arg);
+        }
 
-            for (i = 0; i < sizeof(hmac_key); i++)
-                hmac_key[i] ^= 0x36 ^ 0x5c; /* opad */
-            SHA1_Init(&key->tail);
-            SHA1_Update(&key->tail, hmac_key, sizeof(hmac_key));
+        for (i = 0; i < sizeof(hmac_key); i++)
+            hmac_key[i] ^= 0x36; /* ipad */
+        SHA1_Init(&key->head);
+        SHA1_Update(&key->head, hmac_key, sizeof(hmac_key));
 
-            OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
+        for (i = 0; i < sizeof(hmac_key); i++)
+            hmac_key[i] ^= 0x36 ^ 0x5c; /* opad */
+        SHA1_Init(&key->tail);
+        SHA1_Update(&key->tail, hmac_key, sizeof(hmac_key));
 
-            return 1;
-        }
-    case EVP_CTRL_AEAD_TLS1_AAD:
-        {
-            unsigned char *p = ptr;
-            unsigned int len;
+        OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
 
-            if (arg != EVP_AEAD_TLS1_AAD_LEN)
-                return -1;
+        return 1;
+    }
+    case EVP_CTRL_AEAD_TLS1_AAD: {
+        unsigned char *p = ptr;
+        unsigned int len;
 
-            len = p[arg - 2] << 8 | p[arg - 1];
-
-            if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
-                key->payload_length = len;
-                if ((key->aux.tls_ver =
-                     p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
-                    if (len < AES_BLOCK_SIZE)
-                        return 0;
-                    len -= AES_BLOCK_SIZE;
-                    p[arg - 2] = len >> 8;
-                    p[arg - 1] = len;
-                }
-                key->md = key->head;
-                SHA1_Update(&key->md, p, arg);
+        if (arg != EVP_AEAD_TLS1_AAD_LEN)
+            return -1;
 
-                return (int)(((len + SHA_DIGEST_LENGTH +
-                               AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
-                             - len);
-            } else {
-                memcpy(key->aux.tls_aad, ptr, arg);
-                key->payload_length = arg;
+        len = p[arg - 2] << 8 | p[arg - 1];
 
-                return SHA_DIGEST_LENGTH;
+        if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
+            key->payload_length = len;
+            if ((key->aux.tls_ver = p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
+                if (len < AES_BLOCK_SIZE)
+                    return 0;
+                len -= AES_BLOCK_SIZE;
+                p[arg - 2] = len >> 8;
+                p[arg - 1] = len;
             }
+            key->md = key->head;
+            SHA1_Update(&key->md, p, arg);
+
+            return (int)(((len + SHA_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
+                - len);
+        } else {
+            memcpy(key->aux.tls_aad, ptr, arg);
+            key->payload_length = arg;
+
+            return SHA_DIGEST_LENGTH;
         }
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+    }
+#if !defined(OPENSSL_NO_MULTIBLOCK)
     case EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE:
         return (int)(5 + 16 + ((arg + 20 + 16) & -16));
-    case EVP_CTRL_TLS1_1_MULTIBLOCK_AAD:
-        {
-            EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param =
-                (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *) ptr;
-            unsigned int n4x = 1, x4;
-            unsigned int frag, last, packlen, inp_len;
-
-            if (arg < (int)sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM))
-                return -1;
+    case EVP_CTRL_TLS1_1_MULTIBLOCK_AAD: {
+        EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param = (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
+        unsigned int n4x = 1, x4;
+        unsigned int frag, last, packlen, inp_len;
 
-            inp_len = param->inp[11] << 8 | param->inp[12];
+        if (arg < (int)sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM))
+            return -1;
 
-            if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
-                if ((param->inp[9] << 8 | param->inp[10]) < TLS1_1_VERSION)
-                    return -1;
+        inp_len = param->inp[11] << 8 | param->inp[12];
 
-                if (inp_len) {
-                    if (inp_len < 4096)
-                        return 0; /* too short */
+        if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
+            if ((param->inp[9] << 8 | param->inp[10]) < TLS1_1_VERSION)
+                return -1;
 
-                    if (inp_len >= 8192 && OPENSSL_ia32cap_P[2] & (1 << 5))
-                        n4x = 2; /* AVX2 */
-                } else if ((n4x = param->interleave / 4) && n4x <= 2)
-                    inp_len = param->len;
-                else
-                    return -1;
+            if (inp_len) {
+                if (inp_len < 4096)
+                    return 0; /* too short */
+
+                if (inp_len >= 8192 && OPENSSL_ia32cap_P[2] & (1 << 5))
+                    n4x = 2; /* AVX2 */
+            } else if ((n4x = param->interleave / 4) && n4x <= 2)
+                inp_len = param->len;
+            else
+                return -1;
 
-                key->md = key->head;
-                SHA1_Update(&key->md, param->inp, 13);
+            key->md = key->head;
+            SHA1_Update(&key->md, param->inp, 13);
 
-                x4 = 4 * n4x;
-                n4x += 1;
+            x4 = 4 * n4x;
+            n4x += 1;
 
-                frag = inp_len >> n4x;
-                last = inp_len + frag - (frag << n4x);
-                if (last > frag && ((last + 13 + 9) % 64 < (x4 - 1))) {
-                    frag++;
-                    last -= x4 - 1;
-                }
+            frag = inp_len >> n4x;
+            last = inp_len + frag - (frag << n4x);
+            if (last > frag && ((last + 13 + 9) % 64 < (x4 - 1))) {
+                frag++;
+                last -= x4 - 1;
+            }
 
-                packlen = 5 + 16 + ((frag + 20 + 16) & -16);
-                packlen = (packlen << n4x) - packlen;
-                packlen += 5 + 16 + ((last + 20 + 16) & -16);
+            packlen = 5 + 16 + ((frag + 20 + 16) & -16);
+            packlen = (packlen << n4x) - packlen;
+            packlen += 5 + 16 + ((last + 20 + 16) & -16);
 
-                param->interleave = x4;
+            param->interleave = x4;
 
-                return (int)packlen;
-            } else
-                return -1;      /* not yet */
-        }
-    case EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT:
-        {
-            EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param =
-                (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *) ptr;
-
-            return (int)tls1_1_multi_block_encrypt(key, param->out,
-                                                   param->inp, param->len,
-                                                   param->interleave / 4);
-        }
+            return (int)packlen;
+        } else
+            return -1; /* not yet */
+    }
+    case EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT: {
+        EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param = (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
+
+        return (int)tls1_1_multi_block_encrypt(key, param->out,
+            param->inp, param->len,
+            param->interleave / 4);
+    }
     case EVP_CTRL_TLS1_1_MULTIBLOCK_DECRYPT:
-# endif
+#endif
     default:
         return -1;
     }
 }
 
 static EVP_CIPHER aesni_128_cbc_hmac_sha1_cipher = {
-# ifdef NID_aes_128_cbc_hmac_sha1
+#ifdef NID_aes_128_cbc_hmac_sha1
     NID_aes_128_cbc_hmac_sha1,
-# else
+#else
     NID_undef,
-# endif
+#endif
     AES_BLOCK_SIZE, 16, AES_BLOCK_SIZE,
-    EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 |
-        EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
+    EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
     EVP_ORIG_GLOBAL,
     aesni_cbc_hmac_sha1_init_key,
     aesni_cbc_hmac_sha1_cipher,
@@ -933,14 +915,13 @@ static EVP_CIPHER aesni_128_cbc_hmac_sha1_cipher = {
 };
 
 static EVP_CIPHER aesni_256_cbc_hmac_sha1_cipher = {
-# ifdef NID_aes_256_cbc_hmac_sha1
+#ifdef NID_aes_256_cbc_hmac_sha1
     NID_aes_256_cbc_hmac_sha1,
-# else
+#else
     NID_undef,
-# endif
+#endif
     AES_BLOCK_SIZE, 32, AES_BLOCK_SIZE,
-    EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 |
-        EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
+    EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
     EVP_ORIG_GLOBAL,
     aesni_cbc_hmac_sha1_init_key,
     aesni_cbc_hmac_sha1_cipher,
@@ -954,14 +935,12 @@ static EVP_CIPHER aesni_256_cbc_hmac_sha1_cipher = {
 
 const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void)
 {
-    return (OPENSSL_ia32cap_P[1] & AESNI_CAPABLE ?
-            &aesni_128_cbc_hmac_sha1_cipher : NULL);
+    return (OPENSSL_ia32cap_P[1] & AESNI_CAPABLE ? &aesni_128_cbc_hmac_sha1_cipher : NULL);
 }
 
 const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void)
 {
-    return (OPENSSL_ia32cap_P[1] & AESNI_CAPABLE ?
-            &aesni_256_cbc_hmac_sha1_cipher : NULL);
+    return (OPENSSL_ia32cap_P[1] & AESNI_CAPABLE ? &aesni_256_cbc_hmac_sha1_cipher : NULL);
 }
 #else
 const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void)
diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c
index 3a5f757dbff37..8155164ca357a 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha256.c
@@ -31,54 +31,52 @@
 typedef struct {
     AES_KEY ks;
     SHA256_CTX head, tail, md;
-    size_t payload_length;      /* AAD length in decrypt case */
+    size_t payload_length; /* AAD length in decrypt case */
     union {
         unsigned int tls_ver;
         unsigned char tls_aad[16]; /* 13 used */
     } aux;
 } EVP_AES_HMAC_SHA256;
 
-# define NO_PAYLOAD_LENGTH       ((size_t)-1)
+#define NO_PAYLOAD_LENGTH ((size_t)-1)
 
-#if     defined(AES_ASM) &&     ( \
-        defined(__x86_64)       || defined(__x86_64__)  || \
-        defined(_M_AMD64)       || defined(_M_X64)      )
+#if defined(AES_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
 
-# define AESNI_CAPABLE   (1<<(57-32))
+#define AESNI_CAPABLE (1 << (57 - 32))
 
 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_cbc_encrypt(const unsigned char *in,
-                       unsigned char *out,
-                       size_t length,
-                       const AES_KEY *key, unsigned char *ivec, int enc);
+    unsigned char *out,
+    size_t length,
+    const AES_KEY *key, unsigned char *ivec, int enc);
 
 int aesni_cbc_sha256_enc(const void *inp, void *out, size_t blocks,
-                         const AES_KEY *key, unsigned char iv[16],
-                         SHA256_CTX *ctx, const void *in0);
+    const AES_KEY *key, unsigned char iv[16],
+    SHA256_CTX *ctx, const void *in0);
 
-# define data(ctx) ((EVP_AES_HMAC_SHA256 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
+#define data(ctx) ((EVP_AES_HMAC_SHA256 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
 
 static int aesni_cbc_hmac_sha256_init_key(EVP_CIPHER_CTX *ctx,
-                                          const unsigned char *inkey,
-                                          const unsigned char *iv, int enc)
+    const unsigned char *inkey,
+    const unsigned char *iv, int enc)
 {
     EVP_AES_HMAC_SHA256 *key = data(ctx);
     int ret;
 
     if (enc)
         ret = aesni_set_encrypt_key(inkey,
-                                    EVP_CIPHER_CTX_get_key_length(ctx) * 8,
-                                    &key->ks);
+            EVP_CIPHER_CTX_get_key_length(ctx) * 8,
+            &key->ks);
     else
         ret = aesni_set_decrypt_key(inkey,
-                                    EVP_CIPHER_CTX_get_key_length(ctx) * 8,
-                                    &key->ks);
+            EVP_CIPHER_CTX_get_key_length(ctx) * 8,
+            &key->ks);
 
-    SHA256_Init(&key->head);    /* handy when benchmarking */
+    SHA256_Init(&key->head); /* handy when benchmarking */
     key->tail = key->head;
     key->md = key->head;
 
@@ -87,11 +85,11 @@ static int aesni_cbc_hmac_sha256_init_key(EVP_CIPHER_CTX *ctx,
     return ret < 0 ? 0 : 1;
 }
 
-# define STITCHED_CALL
+#define STITCHED_CALL
 
-# if !defined(STITCHED_CALL)
-#  define aes_off 0
-# endif
+#if !defined(STITCHED_CALL)
+#define aes_off 0
+#endif
 
 void sha256_block_data_order(void *c, const void *p, size_t len);
 
@@ -126,12 +124,12 @@ static void sha256_update(SHA256_CTX *c, const void *data, size_t len)
         SHA256_Update(c, ptr, res);
 }
 
-# ifdef SHA256_Update
-#  undef SHA256_Update
-# endif
-# define SHA256_Update sha256_update
+#ifdef SHA256_Update
+#undef SHA256_Update
+#endif
+#define SHA256_Update sha256_update
 
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
 
 typedef struct {
     unsigned int A[8], B[8], C[8], D[8], E[8], F[8], G[8], H[8];
@@ -153,10 +151,10 @@ typedef struct {
 void aesni_multi_cbc_encrypt(CIPH_DESC *, void *, int);
 
 static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
-                                         unsigned char *out,
-                                         const unsigned char *inp,
-                                         size_t inp_len, int n4x)
-{                               /* n4x is 1 or 2 */
+    unsigned char *out,
+    const unsigned char *inp,
+    size_t inp_len, int n4x)
+{ /* n4x is 1 or 2 */
     HASH_DESC hash_d[8], edges[8];
     CIPH_DESC ciph_d[8];
     unsigned char storage[sizeof(SHA256_MB_CTX) + 32];
@@ -166,20 +164,19 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
         u8 c[128];
     } blocks[8];
     SHA256_MB_CTX *ctx;
-    unsigned int frag, last, packlen, i, x4 = 4 * n4x, minblocks, processed =
-        0;
+    unsigned int frag, last, packlen, i, x4 = 4 * n4x, minblocks, processed = 0;
     size_t ret = 0;
     u8 *IVs;
-#  if defined(BSWAP8)
+#if defined(BSWAP8)
     u64 seqnum;
-#  endif
+#endif
 
     /* ask for IVs in bulk */
     if (RAND_bytes((IVs = blocks[0].c), 16 * x4) <= 0)
         return 0;
 
     /* align */
-    ctx = (SHA256_MB_CTX *) (storage + 32 - ((size_t)storage % 32));
+    ctx = (SHA256_MB_CTX *)(storage + 32 - ((size_t)storage % 32));
 
     frag = (unsigned int)inp_len >> (1 + n4x);
     last = (unsigned int)inp_len + frag - (frag << (1 + n4x));
@@ -207,15 +204,15 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
         IVs += 16;
     }
 
-#  if defined(BSWAP8)
+#if defined(BSWAP8)
     memcpy(blocks[0].c, key->md.data, 8);
     seqnum = BSWAP8(blocks[0].q[0]);
-#  endif
+#endif
     for (i = 0; i < x4; i++) {
         unsigned int len = (i == (x4 - 1) ? last : frag);
-#  if !defined(BSWAP8)
+#if !defined(BSWAP8)
         unsigned int carry, j;
-#  endif
+#endif
 
         ctx->A[i] = key->md.h[0];
         ctx->B[i] = key->md.h[1];
@@ -227,14 +224,14 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
         ctx->H[i] = key->md.h[7];
 
         /* fix seqnum */
-#  if defined(BSWAP8)
+#if defined(BSWAP8)
         blocks[i].q[0] = BSWAP8(seqnum + i);
-#  else
+#else
         for (carry = i, j = 8; j--;) {
             blocks[i].c[j] = ((u8 *)key->md.data)[j] + carry;
             carry = (blocks[i].c[j] - carry) >> (sizeof(carry) * 8 - 1);
         }
-#  endif
+#endif
         blocks[i].c[8] = ((u8 *)key->md.data)[8];
         blocks[i].c[9] = ((u8 *)key->md.data)[9];
         blocks[i].c[10] = ((u8 *)key->md.data)[10];
@@ -253,10 +250,10 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
     /* hash 13-byte headers and first 64-13 bytes of inputs */
     sha256_multi_block(ctx, edges, n4x);
     /* hash bulk inputs */
-#  define MAXCHUNKSIZE    2048
-#  if     MAXCHUNKSIZE%64
-#   error  "MAXCHUNKSIZE is not divisible by 64"
-#  elif   MAXCHUNKSIZE
+#define MAXCHUNKSIZE 2048
+#if MAXCHUNKSIZE % 64
+#error "MAXCHUNKSIZE is not divisible by 64"
+#elif MAXCHUNKSIZE
     /*
      * goal is to minimize pressure on L1 cache by moving in shorter steps,
      * so that hashed data is still in the cache by the time we encrypt it
@@ -285,34 +282,34 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
             minblocks -= MAXCHUNKSIZE / 64;
         } while (minblocks > MAXCHUNKSIZE / 64);
     }
-#  endif
-#  undef  MAXCHUNKSIZE
+#endif
+#undef MAXCHUNKSIZE
     sha256_multi_block(ctx, hash_d, n4x);
 
     memset(blocks, 0, sizeof(blocks));
     for (i = 0; i < x4; i++) {
         unsigned int len = (i == (x4 - 1) ? last : frag),
-            off = hash_d[i].blocks * 64;
+                     off = hash_d[i].blocks * 64;
         const unsigned char *ptr = hash_d[i].ptr + off;
 
         off = (len - processed) - (64 - 13) - off; /* remainder actually */
         memcpy(blocks[i].c, ptr, off);
         blocks[i].c[off] = 0x80;
-        len += 64 + 13;         /* 64 is HMAC header */
-        len *= 8;               /* convert to bits */
+        len += 64 + 13; /* 64 is HMAC header */
+        len *= 8; /* convert to bits */
         if (off < (64 - 8)) {
-#  ifdef BSWAP4
+#ifdef BSWAP4
             blocks[i].d[15] = BSWAP4(len);
-#  else
+#else
             PUTU32(blocks[i].c + 60, len);
-#  endif
+#endif
             edges[i].blocks = 1;
         } else {
-#  ifdef BSWAP4
+#ifdef BSWAP4
             blocks[i].d[31] = BSWAP4(len);
-#  else
+#else
             PUTU32(blocks[i].c + 124, len);
-#  endif
+#endif
             edges[i].blocks = 2;
         }
         edges[i].ptr = blocks[i].c;
@@ -323,7 +320,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
 
     memset(blocks, 0, sizeof(blocks));
     for (i = 0; i < x4; i++) {
-#  ifdef BSWAP4
+#ifdef BSWAP4
         blocks[i].d[0] = BSWAP4(ctx->A[i]);
         ctx->A[i] = key->tail.h[0];
         blocks[i].d[1] = BSWAP4(ctx->B[i]);
@@ -342,7 +339,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
         ctx->H[i] = key->tail.h[7];
         blocks[i].c[32] = 0x80;
         blocks[i].d[15] = BSWAP4((64 + 32) * 8);
-#  else
+#else
         PUTU32(blocks[i].c + 0, ctx->A[i]);
         ctx->A[i] = key->tail.h[0];
         PUTU32(blocks[i].c + 4, ctx->B[i]);
@@ -361,7 +358,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
         ctx->H[i] = key->tail.h[7];
         blocks[i].c[32] = 0x80;
         PUTU32(blocks[i].c + 60, (64 + 32) * 8);
-#  endif
+#endif
         edges[i].ptr = blocks[i].c;
         edges[i].blocks = 1;
     }
@@ -397,7 +394,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
         len += pad + 1;
 
         ciph_d[i].blocks = (len - processed) / 16;
-        len += 16;              /* account for explicit iv */
+        len += 16; /* account for explicit iv */
 
         /* arrange header */
         out0[0] = ((u8 *)key->md.data)[8];
@@ -417,22 +414,22 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA256 *key,
 
     return ret;
 }
-# endif
+#endif
 
 static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
-                                        unsigned char *out,
-                                        const unsigned char *in, size_t len)
+    unsigned char *out,
+    const unsigned char *in, size_t len)
 {
     EVP_AES_HMAC_SHA256 *key = data(ctx);
     unsigned int l;
     size_t plen = key->payload_length, iv = 0, /* explicit IV in TLS 1.1 and
                                                 * later */
         sha_off = 0;
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
     size_t aes_off = 0, blocks;
 
     sha_off = SHA256_CBLOCK - key->md.num;
-# endif
+#endif
 
     key->payload_length = NO_PAYLOAD_LENGTH;
 
@@ -442,14 +439,12 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
     if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
         if (plen == NO_PAYLOAD_LENGTH)
             plen = len;
-        else if (len !=
-                 ((plen + SHA256_DIGEST_LENGTH +
-                   AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
+        else if (len != ((plen + SHA256_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
             return 0;
         else if (key->aux.tls_ver >= TLS1_1_VERSION)
             iv = AES_BLOCK_SIZE;
 
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
         /*
          * Assembly stitch handles AVX-capable processors, but its
          * performance is not optimal on AMD Jaguar, ~40% worse, for
@@ -460,16 +455,16 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
          * either even XOP-capable Bulldozer-based or GenuineIntel one.
          * But SHAEXT-capable go ahead...
          */
-        if (((OPENSSL_ia32cap_P[2] & (1 << 29)) ||         /* SHAEXT? */
-             ((OPENSSL_ia32cap_P[1] & (1 << (60 - 32))) && /* AVX? */
-              ((OPENSSL_ia32cap_P[1] & (1 << (43 - 32)))   /* XOP? */
-               | (OPENSSL_ia32cap_P[0] & (1 << 30))))) &&  /* "Intel CPU"? */
-            plen > (sha_off + iv) &&
-            (blocks = (plen - (sha_off + iv)) / SHA256_CBLOCK)) {
+        if (((OPENSSL_ia32cap_P[2] & (1 << 29)) || /* SHAEXT? */
+                ((OPENSSL_ia32cap_P[1] & (1 << (60 - 32))) && /* AVX? */
+                    ((OPENSSL_ia32cap_P[1] & (1 << (43 - 32))) /* XOP? */
+                        | (OPENSSL_ia32cap_P[0] & (1 << 30)))))
+            && /* "Intel CPU"? */
+            plen > (sha_off + iv) && (blocks = (plen - (sha_off + iv)) / SHA256_CBLOCK)) {
             SHA256_Update(&key->md, in + iv, sha_off);
 
             (void)aesni_cbc_sha256_enc(in, out, blocks, &key->ks,
-                                       ctx->iv, &key->md, in + iv + sha_off);
+                ctx->iv, &key->md, in + iv + sha_off);
             blocks *= SHA256_CBLOCK;
             aes_off += blocks;
             sha_off += blocks;
@@ -480,11 +475,11 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
         } else {
             sha_off = 0;
         }
-# endif
+#endif
         sha_off += iv;
         SHA256_Update(&key->md, in + sha_off, plen - sha_off);
 
-        if (plen != len) {      /* "TLS" mode of operation */
+        if (plen != len) { /* "TLS" mode of operation */
             if (in != out)
                 memcpy(out + aes_off, in + aes_off, plen - aes_off);
 
@@ -500,10 +495,10 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
                 out[plen] = l;
             /* encrypt HMAC|padding at once */
             aesni_cbc_encrypt(out + aes_off, out + aes_off, len - aes_off,
-                              &key->ks, ctx->iv, 1);
+                &key->ks, ctx->iv, 1);
         } else {
             aesni_cbc_encrypt(in + aes_off, out + aes_off, len - aes_off,
-                              &key->ks, ctx->iv, 1);
+                &key->ks, ctx->iv, 1);
         }
     } else {
         union {
@@ -516,7 +511,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
 
         /* decrypt HMAC|padding at once */
         aesni_cbc_encrypt(in, out, len, &key->ks,
-                          ctx->iv, 0);
+            ctx->iv, 0);
 
         if (plen != NO_PAYLOAD_LENGTH) { /* "TLS" mode of operation */
             size_t inp_len, mask, j, i;
@@ -563,7 +558,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
             key->md = key->head;
             SHA256_Update(&key->md, key->aux.tls_aad, plen);
 
-# if 1      /* see original reference version in #else */
+#if 1 /* see original reference version in #else */
             len -= SHA256_DIGEST_LENGTH; /* amend mac */
             if (len >= (256 + SHA256_CBLOCK)) {
                 j = (len - (256 + SHA256_CBLOCK)) & (0 - SHA256_CBLOCK);
@@ -576,15 +571,15 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
 
             /* but pretend as if we hashed padded payload */
             bitlen = key->md.Nl + (inp_len << 3); /* at most 18 bits */
-#  ifdef BSWAP4
+#ifdef BSWAP4
             bitlen = BSWAP4(bitlen);
-#  else
+#else
             mac.c[0] = 0;
             mac.c[1] = (unsigned char)(bitlen >> 16);
             mac.c[2] = (unsigned char)(bitlen >> 8);
             mac.c[3] = (unsigned char)bitlen;
             bitlen = mac.u[0];
-#  endif
+#endif
 
             pmac->u[0] = 0;
             pmac->u[1] = 0;
@@ -653,7 +648,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
             pmac->u[6] |= key->md.h[6] & mask;
             pmac->u[7] |= key->md.h[7] & mask;
 
-#  ifdef BSWAP4
+#ifdef BSWAP4
             pmac->u[0] = BSWAP4(pmac->u[0]);
             pmac->u[1] = BSWAP4(pmac->u[1]);
             pmac->u[2] = BSWAP4(pmac->u[2]);
@@ -662,7 +657,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
             pmac->u[5] = BSWAP4(pmac->u[5]);
             pmac->u[6] = BSWAP4(pmac->u[6]);
             pmac->u[7] = BSWAP4(pmac->u[7]);
-#  else
+#else
             for (i = 0; i < 8; i++) {
                 res = pmac->u[i];
                 pmac->c[4 * i + 0] = (unsigned char)(res >> 24);
@@ -670,9 +665,9 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
                 pmac->c[4 * i + 2] = (unsigned char)(res >> 8);
                 pmac->c[4 * i + 3] = (unsigned char)res;
             }
-#  endif
+#endif
             len += SHA256_DIGEST_LENGTH;
-# else
+#else
             SHA256_Update(&key->md, out, inp_len);
             res = key->md.num;
             SHA256_Final(pmac->c, &key->md);
@@ -681,17 +676,15 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
                 unsigned int inp_blocks, pad_blocks;
 
                 /* but pretend as if we hashed padded payload */
-                inp_blocks =
-                    1 + ((SHA256_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
+                inp_blocks = 1 + ((SHA256_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
                 res += (unsigned int)(len - inp_len);
                 pad_blocks = res / SHA256_CBLOCK;
                 res %= SHA256_CBLOCK;
-                pad_blocks +=
-                    1 + ((SHA256_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
+                pad_blocks += 1 + ((SHA256_CBLOCK - 9 - res) >> (sizeof(res) * 8 - 1));
                 for (; inp_blocks < pad_blocks; inp_blocks++)
                     sha1_block_data_order(&key->md, data, 1);
             }
-# endif      /* pre-lucky-13 reference version of above */
+#endif /* pre-lucky-13 reference version of above */
             key->md = key->tail;
             SHA256_Update(&key->md, pmac->c, SHA256_DIGEST_LENGTH);
             SHA256_Final(pmac->c, &key->md);
@@ -699,19 +692,16 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
             /* verify HMAC */
             out += inp_len;
             len -= inp_len;
-# if 1      /* see original reference version in #else */
+#if 1 /* see original reference version in #else */
             {
-                unsigned char *p =
-                    out + len - 1 - maxpad - SHA256_DIGEST_LENGTH;
+                unsigned char *p = out + len - 1 - maxpad - SHA256_DIGEST_LENGTH;
                 size_t off = out - p;
                 unsigned int c, cmask;
 
                 for (res = 0, i = 0, j = 0; j < maxpad + SHA256_DIGEST_LENGTH;
-                     j++) {
+                    j++) {
                     c = p[j];
-                    cmask =
-                        ((int)(j - off - SHA256_DIGEST_LENGTH)) >>
-                        (sizeof(int) * 8 - 1);
+                    cmask = ((int)(j - off - SHA256_DIGEST_LENGTH)) >> (sizeof(int) * 8 - 1);
                     res |= (c ^ pad) & ~cmask; /* ... and padding */
                     cmask &= ((int)(off - 1 - j)) >> (sizeof(int) * 8 - 1);
                     res |= (c ^ pmac->c[i]) & cmask;
@@ -721,7 +711,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
                 res = 0 - ((0 - res) >> (sizeof(res) * 8 - 1));
                 ret &= (int)~res;
             }
-# else      /* pre-lucky-13 reference version of above */
+#else /* pre-lucky-13 reference version of above */
             for (res = 0, i = 0; i < SHA256_DIGEST_LENGTH; i++)
                 res |= out[i] ^ pmac->c[i];
             res = 0 - ((0 - res) >> (sizeof(res) * 8 - 1));
@@ -735,7 +725,7 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
 
             res = (0 - res) >> (sizeof(res) * 8 - 1);
             ret &= (int)~res;
-# endif
+#endif
             return ret;
         } else {
             SHA256_Update(&key->md, out, len);
@@ -746,158 +736,149 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx,
 }
 
 static int aesni_cbc_hmac_sha256_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
-                                      void *ptr)
+    void *ptr)
 {
     EVP_AES_HMAC_SHA256 *key = data(ctx);
     unsigned int u_arg = (unsigned int)arg;
 
     switch (type) {
-    case EVP_CTRL_AEAD_SET_MAC_KEY:
-        {
-            unsigned int i;
-            unsigned char hmac_key[64];
+    case EVP_CTRL_AEAD_SET_MAC_KEY: {
+        unsigned int i;
+        unsigned char hmac_key[64];
 
-            memset(hmac_key, 0, sizeof(hmac_key));
+        memset(hmac_key, 0, sizeof(hmac_key));
 
-            if (arg < 0)
-                return -1;
+        if (arg < 0)
+            return -1;
 
-            if (u_arg > sizeof(hmac_key)) {
-                SHA256_Init(&key->head);
-                SHA256_Update(&key->head, ptr, arg);
-                SHA256_Final(hmac_key, &key->head);
-            } else {
-                memcpy(hmac_key, ptr, arg);
-            }
-
-            for (i = 0; i < sizeof(hmac_key); i++)
-                hmac_key[i] ^= 0x36; /* ipad */
+        if (u_arg > sizeof(hmac_key)) {
             SHA256_Init(&key->head);
-            SHA256_Update(&key->head, hmac_key, sizeof(hmac_key));
-
-            for (i = 0; i < sizeof(hmac_key); i++)
-                hmac_key[i] ^= 0x36 ^ 0x5c; /* opad */
-            SHA256_Init(&key->tail);
-            SHA256_Update(&key->tail, hmac_key, sizeof(hmac_key));
-
-            OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
-
-            return 1;
+            SHA256_Update(&key->head, ptr, arg);
+            SHA256_Final(hmac_key, &key->head);
+        } else {
+            memcpy(hmac_key, ptr, arg);
         }
-    case EVP_CTRL_AEAD_TLS1_AAD:
-        {
-            unsigned char *p = ptr;
-            unsigned int len;
 
-            if (arg != EVP_AEAD_TLS1_AAD_LEN)
-                return -1;
+        for (i = 0; i < sizeof(hmac_key); i++)
+            hmac_key[i] ^= 0x36; /* ipad */
+        SHA256_Init(&key->head);
+        SHA256_Update(&key->head, hmac_key, sizeof(hmac_key));
 
-            len = p[arg - 2] << 8 | p[arg - 1];
-
-            if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
-                key->payload_length = len;
-                if ((key->aux.tls_ver =
-                     p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
-                    if (len < AES_BLOCK_SIZE)
-                        return 0;
-                    len -= AES_BLOCK_SIZE;
-                    p[arg - 2] = len >> 8;
-                    p[arg - 1] = len;
-                }
-                key->md = key->head;
-                SHA256_Update(&key->md, p, arg);
+        for (i = 0; i < sizeof(hmac_key); i++)
+            hmac_key[i] ^= 0x36 ^ 0x5c; /* opad */
+        SHA256_Init(&key->tail);
+        SHA256_Update(&key->tail, hmac_key, sizeof(hmac_key));
 
-                return (int)(((len + SHA256_DIGEST_LENGTH +
-                               AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
-                             - len);
-            } else {
-                memcpy(key->aux.tls_aad, ptr, arg);
-                key->payload_length = arg;
+        OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
 
-                return SHA256_DIGEST_LENGTH;
+        return 1;
+    }
+    case EVP_CTRL_AEAD_TLS1_AAD: {
+        unsigned char *p = ptr;
+        unsigned int len;
+
+        if (arg != EVP_AEAD_TLS1_AAD_LEN)
+            return -1;
+
+        len = p[arg - 2] << 8 | p[arg - 1];
+
+        if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
+            key->payload_length = len;
+            if ((key->aux.tls_ver = p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
+                if (len < AES_BLOCK_SIZE)
+                    return 0;
+                len -= AES_BLOCK_SIZE;
+                p[arg - 2] = len >> 8;
+                p[arg - 1] = len;
             }
+            key->md = key->head;
+            SHA256_Update(&key->md, p, arg);
+
+            return (int)(((len + SHA256_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
+                - len);
+        } else {
+            memcpy(key->aux.tls_aad, ptr, arg);
+            key->payload_length = arg;
+
+            return SHA256_DIGEST_LENGTH;
         }
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+    }
+#if !defined(OPENSSL_NO_MULTIBLOCK)
     case EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE:
         return (int)(5 + 16 + ((arg + 32 + 16) & -16));
-    case EVP_CTRL_TLS1_1_MULTIBLOCK_AAD:
-        {
-            EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param =
-                (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *) ptr;
-            unsigned int n4x = 1, x4;
-            unsigned int frag, last, packlen, inp_len;
-
-            if (arg < 0)
-                return -1;
+    case EVP_CTRL_TLS1_1_MULTIBLOCK_AAD: {
+        EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param = (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
+        unsigned int n4x = 1, x4;
+        unsigned int frag, last, packlen, inp_len;
 
-            if (u_arg < sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM))
-                return -1;
+        if (arg < 0)
+            return -1;
+
+        if (u_arg < sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM))
+            return -1;
+
+        inp_len = param->inp[11] << 8 | param->inp[12];
 
-            inp_len = param->inp[11] << 8 | param->inp[12];
+        if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
+            if ((param->inp[9] << 8 | param->inp[10]) < TLS1_1_VERSION)
+                return -1;
 
-            if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
-                if ((param->inp[9] << 8 | param->inp[10]) < TLS1_1_VERSION)
-                    return -1;
+            if (inp_len) {
+                if (inp_len < 4096)
+                    return 0; /* too short */
 
-                if (inp_len) {
-                    if (inp_len < 4096)
-                        return 0; /* too short */
+                if (inp_len >= 8192 && OPENSSL_ia32cap_P[2] & (1 << 5))
+                    n4x = 2; /* AVX2 */
+            } else if ((n4x = param->interleave / 4) && n4x <= 2)
+                inp_len = param->len;
+            else
+                return -1;
 
-                    if (inp_len >= 8192 && OPENSSL_ia32cap_P[2] & (1 << 5))
-                        n4x = 2; /* AVX2 */
-                } else if ((n4x = param->interleave / 4) && n4x <= 2)
-                    inp_len = param->len;
-                else
-                    return -1;
+            key->md = key->head;
+            SHA256_Update(&key->md, param->inp, 13);
 
-                key->md = key->head;
-                SHA256_Update(&key->md, param->inp, 13);
+            x4 = 4 * n4x;
+            n4x += 1;
 
-                x4 = 4 * n4x;
-                n4x += 1;
+            frag = inp_len >> n4x;
+            last = inp_len + frag - (frag << n4x);
+            if (last > frag && ((last + 13 + 9) % 64 < (x4 - 1))) {
+                frag++;
+                last -= x4 - 1;
+            }
 
-                frag = inp_len >> n4x;
-                last = inp_len + frag - (frag << n4x);
-                if (last > frag && ((last + 13 + 9) % 64 < (x4 - 1))) {
-                    frag++;
-                    last -= x4 - 1;
-                }
+            packlen = 5 + 16 + ((frag + 32 + 16) & -16);
+            packlen = (packlen << n4x) - packlen;
+            packlen += 5 + 16 + ((last + 32 + 16) & -16);
 
-                packlen = 5 + 16 + ((frag + 32 + 16) & -16);
-                packlen = (packlen << n4x) - packlen;
-                packlen += 5 + 16 + ((last + 32 + 16) & -16);
+            param->interleave = x4;
 
-                param->interleave = x4;
+            return (int)packlen;
+        } else
+            return -1; /* not yet */
+    }
+    case EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT: {
+        EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param = (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
 
-                return (int)packlen;
-            } else
-                return -1;      /* not yet */
-        }
-    case EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT:
-        {
-            EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param =
-                (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *) ptr;
-
-            return (int)tls1_1_multi_block_encrypt(key, param->out,
-                                                   param->inp, param->len,
-                                                   param->interleave / 4);
-        }
+        return (int)tls1_1_multi_block_encrypt(key, param->out,
+            param->inp, param->len,
+            param->interleave / 4);
+    }
     case EVP_CTRL_TLS1_1_MULTIBLOCK_DECRYPT:
-# endif
+#endif
     default:
         return -1;
     }
 }
 
 static EVP_CIPHER aesni_128_cbc_hmac_sha256_cipher = {
-# ifdef NID_aes_128_cbc_hmac_sha256
+#ifdef NID_aes_128_cbc_hmac_sha256
     NID_aes_128_cbc_hmac_sha256,
-# else
+#else
     NID_undef,
-# endif
+#endif
     AES_BLOCK_SIZE, 16, AES_BLOCK_SIZE,
-    EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 |
-        EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
+    EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
     EVP_ORIG_GLOBAL,
     aesni_cbc_hmac_sha256_init_key,
     aesni_cbc_hmac_sha256_cipher,
@@ -910,14 +891,13 @@ static EVP_CIPHER aesni_128_cbc_hmac_sha256_cipher = {
 };
 
 static EVP_CIPHER aesni_256_cbc_hmac_sha256_cipher = {
-# ifdef NID_aes_256_cbc_hmac_sha256
+#ifdef NID_aes_256_cbc_hmac_sha256
     NID_aes_256_cbc_hmac_sha256,
-# else
+#else
     NID_undef,
-# endif
+#endif
     AES_BLOCK_SIZE, 32, AES_BLOCK_SIZE,
-    EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 |
-        EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
+    EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK,
     EVP_ORIG_GLOBAL,
     aesni_cbc_hmac_sha256_init_key,
     aesni_cbc_hmac_sha256_cipher,
@@ -931,16 +911,12 @@ static EVP_CIPHER aesni_256_cbc_hmac_sha256_cipher = {
 
 const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha256(void)
 {
-    return ((OPENSSL_ia32cap_P[1] & AESNI_CAPABLE) &&
-            aesni_cbc_sha256_enc(NULL, NULL, 0, NULL, NULL, NULL, NULL) ?
-            &aesni_128_cbc_hmac_sha256_cipher : NULL);
+    return ((OPENSSL_ia32cap_P[1] & AESNI_CAPABLE) && aesni_cbc_sha256_enc(NULL, NULL, 0, NULL, NULL, NULL, NULL) ? &aesni_128_cbc_hmac_sha256_cipher : NULL);
 }
 
 const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void)
 {
-    return ((OPENSSL_ia32cap_P[1] & AESNI_CAPABLE) &&
-            aesni_cbc_sha256_enc(NULL, NULL, 0, NULL, NULL, NULL, NULL) ?
-            &aesni_256_cbc_hmac_sha256_cipher : NULL);
+    return ((OPENSSL_ia32cap_P[1] & AESNI_CAPABLE) && aesni_cbc_sha256_enc(NULL, NULL, 0, NULL, NULL, NULL, NULL) ? &aesni_256_cbc_hmac_sha256_cipher : NULL);
 }
 #else
 const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha256(void)
diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c
index 5a894fbb9be2c..eb3d98259e3a7 100644
--- a/crypto/evp/e_aria.c
+++ b/crypto/evp/e_aria.c
@@ -12,13 +12,13 @@
 
 #include "internal/cryptlib.h"
 #ifndef OPENSSL_NO_ARIA
-# include <openssl/evp.h>
-# include <openssl/modes.h>
-# include <openssl/rand.h>
-# include "crypto/aria.h"
-# include "crypto/evp.h"
-# include "crypto/modes.h"
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/modes.h>
+#include <openssl/rand.h>
+#include "crypto/aria.h"
+#include "crypto/evp.h"
+#include "crypto/modes.h"
+#include "evp_local.h"
 
 /* ARIA subkey Structure */
 typedef struct {
@@ -30,15 +30,15 @@ typedef struct {
     union {
         OSSL_UNION_ALIGN;
         ARIA_KEY ks;
-    } ks;                       /* ARIA subkey to use */
-    int key_set;                /* Set if key initialised */
-    int iv_set;                 /* Set if an iv is set */
+    } ks; /* ARIA subkey to use */
+    int key_set; /* Set if key initialised */
+    int iv_set; /* Set if an iv is set */
     GCM128_CONTEXT gcm;
-    unsigned char *iv;          /* Temporary IV store */
-    int ivlen;                  /* IV length */
+    unsigned char *iv; /* Temporary IV store */
+    int ivlen; /* IV length */
     int taglen;
-    int iv_gen;                 /* It is OK to generate IVs */
-    int tls_aad_len;            /* TLS AAD length */
+    int iv_gen; /* It is OK to generate IVs */
+    int tls_aad_len; /* TLS AAD length */
 } EVP_ARIA_GCM_CTX;
 
 /* ARIA CCM context */
@@ -46,32 +46,32 @@ typedef struct {
     union {
         OSSL_UNION_ALIGN;
         ARIA_KEY ks;
-    } ks;                       /* ARIA key schedule to use */
-    int key_set;                /* Set if key initialised */
-    int iv_set;                 /* Set if an iv is set */
-    int tag_set;                /* Set if tag is valid */
-    int len_set;                /* Set if message length set */
-    int L, M;                   /* L and M parameters from RFC3610 */
-    int tls_aad_len;            /* TLS AAD length */
+    } ks; /* ARIA key schedule to use */
+    int key_set; /* Set if key initialised */
+    int iv_set; /* Set if an iv is set */
+    int tag_set; /* Set if tag is valid */
+    int len_set; /* Set if message length set */
+    int L, M; /* L and M parameters from RFC3610 */
+    int tls_aad_len; /* TLS AAD length */
     CCM128_CONTEXT ccm;
     ccm128_f str;
 } EVP_ARIA_CCM_CTX;
 
 /* The subkey for ARIA is generated. */
 static int aria_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                            const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int ret;
     int mode = EVP_CIPHER_CTX_get_mode(ctx);
 
     if (enc || (mode != EVP_CIPH_ECB_MODE && mode != EVP_CIPH_CBC_MODE))
         ret = ossl_aria_set_encrypt_key(key,
-                                        EVP_CIPHER_CTX_get_key_length(ctx) * 8,
-                                        EVP_CIPHER_CTX_get_cipher_data(ctx));
+            EVP_CIPHER_CTX_get_key_length(ctx) * 8,
+            EVP_CIPHER_CTX_get_cipher_data(ctx));
     else
         ret = ossl_aria_set_decrypt_key(key,
-                                        EVP_CIPHER_CTX_get_key_length(ctx) * 8,
-                                        EVP_CIPHER_CTX_get_cipher_data(ctx));
+            EVP_CIPHER_CTX_get_key_length(ctx) * 8,
+            EVP_CIPHER_CTX_get_cipher_data(ctx));
     if (ret < 0) {
         ERR_raise(ERR_LIB_EVP, EVP_R_ARIA_KEY_SETUP_FAILED);
         return 0;
@@ -80,100 +80,103 @@ static int aria_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static void aria_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t len, const ARIA_KEY *key,
-                             unsigned char *ivec, const int enc)
+    size_t len, const ARIA_KEY *key,
+    unsigned char *ivec, const int enc)
 {
 
     if (enc)
         CRYPTO_cbc128_encrypt(in, out, len, key, ivec,
-                              (block128_f) ossl_aria_encrypt);
+            (block128_f)ossl_aria_encrypt);
     else
         CRYPTO_cbc128_decrypt(in, out, len, key, ivec,
-                              (block128_f) ossl_aria_encrypt);
+            (block128_f)ossl_aria_encrypt);
 }
 
 static void aria_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                                size_t length, const ARIA_KEY *key,
-                                unsigned char *ivec, int *num, const int enc)
+    size_t length, const ARIA_KEY *key,
+    unsigned char *ivec, int *num, const int enc)
 {
 
     CRYPTO_cfb128_encrypt(in, out, length, key, ivec, num, enc,
-                          (block128_f) ossl_aria_encrypt);
+        (block128_f)ossl_aria_encrypt);
 }
 
 static void aria_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-                              size_t length, const ARIA_KEY *key,
-                              unsigned char *ivec, int *num, const int enc)
+    size_t length, const ARIA_KEY *key,
+    unsigned char *ivec, int *num, const int enc)
 {
     CRYPTO_cfb128_1_encrypt(in, out, length, key, ivec, num, enc,
-                            (block128_f) ossl_aria_encrypt);
+        (block128_f)ossl_aria_encrypt);
 }
 
 static void aria_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-                              size_t length, const ARIA_KEY *key,
-                              unsigned char *ivec, int *num, const int enc)
+    size_t length, const ARIA_KEY *key,
+    unsigned char *ivec, int *num, const int enc)
 {
     CRYPTO_cfb128_8_encrypt(in, out, length, key, ivec, num, enc,
-                            (block128_f) ossl_aria_encrypt);
+        (block128_f)ossl_aria_encrypt);
 }
 
 static void aria_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                             const ARIA_KEY *key, const int enc)
+    const ARIA_KEY *key, const int enc)
 {
     ossl_aria_encrypt(in, out, key);
 }
 
 static void aria_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const ARIA_KEY *key,
-                             unsigned char *ivec, int *num)
+    size_t length, const ARIA_KEY *key,
+    unsigned char *ivec, int *num)
 {
     CRYPTO_ofb128_encrypt(in, out, length, key, ivec, num,
-                         (block128_f) ossl_aria_encrypt);
+        (block128_f)ossl_aria_encrypt);
 }
 
 IMPLEMENT_BLOCK_CIPHER(aria_128, ks, aria, EVP_ARIA_KEY,
-                        NID_aria_128, 16, 16, 16, 128,
-                        0, aria_init_key, NULL,
-                        EVP_CIPHER_set_asn1_iv,
-                        EVP_CIPHER_get_asn1_iv,
-                        NULL)
+    NID_aria_128, 16, 16, 16, 128,
+    0, aria_init_key, NULL,
+    EVP_CIPHER_set_asn1_iv,
+    EVP_CIPHER_get_asn1_iv,
+    NULL)
 IMPLEMENT_BLOCK_CIPHER(aria_192, ks, aria, EVP_ARIA_KEY,
-                        NID_aria_192, 16, 24, 16, 128,
-                        0, aria_init_key, NULL,
-                        EVP_CIPHER_set_asn1_iv,
-                        EVP_CIPHER_get_asn1_iv,
-                        NULL)
+    NID_aria_192, 16, 24, 16, 128,
+    0, aria_init_key, NULL,
+    EVP_CIPHER_set_asn1_iv,
+    EVP_CIPHER_get_asn1_iv,
+    NULL)
 IMPLEMENT_BLOCK_CIPHER(aria_256, ks, aria, EVP_ARIA_KEY,
-                        NID_aria_256, 16, 32, 16, 128,
-                        0, aria_init_key, NULL,
-                        EVP_CIPHER_set_asn1_iv,
-                        EVP_CIPHER_get_asn1_iv,
-                        NULL)
-
-# define IMPLEMENT_ARIA_CFBR(ksize,cbits) \
-                IMPLEMENT_CFBR(aria,aria,EVP_ARIA_KEY,ks,ksize,cbits,16,0)
-IMPLEMENT_ARIA_CFBR(128,1)
-IMPLEMENT_ARIA_CFBR(192,1)
-IMPLEMENT_ARIA_CFBR(256,1)
-IMPLEMENT_ARIA_CFBR(128,8)
-IMPLEMENT_ARIA_CFBR(192,8)
-IMPLEMENT_ARIA_CFBR(256,8)
-
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER aria_##keylen##_##mode = { \
-        nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        aria_init_key,                  \
-        aria_##mode##_cipher,           \
-        NULL,                           \
-        sizeof(EVP_ARIA_KEY),           \
-        NULL,NULL,NULL,NULL };          \
-const EVP_CIPHER *EVP_aria_##keylen##_##mode(void) \
-{ return &aria_##keylen##_##mode; }
+    NID_aria_256, 16, 32, 16, 128,
+    0, aria_init_key, NULL,
+    EVP_CIPHER_set_asn1_iv,
+    EVP_CIPHER_get_asn1_iv,
+    NULL)
+
+#define IMPLEMENT_ARIA_CFBR(ksize, cbits) \
+    IMPLEMENT_CFBR(aria, aria, EVP_ARIA_KEY, ks, ksize, cbits, 16, 0)
+IMPLEMENT_ARIA_CFBR(128, 1)
+IMPLEMENT_ARIA_CFBR(192, 1)
+IMPLEMENT_ARIA_CFBR(256, 1)
+IMPLEMENT_ARIA_CFBR(128, 8)
+IMPLEMENT_ARIA_CFBR(192, 8)
+IMPLEMENT_ARIA_CFBR(256, 8)
+
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, MODE, flags) \
+    static const EVP_CIPHER aria_##keylen##_##mode = {                                \
+        nid##_##keylen##_##nmode, blocksize, keylen / 8, ivlen,                       \
+        flags | EVP_CIPH_##MODE##_MODE,                                               \
+        EVP_ORIG_GLOBAL,                                                              \
+        aria_init_key,                                                                \
+        aria_##mode##_cipher,                                                         \
+        NULL,                                                                         \
+        sizeof(EVP_ARIA_KEY),                                                         \
+        NULL, NULL, NULL, NULL                                                        \
+    };                                                                                \
+    const EVP_CIPHER *EVP_aria_##keylen##_##mode(void)                                \
+    {                                                                                 \
+        return &aria_##keylen##_##mode;                                               \
+    }
 
 static int aria_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     int n = EVP_CIPHER_CTX_get_num(ctx);
     unsigned int num;
@@ -184,20 +187,20 @@ static int aria_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     num = (unsigned int)n;
 
     CRYPTO_ctr128_encrypt(in, out, len, &dat->ks, ctx->iv,
-                          EVP_CIPHER_CTX_buf_noconst(ctx), &num,
-                          (block128_f) ossl_aria_encrypt);
+        EVP_CIPHER_CTX_buf_noconst(ctx), &num,
+        (block128_f)ossl_aria_encrypt);
     EVP_CIPHER_CTX_set_num(ctx, num);
     return 1;
 }
 
 BLOCK_CIPHER_generic(NID_aria, 128, 1, 16, ctr, ctr, CTR, 0)
-BLOCK_CIPHER_generic(NID_aria, 192, 1, 16, ctr, ctr, CTR, 0)
-BLOCK_CIPHER_generic(NID_aria, 256, 1, 16, ctr, ctr, CTR, 0)
+    BLOCK_CIPHER_generic(NID_aria, 192, 1, 16, ctr, ctr, CTR, 0)
+        BLOCK_CIPHER_generic(NID_aria, 256, 1, 16, ctr, ctr, CTR, 0)
 
-/* Authenticated cipher modes (GCM/CCM) */
+    /* Authenticated cipher modes (GCM/CCM) */
 
-/* increment counter (64-bit int) by 1 */
-static void ctr64_inc(unsigned char *counter)
+    /* increment counter (64-bit int) by 1 */
+    static void ctr64_inc(unsigned char *counter)
 {
     int n = 8;
     unsigned char c;
@@ -213,7 +216,7 @@ static void ctr64_inc(unsigned char *counter)
 }
 
 static int aria_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                                 const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int ret;
     EVP_ARIA_GCM_CTX *gctx = EVP_C_DATA(EVP_ARIA_GCM_CTX, ctx);
@@ -222,10 +225,10 @@ static int aria_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         return 1;
     if (key) {
         ret = ossl_aria_set_encrypt_key(key,
-                                        EVP_CIPHER_CTX_get_key_length(ctx) * 8,
-                                        &gctx->ks.ks);
+            EVP_CIPHER_CTX_get_key_length(ctx) * 8,
+            &gctx->ks.ks);
         CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
-                           (block128_f) ossl_aria_encrypt);
+            (block128_f)ossl_aria_encrypt);
         if (ret < 0) {
             ERR_raise(ERR_LIB_EVP, EVP_R_ARIA_KEY_SETUP_FAILED);
             return 0;
@@ -351,8 +354,7 @@ static int aria_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
         memcpy(EVP_CIPHER_CTX_buf_noconst(c), ptr, arg);
         gctx->tls_aad_len = arg;
         {
-            unsigned int len =
-                EVP_CIPHER_CTX_buf_noconst(c)[arg - 2] << 8
+            unsigned int len = EVP_CIPHER_CTX_buf_noconst(c)[arg - 2] << 8
                 | EVP_CIPHER_CTX_buf_noconst(c)[arg - 1];
             /* Correct length for explicit IV */
             if (len < EVP_GCM_TLS_EXPLICIT_IV_LEN)
@@ -370,33 +372,31 @@ static int aria_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
         /* Extra padding: tag appended to record */
         return EVP_GCM_TLS_TAG_LEN;
 
-    case EVP_CTRL_COPY:
-        {
-            EVP_CIPHER_CTX *out = ptr;
-            EVP_ARIA_GCM_CTX *gctx_out = EVP_C_DATA(EVP_ARIA_GCM_CTX, out);
-            if (gctx->gcm.key) {
-                if (gctx->gcm.key != &gctx->ks)
-                    return 0;
-                gctx_out->gcm.key = &gctx_out->ks;
-            }
-            if (gctx->iv == c->iv)
-                gctx_out->iv = out->iv;
-            else {
-                if ((gctx_out->iv = OPENSSL_malloc(gctx->ivlen)) == NULL)
-                    return 0;
-                memcpy(gctx_out->iv, gctx->iv, gctx->ivlen);
-            }
-            return 1;
+    case EVP_CTRL_COPY: {
+        EVP_CIPHER_CTX *out = ptr;
+        EVP_ARIA_GCM_CTX *gctx_out = EVP_C_DATA(EVP_ARIA_GCM_CTX, out);
+        if (gctx->gcm.key) {
+            if (gctx->gcm.key != &gctx->ks)
+                return 0;
+            gctx_out->gcm.key = &gctx_out->ks;
+        }
+        if (gctx->iv == c->iv)
+            gctx_out->iv = out->iv;
+        else {
+            if ((gctx_out->iv = OPENSSL_malloc(gctx->ivlen)) == NULL)
+                return 0;
+            memcpy(gctx_out->iv, gctx->iv, gctx->ivlen);
         }
+        return 1;
+    }
 
     default:
         return -1;
-
     }
 }
 
 static int aria_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_ARIA_GCM_CTX *gctx = EVP_C_DATA(EVP_ARIA_GCM_CTX, ctx);
     int rv = -1;
@@ -409,13 +409,13 @@ static int aria_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
      * Set IV from start of buffer or generate IV and write to start of
      * buffer.
      */
-    if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CIPHER_CTX_is_encrypting(ctx) ?
-                            EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
-                            EVP_GCM_TLS_EXPLICIT_IV_LEN, out) <= 0)
+    if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CIPHER_CTX_is_encrypting(ctx) ? EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
+            EVP_GCM_TLS_EXPLICIT_IV_LEN, out)
+        <= 0)
         goto err;
     /* Use saved AAD */
     if (CRYPTO_gcm128_aad(&gctx->gcm, EVP_CIPHER_CTX_buf_noconst(ctx),
-                          gctx->tls_aad_len))
+            gctx->tls_aad_len))
         goto err;
     /* Fix buffer and length to point to payload */
     in += EVP_GCM_TLS_EXPLICIT_IV_LEN;
@@ -435,24 +435,24 @@ static int aria_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             goto err;
         /* Retrieve tag */
         CRYPTO_gcm128_tag(&gctx->gcm, EVP_CIPHER_CTX_buf_noconst(ctx),
-                          EVP_GCM_TLS_TAG_LEN);
+            EVP_GCM_TLS_TAG_LEN);
         /* If tag mismatch wipe buffer */
         if (CRYPTO_memcmp(EVP_CIPHER_CTX_buf_noconst(ctx), in + len,
-                          EVP_GCM_TLS_TAG_LEN)) {
+                EVP_GCM_TLS_TAG_LEN)) {
             OPENSSL_cleanse(out, len);
             goto err;
         }
         rv = len;
     }
 
- err:
+err:
     gctx->iv_set = 0;
     gctx->tls_aad_len = -1;
     return rv;
 }
 
 static int aria_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_ARIA_GCM_CTX *gctx = EVP_C_DATA(EVP_ARIA_GCM_CTX, ctx);
 
@@ -482,8 +482,9 @@ static int aria_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         if (gctx->taglen < 0)
             return -1;
         if (CRYPTO_gcm128_finish(&gctx->gcm,
-                                 EVP_CIPHER_CTX_buf_noconst(ctx),
-                                 gctx->taglen) != 0)
+                EVP_CIPHER_CTX_buf_noconst(ctx),
+                gctx->taglen)
+            != 0)
             return -1;
         gctx->iv_set = 0;
         return 0;
@@ -506,7 +507,7 @@ static int aria_gcm_cleanup(EVP_CIPHER_CTX *ctx)
 }
 
 static int aria_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                            const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int ret;
     EVP_ARIA_CCM_CTX *cctx = EVP_C_DATA(EVP_ARIA_CCM_CTX, ctx);
@@ -516,10 +517,10 @@ static int aria_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 
     if (key) {
         ret = ossl_aria_set_encrypt_key(key,
-                                        EVP_CIPHER_CTX_get_key_length(ctx) * 8,
-                                        &cctx->ks.ks);
+            EVP_CIPHER_CTX_get_key_length(ctx) * 8,
+            &cctx->ks.ks);
         CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
-                           &cctx->ks, (block128_f) ossl_aria_encrypt);
+            &cctx->ks, (block128_f)ossl_aria_encrypt);
         if (ret < 0) {
             ERR_raise(ERR_LIB_EVP, EVP_R_ARIA_KEY_SETUP_FAILED);
             return 0;
@@ -560,8 +561,7 @@ static int aria_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
         memcpy(EVP_CIPHER_CTX_buf_noconst(c), ptr, arg);
         cctx->tls_aad_len = arg;
         {
-            uint16_t len =
-                EVP_CIPHER_CTX_buf_noconst(c)[arg - 2] << 8
+            uint16_t len = EVP_CIPHER_CTX_buf_noconst(c)[arg - 2] << 8
                 | EVP_CIPHER_CTX_buf_noconst(c)[arg - 1];
             /* Correct length for explicit IV */
             if (len < EVP_CCM_TLS_EXPLICIT_IV_LEN)
@@ -617,17 +617,16 @@ static int aria_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
         cctx->len_set = 0;
         return 1;
 
-    case EVP_CTRL_COPY:
-        {
-            EVP_CIPHER_CTX *out = ptr;
-            EVP_ARIA_CCM_CTX *cctx_out = EVP_C_DATA(EVP_ARIA_CCM_CTX, out);
-            if (cctx->ccm.key) {
-                if (cctx->ccm.key != &cctx->ks)
-                    return 0;
-                cctx_out->ccm.key = &cctx_out->ks;
-            }
-            return 1;
+    case EVP_CTRL_COPY: {
+        EVP_CIPHER_CTX *out = ptr;
+        EVP_ARIA_CCM_CTX *cctx_out = EVP_C_DATA(EVP_ARIA_CCM_CTX, out);
+        if (cctx->ccm.key) {
+            if (cctx->ccm.key != &cctx->ks)
+                return 0;
+            cctx_out->ccm.key = &cctx_out->ks;
         }
+        return 1;
+    }
 
     default:
         return -1;
@@ -635,7 +634,7 @@ static int aria_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 }
 
 static int aria_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_ARIA_CCM_CTX *cctx = EVP_C_DATA(EVP_ARIA_CCM_CTX, ctx);
     CCM128_CONTEXT *ccm = &cctx->ccm;
@@ -646,18 +645,18 @@ static int aria_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     /* If encrypting set explicit IV from sequence number (start of AAD) */
     if (EVP_CIPHER_CTX_is_encrypting(ctx))
         memcpy(out, EVP_CIPHER_CTX_buf_noconst(ctx),
-               EVP_CCM_TLS_EXPLICIT_IV_LEN);
+            EVP_CCM_TLS_EXPLICIT_IV_LEN);
     /* Get rest of IV from explicit IV */
     memcpy(ctx->iv + EVP_CCM_TLS_FIXED_IV_LEN, in,
-           EVP_CCM_TLS_EXPLICIT_IV_LEN);
+        EVP_CCM_TLS_EXPLICIT_IV_LEN);
     /* Correct length value */
     len -= EVP_CCM_TLS_EXPLICIT_IV_LEN + cctx->M;
     if (CRYPTO_ccm128_setiv(ccm, ctx->iv, 15 - cctx->L,
-                            len))
-            return -1;
+            len))
+        return -1;
     /* Use saved AAD */
     CRYPTO_ccm128_aad(ccm, EVP_CIPHER_CTX_buf_noconst(ctx),
-                      cctx->tls_aad_len);
+        cctx->tls_aad_len);
     /* Fix buffer to point to payload */
     in += EVP_CCM_TLS_EXPLICIT_IV_LEN;
     out += EVP_CCM_TLS_EXPLICIT_IV_LEN;
@@ -683,7 +682,7 @@ static int aria_ccm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int aria_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_ARIA_CCM_CTX *cctx = EVP_C_DATA(EVP_ARIA_CCM_CTX, ctx);
     CCM128_CONTEXT *ccm = &cctx->ccm;
@@ -735,12 +734,12 @@ static int aria_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     } else {
         int rv = -1;
         if (cctx->str ? !CRYPTO_ccm128_decrypt_ccm64(ccm, in, out, len,
-                                                     cctx->str) :
-            !CRYPTO_ccm128_decrypt(ccm, in, out, len)) {
+                            cctx->str)
+                      : !CRYPTO_ccm128_decrypt(ccm, in, out, len)) {
             unsigned char tag[16];
             if (CRYPTO_ccm128_tag(ccm, tag, cctx->M)) {
                 if (!CRYPTO_memcmp(tag, EVP_CIPHER_CTX_buf_noconst(ctx),
-                                   cctx->M))
+                        cctx->M))
                     rv = len;
             }
         }
@@ -753,34 +752,37 @@ static int aria_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     }
 }
 
-#define aria_ccm_cleanup    NULL
-
-#define ARIA_AUTH_FLAGS  (EVP_CIPH_FLAG_DEFAULT_ASN1 \
-                          | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
-                          | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
-                          | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_FLAG_AEAD_CIPHER \
-                          | EVP_CIPH_CUSTOM_IV_LENGTH)
-
-#define BLOCK_CIPHER_aead(keylen,mode,MODE)        \
-static const EVP_CIPHER aria_##keylen##_##mode = { \
-        NID_aria_##keylen##_##mode,                \
-        1, keylen/8, 12,                           \
-        ARIA_AUTH_FLAGS|EVP_CIPH_##MODE##_MODE,    \
-        EVP_ORIG_GLOBAL,                           \
-        aria_##mode##_init_key,                    \
-        aria_##mode##_cipher,                      \
-        aria_##mode##_cleanup,                     \
-        sizeof(EVP_ARIA_##MODE##_CTX),             \
-        NULL,NULL,aria_##mode##_ctrl,NULL };       \
-const EVP_CIPHER *EVP_aria_##keylen##_##mode(void) \
-{ return (EVP_CIPHER*)&aria_##keylen##_##mode; }
+#define aria_ccm_cleanup NULL
+
+#define ARIA_AUTH_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1    \
+    | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
+    | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT   \
+    | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_FLAG_AEAD_CIPHER \
+    | EVP_CIPH_CUSTOM_IV_LENGTH)
+
+#define BLOCK_CIPHER_aead(keylen, mode, MODE)          \
+    static const EVP_CIPHER aria_##keylen##_##mode = { \
+        NID_aria_##keylen##_##mode,                    \
+        1, keylen / 8, 12,                             \
+        ARIA_AUTH_FLAGS | EVP_CIPH_##MODE##_MODE,      \
+        EVP_ORIG_GLOBAL,                               \
+        aria_##mode##_init_key,                        \
+        aria_##mode##_cipher,                          \
+        aria_##mode##_cleanup,                         \
+        sizeof(EVP_ARIA_##MODE##_CTX),                 \
+        NULL, NULL, aria_##mode##_ctrl, NULL           \
+    };                                                 \
+    const EVP_CIPHER *EVP_aria_##keylen##_##mode(void) \
+    {                                                  \
+        return (EVP_CIPHER *)&aria_##keylen##_##mode;  \
+    }
 
 BLOCK_CIPHER_aead(128, gcm, GCM)
-BLOCK_CIPHER_aead(192, gcm, GCM)
-BLOCK_CIPHER_aead(256, gcm, GCM)
+    BLOCK_CIPHER_aead(192, gcm, GCM)
+        BLOCK_CIPHER_aead(256, gcm, GCM)
 
-BLOCK_CIPHER_aead(128, ccm, CCM)
-BLOCK_CIPHER_aead(192, ccm, CCM)
-BLOCK_CIPHER_aead(256, ccm, CCM)
+            BLOCK_CIPHER_aead(128, ccm, CCM)
+                BLOCK_CIPHER_aead(192, ccm, CCM)
+                    BLOCK_CIPHER_aead(256, ccm, CCM)
 
 #endif
diff --git a/crypto/evp/e_bf.c b/crypto/evp/e_bf.c
index 2aeda2ecf07ad..8cac877e91c54 100644
--- a/crypto/evp/e_bf.c
+++ b/crypto/evp/e_bf.c
@@ -16,27 +16,27 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #ifndef OPENSSL_NO_BF
-# include <openssl/evp.h>
-# include "crypto/evp.h"
-# include <openssl/objects.h>
-# include <openssl/blowfish.h>
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include "crypto/evp.h"
+#include <openssl/objects.h>
+#include <openssl/blowfish.h>
+#include "evp_local.h"
 
 static int bf_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                       const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 
 typedef struct {
     BF_KEY ks;
 } EVP_BF_KEY;
 
-# define data(ctx)       EVP_C_DATA(EVP_BF_KEY,ctx)
+#define data(ctx) EVP_C_DATA(EVP_BF_KEY, ctx)
 
 IMPLEMENT_BLOCK_CIPHER(bf, ks, BF, EVP_BF_KEY, NID_bf, 8, 16, 8, 64,
-                       EVP_CIPH_VARIABLE_LENGTH, bf_init_key, NULL,
-                       EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
+    EVP_CIPH_VARIABLE_LENGTH, bf_init_key, NULL,
+    EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
 
 static int bf_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                       const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int len = EVP_CIPHER_CTX_get_key_length(ctx);
 
diff --git a/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c
index cb69516bdef01..c994bb395d8fd 100644
--- a/crypto/evp/e_camellia.c
+++ b/crypto/evp/e_camellia.c
@@ -26,7 +26,7 @@
 #include "evp_local.h"
 
 static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 
 /* Camellia subkey Structure */
 typedef struct {
@@ -38,22 +38,21 @@ typedef struct {
     } stream;
 } EVP_CAMELLIA_KEY;
 
-#define MAXBITCHUNK     ((size_t)1<<(sizeof(size_t)*8-4))
+#define MAXBITCHUNK ((size_t)1 << (sizeof(size_t) * 8 - 4))
 
 /* Attribute operation for Camellia */
-#define data(ctx)       EVP_C_DATA(EVP_CAMELLIA_KEY,ctx)
+#define data(ctx) EVP_C_DATA(EVP_CAMELLIA_KEY, ctx)
 
 #if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
 /* ---------^^^ this is not a typo, just a way to detect that
  * assembler support was in general requested... */
-# include "crypto/sparc_arch.h"
+#include "crypto/sparc_arch.h"
 
 static int cmll_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                            const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int ret, mode, bits;
-    EVP_CAMELLIA_KEY *dat =
-        (EVP_CAMELLIA_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+    EVP_CAMELLIA_KEY *dat = (EVP_CAMELLIA_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx);
 
     mode = EVP_CIPHER_CTX_get_mode(ctx);
     bits = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
@@ -63,38 +62,36 @@ static int cmll_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
         && !enc) {
         ret = 0;
-        dat->block = (block128_f) cmll_t4_decrypt;
+        dat->block = (block128_f)cmll_t4_decrypt;
         switch (bits) {
         case 128:
-            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-                (cbc128_f) cmll128_t4_cbc_decrypt : NULL;
+            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)cmll128_t4_cbc_decrypt : NULL;
             break;
         case 192:
         case 256:
-            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-                (cbc128_f) cmll256_t4_cbc_decrypt : NULL;
+            dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)cmll256_t4_cbc_decrypt : NULL;
             break;
         default:
             ret = -1;
         }
     } else {
         ret = 0;
-        dat->block = (block128_f) cmll_t4_encrypt;
+        dat->block = (block128_f)cmll_t4_encrypt;
         switch (bits) {
         case 128:
             if (mode == EVP_CIPH_CBC_MODE)
-                dat->stream.cbc = (cbc128_f) cmll128_t4_cbc_encrypt;
+                dat->stream.cbc = (cbc128_f)cmll128_t4_cbc_encrypt;
             else if (mode == EVP_CIPH_CTR_MODE)
-                dat->stream.ctr = (ctr128_f) cmll128_t4_ctr32_encrypt;
+                dat->stream.ctr = (ctr128_f)cmll128_t4_ctr32_encrypt;
             else
                 dat->stream.cbc = NULL;
             break;
         case 192:
         case 256:
             if (mode == EVP_CIPH_CBC_MODE)
-                dat->stream.cbc = (cbc128_f) cmll256_t4_cbc_encrypt;
+                dat->stream.cbc = (cbc128_f)cmll256_t4_cbc_encrypt;
             else if (mode == EVP_CIPH_CTR_MODE)
-                dat->stream.ctr = (ctr128_f) cmll256_t4_ctr32_encrypt;
+                dat->stream.ctr = (ctr128_f)cmll256_t4_ctr32_encrypt;
             else
                 dat->stream.cbc = NULL;
             break;
@@ -111,92 +108,99 @@ static int cmll_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     return 1;
 }
 
-# define cmll_t4_cbc_cipher camellia_cbc_cipher
+#define cmll_t4_cbc_cipher camellia_cbc_cipher
 static int cmll_t4_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define cmll_t4_ecb_cipher camellia_ecb_cipher
+#define cmll_t4_ecb_cipher camellia_ecb_cipher
 static int cmll_t4_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define cmll_t4_ofb_cipher camellia_ofb_cipher
+#define cmll_t4_ofb_cipher camellia_ofb_cipher
 static int cmll_t4_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define cmll_t4_cfb_cipher camellia_cfb_cipher
+#define cmll_t4_cfb_cipher camellia_cfb_cipher
 static int cmll_t4_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define cmll_t4_cfb8_cipher camellia_cfb8_cipher
+#define cmll_t4_cfb8_cipher camellia_cfb8_cipher
 static int cmll_t4_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define cmll_t4_cfb1_cipher camellia_cfb1_cipher
+#define cmll_t4_cfb1_cipher camellia_cfb1_cipher
 static int cmll_t4_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
-# define cmll_t4_ctr_cipher camellia_ctr_cipher
+#define cmll_t4_ctr_cipher camellia_ctr_cipher
 static int cmll_t4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t len);
-
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER cmll_t4_##keylen##_##mode = { \
-        nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        cmll_t4_init_key,               \
-        cmll_t4_##mode##_cipher,        \
-        NULL,                           \
-        sizeof(EVP_CAMELLIA_KEY),       \
-        NULL,NULL,NULL,NULL }; \
-static const EVP_CIPHER camellia_##keylen##_##mode = { \
-        nid##_##keylen##_##nmode,blocksize,     \
-        keylen/8,ivlen, \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        camellia_init_key,              \
-        camellia_##mode##_cipher,       \
-        NULL,                           \
-        sizeof(EVP_CAMELLIA_KEY),       \
-        NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_camellia_##keylen##_##mode(void) \
-{ return SPARC_CMLL_CAPABLE?&cmll_t4_##keylen##_##mode:&camellia_##keylen##_##mode; }
+    const unsigned char *in, size_t len);
+
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, MODE, flags)         \
+    static const EVP_CIPHER cmll_t4_##keylen##_##mode = {                                     \
+        nid##_##keylen##_##nmode, blocksize, keylen / 8, ivlen,                               \
+        flags | EVP_CIPH_##MODE##_MODE,                                                       \
+        EVP_ORIG_GLOBAL,                                                                      \
+        cmll_t4_init_key,                                                                     \
+        cmll_t4_##mode##_cipher,                                                              \
+        NULL,                                                                                 \
+        sizeof(EVP_CAMELLIA_KEY),                                                             \
+        NULL, NULL, NULL, NULL                                                                \
+    };                                                                                        \
+    static const EVP_CIPHER camellia_##keylen##_##mode = {                                    \
+        nid##_##keylen##_##nmode, blocksize,                                                  \
+        keylen / 8, ivlen,                                                                    \
+        flags | EVP_CIPH_##MODE##_MODE,                                                       \
+        EVP_ORIG_GLOBAL,                                                                      \
+        camellia_init_key,                                                                    \
+        camellia_##mode##_cipher,                                                             \
+        NULL,                                                                                 \
+        sizeof(EVP_CAMELLIA_KEY),                                                             \
+        NULL, NULL, NULL, NULL                                                                \
+    };                                                                                        \
+    const EVP_CIPHER *EVP_camellia_##keylen##_##mode(void)                                    \
+    {                                                                                         \
+        return SPARC_CMLL_CAPABLE ? &cmll_t4_##keylen##_##mode : &camellia_##keylen##_##mode; \
+    }
 
 #else
 
-# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER camellia_##keylen##_##mode = { \
-        nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        camellia_init_key,              \
-        camellia_##mode##_cipher,       \
-        NULL,                           \
-        sizeof(EVP_CAMELLIA_KEY),       \
-        NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_camellia_##keylen##_##mode(void) \
-{ return &camellia_##keylen##_##mode; }
+#define BLOCK_CIPHER_generic(nid, keylen, blocksize, ivlen, nmode, mode, MODE, flags) \
+    static const EVP_CIPHER camellia_##keylen##_##mode = {                            \
+        nid##_##keylen##_##nmode, blocksize, keylen / 8, ivlen,                       \
+        flags | EVP_CIPH_##MODE##_MODE,                                               \
+        EVP_ORIG_GLOBAL,                                                              \
+        camellia_init_key,                                                            \
+        camellia_##mode##_cipher,                                                     \
+        NULL,                                                                         \
+        sizeof(EVP_CAMELLIA_KEY),                                                     \
+        NULL, NULL, NULL, NULL                                                        \
+    };                                                                                \
+    const EVP_CIPHER *EVP_camellia_##keylen##_##mode(void)                            \
+    {                                                                                 \
+        return &camellia_##keylen##_##mode;                                           \
+    }
 
 #endif
 
-#define BLOCK_CIPHER_generic_pack(nid,keylen,flags)             \
-        BLOCK_CIPHER_generic(nid,keylen,16,16,cbc,cbc,CBC,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)     \
-        BLOCK_CIPHER_generic(nid,keylen,16,0,ecb,ecb,ECB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)      \
-        BLOCK_CIPHER_generic(nid,keylen,1,16,ofb128,ofb,OFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
-        BLOCK_CIPHER_generic(nid,keylen,1,16,cfb128,cfb,CFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
-        BLOCK_CIPHER_generic(nid,keylen,1,16,cfb1,cfb1,CFB,flags)       \
-        BLOCK_CIPHER_generic(nid,keylen,1,16,cfb8,cfb8,CFB,flags)       \
-        BLOCK_CIPHER_generic(nid, keylen, 1, 16, ctr, ctr, CTR, flags)
+#define BLOCK_CIPHER_generic_pack(nid, keylen, flags)                                                          \
+    BLOCK_CIPHER_generic(nid, keylen, 16, 16, cbc, cbc, CBC, flags | EVP_CIPH_FLAG_DEFAULT_ASN1)               \
+        BLOCK_CIPHER_generic(nid, keylen, 16, 0, ecb, ecb, ECB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1)            \
+            BLOCK_CIPHER_generic(nid, keylen, 1, 16, ofb128, ofb, OFB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1)     \
+                BLOCK_CIPHER_generic(nid, keylen, 1, 16, cfb128, cfb, CFB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+                    BLOCK_CIPHER_generic(nid, keylen, 1, 16, cfb1, cfb1, CFB, flags)                           \
+                        BLOCK_CIPHER_generic(nid, keylen, 1, 16, cfb8, cfb8, CFB, flags)                       \
+                            BLOCK_CIPHER_generic(nid, keylen, 1, 16, ctr, ctr, CTR, flags)
 
 /* The subkey for Camellia is generated. */
 static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int ret, mode;
     EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY, ctx);
 
     ret = Camellia_set_key(key, EVP_CIPHER_CTX_get_key_length(ctx) * 8,
-                           &dat->ks);
+        &dat->ks);
     if (ret < 0) {
         ERR_raise(ERR_LIB_EVP, EVP_R_CAMELLIA_KEY_SETUP_FAILED);
         return 0;
@@ -205,26 +209,24 @@ static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     mode = EVP_CIPHER_CTX_get_mode(ctx);
     if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
         && !enc) {
-        dat->block = (block128_f) Camellia_decrypt;
-        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-            (cbc128_f) Camellia_cbc_encrypt : NULL;
+        dat->block = (block128_f)Camellia_decrypt;
+        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)Camellia_cbc_encrypt : NULL;
     } else {
-        dat->block = (block128_f) Camellia_encrypt;
-        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-            (cbc128_f) Camellia_cbc_encrypt : NULL;
+        dat->block = (block128_f)Camellia_encrypt;
+        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)Camellia_cbc_encrypt : NULL;
     }
 
     return 1;
 }
 
 static int camellia_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY, ctx);
 
     if (dat->stream.cbc)
-        (*dat->stream.cbc) (in, out, len, &dat->ks, ctx->iv,
-                            EVP_CIPHER_CTX_is_encrypting(ctx));
+        (*dat->stream.cbc)(in, out, len, &dat->ks, ctx->iv,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
     else if (EVP_CIPHER_CTX_is_encrypting(ctx))
         CRYPTO_cbc128_encrypt(in, out, len, &dat->ks, ctx->iv, dat->block);
     else
@@ -234,7 +236,7 @@ static int camellia_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int camellia_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     size_t bl = EVP_CIPHER_CTX_get_block_size(ctx);
     size_t i;
@@ -244,13 +246,13 @@ static int camellia_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         return 1;
 
     for (i = 0, len -= bl; i <= len; i += bl)
-        (*dat->block) (in + i, out + i, &dat->ks);
+        (*dat->block)(in + i, out + i, &dat->ks);
 
     return 1;
 }
 
 static int camellia_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY, ctx);
 
@@ -261,39 +263,39 @@ static int camellia_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int camellia_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY, ctx);
 
     int num = EVP_CIPHER_CTX_get_num(ctx);
     CRYPTO_cfb128_encrypt(in, out, len, &dat->ks, ctx->iv, &num,
-                          EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+        EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
     EVP_CIPHER_CTX_set_num(ctx, num);
     return 1;
 }
 
 static int camellia_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY, ctx);
 
     int num = EVP_CIPHER_CTX_get_num(ctx);
     CRYPTO_cfb128_8_encrypt(in, out, len, &dat->ks, ctx->iv, &num,
-                            EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+        EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
     EVP_CIPHER_CTX_set_num(ctx, num);
     return 1;
 }
 
 static int camellia_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_CAMELLIA_KEY *dat = EVP_C_DATA(EVP_CAMELLIA_KEY, ctx);
 
     if (EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS)) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         CRYPTO_cfb128_1_encrypt(in, out, len, &dat->ks, ctx->iv, &num,
-                                EVP_CIPHER_CTX_is_encrypting(ctx),
-                                dat->block);
+            EVP_CIPHER_CTX_is_encrypting(ctx),
+            dat->block);
         EVP_CIPHER_CTX_set_num(ctx, num);
         return 1;
     }
@@ -301,20 +303,20 @@ static int camellia_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     while (len >= MAXBITCHUNK) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         CRYPTO_cfb128_1_encrypt(in, out, MAXBITCHUNK * 8, &dat->ks,
-                                ctx->iv, &num,
-                                EVP_CIPHER_CTX_is_encrypting(ctx),
-                                dat->block);
+            ctx->iv, &num,
+            EVP_CIPHER_CTX_is_encrypting(ctx),
+            dat->block);
         EVP_CIPHER_CTX_set_num(ctx, num);
         len -= MAXBITCHUNK;
         out += MAXBITCHUNK;
-        in  += MAXBITCHUNK;
+        in += MAXBITCHUNK;
     }
     if (len) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         CRYPTO_cfb128_1_encrypt(in, out, len * 8, &dat->ks,
-                                ctx->iv, &num,
-                                EVP_CIPHER_CTX_is_encrypting(ctx),
-                                dat->block);
+            ctx->iv, &num,
+            EVP_CIPHER_CTX_is_encrypting(ctx),
+            dat->block);
         EVP_CIPHER_CTX_set_num(ctx, num);
     }
 
@@ -322,7 +324,7 @@ static int camellia_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int camellia_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     int snum = EVP_CIPHER_CTX_get_num(ctx);
     unsigned int num;
@@ -333,17 +335,17 @@ static int camellia_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     num = snum;
     if (dat->stream.ctr)
         CRYPTO_ctr128_encrypt_ctr32(in, out, len, &dat->ks, ctx->iv,
-                                    EVP_CIPHER_CTX_buf_noconst(ctx),
-                                    &num,
-                                    dat->stream.ctr);
+            EVP_CIPHER_CTX_buf_noconst(ctx),
+            &num,
+            dat->stream.ctr);
     else
         CRYPTO_ctr128_encrypt(in, out, len, &dat->ks, ctx->iv,
-                              EVP_CIPHER_CTX_buf_noconst(ctx), &num,
-                              dat->block);
+            EVP_CIPHER_CTX_buf_noconst(ctx), &num,
+            dat->block);
     EVP_CIPHER_CTX_set_num(ctx, num);
     return 1;
 }
 
 BLOCK_CIPHER_generic_pack(NID_camellia, 128, 0)
     BLOCK_CIPHER_generic_pack(NID_camellia, 192, 0)
-    BLOCK_CIPHER_generic_pack(NID_camellia, 256, 0)
+        BLOCK_CIPHER_generic_pack(NID_camellia, 256, 0)
diff --git a/crypto/evp/e_cast.c b/crypto/evp/e_cast.c
index 5e9be2dc7dd57..f45469e821291 100644
--- a/crypto/evp/e_cast.c
+++ b/crypto/evp/e_cast.c
@@ -17,28 +17,28 @@
 #include "internal/cryptlib.h"
 
 #ifndef OPENSSL_NO_CAST
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include <openssl/cast.h>
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include <openssl/cast.h>
+#include "evp_local.h"
 
 static int cast_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                         const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 
 typedef struct {
     CAST_KEY ks;
 } EVP_CAST_KEY;
 
-# define data(ctx)       EVP_C_DATA(EVP_CAST_KEY,ctx)
+#define data(ctx) EVP_C_DATA(EVP_CAST_KEY, ctx)
 
 IMPLEMENT_BLOCK_CIPHER(cast5, ks, CAST, EVP_CAST_KEY,
-                       NID_cast5, 8, CAST_KEY_LENGTH, 8, 64,
-                       EVP_CIPH_VARIABLE_LENGTH, cast_init_key, NULL,
-                       EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
+    NID_cast5, 8, CAST_KEY_LENGTH, 8, 64,
+    EVP_CIPH_VARIABLE_LENGTH, cast_init_key, NULL,
+    EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
 
 static int cast_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                         const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
 
diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c
index 731c1a1dc70c8..1751444a904c6 100644
--- a/crypto/evp/e_chacha20_poly1305.c
+++ b/crypto/evp/e_chacha20_poly1305.c
@@ -13,41 +13,41 @@
 
 #ifndef OPENSSL_NO_CHACHA
 
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include "evp_local.h"
-# include "crypto/chacha.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include "evp_local.h"
+#include "crypto/chacha.h"
 
 typedef struct {
     union {
-        OSSL_UNION_ALIGN;  /* this ensures even sizeof(EVP_CHACHA_KEY)%8==0 */
+        OSSL_UNION_ALIGN; /* this ensures even sizeof(EVP_CHACHA_KEY)%8==0 */
         unsigned int d[CHACHA_KEY_SIZE / 4];
     } key;
-    unsigned int  counter[CHACHA_CTR_SIZE / 4];
+    unsigned int counter[CHACHA_CTR_SIZE / 4];
     unsigned char buf[CHACHA_BLK_SIZE];
-    unsigned int  partial_len;
+    unsigned int partial_len;
 } EVP_CHACHA_KEY;
 
-#define data(ctx)   ((EVP_CHACHA_KEY *)(ctx)->cipher_data)
+#define data(ctx) ((EVP_CHACHA_KEY *)(ctx)->cipher_data)
 
-#define CHACHA20_POLY1305_MAX_IVLEN     12
+#define CHACHA20_POLY1305_MAX_IVLEN 12
 
 static int chacha_init_key(EVP_CIPHER_CTX *ctx,
-                           const unsigned char user_key[CHACHA_KEY_SIZE],
-                           const unsigned char iv[CHACHA_CTR_SIZE], int enc)
+    const unsigned char user_key[CHACHA_KEY_SIZE],
+    const unsigned char iv[CHACHA_CTR_SIZE], int enc)
 {
     EVP_CHACHA_KEY *key = data(ctx);
     unsigned int i;
 
     if (user_key)
-        for (i = 0; i < CHACHA_KEY_SIZE; i+=4) {
-            key->key.d[i/4] = CHACHA_U8TOU32(user_key+i);
+        for (i = 0; i < CHACHA_KEY_SIZE; i += 4) {
+            key->key.d[i / 4] = CHACHA_U8TOU32(user_key + i);
         }
 
     if (iv)
-        for (i = 0; i < CHACHA_CTR_SIZE; i+=4) {
-            key->counter[i/4] = CHACHA_U8TOU32(iv+i);
+        for (i = 0; i < CHACHA_CTR_SIZE; i += 4) {
+            key->counter[i / 4] = CHACHA_U8TOU32(iv + i);
         }
 
     key->partial_len = 0;
@@ -56,7 +56,7 @@ static int chacha_init_key(EVP_CIPHER_CTX *ctx,
 }
 
 static int chacha_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                         const unsigned char *inp, size_t len)
+    const unsigned char *inp, size_t len)
 {
     EVP_CHACHA_KEY *key = data(ctx);
     unsigned int n, rem, ctr32;
@@ -89,8 +89,8 @@ static int chacha_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
          * Below condition is practically never met, but it has to
          * be checked for code correctness.
          */
-        if (sizeof(size_t)>sizeof(unsigned int) && blocks>(1U<<28))
-            blocks = (1U<<28);
+        if (sizeof(size_t) > sizeof(unsigned int) && blocks > (1U << 28))
+            blocks = (1U << 28);
 
         /*
          * As ChaCha20_ctr32 operates on 32-bit counter, caller
@@ -110,13 +110,14 @@ static int chacha_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         out += blocks;
 
         key->counter[0] = ctr32;
-        if (ctr32 == 0) key->counter[1]++;
+        if (ctr32 == 0)
+            key->counter[1]++;
     }
 
     if (rem) {
         memset(key->buf, 0, sizeof(key->buf));
         ChaCha20_ctr32(key->buf, key->buf, CHACHA_BLK_SIZE,
-                       key->key.d, key->counter);
+            key->key.d, key->counter);
         for (n = 0; n < rem; n++)
             out[n] = inp[n] ^ key->buf[n];
         key->partial_len = rem;
@@ -127,9 +128,9 @@ static int chacha_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
 static const EVP_CIPHER chacha20 = {
     NID_chacha20,
-    1,                      /* block_size */
-    CHACHA_KEY_SIZE,        /* key_len */
-    CHACHA_CTR_SIZE,        /* iv_len, 128-bit counter in the context */
+    1, /* block_size */
+    CHACHA_KEY_SIZE, /* key_len */
+    CHACHA_CTR_SIZE, /* iv_len, 128-bit counter in the context */
     EVP_CIPH_CUSTOM_IV | EVP_CIPH_ALWAYS_CALL_INIT,
     EVP_ORIG_GLOBAL,
     chacha_init_key,
@@ -147,26 +148,28 @@ const EVP_CIPHER *EVP_chacha20(void)
     return &chacha20;
 }
 
-# ifndef OPENSSL_NO_POLY1305
-#  include "crypto/poly1305.h"
+#ifndef OPENSSL_NO_POLY1305
+#include "crypto/poly1305.h"
 
 typedef struct {
     EVP_CHACHA_KEY key;
-    unsigned int nonce[12/4];
+    unsigned int nonce[12 / 4];
     unsigned char tag[POLY1305_BLOCK_SIZE];
     unsigned char tls_aad[POLY1305_BLOCK_SIZE];
-    struct { uint64_t aad, text; } len;
+    struct {
+        uint64_t aad, text;
+    } len;
     int aad, mac_inited, tag_len, nonce_len;
     size_t tls_payload_length;
 } EVP_CHACHA_AEAD_CTX;
 
-#  define NO_TLS_PAYLOAD_LENGTH ((size_t)-1)
-#  define aead_data(ctx)        ((EVP_CHACHA_AEAD_CTX *)(ctx)->cipher_data)
-#  define POLY1305_ctx(actx)    ((POLY1305 *)(actx + 1))
+#define NO_TLS_PAYLOAD_LENGTH ((size_t)-1)
+#define aead_data(ctx) ((EVP_CHACHA_AEAD_CTX *)(ctx)->cipher_data)
+#define POLY1305_ctx(actx) ((POLY1305 *)(actx + 1))
 
 static int chacha20_poly1305_init_key(EVP_CIPHER_CTX *ctx,
-                                      const unsigned char *inkey,
-                                      const unsigned char *iv, int enc)
+    const unsigned char *inkey,
+    const unsigned char *iv, int enc)
 {
     EVP_CHACHA_AEAD_CTX *actx = aead_data(ctx);
 
@@ -185,7 +188,7 @@ static int chacha20_poly1305_init_key(EVP_CIPHER_CTX *ctx,
         /* pad on the left */
         if (actx->nonce_len <= CHACHA_CTR_SIZE)
             memcpy(temp + CHACHA_CTR_SIZE - actx->nonce_len, iv,
-                   actx->nonce_len);
+                actx->nonce_len);
 
         chacha_init_key(ctx, inkey, temp, enc);
 
@@ -199,20 +202,19 @@ static int chacha20_poly1305_init_key(EVP_CIPHER_CTX *ctx,
     return 1;
 }
 
-#  if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
 
-#   if defined(POLY1305_ASM) && (defined(__x86_64) || defined(__x86_64__) || \
-                                 defined(_M_AMD64) || defined(_M_X64))
-#    define XOR128_HELPERS
+#if defined(POLY1305_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
+#define XOR128_HELPERS
 void *xor128_encrypt_n_pad(void *out, const void *inp, void *otp, size_t len);
 void *xor128_decrypt_n_pad(void *out, const void *inp, void *otp, size_t len);
 static const unsigned char zero[4 * CHACHA_BLK_SIZE] = { 0 };
-#   else
+#else
 static const unsigned char zero[2 * CHACHA_BLK_SIZE] = { 0 };
-#   endif
+#endif
 
 static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                        const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_CHACHA_AEAD_CTX *actx = aead_data(ctx);
     size_t tail, tohash_len, buf_len, plen = actx->tls_payload_length;
@@ -221,16 +223,16 @@ static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     if (len != plen + POLY1305_BLOCK_SIZE)
         return -1;
 
-    buf = storage + ((0 - (size_t)storage) & 15);   /* align */
+    buf = storage + ((0 - (size_t)storage) & 15); /* align */
     ctr = buf + CHACHA_BLK_SIZE;
     tohash = buf + CHACHA_BLK_SIZE - POLY1305_BLOCK_SIZE;
 
-#   ifdef XOR128_HELPERS
+#ifdef XOR128_HELPERS
     if (plen <= 3 * CHACHA_BLK_SIZE) {
         actx->key.counter[0] = 0;
         buf_len = (plen + 2 * CHACHA_BLK_SIZE - 1) & (0 - CHACHA_BLK_SIZE);
         ChaCha20_ctr32(buf, zero, buf_len, actx->key.key.d,
-                       actx->key.counter);
+            actx->key.counter);
         Poly1305_Init(POLY1305_ctx(actx), buf);
         actx->key.partial_len = 0;
         memcpy(tohash, actx->tls_aad, POLY1305_BLOCK_SIZE);
@@ -249,13 +251,13 @@ static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             tohash_len = (size_t)(ctr - tohash);
         }
     }
-#   else
+#else
     if (plen <= CHACHA_BLK_SIZE) {
         size_t i;
 
         actx->key.counter[0] = 0;
         ChaCha20_ctr32(buf, zero, (buf_len = 2 * CHACHA_BLK_SIZE),
-                       actx->key.key.d, actx->key.counter);
+            actx->key.key.d, actx->key.counter);
         Poly1305_Init(POLY1305_ctx(actx), buf);
         actx->key.partial_len = 0;
         memcpy(tohash, actx->tls_aad, POLY1305_BLOCK_SIZE);
@@ -283,11 +285,11 @@ static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         ctr += i + tail;
         tohash_len += i + tail;
     }
-#   endif
+#endif
     else {
         actx->key.counter[0] = 0;
         ChaCha20_ctr32(buf, zero, (buf_len = CHACHA_BLK_SIZE),
-                       actx->key.key.d, actx->key.counter);
+            actx->key.key.d, actx->key.counter);
         Poly1305_Init(POLY1305_ctx(actx), buf);
         actx->key.counter[0] = 1;
         actx->key.partial_len = 0;
@@ -317,23 +319,23 @@ static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         if (IS_LITTLE_ENDIAN) {
             memcpy(ctr, (unsigned char *)&actx->len, POLY1305_BLOCK_SIZE);
         } else {
-            ctr[0]  = (unsigned char)(actx->len.aad);
-            ctr[1]  = (unsigned char)(actx->len.aad>>8);
-            ctr[2]  = (unsigned char)(actx->len.aad>>16);
-            ctr[3]  = (unsigned char)(actx->len.aad>>24);
-            ctr[4]  = (unsigned char)(actx->len.aad>>32);
-            ctr[5]  = (unsigned char)(actx->len.aad>>40);
-            ctr[6]  = (unsigned char)(actx->len.aad>>48);
-            ctr[7]  = (unsigned char)(actx->len.aad>>56);
-
-            ctr[8]  = (unsigned char)(actx->len.text);
-            ctr[9]  = (unsigned char)(actx->len.text>>8);
-            ctr[10] = (unsigned char)(actx->len.text>>16);
-            ctr[11] = (unsigned char)(actx->len.text>>24);
-            ctr[12] = (unsigned char)(actx->len.text>>32);
-            ctr[13] = (unsigned char)(actx->len.text>>40);
-            ctr[14] = (unsigned char)(actx->len.text>>48);
-            ctr[15] = (unsigned char)(actx->len.text>>56);
+            ctr[0] = (unsigned char)(actx->len.aad);
+            ctr[1] = (unsigned char)(actx->len.aad >> 8);
+            ctr[2] = (unsigned char)(actx->len.aad >> 16);
+            ctr[3] = (unsigned char)(actx->len.aad >> 24);
+            ctr[4] = (unsigned char)(actx->len.aad >> 32);
+            ctr[5] = (unsigned char)(actx->len.aad >> 40);
+            ctr[6] = (unsigned char)(actx->len.aad >> 48);
+            ctr[7] = (unsigned char)(actx->len.aad >> 56);
+
+            ctr[8] = (unsigned char)(actx->len.text);
+            ctr[9] = (unsigned char)(actx->len.text >> 8);
+            ctr[10] = (unsigned char)(actx->len.text >> 16);
+            ctr[11] = (unsigned char)(actx->len.text >> 24);
+            ctr[12] = (unsigned char)(actx->len.text >> 32);
+            ctr[13] = (unsigned char)(actx->len.text >> 40);
+            ctr[14] = (unsigned char)(actx->len.text >> 48);
+            ctr[15] = (unsigned char)(actx->len.text >> 56);
         }
         tohash_len += POLY1305_BLOCK_SIZE;
     }
@@ -341,7 +343,7 @@ static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     Poly1305_Update(POLY1305_ctx(actx), tohash, tohash_len);
     OPENSSL_cleanse(buf, buf_len);
     Poly1305_Final(POLY1305_ctx(actx),
-                   EVP_CIPHER_CTX_is_encrypting(ctx) ? actx->tag : tohash);
+        EVP_CIPHER_CTX_is_encrypting(ctx) ? actx->tag : tohash);
 
     actx->tls_payload_length = NO_TLS_PAYLOAD_LENGTH;
 
@@ -350,31 +352,31 @@ static int chacha20_poly1305_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     } else {
         if (CRYPTO_memcmp(tohash, in, POLY1305_BLOCK_SIZE)) {
             memset(out - (len - POLY1305_BLOCK_SIZE), 0,
-                   len - POLY1305_BLOCK_SIZE);
+                len - POLY1305_BLOCK_SIZE);
             return -1;
         }
     }
 
     return len;
 }
-#  else
+#else
 static const unsigned char zero[CHACHA_BLK_SIZE] = { 0 };
-#  endif
+#endif
 
 static int chacha20_poly1305_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                    const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_CHACHA_AEAD_CTX *actx = aead_data(ctx);
     size_t rem, plen = actx->tls_payload_length;
 
     if (!actx->mac_inited) {
-#  if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
         if (plen != NO_TLS_PAYLOAD_LENGTH && out != NULL)
             return chacha20_poly1305_tls_cipher(ctx, out, in, len);
-#  endif
+#endif
         actx->key.counter[0] = 0;
         ChaCha20_ctr32(actx->key.buf, zero, CHACHA_BLK_SIZE,
-                       actx->key.key.d, actx->key.counter);
+            actx->key.key.d, actx->key.counter);
         Poly1305_Init(POLY1305_ctx(actx), actx->key.buf);
         actx->key.counter[0] = 1;
         actx->key.partial_len = 0;
@@ -382,23 +384,23 @@ static int chacha20_poly1305_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         actx->mac_inited = 1;
         if (plen != NO_TLS_PAYLOAD_LENGTH) {
             Poly1305_Update(POLY1305_ctx(actx), actx->tls_aad,
-                            EVP_AEAD_TLS1_AAD_LEN);
+                EVP_AEAD_TLS1_AAD_LEN);
             actx->len.aad = EVP_AEAD_TLS1_AAD_LEN;
             actx->aad = 1;
         }
     }
 
-    if (in) {                                   /* aad or text */
-        if (out == NULL) {                      /* aad */
+    if (in) { /* aad or text */
+        if (out == NULL) { /* aad */
             Poly1305_Update(POLY1305_ctx(actx), in, len);
             actx->len.aad += len;
             actx->aad = 1;
             return len;
-        } else {                                /* plain- or ciphertext */
-            if (actx->aad) {                    /* wrap up aad */
+        } else { /* plain- or ciphertext */
+            if (actx->aad) { /* wrap up aad */
                 if ((rem = (size_t)actx->len.aad % POLY1305_BLOCK_SIZE))
                     Poly1305_Update(POLY1305_ctx(actx), zero,
-                                    POLY1305_BLOCK_SIZE - rem);
+                        POLY1305_BLOCK_SIZE - rem);
                 actx->aad = 0;
             }
 
@@ -408,13 +410,13 @@ static int chacha20_poly1305_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             else if (len != plen + POLY1305_BLOCK_SIZE)
                 return -1;
 
-            if (EVP_CIPHER_CTX_is_encrypting(ctx)) {    /* plaintext */
+            if (EVP_CIPHER_CTX_is_encrypting(ctx)) { /* plaintext */
                 chacha_cipher(ctx, out, in, plen);
                 Poly1305_Update(POLY1305_ctx(actx), out, plen);
                 in += plen;
                 out += plen;
                 actx->len.text += plen;
-            } else {                            /* ciphertext */
+            } else { /* ciphertext */
                 Poly1305_Update(POLY1305_ctx(actx), in, plen);
                 chacha_cipher(ctx, out, in, plen);
                 in += plen;
@@ -423,51 +425,51 @@ static int chacha20_poly1305_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             }
         }
     }
-    if (in == NULL                              /* explicit final */
-        || plen != len) {                       /* or tls mode */
+    if (in == NULL /* explicit final */
+        || plen != len) { /* or tls mode */
         DECLARE_IS_ENDIAN;
         unsigned char temp[POLY1305_BLOCK_SIZE];
 
-        if (actx->aad) {                        /* wrap up aad */
+        if (actx->aad) { /* wrap up aad */
             if ((rem = (size_t)actx->len.aad % POLY1305_BLOCK_SIZE))
                 Poly1305_Update(POLY1305_ctx(actx), zero,
-                                POLY1305_BLOCK_SIZE - rem);
+                    POLY1305_BLOCK_SIZE - rem);
             actx->aad = 0;
         }
 
         if ((rem = (size_t)actx->len.text % POLY1305_BLOCK_SIZE))
             Poly1305_Update(POLY1305_ctx(actx), zero,
-                            POLY1305_BLOCK_SIZE - rem);
+                POLY1305_BLOCK_SIZE - rem);
 
         if (IS_LITTLE_ENDIAN) {
             Poly1305_Update(POLY1305_ctx(actx),
-                            (unsigned char *)&actx->len, POLY1305_BLOCK_SIZE);
+                (unsigned char *)&actx->len, POLY1305_BLOCK_SIZE);
         } else {
-            temp[0]  = (unsigned char)(actx->len.aad);
-            temp[1]  = (unsigned char)(actx->len.aad>>8);
-            temp[2]  = (unsigned char)(actx->len.aad>>16);
-            temp[3]  = (unsigned char)(actx->len.aad>>24);
-            temp[4]  = (unsigned char)(actx->len.aad>>32);
-            temp[5]  = (unsigned char)(actx->len.aad>>40);
-            temp[6]  = (unsigned char)(actx->len.aad>>48);
-            temp[7]  = (unsigned char)(actx->len.aad>>56);
-
-            temp[8]  = (unsigned char)(actx->len.text);
-            temp[9]  = (unsigned char)(actx->len.text>>8);
-            temp[10] = (unsigned char)(actx->len.text>>16);
-            temp[11] = (unsigned char)(actx->len.text>>24);
-            temp[12] = (unsigned char)(actx->len.text>>32);
-            temp[13] = (unsigned char)(actx->len.text>>40);
-            temp[14] = (unsigned char)(actx->len.text>>48);
-            temp[15] = (unsigned char)(actx->len.text>>56);
+            temp[0] = (unsigned char)(actx->len.aad);
+            temp[1] = (unsigned char)(actx->len.aad >> 8);
+            temp[2] = (unsigned char)(actx->len.aad >> 16);
+            temp[3] = (unsigned char)(actx->len.aad >> 24);
+            temp[4] = (unsigned char)(actx->len.aad >> 32);
+            temp[5] = (unsigned char)(actx->len.aad >> 40);
+            temp[6] = (unsigned char)(actx->len.aad >> 48);
+            temp[7] = (unsigned char)(actx->len.aad >> 56);
+
+            temp[8] = (unsigned char)(actx->len.text);
+            temp[9] = (unsigned char)(actx->len.text >> 8);
+            temp[10] = (unsigned char)(actx->len.text >> 16);
+            temp[11] = (unsigned char)(actx->len.text >> 24);
+            temp[12] = (unsigned char)(actx->len.text >> 32);
+            temp[13] = (unsigned char)(actx->len.text >> 40);
+            temp[14] = (unsigned char)(actx->len.text >> 48);
+            temp[15] = (unsigned char)(actx->len.text >> 56);
 
             Poly1305_Update(POLY1305_ctx(actx), temp, POLY1305_BLOCK_SIZE);
         }
         Poly1305_Final(POLY1305_ctx(actx),
-                       EVP_CIPHER_CTX_is_encrypting(ctx) ? actx->tag : temp);
+            EVP_CIPHER_CTX_is_encrypting(ctx) ? actx->tag : temp);
         actx->mac_inited = 0;
 
-        if (in != NULL && len != plen) {        /* tls mode */
+        if (in != NULL && len != plen) { /* tls mode */
             if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
                 memcpy(out, actx->tag, POLY1305_BLOCK_SIZE);
             } else {
@@ -476,8 +478,7 @@ static int chacha20_poly1305_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                     return -1;
                 }
             }
-        }
-        else if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
+        } else if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
             if (CRYPTO_memcmp(temp, actx->tag, actx->tag_len))
                 return -1;
         }
@@ -494,7 +495,7 @@ static int chacha20_poly1305_cleanup(EVP_CIPHER_CTX *ctx)
 }
 
 static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
-                                  void *ptr)
+    void *ptr)
 {
     EVP_CHACHA_AEAD_CTX *actx = aead_data(ctx);
 
@@ -502,7 +503,7 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
     case EVP_CTRL_INIT:
         if (actx == NULL)
             actx = ctx->cipher_data
-                 = OPENSSL_zalloc(sizeof(*actx) + Poly1305_ctx_size());
+                = OPENSSL_zalloc(sizeof(*actx) + Poly1305_ctx_size());
         if (actx == NULL) {
             ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
             return 0;
@@ -521,8 +522,7 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
         if (actx) {
             EVP_CIPHER_CTX *dst = (EVP_CIPHER_CTX *)ptr;
 
-            dst->cipher_data =
-                   OPENSSL_memdup(actx, sizeof(*actx) + Poly1305_ctx_size());
+            dst->cipher_data = OPENSSL_memdup(actx, sizeof(*actx) + Poly1305_ctx_size());
             if (dst->cipher_data == NULL) {
                 ERR_raise(ERR_LIB_EVP, EVP_R_COPY_ERROR);
                 return 0;
@@ -544,11 +544,11 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
         if (arg != 12)
             return 0;
         actx->nonce[0] = actx->key.counter[1]
-                       = CHACHA_U8TOU32((unsigned char *)ptr);
+            = CHACHA_U8TOU32((unsigned char *)ptr);
         actx->nonce[1] = actx->key.counter[2]
-                       = CHACHA_U8TOU32((unsigned char *)ptr+4);
+            = CHACHA_U8TOU32((unsigned char *)ptr + 4);
         actx->nonce[2] = actx->key.counter[3]
-                       = CHACHA_U8TOU32((unsigned char *)ptr+8);
+            = CHACHA_U8TOU32((unsigned char *)ptr + 8);
         return 1;
 
     case EVP_CTRL_AEAD_SET_TAG:
@@ -561,8 +561,7 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
         return 1;
 
     case EVP_CTRL_AEAD_GET_TAG:
-        if (arg <= 0 || arg > POLY1305_BLOCK_SIZE ||
-                !EVP_CIPHER_CTX_is_encrypting(ctx))
+        if (arg <= 0 || arg > POLY1305_BLOCK_SIZE || !EVP_CIPHER_CTX_is_encrypting(ctx))
             return 0;
         memcpy(ptr, actx->tag, arg);
         return 1;
@@ -575,13 +574,12 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
             unsigned char *aad = ptr;
 
             memcpy(actx->tls_aad, ptr, EVP_AEAD_TLS1_AAD_LEN);
-            len = aad[EVP_AEAD_TLS1_AAD_LEN - 2] << 8 |
-                  aad[EVP_AEAD_TLS1_AAD_LEN - 1];
+            len = aad[EVP_AEAD_TLS1_AAD_LEN - 2] << 8 | aad[EVP_AEAD_TLS1_AAD_LEN - 1];
             aad = actx->tls_aad;
             if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
                 if (len < POLY1305_BLOCK_SIZE)
                     return 0;
-                len -= POLY1305_BLOCK_SIZE;     /* discount attached tag */
+                len -= POLY1305_BLOCK_SIZE; /* discount attached tag */
                 aad[EVP_AEAD_TLS1_AAD_LEN - 2] = (unsigned char)(len >> 8);
                 aad[EVP_AEAD_TLS1_AAD_LEN - 1] = (unsigned char)len;
             }
@@ -592,10 +590,10 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
              */
             actx->key.counter[1] = actx->nonce[0];
             actx->key.counter[2] = actx->nonce[1] ^ CHACHA_U8TOU32(aad);
-            actx->key.counter[3] = actx->nonce[2] ^ CHACHA_U8TOU32(aad+4);
+            actx->key.counter[3] = actx->nonce[2] ^ CHACHA_U8TOU32(aad + 4);
             actx->mac_inited = 0;
 
-            return POLY1305_BLOCK_SIZE;         /* tag length */
+            return POLY1305_BLOCK_SIZE; /* tag length */
         }
 
     case EVP_CTRL_AEAD_SET_MAC_KEY:
@@ -609,27 +607,24 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
 
 static EVP_CIPHER chacha20_poly1305 = {
     NID_chacha20_poly1305,
-    1,                  /* block_size */
-    CHACHA_KEY_SIZE,    /* key_len */
-    12,                 /* iv_len, 96-bit nonce in the context */
-    EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_CUSTOM_IV |
-    EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT |
-    EVP_CIPH_CUSTOM_COPY | EVP_CIPH_FLAG_CUSTOM_CIPHER |
-    EVP_CIPH_CUSTOM_IV_LENGTH,
+    1, /* block_size */
+    CHACHA_KEY_SIZE, /* key_len */
+    12, /* iv_len, 96-bit nonce in the context */
+    EVP_CIPH_FLAG_AEAD_CIPHER | EVP_CIPH_CUSTOM_IV | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_FLAG_CUSTOM_CIPHER | EVP_CIPH_CUSTOM_IV_LENGTH,
     EVP_ORIG_GLOBAL,
     chacha20_poly1305_init_key,
     chacha20_poly1305_cipher,
     chacha20_poly1305_cleanup,
-    0,          /* 0 moves context-specific structure allocation to ctrl */
-    NULL,       /* set_asn1_parameters */
-    NULL,       /* get_asn1_parameters */
+    0, /* 0 moves context-specific structure allocation to ctrl */
+    NULL, /* set_asn1_parameters */
+    NULL, /* get_asn1_parameters */
     chacha20_poly1305_ctrl,
-    NULL        /* app_data */
+    NULL /* app_data */
 };
 
 const EVP_CIPHER *EVP_chacha20_poly1305(void)
 {
-    return(&chacha20_poly1305);
+    return (&chacha20_poly1305);
 }
-# endif
+#endif
 #endif
diff --git a/crypto/evp/e_des.c b/crypto/evp/e_des.c
index 6eb49c0339102..b8d10829c2577 100644
--- a/crypto/evp/e_des.c
+++ b/crypto/evp/e_des.c
@@ -16,12 +16,12 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #ifndef OPENSSL_NO_DES
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include <openssl/des.h>
-# include <openssl/rand.h>
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include <openssl/des.h>
+#include <openssl/rand.h>
+#include "evp_local.h"
 
 typedef struct {
     union {
@@ -29,27 +29,27 @@ typedef struct {
         DES_key_schedule ks;
     } ks;
     union {
-        void (*cbc) (const void *, void *, size_t,
-                     const DES_key_schedule *, unsigned char *);
+        void (*cbc)(const void *, void *, size_t,
+            const DES_key_schedule *, unsigned char *);
     } stream;
 } EVP_DES_KEY;
 
-# if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
+#if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
 /* ----------^^^ this is not a typo, just a way to detect that
  * assembler support was in general requested... */
-#  include "crypto/sparc_arch.h"
+#include "crypto/sparc_arch.h"
 
-#  define SPARC_DES_CAPABLE       (OPENSSL_sparcv9cap_P[1] & CFR_DES)
+#define SPARC_DES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_DES)
 
 void des_t4_key_expand(const void *key, DES_key_schedule *ks);
 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
+    const DES_key_schedule *ks, unsigned char iv[8]);
+#endif
 
 static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                        const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 static int des_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
 
 /*
@@ -58,23 +58,23 @@ static int des_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
  */
 
 static int des_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     BLOCK_CIPHER_ecb_loop()
         DES_ecb_encrypt((DES_cblock *)(in + i), (DES_cblock *)(out + i),
-                        EVP_CIPHER_CTX_get_cipher_data(ctx),
-                        EVP_CIPHER_CTX_is_encrypting(ctx));
+            EVP_CIPHER_CTX_get_cipher_data(ctx),
+            EVP_CIPHER_CTX_is_encrypting(ctx));
     return 1;
 }
 
 static int des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     while (inl >= EVP_MAXCHUNK) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         DES_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK,
-                          EVP_CIPHER_CTX_get_cipher_data(ctx),
-                          (DES_cblock *)ctx->iv, &num);
+            EVP_CIPHER_CTX_get_cipher_data(ctx),
+            (DES_cblock *)ctx->iv, &num);
         EVP_CIPHER_CTX_set_num(ctx, num);
         inl -= EVP_MAXCHUNK;
         in += EVP_MAXCHUNK;
@@ -83,48 +83,48 @@ static int des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     if (inl) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         DES_ofb64_encrypt(in, out, (long)inl,
-                          EVP_CIPHER_CTX_get_cipher_data(ctx),
-                          (DES_cblock *)ctx->iv, &num);
+            EVP_CIPHER_CTX_get_cipher_data(ctx),
+            (DES_cblock *)ctx->iv, &num);
         EVP_CIPHER_CTX_set_num(ctx, num);
     }
     return 1;
 }
 
 static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
-    EVP_DES_KEY *dat = (EVP_DES_KEY *) EVP_CIPHER_CTX_get_cipher_data(ctx);
+    EVP_DES_KEY *dat = (EVP_DES_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx);
 
     if (dat->stream.cbc != NULL) {
-        (*dat->stream.cbc) (in, out, inl, &dat->ks.ks, ctx->iv);
+        (*dat->stream.cbc)(in, out, inl, &dat->ks.ks, ctx->iv);
         return 1;
     }
     while (inl >= EVP_MAXCHUNK) {
         DES_ncbc_encrypt(in, out, (long)EVP_MAXCHUNK,
-                         EVP_CIPHER_CTX_get_cipher_data(ctx),
-                         (DES_cblock *)ctx->iv,
-                         EVP_CIPHER_CTX_is_encrypting(ctx));
+            EVP_CIPHER_CTX_get_cipher_data(ctx),
+            (DES_cblock *)ctx->iv,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
         inl -= EVP_MAXCHUNK;
         in += EVP_MAXCHUNK;
         out += EVP_MAXCHUNK;
     }
     if (inl)
         DES_ncbc_encrypt(in, out, (long)inl,
-                         EVP_CIPHER_CTX_get_cipher_data(ctx),
-                         (DES_cblock *)ctx->iv,
-                         EVP_CIPHER_CTX_is_encrypting(ctx));
+            EVP_CIPHER_CTX_get_cipher_data(ctx),
+            (DES_cblock *)ctx->iv,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
     return 1;
 }
 
 static int des_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     while (inl >= EVP_MAXCHUNK) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         DES_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK,
-                          EVP_CIPHER_CTX_get_cipher_data(ctx),
-                          (DES_cblock *)ctx->iv, &num,
-                          EVP_CIPHER_CTX_is_encrypting(ctx));
+            EVP_CIPHER_CTX_get_cipher_data(ctx),
+            (DES_cblock *)ctx->iv, &num,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
         EVP_CIPHER_CTX_set_num(ctx, num);
         inl -= EVP_MAXCHUNK;
         in += EVP_MAXCHUNK;
@@ -133,9 +133,9 @@ static int des_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     if (inl) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         DES_cfb64_encrypt(in, out, (long)inl,
-                          EVP_CIPHER_CTX_get_cipher_data(ctx),
-                          (DES_cblock *)ctx->iv, &num,
-                          EVP_CIPHER_CTX_is_encrypting(ctx));
+            EVP_CIPHER_CTX_get_cipher_data(ctx),
+            (DES_cblock *)ctx->iv, &num,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
         EVP_CIPHER_CTX_set_num(ctx, num);
     }
     return 1;
@@ -146,11 +146,11 @@ static int des_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
  * way, so wrap it here
  */
 static int des_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     size_t n, chunk = EVP_MAXCHUNK / 8;
     unsigned char c[1];
-    unsigned char d[1] = { 0 };  /* Appease Coverity */
+    unsigned char d[1] = { 0 }; /* Appease Coverity */
 
     if (inl < chunk)
         chunk = inl;
@@ -159,11 +159,9 @@ static int des_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         for (n = 0; n < chunk * 8; ++n) {
             c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;
             DES_cfb_encrypt(c, d, 1, 1, EVP_CIPHER_CTX_get_cipher_data(ctx),
-                            (DES_cblock *)ctx->iv,
-                            EVP_CIPHER_CTX_is_encrypting(ctx));
-            out[n / 8] =
-                (out[n / 8] & ~(0x80 >> (unsigned int)(n % 8))) |
-                ((d[0] & 0x80) >> (unsigned int)(n % 8));
+                (DES_cblock *)ctx->iv,
+                EVP_CIPHER_CTX_is_encrypting(ctx));
+            out[n / 8] = (out[n / 8] & ~(0x80 >> (unsigned int)(n % 8))) | ((d[0] & 0x80) >> (unsigned int)(n % 8));
         }
         inl -= chunk;
         in += chunk;
@@ -176,45 +174,45 @@ static int des_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int des_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     while (inl >= EVP_MAXCHUNK) {
         DES_cfb_encrypt(in, out, 8, (long)EVP_MAXCHUNK,
-                        EVP_CIPHER_CTX_get_cipher_data(ctx),
-                        (DES_cblock *)ctx->iv,
-                        EVP_CIPHER_CTX_is_encrypting(ctx));
+            EVP_CIPHER_CTX_get_cipher_data(ctx),
+            (DES_cblock *)ctx->iv,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
         inl -= EVP_MAXCHUNK;
         in += EVP_MAXCHUNK;
         out += EVP_MAXCHUNK;
     }
     if (inl)
         DES_cfb_encrypt(in, out, 8, (long)inl,
-                        EVP_CIPHER_CTX_get_cipher_data(ctx),
-                        (DES_cblock *)ctx->iv,
-                        EVP_CIPHER_CTX_is_encrypting(ctx));
+            EVP_CIPHER_CTX_get_cipher_data(ctx),
+            (DES_cblock *)ctx->iv,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
     return 1;
 }
 
 BLOCK_CIPHER_defs(des, EVP_DES_KEY, NID_des, 8, 8, 8, 64,
-                  EVP_CIPH_RAND_KEY, des_init_key, NULL,
-                  EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
+    EVP_CIPH_RAND_KEY, des_init_key, NULL,
+    EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
 
     BLOCK_CIPHER_def_cfb(des, EVP_DES_KEY, NID_des, 8, 8, 1,
-                     EVP_CIPH_RAND_KEY, des_init_key, NULL,
-                     EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
+        EVP_CIPH_RAND_KEY, des_init_key, NULL,
+        EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
 
-    BLOCK_CIPHER_def_cfb(des, EVP_DES_KEY, NID_des, 8, 8, 8,
-                     EVP_CIPH_RAND_KEY, des_init_key, NULL,
-                     EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
+        BLOCK_CIPHER_def_cfb(des, EVP_DES_KEY, NID_des, 8, 8, 8,
+            EVP_CIPH_RAND_KEY, des_init_key, NULL,
+            EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
 
-static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                        const unsigned char *iv, int enc)
+            static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                const unsigned char *iv, int enc)
 {
     DES_cblock *deskey = (DES_cblock *)key;
-    EVP_DES_KEY *dat = (EVP_DES_KEY *) EVP_CIPHER_CTX_get_cipher_data(ctx);
+    EVP_DES_KEY *dat = (EVP_DES_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx);
 
     dat->stream.cbc = NULL;
-# if defined(SPARC_DES_CAPABLE)
+#if defined(SPARC_DES_CAPABLE)
     if (SPARC_DES_CAPABLE) {
         int mode = EVP_CIPHER_CTX_get_mode(ctx);
 
@@ -224,7 +222,7 @@ static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
             return 1;
         }
     }
-# endif
+#endif
     DES_set_key_unchecked(deskey, EVP_CIPHER_CTX_get_cipher_data(ctx));
     return 1;
 }
diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c
index 8fdf17cdc0d1b..ecb49a3f204e2 100644
--- a/crypto/evp/e_des3.c
+++ b/crypto/evp/e_des3.c
@@ -16,12 +16,12 @@
 #include <stdio.h>
 #include "internal/cryptlib.h"
 #ifndef OPENSSL_NO_DES
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include "crypto/sha.h"
-# include <openssl/des.h>
-# include <openssl/rand.h>
-# include "evp_local.h"
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include "crypto/sha.h"
+#include <openssl/des.h>
+#include <openssl/rand.h>
+#include "evp_local.h"
 
 typedef struct {
     union {
@@ -29,37 +29,37 @@ typedef struct {
         DES_key_schedule ks[3];
     } ks;
     union {
-        void (*cbc) (const void *, void *, size_t,
-                     const DES_key_schedule *, unsigned char *);
+        void (*cbc)(const void *, void *, size_t,
+            const DES_key_schedule *, unsigned char *);
     } stream;
 } DES_EDE_KEY;
-# define ks1 ks.ks[0]
-# define ks2 ks.ks[1]
-# define ks3 ks.ks[2]
+#define ks1 ks.ks[0]
+#define ks2 ks.ks[1]
+#define ks3 ks.ks[2]
 
-# if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
+#if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
 /* ---------^^^ this is not a typo, just a way to detect that
  * assembler support was in general requested... */
-#  include "crypto/sparc_arch.h"
+#include "crypto/sparc_arch.h"
 
-#  define SPARC_DES_CAPABLE       (OPENSSL_sparcv9cap_P[1] & CFR_DES)
+#define SPARC_DES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_DES)
 
 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]);
-# endif
+    const DES_key_schedule ks[3], unsigned char iv[8]);
+#endif
 
 static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                            const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 
 static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 
 static int des3_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
 
-# define data(ctx) EVP_C_DATA(DES_EDE_KEY,ctx)
+#define data(ctx) EVP_C_DATA(DES_EDE_KEY, ctx)
 
 /*
  * Because of various casts and different args can't use
@@ -67,26 +67,26 @@ static int des3_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
  */
 
 static int des_ede_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     BLOCK_CIPHER_ecb_loop()
         DES_ecb3_encrypt((const_DES_cblock *)(in + i),
-                         (DES_cblock *)(out + i),
-                         &data(ctx)->ks1, &data(ctx)->ks2,
-                         &data(ctx)->ks3, EVP_CIPHER_CTX_is_encrypting(ctx));
+            (DES_cblock *)(out + i),
+            &data(ctx)->ks1, &data(ctx)->ks2,
+            &data(ctx)->ks3, EVP_CIPHER_CTX_is_encrypting(ctx));
     return 1;
 }
 
 static int des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     while (inl >= EVP_MAXCHUNK) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         DES_ede3_ofb64_encrypt(in, out, (long)EVP_MAXCHUNK,
-                               &data(ctx)->ks1, &data(ctx)->ks2,
-                               &data(ctx)->ks3,
-                               (DES_cblock *)ctx->iv,
-                               &num);
+            &data(ctx)->ks1, &data(ctx)->ks2,
+            &data(ctx)->ks3,
+            (DES_cblock *)ctx->iv,
+            &num);
         EVP_CIPHER_CTX_set_num(ctx, num);
         inl -= EVP_MAXCHUNK;
         in += EVP_MAXCHUNK;
@@ -95,52 +95,52 @@ static int des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     if (inl) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         DES_ede3_ofb64_encrypt(in, out, (long)inl,
-                               &data(ctx)->ks1, &data(ctx)->ks2,
-                               &data(ctx)->ks3,
-                               (DES_cblock *)ctx->iv,
-                               &num);
+            &data(ctx)->ks1, &data(ctx)->ks2,
+            &data(ctx)->ks3,
+            (DES_cblock *)ctx->iv,
+            &num);
         EVP_CIPHER_CTX_set_num(ctx, num);
     }
     return 1;
 }
 
 static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     DES_EDE_KEY *dat = data(ctx);
 
     if (dat->stream.cbc != NULL) {
-        (*dat->stream.cbc) (in, out, inl, dat->ks.ks,
-                            ctx->iv);
+        (*dat->stream.cbc)(in, out, inl, dat->ks.ks,
+            ctx->iv);
         return 1;
     }
 
     while (inl >= EVP_MAXCHUNK) {
         DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK,
-                             &dat->ks1, &dat->ks2, &dat->ks3,
-                             (DES_cblock *)ctx->iv,
-                             EVP_CIPHER_CTX_is_encrypting(ctx));
+            &dat->ks1, &dat->ks2, &dat->ks3,
+            (DES_cblock *)ctx->iv,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
         inl -= EVP_MAXCHUNK;
         in += EVP_MAXCHUNK;
         out += EVP_MAXCHUNK;
     }
     if (inl)
         DES_ede3_cbc_encrypt(in, out, (long)inl,
-                             &dat->ks1, &dat->ks2, &dat->ks3,
-                             (DES_cblock *)ctx->iv,
-                             EVP_CIPHER_CTX_is_encrypting(ctx));
+            &dat->ks1, &dat->ks2, &dat->ks3,
+            (DES_cblock *)ctx->iv,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
     return 1;
 }
 
 static int des_ede_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     while (inl >= EVP_MAXCHUNK) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         DES_ede3_cfb64_encrypt(in, out, (long)EVP_MAXCHUNK,
-                               &data(ctx)->ks1, &data(ctx)->ks2,
-                               &data(ctx)->ks3, (DES_cblock *)ctx->iv,
-                               &num, EVP_CIPHER_CTX_is_encrypting(ctx));
+            &data(ctx)->ks1, &data(ctx)->ks2,
+            &data(ctx)->ks3, (DES_cblock *)ctx->iv,
+            &num, EVP_CIPHER_CTX_is_encrypting(ctx));
         EVP_CIPHER_CTX_set_num(ctx, num);
         inl -= EVP_MAXCHUNK;
         in += EVP_MAXCHUNK;
@@ -149,9 +149,9 @@ static int des_ede_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     if (inl) {
         int num = EVP_CIPHER_CTX_get_num(ctx);
         DES_ede3_cfb64_encrypt(in, out, (long)inl,
-                               &data(ctx)->ks1, &data(ctx)->ks2,
-                               &data(ctx)->ks3, (DES_cblock *)ctx->iv,
-                               &num, EVP_CIPHER_CTX_is_encrypting(ctx));
+            &data(ctx)->ks1, &data(ctx)->ks2,
+            &data(ctx)->ks3, (DES_cblock *)ctx->iv,
+            &num, EVP_CIPHER_CTX_is_encrypting(ctx));
         EVP_CIPHER_CTX_set_num(ctx, num);
     }
     return 1;
@@ -162,20 +162,20 @@ static int des_ede_cfb64_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
  * right way, so wrap it here
  */
 static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     size_t n;
     unsigned char c[1];
     unsigned char d[1] = { 0 }; /* Appease Coverity */
 
     if (!EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS))
-            inl *= 8;
+        inl *= 8;
     for (n = 0; n < inl; ++n) {
         c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;
         DES_ede3_cfb_encrypt(c, d, 1, 1,
-                             &data(ctx)->ks1, &data(ctx)->ks2,
-                             &data(ctx)->ks3, (DES_cblock *)ctx->iv,
-                             EVP_CIPHER_CTX_is_encrypting(ctx));
+            &data(ctx)->ks1, &data(ctx)->ks2,
+            &data(ctx)->ks3, (DES_cblock *)ctx->iv,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
         out[n / 8] = (out[n / 8] & ~(0x80 >> (unsigned int)(n % 8)))
             | ((d[0] & 0x80) >> (unsigned int)(n % 8));
     }
@@ -184,52 +184,52 @@ static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int des_ede3_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     while (inl >= EVP_MAXCHUNK) {
         DES_ede3_cfb_encrypt(in, out, 8, (long)EVP_MAXCHUNK,
-                             &data(ctx)->ks1, &data(ctx)->ks2,
-                             &data(ctx)->ks3, (DES_cblock *)ctx->iv,
-                             EVP_CIPHER_CTX_is_encrypting(ctx));
+            &data(ctx)->ks1, &data(ctx)->ks2,
+            &data(ctx)->ks3, (DES_cblock *)ctx->iv,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
         inl -= EVP_MAXCHUNK;
         in += EVP_MAXCHUNK;
         out += EVP_MAXCHUNK;
     }
     if (inl)
         DES_ede3_cfb_encrypt(in, out, 8, (long)inl,
-                             &data(ctx)->ks1, &data(ctx)->ks2,
-                             &data(ctx)->ks3, (DES_cblock *)ctx->iv,
-                             EVP_CIPHER_CTX_is_encrypting(ctx));
+            &data(ctx)->ks1, &data(ctx)->ks2,
+            &data(ctx)->ks3, (DES_cblock *)ctx->iv,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
     return 1;
 }
 
 BLOCK_CIPHER_defs(des_ede, DES_EDE_KEY, NID_des_ede, 8, 16, 8, 64,
-                  EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
-                  des_ede_init_key, NULL, NULL, NULL, des3_ctrl)
-# define des_ede3_cfb64_cipher des_ede_cfb64_cipher
-# define des_ede3_ofb_cipher des_ede_ofb_cipher
-# define des_ede3_cbc_cipher des_ede_cbc_cipher
-# define des_ede3_ecb_cipher des_ede_ecb_cipher
+    EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
+    des_ede_init_key, NULL, NULL, NULL, des3_ctrl)
+#define des_ede3_cfb64_cipher des_ede_cfb64_cipher
+#define des_ede3_ofb_cipher des_ede_ofb_cipher
+#define des_ede3_cbc_cipher des_ede_cbc_cipher
+#define des_ede3_ecb_cipher des_ede_ecb_cipher
     BLOCK_CIPHER_defs(des_ede3, DES_EDE_KEY, NID_des_ede3, 8, 24, 8, 64,
-                  EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
-                  des_ede3_init_key, NULL, NULL, NULL, des3_ctrl)
+        EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
+        des_ede3_init_key, NULL, NULL, NULL, des3_ctrl)
 
-    BLOCK_CIPHER_def_cfb(des_ede3, DES_EDE_KEY, NID_des_ede3, 24, 8, 1,
-                     EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
-                     des_ede3_init_key, NULL, NULL, NULL, des3_ctrl)
+        BLOCK_CIPHER_def_cfb(des_ede3, DES_EDE_KEY, NID_des_ede3, 24, 8, 1,
+            EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
+            des_ede3_init_key, NULL, NULL, NULL, des3_ctrl)
 
-    BLOCK_CIPHER_def_cfb(des_ede3, DES_EDE_KEY, NID_des_ede3, 24, 8, 8,
-                     EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
-                     des_ede3_init_key, NULL, NULL, NULL, des3_ctrl)
+            BLOCK_CIPHER_def_cfb(des_ede3, DES_EDE_KEY, NID_des_ede3, 24, 8, 8,
+                EVP_CIPH_RAND_KEY | EVP_CIPH_FLAG_DEFAULT_ASN1,
+                des_ede3_init_key, NULL, NULL, NULL, des3_ctrl)
 
-static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                            const unsigned char *iv, int enc)
+                static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                    const unsigned char *iv, int enc)
 {
     DES_cblock *deskey = (DES_cblock *)key;
     DES_EDE_KEY *dat = data(ctx);
 
     dat->stream.cbc = NULL;
-# if defined(SPARC_DES_CAPABLE)
+#if defined(SPARC_DES_CAPABLE)
     if (SPARC_DES_CAPABLE) {
         int mode = EVP_CIPHER_CTX_get_mode(ctx);
 
@@ -237,12 +237,11 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
             des_t4_key_expand(&deskey[0], &dat->ks1);
             des_t4_key_expand(&deskey[1], &dat->ks2);
             memcpy(&dat->ks3, &dat->ks1, sizeof(dat->ks1));
-            dat->stream.cbc = enc ? des_t4_ede3_cbc_encrypt :
-                des_t4_ede3_cbc_decrypt;
+            dat->stream.cbc = enc ? des_t4_ede3_cbc_encrypt : des_t4_ede3_cbc_decrypt;
             return 1;
         }
     }
-# endif
+#endif
     DES_set_key_unchecked(&deskey[0], &dat->ks1);
     DES_set_key_unchecked(&deskey[1], &dat->ks2);
     memcpy(&dat->ks3, &dat->ks1, sizeof(dat->ks1));
@@ -250,13 +249,13 @@ static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     DES_cblock *deskey = (DES_cblock *)key;
     DES_EDE_KEY *dat = data(ctx);
 
     dat->stream.cbc = NULL;
-# if defined(SPARC_DES_CAPABLE)
+#if defined(SPARC_DES_CAPABLE)
     if (SPARC_DES_CAPABLE) {
         int mode = EVP_CIPHER_CTX_get_mode(ctx);
 
@@ -264,12 +263,11 @@ static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
             des_t4_key_expand(&deskey[0], &dat->ks1);
             des_t4_key_expand(&deskey[1], &dat->ks2);
             des_t4_key_expand(&deskey[2], &dat->ks3);
-            dat->stream.cbc = enc ? des_t4_ede3_cbc_encrypt :
-                des_t4_ede3_cbc_decrypt;
+            dat->stream.cbc = enc ? des_t4_ede3_cbc_encrypt : des_t4_ede3_cbc_decrypt;
             return 1;
         }
     }
-# endif
+#endif
     DES_set_key_unchecked(&deskey[0], &dat->ks1);
     DES_set_key_unchecked(&deskey[1], &dat->ks2);
     DES_set_key_unchecked(&deskey[2], &dat->ks3);
@@ -309,15 +307,14 @@ const EVP_CIPHER *EVP_des_ede3(void)
     return &des_ede3_ecb;
 }
 
-
-# include <openssl/sha.h>
+#include <openssl/sha.h>
 
 static const unsigned char wrap_iv[8] = {
     0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05
 };
 
 static int des_ede3_unwrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     unsigned char icv[8], iv[8], sha1tmp[SHA_DIGEST_LENGTH];
     int rv = -1;
@@ -347,8 +344,8 @@ static int des_ede3_unwrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
     /* Decrypt again using new IV */
     des_ede_cbc_cipher(ctx, out, out, inl - 16);
     des_ede_cbc_cipher(ctx, icv, icv, 8);
-    if (ossl_sha1(out, inl - 16, sha1tmp)  /* Work out hash of first portion */
-            && CRYPTO_memcmp(sha1tmp, icv, 8) == 0)
+    if (ossl_sha1(out, inl - 16, sha1tmp) /* Work out hash of first portion */
+        && CRYPTO_memcmp(sha1tmp, icv, 8) == 0)
         rv = inl - 16;
     OPENSSL_cleanse(icv, 8);
     OPENSSL_cleanse(sha1tmp, SHA_DIGEST_LENGTH);
@@ -361,7 +358,7 @@ static int des_ede3_unwrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int des_ede3_wrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                         const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     unsigned char sha1tmp[SHA_DIGEST_LENGTH];
     if (out == NULL)
@@ -386,7 +383,7 @@ static int des_ede3_wrap(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int des_ede3_wrap_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     /*
      * Sanity check input length: we typically only wrap keys so EVP_MAXCHUNK
diff --git a/crypto/evp/e_idea.c b/crypto/evp/e_idea.c
index 93da93823d62c..0371094fe3bbf 100644
--- a/crypto/evp/e_idea.c
+++ b/crypto/evp/e_idea.c
@@ -18,11 +18,11 @@
 #include "internal/cryptlib.h"
 
 #ifndef OPENSSL_NO_IDEA
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include <openssl/idea.h>
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include <openssl/idea.h>
+#include "evp_local.h"
 
 /* Can't use IMPLEMENT_BLOCK_CIPHER because IDEA_ecb_encrypt is different */
 
@@ -31,7 +31,7 @@ typedef struct {
 } EVP_IDEA_KEY;
 
 static int idea_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                         const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 
 /*
  * NB IDEA_ecb_encrypt doesn't take an 'encrypt' argument so we treat it as a
@@ -39,7 +39,7 @@ static int idea_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
  */
 
 static int idea_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     BLOCK_CIPHER_ecb_loop()
         IDEA_ecb_encrypt(in + i, out + i, &EVP_C_DATA(EVP_IDEA_KEY, ctx)->ks);
@@ -47,15 +47,15 @@ static int idea_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 BLOCK_CIPHER_func_cbc(idea, IDEA, EVP_IDEA_KEY, ks)
-BLOCK_CIPHER_func_ofb(idea, IDEA, 64, EVP_IDEA_KEY, ks)
-BLOCK_CIPHER_func_cfb(idea, IDEA, 64, EVP_IDEA_KEY, ks)
+    BLOCK_CIPHER_func_ofb(idea, IDEA, 64, EVP_IDEA_KEY, ks)
+        BLOCK_CIPHER_func_cfb(idea, IDEA, 64, EVP_IDEA_KEY, ks)
 
-BLOCK_CIPHER_defs(idea, IDEA_KEY_SCHEDULE, NID_idea, 8, 16, 8, 64,
-                  0, idea_init_key, NULL,
-                  EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
+            BLOCK_CIPHER_defs(idea, IDEA_KEY_SCHEDULE, NID_idea, 8, 16, 8, 64,
+                0, idea_init_key, NULL,
+                EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
 
-static int idea_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                         const unsigned char *iv, int enc)
+                static int idea_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                    const unsigned char *iv, int enc)
 {
     if (!enc) {
         if (EVP_CIPHER_CTX_get_mode(ctx) == EVP_CIPH_OFB_MODE)
diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c
index af900c52989f8..1303caa892d4b 100644
--- a/crypto/evp/e_null.c
+++ b/crypto/evp/e_null.c
@@ -14,9 +14,9 @@
 #include "crypto/evp.h"
 
 static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                         const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                       const unsigned char *in, size_t inl);
+    const unsigned char *in, size_t inl);
 static const EVP_CIPHER n_cipher = {
     NID_undef,
     1, 0, 0, 0,
@@ -37,13 +37,13 @@ const EVP_CIPHER *EVP_enc_null(void)
 }
 
 static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                         const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     return 1;
 }
 
 static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                       const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     if (in != out)
         memcpy(out, in, inl);
diff --git a/crypto/evp/e_old.c b/crypto/evp/e_old.c
index e9c9f22119bf4..c2e5319b2d4a7 100644
--- a/crypto/evp/e_old.c
+++ b/crypto/evp/e_old.c
@@ -19,7 +19,7 @@
  */
 
 #ifndef OPENSSL_NO_BF
-# undef EVP_bf_cfb
+#undef EVP_bf_cfb
 const EVP_CIPHER *EVP_bf_cfb(void);
 const EVP_CIPHER *EVP_bf_cfb(void)
 {
@@ -28,21 +28,21 @@ const EVP_CIPHER *EVP_bf_cfb(void)
 #endif
 
 #ifndef OPENSSL_NO_DES
-# undef EVP_des_cfb
+#undef EVP_des_cfb
 const EVP_CIPHER *EVP_des_cfb(void);
 const EVP_CIPHER *EVP_des_cfb(void)
 {
     return EVP_des_cfb64();
 }
 
-# undef EVP_des_ede3_cfb
+#undef EVP_des_ede3_cfb
 const EVP_CIPHER *EVP_des_ede3_cfb(void);
 const EVP_CIPHER *EVP_des_ede3_cfb(void)
 {
     return EVP_des_ede3_cfb64();
 }
 
-# undef EVP_des_ede_cfb
+#undef EVP_des_ede_cfb
 const EVP_CIPHER *EVP_des_ede_cfb(void);
 const EVP_CIPHER *EVP_des_ede_cfb(void)
 {
@@ -51,7 +51,7 @@ const EVP_CIPHER *EVP_des_ede_cfb(void)
 #endif
 
 #ifndef OPENSSL_NO_IDEA
-# undef EVP_idea_cfb
+#undef EVP_idea_cfb
 const EVP_CIPHER *EVP_idea_cfb(void);
 const EVP_CIPHER *EVP_idea_cfb(void)
 {
@@ -60,7 +60,7 @@ const EVP_CIPHER *EVP_idea_cfb(void)
 #endif
 
 #ifndef OPENSSL_NO_RC2
-# undef EVP_rc2_cfb
+#undef EVP_rc2_cfb
 const EVP_CIPHER *EVP_rc2_cfb(void);
 const EVP_CIPHER *EVP_rc2_cfb(void)
 {
@@ -69,7 +69,7 @@ const EVP_CIPHER *EVP_rc2_cfb(void)
 #endif
 
 #ifndef OPENSSL_NO_CAST
-# undef EVP_cast5_cfb
+#undef EVP_cast5_cfb
 const EVP_CIPHER *EVP_cast5_cfb(void);
 const EVP_CIPHER *EVP_cast5_cfb(void)
 {
@@ -78,7 +78,7 @@ const EVP_CIPHER *EVP_cast5_cfb(void)
 #endif
 
 #ifndef OPENSSL_NO_RC5
-# undef EVP_rc5_32_12_16_cfb
+#undef EVP_rc5_32_12_16_cfb
 const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void);
 const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void)
 {
diff --git a/crypto/evp/e_rc2.c b/crypto/evp/e_rc2.c
index ffeb17fb1e5ac..88e359bd44e77 100644
--- a/crypto/evp/e_rc2.c
+++ b/crypto/evp/e_rc2.c
@@ -18,14 +18,14 @@
 
 #ifndef OPENSSL_NO_RC2
 
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include <openssl/rc2.h>
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include <openssl/rc2.h>
+#include "evp_local.h"
 
 static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                        const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 static int rc2_meth_to_magic(EVP_CIPHER_CTX *ctx);
 static int rc2_magic_to_meth(int i);
 static int rc2_set_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
@@ -33,25 +33,25 @@ static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
 static int rc2_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
 
 typedef struct {
-    int key_bits;               /* effective key bits */
-    RC2_KEY ks;                 /* key schedule */
+    int key_bits; /* effective key bits */
+    RC2_KEY ks; /* key schedule */
 } EVP_RC2_KEY;
 
-# define data(ctx)       EVP_C_DATA(EVP_RC2_KEY,ctx)
+#define data(ctx) EVP_C_DATA(EVP_RC2_KEY, ctx)
 
 IMPLEMENT_BLOCK_CIPHER(rc2, ks, RC2, EVP_RC2_KEY, NID_rc2,
-                       8,
-                       RC2_KEY_LENGTH, 8, 64,
-                       EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
-                       rc2_init_key, NULL,
-                       rc2_set_asn1_type_and_iv, rc2_get_asn1_type_and_iv,
-                       rc2_ctrl)
-# define RC2_40_MAGIC    0xa0
-# define RC2_64_MAGIC    0x78
-# define RC2_128_MAGIC   0x3a
+    8,
+    RC2_KEY_LENGTH, 8, 64,
+    EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
+    rc2_init_key, NULL,
+    rc2_set_asn1_type_and_iv, rc2_get_asn1_type_and_iv,
+    rc2_ctrl)
+#define RC2_40_MAGIC 0xa0
+#define RC2_64_MAGIC 0x78
+#define RC2_128_MAGIC 0x3a
 static const EVP_CIPHER r2_64_cbc_cipher = {
     NID_rc2_64_cbc,
-    8, 8 /* 64 bit */ , 8,
+    8, 8 /* 64 bit */, 8,
     EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
     EVP_ORIG_GLOBAL,
     rc2_init_key,
@@ -66,7 +66,7 @@ static const EVP_CIPHER r2_64_cbc_cipher = {
 
 static const EVP_CIPHER r2_40_cbc_cipher = {
     NID_rc2_40_cbc,
-    8, 5 /* 40 bit */ , 8,
+    8, 5 /* 40 bit */, 8,
     EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
     EVP_ORIG_GLOBAL,
     rc2_init_key,
@@ -90,10 +90,10 @@ const EVP_CIPHER *EVP_rc2_40_cbc(void)
 }
 
 static int rc2_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                        const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     RC2_set_key(&data(ctx)->ks, EVP_CIPHER_CTX_get_key_length(ctx),
-                key, data(ctx)->key_bits);
+        key, data(ctx)->key_bits);
     return 1;
 }
 
@@ -147,8 +147,9 @@ static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
         if (i > 0 && !EVP_CipherInit_ex(c, NULL, NULL, NULL, iv, -1))
             return -1;
         if (EVP_CIPHER_CTX_ctrl(c, EVP_CTRL_SET_RC2_KEY_BITS, key_bits,
-                                NULL) <= 0
-                || EVP_CIPHER_CTX_set_key_length(c, key_bits / 8) <= 0)
+                NULL)
+                <= 0
+            || EVP_CIPHER_CTX_set_key_length(c, key_bits / 8) <= 0)
             return -1;
     }
     return i;
@@ -184,11 +185,11 @@ static int rc2_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
             return 1;
         }
         return 0;
-# ifdef PBE_PRF_TEST
+#ifdef PBE_PRF_TEST
     case EVP_CTRL_PBE_PRF_NID:
         *(int *)ptr = NID_hmacWithMD5;
         return 1;
-# endif
+#endif
 
     default:
         return -1;
diff --git a/crypto/evp/e_rc4.c b/crypto/evp/e_rc4.c
index e22e81d467525..7ca5e797e59ff 100644
--- a/crypto/evp/e_rc4.c
+++ b/crypto/evp/e_rc4.c
@@ -18,22 +18,22 @@
 
 #ifndef OPENSSL_NO_RC4
 
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include <openssl/rc4.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/rc4.h>
 
-# include "crypto/evp.h"
+#include "crypto/evp.h"
 
 typedef struct {
-    RC4_KEY ks;                 /* working key */
+    RC4_KEY ks; /* working key */
 } EVP_RC4_KEY;
 
-# define data(ctx) ((EVP_RC4_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx))
+#define data(ctx) ((EVP_RC4_KEY *)EVP_CIPHER_CTX_get_cipher_data(ctx))
 
 static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                        const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 static int rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                      const unsigned char *in, size_t inl);
+    const unsigned char *in, size_t inl);
 static const EVP_CIPHER r4_cipher = {
     NID_rc4,
     1, EVP_RC4_KEY_SIZE, 0,
@@ -51,7 +51,7 @@ static const EVP_CIPHER r4_cipher = {
 
 static const EVP_CIPHER r4_40_cipher = {
     NID_rc4_40,
-    1, 5 /* 40 bit */ , 0,
+    1, 5 /* 40 bit */, 0,
     EVP_CIPH_VARIABLE_LENGTH,
     EVP_ORIG_GLOBAL,
     rc4_init_key,
@@ -75,7 +75,7 @@ const EVP_CIPHER *EVP_rc4_40(void)
 }
 
 static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                        const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int keylen;
 
@@ -86,7 +86,7 @@ static int rc4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static int rc4_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                      const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     RC4(&data(ctx)->ks, inl, in, out);
     return 1;
diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c
index 183ecefcec652..7b45c08395c9e 100644
--- a/crypto/evp/e_rc4_hmac_md5.c
+++ b/crypto/evp/e_rc4_hmac_md5.c
@@ -21,12 +21,12 @@
 
 #if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_MD5)
 
-# include <openssl/crypto.h>
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include <openssl/rc4.h>
-# include <openssl/md5.h>
-# include "crypto/evp.h"
+#include <openssl/crypto.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/rc4.h>
+#include <openssl/md5.h>
+#include "crypto/evp.h"
 
 typedef struct {
     RC4_KEY ks;
@@ -34,16 +34,16 @@ typedef struct {
     size_t payload_length;
 } EVP_RC4_HMAC_MD5;
 
-# define NO_PAYLOAD_LENGTH       ((size_t)-1)
+#define NO_PAYLOAD_LENGTH ((size_t)-1)
 
 void rc4_md5_enc(RC4_KEY *key, const void *in0, void *out,
-                 MD5_CTX *ctx, const void *inp, size_t blocks);
+    MD5_CTX *ctx, const void *inp, size_t blocks);
 
-# define data(ctx) ((EVP_RC4_HMAC_MD5 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
+#define data(ctx) ((EVP_RC4_HMAC_MD5 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
 
 static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
-                                 const unsigned char *inkey,
-                                 const unsigned char *iv, int enc)
+    const unsigned char *inkey,
+    const unsigned char *iv, int enc)
 {
     EVP_RC4_HMAC_MD5 *key = data(ctx);
     const int keylen = EVP_CIPHER_CTX_get_key_length(ctx);
@@ -53,7 +53,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
 
     RC4_set_key(&key->ks, keylen, inkey);
 
-    MD5_Init(&key->head);       /* handy when benchmarking */
+    MD5_Init(&key->head); /* handy when benchmarking */
     key->tail = key->head;
     key->md = key->head;
 
@@ -62,27 +62,25 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
     return 1;
 }
 
-# if     defined(RC4_ASM) && defined(MD5_ASM) &&     (     \
-        defined(__x86_64)       || defined(__x86_64__)  || \
-        defined(_M_AMD64)       || defined(_M_X64)      )
-#  define STITCHED_CALL
-# endif
+#if defined(RC4_ASM) && defined(MD5_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
+#define STITCHED_CALL
+#endif
 
-# if !defined(STITCHED_CALL)
-#  define rc4_off 0
-#  define md5_off 0
-# endif
+#if !defined(STITCHED_CALL)
+#define rc4_off 0
+#define md5_off 0
+#endif
 
 static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     EVP_RC4_HMAC_MD5 *key = data(ctx);
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
     size_t rc4_off = 32 - 1 - (key->ks.x & (32 - 1)), /* 32 is $MOD from
                                                        * rc4_md5-x86_64.pl */
         md5_off = MD5_CBLOCK - key->md.num, blocks;
     unsigned int l;
-# endif
+#endif
     size_t plen = key->payload_length;
 
     if (plen != NO_PAYLOAD_LENGTH && len != (plen + MD5_DIGEST_LENGTH))
@@ -91,18 +89,17 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
         if (plen == NO_PAYLOAD_LENGTH)
             plen = len;
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
         /* cipher has to "fall behind" */
         if (rc4_off > md5_off)
             md5_off += MD5_CBLOCK;
 
-        if (plen > md5_off && (blocks = (plen - md5_off) / MD5_CBLOCK) &&
-            (OPENSSL_ia32cap_P[0] & (1 << 20)) == 0) {
+        if (plen > md5_off && (blocks = (plen - md5_off) / MD5_CBLOCK) && (OPENSSL_ia32cap_P[0] & (1 << 20)) == 0) {
             MD5_Update(&key->md, in, md5_off);
             RC4(&key->ks, rc4_off, in, out);
 
             rc4_md5_enc(&key->ks, in + rc4_off, out + rc4_off,
-                        &key->md, in + md5_off, blocks);
+                &key->md, in + md5_off, blocks);
             blocks *= MD5_CBLOCK;
             rc4_off += blocks;
             md5_off += blocks;
@@ -114,10 +111,10 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             rc4_off = 0;
             md5_off = 0;
         }
-# endif
+#endif
         MD5_Update(&key->md, in + md5_off, plen - md5_off);
 
-        if (plen != len) {      /* "TLS" mode of operation */
+        if (plen != len) { /* "TLS" mode of operation */
             if (in != out)
                 memcpy(out + rc4_off, in + rc4_off, plen - rc4_off);
 
@@ -133,20 +130,19 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         }
     } else {
         unsigned char mac[MD5_DIGEST_LENGTH];
-# if defined(STITCHED_CALL)
+#if defined(STITCHED_CALL)
         /* digest has to "fall behind" */
         if (md5_off > rc4_off)
             rc4_off += 2 * MD5_CBLOCK;
         else
             rc4_off += MD5_CBLOCK;
 
-        if (len > rc4_off && (blocks = (len - rc4_off) / MD5_CBLOCK) &&
-            (OPENSSL_ia32cap_P[0] & (1 << 20)) == 0) {
+        if (len > rc4_off && (blocks = (len - rc4_off) / MD5_CBLOCK) && (OPENSSL_ia32cap_P[0] & (1 << 20)) == 0) {
             RC4(&key->ks, rc4_off, in, out);
             MD5_Update(&key->md, out, md5_off);
 
             rc4_md5_enc(&key->ks, in + rc4_off, out + rc4_off,
-                        &key->md, out + md5_off, blocks);
+                &key->md, out + md5_off, blocks);
             blocks *= MD5_CBLOCK;
             rc4_off += blocks;
             md5_off += blocks;
@@ -159,7 +155,7 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             md5_off = 0;
             rc4_off = 0;
         }
-# endif
+#endif
         /* decrypt HMAC at once */
         RC4(&key->ks, len - rc4_off, in + rc4_off, out + rc4_off);
         if (plen != NO_PAYLOAD_LENGTH) { /* "TLS" mode of operation */
@@ -184,77 +180,74 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int rc4_hmac_md5_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
-                             void *ptr)
+    void *ptr)
 {
     EVP_RC4_HMAC_MD5 *key = data(ctx);
 
     switch (type) {
-    case EVP_CTRL_AEAD_SET_MAC_KEY:
-        {
-            unsigned int i;
-            unsigned char hmac_key[64];
-
-            memset(hmac_key, 0, sizeof(hmac_key));
-
-            if (arg > (int)sizeof(hmac_key)) {
-                MD5_Init(&key->head);
-                MD5_Update(&key->head, ptr, arg);
-                MD5_Final(hmac_key, &key->head);
-            } else {
-                memcpy(hmac_key, ptr, arg);
-            }
-
-            for (i = 0; i < sizeof(hmac_key); i++)
-                hmac_key[i] ^= 0x36; /* ipad */
+    case EVP_CTRL_AEAD_SET_MAC_KEY: {
+        unsigned int i;
+        unsigned char hmac_key[64];
+
+        memset(hmac_key, 0, sizeof(hmac_key));
+
+        if (arg > (int)sizeof(hmac_key)) {
             MD5_Init(&key->head);
-            MD5_Update(&key->head, hmac_key, sizeof(hmac_key));
+            MD5_Update(&key->head, ptr, arg);
+            MD5_Final(hmac_key, &key->head);
+        } else {
+            memcpy(hmac_key, ptr, arg);
+        }
 
-            for (i = 0; i < sizeof(hmac_key); i++)
-                hmac_key[i] ^= 0x36 ^ 0x5c; /* opad */
-            MD5_Init(&key->tail);
-            MD5_Update(&key->tail, hmac_key, sizeof(hmac_key));
+        for (i = 0; i < sizeof(hmac_key); i++)
+            hmac_key[i] ^= 0x36; /* ipad */
+        MD5_Init(&key->head);
+        MD5_Update(&key->head, hmac_key, sizeof(hmac_key));
 
-            OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
+        for (i = 0; i < sizeof(hmac_key); i++)
+            hmac_key[i] ^= 0x36 ^ 0x5c; /* opad */
+        MD5_Init(&key->tail);
+        MD5_Update(&key->tail, hmac_key, sizeof(hmac_key));
 
-            return 1;
-        }
-    case EVP_CTRL_AEAD_TLS1_AAD:
-        {
-            unsigned char *p = ptr;
-            unsigned int len;
+        OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
 
-            if (arg != EVP_AEAD_TLS1_AAD_LEN)
-                return -1;
+        return 1;
+    }
+    case EVP_CTRL_AEAD_TLS1_AAD: {
+        unsigned char *p = ptr;
+        unsigned int len;
 
-            len = p[arg - 2] << 8 | p[arg - 1];
+        if (arg != EVP_AEAD_TLS1_AAD_LEN)
+            return -1;
 
-            if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
-                if (len < MD5_DIGEST_LENGTH)
-                    return -1;
-                len -= MD5_DIGEST_LENGTH;
-                p[arg - 2] = len >> 8;
-                p[arg - 1] = len;
-            }
-            key->payload_length = len;
-            key->md = key->head;
-            MD5_Update(&key->md, p, arg);
+        len = p[arg - 2] << 8 | p[arg - 1];
 
-            return MD5_DIGEST_LENGTH;
+        if (!EVP_CIPHER_CTX_is_encrypting(ctx)) {
+            if (len < MD5_DIGEST_LENGTH)
+                return -1;
+            len -= MD5_DIGEST_LENGTH;
+            p[arg - 2] = len >> 8;
+            p[arg - 1] = len;
         }
+        key->payload_length = len;
+        key->md = key->head;
+        MD5_Update(&key->md, p, arg);
+
+        return MD5_DIGEST_LENGTH;
+    }
     default:
         return -1;
     }
 }
 
 static EVP_CIPHER r4_hmac_md5_cipher = {
-# ifdef NID_rc4_hmac_md5
+#ifdef NID_rc4_hmac_md5
     NID_rc4_hmac_md5,
-# else
+#else
     NID_undef,
-# endif
+#endif
     1, EVP_RC4_KEY_SIZE, 0,
-    EVP_CIPH_STREAM_CIPHER | EVP_CIPH_VARIABLE_LENGTH |
-        EVP_CIPH_FLAG_AEAD_CIPHER,
+    EVP_CIPH_STREAM_CIPHER | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_FLAG_AEAD_CIPHER,
     EVP_ORIG_GLOBAL,
     rc4_hmac_md5_init_key,
     rc4_hmac_md5_cipher,
diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c
index 3496a701931c9..5133b28d3662a 100644
--- a/crypto/evp/e_rc5.c
+++ b/crypto/evp/e_rc5.c
@@ -18,27 +18,27 @@
 
 #ifndef OPENSSL_NO_RC5
 
-# include <openssl/evp.h>
-# include "crypto/evp.h"
-# include <openssl/objects.h>
-# include "evp_local.h"
-# include <openssl/rc5.h>
+#include <openssl/evp.h>
+#include "crypto/evp.h"
+#include <openssl/objects.h>
+#include "evp_local.h"
+#include <openssl/rc5.h>
 
 static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                               const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 static int rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr);
 
 typedef struct {
-    int rounds;                 /* number of rounds */
-    RC5_32_KEY ks;              /* key schedule */
+    int rounds; /* number of rounds */
+    RC5_32_KEY ks; /* key schedule */
 } EVP_RC5_KEY;
 
-# define data(ctx)       EVP_C_DATA(EVP_RC5_KEY,ctx)
+#define data(ctx) EVP_C_DATA(EVP_RC5_KEY, ctx)
 
 IMPLEMENT_BLOCK_CIPHER(rc5_32_12_16, ks, RC5_32, EVP_RC5_KEY, NID_rc5,
-                       8, RC5_32_KEY_LENGTH, 8, 64,
-                       EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
-                       r_32_12_16_init_key, NULL, NULL, NULL, rc5_ctrl)
+    8, RC5_32_KEY_LENGTH, 8, 64,
+    EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_CTRL_INIT,
+    r_32_12_16_init_key, NULL, NULL, NULL, rc5_ctrl)
 
 static int rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 {
@@ -70,7 +70,7 @@ static int rc5_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 }
 
 static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                               const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     const int key_len = EVP_CIPHER_CTX_get_key_length(ctx);
 
diff --git a/crypto/evp/e_seed.c b/crypto/evp/e_seed.c
index 65ddb573350af..a88cab029412c 100644
--- a/crypto/evp/e_seed.c
+++ b/crypto/evp/e_seed.c
@@ -23,18 +23,18 @@
 #include "evp_local.h"
 
 static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                         const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 
 typedef struct {
     SEED_KEY_SCHEDULE ks;
 } EVP_SEED_KEY;
 
 IMPLEMENT_BLOCK_CIPHER(seed, ks, SEED, EVP_SEED_KEY, NID_seed,
-                       16, 16, 16, 128, EVP_CIPH_FLAG_DEFAULT_ASN1,
-                       seed_init_key, 0, 0, 0, 0)
+    16, 16, 16, 128, EVP_CIPH_FLAG_DEFAULT_ASN1,
+    seed_init_key, 0, 0, 0, 0)
 
 static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                         const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     SEED_set_key(key, &EVP_C_DATA(EVP_SEED_KEY, ctx)->ks);
     return 1;
diff --git a/crypto/evp/e_sm4.c b/crypto/evp/e_sm4.c
index eeb4fd8e09f8d..f833e755162d7 100644
--- a/crypto/evp/e_sm4.c
+++ b/crypto/evp/e_sm4.c
@@ -13,12 +13,12 @@
 
 #include "internal/cryptlib.h"
 #ifndef OPENSSL_NO_SM4
-# include <openssl/evp.h>
-# include <openssl/modes.h>
-# include "crypto/sm4.h"
-# include "crypto/evp.h"
-# include "crypto/sm4_platform.h"
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/modes.h>
+#include "crypto/sm4.h"
+#include "crypto/evp.h"
+#include "crypto/sm4_platform.h"
+#include "evp_local.h"
 
 typedef struct {
     union {
@@ -33,31 +33,34 @@ typedef struct {
     } stream;
 } EVP_SM4_KEY;
 
-# define BLOCK_CIPHER_generic(nid,blocksize,ivlen,nmode,mode,MODE,flags) \
-static const EVP_CIPHER sm4_##mode = { \
-        nid##_##nmode,blocksize,128/8,ivlen, \
-        flags|EVP_CIPH_##MODE##_MODE,   \
-        EVP_ORIG_GLOBAL,                \
-        sm4_init_key,                   \
-        sm4_##mode##_cipher,            \
-        NULL,                           \
-        sizeof(EVP_SM4_KEY),            \
-        NULL,NULL,NULL,NULL }; \
-const EVP_CIPHER *EVP_sm4_##mode(void) \
-{ return &sm4_##mode; }
-
-#define DEFINE_BLOCK_CIPHERS(nid,flags)             \
-        BLOCK_CIPHER_generic(nid,16,16,cbc,cbc,CBC,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)     \
-        BLOCK_CIPHER_generic(nid,16,0,ecb,ecb,ECB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)      \
-        BLOCK_CIPHER_generic(nid,1,16,ofb128,ofb,OFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
-        BLOCK_CIPHER_generic(nid,1,16,cfb128,cfb,CFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
-        BLOCK_CIPHER_generic(nid,1,16,ctr,ctr,CTR,flags)
+#define BLOCK_CIPHER_generic(nid, blocksize, ivlen, nmode, mode, MODE, flags) \
+    static const EVP_CIPHER sm4_##mode = {                                    \
+        nid##_##nmode, blocksize, 128 / 8, ivlen,                             \
+        flags | EVP_CIPH_##MODE##_MODE,                                       \
+        EVP_ORIG_GLOBAL,                                                      \
+        sm4_init_key,                                                         \
+        sm4_##mode##_cipher,                                                  \
+        NULL,                                                                 \
+        sizeof(EVP_SM4_KEY),                                                  \
+        NULL, NULL, NULL, NULL                                                \
+    };                                                                        \
+    const EVP_CIPHER *EVP_sm4_##mode(void)                                    \
+    {                                                                         \
+        return &sm4_##mode;                                                   \
+    }
+
+#define DEFINE_BLOCK_CIPHERS(nid, flags)                                                               \
+    BLOCK_CIPHER_generic(nid, 16, 16, cbc, cbc, CBC, flags | EVP_CIPH_FLAG_DEFAULT_ASN1)               \
+        BLOCK_CIPHER_generic(nid, 16, 0, ecb, ecb, ECB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1)            \
+            BLOCK_CIPHER_generic(nid, 1, 16, ofb128, ofb, OFB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1)     \
+                BLOCK_CIPHER_generic(nid, 1, 16, cfb128, cfb, CFB, flags | EVP_CIPH_FLAG_DEFAULT_ASN1) \
+                    BLOCK_CIPHER_generic(nid, 1, 16, ctr, ctr, CTR, flags)
 
 static int sm4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                        const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int mode;
-    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
+    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
 
     mode = EVP_CIPHER_CTX_get_mode(ctx);
     if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
@@ -65,145 +68,145 @@ static int sm4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 #ifdef HWSM4_CAPABLE
         if (HWSM4_CAPABLE) {
             HWSM4_set_decrypt_key(key, &dat->ks.ks);
-            dat->block = (block128_f) HWSM4_decrypt;
+            dat->block = (block128_f)HWSM4_decrypt;
             dat->stream.cbc = NULL;
-# ifdef HWSM4_cbc_encrypt
+#ifdef HWSM4_cbc_encrypt
             if (mode == EVP_CIPH_CBC_MODE)
-                dat->stream.cbc = (cbc128_f) HWSM4_cbc_encrypt;
-# endif
-# ifdef HWSM4_ecb_encrypt
+                dat->stream.cbc = (cbc128_f)HWSM4_cbc_encrypt;
+#endif
+#ifdef HWSM4_ecb_encrypt
             if (mode == EVP_CIPH_ECB_MODE)
-                dat->stream.ecb = (ecb128_f) HWSM4_ecb_encrypt;
-# endif
+                dat->stream.ecb = (ecb128_f)HWSM4_ecb_encrypt;
+#endif
         } else
 #endif
 #ifdef VPSM4_CAPABLE
-        if (VPSM4_CAPABLE) {
+            if (VPSM4_CAPABLE) {
             vpsm4_set_decrypt_key(key, &dat->ks.ks);
-            dat->block = (block128_f) vpsm4_decrypt;
+            dat->block = (block128_f)vpsm4_decrypt;
             dat->stream.cbc = NULL;
             if (mode == EVP_CIPH_CBC_MODE)
-                dat->stream.cbc = (cbc128_f) vpsm4_cbc_encrypt;
+                dat->stream.cbc = (cbc128_f)vpsm4_cbc_encrypt;
             else if (mode == EVP_CIPH_ECB_MODE)
-                dat->stream.ecb = (ecb128_f) vpsm4_ecb_encrypt;
+                dat->stream.ecb = (ecb128_f)vpsm4_ecb_encrypt;
         } else
 #endif
         {
-            dat->block = (block128_f) ossl_sm4_decrypt;
+            dat->block = (block128_f)ossl_sm4_decrypt;
             ossl_sm4_set_key(key, EVP_CIPHER_CTX_get_cipher_data(ctx));
         }
     } else
 #ifdef HWSM4_CAPABLE
-    if (HWSM4_CAPABLE) {
+        if (HWSM4_CAPABLE) {
         HWSM4_set_encrypt_key(key, &dat->ks.ks);
-        dat->block = (block128_f) HWSM4_encrypt;
+        dat->block = (block128_f)HWSM4_encrypt;
         dat->stream.cbc = NULL;
-# ifdef HWSM4_cbc_encrypt
+#ifdef HWSM4_cbc_encrypt
         if (mode == EVP_CIPH_CBC_MODE)
-            dat->stream.cbc = (cbc128_f) HWSM4_cbc_encrypt;
+            dat->stream.cbc = (cbc128_f)HWSM4_cbc_encrypt;
         else
-# endif
-# ifdef HWSM4_ecb_encrypt
-        if (mode == EVP_CIPH_ECB_MODE)
-            dat->stream.ecb = (ecb128_f) HWSM4_ecb_encrypt;
+#endif
+#ifdef HWSM4_ecb_encrypt
+            if (mode == EVP_CIPH_ECB_MODE)
+            dat->stream.ecb = (ecb128_f)HWSM4_ecb_encrypt;
         else
-# endif
-# ifdef HWSM4_ctr32_encrypt_blocks
-        if (mode == EVP_CIPH_CTR_MODE)
-            dat->stream.ctr = (ctr128_f) HWSM4_ctr32_encrypt_blocks;
+#endif
+#ifdef HWSM4_ctr32_encrypt_blocks
+            if (mode == EVP_CIPH_CTR_MODE)
+            dat->stream.ctr = (ctr128_f)HWSM4_ctr32_encrypt_blocks;
         else
-# endif
-            (void)0;            /* terminate potentially open 'else' */
+#endif
+            (void)0; /* terminate potentially open 'else' */
     } else
 #endif
 #ifdef VPSM4_CAPABLE
-    if (VPSM4_CAPABLE) {
+        if (VPSM4_CAPABLE) {
         vpsm4_set_encrypt_key(key, &dat->ks.ks);
-        dat->block = (block128_f) vpsm4_encrypt;
+        dat->block = (block128_f)vpsm4_encrypt;
         dat->stream.cbc = NULL;
         if (mode == EVP_CIPH_CBC_MODE)
-            dat->stream.cbc = (cbc128_f) vpsm4_cbc_encrypt;
+            dat->stream.cbc = (cbc128_f)vpsm4_cbc_encrypt;
         else if (mode == EVP_CIPH_ECB_MODE)
-            dat->stream.ecb = (ecb128_f) vpsm4_ecb_encrypt;
+            dat->stream.ecb = (ecb128_f)vpsm4_ecb_encrypt;
         else if (mode == EVP_CIPH_CTR_MODE)
-            dat->stream.ctr = (ctr128_f) vpsm4_ctr32_encrypt_blocks;
+            dat->stream.ctr = (ctr128_f)vpsm4_ctr32_encrypt_blocks;
     } else
 #endif
     {
-        dat->block = (block128_f) ossl_sm4_encrypt;
+        dat->block = (block128_f)ossl_sm4_encrypt;
         ossl_sm4_set_key(key, EVP_CIPHER_CTX_get_cipher_data(ctx));
     }
     return 1;
 }
 
 static int sm4_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
+    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
 
     if (dat->stream.cbc)
-        (*dat->stream.cbc) (in, out, len, &dat->ks.ks, ctx->iv,
-                            EVP_CIPHER_CTX_is_encrypting(ctx));
+        (*dat->stream.cbc)(in, out, len, &dat->ks.ks, ctx->iv,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
     else if (EVP_CIPHER_CTX_is_encrypting(ctx))
         CRYPTO_cbc128_encrypt(in, out, len, &dat->ks, ctx->iv,
-                              dat->block);
+            dat->block);
     else
         CRYPTO_cbc128_decrypt(in, out, len, &dat->ks,
-                              ctx->iv, dat->block);
+            ctx->iv, dat->block);
     return 1;
 }
 
 static int sm4_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
+    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
     int num = EVP_CIPHER_CTX_get_num(ctx);
 
     CRYPTO_cfb128_encrypt(in, out, len, &dat->ks,
-                          ctx->iv, &num,
-                          EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
+        ctx->iv, &num,
+        EVP_CIPHER_CTX_is_encrypting(ctx), dat->block);
     EVP_CIPHER_CTX_set_num(ctx, num);
     return 1;
 }
 
 static int sm4_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     size_t bl = EVP_CIPHER_CTX_get_block_size(ctx);
     size_t i;
-    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
+    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
 
     if (len < bl)
         return 1;
 
     if (dat->stream.ecb != NULL)
-        (*dat->stream.ecb) (in, out, len, &dat->ks.ks,
-                            EVP_CIPHER_CTX_is_encrypting(ctx));
+        (*dat->stream.ecb)(in, out, len, &dat->ks.ks,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
     else
         for (i = 0, len -= bl; i <= len; i += bl)
-            (*dat->block) (in + i, out + i, &dat->ks);
+            (*dat->block)(in + i, out + i, &dat->ks);
 
     return 1;
 }
 
 static int sm4_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
+    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
     int num = EVP_CIPHER_CTX_get_num(ctx);
 
     CRYPTO_ofb128_encrypt(in, out, len, &dat->ks,
-                          ctx->iv, &num, dat->block);
+        ctx->iv, &num, dat->block);
     EVP_CIPHER_CTX_set_num(ctx, num);
     return 1;
 }
 
 static int sm4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     int n = EVP_CIPHER_CTX_get_num(ctx);
     unsigned int num;
-    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY,ctx);
+    EVP_SM4_KEY *dat = EVP_C_DATA(EVP_SM4_KEY, ctx);
 
     if (n < 0)
         return 0;
@@ -211,14 +214,14 @@ static int sm4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
     if (dat->stream.ctr)
         CRYPTO_ctr128_encrypt_ctr32(in, out, len, &dat->ks,
-                                    ctx->iv,
-                                    EVP_CIPHER_CTX_buf_noconst(ctx),
-                                    &num, dat->stream.ctr);
+            ctx->iv,
+            EVP_CIPHER_CTX_buf_noconst(ctx),
+            &num, dat->stream.ctr);
     else
         CRYPTO_ctr128_encrypt(in, out, len, &dat->ks,
-                              ctx->iv,
-                              EVP_CIPHER_CTX_buf_noconst(ctx), &num,
-                              dat->block);
+            ctx->iv,
+            EVP_CIPHER_CTX_buf_noconst(ctx), &num,
+            dat->block);
     EVP_CIPHER_CTX_set_num(ctx, num);
     return 1;
 }
diff --git a/crypto/evp/e_xcbc_d.c b/crypto/evp/e_xcbc_d.c
index f930941887a36..eaa021be2cf0e 100644
--- a/crypto/evp/e_xcbc_d.c
+++ b/crypto/evp/e_xcbc_d.c
@@ -18,24 +18,24 @@
 
 #ifndef OPENSSL_NO_DES
 
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "crypto/evp.h"
-# include <openssl/des.h>
-# include "evp_local.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include "crypto/evp.h"
+#include <openssl/des.h>
+#include "evp_local.h"
 
 static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inl);
+    const unsigned char *in, size_t inl);
 
 typedef struct {
-    DES_key_schedule ks;        /* key schedule */
+    DES_key_schedule ks; /* key schedule */
     DES_cblock inw;
     DES_cblock outw;
 } DESX_CBC_KEY;
 
-# define data(ctx) EVP_C_DATA(DESX_CBC_KEY,ctx)
+#define data(ctx) EVP_C_DATA(DESX_CBC_KEY, ctx)
 
 static const EVP_CIPHER d_xcbc_cipher = {
     NID_desx_cbc,
@@ -58,7 +58,7 @@ const EVP_CIPHER *EVP_desx_cbc(void)
 }
 
 static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     DES_cblock *deskey = (DES_cblock *)key;
 
@@ -70,22 +70,22 @@ static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     while (inl >= EVP_MAXCHUNK) {
         DES_xcbc_encrypt(in, out, (long)EVP_MAXCHUNK, &data(ctx)->ks,
-                         (DES_cblock *)ctx->iv,
-                         &data(ctx)->inw, &data(ctx)->outw,
-                         EVP_CIPHER_CTX_is_encrypting(ctx));
+            (DES_cblock *)ctx->iv,
+            &data(ctx)->inw, &data(ctx)->outw,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
         inl -= EVP_MAXCHUNK;
         in += EVP_MAXCHUNK;
         out += EVP_MAXCHUNK;
     }
     if (inl)
         DES_xcbc_encrypt(in, out, (long)inl, &data(ctx)->ks,
-                         (DES_cblock *)ctx->iv,
-                         &data(ctx)->inw, &data(ctx)->outw,
-                         EVP_CIPHER_CTX_is_encrypting(ctx));
+            (DES_cblock *)ctx->iv,
+            &data(ctx)->inw, &data(ctx)->outw,
+            EVP_CIPHER_CTX_is_encrypting(ctx));
     return 1;
 }
 #endif
diff --git a/crypto/evp/ec_ctrl.c b/crypto/evp/ec_ctrl.c
index c1cf221a0db53..096f7f18d73ef 100644
--- a/crypto/evp/ec_ctrl.c
+++ b/crypto/evp/ec_ctrl.c
@@ -20,8 +20,7 @@
  * keys.
  */
 
-static ossl_inline
-int evp_pkey_ctx_getset_ecdh_param_checks(const EVP_PKEY_CTX *ctx)
+static ossl_inline int evp_pkey_ctx_getset_ecdh_param_checks(const EVP_PKEY_CTX *ctx)
 {
     if (ctx == NULL || !EVP_PKEY_CTX_IS_DERIVE_OP(ctx)) {
         ERR_raise(ERR_LIB_EVP, EVP_R_COMMAND_NOT_SUPPORTED);
@@ -58,7 +57,7 @@ int EVP_PKEY_CTX_set_ecdh_cofactor_mode(EVP_PKEY_CTX *ctx, int cofactor_mode)
     }
 
     *p++ = OSSL_PARAM_construct_int(OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE,
-                                    &cofactor_mode);
+        &cofactor_mode);
     *p++ = OSSL_PARAM_construct_end();
 
     ret = evp_pkey_ctx_set_params_strict(ctx, params);
@@ -77,7 +76,7 @@ int EVP_PKEY_CTX_get_ecdh_cofactor_mode(EVP_PKEY_CTX *ctx)
         return ret;
 
     *p++ = OSSL_PARAM_construct_int(OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE,
-                                    &mode);
+        &mode);
     *p++ = OSSL_PARAM_construct_end();
 
     ret = evp_pkey_ctx_get_params_strict(ctx, params);
@@ -111,7 +110,7 @@ int EVP_PKEY_CTX_get_ecdh_cofactor_mode(EVP_PKEY_CTX *ctx)
 int EVP_PKEY_CTX_set_ecdh_kdf_type(EVP_PKEY_CTX *ctx, int kdf)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_DERIVE,
-                             EVP_PKEY_CTRL_EC_KDF_TYPE, kdf, NULL);
+        EVP_PKEY_CTRL_EC_KDF_TYPE, kdf, NULL);
 }
 
 /*
@@ -121,7 +120,7 @@ int EVP_PKEY_CTX_set_ecdh_kdf_type(EVP_PKEY_CTX *ctx, int kdf)
 int EVP_PKEY_CTX_get_ecdh_kdf_type(EVP_PKEY_CTX *ctx)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_DERIVE,
-                             EVP_PKEY_CTRL_EC_KDF_TYPE, -2, NULL);
+        EVP_PKEY_CTRL_EC_KDF_TYPE, -2, NULL);
 }
 
 /*
@@ -131,7 +130,7 @@ int EVP_PKEY_CTX_get_ecdh_kdf_type(EVP_PKEY_CTX *ctx)
 int EVP_PKEY_CTX_set_ecdh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_DERIVE,
-                             EVP_PKEY_CTRL_EC_KDF_MD, 0, (void *)(md));
+        EVP_PKEY_CTRL_EC_KDF_MD, 0, (void *)(md));
 }
 
 /*
@@ -141,7 +140,7 @@ int EVP_PKEY_CTX_set_ecdh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
 int EVP_PKEY_CTX_get_ecdh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD **pmd)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_DERIVE,
-                             EVP_PKEY_CTRL_GET_EC_KDF_MD, 0, (void *)(pmd));
+        EVP_PKEY_CTRL_GET_EC_KDF_MD, 0, (void *)(pmd));
 }
 
 int EVP_PKEY_CTX_set_ecdh_kdf_outlen(EVP_PKEY_CTX *ctx, int outlen)
@@ -164,7 +163,7 @@ int EVP_PKEY_CTX_set_ecdh_kdf_outlen(EVP_PKEY_CTX *ctx, int outlen)
     }
 
     *p++ = OSSL_PARAM_construct_size_t(OSSL_EXCHANGE_PARAM_KDF_OUTLEN,
-                                       &len);
+        &len);
     *p++ = OSSL_PARAM_construct_end();
 
     ret = evp_pkey_ctx_set_params_strict(ctx, params);
@@ -184,7 +183,7 @@ int EVP_PKEY_CTX_get_ecdh_kdf_outlen(EVP_PKEY_CTX *ctx, int *plen)
         return ret;
 
     *p++ = OSSL_PARAM_construct_size_t(OSSL_EXCHANGE_PARAM_KDF_OUTLEN,
-                                       &len);
+        &len);
     *p++ = OSSL_PARAM_construct_end();
 
     ret = evp_pkey_ctx_get_params_strict(ctx, params);
@@ -217,12 +216,12 @@ int EVP_PKEY_CTX_set0_ecdh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char *ukm, int le
         return ret;
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_EXCHANGE_PARAM_KDF_UKM,
-                                            /*
-                                             * Cast away the const. This is read
-                                             * only so should be safe
-                                             */
-                                            (void *)ukm,
-                                            (size_t)len);
+        /*
+         * Cast away the const. This is read
+         * only so should be safe
+         */
+        (void *)ukm,
+        (size_t)len);
     *p++ = OSSL_PARAM_construct_end();
 
     ret = evp_pkey_ctx_set_params_strict(ctx, params);
@@ -251,7 +250,7 @@ int EVP_PKEY_CTX_get0_ecdh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **pukm)
         return ret;
 
     *p++ = OSSL_PARAM_construct_octet_ptr(OSSL_EXCHANGE_PARAM_KDF_UKM,
-                                          (void **)pukm, 0);
+        (void **)pukm, 0);
     *p++ = OSSL_PARAM_construct_end();
 
     ret = evp_pkey_ctx_get_params_strict(ctx, params);
@@ -286,8 +285,8 @@ int EVP_PKEY_CTX_set_ec_paramgen_curve_nid(EVP_PKEY_CTX *ctx, int nid)
     int keytype = nid == EVP_PKEY_SM2 ? EVP_PKEY_SM2 : EVP_PKEY_EC;
 
     return EVP_PKEY_CTX_ctrl(ctx, keytype, EVP_PKEY_OP_TYPE_GEN,
-                             EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID,
-                             nid, NULL);
+        EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID,
+        nid, NULL);
 }
 
 /*
@@ -297,6 +296,6 @@ 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)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_TYPE_GEN,
-                             EVP_PKEY_CTRL_EC_PARAM_ENC, param_enc, NULL);
+        EVP_PKEY_CTRL_EC_PARAM_ENC, param_enc, NULL);
 }
 #endif
diff --git a/crypto/evp/ec_support.c b/crypto/evp/ec_support.c
index 1ec10143d2de7..20883c48f10d6 100644
--- a/crypto/evp/ec_support.c
+++ b/crypto/evp/ec_support.c
@@ -20,99 +20,99 @@ typedef struct ec_name2nid_st {
 static const EC_NAME2NID curve_list[] = {
     /* prime field curves */
     /* secg curves */
-    {"secp112r1", NID_secp112r1 },
-    {"secp112r2", NID_secp112r2 },
-    {"secp128r1", NID_secp128r1 },
-    {"secp128r2", NID_secp128r2 },
-    {"secp160k1", NID_secp160k1 },
-    {"secp160r1", NID_secp160r1 },
-    {"secp160r2", NID_secp160r2 },
-    {"secp192k1", NID_secp192k1 },
-    {"secp224k1", NID_secp224k1 },
-    {"secp224r1", NID_secp224r1 },
-    {"secp256k1", NID_secp256k1 },
-    {"secp384r1", NID_secp384r1 },
-    {"secp521r1", NID_secp521r1 },
+    { "secp112r1", NID_secp112r1 },
+    { "secp112r2", NID_secp112r2 },
+    { "secp128r1", NID_secp128r1 },
+    { "secp128r2", NID_secp128r2 },
+    { "secp160k1", NID_secp160k1 },
+    { "secp160r1", NID_secp160r1 },
+    { "secp160r2", NID_secp160r2 },
+    { "secp192k1", NID_secp192k1 },
+    { "secp224k1", NID_secp224k1 },
+    { "secp224r1", NID_secp224r1 },
+    { "secp256k1", NID_secp256k1 },
+    { "secp384r1", NID_secp384r1 },
+    { "secp521r1", NID_secp521r1 },
     /* X9.62 curves */
-    {"prime192v1", NID_X9_62_prime192v1 },
-    {"prime192v2", NID_X9_62_prime192v2 },
-    {"prime192v3", NID_X9_62_prime192v3 },
-    {"prime239v1", NID_X9_62_prime239v1 },
-    {"prime239v2", NID_X9_62_prime239v2 },
-    {"prime239v3", NID_X9_62_prime239v3 },
-    {"prime256v1", NID_X9_62_prime256v1 },
+    { "prime192v1", NID_X9_62_prime192v1 },
+    { "prime192v2", NID_X9_62_prime192v2 },
+    { "prime192v3", NID_X9_62_prime192v3 },
+    { "prime239v1", NID_X9_62_prime239v1 },
+    { "prime239v2", NID_X9_62_prime239v2 },
+    { "prime239v3", NID_X9_62_prime239v3 },
+    { "prime256v1", NID_X9_62_prime256v1 },
     /* characteristic two field curves */
     /* NIST/SECG curves */
-    {"sect113r1", NID_sect113r1 },
-    {"sect113r2", NID_sect113r2 },
-    {"sect131r1", NID_sect131r1 },
-    {"sect131r2", NID_sect131r2 },
-    {"sect163k1", NID_sect163k1 },
-    {"sect163r1", NID_sect163r1 },
-    {"sect163r2", NID_sect163r2 },
-    {"sect193r1", NID_sect193r1 },
-    {"sect193r2", NID_sect193r2 },
-    {"sect233k1", NID_sect233k1 },
-    {"sect233r1", NID_sect233r1 },
-    {"sect239k1", NID_sect239k1 },
-    {"sect283k1", NID_sect283k1 },
-    {"sect283r1", NID_sect283r1 },
-    {"sect409k1", NID_sect409k1 },
-    {"sect409r1", NID_sect409r1 },
-    {"sect571k1", NID_sect571k1 },
-    {"sect571r1", NID_sect571r1 },
+    { "sect113r1", NID_sect113r1 },
+    { "sect113r2", NID_sect113r2 },
+    { "sect131r1", NID_sect131r1 },
+    { "sect131r2", NID_sect131r2 },
+    { "sect163k1", NID_sect163k1 },
+    { "sect163r1", NID_sect163r1 },
+    { "sect163r2", NID_sect163r2 },
+    { "sect193r1", NID_sect193r1 },
+    { "sect193r2", NID_sect193r2 },
+    { "sect233k1", NID_sect233k1 },
+    { "sect233r1", NID_sect233r1 },
+    { "sect239k1", NID_sect239k1 },
+    { "sect283k1", NID_sect283k1 },
+    { "sect283r1", NID_sect283r1 },
+    { "sect409k1", NID_sect409k1 },
+    { "sect409r1", NID_sect409r1 },
+    { "sect571k1", NID_sect571k1 },
+    { "sect571r1", NID_sect571r1 },
     /* X9.62 curves */
-    {"c2pnb163v1", NID_X9_62_c2pnb163v1 },
-    {"c2pnb163v2", NID_X9_62_c2pnb163v2 },
-    {"c2pnb163v3", NID_X9_62_c2pnb163v3 },
-    {"c2pnb176v1", NID_X9_62_c2pnb176v1 },
-    {"c2tnb191v1", NID_X9_62_c2tnb191v1 },
-    {"c2tnb191v2", NID_X9_62_c2tnb191v2 },
-    {"c2tnb191v3", NID_X9_62_c2tnb191v3 },
-    {"c2pnb208w1", NID_X9_62_c2pnb208w1 },
-    {"c2tnb239v1", NID_X9_62_c2tnb239v1 },
-    {"c2tnb239v2", NID_X9_62_c2tnb239v2 },
-    {"c2tnb239v3", NID_X9_62_c2tnb239v3 },
-    {"c2pnb272w1", NID_X9_62_c2pnb272w1 },
-    {"c2pnb304w1", NID_X9_62_c2pnb304w1 },
-    {"c2tnb359v1", NID_X9_62_c2tnb359v1 },
-    {"c2pnb368w1", NID_X9_62_c2pnb368w1 },
-    {"c2tnb431r1", NID_X9_62_c2tnb431r1 },
+    { "c2pnb163v1", NID_X9_62_c2pnb163v1 },
+    { "c2pnb163v2", NID_X9_62_c2pnb163v2 },
+    { "c2pnb163v3", NID_X9_62_c2pnb163v3 },
+    { "c2pnb176v1", NID_X9_62_c2pnb176v1 },
+    { "c2tnb191v1", NID_X9_62_c2tnb191v1 },
+    { "c2tnb191v2", NID_X9_62_c2tnb191v2 },
+    { "c2tnb191v3", NID_X9_62_c2tnb191v3 },
+    { "c2pnb208w1", NID_X9_62_c2pnb208w1 },
+    { "c2tnb239v1", NID_X9_62_c2tnb239v1 },
+    { "c2tnb239v2", NID_X9_62_c2tnb239v2 },
+    { "c2tnb239v3", NID_X9_62_c2tnb239v3 },
+    { "c2pnb272w1", NID_X9_62_c2pnb272w1 },
+    { "c2pnb304w1", NID_X9_62_c2pnb304w1 },
+    { "c2tnb359v1", NID_X9_62_c2tnb359v1 },
+    { "c2pnb368w1", NID_X9_62_c2pnb368w1 },
+    { "c2tnb431r1", NID_X9_62_c2tnb431r1 },
     /*
      * the WAP/WTLS curves [unlike SECG, spec has its own OIDs for curves
      * from X9.62]
      */
-    {"wap-wsg-idm-ecid-wtls1", NID_wap_wsg_idm_ecid_wtls1 },
-    {"wap-wsg-idm-ecid-wtls3", NID_wap_wsg_idm_ecid_wtls3 },
-    {"wap-wsg-idm-ecid-wtls4", NID_wap_wsg_idm_ecid_wtls4 },
-    {"wap-wsg-idm-ecid-wtls5", NID_wap_wsg_idm_ecid_wtls5 },
-    {"wap-wsg-idm-ecid-wtls6", NID_wap_wsg_idm_ecid_wtls6 },
-    {"wap-wsg-idm-ecid-wtls7", NID_wap_wsg_idm_ecid_wtls7 },
-    {"wap-wsg-idm-ecid-wtls8", NID_wap_wsg_idm_ecid_wtls8 },
-    {"wap-wsg-idm-ecid-wtls9", NID_wap_wsg_idm_ecid_wtls9 },
-    {"wap-wsg-idm-ecid-wtls10", NID_wap_wsg_idm_ecid_wtls10 },
-    {"wap-wsg-idm-ecid-wtls11", NID_wap_wsg_idm_ecid_wtls11 },
-    {"wap-wsg-idm-ecid-wtls12", NID_wap_wsg_idm_ecid_wtls12 },
+    { "wap-wsg-idm-ecid-wtls1", NID_wap_wsg_idm_ecid_wtls1 },
+    { "wap-wsg-idm-ecid-wtls3", NID_wap_wsg_idm_ecid_wtls3 },
+    { "wap-wsg-idm-ecid-wtls4", NID_wap_wsg_idm_ecid_wtls4 },
+    { "wap-wsg-idm-ecid-wtls5", NID_wap_wsg_idm_ecid_wtls5 },
+    { "wap-wsg-idm-ecid-wtls6", NID_wap_wsg_idm_ecid_wtls6 },
+    { "wap-wsg-idm-ecid-wtls7", NID_wap_wsg_idm_ecid_wtls7 },
+    { "wap-wsg-idm-ecid-wtls8", NID_wap_wsg_idm_ecid_wtls8 },
+    { "wap-wsg-idm-ecid-wtls9", NID_wap_wsg_idm_ecid_wtls9 },
+    { "wap-wsg-idm-ecid-wtls10", NID_wap_wsg_idm_ecid_wtls10 },
+    { "wap-wsg-idm-ecid-wtls11", NID_wap_wsg_idm_ecid_wtls11 },
+    { "wap-wsg-idm-ecid-wtls12", NID_wap_wsg_idm_ecid_wtls12 },
     /* IPSec curves */
-    {"Oakley-EC2N-3", NID_ipsec3 },
-    {"Oakley-EC2N-4", NID_ipsec4 },
+    { "Oakley-EC2N-3", NID_ipsec3 },
+    { "Oakley-EC2N-4", NID_ipsec4 },
     /* brainpool curves */
-    {"brainpoolP160r1", NID_brainpoolP160r1 },
-    {"brainpoolP160t1", NID_brainpoolP160t1 },
-    {"brainpoolP192r1", NID_brainpoolP192r1 },
-    {"brainpoolP192t1", NID_brainpoolP192t1 },
-    {"brainpoolP224r1", NID_brainpoolP224r1 },
-    {"brainpoolP224t1", NID_brainpoolP224t1 },
-    {"brainpoolP256r1", NID_brainpoolP256r1 },
-    {"brainpoolP256t1", NID_brainpoolP256t1 },
-    {"brainpoolP320r1", NID_brainpoolP320r1 },
-    {"brainpoolP320t1", NID_brainpoolP320t1 },
-    {"brainpoolP384r1", NID_brainpoolP384r1 },
-    {"brainpoolP384t1", NID_brainpoolP384t1 },
-    {"brainpoolP512r1", NID_brainpoolP512r1 },
-    {"brainpoolP512t1", NID_brainpoolP512t1 },
+    { "brainpoolP160r1", NID_brainpoolP160r1 },
+    { "brainpoolP160t1", NID_brainpoolP160t1 },
+    { "brainpoolP192r1", NID_brainpoolP192r1 },
+    { "brainpoolP192t1", NID_brainpoolP192t1 },
+    { "brainpoolP224r1", NID_brainpoolP224r1 },
+    { "brainpoolP224t1", NID_brainpoolP224t1 },
+    { "brainpoolP256r1", NID_brainpoolP256r1 },
+    { "brainpoolP256t1", NID_brainpoolP256t1 },
+    { "brainpoolP320r1", NID_brainpoolP320r1 },
+    { "brainpoolP320t1", NID_brainpoolP320t1 },
+    { "brainpoolP384r1", NID_brainpoolP384r1 },
+    { "brainpoolP384t1", NID_brainpoolP384t1 },
+    { "brainpoolP512r1", NID_brainpoolP512r1 },
+    { "brainpoolP512t1", NID_brainpoolP512t1 },
     /* SM2 curve */
-    {"SM2", NID_sm2 },
+    { "SM2", NID_sm2 },
 };
 
 const char *OSSL_EC_curve_nid2name(int nid)
@@ -150,21 +150,21 @@ int ossl_ec_curve_name2nid(const char *name)
 /* Functions to translate between common NIST curve names and NIDs */
 
 static const EC_NAME2NID nist_curves[] = {
-    {"B-163", NID_sect163r2},
-    {"B-233", NID_sect233r1},
-    {"B-283", NID_sect283r1},
-    {"B-409", NID_sect409r1},
-    {"B-571", NID_sect571r1},
-    {"K-163", NID_sect163k1},
-    {"K-233", NID_sect233k1},
-    {"K-283", NID_sect283k1},
-    {"K-409", NID_sect409k1},
-    {"K-571", NID_sect571k1},
-    {"P-192", NID_X9_62_prime192v1},
-    {"P-224", NID_secp224r1},
-    {"P-256", NID_X9_62_prime256v1},
-    {"P-384", NID_secp384r1},
-    {"P-521", NID_secp521r1}
+    { "B-163", NID_sect163r2 },
+    { "B-233", NID_sect233r1 },
+    { "B-283", NID_sect283r1 },
+    { "B-409", NID_sect409r1 },
+    { "B-571", NID_sect571r1 },
+    { "K-163", NID_sect163k1 },
+    { "K-233", NID_sect233k1 },
+    { "K-283", NID_sect283k1 },
+    { "K-409", NID_sect409k1 },
+    { "K-571", NID_sect571k1 },
+    { "P-192", NID_X9_62_prime192v1 },
+    { "P-224", NID_secp224r1 },
+    { "P-256", NID_X9_62_prime256v1 },
+    { "P-384", NID_secp384r1 },
+    { "P-521", NID_secp521r1 }
 };
 
 const char *ossl_ec_curve_nid2nist_int(int nid)
diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c
index 9bbb9b43aa420..ceeaea5f11451 100644
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c
@@ -15,14 +15,14 @@
 #include "evp_local.h"
 
 static unsigned char conv_ascii2bin(unsigned char a,
-                                    const unsigned char *table);
+    const unsigned char *table);
 static int evp_encodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
-                               const unsigned char *f, int dlen);
+    const unsigned char *f, int dlen);
 static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
-                               const unsigned char *f, int n, int eof);
+    const unsigned char *f, int n, int eof);
 
 #ifndef CHARSET_EBCDIC
-# define conv_bin2ascii(a, table)       ((table)[(a)&0x3f])
+#define conv_bin2ascii(a, table) ((table)[(a) & 0x3f])
 #else
 /*
  * We assume that PEM encoded files are EBCDIC files (i.e., printable text
@@ -30,7 +30,7 @@ static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
  * (text) format again. (No need for conversion in the conv_bin2ascii macro,
  * as the underlying textstring data_bin2ascii[] is already EBCDIC)
  */
-# define conv_bin2ascii(a, table)       ((table)[(a)&0x3f])
+#define conv_bin2ascii(a, table) ((table)[(a) & 0x3f])
 #endif
 
 /*-
@@ -41,17 +41,14 @@ static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
  * 2 bytes => xxx=
  * 3 bytes => xxxx
  */
-#define BIN_PER_LINE    (64/4*3)
-#define CHUNKS_PER_LINE (64/4)
-#define CHAR_PER_LINE   (64+1)
+#define BIN_PER_LINE (64 / 4 * 3)
+#define CHUNKS_PER_LINE (64 / 4)
+#define CHAR_PER_LINE (64 + 1)
 
-static const unsigned char data_bin2ascii[65] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static const unsigned char data_bin2ascii[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 /* SRP uses a different base64 alphabet */
-static const unsigned char srpdata_bin2ascii[65] =
-    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz./";
-
+static const unsigned char srpdata_bin2ascii[65] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz./";
 
 /*-
  * 0xF0 is a EOLN
@@ -61,50 +58,274 @@ static const unsigned char srpdata_bin2ascii[65] =
  * 0xFF is error
  */
 
-#define B64_EOLN                0xF0
-#define B64_CR                  0xF1
-#define B64_EOF                 0xF2
-#define B64_WS                  0xE0
-#define B64_ERROR               0xFF
-#define B64_NOT_BASE64(a)       (((a)|0x13) == 0xF3)
-#define B64_BASE64(a)           (!B64_NOT_BASE64(a))
+#define B64_EOLN 0xF0
+#define B64_CR 0xF1
+#define B64_EOF 0xF2
+#define B64_WS 0xE0
+#define B64_ERROR 0xFF
+#define B64_NOT_BASE64(a) (((a) | 0x13) == 0xF3)
+#define B64_BASE64(a) (!B64_NOT_BASE64(a))
 
 static const unsigned char data_ascii2bin[128] = {
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xE0, 0xF0, 0xFF, 0xFF, 0xF1, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0x3E, 0xFF, 0xF2, 0xFF, 0x3F,
-    0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
-    0x3C, 0x3D, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
-    0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
-    0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
-    0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
-    0x17, 0x18, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
-    0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-    0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30,
-    0x31, 0x32, 0x33, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xE0,
+    0xF0,
+    0xFF,
+    0xFF,
+    0xF1,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xE0,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0x3E,
+    0xFF,
+    0xF2,
+    0xFF,
+    0x3F,
+    0x34,
+    0x35,
+    0x36,
+    0x37,
+    0x38,
+    0x39,
+    0x3A,
+    0x3B,
+    0x3C,
+    0x3D,
+    0xFF,
+    0xFF,
+    0xFF,
+    0x00,
+    0xFF,
+    0xFF,
+    0xFF,
+    0x00,
+    0x01,
+    0x02,
+    0x03,
+    0x04,
+    0x05,
+    0x06,
+    0x07,
+    0x08,
+    0x09,
+    0x0A,
+    0x0B,
+    0x0C,
+    0x0D,
+    0x0E,
+    0x0F,
+    0x10,
+    0x11,
+    0x12,
+    0x13,
+    0x14,
+    0x15,
+    0x16,
+    0x17,
+    0x18,
+    0x19,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0x1A,
+    0x1B,
+    0x1C,
+    0x1D,
+    0x1E,
+    0x1F,
+    0x20,
+    0x21,
+    0x22,
+    0x23,
+    0x24,
+    0x25,
+    0x26,
+    0x27,
+    0x28,
+    0x29,
+    0x2A,
+    0x2B,
+    0x2C,
+    0x2D,
+    0x2E,
+    0x2F,
+    0x30,
+    0x31,
+    0x32,
+    0x33,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
 };
 
 static const unsigned char srpdata_ascii2bin[128] = {
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xE0, 0xF0, 0xFF, 0xFF, 0xF1, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x3E, 0x3F,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF,
-    0xFF, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10,
-    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-    0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
-    0x21, 0x22, 0x23, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A,
-    0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32,
-    0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A,
-    0x3B, 0x3C, 0x3D, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xE0,
+    0xF0,
+    0xFF,
+    0xFF,
+    0xF1,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xE0,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xF2,
+    0x3E,
+    0x3F,
+    0x00,
+    0x01,
+    0x02,
+    0x03,
+    0x04,
+    0x05,
+    0x06,
+    0x07,
+    0x08,
+    0x09,
+    0xFF,
+    0xFF,
+    0xFF,
+    0x00,
+    0xFF,
+    0xFF,
+    0xFF,
+    0x0A,
+    0x0B,
+    0x0C,
+    0x0D,
+    0x0E,
+    0x0F,
+    0x10,
+    0x11,
+    0x12,
+    0x13,
+    0x14,
+    0x15,
+    0x16,
+    0x17,
+    0x18,
+    0x19,
+    0x1A,
+    0x1B,
+    0x1C,
+    0x1D,
+    0x1E,
+    0x1F,
+    0x20,
+    0x21,
+    0x22,
+    0x23,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0x24,
+    0x25,
+    0x26,
+    0x27,
+    0x28,
+    0x29,
+    0x2A,
+    0x2B,
+    0x2C,
+    0x2D,
+    0x2E,
+    0x2F,
+    0x30,
+    0x31,
+    0x32,
+    0x33,
+    0x34,
+    0x35,
+    0x36,
+    0x37,
+    0x38,
+    0x39,
+    0x3A,
+    0x3B,
+    0x3C,
+    0x3D,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
 };
 
 #ifndef CHARSET_EBCDIC
@@ -160,7 +381,7 @@ 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)
 {
     int i, j;
     size_t total = 0;
@@ -229,7 +450,7 @@ void EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl)
 }
 
 static int evp_encodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
-                               const unsigned char *f, int dlen)
+    const unsigned char *f, int dlen)
 {
     int i, ret = 0;
     unsigned long l;
@@ -242,8 +463,7 @@ static int evp_encodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
 
     for (i = dlen; i > 0; i -= 3) {
         if (i >= 3) {
-            l = (((unsigned long)f[0]) << 16L) |
-                (((unsigned long)f[1]) << 8L) | f[2];
+            l = (((unsigned long)f[0]) << 16L) | (((unsigned long)f[1]) << 8L) | f[2];
             *(t++) = conv_bin2ascii(l >> 18L, table);
             *(t++) = conv_bin2ascii(l >> 12L, table);
             *(t++) = conv_bin2ascii(l >> 6L, table);
@@ -301,7 +521,7 @@ void EVP_DecodeInit(EVP_ENCODE_CTX *ctx)
  *   - B64_EOF is detected after an incomplete base64 block.
  */
 int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
-                     const unsigned char *in, int inl)
+    const unsigned char *in, int inl)
 {
     int seof = 0, eof = 0, rv = -1, ret = 0, i, v, tmp, n, decoded_len;
     unsigned char *d;
@@ -316,7 +536,7 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
             eof++;
     }
 
-     /* Legacy behaviour: an empty input chunk signals end of input. */
+    /* Legacy behaviour: an empty input chunk signals end of input. */
     if (inl == 0) {
         rv = 0;
         goto end;
@@ -411,8 +631,8 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
 }
 
 static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
-                               const unsigned char *f, int n,
-                               int eof)
+    const unsigned char *f, int n,
+    int eof)
 {
     int i, ret = 0, a, b, c, d;
     unsigned long l;
@@ -452,9 +672,7 @@ static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
         d = conv_ascii2bin(*(f++), table);
         if ((a | b | c | d) & 0x80)
             return -1;
-        l = ((((unsigned long)a) << 18L) |
-             (((unsigned long)b) << 12L) |
-             (((unsigned long)c) << 6L) | (((unsigned long)d)));
+        l = ((((unsigned long)a) << 18L) | (((unsigned long)b) << 12L) | (((unsigned long)c) << 6L) | (((unsigned long)d)));
         *(t++) = (unsigned char)(l >> 16L) & 0xff;
         *(t++) = (unsigned char)(l >> 8L) & 0xff;
         *(t++) = (unsigned char)(l) & 0xff;
@@ -468,9 +686,7 @@ static int evp_decodeblock_int(EVP_ENCODE_CTX *ctx, unsigned char *t,
     d = conv_ascii2bin(*(f++), table);
     if ((a | b | c | d) & 0x80)
         return -1;
-    l = ((((unsigned long)a) << 18L) |
-         (((unsigned long)b) << 12L) |
-         (((unsigned long)c) << 6L) | (((unsigned long)d)));
+    l = ((((unsigned long)a) << 18L) | (((unsigned long)b) << 12L) | (((unsigned long)c) << 6L) | (((unsigned long)d)));
 
     if (eof == -1)
         eof = (f[2] == '=') + (f[3] == '=');
diff --git a/crypto/evp/evp_cnf.c b/crypto/evp/evp_cnf.c
index 0e7fe64cf92e4..184bab933ca0c 100644
--- a/crypto/evp/evp_cnf.c
+++ b/crypto/evp/evp_cnf.c
@@ -26,7 +26,7 @@ static int alg_module_init(CONF_IMODULE *md, const CONF *cnf)
     CONF_VALUE *oval;
 
     OSSL_TRACE2(CONF, "Loading EVP module: name %s, value %s\n",
-                CONF_imodule_get_name(md), CONF_imodule_get_value(md));
+        CONF_imodule_get_name(md), CONF_imodule_get_value(md));
 
     oid_section = CONF_imodule_get_value(md);
     if ((sktmp = NCONF_get_section(cnf, oid_section)) == NULL) {
@@ -53,16 +53,15 @@ static int alg_module_init(CONF_IMODULE *md, const CONF *cnf)
             }
         } else if (strcmp(oval->name, "default_properties") == 0) {
             if (!evp_set_default_properties_int(NCONF_get0_libctx((CONF *)cnf),
-                        oval->value, 0, 0)) {
+                    oval->value, 0, 0)) {
                 ERR_raise(ERR_LIB_EVP, EVP_R_SET_DEFAULT_PROPERTY_FAILURE);
                 return 0;
             }
         } else {
             ERR_raise_data(ERR_LIB_EVP, EVP_R_UNKNOWN_OPTION,
-                           "name=%s, value=%s", oval->name, oval->value);
+                "name=%s, value=%s", oval->name, oval->value);
             return 0;
         }
-
     }
     return 1;
 }
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index eee00a07800d5..5584e06d7e38d 100644
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -17,7 +17,7 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include <openssl/params.h>
 #include <openssl/core_names.h>
@@ -51,7 +51,7 @@ int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx)
     return 1;
 
     /* Remove legacy code below when legacy support is removed. */
- legacy:
+legacy:
 
     if (ctx->cipher != NULL) {
         if (ctx->cipher->cleanup && !ctx->cipher->cleanup(ctx))
@@ -90,11 +90,11 @@ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
 }
 
 static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
-                                    const EVP_CIPHER *cipher,
-                                    ENGINE *impl, const unsigned char *key,
-                                    const unsigned char *iv, int enc,
-                                    uint8_t is_pipeline,
-                                    const OSSL_PARAM params[])
+    const EVP_CIPHER *cipher,
+    ENGINE *impl, const unsigned char *key,
+    const unsigned char *iv, int enc,
+    uint8_t is_pipeline,
+    const OSSL_PARAM params[])
 {
     int n;
 #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
@@ -135,7 +135,7 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
         goto skip_to_init;
 
     if (cipher != NULL && impl == NULL) {
-         /* Ask if an ENGINE is reserved for this job */
+        /* Ask if an ENGINE is reserved for this job */
         tmpimpl = ENGINE_get_cipher_engine(cipher->nid);
     }
 #endif
@@ -145,12 +145,12 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
      */
     if (ctx->engine != NULL
 #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
-            || tmpimpl != NULL
+        || tmpimpl != NULL
 #endif
-            || impl != NULL
-            || (cipher != NULL && cipher->origin == EVP_ORIG_METH)
-            || (cipher == NULL && ctx->cipher != NULL
-                               && ctx->cipher->origin == EVP_ORIG_METH)) {
+        || impl != NULL
+        || (cipher != NULL && cipher->origin == EVP_ORIG_METH)
+        || (cipher == NULL && ctx->cipher != NULL
+            && ctx->cipher->origin == EVP_ORIG_METH)) {
         if (ctx->cipher == ctx->fetched_cipher)
             ctx->cipher = NULL;
         EVP_CIPHER_free(ctx->fetched_cipher);
@@ -189,11 +189,10 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
         return 0;
 #else
-        EVP_CIPHER *provciph =
-            EVP_CIPHER_fetch(NULL,
-                             cipher->nid == NID_undef ? "NULL"
-                                                      : OBJ_nid2sn(cipher->nid),
-                             "");
+        EVP_CIPHER *provciph = EVP_CIPHER_fetch(NULL,
+            cipher->nid == NID_undef ? "NULL"
+                                     : OBJ_nid2sn(cipher->nid),
+            "");
 
         if (provciph == NULL)
             return 0;
@@ -253,7 +252,7 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
      */
     if (params != NULL) {
         OSSL_PARAM param_lens[3] = { OSSL_PARAM_END, OSSL_PARAM_END,
-                                     OSSL_PARAM_END };
+            OSSL_PARAM_END };
         OSSL_PARAM *q = param_lens;
         const OSSL_PARAM *p;
 
@@ -289,23 +288,23 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
              */
             if (key == NULL && ctx->cipher->einit_skey != NULL) {
                 return ctx->cipher->einit_skey(ctx->algctx, NULL,
-                                               iv,
-                                               iv == NULL ? 0
-                                                          : EVP_CIPHER_CTX_get_iv_length(ctx),
-                                               params);
+                    iv,
+                    iv == NULL ? 0
+                               : EVP_CIPHER_CTX_get_iv_length(ctx),
+                    params);
             }
             ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
             return 0;
         }
 
         return ctx->cipher->einit(ctx->algctx,
-                                  key,
-                                  key == NULL ? 0
-                                              : EVP_CIPHER_CTX_get_key_length(ctx),
-                                  iv,
-                                  iv == NULL ? 0
-                                             : EVP_CIPHER_CTX_get_iv_length(ctx),
-                                  params);
+            key,
+            key == NULL ? 0
+                        : EVP_CIPHER_CTX_get_key_length(ctx),
+            iv,
+            iv == NULL ? 0
+                       : EVP_CIPHER_CTX_get_iv_length(ctx),
+            params);
     }
 
     if (ctx->cipher->dinit == NULL) {
@@ -315,26 +314,26 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
          */
         if (key == NULL && ctx->cipher->dinit_skey != NULL) {
             return ctx->cipher->dinit_skey(ctx->algctx, NULL,
-                                           iv,
-                                           iv == NULL ? 0
-                                                      : EVP_CIPHER_CTX_get_iv_length(ctx),
-                                           params);
+                iv,
+                iv == NULL ? 0
+                           : EVP_CIPHER_CTX_get_iv_length(ctx),
+                params);
         }
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
         return 0;
     }
 
     return ctx->cipher->dinit(ctx->algctx,
-                              key,
-                              key == NULL ? 0
-                                          : EVP_CIPHER_CTX_get_key_length(ctx),
-                              iv,
-                              iv == NULL ? 0
-                                         : EVP_CIPHER_CTX_get_iv_length(ctx),
-                                  params);
+        key,
+        key == NULL ? 0
+                    : EVP_CIPHER_CTX_get_key_length(ctx),
+        iv,
+        iv == NULL ? 0
+                   : EVP_CIPHER_CTX_get_iv_length(ctx),
+        params);
 
     /* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
 
     if (cipher != NULL) {
         /*
@@ -405,15 +404,15 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
         }
     }
 #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
- skip_to_init:
+skip_to_init:
 #endif
     if (ctx->cipher == NULL)
         return 0;
 
     /* we assume block size is a power of 2 in *cryptUpdate */
     OPENSSL_assert(ctx->cipher->block_size == 1
-                   || ctx->cipher->block_size == 8
-                   || ctx->cipher->block_size == 16);
+        || ctx->cipher->block_size == 8
+        || ctx->cipher->block_size == 16);
 
     if (!(ctx->flags & EVP_CIPHER_CTX_FLAG_WRAP_ALLOW)
         && EVP_CIPHER_CTX_get_mode(ctx) == EVP_CIPH_WRAP_MODE) {
@@ -422,7 +421,8 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
     }
 
     if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
-                & EVP_CIPH_CUSTOM_IV) == 0) {
+            & EVP_CIPH_CUSTOM_IV)
+        == 0) {
         switch (EVP_CIPHER_CTX_get_mode(ctx)) {
 
         case EVP_CIPH_STREAM_CIPHER:
@@ -479,10 +479,10 @@ static int evp_cipher_init_internal(EVP_CIPHER_CTX *ctx,
  * They should be combined when engines are not supported any longer.
  */
 static int evp_cipher_init_skey_internal(EVP_CIPHER_CTX *ctx,
-                                         const EVP_CIPHER *cipher,
-                                         const EVP_SKEY *skey,
-                                         const unsigned char *iv, size_t iv_len,
-                                         int enc, const OSSL_PARAM params[])
+    const EVP_CIPHER *cipher,
+    const EVP_SKEY *skey,
+    const unsigned char *iv, size_t iv_len,
+    int enc, const OSSL_PARAM params[])
 {
     int ret;
 
@@ -505,9 +505,9 @@ static int evp_cipher_init_skey_internal(EVP_CIPHER_CTX *ctx,
      * If there are engines involved then we throw an error
      */
     if (ctx->engine != NULL
-            || (cipher != NULL && cipher->origin == EVP_ORIG_METH)
-            || (cipher == NULL && ctx->cipher != NULL
-                && ctx->cipher->origin == EVP_ORIG_METH)) {
+        || (cipher != NULL && cipher->origin == EVP_ORIG_METH)
+        || (cipher == NULL && ctx->cipher != NULL
+            && ctx->cipher->origin == EVP_ORIG_METH)) {
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
         return 0;
     }
@@ -592,11 +592,11 @@ static int evp_cipher_init_skey_internal(EVP_CIPHER_CTX *ctx,
             }
 
             ret = ctx->cipher->einit(ctx->algctx, keydata, keylen,
-                                     iv, iv_len, params);
+                iv, iv_len, params);
         } else {
             ret = ctx->cipher->einit_skey(ctx->algctx,
-                                          skey == NULL ? NULL : skey->keydata,
-                                          iv, iv_len, params);
+                skey == NULL ? NULL : skey->keydata,
+                iv, iv_len, params);
         }
     } else {
         if (ctx->cipher->dinit_skey == NULL) {
@@ -613,11 +613,11 @@ static int evp_cipher_init_skey_internal(EVP_CIPHER_CTX *ctx,
             }
 
             ret = ctx->cipher->dinit(ctx->algctx, keydata, keylen,
-                                     iv, iv_len, params);
+                iv, iv_len, params);
         } else {
             ret = ctx->cipher->dinit_skey(ctx->algctx,
-                                          skey == NULL ? NULL : skey->keydata,
-                                          iv, iv_len, params);
+                skey == NULL ? NULL : skey->keydata,
+                iv, iv_len, params);
         }
     }
 
@@ -625,21 +625,21 @@ static int evp_cipher_init_skey_internal(EVP_CIPHER_CTX *ctx,
 }
 
 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[])
 {
     return evp_cipher_init_skey_internal(ctx, cipher, skey, iv, iv_len, enc, params);
 }
 
 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[])
 {
     return evp_cipher_init_internal(ctx, cipher, NULL, key, iv, enc, 0, params);
 }
 
 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)
 {
     if (cipher != NULL)
         EVP_CIPHER_CTX_reset(ctx);
@@ -647,16 +647,16 @@ int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
 }
 
 int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                      ENGINE *impl, const unsigned char *key,
-                      const unsigned char *iv, int enc)
+    ENGINE *impl, const unsigned char *key,
+    const unsigned char *iv, int enc)
 {
     return evp_cipher_init_internal(ctx, cipher, impl, key, iv, enc, 0, NULL);
 }
 
 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 unsigned char *key, size_t keylen,
+    size_t numpipes,
+    const unsigned char **iv, size_t ivlen)
 {
     if (numpipes > EVP_MAX_PIPES) {
         ERR_raise(ERR_LIB_EVP, EVP_R_TOO_MANY_PIPES);
@@ -666,7 +666,7 @@ int EVP_CipherPipelineEncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
     ctx->numpipes = numpipes;
 
     if (!evp_cipher_init_internal(ctx, cipher, NULL, NULL, NULL, 1, 1,
-                                  NULL))
+            NULL))
         return 0;
 
     if (ctx->cipher->p_einit == NULL) {
@@ -675,18 +675,18 @@ int EVP_CipherPipelineEncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
     }
 
     return ctx->cipher->p_einit(ctx->algctx,
-                                key,
-                                keylen,
-                                numpipes,
-                                iv,
-                                ivlen,
-                                NULL);
+        key,
+        keylen,
+        numpipes,
+        iv,
+        ivlen,
+        NULL);
 }
 
 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 unsigned char *key, size_t keylen,
+    size_t numpipes,
+    const unsigned char **iv, size_t ivlen)
 {
     if (numpipes > EVP_MAX_PIPES) {
         ERR_raise(ERR_LIB_EVP, EVP_R_TOO_MANY_PIPES);
@@ -696,7 +696,7 @@ int EVP_CipherPipelineDecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
     ctx->numpipes = numpipes;
 
     if (!evp_cipher_init_internal(ctx, cipher, NULL, NULL, NULL, 0, 1,
-                                  NULL))
+            NULL))
         return 0;
 
     if (ctx->cipher->p_dinit == NULL) {
@@ -705,16 +705,16 @@ int EVP_CipherPipelineDecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
     }
 
     return ctx->cipher->p_dinit(ctx->algctx,
-                                key,
-                                keylen,
-                                numpipes,
-                                iv,
-                                ivlen,
-                                NULL);
+        key,
+        keylen,
+        numpipes,
+        iv,
+        ivlen,
+        NULL);
 }
 
 int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
-                     const unsigned char *in, int inl)
+    const unsigned char *in, int inl)
 {
     if (ctx->encrypt)
         return EVP_EncryptUpdate(ctx, out, outl, in, inl);
@@ -723,9 +723,9 @@ int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
 }
 
 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)
 {
     size_t i;
 
@@ -753,8 +753,8 @@ int EVP_CipherPipelineUpdate(EVP_CIPHER_CTX *ctx,
         outl[i] = 0;
 
     return ctx->cipher->p_cupdate(ctx->algctx, ctx->numpipes,
-                                  out, outl, outsize,
-                                  in, inl);
+        out, outl, outsize,
+        in, inl);
 }
 
 int EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
@@ -774,8 +774,8 @@ int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
 }
 
 int EVP_CipherPipelineFinal(EVP_CIPHER_CTX *ctx,
-                            unsigned char **out, size_t *outl,
-                            const size_t *outsize)
+    unsigned char **out, size_t *outl,
+    const size_t *outsize)
 {
     size_t i;
 
@@ -803,45 +803,45 @@ int EVP_CipherPipelineFinal(EVP_CIPHER_CTX *ctx,
         outl[i] = 0;
 
     return ctx->cipher->p_cfinal(ctx->algctx, ctx->numpipes,
-                                 out, outl, outsize);
+        out, outl, outsize);
 }
 
 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)
 {
     return EVP_CipherInit(ctx, cipher, key, iv, 1);
 }
 
 int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                       ENGINE *impl, const unsigned char *key,
-                       const unsigned char *iv)
+    ENGINE *impl, const unsigned char *key,
+    const unsigned char *iv)
 {
     return EVP_CipherInit_ex(ctx, cipher, impl, key, iv, 1);
 }
 
 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[])
 {
     return EVP_CipherInit_ex2(ctx, cipher, key, iv, 1, params);
 }
 
 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)
 {
     return EVP_CipherInit(ctx, cipher, key, iv, 0);
 }
 
 int EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                       ENGINE *impl, const unsigned char *key,
-                       const unsigned char *iv)
+    ENGINE *impl, const unsigned char *key,
+    const unsigned char *iv)
 {
     return EVP_CipherInit_ex(ctx, cipher, impl, key, iv, 0);
 }
 
 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[])
 {
     return EVP_CipherInit_ex2(ctx, cipher, key, iv, 0, params);
 }
@@ -853,9 +853,9 @@ int EVP_DecryptInit_ex2(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
  * are not partially overlapping with standard pointer arithmetic.
  */
 #ifdef PTRDIFF_T
-# undef PTRDIFF_T
+#undef PTRDIFF_T
 #endif
-#if defined(OPENSSL_SYS_VMS) && __INITIAL_POINTER_SIZE==64
+#if defined(OPENSSL_SYS_VMS) && __INITIAL_POINTER_SIZE == 64
 /*
  * Then we have VMS that distinguishes itself by adhering to
  * sizeof(size_t)==4 even in 64-bit builds, which means that
@@ -864,28 +864,27 @@ int EVP_DecryptInit_ex2(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
  * equality is implemented. To be on the safe side we adhere to
  * PTRDIFF_T even for comparison for equality.
  */
-# define PTRDIFF_T uint64_t
+#define PTRDIFF_T uint64_t
 #else
-# define PTRDIFF_T size_t
+#define PTRDIFF_T size_t
 #endif
 
 int ossl_is_partially_overlapping(const void *ptr1, const void *ptr2, int len)
 {
-    PTRDIFF_T diff = (PTRDIFF_T)ptr1-(PTRDIFF_T)ptr2;
+    PTRDIFF_T diff = (PTRDIFF_T)ptr1 - (PTRDIFF_T)ptr2;
     /*
      * Check for partially overlapping buffers. [Binary logical
      * operations are used instead of boolean to minimize number
      * of conditional branches.]
      */
-    int overlapped = (len > 0) & (diff != 0) & ((diff < (PTRDIFF_T)len) |
-                                                (diff > (0 - (PTRDIFF_T)len)));
+    int overlapped = (len > 0) & (diff != 0) & ((diff < (PTRDIFF_T)len) | (diff > (0 - (PTRDIFF_T)len)));
 
     return overlapped;
 }
 
 static int evp_EncryptDecryptUpdate(EVP_CIPHER_CTX *ctx,
-                                    unsigned char *out, int *outl,
-                                    const unsigned char *in, int inl)
+    unsigned char *out, int *outl,
+    const unsigned char *in, int inl)
 {
     int i, j, bl, cmpl = inl;
 
@@ -973,9 +972,8 @@ static int evp_EncryptDecryptUpdate(EVP_CIPHER_CTX *ctx,
     return 1;
 }
 
-
 int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
-                      const unsigned char *in, int inl)
+    const unsigned char *in, int inl)
 {
     int ret;
     size_t soutl, inl_ = (size_t)inl;
@@ -1010,8 +1008,8 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
     }
 
     ret = ctx->cipher->cupdate(ctx->algctx, out, &soutl,
-                               inl_ + (size_t)(blocksize == 1 ? 0 : blocksize),
-                               in, inl_);
+        inl_ + (size_t)(blocksize == 1 ? 0 : blocksize),
+        in, inl_);
 
     if (ossl_likely(ret)) {
         if (soutl > INT_MAX) {
@@ -1024,7 +1022,7 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
     return ret;
 
     /* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
 
     return evp_EncryptDecryptUpdate(ctx, out, outl, in, inl);
 }
@@ -1071,7 +1069,7 @@ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
     }
 
     ret = ctx->cipher->cfinal(ctx->algctx, out, &soutl,
-                              blocksize == 1 ? 0 : blocksize);
+        blocksize == 1 ? 0 : blocksize);
 
     if (ret) {
         if (soutl > INT_MAX) {
@@ -1084,7 +1082,7 @@ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
     return ret;
 
     /* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
 
     if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER) {
         ret = ctx->cipher->do_cipher(ctx, out, NULL, 0);
@@ -1123,7 +1121,7 @@ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
 }
 
 int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
-                      const unsigned char *in, int inl)
+    const unsigned char *in, int inl)
 {
     int fix_len, cmpl = inl, ret;
     unsigned int b;
@@ -1157,8 +1155,8 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
         return 0;
     }
     ret = ctx->cipher->cupdate(ctx->algctx, out, &soutl,
-                               inl_ + (size_t)(blocksize == 1 ? 0 : blocksize),
-                               in, inl_);
+        inl_ + (size_t)(blocksize == 1 ? 0 : blocksize),
+        in, inl_);
 
     if (ossl_likely(ret)) {
         if (soutl > INT_MAX) {
@@ -1171,7 +1169,7 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
     return ret;
 
     /* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
 
     b = ctx->cipher->block_size;
 
@@ -1293,7 +1291,7 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
     }
 
     ret = ctx->cipher->cfinal(ctx->algctx, out, &soutl,
-                              blocksize == 1 ? 0 : blocksize);
+        blocksize == 1 ? 0 : blocksize);
 
     if (ret) {
         if (soutl > INT_MAX) {
@@ -1306,7 +1304,7 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
     return ret;
 
     /* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
 
     *outl = 0;
     if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER) {
@@ -1369,7 +1367,8 @@ int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *c, int keylen)
 
         /* Check the cipher actually understands this parameter */
         if (OSSL_PARAM_locate_const(EVP_CIPHER_settable_ctx_params(c->cipher),
-                                    OSSL_CIPHER_PARAM_KEYLEN) == NULL) {
+                OSSL_CIPHER_PARAM_KEYLEN)
+            == NULL) {
             ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY_LENGTH);
             return 0;
         }
@@ -1449,11 +1448,10 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
         params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_KEYLEN, &sz);
         ctx->key_len = -1;
         break;
-    case EVP_CTRL_RAND_KEY:      /* Used by DES */
+    case EVP_CTRL_RAND_KEY: /* Used by DES */
         set_params = 0;
-        params[0] =
-            OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_RANDOM_KEY,
-                                              ptr, sz);
+        params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_RANDOM_KEY,
+            ptr, sz);
         break;
 
     case EVP_CTRL_INIT:
@@ -1486,20 +1484,20 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
         break;
     case EVP_CTRL_AEAD_SET_IV_FIXED:
         params[0] = OSSL_PARAM_construct_octet_string(
-                        OSSL_CIPHER_PARAM_AEAD_TLS1_IV_FIXED, ptr, sz);
+            OSSL_CIPHER_PARAM_AEAD_TLS1_IV_FIXED, ptr, sz);
         break;
     case EVP_CTRL_GCM_IV_GEN:
         set_params = 0;
         if (arg < 0)
             sz = 0; /* special case that uses the iv length */
         params[0] = OSSL_PARAM_construct_octet_string(
-                        OSSL_CIPHER_PARAM_AEAD_TLS1_GET_IV_GEN, ptr, sz);
+            OSSL_CIPHER_PARAM_AEAD_TLS1_GET_IV_GEN, ptr, sz);
         break;
     case EVP_CTRL_GCM_SET_IV_INV:
         if (arg < 0)
             return 0;
         params[0] = OSSL_PARAM_construct_octet_string(
-                        OSSL_CIPHER_PARAM_AEAD_TLS1_SET_IV_INV, ptr, sz);
+            OSSL_CIPHER_PARAM_AEAD_TLS1_SET_IV_INV, ptr, sz);
         break;
     case EVP_CTRL_GET_RC5_ROUNDS:
         set_params = 0; /* Fall thru */
@@ -1519,18 +1517,16 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
         set_params = 0; /* Fall thru */
     case EVP_CTRL_AEAD_SET_TAG:
         params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
-                                                      ptr, sz);
+            ptr, sz);
         break;
     case EVP_CTRL_AEAD_TLS1_AAD:
         /* This one does a set and a get - since it returns a size */
-        params[0] =
-            OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD,
-                                              ptr, sz);
+        params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD,
+            ptr, sz);
         ret = evp_do_ciph_ctx_setparams(ctx->cipher, ctx->algctx, params);
         if (ret <= 0)
             goto end;
-        params[0] =
-            OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, &sz);
+        params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, &sz);
         ret = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
         if (ret <= 0)
             goto end;
@@ -1545,37 +1541,36 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
 #if !defined(OPENSSL_NO_MULTIBLOCK)
     case EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE:
         params[0] = OSSL_PARAM_construct_size_t(
-                OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_SEND_FRAGMENT, &sz);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_SEND_FRAGMENT, &sz);
         ret = evp_do_ciph_ctx_setparams(ctx->cipher, ctx->algctx, params);
         if (ret <= 0)
             return 0;
 
         params[0] = OSSL_PARAM_construct_size_t(
-                OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_BUFSIZE, &sz);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_BUFSIZE, &sz);
         params[1] = OSSL_PARAM_construct_end();
         ret = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
         if (ret <= 0)
             return 0;
         return sz;
     case EVP_CTRL_TLS1_1_MULTIBLOCK_AAD: {
-        EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *p =
-            (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
+        EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *p = (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
 
         if (arg < (int)sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM))
             return 0;
 
         params[0] = OSSL_PARAM_construct_octet_string(
-                OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_AAD, (void*)p->inp, p->len);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_AAD, (void *)p->inp, p->len);
         params[1] = OSSL_PARAM_construct_uint(
-                OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, &p->interleave);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, &p->interleave);
         ret = evp_do_ciph_ctx_setparams(ctx->cipher, ctx->algctx, params);
         if (ret <= 0)
             return ret;
         /* Retrieve the return values changed by the set */
         params[0] = OSSL_PARAM_construct_size_t(
-                OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_AAD_PACKLEN, &sz);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_AAD_PACKLEN, &sz);
         params[1] = OSSL_PARAM_construct_uint(
-                OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, &p->interleave);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, &p->interleave);
         params[2] = OSSL_PARAM_construct_end();
         ret = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
         if (ret <= 0)
@@ -1583,22 +1578,21 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
         return sz;
     }
     case EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT: {
-        EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *p =
-            (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
+        EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *p = (EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *)ptr;
 
         params[0] = OSSL_PARAM_construct_octet_string(
-                        OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC, p->out, p->len);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC, p->out, p->len);
 
         params[1] = OSSL_PARAM_construct_octet_string(
-                OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC_IN, (void*)p->inp,
-                p->len);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC_IN, (void *)p->inp,
+            p->len);
         params[2] = OSSL_PARAM_construct_uint(
-                OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, &p->interleave);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, &p->interleave);
         ret = evp_do_ciph_ctx_setparams(ctx->cipher, ctx->algctx, params);
         if (ret <= 0)
             return ret;
         params[0] = OSSL_PARAM_construct_size_t(
-                        OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC_LEN, &sz);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC_LEN, &sz);
         params[1] = OSSL_PARAM_construct_end();
         ret = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
         if (ret <= 0)
@@ -1610,7 +1604,7 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
         if (arg < 0)
             return -1;
         params[0] = OSSL_PARAM_construct_octet_string(
-                OSSL_CIPHER_PARAM_AEAD_MAC_KEY, ptr, sz);
+            OSSL_CIPHER_PARAM_AEAD_MAC_KEY, ptr, sz);
         break;
     }
 
@@ -1629,7 +1623,7 @@ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
 
     ret = ctx->cipher->ctrl(ctx, type, arg, ptr);
 
- end:
+end:
     if (ret == EVP_CTRL_RET_UNSUPPORTED) {
         ERR_raise(ERR_LIB_EVP, EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED);
         return 0;
@@ -1680,7 +1674,7 @@ const OSSL_PARAM *EVP_CIPHER_gettable_params(const EVP_CIPHER *cipher)
 {
     if (cipher != NULL && cipher->gettable_params != NULL)
         return cipher->gettable_params(
-                   ossl_provider_ctx(EVP_CIPHER_get0_provider(cipher)));
+            ossl_provider_ctx(EVP_CIPHER_get0_provider(cipher)));
     return NULL;
 }
 
@@ -1807,7 +1801,7 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
     return 1;
 
     /* Code below to be removed when legacy support is dropped. */
- legacy:
+legacy:
 
 #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
     /* Make sure it's safe to copy a cipher context using an ENGINE */
@@ -1867,7 +1861,7 @@ static void set_legacy_nid(const char *name, void *vlegacy_nid)
      */
     const void *legacy_method = OBJ_NAME_get(name, OBJ_NAME_TYPE_CIPHER_METH);
 
-    if (*legacy_nid == -1)       /* We found a clash already */
+    if (*legacy_nid == -1) /* We found a clash already */
         return;
     if (legacy_method == NULL)
         return;
@@ -1881,8 +1875,8 @@ static void set_legacy_nid(const char *name, void *vlegacy_nid)
 #endif
 
 static void *evp_cipher_from_algorithm(const int name_id,
-                                       const OSSL_ALGORITHM *algodef,
-                                       OSSL_PROVIDER *prov)
+    const OSSL_ALGORITHM *algodef,
+    OSSL_PROVIDER *prov)
 {
     const OSSL_DISPATCH *fns = algodef->implementation;
     EVP_CIPHER *cipher = NULL;
@@ -1896,7 +1890,7 @@ static void *evp_cipher_from_algorithm(const int name_id,
 #ifndef FIPS_MODULE
     cipher->nid = NID_undef;
     if (!evp_names_do_all(prov, name_id, set_legacy_nid, &cipher->nid)
-            || cipher->nid == -1) {
+        || cipher->nid == -1) {
         ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -2015,23 +2009,20 @@ static void *evp_cipher_from_algorithm(const int name_id,
         case OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS:
             if (cipher->gettable_ctx_params != NULL)
                 break;
-            cipher->gettable_ctx_params =
-                OSSL_FUNC_cipher_gettable_ctx_params(fns);
+            cipher->gettable_ctx_params = OSSL_FUNC_cipher_gettable_ctx_params(fns);
             break;
         case OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS:
             if (cipher->settable_ctx_params != NULL)
                 break;
-            cipher->settable_ctx_params =
-                OSSL_FUNC_cipher_settable_ctx_params(fns);
+            cipher->settable_ctx_params = OSSL_FUNC_cipher_settable_ctx_params(fns);
             break;
         }
     }
     fnciphcnt += encinit + decinit;
     if ((fnciphcnt != 0 && fnciphcnt != 3 && fnciphcnt != 4)
-            || (fnciphcnt == 0 && cipher->ccipher == NULL && fnpipecnt == 0)
-            || (fnpipecnt != 0 && (fnpipecnt < 3 || cipher->p_cupdate == NULL
-                                   || cipher->p_cfinal == NULL))
-            || fnctxcnt != 2) {
+        || (fnciphcnt == 0 && cipher->ccipher == NULL && fnpipecnt == 0)
+        || (fnpipecnt != 0 && (fnpipecnt < 3 || cipher->p_cupdate == NULL || cipher->p_cfinal == NULL))
+        || fnctxcnt != 2) {
         /*
          * In order to be a consistent set of functions we must have at least
          * a complete set of "encrypt" functions, or a complete set of "decrypt"
@@ -2069,25 +2060,24 @@ static void evp_cipher_free(void *cipher)
 }
 
 EVP_CIPHER *EVP_CIPHER_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                             const char *properties)
+    const char *properties)
 {
-    EVP_CIPHER *cipher =
-        evp_generic_fetch(ctx, OSSL_OP_CIPHER, algorithm, properties,
-                          evp_cipher_from_algorithm, evp_cipher_up_ref,
-                          evp_cipher_free);
+    EVP_CIPHER *cipher = evp_generic_fetch(ctx, OSSL_OP_CIPHER, algorithm, properties,
+        evp_cipher_from_algorithm, evp_cipher_up_ref,
+        evp_cipher_free);
 
     return cipher;
 }
 
 EVP_CIPHER *evp_cipher_fetch_from_prov(OSSL_PROVIDER *prov,
-                                       const char *algorithm,
-                                       const char *properties)
+    const char *algorithm,
+    const char *properties)
 {
     return evp_generic_fetch_from_prov(prov, OSSL_OP_CIPHER,
-                                       algorithm, properties,
-                                       evp_cipher_from_algorithm,
-                                       evp_cipher_up_ref,
-                                       evp_cipher_free);
+        algorithm, properties,
+        evp_cipher_from_algorithm,
+        evp_cipher_up_ref,
+        evp_cipher_free);
 }
 
 int EVP_CIPHER_can_pipeline(const EVP_CIPHER *cipher, int enc)
@@ -2130,11 +2120,11 @@ void EVP_CIPHER_free(EVP_CIPHER *cipher)
 }
 
 void EVP_CIPHER_do_all_provided(OSSL_LIB_CTX *libctx,
-                                void (*fn)(EVP_CIPHER *mac, void *arg),
-                                void *arg)
+    void (*fn)(EVP_CIPHER *mac, void *arg),
+    void *arg)
 {
     evp_generic_do_all(libctx, OSSL_OP_CIPHER,
-                       (void (*)(void *, void *))fn, arg,
-                       evp_cipher_from_algorithm, evp_cipher_up_ref,
-                       evp_cipher_free);
+        (void (*)(void *, void *))fn, arg,
+        evp_cipher_from_algorithm, evp_cipher_up_ref,
+        evp_cipher_free);
 }
diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c
index d8440fc76d139..91b40a6cd574e 100644
--- a/crypto/evp/evp_err.c
+++ b/crypto/evp/evp_err.c
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -15,198 +15,210 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA EVP_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_AES_KEY_SETUP_FAILED),
-     "aes key setup failed"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ARIA_KEY_SETUP_FAILED),
-     "aria key setup failed"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BAD_ALGORITHM_NAME), "bad algorithm name"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BAD_DECRYPT), "bad decrypt"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BAD_KEY_LENGTH), "bad key length"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BUFFER_TOO_SMALL), "buffer too small"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CACHE_CONSTANTS_FAILED),
-     "cache constants failed"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CAMELLIA_KEY_SETUP_FAILED),
-     "camellia key setup failed"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CANNOT_GET_PARAMETERS),
-     "cannot get parameters"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CANNOT_SET_PARAMETERS),
-     "cannot set parameters"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CIPHER_NOT_GCM_MODE),
-     "cipher not gcm mode"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CIPHER_PARAMETER_ERROR),
-     "cipher parameter error"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_COMMAND_NOT_SUPPORTED),
-     "command not supported"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CONFLICTING_ALGORITHM_NAME),
-     "conflicting algorithm name"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_COPY_ERROR), "copy error"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CTRL_NOT_IMPLEMENTED),
-     "ctrl not implemented"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED),
-     "ctrl operation not implemented"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH),
-     "data not multiple of block length"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DECODE_ERROR), "decode error"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DEFAULT_QUERY_PARSE_ERROR),
-     "default query parse error"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DIFFERENT_KEY_TYPES),
-     "different key types"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DIFFERENT_PARAMETERS),
-     "different parameters"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ERROR_LOADING_SECTION),
-     "error loading section"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_AN_HMAC_KEY),
-     "expecting an hmac key"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_AN_RSA_KEY),
-     "expecting an rsa key"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_DH_KEY), "expecting a dh key"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_DSA_KEY),
-     "expecting a dsa key"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_ECX_KEY),
-     "expecting an ecx key"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_EC_KEY), "expecting an ec key"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_POLY1305_KEY),
-     "expecting a poly1305 key"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_SIPHASH_KEY),
-     "expecting a siphash key"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_FINAL_ERROR), "final error"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_GENERATE_ERROR), "generate error"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_GETTING_ALGORITHMIDENTIFIER_NOT_SUPPORTED),
-     "getting AlgorithmIdentifier not supported"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_GET_RAW_KEY_FAILED), "get raw key failed"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ILLEGAL_SCRYPT_PARAMETERS),
-     "illegal scrypt parameters"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INACCESSIBLE_DOMAIN_PARAMETERS),
-     "inaccessible domain parameters"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INACCESSIBLE_KEY), "inaccessible key"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INITIALIZATION_ERROR),
-     "initialization error"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INPUT_NOT_INITIALIZED),
-     "input not initialized"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_CUSTOM_LENGTH),
-     "invalid custom length"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_DIGEST), "invalid digest"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_IV_LENGTH), "invalid iv length"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_KEY), "invalid key"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_KEY_LENGTH), "invalid key length"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_LENGTH), "invalid length"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_NULL_ALGORITHM),
-     "invalid null algorithm"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_OPERATION), "invalid operation"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_PROVIDER_FUNCTIONS),
-     "invalid provider functions"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SALT_LENGTH),
-     "invalid salt length"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SECRET_LENGTH),
-     "invalid secret length"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SEED_LENGTH),
-     "invalid seed length"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_VALUE), "invalid value"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_KEYMGMT_EXPORT_FAILURE),
-     "keymgmt export failure"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_KEY_SETUP_FAILED), "key setup failed"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_LOCKING_NOT_SUPPORTED),
-     "locking not supported"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_MEMORY_LIMIT_EXCEEDED),
-     "memory limit exceeded"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_MESSAGE_DIGEST_IS_NULL),
-     "message digest is null"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_METHOD_NOT_SUPPORTED),
-     "method not supported"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_MISSING_PARAMETERS), "missing parameters"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NOT_ABLE_TO_COPY_CTX),
-     "not able to copy ctx"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NOT_XOF_OR_INVALID_LENGTH),
-     "not XOF or invalid length"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_CIPHER_SET), "no cipher set"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_DEFAULT_DIGEST), "no default digest"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_DIGEST_SET), "no digest set"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_IMPORT_FUNCTION), "no import function"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_KEYMGMT_AVAILABLE),
-     "no keymgmt available"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_KEYMGMT_PRESENT), "no keymgmt present"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_KEY_SET), "no key set"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_OPERATION_SET), "no operation set"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NULL_MAC_PKEY_CTX), "null mac pkey ctx"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ONLY_ONESHOT_SUPPORTED),
-     "only oneshot supported"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_INITIALIZED),
-     "operation not initialized"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),
-     "operation not supported for this keytype"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_SIGNATURE_TYPE),
-     "operation not supported for this signature type"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OUTPUT_WOULD_OVERFLOW),
-     "output would overflow"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARAMETER_TOO_LARGE),
-     "parameter too large"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARTIALLY_OVERLAPPING),
-     "partially overlapping buffers"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PBKDF2_ERROR), "pbkdf2 error"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PIPELINE_NOT_SUPPORTED),
-     "pipeline not supported"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED),
-     "pkey application asn1 method already registered"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PRIVATE_KEY_DECODE_ERROR),
-     "private key decode error"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PRIVATE_KEY_ENCODE_ERROR),
-     "private key encode error"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PUBLIC_KEY_NOT_RSA), "public key not rsa"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_SETTING_XOF_FAILED), "setting xof failed"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_SET_DEFAULT_PROPERTY_FAILURE),
-     "set default property failure"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_SIGNATURE_TYPE_AND_KEY_TYPE_INCOMPATIBLE),
-     "signature type and key type incompatible"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_TOO_MANY_PIPES), "too many pipes"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_TOO_MANY_RECORDS), "too many records"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_ENABLE_LOCKING),
-     "unable to enable locking"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_GET_MAXIMUM_REQUEST_SIZE),
-     "unable to get maximum request size"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_GET_RANDOM_STRENGTH),
-     "unable to get random strength"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_LOCK_CONTEXT),
-     "unable to lock context"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_SET_CALLBACKS),
-     "unable to set callbacks"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_BITS), "unknown bits"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_CIPHER), "unknown cipher"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_DIGEST), "unknown digest"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_KEY_TYPE), "unknown key type"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_MAX_SIZE), "unknown max size"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_OPTION), "unknown option"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_PBE_ALGORITHM),
-     "unknown pbe algorithm"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_SECURITY_BITS),
-     "unknown security bits"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_ALGORITHM),
-     "unsupported algorithm"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_CIPHER), "unsupported cipher"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEYLENGTH),
-     "unsupported keylength"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION),
-     "unsupported key derivation function"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEY_SIZE),
-     "unsupported key size"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEY_TYPE),
-     "unsupported key type"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS),
-     "unsupported number of rounds"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_PRF), "unsupported prf"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM),
-     "unsupported private key algorithm"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_SALT_TYPE),
-     "unsupported salt type"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UPDATE_ERROR), "update error"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_WRAP_MODE_NOT_ALLOWED),
-     "wrap mode not allowed"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_WRONG_FINAL_BLOCK_LENGTH),
-     "wrong final block length"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_XTS_DATA_UNIT_IS_TOO_LARGE),
-     "xts data unit is too large"},
-    {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_XTS_DUPLICATED_KEYS),
-     "xts duplicated keys"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_AES_KEY_SETUP_FAILED),
+        "aes key setup failed" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ARIA_KEY_SETUP_FAILED),
+        "aria key setup failed" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BAD_ALGORITHM_NAME), "bad algorithm name" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BAD_DECRYPT), "bad decrypt" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BAD_KEY_LENGTH), "bad key length" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BUFFER_TOO_SMALL), "buffer too small" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CACHE_CONSTANTS_FAILED),
+        "cache constants failed" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CAMELLIA_KEY_SETUP_FAILED),
+        "camellia key setup failed" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CANNOT_GET_PARAMETERS),
+        "cannot get parameters" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CANNOT_SET_PARAMETERS),
+        "cannot set parameters" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CIPHER_NOT_GCM_MODE),
+        "cipher not gcm mode" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CIPHER_PARAMETER_ERROR),
+        "cipher parameter error" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_COMMAND_NOT_SUPPORTED),
+        "command not supported" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CONFLICTING_ALGORITHM_NAME),
+        "conflicting algorithm name" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_COPY_ERROR), "copy error" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CTRL_NOT_IMPLEMENTED),
+        "ctrl not implemented" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED),
+        "ctrl operation not implemented" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH),
+        "data not multiple of block length" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DECODE_ERROR), "decode error" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DEFAULT_QUERY_PARSE_ERROR),
+        "default query parse error" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DIFFERENT_KEY_TYPES),
+        "different key types" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_DIFFERENT_PARAMETERS),
+        "different parameters" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ERROR_LOADING_SECTION),
+        "error loading section" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_AN_HMAC_KEY),
+        "expecting an hmac key" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_AN_RSA_KEY),
+        "expecting an rsa key" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_DH_KEY), "expecting a dh key" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_DSA_KEY),
+        "expecting a dsa key" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_ECX_KEY),
+        "expecting an ecx key" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_EC_KEY), "expecting an ec key" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_POLY1305_KEY),
+        "expecting a poly1305 key" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_EXPECTING_A_SIPHASH_KEY),
+        "expecting a siphash key" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_FINAL_ERROR), "final error" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_GENERATE_ERROR), "generate error" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_GETTING_ALGORITHMIDENTIFIER_NOT_SUPPORTED),
+        "getting AlgorithmIdentifier not supported" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_GET_RAW_KEY_FAILED), "get raw key failed" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ILLEGAL_SCRYPT_PARAMETERS),
+        "illegal scrypt parameters" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INACCESSIBLE_DOMAIN_PARAMETERS),
+        "inaccessible domain parameters" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INACCESSIBLE_KEY), "inaccessible key" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INITIALIZATION_ERROR),
+        "initialization error" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INPUT_NOT_INITIALIZED),
+        "input not initialized" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_CUSTOM_LENGTH),
+        "invalid custom length" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_DIGEST), "invalid digest" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_IV_LENGTH), "invalid iv length" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_KEY), "invalid key" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_KEY_LENGTH), "invalid key length" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_LENGTH), "invalid length" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_NULL_ALGORITHM),
+        "invalid null algorithm" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_OPERATION), "invalid operation" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_PROVIDER_FUNCTIONS),
+        "invalid provider functions" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SALT_LENGTH),
+        "invalid salt length" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SECRET_LENGTH),
+        "invalid secret length" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_SEED_LENGTH),
+        "invalid seed length" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_INVALID_VALUE), "invalid value" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_KEYMGMT_EXPORT_FAILURE),
+        "keymgmt export failure" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_KEY_SETUP_FAILED), "key setup failed" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_LOCKING_NOT_SUPPORTED),
+        "locking not supported" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_MEMORY_LIMIT_EXCEEDED),
+        "memory limit exceeded" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_MESSAGE_DIGEST_IS_NULL),
+        "message digest is null" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_METHOD_NOT_SUPPORTED),
+        "method not supported" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_MISSING_PARAMETERS), "missing parameters" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NOT_ABLE_TO_COPY_CTX),
+        "not able to copy ctx" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NOT_XOF_OR_INVALID_LENGTH),
+        "not XOF or invalid length" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_CIPHER_SET), "no cipher set" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_DEFAULT_DIGEST), "no default digest" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_DIGEST_SET), "no digest set" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_IMPORT_FUNCTION), "no import function" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_KEYMGMT_AVAILABLE),
+        "no keymgmt available" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_KEYMGMT_PRESENT), "no keymgmt present" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_KEY_SET), "no key set" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NO_OPERATION_SET), "no operation set" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_NULL_MAC_PKEY_CTX), "null mac pkey ctx" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_ONLY_ONESHOT_SUPPORTED),
+        "only oneshot supported" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_INITIALIZED),
+        "operation not initialized" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),
+        "operation not supported for this keytype" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_SIGNATURE_TYPE),
+        "operation not supported for this signature type" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_OUTPUT_WOULD_OVERFLOW),
+        "output would overflow" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARAMETER_TOO_LARGE),
+        "parameter too large" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PARTIALLY_OVERLAPPING),
+        "partially overlapping buffers" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PBKDF2_ERROR), "pbkdf2 error" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PIPELINE_NOT_SUPPORTED),
+        "pipeline not supported" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED),
+        "pkey application asn1 method already registered" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PRIVATE_KEY_DECODE_ERROR),
+        "private key decode error" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PRIVATE_KEY_ENCODE_ERROR),
+        "private key encode error" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_ASYM_CIPHER_FAILURE),
+        "provider asym cipher failure" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED),
+        "provider asym cipher not supported" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_KEYMGMT_FAILURE),
+        "provider keymgmt failure" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_KEYMGMT_NOT_SUPPORTED),
+        "provider keymgmt not supported" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_SIGNATURE_FAILURE),
+        "provider signature failure" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED),
+        "provider signature not supported" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PUBLIC_KEY_NOT_RSA), "public key not rsa" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_SETTING_XOF_FAILED), "setting xof failed" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_SET_DEFAULT_PROPERTY_FAILURE),
+        "set default property failure" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_SIGNATURE_TYPE_AND_KEY_TYPE_INCOMPATIBLE),
+        "signature type and key type incompatible" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_TOO_MANY_PIPES), "too many pipes" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_TOO_MANY_RECORDS), "too many records" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_ENABLE_LOCKING),
+        "unable to enable locking" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_GET_MAXIMUM_REQUEST_SIZE),
+        "unable to get maximum request size" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_GET_RANDOM_STRENGTH),
+        "unable to get random strength" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_LOCK_CONTEXT),
+        "unable to lock context" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNABLE_TO_SET_CALLBACKS),
+        "unable to set callbacks" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_BITS), "unknown bits" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_CIPHER), "unknown cipher" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_DIGEST), "unknown digest" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_KEY_TYPE), "unknown key type" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_MAX_SIZE), "unknown max size" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_OPTION), "unknown option" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_PBE_ALGORITHM),
+        "unknown pbe algorithm" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNKNOWN_SECURITY_BITS),
+        "unknown security bits" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_ALGORITHM),
+        "unsupported algorithm" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_CIPHER), "unsupported cipher" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEYLENGTH),
+        "unsupported keylength" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION),
+        "unsupported key derivation function" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEY_SIZE),
+        "unsupported key size" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_KEY_TYPE),
+        "unsupported key type" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS),
+        "unsupported number of rounds" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_PRF), "unsupported prf" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM),
+        "unsupported private key algorithm" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UNSUPPORTED_SALT_TYPE),
+        "unsupported salt type" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_UPDATE_ERROR), "update error" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_WRAP_MODE_NOT_ALLOWED),
+        "wrap mode not allowed" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_WRONG_FINAL_BLOCK_LENGTH),
+        "wrong final block length" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_XTS_DATA_UNIT_IS_TOO_LARGE),
+        "xts data unit is too large" },
+    { ERR_PACK(ERR_LIB_EVP, 0, EVP_R_XTS_DUPLICATED_KEYS),
+        "xts duplicated keys" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c
index fbebca1b634c5..612e57e6f08c7 100644
--- a/crypto/evp/evp_fetch.c
+++ b/crypto/evp/evp_fetch.c
@@ -18,7 +18,7 @@
 #include "internal/provider.h"
 #include "internal/namemap.h"
 #include "crypto/decoder.h"
-#include "crypto/evp.h"    /* evp_local.h needs it */
+#include "crypto/evp.h" /* evp_local.h needs it */
 #include "evp_local.h"
 
 #define NAME_SEPARATOR ':'
@@ -26,17 +26,17 @@
 /* Data to be passed through ossl_method_construct() */
 struct evp_method_data_st {
     OSSL_LIB_CTX *libctx;
-    int operation_id;            /* For get_evp_method_from_store() */
-    int name_id;                 /* For get_evp_method_from_store() */
-    const char *names;           /* For get_evp_method_from_store() */
-    const char *propquery;       /* For get_evp_method_from_store() */
+    int operation_id; /* For get_evp_method_from_store() */
+    int name_id; /* For get_evp_method_from_store() */
+    const char *names; /* For get_evp_method_from_store() */
+    const char *propquery; /* For get_evp_method_from_store() */
 
     OSSL_METHOD_STORE *tmp_store; /* For get_tmp_evp_method_store() */
 
     unsigned int flag_construct_error_occurred : 1;
 
     void *(*method_from_algorithm)(int name_id, const OSSL_ALGORITHM *,
-                                   OSSL_PROVIDER *);
+        OSSL_PROVIDER *);
     int (*refcnt_up_method)(void *method);
     void (*destruct_method)(void *method);
 };
@@ -57,7 +57,7 @@ static void *get_tmp_evp_method_store(void *data)
     return methdata->tmp_store;
 }
 
- static void dealloc_tmp_evp_method_store(void *store)
+static void dealloc_tmp_evp_method_store(void *store)
 {
     OSSL_TRACE1(QUERY, "Deallocating the tmp_store %p\n", store);
     if (store != NULL)
@@ -108,23 +108,23 @@ static int unreserve_evp_method_store(void *store, void *data)
  * passed to ossl_method_store_cache_set(), and it's in that form that it
  * gets passed along to filter_on_operation_id(), defined further down.
  */
-#define METHOD_ID_OPERATION_MASK        0x000000FF
-#define METHOD_ID_OPERATION_MAX         ((1 << 8) - 1)
-#define METHOD_ID_NAME_MASK             0x7FFFFF00
-#define METHOD_ID_NAME_OFFSET           8
-#define METHOD_ID_NAME_MAX              ((1 << 23) - 1)
+#define METHOD_ID_OPERATION_MASK 0x000000FF
+#define METHOD_ID_OPERATION_MAX ((1 << 8) - 1)
+#define METHOD_ID_NAME_MASK 0x7FFFFF00
+#define METHOD_ID_NAME_OFFSET 8
+#define METHOD_ID_NAME_MAX ((1 << 23) - 1)
 static uint32_t evp_method_id(int name_id, unsigned int operation_id)
 {
     if (!ossl_assert(name_id > 0 && name_id <= METHOD_ID_NAME_MAX)
         || !ossl_assert(operation_id > 0
-                        && operation_id <= METHOD_ID_OPERATION_MAX))
+            && operation_id <= METHOD_ID_OPERATION_MAX))
         return 0;
     return (((name_id << METHOD_ID_NAME_OFFSET) & METHOD_ID_NAME_MASK)
-            | (operation_id & METHOD_ID_OPERATION_MASK));
+        | (operation_id & METHOD_ID_OPERATION_MASK));
 }
 
 static void *get_evp_method_from_store(void *store, const OSSL_PROVIDER **prov,
-                                       void *data)
+    void *data)
 {
     struct evp_method_data_st *methdata = data;
     void *method = NULL;
@@ -156,15 +156,15 @@ static void *get_evp_method_from_store(void *store, const OSSL_PROVIDER **prov,
         return NULL;
 
     if (!ossl_method_store_fetch(store, meth_id, methdata->propquery, prov,
-                                 &method))
+            &method))
         return NULL;
     return method;
 }
 
 static int put_evp_method_in_store(void *store, void *method,
-                                   const OSSL_PROVIDER *prov,
-                                   const char *names, const char *propdef,
-                                   void *data)
+    const OSSL_PROVIDER *prov,
+    const char *names, const char *propdef,
+    void *data)
 {
     struct evp_method_data_st *methdata = data;
     OSSL_NAMEMAP *namemap;
@@ -195,12 +195,12 @@ static int put_evp_method_in_store(void *store, void *method,
         return 0;
 
     OSSL_TRACE5(QUERY,
-                "put_evp_method_in_store: "
-                "store: %p, names: %s, operation_id %d, method_id: %d, properties: %s\n",
-                store, names, methdata->operation_id, meth_id, propdef ? propdef : "<null>");
+        "put_evp_method_in_store: "
+        "store: %p, names: %s, operation_id %d, method_id: %d, properties: %s\n",
+        store, names, methdata->operation_id, meth_id, propdef ? propdef : "<null>");
     return ossl_method_store_add(store, prov, meth_id, propdef, method,
-                                 methdata->refcnt_up_method,
-                                 methdata->destruct_method);
+        methdata->refcnt_up_method,
+        methdata->destruct_method);
 }
 
 /*
@@ -208,7 +208,7 @@ static int put_evp_method_in_store(void *store, void *method,
  * This function is responsible to getting an identity number for it.
  */
 static void *construct_evp_method(const OSSL_ALGORITHM *algodef,
-                                  OSSL_PROVIDER *prov, void *data)
+    OSSL_PROVIDER *prov, void *data)
 {
     /*
      * This function is only called if get_evp_method_from_store() returned
@@ -249,13 +249,13 @@ static void destruct_evp_method(void *method, void *data)
 
 static void *
 inner_evp_generic_fetch(struct evp_method_data_st *methdata,
-                        OSSL_PROVIDER *prov, int operation_id,
-                        const char *name, ossl_unused const char *properties,
-                        void *(*new_method)(int name_id,
-                                            const OSSL_ALGORITHM *algodef,
-                                            OSSL_PROVIDER *prov),
-                        int (*up_ref_method)(void *),
-                        void (*free_method)(void *))
+    OSSL_PROVIDER *prov, int operation_id,
+    const char *name, ossl_unused const char *properties,
+    void *(*new_method)(int name_id,
+        const OSSL_ALGORITHM *algodef,
+        OSSL_PROVIDER *prov),
+    int (*up_ref_method)(void *),
+    void (*free_method)(void *))
 {
     OSSL_METHOD_STORE *store = get_evp_method_store(methdata->libctx);
     OSSL_NAMEMAP *namemap = ossl_namemap_stored(methdata->libctx);
@@ -269,7 +269,7 @@ inner_evp_generic_fetch(struct evp_method_data_st *methdata,
     const char *const propq = "";
 #else
     const char *const propq = properties != NULL ? properties : "";
-#endif  /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
     uint32_t meth_id = 0;
     void *method = NULL;
     int unsupported, name_id;
@@ -331,8 +331,9 @@ inner_evp_generic_fetch(struct evp_method_data_st *methdata,
         methdata->destruct_method = free_method;
         methdata->flag_construct_error_occurred = 0;
         if ((method = ossl_method_construct(methdata->libctx, operation_id,
-                                            &prov, 0 /* !force_cache */,
-                                            &mcm, methdata)) != NULL) {
+                 &prov, 0 /* !force_cache */,
+                 &mcm, methdata))
+            != NULL) {
             /*
              * If construction did create a method for us, we know that
              * there is a correct name_id and meth_id, since those have
@@ -349,14 +350,14 @@ inner_evp_generic_fetch(struct evp_method_data_st *methdata,
                 name_id = ossl_namemap_name2num(namemap, name);
             if (name_id == 0) {
                 ERR_raise_data(ERR_LIB_EVP, ERR_R_FETCH_FAILED,
-                               "Algorithm %s cannot be found", name);
+                    "Algorithm %s cannot be found", name);
                 free_method(method);
                 method = NULL;
             } else {
                 meth_id = evp_method_id(name_id, operation_id);
                 if (meth_id != 0)
                     ossl_method_store_cache_set(store, prov, meth_id, propq,
-                                                method, up_ref_method, free_method);
+                        method, up_ref_method, free_method);
             }
         }
 
@@ -373,27 +374,27 @@ inner_evp_generic_fetch(struct evp_method_data_st *methdata,
         if (name == NULL)
             name = ossl_namemap_num2name(namemap, name_id, 0);
         ERR_raise_data(ERR_LIB_EVP, code,
-                       "%s, Algorithm (%s : %d), Properties (%s)",
-                       ossl_lib_ctx_get_descriptor(methdata->libctx),
-                       name == NULL ? "<null>" : name, name_id,
-                       properties == NULL ? "<null>" : properties);
+            "%s, Algorithm (%s : %d), Properties (%s)",
+            ossl_lib_ctx_get_descriptor(methdata->libctx),
+            name == NULL ? "<null>" : name, name_id,
+            properties == NULL ? "<null>" : properties);
     } else {
         OSSL_TRACE4(QUERY, "%s, Algorithm (%s : %d), Properties (%s)\n",
-                    ossl_lib_ctx_get_descriptor(methdata->libctx),
-                    name == NULL ? "<null>" : name, name_id,
-                    properties == NULL ? "<null>" : properties);
+            ossl_lib_ctx_get_descriptor(methdata->libctx),
+            name == NULL ? "<null>" : name, name_id,
+            properties == NULL ? "<null>" : properties);
     }
 
     return method;
 }
 
 void *evp_generic_fetch(OSSL_LIB_CTX *libctx, int operation_id,
-                        const char *name, const char *properties,
-                        void *(*new_method)(int name_id,
-                                            const OSSL_ALGORITHM *algodef,
-                                            OSSL_PROVIDER *prov),
-                        int (*up_ref_method)(void *),
-                        void (*free_method)(void *))
+    const char *name, const char *properties,
+    void *(*new_method)(int name_id,
+        const OSSL_ALGORITHM *algodef,
+        OSSL_PROVIDER *prov),
+    int (*up_ref_method)(void *),
+    void (*free_method)(void *))
 {
     struct evp_method_data_st methdata;
     void *method;
@@ -401,8 +402,8 @@ void *evp_generic_fetch(OSSL_LIB_CTX *libctx, int operation_id,
     methdata.libctx = libctx;
     methdata.tmp_store = NULL;
     method = inner_evp_generic_fetch(&methdata, NULL, operation_id,
-                                     name, properties,
-                                     new_method, up_ref_method, free_method);
+        name, properties,
+        new_method, up_ref_method, free_method);
     dealloc_tmp_evp_method_store(methdata.tmp_store);
     return method;
 }
@@ -414,12 +415,12 @@ void *evp_generic_fetch(OSSL_LIB_CTX *libctx, int operation_id,
  * method.
  */
 void *evp_generic_fetch_from_prov(OSSL_PROVIDER *prov, int operation_id,
-                                  const char *name, const char *properties,
-                                  void *(*new_method)(int name_id,
-                                                      const OSSL_ALGORITHM *algodef,
-                                                      OSSL_PROVIDER *prov),
-                                  int (*up_ref_method)(void *),
-                                  void (*free_method)(void *))
+    const char *name, const char *properties,
+    void *(*new_method)(int name_id,
+        const OSSL_ALGORITHM *algodef,
+        OSSL_PROVIDER *prov),
+    int (*up_ref_method)(void *),
+    void (*free_method)(void *))
 {
     struct evp_method_data_st methdata;
     void *method;
@@ -427,8 +428,8 @@ void *evp_generic_fetch_from_prov(OSSL_PROVIDER *prov, int operation_id,
     methdata.libctx = ossl_provider_libctx(prov);
     methdata.tmp_store = NULL;
     method = inner_evp_generic_fetch(&methdata, prov, operation_id,
-                                     name, properties,
-                                     new_method, up_ref_method, free_method);
+        name, properties,
+        new_method, up_ref_method, free_method);
     dealloc_tmp_evp_method_store(methdata.tmp_store);
     return method;
 }
@@ -453,9 +454,9 @@ int evp_method_store_remove_all_provided(const OSSL_PROVIDER *prov)
 }
 
 static int evp_set_parsed_default_properties(OSSL_LIB_CTX *libctx,
-                                             OSSL_PROPERTY_LIST *def_prop,
-                                             int loadconfig,
-                                             int mirrored)
+    OSSL_PROPERTY_LIST *def_prop,
+    int loadconfig,
+    int mirrored)
 {
     OSSL_METHOD_STORE *store = get_evp_method_store(libctx);
     OSSL_PROPERTY_LIST **plp = ossl_ctx_global_properties(libctx, loadconfig);
@@ -485,7 +486,8 @@ static int evp_set_parsed_default_properties(OSSL_LIB_CTX *libctx,
             return 0;
         }
         if (ossl_property_list_to_string(libctx, def_prop, propstr,
-                                         strsz) == 0) {
+                strsz)
+            == 0) {
             OPENSSL_free(propstr);
             ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
             return 0;
@@ -507,7 +509,7 @@ static int evp_set_parsed_default_properties(OSSL_LIB_CTX *libctx,
 }
 
 int evp_set_default_properties_int(OSSL_LIB_CTX *libctx, const char *propq,
-                                   int loadconfig, int mirrored)
+    int loadconfig, int mirrored)
 {
     OSSL_PROPERTY_LIST *pl = NULL;
 
@@ -528,7 +530,7 @@ int EVP_set_default_properties(OSSL_LIB_CTX *libctx, const char *propq)
 }
 
 static int evp_default_properties_merge(OSSL_LIB_CTX *libctx, const char *propq,
-                                        int loadconfig)
+    int loadconfig)
 {
     OSSL_PROPERTY_LIST **plp = ossl_ctx_global_properties(libctx, loadconfig);
     OSSL_PROPERTY_LIST *pl1, *pl2;
@@ -555,7 +557,7 @@ static int evp_default_properties_merge(OSSL_LIB_CTX *libctx, const char *propq,
 }
 
 static int evp_default_property_is_enabled(OSSL_LIB_CTX *libctx,
-                                           const char *prop_name)
+    const char *prop_name)
 {
     OSSL_PROPERTY_LIST **plp = ossl_ctx_global_properties(libctx, 1);
 
@@ -568,7 +570,7 @@ int EVP_default_properties_is_fips_enabled(OSSL_LIB_CTX *libctx)
 }
 
 int evp_default_properties_enable_fips_int(OSSL_LIB_CTX *libctx, int enable,
-                                           int loadconfig)
+    int loadconfig)
 {
     const char *query = (enable != 0) ? "fips=yes" : "-fips";
 
@@ -626,13 +628,13 @@ static void filter_on_operation_id(int id, void *method, void *arg)
 }
 
 void evp_generic_do_all(OSSL_LIB_CTX *libctx, int operation_id,
-                        void (*user_fn)(void *method, void *arg),
-                        void *user_arg,
-                        void *(*new_method)(int name_id,
-                                            const OSSL_ALGORITHM *algodef,
-                                            OSSL_PROVIDER *prov),
-                        int (*up_ref_method)(void *),
-                        void (*free_method)(void *))
+    void (*user_fn)(void *method, void *arg),
+    void *user_arg,
+    void *(*new_method)(int name_id,
+        const OSSL_ALGORITHM *algodef,
+        OSSL_PROVIDER *prov),
+    int (*up_ref_method)(void *),
+    void (*free_method)(void *))
 {
     struct evp_method_data_st methdata;
     struct filter_data_st data;
@@ -640,21 +642,21 @@ void evp_generic_do_all(OSSL_LIB_CTX *libctx, int operation_id,
     methdata.libctx = libctx;
     methdata.tmp_store = NULL;
     (void)inner_evp_generic_fetch(&methdata, NULL, operation_id, NULL, NULL,
-                                  new_method, up_ref_method, free_method);
+        new_method, up_ref_method, free_method);
 
     data.operation_id = operation_id;
     data.user_fn = user_fn;
     data.user_arg = user_arg;
     if (methdata.tmp_store != NULL)
         ossl_method_store_do_all(methdata.tmp_store, &filter_on_operation_id,
-                                 &data);
+            &data);
     ossl_method_store_do_all(get_evp_method_store(libctx),
-                             &filter_on_operation_id, &data);
+        &filter_on_operation_id, &data);
     dealloc_tmp_evp_method_store(methdata.tmp_store);
 }
 
 int evp_is_a(OSSL_PROVIDER *prov, int number,
-             const char *legacy_name, const char *name)
+    const char *legacy_name, const char *name)
 {
     /*
      * For a |prov| that is NULL, the library context will be NULL
@@ -668,8 +670,8 @@ int evp_is_a(OSSL_PROVIDER *prov, int number,
 }
 
 int evp_names_do_all(OSSL_PROVIDER *prov, int number,
-                     void (*fn)(const char *name, void *data),
-                     void *data)
+    void (*fn)(const char *name, void *data),
+    void *data)
 {
     OSSL_LIB_CTX *libctx = ossl_provider_libctx(prov);
     OSSL_NAMEMAP *namemap = ossl_namemap_stored(libctx);
diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c
index 7ef94e44eb532..4f8fdd8727b5c 100644
--- a/crypto/evp/evp_key.c
+++ b/crypto/evp/evp_key.c
@@ -15,7 +15,7 @@
 #include <openssl/ui.h>
 
 #ifndef BUFSIZ
-# define BUFSIZ 256
+#define BUFSIZ 256
 #endif
 
 /* should be init to zeros. */
@@ -50,7 +50,7 @@ int EVP_read_pw_string(char *buf, int len, const char *prompt, int verify)
 }
 
 int EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt,
-                           int verify)
+    int verify)
 {
     int ret = -1;
     char buff[BUFSIZ];
@@ -62,23 +62,25 @@ int EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt,
     if (ui == NULL)
         return ret;
     if (UI_add_input_string(ui, prompt, 0, buf, min,
-                            (len >= BUFSIZ) ? BUFSIZ - 1 : len) < 0
+            (len >= BUFSIZ) ? BUFSIZ - 1 : len)
+            < 0
         || (verify
             && UI_add_verify_string(ui, prompt, 0, buff, min,
-                                    (len >= BUFSIZ) ? BUFSIZ - 1 : len,
-                                    buf) < 0))
+                   (len >= BUFSIZ) ? BUFSIZ - 1 : len,
+                   buf)
+                < 0))
         goto end;
     ret = UI_process(ui);
     OPENSSL_cleanse(buff, BUFSIZ);
- end:
+end:
     UI_free(ui);
     return ret;
 }
 
 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)
 {
     EVP_MD_CTX *c;
     unsigned char md_buf[EVP_MAX_MD_SIZE];
@@ -147,7 +149,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
             break;
     }
     rv = EVP_CIPHER_get_key_length(type);
- err:
+err:
     EVP_MD_CTX_free(c);
     OPENSSL_cleanse(md_buf, sizeof(md_buf));
     return rv;
diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index 32ada929e1bec..ddf5fd54b31c5 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -30,7 +30,7 @@
 #include "evp_local.h"
 
 #if !defined(FIPS_MODULE)
-# include "crypto/asn1.h"
+#include "crypto/asn1.h"
 
 int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
 {
@@ -79,9 +79,9 @@ int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
 }
 
 int evp_cipher_param_to_asn1_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
-                                evp_cipher_aead_asn1_params *asn1_params)
+    evp_cipher_aead_asn1_params *asn1_params)
 {
-    int ret = -1;                /* Assume the worst */
+    int ret = -1; /* Assume the worst */
     const EVP_CIPHER *cipher;
 
     if (c == NULL || c->cipher == NULL)
@@ -139,7 +139,7 @@ int evp_cipher_param_to_asn1_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
         ret = -2;
     }
 
- err:
+err:
     if (ret == -2)
         ERR_raise(ERR_LIB_EVP, EVP_R_UNSUPPORTED_CIPHER);
     else if (ret <= 0)
@@ -150,9 +150,9 @@ int evp_cipher_param_to_asn1_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
 }
 
 int evp_cipher_asn1_to_param_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
-                                evp_cipher_aead_asn1_params *asn1_params)
+    evp_cipher_aead_asn1_params *asn1_params)
 {
-    int ret = -1;                /* Assume the worst */
+    int ret = -1; /* Assume the worst */
     const EVP_CIPHER *cipher;
 
     if (c == NULL || c->cipher == NULL)
@@ -219,7 +219,7 @@ int evp_cipher_asn1_to_param_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
 }
 
 int evp_cipher_get_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
-                                    evp_cipher_aead_asn1_params *asn1_params)
+    evp_cipher_aead_asn1_params *asn1_params)
 {
     int i = 0;
     long tl;
@@ -228,10 +228,9 @@ int evp_cipher_get_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
     if (type == NULL || asn1_params == NULL)
         return 0;
 
-    i = ossl_asn1_type_get_octetstring_int(type, &tl, NULL, EVP_MAX_IV_LENGTH);
-    if (i <= 0)
+    i = ossl_asn1_type_get_octetstring_int(type, &tl, iv, EVP_MAX_IV_LENGTH);
+    if (i <= 0 || i > EVP_MAX_IV_LENGTH)
         return -1;
-    ossl_asn1_type_get_octetstring_int(type, &tl, iv, i);
 
     memcpy(asn1_params->iv, iv, i);
     asn1_params->iv_len = i;
@@ -240,14 +239,14 @@ int evp_cipher_get_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
 }
 
 int evp_cipher_set_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
-                                    evp_cipher_aead_asn1_params *asn1_params)
+    evp_cipher_aead_asn1_params *asn1_params)
 {
     if (type == NULL || asn1_params == NULL)
         return 0;
 
     return ossl_asn1_type_set_octetstring_int(type, asn1_params->tag_len,
-                                              asn1_params->iv,
-                                              asn1_params->iv_len);
+        asn1_params->iv,
+        asn1_params->iv_len);
 }
 #endif /* !defined(FIPS_MODULE) */
 
@@ -304,15 +303,15 @@ int EVP_CIPHER_get_type(const EVP_CIPHER *cipher)
 #ifdef FIPS_MODULE
         return NID_undef;
 #else
-        {
-            /* Check it has an OID and it is valid */
-            ASN1_OBJECT *otmp = OBJ_nid2obj(nid);
-
-            if (OBJ_get0_data(otmp) == NULL)
-                nid = NID_undef;
-            ASN1_OBJECT_free(otmp);
-            return nid;
-        }
+    {
+        /* Check it has an OID and it is valid */
+        ASN1_OBJECT *otmp = OBJ_nid2obj(nid);
+
+        if (OBJ_get0_data(otmp) == NULL)
+            nid = NID_undef;
+        ASN1_OBJECT_free(otmp);
+        return nid;
+    }
 #endif
     }
 }
@@ -332,12 +331,12 @@ int evp_cipher_cache_constants(EVP_CIPHER *cipher)
     params[3] = OSSL_PARAM_construct_uint(OSSL_CIPHER_PARAM_MODE, &mode);
     params[4] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_AEAD, &aead);
     params[5] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_CUSTOM_IV,
-                                         &custom_iv);
+        &custom_iv);
     params[6] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_CTS, &cts);
     params[7] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK,
-                                         &multiblock);
+        &multiblock);
     params[8] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_HAS_RAND_KEY,
-                                         &randkey);
+        &randkey);
     params[9] = OSSL_PARAM_construct_end();
     ok = evp_do_ciph_getparams(cipher, params) > 0;
     if (ok) {
@@ -358,7 +357,7 @@ int evp_cipher_cache_constants(EVP_CIPHER *cipher)
         if (randkey)
             cipher->flags |= EVP_CIPH_RAND_KEY;
         if (OSSL_PARAM_locate_const(EVP_CIPHER_gettable_ctx_params(cipher),
-                                    OSSL_CIPHER_PARAM_ALGORITHM_ID_PARAMS))
+                OSSL_CIPHER_PARAM_ALGORITHM_ID_PARAMS))
             cipher->flags |= EVP_CIPH_FLAG_CUSTOM_ASN1;
     }
     return ok;
@@ -380,7 +379,7 @@ int EVP_CIPHER_impl_ctx_size(const EVP_CIPHER *e)
 }
 
 int EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-               const unsigned char *in, unsigned int inl)
+    const unsigned char *in, unsigned int inl)
 {
     if (ctx == NULL || ctx->cipher == NULL)
         return 0;
@@ -401,17 +400,18 @@ int EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             return 0;
 
         if (ctx->cipher->ccipher != NULL)
-            ret =  ctx->cipher->ccipher(ctx->algctx, out, &outl,
-                                        inl + (blocksize == 1 ? 0 : blocksize),
-                                        in, (size_t)inl)
-                ? (int)outl : -1;
+            ret = ctx->cipher->ccipher(ctx->algctx, out, &outl,
+                      inl + (blocksize == 1 ? 0 : blocksize),
+                      in, (size_t)inl)
+                ? (int)outl
+                : -1;
         else if (in != NULL)
             ret = ctx->cipher->cupdate(ctx->algctx, out, &outl,
-                                       inl + (blocksize == 1 ? 0 : blocksize),
-                                       in, (size_t)inl);
+                inl + (blocksize == 1 ? 0 : blocksize),
+                in, (size_t)inl);
         else
             ret = ctx->cipher->cfinal(ctx->algctx, out, &outl,
-                                      blocksize == 1 ? 0 : blocksize);
+                blocksize == 1 ? 0 : blocksize);
 
         return ret;
     }
@@ -499,11 +499,11 @@ int EVP_CIPHER_CTX_get_iv_length(const EVP_CIPHER_CTX *ctx)
 
         if (ctx->cipher->get_ctx_params != NULL) {
             params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_IVLEN,
-                                                    &v);
+                &v);
             rv = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
             if (rv > 0) {
                 if (OSSL_PARAM_modified(params)
-                        && !OSSL_PARAM_get_int(params, &len))
+                    && !OSSL_PARAM_get_int(params, &len))
                     return -1;
             } else if (rv != EVP_CTRL_RET_UNSUPPORTED) {
                 return -1;
@@ -511,9 +511,10 @@ int EVP_CIPHER_CTX_get_iv_length(const EVP_CIPHER_CTX *ctx)
         }
         /* Code below to be removed when legacy support is dropped. */
         else if ((EVP_CIPHER_get_flags(ctx->cipher)
-                  & EVP_CIPH_CUSTOM_IV_LENGTH) != 0) {
+                     & EVP_CIPH_CUSTOM_IV_LENGTH)
+            != 0) {
             rv = EVP_CIPHER_CTX_ctrl((EVP_CIPHER_CTX *)ctx, EVP_CTRL_GET_IVLEN,
-                                     0, &len);
+                0, &len);
             if (rv <= 0)
                 return -1;
         }
@@ -544,9 +545,8 @@ const unsigned char *EVP_CIPHER_CTX_original_iv(const EVP_CIPHER_CTX *ctx)
     const unsigned char *v = ctx->oiv;
     OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
 
-    params[0] =
-        OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_IV,
-                                       (void **)&v, sizeof(ctx->oiv));
+    params[0] = OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_IV,
+        (void **)&v, sizeof(ctx->oiv));
     ok = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
 
     return ok != 0 ? v : NULL;
@@ -561,9 +561,8 @@ const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx)
     const unsigned char *v = ctx->iv;
     OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
 
-    params[0] =
-        OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_UPDATED_IV,
-                                       (void **)&v, sizeof(ctx->iv));
+    params[0] = OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_UPDATED_IV,
+        (void **)&v, sizeof(ctx->iv));
     ok = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
 
     return ok != 0 ? v : NULL;
@@ -575,9 +574,8 @@ unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx)
     unsigned char *v = ctx->iv;
     OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
 
-    params[0] =
-        OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_UPDATED_IV,
-                                       (void **)&v, sizeof(ctx->iv));
+    params[0] = OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_UPDATED_IV,
+        (void **)&v, sizeof(ctx->iv));
     ok = evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params);
 
     return ok != 0 ? v : NULL;
@@ -588,8 +586,7 @@ int EVP_CIPHER_CTX_get_updated_iv(EVP_CIPHER_CTX *ctx, void *buf, size_t len)
 {
     OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
 
-    params[0] =
-        OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_UPDATED_IV, buf, len);
+    params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_UPDATED_IV, buf, len);
     return evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params) > 0;
 }
 
@@ -597,8 +594,7 @@ int EVP_CIPHER_CTX_get_original_iv(EVP_CIPHER_CTX *ctx, void *buf, size_t len)
 {
     OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
 
-    params[0] =
-        OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_IV, buf, len);
+    params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_IV, buf, len);
     return evp_do_ciph_ctx_getparams(ctx->cipher, ctx->algctx, params) > 0;
 }
 
@@ -714,8 +710,8 @@ const char *EVP_CIPHER_get0_description(const EVP_CIPHER *cipher)
 }
 
 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)
 {
     if (cipher->prov != NULL)
         return evp_names_do_all(cipher->prov, cipher->name_id, fn, data);
@@ -772,8 +768,8 @@ const char *EVP_MD_get0_name(const EVP_MD *md)
 }
 
 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)
 {
     if (md->prov != NULL)
         return evp_names_do_all(md->prov, md->name_id, fn, data);
@@ -868,7 +864,7 @@ void evp_md_free_int(EVP_MD *md)
 void EVP_MD_meth_free(EVP_MD *md)
 {
     if (md == NULL || md->origin != EVP_ORIG_METH)
-       return;
+        return;
 
     evp_md_free_int(md);
 }
@@ -913,9 +909,7 @@ int EVP_MD_meth_set_init(EVP_MD *md, int (*init)(EVP_MD_CTX *ctx))
     md->init = init;
     return 1;
 }
-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))
 {
     if (md->update != NULL)
         return 0;
@@ -923,8 +917,7 @@ int EVP_MD_meth_set_update(EVP_MD *md, int (*update)(EVP_MD_CTX *ctx,
     md->update = update;
     return 1;
 }
-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))
 {
     if (md->final != NULL)
         return 0;
@@ -932,8 +925,7 @@ int EVP_MD_meth_set_final(EVP_MD *md, int (*final)(EVP_MD_CTX *ctx,
     md->final = final;
     return 1;
 }
-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))
 {
     if (md->copy != NULL)
         return 0;
@@ -949,8 +941,7 @@ int EVP_MD_meth_set_cleanup(EVP_MD *md, int (*cleanup)(EVP_MD_CTX *ctx))
     md->cleanup = cleanup;
     return 1;
 }
-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))
 {
     if (md->md_ctrl != NULL)
         return 0;
@@ -980,18 +971,18 @@ int (*EVP_MD_meth_get_init(const EVP_MD *md))(EVP_MD_CTX *ctx)
     return md->init;
 }
 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)
 {
     return md->update;
 }
 int (*EVP_MD_meth_get_final(const EVP_MD *md))(EVP_MD_CTX *ctx,
-                                               unsigned char *md)
+    unsigned char *md)
 {
     return md->final;
 }
 int (*EVP_MD_meth_get_copy(const EVP_MD *md))(EVP_MD_CTX *to,
-                                              const EVP_MD_CTX *from)
+    const EVP_MD_CTX *from)
 {
     return md->copy;
 }
@@ -1000,7 +991,7 @@ int (*EVP_MD_meth_get_cleanup(const EVP_MD *md))(EVP_MD_CTX *ctx)
     return md->cleanup;
 }
 int (*EVP_MD_meth_get_ctrl(const EVP_MD *md))(EVP_MD_CTX *ctx, int cmd,
-                                              int p1, void *p2)
+    int p1, void *p2)
 {
     return md->md_ctrl;
 }
@@ -1040,8 +1031,9 @@ int EVP_MD_CTX_get_size_ex(const EVP_MD_CTX *ctx)
 
     gettables = EVP_MD_CTX_gettable_params(c);
     if (gettables != NULL
-            && OSSL_PARAM_locate_const(gettables,
-                                       OSSL_DIGEST_PARAM_SIZE) != NULL) {
+        && OSSL_PARAM_locate_const(gettables,
+               OSSL_DIGEST_PARAM_SIZE)
+            != NULL) {
         OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
         size_t sz = 0;
 
@@ -1052,8 +1044,8 @@ int EVP_MD_CTX_get_size_ex(const EVP_MD_CTX *ctx)
          */
         params[0] = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_SIZE, &sz);
         if (EVP_MD_CTX_get_params(c, params) != 1
-                || sz == SIZE_MAX
-                || sz == 0)
+            || sz == SIZE_MAX
+            || sz == 0)
             return -1;
         return sz;
     }
@@ -1093,14 +1085,14 @@ void *EVP_MD_CTX_get0_md_data(const EVP_MD_CTX *ctx)
 }
 
 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)
 {
     return ctx->update;
 }
 
 void EVP_MD_CTX_set_update_fn(EVP_MD_CTX *ctx,
-                              int (*update) (EVP_MD_CTX *ctx,
-                                             const void *data, size_t count))
+    int (*update)(EVP_MD_CTX *ctx,
+        const void *data, size_t count))
 {
     ctx->update = update;
 }
@@ -1121,7 +1113,7 @@ int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags)
 }
 
 static int evp_cipher_ctx_enable_use_bits(EVP_CIPHER_CTX *ctx,
-                                          unsigned int enable)
+    unsigned int enable)
 {
     OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END };
 
@@ -1168,7 +1160,7 @@ int EVP_PKEY_CTX_set_group_name(EVP_PKEY_CTX *ctx, const char *name)
         return -1;
 
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                 (char *)name, 0);
+        (char *)name, 0);
     return EVP_PKEY_CTX_set_params(ctx, params);
 }
 
@@ -1188,12 +1180,12 @@ int EVP_PKEY_CTX_get_group_name(EVP_PKEY_CTX *ctx, char *name, size_t namelen)
         return -1;
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                            name, namelen);
+        name, namelen);
     if (!EVP_PKEY_CTX_get_params(ctx, params))
         return -1;
     return 1;
 }
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
 
 /*
  * evp_pkey_keygen() abstracts from the explicit use of B<EVP_PKEY_CTX>
@@ -1205,14 +1197,14 @@ int EVP_PKEY_CTX_get_group_name(EVP_PKEY_CTX *ctx, char *name, size_t namelen)
  * such as the RSA modulus size or the name of an EC curve.
  */
 static EVP_PKEY *evp_pkey_keygen(OSSL_LIB_CTX *libctx, const char *name,
-                                 const char *propq, const OSSL_PARAM *params)
+    const char *propq, const OSSL_PARAM *params)
 {
     EVP_PKEY *pkey = NULL;
     EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_from_name(libctx, name, propq);
 
     if (ctx != NULL
-            && EVP_PKEY_keygen_init(ctx) > 0
-            && EVP_PKEY_CTX_set_params(ctx, params))
+        && EVP_PKEY_keygen_init(ctx) > 0
+        && EVP_PKEY_CTX_set_params(ctx, params))
         (void)EVP_PKEY_generate(ctx, &pkey);
 
     EVP_PKEY_CTX_free(ctx);
@@ -1220,7 +1212,7 @@ static EVP_PKEY *evp_pkey_keygen(OSSL_LIB_CTX *libctx, const char *name,
 }
 
 EVP_PKEY *EVP_PKEY_Q_keygen(OSSL_LIB_CTX *libctx, const char *propq,
-                            const char *type, ...)
+    const char *type, ...)
 {
     va_list args;
     size_t bits;
@@ -1236,7 +1228,7 @@ EVP_PKEY *EVP_PKEY_Q_keygen(OSSL_LIB_CTX *libctx, const char *propq,
     } else if (OPENSSL_strcasecmp(type, "EC") == 0) {
         name = va_arg(args, char *);
         params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                     name, 0);
+            name, 0);
     }
 
     ret = evp_pkey_keygen(libctx, type, propq, params);
@@ -1248,7 +1240,7 @@ EVP_PKEY *EVP_PKEY_Q_keygen(OSSL_LIB_CTX *libctx, const char *propq,
 #if !defined(FIPS_MODULE)
 int EVP_CIPHER_CTX_set_algor_params(EVP_CIPHER_CTX *ctx, const X509_ALGOR *alg)
 {
-    int ret = -1;                /* Assume the worst */
+    int ret = -1; /* Assume the worst */
     unsigned char *der = NULL;
     int derl = -1;
 
@@ -1272,7 +1264,7 @@ int EVP_CIPHER_CTX_set_algor_params(EVP_CIPHER_CTX *ctx, const X509_ALGOR *alg)
 
 int EVP_CIPHER_CTX_get_algor_params(EVP_CIPHER_CTX *ctx, X509_ALGOR *alg)
 {
-    int ret = -1;                /* Assume the worst */
+    int ret = -1; /* Assume the worst */
     unsigned char *der = NULL;
     size_t derl;
     ASN1_TYPE *type = NULL;
@@ -1322,7 +1314,8 @@ int EVP_CIPHER_CTX_get_algor_params(EVP_CIPHER_CTX *ctx, X509_ALGOR *alg)
         if (EVP_CIPHER_CTX_get_params(ctx, params)
             && OSSL_PARAM_modified(&params[i])
             && d2i_ASN1_TYPE(&type, (const unsigned char **)&derp,
-                             (int)derl) != NULL) {
+                   (int)derl)
+                != NULL) {
             /*
              * Don't free alg->parameter, see comment further up.
              * Worst case, alg->parameter gets assigned its own value.
@@ -1331,14 +1324,14 @@ int EVP_CIPHER_CTX_get_algor_params(EVP_CIPHER_CTX *ctx, X509_ALGOR *alg)
             ret = 1;
         }
     }
- err:
+err:
     OPENSSL_free(der);
     return ret;
 }
 
 int EVP_CIPHER_CTX_get_algor(EVP_CIPHER_CTX *ctx, X509_ALGOR **alg)
 {
-    int ret = -1;                /* Assume the worst */
+    int ret = -1; /* Assume the worst */
     OSSL_PARAM params[2];
     size_t aid_len = 0;
     const char *k_aid = OSSL_SIGNATURE_PARAM_ALGORITHM_ID;
@@ -1370,13 +1363,13 @@ int EVP_CIPHER_CTX_get_algor(EVP_CIPHER_CTX *ctx, X509_ALGOR **alg)
         }
         OPENSSL_free(aid);
     }
- err:
+err:
     return ret;
 }
 
 int EVP_PKEY_CTX_set_algor_params(EVP_PKEY_CTX *ctx, const X509_ALGOR *alg)
 {
-    int ret = -1;                /* Assume the worst */
+    int ret = -1; /* Assume the worst */
     unsigned char *der = NULL;
     int derl = -1;
 
@@ -1398,7 +1391,7 @@ int EVP_PKEY_CTX_set_algor_params(EVP_PKEY_CTX *ctx, const X509_ALGOR *alg)
 
 int EVP_PKEY_CTX_get_algor_params(EVP_PKEY_CTX *ctx, X509_ALGOR *alg)
 {
-    int ret = -1;                /* Assume the worst */
+    int ret = -1; /* Assume the worst */
     OSSL_PARAM params[2];
     unsigned char *der = NULL;
     size_t derl;
@@ -1438,7 +1431,8 @@ int EVP_PKEY_CTX_get_algor_params(EVP_PKEY_CTX *ctx, X509_ALGOR *alg)
         if (EVP_PKEY_CTX_get_params(ctx, params)
             && OSSL_PARAM_modified(&params[0])
             && d2i_ASN1_TYPE(&type, (const unsigned char **)&derp,
-                             derl) != NULL) {
+                   derl)
+                != NULL) {
             /*
              * Don't free alg->parameter, see comment further up.
              * Worst case, alg->parameter gets assigned its own value.
@@ -1447,14 +1441,14 @@ int EVP_PKEY_CTX_get_algor_params(EVP_PKEY_CTX *ctx, X509_ALGOR *alg)
             ret = 1;
         }
     }
- err:
+err:
     OPENSSL_free(der);
     return ret;
 }
 
 int EVP_PKEY_CTX_get_algor(EVP_PKEY_CTX *ctx, X509_ALGOR **alg)
 {
-    int ret = -1;                /* Assume the worst */
+    int ret = -1; /* Assume the worst */
     OSSL_PARAM params[2];
     size_t aid_len = 0;
     const char *k_aid = OSSL_SIGNATURE_PARAM_ALGORITHM_ID;
@@ -1486,7 +1480,7 @@ int EVP_PKEY_CTX_get_algor(EVP_PKEY_CTX *ctx, X509_ALGOR **alg)
         }
         OPENSSL_free(aid);
     }
- err:
+err:
     return ret;
 }
 
diff --git a/crypto/evp/evp_local.h b/crypto/evp/evp_local.h
index 9a216c30c849a..ec1e3a83fa152 100644
--- a/crypto/evp/evp_local.h
+++ b/crypto/evp/evp_local.h
@@ -12,18 +12,17 @@
 
 #define EVP_CTRL_RET_UNSUPPORTED -1
 
-
 struct evp_md_ctx_st {
-    const EVP_MD *reqdigest;    /* The original requested digest */
+    const EVP_MD *reqdigest; /* The original requested digest */
     const EVP_MD *digest;
-    ENGINE *engine;             /* functional reference if 'digest' is
-                                 * ENGINE-provided */
+    ENGINE *engine; /* functional reference if 'digest' is
+                     * ENGINE-provided */
     unsigned long flags;
     void *md_data;
     /* Public key context for sign/verify */
     EVP_PKEY_CTX *pctx;
     /* Update function: usually copied from EVP_MD */
-    int (*update) (EVP_MD_CTX *ctx, const void *data, size_t count);
+    int (*update)(EVP_MD_CTX *ctx, const void *data, size_t count);
 
     /*
      * Opaque ctx returned from a providers digest algorithm implementation
@@ -31,24 +30,24 @@ struct evp_md_ctx_st {
      */
     void *algctx;
     EVP_MD *fetched_digest;
-} /* EVP_MD_CTX */ ;
+} /* EVP_MD_CTX */;
 
 struct evp_cipher_ctx_st {
     const EVP_CIPHER *cipher;
-    ENGINE *engine;             /* functional reference if 'cipher' is
-                                 * ENGINE-provided */
-    int encrypt;                /* encrypt or decrypt */
-    int buf_len;                /* number we have left */
+    ENGINE *engine; /* functional reference if 'cipher' is
+                     * ENGINE-provided */
+    int encrypt; /* encrypt or decrypt */
+    int buf_len; /* number we have left */
     unsigned char oiv[EVP_MAX_IV_LENGTH]; /* original iv */
     unsigned char iv[EVP_MAX_IV_LENGTH]; /* working iv */
     unsigned char buf[EVP_MAX_BLOCK_LENGTH]; /* saved partial block */
-    int num;                    /* used by cfb/ofb/ctr mode */
+    int num; /* used by cfb/ofb/ctr mode */
     /* FIXME: Should this even exist? It appears unused */
-    void *app_data;             /* application stuff */
-    int key_len;                /* May change for variable length cipher */
-    int iv_len;                 /* IV length */
-    unsigned long flags;        /* Various flags */
-    void *cipher_data;          /* per EVP data */
+    void *app_data; /* application stuff */
+    int key_len; /* May change for variable length cipher */
+    int iv_len; /* IV length */
+    unsigned long flags; /* Various flags */
+    void *cipher_data; /* per EVP data */
     int final_used;
     int block_mask;
     unsigned char final[EVP_MAX_BLOCK_LENGTH]; /* possible final block */
@@ -60,10 +59,10 @@ struct evp_cipher_ctx_st {
      */
     void *algctx;
     EVP_CIPHER *fetched_cipher;
-} /* EVP_CIPHER_CTX */ ;
+} /* EVP_CIPHER_CTX */;
 
 struct evp_mac_ctx_st {
-    EVP_MAC *meth;               /* Method structure */
+    EVP_MAC *meth; /* Method structure */
     /*
      * Opaque ctx returned from a providers MAC algorithm implementation
      * OSSL_FUNC_mac_newctx()
@@ -72,28 +71,28 @@ struct evp_mac_ctx_st {
 } /* EVP_MAC_CTX */;
 
 struct evp_kdf_ctx_st {
-    EVP_KDF *meth;              /* Method structure */
+    EVP_KDF *meth; /* Method structure */
     /*
      * Opaque ctx returned from a providers KDF algorithm implementation
      * OSSL_FUNC_kdf_newctx()
      */
     void *algctx;
-} /* EVP_KDF_CTX */ ;
+} /* EVP_KDF_CTX */;
 
 struct evp_rand_ctx_st {
-    EVP_RAND *meth;             /* Method structure */
+    EVP_RAND *meth; /* Method structure */
     /*
      * Opaque ctx returned from a providers rand algorithm implementation
      * OSSL_FUNC_rand_newctx()
      */
     void *algctx;
-    EVP_RAND_CTX *parent;       /* Parent EVP_RAND or NULL if none */
-    CRYPTO_REF_COUNT refcnt;    /* Context reference count */
+    EVP_RAND_CTX *parent; /* Parent EVP_RAND or NULL if none */
+    CRYPTO_REF_COUNT refcnt; /* Context reference count */
     CRYPTO_RWLOCK *refcnt_lock;
-} /* EVP_RAND_CTX */ ;
+} /* EVP_RAND_CTX */;
 
 struct evp_keymgmt_st {
-    int id;                      /* libcrypto internal */
+    int id; /* libcrypto internal */
 
     int name_id;
     /* NID for the legacy alg if there is one */
@@ -137,7 +136,7 @@ struct evp_keymgmt_st {
     OSSL_FUNC_keymgmt_export_types_fn *export_types;
     OSSL_FUNC_keymgmt_export_types_ex_fn *export_types_ex;
     OSSL_FUNC_keymgmt_dup_fn *dup;
-} /* EVP_KEYMGMT */ ;
+} /* EVP_KEYMGMT */;
 
 struct evp_keyexch_st {
     int name_id;
@@ -267,13 +266,13 @@ struct evp_kem_st {
 } /* EVP_KEM */;
 
 int PKCS5_v2_PBKDF2_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_PBKDF2_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);
 
 struct evp_Encode_Ctx_st {
     /* number saved in a partial encode/decode */
@@ -300,64 +299,64 @@ int ossl_is_partially_overlapping(const void *ptr1, const void *ptr2, int len);
 #include <openssl/core.h>
 
 void *evp_generic_fetch(OSSL_LIB_CTX *ctx, int operation_id,
-                        const char *name, const char *properties,
-                        void *(*new_method)(int name_id,
-                                            const OSSL_ALGORITHM *algodef,
-                                            OSSL_PROVIDER *prov),
-                        int (*up_ref_method)(void *),
-                        void (*free_method)(void *));
+    const char *name, const char *properties,
+    void *(*new_method)(int name_id,
+        const OSSL_ALGORITHM *algodef,
+        OSSL_PROVIDER *prov),
+    int (*up_ref_method)(void *),
+    void (*free_method)(void *));
 void *evp_generic_fetch_from_prov(OSSL_PROVIDER *prov, int operation_id,
-                                  const char *name, const char *properties,
-                                  void *(*new_method)(int name_id,
-                                                      const OSSL_ALGORITHM *algodef,
-                                                      OSSL_PROVIDER *prov),
-                                  int (*up_ref_method)(void *),
-                                  void (*free_method)(void *));
+    const char *name, const char *properties,
+    void *(*new_method)(int name_id,
+        const OSSL_ALGORITHM *algodef,
+        OSSL_PROVIDER *prov),
+    int (*up_ref_method)(void *),
+    void (*free_method)(void *));
 void evp_generic_do_all_prefetched(OSSL_LIB_CTX *libctx, int operation_id,
-                                   void (*user_fn)(void *method, void *arg),
-                                   void *user_arg);
+    void (*user_fn)(void *method, void *arg),
+    void *user_arg);
 void evp_generic_do_all(OSSL_LIB_CTX *libctx, int operation_id,
-                        void (*user_fn)(void *method, void *arg),
-                        void *user_arg,
-                        void *(*new_method)(int name_id,
-                                            const OSSL_ALGORITHM *algodef,
-                                            OSSL_PROVIDER *prov),
-                        int (*up_ref_method)(void *),
-                        void (*free_method)(void *));
+    void (*user_fn)(void *method, void *arg),
+    void *user_arg,
+    void *(*new_method)(int name_id,
+        const OSSL_ALGORITHM *algodef,
+        OSSL_PROVIDER *prov),
+    int (*up_ref_method)(void *),
+    void (*free_method)(void *));
 
 /* Internal fetchers for method types that are to be combined with others */
 EVP_KEYMGMT *evp_keymgmt_fetch_by_number(OSSL_LIB_CTX *ctx, int name_id,
-                                         const char *properties);
+    const char *properties);
 EVP_SIGNATURE *evp_signature_fetch_from_prov(OSSL_PROVIDER *prov,
-                                             const char *name,
-                                             const char *properties);
+    const char *name,
+    const char *properties);
 EVP_ASYM_CIPHER *evp_asym_cipher_fetch_from_prov(OSSL_PROVIDER *prov,
-                                                 const char *name,
-                                                 const char *properties);
+    const char *name,
+    const char *properties);
 EVP_KEYEXCH *evp_keyexch_fetch_from_prov(OSSL_PROVIDER *prov,
-                                         const char *name,
-                                         const char *properties);
+    const char *name,
+    const char *properties);
 EVP_KEM *evp_kem_fetch_from_prov(OSSL_PROVIDER *prov,
-                                 const char *name,
-                                 const char *properties);
+    const char *name,
+    const char *properties);
 EVP_CIPHER *evp_cipher_fetch_from_prov(OSSL_PROVIDER *prov,
-                                       const char *algorithm,
-                                       const char *properties);
+    const char *algorithm,
+    const char *properties);
 EVP_MD *evp_digest_fetch_from_prov(OSSL_PROVIDER *prov,
-                                   const char *algorithm,
-                                   const char *properties);
+    const char *algorithm,
+    const char *properties);
 EVP_MAC *evp_mac_fetch_from_prov(OSSL_PROVIDER *prov,
-                                 const char *algorithm,
-                                 const char *properties);
+    const char *algorithm,
+    const char *properties);
 
 /* Internal structure constructors for fetched methods */
 EVP_MD *evp_md_new(void);
 EVP_CIPHER *evp_cipher_new(void);
 
 int evp_cipher_get_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
-                                    evp_cipher_aead_asn1_params *asn1_params);
+    evp_cipher_aead_asn1_params *asn1_params);
 int evp_cipher_set_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
-                                    evp_cipher_aead_asn1_params *asn1_params);
+    evp_cipher_aead_asn1_params *asn1_params);
 
 /* Helper functions to avoid duplicating code */
 
@@ -374,33 +373,33 @@ int evp_cipher_set_asn1_aead_params(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
  */
 int evp_do_ciph_getparams(const EVP_CIPHER *ciph, OSSL_PARAM params[]);
 int evp_do_ciph_ctx_getparams(const EVP_CIPHER *ciph, void *provctx,
-                              OSSL_PARAM params[]);
+    OSSL_PARAM params[]);
 int evp_do_ciph_ctx_setparams(const EVP_CIPHER *ciph, void *provctx,
-                              OSSL_PARAM params[]);
+    OSSL_PARAM params[]);
 int evp_do_md_getparams(const EVP_MD *md, OSSL_PARAM params[]);
 int evp_do_md_ctx_getparams(const EVP_MD *md, void *provctx,
-                            OSSL_PARAM params[]);
+    OSSL_PARAM params[]);
 int evp_do_md_ctx_setparams(const EVP_MD *md, void *provctx,
-                            OSSL_PARAM params[]);
+    OSSL_PARAM params[]);
 
 OSSL_PARAM *evp_pkey_to_param(EVP_PKEY *pkey, size_t *sz);
 
-#define M_check_autoarg(ctx, arg, arglen, err) \
-    if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) {           \
-        size_t pksize = (size_t)EVP_PKEY_get_size(ctx->pkey);         \
-                                                                  \
-        if (pksize == 0) {                                        \
-            ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY); /*ckerr_ignore*/ \
-            return 0;                                             \
-        }                                                         \
-        if (arg == NULL) {                                        \
-            *arglen = pksize;                                     \
-            return 1;                                             \
-        }                                                         \
-        if (*arglen < pksize) {                                   \
+#define M_check_autoarg(ctx, arg, arglen, err)                               \
+    if (ctx->pmeth->flags & EVP_PKEY_FLAG_AUTOARGLEN) {                      \
+        size_t pksize = (size_t)EVP_PKEY_get_size(ctx->pkey);                \
+                                                                             \
+        if (pksize == 0) {                                                   \
+            ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY); /*ckerr_ignore*/      \
+            return 0;                                                        \
+        }                                                                    \
+        if (arg == NULL) {                                                   \
+            *arglen = pksize;                                                \
+            return 1;                                                        \
+        }                                                                    \
+        if (*arglen < pksize) {                                              \
             ERR_raise(ERR_LIB_EVP, EVP_R_BUFFER_TOO_SMALL); /*ckerr_ignore*/ \
-            return 0;                                             \
-        }                                                         \
+            return 0;                                                        \
+        }                                                                    \
     }
 
 void evp_pkey_ctx_free_old_ops(EVP_PKEY_CTX *ctx);
@@ -409,8 +408,8 @@ void evp_md_free_int(EVP_MD *md);
 
 /* OSSL_PROVIDER * is only used to get the library context */
 int evp_is_a(OSSL_PROVIDER *prov, int number,
-             const char *legacy_name, const char *name);
+    const char *legacy_name, const char *name);
 int evp_names_do_all(OSSL_PROVIDER *prov, int number,
-                     void (*fn)(const char *name, void *data),
-                     void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 int evp_cipher_cache_constants(EVP_CIPHER *cipher);
diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index 5478dfcd3b6db..785c4e1f512fa 100644
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -33,70 +33,69 @@ struct evp_pbe_st {
 static STACK_OF(EVP_PBE_CTL) *pbe_algs;
 
 static const EVP_PBE_CTL builtin_pbe[] = {
-    {EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndDES_CBC,
-     NID_des_cbc, NID_md2, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex},
-    {EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndDES_CBC,
-     NID_des_cbc, NID_md5, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex},
-    {EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndRC2_CBC,
-     NID_rc2_64_cbc, NID_sha1, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex},
-
-    {EVP_PBE_TYPE_OUTER, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen,
-     PKCS5_v2_PBKDF2_keyivgen_ex},
-
-    {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC4,
-     NID_rc4, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
-    {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC4,
-     NID_rc4_40, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
-    {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
-     NID_des_ede3_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
-    {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And2_Key_TripleDES_CBC,
-     NID_des_ede_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
-    {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC2_CBC,
-     NID_rc2_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
-    {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC2_CBC,
-     NID_rc2_40_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex},
-
-    {EVP_PBE_TYPE_OUTER, NID_pbes2, -1, -1, PKCS5_v2_PBE_keyivgen, &PKCS5_v2_PBE_keyivgen_ex},
-
-    {EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndRC2_CBC,
-     NID_rc2_64_cbc, NID_md2, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex},
-    {EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndRC2_CBC,
-     NID_rc2_64_cbc, NID_md5, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex},
-    {EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndDES_CBC,
-     NID_des_cbc, NID_sha1, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex},
-
-    {EVP_PBE_TYPE_PRF, NID_hmacWithSHA1, -1, NID_sha1, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmac_md5, -1, NID_md5, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmac_sha1, -1, NID_sha1, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmacWithMD5, -1, NID_md5, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmacWithSHA224, -1, NID_sha224, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmacWithSHA256, -1, NID_sha256, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmacWithSHA384, -1, NID_sha384, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmacWithSHA512, -1, NID_sha512, 0},
-    {EVP_PBE_TYPE_PRF, NID_id_HMACGostR3411_94, -1, NID_id_GostR3411_94, 0},
-    {EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_256, -1,
-     NID_id_GostR3411_2012_256, 0},
-    {EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_512, -1,
-     NID_id_GostR3411_2012_512, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmac_sha3_224, -1, NID_sha3_224, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmac_sha3_256, -1, NID_sha3_256, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmac_sha3_384, -1, NID_sha3_384, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmac_sha3_512, -1, NID_sha3_512, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_224, -1, NID_sha512_224, 0},
-    {EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_256, -1, NID_sha512_256, 0},
+    { EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndDES_CBC,
+        NID_des_cbc, NID_md2, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex },
+    { EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndDES_CBC,
+        NID_des_cbc, NID_md5, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex },
+    { EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndRC2_CBC,
+        NID_rc2_64_cbc, NID_sha1, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex },
+
+    { EVP_PBE_TYPE_OUTER, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen,
+        PKCS5_v2_PBKDF2_keyivgen_ex },
+
+    { EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC4,
+        NID_rc4, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex },
+    { EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC4,
+        NID_rc4_40, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex },
+    { EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
+        NID_des_ede3_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex },
+    { EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And2_Key_TripleDES_CBC,
+        NID_des_ede_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex },
+    { EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC2_CBC,
+        NID_rc2_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex },
+    { EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC2_CBC,
+        NID_rc2_40_cbc, NID_sha1, PKCS12_PBE_keyivgen, &PKCS12_PBE_keyivgen_ex },
+
+    { EVP_PBE_TYPE_OUTER, NID_pbes2, -1, -1, PKCS5_v2_PBE_keyivgen, &PKCS5_v2_PBE_keyivgen_ex },
+
+    { EVP_PBE_TYPE_OUTER, NID_pbeWithMD2AndRC2_CBC,
+        NID_rc2_64_cbc, NID_md2, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex },
+    { EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndRC2_CBC,
+        NID_rc2_64_cbc, NID_md5, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex },
+    { EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndDES_CBC,
+        NID_des_cbc, NID_sha1, PKCS5_PBE_keyivgen, PKCS5_PBE_keyivgen_ex },
+
+    { EVP_PBE_TYPE_PRF, NID_hmacWithSHA1, -1, NID_sha1, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmac_md5, -1, NID_md5, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmac_sha1, -1, NID_sha1, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmacWithMD5, -1, NID_md5, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmacWithSHA224, -1, NID_sha224, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmacWithSHA256, -1, NID_sha256, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmacWithSHA384, -1, NID_sha384, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmacWithSHA512, -1, NID_sha512, 0 },
+    { EVP_PBE_TYPE_PRF, NID_id_HMACGostR3411_94, -1, NID_id_GostR3411_94, 0 },
+    { EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_256, -1,
+        NID_id_GostR3411_2012_256, 0 },
+    { EVP_PBE_TYPE_PRF, NID_id_tc26_hmac_gost_3411_2012_512, -1,
+        NID_id_GostR3411_2012_512, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmac_sha3_224, -1, NID_sha3_224, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmac_sha3_256, -1, NID_sha3_256, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmac_sha3_384, -1, NID_sha3_384, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmac_sha3_512, -1, NID_sha3_512, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_224, -1, NID_sha512_224, 0 },
+    { EVP_PBE_TYPE_PRF, NID_hmacWithSHA512_256, -1, NID_sha512_256, 0 },
 #ifndef OPENSSL_NO_SM3
-    {EVP_PBE_TYPE_PRF, NID_hmacWithSM3, -1, NID_sm3, 0},
+    { EVP_PBE_TYPE_PRF, NID_hmacWithSM3, -1, NID_sm3, 0 },
 #endif
-    {EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen, &PKCS5_v2_PBKDF2_keyivgen_ex},
+    { EVP_PBE_TYPE_KDF, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen, &PKCS5_v2_PBKDF2_keyivgen_ex },
 #ifndef OPENSSL_NO_SCRYPT
-    {EVP_PBE_TYPE_KDF, NID_id_scrypt, -1, -1, PKCS5_v2_scrypt_keyivgen, &PKCS5_v2_scrypt_keyivgen_ex}
+    { EVP_PBE_TYPE_KDF, NID_id_scrypt, -1, -1, PKCS5_v2_scrypt_keyivgen, &PKCS5_v2_scrypt_keyivgen_ex }
 #endif
 };
 
-
 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)
 {
     const EVP_CIPHER *cipher = NULL;
     EVP_CIPHER *cipher_fetch = NULL;
@@ -107,7 +106,7 @@ int EVP_PBE_CipherInit_ex(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
     EVP_PBE_KEYGEN *keygen;
 
     if (!EVP_PBE_find_ex(EVP_PBE_TYPE_OUTER, OBJ_obj2nid(pbe_obj),
-                         &cipher_nid, &md_nid, &keygen, &keygen_ex)) {
+            &cipher_nid, &md_nid, &keygen, &keygen_ex)) {
         char obj_tmp[80];
 
         if (pbe_obj == NULL)
@@ -115,7 +114,7 @@ int EVP_PBE_CipherInit_ex(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
         else
             i2t_ASN1_OBJECT(obj_tmp, sizeof(obj_tmp), pbe_obj);
         ERR_raise_data(ERR_LIB_EVP, EVP_R_UNKNOWN_PBE_ALGORITHM,
-                       "TYPE=%s", obj_tmp);
+            "TYPE=%s", obj_tmp);
         goto err;
     }
 
@@ -133,7 +132,7 @@ int EVP_PBE_CipherInit_ex(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
         if (cipher == NULL) {
             (void)ERR_clear_last_mark();
             ERR_raise_data(ERR_LIB_EVP, EVP_R_UNKNOWN_CIPHER,
-                           OBJ_nid2sn(cipher_nid));
+                OBJ_nid2sn(cipher_nid));
             goto err;
         }
         (void)ERR_pop_to_mark();
@@ -168,7 +167,7 @@ int EVP_PBE_CipherInit_ex(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
 }
 
 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)
 {
     return EVP_PBE_CipherInit_ex(pbe_obj, pass, passlen, param, ctx, en_de, NULL, NULL);
 }
@@ -198,7 +197,7 @@ static int pbe_cmp(const EVP_PBE_CTL *const *a, const EVP_PBE_CTL *const *b)
 /* Add a PBE algorithm */
 
 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)
 {
     EVP_PBE_CTL *pbe_tmp = NULL;
 
@@ -225,13 +224,13 @@ int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid,
     }
     return 1;
 
- err:
+err:
     OPENSSL_free(pbe_tmp);
     return 0;
 }
 
 int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
-                    EVP_PBE_KEYGEN *keygen)
+    EVP_PBE_KEYGEN *keygen)
 {
     int cipher_nid, md_nid;
 
@@ -245,11 +244,11 @@ int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
         md_nid = -1;
 
     return EVP_PBE_alg_add_type(EVP_PBE_TYPE_OUTER, nid,
-                                cipher_nid, md_nid, keygen);
+        cipher_nid, md_nid, keygen);
 }
 
 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)
 {
     EVP_PBE_CTL *pbetmp = NULL, pbelu;
     int i;
@@ -282,7 +281,7 @@ int EVP_PBE_find_ex(int type, int pbe_nid, int *pcnid, int *pmnid,
 }
 
 int EVP_PBE_find(int type, int pbe_nid,
-                 int *pcnid, int *pmnid, EVP_PBE_KEYGEN **pkeygen)
+    int *pcnid, int *pmnid, EVP_PBE_KEYGEN **pkeygen)
 {
     return EVP_PBE_find_ex(type, pbe_nid, pcnid, pmnid, pkeygen, NULL);
 }
diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index a4505a9d036c5..6b0103c2aa00a 100644
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -23,7 +23,7 @@
 /* Extract a private key from a PKCS8 structure */
 
 EVP_PKEY *evp_pkcs82pkey_legacy(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *libctx,
-                                const char *propq)
+    const char *propq)
 {
     EVP_PKEY *pkey = NULL;
     const ASN1_OBJECT *algoid;
@@ -40,7 +40,7 @@ EVP_PKEY *evp_pkcs82pkey_legacy(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *lib
     if (!EVP_PKEY_set_type(pkey, OBJ_obj2nid(algoid))) {
         i2t_ASN1_OBJECT(obj_tmp, 80, algoid);
         ERR_raise_data(ERR_LIB_EVP, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM,
-                       "TYPE=%s", obj_tmp);
+            "TYPE=%s", obj_tmp);
         goto error;
     }
 
@@ -59,13 +59,13 @@ EVP_PKEY *evp_pkcs82pkey_legacy(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *lib
 
     return pkey;
 
- error:
+error:
     EVP_PKEY_free(pkey);
     return NULL;
 }
 
 EVP_PKEY *EVP_PKCS82PKEY_ex(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *libctx,
-                            const char *propq)
+    const char *propq)
 {
     EVP_PKEY *pkey = NULL;
     const unsigned char *p8_data = NULL;
@@ -78,19 +78,19 @@ EVP_PKEY *EVP_PKCS82PKEY_ex(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *libctx,
     char keytype[OSSL_MAX_NAME_SIZE];
 
     if (p8 == NULL
-            || !PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8)
-            || !OBJ_obj2txt(keytype, sizeof(keytype), algoid, 0))
+        || !PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8)
+        || !OBJ_obj2txt(keytype, sizeof(keytype), algoid, 0))
         return NULL;
 
     if ((encoded_len = i2d_PKCS8_PRIV_KEY_INFO(p8, &encoded_data)) <= 0
-            || encoded_data == NULL)
+        || encoded_data == NULL)
         return NULL;
 
     p8_data = encoded_data;
     len = encoded_len;
     selection = EVP_PKEY_KEYPAIR | EVP_PKEY_KEY_PARAMETERS;
     dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", "PrivateKeyInfo",
-                                         keytype, selection, libctx, propq);
+        keytype, selection, libctx, propq);
 
     if (dctx != NULL && OSSL_DECODER_CTX_get_num_decoders(dctx) == 0) {
         OSSL_DECODER_CTX_free(dctx);
@@ -101,7 +101,7 @@ EVP_PKEY *EVP_PKCS82PKEY_ex(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *libctx,
          * keytype
          */
         dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", "PrivateKeyInfo",
-                                             NULL, selection, libctx, propq);
+            NULL, selection, libctx, propq);
     }
 
     if (dctx == NULL
@@ -138,8 +138,9 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(const EVP_PKEY *pkey)
         const unsigned char *pp;
 
         if ((ctx = OSSL_ENCODER_CTX_new_for_pkey(pkey, selection,
-                                                 "DER", "PrivateKeyInfo",
-                                                 NULL)) == NULL
+                 "DER", "PrivateKeyInfo",
+                 NULL))
+                == NULL
             || !OSSL_ENCODER_to_data(ctx, &der, &derlen))
             goto error;
 
@@ -150,7 +151,7 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(const EVP_PKEY *pkey)
             goto error;
     } else {
         p8 = PKCS8_PRIV_KEY_INFO_new();
-        if (p8  == NULL) {
+        if (p8 == NULL) {
             ERR_raise(ERR_LIB_EVP, ERR_R_ASN1_LIB);
             return NULL;
         }
@@ -171,13 +172,12 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(const EVP_PKEY *pkey)
         }
     }
     goto end;
- error:
+error:
     PKCS8_PRIV_KEY_INFO_free(p8);
     p8 = NULL;
- end:
+end:
     OSSL_ENCODER_CTX_free(ctx);
     return p8;
-
 }
 
 /* EVP_PKEY attribute functions */
@@ -193,7 +193,7 @@ 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)
 {
     return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos);
 }
@@ -216,8 +216,8 @@ 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)
 {
     if (X509at_add1_attr_by_OBJ(&key->attributes, obj, type, bytes, len))
         return 1;
@@ -225,8 +225,8 @@ int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key,
 }
 
 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)
 {
     if (X509at_add1_attr_by_NID(&key->attributes, nid, type, bytes, len))
         return 1;
@@ -234,8 +234,8 @@ int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key,
 }
 
 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)
 {
     if (X509at_add1_attr_by_txt(&key->attributes, attrname, type, bytes, len))
         return 1;
@@ -254,7 +254,7 @@ const char *EVP_PKEY_get0_type_name(const EVP_PKEY *key)
     ameth = EVP_PKEY_get0_asn1(key);
     if (ameth != NULL)
         EVP_PKEY_asn1_get0_info(NULL, NULL,
-                                NULL, NULL, &name, ameth);
+            NULL, NULL, &name, ameth);
 
     return name;
 }
diff --git a/crypto/evp/evp_rand.c b/crypto/evp/evp_rand.c
index 50334042a9cca..6aa9c055678bd 100644
--- a/crypto/evp/evp_rand.c
+++ b/crypto/evp/evp_rand.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-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
@@ -48,7 +48,7 @@ struct evp_rand_st {
     OSSL_FUNC_rand_verify_zeroization_fn *verify_zeroization;
     OSSL_FUNC_rand_get_seed_fn *get_seed;
     OSSL_FUNC_rand_clear_seed_fn *clear_seed;
-} /* EVP_RAND */ ;
+} /* EVP_RAND */;
 
 static int evp_rand_up_ref(void *vrand)
 {
@@ -115,8 +115,8 @@ static void evp_rand_unlock(EVP_RAND_CTX *rand)
 }
 
 static void *evp_rand_from_algorithm(int name_id,
-                                     const OSSL_ALGORITHM *algodef,
-                                     OSSL_PROVIDER *prov)
+    const OSSL_ALGORITHM *algodef,
+    OSSL_PROVIDER *prov)
 {
     const OSSL_DISPATCH *fns = algodef->implementation;
     EVP_RAND *rand = NULL;
@@ -157,7 +157,7 @@ static void *evp_rand_from_algorithm(int name_id,
             fnrandcnt++;
             break;
         case OSSL_FUNC_RAND_UNINSTANTIATE:
-             if (rand->uninstantiate != NULL)
+            if (rand->uninstantiate != NULL)
                 break;
             rand->uninstantiate = OSSL_FUNC_rand_uninstantiate(fns);
             fnrandcnt++;
@@ -199,20 +199,17 @@ static void *evp_rand_from_algorithm(int name_id,
         case OSSL_FUNC_RAND_GETTABLE_PARAMS:
             if (rand->gettable_params != NULL)
                 break;
-            rand->gettable_params =
-                OSSL_FUNC_rand_gettable_params(fns);
+            rand->gettable_params = OSSL_FUNC_rand_gettable_params(fns);
             break;
         case OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS:
             if (rand->gettable_ctx_params != NULL)
                 break;
-            rand->gettable_ctx_params =
-                OSSL_FUNC_rand_gettable_ctx_params(fns);
+            rand->gettable_ctx_params = OSSL_FUNC_rand_gettable_ctx_params(fns);
             break;
         case OSSL_FUNC_RAND_SETTABLE_CTX_PARAMS:
             if (rand->settable_ctx_params != NULL)
                 break;
-            rand->settable_ctx_params =
-                OSSL_FUNC_rand_settable_ctx_params(fns);
+            rand->settable_ctx_params = OSSL_FUNC_rand_settable_ctx_params(fns);
             break;
         case OSSL_FUNC_RAND_GET_PARAMS:
             if (rand->get_params != NULL)
@@ -260,13 +257,13 @@ static void *evp_rand_from_algorithm(int name_id,
      * locking functions.
      */
     if (fnrandcnt != 3
-            || fnctxcnt != 3
-            || (fnenablelockcnt != 0 && fnenablelockcnt != 1)
-            || (fnlockcnt != 0 && fnlockcnt != 2)
+        || fnctxcnt != 3
+        || (fnenablelockcnt != 0 && fnenablelockcnt != 1)
+        || (fnlockcnt != 0 && fnlockcnt != 2)
 #ifdef FIPS_MODULE
-            || fnzeroizecnt != 1
+        || fnzeroizecnt != 1
 #endif
-       ) {
+    ) {
         evp_rand_free(rand);
         ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS);
         return NULL;
@@ -283,11 +280,11 @@ static void *evp_rand_from_algorithm(int name_id,
 }
 
 EVP_RAND *EVP_RAND_fetch(OSSL_LIB_CTX *libctx, const char *algorithm,
-                         const char *properties)
+    const char *properties)
 {
     return evp_generic_fetch(libctx, OSSL_OP_RAND, algorithm, properties,
-                             evp_rand_from_algorithm, evp_rand_up_ref,
-                             evp_rand_free);
+        evp_rand_from_algorithm, evp_rand_up_ref,
+        evp_rand_free);
 }
 
 int EVP_RAND_up_ref(EVP_RAND *rand)
@@ -368,8 +365,9 @@ EVP_RAND_CTX *EVP_RAND_CTX_new(EVP_RAND *rand, EVP_RAND_CTX *parent)
         parent_dispatch = parent->meth->dispatch;
     }
     if ((ctx->algctx = rand->newctx(ossl_provider_ctx(rand->prov), parent_ctx,
-                                    parent_dispatch)) == NULL
-            || !EVP_RAND_up_ref(rand)) {
+             parent_dispatch))
+            == NULL
+        || !EVP_RAND_up_ref(rand)) {
         ERR_raise(ERR_LIB_EVP, ERR_R_EVP_LIB);
         rand->freectx(ctx->algctx);
         CRYPTO_FREE_REF(&ctx->refcnt);
@@ -408,7 +406,7 @@ EVP_RAND *EVP_RAND_CTX_get0_rand(EVP_RAND_CTX *ctx)
 }
 
 static int evp_rand_get_ctx_params_locked(EVP_RAND_CTX *ctx,
-                                          OSSL_PARAM params[])
+    OSSL_PARAM params[])
 {
     return ctx->meth->get_ctx_params(ctx->algctx, params);
 }
@@ -425,7 +423,7 @@ int EVP_RAND_CTX_get_params(EVP_RAND_CTX *ctx, OSSL_PARAM params[])
 }
 
 static int evp_rand_set_ctx_params_locked(EVP_RAND_CTX *ctx,
-                                          const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     if (ctx->meth->set_ctx_params != NULL)
         return ctx->meth->set_ctx_params(ctx->algctx, params);
@@ -491,18 +489,18 @@ 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)
 {
     evp_generic_do_all(libctx, OSSL_OP_RAND,
-                       (void (*)(void *, void *))fn, arg,
-                       evp_rand_from_algorithm, evp_rand_up_ref,
-                       evp_rand_free);
+        (void (*)(void *, void *))fn, arg,
+        evp_rand_from_algorithm, evp_rand_up_ref,
+        evp_rand_free);
 }
 
 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)
 {
     if (rand->prov != NULL)
         return evp_names_do_all(rand->prov, rand->name_id, fn, data);
@@ -510,25 +508,24 @@ int EVP_RAND_names_do_all(const EVP_RAND *rand,
     return 1;
 }
 
-static int evp_rand_instantiate_locked
-    (EVP_RAND_CTX *ctx, unsigned int strength, int prediction_resistance,
-     const unsigned char *pstr, size_t pstr_len, const OSSL_PARAM params[])
+static int evp_rand_instantiate_locked(EVP_RAND_CTX *ctx, unsigned int strength, int prediction_resistance,
+    const unsigned char *pstr, size_t pstr_len, const OSSL_PARAM params[])
 {
     return ctx->meth->instantiate(ctx->algctx, strength, prediction_resistance,
-                                  pstr, pstr_len, params);
+        pstr, pstr_len, params);
 }
 
 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 res;
 
     if (!evp_rand_lock(ctx))
         return 0;
     res = evp_rand_instantiate_locked(ctx, strength, prediction_resistance,
-                                      pstr, pstr_len, params);
+        pstr, pstr_len, params);
     evp_rand_unlock(ctx);
     return res;
 }
@@ -550,25 +547,25 @@ int EVP_RAND_uninstantiate(EVP_RAND_CTX *ctx)
 }
 
 static int evp_rand_generate_locked(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)
 {
     size_t chunk, max_request = 0;
     OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
 
     params[0] = OSSL_PARAM_construct_size_t(OSSL_RAND_PARAM_MAX_REQUEST,
-                                            &max_request);
+        &max_request);
     if (!evp_rand_get_ctx_params_locked(ctx, params)
-            || max_request == 0) {
+        || max_request == 0) {
         ERR_raise(ERR_LIB_EVP, EVP_R_UNABLE_TO_GET_MAXIMUM_REQUEST_SIZE);
         return 0;
     }
     for (; outlen > 0; outlen -= chunk, out += chunk) {
         chunk = outlen > max_request ? max_request : outlen;
         if (!ctx->meth->generate(ctx->algctx, out, chunk, strength,
-                                 prediction_resistance, addin, addin_len)) {
+                prediction_resistance, addin, addin_len)) {
             ERR_raise(ERR_LIB_EVP, EVP_R_GENERATE_ERROR);
             return 0;
         }
@@ -582,39 +579,39 @@ static int evp_rand_generate_locked(EVP_RAND_CTX *ctx, unsigned char *out,
 }
 
 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)
+    unsigned int strength, int prediction_resistance,
+    const unsigned char *addin, size_t addin_len)
 {
     int res;
 
     if (!evp_rand_lock(ctx))
         return 0;
     res = evp_rand_generate_locked(ctx, out, outlen, strength,
-                                   prediction_resistance, addin, addin_len);
+        prediction_resistance, addin, addin_len);
     evp_rand_unlock(ctx);
     return res;
 }
 
 static int evp_rand_reseed_locked(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)
 {
     if (ctx->meth->reseed != NULL)
         return ctx->meth->reseed(ctx->algctx, prediction_resistance,
-                                 ent, ent_len, addin, addin_len);
+            ent, ent_len, addin, addin_len);
     return 1;
 }
 
 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)
 {
     int res;
 
     if (!evp_rand_lock(ctx))
         return 0;
     res = evp_rand_reseed_locked(ctx, prediction_resistance,
-                                 ent, ent_len, addin, addin_len);
+        ent, ent_len, addin, addin_len);
     evp_rand_unlock(ctx);
     return res;
 }
@@ -642,14 +639,12 @@ unsigned int EVP_RAND_get_strength(EVP_RAND_CTX *ctx)
 }
 
 static int evp_rand_nonce_locked(EVP_RAND_CTX *ctx, unsigned char *out,
-                                 size_t outlen)
+    size_t outlen)
 {
     unsigned int str = evp_rand_strength_locked(ctx);
 
-    if (ctx->meth->nonce == NULL)
-        return 0;
-    if (ctx->meth->nonce(ctx->algctx, out, str, outlen, outlen))
-        return 1;
+    if (ctx->meth->nonce != NULL)
+        return ctx->meth->nonce(ctx->algctx, out, str, outlen, outlen) > 0;
     return evp_rand_generate_locked(ctx, out, outlen, str, 0, NULL, 0);
 }
 
@@ -657,6 +652,11 @@ int EVP_RAND_nonce(EVP_RAND_CTX *ctx, unsigned char *out, size_t outlen)
 {
     int res;
 
+    if (ctx == NULL || out == NULL || outlen == 0) {
+        ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_NULL_PARAMETER);
+        return 0;
+    }
+
     if (!evp_rand_lock(ctx))
         return 0;
     res = evp_rand_nonce_locked(ctx, out, outlen);
@@ -699,49 +699,49 @@ int evp_rand_can_seed(EVP_RAND_CTX *ctx)
 }
 
 static size_t evp_rand_get_seed_locked(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)
 {
     if (ctx->meth->get_seed != NULL)
         return ctx->meth->get_seed(ctx->algctx, buffer,
-                                   entropy, min_len, max_len,
-                                   prediction_resistance,
-                                   adin, adin_len);
+            entropy, min_len, max_len,
+            prediction_resistance,
+            adin, adin_len);
     return 0;
 }
 
 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)
 {
     int res;
 
     if (!evp_rand_lock(ctx))
         return 0;
     res = evp_rand_get_seed_locked(ctx,
-                                   buffer,
-                                   entropy, min_len, max_len,
-                                   prediction_resistance,
-                                   adin, adin_len);
+        buffer,
+        entropy, min_len, max_len,
+        prediction_resistance,
+        adin, adin_len);
     evp_rand_unlock(ctx);
     return res;
 }
 
 static void evp_rand_clear_seed_locked(EVP_RAND_CTX *ctx,
-                                       unsigned char *buffer, size_t b_len)
+    unsigned char *buffer, size_t b_len)
 {
     if (ctx->meth->clear_seed != NULL)
         ctx->meth->clear_seed(ctx->algctx, buffer, b_len);
 }
 
 void evp_rand_clear_seed(EVP_RAND_CTX *ctx,
-                         unsigned char *buffer, size_t b_len)
+    unsigned char *buffer, size_t b_len)
 {
     if (!evp_rand_lock(ctx))
         return;
diff --git a/crypto/evp/evp_utils.c b/crypto/evp/evp_utils.c
index 3cc17921f8f49..68a04b65198ac 100644
--- a/crypto/evp/evp_utils.c
+++ b/crypto/evp/evp_utils.c
@@ -12,9 +12,9 @@
 #include <openssl/core.h>
 #include <openssl/evp.h>
 #include <openssl/err.h>
-#include <openssl/asn1.h>        /* evp_local.h needs it */
-#include <openssl/safestack.h>   /* evp_local.h needs it */
-#include "crypto/evp.h"    /* evp_local.h needs it */
+#include <openssl/asn1.h> /* evp_local.h needs it */
+#include <openssl/safestack.h> /* evp_local.h needs it */
+#include "crypto/evp.h" /* evp_local.h needs it */
 #include "evp_local.h"
 
 /*
@@ -24,36 +24,36 @@
  * Since these functions are used to implement ctrl functionality, we
  * use the same value, and other callers will have to compensate.
  */
-#define PARAM_CHECK(obj, func, errfunc)                                        \
-    if (obj == NULL)                                                           \
-        return 0;                                                              \
-    if (obj->prov == NULL)                                                     \
-        return EVP_CTRL_RET_UNSUPPORTED;                                       \
-    if (obj->func == NULL) {                                                   \
-        errfunc();                                                             \
-        return 0;                                                              \
+#define PARAM_CHECK(obj, func, errfunc)  \
+    if (obj == NULL)                     \
+        return 0;                        \
+    if (obj->prov == NULL)               \
+        return EVP_CTRL_RET_UNSUPPORTED; \
+    if (obj->func == NULL) {             \
+        errfunc();                       \
+        return 0;                        \
     }
 
-#define PARAM_FUNC(name, func, type, err)                                      \
-int name (const type *obj, OSSL_PARAM params[])                                \
-{                                                                              \
-    PARAM_CHECK(obj, func, err)                                                \
-    return obj->func(params);                                                  \
-}
+#define PARAM_FUNC(name, func, type, err)          \
+    int name(const type *obj, OSSL_PARAM params[]) \
+    {                                              \
+        PARAM_CHECK(obj, func, err)                \
+        return obj->func(params);                  \
+    }
 
-#define PARAM_CTX_FUNC(name, func, type, err)                                  \
-int name (const type *obj, void *algctx, OSSL_PARAM params[])                  \
-{                                                                              \
-    PARAM_CHECK(obj, func, err)                                                \
-    return obj->func(algctx, params);                                          \
-}
+#define PARAM_CTX_FUNC(name, func, type, err)                    \
+    int name(const type *obj, void *algctx, OSSL_PARAM params[]) \
+    {                                                            \
+        PARAM_CHECK(obj, func, err)                              \
+        return obj->func(algctx, params);                        \
+    }
 
-#define PARAM_FUNCTIONS(type,                                                  \
-                        getname, getfunc,                                      \
-                        getctxname, getctxfunc,                                \
-                        setctxname, setctxfunc)                                \
-    PARAM_FUNC(getname, getfunc, type, geterr)                                 \
-    PARAM_CTX_FUNC(getctxname, getctxfunc, type, geterr)                       \
+#define PARAM_FUNCTIONS(type,                            \
+    getname, getfunc,                                    \
+    getctxname, getctxfunc,                              \
+    setctxname, setctxfunc)                              \
+    PARAM_FUNC(getname, getfunc, type, geterr)           \
+    PARAM_CTX_FUNC(getctxname, getctxfunc, type, geterr) \
     PARAM_CTX_FUNC(setctxname, setctxfunc, type, seterr)
 
 /*
@@ -71,11 +71,11 @@ static void seterr(void)
 }
 
 PARAM_FUNCTIONS(EVP_CIPHER,
-                evp_do_ciph_getparams, get_params,
-                evp_do_ciph_ctx_getparams, get_ctx_params,
-                evp_do_ciph_ctx_setparams, set_ctx_params)
+    evp_do_ciph_getparams, get_params,
+    evp_do_ciph_ctx_getparams, get_ctx_params,
+    evp_do_ciph_ctx_setparams, set_ctx_params)
 
 PARAM_FUNCTIONS(EVP_MD,
-                evp_do_md_getparams, get_params,
-                evp_do_md_ctx_getparams, get_ctx_params,
-                evp_do_md_ctx_setparams, set_ctx_params)
+    evp_do_md_getparams, get_params,
+    evp_do_md_ctx_getparams, get_ctx_params,
+    evp_do_md_ctx_setparams, set_ctx_params)
diff --git a/crypto/evp/exchange.c b/crypto/evp/exchange.c
index 225b2be10cdc4..088d2fdc6e731 100644
--- a/crypto/evp/exchange.c
+++ b/crypto/evp/exchange.c
@@ -14,7 +14,7 @@
 #include "internal/refcount.h"
 #include "internal/provider.h"
 #include "internal/core.h"
-#include "internal/numbers.h"   /* includes SIZE_MAX */
+#include "internal/numbers.h" /* includes SIZE_MAX */
 #include "crypto/evp.h"
 #include "evp_local.h"
 
@@ -47,8 +47,8 @@ static EVP_KEYEXCH *evp_keyexch_new(OSSL_PROVIDER *prov)
 }
 
 static void *evp_keyexch_from_algorithm(int name_id,
-                                        const OSSL_ALGORITHM *algodef,
-                                        OSSL_PROVIDER *prov)
+    const OSSL_ALGORITHM *algodef,
+    OSSL_PROVIDER *prov)
 {
     const OSSL_DISPATCH *fns = algodef->implementation;
     EVP_KEYEXCH *exchange = NULL;
@@ -129,8 +129,8 @@ static void *evp_keyexch_from_algorithm(int name_id,
         }
     }
     if (fncnt != 4
-            || (gparamfncnt != 0 && gparamfncnt != 2)
-            || (sparamfncnt != 0 && sparamfncnt != 2)) {
+        || (gparamfncnt != 0 && gparamfncnt != 2)
+        || (sparamfncnt != 0 && sparamfncnt != 2)) {
         /*
          * In order to be a consistent set of functions we must have at least
          * a complete set of "exchange" functions: init, derive, newctx,
@@ -145,7 +145,7 @@ static void *evp_keyexch_from_algorithm(int name_id,
 
     return exchange;
 
- err:
+err:
     EVP_KEYEXCH_free(exchange);
     return NULL;
 }
@@ -179,23 +179,23 @@ OSSL_PROVIDER *EVP_KEYEXCH_get0_provider(const EVP_KEYEXCH *exchange)
 }
 
 EVP_KEYEXCH *EVP_KEYEXCH_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                               const char *properties)
+    const char *properties)
 {
     return evp_generic_fetch(ctx, OSSL_OP_KEYEXCH, algorithm, properties,
-                             evp_keyexch_from_algorithm,
-                             evp_keyexch_up_ref,
-                             evp_keyexch_free);
+        evp_keyexch_from_algorithm,
+        evp_keyexch_up_ref,
+        evp_keyexch_free);
 }
 
 EVP_KEYEXCH *evp_keyexch_fetch_from_prov(OSSL_PROVIDER *prov,
-                                         const char *algorithm,
-                                         const char *properties)
+    const char *algorithm,
+    const char *properties)
 {
     return evp_generic_fetch_from_prov(prov, OSSL_OP_KEYEXCH,
-                                       algorithm, properties,
-                                       evp_keyexch_from_algorithm,
-                                       evp_keyexch_up_ref,
-                                       evp_keyexch_free);
+        algorithm, properties,
+        evp_keyexch_from_algorithm,
+        evp_keyexch_up_ref,
+        evp_keyexch_free);
 }
 
 int EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx)
@@ -248,20 +248,19 @@ int EVP_PKEY_derive_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
      * Try to derive the supported exch from |ctx->keymgmt|.
      */
     if (!ossl_assert(ctx->pkey->keymgmt == NULL
-                     || ctx->pkey->keymgmt == ctx->keymgmt)) {
+            || ctx->pkey->keymgmt == ctx->keymgmt)) {
         ERR_clear_last_mark();
         ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
         goto err;
     }
     supported_exch = evp_keymgmt_util_query_operation_name(ctx->keymgmt,
-                                                           OSSL_OP_KEYEXCH);
+        OSSL_OP_KEYEXCH);
     if (supported_exch == NULL) {
         ERR_clear_last_mark();
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
         goto err;
     }
 
-
     /*
      * We perform two iterations:
      *
@@ -292,16 +291,14 @@ int EVP_PKEY_derive_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
 
         switch (iter) {
         case 1:
-            exchange =
-                EVP_KEYEXCH_fetch(ctx->libctx, supported_exch, ctx->propquery);
+            exchange = EVP_KEYEXCH_fetch(ctx->libctx, supported_exch, ctx->propquery);
             if (exchange != NULL)
                 tmp_prov = EVP_KEYEXCH_get0_provider(exchange);
             break;
         case 2:
             tmp_prov = EVP_KEYMGMT_get0_provider(ctx->keymgmt);
-            exchange =
-                evp_keyexch_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
-                                              supported_exch, ctx->propquery);
+            exchange = evp_keyexch_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+                supported_exch, ctx->propquery);
             if (exchange == NULL)
                 goto legacy;
             break;
@@ -318,13 +315,12 @@ int EVP_PKEY_derive_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
          * to it (evp_pkey_export_to_provider() is smart enough to only actually
          * export it if |tmp_keymgmt| is different from |ctx->pkey|'s keymgmt)
          */
-        tmp_keymgmt_tofree = tmp_keymgmt =
-            evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
-                                        EVP_KEYMGMT_get0_name(ctx->keymgmt),
-                                        ctx->propquery);
+        tmp_keymgmt_tofree = tmp_keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+            EVP_KEYMGMT_get0_name(ctx->keymgmt),
+            ctx->propquery);
         if (tmp_keymgmt != NULL)
             provkey = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
-                                                  &tmp_keymgmt, ctx->propquery);
+                &tmp_keymgmt, ctx->propquery);
         if (tmp_keymgmt == NULL)
             EVP_KEYMGMT_free(tmp_keymgmt_tofree);
     }
@@ -353,13 +349,13 @@ int EVP_PKEY_derive_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
 
     EVP_KEYMGMT_free(tmp_keymgmt);
     return ret ? 1 : 0;
- err:
+err:
     evp_pkey_ctx_free_old_ops(ctx);
     ctx->operation = EVP_PKEY_OP_UNDEFINED;
     EVP_KEYMGMT_free(tmp_keymgmt);
     return 0;
 
- legacy:
+legacy:
     /*
      * If we don't have the full support we need with provided methods,
      * let's go see if legacy does.
@@ -385,7 +381,7 @@ 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 ret = 0, check;
     void *provkey = NULL;
@@ -424,16 +420,15 @@ int EVP_PKEY_derive_set_peer_ex(EVP_PKEY_CTX *ctx, EVP_PKEY *peer,
      * to it (evp_pkey_export_to_provider() is smart enough to only actually
      * export it if |tmp_keymgmt| is different from |peer|'s keymgmt)
      */
-    tmp_keymgmt_tofree = tmp_keymgmt =
-        evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)
-                                    EVP_KEYEXCH_get0_provider(ctx->op.kex.exchange),
-                                    EVP_KEYMGMT_get0_name(ctx->keymgmt),
-                                    ctx->propquery);
+    tmp_keymgmt_tofree = tmp_keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)
+                                                                       EVP_KEYEXCH_get0_provider(ctx->op.kex.exchange),
+        EVP_KEYMGMT_get0_name(ctx->keymgmt),
+        ctx->propquery);
     if (tmp_keymgmt != NULL)
         /* A Coverity issue with up_ref/down_ref and free */
         /* coverity[pass_freed_arg] */
         provkey = evp_pkey_export_to_provider(peer, ctx->libctx,
-                                              &tmp_keymgmt, ctx->propquery);
+            &tmp_keymgmt, ctx->propquery);
     EVP_KEYMGMT_free(tmp_keymgmt_tofree);
 
     /*
@@ -442,16 +437,19 @@ int EVP_PKEY_derive_set_peer_ex(EVP_PKEY_CTX *ctx, EVP_PKEY *peer,
      */
     if (provkey == NULL)
         goto legacy;
-    return ctx->op.kex.exchange->set_peer(ctx->op.kex.algctx, provkey);
+    ret = ctx->op.kex.exchange->set_peer(ctx->op.kex.algctx, provkey);
+    if (ret <= 0)
+        return ret;
+    goto common;
 
- legacy:
+legacy:
 #ifdef FIPS_MODULE
     return ret;
 #else
     if (ctx->pmeth == NULL
         || !(ctx->pmeth->derive != NULL
-             || ctx->pmeth->encrypt != NULL
-             || ctx->pmeth->decrypt != NULL)
+            || ctx->pmeth->encrypt != NULL
+            || ctx->pmeth->decrypt != NULL)
         || ctx->pmeth->ctrl == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
         return -2;
@@ -488,8 +486,7 @@ int EVP_PKEY_derive_set_peer_ex(EVP_PKEY_CTX *ctx, EVP_PKEY *peer,
      * (different key types) is impossible here because it is checked earlier.
      * -2 is OK for us here, as well as 1, so we can check for 0 only.
      */
-    if (!EVP_PKEY_missing_parameters(peer) &&
-        !EVP_PKEY_parameters_eq(ctx->pkey, peer)) {
+    if (!EVP_PKEY_missing_parameters(peer) && !EVP_PKEY_parameters_eq(ctx->pkey, peer)) {
         ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_PARAMETERS);
         return -1;
     }
@@ -497,6 +494,9 @@ int EVP_PKEY_derive_set_peer_ex(EVP_PKEY_CTX *ctx, EVP_PKEY *peer,
     ret = ctx->pmeth->ctrl(ctx, EVP_PKEY_CTRL_PEER_KEY, 1, peer);
     if (ret <= 0)
         return ret;
+#endif
+
+common:
     if (!EVP_PKEY_up_ref(peer))
         return -1;
 
@@ -504,7 +504,6 @@ int EVP_PKEY_derive_set_peer_ex(EVP_PKEY_CTX *ctx, EVP_PKEY *peer,
     ctx->peerkey = peer;
 
     return 1;
-#endif
 }
 
 int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer)
@@ -530,17 +529,16 @@ int EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *pkeylen)
         goto legacy;
 
     ret = ctx->op.kex.exchange->derive(ctx->op.kex.algctx, key, pkeylen,
-                                       key != NULL ? *pkeylen : 0);
+        key != NULL ? *pkeylen : 0);
 
     return ret;
- legacy:
+legacy:
     if (ctx->pmeth == NULL || ctx->pmeth->derive == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
         return -2;
     }
 
-    M_check_autoarg(ctx, key, pkeylen, EVP_F_EVP_PKEY_DERIVE)
-        return ctx->pmeth->derive(ctx, key, pkeylen);
+    M_check_autoarg(ctx, key, pkeylen, EVP_F_EVP_PKEY_DERIVE) return ctx->pmeth->derive(ctx, key, pkeylen);
 }
 
 int evp_keyexch_get_number(const EVP_KEYEXCH *keyexch)
@@ -561,23 +559,23 @@ const char *EVP_KEYEXCH_get0_description(const EVP_KEYEXCH *keyexch)
 int EVP_KEYEXCH_is_a(const EVP_KEYEXCH *keyexch, const char *name)
 {
     return keyexch != NULL
-           && evp_is_a(keyexch->prov, keyexch->name_id, NULL, name);
+        && evp_is_a(keyexch->prov, keyexch->name_id, NULL, name);
 }
 
 void EVP_KEYEXCH_do_all_provided(OSSL_LIB_CTX *libctx,
-                                 void (*fn)(EVP_KEYEXCH *keyexch, void *arg),
-                                 void *arg)
+    void (*fn)(EVP_KEYEXCH *keyexch, void *arg),
+    void *arg)
 {
     evp_generic_do_all(libctx, OSSL_OP_KEYEXCH,
-                       (void (*)(void *, void *))fn, arg,
-                       evp_keyexch_from_algorithm,
-                       evp_keyexch_up_ref,
-                       evp_keyexch_free);
+        (void (*)(void *, void *))fn, arg,
+        evp_keyexch_from_algorithm,
+        evp_keyexch_up_ref,
+        evp_keyexch_free);
 }
 
 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)
 {
     if (keyexch->prov != NULL)
         return evp_names_do_all(keyexch->prov, keyexch->name_id, fn, data);
diff --git a/crypto/evp/kdf_lib.c b/crypto/evp/kdf_lib.c
index 1093aac29e91d..b445fa9d1247b 100644
--- a/crypto/evp/kdf_lib.c
+++ b/crypto/evp/kdf_lib.c
@@ -128,15 +128,15 @@ size_t EVP_KDF_CTX_get_kdf_size(EVP_KDF_CTX *ctx)
     *params = OSSL_PARAM_construct_size_t(OSSL_KDF_PARAM_SIZE, &s);
     if (ctx->meth->get_ctx_params != NULL
         && ctx->meth->get_ctx_params(ctx->algctx, params))
-            return s;
+        return s;
     if (ctx->meth->get_params != NULL
         && ctx->meth->get_params(params))
-            return s;
+        return s;
     return 0;
 }
 
 int EVP_KDF_derive(EVP_KDF_CTX *ctx, unsigned char *key, size_t keylen,
-                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     if (ctx == NULL)
         return 0;
@@ -172,8 +172,8 @@ int EVP_KDF_CTX_set_params(EVP_KDF_CTX *ctx, const OSSL_PARAM params[])
 }
 
 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)
 {
     if (kdf->prov != NULL)
         return evp_names_do_all(kdf->prov, kdf->name_id, fn, data);
diff --git a/crypto/evp/kdf_meth.c b/crypto/evp/kdf_meth.c
index ad02b3381fa4a..11d0a39ef2731 100644
--- a/crypto/evp/kdf_meth.c
+++ b/crypto/evp/kdf_meth.c
@@ -56,8 +56,8 @@ static void *evp_kdf_new(void)
 }
 
 static void *evp_kdf_from_algorithm(int name_id,
-                                    const OSSL_ALGORITHM *algodef,
-                                    OSSL_PROVIDER *prov)
+    const OSSL_ALGORITHM *algodef,
+    OSSL_PROVIDER *prov)
 {
     const OSSL_DISPATCH *fns = algodef->implementation;
     EVP_KDF *kdf = NULL;
@@ -106,20 +106,17 @@ static void *evp_kdf_from_algorithm(int name_id,
         case OSSL_FUNC_KDF_GETTABLE_PARAMS:
             if (kdf->gettable_params != NULL)
                 break;
-            kdf->gettable_params =
-                OSSL_FUNC_kdf_gettable_params(fns);
+            kdf->gettable_params = OSSL_FUNC_kdf_gettable_params(fns);
             break;
         case OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS:
             if (kdf->gettable_ctx_params != NULL)
                 break;
-            kdf->gettable_ctx_params =
-                OSSL_FUNC_kdf_gettable_ctx_params(fns);
+            kdf->gettable_ctx_params = OSSL_FUNC_kdf_gettable_ctx_params(fns);
             break;
         case OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS:
             if (kdf->settable_ctx_params != NULL)
                 break;
-            kdf->settable_ctx_params =
-                OSSL_FUNC_kdf_settable_ctx_params(fns);
+            kdf->settable_ctx_params = OSSL_FUNC_kdf_settable_ctx_params(fns);
             break;
         case OSSL_FUNC_KDF_GET_PARAMS:
             if (kdf->get_params != NULL)
@@ -160,11 +157,11 @@ static void *evp_kdf_from_algorithm(int name_id,
 }
 
 EVP_KDF *EVP_KDF_fetch(OSSL_LIB_CTX *libctx, const char *algorithm,
-                       const char *properties)
+    const char *properties)
 {
     return evp_generic_fetch(libctx, OSSL_OP_KDF, algorithm, properties,
-                             evp_kdf_from_algorithm, evp_kdf_up_ref,
-                             evp_kdf_free);
+        evp_kdf_from_algorithm, evp_kdf_up_ref,
+        evp_kdf_free);
 }
 
 int EVP_KDF_up_ref(EVP_KDF *kdf)
@@ -225,10 +222,10 @@ 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)
 {
     evp_generic_do_all(libctx, OSSL_OP_KDF,
-                       (void (*)(void *, void *))fn, arg,
-                       evp_kdf_from_algorithm, evp_kdf_up_ref, evp_kdf_free);
+        (void (*)(void *, void *))fn, arg,
+        evp_kdf_from_algorithm, evp_kdf_up_ref, evp_kdf_free);
 }
diff --git a/crypto/evp/kem.c b/crypto/evp/kem.c
index 2bc03e1d4e034..6c36164760e35 100644
--- a/crypto/evp/kem.c
+++ b/crypto/evp/kem.c
@@ -28,7 +28,7 @@ static int evp_kem_up_ref(void *data)
 }
 
 static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
-                        const OSSL_PARAM params[], EVP_PKEY *authkey)
+    const OSSL_PARAM params[], EVP_PKEY *authkey)
 {
     int ret = 0;
     EVP_KEM *kem = NULL;
@@ -58,12 +58,12 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
      * Try to derive the supported kem from |ctx->keymgmt|.
      */
     if (!ossl_assert(ctx->pkey->keymgmt == NULL
-                     || ctx->pkey->keymgmt == ctx->keymgmt)) {
+            || ctx->pkey->keymgmt == ctx->keymgmt)) {
         ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
         goto err;
     }
     supported_kem = evp_keymgmt_util_query_operation_name(ctx->keymgmt,
-                                                          OSSL_OP_KEM);
+        OSSL_OP_KEM);
     if (supported_kem == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
         goto err;
@@ -108,11 +108,11 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
         case 2:
             tmp_prov = EVP_KEYMGMT_get0_provider(ctx->keymgmt);
             kem = evp_kem_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
-                                          supported_kem, ctx->propquery);
+                supported_kem, ctx->propquery);
 
             if (kem == NULL) {
                 ERR_raise(ERR_LIB_EVP,
-                          EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+                    EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
                 ret = -2;
                 goto err;
             }
@@ -129,17 +129,16 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
          * to it (evp_pkey_export_to_provider() is smart enough to only actually
          * export it if |tmp_keymgmt| is different from |ctx->pkey|'s keymgmt)
          */
-        tmp_keymgmt_tofree = tmp_keymgmt =
-            evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
-                                        EVP_KEYMGMT_get0_name(ctx->keymgmt),
-                                        ctx->propquery);
+        tmp_keymgmt_tofree = tmp_keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+            EVP_KEYMGMT_get0_name(ctx->keymgmt),
+            ctx->propquery);
         if (tmp_keymgmt != NULL) {
             provkey = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
-                                                  &tmp_keymgmt, ctx->propquery);
+                &tmp_keymgmt, ctx->propquery);
             if (provkey != NULL && authkey != NULL) {
                 provauthkey = evp_pkey_export_to_provider(authkey, ctx->libctx,
-                                                          &tmp_keymgmt,
-                                                          ctx->propquery);
+                    &tmp_keymgmt,
+                    ctx->propquery);
                 if (provauthkey == NULL) {
                     EVP_KEM_free(kem);
                     ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -169,7 +168,7 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
     case EVP_PKEY_OP_ENCAPSULATE:
         if (provauthkey != NULL && kem->auth_encapsulate_init != NULL) {
             ret = kem->auth_encapsulate_init(ctx->op.encap.algctx, provkey,
-                                             provauthkey, params);
+                provauthkey, params);
         } else if (provauthkey == NULL && kem->encapsulate_init != NULL) {
             ret = kem->encapsulate_init(ctx->op.encap.algctx, provkey, params);
         } else {
@@ -181,7 +180,7 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
     case EVP_PKEY_OP_DECAPSULATE:
         if (provauthkey != NULL && kem->auth_decapsulate_init != NULL) {
             ret = kem->auth_decapsulate_init(ctx->op.encap.algctx, provkey,
-                                             provauthkey, params);
+                provauthkey, params);
         } else if (provauthkey == NULL && kem->encapsulate_init != NULL) {
             ret = kem->decapsulate_init(ctx->op.encap.algctx, provkey, params);
         } else {
@@ -200,7 +199,7 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
 
     if (ret > 0)
         return 1;
- err:
+err:
     if (ret <= 0) {
         evp_pkey_ctx_free_old_ops(ctx);
         ctx->operation = EVP_PKEY_OP_UNDEFINED;
@@ -210,7 +209,7 @@ static int evp_kem_init(EVP_PKEY_CTX *ctx, int operation,
 }
 
 int EVP_PKEY_auth_encapsulate_init(EVP_PKEY_CTX *ctx, EVP_PKEY *authpriv,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     if (authpriv == NULL)
         return 0;
@@ -223,8 +222,8 @@ int EVP_PKEY_encapsulate_init(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
 }
 
 int EVP_PKEY_encapsulate(EVP_PKEY_CTX *ctx,
-                         unsigned char *out, size_t *outlen,
-                         unsigned char *secret, size_t *secretlen)
+    unsigned char *out, size_t *outlen,
+    unsigned char *secret, size_t *secretlen)
 {
     if (ctx == NULL)
         return 0;
@@ -243,7 +242,7 @@ int EVP_PKEY_encapsulate(EVP_PKEY_CTX *ctx,
         return 0;
 
     return ctx->op.encap.kem->encapsulate(ctx->op.encap.algctx,
-                                          out, outlen, secret, secretlen);
+        out, outlen, secret, secretlen);
 }
 
 int EVP_PKEY_decapsulate_init(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[])
@@ -252,7 +251,7 @@ 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[])
 {
     if (authpub == NULL)
         return 0;
@@ -260,8 +259,8 @@ int EVP_PKEY_auth_decapsulate_init(EVP_PKEY_CTX *ctx, EVP_PKEY *authpub,
 }
 
 int EVP_PKEY_decapsulate(EVP_PKEY_CTX *ctx,
-                         unsigned char *secret, size_t *secretlen,
-                         const unsigned char *in, size_t inlen)
+    unsigned char *secret, size_t *secretlen,
+    const unsigned char *in, size_t inlen)
 {
     if (ctx == NULL
         || (in == NULL || inlen == 0)
@@ -278,7 +277,7 @@ int EVP_PKEY_decapsulate(EVP_PKEY_CTX *ctx,
         return -2;
     }
     return ctx->op.encap.kem->decapsulate(ctx->op.encap.algctx,
-                                          secret, secretlen, in, inlen);
+        secret, secretlen, in, inlen);
 }
 
 static EVP_KEM *evp_kem_new(OSSL_PROVIDER *prov)
@@ -300,7 +299,7 @@ static EVP_KEM *evp_kem_new(OSSL_PROVIDER *prov)
 }
 
 static void *evp_kem_from_algorithm(int name_id, const OSSL_ALGORITHM *algodef,
-                                    OSSL_PROVIDER *prov)
+    OSSL_PROVIDER *prov)
 {
     const OSSL_DISPATCH *fns = algodef->implementation;
     EVP_KEM *kem = NULL;
@@ -424,7 +423,7 @@ static void *evp_kem_from_algorithm(int name_id, const OSSL_ALGORITHM *algodef,
     }
 
     return kem;
- err:
+err:
     EVP_KEM_free(kem);
     return NULL;
 }
@@ -459,21 +458,21 @@ OSSL_PROVIDER *EVP_KEM_get0_provider(const EVP_KEM *kem)
 }
 
 EVP_KEM *EVP_KEM_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                       const char *properties)
+    const char *properties)
 {
     return evp_generic_fetch(ctx, OSSL_OP_KEM, algorithm, properties,
-                             evp_kem_from_algorithm,
-                             evp_kem_up_ref,
-                             evp_kem_free);
+        evp_kem_from_algorithm,
+        evp_kem_up_ref,
+        evp_kem_free);
 }
 
 EVP_KEM *evp_kem_fetch_from_prov(OSSL_PROVIDER *prov, const char *algorithm,
-                                 const char *properties)
+    const char *properties)
 {
     return evp_generic_fetch_from_prov(prov, OSSL_OP_KEM, algorithm, properties,
-                                       evp_kem_from_algorithm,
-                                       evp_kem_up_ref,
-                                       evp_kem_free);
+        evp_kem_from_algorithm,
+        evp_kem_up_ref,
+        evp_kem_free);
 }
 
 int EVP_KEM_is_a(const EVP_KEM *kem, const char *name)
@@ -497,18 +496,18 @@ const char *EVP_KEM_get0_description(const EVP_KEM *kem)
 }
 
 void EVP_KEM_do_all_provided(OSSL_LIB_CTX *libctx,
-                             void (*fn)(EVP_KEM *kem, void *arg),
-                             void *arg)
+    void (*fn)(EVP_KEM *kem, void *arg),
+    void *arg)
 {
     evp_generic_do_all(libctx, OSSL_OP_KEM, (void (*)(void *, void *))fn, arg,
-                       evp_kem_from_algorithm,
-                       evp_kem_up_ref,
-                       evp_kem_free);
+        evp_kem_from_algorithm,
+        evp_kem_up_ref,
+        evp_kem_free);
 }
 
 int EVP_KEM_names_do_all(const EVP_KEM *kem,
-                         void (*fn)(const char *name, void *data),
-                         void *data)
+    void (*fn)(const char *name, void *data),
+    void *data)
 {
     if (kem->prov != NULL)
         return evp_names_do_all(kem->prov, kem->name_id, fn, data);
diff --git a/crypto/evp/keymgmt_lib.c b/crypto/evp/keymgmt_lib.c
index 9ed0ba3caea9d..6b6da9062a547 100644
--- a/crypto/evp/keymgmt_lib.c
+++ b/crypto/evp/keymgmt_lib.c
@@ -48,7 +48,7 @@ int evp_keymgmt_util_try_import(const OSSL_PARAM params[], void *arg)
         return 1;
 
     if (evp_keymgmt_import(data->keymgmt, data->keydata, data->selection,
-                           params))
+            params))
         return 1;
     if (delete_on_error) {
         evp_keymgmt_freedata(data->keymgmt, data->keydata);
@@ -58,7 +58,7 @@ 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)
 {
     if (pkey == NULL || keymgmt == NULL || keydata == NULL
         || !EVP_PKEY_set_type_by_keymgmt(pkey, keymgmt)) {
@@ -85,16 +85,16 @@ 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)
 {
     if (pk == NULL || export_cb == NULL)
         return 0;
     return evp_keymgmt_export(pk->keymgmt, pk->keydata, selection,
-                              export_cb, export_cbarg);
+        export_cb, export_cbarg);
 }
 
 void *evp_keymgmt_util_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt,
-                                          int selection)
+    int selection)
 {
     struct evp_keymgmt_util_try_import_data_st import_data;
     OP_CACHE_ELEM *op;
@@ -156,7 +156,7 @@ void *evp_keymgmt_util_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt,
      */
 
     /* Setup for the export callback */
-    import_data.keydata = NULL;  /* evp_keymgmt_util_try_import will create it */
+    import_data.keydata = NULL; /* evp_keymgmt_util_try_import will create it */
     import_data.keymgmt = keymgmt;
     import_data.selection = selection;
 
@@ -165,7 +165,7 @@ void *evp_keymgmt_util_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt,
      * which does the import for us.  If successful, we're done.
      */
     if (!evp_keymgmt_util_export(pk, selection,
-                                 &evp_keymgmt_util_try_import, &import_data))
+            &evp_keymgmt_util_try_import, &import_data))
         /* If there was an error, bail out */
         return NULL;
 
@@ -198,7 +198,7 @@ void *evp_keymgmt_util_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt,
 
     /* Add the new export to the operation cache */
     if (!evp_keymgmt_util_cache_keydata(pk, keymgmt, import_data.keydata,
-                                        selection)) {
+            selection)) {
         CRYPTO_THREAD_unlock(pk->lock);
         evp_keymgmt_freedata(keymgmt, import_data.keydata);
         return NULL;
@@ -230,8 +230,8 @@ int evp_keymgmt_util_clear_operation_cache(EVP_PKEY *pk)
 }
 
 OP_CACHE_ELEM *evp_keymgmt_util_find_operation_cache(EVP_PKEY *pk,
-                                                     EVP_KEYMGMT *keymgmt,
-                                                     int selection)
+    EVP_KEYMGMT *keymgmt,
+    int selection)
 {
     int i, end = sk_OP_CACHE_ELEM_num(pk->operation_cache);
     OP_CACHE_ELEM *p;
@@ -245,16 +245,16 @@ OP_CACHE_ELEM *evp_keymgmt_util_find_operation_cache(EVP_PKEY *pk,
     for (i = 0; i < end; i++) {
         p = sk_OP_CACHE_ELEM_value(pk->operation_cache, i);
         if ((p->selection & selection) == selection
-                && (keymgmt == p->keymgmt
-                    || (keymgmt->name_id == p->keymgmt->name_id
-                        && keymgmt->prov == p->keymgmt->prov)))
+            && (keymgmt == p->keymgmt
+                || (keymgmt->name_id == p->keymgmt->name_id
+                    && keymgmt->prov == p->keymgmt->prov)))
             return p;
     }
     return NULL;
 }
 
 int evp_keymgmt_util_cache_keydata(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt,
-                                   void *keydata, int selection)
+    void *keydata, int selection)
 {
     OP_CACHE_ELEM *p = NULL;
 
@@ -301,7 +301,7 @@ void evp_keymgmt_util_cache_keyinfo(EVP_PKEY *pk)
 
         params[0] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_BITS, &bits);
         params[1] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_SECURITY_BITS,
-                                             &security_bits);
+            &security_bits);
         params[2] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_MAX_SIZE, &size);
         params[3] = OSSL_PARAM_construct_end();
         if (evp_keymgmt_get_params(pk->keymgmt, pk->keydata, params)) {
@@ -313,7 +313,7 @@ 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[])
 {
     void *keydata = NULL;
 
@@ -382,7 +382,7 @@ int evp_keymgmt_util_match(EVP_PKEY *pk1, EVP_PKEY *pk2, int selection)
             && keymgmt2 != NULL
             && !match_type(keymgmt1, keymgmt2)) {
             ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_KEY_TYPES);
-            return -1;           /* Not the same type */
+            return -1; /* Not the same type */
         }
 
         /*
@@ -395,9 +395,8 @@ int evp_keymgmt_util_match(EVP_PKEY *pk1, EVP_PKEY *pk2, int selection)
 
             ok = 1;
             if (keydata1 != NULL) {
-                tmp_keydata =
-                    evp_keymgmt_util_export_to_provider(pk1, keymgmt2,
-                                                        selection);
+                tmp_keydata = evp_keymgmt_util_export_to_provider(pk1, keymgmt2,
+                    selection);
                 ok = (tmp_keydata != NULL);
             }
             if (ok) {
@@ -416,9 +415,8 @@ int evp_keymgmt_util_match(EVP_PKEY *pk1, EVP_PKEY *pk2, int selection)
 
             ok = 1;
             if (keydata2 != NULL) {
-                tmp_keydata =
-                    evp_keymgmt_util_export_to_provider(pk2, keymgmt1,
-                                                        selection);
+                tmp_keydata = evp_keymgmt_util_export_to_provider(pk2, keymgmt1,
+                    selection);
                 ok = (tmp_keydata != NULL);
             }
             if (ok) {
@@ -463,8 +461,8 @@ int evp_keymgmt_util_copy(EVP_PKEY *to, EVP_PKEY *from, int selection)
     if (to_keymgmt == from->keymgmt && to_keymgmt->dup != NULL
         && to_keydata == NULL) {
         to_keydata = alloc_keydata = evp_keymgmt_dup(to_keymgmt,
-                                                     from->keydata,
-                                                     selection);
+            from->keydata,
+            selection);
         if (to_keydata == NULL)
             return 0;
     } else if (match_type(to_keymgmt, from->keymgmt)) {
@@ -475,8 +473,8 @@ int evp_keymgmt_util_copy(EVP_PKEY *to, EVP_PKEY *from, int selection)
         import_data.selection = selection;
 
         if (!evp_keymgmt_util_export(from, selection,
-                                     &evp_keymgmt_util_try_import,
-                                     &import_data))
+                &evp_keymgmt_util_try_import,
+                &import_data))
             return 0;
 
         /*
@@ -511,7 +509,7 @@ 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)
 {
     void *keydata = NULL;
 
@@ -531,8 +529,8 @@ void *evp_keymgmt_util_gen(EVP_PKEY *target, EVP_KEYMGMT *keymgmt,
  * returns for no digest.
  */
 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)
 {
     OSSL_PARAM params[3];
     char mddefault[100] = "";
@@ -540,13 +538,11 @@ int evp_keymgmt_util_get_deflt_digest_name(EVP_KEYMGMT *keymgmt,
     char *result = NULL;
     int rv = -2;
 
-    params[0] =
-        OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_DEFAULT_DIGEST,
-                                         mddefault, sizeof(mddefault));
-    params[1] =
-        OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_MANDATORY_DIGEST,
-                                         mdmandatory,
-                                         sizeof(mdmandatory));
+    params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_DEFAULT_DIGEST,
+        mddefault, sizeof(mddefault));
+    params[1] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_MANDATORY_DIGEST,
+        mdmandatory,
+        sizeof(mdmandatory));
     params[2] = OSSL_PARAM_construct_end();
 
     if (!evp_keymgmt_get_params(keymgmt, keydata, params))
@@ -576,7 +572,7 @@ int evp_keymgmt_util_get_deflt_digest_name(EVP_KEYMGMT *keymgmt,
  * assuming that it works as a default operation name.
  */
 const char *evp_keymgmt_util_query_operation_name(EVP_KEYMGMT *keymgmt,
-                                                  int op_id)
+    int op_id)
 {
     const char *name = NULL;
 
diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c
index 108bbf957973e..843976f476e35 100644
--- a/crypto/evp/keymgmt_meth.c
+++ b/crypto/evp/keymgmt_meth.c
@@ -42,7 +42,7 @@ static void *keymgmt_new(void)
 
 #ifndef FIPS_MODULE
 static void help_get_legacy_alg_type_from_keymgmt(const char *keytype,
-                                                  void *arg)
+    void *arg)
 {
     int *type = arg;
 
@@ -55,14 +55,14 @@ static int get_legacy_alg_type_from_keymgmt(const EVP_KEYMGMT *keymgmt)
     int type = NID_undef;
 
     EVP_KEYMGMT_names_do_all(keymgmt, help_get_legacy_alg_type_from_keymgmt,
-                             &type);
+        &type);
     return type;
 }
 #endif
 
 static void *keymgmt_from_algorithm(int name_id,
-                                    const OSSL_ALGORITHM *algodef,
-                                    OSSL_PROVIDER *prov)
+    const OSSL_ALGORITHM *algodef,
+    OSSL_PROVIDER *prov)
 {
     const OSSL_DISPATCH *fns = algodef->implementation;
     EVP_KEYMGMT *keymgmt = NULL;
@@ -94,35 +94,30 @@ static void *keymgmt_from_algorithm(int name_id,
             break;
         case OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE:
             if (keymgmt->gen_set_template == NULL)
-                keymgmt->gen_set_template =
-                    OSSL_FUNC_keymgmt_gen_set_template(fns);
+                keymgmt->gen_set_template = OSSL_FUNC_keymgmt_gen_set_template(fns);
             break;
         case OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS:
             if (keymgmt->gen_set_params == NULL) {
                 setgenparamfncnt++;
-                keymgmt->gen_set_params =
-                    OSSL_FUNC_keymgmt_gen_set_params(fns);
+                keymgmt->gen_set_params = OSSL_FUNC_keymgmt_gen_set_params(fns);
             }
             break;
         case OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS:
             if (keymgmt->gen_settable_params == NULL) {
                 setgenparamfncnt++;
-                keymgmt->gen_settable_params =
-                    OSSL_FUNC_keymgmt_gen_settable_params(fns);
+                keymgmt->gen_settable_params = OSSL_FUNC_keymgmt_gen_settable_params(fns);
             }
             break;
         case OSSL_FUNC_KEYMGMT_GEN_GET_PARAMS:
             if (keymgmt->gen_get_params == NULL) {
                 getgenparamfncnt++;
-                keymgmt->gen_get_params =
-                    OSSL_FUNC_keymgmt_gen_get_params(fns);
+                keymgmt->gen_get_params = OSSL_FUNC_keymgmt_gen_get_params(fns);
             }
             break;
         case OSSL_FUNC_KEYMGMT_GEN_GETTABLE_PARAMS:
             if (keymgmt->gen_gettable_params == NULL) {
                 getgenparamfncnt++;
-                keymgmt->gen_gettable_params =
-                    OSSL_FUNC_keymgmt_gen_gettable_params(fns);
+                keymgmt->gen_gettable_params = OSSL_FUNC_keymgmt_gen_gettable_params(fns);
             }
             break;
         case OSSL_FUNC_KEYMGMT_GEN:
@@ -150,11 +145,10 @@ static void *keymgmt_from_algorithm(int name_id,
         case OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS:
             if (keymgmt->gettable_params == NULL) {
                 getparamfncnt++;
-                keymgmt->gettable_params =
-                    OSSL_FUNC_keymgmt_gettable_params(fns);
+                keymgmt->gettable_params = OSSL_FUNC_keymgmt_gettable_params(fns);
             }
             break;
-         case OSSL_FUNC_KEYMGMT_SET_PARAMS:
+        case OSSL_FUNC_KEYMGMT_SET_PARAMS:
             if (keymgmt->set_params == NULL) {
                 setparamfncnt++;
                 keymgmt->set_params = OSSL_FUNC_keymgmt_set_params(fns);
@@ -163,14 +157,12 @@ static void *keymgmt_from_algorithm(int name_id,
         case OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS:
             if (keymgmt->settable_params == NULL) {
                 setparamfncnt++;
-                keymgmt->settable_params =
-                    OSSL_FUNC_keymgmt_settable_params(fns);
+                keymgmt->settable_params = OSSL_FUNC_keymgmt_settable_params(fns);
             }
             break;
         case OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME:
             if (keymgmt->query_operation_name == NULL)
-                keymgmt->query_operation_name =
-                    OSSL_FUNC_keymgmt_query_operation_name(fns);
+                keymgmt->query_operation_name = OSSL_FUNC_keymgmt_query_operation_name(fns);
             break;
         case OSSL_FUNC_KEYMGMT_HAS:
             if (keymgmt->has == NULL)
@@ -272,23 +264,23 @@ static void *keymgmt_from_algorithm(int name_id,
 }
 
 EVP_KEYMGMT *evp_keymgmt_fetch_from_prov(OSSL_PROVIDER *prov,
-                                         const char *name,
-                                         const char *properties)
+    const char *name,
+    const char *properties)
 {
     return evp_generic_fetch_from_prov(prov, OSSL_OP_KEYMGMT,
-                                       name, properties,
-                                       keymgmt_from_algorithm,
-                                       evp_keymgmt_up_ref,
-                                       evp_keymgmt_free);
+        name, properties,
+        keymgmt_from_algorithm,
+        evp_keymgmt_up_ref,
+        evp_keymgmt_free);
 }
 
 EVP_KEYMGMT *EVP_KEYMGMT_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                               const char *properties)
+    const char *properties)
 {
     return evp_generic_fetch(ctx, OSSL_OP_KEYMGMT, algorithm, properties,
-                             keymgmt_from_algorithm,
-                             evp_keymgmt_up_ref,
-                             evp_keymgmt_free);
+        keymgmt_from_algorithm,
+        evp_keymgmt_up_ref,
+        evp_keymgmt_free);
 }
 
 int EVP_KEYMGMT_up_ref(EVP_KEYMGMT *keymgmt)
@@ -343,23 +335,23 @@ const char *EVP_KEYMGMT_get0_name(const EVP_KEYMGMT *keymgmt)
 int EVP_KEYMGMT_is_a(const EVP_KEYMGMT *keymgmt, const char *name)
 {
     return keymgmt != NULL
-           && evp_is_a(keymgmt->prov, keymgmt->name_id, NULL, name);
+        && evp_is_a(keymgmt->prov, keymgmt->name_id, NULL, 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)
 {
     evp_generic_do_all(libctx, OSSL_OP_KEYMGMT,
-                       (void (*)(void *, void *))fn, arg,
-                       keymgmt_from_algorithm,
-                       evp_keymgmt_up_ref,
-                       evp_keymgmt_free);
+        (void (*)(void *, void *))fn, arg,
+        keymgmt_from_algorithm,
+        evp_keymgmt_up_ref,
+        evp_keymgmt_free);
 }
 
 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)
 {
     if (keymgmt->prov != NULL)
         return evp_names_do_all(keymgmt->prov, keymgmt->name_id, fn, data);
@@ -391,7 +383,7 @@ void evp_keymgmt_freedata(const EVP_KEYMGMT *keymgmt, void *keydata)
 }
 
 void *evp_keymgmt_gen_init(const EVP_KEYMGMT *keymgmt, int selection,
-                           const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
 
@@ -401,7 +393,7 @@ void *evp_keymgmt_gen_init(const EVP_KEYMGMT *keymgmt, int selection,
 }
 
 int evp_keymgmt_gen_set_template(const EVP_KEYMGMT *keymgmt, void *genctx,
-                                 void *templ)
+    void *templ)
 {
     /*
      * It's arguable if we actually should return success in this case, as
@@ -415,7 +407,7 @@ int evp_keymgmt_gen_set_template(const EVP_KEYMGMT *keymgmt, void *genctx,
 }
 
 int evp_keymgmt_gen_set_params(const EVP_KEYMGMT *keymgmt, void *genctx,
-                               const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     if (keymgmt->gen_set_params == NULL)
         return 0;
@@ -432,7 +424,7 @@ const OSSL_PARAM *EVP_KEYMGMT_gen_settable_params(const EVP_KEYMGMT *keymgmt)
 }
 
 int evp_keymgmt_gen_get_params(const EVP_KEYMGMT *keymgmt, void *genctx,
-                               OSSL_PARAM params[])
+    OSSL_PARAM params[])
 {
     if (keymgmt->gen_get_params == NULL)
         return 0;
@@ -449,11 +441,24 @@ const OSSL_PARAM *EVP_KEYMGMT_gen_gettable_params(const EVP_KEYMGMT *keymgmt)
 }
 
 void *evp_keymgmt_gen(const EVP_KEYMGMT *keymgmt, void *genctx,
-                      OSSL_CALLBACK *cb, void *cbarg)
+    OSSL_CALLBACK *cb, void *cbarg)
 {
-    if (keymgmt->gen == NULL)
+    void *ret;
+    const char *desc = keymgmt->description != NULL ? keymgmt->description : "";
+
+    if (keymgmt->gen == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_KEYMGMT_NOT_SUPPORTED,
+            "%s key generation:%s", keymgmt->type_name, desc);
         return NULL;
-    return keymgmt->gen(genctx, cb, cbarg);
+    }
+
+    ERR_set_mark();
+    ret = keymgmt->gen(genctx, cb, cbarg);
+    if (ret == NULL && ERR_count_to_mark() == 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_KEYMGMT_FAILURE,
+            "%s key generation:%s", keymgmt->type_name, desc);
+    ERR_clear_last_mark();
+    return ret;
 }
 
 void evp_keymgmt_gen_cleanup(const EVP_KEYMGMT *keymgmt, void *genctx)
@@ -468,7 +473,7 @@ 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)
 {
     if (evp_keymgmt_has_load(keymgmt))
         return keymgmt->load(objref, objref_sz);
@@ -476,7 +481,7 @@ void *evp_keymgmt_load(const EVP_KEYMGMT *keymgmt,
 }
 
 int evp_keymgmt_get_params(const EVP_KEYMGMT *keymgmt, void *keydata,
-                           OSSL_PARAM params[])
+    OSSL_PARAM params[])
 {
     if (keymgmt->get_params == NULL)
         return 1;
@@ -493,7 +498,7 @@ const OSSL_PARAM *EVP_KEYMGMT_gettable_params(const EVP_KEYMGMT *keymgmt)
 }
 
 int evp_keymgmt_set_params(const EVP_KEYMGMT *keymgmt, void *keydata,
-                           const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     if (keymgmt->set_params == NULL)
         return 1;
@@ -516,7 +521,7 @@ int evp_keymgmt_has(const EVP_KEYMGMT *keymgmt, void *keydata, int selection)
 }
 
 int evp_keymgmt_validate(const EVP_KEYMGMT *keymgmt, void *keydata,
-                         int selection, int checktype)
+    int selection, int checktype)
 {
     /* We assume valid if the implementation doesn't have a function */
     if (keymgmt->validate == NULL)
@@ -525,8 +530,8 @@ int evp_keymgmt_validate(const EVP_KEYMGMT *keymgmt, void *keydata,
 }
 
 int evp_keymgmt_match(const EVP_KEYMGMT *keymgmt,
-                      const void *keydata1, const void *keydata2,
-                      int selection)
+    const void *keydata1, const void *keydata2,
+    int selection)
 {
     /* We assume no match if the implementation doesn't have a function */
     if (keymgmt->match == NULL)
@@ -535,7 +540,7 @@ int evp_keymgmt_match(const EVP_KEYMGMT *keymgmt,
 }
 
 int evp_keymgmt_import(const EVP_KEYMGMT *keymgmt, void *keydata,
-                       int selection, const OSSL_PARAM params[])
+    int selection, const OSSL_PARAM params[])
 {
     if (keymgmt->import == NULL)
         return 0;
@@ -543,7 +548,7 @@ int evp_keymgmt_import(const EVP_KEYMGMT *keymgmt, void *keydata,
 }
 
 const OSSL_PARAM *evp_keymgmt_import_types(const EVP_KEYMGMT *keymgmt,
-                                           int selection)
+    int selection)
 {
     void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
 
@@ -555,7 +560,7 @@ const OSSL_PARAM *evp_keymgmt_import_types(const EVP_KEYMGMT *keymgmt,
 }
 
 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)
 {
     if (keymgmt->export == NULL)
         return 0;
@@ -563,7 +568,7 @@ int evp_keymgmt_export(const EVP_KEYMGMT *keymgmt, void *keydata,
 }
 
 const OSSL_PARAM *evp_keymgmt_export_types(const EVP_KEYMGMT *keymgmt,
-                                           int selection)
+    int selection)
 {
     void *provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(keymgmt));
 
@@ -575,7 +580,7 @@ const OSSL_PARAM *evp_keymgmt_export_types(const EVP_KEYMGMT *keymgmt,
 }
 
 void *evp_keymgmt_dup(const EVP_KEYMGMT *keymgmt, const void *keydata_from,
-                      int selection)
+    int selection)
 {
     /* We assume no dup if the implementation doesn't have a function */
     if (keymgmt->dup == NULL)
diff --git a/crypto/evp/legacy_blake2.c b/crypto/evp/legacy_blake2.c
index 5a5f05044ceed..af8ad536fa351 100644
--- a/crypto/evp/legacy_blake2.c
+++ b/crypto/evp/legacy_blake2.c
@@ -8,7 +8,7 @@
  */
 
 #include "crypto/evp.h"
-#include "prov/blake2.h"        /* diverse BLAKE2 macros */
+#include "prov/blake2.h" /* diverse BLAKE2 macros */
 #include "legacy_meth.h"
 
 /*
@@ -44,7 +44,7 @@ static const EVP_MD blake2b_md = {
     0,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(blake2b_int_init, blake2b_int_update,
-                             blake2b_int_final, NULL, BLAKE2B_BLOCKBYTES),
+        blake2b_int_final, NULL, BLAKE2B_BLOCKBYTES),
 };
 
 const EVP_MD *EVP_blake2b512(void)
@@ -59,7 +59,7 @@ static const EVP_MD blake2s_md = {
     0,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(blake2s_int_init, blake2s_int_update,
-                             blake2s_int_final, NULL, BLAKE2S_BLOCKBYTES),
+        blake2s_int_final, NULL, BLAKE2S_BLOCKBYTES),
 };
 
 const EVP_MD *EVP_blake2s256(void)
diff --git a/crypto/evp/legacy_md5_sha1.c b/crypto/evp/legacy_md5_sha1.c
index b84bf3deaaf48..62947f8b9a6e8 100644
--- a/crypto/evp/legacy_md5_sha1.c
+++ b/crypto/evp/legacy_md5_sha1.c
@@ -15,7 +15,7 @@
 #include "internal/deprecated.h"
 
 #include "crypto/evp.h"
-#include "prov/md5_sha1.h"   /* diverse MD5_SHA1 macros */
+#include "prov/md5_sha1.h" /* diverse MD5_SHA1 macros */
 #include "legacy_meth.h"
 
 IMPLEMENT_LEGACY_EVP_MD_METH_LC(md5_sha1_int, ossl_md5_sha1)
@@ -31,8 +31,8 @@ static const EVP_MD md5_sha1_md = {
     0,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(md5_sha1_int_init, md5_sha1_int_update,
-                             md5_sha1_int_final, md5_sha1_int_ctrl,
-                             MD5_SHA1_CBLOCK),
+        md5_sha1_int_final, md5_sha1_int_ctrl,
+        MD5_SHA1_CBLOCK),
 };
 
 const EVP_MD *EVP_md5_sha1(void)
diff --git a/crypto/evp/legacy_mdc2.c b/crypto/evp/legacy_mdc2.c
index 317d87c61b145..2ad432426c691 100644
--- a/crypto/evp/legacy_mdc2.c
+++ b/crypto/evp/legacy_mdc2.c
@@ -26,7 +26,7 @@ static const EVP_MD mdc2_md = {
     0,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(mdc2_init, mdc2_update, mdc2_final, NULL,
-                             MDC2_BLOCK),
+        MDC2_BLOCK),
 };
 
 const EVP_MD *EVP_mdc2(void)
diff --git a/crypto/evp/legacy_meth.h b/crypto/evp/legacy_meth.h
index a6e58bc824e2c..ea1e84c7e7b4c 100644
--- a/crypto/evp/legacy_meth.h
+++ b/crypto/evp/legacy_meth.h
@@ -7,34 +7,33 @@
  * https://www.openssl.org/source/license.html
  */
 
-#define IMPLEMENT_LEGACY_EVP_MD_METH(nm, fn)                                   \
-static int nm##_init(EVP_MD_CTX *ctx)                                          \
-{                                                                              \
-    return fn##_Init(EVP_MD_CTX_get0_md_data(ctx));                            \
-}                                                                              \
-static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count)        \
-{                                                                              \
-    return fn##_Update(EVP_MD_CTX_get0_md_data(ctx), data, count);             \
-}                                                                              \
-static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md)                      \
-{                                                                              \
-    return fn##_Final(md, EVP_MD_CTX_get0_md_data(ctx));                       \
-}
+#define IMPLEMENT_LEGACY_EVP_MD_METH(nm, fn)                                \
+    static int nm##_init(EVP_MD_CTX *ctx)                                   \
+    {                                                                       \
+        return fn##_Init(EVP_MD_CTX_get0_md_data(ctx));                     \
+    }                                                                       \
+    static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \
+    {                                                                       \
+        return fn##_Update(EVP_MD_CTX_get0_md_data(ctx), data, count);      \
+    }                                                                       \
+    static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md)               \
+    {                                                                       \
+        return fn##_Final(md, EVP_MD_CTX_get0_md_data(ctx));                \
+    }
 
-#define IMPLEMENT_LEGACY_EVP_MD_METH_LC(nm, fn)                                \
-static int nm##_init(EVP_MD_CTX *ctx)                                          \
-{                                                                              \
-    return fn##_init(EVP_MD_CTX_get0_md_data(ctx));                            \
-}                                                                              \
-static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count)        \
-{                                                                              \
-    return fn##_update(EVP_MD_CTX_get0_md_data(ctx), data, count);             \
-}                                                                              \
-static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md)                      \
-{                                                                              \
-    return fn##_final(md, EVP_MD_CTX_get0_md_data(ctx));                       \
-}
+#define IMPLEMENT_LEGACY_EVP_MD_METH_LC(nm, fn)                             \
+    static int nm##_init(EVP_MD_CTX *ctx)                                   \
+    {                                                                       \
+        return fn##_init(EVP_MD_CTX_get0_md_data(ctx));                     \
+    }                                                                       \
+    static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count) \
+    {                                                                       \
+        return fn##_update(EVP_MD_CTX_get0_md_data(ctx), data, count);      \
+    }                                                                       \
+    static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md)               \
+    {                                                                       \
+        return fn##_final(md, EVP_MD_CTX_get0_md_data(ctx));                \
+    }
 
-
-#define LEGACY_EVP_MD_METH_TABLE(init, update, final, ctrl, blksz)             \
+#define LEGACY_EVP_MD_METH_TABLE(init, update, final, ctrl, blksz) \
     init, update, final, NULL, NULL, blksz, 0, ctrl
diff --git a/crypto/evp/legacy_ripemd.c b/crypto/evp/legacy_ripemd.c
index 1fa1ebc04998a..80f551a97d5a2 100644
--- a/crypto/evp/legacy_ripemd.c
+++ b/crypto/evp/legacy_ripemd.c
@@ -26,7 +26,7 @@ static const EVP_MD ripemd160_md = {
     0,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(ripe_init, ripe_update, ripe_final, NULL,
-                             RIPEMD160_CBLOCK),
+        RIPEMD160_CBLOCK),
 };
 
 const EVP_MD *EVP_ripemd160(void)
diff --git a/crypto/evp/legacy_sha.c b/crypto/evp/legacy_sha.c
index 38423ff540f56..0c1a74de30a17 100644
--- a/crypto/evp/legacy_sha.c
+++ b/crypto/evp/legacy_sha.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-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
@@ -13,8 +13,8 @@
  */
 #include "internal/deprecated.h"
 
-#include <openssl/sha.h>         /* diverse SHA macros */
-#include "internal/sha3.h"       /* KECCAK1600_WIDTH */
+#include <openssl/sha.h> /* diverse SHA macros */
+#include "internal/sha3.h" /* KECCAK1600_WIDTH */
 #include "crypto/evp.h"
 /* Used by legacy methods */
 #include "crypto/sha.h"
@@ -26,33 +26,33 @@
  * These only remain to support engines that can get these methods.
  * Hardware support for SHA3 has been removed from these legacy cases.
  */
-#define IMPLEMENT_LEGACY_EVP_MD_METH_SHA3(nm, fn, tag)                         \
-static int nm##_init(EVP_MD_CTX *ctx)                                          \
-{                                                                              \
-    return fn##_init(EVP_MD_CTX_get0_md_data(ctx), tag, ctx->digest->md_size * 8); \
-}                                                                              \
-static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count)        \
-{                                                                              \
-    return fn##_update(EVP_MD_CTX_get0_md_data(ctx), data, count);             \
-}                                                                              \
-static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md)                      \
-{                                                                              \
-    KECCAK1600_CTX *kctx = EVP_MD_CTX_get0_md_data(ctx);                       \
-    return fn##_final(kctx, md, kctx->md_size);                                \
-}
-#define IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(nm, fn, tag)                        \
-static int nm##_init(EVP_MD_CTX *ctx)                                          \
-{                                                                              \
-    return fn##_init(EVP_MD_CTX_get0_md_data(ctx), tag, ctx->digest->md_size * 8); \
-}                                                                              \
+#define IMPLEMENT_LEGACY_EVP_MD_METH_SHA3(nm, fn, tag)                                 \
+    static int nm##_init(EVP_MD_CTX *ctx)                                              \
+    {                                                                                  \
+        return fn##_init(EVP_MD_CTX_get0_md_data(ctx), tag, ctx->digest->md_size * 8); \
+    }                                                                                  \
+    static int nm##_update(EVP_MD_CTX *ctx, const void *data, size_t count)            \
+    {                                                                                  \
+        return fn##_update(EVP_MD_CTX_get0_md_data(ctx), data, count);                 \
+    }                                                                                  \
+    static int nm##_final(EVP_MD_CTX *ctx, unsigned char *md)                          \
+    {                                                                                  \
+        KECCAK1600_CTX *kctx = EVP_MD_CTX_get0_md_data(ctx);                           \
+        return fn##_final(kctx, md, kctx->md_size);                                    \
+    }
+#define IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(nm, fn, tag)                                \
+    static int nm##_init(EVP_MD_CTX *ctx)                                              \
+    {                                                                                  \
+        return fn##_init(EVP_MD_CTX_get0_md_data(ctx), tag, ctx->digest->md_size * 8); \
+    }
 
-#define sha512_224_Init    sha512_224_init
-#define sha512_256_Init    sha512_256_init
+#define sha512_224_Init sha512_224_init
+#define sha512_256_Init sha512_256_init
 
-#define sha512_224_Update  SHA512_Update
-#define sha512_224_Final   SHA512_Final
-#define sha512_256_Update  SHA512_Update
-#define sha512_256_Final   SHA512_Final
+#define sha512_224_Update SHA512_Update
+#define sha512_224_Final SHA512_Final
+#define sha512_256_Update SHA512_Update
+#define sha512_256_Final SHA512_Final
 
 IMPLEMENT_LEGACY_EVP_MD_METH(sha1, SHA1)
 IMPLEMENT_LEGACY_EVP_MD_METH(sha224, SHA224)
@@ -67,7 +67,7 @@ IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(shake, ossl_sha3, '\x1f')
 static int sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
 {
     return ossl_sha1_ctrl(ctx != NULL ? EVP_MD_CTX_get0_md_data(ctx) : NULL,
-                          cmd, p1, p2);
+        cmd, p1, p2);
 }
 
 static int shake_ctrl(EVP_MD_CTX *evp_ctx, int cmd, int p1, void *p2)
@@ -87,8 +87,6 @@ static int shake_ctrl(EVP_MD_CTX *evp_ctx, int cmd, int p1, void *p2)
     }
 }
 
-
-
 static const EVP_MD sha1_md = {
     NID_sha1,
     NID_sha1WithRSAEncryption,
@@ -96,7 +94,7 @@ static const EVP_MD sha1_md = {
     EVP_MD_FLAG_DIGALGID_ABSENT,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(sha1_init, sha1_update, sha1_final, sha1_int_ctrl,
-                             SHA_CBLOCK),
+        SHA_CBLOCK),
 };
 
 const EVP_MD *EVP_sha1(void)
@@ -111,7 +109,7 @@ static const EVP_MD sha224_md = {
     EVP_MD_FLAG_DIGALGID_ABSENT,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(sha224_init, sha224_update, sha224_final, NULL,
-                             SHA256_CBLOCK),
+        SHA256_CBLOCK),
 };
 
 const EVP_MD *EVP_sha224(void)
@@ -126,7 +124,7 @@ static const EVP_MD sha256_md = {
     EVP_MD_FLAG_DIGALGID_ABSENT,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(sha256_init, sha256_update, sha256_final, NULL,
-                             SHA256_CBLOCK),
+        SHA256_CBLOCK),
 };
 
 const EVP_MD *EVP_sha256(void)
@@ -141,7 +139,7 @@ static const EVP_MD sha512_224_md = {
     EVP_MD_FLAG_DIGALGID_ABSENT,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(sha512_224_int_init, sha512_224_int_update,
-                             sha512_224_int_final, NULL, SHA512_CBLOCK),
+        sha512_224_int_final, NULL, SHA512_CBLOCK),
 };
 
 const EVP_MD *EVP_sha512_224(void)
@@ -156,7 +154,7 @@ static const EVP_MD sha512_256_md = {
     EVP_MD_FLAG_DIGALGID_ABSENT,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(sha512_256_int_init, sha512_256_int_update,
-                             sha512_256_int_final, NULL, SHA512_CBLOCK),
+        sha512_256_int_final, NULL, SHA512_CBLOCK),
 };
 
 const EVP_MD *EVP_sha512_256(void)
@@ -171,7 +169,7 @@ static const EVP_MD sha384_md = {
     EVP_MD_FLAG_DIGALGID_ABSENT,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(sha384_init, sha384_update, sha384_final, NULL,
-                             SHA512_CBLOCK),
+        SHA512_CBLOCK),
 };
 
 const EVP_MD *EVP_sha384(void)
@@ -186,7 +184,7 @@ static const EVP_MD sha512_md = {
     EVP_MD_FLAG_DIGALGID_ABSENT,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(sha512_init, sha512_update, sha512_final, NULL,
-                             SHA512_CBLOCK),
+        SHA512_CBLOCK),
 };
 
 const EVP_MD *EVP_sha512(void)
@@ -194,35 +192,35 @@ const EVP_MD *EVP_sha512(void)
     return &sha512_md;
 }
 
-#define EVP_MD_SHA3(bitlen)                                                    \
-const EVP_MD *EVP_sha3_##bitlen(void)                                          \
-{                                                                              \
-    static const EVP_MD sha3_##bitlen##_md = {                                 \
-        NID_sha3_##bitlen,                                                     \
-        NID_RSA_SHA3_##bitlen,                                                 \
-        bitlen / 8,                                                            \
-        EVP_MD_FLAG_DIGALGID_ABSENT,                                           \
-        EVP_ORIG_GLOBAL,                                                       \
-        LEGACY_EVP_MD_METH_TABLE(sha3_int_init, sha3_int_update,               \
-                                 sha3_int_final, NULL,                         \
-                                 (KECCAK1600_WIDTH - bitlen * 2) / 8),         \
-    };                                                                         \
-    return &sha3_##bitlen##_md;                                                \
-}
-#define EVP_MD_SHAKE(bitlen)                                                   \
-const EVP_MD *EVP_shake##bitlen(void)                                          \
-{                                                                              \
-    static const EVP_MD shake##bitlen##_md = {                                 \
-        NID_shake##bitlen,                                                     \
-        0,                                                                     \
-        bitlen / 8,                                                            \
-        EVP_MD_FLAG_XOF,                                                       \
-        EVP_ORIG_GLOBAL,                                                       \
-        LEGACY_EVP_MD_METH_TABLE(shake_init, sha3_int_update, sha3_int_final,  \
-                        shake_ctrl, (KECCAK1600_WIDTH - bitlen * 2) / 8),      \
-    };                                                                         \
-    return &shake##bitlen##_md;                                                \
-}
+#define EVP_MD_SHA3(bitlen)                                          \
+    const EVP_MD *EVP_sha3_##bitlen(void)                            \
+    {                                                                \
+        static const EVP_MD sha3_##bitlen##_md = {                   \
+            NID_sha3_##bitlen,                                       \
+            NID_RSA_SHA3_##bitlen,                                   \
+            bitlen / 8,                                              \
+            EVP_MD_FLAG_DIGALGID_ABSENT,                             \
+            EVP_ORIG_GLOBAL,                                         \
+            LEGACY_EVP_MD_METH_TABLE(sha3_int_init, sha3_int_update, \
+                sha3_int_final, NULL,                                \
+                (KECCAK1600_WIDTH - bitlen * 2) / 8),                \
+        };                                                           \
+        return &sha3_##bitlen##_md;                                  \
+    }
+#define EVP_MD_SHAKE(bitlen)                                                      \
+    const EVP_MD *EVP_shake##bitlen(void)                                         \
+    {                                                                             \
+        static const EVP_MD shake##bitlen##_md = {                                \
+            NID_shake##bitlen,                                                    \
+            0,                                                                    \
+            bitlen / 8,                                                           \
+            EVP_MD_FLAG_XOF | EVP_MD_FLAG_DIGALGID_ABSENT,                        \
+            EVP_ORIG_GLOBAL,                                                      \
+            LEGACY_EVP_MD_METH_TABLE(shake_init, sha3_int_update, sha3_int_final, \
+                shake_ctrl, (KECCAK1600_WIDTH - bitlen * 2) / 8),                 \
+        };                                                                        \
+        return &shake##bitlen##_md;                                               \
+    }
 
 EVP_MD_SHA3(224)
 EVP_MD_SHA3(256)
diff --git a/crypto/evp/legacy_wp.c b/crypto/evp/legacy_wp.c
index 3976ff73fb2d7..21865e6350815 100644
--- a/crypto/evp/legacy_wp.c
+++ b/crypto/evp/legacy_wp.c
@@ -26,7 +26,7 @@ static const EVP_MD whirlpool_md = {
     0,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(wp_init, wp_update, wp_final, NULL,
-                             WHIRLPOOL_BBLOCK / 8),
+        WHIRLPOOL_BBLOCK / 8),
 };
 
 const EVP_MD *EVP_whirlpool(void)
diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index 2d1839fedb2f9..0a433adbe411e 100644
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -13,7 +13,7 @@
 #include <openssl/objects.h>
 #include "crypto/evp.h"
 #include "internal/provider.h"
-#include "internal/numbers.h"   /* includes SIZE_MAX */
+#include "internal/numbers.h" /* includes SIZE_MAX */
 #include "evp_local.h"
 
 static int update(EVP_MD_CTX *ctx, const void *data, size_t datalen)
@@ -35,17 +35,18 @@ static const char *canon_mdname(const char *mdname)
 }
 
 static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                          const EVP_MD *type, const char *mdname,
-                          OSSL_LIB_CTX *libctx, const char *props,
-                          ENGINE *e, EVP_PKEY *pkey, int ver,
-                          const OSSL_PARAM params[])
+    const EVP_MD *type, const char *mdname,
+    OSSL_LIB_CTX *libctx, const char *props,
+    ENGINE *e, EVP_PKEY *pkey, int ver,
+    const OSSL_PARAM params[])
 {
     EVP_PKEY_CTX *locpctx = NULL;
     EVP_SIGNATURE *signature = NULL;
+    const char *desc;
     EVP_KEYMGMT *tmp_keymgmt = NULL;
     const OSSL_PROVIDER *tmp_prov = NULL;
     const char *supported_sig = NULL;
-    char locmdname[80] = "";     /* 80 chars should be enough */
+    char locmdname[80] = ""; /* 80 chars should be enough */
     void *provkey = NULL;
     int ret, iter, reinit = 1;
 
@@ -73,8 +74,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
     /* do not reinitialize if pkey is set or operation is different */
     if (reinit
         && (pkey != NULL
-            || locpctx->operation != (ver ? EVP_PKEY_OP_VERIFYCTX
-                                          : EVP_PKEY_OP_SIGNCTX)
+            || locpctx->operation != (ver ? EVP_PKEY_OP_VERIFYCTX : EVP_PKEY_OP_SIGNCTX)
             || (signature = locpctx->op.sig.signature) == NULL
             || locpctx->op.sig.algctx == NULL))
         reinit = 0;
@@ -100,13 +100,13 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
      * Try to derive the supported signature from |locpctx->keymgmt|.
      */
     if (!ossl_assert(locpctx->pkey->keymgmt == NULL
-                     || locpctx->pkey->keymgmt == locpctx->keymgmt)) {
+            || locpctx->pkey->keymgmt == locpctx->keymgmt)) {
         ERR_clear_last_mark();
         ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
         goto err;
     }
     supported_sig = evp_keymgmt_util_query_operation_name(locpctx->keymgmt,
-                                                          OSSL_OP_SIGNATURE);
+        OSSL_OP_SIGNATURE);
     if (supported_sig == NULL) {
         ERR_clear_last_mark();
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -144,15 +144,14 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
         switch (iter) {
         case 1:
             signature = EVP_SIGNATURE_fetch(locpctx->libctx, supported_sig,
-                                            locpctx->propquery);
+                locpctx->propquery);
             if (signature != NULL)
                 tmp_prov = EVP_SIGNATURE_get0_provider(signature);
             break;
         case 2:
             tmp_prov = EVP_KEYMGMT_get0_provider(locpctx->keymgmt);
-            signature =
-                evp_signature_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
-                                              supported_sig, locpctx->propquery);
+            signature = evp_signature_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+                supported_sig, locpctx->propquery);
             if (signature == NULL)
                 goto legacy;
             break;
@@ -170,13 +169,12 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
 
          * export it if |tmp_keymgmt| is different from |locpctx->pkey|'s keymgmt)
          */
-        tmp_keymgmt_tofree = tmp_keymgmt =
-            evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
-                                        EVP_KEYMGMT_get0_name(locpctx->keymgmt),
-                                        locpctx->propquery);
+        tmp_keymgmt_tofree = tmp_keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+            EVP_KEYMGMT_get0_name(locpctx->keymgmt),
+            locpctx->propquery);
         if (tmp_keymgmt != NULL)
             provkey = evp_pkey_export_to_provider(locpctx->pkey, locpctx->libctx,
-                                                  &tmp_keymgmt, locpctx->propquery);
+                &tmp_keymgmt, locpctx->propquery);
         if (tmp_keymgmt == NULL)
             EVP_KEYMGMT_free(tmp_keymgmt_tofree);
     }
@@ -198,11 +196,11 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
     locpctx->op.sig.algctx
         = signature->newctx(ossl_provider_ctx(signature->prov), props);
     if (locpctx->op.sig.algctx == NULL) {
-        ERR_raise(ERR_LIB_EVP,  EVP_R_INITIALIZATION_ERROR);
+        ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
         goto err;
     }
 
- reinitialize:
+reinitialize:
     if (pctx != NULL)
         *pctx = locpctx;
 
@@ -213,8 +211,9 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
     } else {
         if (mdname == NULL && !reinit) {
             if (evp_keymgmt_util_get_deflt_digest_name(tmp_keymgmt, provkey,
-                                                       locmdname,
-                                                       sizeof(locmdname)) > 0) {
+                    locmdname,
+                    sizeof(locmdname))
+                > 0) {
                 mdname = canon_mdname(locmdname);
             }
         }
@@ -251,20 +250,23 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
         }
     }
 
+    desc = signature->description != NULL ? signature->description : "";
     if (ver) {
         if (signature->digest_verify_init == NULL) {
-            ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
+            ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+                "%s digest_verify_init:%s", signature->type_name, desc);
             goto err;
         }
         ret = signature->digest_verify_init(locpctx->op.sig.algctx,
-                                            mdname, provkey, params);
+            mdname, provkey, params);
     } else {
         if (signature->digest_sign_init == NULL) {
-            ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
+            ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+                "%s digest_sign_init:%s", signature->type_name, desc);
             goto err;
         }
         ret = signature->digest_sign_init(locpctx->op.sig.algctx,
-                                          mdname, provkey, params);
+            mdname, provkey, params);
     }
 
     /*
@@ -273,16 +275,19 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
      */
     if (ret > 0 || mdname != NULL)
         goto end;
-    if (type == NULL)   /* This check is redundant but clarifies matters */
+    if (type == NULL) /* This check is redundant but clarifies matters */
         ERR_raise(ERR_LIB_EVP, EVP_R_NO_DEFAULT_DIGEST);
+    ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+        ver ? "%s digest_verify_init:%s" : "%s digest_sign_init:%s",
+        signature->type_name, desc);
 
- err:
+err:
     evp_pkey_ctx_free_old_ops(locpctx);
     locpctx->operation = EVP_PKEY_OP_UNDEFINED;
     EVP_KEYMGMT_free(tmp_keymgmt);
     return 0;
 
- legacy:
+legacy:
     /*
      * If we don't have the full support we need with provided methods,
      * let's go see if legacy does.
@@ -353,7 +358,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
         ctx->pctx->flag_call_digest_custom = 1;
 
     ret = 1;
- end:
+end:
     if (ret > 0)
         ret = evp_pkey_ctx_use_cached_data(locpctx);
 
@@ -362,40 +367,43 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
 }
 
 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[])
 {
     return do_sigver_init(ctx, pctx, NULL, mdname, libctx, props, NULL, pkey, 0,
-                          params);
+        params);
 }
 
 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)
 {
     return do_sigver_init(ctx, pctx, type, NULL, NULL, NULL, e, pkey, 0,
-                          NULL);
+        NULL);
 }
 
 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[])
 {
     return do_sigver_init(ctx, pctx, NULL, mdname, libctx, props, NULL, pkey, 1,
-                          params);
+        params);
 }
 
 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)
 {
     return do_sigver_init(ctx, pctx, type, NULL, NULL, NULL, e, pkey, 1,
-                          NULL);
+        NULL);
 }
 
 int EVP_DigestSignUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
 {
+    EVP_SIGNATURE *signature;
+    const char *desc;
     EVP_PKEY_CTX *pctx = ctx->pctx;
+    int ret;
 
     if ((ctx->flags & EVP_MD_CTX_FLAG_FINALISED) != 0) {
         ERR_raise(ERR_LIB_EVP, EVP_R_UPDATE_ERROR);
@@ -403,20 +411,28 @@ int EVP_DigestSignUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
     }
 
     if (pctx == NULL
-            || pctx->operation != EVP_PKEY_OP_SIGNCTX
-            || pctx->op.sig.algctx == NULL
-            || pctx->op.sig.signature == NULL)
+        || pctx->operation != EVP_PKEY_OP_SIGNCTX
+        || pctx->op.sig.algctx == NULL
+        || pctx->op.sig.signature == NULL)
         goto legacy;
 
-    if (pctx->op.sig.signature->digest_sign_update == NULL) {
-        ERR_raise(ERR_LIB_EVP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+    signature = pctx->op.sig.signature;
+    desc = signature->description != NULL ? signature->description : "";
+    if (signature->digest_sign_update == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+            "%s digest_sign_update:%s", signature->type_name, desc);
         return 0;
     }
 
-    return pctx->op.sig.signature->digest_sign_update(pctx->op.sig.algctx,
-                                                      data, dsize);
-
- legacy:
+    ERR_set_mark();
+    ret = signature->digest_sign_update(pctx->op.sig.algctx, data, dsize);
+    if (ret <= 0 && ERR_count_to_mark() == 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+            "%s digest_sign_update:%s", signature->type_name, desc);
+    ERR_clear_last_mark();
+    return ret;
+
+legacy:
     if (pctx != NULL) {
         /* do_sigver_init() checked that |digest_custom| is non-NULL */
         if (pctx->flag_call_digest_custom
@@ -430,7 +446,10 @@ int EVP_DigestSignUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
 
 int EVP_DigestVerifyUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
 {
+    EVP_SIGNATURE *signature;
+    const char *desc;
     EVP_PKEY_CTX *pctx = ctx->pctx;
+    int ret;
 
     if ((ctx->flags & EVP_MD_CTX_FLAG_FINALISED) != 0) {
         ERR_raise(ERR_LIB_EVP, EVP_R_UPDATE_ERROR);
@@ -438,20 +457,28 @@ int EVP_DigestVerifyUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
     }
 
     if (pctx == NULL
-            || pctx->operation != EVP_PKEY_OP_VERIFYCTX
-            || pctx->op.sig.algctx == NULL
-            || pctx->op.sig.signature == NULL)
+        || pctx->operation != EVP_PKEY_OP_VERIFYCTX
+        || pctx->op.sig.algctx == NULL
+        || pctx->op.sig.signature == NULL)
         goto legacy;
 
-    if (pctx->op.sig.signature->digest_verify_update == NULL) {
-        ERR_raise(ERR_LIB_EVP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+    signature = pctx->op.sig.signature;
+    desc = signature->description != NULL ? signature->description : "";
+    if (signature->digest_verify_update == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+            "%s digest_verify_update:%s", signature->type_name, desc);
         return 0;
     }
 
-    return pctx->op.sig.signature->digest_verify_update(pctx->op.sig.algctx,
-                                                        data, dsize);
-
- legacy:
+    ERR_set_mark();
+    ret = signature->digest_verify_update(pctx->op.sig.algctx, data, dsize);
+    if (ret <= 0 && ERR_count_to_mark() == 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+            "%s digest_verify_update:%s", signature->type_name, desc);
+    ERR_clear_last_mark();
+    return ret;
+
+legacy:
     if (pctx != NULL) {
         /* do_sigver_init() checked that |digest_custom| is non-NULL */
         if (pctx->flag_call_digest_custom
@@ -464,8 +491,10 @@ int EVP_DigestVerifyUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
 }
 
 int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
-                        size_t *siglen)
+    size_t *siglen)
 {
+    EVP_SIGNATURE *signature;
+    const char *desc;
     int sctx = 0;
     int r = 0;
     EVP_PKEY_CTX *dctx = NULL, *pctx = ctx->pctx;
@@ -476,27 +505,40 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
     }
 
     if (pctx == NULL
-            || pctx->operation != EVP_PKEY_OP_SIGNCTX
-            || pctx->op.sig.algctx == NULL
-            || pctx->op.sig.signature == NULL)
+        || pctx->operation != EVP_PKEY_OP_SIGNCTX
+        || pctx->op.sig.algctx == NULL
+        || pctx->op.sig.signature == NULL)
         goto legacy;
 
+    signature = pctx->op.sig.signature;
+    desc = signature->description != NULL ? signature->description : "";
+    if (signature->digest_sign_final == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+            "%s digest_sign_final:%s", signature->type_name, desc);
+        return 0;
+    }
+
     if (sigret != NULL && (ctx->flags & EVP_MD_CTX_FLAG_FINALISE) == 0) {
         /* try dup */
         dctx = EVP_PKEY_CTX_dup(pctx);
         if (dctx != NULL)
             pctx = dctx;
     }
-    r = pctx->op.sig.signature->digest_sign_final(pctx->op.sig.algctx,
-                                                  sigret, siglen,
-                                                  sigret == NULL ? 0 : *siglen);
+
+    ERR_set_mark();
+    r = signature->digest_sign_final(pctx->op.sig.algctx, sigret, siglen,
+        sigret == NULL ? 0 : *siglen);
+    if (!r && ERR_count_to_mark() == 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+            "%s digest_sign_final:%s", signature->type_name, desc);
+    ERR_clear_last_mark();
     if (dctx == NULL && sigret != NULL)
         ctx->flags |= EVP_MD_CTX_FLAG_FINALISED;
     else
         EVP_PKEY_CTX_free(dctx);
     return r;
 
- legacy:
+legacy:
     if (pctx == NULL || pctx->pmeth == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
         return 0;
@@ -547,7 +589,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
             }
             if (sctx)
                 r = tmp_ctx->pctx->pmeth->signctx(tmp_ctx->pctx,
-                                                  sigret, siglen, tmp_ctx);
+                    sigret, siglen, tmp_ctx);
             else
                 r = EVP_DigestFinal_ex(tmp_ctx, md, &mdlen);
             EVP_MD_CTX_free(tmp_ctx);
@@ -571,9 +613,10 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
 }
 
 int EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
-                   const unsigned char *tbs, size_t tbslen)
+    const unsigned char *tbs, size_t tbslen)
 {
     EVP_PKEY_CTX *pctx = ctx->pctx;
+    int ret;
 
     if (pctx == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -586,15 +629,23 @@ int EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
     }
 
     if (pctx->operation == EVP_PKEY_OP_SIGNCTX
-            && pctx->op.sig.algctx != NULL
-            && pctx->op.sig.signature != NULL) {
-        if (pctx->op.sig.signature->digest_sign != NULL) {
+        && pctx->op.sig.algctx != NULL
+        && pctx->op.sig.signature != NULL) {
+        EVP_SIGNATURE *signature = pctx->op.sig.signature;
+
+        if (signature->digest_sign != NULL) {
+            const char *desc = signature->description != NULL ? signature->description : "";
+
             if (sigret != NULL)
                 ctx->flags |= EVP_MD_CTX_FLAG_FINALISED;
-            return pctx->op.sig.signature->digest_sign(pctx->op.sig.algctx,
-                                                       sigret, siglen,
-                                                       sigret == NULL ? 0 : *siglen,
-                                                       tbs, tbslen);
+            ERR_set_mark();
+            ret = signature->digest_sign(pctx->op.sig.algctx, sigret, siglen,
+                sigret == NULL ? 0 : *siglen, tbs, tbslen);
+            if (ret <= 0 && ERR_count_to_mark() == 0)
+                ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+                    "%s digest_sign:%s", signature->type_name, desc);
+            ERR_clear_last_mark();
+            return ret;
         }
     } else {
         /* legacy */
@@ -608,8 +659,10 @@ int EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen,
 }
 
 int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
-                          size_t siglen)
+    size_t siglen)
 {
+    EVP_SIGNATURE *signature;
+    const char *desc;
     int vctx = 0;
     unsigned int mdlen = 0;
     unsigned char md[EVP_MAX_MD_SIZE];
@@ -622,26 +675,39 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
     }
 
     if (pctx == NULL
-            || pctx->operation != EVP_PKEY_OP_VERIFYCTX
-            || pctx->op.sig.algctx == NULL
-            || pctx->op.sig.signature == NULL)
+        || pctx->operation != EVP_PKEY_OP_VERIFYCTX
+        || pctx->op.sig.algctx == NULL
+        || pctx->op.sig.signature == NULL)
         goto legacy;
 
+    signature = pctx->op.sig.signature;
+    desc = signature->description != NULL ? signature->description : "";
+    if (signature->digest_verify_final == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+            "%s digest_verify_final:%s", signature->type_name, desc);
+        return 0;
+    }
+
     if ((ctx->flags & EVP_MD_CTX_FLAG_FINALISE) == 0) {
         /* try dup */
         dctx = EVP_PKEY_CTX_dup(pctx);
         if (dctx != NULL)
             pctx = dctx;
     }
-    r = pctx->op.sig.signature->digest_verify_final(pctx->op.sig.algctx,
-                                                    sig, siglen);
+
+    ERR_set_mark();
+    r = signature->digest_verify_final(pctx->op.sig.algctx, sig, siglen);
+    if (!r && ERR_count_to_mark() == 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+            "%s digest_verify_final:%s", signature->type_name, desc);
+    ERR_clear_last_mark();
     if (dctx == NULL)
         ctx->flags |= EVP_MD_CTX_FLAG_FINALISED;
     else
         EVP_PKEY_CTX_free(dctx);
     return r;
 
- legacy:
+legacy:
     if (pctx == NULL || pctx->pmeth == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
         return 0;
@@ -673,7 +739,7 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
         }
         if (vctx)
             r = tmp_ctx->pctx->pmeth->verifyctx(tmp_ctx->pctx,
-                                                sig, siglen, tmp_ctx);
+                sig, siglen, tmp_ctx);
         else
             r = EVP_DigestFinal_ex(tmp_ctx, md, &mdlen);
         EVP_MD_CTX_free(tmp_ctx);
@@ -684,7 +750,7 @@ int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
 }
 
 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)
 {
     EVP_PKEY_CTX *pctx = ctx->pctx;
 
@@ -699,13 +765,21 @@ int EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret,
     }
 
     if (pctx->operation == EVP_PKEY_OP_VERIFYCTX
-            && pctx->op.sig.algctx != NULL
-            && pctx->op.sig.signature != NULL) {
+        && pctx->op.sig.algctx != NULL
+        && pctx->op.sig.signature != NULL) {
         if (pctx->op.sig.signature->digest_verify != NULL) {
+            EVP_SIGNATURE *signature = pctx->op.sig.signature;
+            const char *desc = signature->description != NULL ? signature->description : "";
+            int ret;
+
             ctx->flags |= EVP_MD_CTX_FLAG_FINALISED;
-            return pctx->op.sig.signature->digest_verify(pctx->op.sig.algctx,
-                                                         sigret, siglen,
-                                                         tbs, tbslen);
+            ERR_set_mark();
+            ret = signature->digest_verify(pctx->op.sig.algctx, sigret, siglen, tbs, tbslen);
+            if (ret <= 0 && ERR_count_to_mark() == 0)
+                ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+                    "%s digest_verify:%s", signature->type_name, desc);
+            ERR_clear_last_mark();
+            return ret;
         }
     } else {
         /* legacy */
diff --git a/crypto/evp/mac_lib.c b/crypto/evp/mac_lib.c
index 58ddf76151d35..a3c7fbb4b538e 100644
--- a/crypto/evp/mac_lib.c
+++ b/crypto/evp/mac_lib.c
@@ -113,7 +113,7 @@ size_t EVP_MAC_CTX_get_block_size(EVP_MAC_CTX *ctx)
 }
 
 int EVP_MAC_init(EVP_MAC_CTX *ctx, const unsigned char *key, size_t keylen,
-                 const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     if (ctx->meth->init == NULL) {
         ERR_raise(ERR_R_EVP_LIB, ERR_R_UNSUPPORTED);
@@ -139,7 +139,7 @@ int EVP_MAC_update(EVP_MAC_CTX *ctx, const unsigned char *data, size_t datalen)
 }
 
 static int evp_mac_final(EVP_MAC_CTX *ctx, int xof,
-                         unsigned char *out, size_t *outl, size_t outsize)
+    unsigned char *out, size_t *outl, size_t outsize)
 {
     size_t l;
     int res;
@@ -184,7 +184,7 @@ static int evp_mac_final(EVP_MAC_CTX *ctx, int xof,
 }
 
 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)
 {
     return evp_mac_final(ctx, 0, out, outl, outsize);
 }
@@ -242,8 +242,8 @@ int EVP_MAC_is_a(const EVP_MAC *mac, const char *name)
 }
 
 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)
 {
     if (mac->prov != NULL)
         return evp_names_do_all(mac->prov, mac->name_id, fn, data);
@@ -252,15 +252,15 @@ int EVP_MAC_names_do_all(const EVP_MAC *mac,
 }
 
 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 *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)
 {
     EVP_MAC *mac = EVP_MAC_fetch(libctx, name, propq);
     OSSL_PARAM subalg_param[] = { OSSL_PARAM_END, OSSL_PARAM_END };
-    EVP_MAC_CTX *ctx  = NULL;
+    EVP_MAC_CTX *ctx = NULL;
     size_t len = 0;
     unsigned char *res = NULL;
 
@@ -284,18 +284,17 @@ unsigned char *EVP_Q_mac(OSSL_LIB_CTX *libctx,
                 goto err;
             }
         }
-        subalg_param[0] =
-            OSSL_PARAM_construct_utf8_string(param_name, (char *)subalg, 0);
+        subalg_param[0] = OSSL_PARAM_construct_utf8_string(param_name, (char *)subalg, 0);
     }
     /* Single-shot - on NULL key input, set dummy key value for EVP_MAC_Init. */
     if (key == NULL && keylen == 0)
         key = data;
     if ((ctx = EVP_MAC_CTX_new(mac)) != NULL
-            && EVP_MAC_CTX_set_params(ctx, subalg_param)
-            && EVP_MAC_CTX_set_params(ctx, params)
-            && EVP_MAC_init(ctx, key, keylen, params)
-            && EVP_MAC_update(ctx, data, datalen)
-            && EVP_MAC_final(ctx, out, &len, outsize)) {
+        && EVP_MAC_CTX_set_params(ctx, subalg_param)
+        && EVP_MAC_CTX_set_params(ctx, params)
+        && EVP_MAC_init(ctx, key, keylen, params)
+        && EVP_MAC_update(ctx, data, datalen)
+        && EVP_MAC_final(ctx, out, &len, outsize)) {
         if (out == NULL) {
             out = OPENSSL_malloc(len);
             if (out != NULL && !EVP_MAC_final(ctx, out, NULL, len)) {
@@ -308,7 +307,7 @@ unsigned char *EVP_Q_mac(OSSL_LIB_CTX *libctx,
             *outlen = len;
     }
 
- err:
+err:
     EVP_MAC_CTX_free(ctx);
     EVP_MAC_free(mac);
     return res;
diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c
index 3c7a1365fdd8b..ee29f58b3e223 100644
--- a/crypto/evp/mac_meth.c
+++ b/crypto/evp/mac_meth.c
@@ -55,8 +55,8 @@ static void *evp_mac_new(void)
 }
 
 static void *evp_mac_from_algorithm(int name_id,
-                                    const OSSL_ALGORITHM *algodef,
-                                    OSSL_PROVIDER *prov)
+    const OSSL_ALGORITHM *algodef,
+    OSSL_PROVIDER *prov)
 {
     const OSSL_DISPATCH *fns = algodef->implementation;
     EVP_MAC *mac = NULL;
@@ -113,20 +113,17 @@ static void *evp_mac_from_algorithm(int name_id,
         case OSSL_FUNC_MAC_GETTABLE_PARAMS:
             if (mac->gettable_params != NULL)
                 break;
-            mac->gettable_params =
-                OSSL_FUNC_mac_gettable_params(fns);
+            mac->gettable_params = OSSL_FUNC_mac_gettable_params(fns);
             break;
         case OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS:
             if (mac->gettable_ctx_params != NULL)
                 break;
-            mac->gettable_ctx_params =
-                OSSL_FUNC_mac_gettable_ctx_params(fns);
+            mac->gettable_ctx_params = OSSL_FUNC_mac_gettable_ctx_params(fns);
             break;
         case OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS:
             if (mac->settable_ctx_params != NULL)
                 break;
-            mac->settable_ctx_params =
-                OSSL_FUNC_mac_settable_ctx_params(fns);
+            mac->settable_ctx_params = OSSL_FUNC_mac_settable_ctx_params(fns);
             break;
         case OSSL_FUNC_MAC_GET_PARAMS:
             if (mac->get_params != NULL)
@@ -176,11 +173,11 @@ static void *evp_mac_from_algorithm(int name_id,
 }
 
 EVP_MAC *EVP_MAC_fetch(OSSL_LIB_CTX *libctx, const char *algorithm,
-                       const char *properties)
+    const char *properties)
 {
     return evp_generic_fetch(libctx, OSSL_OP_MAC, algorithm, properties,
-                             evp_mac_from_algorithm, evp_mac_up_ref,
-                             evp_mac_free);
+        evp_mac_from_algorithm, evp_mac_up_ref,
+        evp_mac_free);
 }
 
 int EVP_MAC_up_ref(EVP_MAC *mac)
@@ -246,21 +243,21 @@ 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)
 {
     evp_generic_do_all(libctx, OSSL_OP_MAC,
-                       (void (*)(void *, void *))fn, arg,
-                       evp_mac_from_algorithm, evp_mac_up_ref, evp_mac_free);
+        (void (*)(void *, void *))fn, arg,
+        evp_mac_from_algorithm, evp_mac_up_ref, evp_mac_free);
 }
 
 EVP_MAC *evp_mac_fetch_from_prov(OSSL_PROVIDER *prov,
-                                 const char *algorithm,
-                                 const char *properties)
+    const char *algorithm,
+    const char *properties)
 {
     return evp_generic_fetch_from_prov(prov, OSSL_OP_MAC,
-                                       algorithm, properties,
-                                       evp_mac_from_algorithm,
-                                       evp_mac_up_ref,
-                                       evp_mac_free);
+        algorithm, properties,
+        evp_mac_from_algorithm,
+        evp_mac_up_ref,
+        evp_mac_free);
 }
diff --git a/crypto/evp/names.c b/crypto/evp/names.c
index 7ff850f997530..012973254217b 100644
--- a/crypto/evp/names.c
+++ b/crypto/evp/names.c
@@ -24,11 +24,11 @@ int EVP_add_cipher(const EVP_CIPHER *c)
         return 0;
 
     r = OBJ_NAME_add(OBJ_nid2sn(c->nid), OBJ_NAME_TYPE_CIPHER_METH,
-                     (const char *)c);
+        (const char *)c);
     if (r == 0)
         return 0;
     r = OBJ_NAME_add(OBJ_nid2ln(c->nid), OBJ_NAME_TYPE_CIPHER_METH,
-                     (const char *)c);
+        (const char *)c);
     return r;
 }
 
@@ -42,17 +42,17 @@ int EVP_add_digest(const EVP_MD *md)
     if (r == 0)
         return 0;
     r = OBJ_NAME_add(OBJ_nid2ln(md->type), OBJ_NAME_TYPE_MD_METH,
-                     (const char *)md);
+        (const char *)md);
     if (r == 0)
         return 0;
 
     if (md->pkey_type && md->type != md->pkey_type) {
         r = OBJ_NAME_add(OBJ_nid2sn(md->pkey_type),
-                         OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, name);
+            OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, name);
         if (r == 0)
             return 0;
         r = OBJ_NAME_add(OBJ_nid2ln(md->pkey_type),
-                         OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, name);
+            OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, name);
     }
     return r;
 }
@@ -73,7 +73,7 @@ const EVP_CIPHER *EVP_get_cipherbyname(const char *name)
 }
 
 const EVP_CIPHER *evp_get_cipherbyname_ex(OSSL_LIB_CTX *libctx,
-                                          const char *name)
+    const char *name)
 {
     const EVP_CIPHER *cp;
     OSSL_NAMEMAP *namemap;
@@ -95,7 +95,7 @@ const EVP_CIPHER *evp_get_cipherbyname_ex(OSSL_LIB_CTX *libctx,
      */
 
     namemap = ossl_namemap_stored(libctx);
- retry:
+retry:
     id = ossl_namemap_name2num(namemap, name);
     if (id == 0) {
         EVP_CIPHER *fetched_cipher;
@@ -154,7 +154,7 @@ const EVP_MD *evp_get_digestbyname_ex(OSSL_LIB_CTX *libctx, const char *name)
      */
 
     namemap = ossl_namemap_stored(libctx);
- retry:
+retry:
     id = ossl_namemap_name2num(namemap, name);
     if (id == 0) {
         EVP_MD *fetched_md;
@@ -196,8 +196,8 @@ void evp_cleanup_int(void)
 
 struct doall_cipher {
     void *arg;
-    void (*fn) (const EVP_CIPHER *ciph,
-                const char *from, const char *to, void *arg);
+    void (*fn)(const EVP_CIPHER *ciph,
+        const char *from, const char *to, void *arg);
 };
 
 static void do_all_cipher_fn(const OBJ_NAME *nm, void *arg)
@@ -209,9 +209,9 @@ static void do_all_cipher_fn(const OBJ_NAME *nm, void *arg)
         dc->fn((const EVP_CIPHER *)nm->data, nm->name, NULL, dc->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(void (*fn)(const EVP_CIPHER *ciph,
+                           const char *from, const char *to, void *x),
+    void *arg)
 {
     struct doall_cipher dc;
 
@@ -223,9 +223,10 @@ void EVP_CIPHER_do_all(void (*fn) (const EVP_CIPHER *ciph,
     OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc);
 }
 
-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_sorted(void (*fn)(const EVP_CIPHER *ciph,
+                                  const char *from, const char *to,
+                                  void *x),
+    void *arg)
 {
     struct doall_cipher dc;
 
@@ -239,8 +240,8 @@ void EVP_CIPHER_do_all_sorted(void (*fn) (const EVP_CIPHER *ciph,
 
 struct doall_md {
     void *arg;
-    void (*fn) (const EVP_MD *ciph,
-                const char *from, const char *to, void *arg);
+    void (*fn)(const EVP_MD *ciph,
+        const char *from, const char *to, void *arg);
 };
 
 static void do_all_md_fn(const OBJ_NAME *nm, void *arg)
@@ -252,9 +253,9 @@ static void do_all_md_fn(const OBJ_NAME *nm, void *arg)
         dc->fn((const EVP_MD *)nm->data, nm->name, NULL, dc->arg);
 }
 
-void EVP_MD_do_all(void (*fn) (const EVP_MD *md,
-                               const char *from, const char *to, void *x),
-                   void *arg)
+void EVP_MD_do_all(void (*fn)(const EVP_MD *md,
+                       const char *from, const char *to, void *x),
+    void *arg)
 {
     struct doall_md dc;
 
@@ -266,9 +267,10 @@ void EVP_MD_do_all(void (*fn) (const EVP_MD *md,
     OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);
 }
 
-void EVP_MD_do_all_sorted(void (*fn) (const EVP_MD *md,
-                                      const char *from, const char *to,
-                                      void *x), void *arg)
+void EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md,
+                              const char *from, const char *to,
+                              void *x),
+    void *arg)
 {
     struct doall_md dc;
 
diff --git a/crypto/evp/p5_crpt.c b/crypto/evp/p5_crpt.c
index eb8fbc09fb2b5..0a301104e0fe2 100644
--- a/crypto/evp/p5_crpt.c
+++ b/crypto/evp/p5_crpt.c
@@ -24,9 +24,9 @@ void PKCS5_PBE_add(void)
 }
 
 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)
 {
     unsigned char md_tmp[EVP_MAX_MD_SIZE];
     unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
@@ -42,8 +42,7 @@ int PKCS5_PBE_keyivgen_ex(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
     const char *mdname = EVP_MD_name(md);
 
     /* Extract useful info from parameter */
-    if (param == NULL || param->type != V_ASN1_SEQUENCE ||
-        param->value.sequence == NULL) {
+    if (param == NULL || param->type != V_ASN1_SEQUENCE || param->value.sequence == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_DECODE_ERROR);
         return 0;
     }
@@ -87,12 +86,12 @@ int PKCS5_PBE_keyivgen_ex(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
     if (kctx == NULL)
         goto err;
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
-                                             (char *)pass, (size_t)passlen);
+        (char *)pass, (size_t)passlen);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                             salt, saltlen);
+        salt, saltlen);
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_ITER, &iter);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)mdname, 0);
+        (char *)mdname, 0);
     *p = OSSL_PARAM_construct_end();
     if (EVP_KDF_derive(kctx, md_tmp, mdsize, params) != 1)
         goto err;
@@ -104,17 +103,16 @@ int PKCS5_PBE_keyivgen_ex(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
     OPENSSL_cleanse(key, EVP_MAX_KEY_LENGTH);
     OPENSSL_cleanse(iv, EVP_MAX_IV_LENGTH);
     rv = 1;
- err:
+err:
     EVP_KDF_CTX_free(kctx);
     PBEPARAM_free(pbe);
     return rv;
 }
 
 int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, 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)
 {
     return PKCS5_PBE_keyivgen_ex(cctx, pass, passlen, param, cipher, md, en_de,
-                                 NULL, NULL);
+        NULL, NULL);
 }
-
diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c
index 3561739023342..8003bd31afdce 100644
--- a/crypto/evp/p5_crpt2.c
+++ b/crypto/evp/p5_crpt2.c
@@ -20,9 +20,9 @@
 #include "evp_local.h"
 
 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)
 {
     const char *empty = "";
     int rv = 1, mode = 1;
@@ -43,62 +43,63 @@ int ossl_pkcs5_pbkdf2_hmac_ex(const char *pass, int passlen,
 
     kdf = EVP_KDF_fetch(libctx, OSSL_KDF_NAME_PBKDF2, propq);
     if (kdf == NULL)
-         return 0;
+        return 0;
     kctx = EVP_KDF_CTX_new(kdf);
     EVP_KDF_free(kdf);
     if (kctx == NULL)
         return 0;
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
-                                             (char *)pass, (size_t)passlen);
+        (char *)pass, (size_t)passlen);
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_PKCS5, &mode);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                             (unsigned char *)salt, saltlen);
+        (unsigned char *)salt, saltlen);
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_ITER, &iter);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)mdname, 0);
+        (char *)mdname, 0);
     *p = OSSL_PARAM_construct_end();
     if (EVP_KDF_derive(kctx, out, keylen, params) != 1)
         rv = 0;
 
     EVP_KDF_CTX_free(kctx);
 
-    OSSL_TRACE_BEGIN(PKCS5V2) {
+    OSSL_TRACE_BEGIN(PKCS5V2)
+    {
         BIO_printf(trc_out, "Password:\n");
         BIO_hex_string(trc_out,
-                       0, passlen, pass, passlen);
+            0, passlen, pass, passlen);
         BIO_printf(trc_out, "\n");
         BIO_printf(trc_out, "Salt:\n");
         BIO_hex_string(trc_out,
-                       0, saltlen, salt, saltlen);
+            0, saltlen, salt, saltlen);
         BIO_printf(trc_out, "\n");
         BIO_printf(trc_out, "Iteration count %d\n", iter);
         BIO_printf(trc_out, "Key:\n");
         BIO_hex_string(trc_out,
-                       0, keylen, out, keylen);
+            0, keylen, out, keylen);
         BIO_printf(trc_out, "\n");
-    } OSSL_TRACE_END(PKCS5V2);
+    }
+    OSSL_TRACE_END(PKCS5V2);
     return rv;
 }
 
 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)
+    int saltlen, int iter, const EVP_MD *digest, int keylen,
+    unsigned char *out)
 {
     return ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, iter, digest,
-                                     keylen, out, NULL, NULL);
+        keylen, out, NULL, NULL);
 }
 
-
 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)
 {
     EVP_MD *digest;
     int r = 0;
 
     if ((digest = EVP_MD_fetch(NULL, SN_sha1, NULL)) != NULL)
         r = ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, iter,
-                                      digest, keylen, out, NULL, NULL);
+            digest, keylen, out, NULL, NULL);
     EVP_MD_free(digest);
     return r;
 }
@@ -110,9 +111,9 @@ int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
  */
 
 int PKCS5_v2_PBE_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)
+    ASN1_TYPE *param, const EVP_CIPHER *c,
+    const EVP_MD *md, int en_de,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     PBE2PARAM *pbe2 = NULL;
     char ciph_name[80];
@@ -130,7 +131,7 @@ int PKCS5_v2_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
 
     /* See if we recognise the key derivation function */
     if (!EVP_PBE_find_ex(EVP_PBE_TYPE_KDF, OBJ_obj2nid(pbe2->keyfunc->algorithm),
-                         NULL, NULL, NULL, &kdf)) {
+            NULL, NULL, NULL, &kdf)) {
         ERR_raise(ERR_LIB_EVP, EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION);
         goto err;
     }
@@ -164,23 +165,23 @@ int PKCS5_v2_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
         goto err;
     }
     rv = kdf(ctx, pass, passlen, pbe2->keyfunc->parameter, NULL, NULL, en_de, libctx, propq);
- err:
+err:
     EVP_CIPHER_free(cipher_fetch);
     PBE2PARAM_free(pbe2);
     return rv;
 }
 
 int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                          ASN1_TYPE *param, const EVP_CIPHER *c,
-                          const EVP_MD *md, int en_de)
+    ASN1_TYPE *param, const EVP_CIPHER *c,
+    const EVP_MD *md, int en_de)
 {
     return PKCS5_v2_PBE_keyivgen_ex(ctx, pass, passlen, param, c, md, en_de, NULL, NULL);
 }
 
 int PKCS5_v2_PBKDF2_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)
 {
     unsigned char *salt, key[EVP_MAX_KEY_LENGTH];
     int saltlen, iter, t;
@@ -252,10 +253,10 @@ int PKCS5_v2_PBKDF2_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
     saltlen = kdf->salt->value.octet_string->length;
     iter = ASN1_INTEGER_get(kdf->iter);
     if (!ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, iter, prfmd,
-                                   keylen, key, libctx, propq))
+            keylen, key, libctx, propq))
         goto err;
     rv = EVP_CipherInit_ex(ctx, NULL, NULL, key, NULL, en_de);
- err:
+err:
     OPENSSL_cleanse(key, keylen);
     PBKDF2PARAM_free(kdf);
     EVP_MD_free(prfmd_fetch);
@@ -263,9 +264,9 @@ int PKCS5_v2_PBKDF2_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
 }
 
 int PKCS5_v2_PBKDF2_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)
 {
     return PKCS5_v2_PBKDF2_keyivgen_ex(ctx, pass, passlen, param, c, md, en_de,
-                                       NULL, NULL);
+        NULL, NULL);
 }
diff --git a/crypto/evp/p_dec.c b/crypto/evp/p_dec.c
index 29ea3f5fbcb33..ef53f3ada6cbf 100644
--- a/crypto/evp/p_dec.c
+++ b/crypto/evp/p_dec.c
@@ -19,7 +19,7 @@
 #include "crypto/evp.h"
 
 int EVP_PKEY_decrypt_old(unsigned char *key, const unsigned char *ek, int ekl,
-                         EVP_PKEY *priv)
+    EVP_PKEY *priv)
 {
     int ret = -1;
     RSA *rsa = NULL;
@@ -33,8 +33,7 @@ int EVP_PKEY_decrypt_old(unsigned char *key, const unsigned char *ek, int ekl,
     if (rsa == NULL)
         goto err;
 
-    ret =
-        RSA_private_decrypt(ekl, ek, key, rsa, RSA_PKCS1_PADDING);
- err:
+    ret = RSA_private_decrypt(ekl, ek, key, rsa, RSA_PKCS1_PADDING);
+err:
     return ret;
 }
diff --git a/crypto/evp/p_enc.c b/crypto/evp/p_enc.c
index 64e67514561c0..a843b8f4e9d61 100644
--- a/crypto/evp/p_enc.c
+++ b/crypto/evp/p_enc.c
@@ -19,7 +19,7 @@
 #include "crypto/evp.h"
 
 int EVP_PKEY_encrypt_old(unsigned char *ek, const unsigned char *key,
-                         int key_len, EVP_PKEY *pubk)
+    int key_len, EVP_PKEY *pubk)
 {
     int ret = 0;
     RSA *rsa = NULL;
@@ -33,8 +33,7 @@ int EVP_PKEY_encrypt_old(unsigned char *ek, const unsigned char *key,
     if (rsa == NULL)
         goto err;
 
-    ret =
-        RSA_public_encrypt(key_len, key, ek, rsa, RSA_PKCS1_PADDING);
- err:
+    ret = RSA_public_encrypt(key_len, key, ek, rsa, RSA_PKCS1_PADDING);
+err:
     return ret;
 }
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 7f4508169dfa7..412ed9fcf0949 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -28,14 +28,14 @@
 #include <openssl/ec.h>
 #include <openssl/cmac.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include <openssl/params.h>
 #include <openssl/param_build.h>
 #include <openssl/encoder.h>
 #include <openssl/core_names.h>
 
-#include "internal/numbers.h"   /* includes SIZE_MAX */
+#include "internal/numbers.h" /* includes SIZE_MAX */
 #include "internal/ffc.h"
 #include "crypto/evp.h"
 #include "crypto/dh.h"
@@ -44,18 +44,18 @@
 #include "crypto/ecx.h"
 #include "crypto/rsa.h"
 #ifndef FIPS_MODULE
-# include "crypto/asn1.h"
-# include "crypto/x509.h"
+#include "crypto/asn1.h"
+#include "crypto/x509.h"
 #endif
 #include "internal/provider.h"
 #include "evp_local.h"
 
 static int pkey_set_type(EVP_PKEY *pkey, ENGINE *e, int type, const char *str,
-                         int len, EVP_KEYMGMT *keymgmt);
+    int len, EVP_KEYMGMT *keymgmt);
 static void evp_pkey_free_it(EVP_PKEY *key);
 
 /* The type of parameters selected in key parameter functions */
-# define SELECT_PARAMETERS OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS
+#define SELECT_PARAMETERS OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS
 
 #ifndef FIPS_MODULE
 int EVP_PKEY_get_bits(const EVP_PKEY *pkey)
@@ -92,7 +92,7 @@ int EVP_PKEY_get_security_bits(const EVP_PKEY *pkey)
 
 int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
 {
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
     if (pkey->type == EVP_PKEY_DSA) {
         int ret = pkey->save_parameters;
 
@@ -100,8 +100,8 @@ int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
             pkey->save_parameters = mode;
         return ret;
     }
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
     if (pkey->type == EVP_PKEY_EC) {
         int ret = pkey->save_parameters;
 
@@ -109,7 +109,7 @@ int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
             pkey->save_parameters = mode;
         return ret;
     }
-# endif
+#endif
     return 0;
 }
 
@@ -122,7 +122,7 @@ void *EVP_PKEY_get_ex_data(const EVP_PKEY *key, int idx)
 {
     return CRYPTO_get_ex_data(&key->ex_data, idx);
 }
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
 
 int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
 {
@@ -143,7 +143,7 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
             goto end;
         from = downgraded_from;
     }
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
 
     /*
      * Make sure |to| is typed.  Content is less important at this early
@@ -163,7 +163,7 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
             if (EVP_PKEY_set_type(to, from->type) == 0)
                 goto end;
         } else
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
         {
             if (EVP_PKEY_set_type_by_keymgmt(to, from->keymgmt) == 0)
                 goto end;
@@ -176,7 +176,7 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
             goto end;
         }
     }
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
 
     if (EVP_PKEY_missing_parameters(from)) {
         ERR_raise(ERR_LIB_EVP, EVP_R_MISSING_PARAMETERS);
@@ -207,9 +207,8 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
      */
     if (to->keymgmt != NULL && to->keydata == NULL) {
         EVP_KEYMGMT *to_keymgmt = to->keymgmt;
-        void *from_keydata =
-            evp_pkey_export_to_provider((EVP_PKEY *)from, NULL, &to_keymgmt,
-                                        NULL);
+        void *from_keydata = evp_pkey_export_to_provider((EVP_PKEY *)from, NULL, &to_keymgmt,
+            NULL);
 
         /*
          * If we get a NULL, it could be an internal error, or it could be
@@ -219,16 +218,17 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
             ERR_raise(ERR_LIB_EVP, EVP_R_DIFFERENT_KEY_TYPES);
         else
             ok = (to->keydata = evp_keymgmt_dup(to->keymgmt,
-                                                from_keydata,
-                                                SELECT_PARAMETERS)) != NULL;
+                      from_keydata,
+                      SELECT_PARAMETERS))
+                != NULL;
         goto end;
     }
 
     /* Both keys are legacy */
     if (from->ameth != NULL && from->ameth->param_copy != NULL)
         ok = from->ameth->param_copy(to, from);
-#endif  /* !FIPS_MODULE */
- end:
+#endif /* !FIPS_MODULE */
+end:
     EVP_PKEY_free(downgraded_from);
     return ok;
 }
@@ -243,7 +243,7 @@ int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)
             return !evp_keymgmt_util_has((EVP_PKEY *)pkey, SELECT_PARAMETERS);
         if (pkey->ameth != NULL && pkey->ameth->param_missing != NULL)
             return pkey->ameth->param_missing(pkey);
-#endif  /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
     }
     return 0;
 }
@@ -254,7 +254,7 @@ int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)
  * a call to evp_keymgmt_util_match().
  */
 static int evp_pkey_cmp_any(const EVP_PKEY *a, const EVP_PKEY *b,
-                            int selection)
+    int selection)
 {
 #ifdef FIPS_MODULE
     return evp_keymgmt_util_match((EVP_PKEY *)a, (EVP_PKEY *)b, selection);
@@ -276,10 +276,10 @@ static int evp_pkey_cmp_any(const EVP_PKEY *a, const EVP_PKEY *b,
      */
     if (evp_pkey_is_legacy(a)
         && !EVP_KEYMGMT_is_a(b->keymgmt, OBJ_nid2sn(a->type)))
-        return -1;               /* not the same key type */
+        return -1; /* not the same key type */
     if (evp_pkey_is_legacy(b)
         && !EVP_KEYMGMT_is_a(a->keymgmt, OBJ_nid2sn(b->type)))
-        return -1;               /* not the same key type */
+        return -1; /* not the same key type */
 
     /*
      * We've determined that they both are the same keytype, so the next
@@ -292,16 +292,14 @@ static int evp_pkey_cmp_any(const EVP_PKEY *a, const EVP_PKEY *b,
     keydata2 = b->keydata;
 
     if (keymgmt2 != NULL && keymgmt2->match != NULL) {
-        tmp_keydata =
-            evp_pkey_export_to_provider((EVP_PKEY *)a, NULL, &keymgmt2, NULL);
+        tmp_keydata = evp_pkey_export_to_provider((EVP_PKEY *)a, NULL, &keymgmt2, NULL);
         if (tmp_keydata != NULL) {
             keymgmt1 = keymgmt2;
             keydata1 = tmp_keydata;
         }
     }
     if (tmp_keydata == NULL && keymgmt1 != NULL && keymgmt1->match != NULL) {
-        tmp_keydata =
-            evp_pkey_export_to_provider((EVP_PKEY *)b, NULL, &keymgmt1, NULL);
+        tmp_keydata = evp_pkey_export_to_provider((EVP_PKEY *)b, NULL, &keymgmt1, NULL);
         if (tmp_keydata != NULL) {
             keymgmt2 = keymgmt1;
             keydata2 = tmp_keydata;
@@ -317,17 +315,17 @@ static int evp_pkey_cmp_any(const EVP_PKEY *a, const EVP_PKEY *b,
         return -2;
 
     return evp_keymgmt_match(keymgmt1, keydata1, keydata2, selection);
-#endif  /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 }
 
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 int EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
 {
     return EVP_PKEY_parameters_eq(a, b);
 }
-# endif
-#endif  /* FIPS_MODULE */
+#endif
+#endif /* FIPS_MODULE */
 
 int EVP_PKEY_parameters_eq(const EVP_PKEY *a, const EVP_PKEY *b)
 {
@@ -348,17 +346,17 @@ int EVP_PKEY_parameters_eq(const EVP_PKEY *a, const EVP_PKEY *b)
     if (a->ameth != NULL && a->ameth->param_cmp != NULL)
         return a->ameth->param_cmp(a, b);
     return -2;
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
 }
 
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
 {
     return EVP_PKEY_eq(a, b);
 }
-# endif
-#endif  /* !FIPS_MODULE */
+#endif
+#endif /* !FIPS_MODULE */
 
 int EVP_PKEY_eq(const EVP_PKEY *a, const EVP_PKEY *b)
 {
@@ -375,7 +373,7 @@ int EVP_PKEY_eq(const EVP_PKEY *a, const EVP_PKEY *b)
 
 #ifndef FIPS_MODULE
     if (a->keymgmt != NULL || b->keymgmt != NULL)
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
     {
         int selection = SELECT_PARAMETERS;
 
@@ -406,25 +404,25 @@ int EVP_PKEY_eq(const EVP_PKEY *a, const EVP_PKEY *b)
     }
 
     return -2;
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
 }
 
 #ifndef FIPS_MODULE
 static EVP_PKEY *new_raw_key_int(OSSL_LIB_CTX *libctx,
-                                 const char *strtype,
-                                 const char *propq,
-                                 int nidtype,
-                                 ENGINE *e,
-                                 const unsigned char *key,
-                                 size_t len,
-                                 int key_is_priv)
+    const char *strtype,
+    const char *propq,
+    int nidtype,
+    ENGINE *e,
+    const unsigned char *key,
+    size_t len,
+    int key_is_priv)
 {
     EVP_PKEY *pkey = NULL;
     EVP_PKEY_CTX *ctx = NULL;
     const EVP_PKEY_ASN1_METHOD *ameth = NULL;
     int result = 0;
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
     /* Check if there is an Engine for this type */
     if (e == NULL) {
         ENGINE *tmpe = NULL;
@@ -440,7 +438,7 @@ static EVP_PKEY *new_raw_key_int(OSSL_LIB_CTX *libctx,
 
         ENGINE_finish(tmpe);
     }
-# endif
+#endif
 
     if (e == NULL && ameth == NULL) {
         /*
@@ -448,9 +446,9 @@ static EVP_PKEY *new_raw_key_int(OSSL_LIB_CTX *libctx,
          * a provider.
          */
         ctx = EVP_PKEY_CTX_new_from_name(libctx,
-                                         strtype != NULL ? strtype
-                                                         : OBJ_nid2sn(nidtype),
-                                         propq);
+            strtype != NULL ? strtype
+                            : OBJ_nid2sn(nidtype),
+            propq);
         if (ctx == NULL)
             goto err;
         /* May fail if no provider available */
@@ -460,9 +458,9 @@ static EVP_PKEY *new_raw_key_int(OSSL_LIB_CTX *libctx,
 
             ERR_clear_last_mark();
             params[0] = OSSL_PARAM_construct_octet_string(
-                            key_is_priv ? OSSL_PKEY_PARAM_PRIV_KEY
-                                        : OSSL_PKEY_PARAM_PUB_KEY,
-                            (void *)key, len);
+                key_is_priv ? OSSL_PKEY_PARAM_PRIV_KEY
+                            : OSSL_PKEY_PARAM_PUB_KEY,
+                (void *)key, len);
 
             if (EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEYPAIR, params) != 1) {
                 ERR_raise(ERR_LIB_EVP, EVP_R_KEY_SETUP_FAILED);
@@ -516,7 +514,7 @@ static EVP_PKEY *new_raw_key_int(OSSL_LIB_CTX *libctx,
     }
 
     result = 1;
- err:
+err:
     if (!result) {
         EVP_PKEY_free(pkey);
         pkey = NULL;
@@ -526,32 +524,32 @@ static EVP_PKEY *new_raw_key_int(OSSL_LIB_CTX *libctx,
 }
 
 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)
 {
     return new_raw_key_int(libctx, keytype, propq, EVP_PKEY_NONE, NULL, priv,
-                           len, 1);
+        len, 1);
 }
 
 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)
 {
     return new_raw_key_int(NULL, NULL, NULL, type, e, priv, len, 1);
 }
 
 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)
 {
     return new_raw_key_int(libctx, keytype, propq, EVP_PKEY_NONE, NULL, pub,
-                           len, 0);
+        len, 0);
 }
 
 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)
 {
     return new_raw_key_int(NULL, NULL, NULL, type, e, pub, len, 0);
 }
@@ -570,23 +568,23 @@ static int get_raw_key_details(const OSSL_PARAM params[], void *arg)
 
     if (raw_key->selection == OSSL_KEYMGMT_SELECT_PRIVATE_KEY) {
         if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY))
-                != NULL)
+            != NULL)
             return OSSL_PARAM_get_octet_string(p, (void **)raw_key->key,
-                                               raw_key->key == NULL ? 0 : *raw_key->len,
-                                               raw_key->len);
+                raw_key->key == NULL ? 0 : *raw_key->len,
+                raw_key->len);
     } else if (raw_key->selection == OSSL_KEYMGMT_SELECT_PUBLIC_KEY) {
         if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY))
-                != NULL)
+            != NULL)
             return OSSL_PARAM_get_octet_string(p, (void **)raw_key->key,
-                                               raw_key->key == NULL ? 0 : *raw_key->len,
-                                               raw_key->len);
+                raw_key->key == NULL ? 0 : *raw_key->len,
+                raw_key->len);
     }
 
     return 0;
 }
 
 int EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, unsigned char *priv,
-                                 size_t *len)
+    size_t *len)
 {
     if (pkey->keymgmt != NULL) {
         struct raw_key_details_st raw_key;
@@ -596,7 +594,7 @@ int EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, unsigned char *priv,
         raw_key.selection = OSSL_KEYMGMT_SELECT_PRIVATE_KEY;
 
         return evp_keymgmt_util_export(pkey, OSSL_KEYMGMT_SELECT_PRIVATE_KEY,
-                                       get_raw_key_details, &raw_key);
+            get_raw_key_details, &raw_key);
     }
 
     if (pkey->ameth == NULL) {
@@ -618,7 +616,7 @@ int EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, unsigned char *priv,
 }
 
 int EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, unsigned char *pub,
-                                size_t *len)
+    size_t *len)
 {
     if (pkey->keymgmt != NULL) {
         struct raw_key_details_st raw_key;
@@ -628,7 +626,7 @@ int EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, unsigned char *pub,
         raw_key.selection = OSSL_KEYMGMT_SELECT_PUBLIC_KEY;
 
         return evp_keymgmt_util_export(pkey, OSSL_KEYMGMT_SELECT_PUBLIC_KEY,
-                                       get_raw_key_details, &raw_key);
+            get_raw_key_details, &raw_key);
     }
 
     if (pkey->ameth == NULL) {
@@ -636,7 +634,7 @@ int EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, unsigned char *pub,
         return 0;
     }
 
-     if (pkey->ameth->get_pub_key == NULL) {
+    if (pkey->ameth->get_pub_key == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
         return 0;
     }
@@ -650,15 +648,15 @@ int EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, unsigned char *pub,
 }
 
 static EVP_PKEY *new_cmac_key_int(const unsigned char *priv, size_t len,
-                                  const char *cipher_name,
-                                  const EVP_CIPHER *cipher,
-                                  OSSL_LIB_CTX *libctx,
-                                  const char *propq, ENGINE *e)
+    const char *cipher_name,
+    const EVP_CIPHER *cipher,
+    OSSL_LIB_CTX *libctx,
+    const char *propq, ENGINE *e)
 {
-# ifndef OPENSSL_NO_CMAC
-#  ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_CMAC
+#ifndef OPENSSL_NO_ENGINE
     const char *engine_id = e != NULL ? ENGINE_get_id(e) : NULL;
-#  endif
+#endif
     OSSL_PARAM params[5], *p = params;
     EVP_PKEY *pkey = NULL;
     EVP_PKEY_CTX *ctx;
@@ -681,17 +679,17 @@ static EVP_PKEY *new_cmac_key_int(const unsigned char *priv, size_t len,
     }
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_PRIV_KEY,
-                                            (void *)priv, len);
+        (void *)priv, len);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_CIPHER,
-                                            (char *)cipher_name, 0);
+        (char *)cipher_name, 0);
     if (propq != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_PROPERTIES,
-                                                (char *)propq, 0);
-#  ifndef OPENSSL_NO_ENGINE
+            (char *)propq, 0);
+#ifndef OPENSSL_NO_ENGINE
     if (engine_id != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_ENGINE,
-                                                (char *)engine_id, 0);
-#  endif
+            (char *)engine_id, 0);
+#endif
     *p = OSSL_PARAM_construct_end();
 
     if (EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEYPAIR, params) <= 0) {
@@ -699,18 +697,18 @@ static EVP_PKEY *new_cmac_key_int(const unsigned char *priv, size_t len,
         goto err;
     }
 
- err:
+err:
     EVP_PKEY_CTX_free(ctx);
 
     return pkey;
-# else
+#else
     ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
     return NULL;
-# endif
+#endif
 }
 
 EVP_PKEY *EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv,
-                                size_t len, const EVP_CIPHER *cipher)
+    size_t len, const EVP_CIPHER *cipher)
 {
     return new_cmac_key_int(priv, len, NULL, cipher, NULL, NULL, e);
 }
@@ -725,7 +723,7 @@ int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len)
     return pkey_set_type(pkey, NULL, EVP_PKEY_NONE, str, len, NULL);
 }
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
 int EVP_PKEY_set1_engine(EVP_PKEY *pkey, ENGINE *e)
 {
     if (e != NULL) {
@@ -748,35 +746,35 @@ ENGINE *EVP_PKEY_get0_engine(const EVP_PKEY *pkey)
 {
     return pkey->engine;
 }
-# endif
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 static void detect_foreign_key(EVP_PKEY *pkey)
 {
     switch (pkey->type) {
     case EVP_PKEY_RSA:
     case EVP_PKEY_RSA_PSS:
         pkey->foreign = pkey->pkey.rsa != NULL
-                        && ossl_rsa_is_foreign(pkey->pkey.rsa);
+            && ossl_rsa_is_foreign(pkey->pkey.rsa);
         break;
-#  ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
     case EVP_PKEY_SM2:
         break;
     case EVP_PKEY_EC:
         pkey->foreign = pkey->pkey.ec != NULL
-                        && ossl_ec_key_is_foreign(pkey->pkey.ec);
+            && ossl_ec_key_is_foreign(pkey->pkey.ec);
         break;
-#  endif
-#  ifndef OPENSSL_NO_DSA
+#endif
+#ifndef OPENSSL_NO_DSA
     case EVP_PKEY_DSA:
         pkey->foreign = pkey->pkey.dsa != NULL
-                        && ossl_dsa_is_foreign(pkey->pkey.dsa);
+            && ossl_dsa_is_foreign(pkey->pkey.dsa);
         break;
 #endif
-#  ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
     case EVP_PKEY_DH:
         pkey->foreign = pkey->pkey.dh != NULL
-                        && ossl_dh_is_foreign(pkey->pkey.dh);
+            && ossl_dh_is_foreign(pkey->pkey.dh);
         break;
 #endif
     default:
@@ -787,7 +785,7 @@ static void detect_foreign_key(EVP_PKEY *pkey)
 
 int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
 {
-#  ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
     int pktype;
 
     pktype = EVP_PKEY_type(type);
@@ -803,11 +801,11 @@ int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
              */
             if (curve == NID_sm2 && pktype == EVP_PKEY_EC)
                 type = EVP_PKEY_SM2;
-            else if(curve != NID_sm2 && pktype == EVP_PKEY_SM2)
+            else if (curve != NID_sm2 && pktype == EVP_PKEY_SM2)
                 type = EVP_PKEY_EC;
         }
     }
-#  endif
+#endif
 
     if (pkey == NULL || !EVP_PKEY_set_type(pkey, type))
         return 0;
@@ -817,7 +815,7 @@ int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
 
     return (key != NULL);
 }
-# endif
+#endif
 
 void *EVP_PKEY_get0(const EVP_PKEY *pkey)
 {
@@ -845,7 +843,7 @@ const unsigned char *EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len)
     return NULL;
 }
 
-# ifndef OPENSSL_NO_POLY1305
+#ifndef OPENSSL_NO_POLY1305
 const unsigned char *EVP_PKEY_get0_poly1305(const EVP_PKEY *pkey, size_t *len)
 {
     const ASN1_OCTET_STRING *os = NULL;
@@ -860,9 +858,9 @@ const unsigned char *EVP_PKEY_get0_poly1305(const EVP_PKEY *pkey, size_t *len)
     }
     return NULL;
 }
-# endif
+#endif
 
-# ifndef OPENSSL_NO_SIPHASH
+#ifndef OPENSSL_NO_SIPHASH
 const unsigned char *EVP_PKEY_get0_siphash(const EVP_PKEY *pkey, size_t *len)
 {
     const ASN1_OCTET_STRING *os = NULL;
@@ -878,9 +876,9 @@ const unsigned char *EVP_PKEY_get0_siphash(const EVP_PKEY *pkey, size_t *len)
     }
     return NULL;
 }
-# endif
+#endif
 
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
 static DSA *evp_pkey_get0_DSA_int(const EVP_PKEY *pkey)
 {
     if (pkey->type != EVP_PKEY_DSA) {
@@ -918,9 +916,9 @@ DSA *EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
 
     return ret;
 }
-# endif /*  OPENSSL_NO_DSA */
+#endif /*  OPENSSL_NO_DSA */
 
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 static const ECX_KEY *evp_pkey_get0_ECX_KEY(const EVP_PKEY *pkey, int type)
 {
     if (EVP_PKEY_get_base_id(pkey) != type) {
@@ -939,19 +937,19 @@ static ECX_KEY *evp_pkey_get1_ECX_KEY(EVP_PKEY *pkey, int type)
     return ret;
 }
 
-#  define IMPLEMENT_ECX_VARIANT(NAME)                                   \
-    ECX_KEY *ossl_evp_pkey_get1_##NAME(EVP_PKEY *pkey)                  \
-    {                                                                   \
-        return evp_pkey_get1_ECX_KEY(pkey, EVP_PKEY_##NAME);            \
+#define IMPLEMENT_ECX_VARIANT(NAME)                          \
+    ECX_KEY *ossl_evp_pkey_get1_##NAME(EVP_PKEY *pkey)       \
+    {                                                        \
+        return evp_pkey_get1_ECX_KEY(pkey, EVP_PKEY_##NAME); \
     }
 IMPLEMENT_ECX_VARIANT(X25519)
 IMPLEMENT_ECX_VARIANT(X448)
 IMPLEMENT_ECX_VARIANT(ED25519)
 IMPLEMENT_ECX_VARIANT(ED448)
 
-# endif /* OPENSSL_NO_ECX */
+#endif /* OPENSSL_NO_ECX */
 
-# if !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_DEPRECATED_3_0)
+#if !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_DEPRECATED_3_0)
 
 int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *dhkey)
 {
@@ -1015,7 +1013,7 @@ DH *EVP_PKEY_get1_DH(EVP_PKEY *pkey)
 
     return ret;
 }
-# endif
+#endif
 
 int EVP_PKEY_type(int type)
 {
@@ -1027,9 +1025,9 @@ int EVP_PKEY_type(int type)
         ret = ameth->pkey_id;
     else
         ret = NID_undef;
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
     ENGINE_finish(e);
-# endif
+#endif
     return ret;
 }
 
@@ -1056,18 +1054,18 @@ int EVP_PKEY_get_base_id(const EVP_PKEY *pkey)
  * This should be cleaned away along with all other #legacy support.
  */
 static const OSSL_ITEM standard_name2type[] = {
-    { EVP_PKEY_RSA,     "RSA" },
+    { EVP_PKEY_RSA, "RSA" },
     { EVP_PKEY_RSA_PSS, "RSA-PSS" },
-    { EVP_PKEY_EC,      "EC" },
+    { EVP_PKEY_EC, "EC" },
     { EVP_PKEY_ED25519, "ED25519" },
-    { EVP_PKEY_ED448,   "ED448" },
-    { EVP_PKEY_X25519,  "X25519" },
-    { EVP_PKEY_X448,    "X448" },
-    { EVP_PKEY_SM2,     "SM2" },
-    { EVP_PKEY_DH,      "DH" },
-    { EVP_PKEY_DHX,     "X9.42 DH" },
-    { EVP_PKEY_DHX,     "DHX" },
-    { EVP_PKEY_DSA,     "DSA" },
+    { EVP_PKEY_ED448, "ED448" },
+    { EVP_PKEY_X25519, "X25519" },
+    { EVP_PKEY_X448, "X448" },
+    { EVP_PKEY_SM2, "SM2" },
+    { EVP_PKEY_DH, "DH" },
+    { EVP_PKEY_DHX, "X9.42 DH" },
+    { EVP_PKEY_DHX, "DHX" },
+    { EVP_PKEY_DSA, "DSA" },
 };
 
 int evp_pkey_name2type(const char *name)
@@ -1107,8 +1105,8 @@ 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)
 {
     if (!evp_pkey_is_typed(pkey))
         return 0;
@@ -1129,32 +1127,31 @@ int EVP_PKEY_can_sign(const EVP_PKEY *pkey)
         case EVP_PKEY_RSA:
         case EVP_PKEY_RSA_PSS:
             return 1;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
         case EVP_PKEY_DSA:
             return 1;
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
         case EVP_PKEY_ED25519:
         case EVP_PKEY_ED448:
             return 1;
-        case EVP_PKEY_EC:        /* Including SM2 */
+        case EVP_PKEY_EC: /* Including SM2 */
             return EC_KEY_can_sign(pkey->pkey.ec);
-# endif
+#endif
         default:
             break;
         }
     } else {
         const OSSL_PROVIDER *prov = EVP_KEYMGMT_get0_provider(pkey->keymgmt);
         OSSL_LIB_CTX *libctx = ossl_provider_libctx(prov);
-        const char *supported_sig =
-            pkey->keymgmt->query_operation_name != NULL
-            ? pkey->keymgmt->query_operation_name(OSSL_OP_SIGNATURE)
-            : EVP_KEYMGMT_get0_name(pkey->keymgmt);
-        EVP_SIGNATURE *signature = NULL;
-
-        signature = EVP_SIGNATURE_fetch(libctx, supported_sig, NULL);
-        if (signature != NULL) {
-            EVP_SIGNATURE_free(signature);
+        EVP_SIGNATURE *sig;
+        const char *name;
+
+        name = evp_keymgmt_util_query_operation_name(pkey->keymgmt,
+            OSSL_OP_SIGNATURE);
+        sig = EVP_SIGNATURE_fetch(libctx, name, NULL);
+        if (sig != NULL) {
+            EVP_SIGNATURE_free(sig);
             return 1;
         }
     }
@@ -1174,14 +1171,14 @@ static int print_reset_indent(BIO **out, int pop_f_prefix, long saved_indent)
 }
 
 static int print_set_indent(BIO **out, int *pop_f_prefix, long *saved_indent,
-                            long indent)
+    long indent)
 {
     *pop_f_prefix = 0;
     *saved_indent = 0;
     if (indent > 0) {
         long i = BIO_get_indent(*out);
 
-        *saved_indent =  (i < 0 ? 0 : i);
+        *saved_indent = (i < 0 ? 0 : i);
         if (BIO_set_indent(*out, indent) <= 0) {
             BIO *prefbio = BIO_new(BIO_f_prefix());
 
@@ -1199,30 +1196,31 @@ static int print_set_indent(BIO **out, int *pop_f_prefix, long *saved_indent,
 }
 
 static int unsup_alg(BIO *out, const EVP_PKEY *pkey, int indent,
-                     const char *kstr)
+    const char *kstr)
 {
     return BIO_indent(out, indent, 128)
         && BIO_printf(out, "%s algorithm \"%s\" unsupported\n",
-                      kstr, OBJ_nid2ln(pkey->type)) > 0;
+               kstr, OBJ_nid2ln(pkey->type))
+        > 0;
 }
 
 static int print_pkey(const EVP_PKEY *pkey, BIO *out, int indent,
-                      int selection /* For provided encoding */,
-                      const char *propquery /* For provided encoding */,
-                      int (*legacy_print)(BIO *out, const EVP_PKEY *pkey,
-                                          int indent, ASN1_PCTX *pctx),
-                      ASN1_PCTX *legacy_pctx /* For legacy print */)
+    int selection /* For provided encoding */,
+    const char *propquery /* For provided encoding */,
+    int (*legacy_print)(BIO *out, const EVP_PKEY *pkey,
+        int indent, ASN1_PCTX *pctx),
+    ASN1_PCTX *legacy_pctx /* For legacy print */)
 {
     int pop_f_prefix;
     long saved_indent;
     OSSL_ENCODER_CTX *ctx = NULL;
-    int ret = -2;                /* default to unsupported */
+    int ret = -2; /* default to unsupported */
 
     if (!print_set_indent(&out, &pop_f_prefix, &saved_indent, indent))
         return 0;
 
     ctx = OSSL_ENCODER_CTX_new_for_pkey(pkey, selection, "TEXT", NULL,
-                                        propquery);
+        propquery);
     if (OSSL_ENCODER_CTX_get_num_encoders(ctx) != 0)
         ret = OSSL_ENCODER_to_bio(ctx, out);
     OSSL_ENCODER_CTX_free(ctx);
@@ -1236,38 +1234,38 @@ static int print_pkey(const EVP_PKEY *pkey, BIO *out, int indent,
     else
         ret = unsup_alg(out, pkey, 0, "Public Key");
 
- end:
+end:
     print_reset_indent(&out, pop_f_prefix, saved_indent);
     return ret;
 }
 
 int EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey,
-                          int indent, ASN1_PCTX *pctx)
+    int indent, ASN1_PCTX *pctx)
 {
     return print_pkey(pkey, out, indent, EVP_PKEY_PUBLIC_KEY, NULL,
-                      (pkey->ameth != NULL ? pkey->ameth->pub_print : NULL),
-                      pctx);
+        (pkey->ameth != NULL ? pkey->ameth->pub_print : NULL),
+        pctx);
 }
 
 int EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey,
-                           int indent, ASN1_PCTX *pctx)
+    int indent, ASN1_PCTX *pctx)
 {
     return print_pkey(pkey, out, indent, EVP_PKEY_PRIVATE_KEY, NULL,
-                      (pkey->ameth != NULL ? pkey->ameth->priv_print : NULL),
-                      pctx);
+        (pkey->ameth != NULL ? pkey->ameth->priv_print : NULL),
+        pctx);
 }
 
 int EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey,
-                          int indent, ASN1_PCTX *pctx)
+    int indent, ASN1_PCTX *pctx)
 {
     return print_pkey(pkey, out, indent, EVP_PKEY_KEY_PARAMETERS, NULL,
-                      (pkey->ameth != NULL ? pkey->ameth->param_print : NULL),
-                      pctx);
+        (pkey->ameth != NULL ? pkey->ameth->param_print : NULL),
+        pctx);
 }
 
-# ifndef OPENSSL_NO_STDIO
+#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 ret;
     BIO *b = BIO_new_fp(fp, BIO_NOCLOSE);
@@ -1280,7 +1278,7 @@ int EVP_PKEY_print_public_fp(FILE *fp, const EVP_PKEY *pkey,
 }
 
 int EVP_PKEY_print_private_fp(FILE *fp, const EVP_PKEY *pkey,
-                              int indent, ASN1_PCTX *pctx)
+    int indent, ASN1_PCTX *pctx)
 {
     int ret;
     BIO *b = BIO_new_fp(fp, BIO_NOCLOSE);
@@ -1293,7 +1291,7 @@ int EVP_PKEY_print_private_fp(FILE *fp, const EVP_PKEY *pkey,
 }
 
 int EVP_PKEY_print_params_fp(FILE *fp, const EVP_PKEY *pkey,
-                             int indent, ASN1_PCTX *pctx)
+    int indent, ASN1_PCTX *pctx)
 {
     int ret;
     BIO *b = BIO_new_fp(fp, BIO_NOCLOSE);
@@ -1304,7 +1302,7 @@ int EVP_PKEY_print_params_fp(FILE *fp, const EVP_PKEY *pkey,
     BIO_free(b);
     return ret;
 }
-# endif
+#endif
 
 static void mdname2nid(const char *mdname, void *data)
 {
@@ -1319,49 +1317,48 @@ static void mdname2nid(const char *mdname, void *data)
 }
 
 static int legacy_asn1_ctrl_to_param(EVP_PKEY *pkey, int op,
-                                     int arg1, void *arg2)
+    int arg1, void *arg2)
 {
     if (pkey->keymgmt == NULL)
         return 0;
     switch (op) {
-    case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
-        {
-            char mdname[80] = "";
-            int rv = EVP_PKEY_get_default_digest_name(pkey, mdname,
-                                                      sizeof(mdname));
-
-            if (rv > 0) {
-                int mdnum;
-                OSSL_LIB_CTX *libctx = ossl_provider_libctx(pkey->keymgmt->prov);
-                /* Make sure the MD is in the namemap if available */
-                EVP_MD *md;
-                OSSL_NAMEMAP *namemap;
-                int nid = NID_undef;
-
-                (void)ERR_set_mark();
-                md = EVP_MD_fetch(libctx, mdname, NULL);
-                (void)ERR_pop_to_mark();
-                namemap = ossl_namemap_stored(libctx);
+    case ASN1_PKEY_CTRL_DEFAULT_MD_NID: {
+        char mdname[80] = "";
+        int rv = EVP_PKEY_get_default_digest_name(pkey, mdname,
+            sizeof(mdname));
+
+        if (rv > 0) {
+            int mdnum;
+            OSSL_LIB_CTX *libctx = ossl_provider_libctx(pkey->keymgmt->prov);
+            /* Make sure the MD is in the namemap if available */
+            EVP_MD *md;
+            OSSL_NAMEMAP *namemap;
+            int nid = NID_undef;
+
+            (void)ERR_set_mark();
+            md = EVP_MD_fetch(libctx, mdname, NULL);
+            (void)ERR_pop_to_mark();
+            namemap = ossl_namemap_stored(libctx);
 
-                /*
-                 * The only reason to fetch the MD was to make sure it is in the
-                 * namemap. We can immediately free it.
-                 */
-                EVP_MD_free(md);
-                mdnum = ossl_namemap_name2num(namemap, mdname);
-                if (mdnum == 0)
-                    return 0;
+            /*
+             * The only reason to fetch the MD was to make sure it is in the
+             * namemap. We can immediately free it.
+             */
+            EVP_MD_free(md);
+            mdnum = ossl_namemap_name2num(namemap, mdname);
+            if (mdnum == 0)
+                return 0;
 
-                /*
-                 * We have the namemap number - now we need to find the
-                 * associated nid
-                 */
-                if (!ossl_namemap_doall_names(namemap, mdnum, mdname2nid, &nid))
-                    return 0;
-                *(int *)arg2 = nid;
-            }
-            return rv;
+            /*
+             * We have the namemap number - now we need to find the
+             * associated nid
+             */
+            if (!ossl_namemap_doall_names(namemap, mdnum, mdname2nid, &nid))
+                return 0;
+            *(int *)arg2 = nid;
         }
+        return rv;
+    }
     default:
         return -2;
     }
@@ -1384,12 +1381,12 @@ 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)
 {
     if (pkey->ameth == NULL)
         return evp_keymgmt_util_get_deflt_digest_name(pkey->keymgmt,
-                                                      pkey->keydata,
-                                                      mdname, mdname_sz);
+            pkey->keydata,
+            mdname, mdname_sz);
 
     {
         int nid = NID_undef;
@@ -1403,14 +1400,14 @@ int EVP_PKEY_get_default_digest_name(EVP_PKEY *pkey,
 }
 
 int EVP_PKEY_get_group_name(const EVP_PKEY *pkey, char *gname, size_t gname_sz,
-                            size_t *gname_len)
+    size_t *gname_len)
 {
     return EVP_PKEY_get_utf8_string_param(pkey, OSSL_PKEY_PARAM_GROUP_NAME,
-                                          gname, gname_sz, gname_len);
+        gname, gname_sz, gname_len);
 }
 
 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)
 {
     int rv;
     EVP_MD_CTX *ctx = NULL;
@@ -1420,36 +1417,36 @@ int EVP_PKEY_digestsign_supports_digest(EVP_PKEY *pkey, OSSL_LIB_CTX *libctx,
 
     ERR_set_mark();
     rv = EVP_DigestSignInit_ex(ctx, NULL, name, libctx,
-                               propq, pkey, NULL);
+        propq, pkey, NULL);
     ERR_pop_to_mark();
 
     EVP_MD_CTX_free(ctx);
     return rv;
 }
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
 
 int EVP_PKEY_set1_encoded_public_key(EVP_PKEY *pkey, const unsigned char *pub,
-                                     size_t publen)
+    size_t publen)
 {
     if (pkey == NULL)
         return 0;
 #ifndef FIPS_MODULE
     if (evp_pkey_is_provided(pkey))
-#endif  /* !FIPS_MODULE */
-        return
-            EVP_PKEY_set_octet_string_param(pkey,
-                                            OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
-                                            (unsigned char *)pub, publen);
+#endif /* !FIPS_MODULE */
+        return EVP_PKEY_set_octet_string_param(pkey,
+            OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+            (unsigned char *)pub, publen);
 
 #ifndef FIPS_MODULE
     if (publen > INT_MAX)
         return 0;
     /* Historically this function was EVP_PKEY_set1_tls_encodedpoint */
     if (evp_pkey_asn1_ctrl(pkey, ASN1_PKEY_CTRL_SET1_TLS_ENCPT, publen,
-                           (void *)pub) <= 0)
+            (void *)pub)
+        <= 0)
         return 0;
     return 1;
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
 }
 
 size_t EVP_PKEY_get1_encoded_public_key(EVP_PKEY *pkey, unsigned char **ppub)
@@ -1468,8 +1465,8 @@ size_t EVP_PKEY_get1_encoded_public_key(EVP_PKEY *pkey, unsigned char **ppub)
          * to allocate.
          */
         EVP_PKEY_get_octet_string_param(pkey,
-                                        OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
-                                        NULL, 0, &return_size);
+            OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+            NULL, 0, &return_size);
         if (return_size == OSSL_PARAM_UNMODIFIED)
             return 0;
 
@@ -1479,8 +1476,8 @@ size_t EVP_PKEY_get1_encoded_public_key(EVP_PKEY *pkey, unsigned char **ppub)
             return 0;
 
         if (!EVP_PKEY_get_octet_string_param(pkey,
-                                             OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
-                                             buf, return_size, NULL)) {
+                OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+                buf, return_size, NULL)) {
             OPENSSL_free(buf);
             return 0;
         }
@@ -1495,7 +1492,7 @@ size_t EVP_PKEY_get1_encoded_public_key(EVP_PKEY *pkey, unsigned char **ppub)
             return 0;
         return rv;
     }
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
 }
 
 /*- All methods below can also be used in FIPS_MODULE */
@@ -1528,7 +1525,7 @@ EVP_PKEY *EVP_PKEY_new(void)
 #endif
     return ret;
 
- err:
+err:
     CRYPTO_FREE_REF(&ret->references);
     CRYPTO_THREAD_lock_free(ret->lock);
     OPENSSL_free(ret);
@@ -1549,11 +1546,11 @@ EVP_PKEY *EVP_PKEY_new(void)
  */
 
 static int pkey_set_type(EVP_PKEY *pkey, ENGINE *e, int type, const char *str,
-                         int len, EVP_KEYMGMT *keymgmt)
+    int len, EVP_KEYMGMT *keymgmt)
 {
 #ifndef FIPS_MODULE
     const EVP_PKEY_ASN1_METHOD *ameth = NULL;
-    ENGINE **eptr = (e == NULL) ? &e :  NULL;
+    ENGINE **eptr = (e == NULL) ? &e : NULL;
 #endif
 
     /*
@@ -1584,13 +1581,13 @@ static int pkey_set_type(EVP_PKEY *pkey, ENGINE *e, int type, const char *str,
             && type == pkey->save_type
             && pkey->ameth != NULL)
             return 1;
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
         /* If we have ENGINEs release them */
         ENGINE_finish(pkey->engine);
         pkey->engine = NULL;
         ENGINE_finish(pkey->pmeth_engine);
         pkey->pmeth_engine = NULL;
-# endif
+#endif
 #endif
     }
 #ifndef FIPS_MODULE
@@ -1598,12 +1595,11 @@ static int pkey_set_type(EVP_PKEY *pkey, ENGINE *e, int type, const char *str,
         ameth = EVP_PKEY_asn1_find_str(eptr, str, len);
     else if (type != EVP_PKEY_NONE)
         ameth = EVP_PKEY_asn1_find(eptr, type);
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
     if (pkey == NULL && eptr != NULL)
         ENGINE_finish(e);
-# endif
 #endif
-
+#endif
 
     {
         int check = 1;
@@ -1651,12 +1647,12 @@ static int pkey_set_type(EVP_PKEY *pkey, ENGINE *e, int type, const char *str,
         } else {
             pkey->type = EVP_PKEY_KEYMGMT;
         }
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
         if (eptr == NULL && e != NULL && !ENGINE_init(e)) {
             ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
             return 0;
         }
-# endif
+#endif
         pkey->engine = e;
 #endif
     }
@@ -1675,7 +1671,7 @@ static void find_ameth(const char *name, void *data)
     ERR_set_mark();
 
     if (pkey_set_type(NULL, NULL, EVP_PKEY_NONE, name, strlen(name),
-                      NULL)) {
+            NULL)) {
         if (str[0] == NULL)
             str[0] = name;
         else if (str[1] == NULL)
@@ -1689,8 +1685,8 @@ static void find_ameth(const char *name, void *data)
 int EVP_PKEY_set_type_by_keymgmt(EVP_PKEY *pkey, EVP_KEYMGMT *keymgmt)
 {
 #ifndef FIPS_MODULE
-# define EVP_PKEY_TYPE_STR str[0]
-# define EVP_PKEY_TYPE_STRLEN (str[0] == NULL ? -1 : (int)strlen(str[0]))
+#define EVP_PKEY_TYPE_STR str[0]
+#define EVP_PKEY_TYPE_STRLEN (str[0] == NULL ? -1 : (int)strlen(str[0]))
     /*
      * Find at most two strings that have an associated EVP_PKEY_ASN1_METHOD
      * Ideally, only one should be found.  If two (or more) are found, the
@@ -1699,17 +1695,17 @@ int EVP_PKEY_set_type_by_keymgmt(EVP_PKEY *pkey, EVP_KEYMGMT *keymgmt)
     const char *str[2] = { NULL, NULL };
 
     if (!EVP_KEYMGMT_names_do_all(keymgmt, find_ameth, &str)
-            || str[1] != NULL) {
+        || str[1] != NULL) {
         ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
         return 0;
     }
 #else
-# define EVP_PKEY_TYPE_STR NULL
-# define EVP_PKEY_TYPE_STRLEN -1
+#define EVP_PKEY_TYPE_STR NULL
+#define EVP_PKEY_TYPE_STRLEN -1
 #endif
     return pkey_set_type(pkey, NULL, EVP_PKEY_NONE,
-                         EVP_PKEY_TYPE_STR, EVP_PKEY_TYPE_STRLEN,
-                         keymgmt);
+        EVP_PKEY_TYPE_STR, EVP_PKEY_TYPE_STRLEN,
+        keymgmt);
 
 #undef EVP_PKEY_TYPE_STR
 #undef EVP_PKEY_TYPE_STRLEN
@@ -1744,10 +1740,10 @@ EVP_PKEY *EVP_PKEY_dup(EVP_PKEY *pkey)
 
 #ifndef FIPS_MODULE
     if (evp_pkey_is_provided(pkey))
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
     {
         if (!evp_keymgmt_util_copy(dup_pk, pkey,
-                                   OSSL_KEYMGMT_SELECT_ALL))
+                OSSL_KEYMGMT_SELECT_ALL))
             goto err;
         goto done;
     }
@@ -1767,21 +1763,21 @@ EVP_PKEY *EVP_PKEY_dup(EVP_PKEY *pkey)
             goto err;
         goto done;
     }
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
 
     goto err;
 done:
 #ifndef FIPS_MODULE
     /* copy auxiliary data */
     if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_EVP_PKEY,
-                            &dup_pk->ex_data, &pkey->ex_data))
+            &dup_pk->ex_data, &pkey->ex_data))
         goto err;
 
     if (pkey->attributes != NULL) {
         if ((dup_pk->attributes = ossl_x509at_dup(pkey->attributes)) == NULL)
             goto err;
     }
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
     return dup_pk;
 err:
     EVP_PKEY_free(dup_pk);
@@ -1815,15 +1811,15 @@ void evp_pkey_free_legacy(EVP_PKEY *x)
             ameth->pkey_free(x);
         x->pkey.ptr = NULL;
     }
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
     ENGINE_finish(tmpe);
     ENGINE_finish(x->engine);
     x->engine = NULL;
     ENGINE_finish(x->pmeth_engine);
     x->pmeth_engine = NULL;
-# endif
+#endif
 }
-#endif  /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 
 static void evp_pkey_free_it(EVP_PKEY *x)
 {
@@ -1899,8 +1895,8 @@ const char *EVP_PKEY_get0_description(const EVP_PKEY *pkey)
 }
 
 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)
 {
     EVP_KEYMGMT *allocated_keymgmt = NULL;
     EVP_KEYMGMT *tmp_keymgmt = NULL;
@@ -1967,7 +1963,7 @@ void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx,
             if (!CRYPTO_THREAD_read_lock(pk->lock))
                 goto end;
             op = evp_keymgmt_util_find_operation_cache(pk, tmp_keymgmt,
-                                                       selection);
+                selection);
 
             /*
              * If |tmp_keymgmt| is present in the operation cache, it means
@@ -1999,7 +1995,7 @@ void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx,
             goto end;
 
         if (!pk->ameth->export_to(pk, keydata, tmp_keymgmt->import,
-                                  libctx, propquery)) {
+                libctx, propquery)) {
             evp_keymgmt_freedata(tmp_keymgmt, keydata);
             keydata = NULL;
             goto end;
@@ -2020,7 +2016,7 @@ void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx,
         if (!CRYPTO_THREAD_write_lock(pk->lock))
             goto end;
         if (pk->ameth->dirty_cnt(pk) != pk->dirty_cnt_copy
-                && !evp_keymgmt_util_clear_operation_cache(pk)) {
+            && !evp_keymgmt_util_clear_operation_cache(pk)) {
             CRYPTO_THREAD_unlock(pk->lock);
             evp_keymgmt_freedata(tmp_keymgmt, keydata);
             keydata = NULL;
@@ -2042,7 +2038,7 @@ void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx,
 
         /* Add the new export to the operation cache */
         if (!evp_keymgmt_util_cache_keydata(pk, tmp_keymgmt, keydata,
-                                            selection)) {
+                selection)) {
             CRYPTO_THREAD_unlock(pk->lock);
             evp_keymgmt_freedata(tmp_keymgmt, keydata);
             keydata = NULL;
@@ -2055,11 +2051,11 @@ void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx,
         CRYPTO_THREAD_unlock(pk->lock);
         goto end;
     }
-#endif  /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 
     keydata = evp_keymgmt_util_export_to_provider(pk, tmp_keymgmt, selection);
 
- end:
+end:
     /*
      * If nothing was exported, |tmp_keymgmt| might point at a freed
      * EVP_KEYMGMT, so we clear it to be safe.  It shouldn't be useful for
@@ -2101,8 +2097,8 @@ int evp_pkey_copy_downgraded(EVP_PKEY **dest, const EVP_PKEY *src)
          */
         if (!ossl_assert(type != EVP_PKEY_NONE)) {
             ERR_raise_data(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR,
-                           "keymgmt key type = %s but legacy type = EVP_PKEY_NONE",
-                           keytype);
+                "keymgmt key type = %s but legacy type = EVP_PKEY_NONE",
+                keytype);
             return 0;
         }
 
@@ -2128,25 +2124,23 @@ int evp_pkey_copy_downgraded(EVP_PKEY **dest, const EVP_PKEY *src)
 
             if ((*dest)->ameth->import_from == NULL) {
                 ERR_raise_data(ERR_LIB_EVP, EVP_R_NO_IMPORT_FUNCTION,
-                               "key type = %s", keytype);
+                    "key type = %s", keytype);
             } else {
                 /*
                  * We perform the export in the same libctx as the keymgmt
                  * that we are using.
                  */
-                OSSL_LIB_CTX *libctx =
-                    ossl_provider_libctx(keymgmt->prov);
-                EVP_PKEY_CTX *pctx =
-                    EVP_PKEY_CTX_new_from_pkey(libctx, *dest, NULL);
+                OSSL_LIB_CTX *libctx = ossl_provider_libctx(keymgmt->prov);
+                EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_from_pkey(libctx, *dest, NULL);
 
                 if (pctx == NULL)
                     ERR_raise(ERR_LIB_EVP, ERR_R_EVP_LIB);
 
                 if (pctx != NULL
                     && evp_keymgmt_export(keymgmt, keydata,
-                                          OSSL_KEYMGMT_SELECT_ALL,
-                                          (*dest)->ameth->import_from,
-                                          pctx)) {
+                        OSSL_KEYMGMT_SELECT_ALL,
+                        (*dest)->ameth->import_from,
+                        pctx)) {
                     /* Synchronize the dirty count */
                     (*dest)->dirty_cnt_copy = (*dest)->ameth->dirty_cnt(*dest);
 
@@ -2157,7 +2151,7 @@ int evp_pkey_copy_downgraded(EVP_PKEY **dest, const EVP_PKEY *src)
             }
 
             ERR_raise_data(ERR_LIB_EVP, EVP_R_KEYMGMT_EXPORT_FAILURE,
-                           "key type = %s", keytype);
+                "key type = %s", keytype);
         }
     }
 
@@ -2215,15 +2209,15 @@ void *evp_pkey_get_legacy(EVP_PKEY *pk)
         goto err;
     }
 
- err:
+err:
     EVP_PKEY_free(tmp_copy);
 
     return ret;
 }
-#endif  /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 
 int EVP_PKEY_get_bn_param(const EVP_PKEY *pkey, const char *key_name,
-                          BIGNUM **bn)
+    BIGNUM **bn)
 {
     int ret = 0;
     OSSL_PARAM params[2];
@@ -2272,8 +2266,8 @@ int EVP_PKEY_get_bn_param(const EVP_PKEY *pkey, const char *key_name,
 }
 
 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_len)
+    unsigned char *buf, size_t max_buf_sz,
+    size_t *out_len)
 {
     OSSL_PARAM params[2];
     int ret1 = 0, ret2 = 0;
@@ -2291,8 +2285,8 @@ int EVP_PKEY_get_octet_string_param(const EVP_PKEY *pkey, const char *key_name,
 }
 
 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_len)
+    char *str, size_t max_buf_sz,
+    size_t *out_len)
 {
     OSSL_PARAM params[2];
     int ret1 = 0, ret2 = 0;
@@ -2318,7 +2312,7 @@ int EVP_PKEY_get_utf8_string_param(const EVP_PKEY *pkey, const char *key_name,
 }
 
 int EVP_PKEY_get_int_param(const EVP_PKEY *pkey, const char *key_name,
-                           int *out)
+    int *out)
 {
     OSSL_PARAM params[2];
 
@@ -2332,7 +2326,7 @@ int EVP_PKEY_get_int_param(const EVP_PKEY *pkey, const char *key_name,
 }
 
 int EVP_PKEY_get_size_t_param(const EVP_PKEY *pkey, const char *key_name,
-                              size_t *out)
+    size_t *out)
 {
     OSSL_PARAM params[2];
 
@@ -2370,7 +2364,7 @@ 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)
 {
     OSSL_PARAM params[2];
     unsigned char buffer[2048];
@@ -2394,7 +2388,7 @@ int EVP_PKEY_set_bn_param(EVP_PKEY *pkey, const char *key_name,
 }
 
 int EVP_PKEY_set_utf8_string_param(EVP_PKEY *pkey, const char *key_name,
-                                   const char *str)
+    const char *str)
 {
     OSSL_PARAM params[2];
 
@@ -2407,7 +2401,7 @@ int EVP_PKEY_set_utf8_string_param(EVP_PKEY *pkey, const char *key_name,
 }
 
 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)
 {
     OSSL_PARAM params[2];
 
@@ -2415,7 +2409,7 @@ int EVP_PKEY_set_octet_string_param(EVP_PKEY *pkey, const char *key_name,
         return 0;
 
     params[0] = OSSL_PARAM_construct_octet_string(key_name,
-                                                  (unsigned char *)buf, bsize);
+        (unsigned char *)buf, bsize);
     params[1] = OSSL_PARAM_construct_end();
     return EVP_PKEY_set_params(pkey, params);
 }
@@ -2441,11 +2435,11 @@ int EVP_PKEY_set_params(EVP_PKEY *pkey, OSSL_PARAM params[])
          * sure.  This bit of code can be enabled if we find the need.  If
          * not, it can safely be removed when #legacy support is removed.
          */
-# if 0
+#if 0
         else if (evp_pkey_is_legacy(pkey)) {
             return evp_pkey_set_params_to_ctrl(pkey, params);
         }
-# endif
+#endif
 #endif
     }
     ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_KEY);
@@ -2483,8 +2477,8 @@ int EVP_PKEY_get_ec_point_conv_form(const EVP_PKEY *pkey)
         return 0;
 
     if (pkey->keymgmt == NULL
-            || pkey->keydata == NULL) {
-# ifndef OPENSSL_NO_EC
+        || pkey->keydata == NULL) {
+#ifndef OPENSSL_NO_EC
         /* Might work through the legacy route */
         const EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey);
 
@@ -2492,14 +2486,14 @@ int EVP_PKEY_get_ec_point_conv_form(const EVP_PKEY *pkey)
             return 0;
 
         return EC_KEY_get_conv_form(ec);
-# else
+#else
         return 0;
-# endif
+#endif
     }
 
     if (!EVP_PKEY_get_utf8_string_param(pkey,
-                                        OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
-                                        name, sizeof(name), &name_len))
+            OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+            name, sizeof(name), &name_len))
         return 0;
 
     if (strcmp(name, "uncompressed") == 0)
@@ -2523,8 +2517,8 @@ int EVP_PKEY_get_field_type(const EVP_PKEY *pkey)
         return 0;
 
     if (pkey->keymgmt == NULL
-            || pkey->keydata == NULL) {
-# ifndef OPENSSL_NO_EC
+        || pkey->keydata == NULL) {
+#ifndef OPENSSL_NO_EC
         /* Might work through the legacy route */
         const EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey);
         const EC_GROUP *grp;
@@ -2536,13 +2530,13 @@ int EVP_PKEY_get_field_type(const EVP_PKEY *pkey)
             return 0;
 
         return EC_GROUP_get_field_type(grp);
-# else
+#else
         return 0;
-# endif
+#endif
     }
 
     if (!EVP_PKEY_get_utf8_string_param(pkey, OSSL_PKEY_PARAM_EC_FIELD_TYPE,
-                                        fstr, sizeof(fstr), &fstrlen))
+            fstr, sizeof(fstr), &fstrlen))
         return 0;
 
     if (strcmp(fstr, SN_X9_62_prime_field) == 0)
diff --git a/crypto/evp/p_open.c b/crypto/evp/p_open.c
index 8630553e7963c..cddb85d314035 100644
--- a/crypto/evp/p_open.c
+++ b/crypto/evp/p_open.c
@@ -16,8 +16,8 @@
 #include <openssl/rsa.h>
 
 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)
 {
     unsigned char *key = NULL;
     size_t keylen = 0;
@@ -53,7 +53,7 @@ int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
         goto err;
 
     ret = 1;
- err:
+err:
     EVP_PKEY_CTX_free(pctx);
     OPENSSL_clear_free(key, keylen);
     return ret;
diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c
index 94c8462ab4570..a4df78b251cfa 100644
--- a/crypto/evp/p_seal.c
+++ b/crypto/evp/p_seal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -17,8 +17,8 @@
 #include <openssl/x509.h>
 
 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)
 {
     unsigned char key[EVP_MAX_KEY_LENGTH];
     const OSSL_PROVIDER *prov;
@@ -34,7 +34,7 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
             return 0;
     }
     if ((cipher = EVP_CIPHER_CTX_get0_cipher(ctx)) != NULL
-            && (prov = EVP_CIPHER_get0_provider(cipher)) != NULL)
+        && (prov = EVP_CIPHER_get0_provider(cipher)) != NULL)
         libctx = ossl_provider_libctx(prov);
     if ((npubk <= 0) || !pubk)
         return 1;
@@ -55,6 +55,7 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
 
     for (i = 0; i < npubk; i++) {
         size_t keylen = len;
+        size_t outlen = EVP_PKEY_get_size(pubk[i]);
 
         pctx = EVP_PKEY_CTX_new_from_pkey(libctx, pubk[i], NULL);
         if (pctx == NULL) {
@@ -63,9 +64,9 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
         }
 
         if (EVP_PKEY_encrypt_init(pctx) <= 0
-            || EVP_PKEY_encrypt(pctx, ek[i], &keylen, key, keylen) <= 0)
+            || EVP_PKEY_encrypt(pctx, ek[i], &outlen, key, keylen) <= 0)
             goto err;
-        ekl[i] = (int)keylen;
+        ekl[i] = (int)outlen;
         EVP_PKEY_CTX_free(pctx);
     }
     pctx = NULL;
diff --git a/crypto/evp/p_sign.c b/crypto/evp/p_sign.c
index e5555281a6b09..3601a1556b64f 100644
--- a/crypto/evp/p_sign.c
+++ b/crypto/evp/p_sign.c
@@ -15,8 +15,8 @@
 #include "crypto/evp.h"
 
 int EVP_SignFinal_ex(EVP_MD_CTX *ctx, unsigned char *sigret,
-                     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)
 {
     unsigned char m[EVP_MAX_MD_SIZE];
     unsigned int m_len = 0;
@@ -59,13 +59,13 @@ int EVP_SignFinal_ex(EVP_MD_CTX *ctx, unsigned char *sigret,
         goto err;
     *siglen = sltmp;
     i = 1;
- err:
+err:
     EVP_PKEY_CTX_free(pkctx);
     return i;
 }
 
 int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
-                  unsigned int *siglen, EVP_PKEY *pkey)
+    unsigned int *siglen, EVP_PKEY *pkey)
 {
     return EVP_SignFinal_ex(ctx, sigret, siglen, pkey, NULL, NULL);
 }
diff --git a/crypto/evp/p_verify.c b/crypto/evp/p_verify.c
index 02db143d13241..9116ec9dad81a 100644
--- a/crypto/evp/p_verify.c
+++ b/crypto/evp/p_verify.c
@@ -15,8 +15,8 @@
 #include "crypto/evp.h"
 
 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)
 {
     unsigned char m[EVP_MAX_MD_SIZE];
     unsigned int m_len = 0;
@@ -53,13 +53,13 @@ int EVP_VerifyFinal_ex(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
     if (EVP_PKEY_CTX_set_signature_md(pkctx, EVP_MD_CTX_get0_md(ctx)) <= 0)
         goto err;
     i = EVP_PKEY_verify(pkctx, sigbuf, siglen, m, m_len);
- err:
+err:
     EVP_PKEY_CTX_free(pkctx);
     return i;
 }
 
 int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
-                    unsigned int siglen, EVP_PKEY *pkey)
+    unsigned int siglen, EVP_PKEY *pkey)
 {
     return EVP_VerifyFinal_ex(ctx, sigbuf, siglen, pkey, NULL, NULL);
 }
diff --git a/crypto/evp/pbe_scrypt.c b/crypto/evp/pbe_scrypt.c
index 78b2d13ec9e10..cf123fd172abb 100644
--- a/crypto/evp/pbe_scrypt.c
+++ b/crypto/evp/pbe_scrypt.c
@@ -21,24 +21,24 @@
  */
 
 #ifdef SCRYPT_MAX_MEM
-# if SCRYPT_MAX_MEM == 0
-#  undef SCRYPT_MAX_MEM
+#if SCRYPT_MAX_MEM == 0
+#undef SCRYPT_MAX_MEM
 /*
  * Although we could theoretically allocate SIZE_MAX memory that would leave
  * no memory available for anything else so set limit as half that.
  */
-#  define SCRYPT_MAX_MEM (SIZE_MAX/2)
-# endif
+#define SCRYPT_MAX_MEM (SIZE_MAX / 2)
+#endif
 #else
 /* Default memory limit: 32 MB */
-# define SCRYPT_MAX_MEM  (1024 * 1024 * 32)
+#define SCRYPT_MAX_MEM (1024 * 1024 * 32)
 #endif
 
 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)
 {
     const char *empty = "";
     int rv = 1;
@@ -71,10 +71,10 @@ int EVP_PBE_scrypt_ex(const char *pass, size_t passlen,
         return 0;
 
     *z++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
-                                              (unsigned char *)pass,
-                                                      passlen);
+        (unsigned char *)pass,
+        passlen);
     *z++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                             (unsigned char *)salt, saltlen);
+        (unsigned char *)salt, saltlen);
     *z++ = OSSL_PARAM_construct_uint64(OSSL_KDF_PARAM_SCRYPT_N, &N);
     *z++ = OSSL_PARAM_construct_uint64(OSSL_KDF_PARAM_SCRYPT_R, &r);
     *z++ = OSSL_PARAM_construct_uint64(OSSL_KDF_PARAM_SCRYPT_P, &p);
@@ -88,12 +88,12 @@ int EVP_PBE_scrypt_ex(const char *pass, size_t passlen,
 }
 
 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)
 {
     return EVP_PBE_scrypt_ex(pass, passlen, salt, saltlen, N, r, p, maxmem,
-                             key, keylen, NULL, NULL);
+        key, keylen, NULL, NULL);
 }
 
 #endif
diff --git a/crypto/evp/pmeth_check.c b/crypto/evp/pmeth_check.c
index 7f3a2e3a1c805..ebab82809ca62 100644
--- a/crypto/evp/pmeth_check.c
+++ b/crypto/evp/pmeth_check.c
@@ -14,7 +14,7 @@
 #include <openssl/evp.h>
 #include "crypto/bn.h"
 #ifndef FIPS_MODULE
-# include "crypto/asn1.h"
+#include "crypto/asn1.h"
 #endif
 #include "crypto/evp.h"
 #include "evp_local.h"
@@ -35,7 +35,7 @@ static int try_provided_check(EVP_PKEY_CTX *ctx, int selection, int checktype)
 
     keymgmt = ctx->keymgmt;
     keydata = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
-                                          &keymgmt, ctx->propquery);
+        &keymgmt, ctx->propquery);
     if (keydata == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
         return 0;
@@ -55,7 +55,8 @@ static int evp_pkey_public_check_combined(EVP_PKEY_CTX *ctx, int checktype)
     }
 
     if ((ok = try_provided_check(ctx, OSSL_KEYMGMT_SELECT_PUBLIC_KEY,
-                                 checktype)) != -1)
+             checktype))
+        != -1)
         return ok;
 
     if (pkey->type == EVP_PKEY_NONE)
@@ -73,7 +74,7 @@ static int evp_pkey_public_check_combined(EVP_PKEY_CTX *ctx, int checktype)
 
     return pkey->ameth->pkey_public_check(pkey);
 #endif
- not_supported:
+not_supported:
     ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
     return -2;
 }
@@ -99,8 +100,9 @@ static int evp_pkey_param_check_combined(EVP_PKEY_CTX *ctx, int checktype)
     }
 
     if ((ok = try_provided_check(ctx,
-                                 OSSL_KEYMGMT_SELECT_ALL_PARAMETERS,
-                                 checktype)) != -1)
+             OSSL_KEYMGMT_SELECT_ALL_PARAMETERS,
+             checktype))
+        != -1)
         return ok;
 
     if (pkey->type == EVP_PKEY_NONE)
@@ -118,7 +120,7 @@ static int evp_pkey_param_check_combined(EVP_PKEY_CTX *ctx, int checktype)
 
     return pkey->ameth->pkey_param_check(pkey);
 #endif
- not_supported:
+not_supported:
     ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
     return -2;
 }
@@ -144,7 +146,8 @@ int EVP_PKEY_private_check(EVP_PKEY_CTX *ctx)
     }
 
     if ((ok = try_provided_check(ctx, OSSL_KEYMGMT_SELECT_PRIVATE_KEY,
-                                 OSSL_KEYMGMT_VALIDATE_FULL_CHECK)) != -1)
+             OSSL_KEYMGMT_VALIDATE_FULL_CHECK))
+        != -1)
         return ok;
 
     /* not supported for legacy keys */
@@ -168,7 +171,8 @@ int EVP_PKEY_pairwise_check(EVP_PKEY_CTX *ctx)
     }
 
     if ((ok = try_provided_check(ctx, OSSL_KEYMGMT_SELECT_KEYPAIR,
-                                 OSSL_KEYMGMT_VALIDATE_FULL_CHECK)) != -1)
+             OSSL_KEYMGMT_VALIDATE_FULL_CHECK))
+        != -1)
         return ok;
 
     if (pkey->type == EVP_PKEY_NONE)
@@ -186,8 +190,7 @@ int EVP_PKEY_pairwise_check(EVP_PKEY_CTX *ctx)
 
     return pkey->ameth->pkey_check(pkey);
 #endif
- not_supported:
+not_supported:
     ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
     return -2;
 }
-
diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c
index 74cca96f4d782..c653dbd6edca7 100644
--- a/crypto/evp/pmeth_gn.c
+++ b/crypto/evp/pmeth_gn.c
@@ -17,7 +17,7 @@
 #include <openssl/evp.h>
 #include "crypto/bn.h"
 #ifndef FIPS_MODULE
-# include "crypto/asn1.h"
+#include "crypto/asn1.h"
 #endif
 #include "crypto/evp.h"
 #include "evp_local.h"
@@ -37,14 +37,12 @@ static int gen_init(EVP_PKEY_CTX *ctx, int operation)
 
     switch (operation) {
     case EVP_PKEY_OP_PARAMGEN:
-        ctx->op.keymgmt.genctx =
-            evp_keymgmt_gen_init(ctx->keymgmt,
-                                 OSSL_KEYMGMT_SELECT_ALL_PARAMETERS, NULL);
+        ctx->op.keymgmt.genctx = evp_keymgmt_gen_init(ctx->keymgmt,
+            OSSL_KEYMGMT_SELECT_ALL_PARAMETERS, NULL);
         break;
     case EVP_PKEY_OP_KEYGEN:
-        ctx->op.keymgmt.genctx =
-            evp_keymgmt_gen_init(ctx->keymgmt, OSSL_KEYMGMT_SELECT_KEYPAIR,
-                                 NULL);
+        ctx->op.keymgmt.genctx = evp_keymgmt_gen_init(ctx->keymgmt, OSSL_KEYMGMT_SELECT_KEYPAIR,
+            NULL);
         break;
     }
 
@@ -54,7 +52,7 @@ static int gen_init(EVP_PKEY_CTX *ctx, int operation)
         ret = 1;
     goto end;
 
- legacy:
+legacy:
 #ifdef FIPS_MODULE
     goto not_supported;
 #else
@@ -78,14 +76,14 @@ static int gen_init(EVP_PKEY_CTX *ctx, int operation)
     }
 #endif
 
- end:
+end:
     if (ret <= 0 && ctx != NULL) {
         evp_pkey_ctx_free_old_ops(ctx);
         ctx->operation = EVP_PKEY_OP_UNDEFINED;
     }
     return ret;
 
- not_supported:
+not_supported:
     ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
     ret = -2;
     goto end;
@@ -108,14 +106,14 @@ static int ossl_callback_to_pkey_gencb(const OSSL_PARAM params[], void *arg)
     int p = -1, n = -1;
 
     if (ctx->pkey_gencb == NULL)
-        return 1;                /* No callback?  That's fine */
+        return 1; /* No callback?  That's fine */
 
     if ((param = OSSL_PARAM_locate_const(params, OSSL_GEN_PARAM_POTENTIAL))
-        == NULL
+            == NULL
         || !OSSL_PARAM_get_int(param, &p))
         return 0;
     if ((param = OSSL_PARAM_locate_const(params, OSSL_GEN_PARAM_ITERATION))
-        == NULL
+            == NULL
         || !OSSL_PARAM_get_int(param, &n))
         return 0;
 
@@ -167,9 +165,8 @@ int EVP_PKEY_generate(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
     ret = 1;
     if (ctx->pkey != NULL) {
         EVP_KEYMGMT *tmp_keymgmt = ctx->keymgmt;
-        void *keydata =
-            evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
-                                        &tmp_keymgmt, ctx->propquery);
+        void *keydata = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
+            &tmp_keymgmt, ctx->propquery);
 
         if (tmp_keymgmt == NULL)
             goto not_supported;
@@ -178,7 +175,7 @@ int EVP_PKEY_generate(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
          * with that as it sees fit.
          */
         ret = evp_keymgmt_gen_set_template(ctx->keymgmt,
-                                           ctx->op.keymgmt.genctx, keydata);
+            ctx->op.keymgmt.genctx, keydata);
     }
 
     /*
@@ -187,7 +184,7 @@ int EVP_PKEY_generate(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
      */
     ret = ret
         && (evp_keymgmt_util_gen(*ppkey, ctx->keymgmt, ctx->op.keymgmt.genctx,
-                                 ossl_callback_to_pkey_gencb, ctx)
+                ossl_callback_to_pkey_gencb, ctx)
             != NULL);
 
     ctx->keygen_info = NULL;
@@ -205,7 +202,7 @@ int EVP_PKEY_generate(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
 
     goto end;
 
- legacy:
+legacy:
 #ifdef FIPS_MODULE
     goto not_supported;
 #else
@@ -232,7 +229,7 @@ int EVP_PKEY_generate(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
     }
 #endif
 
- end:
+end:
     if (ret <= 0) {
         if (allocated_pkey != NULL)
             *ppkey = NULL;
@@ -240,16 +237,16 @@ int EVP_PKEY_generate(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey)
     }
     return ret;
 
- not_supported:
+not_supported:
     ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
     ret = -2;
     goto end;
- not_initialized:
+not_initialized:
     ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_INITIALIZED);
     ret = -1;
     goto end;
 #ifndef FIPS_MODULE
- not_accessible:
+not_accessible:
     ERR_raise(ERR_LIB_EVP, EVP_R_INACCESSIBLE_DOMAIN_PARAMETERS);
     ret = -1;
     goto end;
@@ -314,7 +311,7 @@ int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx)
 #ifndef FIPS_MODULE
 
 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_CTX *mac_ctx = NULL;
     EVP_PKEY *mac_key = NULL;
@@ -327,7 +324,7 @@ EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
         goto merr;
     if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0)
         goto merr;
- merr:
+merr:
     EVP_PKEY_CTX_free(mac_ctx);
     return mac_key;
 }
@@ -348,7 +345,7 @@ static int fromdata_init(EVP_PKEY_CTX *ctx, int operation)
     ctx->operation = operation;
     return 1;
 
- not_supported:
+not_supported:
     if (ctx != NULL)
         ctx->operation = EVP_PKEY_OP_UNDEFINED;
     ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
@@ -361,7 +358,7 @@ int EVP_PKEY_fromdata_init(EVP_PKEY_CTX *ctx)
 }
 
 int EVP_PKEY_fromdata(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey, int selection,
-                      OSSL_PARAM params[])
+    OSSL_PARAM params[])
 {
     void *keydata = NULL;
     EVP_PKEY *allocated_pkey = NULL;
@@ -427,7 +424,7 @@ struct fake_import_data_st {
 
 static OSSL_FUNC_keymgmt_import_fn pkey_fake_import;
 static int pkey_fake_import(void *fake_keydata, int ignored_selection,
-                            const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     struct fake_import_data_st *data = fake_keydata;
 
@@ -436,7 +433,7 @@ static int pkey_fake_import(void *fake_keydata, int ignored_selection,
 #endif
 
 int EVP_PKEY_export(const EVP_PKEY *pkey, int selection,
-                    OSSL_CALLBACK *export_cb, void *export_cbarg)
+    OSSL_CALLBACK *export_cb, void *export_cbarg)
 {
     if (pkey == NULL) {
         ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_NULL_PARAMETER);
@@ -454,7 +451,7 @@ int EVP_PKEY_export(const EVP_PKEY *pkey, int selection,
          * interested in the resulting OSSL_PARAM array.
          */
         return pkey->ameth->export_to(pkey, &data, pkey_fake_import,
-                                      NULL, NULL);
+            NULL, NULL);
     }
 #endif
     return evp_keymgmt_util_export(pkey, selection, export_cb, export_cbarg);
diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 846a790152c2e..2a0fc3ef0be65 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include <openssl/evp.h>
 #include <openssl/core_names.h>
@@ -25,7 +25,7 @@
 #include <openssl/kdf.h>
 #include "internal/cryptlib.h"
 #ifndef FIPS_MODULE
-# include "crypto/asn1.h"
+#include "crypto/asn1.h"
 #endif
 #include "crypto/evp.h"
 #include "crypto/dh.h"
@@ -38,11 +38,11 @@
 #ifndef FIPS_MODULE
 
 static int evp_pkey_ctx_store_cached_data(EVP_PKEY_CTX *ctx,
-                                          int keytype, int optype,
-                                          int cmd, const char *name,
-                                          const void *data, size_t data_len);
+    int keytype, int optype,
+    int cmd, const char *name,
+    const void *data, size_t data_len);
 static void evp_pkey_ctx_free_cached_data(EVP_PKEY_CTX *ctx,
-                                          int cmd, const char *name);
+    int cmd, const char *name);
 static void evp_pkey_ctx_free_all_cached_data(EVP_PKEY_CTX *ctx);
 
 typedef const EVP_PKEY_METHOD *(*pmeth_fn)(void);
@@ -53,25 +53,25 @@ static STACK_OF(EVP_PKEY_METHOD) *app_pkey_methods = NULL;
 /* This array needs to be in order of NIDs */
 static pmeth_fn standard_methods[] = {
     ossl_rsa_pkey_method,
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
     ossl_dh_pkey_method,
-# endif
-# ifndef OPENSSL_NO_DSA
+#endif
+#ifndef OPENSSL_NO_DSA
     ossl_dsa_pkey_method,
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
     ossl_ec_pkey_method,
-# endif
+#endif
     ossl_rsa_pss_pkey_method,
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
     ossl_dhx_pkey_method,
-# endif
-# ifndef OPENSSL_NO_ECX
+#endif
+#ifndef OPENSSL_NO_ECX
     ossl_ecx25519_pkey_method,
     ossl_ecx448_pkey_method,
     ossl_ed25519_pkey_method,
     ossl_ed448_pkey_method,
-# endif
+#endif
 };
 
 DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_METHOD *, pmeth_fn, pmeth_func);
@@ -84,7 +84,7 @@ static int pmeth_func_cmp(const EVP_PKEY_METHOD *const *a, pmeth_fn const *b)
 IMPLEMENT_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_METHOD *, pmeth_fn, pmeth_func);
 
 static int pmeth_cmp(const EVP_PKEY_METHOD *const *a,
-                     const EVP_PKEY_METHOD *const *b)
+    const EVP_PKEY_METHOD *const *b)
 {
     return ((*a)->pkey_id - (*b)->pkey_id);
 }
@@ -115,7 +115,7 @@ const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type)
     tmp.pkey_id = type;
     t = &tmp;
     ret = OBJ_bsearch_pmeth_func(&t, standard_methods,
-                                 OSSL_NELEM(standard_methods));
+        OSSL_NELEM(standard_methods));
     if (ret == NULL || *ret == NULL)
         return NULL;
     return (**ret)();
@@ -141,7 +141,7 @@ int evp_pkey_ctx_state(const EVP_PKEY_CTX *ctx)
         return EVP_PKEY_STATE_UNKNOWN;
 
     if ((EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
-         && ctx->op.kex.algctx != NULL)
+            && ctx->op.kex.algctx != NULL)
         || (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
             && ctx->op.sig.algctx != NULL)
         || (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
@@ -156,9 +156,9 @@ int evp_pkey_ctx_state(const EVP_PKEY_CTX *ctx)
 }
 
 static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx,
-                                 EVP_PKEY *pkey, ENGINE *e,
-                                 const char *keytype, const char *propquery,
-                                 int id)
+    EVP_PKEY *pkey, ENGINE *e,
+    const char *keytype, const char *propquery,
+    int id)
 
 {
     EVP_PKEY_CTX *ret = NULL;
@@ -210,7 +210,7 @@ static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx,
     if (e == NULL && (pkey == NULL || pkey->foreign == 0))
         keytype = OBJ_nid2sn(id);
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
     if (e == NULL && pkey != NULL)
         e = pkey->pmeth_engine != NULL ? pkey->pmeth_engine : pkey->engine;
     /* Try to find an ENGINE which implements this method */
@@ -230,15 +230,15 @@ static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx,
     if (e != NULL)
         pmeth = ENGINE_get_pkey_meth(e, id);
     else
-# endif /* OPENSSL_NO_ENGINE */
-    if (pkey != NULL && pkey->foreign)
-        pmeth = EVP_PKEY_meth_find(id);
-    else
-        app_pmeth = pmeth = evp_pkey_meth_find_added_by_application(id);
+#endif /* OPENSSL_NO_ENGINE */
+        if (pkey != NULL && pkey->foreign)
+            pmeth = EVP_PKEY_meth_find(id);
+        else
+            app_pmeth = pmeth = evp_pkey_meth_find_added_by_application(id);
 
-    /* END legacy */
+        /* END legacy */
 #endif /* FIPS_MODULE */
- common:
+common:
     /*
      * If there's no engine and no app supplied pmeth and there's a name, we try
      * fetching a provider implementation.
@@ -259,7 +259,7 @@ static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx,
             keymgmt = EVP_KEYMGMT_fetch(libctx, keytype, propquery);
         }
         if (keymgmt == NULL)
-            return NULL;   /* EVP_KEYMGMT_fetch() recorded an error */
+            return NULL; /* EVP_KEYMGMT_fetch() recorded an error */
 
 #ifndef FIPS_MODULE
         /*
@@ -343,14 +343,14 @@ static EVP_PKEY_CTX *int_ctx_new(OSSL_LIB_CTX *libctx,
 /*- All methods below can also be used in FIPS_MODULE */
 
 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)
 {
     return int_ctx_new(libctx, NULL, NULL, name, propquery, -1);
 }
 
 EVP_PKEY_CTX *EVP_PKEY_CTX_new_from_pkey(OSSL_LIB_CTX *libctx, EVP_PKEY *pkey,
-                                         const char *propquery)
+    const char *propquery)
 {
     return int_ctx_new(libctx, pkey, NULL, NULL, propquery, -1);
 }
@@ -375,8 +375,7 @@ void evp_pkey_ctx_free_old_ops(EVP_PKEY_CTX *ctx)
         EVP_KEM_free(ctx->op.encap.kem);
         ctx->op.encap.algctx = NULL;
         ctx->op.encap.kem = NULL;
-    }
-    else if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)) {
+    } else if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)) {
         if (ctx->op.ciph.algctx != NULL && ctx->op.ciph.cipher != NULL)
             ctx->op.ciph.cipher->freectx(ctx->op.ciph.algctx);
         EVP_ASYM_CIPHER_free(ctx->op.ciph.cipher);
@@ -414,7 +413,7 @@ void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx)
 #ifndef FIPS_MODULE
 
 void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags,
-                             const EVP_PKEY_METHOD *meth)
+    const EVP_PKEY_METHOD *meth)
 {
     if (ppkey_id)
         *ppkey_id = meth->pkey_id;
@@ -454,13 +453,13 @@ EVP_PKEY_CTX *EVP_PKEY_CTX_dup(const EVP_PKEY_CTX *pctx)
 {
     EVP_PKEY_CTX *rctx;
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
     /* Make sure it's safe to copy a pkey context using an ENGINE */
     if (pctx->engine && !ENGINE_init(pctx->engine)) {
         ERR_raise(ERR_LIB_EVP, ERR_R_ENGINE_LIB);
         return 0;
     }
-# endif
+#endif
     rctx = OPENSSL_zalloc(sizeof(*rctx));
     if (rctx == NULL)
         return NULL;
@@ -480,6 +479,12 @@ EVP_PKEY_CTX *EVP_PKEY_CTX_dup(const EVP_PKEY_CTX *pctx)
     }
     rctx->legacy_keytype = pctx->legacy_keytype;
 
+    if (pctx->keymgmt != NULL) {
+        if (!EVP_KEYMGMT_up_ref(pctx->keymgmt))
+            goto err;
+        rctx->keymgmt = pctx->keymgmt;
+    }
+
     if (EVP_PKEY_CTX_IS_DERIVE_OP(pctx)) {
         if (pctx->op.kex.exchange != NULL) {
             rctx->op.kex.exchange = pctx->op.kex.exchange;
@@ -570,9 +575,9 @@ EVP_PKEY_CTX *EVP_PKEY_CTX_dup(const EVP_PKEY_CTX *pctx)
     }
 
     rctx->pmeth = pctx->pmeth;
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
     rctx->engine = pctx->engine;
-# endif
+#endif
 
     if (pctx->peerkey != NULL && !EVP_PKEY_up_ref(pctx->peerkey))
         goto err;
@@ -584,8 +589,11 @@ EVP_PKEY_CTX *EVP_PKEY_CTX_dup(const EVP_PKEY_CTX *pctx)
             EVP_KEYMGMT *tmp_keymgmt = pctx->keymgmt;
             void *provkey;
 
+            if (pctx->pkey == NULL)
+                return rctx;
+
             provkey = evp_pkey_export_to_provider(pctx->pkey, pctx->libctx,
-                                                  &tmp_keymgmt, pctx->propquery);
+                &tmp_keymgmt, pctx->propquery);
             if (provkey == NULL)
                 goto err;
             if (!EVP_KEYMGMT_up_ref(tmp_keymgmt))
@@ -673,36 +681,32 @@ int EVP_PKEY_CTX_set_params(EVP_PKEY_CTX *ctx, const OSSL_PARAM *params)
         if (EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
             && ctx->op.kex.exchange != NULL
             && ctx->op.kex.exchange->set_ctx_params != NULL)
-            return
-                ctx->op.kex.exchange->set_ctx_params(ctx->op.kex.algctx,
-                                                     params);
+            return ctx->op.kex.exchange->set_ctx_params(ctx->op.kex.algctx,
+                params);
         if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
             && ctx->op.sig.signature != NULL
             && ctx->op.sig.signature->set_ctx_params != NULL)
-            return
-                ctx->op.sig.signature->set_ctx_params(ctx->op.sig.algctx,
-                                                      params);
+            return ctx->op.sig.signature->set_ctx_params(ctx->op.sig.algctx,
+                params);
         if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
             && ctx->op.ciph.cipher != NULL
             && ctx->op.ciph.cipher->set_ctx_params != NULL)
-            return
-                ctx->op.ciph.cipher->set_ctx_params(ctx->op.ciph.algctx,
-                                                    params);
+            return ctx->op.ciph.cipher->set_ctx_params(ctx->op.ciph.algctx,
+                params);
         if (EVP_PKEY_CTX_IS_GEN_OP(ctx)
             && ctx->keymgmt != NULL
             && ctx->keymgmt->gen_set_params != NULL)
-            return
-                evp_keymgmt_gen_set_params(ctx->keymgmt, ctx->op.keymgmt.genctx,
-                                           params);
+            return evp_keymgmt_gen_set_params(ctx->keymgmt, ctx->op.keymgmt.genctx,
+                params);
         if (EVP_PKEY_CTX_IS_KEM_OP(ctx)
             && ctx->op.encap.kem != NULL
             && ctx->op.encap.kem->set_ctx_params != NULL)
-            return
-                ctx->op.encap.kem->set_ctx_params(ctx->op.encap.algctx,
-                                                  params);
+            return ctx->op.encap.kem->set_ctx_params(ctx->op.encap.algctx,
+                params);
         break;
-#ifndef FIPS_MODULE
     case EVP_PKEY_STATE_UNKNOWN:
+        break;
+#ifndef FIPS_MODULE
     case EVP_PKEY_STATE_LEGACY:
         return evp_pkey_ctx_set_params_to_ctrl(ctx, params);
 #endif
@@ -717,36 +721,32 @@ int EVP_PKEY_CTX_get_params(EVP_PKEY_CTX *ctx, OSSL_PARAM *params)
         if (EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
             && ctx->op.kex.exchange != NULL
             && ctx->op.kex.exchange->get_ctx_params != NULL)
-            return
-                ctx->op.kex.exchange->get_ctx_params(ctx->op.kex.algctx,
-                                                     params);
+            return ctx->op.kex.exchange->get_ctx_params(ctx->op.kex.algctx,
+                params);
         if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
             && ctx->op.sig.signature != NULL
             && ctx->op.sig.signature->get_ctx_params != NULL)
-            return
-                ctx->op.sig.signature->get_ctx_params(ctx->op.sig.algctx,
-                                                      params);
+            return ctx->op.sig.signature->get_ctx_params(ctx->op.sig.algctx,
+                params);
         if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
             && ctx->op.ciph.cipher != NULL
             && ctx->op.ciph.cipher->get_ctx_params != NULL)
-            return
-                ctx->op.ciph.cipher->get_ctx_params(ctx->op.ciph.algctx,
-                                                    params);
+            return ctx->op.ciph.cipher->get_ctx_params(ctx->op.ciph.algctx,
+                params);
         if (EVP_PKEY_CTX_IS_KEM_OP(ctx)
             && ctx->op.encap.kem != NULL
             && ctx->op.encap.kem->get_ctx_params != NULL)
-            return
-                ctx->op.encap.kem->get_ctx_params(ctx->op.encap.algctx,
-                                                  params);
+            return ctx->op.encap.kem->get_ctx_params(ctx->op.encap.algctx,
+                params);
         if (EVP_PKEY_CTX_IS_GEN_OP(ctx)
             && ctx->keymgmt != NULL
             && ctx->keymgmt->gen_get_params != NULL)
-            return
-                evp_keymgmt_gen_get_params(ctx->keymgmt, ctx->op.keymgmt.genctx,
-                                           params);
+            return evp_keymgmt_gen_get_params(ctx->keymgmt, ctx->op.keymgmt.genctx,
+                params);
         break;
-#ifndef FIPS_MODULE
     case EVP_PKEY_STATE_UNKNOWN:
+        break;
+#ifndef FIPS_MODULE
     case EVP_PKEY_STATE_LEGACY:
         return evp_pkey_ctx_get_params_to_ctrl(ctx, params);
 #endif
@@ -760,41 +760,41 @@ const OSSL_PARAM *EVP_PKEY_CTX_gettable_params(const EVP_PKEY_CTX *ctx)
     void *provctx;
 
     if (EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
-            && ctx->op.kex.exchange != NULL
-            && ctx->op.kex.exchange->gettable_ctx_params != NULL) {
+        && ctx->op.kex.exchange != NULL
+        && ctx->op.kex.exchange->gettable_ctx_params != NULL) {
         provctx = ossl_provider_ctx(EVP_KEYEXCH_get0_provider(ctx->op.kex.exchange));
         return ctx->op.kex.exchange->gettable_ctx_params(ctx->op.kex.algctx,
-                                                         provctx);
+            provctx);
     }
     if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
-            && ctx->op.sig.signature != NULL
-            && ctx->op.sig.signature->gettable_ctx_params != NULL) {
+        && ctx->op.sig.signature != NULL
+        && ctx->op.sig.signature->gettable_ctx_params != NULL) {
         provctx = ossl_provider_ctx(
-                      EVP_SIGNATURE_get0_provider(ctx->op.sig.signature));
+            EVP_SIGNATURE_get0_provider(ctx->op.sig.signature));
         return ctx->op.sig.signature->gettable_ctx_params(ctx->op.sig.algctx,
-                                                          provctx);
+            provctx);
     }
     if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
-            && ctx->op.ciph.cipher != NULL
-            && ctx->op.ciph.cipher->gettable_ctx_params != NULL) {
+        && ctx->op.ciph.cipher != NULL
+        && ctx->op.ciph.cipher->gettable_ctx_params != NULL) {
         provctx = ossl_provider_ctx(
-                      EVP_ASYM_CIPHER_get0_provider(ctx->op.ciph.cipher));
+            EVP_ASYM_CIPHER_get0_provider(ctx->op.ciph.cipher));
         return ctx->op.ciph.cipher->gettable_ctx_params(ctx->op.ciph.algctx,
-                                                        provctx);
+            provctx);
     }
     if (EVP_PKEY_CTX_IS_KEM_OP(ctx)
         && ctx->op.encap.kem != NULL
         && ctx->op.encap.kem->gettable_ctx_params != NULL) {
         provctx = ossl_provider_ctx(EVP_KEM_get0_provider(ctx->op.encap.kem));
         return ctx->op.encap.kem->gettable_ctx_params(ctx->op.encap.algctx,
-                                                      provctx);
+            provctx);
     }
     if (EVP_PKEY_CTX_IS_GEN_OP(ctx)
-            && ctx->keymgmt != NULL
-            && ctx->keymgmt->gen_gettable_params != NULL) {
+        && ctx->keymgmt != NULL
+        && ctx->keymgmt->gen_gettable_params != NULL) {
         provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(ctx->keymgmt));
         return ctx->keymgmt->gen_gettable_params(ctx->op.keymgmt.genctx,
-                                                 provctx);
+            provctx);
     }
     return NULL;
 }
@@ -804,41 +804,41 @@ const OSSL_PARAM *EVP_PKEY_CTX_settable_params(const EVP_PKEY_CTX *ctx)
     void *provctx;
 
     if (EVP_PKEY_CTX_IS_DERIVE_OP(ctx)
-            && ctx->op.kex.exchange != NULL
-            && ctx->op.kex.exchange->settable_ctx_params != NULL) {
+        && ctx->op.kex.exchange != NULL
+        && ctx->op.kex.exchange->settable_ctx_params != NULL) {
         provctx = ossl_provider_ctx(EVP_KEYEXCH_get0_provider(ctx->op.kex.exchange));
         return ctx->op.kex.exchange->settable_ctx_params(ctx->op.kex.algctx,
-                                                         provctx);
+            provctx);
     }
     if (EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx)
-            && ctx->op.sig.signature != NULL
-            && ctx->op.sig.signature->settable_ctx_params != NULL) {
+        && ctx->op.sig.signature != NULL
+        && ctx->op.sig.signature->settable_ctx_params != NULL) {
         provctx = ossl_provider_ctx(
-                      EVP_SIGNATURE_get0_provider(ctx->op.sig.signature));
+            EVP_SIGNATURE_get0_provider(ctx->op.sig.signature));
         return ctx->op.sig.signature->settable_ctx_params(ctx->op.sig.algctx,
-                                                          provctx);
+            provctx);
     }
     if (EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx)
-            && ctx->op.ciph.cipher != NULL
-            && ctx->op.ciph.cipher->settable_ctx_params != NULL) {
+        && ctx->op.ciph.cipher != NULL
+        && ctx->op.ciph.cipher->settable_ctx_params != NULL) {
         provctx = ossl_provider_ctx(
-                      EVP_ASYM_CIPHER_get0_provider(ctx->op.ciph.cipher));
+            EVP_ASYM_CIPHER_get0_provider(ctx->op.ciph.cipher));
         return ctx->op.ciph.cipher->settable_ctx_params(ctx->op.ciph.algctx,
-                                                        provctx);
+            provctx);
     }
     if (EVP_PKEY_CTX_IS_GEN_OP(ctx)
-            && ctx->keymgmt != NULL
-            && ctx->keymgmt->gen_settable_params != NULL) {
+        && ctx->keymgmt != NULL
+        && ctx->keymgmt->gen_settable_params != NULL) {
         provctx = ossl_provider_ctx(EVP_KEYMGMT_get0_provider(ctx->keymgmt));
         return ctx->keymgmt->gen_settable_params(ctx->op.keymgmt.genctx,
-                                                 provctx);
+            provctx);
     }
     if (EVP_PKEY_CTX_IS_KEM_OP(ctx)
         && ctx->op.encap.kem != NULL
         && ctx->op.encap.kem->settable_ctx_params != NULL) {
         provctx = ossl_provider_ctx(EVP_KEM_get0_provider(ctx->op.encap.kem));
         return ctx->op.encap.kem->settable_ctx_params(ctx->op.encap.algctx,
-                                                      provctx);
+            provctx);
     }
     return NULL;
 }
@@ -920,11 +920,11 @@ int EVP_PKEY_CTX_get_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD **md)
 
     if (ctx->op.sig.algctx == NULL)
         return EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,
-                                 EVP_PKEY_CTRL_GET_MD, 0, (void *)(md));
+            EVP_PKEY_CTRL_GET_MD, 0, (void *)(md));
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_DIGEST,
-                                            name,
-                                            sizeof(name));
+        name,
+        sizeof(name));
     *p = OSSL_PARAM_construct_end();
 
     if (!EVP_PKEY_CTX_get_params(ctx, sig_md_params))
@@ -940,8 +940,8 @@ int EVP_PKEY_CTX_get_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD **md)
 }
 
 static int evp_pkey_ctx_set_md(EVP_PKEY_CTX *ctx, const EVP_MD *md,
-                               int fallback, const char *param, int op,
-                               int ctrl)
+    int fallback, const char *param, int op,
+    int ctrl)
 {
     OSSL_PARAM md_params[2], *p = md_params;
     const char *name;
@@ -962,11 +962,11 @@ static int evp_pkey_ctx_set_md(EVP_PKEY_CTX *ctx, const EVP_MD *md,
     }
 
     *p++ = OSSL_PARAM_construct_utf8_string(param,
-                                            /*
-                                             * Cast away the const. This is read
-                                             * only so should be safe
-                                             */
-                                            (char *)name, 0);
+        /*
+         * Cast away the const. This is read
+         * only so should be safe
+         */
+        (char *)name, 0);
     *p = OSSL_PARAM_construct_end();
 
     return EVP_PKEY_CTX_set_params(ctx, md_params);
@@ -975,21 +975,21 @@ static int evp_pkey_ctx_set_md(EVP_PKEY_CTX *ctx, const EVP_MD *md,
 int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
 {
     return evp_pkey_ctx_set_md(ctx, md, ctx->op.sig.algctx == NULL,
-                               OSSL_SIGNATURE_PARAM_DIGEST,
-                               EVP_PKEY_OP_TYPE_SIG, EVP_PKEY_CTRL_MD);
+        OSSL_SIGNATURE_PARAM_DIGEST,
+        EVP_PKEY_OP_TYPE_SIG, EVP_PKEY_CTRL_MD);
 }
 
 int EVP_PKEY_CTX_set_tls1_prf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
 {
     return evp_pkey_ctx_set_md(ctx, md, ctx->op.kex.algctx == NULL,
-                               OSSL_KDF_PARAM_DIGEST,
-                               EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_TLS_MD);
+        OSSL_KDF_PARAM_DIGEST,
+        EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_TLS_MD);
 }
 
 static int evp_pkey_ctx_set1_octet_string(EVP_PKEY_CTX *ctx, int fallback,
-                                          const char *param, int op, int ctrl,
-                                          const unsigned char *data,
-                                          int datalen)
+    const char *param, int op, int ctrl,
+    const unsigned char *data,
+    int datalen)
 {
     OSSL_PARAM octet_string_params[2], *p = octet_string_params;
 
@@ -1010,21 +1010,21 @@ static int evp_pkey_ctx_set1_octet_string(EVP_PKEY_CTX *ctx, int fallback,
     }
 
     *p++ = OSSL_PARAM_construct_octet_string(param,
-                                            /*
-                                             * Cast away the const. This is read
-                                             * only so should be safe
-                                             */
-                                            (unsigned char *)data,
-                                            (size_t)datalen);
+        /*
+         * Cast away the const. This is read
+         * only so should be safe
+         */
+        (unsigned char *)data,
+        (size_t)datalen);
     *p = OSSL_PARAM_construct_end();
 
     return EVP_PKEY_CTX_set_params(ctx, octet_string_params);
 }
 
 static int evp_pkey_ctx_add1_octet_string(EVP_PKEY_CTX *ctx, int fallback,
-                                          const char *param, int op, int ctrl,
-                                          const unsigned char *data,
-                                          int datalen)
+    const char *param, int op, int ctrl,
+    const unsigned char *data,
+    int datalen)
 {
     OSSL_PARAM os_params[2];
     const OSSL_PARAM *gettables;
@@ -1055,7 +1055,7 @@ static int evp_pkey_ctx_add1_octet_string(EVP_PKEY_CTX *ctx, int fallback,
     gettables = EVP_PKEY_CTX_gettable_params(ctx);
     if (gettables == NULL || OSSL_PARAM_locate_const(gettables, param) == NULL)
         return evp_pkey_ctx_set1_octet_string(ctx, fallback, param, op, ctrl,
-                                              data, datalen);
+            data, datalen);
 
     /* Get the original value length */
     os_params[0] = OSSL_PARAM_construct_octet_string(param, NULL, 0);
@@ -1088,66 +1088,66 @@ static int evp_pkey_ctx_add1_octet_string(EVP_PKEY_CTX *ctx, int fallback,
     memcpy(&info[info_len], data, datalen);
     ret = EVP_PKEY_CTX_set_params(ctx, os_params);
 
- error:
+error:
     OPENSSL_clear_free(info, info_alloc);
     return ret;
 }
 
 int EVP_PKEY_CTX_set1_tls1_prf_secret(EVP_PKEY_CTX *ctx,
-                                      const unsigned char *sec, int seclen)
+    const unsigned char *sec, int seclen)
 {
     return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.algctx == NULL,
-                                          OSSL_KDF_PARAM_SECRET,
-                                          EVP_PKEY_OP_DERIVE,
-                                          EVP_PKEY_CTRL_TLS_SECRET,
-                                          sec, seclen);
+        OSSL_KDF_PARAM_SECRET,
+        EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_TLS_SECRET,
+        sec, seclen);
 }
 
 int EVP_PKEY_CTX_add1_tls1_prf_seed(EVP_PKEY_CTX *ctx,
-                                    const unsigned char *seed, int seedlen)
+    const unsigned char *seed, int seedlen)
 {
     return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.algctx == NULL,
-                                          OSSL_KDF_PARAM_SEED,
-                                          EVP_PKEY_OP_DERIVE,
-                                          EVP_PKEY_CTRL_TLS_SEED,
-                                          seed, seedlen);
+        OSSL_KDF_PARAM_SEED,
+        EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_TLS_SEED,
+        seed, seedlen);
 }
 
 int EVP_PKEY_CTX_set_hkdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
 {
     return evp_pkey_ctx_set_md(ctx, md, ctx->op.kex.algctx == NULL,
-                               OSSL_KDF_PARAM_DIGEST,
-                               EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_HKDF_MD);
+        OSSL_KDF_PARAM_DIGEST,
+        EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_HKDF_MD);
 }
 
 int EVP_PKEY_CTX_set1_hkdf_salt(EVP_PKEY_CTX *ctx,
-                                const unsigned char *salt, int saltlen)
+    const unsigned char *salt, int saltlen)
 {
     return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.algctx == NULL,
-                                          OSSL_KDF_PARAM_SALT,
-                                          EVP_PKEY_OP_DERIVE,
-                                          EVP_PKEY_CTRL_HKDF_SALT,
-                                          salt, saltlen);
+        OSSL_KDF_PARAM_SALT,
+        EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_HKDF_SALT,
+        salt, saltlen);
 }
 
 int EVP_PKEY_CTX_set1_hkdf_key(EVP_PKEY_CTX *ctx,
-                                      const unsigned char *key, int keylen)
+    const unsigned char *key, int keylen)
 {
     return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.algctx == NULL,
-                                          OSSL_KDF_PARAM_KEY,
-                                          EVP_PKEY_OP_DERIVE,
-                                          EVP_PKEY_CTRL_HKDF_KEY,
-                                          key, keylen);
+        OSSL_KDF_PARAM_KEY,
+        EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_HKDF_KEY,
+        key, keylen);
 }
 
 int EVP_PKEY_CTX_add1_hkdf_info(EVP_PKEY_CTX *ctx,
-                                      const unsigned char *info, int infolen)
+    const unsigned char *info, int infolen)
 {
     return evp_pkey_ctx_add1_octet_string(ctx, ctx->op.kex.algctx == NULL,
-                                          OSSL_KDF_PARAM_INFO,
-                                          EVP_PKEY_OP_DERIVE,
-                                          EVP_PKEY_CTRL_HKDF_INFO,
-                                          info, infolen);
+        OSSL_KDF_PARAM_INFO,
+        EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_HKDF_INFO,
+        info, infolen);
 }
 
 int EVP_PKEY_CTX_set_hkdf_mode(EVP_PKEY_CTX *ctx, int mode)
@@ -1163,7 +1163,7 @@ int EVP_PKEY_CTX_set_hkdf_mode(EVP_PKEY_CTX *ctx, int mode)
     /* Code below to be removed when legacy support is dropped. */
     if (ctx->op.kex.algctx == NULL)
         return EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_DERIVE,
-                                 EVP_PKEY_CTRL_HKDF_MODE, mode, NULL);
+            EVP_PKEY_CTRL_HKDF_MODE, mode, NULL);
     /* end of legacy support */
 
     if (mode < 0) {
@@ -1178,27 +1178,27 @@ int EVP_PKEY_CTX_set_hkdf_mode(EVP_PKEY_CTX *ctx, int mode)
 }
 
 int EVP_PKEY_CTX_set1_pbe_pass(EVP_PKEY_CTX *ctx, const char *pass,
-                               int passlen)
+    int passlen)
 {
     return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.algctx == NULL,
-                                          OSSL_KDF_PARAM_PASSWORD,
-                                          EVP_PKEY_OP_DERIVE,
-                                          EVP_PKEY_CTRL_PASS,
-                                          (const unsigned char *)pass, passlen);
+        OSSL_KDF_PARAM_PASSWORD,
+        EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_PASS,
+        (const unsigned char *)pass, passlen);
 }
 
 int EVP_PKEY_CTX_set1_scrypt_salt(EVP_PKEY_CTX *ctx,
-                                  const unsigned char *salt, int saltlen)
+    const unsigned char *salt, int saltlen)
 {
     return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.kex.algctx == NULL,
-                                          OSSL_KDF_PARAM_SALT,
-                                          EVP_PKEY_OP_DERIVE,
-                                          EVP_PKEY_CTRL_SCRYPT_SALT,
-                                          salt, saltlen);
+        OSSL_KDF_PARAM_SALT,
+        EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_SCRYPT_SALT,
+        salt, saltlen);
 }
 
 static int evp_pkey_ctx_set_uint64(EVP_PKEY_CTX *ctx, const char *param,
-                                   int op, int ctrl, uint64_t val)
+    int op, int ctrl, uint64_t val)
 {
     OSSL_PARAM uint64_params[2], *p = uint64_params;
 
@@ -1222,41 +1222,41 @@ static int evp_pkey_ctx_set_uint64(EVP_PKEY_CTX *ctx, const char *param,
 int EVP_PKEY_CTX_set_scrypt_N(EVP_PKEY_CTX *ctx, uint64_t n)
 {
     return evp_pkey_ctx_set_uint64(ctx, OSSL_KDF_PARAM_SCRYPT_N,
-                                   EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_SCRYPT_N,
-                                   n);
+        EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_SCRYPT_N,
+        n);
 }
 
 int EVP_PKEY_CTX_set_scrypt_r(EVP_PKEY_CTX *ctx, uint64_t r)
 {
     return evp_pkey_ctx_set_uint64(ctx, OSSL_KDF_PARAM_SCRYPT_R,
-                                   EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_SCRYPT_R,
-                                   r);
+        EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_SCRYPT_R,
+        r);
 }
 
 int EVP_PKEY_CTX_set_scrypt_p(EVP_PKEY_CTX *ctx, uint64_t p)
 {
     return evp_pkey_ctx_set_uint64(ctx, OSSL_KDF_PARAM_SCRYPT_P,
-                                   EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_SCRYPT_P,
-                                   p);
+        EVP_PKEY_OP_DERIVE, EVP_PKEY_CTRL_SCRYPT_P,
+        p);
 }
 
 int EVP_PKEY_CTX_set_scrypt_maxmem_bytes(EVP_PKEY_CTX *ctx,
-                                         uint64_t maxmem_bytes)
+    uint64_t maxmem_bytes)
 {
     return evp_pkey_ctx_set_uint64(ctx, OSSL_KDF_PARAM_SCRYPT_MAXMEM,
-                                   EVP_PKEY_OP_DERIVE,
-                                   EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES,
-                                   maxmem_bytes);
+        EVP_PKEY_OP_DERIVE,
+        EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES,
+        maxmem_bytes);
 }
 
 int EVP_PKEY_CTX_set_mac_key(EVP_PKEY_CTX *ctx, const unsigned char *key,
-                             int keylen)
+    int keylen)
 {
     return evp_pkey_ctx_set1_octet_string(ctx, ctx->op.keymgmt.genctx == NULL,
-                                          OSSL_PKEY_PARAM_PRIV_KEY,
-                                          EVP_PKEY_OP_KEYGEN,
-                                          EVP_PKEY_CTRL_SET_MAC_KEY,
-                                          key, keylen);
+        OSSL_PKEY_PARAM_PRIV_KEY,
+        EVP_PKEY_OP_KEYGEN,
+        EVP_PKEY_CTRL_SET_MAC_KEY,
+        key, keylen);
 }
 
 int EVP_PKEY_CTX_set_kem_op(EVP_PKEY_CTX *ctx, const char *op)
@@ -1272,7 +1272,7 @@ int EVP_PKEY_CTX_set_kem_op(EVP_PKEY_CTX *ctx, const char *op)
         return -2;
     }
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KEM_PARAM_OPERATION,
-                                            (char *)op, 0);
+        (char *)op, 0);
     *p = OSSL_PARAM_construct_end();
     return EVP_PKEY_CTX_set_params(ctx, params);
 }
@@ -1280,22 +1280,22 @@ int EVP_PKEY_CTX_set_kem_op(EVP_PKEY_CTX *ctx, const char *op)
 int EVP_PKEY_CTX_set1_id(EVP_PKEY_CTX *ctx, const void *id, int len)
 {
     return EVP_PKEY_CTX_ctrl(ctx, -1, -1,
-                             EVP_PKEY_CTRL_SET1_ID, (int)len, (void*)(id));
+        EVP_PKEY_CTRL_SET1_ID, (int)len, (void *)(id));
 }
 
 int EVP_PKEY_CTX_get1_id(EVP_PKEY_CTX *ctx, void *id)
 {
-    return EVP_PKEY_CTX_ctrl(ctx, -1, -1, EVP_PKEY_CTRL_GET1_ID, 0, (void*)id);
+    return EVP_PKEY_CTX_ctrl(ctx, -1, -1, EVP_PKEY_CTRL_GET1_ID, 0, (void *)id);
 }
 
 int EVP_PKEY_CTX_get1_id_len(EVP_PKEY_CTX *ctx, size_t *id_len)
 {
     return EVP_PKEY_CTX_ctrl(ctx, -1, -1,
-                             EVP_PKEY_CTRL_GET1_ID_LEN, 0, (void*)id_len);
+        EVP_PKEY_CTRL_GET1_ID_LEN, 0, (void *)id_len);
 }
 
 static int evp_pkey_ctx_ctrl_int(EVP_PKEY_CTX *ctx, int keytype, int optype,
-                                 int cmd, int p1, void *p2)
+    int cmd, int p1, void *p2)
 {
     int ret = 0;
 
@@ -1338,7 +1338,7 @@ static int evp_pkey_ctx_ctrl_int(EVP_PKEY_CTX *ctx, int keytype, int optype,
 }
 
 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 ret = 0;
 
@@ -1349,7 +1349,7 @@ int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
     /* If unsupported, we don't want that reported here */
     ERR_set_mark();
     ret = evp_pkey_ctx_store_cached_data(ctx, keytype, optype,
-                                         cmd, NULL, p2, p1);
+        cmd, NULL, p2, p1);
     if (ret == -2) {
         ERR_pop_to_mark();
     } else {
@@ -1366,14 +1366,13 @@ int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
 }
 
 int EVP_PKEY_CTX_ctrl_uint64(EVP_PKEY_CTX *ctx, int keytype, int optype,
-                             int cmd, uint64_t value)
+    int cmd, uint64_t value)
 {
     return EVP_PKEY_CTX_ctrl(ctx, keytype, optype, cmd, 0, &value);
 }
 
-
 static int evp_pkey_ctx_ctrl_str_int(EVP_PKEY_CTX *ctx,
-                                     const char *name, const char *value)
+    const char *name, const char *value)
 {
     int ret = 0;
 
@@ -1393,8 +1392,8 @@ static int evp_pkey_ctx_ctrl_str_int(EVP_PKEY_CTX *ctx,
         }
         if (strcmp(name, "digest") == 0)
             ret = EVP_PKEY_CTX_md(ctx,
-                                  EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
-                                  EVP_PKEY_CTRL_MD, value);
+                EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
+                EVP_PKEY_CTRL_MD, value);
         else
             ret = ctx->pmeth->ctrl_str(ctx, name, value);
         break;
@@ -1404,14 +1403,14 @@ static int evp_pkey_ctx_ctrl_str_int(EVP_PKEY_CTX *ctx,
 }
 
 int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx,
-                          const char *name, const char *value)
+    const char *name, const char *value)
 {
     int ret = 0;
 
     /* If unsupported, we don't want that reported here */
     ERR_set_mark();
     ret = evp_pkey_ctx_store_cached_data(ctx, -1, -1, -1,
-                                         name, value, strlen(value) + 1);
+        name, value, strlen(value) + 1);
     if (ret == -2) {
         ERR_pop_to_mark();
     } else {
@@ -1445,9 +1444,9 @@ static int decode_cmd(int cmd, const char *name)
 }
 
 static int evp_pkey_ctx_store_cached_data(EVP_PKEY_CTX *ctx,
-                                          int keytype, int optype,
-                                          int cmd, const char *name,
-                                          const void *data, size_t data_len)
+    int keytype, int optype,
+    int cmd, const char *name,
+    const void *data, size_t data_len)
 {
     /*
      * Check that it's one of the supported commands.  The ctrl commands
@@ -1470,7 +1469,7 @@ static int evp_pkey_ctx_store_cached_data(EVP_PKEY_CTX *ctx,
                 return -2;
             }
             if (!EVP_KEYMGMT_is_a(ctx->keymgmt,
-                                  evp_pkey_type2name(keytype))) {
+                    evp_pkey_type2name(keytype))) {
                 ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_OPERATION);
                 return -1;
             }
@@ -1514,7 +1513,7 @@ static int evp_pkey_ctx_store_cached_data(EVP_PKEY_CTX *ctx,
 }
 
 static void evp_pkey_ctx_free_cached_data(EVP_PKEY_CTX *ctx,
-                                          int cmd, const char *name)
+    int cmd, const char *name)
 {
     cmd = decode_cmd(cmd, name);
     switch (cmd) {
@@ -1545,8 +1544,8 @@ int evp_pkey_ctx_use_cached_data(EVP_PKEY_CTX *ctx)
             ret = evp_pkey_ctx_ctrl_str_int(ctx, name, val);
         else
             ret = evp_pkey_ctx_ctrl_int(ctx, -1, ctx->operation,
-                                        EVP_PKEY_CTRL_SET1_ID,
-                                        (int)len, (void *)val);
+                EVP_PKEY_CTRL_SET1_ID,
+                (int)len, (void *)val);
     }
 
     return ret;
@@ -1665,213 +1664,212 @@ void *EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx)
 }
 
 void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
-                            int (*init) (EVP_PKEY_CTX *ctx))
+    int (*init)(EVP_PKEY_CTX *ctx))
 {
     pmeth->init = init;
 }
 
 void EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth,
-                            int (*copy) (EVP_PKEY_CTX *dst,
-                                         const EVP_PKEY_CTX *src))
+    int (*copy)(EVP_PKEY_CTX *dst,
+        const EVP_PKEY_CTX *src))
 {
     pmeth->copy = copy;
 }
 
 void EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth,
-                               void (*cleanup) (EVP_PKEY_CTX *ctx))
+    void (*cleanup)(EVP_PKEY_CTX *ctx))
 {
     pmeth->cleanup = cleanup;
 }
 
 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))
+    int (*paramgen_init)(EVP_PKEY_CTX *ctx),
+    int (*paramgen)(EVP_PKEY_CTX *ctx,
+        EVP_PKEY *pkey))
 {
     pmeth->paramgen_init = paramgen_init;
     pmeth->paramgen = paramgen;
 }
 
 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))
+    int (*keygen_init)(EVP_PKEY_CTX *ctx),
+    int (*keygen)(EVP_PKEY_CTX *ctx,
+        EVP_PKEY *pkey))
 {
     pmeth->keygen_init = keygen_init;
     pmeth->keygen = keygen;
 }
 
 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))
+    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))
 {
     pmeth->sign_init = sign_init;
     pmeth->sign = sign;
 }
 
 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))
+    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))
 {
     pmeth->verify_init = verify_init;
     pmeth->verify = verify;
 }
 
 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))
+    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))
 {
     pmeth->verify_recover_init = verify_recover_init;
     pmeth->verify_recover = verify_recover;
 }
 
 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))
+    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))
 {
     pmeth->signctx_init = signctx_init;
     pmeth->signctx = signctx;
 }
 
 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))
+    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))
 {
     pmeth->verifyctx_init = verifyctx_init;
     pmeth->verifyctx = verifyctx;
 }
 
 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))
+    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))
 {
     pmeth->encrypt_init = encrypt_init;
     pmeth->encrypt = encryptfn;
 }
 
 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))
+    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))
 {
     pmeth->decrypt_init = decrypt_init;
     pmeth->decrypt = decrypt;
 }
 
 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))
+    int (*derive_init)(EVP_PKEY_CTX *ctx),
+    int (*derive)(EVP_PKEY_CTX *ctx,
+        unsigned char *key,
+        size_t *keylen))
 {
     pmeth->derive_init = derive_init;
     pmeth->derive = derive;
 }
 
 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))
+    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))
 {
     pmeth->ctrl = ctrl;
     pmeth->ctrl_str = ctrl_str;
 }
 
 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))
+    int (*digestsign)(EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
+        const unsigned char *tbs, size_t tbslen))
 {
     pmeth->digestsign = digestsign;
 }
 
 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))
+    int (*digestverify)(EVP_MD_CTX *ctx, const unsigned char *sig,
+        size_t siglen, const unsigned char *tbs,
+        size_t tbslen))
 {
     pmeth->digestverify = digestverify;
 }
 
 void EVP_PKEY_meth_set_check(EVP_PKEY_METHOD *pmeth,
-                             int (*check) (EVP_PKEY *pkey))
+    int (*check)(EVP_PKEY *pkey))
 {
     pmeth->check = check;
 }
 
 void EVP_PKEY_meth_set_public_check(EVP_PKEY_METHOD *pmeth,
-                                    int (*check) (EVP_PKEY *pkey))
+    int (*check)(EVP_PKEY *pkey))
 {
     pmeth->public_check = check;
 }
 
 void EVP_PKEY_meth_set_param_check(EVP_PKEY_METHOD *pmeth,
-                                   int (*check) (EVP_PKEY *pkey))
+    int (*check)(EVP_PKEY *pkey))
 {
     pmeth->param_check = check;
 }
 
 void EVP_PKEY_meth_set_digest_custom(EVP_PKEY_METHOD *pmeth,
-                                     int (*digest_custom) (EVP_PKEY_CTX *ctx,
-                                                           EVP_MD_CTX *mctx))
+    int (*digest_custom)(EVP_PKEY_CTX *ctx,
+        EVP_MD_CTX *mctx))
 {
     pmeth->digest_custom = digest_custom;
 }
 
 void EVP_PKEY_meth_get_init(const EVP_PKEY_METHOD *pmeth,
-                            int (**pinit) (EVP_PKEY_CTX *ctx))
+    int (**pinit)(EVP_PKEY_CTX *ctx))
 {
     *pinit = pmeth->init;
 }
 
 void EVP_PKEY_meth_get_copy(const EVP_PKEY_METHOD *pmeth,
-                            int (**pcopy) (EVP_PKEY_CTX *dst,
-                                           const EVP_PKEY_CTX *src))
+    int (**pcopy)(EVP_PKEY_CTX *dst,
+        const EVP_PKEY_CTX *src))
 {
     *pcopy = pmeth->copy;
 }
 
 void EVP_PKEY_meth_get_cleanup(const EVP_PKEY_METHOD *pmeth,
-                               void (**pcleanup) (EVP_PKEY_CTX *ctx))
+    void (**pcleanup)(EVP_PKEY_CTX *ctx))
 {
     *pcleanup = pmeth->cleanup;
 }
 
 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))
+    int (**pparamgen_init)(EVP_PKEY_CTX *ctx),
+    int (**pparamgen)(EVP_PKEY_CTX *ctx,
+        EVP_PKEY *pkey))
 {
     if (pparamgen_init)
         *pparamgen_init = pmeth->paramgen_init;
@@ -1880,9 +1878,9 @@ void EVP_PKEY_meth_get_paramgen(const EVP_PKEY_METHOD *pmeth,
 }
 
 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))
+    int (**pkeygen_init)(EVP_PKEY_CTX *ctx),
+    int (**pkeygen)(EVP_PKEY_CTX *ctx,
+        EVP_PKEY *pkey))
 {
     if (pkeygen_init)
         *pkeygen_init = pmeth->keygen_init;
@@ -1891,11 +1889,11 @@ void EVP_PKEY_meth_get_keygen(const EVP_PKEY_METHOD *pmeth,
 }
 
 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))
+    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))
 {
     if (psign_init)
         *psign_init = pmeth->sign_init;
@@ -1904,12 +1902,12 @@ void EVP_PKEY_meth_get_sign(const EVP_PKEY_METHOD *pmeth,
 }
 
 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))
+    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))
 {
     if (pverify_init)
         *pverify_init = pmeth->verify_init;
@@ -1918,16 +1916,15 @@ void EVP_PKEY_meth_get_verify(const EVP_PKEY_METHOD *pmeth,
 }
 
 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))
+    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))
 {
     if (pverify_recover_init)
         *pverify_recover_init = pmeth->verify_recover_init;
@@ -1936,12 +1933,12 @@ void EVP_PKEY_meth_get_verify_recover(const EVP_PKEY_METHOD *pmeth,
 }
 
 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))
+    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))
 {
     if (psignctx_init)
         *psignctx_init = pmeth->signctx_init;
@@ -1950,12 +1947,12 @@ void EVP_PKEY_meth_get_signctx(const EVP_PKEY_METHOD *pmeth,
 }
 
 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))
+    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))
 {
     if (pverifyctx_init)
         *pverifyctx_init = pmeth->verifyctx_init;
@@ -1964,12 +1961,12 @@ void EVP_PKEY_meth_get_verifyctx(const EVP_PKEY_METHOD *pmeth,
 }
 
 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))
+    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))
 {
     if (pencrypt_init)
         *pencrypt_init = pmeth->encrypt_init;
@@ -1978,12 +1975,12 @@ void EVP_PKEY_meth_get_encrypt(const EVP_PKEY_METHOD *pmeth,
 }
 
 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))
+    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))
 {
     if (pdecrypt_init)
         *pdecrypt_init = pmeth->decrypt_init;
@@ -1992,10 +1989,10 @@ void EVP_PKEY_meth_get_decrypt(const EVP_PKEY_METHOD *pmeth,
 }
 
 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))
+    int (**pderive_init)(EVP_PKEY_CTX *ctx),
+    int (**pderive)(EVP_PKEY_CTX *ctx,
+        unsigned char *key,
+        size_t *keylen))
 {
     if (pderive_init)
         *pderive_init = pmeth->derive_init;
@@ -2004,11 +2001,11 @@ void EVP_PKEY_meth_get_derive(const EVP_PKEY_METHOD *pmeth,
 }
 
 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))
+    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))
 {
     if (pctrl)
         *pctrl = pmeth->ctrl;
@@ -2017,46 +2014,46 @@ void EVP_PKEY_meth_get_ctrl(const EVP_PKEY_METHOD *pmeth,
 }
 
 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))
+    int (**digestsign)(EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
+        const unsigned char *tbs, size_t tbslen))
 {
     if (digestsign)
         *digestsign = pmeth->digestsign;
 }
 
 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))
+    int (**digestverify)(EVP_MD_CTX *ctx, const unsigned char *sig,
+        size_t siglen, const unsigned char *tbs,
+        size_t tbslen))
 {
     if (digestverify)
         *digestverify = pmeth->digestverify;
 }
 
 void EVP_PKEY_meth_get_check(const EVP_PKEY_METHOD *pmeth,
-                             int (**pcheck) (EVP_PKEY *pkey))
+    int (**pcheck)(EVP_PKEY *pkey))
 {
     if (pcheck != NULL)
         *pcheck = pmeth->check;
 }
 
 void EVP_PKEY_meth_get_public_check(const EVP_PKEY_METHOD *pmeth,
-                                    int (**pcheck) (EVP_PKEY *pkey))
+    int (**pcheck)(EVP_PKEY *pkey))
 {
     if (pcheck != NULL)
         *pcheck = pmeth->public_check;
 }
 
 void EVP_PKEY_meth_get_param_check(const EVP_PKEY_METHOD *pmeth,
-                                   int (**pcheck) (EVP_PKEY *pkey))
+    int (**pcheck)(EVP_PKEY *pkey))
 {
     if (pcheck != NULL)
         *pcheck = pmeth->param_check;
 }
 
 void EVP_PKEY_meth_get_digest_custom(const EVP_PKEY_METHOD *pmeth,
-                                     int (**pdigest_custom) (EVP_PKEY_CTX *ctx,
-                                                             EVP_MD_CTX *mctx))
+    int (**pdigest_custom)(EVP_PKEY_CTX *ctx,
+        EVP_MD_CTX *mctx))
 {
     if (pdigest_custom != NULL)
         *pdigest_custom = pmeth->digest_custom;
diff --git a/crypto/evp/s_lib.c b/crypto/evp/s_lib.c
index f8d132a666f32..23982d962044d 100644
--- a/crypto/evp/s_lib.c
+++ b/crypto/evp/s_lib.c
@@ -19,7 +19,7 @@
 #include "evp_local.h"
 
 int EVP_SKEY_export(const EVP_SKEY *skey, int selection,
-                    OSSL_CALLBACK *export_cb, void *export_cbarg)
+    OSSL_CALLBACK *export_cb, void *export_cbarg)
 {
     if (skey == NULL) {
         ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_NULL_PARAMETER);
@@ -50,7 +50,7 @@ static EVP_SKEY *evp_skey_alloc(EVP_SKEYMGMT *skeymgmt)
     skey->skeymgmt = skeymgmt;
     return skey;
 
- err:
+err:
     CRYPTO_FREE_REF(&skey->references);
     CRYPTO_THREAD_lock_free(skey->lock);
     OPENSSL_free(skey);
@@ -58,8 +58,8 @@ static EVP_SKEY *evp_skey_alloc(EVP_SKEYMGMT *skeymgmt)
 }
 
 static EVP_SKEY *evp_skey_alloc_fetch(OSSL_LIB_CTX *libctx,
-                                      const char *skeymgmtname,
-                                      const char *propquery)
+    const char *skeymgmtname,
+    const char *propquery)
 {
     EVP_SKEYMGMT *skeymgmt;
     EVP_SKEY *skey;
@@ -85,7 +85,7 @@ static EVP_SKEY *evp_skey_alloc_fetch(OSSL_LIB_CTX *libctx,
 }
 
 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 *skey = evp_skey_alloc_fetch(libctx, skeymgmtname, propquery);
 
@@ -98,13 +98,13 @@ EVP_SKEY *EVP_SKEY_import(OSSL_LIB_CTX *libctx, const char *skeymgmtname, const
 
     return skey;
 
- err:
+err:
     EVP_SKEY_free(skey);
     return NULL;
 }
 
 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 *skey = evp_skey_alloc_fetch(libctx, skeymgmtname, propquery);
 
@@ -117,7 +117,7 @@ EVP_SKEY *EVP_SKEY_generate(OSSL_LIB_CTX *libctx, const char *skeymgmtname,
 
     return skey;
 
- err:
+err:
     EVP_SKEY_free(skey);
     return NULL;
 }
@@ -139,7 +139,7 @@ static int get_secret_key(const OSSL_PARAM params[], void *arg)
 }
 
 int EVP_SKEY_get0_raw_key(const EVP_SKEY *skey, const unsigned char **key,
-                          size_t *len)
+    size_t *len)
 {
     struct raw_key_details_st raw_key;
 
@@ -152,22 +152,22 @@ int EVP_SKEY_get0_raw_key(const EVP_SKEY *skey, const unsigned char **key,
     raw_key.len = len;
 
     return evp_skeymgmt_export(skey->skeymgmt, skey->keydata,
-                               OSSL_SKEYMGMT_SELECT_SECRET_KEY,
-                               get_secret_key, &raw_key);
+        OSSL_SKEYMGMT_SELECT_SECRET_KEY,
+        get_secret_key, &raw_key);
 }
 
 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)
 {
     OSSL_PARAM params[2];
 
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_SKEY_PARAM_RAW_BYTES,
-                                                  (void *)key, keylen);
+        (void *)key, keylen);
     params[1] = OSSL_PARAM_construct_end();
 
     return EVP_SKEY_import(libctx, skeymgmtname, propquery,
-                           OSSL_SKEYMGMT_SELECT_SECRET_KEY, params);
+        OSSL_SKEYMGMT_SELECT_SECRET_KEY, params);
 }
 
 int EVP_SKEY_up_ref(EVP_SKEY *skey)
@@ -220,7 +220,6 @@ const char *EVP_SKEY_get0_skeymgmt_name(const EVP_SKEY *skey)
         return NULL;
 
     return skey->skeymgmt->type_name;
-
 }
 
 const char *EVP_SKEY_get0_provider_name(const EVP_SKEY *skey)
@@ -254,7 +253,7 @@ static int transfer_cb(const OSSL_PARAM params[], void *arg)
 }
 
 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)
 {
     struct transfer_cb_ctx ctx = { 0 };
     EVP_SKEYMGMT *skeymgmt = NULL;
@@ -270,11 +269,11 @@ EVP_SKEY *EVP_SKEY_to_provider(EVP_SKEY *skey, OSSL_LIB_CTX *libctx,
             skeymgmt = skey->skeymgmt;
         else
             skeymgmt = evp_skeymgmt_fetch_from_prov(prov, skey->skeymgmt->type_name,
-                                                    propquery);
+                propquery);
     } else {
         /* If no provider, get the default skeymgmt */
         skeymgmt = EVP_SKEYMGMT_fetch(libctx, skey->skeymgmt->type_name,
-                                      propquery);
+            propquery);
     }
     if (skeymgmt == NULL) {
         ERR_raise(ERR_LIB_EVP, ERR_R_FETCH_FAILED);
@@ -307,7 +306,7 @@ EVP_SKEY *EVP_SKEY_to_provider(EVP_SKEY *skey, OSSL_LIB_CTX *libctx,
 
     return ret;
 
- err:
+err:
     EVP_SKEYMGMT_free(skeymgmt);
     EVP_SKEY_free(ret);
     return NULL;
diff --git a/crypto/evp/signature.c b/crypto/evp/signature.c
index e5bb7da255f39..8b57ac67fe7b5 100644
--- a/crypto/evp/signature.c
+++ b/crypto/evp/signature.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -13,7 +13,7 @@
 #include <openssl/core_names.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
-#include "internal/numbers.h"   /* includes SIZE_MAX */
+#include "internal/numbers.h" /* includes SIZE_MAX */
 #include "internal/cryptlib.h"
 #include "internal/provider.h"
 #include "internal/core.h"
@@ -50,11 +50,12 @@ static EVP_SIGNATURE *evp_signature_new(OSSL_PROVIDER *prov)
 }
 
 static void *evp_signature_from_algorithm(int name_id,
-                                          const OSSL_ALGORITHM *algodef,
-                                          OSSL_PROVIDER *prov)
+    const OSSL_ALGORITHM *algodef,
+    OSSL_PROVIDER *prov)
 {
     const OSSL_DISPATCH *fns = algodef->implementation;
     EVP_SIGNATURE *signature = NULL;
+    const char *desc;
     /* Counts newctx / freectx */
     int ctxfncnt = 0;
     /* Counts all init functions  */
@@ -72,6 +73,7 @@ static void *evp_signature_from_algorithm(int name_id,
     if ((signature->type_name = ossl_algorithm_get1_first_name(algodef)) == NULL)
         goto err;
     signature->description = algodef->algorithm_description;
+    desc = signature->description != NULL ? signature->description : "";
 
     for (; fns->function_id != 0; fns++) {
         switch (fns->function_id) {
@@ -290,94 +292,162 @@ static void *evp_signature_from_algorithm(int name_id,
      */
     valid = 1;
     /* Start with the ones where counters say enough */
-    if (ctxfncnt != 2)
-        /* newctx or freectx missing */
+    if (ctxfncnt != 2) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "missing %s newctx or freectx:%s", signature->type_name, desc);
         valid = 0;
+    }
     if (valid
         && ((gparamfncnt != 0 && gparamfncnt != 2)
             || (sparamfncnt != 0 && sparamfncnt != 2)
             || (gmdparamfncnt != 0 && gmdparamfncnt != 2)
-            || (smdparamfncnt != 0 && smdparamfncnt != 2)))
+            || (smdparamfncnt != 0 && smdparamfncnt != 2))) {
         /*
          * Params functions are optional, but if defined, they must
          * be pairwise complete sets, i.e. a getter must have an
          * associated gettable, etc
          */
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "missing %s params getter or setter:%s", signature->type_name, desc);
         valid = 0;
-    if (valid && initfncnt == 0)
-        /* No init functions */
+    }
+    if (valid && initfncnt == 0) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "missing %s init:%s", signature->type_name, desc);
         valid = 0;
+    }
 
     /* Now we check for function combinations */
     if (valid
         && ((signature->sign_init != NULL
-             && signature->sign == NULL)
+                && signature->sign == NULL)
             || (signature->sign_message_init != NULL
                 && signature->sign == NULL
                 && (signature->sign_message_update == NULL
-                    || signature->sign_message_final == NULL))))
-        /* sign_init functions with no signing function?  That's weird */
+                    || signature->sign_message_final == NULL)))) {
+        /* sign_init function(s) with no signing function?  That's weird */
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "missing %s signing function:%s", signature->type_name, desc);
         valid = 0;
+    }
     if (valid
         && (signature->sign != NULL
             || signature->sign_message_update != NULL
             || signature->sign_message_final != NULL)
         && signature->sign_init == NULL
-        && signature->sign_message_init == NULL)
-        /* signing functions with no sign_init? That's odd */
+        && signature->sign_message_init == NULL) {
+        /* signing function(s) with no sign_init? That's odd */
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "missing %s sign_init or sign_message_init:%s", signature->type_name, desc);
         valid = 0;
+    }
 
     if (valid
         && ((signature->verify_init != NULL
-             && signature->verify == NULL)
+                && signature->verify == NULL)
             || (signature->verify_message_init != NULL
                 && signature->verify == NULL
                 && (signature->verify_message_update == NULL
-                    || signature->verify_message_final == NULL))))
-        /* verify_init functions with no verification function?  That's weird */
+                    || signature->verify_message_final == NULL)))) {
+        /* verify_init function(s) with no verification function?  That's weird */
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "missing %s verification function:%s", signature->type_name, desc);
         valid = 0;
+    }
     if (valid
         && (signature->verify != NULL
             || signature->verify_message_update != NULL
             || signature->verify_message_final != NULL)
         && signature->verify_init == NULL
-        && signature->verify_message_init == NULL)
-        /* verification functions with no verify_init? That's odd */
+        && signature->verify_message_init == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "missing %s verify_init or verify_message_init:%s",
+            signature->type_name, desc);
+        /* verification function(s) with no verify_init? That's odd */
         valid = 0;
+    }
 
     if (valid
         && (signature->verify_recover_init != NULL)
-            && (signature->verify_recover == NULL))
-        /* verify_recover_init functions with no verify_recover?  How quaint */
+        && (signature->verify_recover == NULL)) {
+        /* verify_recover_init function with no verify_recover?  How quaint */
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "missing %s verify_recover:%s", signature->type_name, desc);
         valid = 0;
+    }
 
     if (valid
         && (signature->digest_sign_init != NULL
             && signature->digest_sign == NULL
             && (signature->digest_sign_update == NULL
-                || signature->digest_sign_final == NULL)))
-        /*
-         * You can't have a digest_sign_init without *some* performing functions
-         */
+                || signature->digest_sign_final == NULL))) {
+        /* You can't have a digest_sign_init without *some* performing functions */
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "missing %s digest_sign function:%s", signature->type_name, desc);
         valid = 0;
+    }
 
     if (valid
         && ((signature->digest_verify_init != NULL
-             && signature->digest_verify == NULL
-             && (signature->digest_verify_update == NULL
-                 || signature->digest_verify_final == NULL))))
-        /*
-         * You can't have a digest_verify_init without *some* performing functions
-         */
+            && signature->digest_verify == NULL
+            && (signature->digest_verify_update == NULL
+                || signature->digest_verify_final == NULL)))) {
+        /* You can't have a digest_verify_init without *some* performing functions */
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "missing %s digest_verify function:%s", signature->type_name, desc);
         valid = 0;
+    }
+
+    if (!valid)
+        goto err;
+
+    if ((signature->digest_sign != NULL
+            || signature->digest_sign_update != NULL
+            || signature->digest_sign_final != NULL)
+        && signature->digest_sign_init == NULL) {
+        /* digest signing function(s) with no digest_sign_init? That's odd */
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "missing %s digest_sign_init:%s", signature->type_name, desc);
+        goto err;
+    }
 
-    if (!valid) {
-        ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS);
+    if ((signature->digest_verify != NULL
+            || signature->digest_verify_update != NULL
+            || signature->digest_verify_final != NULL)
+        && signature->digest_verify_init == NULL) {
+        /* digest verification function(s) with no digest_verify_init? That's odd */
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "missing %s digest_verify_init:%s", signature->type_name, desc);
+        goto err;
+    }
+
+    if ((signature->sign_message_update == NULL) != (signature->sign_message_final == NULL)) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "only one of %s message signing update and final available:%s",
+            signature->type_name, desc);
+        goto err;
+    }
+    if ((signature->verify_message_update == NULL) != (signature->verify_message_final == NULL)) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "only one of %s message verification update and final available:%s",
+            signature->type_name, desc);
+        goto err;
+    }
+    if ((signature->digest_sign_update == NULL) != (signature->digest_sign_final == NULL)) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "only one of %s digest signing update and final available:%s",
+            signature->type_name, desc);
+        goto err;
+    }
+    if ((signature->digest_verify_update == NULL) != (signature->digest_verify_final == NULL)) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_INVALID_PROVIDER_FUNCTIONS,
+            "only one of %s digest verification update and final available:%s",
+            signature->type_name, desc);
         goto err;
     }
 
     return signature;
- err:
+err:
     EVP_SIGNATURE_free(signature);
     return NULL;
 }
@@ -411,29 +481,29 @@ 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)
 {
     return evp_generic_fetch(ctx, OSSL_OP_SIGNATURE, algorithm, properties,
-                             evp_signature_from_algorithm,
-                             evp_signature_up_ref,
-                             evp_signature_free);
+        evp_signature_from_algorithm,
+        evp_signature_up_ref,
+        evp_signature_free);
 }
 
 EVP_SIGNATURE *evp_signature_fetch_from_prov(OSSL_PROVIDER *prov,
-                                             const char *algorithm,
-                                             const char *properties)
+    const char *algorithm,
+    const char *properties)
 {
     return evp_generic_fetch_from_prov(prov, OSSL_OP_SIGNATURE,
-                                       algorithm, properties,
-                                       evp_signature_from_algorithm,
-                                       evp_signature_up_ref,
-                                       evp_signature_free);
+        algorithm, properties,
+        evp_signature_from_algorithm,
+        evp_signature_up_ref,
+        evp_signature_free);
 }
 
 int EVP_SIGNATURE_is_a(const EVP_SIGNATURE *signature, const char *name)
 {
     return signature != NULL
-           && evp_is_a(signature->prov, signature->name_id, NULL, name);
+        && evp_is_a(signature->prov, signature->name_id, NULL, name);
 }
 
 int evp_signature_get_number(const EVP_SIGNATURE *signature)
@@ -452,21 +522,20 @@ 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 *arg),
-                                   void *arg)
+    void (*fn)(EVP_SIGNATURE *signature,
+        void *arg),
+    void *arg)
 {
     evp_generic_do_all(libctx, OSSL_OP_SIGNATURE,
-                       (void (*)(void *, void *))fn, arg,
-                       evp_signature_from_algorithm,
-                       evp_signature_up_ref,
-                       evp_signature_free);
+        (void (*)(void *, void *))fn, arg,
+        evp_signature_from_algorithm,
+        evp_signature_up_ref,
+        evp_signature_free);
 }
 
-
 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)
 {
     if (signature->prov != NULL)
         return evp_names_do_all(signature->prov, signature->name_id, fn, data);
@@ -497,8 +566,9 @@ const OSSL_PARAM *EVP_SIGNATURE_settable_ctx_params(const EVP_SIGNATURE *sig)
 }
 
 static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
-                                   int operation, const OSSL_PARAM params[])
+    int operation, const OSSL_PARAM params[])
 {
+    const char *desc;
     int ret = 0;
     void *provkey = NULL;
     EVP_KEYMGMT *tmp_keymgmt = NULL;
@@ -538,13 +608,12 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
          * is different from |ctx->pkey|'s keymgmt)
          */
         tmp_prov = EVP_SIGNATURE_get0_provider(signature);
-        tmp_keymgmt_tofree = tmp_keymgmt =
-            evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
-                                        EVP_KEYMGMT_get0_name(ctx->keymgmt),
-                                        ctx->propquery);
+        tmp_keymgmt_tofree = tmp_keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+            EVP_KEYMGMT_get0_name(ctx->keymgmt),
+            ctx->propquery);
         if (tmp_keymgmt != NULL)
             provkey = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
-                                                  &tmp_keymgmt, ctx->propquery);
+                &tmp_keymgmt, ctx->propquery);
         if (tmp_keymgmt == NULL)
             EVP_KEYMGMT_free(tmp_keymgmt_tofree);
 
@@ -557,7 +626,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
          * ensured that the key is at least exported to a provider (above).
          */
         if (signature->query_key_types != NULL) {
-            /* This is expect to be a NULL terminated array */
+            /* This is expected to be a NULL-terminated array */
             const char **keytypes;
 
             keytypes = signature->query_key_types();
@@ -566,7 +635,8 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
                     break;
             if (*keytypes == NULL) {
                 ERR_raise(ERR_LIB_EVP, EVP_R_SIGNATURE_TYPE_AND_KEY_TYPE_INCOMPATIBLE);
-                return -2;
+                ret = -2;
+                goto end;
             }
         } else {
             /*
@@ -584,7 +654,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
             if (!ok) {
                 const char *signame
                     = evp_keymgmt_util_query_operation_name(ctx->keymgmt,
-                                                            OSSL_OP_SIGNATURE);
+                        OSSL_OP_SIGNATURE);
 
                 ok = EVP_SIGNATURE_is_a(signature, signame);
             }
@@ -592,12 +662,13 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
             /* If none of the fallbacks helped, we're lost */
             if (!ok) {
                 ERR_raise(ERR_LIB_EVP, EVP_R_SIGNATURE_TYPE_AND_KEY_TYPE_INCOMPATIBLE);
-                return -2;
+                ret = -2;
+                goto end;
             }
         }
 
         if (!EVP_SIGNATURE_up_ref(signature))
-            return 0;
+            goto err;
     } else {
         /* Without a pre-fetched signature, it must be figured out somehow */
         ERR_set_mark();
@@ -615,14 +686,14 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
          * Try to derive the supported signature from |ctx->keymgmt|.
          */
         if (!ossl_assert(ctx->pkey->keymgmt == NULL
-                         || ctx->pkey->keymgmt == ctx->keymgmt)) {
+                || ctx->pkey->keymgmt == ctx->keymgmt)) {
             ERR_clear_last_mark();
             ERR_raise(ERR_LIB_EVP, ERR_R_INTERNAL_ERROR);
             goto err;
         }
         supported_sig
             = evp_keymgmt_util_query_operation_name(ctx->keymgmt,
-                                                    OSSL_OP_SIGNATURE);
+                OSSL_OP_SIGNATURE);
         if (supported_sig == NULL) {
             ERR_clear_last_mark();
             ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -659,16 +730,14 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
 
             switch (iter) {
             case 1:
-                signature =
-                    EVP_SIGNATURE_fetch(ctx->libctx, supported_sig, ctx->propquery);
+                signature = EVP_SIGNATURE_fetch(ctx->libctx, supported_sig, ctx->propquery);
                 if (signature != NULL)
                     tmp_prov = EVP_SIGNATURE_get0_provider(signature);
                 break;
             case 2:
                 tmp_prov = EVP_KEYMGMT_get0_provider(ctx->keymgmt);
-                signature =
-                    evp_signature_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
-                                                  supported_sig, ctx->propquery);
+                signature = evp_signature_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+                    supported_sig, ctx->propquery);
                 if (signature == NULL)
                     goto legacy;
                 break;
@@ -686,13 +755,12 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
              * is smart enough to only actually export it if |tmp_keymgmt|
              * is different from |ctx->pkey|'s keymgmt)
              */
-            tmp_keymgmt_tofree = tmp_keymgmt =
-                evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
-                                            EVP_KEYMGMT_get0_name(ctx->keymgmt),
-                                            ctx->propquery);
+            tmp_keymgmt_tofree = tmp_keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)tmp_prov,
+                EVP_KEYMGMT_get0_name(ctx->keymgmt),
+                ctx->propquery);
             if (tmp_keymgmt != NULL)
                 provkey = evp_pkey_export_to_provider(ctx->pkey, ctx->libctx,
-                                                      &tmp_keymgmt, ctx->propquery);
+                    &tmp_keymgmt, ctx->propquery);
             if (tmp_keymgmt == NULL)
                 EVP_KEYMGMT_free(tmp_keymgmt_tofree);
         }
@@ -708,8 +776,9 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
     /* No more legacy from here down to legacy: */
 
     ctx->op.sig.signature = signature;
-    ctx->op.sig.algctx =
-        signature->newctx(ossl_provider_ctx(signature->prov), ctx->propquery);
+    desc = signature->description != NULL ? signature->description : "";
+
+    ctx->op.sig.algctx = signature->newctx(ossl_provider_ctx(signature->prov), ctx->propquery);
     if (ctx->op.sig.algctx == NULL) {
         /* The provider key can stay in the cache */
         ERR_raise(ERR_LIB_EVP, EVP_R_INITIALIZATION_ERROR);
@@ -719,7 +788,8 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
     switch (operation) {
     case EVP_PKEY_OP_SIGN:
         if (signature->sign_init == NULL) {
-            ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+            ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+                "%s sign_init:%s", signature->type_name, desc);
             ret = -2;
             goto err;
         }
@@ -727,7 +797,8 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
         break;
     case EVP_PKEY_OP_SIGNMSG:
         if (signature->sign_message_init == NULL) {
-            ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+            ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+                "%s sign_message_init:%s", signature->type_name, desc);
             ret = -2;
             goto err;
         }
@@ -735,7 +806,8 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
         break;
     case EVP_PKEY_OP_VERIFY:
         if (signature->verify_init == NULL) {
-            ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+            ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+                "%s verify_init:%s", signature->type_name, desc);
             ret = -2;
             goto err;
         }
@@ -743,7 +815,8 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
         break;
     case EVP_PKEY_OP_VERIFYMSG:
         if (signature->verify_message_init == NULL) {
-            ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+            ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+                "%s verify_message_init:%s", signature->type_name, desc);
             ret = -2;
             goto err;
         }
@@ -751,7 +824,8 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
         break;
     case EVP_PKEY_OP_VERIFYRECOVER:
         if (signature->verify_recover_init == NULL) {
-            ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+            ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+                "%s verify_recover_init:%s", signature->type_name, desc);
             ret = -2;
             goto err;
         }
@@ -769,7 +843,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
     }
     goto end;
 
- legacy:
+legacy:
     /*
      * If we don't have the full support we need with provided methods,
      * let's go see if legacy does.
@@ -779,10 +853,10 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
     tmp_keymgmt = NULL;
 
     if (ctx->pmeth == NULL
-            || (operation == EVP_PKEY_OP_SIGN && ctx->pmeth->sign == NULL)
-            || (operation == EVP_PKEY_OP_VERIFY && ctx->pmeth->verify == NULL)
-            || (operation == EVP_PKEY_OP_VERIFYRECOVER
-                && ctx->pmeth->verify_recover == NULL)) {
+        || (operation == EVP_PKEY_OP_SIGN && ctx->pmeth->sign == NULL)
+        || (operation == EVP_PKEY_OP_VERIFY && ctx->pmeth->verify == NULL)
+        || (operation == EVP_PKEY_OP_VERIFYRECOVER
+            && ctx->pmeth->verify_recover == NULL)) {
         ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
         return -2;
     }
@@ -809,7 +883,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
     }
     if (ret <= 0)
         goto err;
- end:
+end:
 #ifndef FIPS_MODULE
     if (ret > 0)
         ret = evp_pkey_ctx_use_cached_data(ctx);
@@ -817,7 +891,7 @@ static int evp_pkey_signature_init(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *signature,
 
     EVP_KEYMGMT_free(tmp_keymgmt);
     return ret;
- err:
+err:
     evp_pkey_ctx_free_old_ops(ctx);
     ctx->operation = EVP_PKEY_OP_UNDEFINED;
     EVP_KEYMGMT_free(tmp_keymgmt);
@@ -835,20 +909,24 @@ 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[])
 {
     return evp_pkey_signature_init(ctx, algo, EVP_PKEY_OP_SIGN, params);
 }
 
 int EVP_PKEY_sign_message_init(EVP_PKEY_CTX *ctx,
-                               EVP_SIGNATURE *algo, const OSSL_PARAM params[])
+    EVP_SIGNATURE *algo, const OSSL_PARAM params[])
 {
     return evp_pkey_signature_init(ctx, algo, EVP_PKEY_OP_SIGNMSG, 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)
 {
+    EVP_SIGNATURE *signature;
+    const char *desc;
+    int ret;
+
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_NULL_PARAMETER);
         return -1;
@@ -859,18 +937,28 @@ int EVP_PKEY_sign_message_update(EVP_PKEY_CTX *ctx,
         return -1;
     }
 
-    if (ctx->op.sig.signature->sign_message_update == NULL) {
-        ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+    signature = ctx->op.sig.signature;
+    desc = signature->description != NULL ? signature->description : "";
+    if (signature->sign_message_update == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+            "%s sign_message_update:%s", signature->type_name, desc);
         return -2;
     }
 
-    return ctx->op.sig.signature->sign_message_update(ctx->op.sig.algctx,
-                                                      in, inlen);
+    ret = signature->sign_message_update(ctx->op.sig.algctx, in, inlen);
+    if (ret <= 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+            "%s sign_message_update:%s", signature->type_name, desc);
+    return ret;
 }
 
 int EVP_PKEY_sign_message_final(EVP_PKEY_CTX *ctx,
-                                unsigned char *sig, size_t *siglen)
+    unsigned char *sig, size_t *siglen)
 {
+    EVP_SIGNATURE *signature;
+    const char *desc;
+    int ret;
+
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_NULL_PARAMETER);
         return -1;
@@ -881,20 +969,28 @@ int EVP_PKEY_sign_message_final(EVP_PKEY_CTX *ctx,
         return -1;
     }
 
-    if (ctx->op.sig.signature->sign_message_final == NULL) {
-        ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+    signature = ctx->op.sig.signature;
+    desc = signature->description != NULL ? signature->description : "";
+    if (signature->sign_message_final == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+            "%s sign_message_final:%s", signature->type_name, desc);
         return -2;
     }
 
-    return ctx->op.sig.signature->sign_message_final(ctx->op.sig.algctx,
-                                                     sig, siglen,
-                                                     (sig == NULL) ? 0 : *siglen);
+    ret = signature->sign_message_final(ctx->op.sig.algctx, sig, siglen,
+        (sig == NULL) ? 0 : *siglen);
+    if (ret <= 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+            "%s sign_message_final:%s", signature->type_name, desc);
+    return ret;
 }
 
 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)
 {
+    EVP_SIGNATURE *signature;
+    const char *desc;
     int ret;
 
     if (ctx == NULL) {
@@ -911,24 +1007,28 @@ int EVP_PKEY_sign(EVP_PKEY_CTX *ctx,
     if (ctx->op.sig.algctx == NULL)
         goto legacy;
 
-    if (ctx->op.sig.signature->sign == NULL) {
-        ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+    signature = ctx->op.sig.signature;
+    desc = signature->description != NULL ? signature->description : "";
+    if (signature->sign == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+            "%s sign:%s", signature->type_name, desc);
         return -2;
     }
 
-    ret = ctx->op.sig.signature->sign(ctx->op.sig.algctx, sig, siglen,
-                                      (sig == NULL) ? 0 : *siglen, tbs, tbslen);
-
+    ret = signature->sign(ctx->op.sig.algctx, sig, siglen,
+        (sig == NULL) ? 0 : *siglen, tbs, tbslen);
+    if (ret <= 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+            "%s sign:%s", signature->type_name, desc);
     return ret;
- legacy:
+legacy:
 
     if (ctx->pmeth == NULL || ctx->pmeth->sign == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
         return -2;
     }
 
-    M_check_autoarg(ctx, sig, siglen, EVP_F_EVP_PKEY_SIGN)
-        return ctx->pmeth->sign(ctx, sig, siglen, tbs, tbslen);
+    M_check_autoarg(ctx, sig, siglen, EVP_F_EVP_PKEY_SIGN) return ctx->pmeth->sign(ctx, sig, siglen, tbs, tbslen);
 }
 
 int EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx)
@@ -942,19 +1042,19 @@ 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[])
 {
     return evp_pkey_signature_init(ctx, algo, EVP_PKEY_OP_VERIFY, params);
 }
 
 int EVP_PKEY_verify_message_init(EVP_PKEY_CTX *ctx,
-                                 EVP_SIGNATURE *algo, const OSSL_PARAM params[])
+    EVP_SIGNATURE *algo, const OSSL_PARAM params[])
 {
     return evp_pkey_signature_init(ctx, algo, EVP_PKEY_OP_VERIFYMSG, params);
 }
 
 int EVP_PKEY_CTX_set_signature(EVP_PKEY_CTX *ctx,
-                               const unsigned char *sig, size_t siglen)
+    const unsigned char *sig, size_t siglen)
 {
     OSSL_PARAM sig_params[2], *p = sig_params;
 
@@ -964,19 +1064,23 @@ int EVP_PKEY_CTX_set_signature(EVP_PKEY_CTX *ctx,
     }
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_SIGNATURE,
-                                             /*
-                                              * Cast away the const. This is
-                                              * read only so should be safe
-                                              */
-                                             (char *)sig, siglen);
+        /*
+         * Cast away the const. This is
+         * read only so should be safe
+         */
+        (char *)sig, siglen);
     *p = OSSL_PARAM_construct_end();
 
     return EVP_PKEY_CTX_set_params(ctx, sig_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)
 {
+    EVP_SIGNATURE *signature;
+    const char *desc;
+    int ret;
+
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_NULL_PARAMETER);
         return -1;
@@ -987,17 +1091,27 @@ int EVP_PKEY_verify_message_update(EVP_PKEY_CTX *ctx,
         return -1;
     }
 
-    if (ctx->op.sig.signature->verify_message_update == NULL) {
-        ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+    signature = ctx->op.sig.signature;
+    desc = signature->description != NULL ? signature->description : "";
+    if (signature->verify_message_update == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+            "%s verify_message_update:%s", signature->type_name, desc);
         return -2;
     }
 
-    return ctx->op.sig.signature->verify_message_update(ctx->op.sig.algctx,
-                                                        in, inlen);
+    ret = signature->verify_message_update(ctx->op.sig.algctx, in, inlen);
+    if (ret <= 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+            "%s verify_message_update:%s", signature->type_name, desc);
+    return ret;
 }
 
 int EVP_PKEY_verify_message_final(EVP_PKEY_CTX *ctx)
 {
+    EVP_SIGNATURE *signature;
+    const char *desc;
+    int ret;
+
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_EVP, ERR_R_PASSED_NULL_PARAMETER);
         return -1;
@@ -1008,19 +1122,28 @@ int EVP_PKEY_verify_message_final(EVP_PKEY_CTX *ctx)
         return -1;
     }
 
-    if (ctx->op.sig.signature->verify_message_final == NULL) {
-        ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+    signature = ctx->op.sig.signature;
+    desc = signature->description != NULL ? signature->description : "";
+    if (signature->verify_message_final == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+            "%s verify_message_final:%s", signature->type_name, desc);
         return -2;
     }
 
     /* The signature must have been set with EVP_PKEY_CTX_set_signature() */
-    return ctx->op.sig.signature->verify_message_final(ctx->op.sig.algctx);
+    ret = signature->verify_message_final(ctx->op.sig.algctx);
+    if (ret <= 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+            "%s verify_message_final:%s", signature->type_name, desc);
+    return ret;
 }
 
 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)
 {
+    EVP_SIGNATURE *signature;
+    const char *desc;
     int ret;
 
     if (ctx == NULL) {
@@ -1037,16 +1160,22 @@ int EVP_PKEY_verify(EVP_PKEY_CTX *ctx,
     if (ctx->op.sig.algctx == NULL)
         goto legacy;
 
-    if (ctx->op.sig.signature->verify == NULL) {
-        ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+    signature = ctx->op.sig.signature;
+    desc = signature->description != NULL ? signature->description : "";
+    if (signature->verify == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+            "%s verify:%s", signature->type_name, desc);
         return -2;
     }
 
     ret = ctx->op.sig.signature->verify(ctx->op.sig.algctx, sig, siglen,
-                                        tbs, tbslen);
+        tbs, tbslen);
+    if (ret <= 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+            "%s verify:%s", signature->type_name, desc);
 
     return ret;
- legacy:
+legacy:
     if (ctx->pmeth == NULL || ctx->pmeth->verify == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
         return -2;
@@ -1061,21 +1190,23 @@ 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[])
 {
     return evp_pkey_signature_init(ctx, NULL, EVP_PKEY_OP_VERIFYRECOVER, 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[])
 {
     return evp_pkey_signature_init(ctx, algo, EVP_PKEY_OP_VERIFYRECOVER, 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)
 {
+    EVP_SIGNATURE *signature;
+    const char *desc;
     int ret;
 
     if (ctx == NULL) {
@@ -1091,21 +1222,24 @@ int EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx,
     if (ctx->op.sig.algctx == NULL)
         goto legacy;
 
-    if (ctx->op.sig.signature->verify_recover == NULL) {
-        ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+    signature = ctx->op.sig.signature;
+    desc = signature->description != NULL ? signature->description : "";
+    if (signature->verify_recover == NULL) {
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED,
+            "%s verify_recover:%s", signature->type_name, desc);
         return -2;
     }
 
-    ret = ctx->op.sig.signature->verify_recover(ctx->op.sig.algctx, rout,
-                                                routlen,
-                                                (rout == NULL ? 0 : *routlen),
-                                                sig, siglen);
+    ret = signature->verify_recover(ctx->op.sig.algctx, rout, routlen,
+        (rout == NULL ? 0 : *routlen), sig, siglen);
+    if (ret <= 0)
+        ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_SIGNATURE_FAILURE,
+            "%s verify_recover:%s", signature->type_name, desc);
     return ret;
- legacy:
+legacy:
     if (ctx->pmeth == NULL || ctx->pmeth->verify_recover == NULL) {
         ERR_raise(ERR_LIB_EVP, EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
         return -2;
     }
-    M_check_autoarg(ctx, rout, routlen, EVP_F_EVP_PKEY_VERIFY_RECOVER)
-        return ctx->pmeth->verify_recover(ctx, rout, routlen, sig, siglen);
+    M_check_autoarg(ctx, rout, routlen, EVP_F_EVP_PKEY_VERIFY_RECOVER) return ctx->pmeth->verify_recover(ctx, rout, routlen, sig, siglen);
 }
diff --git a/crypto/evp/skeymgmt_meth.c b/crypto/evp/skeymgmt_meth.c
index 10a320e58a60b..46ea0c5443492 100644
--- a/crypto/evp/skeymgmt_meth.c
+++ b/crypto/evp/skeymgmt_meth.c
@@ -33,7 +33,7 @@ void *evp_skeymgmt_import(const EVP_SKEYMGMT *skeymgmt, int selection, const OSS
 }
 
 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)
 {
     /* This is mandatory, no need to check for its presence */
     return skeymgmt->export(keydata, selection, param_cb, cbarg);
@@ -59,8 +59,8 @@ static void *skeymgmt_new(void)
 }
 
 static void *skeymgmt_from_algorithm(int name_id,
-                                     const OSSL_ALGORITHM *algodef,
-                                     OSSL_PROVIDER *prov)
+    const OSSL_ALGORITHM *algodef,
+    OSSL_PROVIDER *prov)
 {
     const OSSL_DISPATCH *fns = algodef->implementation;
     EVP_SKEYMGMT *skeymgmt = NULL;
@@ -128,24 +128,24 @@ static void *skeymgmt_from_algorithm(int name_id,
 }
 
 EVP_SKEYMGMT *evp_skeymgmt_fetch_from_prov(OSSL_PROVIDER *prov,
-                                           const char *name,
-                                           const char *properties)
+    const char *name,
+    const char *properties)
 {
     return evp_generic_fetch_from_prov(prov,
-                                       OSSL_OP_SKEYMGMT,
-                                       name, properties,
-                                       skeymgmt_from_algorithm,
-                                       (int (*)(void *))EVP_SKEYMGMT_up_ref,
-                                       (void (*)(void *))EVP_SKEYMGMT_free);
+        OSSL_OP_SKEYMGMT,
+        name, properties,
+        skeymgmt_from_algorithm,
+        (int (*)(void *))EVP_SKEYMGMT_up_ref,
+        (void (*)(void *))EVP_SKEYMGMT_free);
 }
 
 EVP_SKEYMGMT *EVP_SKEYMGMT_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                                 const char *properties)
+    const char *properties)
 {
     return evp_generic_fetch(ctx, OSSL_OP_SKEYMGMT, algorithm, properties,
-                             skeymgmt_from_algorithm,
-                             (int (*)(void *))EVP_SKEYMGMT_up_ref,
-                             (void (*)(void *))EVP_SKEYMGMT_free);
+        skeymgmt_from_algorithm,
+        (int (*)(void *))EVP_SKEYMGMT_up_ref,
+        (void (*)(void *))EVP_SKEYMGMT_free);
 }
 
 int EVP_SKEYMGMT_up_ref(EVP_SKEYMGMT *skeymgmt)
@@ -194,19 +194,19 @@ int EVP_SKEYMGMT_is_a(const EVP_SKEYMGMT *skeymgmt, const char *name)
 }
 
 void EVP_SKEYMGMT_do_all_provided(OSSL_LIB_CTX *libctx,
-                                  void (*fn)(EVP_SKEYMGMT *skeymgmt, void *arg),
-                                  void *arg)
+    void (*fn)(EVP_SKEYMGMT *skeymgmt, void *arg),
+    void *arg)
 {
-    evp_generic_do_all(libctx, OSSL_OP_KEYMGMT,
-                       (void (*)(void *, void *))fn, arg,
-                       skeymgmt_from_algorithm,
-                       (int (*)(void *))EVP_SKEYMGMT_up_ref,
-                       (void (*)(void *))EVP_SKEYMGMT_free);
+    evp_generic_do_all(libctx, OSSL_OP_SKEYMGMT,
+        (void (*)(void *, void *))fn, arg,
+        skeymgmt_from_algorithm,
+        (int (*)(void *))EVP_SKEYMGMT_up_ref,
+        (void (*)(void *))EVP_SKEYMGMT_free);
 }
 
 int EVP_SKEYMGMT_names_do_all(const EVP_SKEYMGMT *skeymgmt,
-                              void (*fn)(const char *name, void *data),
-                              void *data)
+    void (*fn)(const char *name, void *data),
+    void *data)
 {
     if (skeymgmt == NULL)
         return 0;
diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 0412f38e9baae..8efe0277b726c 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -29,7 +29,7 @@ int ossl_do_ex_data_init(OSSL_LIB_CTX *ctx)
  * If |read| is 1 then a read lock is obtained. Otherwise it is a write lock.
  */
 static EX_CALLBACKS *get_and_lock(OSSL_EX_DATA_GLOBAL *global, int class_index,
-                                  int read)
+    int read)
 {
     EX_CALLBACKS *ip;
 
@@ -43,7 +43,7 @@ static EX_CALLBACKS *get_and_lock(OSSL_EX_DATA_GLOBAL *global, int class_index,
          * If we get here, someone (who?) cleaned up the lock, so just
          * treat it as an error.
          */
-         return NULL;
+        return NULL;
     }
 
     if (read) {
@@ -88,24 +88,23 @@ void ossl_crypto_cleanup_all_ex_data_int(OSSL_LIB_CTX *ctx)
     global->ex_data_lock = NULL;
 }
 
-
 /*
  * Unregister a new index by replacing the callbacks with no-ops.
  * Any in-use instances are leaked.
  */
 static void dummy_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad, int idx,
-                     long argl, void *argp)
+    long argl, void *argp)
 {
 }
 
 static void dummy_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad, int idx,
-                       long argl, void *argp)
+    long argl, void *argp)
 {
 }
 
 static int dummy_dup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
-                     void **from_d, int idx,
-                     long argl, void *argp)
+    void **from_d, int idx,
+    long argl, void *argp)
 {
     return 1;
 }
@@ -147,11 +146,11 @@ int CRYPTO_free_ex_index(int class_index, int idx)
  * Register a new index.
  */
 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 toret = -1;
     EX_CALLBACK *a;
@@ -196,17 +195,17 @@ int ossl_crypto_get_ex_new_index_ex(OSSL_LIB_CTX *ctx, int class_index,
     toret = sk_EX_CALLBACK_num(ip->meth) - 1;
     (void)sk_EX_CALLBACK_set(ip->meth, toret, a);
 
- err:
+err:
     CRYPTO_THREAD_unlock(global->ex_data_lock);
     return toret;
 }
 
 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)
 {
     return ossl_crypto_get_ex_new_index_ex(NULL, class_index, argl, argp,
-                                           new_func, dup_func, free_func, 0);
+        new_func, dup_func, free_func, 0);
 }
 
 /*
@@ -217,7 +216,7 @@ int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
  * to the global "ex_data" state (ie. class definitions), not 'ad' itself.
  */
 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 mx, i;
     void *ptr;
@@ -253,7 +252,7 @@ int ossl_crypto_new_ex_data_ex(OSSL_LIB_CTX *ctx, int class_index, void *obj,
         if (storage[i] != NULL && storage[i]->new_func != NULL) {
             ptr = CRYPTO_get_ex_data(ad, i);
             storage[i]->new_func(obj, ptr, ad, i,
-                                 storage[i]->argl, storage[i]->argp);
+                storage[i]->argl, storage[i]->argp);
         }
     }
     if (storage != stack)
@@ -271,7 +270,7 @@ int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
  * for each index in the class used by this variable
  */
 int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
-                       const CRYPTO_EX_DATA *from)
+    const CRYPTO_EX_DATA *from)
 {
     int mx, j, i;
     void *ptr;
@@ -327,12 +326,12 @@ int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
         ptr = CRYPTO_get_ex_data(from, i);
         if (storage[i] != NULL && storage[i]->dup_func != NULL)
             if (!storage[i]->dup_func(to, from, &ptr, i,
-                                      storage[i]->argl, storage[i]->argp))
+                    storage[i]->argl, storage[i]->argp))
                 goto err;
         CRYPTO_set_ex_data(to, i, ptr);
     }
     toret = 1;
- err:
+err:
     if (storage != stack)
         OPENSSL_free(storage);
     return toret;
@@ -410,7 +409,7 @@ void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
 
     if (storage != stack)
         OPENSSL_free(storage);
- err:
+err:
     sk_void_free(ad->sk);
     ad->sk = NULL;
     ad->ctx = NULL;
@@ -421,7 +420,7 @@ void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
  * function
  */
 int CRYPTO_alloc_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad,
-                         int idx)
+    int idx)
 {
     void *curval;
 
@@ -434,7 +433,7 @@ int CRYPTO_alloc_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad,
 }
 
 int ossl_crypto_alloc_ex_data_intern(int class_index, void *obj,
-                                     CRYPTO_EX_DATA *ad, int idx)
+    CRYPTO_EX_DATA *ad, int idx)
 {
     EX_CALLBACK *f;
     EX_CALLBACKS *ip;
diff --git a/crypto/ffc/ffc_backend.c b/crypto/ffc/ffc_backend.c
index c12a88148fc81..fa3182bc80a78 100644
--- a/crypto/ffc/ffc_backend.c
+++ b/crypto/ffc/ffc_backend.c
@@ -24,7 +24,7 @@ int ossl_ffc_params_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[])
     BIGNUM *p = NULL, *q = NULL, *g = NULL, *j = NULL;
     int i;
 
-    prm  = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_GROUP_NAME);
+    prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_GROUP_NAME);
     if (prm != NULL) {
         /*
          * In a no-dh build we just go straight to err because we have no
@@ -54,7 +54,7 @@ int ossl_ffc_params_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[])
     if (prm != NULL) {
         if (!OSSL_PARAM_get_int(prm, &i))
             goto err;
-        ffc->gindex =  i;
+        ffc->gindex = i;
     }
     prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_PCOUNTER);
     if (prm != NULL) {
@@ -69,27 +69,27 @@ int ossl_ffc_params_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[])
     if (prm != NULL) {
         if (!OSSL_PARAM_get_int(prm, &i))
             goto err;
-        ffc->h =  i;
+        ffc->h = i;
     }
-    prm  = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_SEED);
+    prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_SEED);
     if (prm != NULL) {
         if (prm->data_type != OSSL_PARAM_OCTET_STRING
             || !ossl_ffc_params_set_seed(ffc, prm->data, prm->data_size))
             goto err;
     }
-    prm  = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_VALIDATE_PQ);
+    prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_VALIDATE_PQ);
     if (prm != NULL) {
         if (!OSSL_PARAM_get_int(prm, &i))
             goto err;
         ossl_ffc_params_enable_flags(ffc, FFC_PARAM_FLAG_VALIDATE_PQ, i);
     }
-    prm  = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_VALIDATE_G);
+    prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_VALIDATE_G);
     if (prm != NULL) {
         if (!OSSL_PARAM_get_int(prm, &i))
             goto err;
         ossl_ffc_params_enable_flags(ffc, FFC_PARAM_FLAG_VALIDATE_G, i);
     }
-    prm  = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_VALIDATE_LEGACY);
+    prm = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_VALIDATE_LEGACY);
     if (prm != NULL) {
         if (!OSSL_PARAM_get_int(prm, &i))
             goto err;
@@ -115,7 +115,7 @@ int ossl_ffc_params_fromdata(FFC_PARAMS *ffc, const OSSL_PARAM params[])
     ossl_ffc_params_set0_j(ffc, j);
     return 1;
 
- err:
+err:
     BN_free(j);
     BN_free(p);
     BN_free(q);
diff --git a/crypto/ffc/ffc_dh.c b/crypto/ffc/ffc_dh.c
index df07e173bcb8c..e4077e5e52462 100644
--- a/crypto/ffc/ffc_dh.c
+++ b/crypto/ffc/ffc_dh.c
@@ -13,35 +13,37 @@
 
 #ifndef OPENSSL_NO_DH
 
-# define FFDHE(sz, keylength) {                                             \
-        SN_ffdhe##sz, NID_ffdhe##sz,                                        \
-        sz,                                                                 \
-        keylength,                                                          \
-        &ossl_bignum_ffdhe##sz##_p, &ossl_bignum_ffdhe##sz##_q,             \
-        &ossl_bignum_const_2,                                               \
-    }
+#define FFDHE(sz, keylength) {  \
+    SN_ffdhe##sz,               \
+    NID_ffdhe##sz,              \
+    sz,                         \
+    keylength,                  \
+    &ossl_bignum_ffdhe##sz##_p, \
+    &ossl_bignum_ffdhe##sz##_q, \
+    &ossl_bignum_const_2,       \
+}
 
-# define MODP(sz, keylength)  {                                             \
-        SN_modp_##sz, NID_modp_##sz,                                        \
-        sz,                                                                 \
-        keylength,                                                          \
-        &ossl_bignum_modp_##sz##_p, &ossl_bignum_modp_##sz##_q,             \
-        &ossl_bignum_const_2                                                \
-    }
+#define MODP(sz, keylength) {                               \
+    SN_modp_##sz, NID_modp_##sz,                            \
+    sz,                                                     \
+    keylength,                                              \
+    &ossl_bignum_modp_##sz##_p, &ossl_bignum_modp_##sz##_q, \
+    &ossl_bignum_const_2                                    \
+}
 
-# define RFC5114(name, uid, sz, tag) {                                      \
-        name, uid,                                                          \
-        sz,                                                                 \
-        0,                                                                  \
-        &ossl_bignum_dh##tag##_p, &ossl_bignum_dh##tag##_q,                 \
-        &ossl_bignum_dh##tag##_g                                            \
-    }
+#define RFC5114(name, uid, sz, tag) {                   \
+    name, uid,                                          \
+    sz,                                                 \
+    0,                                                  \
+    &ossl_bignum_dh##tag##_p, &ossl_bignum_dh##tag##_q, \
+    &ossl_bignum_dh##tag##_g                            \
+}
 
 #else
 
-# define FFDHE(sz, keylength)           { SN_ffdhe##sz, NID_ffdhe##sz }
-# define MODP(sz, keylength)            { SN_modp_##sz, NID_modp_##sz }
-# define RFC5114(name, uid, sz, tag)    { name, uid }
+#define FFDHE(sz, keylength) { SN_ffdhe##sz, NID_ffdhe##sz }
+#define MODP(sz, keylength) { SN_modp_##sz, NID_modp_##sz }
+#define RFC5114(name, uid, sz, tag) { name, uid }
 
 #endif
 
@@ -76,10 +78,10 @@ static const DH_NAMED_GROUP dh_named_groups[] = {
     MODP(4096, 325),
     MODP(6144, 375),
     MODP(8192, 400),
-    /*
-     * Additional dh named groups from RFC 5114 that have a different g.
-     * The uid can be any unique identifier.
-     */
+/*
+ * Additional dh named groups from RFC 5114 that have a different g.
+ * The uid can be any unique identifier.
+ */
 #ifndef FIPS_MODULE
     RFC5114("dh_1024_160", 1, 1024, 1024_160),
     RFC5114("dh_2048_224", 2, 2048, 2048_224),
@@ -111,8 +113,8 @@ 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)
 {
     size_t i;
 
@@ -163,7 +165,7 @@ int ossl_ffc_named_group_set(FFC_PARAMS *ffc, const DH_NAMED_GROUP *group)
         return 0;
 
     ossl_ffc_params_set0_pqg(ffc, (BIGNUM *)group->p, (BIGNUM *)group->q,
-                             (BIGNUM *)group->g);
+        (BIGNUM *)group->g);
     ffc->keylength = group->keylength;
 
     /* flush the cached nid, The DH layer is responsible for caching */
diff --git a/crypto/ffc/ffc_key_generate.c b/crypto/ffc/ffc_key_generate.c
index cb895f2abd532..1625a272aa3e2 100644
--- a/crypto/ffc/ffc_key_generate.c
+++ b/crypto/ffc/ffc_key_generate.c
@@ -20,7 +20,7 @@
  * priv_key is the returned private key,
  */
 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 ret = 0, qbits = BN_num_bits(params->q);
     BIGNUM *m, *two_powN = NULL;
diff --git a/crypto/ffc/ffc_key_validate.c b/crypto/ffc/ffc_key_validate.c
index a4a2a58e9a7fd..9b48c74ffce94 100644
--- a/crypto/ffc/ffc_key_validate.c
+++ b/crypto/ffc/ffc_key_validate.c
@@ -17,7 +17,7 @@
  * ret contains 0 on success, or error flags (see FFC_ERROR_PUBKEY_TOO_SMALL)
  */
 int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params,
-                                         const BIGNUM *pub_key, int *ret)
+    const BIGNUM *pub_key, int *ret)
 {
     int ok = 0;
     BIGNUM *tmp = NULL;
@@ -48,7 +48,7 @@ int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params,
     if (BN_cmp(pub_key, tmp) >= 0)
         *ret |= FFC_ERROR_PUBKEY_TOO_LARGE;
     ok = 1;
- err:
+err:
     if (ctx != NULL) {
         BN_CTX_end(ctx);
         BN_CTX_free(ctx);
@@ -60,7 +60,7 @@ int ossl_ffc_validate_public_key_partial(const FFC_PARAMS *params,
  * See SP800-56Ar3 Section 5.6.2.3.1 : FFC Full public key validation.
  */
 int ossl_ffc_validate_public_key(const FFC_PARAMS *params,
-                                 const BIGNUM *pub_key, int *ret)
+    const BIGNUM *pub_key, int *ret)
 {
     int ok = 0;
     BIGNUM *tmp = NULL;
@@ -85,7 +85,7 @@ int ossl_ffc_validate_public_key(const FFC_PARAMS *params,
     }
 
     ok = 1;
- err:
+err:
     if (ctx != NULL) {
         BN_CTX_end(ctx);
         BN_CTX_free(ctx);
@@ -100,7 +100,7 @@ int ossl_ffc_validate_public_key(const FFC_PARAMS *params,
  * Note: This assumes that the domain parameters are valid.
  */
 int ossl_ffc_validate_private_key(const BIGNUM *upper, const BIGNUM *priv,
-                                  int *ret)
+    int *ret)
 {
     int ok = 0;
 
diff --git a/crypto/ffc/ffc_params.c b/crypto/ffc/ffc_params.c
index 4101682a9a6d4..9815360a4e8c0 100644
--- a/crypto/ffc/ffc_params.c
+++ b/crypto/ffc/ffc_params.c
@@ -14,7 +14,7 @@
 #include "internal/nelem.h"
 
 #ifndef FIPS_MODULE
-# include <openssl/asn1.h> /* ossl_ffc_params_print */
+#include <openssl/asn1.h> /* ossl_ffc_params_print */
 #endif
 
 void ossl_ffc_params_init(FFC_PARAMS *params)
@@ -60,7 +60,7 @@ void ossl_ffc_params_set0_pqg(FFC_PARAMS *d, BIGNUM *p, BIGNUM *q, BIGNUM *g)
 }
 
 void ossl_ffc_params_get0_pqg(const FFC_PARAMS *d, const BIGNUM **p,
-                              const BIGNUM **q, const BIGNUM **g)
+    const BIGNUM **q, const BIGNUM **g)
 {
     if (p != NULL)
         *p = d->p;
@@ -70,7 +70,6 @@ void ossl_ffc_params_get0_pqg(const FFC_PARAMS *d, const BIGNUM **p,
         *g = d->g;
 }
 
-
 /* j is the 'cofactor' that is optionally output for ASN1. */
 void ossl_ffc_params_set0_j(FFC_PARAMS *d, BIGNUM *j)
 {
@@ -81,7 +80,7 @@ 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)
 {
     if (params->seed != NULL) {
         if (params->seed == seed)
@@ -122,7 +121,7 @@ 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)
 {
     if (enable)
         params->flags |= flags;
@@ -137,8 +136,8 @@ 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)
 {
     if (!ossl_ffc_params_set_seed(params, seed, seedlen))
         return 0;
@@ -147,8 +146,8 @@ int ossl_ffc_params_set_validate_params(FFC_PARAMS *params,
 }
 
 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)
 {
     if (seed != NULL)
         *seed = params->seed;
@@ -169,7 +168,7 @@ static int ffc_bn_cpy(BIGNUM **dst, const BIGNUM *src)
     if (src == NULL)
         a = NULL;
     else if (BN_get_flags(src, BN_FLG_STATIC_DATA)
-             && !BN_get_flags(src, BN_FLG_MALLOCED))
+        && !BN_get_flags(src, BN_FLG_MALLOCED))
         a = (BIGNUM *)src;
     else if ((a = BN_dup(src)) == NULL)
         return 0;
@@ -192,7 +191,7 @@ int ossl_ffc_params_copy(FFC_PARAMS *dst, const FFC_PARAMS *src)
     dst->seedlen = src->seedlen;
     if (src->seed != NULL) {
         dst->seed = OPENSSL_memdup(src->seed, src->seedlen);
-        if  (dst->seed == NULL)
+        if (dst->seed == NULL)
             return 0;
     } else {
         dst->seed = NULL;
@@ -209,12 +208,12 @@ 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)
 {
     return BN_cmp(a->p, b->p) == 0
-           && BN_cmp(a->g, b->g) == 0
-           && (ignore_q || BN_cmp(a->q, b->q) == 0); /* Note: q may be NULL */
+        && BN_cmp(a->g, b->g) == 0
+        && (ignore_q || BN_cmp(a->q, b->q) == 0); /* Note: q may be NULL */
 }
 
 int ossl_ffc_params_todata(const FFC_PARAMS *ffc, OSSL_PARAM_BLD *bld,
-                      OSSL_PARAM params[])
+    OSSL_PARAM params[])
 {
     int test_flags;
 
@@ -229,20 +228,20 @@ int ossl_ffc_params_todata(const FFC_PARAMS *ffc, OSSL_PARAM_BLD *bld,
         return 0;
     if (ffc->j != NULL
         && !ossl_param_build_set_bn(bld, params, OSSL_PKEY_PARAM_FFC_COFACTOR,
-                                    ffc->j))
+            ffc->j))
         return 0;
     if (!ossl_param_build_set_int(bld, params, OSSL_PKEY_PARAM_FFC_GINDEX,
-                                  ffc->gindex))
+            ffc->gindex))
         return 0;
     if (!ossl_param_build_set_int(bld, params, OSSL_PKEY_PARAM_FFC_PCOUNTER,
-                                  ffc->pcounter))
+            ffc->pcounter))
         return 0;
     if (!ossl_param_build_set_int(bld, params, OSSL_PKEY_PARAM_FFC_H, ffc->h))
         return 0;
     if (ffc->seed != NULL
         && !ossl_param_build_set_octet_string(bld, params,
-                                              OSSL_PKEY_PARAM_FFC_SEED,
-                                              ffc->seed, ffc->seedlen))
+            OSSL_PKEY_PARAM_FFC_SEED,
+            ffc->seed, ffc->seedlen))
         return 0;
     if (ffc->nid != NID_undef) {
         const DH_NAMED_GROUP *group = ossl_ffc_uid_to_dh_named_group(ffc->nid);
@@ -250,33 +249,33 @@ int ossl_ffc_params_todata(const FFC_PARAMS *ffc, OSSL_PARAM_BLD *bld,
 
         if (name == NULL
             || !ossl_param_build_set_utf8_string(bld, params,
-                                                 OSSL_PKEY_PARAM_GROUP_NAME,
-                                                 name))
+                OSSL_PKEY_PARAM_GROUP_NAME,
+                name))
             return 0;
     }
     test_flags = ((ffc->flags & FFC_PARAM_FLAG_VALIDATE_PQ) != 0);
     if (!ossl_param_build_set_int(bld, params,
-                                  OSSL_PKEY_PARAM_FFC_VALIDATE_PQ, test_flags))
+            OSSL_PKEY_PARAM_FFC_VALIDATE_PQ, test_flags))
         return 0;
     test_flags = ((ffc->flags & FFC_PARAM_FLAG_VALIDATE_G) != 0);
     if (!ossl_param_build_set_int(bld, params,
-                                  OSSL_PKEY_PARAM_FFC_VALIDATE_G, test_flags))
+            OSSL_PKEY_PARAM_FFC_VALIDATE_G, test_flags))
         return 0;
     test_flags = ((ffc->flags & FFC_PARAM_FLAG_VALIDATE_LEGACY) != 0);
     if (!ossl_param_build_set_int(bld, params,
-                                  OSSL_PKEY_PARAM_FFC_VALIDATE_LEGACY,
-                                  test_flags))
+            OSSL_PKEY_PARAM_FFC_VALIDATE_LEGACY,
+            test_flags))
         return 0;
 
     if (ffc->mdname != NULL
         && !ossl_param_build_set_utf8_string(bld, params,
-                                             OSSL_PKEY_PARAM_FFC_DIGEST,
-                                             ffc->mdname))
-       return 0;
+            OSSL_PKEY_PARAM_FFC_DIGEST,
+            ffc->mdname))
+        return 0;
     if (ffc->mdprops != NULL
         && !ossl_param_build_set_utf8_string(bld, params,
-                                             OSSL_PKEY_PARAM_FFC_DIGEST_PROPS,
-                                             ffc->mdprops))
+            OSSL_PKEY_PARAM_FFC_DIGEST_PROPS,
+            ffc->mdprops))
         return 0;
     return 1;
 }
@@ -307,7 +306,8 @@ int ossl_ffc_params_print(BIO *bp, const FFC_PARAMS *ffc, int indent)
                     goto err;
             }
             if (BIO_printf(bp, "%02x%s", ffc->seed[i],
-                           ((i + 1) == ffc->seedlen) ? "" : ":") <= 0)
+                    ((i + 1) == ffc->seedlen) ? "" : ":")
+                <= 0)
                 goto err;
         }
         if (BIO_write(bp, "\n", 1) <= 0)
diff --git a/crypto/ffc/ffc_params_generate.c b/crypto/ffc/ffc_params_generate.c
index f6dc57fc99804..969cca76f999b 100644
--- a/crypto/ffc/ffc_params_generate.c
+++ b/crypto/ffc/ffc_params_generate.c
@@ -45,9 +45,9 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify)
         /* Valid DH L,N parameters from SP800-56Ar3 5.5.1 Table 1 */
         if (L == 2048 && (N == 224 || N == 256))
             return 112;
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
         ERR_raise(ERR_LIB_DH, DH_R_BAD_FFC_PARAMETERS);
-# endif
+#endif
     } else if (type == FFC_PARAM_TYPE_DSA) {
         /* Valid DSA L,N parameters from FIPS 186-4 Section 4.2 */
         /* In fips mode 1024/160 can only be used for verification */
@@ -57,9 +57,9 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify)
             return 112;
         if (L == 3072 && N == 256)
             return 128;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
         ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS);
-# endif
+#endif
     }
     return 0;
 }
@@ -73,9 +73,9 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify)
         /* Valid DH L,N parameters from SP800-56Ar3 5.5.1 Table 1 */
         if (L == 2048 && (N == 224 || N == 256))
             return 112;
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
         ERR_raise(ERR_LIB_DH, DH_R_BAD_FFC_PARAMETERS);
-# endif
+#endif
     } else if (type == FFC_PARAM_TYPE_DSA) {
         if (L >= 3072 && N >= 256)
             return 128;
@@ -83,9 +83,9 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify)
             return 112;
         if (L >= 1024 && N >= 160)
             return 80;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
         ERR_raise(ERR_LIB_DSA, DSA_R_BAD_FFC_PARAMETERS);
-# endif
+#endif
     }
     return 0;
 }
@@ -93,9 +93,9 @@ static int ffc_validate_LN(size_t L, size_t N, int type, int verify)
 
 /* FIPS186-4 A.2.1 Unverifiable Generation of Generator g */
 static int generate_unverifiable_g(BN_CTX *ctx, BN_MONT_CTX *mont, BIGNUM *g,
-                                   BIGNUM *hbn, const BIGNUM *p,
-                                   const BIGNUM *e,const BIGNUM *pm1,
-                                   int *hret)
+    BIGNUM *hbn, const BIGNUM *p,
+    const BIGNUM *e, const BIGNUM *pm1,
+    int *hret)
 {
     int h = 2;
 
@@ -130,9 +130,9 @@ static int generate_unverifiable_g(BN_CTX *ctx, BN_MONT_CTX *mont, BIGNUM *g,
  * Returns a value in g.
  */
 static int generate_canonical_g(BN_CTX *ctx, BN_MONT_CTX *mont,
-                                const EVP_MD *evpmd, BIGNUM *g, BIGNUM *tmp,
-                                const BIGNUM *p, const BIGNUM *e,
-                                int gindex, unsigned char *seed, size_t seedlen)
+    const EVP_MD *evpmd, BIGNUM *g, BIGNUM *tmp,
+    const BIGNUM *p, const BIGNUM *e,
+    int gindex, unsigned char *seed, size_t seedlen)
 {
     int ret = 0;
     int counter = 1;
@@ -148,11 +148,11 @@ static int generate_canonical_g(BN_CTX *ctx, BN_MONT_CTX *mont,
     if (mctx == NULL)
         return 0;
 
-   /*
-    * A.2.3 Step (4) & (5)
-    * A.2.4 Step (6) & (7)
-    * counter = 0; counter += 1
-    */
+    /*
+     * A.2.3 Step (4) & (5)
+     * A.2.4 Step (6) & (7)
+     * counter = 0; counter += 1
+     */
     for (counter = 1; counter <= 0xFFFF; ++counter) {
         /*
          * A.2.3 Step (7) & (8) & (9)
@@ -166,13 +166,13 @@ static int generate_canonical_g(BN_CTX *ctx, BN_MONT_CTX *mont,
         md[1] = (unsigned char)((counter >> 8) & 0xff);
         md[2] = (unsigned char)(counter & 0xff);
         if (!EVP_DigestInit_ex(mctx, evpmd, NULL)
-                || !EVP_DigestUpdate(mctx, seed, seedlen)
-                || !EVP_DigestUpdate(mctx, ggen, sizeof(ggen))
-                || !EVP_DigestUpdate(mctx, md, 3)
-                || !EVP_DigestFinal_ex(mctx, md, NULL)
-                || (BN_bin2bn(md, mdsize, tmp) == NULL)
-                || !BN_mod_exp_mont(g, tmp, e, p, ctx, mont))
-                    break; /* exit on failure */
+            || !EVP_DigestUpdate(mctx, seed, seedlen)
+            || !EVP_DigestUpdate(mctx, ggen, sizeof(ggen))
+            || !EVP_DigestUpdate(mctx, md, 3)
+            || !EVP_DigestFinal_ex(mctx, md, NULL)
+            || (BN_bin2bn(md, mdsize, tmp) == NULL)
+            || !BN_mod_exp_mont(g, tmp, e, p, ctx, mont))
+            break; /* exit on failure */
         /*
          * A.2.3 Step (10)
          * A.2.4 Step (12)
@@ -189,9 +189,9 @@ static int generate_canonical_g(BN_CTX *ctx, BN_MONT_CTX *mont,
 
 /* Generation of p is the same for FIPS 186-4 & FIPS 186-2 */
 static int generate_p(BN_CTX *ctx, const EVP_MD *evpmd, int max_counter, int n,
-                      unsigned char *buf, size_t buf_len, const BIGNUM *q,
-                      BIGNUM *p, int L, BN_GENCB *cb, int *counter,
-                      int *res)
+    unsigned char *buf, size_t buf_len, const BIGNUM *q,
+    BIGNUM *p, int L, BN_GENCB *cb, int *counter,
+    int *res)
 {
     int ret = -1;
     int i, j, k, r;
@@ -242,14 +242,14 @@ static int generate_p(BN_CTX *ctx, const EVP_MD *evpmd, int max_counter, int n,
              * tmp = V(j) = Hash((seed + offset + j) % 2^seedlen)
              */
             if (!EVP_Digest(buf, buf_len, md, NULL, evpmd, NULL)
-                    || (BN_bin2bn(md, mdsize, tmp) == NULL)
-                    /*
-                     * A.1.1.2 Step (11.2)
-                     * A.1.1.3 Step (13.2)
-                     * W += V(j) * 2^(outlen * j)
-                     */
-                    || !BN_lshift(tmp, tmp, (mdsize << 3) * j)
-                    || !BN_add(W, W, tmp))
+                || (BN_bin2bn(md, mdsize, tmp) == NULL)
+                /*
+                 * A.1.1.2 Step (11.2)
+                 * A.1.1.3 Step (13.2)
+                 * W += V(j) * 2^(outlen * j)
+                 */
+                || !BN_lshift(tmp, tmp, (mdsize << 3) * j)
+                || !BN_add(W, W, tmp))
                 goto err;
         }
 
@@ -259,22 +259,22 @@ static int generate_p(BN_CTX *ctx, const EVP_MD *evpmd, int max_counter, int n,
          * X = W + 2^(L-1) where W < 2^(L-1)
          */
         if (!BN_mask_bits(W, L - 1)
-                || !BN_copy(X, W)
-                || !BN_add(X, X, test)
-                /*
-                 * A.1.1.2 Step (11.4) AND
-                 * A.1.1.3 Step (13.4)
-                 * c = X mod 2q
-                 */
-                || !BN_lshift1(tmp, q)
-                || !BN_mod(c, X, tmp, ctx)
-                /*
-                 * A.1.1.2 Step (11.5) AND
-                 * A.1.1.3 Step (13.5)
-                 * p = X - (c - 1)
-                 */
-                || !BN_sub(tmp, c, BN_value_one())
-                || !BN_sub(p, X, tmp))
+            || !BN_copy(X, W)
+            || !BN_add(X, X, test)
+            /*
+             * A.1.1.2 Step (11.4) AND
+             * A.1.1.3 Step (13.4)
+             * c = X mod 2q
+             */
+            || !BN_lshift1(tmp, q)
+            || !BN_mod(c, X, tmp, ctx)
+            /*
+             * A.1.1.2 Step (11.5) AND
+             * A.1.1.3 Step (13.5)
+             * p = X - (c - 1)
+             */
+            || !BN_sub(tmp, c, BN_value_one())
+            || !BN_sub(p, X, tmp))
             goto err;
 
         /*
@@ -294,7 +294,7 @@ static int generate_p(BN_CTX *ctx, const EVP_MD *evpmd, int max_counter, int n,
             /* A.1.1.2 Step (11.8) : Return if p is prime */
             if (r > 0) {
                 *counter = i;
-                ret = 1;   /* return success */
+                ret = 1; /* return success */
                 goto err;
             }
             if (r != 0)
@@ -311,9 +311,9 @@ static int generate_p(BN_CTX *ctx, const EVP_MD *evpmd, int max_counter, int n,
 }
 
 static int generate_q_fips186_4(BN_CTX *ctx, BIGNUM *q, const EVP_MD *evpmd,
-                                int qsize, unsigned char *seed, size_t seedlen,
-                                int generate_seed, int *retm, int *res,
-                                BN_GENCB *cb)
+    int qsize, unsigned char *seed, size_t seedlen,
+    int generate_seed, int *retm, int *res,
+    BN_GENCB *cb)
 {
     int ret = 0, r;
     int m = *retm;
@@ -332,7 +332,7 @@ static int generate_q_fips186_4(BN_CTX *ctx, BIGNUM *q, const EVP_MD *evpmd,
 
         /* A.1.1.2 Step (5) : generate seed with size seed_len */
         if (generate_seed
-                && RAND_bytes_ex(libctx, seed, seedlen, 0) <= 0)
+            && RAND_bytes_ex(libctx, seed, seedlen, 0) <= 0)
             goto err;
         /*
          * A.1.1.2 Step (6) AND
@@ -355,7 +355,7 @@ static int generate_q_fips186_4(BN_CTX *ctx, BIGNUM *q, const EVP_MD *evpmd,
          * q = U + 2^(N-1) + (1 - U %2) (This sets top and bottom bits)
          */
         pmd[0] |= 0x80;
-        pmd[qsize-1] |= 0x01;
+        pmd[qsize - 1] |= 0x01;
         if (!BN_bin2bn(pmd, qsize, q))
             goto err;
 
@@ -387,9 +387,9 @@ static int generate_q_fips186_4(BN_CTX *ctx, BIGNUM *q, const EVP_MD *evpmd,
 }
 
 static int generate_q_fips186_2(BN_CTX *ctx, BIGNUM *q, const EVP_MD *evpmd,
-                                unsigned char *buf, unsigned char *seed,
-                                size_t qsize, int generate_seed, int *retm,
-                                int *res, BN_GENCB *cb)
+    unsigned char *buf, unsigned char *seed,
+    size_t qsize, int generate_seed, int *retm,
+    int *res, BN_GENCB *cb)
 {
     unsigned char buf2[EVP_MAX_MD_SIZE];
     unsigned char md[EVP_MAX_MD_SIZE];
@@ -514,9 +514,9 @@ static const char *default_mdname(size_t N)
  *     but G is unverifiable.
  */
 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 ok = FFC_PARAM_RET_STATUS_FAILED;
     unsigned char *seed = NULL, *seed_tmp = NULL;
@@ -684,7 +684,7 @@ int ossl_ffc_params_FIPS186_4_gen_verify(OSSL_LIB_CTX *libctx,
 
     for (;;) {
         if (!generate_q_fips186_4(ctx, q, md, qsize, seed, seedlen,
-                                  seed != params->seed, &m, res, cb))
+                seed != params->seed, &m, res, cb))
             goto err;
         /* A.1.1.3 Step (9): Verify that q matches the expected value */
         if (verify && (BN_cmp(q, params->q) != 0)) {
@@ -698,7 +698,7 @@ int ossl_ffc_params_FIPS186_4_gen_verify(OSSL_LIB_CTX *libctx,
 
         memcpy(seed_tmp, seed, seedlen);
         r = generate_p(ctx, md, counter, n, seed_tmp, seedlen, q, p, L,
-                       cb, &pcounter, res);
+            cb, &pcounter, res);
         if (r > 0)
             break; /* found p */
         if (r < 0)
@@ -713,7 +713,7 @@ int ossl_ffc_params_FIPS186_4_gen_verify(OSSL_LIB_CTX *libctx,
             goto err;
         }
     }
-    if(!BN_GENCB_call(cb, 2, 1))
+    if (!BN_GENCB_call(cb, 2, 1))
         goto err;
     /*
      * Gets here if we found p.
@@ -733,7 +733,7 @@ int ossl_ffc_params_FIPS186_4_gen_verify(OSSL_LIB_CTX *libctx,
 
     if (((flags & FFC_PARAM_FLAG_VALIDATE_G) != 0)
         && !ossl_ffc_params_validate_unverifiable_g(ctx, mont, p, q, params->g,
-                                                    tmp, res))
+            tmp, res))
         goto err;
 
     /*
@@ -749,7 +749,7 @@ int ossl_ffc_params_FIPS186_4_gen_verify(OSSL_LIB_CTX *libctx,
     if ((seed != NULL) && (params->gindex != FFC_UNVERIFIABLE_GINDEX)) {
         canonical_g = 1;
         if (!generate_canonical_g(ctx, mont, md, g, tmp, p, e,
-                                  params->gindex, seed, seedlen)) {
+                params->gindex, seed, seedlen)) {
             *res = FFC_CHECK_INVALID_G;
             goto err;
         }
@@ -782,7 +782,7 @@ int ossl_ffc_params_FIPS186_4_gen_verify(OSSL_LIB_CTX *libctx,
         if (params->p == NULL || params->q == NULL || params->g == NULL)
             goto err;
         if (!ossl_ffc_params_set_validate_params(params, seed, seedlen,
-                                                 pcounter))
+                pcounter))
             goto err;
         params->h = hret;
     }
@@ -807,9 +807,9 @@ int ossl_ffc_params_FIPS186_4_gen_verify(OSSL_LIB_CTX *libctx,
 
 /* Note this function is only used for verification in fips mode */
 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 ok = FFC_PARAM_RET_STATUS_FAILED;
     unsigned char seed[SHA256_DIGEST_LENGTH];
@@ -935,7 +935,7 @@ int ossl_ffc_params_FIPS186_2_gen_verify(OSSL_LIB_CTX *libctx,
     use_random_seed = (seed_in == NULL);
     for (;;) {
         if (!generate_q_fips186_2(ctx, q, md, buf, seed, qsize,
-                                  use_random_seed, &m, res, cb))
+                use_random_seed, &m, res, cb))
             goto err;
 
         if (!BN_GENCB_call(cb, 2, 0))
@@ -956,7 +956,7 @@ int ossl_ffc_params_FIPS186_2_gen_verify(OSSL_LIB_CTX *libctx,
         }
 
         rv = generate_p(ctx, md, counter, n, buf, qsize, q, p, L, cb,
-                        &pcounter, res);
+            &pcounter, res);
         if (rv > 0)
             break; /* found it */
         if (rv == -1)
@@ -998,9 +998,9 @@ int ossl_ffc_params_FIPS186_2_gen_verify(OSSL_LIB_CTX *libctx,
         if (!generate_unverifiable_g(ctx, mont, g, tmp, p, r0, test, &hret))
             goto err;
     } else if (((flags & FFC_PARAM_FLAG_VALIDATE_G) != 0)
-               && !ossl_ffc_params_validate_unverifiable_g(ctx, mont, p, q,
-                                                           params->g, tmp,
-                                                           res)) {
+        && !ossl_ffc_params_validate_unverifiable_g(ctx, mont, p, q,
+            params->g, tmp,
+            res)) {
         goto err;
     }
 
@@ -1041,22 +1041,22 @@ int ossl_ffc_params_FIPS186_2_gen_verify(OSSL_LIB_CTX *libctx,
 }
 
 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)
 {
     return ossl_ffc_params_FIPS186_4_gen_verify(libctx, params,
-                                                FFC_PARAM_MODE_GENERATE,
-                                                type, L, N, res, cb);
+        FFC_PARAM_MODE_GENERATE,
+        type, L, N, res, cb);
 }
 
 /* This should no longer be used in FIPS mode */
 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)
 {
     if (!ossl_ffc_params_FIPS186_2_gen_verify(libctx, params,
-                                              FFC_PARAM_MODE_GENERATE,
-                                              type, L, N, res, cb))
+            FFC_PARAM_MODE_GENERATE,
+            type, L, N, res, cb))
         return 0;
 
     ossl_ffc_params_enable_flags(params, FFC_PARAM_FLAG_VALIDATE_LEGACY, 1);
diff --git a/crypto/ffc/ffc_params_validate.c b/crypto/ffc/ffc_params_validate.c
index c1b4cf05d200b..36ea9449b6aea 100644
--- a/crypto/ffc/ffc_params_validate.c
+++ b/crypto/ffc/ffc_params_validate.c
@@ -21,9 +21,9 @@
 
 /* FIPS186-4 A.2.2 Unverifiable partial validation of Generator g */
 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)
 {
     /*
      * A.2.2 Step (1) AND
@@ -50,8 +50,8 @@ int ossl_ffc_params_validate_unverifiable_g(BN_CTX *ctx, BN_MONT_CTX *mont,
 }
 
 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)
 {
     size_t L, N;
 
@@ -62,14 +62,14 @@ int ossl_ffc_params_FIPS186_4_validate(OSSL_LIB_CTX *libctx,
     L = BN_num_bits(params->p);
     N = BN_num_bits(params->q);
     return ossl_ffc_params_FIPS186_4_gen_verify(libctx, (FFC_PARAMS *)params,
-                                                FFC_PARAM_MODE_VERIFY, type,
-                                                L, N, res, cb);
+        FFC_PARAM_MODE_VERIFY, type,
+        L, N, res, cb);
 }
 
 /* This may be used in FIPS mode to validate deprecated FIPS-186-2 Params */
 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)
 {
     size_t L, N;
 
@@ -82,8 +82,8 @@ int ossl_ffc_params_FIPS186_2_validate(OSSL_LIB_CTX *libctx,
     L = BN_num_bits(params->p);
     N = BN_num_bits(params->q);
     return ossl_ffc_params_FIPS186_2_gen_verify(libctx, (FFC_PARAMS *)params,
-                                                FFC_PARAM_MODE_VERIFY, type,
-                                                L, N, res, cb);
+        FFC_PARAM_MODE_VERIFY, type,
+        L, N, res, cb);
 }
 
 /*
@@ -93,11 +93,11 @@ int ossl_ffc_params_FIPS186_2_validate(OSSL_LIB_CTX *libctx,
  * this test.
  */
 int ossl_ffc_params_simple_validate(OSSL_LIB_CTX *libctx, const FFC_PARAMS *params,
-                                    int paramstype, int *res)
+    int paramstype, int *res)
 {
     int ret;
     int tmpres = 0;
-    FFC_PARAMS tmpparams = {0};
+    FFC_PARAMS tmpparams = { 0 };
 
     if (params == NULL)
         return 0;
@@ -114,11 +114,11 @@ int ossl_ffc_params_simple_validate(OSSL_LIB_CTX *libctx, const FFC_PARAMS *para
 #ifndef FIPS_MODULE
     if (params->flags & FFC_PARAM_FLAG_VALIDATE_LEGACY)
         ret = ossl_ffc_params_FIPS186_2_validate(libctx, &tmpparams, paramstype,
-                                                 res, NULL);
+            res, NULL);
     else
 #endif
         ret = ossl_ffc_params_FIPS186_4_validate(libctx, &tmpparams, paramstype,
-                                                 res, NULL);
+            res, NULL);
 #ifndef OPENSSL_NO_DH
     if (ret == FFC_PARAM_RET_STATUS_FAILED
         && (*res & FFC_ERROR_NOT_SUITABLE_GENERATOR) != 0) {
@@ -137,7 +137,7 @@ int ossl_ffc_params_simple_validate(OSSL_LIB_CTX *libctx, const FFC_PARAMS *para
  * p and q.
  */
 int ossl_ffc_params_full_validate(OSSL_LIB_CTX *libctx, const FFC_PARAMS *params,
-                                  int paramstype, int *res)
+    int paramstype, int *res)
 {
     int tmpres = 0;
 
@@ -149,15 +149,15 @@ int ossl_ffc_params_full_validate(OSSL_LIB_CTX *libctx, const FFC_PARAMS *params
 
 #ifdef FIPS_MODULE
     return ossl_ffc_params_FIPS186_4_validate(libctx, params, paramstype,
-                                              res, NULL);
+        res, NULL);
 #else
     if (params->seed != NULL) {
         if (params->flags & FFC_PARAM_FLAG_VALIDATE_LEGACY)
             return ossl_ffc_params_FIPS186_2_validate(libctx, params, paramstype,
-                                                      res, NULL);
+                res, NULL);
         else
             return ossl_ffc_params_FIPS186_4_validate(libctx, params, paramstype,
-                                                      res, NULL);
+                res, NULL);
     } else {
         int ret = 0;
 
@@ -168,15 +168,15 @@ int ossl_ffc_params_full_validate(OSSL_LIB_CTX *libctx, const FFC_PARAMS *params
             if ((ctx = BN_CTX_new_ex(libctx)) == NULL)
                 return 0;
             if (BN_check_prime(params->q, ctx, NULL) != 1) {
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
                 ERR_raise(ERR_LIB_DSA, DSA_R_Q_NOT_PRIME);
-# endif
+#endif
                 ret = 0;
             }
             if (ret && BN_check_prime(params->p, ctx, NULL) != 1) {
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
                 ERR_raise(ERR_LIB_DSA, DSA_R_P_NOT_PRIME);
-# endif
+#endif
                 ret = 0;
             }
             BN_CTX_free(ctx);
diff --git a/crypto/getenv.c b/crypto/getenv.c
index fe8444f417f7f..aa01ea8af7c18 100644
--- a/crypto/getenv.c
+++ b/crypto/getenv.c
@@ -8,7 +8,7 @@
  */
 
 #ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#define _GNU_SOURCE
 #endif
 
 #include <stdlib.h>
@@ -34,10 +34,7 @@ char *ossl_safe_getenv(const char *name)
          * For the code pages listed below, dwFlags must be set to 0.
          * Otherwise, the function fails with ERROR_INVALID_FLAGS.
          */
-        if (curacp == 50220 || curacp == 50221 || curacp == 50222 ||
-            curacp == 50225 || curacp == 50227 || curacp == 50229 ||
-            (57002 <= curacp && curacp <=57011) || curacp == 65000 ||
-            curacp == 42)
+        if (curacp == 50220 || curacp == 50221 || curacp == 50222 || curacp == 50225 || curacp == 50227 || curacp == 50229 || (57002 <= curacp && curacp <= 57011) || curacp == 65000 || curacp == 42)
             dwFlags = 0;
 
         /* query for buffer len */
@@ -62,7 +59,7 @@ char *ossl_safe_getenv(const char *name)
             if (GetEnvironmentVariableW(namew, valw, envlen) < envlen) {
                 /* determine value string size in utf-8 */
                 vallen = WideCharToMultiByte(CP_UTF8, 0, valw, -1, NULL, 0,
-                                             NULL, NULL);
+                    NULL, NULL);
             }
         }
 
@@ -72,7 +69,8 @@ char *ossl_safe_getenv(const char *name)
         if (NULL != val) {
             /* convert value string from wide to utf-8 */
             if (WideCharToMultiByte(CP_UTF8, 0, valw, -1, val, vallen,
-                                    NULL, NULL) == 0) {
+                    NULL, NULL)
+                == 0) {
                 OPENSSL_free(val);
                 val = NULL;
             }
@@ -89,10 +87,10 @@ char *ossl_safe_getenv(const char *name)
 #endif
 
 #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-# if __GLIBC_PREREQ(2, 17)
-#  define SECURE_GETENV
+#if __GLIBC_PREREQ(2, 17)
+#define SECURE_GETENV
     return secure_getenv(name);
-# endif
+#endif
 #endif
 
 #ifndef SECURE_GETENV
diff --git a/crypto/hashtable/hashtable.c b/crypto/hashtable/hashtable.c
index 74b4ec91f4157..dba05ebe25ced 100644
--- a/crypto/hashtable/hashtable.c
+++ b/crypto/hashtable/hashtable.c
@@ -62,13 +62,13 @@
  * map the latter to the former
  */
 #if defined(__clang__) && defined(__has_feature)
-# if __has_feature(thread_sanitizer)
-#  define __SANITIZE_THREADS__
-# endif
+#if __has_feature(thread_sanitizer)
+#define __SANITIZE_THREADS__
+#endif
 #endif
 
 #ifdef __SANITIZE_THREADS__
-# include <sanitizer/tsan_interface.h>
+#include <sanitizer/tsan_interface.h>
 #endif
 
 #include "internal/numbers.h"
@@ -80,11 +80,11 @@
  * structure for faster lookups
  */
 #if defined(__GNUC__) || defined(__CLANG__)
-# define PREFETCH_NEIGHBORHOOD(x) __builtin_prefetch(x.entries)
-# define PREFETCH(x) __builtin_prefetch(x)
+#define PREFETCH_NEIGHBORHOOD(x) __builtin_prefetch(x.entries)
+#define PREFETCH(x) __builtin_prefetch(x)
 #else
-# define PREFETCH_NEIGHBORHOOD(x)
-# define PREFETCH(x)
+#define PREFETCH_NEIGHBORHOOD(x)
+#define PREFETCH(x)
 #endif
 
 /*
@@ -150,12 +150,12 @@ struct ht_internal_st {
 static void free_value(struct ht_internal_value_st *v);
 
 static struct ht_neighborhood_st *alloc_new_neighborhood_list(size_t len,
-                                                              void **freeptr)
+    void **freeptr)
 {
     struct ht_neighborhood_st *ret;
 
     ret = OPENSSL_aligned_alloc(sizeof(struct ht_neighborhood_st) * len,
-                                CACHE_LINE_BYTES, freeptr);
+        CACHE_LINE_BYTES, freeptr);
 
     /* fall back to regular malloc */
     if (ret == NULL) {
@@ -206,9 +206,8 @@ HT *ossl_ht_new(const HT_CONFIG *conf)
     if (new->md == NULL)
         goto err;
 
-    new->md->neighborhoods =
-        alloc_new_neighborhood_list(new->wpd.neighborhood_len,
-                                    &new->md->neighborhood_ptr_to_free);
+    new->md->neighborhoods = alloc_new_neighborhood_list(new->wpd.neighborhood_len,
+        &new->md->neighborhood_ptr_to_free);
     if (new->md->neighborhoods == NULL)
         goto err;
     new->md->neighborhood_mask = new->wpd.neighborhood_len - 1;
@@ -290,7 +289,7 @@ static int ossl_ht_flush_internal(HT *h)
         return 0;
 
     newmd->neighborhoods = alloc_new_neighborhood_list(DEFAULT_NEIGH_LEN,
-                                                       &newmd->neighborhood_ptr_to_free);
+        &newmd->neighborhood_ptr_to_free);
     if (newmd->neighborhoods == NULL) {
         OPENSSL_free(newmd);
         return 0;
@@ -342,7 +341,7 @@ size_t ossl_ht_count(HT *h)
 }
 
 void ossl_ht_foreach_until(HT *h, int (*cb)(HT_VALUE *obj, void *arg),
-                           void *arg)
+    void *arg)
 {
     size_t i, j;
     struct ht_mutable_data_st *md;
@@ -362,12 +361,12 @@ void ossl_ht_foreach_until(HT *h, int (*cb)(HT_VALUE *obj, void *arg),
 }
 
 HT_VALUE_LIST *ossl_ht_filter(HT *h, size_t max_len,
-                                     int (*filter)(HT_VALUE *obj, void *arg),
-                                     void *arg)
+    int (*filter)(HT_VALUE *obj, void *arg),
+    void *arg)
 {
     struct ht_mutable_data_st *md;
     HT_VALUE_LIST *list = OPENSSL_zalloc(sizeof(HT_VALUE_LIST)
-                                         + (sizeof(HT_VALUE *) * max_len));
+        + (sizeof(HT_VALUE *) * max_len));
     size_t i, j;
     struct ht_internal_value_st *v;
 
@@ -382,7 +381,7 @@ HT_VALUE_LIST *ossl_ht_filter(HT *h, size_t max_len,
 
     md = ossl_rcu_deref(&h->md);
     for (i = 0; i < md->neighborhood_mask + 1; i++) {
-        PREFETCH_NEIGHBORHOOD(md->neighborhoods[i+1]);
+        PREFETCH_NEIGHBORHOOD(md->neighborhoods[i + 1]);
         for (j = 0; j < NEIGHBORHOOD_LEN; j++) {
             v = md->neighborhoods[i].entries[j].value;
             if (v != NULL && filter((HT_VALUE *)v, arg)) {
@@ -437,7 +436,7 @@ static int grow_hashtable(HT *h, size_t oldsize)
 
     /* bucket list is always a power of 2 */
     newmd->neighborhoods = alloc_new_neighborhood_list(oldsize * 2,
-                                                       &newmd->neighborhood_ptr_to_free);
+        &newmd->neighborhood_ptr_to_free);
     if (newmd->neighborhoods == NULL)
         goto out_free;
 
@@ -527,8 +526,8 @@ static ossl_inline int match_key(HT_KEY *a, HT_KEY *b)
 }
 
 static int ossl_ht_insert_locked(HT *h, uint64_t hash,
-                                 struct ht_internal_value_st *newval,
-                                 HT_VALUE **olddata)
+    struct ht_internal_value_st *newval,
+    HT_VALUE **olddata)
 {
     struct ht_mutable_data_st *md = h->md;
     uint64_t neigh_idx_start = hash & md->neighborhood_mask;
@@ -552,21 +551,20 @@ static int ossl_ht_insert_locked(HT *h, uint64_t hash,
                 continue;
             }
             if (!CRYPTO_atomic_load(&md->neighborhoods[neigh_idx].entries[j].hash,
-                                    &ihash, h->atomic_lock))
+                    &ihash, h->atomic_lock))
                 return 0;
-            if (compare_hash(hash, ihash) && match_key(&newval->value.key,
-                                                       &ival->key)) {
+            if (compare_hash(hash, ihash) && match_key(&newval->value.key, &ival->key)) {
                 if (olddata == NULL) {
                     /* This would insert a duplicate -> fail */
                     return 0;
                 }
                 /* Do a replacement */
                 if (!CRYPTO_atomic_store(&md->neighborhoods[neigh_idx].entries[j].hash,
-                                         hash, h->atomic_lock))
+                        hash, h->atomic_lock))
                     return 0;
                 *olddata = (HT_VALUE *)md->neighborhoods[neigh_idx].entries[j].value;
                 ossl_rcu_assign_ptr(&md->neighborhoods[neigh_idx].entries[j].value,
-                                    &newval);
+                    &newval);
                 ossl_rcu_call(h->lock, free_old_ht_value, *olddata);
                 h->wpd.need_sync = 1;
                 return 1;
@@ -578,22 +576,22 @@ static int ossl_ht_insert_locked(HT *h, uint64_t hash,
         neigh_idx = (neigh_idx + 1) & md->neighborhood_mask;
     } while (neigh_idx != neigh_idx_start);
 
- not_found:
+not_found:
     /* If we get to here, its just an insert */
     if (empty_idx == SIZE_MAX)
         return -1; /* out of space */
     if (!CRYPTO_atomic_store(&md->neighborhoods[neigh_idx].entries[empty_idx].hash,
-                             hash, h->atomic_lock))
+            hash, h->atomic_lock))
         return 0;
     h->wpd.value_count++;
     ossl_rcu_assign_ptr(&md->neighborhoods[neigh_idx].entries[empty_idx].value,
-                        &newval);
+        &newval);
     return 1;
 }
 
 static struct ht_internal_value_st *alloc_new_value(HT *h, HT_KEY *key,
-                                                    void *data,
-                                                    uintptr_t *type)
+    void *data,
+    uintptr_t *type)
 {
     struct ht_internal_value_st *tmp;
     size_t nvsize = sizeof(*tmp);
@@ -616,7 +614,6 @@ static struct ht_internal_value_st *alloc_new_value(HT *h, HT_KEY *key,
         memcpy(tmp->value.key.keybuf, key->keybuf, key->keysize);
     }
 
-
     return tmp;
 }
 
@@ -646,9 +643,9 @@ int ossl_ht_insert(HT *h, HT_KEY *key, HT_VALUE *data, HT_VALUE **olddata)
     hash = h->config.ht_hash_fn(key->keybuf, key->keysize);
 
     for (i = 0;
-         (rc = ossl_ht_insert_locked(h, hash, newval, olddata)) == -1
-         && i < 4;
-         ++i)
+        (rc = ossl_ht_insert_locked(h, hash, newval, olddata)) == -1
+        && i < 4;
+        ++i)
         if (!grow_hashtable(h, h->wpd.neighborhood_len)) {
             rc = -1;
             break;
@@ -687,7 +684,7 @@ HT_VALUE *ossl_ht_get(HT *h, HT_KEY *key)
                 continue;
             }
             if (!CRYPTO_atomic_load(&md->neighborhoods[neigh_idx].entries[j].hash,
-                                    &ehash, h->atomic_lock))
+                    &ehash, h->atomic_lock))
                 return NULL;
             if (compare_hash(hash, ehash) && match_key(&ival->value.key, key))
                 return (HT_VALUE *)ival;
@@ -732,11 +729,11 @@ int ossl_ht_delete(HT *h, HT_KEY *key)
         if (compare_hash(hash, h->md->neighborhoods[neigh_idx].entries[j].hash)
             && match_key(key, &v->value.key)) {
             if (!CRYPTO_atomic_store(&h->md->neighborhoods[neigh_idx].entries[j].hash,
-                                     0, h->atomic_lock))
+                    0, h->atomic_lock))
                 break;
             h->wpd.value_count--;
             ossl_rcu_assign_ptr(&h->md->neighborhoods[neigh_idx].entries[j].value,
-                                &nv);
+                &nv);
             rc = 1;
             break;
         }
diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 19fc7d3b4f6aa..c5d42db820200 100644
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -23,7 +23,7 @@
 #include "hmac_local.h"
 
 int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
-                 const EVP_MD *md, ENGINE *impl)
+    const EVP_MD *md, ENGINE *impl)
 {
     int rv = 0, reset = 0;
     int i, j;
@@ -65,9 +65,9 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
             return 0;
         if (j < len) {
             if (!EVP_DigestInit_ex(ctx->md_ctx, md, impl)
-                    || !EVP_DigestUpdate(ctx->md_ctx, key, len)
-                    || !EVP_DigestFinal_ex(ctx->md_ctx, keytmp,
-                                           &keytmp_length))
+                || !EVP_DigestUpdate(ctx->md_ctx, key, len)
+                || !EVP_DigestFinal_ex(ctx->md_ctx, keytmp,
+                    &keytmp_length))
                 return 0;
         } else {
             if (len < 0 || len > (int)sizeof(keytmp))
@@ -77,26 +77,26 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
         }
         if (keytmp_length != HMAC_MAX_MD_CBLOCK_SIZE)
             memset(&keytmp[keytmp_length], 0,
-                   HMAC_MAX_MD_CBLOCK_SIZE - keytmp_length);
+                HMAC_MAX_MD_CBLOCK_SIZE - keytmp_length);
 
         for (i = 0; i < HMAC_MAX_MD_CBLOCK_SIZE; i++)
             pad[i] = 0x36 ^ keytmp[i];
         if (!EVP_DigestInit_ex(ctx->i_ctx, md, impl)
-                || !EVP_DigestUpdate(ctx->i_ctx, pad,
-                                     EVP_MD_get_block_size(md)))
+            || !EVP_DigestUpdate(ctx->i_ctx, pad,
+                EVP_MD_get_block_size(md)))
             goto err;
 
         for (i = 0; i < HMAC_MAX_MD_CBLOCK_SIZE; i++)
             pad[i] = 0x5c ^ keytmp[i];
         if (!EVP_DigestInit_ex(ctx->o_ctx, md, impl)
-                || !EVP_DigestUpdate(ctx->o_ctx, pad,
-                                     EVP_MD_get_block_size(md)))
+            || !EVP_DigestUpdate(ctx->o_ctx, pad,
+                EVP_MD_get_block_size(md)))
             goto err;
     }
     if (!EVP_MD_CTX_copy_ex(ctx->md_ctx, ctx->i_ctx))
         goto err;
     rv = 1;
- err:
+err:
     if (reset) {
         OPENSSL_cleanse(keytmp, sizeof(keytmp));
         OPENSSL_cleanse(pad, sizeof(pad));
@@ -148,7 +148,7 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
     if (!EVP_DigestFinal_ex(ctx->md_ctx, md, len))
         goto err;
     return 1;
- err:
+err:
     return 0;
 }
 
@@ -240,14 +240,14 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
 #endif
 
     return 1;
- err:
+err:
     hmac_ctx_cleanup(dctx);
     return 0;
 }
 
 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)
 {
     static unsigned char static_md[EVP_MAX_MD_SIZE];
     int size = EVP_MD_get_size(evp_md);
@@ -256,8 +256,8 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
 
     if (size > 0) {
         ret = EVP_Q_mac(NULL, "HMAC", NULL, EVP_MD_get0_name(evp_md), NULL,
-                        key, key_len, data, data_len,
-                        md == NULL ? static_md : md, size, &temp_md_len);
+            key, key_len, data, data_len,
+            md == NULL ? static_md : md, size, &temp_md_len);
         if (md_len != NULL)
             *md_len = (unsigned int)temp_md_len;
     }
diff --git a/crypto/hmac/hmac_local.h b/crypto/hmac/hmac_local.h
index 1b871e732053e..288252ab46de8 100644
--- a/crypto/hmac/hmac_local.h
+++ b/crypto/hmac/hmac_local.h
@@ -8,14 +8,14 @@
  */
 
 #ifndef OSSL_CRYPTO_HMAC_LOCAL_H
-# define OSSL_CRYPTO_HMAC_LOCAL_H
+#define OSSL_CRYPTO_HMAC_LOCAL_H
 
-# include "internal/common.h"
-# include "internal/numbers.h"
-# include "openssl/sha.h"
+#include "internal/common.h"
+#include "internal/numbers.h"
+#include "openssl/sha.h"
 
 /* The current largest case is for SHA3-224 */
-#define HMAC_MAX_MD_CBLOCK_SIZE     144
+#define HMAC_MAX_MD_CBLOCK_SIZE 144
 
 struct hmac_ctx_st {
     const EVP_MD *md;
@@ -26,7 +26,7 @@ struct hmac_ctx_st {
     /* Platform specific data */
     union {
         int dummy;
-# ifdef OPENSSL_HMAC_S390X
+#ifdef OPENSSL_HMAC_S390X
         struct {
             unsigned int fc; /* 0 if not supported by kmac instruction */
             int blk_size;
@@ -49,18 +49,18 @@ struct hmac_ctx_st {
                 } hmac_384_512;
             } param;
         } s390x;
-# endif /* OPENSSL_HMAC_S390X */
+#endif /* OPENSSL_HMAC_S390X */
     } plat;
 };
 
-# ifdef OPENSSL_HMAC_S390X
-#  define HMAC_S390X_BUF_NUM_BLOCKS 64
+#ifdef OPENSSL_HMAC_S390X
+#define HMAC_S390X_BUF_NUM_BLOCKS 64
 
 int s390x_HMAC_init(HMAC_CTX *ctx, const void *key, int key_len, ENGINE *impl);
 int s390x_HMAC_update(HMAC_CTX *ctx, const unsigned char *data, size_t len);
 int s390x_HMAC_final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
 int s390x_HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
 int s390x_HMAC_CTX_cleanup(HMAC_CTX *ctx);
-# endif /* OPENSSL_HMAC_S390X */
+#endif /* OPENSSL_HMAC_S390X */
 
 #endif
diff --git a/crypto/hmac/hmac_s390x.c b/crypto/hmac/hmac_s390x.c
index 02e1cd1dd6503..cae5a6064e917 100644
--- a/crypto/hmac/hmac_s390x.c
+++ b/crypto/hmac/hmac_s390x.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2024-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
@@ -14,8 +14,9 @@
 #include "hmac_local.h"
 #include "openssl/obj_mac.h"
 #include "openssl/evp.h"
+#include "openssl/err.h"
 #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 
 #ifdef OPENSSL_HMAC_S390X
@@ -71,7 +72,7 @@ static void s390x_call_kmac(HMAC_CTX *ctx, const unsigned char *in, size_t len)
 
 static int s390x_check_engine_used(const EVP_MD *md, ENGINE *impl)
 {
-# if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
+#if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
     const EVP_MD *d;
 
     if (impl != NULL) {
@@ -89,7 +90,7 @@ static int s390x_check_engine_used(const EVP_MD *md, ENGINE *impl)
 
     if (d != NULL)
         return 1;
-# endif
+#endif
 
     return 0;
 }
@@ -112,16 +113,13 @@ int s390x_HMAC_init(HMAC_CTX *ctx, const void *key, int key_len, ENGINE *impl)
     if (ctx->plat.s390x.blk_size < 0)
         return 0;
 
-    if (ctx->plat.s390x.size !=
-        (size_t)(ctx->plat.s390x.blk_size * HMAC_S390X_BUF_NUM_BLOCKS)) {
+    if (ctx->plat.s390x.size != (size_t)(ctx->plat.s390x.blk_size * HMAC_S390X_BUF_NUM_BLOCKS)) {
         OPENSSL_clear_free(ctx->plat.s390x.buf, ctx->plat.s390x.size);
         ctx->plat.s390x.size = 0;
-        ctx->plat.s390x.buf = OPENSSL_zalloc(ctx->plat.s390x.blk_size *
-                                             HMAC_S390X_BUF_NUM_BLOCKS);
+        ctx->plat.s390x.buf = OPENSSL_zalloc(ctx->plat.s390x.blk_size * HMAC_S390X_BUF_NUM_BLOCKS);
         if (ctx->plat.s390x.buf == NULL)
             return 0;
-        ctx->plat.s390x.size = ctx->plat.s390x.blk_size *
-            HMAC_S390X_BUF_NUM_BLOCKS;
+        ctx->plat.s390x.size = ctx->plat.s390x.blk_size * HMAC_S390X_BUF_NUM_BLOCKS;
     }
     ctx->plat.s390x.num = 0;
 
@@ -133,13 +131,13 @@ int s390x_HMAC_init(HMAC_CTX *ctx, const void *key, int key_len, ENGINE *impl)
     case S390X_HMAC_SHA_256:
         ctx->plat.s390x.param.hmac_224_256.imbl = 0;
         OPENSSL_cleanse(ctx->plat.s390x.param.hmac_224_256.h,
-                        sizeof(ctx->plat.s390x.param.hmac_224_256.h));
+            sizeof(ctx->plat.s390x.param.hmac_224_256.h));
         break;
     case S390X_HMAC_SHA_384:
     case S390X_HMAC_SHA_512:
         ctx->plat.s390x.param.hmac_384_512.imbl = 0;
         OPENSSL_cleanse(ctx->plat.s390x.param.hmac_384_512.h,
-                        sizeof(ctx->plat.s390x.param.hmac_384_512.h));
+            sizeof(ctx->plat.s390x.param.hmac_384_512.h));
         break;
     default:
         return 0;
@@ -150,14 +148,14 @@ int s390x_HMAC_init(HMAC_CTX *ctx, const void *key, int key_len, ENGINE *impl)
         case S390X_HMAC_SHA_224:
         case S390X_HMAC_SHA_256:
             OPENSSL_cleanse(&ctx->plat.s390x.param.hmac_224_256.key,
-                            sizeof(ctx->plat.s390x.param.hmac_224_256.key));
+                sizeof(ctx->plat.s390x.param.hmac_224_256.key));
             key_param = ctx->plat.s390x.param.hmac_224_256.key;
             key_param_len = sizeof(ctx->plat.s390x.param.hmac_224_256.key);
             break;
         case S390X_HMAC_SHA_384:
         case S390X_HMAC_SHA_512:
             OPENSSL_cleanse(&ctx->plat.s390x.param.hmac_384_512.key,
-                            sizeof(ctx->plat.s390x.param.hmac_384_512.key));
+                sizeof(ctx->plat.s390x.param.hmac_384_512.key));
             key_param = ctx->plat.s390x.param.hmac_384_512.key;
             key_param_len = sizeof(ctx->plat.s390x.param.hmac_384_512.key);
             break;
@@ -170,9 +168,9 @@ int s390x_HMAC_init(HMAC_CTX *ctx, const void *key, int key_len, ENGINE *impl)
 
         if (key_len > ctx->plat.s390x.blk_size) {
             if (!EVP_DigestInit_ex(ctx->md_ctx, ctx->md, impl)
-                    || !EVP_DigestUpdate(ctx->md_ctx, key, key_len)
-                    || !EVP_DigestFinal_ex(ctx->md_ctx, key_param,
-                                           &key_param_len))
+                || !EVP_DigestUpdate(ctx->md_ctx, key, key_len)
+                || !EVP_DigestFinal_ex(ctx->md_ctx, key_param,
+                    &key_param_len))
                 return 0;
         } else {
             if (key_len < 0 || key_len > (int)key_param_len)
@@ -189,6 +187,11 @@ int s390x_HMAC_update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
 {
     size_t remain, num;
 
+    if (ctx->plat.s390x.iimp != 1) {
+        ERR_raise(ERR_LIB_EVP, EVP_R_UPDATE_ERROR);
+        return 0;
+    }
+
     if (len == 0)
         return 1;
 
@@ -250,6 +253,11 @@ int s390x_HMAC_final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
     void *result;
     unsigned int res_len;
 
+    if (ctx->plat.s390x.iimp != 1) {
+        ERR_raise(ERR_LIB_EVP, EVP_R_FINAL_ERROR);
+        return 0;
+    }
+
     ctx->plat.s390x.iimp = 0; /* last block */
     s390x_call_kmac(ctx, ctx->plat.s390x.buf, ctx->plat.s390x.num);
 
@@ -291,13 +299,13 @@ int s390x_HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
     dctx->plat.s390x.iimp = sctx->plat.s390x.iimp;
 
     memcpy(&dctx->plat.s390x.param, &sctx->plat.s390x.param,
-           sizeof(dctx->plat.s390x.param));
+        sizeof(dctx->plat.s390x.param));
 
     OPENSSL_clear_free(dctx->plat.s390x.buf, dctx->plat.s390x.size);
     dctx->plat.s390x.buf = NULL;
     if (sctx->plat.s390x.buf != NULL) {
         dctx->plat.s390x.buf = OPENSSL_memdup(sctx->plat.s390x.buf,
-                                              sctx->plat.s390x.size);
+            sctx->plat.s390x.size);
         if (dctx->plat.s390x.buf == NULL)
             return 0;
     }
diff --git a/crypto/hpke/hpke.c b/crypto/hpke/hpke.c
index 8dca5584cbc78..2c1fe47cea3a8 100644
--- a/crypto/hpke/hpke.c
+++ b/crypto/hpke/hpke.c
@@ -100,17 +100,17 @@ static int hpke_kem_id_nist_curve(uint16_t kem_id)
  * future, but would likely require a name change.
  */
 static EVP_PKEY *evp_pkey_new_raw_nist_public_key(OSSL_LIB_CTX *libctx,
-                                                  const char *propq,
-                                                  const char *gname,
-                                                  const unsigned char *buf,
-                                                  size_t buflen)
+    const char *propq,
+    const char *gname,
+    const unsigned char *buf,
+    size_t buflen)
 {
     OSSL_PARAM params[2];
     EVP_PKEY *ret = NULL;
     EVP_PKEY_CTX *cctx = EVP_PKEY_CTX_new_from_name(libctx, "EC", propq);
 
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                 (char *)gname, 0);
+        (char *)gname, 0);
     params[1] = OSSL_PARAM_construct_end();
     if (cctx == NULL
         || EVP_PKEY_paramgen_init(cctx) <= 0
@@ -139,9 +139,9 @@ static EVP_PKEY *evp_pkey_new_raw_nist_public_key(OSSL_LIB_CTX *libctx,
  * @return 1 on success, 0 otherwise
  */
 static int hpke_aead_dec(OSSL_HPKE_CTX *hctx, const unsigned char *iv,
-                         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,
+    unsigned char *pt, size_t *ptlen)
 {
     int erv = 0;
     EVP_CIPHER_CTX *ctx = NULL;
@@ -162,7 +162,8 @@ static int hpke_aead_dec(OSSL_HPKE_CTX *hctx, const unsigned char *iv,
         goto err;
     }
     if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN,
-                            hctx->noncelen, NULL) != 1) {
+            hctx->noncelen, NULL)
+        != 1) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -184,7 +185,7 @@ static int hpke_aead_dec(OSSL_HPKE_CTX *hctx, const unsigned char *iv,
     }
     *ptlen = len;
     if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
-                             taglen, (void *)(ct + ctlen - taglen))) {
+            taglen, (void *)(ct + ctlen - taglen))) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -215,9 +216,9 @@ static int hpke_aead_dec(OSSL_HPKE_CTX *hctx, const unsigned char *iv,
  * @return 1 for success, 0 otherwise
  */
 static int hpke_aead_enc(OSSL_HPKE_CTX *hctx, const unsigned char *iv,
-                         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,
+    unsigned char *ct, size_t *ctlen)
 {
     int erv = 0;
     EVP_CIPHER_CTX *ctx = NULL;
@@ -243,7 +244,8 @@ static int hpke_aead_enc(OSSL_HPKE_CTX *hctx, const unsigned char *iv,
         goto err;
     }
     if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN,
-                            hctx->noncelen, NULL) != 1) {
+            hctx->noncelen, NULL)
+        != 1) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -311,9 +313,9 @@ static int hpke_mode_check(unsigned int mode)
  * @return 1 for good, 0 otherwise
  */
 static int hpke_suite_check(OSSL_HPKE_SUITE suite,
-                            const OSSL_HPKE_KEM_INFO **kem_info,
-                            const OSSL_HPKE_KDF_INFO **kdf_info,
-                            const OSSL_HPKE_AEAD_INFO **aead_info)
+    const OSSL_HPKE_KEM_INFO **kem_info,
+    const OSSL_HPKE_KDF_INFO **kdf_info,
+    const OSSL_HPKE_AEAD_INFO **aead_info)
 {
     const OSSL_HPKE_KEM_INFO *kem_info_;
     const OSSL_HPKE_KDF_INFO *kdf_info_;
@@ -345,8 +347,8 @@ static int hpke_suite_check(OSSL_HPKE_SUITE suite,
  * @return 1 for success, 0 otherwise
  */
 static int hpke_random_suite(OSSL_LIB_CTX *libctx,
-                             const char *propq,
-                             OSSL_HPKE_SUITE *suite)
+    const char *propq,
+    OSSL_HPKE_SUITE *suite)
 {
     const OSSL_HPKE_KEM_INFO *kem_info = NULL;
     const OSSL_HPKE_KDF_INFO *kdf_info = NULL;
@@ -388,9 +390,9 @@ static int hpke_random_suite(OSSL_LIB_CTX *libctx,
  * @return 1 for success, 0 otherwise
  */
 static int hpke_expansion(OSSL_HPKE_SUITE suite,
-                          size_t *enclen,
-                          size_t clearlen,
-                          size_t *cipherlen)
+    size_t *enclen,
+    size_t clearlen,
+    size_t *cipherlen)
 {
     const OSSL_HPKE_AEAD_INFO *aead_info = NULL;
     const OSSL_HPKE_KEM_INFO *kem_info = NULL;
@@ -416,7 +418,7 @@ static int hpke_expansion(OSSL_HPKE_SUITE suite,
  * @return 0 for error, otherwise blen
  */
 static size_t hpke_seqnonce2buf(OSSL_HPKE_CTX *ctx,
-                                unsigned char *buf, size_t blen)
+    unsigned char *buf, size_t blen)
 {
     size_t i;
     uint64_t seq_copy;
@@ -444,7 +446,7 @@ static size_t hpke_seqnonce2buf(OSSL_HPKE_CTX *ctx,
  * @return 1 for success, 0 for error
  */
 static int hpke_encap(OSSL_HPKE_CTX *ctx, unsigned char *enc, size_t *enclen,
-                      const unsigned char *pub, size_t publen)
+    const unsigned char *pub, size_t publen)
 {
     int erv = 0;
     OSSL_PARAM params[3], *p = params;
@@ -470,12 +472,12 @@ static int hpke_encap(OSSL_HPKE_CTX *ctx, unsigned char *enc, size_t *enclen,
     }
     if (hpke_kem_id_nist_curve(ctx->suite.kem_id) == 1) {
         pkR = evp_pkey_new_raw_nist_public_key(ctx->libctx, ctx->propq,
-                                               kem_info->groupname,
-                                               pub, publen);
+            kem_info->groupname,
+            pub, publen);
     } else {
         pkR = EVP_PKEY_new_raw_public_key_ex(ctx->libctx,
-                                             kem_info->keytype,
-                                             ctx->propq, pub, publen);
+            kem_info->keytype,
+            ctx->propq, pub, publen);
     }
     if (pkR == NULL) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
@@ -487,17 +489,18 @@ static int hpke_encap(OSSL_HPKE_CTX *ctx, unsigned char *enc, size_t *enclen,
         goto err;
     }
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KEM_PARAM_OPERATION,
-                                            OSSL_KEM_PARAM_OPERATION_DHKEM,
-                                            0);
+        OSSL_KEM_PARAM_OPERATION_DHKEM,
+        0);
     if (ctx->ikme != NULL) {
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_KEM_PARAM_IKME,
-                                                 ctx->ikme, ctx->ikmelen);
+            ctx->ikme, ctx->ikmelen);
     }
     *p = OSSL_PARAM_construct_end();
     if (ctx->mode == OSSL_HPKE_MODE_AUTH
         || ctx->mode == OSSL_HPKE_MODE_PSKAUTH) {
         if (EVP_PKEY_auth_encapsulate_init(pctx, ctx->authpriv,
-                                           params) != 1) {
+                params)
+            != 1) {
             ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
             goto err;
         }
@@ -521,7 +524,8 @@ static int hpke_encap(OSSL_HPKE_CTX *ctx, unsigned char *enc, size_t *enclen,
         goto err;
     ctx->shared_secretlen = lsslen;
     if (EVP_PKEY_encapsulate(pctx, enc, enclen, ctx->shared_secret,
-                             &ctx->shared_secretlen) != 1) {
+            &ctx->shared_secretlen)
+        != 1) {
         ctx->shared_secretlen = 0;
         OPENSSL_free(ctx->shared_secret);
         ctx->shared_secret = NULL;
@@ -545,8 +549,8 @@ static int hpke_encap(OSSL_HPKE_CTX *ctx, unsigned char *enc, size_t *enclen,
  * @return 1 for success, 0 for error
  */
 static int hpke_decap(OSSL_HPKE_CTX *ctx,
-                      const unsigned char *enc, size_t enclen,
-                      EVP_PKEY *priv)
+    const unsigned char *enc, size_t enclen,
+    EVP_PKEY *priv)
 {
     int erv = 0;
     EVP_PKEY_CTX *pctx = NULL;
@@ -569,8 +573,8 @@ static int hpke_decap(OSSL_HPKE_CTX *ctx,
         goto err;
     }
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KEM_PARAM_OPERATION,
-                                            OSSL_KEM_PARAM_OPERATION_DHKEM,
-                                            0);
+        OSSL_KEM_PARAM_OPERATION_DHKEM,
+        0);
     *p = OSSL_PARAM_construct_end();
     if (ctx->mode == OSSL_HPKE_MODE_AUTH
         || ctx->mode == OSSL_HPKE_MODE_PSKAUTH) {
@@ -583,15 +587,15 @@ static int hpke_decap(OSSL_HPKE_CTX *ctx,
         }
         if (hpke_kem_id_nist_curve(ctx->suite.kem_id) == 1) {
             spub = evp_pkey_new_raw_nist_public_key(ctx->libctx, ctx->propq,
-                                                    kem_info->groupname,
-                                                    ctx->authpub,
-                                                    ctx->authpublen);
+                kem_info->groupname,
+                ctx->authpub,
+                ctx->authpublen);
         } else {
             spub = EVP_PKEY_new_raw_public_key_ex(ctx->libctx,
-                                                  kem_info->keytype,
-                                                  ctx->propq,
-                                                  ctx->authpub,
-                                                  ctx->authpublen);
+                kem_info->keytype,
+                ctx->propq,
+                ctx->authpub,
+                ctx->authpublen);
         }
         if (spub == NULL) {
             ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
@@ -615,7 +619,8 @@ static int hpke_decap(OSSL_HPKE_CTX *ctx,
     if (ctx->shared_secret == NULL)
         goto err;
     if (EVP_PKEY_decapsulate(pctx, ctx->shared_secret, &lsslen,
-                             enc, enclen) != 1) {
+            enc, enclen)
+        != 1) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -645,7 +650,7 @@ static int hpke_decap(OSSL_HPKE_CTX *ctx,
  * ctx fields for the shared_secret, nonce, key and exporter_secret
  */
 static int hpke_do_middle(OSSL_HPKE_CTX *ctx,
-                          const unsigned char *info, size_t infolen)
+    const unsigned char *info, size_t infolen)
 {
     int erv = 0;
     size_t ks_contextlen = OSSL_HPKE_MAXSIZE;
@@ -712,18 +717,20 @@ static int hpke_do_middle(OSSL_HPKE_CTX *ctx,
     suitebuf[5] = ctx->suite.aead_id % 256;
     /* Extract and Expand variously... */
     if (ossl_hpke_labeled_extract(kctx, ks_context + 1, halflen,
-                                  NULL, 0, OSSL_HPKE_SEC51LABEL,
-                                  suitebuf, sizeof(suitebuf),
-                                  OSSL_HPKE_PSKIDHASH_LABEL,
-                                  (unsigned char *)ctx->pskid, pskidlen) != 1) {
+            NULL, 0, OSSL_HPKE_SEC51LABEL,
+            suitebuf, sizeof(suitebuf),
+            OSSL_HPKE_PSKIDHASH_LABEL,
+            (unsigned char *)ctx->pskid, pskidlen)
+        != 1) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
     if (ossl_hpke_labeled_extract(kctx, ks_context + 1 + halflen, halflen,
-                                  NULL, 0, OSSL_HPKE_SEC51LABEL,
-                                  suitebuf, sizeof(suitebuf),
-                                  OSSL_HPKE_INFOHASH_LABEL,
-                                  (unsigned char *)info, infolen) != 1) {
+            NULL, 0, OSSL_HPKE_SEC51LABEL,
+            suitebuf, sizeof(suitebuf),
+            OSSL_HPKE_INFOHASH_LABEL,
+            (unsigned char *)info, infolen)
+        != 1) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -734,11 +741,12 @@ static int hpke_do_middle(OSSL_HPKE_CTX *ctx,
         goto err;
     }
     if (ossl_hpke_labeled_extract(kctx, secret, secretlen,
-                                  ctx->shared_secret, ctx->shared_secretlen,
-                                  OSSL_HPKE_SEC51LABEL,
-                                  suitebuf, sizeof(suitebuf),
-                                  OSSL_HPKE_SECRET_LABEL,
-                                  ctx->psk, ctx->psklen) != 1) {
+            ctx->shared_secret, ctx->shared_secretlen,
+            OSSL_HPKE_SEC51LABEL,
+            suitebuf, sizeof(suitebuf),
+            OSSL_HPKE_SECRET_LABEL,
+            ctx->psk, ctx->psklen)
+        != 1) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -749,10 +757,11 @@ static int hpke_do_middle(OSSL_HPKE_CTX *ctx,
         if (ctx->nonce == NULL)
             goto err;
         if (ossl_hpke_labeled_expand(kctx, ctx->nonce, ctx->noncelen,
-                                     secret, secretlen, OSSL_HPKE_SEC51LABEL,
-                                     suitebuf, sizeof(suitebuf),
-                                     OSSL_HPKE_NONCE_LABEL,
-                                     ks_context, ks_contextlen) != 1) {
+                secret, secretlen, OSSL_HPKE_SEC51LABEL,
+                suitebuf, sizeof(suitebuf),
+                OSSL_HPKE_NONCE_LABEL,
+                ks_context, ks_contextlen)
+            != 1) {
             ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
             goto err;
         }
@@ -761,10 +770,11 @@ static int hpke_do_middle(OSSL_HPKE_CTX *ctx,
         if (ctx->key == NULL)
             goto err;
         if (ossl_hpke_labeled_expand(kctx, ctx->key, ctx->keylen,
-                                     secret, secretlen, OSSL_HPKE_SEC51LABEL,
-                                     suitebuf, sizeof(suitebuf),
-                                     OSSL_HPKE_KEY_LABEL,
-                                     ks_context, ks_contextlen) != 1) {
+                secret, secretlen, OSSL_HPKE_SEC51LABEL,
+                suitebuf, sizeof(suitebuf),
+                OSSL_HPKE_KEY_LABEL,
+                ks_context, ks_contextlen)
+            != 1) {
             ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
             goto err;
         }
@@ -774,10 +784,11 @@ static int hpke_do_middle(OSSL_HPKE_CTX *ctx,
     if (ctx->exportersec == NULL)
         goto err;
     if (ossl_hpke_labeled_expand(kctx, ctx->exportersec, ctx->exporterseclen,
-                                 secret, secretlen, OSSL_HPKE_SEC51LABEL,
-                                 suitebuf, sizeof(suitebuf),
-                                 OSSL_HPKE_EXP_LABEL,
-                                 ks_context, ks_contextlen) != 1) {
+            secret, secretlen, OSSL_HPKE_SEC51LABEL,
+            suitebuf, sizeof(suitebuf),
+            OSSL_HPKE_EXP_LABEL,
+            ks_context, ks_contextlen)
+        != 1) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -796,7 +807,7 @@ static int hpke_do_middle(OSSL_HPKE_CTX *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)
 {
     OSSL_HPKE_CTX *ctx = NULL;
     const OSSL_HPKE_KEM_INFO *kem_info;
@@ -839,7 +850,7 @@ OSSL_HPKE_CTX *OSSL_HPKE_CTX_new(int mode, OSSL_HPKE_SUITE suite, int role,
     ctx->aead_info = aead_info;
     return ctx;
 
- err:
+err:
     EVP_CIPHER_free(ctx->aead_ciph);
     OPENSSL_free(ctx->propq);
     OPENSSL_free(ctx);
@@ -867,8 +878,8 @@ void OSSL_HPKE_CTX_free(OSSL_HPKE_CTX *ctx)
 }
 
 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)
 {
     if (ctx == NULL || pskid == NULL || psk == NULL || psklen == 0) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_INVALID_ARGUMENT);
@@ -913,7 +924,7 @@ int OSSL_HPKE_CTX_set1_psk(OSSL_HPKE_CTX *ctx,
 }
 
 int OSSL_HPKE_CTX_set1_ikme(OSSL_HPKE_CTX *ctx,
-                            const unsigned char *ikme, size_t ikmelen)
+    const unsigned char *ikme, size_t ikmelen)
 {
     if (ctx == NULL || ikme == NULL) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -958,7 +969,7 @@ 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 erv = 0;
     EVP_PKEY *pubp = NULL;
@@ -985,13 +996,13 @@ int OSSL_HPKE_CTX_set1_authpub(OSSL_HPKE_CTX *ctx,
         return 0;
     if (hpke_kem_id_nist_curve(ctx->suite.kem_id) == 1) {
         pubp = evp_pkey_new_raw_nist_public_key(ctx->libctx, ctx->propq,
-                                                kem_info->groupname,
-                                                pub, publen);
+            kem_info->groupname,
+            pub, publen);
     } else {
         pubp = EVP_PKEY_new_raw_public_key_ex(ctx->libctx,
-                                              kem_info->keytype,
-                                              ctx->propq,
-                                              pub, publen);
+            kem_info->keytype,
+            ctx->propq,
+            pub, publen);
     }
     if (pubp == NULL) {
         /* can happen based on external input - buffer value may be garbage */
@@ -1006,8 +1017,8 @@ int OSSL_HPKE_CTX_set1_authpub(OSSL_HPKE_CTX *ctx,
     if (lpub == NULL)
         goto err;
     if (EVP_PKEY_get_octet_string_param(pubp,
-                                        OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
-                                        lpub, OSSL_HPKE_MAXSIZE, &lpublen)
+            OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+            lpub, OSSL_HPKE_MAXSIZE, &lpublen)
         != 1) {
         OPENSSL_free(lpub);
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
@@ -1054,9 +1065,9 @@ int OSSL_HPKE_CTX_set_seq(OSSL_HPKE_CTX *ctx, uint64_t seq)
 }
 
 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 erv = 1;
     size_t minenc = 0;
@@ -1102,9 +1113,9 @@ int OSSL_HPKE_encap(OSSL_HPKE_CTX *ctx,
 }
 
 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 erv = 1;
     size_t minenc = 0;
@@ -1150,9 +1161,9 @@ int OSSL_HPKE_decap(OSSL_HPKE_CTX *ctx,
 }
 
 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)
 {
     unsigned char seqbuf[OSSL_HPKE_MAX_NONCELEN];
     size_t seqlen = 0;
@@ -1192,9 +1203,9 @@ int OSSL_HPKE_seal(OSSL_HPKE_CTX *ctx,
 }
 
 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)
 {
     unsigned char seqbuf[OSSL_HPKE_MAX_NONCELEN];
     size_t seqlen = 0;
@@ -1233,8 +1244,8 @@ int OSSL_HPKE_open(OSSL_HPKE_CTX *ctx,
 }
 
 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 erv = 0;
     EVP_KDF_CTX *kctx = NULL;
@@ -1277,11 +1288,11 @@ int OSSL_HPKE_export(OSSL_HPKE_CTX *ctx,
     suitebuf[4] = ctx->suite.aead_id / 256;
     suitebuf[5] = ctx->suite.aead_id % 256;
     erv = ossl_hpke_labeled_expand(kctx, secret, secretlen,
-                                   ctx->exportersec, ctx->exporterseclen,
-                                   OSSL_HPKE_SEC51LABEL,
-                                   suitebuf, sizeof(suitebuf),
-                                   OSSL_HPKE_EXP_SEC_LABEL,
-                                   label, labellen);
+        ctx->exportersec, ctx->exporterseclen,
+        OSSL_HPKE_SEC51LABEL,
+        suitebuf, sizeof(suitebuf),
+        OSSL_HPKE_EXP_SEC_LABEL,
+        label, labellen);
     EVP_KDF_CTX_free(kctx);
     if (erv != 1)
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
@@ -1289,9 +1300,9 @@ int OSSL_HPKE_export(OSSL_HPKE_CTX *ctx,
 }
 
 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 erv = 0; /* Our error return value - 1 is success */
     EVP_PKEY_CTX *pctx = NULL;
@@ -1316,7 +1327,7 @@ int OSSL_HPKE_keygen(OSSL_HPKE_SUITE suite,
 
     if (hpke_kem_id_nist_curve(suite.kem_id) == 1) {
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                (char *)kem_info->groupname, 0);
+            (char *)kem_info->groupname, 0);
         pctx = EVP_PKEY_CTX_new_from_name(libctx, "EC", propq);
     } else {
         pctx = EVP_PKEY_CTX_new_from_name(libctx, kem_info->keytype, propq);
@@ -1328,7 +1339,7 @@ int OSSL_HPKE_keygen(OSSL_HPKE_SUITE suite,
     }
     if (ikm != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_DHKEM_IKM,
-                                                 (char *)ikm, ikmlen);
+            (char *)ikm, ikmlen);
     *p = OSSL_PARAM_construct_end();
     if (EVP_PKEY_CTX_set_params(pctx, params) <= 0) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
@@ -1341,7 +1352,8 @@ int OSSL_HPKE_keygen(OSSL_HPKE_SUITE suite,
     EVP_PKEY_CTX_free(pctx);
     pctx = NULL;
     if (EVP_PKEY_get_octet_string_param(skR, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
-                                        pub, *publen, publen) != 1) {
+            pub, *publen, publen)
+        != 1) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -1361,10 +1373,10 @@ 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)
 {
     OSSL_HPKE_SUITE chosen;
     size_t plen = 0;
@@ -1410,7 +1422,8 @@ int OSSL_HPKE_get_grease_value(const OSSL_HPKE_SUITE *suite_in,
      * the relevant curve.
      */
     if (OSSL_HPKE_keygen(chosen, enc, enclen, &fakepriv, NULL, 0,
-                         libctx, propq) != 1) {
+            libctx, propq)
+        != 1) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
         goto err;
     }
diff --git a/crypto/hpke/hpke_util.c b/crypto/hpke/hpke_util.c
index a9d86a935595a..b74f36b6e376d 100644
--- a/crypto/hpke/hpke_util.c
+++ b/crypto/hpke/hpke_util.c
@@ -63,19 +63,19 @@ static const char LABEL_HPKEV1[] = "\x48\x50\x4B\x45\x2D\x76\x31";
 static const OSSL_HPKE_KEM_INFO hpke_kem_tab[] = {
 #ifndef OPENSSL_NO_EC
     { OSSL_HPKE_KEM_ID_P256, "EC", OSSL_HPKE_KEMSTR_P256,
-      LN_sha256, SHA256_DIGEST_LENGTH, 65, 65, 32, 0xFF },
+        LN_sha256, SHA256_DIGEST_LENGTH, 65, 65, 32, 0xFF },
     { OSSL_HPKE_KEM_ID_P384, "EC", OSSL_HPKE_KEMSTR_P384,
-      LN_sha384, SHA384_DIGEST_LENGTH, 97, 97, 48, 0xFF },
+        LN_sha384, SHA384_DIGEST_LENGTH, 97, 97, 48, 0xFF },
     { OSSL_HPKE_KEM_ID_P521, "EC", OSSL_HPKE_KEMSTR_P521,
-      LN_sha512, SHA512_DIGEST_LENGTH, 133, 133, 66, 0x01 },
-# ifndef OPENSSL_NO_ECX
+        LN_sha512, SHA512_DIGEST_LENGTH, 133, 133, 66, 0x01 },
+#ifndef OPENSSL_NO_ECX
     { OSSL_HPKE_KEM_ID_X25519, OSSL_HPKE_KEMSTR_X25519, NULL,
-      LN_sha256, SHA256_DIGEST_LENGTH,
-      X25519_KEYLEN, X25519_KEYLEN, X25519_KEYLEN, 0x00 },
+        LN_sha256, SHA256_DIGEST_LENGTH,
+        X25519_KEYLEN, X25519_KEYLEN, X25519_KEYLEN, 0x00 },
     { OSSL_HPKE_KEM_ID_X448, OSSL_HPKE_KEMSTR_X448, NULL,
-      LN_sha512, SHA512_DIGEST_LENGTH,
-      X448_KEYLEN, X448_KEYLEN, X448_KEYLEN, 0x00 }
-# endif
+        LN_sha512, SHA512_DIGEST_LENGTH,
+        X448_KEYLEN, X448_KEYLEN, X448_KEYLEN, 0x00 }
+#endif
 #else
     { OSSL_HPKE_KEM_ID_RESERVED, NULL, NULL, NULL, 0, 0, 0, 0, 0x00 }
 #endif
@@ -87,12 +87,12 @@ static const OSSL_HPKE_KEM_INFO hpke_kem_tab[] = {
  */
 static const OSSL_HPKE_AEAD_INFO hpke_aead_tab[] = {
     { OSSL_HPKE_AEAD_ID_AES_GCM_128, LN_aes_128_gcm, 16, 16,
-      OSSL_HPKE_MAX_NONCELEN },
+        OSSL_HPKE_MAX_NONCELEN },
     { OSSL_HPKE_AEAD_ID_AES_GCM_256, LN_aes_256_gcm, 16, 32,
-      OSSL_HPKE_MAX_NONCELEN },
+        OSSL_HPKE_MAX_NONCELEN },
 #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
     { OSSL_HPKE_AEAD_ID_CHACHA_POLY1305, LN_chacha20_poly1305, 16, 32,
-      OSSL_HPKE_MAX_NONCELEN },
+        OSSL_HPKE_MAX_NONCELEN },
 #endif
     { OSSL_HPKE_AEAD_ID_EXPORTONLY, NULL, 0, 0, 0 }
 };
@@ -120,36 +120,36 @@ static const OSSL_HPKE_KDF_INFO hpke_kdf_tab[] = {
  * sizes (i.e. allow exactly 4 synonyms) don't change.
  */
 static const synonymttab_t kemstrtab[] = {
-    {OSSL_HPKE_KEM_ID_P256,
-     {OSSL_HPKE_KEMSTR_P256, "0x10", "0x10", "16" }},
-    {OSSL_HPKE_KEM_ID_P384,
-     {OSSL_HPKE_KEMSTR_P384, "0x11", "0x11", "17" }},
-    {OSSL_HPKE_KEM_ID_P521,
-     {OSSL_HPKE_KEMSTR_P521, "0x12", "0x12", "18" }},
-# ifndef OPENSSL_NO_ECX
-    {OSSL_HPKE_KEM_ID_X25519,
-     {OSSL_HPKE_KEMSTR_X25519, "0x20", "0x20", "32" }},
-    {OSSL_HPKE_KEM_ID_X448,
-     {OSSL_HPKE_KEMSTR_X448, "0x21", "0x21", "33" }}
-# endif
+    { OSSL_HPKE_KEM_ID_P256,
+        { OSSL_HPKE_KEMSTR_P256, "0x10", "0x10", "16" } },
+    { OSSL_HPKE_KEM_ID_P384,
+        { OSSL_HPKE_KEMSTR_P384, "0x11", "0x11", "17" } },
+    { OSSL_HPKE_KEM_ID_P521,
+        { OSSL_HPKE_KEMSTR_P521, "0x12", "0x12", "18" } },
+#ifndef OPENSSL_NO_ECX
+    { OSSL_HPKE_KEM_ID_X25519,
+        { OSSL_HPKE_KEMSTR_X25519, "0x20", "0x20", "32" } },
+    { OSSL_HPKE_KEM_ID_X448,
+        { OSSL_HPKE_KEMSTR_X448, "0x21", "0x21", "33" } }
+#endif
 };
 static const synonymttab_t kdfstrtab[] = {
-    {OSSL_HPKE_KDF_ID_HKDF_SHA256,
-     {OSSL_HPKE_KDFSTR_256, "0x1", "0x01", "1"}},
-    {OSSL_HPKE_KDF_ID_HKDF_SHA384,
-     {OSSL_HPKE_KDFSTR_384, "0x2", "0x02", "2"}},
-    {OSSL_HPKE_KDF_ID_HKDF_SHA512,
-     {OSSL_HPKE_KDFSTR_512, "0x3", "0x03", "3"}}
+    { OSSL_HPKE_KDF_ID_HKDF_SHA256,
+        { OSSL_HPKE_KDFSTR_256, "0x1", "0x01", "1" } },
+    { OSSL_HPKE_KDF_ID_HKDF_SHA384,
+        { OSSL_HPKE_KDFSTR_384, "0x2", "0x02", "2" } },
+    { OSSL_HPKE_KDF_ID_HKDF_SHA512,
+        { OSSL_HPKE_KDFSTR_512, "0x3", "0x03", "3" } }
 };
 static const synonymttab_t aeadstrtab[] = {
-    {OSSL_HPKE_AEAD_ID_AES_GCM_128,
-     {OSSL_HPKE_AEADSTR_AES128GCM, "0x1", "0x01", "1"}},
-    {OSSL_HPKE_AEAD_ID_AES_GCM_256,
-     {OSSL_HPKE_AEADSTR_AES256GCM, "0x2", "0x02", "2"}},
-    {OSSL_HPKE_AEAD_ID_CHACHA_POLY1305,
-     {OSSL_HPKE_AEADSTR_CP, "0x3", "0x03", "3"}},
-    {OSSL_HPKE_AEAD_ID_EXPORTONLY,
-     {OSSL_HPKE_AEADSTR_EXP, "ff", "0xff", "255"}}
+    { OSSL_HPKE_AEAD_ID_AES_GCM_128,
+        { OSSL_HPKE_AEADSTR_AES128GCM, "0x1", "0x01", "1" } },
+    { OSSL_HPKE_AEAD_ID_AES_GCM_256,
+        { OSSL_HPKE_AEADSTR_AES256GCM, "0x2", "0x02", "2" } },
+    { OSSL_HPKE_AEAD_ID_CHACHA_POLY1305,
+        { OSSL_HPKE_AEADSTR_CP, "0x3", "0x03", "3" } },
+    { OSSL_HPKE_AEAD_ID_EXPORTONLY,
+        { OSSL_HPKE_AEADSTR_EXP, "ff", "0xff", "255" } }
 };
 
 /* Return an object containing KEM constants associated with a EC curve name */
@@ -245,10 +245,10 @@ const OSSL_HPKE_AEAD_INFO *ossl_HPKE_AEAD_INFO_find_random(OSSL_LIB_CTX *ctx)
 }
 
 static int kdf_derive(EVP_KDF_CTX *kctx,
-                      unsigned char *out, size_t outlen, int mode,
-                      const unsigned char *salt, size_t saltlen,
-                      const unsigned char *ikm, size_t ikmlen,
-                      const unsigned char *info, size_t infolen)
+    unsigned char *out, size_t outlen, int mode,
+    const unsigned char *salt, size_t saltlen,
+    const unsigned char *ikm, size_t ikmlen,
+    const unsigned char *info, size_t infolen)
 {
     int ret;
     OSSL_PARAM params[5], *p = params;
@@ -256,13 +256,13 @@ static int kdf_derive(EVP_KDF_CTX *kctx,
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_MODE, &mode);
     if (salt != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                                 (char *)salt, saltlen);
+            (char *)salt, saltlen);
     if (ikm != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
-                                                 (char *)ikm, ikmlen);
+            (char *)ikm, ikmlen);
     if (info != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO,
-                                                 (char *)info, infolen);
+            (char *)info, infolen);
     *p = OSSL_PARAM_construct_end();
     ret = EVP_KDF_derive(kctx, out, outlen, params) > 0;
     if (!ret)
@@ -271,34 +271,34 @@ static int kdf_derive(EVP_KDF_CTX *kctx,
 }
 
 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)
 {
     return kdf_derive(kctx, prk, prklen, EVP_KDF_HKDF_MODE_EXTRACT_ONLY,
-                      salt, saltlen, ikm, ikmlen, NULL, 0);
+        salt, saltlen, ikm, ikmlen, NULL, 0);
 }
 
 /* Common code to perform a HKDF expand */
 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)
 {
     return kdf_derive(kctx, okm, okmlen, EVP_KDF_HKDF_MODE_EXPAND_ONLY,
-                      NULL, 0, prk, prklen, info, infolen);
+        NULL, 0, prk, prklen, info, infolen);
 }
 
 /*
  * See RFC 9180 Section 4 LabelExtract()
  */
 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 ret = 0;
     size_t label_hpkev1len = 0;
@@ -319,19 +319,19 @@ int ossl_hpke_labeled_extract(EVP_KDF_CTX *kctx,
 
     /* labeled_ikm = concat("HPKE-v1", suiteid, label, ikm) */
     if (!WPACKET_init_static_len(&pkt, labeled_ikm, labeled_ikmlen, 0)
-            || !WPACKET_memcpy(&pkt, LABEL_HPKEV1, label_hpkev1len)
-            || !WPACKET_memcpy(&pkt, protocol_label, protocol_labellen)
-            || !WPACKET_memcpy(&pkt, suiteid, suiteidlen)
-            || !WPACKET_memcpy(&pkt, label, labellen)
-            || !WPACKET_memcpy(&pkt, ikm, ikmlen)
-            || !WPACKET_get_total_written(&pkt, &labeled_ikmlen)
-            || !WPACKET_finish(&pkt)) {
+        || !WPACKET_memcpy(&pkt, LABEL_HPKEV1, label_hpkev1len)
+        || !WPACKET_memcpy(&pkt, protocol_label, protocol_labellen)
+        || !WPACKET_memcpy(&pkt, suiteid, suiteidlen)
+        || !WPACKET_memcpy(&pkt, label, labellen)
+        || !WPACKET_memcpy(&pkt, ikm, ikmlen)
+        || !WPACKET_get_total_written(&pkt, &labeled_ikmlen)
+        || !WPACKET_finish(&pkt)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
         goto end;
     }
 
     ret = ossl_hpke_kdf_extract(kctx, prk, prklen, salt, saltlen,
-                                labeled_ikm, labeled_ikmlen);
+        labeled_ikm, labeled_ikmlen);
 end:
     WPACKET_cleanup(&pkt);
     OPENSSL_cleanse(labeled_ikm, labeled_ikmlen);
@@ -343,12 +343,12 @@ int ossl_hpke_labeled_extract(EVP_KDF_CTX *kctx,
  * See RFC 9180 Section 4 LabelExpand()
  */
 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)
 {
     int ret = 0;
     size_t label_hpkev1len = 0;
@@ -369,20 +369,20 @@ int ossl_hpke_labeled_expand(EVP_KDF_CTX *kctx,
 
     /* labeled_info = concat(okmlen, "HPKE-v1", suiteid, label, info) */
     if (!WPACKET_init_static_len(&pkt, labeled_info, labeled_infolen, 0)
-            || !WPACKET_put_bytes_u16(&pkt, okmlen)
-            || !WPACKET_memcpy(&pkt, LABEL_HPKEV1, label_hpkev1len)
-            || !WPACKET_memcpy(&pkt, protocol_label, protocol_labellen)
-            || !WPACKET_memcpy(&pkt, suiteid, suiteidlen)
-            || !WPACKET_memcpy(&pkt, label, labellen)
-            || !WPACKET_memcpy(&pkt, info, infolen)
-            || !WPACKET_get_total_written(&pkt, &labeled_infolen)
-            || !WPACKET_finish(&pkt)) {
+        || !WPACKET_put_bytes_u16(&pkt, okmlen)
+        || !WPACKET_memcpy(&pkt, LABEL_HPKEV1, label_hpkev1len)
+        || !WPACKET_memcpy(&pkt, protocol_label, protocol_labellen)
+        || !WPACKET_memcpy(&pkt, suiteid, suiteidlen)
+        || !WPACKET_memcpy(&pkt, label, labellen)
+        || !WPACKET_memcpy(&pkt, info, infolen)
+        || !WPACKET_get_total_written(&pkt, &labeled_infolen)
+        || !WPACKET_finish(&pkt)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
         goto end;
     }
 
     ret = ossl_hpke_kdf_expand(kctx, okm, okmlen,
-                               prk, prklen, labeled_info, labeled_infolen);
+        prk, prklen, labeled_info, labeled_infolen);
 end:
     WPACKET_cleanup(&pkt);
     OPENSSL_free(labeled_info);
@@ -391,7 +391,7 @@ int ossl_hpke_labeled_expand(EVP_KDF_CTX *kctx,
 
 /* Common code to create a HKDF ctx */
 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)
 {
     EVP_KDF *kdf;
     EVP_KDF_CTX *kctx = NULL;
@@ -408,10 +408,10 @@ EVP_KDF_CTX *ossl_kdf_ctx_create(const char *kdfname, const char *mdname,
 
         if (mdname != NULL)
             *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                                    (char *)mdname, 0);
+                (char *)mdname, 0);
         if (propq != NULL)
             *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_PROPERTIES,
-                                                    (char *)propq, 0);
+                (char *)propq, 0);
         *p = OSSL_PARAM_construct_end();
         if (EVP_KDF_CTX_set_params(kctx, params) <= 0) {
             EVP_KDF_CTX_free(kctx);
@@ -429,7 +429,7 @@ EVP_KDF_CTX *ossl_kdf_ctx_create(const char *kdfname, const char *mdname,
  * @return 0 when not found, else the matching item id.
  */
 static uint16_t synonyms_name2id(const char *st, const synonymttab_t *synp,
-                                 size_t arrsize)
+    size_t arrsize)
 {
     size_t i, j;
 
@@ -498,15 +498,18 @@ int ossl_hpke_str2suite(const char *suitestr, OSSL_HPKE_SUITE *suite)
         /* check if string is known or number and if so handle appropriately */
         if (labels == 0
             && (kem = synonyms_name2id(st, kemstrtab,
-                                       OSSL_NELEM(kemstrtab))) == 0)
+                    OSSL_NELEM(kemstrtab)))
+                == 0)
             goto fail;
         else if (labels == 1
-                 && (kdf = synonyms_name2id(st, kdfstrtab,
-                                            OSSL_NELEM(kdfstrtab))) == 0)
+            && (kdf = synonyms_name2id(st, kdfstrtab,
+                    OSSL_NELEM(kdfstrtab)))
+                == 0)
             goto fail;
         else if (labels == 2
-                 && (aead = synonyms_name2id(st, aeadstrtab,
-                                             OSSL_NELEM(aeadstrtab))) == 0)
+            && (aead = synonyms_name2id(st, aeadstrtab,
+                    OSSL_NELEM(aeadstrtab)))
+                == 0)
             goto fail;
 
         if (cp == NULL)
diff --git a/crypto/http/http_client.c b/crypto/http/http_client.c
index dea69ffc64d44..cc12545fc447c 100644
--- a/crypto/http/http_client.c
+++ b/crypto/http/http_client.c
@@ -27,70 +27,71 @@
 #define HTTP_PREFIX "HTTP/"
 #define HTTP_VERSION_PATT "1." /* allow 1.x */
 #define HTTP_VERSION_STR_LEN sizeof(HTTP_VERSION_PATT) /* == strlen("1.0") */
-#define HTTP_PREFIX_VERSION HTTP_PREFIX""HTTP_VERSION_PATT
-#define HTTP_1_0 HTTP_PREFIX_VERSION"0" /* "HTTP/1.0" */
+#define HTTP_PREFIX_VERSION HTTP_PREFIX "" HTTP_VERSION_PATT
+#define HTTP_1_0 HTTP_PREFIX_VERSION "0" /* "HTTP/1.0" */
 #define HTTP_LINE1_MINLEN (sizeof(HTTP_PREFIX_VERSION "x 200\n") - 1)
 #define HTTP_VERSION_MAX_REDIRECTIONS 50
 
-#define HTTP_STATUS_CODE_OK                200
+#define HTTP_STATUS_CODE_OK 200
 #define HTTP_STATUS_CODE_MOVED_PERMANENTLY 301
-#define HTTP_STATUS_CODE_FOUND             302
-#define HTTP_STATUS_CODES_NONFATAL_ERROR   400
+#define HTTP_STATUS_CODE_FOUND 302
+#define HTTP_STATUS_CODES_NONFATAL_ERROR 400
+#define HTTP_STATUS_CODE_NOT_FOUND 404
 
 /* Stateful HTTP request code, supporting blocking and non-blocking I/O */
 
 /* Opaque HTTP request status structure */
 
 struct ossl_http_req_ctx_st {
-    int state;                  /* Current I/O state */
-    unsigned char *buf;         /* Buffer to write request or read response */
-    int buf_size;               /* Buffer size */
-    int free_wbio;              /* wbio allocated internally, free with ctx */
-    BIO *wbio;                  /* BIO to write/send request to */
-    BIO *rbio;                  /* BIO to read/receive response from */
-    OSSL_HTTP_bio_cb_t upd_fn;  /* Optional BIO update callback used for TLS */
-    void *upd_arg;              /* Optional arg for update callback function */
-    int use_ssl;                /* Use HTTPS */
-    char *proxy;                /* Optional proxy name or URI */
-    char *server;               /* Optional server hostname */
-    char *port;                 /* Optional server port */
-    BIO *mem;                   /* Mem BIO holding request header or response */
-    BIO *req;                   /* BIO holding the request provided by caller */
-    int method_POST;            /* HTTP method is POST (else GET) */
-    int text;                   /* Request content type is (likely) text */
-    char *expected_ct;          /* Optional expected Content-Type */
-    int expect_asn1;            /* Response content must be ASN.1-encoded */
-    unsigned char *pos;         /* Current position sending data */
-    long len_to_send;           /* Number of bytes still to send */
-    size_t resp_len;            /* Length of response */
-    size_t max_resp_len;        /* Maximum length of response, or 0 */
-    int keep_alive;             /* Persistent conn. 0=no, 1=prefer, 2=require */
-    time_t max_time;            /* Maximum end time of current transfer, or 0 */
-    time_t max_total_time;      /* Maximum end time of total transfer, or 0 */
-    char *redirection_url;      /* Location obtained from HTTP status 301/302 */
-    size_t max_hdr_lines;       /* Max. number of response header lines, or 0 */
+    int state; /* Current I/O state */
+    unsigned char *buf; /* Buffer to write request or read response */
+    int buf_size; /* Buffer size */
+    int free_wbio; /* wbio allocated internally, free with ctx */
+    BIO *wbio; /* BIO to write/send request to */
+    BIO *rbio; /* BIO to read/receive response from */
+    OSSL_HTTP_bio_cb_t upd_fn; /* Optional BIO update callback used for TLS */
+    void *upd_arg; /* Optional arg for update callback function */
+    int use_ssl; /* Use HTTPS */
+    char *proxy; /* Optional proxy name or URI */
+    char *server; /* Optional server hostname */
+    char *port; /* Optional server port */
+    BIO *mem; /* Mem BIO holding request header or response */
+    BIO *req; /* BIO holding the request provided by caller */
+    int method_POST; /* HTTP method is POST (else GET) */
+    int text; /* Request content type is (likely) text */
+    char *expected_ct; /* Optional expected Content-Type */
+    int expect_asn1; /* Response content must be ASN.1-encoded */
+    unsigned char *pos; /* Current position sending data */
+    long len_to_send; /* Number of bytes still to send */
+    size_t resp_len; /* Length of response */
+    size_t max_resp_len; /* Maximum length of response, or 0 */
+    int keep_alive; /* Persistent conn. 0=no, 1=prefer, 2=require */
+    time_t max_time; /* Maximum end time of current transfer, or 0 */
+    time_t max_total_time; /* Maximum end time of total transfer, or 0 */
+    char *redirection_url; /* Location obtained from HTTP status 301/302 */
+    size_t max_hdr_lines; /* Max. number of response header lines, or 0 */
 };
 
 /* HTTP client OSSL_HTTP_REQ_CTX_nbio() internal states, in typical order */
 
-#define OHS_NOREAD         0x1000 /* If set no reading should be performed */
-#define OHS_ERROR          (0 | OHS_NOREAD) /* Error condition */
-#define OHS_ADD_HEADERS    (1 | OHS_NOREAD) /* Adding header lines to request */
-#define OHS_WRITE_INIT     (2 | OHS_NOREAD) /* 1st call: ready to start send */
-#define OHS_WRITE_HDR1     (3 | OHS_NOREAD) /* Request header to be sent */
-#define OHS_WRITE_HDR      (4 | OHS_NOREAD) /* Request header being sent */
-#define OHS_WRITE_REQ      (5 | OHS_NOREAD) /* Request content (body) being sent */
-#define OHS_FLUSH          (6 | OHS_NOREAD) /* Request being flushed */
-
-#define OHS_FIRSTLINE       1 /* First line of response being read */
-#define OHS_HEADERS         2 /* MIME headers of response being read */
-#define OHS_HEADERS_ERROR   3 /* MIME headers of response being read after fatal error */
-#define OHS_REDIRECT        4 /* MIME headers being read, expecting Location */
-#define OHS_ASN1_HEADER     5 /* ASN1 sequence header (tag+length) being read */
-#define OHS_ASN1_CONTENT    6 /* ASN1 content octets being read */
-#define OHS_ASN1_DONE       7 /* ASN1 content read completed */
-#define OHS_STREAM          8 /* HTTP content stream to be read by caller */
-#define OHS_ERROR_CONTENT   9 /* response content (body) being read after fatal error */
+#define OHS_NOREAD 0x1000 /* If set no reading should be performed */
+#define OHS_ERROR (0 | OHS_NOREAD) /* Error condition */
+#define OHS_ADD_HEADERS (1 | OHS_NOREAD) /* Adding header lines to request */
+#define OHS_WRITE_INIT (2 | OHS_NOREAD) /* 1st call: ready to start send */
+#define OHS_WRITE_HDR1 (3 | OHS_NOREAD) /* Request header to be sent */
+#define OHS_WRITE_HDR (4 | OHS_NOREAD) /* Request header being sent */
+#define OHS_WRITE_REQ (5 | OHS_NOREAD) /* Request content (body) being sent */
+#define OHS_FLUSH (6 | OHS_NOREAD) /* Request being flushed */
+
+#define OHS_FIRSTLINE 1 /* First line of response being read */
+#define OHS_HEADERS 2 /* MIME headers of response being read */
+#define OHS_HEADERS_ERROR 3 /* MIME headers of response being read after fatal error */
+#define OHS_REDIRECT 4 /* MIME headers being read, expecting Location */
+#define OHS_ASN1_HEADER 5 /* ASN1 sequence header (tag+length) being read */
+#define OHS_ASN1_CONTENT 6 /* ASN1 content octets being read */
+#define OHS_ASN1_DONE 7 /* ASN1 content read completed */
+#define OHS_STREAM 8 /* HTTP content stream to be read by caller */
+#define OHS_ERROR_CONTENT 9 /* response content (body) being read after fatal error */
 
 /* Low-level HTTP API implementation */
 
@@ -161,7 +162,7 @@ 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)
 {
     if (rctx == NULL) {
         ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
@@ -176,8 +177,8 @@ void OSSL_HTTP_REQ_CTX_set_max_response_length(OSSL_HTTP_REQ_CTX *rctx,
  * a plain HTTP proxy is used and |path| does not begin with 'http://'.
  */
 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)
 {
     if (rctx == NULL) {
         ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
@@ -196,14 +197,14 @@ int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
          * Section 5.1.2 of RFC 1945 states that the absoluteURI form is only
          * allowed when using a proxy
          */
-        if (BIO_printf(rctx->mem, OSSL_HTTP_PREFIX"%s", server) <= 0)
+        if (BIO_printf(rctx->mem, OSSL_HTTP_PREFIX "%s", server) <= 0)
             return 0;
         if (port != NULL && BIO_printf(rctx->mem, ":%s", port) <= 0)
             return 0;
     }
 
     /* Make sure path includes a forward slash (abs_path) */
-    if (path == NULL)  {
+    if (path == NULL) {
         path = "/";
     } else if (HAS_PREFIX(path, "http://")) { /* absoluteURI for proxy use */
         if (server != NULL) {
@@ -217,7 +218,7 @@ int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
      * Add (the rest of) the path and the HTTP version,
      * which is fixed to 1.0 for straightforward implementation of keep-alive
      */
-    if (BIO_printf(rctx->mem, "%s "HTTP_1_0"\r\n", path) <= 0)
+    if (BIO_printf(rctx->mem, "%s " HTTP_1_0 "\r\n", path) <= 0)
         return 0;
 
     rctx->resp_len = 0;
@@ -226,7 +227,7 @@ int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
 }
 
 int OSSL_HTTP_REQ_CTX_add1_header(OSSL_HTTP_REQ_CTX *rctx,
-                                  const char *name, const char *value)
+    const char *name, const char *value)
 {
     if (rctx == NULL || name == NULL) {
         ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
@@ -249,15 +250,15 @@ int OSSL_HTTP_REQ_CTX_add1_header(OSSL_HTTP_REQ_CTX *rctx,
 }
 
 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)
 {
     if (rctx == NULL) {
         ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
         return 0;
     }
     if (keep_alive != 0
-            && rctx->state != OHS_ERROR && rctx->state != OHS_ADD_HEADERS) {
+        && rctx->state != OHS_ERROR && rctx->state != OHS_ADD_HEADERS) {
         /* Cannot anymore set keep-alive in request header */
         ERR_raise(ERR_LIB_HTTP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return 0;
@@ -266,7 +267,7 @@ int OSSL_HTTP_REQ_CTX_set_expected(OSSL_HTTP_REQ_CTX *rctx,
     OPENSSL_free(rctx->expected_ct);
     rctx->expected_ct = NULL;
     if (content_type != NULL
-            && (rctx->expected_ct = OPENSSL_strdup(content_type)) == NULL)
+        && (rctx->expected_ct = OPENSSL_strdup(content_type)) == NULL)
         return 0;
 
     rctx->expect_asn1 = asn1;
@@ -279,7 +280,7 @@ int OSSL_HTTP_REQ_CTX_set_expected(OSSL_HTTP_REQ_CTX *rctx,
 }
 
 static int set1_content(OSSL_HTTP_REQ_CTX *rctx,
-                        const char *content_type, BIO *req)
+    const char *content_type, BIO *req)
 {
     long req_len = 0;
 #ifndef OPENSSL_NO_STDIO
@@ -292,7 +293,7 @@ static int set1_content(OSSL_HTTP_REQ_CTX *rctx,
     }
 
     if (rctx->keep_alive != 0
-            && !OSSL_HTTP_REQ_CTX_add1_header(rctx, "Connection", "keep-alive"))
+        && !OSSL_HTTP_REQ_CTX_add1_header(rctx, "Connection", "keep-alive"))
         return 0;
 
     BIO_free(rctx->req);
@@ -335,10 +336,10 @@ static int set1_content(OSSL_HTTP_REQ_CTX *rctx,
     }
     if ((
 #ifndef OPENSSL_NO_STDIO
-         fp != NULL /* definitely correct req_len */ ||
+            fp != NULL /* definitely correct req_len */ ||
 #endif
-         req_len > 0)
-            && BIO_printf(rctx->mem, "Content-Length: %ld\r\n", req_len) < 0)
+            req_len > 0)
+        && BIO_printf(rctx->mem, "Content-Length: %ld\r\n", req_len) < 0)
         return 0;
 
     if (!BIO_up_ref(req))
@@ -348,7 +349,7 @@ static int set1_content(OSSL_HTTP_REQ_CTX *rctx,
 }
 
 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)
 {
     BIO *mem = NULL;
     int res = 1;
@@ -361,7 +362,7 @@ int OSSL_HTTP_REQ_CTX_set1_req(OSSL_HTTP_REQ_CTX *rctx, const char *content_type
 }
 
 void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
-                                                  size_t count)
+    size_t count)
 {
     if (rctx == NULL) {
         ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
@@ -371,7 +372,7 @@ void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
 }
 
 static int add1_headers(OSSL_HTTP_REQ_CTX *rctx,
-                        const STACK_OF(CONF_VALUE) *headers, const char *host)
+    const STACK_OF(CONF_VALUE) *headers, const char *host)
 {
     int i;
     int add_host = host != NULL && *host != '\0';
@@ -392,11 +393,11 @@ static int add1_headers(OSSL_HTTP_REQ_CTX *rctx,
 
 /* Create OSSL_HTTP_REQ_CTX structure using the values provided. */
 static OSSL_HTTP_REQ_CTX *http_req_ctx_new(int free_wbio, BIO *wbio, BIO *rbio,
-                                           OSSL_HTTP_bio_cb_t bio_update_fn,
-                                           void *arg, int use_ssl,
-                                           const char *proxy,
-                                           const char *server, const char *port,
-                                           int buf_size, int overall_timeout)
+    OSSL_HTTP_bio_cb_t bio_update_fn,
+    void *arg, int use_ssl,
+    const char *proxy,
+    const char *server, const char *port,
+    int buf_size, int overall_timeout)
 {
     OSSL_HTTP_REQ_CTX *rctx = OSSL_HTTP_REQ_CTX_new(wbio, rbio, buf_size);
 
@@ -407,19 +408,18 @@ static OSSL_HTTP_REQ_CTX *http_req_ctx_new(int free_wbio, BIO *wbio, BIO *rbio,
     rctx->upd_arg = arg;
     rctx->use_ssl = use_ssl;
     if (proxy != NULL
-            && (rctx->proxy = OPENSSL_strdup(proxy)) == NULL)
+        && (rctx->proxy = OPENSSL_strdup(proxy)) == NULL)
         goto err;
     if (server != NULL
-            && (rctx->server = OPENSSL_strdup(server)) == NULL)
+        && (rctx->server = OPENSSL_strdup(server)) == NULL)
         goto err;
     if (port != NULL
-            && (rctx->port = OPENSSL_strdup(port)) == NULL)
+        && (rctx->port = OPENSSL_strdup(port)) == NULL)
         goto err;
-    rctx->max_total_time =
-        overall_timeout > 0 ? time(NULL) + overall_timeout : 0;
+    rctx->max_total_time = overall_timeout > 0 ? time(NULL) + overall_timeout : 0;
     return rctx;
 
- err:
+err:
     OSSL_HTTP_REQ_CTX_free(rctx);
     return NULL;
 }
@@ -488,15 +488,16 @@ static int parse_http_line1(char *line, int *found_keep_alive)
     case HTTP_STATUS_CODE_FOUND:
         return retcode;
     default:
-        if (retcode < HTTP_STATUS_CODES_NONFATAL_ERROR) {
+        if (retcode == HTTP_STATUS_CODE_NOT_FOUND
+            || retcode < HTTP_STATUS_CODES_NONFATAL_ERROR) {
             ERR_raise_data(ERR_LIB_HTTP, HTTP_R_STATUS_CODE_UNSUPPORTED, "code=%s", code);
             if (*reason != '\0')
                 ERR_add_error_data(2, ", reason=", reason);
-        } /* must return content normally if status >= 400 */
+        } /* must return content normally if status >= 400, still tentatively raised error on 404 */
         return retcode;
     }
 
- err:
+err:
     for (i = 0; i < 60 && line[i] != '\0'; i++)
         if (!ossl_isprint(line[i]))
             line[i] = ' ';
@@ -509,7 +510,7 @@ static int check_max_len(const char *desc, size_t max_len, size_t len)
 {
     if (max_len != 0 && len > max_len) {
         ERR_raise_data(ERR_LIB_HTTP, HTTP_R_MAX_RESP_LEN_EXCEEDED,
-                       "%s length=%zu, max=%zu", desc, len, max_len);
+            "%s length=%zu, max=%zu", desc, len, max_len);
         return 0;
     }
     return 1;
@@ -521,7 +522,7 @@ static int check_set_resp_len(const char *desc, OSSL_HTTP_REQ_CTX *rctx, size_t
         return 0;
     if (rctx->resp_len != 0 && rctx->resp_len != len) {
         ERR_raise_data(ERR_LIB_HTTP, HTTP_R_INCONSISTENT_CONTENT_LENGTH,
-                       "%s length=%zu, Content-Length=%zu", desc, len, rctx->resp_len);
+            "%s length=%zu, Content-Length=%zu", desc, len, rctx->resp_len);
         return 0;
     }
     rctx->resp_len = len;
@@ -567,11 +568,10 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
     }
 
     rctx->redirection_url = NULL;
- next_io:
+next_io:
     buf = (char *)rctx->buf;
     if ((rctx->state & OHS_NOREAD) == 0) {
-        if (rctx->expect_asn1 && (rctx->state == OHS_ASN1_HEADER
-                                  || rctx->state == OHS_ASN1_CONTENT)) {
+        if (rctx->expect_asn1 && (rctx->state == OHS_ASN1_HEADER || rctx->state == OHS_ASN1_CONTENT)) {
             n = BIO_read(rctx->rbio, buf, rctx->buf_size);
         } else { /* read one text line */
             (void)ERR_set_mark();
@@ -641,7 +641,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
                     OSSL_TRACE(HTTP, "Sending request header: [\n");
                 /* for request headers, this usually traces several lines at once: */
                 OSSL_TRACE_STRING(HTTP, rctx->state != OHS_WRITE_REQ || rctx->text,
-                                  rctx->state != OHS_WRITE_REQ, rctx->pos, sz);
+                    rctx->state != OHS_WRITE_REQ, rctx->pos, sz);
                 OSSL_TRACE(HTTP, "]\n"); /* end of request header or content */
             }
             if (rctx->state == OHS_WRITE_HDR1)
@@ -657,7 +657,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
         if (rctx->req != NULL && !BIO_eof(rctx->req)) {
             if (OSSL_TRACE_ENABLED(HTTP))
                 OSSL_TRACE1(HTTP, "Sending request content (likely %s)\n",
-                            rctx->text ? "text" : "ASN.1");
+                    rctx->text ? "text" : "ASN.1");
             n = BIO_read(rctx->req, rctx->buf, rctx->buf_size);
             if (n <= 0) {
                 if (BIO_should_retry(rctx->req))
@@ -696,7 +696,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
     case OHS_ERROR_CONTENT:
 
         /* Attempt to read a line in */
- next_line:
+    next_line:
         /*
          * Due to strange memory BIO behavior with BIO_gets we have to check
          * there's a complete line in there before calling BIO_gets or we'll
@@ -768,7 +768,8 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
             default:
                 /* must return content if status >= 400 */
                 rctx->state = i < HTTP_STATUS_CODES_NONFATAL_ERROR
-                    ? OHS_HEADERS_ERROR : OHS_HEADERS;
+                    ? OHS_HEADERS_ERROR
+                    : OHS_HEADERS;
                 goto next_line; /* continue parsing, also on HTTP error */
             }
         }
@@ -786,7 +787,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
         }
         if (value != NULL && line_end != NULL) {
             if (rctx->state == OHS_REDIRECT
-                    && OPENSSL_strcasecmp(key, "Location") == 0) {
+                && OPENSSL_strcasecmp(key, "Location") == 0) {
                 rctx->redirection_url = value;
                 if (OSSL_TRACE_ENABLED(HTTP))
                     OSSL_TRACE(HTTP, "]\n");
@@ -806,11 +807,12 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
                             || (semicolon = strchr(value, ';')) == NULL
                             || (size_t)(semicolon - value) != strlen(rctx->expected_ct)
                             || OPENSSL_strncasecmp(rctx->expected_ct, value,
-                                                   semicolon - value) != 0)) {
+                                   semicolon - value)
+                                != 0)) {
                         ERR_raise_data(ERR_LIB_HTTP,
-                                       HTTP_R_UNEXPECTED_CONTENT_TYPE,
-                                       "expected=%s, actual=%s",
-                                       rctx->expected_ct, value);
+                            HTTP_R_UNEXPECTED_CONTENT_TYPE,
+                            "expected=%s, actual=%s",
+                            rctx->expected_ct, value);
                         return 0;
                     }
                     found_expected_ct = 1;
@@ -828,8 +830,8 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
 
                 if (line_end == value || *line_end != '\0') {
                     ERR_raise_data(ERR_LIB_HTTP,
-                                   HTTP_R_ERROR_PARSING_CONTENT_LENGTH,
-                                   "input=%s", value);
+                        HTTP_R_ERROR_PARSING_CONTENT_LENGTH,
+                        "input=%s", value);
                     return 0;
                 }
                 if (!check_set_resp_len("response content-length", rctx, content_len))
@@ -842,7 +844,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
             if (*p != '\r' && *p != '\n')
                 break;
         }
-        if (*p != '\0') /* not end of headers or not end of error reponse content */
+        if (*p != '\0') /* not end of headers or not end of error response content */
             goto next_line;
 
         /* Found blank line(s) indicating end of headers */
@@ -850,7 +852,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
             OSSL_TRACE(HTTP, "]\n"); /* end of response header */
 
         if (rctx->keep_alive != 0 /* do not let server initiate keep_alive */
-                && !found_keep_alive /* otherwise there is no change */) {
+            && !found_keep_alive /* otherwise there is no change */) {
             if (rctx->keep_alive == 2) {
                 rctx->keep_alive = 0;
                 ERR_raise(ERR_LIB_HTTP, HTTP_R_SERVER_CANCELED_CONNECTION);
@@ -863,7 +865,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
             rctx->state = OHS_ERROR_CONTENT;
             if (OSSL_TRACE_ENABLED(HTTP)) {
                 OSSL_TRACE1(HTTP, "Receiving error response content (likely %s): [\n",
-                            got_text ? "text" : "ASN.1");
+                    got_text ? "text" : "ASN.1");
                 goto next_line;
             }
             /* discard response content when trace not enabled */
@@ -873,7 +875,7 @@ int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx)
 
         if (rctx->expected_ct != NULL && !found_expected_ct) {
             ERR_raise_data(ERR_LIB_HTTP, HTTP_R_MISSING_CONTENT_TYPE,
-                           "expected=%s", rctx->expected_ct);
+                "expected=%s", rctx->expected_ct);
             return 0;
         }
         if (rctx->state == OHS_REDIRECT) {
@@ -956,7 +958,7 @@ 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)
 {
     const unsigned char *p;
     int rv;
@@ -966,7 +968,6 @@ int OSSL_HTTP_REQ_CTX_nbio_d2i(OSSL_HTTP_REQ_CTX *rctx,
         return rv;
     *pval = ASN1_item_d2i(NULL, &p, BIO_get_mem_data(rctx->mem, &p), it);
     return *pval != NULL;
-
 }
 
 #ifndef OPENSSL_NO_SOCK
@@ -987,10 +988,10 @@ static const char *explict_or_default_port(const char *hostserv, const char *por
 
 /* set up a new connection BIO, to HTTP server or to HTTP(S) proxy if given */
 static BIO *http_new_bio(const char *server /* optionally includes ":port" */,
-                         const char *server_port /* explicit server port */,
-                         int use_ssl,
-                         const char *proxy /* optionally includes ":port" */,
-                         const char *proxy_port /* explicit proxy port */)
+    const char *server_port /* explicit server port */,
+    int use_ssl,
+    const char *proxy /* optionally includes ":port" */,
+    const char *proxy_port /* explicit proxy port */)
 {
     const char *host = server;
     const char *port = server_port;
@@ -1012,7 +1013,7 @@ static BIO *http_new_bio(const char *server /* optionally includes ":port" */,
     if (port != NULL)
         (void)BIO_set_conn_port(cbio, port);
 
- end:
+end:
     return cbio;
 }
 #endif /* OPENSSL_NO_SOCK */
@@ -1058,10 +1059,10 @@ int OSSL_HTTP_is_alive(const OSSL_HTTP_REQ_CTX *rctx)
 
 /* Initiate an HTTP session using bio, else use given server, proxy, etc. */
 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)
 {
     BIO *cbio; /* == bio if supplied, used as connection BIO if rbio is NULL */
     OSSL_HTTP_REQ_CTX *rctx = NULL;
@@ -1094,8 +1095,8 @@ OSSL_HTTP_REQ_CTX *OSSL_HTTP_open(const char *server, const char *port,
         proxy = OSSL_HTTP_adapt_proxy(proxy, no_proxy, server, use_ssl);
         if (proxy != NULL
             && !OSSL_HTTP_parse_url(proxy, NULL /* use_ssl */, NULL /* user */,
-                                    &proxy_host, &proxy_port, NULL /* num */,
-                                    NULL /* path */, NULL, NULL))
+                &proxy_host, &proxy_port, NULL /* num */,
+                NULL /* path */, NULL, NULL))
             return NULL;
         cbio = http_new_bio(server, port, use_ssl, proxy_host, proxy_port);
         OPENSSL_free(proxy_host);
@@ -1130,10 +1131,10 @@ OSSL_HTTP_REQ_CTX *OSSL_HTTP_open(const char *server, const char *port,
     }
 
     rctx = http_req_ctx_new(bio == NULL, cbio, rbio != NULL ? rbio : cbio,
-                            bio_update_fn, arg, use_ssl, proxy, server, port,
-                            buf_size, overall_timeout);
+        bio_update_fn, arg, use_ssl, proxy, server, port,
+        buf_size, overall_timeout);
 
- end:
+end:
     if (rctx != NULL)
         /* remove any spurious error queue entries by ssl_add_cert_chain() */
         (void)ERR_pop_to_mark();
@@ -1144,10 +1145,10 @@ OSSL_HTTP_REQ_CTX *OSSL_HTTP_open(const char *server, const char *port,
 }
 
 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)
 {
     int use_http_proxy;
 
@@ -1163,11 +1164,12 @@ int OSSL_HTTP_set1_request(OSSL_HTTP_REQ_CTX *rctx, const char *path,
     rctx->max_resp_len = max_resp_len; /* allows for 0: indefinite */
 
     return OSSL_HTTP_REQ_CTX_set_request_line(rctx, req != NULL,
-                                              use_http_proxy ? rctx->server
-                                              : NULL, rctx->port, path)
+               use_http_proxy ? rctx->server
+                              : NULL,
+               rctx->port, path)
         && add1_headers(rctx, headers, rctx->server)
         && OSSL_HTTP_REQ_CTX_set_expected(rctx, expected_content_type,
-                                          expect_asn1, timeout, keep_alive)
+            expect_asn1, timeout, keep_alive)
         && set1_content(rctx, content_type, req);
 }
 
@@ -1203,26 +1205,25 @@ BIO *OSSL_HTTP_exchange(OSSL_HTTP_REQ_CTX *rctx, char **redirection_url)
             int reason = ERR_GET_REASON(err);
 
             if (lib == ERR_LIB_SSL || lib == ERR_LIB_HTTP
-                    || (lib == ERR_LIB_BIO && reason == BIO_R_CONNECT_TIMEOUT)
-                    || (lib == ERR_LIB_BIO && reason == BIO_R_CONNECT_ERROR)
+                || (lib == ERR_LIB_BIO && reason == BIO_R_CONNECT_TIMEOUT)
+                || (lib == ERR_LIB_BIO && reason == BIO_R_CONNECT_ERROR)
 #ifndef OPENSSL_NO_CMP
-                    || (lib == ERR_LIB_CMP
-                        && reason == CMP_R_POTENTIALLY_INVALID_CERTIFICATE)
+                || (lib == ERR_LIB_CMP
+                    && reason == CMP_R_POTENTIALLY_INVALID_CERTIFICATE)
 #endif
-                ) {
+            ) {
                 if (rctx->server != NULL && *rctx->server != '\0') {
                     BIO_snprintf(buf, sizeof(buf), "server=http%s://%s%s%s",
-                                 rctx->use_ssl ? "s" : "", rctx->server,
-                                 rctx->port != NULL ? ":" : "",
-                                 rctx->port != NULL ? rctx->port : "");
+                        rctx->use_ssl ? "s" : "", rctx->server,
+                        rctx->port != NULL ? ":" : "",
+                        rctx->port != NULL ? rctx->port : "");
                     ERR_add_error_data(1, buf);
                 }
                 if (rctx->proxy != NULL)
                     ERR_add_error_data(2, " proxy=", rctx->proxy);
                 if (err == 0) {
                     BIO_snprintf(buf, sizeof(buf), " peer has disconnected%s",
-                                 rctx->use_ssl ? " violating the protocol" :
-                                 ", likely because it requires the use of TLS");
+                        rctx->use_ssl ? " violating the protocol" : ", likely because it requires the use of TLS");
                     ERR_add_error_data(1, buf);
                 }
             }
@@ -1242,8 +1243,7 @@ static int redirection_ok(int n_redir, const char *old_url, const char *new_url)
     }
     if (*new_url == '/') /* redirection to same server => same protocol */
         return 1;
-    if (HAS_PREFIX(old_url, OSSL_HTTPS_NAME":") &&
-        !HAS_PREFIX(new_url, OSSL_HTTPS_NAME":")) {
+    if (HAS_PREFIX(old_url, OSSL_HTTPS_NAME ":") && !HAS_PREFIX(new_url, OSSL_HTTPS_NAME ":")) {
         ERR_raise(ERR_LIB_HTTP, HTTP_R_REDIRECTION_FROM_HTTPS_TO_HTTP);
         return 0;
     }
@@ -1252,11 +1252,11 @@ static int redirection_ok(int n_redir, const char *old_url, const char *new_url)
 
 /* Get data via HTTP from server at given URL, potentially with redirection */
 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_ct, 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_ct, int expect_asn1,
+    size_t max_resp_len, int timeout)
 {
     char *current_url;
     int n_redirs = 0;
@@ -1279,21 +1279,21 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy,
         char *redirection_url;
 
         if (!OSSL_HTTP_parse_url(current_url, &use_ssl, NULL /* user */, &host,
-                                 &port, NULL /* port_num */, &path, NULL, NULL))
+                &port, NULL /* port_num */, &path, NULL, NULL))
             break;
 
         rctx = OSSL_HTTP_open(host, port, proxy, no_proxy,
-                              use_ssl, bio, rbio, bio_update_fn, arg,
-                              buf_size, timeout);
+            use_ssl, bio, rbio, bio_update_fn, arg,
+            buf_size, timeout);
     new_rpath:
         redirection_url = NULL;
         if (rctx != NULL) {
             if (!OSSL_HTTP_set1_request(rctx, path, headers,
-                                        NULL /* content_type */,
-                                        NULL /* req */,
-                                        expected_ct, expect_asn1, max_resp_len,
-                                        -1 /* use same max time (timeout) */,
-                                        0 /* no keep_alive */)) {
+                    NULL /* content_type */,
+                    NULL /* req */,
+                    expected_ct, expect_asn1, max_resp_len,
+                    -1 /* use same max time (timeout) */,
+                    0 /* no keep_alive */)) {
                 OSSL_HTTP_REQ_CTX_free(rctx);
                 rctx = NULL;
             } else {
@@ -1303,7 +1303,7 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy,
         OPENSSL_free(path);
         if (resp == NULL && redirection_url != NULL) {
             if (redirection_ok(++n_redirs, current_url, redirection_url)
-                    && may_still_retry(max_time, &timeout)) {
+                && may_still_retry(max_time, &timeout)) {
                 (void)BIO_reset(bio);
                 OPENSSL_free(current_url);
                 current_url = redirection_url;
@@ -1341,29 +1341,29 @@ BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy,
 
 /* Exchange request and response over a connection managed via |prctx| */
 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_ct, 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_ct, int expect_asn1,
+    size_t max_resp_len, int timeout, int keep_alive)
 {
     OSSL_HTTP_REQ_CTX *rctx = prctx == NULL ? NULL : *prctx;
     BIO *resp = NULL;
 
     if (rctx == NULL) {
         rctx = OSSL_HTTP_open(server, port, proxy, no_proxy,
-                              use_ssl, bio, rbio, bio_update_fn, arg,
-                              buf_size, timeout);
+            use_ssl, bio, rbio, bio_update_fn, arg,
+            buf_size, timeout);
         timeout = -1; /* Already set during opening the connection */
     }
     if (rctx != NULL) {
         if (OSSL_HTTP_set1_request(rctx, path, headers, content_type, req,
-                                   expected_ct, expect_asn1,
-                                   max_resp_len, timeout, keep_alive))
+                expected_ct, expect_asn1,
+                max_resp_len, timeout, keep_alive))
             resp = OSSL_HTTP_exchange(rctx, NULL);
         if (resp == NULL || !OSSL_HTTP_is_alive(rctx)) {
             if (!OSSL_HTTP_close(rctx, resp != NULL)) {
@@ -1386,7 +1386,7 @@ int OSSL_HTTP_close(OSSL_HTTP_REQ_CTX *rctx, int ok)
     /* callback can be used to finish TLS session and free its BIO */
     if (rctx != NULL && rctx->upd_fn != NULL) {
         wbio = (*rctx->upd_fn)(rctx->wbio, rctx->upd_arg,
-                               0 /* disconnect */, ok);
+            0 /* disconnect */, ok);
         ret = wbio != NULL;
         if (ret)
             rctx->wbio = wbio;
@@ -1425,8 +1425,8 @@ static char *base64encode(const void *buf, size_t len)
  * to print additional diagnostic information in a user-oriented way.
  */
 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)
 {
 #undef BUF_SIZE
 #define BUF_SIZE (8 * 1024)
@@ -1439,7 +1439,7 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
     time_t max_time = timeout > 0 ? time(NULL) + timeout : 0;
 
     if (bio == NULL || server == NULL
-            || (bio_err != NULL && prog == NULL)) {
+        || (bio_err != NULL && prog == NULL)) {
         ERR_raise(ERR_LIB_HTTP, ERR_R_PASSED_NULL_PARAMETER);
         goto end;
     }
@@ -1452,7 +1452,7 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
     }
     BIO_push(fbio, bio);
 
-    BIO_printf(fbio, "CONNECT %s:%s "HTTP_1_0"\r\n", server, port);
+    BIO_printf(fbio, "CONNECT %s:%s " HTTP_1_0 "\r\n", server, port);
 
     /*
      * Workaround for broken proxies which would otherwise close
@@ -1471,7 +1471,8 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
         if (proxyauth == NULL)
             goto end;
         if (BIO_snprintf(proxyauth, len + 1, "%s:%s", proxyuser,
-                         proxypass != NULL ? proxypass : "") != (int)len)
+                proxypass != NULL ? proxypass : "")
+            != (int)len)
             goto proxy_end;
         proxyauthenc = base64encode(proxyauth, len);
         if (proxyauthenc != NULL) {
@@ -1500,7 +1501,7 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
         rv = BIO_wait(fbio, max_time, 100 /* milliseconds */);
         if (rv <= 0) {
             BIO_printf(bio_err, "%s: HTTP CONNECT %s\n", prog,
-                       rv == 0 ? "timed out" : "failed waiting for data");
+                rv == 0 ? "timed out" : "failed waiting for data");
             goto end;
         }
 
@@ -1519,15 +1520,15 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
         if (!CHECK_AND_SKIP_PREFIX(mbufp, HTTP_PREFIX)) {
             ERR_raise(ERR_LIB_HTTP, HTTP_R_HEADER_PARSE_ERROR);
             BIO_printf(bio_err, "%s: HTTP CONNECT failed, non-HTTP response\n",
-                       prog);
+                prog);
             /* Wrong protocol, not even HTTP, so stop reading headers */
             goto end;
         }
         if (!HAS_PREFIX(mbufp, HTTP_VERSION_PATT)) {
             ERR_raise(ERR_LIB_HTTP, HTTP_R_RECEIVED_WRONG_HTTP_VERSION);
             BIO_printf(bio_err,
-                       "%s: HTTP CONNECT failed, bad HTTP version %.*s\n",
-                       prog, (int)HTTP_VERSION_STR_LEN, mbufp);
+                "%s: HTTP CONNECT failed, bad HTTP version %.*s\n",
+                prog, (int)HTTP_VERSION_STR_LEN, mbufp);
             goto end;
         }
         mbufp += HTTP_VERSION_STR_LEN;
@@ -1541,9 +1542,9 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
                 read_len--;
             mbuf[read_len] = '\0';
             ERR_raise_data(ERR_LIB_HTTP, HTTP_R_CONNECT_FAILURE,
-                           "reason=%s", mbufp);
+                "reason=%s", mbufp);
             BIO_printf(bio_err, "%s: HTTP CONNECT failed, reason=%s\n",
-                       prog, mbufp);
+                prog, mbufp);
             goto end;
         }
         ret = 1;
@@ -1559,7 +1560,7 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
         read_len = BIO_gets(fbio, mbuf, BUF_SIZE);
     } while (read_len > 2);
 
- end:
+end:
     if (fbio != NULL) {
         (void)BIO_flush(fbio);
         BIO_pop(fbio);
diff --git a/crypto/http/http_err.c b/crypto/http/http_err.c
index 22c2b40e619a1..947a403d6009f 100644
--- a/crypto/http/http_err.c
+++ b/crypto/http/http_err.c
@@ -14,74 +14,74 @@
 
 #ifndef OPENSSL_NO_HTTP
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA HTTP_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ASN1_LEN_EXCEEDS_MAX_RESP_LEN),
-    "asn1 len exceeds max resp len"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_CONNECT_FAILURE), "connect failure"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_PARSING_ASN1_LENGTH),
-    "error parsing asn1 length"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_PARSING_CONTENT_LENGTH),
-    "error parsing content length"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_PARSING_URL), "error parsing url"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_RECEIVING), "error receiving"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_SENDING), "error sending"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_FAILED_READING_DATA),
-    "failed reading data"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_HEADER_PARSE_ERROR),
-    "header parse error"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INCONSISTENT_CONTENT_LENGTH),
-    "inconsistent content length"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INVALID_PORT_NUMBER),
-    "invalid port number"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INVALID_URL_PATH), "invalid url path"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INVALID_URL_SCHEME),
-    "invalid url scheme"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MAX_RESP_LEN_EXCEEDED),
-    "max resp len exceeded"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MISSING_ASN1_ENCODING),
-    "missing asn1 encoding"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MISSING_CONTENT_TYPE),
-    "missing content type"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MISSING_REDIRECT_LOCATION),
-    "missing redirect location"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RECEIVED_ERROR), "received error"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RECEIVED_WRONG_HTTP_VERSION),
-    "received wrong http version"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_REDIRECTION_FROM_HTTPS_TO_HTTP),
-    "redirection from https to http"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_REDIRECTION_NOT_ENABLED),
-    "redirection not enabled"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RESPONSE_LINE_TOO_LONG),
-    "response line too long"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RESPONSE_PARSE_ERROR),
-    "response parse error"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RESPONSE_TOO_MANY_HDRLINES),
-    "response too many hdrlines"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RETRY_TIMEOUT), "retry timeout"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_SERVER_CANCELED_CONNECTION),
-    "server canceled connection"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_SOCK_NOT_SUPPORTED),
-    "sock not supported"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_STATUS_CODE_UNSUPPORTED),
-    "status code unsupported"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_TLS_NOT_ENABLED), "tls not enabled"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_TOO_MANY_REDIRECTIONS),
-    "too many redirections"},
-    {ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_UNEXPECTED_CONTENT_TYPE),
-    "unexpected content type"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ASN1_LEN_EXCEEDS_MAX_RESP_LEN),
+        "asn1 len exceeds max resp len" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_CONNECT_FAILURE), "connect failure" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_PARSING_ASN1_LENGTH),
+        "error parsing asn1 length" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_PARSING_CONTENT_LENGTH),
+        "error parsing content length" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_PARSING_URL), "error parsing url" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_RECEIVING), "error receiving" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_ERROR_SENDING), "error sending" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_FAILED_READING_DATA),
+        "failed reading data" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_HEADER_PARSE_ERROR),
+        "header parse error" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INCONSISTENT_CONTENT_LENGTH),
+        "inconsistent content length" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INVALID_PORT_NUMBER),
+        "invalid port number" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INVALID_URL_PATH), "invalid url path" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_INVALID_URL_SCHEME),
+        "invalid url scheme" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MAX_RESP_LEN_EXCEEDED),
+        "max resp len exceeded" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MISSING_ASN1_ENCODING),
+        "missing asn1 encoding" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MISSING_CONTENT_TYPE),
+        "missing content type" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_MISSING_REDIRECT_LOCATION),
+        "missing redirect location" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RECEIVED_ERROR), "received error" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RECEIVED_WRONG_HTTP_VERSION),
+        "received wrong http version" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_REDIRECTION_FROM_HTTPS_TO_HTTP),
+        "redirection from https to http" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_REDIRECTION_NOT_ENABLED),
+        "redirection not enabled" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RESPONSE_LINE_TOO_LONG),
+        "response line too long" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RESPONSE_PARSE_ERROR),
+        "response parse error" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RESPONSE_TOO_MANY_HDRLINES),
+        "response too many hdrlines" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_RETRY_TIMEOUT), "retry timeout" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_SERVER_CANCELED_CONNECTION),
+        "server canceled connection" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_SOCK_NOT_SUPPORTED),
+        "sock not supported" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_STATUS_CODE_UNSUPPORTED),
+        "status code unsupported" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_TLS_NOT_ENABLED), "tls not enabled" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_TOO_MANY_REDIRECTIONS),
+        "too many redirections" },
+    { ERR_PACK(ERR_LIB_HTTP, 0, HTTP_R_UNEXPECTED_CONTENT_TYPE),
+        "unexpected content type" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_HTTP_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(HTTP_str_reasons[0].error) == NULL)
         ERR_load_strings_const(HTTP_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/http/http_lib.c b/crypto/http/http_lib.c
index 725ec19084998..54c5c6ec1d8f3 100644
--- a/crypto/http/http_lib.c
+++ b/crypto/http/http_lib.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <stdio.h>       /* for sscanf() */
+#include <stdio.h> /* for sscanf() */
 #include <string.h>
 #include <openssl/http.h>
 #include <openssl/httperr.h>
@@ -15,10 +15,10 @@
 #include <openssl/err.h>
 #include "internal/cryptlib.h" /* for ossl_assert() */
 #ifndef OPENSSL_NO_SOCK
-# include "internal/bio_addr.h" /* for NI_MAXHOST */
+#include "internal/bio_addr.h" /* for NI_MAXHOST */
 #endif
 #ifndef NI_MAXHOST
-# define NI_MAXHOST 255
+#define NI_MAXHOST 255
 #endif
 #include "crypto/ctype.h" /* for ossl_isspace() */
 
@@ -51,15 +51,15 @@ static void free_pstring(char **pstr)
 }
 
 int OSSL_parse_url(const char *url, char **pscheme, 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 *p, *tmp;
     const char *scheme, *scheme_end;
     const char *user, *user_end;
     const char *host, *host_end;
     const char *port, *port_end;
-    unsigned int portnum;
+    unsigned int portnum = 0;
     const char *path, *path_end;
     const char *query, *query_end;
     const char *frag, *frag_end;
@@ -107,13 +107,7 @@ int OSSL_parse_url(const char *url, char **pscheme, char **puser, char **phost,
         p = ++host_end;
     } else {
         /* look for start of optional port, path, query, or fragment */
-        host_end = strchr(host, ':');
-        if (host_end == NULL)
-            host_end = strchr(host, '/');
-        if (host_end == NULL)
-            host_end = strchr(host, '?');
-        if (host_end == NULL)
-            host_end = strchr(host, '#');
+        host_end = strpbrk(host, ":/?#");
         if (host_end == NULL) /* the remaining string is just the hostname */
             host_end = host + strlen(host);
         p = host_end;
@@ -162,11 +156,11 @@ int OSSL_parse_url(const char *url, char **pscheme, char **puser, char **phost,
     }
 
     if (!copy_substring(pscheme, scheme, scheme_end)
-            || !copy_substring(phost, host, host_end)
-            || !copy_substring(pport, port, port_end)
-            || !copy_substring(puser, user, user_end)
-            || !copy_substring(pquery, query, query_end)
-            || !copy_substring(pfrag, frag, frag_end))
+        || !copy_substring(phost, host, host_end)
+        || !copy_substring(pport, port, port_end)
+        || !copy_substring(puser, user, user_end)
+        || !copy_substring(pquery, query, query_end)
+        || !copy_substring(pfrag, frag, frag_end))
         goto err;
     if (pport_num != NULL)
         *pport_num = (int)portnum;
@@ -182,10 +176,10 @@ int OSSL_parse_url(const char *url, char **pscheme, char **puser, char **phost,
     }
     return 1;
 
- parse_err:
+parse_err:
     ERR_raise(ERR_LIB_HTTP, HTTP_R_ERROR_PARSING_URL);
 
- err:
+err:
     free_pstring(pscheme);
     free_pstring(puser);
     free_pstring(phost);
@@ -199,8 +193,8 @@ int OSSL_parse_url(const char *url, char **pscheme, char **puser, char **phost,
 #ifndef OPENSSL_NO_HTTP
 
 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)
 {
     char *scheme, *port;
     int ssl = 0, portnum;
@@ -209,7 +203,7 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
     if (pssl != NULL)
         *pssl = 0;
     if (!OSSL_parse_url(url, &scheme, puser, phost, &port, pport_num,
-                        ppath, pquery, pfrag))
+            ppath, pquery, pfrag))
         return 0;
 
     /* check for optional HTTP scheme "http[s]" */
@@ -246,7 +240,7 @@ int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
     }
     return 1;
 
- err:
+err:
     free_pstring(puser);
     free_pstring(phost);
     free_pstring(ppath);
@@ -269,6 +263,7 @@ static int use_proxy(const char *no_proxy, const char *server)
         /* strip leading '[' and trailing ']' from escaped IPv6 address */
         sl -= 2;
         strncpy(host, server + 1, sl);
+        host[sl] = '\0';
         server = host;
     }
 
@@ -284,15 +279,15 @@ static int use_proxy(const char *no_proxy, const char *server)
     if (no_proxy != NULL)
         found = strstr(no_proxy, server);
     while (found != NULL
-           && ((found != no_proxy && !ossl_isspace(found[-1]) && found[-1] != ',')
-               || (found[sl] != '\0' && !ossl_isspace(found[sl]) && found[sl] != ',')))
+        && ((found != no_proxy && !ossl_isspace(found[-1]) && found[-1] != ',')
+            || (found[sl] != '\0' && !ossl_isspace(found[sl]) && found[sl] != ',')))
         found = strstr(found + 1, server);
     return found == NULL;
 }
 
 /* Take default value from environment variable(s), respect no_proxy */
 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)
 {
     /*
      * using environment variable names, both lowercase and uppercase variants,
diff --git a/crypto/idea/i_cbc.c b/crypto/idea/i_cbc.c
index e9608e82f561d..a3b3a554f4322 100644
--- a/crypto/idea/i_cbc.c
+++ b/crypto/idea/i_cbc.c
@@ -18,8 +18,8 @@
 #include "idea_local.h"
 
 void IDEA_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-                      int encrypt)
+    long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
+    int encrypt)
 {
     register unsigned long tin0, tin1;
     register unsigned long tout0, tout1, xor0, xor1;
diff --git a/crypto/idea/i_cfb64.c b/crypto/idea/i_cfb64.c
index afea89edfa08d..c8ed3853285a6 100644
--- a/crypto/idea/i_cfb64.c
+++ b/crypto/idea/i_cfb64.c
@@ -24,8 +24,8 @@
  */
 
 void IDEA_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, IDEA_KEY_SCHEDULE *schedule,
-                        unsigned char *ivec, int *num, int encrypt)
+    long length, IDEA_KEY_SCHEDULE *schedule,
+    unsigned char *ivec, int *num, int encrypt)
 {
     register unsigned long v0, v1, t;
     register int n = *num;
diff --git a/crypto/idea/i_ecb.c b/crypto/idea/i_ecb.c
index 6304e6cac8028..34360ad7ed0cc 100644
--- a/crypto/idea/i_ecb.c
+++ b/crypto/idea/i_ecb.c
@@ -24,7 +24,7 @@ const char *IDEA_options(void)
 }
 
 void IDEA_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      IDEA_KEY_SCHEDULE *ks)
+    IDEA_KEY_SCHEDULE *ks)
 {
     unsigned long l0, l1, d[2];
 
diff --git a/crypto/idea/i_ofb64.c b/crypto/idea/i_ofb64.c
index a6a149764dbee..afa6a960d4ed9 100644
--- a/crypto/idea/i_ofb64.c
+++ b/crypto/idea/i_ofb64.c
@@ -23,8 +23,8 @@
  * used is contained in *num;
  */
 void IDEA_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, IDEA_KEY_SCHEDULE *schedule,
-                        unsigned char *ivec, int *num)
+    long length, IDEA_KEY_SCHEDULE *schedule,
+    unsigned char *ivec, int *num)
 {
     register unsigned long v0, v1, t;
     register int n = *num;
diff --git a/crypto/idea/idea_local.h b/crypto/idea/idea_local.h
index 29836a84ba5fa..73dcd3adbd8ed 100644
--- a/crypto/idea/idea_local.h
+++ b/crypto/idea/idea_local.h
@@ -7,95 +7,116 @@
  * https://www.openssl.org/source/license.html
  */
 
-#define idea_mul(r,a,b,ul) \
-ul=(unsigned long)a*b; \
-if (ul != 0) { \
-        r=(ul&0xffff)-(ul>>16); \
-        r-=((r)>>16); \
-} else { \
-        r=(-(int)a-b+1);        /* assuming a or b is 0 and in range */ \
-}
+#define idea_mul(r, a, b, ul)                                          \
+    ul = (unsigned long)a * b;                                         \
+    if (ul != 0) {                                                     \
+        r = (ul & 0xffff) - (ul >> 16);                                \
+        r -= ((r) >> 16);                                              \
+    } else {                                                           \
+        r = (-(int)a - b + 1); /* assuming a or b is 0 and in range */ \
+    }
 
 /* NOTE - c is not incremented as per n2l */
-#define n2ln(c,l1,l2,n) { \
-                        c+=n; \
-                        l1=l2=0; \
-                        switch (n) { \
-                        case 8: l2 =((unsigned long)(*(--(c))))    ; \
-                        /* fall through */                              \
-                        case 7: l2|=((unsigned long)(*(--(c))))<< 8; \
-                        /* fall through */                              \
-                        case 6: l2|=((unsigned long)(*(--(c))))<<16; \
-                        /* fall through */                              \
-                        case 5: l2|=((unsigned long)(*(--(c))))<<24; \
-                        /* fall through */                              \
-                        case 4: l1 =((unsigned long)(*(--(c))))    ; \
-                        /* fall through */                              \
-                        case 3: l1|=((unsigned long)(*(--(c))))<< 8; \
-                        /* fall through */                              \
-                        case 2: l1|=((unsigned long)(*(--(c))))<<16; \
-                        /* fall through */                              \
-                        case 1: l1|=((unsigned long)(*(--(c))))<<24; \
-                                } \
-                        }
+#define n2ln(c, l1, l2, n)                           \
+    {                                                \
+        c += n;                                      \
+        l1 = l2 = 0;                                 \
+        switch (n) {                                 \
+        case 8:                                      \
+            l2 = ((unsigned long)(*(--(c))));        \
+        /* fall through */                           \
+        case 7:                                      \
+            l2 |= ((unsigned long)(*(--(c)))) << 8;  \
+        /* fall through */                           \
+        case 6:                                      \
+            l2 |= ((unsigned long)(*(--(c)))) << 16; \
+        /* fall through */                           \
+        case 5:                                      \
+            l2 |= ((unsigned long)(*(--(c)))) << 24; \
+        /* fall through */                           \
+        case 4:                                      \
+            l1 = ((unsigned long)(*(--(c))));        \
+        /* fall through */                           \
+        case 3:                                      \
+            l1 |= ((unsigned long)(*(--(c)))) << 8;  \
+        /* fall through */                           \
+        case 2:                                      \
+            l1 |= ((unsigned long)(*(--(c)))) << 16; \
+        /* fall through */                           \
+        case 1:                                      \
+            l1 |= ((unsigned long)(*(--(c)))) << 24; \
+        }                                            \
+    }
 
 /* NOTE - c is not incremented as per l2n */
-#define l2nn(l1,l2,c,n) { \
-                        c+=n; \
-                        switch (n) { \
-                        case 8: *(--(c))=(unsigned char)(((l2)    )&0xff); \
-                        /* fall through */                                    \
-                        case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
-                        /* fall through */                                    \
-                        case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
-                        /* fall through */                                    \
-                        case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
-                        /* fall through */                                    \
-                        case 4: *(--(c))=(unsigned char)(((l1)    )&0xff); \
-                        /* fall through */                                    \
-                        case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
-                        /* fall through */                                    \
-                        case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
-                        /* fall through */                                    \
-                        case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
-                                } \
-                        }
+#define l2nn(l1, l2, c, n)                                   \
+    {                                                        \
+        c += n;                                              \
+        switch (n) {                                         \
+        case 8:                                              \
+            *(--(c)) = (unsigned char)(((l2)) & 0xff);       \
+        /* fall through */                                   \
+        case 7:                                              \
+            *(--(c)) = (unsigned char)(((l2) >> 8) & 0xff);  \
+        /* fall through */                                   \
+        case 6:                                              \
+            *(--(c)) = (unsigned char)(((l2) >> 16) & 0xff); \
+        /* fall through */                                   \
+        case 5:                                              \
+            *(--(c)) = (unsigned char)(((l2) >> 24) & 0xff); \
+        /* fall through */                                   \
+        case 4:                                              \
+            *(--(c)) = (unsigned char)(((l1)) & 0xff);       \
+        /* fall through */                                   \
+        case 3:                                              \
+            *(--(c)) = (unsigned char)(((l1) >> 8) & 0xff);  \
+        /* fall through */                                   \
+        case 2:                                              \
+            *(--(c)) = (unsigned char)(((l1) >> 16) & 0xff); \
+        /* fall through */                                   \
+        case 1:                                              \
+            *(--(c)) = (unsigned char)(((l1) >> 24) & 0xff); \
+        }                                                    \
+    }
 
 #undef n2l
-#define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24L, \
-                         l|=((unsigned long)(*((c)++)))<<16L, \
-                         l|=((unsigned long)(*((c)++)))<< 8L, \
-                         l|=((unsigned long)(*((c)++))))
+#define n2l(c, l) (l = ((unsigned long)(*((c)++))) << 24L, \
+    l |= ((unsigned long)(*((c)++))) << 16L,               \
+    l |= ((unsigned long)(*((c)++))) << 8L,                \
+    l |= ((unsigned long)(*((c)++))))
 
 #undef l2n
-#define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)     )&0xff))
+#define l2n(l, c) (*((c)++) = (unsigned char)(((l) >> 24L) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 16L) & 0xff),                \
+    *((c)++) = (unsigned char)(((l) >> 8L) & 0xff),                 \
+    *((c)++) = (unsigned char)(((l)) & 0xff))
 
 #undef s2n
-#define s2n(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff))
+#define s2n(l, c) (*((c)++) = (unsigned char)(((l)) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 8L) & 0xff))
 
 #undef n2s
-#define n2s(c,l)        (l =((IDEA_INT)(*((c)++)))<< 8L, \
-                         l|=((IDEA_INT)(*((c)++)))      )
+#define n2s(c, l) (l = ((IDEA_INT)(*((c)++))) << 8L, \
+    l |= ((IDEA_INT)(*((c)++))))
 
-
-#define E_IDEA(num) \
-        x1&=0xffff; \
-        idea_mul(x1,x1,*p,ul); p++; \
-        x2+= *(p++); \
-        x3+= *(p++); \
-        x4&=0xffff; \
-        idea_mul(x4,x4,*p,ul); p++; \
-        t0=(x1^x3)&0xffff; \
-        idea_mul(t0,t0,*p,ul); p++; \
-        t1=(t0+(x2^x4))&0xffff; \
-        idea_mul(t1,t1,*p,ul); p++; \
-        t0+=t1; \
-        x1^=t1; \
-        x4^=t0; \
-        ul=x2^t0; /* do the swap to x3 */ \
-        x2=x3^t1; \
-        x3=ul;
+#define E_IDEA(num)                       \
+    x1 &= 0xffff;                         \
+    idea_mul(x1, x1, *p, ul);             \
+    p++;                                  \
+    x2 += *(p++);                         \
+    x3 += *(p++);                         \
+    x4 &= 0xffff;                         \
+    idea_mul(x4, x4, *p, ul);             \
+    p++;                                  \
+    t0 = (x1 ^ x3) & 0xffff;              \
+    idea_mul(t0, t0, *p, ul);             \
+    p++;                                  \
+    t1 = (t0 + (x2 ^ x4)) & 0xffff;       \
+    idea_mul(t1, t1, *p, ul);             \
+    p++;                                  \
+    t0 += t1;                             \
+    x1 ^= t1;                             \
+    x4 ^= t0;                             \
+    ul = x2 ^ t0; /* do the swap to x3 */ \
+    x2 = x3 ^ t1;                         \
+    x3 = ul;
diff --git a/crypto/indicator_core.c b/crypto/indicator_core.c
index 4b3c1227179f8..5b1f9cecd6942 100644
--- a/crypto/indicator_core.c
+++ b/crypto/indicator_core.c
@@ -13,8 +13,7 @@
 #include "internal/cryptlib.h"
 #include "crypto/context.h"
 
-typedef struct indicator_cb_st
-{
+typedef struct indicator_cb_st {
     OSSL_INDICATOR_CALLBACK *cb;
 } INDICATOR_CB;
 
@@ -37,7 +36,7 @@ static INDICATOR_CB *get_indicator_callback(OSSL_LIB_CTX *libctx)
 }
 
 void OSSL_INDICATOR_set_callback(OSSL_LIB_CTX *libctx,
-                                 OSSL_INDICATOR_CALLBACK *cb)
+    OSSL_INDICATOR_CALLBACK *cb)
 {
     INDICATOR_CB *icb = get_indicator_callback(libctx);
 
@@ -46,7 +45,7 @@ void OSSL_INDICATOR_set_callback(OSSL_LIB_CTX *libctx,
 }
 
 void OSSL_INDICATOR_get_callback(OSSL_LIB_CTX *libctx,
-                                 OSSL_INDICATOR_CALLBACK **cb)
+    OSSL_INDICATOR_CALLBACK **cb)
 {
     INDICATOR_CB *icb = get_indicator_callback(libctx);
 
diff --git a/crypto/info.c b/crypto/info.c
index 4d70471be255c..a0344a8876947 100644
--- a/crypto/info.c
+++ b/crypto/info.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-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
@@ -16,21 +16,24 @@
 #include "buildinf.h"
 
 #ifndef OPENSSL_NO_JITTER
-# include <stdio.h>
-# include <jitterentropy.h>
+#include <stdio.h>
+#include <jitterentropy.h>
 #endif
 
 #if defined(__arm__) || defined(__arm) || defined(__aarch64__)
-# include "arm_arch.h"
-# define CPU_INFO_STR_LEN 128
+#include "arm_arch.h"
+#define CPU_INFO_STR_LEN 128
+#elif defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC)
+#include "crypto/ppc_arch.h"
+#define CPU_INFO_STR_LEN 128
 #elif defined(__s390__) || defined(__s390x__)
-# include "s390x_arch.h"
-# define CPU_INFO_STR_LEN 2048
+#include "s390x_arch.h"
+#define CPU_INFO_STR_LEN 2048
 #elif defined(__riscv)
-# include "crypto/riscv_arch.h"
-# define CPU_INFO_STR_LEN 2048
+#include "crypto/riscv_arch.h"
+#define CPU_INFO_STR_LEN 2048
 #else
-# define CPU_INFO_STR_LEN 256
+#define CPU_INFO_STR_LEN 256
 #endif
 
 /* extern declaration to avoid warning */
@@ -46,129 +49,158 @@ static CRYPTO_ONCE init_info = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(init_info_strings)
 {
 #if defined(OPENSSL_CPUID_OBJ)
-# if defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
-     defined(__x86_64) || defined(__x86_64__) || \
-     defined(_M_AMD64) || defined(_M_X64)
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
     const char *env;
 
     BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
-                 CPUINFO_PREFIX "OPENSSL_ia32cap=0x%.16llx:0x%.16llx:0x%.16llx:0x%.16llx:0x%.16llx",
-                 (unsigned long long)OPENSSL_ia32cap_P[0] |
-                 (unsigned long long)OPENSSL_ia32cap_P[1] << 32,
-                 (unsigned long long)OPENSSL_ia32cap_P[2] |
-                 (unsigned long long)OPENSSL_ia32cap_P[3] << 32,
-                 (unsigned long long)OPENSSL_ia32cap_P[4] |
-                 (unsigned long long)OPENSSL_ia32cap_P[5] << 32,
-                 (unsigned long long)OPENSSL_ia32cap_P[6] |
-                 (unsigned long long)OPENSSL_ia32cap_P[7] << 32,
-                 (unsigned long long)OPENSSL_ia32cap_P[8] |
-                 (unsigned long long)OPENSSL_ia32cap_P[9] << 32);
+        CPUINFO_PREFIX "OPENSSL_ia32cap=0x%.16llx:0x%.16llx:0x%.16llx:0x%.16llx:0x%.16llx",
+        (unsigned long long)OPENSSL_ia32cap_P[0] | (unsigned long long)OPENSSL_ia32cap_P[1] << 32,
+        (unsigned long long)OPENSSL_ia32cap_P[2] | (unsigned long long)OPENSSL_ia32cap_P[3] << 32,
+        (unsigned long long)OPENSSL_ia32cap_P[4] | (unsigned long long)OPENSSL_ia32cap_P[5] << 32,
+        (unsigned long long)OPENSSL_ia32cap_P[6] | (unsigned long long)OPENSSL_ia32cap_P[7] << 32,
+        (unsigned long long)OPENSSL_ia32cap_P[8] | (unsigned long long)OPENSSL_ia32cap_P[9] << 32);
 
     if ((env = getenv("OPENSSL_ia32cap")) != NULL)
         BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
-                     sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
-                     " env:%s", env);
-# elif defined(__arm__) || defined(__arm) || defined(__aarch64__)
+            sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+            " env:%s", env);
+#elif defined(__arm__) || defined(__arm) || defined(__aarch64__)
     const char *env;
 
     BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
-                 CPUINFO_PREFIX "OPENSSL_armcap=0x%x", OPENSSL_armcap_P);
+        CPUINFO_PREFIX "OPENSSL_armcap=0x%x", OPENSSL_armcap_P);
     if ((env = getenv("OPENSSL_armcap")) != NULL)
         BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
-                     sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
-                     " env:%s", env);
-# elif defined(__s390__) || defined(__s390x__)
+            sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+            " env:%s", env);
+#elif defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC)
     const char *env;
 
     BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
-                 CPUINFO_PREFIX "OPENSSL_s390xcap="
-                 "stfle:0x%llx:0x%llx:0x%llx:0x%llx:"
-                 "kimd:0x%llx:0x%llx:"
-                 "klmd:0x%llx:0x%llx:"
-                 "km:0x%llx:0x%llx:"
-                 "kmc:0x%llx:0x%llx:"
-                 "kmac:0x%llx:0x%llx:"
-                 "kmctr:0x%llx:0x%llx:"
-                 "kmo:0x%llx:0x%llx:"
-                 "kmf:0x%llx:0x%llx:"
-                 "prno:0x%llx:0x%llx:"
-                 "kma:0x%llx:0x%llx:"
-                 "pcc:0x%llx:0x%llx:"
-                 "kdsa:0x%llx:0x%llx",
-                 OPENSSL_s390xcap_P.stfle[0], OPENSSL_s390xcap_P.stfle[1],
-                 OPENSSL_s390xcap_P.stfle[2], OPENSSL_s390xcap_P.stfle[3],
-                 OPENSSL_s390xcap_P.kimd[0], OPENSSL_s390xcap_P.kimd[1],
-                 OPENSSL_s390xcap_P.klmd[0], OPENSSL_s390xcap_P.klmd[1],
-                 OPENSSL_s390xcap_P.km[0], OPENSSL_s390xcap_P.km[1],
-                 OPENSSL_s390xcap_P.kmc[0], OPENSSL_s390xcap_P.kmc[1],
-                 OPENSSL_s390xcap_P.kmac[0], OPENSSL_s390xcap_P.kmac[1],
-                 OPENSSL_s390xcap_P.kmctr[0], OPENSSL_s390xcap_P.kmctr[1],
-                 OPENSSL_s390xcap_P.kmo[0], OPENSSL_s390xcap_P.kmo[1],
-                 OPENSSL_s390xcap_P.kmf[0], OPENSSL_s390xcap_P.kmf[1],
-                 OPENSSL_s390xcap_P.prno[0], OPENSSL_s390xcap_P.prno[1],
-                 OPENSSL_s390xcap_P.kma[0], OPENSSL_s390xcap_P.kma[1],
-                 OPENSSL_s390xcap_P.pcc[0], OPENSSL_s390xcap_P.pcc[1],
-                 OPENSSL_s390xcap_P.kdsa[0], OPENSSL_s390xcap_P.kdsa[1]);
+        CPUINFO_PREFIX "OPENSSL_ppccap=0x%x", OPENSSL_ppccap_P);
+    if ((env = getenv("OPENSSL_ppccap")) != NULL)
+        BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
+            sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+            " env:%s", env);
+#elif defined(__s390__) || defined(__s390x__)
+    const char *env;
+
+    BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
+        CPUINFO_PREFIX "OPENSSL_s390xcap="
+                       "stfle:0x%llx:0x%llx:0x%llx:0x%llx:"
+                       "kimd:0x%llx:0x%llx:"
+                       "klmd:0x%llx:0x%llx:"
+                       "km:0x%llx:0x%llx:"
+                       "kmc:0x%llx:0x%llx:"
+                       "kmac:0x%llx:0x%llx:"
+                       "kmctr:0x%llx:0x%llx:"
+                       "kmo:0x%llx:0x%llx:"
+                       "kmf:0x%llx:0x%llx:"
+                       "prno:0x%llx:0x%llx:"
+                       "kma:0x%llx:0x%llx:"
+                       "pcc:0x%llx:0x%llx:"
+                       "kdsa:0x%llx:0x%llx",
+        OPENSSL_s390xcap_P.stfle[0], OPENSSL_s390xcap_P.stfle[1],
+        OPENSSL_s390xcap_P.stfle[2], OPENSSL_s390xcap_P.stfle[3],
+        OPENSSL_s390xcap_P.kimd[0], OPENSSL_s390xcap_P.kimd[1],
+        OPENSSL_s390xcap_P.klmd[0], OPENSSL_s390xcap_P.klmd[1],
+        OPENSSL_s390xcap_P.km[0], OPENSSL_s390xcap_P.km[1],
+        OPENSSL_s390xcap_P.kmc[0], OPENSSL_s390xcap_P.kmc[1],
+        OPENSSL_s390xcap_P.kmac[0], OPENSSL_s390xcap_P.kmac[1],
+        OPENSSL_s390xcap_P.kmctr[0], OPENSSL_s390xcap_P.kmctr[1],
+        OPENSSL_s390xcap_P.kmo[0], OPENSSL_s390xcap_P.kmo[1],
+        OPENSSL_s390xcap_P.kmf[0], OPENSSL_s390xcap_P.kmf[1],
+        OPENSSL_s390xcap_P.prno[0], OPENSSL_s390xcap_P.prno[1],
+        OPENSSL_s390xcap_P.kma[0], OPENSSL_s390xcap_P.kma[1],
+        OPENSSL_s390xcap_P.pcc[0], OPENSSL_s390xcap_P.pcc[1],
+        OPENSSL_s390xcap_P.kdsa[0], OPENSSL_s390xcap_P.kdsa[1]);
     if ((env = getenv("OPENSSL_s390xcap")) != NULL)
         BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
-                     sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
-                     " env:%s", env);
-# elif defined(__riscv)
+            sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+            " env:%s", env);
+#elif defined(__riscv)
     const char *env;
-    char sep = '=';
+    size_t i;
 
     BIO_snprintf(ossl_cpu_info_str, sizeof(ossl_cpu_info_str),
-                 CPUINFO_PREFIX "OPENSSL_riscvcap");
-    for (size_t i = 0; i < kRISCVNumCaps; ++i) {
+        CPUINFO_PREFIX "OPENSSL_riscvcap=RV"
+#if __riscv_xlen == 32
+                       "32"
+#elif __riscv_xlen == 64
+                       "64"
+#elif __riscv_xlen == 128
+                       "128"
+#endif
+#if defined(__riscv_i) && defined(__riscv_m) && defined(__riscv_a) \
+    && defined(__riscv_f) && defined(__riscv_d)                    \
+    && defined(__riscv_zicsr) && defined(__riscv_zifencei)
+                       "G" /* shorthand for IMAFD_Zicsr_Zifencei */
+#else
+#ifdef __riscv_i
+                       "I"
+#endif
+#ifdef __riscv_m
+                       "M"
+#endif
+#ifdef __riscv_a
+                       "A"
+#endif
+#ifdef __riscv_f
+                       "F"
+#endif
+#ifdef __riscv_d
+                       "D"
+#endif
+#endif
+#ifdef __riscv_c
+                       "C"
+#endif
+    );
+    for (i = 0; i < kRISCVNumCaps; i++) {
         if (OPENSSL_riscvcap_P[RISCV_capabilities[i].index]
-                & (1 << RISCV_capabilities[i].bit_offset)) {
+            & (1 << RISCV_capabilities[i].bit_offset))
             /* Match, display the name */
             BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
-                         sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
-                         "%c%s", sep, RISCV_capabilities[i].name);
-            /* Only the first sep is '=' */
-            sep = '_';
-        }
+                sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+                "_%s", RISCV_capabilities[i].name);
     }
-    /* If no capability is found, add back the = */
-    if (sep == '=') {
+    if (RISCV_HAS_V())
         BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
-                     sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
-                     "%c", sep);
-    }
+            sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+            " vlen:%lu", riscv_vlen());
     if ((env = getenv("OPENSSL_riscvcap")) != NULL)
         BIO_snprintf(ossl_cpu_info_str + strlen(ossl_cpu_info_str),
-                     sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
-                     " env:%s", env);
-# endif
+            sizeof(ossl_cpu_info_str) - strlen(ossl_cpu_info_str),
+            " env:%s", env);
+#endif
 #endif
 
     {
         static char seeds[512] = "";
 
-#define add_seeds_string(str)                                           \
-        do {                                                            \
-            if (seeds[0] != '\0')                                       \
-                OPENSSL_strlcat(seeds, " ", sizeof(seeds));             \
-            OPENSSL_strlcat(seeds, str, sizeof(seeds));                 \
-        } while (0)
-#define add_seeds_stringlist(label, strlist)                            \
-        do {                                                            \
-            add_seeds_string(label "(");                                \
-            {                                                           \
-                const char *dev[] =  { strlist, NULL };                 \
-                const char **p;                                         \
-                int first = 1;                                          \
-                                                                        \
-                for (p = dev; *p != NULL; p++) {                        \
-                    if (!first)                                         \
-                        OPENSSL_strlcat(seeds, " ", sizeof(seeds));     \
-                    first = 0;                                          \
-                    OPENSSL_strlcat(seeds, *p, sizeof(seeds));          \
-                }                                                       \
-            }                                                           \
-            OPENSSL_strlcat(seeds, ")", sizeof(seeds));                 \
-        } while (0)
+#define add_seeds_string(str)                           \
+    do {                                                \
+        if (seeds[0] != '\0')                           \
+            OPENSSL_strlcat(seeds, " ", sizeof(seeds)); \
+        OPENSSL_strlcat(seeds, str, sizeof(seeds));     \
+    } while (0)
+#define add_seeds_stringlist(label, strlist)                    \
+    do {                                                        \
+        add_seeds_string(label "(");                            \
+        {                                                       \
+            const char *dev[] = { strlist, NULL };              \
+            const char **p;                                     \
+            int first = 1;                                      \
+                                                                \
+            for (p = dev; *p != NULL; p++) {                    \
+                if (!first)                                     \
+                    OPENSSL_strlcat(seeds, " ", sizeof(seeds)); \
+                first = 0;                                      \
+                OPENSSL_strlcat(seeds, *p, sizeof(seeds));      \
+            }                                                   \
+        }                                                       \
+        OPENSSL_strlcat(seeds, ")", sizeof(seeds));             \
+    } while (0)
 
 #ifdef OPENSSL_RAND_SEED_NONE
         add_seeds_string("none");
@@ -177,11 +209,11 @@ DEFINE_RUN_ONCE_STATIC(init_info_strings)
         add_seeds_string("rdtsc");
 #endif
 #ifdef OPENSSL_RAND_SEED_RDCPU
-# ifdef __aarch64__
+#ifdef __aarch64__
         add_seeds_string("rndr ( rndrrs rndr )");
-# else
+#else
         add_seeds_string("rdrand ( rdseed rdrand )");
-# endif
+#endif
 #endif
 #ifdef OPENSSL_RAND_SEED_GETRANDOM
         add_seeds_string("getrandom-syscall");
@@ -231,14 +263,13 @@ const char *OPENSSL_info(int t)
         return "\\";
 #elif defined(__VMS)
         return "";
-#else  /* Assume POSIX */
+#else /* Assume POSIX */
         return "/";
 #endif
-    case OPENSSL_INFO_LIST_SEPARATOR:
-        {
-            static const char list_sep[] = { LIST_SEPARATOR_CHAR, '\0' };
-            return list_sep;
-        }
+    case OPENSSL_INFO_LIST_SEPARATOR: {
+        static const char list_sep[] = { LIST_SEPARATOR_CHAR, '\0' };
+        return list_sep;
+    }
     case OPENSSL_INFO_SEED_SOURCE:
         return seed_sources;
     case OPENSSL_INFO_CPU_SETTINGS:
diff --git a/crypto/init.c b/crypto/init.c
index 2da4914707b1f..c309b27c5ddaa 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -100,26 +100,26 @@ static int win32atexit(void)
 DEFINE_RUN_ONCE_STATIC(ossl_init_register_atexit)
 {
 #ifndef OPENSSL_NO_ATEXIT
-# ifdef OPENSSL_INIT_DEBUG
+#ifdef OPENSSL_INIT_DEBUG
     fprintf(stderr, "OPENSSL_INIT: ossl_init_register_atexit()\n");
-# endif
-# ifndef OPENSSL_SYS_UEFI
-#  if defined(_WIN32) && !defined(__BORLANDC__)
+#endif
+#ifndef OPENSSL_SYS_UEFI
+#if defined(_WIN32) && !defined(__BORLANDC__)
     /* We use _onexit() in preference because it gets called on DLL unload */
     if (_onexit(win32atexit) == NULL)
         return 0;
-#  else
+#else
     if (atexit(OPENSSL_cleanup) != 0)
         return 0;
-#  endif
-# endif
+#endif
+#endif
 #endif
 
     return 1;
 }
 
 DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_register_atexit,
-                           ossl_init_register_atexit)
+    ossl_init_register_atexit)
 {
 #ifdef OPENSSL_INIT_DEBUG
     fprintf(stderr, "OPENSSL_INIT: ossl_init_no_register_atexit ok!\n");
@@ -135,23 +135,23 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_nodelete)
 
 #if !defined(OPENSSL_USE_NODELETE) \
     && !defined(OPENSSL_NO_PINSHARED)
-# if defined(DSO_WIN32) && !defined(_WIN32_WCE)
+#if defined(DSO_WIN32) && !defined(_WIN32_WCE)
     {
         HMODULE handle = NULL;
         BOOL ret;
 
         /* We don't use the DSO route for WIN32 because there is a better way */
         ret = GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
-                                | GET_MODULE_HANDLE_EX_FLAG_PIN,
-                                (void *)&base_inited, &handle);
+                | GET_MODULE_HANDLE_EX_FLAG_PIN,
+            (void *)&base_inited, &handle);
 
         OSSL_TRACE1(INIT,
-                    "ossl_init_load_crypto_nodelete: "
-                    "obtained DSO reference? %s\n",
-                    (ret == TRUE ? "No!" : "Yes."));
+            "ossl_init_load_crypto_nodelete: "
+            "obtained DSO reference? %s\n",
+            (ret == TRUE ? "No!" : "Yes."));
         return (ret == TRUE) ? 1 : 0;
     }
-# elif !defined(DSO_NONE)
+#elif !defined(DSO_NONE)
     /*
      * Deliberately leak a reference to ourselves. This will force the library
      * to remain loaded until the atexit() handler is run at process exit.
@@ -170,11 +170,11 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_nodelete)
          * already.
          */
         OSSL_TRACE1(INIT, "obtained DSO reference? %s\n",
-                    (dso == NULL ? "No!" : "Yes."));
+            (dso == NULL ? "No!" : "Yes."));
         DSO_free(dso);
         err_unshelve_state(err);
     }
-# endif
+#endif
 #endif
 
     return 1;
@@ -204,7 +204,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_strings)
 }
 
 DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_load_crypto_strings,
-                           ossl_init_load_crypto_strings)
+    ossl_init_load_crypto_strings)
 {
     /* Do nothing in this case */
     return 1;
@@ -226,7 +226,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_ssl_strings)
 }
 
 DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_load_ssl_strings,
-                           ossl_init_load_ssl_strings)
+    ossl_init_load_ssl_strings)
 {
     /* Do nothing in this case */
     return 1;
@@ -247,7 +247,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_add_all_ciphers)
 }
 
 DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_add_all_ciphers,
-                           ossl_init_add_all_ciphers)
+    ossl_init_add_all_ciphers)
 {
     /* Do nothing */
     return 1;
@@ -268,7 +268,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_add_all_digests)
 }
 
 DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_add_all_digests,
-                           ossl_init_add_all_digests)
+    ossl_init_add_all_digests)
 {
     /* Do nothing */
     return 1;
@@ -318,7 +318,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_openssl)
     engine_load_openssl_int();
     return 1;
 }
-# ifndef OPENSSL_NO_RDRAND
+#ifndef OPENSSL_NO_RDRAND
 static CRYPTO_ONCE engine_rdrand = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(ossl_init_engine_rdrand)
 {
@@ -326,7 +326,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_rdrand)
     engine_load_rdrand_int();
     return 1;
 }
-# endif
+#endif
 static CRYPTO_ONCE engine_dynamic = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(ossl_init_engine_dynamic)
 {
@@ -334,8 +334,8 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_dynamic)
     engine_load_dynamic_int();
     return 1;
 }
-# ifndef OPENSSL_NO_STATIC_ENGINE
-#  ifndef OPENSSL_NO_DEVCRYPTOENG
+#ifndef OPENSSL_NO_STATIC_ENGINE
+#ifndef OPENSSL_NO_DEVCRYPTOENG
 static CRYPTO_ONCE engine_devcrypto = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(ossl_init_engine_devcrypto)
 {
@@ -343,8 +343,8 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_devcrypto)
     engine_load_devcrypto_int();
     return 1;
 }
-#  endif
-#  if !defined(OPENSSL_NO_PADLOCKENG)
+#endif
+#if !defined(OPENSSL_NO_PADLOCKENG)
 static CRYPTO_ONCE engine_padlock = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(ossl_init_engine_padlock)
 {
@@ -352,8 +352,8 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_padlock)
     engine_load_padlock_int();
     return 1;
 }
-#  endif
-#  if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+#endif
+#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
 static CRYPTO_ONCE engine_capi = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(ossl_init_engine_capi)
 {
@@ -361,8 +361,8 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_capi)
     engine_load_capi_int();
     return 1;
 }
-#  endif
-#  if !defined(OPENSSL_NO_AFALGENG)
+#endif
+#if !defined(OPENSSL_NO_AFALGENG)
 static CRYPTO_ONCE engine_afalg = CRYPTO_ONCE_STATIC_INIT;
 DEFINE_RUN_ONCE_STATIC(ossl_init_engine_afalg)
 {
@@ -370,8 +370,8 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_engine_afalg)
     engine_load_afalg_int();
     return 1;
 }
-#  endif
-# endif
+#endif
+#endif
 #endif
 
 void OPENSSL_cleanup(void)
@@ -501,7 +501,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
     uint64_t tmp;
     int aloaddone = 0;
 
-   /* Applications depend on 0 being returned when cleanup was already done */
+    /* Applications depend on 0 being returned when cleanup was already done */
     if (stopped) {
         if (!(opts & OPENSSL_INIT_BASE_ONLY))
             ERR_raise(ERR_LIB_CRYPTO, ERR_R_INIT_FAIL);
@@ -567,7 +567,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
      */
     if ((opts & OPENSSL_INIT_NO_ATEXIT) != 0) {
         if (!RUN_ONCE_ALT(&register_atexit, ossl_init_no_register_atexit,
-                          ossl_init_register_atexit))
+                ossl_init_register_atexit))
             return 0;
     } else if (!RUN_ONCE(&register_atexit, ossl_init_register_atexit)) {
         return 0;
@@ -577,18 +577,18 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
         return 0;
 
     if ((opts & OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS)
-            && !RUN_ONCE_ALT(&load_crypto_strings,
-                             ossl_init_no_load_crypto_strings,
-                             ossl_init_load_crypto_strings))
+        && !RUN_ONCE_ALT(&load_crypto_strings,
+            ossl_init_no_load_crypto_strings,
+            ossl_init_load_crypto_strings))
         return 0;
 
     if ((opts & OPENSSL_INIT_LOAD_CRYPTO_STRINGS)
-            && !RUN_ONCE(&load_crypto_strings, ossl_init_load_crypto_strings))
+        && !RUN_ONCE(&load_crypto_strings, ossl_init_load_crypto_strings))
         return 0;
 
     if ((opts & OPENSSL_INIT_NO_LOAD_SSL_STRINGS)
         && !RUN_ONCE_ALT(&ssl_strings, ossl_init_no_load_ssl_strings,
-                         ossl_init_load_ssl_strings))
+            ossl_init_load_ssl_strings))
         return 0;
 
     if ((opts & OPENSSL_INIT_LOAD_SSL_STRINGS)
@@ -596,29 +596,29 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
         return 0;
 
     if ((opts & OPENSSL_INIT_NO_ADD_ALL_CIPHERS)
-            && !RUN_ONCE_ALT(&add_all_ciphers, ossl_init_no_add_all_ciphers,
-                             ossl_init_add_all_ciphers))
+        && !RUN_ONCE_ALT(&add_all_ciphers, ossl_init_no_add_all_ciphers,
+            ossl_init_add_all_ciphers))
         return 0;
 
     if ((opts & OPENSSL_INIT_ADD_ALL_CIPHERS)
-            && !RUN_ONCE(&add_all_ciphers, ossl_init_add_all_ciphers))
+        && !RUN_ONCE(&add_all_ciphers, ossl_init_add_all_ciphers))
         return 0;
 
     if ((opts & OPENSSL_INIT_NO_ADD_ALL_DIGESTS)
-            && !RUN_ONCE_ALT(&add_all_digests, ossl_init_no_add_all_digests,
-                             ossl_init_add_all_digests))
+        && !RUN_ONCE_ALT(&add_all_digests, ossl_init_no_add_all_digests,
+            ossl_init_add_all_digests))
         return 0;
 
     if ((opts & OPENSSL_INIT_ADD_ALL_DIGESTS)
-            && !RUN_ONCE(&add_all_digests, ossl_init_add_all_digests))
+        && !RUN_ONCE(&add_all_digests, ossl_init_add_all_digests))
         return 0;
 
     if ((opts & OPENSSL_INIT_ATFORK)
-            && !openssl_init_fork_handlers())
+        && !openssl_init_fork_handlers())
         return 0;
 
     if ((opts & OPENSSL_INIT_NO_LOAD_CONFIG)
-            && !RUN_ONCE_ALT(&config, ossl_init_no_config, ossl_init_config))
+        && !RUN_ONCE_ALT(&config, ossl_init_no_config, ossl_init_config))
         return 0;
 
     if (opts & OPENSSL_INIT_LOAD_CONFIG) {
@@ -637,7 +637,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
                     return 0;
                 conf_settings = settings;
                 ret = RUN_ONCE_ALT(&config, ossl_init_config_settings,
-                                   ossl_init_config);
+                    ossl_init_config);
                 conf_settings = NULL;
                 CRYPTO_THREAD_unlock(init_lock);
             }
@@ -648,46 +648,44 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
     }
 
     if ((opts & OPENSSL_INIT_ASYNC)
-            && !RUN_ONCE(&async, ossl_init_async))
+        && !RUN_ONCE(&async, ossl_init_async))
         return 0;
 
 #ifndef OPENSSL_NO_ENGINE
     if ((opts & OPENSSL_INIT_ENGINE_OPENSSL)
-            && !RUN_ONCE(&engine_openssl, ossl_init_engine_openssl))
+        && !RUN_ONCE(&engine_openssl, ossl_init_engine_openssl))
         return 0;
-# ifndef OPENSSL_NO_RDRAND
+#ifndef OPENSSL_NO_RDRAND
     if ((opts & OPENSSL_INIT_ENGINE_RDRAND)
-            && !RUN_ONCE(&engine_rdrand, ossl_init_engine_rdrand))
+        && !RUN_ONCE(&engine_rdrand, ossl_init_engine_rdrand))
         return 0;
-# endif
+#endif
     if ((opts & OPENSSL_INIT_ENGINE_DYNAMIC)
-            && !RUN_ONCE(&engine_dynamic, ossl_init_engine_dynamic))
+        && !RUN_ONCE(&engine_dynamic, ossl_init_engine_dynamic))
         return 0;
-# ifndef OPENSSL_NO_STATIC_ENGINE
-#  ifndef OPENSSL_NO_DEVCRYPTOENG
+#ifndef OPENSSL_NO_STATIC_ENGINE
+#ifndef OPENSSL_NO_DEVCRYPTOENG
     if ((opts & OPENSSL_INIT_ENGINE_CRYPTODEV)
-            && !RUN_ONCE(&engine_devcrypto, ossl_init_engine_devcrypto))
+        && !RUN_ONCE(&engine_devcrypto, ossl_init_engine_devcrypto))
         return 0;
-#  endif
-#  if !defined(OPENSSL_NO_PADLOCKENG)
+#endif
+#if !defined(OPENSSL_NO_PADLOCKENG)
     if ((opts & OPENSSL_INIT_ENGINE_PADLOCK)
-            && !RUN_ONCE(&engine_padlock, ossl_init_engine_padlock))
+        && !RUN_ONCE(&engine_padlock, ossl_init_engine_padlock))
         return 0;
-#  endif
-#  if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
+#endif
+#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
     if ((opts & OPENSSL_INIT_ENGINE_CAPI)
-            && !RUN_ONCE(&engine_capi, ossl_init_engine_capi))
+        && !RUN_ONCE(&engine_capi, ossl_init_engine_capi))
         return 0;
-#  endif
-#  if !defined(OPENSSL_NO_AFALGENG)
+#endif
+#if !defined(OPENSSL_NO_AFALGENG)
     if ((opts & OPENSSL_INIT_ENGINE_AFALG)
-            && !RUN_ONCE(&engine_afalg, ossl_init_engine_afalg))
+        && !RUN_ONCE(&engine_afalg, ossl_init_engine_afalg))
         return 0;
-#  endif
-# endif
-    if (opts & (OPENSSL_INIT_ENGINE_ALL_BUILTIN
-                | OPENSSL_INIT_ENGINE_OPENSSL
-                | OPENSSL_INIT_ENGINE_AFALG)) {
+#endif
+#endif
+    if (opts & (OPENSSL_INIT_ENGINE_ALL_BUILTIN | OPENSSL_INIT_ENGINE_OPENSSL | OPENSSL_INIT_ENGINE_AFALG)) {
         ENGINE_register_all_complete();
     }
 #endif
@@ -702,10 +700,10 @@ int OPENSSL_atexit(void (*handler)(void))
 {
     OPENSSL_INIT_STOP *newhand;
 
-#if !defined(OPENSSL_USE_NODELETE)\
+#if !defined(OPENSSL_USE_NODELETE) \
     && !defined(OPENSSL_NO_PINSHARED)
     {
-# if defined(DSO_WIN32) && !defined(_WIN32_WCE)
+#if defined(DSO_WIN32) && !defined(_WIN32_WCE)
         HMODULE handle = NULL;
         BOOL ret;
         union {
@@ -720,12 +718,12 @@ int OPENSSL_atexit(void (*handler)(void))
          * way
          */
         ret = GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
-                                | GET_MODULE_HANDLE_EX_FLAG_PIN,
-                                handlersym.sym, &handle);
+                | GET_MODULE_HANDLE_EX_FLAG_PIN,
+            handlersym.sym, &handle);
 
         if (!ret)
             return 0;
-# elif !defined(DSO_NONE)
+#elif !defined(DSO_NONE)
         /*
          * Deliberately leak a reference to the handler. This will force the
          * library/code containing the handler to remain loaded until we run the
@@ -744,11 +742,11 @@ int OPENSSL_atexit(void (*handler)(void))
         dso = DSO_dsobyaddr(handlersym.sym, DSO_FLAG_NO_UNLOAD_ON_FREE);
         /* See same code above in ossl_init_base() for an explanation. */
         OSSL_TRACE1(INIT,
-                   "atexit: obtained DSO reference? %s\n",
-                   (dso == NULL ? "No!" : "Yes."));
+            "atexit: obtained DSO reference? %s\n",
+            (dso == NULL ? "No!" : "Yes."));
         DSO_free(dso);
         ERR_pop_to_mark();
-# endif
+#endif
     }
 #endif
 
@@ -761,4 +759,3 @@ int OPENSSL_atexit(void (*handler)(void))
 
     return 1;
 }
-
diff --git a/crypto/initthread.c b/crypto/initthread.c
index 27b460009e1dc..194f7538b20e7 100644
--- a/crypto/initthread.c
+++ b/crypto/initthread.c
@@ -83,10 +83,10 @@ static GLOBAL_TEVENT_REGISTER *get_global_tevent_register(void)
 #endif
 
 #ifndef FIPS_MODULE
-static int  init_thread_push_handlers(THREAD_EVENT_HANDLER **hands);
+static int init_thread_push_handlers(THREAD_EVENT_HANDLER **hands);
 static void init_thread_remove_handlers(THREAD_EVENT_HANDLER **handsin);
 static void init_thread_destructor(void *hands);
-static int  init_thread_deregister(void *arg, int all);
+static int init_thread_deregister(void *arg, int all);
 #endif
 static void init_thread_stop(void *arg, THREAD_EVENT_HANDLER **hands);
 
@@ -199,12 +199,27 @@ static void init_thread_destructor(void *hands)
     OPENSSL_free(hands);
 }
 
-int ossl_init_thread(void)
+static CRYPTO_ONCE ossl_init_thread_runonce = CRYPTO_ONCE_STATIC_INIT;
+static CRYPTO_THREAD_ID recursion_guard = (CRYPTO_THREAD_ID)0;
+
+DEFINE_RUN_ONCE_STATIC(ossl_init_thread_once)
 {
+    recursion_guard = CRYPTO_THREAD_get_current_id();
     if (!CRYPTO_THREAD_init_local(&destructor_key.value,
-                                  init_thread_destructor))
+            init_thread_destructor))
         return 0;
 
+    recursion_guard = (CRYPTO_THREAD_ID)0;
+    return 1;
+}
+
+int ossl_init_thread(void)
+{
+    if (CRYPTO_THREAD_compare_id(recursion_guard,
+            CRYPTO_THREAD_get_current_id()))
+        return 1;
+    if (!RUN_ONCE(&ossl_init_thread_runonce, ossl_init_thread_once))
+        return 0;
     return 1;
 }
 
@@ -255,7 +270,7 @@ static void ossl_arg_thread_stop(void *arg);
 int ossl_thread_register_fips(OSSL_LIB_CTX *libctx)
 {
     return c_thread_start(FIPS_get_core_handle(libctx), ossl_arg_thread_stop,
-                          libctx);
+        libctx);
 }
 
 void *ossl_thread_event_ctx_new(OSSL_LIB_CTX *libctx)
@@ -287,10 +302,10 @@ void *ossl_thread_event_ctx_new(OSSL_LIB_CTX *libctx)
      */
 
     return tlocal;
- err:
+err:
     OPENSSL_free(hands);
     CRYPTO_THREAD_cleanup_local(tlocal);
- deinit:
+deinit:
     OPENSSL_free(tlocal);
     return NULL;
 }
@@ -320,7 +335,6 @@ void ossl_ctx_thread_stop(OSSL_LIB_CTX *ctx)
 }
 #endif /* FIPS_MODULE */
 
-
 static void init_thread_stop(void *arg, THREAD_EVENT_HANDLER **hands)
 {
     THREAD_EVENT_HANDLER *curr, *prev = NULL, *tmp;
@@ -365,7 +379,7 @@ static void init_thread_stop(void *arg, THREAD_EVENT_HANDLER **hands)
 }
 
 int ossl_init_thread_start(const void *index, void *arg,
-                           OSSL_thread_stop_handler_fn handfn)
+    OSSL_thread_stop_handler_fn handfn)
 {
     THREAD_EVENT_HANDLER **hands;
     THREAD_EVENT_HANDLER *hand;
diff --git a/crypto/lhash/lh_stats.c b/crypto/lhash/lh_stats.c
index ea0a3252a6ba8..3e540b40af344 100644
--- a/crypto/lhash/lh_stats.c
+++ b/crypto/lhash/lh_stats.c
@@ -22,8 +22,8 @@
 #include <openssl/lhash.h>
 #include "lhash_local.h"
 
-# ifndef OPENSSL_NO_STDIO
-#  ifndef OPENSSL_NO_DEPRECATED_3_1
+#ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_DEPRECATED_3_1
 void OPENSSL_LH_stats(const OPENSSL_LHASH *lh, FILE *fp)
 {
     BIO *bp;
@@ -59,10 +59,10 @@ void OPENSSL_LH_node_usage_stats(const OPENSSL_LHASH *lh, FILE *fp)
     OPENSSL_LH_node_usage_stats_bio(lh, bp);
     BIO_free(bp);
 }
-#  endif
-# endif
+#endif
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_1
+#ifndef OPENSSL_NO_DEPRECATED_3_1
 /*
  * These functions are implemented as separate static functions as they are
  * called from the stdio functions above and calling deprecated functions will
@@ -71,8 +71,8 @@ void OPENSSL_LH_node_usage_stats(const OPENSSL_LHASH *lh, FILE *fp)
 void OPENSSL_LH_stats_bio(const OPENSSL_LHASH *lh, BIO *out)
 {
     BIO_printf(out, "num_items             = %lu\n", lh->num_items);
-    BIO_printf(out, "num_nodes             = %u\n",  lh->num_nodes);
-    BIO_printf(out, "num_alloc_nodes       = %u\n",  lh->num_alloc_nodes);
+    BIO_printf(out, "num_nodes             = %u\n", lh->num_nodes);
+    BIO_printf(out, "num_alloc_nodes       = %u\n", lh->num_alloc_nodes);
     BIO_printf(out, "num_expands           = 0\n");
     BIO_printf(out, "num_expand_reallocs   = 0\n");
     BIO_printf(out, "num_contracts         = 0\n");
@@ -120,8 +120,8 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out)
     if (n_used == 0)
         return;
     BIO_printf(out, "load %d.%02d  actual load %d.%02d\n",
-               (int)(total / lh->num_nodes),
-               (int)((total % lh->num_nodes) * 100 / lh->num_nodes),
-               (int)(total / n_used), (int)((total % n_used) * 100 / n_used));
+        (int)(total / lh->num_nodes),
+        (int)((total % lh->num_nodes) * 100 / lh->num_nodes),
+        (int)(total / n_used), (int)((total % n_used) * 100 / n_used));
 }
-# endif
+#endif
diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c
index e0234ccbffe43..1813d687c883d 100644
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c
@@ -36,19 +36,19 @@
  */
 
 #undef MIN_NODES
-#define MIN_NODES       16
-#define UP_LOAD         (2*LH_LOAD_MULT) /* load times 256 (default 2) */
-#define DOWN_LOAD       (LH_LOAD_MULT) /* load times 256 (default 1) */
+#define MIN_NODES 16
+#define UP_LOAD (2 * LH_LOAD_MULT) /* load times 256 (default 2) */
+#define DOWN_LOAD (LH_LOAD_MULT) /* load times 256 (default 1) */
 
 static int expand(OPENSSL_LHASH *lh);
 static void contract(OPENSSL_LHASH *lh);
 static OPENSSL_LH_NODE **getrn(OPENSSL_LHASH *lh, const void *data, unsigned long *rhash);
 
 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)
 {
 
     if (lh == NULL)
@@ -122,7 +122,7 @@ void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data)
 
     lh->error = 0;
     if ((lh->up_load <= (lh->num_items * LH_LOAD_MULT / lh->num_nodes)) && !expand(lh))
-        return NULL;        /* 'lh->error++' already done in 'expand' */
+        return NULL; /* 'lh->error++' already done in 'expand' */
 
     rn = getrn(lh, data, &hash);
 
@@ -137,7 +137,7 @@ void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data)
         *rn = nn;
         ret = NULL;
         lh->num_items++;
-    } else {                    /* replace same key */
+    } else { /* replace same key */
         ret = (*rn)->data;
         (*rn)->data = data;
     }
@@ -163,8 +163,7 @@ void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data)
     }
 
     lh->num_items--;
-    if ((lh->num_nodes > MIN_NODES) &&
-        (lh->down_load >= (lh->num_items * LH_LOAD_MULT / lh->num_nodes)))
+    if ((lh->num_nodes > MIN_NODES) && (lh->down_load >= (lh->num_items * LH_LOAD_MULT / lh->num_nodes)))
         contract(lh);
 
     return ret;
@@ -184,11 +183,11 @@ void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data)
 }
 
 static void doall_util_fn(OPENSSL_LHASH *lh, int use_arg,
-                          OPENSSL_LH_DOALL_FUNC_THUNK wfunc,
-                          OPENSSL_LH_DOALL_FUNC func,
-                          OPENSSL_LH_DOALL_FUNCARG func_arg,
-                          OPENSSL_LH_DOALL_FUNCARG_THUNK wfunc_arg,
-                          void *arg)
+    OPENSSL_LH_DOALL_FUNC_THUNK wfunc,
+    OPENSSL_LH_DOALL_FUNC func,
+    OPENSSL_LH_DOALL_FUNCARG func_arg,
+    OPENSSL_LH_DOALL_FUNCARG_THUNK wfunc_arg,
+    void *arg)
 {
     int i;
     OPENSSL_LH_NODE *a, *n;
@@ -219,25 +218,25 @@ void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func)
         return;
 
     doall_util_fn(lh, 0, lh->daw, func, (OPENSSL_LH_DOALL_FUNCARG)NULL,
-                  (OPENSSL_LH_DOALL_FUNCARG_THUNK)NULL, NULL);
+        (OPENSSL_LH_DOALL_FUNCARG_THUNK)NULL, NULL);
 }
 
 void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
-                          OPENSSL_LH_DOALL_FUNCARG func, void *arg)
+    OPENSSL_LH_DOALL_FUNCARG func, void *arg)
 {
     if (lh == NULL)
         return;
 
     doall_util_fn(lh, 1, (OPENSSL_LH_DOALL_FUNC_THUNK)NULL,
-                  (OPENSSL_LH_DOALL_FUNC)NULL, func, lh->daaw, arg);
+        (OPENSSL_LH_DOALL_FUNC)NULL, func, lh->daaw, 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)
 {
     doall_util_fn(lh, 1, (OPENSSL_LH_DOALL_FUNC_THUNK)NULL,
-                  (OPENSSL_LH_DOALL_FUNC)NULL, fn, daaw, arg);
+        (OPENSSL_LH_DOALL_FUNC)NULL, fn, daaw, arg);
 }
 
 static int expand(OPENSSL_LHASH *lh)
@@ -292,7 +291,7 @@ static void contract(OPENSSL_LHASH *lh)
     lh->b[lh->p + lh->pmax - 1] = NULL; /* 24/07-92 - eay - weird but :-( */
     if (lh->p == 0) {
         n = OPENSSL_realloc(lh->b,
-                            (unsigned int)(sizeof(OPENSSL_LH_NODE *) * lh->pmax));
+            (unsigned int)(sizeof(OPENSSL_LH_NODE *) * lh->pmax));
         if (n == NULL) {
             /* fputs("realloc error in lhash", stderr); */
             lh->error++;
@@ -318,7 +317,7 @@ static void contract(OPENSSL_LHASH *lh)
 }
 
 static OPENSSL_LH_NODE **getrn(OPENSSL_LHASH *lh,
-                               const void *data, unsigned long *rhash)
+    const void *data, unsigned long *rhash)
 {
     OPENSSL_LH_NODE **ret, *n1;
     unsigned long hash, nn;
diff --git a/crypto/lhash/lhash_local.h b/crypto/lhash/lhash_local.h
index 8da63b9adda24..4a7cdfb9f6620 100644
--- a/crypto/lhash/lhash_local.h
+++ b/crypto/lhash/lhash_local.h
@@ -28,8 +28,8 @@ struct lhash_st {
     unsigned int num_alloc_nodes;
     unsigned int p;
     unsigned int pmax;
-    unsigned long up_load;      /* load times 256 */
-    unsigned long down_load;    /* load times 256 */
+    unsigned long up_load; /* load times 256 */
+    unsigned long down_load; /* load times 256 */
     unsigned long num_items;
     int error;
 };
diff --git a/crypto/loongarch_arch.h b/crypto/loongarch_arch.h
index c7fd42df1e0a8..e1a7f82293f8a 100644
--- a/crypto/loongarch_arch.h
+++ b/crypto/loongarch_arch.h
@@ -7,13 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_CRYPTO_LOONGARCH_ARCH_H
-# define OSSL_CRYPTO_LOONGARCH_ARCH_H
+#define OSSL_CRYPTO_LOONGARCH_ARCH_H
 
-# ifndef __ASSEMBLER__
+#ifndef __ASSEMBLER__
 extern unsigned int OPENSSL_loongarch_hwcap_P;
-# endif
+#endif
 
-# define LOONGARCH_HWCAP_LSX  (1 << 4)
-# define LOONGARCH_HWCAP_LASX (1 << 5)
+#define LOONGARCH_HWCAP_LSX (1 << 4)
+#define LOONGARCH_HWCAP_LASX (1 << 5)
 
 #endif
diff --git a/crypto/loongarchcap.c b/crypto/loongarchcap.c
index 2123fd9c08317..9772a98090360 100644
--- a/crypto/loongarchcap.c
+++ b/crypto/loongarchcap.c
@@ -13,5 +13,5 @@ unsigned int OPENSSL_loongarch_hwcap_P = 0;
 
 void OPENSSL_cpuid_setup(void)
 {
-	OPENSSL_loongarch_hwcap_P = getauxval(AT_HWCAP);
+    OPENSSL_loongarch_hwcap_P = getauxval(AT_HWCAP);
 }
diff --git a/crypto/md2/md2_dgst.c b/crypto/md2/md2_dgst.c
index 0b00335438812..61c4b72507a7e 100644
--- a/crypto/md2/md2_dgst.c
+++ b/crypto/md2/md2_dgst.c
@@ -24,7 +24,7 @@
  * Implemented from RFC1319 The MD2 Message-Digest Algorithm
  */
 
-#define UCHAR   unsigned char
+#define UCHAR unsigned char
 
 static void md2_block(MD2_CTX *c, const unsigned char *d);
 /*
@@ -32,38 +32,262 @@ static void md2_block(MD2_CTX *c, const unsigned char *d);
  * a random byte string.
  */
 static const MD2_INT S[256] = {
-    0x29, 0x2E, 0x43, 0xC9, 0xA2, 0xD8, 0x7C, 0x01,
-    0x3D, 0x36, 0x54, 0xA1, 0xEC, 0xF0, 0x06, 0x13,
-    0x62, 0xA7, 0x05, 0xF3, 0xC0, 0xC7, 0x73, 0x8C,
-    0x98, 0x93, 0x2B, 0xD9, 0xBC, 0x4C, 0x82, 0xCA,
-    0x1E, 0x9B, 0x57, 0x3C, 0xFD, 0xD4, 0xE0, 0x16,
-    0x67, 0x42, 0x6F, 0x18, 0x8A, 0x17, 0xE5, 0x12,
-    0xBE, 0x4E, 0xC4, 0xD6, 0xDA, 0x9E, 0xDE, 0x49,
-    0xA0, 0xFB, 0xF5, 0x8E, 0xBB, 0x2F, 0xEE, 0x7A,
-    0xA9, 0x68, 0x79, 0x91, 0x15, 0xB2, 0x07, 0x3F,
-    0x94, 0xC2, 0x10, 0x89, 0x0B, 0x22, 0x5F, 0x21,
-    0x80, 0x7F, 0x5D, 0x9A, 0x5A, 0x90, 0x32, 0x27,
-    0x35, 0x3E, 0xCC, 0xE7, 0xBF, 0xF7, 0x97, 0x03,
-    0xFF, 0x19, 0x30, 0xB3, 0x48, 0xA5, 0xB5, 0xD1,
-    0xD7, 0x5E, 0x92, 0x2A, 0xAC, 0x56, 0xAA, 0xC6,
-    0x4F, 0xB8, 0x38, 0xD2, 0x96, 0xA4, 0x7D, 0xB6,
-    0x76, 0xFC, 0x6B, 0xE2, 0x9C, 0x74, 0x04, 0xF1,
-    0x45, 0x9D, 0x70, 0x59, 0x64, 0x71, 0x87, 0x20,
-    0x86, 0x5B, 0xCF, 0x65, 0xE6, 0x2D, 0xA8, 0x02,
-    0x1B, 0x60, 0x25, 0xAD, 0xAE, 0xB0, 0xB9, 0xF6,
-    0x1C, 0x46, 0x61, 0x69, 0x34, 0x40, 0x7E, 0x0F,
-    0x55, 0x47, 0xA3, 0x23, 0xDD, 0x51, 0xAF, 0x3A,
-    0xC3, 0x5C, 0xF9, 0xCE, 0xBA, 0xC5, 0xEA, 0x26,
-    0x2C, 0x53, 0x0D, 0x6E, 0x85, 0x28, 0x84, 0x09,
-    0xD3, 0xDF, 0xCD, 0xF4, 0x41, 0x81, 0x4D, 0x52,
-    0x6A, 0xDC, 0x37, 0xC8, 0x6C, 0xC1, 0xAB, 0xFA,
-    0x24, 0xE1, 0x7B, 0x08, 0x0C, 0xBD, 0xB1, 0x4A,
-    0x78, 0x88, 0x95, 0x8B, 0xE3, 0x63, 0xE8, 0x6D,
-    0xE9, 0xCB, 0xD5, 0xFE, 0x3B, 0x00, 0x1D, 0x39,
-    0xF2, 0xEF, 0xB7, 0x0E, 0x66, 0x58, 0xD0, 0xE4,
-    0xA6, 0x77, 0x72, 0xF8, 0xEB, 0x75, 0x4B, 0x0A,
-    0x31, 0x44, 0x50, 0xB4, 0x8F, 0xED, 0x1F, 0x1A,
-    0xDB, 0x99, 0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14,
+    0x29,
+    0x2E,
+    0x43,
+    0xC9,
+    0xA2,
+    0xD8,
+    0x7C,
+    0x01,
+    0x3D,
+    0x36,
+    0x54,
+    0xA1,
+    0xEC,
+    0xF0,
+    0x06,
+    0x13,
+    0x62,
+    0xA7,
+    0x05,
+    0xF3,
+    0xC0,
+    0xC7,
+    0x73,
+    0x8C,
+    0x98,
+    0x93,
+    0x2B,
+    0xD9,
+    0xBC,
+    0x4C,
+    0x82,
+    0xCA,
+    0x1E,
+    0x9B,
+    0x57,
+    0x3C,
+    0xFD,
+    0xD4,
+    0xE0,
+    0x16,
+    0x67,
+    0x42,
+    0x6F,
+    0x18,
+    0x8A,
+    0x17,
+    0xE5,
+    0x12,
+    0xBE,
+    0x4E,
+    0xC4,
+    0xD6,
+    0xDA,
+    0x9E,
+    0xDE,
+    0x49,
+    0xA0,
+    0xFB,
+    0xF5,
+    0x8E,
+    0xBB,
+    0x2F,
+    0xEE,
+    0x7A,
+    0xA9,
+    0x68,
+    0x79,
+    0x91,
+    0x15,
+    0xB2,
+    0x07,
+    0x3F,
+    0x94,
+    0xC2,
+    0x10,
+    0x89,
+    0x0B,
+    0x22,
+    0x5F,
+    0x21,
+    0x80,
+    0x7F,
+    0x5D,
+    0x9A,
+    0x5A,
+    0x90,
+    0x32,
+    0x27,
+    0x35,
+    0x3E,
+    0xCC,
+    0xE7,
+    0xBF,
+    0xF7,
+    0x97,
+    0x03,
+    0xFF,
+    0x19,
+    0x30,
+    0xB3,
+    0x48,
+    0xA5,
+    0xB5,
+    0xD1,
+    0xD7,
+    0x5E,
+    0x92,
+    0x2A,
+    0xAC,
+    0x56,
+    0xAA,
+    0xC6,
+    0x4F,
+    0xB8,
+    0x38,
+    0xD2,
+    0x96,
+    0xA4,
+    0x7D,
+    0xB6,
+    0x76,
+    0xFC,
+    0x6B,
+    0xE2,
+    0x9C,
+    0x74,
+    0x04,
+    0xF1,
+    0x45,
+    0x9D,
+    0x70,
+    0x59,
+    0x64,
+    0x71,
+    0x87,
+    0x20,
+    0x86,
+    0x5B,
+    0xCF,
+    0x65,
+    0xE6,
+    0x2D,
+    0xA8,
+    0x02,
+    0x1B,
+    0x60,
+    0x25,
+    0xAD,
+    0xAE,
+    0xB0,
+    0xB9,
+    0xF6,
+    0x1C,
+    0x46,
+    0x61,
+    0x69,
+    0x34,
+    0x40,
+    0x7E,
+    0x0F,
+    0x55,
+    0x47,
+    0xA3,
+    0x23,
+    0xDD,
+    0x51,
+    0xAF,
+    0x3A,
+    0xC3,
+    0x5C,
+    0xF9,
+    0xCE,
+    0xBA,
+    0xC5,
+    0xEA,
+    0x26,
+    0x2C,
+    0x53,
+    0x0D,
+    0x6E,
+    0x85,
+    0x28,
+    0x84,
+    0x09,
+    0xD3,
+    0xDF,
+    0xCD,
+    0xF4,
+    0x41,
+    0x81,
+    0x4D,
+    0x52,
+    0x6A,
+    0xDC,
+    0x37,
+    0xC8,
+    0x6C,
+    0xC1,
+    0xAB,
+    0xFA,
+    0x24,
+    0xE1,
+    0x7B,
+    0x08,
+    0x0C,
+    0xBD,
+    0xB1,
+    0x4A,
+    0x78,
+    0x88,
+    0x95,
+    0x8B,
+    0xE3,
+    0x63,
+    0xE8,
+    0x6D,
+    0xE9,
+    0xCB,
+    0xD5,
+    0xFE,
+    0x3B,
+    0x00,
+    0x1D,
+    0x39,
+    0xF2,
+    0xEF,
+    0xB7,
+    0x0E,
+    0x66,
+    0x58,
+    0xD0,
+    0xE4,
+    0xA6,
+    0x77,
+    0x72,
+    0xF8,
+    0xEB,
+    0x75,
+    0x4B,
+    0x0A,
+    0x31,
+    0x44,
+    0x50,
+    0xB4,
+    0x8F,
+    0xED,
+    0x1F,
+    0x1A,
+    0xDB,
+    0x99,
+    0x8D,
+    0x33,
+    0x9F,
+    0x11,
+    0x83,
+    0x14,
 };
 
 const char *MD2_options(void)
@@ -164,16 +388,16 @@ int MD2_Final(unsigned char *md, MD2_CTX *c)
     p2 = c->cksm;
     v = MD2_BLOCK - c->num;
     for (i = c->num; i < MD2_BLOCK; i++)
-        cp[i] = (UCHAR) v;
+        cp[i] = (UCHAR)v;
 
     md2_block(c, cp);
 
     for (i = 0; i < MD2_BLOCK; i++)
-        cp[i] = (UCHAR) p2[i];
+        cp[i] = (UCHAR)p2[i];
     md2_block(c, cp);
 
     for (i = 0; i < 16; i++)
-        md[i] = (UCHAR) (p1[i] & 0xff);
+        md[i] = (UCHAR)(p1[i] & 0xff);
     OPENSSL_cleanse(c, sizeof(*c));
     return 1;
 }
diff --git a/crypto/md4/md4_dgst.c b/crypto/md4/md4_dgst.c
index aefe6a3a3770b..3912fe2833874 100644
--- a/crypto/md4/md4_dgst.c
+++ b/crypto/md4/md4_dgst.c
@@ -37,22 +37,22 @@ int MD4_Init(MD4_CTX *c)
 }
 
 #ifndef md4_block_data_order
-# ifdef X
-#  undef X
-# endif
+#ifdef X
+#undef X
+#endif
 void md4_block_data_order(MD4_CTX *c, const void *data_, size_t num)
 {
     const unsigned char *data = data_;
     register unsigned MD32_REG_T A, B, C, D, l;
-# ifndef MD32_XARRAY
+#ifndef MD32_XARRAY
     /* See comment in crypto/sha/sha_local.h for details. */
     unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
         XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
-#  define X(i)   XX##i
-# else
+#define X(i) XX##i
+#else
     MD4_LONG XX[MD4_LBLOCK];
-#  define X(i)   XX[i]
-# endif
+#define X(i) XX[i]
+#endif
 
     A = c->A;
     B = c->B;
diff --git a/crypto/md4/md4_local.h b/crypto/md4/md4_local.h
index 66aa5e4038978..ec2a8c361cf08 100644
--- a/crypto/md4/md4_local.h
+++ b/crypto/md4/md4_local.h
@@ -16,20 +16,25 @@ void md4_block_data_order(MD4_CTX *c, const void *p, size_t num);
 
 #define DATA_ORDER_IS_LITTLE_ENDIAN
 
-#define HASH_LONG               MD4_LONG
-#define HASH_CTX                MD4_CTX
-#define HASH_CBLOCK             MD4_CBLOCK
-#define HASH_UPDATE             MD4_Update
-#define HASH_TRANSFORM          MD4_Transform
-#define HASH_FINAL              MD4_Final
-#define HASH_MAKE_STRING(c,s)   do {    \
-        unsigned long ll;               \
-        ll=(c)->A; (void)HOST_l2c(ll,(s));      \
-        ll=(c)->B; (void)HOST_l2c(ll,(s));      \
-        ll=(c)->C; (void)HOST_l2c(ll,(s));      \
-        ll=(c)->D; (void)HOST_l2c(ll,(s));      \
-        } while (0)
-#define HASH_BLOCK_DATA_ORDER   md4_block_data_order
+#define HASH_LONG MD4_LONG
+#define HASH_CTX MD4_CTX
+#define HASH_CBLOCK MD4_CBLOCK
+#define HASH_UPDATE MD4_Update
+#define HASH_TRANSFORM MD4_Transform
+#define HASH_FINAL MD4_Final
+#define HASH_MAKE_STRING(c, s)   \
+    do {                         \
+        unsigned long ll;        \
+        ll = (c)->A;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->B;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->C;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->D;             \
+        (void)HOST_l2c(ll, (s)); \
+    } while (0)
+#define HASH_BLOCK_DATA_ORDER md4_block_data_order
 
 #include "crypto/md32_common.h"
 
@@ -43,18 +48,24 @@ void md4_block_data_order(MD4_CTX *c, const void *p, size_t num);
  * below.  Wei attributes these optimizations to Peter Gutmann's SHS code,
  * and he attributes it to Rich Schroeppel.
  */
-#define F(b,c,d)        ((((c) ^ (d)) & (b)) ^ (d))
-#define G(b,c,d)        (((b) & (c)) | ((b) & (d)) | ((c) & (d)))
-#define H(b,c,d)        ((b) ^ (c) ^ (d))
+#define F(b, c, d) ((((c) ^ (d)) & (b)) ^ (d))
+#define G(b, c, d) (((b) & (c)) | ((b) & (d)) | ((c) & (d)))
+#define H(b, c, d) ((b) ^ (c) ^ (d))
 
-#define R0(a,b,c,d,k,s,t) { \
-        a+=((k)+(t)+F((b),(c),(d))); \
-        a=ROTATE(a,s); };
+#define R0(a, b, c, d, k, s, t)              \
+    {                                        \
+        a += ((k) + (t) + F((b), (c), (d))); \
+        a = ROTATE(a, s);                    \
+    };
 
-#define R1(a,b,c,d,k,s,t) { \
-        a+=((k)+(t)+G((b),(c),(d))); \
-        a=ROTATE(a,s); };
+#define R1(a, b, c, d, k, s, t)              \
+    {                                        \
+        a += ((k) + (t) + G((b), (c), (d))); \
+        a = ROTATE(a, s);                    \
+    };
 
-#define R2(a,b,c,d,k,s,t) { \
-        a+=((k)+(t)+H((b),(c),(d))); \
-        a=ROTATE(a,s); };
+#define R2(a, b, c, d, k, s, t)              \
+    {                                        \
+        a += ((k) + (t) + H((b), (c), (d))); \
+        a = ROTATE(a, s);                    \
+    };
diff --git a/crypto/md4/md4_one.c b/crypto/md4/md4_one.c
index 36fa88dd4166b..c7512209e79f4 100644
--- a/crypto/md4/md4_one.c
+++ b/crypto/md4/md4_one.c
@@ -19,7 +19,7 @@
 #include <openssl/crypto.h>
 
 #ifdef CHARSET_EBCDIC
-# include <openssl/ebcdic.h>
+#include <openssl/ebcdic.h>
 #endif
 
 unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md)
diff --git a/crypto/md5/md5_dgst.c b/crypto/md5/md5_dgst.c
index 913b1ea5cad6f..4b240e1fc6fb4 100644
--- a/crypto/md5/md5_dgst.c
+++ b/crypto/md5/md5_dgst.c
@@ -37,22 +37,22 @@ int MD5_Init(MD5_CTX *c)
 }
 
 #ifndef md5_block_data_order
-# ifdef X
-#  undef X
-# endif
+#ifdef X
+#undef X
+#endif
 void md5_block_data_order(MD5_CTX *c, const void *data_, size_t num)
 {
     const unsigned char *data = data_;
     register unsigned MD32_REG_T A, B, C, D, l;
-# ifndef MD32_XARRAY
+#ifndef MD32_XARRAY
     /* See comment in crypto/sha/sha_local.h for details. */
     unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
         XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
-#  define X(i)   XX##i
-# else
+#define X(i) XX##i
+#else
     MD5_LONG XX[MD5_LBLOCK];
-#  define X(i)   XX[i]
-# endif
+#define X(i) XX[i]
+#endif
 
     A = c->A;
     B = c->B;
diff --git a/crypto/md5/md5_local.h b/crypto/md5/md5_local.h
index fab8bb9dae638..f0905e513c69d 100644
--- a/crypto/md5/md5_local.h
+++ b/crypto/md5/md5_local.h
@@ -13,36 +13,38 @@
 #include <openssl/md5.h>
 
 #ifdef MD5_ASM
-# if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
-     defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \
-     defined(_M_X64) || defined(__aarch64__) || \
-     (defined(__loongarch__) && __loongarch_grlen == 64)
-#  define md5_block_data_order ossl_md5_block_asm_data_order
-# elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
-#  define md5_block_data_order ossl_md5_block_asm_data_order
-# elif defined(__sparc) || defined(__sparc__)
-#  define md5_block_data_order ossl_md5_block_asm_data_order
-# endif
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) || defined(__aarch64__) || (defined(__loongarch__) && __loongarch_grlen == 64)
+#define md5_block_data_order ossl_md5_block_asm_data_order
+#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
+#define md5_block_data_order ossl_md5_block_asm_data_order
+#elif defined(__sparc) || defined(__sparc__)
+#define md5_block_data_order ossl_md5_block_asm_data_order
+#endif
 #endif
 
 void md5_block_data_order(MD5_CTX *c, const void *p, size_t num);
 
 #define DATA_ORDER_IS_LITTLE_ENDIAN
 
-#define HASH_LONG               MD5_LONG
-#define HASH_CTX                MD5_CTX
-#define HASH_CBLOCK             MD5_CBLOCK
-#define HASH_UPDATE             MD5_Update
-#define HASH_TRANSFORM          MD5_Transform
-#define HASH_FINAL              MD5_Final
-#define HASH_MAKE_STRING(c,s)   do {    \
-        unsigned long ll;               \
-        ll=(c)->A; (void)HOST_l2c(ll,(s));      \
-        ll=(c)->B; (void)HOST_l2c(ll,(s));      \
-        ll=(c)->C; (void)HOST_l2c(ll,(s));      \
-        ll=(c)->D; (void)HOST_l2c(ll,(s));      \
-        } while (0)
-#define HASH_BLOCK_DATA_ORDER   md5_block_data_order
+#define HASH_LONG MD5_LONG
+#define HASH_CTX MD5_CTX
+#define HASH_CBLOCK MD5_CBLOCK
+#define HASH_UPDATE MD5_Update
+#define HASH_TRANSFORM MD5_Transform
+#define HASH_FINAL MD5_Final
+#define HASH_MAKE_STRING(c, s)   \
+    do {                         \
+        unsigned long ll;        \
+        ll = (c)->A;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->B;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->C;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->D;             \
+        (void)HOST_l2c(ll, (s)); \
+    } while (0)
+#define HASH_BLOCK_DATA_ORDER md5_block_data_order
 
 #include "crypto/md32_common.h"
 
@@ -56,27 +58,35 @@ void md5_block_data_order(MD5_CTX *c, const void *p, size_t num);
  * below.  Wei attributes these optimizations to Peter Gutmann's
  * SHS code, and he attributes it to Rich Schroeppel.
  */
-#define F(b,c,d)        ((((c) ^ (d)) & (b)) ^ (d))
-#define G(b,c,d)        ((((b) ^ (c)) & (d)) ^ (c))
-#define H(b,c,d)        ((b) ^ (c) ^ (d))
-#define I(b,c,d)        (((~(d)) | (b)) ^ (c))
+#define F(b, c, d) ((((c) ^ (d)) & (b)) ^ (d))
+#define G(b, c, d) ((((b) ^ (c)) & (d)) ^ (c))
+#define H(b, c, d) ((b) ^ (c) ^ (d))
+#define I(b, c, d) (((~(d)) | (b)) ^ (c))
 
-#define R0(a,b,c,d,k,s,t) { \
-        a+=((k)+(t)+F((b),(c),(d))); \
-        a=ROTATE(a,s); \
-        a+=b; };
+#define R0(a, b, c, d, k, s, t)              \
+    {                                        \
+        a += ((k) + (t) + F((b), (c), (d))); \
+        a = ROTATE(a, s);                    \
+        a += b;                              \
+    };
 
-#define R1(a,b,c,d,k,s,t) { \
-        a+=((k)+(t)+G((b),(c),(d))); \
-        a=ROTATE(a,s); \
-        a+=b; };
+#define R1(a, b, c, d, k, s, t)              \
+    {                                        \
+        a += ((k) + (t) + G((b), (c), (d))); \
+        a = ROTATE(a, s);                    \
+        a += b;                              \
+    };
 
-#define R2(a,b,c,d,k,s,t) { \
-        a+=((k)+(t)+H((b),(c),(d))); \
-        a=ROTATE(a,s); \
-        a+=b; };
+#define R2(a, b, c, d, k, s, t)              \
+    {                                        \
+        a += ((k) + (t) + H((b), (c), (d))); \
+        a = ROTATE(a, s);                    \
+        a += b;                              \
+    };
 
-#define R3(a,b,c,d,k,s,t) { \
-        a+=((k)+(t)+I((b),(c),(d))); \
-        a=ROTATE(a,s); \
-        a+=b; };
+#define R3(a, b, c, d, k, s, t)              \
+    {                                        \
+        a += ((k) + (t) + I((b), (c), (d))); \
+        a = ROTATE(a, s);                    \
+        a += b;                              \
+    };
diff --git a/crypto/md5/md5_one.c b/crypto/md5/md5_one.c
index fe9b3df29e83f..37b7c1c3cd29c 100644
--- a/crypto/md5/md5_one.c
+++ b/crypto/md5/md5_one.c
@@ -19,7 +19,7 @@
 #include <openssl/crypto.h>
 
 #ifdef CHARSET_EBCDIC
-# include <openssl/ebcdic.h>
+#include <openssl/ebcdic.h>
 #endif
 
 unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md)
diff --git a/crypto/mdc2/mdc2dgst.c b/crypto/mdc2/mdc2dgst.c
index 607f9fc73a3ec..6fa9bbd356a3a 100644
--- a/crypto/mdc2/mdc2dgst.c
+++ b/crypto/mdc2/mdc2dgst.c
@@ -21,16 +21,16 @@
 #include <openssl/mdc2.h>
 
 #undef c2l
-#define c2l(c,l)        (l =((DES_LONG)(*((c)++)))    , \
-                         l|=((DES_LONG)(*((c)++)))<< 8L, \
-                         l|=((DES_LONG)(*((c)++)))<<16L, \
-                         l|=((DES_LONG)(*((c)++)))<<24L)
+#define c2l(c, l) (l = ((DES_LONG)(*((c)++))), \
+    l |= ((DES_LONG)(*((c)++))) << 8L,         \
+    l |= ((DES_LONG)(*((c)++))) << 16L,        \
+    l |= ((DES_LONG)(*((c)++))) << 24L)
 
 #undef l2c
-#define l2c(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff), \
-                        *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-                        *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-                        *((c)++)=(unsigned char)(((l)>>24L)&0xff))
+#define l2c(l, c) (*((c)++) = (unsigned char)(((l)) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 8L) & 0xff),          \
+    *((c)++) = (unsigned char)(((l) >> 16L) & 0xff),         \
+    *((c)++) = (unsigned char)(((l) >> 24L) & 0xff))
 
 static void mdc2_body(MDC2_CTX *c, const unsigned char *in, size_t len);
 int MDC2_Init(MDC2_CTX *c)
diff --git a/crypto/mem.c b/crypto/mem.c
index c6cdfb36e1e6a..2ae2b8c8c7583 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -24,19 +24,19 @@ static CRYPTO_realloc_fn realloc_impl = CRYPTO_realloc;
 static CRYPTO_free_fn free_impl = CRYPTO_free;
 
 #if !defined(OPENSSL_NO_CRYPTO_MDEBUG) && !defined(FIPS_MODULE)
-# include "internal/tsan_assist.h"
+#include "internal/tsan_assist.h"
 
-# ifdef TSAN_REQUIRES_LOCKING
-#  define INCREMENT(x) /* empty */
-#  define LOAD(x) 0
-# else  /* TSAN_REQUIRES_LOCKING */
+#ifdef TSAN_REQUIRES_LOCKING
+#define INCREMENT(x) /* empty */
+#define LOAD(x) 0
+#else /* TSAN_REQUIRES_LOCKING */
 static TSAN_QUALIFIER int malloc_count;
 static TSAN_QUALIFIER int realloc_count;
 static TSAN_QUALIFIER int free_count;
 
-#  define INCREMENT(x) tsan_counter(&(x))
-#  define LOAD(x)      tsan_load(&x)
-# endif /* TSAN_REQUIRES_LOCKING */
+#define INCREMENT(x) tsan_counter(&(x))
+#define LOAD(x) tsan_load(&x)
+#endif /* TSAN_REQUIRES_LOCKING */
 
 static char md_failbuf[CRYPTO_MEM_CHECK_MAX_FS + 1];
 static char *md_failstring = NULL;
@@ -47,17 +47,19 @@ static int md_tracefd = -1;
 static void parseit(void);
 static int shouldfail(void);
 
-# define FAILTEST() if (shouldfail()) return NULL
+#define FAILTEST()    \
+    if (shouldfail()) \
+    return NULL
 
 #else
 
-# define INCREMENT(x) /* empty */
-# define FAILTEST() /* empty */
+#define INCREMENT(x) /* empty */
+#define FAILTEST() /* empty */
 #endif
 
 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)
 {
     if (!allow_customize)
         return 0;
@@ -71,8 +73,8 @@ int CRYPTO_set_mem_functions(CRYPTO_malloc_fn malloc_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)
 {
     if (malloc_fn != NULL)
         *malloc_fn = malloc_impl;
@@ -127,10 +129,10 @@ static void parseit(void)
  * Some rand() implementations aren't good, but we're not
  * dealing with secure randomness here.
  */
-# ifdef _WIN32
-#  define random() rand()
-#  define srandom(seed) srand(seed)
-# endif
+#ifdef _WIN32
+#define random() rand()
+#define srandom(seed) srand(seed)
+#endif
 /*
  * See if the current malloc should fail.
  */
@@ -138,20 +140,20 @@ static int shouldfail(void)
 {
     int roll = (int)(random() % 10000);
     int shoulditfail = roll < md_fail_percent;
-# ifndef _WIN32
-/* suppressed on Windows as POSIX-like file descriptors are non-inheritable */
+#ifndef _WIN32
+    /* suppressed on Windows as POSIX-like file descriptors are non-inheritable */
     int len;
     char buff[80];
 
     if (md_tracefd > 0) {
         BIO_snprintf(buff, sizeof(buff),
-                     "%c C%ld %%%d R%d\n",
-                     shoulditfail ? '-' : '+', md_count, md_fail_percent, roll);
+            "%c C%ld %%%d R%d\n",
+            shoulditfail ? '-' : '+', md_count, md_fail_percent, roll);
         len = strlen(buff);
         if (write(md_tracefd, buff, len) != len)
             perror("shouldfail write failed");
     }
-# endif
+#endif
 
     if (md_count) {
         /* If we used up this one, go to the next. */
@@ -211,7 +213,7 @@ void *CRYPTO_malloc(size_t num, const char *file, int line)
     ptr = malloc(num);
     if (ptr != NULL)
         return ptr;
- err:
+err:
     /*
      * ossl_err_get_state_int() in err.c uses CRYPTO_zalloc(num, NULL, 0) for
      * ERR_STATE allocation. Prevent mem alloc error loop while reporting error.
@@ -236,7 +238,7 @@ void *CRYPTO_zalloc(size_t num, const char *file, int line)
 }
 
 void *CRYPTO_aligned_alloc(size_t num, size_t alignment, void **freeptr,
-                           const char *file, int line)
+    const char *file, int line)
 {
     void *ret;
 
@@ -316,7 +318,7 @@ void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)
 }
 
 void *CRYPTO_clear_realloc(void *str, size_t old_len, size_t num,
-                           const char *file, int line)
+    const char *file, int line)
 {
     void *ret = NULL;
 
@@ -330,7 +332,7 @@ void *CRYPTO_clear_realloc(void *str, size_t old_len, size_t num,
 
     /* Can't shrink the buffer since memcpy below copies |old_len| bytes. */
     if (num < old_len) {
-        OPENSSL_cleanse((char*)str + num, old_len - num);
+        OPENSSL_cleanse((char *)str + num, old_len - num);
         return str;
     }
 
@@ -364,7 +366,7 @@ void CRYPTO_clear_free(void *str, size_t num, const char *file, int line)
 
 #if !defined(OPENSSL_NO_CRYPTO_MDEBUG)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 int CRYPTO_mem_ctrl(int mode)
 {
     (void)mode;
@@ -379,7 +381,9 @@ int CRYPTO_set_mem_debug(int flag)
 
 int CRYPTO_mem_debug_push(const char *info, const char *file, int line)
 {
-    (void)info; (void)file; (void)line;
+    (void)info;
+    (void)file;
+    (void)line;
     return 0;
 }
 
@@ -389,21 +393,33 @@ int CRYPTO_mem_debug_pop(void)
 }
 
 void CRYPTO_mem_debug_malloc(void *addr, size_t num, int flag,
-                             const char *file, int line)
+    const char *file, int line)
 {
-    (void)addr; (void)num; (void)flag; (void)file; (void)line;
+    (void)addr;
+    (void)num;
+    (void)flag;
+    (void)file;
+    (void)line;
 }
 
 void CRYPTO_mem_debug_realloc(void *addr1, void *addr2, size_t num, int flag,
-                              const char *file, int line)
+    const char *file, int line)
 {
-    (void)addr1; (void)addr2; (void)num; (void)flag; (void)file; (void)line;
+    (void)addr1;
+    (void)addr2;
+    (void)num;
+    (void)flag;
+    (void)file;
+    (void)line;
 }
 
 void CRYPTO_mem_debug_free(void *addr, int flag,
-                           const char *file, int line)
+    const char *file, int line)
 {
-    (void)addr; (void)flag; (void)file; (void)line;
+    (void)addr;
+    (void)flag;
+    (void)file;
+    (void)line;
 }
 
 int CRYPTO_mem_leaks(BIO *b)
@@ -412,21 +428,22 @@ int CRYPTO_mem_leaks(BIO *b)
     return -1;
 }
 
-#  ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 int CRYPTO_mem_leaks_fp(FILE *fp)
 {
     (void)fp;
     return -1;
 }
-#  endif
+#endif
 
 int CRYPTO_mem_leaks_cb(int (*cb)(const char *str, size_t len, void *u),
-                        void *u)
+    void *u)
 {
-    (void)cb; (void)u;
+    (void)cb;
+    (void)u;
     return -1;
 }
 
-# endif
+#endif
 
 #endif
diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index e8700ebaa42b1..21275d6cb23ea 100644
--- a/crypto/mem_sec.c
+++ b/crypto/mem_sec.c
@@ -22,69 +22,68 @@
 #include <string.h>
 
 #ifndef OPENSSL_NO_SECURE_MEMORY
-# if defined(_WIN32)
-#  include <windows.h>
-#  if defined(WINAPI_FAMILY_PARTITION)
-#   if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
+#if defined(_WIN32)
+#include <windows.h>
+#if defined(WINAPI_FAMILY_PARTITION)
+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
 /*
  * While VirtualLock is available under the app partition (e.g. UWP),
  * the headers do not define the API. Define it ourselves instead.
  */
 WINBASEAPI
 BOOL
-WINAPI
-VirtualLock(
-    _In_ LPVOID lpAddress,
-    _In_ SIZE_T dwSize
-    );
-#   endif
-#  endif
-# endif
-# include <stdlib.h>
-# include <assert.h>
-# if defined(OPENSSL_SYS_UNIX)
-#  include <unistd.h>
-# endif
-# include <sys/types.h>
-# if defined(OPENSSL_SYS_UNIX)
-#  include <sys/mman.h>
-#  if defined(__FreeBSD__)
-#    define MADV_DONTDUMP MADV_NOCORE
-#  endif
-#  if !defined(MAP_CONCEAL)
-#    define MAP_CONCEAL 0
-#  endif
-# endif
-# if defined(OPENSSL_SYS_LINUX)
-#  include <sys/syscall.h>
-#  if defined(SYS_mlock2)
-#   include <linux/mman.h>
-#   include <errno.h>
-#  endif
-#  include <sys/param.h>
-# endif
-# include <sys/stat.h>
-# include <fcntl.h>
+    WINAPI
+    VirtualLock(
+        _In_ LPVOID lpAddress,
+        _In_ SIZE_T dwSize);
+#endif
+#endif
+#endif
+#include <stdlib.h>
+#include <assert.h>
+#if defined(OPENSSL_SYS_UNIX)
+#include <unistd.h>
+#endif
+#include <sys/types.h>
+#if defined(OPENSSL_SYS_UNIX)
+#include <sys/mman.h>
+#if defined(__FreeBSD__)
+#define MADV_DONTDUMP MADV_NOCORE
+#endif
+#if !defined(MAP_CONCEAL)
+#define MAP_CONCEAL 0
+#endif
+#endif
+#if defined(OPENSSL_SYS_LINUX)
+#include <sys/syscall.h>
+#if defined(SYS_mlock2)
+#include <linux/mman.h>
+#include <errno.h>
+#endif
+#include <sys/param.h>
+#endif
+#include <sys/stat.h>
+#include <fcntl.h>
 #endif
 #ifndef HAVE_MADVISE
-# if defined(MADV_DONTDUMP)
-#  define HAVE_MADVISE 1
-# else
-#  define HAVE_MADVISE 0
-# endif
+#if defined(MADV_DONTDUMP)
+#define HAVE_MADVISE 1
+#else
+#define HAVE_MADVISE 0
+#endif
 #endif
 #if HAVE_MADVISE
-# undef NO_MADVISE
+#undef NO_MADVISE
 #else
-# define NO_MADVISE
+#define NO_MADVISE
 #endif
 
 #define CLEAR(p, s) OPENSSL_cleanse(p, s)
 #ifndef PAGE_SIZE
-# define PAGE_SIZE    4096
+#define PAGE_SIZE 4096
 #endif
 #if !defined(MAP_ANON) && defined(MAP_ANONYMOUS)
-# define MAP_ANON MAP_ANONYMOUS
+#define MAP_ANON MAP_ANONYMOUS
 #endif
 
 #ifndef OPENSSL_NO_SECURE_MEMORY
@@ -169,7 +168,7 @@ void *CRYPTO_secure_malloc(size_t num, const char *file, int line)
     actual_size = ret ? sh_actual_size(ret) : 0;
     secure_mem_used += actual_size;
     CRYPTO_THREAD_unlock(sec_malloc_lock);
- err:
+err:
     if (ret == NULL && (file != NULL || line != 0)) {
         ERR_new();
         ERR_set_debug(file, line, NULL);
@@ -215,7 +214,7 @@ 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)
 {
 #ifndef OPENSSL_NO_SECURE_MEMORY
     size_t actual_size;
@@ -293,7 +292,6 @@ size_t CRYPTO_secure_actual_size(void *ptr)
  */
 #ifndef OPENSSL_NO_SECURE_MEMORY
 
-
 /*
  * The implementation provided here uses a fixed-sized mmap() heap,
  * which is locked into memory, not written to core files, and protected
@@ -311,15 +309,14 @@ size_t CRYPTO_secure_actual_size(void *ptr)
 
 #define ONE ((size_t)1)
 
-# define TESTBIT(t, b)  (t[(b) >> 3] &  (ONE << ((b) & 7)))
-# define SETBIT(t, b)   (t[(b) >> 3] |= (ONE << ((b) & 7)))
-# define CLEARBIT(t, b) (t[(b) >> 3] &= (0xFF & ~(ONE << ((b) & 7))))
+#define TESTBIT(t, b) (t[(b) >> 3] & (ONE << ((b) & 7)))
+#define SETBIT(t, b) (t[(b) >> 3] |= (ONE << ((b) & 7)))
+#define CLEARBIT(t, b) (t[(b) >> 3] &= (0xFF & ~(ONE << ((b) & 7))))
 
 #define WITHIN_ARENA(p) \
-    ((char*)(p) >= sh.arena && (char*)(p) < &sh.arena[sh.arena_size])
+    ((char *)(p) >= sh.arena && (char *)(p) < &sh.arena[sh.arena_size])
 #define WITHIN_FREELIST(p) \
-    ((char*)(p) >= (char*)sh.freelist && (char*)(p) < (char*)&sh.freelist[sh.freelist_size])
-
+    ((char *)(p) >= (char *)sh.freelist && (char *)(p) < (char *)&sh.freelist[sh.freelist_size])
 
 typedef struct sh_list_st {
     struct sh_list_st *next;
@@ -327,7 +324,7 @@ typedef struct sh_list_st {
 } SH_LIST;
 
 typedef struct sh_st {
-    char* map_result;
+    char *map_result;
     size_t map_size;
     char *arena;
     size_t arena_size;
@@ -355,7 +352,6 @@ static size_t sh_getlist(char *ptr)
     return list;
 }
 
-
 static int sh_testbit(char *ptr, int list, unsigned char *table)
 {
     size_t bit;
@@ -426,7 +422,6 @@ static void sh_remove_from_list(char *ptr)
     OPENSSL_assert(WITHIN_FREELIST(temp2->p_next) || WITHIN_ARENA(temp2->p_next));
 }
 
-
 static int sh_init(size_t size, size_t minsize)
 {
     int ret;
@@ -463,9 +458,9 @@ static int sh_init(size_t size, size_t minsize)
         minsize++;
     } else {
         /* make sure minsize is a powers of 2 */
-          OPENSSL_assert((minsize & (minsize - 1)) == 0);
-          if ((minsize & (minsize - 1)) != 0)
-              goto err;
+        OPENSSL_assert((minsize & (minsize - 1)) == 0);
+        if ((minsize & (minsize - 1)) != 0)
+            goto err;
     }
 
     sh.arena_size = size;
@@ -496,13 +491,13 @@ static int sh_init(size_t size, size_t minsize)
         goto err;
 
     /* Allocate space for heap, and two extra pages as guards */
-#if defined(_SC_PAGE_SIZE) || defined (_SC_PAGESIZE)
+#if defined(_SC_PAGE_SIZE) || defined(_SC_PAGESIZE)
     {
-# if defined(_SC_PAGE_SIZE)
+#if defined(_SC_PAGE_SIZE)
         long tmppgsize = sysconf(_SC_PAGE_SIZE);
-# else
+#else
         long tmppgsize = sysconf(_SC_PAGESIZE);
-# endif
+#endif
         if (tmppgsize < 1)
             pgsize = PAGE_SIZE;
         else
@@ -517,28 +512,28 @@ static int sh_init(size_t size, size_t minsize)
     sh.map_size = pgsize + sh.arena_size + pgsize;
 
 #if !defined(_WIN32)
-# ifdef MAP_ANON
+#ifdef MAP_ANON
     sh.map_result = mmap(NULL, sh.map_size,
-                         PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE|MAP_CONCEAL, -1, 0);
-# else
+        PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE | MAP_CONCEAL, -1, 0);
+#else
     {
         int fd;
 
         sh.map_result = MAP_FAILED;
         if ((fd = open("/dev/zero", O_RDWR)) >= 0) {
             sh.map_result = mmap(NULL, sh.map_size,
-                                 PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
+                PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
             close(fd);
         }
     }
-# endif
+#endif
     if (sh.map_result == MAP_FAILED)
         goto err;
 #else
     sh.map_result = VirtualAlloc(NULL, sh.map_size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 
     if (sh.map_result == NULL)
-            goto err;
+        goto err;
 #endif
 
     sh.arena = (char *)(sh.map_result + pgsize);
@@ -590,7 +585,7 @@ static int sh_init(size_t size, size_t minsize)
 
     return ret;
 
- err:
+err:
     sh_done();
     return 0;
 }
@@ -677,7 +672,7 @@ static void *sh_malloc(size_t size)
         sh_add_to_list(&sh.freelist[slist], temp);
         OPENSSL_assert(sh.freelist[slist] == temp);
 
-        OPENSSL_assert(temp-(sh.arena_size >> slist) == sh_find_my_buddy(temp, slist));
+        OPENSSL_assert(temp - (sh.arena_size >> slist) == sh_find_my_buddy(temp, slist));
     }
 
     /* peel off memory to hand back */
diff --git a/crypto/mips_arch.h b/crypto/mips_arch.h
index 12a27615f14f7..ddc1293b2e6eb 100644
--- a/crypto/mips_arch.h
+++ b/crypto/mips_arch.h
@@ -8,33 +8,31 @@
  */
 
 #ifndef OSSL_CRYPTO_MIPS_ARCH_H
-# define OSSL_CRYPTO_MIPS_ARCH_H
+#define OSSL_CRYPTO_MIPS_ARCH_H
 
-# if (defined(__mips_smartmips) || defined(_MIPS_ARCH_MIPS32R3) || \
-      defined(_MIPS_ARCH_MIPS32R5) || defined(_MIPS_ARCH_MIPS32R6)) \
-      && !defined(_MIPS_ARCH_MIPS32R2)
-#  define _MIPS_ARCH_MIPS32R2
-# endif
+#if (defined(__mips_smartmips) || defined(_MIPS_ARCH_MIPS32R3) || defined(_MIPS_ARCH_MIPS32R5) || defined(_MIPS_ARCH_MIPS32R6)) \
+    && !defined(_MIPS_ARCH_MIPS32R2)
+#define _MIPS_ARCH_MIPS32R2
+#endif
 
-# if (defined(_MIPS_ARCH_MIPS64R3) || defined(_MIPS_ARCH_MIPS64R5) || \
-      defined(_MIPS_ARCH_MIPS64R6)) \
-      && !defined(_MIPS_ARCH_MIPS64R2)
-#  define _MIPS_ARCH_MIPS64R2
-# endif
+#if (defined(_MIPS_ARCH_MIPS64R3) || defined(_MIPS_ARCH_MIPS64R5) || defined(_MIPS_ARCH_MIPS64R6)) \
+    && !defined(_MIPS_ARCH_MIPS64R2)
+#define _MIPS_ARCH_MIPS64R2
+#endif
 
-# if defined(_MIPS_ARCH_MIPS64R6)
-#  define dmultu(rs,rt)
-#  define mflo(rd,rs,rt)	dmulu	rd,rs,rt
-#  define mfhi(rd,rs,rt)	dmuhu	rd,rs,rt
-# elif defined(_MIPS_ARCH_MIPS32R6)
-#  define multu(rs,rt)
-#  define mflo(rd,rs,rt)	mulu	rd,rs,rt
-#  define mfhi(rd,rs,rt)	muhu	rd,rs,rt
-# else
-#  define dmultu(rs,rt)		dmultu	rs,rt
-#  define multu(rs,rt)		multu	rs,rt
-#  define mflo(rd,rs,rt)	mflo	rd
-#  define mfhi(rd,rs,rt)	mfhi	rd
-# endif
+#if defined(_MIPS_ARCH_MIPS64R6)
+#define dmultu(rs, rt)
+#define mflo(rd, rs, rt) dmulu rd, rs, rt
+#define mfhi(rd, rs, rt) dmuhu rd, rs, rt
+#elif defined(_MIPS_ARCH_MIPS32R6)
+#define multu(rs, rt)
+#define mflo(rd, rs, rt) mulu rd, rs, rt
+#define mfhi(rd, rs, rt) muhu rd, rs, rt
+#else
+#define dmultu(rs, rt) dmultu rs, rt
+#define multu(rs, rt) multu rs, rt
+#define mflo(rd, rs, rt) mflo rd
+#define mfhi(rd, rs, rt) mfhi rd
+#endif
 
 #endif
diff --git a/crypto/ml_dsa/ml_dsa_encoders.c b/crypto/ml_dsa/ml_dsa_encoders.c
index 7d8012efcaf4f..00e2b1772cf94 100644
--- a/crypto/ml_dsa/ml_dsa_encoders.c
+++ b/crypto/ml_dsa/ml_dsa_encoders.c
@@ -16,12 +16,12 @@
 #include "ml_dsa_sign.h"
 #include "internal/packet.h"
 
-#define POLY_COEFF_NUM_BYTES(bits)  ((bits) * (ML_DSA_NUM_POLY_COEFFICIENTS / 8))
+#define POLY_COEFF_NUM_BYTES(bits) ((bits) * (ML_DSA_NUM_POLY_COEFFICIENTS / 8))
 /* Cast mod_sub result in support of left-shifts that create 64-bit values. */
-#define mod_sub_64(a, b) ((uint64_t) mod_sub(a, b))
+#define mod_sub_64(a, b) ((uint64_t)mod_sub(a, b))
 
-typedef int (ENCODE_FN)(const POLY *s, WPACKET *pkt);
-typedef int (DECODE_FN)(POLY *s, PACKET *pkt);
+typedef int(ENCODE_FN)(const POLY *s, WPACKET *pkt);
+typedef int(DECODE_FN)(POLY *s, PACKET *pkt);
 
 static ENCODE_FN poly_encode_signed_2;
 static ENCODE_FN poly_encode_signed_4;
@@ -258,7 +258,7 @@ static int poly_decode_signed_4(POLY *p, PACKET *pkt)
         *out++ = mod_sub(4, v >> 28);
     }
     ret = 1;
- err:
+err:
     return ret;
 }
 
@@ -304,8 +304,8 @@ static int poly_encode_signed_2(const POLY *p, WPACKET *pkt)
         z |= mod_sub(2, *in++) << 18;
         z |= mod_sub(2, *in++) << 21;
 
-        out = OPENSSL_store_u16_le(out, (uint16_t) z);
-        *out++ = (uint8_t) (z >> 16);
+        out = OPENSSL_store_u16_le(out, (uint16_t)z);
+        *out++ = (uint8_t)(z >> 16);
     } while (in < end);
     return 1;
 }
@@ -358,7 +358,7 @@ static int poly_decode_signed_2(POLY *p, PACKET *pkt)
         *out++ = mod_sub(2, (v >> 21) & 7);
     }
     ret = 1;
- err:
+err:
     return ret;
 }
 
@@ -405,8 +405,8 @@ static int poly_encode_signed_two_to_power_12(const POLY *p, WPACKET *pkt)
         a2 |= mod_sub_64(range, *in++) << 27;
 
         out = OPENSSL_store_u64_le(out, a1);
-        out = OPENSSL_store_u32_le(out, (uint32_t) a2);
-        *out = (uint8_t) (a2 >> 32);
+        out = OPENSSL_store_u32_le(out, (uint32_t)a2);
+        *out = (uint8_t)(a2 >> 32);
     } while (in < end);
     return 1;
 }
@@ -436,7 +436,7 @@ static int poly_decode_signed_two_to_power_12(POLY *p, PACKET *pkt)
             goto err;
         in = OPENSSL_load_u64_le(&a1, in);
         in = OPENSSL_load_u32_le(&a2, in);
-        b13 = (uint32_t) *in;
+        b13 = (uint32_t)*in;
 
         *out++ = mod_sub(range, a1 & mask_13_bits);
         *out++ = mod_sub(range, (a1 >> 13) & mask_13_bits);
@@ -448,7 +448,7 @@ static int poly_decode_signed_two_to_power_12(POLY *p, PACKET *pkt)
         *out++ = mod_sub(range, (a2 >> 27) | (b13 << 5));
     }
     ret = 1;
- err:
+err:
     return ret;
 }
 
@@ -491,7 +491,7 @@ static int poly_encode_signed_two_to_power_19(const POLY *p, WPACKET *pkt)
 
         out = OPENSSL_store_u32_le(out, z0);
         out = OPENSSL_store_u32_le(out, z1);
-        out = OPENSSL_store_u16_le(out, (uint16_t) (z2 >> 4));
+        out = OPENSSL_store_u16_le(out, (uint16_t)(z2 >> 4));
     } while (in < end);
     return 1;
 }
@@ -529,7 +529,7 @@ static int poly_decode_signed_two_to_power_19(POLY *p, PACKET *pkt)
         *out++ = mod_sub(range, (a2 >> 28) | (a3 << 4));
     }
     ret = 1;
- err:
+err:
     return ret;
 }
 
@@ -601,7 +601,7 @@ static int poly_decode_signed_two_to_power_17(POLY *p, PACKET *pkt)
             return 0;
         in = OPENSSL_load_u32_le(&a1, in);
         in = OPENSSL_load_u32_le(&a2, in);
-        a3 = (uint32_t) *in;
+        a3 = (uint32_t)*in;
 
         *out++ = mod_sub(range, a1 & mask_18_bits);
         *out++ = mod_sub(range, (a1 >> 18) | ((a2 & 0xF) << 14));
@@ -633,13 +633,13 @@ int ossl_ml_dsa_pk_encode(ML_DSA_KEY *key)
         return 0;
 
     if (!WPACKET_init_static_len(&pkt, enc, enc_len, 0)
-            || !WPACKET_memcpy(&pkt, key->rho, sizeof(key->rho)))
+        || !WPACKET_memcpy(&pkt, key->rho, sizeof(key->rho)))
         goto err;
     for (i = 0; i < t1_len; i++)
         if (!poly_encode_10_bits(t1 + i, &pkt))
             goto err;
     if (!WPACKET_get_total_written(&pkt, &written)
-            || written != enc_len)
+        || written != enc_len)
         goto err;
     OPENSSL_free(key->pub_encoding);
     key->pub_encoding = enc;
@@ -679,7 +679,7 @@ int ossl_ml_dsa_pk_decode(ML_DSA_KEY *key, const uint8_t *in, size_t in_len)
     if (ctx == NULL)
         goto err;
     if (!PACKET_buf_init(&pkt, in, in_len)
-            || !PACKET_copy_bytes(&pkt, key->rho, sizeof(key->rho)))
+        || !PACKET_copy_bytes(&pkt, key->rho, sizeof(key->rho)))
         goto err;
     for (i = 0; i < key->t1.num_poly; i++)
         if (!poly_decode_10_bits(key->t1.poly + i, &pkt))
@@ -725,9 +725,9 @@ int ossl_ml_dsa_sk_encode(ML_DSA_KEY *key)
         encode_fn = poly_encode_signed_2;
 
     if (!WPACKET_init_static_len(&pkt, enc, enc_len, 0)
-            || !WPACKET_memcpy(&pkt, key->rho, sizeof(key->rho))
-            || !WPACKET_memcpy(&pkt, key->K, sizeof(key->K))
-            || !WPACKET_memcpy(&pkt, key->tr, sizeof(key->tr)))
+        || !WPACKET_memcpy(&pkt, key->rho, sizeof(key->rho))
+        || !WPACKET_memcpy(&pkt, key->K, sizeof(key->K))
+        || !WPACKET_memcpy(&pkt, key->tr, sizeof(key->tr)))
         goto err;
     for (i = 0; i < l; ++i)
         if (!encode_fn(key->s1.poly + i, &pkt))
@@ -739,7 +739,7 @@ int ossl_ml_dsa_sk_encode(ML_DSA_KEY *key)
         if (!poly_encode_signed_two_to_power_12(t0++, &pkt))
             goto err;
     if (!WPACKET_get_total_written(&pkt, &written)
-            || written != enc_len)
+        || written != enc_len)
         goto err;
     OPENSSL_clear_free(key->priv_encoding, enc_len);
     key->priv_encoding = enc;
@@ -789,9 +789,9 @@ int ossl_ml_dsa_sk_decode(ML_DSA_KEY *key, const uint8_t *in, size_t in_len)
         decode_fn = poly_decode_signed_2;
 
     if (!PACKET_buf_init(&pkt, in, in_len)
-            || !PACKET_copy_bytes(&pkt, key->rho, sizeof(key->rho))
-            || !PACKET_copy_bytes(&pkt, key->K, sizeof(key->K))
-            || !PACKET_copy_bytes(&pkt, input_tr, sizeof(input_tr)))
+        || !PACKET_copy_bytes(&pkt, key->rho, sizeof(key->rho))
+        || !PACKET_copy_bytes(&pkt, key->K, sizeof(key->K))
+        || !PACKET_copy_bytes(&pkt, input_tr, sizeof(input_tr)))
         return 0;
 
     for (i = 0; i < l; ++i)
@@ -813,16 +813,16 @@ int ossl_ml_dsa_sk_decode(ML_DSA_KEY *key, const uint8_t *in, size_t in_len)
      * the |tr| value in the private key, else the key was corrupted.
      */
     if (!ossl_ml_dsa_key_public_from_private(key)
-            || memcmp(input_tr, key->tr, sizeof(input_tr)) != 0) {
+        || memcmp(input_tr, key->tr, sizeof(input_tr)) != 0) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
-                       "%s private key does not match its pubkey part",
-                       key->params->alg);
+            "%s private key does not match its pubkey part",
+            key->params->alg);
         ossl_ml_dsa_key_reset(key);
         goto err;
     }
 
     return 1;
- err:
+err:
     return 0;
 }
 
@@ -868,7 +868,7 @@ static int hint_bits_decode(VECTOR *hint, PACKET *pkt, uint32_t omega)
     POLY *p = hint->poly, *end = p + k;
 
     if (!PACKET_get_bytes(pkt, &in, omega)
-            || !PACKET_get_bytes(pkt, &limits, k))
+        || !PACKET_get_bytes(pkt, &limits, k))
         return 0;
 
     vector_zero(hint); /* Set all coefficients to zero */
@@ -905,7 +905,7 @@ static int hint_bits_decode(VECTOR *hint, PACKET *pkt, uint32_t omega)
  * @returns 1 if the signature was encoded successfully or 0 otherwise.
  */
 int ossl_ml_dsa_sig_encode(const ML_DSA_SIG *sig, const ML_DSA_PARAMS *params,
-                           uint8_t *out)
+    uint8_t *out)
 {
     int ret = 0;
     size_t i;
@@ -921,7 +921,7 @@ int ossl_ml_dsa_sig_encode(const ML_DSA_SIG *sig, const ML_DSA_PARAMS *params,
         encode_fn = poly_encode_signed_two_to_power_17;
 
     if (!WPACKET_init_static_len(&pkt, out, params->sig_len, 0)
-            || !WPACKET_memcpy(&pkt, sig->c_tilde, sig->c_tilde_len))
+        || !WPACKET_memcpy(&pkt, sig->c_tilde, sig->c_tilde_len))
         goto err;
 
     for (i = 0; i < sig->z.num_poly; ++i)
@@ -943,7 +943,7 @@ int ossl_ml_dsa_sig_encode(const ML_DSA_SIG *sig, const ML_DSA_PARAMS *params,
  * @returns 1 if the signature was successfully decoded or 0 otherwise.
  */
 int ossl_ml_dsa_sig_decode(ML_DSA_SIG *sig, const uint8_t *in, size_t in_len,
-                           const ML_DSA_PARAMS *params)
+    const ML_DSA_PARAMS *params)
 {
     int ret = 0;
     size_t i;
@@ -956,14 +956,14 @@ int ossl_ml_dsa_sig_decode(ML_DSA_SIG *sig, const uint8_t *in, size_t in_len,
         decode_fn = poly_decode_signed_two_to_power_17;
 
     if (!PACKET_buf_init(&pkt, in, in_len)
-            || !PACKET_copy_bytes(&pkt, sig->c_tilde, sig->c_tilde_len))
+        || !PACKET_copy_bytes(&pkt, sig->c_tilde, sig->c_tilde_len))
         goto err;
     for (i = 0; i < sig->z.num_poly; ++i)
         if (!decode_fn(sig->z.poly + i, &pkt))
             goto err;
 
     if (!hint_bits_decode(&sig->hint, &pkt, params->omega)
-            || PACKET_remaining(&pkt) != 0)
+        || PACKET_remaining(&pkt) != 0)
         goto err;
     ret = 1;
 err:
@@ -971,8 +971,8 @@ int ossl_ml_dsa_sig_decode(ML_DSA_SIG *sig, const uint8_t *in, size_t in_len,
 }
 
 int ossl_ml_dsa_poly_decode_expand_mask(POLY *out,
-                                        const uint8_t *in, size_t in_len,
-                                        uint32_t gamma1)
+    const uint8_t *in, size_t in_len,
+    uint32_t gamma1)
 {
     PACKET pkt;
 
@@ -996,7 +996,7 @@ int ossl_ml_dsa_poly_decode_expand_mask(POLY *out,
  * @returns 1 if the signature was encoded successfully or 0 otherwise.
  */
 int ossl_ml_dsa_w1_encode(const VECTOR *w1, uint32_t gamma2,
-                          uint8_t *out, size_t out_len)
+    uint8_t *out, size_t out_len)
 {
     WPACKET pkt;
     ENCODE_FN *encode_fn;
diff --git a/crypto/ml_dsa/ml_dsa_hash.h b/crypto/ml_dsa/ml_dsa_hash.h
index 3d06225969447..7625d3367d9c3 100644
--- a/crypto/ml_dsa/ml_dsa_hash.h
+++ b/crypto/ml_dsa/ml_dsa_hash.h
@@ -11,16 +11,16 @@
 
 static ossl_inline ossl_unused int
 shake_xof(EVP_MD_CTX *ctx, const EVP_MD *md, const uint8_t *in, size_t in_len,
-          uint8_t *out, size_t out_len)
+    uint8_t *out, size_t out_len)
 {
     return (EVP_DigestInit_ex2(ctx, md, NULL) == 1
-            && EVP_DigestUpdate(ctx, in, in_len) == 1
-            && EVP_DigestSqueeze(ctx, out, out_len) == 1);
+        && EVP_DigestUpdate(ctx, in, in_len) == 1
+        && EVP_DigestSqueeze(ctx, out, out_len) == 1);
 }
 
 static ossl_inline ossl_unused int
 shake_xof_2(EVP_MD_CTX *ctx, const EVP_MD *md, const uint8_t *in1, size_t in1_len,
-            const uint8_t *in2, size_t in2_len, uint8_t *out, size_t out_len)
+    const uint8_t *in2, size_t in2_len, uint8_t *out, size_t out_len)
 {
     return EVP_DigestInit_ex2(ctx, md, NULL)
         && EVP_DigestUpdate(ctx, in1, in1_len)
@@ -30,8 +30,8 @@ shake_xof_2(EVP_MD_CTX *ctx, const EVP_MD *md, const uint8_t *in1, size_t in1_le
 
 static ossl_inline ossl_unused int
 shake_xof_3(EVP_MD_CTX *ctx, const EVP_MD *md, const uint8_t *in1, size_t in1_len,
-            const uint8_t *in2, size_t in2_len,
-            const uint8_t *in3, size_t in3_len, uint8_t *out, size_t out_len)
+    const uint8_t *in2, size_t in2_len,
+    const uint8_t *in3, size_t in3_len, uint8_t *out, size_t out_len)
 {
     return EVP_DigestInit_ex2(ctx, md, NULL)
         && EVP_DigestUpdate(ctx, in1, in1_len)
diff --git a/crypto/ml_dsa/ml_dsa_key.c b/crypto/ml_dsa/ml_dsa_key.c
index d76919f3adccd..87613c937d592 100644
--- a/crypto/ml_dsa/ml_dsa_key.c
+++ b/crypto/ml_dsa/ml_dsa_key.c
@@ -35,8 +35,8 @@ 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)
 {
     int ret = 0;
 
@@ -58,7 +58,7 @@ int ossl_ml_dsa_set_prekey(ML_DSA_KEY *key, int flags_set, int flags_clr,
     key->prov_flags &= ~flags_clr;
     ret = 1;
 
-  end:
+end:
     if (!ret) {
         OPENSSL_free(key->priv_encoding);
         OPENSSL_free(key->seed);
@@ -76,7 +76,7 @@ int ossl_ml_dsa_set_prekey(ML_DSA_KEY *key, int flags_set, int flags_clr,
  * @returns The new ML_DSA_KEY object on success, or NULL on malloc failure
  */
 ML_DSA_KEY *ossl_ml_dsa_key_new(OSSL_LIB_CTX *libctx, const char *propq,
-                                int evp_type)
+    int evp_type)
 {
     ML_DSA_KEY *ret;
     const ML_DSA_PARAMS *params = ossl_ml_dsa_params_get(evp_type);
@@ -204,7 +204,8 @@ ML_DSA_KEY *ossl_ml_dsa_key_dup(const ML_DSA_KEY *src, int selection)
                     vector_copy(&ret->t1, &src->t1);
                 }
                 if ((ret->pub_encoding = OPENSSL_memdup(src->pub_encoding,
-                                                        src->params->pk_len)) == NULL)
+                         src->params->pk_len))
+                    == NULL)
                     goto err;
             }
             if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
@@ -217,14 +218,15 @@ ML_DSA_KEY *ossl_ml_dsa_key_dup(const ML_DSA_KEY *src, int selection)
                         vector_copy(&ret->s2, &src->s2);
                         vector_copy(&ret->t0, &src->t0);
                     }
-                    if ((ret->priv_encoding =
-                            OPENSSL_memdup(src->priv_encoding,
-                                           src->params->sk_len)) == NULL)
+                    if ((ret->priv_encoding = OPENSSL_memdup(src->priv_encoding,
+                             src->params->sk_len))
+                        == NULL)
                         goto err;
                 }
                 if (src->seed != NULL
                     && (ret->seed = OPENSSL_memdup(src->seed,
-                                                   ML_DSA_SEED_BYTES)) == NULL)
+                            ML_DSA_SEED_BYTES))
+                        == NULL)
                     goto err;
             }
         }
@@ -234,7 +236,7 @@ ML_DSA_KEY *ossl_ml_dsa_key_dup(const ML_DSA_KEY *src, int selection)
         ret->shake256_md = src->shake256_md;
     }
     return ret;
- err:
+err:
     ossl_ml_dsa_key_free(ret);
     return NULL;
 }
@@ -252,7 +254,7 @@ ML_DSA_KEY *ossl_ml_dsa_key_dup(const ML_DSA_KEY *src, int selection)
  * @returns 1 if the keys are equal otherwise it returns 0.
  */
 int ossl_ml_dsa_key_equal(const ML_DSA_KEY *key1, const ML_DSA_KEY *key2,
-                          int selection)
+    int selection)
 {
     int key_checked = 0;
 
@@ -263,16 +265,18 @@ int ossl_ml_dsa_key_equal(const ML_DSA_KEY *key1, const ML_DSA_KEY *key2,
         if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
             if (key1->pub_encoding != NULL && key2->pub_encoding != NULL) {
                 if (memcmp(key1->pub_encoding, key2->pub_encoding,
-                                  key1->params->pk_len) != 0)
+                        key1->params->pk_len)
+                    != 0)
                     return 0;
                 key_checked = 1;
             }
         }
         if (!key_checked
-                && (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
+            && (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
             if (key1->priv_encoding != NULL && key2->priv_encoding != NULL) {
                 if (memcmp(key1->priv_encoding, key2->priv_encoding,
-                           key1->params->sk_len) != 0)
+                        key1->params->sk_len)
+                    != 0)
                     return 0;
                 key_checked = 1;
             }
@@ -289,7 +293,7 @@ int ossl_ml_dsa_key_has(const ML_DSA_KEY *key, int selection)
         if (ossl_ml_dsa_key_get_pub(key) == NULL)
             return 0; /* No public key */
         if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0
-                && ossl_ml_dsa_key_get_priv(key) == NULL)
+            && ossl_ml_dsa_key_get_priv(key) == NULL)
             return 0; /* No private key */
         return 1;
     }
@@ -309,8 +313,9 @@ int ossl_ml_dsa_key_has(const ML_DSA_KEY *key, int selection)
  * @returns 1 on success, or 0 on failure.
  */
 static int public_from_private(const ML_DSA_KEY *key, EVP_MD_CTX *md_ctx,
-                               VECTOR *t1, VECTOR *t0)
+    VECTOR *t1, VECTOR *t0)
 {
+    int ret = 0;
     const ML_DSA_PARAMS *params = key->params;
     uint32_t k = params->k, l = params->l;
     POLY *polys;
@@ -343,9 +348,10 @@ static int public_from_private(const ML_DSA_KEY *key, EVP_MD_CTX *md_ctx,
 
     /* Zeroize secret */
     vector_zero(&s1_ntt);
+    ret = 1;
 err:
     OPENSSL_free(polys);
-    return 1;
+    return ret;
 }
 
 int ossl_ml_dsa_key_public_from_private(ML_DSA_KEY *key)
@@ -356,14 +362,14 @@ int ossl_ml_dsa_key_public_from_private(ML_DSA_KEY *key)
 
     if (!vector_alloc(&t0, key->params->k)) /* t0 is already in the private key */
         return 0;
-    ret = ((md_ctx = EVP_MD_CTX_new())!= NULL)
-        && ossl_ml_dsa_key_pub_alloc(key)  /* allocate space for t1 */
+    ret = ((md_ctx = EVP_MD_CTX_new()) != NULL)
+        && ossl_ml_dsa_key_pub_alloc(key) /* allocate space for t1 */
         && public_from_private(key, md_ctx, &key->t1, &t0)
         && vector_equal(&t0, &key->t0) /* compare the generated t0 to the expected */
         && ossl_ml_dsa_pk_encode(key)
         && shake_xof(md_ctx, key->shake256_md,
-                     key->pub_encoding, key->params->pk_len,
-                     key->tr, sizeof(key->tr));
+            key->pub_encoding, key->params->pk_len,
+            key->tr, sizeof(key->tr));
     vector_free(&t0);
     EVP_MD_CTX_free(md_ctx);
     return ret;
@@ -430,7 +436,7 @@ static int keygen_internal(ML_DSA_KEY *out)
     augmented_seed[ML_DSA_SEED_BYTES + 1] = (uint8_t)params->l;
     /* Expand the seed into p[32], p'[64], K[32] */
     if (!shake_xof(md_ctx, out->shake256_md, augmented_seed, sizeof(augmented_seed),
-                   expanded_seed, sizeof(expanded_seed)))
+            expanded_seed, sizeof(expanded_seed)))
         goto err;
 
     memcpy(out->rho, rho, sizeof(out->rho));
@@ -440,7 +446,7 @@ static int keygen_internal(ML_DSA_KEY *out)
         && public_from_private(out, md_ctx, &out->t1, &out->t0)
         && ossl_ml_dsa_pk_encode(out)
         && shake_xof(md_ctx, out->shake256_md, out->pub_encoding, out->params->pk_len,
-                     out->tr, sizeof(out->tr))
+            out->tr, sizeof(out->tr))
         && ossl_ml_dsa_sk_encode(out);
 
 err:
@@ -480,8 +486,8 @@ int ossl_ml_dsa_generate_key(ML_DSA_KEY *out)
             ret = 0;
             ossl_ml_dsa_key_reset(out);
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
-                           "explicit %s private key does not match seed",
-                           out->params->alg);
+                "explicit %s private key does not match seed",
+                out->params->alg);
         }
         OPENSSL_free(sk);
     }
diff --git a/crypto/ml_dsa/ml_dsa_key.h b/crypto/ml_dsa/ml_dsa_key.h
index 83f93fc9ca63f..e89bb01ca444e 100644
--- a/crypto/ml_dsa/ml_dsa_key.h
+++ b/crypto/ml_dsa/ml_dsa_key.h
@@ -20,8 +20,8 @@ struct ml_dsa_key_st {
     EVP_MD *shake256_md;
 
     uint8_t rho[ML_DSA_RHO_BYTES]; /* public random seed */
-    uint8_t tr[ML_DSA_TR_BYTES];   /* Pre-cached public key Hash */
-    uint8_t K[ML_DSA_K_BYTES];     /* Private random seed for signing */
+    uint8_t tr[ML_DSA_TR_BYTES]; /* Pre-cached public key Hash */
+    uint8_t K[ML_DSA_K_BYTES]; /* Private random seed for signing */
 
     /*
      * The encoded public and private keys, these are non NULL if the key
@@ -52,5 +52,5 @@ struct ml_dsa_key_st {
     VECTOR t0;
     VECTOR s2; /* private secret of size K with short coefficients (-4..4) or (-2..2) */
     VECTOR s1; /* private secret of size L with short coefficients (-4..4) or (-2..2) */
-               /* The s1->poly block is allocated and has space for s2 and t0 also */
+    /* The s1->poly block is allocated and has space for s2 and t0 also */
 };
diff --git a/crypto/ml_dsa/ml_dsa_key_compress.c b/crypto/ml_dsa/ml_dsa_key_compress.c
index fa46f2ba7282e..3fea03d21be0d 100644
--- a/crypto/ml_dsa/ml_dsa_key_compress.c
+++ b/crypto/ml_dsa/ml_dsa_key_compress.c
@@ -36,7 +36,7 @@ void ossl_ml_dsa_key_compress_power2_round(uint32_t r, uint32_t *r1, uint32_t *r
     unsigned int mask;
     uint32_t r0_adjusted, r1_adjusted;
 
-    *r1 = r >> ML_DSA_D_BITS;         /* top 13 bits */
+    *r1 = r >> ML_DSA_D_BITS; /* top 13 bits */
     *r0 = r - (*r1 << ML_DSA_D_BITS); /* The remainder mod q */
 
     r0_adjusted = mod_sub(*r0, 1 << ML_DSA_D_BITS);
@@ -84,7 +84,7 @@ uint32_t ossl_ml_dsa_key_compress_high_bits(uint32_t r, uint32_t gamma2)
  * @param r0 The returned low order bits
  */
 void ossl_ml_dsa_key_compress_decompose(uint32_t r, uint32_t gamma2,
-                                        uint32_t *r1, int32_t *r0)
+    uint32_t *r1, int32_t *r0)
 {
     *r1 = ossl_ml_dsa_key_compress_high_bits(r, gamma2);
 
@@ -131,13 +131,13 @@ int32_t ossl_ml_dsa_key_compress_low_bits(uint32_t r, uint32_t gamma2)
  * @returns The hint bit.
  */
 int32_t ossl_ml_dsa_key_compress_make_hint(uint32_t ct0, uint32_t cs2,
-                                           uint32_t gamma2, uint32_t w)
+    uint32_t gamma2, uint32_t w)
 {
     uint32_t r_plus_z = mod_sub(w, cs2);
     uint32_t r = reduce_once(r_plus_z + ct0);
 
-    return  ossl_ml_dsa_key_compress_high_bits(r, gamma2)
-        !=  ossl_ml_dsa_key_compress_high_bits(r_plus_z, gamma2);
+    return ossl_ml_dsa_key_compress_high_bits(r, gamma2)
+        != ossl_ml_dsa_key_compress_high_bits(r_plus_z, gamma2);
 }
 
 /*
@@ -152,7 +152,7 @@ int32_t ossl_ml_dsa_key_compress_make_hint(uint32_t ct0, uint32_t cs2,
  * @returns The adjusted high bits or r.
  */
 uint32_t ossl_ml_dsa_key_compress_use_hint(uint32_t hint, uint32_t r,
-                                           uint32_t gamma2)
+    uint32_t gamma2)
 {
     uint32_t r1;
     int32_t r0;
diff --git a/crypto/ml_dsa/ml_dsa_local.h b/crypto/ml_dsa/ml_dsa_local.h
index 7dfc91bb03ded..459ab3ff0a952 100644
--- a/crypto/ml_dsa/ml_dsa_local.h
+++ b/crypto/ml_dsa/ml_dsa_local.h
@@ -8,29 +8,29 @@
  */
 
 #ifndef OSSL_CRYPTO_ML_DSA_LOCAL_H
-# define OSSL_CRYPTO_ML_DSA_LOCAL_H
+#define OSSL_CRYPTO_ML_DSA_LOCAL_H
 
-# include "crypto/ml_dsa.h"
-# include "internal/constant_time.h"
-# include "internal/packet.h"
+#include "crypto/ml_dsa.h"
+#include "internal/constant_time.h"
+#include "internal/packet.h"
 
 /* The following constants are shared by ML-DSA-44, ML-DSA-65 & ML-DSA-87 */
-# define ML_DSA_Q 8380417   /* The modulus is 23 bits (2^23 - 2^13 + 1) */
-# define ML_DSA_Q_MINUS1_DIV2 ((ML_DSA_Q - 1) / 2)
-
-# define ML_DSA_Q_BITS 23
-# define ML_DSA_Q_INV 58728449  /* q^-1 satisfies: q^-1 * q = 1 mod 2^32 */
-# define ML_DSA_Q_NEG_INV 4236238847 /* Inverse of -q modulo 2^32 */
-# define ML_DSA_DEGREE_INV_MONTGOMERY 41978 /* Inverse of 256 mod q, in Montgomery form. */
-
-# define ML_DSA_D_BITS 13   /* The number of bits dropped from the public vector t */
-# define ML_DSA_NUM_POLY_COEFFICIENTS 256  /* The number of coefficients in the polynomials */
-# define ML_DSA_RHO_BYTES 32   /* p = Public Random Seed */
-# define ML_DSA_PRIV_SEED_BYTES 64 /* p' = Private random seed */
-# define ML_DSA_K_BYTES 32 /* K = Private random seed for signing */
-# define ML_DSA_TR_BYTES 64 /* Size of the Hash of the public key used for signing */
-# define ML_DSA_MU_BYTES 64 /* Size of the Hash for the message representative */
-# define ML_DSA_RHO_PRIME_BYTES 64 /* private random seed size */
+#define ML_DSA_Q 8380417 /* The modulus is 23 bits (2^23 - 2^13 + 1) */
+#define ML_DSA_Q_MINUS1_DIV2 ((ML_DSA_Q - 1) / 2)
+
+#define ML_DSA_Q_BITS 23
+#define ML_DSA_Q_INV 58728449 /* q^-1 satisfies: q^-1 * q = 1 mod 2^32 */
+#define ML_DSA_Q_NEG_INV 4236238847 /* Inverse of -q modulo 2^32 */
+#define ML_DSA_DEGREE_INV_MONTGOMERY 41978 /* Inverse of 256 mod q, in Montgomery form. */
+
+#define ML_DSA_D_BITS 13 /* The number of bits dropped from the public vector t */
+#define ML_DSA_NUM_POLY_COEFFICIENTS 256 /* The number of coefficients in the polynomials */
+#define ML_DSA_RHO_BYTES 32 /* p = Public Random Seed */
+#define ML_DSA_PRIV_SEED_BYTES 64 /* p' = Private random seed */
+#define ML_DSA_K_BYTES 32 /* K = Private random seed for signing */
+#define ML_DSA_TR_BYTES 64 /* Size of the Hash of the public key used for signing */
+#define ML_DSA_MU_BYTES 64 /* Size of the Hash for the message representative */
+#define ML_DSA_RHO_PRIME_BYTES 64 /* private random seed size */
 
 /*
  * There is special case code related to encoding/decoding that tests the
@@ -40,20 +40,20 @@
  * The possible value for eta - If a new value is added, then all code
  * that accesses ML_DSA_ETA_4 would need to be modified.
  */
-# define ML_DSA_ETA_4 4
-# define ML_DSA_ETA_2 2
+#define ML_DSA_ETA_4 4
+#define ML_DSA_ETA_2 2
 /*
  * The possible values of gamma1 - If a new value is added, then all code
  * that accesses ML_DSA_GAMMA1_TWO_POWER_19 would need to be modified.
  */
-# define ML_DSA_GAMMA1_TWO_POWER_19 (1 << 19)
-# define ML_DSA_GAMMA1_TWO_POWER_17 (1 << 17)
+#define ML_DSA_GAMMA1_TWO_POWER_19 (1 << 19)
+#define ML_DSA_GAMMA1_TWO_POWER_17 (1 << 17)
 /*
  * The possible values for gamma2 - If a new value is added, then all code
  * that accesses ML_DSA_GAMMA2_Q_MINUS1_DIV32 would need to be modified.
  */
-# define ML_DSA_GAMMA2_Q_MINUS1_DIV32 ((ML_DSA_Q - 1) / 32)
-# define ML_DSA_GAMMA2_Q_MINUS1_DIV88 ((ML_DSA_Q - 1) / 88)
+#define ML_DSA_GAMMA2_Q_MINUS1_DIV32 ((ML_DSA_Q - 1) / 32)
+#define ML_DSA_GAMMA2_Q_MINUS1_DIV88 ((ML_DSA_Q - 1) / 88)
 
 typedef struct poly_st POLY;
 typedef struct vector_st VECTOR;
@@ -61,17 +61,17 @@ typedef struct matrix_st MATRIX;
 typedef struct ml_dsa_sig_st ML_DSA_SIG;
 
 int ossl_ml_dsa_matrix_expand_A(EVP_MD_CTX *g_ctx, const EVP_MD *md,
-                                const uint8_t *rho, MATRIX *out);
+    const uint8_t *rho, MATRIX *out);
 int ossl_ml_dsa_vector_expand_S(EVP_MD_CTX *h_ctx, const EVP_MD *md, int eta,
-                                const uint8_t *seed, VECTOR *s1, VECTOR *s2);
+    const uint8_t *seed, VECTOR *s1, VECTOR *s2);
 void ossl_ml_dsa_matrix_mult_vector(const MATRIX *matrix_kl, const VECTOR *vl,
-                                    VECTOR *vk);
+    VECTOR *vk);
 int ossl_ml_dsa_poly_expand_mask(POLY *out, const uint8_t *seed, size_t seed_len,
-                                 uint32_t gamma1,
-                                 EVP_MD_CTX *h_ctx, const EVP_MD *md);
+    uint32_t gamma1,
+    EVP_MD_CTX *h_ctx, const EVP_MD *md);
 int ossl_ml_dsa_poly_sample_in_ball(POLY *out_c, const uint8_t *seed, int seed_len,
-                                    EVP_MD_CTX *h_ctx, const EVP_MD *md,
-                                    uint32_t tau);
+    EVP_MD_CTX *h_ctx, const EVP_MD *md,
+    uint32_t tau);
 
 void ossl_ml_dsa_poly_ntt(POLY *s);
 void ossl_ml_dsa_poly_ntt_inverse(POLY *s);
@@ -80,27 +80,27 @@ void ossl_ml_dsa_poly_ntt_mult(const POLY *lhs, const POLY *rhs, POLY *out);
 void ossl_ml_dsa_key_compress_power2_round(uint32_t r, uint32_t *r1, uint32_t *r0);
 uint32_t ossl_ml_dsa_key_compress_high_bits(uint32_t r, uint32_t gamma2);
 void ossl_ml_dsa_key_compress_decompose(uint32_t r, uint32_t gamma2,
-                                        uint32_t *r1, int32_t *r0);
+    uint32_t *r1, int32_t *r0);
 void ossl_ml_dsa_key_compress_decompose(uint32_t r, uint32_t gamma2,
-                                        uint32_t *r1, int32_t *r0);
+    uint32_t *r1, int32_t *r0);
 int32_t ossl_ml_dsa_key_compress_low_bits(uint32_t r, uint32_t gamma2);
 int32_t ossl_ml_dsa_key_compress_make_hint(uint32_t ct0, uint32_t cs2,
-                                           uint32_t gamma2, uint32_t w);
+    uint32_t gamma2, uint32_t w);
 uint32_t ossl_ml_dsa_key_compress_use_hint(uint32_t hint, uint32_t r,
-                                           uint32_t gamma2);
+    uint32_t gamma2);
 
 int ossl_ml_dsa_pk_encode(ML_DSA_KEY *key);
 int ossl_ml_dsa_sk_encode(ML_DSA_KEY *key);
 
 int ossl_ml_dsa_sig_encode(const ML_DSA_SIG *sig, const ML_DSA_PARAMS *params,
-                           uint8_t *out);
+    uint8_t *out);
 int ossl_ml_dsa_sig_decode(ML_DSA_SIG *sig, const uint8_t *in, size_t in_len,
-                           const ML_DSA_PARAMS *params);
+    const ML_DSA_PARAMS *params);
 int ossl_ml_dsa_w1_encode(const VECTOR *w1, uint32_t gamma2,
-                          uint8_t *out, size_t out_len);
+    uint8_t *out, size_t out_len);
 int ossl_ml_dsa_poly_decode_expand_mask(POLY *out,
-                                        const uint8_t *in, size_t in_len,
-                                        uint32_t gamma1);
+    const uint8_t *in, size_t in_len,
+    uint32_t gamma1);
 
 /*
  * @brief Reduces x mod q in constant time
@@ -146,7 +146,7 @@ static ossl_inline ossl_unused uint32_t abs_signed(uint32_t x)
 static ossl_inline ossl_unused uint32_t abs_mod_prime(uint32_t x)
 {
     return constant_time_select_32(constant_time_lt_32(ML_DSA_Q_MINUS1_DIV2, x),
-                                                       ML_DSA_Q - x, x);
+        ML_DSA_Q - x, x);
 }
 
 /*
diff --git a/crypto/ml_dsa/ml_dsa_matrix.c b/crypto/ml_dsa/ml_dsa_matrix.c
index 1b892b20c5c74..c7ff59845217f 100644
--- a/crypto/ml_dsa/ml_dsa_matrix.c
+++ b/crypto/ml_dsa/ml_dsa_matrix.c
@@ -21,7 +21,7 @@
  * @param t 1 * k vector of polynomial results in NTT form
  */
 void ossl_ml_dsa_matrix_mult_vector(const MATRIX *a, const VECTOR *s,
-                                    VECTOR *t)
+    VECTOR *t)
 {
     size_t i, j;
     POLY *poly = a->m_poly;
diff --git a/crypto/ml_dsa/ml_dsa_matrix.h b/crypto/ml_dsa/ml_dsa_matrix.h
index 3051563049c9a..0352ecac7afc0 100644
--- a/crypto/ml_dsa/ml_dsa_matrix.h
+++ b/crypto/ml_dsa/ml_dsa_matrix.h
@@ -38,7 +38,7 @@ matrix_mult_vector(const MATRIX *a, const VECTOR *s, VECTOR *t)
 
 static ossl_inline ossl_unused int
 matrix_expand_A(EVP_MD_CTX *g_ctx, const EVP_MD *md, const uint8_t *rho,
-                MATRIX *out)
+    MATRIX *out)
 {
     return ossl_ml_dsa_matrix_expand_A(g_ctx, md, rho, out);
 }
diff --git a/crypto/ml_dsa/ml_dsa_ntt.c b/crypto/ml_dsa/ml_dsa_ntt.c
index 9628b125412c6..2cce462292337 100644
--- a/crypto/ml_dsa/ml_dsa_ntt.c
+++ b/crypto/ml_dsa/ml_dsa_ntt.c
@@ -45,37 +45,37 @@
  * reduce_montgomery() is defined below..
  */
 static const uint32_t zetas_montgomery[256] = {
-    4193792, 25847,   5771523, 7861508, 237124,  7602457, 7504169, 466468,
+    4193792, 25847, 5771523, 7861508, 237124, 7602457, 7504169, 466468,
     1826347, 2353451, 8021166, 6288512, 3119733, 5495562, 3111497, 2680103,
     2725464, 1024112, 7300517, 3585928, 7830929, 7260833, 2619752, 6271868,
     6262231, 4520680, 6980856, 5102745, 1757237, 8360995, 4010497, 280005,
-    2706023, 95776,   3077325, 3530437, 6718724, 4788269, 5842901, 3915439,
+    2706023, 95776, 3077325, 3530437, 6718724, 4788269, 5842901, 3915439,
     4519302, 5336701, 3574422, 5512770, 3539968, 8079950, 2348700, 7841118,
     6681150, 6736599, 3505694, 4558682, 3507263, 6239768, 6779997, 3699596,
-    811944,  531354,  954230,  3881043, 3900724, 5823537, 2071892, 5582638,
+    811944, 531354, 954230, 3881043, 3900724, 5823537, 2071892, 5582638,
     4450022, 6851714, 4702672, 5339162, 6927966, 3475950, 2176455, 6795196,
     7122806, 1939314, 4296819, 7380215, 5190273, 5223087, 4747489, 126922,
     3412210, 7396998, 2147896, 2715295, 5412772, 4686924, 7969390, 5903370,
     7709315, 7151892, 8357436, 7072248, 7998430, 1349076, 1852771, 6949987,
-    5037034, 264944,  508951,  3097992, 44288,   7280319, 904516,  3958618,
-    4656075, 8371839, 1653064, 5130689, 2389356, 8169440, 759969,  7063561,
-    189548,  4827145, 3159746, 6529015, 5971092, 8202977, 1315589, 1341330,
+    5037034, 264944, 508951, 3097992, 44288, 7280319, 904516, 3958618,
+    4656075, 8371839, 1653064, 5130689, 2389356, 8169440, 759969, 7063561,
+    189548, 4827145, 3159746, 6529015, 5971092, 8202977, 1315589, 1341330,
     1285669, 6795489, 7567685, 6940675, 5361315, 4499357, 4751448, 3839961,
     2091667, 3407706, 2316500, 3817976, 5037939, 2244091, 5933984, 4817955,
-    266997,  2434439, 7144689, 3513181, 4860065, 4621053, 7183191, 5187039,
-    900702,  1859098, 909542,  819034,  495491,  6767243, 8337157, 7857917,
+    266997, 2434439, 7144689, 3513181, 4860065, 4621053, 7183191, 5187039,
+    900702, 1859098, 909542, 819034, 495491, 6767243, 8337157, 7857917,
     7725090, 5257975, 2031748, 3207046, 4823422, 7855319, 7611795, 4784579,
-    342297,  286988,  5942594, 4108315, 3437287, 5038140, 1735879, 203044,
+    342297, 286988, 5942594, 4108315, 3437287, 5038140, 1735879, 203044,
     2842341, 2691481, 5790267, 1265009, 4055324, 1247620, 2486353, 1595974,
     4613401, 1250494, 2635921, 4832145, 5386378, 1869119, 1903435, 7329447,
     7047359, 1237275, 5062207, 6950192, 7929317, 1312455, 3306115, 6417775,
-    7100756, 1917081, 5834105, 7005614, 1500165, 777191,  2235880, 3406031,
-    7838005, 5548557, 6709241, 6533464, 5796124, 4656147, 594136,  4603424,
-    6366809, 2432395, 2454455, 8215696, 1957272, 3369112, 185531,  7173032,
-    5196991, 162844,  1616392, 3014001, 810149,  1652634, 4686184, 6581310,
-    5341501, 3523897, 3866901, 269760,  2213111, 7404533, 1717735, 472078,
+    7100756, 1917081, 5834105, 7005614, 1500165, 777191, 2235880, 3406031,
+    7838005, 5548557, 6709241, 6533464, 5796124, 4656147, 594136, 4603424,
+    6366809, 2432395, 2454455, 8215696, 1957272, 3369112, 185531, 7173032,
+    5196991, 162844, 1616392, 3014001, 810149, 1652634, 4686184, 6581310,
+    5341501, 3523897, 3866901, 269760, 2213111, 7404533, 1717735, 472078,
     7953734, 1723600, 6577327, 1910376, 6712985, 7276084, 8119771, 4546524,
-    5441381, 6144432, 7959518, 6094090, 183443,  7403526, 1612842, 4834730,
+    5441381, 6144432, 7959518, 6094090, 183443, 7403526, 1612842, 4834730,
     7826001, 3919660, 8332111, 7018208, 3937738, 1400424, 7534263, 1976782
 };
 
@@ -113,8 +113,7 @@ void ossl_ml_dsa_poly_ntt_mult(const POLY *lhs, const POLY *rhs, POLY *out)
     int i;
 
     for (i = 0; i < ML_DSA_NUM_POLY_COEFFICIENTS; i++)
-        out->coeff[i] =
-            reduce_montgomery((uint64_t)lhs->coeff[i] * (uint64_t)rhs->coeff[i]);
+        out->coeff[i] = reduce_montgomery((uint64_t)lhs->coeff[i] * (uint64_t)rhs->coeff[i]);
 }
 
 /*
@@ -141,9 +140,8 @@ void ossl_ml_dsa_poly_ntt(POLY *p)
 
             for (j = k; j < k + offset; j++) {
                 uint32_t w_even = p->coeff[j];
-                uint32_t t_odd =
-                    reduce_montgomery((uint64_t)z_step_root
-                                      * (uint64_t)p->coeff[j + offset]);
+                uint32_t t_odd = reduce_montgomery((uint64_t)z_step_root
+                    * (uint64_t)p->coeff[j + offset]);
 
                 p->coeff[j] = reduce_once(w_even + t_odd);
                 p->coeff[j + offset] = mod_sub(w_even, t_odd);
@@ -177,22 +175,19 @@ void ossl_ml_dsa_poly_ntt_inverse(POLY *p)
         step >>= 1;
         k = 0;
         for (i = 0; i < step; i++) {
-            const uint32_t step_root =
-                ML_DSA_Q - zetas_montgomery[step + (step - 1 - i)];
+            const uint32_t step_root = ML_DSA_Q - zetas_montgomery[step + (step - 1 - i)];
 
             for (j = k; j < k + offset; j++) {
                 uint32_t even = p->coeff[j];
                 uint32_t odd = p->coeff[j + offset];
 
                 p->coeff[j] = reduce_once(odd + even);
-                p->coeff[j + offset] =
-                    reduce_montgomery((uint64_t)step_root
-                                      * (uint64_t)(ML_DSA_Q + even - odd));
+                p->coeff[j + offset] = reduce_montgomery((uint64_t)step_root
+                    * (uint64_t)(ML_DSA_Q + even - odd));
             }
             k += 2 * offset;
         }
     }
     for (i = 0; i < ML_DSA_NUM_POLY_COEFFICIENTS; i++)
-        p->coeff[i] = reduce_montgomery((uint64_t)p->coeff[i] *
-                                        (uint64_t)inverse_degree_montgomery);
+        p->coeff[i] = reduce_montgomery((uint64_t)p->coeff[i] * (uint64_t)inverse_degree_montgomery);
 }
diff --git a/crypto/ml_dsa/ml_dsa_params.c b/crypto/ml_dsa/ml_dsa_params.c
index 2fd569d5e7f8c..03b3c43f475f5 100644
--- a/crypto/ml_dsa/ml_dsa_params.c
+++ b/crypto/ml_dsa/ml_dsa_params.c
@@ -43,54 +43,51 @@
 
 static const ML_DSA_PARAMS ml_dsa_params[] = {
     { "ML-DSA-44",
-      EVP_PKEY_ML_DSA_44,
-      ML_DSA_44_TAU,
-      ML_DSA_44_LAMBDA,
-      ML_DSA_GAMMA1_TWO_POWER_17,
-      ML_DSA_GAMMA2_Q_MINUS1_DIV88,
-      ML_DSA_44_K,
-      ML_DSA_44_L,
-      ML_DSA_44_ETA,
-      ML_DSA_44_BETA,
-      ML_DSA_44_OMEGA,
-      ML_DSA_44_SECURITY_CATEGORY,
-      ML_DSA_44_PRIV_LEN,
-      ML_DSA_44_PUB_LEN,
-      ML_DSA_44_SIG_LEN
-    },
+        EVP_PKEY_ML_DSA_44,
+        ML_DSA_44_TAU,
+        ML_DSA_44_LAMBDA,
+        ML_DSA_GAMMA1_TWO_POWER_17,
+        ML_DSA_GAMMA2_Q_MINUS1_DIV88,
+        ML_DSA_44_K,
+        ML_DSA_44_L,
+        ML_DSA_44_ETA,
+        ML_DSA_44_BETA,
+        ML_DSA_44_OMEGA,
+        ML_DSA_44_SECURITY_CATEGORY,
+        ML_DSA_44_PRIV_LEN,
+        ML_DSA_44_PUB_LEN,
+        ML_DSA_44_SIG_LEN },
     { "ML-DSA-65",
-      EVP_PKEY_ML_DSA_65,
-      ML_DSA_65_TAU,
-      ML_DSA_65_LAMBDA,
-      ML_DSA_GAMMA1_TWO_POWER_19,
-      ML_DSA_GAMMA2_Q_MINUS1_DIV32,
-      ML_DSA_65_K,
-      ML_DSA_65_L,
-      ML_DSA_65_ETA,
-      ML_DSA_65_BETA,
-      ML_DSA_65_OMEGA,
-      ML_DSA_65_SECURITY_CATEGORY,
-      ML_DSA_65_PRIV_LEN,
-      ML_DSA_65_PUB_LEN,
-      ML_DSA_65_SIG_LEN
-    },
+        EVP_PKEY_ML_DSA_65,
+        ML_DSA_65_TAU,
+        ML_DSA_65_LAMBDA,
+        ML_DSA_GAMMA1_TWO_POWER_19,
+        ML_DSA_GAMMA2_Q_MINUS1_DIV32,
+        ML_DSA_65_K,
+        ML_DSA_65_L,
+        ML_DSA_65_ETA,
+        ML_DSA_65_BETA,
+        ML_DSA_65_OMEGA,
+        ML_DSA_65_SECURITY_CATEGORY,
+        ML_DSA_65_PRIV_LEN,
+        ML_DSA_65_PUB_LEN,
+        ML_DSA_65_SIG_LEN },
     { "ML-DSA-87",
-      EVP_PKEY_ML_DSA_87,
-      ML_DSA_87_TAU,
-      ML_DSA_87_LAMBDA,
-      ML_DSA_GAMMA1_TWO_POWER_19,
-      ML_DSA_GAMMA2_Q_MINUS1_DIV32,
-      ML_DSA_87_K,
-      ML_DSA_87_L,
-      ML_DSA_87_ETA,
-      ML_DSA_87_BETA,
-      ML_DSA_87_OMEGA,
-      ML_DSA_87_SECURITY_CATEGORY,
-      ML_DSA_87_PRIV_LEN,
-      ML_DSA_87_PUB_LEN,
-      ML_DSA_87_SIG_LEN
-    },
-    {NULL},
+        EVP_PKEY_ML_DSA_87,
+        ML_DSA_87_TAU,
+        ML_DSA_87_LAMBDA,
+        ML_DSA_GAMMA1_TWO_POWER_19,
+        ML_DSA_GAMMA2_Q_MINUS1_DIV32,
+        ML_DSA_87_K,
+        ML_DSA_87_L,
+        ML_DSA_87_ETA,
+        ML_DSA_87_BETA,
+        ML_DSA_87_OMEGA,
+        ML_DSA_87_SECURITY_CATEGORY,
+        ML_DSA_87_PRIV_LEN,
+        ML_DSA_87_PUB_LEN,
+        ML_DSA_87_SIG_LEN },
+    { NULL },
 };
 
 /**
diff --git a/crypto/ml_dsa/ml_dsa_poly.h b/crypto/ml_dsa/ml_dsa_poly.h
index ad4a41b520a46..5edc11be80649 100644
--- a/crypto/ml_dsa/ml_dsa_poly.h
+++ b/crypto/ml_dsa/ml_dsa_poly.h
@@ -72,7 +72,7 @@ poly_ntt(POLY *p)
 
 static ossl_inline ossl_unused int
 poly_sample_in_ball_ntt(POLY *out, const uint8_t *seed, int seed_len,
-                        EVP_MD_CTX *h_ctx, const EVP_MD *md, uint32_t tau)
+    EVP_MD_CTX *h_ctx, const EVP_MD *md, uint32_t tau)
 {
     if (!ossl_ml_dsa_poly_sample_in_ball(out, seed, seed_len, h_ctx, md, tau))
         return 0;
@@ -82,7 +82,7 @@ poly_sample_in_ball_ntt(POLY *out, const uint8_t *seed, int seed_len,
 
 static ossl_inline ossl_unused int
 poly_expand_mask(POLY *out, const uint8_t *seed, size_t seed_len,
-                 uint32_t gamma1, EVP_MD_CTX *h_ctx, const EVP_MD *md)
+    uint32_t gamma1, EVP_MD_CTX *h_ctx, const EVP_MD *md)
 {
     return ossl_ml_dsa_poly_expand_mask(out, seed, seed_len, gamma1, h_ctx, md);
 }
@@ -105,7 +105,7 @@ poly_power2_round(const POLY *t, POLY *t1, POLY *t0)
 
     for (i = 0; i < ML_DSA_NUM_POLY_COEFFICIENTS; i++)
         ossl_ml_dsa_key_compress_power2_round(t->coeff[i],
-                                              t1->coeff + i, t0->coeff + i);
+            t1->coeff + i, t0->coeff + i);
 }
 
 static ossl_inline ossl_unused void
@@ -137,14 +137,14 @@ poly_low_bits(const POLY *in, uint32_t gamma2, POLY *out)
 
 static ossl_inline ossl_unused void
 poly_make_hint(const POLY *ct0, const POLY *cs2, const POLY *w, uint32_t gamma2,
-               POLY *out)
+    POLY *out)
 {
     int i;
 
     for (i = 0; i < ML_DSA_NUM_POLY_COEFFICIENTS; i++)
         out->coeff[i] = ossl_ml_dsa_key_compress_make_hint(ct0->coeff[i],
-                                                           cs2->coeff[i],
-                                                           gamma2, w->coeff[i]);
+            cs2->coeff[i],
+            gamma2, w->coeff[i]);
 }
 
 static ossl_inline ossl_unused void
@@ -154,7 +154,7 @@ poly_use_hint(const POLY *h, const POLY *r, uint32_t gamma2, POLY *out)
 
     for (i = 0; i < ML_DSA_NUM_POLY_COEFFICIENTS; i++)
         out->coeff[i] = ossl_ml_dsa_key_compress_use_hint(h->coeff[i],
-                                                          r->coeff[i], gamma2);
+            r->coeff[i], gamma2);
 }
 
 static ossl_inline ossl_unused void
diff --git a/crypto/ml_dsa/ml_dsa_sample.c b/crypto/ml_dsa/ml_dsa_sample.c
index 82fcb63e4944e..6fae4c4a0de5c 100644
--- a/crypto/ml_dsa/ml_dsa_sample.c
+++ b/crypto/ml_dsa/ml_dsa_sample.c
@@ -26,10 +26,10 @@
 #define MOD5(n) ((n) - 5 * (0x3335 * (n) >> 16))
 
 #if SHAKE128_BLOCKSIZE % 3 != 0
-# error "rej_ntt_poly() requires SHAKE128_BLOCKSIZE to be a multiple of 3"
+#error "rej_ntt_poly() requires SHAKE128_BLOCKSIZE to be a multiple of 3"
 #endif
 
-typedef int (COEFF_FROM_NIBBLE_FUNC)(uint32_t nibble, uint32_t *out);
+typedef int(COEFF_FROM_NIBBLE_FUNC)(uint32_t nibble, uint32_t *out);
 
 static COEFF_FROM_NIBBLE_FUNC coeff_from_nibble_4;
 static COEFF_FROM_NIBBLE_FUNC coeff_from_nibble_2;
@@ -114,7 +114,7 @@ static ossl_inline int coeff_from_nibble_2(uint32_t nibble, uint32_t *out)
  *            digest operations failed.
  */
 static int rej_ntt_poly(EVP_MD_CTX *g_ctx, const EVP_MD *md,
-                        const uint8_t *seed, size_t seed_len, POLY *out)
+    const uint8_t *seed, size_t seed_len, POLY *out)
 {
     int j = 0;
     uint8_t blocks[SHAKE128_BLOCKSIZE], *b, *end = blocks + sizeof(blocks);
@@ -130,7 +130,7 @@ static int rej_ntt_poly(EVP_MD_CTX *g_ctx, const EVP_MD *md,
         for (b = blocks; b < end; b += 3) {
             if (coeff_from_three_bytes(b, &(out->coeff[j]))) {
                 if (++j >= ML_DSA_NUM_POLY_COEFFICIENTS)
-                    return 1;   /* finished */
+                    return 1; /* finished */
             }
         }
         if (!EVP_DigestSqueeze(g_ctx, blocks, sizeof(blocks)))
@@ -156,8 +156,8 @@ static int rej_ntt_poly(EVP_MD_CTX *g_ctx, const EVP_MD *md,
  *            digest operations failed.
  */
 static int rej_bounded_poly(EVP_MD_CTX *h_ctx, const EVP_MD *md,
-                            COEFF_FROM_NIBBLE_FUNC *coef_from_nibble,
-                            const uint8_t *seed, size_t seed_len, POLY *out)
+    COEFF_FROM_NIBBLE_FUNC *coef_from_nibble,
+    const uint8_t *seed, size_t seed_len, POLY *out)
 {
     int j = 0;
     uint32_t z0, z1;
@@ -170,13 +170,13 @@ static int rej_bounded_poly(EVP_MD_CTX *h_ctx, const EVP_MD *md,
     while (1) {
         for (b = blocks; b < end; b++) {
             z0 = *b & 0x0F; /* lower nibble of byte */
-            z1 = *b >> 4;   /* high nibble of byte */
+            z1 = *b >> 4; /* high nibble of byte */
 
             if (coef_from_nibble(z0, &out->coeff[j])
-                    && ++j >= ML_DSA_NUM_POLY_COEFFICIENTS)
+                && ++j >= ML_DSA_NUM_POLY_COEFFICIENTS)
                 return 1;
             if (coef_from_nibble(z1, &out->coeff[j])
-                    && ++j >= ML_DSA_NUM_POLY_COEFFICIENTS)
+                && ++j >= ML_DSA_NUM_POLY_COEFFICIENTS)
                 return 1;
         }
         if (!EVP_DigestSqueeze(h_ctx, blocks, sizeof(blocks)))
@@ -198,7 +198,7 @@ static int rej_bounded_poly(EVP_MD_CTX *h_ctx, const EVP_MD *md,
  * @returns 1 if the matrix was generated, or 0 on error.
  */
 int ossl_ml_dsa_matrix_expand_A(EVP_MD_CTX *g_ctx, const EVP_MD *md,
-                                const uint8_t *rho, MATRIX *out)
+    const uint8_t *rho, MATRIX *out)
 {
     int ret = 0;
     size_t i, j;
@@ -241,7 +241,7 @@ int ossl_ml_dsa_matrix_expand_A(EVP_MD_CTX *g_ctx, const EVP_MD *md,
  * @returns 1 if s1 and s2 were successfully generated, or 0 otherwise.
  */
 int ossl_ml_dsa_vector_expand_S(EVP_MD_CTX *h_ctx, const EVP_MD *md, int eta,
-                                const uint8_t *seed, VECTOR *s1, VECTOR *s2)
+    const uint8_t *seed, VECTOR *s1, VECTOR *s2)
 {
     int ret = 0;
     size_t i;
@@ -262,13 +262,13 @@ int ossl_ml_dsa_vector_expand_S(EVP_MD_CTX *h_ctx, const EVP_MD *md, int eta,
 
     for (i = 0; i < l; i++) {
         if (!rej_bounded_poly(h_ctx, md, coef_from_nibble_fn,
-                              derived_seed, sizeof(derived_seed), &s1->poly[i]))
+                derived_seed, sizeof(derived_seed), &s1->poly[i]))
             goto err;
         ++derived_seed[ML_DSA_PRIV_SEED_BYTES];
     }
     for (i = 0; i < k; i++) {
         if (!rej_bounded_poly(h_ctx, md, coef_from_nibble_fn,
-                              derived_seed, sizeof(derived_seed), &s2->poly[i]))
+                derived_seed, sizeof(derived_seed), &s2->poly[i]))
             goto err;
         ++derived_seed[ML_DSA_PRIV_SEED_BYTES];
     }
@@ -279,8 +279,8 @@ int ossl_ml_dsa_vector_expand_S(EVP_MD_CTX *h_ctx, const EVP_MD *md, int eta,
 
 /* See FIPS 204, Algorithm 34, ExpandMask(), Step 4 & 5 */
 int ossl_ml_dsa_poly_expand_mask(POLY *out, const uint8_t *seed, size_t seed_len,
-                                 uint32_t gamma1,
-                                 EVP_MD_CTX *h_ctx, const EVP_MD *md)
+    uint32_t gamma1,
+    EVP_MD_CTX *h_ctx, const EVP_MD *md)
 {
     uint8_t buf[32 * 20];
     size_t buf_len = 32 * (gamma1 == ML_DSA_GAMMA1_TWO_POWER_19 ? 20 : 18);
@@ -304,8 +304,8 @@ int ossl_ml_dsa_poly_expand_mask(POLY *out, const uint8_t *seed, size_t seed_len
  *            that is less than or equal to 64
  */
 int ossl_ml_dsa_poly_sample_in_ball(POLY *out_c, const uint8_t *seed, int seed_len,
-                                    EVP_MD_CTX *h_ctx, const EVP_MD *md,
-                                    uint32_t tau)
+    EVP_MD_CTX *h_ctx, const EVP_MD *md,
+    uint32_t tau)
 {
     uint8_t block[SHAKE256_BLOCKSIZE];
     uint64_t signs;
diff --git a/crypto/ml_dsa/ml_dsa_sign.c b/crypto/ml_dsa/ml_dsa_sign.c
index 346f635094e95..71eccf8759635 100644
--- a/crypto/ml_dsa/ml_dsa_sign.c
+++ b/crypto/ml_dsa/ml_dsa_sign.c
@@ -33,8 +33,8 @@
  * @param c_tilde_len The size of |c_tilde|
  */
 static void signature_init(ML_DSA_SIG *sig,
-                           POLY *hint, uint32_t k, POLY *z, uint32_t l,
-                           uint8_t *c_tilde, size_t c_tilde_len)
+    POLY *hint, uint32_t k, POLY *z, uint32_t l,
+    uint8_t *c_tilde, size_t c_tilde_len)
 {
     vector_init(&sig->z, z, l);
     vector_init(&sig->hint, hint, k);
@@ -47,10 +47,10 @@ static void signature_init(ML_DSA_SIG *sig,
  * @returns 1 on success and 0 on failure.
  */
 static int ml_dsa_sign_internal(const ML_DSA_KEY *priv, int msg_is_mu,
-                                const uint8_t *encoded_msg,
-                                size_t encoded_msg_len,
-                                const uint8_t *rnd, size_t rnd_len,
-                                uint8_t *out_sig)
+    const uint8_t *encoded_msg,
+    size_t encoded_msg_len,
+    const uint8_t *rnd, size_t rnd_len,
+    uint8_t *out_sig)
 {
     int ret = 0;
     const ML_DSA_PARAMS *params = priv->params;
@@ -80,8 +80,7 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv, int msg_is_mu,
      */
     w1_encoded_len = k * (gamma2 == ML_DSA_GAMMA2_Q_MINUS1_DIV88 ? 192 : 128);
     alloc_len = w1_encoded_len
-        + sizeof(*polys) * (1 + num_polys_k + num_polys_l
-                            + num_polys_k_by_l + num_polys_sig_k);
+        + sizeof(*polys) * (1 + num_polys_k + num_polys_l + num_polys_k_by_l + num_polys_sig_k);
     alloc = OPENSSL_malloc(alloc_len);
     if (alloc == NULL)
         return 0;
@@ -116,12 +115,12 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv, int msg_is_mu,
         mu_ptr = (uint8_t *)encoded_msg;
     } else {
         if (!shake_xof_2(md_ctx, priv->shake256_md, priv->tr, sizeof(priv->tr),
-                         encoded_msg, encoded_msg_len, mu_ptr, mu_len))
+                encoded_msg, encoded_msg_len, mu_ptr, mu_len))
             goto err;
     }
     if (!shake_xof_3(md_ctx, priv->shake256_md, priv->K, sizeof(priv->K),
-                     rnd, rnd_len, mu_ptr, mu_len,
-                     rho_prime, sizeof(rho_prime)))
+            rnd, rnd_len, mu_ptr, mu_len,
+            rho_prime, sizeof(rho_prime)))
         goto err;
 
     vector_copy(&s1_ntt, &priv->s1);
@@ -135,14 +134,14 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv, int msg_is_mu,
      * kappa must not exceed 2^16. But the probability of it
      * exceeding even 1000 iterations is vanishingly small.
      */
-    for (kappa = 0; ; kappa += l) {
+    for (kappa = 0;; kappa += l) {
         VECTOR *y_ntt = &cs1;
         VECTOR *r0 = &w1;
         VECTOR *ct0 = &w1;
         uint32_t z_max, r0_max, ct0_max, h_ones;
 
         vector_expand_mask(&y, rho_prime, sizeof(rho_prime), kappa,
-                           gamma1, md_ctx, priv->shake256_md);
+            gamma1, md_ctx, priv->shake256_md);
         vector_copy(y_ntt, &y);
         vector_ntt(y_ntt);
 
@@ -153,11 +152,11 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv, int msg_is_mu,
         ossl_ml_dsa_w1_encode(&w1, gamma2, w1_encoded, w1_encoded_len);
 
         if (!shake_xof_2(md_ctx, priv->shake256_md, mu_ptr, mu_len,
-                         w1_encoded, w1_encoded_len, c_tilde, c_tilde_len))
+                w1_encoded, w1_encoded_len, c_tilde, c_tilde_len))
             break;
 
         if (!poly_sample_in_ball_ntt(c_ntt, c_tilde, c_tilde_len,
-                                     md_ctx, priv->shake256_md, params->tau))
+                md_ctx, priv->shake256_md, params->tau))
             break;
 
         vector_mult_scalar(&s1_ntt, c_ntt, &cs1);
@@ -178,7 +177,7 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv, int msg_is_mu,
         z_max = vector_max(&sig.z);
         r0_max = vector_max_signed(r0);
         if (value_barrier_32(constant_time_ge(z_max, gamma1 - params->beta)
-                             | constant_time_ge(r0_max, gamma2 - params->beta)))
+                | constant_time_ge(r0_max, gamma2 - params->beta)))
             continue;
 
         vector_mult_scalar(&t0_ntt, c_ntt, ct0);
@@ -189,7 +188,7 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv, int msg_is_mu,
         h_ones = vector_count_ones(&sig.hint);
         /* Same reasoning applies to the leak as above */
         if (value_barrier_32(constant_time_ge(ct0_max, gamma2)
-                             | constant_time_lt(params->omega, h_ones)))
+                | constant_time_lt(params->omega, h_ones)))
             continue;
         ret = ossl_ml_dsa_sig_encode(&sig, params, out_sig);
         break;
@@ -205,8 +204,8 @@ static int ml_dsa_sign_internal(const ML_DSA_KEY *priv, int msg_is_mu,
  * See FIPS 204, Algorithm 8, ML-DSA.Verify_internal().
  */
 static int ml_dsa_verify_internal(const ML_DSA_KEY *pub, int msg_is_mu,
-                                  const uint8_t *msg_enc, size_t msg_enc_len,
-                                  const uint8_t *sig_enc, size_t sig_enc_len)
+    const uint8_t *msg_enc, size_t msg_enc_len,
+    const uint8_t *sig_enc, size_t sig_enc_len)
 {
     int ret = 0;
     uint8_t *alloc = NULL, *w1_encoded;
@@ -234,10 +233,7 @@ static int ml_dsa_verify_internal(const ML_DSA_KEY *pub, int msg_is_mu,
     /* Allocate space for all the POLYNOMIALS used by temporary VECTORS */
     w1_encoded_len = k * (gamma2 == ML_DSA_GAMMA2_Q_MINUS1_DIV88 ? 192 : 128);
     alloc = OPENSSL_malloc(w1_encoded_len
-                           + sizeof(*polys) * (1 + num_polys_k
-                                               + num_polys_l
-                                               + num_polys_k_by_l
-                                               + num_polys_sig));
+        + sizeof(*polys) * (1 + num_polys_k + num_polys_l + num_polys_k_by_l + num_polys_sig));
     if (alloc == NULL)
         return 0;
     md_ctx = EVP_MD_CTX_new();
@@ -256,7 +252,7 @@ static int ml_dsa_verify_internal(const ML_DSA_KEY *pub, int msg_is_mu,
     vector_init(&ct1_ntt, p + k, k);
 
     if (!ossl_ml_dsa_sig_decode(&sig, sig_enc, sig_enc_len, pub->params)
-            || !matrix_expand_A(md_ctx, pub->shake128_md, pub->rho, &a_ntt))
+        || !matrix_expand_A(md_ctx, pub->shake128_md, pub->rho, &a_ntt))
         goto err;
     if (msg_is_mu) {
         if (msg_enc_len != mu_len)
@@ -264,12 +260,12 @@ static int ml_dsa_verify_internal(const ML_DSA_KEY *pub, int msg_is_mu,
         mu_ptr = (uint8_t *)msg_enc;
     } else {
         if (!shake_xof_2(md_ctx, pub->shake256_md, pub->tr, sizeof(pub->tr),
-                         msg_enc, msg_enc_len, mu_ptr, mu_len))
+                msg_enc, msg_enc_len, mu_ptr, mu_len))
             goto err;
     }
     /* Compute verifiers challenge c_ntt = NTT(SampleInBall(c_tilde) */
     if (!poly_sample_in_ball_ntt(c_ntt, c_tilde_sig, c_tilde_len,
-                                 md_ctx, pub->shake256_md, params->tau))
+            md_ctx, pub->shake256_md, params->tau))
         goto err;
 
     /* ct1_ntt = NTT(c) * NTT(t1 * 2^d) */
@@ -293,7 +289,7 @@ static int ml_dsa_verify_internal(const ML_DSA_KEY *pub, int msg_is_mu,
     ossl_ml_dsa_w1_encode(w1, gamma2, w1_encoded, w1_encoded_len);
 
     if (!shake_xof_3(md_ctx, pub->shake256_md, mu_ptr, mu_len,
-                     w1_encoded, w1_encoded_len, NULL, 0, c_tilde, c_tilde_len))
+            w1_encoded, w1_encoded_len, NULL, 0, c_tilde, c_tilde_len))
         goto err;
 
     ret = (z_max < (uint32_t)(params->gamma1 - params->beta))
@@ -328,8 +324,8 @@ static int ml_dsa_verify_internal(const ML_DSA_KEY *pub, int msg_is_mu,
  * is 0 then it returns |msg|. NULL is returned if there is a failure.
  */
 static uint8_t *msg_encode(const uint8_t *msg, size_t msg_len,
-                           const uint8_t *ctx, size_t ctx_len, int encode,
-                           uint8_t *tmp, size_t tmp_len, size_t *out_len)
+    const uint8_t *ctx, size_t ctx_len, int encode,
+    uint8_t *tmp, size_t tmp_len, size_t *out_len)
 {
     uint8_t *encoded = NULL;
     size_t encoded_len;
@@ -365,10 +361,10 @@ static uint8_t *msg_encode(const uint8_t *msg, size_t msg_len,
  * @returns 1 on success, or 0 on error.
  */
 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 *sig_len, size_t sig_size)
+    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 *sig_len, size_t sig_size)
 {
     int ret = 1;
     uint8_t m_tmp[1024], *m = m_tmp, *alloced_m = NULL;
@@ -384,7 +380,7 @@ int ossl_ml_dsa_sign(const ML_DSA_KEY *priv, int msg_is_mu,
             m_len = msg_len;
         } else {
             m = msg_encode(msg, msg_len, context, context_len, encode,
-                           m_tmp, sizeof(m_tmp), &m_len);
+                m_tmp, sizeof(m_tmp), &m_len);
             if (m == NULL)
                 return 0;
             if (m != msg && m != m_tmp)
@@ -403,9 +399,9 @@ int ossl_ml_dsa_sign(const ML_DSA_KEY *priv, int msg_is_mu,
  * @returns 1 on success, or 0 on error.
  */
 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)
 {
     uint8_t *m, *alloced_m = NULL;
     size_t m_len;
@@ -420,7 +416,7 @@ int ossl_ml_dsa_verify(const ML_DSA_KEY *pub, int msg_is_mu,
         m_len = msg_len;
     } else {
         m = msg_encode(msg, msg_len, context, context_len, encode,
-                       m_tmp, sizeof(m_tmp), &m_len);
+            m_tmp, sizeof(m_tmp), &m_len);
         if (m == NULL)
             return 0;
         if (m != msg && m != m_tmp)
diff --git a/crypto/ml_dsa/ml_dsa_vector.h b/crypto/ml_dsa/ml_dsa_vector.h
index 125e3257e45e1..d24bf031a292a 100644
--- a/crypto/ml_dsa/ml_dsa_vector.h
+++ b/crypto/ml_dsa/ml_dsa_vector.h
@@ -23,15 +23,13 @@ struct vector_st {
  *              does not own/free this.
  * @param num_polys The number of |polys| blocks (k or l)
  */
-static ossl_inline ossl_unused
-void vector_init(VECTOR *v, POLY *polys, size_t num_polys)
+static ossl_inline ossl_unused void vector_init(VECTOR *v, POLY *polys, size_t num_polys)
 {
     v->poly = polys;
     v->num_poly = num_polys;
 }
 
-static ossl_inline ossl_unused
-int vector_alloc(VECTOR *v, size_t num_polys)
+static ossl_inline ossl_unused int vector_alloc(VECTOR *v, size_t num_polys)
 {
     v->poly = OPENSSL_malloc(num_polys * sizeof(POLY));
     if (v->poly == NULL)
@@ -40,8 +38,7 @@ int vector_alloc(VECTOR *v, size_t num_polys)
     return 1;
 }
 
-static ossl_inline ossl_unused
-void vector_free(VECTOR *v)
+static ossl_inline ossl_unused void vector_free(VECTOR *v)
 {
     OPENSSL_free(v->poly);
     v->poly = NULL;
@@ -49,8 +46,7 @@ void vector_free(VECTOR *v)
 }
 
 /* @brief zeroize a vectors polynomial coefficients */
-static ossl_inline ossl_unused
-void vector_zero(VECTOR *va)
+static ossl_inline ossl_unused void vector_zero(VECTOR *va)
 {
     if (va->poly != NULL)
         memset(va->poly, 0, va->num_poly * sizeof(va->poly[0]));
@@ -134,15 +130,15 @@ vector_mult_scalar(const VECTOR *lhs, const POLY *rhs, VECTOR *out)
 
 static ossl_inline ossl_unused int
 vector_expand_S(EVP_MD_CTX *h_ctx, const EVP_MD *md, int eta,
-                const uint8_t *seed, VECTOR *s1, VECTOR *s2)
+    const uint8_t *seed, VECTOR *s1, VECTOR *s2)
 {
     return ossl_ml_dsa_vector_expand_S(h_ctx, md, eta, seed, s1, s2);
 }
 
 static ossl_inline ossl_unused void
 vector_expand_mask(VECTOR *out, const uint8_t *rho_prime, size_t rho_prime_len,
-                   uint32_t kappa, uint32_t gamma1,
-                   EVP_MD_CTX *h_ctx, const EVP_MD *md)
+    uint32_t kappa, uint32_t gamma1,
+    EVP_MD_CTX *h_ctx, const EVP_MD *md)
 {
     size_t i;
     uint8_t derived_seed[ML_DSA_RHO_PRIME_BYTES + 2];
@@ -155,7 +151,7 @@ vector_expand_mask(VECTOR *out, const uint8_t *rho_prime, size_t rho_prime_len,
         derived_seed[ML_DSA_RHO_PRIME_BYTES] = index & 0xFF;
         derived_seed[ML_DSA_RHO_PRIME_BYTES + 1] = (index >> 8) & 0xFF;
         poly_expand_mask(out->poly + i, derived_seed, sizeof(derived_seed),
-                         gamma1, h_ctx, md);
+            gamma1, h_ctx, md);
     }
 }
 
@@ -238,13 +234,13 @@ vector_count_ones(const VECTOR *v)
 
 static ossl_inline ossl_unused void
 vector_make_hint(const VECTOR *ct0, const VECTOR *cs2, const VECTOR *w,
-                 uint32_t gamma2, VECTOR *out)
+    uint32_t gamma2, VECTOR *out)
 {
     size_t i;
 
     for (i = 0; i < out->num_poly; i++)
         poly_make_hint(ct0->poly + i, cs2->poly + i, w->poly + i, gamma2,
-                       out->poly + i);
+            out->poly + i);
 }
 
 static ossl_inline ossl_unused void
diff --git a/crypto/ml_kem/ml_kem.c b/crypto/ml_kem/ml_kem.c
index 6431445f34677..dd8a39197ac8b 100644
--- a/crypto/ml_kem/ml_kem.c
+++ b/crypto/ml_kem/ml_kem.c
@@ -9,6 +9,7 @@
 
 #include <openssl/byteorder.h>
 #include <openssl/rand.h>
+#include <openssl/proverr.h>
 #include "crypto/ml_kem.h"
 #include "internal/common.h"
 #include "internal/constant_time.h"
@@ -19,37 +20,37 @@
 #endif
 
 #if ML_KEM_SEED_BYTES != ML_KEM_SHARED_SECRET_BYTES + ML_KEM_RANDOM_BYTES
-# error "ML-KEM keygen seed length != shared secret + random bytes length"
+#error "ML-KEM keygen seed length != shared secret + random bytes length"
 #endif
 #if ML_KEM_SHARED_SECRET_BYTES != ML_KEM_RANDOM_BYTES
-# error "Invalid unequal lengths of ML-KEM shared secret and random inputs"
+#error "Invalid unequal lengths of ML-KEM shared secret and random inputs"
 #endif
 
 #if UINT_MAX < UINT32_MAX
-# error "Unsupported compiler: sizeof(unsigned int) < sizeof(uint32_t)"
+#error "Unsupported compiler: sizeof(unsigned int) < sizeof(uint32_t)"
 #endif
 
 /* Handy function-like bit-extraction macros */
-#define bit0(b)     ((b) & 1)
-#define bitn(n, b)  (((b) >> n) & 1)
+#define bit0(b) ((b) & 1)
+#define bitn(n, b) (((b) >> n) & 1)
 
 /*
  * 12 bits are sufficient to losslessly represent values in [0, q-1].
  * INVERSE_DEGREE is (n/2)^-1 mod q; used in inverse NTT.
  */
-#define DEGREE          ML_KEM_DEGREE
-#define INVERSE_DEGREE  (ML_KEM_PRIME - 2 * 13)
-#define LOG2PRIME       12
-#define BARRETT_SHIFT   (2 * LOG2PRIME)
+#define DEGREE ML_KEM_DEGREE
+#define INVERSE_DEGREE (ML_KEM_PRIME - 2 * 13)
+#define LOG2PRIME 12
+#define BARRETT_SHIFT (2 * LOG2PRIME)
 
 #ifdef SHA3_BLOCKSIZE
-# define SHAKE128_BLOCKSIZE SHA3_BLOCKSIZE(128)
+#define SHAKE128_BLOCKSIZE SHA3_BLOCKSIZE(128)
 #endif
 
 /*
  * Return whether a value that can only be 0 or 1 is non-zero, in constant time
  * in practice!  The return value is a mask that is all ones if true, and all
- * zeros otherwise (twos-complement arithmentic assumed for unsigned values).
+ * zeros otherwise (twos-complement arithmetic assumed for unsigned values).
  *
  * Although this is used in constant-time selects, we omit a value barrier
  * here.  Value barriers impede auto-vectorization (likely because it forces
@@ -64,9 +65,9 @@
  * |reduce_once|.  (David Benjamin, Chromium)
  */
 #if 0
-# define constish_time_non_zero(b) (~constant_time_is_zero(b));
+#define constish_time_non_zero(b) (~constant_time_is_zero(b));
 #else
-# define constish_time_non_zero(b) (0u - (b))
+#define constish_time_non_zero(b) (0u - (b))
 #endif
 
 /*
@@ -79,9 +80,9 @@
  * fallback.
  */
 #if defined(SHAKE128_BLOCKSIZE) && (SHAKE128_BLOCKSIZE) % 12 == 0
-# define SCALAR_SAMPLING_BUFSIZE (SHAKE128_BLOCKSIZE)
+#define SCALAR_SAMPLING_BUFSIZE (SHAKE128_BLOCKSIZE)
 #else
-# define SCALAR_SAMPLING_BUFSIZE 168
+#define SCALAR_SAMPLING_BUFSIZE 168
 #endif
 
 /*
@@ -93,31 +94,27 @@ typedef struct ossl_ml_kem_scalar_st {
 } scalar;
 
 /* Key material allocation layout */
-#define DECLARE_ML_KEM_KEYDATA(name, rank, private_sz) \
-    struct name##_alloc { \
-        /* Public vector |t| */ \
-        scalar tbuf[(rank)]; \
-        /* Pre-computed matrix |m| (FIPS 203 |A| transpose) */ \
-        scalar mbuf[(rank)*(rank)] \
-        /* optional private key data */ \
-        private_sz \
+#define DECLARE_ML_KEM_KEYDATA(name, rank, private_sz)               \
+    struct name##_alloc {                                            \
+        /* Public vector |t| */                                      \
+        scalar tbuf[(rank)];                                         \
+        /* Pre-computed matrix |m| (FIPS 203 |A| transpose) */       \
+        scalar mbuf[(rank) * (rank)] /* optional private key data */ \
+            private_sz                                               \
     }
 
 /* Declare variant-specific public and private storage */
-#define DECLARE_ML_KEM_VARIANT_KEYDATA(bits) \
-    DECLARE_ML_KEM_KEYDATA(pubkey_##bits, ML_KEM_##bits##_RANK,;); \
-    DECLARE_ML_KEM_KEYDATA(prvkey_##bits, ML_KEM_##bits##_RANK,;\
-        scalar sbuf[ML_KEM_##bits##_RANK]; \
-        uint8_t zbuf[2 * ML_KEM_RANDOM_BYTES];)
+#define DECLARE_ML_KEM_VARIANT_KEYDATA(bits)                        \
+    DECLARE_ML_KEM_KEYDATA(pubkey_##bits, ML_KEM_##bits##_RANK, ;); \
+    DECLARE_ML_KEM_KEYDATA(prvkey_##bits, ML_KEM_##bits##_RANK, ; scalar sbuf[ML_KEM_##bits##_RANK]; uint8_t zbuf[2 * ML_KEM_RANDOM_BYTES];)
 DECLARE_ML_KEM_VARIANT_KEYDATA(512);
 DECLARE_ML_KEM_VARIANT_KEYDATA(768);
 DECLARE_ML_KEM_VARIANT_KEYDATA(1024);
 #undef DECLARE_ML_KEM_VARIANT_KEYDATA
 #undef DECLARE_ML_KEM_KEYDATA
 
-typedef __owur
-int (*CBD_FUNC)(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
-                EVP_MD_CTX *mdctx, const ML_KEM_KEY *key);
+typedef __owur int (*CBD_FUNC)(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
+    EVP_MD_CTX *mdctx, const ML_KEM_KEY *key);
 static void scalar_encode(uint8_t *out, const scalar *s, int bits);
 
 /*
@@ -129,9 +126,9 @@ static void scalar_encode(uint8_t *out, const scalar *s, int bits);
  * Our serialised private key concatenates serialisations of the private vector
  * |s|, the public key, the public key hash, and the failure secret |z|.
  */
-#define VECTOR_BYTES(b)     ((3 * DEGREE / 2) * ML_KEM_##b##_RANK)
-#define PUBKEY_BYTES(b)     (VECTOR_BYTES(b) + ML_KEM_RANDOM_BYTES)
-#define PRVKEY_BYTES(b)     (2 * PUBKEY_BYTES(b) + ML_KEM_PKHASH_BYTES)
+#define VECTOR_BYTES(b) ((3 * DEGREE / 2) * ML_KEM_##b##_RANK)
+#define PUBKEY_BYTES(b) (VECTOR_BYTES(b) + ML_KEM_RANDOM_BYTES)
+#define PRVKEY_BYTES(b) (2 * PUBKEY_BYTES(b) + ML_KEM_PKHASH_BYTES)
 
 /*
  * Encapsulation produces a vector "u" and a scalar "v", whose coordinates
@@ -139,9 +136,9 @@ static void scalar_encode(uint8_t *out, const scalar *s, int bits);
  * "dv" bits, respectively.  This encoding is the ciphertext input for
  * decapsulation.
  */
-#define U_VECTOR_BYTES(b)   ((DEGREE / 8) * ML_KEM_##b##_DU * ML_KEM_##b##_RANK)
-#define V_SCALAR_BYTES(b)   ((DEGREE / 8) * ML_KEM_##b##_DV)
-#define CTEXT_BYTES(b)      (U_VECTOR_BYTES(b) + V_SCALAR_BYTES(b))
+#define U_VECTOR_BYTES(b) ((DEGREE / 8) * ML_KEM_##b##_DU * ML_KEM_##b##_RANK)
+#define V_SCALAR_BYTES(b) ((DEGREE / 8) * ML_KEM_##b##_DV)
+#define CTEXT_BYTES(b) (U_VECTOR_BYTES(b) + V_SCALAR_BYTES(b))
 
 #if defined(OPENSSL_CONSTANT_TIME_VALIDATION)
 
@@ -151,35 +148,34 @@ static void scalar_encode(uint8_t *out, const scalar *s, int bits);
  * other parts of a memory. If secret data is used as a condition for a branch,
  * or as a memory index, it will trigger warnings in valgrind.
  */
-# define CONSTTIME_SECRET(ptr, len) VALGRIND_MAKE_MEM_UNDEFINED(ptr, len)
+#define CONSTTIME_SECRET(ptr, len) VALGRIND_MAKE_MEM_UNDEFINED(ptr, len)
 
 /*
  * CONSTTIME_DECLASSIFY takes a pointer and a number of bytes and marks that
  * region of memory as public. Public data is not subject to constant-time
  * rules.
  */
-# define CONSTTIME_DECLASSIFY(ptr, len) VALGRIND_MAKE_MEM_DEFINED(ptr, len)
+#define CONSTTIME_DECLASSIFY(ptr, len) VALGRIND_MAKE_MEM_DEFINED(ptr, len)
 
 #else
 
-# define CONSTTIME_SECRET(ptr, len)
-# define CONSTTIME_DECLASSIFY(ptr, len)
+#define CONSTTIME_SECRET(ptr, len)
+#define CONSTTIME_DECLASSIFY(ptr, len)
 
 #endif
 
 /*
  * Indices of slots in the vinfo tables below
  */
-#define ML_KEM_512_VINFO    0
-#define ML_KEM_768_VINFO    1
-#define ML_KEM_1024_VINFO   2
+#define ML_KEM_512_VINFO 0
+#define ML_KEM_768_VINFO 1
+#define ML_KEM_1024_VINFO 2
 
 /*
  * Per-variant fixed parameters
  */
 static const ML_KEM_VINFO vinfo_map[3] = {
-    {
-        "ML-KEM-512",
+    { "ML-KEM-512",
         PRVKEY_BYTES(512),
         sizeof(struct prvkey_512_alloc),
         PUBKEY_BYTES(512),
@@ -192,10 +188,8 @@ static const ML_KEM_VINFO vinfo_map[3] = {
         ML_KEM_512_RANK,
         ML_KEM_512_DU,
         ML_KEM_512_DV,
-        ML_KEM_512_SECBITS
-    },
-    {
-        "ML-KEM-768",
+        ML_KEM_512_SECBITS },
+    { "ML-KEM-768",
         PRVKEY_BYTES(768),
         sizeof(struct prvkey_768_alloc),
         PUBKEY_BYTES(768),
@@ -208,10 +202,8 @@ static const ML_KEM_VINFO vinfo_map[3] = {
         ML_KEM_768_RANK,
         ML_KEM_768_DU,
         ML_KEM_768_DV,
-        ML_KEM_768_SECBITS
-    },
-    {
-        "ML-KEM-1024",
+        ML_KEM_768_SECBITS },
+    { "ML-KEM-1024",
         PRVKEY_BYTES(1024),
         sizeof(struct prvkey_1024_alloc),
         PUBKEY_BYTES(1024),
@@ -224,8 +216,7 @@ static const ML_KEM_VINFO vinfo_map[3] = {
         ML_KEM_1024_RANK,
         ML_KEM_1024_DU,
         ML_KEM_1024_DV,
-        ML_KEM_1024_SECBITS
-    }
+        ML_KEM_1024_SECBITS }
 };
 
 /*
@@ -235,7 +226,7 @@ static const ML_KEM_VINFO vinfo_map[3] = {
  */
 static const int kPrime = ML_KEM_PRIME;
 static const unsigned int kBarrettShift = BARRETT_SHIFT;
-static const size_t   kBarrettMultiplier = (1 << BARRETT_SHIFT) / ML_KEM_PRIME;
+static const size_t kBarrettMultiplier = (1 << BARRETT_SHIFT) / ML_KEM_PRIME;
 static const uint16_t kHalfPrime = (ML_KEM_PRIME - 1) / 2;
 static const uint16_t kInverseDegree = INVERSE_DEGREE;
 
@@ -258,22 +249,134 @@ static const uint16_t kInverseDegree = INVERSE_DEGREE;
  * kNTTRoots = [pow(17, bitreverse(i), p) for i in range(128)]
  */
 static const uint16_t kNTTRoots[128] = {
-    1,    1729, 2580, 3289, 2642, 630,  1897, 848,
-    1062, 1919, 193,  797,  2786, 3260, 569,  1746,
-    296,  2447, 1339, 1476, 3046, 56,   2240, 1333,
-    1426, 2094, 535,  2882, 2393, 2879, 1974, 821,
-    289,  331,  3253, 1756, 1197, 2304, 2277, 2055,
-    650,  1977, 2513, 632,  2865, 33,   1320, 1915,
-    2319, 1435, 807,  452,  1438, 2868, 1534, 2402,
-    2647, 2617, 1481, 648,  2474, 3110, 1227, 910,
-    17,   2761, 583,  2649, 1637, 723,  2288, 1100,
-    1409, 2662, 3281, 233,  756,  2156, 3015, 3050,
-    1703, 1651, 2789, 1789, 1847, 952,  1461, 2687,
-    939,  2308, 2437, 2388, 733,  2337, 268,  641,
-    1584, 2298, 2037, 3220, 375,  2549, 2090, 1645,
-    1063, 319,  2773, 757,  2099, 561,  2466, 2594,
-    2804, 1092, 403,  1026, 1143, 2150, 2775, 886,
-    1722, 1212, 1874, 1029, 2110, 2935, 885,  2154,
+    1,
+    1729,
+    2580,
+    3289,
+    2642,
+    630,
+    1897,
+    848,
+    1062,
+    1919,
+    193,
+    797,
+    2786,
+    3260,
+    569,
+    1746,
+    296,
+    2447,
+    1339,
+    1476,
+    3046,
+    56,
+    2240,
+    1333,
+    1426,
+    2094,
+    535,
+    2882,
+    2393,
+    2879,
+    1974,
+    821,
+    289,
+    331,
+    3253,
+    1756,
+    1197,
+    2304,
+    2277,
+    2055,
+    650,
+    1977,
+    2513,
+    632,
+    2865,
+    33,
+    1320,
+    1915,
+    2319,
+    1435,
+    807,
+    452,
+    1438,
+    2868,
+    1534,
+    2402,
+    2647,
+    2617,
+    1481,
+    648,
+    2474,
+    3110,
+    1227,
+    910,
+    17,
+    2761,
+    583,
+    2649,
+    1637,
+    723,
+    2288,
+    1100,
+    1409,
+    2662,
+    3281,
+    233,
+    756,
+    2156,
+    3015,
+    3050,
+    1703,
+    1651,
+    2789,
+    1789,
+    1847,
+    952,
+    1461,
+    2687,
+    939,
+    2308,
+    2437,
+    2388,
+    733,
+    2337,
+    268,
+    641,
+    1584,
+    2298,
+    2037,
+    3220,
+    375,
+    2549,
+    2090,
+    1645,
+    1063,
+    319,
+    2773,
+    757,
+    2099,
+    561,
+    2466,
+    2594,
+    2804,
+    1092,
+    403,
+    1026,
+    1143,
+    2150,
+    2775,
+    886,
+    1722,
+    1212,
+    1874,
+    1029,
+    2110,
+    2935,
+    885,
+    2154,
 };
 
 /*
@@ -283,22 +386,134 @@ static const uint16_t kNTTRoots[128] = {
  *  0, 64, 65, ..., 127, 32, 33, ..., 63, 16, 17, ..., 31, 8, 9, ...
  */
 static const uint16_t kInverseNTTRoots[128] = {
-    1,    1175, 2444, 394,  1219, 2300, 1455, 2117,
-    1607, 2443, 554,  1179, 2186, 2303, 2926, 2237,
-    525,  735,  863,  2768, 1230, 2572, 556,  3010,
-    2266, 1684, 1239, 780,  2954, 109,  1292, 1031,
-    1745, 2688, 3061, 992,  2596, 941,  892,  1021,
-    2390, 642,  1868, 2377, 1482, 1540, 540,  1678,
-    1626, 279,  314,  1173, 2573, 3096, 48,   667,
-    1920, 2229, 1041, 2606, 1692, 680,  2746, 568,
-    3312, 2419, 2102, 219,  855,  2681, 1848, 712,
-    682,  927,  1795, 461,  1891, 2877, 2522, 1894,
-    1010, 1414, 2009, 3296, 464,  2697, 816,  1352,
-    2679, 1274, 1052, 1025, 2132, 1573, 76,   2998,
-    3040, 2508, 1355, 450,  936,  447,  2794, 1235,
-    1903, 1996, 1089, 3273, 283,  1853, 1990, 882,
-    3033, 1583, 2760, 69,   543,  2532, 3136, 1410,
-    2267, 2481, 1432, 2699, 687,  40,   749,  1600,
+    1,
+    1175,
+    2444,
+    394,
+    1219,
+    2300,
+    1455,
+    2117,
+    1607,
+    2443,
+    554,
+    1179,
+    2186,
+    2303,
+    2926,
+    2237,
+    525,
+    735,
+    863,
+    2768,
+    1230,
+    2572,
+    556,
+    3010,
+    2266,
+    1684,
+    1239,
+    780,
+    2954,
+    109,
+    1292,
+    1031,
+    1745,
+    2688,
+    3061,
+    992,
+    2596,
+    941,
+    892,
+    1021,
+    2390,
+    642,
+    1868,
+    2377,
+    1482,
+    1540,
+    540,
+    1678,
+    1626,
+    279,
+    314,
+    1173,
+    2573,
+    3096,
+    48,
+    667,
+    1920,
+    2229,
+    1041,
+    2606,
+    1692,
+    680,
+    2746,
+    568,
+    3312,
+    2419,
+    2102,
+    219,
+    855,
+    2681,
+    1848,
+    712,
+    682,
+    927,
+    1795,
+    461,
+    1891,
+    2877,
+    2522,
+    1894,
+    1010,
+    1414,
+    2009,
+    3296,
+    464,
+    2697,
+    816,
+    1352,
+    2679,
+    1274,
+    1052,
+    1025,
+    2132,
+    1573,
+    76,
+    2998,
+    3040,
+    2508,
+    1355,
+    450,
+    936,
+    447,
+    2794,
+    1235,
+    1903,
+    1996,
+    1089,
+    3273,
+    283,
+    1853,
+    1990,
+    882,
+    3033,
+    1583,
+    2760,
+    69,
+    543,
+    2532,
+    3136,
+    1410,
+    2267,
+    2481,
+    1432,
+    2699,
+    687,
+    40,
+    749,
+    1600,
 };
 
 /*
@@ -307,17 +522,134 @@ static const uint16_t kInverseNTTRoots[128] = {
  * ModRoots = [pow(17, 2*bitreverse(i) + 1, p) for i in range(128)]
  */
 static const uint16_t kModRoots[128] = {
-    17,   3312, 2761, 568,  583,  2746, 2649, 680,  1637, 1692, 723,  2606,
-    2288, 1041, 1100, 2229, 1409, 1920, 2662, 667,  3281, 48,   233,  3096,
-    756,  2573, 2156, 1173, 3015, 314,  3050, 279,  1703, 1626, 1651, 1678,
-    2789, 540,  1789, 1540, 1847, 1482, 952,  2377, 1461, 1868, 2687, 642,
-    939,  2390, 2308, 1021, 2437, 892,  2388, 941,  733,  2596, 2337, 992,
-    268,  3061, 641,  2688, 1584, 1745, 2298, 1031, 2037, 1292, 3220, 109,
-    375,  2954, 2549, 780,  2090, 1239, 1645, 1684, 1063, 2266, 319,  3010,
-    2773, 556,  757,  2572, 2099, 1230, 561,  2768, 2466, 863,  2594, 735,
-    2804, 525,  1092, 2237, 403,  2926, 1026, 2303, 1143, 2186, 2150, 1179,
-    2775, 554,  886,  2443, 1722, 1607, 1212, 2117, 1874, 1455, 1029, 2300,
-    2110, 1219, 2935, 394,  885,  2444, 2154, 1175,
+    17,
+    3312,
+    2761,
+    568,
+    583,
+    2746,
+    2649,
+    680,
+    1637,
+    1692,
+    723,
+    2606,
+    2288,
+    1041,
+    1100,
+    2229,
+    1409,
+    1920,
+    2662,
+    667,
+    3281,
+    48,
+    233,
+    3096,
+    756,
+    2573,
+    2156,
+    1173,
+    3015,
+    314,
+    3050,
+    279,
+    1703,
+    1626,
+    1651,
+    1678,
+    2789,
+    540,
+    1789,
+    1540,
+    1847,
+    1482,
+    952,
+    2377,
+    1461,
+    1868,
+    2687,
+    642,
+    939,
+    2390,
+    2308,
+    1021,
+    2437,
+    892,
+    2388,
+    941,
+    733,
+    2596,
+    2337,
+    992,
+    268,
+    3061,
+    641,
+    2688,
+    1584,
+    1745,
+    2298,
+    1031,
+    2037,
+    1292,
+    3220,
+    109,
+    375,
+    2954,
+    2549,
+    780,
+    2090,
+    1239,
+    1645,
+    1684,
+    1063,
+    2266,
+    319,
+    3010,
+    2773,
+    556,
+    757,
+    2572,
+    2099,
+    1230,
+    561,
+    2768,
+    2466,
+    863,
+    2594,
+    735,
+    2804,
+    525,
+    1092,
+    2237,
+    403,
+    2926,
+    1026,
+    2303,
+    1143,
+    2186,
+    2150,
+    1179,
+    2775,
+    554,
+    886,
+    2443,
+    1722,
+    1607,
+    1212,
+    2117,
+    1874,
+    1455,
+    1029,
+    2300,
+    2110,
+    1219,
+    2935,
+    394,
+    885,
+    2444,
+    2154,
+    1175,
 };
 
 /*
@@ -325,27 +657,25 @@ static const uint16_t kModRoots[128] = {
  * output to |out|. If the |md| specifies a fixed-output function, like
  * SHA3-256, then |outlen| must be the correct length for that function.
  */
-static __owur
-int single_keccak(uint8_t *out, size_t outlen, const uint8_t *in, size_t inlen,
-                  EVP_MD_CTX *mdctx)
+static __owur int single_keccak(uint8_t *out, size_t outlen, const uint8_t *in, size_t inlen,
+    EVP_MD_CTX *mdctx)
 {
-    unsigned int sz = (unsigned int) outlen;
+    unsigned int sz = (unsigned int)outlen;
 
     if (!EVP_DigestUpdate(mdctx, in, inlen))
         return 0;
     if (EVP_MD_xof(EVP_MD_CTX_get0_md(mdctx)))
         return EVP_DigestFinalXOF(mdctx, out, outlen);
     return EVP_DigestFinal_ex(mdctx, out, &sz)
-        && ossl_assert((size_t) sz == outlen);
+        && ossl_assert((size_t)sz == outlen);
 }
 
 /*
  * FIPS 203, Section 4.1, equation (4.3): PRF. Takes 32+1 input bytes, and uses
  * SHAKE256 to produce the input to SamplePolyCBD_eta: FIPS 203, algorithm 8.
  */
-static __owur
-int prf(uint8_t *out, size_t len, const uint8_t in[ML_KEM_RANDOM_BYTES + 1],
-        EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int prf(uint8_t *out, size_t len, const uint8_t in[ML_KEM_RANDOM_BYTES + 1],
+    EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
 {
     return EVP_DigestInit_ex(mdctx, key->shake256_md, NULL)
         && single_keccak(out, len, in, ML_KEM_RANDOM_BYTES + 1, mdctx);
@@ -355,9 +685,8 @@ int prf(uint8_t *out, size_t len, const uint8_t in[ML_KEM_RANDOM_BYTES + 1],
  * FIPS 203, Section 4.1, equation (4.4): H.  SHA3-256 hash of a variable
  * length input, producing 32 bytes of output.
  */
-static __owur
-int hash_h(uint8_t out[ML_KEM_PKHASH_BYTES], const uint8_t *in, size_t len,
-           EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int hash_h(uint8_t out[ML_KEM_PKHASH_BYTES], const uint8_t *in, size_t len,
+    EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
 {
     return EVP_DigestInit_ex(mdctx, key->sha3_256_md, NULL)
         && single_keccak(out, ML_KEM_PKHASH_BYTES, in, len, mdctx);
@@ -366,7 +695,7 @@ int hash_h(uint8_t out[ML_KEM_PKHASH_BYTES], const uint8_t *in, size_t len,
 /* Incremental hash_h of expanded public key */
 static int
 hash_h_pubkey(uint8_t pkhash[ML_KEM_PKHASH_BYTES],
-              EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
+    EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
 {
     const ML_KEM_VINFO *vinfo = key->vinfo;
     const scalar *t = key->t, *end = t + vinfo->rank;
@@ -394,9 +723,8 @@ hash_h_pubkey(uint8_t pkhash[ML_KEM_PKHASH_BYTES],
  * length input, producing 64 bytes of output, in particular the seeds
  * (d,z) for key generation.
  */
-static __owur
-int hash_g(uint8_t out[ML_KEM_SEED_BYTES], const uint8_t *in, size_t len,
-           EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int hash_g(uint8_t out[ML_KEM_SEED_BYTES], const uint8_t *in, size_t len,
+    EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
 {
     return EVP_DigestInit_ex(mdctx, key->sha3_512_md, NULL)
         && single_keccak(out, ML_KEM_SEED_BYTES, in, len, mdctx);
@@ -408,11 +736,10 @@ int hash_g(uint8_t out[ML_KEM_SEED_BYTES], const uint8_t *in, size_t len,
  * length as the expected shared secret.  (Computed even on success to avoid
  * side-channel leaks).
  */
-static __owur
-int kdf(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
-        const uint8_t z[ML_KEM_RANDOM_BYTES],
-        const uint8_t *ctext, size_t len,
-        EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int kdf(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
+    const uint8_t z[ML_KEM_RANDOM_BYTES],
+    const uint8_t *ctext, size_t len,
+    EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
 {
     return EVP_DigestInit_ex(mdctx, key->shake256_md, NULL)
         && EVP_DigestUpdate(mdctx, z, ML_KEM_RANDOM_BYTES)
@@ -426,8 +753,7 @@ int kdf(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
  * uniformly distributed elements in the range [0,q). This is used for matrix
  * expansion and only operates on public inputs.
  */
-static __owur
-int sample_scalar(scalar *out, EVP_MD_CTX *mdctx)
+static __owur int sample_scalar(scalar *out, EVP_MD_CTX *mdctx)
 {
     uint16_t *curr = out->c, *endout = curr + DEGREE;
     uint8_t buf[SCALAR_SAMPLING_BUFSIZE], *in;
@@ -498,7 +824,7 @@ static void scalar_mult_const(scalar *s, uint16_t a)
 }
 
 /*-
- * FIPS 203, Section 4.3, Algoritm 9: "NTT".
+ * FIPS 203, Section 4.3, Algorithm 9: "NTT".
  * In-place number theoretic transform of a given scalar.  Note that ML-KEM's
  * kPrime 3329 does not have a 512th root of unity, so this transform leaves
  * off the last iteration of the usual FFT code, with the 128 relevant roots of
@@ -531,7 +857,7 @@ static void scalar_ntt(scalar *s)
 }
 
 /*-
- * FIPS 203, Section 4.3, Algoritm 10: "NTT^(-1)".
+ * FIPS 203, Section 4.3, Algorithm 10: "NTT^(-1)".
  * In-place inverse number theoretic transform of a given scalar, with pairs of
  * entries of s->v being interpreted as elements of GF(3329^2). Just as with
  * the number theoretic transform, this leaves off the first step of the normal
@@ -588,12 +914,12 @@ static void scalar_sub(scalar *lhs, const scalar *rhs)
  * GF(3329)[X]/(X^2 - 17^(2*bitreverse(i)+1)).
  *
  * The value of 17^(2*bitreverse(i)+1) mod 3329 is stored in the precomputed
- * ModRoots table. Note that our Barrett transform only allows us to multipy
+ * ModRoots table. Note that our Barrett transform only allows us to multiply
  * two reduced numbers together, so we need some intermediate reduction steps,
  * even if an uint64_t could hold 3 multiplied numbers.
  */
 static void scalar_mult(scalar *out, const scalar *lhs,
-                        const scalar *rhs)
+    const scalar *rhs)
 {
     uint16_t *curr = out->c, *end = curr + DEGREE;
     const uint16_t *lc = lhs->c, *rc = rhs->c;
@@ -610,9 +936,8 @@ static void scalar_mult(scalar *out, const scalar *lhs,
 }
 
 /* Above, but add the result to an existing scalar */
-static ossl_inline
-void scalar_mult_add(scalar *out, const scalar *lhs,
-                     const scalar *rhs)
+static ossl_inline void scalar_mult_add(scalar *out, const scalar *lhs,
+    const scalar *rhs)
 {
     uint16_t *curr = out->c, *end = curr + DEGREE;
     const uint16_t *lc = lhs->c, *rc = rhs->c;
@@ -687,7 +1012,7 @@ static void scalar_decode(scalar *out, const uint8_t *in, int bits)
     uint16_t *curr = out->c, *end = curr + DEGREE;
     uint64_t accum = 0;
     int accum_bits = 0, todo = bits;
-    uint16_t bitmask = (((uint16_t) 1) << bits) - 1, mask = bitmask;
+    uint16_t bitmask = (((uint16_t)1) << bits) - 1, mask = bitmask;
     uint16_t element = 0;
 
     do {
@@ -697,12 +1022,12 @@ static void scalar_decode(scalar *out, const uint8_t *in, int bits)
         }
         if (todo == bits && accum_bits >= bits) {
             /* No partial "element", and all the required bits available */
-            *curr++ = ((uint16_t) accum) & mask;
+            *curr++ = ((uint16_t)accum) & mask;
             accum >>= bits;
             accum_bits -= bits;
         } else if (accum_bits >= todo) {
             /* A partial "element", and all the required bits available */
-            *curr++ = element | ((((uint16_t) accum) & mask) << (bits - todo));
+            *curr++ = element | ((((uint16_t)accum) & mask) << (bits - todo));
             accum >>= todo;
             accum_bits -= todo;
             element = 0;
@@ -719,7 +1044,7 @@ static void scalar_decode(scalar *out, const uint8_t *in, int bits)
              * less, if we're here, the previous iteration had all the
              * requisite bits, and so there are no kept bits in |element|.
              */
-            element = ((uint16_t) accum) & mask;
+            element = ((uint16_t)accum) & mask;
             todo -= accum_bits;
             mask = bitmask >> accum_bits;
             accum_bits = 0;
@@ -727,8 +1052,7 @@ static void scalar_decode(scalar *out, const uint8_t *in, int bits)
     } while (curr < end);
 }
 
-static __owur
-int scalar_decode_12(scalar *out, const uint8_t in[3 * DEGREE / 2])
+static __owur int scalar_decode_12(scalar *out, const uint8_t in[3 * DEGREE / 2])
 {
     int i;
     uint16_t *c = out->c;
@@ -771,11 +1095,11 @@ scalar_decode_decompress_add(scalar *out, const uint8_t in[DEGREE / 8])
      * avoiding the "clangover" attack.  See |constish_time_non_zero| for a
      * discussion on why the value barrier is by default omitted.
      */
-#define decode_decompress_add_bit                               \
-        mask = constish_time_non_zero(bit0(b));                 \
-        *curr = reduce_once(*curr + (mask & half_q_plus_1));    \
-        curr++;                                                 \
-        b >>= 1
+#define decode_decompress_add_bit                        \
+    mask = constish_time_non_zero(bit0(b));              \
+    *curr = reduce_once(*curr + (mask & half_q_plus_1)); \
+    curr++;                                              \
+    b >>= 1
 
     /* Unrolled to process each byte in one iteration */
     do {
@@ -913,8 +1237,7 @@ vector_decode_decompress_ntt(scalar *out, const uint8_t *in, int bits, int rank)
 }
 
 /* vector_decode(), specialised to bits == 12. */
-static __owur
-int vector_decode_12(scalar *out, const uint8_t in[3 * DEGREE / 2], int rank)
+static __owur int vector_decode_12(scalar *out, const uint8_t in[3 * DEGREE / 2], int rank)
 {
     int stride = 3 * DEGREE / 2;
 
@@ -934,7 +1257,7 @@ static void vector_compress(scalar *a, int bits, int rank)
 
 /* The output scalar must not overlap with the inputs */
 static void inner_product(scalar *out, const scalar *lhs, const scalar *rhs,
-                          int rank)
+    int rank)
 {
     scalar_mult(out, lhs, rhs);
     while (--rank > 0)
@@ -968,7 +1291,7 @@ matrix_mult_transpose_add(scalar *out, const scalar *m, const scalar *a, int ran
 
     for (i = rank; i-- > 0; ++out) {
         scalar_mult_add(out, mr = mc++, ar = a);
-        for (j = rank; --j > 0; )
+        for (j = rank; --j > 0;)
             scalar_mult_add(out, (mr += rank), ++ar);
     }
 }
@@ -980,8 +1303,7 @@ matrix_mult_transpose_add(scalar *out, const scalar *m, const scalar *a, int ran
  *
  * Where FIPS 203 computes t = A * s + e, we use the transpose of "m".
  */
-static __owur
-int matrix_expand(EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
+static __owur int matrix_expand(EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
 {
     scalar *out = key->m;
     uint8_t input[ML_KEM_RANDOM_BYTES + 2];
@@ -1010,12 +1332,11 @@ int matrix_expand(EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
  * two this gives -2/2 with a probability of 1/16, -1/1 with probability 1/4,
  * and 0 with probability 3/8.
  */
-static __owur
-int cbd_2(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
-          EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int cbd_2(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
+    EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
 {
     uint16_t *curr = out->c, *end = curr + DEGREE;
-    uint8_t randbuf[4 * DEGREE / 8], *r = randbuf;  /* 64 * eta slots */
+    uint8_t randbuf[4 * DEGREE / 8], *r = randbuf; /* 64 * eta slots */
     uint16_t value, mask;
     uint8_t b;
 
@@ -1051,12 +1372,11 @@ int cbd_2(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
  * and setting the coefficient to the count of the first bits minus the count of
  * the second bits, resulting in a centered binomial distribution.
  */
-static __owur
-int cbd_3(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
-          EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int cbd_3(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
+    EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
 {
     uint16_t *curr = out->c, *end = curr + DEGREE;
-    uint8_t randbuf[6 * DEGREE / 8], *r = randbuf;  /* 64 * eta slots */
+    uint8_t randbuf[6 * DEGREE / 8], *r = randbuf; /* 64 * eta slots */
     uint8_t b1, b2, b3;
     uint16_t value, mask;
 
@@ -1076,7 +1396,7 @@ int cbd_3(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
          * versions of Clang to emit a branch.
          */
         value = bit0(b1) + bitn(1, b1) + bitn(2, b1);
-        value -= bitn(3, b1)  + bitn(4, b1) + bitn(5, b1);
+        value -= bitn(3, b1) + bitn(4, b1) + bitn(5, b1);
         mask = constish_time_non_zero(value >> 15);
         *curr++ = value + (kPrime & mask);
 
@@ -1102,10 +1422,9 @@ int cbd_3(scalar *out, uint8_t in[ML_KEM_RANDOM_BYTES + 1],
  * Generates a secret vector by using |cbd| with the given seed to generate
  * scalar elements and incrementing |counter| for each slot of the vector.
  */
-static __owur
-int gencbd_vector(scalar *out, CBD_FUNC cbd, uint8_t *counter,
-                  const uint8_t seed[ML_KEM_RANDOM_BYTES], int rank,
-                  EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int gencbd_vector(scalar *out, CBD_FUNC cbd, uint8_t *counter,
+    const uint8_t seed[ML_KEM_RANDOM_BYTES], int rank,
+    EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
 {
     uint8_t input[ML_KEM_RANDOM_BYTES + 1];
 
@@ -1121,10 +1440,9 @@ int gencbd_vector(scalar *out, CBD_FUNC cbd, uint8_t *counter,
 /*
  * As above plus NTT transform.
  */
-static __owur
-int gencbd_vector_ntt(scalar *out, CBD_FUNC cbd, uint8_t *counter,
-                      const uint8_t seed[ML_KEM_RANDOM_BYTES], int rank,
-                      EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int gencbd_vector_ntt(scalar *out, CBD_FUNC cbd, uint8_t *counter,
+    const uint8_t seed[ML_KEM_RANDOM_BYTES], int rank,
+    EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
 {
     uint8_t input[ML_KEM_RANDOM_BYTES + 1];
 
@@ -1139,7 +1457,7 @@ int gencbd_vector_ntt(scalar *out, CBD_FUNC cbd, uint8_t *counter,
 }
 
 /* The |ETA1| value for ML-KEM-512 is 3, the rest and all ETA2 values are 2. */
-#define CBD1(evp_type)  ((evp_type) == EVP_PKEY_ML_KEM_512 ? cbd_3 : cbd_2)
+#define CBD1(evp_type) ((evp_type) == EVP_PKEY_ML_KEM_512 ? cbd_3 : cbd_2)
 
 /*
  * FIPS 203, Section 5.2, Algorithm 14: K-PKE.Encrypt.
@@ -1157,11 +1475,10 @@ int gencbd_vector_ntt(scalar *out, CBD_FUNC cbd, uint8_t *counter,
  *
  * Caller passes storage in |tmp| for for two temporary vectors.
  */
-static __owur
-int encrypt_cpa(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
-                const uint8_t message[DEGREE / 8],
-                const uint8_t r[ML_KEM_RANDOM_BYTES], scalar *tmp,
-                EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static __owur int encrypt_cpa(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
+    const uint8_t message[DEGREE / 8],
+    const uint8_t r[ML_KEM_RANDOM_BYTES], scalar *tmp,
+    EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
 {
     const ML_KEM_VINFO *vinfo = key->vinfo;
     CBD_FUNC cbd_1 = CBD1(vinfo->evp_type);
@@ -1211,7 +1528,7 @@ int encrypt_cpa(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
  */
 static void
 decrypt_cpa(uint8_t out[ML_KEM_SHARED_SECRET_BYTES],
-            const uint8_t *ctext, scalar *u, const ML_KEM_KEY *key)
+    const uint8_t *ctext, scalar *u, const ML_KEM_KEY *key)
 {
     const ML_KEM_VINFO *vinfo = key->vinfo;
     scalar v, mask;
@@ -1278,16 +1595,26 @@ static int parse_pubkey(const uint8_t *in, EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
     const ML_KEM_VINFO *vinfo = key->vinfo;
 
     /* Decode and check |t| */
-    if (!vector_decode_12(key->t, in, vinfo->rank))
+    if (!vector_decode_12(key->t, in, vinfo->rank)) {
+        ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
+            "%s invalid public 't' vector",
+            vinfo->algorithm_name);
         return 0;
+    }
     /* Save the matrix |m| recovery seed |rho| */
     memcpy(key->rho, in + vinfo->vector_bytes, ML_KEM_RANDOM_BYTES);
     /*
      * Pre-compute the public key hash, needed for both encap and decap.
      * Also pre-compute the matrix expansion, stored with the public key.
      */
-    return hash_h(key->pkhash, in, vinfo->pubkey_bytes, mdctx, key)
-        && matrix_expand(mdctx, key);
+    if (!hash_h(key->pkhash, in, vinfo->pubkey_bytes, mdctx, key)
+        || !matrix_expand(mdctx, key)) {
+        ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
+            "internal error while parsing %s public key",
+            vinfo->algorithm_name);
+        return 0;
+    }
+    return 1;
 }
 
 /*
@@ -1301,8 +1628,12 @@ static int parse_prvkey(const uint8_t *in, EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
     const ML_KEM_VINFO *vinfo = key->vinfo;
 
     /* Decode and check |s|. */
-    if (!vector_decode_12(key->s, in, vinfo->rank))
+    if (!vector_decode_12(key->s, in, vinfo->rank)) {
+        ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
+            "%s invalid private 's' vector",
+            vinfo->algorithm_name);
         return 0;
+    }
     in += vinfo->vector_bytes;
 
     if (!parse_pubkey(in, mdctx, key))
@@ -1310,8 +1641,12 @@ static int parse_prvkey(const uint8_t *in, EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
     in += vinfo->pubkey_bytes;
 
     /* Check public key hash. */
-    if (memcmp(key->pkhash, in, ML_KEM_PKHASH_BYTES) != 0)
+    if (memcmp(key->pkhash, in, ML_KEM_PKHASH_BYTES) != 0) {
+        ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
+            "%s public key hash mismatch",
+            vinfo->algorithm_name);
         return 0;
+    }
     in += ML_KEM_PKHASH_BYTES;
 
     memcpy(key->z, in, ML_KEM_RANDOM_BYTES);
@@ -1343,9 +1678,8 @@ static int parse_prvkey(const uint8_t *in, EVP_MD_CTX *mdctx, ML_KEM_KEY *key)
  * constant time, with no side channel leaks, on all well-formed (valid length,
  * and correctly encoded) ciphertext inputs.
  */
-static __owur
-int genkey(const uint8_t seed[ML_KEM_SEED_BYTES],
-           EVP_MD_CTX *mdctx, uint8_t *pubenc, ML_KEM_KEY *key)
+static __owur int genkey(const uint8_t seed[ML_KEM_SEED_BYTES],
+    EVP_MD_CTX *mdctx, uint8_t *pubenc, ML_KEM_KEY *key)
 {
     uint8_t hashed[2 * ML_KEM_RANDOM_BYTES];
     const uint8_t *const sigma = hashed + ML_KEM_RANDOM_BYTES;
@@ -1361,7 +1695,7 @@ int genkey(const uint8_t seed[ML_KEM_SEED_BYTES],
      * seeds rho and sigma.
      */
     memcpy(augmented_seed, seed, ML_KEM_RANDOM_BYTES);
-    augmented_seed[ML_KEM_RANDOM_BYTES] = (uint8_t) rank;
+    augmented_seed[ML_KEM_RANDOM_BYTES] = (uint8_t)rank;
     if (!hash_g(hashed, augmented_seed, sizeof(augmented_seed), mdctx, key))
         goto end;
     memcpy(key->rho, hashed, ML_KEM_RANDOM_BYTES);
@@ -1402,9 +1736,14 @@ int genkey(const uint8_t seed[ML_KEM_SEED_BYTES],
     }
 
     ret = 1;
-  end:
+end:
     OPENSSL_cleanse((void *)augmented_seed, ML_KEM_RANDOM_BYTES);
     OPENSSL_cleanse((void *)sigma, ML_KEM_RANDOM_BYTES);
+    if (ret == 0) {
+        ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
+            "internal error while generating %s private key",
+            vinfo->algorithm_name);
+    }
     return ret;
 }
 
@@ -1416,10 +1755,9 @@ int genkey(const uint8_t seed[ML_KEM_SEED_BYTES],
  * The |ctext| buffer have space for the ciphertext of the ML-KEM variant
  * of the provided key.
  */
-static
-int encap(uint8_t *ctext, uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
-          const uint8_t entropy[ML_KEM_RANDOM_BYTES],
-          scalar *tmp, EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static int encap(uint8_t *ctext, uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
+    const uint8_t entropy[ML_KEM_RANDOM_BYTES],
+    scalar *tmp, EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
 {
     uint8_t input[ML_KEM_RANDOM_BYTES + ML_KEM_PKHASH_BYTES];
     uint8_t Kr[ML_KEM_SHARED_SECRET_BYTES + ML_KEM_RANDOM_BYTES];
@@ -1430,10 +1768,14 @@ int encap(uint8_t *ctext, uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
     memcpy(input + ML_KEM_RANDOM_BYTES, key->pkhash, ML_KEM_PKHASH_BYTES);
     ret = hash_g(Kr, input, sizeof(input), mdctx, key)
         && encrypt_cpa(ctext, entropy, r, tmp, mdctx, key);
+    OPENSSL_cleanse((void *)input, sizeof(input));
 
     if (ret)
         memcpy(secret, Kr, ML_KEM_SHARED_SECRET_BYTES);
-    OPENSSL_cleanse((void *)input, sizeof(input));
+    else
+        ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
+            "internal error while performing %s encapsulation",
+            key->vinfo->algorithm_name);
     return ret;
 }
 
@@ -1448,10 +1790,9 @@ int encap(uint8_t *ctext, uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
  * The |ctext| and |tmp_ctext| buffers must each have space for the ciphertext
  * of the key's ML-KEM variant.
  */
-static
-int decap(uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
-          const uint8_t *ctext, uint8_t *tmp_ctext, scalar *tmp,
-          EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
+static int decap(uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
+    const uint8_t *ctext, uint8_t *tmp_ctext, scalar *tmp,
+    EVP_MD_CTX *mdctx, const ML_KEM_KEY *key)
 {
     uint8_t decrypted[ML_KEM_SHARED_SECRET_BYTES + ML_KEM_PKHASH_BYTES];
     uint8_t failure_key[ML_KEM_RANDOM_BYTES];
@@ -1477,8 +1818,12 @@ int decap(uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
      * The same action is taken, if also |encrypt_cpa| should catastrophically
      * fail, due to failure of the |PRF| underlying the CBD functions.
      */
-    if (!kdf(failure_key, key->z, ctext, vinfo->ctext_bytes, mdctx, key))
+    if (!kdf(failure_key, key->z, ctext, vinfo->ctext_bytes, mdctx, key)) {
+        ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
+            "internal error while performing %s decapsulation",
+            vinfo->algorithm_name);
         return 0;
+    }
     decrypt_cpa(decrypted, ctext, tmp, key);
     memcpy(decrypted + ML_KEM_SHARED_SECRET_BYTES, pkhash, ML_KEM_PKHASH_BYTES);
     if (!hash_g(Kr, decrypted, sizeof(decrypted), mdctx, key)
@@ -1500,8 +1845,7 @@ int decap(uint8_t secret[ML_KEM_SHARED_SECRET_BYTES],
  * After allocating storage for public or private key data, update the key
  * component pointers to reference that storage.
  */
-static __owur
-int add_storage(scalar *p, int private, ML_KEM_KEY *key)
+static __owur int add_storage(scalar *p, int private, ML_KEM_KEY *key)
 {
     int rank = key->vinfo->rank;
 
@@ -1536,8 +1880,7 @@ int add_storage(scalar *p, int private, ML_KEM_KEY *key)
  * After freeing the storage associated with a key that failed to be
  * constructed, reset the internal pointers back to NULL.
  */
-void
-ossl_ml_kem_key_reset(ML_KEM_KEY *key)
+void ossl_ml_kem_key_reset(ML_KEM_KEY *key)
 {
     if (key->t == NULL)
         return;
@@ -1550,7 +1893,7 @@ ossl_ml_kem_key_reset(ML_KEM_KEY *key)
      */
     if (ossl_ml_kem_have_prvkey(key))
         OPENSSL_cleanse(key->s,
-                        key->vinfo->vector_bytes + 2 * ML_KEM_RANDOM_BYTES);
+            key->vinfo->rank * sizeof(scalar) + 2 * ML_KEM_RANDOM_BYTES);
     OPENSSL_free(key->t);
     key->d = key->z = (uint8_t *)(key->s = key->m = key->t = NULL);
 }
@@ -1577,13 +1920,16 @@ const ML_KEM_VINFO *ossl_ml_kem_get_vinfo(int evp_type)
 }
 
 ML_KEM_KEY *ossl_ml_kem_key_new(OSSL_LIB_CTX *libctx, const char *properties,
-                                int evp_type)
+    int evp_type)
 {
     const ML_KEM_VINFO *vinfo = ossl_ml_kem_get_vinfo(evp_type);
     ML_KEM_KEY *key;
 
-    if (vinfo == NULL)
+    if (vinfo == NULL) {
+        ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_PASSED_INVALID_ARGUMENT,
+            "unsupported ML-KEM key type: %d", evp_type);
         return NULL;
+    }
 
     if ((key = OPENSSL_malloc(sizeof(*key))) == NULL)
         return NULL;
@@ -1602,9 +1948,12 @@ ML_KEM_KEY *ossl_ml_kem_key_new(OSSL_LIB_CTX *libctx, const char *properties,
         && key->shake256_md != NULL
         && key->sha3_256_md != NULL
         && key->sha3_512_md != NULL)
-    return key;
+        return key;
 
     ossl_ml_kem_key_free(key);
+    ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR,
+        "missing SHA3 digest algorithms while creating %s key",
+        vinfo->algorithm_name);
     return NULL;
 }
 
@@ -1618,7 +1967,7 @@ ML_KEM_KEY *ossl_ml_kem_key_dup(const ML_KEM_KEY *key, int selection)
      * duplicated.
      */
     if (ossl_ml_kem_decoded_key(key))
-        return 0;
+        return NULL;
 
     if (key == NULL
         || (ret = OPENSSL_memdup(key, sizeof(*key))) == NULL)
@@ -1685,7 +2034,7 @@ void ossl_ml_kem_key_free(ML_KEM_KEY *key)
 
 /* Serialise the public component of an ML-KEM key */
 int ossl_ml_kem_encode_public_key(uint8_t *out, size_t len,
-                                  const ML_KEM_KEY *key)
+    const ML_KEM_KEY *key)
 {
     if (!ossl_ml_kem_have_pubkey(key)
         || len != key->vinfo->pubkey_bytes)
@@ -1696,7 +2045,7 @@ int ossl_ml_kem_encode_public_key(uint8_t *out, size_t len,
 
 /* Serialise an ML-KEM private key */
 int ossl_ml_kem_encode_private_key(uint8_t *out, size_t len,
-                                   const ML_KEM_KEY *key)
+    const ML_KEM_KEY *key)
 {
     if (!ossl_ml_kem_have_prvkey(key)
         || len != key->vinfo->prvkey_bytes)
@@ -1706,7 +2055,7 @@ int ossl_ml_kem_encode_private_key(uint8_t *out, size_t len,
 }
 
 int ossl_ml_kem_encode_seed(uint8_t *out, size_t len,
-                            const ML_KEM_KEY *key)
+    const ML_KEM_KEY *key)
 {
     if (key == NULL || key->d == NULL || len != ML_KEM_SEED_BYTES)
         return 0;
@@ -1773,7 +2122,7 @@ int ossl_ml_kem_parse_public_key(const uint8_t *in, size_t len, ML_KEM_KEY *key)
 
 /* Parse input as a new private key */
 int ossl_ml_kem_parse_private_key(const uint8_t *in, size_t len,
-                                  ML_KEM_KEY *key)
+    ML_KEM_KEY *key)
 {
     EVP_MD_CTX *mdctx = NULL;
     const ML_KEM_VINFO *vinfo;
@@ -1824,7 +2173,8 @@ int ossl_ml_kem_genkey(uint8_t *pubenc, size_t publen, ML_KEM_KEY *key)
             return 0;
         key->d = key->z = NULL;
     } else if (RAND_priv_bytes_ex(key->libctx, seed, sizeof(seed),
-                                  key->vinfo->secbits) <= 0) {
+                   key->vinfo->secbits)
+        <= 0) {
         return 0;
     }
 
@@ -1861,9 +2211,9 @@ int ossl_ml_kem_genkey(uint8_t *pubenc, size_t publen, ML_KEM_KEY *key)
  * This is the deterministic version with randomness supplied externally.
  */
 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)
+    uint8_t *shared_secret, size_t slen,
+    const uint8_t *entropy, size_t elen,
+    const ML_KEM_KEY *key)
 {
     const ML_KEM_VINFO *vinfo;
     EVP_MD_CTX *mdctx;
@@ -1889,21 +2239,20 @@ int ossl_ml_kem_encap_seed(uint8_t *ctext, size_t clen,
      * each) vectors, that are never retained on return from this function.
      * We stack-allocate these.
      */
-#   define case_encap_seed(bits)                                            \
-    case EVP_PKEY_ML_KEM_##bits:                                            \
-        {                                                                   \
-            scalar tmp[2 * ML_KEM_##bits##_RANK];                           \
-                                                                            \
-            ret = encap(ctext, shared_secret, entropy, tmp, mdctx, key);    \
-            OPENSSL_cleanse((void *)tmp, sizeof(tmp));                      \
-            break;                                                          \
-        }
+#define case_encap_seed(bits)                                        \
+    case EVP_PKEY_ML_KEM_##bits: {                                   \
+        scalar tmp[2 * ML_KEM_##bits##_RANK];                        \
+                                                                     \
+        ret = encap(ctext, shared_secret, entropy, tmp, mdctx, key); \
+        OPENSSL_cleanse((void *)tmp, sizeof(tmp));                   \
+        break;                                                       \
+    }
     switch (vinfo->evp_type) {
-    case_encap_seed(512);
-    case_encap_seed(768);
-    case_encap_seed(1024);
+        case_encap_seed(512);
+        case_encap_seed(768);
+        case_encap_seed(1024);
     }
-#   undef case_encap_seed
+#undef case_encap_seed
 
     /* Declassify secret inputs and derived outputs before returning control */
     CONSTTIME_DECLASSIFY(entropy, elen);
@@ -1915,8 +2264,8 @@ int ossl_ml_kem_encap_seed(uint8_t *ctext, size_t clen,
 }
 
 int ossl_ml_kem_encap_rand(uint8_t *ctext, size_t clen,
-                           uint8_t *shared_secret, size_t slen,
-                           const ML_KEM_KEY *key)
+    uint8_t *shared_secret, size_t slen,
+    const ML_KEM_KEY *key)
 {
     uint8_t r[ML_KEM_RANDOM_BYTES];
 
@@ -1924,16 +2273,17 @@ int ossl_ml_kem_encap_rand(uint8_t *ctext, size_t clen,
         return 0;
 
     if (RAND_bytes_ex(key->libctx, r, ML_KEM_RANDOM_BYTES,
-                      key->vinfo->secbits) < 1)
+            key->vinfo->secbits)
+        < 1)
         return 0;
 
     return ossl_ml_kem_encap_seed(ctext, clen, shared_secret, slen,
-                                  r, sizeof(r), key);
+        r, sizeof(r), key);
 }
 
 int ossl_ml_kem_decap(uint8_t *shared_secret, size_t slen,
-                      const uint8_t *ctext, size_t clen,
-                      const ML_KEM_KEY *key)
+    const uint8_t *ctext, size_t clen,
+    const ML_KEM_KEY *key)
 {
     const ML_KEM_VINFO *vinfo;
     EVP_MD_CTX *mdctx;
@@ -1951,7 +2301,7 @@ int ossl_ml_kem_decap(uint8_t *shared_secret, size_t slen,
         || ctext == NULL || clen != vinfo->ctext_bytes
         || (mdctx = EVP_MD_CTX_new()) == NULL) {
         (void)RAND_bytes_ex(key->libctx, shared_secret,
-                            ML_KEM_SHARED_SECRET_BYTES, vinfo->secbits);
+            ML_KEM_SHARED_SECRET_BYTES, vinfo->secbits);
         return 0;
     }
 #if defined(OPENSSL_CONSTANT_TIME_VALIDATION)
@@ -1969,20 +2319,19 @@ int ossl_ml_kem_decap(uint8_t *shared_secret, size_t slen,
      * retained on return from this function.
      * We stack-allocate these.
      */
-#   define case_decap(bits)                                             \
-    case EVP_PKEY_ML_KEM_##bits:                                        \
-        {                                                               \
-            uint8_t cbuf[CTEXT_BYTES(bits)];                            \
-            scalar tmp[2 * ML_KEM_##bits##_RANK];                       \
-                                                                        \
-            ret = decap(shared_secret, ctext, cbuf, tmp, mdctx, key);   \
-            OPENSSL_cleanse((void *)tmp, sizeof(tmp));                  \
-            break;                                                      \
-        }
+#define case_decap(bits)                                          \
+    case EVP_PKEY_ML_KEM_##bits: {                                \
+        uint8_t cbuf[CTEXT_BYTES(bits)];                          \
+        scalar tmp[2 * ML_KEM_##bits##_RANK];                     \
+                                                                  \
+        ret = decap(shared_secret, ctext, cbuf, tmp, mdctx, key); \
+        OPENSSL_cleanse((void *)tmp, sizeof(tmp));                \
+        break;                                                    \
+    }
     switch (vinfo->evp_type) {
-    case_decap(512);
-    case_decap(768);
-    case_decap(1024);
+        case_decap(512);
+        case_decap(768);
+        case_decap(1024);
     }
 
     /* Declassify secret inputs and derived outputs before returning control */
@@ -1991,7 +2340,7 @@ int ossl_ml_kem_decap(uint8_t *shared_secret, size_t slen,
     EVP_MD_CTX_free(mdctx);
 
     return ret;
-#   undef case_decap
+#undef case_decap
 }
 
 int ossl_ml_kem_pubkey_cmp(const ML_KEM_KEY *key1, const ML_KEM_KEY *key2)
@@ -2008,5 +2357,5 @@ int ossl_ml_kem_pubkey_cmp(const ML_KEM_KEY *key1, const ML_KEM_KEY *key2)
      * No match if just one of the public keys is not available, otherwise both
      * are unavailable, and for now such keys are considered equal.
      */
-    return (ossl_ml_kem_have_pubkey(key1) ^ ossl_ml_kem_have_pubkey(key2));
+    return (!(ossl_ml_kem_have_pubkey(key1) ^ ossl_ml_kem_have_pubkey(key2)));
 }
diff --git a/crypto/modes/asm/aes-gcm-avx512.pl b/crypto/modes/asm/aes-gcm-avx512.pl
index 79ee59f9e07db..054672bb6b9bf 100644
--- a/crypto/modes/asm/aes-gcm-avx512.pl
+++ b/crypto/modes/asm/aes-gcm-avx512.pl
@@ -2592,7 +2592,7 @@ sub GHASH_16_ENCRYPT_N_GHASH_N {
     $code .= <<___;
         vpclmulqdq        \$0x01,@{[XWORD($GH1L)]},@{[XWORD($RED_POLY)]},@{[XWORD($RED_P1)]}
         vpslldq           \$8,@{[XWORD($RED_P1)]},@{[XWORD($RED_P1)]}                    # ; shift-L 2 DWs
-        vpxorq            @{[XWORD($RED_P1)]},@{[XWORD($GH1L)]},@{[XWORD($RED_P1)]}      # ; first phase of the reduct
+        vpxorq            @{[XWORD($RED_P1)]},@{[XWORD($GH1L)]},@{[XWORD($RED_P1)]}      # ; first phase of the reduction
 ___
   }
 
@@ -3222,7 +3222,7 @@ sub GHASH_16_ENCRYPT_16_PARALLEL {
     $code .= <<___;
         vpclmulqdq        \$0x01,@{[XWORD($GH1L)]},@{[XWORD($RED_POLY)]},@{[XWORD($RED_P1)]}
         vpslldq           \$8,@{[XWORD($RED_P1)]},@{[XWORD($RED_P1)]}                    # ; shift-L 2 DWs
-        vpxorq            @{[XWORD($RED_P1)]},@{[XWORD($GH1L)]},@{[XWORD($RED_P1)]}      # ; first phase of the reduct
+        vpxorq            @{[XWORD($RED_P1)]},@{[XWORD($GH1L)]},@{[XWORD($RED_P1)]}      # ; first phase of the reduction
 ___
   }
 
diff --git a/crypto/modes/asm/aes-gcm-ppc.pl b/crypto/modes/asm/aes-gcm-ppc.pl
index e8a215027e832..7355c31cc1297 100644
--- a/crypto/modes/asm/aes-gcm-ppc.pl
+++ b/crypto/modes/asm/aes-gcm-ppc.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/env perl
-# Copyright 2014-2022 The OpenSSL Project Authors. All Rights Reserved.
-# Copyright 2021- IBM Inc. All rights reserved
+# Copyright 2014-2026 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2025- IBM Corp. All rights reserved
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -8,7 +8,9 @@
 # https://www.openssl.org/source/license.html
 #
 #===================================================================================
-# Written by Danny Tsen <dtsen@us.ibm.com> for OpenSSL Project,
+# Accelerated AES-GCM stitched implementation for ppc64le.
+#
+# Written by Danny Tsen <dtsen@us.ibm.com>
 #
 # GHASH is based on the Karatsuba multiplication method.
 #
@@ -32,420 +34,519 @@
 # v31 - counter 1
 #
 # AES used,
-#     vs0 - vs14 for round keys
+#     vs0 - round key 0
 #     v15, v16, v17, v18, v19, v20, v21, v22 for 8 blocks (encrypted)
 #
 # This implementation uses stitched AES-GCM approach to improve overall performance.
 # AES is implemented with 8x blocks and GHASH is using 2 4x blocks.
 #
-# Current large block (16384 bytes) performance per second with 128 bit key --
-#
-#                        Encrypt  Decrypt
-# Power10[le] (3.5GHz)   5.32G    5.26G
-#
 # ===================================================================================
 #
+use strict;
+use warnings;
+
 # $output is the last argument if it looks like a file (it has an extension)
 # $flavour is the first argument if it doesn't look like a file
-$output = $#ARGV >= 0 && $ARGV[$#ARGV] =~ m|\.\w+$| ? pop : undef;
-$flavour = $#ARGV >= 0 && $ARGV[0] !~ m|\.| ? shift : undef;
-
-if ($flavour =~ /64/) {
-	$SIZE_T=8;
-	$LRSAVE=2*$SIZE_T;
-	$STU="stdu";
-	$POP="ld";
-	$PUSH="std";
-	$UCMP="cmpld";
-	$SHRI="srdi";
-} elsif ($flavour =~ /32/) {
-	$SIZE_T=4;
-	$LRSAVE=$SIZE_T;
-	$STU="stwu";
-	$POP="lwz";
-	$PUSH="stw";
-	$UCMP="cmplw";
-	$SHRI="srwi";
-} else { die "nonsense $flavour"; }
-
-$sp="r1";
-$FRAME=6*$SIZE_T+13*16;	# 13*16 is for v20-v31 offload
-
-$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
-( $xlate="${dir}ppc-xlate.pl" and -f $xlate ) or
-( $xlate="${dir}../../perlasm/ppc-xlate.pl" and -f $xlate) or
-die "can't locate ppc-xlate.pl";
-
-open STDOUT,"| $^X $xlate $flavour \"$output\""
-    or die "can't call $xlate: $!";
-
-$code=<<___;
-.machine        "any"
-.text
-
-# 4x loops
-# v15 - v18 - input states
-# vs1 - vs9 - round keys
-#
-.macro Loop_aes_middle4x
-	xxlor	19+32, 1, 1
-	xxlor	20+32, 2, 2
-	xxlor	21+32, 3, 3
-	xxlor	22+32, 4, 4
-
-	vcipher	15, 15, 19
-	vcipher	16, 16, 19
-	vcipher	17, 17, 19
-	vcipher	18, 18, 19
+my $output = $#ARGV >= 0 && $ARGV[$#ARGV] =~ m|\.\w+$| ? pop : undef;
+my $flavour = $#ARGV >= 0 && $ARGV[0] !~ m|\.| ? shift : undef;
 
-	vcipher	15, 15, 20
-	vcipher	16, 16, 20
-	vcipher	17, 17, 20
-	vcipher	18, 18, 20
-
-	vcipher	15, 15, 21
-	vcipher	16, 16, 21
-	vcipher	17, 17, 21
-	vcipher	18, 18, 21
+$output and open STDOUT,">$output";
 
-	vcipher	15, 15, 22
-	vcipher	16, 16, 22
-	vcipher	17, 17, 22
-	vcipher	18, 18, 22
-
-	xxlor	19+32, 5, 5
-	xxlor	20+32, 6, 6
-	xxlor	21+32, 7, 7
-	xxlor	22+32, 8, 8
+my $code.=<<___;
+.machine        "any"
+.text
 
-	vcipher	15, 15, 19
-	vcipher	16, 16, 19
-	vcipher	17, 17, 19
-	vcipher	18, 18, 19
+.macro SAVE_REGS
+	mflr 0
+	std 0, 16(1)
+	stdu 1,-512(1)
 
-	vcipher	15, 15, 20
-	vcipher	16, 16, 20
-	vcipher	17, 17, 20
-	vcipher	18, 18, 20
+	std	14, 112(1)
+	std	15, 120(1)
+	std	16, 128(1)
+	std	17, 136(1)
+	std	18, 144(1)
+	std	19, 152(1)
+	std	20, 160(1)
+	std	21, 168(1)
+	std	22, 176(1)
+	std	23, 184(1)
+	std	24, 192(1)
+
+	stxv	32+20, 256(1)
+	stxv	32+21, 256+16(1)
+	stxv	32+22, 256+32(1)
+	stxv	32+23, 256+48(1)
+	stxv	32+24, 256+64(1)
+	stxv	32+25, 256+80(1)
+	stxv	32+26, 256+96(1)
+	stxv	32+27, 256+112(1)
+	stxv	32+28, 256+128(1)
+	stxv	32+29, 256+144(1)
+	stxv	32+30, 256+160(1)
+	stxv	32+31, 256+176(1)
+.endm # SAVE_REGS
+
+.macro RESTORE_REGS
+	lxv	32+20, 256(1)
+	lxv	32+21, 256+16(1)
+	lxv	32+22, 256+32(1)
+	lxv	32+23, 256+48(1)
+	lxv	32+24, 256+64(1)
+	lxv	32+25, 256+80(1)
+	lxv	32+26, 256+96(1)
+	lxv	32+27, 256+112(1)
+	lxv	32+28, 256+128(1)
+	lxv	32+29, 256+144(1)
+	lxv	32+30, 256+160(1)
+	lxv	32+31, 256+176(1)
+
+	ld	14, 112(1)
+	ld	15, 120(1)
+	ld	16, 128(1)
+	ld	17, 136(1)
+	ld	18, 144(1)
+	ld	19, 152(1)
+	ld	20, 160(1)
+	ld	21, 168(1)
+	ld	22, 176(1)
+	ld	23, 184(1)
+	ld	24, 192(1)
+
+	addi    1, 1, 512
+	ld 0, 16(1)
+	mtlr 0
+.endm # RESTORE_REGS
 
-	vcipher	15, 15, 21
-	vcipher	16, 16, 21
-	vcipher	17, 17, 21
-	vcipher	18, 18, 21
-
-	vcipher	15, 15, 22
-	vcipher	16, 16, 22
-	vcipher	17, 17, 22
-	vcipher	18, 18, 22
-
-	xxlor	23+32, 9, 9
-	vcipher	15, 15, 23
-	vcipher	16, 16, 23
-	vcipher	17, 17, 23
-	vcipher	18, 18, 23
+# 4x loops
+.macro AES_CIPHER_4x r
+	vcipher	15, 15, \\r
+	vcipher	16, 16, \\r
+	vcipher	17, 17, \\r
+	vcipher	18, 18, \\r
 .endm
 
 # 8x loops
-# v15 - v22 - input states
-# vs1 - vs9 - round keys
-#
-.macro Loop_aes_middle8x
-	xxlor	23+32, 1, 1
-	xxlor	24+32, 2, 2
-	xxlor	25+32, 3, 3
-	xxlor	26+32, 4, 4
-
-	vcipher	15, 15, 23
-	vcipher	16, 16, 23
-	vcipher	17, 17, 23
-	vcipher	18, 18, 23
-	vcipher	19, 19, 23
-	vcipher	20, 20, 23
-	vcipher	21, 21, 23
-	vcipher	22, 22, 23
-
-	vcipher	15, 15, 24
-	vcipher	16, 16, 24
-	vcipher	17, 17, 24
-	vcipher	18, 18, 24
-	vcipher	19, 19, 24
-	vcipher	20, 20, 24
-	vcipher	21, 21, 24
-	vcipher	22, 22, 24
-
-	vcipher	15, 15, 25
-	vcipher	16, 16, 25
-	vcipher	17, 17, 25
-	vcipher	18, 18, 25
-	vcipher	19, 19, 25
-	vcipher	20, 20, 25
-	vcipher	21, 21, 25
-	vcipher	22, 22, 25
-
-	vcipher	15, 15, 26
-	vcipher	16, 16, 26
-	vcipher	17, 17, 26
-	vcipher	18, 18, 26
-	vcipher	19, 19, 26
-	vcipher	20, 20, 26
-	vcipher	21, 21, 26
-	vcipher	22, 22, 26
-
-	xxlor	23+32, 5, 5
-	xxlor	24+32, 6, 6
-	xxlor	25+32, 7, 7
-	xxlor	26+32, 8, 8
-
-	vcipher	15, 15, 23
-	vcipher	16, 16, 23
-	vcipher	17, 17, 23
-	vcipher	18, 18, 23
-	vcipher	19, 19, 23
-	vcipher	20, 20, 23
-	vcipher	21, 21, 23
-	vcipher	22, 22, 23
-
-	vcipher	15, 15, 24
-	vcipher	16, 16, 24
-	vcipher	17, 17, 24
-	vcipher	18, 18, 24
-	vcipher	19, 19, 24
-	vcipher	20, 20, 24
-	vcipher	21, 21, 24
-	vcipher	22, 22, 24
-
-	vcipher	15, 15, 25
-	vcipher	16, 16, 25
-	vcipher	17, 17, 25
-	vcipher	18, 18, 25
-	vcipher	19, 19, 25
-	vcipher	20, 20, 25
-	vcipher	21, 21, 25
-	vcipher	22, 22, 25
-
-	vcipher	15, 15, 26
-	vcipher	16, 16, 26
-	vcipher	17, 17, 26
-	vcipher	18, 18, 26
-	vcipher	19, 19, 26
-	vcipher	20, 20, 26
-	vcipher	21, 21, 26
-	vcipher	22, 22, 26
-
-	xxlor	23+32, 9, 9
-	vcipher	15, 15, 23
-	vcipher	16, 16, 23
-	vcipher	17, 17, 23
-	vcipher	18, 18, 23
-	vcipher	19, 19, 23
-	vcipher	20, 20, 23
-	vcipher	21, 21, 23
-	vcipher	22, 22, 23
+.macro AES_CIPHER_8x r
+	vcipher	15, 15, \\r
+	vcipher	16, 16, \\r
+	vcipher	17, 17, \\r
+	vcipher	18, 18, \\r
+	vcipher	19, 19, \\r
+	vcipher	20, 20, \\r
+	vcipher	21, 21, \\r
+	vcipher	22, 22, \\r
+.endm
+
+.macro LOOP_8AES_STATE
+	AES_CIPHER_8x 23
+	AES_CIPHER_8x 24
+	AES_CIPHER_8x 25
+	AES_CIPHER_8x 26
+	AES_CIPHER_8x 27
+	AES_CIPHER_8x 28
+	AES_CIPHER_8x 29
+	AES_CIPHER_8x 1
 .endm
 
 #
-# Compute 4x hash values based on Karatsuba method.
+# PPC_GFMUL128_8x: Compute hash values of 8 blocks based on Karatsuba method.
 #
-ppc_aes_gcm_ghash:
-	vxor		15, 15, 0
-
-	xxlxor		29, 29, 29
+# S1 should xor with the previous digest
+#
+# Xi = v0
+# H Poly = v2
+# Hash keys = v3 - v14
+# vs10: vpermxor vector
+# Scratch: v23 - v29
+#
+.macro PPC_GFMUL128_8x
 
-	vpmsumd		23, 12, 15		# H4.L * X.L
-	vpmsumd		24, 9, 16
-	vpmsumd		25, 6, 17
-	vpmsumd		26, 3, 18
+	vpmsumd	23, 12, 15		# H4.L * X.L
+	vpmsumd	24, 9, 16
+	vpmsumd	25, 6, 17
+	vpmsumd	26, 3, 18
 
-	vxor		23, 23, 24
-	vxor		23, 23, 25
-	vxor		23, 23, 26		# L
+	vxor	23, 23, 24
+	vxor	23, 23, 25
+	vxor	23, 23, 26		# L
 
-	vpmsumd		24, 13, 15		# H4.L * X.H + H4.H * X.L
-	vpmsumd		25, 10, 16		# H3.L * X1.H + H3.H * X1.L
-	vpmsumd		26, 7, 17
-	vpmsumd		27, 4, 18
+	vpmsumd	27, 13, 15		# H4.L * X.H + H4.H * X.L
+	vpmsumd	28, 10, 16		# H3.L * X1.H + H3.H * X1.L
+	vpmsumd	25, 7, 17
+	vpmsumd	26, 4, 18
 
-	vxor		24, 24, 25
-	vxor		24, 24, 26
-	vxor		24, 24, 27		# M
+	vxor	24, 27, 28
+	vxor	24, 24, 25
+	vxor	24, 24, 26		# M
 
-	# sum hash and reduction with H Poly
-	vpmsumd		28, 23, 2		# reduction
+	vpmsumd	26, 14, 15		# H4.H * X.H
+	vpmsumd	27, 11, 16
+	vpmsumd	28, 8, 17
+	vpmsumd	29, 5, 18
 
-	xxlor		29+32, 29, 29
-	vsldoi		26, 24, 29, 8		# mL
-	vsldoi		29, 29, 24, 8		# mH
-	vxor		23, 23, 26		# mL + L
+	vxor	26, 26, 27
+	vxor	26, 26, 28
+	vxor	26, 26, 29
 
-	vsldoi		23, 23, 23, 8		# swap
-	vxor		23, 23, 28
+	# sum hash and reduction with H Poly
+	vpmsumd	28, 23, 2		# reduction
 
-	vpmsumd		24, 14, 15		# H4.H * X.H
-	vpmsumd		25, 11, 16
-	vpmsumd		26, 8, 17
-	vpmsumd		27, 5, 18
+	vxor	1, 1, 1
+	vsldoi	25, 24, 1, 8		# mL
+	vsldoi	1, 1, 24, 8		# mH
+	vxor	23, 23, 25		# mL + L
 
-	vxor		24, 24, 25
-	vxor		24, 24, 26
-	vxor		24, 24, 27
+	# This performs swap and xor like,
+	#   vsldoi	23, 23, 23, 8		# swap
+	#   vxor	23, 23, 28
+	xxlor	32+29, 10, 10
+	vpermxor 23, 23, 28, 29
 
-	vxor		24, 24, 29
+	vxor	24, 26, 1		# H
 
 	# sum hash and reduction with H Poly
-	vsldoi		27, 23, 23, 8		# swap
-	vpmsumd		23, 23, 2
-	vxor		27, 27, 24
-	vxor		23, 23, 27
-
-	xxlor		32, 23+32, 23+32		# update hash
+	#
+	#  vsldoi 25, 23, 23, 8		# swap
+	#  vpmsumd 23, 23, 2
+	#  vxor	27, 25, 24
+	#
+	vpermxor 27, 23, 24, 29
+	vpmsumd	23, 23, 2
+	vxor	0, 23, 27		# Digest of 4 blocks
 
-	blr
+	vxor	19, 19, 0
 
-#
-# Combine two 4x ghash
-# v15 - v22 - input blocks
-#
-.macro ppc_aes_gcm_ghash2_4x
-	# first 4x hash
-	vxor		15, 15, 0		# Xi + X
+	# Compute digest for the next 4 blocks
+	vpmsumd	24, 9, 20
+	vpmsumd	25, 6, 21
+	vpmsumd	26, 3, 22
+	vpmsumd	23, 12, 19		# H4.L * X.L
 
-	xxlxor		29, 29, 29
+	vxor	23, 23, 24
+	vxor	23, 23, 25
+	vxor	23, 23, 26		# L
 
-	vpmsumd		23, 12, 15		# H4.L * X.L
-	vpmsumd		24, 9, 16
-	vpmsumd		25, 6, 17
-	vpmsumd		26, 3, 18
+	vpmsumd	27, 13, 19		# H4.L * X.H + H4.H * X.L
+	vpmsumd	28, 10, 20		# H3.L * X1.H + H3.H * X1.L
+	vpmsumd	25, 7, 21
+	vpmsumd	26, 4, 22
 
-	vxor		23, 23, 24
-	vxor		23, 23, 25
-	vxor		23, 23, 26		# L
+	vxor	24, 27, 28
+	vxor	24, 24, 25
+	vxor	24, 24, 26		# M
 
-	vpmsumd		24, 13, 15		# H4.L * X.H + H4.H * X.L
-	vpmsumd		25, 10, 16		# H3.L * X1.H + H3.H * X1.L
-	vpmsumd		26, 7, 17
-	vpmsumd		27, 4, 18
+	vpmsumd	26, 14, 19		# H4.H * X.H
+	vpmsumd	27, 11, 20
+	vpmsumd	28, 8, 21
+	vpmsumd	29, 5, 22
 
-	vxor		24, 24, 25
-	vxor		24, 24, 26
+	vxor	26, 26, 27
+	vxor	26, 26, 28
+	vxor	26, 26, 29
 
 	# sum hash and reduction with H Poly
-	vpmsumd		28, 23, 2		# reduction
+	vpmsumd	28, 23, 2		# reduction
 
-	xxlor		29+32, 29, 29
+	vxor	1, 1, 1
+	vsldoi	25, 24, 1, 8		# mL
+	vsldoi	1, 1, 24, 8		# mH
+	vxor	23, 23, 25		# mL + L
 
-	vxor		24, 24, 27		# M
-	vsldoi		26, 24, 29, 8		# mL
-	vsldoi		29, 29, 24, 8		# mH
-	vxor		23, 23, 26		# mL + L
+	# This performs swap and xor like,
+	#   vsldoi	23, 23, 23, 8		# swap
+	#   vxor	23, 23, 28
+	xxlor	32+29, 10, 10
+	vpermxor 23, 23, 28, 29
 
-	vsldoi		23, 23, 23, 8		# swap
-	vxor		23, 23, 28
+	vxor	24, 26, 1		# H
 
-	vpmsumd		24, 14, 15		# H4.H * X.H
-	vpmsumd		25, 11, 16
-	vpmsumd		26, 8, 17
-	vpmsumd		27, 5, 18
+	# sum hash and reduction with H Poly
+	#
+	#  vsldoi 25, 23, 23, 8		# swap
+	#  vpmsumd 23, 23, 2
+	#  vxor	27, 25, 24
+	#
+	vpermxor 27, 23, 24, 29
+	vpmsumd	23, 23, 2
+	vxor	0, 23, 27		# Digest of 8 blocks
+.endm
 
-	vxor		24, 24, 25
-	vxor		24, 24, 26
-	vxor		24, 24, 27		# H
+#
+# Compute update single ghash
+# vs10: vpermxor vector
+# scratch: v1, v22..v27
+#
+.macro PPC_GHASH1x H S1
 
-	vxor		24, 24, 29		# H + mH
+	vxor	1, 1, 1
 
-	# sum hash and reduction with H Poly
-	vsldoi		27, 23, 23, 8		# swap
-	vpmsumd		23, 23, 2
-	vxor		27, 27, 24
-	vxor		27, 23, 27		# 1st Xi
-
-	# 2nd 4x hash
-	vpmsumd		24, 9, 20
-	vpmsumd		25, 6, 21
-	vpmsumd		26, 3, 22
-	vxor		19, 19, 27		# Xi + X
-	vpmsumd		23, 12, 19		# H4.L * X.L
-
-	vxor		23, 23, 24
-	vxor		23, 23, 25
-	vxor		23, 23, 26		# L
-
-	vpmsumd		24, 13, 19		# H4.L * X.H + H4.H * X.L
-	vpmsumd		25, 10, 20		# H3.L * X1.H + H3.H * X1.L
-	vpmsumd		26, 7, 21
-	vpmsumd		27, 4, 22
-
-	vxor		24, 24, 25
-	vxor		24, 24, 26
+	vpmsumd	22, 3, \\S1		# L
+	vpmsumd	23, 4, \\S1		# M
+	vpmsumd	24, 5, \\S1		# H
 
-	# sum hash and reduction with H Poly
-	vpmsumd		28, 23, 2		# reduction
+	vpmsumd	27, 22, 2		# reduction
 
-	xxlor		29+32, 29, 29
+	vsldoi	25, 23, 1, 8		# mL
+	vsldoi	26, 1, 23, 8		# mH
+	vxor	22, 22, 25		# LL + LL
+	vxor	24, 24, 26		# HH + HH
 
-	vxor		24, 24, 27		# M
-	vsldoi		26, 24, 29, 8		# mL
-	vsldoi		29, 29, 24, 8		# mH
-	vxor		23, 23, 26		# mL + L
+	xxlor	32+25, 10, 10
+	vpermxor 22, 22, 27, 25
 
-	vsldoi		23, 23, 23, 8		# swap
-	vxor		23, 23, 28
+	#  vsldoi 23, 22, 22, 8		# swap
+	#  vpmsumd 22, 22, 2		# reduction
+	#  vxor	23, 23, 24
+	vpermxor 23, 22, 24, 25
+	vpmsumd	22, 22, 2		# reduction
 
-	vpmsumd		24, 14, 19		# H4.H * X.H
-	vpmsumd		25, 11, 20
-	vpmsumd		26, 8, 21
-	vpmsumd		27, 5, 22
+	vxor	\\H, 22, 23
+.endm
 
-	vxor		24, 24, 25
-	vxor		24, 24, 26
-	vxor		24, 24, 27		# H
+#
+# LOAD_HASH_TABLE
+# Xi = v0
+# H Poly = v2
+# Hash keys = v3 - v14
+#
+.macro LOAD_HASH_TABLE
+	# Load Xi
+	lxvb16x	32, 0, 8	# load Xi
 
-	vxor		24, 24, 29		# H + mH
+	vxor	1, 1, 1
 
-	# sum hash and reduction with H Poly
-	vsldoi		27, 23, 23, 8		# swap
-	vpmsumd		23, 23, 2
-	vxor		27, 27, 24
-	vxor		23, 23, 27
+	li	10, 32
+	lxvd2x	2+32, 10, 8	# H Poli
+
+	# load Hash - h^4, h^3, h^2, h
+	li	10, 64
+	lxvd2x	4+32, 10, 8	# H
+	vsldoi	3, 1, 4, 8	# l
+	vsldoi	5, 4, 1, 8	# h
+	li	10, 112
+	lxvd2x	7+32, 10, 8	# H^2
+	vsldoi	6, 1, 7, 8	# l
+	vsldoi	8, 7, 1, 8	# h
+	li	10, 160
+	lxvd2x	10+32, 10, 8	# H^3
+	vsldoi	9, 1, 10, 8	# l
+	vsldoi	11, 10, 1, 8	# h
+	li	10, 208
+	lxvd2x	13+32, 10, 8	# H^4
+	vsldoi	12, 1, 13, 8	# l
+	vsldoi	14, 13, 1, 8	# h
+.endm
 
-	xxlor		32, 23+32, 23+32		# update hash
+.macro PROCESS_8X_AES_STATES
+	vcipherlast     15, 15, 1
+	vcipherlast     16, 16, 1
+	vcipherlast     17, 17, 1
+	vcipherlast     18, 18, 1
+	vcipherlast     19, 19, 1
+	vcipherlast     20, 20, 1
+	vcipherlast     21, 21, 1
+	vcipherlast     22, 22, 1
+
+	lxvb16x	32+23, 0, 14	# load block
+	lxvb16x	32+24, 15, 14	# load block
+	lxvb16x	32+25, 16, 14	# load block
+	lxvb16x	32+26, 17, 14	# load block
+	lxvb16x	32+27, 18, 14	# load block
+	lxvb16x	32+28, 19, 14	# load block
+	lxvb16x	32+29, 20, 14	# load block
+	lxvb16x	32+30, 21, 14	# load block
+	addi	14, 14, 128
+
+	vxor	15, 15, 23
+	vxor	16, 16, 24
+	vxor	17, 17, 25
+	vxor	18, 18, 26
+	vxor	19, 19, 27
+	vxor	20, 20, 28
+	vxor	21, 21, 29
+	vxor	22, 22, 30
+
+	stxvb16x 47, 0, 9	# store output
+	stxvb16x 48, 15, 9	# store output
+	stxvb16x 49, 16, 9	# store output
+	stxvb16x 50, 17, 9	# store output
+	stxvb16x 51, 18, 9	# store output
+	stxvb16x 52, 19, 9	# store output
+	stxvb16x 53, 20, 9	# store output
+	stxvb16x 54, 21, 9	# store output
+	addi	9, 9, 128
+.endm
 
+.macro COMPUTE_STATES
+	xxlor	32+15, 9, 9		# last state
+	vadduwm 15, 15, 31		# state + counter
+	vadduwm 16, 15, 31
+	vadduwm 17, 16, 31
+	vadduwm 18, 17, 31
+	vadduwm 19, 18, 31
+	vadduwm 20, 19, 31
+	vadduwm 21, 20, 31
+	vadduwm 22, 21, 31
+	xxlor	9, 32+22, 32+22		# save last state
+
+        xxlxor	32+15, 32+15, 0		# IV + round key - add round key 0
+	xxlxor	32+16, 32+16, 0
+	xxlxor	32+17, 32+17, 0
+	xxlxor	32+18, 32+18, 0
+	xxlxor	32+19, 32+19, 0
+	xxlxor	32+20, 32+20, 0
+	xxlxor	32+21, 32+21, 0
+	xxlxor	32+22, 32+22, 0
 .endm
 
+################################################################################
+# Compute AES and ghash one block at a time.
+# r23: AES rounds
+# v30: current IV
+# vs0: roundkey 0
 #
-# Compute update single hash
-#
-.macro ppc_update_hash_1x
-	vxor		28, 28, 0
+################################################################################
+.align 4
+aes_gcm_crypt_1x:
 
-	vxor		19, 19, 19
+	cmpdi	5, 16
+	bge	__More_1x
+	blr
+__More_1x:
+	li      10, 16
+	divdu   12, 5, 10
 
-	vpmsumd		22, 3, 28		# L
-	vpmsumd		23, 4, 28		# M
-	vpmsumd		24, 5, 28		# H
+	xxlxor	32+15, 32+30, 0
 
-	vpmsumd		27, 22, 2		# reduction
+	# Pre-load 8 AES rounds to scratch vectors.
+	lxv	32+16, 16(6)		# round key 1
+	lxv	32+17, 32(6)		# round key 2
+	lxv	32+18, 48(6)		# round key 3
+	lxv	32+19, 64(6)		# round key 4
+	lxv	32+20, 80(6)		# round key 5
+	lxv	32+21, 96(6)		# round key 6
+	lxv	32+28, 112(6)		# round key 7
+	lxv	32+29, 128(6)		# round key 8
 
-	vsldoi		25, 23, 19, 8		# mL
-	vsldoi		26, 19, 23, 8		# mH
-	vxor		22, 22, 25		# LL + LL
-	vxor		24, 24, 26		# HH + HH
+	lwz	23, 240(6)	# n rounds
+	addi	22, 23, -9	# remaining AES rounds
 
-	vsldoi		22, 22, 22, 8		# swap
-	vxor		22, 22, 27
+	cmpdi	12, 0
+	bgt	__Loop_1x
+	blr
+
+__Loop_1x:
+	mtctr	22
+	addi	10, 6, 144
+	vcipher	15, 15, 16
+	vcipher	15, 15, 17
+	vcipher	15, 15, 18
+	vcipher	15, 15, 19
+	vcipher	15, 15, 20
+	vcipher	15, 15, 21
+	vcipher	15, 15, 28
+	vcipher	15, 15, 29
 
-	vsldoi		20, 22, 22, 8		# swap
-	vpmsumd		22, 22, 2		# reduction
-	vxor		20, 20, 24
-	vxor		22, 22, 20
+__Loop_aes_1state:
+	lxv	32+1, 0(10)
+	vcipher	15, 15, 1
+	addi	10, 10, 16
+	bdnz	__Loop_aes_1state
+	lxv	32+1, 0(10)		# last round key
+	lxvb16x 11, 0, 14		# load input block
+	vcipherlast 15, 15, 1
 
-	vmr		0, 22			# update hash
+	xxlxor	32+15, 32+15, 11
+	stxvb16x 32+15, 0, 9	# store output
+	addi	14, 14, 16
+	addi	9, 9, 16
 
-.endm
+	cmpdi	24, 0	# decrypt?
+	bne	__Encrypt_1x
+	xxlor	15+32, 11, 11
+__Encrypt_1x:
+	vxor	15, 15, 0
+	PPC_GHASH1x 0, 15
+
+	addi	5, 5, -16
+	addi	11, 11, 16
 
+	vadduwm 30, 30, 31		# IV + counter
+	xxlxor	32+15, 32+30, 0
+	addi	12, 12, -1
+	cmpdi	12, 0
+	bgt	__Loop_1x
+
+	stxvb16x 32+0, 0, 8		# update Xi
+	blr
+.size   aes_gcm_crypt_1x,.-aes_gcm_crypt_1x
+
+################################################################################
+# Process a normal partial block when we come here.
+#  Compute partial mask, Load and store partial block to stack.
+#  Compute AES state.
+#   Compute ghash.
 #
+################################################################################
+.align 4
+__Process_partial:
+
+	# create partial mask
+	vspltisb 16, -1
+	li	12, 16
+	sub	12, 12, 5
+	sldi	12, 12, 3
+	mtvsrdd	32+17, 0, 12
+	vslo	16, 16, 17		# partial block mask
+
+	lxvb16x 11, 0, 14		# load partial block
+	xxland	11, 11, 32+16
+
+	# AES crypt partial
+	xxlxor	32+15, 32+30, 0
+	lwz	23, 240(6)		# n rounds
+	addi	22, 23, -1		# loop - 1
+	mtctr	22
+	addi	10, 6, 16
+
+__Loop_aes_pstate:
+	lxv	32+1, 0(10)
+	vcipher	15, 15, 1
+	addi	10, 10, 16
+	bdnz	__Loop_aes_pstate
+	lxv	32+1, 0(10)		# last round key
+	vcipherlast 15, 15, 1
+
+	xxlxor	32+15, 32+15, 11
+	vand	15, 15, 16
+
+	# AES crypt output v15
+	# Write partial
+	li	10, 224
+	stxvb16x 15+32, 10, 1		# write v15 to stack
+	addi	10, 1, 223
+	addi	12, 9, -1
+        mtctr	5			# partial block len
+__Write_partial:
+        lbzu	22, 1(10)
+	stbu	22, 1(12)
+        bdnz	__Write_partial
+
+	cmpdi	24, 0			# decrypt?
+	bne	__Encrypt_partial
+	xxlor	32+15, 11, 11		# decrypt using the input block
+__Encrypt_partial:
+	vxor	15, 15, 0		# ^ previous hash
+	PPC_GHASH1x 0, 15
+	li	5, 0			# done last byte
+	stxvb16x 32+0, 0, 8		# Update X1
+	blr
+.size   __Process_partial,.-__Process_partial
+
+################################################################################
 # ppc_aes_gcm_encrypt (const void *inp, void *out, size_t len,
-#               const AES_KEY *key, unsigned char iv[16],
-#               void *Xip);
+#               const char *rk, unsigned char iv[16], void *Xip);
 #
 #    r3 - inp
 #    r4 - out
@@ -454,159 +555,84 @@
 #    r7 - iv
 #    r8 - Xi, HPoli, hash keys
 #
+#    rounds is at offset 240 in rk
+#    Xi is at 0 in gcm_table (Xip).
+#
+################################################################################
 .global ppc_aes_gcm_encrypt
 .align 5
 ppc_aes_gcm_encrypt:
-_ppc_aes_gcm_encrypt:
 
-	stdu 1,-512(1)
-	mflr 0
-
-	std	14,112(1)
-	std	15,120(1)
-	std	16,128(1)
-	std	17,136(1)
-	std	18,144(1)
-	std	19,152(1)
-	std	20,160(1)
-	std	21,168(1)
-	li	9, 256
-	stvx	20, 9, 1
-	addi	9, 9, 16
-	stvx	21, 9, 1
-	addi	9, 9, 16
-	stvx	22, 9, 1
-	addi	9, 9, 16
-	stvx	23, 9, 1
-	addi	9, 9, 16
-	stvx	24, 9, 1
-	addi	9, 9, 16
-	stvx	25, 9, 1
-	addi	9, 9, 16
-	stvx	26, 9, 1
-	addi	9, 9, 16
-	stvx	27, 9, 1
-	addi	9, 9, 16
-	stvx	28, 9, 1
-	addi	9, 9, 16
-	stvx	29, 9, 1
-	addi	9, 9, 16
-	stvx	30, 9, 1
-	addi	9, 9, 16
-	stvx	31, 9, 1
-	std	0, 528(1)
-
-	# Load Xi
-	lxvb16x	32, 0, 8	# load Xi
-
-	# load Hash - h^4, h^3, h^2, h
-	li	10, 32
-	lxvd2x	2+32, 10, 8	# H Poli
-	li	10, 48
-	lxvd2x	3+32, 10, 8	# Hl
-	li	10, 64
-	lxvd2x	4+32, 10, 8	# H
-	li	10, 80
-	lxvd2x	5+32, 10, 8	# Hh
-
-	li	10, 96
-	lxvd2x	6+32, 10, 8	# H^2l
-	li	10, 112
-	lxvd2x	7+32, 10, 8	# H^2
-	li	10, 128
-	lxvd2x	8+32, 10, 8	# H^2h
-
-	li	10, 144
-	lxvd2x	9+32, 10, 8	# H^3l
-	li	10, 160
-	lxvd2x	10+32, 10, 8	# H^3
-	li	10, 176
-	lxvd2x	11+32, 10, 8	# H^3h
-
-	li	10, 192
-	lxvd2x	12+32, 10, 8	# H^4l
-	li	10, 208
-	lxvd2x	13+32, 10, 8	# H^4
-	li	10, 224
-	lxvd2x	14+32, 10, 8	# H^4h
+	SAVE_REGS
+	LOAD_HASH_TABLE
 
 	# initialize ICB: GHASH( IV ), IV - r7
 	lxvb16x	30+32, 0, 7	# load IV  - v30
 
-	mr	12, 5		# length
-	li	11, 0		# block index
+	mr	14, 3
+	mr	9, 4
 
 	# counter 1
 	vxor	31, 31, 31
 	vspltisb 22, 1
 	vsldoi	31, 31, 22,1	# counter 1
 
-	# load round key to VSR
-	lxv	0, 0(6)
-	lxv	1, 0x10(6)
-	lxv	2, 0x20(6)
-	lxv	3, 0x30(6)
-	lxv	4, 0x40(6)
-	lxv	5, 0x50(6)
-	lxv	6, 0x60(6)
-	lxv	7, 0x70(6)
-	lxv	8, 0x80(6)
-	lxv	9, 0x90(6)
-	lxv	10, 0xa0(6)
+	addis	11, 2, permx\@toc\@ha
+	addi	11, 11, permx\@toc\@l
+	lxv	10, 0(11)	# vs10: vpermxor vector
+	li	11, 0
 
-	# load rounds - 10 (128), 12 (192), 14 (256)
-	lwz	9,240(6)
+	lxv	0, 0(6)			# round key 0
 
 	#
-	# vxor	state, state, w # addroundkey
-	xxlor	32+29, 0, 0
-	vxor	15, 30, 29	# IV + round key - add round key 0
-
-	cmpdi	9, 10
-	beq	Loop_aes_gcm_8x
-
-	# load 2 more round keys (v11, v12)
-	lxv	11, 0xb0(6)
-	lxv	12, 0xc0(6)
-
-	cmpdi	9, 12
-	beq	Loop_aes_gcm_8x
-
-	# load 2 more round keys (v11, v12, v13, v14)
-	lxv	13, 0xd0(6)
-	lxv	14, 0xe0(6)
-	cmpdi	9, 14
-	beq	Loop_aes_gcm_8x
-
-	b	aes_gcm_out
+	# Process different blocks
+	#
+	cmpdi	5, 128
+	blt	__Process_more_enc
+
+	# load 9 round keys
+	lxv	32+23, 16(6)		# round key 1
+	lxv	32+24, 32(6)		# round key 2
+	lxv	32+25, 48(6)		# round key 3
+	lxv	32+26, 64(6)		# round key 4
+	lxv	32+27, 80(6)		# round key 5
+	lxv	32+28, 96(6)		# round key 6
+	lxv	32+29, 112(6)		# round key 7
+	lxv	32+1, 128(6)		# round key 8
 
-.align 5
-Loop_aes_gcm_8x:
-	mr	14, 3
-	mr	9, 4
+	# load rounds - 10 (128), 12 (192), 14 (256)
+	lwz	23, 240(6)		# n rounds
 
-	# n blocks
+__Process_encrypt:
+#
+# Process 8x AES/GCM blocks
+#
+__Process_8x_enc:
+	# 8x blocks
 	li	10, 128
-	divdu	10, 5, 10	# n 128 bytes-blocks
-	cmpdi	10, 0
-	beq	Loop_last_block
-
-	vaddudm	30, 30, 31	# IV + counter
-	vxor	16, 30, 29
-	vaddudm	30, 30, 31
-	vxor	17, 30, 29
-	vaddudm	30, 30, 31
-	vxor	18, 30, 29
-	vaddudm	30, 30, 31
-	vxor	19, 30, 29
-	vaddudm	30, 30, 31
-	vxor	20, 30, 29
-	vaddudm	30, 30, 31
-	vxor	21, 30, 29
-	vaddudm	30, 30, 31
-	vxor	22, 30, 29
-
-	mtctr	10
+	divdu	12, 5, 10	# n 128 bytes-blocks
+
+	addi	12, 12, -1	# loop - 1
+
+	vmr	15, 30		# first state: IV
+	vadduwm	16, 15, 31	# state + counter
+	vadduwm	17, 16, 31
+	vadduwm	18, 17, 31
+	vadduwm	19, 18, 31
+	vadduwm	20, 19, 31
+	vadduwm	21, 20, 31
+	vadduwm	22, 21, 31
+	xxlor	9, 32+22, 32+22	# save last state
+
+	# vxor  state, state, w # addroundkey
+	xxlxor	32+15, 32+15, 0      # IV + round key - add round key 0
+	xxlxor	32+16, 32+16, 0
+	xxlxor	32+17, 32+17, 0
+	xxlxor	32+18, 32+18, 0
+	xxlxor	32+19, 32+19, 0
+	xxlxor	32+20, 32+20, 0
+	xxlxor	32+21, 32+21, 0
+	xxlxor	32+22, 32+22, 0
 
 	li	15, 16
 	li	16, 32
@@ -616,523 +642,184 @@
 	li	20, 96
 	li	21, 112
 
-	lwz	10, 240(6)
-
-Loop_8x_block:
-
-	lxvb16x		15, 0, 14	# load block
-	lxvb16x		16, 15, 14	# load block
-	lxvb16x		17, 16, 14	# load block
-	lxvb16x		18, 17, 14	# load block
-	lxvb16x		19, 18, 14	# load block
-	lxvb16x		20, 19, 14	# load block
-	lxvb16x		21, 20, 14	# load block
-	lxvb16x		22, 21, 14	# load block
-	addi		14, 14, 128
-
-	Loop_aes_middle8x
-
-	xxlor	23+32, 10, 10
-
-	cmpdi	10, 10
-	beq	Do_next_ghash
-
-	# 192 bits
-	xxlor	24+32, 11, 11
-
-	vcipher	15, 15, 23
-	vcipher	16, 16, 23
-	vcipher	17, 17, 23
-	vcipher	18, 18, 23
-	vcipher	19, 19, 23
-	vcipher	20, 20, 23
-	vcipher	21, 21, 23
-	vcipher	22, 22, 23
-
-	vcipher	15, 15, 24
-	vcipher	16, 16, 24
-	vcipher	17, 17, 24
-	vcipher	18, 18, 24
-	vcipher	19, 19, 24
-	vcipher	20, 20, 24
-	vcipher	21, 21, 24
-	vcipher	22, 22, 24
-
-	xxlor	23+32, 12, 12
-
-	cmpdi	10, 12
-	beq	Do_next_ghash
-
-	# 256 bits
-	xxlor	24+32, 13, 13
-
-	vcipher	15, 15, 23
-	vcipher	16, 16, 23
-	vcipher	17, 17, 23
-	vcipher	18, 18, 23
-	vcipher	19, 19, 23
-	vcipher	20, 20, 23
-	vcipher	21, 21, 23
-	vcipher	22, 22, 23
-
-	vcipher	15, 15, 24
-	vcipher	16, 16, 24
-	vcipher	17, 17, 24
-	vcipher	18, 18, 24
-	vcipher	19, 19, 24
-	vcipher	20, 20, 24
-	vcipher	21, 21, 24
-	vcipher	22, 22, 24
-
-	xxlor	23+32, 14, 14
-
-	cmpdi	10, 14
-	beq	Do_next_ghash
-	b	aes_gcm_out
-
-Do_next_ghash:
-
 	#
-	# last round
-	vcipherlast     15, 15, 23
-	vcipherlast     16, 16, 23
-
-	xxlxor		47, 47, 15
-	stxvb16x        47, 0, 9	# store output
-	xxlxor		48, 48, 16
-	stxvb16x        48, 15, 9	# store output
-
-	vcipherlast     17, 17, 23
-	vcipherlast     18, 18, 23
+	# Pre-compute first 8 AES state and leave 1/3/5 more rounds
+	# for the loop.
+	#
+	addi	22, 23, -9		# process 8 keys
+	mtctr	22			# AES key loop
+	addi	10, 6, 144
 
-	xxlxor		49, 49, 17
-	stxvb16x        49, 16, 9	# store output
-	xxlxor		50, 50, 18
-	stxvb16x        50, 17, 9	# store output
+	LOOP_8AES_STATE			# process 8 AES keys
 
-	vcipherlast     19, 19, 23
-	vcipherlast     20, 20, 23
+__PreLoop_aes_state:
+	lxv	32+1, 0(10)		# round key
+	AES_CIPHER_8x 1
+	addi	10, 10, 16
+	bdnz	__PreLoop_aes_state
+	lxv	32+1, 0(10)		# last round key (v1)
 
-	xxlxor		51, 51, 19
-	stxvb16x        51, 18, 9	# store output
-	xxlxor		52, 52, 20
-	stxvb16x        52, 19, 9	# store output
+	cmpdi	12, 0			# Only one loop (8 block)
+	beq	__Finish_ghash
 
-	vcipherlast     21, 21, 23
-	vcipherlast     22, 22, 23
+#
+# Loop 8x blocks and compute ghash
+#
+__Loop_8x_block_enc:
+	PROCESS_8X_AES_STATES
 
-	xxlxor		53, 53, 21
-	stxvb16x        53, 20, 9	# store output
-	xxlxor		54, 54, 22
-	stxvb16x        54, 21, 9	# store output
+	# Compute ghash here
+	vxor	15, 15, 0
+	PPC_GFMUL128_8x
 
-	addi		9, 9, 128
+	COMPUTE_STATES
 
-	# ghash here
-	ppc_aes_gcm_ghash2_4x
-
-	xxlor	27+32, 0, 0
-	vaddudm 30, 30, 31		# IV + counter
-	vmr	29, 30
-	vxor    15, 30, 27		# add round key
-	vaddudm 30, 30, 31
-	vxor    16, 30, 27
-	vaddudm 30, 30, 31
-	vxor    17, 30, 27
-	vaddudm 30, 30, 31
-	vxor    18, 30, 27
-	vaddudm 30, 30, 31
-	vxor    19, 30, 27
-	vaddudm 30, 30, 31
-	vxor    20, 30, 27
-	vaddudm 30, 30, 31
-	vxor    21, 30, 27
-	vaddudm 30, 30, 31
-	vxor    22, 30, 27
-
-	addi    12, 12, -128
+	addi    5, 5, -128
 	addi    11, 11, 128
 
-	bdnz	Loop_8x_block
-
-	vmr	30, 29
-
-Loop_last_block:
-	cmpdi   12, 0
-	beq     aes_gcm_out
-
-	# loop last few blocks
-	li      10, 16
-	divdu   10, 12, 10
-
-	mtctr   10
-
-	lwz	10, 240(6)
-
-	cmpdi   12, 16
-	blt     Final_block
-
-.macro Loop_aes_middle_1x
-	xxlor	19+32, 1, 1
-	xxlor	20+32, 2, 2
-	xxlor	21+32, 3, 3
-	xxlor	22+32, 4, 4
-
-	vcipher 15, 15, 19
-	vcipher 15, 15, 20
-	vcipher 15, 15, 21
-	vcipher 15, 15, 22
-
-	xxlor	19+32, 5, 5
-	xxlor	20+32, 6, 6
-	xxlor	21+32, 7, 7
-	xxlor	22+32, 8, 8
-
-	vcipher 15, 15, 19
-	vcipher 15, 15, 20
-	vcipher 15, 15, 21
-	vcipher 15, 15, 22
-
-	xxlor	19+32, 9, 9
-	vcipher 15, 15, 19
-.endm
-
-Next_rem_block:
-	lxvb16x 15, 0, 14		# load block
-
-	Loop_aes_middle_1x
-
-	xxlor	23+32, 10, 10
-
-	cmpdi	10, 10
-	beq	Do_next_1x
-
-	# 192 bits
-	xxlor	24+32, 11, 11
-
-	vcipher	15, 15, 23
-	vcipher	15, 15, 24
-
-	xxlor	23+32, 12, 12
-
-	cmpdi	10, 12
-	beq	Do_next_1x
-
-	# 256 bits
-	xxlor	24+32, 13, 13
-
-	vcipher	15, 15, 23
-	vcipher	15, 15, 24
-
-	xxlor	23+32, 14, 14
-
-	cmpdi	10, 14
-	beq	Do_next_1x
-
-Do_next_1x:
-	vcipherlast     15, 15, 23
-
-	xxlxor		47, 47, 15
-	stxvb16x	47, 0, 9	# store output
-	addi		14, 14, 16
-	addi		9, 9, 16
-
-	vmr		28, 15
-	ppc_update_hash_1x
-
-	addi		12, 12, -16
-	addi		11, 11, 16
-	xxlor		19+32, 0, 0
-	vaddudm		30, 30, 31		# IV + counter
-	vxor		15, 30, 19		# add round key
+	lxv	32+23, 16(6)		# round key 1
+	lxv	32+24, 32(6)		# round key 2
+	lxv	32+25, 48(6)		# round key 3
+	lxv	32+26, 64(6)		# round key 4
+	lxv	32+27, 80(6)		# round key 5
+	lxv	32+28, 96(6)		# round key 6
+	lxv	32+29, 112(6)		# round key 7
+	lxv	32+1, 128(6)		# round key 8
+
+	# Compute first 8 AES state and leave 1/3/5 more rounds
+	# for the loop.
+	LOOP_8AES_STATE			# process 8 AES keys
+	mtctr	22			# AES key loop
+	addi	10, 6, 144
+
+__LastLoop_aes_state:
+	lxv	32+1, 0(10)		# round key
+	AES_CIPHER_8x 1
+	addi	10, 10, 16
+	bdnz	__LastLoop_aes_state
 
-	bdnz	Next_rem_block
+	lxv	32+1, 0(10)		# last round key (v1)
 
+	addi	12, 12, -1
 	cmpdi	12, 0
-	beq	aes_gcm_out
-
-Final_block:
-	Loop_aes_middle_1x
-
-	xxlor	23+32, 10, 10
-
-	cmpdi	10, 10
-	beq	Do_final_1x
-
-	# 192 bits
-	xxlor	24+32, 11, 11
-
-	vcipher	15, 15, 23
-	vcipher	15, 15, 24
+	bne	__Loop_8x_block_enc
 
-	xxlor	23+32, 12, 12
-
-	cmpdi	10, 12
-	beq	Do_final_1x
-
-	# 256 bits
-	xxlor	24+32, 13, 13
-
-	vcipher	15, 15, 23
-	vcipher	15, 15, 24
-
-	xxlor	23+32, 14, 14
-
-	cmpdi	10, 14
-	beq	Do_final_1x
-
-Do_final_1x:
-	vcipherlast     15, 15, 23
-
-	lxvb16x	15, 0, 14		# load last block
-	xxlxor	47, 47, 15
-
-	# create partial block mask
-	li	15, 16
-	sub	15, 15, 12		# index to the mask
-
-	vspltisb	16, -1		# first 16 bytes - 0xffff...ff
-	vspltisb	17, 0		# second 16 bytes - 0x0000...00
-	li	10, 192
-	stvx	16, 10, 1
-	addi	10, 10, 16
-	stvx	17, 10, 1
-
-	addi	10, 1, 192
-	lxvb16x	16, 15, 10		# load partial block mask
-	xxland	47, 47, 16
-
-	vmr	28, 15
-	ppc_update_hash_1x
+	#
+	# Remainng blocks
+	#
+__Finish_ghash:
+	PROCESS_8X_AES_STATES
 
-	# * should store only the remaining bytes.
-	bl	Write_partial_block
+	# Compute ghash here
+	vxor	15, 15, 0
+	PPC_GFMUL128_8x
 
-	b aes_gcm_out
+	# Update IV and Xi
+	xxlor	30+32, 9, 9		# last ctr
+	vadduwm	30, 30, 31		# increase ctr
+	stxvb16x 32+0, 0, 8		# update Xi
 
-#
-# Write partial block
-# r9 - output
-# r12 - remaining bytes
-# v15 - partial input data
-#
-Write_partial_block:
-	li		10, 192
-	stxvb16x	15+32, 10, 1		# last block
+	addi    5, 5, -128
+	addi    11, 11, 128
 
-	#add		10, 9, 11		# Output
-	addi		10, 9, -1
-	addi		16, 1, 191
+	#
+	# Done 8x blocks
+	#
 
-        mtctr		12			# remaining bytes
-	li		15, 0
+	cmpdi   5, 0
+	beq     aes_gcm_out
 
-Write_last_byte:
-        lbzu		14, 1(16)
-	stbu		14, 1(10)
-        bdnz		Write_last_byte
-	blr
+__Process_more_enc:
+	li	24, 1			# encrypt
+	bl	aes_gcm_crypt_1x
+	cmpdi   5, 0
+	beq     aes_gcm_out
 
-aes_gcm_out:
-	# out = state
-	stxvb16x	32, 0, 8		# write out Xi
-	add	3, 11, 12		# return count
+	bl	__Process_partial
+	b	aes_gcm_out
 
-	li	9, 256
-	lvx	20, 9, 1
-	addi	9, 9, 16
-	lvx	21, 9, 1
-	addi	9, 9, 16
-	lvx	22, 9, 1
-	addi	9, 9, 16
-	lvx	23, 9, 1
-	addi	9, 9, 16
-	lvx	24, 9, 1
-	addi	9, 9, 16
-	lvx	25, 9, 1
-	addi	9, 9, 16
-	lvx	26, 9, 1
-	addi	9, 9, 16
-	lvx	27, 9, 1
-	addi	9, 9, 16
-	lvx	28, 9, 1
-	addi	9, 9, 16
-	lvx	29, 9, 1
-	addi	9, 9, 16
-	lvx	30, 9, 1
-	addi	9, 9, 16
-	lvx	31, 9, 1
-
-	ld	0, 528(1)
-	ld      14,112(1)
-	ld      15,120(1)
-	ld      16,128(1)
-	ld      17,136(1)
-	ld      18,144(1)
-	ld      19,152(1)
-	ld      20,160(1)
-	ld	21,168(1)
-
-	mtlr	0
-	addi	1, 1, 512
-	blr
+.size   ppc_aes_gcm_encrypt,.-ppc_aes_gcm_encrypt
 
-#
+################################################################################
+# ppc_aes_gcm_decrypt (const void *inp, void *out, size_t len,
+#               const char *rk, unsigned char iv[16], void *Xip);
 # 8x Decrypt
 #
+################################################################################
 .global ppc_aes_gcm_decrypt
 .align 5
 ppc_aes_gcm_decrypt:
-_ppc_aes_gcm_decrypt:
-
-	stdu 1,-512(1)
-	mflr 0
-
-	std	14,112(1)
-	std	15,120(1)
-	std	16,128(1)
-	std	17,136(1)
-	std	18,144(1)
-	std	19,152(1)
-	std	20,160(1)
-	std	21,168(1)
-	li	9, 256
-	stvx	20, 9, 1
-	addi	9, 9, 16
-	stvx	21, 9, 1
-	addi	9, 9, 16
-	stvx	22, 9, 1
-	addi	9, 9, 16
-	stvx	23, 9, 1
-	addi	9, 9, 16
-	stvx	24, 9, 1
-	addi	9, 9, 16
-	stvx	25, 9, 1
-	addi	9, 9, 16
-	stvx	26, 9, 1
-	addi	9, 9, 16
-	stvx	27, 9, 1
-	addi	9, 9, 16
-	stvx	28, 9, 1
-	addi	9, 9, 16
-	stvx	29, 9, 1
-	addi	9, 9, 16
-	stvx	30, 9, 1
-	addi	9, 9, 16
-	stvx	31, 9, 1
-	std	0, 528(1)
-
-	# Load Xi
-	lxvb16x	32, 0, 8	# load Xi
-
-	# load Hash - h^4, h^3, h^2, h
-	li	10, 32
-	lxvd2x	2+32, 10, 8	# H Poli
-	li	10, 48
-	lxvd2x	3+32, 10, 8	# Hl
-	li	10, 64
-	lxvd2x	4+32, 10, 8	# H
-	li	10, 80
-	lxvd2x	5+32, 10, 8	# Hh
-
-	li	10, 96
-	lxvd2x	6+32, 10, 8	# H^2l
-	li	10, 112
-	lxvd2x	7+32, 10, 8	# H^2
-	li	10, 128
-	lxvd2x	8+32, 10, 8	# H^2h
 
-	li	10, 144
-	lxvd2x	9+32, 10, 8	# H^3l
-	li	10, 160
-	lxvd2x	10+32, 10, 8	# H^3
-	li	10, 176
-	lxvd2x	11+32, 10, 8	# H^3h
-
-	li	10, 192
-	lxvd2x	12+32, 10, 8	# H^4l
-	li	10, 208
-	lxvd2x	13+32, 10, 8	# H^4
-	li	10, 224
-	lxvd2x	14+32, 10, 8	# H^4h
+	SAVE_REGS
+	LOAD_HASH_TABLE
 
 	# initialize ICB: GHASH( IV ), IV - r7
 	lxvb16x	30+32, 0, 7	# load IV  - v30
 
-	mr	12, 5		# length
-	li	11, 0		# block index
+	mr	14, 3
+	mr	9, 4
 
 	# counter 1
 	vxor	31, 31, 31
 	vspltisb 22, 1
 	vsldoi	31, 31, 22,1	# counter 1
 
-	# load round key to VSR
-	lxv	0, 0(6)
-	lxv	1, 0x10(6)
-	lxv	2, 0x20(6)
-	lxv	3, 0x30(6)
-	lxv	4, 0x40(6)
-	lxv	5, 0x50(6)
-	lxv	6, 0x60(6)
-	lxv	7, 0x70(6)
-	lxv	8, 0x80(6)
-	lxv	9, 0x90(6)
-	lxv	10, 0xa0(6)
+	addis	11, 2, permx\@toc\@ha
+	addi	11, 11, permx\@toc\@l
+	lxv	10, 0(11)	# vs10: vpermxor vector
+	li	11, 0
 
-	# load rounds - 10 (128), 12 (192), 14 (256)
-	lwz	9,240(6)
+	lxv	0, 0(6)			# round key 0
 
 	#
-	# vxor	state, state, w # addroundkey
-	xxlor	32+29, 0, 0
-	vxor	15, 30, 29	# IV + round key - add round key 0
-
-	cmpdi	9, 10
-	beq	Loop_aes_gcm_8x_dec
-
-	# load 2 more round keys (v11, v12)
-	lxv	11, 0xb0(6)
-	lxv	12, 0xc0(6)
-
-	cmpdi	9, 12
-	beq	Loop_aes_gcm_8x_dec
-
-	# load 2 more round keys (v11, v12, v13, v14)
-	lxv	13, 0xd0(6)
-	lxv	14, 0xe0(6)
-	cmpdi	9, 14
-	beq	Loop_aes_gcm_8x_dec
-
-	b	aes_gcm_out
+	# Process different blocks
+	#
+	cmpdi	5, 128
+	blt	__Process_more_dec
+
+	# load 9 round keys
+	lxv	32+23, 16(6)		# round key 1
+	lxv	32+24, 32(6)		# round key 2
+	lxv	32+25, 48(6)		# round key 3
+	lxv	32+26, 64(6)		# round key 4
+	lxv	32+27, 80(6)		# round key 5
+	lxv	32+28, 96(6)		# round key 6
+	lxv	32+29, 112(6)		# round key 7
+	lxv	32+1, 128(6)		# round key 8
 
-.align 5
-Loop_aes_gcm_8x_dec:
-	mr	14, 3
-	mr	9, 4
+	# load rounds - 10 (128), 12 (192), 14 (256)
+	lwz	23, 240(6)		# n rounds
 
-	# n blocks
+__Process_decrypt:
+#
+# Process 8x AES/GCM blocks
+#
+__Process_8x_dec:
+	# 8x blocks
 	li	10, 128
-	divdu	10, 5, 10	# n 128 bytes-blocks
-	cmpdi	10, 0
-	beq	Loop_last_block_dec
-
-	vaddudm	30, 30, 31	# IV + counter
-	vxor	16, 30, 29
-	vaddudm	30, 30, 31
-	vxor	17, 30, 29
-	vaddudm	30, 30, 31
-	vxor	18, 30, 29
-	vaddudm	30, 30, 31
-	vxor	19, 30, 29
-	vaddudm	30, 30, 31
-	vxor	20, 30, 29
-	vaddudm	30, 30, 31
-	vxor	21, 30, 29
-	vaddudm	30, 30, 31
-	vxor	22, 30, 29
-
-	mtctr	10
+	divdu	12, 5, 10	# n 128 bytes-blocks
+
+	addi	12, 12, -1	# loop - 1
+
+	vmr	15, 30		# first state: IV
+	vadduwm	16, 15, 31	# state + counter
+	vadduwm	17, 16, 31
+	vadduwm	18, 17, 31
+	vadduwm	19, 18, 31
+	vadduwm	20, 19, 31
+	vadduwm	21, 20, 31
+	vadduwm	22, 21, 31
+	xxlor	9, 32+22, 32+22	# save last state
+
+	# vxor  state, state, w # addroundkey
+	xxlxor	32+15, 32+15, 0      # IV + round key - add round key 0
+	xxlxor	32+16, 32+16, 0
+	xxlxor	32+17, 32+17, 0
+	xxlxor	32+18, 32+18, 0
+	xxlxor	32+19, 32+19, 0
+	xxlxor	32+20, 32+20, 0
+	xxlxor	32+21, 32+21, 0
+	xxlxor	32+22, 32+22, 0
 
 	li	15, 16
 	li	16, 32
@@ -1142,297 +829,218 @@
 	li	20, 96
 	li	21, 112
 
-	lwz	10, 240(6)
-
-Loop_8x_block_dec:
-
-	lxvb16x		15, 0, 14	# load block
-	lxvb16x		16, 15, 14	# load block
-	lxvb16x		17, 16, 14	# load block
-	lxvb16x		18, 17, 14	# load block
-	lxvb16x		19, 18, 14	# load block
-	lxvb16x		20, 19, 14	# load block
-	lxvb16x		21, 20, 14	# load block
-	lxvb16x		22, 21, 14	# load block
-	addi		14, 14, 128
-
-	Loop_aes_middle8x
-
-	xxlor	23+32, 10, 10
-
-	cmpdi	10, 10
-	beq	Do_last_aes_dec
-
-	# 192 bits
-	xxlor	24+32, 11, 11
-
-	vcipher	15, 15, 23
-	vcipher	16, 16, 23
-	vcipher	17, 17, 23
-	vcipher	18, 18, 23
-	vcipher	19, 19, 23
-	vcipher	20, 20, 23
-	vcipher	21, 21, 23
-	vcipher	22, 22, 23
-
-	vcipher	15, 15, 24
-	vcipher	16, 16, 24
-	vcipher	17, 17, 24
-	vcipher	18, 18, 24
-	vcipher	19, 19, 24
-	vcipher	20, 20, 24
-	vcipher	21, 21, 24
-	vcipher	22, 22, 24
-
-	xxlor	23+32, 12, 12
-
-	cmpdi	10, 12
-	beq	Do_last_aes_dec
-
-	# 256 bits
-	xxlor	24+32, 13, 13
-
-	vcipher	15, 15, 23
-	vcipher	16, 16, 23
-	vcipher	17, 17, 23
-	vcipher	18, 18, 23
-	vcipher	19, 19, 23
-	vcipher	20, 20, 23
-	vcipher	21, 21, 23
-	vcipher	22, 22, 23
-
-	vcipher	15, 15, 24
-	vcipher	16, 16, 24
-	vcipher	17, 17, 24
-	vcipher	18, 18, 24
-	vcipher	19, 19, 24
-	vcipher	20, 20, 24
-	vcipher	21, 21, 24
-	vcipher	22, 22, 24
-
-	xxlor	23+32, 14, 14
-
-	cmpdi	10, 14
-	beq	Do_last_aes_dec
-	b	aes_gcm_out
-
-Do_last_aes_dec:
-
 	#
-	# last round
-	vcipherlast     15, 15, 23
-	vcipherlast     16, 16, 23
-
-	xxlxor		47, 47, 15
-	stxvb16x        47, 0, 9	# store output
-	xxlxor		48, 48, 16
-	stxvb16x        48, 15, 9	# store output
-
-	vcipherlast     17, 17, 23
-	vcipherlast     18, 18, 23
-
-	xxlxor		49, 49, 17
-	stxvb16x        49, 16, 9	# store output
-	xxlxor		50, 50, 18
-	stxvb16x        50, 17, 9	# store output
-
-	vcipherlast     19, 19, 23
-	vcipherlast     20, 20, 23
-
-	xxlxor		51, 51, 19
-	stxvb16x        51, 18, 9	# store output
-	xxlxor		52, 52, 20
-	stxvb16x        52, 19, 9	# store output
-
-	vcipherlast     21, 21, 23
-	vcipherlast     22, 22, 23
-
-	xxlxor		53, 53, 21
-	stxvb16x        53, 20, 9	# store output
-	xxlxor		54, 54, 22
-	stxvb16x        54, 21, 9	# store output
-
-	addi		9, 9, 128
-
-	xxlor		15+32, 15, 15
-	xxlor		16+32, 16, 16
-	xxlor		17+32, 17, 17
-	xxlor		18+32, 18, 18
-	xxlor		19+32, 19, 19
-	xxlor		20+32, 20, 20
-	xxlor		21+32, 21, 21
-	xxlor		22+32, 22, 22
-
-	# ghash here
-	ppc_aes_gcm_ghash2_4x
-
-	xxlor	27+32, 0, 0
-	vaddudm 30, 30, 31		# IV + counter
-	vmr	29, 30
-	vxor    15, 30, 27		# add round key
-	vaddudm 30, 30, 31
-	vxor    16, 30, 27
-	vaddudm 30, 30, 31
-	vxor    17, 30, 27
-	vaddudm 30, 30, 31
-	vxor    18, 30, 27
-	vaddudm 30, 30, 31
-	vxor    19, 30, 27
-	vaddudm 30, 30, 31
-	vxor    20, 30, 27
-	vaddudm 30, 30, 31
-	vxor    21, 30, 27
-	vaddudm 30, 30, 31
-	vxor    22, 30, 27
-	addi    12, 12, -128
-	addi    11, 11, 128
-
-	bdnz	Loop_8x_block_dec
-
-	vmr	30, 29
-
-Loop_last_block_dec:
-	cmpdi   12, 0
-	beq     aes_gcm_out
-
-	# loop last few blocks
-	li      10, 16
-	divdu   10, 12, 10
-
-	mtctr   10
-
-	lwz	10,240(6)
-
-	cmpdi   12, 16
-	blt     Final_block_dec
-
-Next_rem_block_dec:
-	lxvb16x 15, 0, 14		# load block
-
-	Loop_aes_middle_1x
-
-	xxlor	23+32, 10, 10
-
-	cmpdi	10, 10
-	beq	Do_next_1x_dec
-
-	# 192 bits
-	xxlor	24+32, 11, 11
-
-	vcipher	15, 15, 23
-	vcipher	15, 15, 24
-
-	xxlor	23+32, 12, 12
-
-	cmpdi	10, 12
-	beq	Do_next_1x_dec
-
-	# 256 bits
-	xxlor	24+32, 13, 13
-
-	vcipher	15, 15, 23
-	vcipher	15, 15, 24
+	# Pre-compute first 8 AES state and leave 1/3/5 more rounds
+	# for the loop.
+	#
+	addi	22, 23, -9		# process 8 keys
+	mtctr	22			# AES key loop
+	addi	10, 6, 144
 
-	xxlor	23+32, 14, 14
+	LOOP_8AES_STATE			# process 8 AES keys
 
-	cmpdi	10, 14
-	beq	Do_next_1x_dec
+__PreLoop_aes_state_dec:
+	lxv	32+1, 0(10)		# round key
+	AES_CIPHER_8x 1
+	addi	10, 10, 16
+	bdnz	__PreLoop_aes_state_dec
+	lxv	32+1, 0(10)		# last round key (v1)
 
-Do_next_1x_dec:
-	vcipherlast     15, 15, 23
+	cmpdi	12, 0			# Only one loop (8 block)
+	beq	__Finish_ghash_dec
 
-	xxlxor  47, 47, 15
-	stxvb16x        47, 0, 9	# store output
-	addi	14, 14, 16
-	addi	9, 9, 16
-
-	xxlor	28+32, 15, 15
-	ppc_update_hash_1x
+#
+# Loop 8x blocks and compute ghash
+#
+__Loop_8x_block_dec:
+	vcipherlast     15, 15, 1
+	vcipherlast     16, 16, 1
+	vcipherlast     17, 17, 1
+	vcipherlast     18, 18, 1
+	vcipherlast     19, 19, 1
+	vcipherlast     20, 20, 1
+	vcipherlast     21, 21, 1
+	vcipherlast     22, 22, 1
+
+	lxvb16x	32+23, 0, 14	# load block
+	lxvb16x	32+24, 15, 14	# load block
+	lxvb16x	32+25, 16, 14	# load block
+	lxvb16x	32+26, 17, 14	# load block
+	lxvb16x	32+27, 18, 14	# load block
+	lxvb16x	32+28, 19, 14	# load block
+	lxvb16x	32+29, 20, 14	# load block
+	lxvb16x	32+30, 21, 14	# load block
+	addi	14, 14, 128
+
+	vxor	15, 15, 23
+	vxor	16, 16, 24
+	vxor	17, 17, 25
+	vxor	18, 18, 26
+	vxor	19, 19, 27
+	vxor	20, 20, 28
+	vxor	21, 21, 29
+	vxor	22, 22, 30
+
+	stxvb16x 47, 0, 9	# store output
+	stxvb16x 48, 15, 9	# store output
+	stxvb16x 49, 16, 9	# store output
+	stxvb16x 50, 17, 9	# store output
+	stxvb16x 51, 18, 9	# store output
+	stxvb16x 52, 19, 9	# store output
+	stxvb16x 53, 20, 9	# store output
+	stxvb16x 54, 21, 9	# store output
+
+	addi	9, 9, 128
+
+	vmr	15, 23
+	vmr	16, 24
+	vmr	17, 25
+	vmr	18, 26
+	vmr	19, 27
+	vmr	20, 28
+	vmr	21, 29
+	vmr	22, 30
 
-	addi    12, 12, -16
-	addi    11, 11, 16
-	xxlor	19+32, 0, 0
-	vaddudm 30, 30, 31		# IV + counter
-	vxor	15, 30, 19		# add round key
+	# ghash here
+	vxor	15, 15, 0
+	PPC_GFMUL128_8x
+
+	xxlor	32+15, 9, 9		# last state
+	vadduwm 15, 15, 31		# state + counter
+	vadduwm 16, 15, 31
+	vadduwm 17, 16, 31
+	vadduwm 18, 17, 31
+	vadduwm 19, 18, 31
+	vadduwm 20, 19, 31
+	vadduwm 21, 20, 31
+	vadduwm 22, 21, 31
+	xxlor	9, 32+22, 32+22		# save last state
+
+	xxlor	32+27, 0, 0		# restore roundkey 0
+        vxor    15, 15, 27		# IV + round key - add round key 0
+	vxor	16, 16, 27
+	vxor	17, 17, 27
+	vxor	18, 18, 27
+	vxor	19, 19, 27
+	vxor	20, 20, 27
+	vxor	21, 21, 27
+	vxor	22, 22, 27
+
+	addi    5, 5, -128
+	addi    11, 11, 128
 
-	bdnz	Next_rem_block_dec
+	lxv	32+23, 16(6)		# round key 1
+	lxv	32+24, 32(6)		# round key 2
+	lxv	32+25, 48(6)		# round key 3
+	lxv	32+26, 64(6)		# round key 4
+	lxv	32+27, 80(6)		# round key 5
+	lxv	32+28, 96(6)		# round key 6
+	lxv	32+29, 112(6)		# round key 7
+	lxv	32+1, 128(6)		# round key 8
+
+	LOOP_8AES_STATE			# process 8 AES keys
+	mtctr	22			# AES key loop
+	addi	10, 6, 144
+__LastLoop_aes_state_dec:
+	lxv	32+1, 0(10)		# round key
+	AES_CIPHER_8x 1
+	addi	10, 10, 16
+	bdnz	__LastLoop_aes_state_dec
+	lxv	32+1, 0(10)		# last round key (v1)
 
+	addi	12, 12, -1
 	cmpdi	12, 0
-	beq	aes_gcm_out
-
-Final_block_dec:
-	Loop_aes_middle_1x
-
-	xxlor	23+32, 10, 10
-
-	cmpdi	10, 10
-	beq	Do_final_1x_dec
-
-	# 192 bits
-	xxlor	24+32, 11, 11
-
-	vcipher	15, 15, 23
-	vcipher	15, 15, 24
-
-	xxlor	23+32, 12, 12
-
-	cmpdi	10, 12
-	beq	Do_final_1x_dec
-
-	# 256 bits
-	xxlor	24+32, 13, 13
-
-	vcipher	15, 15, 23
-	vcipher	15, 15, 24
-
-	xxlor	23+32, 14, 14
-
-	cmpdi	10, 14
-	beq	Do_final_1x_dec
-
-Do_final_1x_dec:
-	vcipherlast     15, 15, 23
-
-	lxvb16x	15, 0, 14		# load block
-	xxlxor	47, 47, 15
+	bne	__Loop_8x_block_dec
+
+__Finish_ghash_dec:
+	vcipherlast     15, 15, 1
+	vcipherlast     16, 16, 1
+	vcipherlast     17, 17, 1
+	vcipherlast     18, 18, 1
+	vcipherlast     19, 19, 1
+	vcipherlast     20, 20, 1
+	vcipherlast     21, 21, 1
+	vcipherlast     22, 22, 1
+
+	lxvb16x	32+23, 0, 14	# load block
+	lxvb16x	32+24, 15, 14	# load block
+	lxvb16x	32+25, 16, 14	# load block
+	lxvb16x	32+26, 17, 14	# load block
+	lxvb16x	32+27, 18, 14	# load block
+	lxvb16x	32+28, 19, 14	# load block
+	lxvb16x	32+29, 20, 14	# load block
+	lxvb16x	32+30, 21, 14	# load block
+	addi	14, 14, 128
+
+	vxor	15, 15, 23
+	vxor	16, 16, 24
+	vxor	17, 17, 25
+	vxor	18, 18, 26
+	vxor	19, 19, 27
+	vxor	20, 20, 28
+	vxor	21, 21, 29
+	vxor	22, 22, 30
+
+	stxvb16x 47, 0, 9	# store output
+	stxvb16x 48, 15, 9	# store output
+	stxvb16x 49, 16, 9	# store output
+	stxvb16x 50, 17, 9	# store output
+	stxvb16x 51, 18, 9	# store output
+	stxvb16x 52, 19, 9	# store output
+	stxvb16x 53, 20, 9	# store output
+	stxvb16x 54, 21, 9	# store output
+	addi	9, 9, 128
+
+	vxor	15, 23, 0
+	vmr	16, 24
+	vmr	17, 25
+	vmr	18, 26
+	vmr	19, 27
+	vmr	20, 28
+	vmr	21, 29
+	vmr	22, 30
+
+	#vxor	15, 15, 0
+	PPC_GFMUL128_8x
+
+	xxlor	30+32, 9, 9		# last ctr
+	vadduwm	30, 30, 31		# increase ctr
+	stxvb16x 32+0, 0, 8		# update Xi
+
+	addi    5, 5, -128
+	addi    11, 11, 128
 
-	# create partial block mask
-	li	15, 16
-	sub	15, 15, 12		# index to the mask
+	#
+	# Done 8x blocks
+	#
 
-	vspltisb	16, -1		# first 16 bytes - 0xffff...ff
-	vspltisb	17, 0		# second 16 bytes - 0x0000...00
-	li	10, 192
-	stvx	16, 10, 1
-	addi	10, 10, 16
-	stvx	17, 10, 1
+	cmpdi   5, 0
+	beq     aes_gcm_out
 
-	addi	10, 1, 192
-	lxvb16x	16, 15, 10		# load block mask
-	xxland	47, 47, 16
+__Process_more_dec:
+	li	24, 0			# decrypt
+	bl	aes_gcm_crypt_1x
+	cmpdi   5, 0
+	beq     aes_gcm_out
 
-	xxlor	28+32, 15, 15
-	ppc_update_hash_1x
+	bl	__Process_partial
+	b	aes_gcm_out
+.size   ppc_aes_gcm_decrypt,.-ppc_aes_gcm_decrypt
 
-	# * should store only the remaining bytes.
-	bl	Write_partial_block
+aes_gcm_out:
 
-	b aes_gcm_out
+	mr	3, 11			# return count
 
+	RESTORE_REGS
+	blr
+.size	aes_gcm_out,.-aes_gcm_out
 
+.rodata
+.align 4
+# for vector permute and xor
+permx:
+.long 0x4c5d6e7f, 0x08192a3b, 0xc4d5e6f7, 0x8091a2b3
 ___
 
-foreach (split("\n",$code)) {
-	s/\`([^\`]*)\`/eval $1/geo;
-
-	if ($flavour =~ /le$/o) {	# little-endian
-	    s/le\?//o		or
-	    s/be\?/#be#/o;
-	} else {
-	    s/le\?/#le#/o	or
-	    s/be\?//o;
-	}
-	print $_,"\n";
-}
-
-close STDOUT or die "error closing STDOUT: $!"; # enforce flush
+print $code;
+close STDOUT or die "error closing STDOUT: $!";
diff --git a/crypto/modes/asm/aesni-gcm-x86_64.pl b/crypto/modes/asm/aesni-gcm-x86_64.pl
index 872e13f8f1a1d..c63570bae42f6 100644
--- a/crypto/modes/asm/aesni-gcm-x86_64.pl
+++ b/crypto/modes/asm/aesni-gcm-x86_64.pl
@@ -53,13 +53,15 @@
 die "can't locate x86_64-xlate.pl";
 
 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
-		=~ /GNU assembler version ([2-9]\.[0-9]+)/) {
-	$avx = ($1>=2.20) + ($1>=2.22);
+		=~ /GNU assembler version ([0-9]+)\.([0-9]+)/) {
+	my $ver = $1 + $2/100.0; # 3.1->3.01, 3.10->3.10
+	$avx = ($ver >= 2.20) + ($ver >= 2.22);
 }
 
 if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
-	    `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/) {
-	$avx = ($1>=2.09) + ($1>=2.10);
+	    `nasm -v 2>&1` =~ /NASM version ([0-9]+)\.([0-9]+)/) {
+	my $ver = $1 + $2/100.0; # 3.1->3.01, 3.10->3.10
+	$avx = ($ver >= 2.09) + ($ver >= 2.10);
 }
 
 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
diff --git a/crypto/modes/cbc128.c b/crypto/modes/cbc128.c
index f3818032a4901..db1c0fadee75d 100644
--- a/crypto/modes/cbc128.c
+++ b/crypto/modes/cbc128.c
@@ -12,7 +12,7 @@
 #include "crypto/modes.h"
 
 #if !defined(STRICT_ALIGNMENT) && !defined(PEDANTIC)
-# define STRICT_ALIGNMENT 0
+#define STRICT_ALIGNMENT 0
 #endif
 
 #if defined(__GNUC__) && !STRICT_ALIGNMENT
@@ -22,8 +22,8 @@ typedef size_t size_t_aX;
 #endif
 
 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)
 {
     size_t n;
     const unsigned char *iv = ivec;
@@ -32,12 +32,11 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
         return;
 
 #if !defined(OPENSSL_SMALL_FOOTPRINT)
-    if (STRICT_ALIGNMENT &&
-        ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
+    if (STRICT_ALIGNMENT && ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
         while (len >= 16) {
             for (n = 0; n < 16; ++n)
                 out[n] = in[n] ^ iv[n];
-            (*block) (out, out, key);
+            (*block)(out, out, key);
             iv = out;
             len -= 16;
             in += 16;
@@ -46,9 +45,8 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
     } else {
         while (len >= 16) {
             for (n = 0; n < 16; n += sizeof(size_t))
-                *(size_t_aX *)(out + n) =
-                    *(size_t_aX *)(in + n) ^ *(size_t_aX *)(iv + n);
-            (*block) (out, out, key);
+                *(size_t_aX *)(out + n) = *(size_t_aX *)(in + n) ^ *(size_t_aX *)(iv + n);
+            (*block)(out, out, key);
             iv = out;
             len -= 16;
             in += 16;
@@ -61,7 +59,7 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
             out[n] = in[n] ^ iv[n];
         for (; n < 16; ++n)
             out[n] = iv[n];
-        (*block) (out, out, key);
+        (*block)(out, out, key);
         iv = out;
         if (len <= 16)
             break;
@@ -74,8 +72,8 @@ void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
 }
 
 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)
 {
     size_t n;
     union {
@@ -90,10 +88,9 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
     if (in != out) {
         const unsigned char *iv = ivec;
 
-        if (STRICT_ALIGNMENT &&
-            ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
+        if (STRICT_ALIGNMENT && ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
             while (len >= 16) {
-                (*block) (in, out, key);
+                (*block)(in, out, key);
                 for (n = 0; n < 16; ++n)
                     out[n] ^= iv[n];
                 iv = in;
@@ -106,7 +103,7 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
                 size_t_aX *out_t = (size_t_aX *)out;
                 size_t_aX *iv_t = (size_t_aX *)iv;
 
-                (*block) (in, out, key);
+                (*block)(in, out, key);
                 for (n = 0; n < 16 / sizeof(size_t); n++)
                     out_t[n] ^= iv_t[n];
                 iv = in;
@@ -118,11 +115,10 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
         if (ivec != iv)
             memcpy(ivec, iv, 16);
     } else {
-        if (STRICT_ALIGNMENT &&
-            ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
+        if (STRICT_ALIGNMENT && ((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
             unsigned char c;
             while (len >= 16) {
-                (*block) (in, tmp.c, key);
+                (*block)(in, tmp.c, key);
                 for (n = 0; n < 16; ++n) {
                     c = in[n];
                     out[n] = tmp.c[n] ^ ivec[n];
@@ -139,7 +135,7 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
                 size_t_aX *ivec_t = (size_t_aX *)ivec;
                 const size_t_aX *in_t = (const size_t_aX *)in;
 
-                (*block) (in, tmp.c, key);
+                (*block)(in, tmp.c, key);
                 for (n = 0; n < 16 / sizeof(size_t); n++) {
                     c = in_t[n];
                     out_t[n] = tmp.t[n] ^ ivec_t[n];
@@ -154,7 +150,7 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
 #endif
     while (len) {
         unsigned char c;
-        (*block) (in, tmp.c, key);
+        (*block)(in, tmp.c, key);
         for (n = 0; n < 16 && n < len; ++n) {
             c = in[n];
             out[n] = tmp.c[n] ^ ivec[n];
diff --git a/crypto/modes/ccm128.c b/crypto/modes/ccm128.c
index eee7a69c3ab79..02ab4f88315ce 100644
--- a/crypto/modes/ccm128.c
+++ b/crypto/modes/ccm128.c
@@ -12,11 +12,11 @@
 #include "crypto/modes.h"
 
 #ifndef STRICT_ALIGNMENT
-# ifdef __GNUC__
+#ifdef __GNUC__
 typedef u64 u64_a1 __attribute((__aligned__(1)));
-# else
+#else
 typedef u64 u64_a1;
-# endif
+#endif
 #endif
 
 /*
@@ -24,8 +24,8 @@ typedef u64 u64_a1;
  * called once per session setup...
  */
 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)
 {
     memset(ctx->nonce.c, 0, sizeof(ctx->nonce.c));
     ctx->nonce.c[0] = ((u8)(L - 1) & 7) | (u8)(((M - 2) / 2) & 7) << 3;
@@ -38,12 +38,12 @@ void CRYPTO_ccm128_init(CCM128_CONTEXT *ctx,
 
 /* Then you setup per-message nonce and pass the length of the message */
 int CRYPTO_ccm128_setiv(CCM128_CONTEXT *ctx,
-                        const unsigned char *nonce, size_t nlen, size_t mlen)
+    const unsigned char *nonce, size_t nlen, size_t mlen)
 {
     unsigned int L = ctx->nonce.c[0] & 7; /* the L parameter */
 
     if (nlen < (14 - L))
-        return -1;              /* nonce is too short */
+        return -1; /* nonce is too short */
 
     if (sizeof(mlen) == 8 && L >= 3) {
         ctx->nonce.c[8] = (u8)(mlen >> (56 % (sizeof(mlen) * 8)));
@@ -58,7 +58,7 @@ int CRYPTO_ccm128_setiv(CCM128_CONTEXT *ctx,
     ctx->nonce.c[14] = (u8)(mlen >> 8);
     ctx->nonce.c[15] = (u8)mlen;
 
-    ctx->nonce.c[0] &= ~0x40;   /* clear Adata flag */
+    ctx->nonce.c[0] &= ~0x40; /* clear Adata flag */
     memcpy(&ctx->nonce.c[1], nonce, 14 - L);
 
     return 0;
@@ -66,7 +66,7 @@ int CRYPTO_ccm128_setiv(CCM128_CONTEXT *ctx,
 
 /* Then you pass additional authentication data, this is optional */
 void CRYPTO_ccm128_aad(CCM128_CONTEXT *ctx,
-                       const unsigned char *aad, size_t alen)
+    const unsigned char *aad, size_t alen)
 {
     unsigned int i;
     block128_f block = ctx->block;
@@ -74,15 +74,15 @@ void CRYPTO_ccm128_aad(CCM128_CONTEXT *ctx,
     if (alen == 0)
         return;
 
-    ctx->nonce.c[0] |= 0x40;    /* set Adata flag */
-    (*block) (ctx->nonce.c, ctx->cmac.c, ctx->key), ctx->blocks++;
+    ctx->nonce.c[0] |= 0x40; /* set Adata flag */
+    (*block)(ctx->nonce.c, ctx->cmac.c, ctx->key), ctx->blocks++;
 
     if (alen < (0x10000 - 0x100)) {
         ctx->cmac.c[0] ^= (u8)(alen >> 8);
         ctx->cmac.c[1] ^= (u8)alen;
         i = 2;
     } else if (sizeof(alen) == 8
-               && alen >= (size_t)1 << (32 % (sizeof(alen) * 8))) {
+        && alen >= (size_t)1 << (32 % (sizeof(alen) * 8))) {
         ctx->cmac.c[0] ^= 0xFF;
         ctx->cmac.c[1] ^= 0xFF;
         ctx->cmac.c[2] ^= (u8)(alen >> (56 % (sizeof(alen) * 8)));
@@ -107,7 +107,7 @@ void CRYPTO_ccm128_aad(CCM128_CONTEXT *ctx,
     do {
         for (; i < 16 && alen; ++i, ++aad, --alen)
             ctx->cmac.c[i] ^= *aad;
-        (*block) (ctx->cmac.c, ctx->cmac.c, ctx->key), ctx->blocks++;
+        (*block)(ctx->cmac.c, ctx->cmac.c, ctx->key), ctx->blocks++;
         i = 0;
     } while (alen);
 }
@@ -135,8 +135,8 @@ static void ctr64_inc(unsigned char *counter)
 }
 
 int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
-                          const unsigned char *inp, unsigned char *out,
-                          size_t len)
+    const unsigned char *inp, unsigned char *out,
+    size_t len)
 {
     size_t n;
     unsigned int i, L;
@@ -149,7 +149,7 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
     } scratch;
 
     if (!(flags0 & 0x40))
-        (*block) (ctx->nonce.c, ctx->cmac.c, key), ctx->blocks++;
+        (*block)(ctx->nonce.c, ctx->cmac.c, key), ctx->blocks++;
 
     ctx->nonce.c[0] = L = flags0 & 7;
     for (n = 0, i = 15 - L; i < 15; ++i) {
@@ -157,15 +157,15 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
         ctx->nonce.c[i] = 0;
         n <<= 8;
     }
-    n |= ctx->nonce.c[15];      /* reconstructed length */
+    n |= ctx->nonce.c[15]; /* reconstructed length */
     ctx->nonce.c[15] = 1;
 
     if (n != len)
-        return -1;              /* length mismatch */
+        return -1; /* length mismatch */
 
     ctx->blocks += ((len + 15) >> 3) | 1;
     if (ctx->blocks > (U64(1) << 61))
-        return -2;              /* too much data */
+        return -2; /* too much data */
 
     while (len >= 16) {
 #if defined(STRICT_ALIGNMENT)
@@ -181,8 +181,8 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
         ctx->cmac.u[0] ^= ((u64_a1 *)inp)[0];
         ctx->cmac.u[1] ^= ((u64_a1 *)inp)[1];
 #endif
-        (*block) (ctx->cmac.c, ctx->cmac.c, key);
-        (*block) (ctx->nonce.c, scratch.c, key);
+        (*block)(ctx->cmac.c, ctx->cmac.c, key);
+        (*block)(ctx->nonce.c, scratch.c, key);
         ctr64_inc(ctx->nonce.c);
 #if defined(STRICT_ALIGNMENT)
         temp.u[0] ^= scratch.u[0];
@@ -200,8 +200,8 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
     if (len) {
         for (i = 0; i < len; ++i)
             ctx->cmac.c[i] ^= inp[i];
-        (*block) (ctx->cmac.c, ctx->cmac.c, key);
-        (*block) (ctx->nonce.c, scratch.c, key);
+        (*block)(ctx->cmac.c, ctx->cmac.c, key);
+        (*block)(ctx->nonce.c, scratch.c, key);
         for (i = 0; i < len; ++i)
             out[i] = scratch.c[i] ^ inp[i];
     }
@@ -209,7 +209,7 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
     for (i = 15 - L; i < 16; ++i)
         ctx->nonce.c[i] = 0;
 
-    (*block) (ctx->nonce.c, scratch.c, key);
+    (*block)(ctx->nonce.c, scratch.c, key);
     ctx->cmac.u[0] ^= scratch.u[0];
     ctx->cmac.u[1] ^= scratch.u[1];
 
@@ -219,8 +219,8 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
 }
 
 int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
-                          const unsigned char *inp, unsigned char *out,
-                          size_t len)
+    const unsigned char *inp, unsigned char *out,
+    size_t len)
 {
     size_t n;
     unsigned int i, L;
@@ -233,7 +233,7 @@ int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
     } scratch;
 
     if (!(flags0 & 0x40))
-        (*block) (ctx->nonce.c, ctx->cmac.c, key);
+        (*block)(ctx->nonce.c, ctx->cmac.c, key);
 
     ctx->nonce.c[0] = L = flags0 & 7;
     for (n = 0, i = 15 - L; i < 15; ++i) {
@@ -241,7 +241,7 @@ int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
         ctx->nonce.c[i] = 0;
         n <<= 8;
     }
-    n |= ctx->nonce.c[15];      /* reconstructed length */
+    n |= ctx->nonce.c[15]; /* reconstructed length */
     ctx->nonce.c[15] = 1;
 
     if (n != len)
@@ -254,7 +254,7 @@ int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
             u8 c[16];
         } temp;
 #endif
-        (*block) (ctx->nonce.c, scratch.c, key);
+        (*block)(ctx->nonce.c, scratch.c, key);
         ctr64_inc(ctx->nonce.c);
 #if defined(STRICT_ALIGNMENT)
         memcpy(temp.c, inp, 16);
@@ -263,11 +263,11 @@ int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
         memcpy(out, scratch.c, 16);
 #else
         ctx->cmac.u[0] ^= (((u64_a1 *)out)[0]
-                            = scratch.u[0] ^ ((u64_a1 *)inp)[0]);
+            = scratch.u[0] ^ ((u64_a1 *)inp)[0]);
         ctx->cmac.u[1] ^= (((u64_a1 *)out)[1]
-                            = scratch.u[1] ^ ((u64_a1 *)inp)[1]);
+            = scratch.u[1] ^ ((u64_a1 *)inp)[1]);
 #endif
-        (*block) (ctx->cmac.c, ctx->cmac.c, key);
+        (*block)(ctx->cmac.c, ctx->cmac.c, key);
 
         inp += 16;
         out += 16;
@@ -275,16 +275,16 @@ int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
     }
 
     if (len) {
-        (*block) (ctx->nonce.c, scratch.c, key);
+        (*block)(ctx->nonce.c, scratch.c, key);
         for (i = 0; i < len; ++i)
             ctx->cmac.c[i] ^= (out[i] = scratch.c[i] ^ inp[i]);
-        (*block) (ctx->cmac.c, ctx->cmac.c, key);
+        (*block)(ctx->cmac.c, ctx->cmac.c, key);
     }
 
     for (i = 15 - L; i < 16; ++i)
         ctx->nonce.c[i] = 0;
 
-    (*block) (ctx->nonce.c, scratch.c, key);
+    (*block)(ctx->nonce.c, scratch.c, key);
     ctx->cmac.u[0] ^= scratch.u[0];
     ctx->cmac.u[1] ^= scratch.u[1];
 
@@ -302,14 +302,14 @@ static void ctr64_add(unsigned char *counter, size_t inc)
         --n;
         val += counter[n] + (inc & 0xff);
         counter[n] = (unsigned char)val;
-        val >>= 8;              /* carry bit */
+        val >>= 8; /* carry bit */
         inc >>= 8;
     } while (n && (inc || val));
 }
 
 int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx,
-                                const unsigned char *inp, unsigned char *out,
-                                size_t len, ccm128_f stream)
+    const unsigned char *inp, unsigned char *out,
+    size_t len, ccm128_f stream)
 {
     size_t n;
     unsigned int i, L;
@@ -322,7 +322,7 @@ int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx,
     } scratch;
 
     if (!(flags0 & 0x40))
-        (*block) (ctx->nonce.c, ctx->cmac.c, key), ctx->blocks++;
+        (*block)(ctx->nonce.c, ctx->cmac.c, key), ctx->blocks++;
 
     ctx->nonce.c[0] = L = flags0 & 7;
     for (n = 0, i = 15 - L; i < 15; ++i) {
@@ -330,18 +330,18 @@ int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx,
         ctx->nonce.c[i] = 0;
         n <<= 8;
     }
-    n |= ctx->nonce.c[15];      /* reconstructed length */
+    n |= ctx->nonce.c[15]; /* reconstructed length */
     ctx->nonce.c[15] = 1;
 
     if (n != len)
-        return -1;              /* length mismatch */
+        return -1; /* length mismatch */
 
     ctx->blocks += ((len + 15) >> 3) | 1;
     if (ctx->blocks > (U64(1) << 61))
-        return -2;              /* too much data */
+        return -2; /* too much data */
 
     if ((n = len / 16)) {
-        (*stream) (inp, out, n, key, ctx->nonce.c, ctx->cmac.c);
+        (*stream)(inp, out, n, key, ctx->nonce.c, ctx->cmac.c);
         n *= 16;
         inp += n;
         out += n;
@@ -353,8 +353,8 @@ int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx,
     if (len) {
         for (i = 0; i < len; ++i)
             ctx->cmac.c[i] ^= inp[i];
-        (*block) (ctx->cmac.c, ctx->cmac.c, key);
-        (*block) (ctx->nonce.c, scratch.c, key);
+        (*block)(ctx->cmac.c, ctx->cmac.c, key);
+        (*block)(ctx->nonce.c, scratch.c, key);
         for (i = 0; i < len; ++i)
             out[i] = scratch.c[i] ^ inp[i];
     }
@@ -362,7 +362,7 @@ int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx,
     for (i = 15 - L; i < 16; ++i)
         ctx->nonce.c[i] = 0;
 
-    (*block) (ctx->nonce.c, scratch.c, key);
+    (*block)(ctx->nonce.c, scratch.c, key);
     ctx->cmac.u[0] ^= scratch.u[0];
     ctx->cmac.u[1] ^= scratch.u[1];
 
@@ -372,8 +372,8 @@ int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx,
 }
 
 int CRYPTO_ccm128_decrypt_ccm64(CCM128_CONTEXT *ctx,
-                                const unsigned char *inp, unsigned char *out,
-                                size_t len, ccm128_f stream)
+    const unsigned char *inp, unsigned char *out,
+    size_t len, ccm128_f stream)
 {
     size_t n;
     unsigned int i, L;
@@ -386,7 +386,7 @@ int CRYPTO_ccm128_decrypt_ccm64(CCM128_CONTEXT *ctx,
     } scratch;
 
     if (!(flags0 & 0x40))
-        (*block) (ctx->nonce.c, ctx->cmac.c, key);
+        (*block)(ctx->nonce.c, ctx->cmac.c, key);
 
     ctx->nonce.c[0] = L = flags0 & 7;
     for (n = 0, i = 15 - L; i < 15; ++i) {
@@ -394,14 +394,14 @@ int CRYPTO_ccm128_decrypt_ccm64(CCM128_CONTEXT *ctx,
         ctx->nonce.c[i] = 0;
         n <<= 8;
     }
-    n |= ctx->nonce.c[15];      /* reconstructed length */
+    n |= ctx->nonce.c[15]; /* reconstructed length */
     ctx->nonce.c[15] = 1;
 
     if (n != len)
         return -1;
 
     if ((n = len / 16)) {
-        (*stream) (inp, out, n, key, ctx->nonce.c, ctx->cmac.c);
+        (*stream)(inp, out, n, key, ctx->nonce.c, ctx->cmac.c);
         n *= 16;
         inp += n;
         out += n;
@@ -411,16 +411,16 @@ int CRYPTO_ccm128_decrypt_ccm64(CCM128_CONTEXT *ctx,
     }
 
     if (len) {
-        (*block) (ctx->nonce.c, scratch.c, key);
+        (*block)(ctx->nonce.c, scratch.c, key);
         for (i = 0; i < len; ++i)
             ctx->cmac.c[i] ^= (out[i] = scratch.c[i] ^ inp[i]);
-        (*block) (ctx->cmac.c, ctx->cmac.c, key);
+        (*block)(ctx->cmac.c, ctx->cmac.c, key);
     }
 
     for (i = 15 - L; i < 16; ++i)
         ctx->nonce.c[i] = 0;
 
-    (*block) (ctx->nonce.c, scratch.c, key);
+    (*block)(ctx->nonce.c, scratch.c, key);
     ctx->cmac.u[0] ^= scratch.u[0];
     ctx->cmac.u[1] ^= scratch.u[1];
 
diff --git a/crypto/modes/cfb128.c b/crypto/modes/cfb128.c
index 2d37bcb586fd8..70345636dd3e2 100644
--- a/crypto/modes/cfb128.c
+++ b/crypto/modes/cfb128.c
@@ -23,9 +23,9 @@ typedef size_t size_t_aX;
  * used is contained in *num;
  */
 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)
 {
     unsigned int n;
     size_t l = 0;
@@ -46,17 +46,15 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
                     --len;
                     n = (n + 1) % 16;
                 }
-# if defined(STRICT_ALIGNMENT)
-                if (((size_t)in | (size_t)out | (size_t)ivec) %
-                    sizeof(size_t) != 0)
+#if defined(STRICT_ALIGNMENT)
+                if (((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0)
                     break;
-# endif
+#endif
                 while (len >= 16) {
-                    (*block) (ivec, ivec, key);
+                    (*block)(ivec, ivec, key);
                     for (; n < 16; n += sizeof(size_t)) {
-                        *(size_t_aX *)(out + n) =
-                            *(size_t_aX *)(ivec + n)
-                                ^= *(size_t_aX *)(in + n);
+                        *(size_t_aX *)(out + n) = *(size_t_aX *)(ivec + n)
+                            ^= *(size_t_aX *)(in + n);
                     }
                     len -= 16;
                     out += 16;
@@ -64,7 +62,7 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
                     n = 0;
                 }
                 if (len) {
-                    (*block) (ivec, ivec, key);
+                    (*block)(ivec, ivec, key);
                     while (len--) {
                         out[n] = ivec[n] ^= in[n];
                         ++n;
@@ -78,7 +76,7 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
 #endif
         while (l < len) {
             if (n == 0) {
-                (*block) (ivec, ivec, key);
+                (*block)(ivec, ivec, key);
             }
             out[l] = ivec[n] ^= in[l];
             ++l;
@@ -96,13 +94,12 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
                     --len;
                     n = (n + 1) % 16;
                 }
-# if defined(STRICT_ALIGNMENT)
-                if (((size_t)in | (size_t)out | (size_t)ivec) %
-                    sizeof(size_t) != 0)
+#if defined(STRICT_ALIGNMENT)
+                if (((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0)
                     break;
-# endif
+#endif
                 while (len >= 16) {
-                    (*block) (ivec, ivec, key);
+                    (*block)(ivec, ivec, key);
                     for (; n < 16; n += sizeof(size_t)) {
                         size_t t = *(size_t_aX *)(in + n);
                         *(size_t_aX *)(out + n)
@@ -115,7 +112,7 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
                     n = 0;
                 }
                 if (len) {
-                    (*block) (ivec, ivec, key);
+                    (*block)(ivec, ivec, key);
                     while (len--) {
                         unsigned char c;
                         out[n] = ivec[n] ^ (c = in[n]);
@@ -132,7 +129,7 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
         while (l < len) {
             unsigned char c;
             if (n == 0) {
-                (*block) (ivec, ivec, key);
+                (*block)(ivec, ivec, key);
             }
             out[l] = ivec[n] ^ (c = in[l]);
             ivec[n] = c;
@@ -148,9 +145,9 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
  * it corrupts any extra bits in the last byte of out
  */
 static void cfbr_encrypt_block(const unsigned char *in, unsigned char *out,
-                               int nbits, const void *key,
-                               unsigned char ivec[16], int enc,
-                               block128_f block)
+    int nbits, const void *key,
+    unsigned char ivec[16], int enc,
+    block128_f block)
 {
     int n, rem, num;
     unsigned char ovec[16 * 2 + 1]; /* +1 because we dereference (but don't
@@ -162,12 +159,12 @@ static void cfbr_encrypt_block(const unsigned char *in, unsigned char *out,
     /* fill in the first half of the new IV with the current IV */
     memcpy(ovec, ivec, 16);
     /* construct the new IV */
-    (*block) (ivec, ivec, key);
+    (*block)(ivec, ivec, key);
     num = (nbits + 7) / 8;
-    if (enc)                    /* encrypt the input */
+    if (enc) /* encrypt the input */
         for (n = 0; n < num; ++n)
             out[n] = (ovec[16 + n] = in[n] ^ ivec[n]);
-    else                        /* decrypt the input */
+    else /* decrypt the input */
         for (n = 0; n < num; ++n)
             out[n] = (ovec[16 + n] = in[n]) ^ ivec[n];
     /* shift ovec left... */
@@ -184,9 +181,9 @@ static void cfbr_encrypt_block(const unsigned char *in, unsigned char *out,
 
 /* N.B. This expects the input to be packed, MS bit first */
 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 n;
     unsigned char c[1], d[1];
@@ -194,15 +191,14 @@ void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
     for (n = 0; n < bits; ++n) {
         c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;
         cfbr_encrypt_block(c, d, 1, key, ivec, enc, block);
-        out[n / 8] = (out[n / 8] & ~(1 << (unsigned int)(7 - n % 8))) |
-            ((d[0] & 0x80) >> (unsigned int)(n % 8));
+        out[n / 8] = (out[n / 8] & ~(1 << (unsigned int)(7 - n % 8))) | ((d[0] & 0x80) >> (unsigned int)(n % 8));
     }
 }
 
 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)
 {
     size_t n;
 
diff --git a/crypto/modes/ctr128.c b/crypto/modes/ctr128.c
index 58014e76e275d..6013d6ee4111c 100644
--- a/crypto/modes/ctr128.c
+++ b/crypto/modes/ctr128.c
@@ -71,10 +71,10 @@ static void ctr128_inc_aligned(unsigned char *counter)
  * doesn't overflow into the rest of the IV when incremented.
  */
 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)
 {
     unsigned int n;
     size_t l = 0;
@@ -90,17 +90,17 @@ void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
                 n = (n + 1) % 16;
             }
 
-# if defined(STRICT_ALIGNMENT)
+#if defined(STRICT_ALIGNMENT)
             if (((size_t)in | (size_t)out | (size_t)ecount_buf)
-                % sizeof(size_t) != 0)
+                    % sizeof(size_t)
+                != 0)
                 break;
-# endif
+#endif
             while (len >= 16) {
-                (*block) (ivec, ecount_buf, key);
+                (*block)(ivec, ecount_buf, key);
                 ctr128_inc_aligned(ivec);
                 for (n = 0; n < 16; n += sizeof(size_t))
-                    *(size_t_aX *)(out + n) =
-                        *(size_t_aX *)(in + n)
+                    *(size_t_aX *)(out + n) = *(size_t_aX *)(in + n)
                         ^ *(size_t_aX *)(ecount_buf + n);
                 len -= 16;
                 out += 16;
@@ -108,7 +108,7 @@ void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
                 n = 0;
             }
             if (len) {
-                (*block) (ivec, ecount_buf, key);
+                (*block)(ivec, ecount_buf, key);
                 ctr128_inc_aligned(ivec);
                 while (len--) {
                     out[n] = in[n] ^ ecount_buf[n];
@@ -123,7 +123,7 @@ void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
 #endif
     while (l < len) {
         if (n == 0) {
-            (*block) (ivec, ecount_buf, key);
+            (*block)(ivec, ecount_buf, key);
             ctr128_inc(ivec);
         }
         out[l] = in[l] ^ ecount_buf[n];
@@ -148,14 +148,14 @@ static void ctr96_inc(unsigned char *counter)
 }
 
 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 func)
+    size_t len, const void *key,
+    unsigned char ivec[16],
+    unsigned char ecount_buf[16],
+    unsigned int *num, ctr128_f func)
 {
     unsigned int n, ctr32;
 
-   n = *num;
+    n = *num;
 
     while (n && len) {
         *(out++) = *(in++) ^ ecount_buf[n];
@@ -184,7 +184,7 @@ void CRYPTO_ctr128_encrypt_ctr32(const unsigned char *in, unsigned char *out,
             blocks -= ctr32;
             ctr32 = 0;
         }
-        (*func) (in, out, blocks, key, ivec);
+        (*func)(in, out, blocks, key, ivec);
         /* (*ctr) does not update ivec, caller does: */
         PUTU32(ivec + 12, ctr32);
         /* ... overflow was detected, propagate carry. */
@@ -197,7 +197,7 @@ void CRYPTO_ctr128_encrypt_ctr32(const unsigned char *in, unsigned char *out,
     }
     if (len) {
         memset(ecount_buf, 0, 16);
-        (*func) (ecount_buf, ecount_buf, 1, key, ivec);
+        (*func)(ecount_buf, ecount_buf, 1, key, ivec);
         ++ctr32;
         PUTU32(ivec + 12, ctr32);
         if (ctr32 == 0)
diff --git a/crypto/modes/cts128.c b/crypto/modes/cts128.c
index 5600d9c54b1b3..f6f1592543d83 100644
--- a/crypto/modes/cts128.c
+++ b/crypto/modes/cts128.c
@@ -25,9 +25,9 @@
  */
 
 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 residue, n;
 
@@ -46,7 +46,7 @@ size_t CRYPTO_cts128_encrypt_block(const unsigned char *in,
 
     for (n = 0; n < residue; ++n)
         ivec[n] ^= in[n];
-    (*block) (ivec, ivec, key);
+    (*block)(ivec, ivec, key);
     memcpy(out, out - 16, residue);
     memcpy(out - 16, ivec, 16);
 
@@ -54,10 +54,10 @@ size_t CRYPTO_cts128_encrypt_block(const unsigned char *in,
 }
 
 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 residue, n;
 
@@ -78,15 +78,15 @@ size_t CRYPTO_nistcts128_encrypt_block(const unsigned char *in,
 
     for (n = 0; n < residue; ++n)
         ivec[n] ^= in[n];
-    (*block) (ivec, ivec, key);
+    (*block)(ivec, ivec, key);
     memcpy(out - 16 + residue, ivec, 16);
 
     return len + residue;
 }
 
 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 residue;
     union {
@@ -102,27 +102,27 @@ size_t CRYPTO_cts128_encrypt(const unsigned char *in, unsigned char *out,
 
     len -= residue;
 
-    (*cbc) (in, out, len, key, ivec, 1);
+    (*cbc)(in, out, len, key, ivec, 1);
 
     in += len;
     out += len;
 
 #if defined(CBC_HANDLES_TRUNCATED_IO)
     memcpy(tmp.c, out - 16, 16);
-    (*cbc) (in, out - 16, residue, key, ivec, 1);
+    (*cbc)(in, out - 16, residue, key, ivec, 1);
     memcpy(out, tmp.c, residue);
 #else
     memset(tmp.c, 0, sizeof(tmp));
     memcpy(tmp.c, in, residue);
     memcpy(out, out - 16, residue);
-    (*cbc) (tmp.c, out - 16, 16, key, ivec, 1);
+    (*cbc)(tmp.c, out - 16, 16, key, ivec, 1);
 #endif
     return len + residue;
 }
 
 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 residue;
     union {
@@ -137,7 +137,7 @@ size_t CRYPTO_nistcts128_encrypt(const unsigned char *in, unsigned char *out,
 
     len -= residue;
 
-    (*cbc) (in, out, len, key, ivec, 1);
+    (*cbc)(in, out, len, key, ivec, 1);
 
     if (residue == 0)
         return len;
@@ -146,19 +146,19 @@ size_t CRYPTO_nistcts128_encrypt(const unsigned char *in, unsigned char *out,
     out += len;
 
 #if defined(CBC_HANDLES_TRUNCATED_IO)
-    (*cbc) (in, out - 16 + residue, residue, key, ivec, 1);
+    (*cbc)(in, out - 16 + residue, residue, key, ivec, 1);
 #else
     memset(tmp.c, 0, sizeof(tmp));
     memcpy(tmp.c, in, residue);
-    (*cbc) (tmp.c, out - 16 + residue, 16, key, ivec, 1);
+    (*cbc)(tmp.c, out - 16 + residue, 16, key, ivec, 1);
 #endif
     return len + residue;
 }
 
 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 residue, n;
     union {
@@ -180,11 +180,11 @@ size_t CRYPTO_cts128_decrypt_block(const unsigned char *in,
         out += len;
     }
 
-    (*block) (in, tmp.c + 16, key);
+    (*block)(in, tmp.c + 16, key);
 
     memcpy(tmp.c, tmp.c + 16, 16);
     memcpy(tmp.c, in + 16, residue);
-    (*block) (tmp.c, tmp.c, key);
+    (*block)(tmp.c, tmp.c, key);
 
     for (n = 0; n < 16; ++n) {
         unsigned char c = in[n];
@@ -198,10 +198,10 @@ size_t CRYPTO_cts128_decrypt_block(const unsigned char *in,
 }
 
 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 residue, n;
     union {
@@ -227,11 +227,11 @@ size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in,
         out += len;
     }
 
-    (*block) (in + residue, tmp.c + 16, key);
+    (*block)(in + residue, tmp.c + 16, key);
 
     memcpy(tmp.c, tmp.c + 16, 16);
     memcpy(tmp.c, in, residue);
-    (*block) (tmp.c, tmp.c, key);
+    (*block)(tmp.c, tmp.c, key);
 
     for (n = 0; n < 16; ++n) {
         unsigned char c = in[n];
@@ -246,8 +246,8 @@ size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in,
 }
 
 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 residue;
     union {
@@ -264,7 +264,7 @@ size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
     len -= 16 + residue;
 
     if (len) {
-        (*cbc) (in, out, len, key, ivec, 0);
+        (*cbc)(in, out, len, key, ivec, 0);
         in += len;
         out += len;
     }
@@ -273,21 +273,21 @@ size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
     /*
      * this places in[16] at &tmp.c[16] and decrypted block at &tmp.c[0]
      */
-    (*cbc) (in, tmp.c, 16, key, tmp.c + 16, 0);
+    (*cbc)(in, tmp.c, 16, key, tmp.c + 16, 0);
 
     memcpy(tmp.c, in + 16, residue);
 #if defined(CBC_HANDLES_TRUNCATED_IO)
-    (*cbc) (tmp.c, out, 16 + residue, key, ivec, 0);
+    (*cbc)(tmp.c, out, 16 + residue, key, ivec, 0);
 #else
-    (*cbc) (tmp.c, tmp.c, 32, key, ivec, 0);
+    (*cbc)(tmp.c, tmp.c, 32, key, ivec, 0);
     memcpy(out, tmp.c, 16 + residue);
 #endif
     return 16 + len + residue;
 }
 
 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)
 {
     size_t residue;
     union {
@@ -301,14 +301,14 @@ size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out,
     residue = len % 16;
 
     if (residue == 0) {
-        (*cbc) (in, out, len, key, ivec, 0);
+        (*cbc)(in, out, len, key, ivec, 0);
         return len;
     }
 
     len -= 16 + residue;
 
     if (len) {
-        (*cbc) (in, out, len, key, ivec, 0);
+        (*cbc)(in, out, len, key, ivec, 0);
         in += len;
         out += len;
     }
@@ -317,13 +317,13 @@ size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out,
     /*
      * this places in[16] at &tmp.c[16] and decrypted block at &tmp.c[0]
      */
-    (*cbc) (in + residue, tmp.c, 16, key, tmp.c + 16, 0);
+    (*cbc)(in + residue, tmp.c, 16, key, tmp.c + 16, 0);
 
     memcpy(tmp.c, in, residue);
 #if defined(CBC_HANDLES_TRUNCATED_IO)
-    (*cbc) (tmp.c, out, 16 + residue, key, ivec, 0);
+    (*cbc)(tmp.c, out, 16 + residue, key, ivec, 0);
 #else
-    (*cbc) (tmp.c, tmp.c, 32, key, ivec, 0);
+    (*cbc)(tmp.c, tmp.c, 32, key, ivec, 0);
     memcpy(out, tmp.c, 16 + residue);
 #endif
     return 16 + len + residue;
diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index 366fe11215ac0..16c13e2961e44 100644
--- a/crypto/modes/gcm128.c
+++ b/crypto/modes/gcm128.c
@@ -21,31 +21,31 @@ typedef size_t size_t_aX;
 
 #if defined(BSWAP4) && defined(STRICT_ALIGNMENT)
 /* redefine, because alignment is ensured */
-# undef  GETU32
-# define GETU32(p)       BSWAP4(*(const u32 *)(p))
-# undef  PUTU32
-# define PUTU32(p,v)     *(u32 *)(p) = BSWAP4(v)
+#undef GETU32
+#define GETU32(p) BSWAP4(*(const u32 *)(p))
+#undef PUTU32
+#define PUTU32(p, v) *(u32 *)(p) = BSWAP4(v)
 #endif
 
 /* RISC-V uses C implementation as a fallback. */
 #if defined(__riscv)
-# define INCLUDE_C_GMULT_4BIT
-# define INCLUDE_C_GHASH_4BIT
-#endif
-
-#define PACK(s)         ((size_t)(s)<<(sizeof(size_t)*8-16))
-#define REDUCE1BIT(V)   do { \
-        if (sizeof(size_t)==8) { \
-                u64 T = U64(0xe100000000000000) & (0-(V.lo&1)); \
-                V.lo  = (V.hi<<63)|(V.lo>>1); \
-                V.hi  = (V.hi>>1 )^T; \
-        } \
-        else { \
-                u32 T = 0xe1000000U & (0-(u32)(V.lo&1)); \
-                V.lo  = (V.hi<<63)|(V.lo>>1); \
-                V.hi  = (V.hi>>1 )^((u64)T<<32); \
-        } \
-} while(0)
+#define INCLUDE_C_GMULT_4BIT
+#define INCLUDE_C_GHASH_4BIT
+#endif
+
+#define PACK(s) ((size_t)(s) << (sizeof(size_t) * 8 - 16))
+#define REDUCE1BIT(V)                                           \
+    do {                                                        \
+        if (sizeof(size_t) == 8) {                              \
+            u64 T = U64(0xe100000000000000) & (0 - (V.lo & 1)); \
+            V.lo = (V.hi << 63) | (V.lo >> 1);                  \
+            V.hi = (V.hi >> 1) ^ T;                             \
+        } else {                                                \
+            u32 T = 0xe1000000U & (0 - (u32)(V.lo & 1));        \
+            V.lo = (V.hi << 63) | (V.lo >> 1);                  \
+            V.hi = (V.hi >> 1) ^ ((u64)T << 32);                \
+        }                                                       \
+    } while (0)
 
 /*-
  *
@@ -88,16 +88,16 @@ typedef size_t size_t_aX;
 static void gcm_init_4bit(u128 Htable[16], const u64 H[2])
 {
     u128 V;
-# if defined(OPENSSL_SMALL_FOOTPRINT)
+#if defined(OPENSSL_SMALL_FOOTPRINT)
     int i;
-# endif
+#endif
 
     Htable[0].hi = 0;
     Htable[0].lo = 0;
     V.hi = H[0];
     V.lo = H[1];
 
-# if defined(OPENSSL_SMALL_FOOTPRINT)
+#if defined(OPENSSL_SMALL_FOOTPRINT)
     for (Htable[8] = V, i = 4; i > 0; i >>= 1) {
         REDUCE1BIT(V);
         Htable[i] = V;
@@ -111,7 +111,7 @@ static void gcm_init_4bit(u128 Htable[16], const u64 H[2])
             Hi[j].lo = V.lo ^ Htable[j].lo;
         }
     }
-# else
+#else
     Htable[8] = V;
     REDUCE1BIT(V);
     Htable[4] = V;
@@ -132,8 +132,8 @@ static void gcm_init_4bit(u128 Htable[16], const u64 H[2])
     Htable[13].hi = V.hi ^ Htable[5].hi, Htable[13].lo = V.lo ^ Htable[5].lo;
     Htable[14].hi = V.hi ^ Htable[6].hi, Htable[14].lo = V.lo ^ Htable[6].lo;
     Htable[15].hi = V.hi ^ Htable[7].hi, Htable[15].lo = V.lo ^ Htable[7].lo;
-# endif
-# if defined(GHASH_ASM) && (defined(__arm__) || defined(__arm))
+#endif
+#if defined(GHASH_ASM) && (defined(__arm__) || defined(__arm))
     /*
      * ARM assembler expects specific dword order in Htable.
      */
@@ -146,17 +146,18 @@ static void gcm_init_4bit(u128 Htable[16], const u64 H[2])
                 V = Htable[j];
                 Htable[j].hi = V.lo;
                 Htable[j].lo = V.hi;
-        } else
+            }
+        else
             for (j = 0; j < 16; ++j) {
                 V = Htable[j];
                 Htable[j].hi = V.lo << 32 | V.lo >> 32;
                 Htable[j].lo = V.hi << 32 | V.hi >> 32;
             }
     }
-# endif
+#endif
 }
 
-# if !defined(GHASH_ASM) || defined(INCLUDE_C_GMULT_4BIT)
+#if !defined(GHASH_ASM) || defined(INCLUDE_C_GMULT_4BIT)
 static const size_t rem_4bit[16] = {
     PACK(0x0000), PACK(0x1C20), PACK(0x3840), PACK(0x2460),
     PACK(0x7080), PACK(0x6CA0), PACK(0x48C0), PACK(0x54E0),
@@ -210,10 +211,10 @@ static void gcm_gmult_4bit(u64 Xi[2], const u128 Htable[16])
     }
 
     if (IS_LITTLE_ENDIAN) {
-#  ifdef BSWAP8
+#ifdef BSWAP8
         Xi[0] = BSWAP8(Z.hi);
         Xi[1] = BSWAP8(Z.lo);
-#  else
+#else
         u8 *p = (u8 *)Xi;
         u32 v;
         v = (u32)(Z.hi >> 32);
@@ -224,17 +225,17 @@ static void gcm_gmult_4bit(u64 Xi[2], const u128 Htable[16])
         PUTU32(p + 8, v);
         v = (u32)(Z.lo);
         PUTU32(p + 12, v);
-#  endif
+#endif
     } else {
         Xi[0] = Z.hi;
         Xi[1] = Z.lo;
     }
 }
 
-# endif
+#endif
 
-# if !defined(GHASH_ASM) || defined(INCLUDE_C_GHASH_4BIT)
-#  if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(GHASH_ASM) || defined(INCLUDE_C_GHASH_4BIT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
 /*
  * Streamed gcm_mult_4bit, see CRYPTO_gcm128_[en|de]crypt for
  * details... Compiler-generated code doesn't seem to give any
@@ -243,7 +244,7 @@ static void gcm_gmult_4bit(u64 Xi[2], const u128 Htable[16])
  * non-trivial optimization[s]...
  */
 static void gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16],
-                           const u8 *inp, size_t len)
+    const u8 *inp, size_t len)
 {
     u128 Z;
     int cnt;
@@ -293,10 +294,10 @@ static void gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16],
         }
 
         if (IS_LITTLE_ENDIAN) {
-#   ifdef BSWAP8
+#ifdef BSWAP8
             Xi[0] = BSWAP8(Z.hi);
             Xi[1] = BSWAP8(Z.lo);
-#   else
+#else
             u8 *p = (u8 *)Xi;
             u32 v;
             v = (u32)(Z.hi >> 32);
@@ -307,7 +308,7 @@ static void gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16],
             PUTU32(p + 8, v);
             v = (u32)(Z.lo);
             PUTU32(p + 12, v);
-#   endif
+#endif
         } else {
             Xi[0] = Z.hi;
             Xi[1] = Z.lo;
@@ -318,91 +319,88 @@ static void gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16],
         len -= 16;
     } while (len > 0);
 }
-#  endif
-# else
+#endif
+#else
 void gcm_gmult_4bit(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16], const u8 *inp,
-                    size_t len);
-# endif
+    size_t len);
+#endif
 
-# define GCM_MUL(ctx)      ctx->funcs.gmult(ctx->Xi.u,ctx->Htable)
-# if defined(GHASH_ASM) || !defined(OPENSSL_SMALL_FOOTPRINT)
-#  define GHASH(ctx,in,len) ctx->funcs.ghash((ctx)->Xi.u,(ctx)->Htable,in,len)
+#define GCM_MUL(ctx) ctx->funcs.gmult(ctx->Xi.u, ctx->Htable)
+#if defined(GHASH_ASM) || !defined(OPENSSL_SMALL_FOOTPRINT)
+#define GHASH(ctx, in, len) ctx->funcs.ghash((ctx)->Xi.u, (ctx)->Htable, in, len)
 /*
  * GHASH_CHUNK is "stride parameter" missioned to mitigate cache trashing
  * effect. In other words idea is to hash data while it's still in L1 cache
  * after encryption pass...
  */
-#  define GHASH_CHUNK       (3*1024)
-# endif
+#define GHASH_CHUNK (3 * 1024)
+#endif
 
-#if     (defined(GHASH_ASM) || defined(OPENSSL_CPUID_OBJ))
-# if    !defined(I386_ONLY) && \
-        (defined(__i386)        || defined(__i386__)    || \
-         defined(__x86_64)      || defined(__x86_64__)  || \
-         defined(_M_IX86)       || defined(_M_AMD64)    || defined(_M_X64))
-#  define GHASH_ASM_X86_OR_64
+#if (defined(GHASH_ASM) || defined(OPENSSL_CPUID_OBJ))
+#if !defined(I386_ONLY) && (defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
+#define GHASH_ASM_X86_OR_64
 
 void gcm_init_clmul(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_clmul(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_clmul(u64 Xi[2], const u128 Htable[16], const u8 *inp,
-                     size_t len);
+    size_t len);
 
-#  if defined(__i386) || defined(__i386__) || defined(_M_IX86)
-#   define gcm_init_avx   gcm_init_clmul
-#   define gcm_gmult_avx  gcm_gmult_clmul
-#   define gcm_ghash_avx  gcm_ghash_clmul
-#  else
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
+#define gcm_init_avx gcm_init_clmul
+#define gcm_gmult_avx gcm_gmult_clmul
+#define gcm_ghash_avx gcm_ghash_clmul
+#else
 void gcm_init_avx(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_avx(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_avx(u64 Xi[2], const u128 Htable[16], const u8 *inp,
-                   size_t len);
-#  endif
+    size_t len);
+#endif
 
-#  if   defined(__i386) || defined(__i386__) || defined(_M_IX86)
-#   define GHASH_ASM_X86
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
+#define GHASH_ASM_X86
 void gcm_gmult_4bit_mmx(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_4bit_mmx(u64 Xi[2], const u128 Htable[16], const u8 *inp,
-                        size_t len);
+    size_t len);
 
 void gcm_gmult_4bit_x86(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_4bit_x86(u64 Xi[2], const u128 Htable[16], const u8 *inp,
-                        size_t len);
-#  endif
-# elif defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(_M_ARM64)
-#  include "arm_arch.h"
-#  if __ARM_MAX_ARCH__>=7
-#   define GHASH_ASM_ARM
-#   define PMULL_CAPABLE        (OPENSSL_armcap_P & ARMV8_PMULL)
-#   if defined(__arm__) || defined(__arm)
-#    define NEON_CAPABLE        (OPENSSL_armcap_P & ARMV7_NEON)
-#   endif
+    size_t len);
+#endif
+#elif defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(_M_ARM64)
+#include "arm_arch.h"
+#if __ARM_MAX_ARCH__ >= 7
+#define GHASH_ASM_ARM
+#define PMULL_CAPABLE (OPENSSL_armcap_P & ARMV8_PMULL)
+#if defined(__arm__) || defined(__arm)
+#define NEON_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
+#endif
 void gcm_init_neon(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_neon(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_neon(u64 Xi[2], const u128 Htable[16], const u8 *inp,
-                    size_t len);
+    size_t len);
 void gcm_init_v8(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_v8(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_v8(u64 Xi[2], const u128 Htable[16], const u8 *inp,
-                  size_t len);
-#  endif
-# elif defined(__sparc__) || defined(__sparc)
-#  include "crypto/sparc_arch.h"
-#  define GHASH_ASM_SPARC
+    size_t len);
+#endif
+#elif defined(__sparc__) || defined(__sparc)
+#include "crypto/sparc_arch.h"
+#define GHASH_ASM_SPARC
 void gcm_init_vis3(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_vis3(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_vis3(u64 Xi[2], const u128 Htable[16], const u8 *inp,
-                    size_t len);
-# elif defined(OPENSSL_CPUID_OBJ) && (defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC))
-#  include "crypto/ppc_arch.h"
-#  define GHASH_ASM_PPC
+    size_t len);
+#elif defined(OPENSSL_CPUID_OBJ) && (defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC))
+#include "crypto/ppc_arch.h"
+#define GHASH_ASM_PPC
 void gcm_init_p8(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_p8(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_p8(u64 Xi[2], const u128 Htable[16], const u8 *inp,
-                  size_t len);
-# elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-#  include "crypto/riscv_arch.h"
-#  define GHASH_ASM_RV64I
+    size_t len);
+#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
+#include "crypto/riscv_arch.h"
+#define GHASH_ASM_RV64I
 /* Zbc/Zbkc (scalar crypto with clmul) based routines. */
 void gcm_init_rv64i_zbc(u128 Htable[16], const u64 Xi[2]);
 void gcm_init_rv64i_zbc__zbb(u128 Htable[16], const u64 Xi[2]);
@@ -410,21 +408,21 @@ void gcm_init_rv64i_zbc__zbkb(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_rv64i_zbc(u64 Xi[2], const u128 Htable[16]);
 void gcm_gmult_rv64i_zbc__zbkb(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_rv64i_zbc(u64 Xi[2], const u128 Htable[16],
-                         const u8 *inp, size_t len);
+    const u8 *inp, size_t len);
 void gcm_ghash_rv64i_zbc__zbkb(u64 Xi[2], const u128 Htable[16],
-                               const u8 *inp, size_t len);
+    const u8 *inp, size_t len);
 /* zvkb/Zvbc (vector crypto with vclmul) based routines. */
 void gcm_init_rv64i_zvkb_zvbc(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_rv64i_zvkb_zvbc(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_rv64i_zvkb_zvbc(u64 Xi[2], const u128 Htable[16],
-                               const u8 *inp, size_t len);
+    const u8 *inp, size_t len);
 /* Zvkg (vector crypto with vgmul.vv and vghsh.vv). */
 void gcm_init_rv64i_zvkg(u128 Htable[16], const u64 Xi[2]);
 void gcm_init_rv64i_zvkg_zvkb(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_rv64i_zvkg(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_rv64i_zvkg(u64 Xi[2], const u128 Htable[16],
-                          const u8 *inp, size_t len);
-# endif
+    const u8 *inp, size_t len);
+#endif
 #endif
 
 static void gcm_get_funcs(struct gcm_funcs_st *ctx)
@@ -443,7 +441,7 @@ static void gcm_get_funcs(struct gcm_funcs_st *ctx)
 #endif
 
 #if defined(GHASH_ASM_X86_OR_64)
-# if !defined(GHASH_ASM_X86) || defined(OPENSSL_IA32_SSE2)
+#if !defined(GHASH_ASM_X86) || defined(OPENSSL_IA32_SSE2)
     /* x86_64 */
     if (OPENSSL_ia32cap_P[1] & (1 << 1)) { /* check PCLMULQDQ bit */
         if (((OPENSSL_ia32cap_P[1] >> 22) & 0x41) == 0x41) { /* AVX+MOVBE */
@@ -457,52 +455,52 @@ static void gcm_get_funcs(struct gcm_funcs_st *ctx)
         }
         return;
     }
-# endif
-# if defined(GHASH_ASM_X86)
+#endif
+#if defined(GHASH_ASM_X86)
     /* x86 only */
-#  if defined(OPENSSL_IA32_SSE2)
+#if defined(OPENSSL_IA32_SSE2)
     if (OPENSSL_ia32cap_P[0] & (1 << 25)) { /* check SSE bit */
         ctx->gmult = gcm_gmult_4bit_mmx;
         ctx->ghash = gcm_ghash_4bit_mmx;
         return;
     }
-#  else
+#else
     if (OPENSSL_ia32cap_P[0] & (1 << 23)) { /* check MMX bit */
         ctx->gmult = gcm_gmult_4bit_mmx;
         ctx->ghash = gcm_ghash_4bit_mmx;
         return;
     }
-#  endif
+#endif
     ctx->gmult = gcm_gmult_4bit_x86;
     ctx->ghash = gcm_ghash_4bit_x86;
     return;
-# else
+#else
     /* x86_64 fallback defaults */
     ctx->gmult = gcm_gmult_4bit;
     ctx->ghash = gcm_ghash_4bit;
     return;
-# endif
+#endif
 #elif defined(GHASH_ASM_ARM)
     /* ARM defaults */
     ctx->gmult = gcm_gmult_4bit;
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
     ctx->ghash = gcm_ghash_4bit;
-# else
+#else
     ctx->ghash = NULL;
-# endif
-# ifdef PMULL_CAPABLE
+#endif
+#ifdef PMULL_CAPABLE
     if (PMULL_CAPABLE) {
         ctx->ginit = (gcm_init_fn)gcm_init_v8;
         ctx->gmult = gcm_gmult_v8;
         ctx->ghash = gcm_ghash_v8;
     }
-# elif defined(NEON_CAPABLE)
+#elif defined(NEON_CAPABLE)
     if (NEON_CAPABLE) {
         ctx->ginit = gcm_init_neon;
         ctx->gmult = gcm_gmult_neon;
         ctx->ghash = gcm_ghash_neon;
     }
-# endif
+#endif
     return;
 #elif defined(GHASH_ASM_SPARC)
     /* SPARC defaults */
@@ -579,7 +577,7 @@ void ossl_gcm_gmult_4bit(u64 Xi[2], const u128 Htable[16])
 }
 
 void ossl_gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16],
-                         const u8 *inp, size_t len)
+    const u8 *inp, size_t len)
 {
     struct gcm_funcs_st funcs;
     u64 tmp[2];
@@ -607,7 +605,7 @@ void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx, void *key, block128_f block)
     ctx->block = block;
     ctx->key = key;
 
-    (*block) (ctx->H.c, ctx->H.c, key);
+    (*block)(ctx->H.c, ctx->H.c, key);
 
     if (IS_LITTLE_ENDIAN) {
         /* H is stored in host byte order */
@@ -629,13 +627,13 @@ 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)
 {
     DECLARE_IS_ENDIAN;
     unsigned int ctr;
 
-    ctx->len.u[0] = 0;          /* AAD length */
-    ctx->len.u[1] = 0;          /* message length */
+    ctx->len.u[0] = 0; /* AAD length */
+    ctx->len.u[1] = 0; /* message length */
     ctx->ares = 0;
     ctx->mres = 0;
 
@@ -703,7 +701,7 @@ void CRYPTO_gcm128_setiv(GCM128_CONTEXT *ctx, const unsigned char *iv,
     ctx->Xi.u[0] = 0;
     ctx->Xi.u[1] = 0;
 
-    (*ctx->block) (ctx->Yi.c, ctx->EK0.c, ctx->key);
+    (*ctx->block)(ctx->Yi.c, ctx->EK0.c, ctx->key);
     ++ctr;
     if (IS_LITTLE_ENDIAN)
 #ifdef BSWAP4
@@ -716,7 +714,7 @@ void CRYPTO_gcm128_setiv(GCM128_CONTEXT *ctx, const unsigned char *iv,
 }
 
 int CRYPTO_gcm128_aad(GCM128_CONTEXT *ctx, const unsigned char *aad,
-                      size_t len)
+    size_t len)
 {
     size_t i;
     unsigned int n;
@@ -770,8 +768,8 @@ int CRYPTO_gcm128_aad(GCM128_CONTEXT *ctx, const unsigned char *aad,
 }
 
 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)
 {
     DECLARE_IS_ENDIAN;
     unsigned int n, ctr, mres;
@@ -819,7 +817,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
     if (16 % sizeof(size_t) == 0) { /* always true actually */
         do {
             if (n) {
-# if defined(GHASH)
+#if defined(GHASH)
                 while (n && len) {
                     ctx->Xn[mres++] = *(out++) = *(in++) ^ ctx->EKi.c[n];
                     --len;
@@ -832,7 +830,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
                     ctx->mres = mres;
                     return 0;
                 }
-# else
+#else
                 while (n && len) {
                     ctx->Xi.c[n] ^= *(out++) = *(in++) ^ ctx->EKi.c[n];
                     --len;
@@ -845,18 +843,18 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
                     ctx->mres = n;
                     return 0;
                 }
-# endif
+#endif
             }
-# if defined(STRICT_ALIGNMENT)
+#if defined(STRICT_ALIGNMENT)
             if (((size_t)in | (size_t)out) % sizeof(size_t) != 0)
                 break;
-# endif
-# if defined(GHASH)
+#endif
+#if defined(GHASH)
             if (len >= 16 && mres) {
                 GHASH(ctx, ctx->Xn, mres);
                 mres = 0;
             }
-#  if defined(GHASH_CHUNK)
+#if defined(GHASH_CHUNK)
             while (len >= GHASH_CHUNK) {
                 size_t j = GHASH_CHUNK;
 
@@ -864,14 +862,14 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
                     size_t_aX *out_t = (size_t_aX *)out;
                     const size_t_aX *in_t = (const size_t_aX *)in;
 
-                    (*block) (ctx->Yi.c, ctx->EKi.c, key);
+                    (*block)(ctx->Yi.c, ctx->EKi.c, key);
                     ++ctr;
                     if (IS_LITTLE_ENDIAN)
-#   ifdef BSWAP4
+#ifdef BSWAP4
                         ctx->Yi.d[3] = BSWAP4(ctr);
-#   else
+#else
                         PUTU32(ctx->Yi.c + 12, ctr);
-#   endif
+#endif
                     else
                         ctx->Yi.d[3] = ctr;
                     for (i = 0; i < 16 / sizeof(size_t); ++i)
@@ -883,7 +881,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
                 GHASH(ctx, out - GHASH_CHUNK, GHASH_CHUNK);
                 len -= GHASH_CHUNK;
             }
-#  endif
+#endif
             if ((i = (len & (size_t)-16))) {
                 size_t j = i;
 
@@ -891,14 +889,14 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
                     size_t_aX *out_t = (size_t_aX *)out;
                     const size_t_aX *in_t = (const size_t_aX *)in;
 
-                    (*block) (ctx->Yi.c, ctx->EKi.c, key);
+                    (*block)(ctx->Yi.c, ctx->EKi.c, key);
                     ++ctr;
                     if (IS_LITTLE_ENDIAN)
-#  ifdef BSWAP4
+#ifdef BSWAP4
                         ctx->Yi.d[3] = BSWAP4(ctr);
-#  else
+#else
                         PUTU32(ctx->Yi.c + 12, ctr);
-#  endif
+#endif
                     else
                         ctx->Yi.d[3] = ctr;
                     for (i = 0; i < 16 / sizeof(size_t); ++i)
@@ -909,19 +907,19 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
                 }
                 GHASH(ctx, out - j, j);
             }
-# else
+#else
             while (len >= 16) {
                 size_t *out_t = (size_t *)out;
                 const size_t *in_t = (const size_t *)in;
 
-                (*block) (ctx->Yi.c, ctx->EKi.c, key);
+                (*block)(ctx->Yi.c, ctx->EKi.c, key);
                 ++ctr;
                 if (IS_LITTLE_ENDIAN)
-#  ifdef BSWAP4
+#ifdef BSWAP4
                     ctx->Yi.d[3] = BSWAP4(ctr);
-#  else
+#else
                     PUTU32(ctx->Yi.c + 12, ctr);
-#  endif
+#endif
                 else
                     ctx->Yi.d[3] = ctr;
                 for (i = 0; i < 16 / sizeof(size_t); ++i)
@@ -931,30 +929,30 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
                 in += 16;
                 len -= 16;
             }
-# endif
+#endif
             if (len) {
-                (*block) (ctx->Yi.c, ctx->EKi.c, key);
+                (*block)(ctx->Yi.c, ctx->EKi.c, key);
                 ++ctr;
                 if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
                     ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
                     PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
                 else
                     ctx->Yi.d[3] = ctr;
-# if defined(GHASH)
+#if defined(GHASH)
                 while (len--) {
                     ctx->Xn[mres++] = out[n] = in[n] ^ ctx->EKi.c[n];
                     ++n;
                 }
-# else
+#else
                 while (len--) {
                     ctx->Xi.c[n] ^= out[n] = in[n] ^ ctx->EKi.c[n];
                     ++n;
                 }
                 mres = n;
-# endif
+#endif
             }
 
             ctx->mres = mres;
@@ -964,7 +962,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
 #endif
     for (i = 0; i < len; ++i) {
         if (n == 0) {
-            (*block) (ctx->Yi.c, ctx->EKi.c, key);
+            (*block)(ctx->Yi.c, ctx->EKi.c, key);
             ++ctr;
             if (IS_LITTLE_ENDIAN)
 #ifdef BSWAP4
@@ -979,7 +977,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
         ctx->Xn[mres++] = out[i] = in[i] ^ ctx->EKi.c[n];
         n = (n + 1) % 16;
         if (mres == sizeof(ctx->Xn)) {
-            GHASH(ctx,ctx->Xn,sizeof(ctx->Xn));
+            GHASH(ctx, ctx->Xn, sizeof(ctx->Xn));
             mres = 0;
         }
 #else
@@ -995,8 +993,8 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
 }
 
 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)
 {
     DECLARE_IS_ENDIAN;
     unsigned int n, ctr, mres;
@@ -1044,7 +1042,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
     if (16 % sizeof(size_t) == 0) { /* always true actually */
         do {
             if (n) {
-# if defined(GHASH)
+#if defined(GHASH)
                 while (n && len) {
                     *(out++) = (ctx->Xn[mres++] = *(in++)) ^ ctx->EKi.c[n];
                     --len;
@@ -1057,7 +1055,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
                     ctx->mres = mres;
                     return 0;
                 }
-# else
+#else
                 while (n && len) {
                     u8 c = *(in++);
                     *(out++) = c ^ ctx->EKi.c[n];
@@ -1072,18 +1070,18 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
                     ctx->mres = n;
                     return 0;
                 }
-# endif
+#endif
             }
-# if defined(STRICT_ALIGNMENT)
+#if defined(STRICT_ALIGNMENT)
             if (((size_t)in | (size_t)out) % sizeof(size_t) != 0)
                 break;
-# endif
-# if defined(GHASH)
+#endif
+#if defined(GHASH)
             if (len >= 16 && mres) {
                 GHASH(ctx, ctx->Xn, mres);
                 mres = 0;
             }
-#  if defined(GHASH_CHUNK)
+#if defined(GHASH_CHUNK)
             while (len >= GHASH_CHUNK) {
                 size_t j = GHASH_CHUNK;
 
@@ -1092,14 +1090,14 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
                     size_t_aX *out_t = (size_t_aX *)out;
                     const size_t_aX *in_t = (const size_t_aX *)in;
 
-                    (*block) (ctx->Yi.c, ctx->EKi.c, key);
+                    (*block)(ctx->Yi.c, ctx->EKi.c, key);
                     ++ctr;
                     if (IS_LITTLE_ENDIAN)
-#   ifdef BSWAP4
+#ifdef BSWAP4
                         ctx->Yi.d[3] = BSWAP4(ctr);
-#   else
+#else
                         PUTU32(ctx->Yi.c + 12, ctr);
-#   endif
+#endif
                     else
                         ctx->Yi.d[3] = ctr;
                     for (i = 0; i < 16 / sizeof(size_t); ++i)
@@ -1110,21 +1108,21 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
                 }
                 len -= GHASH_CHUNK;
             }
-#  endif
+#endif
             if ((i = (len & (size_t)-16))) {
                 GHASH(ctx, in, i);
                 while (len >= 16) {
                     size_t_aX *out_t = (size_t_aX *)out;
                     const size_t_aX *in_t = (const size_t_aX *)in;
 
-                    (*block) (ctx->Yi.c, ctx->EKi.c, key);
+                    (*block)(ctx->Yi.c, ctx->EKi.c, key);
                     ++ctr;
                     if (IS_LITTLE_ENDIAN)
-#  ifdef BSWAP4
+#ifdef BSWAP4
                         ctx->Yi.d[3] = BSWAP4(ctr);
-#  else
+#else
                         PUTU32(ctx->Yi.c + 12, ctr);
-#  endif
+#endif
                     else
                         ctx->Yi.d[3] = ctr;
                     for (i = 0; i < 16 / sizeof(size_t); ++i)
@@ -1134,19 +1132,19 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
                     len -= 16;
                 }
             }
-# else
+#else
             while (len >= 16) {
                 size_t *out_t = (size_t *)out;
                 const size_t *in_t = (const size_t *)in;
 
-                (*block) (ctx->Yi.c, ctx->EKi.c, key);
+                (*block)(ctx->Yi.c, ctx->EKi.c, key);
                 ++ctr;
                 if (IS_LITTLE_ENDIAN)
-#  ifdef BSWAP4
+#ifdef BSWAP4
                     ctx->Yi.d[3] = BSWAP4(ctr);
-#  else
+#else
                     PUTU32(ctx->Yi.c + 12, ctr);
-#  endif
+#endif
                 else
                     ctx->Yi.d[3] = ctr;
                 for (i = 0; i < 16 / sizeof(size_t); ++i) {
@@ -1159,24 +1157,24 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
                 in += 16;
                 len -= 16;
             }
-# endif
+#endif
             if (len) {
-                (*block) (ctx->Yi.c, ctx->EKi.c, key);
+                (*block)(ctx->Yi.c, ctx->EKi.c, key);
                 ++ctr;
                 if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
                     ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
                     PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
                 else
                     ctx->Yi.d[3] = ctr;
-# if defined(GHASH)
+#if defined(GHASH)
                 while (len--) {
                     out[n] = (ctx->Xn[mres++] = in[n]) ^ ctx->EKi.c[n];
                     ++n;
                 }
-# else
+#else
                 while (len--) {
                     u8 c = in[n];
                     ctx->Xi.c[n] ^= c;
@@ -1184,7 +1182,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
                     ++n;
                 }
                 mres = n;
-# endif
+#endif
             }
 
             ctx->mres = mres;
@@ -1195,7 +1193,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
     for (i = 0; i < len; ++i) {
         u8 c;
         if (n == 0) {
-            (*block) (ctx->Yi.c, ctx->EKi.c, key);
+            (*block)(ctx->Yi.c, ctx->EKi.c, key);
             ++ctr;
             if (IS_LITTLE_ENDIAN)
 #ifdef BSWAP4
@@ -1210,7 +1208,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
         out[i] = (ctx->Xn[mres++] = c = in[i]) ^ ctx->EKi.c[n];
         n = (n + 1) % 16;
         if (mres == sizeof(ctx->Xn)) {
-            GHASH(ctx,ctx->Xn,sizeof(ctx->Xn));
+            GHASH(ctx, ctx->Xn, sizeof(ctx->Xn));
             mres = 0;
         }
 #else
@@ -1228,8 +1226,8 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
 }
 
 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)
 {
 #if defined(OPENSSL_SMALL_FOOTPRINT)
     return CRYPTO_gcm128_encrypt(ctx, in, out, len);
@@ -1266,17 +1264,17 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
     }
 
     if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
         ctr = BSWAP4(ctx->Yi.d[3]);
-# else
+#else
         ctr = GETU32(ctx->Yi.c + 12);
-# endif
+#endif
     else
         ctr = ctx->Yi.d[3];
 
     n = mres % 16;
     if (n) {
-# if defined(GHASH)
+#if defined(GHASH)
         while (n && len) {
             ctx->Xn[mres++] = *(out++) = *(in++) ^ ctx->EKi.c[n];
             --len;
@@ -1289,7 +1287,7 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
             ctx->mres = mres;
             return 0;
         }
-# else
+#else
         while (n && len) {
             ctx->Xi.c[n] ^= *(out++) = *(in++) ^ ctx->EKi.c[n];
             --len;
@@ -1302,23 +1300,23 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
             ctx->mres = n;
             return 0;
         }
-# endif
+#endif
     }
-# if defined(GHASH)
-        if (len >= 16 && mres) {
-            GHASH(ctx, ctx->Xn, mres);
-            mres = 0;
-        }
-#  if defined(GHASH_CHUNK)
+#if defined(GHASH)
+    if (len >= 16 && mres) {
+        GHASH(ctx, ctx->Xn, mres);
+        mres = 0;
+    }
+#if defined(GHASH_CHUNK)
     while (len >= GHASH_CHUNK) {
-        (*stream) (in, out, GHASH_CHUNK / 16, key, ctx->Yi.c);
+        (*stream)(in, out, GHASH_CHUNK / 16, key, ctx->Yi.c);
         ctr += GHASH_CHUNK / 16;
         if (IS_LITTLE_ENDIAN)
-#   ifdef BSWAP4
+#ifdef BSWAP4
             ctx->Yi.d[3] = BSWAP4(ctr);
-#   else
+#else
             PUTU32(ctx->Yi.c + 12, ctr);
-#   endif
+#endif
         else
             ctx->Yi.d[3] = ctr;
         GHASH(ctx, out, GHASH_CHUNK);
@@ -1326,52 +1324,52 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
         in += GHASH_CHUNK;
         len -= GHASH_CHUNK;
     }
-#  endif
-# endif
+#endif
+#endif
     if ((i = (len & (size_t)-16))) {
         size_t j = i / 16;
 
-        (*stream) (in, out, j, key, ctx->Yi.c);
+        (*stream)(in, out, j, key, ctx->Yi.c);
         ctr += (unsigned int)j;
         if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
             ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
             PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
         else
             ctx->Yi.d[3] = ctr;
         in += i;
         len -= i;
-# if defined(GHASH)
+#if defined(GHASH)
         GHASH(ctx, out, i);
         out += i;
-# else
+#else
         while (j--) {
             for (i = 0; i < 16; ++i)
                 ctx->Xi.c[i] ^= out[i];
             GCM_MUL(ctx);
             out += 16;
         }
-# endif
+#endif
     }
     if (len) {
-        (*ctx->block) (ctx->Yi.c, ctx->EKi.c, key);
+        (*ctx->block)(ctx->Yi.c, ctx->EKi.c, key);
         ++ctr;
         if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
             ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
             PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
         else
             ctx->Yi.d[3] = ctr;
         while (len--) {
-# if defined(GHASH)
+#if defined(GHASH)
             ctx->Xn[mres++] = out[n] = in[n] ^ ctx->EKi.c[n];
-# else
+#else
             ctx->Xi.c[mres++] ^= out[n] = in[n] ^ ctx->EKi.c[n];
-# endif
+#endif
             ++n;
         }
     }
@@ -1382,8 +1380,8 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
 }
 
 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)
 {
 #if defined(OPENSSL_SMALL_FOOTPRINT)
     return CRYPTO_gcm128_decrypt(ctx, in, out, len);
@@ -1403,7 +1401,7 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
 
     if (ctx->ares) {
         /* First call to decrypt finalizes GHASH(AAD) */
-# if defined(GHASH)
+#if defined(GHASH)
         if (len == 0) {
             GCM_MUL(ctx);
             ctx->ares = 0;
@@ -1413,24 +1411,24 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
         ctx->Xi.u[0] = 0;
         ctx->Xi.u[1] = 0;
         mres = sizeof(ctx->Xi);
-# else
+#else
         GCM_MUL(ctx);
-# endif
+#endif
         ctx->ares = 0;
     }
 
     if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
         ctr = BSWAP4(ctx->Yi.d[3]);
-# else
+#else
         ctr = GETU32(ctx->Yi.c + 12);
-# endif
+#endif
     else
         ctr = ctx->Yi.d[3];
 
     n = mres % 16;
     if (n) {
-# if defined(GHASH)
+#if defined(GHASH)
         while (n && len) {
             *(out++) = (ctx->Xn[mres++] = *(in++)) ^ ctx->EKi.c[n];
             --len;
@@ -1443,7 +1441,7 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
             ctx->mres = mres;
             return 0;
         }
-# else
+#else
         while (n && len) {
             u8 c = *(in++);
             *(out++) = c ^ ctx->EKi.c[n];
@@ -1458,38 +1456,38 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
             ctx->mres = n;
             return 0;
         }
-# endif
+#endif
     }
-# if defined(GHASH)
+#if defined(GHASH)
     if (len >= 16 && mres) {
         GHASH(ctx, ctx->Xn, mres);
         mres = 0;
     }
-#  if defined(GHASH_CHUNK)
+#if defined(GHASH_CHUNK)
     while (len >= GHASH_CHUNK) {
         GHASH(ctx, in, GHASH_CHUNK);
-        (*stream) (in, out, GHASH_CHUNK / 16, key, ctx->Yi.c);
+        (*stream)(in, out, GHASH_CHUNK / 16, key, ctx->Yi.c);
         ctr += GHASH_CHUNK / 16;
         if (IS_LITTLE_ENDIAN)
-#   ifdef BSWAP4
+#ifdef BSWAP4
             ctx->Yi.d[3] = BSWAP4(ctr);
-#   else
+#else
             PUTU32(ctx->Yi.c + 12, ctr);
-#   endif
+#endif
         else
             ctx->Yi.d[3] = ctr;
         out += GHASH_CHUNK;
         in += GHASH_CHUNK;
         len -= GHASH_CHUNK;
     }
-#  endif
-# endif
+#endif
+#endif
     if ((i = (len & (size_t)-16))) {
         size_t j = i / 16;
 
-# if defined(GHASH)
+#if defined(GHASH)
         GHASH(ctx, in, i);
-# else
+#else
         while (j--) {
             size_t k;
             for (k = 0; k < 16; ++k)
@@ -1499,15 +1497,15 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
         }
         j = i / 16;
         in -= i;
-# endif
-        (*stream) (in, out, j, key, ctx->Yi.c);
+#endif
+        (*stream)(in, out, j, key, ctx->Yi.c);
         ctr += (unsigned int)j;
         if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
             ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
             PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
         else
             ctx->Yi.d[3] = ctr;
         out += i;
@@ -1515,24 +1513,24 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
         len -= i;
     }
     if (len) {
-        (*ctx->block) (ctx->Yi.c, ctx->EKi.c, key);
+        (*ctx->block)(ctx->Yi.c, ctx->EKi.c, key);
         ++ctr;
         if (IS_LITTLE_ENDIAN)
-# ifdef BSWAP4
+#ifdef BSWAP4
             ctx->Yi.d[3] = BSWAP4(ctr);
-# else
+#else
             PUTU32(ctx->Yi.c + 12, ctr);
-# endif
+#endif
         else
             ctx->Yi.d[3] = ctr;
         while (len--) {
-# if defined(GHASH)
+#if defined(GHASH)
             out[n] = (ctx->Xn[mres++] = in[n]) ^ ctx->EKi.c[n];
-# else
+#else
             u8 c = in[n];
             ctx->Xi.c[mres++] ^= c;
             out[n] = c ^ ctx->EKi.c[n];
-# endif
+#endif
             ++n;
         }
     }
@@ -1543,7 +1541,7 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
 }
 
 int CRYPTO_gcm128_finish(GCM128_CONTEXT *ctx, const unsigned char *tag,
-                         size_t len)
+    size_t len)
 {
     DECLARE_IS_ENDIAN;
     u64 alen = ctx->len.u[0] << 3;
@@ -1610,7 +1608,7 @@ void CRYPTO_gcm128_tag(GCM128_CONTEXT *ctx, unsigned char *tag, size_t len)
 {
     CRYPTO_gcm128_finish(ctx, NULL, 0);
     memcpy(tag, ctx->Xi.c,
-           len <= sizeof(ctx->Xi.c) ? len : sizeof(ctx->Xi.c));
+        len <= sizeof(ctx->Xi.c) ? len : sizeof(ctx->Xi.c));
 }
 
 GCM128_CONTEXT *CRYPTO_gcm128_new(void *key, block128_f block)
diff --git a/crypto/modes/ocb128.c b/crypto/modes/ocb128.c
index 1ae807c100d01..857730c9aa9d5 100644
--- a/crypto/modes/ocb128.c
+++ b/crypto/modes/ocb128.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2014-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -40,7 +40,7 @@ static u32 ocb_ntz(u64 n)
  * Shift a block of 16 bytes left by shift bits
  */
 static void ocb_block_lshift(const unsigned char *in, size_t shift,
-                             unsigned char *out)
+    unsigned char *out)
 {
     int i;
     unsigned char carry = 0, carry_next;
@@ -76,8 +76,8 @@ static void ocb_double(OCB_BLOCK *in, OCB_BLOCK *out)
  * Perform an xor on in1 and in2 - each of len bytes. Store result in out
  */
 static void ocb_block_xor(const unsigned char *in1,
-                          const unsigned char *in2, size_t len,
-                          unsigned char *out)
+    const unsigned char *in2, size_t len,
+    unsigned char *out)
 {
     size_t i;
     for (i = 0; i < len; i++) {
@@ -128,15 +128,15 @@ static OCB_BLOCK *ocb_lookup_l(OCB128_CONTEXT *ctx, size_t idx)
  * Create a new OCB128_CONTEXT
  */
 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)
 {
     OCB128_CONTEXT *octx;
     int ret;
 
     if ((octx = OPENSSL_malloc(sizeof(*octx))) != NULL) {
         ret = CRYPTO_ocb128_init(octx, keyenc, keydec, encrypt, decrypt,
-                                 stream);
+            stream);
         if (ret)
             return octx;
         OPENSSL_free(octx);
@@ -149,8 +149,8 @@ OCB128_CONTEXT *CRYPTO_ocb128_new(void *keyenc, void *keydec,
  * Initialise an existing OCB128_CONTEXT
  */
 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)
 {
     memset(ctx, 0, sizeof(*ctx));
     ctx->l_index = 0;
@@ -179,11 +179,11 @@ int CRYPTO_ocb128_init(OCB128_CONTEXT *ctx, void *keyenc, void *keydec,
     ocb_double(&ctx->l_dollar, ctx->l);
 
     /* L_{i} = double(L_{i-1}) */
-    ocb_double(ctx->l, ctx->l+1);
-    ocb_double(ctx->l+1, ctx->l+2);
-    ocb_double(ctx->l+2, ctx->l+3);
-    ocb_double(ctx->l+3, ctx->l+4);
-    ctx->l_index = 4;   /* enough to process up to 496 bytes */
+    ocb_double(ctx->l, ctx->l + 1);
+    ocb_double(ctx->l + 1, ctx->l + 2);
+    ocb_double(ctx->l + 2, ctx->l + 3);
+    ocb_double(ctx->l + 3, ctx->l + 4);
+    ctx->l_index = 4; /* enough to process up to 496 bytes */
 
     return 1;
 }
@@ -192,7 +192,7 @@ int CRYPTO_ocb128_init(OCB128_CONTEXT *ctx, void *keyenc, void *keydec,
  * Copy an OCB128_CONTEXT object
  */
 int CRYPTO_ocb128_copy_ctx(OCB128_CONTEXT *dest, OCB128_CONTEXT *src,
-                           void *keyenc, void *keydec)
+    void *keyenc, void *keydec)
 {
     memcpy(dest, src, sizeof(OCB128_CONTEXT));
     if (keyenc)
@@ -211,7 +211,7 @@ int CRYPTO_ocb128_copy_ctx(OCB128_CONTEXT *dest, OCB128_CONTEXT *src,
  * Set the IV to be used for this operation. Must be 1 - 15 bytes.
  */
 int CRYPTO_ocb128_setiv(OCB128_CONTEXT *ctx, const unsigned char *iv,
-                        size_t len, size_t taglen)
+    size_t len, size_t taglen)
 {
     unsigned char ktop[16], tmp[16], mask;
     unsigned char stretch[24], nonce[16];
@@ -251,8 +251,7 @@ int CRYPTO_ocb128_setiv(OCB128_CONTEXT *ctx, const unsigned char *iv,
     ocb_block_lshift(stretch + (bottom / 8), shift, ctx->sess.offset.c);
     mask = 0xff;
     mask <<= 8 - shift;
-    ctx->sess.offset.c[15] |=
-        (*(stretch + (bottom / 8) + 16) & mask) >> (8 - shift);
+    ctx->sess.offset.c[15] |= (*(stretch + (bottom / 8) + 16) & mask) >> (8 - shift);
 
     return 1;
 }
@@ -262,7 +261,7 @@ int CRYPTO_ocb128_setiv(OCB128_CONTEXT *ctx, const unsigned char *iv,
  * have a partial block
  */
 int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad,
-                      size_t len)
+    size_t len)
 {
     u64 i, all_num_blocks;
     size_t num_blocks, last_len;
@@ -300,7 +299,7 @@ int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad,
     if (last_len > 0) {
         /* Offset_* = Offset_m xor L_* */
         ocb_block16_xor(&ctx->sess.offset_aad, &ctx->l_star,
-                        &ctx->sess.offset_aad);
+            &ctx->sess.offset_aad);
 
         /* CipherInput = (A_* || 1 || zeros(127-bitlen(A_*))) xor Offset_* */
         memset(tmp.c, 0, 16);
@@ -323,8 +322,8 @@ int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad,
  * the final time can have a partial block
  */
 int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx,
-                          const unsigned char *in, unsigned char *out,
-                          size_t len)
+    const unsigned char *in, unsigned char *out,
+    size_t len)
 {
     u64 i, all_num_blocks;
     size_t num_blocks, last_len;
@@ -338,7 +337,7 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx,
 
     if (num_blocks && all_num_blocks == (size_t)all_num_blocks
         && ctx->stream != NULL) {
-        size_t max_idx = 0, top = (size_t)all_num_blocks;
+        size_t max_idx = 0, top = (size_t)all_num_blocks, processed_bytes = 0;
 
         /*
          * See how many L_{i} entries we need to process data at hand
@@ -350,8 +349,11 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx,
             return 0;
 
         ctx->stream(in, out, num_blocks, ctx->keyenc,
-                    (size_t)ctx->sess.blocks_processed + 1, ctx->sess.offset.c,
-                    (const unsigned char (*)[16])ctx->l, ctx->sess.checksum.c);
+            (size_t)ctx->sess.blocks_processed + 1, ctx->sess.offset.c,
+            (const unsigned char (*)[16])ctx->l, ctx->sess.checksum.c);
+        processed_bytes = num_blocks * 16;
+        in += processed_bytes;
+        out += processed_bytes;
     } else {
         /* Loop through all full blocks to be encrypted */
         for (i = ctx->sess.blocks_processed + 1; i <= all_num_blocks; i++) {
@@ -399,7 +401,7 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx,
         ocb_block_xor(in, pad.c, last_len, out);
 
         /* Checksum_* = Checksum_m xor (P_* || 1 || zeros(127-bitlen(P_*))) */
-        memset(pad.c, 0, 16);           /* borrow pad */
+        memset(pad.c, 0, 16); /* borrow pad */
         memcpy(pad.c, in, last_len);
         pad.c[last_len] = 0x80;
         ocb_block16_xor(&pad, &ctx->sess.checksum, &ctx->sess.checksum);
@@ -415,8 +417,8 @@ int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx,
  * the final time can have a partial block
  */
 int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx,
-                          const unsigned char *in, unsigned char *out,
-                          size_t len)
+    const unsigned char *in, unsigned char *out,
+    size_t len)
 {
     u64 i, all_num_blocks;
     size_t num_blocks, last_len;
@@ -430,7 +432,7 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx,
 
     if (num_blocks && all_num_blocks == (size_t)all_num_blocks
         && ctx->stream != NULL) {
-        size_t max_idx = 0, top = (size_t)all_num_blocks;
+        size_t max_idx = 0, top = (size_t)all_num_blocks, processed_bytes = 0;
 
         /*
          * See how many L_{i} entries we need to process data at hand
@@ -442,8 +444,11 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx,
             return 0;
 
         ctx->stream(in, out, num_blocks, ctx->keydec,
-                    (size_t)ctx->sess.blocks_processed + 1, ctx->sess.offset.c,
-                    (const unsigned char (*)[16])ctx->l, ctx->sess.checksum.c);
+            (size_t)ctx->sess.blocks_processed + 1, ctx->sess.offset.c,
+            (const unsigned char (*)[16])ctx->l, ctx->sess.checksum.c);
+        processed_bytes = num_blocks * 16;
+        in += processed_bytes;
+        out += processed_bytes;
     } else {
         OCB_BLOCK tmp;
 
@@ -491,7 +496,7 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx,
         ocb_block_xor(in, pad.c, last_len, out);
 
         /* Checksum_* = Checksum_m xor (P_* || 1 || zeros(127-bitlen(P_*))) */
-        memset(pad.c, 0, 16);           /* borrow pad */
+        memset(pad.c, 0, 16); /* borrow pad */
         memcpy(pad.c, out, last_len);
         pad.c[last_len] = 0x80;
         ocb_block16_xor(&pad, &ctx->sess.checksum, &ctx->sess.checksum);
@@ -503,7 +508,7 @@ int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx,
 }
 
 static int ocb_finish(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len,
-                      int write)
+    int write)
 {
     OCB_BLOCK tmp;
 
@@ -531,9 +536,9 @@ static int ocb_finish(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len,
  * Calculate the tag and verify it against the supplied tag
  */
 int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx, const unsigned char *tag,
-                         size_t len)
+    size_t len)
 {
-    return ocb_finish(ctx, (unsigned char*)tag, len, 0);
+    return ocb_finish(ctx, (unsigned char *)tag, len, 0);
 }
 
 /*
@@ -555,4 +560,4 @@ void CRYPTO_ocb128_cleanup(OCB128_CONTEXT *ctx)
     }
 }
 
-#endif                          /* OPENSSL_NO_OCB */
+#endif /* OPENSSL_NO_OCB */
diff --git a/crypto/modes/ofb128.c b/crypto/modes/ofb128.c
index d8319f861ed4a..6aa308bce3d4f 100644
--- a/crypto/modes/ofb128.c
+++ b/crypto/modes/ofb128.c
@@ -23,8 +23,8 @@ typedef size_t size_t_aX;
  * used is contained in *num;
  */
 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)
 {
     unsigned int n;
     size_t l = 0;
@@ -44,16 +44,14 @@ void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
                 --len;
                 n = (n + 1) % 16;
             }
-# if defined(STRICT_ALIGNMENT)
-            if (((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) !=
-                0)
+#if defined(STRICT_ALIGNMENT)
+            if (((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0)
                 break;
-# endif
+#endif
             while (len >= 16) {
-                (*block) (ivec, ivec, key);
+                (*block)(ivec, ivec, key);
                 for (; n < 16; n += sizeof(size_t))
-                    *(size_t_aX *)(out + n) =
-                        *(size_t_aX *)(in + n)
+                    *(size_t_aX *)(out + n) = *(size_t_aX *)(in + n)
                         ^ *(size_t_aX *)(ivec + n);
                 len -= 16;
                 out += 16;
@@ -61,7 +59,7 @@ void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
                 n = 0;
             }
             if (len) {
-                (*block) (ivec, ivec, key);
+                (*block)(ivec, ivec, key);
                 while (len--) {
                     out[n] = in[n] ^ ivec[n];
                     ++n;
@@ -75,7 +73,7 @@ void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
 #endif
     while (l < len) {
         if (n == 0) {
-            (*block) (ivec, ivec, key);
+            (*block)(ivec, ivec, key);
         }
         out[l] = in[l] ^ ivec[n];
         ++l;
diff --git a/crypto/modes/siv128.c b/crypto/modes/siv128.c
index 72526b849eaf7..0ab183b37b58d 100644
--- a/crypto/modes/siv128.c
+++ b/crypto/modes/siv128.c
@@ -59,7 +59,7 @@ static ossl_inline void siv128_putword(SIV_BLOCK *b, size_t i, uint64_t x)
 }
 
 static ossl_inline void siv128_xorblock(SIV_BLOCK *x,
-                                        SIV_BLOCK const *y)
+    SIV_BLOCK const *y)
 {
     x->word[0] ^= y->word[0];
     x->word[1] ^= y->word[1];
@@ -87,7 +87,7 @@ static ossl_inline void siv128_dbl(SIV_BLOCK *b)
 }
 
 __owur static ossl_inline int siv128_do_s2v_p(SIV128_CONTEXT *ctx, SIV_BLOCK *out,
-                                              unsigned char const* in, size_t len)
+    unsigned char const *in, size_t len)
 {
     SIV_BLOCK t;
     size_t out_len = sizeof(out->byte);
@@ -101,7 +101,7 @@ __owur static ossl_inline int siv128_do_s2v_p(SIV128_CONTEXT *ctx, SIV_BLOCK *ou
     if (len >= SIV_LEN) {
         if (!EVP_MAC_update(mac_ctx, in, len - SIV_LEN))
             goto err;
-        memcpy(&t, in + (len-SIV_LEN), SIV_LEN);
+        memcpy(&t, in + (len - SIV_LEN), SIV_LEN);
         siv128_xorblock(&t, &ctx->d);
         if (!EVP_MAC_update(mac_ctx, t.byte, SIV_LEN))
             goto err;
@@ -125,10 +125,9 @@ __owur static ossl_inline int siv128_do_s2v_p(SIV128_CONTEXT *ctx, SIV_BLOCK *ou
     return ret;
 }
 
-
 __owur static ossl_inline int siv128_do_encrypt(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                             unsigned char const *in, size_t len,
-                                             SIV_BLOCK *icv)
+    unsigned char const *in, size_t len,
+    SIV_BLOCK *icv)
 {
     int out_len = (int)len;
 
@@ -141,8 +140,8 @@ __owur static ossl_inline int siv128_do_encrypt(EVP_CIPHER_CTX *ctx, unsigned ch
  * Create a new 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)
 {
     SIV128_CONTEXT *ctx;
     int ret;
@@ -161,8 +160,8 @@ SIV128_CONTEXT *ossl_siv128_new(const unsigned char *key, int klen,
  * Initialise an existing SIV128_CONTEXT
  */
 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)
 {
     static const unsigned char zero[SIV_LEN] = { 0 };
     size_t out_len = SIV_LEN;
@@ -186,25 +185,27 @@ int ossl_siv128_init(SIV128_CONTEXT *ctx, const unsigned char *key, int klen,
 
     cbc_name = EVP_CIPHER_get0_name(cbc);
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_CIPHER,
-                                                 (char *)cbc_name, 0);
+        (char *)cbc_name, 0);
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
-                                                  (void *)key, klen);
+        (void *)key, klen);
     params[2] = OSSL_PARAM_construct_end();
 
     if ((ctx->cipher_ctx = EVP_CIPHER_CTX_new()) == NULL
-            || (ctx->mac =
-                EVP_MAC_fetch(libctx, OSSL_MAC_NAME_CMAC, propq)) == NULL
-            || (ctx->mac_ctx_init = EVP_MAC_CTX_new(ctx->mac)) == NULL
-            || !EVP_MAC_CTX_set_params(ctx->mac_ctx_init, params)
-            || !EVP_EncryptInit_ex(ctx->cipher_ctx, ctr, NULL, key + klen, NULL)
-            || (mac_ctx = EVP_MAC_CTX_dup(ctx->mac_ctx_init)) == NULL
-            || !EVP_MAC_update(mac_ctx, zero, sizeof(zero))
-            || !EVP_MAC_final(mac_ctx, ctx->d.byte, &out_len,
-                              sizeof(ctx->d.byte))) {
+        || (ctx->mac = EVP_MAC_fetch(libctx, OSSL_MAC_NAME_CMAC, propq)) == NULL
+        || (ctx->mac_ctx_init = EVP_MAC_CTX_new(ctx->mac)) == NULL
+        || !EVP_MAC_CTX_set_params(ctx->mac_ctx_init, params)
+        || !EVP_EncryptInit_ex(ctx->cipher_ctx, ctr, NULL, key + klen, NULL)
+        || (mac_ctx = EVP_MAC_CTX_dup(ctx->mac_ctx_init)) == NULL
+        || !EVP_MAC_update(mac_ctx, zero, sizeof(zero))
+        || !EVP_MAC_final(mac_ctx, ctx->d.byte, &out_len,
+            sizeof(ctx->d.byte))) {
         EVP_CIPHER_CTX_free(ctx->cipher_ctx);
+        ctx->cipher_ctx = NULL;
         EVP_MAC_CTX_free(ctx->mac_ctx_init);
+        ctx->mac_ctx_init = NULL;
         EVP_MAC_CTX_free(mac_ctx);
         EVP_MAC_free(ctx->mac);
+        ctx->mac = NULL;
         return 0;
     }
     EVP_MAC_CTX_free(mac_ctx);
@@ -244,7 +245,7 @@ int ossl_siv128_copy_ctx(SIV128_CONTEXT *dest, SIV128_CONTEXT *src)
  * is the nonce, but it's not treated special
  */
 int ossl_siv128_aad(SIV128_CONTEXT *ctx, const unsigned char *aad,
-                      size_t len)
+    size_t len)
 {
     SIV_BLOCK mac_out;
     size_t out_len = SIV_LEN;
@@ -255,7 +256,7 @@ int ossl_siv128_aad(SIV128_CONTEXT *ctx, const unsigned char *aad,
     if ((mac_ctx = EVP_MAC_CTX_dup(ctx->mac_ctx_init)) == NULL
         || !EVP_MAC_update(mac_ctx, aad, len)
         || !EVP_MAC_final(mac_ctx, mac_out.byte, &out_len,
-                          sizeof(mac_out.byte))
+            sizeof(mac_out.byte))
         || out_len != SIV_LEN) {
         EVP_MAC_CTX_free(mac_ctx);
         return 0;
@@ -271,8 +272,8 @@ int ossl_siv128_aad(SIV128_CONTEXT *ctx, const unsigned char *aad,
  * Provide any data to be encrypted. This can be called once.
  */
 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)
 {
     SIV_BLOCK q;
 
@@ -298,10 +299,10 @@ int ossl_siv128_encrypt(SIV128_CONTEXT *ctx,
  * Provide any data to be decrypted. This can be called once.
  */
 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)
 {
-    unsigned char* p;
+    unsigned char *p;
     SIV_BLOCK t, q;
     int i;
 
@@ -390,4 +391,4 @@ int ossl_siv128_speed(SIV128_CONTEXT *ctx, int arg)
     return 1;
 }
 
-#endif                          /* OPENSSL_NO_SIV */
+#endif /* OPENSSL_NO_SIV */
diff --git a/crypto/modes/wrap128.c b/crypto/modes/wrap128.c
index a9622c16bd762..8b84e4709c626 100644
--- a/crypto/modes/wrap128.c
+++ b/crypto/modes/wrap128.c
@@ -18,7 +18,14 @@
 
 /** RFC 3394 section 2.2.3.1 Default Initial Value */
 static const unsigned char default_iv[] = {
-    0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+    0xA6,
+    0xA6,
+    0xA6,
+    0xA6,
+    0xA6,
+    0xA6,
+    0xA6,
+    0xA6,
 };
 
 /** RFC 5649 section 3 Alternative Initial Value 32-bit constant */
@@ -46,9 +53,9 @@ static const unsigned char default_aiv[] = {
  *                     Output length if wrapping succeeded.
  */
 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)
 {
     unsigned char *A, B[16], *R;
     size_t i, j, t;
@@ -97,9 +104,9 @@ size_t CRYPTO_128_wrap(void *key, const unsigned char *iv,
  *                     Output length otherwise.
  */
 static size_t crypto_128_unwrap_raw(void *key, 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)
 {
     unsigned char *A, B[16], *R;
     size_t i, j, t;
@@ -148,8 +155,8 @@ static size_t crypto_128_unwrap_raw(void *key, unsigned char *iv,
  *                     Output length otherwise.
  */
 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 ret;
     unsigned char got_iv[8];
@@ -181,9 +188,9 @@ size_t CRYPTO_128_unwrap(void *key, const unsigned char *iv,
  *                     Output length if wrapping succeeded.
  */
 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)
 {
     /* n: number of 64-bit blocks in the padded key data
      *
@@ -206,7 +213,7 @@ size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv,
     if (!icv)
         memcpy(aiv, default_aiv, 4);
     else
-        memcpy(aiv, icv, 4);    /* Standard doesn't mention this. */
+        memcpy(aiv, icv, 4); /* Standard doesn't mention this. */
 
     aiv[4] = (inlen >> 24) & 0xFF;
     aiv[5] = (inlen >> 16) & 0xFF;
@@ -223,7 +230,7 @@ size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv,
         memcpy(out, aiv, 8);
         memset(out + 8 + inlen, 0, padding_len);
         block(out, out, key);
-        ret = 16;               /* AIV + padded input */
+        ret = 16; /* AIV + padded input */
     } else {
         memmove(out, in, inlen);
         memset(out + inlen, 0, padding_len); /* Section 4.1 step 1 */
@@ -249,9 +256,9 @@ size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv,
  *                     Output length if unwrapping succeeded and IV matches.
  */
 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)
 {
     /* n: number of 64-bit blocks in the padded key data */
     size_t n = inlen / 8 - 1;
@@ -307,10 +314,10 @@ size_t CRYPTO_128_unwrap_pad(void *key, const unsigned char *icv,
      * LSB(32,AIV).
      */
 
-    ptext_len =   ((unsigned int)aiv[4] << 24)
-                | ((unsigned int)aiv[5] << 16)
-                | ((unsigned int)aiv[6] <<  8)
-                |  (unsigned int)aiv[7];
+    ptext_len = ((unsigned int)aiv[4] << 24)
+        | ((unsigned int)aiv[5] << 16)
+        | ((unsigned int)aiv[6] << 8)
+        | (unsigned int)aiv[7];
     if (8 * (n - 1) >= ptext_len || ptext_len > 8 * n) {
         OPENSSL_cleanse(out, inlen);
         return 0;
diff --git a/crypto/modes/xts128.c b/crypto/modes/xts128.c
index 55b81366bf82d..7b55d1e0b3be9 100644
--- a/crypto/modes/xts128.c
+++ b/crypto/modes/xts128.c
@@ -13,17 +13,17 @@
 #include "crypto/modes.h"
 
 #ifndef STRICT_ALIGNMENT
-# ifdef __GNUC__
+#ifdef __GNUC__
 typedef u64 u64_a1 __attribute((__aligned__(1)));
-# else
+#else
 typedef u64 u64_a1;
-# endif
+#endif
 #endif
 
 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)
 {
     DECLARE_IS_ENDIAN;
     union {
@@ -38,7 +38,7 @@ int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
 
     memcpy(tweak.c, iv, 16);
 
-    (*ctx->block2) (tweak.c, tweak.c, ctx->key2);
+    (*ctx->block2)(tweak.c, tweak.c, ctx->key2);
 
     if (!enc && (len % 16))
         len -= 16;
@@ -52,7 +52,7 @@ int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
         scratch.u[0] = ((u64_a1 *)inp)[0] ^ tweak.u[0];
         scratch.u[1] = ((u64_a1 *)inp)[1] ^ tweak.u[1];
 #endif
-        (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+        (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
 #if defined(STRICT_ALIGNMENT)
         scratch.u[0] ^= tweak.u[0];
         scratch.u[1] ^= tweak.u[1];
@@ -97,7 +97,7 @@ int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
         }
         scratch.u[0] ^= tweak.u[0];
         scratch.u[1] ^= tweak.u[1];
-        (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+        (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
         scratch.u[0] ^= tweak.u[0];
         scratch.u[1] ^= tweak.u[1];
         memcpy(out - 16, scratch.c, 16);
@@ -135,7 +135,7 @@ int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
         scratch.u[0] = ((u64_a1 *)inp)[0] ^ tweak1.u[0];
         scratch.u[1] = ((u64_a1 *)inp)[1] ^ tweak1.u[1];
 #endif
-        (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+        (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
         scratch.u[0] ^= tweak1.u[0];
         scratch.u[1] ^= tweak1.u[1];
 
@@ -146,7 +146,7 @@ int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
         }
         scratch.u[0] ^= tweak.u[0];
         scratch.u[1] ^= tweak.u[1];
-        (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+        (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
 #if defined(STRICT_ALIGNMENT)
         scratch.u[0] ^= tweak.u[0];
         scratch.u[1] ^= tweak.u[1];
diff --git a/crypto/modes/xts128gb.c b/crypto/modes/xts128gb.c
index 021c0597e4bb7..563077277c773 100644
--- a/crypto/modes/xts128gb.c
+++ b/crypto/modes/xts128gb.c
@@ -13,17 +13,17 @@
 #include "crypto/modes.h"
 
 #ifndef STRICT_ALIGNMENT
-# ifdef __GNUC__
+#ifdef __GNUC__
 typedef u64 u64_a1 __attribute((__aligned__(1)));
-# else
+#else
 typedef u64 u64_a1;
-# endif
+#endif
 #endif
 
 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)
 {
     DECLARE_IS_ENDIAN;
     union {
@@ -38,7 +38,7 @@ int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
 
     memcpy(tweak.c, iv, 16);
 
-    (*ctx->block2) (tweak.c, tweak.c, ctx->key2);
+    (*ctx->block2)(tweak.c, tweak.c, ctx->key2);
 
     if (!enc && (len % 16))
         len -= 16;
@@ -52,7 +52,7 @@ int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
         scratch.u[0] = ((u64_a1 *)inp)[0] ^ tweak.u[0];
         scratch.u[1] = ((u64_a1 *)inp)[1] ^ tweak.u[1];
 #endif
-        (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+        (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
 #if defined(STRICT_ALIGNMENT)
         scratch.u[0] ^= tweak.u[0];
         scratch.u[1] ^= tweak.u[1];
@@ -116,7 +116,7 @@ int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
         }
         scratch.u[0] ^= tweak.u[0];
         scratch.u[1] ^= tweak.u[1];
-        (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+        (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
         scratch.u[0] ^= tweak.u[0];
         scratch.u[1] ^= tweak.u[1];
         memcpy(out - 16, scratch.c, 16);
@@ -173,7 +173,7 @@ int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
         scratch.u[0] = ((u64_a1 *)inp)[0] ^ tweak1.u[0];
         scratch.u[1] = ((u64_a1 *)inp)[1] ^ tweak1.u[1];
 #endif
-        (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+        (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
         scratch.u[0] ^= tweak1.u[0];
         scratch.u[1] ^= tweak1.u[1];
 
@@ -184,7 +184,7 @@ int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
         }
         scratch.u[0] ^= tweak.u[0];
         scratch.u[1] ^= tweak.u[1];
-        (*ctx->block1) (scratch.c, scratch.c, ctx->key1);
+        (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
 #if defined(STRICT_ALIGNMENT)
         scratch.u[0] ^= tweak.u[0];
         scratch.u[1] ^= tweak.u[1];
diff --git a/crypto/o_dir.c b/crypto/o_dir.c
index d7f5d64d064f3..36d33fbed4f9c 100644
--- a/crypto/o_dir.c
+++ b/crypto/o_dir.c
@@ -22,6 +22,7 @@
 
 #include "internal/o_dir.h"
 
+/* clang-format off */
 #define LPDIR_H
 #if defined OPENSSL_SYS_UNIX || defined DJGPP \
     || (defined __VMS_VER && __VMS_VER >= 70000000)
@@ -35,3 +36,4 @@
 #else
 # include "LPdir_nyi.c"
 #endif
+/* clang-format on */
diff --git a/crypto/o_fopen.c b/crypto/o_fopen.c
index cee4eee8a9e25..4268e69e5e0d1 100644
--- a/crypto/o_fopen.c
+++ b/crypto/o_fopen.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-# if defined(__linux) || defined(__sun) || defined(__hpux)
+#if defined(__linux) || defined(__sun) || defined(__hpux)
 /*
  * Following definition aliases fopen to fopen64 on above mentioned
  * platforms. This makes it possible to open and sequentially access files
@@ -20,32 +20,32 @@
  * of 32-bit platforms which allow for sequential access of large files
  * without extra "magic" comprise *BSD, Darwin, IRIX...
  */
-#  ifndef _FILE_OFFSET_BITS
-#   define _FILE_OFFSET_BITS 64
-#  endif
-# endif
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
+#endif
+#endif
 
 #include "internal/e_os.h"
 #include "internal/cryptlib.h"
 
 #if !defined(OPENSSL_NO_STDIO)
 
-# include <stdio.h>
-# ifdef __DJGPP__
-#  include <unistd.h>
-# endif
+#include <stdio.h>
+#ifdef __DJGPP__
+#include <unistd.h>
+#endif
 
 FILE *openssl_fopen(const char *filename, const char *mode)
 {
     FILE *file = NULL;
-# if defined(_WIN32) && defined(CP_UTF8)
+#if defined(_WIN32) && defined(CP_UTF8)
     int sz, len_0;
     DWORD flags;
-# endif
+#endif
 
     if (filename == NULL)
         return NULL;
-# if defined(_WIN32) && defined(CP_UTF8)
+#if defined(_WIN32) && defined(CP_UTF8)
     len_0 = (int)strlen(filename) + 1;
 
     /*
@@ -61,21 +61,17 @@ FILE *openssl_fopen(const char *filename, const char *mode)
      * back to fopen...
      */
     if ((sz = MultiByteToWideChar(CP_UTF8, (flags = MB_ERR_INVALID_CHARS),
-                                  filename, len_0, NULL, 0)) > 0 ||
-        (GetLastError() == ERROR_INVALID_FLAGS &&
-         (sz = MultiByteToWideChar(CP_UTF8, (flags = 0),
-                                   filename, len_0, NULL, 0)) > 0)
-        ) {
+             filename, len_0, NULL, 0))
+            > 0
+        || (GetLastError() == ERROR_INVALID_FLAGS && (sz = MultiByteToWideChar(CP_UTF8, (flags = 0), filename, len_0, NULL, 0)) > 0)) {
         WCHAR wmode[8];
         WCHAR *wfilename = _alloca(sz * sizeof(WCHAR));
 
         if (MultiByteToWideChar(CP_UTF8, flags,
-                                filename, len_0, wfilename, sz) &&
-            MultiByteToWideChar(CP_UTF8, 0, mode, strlen(mode) + 1,
-                                wmode, OSSL_NELEM(wmode)) &&
-            (file = _wfopen(wfilename, wmode)) == NULL &&
-            (errno == ENOENT || errno == EBADF)
-            ) {
+                filename, len_0, wfilename, sz)
+            && MultiByteToWideChar(CP_UTF8, 0, mode, strlen(mode) + 1,
+                wmode, OSSL_NELEM(wmode))
+            && (file = _wfopen(wfilename, wmode)) == NULL && (errno == ENOENT || errno == EBADF)) {
             /*
              * UTF-8 decode succeeded, but no file, filename
              * could still have been locale-ized...
@@ -85,11 +81,11 @@ FILE *openssl_fopen(const char *filename, const char *mode)
     } else if (GetLastError() == ERROR_NO_UNICODE_TRANSLATION) {
         file = fopen(filename, mode);
     }
-# elif defined(__DJGPP__)
+#elif defined(__DJGPP__)
     {
         char *newname = NULL;
 
-        if (pathconf(filename, _PC_NAME_MAX) <= 12) {  /* 8.3 file system? */
+        if (pathconf(filename, _PC_NAME_MAX) <= 12) { /* 8.3 file system? */
             char *iterator;
             char lastchar;
 
@@ -114,9 +110,9 @@ FILE *openssl_fopen(const char *filename, const char *mode)
 
         OPENSSL_free(newname);
     }
-# else
+#else
     file = fopen(filename, mode);
-# endif
+#endif
     return file;
 }
 
diff --git a/crypto/o_str.c b/crypto/o_str.c
index 93af73561f979..35540630be25f 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -19,7 +19,7 @@
 #define DEFAULT_SEPARATOR ':'
 #define CH_ZERO '\0'
 
-char *CRYPTO_strdup(const char *str, const char* file, int line)
+char *CRYPTO_strdup(const char *str, const char *file, int line)
 {
     char *ret;
 
@@ -31,7 +31,7 @@ char *CRYPTO_strdup(const char *str, const char* file, int line)
     return ret;
 }
 
-char *CRYPTO_strndup(const char *str, size_t s, const char* file, int line)
+char *CRYPTO_strndup(const char *str, size_t s, const char *file, int line)
 {
     size_t maxlen;
     char *ret;
@@ -49,7 +49,7 @@ char *CRYPTO_strndup(const char *str, size_t s, const char* file, int line)
     return ret;
 }
 
-void *CRYPTO_memdup(const void *data, size_t siz, const char* file, int line)
+void *CRYPTO_memdup(const void *data, size_t siz, const char *file, int line)
 {
     void *ret;
 
@@ -66,7 +66,8 @@ size_t OPENSSL_strnlen(const char *str, size_t maxlen)
 {
     const char *p;
 
-    for (p = str; maxlen-- != 0 && *p != CH_ZERO; ++p) ;
+    for (p = str; maxlen-- != 0 && *p != CH_ZERO; ++p)
+        ;
 
     return p - str;
 }
@@ -121,7 +122,7 @@ size_t OPENSSL_strlcat(char *dst, const char *src, size_t size)
  *       by endptr.
  */
 int OPENSSL_strtoul(const char *str, char **endptr, int base,
-                    unsigned long *num)
+    unsigned long *num)
 {
     char *tmp_endptr;
     char **internal_endptr = endptr == NULL ? &tmp_endptr : endptr;
@@ -151,9 +152,7 @@ int OPENSSL_strtoul(const char *str, char **endptr, int base,
      *    means there was some part of the string left over after translation
      * 3) If no bytes of the string were consumed
      */
-    if (errno != 0 ||
-        (endptr == NULL && **internal_endptr != '\0') ||
-        (str == *internal_endptr))
+    if (errno != 0 || (endptr == NULL && **internal_endptr != '\0') || (str == *internal_endptr))
         return 0;
 
     return 1;
@@ -175,35 +174,41 @@ int OPENSSL_hexchar2int(unsigned char c)
     case '3':
         return 3;
     case '4':
-          return 4;
+        return 4;
     case '5':
-          return 5;
+        return 5;
     case '6':
-          return 6;
+        return 6;
     case '7':
-          return 7;
+        return 7;
     case '8':
-          return 8;
+        return 8;
     case '9':
-          return 9;
-    case 'a': case 'A':
-          return 0x0A;
-    case 'b': case 'B':
-          return 0x0B;
-    case 'c': case 'C':
-          return 0x0C;
-    case 'd': case 'D':
-          return 0x0D;
-    case 'e': case 'E':
-          return 0x0E;
-    case 'f': case 'F':
-          return 0x0F;
+        return 9;
+    case 'a':
+    case 'A':
+        return 0x0A;
+    case 'b':
+    case 'B':
+        return 0x0B;
+    case 'c':
+    case 'C':
+        return 0x0C;
+    case 'd':
+    case 'D':
+        return 0x0D;
+    case 'e':
+    case 'E':
+        return 0x0E;
+    case 'f':
+    case 'F':
+        return 0x0F;
     }
     return -1;
 }
 
 static int hexstr2buf_sep(unsigned char *buf, size_t buf_n, size_t *buflen,
-                          const char *str, const char sep)
+    const char *str, const char sep)
 {
     unsigned char *q;
     unsigned char ch, cl;
@@ -211,7 +216,7 @@ static int hexstr2buf_sep(unsigned char *buf, size_t buf_n, size_t *buflen,
     const unsigned char *p;
     size_t cnt;
 
-    for (p = (const unsigned char *)str, q = buf, cnt = 0; *p; ) {
+    for (p = (const unsigned char *)str, q = buf, cnt = 0; *p;) {
         ch = *p++;
         /* A separator of CH_ZERO means there is no separator */
         if (ch == sep && sep != CH_ZERO)
@@ -246,13 +251,13 @@ static int hexstr2buf_sep(unsigned char *buf, size_t buf_n, size_t *buflen,
  * Given a string of hex digits convert to a buffer
  */
 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)
 {
     return hexstr2buf_sep(buf, buf_n, buflen, str, sep);
 }
 
 unsigned char *ossl_hexstr2buf_sep(const char *str, long *buflen,
-                                   const char sep)
+    const char sep)
 {
     unsigned char *buf;
     size_t buf_n, tmp_buflen;
@@ -284,8 +289,8 @@ unsigned char *OPENSSL_hexstr2buf(const char *str, long *buflen)
 }
 
 static int buf2hexstr_sep(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 *q;
     int has_sep = (sep != CH_ZERO);
@@ -320,8 +325,8 @@ static int buf2hexstr_sep(char *str, size_t str_n, size_t *strlength,
 }
 
 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)
 {
     return buf2hexstr_sep(str, str_n, strlength, buf, buflen, sep);
 }
@@ -344,7 +349,6 @@ char *ossl_buf2hexstr_sep(const unsigned char *buf, long buflen, char sep)
     return NULL;
 }
 
-
 /*
  * Given a buffer of length 'buflen' return a OPENSSL_malloc'ed string with
  * its hex representation @@@ (Contents of buffer are always kept in ASCII,
@@ -357,7 +361,7 @@ char *OPENSSL_buf2hexstr(const unsigned char *buf, long buflen)
 
 int openssl_strerror_r(int errnum, char *buf, size_t buflen)
 {
-#if defined(_MSC_VER) && _MSC_VER>=1400 && !defined(_WIN32_WCE)
+#if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(_WIN32_WCE)
     return !strerror_s(buf, buflen, errnum);
 #elif defined(_GNU_SOURCE)
     char *err;
@@ -380,8 +384,7 @@ int openssl_strerror_r(int errnum, char *buf, size_t buflen)
     if (err != buf)
         OPENSSL_strlcpy(buf, err, buflen);
     return 1;
-#elif (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || \
-      (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+#elif (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
     /*
      * We can use "real" strerror_r. The OpenSSL version differs in that it
      * gives 1 on success and 0 on failure for consistency with other OpenSSL
diff --git a/crypto/o_time.c b/crypto/o_time.c
index 23ffe162453ea..b2b32064f8b6b 100644
--- a/crypto/o_time.c
+++ b/crypto/o_time.c
@@ -25,12 +25,12 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
          * pointers.
          */
 #if defined(OPENSSL_SYS_VMS) && __INITIAL_POINTER_SIZE
-# pragma pointer_size save
-# pragma pointer_size 32
+#pragma pointer_size save
+#pragma pointer_size 32
 #endif
         struct tm data, *ts2 = &data;
 #if defined OPENSSL_SYS_VMS && __INITIAL_POINTER_SIZE
-# pragma pointer_size restore
+#pragma pointer_size restore
 #endif
         if (gmtime_r(timer, ts2) == NULL)
             return NULL;
@@ -41,7 +41,7 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
     if (gmtime_r(timer, result) == NULL)
         return NULL;
     ts = result;
-#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(_WIN32_WCE)
+#elif defined(OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(_WIN32_WCE)
     if (gmtime_s(result, timer))
         return NULL;
     ts = result;
@@ -67,7 +67,7 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
 static long date_to_julian(int y, int m, int d);
 static void julian_to_date(long jd, int *y, int *m, int *d);
 static int julian_adj(const struct tm *tm, int off_day, long offset_sec,
-                      long *pday, int *psec);
+    long *pday, int *psec);
 
 int OPENSSL_gmtime_adj(struct tm *tm, int off_day, long offset_sec)
 {
@@ -96,11 +96,10 @@ int OPENSSL_gmtime_adj(struct tm *tm, int off_day, long offset_sec)
     tm->tm_sec = time_sec % 60;
 
     return 1;
-
 }
 
 int OPENSSL_gmtime_diff(int *pday, int *psec,
-                        const struct tm *from, const struct tm *to)
+    const struct tm *from, const struct tm *to)
 {
     int from_sec, to_sec, diff_sec;
     long from_jd, to_jd, diff_day;
@@ -126,12 +125,11 @@ int OPENSSL_gmtime_diff(int *pday, int *psec,
         *psec = diff_sec;
 
     return 1;
-
 }
 
 /* Convert tm structure and offset into julian day and seconds */
 static int julian_adj(const struct tm *tm, int off_day, long offset_sec,
-                      long *pday, int *psec)
+    long *pday, int *psec)
 {
     int offset_hms;
     long offset_day, time_jd;
@@ -178,9 +176,7 @@ static int julian_adj(const struct tm *tm, int off_day, long offset_sec,
  */
 static long date_to_julian(int y, int m, int d)
 {
-    return (1461 * (y + 4800 + (m - 14) / 12)) / 4 +
-        (367 * (m - 2 - 12 * ((m - 14) / 12))) / 12 -
-        (3 * ((y + 4900 + (m - 14) / 12) / 100)) / 4 + d - 32075;
+    return (1461 * (y + 4800 + (m - 14) / 12)) / 4 + (367 * (m - 2 - 12 * ((m - 14) / 12))) / 12 - (3 * ((y + 4900 + (m - 14) / 12) / 100)) / 4 + d - 32075;
 }
 
 static void julian_to_date(long jd, int *y, int *m, int *d)
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index 5a468bba3a2b5..a585e3819724e 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -30,9 +30,9 @@ static int names_type_num = OBJ_NAME_TYPE_NUM;
 static CRYPTO_RWLOCK *obj_lock = NULL;
 
 struct name_funcs_st {
-    unsigned long (*hash_func) (const char *name);
-    int (*cmp_func) (const char *a, const char *b);
-    void (*free_func) (const char *, int, const char *);
+    unsigned long (*hash_func)(const char *name);
+    int (*cmp_func)(const char *a, const char *b);
+    void (*free_func)(const char *, int, const char *);
 };
 
 static STACK_OF(NAME_FUNCS) *name_funcs_stack;
@@ -65,9 +65,9 @@ int OBJ_NAME_init(void)
     return RUN_ONCE(&init, o_names_init);
 }
 
-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 *))
 {
     int ret = 0, i, push;
     NAME_FUNCS *name_funcs;
@@ -125,7 +125,8 @@ static int obj_name_cmp(const OBJ_NAME *a, const OBJ_NAME *b)
         if ((name_funcs_stack != NULL)
             && (sk_NAME_FUNCS_num(name_funcs_stack) > a->type)) {
             ret = sk_NAME_FUNCS_value(name_funcs_stack,
-                                      a->type)->cmp_func(a->name, b->name);
+                a->type)
+                      ->cmp_func(a->name, b->name);
         } else
             ret = OPENSSL_strcasecmp(a->name, b->name);
     }
@@ -138,9 +139,9 @@ static unsigned long obj_name_hash(const OBJ_NAME *a)
 
     if ((name_funcs_stack != NULL)
         && (sk_NAME_FUNCS_num(name_funcs_stack) > a->type)) {
-        ret =
-            sk_NAME_FUNCS_value(name_funcs_stack,
-                                a->type)->hash_func(a->name);
+        ret = sk_NAME_FUNCS_value(name_funcs_stack,
+            a->type)
+                  ->hash_func(a->name);
     } else {
         ret = ossl_lh_strcasehash(a->name);
     }
@@ -220,8 +221,9 @@ int OBJ_NAME_add(const char *name, int type, const char *data)
              * get three arguments... -- Richard Levitte
              */
             sk_NAME_FUNCS_value(name_funcs_stack,
-                                ret->type)->free_func(ret->name, ret->type,
-                                                      ret->data);
+                ret->type)
+                ->free_func(ret->name, ret->type,
+                    ret->data);
         }
         OPENSSL_free(ret);
     } else {
@@ -263,8 +265,9 @@ int OBJ_NAME_remove(const char *name, int type)
              * get three arguments... -- Richard Levitte
              */
             sk_NAME_FUNCS_value(name_funcs_stack,
-                                ret->type)->free_func(ret->name, ret->type,
-                                                      ret->data);
+                ret->type)
+                ->free_func(ret->name, ret->type,
+                    ret->data);
         }
         OPENSSL_free(ret);
         ok = 1;
@@ -276,7 +279,7 @@ int OBJ_NAME_remove(const char *name, int type)
 
 typedef struct {
     int type;
-    void (*fn) (const OBJ_NAME *, void *arg);
+    void (*fn)(const OBJ_NAME *, void *arg);
     void *arg;
 } OBJ_DOALL;
 
@@ -288,8 +291,8 @@ static void do_all_fn(const OBJ_NAME *name, OBJ_DOALL *d)
 
 IMPLEMENT_LHASH_DOALL_ARG_CONST(OBJ_NAME, OBJ_DOALL);
 
-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)
 {
     OBJ_DOALL d;
 
@@ -325,15 +328,14 @@ static int do_all_sorted_cmp(const void *n1_, const void *n2_)
 }
 
 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)
 {
     struct doall_sorted d;
     int n;
 
     d.type = type;
-    d.names =
-        OPENSSL_malloc(sizeof(*d.names) * lh_OBJ_NAME_num_items(names_lh));
+    d.names = OPENSSL_malloc(sizeof(*d.names) * lh_OBJ_NAME_num_items(names_lh));
     /* Really should return an error if !d.names...but its a void function! */
     if (d.names != NULL) {
         d.n = 0;
diff --git a/crypto/objects/obj_compat.h b/crypto/objects/obj_compat.h
index 7d890d1c0b85c..76390cf2a95a6 100644
--- a/crypto/objects/obj_compat.h
+++ b/crypto/objects/obj_compat.h
@@ -9,46 +9,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/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 8bc4fa8ec2d53..482718eadb045 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -27,10 +27,10 @@ DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, sn);
 DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, ln);
 DECLARE_OBJ_BSEARCH_CMP_FN(const ASN1_OBJECT *, unsigned int, obj);
 
-#define ADDED_DATA      0
-#define ADDED_SNAME     1
-#define ADDED_LNAME     2
-#define ADDED_NID       3
+#define ADDED_DATA 0
+#define ADDED_SNAME 1
+#define ADDED_LNAME 2
+#define ADDED_NID 3
 
 struct added_obj_st {
     int type;
@@ -192,8 +192,7 @@ static int added_obj_cmp(const ADDED_OBJ *ca, const ADDED_OBJ *cb)
 static void cleanup1_doall(ADDED_OBJ *a)
 {
     a->obj->nid = 0;
-    a->obj->flags |= ASN1_OBJECT_FLAG_DYNAMIC |
-        ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | ASN1_OBJECT_FLAG_DYNAMIC_DATA;
+    a->obj->flags |= ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | ASN1_OBJECT_FLAG_DYNAMIC_DATA;
 }
 
 static void cleanup2_doall(ADDED_OBJ *a)
@@ -269,13 +268,13 @@ static int ossl_obj_add_object(const ASN1_OBJECT *obj, int lock)
     if ((o = OBJ_dup(obj)) == NULL)
         return NID_undef;
     if ((ao[ADDED_NID] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL
-            || (o->length != 0
-                && obj->data != NULL
-                && (ao[ADDED_DATA] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL)
-            || (o->sn != NULL
-                && (ao[ADDED_SNAME] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL)
-            || (o->ln != NULL
-                && (ao[ADDED_LNAME] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL))
+        || (o->length != 0
+            && obj->data != NULL
+            && (ao[ADDED_DATA] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL)
+        || (o->sn != NULL
+            && (ao[ADDED_SNAME] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL)
+        || (o->ln != NULL
+            && (ao[ADDED_LNAME] = OPENSSL_malloc(sizeof(*ao[0]))) == NULL))
         goto err2;
 
     if (!ossl_obj_write_lock(lock)) {
@@ -311,16 +310,14 @@ static int ossl_obj_add_object(const ASN1_OBJECT *obj, int lock)
             }
         }
     }
-    o->flags &=
-        ~(ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
-          ASN1_OBJECT_FLAG_DYNAMIC_DATA);
+    o->flags &= ~(ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | ASN1_OBJECT_FLAG_DYNAMIC_DATA);
 
     ossl_obj_unlock(lock);
     return o->nid;
 
- err:
+err:
     ossl_obj_unlock(lock);
- err2:
+err2:
     for (i = ADDED_DATA; i <= ADDED_NID; i++)
         OPENSSL_free(ao[i]);
     ASN1_OBJECT_free(o);
@@ -616,7 +613,7 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
     BN_free(bl);
     return n;
 
- err:
+err:
     BN_free(bl);
     return -1;
 }
@@ -688,15 +685,15 @@ int OBJ_sn2nid(const char *s)
 }
 
 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 *))
 {
     return OBJ_bsearch_ex_(key, base, num, size, cmp, 0);
 }
 
 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)
 {
     const char *p = ossl_bsearch(key, base, num, size, cmp, flags);
 
@@ -713,7 +710,7 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base, int num,
 
         for (i = 0; i < num; ++i) {
             p1 = &(base_[i * size]);
-            c = (*cmp) (key, p1);
+            c = (*cmp)(key, p1);
             if (c == 0
                 || (c < 0 && (flags & OBJ_BSEARCH_VALUE_ON_NOMATCH)))
                 return p1;
@@ -789,7 +786,7 @@ int OBJ_create(const char *oid, const char *sn, const char *ln)
 
     /* Check to see if short or long name already present */
     if ((sn != NULL && OBJ_sn2nid(sn) != NID_undef)
-            || (ln != NULL && OBJ_ln2nid(ln) != NID_undef)) {
+        || (ln != NULL && OBJ_ln2nid(ln) != NID_undef)) {
         ERR_raise(ERR_LIB_OBJ, OBJ_R_OID_EXISTS);
         return 0;
     }
@@ -834,7 +831,7 @@ int OBJ_create(const char *oid, const char *sn, const char *ln)
     tmpoid->sn = NULL;
     tmpoid->ln = NULL;
 
- err:
+err:
     ossl_obj_unlock(1);
     ASN1_OBJECT_free(tmpoid);
     return ok;
diff --git a/crypto/objects/obj_err.c b/crypto/objects/obj_err.c
index b4c8df09e66b0..c3c5478034257 100644
--- a/crypto/objects/obj_err.c
+++ b/crypto/objects/obj_err.c
@@ -15,11 +15,11 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA OBJ_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_OID_EXISTS), "oid exists"},
-    {ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_UNKNOWN_NID), "unknown nid"},
-    {ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_UNKNOWN_OBJECT_NAME),
-    "unknown object name"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_OID_EXISTS), "oid exists" },
+    { ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_UNKNOWN_NID), "unknown nid" },
+    { ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_UNKNOWN_OBJECT_NAME),
+        "unknown object name" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/objects/obj_lib.c b/crypto/objects/obj_lib.c
index 6cdc1d7e7465f..adc22a10e2877 100644
--- a/crypto/objects/obj_lib.c
+++ b/crypto/objects/obj_lib.c
@@ -31,9 +31,7 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
 
     /* Set dynamic flags so everything gets freed up on error */
 
-    r->flags = o->flags | (ASN1_OBJECT_FLAG_DYNAMIC |
-                           ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
-                           ASN1_OBJECT_FLAG_DYNAMIC_DATA);
+    r->flags = o->flags | (ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | ASN1_OBJECT_FLAG_DYNAMIC_DATA);
 
     if (o->length > 0 && (r->data = OPENSSL_memdup(o->data, o->length)) == NULL)
         goto err;
@@ -48,7 +46,7 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o)
         goto err;
 
     return r;
- err:
+err:
     ASN1_OBJECT_free(r);
     return NULL;
 }
diff --git a/crypto/objects/obj_xref.c b/crypto/objects/obj_xref.c
index 2eb757cb774c7..afa7372c18d20 100644
--- a/crypto/objects/obj_xref.c
+++ b/crypto/objects/obj_xref.c
@@ -64,7 +64,7 @@ static ossl_inline int obj_sig_init(void)
 }
 
 static int ossl_obj_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid,
-                                    int lock)
+    int lock)
 {
     nid_triple tmp;
     const nid_triple *rv;
@@ -191,7 +191,7 @@ int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
     if (!sk_nid_triple_push(sig_app, ntr))
         goto err;
     if (!sk_nid_triple_push(sigx_app, ntr)) {
-        ntr = NULL;             /* This is referenced by sig_app still */
+        ntr = NULL; /* This is referenced by sig_app still */
         goto err;
     }
 
@@ -200,7 +200,7 @@ int OBJ_add_sigid(int signid, int dig_id, int pkey_id)
 
     ntr = NULL;
     ret = 1;
- err:
+err:
     OPENSSL_free(ntr);
     CRYPTO_THREAD_unlock(sig_lock);
     return ret;
diff --git a/crypto/ocsp/ocsp_asn.c b/crypto/ocsp/ocsp_asn.c
index 4b4342825c3cc..ef70d4c204624 100644
--- a/crypto/ocsp/ocsp_asn.c
+++ b/crypto/ocsp/ocsp_asn.c
@@ -13,41 +13,41 @@
 #include "ocsp_local.h"
 
 ASN1_SEQUENCE(OCSP_SIGNATURE) = {
-        ASN1_EMBED(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR),
-        ASN1_SIMPLE(OCSP_SIGNATURE, signature, ASN1_BIT_STRING),
-        ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SIGNATURE, certs, X509, 0)
+    ASN1_EMBED(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR),
+    ASN1_SIMPLE(OCSP_SIGNATURE, signature, ASN1_BIT_STRING),
+    ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SIGNATURE, certs, X509, 0)
 } ASN1_SEQUENCE_END(OCSP_SIGNATURE)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_SIGNATURE)
 
 ASN1_SEQUENCE(OCSP_CERTID) = {
-        ASN1_EMBED(OCSP_CERTID, hashAlgorithm, X509_ALGOR),
-        ASN1_EMBED(OCSP_CERTID, issuerNameHash, ASN1_OCTET_STRING),
-        ASN1_EMBED(OCSP_CERTID, issuerKeyHash, ASN1_OCTET_STRING),
-        ASN1_EMBED(OCSP_CERTID, serialNumber, ASN1_INTEGER)
+    ASN1_EMBED(OCSP_CERTID, hashAlgorithm, X509_ALGOR),
+    ASN1_EMBED(OCSP_CERTID, issuerNameHash, ASN1_OCTET_STRING),
+    ASN1_EMBED(OCSP_CERTID, issuerKeyHash, ASN1_OCTET_STRING),
+    ASN1_EMBED(OCSP_CERTID, serialNumber, ASN1_INTEGER)
 } ASN1_SEQUENCE_END(OCSP_CERTID)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_CERTID)
 
 ASN1_SEQUENCE(OCSP_ONEREQ) = {
-        ASN1_SIMPLE(OCSP_ONEREQ, reqCert, OCSP_CERTID),
-        ASN1_EXP_SEQUENCE_OF_OPT(OCSP_ONEREQ, singleRequestExtensions, X509_EXTENSION, 0)
+    ASN1_SIMPLE(OCSP_ONEREQ, reqCert, OCSP_CERTID),
+    ASN1_EXP_SEQUENCE_OF_OPT(OCSP_ONEREQ, singleRequestExtensions, X509_EXTENSION, 0)
 } ASN1_SEQUENCE_END(OCSP_ONEREQ)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_ONEREQ)
 
 ASN1_SEQUENCE(OCSP_REQINFO) = {
-        ASN1_EXP_OPT(OCSP_REQINFO, version, ASN1_INTEGER, 0),
-        ASN1_EXP_OPT(OCSP_REQINFO, requestorName, GENERAL_NAME, 1),
-        ASN1_SEQUENCE_OF(OCSP_REQINFO, requestList, OCSP_ONEREQ),
-        ASN1_EXP_SEQUENCE_OF_OPT(OCSP_REQINFO, requestExtensions, X509_EXTENSION, 2)
+    ASN1_EXP_OPT(OCSP_REQINFO, version, ASN1_INTEGER, 0),
+    ASN1_EXP_OPT(OCSP_REQINFO, requestorName, GENERAL_NAME, 1),
+    ASN1_SEQUENCE_OF(OCSP_REQINFO, requestList, OCSP_ONEREQ),
+    ASN1_EXP_SEQUENCE_OF_OPT(OCSP_REQINFO, requestExtensions, X509_EXTENSION, 2)
 } ASN1_SEQUENCE_END(OCSP_REQINFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQINFO)
 
 ASN1_SEQUENCE(OCSP_REQUEST) = {
-        ASN1_EMBED(OCSP_REQUEST, tbsRequest, OCSP_REQINFO),
-        ASN1_EXP_OPT(OCSP_REQUEST, optionalSignature, OCSP_SIGNATURE, 0)
+    ASN1_EMBED(OCSP_REQUEST, tbsRequest, OCSP_REQINFO),
+    ASN1_EXP_OPT(OCSP_REQUEST, optionalSignature, OCSP_SIGNATURE, 0)
 } ASN1_SEQUENCE_END(OCSP_REQUEST)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQUEST)
@@ -55,81 +55,81 @@ IMPLEMENT_ASN1_FUNCTIONS(OCSP_REQUEST)
 /* OCSP_RESPONSE templates */
 
 ASN1_SEQUENCE(OCSP_RESPBYTES) = {
-            ASN1_SIMPLE(OCSP_RESPBYTES, responseType, ASN1_OBJECT),
-            ASN1_SIMPLE(OCSP_RESPBYTES, response, ASN1_OCTET_STRING)
+    ASN1_SIMPLE(OCSP_RESPBYTES, responseType, ASN1_OBJECT),
+    ASN1_SIMPLE(OCSP_RESPBYTES, response, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(OCSP_RESPBYTES)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPBYTES)
 
 ASN1_SEQUENCE(OCSP_RESPONSE) = {
-        ASN1_SIMPLE(OCSP_RESPONSE, responseStatus, ASN1_ENUMERATED),
-        ASN1_EXP_OPT(OCSP_RESPONSE, responseBytes, OCSP_RESPBYTES, 0)
+    ASN1_SIMPLE(OCSP_RESPONSE, responseStatus, ASN1_ENUMERATED),
+    ASN1_EXP_OPT(OCSP_RESPONSE, responseBytes, OCSP_RESPBYTES, 0)
 } ASN1_SEQUENCE_END(OCSP_RESPONSE)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPONSE)
 
 ASN1_CHOICE(OCSP_RESPID) = {
-           ASN1_EXP(OCSP_RESPID, value.byName, X509_NAME, 1),
-           ASN1_EXP(OCSP_RESPID, value.byKey, ASN1_OCTET_STRING, 2)
+    ASN1_EXP(OCSP_RESPID, value.byName, X509_NAME, 1),
+    ASN1_EXP(OCSP_RESPID, value.byKey, ASN1_OCTET_STRING, 2)
 } ASN1_CHOICE_END(OCSP_RESPID)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPID)
 
 ASN1_SEQUENCE(OCSP_REVOKEDINFO) = {
-        ASN1_SIMPLE(OCSP_REVOKEDINFO, revocationTime, ASN1_GENERALIZEDTIME),
-        ASN1_EXP_OPT(OCSP_REVOKEDINFO, revocationReason, ASN1_ENUMERATED, 0)
+    ASN1_SIMPLE(OCSP_REVOKEDINFO, revocationTime, ASN1_GENERALIZEDTIME),
+    ASN1_EXP_OPT(OCSP_REVOKEDINFO, revocationReason, ASN1_ENUMERATED, 0)
 } ASN1_SEQUENCE_END(OCSP_REVOKEDINFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_REVOKEDINFO)
 
 ASN1_CHOICE(OCSP_CERTSTATUS) = {
-        ASN1_IMP(OCSP_CERTSTATUS, value.good, ASN1_NULL, 0),
-        ASN1_IMP(OCSP_CERTSTATUS, value.revoked, OCSP_REVOKEDINFO, 1),
-        ASN1_IMP(OCSP_CERTSTATUS, value.unknown, ASN1_NULL, 2)
+    ASN1_IMP(OCSP_CERTSTATUS, value.good, ASN1_NULL, 0),
+    ASN1_IMP(OCSP_CERTSTATUS, value.revoked, OCSP_REVOKEDINFO, 1),
+    ASN1_IMP(OCSP_CERTSTATUS, value.unknown, ASN1_NULL, 2)
 } ASN1_CHOICE_END(OCSP_CERTSTATUS)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_CERTSTATUS)
 
 ASN1_SEQUENCE(OCSP_SINGLERESP) = {
-           ASN1_SIMPLE(OCSP_SINGLERESP, certId, OCSP_CERTID),
-           ASN1_SIMPLE(OCSP_SINGLERESP, certStatus, OCSP_CERTSTATUS),
-           ASN1_SIMPLE(OCSP_SINGLERESP, thisUpdate, ASN1_GENERALIZEDTIME),
-           ASN1_EXP_OPT(OCSP_SINGLERESP, nextUpdate, ASN1_GENERALIZEDTIME, 0),
-           ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SINGLERESP, singleExtensions, X509_EXTENSION, 1)
+    ASN1_SIMPLE(OCSP_SINGLERESP, certId, OCSP_CERTID),
+    ASN1_SIMPLE(OCSP_SINGLERESP, certStatus, OCSP_CERTSTATUS),
+    ASN1_SIMPLE(OCSP_SINGLERESP, thisUpdate, ASN1_GENERALIZEDTIME),
+    ASN1_EXP_OPT(OCSP_SINGLERESP, nextUpdate, ASN1_GENERALIZEDTIME, 0),
+    ASN1_EXP_SEQUENCE_OF_OPT(OCSP_SINGLERESP, singleExtensions, X509_EXTENSION, 1)
 } ASN1_SEQUENCE_END(OCSP_SINGLERESP)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_SINGLERESP)
 
 ASN1_SEQUENCE(OCSP_RESPDATA) = {
-           ASN1_EXP_OPT(OCSP_RESPDATA, version, ASN1_INTEGER, 0),
-           ASN1_EMBED(OCSP_RESPDATA, responderId, OCSP_RESPID),
-           ASN1_SIMPLE(OCSP_RESPDATA, producedAt, ASN1_GENERALIZEDTIME),
-           ASN1_SEQUENCE_OF(OCSP_RESPDATA, responses, OCSP_SINGLERESP),
-           ASN1_EXP_SEQUENCE_OF_OPT(OCSP_RESPDATA, responseExtensions, X509_EXTENSION, 1)
+    ASN1_EXP_OPT(OCSP_RESPDATA, version, ASN1_INTEGER, 0),
+    ASN1_EMBED(OCSP_RESPDATA, responderId, OCSP_RESPID),
+    ASN1_SIMPLE(OCSP_RESPDATA, producedAt, ASN1_GENERALIZEDTIME),
+    ASN1_SEQUENCE_OF(OCSP_RESPDATA, responses, OCSP_SINGLERESP),
+    ASN1_EXP_SEQUENCE_OF_OPT(OCSP_RESPDATA, responseExtensions, X509_EXTENSION, 1)
 } ASN1_SEQUENCE_END(OCSP_RESPDATA)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_RESPDATA)
 
 ASN1_SEQUENCE(OCSP_BASICRESP) = {
-           ASN1_EMBED(OCSP_BASICRESP, tbsResponseData, OCSP_RESPDATA),
-           ASN1_EMBED(OCSP_BASICRESP, signatureAlgorithm, X509_ALGOR),
-           ASN1_SIMPLE(OCSP_BASICRESP, signature, ASN1_BIT_STRING),
-           ASN1_EXP_SEQUENCE_OF_OPT(OCSP_BASICRESP, certs, X509, 0)
+    ASN1_EMBED(OCSP_BASICRESP, tbsResponseData, OCSP_RESPDATA),
+    ASN1_EMBED(OCSP_BASICRESP, signatureAlgorithm, X509_ALGOR),
+    ASN1_SIMPLE(OCSP_BASICRESP, signature, ASN1_BIT_STRING),
+    ASN1_EXP_SEQUENCE_OF_OPT(OCSP_BASICRESP, certs, X509, 0)
 } ASN1_SEQUENCE_END(OCSP_BASICRESP)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_BASICRESP)
 
 ASN1_SEQUENCE(OCSP_CRLID) = {
-           ASN1_EXP_OPT(OCSP_CRLID, crlUrl, ASN1_IA5STRING, 0),
-           ASN1_EXP_OPT(OCSP_CRLID, crlNum, ASN1_INTEGER, 1),
-           ASN1_EXP_OPT(OCSP_CRLID, crlTime, ASN1_GENERALIZEDTIME, 2)
+    ASN1_EXP_OPT(OCSP_CRLID, crlUrl, ASN1_IA5STRING, 0),
+    ASN1_EXP_OPT(OCSP_CRLID, crlNum, ASN1_INTEGER, 1),
+    ASN1_EXP_OPT(OCSP_CRLID, crlTime, ASN1_GENERALIZEDTIME, 2)
 } ASN1_SEQUENCE_END(OCSP_CRLID)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_CRLID)
 
 ASN1_SEQUENCE(OCSP_SERVICELOC) = {
-        ASN1_SIMPLE(OCSP_SERVICELOC, issuer, X509_NAME),
-        ASN1_SEQUENCE_OF_OPT(OCSP_SERVICELOC, locator, ACCESS_DESCRIPTION)
+    ASN1_SIMPLE(OCSP_SERVICELOC, issuer, X509_NAME),
+    ASN1_SEQUENCE_OF_OPT(OCSP_SERVICELOC, locator, ACCESS_DESCRIPTION)
 } ASN1_SEQUENCE_END(OCSP_SERVICELOC)
 
 IMPLEMENT_ASN1_FUNCTIONS(OCSP_SERVICELOC)
diff --git a/crypto/ocsp/ocsp_cl.c b/crypto/ocsp/ocsp_cl.c
index c1dda38414f2a..8cf49ca46797f 100644
--- a/crypto/ocsp/ocsp_cl.c
+++ b/crypto/ocsp/ocsp_cl.c
@@ -64,12 +64,12 @@ int OCSP_request_set1_name(OCSP_REQUEST *req, const X509_NAME *nm)
 int OCSP_request_add1_cert(OCSP_REQUEST *req, X509 *cert)
 {
     if (req->optionalSignature == NULL
-            && (req->optionalSignature = OCSP_SIGNATURE_new()) == NULL)
+        && (req->optionalSignature = OCSP_SIGNATURE_new()) == NULL)
         return 0;
     if (cert == NULL)
         return 1;
     return ossl_x509_add_cert_new(&req->optionalSignature->certs, cert,
-                                  X509_ADD_FLAG_UP_REF);
+        X509_ADD_FLAG_UP_REF);
 }
 
 /*
@@ -78,10 +78,10 @@ int OCSP_request_add1_cert(OCSP_REQUEST *req, X509 *cert)
  * in the request. Behaves like PKCS7_sign().
  */
 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)
 {
     if (!OCSP_request_set1_name(req, X509_get_subject_name(signer)))
         goto err;
@@ -91,7 +91,7 @@ int OCSP_request_sign(OCSP_REQUEST *req,
     if (key != NULL) {
         if (!X509_check_private_key(signer, key)) {
             ERR_raise(ERR_LIB_OCSP,
-                      OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
+                OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
             goto err;
         }
         if (!OCSP_REQUEST_sign(req, key, dgst, signer->libctx, signer->propq))
@@ -101,12 +101,12 @@ int OCSP_request_sign(OCSP_REQUEST *req,
     if ((flags & OCSP_NOCERTS) == 0) {
         if (!OCSP_request_add1_cert(req, signer)
             || !X509_add_certs(req->optionalSignature->certs, certs,
-                               X509_ADD_FLAG_UP_REF))
+                X509_ADD_FLAG_UP_REF))
             goto err;
     }
 
     return 1;
- err:
+err:
     OCSP_SIGNATURE_free(req->optionalSignature);
     req->optionalSignature = NULL;
     return 0;
@@ -181,8 +181,8 @@ 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)
 {
     const OCSP_RESPID *rid = &bs->tbsResponseData.responderId;
 
@@ -199,8 +199,8 @@ int OCSP_resp_get0_id(const OCSP_BASICRESP *bs,
 }
 
 int OCSP_resp_get1_id(const OCSP_BASICRESP *bs,
-                      ASN1_OCTET_STRING **pid,
-                      X509_NAME **pname)
+    ASN1_OCTET_STRING **pid,
+    X509_NAME **pname)
 {
     const OCSP_RESPID *rid = &bs->tbsResponseData.responderId;
 
@@ -246,9 +246,9 @@ int OCSP_resp_find(OCSP_BASICRESP *bs, OCSP_CERTID *id, int last)
  * revoked. Returns numerical value of status.
  */
 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 ret;
     OCSP_CERTSTATUS *cst;
@@ -281,10 +281,10 @@ int OCSP_single_get0_status(OCSP_SINGLERESP *single, int *reason,
  * found extract status information. Return 0 is successful.
  */
 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 i = OCSP_resp_find(bs, id, -1);
     OCSP_SINGLERESP *single;
@@ -308,7 +308,7 @@ int OCSP_resp_find_status(OCSP_BASICRESP *bs, OCSP_CERTID *id, int *status,
  * parameter specifies the maximum age the thisUpdate field can be.
  */
 int OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd,
-                        ASN1_GENERALIZEDTIME *nextupd, long nsec, long maxsec)
+    ASN1_GENERALIZEDTIME *nextupd, long nsec, long maxsec)
 {
     int ret = 1;
     time_t t_now, t_tmp;
diff --git a/crypto/ocsp/ocsp_err.c b/crypto/ocsp/ocsp_err.c
index c33a7d3e6b211..aa0ee11af4f0a 100644
--- a/crypto/ocsp/ocsp_err.c
+++ b/crypto/ocsp/ocsp_err.c
@@ -14,60 +14,60 @@
 
 #ifndef OPENSSL_NO_OCSP
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA OCSP_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_CERTIFICATE_VERIFY_ERROR),
-    "certificate verify error"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_DIGEST_ERR), "digest err"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_DIGEST_NAME_ERR), "digest name err"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_DIGEST_SIZE_ERR), "digest size err"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_ERROR_IN_NEXTUPDATE_FIELD),
-    "error in nextupdate field"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_ERROR_IN_THISUPDATE_FIELD),
-    "error in thisupdate field"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_MISSING_OCSPSIGNING_USAGE),
-    "missing ocspsigning usage"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE),
-    "nextupdate before thisupdate"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NOT_BASIC_RESPONSE),
-    "not basic response"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_CERTIFICATES_IN_CHAIN),
-    "no certificates in chain"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_RESPONSE_DATA), "no response data"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_REVOKED_TIME), "no revoked time"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_SIGNER_KEY), "no signer key"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
-    "private key does not match certificate"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_REQUEST_NOT_SIGNED),
-    "request not signed"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA),
-    "response contains no revocation data"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_ROOT_CA_NOT_TRUSTED),
-    "root ca not trusted"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_SIGNATURE_FAILURE), "signature failure"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND),
-    "signer certificate not found"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_STATUS_EXPIRED), "status expired"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_STATUS_NOT_YET_VALID),
-    "status not yet valid"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_STATUS_TOO_OLD), "status too old"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_UNKNOWN_MESSAGE_DIGEST),
-    "unknown message digest"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_UNKNOWN_NID), "unknown nid"},
-    {ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE),
-    "unsupported requestorname type"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_CERTIFICATE_VERIFY_ERROR),
+        "certificate verify error" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_DIGEST_ERR), "digest err" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_DIGEST_NAME_ERR), "digest name err" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_DIGEST_SIZE_ERR), "digest size err" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_ERROR_IN_NEXTUPDATE_FIELD),
+        "error in nextupdate field" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_ERROR_IN_THISUPDATE_FIELD),
+        "error in thisupdate field" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_MISSING_OCSPSIGNING_USAGE),
+        "missing ocspsigning usage" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE),
+        "nextupdate before thisupdate" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NOT_BASIC_RESPONSE),
+        "not basic response" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_CERTIFICATES_IN_CHAIN),
+        "no certificates in chain" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_RESPONSE_DATA), "no response data" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_REVOKED_TIME), "no revoked time" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_NO_SIGNER_KEY), "no signer key" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
+        "private key does not match certificate" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_REQUEST_NOT_SIGNED),
+        "request not signed" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA),
+        "response contains no revocation data" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_ROOT_CA_NOT_TRUSTED),
+        "root ca not trusted" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_SIGNATURE_FAILURE), "signature failure" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND),
+        "signer certificate not found" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_STATUS_EXPIRED), "status expired" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_STATUS_NOT_YET_VALID),
+        "status not yet valid" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_STATUS_TOO_OLD), "status too old" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_UNKNOWN_MESSAGE_DIGEST),
+        "unknown message digest" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_UNKNOWN_NID), "unknown nid" },
+    { ERR_PACK(ERR_LIB_OCSP, 0, OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE),
+        "unsupported requestorname type" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_OCSP_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(OCSP_str_reasons[0].error) == NULL)
         ERR_load_strings_const(OCSP_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c
index 95f693ba0cd4b..4149f7f66d260 100644
--- a/crypto/ocsp/ocsp_ext.c
+++ b/crypto/ocsp/ocsp_ext.c
@@ -27,21 +27,18 @@ int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x)
 
 int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos)
 {
-    return (X509v3_get_ext_by_NID
-            (x->tbsRequest.requestExtensions, nid, lastpos));
+    return (X509v3_get_ext_by_NID(x->tbsRequest.requestExtensions, nid, lastpos));
 }
 
 int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, const ASN1_OBJECT *obj,
-                                int lastpos)
+    int lastpos)
 {
-    return (X509v3_get_ext_by_OBJ
-            (x->tbsRequest.requestExtensions, obj, lastpos));
+    return (X509v3_get_ext_by_OBJ(x->tbsRequest.requestExtensions, obj, lastpos));
 }
 
 int OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos)
 {
-    return (X509v3_get_ext_by_critical
-            (x->tbsRequest.requestExtensions, crit, lastpos));
+    return (X509v3_get_ext_by_critical(x->tbsRequest.requestExtensions, crit, lastpos));
 }
 
 X509_EXTENSION *OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc)
@@ -60,16 +57,15 @@ void *OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit, int *idx)
 }
 
 int OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,
-                              unsigned long flags)
+    unsigned long flags)
 {
     return X509V3_add1_i2d(&x->tbsRequest.requestExtensions, nid, value,
-                           crit, flags);
+        crit, flags);
 }
 
 int OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc)
 {
-    return (X509v3_add_ext(&(x->tbsRequest.requestExtensions), ex, loc) !=
-            NULL);
+    return (X509v3_add_ext(&(x->tbsRequest.requestExtensions), ex, loc) != NULL);
 }
 
 /* Single extensions */
@@ -85,15 +81,14 @@ int OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos)
 }
 
 int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, const ASN1_OBJECT *obj,
-                               int lastpos)
+    int lastpos)
 {
     return X509v3_get_ext_by_OBJ(x->singleRequestExtensions, obj, lastpos);
 }
 
 int OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos)
 {
-    return (X509v3_get_ext_by_critical
-            (x->singleRequestExtensions, crit, lastpos));
+    return (X509v3_get_ext_by_critical(x->singleRequestExtensions, crit, lastpos));
 }
 
 X509_EXTENSION *OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc)
@@ -112,10 +107,10 @@ 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)
 {
     return X509V3_add1_i2d(&x->singleRequestExtensions, nid, value, crit,
-                           flags);
+        flags);
 }
 
 int OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc)
@@ -132,22 +127,19 @@ int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x)
 
 int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos)
 {
-    return (X509v3_get_ext_by_NID
-            (x->tbsResponseData.responseExtensions, nid, lastpos));
+    return (X509v3_get_ext_by_NID(x->tbsResponseData.responseExtensions, nid, lastpos));
 }
 
 int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, const ASN1_OBJECT *obj,
-                                  int lastpos)
+    int lastpos)
 {
-    return (X509v3_get_ext_by_OBJ
-            (x->tbsResponseData.responseExtensions, obj, lastpos));
+    return (X509v3_get_ext_by_OBJ(x->tbsResponseData.responseExtensions, obj, lastpos));
 }
 
 int OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit,
-                                       int lastpos)
+    int lastpos)
 {
-    return (X509v3_get_ext_by_critical
-            (x->tbsResponseData.responseExtensions, crit, lastpos));
+    return (X509v3_get_ext_by_critical(x->tbsResponseData.responseExtensions, crit, lastpos));
 }
 
 X509_EXTENSION *OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc)
@@ -161,23 +153,23 @@ 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)
 {
     return X509V3_get_d2i(x->tbsResponseData.responseExtensions, nid, crit,
-                          idx);
+        idx);
 }
 
 int OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value,
-                                int crit, unsigned long flags)
+    int crit, unsigned long flags)
 {
     return X509V3_add1_i2d(&x->tbsResponseData.responseExtensions, nid,
-                           value, crit, flags);
+        value, crit, flags);
 }
 
 int OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc)
 {
     return (X509v3_add_ext(&(x->tbsResponseData.responseExtensions), ex, loc)
-            != NULL);
+        != NULL);
 }
 
 /* OCSP single response extensions */
@@ -193,13 +185,13 @@ 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)
 {
     return X509v3_get_ext_by_OBJ(x->singleExtensions, obj, lastpos);
 }
 
 int OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit,
-                                        int lastpos)
+    int lastpos)
 {
     return X509v3_get_ext_by_critical(x->singleExtensions, crit, lastpos);
 }
@@ -215,13 +207,13 @@ 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)
 {
     return X509V3_get_d2i(x->singleExtensions, nid, crit, idx);
 }
 
 int OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value,
-                                 int crit, unsigned long flags)
+    int crit, unsigned long flags)
 {
     return X509V3_add1_i2d(&x->singleExtensions, nid, value, crit, flags);
 }
@@ -242,7 +234,7 @@ int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc)
  */
 
 static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts,
-                           unsigned char *val, int len)
+    unsigned char *val, int len)
 {
     unsigned char *tmpval;
     ASN1_OCTET_STRING os;
@@ -269,10 +261,11 @@ static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts,
     else if (RAND_bytes(tmpval, len) <= 0)
         goto err;
     if (X509V3_add1_i2d(exts, NID_id_pkix_OCSP_Nonce,
-                         &os, 0, X509V3_ADD_REPLACE) <= 0)
+            &os, 0, X509V3_ADD_REPLACE)
+        <= 0)
         goto err;
     ret = 1;
- err:
+err:
     OPENSSL_free(os.data);
     return ret;
 }
@@ -289,7 +282,7 @@ int OCSP_request_add1_nonce(OCSP_REQUEST *req, unsigned char *val, int len)
 int OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len)
 {
     return ocsp_add1_nonce(&resp->tbsResponseData.responseExtensions, val,
-                           len);
+        len);
 }
 
 /*-
@@ -335,7 +328,7 @@ int OCSP_check_nonce(OCSP_REQUEST *req, OCSP_BASICRESP *bs)
     req_ext = OCSP_REQUEST_get_ext(req, req_idx);
     resp_ext = OCSP_BASICRESP_get_ext(bs, resp_idx);
     if (ASN1_OCTET_STRING_cmp(X509_EXTENSION_get_data(req_ext),
-                              X509_EXTENSION_get_data(resp_ext)))
+            X509_EXTENSION_get_data(resp_ext)))
         return 0;
     return 1;
 }
@@ -383,7 +376,7 @@ X509_EXTENSION *OCSP_crlID_new(const char *url, long *n, char *tim)
             goto err;
     }
     x = X509V3_EXT_i2d(NID_id_pkix_OCSP_CrlID, 0, cid);
- err:
+err:
     OCSP_CRLID_free(cid);
     return x;
 }
@@ -405,7 +398,7 @@ X509_EXTENSION *OCSP_accept_responses_new(char **oids)
         oids++;
     }
     x = X509V3_EXT_i2d(NID_id_pkix_OCSP_acceptableResponses, 0, sk);
- err:
+err:
     sk_ASN1_OBJECT_pop_free(sk, ASN1_OBJECT_free);
     return x;
 }
@@ -421,7 +414,7 @@ X509_EXTENSION *OCSP_archive_cutoff_new(char *tim)
     if (!(ASN1_GENERALIZEDTIME_set_string(gt, tim)))
         goto err;
     x = X509V3_EXT_i2d(NID_id_pkix_OCSP_archiveCutoff, 0, gt);
- err:
+err:
     ASN1_GENERALIZEDTIME_free(gt);
     return x;
 }
@@ -465,7 +458,7 @@ X509_EXTENSION *OCSP_url_svcloc_new(const X509_NAME *issuer, const char **urls)
         urls++;
     }
     x = X509V3_EXT_i2d(NID_id_pkix_OCSP_serviceLocator, 0, sloc);
- err:
+err:
     ASN1_IA5STRING_free(ia5);
     ACCESS_DESCRIPTION_free(ad);
     OCSP_SERVICELOC_free(sloc);
diff --git a/crypto/ocsp/ocsp_http.c b/crypto/ocsp/ocsp_http.c
index e8b6406d3c384..776de02ae7b23 100644
--- a/crypto/ocsp/ocsp_http.c
+++ b/crypto/ocsp/ocsp_http.c
@@ -13,7 +13,7 @@
 #ifndef OPENSSL_NO_OCSP
 
 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)
 {
     OSSL_HTTP_REQ_CTX *rctx = OSSL_HTTP_REQ_CTX_new(io, io, buf_size);
 
@@ -29,21 +29,21 @@ OSSL_HTTP_REQ_CTX *OCSP_sendreq_new(BIO *io, const char *path,
      * max_resp_len = 100 KiB
      */
     if (!OSSL_HTTP_REQ_CTX_set_request_line(rctx, 1 /* POST */,
-                                            NULL, NULL, path))
+            NULL, NULL, path))
         goto err;
     /* by default, no extra headers */
     if (!OSSL_HTTP_REQ_CTX_set_expected(rctx,
-                                        NULL /* content_type */, 1 /* asn1 */,
-                                        0 /* timeout */, 0 /* keep_alive */))
+            NULL /* content_type */, 1 /* asn1 */,
+            0 /* timeout */, 0 /* keep_alive */))
         goto err;
     if (req != NULL
         && !OSSL_HTTP_REQ_CTX_set1_req(rctx, "application/ocsp-request",
-                                       ASN1_ITEM_rptr(OCSP_REQUEST),
-                                       (const ASN1_VALUE *)req))
+            ASN1_ITEM_rptr(OCSP_REQUEST),
+            (const ASN1_VALUE *)req))
         goto err;
     return rctx;
 
- err:
+err:
     OSSL_HTTP_REQ_CTX_free(rctx);
     return NULL;
 }
@@ -60,7 +60,7 @@ OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, const char *path, OCSP_REQUEST *req)
     mem = OSSL_HTTP_REQ_CTX_exchange(ctx);
     /* ASN1_item_d2i_bio handles NULL bio gracefully */
     resp = (OCSP_RESPONSE *)ASN1_item_d2i_bio(ASN1_ITEM_rptr(OCSP_RESPONSE),
-                                              mem, NULL);
+        mem, NULL);
 
     OSSL_HTTP_REQ_CTX_free(ctx);
     return resp;
diff --git a/crypto/ocsp/ocsp_lib.c b/crypto/ocsp/ocsp_lib.c
index 285634dec37b5..b8f3bdccc071e 100644
--- a/crypto/ocsp/ocsp_lib.c
+++ b/crypto/ocsp/ocsp_lib.c
@@ -20,7 +20,7 @@
 /* Convert a certificate and its issuer to an OCSP_CERTID */
 
 OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, const X509 *subject,
-                             const X509 *issuer)
+    const X509 *issuer)
 {
     const X509_NAME *iname;
     const ASN1_INTEGER *serial;
@@ -40,9 +40,9 @@ OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, const X509 *subject,
 }
 
 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)
 {
     int nid;
     unsigned int i;
@@ -82,9 +82,9 @@ OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
             goto err;
     }
     return cid;
- digerr:
+digerr:
     ERR_raise(ERR_LIB_OCSP, OCSP_R_DIGEST_ERR);
- err:
+err:
     OCSP_CERTID_free(cid);
     return NULL;
 }
diff --git a/crypto/ocsp/ocsp_local.h b/crypto/ocsp/ocsp_local.h
index e1633403c6854..03c5aaef8666a 100644
--- a/crypto/ocsp/ocsp_local.h
+++ b/crypto/ocsp/ocsp_local.h
@@ -168,26 +168,26 @@ struct ocsp_response_data_st {
  *      signature            BIT STRING,
  *      certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
  */
-  /*
-   * Note 1: The value for "signature" is specified in the OCSP rfc2560 as
-   * follows: "The value for the signature SHALL be computed on the hash of
-   * the DER encoding ResponseData." This means that you must hash the
-   * DER-encoded tbsResponseData, and then run it through a crypto-signing
-   * function, which will (at least w/RSA) do a hash-'n'-private-encrypt
-   * operation.  This seems a bit odd, but that's the spec.  Also note that
-   * the data structures do not leave anywhere to independently specify the
-   * algorithm used for the initial hash. So, we look at the
-   * signature-specification algorithm, and try to do something intelligent.
-   * -- Kathy Weinhold, CertCo
-   */
-  /*
-   * Note 2: It seems that the mentioned passage from RFC 2560 (section
-   * 4.2.1) is open for interpretation.  I've done tests against another
-   * responder, and found that it doesn't do the double hashing that the RFC
-   * seems to say one should.  Therefore, all relevant functions take a flag
-   * saying which variant should be used.  -- Richard Levitte, OpenSSL team
-   * and CeloCom
-   */
+/*
+ * Note 1: The value for "signature" is specified in the OCSP rfc2560 as
+ * follows: "The value for the signature SHALL be computed on the hash of
+ * the DER encoding ResponseData." This means that you must hash the
+ * DER-encoded tbsResponseData, and then run it through a crypto-signing
+ * function, which will (at least w/RSA) do a hash-'n'-private-encrypt
+ * operation.  This seems a bit odd, but that's the spec.  Also note that
+ * the data structures do not leave anywhere to independently specify the
+ * algorithm used for the initial hash. So, we look at the
+ * signature-specification algorithm, and try to do something intelligent.
+ * -- Kathy Weinhold, CertCo
+ */
+/*
+ * Note 2: It seems that the mentioned passage from RFC 2560 (section
+ * 4.2.1) is open for interpretation.  I've done tests against another
+ * responder, and found that it doesn't do the double hashing that the RFC
+ * seems to say one should.  Therefore, all relevant functions take a flag
+ * saying which variant should be used.  -- Richard Levitte, OpenSSL team
+ * and CeloCom
+ */
 struct ocsp_basic_response_st {
     OCSP_RESPDATA tbsResponseData;
     X509_ALGOR signatureAlgorithm;
@@ -217,30 +217,30 @@ struct ocsp_service_locator_st {
     STACK_OF(ACCESS_DESCRIPTION) *locator;
 };
 
-#  define OCSP_REQUEST_sign(o, pkey, md, libctx, propq)\
-        ASN1_item_sign_ex(ASN1_ITEM_rptr(OCSP_REQINFO),\
-                          &(o)->optionalSignature->signatureAlgorithm, NULL,\
-                         (o)->optionalSignature->signature, &(o)->tbsRequest,\
-                         NULL, pkey, md, libctx, propq)
-
-#  define OCSP_BASICRESP_sign(o, pkey, md, d, libctx, propq)\
-        ASN1_item_sign_ex(ASN1_ITEM_rptr(OCSP_RESPDATA),\
-                          &(o)->signatureAlgorithm, NULL,\
-                          (o)->signature, &(o)->tbsResponseData,\
-                          NULL, pkey, md, libctx, propq)
-
-#  define OCSP_BASICRESP_sign_ctx(o, ctx, d)\
-        ASN1_item_sign_ctx(ASN1_ITEM_rptr(OCSP_RESPDATA),\
-                           &(o)->signatureAlgorithm, NULL,\
-                           (o)->signature, &(o)->tbsResponseData, ctx)
-
-#  define OCSP_REQUEST_verify(a, r, libctx, propq)\
-        ASN1_item_verify_ex(ASN1_ITEM_rptr(OCSP_REQINFO),\
-                            &(a)->optionalSignature->signatureAlgorithm,\
-                            (a)->optionalSignature->signature, &(a)->tbsRequest,\
-                            NULL, r, libctx, propq)
-
-#  define OCSP_BASICRESP_verify(a, r, libctx, propq)\
-        ASN1_item_verify_ex(ASN1_ITEM_rptr(OCSP_RESPDATA),\
-                            &(a)->signatureAlgorithm, (a)->signature,\
-                            &(a)->tbsResponseData, NULL, r, libctx, propq)
+#define OCSP_REQUEST_sign(o, pkey, md, libctx, propq)        \
+    ASN1_item_sign_ex(ASN1_ITEM_rptr(OCSP_REQINFO),          \
+        &(o)->optionalSignature->signatureAlgorithm, NULL,   \
+        (o)->optionalSignature->signature, &(o)->tbsRequest, \
+        NULL, pkey, md, libctx, propq)
+
+#define OCSP_BASICRESP_sign(o, pkey, md, d, libctx, propq) \
+    ASN1_item_sign_ex(ASN1_ITEM_rptr(OCSP_RESPDATA),       \
+        &(o)->signatureAlgorithm, NULL,                    \
+        (o)->signature, &(o)->tbsResponseData,             \
+        NULL, pkey, md, libctx, propq)
+
+#define OCSP_BASICRESP_sign_ctx(o, ctx, d)            \
+    ASN1_item_sign_ctx(ASN1_ITEM_rptr(OCSP_RESPDATA), \
+        &(o)->signatureAlgorithm, NULL,               \
+        (o)->signature, &(o)->tbsResponseData, ctx)
+
+#define OCSP_REQUEST_verify(a, r, libctx, propq)             \
+    ASN1_item_verify_ex(ASN1_ITEM_rptr(OCSP_REQINFO),        \
+        &(a)->optionalSignature->signatureAlgorithm,         \
+        (a)->optionalSignature->signature, &(a)->tbsRequest, \
+        NULL, r, libctx, propq)
+
+#define OCSP_BASICRESP_verify(a, r, libctx, propq)     \
+    ASN1_item_verify_ex(ASN1_ITEM_rptr(OCSP_RESPDATA), \
+        &(a)->signatureAlgorithm, (a)->signature,      \
+        &(a)->tbsResponseData, NULL, r, libctx, propq)
diff --git a/crypto/ocsp/ocsp_prn.c b/crypto/ocsp/ocsp_prn.c
index 6fe65b6c0de38..5a9e49480c934 100644
--- a/crypto/ocsp/ocsp_prn.c
+++ b/crypto/ocsp/ocsp_prn.c
@@ -49,12 +49,12 @@ static const char *do_table2string(long s, const OCSP_TBLSTR *ts, size_t len)
 const char *OCSP_response_status_str(long s)
 {
     static const OCSP_TBLSTR rstat_tbl[] = {
-        {OCSP_RESPONSE_STATUS_SUCCESSFUL, "successful"},
-        {OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, "malformedrequest"},
-        {OCSP_RESPONSE_STATUS_INTERNALERROR, "internalerror"},
-        {OCSP_RESPONSE_STATUS_TRYLATER, "trylater"},
-        {OCSP_RESPONSE_STATUS_SIGREQUIRED, "sigrequired"},
-        {OCSP_RESPONSE_STATUS_UNAUTHORIZED, "unauthorized"}
+        { OCSP_RESPONSE_STATUS_SUCCESSFUL, "successful" },
+        { OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, "malformedrequest" },
+        { OCSP_RESPONSE_STATUS_INTERNALERROR, "internalerror" },
+        { OCSP_RESPONSE_STATUS_TRYLATER, "trylater" },
+        { OCSP_RESPONSE_STATUS_SIGREQUIRED, "sigrequired" },
+        { OCSP_RESPONSE_STATUS_UNAUTHORIZED, "unauthorized" }
     };
     return table2string(s, rstat_tbl);
 }
@@ -62,9 +62,9 @@ const char *OCSP_response_status_str(long s)
 const char *OCSP_cert_status_str(long s)
 {
     static const OCSP_TBLSTR cstat_tbl[] = {
-        {V_OCSP_CERTSTATUS_GOOD, "good"},
-        {V_OCSP_CERTSTATUS_REVOKED, "revoked"},
-        {V_OCSP_CERTSTATUS_UNKNOWN, "unknown"}
+        { V_OCSP_CERTSTATUS_GOOD, "good" },
+        { V_OCSP_CERTSTATUS_REVOKED, "revoked" },
+        { V_OCSP_CERTSTATUS_UNKNOWN, "unknown" }
     };
     return table2string(s, cstat_tbl);
 }
@@ -72,16 +72,16 @@ const char *OCSP_cert_status_str(long s)
 const char *OCSP_crl_reason_str(long s)
 {
     static const OCSP_TBLSTR reason_tbl[] = {
-        {OCSP_REVOKED_STATUS_UNSPECIFIED, "unspecified"},
-        {OCSP_REVOKED_STATUS_KEYCOMPROMISE, "keyCompromise"},
-        {OCSP_REVOKED_STATUS_CACOMPROMISE, "cACompromise"},
-        {OCSP_REVOKED_STATUS_AFFILIATIONCHANGED, "affiliationChanged"},
-        {OCSP_REVOKED_STATUS_SUPERSEDED, "superseded"},
-        {OCSP_REVOKED_STATUS_CESSATIONOFOPERATION, "cessationOfOperation"},
-        {OCSP_REVOKED_STATUS_CERTIFICATEHOLD, "certificateHold"},
-        {OCSP_REVOKED_STATUS_REMOVEFROMCRL, "removeFromCRL"},
-        {OCSP_REVOKED_STATUS_PRIVILEGEWITHDRAWN, "privilegeWithdrawn"},
-        {OCSP_REVOKED_STATUS_AACOMPROMISE, "aACompromise"}
+        { OCSP_REVOKED_STATUS_UNSPECIFIED, "unspecified" },
+        { OCSP_REVOKED_STATUS_KEYCOMPROMISE, "keyCompromise" },
+        { OCSP_REVOKED_STATUS_CACOMPROMISE, "cACompromise" },
+        { OCSP_REVOKED_STATUS_AFFILIATIONCHANGED, "affiliationChanged" },
+        { OCSP_REVOKED_STATUS_SUPERSEDED, "superseded" },
+        { OCSP_REVOKED_STATUS_CESSATIONOFOPERATION, "cessationOfOperation" },
+        { OCSP_REVOKED_STATUS_CERTIFICATEHOLD, "certificateHold" },
+        { OCSP_REVOKED_STATUS_REMOVEFROMCRL, "removeFromCRL" },
+        { OCSP_REVOKED_STATUS_PRIVILEGEWITHDRAWN, "privilegeWithdrawn" },
+        { OCSP_REVOKED_STATUS_AACOMPROMISE, "aACompromise" }
     };
     return table2string(s, reason_tbl);
 }
@@ -112,12 +112,12 @@ int OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST *o, unsigned long flags)
         cid = one->reqCert;
         ocsp_certid_print(bp, cid, 8);
         if (!X509V3_extensions_print(bp,
-                                     "Request Single Extensions",
-                                     one->singleRequestExtensions, flags, 8))
+                "Request Single Extensions",
+                one->singleRequestExtensions, flags, 8))
             goto err;
     }
     if (!X509V3_extensions_print(bp, "Request Extensions",
-                                 inf->requestExtensions, flags, 4))
+            inf->requestExtensions, flags, 4))
         goto err;
     if (sig) {
         X509_signature_print(bp, &sig->signatureAlgorithm, sig->signature);
@@ -127,7 +127,7 @@ int OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST *o, unsigned long flags)
         }
     }
     return 1;
- err:
+err:
     return 0;
 }
 
@@ -148,7 +148,8 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags)
         goto err;
     l = ASN1_ENUMERATED_get(o->responseStatus);
     if (BIO_printf(bp, "    OCSP Response Status: %s (0x%lx)\n",
-                   OCSP_response_status_str(l), l) <= 0)
+            OCSP_response_status_str(l), l)
+        <= 0)
         goto err;
     if (rb == NULL)
         return 1;
@@ -195,7 +196,8 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags)
             goto err;
         cst = single->certStatus;
         if (BIO_printf(bp, "    Cert Status: %s",
-                       OCSP_cert_status_str(cst->type)) <= 0)
+                OCSP_cert_status_str(cst->type))
+            <= 0)
             goto err;
         if (cst->type == V_OCSP_CERTSTATUS_REVOKED) {
             rev = cst->value.revoked;
@@ -206,8 +208,9 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags)
             if (rev->revocationReason) {
                 l = ASN1_ENUMERATED_get(rev->revocationReason);
                 if (BIO_printf(bp,
-                               "\n    Revocation Reason: %s (0x%lx)",
-                               OCSP_crl_reason_str(l), l) <= 0)
+                        "\n    Revocation Reason: %s (0x%lx)",
+                        OCSP_crl_reason_str(l), l)
+                    <= 0)
                     goto err;
             }
         }
@@ -224,14 +227,14 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags)
         if (BIO_write(bp, "\n", 1) <= 0)
             goto err;
         if (!X509V3_extensions_print(bp,
-                                     "Response Single Extensions",
-                                     single->singleExtensions, flags, 8))
+                "Response Single Extensions",
+                single->singleExtensions, flags, 8))
             goto err;
         if (BIO_write(bp, "\n", 1) <= 0)
             goto err;
     }
     if (!X509V3_extensions_print(bp, "Response Extensions",
-                                 rd->responseExtensions, flags, 4))
+            rd->responseExtensions, flags, 4))
         goto err;
     if (X509_signature_print(bp, &br->signatureAlgorithm, br->signature) <= 0)
         goto err;
@@ -242,7 +245,7 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags)
     }
 
     ret = 1;
- err:
+err:
     OCSP_BASICRESP_free(br);
     return ret;
 }
diff --git a/crypto/ocsp/ocsp_srv.c b/crypto/ocsp/ocsp_srv.c
index dbb6e760b20cf..56276ad601720 100644
--- a/crypto/ocsp/ocsp_srv.c
+++ b/crypto/ocsp/ocsp_srv.c
@@ -36,8 +36,8 @@ 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)
 {
     if (!cid)
         return 0;
@@ -73,21 +73,20 @@ OCSP_RESPONSE *OCSP_response_create(int status, OCSP_BASICRESP *bs)
     if ((rsp->responseBytes = OCSP_RESPBYTES_new()) == NULL)
         goto err;
     rsp->responseBytes->responseType = OBJ_nid2obj(NID_id_pkix_OCSP_basic);
-    if (!ASN1_item_pack
-        (bs, ASN1_ITEM_rptr(OCSP_BASICRESP), &rsp->responseBytes->response))
-         goto err;
+    if (!ASN1_item_pack(bs, ASN1_ITEM_rptr(OCSP_BASICRESP), &rsp->responseBytes->response))
+        goto err;
     return rsp;
- err:
+err:
     OCSP_RESPONSE_free(rsp);
     return NULL;
 }
 
 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)
 {
     OCSP_SINGLERESP *single = NULL;
     OCSP_CERTSTATUS *cs;
@@ -95,7 +94,8 @@ OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
 
     if (rsp->tbsResponseData.responses == NULL
         && (rsp->tbsResponseData.responses
-                = sk_OCSP_SINGLERESP_new_null()) == NULL)
+               = sk_OCSP_SINGLERESP_new_null())
+            == NULL)
         goto err;
 
     if ((single = OCSP_SINGLERESP_new()) == NULL)
@@ -103,8 +103,7 @@ OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
 
     if (!ASN1_TIME_to_generalizedtime(thisupd, &single->thisUpdate))
         goto err;
-    if (nextupd &&
-        !ASN1_TIME_to_generalizedtime(nextupd, &single->nextUpdate))
+    if (nextupd && !ASN1_TIME_to_generalizedtime(nextupd, &single->nextUpdate))
         goto err;
 
     OCSP_CERTID_free(single->certId);
@@ -143,12 +142,11 @@ OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
 
     default:
         goto err;
-
     }
     if (!(sk_OCSP_SINGLERESP_push(rsp->tbsResponseData.responses, single)))
         goto err;
     return single;
- err:
+err:
     OCSP_SINGLERESP_free(single);
     return NULL;
 }
@@ -165,8 +163,8 @@ int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert)
  * include one or more optional certificates in the response.
  */
 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)
 {
     OCSP_RESPID *rid;
     EVP_PKEY *pkey;
@@ -196,8 +194,7 @@ int OCSP_basic_sign_ctx(OCSP_BASICRESP *brsp,
         goto err;
     }
 
-    if (!(flags & OCSP_NOTIME) &&
-        !X509_gmtime_adj(brsp->tbsResponseData.producedAt, 0))
+    if (!(flags & OCSP_NOTIME) && !X509_gmtime_adj(brsp->tbsResponseData.producedAt, 0))
         goto err;
 
     /*
@@ -208,13 +205,13 @@ int OCSP_basic_sign_ctx(OCSP_BASICRESP *brsp,
         goto err;
 
     return 1;
- err:
+err:
     return 0;
 }
 
 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)
 {
     EVP_MD_CTX *ctx = EVP_MD_CTX_new();
     EVP_PKEY_CTX *pkctx = NULL;
@@ -224,7 +221,7 @@ int OCSP_basic_sign(OCSP_BASICRESP *brsp,
         return 0;
 
     if (!EVP_DigestSignInit_ex(ctx, &pkctx, EVP_MD_get0_name(dgst),
-                               signer->libctx, signer->propq, key, NULL)) {
+            signer->libctx, signer->propq, key, NULL)) {
         EVP_MD_CTX_free(ctx);
         return 0;
     }
@@ -244,7 +241,7 @@ 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)
 {
     ASN1_OCTET_STRING *byKey = NULL;
     unsigned char md[SHA_DIGEST_LENGTH];
@@ -271,7 +268,7 @@ int OCSP_RESPID_set_by_key_ex(OCSP_RESPID *respid, X509 *cert,
     respid->value.byKey = byKey;
 
     ret = 1;
- err:
+err:
     EVP_MD_free(sha1);
     return ret;
 }
@@ -284,7 +281,7 @@ 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)
 {
     EVP_MD *sha1 = NULL;
     int ret = 0;
@@ -304,17 +301,19 @@ int OCSP_RESPID_match_ex(OCSP_RESPID *respid, X509 *cert, OSSL_LIB_CTX *libctx,
             goto err;
 
         ret = (ASN1_STRING_length(respid->value.byKey) == SHA_DIGEST_LENGTH)
-              && (memcmp(ASN1_STRING_get0_data(respid->value.byKey), md,
-                         SHA_DIGEST_LENGTH) == 0);
+            && (memcmp(ASN1_STRING_get0_data(respid->value.byKey), md,
+                    SHA_DIGEST_LENGTH)
+                == 0);
     } else if (respid->type == V_OCSP_RESPID_NAME) {
         if (respid->value.byName == NULL)
             return 0;
 
         return X509_NAME_cmp(respid->value.byName,
-                             X509_get_subject_name(cert)) == 0;
+                   X509_get_subject_name(cert))
+            == 0;
     }
 
- err:
+err:
     EVP_MD_free(sha1);
     return ret;
 }
diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c
index b0c2d6fd12a7f..3b6b1fe052bc6 100644
--- a/crypto/ocsp/ocsp_vfy.c
+++ b/crypto/ocsp/ocsp_vfy.c
@@ -14,22 +14,22 @@
 #include "ocsp_local.h"
 
 static int ocsp_find_signer(X509 **psigner, OCSP_BASICRESP *bs,
-                            STACK_OF(X509) *certs, unsigned long flags);
+    STACK_OF(X509) *certs, unsigned long flags);
 static X509 *ocsp_find_signer_sk(STACK_OF(X509) *certs, OCSP_RESPID *id);
 static int ocsp_check_issuer(OCSP_BASICRESP *bs, STACK_OF(X509) *chain);
 static int ocsp_check_ids(STACK_OF(OCSP_SINGLERESP) *sresp,
-                          OCSP_CERTID **ret);
+    OCSP_CERTID **ret);
 static int ocsp_match_issuerid(X509 *cert, OCSP_CERTID *cid,
-                               STACK_OF(OCSP_SINGLERESP) *sresp);
+    STACK_OF(OCSP_SINGLERESP) *sresp);
 static int ocsp_check_delegated(X509 *x);
 static int ocsp_req_find_signer(X509 **psigner, OCSP_REQUEST *req,
-                                const X509_NAME *nm, STACK_OF(X509) *certs,
-                                unsigned long flags);
+    const X509_NAME *nm, STACK_OF(X509) *certs,
+    unsigned long flags);
 
 /* Returns 1 on success, 0 on failure, or -1 on fatal error */
 static int ocsp_verify_signer(X509 *signer, int response,
-                              X509_STORE *st, unsigned long flags,
-                              STACK_OF(X509) *untrusted, STACK_OF(X509) **chain)
+    X509_STORE *st, unsigned long flags,
+    STACK_OF(X509) *untrusted, STACK_OF(X509) **chain)
 {
     X509_STORE_CTX *ctx = X509_STORE_CTX_new();
     X509_VERIFY_PARAM *vp;
@@ -48,7 +48,7 @@ static int ocsp_verify_signer(X509 *signer, int response,
     if ((flags & OCSP_PARTIAL_CHAIN) != 0)
         X509_VERIFY_PARAM_set_flags(vp, X509_V_FLAG_PARTIAL_CHAIN);
     if (response
-            && X509_get_ext_by_NID(signer, NID_id_pkix_OCSP_noCheck, -1) >= 0)
+        && X509_get_ext_by_NID(signer, NID_id_pkix_OCSP_noCheck, -1) >= 0)
         /*
          * Locally disable revocation status checking for OCSP responder cert.
          * Done here for CRLs; should be done also for OCSP-based checks.
@@ -62,19 +62,19 @@ static int ocsp_verify_signer(X509 *signer, int response,
         int err = X509_STORE_CTX_get_error(ctx);
 
         ERR_raise_data(ERR_LIB_OCSP, OCSP_R_CERTIFICATE_VERIFY_ERROR,
-                       "Verify error: %s", X509_verify_cert_error_string(err));
+            "Verify error: %s", X509_verify_cert_error_string(err));
         goto end;
     }
     if (chain != NULL)
         *chain = X509_STORE_CTX_get1_chain(ctx);
 
- end:
+end:
     X509_STORE_CTX_free(ctx);
     return ret;
 }
 
 static int ocsp_verify(OCSP_REQUEST *req, OCSP_BASICRESP *bs,
-                       X509 *signer, unsigned long flags)
+    X509 *signer, unsigned long flags)
 {
     EVP_PKEY *skey;
     int ret = 1;
@@ -96,7 +96,7 @@ static int ocsp_verify(OCSP_REQUEST *req, OCSP_BASICRESP *bs,
 
 /* Verify a basic response message */
 int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
-                      X509_STORE *st, unsigned long flags)
+    X509_STORE *st, unsigned long flags)
 {
     X509 *signer, *x;
     STACK_OF(X509) *chain = NULL;
@@ -153,20 +153,20 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
         ret = 1;
     }
 
- end:
+end:
     OSSL_STACK_OF_X509_free(chain);
     sk_X509_free(untrusted);
     return ret;
 }
 
 int OCSP_resp_get0_signer(OCSP_BASICRESP *bs, X509 **signer,
-                          STACK_OF(X509) *extra_certs)
+    STACK_OF(X509) *extra_certs)
 {
     return ocsp_find_signer(signer, bs, extra_certs, 0) > 0;
 }
 
 static int ocsp_find_signer(X509 **psigner, OCSP_BASICRESP *bs,
-                            STACK_OF(X509) *certs, unsigned long flags)
+    STACK_OF(X509) *certs, unsigned long flags)
 {
     X509 *signer;
     OCSP_RESPID *rid = &bs->tbsResponseData.responderId;
@@ -175,8 +175,7 @@ static int ocsp_find_signer(X509 **psigner, OCSP_BASICRESP *bs,
         *psigner = signer;
         return 2;
     }
-    if ((flags & OCSP_NOINTERN) == 0 &&
-        (signer = ocsp_find_signer_sk(bs->certs, rid))) {
+    if ((flags & OCSP_NOINTERN) == 0 && (signer = ocsp_find_signer_sk(bs->certs, rid))) {
         *psigner = signer;
         return 1;
     }
@@ -284,7 +283,7 @@ static int ocsp_check_ids(STACK_OF(OCSP_SINGLERESP) *sresp, OCSP_CERTID **ret)
         if (OCSP_id_issuer_cmp(cid, tmpid)) {
             /* If algorithm mismatch let caller deal with it */
             if (OBJ_cmp(tmpid->hashAlgorithm.algorithm,
-                        cid->hashAlgorithm.algorithm))
+                    cid->hashAlgorithm.algorithm))
                 return 2;
             /* Else mismatch */
             return 0;
@@ -301,7 +300,7 @@ static int ocsp_check_ids(STACK_OF(OCSP_SINGLERESP) *sresp, OCSP_CERTID **ret)
  * Returns -1 on fatal error, 0 if there is no match and 1 if there is a match.
  */
 static int ocsp_match_issuerid(X509 *cert, OCSP_CERTID *cid,
-                               STACK_OF(OCSP_SINGLERESP) *sresp)
+    STACK_OF(OCSP_SINGLERESP) *sresp)
 {
     int ret = -1;
     EVP_MD *dgst = NULL;
@@ -332,8 +331,7 @@ static int ocsp_match_issuerid(X509 *cert, OCSP_CERTID *cid,
             ERR_raise(ERR_LIB_OCSP, OCSP_R_DIGEST_SIZE_ERR);
             goto end;
         }
-        if (cid->issuerNameHash.length != mdlen ||
-            cid->issuerKeyHash.length != mdlen) {
+        if (cid->issuerNameHash.length != mdlen || cid->issuerKeyHash.length != mdlen) {
             ret = 0;
             goto end;
         }
@@ -383,7 +381,7 @@ static int ocsp_check_delegated(X509 *x)
  * Returns 1 on success, 0 on failure and on fatal error.
  */
 int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs,
-                        X509_STORE *store, unsigned long flags)
+    X509_STORE *store, unsigned long flags)
 {
     X509 *signer;
     const X509_NAME *nm;
@@ -413,14 +411,14 @@ int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs,
     if ((flags & OCSP_NOVERIFY) != 0)
         return 1;
     return ocsp_verify_signer(signer, 0, store, flags,
-                              (flags & OCSP_NOCHAIN) != 0 ?
-                              NULL : req->optionalSignature->certs, NULL) > 0;
+               (flags & OCSP_NOCHAIN) != 0 ? NULL : req->optionalSignature->certs, NULL)
+        > 0;
     /* using '> 0' here to avoid breaking backward compatibility returning -1 */
 }
 
 static int ocsp_req_find_signer(X509 **psigner, OCSP_REQUEST *req,
-                                const X509_NAME *nm, STACK_OF(X509) *certs,
-                                unsigned long flags)
+    const X509_NAME *nm, STACK_OF(X509) *certs,
+    unsigned long flags)
 {
     X509 *signer;
 
diff --git a/crypto/ocsp/v3_ocsp.c b/crypto/ocsp/v3_ocsp.c
index 4f54b7ceab95c..d31c74ef453f7 100644
--- a/crypto/ocsp/v3_ocsp.c
+++ b/crypto/ocsp/v3_ocsp.c
@@ -21,25 +21,23 @@
  */
 
 static int i2r_ocsp_crlid(const X509V3_EXT_METHOD *method, void *nonce,
-                          BIO *out, int indent);
+    BIO *out, int indent);
 static int i2r_ocsp_acutoff(const X509V3_EXT_METHOD *method, void *nonce,
-                            BIO *out, int indent);
-static int i2r_object(const X509V3_EXT_METHOD *method, void *obj, BIO *out,
-                      int indent);
+    BIO *out, int indent);
 
 static void *ocsp_nonce_new(void);
 static int i2d_ocsp_nonce(const void *a, unsigned char **pp);
 static void *d2i_ocsp_nonce(void *a, const unsigned char **pp, long length);
 static void ocsp_nonce_free(void *a);
 static int i2r_ocsp_nonce(const X509V3_EXT_METHOD *method, void *nonce,
-                          BIO *out, int indent);
+    BIO *out, int indent);
 
 static int i2r_ocsp_nocheck(const X509V3_EXT_METHOD *method,
-                            void *nocheck, BIO *out, int indent);
+    void *nocheck, BIO *out, int indent);
 static void *s2i_ocsp_nocheck(const X509V3_EXT_METHOD *method,
-                              X509V3_CTX *ctx, const char *str);
+    X509V3_CTX *ctx, const char *str);
 static int i2r_ocsp_serviceloc(const X509V3_EXT_METHOD *method, void *in,
-                               BIO *bp, int ind);
+    BIO *bp, int ind);
 
 const X509V3_EXT_METHOD ossl_v3_ocsp_crlid = {
     NID_id_pkix_OCSP_CrlID, 0, ASN1_ITEM_ref(OCSP_CRLID),
@@ -59,24 +57,6 @@ const X509V3_EXT_METHOD ossl_v3_ocsp_acutoff = {
     NULL
 };
 
-const X509V3_EXT_METHOD ossl_v3_crl_invdate = {
-    NID_invalidity_date, 0, ASN1_ITEM_ref(ASN1_GENERALIZEDTIME),
-    0, 0, 0, 0,
-    0, 0,
-    0, 0,
-    i2r_ocsp_acutoff, 0,
-    NULL
-};
-
-const X509V3_EXT_METHOD ossl_v3_crl_hold = {
-    NID_hold_instruction_code, 0, ASN1_ITEM_ref(ASN1_OBJECT),
-    0, 0, 0, 0,
-    0, 0,
-    0, 0,
-    i2r_object, 0,
-    NULL
-};
-
 const X509V3_EXT_METHOD ossl_v3_ocsp_nonce = {
     NID_id_pkix_OCSP_Nonce, 0, NULL,
     ocsp_nonce_new,
@@ -108,7 +88,7 @@ const X509V3_EXT_METHOD ossl_v3_ocsp_serviceloc = {
 };
 
 static int i2r_ocsp_crlid(const X509V3_EXT_METHOD *method, void *in, BIO *bp,
-                          int ind)
+    int ind)
 {
     OCSP_CRLID *a = in;
     if (a->crlUrl) {
@@ -136,12 +116,12 @@ static int i2r_ocsp_crlid(const X509V3_EXT_METHOD *method, void *in, BIO *bp,
             goto err;
     }
     return 1;
- err:
+err:
     return 0;
 }
 
 static int i2r_ocsp_acutoff(const X509V3_EXT_METHOD *method, void *cutoff,
-                            BIO *bp, int ind)
+    BIO *bp, int ind)
 {
     if (BIO_printf(bp, "%*s", ind, "") <= 0)
         return 0;
@@ -150,16 +130,6 @@ static int i2r_ocsp_acutoff(const X509V3_EXT_METHOD *method, void *cutoff,
     return 1;
 }
 
-static int i2r_object(const X509V3_EXT_METHOD *method, void *oid, BIO *bp,
-                      int ind)
-{
-    if (BIO_printf(bp, "%*s", ind, "") <= 0)
-        return 0;
-    if (i2a_ASN1_OBJECT(bp, oid) <= 0)
-        return 0;
-    return 1;
-}
-
 /*
  * OCSP nonce. This is needs special treatment because it doesn't have an
  * ASN1 encoding at all: it just contains arbitrary data.
@@ -200,7 +170,7 @@ static void *d2i_ocsp_nonce(void *a, const unsigned char **pp, long length)
         *pos = os;
     return os;
 
- err:
+err:
     if ((pos == NULL) || (*pos != os))
         ASN1_OCTET_STRING_free(os);
     ERR_raise(ERR_LIB_OCSP, ERR_R_ASN1_LIB);
@@ -213,7 +183,7 @@ static void ocsp_nonce_free(void *a)
 }
 
 static int i2r_ocsp_nonce(const X509V3_EXT_METHOD *method, void *nonce,
-                          BIO *out, int indent)
+    BIO *out, int indent)
 {
     if (BIO_printf(out, "%*s", indent, "") <= 0)
         return 0;
@@ -225,19 +195,19 @@ static int i2r_ocsp_nonce(const X509V3_EXT_METHOD *method, void *nonce,
 /* Nocheck is just a single NULL. Don't print anything and always set it */
 
 static int i2r_ocsp_nocheck(const X509V3_EXT_METHOD *method, void *nocheck,
-                            BIO *out, int indent)
+    BIO *out, int indent)
 {
     return 1;
 }
 
 static void *s2i_ocsp_nocheck(const X509V3_EXT_METHOD *method,
-                              X509V3_CTX *ctx, const char *str)
+    X509V3_CTX *ctx, const char *str)
 {
     return ASN1_NULL_new();
 }
 
 static int i2r_ocsp_serviceloc(const X509V3_EXT_METHOD *method, void *in,
-                               BIO *bp, int ind)
+    BIO *bp, int ind)
 {
     int i;
     OCSP_SERVICELOC *a = in;
@@ -259,6 +229,6 @@ static int i2r_ocsp_serviceloc(const X509V3_EXT_METHOD *method, void *in,
             goto err;
     }
     return 1;
- err:
+err:
     return 0;
 }
diff --git a/crypto/packet.c b/crypto/packet.c
index 6a43b35655fb4..48e2262ba4d7a 100644
--- a/crypto/packet.c
+++ b/crypto/packet.c
@@ -10,11 +10,11 @@
 #include "internal/cryptlib.h"
 #include "internal/packet.h"
 #if !defined OPENSSL_NO_QUIC && !defined FIPS_MODULE
-# include "internal/packet_quic.h"
+#include "internal/packet_quic.h"
 #endif
 #include <openssl/err.h>
 
-#define DEFAULT_BUF_SIZE    256
+#define DEFAULT_BUF_SIZE 256
 
 int WPACKET_allocate_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
 {
@@ -27,21 +27,21 @@ int WPACKET_allocate_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
 }
 
 int WPACKET_sub_allocate_bytes__(WPACKET *pkt, size_t len,
-                                 unsigned char **allocbytes, size_t lenbytes)
+    unsigned char **allocbytes, size_t lenbytes)
 {
     if (!WPACKET_start_sub_packet_len__(pkt, lenbytes)
-            || !WPACKET_allocate_bytes(pkt, len, allocbytes)
-            || !WPACKET_close(pkt))
+        || !WPACKET_allocate_bytes(pkt, len, allocbytes)
+        || !WPACKET_close(pkt))
         return 0;
 
     return 1;
 }
 
-#define GETBUF(p)   (((p)->staticbuf != NULL) \
-                     ? (p)->staticbuf \
-                     : ((p)->buf != NULL \
-                        ? (unsigned char *)(p)->buf->data \
-                        : NULL))
+#define GETBUF(p) (((p)->staticbuf != NULL)         \
+        ? (p)->staticbuf                            \
+        : ((p)->buf != NULL                         \
+                  ? (unsigned char *)(p)->buf->data \
+                  : NULL))
 
 int WPACKET_reserve_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
 {
@@ -78,7 +78,7 @@ int WPACKET_reserve_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
 }
 
 int WPACKET_sub_reserve_bytes__(WPACKET *pkt, size_t len,
-                                unsigned char **allocbytes, size_t lenbytes)
+    unsigned char **allocbytes, size_t lenbytes)
 {
     if (pkt->endfirst && lenbytes > 0)
         return 0;
@@ -127,7 +127,7 @@ static int wpacket_intern_init_len(WPACKET *pkt, size_t lenbytes)
 }
 
 int WPACKET_init_static_len(WPACKET *pkt, unsigned char *buf, size_t len,
-                            size_t lenbytes)
+    size_t lenbytes)
 {
     size_t max = maxmaxsize(lenbytes);
 
@@ -252,11 +252,11 @@ static int wpacket_intern_close(WPACKET *pkt, WPACKET_SUB *sub, int doclose)
     size_t packlen = pkt->written - sub->pwritten;
 
     if (packlen == 0
-            && (sub->flags & WPACKET_FLAGS_NON_ZERO_LENGTH) != 0)
+        && (sub->flags & WPACKET_FLAGS_NON_ZERO_LENGTH) != 0)
         return 0;
 
     if (packlen == 0
-            && sub->flags & WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH) {
+        && sub->flags & WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH) {
         /* We can't handle this case. Return an error */
         if (!doclose)
             return 0;
@@ -291,9 +291,10 @@ static int wpacket_intern_close(WPACKET *pkt, WPACKET_SUB *sub, int doclose)
 #endif
         }
     } else if (pkt->endfirst && sub->parent != NULL
-               && (packlen != 0
-                   || (sub->flags
-                       & WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH) == 0)) {
+        && (packlen != 0
+            || (sub->flags
+                   & WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH)
+                == 0)) {
         size_t tmplen = packlen;
         size_t numlenbytes = 1;
 
@@ -408,8 +409,8 @@ int WPACKET_put_bytes__(WPACKET *pkt, uint64_t val, size_t size)
 
     /* Internal API, so should not fail */
     if (!ossl_assert(size <= sizeof(uint64_t))
-            || !WPACKET_allocate_bytes(pkt, size, &data)
-            || !put_value(data, val, size))
+        || !WPACKET_allocate_bytes(pkt, size, &data)
+        || !put_value(data, val, size))
         return 0;
 
     return 1;
@@ -473,11 +474,11 @@ int WPACKET_memcpy(WPACKET *pkt, const void *src, size_t len)
 }
 
 int WPACKET_sub_memcpy__(WPACKET *pkt, const void *src, size_t len,
-                         size_t lenbytes)
+    size_t lenbytes)
 {
     if (!WPACKET_start_sub_packet_len__(pkt, lenbytes)
-            || !WPACKET_memcpy(pkt, src, len)
-            || !WPACKET_close(pkt))
+        || !WPACKET_memcpy(pkt, src, len)
+        || !WPACKET_close(pkt))
         return 0;
 
     return 1;
@@ -562,8 +563,8 @@ int WPACKET_start_quic_sub_packet(WPACKET *pkt)
 int WPACKET_quic_sub_allocate_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
 {
     if (!WPACKET_start_quic_sub_packet_bound(pkt, len)
-            || !WPACKET_allocate_bytes(pkt, len, allocbytes)
-            || !WPACKET_close(pkt))
+        || !WPACKET_allocate_bytes(pkt, len, allocbytes)
+        || !WPACKET_close(pkt))
         return 0;
 
     return 1;
diff --git a/crypto/param_build.c b/crypto/param_build.c
index 3294045156fa9..1eb36953ca524 100644
--- a/crypto/param_build.c
+++ b/crypto/param_build.c
@@ -49,8 +49,8 @@ struct ossl_param_bld_st {
 };
 
 static OSSL_PARAM_BLD_DEF *param_push(OSSL_PARAM_BLD *bld, const char *key,
-                                      size_t size, size_t alloc, int type,
-                                      int secure)
+    size_t size, size_t alloc, int type,
+    int secure)
 {
     OSSL_PARAM_BLD_DEF *pd = OPENSSL_zalloc(sizeof(*pd));
 
@@ -72,7 +72,7 @@ static OSSL_PARAM_BLD_DEF *param_push(OSSL_PARAM_BLD *bld, const char *key,
 }
 
 static int param_push_num(OSSL_PARAM_BLD *bld, const char *key,
-                          void *num, size_t size, int type)
+    void *num, size_t size, int type)
 {
     OSSL_PARAM_BLD_DEF *pd = param_push(bld, key, size, size, type, 0);
 
@@ -125,85 +125,85 @@ int OSSL_PARAM_BLD_push_int(OSSL_PARAM_BLD *bld, const char *key, int num)
 }
 
 int OSSL_PARAM_BLD_push_uint(OSSL_PARAM_BLD *bld, const char *key,
-                             unsigned int num)
+    unsigned int num)
 {
     return param_push_num(bld, key, &num, sizeof(num),
-                          OSSL_PARAM_UNSIGNED_INTEGER);
+        OSSL_PARAM_UNSIGNED_INTEGER);
 }
 
 int OSSL_PARAM_BLD_push_long(OSSL_PARAM_BLD *bld, const char *key,
-                             long int num)
+    long int num)
 {
     return param_push_num(bld, key, &num, sizeof(num), OSSL_PARAM_INTEGER);
 }
 
 int OSSL_PARAM_BLD_push_ulong(OSSL_PARAM_BLD *bld, const char *key,
-                              unsigned long int num)
+    unsigned long int num)
 {
     return param_push_num(bld, key, &num, sizeof(num),
-                          OSSL_PARAM_UNSIGNED_INTEGER);
+        OSSL_PARAM_UNSIGNED_INTEGER);
 }
 
 int OSSL_PARAM_BLD_push_int32(OSSL_PARAM_BLD *bld, const char *key,
-                              int32_t num)
+    int32_t num)
 {
     return param_push_num(bld, key, &num, sizeof(num), OSSL_PARAM_INTEGER);
 }
 
 int OSSL_PARAM_BLD_push_uint32(OSSL_PARAM_BLD *bld, const char *key,
-                               uint32_t num)
+    uint32_t num)
 {
     return param_push_num(bld, key, &num, sizeof(num),
-                          OSSL_PARAM_UNSIGNED_INTEGER);
+        OSSL_PARAM_UNSIGNED_INTEGER);
 }
 
 int OSSL_PARAM_BLD_push_int64(OSSL_PARAM_BLD *bld, const char *key,
-                              int64_t num)
+    int64_t num)
 {
     return param_push_num(bld, key, &num, sizeof(num), OSSL_PARAM_INTEGER);
 }
 
 int OSSL_PARAM_BLD_push_uint64(OSSL_PARAM_BLD *bld, const char *key,
-                               uint64_t num)
+    uint64_t num)
 {
     return param_push_num(bld, key, &num, sizeof(num),
-                          OSSL_PARAM_UNSIGNED_INTEGER);
+        OSSL_PARAM_UNSIGNED_INTEGER);
 }
 
 int OSSL_PARAM_BLD_push_size_t(OSSL_PARAM_BLD *bld, const char *key,
-                               size_t num)
+    size_t num)
 {
     return param_push_num(bld, key, &num, sizeof(num),
-                          OSSL_PARAM_UNSIGNED_INTEGER);
+        OSSL_PARAM_UNSIGNED_INTEGER);
 }
 
 int OSSL_PARAM_BLD_push_time_t(OSSL_PARAM_BLD *bld, const char *key,
-                               time_t num)
+    time_t num)
 {
     return param_push_num(bld, key, &num, sizeof(num),
-                          OSSL_PARAM_INTEGER);
+        OSSL_PARAM_INTEGER);
 }
 
 int OSSL_PARAM_BLD_push_double(OSSL_PARAM_BLD *bld, const char *key,
-                               double num)
+    double num)
 {
     return param_push_num(bld, key, &num, sizeof(num), OSSL_PARAM_REAL);
 }
 
 static int push_BN(OSSL_PARAM_BLD *bld, const char *key,
-                   const BIGNUM *bn, size_t sz, int type)
+    const BIGNUM *bn, size_t sz, int type)
 {
     int n, secure = 0;
     OSSL_PARAM_BLD_DEF *pd;
 
     if (!ossl_assert(type == OSSL_PARAM_UNSIGNED_INTEGER
-                     || type == OSSL_PARAM_INTEGER))
+            || type == OSSL_PARAM_INTEGER))
         return 0;
 
     if (bn != NULL) {
         if (type == OSSL_PARAM_UNSIGNED_INTEGER && BN_is_negative(bn)) {
             ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_UNSUPPORTED,
-                           "Negative big numbers are unsupported for OSSL_PARAM_UNSIGNED_INTEGER");
+                "Negative big numbers are unsupported for OSSL_PARAM_UNSIGNED_INTEGER");
             return 0;
         }
 
@@ -231,26 +231,26 @@ static int push_BN(OSSL_PARAM_BLD *bld, const char *key,
 }
 
 int OSSL_PARAM_BLD_push_BN(OSSL_PARAM_BLD *bld, const char *key,
-                           const BIGNUM *bn)
+    const BIGNUM *bn)
 {
     if (bn != NULL && BN_is_negative(bn))
         return push_BN(bld, key, bn, BN_num_bytes(bn) + 1,
-                       OSSL_PARAM_INTEGER);
+            OSSL_PARAM_INTEGER);
     return push_BN(bld, key, bn, bn == NULL ? 0 : BN_num_bytes(bn),
-                   OSSL_PARAM_UNSIGNED_INTEGER);
+        OSSL_PARAM_UNSIGNED_INTEGER);
 }
 
 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)
 {
     if (bn != NULL && BN_is_negative(bn))
         return push_BN(bld, key, bn, BN_num_bytes(bn),
-                       OSSL_PARAM_INTEGER);
+            OSSL_PARAM_INTEGER);
     return push_BN(bld, key, bn, sz, OSSL_PARAM_UNSIGNED_INTEGER);
 }
 
 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)
 {
     OSSL_PARAM_BLD_DEF *pd;
     int secure;
@@ -266,7 +266,7 @@ int OSSL_PARAM_BLD_push_utf8_string(OSSL_PARAM_BLD *bld, const char *key,
 }
 
 int OSSL_PARAM_BLD_push_utf8_ptr(OSSL_PARAM_BLD *bld, const char *key,
-                                 char *buf, size_t bsize)
+    char *buf, size_t bsize)
 {
     OSSL_PARAM_BLD_DEF *pd;
 
@@ -280,7 +280,7 @@ int OSSL_PARAM_BLD_push_utf8_ptr(OSSL_PARAM_BLD *bld, const char *key,
 }
 
 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)
 {
     OSSL_PARAM_BLD_DEF *pd;
     int secure;
@@ -294,7 +294,7 @@ int OSSL_PARAM_BLD_push_octet_string(OSSL_PARAM_BLD *bld, const char *key,
 }
 
 int OSSL_PARAM_BLD_push_octet_ptr(OSSL_PARAM_BLD *bld, const char *key,
-                                  void *buf, size_t bsize)
+    void *buf, size_t bsize)
 {
     OSSL_PARAM_BLD_DEF *pd;
 
@@ -306,8 +306,8 @@ int OSSL_PARAM_BLD_push_octet_ptr(OSSL_PARAM_BLD *bld, const char *key,
 }
 
 static OSSL_PARAM *param_bld_convert(OSSL_PARAM_BLD *bld, OSSL_PARAM *param,
-                                     OSSL_PARAM_ALIGNED_BLOCK *blk,
-                                     OSSL_PARAM_ALIGNED_BLOCK *secure)
+    OSSL_PARAM_ALIGNED_BLOCK *blk,
+    OSSL_PARAM_ALIGNED_BLOCK *secure)
 {
     int i, num = sk_OSSL_PARAM_BLD_DEF_num(bld->params);
     OSSL_PARAM_BLD_DEF *pd;
@@ -335,11 +335,11 @@ static OSSL_PARAM *param_bld_convert(OSSL_PARAM_BLD *bld, OSSL_PARAM *param,
             else
                 BN_signed_bn2native(pd->bn, (unsigned char *)p, pd->size);
         } else if (pd->type == OSSL_PARAM_OCTET_PTR
-                   || pd->type == OSSL_PARAM_UTF8_PTR) {
+            || pd->type == OSSL_PARAM_UTF8_PTR) {
             /* PTR */
             *(const void **)p = pd->string;
         } else if (pd->type == OSSL_PARAM_OCTET_STRING
-                   || pd->type == OSSL_PARAM_UTF8_STRING) {
+            || pd->type == OSSL_PARAM_UTF8_STRING) {
             if (pd->string != NULL)
                 memcpy(p, pd->string, pd->size);
             else
diff --git a/crypto/param_build_set.c b/crypto/param_build_set.c
index f205d101936a6..db49683ed9763 100644
--- a/crypto/param_build_set.c
+++ b/crypto/param_build_set.c
@@ -20,7 +20,7 @@
 DEFINE_SPECIAL_STACK_OF_CONST(BIGNUM_const, BIGNUM)
 
 int ossl_param_build_set_int(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
-                             const char *key, int num)
+    const char *key, int num)
 {
     if (bld != NULL)
         return OSSL_PARAM_BLD_push_int(bld, key, num);
@@ -31,7 +31,7 @@ int ossl_param_build_set_int(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
 }
 
 int ossl_param_build_set_long(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
-                              const char *key, long num)
+    const char *key, long num)
 {
     if (bld != NULL)
         return OSSL_PARAM_BLD_push_long(bld, key, num);
@@ -42,7 +42,7 @@ int ossl_param_build_set_long(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
 }
 
 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)
 {
     if (bld != NULL)
         return OSSL_PARAM_BLD_push_utf8_string(bld, key, buf, 0);
@@ -53,9 +53,9 @@ int ossl_param_build_set_utf8_string(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
 }
 
 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)
 {
     if (bld != NULL)
         return OSSL_PARAM_BLD_push_octet_string(bld, key, data, data_len);
@@ -67,7 +67,7 @@ int ossl_param_build_set_octet_string(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
 }
 
 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)
 {
     if (bld != NULL)
         return OSSL_PARAM_BLD_push_BN_pad(bld, key, bn, sz);
@@ -84,7 +84,7 @@ int ossl_param_build_set_bn_pad(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
 }
 
 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)
 {
     if (bld != NULL)
         return OSSL_PARAM_BLD_push_BN(bld, key, bn);
@@ -96,8 +96,8 @@ int ossl_param_build_set_bn(OSSL_PARAM_BLD *bld, OSSL_PARAM *p,
 }
 
 int ossl_param_build_set_multi_key_bn(OSSL_PARAM_BLD *bld, OSSL_PARAM *params,
-                                      const char *names[],
-                                      STACK_OF(BIGNUM_const) *stk)
+    const char *names[],
+    STACK_OF(BIGNUM_const) *stk)
 {
     int i, sz = sk_BIGNUM_const_num(stk);
     OSSL_PARAM *p;
diff --git a/crypto/params.c b/crypto/params.c
index 6f88a85393086..4c037a3f3f969 100644
--- a/crypto/params.c
+++ b/crypto/params.c
@@ -20,22 +20,22 @@
 /* Shortcuts for raising errors that are widely used */
 #define err_unsigned_negative \
     ERR_raise(ERR_LIB_CRYPTO, \
-              CRYPTO_R_PARAM_UNSIGNED_INTEGER_NEGATIVE_VALUE_UNSUPPORTED)
+        CRYPTO_R_PARAM_UNSIGNED_INTEGER_NEGATIVE_VALUE_UNSUPPORTED)
 #define err_out_of_range      \
     ERR_raise(ERR_LIB_CRYPTO, \
-              CRYPTO_R_PARAM_VALUE_TOO_LARGE_FOR_DESTINATION)
+        CRYPTO_R_PARAM_VALUE_TOO_LARGE_FOR_DESTINATION)
 #define err_inexact           \
     ERR_raise(ERR_LIB_CRYPTO, \
-              CRYPTO_R_PARAM_CANNOT_BE_REPRESENTED_EXACTLY)
-#define err_not_integer       \
+        CRYPTO_R_PARAM_CANNOT_BE_REPRESENTED_EXACTLY)
+#define err_not_integer \
     ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_PARAM_NOT_INTEGER_TYPE)
-#define err_too_small         \
+#define err_too_small \
     ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_TOO_SMALL_BUFFER)
-#define err_bad_type          \
+#define err_bad_type \
     ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_PARAM_OF_INCOMPATIBLE_TYPE)
-#define err_null_argument     \
+#define err_null_argument \
     ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER)
-#define err_unsupported_real  \
+#define err_unsupported_real \
     ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_PARAM_UNSUPPORTED_FLOATING_POINT_FORMAT)
 
 #ifndef OPENSSL_SYS_UEFI
@@ -65,7 +65,7 @@ const OSSL_PARAM *OSSL_PARAM_locate_const(const OSSL_PARAM *p, const char *key)
 }
 
 static OSSL_PARAM ossl_param_construct(const char *key, unsigned int data_type,
-                                       void *data, size_t data_size)
+    void *data, size_t data_size)
 {
     OSSL_PARAM res;
 
@@ -115,8 +115,8 @@ static int check_sign_bytes(const unsigned char *p, size_t n, unsigned char s)
  * Both integers are in native byte ordering.
  */
 static int copy_integer(unsigned char *dest, size_t dest_len,
-                        const unsigned char *src, size_t src_len,
-                        unsigned char pad, int signed_int)
+    const unsigned char *src, size_t src_len,
+    unsigned char pad, int signed_int)
 {
     size_t n;
     DECLARE_IS_ENDIAN;
@@ -129,11 +129,11 @@ static int copy_integer(unsigned char *dest, size_t dest_len,
         } else {
             n = src_len - dest_len;
             if (!check_sign_bytes(src, n, pad)
-                    /*
-                     * Shortening a signed value must retain the correct sign.
-                     * Avoiding this kind of thing: -253 = 0xff03 -> 0x03 = 3
-                     */
-                    || (signed_int && ((pad ^ src[n]) & 0x80) != 0)) {
+                /*
+                 * Shortening a signed value must retain the correct sign.
+                 * Avoiding this kind of thing: -253 = 0xff03 -> 0x03 = 3
+                 */
+                || (signed_int && ((pad ^ src[n]) & 0x80) != 0)) {
                 err_out_of_range;
                 return 0;
             }
@@ -147,11 +147,11 @@ static int copy_integer(unsigned char *dest, size_t dest_len,
         } else {
             n = src_len - dest_len;
             if (!check_sign_bytes(src + dest_len, n, pad)
-                    /*
-                     * Shortening a signed value must retain the correct sign.
-                     * Avoiding this kind of thing: 130 = 0x0082 -> 0x82 = -126
-                     */
-                    || (signed_int && ((pad ^ src[dest_len - 1]) & 0x80) != 0)) {
+                /*
+                 * Shortening a signed value must retain the correct sign.
+                 * Avoiding this kind of thing: 130 = 0x0082 -> 0x82 = -126
+                 */
+                || (signed_int && ((pad ^ src[dest_len - 1]) & 0x80) != 0)) {
                 err_out_of_range;
                 return 0;
             }
@@ -163,22 +163,22 @@ static int copy_integer(unsigned char *dest, size_t dest_len,
 
 /* Copy a signed number to a signed number of possibly different length */
 static int signed_from_signed(void *dest, size_t dest_len,
-                              const void *src, size_t src_len)
+    const void *src, size_t src_len)
 {
     return copy_integer(dest, dest_len, src, src_len,
-                        is_negative(src, src_len) ? 0xff : 0, 1);
+        is_negative(src, src_len) ? 0xff : 0, 1);
 }
 
 /* Copy an unsigned number to a signed number of possibly different length */
 static int signed_from_unsigned(void *dest, size_t dest_len,
-                                const void *src, size_t src_len)
+    const void *src, size_t src_len)
 {
     return copy_integer(dest, dest_len, src, src_len, 0, 1);
 }
 
 /* Copy a signed number to an unsigned number of possibly different length */
 static int unsigned_from_signed(void *dest, size_t dest_len,
-                                const void *src, size_t src_len)
+    const void *src, size_t src_len)
 {
     if (is_negative(src, src_len)) {
         err_unsigned_negative;
@@ -189,7 +189,7 @@ static int unsigned_from_signed(void *dest, size_t dest_len,
 
 /* Copy an unsigned number to an unsigned number of possibly different length */
 static int unsigned_from_unsigned(void *dest, size_t dest_len,
-                                  const void *src, size_t src_len)
+    const void *src, size_t src_len)
 {
     return copy_integer(dest, dest_len, src, src_len, 0, 0);
 }
@@ -323,7 +323,7 @@ int OSSL_PARAM_set_uint(OSSL_PARAM *p, unsigned int val)
 OSSL_PARAM OSSL_PARAM_construct_uint(const char *key, unsigned int *buf)
 {
     return ossl_param_construct(key, OSSL_PARAM_UNSIGNED_INTEGER, buf,
-                                sizeof(unsigned int));
+        sizeof(unsigned int));
 }
 
 int OSSL_PARAM_get_long(const OSSL_PARAM *p, long int *val)
@@ -386,7 +386,7 @@ int OSSL_PARAM_set_ulong(OSSL_PARAM *p, unsigned long int val)
 OSSL_PARAM OSSL_PARAM_construct_ulong(const char *key, unsigned long int *buf)
 {
     return ossl_param_construct(key, OSSL_PARAM_UNSIGNED_INTEGER, buf,
-                                sizeof(unsigned long int));
+        sizeof(unsigned long int));
 }
 
 int OSSL_PARAM_get_int32(const OSSL_PARAM *p, int32_t *val)
@@ -540,7 +540,7 @@ int OSSL_PARAM_set_int32(OSSL_PARAM *p, int32_t val)
 OSSL_PARAM OSSL_PARAM_construct_int32(const char *key, int32_t *buf)
 {
     return ossl_param_construct(key, OSSL_PARAM_INTEGER, buf,
-                                sizeof(int32_t));
+        sizeof(int32_t));
 }
 
 int OSSL_PARAM_get_uint32(const OSSL_PARAM *p, uint32_t *val)
@@ -698,7 +698,7 @@ int OSSL_PARAM_set_uint32(OSSL_PARAM *p, uint32_t val)
 OSSL_PARAM OSSL_PARAM_construct_uint32(const char *key, uint32_t *buf)
 {
     return ossl_param_construct(key, OSSL_PARAM_UNSIGNED_INTEGER, buf,
-                                sizeof(uint32_t));
+        sizeof(uint32_t));
 }
 
 int OSSL_PARAM_get_int64(const OSSL_PARAM *p, int64_t *val)
@@ -752,13 +752,13 @@ int OSSL_PARAM_get_int64(const OSSL_PARAM *p, int64_t *val)
         case sizeof(double):
             d = *(const double *)p->data;
             if (d >= INT64_MIN
-                    /*
-                     * By subtracting 65535 (2^16-1) we cancel the low order
-                     * 15 bits of INT64_MAX to avoid using imprecise floating
-                     * point values.
-                     */
-                    && d < (double)(INT64_MAX - 65535) + 65536.0
-                    && d == (int64_t)d) {
+                /*
+                 * By subtracting 65535 (2^16-1) we cancel the low order
+                 * 15 bits of INT64_MAX to avoid using imprecise floating
+                 * point values.
+                 */
+                && d < (double)(INT64_MAX - 65535) + 65536.0
+                && d == (int64_t)d) {
                 *val = (int64_t)d;
                 return 1;
             }
@@ -913,13 +913,13 @@ int OSSL_PARAM_get_uint64(const OSSL_PARAM *p, uint64_t *val)
         case sizeof(double):
             d = *(const double *)p->data;
             if (d >= 0
-                    /*
-                     * By subtracting 65535 (2^16-1) we cancel the low order
-                     * 15 bits of UINT64_MAX to avoid using imprecise floating
-                     * point values.
-                     */
-                    && d < (double)(UINT64_MAX - 65535) + 65536.0
-                    && d == (uint64_t)d) {
+                /*
+                 * By subtracting 65535 (2^16-1) we cancel the low order
+                 * 15 bits of UINT64_MAX to avoid using imprecise floating
+                 * point values.
+                 */
+                && d < (double)(UINT64_MAX - 65535) + 65536.0
+                && d == (uint64_t)d) {
                 *val = (uint64_t)d;
                 return 1;
             }
@@ -1013,7 +1013,7 @@ int OSSL_PARAM_set_uint64(OSSL_PARAM *p, uint64_t val)
 OSSL_PARAM OSSL_PARAM_construct_uint64(const char *key, uint64_t *buf)
 {
     return ossl_param_construct(key, OSSL_PARAM_UNSIGNED_INTEGER, buf,
-                                sizeof(uint64_t));
+        sizeof(uint64_t));
 }
 
 int OSSL_PARAM_get_size_t(const OSSL_PARAM *p, size_t *val)
@@ -1045,7 +1045,7 @@ int OSSL_PARAM_set_size_t(OSSL_PARAM *p, size_t val)
 OSSL_PARAM OSSL_PARAM_construct_size_t(const char *key, size_t *buf)
 {
     return ossl_param_construct(key, OSSL_PARAM_UNSIGNED_INTEGER, buf,
-                                sizeof(size_t));
+        sizeof(size_t));
 }
 
 int OSSL_PARAM_get_time_t(const OSSL_PARAM *p, time_t *val)
@@ -1167,10 +1167,10 @@ int OSSL_PARAM_set_BN(OSSL_PARAM *p, const BIGNUM *val)
 }
 
 OSSL_PARAM OSSL_PARAM_construct_BN(const char *key, unsigned char *buf,
-                                   size_t bsize)
+    size_t bsize)
 {
     return ossl_param_construct(key, OSSL_PARAM_UNSIGNED_INTEGER,
-                                buf, bsize);
+        buf, bsize);
 }
 
 #ifndef OPENSSL_SYS_UEFI
@@ -1228,7 +1228,7 @@ int OSSL_PARAM_get_double(const OSSL_PARAM *p, double *val)
 
 int OSSL_PARAM_set_double(OSSL_PARAM *p, double val)
 {
-#   define D_POW_31 ((double) (((uint32_t) 1) << 31))
+#define D_POW_31 ((double)(((uint32_t)1) << 31))
     const double d_pow_31 = D_POW_31;
     const double d_pow_32 = 2.0 * D_POW_31;
     const double d_pow_63 = 2.0 * D_POW_31 * D_POW_31;
@@ -1327,8 +1327,8 @@ OSSL_PARAM OSSL_PARAM_construct_double(const char *key, double *buf)
 #endif
 
 static int get_string_internal(const OSSL_PARAM *p, void **val,
-                               size_t *max_len, size_t *used_len,
-                               unsigned int type)
+    size_t *max_len, size_t *used_len,
+    unsigned int type)
 {
     size_t sz, alloc_sz;
 
@@ -1379,7 +1379,7 @@ static int get_string_internal(const OSSL_PARAM *p, void **val,
 int OSSL_PARAM_get_utf8_string(const OSSL_PARAM *p, char **val, size_t max_len)
 {
     int ret = get_string_internal(p, (void **)val, &max_len, NULL,
-                                  OSSL_PARAM_UTF8_STRING);
+        OSSL_PARAM_UTF8_STRING);
 
     /*
      * We try to ensure that the copied string is terminated with a
@@ -1400,7 +1400,7 @@ int OSSL_PARAM_get_utf8_string(const OSSL_PARAM *p, char **val, size_t max_len)
         data_length = OPENSSL_strnlen(p->data, data_length);
     if (data_length >= max_len) {
         ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_NO_SPACE_FOR_TERMINATING_NULL);
-        return 0;            /* No space for a terminating NUL byte */
+        return 0; /* No space for a terminating NUL byte */
     }
     (*val)[data_length] = '\0';
 
@@ -1408,14 +1408,14 @@ int OSSL_PARAM_get_utf8_string(const OSSL_PARAM *p, char **val, size_t max_len)
 }
 
 int OSSL_PARAM_get_octet_string(const OSSL_PARAM *p, void **val, size_t max_len,
-                                size_t *used_len)
+    size_t *used_len)
 {
     return get_string_internal(p, val, &max_len, used_len,
-                               OSSL_PARAM_OCTET_STRING);
+        OSSL_PARAM_OCTET_STRING);
 }
 
 static int set_string_internal(OSSL_PARAM *p, const void *val, size_t len,
-                               unsigned int type)
+    unsigned int type)
 {
     if (p->data_type != type) {
         err_bad_type;
@@ -1447,7 +1447,7 @@ int OSSL_PARAM_set_utf8_string(OSSL_PARAM *p, const char *val)
 }
 
 int OSSL_PARAM_set_octet_string(OSSL_PARAM *p, const void *val,
-                                size_t len)
+    size_t len)
 {
     if (p == NULL || val == NULL) {
         err_null_argument;
@@ -1458,7 +1458,7 @@ int OSSL_PARAM_set_octet_string(OSSL_PARAM *p, const void *val,
 }
 
 OSSL_PARAM OSSL_PARAM_construct_utf8_string(const char *key, char *buf,
-                                            size_t bsize)
+    size_t bsize)
 {
     if (buf != NULL && bsize == 0)
         bsize = strlen(buf);
@@ -1466,13 +1466,13 @@ OSSL_PARAM OSSL_PARAM_construct_utf8_string(const char *key, char *buf,
 }
 
 OSSL_PARAM OSSL_PARAM_construct_octet_string(const char *key, void *buf,
-                                             size_t bsize)
+    size_t bsize)
 {
     return ossl_param_construct(key, OSSL_PARAM_OCTET_STRING, buf, bsize);
 }
 
 static int get_ptr_internal(const OSSL_PARAM *p, const void **val,
-                            size_t *used_len, unsigned int type)
+    size_t *used_len, unsigned int type)
 {
     if (val == NULL || p == NULL) {
         err_null_argument;
@@ -1494,13 +1494,13 @@ int OSSL_PARAM_get_utf8_ptr(const 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)
 {
     return get_ptr_internal(p, val, used_len, OSSL_PARAM_OCTET_PTR);
 }
 
 static int set_ptr_internal(OSSL_PARAM *p, const void *val,
-                            unsigned int type, size_t len)
+    unsigned int type, size_t len)
 {
     if (p->data_type != type) {
         err_bad_type;
@@ -1520,11 +1520,11 @@ int OSSL_PARAM_set_utf8_ptr(OSSL_PARAM *p, const char *val)
     }
     p->return_size = 0;
     return set_ptr_internal(p, val, OSSL_PARAM_UTF8_PTR,
-                            val == NULL ? 0 : strlen(val));
+        val == NULL ? 0 : strlen(val));
 }
 
 int OSSL_PARAM_set_octet_ptr(OSSL_PARAM *p, const void *val,
-                             size_t used_len)
+    size_t used_len)
 {
     if (p == NULL) {
         err_null_argument;
@@ -1535,13 +1535,13 @@ int OSSL_PARAM_set_octet_ptr(OSSL_PARAM *p, const void *val,
 }
 
 OSSL_PARAM OSSL_PARAM_construct_utf8_ptr(const char *key, char **buf,
-                                         size_t bsize)
+    size_t bsize)
 {
     return ossl_param_construct(key, OSSL_PARAM_UTF8_PTR, buf, bsize);
 }
 
 OSSL_PARAM OSSL_PARAM_construct_octet_ptr(const char *key, void **buf,
-                                          size_t bsize)
+    size_t bsize)
 {
     return ossl_param_construct(key, OSSL_PARAM_OCTET_PTR, buf, bsize);
 }
@@ -1556,7 +1556,7 @@ OSSL_PARAM OSSL_PARAM_construct_octet_ptr(const char *key, void **buf,
  * 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)
 {
     const OSSL_PARAM *p = OSSL_PARAM_locate_const(params, name);
     void *buf = NULL;
@@ -1566,8 +1566,8 @@ int ossl_param_get1_octet_string(const OSSL_PARAM *params, const char *name,
         return -1;
 
     if (p->data != NULL
-            && p->data_size > 0
-            && !OSSL_PARAM_get_octet_string(p, &buf, 0, &len))
+        && p->data_size > 0
+        && !OSSL_PARAM_get_octet_string(p, &buf, 0, &len))
         return 0;
 
     OPENSSL_clear_free(*out, *out_len);
@@ -1577,7 +1577,7 @@ int ossl_param_get1_octet_string(const OSSL_PARAM *params, const char *name,
 }
 
 static int setbuf_fromparams(const OSSL_PARAM *p, const char *name,
-                             unsigned char *out, size_t *outlen)
+    unsigned char *out, size_t *outlen)
 {
     int ret = 0;
     WPACKET pkt;
@@ -1594,12 +1594,12 @@ static int setbuf_fromparams(const OSSL_PARAM *p, const char *name,
         if (p->data_type != OSSL_PARAM_OCTET_STRING)
             goto err;
         if (p->data != NULL
-                && p->data_size != 0
-                && !WPACKET_memcpy(&pkt, p->data, p->data_size))
+            && p->data_size != 0
+            && !WPACKET_memcpy(&pkt, p->data, p->data_size))
             goto err;
     }
     if (!WPACKET_get_total_written(&pkt, outlen)
-            || !WPACKET_finish(&pkt))
+        || !WPACKET_finish(&pkt))
         goto err;
     ret = 1;
 err:
@@ -1608,8 +1608,8 @@ static int setbuf_fromparams(const OSSL_PARAM *p, const char *name,
 }
 
 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)
 {
     const OSSL_PARAM *p = OSSL_PARAM_locate_const(params, name);
     unsigned char *res;
@@ -1644,7 +1644,7 @@ int ossl_param_get1_concat_octet_string(const OSSL_PARAM *params, const char *na
         return 0;
     }
 
- fin:
+fin:
     OPENSSL_clear_free(*out, *out_len);
     *out = res;
     *out_len = sz;
@@ -1659,7 +1659,7 @@ OSSL_PARAM OSSL_PARAM_construct_end(void)
 }
 
 static int get_string_ptr_internal(const OSSL_PARAM *p, const void **val,
-                                   size_t *used_len, unsigned int type)
+    size_t *used_len, unsigned int type)
 {
     if (val == NULL || p == NULL) {
         err_null_argument;
@@ -1683,12 +1683,11 @@ int OSSL_PARAM_get_utf8_string_ptr(const OSSL_PARAM *p, const char **val)
     rv = OSSL_PARAM_get_utf8_ptr(p, val);
     ERR_pop_to_mark();
 
-    return rv || get_string_ptr_internal(p, (const void **)val, NULL,
-                                         OSSL_PARAM_UTF8_STRING);
+    return rv || get_string_ptr_internal(p, (const void **)val, NULL, OSSL_PARAM_UTF8_STRING);
 }
 
 int OSSL_PARAM_get_octet_string_ptr(const OSSL_PARAM *p, const void **val,
-                                    size_t *used_len)
+    size_t *used_len)
 {
     int rv;
 
@@ -1696,6 +1695,5 @@ int OSSL_PARAM_get_octet_string_ptr(const OSSL_PARAM *p, const void **val,
     rv = OSSL_PARAM_get_octet_ptr(p, val, used_len);
     ERR_pop_to_mark();
 
-    return rv || get_string_ptr_internal(p, val, used_len,
-                                         OSSL_PARAM_OCTET_STRING);
+    return rv || get_string_ptr_internal(p, val, used_len, OSSL_PARAM_OCTET_STRING);
 }
diff --git a/crypto/params_dup.c b/crypto/params_dup.c
index 769629bbf324c..d231c5b92ef95 100644
--- a/crypto/params_dup.c
+++ b/crypto/params_dup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-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
@@ -12,18 +12,18 @@
 #include <openssl/param_build.h>
 #include "internal/param_build_set.h"
 
-#define OSSL_PARAM_ALLOCATED_END    127
-#define OSSL_PARAM_MERGE_LIST_MAX   128
+#define OSSL_PARAM_ALLOCATED_END 127
+#define OSSL_PARAM_MERGE_LIST_MAX 128
 
 #define OSSL_PARAM_BUF_PUBLIC 0
 #define OSSL_PARAM_BUF_SECURE 1
-#define OSSL_PARAM_BUF_MAX    (OSSL_PARAM_BUF_SECURE + 1)
+#define OSSL_PARAM_BUF_MAX (OSSL_PARAM_BUF_SECURE + 1)
 
 typedef struct {
     OSSL_PARAM_ALIGNED_BLOCK *alloc; /* The allocated buffer */
-    OSSL_PARAM_ALIGNED_BLOCK *cur;   /* Current position in the allocated buf */
-    size_t blocks;    /* Number of aligned blocks */
-    size_t alloc_sz;  /* The size of the allocated buffer (in bytes) */
+    OSSL_PARAM_ALIGNED_BLOCK *cur; /* Current position in the allocated buf */
+    size_t blocks; /* Number of aligned blocks */
+    size_t alloc_sz; /* The size of the allocated buffer (in bytes) */
 } OSSL_PARAM_BUF;
 
 size_t ossl_param_bytes_to_blocks(size_t bytes)
@@ -32,7 +32,7 @@ size_t ossl_param_bytes_to_blocks(size_t bytes)
 }
 
 static int ossl_param_buf_alloc(OSSL_PARAM_BUF *out, size_t extra_blocks,
-                                int is_secure)
+    int is_secure)
 {
     size_t sz = OSSL_PARAM_ALIGN_SIZE * (extra_blocks + out->blocks);
 
@@ -45,7 +45,7 @@ static int ossl_param_buf_alloc(OSSL_PARAM_BUF *out, size_t extra_blocks,
 }
 
 void ossl_param_set_secure_block(OSSL_PARAM *last, void *secure_buffer,
-                                 size_t secure_buffer_sz)
+    size_t secure_buffer_sz)
 {
     last->key = NULL;
     last->data_size = secure_buffer_sz;
@@ -54,8 +54,8 @@ void ossl_param_set_secure_block(OSSL_PARAM *last, void *secure_buffer,
 }
 
 static OSSL_PARAM *ossl_param_dup(const OSSL_PARAM *src, OSSL_PARAM *dst,
-                                  OSSL_PARAM_BUF buf[OSSL_PARAM_BUF_MAX],
-                                  int *param_count)
+    OSSL_PARAM_BUF buf[OSSL_PARAM_BUF_MAX],
+    int *param_count)
 {
     const OSSL_PARAM *in;
     int has_dst = (dst != NULL);
@@ -131,7 +131,7 @@ OSSL_PARAM *OSSL_PARAM_dup(const OSSL_PARAM *src)
     last = ossl_param_dup(src, dst, buf, NULL);
     /* Store the allocated secure memory buffer in the last param block */
     ossl_param_set_secure_block(last, buf[OSSL_PARAM_BUF_SECURE].alloc,
-                                buf[OSSL_PARAM_BUF_SECURE].alloc_sz);
+        buf[OSSL_PARAM_BUF_SECURE].alloc_sz);
     return dst;
 }
 
@@ -150,7 +150,7 @@ OSSL_PARAM *OSSL_PARAM_merge(const OSSL_PARAM *p1, const OSSL_PARAM *p2)
     const OSSL_PARAM *p = NULL;
     const OSSL_PARAM **p1cur, **p2cur;
     OSSL_PARAM *params, *dst;
-    size_t  list1_sz = 0, list2_sz = 0;
+    size_t list1_sz = 0, list2_sz = 0;
     int diff;
 
     if (p1 == NULL && p2 == NULL) {
@@ -180,7 +180,7 @@ OSSL_PARAM *OSSL_PARAM_merge(const OSSL_PARAM *p1, const OSSL_PARAM *p2)
     qsort(list1, list1_sz, sizeof(OSSL_PARAM *), compare_params);
     qsort(list2, list2_sz, sizeof(OSSL_PARAM *), compare_params);
 
-   /* Allocate enough space to store the merged parameters */
+    /* Allocate enough space to store the merged parameters */
     params = OPENSSL_zalloc((list1_sz + list2_sz + 1) * sizeof(*p1));
     if (params == NULL)
         return NULL;
@@ -190,18 +190,18 @@ OSSL_PARAM *OSSL_PARAM_merge(const OSSL_PARAM *p1, const OSSL_PARAM *p2)
     while (1) {
         /* If list1 is finished just tack list2 onto the end */
         if (*p1cur == NULL) {
-            do {
+            while (*p2cur != NULL) {
                 *dst++ = **p2cur;
                 p2cur++;
-            } while (*p2cur != NULL);
+            }
             break;
         }
         /* If list2 is finished just tack list1 onto the end */
         if (*p2cur == NULL) {
-            do {
+            while (*p1cur != NULL) {
                 *dst++ = **p1cur;
                 p1cur++;
-            } while (*p1cur != NULL);
+            }
             break;
         }
         /* consume the list element with the smaller key */
diff --git a/crypto/params_from_text.c b/crypto/params_from_text.c
index 7532d4d43923f..700d9140e186a 100644
--- a/crypto/params_from_text.c
+++ b/crypto/params_from_text.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2025 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2019, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -23,10 +23,10 @@
  */
 
 static int prepare_from_text(const OSSL_PARAM *paramdefs, const char *key,
-                             const char *value, size_t value_n,
-                             /* Output parameters */
-                             const OSSL_PARAM **paramdef, int *ishex,
-                             size_t *buf_n, BIGNUM **tmpbn, int *found)
+    const char *value, size_t value_n,
+    /* Output parameters */
+    const OSSL_PARAM **paramdef, int *ishex,
+    size_t *buf_n, BIGNUM **tmpbn, int *found)
 {
     const OSSL_PARAM *p;
     size_t buf_bits;
@@ -133,8 +133,8 @@ static int prepare_from_text(const OSSL_PARAM *paramdefs, const char *key,
 }
 
 static int construct_from_text(OSSL_PARAM *to, const OSSL_PARAM *paramdef,
-                               const char *value, size_t value_n, int ishex,
-                               void *buf, size_t buf_n, BIGNUM *tmpbn)
+    const char *value, size_t value_n, int ishex,
+    void *buf, size_t buf_n, BIGNUM *tmpbn)
 {
     if (buf == NULL)
         return 0;
@@ -199,7 +199,7 @@ static int construct_from_text(OSSL_PARAM *to, const OSSL_PARAM *paramdef,
 }
 
 /**
- * OSSL_PARAM_print_to_bio - Print OSSL_PARAM array to a bio 
+ * OSSL_PARAM_print_to_bio - Print OSSL_PARAM array to a bio
  *
  * @p:        Array of OSSL_PARAM structures containing keys and values.
  * @bio:      Pointer to bio where the formatted output will be written.
@@ -220,9 +220,9 @@ int OSSL_PARAM_print_to_bio(const OSSL_PARAM *p, BIO *bio, int print_values)
     BIGNUM *bn;
 #ifndef OPENSSL_SYS_UEFI
     double d;
+    int dok;
 #endif
     int ok = -1;
-    int dok;
 
     /*
      * Iterate through each key in the array printing its key and value
@@ -280,19 +280,19 @@ int OSSL_PARAM_print_to_bio(const OSSL_PARAM *p, BIO *bio, int print_values)
         case OSSL_PARAM_OCTET_STRING:
             ok = BIO_dump(bio, (char *)p->data, p->data_size);
             break;
+#ifndef OPENSSL_SYS_UEFI
         case OSSL_PARAM_REAL:
             dok = 0;
-#ifndef OPENSSL_SYS_UEFI
             dok = OSSL_PARAM_get_double(p, &d);
-#endif
             if (dok == 1)
                 ok = BIO_printf(bio, "%f\n", d);
             else
                 ok = BIO_printf(bio, "error getting value\n");
             break;
+#endif
         default:
             ok = BIO_printf(bio, "unknown type (%u) of %zu bytes\n",
-                            p->data_type, p->data_size);
+                p->data_type, p->data_size);
             break;
         }
         if (ok == -1)
@@ -304,9 +304,9 @@ int OSSL_PARAM_print_to_bio(const OSSL_PARAM *p, BIO *bio, int print_values)
 }
 
 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)
 {
     const OSSL_PARAM *paramdef = NULL;
     int ishex = 0;
@@ -319,19 +319,19 @@ int OSSL_PARAM_allocate_from_text(OSSL_PARAM *to,
         return 0;
 
     if (!prepare_from_text(paramdefs, key, value, value_n,
-                           &paramdef, &ishex, &buf_n, &tmpbn, found))
+            &paramdef, &ishex, &buf_n, &tmpbn, found))
         goto err;
 
     if ((buf = OPENSSL_zalloc(buf_n > 0 ? buf_n : 1)) == NULL)
         goto err;
 
     ok = construct_from_text(to, paramdef, value, value_n, ishex,
-                             buf, buf_n, tmpbn);
+        buf, buf_n, tmpbn);
     BN_free(tmpbn);
     if (!ok)
         OPENSSL_free(buf);
     return ok;
- err:
+err:
     BN_free(tmpbn);
     return 0;
 }
diff --git a/crypto/params_idx.c.in b/crypto/params_idx.c.in
index f04939b597c5b..e8a229388b14f 100644
--- a/crypto/params_idx.c.in
+++ b/crypto/params_idx.c.in
@@ -8,14 +8,18 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
+/* clang-format off */
 {-
 use OpenSSL::paramnames qw(produce_decoder);
 -}
+/* clang-format on */
 
 #include "internal/e_os.h"
 #include "internal/param_names.h"
 #include <string.h>
 
 /* Machine generated TRIE -- generated by util/perl/OpenSSL/paramnames.pm */
+/* clang-format off */
 {- produce_decoder(); -}
+/* clang-format on */
 /* End of TRIE */
diff --git a/crypto/passphrase.c b/crypto/passphrase.c
index 563c5acd1e54d..c6ddfc1d5e592 100644
--- a/crypto/passphrase.c
+++ b/crypto/passphrase.c
@@ -18,7 +18,7 @@ void ossl_pw_clear_passphrase_data(struct ossl_passphrase_data_st *data)
     if (data != NULL) {
         if (data->type == is_expl_passphrase)
             OPENSSL_clear_free(data->_.expl_passphrase.passphrase_copy,
-                               data->_.expl_passphrase.passphrase_len);
+                data->_.expl_passphrase.passphrase_len);
         ossl_pw_clear_passphrase_cache(data);
         memset(data, 0, sizeof(*data));
     }
@@ -31,8 +31,8 @@ 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)
 {
     if (!ossl_assert(data != NULL && passphrase != NULL)) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -40,9 +40,8 @@ int ossl_pw_set_passphrase(struct ossl_passphrase_data_st *data,
     }
     ossl_pw_clear_passphrase_data(data);
     data->type = is_expl_passphrase;
-    data->_.expl_passphrase.passphrase_copy =
-        passphrase_len != 0 ? OPENSSL_memdup(passphrase, passphrase_len)
-                            : OPENSSL_malloc(1);
+    data->_.expl_passphrase.passphrase_copy = passphrase_len != 0 ? OPENSSL_memdup(passphrase, passphrase_len)
+                                                                  : OPENSSL_malloc(1);
     if (data->_.expl_passphrase.passphrase_copy == NULL)
         return 0;
     data->_.expl_passphrase.passphrase_len = passphrase_len;
@@ -50,7 +49,7 @@ int ossl_pw_set_passphrase(struct ossl_passphrase_data_st *data,
 }
 
 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)
 {
     if (!ossl_assert(data != NULL && cb != NULL)) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -64,7 +63,7 @@ int ossl_pw_set_pem_password_cb(struct ossl_passphrase_data_st *data,
 }
 
 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)
 {
     if (!ossl_assert(data != NULL && cb != NULL)) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -78,7 +77,7 @@ int ossl_pw_set_ossl_passphrase_cb(struct ossl_passphrase_data_st *data,
 }
 
 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)
 {
     if (!ossl_assert(data != NULL && ui_method != NULL)) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@@ -103,7 +102,6 @@ int ossl_pw_disable_passphrase_caching(struct ossl_passphrase_data_st *data)
     return 1;
 }
 
-
 /*-
  * UI_METHOD processor.  It differs from UI_UTIL_read_pw() like this:
  *
@@ -114,8 +112,8 @@ int ossl_pw_disable_passphrase_caching(struct ossl_passphrase_data_st *data)
  * 4.  It reports back the length of the prompted pass phrase.
  */
 static int do_ui_passphrase(char *pass, size_t pass_size, size_t *pass_len,
-                            const char *prompt_info, int verify,
-                            const UI_METHOD *ui_method, void *ui_data)
+    const char *prompt_info, int verify,
+    const UI_METHOD *ui_method, void *ui_data)
 {
     char *prompt = NULL, *ipass = NULL, *vpass = NULL;
     int prompt_idx = -1, verify_idx = -1, res;
@@ -151,8 +149,9 @@ static int do_ui_passphrase(char *pass, size_t pass_size, size_t *pass_len,
         goto end;
 
     prompt_idx = UI_add_input_string(ui, prompt,
-                                     UI_INPUT_FLAG_DEFAULT_PWD,
-                                     ipass, 0, pass_size) - 1;
+                     UI_INPUT_FLAG_DEFAULT_PWD,
+                     ipass, 0, pass_size)
+        - 1;
     if (prompt_idx < 0) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_UI_LIB);
         goto end;
@@ -164,9 +163,10 @@ static int do_ui_passphrase(char *pass, size_t pass_size, size_t *pass_len,
         if (vpass == NULL)
             goto end;
         verify_idx = UI_add_verify_string(ui, prompt,
-                                          UI_INPUT_FLAG_DEFAULT_PWD,
-                                          vpass, 0, pass_size,
-                                          ipass) - 1;
+                         UI_INPUT_FLAG_DEFAULT_PWD,
+                         vpass, 0, pass_size,
+                         ipass)
+            - 1;
         if (verify_idx < 0) {
             ERR_raise(ERR_LIB_CRYPTO, ERR_R_UI_LIB);
             goto end;
@@ -192,7 +192,7 @@ static int do_ui_passphrase(char *pass, size_t pass_size, size_t *pass_len,
         break;
     }
 
- end:
+end:
     OPENSSL_clear_free(vpass, pass_size + 1);
     OPENSSL_clear_free(ipass, pass_size + 1);
     OPENSSL_free(prompt);
@@ -202,8 +202,8 @@ static int do_ui_passphrase(char *pass, size_t pass_size, size_t *pass_len,
 
 /* Central pw prompting dispatcher */
 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)
 {
     const char *source = NULL;
     size_t source_len = 0;
@@ -245,10 +245,11 @@ int ossl_pw_get_passphrase(char *pass, size_t pass_size, size_t *pass_len,
     /* Handle the is_pem_password and is_ui_method cases */
 
     if ((p = OSSL_PARAM_locate_const(params,
-                                     OSSL_PASSPHRASE_PARAM_INFO)) != NULL) {
+             OSSL_PASSPHRASE_PARAM_INFO))
+        != NULL) {
         if (p->data_type != OSSL_PARAM_UTF8_STRING) {
             ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_PASSED_INVALID_ARGUMENT,
-                           "Prompt info data type incorrect");
+                "Prompt info data type incorrect");
             return 0;
         }
         prompt_info = p->data;
@@ -258,8 +259,7 @@ int ossl_pw_get_passphrase(char *pass, size_t pass_size, size_t *pass_len,
         /* We use a UI wrapper for PEM */
         pem_password_cb *cb = data->_.pem_password.password_cb;
 
-        ui_method = allocated_ui_method =
-            UI_UTIL_wrap_read_pem_callback(cb, verify);
+        ui_method = allocated_ui_method = UI_UTIL_wrap_read_pem_callback(cb, verify);
         ui_data = data->_.pem_password.password_cbarg;
 
         if (ui_method == NULL) {
@@ -273,23 +273,22 @@ int ossl_pw_get_passphrase(char *pass, size_t pass_size, size_t *pass_len,
 
     if (ui_method == NULL) {
         ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_PASSED_INVALID_ARGUMENT,
-                       "No password method specified");
+            "No password method specified");
         return 0;
     }
 
     ret = do_ui_passphrase(pass, pass_size, pass_len, prompt_info, verify,
-                           ui_method, ui_data);
+        ui_method, ui_data);
 
     UI_destroy_method(allocated_ui_method);
 
- do_cache:
+do_cache:
     if (ret && data->flag_cache_passphrase) {
         if (data->cached_passphrase == NULL
             || *pass_len > data->cached_passphrase_len) {
-            void *new_cache =
-                OPENSSL_clear_realloc(data->cached_passphrase,
-                                      data->cached_passphrase_len,
-                                      *pass_len + 1);
+            void *new_cache = OPENSSL_clear_realloc(data->cached_passphrase,
+                data->cached_passphrase_len,
+                *pass_len + 1);
 
             if (new_cache == NULL) {
                 OPENSSL_cleanse(pass, *pass_len);
@@ -306,7 +305,7 @@ int ossl_pw_get_passphrase(char *pass, size_t pass_size, size_t *pass_len,
 }
 
 static int ossl_pw_get_password(char *buf, int size, int rwflag,
-                                void *userdata, const char *info)
+    void *userdata, const char *info)
 {
     size_t password_len = 0;
     OSSL_PARAM params[] = {
@@ -316,7 +315,7 @@ static int ossl_pw_get_password(char *buf, int size, int rwflag,
 
     params[0].data = (void *)info;
     if (ossl_pw_get_passphrase(buf, (size_t)size, &password_len, params,
-                               rwflag, userdata))
+            rwflag, userdata))
         return (int)password_len;
     return -1;
 }
@@ -332,15 +331,15 @@ int ossl_pw_pvk_password(char *buf, int size, int rwflag, void *userdata)
 }
 
 int ossl_pw_passphrase_callback_enc(char *pass, size_t pass_size,
-                                    size_t *pass_len,
-                                    const OSSL_PARAM params[], void *arg)
+    size_t *pass_len,
+    const OSSL_PARAM params[], void *arg)
 {
     return ossl_pw_get_passphrase(pass, pass_size, pass_len, params, 1, arg);
 }
 
 int ossl_pw_passphrase_callback_dec(char *pass, size_t pass_size,
-                                    size_t *pass_len,
-                                    const OSSL_PARAM params[], void *arg)
+    size_t *pass_len,
+    const OSSL_PARAM params[], void *arg)
 {
     return ossl_pw_get_passphrase(pass, pass_size, pass_len, params, 0, arg);
 }
diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c
index 222af64397b4d..7cc4e9644e97b 100644
--- a/crypto/pem/pem_all.c
+++ b/crypto/pem/pem_all.c
@@ -42,7 +42,7 @@ IMPLEMENT_PEM_rw(X509_PUBKEY, X509_PUBKEY, PEM_STRING_PUBLIC, X509_PUBKEY)
 IMPLEMENT_PEM_rw(PKCS7, PKCS7, PEM_STRING_PKCS7, PKCS7)
 
 IMPLEMENT_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE,
-                 PEM_STRING_X509, NETSCAPE_CERT_SEQUENCE)
+    PEM_STRING_X509, NETSCAPE_CERT_SEQUENCE)
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 /*
  * We treat RSA or DSA private keys as a special case. For private keys we
@@ -67,14 +67,14 @@ static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa)
 }
 
 RSA *PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **rsa, pem_password_cb *cb,
-                                void *u)
+    void *u)
 {
     EVP_PKEY *pktmp;
     pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
     return pkey_get_rsa(pktmp, rsa);
 }
 
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 
 RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u)
 {
@@ -83,7 +83,7 @@ RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u)
     return pkey_get_rsa(pktmp, rsa);
 }
 
-# endif
+#endif
 
 IMPLEMENT_PEM_write_cb(RSAPrivateKey, RSA, PEM_STRING_RSA, RSAPrivateKey)
 IMPLEMENT_PEM_rw(RSAPublicKey, RSA, PEM_STRING_RSA_PUBLIC, RSAPublicKey)
@@ -107,7 +107,7 @@ static DSA *pkey_get_dsa(EVP_PKEY *key, DSA **dsa)
 }
 
 DSA *PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **dsa, pem_password_cb *cb,
-                                void *u)
+    void *u)
 {
     EVP_PKEY *pktmp;
     pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
@@ -116,7 +116,7 @@ DSA *PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **dsa, pem_password_cb *cb,
 
 IMPLEMENT_PEM_write_cb(DSAPrivateKey, DSA, PEM_STRING_DSA, DSAPrivateKey)
 IMPLEMENT_PEM_rw(DSA_PUBKEY, DSA, PEM_STRING_PUBLIC, DSA_PUBKEY)
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 DSA *PEM_read_DSAPrivateKey(FILE *fp, DSA **dsa, pem_password_cb *cb, void *u)
 {
     EVP_PKEY *pktmp;
@@ -124,13 +124,13 @@ DSA *PEM_read_DSAPrivateKey(FILE *fp, DSA **dsa, pem_password_cb *cb, void *u)
     return pkey_get_dsa(pktmp, dsa); /* will free pktmp */
 }
 
-# endif
+#endif
 
 IMPLEMENT_PEM_rw(DSAparams, DSA, PEM_STRING_DSAPARAMS, DSAparams)
 #endif
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
 static EC_KEY *pkey_get_eckey(EVP_PKEY *key, EC_KEY **eckey)
 {
     EC_KEY *dtmp;
@@ -148,7 +148,7 @@ static EC_KEY *pkey_get_eckey(EVP_PKEY *key, EC_KEY **eckey)
 }
 
 EC_KEY *PEM_read_bio_ECPrivateKey(BIO *bp, EC_KEY **key, pem_password_cb *cb,
-                                  void *u)
+    void *u)
 {
     EVP_PKEY *pktmp;
     pktmp = PEM_read_bio_PrivateKey(bp, NULL, cb, u);
@@ -156,22 +156,21 @@ EC_KEY *PEM_read_bio_ECPrivateKey(BIO *bp, EC_KEY **key, pem_password_cb *cb,
 }
 
 IMPLEMENT_PEM_rw(ECPKParameters, EC_GROUP, PEM_STRING_ECPARAMETERS,
-                 ECPKParameters)
-
+    ECPKParameters)
 
 IMPLEMENT_PEM_write_cb(ECPrivateKey, EC_KEY, PEM_STRING_ECPRIVATEKEY,
-                       ECPrivateKey)
+    ECPrivateKey)
 IMPLEMENT_PEM_rw(EC_PUBKEY, EC_KEY, PEM_STRING_PUBLIC, EC_PUBKEY)
-#  ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 EC_KEY *PEM_read_ECPrivateKey(FILE *fp, EC_KEY **eckey, pem_password_cb *cb,
-                              void *u)
+    void *u)
 {
     EVP_PKEY *pktmp;
     pktmp = PEM_read_PrivateKey(fp, NULL, cb, u);
     return pkey_get_eckey(pktmp, eckey); /* will free pktmp */
 }
-#  endif
-# endif /* !OPENSSL_NO_EC */
+#endif
+#endif /* !OPENSSL_NO_EC */
 #endif /* !OPENSSL_NO_DEPRECATED_3_0 */
 
 #ifndef OPENSSL_NO_DH
@@ -205,7 +204,7 @@ DH *PEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u)
     return ret;
 }
 
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 DH *PEM_read_DHparams(FILE *fp, DH **x, pem_password_cb *cb, void *u)
 {
     BIO *b;
@@ -220,7 +219,7 @@ DH *PEM_read_DHparams(FILE *fp, DH **x, pem_password_cb *cb, void *u)
     BIO_free(b);
     return ret;
 }
-# endif
+#endif
 
 #endif
 IMPLEMENT_PEM_provided_write(PUBKEY, EVP_PKEY, pkey, PEM_STRING_PUBLIC, PUBKEY)
diff --git a/crypto/pem/pem_err.c b/crypto/pem/pem_err.c
index e5e5facfb468a..d51e584c009c1 100644
--- a/crypto/pem/pem_err.c
+++ b/crypto/pem/pem_err.c
@@ -15,53 +15,53 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA PEM_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_BASE64_DECODE), "bad base64 decode"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_DECRYPT), "bad decrypt"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_END_LINE), "bad end line"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_IV_CHARS), "bad iv chars"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_MAGIC_NUMBER), "bad magic number"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_PASSWORD_READ), "bad password read"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_VERSION_NUMBER), "bad version number"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BIO_WRITE_FAILURE), "bio write failure"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_CIPHER_IS_NULL), "cipher is null"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_ERROR_CONVERTING_PRIVATE_KEY),
-    "error converting private key"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_DSS_KEY_BLOB),
-    "expecting dss key blob"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_PRIVATE_KEY_BLOB),
-    "expecting private key blob"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_PUBLIC_KEY_BLOB),
-    "expecting public key blob"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_RSA_KEY_BLOB),
-    "expecting rsa key blob"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_HEADER_TOO_LONG), "header too long"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_INCONSISTENT_HEADER),
-    "inconsistent header"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_KEYBLOB_HEADER_PARSE_ERROR),
-    "keyblob header parse error"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_KEYBLOB_TOO_SHORT), "keyblob too short"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_MISSING_DEK_IV), "missing dek iv"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NOT_DEK_INFO), "not dek info"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NOT_ENCRYPTED), "not encrypted"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NOT_PROC_TYPE), "not proc type"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NO_START_LINE), "no start line"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_PROBLEMS_GETTING_PASSWORD),
-    "problems getting password"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_PVK_DATA_TOO_SHORT), "pvk data too short"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_PVK_TOO_SHORT), "pvk too short"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_READ_KEY), "read key"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_SHORT_HEADER), "short header"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNEXPECTED_DEK_IV), "unexpected dek iv"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_CIPHER), "unsupported cipher"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_ENCRYPTION),
-    "unsupported encryption"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_KEY_COMPONENTS),
-    "unsupported key components"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_PUBLIC_KEY_TYPE),
-    "unsupported public key type"},
-    {ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_PVK_KEY_TYPE),
-     "unsupported pvk key type"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_BASE64_DECODE), "bad base64 decode" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_DECRYPT), "bad decrypt" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_END_LINE), "bad end line" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_IV_CHARS), "bad iv chars" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_MAGIC_NUMBER), "bad magic number" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_PASSWORD_READ), "bad password read" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BAD_VERSION_NUMBER), "bad version number" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_BIO_WRITE_FAILURE), "bio write failure" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_CIPHER_IS_NULL), "cipher is null" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_ERROR_CONVERTING_PRIVATE_KEY),
+        "error converting private key" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_DSS_KEY_BLOB),
+        "expecting dss key blob" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_PRIVATE_KEY_BLOB),
+        "expecting private key blob" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_PUBLIC_KEY_BLOB),
+        "expecting public key blob" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_EXPECTING_RSA_KEY_BLOB),
+        "expecting rsa key blob" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_HEADER_TOO_LONG), "header too long" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_INCONSISTENT_HEADER),
+        "inconsistent header" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_KEYBLOB_HEADER_PARSE_ERROR),
+        "keyblob header parse error" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_KEYBLOB_TOO_SHORT), "keyblob too short" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_MISSING_DEK_IV), "missing dek iv" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NOT_DEK_INFO), "not dek info" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NOT_ENCRYPTED), "not encrypted" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NOT_PROC_TYPE), "not proc type" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_NO_START_LINE), "no start line" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_PROBLEMS_GETTING_PASSWORD),
+        "problems getting password" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_PVK_DATA_TOO_SHORT), "pvk data too short" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_PVK_TOO_SHORT), "pvk too short" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_READ_KEY), "read key" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_SHORT_HEADER), "short header" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNEXPECTED_DEK_IV), "unexpected dek iv" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_CIPHER), "unsupported cipher" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_ENCRYPTION),
+        "unsupported encryption" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_KEY_COMPONENTS),
+        "unsupported key components" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_PUBLIC_KEY_TYPE),
+        "unsupported public key type" },
+    { ERR_PACK(ERR_LIB_PEM, 0, PEM_R_UNSUPPORTED_PVK_KEY_TYPE),
+        "unsupported pvk key type" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c
index f8dc4416e2167..8f38fe058079e 100644
--- a/crypto/pem/pem_info.c
+++ b/crypto/pem/pem_info.c
@@ -27,7 +27,7 @@
 #ifndef OPENSSL_NO_STDIO
 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)
 {
     BIO *b;
     STACK_OF(X509_INFO) *ret;
@@ -43,16 +43,16 @@ STACK_OF(X509_INFO)
 }
 
 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)
 {
     return PEM_X509_INFO_read_ex(fp, sk, cb, u, NULL, NULL);
 }
 #endif
 
 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)
 {
     X509_INFO *xi = NULL;
     char *name = NULL, *header = NULL, *str;
@@ -90,10 +90,10 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
             goto err;
         }
         ERR_clear_last_mark();
- start:
+    start:
         if (strcmp(name, PEM_STRING_X509) == 0
-                || strcmp(name, PEM_STRING_X509_OLD) == 0
-                || strcmp(name, PEM_STRING_X509_TRUSTED) == 0) {
+            || strcmp(name, PEM_STRING_X509_OLD) == 0
+            || strcmp(name, PEM_STRING_X509_TRUSTED) == 0) {
             if (xi->x509 != NULL) {
                 if (!sk_X509_INFO_push(ret, xi))
                     goto err;
@@ -102,15 +102,15 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
                 goto start;
             }
             if ((strcmp(name, PEM_STRING_X509_TRUSTED) == 0))
-                d2i = (D2I_OF(void)) d2i_X509_AUX;
+                d2i = (D2I_OF(void))d2i_X509_AUX;
             else
-                d2i = (D2I_OF(void)) d2i_X509;
+                d2i = (D2I_OF(void))d2i_X509;
             xi->x509 = X509_new_ex(libctx, propq);
             if (xi->x509 == NULL)
                 goto err;
             pp = &(xi->x509);
         } else if (strcmp(name, PEM_STRING_X509_CRL) == 0) {
-            d2i = (D2I_OF(void)) d2i_X509_CRL;
+            d2i = (D2I_OF(void))d2i_X509_CRL;
             if (xi->crl != NULL) {
                 if (!sk_X509_INFO_push(ret, xi))
                     goto err;
@@ -137,13 +137,13 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
             xi->enc_data = NULL;
             xi->enc_len = 0;
 
-            d2i = (D2I_OF(void)) d2i_AutoPrivateKey;
+            d2i = (D2I_OF(void))d2i_AutoPrivateKey;
             xi->x_pkey = X509_PKEY_new();
             if (xi->x_pkey == NULL)
                 goto err;
             pp = &xi->x_pkey->dec_pkey;
             if ((int)strlen(header) > 10 /* assume encrypted */
-                   || strcmp(name, PEM_STRING_PKCS8) == 0)
+                || strcmp(name, PEM_STRING_PKCS8) == 0)
                 raw = 1;
         } else { /* unknown */
             d2i = NULL;
@@ -161,7 +161,8 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
                 p = data;
                 if (ptype) {
                     if (d2i_PrivateKey_ex(ptype, pp, &p, len,
-                                          libctx, propq) == NULL) {
+                            libctx, propq)
+                        == NULL) {
                         ERR_raise(ERR_LIB_PEM, ERR_R_ASN1_LIB);
                         goto err;
                     }
@@ -169,7 +170,7 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
                     ERR_raise(ERR_LIB_PEM, ERR_R_ASN1_LIB);
                     goto err;
                 }
-            } else {            /* encrypted key data */
+            } else { /* encrypted key data */
                 if (!PEM_get_EVP_CIPHER_INFO(header, &xi->enc_cipher))
                     goto err;
                 xi->enc_data = (char *)data;
@@ -189,14 +190,13 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
      * if the last one hasn't been pushed yet and there is anything in it
      * then add it to the stack ...
      */
-    if ((xi->x509 != NULL) || (xi->crl != NULL) ||
-        (xi->x_pkey != NULL) || (xi->enc_data != NULL)) {
+    if ((xi->x509 != NULL) || (xi->crl != NULL) || (xi->x_pkey != NULL) || (xi->enc_data != NULL)) {
         if (!sk_X509_INFO_push(ret, xi))
             goto err;
         xi = NULL;
     }
     ok = 1;
- err:
+err:
     X509_INFO_free(xi);
     if (!ok) {
         for (i = 0; ((int)i) < sk_X509_INFO_num(ret); i++) {
@@ -215,15 +215,15 @@ STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
 }
 
 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)
 {
     return PEM_X509_INFO_read_bio_ex(bp, sk, cb, u, NULL, NULL);
 }
 
 /* A TJH addition */
 int PEM_X509_INFO_write_bio(BIO *bp, const X509_INFO *xi, EVP_CIPHER *enc,
-                            const unsigned char *kstr, int klen,
-                            pem_password_cb *cb, void *u)
+    const unsigned char *kstr, int klen,
+    pem_password_cb *cb, void *u)
 {
     int i, ret = 0;
     unsigned char *data = NULL;
@@ -234,12 +234,12 @@ int PEM_X509_INFO_write_bio(BIO *bp, const X509_INFO *xi, EVP_CIPHER *enc,
     if (enc != NULL) {
         objstr = EVP_CIPHER_get0_name(enc);
         if (objstr == NULL
-               /*
-                * Check "Proc-Type: 4,Encrypted\nDEK-Info: objstr,hex-iv\n"
-                * fits into buf
-                */
+            /*
+             * Check "Proc-Type: 4,Encrypted\nDEK-Info: objstr,hex-iv\n"
+             * fits into buf
+             */
             || strlen(objstr) + 23 + 2 * EVP_CIPHER_get_iv_length(enc) + 13
-               > sizeof(buf)) {
+                > sizeof(buf)) {
             ERR_raise(ERR_LIB_PEM, PEM_R_UNSUPPORTED_CIPHER);
             goto err;
         }
@@ -277,7 +277,7 @@ int PEM_X509_INFO_write_bio(BIO *bp, const X509_INFO *xi, EVP_CIPHER *enc,
             buf[0] = '\0';
             PEM_proc_type(buf, PEM_TYPE_ENCRYPTED);
             PEM_dek_info(buf, objstr, EVP_CIPHER_get_iv_length(enc),
-                         (const char *)iv);
+                (const char *)iv);
 
             /* use the normal code to write things out */
             i = PEM_write_bio(bp, PEM_STRING_RSA, buf, data, i);
@@ -287,8 +287,9 @@ int PEM_X509_INFO_write_bio(BIO *bp, const X509_INFO *xi, EVP_CIPHER *enc,
             /* Add DSA/DH */
             /* normal optionally encrypted stuff */
             if (PEM_write_bio_RSAPrivateKey(bp,
-                                            EVP_PKEY_get0_RSA(xi->x_pkey->dec_pkey),
-                                            enc, kstr, klen, cb, u) <= 0)
+                    EVP_PKEY_get0_RSA(xi->x_pkey->dec_pkey),
+                    enc, kstr, klen, cb, u)
+                <= 0)
                 goto err;
         }
     }
@@ -305,7 +306,7 @@ int PEM_X509_INFO_write_bio(BIO *bp, const X509_INFO *xi, EVP_CIPHER *enc,
 
     ret = 1;
 
- err:
+err:
     OPENSSL_cleanse(buf, PEM_BUFSIZE);
     return ret;
 }
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 4f0a0049a4844..c42ce0e6a7bca 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -25,7 +25,7 @@
 #include <openssl/des.h>
 #include <openssl/engine.h>
 
-#define MIN_LENGTH      4
+#define MIN_LENGTH 4
 
 static int load_iv(char **fromp, unsigned char *to, int num);
 static int check_pem(const char *nm, const char *name);
@@ -107,7 +107,7 @@ void PEM_dek_info(char *buf, const char *type, int len, const char *str)
 
 #ifndef OPENSSL_NO_STDIO
 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)
 {
     BIO *b;
     void *ret;
@@ -218,10 +218,10 @@ static int check_pem(const char *nm, const char *name)
     return 0;
 }
 
-#define PEM_FREE(p, flags, num)                                 \
+#define PEM_FREE(p, flags, num) \
     pem_free((p), (flags), (num), OPENSSL_FILE, OPENSSL_LINE)
 static void pem_free(void *p, unsigned int flags, size_t num,
-                     const char *file, int line)
+    const char *file, int line)
 {
     if (flags & PEM_FLAG_SECURE)
         CRYPTO_secure_clear_free(p, num, file, line);
@@ -229,20 +229,19 @@ static void pem_free(void *p, unsigned int flags, size_t num,
         CRYPTO_free(p, file, line);
 }
 
-#define PEM_MALLOC(num, flags)                                  \
+#define PEM_MALLOC(num, flags) \
     pem_malloc((num), (flags), OPENSSL_FILE, OPENSSL_LINE)
 static void *pem_malloc(int num, unsigned int flags,
-                        const char *file, int line)
+    const char *file, int line)
 {
     return (flags & PEM_FLAG_SECURE) ? CRYPTO_secure_malloc(num, file, line)
                                      : CRYPTO_malloc(num, file, line);
-
 }
 
 static int pem_bytes_read_bio_flags(unsigned char **pdata, long *plen,
-                                    char **pnm, const char *name, BIO *bp,
-                                    pem_password_cb *cb, void *u,
-                                    unsigned int flags)
+    char **pnm, const char *name, BIO *bp,
+    pem_password_cb *cb, void *u,
+    unsigned int flags)
 {
     EVP_CIPHER_INFO cipher;
     char *nm = NULL, *header = NULL;
@@ -273,7 +272,7 @@ static int pem_bytes_read_bio_flags(unsigned char **pdata, long *plen,
 
     ret = 1;
 
- err:
+err:
     if (!ret || pnm == NULL)
         PEM_FREE(nm, flags, 0);
     PEM_FREE(header, flags, 0);
@@ -283,24 +282,26 @@ static int pem_bytes_read_bio_flags(unsigned char **pdata, long *plen,
 }
 
 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)
+{
     return pem_bytes_read_bio_flags(pdata, plen, pnm, name, bp, cb, u,
-                                    PEM_FLAG_EAY_COMPATIBLE);
+        PEM_FLAG_EAY_COMPATIBLE);
 }
 
 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)
+{
     return pem_bytes_read_bio_flags(pdata, plen, pnm, name, bp, cb, u,
-                                    PEM_FLAG_SECURE | PEM_FLAG_EAY_COMPATIBLE);
+        PEM_FLAG_SECURE | PEM_FLAG_EAY_COMPATIBLE);
 }
 
 #ifndef OPENSSL_NO_STDIO
 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)
 {
     BIO *b;
     int ret;
@@ -333,13 +334,13 @@ PEM_ASN1_write_bio_internal(
     if (enc != NULL) {
         objstr = EVP_CIPHER_get0_name(enc);
         if (objstr == NULL || EVP_CIPHER_get_iv_length(enc) == 0
-                || EVP_CIPHER_get_iv_length(enc) > (int)sizeof(iv)
-                   /*
-                    * Check "Proc-Type: 4,Encrypted\nDEK-Info: objstr,hex-iv\n"
-                    * fits into buf
-                    */
-                || strlen(objstr) + 23 + 2 * EVP_CIPHER_get_iv_length(enc) + 13
-                   > sizeof(buf)) {
+            || EVP_CIPHER_get_iv_length(enc) > (int)sizeof(iv)
+            /*
+             * Check "Proc-Type: 4,Encrypted\nDEK-Info: objstr,hex-iv\n"
+             * fits into buf
+             */
+            || strlen(objstr) + 23 + 2 * EVP_CIPHER_get_iv_length(enc) + 13
+                > sizeof(buf)) {
             ERR_raise(ERR_LIB_PEM, PEM_R_UNSUPPORTED_CIPHER);
             goto err;
         }
@@ -368,7 +369,7 @@ PEM_ASN1_write_bio_internal(
             if (callback == NULL)
                 klen = PEM_def_callback(buf, PEM_BUFSIZE, 1, u);
             else
-                klen = (*callback) (buf, PEM_BUFSIZE, 1, u);
+                klen = (*callback)(buf, PEM_BUFSIZE, 1, u);
             if (klen <= 0) {
                 ERR_raise(ERR_LIB_PEM, PEM_R_READ_KEY);
                 goto err;
@@ -413,7 +414,7 @@ PEM_ASN1_write_bio_internal(
     i = PEM_write_bio(bp, name, buf, data, i);
     if (i <= 0)
         ret = 0;
- err:
+err:
     OPENSSL_cleanse(key, sizeof(key));
     OPENSSL_cleanse(iv, sizeof(iv));
     EVP_CIPHER_CTX_free(ctx);
@@ -422,31 +423,30 @@ PEM_ASN1_write_bio_internal(
     return ret;
 }
 
-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 *callback, 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 *callback, void *u)
 {
     return PEM_ASN1_write_bio_internal(i2d, NULL, NULL, name, bp, x, enc,
-                                       kstr, klen, callback, u);
+        kstr, klen, callback, 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 *callback, void *u)
+    const char *name, BIO *bp, const void *x,
+    const EVP_CIPHER *enc, const unsigned char *kstr,
+    int klen, pem_password_cb *callback, void *u)
 {
     return PEM_ASN1_write_bio_internal(NULL, i2d, vctx, name, bp, x, enc,
-                                       kstr, klen, callback, u);
+        kstr, klen, callback, u);
 }
 
 int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
-                  pem_password_cb *callback, void *u)
+    pem_password_cb *callback, void *u)
 {
     int ok;
     int keylen;
     long len = *plen;
-    int ilen = (int) len;       /* EVP_DecryptUpdate etc. take int lengths */
+    int ilen = (int)len; /* EVP_DecryptUpdate etc. take int lengths */
     EVP_CIPHER_CTX *ctx;
     unsigned char key[EVP_MAX_KEY_LENGTH];
     char buf[PEM_BUFSIZE];
@@ -475,7 +475,7 @@ int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
 #endif
 
     if (!EVP_BytesToKey(cipher->cipher, EVP_md5(), &(cipher->iv[0]),
-                        (unsigned char *)buf, keylen, 1, key, NULL))
+            (unsigned char *)buf, keylen, 1, key, NULL))
         return 0;
 
     ctx = EVP_CIPHER_CTX_new();
@@ -538,8 +538,7 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
     header += strspn(header, " \t");
 
     /* We expect "ENCRYPTED" followed by optional white-space + line break */
-    if (!CHECK_AND_SKIP_PREFIX(header, ENCRYPTED) ||
-        strspn(header, " \t\r\n") == 0) {
+    if (!CHECK_AND_SKIP_PREFIX(header, ENCRYPTED) || strspn(header, " \t\r\n") == 0) {
         ERR_raise(ERR_LIB_PEM, PEM_R_NOT_ENCRYPTED);
         return 0;
     }
@@ -615,7 +614,7 @@ static int load_iv(char **fromp, unsigned char *to, int num)
 
 #ifndef OPENSSL_NO_STDIO
 int PEM_write(FILE *fp, const char *name, const char *header,
-              const unsigned char *data, long len)
+    const unsigned char *data, long len)
 {
     BIO *b;
     int ret;
@@ -632,7 +631,7 @@ int PEM_write(FILE *fp, const char *name, const char *header,
 #endif
 
 int PEM_write_bio(BIO *bp, const char *name, const char *header,
-                  const unsigned char *data, long len)
+    const unsigned char *data, long len)
 {
     int nlen, n, i, j, outl;
     unsigned char *buf = NULL;
@@ -648,9 +647,7 @@ int PEM_write_bio(BIO *bp, const char *name, const char *header,
     EVP_EncodeInit(ctx);
     nlen = strlen(name);
 
-    if ((BIO_write(bp, "-----BEGIN ", 11) != 11) ||
-        (BIO_write(bp, name, nlen) != nlen) ||
-        (BIO_write(bp, "-----\n", 6) != 6)) {
+    if ((BIO_write(bp, "-----BEGIN ", 11) != 11) || (BIO_write(bp, name, nlen) != nlen) || (BIO_write(bp, "-----\n", 6) != 6)) {
         reason = ERR_R_BIO_LIB;
         goto err;
     }
@@ -687,15 +684,13 @@ int PEM_write_bio(BIO *bp, const char *name, const char *header,
         reason = ERR_R_BIO_LIB;
         goto err;
     }
-    if ((BIO_write(bp, "-----END ", 9) != 9) ||
-        (BIO_write(bp, name, nlen) != nlen) ||
-        (BIO_write(bp, "-----\n", 6) != 6)) {
+    if ((BIO_write(bp, "-----END ", 9) != 9) || (BIO_write(bp, name, nlen) != nlen) || (BIO_write(bp, "-----\n", 6) != 6)) {
         reason = ERR_R_BIO_LIB;
         goto err;
     }
     retval = i + outl;
 
- err:
+err:
     if (retval == 0 && reason != 0)
         ERR_raise(ERR_LIB_PEM, reason);
     EVP_ENCODE_CTX_free(ctx);
@@ -705,7 +700,7 @@ int PEM_write_bio(BIO *bp, const char *name, const char *header,
 
 #ifndef OPENSSL_NO_STDIO
 int PEM_read(FILE *fp, char **name, char **header, unsigned char **data,
-             long *len)
+    long *len)
 {
     BIO *b;
     int ret;
@@ -728,7 +723,7 @@ static int sanitize_line(char *linebuf, int len, unsigned int flags, int first_c
     if (first_call) {
         /* Other BOMs imply unsupported multibyte encoding,
          * so don't strip them and let the error raise */
-        const unsigned char utf8_bom[3] = {0xEF, 0xBB, 0xBF};
+        const unsigned char utf8_bom[3] = { 0xEF, 0xBB, 0xBF };
 
         if (len > 3 && memcmp(linebuf, utf8_bom, 3) == 0) {
             memmove(linebuf, linebuf + 3, len - 3);
@@ -804,8 +799,8 @@ static int get_name(BIO *bp, char **name, unsigned int flags)
 
         /* Allow leading empty or non-matching lines. */
     } while (!HAS_PREFIX(linebuf, BEGINSTR)
-             || len < TAILLEN
-             || !HAS_PREFIX(linebuf + len - TAILLEN, TAILSTR));
+        || len < TAILLEN
+        || !HAS_PREFIX(linebuf + len - TAILLEN, TAILSTR));
     linebuf[len - TAILLEN] = '\0';
     len = len - BEGINLEN - TAILLEN + 1;
     *name = PEM_MALLOC(len, flags);
@@ -838,7 +833,7 @@ enum header_status {
  * We need the name of the PEM-encoded type to verify the end string.
  */
 static int get_header_and_data(BIO *bp, BIO **header, BIO **data, char *name,
-                               unsigned int flags)
+    unsigned int flags)
 {
     BIO *tmp = *header;
     char *linebuf, *p;
@@ -854,7 +849,7 @@ static int get_header_and_data(BIO *bp, BIO **header, BIO **data, char *name,
     if (linebuf == NULL)
         return 0;
 
-    while(1) {
+    while (1) {
         flags_mask = ~0u;
         len = BIO_gets(bp, linebuf, LINESIZE);
         if (len <= 0) {
@@ -868,7 +863,7 @@ static int get_header_and_data(BIO *bp, BIO **header, BIO **data, char *name,
          * appear due to reading a line up until the char before the newline.
          */
         prev_partial_line_read = partial_line_read;
-        partial_line_read = len == LINESIZE-1 && linebuf[LINESIZE-2] != '\n';
+        partial_line_read = len == LINESIZE - 1 && linebuf[LINESIZE - 2] != '\n';
 
         if (got_header == MAYBE_HEADER) {
             if (memchr(linebuf, ':', len) != NULL)
@@ -900,8 +895,7 @@ static int get_header_and_data(BIO *bp, BIO **header, BIO **data, char *name,
         p = linebuf;
         if (CHECK_AND_SKIP_PREFIX(p, ENDSTR)) {
             namelen = strlen(name);
-            if (strncmp(p, name, namelen) != 0 ||
-                !HAS_PREFIX(p + namelen, TAILSTR)) {
+            if (strncmp(p, name, namelen) != 0 || !HAS_PREFIX(p + namelen, TAILSTR)) {
                 ERR_raise(ERR_LIB_PEM, PEM_R_BAD_END_LINE);
                 goto err;
             }
@@ -946,7 +940,7 @@ static int get_header_and_data(BIO *bp, BIO **header, BIO **data, char *name,
  * for line endings).  Other characters are malformed input and will be rejected.
  */
 int PEM_read_bio_ex(BIO *bp, char **name_out, char **header,
-                    unsigned char **data, long *len_out, unsigned int flags)
+    unsigned char **data, long *len_out, unsigned int flags)
 {
     EVP_ENCODE_CTX *ctx = NULL;
     const BIO_METHOD *bmeth;
@@ -991,10 +985,12 @@ int PEM_read_bio_ex(BIO *bp, char **name_out, char **header,
     }
 
     EVP_DecodeInit(ctx);
-    if (EVP_DecodeUpdate(ctx, (unsigned char*)buf_mem->data, &len,
-                         (unsigned char*)buf_mem->data, len) < 0
-            || EVP_DecodeFinal(ctx, (unsigned char*)&(buf_mem->data[len]),
-                               &taillen) < 0) {
+    if (EVP_DecodeUpdate(ctx, (unsigned char *)buf_mem->data, &len,
+            (unsigned char *)buf_mem->data, len)
+            < 0
+        || EVP_DecodeFinal(ctx, (unsigned char *)&(buf_mem->data[len]),
+               &taillen)
+            < 0) {
         ERR_raise(ERR_LIB_PEM, PEM_R_BAD_BASE64_DECODE);
         goto end;
     }
@@ -1031,7 +1027,7 @@ int PEM_read_bio_ex(BIO *bp, char **name_out, char **header,
 }
 
 int PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data,
-                 long *len)
+    long *len)
 {
     return PEM_read_bio_ex(bp, name, header, data, len, PEM_FLAG_EAY_COMPATIBLE);
 }
diff --git a/crypto/pem/pem_local.h b/crypto/pem/pem_local.h
index 5cc1c76fdbf7e..0795f82afc3e1 100644
--- a/crypto/pem/pem_local.h
+++ b/crypto/pem/pem_local.h
@@ -23,34 +23,33 @@
  * decoding operation can return an object that contains what libcrypto
  * expects.
  */
-# define PEM_SELECTION_PUBKEY           EVP_PKEY_PUBLIC_KEY
-# define PEM_SELECTION_PrivateKey       EVP_PKEY_KEYPAIR
-# define PEM_SELECTION_Parameters       EVP_PKEY_KEY_PARAMETERS
+#define PEM_SELECTION_PUBKEY EVP_PKEY_PUBLIC_KEY
+#define PEM_SELECTION_PrivateKey EVP_PKEY_KEYPAIR
+#define PEM_SELECTION_Parameters EVP_PKEY_KEY_PARAMETERS
 
 /*
  * Properties, named according to the ASN.1 names used throughout libcrypto.
  */
-# define PEM_STRUCTURE_PUBKEY "SubjectPublicKeyInfo"
-# define PEM_STRUCTURE_PrivateKey "PrivateKeyInfo"
-# define PEM_STRUCTURE_Parameters "type-specific"
+#define PEM_STRUCTURE_PUBKEY "SubjectPublicKeyInfo"
+#define PEM_STRUCTURE_PrivateKey "PrivateKeyInfo"
+#define PEM_STRUCTURE_Parameters "type-specific"
 
-# define PEM_STRUCTURE_RSAPrivateKey "type-specific"
-# define PEM_STRUCTURE_RSAPublicKey "type-specific"
+#define PEM_STRUCTURE_RSAPrivateKey "type-specific"
+#define PEM_STRUCTURE_RSAPublicKey "type-specific"
 
 /* Alternative IMPLEMENT macros for provided encoders */
 
-# define IMPLEMENT_PEM_provided_write_body_vars(type, asn1, pq)         \
-    int ret = 0;                                                        \
-    OSSL_ENCODER_CTX *ctx =                                             \
-        OSSL_ENCODER_CTX_new_for_##type(x, PEM_SELECTION_##asn1,        \
-                                       "PEM", PEM_STRUCTURE_##asn1,     \
-                                       (pq));                           \
-                                                                        \
-    if (OSSL_ENCODER_CTX_get_num_encoders(ctx) == 0) {                  \
-        OSSL_ENCODER_CTX_free(ctx);                                     \
-        goto legacy;                                                    \
+#define IMPLEMENT_PEM_provided_write_body_vars(type, asn1, pq)                       \
+    int ret = 0;                                                                     \
+    OSSL_ENCODER_CTX *ctx = OSSL_ENCODER_CTX_new_for_##type(x, PEM_SELECTION_##asn1, \
+        "PEM", PEM_STRUCTURE_##asn1,                                                 \
+        (pq));                                                                       \
+                                                                                     \
+    if (OSSL_ENCODER_CTX_get_num_encoders(ctx) == 0) {                               \
+        OSSL_ENCODER_CTX_free(ctx);                                                  \
+        goto legacy;                                                                 \
     }
-# define IMPLEMENT_PEM_provided_write_body_pass()                       \
+#define IMPLEMENT_PEM_provided_write_body_pass()                        \
     ret = 1;                                                            \
     if (kstr == NULL && cb == NULL) {                                   \
         if (u != NULL) {                                                \
@@ -63,14 +62,14 @@
     if (enc != NULL) {                                                  \
         ret = 0;                                                        \
         if (OSSL_ENCODER_CTX_set_cipher(ctx, EVP_CIPHER_get0_name(enc), \
-                                        NULL)) {                        \
+                NULL)) {                                                \
             ret = 1;                                                    \
             if (kstr != NULL                                            \
                 && !OSSL_ENCODER_CTX_set_passphrase(ctx, kstr, klen))   \
                 ret = 0;                                                \
             else if (cb != NULL                                         \
-                     && !OSSL_ENCODER_CTX_set_pem_password_cb(ctx,      \
-                                                              cb, u))   \
+                && !OSSL_ENCODER_CTX_set_pem_password_cb(ctx,           \
+                    cb, u))                                             \
                 ret = 0;                                                \
         }                                                               \
     }                                                                   \
@@ -78,48 +77,47 @@
         OSSL_ENCODER_CTX_free(ctx);                                     \
         return 0;                                                       \
     }
-# define IMPLEMENT_PEM_provided_write_body_main(type, outtype)          \
-    ret = OSSL_ENCODER_to_##outtype(ctx, out);                          \
-    OSSL_ENCODER_CTX_free(ctx);                                         \
+#define IMPLEMENT_PEM_provided_write_body_main(type, outtype) \
+    ret = OSSL_ENCODER_to_##outtype(ctx, out);                \
+    OSSL_ENCODER_CTX_free(ctx);                               \
     return ret
-# define IMPLEMENT_PEM_provided_write_body_fallback(str, asn1,          \
-                                                    writename)          \
-    legacy:                                                             \
-    return PEM_ASN1_##writename((i2d_of_void *)i2d_##asn1, str, out,    \
-                                x, NULL, NULL, 0, NULL, NULL)
-# define IMPLEMENT_PEM_provided_write_body_fallback_cb(str, asn1,       \
-                                                       writename)       \
-    legacy:                                                             \
-    return PEM_ASN1_##writename##((i2d_of_void *)i2d_##asn1, str, out,  \
-                                  x, enc, kstr, klen, cb, u)
-
-# define IMPLEMENT_PEM_provided_write_to(name, TYPE, type, str, asn1,   \
-                                         OUTTYPE, outtype, writename)   \
-    PEM_write_fnsig(name, TYPE, OUTTYPE, writename)                     \
-    {                                                                   \
-        IMPLEMENT_PEM_provided_write_body_vars(type, asn1, NULL);       \
-        IMPLEMENT_PEM_provided_write_body_main(type, outtype);          \
-        IMPLEMENT_PEM_provided_write_body_fallback(str, asn1,           \
-                                                   writename);          \
-    }                                                                   \
-    PEM_write_ex_fnsig(name, TYPE, OUTTYPE, writename)                  \
-    {                                                                   \
-        IMPLEMENT_PEM_provided_write_body_vars(type, asn1, propq);      \
-        IMPLEMENT_PEM_provided_write_body_main(type, outtype);          \
-        IMPLEMENT_PEM_provided_write_body_fallback(str, asn1,           \
-                                                   writename);          \
+#define IMPLEMENT_PEM_provided_write_body_fallback(str, asn1,        \
+    writename)                                                       \
+    legacy:                                                          \
+    return PEM_ASN1_##writename((i2d_of_void *)i2d_##asn1, str, out, \
+        x, NULL, NULL, 0, NULL, NULL)
+#define IMPLEMENT_PEM_provided_write_body_fallback_cb(str, asn1,       \
+    writename)                                                         \
+    legacy:                                                            \
+    return PEM_ASN1_##writename##((i2d_of_void *)i2d_##asn1, str, out, \
+        x, enc, kstr, klen, cb, u)
+
+#define IMPLEMENT_PEM_provided_write_to(name, TYPE, type, str, asn1, \
+    OUTTYPE, outtype, writename)                                     \
+    PEM_write_fnsig(name, TYPE, OUTTYPE, writename)                  \
+    {                                                                \
+        IMPLEMENT_PEM_provided_write_body_vars(type, asn1, NULL);    \
+        IMPLEMENT_PEM_provided_write_body_main(type, outtype);       \
+        IMPLEMENT_PEM_provided_write_body_fallback(str, asn1,        \
+            writename);                                              \
+    }                                                                \
+    PEM_write_ex_fnsig(name, TYPE, OUTTYPE, writename)               \
+    {                                                                \
+        IMPLEMENT_PEM_provided_write_body_vars(type, asn1, propq);   \
+        IMPLEMENT_PEM_provided_write_body_main(type, outtype);       \
+        IMPLEMENT_PEM_provided_write_body_fallback(str, asn1,        \
+            writename);                                              \
     }
 
-
-# define IMPLEMENT_PEM_provided_write_cb_to(name, TYPE, type, str, asn1, \
-                                            OUTTYPE, outtype, writename) \
+#define IMPLEMENT_PEM_provided_write_cb_to(name, TYPE, type, str, asn1, \
+    OUTTYPE, outtype, writename)                                        \
     PEM_write_cb_fnsig(name, TYPE, OUTTYPE, writename)                  \
     {                                                                   \
         IMPLEMENT_PEM_provided_write_body_vars(type, asn1, NULL);       \
         IMPLEMENT_PEM_provided_write_body_pass();                       \
         IMPLEMENT_PEM_provided_write_body_main(type, outtype);          \
         IMPLEMENT_PEM_provided_write_body_fallback_cb(str, asn1,        \
-                                                      writename);       \
+            writename);                                                 \
     }                                                                   \
     PEM_write_ex_cb_fnsig(name, TYPE, OUTTYPE, writename)               \
     {                                                                   \
@@ -127,41 +125,40 @@
         IMPLEMENT_PEM_provided_write_body_pass();                       \
         IMPLEMENT_PEM_provided_write_body_main(type, outtype);          \
         IMPLEMENT_PEM_provided_write_body_fallback(str, asn1,           \
-                                                   writename);          \
+            writename);                                                 \
     }
 
-# ifdef OPENSSL_NO_STDIO
+#ifdef OPENSSL_NO_STDIO
 
-#  define IMPLEMENT_PEM_provided_write_fp(name, TYPE, type, str, asn1)
-#  define IMPLEMENT_PEM_provided_write_cb_fp(name, TYPE, type, str, asn1)
+#define IMPLEMENT_PEM_provided_write_fp(name, TYPE, type, str, asn1)
+#define IMPLEMENT_PEM_provided_write_cb_fp(name, TYPE, type, str, asn1)
 
-# else
+#else
 
-#  define IMPLEMENT_PEM_provided_write_fp(name, TYPE, type, str, asn1)    \
+#define IMPLEMENT_PEM_provided_write_fp(name, TYPE, type, str, asn1) \
     IMPLEMENT_PEM_provided_write_to(name, TYPE, type, str, asn1, FILE, fp, write)
-#  define IMPLEMENT_PEM_provided_write_cb_fp(name, TYPE, type, str, asn1) \
+#define IMPLEMENT_PEM_provided_write_cb_fp(name, TYPE, type, str, asn1) \
     IMPLEMENT_PEM_provided_write_cb_to(name, TYPE, type, str, asn1, FILE, fp, write)
 
-# endif
+#endif
 
-# define IMPLEMENT_PEM_provided_write_bio(name, TYPE, type, str, asn1)    \
+#define IMPLEMENT_PEM_provided_write_bio(name, TYPE, type, str, asn1) \
     IMPLEMENT_PEM_provided_write_to(name, TYPE, type, str, asn1, BIO, bio, write_bio)
-# define IMPLEMENT_PEM_provided_write_cb_bio(name, TYPE, type, str, asn1) \
+#define IMPLEMENT_PEM_provided_write_cb_bio(name, TYPE, type, str, asn1) \
     IMPLEMENT_PEM_provided_write_cb_to(name, TYPE, type, str, asn1, BIO, bio, write_bio)
 
-# define IMPLEMENT_PEM_provided_write(name, TYPE, type, str, asn1)        \
-    IMPLEMENT_PEM_provided_write_bio(name, TYPE, type, str, asn1)         \
+#define IMPLEMENT_PEM_provided_write(name, TYPE, type, str, asn1) \
+    IMPLEMENT_PEM_provided_write_bio(name, TYPE, type, str, asn1) \
     IMPLEMENT_PEM_provided_write_fp(name, TYPE, type, str, asn1)
 
-# define IMPLEMENT_PEM_provided_write_cb(name, TYPE, type, str, asn1)     \
-    IMPLEMENT_PEM_provided_write_cb_bio(name, TYPE, type, str, asn1)      \
+#define IMPLEMENT_PEM_provided_write_cb(name, TYPE, type, str, asn1) \
+    IMPLEMENT_PEM_provided_write_cb_bio(name, TYPE, type, str, asn1) \
     IMPLEMENT_PEM_provided_write_cb_fp(name, TYPE, type, str, asn1)
 
-# define IMPLEMENT_PEM_provided_rw(name, TYPE, type, str, asn1)           \
-    IMPLEMENT_PEM_read(name, TYPE, str, asn1)                             \
+#define IMPLEMENT_PEM_provided_rw(name, TYPE, type, str, asn1) \
+    IMPLEMENT_PEM_read(name, TYPE, str, asn1)                  \
     IMPLEMENT_PEM_provided_write(name, TYPE, type, str, asn1)
 
-# define IMPLEMENT_PEM_provided_rw_cb(name, TYPE, type, str, asn1)        \
-    IMPLEMENT_PEM_read(name, TYPE, str, asn1)                             \
+#define IMPLEMENT_PEM_provided_rw_cb(name, TYPE, type, str, asn1) \
+    IMPLEMENT_PEM_read(name, TYPE, str, asn1)                     \
     IMPLEMENT_PEM_provided_write_cb(name, TYPE, type, str, asn1)
-
diff --git a/crypto/pem/pem_oth.c b/crypto/pem/pem_oth.c
index db62246174e39..85e600a5ea380 100644
--- a/crypto/pem/pem_oth.c
+++ b/crypto/pem/pem_oth.c
@@ -18,7 +18,7 @@
 /* Handle 'other' PEMs: not private keys */
 
 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)
 {
     const unsigned char *p = NULL;
     unsigned char *data = NULL;
diff --git a/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c
index 6e84f0afd05d0..1b05d8a29cec3 100644
--- a/crypto/pem/pem_pk8.c
+++ b/crypto/pem/pem_pk8.c
@@ -19,17 +19,17 @@
 #include <openssl/encoder.h>
 
 static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder,
-                      int nid, const EVP_CIPHER *enc,
-                      const char *kstr, int klen,
-                      pem_password_cb *cb, void *u,
-                      const char *propq);
+    int nid, const EVP_CIPHER *enc,
+    const char *kstr, int klen,
+    pem_password_cb *cb, void *u,
+    const char *propq);
 
 #ifndef OPENSSL_NO_STDIO
 static int do_pk8pkey_fp(FILE *bp, const EVP_PKEY *x, int isder,
-                         int nid, const EVP_CIPHER *enc,
-                         const char *kstr, int klen,
-                         pem_password_cb *cb, void *u,
-                         const char *propq);
+    int nid, const EVP_CIPHER *enc,
+    const char *kstr, int klen,
+    pem_password_cb *cb, void *u,
+    const char *propq);
 #endif
 /*
  * These functions write a private key in PKCS#8 format: it is a "drop in"
@@ -39,42 +39,41 @@ static int do_pk8pkey_fp(FILE *bp, const EVP_PKEY *x, int isder,
  */
 
 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)
 {
     return do_pk8pkey(bp, x, 0, nid, NULL, kstr, klen, cb, u, NULL);
 }
 
 int PEM_write_bio_PKCS8PrivateKey(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)
 {
     return do_pk8pkey(bp, x, 0, -1, enc, kstr, klen, cb, u, NULL);
 }
 
 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)
 {
     return do_pk8pkey(bp, x, 1, -1, enc, kstr, klen, cb, u, NULL);
 }
 
 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)
 {
     return do_pk8pkey(bp, x, 1, nid, NULL, kstr, klen, cb, u, NULL);
 }
 
 static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
-                      const EVP_CIPHER *enc, const char *kstr, int klen,
-                      pem_password_cb *cb, void *u, const char *propq)
+    const EVP_CIPHER *enc, const char *kstr, int klen,
+    pem_password_cb *cb, void *u, const char *propq)
 {
     int ret = 0;
     const char *outtype = isder ? "DER" : "PEM";
-    OSSL_ENCODER_CTX *ctx =
-        OSSL_ENCODER_CTX_new_for_pkey(x, OSSL_KEYMGMT_SELECT_ALL,
-                                      outtype, "PrivateKeyInfo", propq);
+    OSSL_ENCODER_CTX *ctx = OSSL_ENCODER_CTX_new_for_pkey(x, OSSL_KEYMGMT_SELECT_ALL,
+        outtype, "PrivateKeyInfo", propq);
 
     if (ctx == NULL)
         return 0;
@@ -104,7 +103,7 @@ static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
         if (enc != NULL) {
             ret = 0;
             if (OSSL_ENCODER_CTX_set_cipher(ctx, EVP_CIPHER_get0_name(enc),
-                                            NULL)) {
+                    NULL)) {
                 const unsigned char *ukstr = (const unsigned char *)kstr;
 
                 /*
@@ -118,7 +117,7 @@ static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
                     && !OSSL_ENCODER_CTX_set_passphrase(ctx, ukstr, klen))
                     ret = 0;
                 else if (cb != NULL
-                         && !OSSL_ENCODER_CTX_set_pem_password_cb(ctx, cb, u))
+                    && !OSSL_ENCODER_CTX_set_pem_password_cb(ctx, cb, u))
                     ret = 0;
             }
         }
@@ -159,7 +158,7 @@ static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
             else
                 ret = PEM_write_bio_PKCS8_PRIV_KEY_INFO(bp, p8inf);
         }
-     legacy_end:
+    legacy_end:
         PKCS8_PRIV_KEY_INFO_free(p8inf);
     }
     OSSL_ENCODER_CTX_free(ctx);
@@ -167,7 +166,7 @@ static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
 }
 
 EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
-                                  void *u)
+    void *u)
 {
     PKCS8_PRIV_KEY_INFO *p8inf = NULL;
     X509_SIG *p8 = NULL;
@@ -206,36 +205,36 @@ EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
 #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)
 {
     return do_pk8pkey_fp(fp, x, 1, -1, enc, kstr, klen, cb, u, NULL);
 }
 
 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)
 {
     return do_pk8pkey_fp(fp, x, 1, nid, NULL, kstr, klen, cb, u, NULL);
 }
 
 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)
 {
     return do_pk8pkey_fp(fp, x, 0, nid, NULL, kstr, klen, cb, u, NULL);
 }
 
 int PEM_write_PKCS8PrivateKey(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)
 {
     return do_pk8pkey_fp(fp, x, 0, -1, enc, kstr, klen, cb, u, NULL);
 }
 
 static int do_pk8pkey_fp(FILE *fp, const EVP_PKEY *x, int isder, int nid,
-                         const EVP_CIPHER *enc, const char *kstr, int klen,
-                         pem_password_cb *cb, void *u, const char *propq)
+    const EVP_CIPHER *enc, const char *kstr, int klen,
+    pem_password_cb *cb, void *u, const char *propq)
 {
     BIO *bp;
     int ret;
@@ -250,7 +249,7 @@ static int do_pk8pkey_fp(FILE *fp, const EVP_PKEY *x, int isder, int nid,
 }
 
 EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
-                                 void *u)
+    void *u)
 {
     BIO *bp;
     EVP_PKEY *ret;
@@ -268,6 +267,5 @@ EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
 
 IMPLEMENT_PEM_rw(PKCS8, X509_SIG, PEM_STRING_PKCS8, X509_SIG)
 
-
 IMPLEMENT_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF,
-                 PKCS8_PRIV_KEY_INFO)
+    PKCS8_PRIV_KEY_INFO)
diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
index b640d3a7ae272..e68df7f5f6edb 100644
--- a/crypto/pem/pem_pkey.c
+++ b/crypto/pem/pem_pkey.c
@@ -31,10 +31,10 @@
 int ossl_pem_check_suffix(const char *pem_str, const char *suffix);
 
 static EVP_PKEY *pem_read_bio_key_decoder(BIO *bp, EVP_PKEY **x,
-                                          pem_password_cb *cb, void *u,
-                                          OSSL_LIB_CTX *libctx,
-                                          const char *propq,
-                                          int selection)
+    pem_password_cb *cb, void *u,
+    OSSL_LIB_CTX *libctx,
+    const char *propq,
+    int selection)
 {
     EVP_PKEY *pkey = NULL;
     OSSL_DECODER_CTX *dctx = NULL;
@@ -45,7 +45,7 @@ static EVP_PKEY *pem_read_bio_key_decoder(BIO *bp, EVP_PKEY **x,
         return NULL;
 
     dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "PEM", NULL, NULL,
-                                         selection, libctx, propq);
+        selection, libctx, propq);
 
     if (dctx == NULL)
         return NULL;
@@ -91,16 +91,16 @@ static EVP_PKEY *pem_read_bio_key_decoder(BIO *bp, EVP_PKEY **x,
         *x = pkey;
     }
 
- err:
+err:
     OSSL_DECODER_CTX_free(dctx);
     return pkey;
 }
 
 static EVP_PKEY *pem_read_bio_key_legacy(BIO *bp, EVP_PKEY **x,
-                                         pem_password_cb *cb, void *u,
-                                         OSSL_LIB_CTX *libctx,
-                                         const char *propq,
-                                         int selection)
+    pem_password_cb *cb, void *u,
+    OSSL_LIB_CTX *libctx,
+    const char *propq,
+    int selection)
 {
     char *nm = NULL;
     const unsigned char *p = NULL;
@@ -109,22 +109,22 @@ static EVP_PKEY *pem_read_bio_key_legacy(BIO *bp, EVP_PKEY **x,
     int slen;
     EVP_PKEY *ret = NULL;
 
-    ERR_set_mark();  /* not interested in PEM read errors */
+    ERR_set_mark(); /* not interested in PEM read errors */
     if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
         if (!PEM_bytes_read_bio_secmem(&data, &len, &nm,
-                                       PEM_STRING_EVP_PKEY,
-                                       bp, cb, u)) {
+                PEM_STRING_EVP_PKEY,
+                bp, cb, u)) {
             ERR_pop_to_mark();
             return NULL;
-         }
+        }
     } else {
         const char *pem_string = PEM_STRING_PARAMETERS;
 
         if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0)
             pem_string = PEM_STRING_PUBLIC;
         if (!PEM_bytes_read_bio(&data, &len, &nm,
-                                pem_string,
-                                bp, cb, u)) {
+                pem_string,
+                bp, cb, u)) {
             ERR_pop_to_mark();
             return NULL;
         }
@@ -177,13 +177,13 @@ static EVP_PKEY *pem_read_bio_key_legacy(BIO *bp, EVP_PKEY **x,
         if (ameth == NULL || ameth->old_priv_decode == NULL)
             goto p8err;
         ret = ossl_d2i_PrivateKey_legacy(ameth->pkey_id, x, &p, len, libctx,
-                                         propq);
+            propq);
     } else if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) == 0
-               && (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
+        && (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
         /* Trying legacy PUBKEY decoding only if we do not want private key. */
         ret = ossl_d2i_PUBKEY_legacy(x, &p, len);
     } else if ((selection & EVP_PKEY_KEYPAIR) == 0
-               && (slen = ossl_pem_check_suffix(nm, "PARAMETERS")) > 0) {
+        && (slen = ossl_pem_check_suffix(nm, "PARAMETERS")) > 0) {
         /* Trying legacy params decoding only if we do not want a key. */
         ret = EVP_PKEY_new();
         if (ret == NULL)
@@ -201,21 +201,21 @@ static EVP_PKEY *pem_read_bio_key_legacy(BIO *bp, EVP_PKEY **x,
         }
     }
 
- p8err:
+p8err:
     if (ret == NULL && ERR_peek_last_error() == 0)
         /* ensure some error is reported but do not hide the real one */
         ERR_raise(ERR_LIB_PEM, ERR_R_ASN1_LIB);
- err:
+err:
     OPENSSL_secure_free(nm);
     OPENSSL_secure_clear_free(data, len);
     return ret;
 }
 
 static EVP_PKEY *pem_read_bio_key(BIO *bp, EVP_PKEY **x,
-                                  pem_password_cb *cb, void *u,
-                                  OSSL_LIB_CTX *libctx,
-                                  const char *propq,
-                                  int selection)
+    pem_password_cb *cb, void *u,
+    OSSL_LIB_CTX *libctx,
+    const char *propq,
+    int selection)
 {
     EVP_PKEY *ret = NULL;
     BIO *new_bio = NULL;
@@ -239,18 +239,19 @@ static EVP_PKEY *pem_read_bio_key(BIO *bp, EVP_PKEY **x,
 
     ERR_set_mark();
     ret = pem_read_bio_key_decoder(bp, x, ossl_pw_pem_password, &pwdata,
-                                   libctx, propq, selection);
+        libctx, propq, selection);
     if (ret == NULL
         && (BIO_seek(bp, pos) < 0
             || (ret = pem_read_bio_key_legacy(bp, x,
-                                              ossl_pw_pem_password, &pwdata,
-                                              libctx, propq,
-                                              selection)) == NULL))
+                    ossl_pw_pem_password, &pwdata,
+                    libctx, propq,
+                    selection))
+                == NULL))
         ERR_clear_last_mark();
     else
         ERR_pop_to_mark();
 
- err:
+err:
     ossl_pw_clear_passphrase_data(&pwdata);
     if (new_bio != NULL) {
         BIO_pop(new_bio);
@@ -260,23 +261,23 @@ static EVP_PKEY *pem_read_bio_key(BIO *bp, EVP_PKEY **x,
 }
 
 EVP_PKEY *PEM_read_bio_PUBKEY_ex(BIO *bp, EVP_PKEY **x,
-                                 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)
 {
     return pem_read_bio_key(bp, x, cb, u, libctx, propq,
-                            EVP_PKEY_PUBLIC_KEY);
+        EVP_PKEY_PUBLIC_KEY);
 }
 
 EVP_PKEY *PEM_read_bio_PUBKEY(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
-                              void *u)
+    void *u)
 {
     return PEM_read_bio_PUBKEY_ex(bp, x, cb, u, NULL, NULL);
 }
 
 #ifndef OPENSSL_NO_STDIO
 EVP_PKEY *PEM_read_PUBKEY_ex(FILE *fp, EVP_PKEY **x,
-                             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)
 {
     BIO *b;
     EVP_PKEY *ret;
@@ -298,16 +299,16 @@ EVP_PKEY *PEM_read_PUBKEY(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
 #endif
 
 EVP_PKEY *PEM_read_bio_PrivateKey_ex(BIO *bp, EVP_PKEY **x,
-                                     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)
 {
     return pem_read_bio_key(bp, x, cb, u, libctx, propq,
-                            /* we also want the public key, if available */
-                            EVP_PKEY_KEYPAIR);
+        /* we also want the public key, if available */
+        EVP_PKEY_KEYPAIR);
 }
 
 EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
-                                  void *u)
+    void *u)
 {
     return PEM_read_bio_PrivateKey_ex(bp, x, cb, u, NULL, NULL);
 }
@@ -319,17 +320,17 @@ PEM_write_cb_ex_fnsig(PrivateKey, EVP_PKEY, BIO, write_bio)
     IMPLEMENT_PEM_provided_write_body_pass();
     IMPLEMENT_PEM_provided_write_body_main(pkey, bio);
 
- legacy:
+legacy:
     if (x != NULL && (x->ameth == NULL || x->ameth->priv_encode != NULL))
         return PEM_write_bio_PKCS8PrivateKey(out, x, enc,
-                                             (const char *)kstr, klen, cb, u);
+            (const char *)kstr, klen, cb, u);
     return PEM_write_bio_PrivateKey_traditional(out, x, enc, kstr, klen, cb, u);
 }
 
 PEM_write_cb_fnsig(PrivateKey, EVP_PKEY, BIO, write_bio)
 {
     return PEM_write_bio_PrivateKey_ex(out, x, enc, kstr, klen, cb, u,
-                                       NULL, NULL);
+        NULL, NULL);
 }
 
 /*
@@ -337,9 +338,9 @@ PEM_write_cb_fnsig(PrivateKey, EVP_PKEY, BIO, write_bio)
  * encoding.  Therefore, if the pkey is provided, we try to take a copy
  */
 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)
 {
     char pem_str[80];
     EVP_PKEY *copy = NULL;
@@ -360,7 +361,7 @@ int PEM_write_bio_PrivateKey_traditional(BIO *bp, const EVP_PKEY *x,
     }
     BIO_snprintf(pem_str, 80, "%s PRIVATE KEY", x->ameth->pem_str);
     ret = PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey,
-                             pem_str, bp, x, enc, kstr, klen, cb, u);
+        pem_str, bp, x, enc, kstr, klen, cb, u);
 
     EVP_PKEY_free(copy);
     return ret;
@@ -372,14 +373,14 @@ static int no_password_cb(char *buf, int num, int rwflag, void *userdata)
 }
 
 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)
 {
     /*
      * PEM_read_bio_Parameters(_ex) should never ask for a password. Any attempt
      * to get a password just fails.
      */
     return pem_read_bio_key(bp, x, no_password_cb, NULL, libctx, propq,
-                            EVP_PKEY_KEY_PARAMETERS);
+        EVP_PKEY_KEY_PARAMETERS);
 }
 
 EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x)
@@ -394,19 +395,19 @@ PEM_write_fnsig(Parameters, EVP_PKEY, BIO, write_bio)
 
     IMPLEMENT_PEM_provided_write_body_main(pkey, bio);
 
- legacy:
+legacy:
     if (!x->ameth || !x->ameth->param_encode)
         return 0;
 
     BIO_snprintf(pem_str, 80, "%s PARAMETERS", x->ameth->pem_str);
     return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode,
-                              pem_str, out, x, NULL, NULL, 0, 0, NULL);
+        pem_str, out, x, NULL, NULL, 0, 0, NULL);
 }
 
 #ifndef OPENSSL_NO_STDIO
 EVP_PKEY *PEM_read_PrivateKey_ex(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
-                                 void *u, OSSL_LIB_CTX *libctx,
-                                 const char *propq)
+    void *u, OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     BIO *b;
     EVP_PKEY *ret;
@@ -422,7 +423,7 @@ EVP_PKEY *PEM_read_PrivateKey_ex(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
 }
 
 EVP_PKEY *PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
-                              void *u)
+    void *u)
 {
     return PEM_read_PrivateKey_ex(fp, x, cb, u, NULL, NULL);
 }
@@ -437,7 +438,7 @@ PEM_write_cb_ex_fnsig(PrivateKey, EVP_PKEY, FILE, write)
         return 0;
     }
     ret = PEM_write_bio_PrivateKey_ex(b, x, enc, kstr, klen, cb, u,
-                                      libctx, propq);
+        libctx, propq);
     BIO_free(b);
     return ret;
 }
diff --git a/crypto/pem/pem_sign.c b/crypto/pem/pem_sign.c
index f6b0ff4ddadb3..161cfa0f19f0b 100644
--- a/crypto/pem/pem_sign.c
+++ b/crypto/pem/pem_sign.c
@@ -20,13 +20,13 @@ int PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type)
 }
 
 int PEM_SignUpdate(EVP_MD_CTX *ctx,
-                   const unsigned char *data, unsigned int count)
+    const unsigned char *data, unsigned int count)
 {
     return EVP_DigestUpdate(ctx, data, count);
 }
 
 int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
-                  unsigned int *siglen, EVP_PKEY *pkey)
+    unsigned int *siglen, EVP_PKEY *pkey)
 {
     unsigned char *m;
     int i, ret = 0;
@@ -42,7 +42,7 @@ int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
     i = EVP_EncodeBlock(sigret, m, m_len);
     *siglen = i;
     ret = 1;
- err:
+err:
     /* ctx has been zeroed by EVP_SignFinal() */
     OPENSSL_free(m);
     return ret;
diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c
index 3d234a507b746..9bfbb01e430aa 100644
--- a/crypto/pem/pvkfmt.c
+++ b/crypto/pem/pvkfmt.c
@@ -67,8 +67,9 @@ static int read_lebn(const unsigned char **in, unsigned int nbyte, BIGNUM **r)
  * (EVP_PKEY_RSA or EVP_PKEY_DSA), even if the resulting EVP_PKEY wasn't
  * created.
  */
-#define isdss_to_evp_type(isdss)                                \
-    (isdss == 0 ? EVP_PKEY_RSA : isdss == 1 ? EVP_PKEY_DSA : EVP_PKEY_NONE)
+#define isdss_to_evp_type(isdss)                           \
+    (isdss == 0 ? EVP_PKEY_RSA : isdss == 1 ? EVP_PKEY_DSA \
+                                            : EVP_PKEY_NONE)
 static EVP_PKEY *evp_pkey_new0_key(void *key, int evp_type)
 {
     EVP_PKEY *pkey = NULL;
@@ -124,27 +125,27 @@ static EVP_PKEY *evp_pkey_new0_key(void *key, int evp_type)
 
 /* Convert private key blob to EVP_PKEY: RSA and DSA keys supported */
 
-# define MS_PUBLICKEYBLOB        0x6
-# define MS_PRIVATEKEYBLOB       0x7
-# define MS_RSA1MAGIC            0x31415352L
-# define MS_RSA2MAGIC            0x32415352L
-# define MS_DSS1MAGIC            0x31535344L
-# define MS_DSS2MAGIC            0x32535344L
+#define MS_PUBLICKEYBLOB 0x6
+#define MS_PRIVATEKEYBLOB 0x7
+#define MS_RSA1MAGIC 0x31415352L
+#define MS_RSA2MAGIC 0x32415352L
+#define MS_DSS1MAGIC 0x31535344L
+#define MS_DSS2MAGIC 0x32535344L
 
-# define MS_KEYALG_RSA_KEYX      0xa400
-# define MS_KEYALG_DSS_SIGN      0x2200
+#define MS_KEYALG_RSA_KEYX 0xa400
+#define MS_KEYALG_DSS_SIGN 0x2200
 
-# define MS_KEYTYPE_KEYX         0x1
-# define MS_KEYTYPE_SIGN         0x2
+#define MS_KEYTYPE_KEYX 0x1
+#define MS_KEYTYPE_SIGN 0x2
 
 /* The PVK file magic number: seems to spell out "bobsfile", who is Bob? */
-# define MS_PVKMAGIC             0xb0b5f11eL
+#define MS_PVKMAGIC 0xb0b5f11eL
 /* Salt length for PVK files */
-# define PVK_SALTLEN             0x10
+#define PVK_SALTLEN 0x10
 /* Maximum length in PVK header */
-# define PVK_MAX_KEYLEN          102400
+#define PVK_MAX_KEYLEN 102400
 /* Maximum salt length */
-# define PVK_MAX_SALTLEN         10240
+#define PVK_MAX_SALTLEN 10240
 
 /*
  * Read the MSBLOB header and get relevant data from it.
@@ -161,8 +162,8 @@ static EVP_PKEY *evp_pkey_new0_key(void *key, int evp_type)
  *      header data.
  */
 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)
 {
     const unsigned char *p = *in;
 
@@ -280,11 +281,10 @@ unsigned int ossl_blob_length(unsigned bitlen, int isdss, int ispub)
              */
             return 4 + 2 * nbyte + 5 * hnbyte;
     }
-
 }
 
 static void *do_b2i_key(const unsigned char **in, unsigned int length,
-                        int *isdss, int *ispub)
+    int *isdss, int *ispub)
 {
     const unsigned char *p = *in;
     unsigned int bitlen, magic;
@@ -366,14 +366,14 @@ EVP_PKEY *ossl_b2i_bio(BIO *in, int *ispub)
     }
 
     pkey = evp_pkey_new0_key(key, isdss_to_evp_type(isdss));
- err:
+err:
     OPENSSL_free(buf);
     return pkey;
 }
 
 #ifndef OPENSSL_NO_DSA
 DSA *ossl_b2i_DSA_after_header(const unsigned char **in, unsigned int bitlen,
-                               int ispub)
+    int ispub)
 {
     const unsigned char *p = *in;
     DSA *dsa = NULL;
@@ -427,13 +427,13 @@ DSA *ossl_b2i_DSA_after_header(const unsigned char **in, unsigned int bitlen,
     *in = p;
     return dsa;
 
- dsaerr:
+dsaerr:
     ERR_raise(ERR_LIB_PEM, ERR_R_DSA_LIB);
     goto err;
- bnerr:
+bnerr:
     ERR_raise(ERR_LIB_PEM, ERR_R_BN_LIB);
 
- err:
+err:
     DSA_free(dsa);
     BN_free(pbn);
     BN_free(qbn);
@@ -446,7 +446,7 @@ DSA *ossl_b2i_DSA_after_header(const unsigned char **in, unsigned int bitlen,
 #endif
 
 RSA *ossl_b2i_RSA_after_header(const unsigned char **in, unsigned int bitlen,
-                               int ispub)
+    int ispub)
 {
     const unsigned char *pin = *in;
     BIGNUM *e = NULL, *n = NULL, *d = NULL;
@@ -492,13 +492,13 @@ RSA *ossl_b2i_RSA_after_header(const unsigned char **in, unsigned int bitlen,
     *in = pin;
     return rsa;
 
- rsaerr:
+rsaerr:
     ERR_raise(ERR_LIB_PEM, ERR_R_RSA_LIB);
     goto err;
- bnerr:
+bnerr:
     ERR_raise(ERR_LIB_PEM, ERR_R_BN_LIB);
 
- err:
+err:
     BN_free(e);
     BN_free(n);
     BN_free(p);
@@ -614,7 +614,7 @@ static int do_i2b(unsigned char **out, const EVP_PKEY *pk, int ispub)
 #endif
     if (!noinc)
         *out += outlen;
- end:
+end:
     return outlen;
 }
 
@@ -668,7 +668,7 @@ static int check_bitlen_rsa(const RSA *rsa, int ispub, unsigned int *pmagic)
             goto badkey;
     }
     return bitlen;
- badkey:
+badkey:
     ERR_raise(ERR_LIB_PEM, PEM_R_UNSUPPORTED_KEY_COMPONENTS);
     return 0;
 }
@@ -719,7 +719,7 @@ static int check_bitlen_dsa(const DSA *dsa, int ispub, unsigned int *pmagic)
     }
 
     return bitlen;
- badkey:
+badkey:
     ERR_raise(ERR_LIB_PEM, PEM_R_UNSUPPORTED_KEY_COMPONENTS);
     return 0;
 }
@@ -758,8 +758,8 @@ int i2b_PublicKey_bio(BIO *out, const EVP_PKEY *pk)
 }
 
 int ossl_do_PVK_header(const unsigned char **in, unsigned int length,
-                       int skip_magic, int *isdss,
-                       unsigned int *psaltlen, unsigned int *pkeylen)
+    int skip_magic, int *isdss,
+    unsigned int *psaltlen, unsigned int *pkeylen)
 {
     const unsigned char *p = *in;
     unsigned int pvk_magic, is_encrypted;
@@ -820,9 +820,9 @@ int ossl_do_PVK_header(const unsigned char **in, unsigned int length,
 
 #ifndef OPENSSL_NO_RC4
 static int derive_pvk_key(unsigned char *key, size_t keylen,
-                          const unsigned char *salt, unsigned int saltlen,
-                          const unsigned char *pass, int passlen,
-                          OSSL_LIB_CTX *libctx, const char *propq)
+    const unsigned char *salt, unsigned int saltlen,
+    const unsigned char *pass, int passlen,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     EVP_KDF *kdf;
     EVP_KDF_CTX *ctx;
@@ -837,12 +837,12 @@ static int derive_pvk_key(unsigned char *key, size_t keylen,
         return 0;
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                             (void *)salt, saltlen);
+        (void *)salt, saltlen);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
-                                             (void *)pass, passlen);
+        (void *)pass, passlen);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, SN_sha1, 0);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_PROPERTIES,
-                                            (char *)propq, 0);
+        (char *)propq, 0);
     *p = OSSL_PARAM_construct_end();
 
     rv = EVP_KDF_derive(ctx, key, keylen, params);
@@ -852,10 +852,10 @@ static int derive_pvk_key(unsigned char *key, size_t keylen,
 #endif
 
 static void *do_PVK_body_key(const unsigned char **in,
-                             unsigned int saltlen, unsigned int keylen,
-                             pem_password_cb *cb, void *u,
-                             int *isdss, int *ispub,
-                             OSSL_LIB_CTX *libctx, const char *propq)
+    unsigned int saltlen, unsigned int keylen,
+    pem_password_cb *cb, void *u,
+    int *isdss, int *ispub,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     const unsigned char *p = *in;
     unsigned char *enctmp = NULL;
@@ -890,7 +890,7 @@ static void *do_PVK_body_key(const unsigned char **in,
         if (enctmp == NULL)
             goto err;
         if (!derive_pvk_key(keybuf, sizeof(keybuf), p, saltlen,
-                            (unsigned char *)psbuf, inlen, libctx, propq))
+                (unsigned char *)psbuf, inlen, libctx, propq))
             goto err;
         p += saltlen;
         /* Copy BLOBHEADER across, decrypt rest */
@@ -934,7 +934,7 @@ static void *do_PVK_body_key(const unsigned char **in,
     }
 
     key = do_b2i_key(&p, keylen, isdss, ispub);
- err:
+err:
     EVP_CIPHER_CTX_free(cctx);
 #ifndef OPENSSL_NO_RC4
     EVP_CIPHER_free(rc4);
@@ -947,8 +947,8 @@ static void *do_PVK_body_key(const unsigned char **in,
 }
 
 static void *do_PVK_key_bio(BIO *in, pem_password_cb *cb, void *u,
-                            int *isdss, int *ispub,
-                            OSSL_LIB_CTX *libctx, const char *propq)
+    int *isdss, int *ispub,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     unsigned char pvk_hdr[24], *buf = NULL;
     const unsigned char *p;
@@ -975,17 +975,17 @@ static void *do_PVK_key_bio(BIO *in, pem_password_cb *cb, void *u,
     }
     key = do_PVK_body_key(&p, saltlen, keylen, cb, u, isdss, ispub, libctx, propq);
 
- err:
+err:
     OPENSSL_clear_free(buf, buflen);
     return key;
 }
 
 #ifndef OPENSSL_NO_DSA
 DSA *b2i_DSA_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 isdss = 1;
-    int ispub = 0;               /* PVK keys are always private */
+    int ispub = 0; /* PVK keys are always private */
 
     return do_PVK_key_bio(in, cb, u, &isdss, &ispub, libctx, propq);
 }
@@ -997,10 +997,10 @@ DSA *b2i_DSA_PVK_bio(BIO *in, pem_password_cb *cb, void *u)
 #endif
 
 RSA *b2i_RSA_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 isdss = 0;
-    int ispub = 0;               /* PVK keys are always private */
+    int ispub = 0; /* PVK keys are always private */
 
     return do_PVK_key_bio(in, cb, u, &isdss, &ispub, libctx, propq);
 }
@@ -1011,7 +1011,7 @@ RSA *b2i_RSA_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 isdss = -1;
     int ispub = -1;
@@ -1026,8 +1026,8 @@ EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u)
 }
 
 static int i2b_PVK(unsigned char **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)
 {
     int ret = -1;
     int outlen = 24, pklen;
@@ -1092,7 +1092,7 @@ static int i2b_PVK(unsigned char **out, const EVP_PKEY *pk, int enclevel,
             goto error;
         }
         if (!derive_pvk_key(keybuf, sizeof(keybuf), salt, PVK_SALTLEN,
-                            (unsigned char *)psbuf, inlen, libctx, propq))
+                (unsigned char *)psbuf, inlen, libctx, propq))
             goto error;
         if ((rc4 = EVP_CIPHER_fetch(libctx, "RC4", propq)) == NULL)
             goto error;
@@ -1115,7 +1115,7 @@ static int i2b_PVK(unsigned char **out, const EVP_PKEY *pk, int enclevel,
     if (*out == NULL)
         *out = start;
     ret = outlen;
- error:
+error:
     EVP_CIPHER_CTX_free(cctx);
 #ifndef OPENSSL_NO_RC4
     EVP_CIPHER_free(rc4);
@@ -1127,8 +1127,8 @@ static int i2b_PVK(unsigned char **out, const EVP_PKEY *pk, int enclevel,
 }
 
 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)
 {
     unsigned char *tmp = NULL;
     int outlen, wrlen;
@@ -1146,8 +1146,7 @@ int i2b_PVK_bio_ex(BIO *out, const EVP_PKEY *pk, int enclevel,
 }
 
 int i2b_PVK_bio(BIO *out, const EVP_PKEY *pk, int enclevel,
-                pem_password_cb *cb, void *u)
+    pem_password_cb *cb, void *u)
 {
     return i2b_PVK_bio_ex(out, pk, enclevel, cb, u, NULL, NULL);
 }
-
diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index 2cd9a219c239b..d677963c6176b 100755
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -218,6 +218,25 @@
 my $current_function;
 my %globals;
 
+{ package vex_prefix;	# pick up vex prefixes, example: {vex} vpmadd52luq m256, %ymm, %ymm
+    sub re {
+	my ($class, $line) = @_;
+	my $self = {};
+	my $ret;
+
+	if ($$line =~ /(^\{vex\})/) {
+	    bless $self,$class;
+	    $self->{value} = $1;
+	    $ret = $self;
+	    $$line = substr($$line,@+[0]); $$line =~ s/^\s+//;
+	}
+	$ret;
+	}
+    sub out {
+	my $self = shift;
+	$self->{value};
+	}
+}
 { package opcode;	# pick up opcodes
     sub re {
 	my	($class, $line) = @_;
@@ -1396,7 +1415,11 @@ sub rxb {
 
     if (my $directive=directive->re(\$line)) {
 	printf "%s",$directive->out();
-    } elsif (my $opcode=opcode->re(\$line)) {
+    } else {
+	if (my $vex_prefix=vex_prefix->re(\$line)) {
+	printf "%s",$vex_prefix->out();
+	}
+	if (my $opcode=opcode->re(\$line)) {
 	my $asm = eval("\$".$opcode->mnemonic());
 
 	if ((ref($asm) eq 'CODE') && scalar(my @bytes=&$asm($line))) {
@@ -1446,6 +1469,7 @@ sub rxb {
 	} else {
 	    printf "\t%s",$opcode->out();
 	}
+	}
     }
 
     print $line,"\n";
diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
index b2635ff1f64ca..4750974d60443 100644
--- a/crypto/pkcs12/p12_add.c
+++ b/crypto/pkcs12/p12_add.c
@@ -18,7 +18,7 @@
 /* Pack an object into an OCTET STRING and turn into a safebag */
 
 PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it,
-                                         int nid1, int nid2)
+    int nid1, int nid2)
 {
     PKCS12_BAGS *bag;
     PKCS12_SAFEBAG *safebag;
@@ -40,7 +40,7 @@ PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it,
     safebag->type = OBJ_nid2obj(nid2);
     return safebag;
 
- err:
+err:
     PKCS12_BAGS_free(bag);
     return NULL;
 }
@@ -66,7 +66,7 @@ PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk)
     }
     return p7;
 
- err:
+err:
     PKCS7_free(p7);
     return NULL;
 }
@@ -85,16 +85,16 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7)
     }
 
     return ASN1_item_unpack_ex(p7->d.data, ASN1_ITEM_rptr(PKCS12_SAFEBAGS),
-                               ossl_pkcs7_ctx_get0_libctx(&p7->ctx),
-                               ossl_pkcs7_ctx_get0_propq(&p7->ctx));
+        ossl_pkcs7_ctx_get0_libctx(&p7->ctx),
+        ossl_pkcs7_ctx_get0_propq(&p7->ctx));
 }
 
 /* Turn a stack of SAFEBAGS into a PKCS#7 encrypted data ContentInfo */
 
 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)
 {
     PKCS7 *p7;
     X509_ALGOR *pbe;
@@ -129,9 +129,8 @@ PKCS7 *PKCS12_pack_p7encdata_ex(int pbe_nid, const char *pass, int passlen,
     X509_ALGOR_free(p7->d.encrypted->enc_data->algorithm);
     p7->d.encrypted->enc_data->algorithm = pbe;
     ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data);
-    if (!(p7->d.encrypted->enc_data->enc_data =
-          PKCS12_item_i2d_encrypt_ex(pbe, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass,
-                                     passlen, bags, 1, ctx, propq))) {
+    if (!(p7->d.encrypted->enc_data->enc_data = PKCS12_item_i2d_encrypt_ex(pbe, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass,
+              passlen, bags, 1, ctx, propq))) {
         ERR_raise(ERR_LIB_PKCS12, PKCS12_R_ENCRYPT_ERROR);
         goto err;
     }
@@ -139,22 +138,22 @@ PKCS7 *PKCS12_pack_p7encdata_ex(int pbe_nid, const char *pass, int passlen,
     EVP_CIPHER_free(pbe_ciph_fetch);
     return p7;
 
- err:
+err:
     PKCS7_free(p7);
     EVP_CIPHER_free(pbe_ciph_fetch);
     return NULL;
 }
 
 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)
 {
     return PKCS12_pack_p7encdata_ex(pbe_nid, pass, passlen, salt, saltlen,
-                                    iter, bags, NULL, NULL);
+        iter, bags, NULL, NULL);
 }
 
 STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
-                                                  int passlen)
+    int passlen)
 {
     if (!PKCS7_type_is_encrypted(p7))
         return NULL;
@@ -165,21 +164,21 @@ STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
     }
 
     return PKCS12_item_decrypt_d2i_ex(p7->d.encrypted->enc_data->algorithm,
-                                   ASN1_ITEM_rptr(PKCS12_SAFEBAGS),
-                                   pass, passlen,
-                                   p7->d.encrypted->enc_data->enc_data, 1,
-                                   p7->ctx.libctx, p7->ctx.propq);
+        ASN1_ITEM_rptr(PKCS12_SAFEBAGS),
+        pass, passlen,
+        p7->d.encrypted->enc_data->enc_data, 1,
+        p7->ctx.libctx, p7->ctx.propq);
 }
 
 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)
 {
     return PKCS8_decrypt_ex(bag->value.shkeybag, pass, passlen, ctx, propq);
 }
 
 PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag,
-                                         const char *pass, int passlen)
+    const char *pass, int passlen)
 {
     return PKCS12_decrypt_skey_ex(bag, pass, passlen, NULL, NULL);
 }
@@ -187,7 +186,7 @@ PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag,
 int PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes)
 {
     if (ASN1_item_pack(safes, ASN1_ITEM_rptr(PKCS12_AUTHSAFES),
-                       &p12->authsafes->d.data))
+            &p12->authsafes->d.data))
         return 1;
     return 0;
 }
@@ -211,9 +210,9 @@ STACK_OF(PKCS7) *PKCS12_unpack_authsafes(const PKCS12 *p12)
 
     p7ctx = &p12->authsafes->ctx;
     p7s = ASN1_item_unpack_ex(p12->authsafes->d.data,
-                              ASN1_ITEM_rptr(PKCS12_AUTHSAFES),
-                              ossl_pkcs7_ctx_get0_libctx(p7ctx),
-                              ossl_pkcs7_ctx_get0_propq(p7ctx));
+        ASN1_ITEM_rptr(PKCS12_AUTHSAFES),
+        ossl_pkcs7_ctx_get0_libctx(p7ctx),
+        ossl_pkcs7_ctx_get0_propq(p7ctx));
     if (p7s != NULL) {
         for (i = 0; i < sk_PKCS7_num(p7s); i++) {
             p7 = sk_PKCS7_value(p7s, i);
diff --git a/crypto/pkcs12/p12_asn.c b/crypto/pkcs12/p12_asn.c
index e4247b27fc3a2..79fbd336067cb 100644
--- a/crypto/pkcs12/p12_asn.c
+++ b/crypto/pkcs12/p12_asn.c
@@ -17,9 +17,9 @@
 /* PKCS#12 ASN1 module */
 
 ASN1_SEQUENCE(PKCS12) = {
-        ASN1_SIMPLE(PKCS12, version, ASN1_INTEGER),
-        ASN1_SIMPLE(PKCS12, authsafes, PKCS7),
-        ASN1_OPT(PKCS12, mac, PKCS12_MAC_DATA)
+    ASN1_SIMPLE(PKCS12, version, ASN1_INTEGER),
+    ASN1_SIMPLE(PKCS12, authsafes, PKCS7),
+    ASN1_OPT(PKCS12, mac, PKCS12_MAC_DATA)
 } ASN1_SEQUENCE_END(PKCS12)
 
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(PKCS12, PKCS12, PKCS12)
@@ -39,9 +39,9 @@ void PKCS12_free(PKCS12 *p12)
 }
 
 ASN1_SEQUENCE(PKCS12_MAC_DATA) = {
-        ASN1_SIMPLE(PKCS12_MAC_DATA, dinfo, X509_SIG),
-        ASN1_SIMPLE(PKCS12_MAC_DATA, salt, ASN1_OCTET_STRING),
-        ASN1_OPT(PKCS12_MAC_DATA, iter, ASN1_INTEGER)
+    ASN1_SIMPLE(PKCS12_MAC_DATA, dinfo, X509_SIG),
+    ASN1_SIMPLE(PKCS12_MAC_DATA, salt, ASN1_OCTET_STRING),
+    ASN1_OPT(PKCS12_MAC_DATA, iter, ASN1_INTEGER)
 } ASN1_SEQUENCE_END(PKCS12_MAC_DATA)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
@@ -49,14 +49,14 @@ IMPLEMENT_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
 ASN1_ADB_TEMPLATE(bag_default) = ASN1_EXP(PKCS12_BAGS, value.other, ASN1_ANY, 0);
 
 ASN1_ADB(PKCS12_BAGS) = {
-        ADB_ENTRY(NID_x509Certificate, ASN1_EXP(PKCS12_BAGS, value.x509cert, ASN1_OCTET_STRING, 0)),
-        ADB_ENTRY(NID_x509Crl, ASN1_EXP(PKCS12_BAGS, value.x509crl, ASN1_OCTET_STRING, 0)),
-        ADB_ENTRY(NID_sdsiCertificate, ASN1_EXP(PKCS12_BAGS, value.sdsicert, ASN1_IA5STRING, 0)),
+    ADB_ENTRY(NID_x509Certificate, ASN1_EXP(PKCS12_BAGS, value.x509cert, ASN1_OCTET_STRING, 0)),
+    ADB_ENTRY(NID_x509Crl, ASN1_EXP(PKCS12_BAGS, value.x509crl, ASN1_OCTET_STRING, 0)),
+    ADB_ENTRY(NID_sdsiCertificate, ASN1_EXP(PKCS12_BAGS, value.sdsicert, ASN1_IA5STRING, 0)),
 } ASN1_ADB_END(PKCS12_BAGS, 0, type, 0, &bag_default_tt, NULL);
 
 ASN1_SEQUENCE(PKCS12_BAGS) = {
-        ASN1_SIMPLE(PKCS12_BAGS, type, ASN1_OBJECT),
-        ASN1_ADB_OBJECT(PKCS12_BAGS),
+    ASN1_SIMPLE(PKCS12_BAGS, type, ASN1_OBJECT),
+    ASN1_ADB_OBJECT(PKCS12_BAGS),
 } ASN1_SEQUENCE_END(PKCS12_BAGS)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS12_BAGS)
@@ -64,28 +64,26 @@ IMPLEMENT_ASN1_FUNCTIONS(PKCS12_BAGS)
 ASN1_ADB_TEMPLATE(safebag_default) = ASN1_EXP(PKCS12_SAFEBAG, value.other, ASN1_ANY, 0);
 
 ASN1_ADB(PKCS12_SAFEBAG) = {
-        ADB_ENTRY(NID_keyBag, ASN1_EXP(PKCS12_SAFEBAG, value.keybag, PKCS8_PRIV_KEY_INFO, 0)),
-        ADB_ENTRY(NID_pkcs8ShroudedKeyBag, ASN1_EXP(PKCS12_SAFEBAG, value.shkeybag, X509_SIG, 0)),
-        ADB_ENTRY(NID_safeContentsBag, ASN1_EXP_SEQUENCE_OF(PKCS12_SAFEBAG, value.safes, PKCS12_SAFEBAG, 0)),
-        ADB_ENTRY(NID_certBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)),
-        ADB_ENTRY(NID_crlBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)),
-        ADB_ENTRY(NID_secretBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0))
+    ADB_ENTRY(NID_keyBag, ASN1_EXP(PKCS12_SAFEBAG, value.keybag, PKCS8_PRIV_KEY_INFO, 0)),
+    ADB_ENTRY(NID_pkcs8ShroudedKeyBag, ASN1_EXP(PKCS12_SAFEBAG, value.shkeybag, X509_SIG, 0)),
+    ADB_ENTRY(NID_safeContentsBag, ASN1_EXP_SEQUENCE_OF(PKCS12_SAFEBAG, value.safes, PKCS12_SAFEBAG, 0)),
+    ADB_ENTRY(NID_certBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)),
+    ADB_ENTRY(NID_crlBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0)),
+    ADB_ENTRY(NID_secretBag, ASN1_EXP(PKCS12_SAFEBAG, value.bag, PKCS12_BAGS, 0))
 } ASN1_ADB_END(PKCS12_SAFEBAG, 0, type, 0, &safebag_default_tt, NULL);
 
 ASN1_SEQUENCE(PKCS12_SAFEBAG) = {
-        ASN1_SIMPLE(PKCS12_SAFEBAG, type, ASN1_OBJECT),
-        ASN1_ADB_OBJECT(PKCS12_SAFEBAG),
-        ASN1_SET_OF_OPT(PKCS12_SAFEBAG, attrib, X509_ATTRIBUTE)
+    ASN1_SIMPLE(PKCS12_SAFEBAG, type, ASN1_OBJECT),
+    ASN1_ADB_OBJECT(PKCS12_SAFEBAG),
+    ASN1_SET_OF_OPT(PKCS12_SAFEBAG, attrib, X509_ATTRIBUTE)
 } ASN1_SEQUENCE_END(PKCS12_SAFEBAG)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS12_SAFEBAG)
 
 /* SEQUENCE OF SafeBag */
-ASN1_ITEM_TEMPLATE(PKCS12_SAFEBAGS) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_SAFEBAGS, PKCS12_SAFEBAG)
+ASN1_ITEM_TEMPLATE(PKCS12_SAFEBAGS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_SAFEBAGS, PKCS12_SAFEBAG)
 ASN1_ITEM_TEMPLATE_END(PKCS12_SAFEBAGS)
 
 /* Authsafes: SEQUENCE OF PKCS7 */
-ASN1_ITEM_TEMPLATE(PKCS12_AUTHSAFES) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_AUTHSAFES, PKCS7)
+ASN1_ITEM_TEMPLATE(PKCS12_AUTHSAFES) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, PKCS12_AUTHSAFES, PKCS7)
 ASN1_ITEM_TEMPLATE_END(PKCS12_AUTHSAFES)
diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index ea0d027c10fcd..ec609d9b5a6cc 100644
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -15,10 +15,11 @@
 /* Add a local keyid to a safebag */
 
 int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name,
-                          int namelen)
+    int namelen)
 {
     if (X509at_add1_attr_by_NID(&bag->attrib, NID_localKeyID,
-                                V_ASN1_OCTET_STRING, name, namelen) != NULL)
+            V_ASN1_OCTET_STRING, name, namelen)
+        != NULL)
         return 1;
     else
         return 0;
@@ -30,36 +31,39 @@ int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage)
 {
     unsigned char us_val = (unsigned char)usage;
     return PKCS8_pkey_add1_attr_by_NID(p8, NID_key_usage,
-                                       V_ASN1_BIT_STRING, &us_val, 1);
+        V_ASN1_BIT_STRING, &us_val, 1);
 }
 
 /* Add a friendlyname to a safebag */
 
 int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name,
-                                int namelen)
+    int namelen)
 {
     if (X509at_add1_attr_by_NID(&bag->attrib, NID_friendlyName,
-                                MBSTRING_ASC, (unsigned char *)name, namelen) != NULL)
+            MBSTRING_ASC, (unsigned char *)name, namelen)
+        != NULL)
         return 1;
     else
         return 0;
 }
 
 int PKCS12_add_friendlyname_utf8(PKCS12_SAFEBAG *bag, const char *name,
-                                int namelen)
+    int namelen)
 {
     if (X509at_add1_attr_by_NID(&bag->attrib, NID_friendlyName,
-                                MBSTRING_UTF8, (unsigned char *)name, namelen) != NULL)
+            MBSTRING_UTF8, (unsigned char *)name, namelen)
+        != NULL)
         return 1;
     else
         return 0;
 }
 
 int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag,
-                                const unsigned char *name, int namelen)
+    const unsigned char *name, int namelen)
 {
     if (X509at_add1_attr_by_NID(&bag->attrib, NID_friendlyName,
-                                MBSTRING_BMP, name, namelen) != NULL)
+            MBSTRING_BMP, name, namelen)
+        != NULL)
         return 1;
     else
         return 0;
@@ -68,14 +72,15 @@ int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag,
 int PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name, int namelen)
 {
     if (X509at_add1_attr_by_NID(&bag->attrib, NID_ms_csp_name,
-                                MBSTRING_ASC, (unsigned char *)name, namelen) != NULL)
+            MBSTRING_ASC, (unsigned char *)name, namelen)
+        != NULL)
         return 1;
     else
         return 0;
 }
 
 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)
 {
     if (X509at_add1_attr_by_NID(&bag->attrib, nid, type, bytes, len) != NULL)
         return 1;
@@ -84,7 +89,7 @@ int PKCS12_add1_attr_by_NID(PKCS12_SAFEBAG *bag, int nid, int type,
 }
 
 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)
 {
     if (X509at_add1_attr_by_txt(&bag->attrib, attrname, type, bytes, len) != NULL)
         return 1;
@@ -93,7 +98,7 @@ int PKCS12_add1_attr_by_txt(PKCS12_SAFEBAG *bag, const char *attrname, int type,
 }
 
 ASN1_TYPE *PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs,
-                               int attr_nid)
+    int attr_nid)
 {
     int i = X509at_get_attr_by_NID(attrs, attr_nid, -1);
 
@@ -111,7 +116,7 @@ char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)
     if (atype->type != V_ASN1_BMPSTRING)
         return NULL;
     return OPENSSL_uni2utf8(atype->value.bmpstring->data,
-                            atype->value.bmpstring->length);
+        atype->value.bmpstring->length);
 }
 
 const STACK_OF(X509_ATTRIBUTE) *
@@ -123,7 +128,7 @@ PKCS12_SAFEBAG_get0_attrs(const PKCS12_SAFEBAG *bag)
 void PKCS12_SAFEBAG_set0_attrs(PKCS12_SAFEBAG *bag, STACK_OF(X509_ATTRIBUTE) *attrs)
 {
     if (bag->attrib != attrs)
-       sk_X509_ATTRIBUTE_free(bag->attrib);
+        sk_X509_ATTRIBUTE_free(bag->attrib);
 
     bag->attrib = attrs;
 }
diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c
index 57d1caecfce74..b7519f7b5858c 100644
--- a/crypto/pkcs12/p12_crpt.c
+++ b/crypto/pkcs12/p12_crpt.c
@@ -21,9 +21,9 @@ void PKCS12_PBE_add(void)
 }
 
 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, 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)
 {
     PBEPARAM *pbe;
     int saltlen, iter, ret;
@@ -49,18 +49,18 @@ int PKCS12_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
     salt = pbe->salt->data;
     saltlen = pbe->salt->length;
     if (!PKCS12_key_gen_utf8_ex(pass, passlen, salt, saltlen, PKCS12_KEY_ID,
-                                iter, EVP_CIPHER_get_key_length(cipher),
-                                key, md,
-                                libctx, propq)) {
+            iter, EVP_CIPHER_get_key_length(cipher),
+            key, md,
+            libctx, propq)) {
         ERR_raise(ERR_LIB_PKCS12, PKCS12_R_KEY_GEN_ERROR);
         PBEPARAM_free(pbe);
         return 0;
     }
     if (EVP_CIPHER_get_iv_length(cipher) > 0) {
         if (!PKCS12_key_gen_utf8_ex(pass, passlen, salt, saltlen, PKCS12_IV_ID,
-                                    iter, EVP_CIPHER_get_iv_length(cipher),
-                                    iv, md,
-                                    libctx, propq)) {
+                iter, EVP_CIPHER_get_iv_length(cipher),
+                iv, md,
+                libctx, propq)) {
             ERR_raise(ERR_LIB_PKCS12, PKCS12_R_IV_GEN_ERROR);
             PBEPARAM_free(pbe);
             return 0;
@@ -76,10 +76,9 @@ int PKCS12_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
 }
 
 int PKCS12_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)
 {
     return PKCS12_PBE_keyivgen_ex(ctx, pass, passlen, param, cipher, md, en_de,
-                                  NULL, NULL);
+        NULL, NULL);
 }
-
diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
index 60cc49820f9af..90a6fe1182dd9 100644
--- a/crypto/pkcs12/p12_crt.c
+++ b/crypto/pkcs12/p12_crt.c
@@ -13,15 +13,15 @@
 #include "p12_local.h"
 
 static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                          PKCS12_SAFEBAG *bag);
+    PKCS12_SAFEBAG *bag);
 static int pkcs12_remove_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                             PKCS12_SAFEBAG *bag);
+    PKCS12_SAFEBAG *bag);
 static PKCS12_SAFEBAG *pkcs12_add_cert_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                                           X509 *cert,
-                                           const char *name,
-                                           int namelen,
-                                           unsigned char *keyid,
-                                           int keyidlen);
+    X509 *cert,
+    const char *name,
+    int namelen,
+    unsigned char *keyid,
+    int keyidlen);
 
 static int copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid)
 {
@@ -33,10 +33,10 @@ static int copy_bag_attr(PKCS12_SAFEBAG *bag, EVP_PKEY *pkey, int nid)
 }
 
 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 *p12 = NULL;
     STACK_OF(PKCS7) *safes = NULL;
@@ -84,7 +84,7 @@ PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
         bag = pkcs12_add_cert_bag(&bags, cert, name, namelen, pkeyid, pkeyidlen);
         if (cb != NULL) {
             cbret = cb(bag, cbarg);
-            if (cbret  == -1) {
+            if (cbret == -1) {
                 ERR_raise(ERR_LIB_PKCS12, PKCS12_R_CALLBACK_FAILED);
                 goto err;
             } else if (cbret == 0) {
@@ -99,7 +99,7 @@ PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
             goto err;
         if (cb != NULL) {
             cbret = cb(bag, cbarg);
-            if (cbret  == -1) {
+            if (cbret == -1) {
                 ERR_raise(ERR_LIB_PKCS12, PKCS12_R_CALLBACK_FAILED);
                 goto err;
             } else if (cbret == 0) {
@@ -108,8 +108,7 @@ PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
         }
     }
 
-    if (bags && !PKCS12_add_safe_ex(&safes, bags, nid_cert, iter, pass,
-                                    ctx, propq))
+    if (bags && !PKCS12_add_safe_ex(&safes, bags, nid_cert, iter, pass, ctx, propq))
         goto err;
 
     sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
@@ -117,7 +116,7 @@ PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
 
     if (pkey) {
         bag = PKCS12_add_key_ex(&bags, pkey, keytype, iter, nid_key, pass,
-                                ctx, propq);
+            ctx, propq);
 
         if (!bag)
             goto err;
@@ -133,7 +132,7 @@ PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
             goto err;
         if (cb != NULL) {
             cbret = cb(bag, cbarg);
-            if (cbret  == -1) {
+            if (cbret == -1) {
                 ERR_raise(ERR_LIB_PKCS12, PKCS12_R_CALLBACK_FAILED);
                 goto err;
             } else if (cbret == 0) {
@@ -157,44 +156,42 @@ PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
 
     safes = NULL;
 
-    if ((mac_iter != -1) &&
-        !PKCS12_set_mac(p12, pass, -1, NULL, 0, mac_iter, NULL))
+    if ((mac_iter != -1) && !PKCS12_set_mac(p12, pass, -1, NULL, 0, mac_iter, NULL))
         goto err;
 
     return p12;
 
- err:
+err:
     PKCS12_free(p12);
     sk_PKCS7_pop_free(safes, PKCS7_free);
     sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
     return NULL;
-
 }
 
 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)
+    STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,
+    int mac_iter, int keytype,
+    OSSL_LIB_CTX *ctx, const char *propq)
 {
     return PKCS12_create_ex2(pass, name, pkey, cert, ca, nid_key, nid_cert,
-                             iter, mac_iter, keytype, ctx, propq,
-                             NULL, NULL);
+        iter, mac_iter, keytype, ctx, propq,
+        NULL, NULL);
 }
 
 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)
+    STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,
+    int mac_iter, int keytype)
 {
     return PKCS12_create_ex(pass, name, pkey, cert, ca, nid_key, nid_cert,
-                            iter, mac_iter, keytype, NULL, NULL);
+        iter, mac_iter, keytype, NULL, NULL);
 }
 
 static PKCS12_SAFEBAG *pkcs12_add_cert_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                                           X509 *cert,
-                                           const char *name,
-                                           int namelen,
-                                           unsigned char *keyid,
-                                           int keyidlen)
+    X509 *cert,
+    const char *name,
+    int namelen,
+    unsigned char *keyid,
+    int keyidlen)
 {
     PKCS12_SAFEBAG *bag = NULL;
 
@@ -213,7 +210,7 @@ static PKCS12_SAFEBAG *pkcs12_add_cert_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
 
     return bag;
 
- err:
+err:
     PKCS12_SAFEBAG_free(bag);
     return NULL;
 }
@@ -235,9 +232,9 @@ PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert)
 }
 
 PKCS12_SAFEBAG *PKCS12_add_key_ex(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                                  EVP_PKEY *key, int key_usage, int iter,
-                                  int nid_key, const char *pass,
-                                  OSSL_LIB_CTX *ctx, const char *propq)
+    EVP_PKEY *key, int key_usage, int iter,
+    int nid_key, const char *pass,
+    OSSL_LIB_CTX *ctx, const char *propq)
 {
 
     PKCS12_SAFEBAG *bag = NULL;
@@ -253,11 +250,11 @@ PKCS12_SAFEBAG *PKCS12_add_key_ex(STACK_OF(PKCS12_SAFEBAG) **pbags,
     if (nid_key != -1) {
         /* This call does not take ownership of p8 */
         bag = PKCS12_SAFEBAG_create_pkcs8_encrypt_ex(nid_key, pass, -1, NULL, 0,
-                                                     iter, p8, ctx, propq);
+            iter, p8, ctx, propq);
     } else {
         bag = PKCS12_SAFEBAG_create0_p8inf(p8);
         if (bag != NULL)
-           p8 = NULL; /* bag takes ownership of p8 */
+            p8 = NULL; /* bag takes ownership of p8 */
     }
     /* This does not need to be in the error path */
     if (p8 != NULL)
@@ -268,22 +265,21 @@ PKCS12_SAFEBAG *PKCS12_add_key_ex(STACK_OF(PKCS12_SAFEBAG) **pbags,
 
     return bag;
 
- err:
+err:
     PKCS12_SAFEBAG_free(bag);
     return NULL;
-
 }
 
 PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                               EVP_PKEY *key, int key_usage, int iter,
-                               int nid_key, const char *pass)
+    EVP_PKEY *key, int key_usage, int iter,
+    int nid_key, const char *pass)
 {
     return PKCS12_add_key_ex(pbags, key, key_usage, iter, nid_key, pass,
-                             NULL, NULL);
+        NULL, NULL);
 }
 
 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)
 {
     PKCS12_SAFEBAG *bag = NULL;
 
@@ -295,14 +291,14 @@ PKCS12_SAFEBAG *PKCS12_add_secret(STACK_OF(PKCS12_SAFEBAG) **pbags,
         goto err;
 
     return bag;
- err:
+err:
     PKCS12_SAFEBAG_free(bag);
     return NULL;
 }
 
 int PKCS12_add_safe_ex(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
-                       int nid_safe, int iter, const char *pass,
-                       OSSL_LIB_CTX *ctx, const char *propq)
+    int nid_safe, int iter, const char *pass,
+    OSSL_LIB_CTX *ctx, const char *propq)
 {
     PKCS7 *p7 = NULL;
     int free_safes = 0;
@@ -333,7 +329,7 @@ int PKCS12_add_safe_ex(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
 
     return 1;
 
- err:
+err:
     if (free_safes) {
         sk_PKCS7_free(*psafes);
         *psafes = NULL;
@@ -343,14 +339,13 @@ int PKCS12_add_safe_ex(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
 }
 
 int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
-                    int nid_safe, int iter, const char *pass)
+    int nid_safe, int iter, const char *pass)
 {
     return PKCS12_add_safe_ex(psafes, bags, nid_safe, iter, pass, NULL, NULL);
 }
 
-
 static int pkcs12_remove_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                             PKCS12_SAFEBAG *bag)
+    PKCS12_SAFEBAG *bag)
 {
     PKCS12_SAFEBAG *tmp;
 
@@ -365,7 +360,7 @@ static int pkcs12_remove_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
 }
 
 static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                          PKCS12_SAFEBAG *bag)
+    PKCS12_SAFEBAG *bag)
 {
     int free_bags = 0;
 
@@ -387,11 +382,10 @@ static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags,
     }
 
     return 1;
-
 }
 
 PKCS12 *PKCS12_add_safes_ex(STACK_OF(PKCS7) *safes, int nid_p7,
-                            OSSL_LIB_CTX *ctx, const char *propq)
+    OSSL_LIB_CTX *ctx, const char *propq)
 {
     PKCS12 *p12;
 
@@ -407,7 +401,6 @@ PKCS12 *PKCS12_add_safes_ex(STACK_OF(PKCS7) *safes, int nid_p7,
     }
 
     return p12;
-
 }
 
 PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int nid_p7)
diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
index 3fa9c9c8ccec8..46f3752e39099 100644
--- a/crypto/pkcs12/p12_decr.c
+++ b/crypto/pkcs12/p12_decr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -17,10 +17,10 @@
  * OPENSSL_malloc'ed buffer
  */
 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)
 {
     unsigned char *out = NULL;
     int outlen, i;
@@ -35,7 +35,7 @@ unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
 
     /* Process data */
     if (!EVP_PBE_CipherInit_ex(algor->algorithm, pass, passlen,
-                               algor->parameter, ctx, en_de, libctx, propq))
+            algor->parameter, ctx, en_de, libctx, propq))
         goto err;
 
     /*
@@ -53,7 +53,8 @@ unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
 
     max_out_len = inlen + block_size;
     if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
-                & EVP_CIPH_FLAG_CIPHER_WITH_MAC) != 0) {
+            & EVP_CIPH_FLAG_CIPHER_WITH_MAC)
+        != 0) {
         if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_TLS1_AAD, 0, &mac_len) < 0) {
             ERR_raise(ERR_LIB_PKCS12, ERR_R_INTERNAL_ERROR);
             goto err;
@@ -68,14 +69,15 @@ unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
             }
             inlen -= mac_len;
             if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
-                                    (int)mac_len, (unsigned char *)in+inlen) < 0) {
+                    (int)mac_len, (unsigned char *)in + inlen)
+                < 0) {
                 ERR_raise(ERR_LIB_PKCS12, ERR_R_INTERNAL_ERROR);
                 goto err;
             }
         }
     }
 
-    if ((out = OPENSSL_malloc(max_out_len)) == NULL)
+    if ((out = OPENSSL_zalloc(max_out_len)) == NULL)
         goto err;
 
     if (!EVP_CipherUpdate(ctx, out, &i, in, inlen)) {
@@ -90,16 +92,18 @@ unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
         OPENSSL_free(out);
         out = NULL;
         ERR_raise_data(ERR_LIB_PKCS12, PKCS12_R_PKCS12_CIPHERFINAL_ERROR,
-                       passlen == 0 ? "empty password"
-                       : "maybe wrong password");
+            passlen == 0 ? "empty password"
+                         : "maybe wrong password");
         goto err;
     }
     outlen += i;
     if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ctx))
-                & EVP_CIPH_FLAG_CIPHER_WITH_MAC) != 0) {
+            & EVP_CIPH_FLAG_CIPHER_WITH_MAC)
+        != 0) {
         if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
             if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG,
-                (int)mac_len, out+outlen) < 0) {
+                    (int)mac_len, out + outlen)
+                < 0) {
                 OPENSSL_free(out);
                 out = NULL;
                 ERR_raise(ERR_LIB_PKCS12, ERR_R_INTERNAL_ERROR);
@@ -112,19 +116,18 @@ unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
         *datalen = outlen;
     if (data)
         *data = out;
- err:
+err:
     EVP_CIPHER_CTX_free(ctx);
     return out;
-
 }
 
 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)
 {
     return PKCS12_pbe_crypt_ex(algor, pass, passlen, in, inlen, data, datalen,
-                               en_de, NULL, NULL);
+        en_de, NULL, NULL);
 }
 
 /*
@@ -133,25 +136,32 @@ unsigned char *PKCS12_pbe_crypt(const X509_ALGOR *algor,
  */
 
 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)
 {
     unsigned char *out = NULL;
     const unsigned char *p;
     void *ret;
     int outlen = 0;
 
+    if (oct == NULL) {
+        ERR_raise(ERR_LIB_PKCS12, ERR_R_PASSED_NULL_PARAMETER);
+        return NULL;
+    }
+
     if (!PKCS12_pbe_crypt_ex(algor, pass, passlen, oct->data, oct->length,
-                             &out, &outlen, 0, libctx, propq))
+            &out, &outlen, 0, libctx, propq))
         return NULL;
     p = out;
-    OSSL_TRACE_BEGIN(PKCS12_DECRYPT) {
+    OSSL_TRACE_BEGIN(PKCS12_DECRYPT)
+    {
         BIO_printf(trc_out, "\n");
         BIO_dump(trc_out, out, outlen);
         BIO_printf(trc_out, "\n");
-    } OSSL_TRACE_END(PKCS12_DECRYPT);
+    }
+    OSSL_TRACE_END(PKCS12_DECRYPT);
     ret = ASN1_item_d2i(NULL, &p, outlen, it);
     if (zbuf)
         OPENSSL_cleanse(out, outlen);
@@ -162,11 +172,11 @@ void *PKCS12_item_decrypt_d2i_ex(const X509_ALGOR *algor, const ASN1_ITEM *it,
 }
 
 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)
 {
     return PKCS12_item_decrypt_d2i_ex(algor, it, pass, passlen, oct, zbuf,
-                                      NULL, NULL);
+        NULL, NULL);
 }
 
 /*
@@ -175,11 +185,11 @@ void *PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it,
  */
 
 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)
 {
     ASN1_OCTET_STRING *oct = NULL;
     unsigned char *in = NULL;
@@ -195,7 +205,7 @@ ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt_ex(X509_ALGOR *algor,
         goto err;
     }
     if (!PKCS12_pbe_crypt_ex(algor, pass, passlen, in, inlen, &oct->data,
-                             &oct->length, 1, ctx, propq)) {
+            &oct->length, 1, ctx, propq)) {
         ERR_raise(ERR_LIB_PKCS12, PKCS12_R_ENCRYPT_ERROR);
         OPENSSL_free(in);
         goto err;
@@ -204,15 +214,15 @@ ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt_ex(X509_ALGOR *algor,
         OPENSSL_cleanse(in, inlen);
     OPENSSL_free(in);
     return oct;
- err:
+err:
     ASN1_OCTET_STRING_free(oct);
     return NULL;
 }
 
 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)
 {
     return PKCS12_item_i2d_encrypt_ex(algor, it, pass, passlen, obj, zbuf, NULL, NULL);
 }
diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c
index 537a1e3168cea..fe264a89d6d39 100644
--- a/crypto/pkcs12/p12_init.c
+++ b/crypto/pkcs12/p12_init.c
@@ -46,7 +46,7 @@ PKCS12 *PKCS12_init_ex(int mode, OSSL_LIB_CTX *ctx, const char *propq)
     }
     return pkcs12;
 
- err:
+err:
     PKCS12_free(pkcs12);
     return NULL;
 }
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c
index b5102110cd740..bd3ae5d2472d9 100644
--- a/crypto/pkcs12/p12_key.c
+++ b/crypto/pkcs12/p12_key.c
@@ -17,9 +17,9 @@
 #include "internal/provider.h"
 
 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 ret;
     unsigned char *unipass;
@@ -33,23 +33,23 @@ int PKCS12_key_gen_asc_ex(const char *pass, int passlen, unsigned char *salt,
         return 0;
     }
     ret = PKCS12_key_gen_uni_ex(unipass, uniplen, salt, saltlen, id, iter,
-                                n, out, md_type, ctx, propq);
+        n, out, md_type, ctx, propq);
     OPENSSL_clear_free(unipass, uniplen);
     return ret > 0;
 }
 
 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)
 {
     return PKCS12_key_gen_asc_ex(pass, passlen, salt, saltlen, id, iter, n,
-                                  out, md_type, NULL, NULL);
+        out, md_type, NULL, NULL);
 }
 
 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 ret;
     unsigned char *unipass;
@@ -63,23 +63,23 @@ int PKCS12_key_gen_utf8_ex(const char *pass, int passlen, unsigned char *salt,
         return 0;
     }
     ret = PKCS12_key_gen_uni_ex(unipass, uniplen, salt, saltlen, id, iter,
-                                n, out, md_type, ctx, propq);
+        n, out, md_type, ctx, propq);
     OPENSSL_clear_free(unipass, uniplen);
     return ret > 0;
 }
 
 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)
 {
     return PKCS12_key_gen_utf8_ex(pass, passlen, salt, saltlen, id, iter, n,
-                                  out, md_type, NULL, NULL);
+        out, md_type, NULL, NULL);
 }
 
 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 *libctx, const char *propq)
+    int saltlen, int id, int iter, int n,
+    unsigned char *out, const EVP_MD *md_type,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     int res = 0;
     EVP_KDF *kdf;
@@ -98,17 +98,18 @@ int PKCS12_key_gen_uni_ex(unsigned char *pass, int passlen, unsigned char *salt,
         return 0;
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)EVP_MD_get0_name(md_type),
-                                            0);
+        (char *)EVP_MD_get0_name(md_type),
+        0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
-                                             pass, passlen);
+        pass, passlen);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                             salt, saltlen);
+        salt, saltlen);
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_PKCS12_ID, &id);
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_ITER, &iter);
     *p = OSSL_PARAM_construct_end();
 
-    OSSL_TRACE_BEGIN(PKCS12_KEYGEN) {
+    OSSL_TRACE_BEGIN(PKCS12_KEYGEN)
+    {
         BIO_printf(trc_out, "PKCS12_key_gen_uni_ex(): ID %d, ITER %d\n", id, iter);
         BIO_printf(trc_out, "Password (length %d):\n", passlen);
         BIO_hex_string(trc_out, 0, passlen, pass, passlen);
@@ -116,23 +117,26 @@ int PKCS12_key_gen_uni_ex(unsigned char *pass, int passlen, unsigned char *salt,
         BIO_printf(trc_out, "Salt (length %d):\n", saltlen);
         BIO_hex_string(trc_out, 0, saltlen, salt, saltlen);
         BIO_printf(trc_out, "\n");
-    } OSSL_TRACE_END(PKCS12_KEYGEN);
+    }
+    OSSL_TRACE_END(PKCS12_KEYGEN);
 
     if (EVP_KDF_derive(ctx, out, (size_t)n, params)) {
         res = 1;
-        OSSL_TRACE_BEGIN(PKCS12_KEYGEN) {
+        OSSL_TRACE_BEGIN(PKCS12_KEYGEN)
+        {
             BIO_printf(trc_out, "Output KEY (length %d)\n", n);
             BIO_hex_string(trc_out, 0, n, out, n);
             BIO_printf(trc_out, "\n");
-        } OSSL_TRACE_END(PKCS12_KEYGEN);
+        }
+        OSSL_TRACE_END(PKCS12_KEYGEN);
     }
     EVP_KDF_CTX_free(ctx);
     return res;
 }
 
 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)
 {
     return PKCS12_key_gen_uni_ex(pass, passlen, salt, saltlen, id, iter, n, out, md_type, NULL, NULL);
 }
diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
index 0901dc94085f5..1c2e49a57fa25 100644
--- a/crypto/pkcs12/p12_kiss.c
+++ b/crypto/pkcs12/p12_kiss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -15,15 +15,15 @@
 /* Simplified PKCS#12 routines */
 
 static int parse_pk12(PKCS12 *p12, const char *pass, int passlen,
-                      EVP_PKEY **pkey, STACK_OF(X509) *ocerts);
+    EVP_PKEY **pkey, STACK_OF(X509) *ocerts);
 
 static int parse_bags(const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass,
-                      int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
-                      OSSL_LIB_CTX *libctx, const char *propq);
+    int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
-                     EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
-                     OSSL_LIB_CTX *libctx, const char *propq);
+    EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 /*
  * Parse and decrypt a PKCS#12 structure returning user key, user cert and
@@ -33,7 +33,7 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
  */
 
 int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
-                 STACK_OF(X509) **ca)
+    STACK_OF(X509) **ca)
 {
     STACK_OF(X509) *ocerts = NULL;
     X509 *x = NULL;
@@ -77,7 +77,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
 
     /* If needed, allocate stack for other certificates */
     if ((cert != NULL || ca != NULL)
-            && (ocerts = sk_X509_new_null()) == NULL) {
+        && (ocerts = sk_X509_new_null()) == NULL) {
         ERR_raise(ERR_LIB_PKCS12, ERR_R_CRYPTO_LIB);
         goto err;
     }
@@ -86,7 +86,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
         int err = ERR_peek_last_error();
 
         if (ERR_GET_LIB(err) != ERR_LIB_EVP
-                && ERR_GET_REASON(err) != EVP_R_UNSUPPORTED_ALGORITHM)
+            && ERR_GET_REASON(err) != EVP_R_UNSUPPORTED_ALGORITHM)
             ERR_raise(ERR_LIB_PKCS12, PKCS12_R_PARSE_ERROR);
         goto err;
     }
@@ -94,7 +94,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
     /* Split the certs in ocerts over *cert and *ca as far as requested */
     while ((x = sk_X509_shift(ocerts)) != NULL) {
         if (pkey != NULL && *pkey != NULL
-                && cert != NULL && *cert == NULL) {
+            && cert != NULL && *cert == NULL) {
             int match;
 
             ERR_set_mark();
@@ -117,7 +117,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
 
     return 1;
 
- err:
+err:
 
     if (pkey != NULL) {
         EVP_PKEY_free(*pkey);
@@ -130,14 +130,13 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
     X509_free(x);
     OSSL_STACK_OF_X509_free(ocerts);
     return 0;
-
 }
 
 /* Parse the outer PKCS#12 structure */
 
 /* pkey and/or ocerts may be NULL */
 static int parse_pk12(PKCS12 *p12, const char *pass, int passlen,
-                      EVP_PKEY **pkey, STACK_OF(X509) *ocerts)
+    EVP_PKEY **pkey, STACK_OF(X509) *ocerts)
 {
     STACK_OF(PKCS7) *asafes;
     STACK_OF(PKCS12_SAFEBAG) *bags;
@@ -160,7 +159,7 @@ static int parse_pk12(PKCS12 *p12, const char *pass, int passlen,
             return 0;
         }
         if (!parse_bags(bags, pass, passlen, pkey, ocerts,
-                        p7->ctx.libctx, p7->ctx.propq)) {
+                p7->ctx.libctx, p7->ctx.propq)) {
             sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
             sk_PKCS7_pop_free(asafes, PKCS7_free);
             return 0;
@@ -173,14 +172,14 @@ static int parse_pk12(PKCS12 *p12, const char *pass, int passlen,
 
 /* pkey and/or ocerts may be NULL */
 static int parse_bags(const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass,
-                      int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
-                      OSSL_LIB_CTX *libctx, const char *propq)
+    int passlen, EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     int i;
     for (i = 0; i < sk_PKCS12_SAFEBAG_num(bags); i++) {
         if (!parse_bag(sk_PKCS12_SAFEBAG_value(bags, i),
-                       pass, passlen, pkey, ocerts,
-                       libctx, propq))
+                pass, passlen, pkey, ocerts,
+                libctx, propq))
             return 0;
     }
     return 1;
@@ -188,8 +187,8 @@ static int parse_bags(const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pass,
 
 /* pkey and/or ocerts may be NULL */
 static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
-                     EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
-                     OSSL_LIB_CTX *libctx, const char *propq)
+    EVP_PKEY **pkey, STACK_OF(X509) *ocerts,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     PKCS8_PRIV_KEY_INFO *p8;
     X509 *x509;
@@ -197,18 +196,24 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
     ASN1_BMPSTRING *fname = NULL;
     ASN1_OCTET_STRING *lkid = NULL;
 
-    if ((attrib = PKCS12_SAFEBAG_get0_attr(bag, NID_friendlyName)))
+    if ((attrib = PKCS12_SAFEBAG_get0_attr(bag, NID_friendlyName))) {
+        if (attrib->type != V_ASN1_BMPSTRING)
+            return 0;
         fname = attrib->value.bmpstring;
+    }
 
-    if ((attrib = PKCS12_SAFEBAG_get0_attr(bag, NID_localKeyID)))
+    if ((attrib = PKCS12_SAFEBAG_get0_attr(bag, NID_localKeyID))) {
+        if (attrib->type != V_ASN1_OCTET_STRING)
+            return 0;
         lkid = attrib->value.octet_string;
+    }
 
     switch (PKCS12_SAFEBAG_get_nid(bag)) {
     case NID_keyBag:
         if (pkey == NULL || *pkey != NULL)
             return 1;
         *pkey = EVP_PKCS82PKEY_ex(PKCS12_SAFEBAG_get0_p8inf(bag),
-                                  libctx, propq);
+            libctx, propq);
         if (*pkey == NULL)
             return 0;
         break;
@@ -217,7 +222,8 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
         if (pkey == NULL || *pkey != NULL)
             return 1;
         if ((p8 = PKCS12_decrypt_skey_ex(bag, pass, passlen,
-                                         libctx, propq)) == NULL)
+                 libctx, propq))
+            == NULL)
             return 0;
         *pkey = EVP_PKCS82PKEY_ex(p8, libctx, propq);
         PKCS8_PRIV_KEY_INFO_free(p8);
@@ -227,7 +233,7 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
 
     case NID_certBag:
         if (ocerts == NULL
-                || PKCS12_SAFEBAG_get_bag_nid(bag) != NID_x509Certificate)
+            || PKCS12_SAFEBAG_get_bag_nid(bag) != NID_x509Certificate)
             return 1;
         if ((x509 = PKCS12_SAFEBAG_get1_cert_ex(bag, libctx, propq)) == NULL)
             return 0;
@@ -259,7 +265,7 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
 
     case NID_safeContentsBag:
         return parse_bags(PKCS12_SAFEBAG_get0_safes(bag), pass, passlen, pkey,
-                          ocerts, libctx, propq);
+            ocerts, libctx, propq);
 
     default:
         return 1;
diff --git a/crypto/pkcs12/p12_local.h b/crypto/pkcs12/p12_local.h
index 7f02874a97623..34ffffb692424 100644
--- a/crypto/pkcs12/p12_local.h
+++ b/crypto/pkcs12/p12_local.h
@@ -10,7 +10,7 @@
 struct PKCS12_MAC_DATA_st {
     X509_SIG *dinfo;
     ASN1_OCTET_STRING *salt;
-    ASN1_INTEGER *iter;         /* defaults to 1 */
+    ASN1_INTEGER *iter; /* defaults to 1 */
 };
 
 struct PKCS12_st {
@@ -24,7 +24,7 @@ struct PKCS12_SAFEBAG_st {
     union {
         struct pkcs12_bag_st *bag; /* secret, crl and certbag */
         struct pkcs8_priv_key_info_st *keybag; /* keybag */
-        X509_SIG *shkeybag;     /* shrouded key bag */
+        X509_SIG *shkeybag; /* shrouded key bag */
         STACK_OF(PKCS12_SAFEBAG) *safes;
         ASN1_TYPE *other;
     } value;
@@ -38,7 +38,7 @@ struct pkcs12_bag_st {
         ASN1_OCTET_STRING *x509crl;
         ASN1_OCTET_STRING *octet;
         ASN1_IA5STRING *sdsicert;
-        ASN1_TYPE *other;       /* Secret or other bag */
+        ASN1_TYPE *other; /* Secret or other bag */
     } value;
 };
 
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
index b43c82f0ed291..79ed41209c09c 100644
--- a/crypto/pkcs12/p12_mutl.c
+++ b/crypto/pkcs12/p12_mutl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -23,10 +23,10 @@
 #include "p12_local.h"
 
 static int pkcs12_pbmac1_pbkdf2_key_gen(const char *pass, int passlen,
-                                        unsigned char *salt, int saltlen,
-                                        int id, int iter, int keylen,
-                                        unsigned char *out,
-                                        const EVP_MD *md_type);
+    unsigned char *salt, int saltlen,
+    int id, int iter, int keylen,
+    unsigned char *out,
+    const EVP_MD *md_type);
 
 int PKCS12_mac_present(const PKCS12 *p12)
 {
@@ -34,10 +34,10 @@ 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)
 {
     if (p12->mac) {
         X509_SIG_get0(p12->mac->dinfo, pmacalg, pmac);
@@ -60,9 +60,9 @@ void PKCS12_get0_mac(const ASN1_OCTET_STRING **pmac,
 #define TK26_MAC_KEY_LEN 32
 
 static int pkcs12_gen_gost_mac_key(const char *pass, int passlen,
-                                   const unsigned char *salt, int saltlen,
-                                   int iter, int keylen, unsigned char *key,
-                                   const EVP_MD *digest)
+    const unsigned char *salt, int saltlen,
+    int iter, int keylen, unsigned char *key,
+    const EVP_MD *digest)
 {
     unsigned char out[96];
 
@@ -71,7 +71,7 @@ static int pkcs12_gen_gost_mac_key(const char *pass, int passlen,
     }
 
     if (!PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter,
-                           digest, sizeof(out), out)) {
+            digest, sizeof(out), out)) {
         return 0;
     }
     memcpy(key, out + sizeof(out) - TK26_MAC_KEY_LEN, TK26_MAC_KEY_LEN);
@@ -99,15 +99,15 @@ PBKDF2PARAM *PBMAC1_get1_pbkdf2_param(const X509_ALGOR *macalg)
     }
 
     pbkdf2_param = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(PBKDF2PARAM),
-                                             param->keyDerivationFunc->parameter);
+        param->keyDerivationFunc->parameter);
     PBMAC1PARAM_free(param);
 
     return pbkdf2_param;
 }
 
 static int PBMAC1_PBKDF2_HMAC(OSSL_LIB_CTX *ctx, const char *propq,
-                              const char *pass, int passlen,
-                              const X509_ALGOR *macalg, unsigned char *key)
+    const char *pass, int passlen,
+    const X509_ALGOR *macalg, unsigned char *key)
 {
     PBKDF2PARAM *pbkdf2_param = NULL;
     const ASN1_OBJECT *kdf_hmac_oid;
@@ -122,8 +122,6 @@ static int PBMAC1_PBKDF2_HMAC(OSSL_LIB_CTX *ctx, const char *propq,
         ERR_raise(ERR_LIB_PKCS12, ERR_R_UNSUPPORTED);
         goto err;
     }
-    keylen = ASN1_INTEGER_get(pbkdf2_param->keylength);
-    pbkdf2_salt = pbkdf2_param->salt->value.octet_string;
 
     if (pbkdf2_param->prf == NULL) {
         kdf_hmac_nid = NID_hmacWithSHA1;
@@ -138,14 +136,31 @@ static int PBMAC1_PBKDF2_HMAC(OSSL_LIB_CTX *ctx, const char *propq,
         goto err;
     }
 
+    /* Validate salt is an OCTET STRING choice */
+    if (pbkdf2_param->salt == NULL
+        || pbkdf2_param->salt->type != V_ASN1_OCTET_STRING) {
+        ERR_raise(ERR_LIB_PKCS12, PKCS12_R_PARSE_ERROR);
+        goto err;
+    }
+    pbkdf2_salt = pbkdf2_param->salt->value.octet_string;
+
+    /* RFC 9579 specifies missing key length as invalid */
+    if (pbkdf2_param->keylength != NULL)
+        keylen = ASN1_INTEGER_get(pbkdf2_param->keylength);
+    if (keylen <= 0 || keylen > EVP_MAX_MD_SIZE) {
+        ERR_raise(ERR_LIB_PKCS12, PKCS12_R_PARSE_ERROR);
+        goto err;
+    }
+
     if (PKCS5_PBKDF2_HMAC(pass, passlen, pbkdf2_salt->data, pbkdf2_salt->length,
-                          ASN1_INTEGER_get(pbkdf2_param->iter), kdf_md, keylen, key) <= 0) {
+            ASN1_INTEGER_get(pbkdf2_param->iter), kdf_md, keylen, key)
+        <= 0) {
         ERR_raise(ERR_LIB_PKCS12, ERR_R_INTERNAL_ERROR);
         goto err;
     }
     ret = keylen;
 
- err:
+err:
     EVP_MD_free(kdf_md);
     PBKDF2PARAM_free(pbkdf2_param);
 
@@ -154,13 +169,13 @@ static int PBMAC1_PBKDF2_HMAC(OSSL_LIB_CTX *ctx, const char *propq,
 
 /* Generate a MAC, also used for verification */
 static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
-                          unsigned char *mac, unsigned int *maclen,
-                          int pbmac1_md_nid, int pbmac1_kdf_nid,
-                          int (*pkcs12_key_gen)(const char *pass, int passlen,
-                                                unsigned char *salt, int slen,
-                                                int id, int iter, int n,
-                                                unsigned char *out,
-                                                const EVP_MD *md_type))
+    unsigned char *mac, unsigned int *maclen,
+    int pbmac1_md_nid, int pbmac1_kdf_nid,
+    int (*pkcs12_key_gen)(const char *pass, int passlen,
+        unsigned char *salt, int slen,
+        int id, int iter, int n,
+        unsigned char *out,
+        const EVP_MD *md_type))
 {
     int ret = 0;
     const EVP_MD *md;
@@ -201,7 +216,7 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
     }
     (void)ERR_set_mark();
     md = md_fetch = EVP_MD_fetch(p12->authsafes->ctx.libctx, md_name,
-                                 p12->authsafes->ctx.propq);
+        p12->authsafes->ctx.propq);
     if (md == NULL)
         md = EVP_get_digestbynid(OBJ_obj2nid(macoid));
 
@@ -220,16 +235,16 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
     /* For PBMAC1 we use a special keygen callback if not provided (e.g. on verification) */
     if (pbmac1_md_nid != NID_undef && pkcs12_key_gen == NULL) {
         keylen = PBMAC1_PBKDF2_HMAC(p12->authsafes->ctx.libctx, p12->authsafes->ctx.propq,
-                                    pass, passlen, macalg, key);
+            pass, passlen, macalg, key);
         if (keylen < 0)
             goto err;
     } else if ((md_nid == NID_id_GostR3411_94
-                || md_nid == NID_id_GostR3411_2012_256
-                || md_nid == NID_id_GostR3411_2012_512)
-               && ossl_safe_getenv("LEGACY_GOST_PKCS12") == NULL) {
+                   || md_nid == NID_id_GostR3411_2012_256
+                   || md_nid == NID_id_GostR3411_2012_512)
+        && ossl_safe_getenv("LEGACY_GOST_PKCS12") == NULL) {
         keylen = TK26_MAC_KEY_LEN;
         if (!pkcs12_gen_gost_mac_key(pass, passlen, salt, saltlen, iter,
-                                     keylen, key, md)) {
+                keylen, key, md)) {
             ERR_raise(ERR_LIB_PKCS12, PKCS12_R_KEY_GEN_ERROR);
             goto err;
         }
@@ -249,7 +264,7 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
         }
         if (pkcs12_key_gen != NULL) {
             int res = (*pkcs12_key_gen)(pass, passlen, salt, saltlen, PKCS12_MAC_ID,
-                                        iter, keylen, key, hmac_md);
+                iter, keylen, key, hmac_md);
 
             if (fetched)
                 EVP_MD_free(hmac_md);
@@ -262,8 +277,8 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
                 EVP_MD_free(hmac_md);
             /* Default to UTF-8 password */
             if (!PKCS12_key_gen_utf8_ex(pass, passlen, salt, saltlen, PKCS12_MAC_ID,
-                                        iter, keylen, key, md,
-                                        p12->authsafes->ctx.libctx, p12->authsafes->ctx.propq)) {
+                    iter, keylen, key, md,
+                    p12->authsafes->ctx.libctx, p12->authsafes->ctx.propq)) {
                 ERR_raise(ERR_LIB_PKCS12, PKCS12_R_KEY_GEN_ERROR);
                 goto err;
             }
@@ -272,7 +287,7 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
     if ((hmac = HMAC_CTX_new()) == NULL
         || !HMAC_Init_ex(hmac, key, keylen, md, NULL)
         || !HMAC_Update(hmac, p12->authsafes->d.data->data,
-                        p12->authsafes->d.data->length)
+            p12->authsafes->d.data->length)
         || !HMAC_Final(hmac, mac, maclen)) {
         goto err;
     }
@@ -286,7 +301,7 @@ static int pkcs12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
 }
 
 int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
-                   unsigned char *mac, unsigned int *maclen)
+    unsigned char *mac, unsigned int *maclen)
 {
     return pkcs12_gen_mac(p12, pass, passlen, mac, maclen, NID_undef, NID_undef, NULL);
 }
@@ -342,8 +357,8 @@ int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen)
 
 /* Set a mac */
 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)
 {
     unsigned char mac[EVP_MAX_MD_SIZE];
     unsigned int maclen;
@@ -374,17 +389,17 @@ int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
 }
 
 static int pkcs12_pbmac1_pbkdf2_key_gen(const char *pass, int passlen,
-                                        unsigned char *salt, int saltlen,
-                                        int id, int iter, int keylen,
-                                        unsigned char *out,
-                                        const EVP_MD *md_type)
+    unsigned char *salt, int saltlen,
+    int id, int iter, int keylen,
+    unsigned char *out,
+    const EVP_MD *md_type)
 {
     return PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter,
-                             md_type, keylen, out);
+        md_type, keylen, out);
 }
 
 static int pkcs12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
-                            int nid)
+    int nid)
 {
     X509_ALGOR *macalg;
 
@@ -412,7 +427,8 @@ static int pkcs12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int salt
     p12->mac->salt->length = saltlen;
     if (salt == NULL) {
         if (RAND_bytes_ex(p12->authsafes->ctx.libctx, p12->mac->salt->data,
-                          (size_t)saltlen, 0) <= 0)
+                (size_t)saltlen, 0)
+            <= 0)
             return 0;
     } else {
         memcpy(p12->mac->salt->data, salt, saltlen);
@@ -428,14 +444,14 @@ static int pkcs12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int salt
 
 /* Set up a mac structure */
 int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
-                     const EVP_MD *md_type)
+    const EVP_MD *md_type)
 {
     return pkcs12_setup_mac(p12, iter, salt, saltlen, EVP_MD_get_type(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)
 {
     unsigned char mac[EVP_MAX_MD_SIZE];
     unsigned int maclen;
@@ -446,7 +462,7 @@ int PKCS12_set_pbmac1_pbkdf2(PKCS12 *p12, const char *pass, int passlen,
     unsigned char *known_salt = NULL;
     int keylen = 0;
     PBMAC1PARAM *param = NULL;
-    X509_ALGOR  *hmac_alg = NULL, *macalg = NULL;
+    X509_ALGOR *hmac_alg = NULL, *macalg = NULL;
 
     if (md_type == NULL)
         /* No need to do a fetch as the md_type is used only to get a NID */
@@ -462,7 +478,7 @@ int PKCS12_set_pbmac1_pbkdf2(PKCS12 *p12, const char *pass, int passlen,
 
     keylen = EVP_MD_get_size(md_type);
 
-    prf_nid  = ossl_md2hmacnid(prf_md_nid);
+    prf_nid = ossl_md2hmacnid(prf_md_nid);
     hmac_nid = ossl_md2hmacnid(EVP_MD_get_type(md_type));
 
     if (prf_nid == NID_undef || hmac_nid == NID_undef) {
@@ -488,7 +504,8 @@ int PKCS12_set_pbmac1_pbkdf2(PKCS12 *p12, const char *pass, int passlen,
         goto err;
 
     if (pkcs12_setup_mac(p12, iter, salt ? salt : known_salt, saltlen,
-                         NID_pbmac1) == PKCS12_ERROR) {
+            NID_pbmac1)
+        == PKCS12_ERROR) {
         ERR_raise(ERR_LIB_PKCS12, PKCS12_R_MAC_SETUP_ERROR);
         goto err;
     }
@@ -511,8 +528,8 @@ int PKCS12_set_pbmac1_pbkdf2(PKCS12 *p12, const char *pass, int passlen,
      * Note that output mac is forced to UTF-8...
      */
     if (!pkcs12_gen_mac(p12, pass, passlen, mac, &maclen,
-                        EVP_MD_get_type(md_type), prf_md_nid,
-                        pkcs12_pbmac1_pbkdf2_key_gen)) {
+            EVP_MD_get_type(md_type), prf_md_nid,
+            pkcs12_pbmac1_pbkdf2_key_gen)) {
         ERR_raise(ERR_LIB_PKCS12, PKCS12_R_MAC_GENERATION_ERROR);
         goto err;
     }
@@ -522,7 +539,7 @@ int PKCS12_set_pbmac1_pbkdf2(PKCS12 *p12, const char *pass, int passlen,
     }
     ret = 1;
 
- err:
+err:
     PBMAC1PARAM_free(param);
     OPENSSL_free(known_salt);
     return ret;
diff --git a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c
index 37abb3821d4b3..2cce2ec0c1082 100644
--- a/crypto/pkcs12/p12_npas.c
+++ b/crypto/pkcs12/p12_npas.c
@@ -19,13 +19,13 @@
 
 static int newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass);
 static int newpass_bags(STACK_OF(PKCS12_SAFEBAG) *bags, const char *oldpass,
-                        const char *newpass,
-                        OSSL_LIB_CTX *libctx, const char *propq);
+    const char *newpass,
+    OSSL_LIB_CTX *libctx, const char *propq);
 static int newpass_bag(PKCS12_SAFEBAG *bag, const char *oldpass,
-                        const char *newpass,
-                        OSSL_LIB_CTX *libctx, const char *propq);
+    const char *newpass,
+    OSSL_LIB_CTX *libctx, const char *propq);
 static int alg_get(const X509_ALGOR *alg, int *pnid, int *piter,
-                   int *psaltlen, int *cipherid);
+    int *psaltlen, int *cipherid);
 
 /*
  * Change the password on a PKCS#12 structure.
@@ -81,8 +81,8 @@ static int newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass)
         } else if (bagnid == NID_pkcs7_encrypted) {
             bags = PKCS12_unpack_p7encdata(p7, oldpass, -1);
             if (p7->d.encrypted == NULL
-                    || !alg_get(p7->d.encrypted->enc_data->algorithm,
-                                &pbe_nid, &pbe_iter, &pbe_saltlen, &cipherid))
+                || !alg_get(p7->d.encrypted->enc_data->algorithm,
+                    &pbe_nid, &pbe_iter, &pbe_saltlen, &cipherid))
                 goto err;
         } else {
             continue;
@@ -90,15 +90,15 @@ static int newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass)
         if (bags == NULL)
             goto err;
         if (!newpass_bags(bags, oldpass, newpass,
-                          p7->ctx.libctx, p7->ctx.propq))
+                p7->ctx.libctx, p7->ctx.propq))
             goto err;
         /* Repack bag in same form with new password */
         if (bagnid == NID_pkcs7_data)
             p7new = PKCS12_pack_p7data(bags);
         else
             p7new = PKCS12_pack_p7encdata_ex(pbe_nid, newpass, -1, NULL,
-                                             pbe_saltlen, pbe_iter, bags,
-                                             p7->ctx.libctx, p7->ctx.propq);
+                pbe_saltlen, pbe_iter, bags,
+                p7->ctx.libctx, p7->ctx.propq);
         if (p7new == NULL || !sk_PKCS7_push(newsafes, p7new))
             goto err;
         sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
@@ -138,13 +138,13 @@ static int newpass_p12(PKCS12 *p12, const char *oldpass, const char *newpass)
 }
 
 static int newpass_bags(STACK_OF(PKCS12_SAFEBAG) *bags, const char *oldpass,
-                        const char *newpass,
-                        OSSL_LIB_CTX *libctx, const char *propq)
+    const char *newpass,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     int i;
     for (i = 0; i < sk_PKCS12_SAFEBAG_num(bags); i++) {
         if (!newpass_bag(sk_PKCS12_SAFEBAG_value(bags, i), oldpass, newpass,
-                         libctx, propq))
+                libctx, propq))
             return 0;
     }
     return 1;
@@ -153,8 +153,8 @@ static int newpass_bags(STACK_OF(PKCS12_SAFEBAG) *bags, const char *oldpass,
 /* Change password of safebag: only needs handle shrouded keybags */
 
 static int newpass_bag(PKCS12_SAFEBAG *bag, const char *oldpass,
-                       const char *newpass,
-                       OSSL_LIB_CTX *libctx, const char *propq)
+    const char *newpass,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     EVP_CIPHER *cipher = NULL;
     PKCS8_PRIV_KEY_INFO *p8;
@@ -166,7 +166,8 @@ static int newpass_bag(PKCS12_SAFEBAG *bag, const char *oldpass,
         return 1;
 
     if ((p8 = PKCS8_decrypt_ex(bag->value.shkeybag, oldpass, -1,
-                               libctx, propq)) == NULL)
+             libctx, propq))
+        == NULL)
         return 0;
     X509_SIG_get0(bag->value.shkeybag, &shalg, NULL);
     if (!alg_get(shalg, &p8_nid, &p8_iter, &p8_saltlen, &cipherid)) {
@@ -181,7 +182,7 @@ static int newpass_bag(PKCS12_SAFEBAG *bag, const char *oldpass,
         }
     }
     p8new = PKCS8_encrypt_ex(p8_nid, cipher, newpass, -1, NULL, p8_saltlen,
-                             p8_iter, p8, libctx, propq);
+        p8_iter, p8, libctx, propq);
     PKCS8_PRIV_KEY_INFO_free(p8);
     EVP_CIPHER_free(cipher);
     if (p8new == NULL)
@@ -192,7 +193,7 @@ static int newpass_bag(PKCS12_SAFEBAG *bag, const char *oldpass,
 }
 
 static int alg_get(const X509_ALGOR *alg, int *pnid, int *piter,
-                   int *psaltlen, int *cipherid)
+    int *psaltlen, int *cipherid)
 {
     int ret = 0, pbenid, aparamtype;
     int encnid, prfnid;
diff --git a/crypto/pkcs12/p12_p8d.c b/crypto/pkcs12/p12_p8d.c
index 449336aa2df16..5b4327dc91718 100644
--- a/crypto/pkcs12/p12_p8d.c
+++ b/crypto/pkcs12/p12_p8d.c
@@ -12,21 +12,20 @@
 #include <openssl/pkcs12.h>
 
 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)
 {
     const X509_ALGOR *dalg;
     const ASN1_OCTET_STRING *doct;
 
     X509_SIG_get0(p8, &dalg, &doct);
     return PKCS12_item_decrypt_d2i_ex(dalg,
-                                   ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass,
-                                   passlen, doct, 1, ctx, propq);
+        ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass,
+        passlen, doct, 1, ctx, propq);
 }
 
 PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(const X509_SIG *p8, const char *pass,
-                                   int passlen)
+    int passlen)
 {
     return PKCS8_decrypt_ex(p8, pass, passlen, NULL, NULL);
 }
-
diff --git a/crypto/pkcs12/p12_p8e.c b/crypto/pkcs12/p12_p8e.c
index 1230c8c88cda4..57f17d5131483 100644
--- a/crypto/pkcs12/p12_p8e.c
+++ b/crypto/pkcs12/p12_p8e.c
@@ -14,10 +14,10 @@
 #include "crypto/x509.h"
 
 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 *p8inf,
-                           OSSL_LIB_CTX *libctx, const char *propq)
+    const char *pass, int passlen,
+    unsigned char *salt, int saltlen, int iter,
+    PKCS8_PRIV_KEY_INFO *p8inf,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     X509_SIG *p8 = NULL;
     X509_ALGOR *pbe;
@@ -28,7 +28,7 @@ X509_SIG *PKCS8_encrypt_ex(int pbe_nid, const EVP_CIPHER *cipher,
             return NULL;
         }
         pbe = PKCS5_pbe2_set_iv_ex(cipher, iter, salt, saltlen, NULL, -1,
-                                   libctx);
+            libctx);
     } else {
         ERR_set_mark();
         if (EVP_PBE_find(EVP_PBE_TYPE_PRF, pbe_nid, NULL, NULL, 0)) {
@@ -38,7 +38,7 @@ X509_SIG *PKCS8_encrypt_ex(int pbe_nid, const EVP_CIPHER *cipher,
                 return NULL;
             }
             pbe = PKCS5_pbe2_set_iv_ex(cipher, iter, salt, saltlen, NULL,
-                                       pbe_nid, libctx);
+                pbe_nid, libctx);
         } else {
             ERR_pop_to_mark();
             pbe = PKCS5_pbe_set_ex(pbe_nid, iter, salt, saltlen, libctx);
@@ -58,24 +58,23 @@ X509_SIG *PKCS8_encrypt_ex(int pbe_nid, const EVP_CIPHER *cipher,
 }
 
 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 *p8inf)
+    const char *pass, int passlen,
+    unsigned char *salt, int saltlen, int iter,
+    PKCS8_PRIV_KEY_INFO *p8inf)
 {
     return PKCS8_encrypt_ex(pbe_nid, cipher, pass, passlen, salt, saltlen, iter,
-                            p8inf, NULL, NULL);
+        p8inf, NULL, NULL);
 }
 
 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)
 {
     X509_SIG *p8;
     ASN1_OCTET_STRING *enckey;
 
-    enckey =
-        PKCS12_item_i2d_encrypt_ex(pbe, ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO),
-                                   pass, passlen, p8inf, 1, ctx, propq);
+    enckey = PKCS12_item_i2d_encrypt_ex(pbe, ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO),
+        pass, passlen, p8inf, 1, ctx, propq);
     if (!enckey) {
         ERR_raise(ERR_LIB_PKCS12, PKCS12_R_ENCRYPT_ERROR);
         return NULL;
@@ -94,7 +93,7 @@ X509_SIG *PKCS8_set0_pbe_ex(const char *pass, int passlen,
 }
 
 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)
 {
     return PKCS8_set0_pbe_ex(pass, passlen, p8inf, pbe, NULL, NULL);
 }
diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c
index 04ef0b74edef4..4848daf2e9b92 100644
--- a/crypto/pkcs12/p12_sbag.c
+++ b/crypto/pkcs12/p12_sbag.c
@@ -21,7 +21,7 @@ ASN1_TYPE *PKCS12_get_attr(const PKCS12_SAFEBAG *bag, int attr_nid)
 #endif
 
 const ASN1_TYPE *PKCS12_SAFEBAG_get0_attr(const PKCS12_SAFEBAG *bag,
-                                          int attr_nid)
+    int attr_nid)
 {
     return PKCS12_get_attr_gen(bag->attrib, attr_nid);
 }
@@ -74,11 +74,20 @@ int PKCS12_SAFEBAG_get_bag_nid(const PKCS12_SAFEBAG *bag)
 
 const ASN1_OBJECT *PKCS12_SAFEBAG_get0_bag_type(const PKCS12_SAFEBAG *bag)
 {
+    int btype = PKCS12_SAFEBAG_get_nid(bag);
+
+    if (btype != NID_certBag && btype != NID_crlBag && btype != NID_secretBag)
+        return NULL;
     return bag->value.bag->type;
 }
 
 const ASN1_TYPE *PKCS12_SAFEBAG_get0_bag_obj(const PKCS12_SAFEBAG *bag)
 {
+    int vtype = PKCS12_SAFEBAG_get_bag_nid(bag);
+
+    if (vtype == -1 || vtype == NID_x509Certificate || vtype == NID_x509Crl
+        || vtype == NID_sdsiCertificate)
+        return NULL;
     return bag->value.bag->value.other;
 }
 
@@ -89,7 +98,7 @@ X509 *PKCS12_SAFEBAG_get1_cert(const PKCS12_SAFEBAG *bag)
     if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Certificate)
         return NULL;
     return ASN1_item_unpack(bag->value.bag->value.octet,
-                            ASN1_ITEM_rptr(X509));
+        ASN1_ITEM_rptr(X509));
 }
 
 X509_CRL *PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag)
@@ -99,11 +108,11 @@ X509_CRL *PKCS12_SAFEBAG_get1_crl(const PKCS12_SAFEBAG *bag)
     if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Crl)
         return NULL;
     return ASN1_item_unpack(bag->value.bag->value.octet,
-                            ASN1_ITEM_rptr(X509_CRL));
+        ASN1_ITEM_rptr(X509_CRL));
 }
 
 X509 *PKCS12_SAFEBAG_get1_cert_ex(const PKCS12_SAFEBAG *bag,
-                                  OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     X509 *ret = NULL;
 
@@ -112,7 +121,7 @@ X509 *PKCS12_SAFEBAG_get1_cert_ex(const PKCS12_SAFEBAG *bag,
     if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Certificate)
         return NULL;
     ret = ASN1_item_unpack_ex(bag->value.bag->value.octet,
-                              ASN1_ITEM_rptr(X509), libctx, propq);
+        ASN1_ITEM_rptr(X509), libctx, propq);
     if (!ossl_x509_set0_libctx(ret, libctx, propq)) {
         X509_free(ret);
         return NULL;
@@ -121,7 +130,7 @@ X509 *PKCS12_SAFEBAG_get1_cert_ex(const PKCS12_SAFEBAG *bag,
 }
 
 X509_CRL *PKCS12_SAFEBAG_get1_crl_ex(const PKCS12_SAFEBAG *bag,
-                                     OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     X509_CRL *ret = NULL;
 
@@ -130,7 +139,7 @@ X509_CRL *PKCS12_SAFEBAG_get1_crl_ex(const PKCS12_SAFEBAG *bag,
     if (OBJ_obj2nid(bag->value.bag->type) != NID_x509Crl)
         return NULL;
     ret = ASN1_item_unpack_ex(bag->value.bag->value.octet,
-                              ASN1_ITEM_rptr(X509_CRL), libctx, propq);
+        ASN1_ITEM_rptr(X509_CRL), libctx, propq);
     if (!ossl_x509_crl_set0_libctx(ret, libctx, propq)) {
         X509_CRL_free(ret);
         return NULL;
@@ -141,13 +150,13 @@ X509_CRL *PKCS12_SAFEBAG_get1_crl_ex(const PKCS12_SAFEBAG *bag,
 PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_cert(X509 *x509)
 {
     return PKCS12_item_pack_safebag(x509, ASN1_ITEM_rptr(X509),
-                                    NID_x509Certificate, NID_certBag);
+        NID_x509Certificate, NID_certBag);
 }
 
 PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_crl(X509_CRL *crl)
 {
     return PKCS12_item_pack_safebag(crl, ASN1_ITEM_rptr(X509_CRL),
-                                    NID_x509Crl, NID_crlBag);
+        NID_x509Crl, NID_crlBag);
 }
 
 PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_secret(int type, int vtype, const unsigned char *value, int len)
@@ -162,29 +171,27 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_secret(int type, int vtype, const unsigned
     bag->type = OBJ_nid2obj(type);
 
     switch (vtype) {
-    case V_ASN1_OCTET_STRING:
-        {
-            ASN1_OCTET_STRING *strtmp = ASN1_OCTET_STRING_new();
-
-            if (strtmp == NULL) {
-                ERR_raise(ERR_LIB_PKCS12, ERR_R_ASN1_LIB);
-                goto err;
-            }
-            /* Pack data into an octet string */
-            if (!ASN1_OCTET_STRING_set(strtmp, value, len)) {
-                ASN1_OCTET_STRING_free(strtmp);
-                ERR_raise(ERR_LIB_PKCS12, PKCS12_R_ENCODE_ERROR);
-                goto err;
-            }
-            bag->value.other = ASN1_TYPE_new();
-            if (bag->value.other == NULL) {
-                ASN1_OCTET_STRING_free(strtmp);
-                ERR_raise(ERR_LIB_PKCS12, ERR_R_ASN1_LIB);
-                goto err;
-            }
-            ASN1_TYPE_set(bag->value.other, vtype, strtmp);
+    case V_ASN1_OCTET_STRING: {
+        ASN1_OCTET_STRING *strtmp = ASN1_OCTET_STRING_new();
+
+        if (strtmp == NULL) {
+            ERR_raise(ERR_LIB_PKCS12, ERR_R_ASN1_LIB);
+            goto err;
+        }
+        /* Pack data into an octet string */
+        if (!ASN1_OCTET_STRING_set(strtmp, value, len)) {
+            ASN1_OCTET_STRING_free(strtmp);
+            ERR_raise(ERR_LIB_PKCS12, PKCS12_R_ENCODE_ERROR);
+            goto err;
         }
-        break;
+        bag->value.other = ASN1_TYPE_new();
+        if (bag->value.other == NULL) {
+            ASN1_OCTET_STRING_free(strtmp);
+            ERR_raise(ERR_LIB_PKCS12, ERR_R_ASN1_LIB);
+            goto err;
+        }
+        ASN1_TYPE_set(bag->value.other, vtype, strtmp);
+    } break;
 
     default:
         ERR_raise(ERR_LIB_PKCS12, PKCS12_R_INVALID_TYPE);
@@ -199,7 +206,7 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_secret(int type, int vtype, const unsigned
     safebag->type = OBJ_nid2obj(NID_secretBag);
     return safebag;
 
- err:
+err:
     PKCS12_BAGS_free(bag);
     return NULL;
 }
@@ -236,13 +243,13 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_create0_pkcs8(X509_SIG *p8)
 }
 
 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 *bag = NULL;
     const EVP_CIPHER *pbe_ciph = NULL;
@@ -259,7 +266,7 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_pkcs8_encrypt_ex(int pbe_nid,
         pbe_nid = -1;
 
     p8 = PKCS8_encrypt_ex(pbe_nid, pbe_ciph, pass, passlen, salt, saltlen, iter,
-                          p8inf, ctx, propq);
+        p8inf, ctx, propq);
     if (p8 == NULL)
         goto err;
 
@@ -273,13 +280,13 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_pkcs8_encrypt_ex(int pbe_nid,
 }
 
 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)
 {
     return PKCS12_SAFEBAG_create_pkcs8_encrypt_ex(pbe_nid, pass, passlen,
-                                                  salt, saltlen, iter, p8inf,
-                                                  NULL, NULL);
+        salt, saltlen, iter, p8inf,
+        NULL, NULL);
 }
diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index a96623f19fbad..9360f9930713f 100644
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -16,7 +16,7 @@
 /* Cheap and nasty Unicode stuff */
 
 unsigned char *OPENSSL_asc2uni(const char *asc, int asclen,
-                               unsigned char **uni, int *unilen)
+    unsigned char **uni, int *unilen)
 {
     int ulen, i;
     unsigned char *unitmp;
@@ -75,7 +75,7 @@ char *OPENSSL_uni2asc(const unsigned char *uni, int unilen)
  * bytes the string occupies, and treat it, the length, accordingly.
  */
 unsigned char *OPENSSL_utf82uni(const char *asc, int asclen,
-                                unsigned char **uni, int *unilen)
+    unsigned char **uni, int *unilen)
 {
     int ulen, i, j;
     unsigned char *unitmp, *ret;
@@ -85,7 +85,7 @@ unsigned char *OPENSSL_utf82uni(const char *asc, int asclen,
         asclen = strlen(asc);
 
     for (ulen = 0, i = 0; i < asclen; i += j) {
-        j = UTF8_getc((const unsigned char *)asc+i, asclen-i, &utf32chr);
+        j = UTF8_getc((const unsigned char *)asc + i, asclen - i, &utf32chr);
 
         /*
          * Following condition is somewhat opportunistic is sense that
@@ -106,34 +106,34 @@ unsigned char *OPENSSL_utf82uni(const char *asc, int asclen,
         if (j < 0)
             return OPENSSL_asc2uni(asc, asclen, uni, unilen);
 
-        if (utf32chr > 0x10FFFF)        /* UTF-16 cap */
+        if (utf32chr > 0x10FFFF) /* UTF-16 cap */
             return NULL;
 
-        if (utf32chr >= 0x10000)        /* pair of UTF-16 characters */
-            ulen += 2*2;
-        else                            /* or just one */
+        if (utf32chr >= 0x10000) /* pair of UTF-16 characters */
+            ulen += 2 * 2;
+        else /* or just one */
             ulen += 2;
     }
 
-    ulen += 2;  /* for trailing UTF16 zero */
+    ulen += 2; /* for trailing UTF16 zero */
 
     if ((ret = OPENSSL_malloc(ulen)) == NULL)
         return NULL;
     /* re-run the loop writing down UTF-16 characters in big-endian order */
     for (unitmp = ret, i = 0; i < asclen; i += j) {
-        j = UTF8_getc((const unsigned char *)asc+i, asclen-i, &utf32chr);
-        if (utf32chr >= 0x10000) {      /* pair if UTF-16 characters */
+        j = UTF8_getc((const unsigned char *)asc + i, asclen - i, &utf32chr);
+        if (utf32chr >= 0x10000) { /* pair if UTF-16 characters */
             unsigned int hi, lo;
 
             utf32chr -= 0x10000;
-            hi = 0xD800 + (utf32chr>>10);
-            lo = 0xDC00 + (utf32chr&0x3ff);
-            *unitmp++ = (unsigned char)(hi>>8);
+            hi = 0xD800 + (utf32chr >> 10);
+            lo = 0xDC00 + (utf32chr & 0x3ff);
+            *unitmp++ = (unsigned char)(hi >> 8);
             *unitmp++ = (unsigned char)(hi);
-            *unitmp++ = (unsigned char)(lo>>8);
+            *unitmp++ = (unsigned char)(lo >> 8);
             *unitmp++ = (unsigned char)(lo);
-        } else {                        /* or just one */
-            *unitmp++ = (unsigned char)(utf32chr>>8);
+        } else { /* or just one */
+            *unitmp++ = (unsigned char)(utf32chr >> 8);
             *unitmp++ = (unsigned char)(utf32chr);
         }
     }
@@ -151,23 +151,27 @@ static int bmp_to_utf8(char *str, const unsigned char *utf16, int len)
 {
     unsigned long utf32chr;
 
-    if (len == 0) return 0;
+    if (len == 0)
+        return 0;
 
-    if (len < 2) return -1;
+    if (len < 2)
+        return -1;
 
     /* pull UTF-16 character in big-endian order */
-    utf32chr = (utf16[0]<<8) | utf16[1];
+    utf32chr = (utf16[0] << 8) | utf16[1];
 
-    if (utf32chr >= 0xD800 && utf32chr < 0xE000) {   /* two chars */
+    if (utf32chr >= 0xD800 && utf32chr < 0xE000) { /* two chars */
         unsigned int lo;
 
-        if (len < 4) return -1;
+        if (len < 4)
+            return -1;
 
         utf32chr -= 0xD800;
         utf32chr <<= 10;
-        lo = (utf16[2]<<8) | utf16[3];
-        if (lo < 0xDC00 || lo >= 0xE000) return -1;
-        utf32chr |= lo-0xDC00;
+        lo = (utf16[2] << 8) | utf16[3];
+        if (lo < 0xDC00 || lo >= 0xE000)
+            return -1;
+        utf32chr |= lo - 0xDC00;
         utf32chr += 0x10000;
     }
 
@@ -183,36 +187,46 @@ char *OPENSSL_uni2utf8(const unsigned char *uni, int unilen)
     if (unilen & 1)
         return NULL;
 
-    for (asclen = 0, i = 0; i < unilen; ) {
-        j = bmp_to_utf8(NULL, uni+i, unilen-i);
+    for (asclen = 0, i = 0; i < unilen;) {
+        j = bmp_to_utf8(NULL, uni + i, unilen - i);
         /*
          * falling back to OPENSSL_uni2asc makes lesser sense [than
          * falling back to OPENSSL_asc2uni in OPENSSL_utf82uni above],
          * it's done rather to maintain symmetry...
          */
-        if (j < 0) return OPENSSL_uni2asc(uni, unilen);
-        if (j == 4) i += 4;
-        else        i += 2;
+        if (j < 0)
+            return OPENSSL_uni2asc(uni, unilen);
+        if (j == 4)
+            i += 4;
+        else
+            i += 2;
         asclen += j;
     }
 
     /* If no terminating zero allow for one */
-    if (!unilen || (uni[unilen-2]||uni[unilen - 1]))
+    if (!unilen || (uni[unilen - 2] || uni[unilen - 1]))
         asclen++;
 
     if ((asctmp = OPENSSL_malloc(asclen)) == NULL)
         return NULL;
 
     /* re-run the loop emitting UTF-8 string */
-    for (asclen = 0, i = 0; i < unilen; ) {
-        j = bmp_to_utf8(asctmp+asclen, uni+i, unilen-i);
-        if (j == 4) i += 4;
-        else        i += 2;
+    for (asclen = 0, i = 0; i < unilen;) {
+        j = bmp_to_utf8(asctmp + asclen, uni + i, unilen - i);
+        /* when UTF8_putc fails */
+        if (j < 0) {
+            OPENSSL_free(asctmp);
+            return NULL;
+        }
+        if (j == 4)
+            i += 4;
+        else
+            i += 2;
         asclen += j;
     }
 
     /* If no terminating zero write one */
-    if (!unilen || (uni[unilen-2]||uni[unilen - 1]))
+    if (!unilen || (uni[unilen - 2] || uni[unilen - 1]))
         asctmp[asclen] = '\0';
 
     return asctmp;
diff --git a/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c
index e9bcaf4b6e5a4..2a92d999d3a16 100644
--- a/crypto/pkcs12/pk12err.c
+++ b/crypto/pkcs12/pk12err.c
@@ -15,39 +15,39 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA PKCS12_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_CALLBACK_FAILED), "callback failed"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_CANT_PACK_STRUCTURE),
-    "can't pack structure"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_CONTENT_TYPE_NOT_DATA),
-    "content type not data"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_DECODE_ERROR), "decode error"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_ENCODE_ERROR), "encode error"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_ENCRYPT_ERROR), "encrypt error"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE),
-    "error setting encrypted data type"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_NULL_ARGUMENT),
-    "invalid null argument"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_NULL_PKCS12_POINTER),
-    "invalid null pkcs12 pointer"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_TYPE), "invalid type"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_IV_GEN_ERROR), "iv gen error"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_KEY_GEN_ERROR), "key gen error"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_ABSENT), "mac absent"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_GENERATION_ERROR),
-    "mac generation error"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_SETUP_ERROR), "mac setup error"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_STRING_SET_ERROR),
-    "mac string set error"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_VERIFY_FAILURE),
-    "mac verify failure"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_PARSE_ERROR), "parse error"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_PKCS12_CIPHERFINAL_ERROR),
-    "pkcs12 cipherfinal error"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_UNKNOWN_DIGEST_ALGORITHM),
-    "unknown digest algorithm"},
-    {ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_UNSUPPORTED_PKCS12_MODE),
-    "unsupported pkcs12 mode"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_CALLBACK_FAILED), "callback failed" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_CANT_PACK_STRUCTURE),
+        "can't pack structure" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_CONTENT_TYPE_NOT_DATA),
+        "content type not data" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_DECODE_ERROR), "decode error" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_ENCODE_ERROR), "encode error" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_ENCRYPT_ERROR), "encrypt error" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE),
+        "error setting encrypted data type" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_NULL_ARGUMENT),
+        "invalid null argument" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_NULL_PKCS12_POINTER),
+        "invalid null pkcs12 pointer" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_INVALID_TYPE), "invalid type" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_IV_GEN_ERROR), "iv gen error" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_KEY_GEN_ERROR), "key gen error" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_ABSENT), "mac absent" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_GENERATION_ERROR),
+        "mac generation error" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_SETUP_ERROR), "mac setup error" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_STRING_SET_ERROR),
+        "mac string set error" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_MAC_VERIFY_FAILURE),
+        "mac verify failure" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_PARSE_ERROR), "parse error" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_PKCS12_CIPHERFINAL_ERROR),
+        "pkcs12 cipherfinal error" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_UNKNOWN_DIGEST_ALGORITHM),
+        "unknown digest algorithm" },
+    { ERR_PACK(ERR_LIB_PKCS12, 0, PKCS12_R_UNSUPPORTED_PKCS12_MODE),
+        "unsupported pkcs12 mode" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/pkcs7/pk7_asn1.c b/crypto/pkcs7/pk7_asn1.c
index 3abcc3dc88315..733f3bb69dcad 100644
--- a/crypto/pkcs7/pk7_asn1.c
+++ b/crypto/pkcs7/pk7_asn1.c
@@ -21,17 +21,17 @@
 ASN1_ADB_TEMPLATE(p7default) = ASN1_EXP_OPT(PKCS7, d.other, ASN1_ANY, 0);
 
 ASN1_ADB(PKCS7) = {
-        ADB_ENTRY(NID_pkcs7_data, ASN1_NDEF_EXP_OPT(PKCS7, d.data, ASN1_OCTET_STRING_NDEF, 0)),
-        ADB_ENTRY(NID_pkcs7_signed, ASN1_NDEF_EXP_OPT(PKCS7, d.sign, PKCS7_SIGNED, 0)),
-        ADB_ENTRY(NID_pkcs7_enveloped, ASN1_NDEF_EXP_OPT(PKCS7, d.enveloped, PKCS7_ENVELOPE, 0)),
-        ADB_ENTRY(NID_pkcs7_signedAndEnveloped, ASN1_NDEF_EXP_OPT(PKCS7, d.signed_and_enveloped, PKCS7_SIGN_ENVELOPE, 0)),
-        ADB_ENTRY(NID_pkcs7_digest, ASN1_NDEF_EXP_OPT(PKCS7, d.digest, PKCS7_DIGEST, 0)),
-        ADB_ENTRY(NID_pkcs7_encrypted, ASN1_NDEF_EXP_OPT(PKCS7, d.encrypted, PKCS7_ENCRYPT, 0))
+    ADB_ENTRY(NID_pkcs7_data, ASN1_NDEF_EXP_OPT(PKCS7, d.data, ASN1_OCTET_STRING_NDEF, 0)),
+    ADB_ENTRY(NID_pkcs7_signed, ASN1_NDEF_EXP_OPT(PKCS7, d.sign, PKCS7_SIGNED, 0)),
+    ADB_ENTRY(NID_pkcs7_enveloped, ASN1_NDEF_EXP_OPT(PKCS7, d.enveloped, PKCS7_ENVELOPE, 0)),
+    ADB_ENTRY(NID_pkcs7_signedAndEnveloped, ASN1_NDEF_EXP_OPT(PKCS7, d.signed_and_enveloped, PKCS7_SIGN_ENVELOPE, 0)),
+    ADB_ENTRY(NID_pkcs7_digest, ASN1_NDEF_EXP_OPT(PKCS7, d.digest, PKCS7_DIGEST, 0)),
+    ADB_ENTRY(NID_pkcs7_encrypted, ASN1_NDEF_EXP_OPT(PKCS7, d.encrypted, PKCS7_ENCRYPT, 0))
 } ASN1_ADB_END(PKCS7, 0, type, 0, &p7default_tt, NULL);
 
 /* PKCS#7 streaming support */
 static int pk7_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                  void *exarg)
+    void *exarg)
 {
     ASN1_STREAM_ARG *sarg = exarg;
     PKCS7 **pp7 = (PKCS7 **)pval;
@@ -53,15 +53,14 @@ static int pk7_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         if (PKCS7_dataFinal(*pp7, sarg->ndef_bio) <= 0)
             return 0;
         break;
-
     }
     return 1;
 }
 
 ASN1_NDEF_SEQUENCE_cb(PKCS7, pk7_cb) = {
-        ASN1_SIMPLE(PKCS7, type, ASN1_OBJECT),
-        ASN1_ADB_OBJECT(PKCS7)
-}ASN1_NDEF_SEQUENCE_END_cb(PKCS7, PKCS7)
+    ASN1_SIMPLE(PKCS7, type, ASN1_OBJECT),
+    ASN1_ADB_OBJECT(PKCS7)
+} ASN1_NDEF_SEQUENCE_END_cb(PKCS7, PKCS7)
 
 PKCS7 *d2i_PKCS7(PKCS7 **a, const unsigned char **in, long len)
 {
@@ -75,7 +74,7 @@ PKCS7 *d2i_PKCS7(PKCS7 **a, const unsigned char **in, long len)
     }
 
     ret = (PKCS7 *)ASN1_item_d2i_ex((ASN1_VALUE **)a, in, len, (PKCS7_it()),
-                                    libctx, propq);
+        libctx, propq);
     if (ret != NULL)
         ossl_pkcs7_resolve_libctx(ret);
     return ret;
@@ -83,7 +82,7 @@ PKCS7 *d2i_PKCS7(PKCS7 **a, const unsigned char **in, long len)
 
 int i2d_PKCS7(const PKCS7 *a, unsigned char **out)
 {
-    return ASN1_item_i2d((const ASN1_VALUE *)a, out, (PKCS7_it()));\
+    return ASN1_item_i2d((const ASN1_VALUE *)a, out, (PKCS7_it()));
 }
 
 PKCS7 *PKCS7_new(void)
@@ -94,7 +93,7 @@ PKCS7 *PKCS7_new(void)
 PKCS7 *PKCS7_new_ex(OSSL_LIB_CTX *libctx, const char *propq)
 {
     PKCS7 *pkcs7 = (PKCS7 *)ASN1_item_new_ex(ASN1_ITEM_rptr(PKCS7), libctx,
-                                             propq);
+        propq);
 
     if (pkcs7 != NULL) {
         pkcs7->ctx.libctx = libctx;
@@ -123,19 +122,19 @@ IMPLEMENT_ASN1_NDEF_FUNCTION(PKCS7)
 IMPLEMENT_ASN1_DUP_FUNCTION(PKCS7)
 
 ASN1_NDEF_SEQUENCE(PKCS7_SIGNED) = {
-        ASN1_SIMPLE(PKCS7_SIGNED, version, ASN1_INTEGER),
-        ASN1_SET_OF(PKCS7_SIGNED, md_algs, X509_ALGOR),
-        ASN1_SIMPLE(PKCS7_SIGNED, contents, PKCS7),
-        ASN1_IMP_SEQUENCE_OF_OPT(PKCS7_SIGNED, cert, X509, 0),
-        ASN1_IMP_SET_OF_OPT(PKCS7_SIGNED, crl, X509_CRL, 1),
-        ASN1_SET_OF(PKCS7_SIGNED, signer_info, PKCS7_SIGNER_INFO)
+    ASN1_SIMPLE(PKCS7_SIGNED, version, ASN1_INTEGER),
+    ASN1_SET_OF(PKCS7_SIGNED, md_algs, X509_ALGOR),
+    ASN1_SIMPLE(PKCS7_SIGNED, contents, PKCS7),
+    ASN1_IMP_SEQUENCE_OF_OPT(PKCS7_SIGNED, cert, X509, 0),
+    ASN1_IMP_SET_OF_OPT(PKCS7_SIGNED, crl, X509_CRL, 1),
+    ASN1_SET_OF(PKCS7_SIGNED, signer_info, PKCS7_SIGNER_INFO)
 } ASN1_NDEF_SEQUENCE_END(PKCS7_SIGNED)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGNED)
 
 /* Minor tweak to operation: free up EVP_PKEY */
 static int si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                 void *exarg)
+    void *exarg)
 {
     if (operation == ASN1_OP_FREE_POST) {
         PKCS7_SIGNER_INFO *si = (PKCS7_SIGNER_INFO *)*pval;
@@ -145,40 +144,40 @@ static int si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_SEQUENCE_cb(PKCS7_SIGNER_INFO, si_cb) = {
-        ASN1_SIMPLE(PKCS7_SIGNER_INFO, version, ASN1_INTEGER),
-        ASN1_SIMPLE(PKCS7_SIGNER_INFO, issuer_and_serial, PKCS7_ISSUER_AND_SERIAL),
-        ASN1_SIMPLE(PKCS7_SIGNER_INFO, digest_alg, X509_ALGOR),
-        /* NB this should be a SET OF but we use a SEQUENCE OF so the
-         * original order * is retained when the structure is reencoded.
-         * Since the attributes are implicitly tagged this will not affect
-         * the encoding.
-         */
-        ASN1_IMP_SEQUENCE_OF_OPT(PKCS7_SIGNER_INFO, auth_attr, X509_ATTRIBUTE, 0),
-        ASN1_SIMPLE(PKCS7_SIGNER_INFO, digest_enc_alg, X509_ALGOR),
-        ASN1_SIMPLE(PKCS7_SIGNER_INFO, enc_digest, ASN1_OCTET_STRING),
-        ASN1_IMP_SET_OF_OPT(PKCS7_SIGNER_INFO, unauth_attr, X509_ATTRIBUTE, 1)
+    ASN1_SIMPLE(PKCS7_SIGNER_INFO, version, ASN1_INTEGER),
+    ASN1_SIMPLE(PKCS7_SIGNER_INFO, issuer_and_serial, PKCS7_ISSUER_AND_SERIAL),
+    ASN1_SIMPLE(PKCS7_SIGNER_INFO, digest_alg, X509_ALGOR),
+    /* NB this should be a SET OF but we use a SEQUENCE OF so the
+     * original order * is retained when the structure is reencoded.
+     * Since the attributes are implicitly tagged this will not affect
+     * the encoding.
+     */
+    ASN1_IMP_SEQUENCE_OF_OPT(PKCS7_SIGNER_INFO, auth_attr, X509_ATTRIBUTE, 0),
+    ASN1_SIMPLE(PKCS7_SIGNER_INFO, digest_enc_alg, X509_ALGOR),
+    ASN1_SIMPLE(PKCS7_SIGNER_INFO, enc_digest, ASN1_OCTET_STRING),
+    ASN1_IMP_SET_OF_OPT(PKCS7_SIGNER_INFO, unauth_attr, X509_ATTRIBUTE, 1)
 } ASN1_SEQUENCE_END_cb(PKCS7_SIGNER_INFO, PKCS7_SIGNER_INFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGNER_INFO)
 
 ASN1_SEQUENCE(PKCS7_ISSUER_AND_SERIAL) = {
-        ASN1_SIMPLE(PKCS7_ISSUER_AND_SERIAL, issuer, X509_NAME),
-        ASN1_SIMPLE(PKCS7_ISSUER_AND_SERIAL, serial, ASN1_INTEGER)
+    ASN1_SIMPLE(PKCS7_ISSUER_AND_SERIAL, issuer, X509_NAME),
+    ASN1_SIMPLE(PKCS7_ISSUER_AND_SERIAL, serial, ASN1_INTEGER)
 } ASN1_SEQUENCE_END(PKCS7_ISSUER_AND_SERIAL)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
 
 ASN1_NDEF_SEQUENCE(PKCS7_ENVELOPE) = {
-        ASN1_SIMPLE(PKCS7_ENVELOPE, version, ASN1_INTEGER),
-        ASN1_SET_OF(PKCS7_ENVELOPE, recipientinfo, PKCS7_RECIP_INFO),
-        ASN1_SIMPLE(PKCS7_ENVELOPE, enc_data, PKCS7_ENC_CONTENT)
+    ASN1_SIMPLE(PKCS7_ENVELOPE, version, ASN1_INTEGER),
+    ASN1_SET_OF(PKCS7_ENVELOPE, recipientinfo, PKCS7_RECIP_INFO),
+    ASN1_SIMPLE(PKCS7_ENVELOPE, enc_data, PKCS7_ENC_CONTENT)
 } ASN1_NDEF_SEQUENCE_END(PKCS7_ENVELOPE)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENVELOPE)
 
 /* Minor tweak to operation: free up X509 */
 static int ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                 void *exarg)
+    void *exarg)
 {
     if (operation == ASN1_OP_FREE_POST) {
         PKCS7_RECIP_INFO *ri = (PKCS7_RECIP_INFO *)*pval;
@@ -188,46 +187,46 @@ static int ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_SEQUENCE_cb(PKCS7_RECIP_INFO, ri_cb) = {
-        ASN1_SIMPLE(PKCS7_RECIP_INFO, version, ASN1_INTEGER),
-        ASN1_SIMPLE(PKCS7_RECIP_INFO, issuer_and_serial, PKCS7_ISSUER_AND_SERIAL),
-        ASN1_SIMPLE(PKCS7_RECIP_INFO, key_enc_algor, X509_ALGOR),
-        ASN1_SIMPLE(PKCS7_RECIP_INFO, enc_key, ASN1_OCTET_STRING)
+    ASN1_SIMPLE(PKCS7_RECIP_INFO, version, ASN1_INTEGER),
+    ASN1_SIMPLE(PKCS7_RECIP_INFO, issuer_and_serial, PKCS7_ISSUER_AND_SERIAL),
+    ASN1_SIMPLE(PKCS7_RECIP_INFO, key_enc_algor, X509_ALGOR),
+    ASN1_SIMPLE(PKCS7_RECIP_INFO, enc_key, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END_cb(PKCS7_RECIP_INFO, PKCS7_RECIP_INFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_RECIP_INFO)
 
 ASN1_NDEF_SEQUENCE(PKCS7_ENC_CONTENT) = {
-        ASN1_SIMPLE(PKCS7_ENC_CONTENT, content_type, ASN1_OBJECT),
-        ASN1_SIMPLE(PKCS7_ENC_CONTENT, algorithm, X509_ALGOR),
-        ASN1_IMP_OPT(PKCS7_ENC_CONTENT, enc_data, ASN1_OCTET_STRING_NDEF, 0)
+    ASN1_SIMPLE(PKCS7_ENC_CONTENT, content_type, ASN1_OBJECT),
+    ASN1_SIMPLE(PKCS7_ENC_CONTENT, algorithm, X509_ALGOR),
+    ASN1_IMP_OPT(PKCS7_ENC_CONTENT, enc_data, ASN1_OCTET_STRING_NDEF, 0)
 } ASN1_NDEF_SEQUENCE_END(PKCS7_ENC_CONTENT)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENC_CONTENT)
 
 ASN1_NDEF_SEQUENCE(PKCS7_SIGN_ENVELOPE) = {
-        ASN1_SIMPLE(PKCS7_SIGN_ENVELOPE, version, ASN1_INTEGER),
-        ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, recipientinfo, PKCS7_RECIP_INFO),
-        ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, md_algs, X509_ALGOR),
-        ASN1_SIMPLE(PKCS7_SIGN_ENVELOPE, enc_data, PKCS7_ENC_CONTENT),
-        ASN1_IMP_SET_OF_OPT(PKCS7_SIGN_ENVELOPE, cert, X509, 0),
-        ASN1_IMP_SET_OF_OPT(PKCS7_SIGN_ENVELOPE, crl, X509_CRL, 1),
-        ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, signer_info, PKCS7_SIGNER_INFO)
+    ASN1_SIMPLE(PKCS7_SIGN_ENVELOPE, version, ASN1_INTEGER),
+    ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, recipientinfo, PKCS7_RECIP_INFO),
+    ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, md_algs, X509_ALGOR),
+    ASN1_SIMPLE(PKCS7_SIGN_ENVELOPE, enc_data, PKCS7_ENC_CONTENT),
+    ASN1_IMP_SET_OF_OPT(PKCS7_SIGN_ENVELOPE, cert, X509, 0),
+    ASN1_IMP_SET_OF_OPT(PKCS7_SIGN_ENVELOPE, crl, X509_CRL, 1),
+    ASN1_SET_OF(PKCS7_SIGN_ENVELOPE, signer_info, PKCS7_SIGNER_INFO)
 } ASN1_NDEF_SEQUENCE_END(PKCS7_SIGN_ENVELOPE)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_SIGN_ENVELOPE)
 
 ASN1_NDEF_SEQUENCE(PKCS7_ENCRYPT) = {
-        ASN1_SIMPLE(PKCS7_ENCRYPT, version, ASN1_INTEGER),
-        ASN1_SIMPLE(PKCS7_ENCRYPT, enc_data, PKCS7_ENC_CONTENT)
+    ASN1_SIMPLE(PKCS7_ENCRYPT, version, ASN1_INTEGER),
+    ASN1_SIMPLE(PKCS7_ENCRYPT, enc_data, PKCS7_ENC_CONTENT)
 } ASN1_NDEF_SEQUENCE_END(PKCS7_ENCRYPT)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_ENCRYPT)
 
 ASN1_NDEF_SEQUENCE(PKCS7_DIGEST) = {
-        ASN1_SIMPLE(PKCS7_DIGEST, version, ASN1_INTEGER),
-        ASN1_SIMPLE(PKCS7_DIGEST, md, X509_ALGOR),
-        ASN1_SIMPLE(PKCS7_DIGEST, contents, PKCS7),
-        ASN1_SIMPLE(PKCS7_DIGEST, digest, ASN1_OCTET_STRING)
+    ASN1_SIMPLE(PKCS7_DIGEST, version, ASN1_INTEGER),
+    ASN1_SIMPLE(PKCS7_DIGEST, md, X509_ALGOR),
+    ASN1_SIMPLE(PKCS7_DIGEST, contents, PKCS7),
+    ASN1_SIMPLE(PKCS7_DIGEST, digest, ASN1_OCTET_STRING)
 } ASN1_NDEF_SEQUENCE_END(PKCS7_DIGEST)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKCS7_DIGEST)
@@ -239,8 +238,7 @@ IMPLEMENT_ASN1_FUNCTIONS(PKCS7_DIGEST)
  * encoding.
  */
 
-ASN1_ITEM_TEMPLATE(PKCS7_ATTR_SIGN) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_ORDER, 0, PKCS7_ATTRIBUTES, X509_ATTRIBUTE)
+ASN1_ITEM_TEMPLATE(PKCS7_ATTR_SIGN) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_ORDER, 0, PKCS7_ATTRIBUTES, X509_ATTRIBUTE)
 ASN1_ITEM_TEMPLATE_END(PKCS7_ATTR_SIGN)
 
 /*
@@ -248,9 +246,8 @@ ASN1_ITEM_TEMPLATE_END(PKCS7_ATTR_SIGN)
  * SEQUENCE OF and tag it to SET OF
  */
 
-ASN1_ITEM_TEMPLATE(PKCS7_ATTR_VERIFY) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_IMPTAG | ASN1_TFLG_UNIVERSAL,
-                                V_ASN1_SET, PKCS7_ATTRIBUTES, X509_ATTRIBUTE)
+ASN1_ITEM_TEMPLATE(PKCS7_ATTR_VERIFY) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_IMPTAG | ASN1_TFLG_UNIVERSAL,
+    V_ASN1_SET, PKCS7_ATTRIBUTES, X509_ATTRIBUTE)
 ASN1_ITEM_TEMPLATE_END(PKCS7_ATTR_VERIFY)
 
 IMPLEMENT_ASN1_PRINT_FUNCTION(PKCS7)
diff --git a/crypto/pkcs7/pk7_attr.c b/crypto/pkcs7/pk7_attr.c
index df83574eaa76a..a1c09840e826b 100644
--- a/crypto/pkcs7/pk7_attr.c
+++ b/crypto/pkcs7/pk7_attr.c
@@ -18,7 +18,7 @@
 #include <openssl/err.h>
 
 int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si,
-                              STACK_OF(X509_ALGOR) *cap)
+    STACK_OF(X509_ALGOR) *cap)
 {
     ASN1_STRING *seq;
 
@@ -27,13 +27,13 @@ int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si,
         return 0;
     }
     seq->length = ASN1_item_i2d((ASN1_VALUE *)cap, &seq->data,
-                                ASN1_ITEM_rptr(X509_ALGORS));
+        ASN1_ITEM_rptr(X509_ALGORS));
     if (seq->length <= 0 || seq->data == NULL) {
         ASN1_STRING_free(seq);
         return 1;
     }
     if (!PKCS7_add_signed_attribute(si, NID_SMIMECapabilities,
-                                    V_ASN1_SEQUENCE, seq)) {
+            V_ASN1_SEQUENCE, seq)) {
         ASN1_STRING_free(seq);
         return 0;
     }
@@ -51,7 +51,7 @@ STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si)
     p = cap->value.sequence->data;
     return (STACK_OF(X509_ALGOR) *)
         ASN1_item_d2i(NULL, &p, cap->value.sequence->length,
-                      ASN1_ITEM_rptr(X509_ALGORS));
+            ASN1_ITEM_rptr(X509_ALGORS));
 }
 
 /* Basic smime-capabilities OID and optional integer arg */
@@ -101,7 +101,7 @@ int PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid)
     if (!coid)
         coid = OBJ_nid2obj(NID_pkcs7_data);
     return PKCS7_add_signed_attribute(si, NID_pkcs9_contentType,
-                                      V_ASN1_OBJECT, coid);
+        V_ASN1_OBJECT, coid);
 }
 
 int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t)
@@ -113,7 +113,7 @@ int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t)
         return 0;
     }
     if (!PKCS7_add_signed_attribute(si, NID_pkcs9_signingTime,
-                                    V_ASN1_UTCTIME, t)) {
+            V_ASN1_UTCTIME, t)) {
         ASN1_TIME_free(tmp);
         return 0;
     }
@@ -121,7 +121,7 @@ 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)
 {
     ASN1_OCTET_STRING *os;
     os = ASN1_OCTET_STRING_new();
@@ -129,7 +129,7 @@ int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si,
         return 0;
     if (!ASN1_STRING_set(os, md, mdlen)
         || !PKCS7_add_signed_attribute(si, NID_pkcs9_messageDigest,
-                                       V_ASN1_OCTET_STRING, os)) {
+            V_ASN1_OCTET_STRING, os)) {
         ASN1_OCTET_STRING_free(os);
         return 0;
     }
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c
index 9fa215a62846f..b180b58481851 100644
--- a/crypto/pkcs7/pk7_doit.c
+++ b/crypto/pkcs7/pk7_doit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -19,7 +19,7 @@
 #include "pk7_local.h"
 
 static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
-                         void *value);
+    void *value);
 static ASN1_TYPE *get_attribute(const STACK_OF(X509_ATTRIBUTE) *sk, int nid);
 
 int PKCS7_type_is_other(PKCS7 *p7)
@@ -42,7 +42,6 @@ int PKCS7_type_is_other(PKCS7 *p7)
     }
 
     return isOther;
-
 }
 
 ASN1_OCTET_STRING *PKCS7_get_octet_string(PKCS7 *p7)
@@ -71,9 +70,9 @@ static ASN1_OCTET_STRING *pkcs7_get1_data(PKCS7 *p7)
 
     /* General case for PKCS#7 content, see RFC 2315 section-7 */
     if (PKCS7_type_is_other(p7) && (p7->d.other != NULL)
-            && (p7->d.other->type == V_ASN1_SEQUENCE)
-            && (p7->d.other->value.sequence != NULL)
-            && (p7->d.other->value.sequence->length > 0)) {
+        && (p7->d.other->type == V_ASN1_SEQUENCE)
+        && (p7->d.other->value.sequence != NULL)
+        && (p7->d.other->value.sequence->length > 0)) {
         const unsigned char *data = p7->d.other->value.sequence->data;
         long len;
         int inf, tag, class;
@@ -82,9 +81,9 @@ static ASN1_OCTET_STRING *pkcs7_get1_data(PKCS7 *p7)
         if (os == NULL)
             return NULL;
         inf = ASN1_get_object(&data, &len, &tag, &class,
-                              p7->d.other->value.sequence->length);
+            p7->d.other->value.sequence->length);
         if (inf != V_ASN1_CONSTRUCTED || tag != V_ASN1_SEQUENCE
-                || !ASN1_OCTET_STRING_set(os, data, len)) {
+            || !ASN1_OCTET_STRING_set(os, data, len)) {
             ASN1_OCTET_STRING_free(os);
             os = NULL;
         }
@@ -93,7 +92,7 @@ static ASN1_OCTET_STRING *pkcs7_get1_data(PKCS7 *p7)
 }
 
 static int pkcs7_bio_add_digest(BIO **pbio, X509_ALGOR *alg,
-                                const PKCS7_CTX *ctx)
+    const PKCS7_CTX *ctx)
 {
     BIO *btmp;
     char name[OSSL_MAX_NAME_SIZE];
@@ -109,7 +108,7 @@ static int pkcs7_bio_add_digest(BIO **pbio, X509_ALGOR *alg,
 
     (void)ERR_set_mark();
     fetched = EVP_MD_fetch(ossl_pkcs7_ctx_get0_libctx(ctx), name,
-                           ossl_pkcs7_ctx_get0_propq(ctx));
+        ossl_pkcs7_ctx_get0_propq(ctx));
     if (fetched != NULL)
         md = fetched;
     else
@@ -138,13 +137,13 @@ static int pkcs7_bio_add_digest(BIO **pbio, X509_ALGOR *alg,
 
     return 1;
 
- err:
+err:
     BIO_free(btmp);
     return 0;
 }
 
 static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
-                              unsigned char *key, int keylen)
+    unsigned char *key, int keylen)
 {
     EVP_PKEY_CTX *pctx = NULL;
     EVP_PKEY *pkey = NULL;
@@ -158,7 +157,7 @@ static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
         return 0;
 
     pctx = EVP_PKEY_CTX_new_from_pkey(ossl_pkcs7_ctx_get0_libctx(ctx), pkey,
-                                      ossl_pkcs7_ctx_get0_propq(ctx));
+        ossl_pkcs7_ctx_get0_propq(ctx));
     if (pctx == NULL)
         return 0;
 
@@ -180,16 +179,15 @@ static int pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri,
 
     ret = 1;
 
- err:
+err:
     EVP_PKEY_CTX_free(pctx);
     OPENSSL_free(ek);
     return ret;
-
 }
 
 static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
-                               PKCS7_RECIP_INFO *ri, EVP_PKEY *pkey,
-                               size_t fixlen)
+    PKCS7_RECIP_INFO *ri, EVP_PKEY *pkey,
+    size_t fixlen)
 {
     EVP_PKEY_CTX *pctx = NULL;
     unsigned char *ek = NULL;
@@ -198,7 +196,7 @@ static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
     const PKCS7_CTX *ctx = ri->ctx;
 
     pctx = EVP_PKEY_CTX_new_from_pkey(ossl_pkcs7_ctx_get0_libctx(ctx), pkey,
-                                      ossl_pkcs7_ctx_get0_propq(ctx));
+        ossl_pkcs7_ctx_get0_propq(ctx));
     if (pctx == NULL)
         return -1;
 
@@ -213,7 +211,7 @@ static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
         EVP_PKEY_CTX_ctrl_str(pctx, "rsa_pkcs1_implicit_rejection", "0");
 
     ret = evp_pkey_decrypt_alloc(pctx, &ek, &eklen, fixlen,
-                                 ri->enc_key->data, ri->enc_key->length);
+        ri->enc_key->data, ri->enc_key->length);
     if (ret <= 0)
         goto err;
 
@@ -223,7 +221,7 @@ static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
     *pek = ek;
     *peklen = eklen;
 
- err:
+err:
     EVP_PKEY_CTX_free(pctx);
     if (!ret)
         OPENSSL_free(ek);
@@ -336,8 +334,8 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
 
         (void)ERR_set_mark();
         fetched_cipher = EVP_CIPHER_fetch(libctx,
-                                          EVP_CIPHER_get0_name(evp_cipher),
-                                          propq);
+            EVP_CIPHER_get0_name(evp_cipher),
+            propq);
         (void)ERR_pop_to_mark();
         if (fetched_cipher != NULL)
             cipher = fetched_cipher;
@@ -361,8 +359,11 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
                 if (xalg->parameter == NULL)
                     goto err;
             }
-            if (EVP_CIPHER_param_to_asn1(ctx, xalg->parameter) <= 0)
+            if (EVP_CIPHER_param_to_asn1(ctx, xalg->parameter) <= 0) {
+                ASN1_TYPE_free(xalg->parameter);
+                xalg->parameter = NULL;
                 goto err;
+            }
         }
 
         /* Lets do the pub key stuff :-) */
@@ -413,7 +414,7 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
     ASN1_OCTET_STRING_free(os);
     return out;
 
- err:
+err:
     ASN1_OCTET_STRING_free(os);
     EVP_CIPHER_free(fetched_cipher);
     BIO_free_all(out);
@@ -425,11 +426,11 @@ static int pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert)
 {
     int ret;
     ret = X509_NAME_cmp(ri->issuer_and_serial->issuer,
-                        X509_get_issuer_name(pcert));
+        X509_get_issuer_name(pcert));
     if (ret)
         return ret;
     return ASN1_INTEGER_cmp(X509_get0_serialNumber(pcert),
-                            ri->issuer_and_serial->serial);
+        ri->issuer_and_serial->serial);
 }
 
 /* int */
@@ -606,7 +607,7 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
             }
             if (ri == NULL) {
                 ERR_raise(ERR_LIB_PKCS7,
-                          PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE);
+                    PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE);
                 goto err;
             }
         }
@@ -621,7 +622,8 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
                 ri = sk_PKCS7_RECIP_INFO_value(rsk, i);
                 ri->ctx = p7_ctx;
                 if (pkcs7_decrypt_rinfo(&ek, &eklen, ri, pkey,
-                        EVP_CIPHER_get_key_length(cipher)) < 0)
+                        EVP_CIPHER_get_key_length(cipher))
+                    < 0)
                     goto err;
                 ERR_clear_error();
             }
@@ -704,7 +706,7 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
     EVP_CIPHER_free(evp_cipher);
     return out;
 
- err:
+err:
     EVP_CIPHER_free(evp_cipher);
     OPENSSL_clear_free(ek, eklen);
     OPENSSL_clear_free(tkey, tkeylen);
@@ -891,8 +893,8 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
                     goto err;
 
                 if (!EVP_SignFinal_ex(ctx_tmp, abuf, &abuflen, si->pkey,
-                                      ossl_pkcs7_ctx_get0_libctx(p7_ctx),
-                                      ossl_pkcs7_ctx_get0_propq(p7_ctx))) {
+                        ossl_pkcs7_ctx_get0_libctx(p7_ctx),
+                        ossl_pkcs7_ctx_get0_propq(p7_ctx))) {
                     OPENSSL_free(abuf);
                     ERR_raise(ERR_LIB_PKCS7, ERR_R_EVP_LIB);
                     goto err;
@@ -904,7 +906,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         unsigned char md_data[EVP_MAX_MD_SIZE];
         unsigned int md_len;
         if (!PKCS7_find_digest(&mdc, bio,
-                               OBJ_obj2nid(p7->d.digest->md->algorithm)))
+                OBJ_obj2nid(p7->d.digest->md->algorithm)))
             goto err;
         if (!EVP_DigestFinal_ex(mdc, md_data, &md_len))
             goto err;
@@ -938,7 +940,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
         }
     }
     ret = 1;
- err:
+err:
     EVP_MD_CTX_free(ctx_tmp);
     return ret;
 }
@@ -964,13 +966,14 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
     }
 
     if (EVP_DigestSignInit_ex(mctx, &pctx, EVP_MD_get0_name(md),
-                              ossl_pkcs7_ctx_get0_libctx(ctx),
-                              ossl_pkcs7_ctx_get0_propq(ctx), si->pkey,
-                              NULL) <= 0)
+            ossl_pkcs7_ctx_get0_libctx(ctx),
+            ossl_pkcs7_ctx_get0_propq(ctx), si->pkey,
+            NULL)
+        <= 0)
         goto err;
 
     alen = ASN1_item_i2d((ASN1_VALUE *)si->auth_attr, &abuf,
-                         ASN1_ITEM_rptr(PKCS7_ATTR_SIGN));
+        ASN1_ITEM_rptr(PKCS7_ATTR_SIGN));
     if (alen < 0 || abuf == NULL)
         goto err;
     if (EVP_DigestSignUpdate(mctx, abuf, alen) <= 0)
@@ -991,7 +994,7 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
 
     return 1;
 
- err:
+err:
     OPENSSL_free(abuf);
     EVP_MD_CTX_free(mctx);
     return 0;
@@ -999,7 +1002,7 @@ int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si)
 
 /* This partly overlaps with PKCS7_verify(). It does not support flags. */
 int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
-                     PKCS7 *p7, PKCS7_SIGNER_INFO *si)
+    PKCS7 *p7, PKCS7_SIGNER_INFO *si)
 {
     PKCS7_ISSUER_AND_SERIAL *ias;
     int ret = 0, i;
@@ -1053,12 +1056,12 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
     }
 
     return PKCS7_signatureVerify(bio, p7, si, signer);
- err:
+err:
     return ret;
 }
 
 int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
-                          X509 *signer)
+    X509 *signer)
 {
     ASN1_OCTET_STRING *os;
     EVP_MD_CTX *mdc_tmp, *mdc;
@@ -1089,8 +1092,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
 
     btmp = bio;
     for (;;) {
-        if ((btmp == NULL) ||
-            ((btmp = BIO_find_type(btmp, BIO_TYPE_MD)) == NULL)) {
+        if ((btmp == NULL) || ((btmp = BIO_find_type(btmp, BIO_TYPE_MD)) == NULL)) {
             ERR_raise(ERR_LIB_PKCS7, PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
             goto err;
         }
@@ -1131,8 +1133,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
             ERR_raise(ERR_LIB_PKCS7, PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST);
             goto err;
         }
-        if ((message_digest->length != (int)md_len) ||
-            (memcmp(message_digest->data, md_dat, md_len))) {
+        if ((message_digest->length != (int)md_len) || (memcmp(message_digest->data, md_dat, md_len))) {
             ERR_raise(ERR_LIB_PKCS7, PKCS7_R_DIGEST_FAILURE);
             ret = -1;
             goto err;
@@ -1153,7 +1154,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
         (void)ERR_pop_to_mark();
 
         alen = ASN1_item_i2d((ASN1_VALUE *)sk, &abuf,
-                             ASN1_ITEM_rptr(PKCS7_ATTR_VERIFY));
+            ASN1_ITEM_rptr(PKCS7_ATTR_VERIFY));
         if (alen <= 0 || abuf == NULL) {
             ERR_raise(ERR_LIB_PKCS7, ERR_R_ASN1_LIB);
             ret = -1;
@@ -1177,7 +1178,7 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
         goto err;
     }
     ret = 1;
- err:
+err:
     OPENSSL_free(abuf);
     EVP_MD_CTX_free(mdc_tmp);
     EVP_MD_free(fetched_md);
@@ -1228,11 +1229,13 @@ ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk)
     ASN1_TYPE *astype;
     if ((astype = get_attribute(sk, NID_pkcs9_messageDigest)) == NULL)
         return NULL;
+    if (astype->type != V_ASN1_OCTET_STRING)
+        return NULL;
     return astype->value.octet_string;
 }
 
 int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
-                                STACK_OF(X509_ATTRIBUTE) *sk)
+    STACK_OF(X509_ATTRIBUTE) *sk)
 {
     sk_X509_ATTRIBUTE_pop_free(p7si->auth_attr, X509_ATTRIBUTE_free);
     p7si->auth_attr = sk_X509_ATTRIBUTE_deep_copy(sk, X509_ATTRIBUTE_dup, X509_ATTRIBUTE_free);
@@ -1242,7 +1245,7 @@ int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
 }
 
 int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,
-                         STACK_OF(X509_ATTRIBUTE) *sk)
+    STACK_OF(X509_ATTRIBUTE) *sk)
 {
     sk_X509_ATTRIBUTE_pop_free(p7si->unauth_attr, X509_ATTRIBUTE_free);
     p7si->unauth_attr = sk_X509_ATTRIBUTE_deep_copy(sk, X509_ATTRIBUTE_dup, X509_ATTRIBUTE_free);
@@ -1252,19 +1255,19 @@ int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,
 }
 
 int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
-                               void *value)
+    void *value)
 {
     return add_attribute(&(p7si->auth_attr), nid, atrtype, value);
 }
 
 int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
-                        void *value)
+    void *value)
 {
     return add_attribute(&(p7si->unauth_attr), nid, atrtype, value);
 }
 
 static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
-                         void *value)
+    void *value)
 {
     X509_ATTRIBUTE *attr = NULL;
     int i, n;
@@ -1282,7 +1285,7 @@ static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
     if (!sk_X509_ATTRIBUTE_push(*sk, NULL))
         return 0;
 
- end:
+end:
     attr = X509_ATTRIBUTE_create(nid, atrtype, value);
     if (attr == NULL) {
         if (i == n)
@@ -1290,6 +1293,6 @@ static int add_attribute(STACK_OF(X509_ATTRIBUTE) **sk, int nid, int atrtype,
         return 0;
     }
     X509_ATTRIBUTE_free(sk_X509_ATTRIBUTE_value(*sk, i));
-    (void) sk_X509_ATTRIBUTE_set(*sk, i, attr);
+    (void)sk_X509_ATTRIBUTE_set(*sk, i, attr);
     return 1;
 }
diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index ab0ae39ab253d..675c694e66cd6 100644
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -42,7 +42,7 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
             }
         } else {
             ERR_raise(ERR_LIB_PKCS7,
-                      PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
+                PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
             ret = 0;
         }
         break;
@@ -56,7 +56,7 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
             p7->detached = ret;
         } else {
             ERR_raise(ERR_LIB_PKCS7,
-                      PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
+                PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
             ret = 0;
         }
 
@@ -80,7 +80,7 @@ int PKCS7_content_new(PKCS7 *p7, int type)
         goto err;
 
     return 1;
- err:
+err:
     PKCS7_free(ret);
     return 0;
 }
@@ -108,7 +108,7 @@ int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
         goto err;
     }
     return 1;
- err:
+err:
     return 0;
 }
 
@@ -119,7 +119,7 @@ int PKCS7_set_type(PKCS7 *p7, int type)
     /*
      * PKCS7_content_free(p7);
      */
-    obj = OBJ_nid2obj(type);    /* will not fail */
+    obj = OBJ_nid2obj(type); /* will not fail */
 
     switch (type) {
     case NID_pkcs7_signed:
@@ -179,7 +179,7 @@ int PKCS7_set_type(PKCS7 *p7, int type)
         goto err;
     }
     return 1;
- err:
+err:
     return 0;
 }
 
@@ -223,7 +223,7 @@ int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
             break;
         }
     }
-    if (!j) {                   /* we need to add another algorithm */
+    if (!j) { /* we need to add another algorithm */
         int nid;
 
         if ((alg = X509_ALGOR_new()) == NULL
@@ -309,7 +309,7 @@ int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
 }
 
 static int pkcs7_ecdsa_or_dsa_sign_verify_setup(PKCS7_SIGNER_INFO *si,
-                                                int verify)
+    int verify)
 {
     if (!verify) {
         int snid, hnid;
@@ -337,13 +337,13 @@ static int pkcs7_rsa_sign_verify_setup(PKCS7_SIGNER_INFO *si, int verify)
         PKCS7_SIGNER_INFO_get0_algs(si, NULL, NULL, &alg);
         if (alg != NULL)
             return X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaEncryption),
-                                   V_ASN1_NULL, NULL);
+                V_ASN1_NULL, NULL);
     }
     return 1;
 }
 
 int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
-                          const EVP_MD *dgst)
+    const EVP_MD *dgst)
 {
     int ret;
 
@@ -351,7 +351,7 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
     if (!ASN1_INTEGER_set(p7i->version, 1))
         return 0;
     if (!X509_NAME_set(&p7i->issuer_and_serial->issuer,
-                       X509_get_issuer_name(x509)))
+            X509_get_issuer_name(x509)))
         return 0;
 
     /*
@@ -359,8 +359,7 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
      * ugly way.
      */
     ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
-    if (!(p7i->issuer_and_serial->serial =
-          ASN1_INTEGER_dup(X509_get0_serialNumber(x509))))
+    if (!(p7i->issuer_and_serial->serial = ASN1_INTEGER_dup(X509_get0_serialNumber(x509))))
         return 0;
 
     /* lets keep the pkey around for a while */
@@ -372,7 +371,7 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
     /* Set the algorithms */
 
     if (!X509_ALGOR_set0(p7i->digest_alg, OBJ_nid2obj(EVP_MD_get_type(dgst)),
-                         V_ASN1_NULL, NULL))
+            V_ASN1_NULL, NULL))
         return 0;
 
     if (EVP_PKEY_is_a(pkey, "EC") || EVP_PKEY_is_a(pkey, "DSA"))
@@ -394,7 +393,7 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
 }
 
 PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey,
-                                       const EVP_MD *dgst)
+    const EVP_MD *dgst)
 {
     PKCS7_SIGNER_INFO *si = NULL;
 
@@ -416,7 +415,7 @@ PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey,
     if (!PKCS7_add_signer(p7, si))
         goto err;
     return si;
- err:
+err:
     PKCS7_SIGNER_INFO_free(si);
     return NULL;
 }
@@ -553,7 +552,7 @@ STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
 }
 
 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)
 {
     if (pk)
         *pk = si->pkey;
@@ -581,7 +580,7 @@ PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509)
         goto err;
     ri->ctx = ossl_pkcs7_get0_ctx(p7);
     return ri;
- err:
+err:
     PKCS7_RECIP_INFO_free(ri);
     return NULL;
 }
@@ -617,7 +616,7 @@ static int pkcs7_rsa_encrypt_decrypt_setup(PKCS7_RECIP_INFO *ri, int decrypt)
         PKCS7_RECIP_INFO_get0_alg(ri, &alg);
         if (alg != NULL)
             return X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaEncryption),
-                                   V_ASN1_NULL, NULL);
+                V_ASN1_NULL, NULL);
     }
     return 1;
 }
@@ -629,12 +628,11 @@ int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
     if (!ASN1_INTEGER_set(p7i->version, 0))
         return 0;
     if (!X509_NAME_set(&p7i->issuer_and_serial->issuer,
-                       X509_get_issuer_name(x509)))
+            X509_get_issuer_name(x509)))
         return 0;
 
     ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
-    if (!(p7i->issuer_and_serial->serial =
-          ASN1_INTEGER_dup(X509_get0_serialNumber(x509))))
+    if (!(p7i->issuer_and_serial->serial = ASN1_INTEGER_dup(X509_get0_serialNumber(x509))))
         return 0;
 
     pkey = X509_get0_pubkey(x509);
@@ -651,14 +649,14 @@ int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
 
     if (pkey->ameth == NULL || pkey->ameth->pkey_ctrl == NULL) {
         ERR_raise(ERR_LIB_PKCS7,
-                  PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
+            PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
         goto err;
     }
 
     ret = pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_PKCS7_ENCRYPT, 0, p7i);
     if (ret == -2) {
         ERR_raise(ERR_LIB_PKCS7,
-                  PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
+            PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
         goto err;
     }
     if (ret <= 0) {
@@ -673,7 +671,7 @@ int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
 
     return 1;
 
- err:
+err:
     return 0;
 }
 
@@ -681,9 +679,8 @@ X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
 {
     if (PKCS7_type_is_signed(p7))
         return (X509_find_by_issuer_and_serial(p7->d.sign->cert,
-                                               si->issuer_and_serial->issuer,
-                                               si->
-                                               issuer_and_serial->serial));
+            si->issuer_and_serial->issuer,
+            si->issuer_and_serial->serial));
     else
         return NULL;
 }
diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
index d23f7a869f9f5..3117c52637a74 100644
--- a/crypto/pkcs7/pk7_mime.c
+++ b/crypto/pkcs7/pk7_mime.c
@@ -18,13 +18,13 @@
 int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
 {
     return i2d_ASN1_bio_stream(out, (ASN1_VALUE *)p7, in, flags,
-                               ASN1_ITEM_rptr(PKCS7));
+        ASN1_ITEM_rptr(PKCS7));
 }
 
 int PEM_write_bio_PKCS7_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
 {
     return PEM_write_bio_ASN1_stream(out, (ASN1_VALUE *)p7, in, flags,
-                                     "PKCS7", ASN1_ITEM_rptr(PKCS7));
+        "PKCS7", ASN1_ITEM_rptr(PKCS7));
 }
 
 int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
@@ -44,9 +44,9 @@ int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
     flags ^= SMIME_OLDMIME;
 
     return SMIME_write_ASN1_ex(bio, (ASN1_VALUE *)p7, data, flags, ctype_nid,
-                               NID_undef, mdalgs, ASN1_ITEM_rptr(PKCS7),
-                               ossl_pkcs7_ctx_get0_libctx(ctx),
-                               ossl_pkcs7_ctx_get0_propq(ctx));
+        NID_undef, mdalgs, ASN1_ITEM_rptr(PKCS7),
+        ossl_pkcs7_ctx_get0_libctx(ctx),
+        ossl_pkcs7_ctx_get0_propq(ctx));
 }
 
 PKCS7 *SMIME_read_PKCS7_ex(BIO *bio, BIO **bcont, PKCS7 **p7)
@@ -61,7 +61,7 @@ PKCS7 *SMIME_read_PKCS7_ex(BIO *bio, BIO **bcont, PKCS7 **p7)
     }
 
     ret = (PKCS7 *)SMIME_read_ASN1_ex(bio, 0, bcont, ASN1_ITEM_rptr(PKCS7),
-                                      (ASN1_VALUE **)p7, libctx, propq);
+        (ASN1_VALUE **)p7, libctx, propq);
     if (ret != NULL)
         ossl_pkcs7_resolve_libctx(ret);
     return ret;
diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
index 3f9ba3b7d6df4..97f20058979f9 100644
--- a/crypto/pkcs7/pk7_smime.c
+++ b/crypto/pkcs7/pk7_smime.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-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
@@ -18,12 +18,11 @@
 
 #define BUFFERSIZE 4096
 
-
 static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si);
 
 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 *p7;
     int i;
@@ -60,18 +59,17 @@ PKCS7 *PKCS7_sign_ex(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
     if (PKCS7_final(p7, data, flags))
         return p7;
 
- err:
+err:
     PKCS7_free(p7);
     return NULL;
 }
 
 PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
-                  BIO *data, int flags)
+    BIO *data, int flags)
 {
     return PKCS7_sign_ex(signcert, pkey, certs, data, flags, NULL, NULL);
 }
 
-
 int PKCS7_final(PKCS7 *p7, BIO *data, int flags)
 {
     BIO *p7bio;
@@ -96,7 +94,6 @@ int PKCS7_final(PKCS7 *p7, BIO *data, int flags)
     BIO_free_all(p7bio);
 
     return ret;
-
 }
 
 /* Check to see if a cipher exists and if so add S/MIME capabilities */
@@ -116,15 +113,15 @@ static int add_digest_smcap(STACK_OF(X509_ALGOR) *sk, int nid, int arg)
 }
 
 PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert,
-                                         EVP_PKEY *pkey, const EVP_MD *md,
-                                         int flags)
+    EVP_PKEY *pkey, const EVP_MD *md,
+    int flags)
 {
     PKCS7_SIGNER_INFO *si = NULL;
     STACK_OF(X509_ALGOR) *smcap = NULL;
 
     if (!X509_check_private_key(signcert, pkey)) {
         ERR_raise(ERR_LIB_PKCS7,
-                  PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
+            PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
         return NULL;
     }
 
@@ -174,7 +171,7 @@ PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert,
         }
     }
     return si;
- err:
+err:
     sk_X509_ALGOR_pop_free(smcap, X509_ALGOR_free);
     return NULL;
 }
@@ -201,7 +198,6 @@ static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
             osdig = PKCS7_digest_from_attributes(sitmp->auth_attr);
             break;
         }
-
     }
 
     if (osdig != NULL)
@@ -213,7 +209,7 @@ static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
 
 /* This strongly overlaps with CMS_verify(), partly with PKCS7_dataVerify() */
 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) *signers;
     STACK_OF(X509) *included_certs;
@@ -272,7 +268,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
     /* Now verify the certificates */
     p7_ctx = ossl_pkcs7_get0_ctx(p7);
     cert_ctx = X509_STORE_CTX_new_ex(ossl_pkcs7_ctx_get0_libctx(p7_ctx),
-                                     ossl_pkcs7_ctx_get0_propq(p7_ctx));
+        ossl_pkcs7_ctx_get0_propq(p7_ctx));
     if (cert_ctx == NULL)
         goto err;
     if ((flags & PKCS7_NOVERIFY) == 0) {
@@ -281,7 +277,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
         included_certs = pkcs7_get0_certificates(p7);
         if ((flags & PKCS7_NOCHAIN) == 0
             && !ossl_x509_add_certs_new(&untrusted, included_certs,
-                                        X509_ADD_FLAG_NO_DUP))
+                X509_ADD_FLAG_NO_DUP))
             goto err;
 
         for (k = 0; k < sk_X509_num(signers); k++) {
@@ -291,7 +287,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
                 goto err;
             }
             if ((flags & PKCS7_NOCHAIN) == 0
-                    && !X509_STORE_CTX_set_default(cert_ctx, "smime_sign"))
+                && !X509_STORE_CTX_set_default(cert_ctx, "smime_sign"))
                 goto err;
             if (!(flags & PKCS7_NOCRL))
                 X509_STORE_CTX_set0_crls(cert_ctx, p7->d.sign->crl);
@@ -299,8 +295,8 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
             if (i <= 0) {
                 j = X509_STORE_CTX_get_error(cert_ctx);
                 ERR_raise_data(ERR_LIB_PKCS7, PKCS7_R_CERTIFICATE_VERIFY_ERROR,
-                               "Verify error: %s",
-                               X509_verify_cert_error_string(j));
+                    "Verify error: %s",
+                    X509_verify_cert_error_string(j));
                 goto err;
             }
             /* Check for revocation status here */
@@ -333,10 +329,8 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
     if (flags & PKCS7_TEXT) {
         if (!SMIME_text(tmpout, out)) {
             ERR_raise(ERR_LIB_PKCS7, PKCS7_R_SMIME_TEXT_ERROR);
-            BIO_free(tmpout);
             goto err;
         }
-        BIO_free(tmpout);
     }
 
     /* Now Verify All Signatures */
@@ -353,7 +347,9 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
 
     ret = 1;
 
- err:
+err:
+    if (flags & PKCS7_TEXT)
+        BIO_free(tmpout);
     X509_STORE_CTX_free(cert_ctx);
     OPENSSL_free(buf);
     if (indata != NULL)
@@ -365,7 +361,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
 }
 
 STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs,
-                                   int flags)
+    int flags)
 {
     STACK_OF(X509) *signers, *included_certs;
     STACK_OF(PKCS7_SIGNER_INFO) *sinfos;
@@ -405,10 +401,10 @@ STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs,
         signer = NULL;
         /* If any certificates passed they take priority */
         signer = X509_find_by_issuer_and_serial(certs,
-                                                ias->issuer, ias->serial);
+            ias->issuer, ias->serial);
         if (signer == NULL && (flags & PKCS7_NOINTERN) == 0)
             signer = X509_find_by_issuer_and_serial(included_certs,
-                                                    ias->issuer, ias->serial);
+                ias->issuer, ias->serial);
         if (signer == NULL) {
             ERR_raise(ERR_LIB_PKCS7, PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND);
             sk_X509_free(signers);
@@ -426,8 +422,8 @@ STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs,
 /* Build a complete PKCS#7 enveloped data */
 
 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)
 {
     PKCS7 *p7;
     BIO *p7bio = NULL;
@@ -460,21 +456,19 @@ PKCS7 *PKCS7_encrypt_ex(STACK_OF(X509) *certs, BIO *in,
     if (PKCS7_final(p7, in, flags))
         return p7;
 
- err:
+err:
 
     BIO_free_all(p7bio);
     PKCS7_free(p7);
     return NULL;
-
 }
 
 PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher,
-                     int flags)
+    int flags)
 {
     return PKCS7_encrypt_ex(certs, in, cipher, flags, NULL, NULL);
 }
 
-
 int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)
 {
     BIO *tmpmem;
@@ -494,7 +488,7 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)
 
     if (cert && !X509_check_private_key(cert, pkey)) {
         ERR_raise(ERR_LIB_PKCS7,
-                  PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
+            PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
         return 0;
     }
 
diff --git a/crypto/pkcs7/pkcs7err.c b/crypto/pkcs7/pkcs7err.c
index cd839511e31c7..45494a976864e 100644
--- a/crypto/pkcs7/pkcs7err.c
+++ b/crypto/pkcs7/pkcs7err.c
@@ -15,75 +15,75 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA PKCS7_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CERTIFICATE_VERIFY_ERROR),
-    "certificate verify error"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER),
-    "cipher has no object identifier"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CIPHER_NOT_INITIALIZED),
-    "cipher not initialized"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CONTENT_AND_DATA_PRESENT),
-    "content and data present"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CTRL_ERROR), "ctrl error"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_DECRYPT_ERROR), "decrypt error"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_DIGEST_FAILURE), "digest failure"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ENCRYPTION_CTRL_FAILURE),
-    "encryption ctrl failure"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),
-    "encryption not supported for this key type"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ERROR_ADDING_RECIPIENT),
-    "error adding recipient"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ERROR_SETTING_CIPHER),
-    "error setting cipher"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_INVALID_NULL_POINTER),
-    "invalid null pointer"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_INVALID_SIGNED_DATA_TYPE),
-    "invalid signed data type"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_CONTENT), "no content"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_DEFAULT_DIGEST),
-    "no default digest"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND),
-    "no matching digest type found"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE),
-    "no recipient matches certificate"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_SIGNATURES_ON_DATA),
-    "no signatures on data"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_SIGNERS), "no signers"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE),
-    "operation not supported on this type"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR),
-    "pkcs7 add signature error"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PKCS7_ADD_SIGNER_ERROR),
-    "pkcs7 add signer error"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PKCS7_DATASIGN), "pkcs7 datasign"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
-    "private key does not match certificate"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNATURE_FAILURE),
-    "signature failure"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND),
-    "signer certificate not found"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNING_CTRL_FAILURE),
-    "signing ctrl failure"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),
-    "signing not supported for this key type"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SMIME_TEXT_ERROR), "smime text error"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNABLE_TO_FIND_CERTIFICATE),
-    "unable to find certificate"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNABLE_TO_FIND_MEM_BIO),
-    "unable to find mem bio"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST),
-    "unable to find message digest"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNKNOWN_DIGEST_TYPE),
-    "unknown digest type"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNKNOWN_OPERATION),
-    "unknown operation"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNSUPPORTED_CIPHER_TYPE),
-    "unsupported cipher type"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNSUPPORTED_CONTENT_TYPE),
-    "unsupported content type"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_WRONG_CONTENT_TYPE),
-    "wrong content type"},
-    {ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_WRONG_PKCS7_TYPE), "wrong pkcs7 type"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CERTIFICATE_VERIFY_ERROR),
+        "certificate verify error" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER),
+        "cipher has no object identifier" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CIPHER_NOT_INITIALIZED),
+        "cipher not initialized" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CONTENT_AND_DATA_PRESENT),
+        "content and data present" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_CTRL_ERROR), "ctrl error" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_DECRYPT_ERROR), "decrypt error" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_DIGEST_FAILURE), "digest failure" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ENCRYPTION_CTRL_FAILURE),
+        "encryption ctrl failure" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),
+        "encryption not supported for this key type" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ERROR_ADDING_RECIPIENT),
+        "error adding recipient" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_ERROR_SETTING_CIPHER),
+        "error setting cipher" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_INVALID_NULL_POINTER),
+        "invalid null pointer" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_INVALID_SIGNED_DATA_TYPE),
+        "invalid signed data type" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_CONTENT), "no content" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_DEFAULT_DIGEST),
+        "no default digest" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND),
+        "no matching digest type found" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE),
+        "no recipient matches certificate" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_SIGNATURES_ON_DATA),
+        "no signatures on data" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_NO_SIGNERS), "no signers" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE),
+        "operation not supported on this type" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR),
+        "pkcs7 add signature error" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PKCS7_ADD_SIGNER_ERROR),
+        "pkcs7 add signer error" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PKCS7_DATASIGN), "pkcs7 datasign" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
+        "private key does not match certificate" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNATURE_FAILURE),
+        "signature failure" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND),
+        "signer certificate not found" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNING_CTRL_FAILURE),
+        "signing ctrl failure" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),
+        "signing not supported for this key type" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_SMIME_TEXT_ERROR), "smime text error" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNABLE_TO_FIND_CERTIFICATE),
+        "unable to find certificate" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNABLE_TO_FIND_MEM_BIO),
+        "unable to find mem bio" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST),
+        "unable to find message digest" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNKNOWN_DIGEST_TYPE),
+        "unknown digest type" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNKNOWN_OPERATION),
+        "unknown operation" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNSUPPORTED_CIPHER_TYPE),
+        "unsupported cipher type" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_UNSUPPORTED_CONTENT_TYPE),
+        "unsupported content type" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_WRONG_CONTENT_TYPE),
+        "wrong content type" },
+    { ERR_PACK(ERR_LIB_PKCS7, 0, PKCS7_R_WRONG_PKCS7_TYPE), "wrong pkcs7 type" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/poly1305/poly1305.c b/crypto/poly1305/poly1305.c
index 693decd4ee8e6..8836dbf79ae41 100644
--- a/crypto/poly1305/poly1305.c
+++ b/crypto/poly1305/poly1305.c
@@ -21,10 +21,7 @@ size_t Poly1305_ctx_size(void)
 /* pick 32-bit unsigned integer in little endian order */
 static unsigned int U8TOU32(const unsigned char *p)
 {
-    return (((unsigned int)(p[0] & 0xff)) |
-            ((unsigned int)(p[1] & 0xff) << 8) |
-            ((unsigned int)(p[2] & 0xff) << 16) |
-            ((unsigned int)(p[3] & 0xff) << 24));
+    return (((unsigned int)(p[0] & 0xff)) | ((unsigned int)(p[1] & 0xff) << 8) | ((unsigned int)(p[2] & 0xff) << 16) | ((unsigned int)(p[3] & 0xff) << 24));
 }
 
 /*
@@ -90,11 +87,10 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit);
 /*
  * Type-agnostic "rip-off" from constant_time.h
  */
-# define CONSTANT_TIME_CARRY(a,b) ( \
-         (a ^ ((a ^ b) | ((a - b) ^ b))) >> (sizeof(a) * 8 - 1) \
-         )
+#define CONSTANT_TIME_CARRY(a, b) ( \
+    (a ^ ((a ^ b) | ((a - b) ^ b))) >> (sizeof(a) * 8 - 1))
 
-# if defined(INT64_MAX) && defined(INT128_MAX)
+#if defined(INT64_MAX) && defined(INT128_MAX)
 
 typedef unsigned long u64;
 typedef uint128_t u128;
@@ -107,14 +103,7 @@ typedef struct {
 /* pick 32-bit unsigned integer in little endian order */
 static u64 U8TOU64(const unsigned char *p)
 {
-    return (((u64)(p[0] & 0xff)) |
-            ((u64)(p[1] & 0xff) << 8) |
-            ((u64)(p[2] & 0xff) << 16) |
-            ((u64)(p[3] & 0xff) << 24) |
-            ((u64)(p[4] & 0xff) << 32) |
-            ((u64)(p[5] & 0xff) << 40) |
-            ((u64)(p[6] & 0xff) << 48) |
-            ((u64)(p[7] & 0xff) << 56));
+    return (((u64)(p[0] & 0xff)) | ((u64)(p[1] & 0xff) << 8) | ((u64)(p[2] & 0xff) << 16) | ((u64)(p[3] & 0xff) << 24) | ((u64)(p[4] & 0xff) << 32) | ((u64)(p[5] & 0xff) << 40) | ((u64)(p[6] & 0xff) << 48) | ((u64)(p[7] & 0xff) << 56));
 }
 
 /* store a 32-bit unsigned integer in little endian */
@@ -132,7 +121,7 @@ static void U64TO8(unsigned char *p, u64 v)
 
 static void poly1305_init(void *ctx, const unsigned char key[16])
 {
-    poly1305_internal *st = (poly1305_internal *) ctx;
+    poly1305_internal *st = (poly1305_internal *)ctx;
 
     /* h = 0 */
     st->h[0] = 0;
@@ -173,11 +162,8 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit)
         h2 += (u64)(d1 >> 64) + padbit;
 
         /* h *= r "%" p, where "%" stands for "partial remainder" */
-        d0 = ((u128)h0 * r0) +
-             ((u128)h1 * s1);
-        d1 = ((u128)h0 * r1) +
-             ((u128)h1 * r0) +
-             (h2 * s1);
+        d0 = ((u128)h0 * r0) + ((u128)h1 * s1);
+        d1 = ((u128)h0 * r1) + ((u128)h1 * r0) + (h2 * s1);
         h2 = (h2 * r0);
 
         /* last reduction step: */
@@ -189,8 +175,8 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit)
         c = (h2 >> 2) + (h2 & ~3UL);
         h2 &= 3;
         h0 += c;
-        h1 += (c = CONSTANT_TIME_CARRY(h0,c));
-        h2 += CONSTANT_TIME_CARRY(h1,c);
+        h1 += (c = CONSTANT_TIME_CARRY(h0, c));
+        h2 += CONSTANT_TIME_CARRY(h1, c);
         /*
          * Occasional overflows to 3rd bit of h2 are taken care of
          * "naturally". If after this point we end up at the top of
@@ -211,9 +197,9 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit)
 }
 
 static void poly1305_emit(void *ctx, unsigned char mac[16],
-                          const u32 nonce[4])
+    const u32 nonce[4])
 {
-    poly1305_internal *st = (poly1305_internal *) ctx;
+    poly1305_internal *st = (poly1305_internal *)ctx;
     u64 h0, h1, h2;
     u64 g0, g1, g2;
     u128 t;
@@ -237,22 +223,22 @@ static void poly1305_emit(void *ctx, unsigned char mac[16],
     h1 = (h1 & mask) | g1;
 
     /* mac = (h + nonce) % (2^128) */
-    h0 = (u64)(t = (u128)h0 + nonce[0] + ((u64)nonce[1]<<32));
-    h1 = (u64)(t = (u128)h1 + nonce[2] + ((u64)nonce[3]<<32) + (t >> 64));
+    h0 = (u64)(t = (u128)h0 + nonce[0] + ((u64)nonce[1] << 32));
+    h1 = (u64)(t = (u128)h1 + nonce[2] + ((u64)nonce[3] << 32) + (t >> 64));
 
     U64TO8(mac + 0, h0);
     U64TO8(mac + 8, h1);
 }
 
-# else
+#else
 
-#  if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__MINGW32__)
 typedef unsigned __int64 u64;
-#  elif defined(__arch64__)
+#elif defined(__arch64__)
 typedef unsigned long u64;
-#  else
+#else
 typedef unsigned long long u64;
-#  endif
+#endif
 
 typedef struct {
     u32 h[5];
@@ -270,7 +256,7 @@ static void U32TO8(unsigned char *p, unsigned int v)
 
 static void poly1305_init(void *ctx, const unsigned char key[16])
 {
-    poly1305_internal *st = (poly1305_internal *) ctx;
+    poly1305_internal *st = (poly1305_internal *)ctx;
 
     /* h = 0 */
     st->h[0] = 0;
@@ -319,25 +305,10 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit)
         h4 += (u32)(d3 >> 32) + padbit;
 
         /* h *= r "%" p, where "%" stands for "partial remainder" */
-        d0 = ((u64)h0 * r0) +
-             ((u64)h1 * s3) +
-             ((u64)h2 * s2) +
-             ((u64)h3 * s1);
-        d1 = ((u64)h0 * r1) +
-             ((u64)h1 * r0) +
-             ((u64)h2 * s3) +
-             ((u64)h3 * s2) +
-             (h4 * s1);
-        d2 = ((u64)h0 * r2) +
-             ((u64)h1 * r1) +
-             ((u64)h2 * r0) +
-             ((u64)h3 * s3) +
-             (h4 * s2);
-        d3 = ((u64)h0 * r3) +
-             ((u64)h1 * r2) +
-             ((u64)h2 * r1) +
-             ((u64)h3 * r0) +
-             (h4 * s3);
+        d0 = ((u64)h0 * r0) + ((u64)h1 * s3) + ((u64)h2 * s2) + ((u64)h3 * s1);
+        d1 = ((u64)h0 * r1) + ((u64)h1 * r0) + ((u64)h2 * s3) + ((u64)h3 * s2) + (h4 * s1);
+        d2 = ((u64)h0 * r2) + ((u64)h1 * r1) + ((u64)h2 * r0) + ((u64)h3 * s3) + (h4 * s2);
+        d3 = ((u64)h0 * r3) + ((u64)h1 * r2) + ((u64)h2 * r1) + ((u64)h3 * r0) + (h4 * s3);
         h4 = (h4 * r0);
 
         /* last reduction step: */
@@ -351,10 +322,10 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit)
         c = (h4 >> 2) + (h4 & ~3U);
         h4 &= 3;
         h0 += c;
-        h1 += (c = CONSTANT_TIME_CARRY(h0,c));
-        h2 += (c = CONSTANT_TIME_CARRY(h1,c));
-        h3 += (c = CONSTANT_TIME_CARRY(h2,c));
-        h4 += CONSTANT_TIME_CARRY(h3,c);
+        h1 += (c = CONSTANT_TIME_CARRY(h0, c));
+        h2 += (c = CONSTANT_TIME_CARRY(h1, c));
+        h3 += (c = CONSTANT_TIME_CARRY(h2, c));
+        h4 += CONSTANT_TIME_CARRY(h3, c);
         /*
          * Occasional overflows to 3rd bit of h4 are taken care of
          * "naturally". If after this point we end up at the top of
@@ -377,9 +348,9 @@ poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit)
 }
 
 static void poly1305_emit(void *ctx, unsigned char mac[16],
-                          const u32 nonce[4])
+    const u32 nonce[4])
 {
-    poly1305_internal *st = (poly1305_internal *) ctx;
+    poly1305_internal *st = (poly1305_internal *)ctx;
     u32 h0, h1, h2, h3, h4;
     u32 g0, g1, g2, g3, g4;
     u64 t;
@@ -421,13 +392,13 @@ static void poly1305_emit(void *ctx, unsigned char mac[16],
     U32TO8(mac + 8, h2);
     U32TO8(mac + 12, h3);
 }
-# endif
+#endif
 #else
 int poly1305_init(void *ctx, const unsigned char key[16], void *func);
 void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
-                     unsigned int padbit);
+    unsigned int padbit);
 void poly1305_emit(void *ctx, unsigned char mac[16],
-                   const unsigned int nonce[4]);
+    const unsigned int nonce[4]);
 #endif
 
 void Poly1305_Init(POLY1305 *ctx, const unsigned char key[32])
@@ -453,7 +424,6 @@ void Poly1305_Init(POLY1305 *ctx, const unsigned char key[32])
 #endif
 
     ctx->num = 0;
-
 }
 
 #ifdef POLY1305_ASM
@@ -461,8 +431,8 @@ void Poly1305_Init(POLY1305 *ctx, const unsigned char key[32])
  * This "eclipses" poly1305_blocks and poly1305_emit, but it's
  * conscious choice imposed by -Wshadow compiler warnings.
  */
-# define poly1305_blocks (*poly1305_blocks_p)
-# define poly1305_emit   (*poly1305_emit_p)
+#define poly1305_blocks (*poly1305_blocks_p)
+#define poly1305_emit (*poly1305_emit_p)
 #endif
 
 void Poly1305_Update(POLY1305 *ctx, const unsigned char *inp, size_t len)
@@ -516,7 +486,7 @@ void Poly1305_Final(POLY1305 *ctx, unsigned char mac[16])
     size_t num;
 
     if ((num = ctx->num)) {
-        ctx->data[num++] = 1;   /* pad bit */
+        ctx->data[num++] = 1; /* pad bit */
         while (num < POLY1305_BLOCK_SIZE)
             ctx->data[num++] = 0;
         poly1305_blocks(ctx->opaque, ctx->data, POLY1305_BLOCK_SIZE, 0);
diff --git a/crypto/poly1305/poly1305_base2_44.c b/crypto/poly1305/poly1305_base2_44.c
index a71e5e86e6b96..7e28970fbe77e 100644
--- a/crypto/poly1305/poly1305_base2_44.c
+++ b/crypto/poly1305/poly1305_base2_44.c
@@ -31,14 +31,7 @@ typedef struct {
 /* pick 64-bit unsigned integer in little endian order */
 static u64 U8TOU64(const unsigned char *p)
 {
-    return (((u64)(p[0] & 0xff)) |
-            ((u64)(p[1] & 0xff) << 8) |
-            ((u64)(p[2] & 0xff) << 16) |
-            ((u64)(p[3] & 0xff) << 24) |
-            ((u64)(p[4] & 0xff) << 32) |
-            ((u64)(p[5] & 0xff) << 40) |
-            ((u64)(p[6] & 0xff) << 48) |
-            ((u64)(p[7] & 0xff) << 56));
+    return (((u64)(p[0] & 0xff)) | ((u64)(p[1] & 0xff) << 8) | ((u64)(p[2] & 0xff) << 16) | ((u64)(p[3] & 0xff) << 24) | ((u64)(p[4] & 0xff) << 32) | ((u64)(p[5] & 0xff) << 40) | ((u64)(p[6] & 0xff) << 48) | ((u64)(p[7] & 0xff) << 56));
 }
 
 /* store a 64-bit unsigned integer in little endian */
@@ -69,7 +62,7 @@ int poly1305_init(void *ctx, const unsigned char key[16])
 
     /* break r1:r0 to three 44-bit digits, masks are 1<<44-1 */
     st->r[0] = r0 & 0x0fffffffffff;
-    st->r[1] = ((r0 >> 44) | (r1 << 20))  & 0x0fffffffffff;
+    st->r[1] = ((r0 >> 44) | (r1 << 20)) & 0x0fffffffffff;
     st->r[2] = (r1 >> 24);
 
     st->s[0] = (st->r[1] + (st->r[1] << 2)) << 2;
@@ -79,7 +72,7 @@ int poly1305_init(void *ctx, const unsigned char key[16])
 }
 
 void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
-                     u32 padbit)
+    u32 padbit)
 {
     poly1305_internal *st = (poly1305_internal *)ctx;
     u64 r0, r1, r2;
@@ -107,8 +100,8 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
 
         /* h += m[i], m[i] is broken to 44-bit digits */
         h0 += m0 & 0x0fffffffffff;
-        h1 += ((m0 >> 44) | (m1 << 20))  & 0x0fffffffffff;
-        h2 +=  (m1 >> 24) + pad;
+        h1 += ((m0 >> 44) | (m1 << 20)) & 0x0fffffffffff;
+        h2 += (m1 >> 24) + pad;
 
         /* h *= r "%" p, where "%" stands for "partial remainder" */
         d0 = ((u128)h0 * r0) + ((u128)h1 * s2) + ((u128)h2 * s1);
@@ -134,7 +127,7 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
 
 void poly1305_emit(void *ctx, unsigned char mac[16], const u32 nonce[4])
 {
-    poly1305_internal *st = (poly1305_internal *) ctx;
+    poly1305_internal *st = (poly1305_internal *)ctx;
     u64 h0, h1, h2;
     u64 g0, g1, g2;
     u128 t;
@@ -145,8 +138,10 @@ void poly1305_emit(void *ctx, unsigned char mac[16], const u32 nonce[4])
     h2 = st->h[2];
 
     /* after "lazy" reduction, convert 44+bit digits to 64-bit ones */
-    h0 = (u64)(t = (u128)h0 + (h1 << 44));              h1 >>= 20;
-    h1 = (u64)(t = (u128)h1 + (h2 << 24) + (t >> 64));  h2 >>= 40;
+    h0 = (u64)(t = (u128)h0 + (h1 << 44));
+    h1 >>= 20;
+    h1 = (u64)(t = (u128)h1 + (h2 << 24) + (t >> 64));
+    h2 >>= 40;
     h2 += (u64)(t >> 64);
 
     /* compare to modulus by computing h + -p */
@@ -163,8 +158,8 @@ void poly1305_emit(void *ctx, unsigned char mac[16], const u32 nonce[4])
     h1 = (h1 & mask) | g1;
 
     /* mac = (h + nonce) % (2^128) */
-    h0 = (u64)(t = (u128)h0 + nonce[0] + ((u64)nonce[1]<<32));
-    h1 = (u64)(t = (u128)h1 + nonce[2] + ((u64)nonce[3]<<32) + (t >> 64));
+    h0 = (u64)(t = (u128)h0 + nonce[0] + ((u64)nonce[1] << 32));
+    h1 = (u64)(t = (u128)h1 + nonce[2] + ((u64)nonce[3] << 32) + (t >> 64));
 
     U64TO8(mac + 0, h0);
     U64TO8(mac + 8, h1);
diff --git a/crypto/poly1305/poly1305_ieee754.c b/crypto/poly1305/poly1305_ieee754.c
index 57a08aa248bb8..bd7426466e588 100644
--- a/crypto/poly1305/poly1305_ieee754.c
+++ b/crypto/poly1305/poly1305_ieee754.c
@@ -46,8 +46,8 @@
  * SPARC T4             16.1
  */
 
-#if !(defined(__GNUC__) && __GNUC__>=2)
-# error "this is gcc-specific template"
+#if !(defined(__GNUC__) && __GNUC__ >= 2)
+#error "this is gcc-specific template"
 #endif
 
 #include <stdlib.h>
@@ -55,35 +55,37 @@
 typedef unsigned char u8;
 typedef unsigned int u32;
 typedef unsigned long long u64;
-typedef union { double d; u64 u; } elem64;
+typedef union {
+    double d;
+    u64 u;
+} elem64;
 
-#define TWO(p)          ((double)(1ULL<<(p)))
-#define TWO0            TWO(0)
-#define TWO32           TWO(32)
-#define TWO64           (TWO32*TWO(32))
-#define TWO96           (TWO64*TWO(32))
-#define TWO130          (TWO96*TWO(34))
+#define TWO(p) ((double)(1ULL << (p)))
+#define TWO0 TWO(0)
+#define TWO32 TWO(32)
+#define TWO64 (TWO32 * TWO(32))
+#define TWO96 (TWO64 * TWO(32))
+#define TWO130 (TWO96 * TWO(34))
 
-#define EXP(p)          ((1023ULL+(p))<<52)
+#define EXP(p) ((1023ULL + (p)) << 52)
 
 #if defined(__x86_64__) || (defined(__PPC__) && defined(__LITTLE_ENDIAN__))
-# define U8TOU32(p)     (*(const u32 *)(p))
-# define U32TO8(p,v)    (*(u32 *)(p) = (v))
+#define U8TOU32(p) (*(const u32 *)(p))
+#define U32TO8(p, v) (*(u32 *)(p) = (v))
 #elif defined(__PPC__) || defined(__POWERPC__)
-# define U8TOU32(p)     ({u32 ret; asm ("lwbrx	%0,0,%1":"=r"(ret):"b"(p)); ret; })
-# define U32TO8(p,v)    asm ("stwbrx %0,0,%1"::"r"(v),"b"(p):"memory")
+#define U8TOU32(p) ({u32 ret; asm ("lwbrx	%0,0,%1":"=r"(ret):"b"(p)); ret; })
+#define U32TO8(p, v) asm("stwbrx %0,0,%1" ::"r"(v), "b"(p) : "memory")
 #elif defined(__s390x__)
-# define U8TOU32(p)     ({u32 ret; asm ("lrv	%0,%1":"=d"(ret):"m"(*(u32 *)(p))); ret; })
-# define U32TO8(p,v)    asm ("strv	%1,%0":"=m"(*(u32 *)(p)):"d"(v))
+#define U8TOU32(p) ({u32 ret; asm ("lrv	%0,%1":"=d"(ret):"m"(*(u32 *)(p))); ret; })
+#define U32TO8(p, v) asm("strv	%1,%0" : "=m"(*(u32 *)(p)) : "d"(v))
 #endif
 
 #ifndef U8TOU32
-# define U8TOU32(p)     ((u32)(p)[0]     | (u32)(p)[1]<<8 |     \
-                         (u32)(p)[2]<<16 | (u32)(p)[3]<<24  )
+#define U8TOU32(p) ((u32)(p)[0] | (u32)(p)[1] << 8 | (u32)(p)[2] << 16 | (u32)(p)[3] << 24)
 #endif
 #ifndef U32TO8
-# define U32TO8(p,v)    ((p)[0] = (u8)(v),       (p)[1] = (u8)((v)>>8), \
-                         (p)[2] = (u8)((v)>>16), (p)[3] = (u8)((v)>>24) )
+#define U32TO8(p, v) ((p)[0] = (u8)(v), (p)[1] = (u8)((v) >> 8), \
+    (p)[2] = (u8)((v) >> 16), (p)[3] = (u8)((v) >> 24))
 #endif
 
 typedef struct {
@@ -100,7 +102,7 @@ static const u64 one = 1;
 #elif defined(__s390x__)
 static const u32 fpc = 1;
 #elif defined(__sparc__)
-static const u64 fsr = 1ULL<<30;
+static const u64 fsr = 1ULL << 30;
 #elif defined(__mips__)
 static const u32 fcsr = 1;
 #else
@@ -109,7 +111,7 @@ static const u32 fcsr = 1;
 
 int poly1305_init(void *ctx, const unsigned char key[16])
 {
-    poly1305_internal *st = (poly1305_internal *) ctx;
+    poly1305_internal *st = (poly1305_internal *)ctx;
     elem64 r0, r1, r2, r3;
 
     /* h = 0, biased */
@@ -119,10 +121,10 @@ int poly1305_init(void *ctx, const unsigned char key[16])
     st->h[2].d = TWO(52)*TWO64;
     st->h[3].d = TWO(52)*TWO96;
 #else
-    st->h[0].u = EXP(52+0);
-    st->h[1].u = EXP(52+32);
-    st->h[2].u = EXP(52+64);
-    st->h[3].u = EXP(52+96);
+    st->h[0].u = EXP(52 + 0);
+    st->h[1].u = EXP(52 + 32);
+    st->h[2].u = EXP(52 + 64);
+    st->h[3].u = EXP(52 + 96);
 #endif
 
     if (key) {
@@ -132,89 +134,82 @@ int poly1305_init(void *ctx, const unsigned char key[16])
 #if defined(__x86_64__)
         u32 mxcsr_orig;
 
-        asm volatile ("stmxcsr	%0":"=m"(mxcsr_orig));
-        asm volatile ("ldmxcsr	%0"::"m"(mxcsr));
+        asm volatile("stmxcsr	%0" : "=m"(mxcsr_orig));
+        asm volatile("ldmxcsr	%0" ::"m"(mxcsr));
 #elif defined(__PPC__) || defined(__POWERPC__)
         double fpscr_orig, fpscr = *(double *)&one;
 
-        asm volatile ("mffs	%0":"=f"(fpscr_orig));
-        asm volatile ("mtfsf	255,%0"::"f"(fpscr));
+        asm volatile("mffs	%0" : "=f"(fpscr_orig));
+        asm volatile("mtfsf	255,%0" ::"f"(fpscr));
 #elif defined(__s390x__)
         u32 fpc_orig;
 
-        asm volatile ("stfpc	%0":"=m"(fpc_orig));
-        asm volatile ("lfpc	%0"::"m"(fpc));
+        asm volatile("stfpc	%0" : "=m"(fpc_orig));
+        asm volatile("lfpc	%0" ::"m"(fpc));
 #elif defined(__sparc__)
         u64 fsr_orig;
 
-        asm volatile ("stx	%%fsr,%0":"=m"(fsr_orig));
-        asm volatile ("ldx	%0,%%fsr"::"m"(fsr));
+        asm volatile("stx	%%fsr,%0" : "=m"(fsr_orig));
+        asm volatile("ldx	%0,%%fsr" ::"m"(fsr));
 #elif defined(__mips__)
         u32 fcsr_orig;
 
-        asm volatile ("cfc1	%0,$31":"=r"(fcsr_orig));
-        asm volatile ("ctc1	%0,$31"::"r"(fcsr));
+        asm volatile("cfc1	%0,$31" : "=r"(fcsr_orig));
+        asm volatile("ctc1	%0,$31" ::"r"(fcsr));
 #endif
 
         /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
-        r0.u = EXP(52+0)  | (U8TOU32(&key[0])  & 0x0fffffff);
-        r1.u = EXP(52+32) | (U8TOU32(&key[4])  & 0x0ffffffc);
-        r2.u = EXP(52+64) | (U8TOU32(&key[8])  & 0x0ffffffc);
-        r3.u = EXP(52+96) | (U8TOU32(&key[12]) & 0x0ffffffc);
+        r0.u = EXP(52 + 0) | (U8TOU32(&key[0]) & 0x0fffffff);
+        r1.u = EXP(52 + 32) | (U8TOU32(&key[4]) & 0x0ffffffc);
+        r2.u = EXP(52 + 64) | (U8TOU32(&key[8]) & 0x0ffffffc);
+        r3.u = EXP(52 + 96) | (U8TOU32(&key[12]) & 0x0ffffffc);
 
-        st->r[0] = r0.d - TWO(52)*TWO0;
-        st->r[2] = r1.d - TWO(52)*TWO32;
-        st->r[4] = r2.d - TWO(52)*TWO64;
-        st->r[6] = r3.d - TWO(52)*TWO96;
+        st->r[0] = r0.d - TWO(52) * TWO0;
+        st->r[2] = r1.d - TWO(52) * TWO32;
+        st->r[4] = r2.d - TWO(52) * TWO64;
+        st->r[6] = r3.d - TWO(52) * TWO96;
 
-        st->s[0] = st->r[2] * (5.0/TWO130);
-        st->s[2] = st->r[4] * (5.0/TWO130);
-        st->s[4] = st->r[6] * (5.0/TWO130);
+        st->s[0] = st->r[2] * (5.0 / TWO130);
+        st->s[2] = st->r[4] * (5.0 / TWO130);
+        st->s[4] = st->r[6] * (5.0 / TWO130);
 
         /*
          * base 2^32 -> base 2^16
          */
-        st->r[1] = (st->r[0] + TWO(52)*TWO(16)*TWO0) -
-                               TWO(52)*TWO(16)*TWO0;
+        st->r[1] = (st->r[0] + TWO(52) * TWO(16) * TWO0) - TWO(52) * TWO(16) * TWO0;
         st->r[0] -= st->r[1];
 
-        st->r[3] = (st->r[2] + TWO(52)*TWO(16)*TWO32) -
-                               TWO(52)*TWO(16)*TWO32;
+        st->r[3] = (st->r[2] + TWO(52) * TWO(16) * TWO32) - TWO(52) * TWO(16) * TWO32;
         st->r[2] -= st->r[3];
 
-        st->r[5] = (st->r[4] + TWO(52)*TWO(16)*TWO64) -
-                               TWO(52)*TWO(16)*TWO64;
+        st->r[5] = (st->r[4] + TWO(52) * TWO(16) * TWO64) - TWO(52) * TWO(16) * TWO64;
         st->r[4] -= st->r[5];
 
-        st->r[7] = (st->r[6] + TWO(52)*TWO(16)*TWO96) -
-                               TWO(52)*TWO(16)*TWO96;
+        st->r[7] = (st->r[6] + TWO(52) * TWO(16) * TWO96) - TWO(52) * TWO(16) * TWO96;
         st->r[6] -= st->r[7];
 
-        st->s[1] = (st->s[0] + TWO(52)*TWO(16)*TWO0/TWO96) -
-                               TWO(52)*TWO(16)*TWO0/TWO96;
+        st->s[1] = (st->s[0] + TWO(52) * TWO(16) * TWO0 / TWO96) - TWO(52) * TWO(16) * TWO0 / TWO96;
         st->s[0] -= st->s[1];
 
-        st->s[3] = (st->s[2] + TWO(52)*TWO(16)*TWO32/TWO96) -
-                               TWO(52)*TWO(16)*TWO32/TWO96;
+        st->s[3] = (st->s[2] + TWO(52) * TWO(16) * TWO32 / TWO96) - TWO(52) * TWO(16) * TWO32 / TWO96;
         st->s[2] -= st->s[3];
 
-        st->s[5] = (st->s[4] + TWO(52)*TWO(16)*TWO64/TWO96) -
-                               TWO(52)*TWO(16)*TWO64/TWO96;
+        st->s[5] = (st->s[4] + TWO(52) * TWO(16) * TWO64 / TWO96) - TWO(52) * TWO(16) * TWO64 / TWO96;
         st->s[4] -= st->s[5];
 
         /*
          * restore original FPU control register
          */
 #if defined(__x86_64__)
-        asm volatile ("ldmxcsr	%0"::"m"(mxcsr_orig));
+        asm volatile("ldmxcsr	%0" ::"m"(mxcsr_orig));
 #elif defined(__PPC__) || defined(__POWERPC__)
-        asm volatile ("mtfsf	255,%0"::"f"(fpscr_orig));
+        asm volatile("mtfsf	255,%0" ::"f"(fpscr_orig));
 #elif defined(__s390x__)
-        asm volatile ("lfpc	%0"::"m"(fpc_orig));
+        asm volatile("lfpc	%0" ::"m"(fpc_orig));
 #elif defined(__sparc__)
-        asm volatile ("ldx	%0,%%fsr"::"m"(fsr_orig));
+        asm volatile("ldx	%0,%%fsr" ::"m"(fsr_orig));
 #elif defined(__mips__)
-        asm volatile ("ctc1	%0,$31"::"r"(fcsr_orig));
+        asm volatile("ctc1	%0,$31" ::"r"(fcsr_orig));
 #endif
     }
 
@@ -222,11 +217,11 @@ int poly1305_init(void *ctx, const unsigned char key[16])
 }
 
 void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
-                     int padbit)
+    int padbit)
 {
     poly1305_internal *st = (poly1305_internal *)ctx;
     elem64 in0, in1, in2, in3;
-    u64 pad = (u64)padbit<<32;
+    u64 pad = (u64)padbit << 32;
 
     double x0, x1, x2, x3;
     double h0lo, h0hi, h1lo, h1hi, h2lo, h2hi, h3lo, h3hi;
@@ -254,37 +249,37 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
 #if defined(__x86_64__)
     u32 mxcsr_orig;
 
-    asm volatile ("stmxcsr	%0":"=m"(mxcsr_orig));
-    asm volatile ("ldmxcsr	%0"::"m"(mxcsr));
+    asm volatile("stmxcsr	%0" : "=m"(mxcsr_orig));
+    asm volatile("ldmxcsr	%0" ::"m"(mxcsr));
 #elif defined(__PPC__) || defined(__POWERPC__)
     double fpscr_orig, fpscr = *(double *)&one;
 
-    asm volatile ("mffs		%0":"=f"(fpscr_orig));
-    asm volatile ("mtfsf	255,%0"::"f"(fpscr));
+    asm volatile("mffs		%0" : "=f"(fpscr_orig));
+    asm volatile("mtfsf	255,%0" ::"f"(fpscr));
 #elif defined(__s390x__)
     u32 fpc_orig;
 
-    asm volatile ("stfpc	%0":"=m"(fpc_orig));
-    asm volatile ("lfpc		%0"::"m"(fpc));
+    asm volatile("stfpc	%0" : "=m"(fpc_orig));
+    asm volatile("lfpc		%0" ::"m"(fpc));
 #elif defined(__sparc__)
     u64 fsr_orig;
 
-    asm volatile ("stx		%%fsr,%0":"=m"(fsr_orig));
-    asm volatile ("ldx		%0,%%fsr"::"m"(fsr));
+    asm volatile("stx		%%fsr,%0" : "=m"(fsr_orig));
+    asm volatile("ldx		%0,%%fsr" ::"m"(fsr));
 #elif defined(__mips__)
     u32 fcsr_orig;
 
-    asm volatile ("cfc1		%0,$31":"=r"(fcsr_orig));
-    asm volatile ("ctc1		%0,$31"::"r"(fcsr));
+    asm volatile("cfc1		%0,$31" : "=r"(fcsr_orig));
+    asm volatile("ctc1		%0,$31" ::"r"(fcsr));
 #endif
 
     /*
      * load base 2^32 and de-bias
      */
-    h0lo = st->h[0].d - TWO(52)*TWO0;
-    h1lo = st->h[1].d - TWO(52)*TWO32;
-    h2lo = st->h[2].d - TWO(52)*TWO64;
-    h3lo = st->h[3].d - TWO(52)*TWO96;
+    h0lo = st->h[0].d - TWO(52) * TWO0;
+    h1lo = st->h[1].d - TWO(52) * TWO32;
+    h2lo = st->h[2].d - TWO(52) * TWO64;
+    h3lo = st->h[3].d - TWO(52) * TWO96;
 
 #ifdef __clang__
     h0hi = 0;
@@ -292,15 +287,15 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
     h2hi = 0;
     h3hi = 0;
 #else
-    in0.u = EXP(52+0)  | U8TOU32(&inp[0]);
-    in1.u = EXP(52+32) | U8TOU32(&inp[4]);
-    in2.u = EXP(52+64) | U8TOU32(&inp[8]);
-    in3.u = EXP(52+96) | U8TOU32(&inp[12]) | pad;
+    in0.u = EXP(52 + 0) | U8TOU32(&inp[0]);
+    in1.u = EXP(52 + 32) | U8TOU32(&inp[4]);
+    in2.u = EXP(52 + 64) | U8TOU32(&inp[8]);
+    in3.u = EXP(52 + 96) | U8TOU32(&inp[12]) | pad;
 
-    x0 = in0.d - TWO(52)*TWO0;
-    x1 = in1.d - TWO(52)*TWO32;
-    x2 = in2.d - TWO(52)*TWO64;
-    x3 = in3.d - TWO(52)*TWO96;
+    x0 = in0.d - TWO(52) * TWO0;
+    x1 = in1.d - TWO(52) * TWO32;
+    x2 = in2.d - TWO(52) * TWO64;
+    x3 = in3.d - TWO(52) * TWO96;
 
     x0 += h0lo;
     x1 += h1lo;
@@ -311,15 +306,15 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
 #endif
 
     do {
-        in0.u = EXP(52+0)  | U8TOU32(&inp[0]);
-        in1.u = EXP(52+32) | U8TOU32(&inp[4]);
-        in2.u = EXP(52+64) | U8TOU32(&inp[8]);
-        in3.u = EXP(52+96) | U8TOU32(&inp[12]) | pad;
+        in0.u = EXP(52 + 0) | U8TOU32(&inp[0]);
+        in1.u = EXP(52 + 32) | U8TOU32(&inp[4]);
+        in2.u = EXP(52 + 64) | U8TOU32(&inp[8]);
+        in3.u = EXP(52 + 96) | U8TOU32(&inp[12]) | pad;
 
-        x0 = in0.d - TWO(52)*TWO0;
-        x1 = in1.d - TWO(52)*TWO32;
-        x2 = in2.d - TWO(52)*TWO64;
-        x3 = in3.d - TWO(52)*TWO96;
+        x0 = in0.d - TWO(52) * TWO0;
+        x1 = in1.d - TWO(52) * TWO32;
+        x2 = in2.d - TWO(52) * TWO64;
+        x3 = in3.d - TWO(52) * TWO96;
 
         /*
          * note that there are multiple ways to accumulate input, e.g.
@@ -333,28 +328,28 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
         /*
          * carries that cross 32n-bit (and 130-bit) boundaries
          */
-        c0lo = (h0lo + TWO(52)*TWO32)  - TWO(52)*TWO32;
-        c1lo = (h1lo + TWO(52)*TWO64)  - TWO(52)*TWO64;
-        c2lo = (h2lo + TWO(52)*TWO96)  - TWO(52)*TWO96;
-        c3lo = (h3lo + TWO(52)*TWO130) - TWO(52)*TWO130;
+        c0lo = (h0lo + TWO(52) * TWO32) - TWO(52) * TWO32;
+        c1lo = (h1lo + TWO(52) * TWO64) - TWO(52) * TWO64;
+        c2lo = (h2lo + TWO(52) * TWO96) - TWO(52) * TWO96;
+        c3lo = (h3lo + TWO(52) * TWO130) - TWO(52) * TWO130;
 
-        c0hi = (h0hi + TWO(52)*TWO32)  - TWO(52)*TWO32;
-        c1hi = (h1hi + TWO(52)*TWO64)  - TWO(52)*TWO64;
-        c2hi = (h2hi + TWO(52)*TWO96)  - TWO(52)*TWO96;
-        c3hi = (h3hi + TWO(52)*TWO130) - TWO(52)*TWO130;
+        c0hi = (h0hi + TWO(52) * TWO32) - TWO(52) * TWO32;
+        c1hi = (h1hi + TWO(52) * TWO64) - TWO(52) * TWO64;
+        c2hi = (h2hi + TWO(52) * TWO96) - TWO(52) * TWO96;
+        c3hi = (h3hi + TWO(52) * TWO130) - TWO(52) * TWO130;
 
         /*
          * base 2^48 -> base 2^32 with last reduction step
          */
-        x1 =  (h1lo - c1lo) + c0lo;
-        x2 =  (h2lo - c2lo) + c1lo;
-        x3 =  (h3lo - c3lo) + c2lo;
-        x0 =  (h0lo - c0lo) + c3lo * (5.0/TWO130);
+        x1 = (h1lo - c1lo) + c0lo;
+        x2 = (h2lo - c2lo) + c1lo;
+        x3 = (h3lo - c3lo) + c2lo;
+        x0 = (h0lo - c0lo) + c3lo * (5.0 / TWO130);
 
         x1 += (h1hi - c1hi) + c0hi;
         x2 += (h2hi - c2hi) + c1hi;
         x3 += (h3hi - c3hi) + c2hi;
-        x0 += (h0hi - c0hi) + c3hi * (5.0/TWO130);
+        x0 += (h0hi - c0hi) + c3hi * (5.0 / TWO130);
 
 #ifndef __clang__
     fast_entry:
@@ -380,56 +375,56 @@ void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
     /*
      * carries that cross 32n-bit (and 130-bit) boundaries
      */
-    c0lo = (h0lo + TWO(52)*TWO32)  - TWO(52)*TWO32;
-    c1lo = (h1lo + TWO(52)*TWO64)  - TWO(52)*TWO64;
-    c2lo = (h2lo + TWO(52)*TWO96)  - TWO(52)*TWO96;
-    c3lo = (h3lo + TWO(52)*TWO130) - TWO(52)*TWO130;
+    c0lo = (h0lo + TWO(52) * TWO32) - TWO(52) * TWO32;
+    c1lo = (h1lo + TWO(52) * TWO64) - TWO(52) * TWO64;
+    c2lo = (h2lo + TWO(52) * TWO96) - TWO(52) * TWO96;
+    c3lo = (h3lo + TWO(52) * TWO130) - TWO(52) * TWO130;
 
-    c0hi = (h0hi + TWO(52)*TWO32)  - TWO(52)*TWO32;
-    c1hi = (h1hi + TWO(52)*TWO64)  - TWO(52)*TWO64;
-    c2hi = (h2hi + TWO(52)*TWO96)  - TWO(52)*TWO96;
-    c3hi = (h3hi + TWO(52)*TWO130) - TWO(52)*TWO130;
+    c0hi = (h0hi + TWO(52) * TWO32) - TWO(52) * TWO32;
+    c1hi = (h1hi + TWO(52) * TWO64) - TWO(52) * TWO64;
+    c2hi = (h2hi + TWO(52) * TWO96) - TWO(52) * TWO96;
+    c3hi = (h3hi + TWO(52) * TWO130) - TWO(52) * TWO130;
 
     /*
      * base 2^48 -> base 2^32 with last reduction step
      */
-    x1 =  (h1lo - c1lo) + c0lo;
-    x2 =  (h2lo - c2lo) + c1lo;
-    x3 =  (h3lo - c3lo) + c2lo;
-    x0 =  (h0lo - c0lo) + c3lo * (5.0/TWO130);
+    x1 = (h1lo - c1lo) + c0lo;
+    x2 = (h2lo - c2lo) + c1lo;
+    x3 = (h3lo - c3lo) + c2lo;
+    x0 = (h0lo - c0lo) + c3lo * (5.0 / TWO130);
 
     x1 += (h1hi - c1hi) + c0hi;
     x2 += (h2hi - c2hi) + c1hi;
     x3 += (h3hi - c3hi) + c2hi;
-    x0 += (h0hi - c0hi) + c3hi * (5.0/TWO130);
+    x0 += (h0hi - c0hi) + c3hi * (5.0 / TWO130);
 
     /*
      * store base 2^32, with bias
      */
-    st->h[1].d = x1 + TWO(52)*TWO32;
-    st->h[2].d = x2 + TWO(52)*TWO64;
-    st->h[3].d = x3 + TWO(52)*TWO96;
-    st->h[0].d = x0 + TWO(52)*TWO0;
+    st->h[1].d = x1 + TWO(52) * TWO32;
+    st->h[2].d = x2 + TWO(52) * TWO64;
+    st->h[3].d = x3 + TWO(52) * TWO96;
+    st->h[0].d = x0 + TWO(52) * TWO0;
 
     /*
      * restore original FPU control register
      */
 #if defined(__x86_64__)
-    asm volatile ("ldmxcsr	%0"::"m"(mxcsr_orig));
+    asm volatile("ldmxcsr	%0" ::"m"(mxcsr_orig));
 #elif defined(__PPC__) || defined(__POWERPC__)
-    asm volatile ("mtfsf	255,%0"::"f"(fpscr_orig));
+    asm volatile("mtfsf	255,%0" ::"f"(fpscr_orig));
 #elif defined(__s390x__)
-    asm volatile ("lfpc		%0"::"m"(fpc_orig));
+    asm volatile("lfpc		%0" ::"m"(fpc_orig));
 #elif defined(__sparc__)
-    asm volatile ("ldx		%0,%%fsr"::"m"(fsr_orig));
+    asm volatile("ldx		%0,%%fsr" ::"m"(fsr_orig));
 #elif defined(__mips__)
-    asm volatile ("ctc1		%0,$31"::"r"(fcsr_orig));
+    asm volatile("ctc1		%0,$31" ::"r"(fcsr_orig));
 #endif
 }
 
 void poly1305_emit(void *ctx, unsigned char mac[16], const u32 nonce[4])
 {
-    poly1305_internal *st = (poly1305_internal *) ctx;
+    poly1305_internal *st = (poly1305_internal *)ctx;
     u64 h0, h1, h2, h3, h4;
     u32 g0, g1, g2, g3, g4;
     u64 t;
@@ -446,15 +441,19 @@ void poly1305_emit(void *ctx, unsigned char mac[16], const u32 nonce[4])
     /*
      * can be partially reduced, so reduce...
      */
-    h4 = h3>>32; h3 &= 0xffffffffU;
-    g4 = h4&-4;
+    h4 = h3 >> 32;
+    h3 &= 0xffffffffU;
+    g4 = h4 & -4;
     h4 &= 3;
-    g4 += g4>>2;
+    g4 += g4 >> 2;
 
     h0 += g4;
-    h1 += h0>>32; h0 &= 0xffffffffU;
-    h2 += h1>>32; h1 &= 0xffffffffU;
-    h3 += h2>>32; h2 &= 0xffffffffU;
+    h1 += h0 >> 32;
+    h0 &= 0xffffffffU;
+    h2 += h1 >> 32;
+    h1 &= 0xffffffffU;
+    h3 += h2 >> 32;
+    h2 &= 0xffffffffU;
 
     /* compute h + -p */
     g0 = (u32)(t = h0 + 5);
diff --git a/crypto/poly1305/poly1305_ppc.c b/crypto/poly1305/poly1305_ppc.c
index 4e4e3d1994f18..a40ce729b729b 100644
--- a/crypto/poly1305/poly1305_ppc.c
+++ b/crypto/poly1305/poly1305_ppc.c
@@ -14,34 +14,34 @@
 
 void poly1305_init_int(void *ctx, const unsigned char key[16]);
 void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,
-                         unsigned int padbit);
+    unsigned int padbit);
 void poly1305_emit(void *ctx, unsigned char mac[16],
-                       const unsigned int nonce[4]);
+    const unsigned int nonce[4]);
 void poly1305_init_fpu(void *ctx, const unsigned char key[16]);
 void poly1305_blocks_fpu(void *ctx, const unsigned char *inp, size_t len,
-                         unsigned int padbit);
+    unsigned int padbit);
 void poly1305_emit_fpu(void *ctx, unsigned char mac[16],
-                       const unsigned int nonce[4]);
+    const unsigned int nonce[4]);
 void poly1305_init_vsx(void *ctx, const unsigned char key[16]);
 void poly1305_blocks_vsx(void *ctx, const unsigned char *inp, size_t len,
-                         unsigned int padbit);
+    unsigned int padbit);
 void poly1305_emit_vsx(void *ctx, unsigned char mac[16],
-                       const unsigned int nonce[4]);
+    const unsigned int nonce[4]);
 int poly1305_init(void *ctx, const unsigned char key[16], void *func[2]);
 int poly1305_init(void *ctx, const unsigned char key[16], void *func[2])
 {
     if (OPENSSL_ppccap_P & PPC_CRYPTO207) {
         poly1305_init_int(ctx, key);
-        func[0] = (void*)(uintptr_t)poly1305_blocks_vsx;
-        func[1] = (void*)(uintptr_t)poly1305_emit;
+        func[0] = (void *)(uintptr_t)poly1305_blocks_vsx;
+        func[1] = (void *)(uintptr_t)poly1305_emit;
     } else if (sizeof(size_t) == 4 && (OPENSSL_ppccap_P & PPC_FPU)) {
         poly1305_init_fpu(ctx, key);
-        func[0] = (void*)(uintptr_t)poly1305_blocks_fpu;
-        func[1] = (void*)(uintptr_t)poly1305_emit_fpu;
+        func[0] = (void *)(uintptr_t)poly1305_blocks_fpu;
+        func[1] = (void *)(uintptr_t)poly1305_emit_fpu;
     } else {
         poly1305_init_int(ctx, key);
-        func[0] = (void*)(uintptr_t)poly1305_blocks;
-        func[1] = (void*)(uintptr_t)poly1305_emit;
+        func[0] = (void *)(uintptr_t)poly1305_blocks;
+        func[1] = (void *)(uintptr_t)poly1305_emit;
     }
     return 1;
 }
diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index 08794a3ba62e7..58ee452fa383c 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -14,17 +14,17 @@
 #include <signal.h>
 #include <unistd.h>
 #if defined(__linux) || defined(_AIX)
-# include <sys/utsname.h>
+#include <sys/utsname.h>
+#endif
+#if defined(_AIX53) /* defined even on post-5.3 */
+#include <sys/systemcfg.h>
+#if !defined(__power_set)
+#define __power_set(a) (_system_configuration.implementation & (a))
 #endif
-#if defined(_AIX53)     /* defined even on post-5.3 */
-# include <sys/systemcfg.h>
-# if !defined(__power_set)
-#  define __power_set(a) (_system_configuration.implementation & (a))
-# endif
 #endif
 #if defined(__APPLE__) && defined(__MACH__)
-# include <sys/types.h>
-# include <sys/sysctl.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
 #endif
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
@@ -87,57 +87,56 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
 }
 
 #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-# if __GLIBC_PREREQ(2, 16)
-#  include <sys/auxv.h>
-#  define OSSL_IMPLEMENT_GETAUXVAL
-# elif defined(__ANDROID_API__)
+#if __GLIBC_PREREQ(2, 16)
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#elif defined(__ANDROID_API__)
 /* see https://developer.android.google.cn/ndk/guides/cpu-features */
-#  if __ANDROID_API__ >= 18
-#   include <sys/auxv.h>
-#   define OSSL_IMPLEMENT_GETAUXVAL
-#  endif
-# endif
+#if __ANDROID_API__ >= 18
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
+#endif
 #endif
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__)
-# include <sys/param.h>
-# if (defined(__FreeBSD__) && __FreeBSD_version >= 1200000) || \
-    (defined(__OpenBSD__) && OpenBSD >= 202409)
-#  include <sys/auxv.h>
-#  define OSSL_IMPLEMENT_GETAUXVAL
+#include <sys/param.h>
+#if (defined(__FreeBSD__) && __FreeBSD_version >= 1200000) || (defined(__OpenBSD__) && OpenBSD >= 202409)
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
 
 static unsigned long getauxval(unsigned long key)
 {
-  unsigned long val = 0ul;
+    unsigned long val = 0ul;
 
-  if (elf_aux_info((int)key, &val, sizeof(val)) != 0)
-    return 0ul;
+    if (elf_aux_info((int)key, &val, sizeof(val)) != 0)
+        return 0ul;
 
-  return val;
+    return val;
 }
-# endif
+#endif
 #endif
 
 /* I wish <sys/auxv.h> was universally available */
 #ifndef AT_HWCAP
-# define AT_HWCAP               16      /* AT_HWCAP */
+#define AT_HWCAP 16 /* AT_HWCAP */
 #endif
-#define HWCAP_PPC64             (1U << 30)
-#define HWCAP_ALTIVEC           (1U << 28)
-#define HWCAP_FPU               (1U << 27)
-#define HWCAP_POWER6_EXT        (1U << 9)
-#define HWCAP_VSX               (1U << 7)
+#define HWCAP_PPC64 (1U << 30)
+#define HWCAP_ALTIVEC (1U << 28)
+#define HWCAP_FPU (1U << 27)
+#define HWCAP_POWER6_EXT (1U << 9)
+#define HWCAP_VSX (1U << 7)
 
 #ifndef AT_HWCAP2
-# define AT_HWCAP2              26      /* AT_HWCAP2 */
+#define AT_HWCAP2 26 /* AT_HWCAP2 */
 #endif
-#define HWCAP_VEC_CRYPTO        (1U << 25)
-#define HWCAP_ARCH_3_00         (1U << 23)
-#define HWCAP_ARCH_3_1          (1U << 18)
+#define HWCAP_VEC_CRYPTO (1U << 25)
+#define HWCAP_ARCH_3_00 (1U << 23)
+#define HWCAP_ARCH_3_1 (1U << 18)
 
-# if defined(__GNUC__) && __GNUC__>=2
-__attribute__ ((constructor))
-# endif
+#if defined(__GNUC__) && __GNUC__ >= 2
+__attribute__((constructor))
+#endif
 void OPENSSL_cpuid_setup(void)
 {
     char *e;
@@ -161,15 +160,15 @@ void OPENSSL_cpuid_setup(void)
 
     if (sizeof(size_t) == 4) {
         struct utsname uts;
-# if defined(_SC_AIX_KERNEL_BITMODE)
+#if defined(_SC_AIX_KERNEL_BITMODE)
         if (sysconf(_SC_AIX_KERNEL_BITMODE) != 64)
             return;
-# endif
+#endif
         if (uname(&uts) != 0 || atoi(uts.version) < 6)
             return;
     }
 
-# if defined(__power_set)
+#if defined(__power_set)
     /*
      * Value used in __power_set is a single-bit 1<<n one denoting
      * specific processor class. Incidentally 0xffffffff<<n can be
@@ -177,28 +176,28 @@ void OPENSSL_cpuid_setup(void)
      */
     if (sizeof(size_t) == 4) {
         /* In 32-bit case PPC_FPU64 is always fastest [if option] */
-        if (__power_set(0xffffffffU<<13))       /* POWER5 and later */
+        if (__power_set(0xffffffffU << 13)) /* POWER5 and later */
             OPENSSL_ppccap_P |= PPC_FPU64;
     } else {
         /* In 64-bit case PPC_FPU64 is fastest only on POWER6 */
-        if (__power_set(0x1U<<14))              /* POWER6 */
+        if (__power_set(0x1U << 14)) /* POWER6 */
             OPENSSL_ppccap_P |= PPC_FPU64;
     }
 
-    if (__power_set(0xffffffffU<<14))           /* POWER6 and later */
+    if (__power_set(0xffffffffU << 14)) /* POWER6 and later */
         OPENSSL_ppccap_P |= PPC_ALTIVEC;
 
-    if (__power_set(0xffffffffU<<16))           /* POWER8 and later */
+    if (__power_set(0xffffffffU << 16)) /* POWER8 and later */
         OPENSSL_ppccap_P |= PPC_CRYPTO207;
 
-    if (__power_set(0xffffffffU<<17))           /* POWER9 and later */
+    if (__power_set(0xffffffffU << 17)) /* POWER9 and later */
         OPENSSL_ppccap_P |= PPC_MADD300;
 
-    if (__power_set(0xffffffffU<<18))           /* POWER10 and later */
+    if (__power_set(0xffffffffU << 18)) /* POWER10 and later */
         OPENSSL_ppccap_P |= PPC_BRD31;
 
     return;
-# endif
+#endif
 #endif
 
 #if defined(__APPLE__) && defined(__MACH__)
@@ -282,10 +281,10 @@ void OPENSSL_cpuid_setup(void)
         OPENSSL_ppccap_P |= PPC_FPU;
 
         if (sizeof(size_t) == 4) {
-# ifdef __linux
+#ifdef __linux
             struct utsname uts;
             if (uname(&uts) == 0 && strcmp(uts.machine, "ppc64") == 0)
-# endif
+#endif
                 if (sigsetjmp(ill_jmp, 1) == 0) {
                     OPENSSL_ppc64_probe();
                     OPENSSL_ppccap_P |= PPC_FPU64;
diff --git a/crypto/property/defn_cache.c b/crypto/property/defn_cache.c
index eb68a55aa79e1..b9608610a411d 100644
--- a/crypto/property/defn_cache.c
+++ b/crypto/property/defn_cache.c
@@ -37,7 +37,7 @@ static unsigned long property_defn_hash(const PROPERTY_DEFN_ELEM *a)
 }
 
 static int property_defn_cmp(const PROPERTY_DEFN_ELEM *a,
-                             const PROPERTY_DEFN_ELEM *b)
+    const PROPERTY_DEFN_ELEM *b)
 {
     return strcmp(a->prop, b->prop);
 }
@@ -54,12 +54,13 @@ void ossl_property_defns_free(void *vproperty_defns)
 
     if (property_defns != NULL) {
         lh_PROPERTY_DEFN_ELEM_doall(property_defns,
-                                    &property_defn_free);
+            &property_defn_free);
         lh_PROPERTY_DEFN_ELEM_free(property_defns);
     }
 }
 
-void *ossl_property_defns_new(OSSL_LIB_CTX *ctx) {
+void *ossl_property_defns_new(OSSL_LIB_CTX *ctx)
+{
     return lh_PROPERTY_DEFN_ELEM_new(&property_defn_hash, &property_defn_cmp);
 }
 
@@ -69,7 +70,7 @@ OSSL_PROPERTY_LIST *ossl_prop_defn_get(OSSL_LIB_CTX *ctx, const char *prop)
     LHASH_OF(PROPERTY_DEFN_ELEM) *property_defns;
 
     property_defns = ossl_lib_ctx_get_data(ctx,
-                                           OSSL_LIB_CTX_PROPERTY_DEFN_INDEX);
+        OSSL_LIB_CTX_PROPERTY_DEFN_INDEX);
     if (!ossl_assert(property_defns != NULL) || !ossl_lib_ctx_read_lock(ctx))
         return NULL;
 
@@ -87,7 +88,7 @@ OSSL_PROPERTY_LIST *ossl_prop_defn_get(OSSL_LIB_CTX *ctx, const char *prop)
  * overwritten with the existing entry from the cache.
  */
 int ossl_prop_defn_set(OSSL_LIB_CTX *ctx, const char *prop,
-                       OSSL_PROPERTY_LIST **pl)
+    OSSL_PROPERTY_LIST **pl)
 {
     PROPERTY_DEFN_ELEM elem, *old, *p = NULL;
     size_t len;
@@ -95,7 +96,7 @@ int ossl_prop_defn_set(OSSL_LIB_CTX *ctx, const char *prop,
     int res = 1;
 
     property_defns = ossl_lib_ctx_get_data(ctx,
-                                           OSSL_LIB_CTX_PROPERTY_DEFN_INDEX);
+        OSSL_LIB_CTX_PROPERTY_DEFN_INDEX);
     if (property_defns == NULL)
         return 0;
 
@@ -130,7 +131,7 @@ int ossl_prop_defn_set(OSSL_LIB_CTX *ctx, const char *prop,
     }
     OPENSSL_free(p);
     res = 0;
- end:
+end:
     ossl_lib_ctx_unlock(ctx);
     return res;
 }
diff --git a/crypto/property/property.c b/crypto/property/property.c
index 2c35222f76f8f..b702d03f613e7 100644
--- a/crypto/property/property.c
+++ b/crypto/property/property.c
@@ -31,7 +31,7 @@
  * If reducing this, also ensure the stochastic test in test/property_test.c
  * isn't likely to fail.
  */
-#define IMPL_CACHE_FLUSH_THRESHOLD  500
+#define IMPL_CACHE_FLUSH_THRESHOLD 500
 
 typedef struct {
     void *method;
@@ -64,7 +64,7 @@ typedef struct {
 
 struct ossl_method_store_st {
     OSSL_LIB_CTX *ctx;
-    SPARSE_ARRAY_OF(ALGORITHM) *algs;
+    SPARSE_ARRAY_OF(ALGORITHM) * algs;
     /*
      * Lock to protect the |algs| array from concurrent writing, when
      * individual implementations or queries are inserted.  This is used
@@ -107,7 +107,7 @@ typedef struct ossl_global_properties_st {
 } OSSL_GLOBAL_PROPERTIES;
 
 static void ossl_method_cache_flush_alg(OSSL_METHOD_STORE *store,
-                                        ALGORITHM *alg);
+    ALGORITHM *alg);
 static void ossl_method_cache_flush(OSSL_METHOD_STORE *store, int nid);
 
 /* Global properties are stored per library context */
@@ -127,7 +127,7 @@ void *ossl_ctx_global_properties_new(OSSL_LIB_CTX *ctx)
 }
 
 OSSL_PROPERTY_LIST **ossl_ctx_global_properties(OSSL_LIB_CTX *libctx,
-                                                ossl_unused int loadconfig)
+    ossl_unused int loadconfig)
 {
     OSSL_GLOBAL_PROPERTIES *globp;
 
@@ -196,7 +196,7 @@ static int query_cmp(const QUERY *a, const QUERY *b)
     if (res == 0 && a->provider != NULL && b->provider != NULL)
         res = b->provider > a->provider ? 1
             : b->provider < a->provider ? -1
-            : 0;
+                                        : 0;
     return res;
 }
 
@@ -315,9 +315,9 @@ static int ossl_method_store_insert(OSSL_METHOD_STORE *store, ALGORITHM *alg)
  * It is an internal unique identifier.
  */
 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 *))
 {
     ALGORITHM *alg = NULL;
     IMPLEMENTATION *impl;
@@ -348,7 +348,7 @@ int ossl_method_store_add(OSSL_METHOD_STORE *store, const OSSL_PROVIDER *prov,
 
     /* Insert into the hash table if required */
     if (!ossl_property_write_lock(store)) {
-        OPENSSL_free(impl);
+        impl_free(impl);
         return 0;
     }
 
@@ -388,8 +388,8 @@ int ossl_method_store_add(OSSL_METHOD_STORE *store, const OSSL_PROVIDER *prov,
     alg = ossl_method_store_retrieve(store, nid);
     if (alg == NULL) {
         if ((alg = OPENSSL_zalloc(sizeof(*alg))) == NULL
-                || (alg->impls = sk_IMPLEMENTATION_new_null()) == NULL
-                || (alg->cache = lh_QUERY_new(&query_hash, &query_cmp)) == NULL)
+            || (alg->impls = sk_IMPLEMENTATION_new_null()) == NULL
+            || (alg->cache = lh_QUERY_new(&query_hash, &query_cmp)) == NULL)
             goto err;
         alg->nid = nid;
         if (!ossl_method_store_insert(store, alg))
@@ -410,13 +410,14 @@ int ossl_method_store_add(OSSL_METHOD_STORE *store, const OSSL_PROVIDER *prov,
         && sk_IMPLEMENTATION_push(alg->impls, impl)) {
         ret = 1;
 #ifndef FIPS_MODULE
-        OSSL_TRACE_BEGIN(QUERY) {
+        OSSL_TRACE_BEGIN(QUERY)
+        {
             BIO_printf(trc_out, "Adding to method store "
-                       "nid: %d\nproperties: %s\nprovider: %s\n",
-                       nid, properties,
-                       ossl_provider_name(prov) == NULL ? "none" :
-                       ossl_provider_name(prov));
-        } OSSL_TRACE_END(QUERY);
+                                "nid: %d\nproperties: %s\nprovider: %s\n",
+                nid, properties,
+                ossl_provider_name(prov) == NULL ? "none" : ossl_provider_name(prov));
+        }
+        OSSL_TRACE_END(QUERY);
 #endif
     }
     ossl_property_unlock(store);
@@ -432,7 +433,7 @@ int ossl_method_store_add(OSSL_METHOD_STORE *store, const OSSL_PROVIDER *prov,
 }
 
 int ossl_method_store_remove(OSSL_METHOD_STORE *store, int nid,
-                             const void *method)
+    const void *method)
 {
     ALGORITHM *alg = NULL;
     int i;
@@ -503,18 +504,19 @@ alg_cleanup_by_provider(ossl_uintmax_t idx, ALGORITHM *alg, void *arg)
 
         if (impl->provider == data->prov) {
 #ifndef FIPS_MODULE
-            OSSL_TRACE_BEGIN(QUERY) {
+            OSSL_TRACE_BEGIN(QUERY)
+            {
                 char buf[512];
                 size_t size;
 
                 size = ossl_property_list_to_string(NULL, impl->properties, buf,
-                                                    sizeof(buf));
+                    sizeof(buf));
                 BIO_printf(trc_out, "Removing implementation from "
-                           "query cache\nproperties %s\nprovider %s\n",
-                           size == 0 ? "none" : buf,
-                           ossl_provider_name(impl->provider) == NULL ? "none" :
-                           ossl_provider_name(impl->provider));
-            } OSSL_TRACE_END(QUERY);
+                                    "query cache\nproperties %s\nprovider %s\n",
+                    size == 0 ? "none" : buf,
+                    ossl_provider_name(impl->provider) == NULL ? "none" : ossl_provider_name(impl->provider));
+            }
+            OSSL_TRACE_END(QUERY);
 #endif
 
             (void)sk_IMPLEMENTATION_delete(alg->impls, i);
@@ -534,7 +536,7 @@ alg_cleanup_by_provider(ossl_uintmax_t idx, ALGORITHM *alg, void *arg)
 }
 
 int ossl_method_store_remove_all_provided(OSSL_METHOD_STORE *store,
-                                          const OSSL_PROVIDER *prov)
+    const OSSL_PROVIDER *prov)
 {
     struct alg_cleanup_by_provider_data_st data;
 
@@ -548,8 +550,8 @@ int ossl_method_store_remove_all_provided(OSSL_METHOD_STORE *store,
 }
 
 static void alg_do_one(ALGORITHM *alg, IMPLEMENTATION *impl,
-                       void (*fn)(int id, void *method, void *fnarg),
-                       void *fnarg)
+    void (*fn)(int id, void *method, void *fnarg),
+    void *fnarg)
 {
     fn(alg->nid, impl->method.method, fnarg);
 }
@@ -558,12 +560,24 @@ static void alg_copy(ossl_uintmax_t idx, ALGORITHM *alg, void *arg)
 {
     STACK_OF(ALGORITHM) *newalg = arg;
 
+    alg = OPENSSL_memdup(alg, sizeof(ALGORITHM));
+    if (alg == NULL)
+        return;
+
+    alg->impls = sk_IMPLEMENTATION_dup(alg->impls);
+
     (void)sk_ALGORITHM_push(newalg, alg);
 }
 
+static void del_tmpalg(ALGORITHM *alg)
+{
+    sk_IMPLEMENTATION_free(alg->impls);
+    OPENSSL_free(alg);
+}
+
 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 i, j;
     int numalgs, numimps;
@@ -574,9 +588,9 @@ void ossl_method_store_do_all(OSSL_METHOD_STORE *store,
 
         if (!ossl_property_read_lock(store))
             return;
-       
+
         tmpalgs = sk_ALGORITHM_new_reserve(NULL,
-                                           ossl_sa_ALGORITHM_num(store->algs));
+            ossl_sa_ALGORITHM_num(store->algs));
         if (tmpalgs == NULL) {
             ossl_property_unlock(store);
             return;
@@ -591,7 +605,7 @@ void ossl_method_store_do_all(OSSL_METHOD_STORE *store,
             for (j = 0; j < numimps; j++)
                 alg_do_one(alg, sk_IMPLEMENTATION_value(alg->impls, j), fn, fnarg);
         }
-        sk_ALGORITHM_free(tmpalgs);
+        sk_ALGORITHM_pop_free(tmpalgs, del_tmpalg);
     }
 }
 
@@ -619,8 +633,8 @@ void ossl_method_store_do_all(OSSL_METHOD_STORE *store,
  * It is a unique internal identifier value.
  */
 int ossl_method_store_fetch(OSSL_METHOD_STORE *store,
-                            int nid, const char *prop_query,
-                            const OSSL_PROVIDER **prov_rw, void **method)
+    int nid, const char *prop_query,
+    const OSSL_PROVIDER **prov_rw, void **method)
 {
     OSSL_PROPERTY_LIST **plp;
     ALGORITHM *alg;
@@ -635,7 +649,7 @@ int ossl_method_store_fetch(OSSL_METHOD_STORE *store,
 
 #if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_AUTOLOAD_CONFIG)
     if (ossl_lib_ctx_is_default(store->ctx)
-            && !OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL))
+        && !OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL))
         return 0;
 #endif
 
@@ -724,17 +738,18 @@ int ossl_method_store_fetch(OSSL_METHOD_STORE *store,
     }
 
 #ifndef FIPS_MODULE
-    OSSL_TRACE_BEGIN(QUERY) {
+    OSSL_TRACE_BEGIN(QUERY)
+    {
         char buf[512];
         int size;
 
         size = ossl_property_list_to_string(NULL, pq, buf, 512);
         BIO_printf(trc_out, "method store query with properties %s "
-                   "resolves to provider %s\n",
-                   size == 0 ? "none" : buf,
-                   best_impl == NULL ? "none" :
-                   ossl_provider_name(best_impl->provider));
-    } OSSL_TRACE_END(QUERY);
+                            "resolves to provider %s\n",
+            size == 0 ? "none" : buf,
+            best_impl == NULL ? "none" : ossl_provider_name(best_impl->provider));
+    }
+    OSSL_TRACE_END(QUERY);
 #endif
 
     ossl_property_unlock(store);
@@ -743,7 +758,7 @@ int ossl_method_store_fetch(OSSL_METHOD_STORE *store,
 }
 
 static void ossl_method_cache_flush_alg(OSSL_METHOD_STORE *store,
-                                        ALGORITHM *alg)
+    ALGORITHM *alg)
 {
     store->cache_nelem -= lh_QUERY_num_items(alg->cache);
     impl_cache_flush_alg(0, alg);
@@ -809,7 +824,7 @@ static void impl_cache_flush_cache(QUERY *c, IMPL_CACHE_FLUSH *state)
 }
 
 static void impl_cache_flush_one_alg(ossl_uintmax_t idx, ALGORITHM *alg,
-                                     void *v)
+    void *v)
 {
     IMPL_CACHE_FLUSH *state = (IMPL_CACHE_FLUSH *)v;
     unsigned long orig_down_load = lh_QUERY_get_down_load(alg->cache);
@@ -817,7 +832,7 @@ static void impl_cache_flush_one_alg(ossl_uintmax_t idx, ALGORITHM *alg,
     state->cache = alg->cache;
     lh_QUERY_set_down_load(alg->cache, 0);
     lh_QUERY_doall_IMPL_CACHE_FLUSH(state->cache, &impl_cache_flush_cache,
-                                    state);
+        state);
     lh_QUERY_set_down_load(alg->cache, orig_down_load);
 }
 
@@ -842,7 +857,7 @@ static void ossl_method_cache_flush_some(OSSL_METHOD_STORE *store)
 }
 
 int ossl_method_store_cache_get(OSSL_METHOD_STORE *store, OSSL_PROVIDER *prov,
-                                int nid, const char *prop_query, void **method)
+    int nid, const char *prop_query, void **method)
 {
     ALGORITHM *alg;
     QUERY elem, *r;
@@ -872,9 +887,9 @@ int ossl_method_store_cache_get(OSSL_METHOD_STORE *store, OSSL_PROVIDER *prov,
 }
 
 int ossl_method_store_cache_set(OSSL_METHOD_STORE *store, OSSL_PROVIDER *prov,
-                                int nid, const char *prop_query, void *method,
-                                int (*method_up_ref)(void *),
-                                void (*method_destruct)(void *))
+    int nid, const char *prop_query, void *method,
+    int (*method_up_ref)(void *),
+    void (*method_destruct)(void *))
 {
     QUERY elem, *old, *p = NULL;
     ALGORITHM *alg;
diff --git a/crypto/property/property_err.c b/crypto/property/property_err.c
index 9a25d602282ef..2361806fc7b53 100644
--- a/crypto/property/property_err.c
+++ b/crypto/property/property_err.c
@@ -14,24 +14,24 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA PROP_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NAME_TOO_LONG), "name too long"},
-    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_ASCII_CHARACTER),
-    "not an ascii character"},
-    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_HEXADECIMAL_DIGIT),
-    "not an hexadecimal digit"},
-    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_IDENTIFIER), "not an identifier"},
-    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_OCTAL_DIGIT),
-    "not an octal digit"},
-    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_A_DECIMAL_DIGIT),
-    "not a decimal digit"},
-    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_MATCHING_STRING_DELIMITER),
-    "no matching string delimiter"},
-    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_VALUE), "no value"},
-    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_PARSE_FAILED), "parse failed"},
-    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_STRING_TOO_LONG), "string too long"},
-    {ERR_PACK(ERR_LIB_PROP, 0, PROP_R_TRAILING_CHARACTERS),
-    "trailing characters"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NAME_TOO_LONG), "name too long" },
+    { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_ASCII_CHARACTER),
+        "not an ascii character" },
+    { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_HEXADECIMAL_DIGIT),
+        "not an hexadecimal digit" },
+    { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_IDENTIFIER), "not an identifier" },
+    { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_AN_OCTAL_DIGIT),
+        "not an octal digit" },
+    { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NOT_A_DECIMAL_DIGIT),
+        "not a decimal digit" },
+    { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_MATCHING_STRING_DELIMITER),
+        "no matching string delimiter" },
+    { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_NO_VALUE), "no value" },
+    { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_PARSE_FAILED), "parse failed" },
+    { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_STRING_TOO_LONG), "string too long" },
+    { ERR_PACK(ERR_LIB_PROP, 0, PROP_R_TRAILING_CHARACTERS),
+        "trailing characters" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/property/property_local.h b/crypto/property/property_local.h
index 797fb3bf5f2bb..98484240bb554 100644
--- a/crypto/property/property_local.h
+++ b/crypto/property/property_local.h
@@ -14,7 +14,9 @@
 typedef int OSSL_PROPERTY_IDX;
 
 typedef enum {
-    OSSL_PROPERTY_OPER_EQ, OSSL_PROPERTY_OPER_NE, OSSL_PROPERTY_OVERRIDE
+    OSSL_PROPERTY_OPER_EQ,
+    OSSL_PROPERTY_OPER_NE,
+    OSSL_PROPERTY_OVERRIDE
 } OSSL_PROPERTY_OPER;
 
 struct ossl_property_definition_st {
@@ -23,8 +25,8 @@ struct ossl_property_definition_st {
     OSSL_PROPERTY_OPER oper;
     unsigned int optional : 1;
     union {
-        int64_t             int_val;     /* Signed integer */
-        OSSL_PROPERTY_IDX   str_val;     /* String */
+        int64_t int_val; /* Signed integer */
+        OSSL_PROPERTY_IDX str_val; /* String */
     } v;
 };
 
@@ -34,15 +36,15 @@ struct ossl_property_list_st {
     OSSL_PROPERTY_DEFINITION properties[1];
 };
 
-#define OSSL_PROPERTY_TRUE      1
-#define OSSL_PROPERTY_FALSE     2
+#define OSSL_PROPERTY_TRUE 1
+#define OSSL_PROPERTY_FALSE 2
 
 /* Property string functions */
 OSSL_PROPERTY_IDX ossl_property_name(OSSL_LIB_CTX *ctx, const char *s,
-                                     int create);
+    int create);
 const char *ossl_property_name_str(OSSL_LIB_CTX *ctx, OSSL_PROPERTY_IDX idx);
 OSSL_PROPERTY_IDX ossl_property_value(OSSL_LIB_CTX *ctx, const char *s,
-                                      int create);
+    int create);
 const char *ossl_property_value_str(OSSL_LIB_CTX *ctx, OSSL_PROPERTY_IDX idx);
 
 /* Property list functions */
@@ -52,4 +54,4 @@ int ossl_property_has_optional(const OSSL_PROPERTY_LIST *query);
 /* Property definition cache functions */
 OSSL_PROPERTY_LIST *ossl_prop_defn_get(OSSL_LIB_CTX *ctx, const char *prop);
 int ossl_prop_defn_set(OSSL_LIB_CTX *ctx, const char *prop,
-                       OSSL_PROPERTY_LIST **pl);
+    OSSL_PROPERTY_LIST **pl);
diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c
index 3a67754224f06..869d19da85af0 100644
--- a/crypto/property/property_parse.c
+++ b/crypto/property/property_parse.c
@@ -54,7 +54,7 @@ static int match(const char *t[], const char m[], size_t m_len)
 }
 
 static int parse_name(OSSL_LIB_CTX *ctx, const char *t[], int create,
-                      OSSL_PROPERTY_IDX *idx)
+    OSSL_PROPERTY_IDX *idx)
 {
     char name[100];
     int err = 0;
@@ -65,7 +65,7 @@ static int parse_name(OSSL_LIB_CTX *ctx, const char *t[], int create,
     for (;;) {
         if (!ossl_isalpha(*s)) {
             ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_IDENTIFIER,
-                           "HERE-->%s", *t);
+                "HERE-->%s", *t);
             return 0;
         }
         do {
@@ -101,20 +101,20 @@ static int parse_number(const char *t[], OSSL_PROPERTY_DEFINITION *res)
     do {
         if (!ossl_isdigit(*s)) {
             ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_A_DECIMAL_DIGIT,
-                           "HERE-->%s", *t);
+                "HERE-->%s", *t);
             return 0;
         }
         /* overflow check */
         if (v > ((INT64_MAX - (*s - '0')) / 10)) {
             ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED,
-                           "Property %s overflows", *t);
+                "Property %s overflows", *t);
             return 0;
         }
         v = v * 10 + (*s++ - '0');
     } while (ossl_isdigit(*s));
     if (!ossl_isspace(*s) && *s != '\0' && *s != ',') {
         ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_A_DECIMAL_DIGIT,
-                       "HERE-->%s", *t);
+            "HERE-->%s", *t);
         return 0;
     }
     *t = skip_space(s);
@@ -136,13 +136,13 @@ static int parse_hex(const char *t[], OSSL_PROPERTY_DEFINITION *res)
             sval = ossl_tolower(*s) - 'a' + 10;
         } else {
             ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_HEXADECIMAL_DIGIT,
-                           "%s", *t);
+                "%s", *t);
             return 0;
         }
 
         if (v > ((INT64_MAX - sval) / 16)) {
             ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED,
-                           "Property %s overflows", *t);
+                "Property %s overflows", *t);
             return 0;
         }
 
@@ -151,7 +151,7 @@ static int parse_hex(const char *t[], OSSL_PROPERTY_DEFINITION *res)
     } while (ossl_isxdigit(*++s));
     if (!ossl_isspace(*s) && *s != '\0' && *s != ',') {
         ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_HEXADECIMAL_DIGIT,
-                       "HERE-->%s", *t);
+            "HERE-->%s", *t);
         return 0;
     }
     *t = skip_space(s);
@@ -168,12 +168,12 @@ static int parse_oct(const char *t[], OSSL_PROPERTY_DEFINITION *res)
     do {
         if (*s == '9' || *s == '8' || !ossl_isdigit(*s)) {
             ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_OCTAL_DIGIT,
-                           "HERE-->%s", *t);
+                "HERE-->%s", *t);
             return 0;
         }
         if (v > ((INT64_MAX - (*s - '0')) / 8)) {
             ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED,
-                           "Property %s overflows", *t);
+                "Property %s overflows", *t);
             return 0;
         }
 
@@ -181,7 +181,7 @@ static int parse_oct(const char *t[], OSSL_PROPERTY_DEFINITION *res)
     } while (ossl_isdigit(*++s) && *s != '9' && *s != '8');
     if (!ossl_isspace(*s) && *s != '\0' && *s != ',') {
         ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_OCTAL_DIGIT,
-                       "HERE-->%s", *t);
+            "HERE-->%s", *t);
         return 0;
     }
     *t = skip_space(s);
@@ -191,7 +191,7 @@ static int parse_oct(const char *t[], OSSL_PROPERTY_DEFINITION *res)
 }
 
 static int parse_string(OSSL_LIB_CTX *ctx, const char *t[], char delim,
-                        OSSL_PROPERTY_DEFINITION *res, const int create)
+    OSSL_PROPERTY_DEFINITION *res, const int create)
 {
     char v[1000];
     const char *s = *t;
@@ -207,7 +207,7 @@ static int parse_string(OSSL_LIB_CTX *ctx, const char *t[], char delim,
     }
     if (*s == '\0') {
         ERR_raise_data(ERR_LIB_PROP, PROP_R_NO_MATCHING_STRING_DELIMITER,
-                       "HERE-->%c%s", delim, *t);
+            "HERE-->%c%s", delim, *t);
         return 0;
     }
     v[i] = '\0';
@@ -222,7 +222,7 @@ static int parse_string(OSSL_LIB_CTX *ctx, const char *t[], char delim,
 }
 
 static int parse_unquoted(OSSL_LIB_CTX *ctx, const char *t[],
-                          OSSL_PROPERTY_DEFINITION *res, const int create)
+    OSSL_PROPERTY_DEFINITION *res, const int create)
 {
     char v[1000];
     const char *s = *t;
@@ -240,7 +240,7 @@ static int parse_unquoted(OSSL_LIB_CTX *ctx, const char *t[],
     }
     if (!ossl_isspace(*s) && *s != '\0' && *s != ',') {
         ERR_raise_data(ERR_LIB_PROP, PROP_R_NOT_AN_ASCII_CHARACTER,
-                       "HERE-->%s", s);
+            "HERE-->%s", s);
         return 0;
     }
     v[i] = 0;
@@ -254,7 +254,7 @@ static int parse_unquoted(OSSL_LIB_CTX *ctx, const char *t[],
 }
 
 static int parse_value(OSSL_LIB_CTX *ctx, const char *t[],
-                       OSSL_PROPERTY_DEFINITION *res, int create)
+    OSSL_PROPERTY_DEFINITION *res, int create)
 {
     const char *s = *t;
     int r = 0;
@@ -285,7 +285,7 @@ static int parse_value(OSSL_LIB_CTX *ctx, const char *t[],
 }
 
 static int pd_compare(const OSSL_PROPERTY_DEFINITION *const *p1,
-                      const OSSL_PROPERTY_DEFINITION *const *p2)
+    const OSSL_PROPERTY_DEFINITION *const *p2)
 {
     const OSSL_PROPERTY_DEFINITION *pd1 = *p1;
     const OSSL_PROPERTY_DEFINITION *pd2 = *p2;
@@ -310,7 +310,7 @@ static void pd_free(OSSL_PROPERTY_DEFINITION *pd)
  */
 static OSSL_PROPERTY_LIST *
 stack_to_property_list(OSSL_LIB_CTX *ctx,
-                       STACK_OF(OSSL_PROPERTY_DEFINITION) *sk)
+    STACK_OF(OSSL_PROPERTY_DEFINITION) *sk)
 {
     const int n = sk_OSSL_PROPERTY_DEFINITION_num(sk);
     OSSL_PROPERTY_LIST *r;
@@ -318,7 +318,7 @@ stack_to_property_list(OSSL_LIB_CTX *ctx,
     int i;
 
     r = OPENSSL_malloc(sizeof(*r)
-                       + (n <= 0 ? 0 : n - 1) * sizeof(r->properties[0]));
+        + (n <= 0 ? 0 : n - 1) * sizeof(r->properties[0]));
     if (r != NULL) {
         sk_OSSL_PROPERTY_DEFINITION_sort(sk);
 
@@ -331,8 +331,8 @@ stack_to_property_list(OSSL_LIB_CTX *ctx,
             if (i > 0 && r->properties[i].name_idx == prev_name_idx) {
                 OPENSSL_free(r);
                 ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED,
-                               "Duplicated name `%s'",
-                               ossl_property_name_str(ctx, prev_name_idx));
+                    "Duplicated name `%s'",
+                    ossl_property_name_str(ctx, prev_name_idx));
                 return NULL;
             }
             prev_name_idx = r->properties[i].name_idx;
@@ -368,13 +368,13 @@ OSSL_PROPERTY_LIST *ossl_parse_property(OSSL_LIB_CTX *ctx, const char *defn)
         prop->oper = OSSL_PROPERTY_OPER_EQ;
         if (prop->name_idx == 0) {
             ERR_raise_data(ERR_LIB_PROP, PROP_R_PARSE_FAILED,
-                           "Unknown name HERE-->%s", start);
+                "Unknown name HERE-->%s", start);
             goto err;
         }
         if (match_ch(&s, '=')) {
             if (!parse_value(ctx, &s, prop, 1)) {
                 ERR_raise_data(ERR_LIB_PROP, PROP_R_NO_VALUE,
-                               "HERE-->%s", start);
+                    "HERE-->%s", start);
                 goto err;
             }
         } else {
@@ -390,7 +390,7 @@ OSSL_PROPERTY_LIST *ossl_parse_property(OSSL_LIB_CTX *ctx, const char *defn)
     }
     if (*s != '\0') {
         ERR_raise_data(ERR_LIB_PROP, PROP_R_TRAILING_CHARACTERS,
-                       "HERE-->%s", s);
+            "HERE-->%s", s);
         goto err;
     }
     res = stack_to_property_list(ctx, sk);
@@ -402,7 +402,7 @@ OSSL_PROPERTY_LIST *ossl_parse_property(OSSL_LIB_CTX *ctx, const char *defn)
 }
 
 OSSL_PROPERTY_LIST *ossl_parse_query(OSSL_LIB_CTX *ctx, const char *s,
-                                     int create_values)
+    int create_values)
 {
     STACK_OF(OSSL_PROPERTY_DEFINITION) *sk;
     OSSL_PROPERTY_LIST *res = NULL;
@@ -445,7 +445,7 @@ OSSL_PROPERTY_LIST *ossl_parse_query(OSSL_LIB_CTX *ctx, const char *s,
         if (!parse_value(ctx, &s, prop, create_values))
             prop->type = OSSL_PROPERTY_TYPE_VALUE_UNDEFINED;
 
-skip_value:
+    skip_value:
         if (!sk_OSSL_PROPERTY_DEFINITION_push(sk, prop))
             goto err;
         prop = NULL;
@@ -453,7 +453,7 @@ OSSL_PROPERTY_LIST *ossl_parse_query(OSSL_LIB_CTX *ctx, const char *s,
     }
     if (*s != '\0') {
         ERR_raise_data(ERR_LIB_PROP, PROP_R_TRAILING_CHARACTERS,
-                       "HERE-->%s", s);
+            "HERE-->%s", s);
         goto err;
     }
     res = stack_to_property_list(ctx, sk);
@@ -469,7 +469,7 @@ OSSL_PROPERTY_LIST *ossl_parse_query(OSSL_LIB_CTX *ctx, const char *s,
  * Return the number of clauses matched or -1 if a mandatory clause is false.
  */
 int ossl_property_match_count(const OSSL_PROPERTY_LIST *query,
-                              const OSSL_PROPERTY_LIST *defn)
+    const OSSL_PROPERTY_LIST *defn)
 {
     const OSSL_PROPERTY_DEFINITION *const q = query->properties;
     const OSSL_PROPERTY_DEFINITION *const d = defn->properties;
@@ -482,13 +482,13 @@ int ossl_property_match_count(const OSSL_PROPERTY_LIST *query,
             continue;
         }
         if (j < defn->num_properties) {
-            if (q[i].name_idx > d[j].name_idx) {  /* skip defn, not in query */
+            if (q[i].name_idx > d[j].name_idx) { /* skip defn, not in query */
                 j++;
                 continue;
             }
             if (q[i].name_idx == d[j].name_idx) { /* both in defn and query */
                 const int eq = q[i].type == d[j].type
-                               && memcmp(&q[i].v, &d[j].v, sizeof(q[i].v)) == 0;
+                    && memcmp(&q[i].v, &d[j].v, sizeof(q[i].v)) == 0;
 
                 if ((eq && oper == OSSL_PROPERTY_OPER_EQ)
                     || (!eq && oper == OSSL_PROPERTY_OPER_NE))
@@ -512,10 +512,10 @@ int ossl_property_match_count(const OSSL_PROPERTY_LIST *query,
             else if (!q[i].optional)
                 return -1;
         } else if (q[i].type != OSSL_PROPERTY_TYPE_STRING
-                   || (oper == OSSL_PROPERTY_OPER_EQ
-                       && q[i].v.str_val != OSSL_PROPERTY_FALSE)
-                   || (oper == OSSL_PROPERTY_OPER_NE
-                       && q[i].v.str_val == OSSL_PROPERTY_FALSE)) {
+            || (oper == OSSL_PROPERTY_OPER_EQ
+                && q[i].v.str_val != OSSL_PROPERTY_FALSE)
+            || (oper == OSSL_PROPERTY_OPER_NE
+                && q[i].v.str_val == OSSL_PROPERTY_FALSE)) {
             if (!q[i].optional)
                 return -1;
         } else {
@@ -536,7 +536,7 @@ void ossl_property_free(OSSL_PROPERTY_LIST *p)
  * If there is a common name, the one from the first list is used.
  */
 OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a,
-                                        const OSSL_PROPERTY_LIST *b)
+    const OSSL_PROPERTY_LIST *b)
 {
     const OSSL_PROPERTY_DEFINITION *const ap = a->properties;
     const OSSL_PROPERTY_DEFINITION *const bp = b->properties;
@@ -546,7 +546,7 @@ OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a,
     const int t = a->num_properties + b->num_properties;
 
     r = OPENSSL_malloc(sizeof(*r)
-                       + (t == 0 ? 0 : t - 1) * sizeof(r->properties[0]));
+        + (t == 0 ? 0 : t - 1) * sizeof(r->properties[0]));
     if (r == NULL)
         return NULL;
 
@@ -574,12 +574,12 @@ OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a,
 int ossl_property_parse_init(OSSL_LIB_CTX *ctx)
 {
     static const char *const predefined_names[] = {
-        "provider",     /* Name of provider (default, legacy, fips) */
-        "version",      /* Version number of this provider */
-        "fips",         /* FIPS validated or FIPS supporting algorithm */
-        "output",       /* Output type for encoders */
-        "input",        /* Input type for decoders */
-        "structure",    /* Structure name for encoders and decoders */
+        "provider", /* Name of provider (default, legacy, fips) */
+        "version", /* Version number of this provider */
+        "fips", /* FIPS validated or FIPS supporting algorithm */
+        "output", /* Output type for encoders */
+        "input", /* Input type for decoders */
+        "structure", /* Structure name for encoders and decoders */
     };
     size_t i;
 
@@ -641,7 +641,7 @@ static void put_str(const char *str, char **buf, size_t *remain, size_t *needed)
         }
 
     quotes = quote != '\0';
-    if (*remain == 0) {
+    if (*remain <= (size_t)quotes) {
         *needed += 2 * quotes;
         return;
     }
@@ -677,7 +677,8 @@ static void put_num(int64_t val, char **buf, size_t *remain, size_t *needed)
         len++;
         tmpval = -tmpval;
     }
-    for (; tmpval > 9; len++, tmpval /= 10);
+    for (; tmpval > 9; len++, tmpval /= 10)
+        ;
 
     *needed += len;
 
@@ -695,8 +696,8 @@ static void put_num(int64_t val, char **buf, size_t *remain, size_t *needed)
 }
 
 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 i;
     const OSSL_PROPERTY_DEFINITION *prop = NULL;
@@ -729,31 +730,31 @@ size_t ossl_property_list_to_string(OSSL_LIB_CTX *ctx,
         put_str(val, &buf, &bufsize, &needed);
 
         switch (prop->oper) {
-            case OSSL_PROPERTY_OPER_NE:
-                put_char('!', &buf, &bufsize, &needed);
-                /* fall through */
-            case OSSL_PROPERTY_OPER_EQ:
-                put_char('=', &buf, &bufsize, &needed);
-                /* put value */
-                switch (prop->type) {
-                case OSSL_PROPERTY_TYPE_STRING:
-                    val = ossl_property_value_str(ctx, prop->v.str_val);
-                    if (val == NULL)
-                        return 0;
-                    put_str(val, &buf, &bufsize, &needed);
-                    break;
-
-                case OSSL_PROPERTY_TYPE_NUMBER:
-                    put_num(prop->v.int_val, &buf, &bufsize, &needed);
-                    break;
-
-                default:
+        case OSSL_PROPERTY_OPER_NE:
+            put_char('!', &buf, &bufsize, &needed);
+            /* fall through */
+        case OSSL_PROPERTY_OPER_EQ:
+            put_char('=', &buf, &bufsize, &needed);
+            /* put value */
+            switch (prop->type) {
+            case OSSL_PROPERTY_TYPE_STRING:
+                val = ossl_property_value_str(ctx, prop->v.str_val);
+                if (val == NULL)
                     return 0;
-                }
+                put_str(val, &buf, &bufsize, &needed);
                 break;
-            default:
-                /* do nothing */
+
+            case OSSL_PROPERTY_TYPE_NUMBER:
+                put_num(prop->v.int_val, &buf, &bufsize, &needed);
                 break;
+
+            default:
+                return 0;
+            }
+            break;
+        default:
+            /* do nothing */
+            break;
         }
     }
 
diff --git a/crypto/property/property_query.c b/crypto/property/property_query.c
index 28cc704840a49..f5daca2aad17c 100644
--- a/crypto/property/property_query.c
+++ b/crypto/property/property_query.c
@@ -14,15 +14,14 @@
 static int property_idx_cmp(const void *keyp, const void *compare)
 {
     OSSL_PROPERTY_IDX key = *(const OSSL_PROPERTY_IDX *)keyp;
-    const OSSL_PROPERTY_DEFINITION *defn =
-            (const OSSL_PROPERTY_DEFINITION *)compare;
+    const OSSL_PROPERTY_DEFINITION *defn = (const OSSL_PROPERTY_DEFINITION *)compare;
 
     return key - defn->name_idx;
 }
 
 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_IDX name_idx;
 
@@ -31,7 +30,7 @@ ossl_property_find_property(const OSSL_PROPERTY_LIST *list,
         return NULL;
 
     return ossl_bsearch(&name_idx, list->properties, list->num_properties,
-                        sizeof(*list->properties), &property_idx_cmp, 0);
+        sizeof(*list->properties), &property_idx_cmp, 0);
 }
 
 OSSL_PROPERTY_TYPE ossl_property_get_type(const OSSL_PROPERTY_DEFINITION *prop)
@@ -40,7 +39,7 @@ 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)
 {
     const char *value = NULL;
 
@@ -64,8 +63,8 @@ int ossl_property_has_optional(const OSSL_PROPERTY_LIST *query)
     return query->has_optional ? 1 : 0;
 }
 
-int ossl_property_is_enabled(OSSL_LIB_CTX *ctx,  const char *property_name,
-                             const OSSL_PROPERTY_LIST *prop_list)
+int ossl_property_is_enabled(OSSL_LIB_CTX *ctx, const char *property_name,
+    const OSSL_PROPERTY_LIST *prop_list)
 {
     const OSSL_PROPERTY_DEFINITION *prop;
 
@@ -74,9 +73,8 @@ int ossl_property_is_enabled(OSSL_LIB_CTX *ctx,  const char *property_name,
     if (prop == NULL || prop->optional || prop->oper == OSSL_PROPERTY_OVERRIDE)
         return 0;
     return (prop->type == OSSL_PROPERTY_TYPE_STRING
-            && ((prop->oper == OSSL_PROPERTY_OPER_EQ
-                     && prop->v.str_val == OSSL_PROPERTY_TRUE)
-                 || (prop->oper == OSSL_PROPERTY_OPER_NE
-                     && prop->v.str_val != OSSL_PROPERTY_TRUE)));
+        && ((prop->oper == OSSL_PROPERTY_OPER_EQ
+                && prop->v.str_val == OSSL_PROPERTY_TRUE)
+            || (prop->oper == OSSL_PROPERTY_OPER_NE
+                && prop->v.str_val != OSSL_PROPERTY_TRUE)));
 }
-
diff --git a/crypto/property/property_string.c b/crypto/property/property_string.c
index e06f47a6b798e..6a6849a132451 100644
--- a/crypto/property/property_string.c
+++ b/crypto/property/property_string.c
@@ -93,7 +93,8 @@ void ossl_property_string_data_free(void *vpropdata)
     OPENSSL_free(propdata);
 }
 
-void *ossl_property_string_data_new(OSSL_LIB_CTX *ctx) {
+void *ossl_property_string_data_new(OSSL_LIB_CTX *ctx)
+{
     PROPERTY_STRING_DATA *propdata = OPENSSL_zalloc(sizeof(*propdata));
 
     if (propdata == NULL)
@@ -101,20 +102,20 @@ void *ossl_property_string_data_new(OSSL_LIB_CTX *ctx) {
 
     propdata->lock = CRYPTO_THREAD_lock_new();
     propdata->prop_names = lh_PROPERTY_STRING_new(&property_hash,
-                                                  &property_cmp);
+        &property_cmp);
     propdata->prop_values = lh_PROPERTY_STRING_new(&property_hash,
-                                                   &property_cmp);
+        &property_cmp);
 #ifndef OPENSSL_SMALL_FOOTPRINT
     propdata->prop_namelist = sk_OPENSSL_CSTRING_new_null();
     propdata->prop_valuelist = sk_OPENSSL_CSTRING_new_null();
 #endif
     if (propdata->lock == NULL
 #ifndef OPENSSL_SMALL_FOOTPRINT
-            || propdata->prop_namelist == NULL
-            || propdata->prop_valuelist == NULL
+        || propdata->prop_namelist == NULL
+        || propdata->prop_valuelist == NULL
 #endif
-            || propdata->prop_names == NULL
-            || propdata->prop_values == NULL) {
+        || propdata->prop_names == NULL
+        || propdata->prop_values == NULL) {
         ossl_property_string_data_free(propdata);
         return NULL;
     }
@@ -122,7 +123,7 @@ void *ossl_property_string_data_new(OSSL_LIB_CTX *ctx) {
 }
 
 static PROPERTY_STRING *new_property_string(const char *s,
-                                            OSSL_PROPERTY_IDX *pidx)
+    OSSL_PROPERTY_IDX *pidx)
 {
     const size_t l = strlen(s);
     PROPERTY_STRING *ps = OPENSSL_malloc(sizeof(*ps) + l);
@@ -140,7 +141,7 @@ static PROPERTY_STRING *new_property_string(const char *s,
 }
 
 static OSSL_PROPERTY_IDX ossl_property_string(OSSL_LIB_CTX *ctx, int name,
-                                              int create, const char *s)
+    int create, const char *s)
 {
     PROPERTY_STRING p, *ps, *ps_new;
     PROP_TABLE *t;
@@ -214,7 +215,7 @@ static void find_str_fn(PROPERTY_STRING *prop, void *vfindstr)
 #endif
 
 static const char *ossl_property_str(int name, OSSL_LIB_CTX *ctx,
-                                     OSSL_PROPERTY_IDX idx)
+    OSSL_PROPERTY_IDX idx)
 {
     const char *r;
     PROPERTY_STRING_DATA *propdata
@@ -236,12 +237,13 @@ static const char *ossl_property_str(int name, OSSL_LIB_CTX *ctx,
 
         lh_PROPERTY_STRING_doall_arg(name ? propdata->prop_names
                                           : propdata->prop_values,
-                                     find_str_fn, &findstr);
+            find_str_fn, &findstr);
         r = findstr.str;
     }
 #else
     r = sk_OPENSSL_CSTRING_value(name ? propdata->prop_namelist
-                                      : propdata->prop_valuelist, idx - 1);
+                                      : propdata->prop_valuelist,
+        idx - 1);
 #endif
     CRYPTO_THREAD_unlock(propdata->lock);
 
@@ -249,7 +251,7 @@ static const char *ossl_property_str(int name, OSSL_LIB_CTX *ctx,
 }
 
 OSSL_PROPERTY_IDX ossl_property_name(OSSL_LIB_CTX *ctx, const char *s,
-                                     int create)
+    int create)
 {
     return ossl_property_string(ctx, 1, create, s);
 }
@@ -260,7 +262,7 @@ const char *ossl_property_name_str(OSSL_LIB_CTX *ctx, OSSL_PROPERTY_IDX idx)
 }
 
 OSSL_PROPERTY_IDX ossl_property_value(OSSL_LIB_CTX *ctx, const char *s,
-                                      int create)
+    int create)
 {
     return ossl_property_string(ctx, 0, create, s);
 }
diff --git a/crypto/provider.c b/crypto/provider.c
index c122cb4d0be26..6d6f6626085ed 100644
--- a/crypto/provider.c
+++ b/crypto/provider.c
@@ -16,7 +16,7 @@
 #include "provider_local.h"
 
 OSSL_PROVIDER *OSSL_PROVIDER_try_load_ex(OSSL_LIB_CTX *libctx, const char *name,
-                                         OSSL_PARAM *params, int retain_fallbacks)
+    OSSL_PARAM *params, int retain_fallbacks)
 {
     OSSL_PROVIDER *prov = NULL, *actual;
     int isnew = 0;
@@ -50,7 +50,7 @@ OSSL_PROVIDER *OSSL_PROVIDER_try_load_ex(OSSL_LIB_CTX *libctx, const char *name,
 }
 
 OSSL_PROVIDER *OSSL_PROVIDER_try_load(OSSL_LIB_CTX *libctx, const char *name,
-                                      int retain_fallbacks)
+    int retain_fallbacks)
 {
     return OSSL_PROVIDER_try_load_ex(libctx, name, NULL, retain_fallbacks);
 }
@@ -87,15 +87,15 @@ int OSSL_PROVIDER_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[])
 }
 
 const OSSL_ALGORITHM *OSSL_PROVIDER_query_operation(const OSSL_PROVIDER *prov,
-                                                    int operation_id,
-                                                    int *no_cache)
+    int operation_id,
+    int *no_cache)
 {
     return ossl_provider_query_operation(prov, operation_id, 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)
 {
     ossl_provider_unquery_operation(prov, operation_id, algs);
 }
@@ -116,15 +116,15 @@ 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)
 {
     return ossl_provider_get_capabilities(prov, capability, cb, arg);
 }
 
 int OSSL_PROVIDER_add_builtin(OSSL_LIB_CTX *libctx, const char *name,
-                              OSSL_provider_init_fn *init_fn)
+    OSSL_provider_init_fn *init_fn)
 {
     OSSL_PROVIDER_INFO entry;
 
@@ -150,9 +150,9 @@ const char *OSSL_PROVIDER_get0_name(const OSSL_PROVIDER *prov)
 }
 
 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)
 {
     return ossl_provider_doall_activated(ctx, cb, cbdata);
 }
diff --git a/crypto/provider_child.c b/crypto/provider_child.c
index 52e9cb405f28a..c2555b59f2fd5 100644
--- a/crypto/provider_child.c
+++ b/crypto/provider_child.c
@@ -50,9 +50,9 @@ void ossl_child_prov_ctx_free(void *vgbl)
 static OSSL_provider_init_fn ossl_child_provider_init;
 
 static int ossl_child_provider_init(const OSSL_CORE_HANDLE *handle,
-                                    const OSSL_DISPATCH *in,
-                                    const OSSL_DISPATCH **out,
-                                    void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     OSSL_FUNC_core_get_libctx_fn *c_get_libctx = NULL;
     OSSL_LIB_CTX *ctx;
@@ -132,7 +132,8 @@ static int provider_create_child_cb(const OSSL_CORE_HANDLE *prov, void *cbdata)
          * init children
          */
         if ((cprov = ossl_provider_new(ctx, provname, ossl_child_provider_init,
-                                       NULL, 1)) == NULL)
+                 NULL, 1))
+            == NULL)
             goto err;
 
         if (!ossl_provider_activate(cprov, 0, 0)) {
@@ -149,7 +150,7 @@ static int provider_create_child_cb(const OSSL_CORE_HANDLE *prov, void *cbdata)
     }
 
     ret = 1;
- err:
+err:
     CRYPTO_THREAD_unlock(gbl->lock);
     return ret;
 }
@@ -175,7 +176,7 @@ static int provider_remove_child_cb(const OSSL_CORE_HANDLE *prov, void *cbdata)
      */
     ossl_provider_free(cprov);
     if (ossl_provider_is_child(cprov)
-            && !ossl_provider_deactivate(cprov, 1))
+        && !ossl_provider_deactivate(cprov, 1))
         return 0;
 
     return 1;
@@ -189,8 +190,8 @@ static int provider_global_props_cb(const char *props, void *cbdata)
 }
 
 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)
 {
     struct child_prov_globals *gbl;
 
@@ -239,12 +240,12 @@ int ossl_provider_init_as_child(OSSL_LIB_CTX *ctx,
     }
 
     if (gbl->c_get_libctx == NULL
-            || gbl->c_provider_register_child_cb == NULL
-            || gbl->c_prov_name == NULL
-            || gbl->c_prov_get0_provider_ctx == NULL
-            || gbl->c_prov_get0_dispatch == NULL
-            || gbl->c_prov_up_ref == NULL
-            || gbl->c_prov_free == NULL)
+        || gbl->c_provider_register_child_cb == NULL
+        || gbl->c_prov_name == NULL
+        || gbl->c_prov_get0_provider_ctx == NULL
+        || gbl->c_prov_get0_dispatch == NULL
+        || gbl->c_prov_up_ref == NULL
+        || gbl->c_prov_free == NULL)
         return 0;
 
     gbl->lock = CRYPTO_THREAD_lock_new();
@@ -252,10 +253,10 @@ int ossl_provider_init_as_child(OSSL_LIB_CTX *ctx,
         return 0;
 
     if (!gbl->c_provider_register_child_cb(gbl->handle,
-                                           provider_create_child_cb,
-                                           provider_remove_child_cb,
-                                           provider_global_props_cb,
-                                           ctx))
+            provider_create_child_cb,
+            provider_remove_child_cb,
+            provider_global_props_cb,
+            ctx))
         return 0;
 
     return 1;
@@ -289,7 +290,7 @@ int ossl_provider_up_ref_parent(OSSL_PROVIDER *prov, int activate)
     const OSSL_CORE_HANDLE *parent_handle;
 
     gbl = ossl_lib_ctx_get_data(ossl_provider_libctx(prov),
-                                OSSL_LIB_CTX_CHILD_PROVIDER_INDEX);
+        OSSL_LIB_CTX_CHILD_PROVIDER_INDEX);
     if (gbl == NULL)
         return 0;
 
@@ -305,7 +306,7 @@ int ossl_provider_free_parent(OSSL_PROVIDER *prov, int deactivate)
     const OSSL_CORE_HANDLE *parent_handle;
 
     gbl = ossl_lib_ctx_get_data(ossl_provider_libctx(prov),
-                                OSSL_LIB_CTX_CHILD_PROVIDER_INDEX);
+        OSSL_LIB_CTX_CHILD_PROVIDER_INDEX);
     if (gbl == NULL)
         return 0;
 
diff --git a/crypto/provider_conf.c b/crypto/provider_conf.c
index 5ec50f97e4a52..f2e76ac402e6c 100644
--- a/crypto/provider_conf.c
+++ b/crypto/provider_conf.c
@@ -48,7 +48,7 @@ void ossl_prov_conf_ctx_free(void *vpcgbl)
     PROVIDER_CONF_GLOBAL *pcgbl = vpcgbl;
 
     sk_OSSL_PROVIDER_pop_free(pcgbl->activated_providers,
-                              ossl_provider_free);
+        ossl_provider_free);
 
     OSSL_TRACE(CONF, "Cleaned up providers\n");
     CRYPTO_THREAD_lock_free(pcgbl->lock);
@@ -72,10 +72,10 @@ static const char *skip_dot(const char *name)
  * < 0 for fatal errors
  */
 static int provider_conf_params_internal(OSSL_PROVIDER *prov,
-                                         OSSL_PROVIDER_INFO *provinfo,
-                                         const char *name, const char *value,
-                                         const CONF *cnf,
-                                         STACK_OF(OPENSSL_CSTRING) *visited)
+    OSSL_PROVIDER_INFO *provinfo,
+    const char *name, const char *value,
+    const CONF *cnf,
+    STACK_OF(OPENSSL_CSTRING) *visited)
 {
     STACK_OF(CONF_VALUE) *sect;
     int ok = 1;
@@ -124,7 +124,7 @@ static int provider_conf_params_internal(OSSL_PROVIDER *prov,
             buffer[buffer_len] = '\0';
             OPENSSL_strlcat(buffer, sectconf->name, sizeof(buffer));
             rc = provider_conf_params_internal(prov, provinfo, buffer,
-                                               sectconf->value, cnf, visited);
+                sectconf->value, cnf, visited);
             if (rc < 0) {
                 sk_OPENSSL_CSTRING_pop(visited);
                 return rc;
@@ -146,16 +146,16 @@ static int provider_conf_params_internal(OSSL_PROVIDER *prov,
 
 /*
  * recursively parse the provider configuration section
- * of the config file. 
+ * of the config file.
  * Returns
  * 1 on success
  * 0 on non-fatal error
  * < 0 on fatal errors
  */
 static int provider_conf_params(OSSL_PROVIDER *prov,
-                                OSSL_PROVIDER_INFO *provinfo,
-                                const char *name, const char *value,
-                                const CONF *cnf)
+    OSSL_PROVIDER_INFO *provinfo,
+    const char *name, const char *value,
+    const CONF *cnf)
 {
     int rc;
     STACK_OF(OPENSSL_CSTRING) *visited = sk_OPENSSL_CSTRING_new_null();
@@ -164,7 +164,7 @@ static int provider_conf_params(OSSL_PROVIDER *prov,
         return -1;
 
     rc = provider_conf_params_internal(prov, provinfo, name,
-                                       value, cnf, visited);
+        value, cnf, visited);
 
     sk_OPENSSL_CSTRING_free(visited);
 
@@ -172,7 +172,7 @@ static int provider_conf_params(OSSL_PROVIDER *prov,
 }
 
 static int prov_already_activated(const char *name,
-                                  STACK_OF(OSSL_PROVIDER) *activated)
+    STACK_OF(OSSL_PROVIDER) *activated)
 {
     int i, max;
 
@@ -199,8 +199,8 @@ static int prov_already_activated(const char *name,
  * < 0 on failed activation for fatal errors
  */
 static int provider_conf_activate(OSSL_LIB_CTX *libctx, const char *name,
-                                  const char *value, const char *path,
-                                  int soft, const CONF *cnf)
+    const char *value, const char *path,
+    int soft, const CONF *cnf)
 {
     PROVIDER_CONF_GLOBAL *pcgbl
         = ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_PROVIDER_CONF_INDEX);
@@ -213,12 +213,12 @@ static int provider_conf_activate(OSSL_LIB_CTX *libctx, const char *name,
     }
     if (!prov_already_activated(name, pcgbl->activated_providers)) {
         /*
-        * There is an attempt to activate a provider, so we should disable
-        * loading of fallbacks. Otherwise a misconfiguration could mean the
-        * intended provider does not get loaded. Subsequent fetches could
-        * then fallback to the default provider - which may be the wrong
-        * thing.
-        */
+         * There is an attempt to activate a provider, so we should disable
+         * loading of fallbacks. Otherwise a misconfiguration could mean the
+         * intended provider does not get loaded. Subsequent fetches could
+         * then fallback to the default provider - which may be the wrong
+         * thing.
+         */
         if (!ossl_provider_disable_fallback_loading(libctx)) {
             CRYPTO_THREAD_unlock(pcgbl->lock);
             ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
@@ -246,7 +246,7 @@ static int provider_conf_activate(OSSL_LIB_CTX *libctx, const char *name,
                 ossl_provider_deactivate(prov, 1);
                 ok = 0;
             } else if (actual != prov
-                       && !ossl_provider_activate(actual, 1, 0)) {
+                && !ossl_provider_activate(actual, 1, 0)) {
                 ossl_provider_free(actual);
                 ok = 0;
             } else {
@@ -254,7 +254,7 @@ static int provider_conf_activate(OSSL_LIB_CTX *libctx, const char *name,
                     pcgbl->activated_providers = sk_OSSL_PROVIDER_new_null();
                 if (pcgbl->activated_providers == NULL
                     || !sk_OSSL_PROVIDER_push(pcgbl->activated_providers,
-                                              actual)) {
+                        actual)) {
                     ossl_provider_deactivate(actual, 1);
                     ossl_provider_free(actual);
                     ok = 0;
@@ -273,13 +273,13 @@ static int provider_conf_activate(OSSL_LIB_CTX *libctx, const char *name,
 }
 
 static int provider_conf_parse_bool_setting(const char *confname,
-                                            const char *confvalue, int *val)
+    const char *confvalue, int *val)
 {
 
     if (confvalue == NULL) {
         ERR_raise_data(ERR_LIB_CRYPTO, CRYPTO_R_PROVIDER_SECTION_ERROR,
-                               "directive %s set to unrecognized value",
-                               confname);
+            "directive %s set to unrecognized value",
+            confname);
         return 0;
     }
     if ((strcmp(confvalue, "1") == 0)
@@ -289,19 +289,19 @@ static int provider_conf_parse_bool_setting(const char *confname,
         || (strcmp(confvalue, "TRUE") == 0)
         || (strcmp(confvalue, "on") == 0)
         || (strcmp(confvalue, "ON") == 0)) {
-            *val = 1;
+        *val = 1;
     } else if ((strcmp(confvalue, "0") == 0)
-               || (strcmp(confvalue, "no") == 0)
-               || (strcmp(confvalue, "NO") == 0)
-               || (strcmp(confvalue, "false") == 0)
-               || (strcmp(confvalue, "FALSE") == 0)
-               || (strcmp(confvalue, "off") == 0)
-               || (strcmp(confvalue, "OFF") == 0)) {
-            *val = 0;
+        || (strcmp(confvalue, "no") == 0)
+        || (strcmp(confvalue, "NO") == 0)
+        || (strcmp(confvalue, "false") == 0)
+        || (strcmp(confvalue, "FALSE") == 0)
+        || (strcmp(confvalue, "off") == 0)
+        || (strcmp(confvalue, "OFF") == 0)) {
+        *val = 0;
     } else {
         ERR_raise_data(ERR_LIB_CRYPTO, CRYPTO_R_PROVIDER_SECTION_ERROR,
-                               "directive %s set to unrecognized value",
-                               confname);
+            "directive %s set to unrecognized value",
+            confname);
         return 0;
     }
 
@@ -309,7 +309,7 @@ static int provider_conf_parse_bool_setting(const char *confname,
 }
 
 static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name,
-                              const char *value, const CONF *cnf)
+    const char *value, const CONF *cnf)
 {
     int i;
     STACK_OF(CONF_VALUE) *ecmds;
@@ -326,7 +326,7 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name,
 
     if (!ecmds) {
         ERR_raise_data(ERR_LIB_CRYPTO, CRYPTO_R_PROVIDER_SECTION_ERROR,
-                       "section=%s not found", value);
+            "section=%s not found", value);
         return 0;
     }
 
@@ -337,7 +337,7 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name,
         const char *confvalue = ecmd->value;
 
         OSSL_TRACE2(CONF, "Provider command: %s = %s\n",
-                    confname, confvalue);
+            confname, confvalue);
 
         /* First handle some special pseudo confs */
 
@@ -346,14 +346,14 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name,
             name = confvalue;
         } else if (strcmp(confname, "soft_load") == 0) {
             if (!provider_conf_parse_bool_setting(confname,
-                                                  confvalue, &soft))
+                    confvalue, &soft))
                 return 0;
-        /* Load a dynamic PROVIDER */
+            /* Load a dynamic PROVIDER */
         } else if (strcmp(confname, "module") == 0) {
             path = confvalue;
         } else if (strcmp(confname, "activate") == 0) {
             if (!provider_conf_parse_bool_setting(confname,
-                                                  confvalue, &activate))
+                    confvalue, &activate))
                 return 0;
         }
     }
@@ -379,7 +379,7 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name,
             ok = provider_conf_params(NULL, &entry, NULL, value, cnf);
         if (ok >= 1 && (entry.path != NULL || entry.parameters != NULL)) {
             ok = ossl_provider_info_add_to_store(libctx, &entry);
-            added = 1;
+            added = ok;
         }
         if (added == 0)
             ossl_provider_info_clear(&entry);
@@ -403,7 +403,7 @@ static int provider_conf_init(CONF_IMODULE *md, const CONF *cnf)
     int i;
 
     OSSL_TRACE1(CONF, "Loading providers module: section %s\n",
-                CONF_imodule_get_value(md));
+        CONF_imodule_get_value(md));
 
     /* Value is a section containing PROVIDERs to configure */
     elist = NCONF_get_section(cnf, CONF_imodule_get_value(md));
@@ -416,7 +416,7 @@ static int provider_conf_init(CONF_IMODULE *md, const CONF *cnf)
     for (i = 0; i < sk_CONF_VALUE_num(elist); i++) {
         cval = sk_CONF_VALUE_value(elist, i);
         if (!provider_conf_load(NCONF_get0_libctx((CONF *)cnf),
-                                cval->name, cval->value, cnf))
+                cval->name, cval->value, cnf))
             return 0;
     }
 
diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index 490991b5e58ba..507be35277501 100644
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -31,8 +31,8 @@
 #include "provider_local.h"
 #include "crypto/context.h"
 #ifndef FIPS_MODULE
-# include <openssl/self_test.h>
-# include <openssl/indicator.h>
+#include <openssl/self_test.h>
+#include <openssl/indicator.h>
 #endif
 
 /*
@@ -118,8 +118,8 @@
  */
 
 static OSSL_PROVIDER *provider_new(const char *name,
-                                   OSSL_provider_init_fn *init_function,
-                                   STACK_OF(INFOPAIR) *parameters);
+    OSSL_provider_init_fn *init_function,
+    STACK_OF(INFOPAIR) *parameters);
 
 /*-
  * Provider Object structure
@@ -137,12 +137,12 @@ typedef struct {
 DEFINE_STACK_OF(OSSL_PROVIDER_CHILD_CB)
 #endif
 
-struct provider_store_st;        /* Forward declaration */
+struct provider_store_st; /* Forward declaration */
 
 struct ossl_provider_st {
     /* Flag bits */
-    unsigned int flag_initialized:1;
-    unsigned int flag_activated:1;
+    unsigned int flag_initialized : 1;
+    unsigned int flag_activated : 1;
 
     /* Getting and setting the flags require synchronization */
     CRYPTO_RWLOCK *flag_lock;
@@ -163,10 +163,10 @@ struct ossl_provider_st {
      * In the FIPS module inner provider, this isn't needed, since the
      * error upcalls are always direct calls to the outer provider.
      */
-    int error_lib;     /* ERR library number, one for each provider */
-# ifndef OPENSSL_NO_ERR
+    int error_lib; /* ERR library number, one for each provider */
+#ifndef OPENSSL_NO_ERR
     ERR_STRING_DATA *error_strings; /* Copy of what the provider gives us */
-# endif
+#endif
 #endif
 
     /* Provider side functions */
@@ -190,7 +190,7 @@ struct ossl_provider_st {
 #ifndef FIPS_MODULE
     /* Whether this provider is the child of some other provider */
     const OSSL_CORE_HANDLE *handle;
-    unsigned int ischild:1;
+    unsigned int ischild : 1;
 #endif
 
     /* Provider side data */
@@ -199,8 +199,8 @@ struct ossl_provider_st {
 };
 DEFINE_STACK_OF(OSSL_PROVIDER)
 
-static int ossl_provider_cmp(const OSSL_PROVIDER * const *a,
-                             const OSSL_PROVIDER * const *b)
+static int ossl_provider_cmp(const OSSL_PROVIDER *const *a,
+    const OSSL_PROVIDER *const *b)
 {
     return strcmp((*a)->name, (*b)->name);
 }
@@ -223,8 +223,8 @@ struct provider_store_st {
     OSSL_PROVIDER_INFO *provinfo;
     size_t numprovinfo;
     size_t provinfosz;
-    unsigned int use_fallbacks:1;
-    unsigned int freeing:1;
+    unsigned int use_fallbacks : 1;
+    unsigned int freeing : 1;
 };
 
 /*
@@ -271,7 +271,7 @@ static INFOPAIR *infopair_copy(const INFOPAIR *src)
             goto err;
     }
     return dest;
- err:
+err:
     OPENSSL_free(dest->name);
     OPENSSL_free(dest);
     return NULL;
@@ -296,7 +296,7 @@ void ossl_provider_store_free(void *vstore)
     sk_OSSL_PROVIDER_pop_free(store->providers, provider_deactivate_free);
 #ifndef FIPS_MODULE
     sk_OSSL_PROVIDER_CHILD_CB_pop_free(store->child_cbs,
-                                       ossl_provider_child_cb_free);
+        ossl_provider_child_cb_free);
 #endif
     CRYPTO_THREAD_lock_free(store->default_path_lock);
     CRYPTO_THREAD_lock_free(store->lock);
@@ -350,10 +350,10 @@ int ossl_provider_disable_fallback_loading(OSSL_LIB_CTX *libctx)
     return 0;
 }
 
-#define BUILTINS_BLOCK_SIZE     10
+#define BUILTINS_BLOCK_SIZE 10
 
 int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
-                                    OSSL_PROVIDER_INFO *entry)
+    OSSL_PROVIDER_INFO *entry)
 {
     struct provider_store_st *store = get_provider_store(libctx);
     int ret = 0;
@@ -372,7 +372,7 @@ int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
         return 0;
     if (store->provinfosz == 0) {
         store->provinfo = OPENSSL_zalloc(sizeof(*store->provinfo)
-                                         * BUILTINS_BLOCK_SIZE);
+            * BUILTINS_BLOCK_SIZE);
         if (store->provinfo == NULL)
             goto err;
         store->provinfosz = BUILTINS_BLOCK_SIZE;
@@ -381,7 +381,7 @@ int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
         size_t newsz = store->provinfosz + BUILTINS_BLOCK_SIZE;
 
         tmpbuiltins = OPENSSL_realloc(store->provinfo,
-                                      sizeof(*store->provinfo) * newsz);
+            sizeof(*store->provinfo) * newsz);
         if (tmpbuiltins == NULL)
             goto err;
         store->provinfo = tmpbuiltins;
@@ -391,19 +391,21 @@ int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
     store->numprovinfo++;
 
     ret = 1;
- err:
+err:
     CRYPTO_THREAD_unlock(store->lock);
     return ret;
 }
 
 OSSL_PROVIDER *ossl_provider_find(OSSL_LIB_CTX *libctx, const char *name,
-                                  ossl_unused int noconfig)
+    ossl_unused int noconfig)
 {
     struct provider_store_st *store = NULL;
     OSSL_PROVIDER *prov = NULL;
 
     if ((store = get_provider_store(libctx)) != NULL) {
-        OSSL_PROVIDER tmpl = { 0, };
+        OSSL_PROVIDER tmpl = {
+            0,
+        };
         int i;
 
 #if !defined(FIPS_MODULE) && !defined(OPENSSL_NO_AUTOLOAD_CONFIG)
@@ -437,8 +439,8 @@ OSSL_PROVIDER *ossl_provider_find(OSSL_LIB_CTX *libctx, const char *name,
  */
 
 static OSSL_PROVIDER *provider_new(const char *name,
-                                   OSSL_provider_init_fn *init_function,
-                                   STACK_OF(INFOPAIR) *parameters)
+    OSSL_provider_init_fn *init_function,
+    STACK_OF(INFOPAIR) *parameters)
 {
     OSSL_PROVIDER *prov = NULL;
 
@@ -457,8 +459,9 @@ static OSSL_PROVIDER *provider_new(const char *name,
     if ((prov->opbits_lock = CRYPTO_THREAD_lock_new()) == NULL
         || (prov->flag_lock = CRYPTO_THREAD_lock_new()) == NULL
         || (prov->parameters = sk_INFOPAIR_deep_copy(parameters,
-                                                     infopair_copy,
-                                                     infopair_free)) == NULL) {
+                infopair_copy,
+                infopair_free))
+            == NULL) {
         ossl_provider_free(prov);
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_CRYPTO_LIB);
         return NULL;
@@ -517,8 +520,8 @@ static int provider_free_intern(OSSL_PROVIDER *prov, int deactivate)
  * will fail.
  */
 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)
 {
     struct provider_store_st *store = NULL;
     OSSL_PROVIDER_INFO template;
@@ -560,10 +563,12 @@ OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name,
             }
             /* Always copy to avoid sharing/mutation. */
             template.parameters = sk_INFOPAIR_deep_copy(p->parameters,
-                                                        infopair_copy,
-                                                        infopair_free);
-            if (template.parameters == NULL)
+                infopair_copy,
+                infopair_free);
+            if (template.parameters == NULL) {
+                CRYPTO_THREAD_unlock(store->lock);
                 return NULL;
+            }
             break;
         }
         CRYPTO_THREAD_unlock(store->lock);
@@ -584,7 +589,8 @@ OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name,
             if (params[i].data_type != OSSL_PARAM_UTF8_STRING)
                 continue;
             if (ossl_provider_info_add_parameter(&template, params[i].key,
-                                                 (char *)params[i].data) <= 0) {
+                    (char *)params[i].data)
+                <= 0) {
                 sk_INFOPAIR_pop_free(template.parameters, infopair_free);
                 return NULL;
             }
@@ -644,11 +650,13 @@ static int create_provider_children(OSSL_PROVIDER *prov)
 }
 
 int ossl_provider_add_to_store(OSSL_PROVIDER *prov, OSSL_PROVIDER **actualprov,
-                               int retain_fallbacks)
+    int retain_fallbacks)
 {
     struct provider_store_st *store;
     int idx;
-    OSSL_PROVIDER tmpl = { 0, };
+    OSSL_PROVIDER tmpl = {
+        0,
+    };
     OSSL_PROVIDER *actualtmp = NULL;
 
     if (actualprov != NULL)
@@ -716,7 +724,7 @@ int ossl_provider_add_to_store(OSSL_PROVIDER *prov, OSSL_PROVIDER **actualprov,
 
     return 1;
 
- err:
+err:
     CRYPTO_THREAD_unlock(store->lock);
     return 0;
 }
@@ -740,13 +748,13 @@ void ossl_provider_free(OSSL_PROVIDER *prov)
             if (prov->flag_initialized) {
                 ossl_provider_teardown(prov);
 #ifndef OPENSSL_NO_ERR
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
                 if (prov->error_strings != NULL) {
                     ERR_unload_strings(prov->error_lib, prov->error_strings);
                     OPENSSL_free(prov->error_strings);
                     prov->error_strings = NULL;
                 }
-# endif
+#endif
 #endif
                 OPENSSL_free(prov->operation_bits);
                 prov->operation_bits = NULL;
@@ -793,7 +801,7 @@ int ossl_provider_set_module_path(OSSL_PROVIDER *prov, const char *module_path)
 }
 
 static int infopair_add(STACK_OF(INFOPAIR) **infopairsk, const char *name,
-                        const char *value)
+    const char *value)
 {
     INFOPAIR *pair = NULL;
 
@@ -803,7 +811,7 @@ static int infopair_add(STACK_OF(INFOPAIR) **infopairsk, const char *name,
         goto err;
 
     if ((*infopairsk == NULL
-         && (*infopairsk = sk_INFOPAIR_new_null()) == NULL)
+            && (*infopairsk = sk_INFOPAIR_new_null()) == NULL)
         || sk_INFOPAIR_push(*infopairsk, pair) <= 0) {
         ERR_raise(ERR_LIB_CRYPTO, ERR_R_CRYPTO_LIB);
         goto err;
@@ -811,7 +819,7 @@ static int infopair_add(STACK_OF(INFOPAIR) **infopairsk, const char *name,
 
     return 1;
 
- err:
+err:
     if (pair != NULL) {
         OPENSSL_free(pair->name);
         OPENSSL_free(pair->value);
@@ -821,13 +829,13 @@ static int infopair_add(STACK_OF(INFOPAIR) **infopairsk, const char *name,
 }
 
 int OSSL_PROVIDER_add_conf_parameter(OSSL_PROVIDER *prov,
-                                     const char *name, const char *value)
+    const char *name, const char *value)
 {
     return infopair_add(&prov->parameters, name, value);
 }
 
 int OSSL_PROVIDER_get_conf_parameters(const OSSL_PROVIDER *prov,
-                                      OSSL_PARAM params[])
+    OSSL_PARAM params[])
 {
     int i;
 
@@ -846,14 +854,14 @@ int OSSL_PROVIDER_get_conf_parameters(const OSSL_PROVIDER *prov,
 }
 
 int OSSL_PROVIDER_conf_get_bool(const OSSL_PROVIDER *prov,
-                                const char *name, int defval)
+    const char *name, int defval)
 {
     char *val = NULL;
     OSSL_PARAM param[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
 
     param[0].key = (char *)name;
     param[0].data_type = OSSL_PARAM_UTF8_PTR;
-    param[0].data = (void *) &val;
+    param[0].data = (void *)&val;
     param[0].data_size = sizeof(val);
     param[0].return_size = OSSL_PARAM_UNMODIFIED;
 
@@ -867,17 +875,17 @@ int OSSL_PROVIDER_conf_get_bool(const OSSL_PROVIDER *prov,
             || (OPENSSL_strcasecmp(val, "on") == 0))
             return 1;
         else if ((strcmp(val, "0") == 0)
-                   || (OPENSSL_strcasecmp(val, "no") == 0)
-                   || (OPENSSL_strcasecmp(val, "false") == 0)
-                   || (OPENSSL_strcasecmp(val, "off") == 0))
+            || (OPENSSL_strcasecmp(val, "no") == 0)
+            || (OPENSSL_strcasecmp(val, "false") == 0)
+            || (OPENSSL_strcasecmp(val, "off") == 0))
             return 0;
     }
     return defval;
 }
 
 int ossl_provider_info_add_parameter(OSSL_PROVIDER_INFO *provinfo,
-                                     const char *name,
-                                     const char *value)
+    const char *name,
+    const char *value)
 {
     return infopair_add(&provinfo->parameters, name, value);
 }
@@ -897,7 +905,7 @@ int ossl_provider_info_add_parameter(OSSL_PROVIDER_INFO *provinfo,
 static const OSSL_DISPATCH *core_dispatch; /* Define further down */
 
 int OSSL_PROVIDER_set_default_search_path(OSSL_LIB_CTX *libctx,
-                                          const char *path)
+    const char *path)
 {
     struct provider_store_st *store;
     char *p = NULL;
@@ -908,7 +916,7 @@ int OSSL_PROVIDER_set_default_search_path(OSSL_LIB_CTX *libctx,
             return 0;
     }
     if ((store = get_provider_store(libctx)) != NULL
-            && CRYPTO_THREAD_write_lock(store->default_path_lock)) {
+        && CRYPTO_THREAD_write_lock(store->default_path_lock)) {
         OPENSSL_free(store->default_path);
         store->default_path = p;
         CRYPTO_THREAD_unlock(store->default_path_lock);
@@ -924,7 +932,7 @@ const char *OSSL_PROVIDER_get0_default_search_path(OSSL_LIB_CTX *libctx)
     char *path = NULL;
 
     if ((store = get_provider_store(libctx)) != NULL
-            && CRYPTO_THREAD_read_lock(store->default_path_lock)) {
+        && CRYPTO_THREAD_read_lock(store->default_path_lock)) {
         path = store->default_path;
         CRYPTO_THREAD_unlock(store->default_path_lock);
     }
@@ -939,11 +947,11 @@ const char *OSSL_PROVIDER_get0_default_search_path(OSSL_LIB_CTX *libctx)
 static int provider_init(OSSL_PROVIDER *prov)
 {
     const OSSL_DISPATCH *provider_dispatch = NULL;
-    void *tmp_provctx = NULL;    /* safety measure */
+    void *tmp_provctx = NULL; /* safety measure */
 #ifndef OPENSSL_NO_ERR
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
     OSSL_FUNC_provider_get_reason_strings_fn *p_get_reason_strings = NULL;
-# endif
+#endif
 #endif
     int ok = 0;
 
@@ -974,7 +982,7 @@ static int provider_init(OSSL_PROVIDER *prov)
             }
 
             if ((store = get_provider_store(prov->libctx)) == NULL
-                    || !CRYPTO_THREAD_read_lock(store->default_path_lock))
+                || !CRYPTO_THREAD_read_lock(store->default_path_lock))
                 goto end;
 
             if (store->default_path != NULL) {
@@ -994,12 +1002,11 @@ static int provider_init(OSSL_PROVIDER *prov)
             }
 
             DSO_ctrl(prov->module, DSO_CTRL_SET_FLAGS,
-                     DSO_FLAG_NAME_TRANSLATION_EXT_ONLY, NULL);
+                DSO_FLAG_NAME_TRANSLATION_EXT_ONLY, NULL);
 
             module_path = prov->path;
             if (module_path == NULL)
-                module_path = allocated_path =
-                    DSO_convert_filename(prov->module, prov->name);
+                module_path = allocated_path = DSO_convert_filename(prov->module, prov->name);
             if (module_path != NULL)
                 merged_path = DSO_merge(prov->module, module_path, load_dir);
 
@@ -1017,7 +1024,7 @@ static int provider_init(OSSL_PROVIDER *prov)
         if (prov->module == NULL) {
             /* DSO has already recorded errors, this is just a tracepoint */
             ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_DSO_LIB,
-                           "name=%s", prov->name);
+                "name=%s", prov->name);
             goto end;
         }
 
@@ -1029,21 +1036,23 @@ static int provider_init(OSSL_PROVIDER *prov)
     /* Check for and call the initialise function for the provider. */
     if (prov->init_function == NULL) {
         ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_UNSUPPORTED,
-                       "name=%s, provider has no provider init function",
-                       prov->name);
+            "name=%s, provider has no provider init function",
+            prov->name);
         goto end;
     }
 #ifndef FIPS_MODULE
-    OSSL_TRACE_BEGIN(PROVIDER) {
+    OSSL_TRACE_BEGIN(PROVIDER)
+    {
         BIO_printf(trc_out,
-                   "(provider %s) initalizing\n", prov->name);
-    } OSSL_TRACE_END(PROVIDER);
+            "(provider %s) initializing\n", prov->name);
+    }
+    OSSL_TRACE_END(PROVIDER);
 #endif
 
     if (!prov->init_function((OSSL_CORE_HANDLE *)prov, core_dispatch,
-                             &provider_dispatch, &tmp_provctx)) {
+            &provider_dispatch, &tmp_provctx)) {
         ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_INIT_FAIL,
-                       "name=%s", prov->name);
+            "name=%s", prov->name);
         goto end;
     }
     prov->provctx = tmp_provctx;
@@ -1053,51 +1062,42 @@ static int provider_init(OSSL_PROVIDER *prov)
         for (; provider_dispatch->function_id != 0; provider_dispatch++) {
             switch (provider_dispatch->function_id) {
             case OSSL_FUNC_PROVIDER_TEARDOWN:
-                prov->teardown =
-                    OSSL_FUNC_provider_teardown(provider_dispatch);
+                prov->teardown = OSSL_FUNC_provider_teardown(provider_dispatch);
                 break;
             case OSSL_FUNC_PROVIDER_GETTABLE_PARAMS:
-                prov->gettable_params =
-                    OSSL_FUNC_provider_gettable_params(provider_dispatch);
+                prov->gettable_params = OSSL_FUNC_provider_gettable_params(provider_dispatch);
                 break;
             case OSSL_FUNC_PROVIDER_GET_PARAMS:
-                prov->get_params =
-                    OSSL_FUNC_provider_get_params(provider_dispatch);
+                prov->get_params = OSSL_FUNC_provider_get_params(provider_dispatch);
                 break;
             case OSSL_FUNC_PROVIDER_SELF_TEST:
-                prov->self_test =
-                    OSSL_FUNC_provider_self_test(provider_dispatch);
+                prov->self_test = OSSL_FUNC_provider_self_test(provider_dispatch);
                 break;
             case OSSL_FUNC_PROVIDER_RANDOM_BYTES:
-                prov->random_bytes =
-                    OSSL_FUNC_provider_random_bytes(provider_dispatch);
+                prov->random_bytes = OSSL_FUNC_provider_random_bytes(provider_dispatch);
                 break;
             case OSSL_FUNC_PROVIDER_GET_CAPABILITIES:
-                prov->get_capabilities =
-                    OSSL_FUNC_provider_get_capabilities(provider_dispatch);
+                prov->get_capabilities = OSSL_FUNC_provider_get_capabilities(provider_dispatch);
                 break;
             case OSSL_FUNC_PROVIDER_QUERY_OPERATION:
-                prov->query_operation =
-                    OSSL_FUNC_provider_query_operation(provider_dispatch);
+                prov->query_operation = OSSL_FUNC_provider_query_operation(provider_dispatch);
                 break;
             case OSSL_FUNC_PROVIDER_UNQUERY_OPERATION:
-                prov->unquery_operation =
-                    OSSL_FUNC_provider_unquery_operation(provider_dispatch);
+                prov->unquery_operation = OSSL_FUNC_provider_unquery_operation(provider_dispatch);
                 break;
 #ifndef OPENSSL_NO_ERR
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
             case OSSL_FUNC_PROVIDER_GET_REASON_STRINGS:
-                p_get_reason_strings =
-                    OSSL_FUNC_provider_get_reason_strings(provider_dispatch);
+                p_get_reason_strings = OSSL_FUNC_provider_get_reason_strings(provider_dispatch);
                 break;
-# endif
+#endif
 #endif
             }
         }
     }
 
 #ifndef OPENSSL_NO_ERR
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
     if (p_get_reason_strings != NULL) {
         const OSSL_ITEM *reasonstrings = p_get_reason_strings(prov->provctx);
         size_t cnt, cnt2;
@@ -1115,11 +1115,10 @@ static int provider_init(OSSL_PROVIDER *prov)
                 goto end;
             cnt++;
         }
-        cnt++;                   /* One for the terminating item */
+        cnt++; /* One for the terminating item */
 
         /* Allocate one extra item for the "library" name */
-        prov->error_strings =
-            OPENSSL_zalloc(sizeof(ERR_STRING_DATA) * (cnt + 1));
+        prov->error_strings = OPENSSL_zalloc(sizeof(ERR_STRING_DATA) * (cnt + 1));
         if (prov->error_strings == NULL)
             goto end;
 
@@ -1133,20 +1132,20 @@ static int provider_init(OSSL_PROVIDER *prov)
          * 1..cnt.
          */
         for (cnt2 = 1; cnt2 <= cnt; cnt2++) {
-            prov->error_strings[cnt2].error = (int)reasonstrings[cnt2-1].id;
-            prov->error_strings[cnt2].string = reasonstrings[cnt2-1].ptr;
+            prov->error_strings[cnt2].error = (int)reasonstrings[cnt2 - 1].id;
+            prov->error_strings[cnt2].string = reasonstrings[cnt2 - 1].ptr;
         }
 
         ERR_load_strings(prov->error_lib, prov->error_strings);
     }
-# endif
+#endif
 #endif
 
     /* With this flag set, this provider has become fully "loaded". */
     prov->flag_initialized = 1;
     ok = 1;
 
- end:
+end:
     return ok;
 }
 
@@ -1157,7 +1156,7 @@ static int provider_init(OSSL_PROVIDER *prov)
  * Return -1 on failure and the activation count on success
  */
 static int provider_deactivate(OSSL_PROVIDER *prov, int upcalls,
-                               int removechildren)
+    int removechildren)
 {
     int count;
     struct provider_store_st *store;
@@ -1171,7 +1170,7 @@ static int provider_deactivate(OSSL_PROVIDER *prov, int upcalls,
 
 #ifndef FIPS_MODULE
     if (prov->random_bytes != NULL
-            && !ossl_rand_check_random_provider_on_unload(prov->libctx, prov))
+        && !ossl_rand_check_random_provider_on_unload(prov->libctx, prov))
         return -1;
 #endif
 
@@ -1261,9 +1260,9 @@ static int provider_activate(OSSL_PROVIDER *prov, int lock, int upcalls)
 
     store = prov->store;
     /*
-    * If the provider hasn't been added to the store, then we don't need
-    * any locks because we've not shared it with other threads.
-    */
+     * If the provider hasn't been added to the store, then we don't need
+     * any locks because we've not shared it with other threads.
+     */
     if (store == NULL) {
         lock = 0;
         if (!provider_init(prov))
@@ -1272,7 +1271,7 @@ static int provider_activate(OSSL_PROVIDER *prov, int lock, int upcalls)
 
 #ifndef FIPS_MODULE
     if (prov->random_bytes != NULL
-            && !ossl_rand_check_random_provider_on_load(prov->libctx, prov))
+        && !ossl_rand_check_random_provider_on_load(prov->libctx, prov))
         return -1;
 
     if (prov->ischild && upcalls && !ossl_provider_up_ref_parent(prov, 1))
@@ -1418,7 +1417,7 @@ int ossl_provider_deactivate(OSSL_PROVIDER *prov, int removechildren)
     int count;
 
     if (prov == NULL
-            || (count = provider_deactivate(prov, 1, removechildren)) < 0)
+        || (count = provider_deactivate(prov, 1, removechildren)) < 0)
         return 0;
     return count == 0 ? provider_remove_store_methods(prov) : 1;
 }
@@ -1506,15 +1505,25 @@ static int provider_activate_fallbacks(struct provider_store_st *store)
         store->use_fallbacks = 0;
         ret = 1;
     }
- err:
+err:
     CRYPTO_THREAD_unlock(store->lock);
     return ret;
 }
 
+int ossl_provider_activate_fallbacks(OSSL_LIB_CTX *ctx)
+{
+    struct provider_store_st *store = get_provider_store(ctx);
+
+    if (store == NULL)
+        return 0;
+
+    return provider_activate_fallbacks(store);
+}
+
 int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
-                                  int (*cb)(OSSL_PROVIDER *provider,
-                                            void *cbdata),
-                                  void *cbdata)
+    int (*cb)(OSSL_PROVIDER *provider,
+        void *cbdata),
+    void *cbdata)
 {
     int ret = 0, curr, max, ref = 0;
     struct provider_store_st *store = get_provider_store(ctx);
@@ -1572,7 +1581,7 @@ int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
              * whilst still activated in the child for a short period. That's ok.
              */
             if (!CRYPTO_atomic_add(&prov->activatecnt, 1, &ref,
-                                   prov->activatecnt_lock)) {
+                    prov->activatecnt_lock)) {
                 CRYPTO_DOWN_REF(&prov->refcnt, &ref);
                 CRYPTO_THREAD_unlock(prov->flag_lock);
                 goto err_unlock;
@@ -1601,9 +1610,9 @@ int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
     ret = 1;
     goto finish;
 
- err_unlock:
+err_unlock:
     CRYPTO_THREAD_unlock(store->lock);
- finish:
+finish:
     /*
      * The pop_free call doesn't do what we want on an error condition. We
      * either start from the first item in the stack, or part way through if
@@ -1613,7 +1622,7 @@ int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
         OSSL_PROVIDER *prov = sk_OSSL_PROVIDER_value(provs, curr);
 
         if (!CRYPTO_atomic_add(&prov->activatecnt, -1, &ref,
-                               prov->activatecnt_lock)) {
+                prov->activatecnt_lock)) {
             ret = 0;
             continue;
         }
@@ -1624,7 +1633,7 @@ int ossl_provider_doall_activated(OSSL_LIB_CTX *ctx,
              * we avoid it. We up the count again and do a full deactivation
              */
             if (CRYPTO_atomic_add(&prov->activatecnt, 1, &ref,
-                                  prov->activatecnt_lock))
+                    prov->activatecnt_lock))
                 provider_deactivate(prov, 0, 1);
             else
                 ret = 0;
@@ -1727,14 +1736,16 @@ void ossl_provider_teardown(const OSSL_PROVIDER *prov)
 {
     if (prov->teardown != NULL
 #ifndef FIPS_MODULE
-            && !prov->ischild
+        && !prov->ischild
 #endif
-        ) {
+    ) {
 #ifndef FIPS_MODULE
-        OSSL_TRACE_BEGIN(PROVIDER) {
+        OSSL_TRACE_BEGIN(PROVIDER)
+        {
             BIO_printf(trc_out, "(provider %s) calling teardown\n",
-                       ossl_provider_name(prov));
-        } OSSL_TRACE_END(PROVIDER);
+                ossl_provider_name(prov));
+        }
+        OSSL_TRACE_END(PROVIDER);
 #endif
         prov->teardown(prov->provctx);
     }
@@ -1761,11 +1772,12 @@ const OSSL_PARAM *ossl_provider_gettable_params(const OSSL_PROVIDER *prov)
         ret = prov->gettable_params(prov->provctx);
 
 #ifndef FIPS_MODULE
-    OSSL_TRACE_BEGIN(PROVIDER) {
+    OSSL_TRACE_BEGIN(PROVIDER)
+    {
         char *buf = NULL;
 
         BIO_printf(trc_out, "(provider %s) gettable params\n",
-                   ossl_provider_name(prov));
+            ossl_provider_name(prov));
         BIO_printf(trc_out, "Parameters:\n");
         if (prov->gettable_params != NULL) {
             if (!OSSL_PARAM_print_to_bio(ret, trc_out, 0))
@@ -1774,7 +1786,8 @@ const OSSL_PARAM *ossl_provider_gettable_params(const OSSL_PROVIDER *prov)
         } else {
             BIO_printf(trc_out, "Provider doesn't implement gettable_params\n");
         }
-    } OSSL_TRACE_END(PROVIDER);
+    }
+    OSSL_TRACE_END(PROVIDER);
 #endif
 
     return ret;
@@ -1803,10 +1816,11 @@ int ossl_provider_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[])
 
     ret = prov->get_params(prov->provctx, params);
 #ifndef FIPS_MODULE
-    OSSL_TRACE_BEGIN(PROVIDER) {
+    OSSL_TRACE_BEGIN(PROVIDER)
+    {
 
         BIO_printf(trc_out,
-                   "(provider %s) calling get_params\n", prov->name);
+            "(provider %s) calling get_params\n", prov->name);
         if (ret == 1) {
             BIO_printf(trc_out, "Parameters:\n");
             if (!OSSL_PARAM_print_to_bio(params, trc_out, 1))
@@ -1814,7 +1828,8 @@ int ossl_provider_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[])
         } else {
             BIO_printf(trc_out, "get_params call failed\n");
         }
-    } OSSL_TRACE_END(PROVIDER);
+    }
+    OSSL_TRACE_END(PROVIDER);
 #endif
     return ret;
 }
@@ -1841,16 +1856,18 @@ int ossl_provider_self_test(const OSSL_PROVIDER *prov)
         ret = prov->self_test(prov->provctx);
 
 #ifndef FIPS_MODULE
-    OSSL_TRACE_BEGIN(PROVIDER) {
-        if (prov->self_test != NULL) 
+    OSSL_TRACE_BEGIN(PROVIDER)
+    {
+        if (prov->self_test != NULL)
             BIO_printf(trc_out,
-                       "(provider %s) Calling self_test, ret = %d\n",
-                       prov->name, ret);
+                "(provider %s) Calling self_test, ret = %d\n",
+                prov->name, ret);
         else
             BIO_printf(trc_out,
-                       "(provider %s) doesn't implement self_test\n",
-                       prov->name);
-    } OSSL_TRACE_END(PROVIDER);
+                "(provider %s) doesn't implement self_test\n",
+                prov->name);
+    }
+    OSSL_TRACE_END(PROVIDER);
 #endif
     if (ret == 0)
         (void)provider_remove_store_methods((OSSL_PROVIDER *)prov);
@@ -1876,26 +1893,29 @@ int ossl_provider_self_test(const OSSL_PROVIDER *prov)
  * capabilities.
  */
 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)
 {
     return prov->random_bytes == NULL ? 0
                                       : prov->random_bytes(prov->provctx, which,
-                                                           buf, n, strength);
+                                            buf, n, strength);
 }
 
 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)
 {
     if (prov->get_capabilities != NULL) {
 #ifndef FIPS_MODULE
-        OSSL_TRACE_BEGIN(PROVIDER) {
+        OSSL_TRACE_BEGIN(PROVIDER)
+        {
             BIO_printf(trc_out,
-                       "(provider %s) Calling get_capabilities "
-                       "with capabilities %s\n", prov->name,
-                       capability == NULL ? "none" : capability);
-        } OSSL_TRACE_END(PROVIDER);
+                "(provider %s) Calling get_capabilities "
+                "with capabilities %s\n",
+                prov->name,
+                capability == NULL ? "none" : capability);
+        }
+        OSSL_TRACE_END(PROVIDER);
 #endif
         return prov->get_capabilities(prov->provctx, capability, cb, arg);
     }
@@ -1921,44 +1941,45 @@ int ossl_provider_get_capabilities(const OSSL_PROVIDER *prov,
  * printed for debugging.
  */
 const OSSL_ALGORITHM *ossl_provider_query_operation(const OSSL_PROVIDER *prov,
-                                                    int operation_id,
-                                                    int *no_cache)
+    int operation_id,
+    int *no_cache)
 {
     const OSSL_ALGORITHM *res;
 
     if (prov->query_operation == NULL) {
 #ifndef FIPS_MODULE
-        OSSL_TRACE_BEGIN(PROVIDER) {
+        OSSL_TRACE_BEGIN(PROVIDER)
+        {
             BIO_printf(trc_out, "provider %s lacks query operation!\n",
-                       prov->name);
-        } OSSL_TRACE_END(PROVIDER);
+                prov->name);
+        }
+        OSSL_TRACE_END(PROVIDER);
 #endif
         return NULL;
     }
 
     res = prov->query_operation(prov->provctx, operation_id, no_cache);
 #ifndef FIPS_MODULE
-    OSSL_TRACE_BEGIN(PROVIDER) {
+    OSSL_TRACE_BEGIN(PROVIDER)
+    {
         const OSSL_ALGORITHM *idx;
         if (res != NULL) {
             BIO_printf(trc_out,
-                       "(provider %s) Calling query, available algs are:\n", prov->name);
+                "(provider %s) Calling query, available algs are:\n", prov->name);
 
             for (idx = res; idx->algorithm_names != NULL; idx++) {
                 BIO_printf(trc_out,
-                           "(provider %s) names %s, prop_def %s, desc %s\n",
-                           prov->name,
-                           res->algorithm_names == NULL ? "none" :
-                           res->algorithm_names,
-                           res->property_definition == NULL ? "none" :
-                           res->property_definition,
-                           res->algorithm_description == NULL ? "none" :
-                           res->algorithm_description);
+                    "(provider %s) names %s, prop_def %s, desc %s\n",
+                    prov->name,
+                    idx->algorithm_names == NULL ? "none" : idx->algorithm_names,
+                    idx->property_definition == NULL ? "none" : idx->property_definition,
+                    idx->algorithm_description == NULL ? "none" : idx->algorithm_description);
             }
         } else {
             BIO_printf(trc_out, "(provider %s) query_operation failed\n", prov->name);
         }
-    } OSSL_TRACE_END(PROVIDER);
+    }
+    OSSL_TRACE_END(PROVIDER);
 #endif
 
 #if defined(OPENSSL_NO_CACHED_FETCH)
@@ -1984,18 +2005,20 @@ const OSSL_ALGORITHM *ossl_provider_query_operation(const OSSL_PROVIDER *prov,
  * is being unqueried.
  */
 void ossl_provider_unquery_operation(const OSSL_PROVIDER *prov,
-                                     int operation_id,
-                                     const OSSL_ALGORITHM *algs)
+    int operation_id,
+    const OSSL_ALGORITHM *algs)
 {
     if (prov->unquery_operation != NULL) {
 #ifndef FIPS_MODULE
-        OSSL_TRACE_BEGIN(PROVIDER) {
+        OSSL_TRACE_BEGIN(PROVIDER)
+        {
             BIO_printf(trc_out,
-                       "(provider %s) Calling unquery"
-                       " with operation %d\n",
-                       prov->name,
-                       operation_id);
-        } OSSL_TRACE_END(PROVIDER);
+                "(provider %s) Calling unquery"
+                " with operation %d\n",
+                prov->name,
+                operation_id);
+        }
+        OSSL_TRACE_END(PROVIDER);
 #endif
         prov->unquery_operation(prov->provctx, operation_id, algs);
     }
@@ -2010,7 +2033,7 @@ int ossl_provider_set_operation_bit(OSSL_PROVIDER *provider, size_t bitnum)
         return 0;
     if (provider->operation_bits_sz <= byte) {
         unsigned char *tmp = OPENSSL_realloc(provider->operation_bits,
-                                             byte + 1);
+            byte + 1);
 
         if (tmp == NULL) {
             CRYPTO_THREAD_unlock(provider->opbits_lock);
@@ -2018,7 +2041,7 @@ int ossl_provider_set_operation_bit(OSSL_PROVIDER *provider, size_t bitnum)
         }
         provider->operation_bits = tmp;
         memset(provider->operation_bits + provider->operation_bits_sz,
-               '\0', byte + 1 - provider->operation_bits_sz);
+            '\0', byte + 1 - provider->operation_bits_sz);
         provider->operation_bits_sz = byte + 1;
     }
     provider->operation_bits[byte] |= bit;
@@ -2027,7 +2050,7 @@ 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)
 {
     size_t byte = bitnum / 8;
     unsigned char bit = (1 << (bitnum % 8)) & 0xFF;
@@ -2090,16 +2113,16 @@ int ossl_provider_default_props_update(OSSL_LIB_CTX *libctx, const char *props)
 }
 
 static int ossl_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)
+    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)
 {
     /*
      * This is really an OSSL_PROVIDER that we created and cast to
@@ -2221,10 +2244,10 @@ static void ossl_provider_deregister_child_cb(const OSSL_CORE_HANDLE *handle)
 static const OSSL_PARAM param_types[] = {
     OSSL_PARAM_DEFN(OSSL_PROV_PARAM_CORE_VERSION, OSSL_PARAM_UTF8_PTR, NULL, 0),
     OSSL_PARAM_DEFN(OSSL_PROV_PARAM_CORE_PROV_NAME, OSSL_PARAM_UTF8_PTR,
-                    NULL, 0),
+        NULL, 0),
 #ifndef FIPS_MODULE
     OSSL_PARAM_DEFN(OSSL_PROV_PARAM_CORE_MODULE_FILENAME, OSSL_PARAM_UTF8_PTR,
-                    NULL, 0),
+        NULL, 0),
 #endif
     OSSL_PARAM_END
 };
@@ -2311,7 +2334,8 @@ static int core_get_params(const OSSL_CORE_HANDLE *handle, OSSL_PARAM params[])
 
 #ifndef FIPS_MODULE
     if ((p = OSSL_PARAM_locate(params,
-                               OSSL_PROV_PARAM_CORE_MODULE_FILENAME)) != NULL)
+             OSSL_PROV_PARAM_CORE_MODULE_FILENAME))
+        != NULL)
         OSSL_PARAM_set_utf8_ptr(p, ossl_provider_module_path(prov));
 #endif
 
@@ -2337,8 +2361,8 @@ static OPENSSL_CORE_CTX *core_get_libctx(const OSSL_CORE_HANDLE *handle)
 }
 
 static int core_thread_start(const OSSL_CORE_HANDLE *handle,
-                             OSSL_thread_stop_handler_fn handfn,
-                             void *arg)
+    OSSL_thread_stop_handler_fn handfn,
+    void *arg)
 {
     /*
      * We created this object originally and we know it is actually an
@@ -2368,13 +2392,13 @@ static void core_new_error(const OSSL_CORE_HANDLE *handle)
 }
 
 static void core_set_error_debug(const OSSL_CORE_HANDLE *handle,
-                                 const char *file, int line, const char *func)
+    const char *file, int line, const char *func)
 {
     ERR_set_debug(file, line, func);
 }
 
 static void core_vset_error(const OSSL_CORE_HANDLE *handle,
-                            uint32_t reason, const char *fmt, va_list args)
+    uint32_t reason, const char *fmt, va_list args)
 {
     /*
      * We created this object originally and we know it is actually an
@@ -2409,27 +2433,32 @@ static int core_pop_error_to_mark(const OSSL_CORE_HANDLE *handle)
     return ERR_pop_to_mark();
 }
 
+static int core_count_to_mark(const OSSL_CORE_HANDLE *handle)
+{
+    return ERR_count_to_mark();
+}
+
 static void core_indicator_get_callback(OPENSSL_CORE_CTX *libctx,
-                                        OSSL_INDICATOR_CALLBACK **cb)
+    OSSL_INDICATOR_CALLBACK **cb)
 {
     OSSL_INDICATOR_get_callback((OSSL_LIB_CTX *)libctx, cb);
 }
 
 static void core_self_test_get_callback(OPENSSL_CORE_CTX *libctx,
-                                        OSSL_CALLBACK **cb, void **cbarg)
+    OSSL_CALLBACK **cb, void **cbarg)
 {
     OSSL_SELF_TEST_get_callback((OSSL_LIB_CTX *)libctx, cb, cbarg);
 }
 
-# ifdef OPENSSL_NO_FIPS_JITTER
+#ifdef OPENSSL_NO_FIPS_JITTER
 static size_t rand_get_entropy(const OSSL_CORE_HANDLE *handle,
-                               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)
 {
     return ossl_rand_get_entropy((OSSL_LIB_CTX *)core_get_libctx(handle),
-                                 pout, entropy, min_len, max_len);
+        pout, entropy, min_len, max_len);
 }
-# else
+#else
 /*
  * OpenSSL FIPS providers prior to 3.2 call rand_get_entropy API from
  * core, instead of the newer get_user_entropy. Newer API call honors
@@ -2448,65 +2477,65 @@ static size_t rand_get_entropy(const OSSL_CORE_HANDLE *handle,
  */
 size_t ossl_rand_jitter_get_seed(unsigned char **, int, size_t, size_t);
 static size_t rand_get_entropy(const OSSL_CORE_HANDLE *handle,
-                               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)
 {
     return ossl_rand_jitter_get_seed(pout, entropy, min_len, max_len);
 }
-# endif
+#endif
 
 static size_t rand_get_user_entropy(const OSSL_CORE_HANDLE *handle,
-                                    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)
 {
     return ossl_rand_get_user_entropy((OSSL_LIB_CTX *)core_get_libctx(handle),
-                                      pout, entropy, min_len, max_len);
+        pout, entropy, min_len, max_len);
 }
 
 static void rand_cleanup_entropy(const OSSL_CORE_HANDLE *handle,
-                                 unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     ossl_rand_cleanup_entropy((OSSL_LIB_CTX *)core_get_libctx(handle),
-                              buf, len);
+        buf, len);
 }
 
 static void rand_cleanup_user_entropy(const OSSL_CORE_HANDLE *handle,
-                                      unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     ossl_rand_cleanup_user_entropy((OSSL_LIB_CTX *)core_get_libctx(handle),
-                                   buf, len);
+        buf, len);
 }
 
 static size_t rand_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)
+    unsigned char **pout,
+    size_t min_len, size_t max_len,
+    const void *salt, size_t salt_len)
 {
     return ossl_rand_get_nonce((OSSL_LIB_CTX *)core_get_libctx(handle),
-                               pout, min_len, max_len, salt, salt_len);
+        pout, min_len, max_len, salt, salt_len);
 }
 
 static size_t rand_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)
+    unsigned char **pout,
+    size_t min_len, size_t max_len,
+    const void *salt, size_t salt_len)
 {
     return ossl_rand_get_user_nonce((OSSL_LIB_CTX *)core_get_libctx(handle),
-                                    pout, min_len, max_len, salt, salt_len);
+        pout, min_len, max_len, salt, salt_len);
 }
 
 static void rand_cleanup_nonce(const OSSL_CORE_HANDLE *handle,
-                               unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     ossl_rand_cleanup_nonce((OSSL_LIB_CTX *)core_get_libctx(handle),
-                            buf, len);
+        buf, len);
 }
 
 static void rand_cleanup_user_nonce(const OSSL_CORE_HANDLE *handle,
-                               unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     ossl_rand_cleanup_user_nonce((OSSL_LIB_CTX *)core_get_libctx(handle),
-                                 buf, len);
+        buf, len);
 }
 
 static const char *core_provider_get0_name(const OSSL_CORE_HANDLE *prov)
@@ -2526,20 +2555,20 @@ core_provider_get0_dispatch(const OSSL_CORE_HANDLE *prov)
 }
 
 static int core_provider_up_ref_intern(const OSSL_CORE_HANDLE *prov,
-                                       int activate)
+    int activate)
 {
     return provider_up_ref_intern((OSSL_PROVIDER *)prov, activate);
 }
 
 static int core_provider_free_intern(const OSSL_CORE_HANDLE *prov,
-                                     int deactivate)
+    int deactivate)
 {
     return provider_free_intern((OSSL_PROVIDER *)prov, deactivate);
 }
 
 static int core_obj_add_sigid(const OSSL_CORE_HANDLE *prov,
-                              const char *sign_name, const char *digest_name,
-                              const char *pkey_name)
+    const char *sign_name, const char *digest_name,
+    const char *pkey_name)
 {
     int sign_nid = OBJ_txt2nid(sign_name);
     int digest_nid = NID_undef;
@@ -2547,7 +2576,7 @@ static int core_obj_add_sigid(const OSSL_CORE_HANDLE *prov,
 
     if (digest_name != NULL && digest_name[0] != '\0'
         && (digest_nid = OBJ_txt2nid(digest_name)) == NID_undef)
-            return 0;
+        return 0;
 
     if (sign_nid == NID_undef)
         return 0;
@@ -2566,11 +2595,11 @@ static int core_obj_add_sigid(const OSSL_CORE_HANDLE *prov,
 }
 
 static int core_obj_create(const OSSL_CORE_HANDLE *prov, const char *oid,
-                           const char *sn, const char *ln)
+    const char *sn, const char *ln)
 {
     /* Check if it already exists and create it if not */
     return OBJ_txt2nid(oid) != NID_undef
-           || OBJ_create(oid, sn, ln) != NID_undef;
+        || OBJ_create(oid, sn, ln) != NID_undef;
 }
 #endif /* FIPS_MODULE */
 
@@ -2588,8 +2617,9 @@ static const OSSL_DISPATCH core_dispatch_[] = {
     { OSSL_FUNC_CORE_VSET_ERROR, (void (*)(void))core_vset_error },
     { OSSL_FUNC_CORE_SET_ERROR_MARK, (void (*)(void))core_set_error_mark },
     { OSSL_FUNC_CORE_CLEAR_LAST_ERROR_MARK,
-      (void (*)(void))core_clear_last_error_mark },
+        (void (*)(void))core_clear_last_error_mark },
     { OSSL_FUNC_CORE_POP_ERROR_TO_MARK, (void (*)(void))core_pop_error_to_mark },
+    { OSSL_FUNC_CORE_COUNT_TO_MARK, (void (*)(void))core_count_to_mark },
     { OSSL_FUNC_BIO_NEW_FILE, (void (*)(void))ossl_core_bio_new_file },
     { OSSL_FUNC_BIO_NEW_MEMBUF, (void (*)(void))ossl_core_bio_new_mem_buf },
     { OSSL_FUNC_BIO_READ_EX, (void (*)(void))ossl_core_bio_read_ex },
diff --git a/crypto/provider_local.h b/crypto/provider_local.h
index e0bcbcb9f94e3..7799980808fdd 100644
--- a/crypto/provider_local.h
+++ b/crypto/provider_local.h
@@ -20,14 +20,14 @@ typedef struct {
     char *path;
     OSSL_provider_init_fn *init;
     STACK_OF(INFOPAIR) *parameters;
-    unsigned int is_fallback:1;
+    unsigned int is_fallback : 1;
 } OSSL_PROVIDER_INFO;
 
 extern const OSSL_PROVIDER_INFO ossl_predefined_providers[];
 
 void ossl_provider_info_clear(OSSL_PROVIDER_INFO *info);
 int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
-                                    OSSL_PROVIDER_INFO *entry);
+    OSSL_PROVIDER_INFO *entry);
 int ossl_provider_info_add_parameter(OSSL_PROVIDER_INFO *provinfo,
-                                     const char *name,
-                                     const char *value);
+    const char *name,
+    const char *value);
diff --git a/crypto/provider_predefined.c b/crypto/provider_predefined.c
index 068e0b7cd96a5..2f8d1067a91ae 100644
--- a/crypto/provider_predefined.c
+++ b/crypto/provider_predefined.c
@@ -22,9 +22,9 @@ const OSSL_PROVIDER_INFO ossl_predefined_providers[] = {
     { "fips", NULL, ossl_fips_intern_provider_init, NULL, 1 },
 #else
     { "default", NULL, ossl_default_provider_init, NULL, 1 },
-# ifdef STATIC_LEGACY
+#ifdef STATIC_LEGACY
     { "legacy", NULL, ossl_legacy_provider_init, NULL, 0 },
-# endif
+#endif
     { "base", NULL, ossl_base_provider_init, NULL, 0 },
     { "null", NULL, ossl_null_provider_init, NULL, 0 },
 #endif
diff --git a/crypto/punycode.c b/crypto/punycode.c
index 68fc586e68157..18cbccf1ae7a2 100644
--- a/crypto/punycode.c
+++ b/crypto/punycode.c
@@ -42,7 +42,7 @@ static const char delimiter = '-';
  */
 
 static int adapt(unsigned int delta, unsigned int numpoints,
-                 unsigned int firsttime)
+    unsigned int firsttime)
 {
     unsigned int k = 0;
 
@@ -117,7 +117,7 @@ static ossl_inline int digit_decoded(const unsigned char a)
  */
 
 int ossl_punycode_decode(const char *pEncoded, const size_t enc_len,
-                         unsigned int *pDecoded, unsigned int *pout_length)
+    unsigned int *pDecoded, unsigned int *pout_length)
 {
     unsigned int n = initial_n;
     unsigned int i = 0;
@@ -165,7 +165,8 @@ int ossl_punycode_decode(const char *pEncoded, const size_t enc_len,
                 return 0;
 
             i = i + digit * w;
-            t = (k <= bias) ? tmin : (k >= bias + tmax) ? tmax : k - bias;
+            t = (k <= bias) ? tmin : (k >= bias + tmax) ? tmax
+                                                        : k - bias;
 
             if ((unsigned int)digit < t)
                 break;
@@ -185,7 +186,7 @@ int ossl_punycode_decode(const char *pEncoded, const size_t enc_len,
             return 0;
 
         memmove(pDecoded + i + 1, pDecoded + i,
-                (written_out - i) * sizeof(*pDecoded));
+            (written_out - i) * sizeof(*pDecoded));
         pDecoded[i] = n;
         i++;
         written_out++;
@@ -256,7 +257,7 @@ int ossl_a2ulabel(const char *in, char *out, size_t outlen)
     const char *inptr = in;
     int result = 1;
     unsigned int i;
-    unsigned int buf[LABEL_BUF_SIZE];      /* It's a hostname */
+    unsigned int buf[LABEL_BUF_SIZE]; /* It's a hostname */
     WPACKET pkt;
 
     /* Internal API, so should not fail */
@@ -306,7 +307,7 @@ int ossl_a2ulabel(const char *in, char *out, size_t outlen)
 
     if (!WPACKET_put_bytes_u8(&pkt, '\0'))
         result = 0;
- end:
+end:
     WPACKET_cleanup(&pkt);
     return result;
 }
diff --git a/crypto/quic_vlint.c b/crypto/quic_vlint.c
index 0238985963195..148b99db0d09a 100644
--- a/crypto/quic_vlint.c
+++ b/crypto/quic_vlint.c
@@ -13,7 +13,7 @@ void ossl_quic_vlint_encode_n(uint8_t *buf, uint64_t v, int n)
     } else if (n == 4) {
         buf[0] = (uint8_t)(0x80 | ((v >> 24) & 0x3F));
         buf[1] = (uint8_t)(v >> 16);
-        buf[2] = (uint8_t)(v >>  8);
+        buf[2] = (uint8_t)(v >> 8);
         buf[3] = (uint8_t)v;
     } else {
         buf[0] = (uint8_t)(0xC0 | ((v >> 56) & 0x3F));
@@ -22,7 +22,7 @@ void ossl_quic_vlint_encode_n(uint8_t *buf, uint64_t v, int n)
         buf[3] = (uint8_t)(v >> 32);
         buf[4] = (uint8_t)(v >> 24);
         buf[5] = (uint8_t)(v >> 16);
-        buf[6] = (uint8_t)(v >>  8);
+        buf[6] = (uint8_t)(v >> 8);
         buf[7] = (uint8_t)v;
     }
 }
@@ -42,22 +42,22 @@ uint64_t ossl_quic_vlint_decode_unchecked(const unsigned char *buf)
 
     if (sz == 2)
         return ((uint64_t)(first_byte & 0x3F) << 8)
-             | buf[1];
+            | buf[1];
 
     if (sz == 4)
         return ((uint64_t)(first_byte & 0x3F) << 24)
-             | ((uint64_t)buf[1] << 16)
-             | ((uint64_t)buf[2] <<  8)
-             |  buf[3];
+            | ((uint64_t)buf[1] << 16)
+            | ((uint64_t)buf[2] << 8)
+            | buf[3];
 
     return ((uint64_t)(first_byte & 0x3F) << 56)
-         | ((uint64_t)buf[1] << 48)
-         | ((uint64_t)buf[2] << 40)
-         | ((uint64_t)buf[3] << 32)
-         | ((uint64_t)buf[4] << 24)
-         | ((uint64_t)buf[5] << 16)
-         | ((uint64_t)buf[6] <<  8)
-         |  buf[7];
+        | ((uint64_t)buf[1] << 48)
+        | ((uint64_t)buf[2] << 40)
+        | ((uint64_t)buf[3] << 32)
+        | ((uint64_t)buf[4] << 24)
+        | ((uint64_t)buf[5] << 16)
+        | ((uint64_t)buf[6] << 8)
+        | buf[7];
 }
 
 int ossl_quic_vlint_decode(const unsigned char *buf, size_t buf_len, uint64_t *v)
diff --git a/crypto/rand/prov_seed.c b/crypto/rand/prov_seed.c
index 2985c7f2d8113..8466ded8ab089 100644
--- a/crypto/rand/prov_seed.c
+++ b/crypto/rand/prov_seed.c
@@ -16,8 +16,8 @@
 #include <openssl/err.h>
 
 size_t ossl_rand_get_entropy(ossl_unused 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 ret = 0;
     size_t entropy_available;
@@ -33,7 +33,7 @@ size_t ossl_rand_get_entropy(ossl_unused OSSL_LIB_CTX *ctx,
     entropy_available = ossl_pool_acquire_entropy(pool);
 
     if (entropy_available > 0) {
-        ret   = ossl_rand_pool_length(pool);
+        ret = ossl_rand_pool_length(pool);
         *pout = ossl_rand_pool_detach(pool);
     }
 
@@ -42,26 +42,26 @@ size_t ossl_rand_get_entropy(ossl_unused OSSL_LIB_CTX *ctx,
 }
 
 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)
 {
     EVP_RAND_CTX *rng = ossl_rand_get0_seed_noncreating(ctx);
 
     if (rng != NULL && evp_rand_can_seed(rng))
         return evp_rand_get_seed(rng, pout, entropy, min_len, max_len,
-                                 0, NULL, 0);
+            0, NULL, 0);
     else
         return ossl_rand_get_entropy(ctx, pout, entropy, min_len, max_len);
 }
 
 void ossl_rand_cleanup_entropy(ossl_unused OSSL_LIB_CTX *ctx,
-                               unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     OPENSSL_secure_clear_free(buf, len);
 }
 
 void ossl_rand_cleanup_user_entropy(OSSL_LIB_CTX *ctx,
-                                    unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     EVP_RAND_CTX *rng = ossl_rand_get0_seed_noncreating(ctx);
 
@@ -72,9 +72,9 @@ void ossl_rand_cleanup_user_entropy(OSSL_LIB_CTX *ctx,
 }
 
 size_t ossl_rand_get_nonce(ossl_unused OSSL_LIB_CTX *ctx,
-                           unsigned char **pout,
-                           size_t min_len, ossl_unused size_t max_len,
-                           const void *salt, size_t salt_len)
+    unsigned char **pout,
+    size_t min_len, ossl_unused size_t max_len,
+    const void *salt, size_t salt_len)
 {
     size_t ret = 0;
     RAND_POOL *pool;
@@ -90,17 +90,17 @@ size_t ossl_rand_get_nonce(ossl_unused OSSL_LIB_CTX *ctx,
 
     if (salt != NULL && !ossl_rand_pool_add(pool, salt, salt_len, 0))
         goto err;
-    ret   = ossl_rand_pool_length(pool);
+    ret = ossl_rand_pool_length(pool);
     *pout = ossl_rand_pool_detach(pool);
- err:
+err:
     ossl_rand_pool_free(pool);
     return ret;
 }
 
 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)
+    unsigned char **pout,
+    size_t min_len, size_t max_len,
+    const void *salt, size_t salt_len)
 {
     unsigned char *buf;
     EVP_RAND_CTX *rng = ossl_rand_get0_seed_noncreating(ctx);
@@ -120,13 +120,13 @@ size_t ossl_rand_get_user_nonce(OSSL_LIB_CTX *ctx,
 }
 
 void ossl_rand_cleanup_nonce(ossl_unused OSSL_LIB_CTX *ctx,
-                             unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     OPENSSL_clear_free(buf, len);
 }
 
 void ossl_rand_cleanup_user_nonce(ossl_unused OSSL_LIB_CTX *ctx,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     OPENSSL_clear_free(buf, len);
 }
diff --git a/crypto/rand/rand_deprecated.c b/crypto/rand/rand_deprecated.c
index bd870013f9d82..d1eabc0080f57 100644
--- a/crypto/rand/rand_deprecated.c
+++ b/crypto/rand/rand_deprecated.c
@@ -12,10 +12,10 @@
 #include <openssl/rand.h>
 
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-# include <windows.h>
-# if OPENSSL_API_COMPAT < 0x10100000L
+#include <windows.h>
+#if OPENSSL_API_COMPAT < 0x10100000L
 
-# define DEPRECATED_RAND_FUNCTIONS_DEFINED
+#define DEPRECATED_RAND_FUNCTIONS_DEFINED
 
 int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -27,7 +27,7 @@ void RAND_screen(void)
 {
     RAND_poll();
 }
-# endif
+#endif
 #endif
 
 #ifndef DEPRECATED_RAND_FUNCTIONS_DEFINED
diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c
index f44b38d1a9515..ba8aa34dc2047 100644
--- a/crypto/rand/rand_egd.c
+++ b/crypto/rand/rand_egd.c
@@ -35,22 +35,22 @@ int RAND_egd_bytes(const char *path, int bytes)
 
 #else
 
-# include <unistd.h>
-# include <stddef.h>
-# include <sys/types.h>
-# include <sys/socket.h>
-# ifndef NO_SYS_UN_H
-#  include <sys/un.h>
-# else
+#include <unistd.h>
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#ifndef NO_SYS_UN_H
+#include <sys/un.h>
+#else
 struct sockaddr_un {
-    short sun_family;           /* AF_UNIX */
-    char sun_path[108];         /* path name (gag) */
+    short sun_family; /* AF_UNIX */
+    char sun_path[108]; /* path name (gag) */
 };
-# endif                         /* NO_SYS_UN_H */
-# include <string.h>
-# include <errno.h>
+#endif /* NO_SYS_UN_H */
+#include <string.h>
+#include <errno.h>
 
-# if defined(OPENSSL_SYS_TANDEM)
+#if defined(OPENSSL_SYS_TANDEM)
 /*
  * HPNS:
  *
@@ -66,17 +66,16 @@ struct sockaddr_un {
  *  the two modes or revise the EGD code to listen on two different sockets
  *  (each in one of the two modes) or use the hardware randomizer.
  */
-_variable
-int hpns_socket(int family,
-                int type,
-                int protocol,
-                char* transport)
+_variable int hpns_socket(int family,
+    int type,
+    int protocol,
+    char *transport)
 {
-    int  socket_rc;
+    int socket_rc;
     char current_transport[20];
 
-#  define AF_UNIX_PORTABILITY    "$ZAFN2"
-#  define AF_UNIX_COMPATIBILITY  "$ZPLS"
+#define AF_UNIX_PORTABILITY "$ZAFN2"
+#define AF_UNIX_COMPATIBILITY "$ZPLS"
 
     if (!_arg_present(transport) || transport == NULL || transport[0] == '\0')
         return socket(family, type, protocol);
@@ -103,8 +102,7 @@ int hpns_socket(int family,
 
 static int hpns_connect_attempt = 0;
 
-# endif /* defined(OPENSSL_SYS_HPNS) */
-
+#endif /* defined(OPENSSL_SYS_HPNS) */
 
 int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
 {
@@ -136,27 +134,27 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
     for (;;) {
         if (connect(fd, (struct sockaddr *)&addr, i) == 0)
             break;
-# ifdef EISCONN
+#ifdef EISCONN
         if (errno == EISCONN)
             break;
-# endif
+#endif
         switch (errno) {
-# ifdef EINTR
+#ifdef EINTR
         case EINTR:
-# endif
-# ifdef EAGAIN
+#endif
+#ifdef EAGAIN
         case EAGAIN:
-# endif
-# ifdef EINPROGRESS
+#endif
+#ifdef EINPROGRESS
         case EINPROGRESS:
-# endif
-# ifdef EALREADY
+#endif
+#ifdef EALREADY
         case EALREADY:
-# endif
+#endif
             /* No error, try again */
             break;
         default:
-# if defined(OPENSSL_SYS_TANDEM)
+#if defined(OPENSSL_SYS_TANDEM)
             if (hpns_connect_attempt == 0) {
                 /* try the other kind of AF_UNIX socket */
                 close(fd);
@@ -164,9 +162,9 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
                 if (fd == -1)
                     return -1;
                 ++hpns_connect_attempt;
-                break;  /* try the connect again */
+                break; /* try the connect again */
             }
-# endif
+#endif
 
             ret = -1;
             goto err;
@@ -195,7 +193,7 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
     if (mybuffer)
         RAND_add(tempbuf, i, i);
 
- err:
+err:
     if (fp != NULL)
         fclose(fp);
     return ret;
diff --git a/crypto/rand/rand_err.c b/crypto/rand/rand_err.c
index 6f078935c09ed..5bd44f2190bee 100644
--- a/crypto/rand/rand_err.c
+++ b/crypto/rand/rand_err.c
@@ -15,88 +15,88 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA RAND_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ADDITIONAL_INPUT_TOO_LONG),
-     "additional input too long"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ALREADY_INSTANTIATED),
-     "already instantiated"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ARGUMENT_OUT_OF_RANGE),
-     "argument out of range"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_CANNOT_OPEN_FILE), "Cannot open file"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_DRBG_ALREADY_INITIALIZED),
-     "drbg already initialized"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_DRBG_NOT_INITIALISED),
-     "drbg not initialised"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ENTROPY_INPUT_TOO_LONG),
-     "entropy input too long"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ENTROPY_OUT_OF_RANGE),
-     "entropy out of range"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_ENTROPY_POOL_WAS_IGNORED),
-     "error entropy pool was ignored"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_INITIALISING_DRBG),
-     "error initialising drbg"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_INSTANTIATING_DRBG),
-     "error instantiating drbg"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_RETRIEVING_ADDITIONAL_INPUT),
-     "error retrieving additional input"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_RETRIEVING_ENTROPY),
-     "error retrieving entropy"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_RETRIEVING_NONCE),
-     "error retrieving nonce"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_FAILED_TO_CREATE_LOCK),
-     "failed to create lock"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_FUNC_NOT_IMPLEMENTED),
-     "Function not implemented"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_FWRITE_ERROR), "Error writing file"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_GENERATE_ERROR), "generate error"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_INSUFFICIENT_DRBG_STRENGTH),
-     "insufficient drbg strength"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_INTERNAL_ERROR), "internal error"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_INVALID_PROPERTY_QUERY),
-     "invalid property query"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_IN_ERROR_STATE), "in error state"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_NOT_A_REGULAR_FILE),
-     "Not a regular file"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_NOT_INSTANTIATED), "not instantiated"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_NO_DRBG_IMPLEMENTATION_SELECTED),
-     "no drbg implementation selected"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PARENT_LOCKING_NOT_ENABLED),
-     "parent locking not enabled"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PARENT_STRENGTH_TOO_WEAK),
-     "parent strength too weak"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PERSONALISATION_STRING_TOO_LONG),
-     "personalisation string too long"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PREDICTION_RESISTANCE_NOT_SUPPORTED),
-     "prediction resistance not supported"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PRNG_NOT_SEEDED), "PRNG not seeded"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RANDOM_POOL_IS_EMPTY),
-     "random pool is empty"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RANDOM_POOL_OVERFLOW),
-     "random pool overflow"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RANDOM_POOL_UNDERFLOW),
-     "random pool underflow"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_REQUEST_TOO_LARGE_FOR_DRBG),
-     "request too large for drbg"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RESEED_ERROR), "reseed error"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_SELFTEST_FAILURE), "selftest failure"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_TOO_LITTLE_NONCE_REQUESTED),
-     "too little nonce requested"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_TOO_MUCH_NONCE_REQUESTED),
-     "too much nonce requested"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_CREATE_DRBG),
-     "unable to create drbg"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_FETCH_DRBG),
-     "unable to fetch drbg"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_GET_PARENT_RESEED_PROP_COUNTER),
-     "unable to get parent reseed prop counter"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_GET_PARENT_STRENGTH),
-     "unable to get parent strength"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_LOCK_PARENT),
-     "unable to lock parent"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNSUPPORTED_DRBG_FLAGS),
-     "unsupported drbg flags"},
-    {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNSUPPORTED_DRBG_TYPE),
-     "unsupported drbg type"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ADDITIONAL_INPUT_TOO_LONG),
+        "additional input too long" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ALREADY_INSTANTIATED),
+        "already instantiated" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ARGUMENT_OUT_OF_RANGE),
+        "argument out of range" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_CANNOT_OPEN_FILE), "Cannot open file" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_DRBG_ALREADY_INITIALIZED),
+        "drbg already initialized" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_DRBG_NOT_INITIALISED),
+        "drbg not initialised" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ENTROPY_INPUT_TOO_LONG),
+        "entropy input too long" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ENTROPY_OUT_OF_RANGE),
+        "entropy out of range" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_ENTROPY_POOL_WAS_IGNORED),
+        "error entropy pool was ignored" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_INITIALISING_DRBG),
+        "error initialising drbg" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_INSTANTIATING_DRBG),
+        "error instantiating drbg" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_RETRIEVING_ADDITIONAL_INPUT),
+        "error retrieving additional input" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_RETRIEVING_ENTROPY),
+        "error retrieving entropy" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ERROR_RETRIEVING_NONCE),
+        "error retrieving nonce" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_FAILED_TO_CREATE_LOCK),
+        "failed to create lock" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_FUNC_NOT_IMPLEMENTED),
+        "Function not implemented" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_FWRITE_ERROR), "Error writing file" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_GENERATE_ERROR), "generate error" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_INSUFFICIENT_DRBG_STRENGTH),
+        "insufficient drbg strength" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_INTERNAL_ERROR), "internal error" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_INVALID_PROPERTY_QUERY),
+        "invalid property query" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_IN_ERROR_STATE), "in error state" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_NOT_A_REGULAR_FILE),
+        "Not a regular file" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_NOT_INSTANTIATED), "not instantiated" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_NO_DRBG_IMPLEMENTATION_SELECTED),
+        "no drbg implementation selected" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PARENT_LOCKING_NOT_ENABLED),
+        "parent locking not enabled" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PARENT_STRENGTH_TOO_WEAK),
+        "parent strength too weak" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PERSONALISATION_STRING_TOO_LONG),
+        "personalisation string too long" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PREDICTION_RESISTANCE_NOT_SUPPORTED),
+        "prediction resistance not supported" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_PRNG_NOT_SEEDED), "PRNG not seeded" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RANDOM_POOL_IS_EMPTY),
+        "random pool is empty" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RANDOM_POOL_OVERFLOW),
+        "random pool overflow" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RANDOM_POOL_UNDERFLOW),
+        "random pool underflow" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_REQUEST_TOO_LARGE_FOR_DRBG),
+        "request too large for drbg" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_RESEED_ERROR), "reseed error" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_SELFTEST_FAILURE), "selftest failure" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_TOO_LITTLE_NONCE_REQUESTED),
+        "too little nonce requested" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_TOO_MUCH_NONCE_REQUESTED),
+        "too much nonce requested" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_CREATE_DRBG),
+        "unable to create drbg" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_FETCH_DRBG),
+        "unable to fetch drbg" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_GET_PARENT_RESEED_PROP_COUNTER),
+        "unable to get parent reseed prop counter" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_GET_PARENT_STRENGTH),
+        "unable to get parent strength" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_LOCK_PARENT),
+        "unable to lock parent" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNSUPPORTED_DRBG_FLAGS),
+        "unsupported drbg flags" },
+    { ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNSUPPORTED_DRBG_TYPE),
+        "unsupported drbg type" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 6b9ae7c06524a..f03bb2967c436 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -23,9 +23,11 @@
 #include "crypto/context.h"
 #include "internal/provider.h"
 
+/* clang-format off */
 #ifndef OPENSSL_DEFAULT_SEED_SRC
-# define OPENSSL_DEFAULT_SEED_SRC SEED-SRC
+#define OPENSSL_DEFAULT_SEED_SRC SEED-SRC
 #endif
+/* clang-format on */
 
 typedef struct rand_global_st {
     /*
@@ -59,7 +61,7 @@ typedef struct rand_global_st {
 #ifndef FIPS_MODULE
     OSSL_PROVIDER *random_provider;
     char *random_provider_name;
-#endif      /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
 
     /*
      * The <public> DRBG
@@ -102,16 +104,16 @@ static RAND_GLOBAL *rand_get_global(OSSL_LIB_CTX *libctx)
 }
 
 #ifndef FIPS_MODULE
-# include <stdio.h>
-# include <time.h>
-# include <limits.h>
-# include <openssl/conf.h>
-# include <openssl/trace.h>
-# include <openssl/engine.h>
-# include "crypto/rand_pool.h"
-# include "prov/seeding.h"
-# include "internal/e_os.h"
-# include "internal/property.h"
+#include <stdio.h>
+#include <time.h>
+#include <limits.h>
+#include <openssl/conf.h>
+#include <openssl/trace.h>
+#include <openssl/engine.h>
+#include "crypto/rand_pool.h"
+#include "prov/seeding.h"
+#include "internal/e_os.h"
+#include "internal/property.h"
 
 /*
  * The default name for the random provider.
@@ -123,40 +125,40 @@ static const char random_provider_fips_name[] = "fips";
 static int set_random_provider_name(RAND_GLOBAL *dgbl, const char *name)
 {
     if (dgbl->random_provider_name != NULL
-            && OPENSSL_strcasecmp(dgbl->random_provider_name, name) == 0)
+        && OPENSSL_strcasecmp(dgbl->random_provider_name, name) == 0)
         return 1;
 
     OPENSSL_free(dgbl->random_provider_name);
-    dgbl->random_provider_name = strdup(name);
+    dgbl->random_provider_name = OPENSSL_strdup(name);
     return dgbl->random_provider_name != NULL;
 }
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
 /* non-NULL if default_RAND_meth is ENGINE-provided */
 static ENGINE *funct_ref;
 static CRYPTO_RWLOCK *rand_engine_lock;
-# endif     /* !OPENSSL_NO_ENGINE */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif /* !OPENSSL_NO_ENGINE */
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 static CRYPTO_RWLOCK *rand_meth_lock;
 static const RAND_METHOD *default_RAND_meth;
-# endif     /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
 static CRYPTO_ONCE rand_init = CRYPTO_ONCE_STATIC_INIT;
 
 static int rand_inited = 0;
 
 DEFINE_RUN_ONCE_STATIC(do_rand_init)
 {
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
     rand_engine_lock = CRYPTO_THREAD_lock_new();
     if (rand_engine_lock == NULL)
         return 0;
-# endif     /* !OPENSSL_NO_ENGINE */
+#endif /* !OPENSSL_NO_ENGINE */
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     rand_meth_lock = CRYPTO_THREAD_lock_new();
     if (rand_meth_lock == NULL)
         goto err;
-# endif     /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
 
     if (!ossl_rand_pool_init())
         goto err;
@@ -164,21 +166,21 @@ DEFINE_RUN_ONCE_STATIC(do_rand_init)
     rand_inited = 1;
     return 1;
 
- err:
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+err:
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     CRYPTO_THREAD_lock_free(rand_meth_lock);
     rand_meth_lock = NULL;
-# endif     /* !OPENSSL_NO_DEPRECATED_3_0 */
-# ifndef OPENSSL_NO_ENGINE
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
+#ifndef OPENSSL_NO_ENGINE
     CRYPTO_THREAD_lock_free(rand_engine_lock);
     rand_engine_lock = NULL;
-# endif     /* !OPENSSL_NO_ENGINE */
+#endif /* !OPENSSL_NO_ENGINE */
     return 0;
 }
 
 void ossl_rand_cleanup_int(void)
 {
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     const RAND_METHOD *meth = default_RAND_meth;
 
     if (!rand_inited)
@@ -187,16 +189,16 @@ void ossl_rand_cleanup_int(void)
     if (meth != NULL && meth->cleanup != NULL)
         meth->cleanup();
     RAND_set_rand_method(NULL);
-# endif     /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
     ossl_rand_pool_cleanup();
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
     CRYPTO_THREAD_lock_free(rand_engine_lock);
     rand_engine_lock = NULL;
-# endif     /* !OPENSSL_NO_ENGINE */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif /* !OPENSSL_NO_ENGINE */
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     CRYPTO_THREAD_lock_free(rand_meth_lock);
     rand_meth_lock = NULL;
-# endif     /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
     ossl_release_default_drbg_ctx();
     rand_inited = 0;
 }
@@ -223,7 +225,7 @@ int RAND_poll(void)
 {
     static const char salt[] = "polling";
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     const RAND_METHOD *meth = RAND_get_rand_method();
     int ret = meth == RAND_OpenSSL();
 
@@ -233,8 +235,8 @@ int RAND_poll(void)
     if (!ret) {
         /* fill random pool and seed the current legacy RNG */
         RAND_POOL *pool = ossl_rand_pool_new(RAND_DRBG_STRENGTH, 1,
-                                             (RAND_DRBG_STRENGTH + 7) / 8,
-                                             RAND_POOL_MAX_LENGTH);
+            (RAND_DRBG_STRENGTH + 7) / 8,
+            RAND_POOL_MAX_LENGTH);
 
         if (pool == NULL)
             return 0;
@@ -244,34 +246,35 @@ int RAND_poll(void)
 
         if (meth->add == NULL
             || meth->add(ossl_rand_pool_buffer(pool),
-                         ossl_rand_pool_length(pool),
-                         (ossl_rand_pool_entropy(pool) / 8.0)) == 0)
+                   ossl_rand_pool_length(pool),
+                   (ossl_rand_pool_entropy(pool) / 8.0))
+                == 0)
             goto err;
 
         ret = 1;
-     err:
+    err:
         ossl_rand_pool_free(pool);
         return ret;
     }
-# endif     /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
 
     RAND_seed(salt, sizeof(salt));
     return 1;
 }
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 static int rand_set_rand_method_internal(const RAND_METHOD *meth,
-                                         ossl_unused ENGINE *e)
+    ossl_unused ENGINE *e)
 {
     if (!RUN_ONCE(&rand_init, do_rand_init))
         return 0;
 
     if (!CRYPTO_THREAD_write_lock(rand_meth_lock))
         return 0;
-#  ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
     ENGINE_finish(funct_ref);
     funct_ref = e;
-#  endif
+#endif
     default_RAND_meth = meth;
     CRYPTO_THREAD_unlock(rand_meth_lock);
     return 1;
@@ -289,6 +292,9 @@ const RAND_METHOD *RAND_get_rand_method(void)
     if (!RUN_ONCE(&rand_init, do_rand_init))
         return NULL;
 
+    if (rand_meth_lock == NULL)
+        return NULL;
+
     if (!CRYPTO_THREAD_read_lock(rand_meth_lock))
         return NULL;
     tmp_meth = default_RAND_meth;
@@ -299,28 +305,28 @@ const RAND_METHOD *RAND_get_rand_method(void)
     if (!CRYPTO_THREAD_write_lock(rand_meth_lock))
         return NULL;
     if (default_RAND_meth == NULL) {
-#  ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
         ENGINE *e;
 
         /* If we have an engine that can do RAND, use it. */
         if ((e = ENGINE_get_default_RAND()) != NULL
-                && (tmp_meth = ENGINE_get_RAND(e)) != NULL) {
+            && (tmp_meth = ENGINE_get_RAND(e)) != NULL) {
             funct_ref = e;
             default_RAND_meth = tmp_meth;
         } else {
             ENGINE_finish(e);
             default_RAND_meth = &ossl_rand_meth;
         }
-#  else
+#else
         default_RAND_meth = &ossl_rand_meth;
-#  endif
+#endif
     }
     tmp_meth = default_RAND_meth;
     CRYPTO_THREAD_unlock(rand_meth_lock);
     return tmp_meth;
 }
 
-#  if !defined(OPENSSL_NO_ENGINE)
+#if !defined(OPENSSL_NO_ENGINE)
 int RAND_set_rand_engine(ENGINE *engine)
 {
     const RAND_METHOD *tmp_meth = NULL;
@@ -347,20 +353,20 @@ int RAND_set_rand_engine(ENGINE *engine)
     CRYPTO_THREAD_unlock(rand_engine_lock);
     return 1;
 }
-#  endif
-# endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#endif
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 void RAND_seed(const void *buf, int num)
 {
     EVP_RAND_CTX *drbg;
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     const RAND_METHOD *meth = RAND_get_rand_method();
 
     if (meth != NULL && meth->seed != NULL) {
         meth->seed(buf, num);
         return;
     }
-# endif
+#endif
 
     drbg = RAND_get0_primary(NULL);
     if (drbg != NULL && num > 0)
@@ -370,26 +376,26 @@ void RAND_seed(const void *buf, int num)
 void RAND_add(const void *buf, int num, double randomness)
 {
     EVP_RAND_CTX *drbg;
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     const RAND_METHOD *meth = RAND_get_rand_method();
 
     if (meth != NULL && meth->add != NULL) {
         meth->add(buf, num, randomness);
         return;
     }
-# endif
+#endif
     drbg = RAND_get0_primary(NULL);
     if (drbg != NULL && num > 0)
-# ifdef OPENSSL_RAND_SEED_NONE
+#ifdef OPENSSL_RAND_SEED_NONE
         /* Without an entropy source, we have to rely on the user */
         EVP_RAND_reseed(drbg, 0, buf, num, NULL, 0);
-# else
+#else
         /* With an entropy source, we downgrade this to additional input */
         EVP_RAND_reseed(drbg, 0, NULL, 0, buf, num);
-# endif
+#endif
 }
 
-# if !defined(OPENSSL_NO_DEPRECATED_1_1_0)
+#if !defined(OPENSSL_NO_DEPRECATED_1_1_0)
 int RAND_pseudo_bytes(unsigned char *buf, int num)
 {
     const RAND_METHOD *meth = RAND_get_rand_method();
@@ -399,30 +405,30 @@ int RAND_pseudo_bytes(unsigned char *buf, int num)
     ERR_raise(ERR_LIB_RAND, RAND_R_FUNC_NOT_IMPLEMENTED);
     return -1;
 }
-# endif
+#endif
 
 int RAND_status(void)
 {
     EVP_RAND_CTX *rand;
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     const RAND_METHOD *meth = RAND_get_rand_method();
 
     if (meth != NULL && meth != RAND_OpenSSL())
         return meth->status != NULL ? meth->status() : 0;
-# endif
+#endif
 
     if ((rand = RAND_get0_primary(NULL)) == NULL)
         return 0;
     return EVP_RAND_get_state(rand) == EVP_RAND_STATE_READY;
 }
-# else  /* !FIPS_MODULE */
+#else /* !FIPS_MODULE */
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 const RAND_METHOD *RAND_get_rand_method(void)
 {
     return NULL;
 }
-# endif
+#endif
 #endif /* !FIPS_MODULE */
 
 /*
@@ -431,7 +437,7 @@ const RAND_METHOD *RAND_get_rand_method(void)
  * sure we're instantiated and use the private DRBG.
  */
 int RAND_priv_bytes_ex(OSSL_LIB_CTX *ctx, unsigned char *buf, size_t num,
-                       unsigned int strength)
+    unsigned int strength)
 {
     RAND_GLOBAL *dgbl;
     EVP_RAND_CTX *rand;
@@ -452,9 +458,9 @@ int RAND_priv_bytes_ex(OSSL_LIB_CTX *ctx, unsigned char *buf, size_t num,
 #ifndef FIPS_MODULE
     if (dgbl->random_provider != NULL)
         return ossl_provider_random_bytes(dgbl->random_provider,
-                                          OSSL_PROV_RANDOM_PRIVATE,
-                                          buf, num, strength);
-#endif      /* !FIPS_MODULE */
+            OSSL_PROV_RANDOM_PRIVATE,
+            buf, num, strength);
+#endif /* !FIPS_MODULE */
     rand = rand_get0_private(ctx, dgbl);
     if (rand != NULL)
         return EVP_RAND_generate(rand, buf, num, strength, 0, NULL, 0);
@@ -470,7 +476,7 @@ int RAND_priv_bytes(unsigned char *buf, int num)
 }
 
 int RAND_bytes_ex(OSSL_LIB_CTX *ctx, unsigned char *buf, size_t num,
-                  unsigned int strength)
+    unsigned int strength)
 {
     RAND_GLOBAL *dgbl;
     EVP_RAND_CTX *rand;
@@ -491,9 +497,9 @@ int RAND_bytes_ex(OSSL_LIB_CTX *ctx, unsigned char *buf, size_t num,
 #ifndef FIPS_MODULE
     if (dgbl->random_provider != NULL)
         return ossl_provider_random_bytes(dgbl->random_provider,
-                                          OSSL_PROV_RANDOM_PUBLIC,
-                                          buf, num, strength);
-#endif      /* !FIPS_MODULE */
+            OSSL_PROV_RANDOM_PUBLIC,
+            buf, num, strength);
+#endif /* !FIPS_MODULE */
 
     rand = rand_get0_public(ctx, dgbl);
     if (rand != NULL)
@@ -545,12 +551,12 @@ void *ossl_rand_ctx_new(OSSL_LIB_CTX *libctx)
 
     return dgbl;
 
- err2:
+err2:
     CRYPTO_THREAD_cleanup_local(&dgbl->private);
- err1:
+err1:
     CRYPTO_THREAD_lock_free(dgbl->lock);
 #ifndef FIPS_MODULE
- err0:
+err0:
     OPENSSL_free(dgbl->random_provider_name);
 #endif
     OPENSSL_free(dgbl);
@@ -571,7 +577,7 @@ void ossl_rand_ctx_free(void *vdgbl)
     EVP_RAND_CTX_free(dgbl->seed);
 #ifndef FIPS_MODULE
     OPENSSL_free(dgbl->random_provider_name);
-#endif      /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
     OPENSSL_free(dgbl->rng_name);
     OPENSSL_free(dgbl->rng_cipher);
     OPENSSL_free(dgbl->rng_digest);
@@ -607,7 +613,7 @@ static EVP_RAND_CTX *rand_new_seed(OSSL_LIB_CTX *libctx)
     const char *propq;
     char *name;
     EVP_RAND_CTX *ctx = NULL;
-# ifdef OPENSSL_NO_FIPS_JITTER
+#ifdef OPENSSL_NO_FIPS_JITTER
     RAND_GLOBAL *dgbl = rand_get_global(libctx);
 
     if (dgbl == NULL)
@@ -615,10 +621,10 @@ static EVP_RAND_CTX *rand_new_seed(OSSL_LIB_CTX *libctx)
     propq = dgbl->seed_propq;
     name = dgbl->seed_name != NULL ? dgbl->seed_name
                                    : OPENSSL_MSTR(OPENSSL_DEFAULT_SEED_SRC);
-# else /* !OPENSSL_NO_FIPS_JITTER */
+#else /* !OPENSSL_NO_FIPS_JITTER */
     name = "JITTER";
     propq = "";
-# endif /* OPENSSL_NO_FIPS_JITTER */
+#endif /* OPENSSL_NO_FIPS_JITTER */
 
     rand = EVP_RAND_fetch(libctx, name, propq);
     if (rand == NULL) {
@@ -636,11 +642,11 @@ static EVP_RAND_CTX *rand_new_seed(OSSL_LIB_CTX *libctx)
         goto err;
     }
     return ctx;
- err:
+err:
     EVP_RAND_CTX_free(ctx);
     return NULL;
 }
-#endif  /* !FIPS_MODULE || !OPENSSL_NO_FIPS_JITTER */
+#endif /* !FIPS_MODULE || !OPENSSL_NO_FIPS_JITTER */
 
 #ifndef FIPS_MODULE
 EVP_RAND_CTX *ossl_rand_get0_seed_noncreating(OSSL_LIB_CTX *ctx)
@@ -657,11 +663,11 @@ EVP_RAND_CTX *ossl_rand_get0_seed_noncreating(OSSL_LIB_CTX *ctx)
     CRYPTO_THREAD_unlock(dgbl->lock);
     return ret;
 }
-#endif  /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
 
 static EVP_RAND_CTX *rand_new_drbg(OSSL_LIB_CTX *libctx, EVP_RAND_CTX *parent,
-                                   unsigned int reseed_interval,
-                                   time_t reseed_time_interval)
+    unsigned int reseed_interval,
+    time_t reseed_time_interval)
 {
     EVP_RAND *rand;
     RAND_GLOBAL *dgbl = rand_get_global(libctx);
@@ -692,26 +698,26 @@ static EVP_RAND_CTX *rand_new_drbg(OSSL_LIB_CTX *libctx, EVP_RAND_CTX *parent,
     if (OSSL_PARAM_locate_const(settables, OSSL_DRBG_PARAM_CIPHER)) {
         cipher = dgbl->rng_cipher != NULL ? dgbl->rng_cipher : "AES-256-CTR";
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_CIPHER,
-                                                cipher, 0);
+            cipher, 0);
     }
     if (dgbl->rng_digest != NULL
-            && OSSL_PARAM_locate_const(settables, OSSL_DRBG_PARAM_DIGEST))
+        && OSSL_PARAM_locate_const(settables, OSSL_DRBG_PARAM_DIGEST))
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_DIGEST,
-                                                dgbl->rng_digest, 0);
+            dgbl->rng_digest, 0);
     if (prov_name != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_CORE_PROV_NAME,
-                                                (char *)prov_name, 0);
+            (char *)prov_name, 0);
     if (dgbl->rng_propq != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_PROPERTIES,
-                                                dgbl->rng_propq, 0);
+            dgbl->rng_propq, 0);
     if (OSSL_PARAM_locate_const(settables, OSSL_ALG_PARAM_MAC))
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_MAC, "HMAC", 0);
     if (OSSL_PARAM_locate_const(settables, OSSL_DRBG_PARAM_USE_DF))
         *p++ = OSSL_PARAM_construct_int(OSSL_DRBG_PARAM_USE_DF, &use_df);
     *p++ = OSSL_PARAM_construct_uint(OSSL_DRBG_PARAM_RESEED_REQUESTS,
-                                     &reseed_interval);
+        &reseed_interval);
     *p++ = OSSL_PARAM_construct_time_t(OSSL_DRBG_PARAM_RESEED_TIME_INTERVAL,
-                                       &reseed_time_interval);
+        &reseed_time_interval);
     *p = OSSL_PARAM_construct_end();
     if (!EVP_RAND_instantiate(ctx, 0, 0, NULL, 0, params)) {
         ERR_raise(ERR_LIB_RAND, RAND_R_ERROR_INSTANTIATING_DRBG);
@@ -746,7 +752,7 @@ static EVP_RAND_CTX *rand_new_crngt(OSSL_LIB_CTX *libctx, EVP_RAND_CTX *parent)
     }
     return ctx;
 }
-#endif  /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 
 /*
  * Get the primary random generator.
@@ -755,7 +761,7 @@ static EVP_RAND_CTX *rand_new_crngt(OSSL_LIB_CTX *libctx, EVP_RAND_CTX *parent)
  */
 static EVP_RAND_CTX *rand_get0_primary(OSSL_LIB_CTX *ctx, RAND_GLOBAL *dgbl)
 {
-    EVP_RAND_CTX *ret;
+    EVP_RAND_CTX *ret, *seed, *newseed = NULL, *primary;
 
     if (dgbl == NULL)
         return NULL;
@@ -764,47 +770,57 @@ static EVP_RAND_CTX *rand_get0_primary(OSSL_LIB_CTX *ctx, RAND_GLOBAL *dgbl)
         return NULL;
 
     ret = dgbl->primary;
+    seed = dgbl->seed;
     CRYPTO_THREAD_unlock(dgbl->lock);
 
     if (ret != NULL)
         return ret;
 
-    if (!CRYPTO_THREAD_write_lock(dgbl->lock))
-        return NULL;
-
-    ret = dgbl->primary;
-    if (ret != NULL) {
-        CRYPTO_THREAD_unlock(dgbl->lock);
-        return ret;
-    }
-
 #if !defined(FIPS_MODULE) || !defined(OPENSSL_NO_FIPS_JITTER)
     /* Create a seed source for libcrypto or jitter enabled FIPS provider */
-    if (dgbl->seed == NULL) {
+    if (seed == NULL) {
         ERR_set_mark();
-        dgbl->seed = rand_new_seed(ctx);
+        seed = newseed = rand_new_seed(ctx);
         ERR_pop_to_mark();
     }
-#endif  /* !FIPS_MODULE || !OPENSSL_NO_FIPS_JITTER */
+#endif /* !FIPS_MODULE || !OPENSSL_NO_FIPS_JITTER */
 
 #if defined(FIPS_MODULE)
     /* The FIPS provider has entropy health tests instead of the primary */
-    ret = rand_new_crngt(ctx, dgbl->seed);
-#else   /* FIPS_MODULE */
-    ret = rand_new_drbg(ctx, dgbl->seed, PRIMARY_RESEED_INTERVAL,
-                        PRIMARY_RESEED_TIME_INTERVAL);
-#endif  /* FIPS_MODULE */
+    ret = rand_new_crngt(ctx, seed);
+#else /* FIPS_MODULE */
+    ret = rand_new_drbg(ctx, seed, PRIMARY_RESEED_INTERVAL,
+        PRIMARY_RESEED_TIME_INTERVAL);
+#endif /* FIPS_MODULE */
 
     /*
      * The primary DRBG may be shared between multiple threads so we must
      * enable locking.
      */
-    dgbl->primary = ret;
-    if (ret != NULL && !EVP_RAND_enable_locking(ret)) {
-        ERR_raise(ERR_LIB_EVP, EVP_R_UNABLE_TO_ENABLE_LOCKING);
+    if (ret == NULL || !EVP_RAND_enable_locking(ret)) {
+        if (ret != NULL) {
+            ERR_raise(ERR_LIB_EVP, EVP_R_UNABLE_TO_ENABLE_LOCKING);
+            EVP_RAND_CTX_free(ret);
+        }
+        if (newseed == NULL)
+            return NULL;
+        /* else carry on and store seed */
+        ret = NULL;
+    }
+
+    if (!CRYPTO_THREAD_write_lock(dgbl->lock))
+        return NULL;
+
+    primary = dgbl->primary;
+    if (primary != NULL) {
+        CRYPTO_THREAD_unlock(dgbl->lock);
         EVP_RAND_CTX_free(ret);
-        ret = dgbl->primary = NULL;
+        EVP_RAND_CTX_free(newseed);
+        return primary;
     }
+    if (newseed != NULL)
+        dgbl->seed = newseed;
+    dgbl->primary = ret;
     CRYPTO_THREAD_unlock(dgbl->lock);
 
     return ret;
@@ -844,10 +860,10 @@ static EVP_RAND_CTX *rand_get0_public(OSSL_LIB_CTX *ctx, RAND_GLOBAL *dgbl)
          * used this thread.
          */
         if (CRYPTO_THREAD_get_local(&dgbl->private) == NULL
-                && !ossl_init_thread_start(NULL, ctx, rand_delete_thread_state))
+            && !ossl_init_thread_start(NULL, ctx, rand_delete_thread_state))
             return NULL;
         rand = rand_new_drbg(ctx, primary, SECONDARY_RESEED_INTERVAL,
-                             SECONDARY_RESEED_TIME_INTERVAL);
+            SECONDARY_RESEED_TIME_INTERVAL);
         CRYPTO_THREAD_set_local(&dgbl->public, rand);
     }
     return rand;
@@ -883,10 +899,10 @@ static EVP_RAND_CTX *rand_get0_private(OSSL_LIB_CTX *ctx, RAND_GLOBAL *dgbl)
          * used this thread.
          */
         if (CRYPTO_THREAD_get_local(&dgbl->public) == NULL
-                && !ossl_init_thread_start(NULL, ctx, rand_delete_thread_state))
+            && !ossl_init_thread_start(NULL, ctx, rand_delete_thread_state))
             return NULL;
         rand = rand_new_drbg(ctx, primary, SECONDARY_RESEED_INTERVAL,
-                             SECONDARY_RESEED_TIME_INTERVAL);
+            SECONDARY_RESEED_TIME_INTERVAL);
         CRYPTO_THREAD_set_local(&dgbl->private, rand);
     }
     return rand;
@@ -970,7 +986,7 @@ static int random_conf_init(CONF_IMODULE *md, const CONF *cnf)
     int i, r = 1;
 
     OSSL_TRACE1(CONF, "Loading random module: section %s\n",
-                CONF_imodule_get_value(md));
+        CONF_imodule_get_value(md));
 
     /* Value is a section containing RANDOM configuration */
     elist = NCONF_get_section(cnf, CONF_imodule_get_value(md));
@@ -1003,7 +1019,7 @@ static int random_conf_init(CONF_IMODULE *md, const CONF *cnf)
             if (!random_set_string(&dgbl->seed_propq, cval->value))
                 return 0;
         } else if (OPENSSL_strcasecmp(cval->name, "random_provider") == 0) {
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
             OSSL_PROVIDER *prov = ossl_provider_find(libctx, cval->value, 0);
 
             if (prov != NULL) {
@@ -1026,18 +1042,17 @@ static int random_conf_init(CONF_IMODULE *md, const CONF *cnf)
                 OSSL_PROVIDER_unload(prov);
             } else if (!set_random_provider_name(dgbl, cval->value))
                 return 0;
-# endif
+#endif
         } else {
             ERR_raise_data(ERR_LIB_CRYPTO,
-                           CRYPTO_R_UNKNOWN_NAME_IN_RANDOM_SECTION,
-                           "name=%s, value=%s", cval->name, cval->value);
+                CRYPTO_R_UNKNOWN_NAME_IN_RANDOM_SECTION,
+                "name=%s, value=%s", cval->name, cval->value);
             r = 0;
         }
     }
     return r;
 }
 
-
 static void random_conf_deinit(CONF_IMODULE *md)
 {
     OSSL_TRACE(CONF, "Cleaned up random\n");
@@ -1050,14 +1065,14 @@ void ossl_random_add_conf_module(void)
 }
 
 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)
 {
     RAND_GLOBAL *dgbl = rand_get_global(ctx);
 
     if (dgbl == NULL)
         return 0;
     if (dgbl->primary != NULL) {
-        ERR_raise(ERR_LIB_CRYPTO, RAND_R_ALREADY_INSTANTIATED);
+        ERR_raise(ERR_LIB_RAND, RAND_R_ALREADY_INSTANTIATED);
         return 0;
     }
     return random_set_string(&dgbl->rng_name, drbg)
@@ -1067,14 +1082,14 @@ int RAND_set_DRBG_type(OSSL_LIB_CTX *ctx, const char *drbg, const char *propq,
 }
 
 int RAND_set_seed_source_type(OSSL_LIB_CTX *ctx, const char *seed,
-                              const char *propq)
+    const char *propq)
 {
     RAND_GLOBAL *dgbl = rand_get_global(ctx);
 
     if (dgbl == NULL)
         return 0;
     if (dgbl->seed != NULL) {
-        ERR_raise(ERR_LIB_CRYPTO, RAND_R_ALREADY_INSTANTIATED);
+        ERR_raise(ERR_LIB_RAND, RAND_R_ALREADY_INSTANTIATED);
         return 0;
     }
     return random_set_string(&dgbl->seed_name, seed)
@@ -1110,7 +1125,7 @@ int RAND_set1_random_provider(OSSL_LIB_CTX *ctx, OSSL_PROVIDER *prov)
  * designated randomness provider and register it if it is.
  */
 int ossl_rand_check_random_provider_on_load(OSSL_LIB_CTX *ctx,
-                                            OSSL_PROVIDER *prov)
+    OSSL_PROVIDER *prov)
 {
     RAND_GLOBAL *dgbl = rand_get_global(ctx);
 
@@ -1134,7 +1149,7 @@ int ossl_rand_check_random_provider_on_load(OSSL_LIB_CTX *ctx,
  * we need to deregister it.
  */
 int ossl_rand_check_random_provider_on_unload(OSSL_LIB_CTX *ctx,
-                                              OSSL_PROVIDER *prov)
+    OSSL_PROVIDER *prov)
 {
     RAND_GLOBAL *dgbl = rand_get_global(ctx);
 
@@ -1146,4 +1161,4 @@ int ossl_rand_check_random_provider_on_unload(OSSL_LIB_CTX *ctx,
     return 1;
 }
 
-#endif      /* !FIPS_MODULE */
+#endif /* !FIPS_MODULE */
diff --git a/crypto/rand/rand_local.h b/crypto/rand/rand_local.h
index 31428f20c85e4..c11578dd4d43b 100644
--- a/crypto/rand/rand_local.h
+++ b/crypto/rand/rand_local.h
@@ -8,26 +8,26 @@
  */
 
 #ifndef OSSL_CRYPTO_RAND_LOCAL_H
-# define OSSL_CRYPTO_RAND_LOCAL_H
+#define OSSL_CRYPTO_RAND_LOCAL_H
 
-# include <openssl/aes.h>
-# include <openssl/evp.h>
-# include <openssl/sha.h>
-# include <openssl/hmac.h>
-# include <openssl/ec.h>
-# include <openssl/rand.h>
-# include "internal/tsan_assist.h"
-# include "crypto/rand.h"
+#include <openssl/aes.h>
+#include <openssl/evp.h>
+#include <openssl/sha.h>
+#include <openssl/hmac.h>
+#include <openssl/ec.h>
+#include <openssl/rand.h>
+#include "internal/tsan_assist.h"
+#include "crypto/rand.h"
 
 /* Default reseed intervals */
-# define PRIMARY_RESEED_INTERVAL                 (1 << 8)
-# define SECONDARY_RESEED_INTERVAL               (1 << 16)
-# define PRIMARY_RESEED_TIME_INTERVAL            (60 * 60) /* 1 hour */
-# define SECONDARY_RESEED_TIME_INTERVAL          (7 * 60)  /* 7 minutes */
+#define PRIMARY_RESEED_INTERVAL (1 << 8)
+#define SECONDARY_RESEED_INTERVAL (1 << 16)
+#define PRIMARY_RESEED_TIME_INTERVAL (60 * 60) /* 1 hour */
+#define SECONDARY_RESEED_TIME_INTERVAL (7 * 60) /* 7 minutes */
 
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
 /* The global RAND method, and the global buffer and DRBG instance. */
 extern RAND_METHOD ossl_rand_meth;
-# endif
+#endif
 
 #endif
diff --git a/crypto/rand/rand_meth.c b/crypto/rand/rand_meth.c
index 276763057db26..7f3e1ba64987c 100644
--- a/crypto/rand/rand_meth.c
+++ b/crypto/rand/rand_meth.c
@@ -36,7 +36,7 @@ static int drbg_status(void)
     if (drbg == NULL)
         return 0;
 
-    return  EVP_RAND_get_state(drbg) == EVP_RAND_STATE_READY ? 1 : 0;
+    return EVP_RAND_get_state(drbg) == EVP_RAND_STATE_READY ? 1 : 0;
 }
 
 /* Implements the default OpenSSL RAND_bytes() method */
diff --git a/crypto/rand/rand_pool.c b/crypto/rand/rand_pool.c
index 4f258b87ee4b6..cf2f8f359cadb 100644
--- a/crypto/rand/rand_pool.c
+++ b/crypto/rand/rand_pool.c
@@ -20,7 +20,7 @@
  * Allocate memory and initialize a new random 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 *pool = OPENSSL_zalloc(sizeof(*pool));
     size_t min_alloc_size = RAND_POOL_MIN_ALLOCATION(secure);
@@ -29,8 +29,7 @@ RAND_POOL *ossl_rand_pool_new(int entropy_requested, int secure,
         return NULL;
 
     pool->min_len = min_len;
-    pool->max_len = (max_len > RAND_POOL_MAX_LENGTH) ?
-        RAND_POOL_MAX_LENGTH : max_len;
+    pool->max_len = (max_len > RAND_POOL_MAX_LENGTH) ? RAND_POOL_MAX_LENGTH : max_len;
     pool->alloc_len = min_len < min_alloc_size ? min_alloc_size : min_len;
     if (pool->alloc_len > pool->max_len)
         pool->alloc_len = pool->max_len;
@@ -59,7 +58,7 @@ RAND_POOL *ossl_rand_pool_new(int entropy_requested, int secure,
  * provided by RAND_add() and RAND_seed() into the <master> DRBG.
  */
 RAND_POOL *ossl_rand_pool_attach(const unsigned char *buffer, size_t len,
-                                 size_t entropy)
+    size_t entropy)
 {
     RAND_POOL *pool = OPENSSL_zalloc(sizeof(*pool));
 
@@ -71,7 +70,7 @@ RAND_POOL *ossl_rand_pool_attach(const unsigned char *buffer, size_t len,
      * modified (in contrary to allocated buffers which are zeroed and
      * freed in the end).
      */
-    pool->buffer = (unsigned char *) buffer;
+    pool->buffer = (unsigned char *)buffer;
     pool->len = len;
 
     pool->attached = 1;
@@ -162,7 +161,6 @@ void ossl_rand_pool_reattach(RAND_POOL *pool, unsigned char *buffer)
 #define ENTROPY_TO_BYTES(bits, entropy_factor) \
     (((bits) * (entropy_factor) + 7) / 8)
 
-
 /*
  * Checks whether the |pool|'s entropy is available to the caller.
  * This is the case when entropy count and buffer length are high enough.
@@ -250,15 +248,14 @@ size_t ossl_rand_pool_bytes_needed(RAND_POOL *pool, unsigned int entropy_factor)
     if (bytes_needed > pool->max_len - pool->len) {
         /* not enough space left */
         ERR_raise_data(ERR_LIB_RAND, RAND_R_RANDOM_POOL_OVERFLOW,
-                       "entropy_factor=%u, entropy_needed=%zu, bytes_needed=%zu,"
-                       "pool->max_len=%zu, pool->len=%zu",
-                       entropy_factor, entropy_needed, bytes_needed,
-                       pool->max_len, pool->len);
+            "entropy_factor=%u, entropy_needed=%zu, bytes_needed=%zu,"
+            "pool->max_len=%zu, pool->len=%zu",
+            entropy_factor, entropy_needed, bytes_needed,
+            pool->max_len, pool->len);
         return 0;
     }
 
-    if (pool->len < pool->min_len &&
-        bytes_needed < pool->min_len - pool->len)
+    if (pool->len < pool->min_len && bytes_needed < pool->min_len - pool->len)
         /* to meet the min_len requirement */
         bytes_needed = pool->min_len - pool->len;
 
@@ -299,7 +296,7 @@ size_t ossl_rand_pool_bytes_remaining(RAND_POOL *pool)
  * Returns 1 if the added amount is adequate, otherwise 0
  */
 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)
 {
     if (len > pool->max_len - pool->len) {
         ERR_raise(ERR_LIB_RAND, RAND_R_ENTROPY_INPUT_TOO_LONG);
@@ -419,7 +416,7 @@ 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)
 {
     if (adin == NULL || adin_len == 0)
         /* Nothing to mix in -> success */
diff --git a/crypto/rand/rand_uniform.c b/crypto/rand/rand_uniform.c
index f0b199b95ade9..877150af4e538 100644
--- a/crypto/rand/rand_uniform.c
+++ b/crypto/rand/rand_uniform.c
@@ -24,9 +24,9 @@
  */
 uint32_t ossl_rand_uniform_uint32(OSSL_LIB_CTX *ctx, uint32_t upper, int *err)
 {
-    uint32_t i, f;      /* integer and fractional parts */
-    uint32_t f2, rand;  /* extra fractional part and random material */
-    uint64_t prod;      /* temporary holding double width product */
+    uint32_t i, f; /* integer and fractional parts */
+    uint32_t f2, rand; /* extra fractional part and random material */
+    uint64_t prod; /* temporary holding double width product */
     const int max_followup_iterations = 10;
     int j;
 
@@ -56,7 +56,7 @@ uint32_t ossl_rand_uniform_uint32(OSSL_LIB_CTX *ctx, uint32_t upper, int *err)
     prod = (uint64_t)upper * rand;
     i = prod >> 32;
     f = prod & 0xffffffff;
-    if (ossl_likely(f <= 1 + ~upper))    /* 1+~upper == -upper but compilers whine */
+    if (ossl_likely(f <= 1 + ~upper)) /* 1+~upper == -upper but compilers whine */
         return i;
 
     /*
@@ -99,7 +99,7 @@ uint32_t ossl_rand_uniform_uint32(OSSL_LIB_CTX *ctx, uint32_t upper, int *err)
 }
 
 uint32_t ossl_rand_range_uint32(OSSL_LIB_CTX *ctx, uint32_t lower, uint32_t upper,
-                                int *err)
+    int *err)
 {
     if (!ossl_assert(lower < upper)) {
         *err = 1;
diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 9337b36dc8b9f..89797ec9649d3 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -7,13 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 
-#if defined (__TANDEM) && defined (_SPT_MODEL_)
+#if defined(__TANDEM) && defined(_SPT_MODEL_)
 /*
  * These definitions have to come first in SPT due to scoping of the
  * declarations in c99 associated with SPT use of stat.
  */
-# include <sys/types.h>
-# include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #endif
 
 #include "internal/e_os.h"
@@ -29,22 +29,22 @@
 #include <openssl/buffer.h>
 
 #ifdef OPENSSL_SYS_VMS
-# include <unixio.h>
+#include <unixio.h>
 #endif
 #include <sys/types.h>
 #ifndef OPENSSL_NO_POSIX_IO
-# include <sys/stat.h>
-# include <fcntl.h>
-# if defined(_WIN32) && !defined(_WIN32_WCE)
-#  include <windows.h>
-#  include <io.h>
-#  define stat    _stat
-#  define chmod   _chmod
-#  define open    _open
-#  define fdopen  _fdopen
-#  define fstat   _fstat
-#  define fileno  _fileno
-# endif
+#include <sys/stat.h>
+#include <fcntl.h>
+#if defined(_WIN32) && !defined(_WIN32_WCE)
+#include <windows.h>
+#include <io.h>
+#define stat _stat
+#define chmod _chmod
+#define open _open
+#define fdopen _fdopen
+#define fstat _fstat
+#define fileno _fileno
+#endif
 #endif
 
 /*
@@ -54,9 +54,9 @@
  * would look like ((m) & MASK == TYPE), but since MASK availability
  * is as questionable, we settle for this poor-man fallback...
  */
-# if !defined(S_ISREG)
-#   define S_ISREG(m) ((m) & S_IFREG)
-# endif
+#if !defined(S_ISREG)
+#define S_ISREG(m) ((m) & S_IFREG)
+#endif
 
 #define RAND_BUF_SIZE 1024
 #define RFILE ".rnd"
@@ -70,11 +70,10 @@
  * This declaration is a nasty hack to get around vms' extension to fopen for
  * passing in sharing options being disabled by /STANDARD=ANSI89
  */
-static __FILE_ptr32 (*const vms_fopen)(const char *, const char *, ...) =
-        (__FILE_ptr32 (*)(const char *, const char *, ...))fopen;
-# define VMS_OPEN_ATTRS \
-        "shr=get,put,upd,del","ctx=bin,stm","rfm=stm","rat=none","mrs=0"
-# define openssl_fopen(fname, mode) vms_fopen((fname), (mode), VMS_OPEN_ATTRS)
+static __FILE_ptr32 (*const vms_fopen)(const char *, const char *, ...) = (__FILE_ptr32 (*)(const char *, const char *, ...))fopen;
+#define VMS_OPEN_ATTRS \
+    "shr=get,put,upd,del", "ctx=bin,stm", "rfm=stm", "rat=none", "mrs=0"
+#define openssl_fopen(fname, mode) vms_fopen((fname), (mode), VMS_OPEN_ATTRS)
 #endif
 
 /*
@@ -105,14 +104,14 @@ int RAND_load_file(const char *file, long bytes)
 
     if ((in = openssl_fopen(file, "rb")) == NULL) {
         ERR_raise_data(ERR_LIB_RAND, RAND_R_CANNOT_OPEN_FILE,
-                       "Filename=%s", file);
+            "Filename=%s", file);
         return -1;
     }
 
 #ifndef OPENSSL_NO_POSIX_IO
     if (fstat(fileno(in), &sb) < 0) {
         ERR_raise_data(ERR_LIB_RAND, RAND_R_INTERNAL_ERROR,
-                       "Filename=%s", file);
+            "Filename=%s", file);
         fclose(in);
         return -1;
     }
@@ -132,8 +131,8 @@ int RAND_load_file(const char *file, long bytes)
      * temporarily.
      */
 #if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma environment save
-# pragma message disable maylosedata2
+#pragma environment save
+#pragma message disable maylosedata2
 #endif
     /*
      * Don't buffer, because even if |file| is regular file, we have
@@ -142,7 +141,7 @@ int RAND_load_file(const char *file, long bytes)
      */
     setbuf(in, NULL);
 #if defined(OPENSSL_SYS_VMS) && defined(__DECC)
-# pragma environment restore
+#pragma environment restore
 #endif
 
     for (;;) {
@@ -167,6 +166,10 @@ int RAND_load_file(const char *file, long bytes)
         /* If given a bytecount, and we did it, break. */
         if (bytes > 0 && (bytes -= i) <= 0)
             break;
+
+        /* We can hit a signed integer overflow on the next iteration */
+        if (ret > INT_MAX - RAND_LOAD_BUF_SIZE)
+            break;
     }
 
     OPENSSL_cleanse(buf, sizeof(buf));
@@ -189,21 +192,20 @@ int RAND_write_file(const char *file)
 
     if (stat(file, &sb) >= 0 && !S_ISREG(sb.st_mode)) {
         ERR_raise_data(ERR_LIB_RAND, RAND_R_NOT_A_REGULAR_FILE,
-                       "Filename=%s", file);
+            "Filename=%s", file);
         return -1;
     }
 #endif
 
     /* Collect enough random data. */
     if (RAND_priv_bytes(buf, (int)sizeof(buf)) != 1)
-        return  -1;
+        return -1;
 
-#if defined(O_CREAT) && !defined(OPENSSL_NO_POSIX_IO) && \
-    !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WINDOWS)
+#if defined(O_CREAT) && !defined(OPENSSL_NO_POSIX_IO) && !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WINDOWS)
     {
-# ifndef O_BINARY
-#  define O_BINARY 0
-# endif
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
         /*
          * chmod(..., 0600) is too late to protect the file, permissions
          * should be restrictive from the start
@@ -215,7 +217,7 @@ int RAND_write_file(const char *file)
             if (out == NULL) {
                 close(fd);
                 ERR_raise_data(ERR_LIB_RAND, RAND_R_CANNOT_OPEN_FILE,
-                               "Filename=%s", file);
+                    "Filename=%s", file);
                 return -1;
             }
         }
@@ -247,7 +249,7 @@ int RAND_write_file(const char *file)
         out = openssl_fopen(file, "wb");
     if (out == NULL) {
         ERR_raise_data(ERR_LIB_RAND, RAND_R_CANNOT_OPEN_FILE,
-                       "Filename=%s", file);
+            "Filename=%s", file);
         return -1;
     }
 
@@ -278,8 +280,9 @@ const char *RAND_file_name(char *buf, size_t size)
     if ((envlen = GetEnvironmentVariableW(var = L"RANDFILE", NULL, 0)) == 0) {
         use_randfile = 0;
         if ((envlen = GetEnvironmentVariableW(var = L"HOME", NULL, 0)) == 0
-                && (envlen = GetEnvironmentVariableW(var = L"USERPROFILE",
-                                                  NULL, 0)) == 0)
+            && (envlen = GetEnvironmentVariableW(var = L"USERPROFILE",
+                    NULL, 0))
+                == 0)
             envlen = GetEnvironmentVariableW(var = L"SYSTEMROOT", NULL, 0);
     }
 
@@ -289,11 +292,13 @@ const char *RAND_file_name(char *buf, size_t size)
         WCHAR *val = _alloca(envlen * sizeof(WCHAR));
 
         if (GetEnvironmentVariableW(var, val, envlen) < envlen
-                && (sz = WideCharToMultiByte(CP_UTF8, 0, val, -1, NULL, 0,
-                                             NULL, NULL)) != 0) {
+            && (sz = WideCharToMultiByte(CP_UTF8, 0, val, -1, NULL, 0,
+                    NULL, NULL))
+                != 0) {
             s = _alloca(sz);
             if (WideCharToMultiByte(CP_UTF8, 0, val, -1, s, sz,
-                                    NULL, NULL) == 0)
+                    NULL, NULL)
+                == 0)
                 s = NULL;
         }
     }
diff --git a/crypto/rc2/rc2_cbc.c b/crypto/rc2/rc2_cbc.c
index d37093fcc76c1..46baa9b772d87 100644
--- a/crypto/rc2/rc2_cbc.c
+++ b/crypto/rc2/rc2_cbc.c
@@ -17,7 +17,7 @@
 #include "rc2_local.h"
 
 void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                     RC2_KEY *ks, unsigned char *iv, int encrypt)
+    RC2_KEY *ks, unsigned char *iv, int encrypt)
 {
     register unsigned long tin0, tin1;
     register unsigned long tout0, tout1, xor0, xor1;
@@ -99,11 +99,11 @@ void RC2_encrypt(unsigned long *d, RC2_KEY *key)
     unsigned long l;
 
     l = d[0];
-    x0 = (RC2_INT) l & 0xffff;
-    x1 = (RC2_INT) (l >> 16L);
+    x0 = (RC2_INT)l & 0xffff;
+    x1 = (RC2_INT)(l >> 16L);
     l = d[1];
-    x2 = (RC2_INT) l & 0xffff;
-    x3 = (RC2_INT) (l >> 16L);
+    x2 = (RC2_INT)l & 0xffff;
+    x3 = (RC2_INT)(l >> 16L);
 
     n = 3;
     i = 5;
@@ -131,10 +131,8 @@ void RC2_encrypt(unsigned long *d, RC2_KEY *key)
         }
     }
 
-    d[0] =
-        (unsigned long)(x0 & 0xffff) | ((unsigned long)(x1 & 0xffff) << 16L);
-    d[1] =
-        (unsigned long)(x2 & 0xffff) | ((unsigned long)(x3 & 0xffff) << 16L);
+    d[0] = (unsigned long)(x0 & 0xffff) | ((unsigned long)(x1 & 0xffff) << 16L);
+    d[1] = (unsigned long)(x2 & 0xffff) | ((unsigned long)(x3 & 0xffff) << 16L);
 }
 
 void RC2_decrypt(unsigned long *d, RC2_KEY *key)
@@ -145,11 +143,11 @@ void RC2_decrypt(unsigned long *d, RC2_KEY *key)
     unsigned long l;
 
     l = d[0];
-    x0 = (RC2_INT) l & 0xffff;
-    x1 = (RC2_INT) (l >> 16L);
+    x0 = (RC2_INT)l & 0xffff;
+    x1 = (RC2_INT)(l >> 16L);
     l = d[1];
-    x2 = (RC2_INT) l & 0xffff;
-    x3 = (RC2_INT) (l >> 16L);
+    x2 = (RC2_INT)l & 0xffff;
+    x3 = (RC2_INT)(l >> 16L);
 
     n = 3;
     i = 5;
@@ -178,8 +176,6 @@ void RC2_decrypt(unsigned long *d, RC2_KEY *key)
         }
     }
 
-    d[0] =
-        (unsigned long)(x0 & 0xffff) | ((unsigned long)(x1 & 0xffff) << 16L);
-    d[1] =
-        (unsigned long)(x2 & 0xffff) | ((unsigned long)(x3 & 0xffff) << 16L);
+    d[0] = (unsigned long)(x0 & 0xffff) | ((unsigned long)(x1 & 0xffff) << 16L);
+    d[1] = (unsigned long)(x2 & 0xffff) | ((unsigned long)(x3 & 0xffff) << 16L);
 }
diff --git a/crypto/rc2/rc2_ecb.c b/crypto/rc2/rc2_ecb.c
index 8861d05673b91..d305cc8060ffe 100644
--- a/crypto/rc2/rc2_ecb.c
+++ b/crypto/rc2/rc2_ecb.c
@@ -26,7 +26,7 @@
  */
 
 void RC2_ecb_encrypt(const unsigned char *in, unsigned char *out, RC2_KEY *ks,
-                     int encrypt)
+    int encrypt)
 {
     unsigned long l, d[2];
 
diff --git a/crypto/rc2/rc2_local.h b/crypto/rc2/rc2_local.h
index f9ca888a638c5..f4bd06aaa669d 100644
--- a/crypto/rc2/rc2_local.h
+++ b/crypto/rc2/rc2_local.h
@@ -8,61 +8,78 @@
  */
 
 #undef c2l
-#define c2l(c,l)        (l =((unsigned long)(*((c)++)))    , \
-                         l|=((unsigned long)(*((c)++)))<< 8L, \
-                         l|=((unsigned long)(*((c)++)))<<16L, \
-                         l|=((unsigned long)(*((c)++)))<<24L)
+#define c2l(c, l) (l = ((unsigned long)(*((c)++))), \
+    l |= ((unsigned long)(*((c)++))) << 8L,         \
+    l |= ((unsigned long)(*((c)++))) << 16L,        \
+    l |= ((unsigned long)(*((c)++))) << 24L)
 
 /* NOTE - c is not incremented as per c2l */
 #undef c2ln
-#define c2ln(c,l1,l2,n) { \
-                        c+=n; \
-                        l1=l2=0; \
-                        switch (n) { \
-                        case 8: l2 =((unsigned long)(*(--(c))))<<24L; \
-                        /* fall through */                               \
-                        case 7: l2|=((unsigned long)(*(--(c))))<<16L; \
-                        /* fall through */                               \
-                        case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \
-                        /* fall through */                               \
-                        case 5: l2|=((unsigned long)(*(--(c))));      \
-                        /* fall through */                               \
-                        case 4: l1 =((unsigned long)(*(--(c))))<<24L; \
-                        /* fall through */                               \
-                        case 3: l1|=((unsigned long)(*(--(c))))<<16L; \
-                        /* fall through */                               \
-                        case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \
-                        /* fall through */                               \
-                        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)))) << 24L;  \
+        /* fall through */                            \
+        case 7:                                       \
+            l2 |= ((unsigned long)(*(--(c)))) << 16L; \
+        /* fall through */                            \
+        case 6:                                       \
+            l2 |= ((unsigned long)(*(--(c)))) << 8L;  \
+        /* fall through */                            \
+        case 5:                                       \
+            l2 |= ((unsigned long)(*(--(c))));        \
+        /* fall through */                            \
+        case 4:                                       \
+            l1 = ((unsigned long)(*(--(c)))) << 24L;  \
+        /* fall through */                            \
+        case 3:                                       \
+            l1 |= ((unsigned long)(*(--(c)))) << 16L; \
+        /* fall through */                            \
+        case 2:                                       \
+            l1 |= ((unsigned long)(*(--(c)))) << 8L;  \
+        /* fall through */                            \
+        case 1:                                       \
+            l1 |= ((unsigned long)(*(--(c))));        \
+        }                                             \
+    }
 
 #undef l2c
-#define l2c(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>24L)&0xff))
+#define l2c(l, c) (*((c)++) = (unsigned char)(((l)) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 8L) & 0xff),          \
+    *((c)++) = (unsigned char)(((l) >> 16L) & 0xff),         \
+    *((c)++) = (unsigned char)(((l) >> 24L) & 0xff))
 
 /* NOTE - c is not incremented as per l2c */
 #undef l2cn
-#define l2cn(l1,l2,c,n) { \
-                        c+=n; \
-                        switch (n) { \
-                        case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \
-                        /* fall through */                                     \
-                        case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \
-                        /* fall through */                                     \
-                        case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \
-                        /* fall through */                                     \
-                        case 5: *(--(c))=(unsigned char)(((l2)     )&0xff); \
-                        /* fall through */                                     \
-                        case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \
-                        /* fall through */                                     \
-                        case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \
-                        /* fall through */                                     \
-                        case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \
-                        /* fall through */                                     \
-                        case 1: *(--(c))=(unsigned char)(((l1)     )&0xff); \
-                                } \
-                        }
-
+#define l2cn(l1, l2, c, n)                                    \
+    {                                                         \
+        c += n;                                               \
+        switch (n) {                                          \
+        case 8:                                               \
+            *(--(c)) = (unsigned char)(((l2) >> 24L) & 0xff); \
+        /* fall through */                                    \
+        case 7:                                               \
+            *(--(c)) = (unsigned char)(((l2) >> 16L) & 0xff); \
+        /* fall through */                                    \
+        case 6:                                               \
+            *(--(c)) = (unsigned char)(((l2) >> 8L) & 0xff);  \
+        /* fall through */                                    \
+        case 5:                                               \
+            *(--(c)) = (unsigned char)(((l2)) & 0xff);        \
+        /* fall through */                                    \
+        case 4:                                               \
+            *(--(c)) = (unsigned char)(((l1) >> 24L) & 0xff); \
+        /* fall through */                                    \
+        case 3:                                               \
+            *(--(c)) = (unsigned char)(((l1) >> 16L) & 0xff); \
+        /* fall through */                                    \
+        case 2:                                               \
+            *(--(c)) = (unsigned char)(((l1) >> 8L) & 0xff);  \
+        /* fall through */                                    \
+        case 1:                                               \
+            *(--(c)) = (unsigned char)(((l1)) & 0xff);        \
+        }                                                     \
+    }
diff --git a/crypto/rc2/rc2_skey.c b/crypto/rc2/rc2_skey.c
index e43b84af1715f..e82a7627a0520 100644
--- a/crypto/rc2/rc2_skey.c
+++ b/crypto/rc2/rc2_skey.c
@@ -17,32 +17,266 @@
 #include "rc2_local.h"
 
 static const unsigned char key_table[256] = {
-    0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, 0x28, 0xe9, 0xfd, 0x79,
-    0x4a, 0xa0, 0xd8, 0x9d, 0xc6, 0x7e, 0x37, 0x83, 0x2b, 0x76, 0x53, 0x8e,
-    0x62, 0x4c, 0x64, 0x88, 0x44, 0x8b, 0xfb, 0xa2, 0x17, 0x9a, 0x59, 0xf5,
-    0x87, 0xb3, 0x4f, 0x13, 0x61, 0x45, 0x6d, 0x8d, 0x09, 0x81, 0x7d, 0x32,
-    0xbd, 0x8f, 0x40, 0xeb, 0x86, 0xb7, 0x7b, 0x0b, 0xf0, 0x95, 0x21, 0x22,
-    0x5c, 0x6b, 0x4e, 0x82, 0x54, 0xd6, 0x65, 0x93, 0xce, 0x60, 0xb2, 0x1c,
-    0x73, 0x56, 0xc0, 0x14, 0xa7, 0x8c, 0xf1, 0xdc, 0x12, 0x75, 0xca, 0x1f,
-    0x3b, 0xbe, 0xe4, 0xd1, 0x42, 0x3d, 0xd4, 0x30, 0xa3, 0x3c, 0xb6, 0x26,
-    0x6f, 0xbf, 0x0e, 0xda, 0x46, 0x69, 0x07, 0x57, 0x27, 0xf2, 0x1d, 0x9b,
-    0xbc, 0x94, 0x43, 0x03, 0xf8, 0x11, 0xc7, 0xf6, 0x90, 0xef, 0x3e, 0xe7,
-    0x06, 0xc3, 0xd5, 0x2f, 0xc8, 0x66, 0x1e, 0xd7, 0x08, 0xe8, 0xea, 0xde,
-    0x80, 0x52, 0xee, 0xf7, 0x84, 0xaa, 0x72, 0xac, 0x35, 0x4d, 0x6a, 0x2a,
-    0x96, 0x1a, 0xd2, 0x71, 0x5a, 0x15, 0x49, 0x74, 0x4b, 0x9f, 0xd0, 0x5e,
-    0x04, 0x18, 0xa4, 0xec, 0xc2, 0xe0, 0x41, 0x6e, 0x0f, 0x51, 0xcb, 0xcc,
-    0x24, 0x91, 0xaf, 0x50, 0xa1, 0xf4, 0x70, 0x39, 0x99, 0x7c, 0x3a, 0x85,
-    0x23, 0xb8, 0xb4, 0x7a, 0xfc, 0x02, 0x36, 0x5b, 0x25, 0x55, 0x97, 0x31,
-    0x2d, 0x5d, 0xfa, 0x98, 0xe3, 0x8a, 0x92, 0xae, 0x05, 0xdf, 0x29, 0x10,
-    0x67, 0x6c, 0xba, 0xc9, 0xd3, 0x00, 0xe6, 0xcf, 0xe1, 0x9e, 0xa8, 0x2c,
-    0x63, 0x16, 0x01, 0x3f, 0x58, 0xe2, 0x89, 0xa9, 0x0d, 0x38, 0x34, 0x1b,
-    0xab, 0x33, 0xff, 0xb0, 0xbb, 0x48, 0x0c, 0x5f, 0xb9, 0xb1, 0xcd, 0x2e,
-    0xc5, 0xf3, 0xdb, 0x47, 0xe5, 0xa5, 0x9c, 0x77, 0x0a, 0xa6, 0x20, 0x68,
-    0xfe, 0x7f, 0xc1, 0xad,
+    0xd9,
+    0x78,
+    0xf9,
+    0xc4,
+    0x19,
+    0xdd,
+    0xb5,
+    0xed,
+    0x28,
+    0xe9,
+    0xfd,
+    0x79,
+    0x4a,
+    0xa0,
+    0xd8,
+    0x9d,
+    0xc6,
+    0x7e,
+    0x37,
+    0x83,
+    0x2b,
+    0x76,
+    0x53,
+    0x8e,
+    0x62,
+    0x4c,
+    0x64,
+    0x88,
+    0x44,
+    0x8b,
+    0xfb,
+    0xa2,
+    0x17,
+    0x9a,
+    0x59,
+    0xf5,
+    0x87,
+    0xb3,
+    0x4f,
+    0x13,
+    0x61,
+    0x45,
+    0x6d,
+    0x8d,
+    0x09,
+    0x81,
+    0x7d,
+    0x32,
+    0xbd,
+    0x8f,
+    0x40,
+    0xeb,
+    0x86,
+    0xb7,
+    0x7b,
+    0x0b,
+    0xf0,
+    0x95,
+    0x21,
+    0x22,
+    0x5c,
+    0x6b,
+    0x4e,
+    0x82,
+    0x54,
+    0xd6,
+    0x65,
+    0x93,
+    0xce,
+    0x60,
+    0xb2,
+    0x1c,
+    0x73,
+    0x56,
+    0xc0,
+    0x14,
+    0xa7,
+    0x8c,
+    0xf1,
+    0xdc,
+    0x12,
+    0x75,
+    0xca,
+    0x1f,
+    0x3b,
+    0xbe,
+    0xe4,
+    0xd1,
+    0x42,
+    0x3d,
+    0xd4,
+    0x30,
+    0xa3,
+    0x3c,
+    0xb6,
+    0x26,
+    0x6f,
+    0xbf,
+    0x0e,
+    0xda,
+    0x46,
+    0x69,
+    0x07,
+    0x57,
+    0x27,
+    0xf2,
+    0x1d,
+    0x9b,
+    0xbc,
+    0x94,
+    0x43,
+    0x03,
+    0xf8,
+    0x11,
+    0xc7,
+    0xf6,
+    0x90,
+    0xef,
+    0x3e,
+    0xe7,
+    0x06,
+    0xc3,
+    0xd5,
+    0x2f,
+    0xc8,
+    0x66,
+    0x1e,
+    0xd7,
+    0x08,
+    0xe8,
+    0xea,
+    0xde,
+    0x80,
+    0x52,
+    0xee,
+    0xf7,
+    0x84,
+    0xaa,
+    0x72,
+    0xac,
+    0x35,
+    0x4d,
+    0x6a,
+    0x2a,
+    0x96,
+    0x1a,
+    0xd2,
+    0x71,
+    0x5a,
+    0x15,
+    0x49,
+    0x74,
+    0x4b,
+    0x9f,
+    0xd0,
+    0x5e,
+    0x04,
+    0x18,
+    0xa4,
+    0xec,
+    0xc2,
+    0xe0,
+    0x41,
+    0x6e,
+    0x0f,
+    0x51,
+    0xcb,
+    0xcc,
+    0x24,
+    0x91,
+    0xaf,
+    0x50,
+    0xa1,
+    0xf4,
+    0x70,
+    0x39,
+    0x99,
+    0x7c,
+    0x3a,
+    0x85,
+    0x23,
+    0xb8,
+    0xb4,
+    0x7a,
+    0xfc,
+    0x02,
+    0x36,
+    0x5b,
+    0x25,
+    0x55,
+    0x97,
+    0x31,
+    0x2d,
+    0x5d,
+    0xfa,
+    0x98,
+    0xe3,
+    0x8a,
+    0x92,
+    0xae,
+    0x05,
+    0xdf,
+    0x29,
+    0x10,
+    0x67,
+    0x6c,
+    0xba,
+    0xc9,
+    0xd3,
+    0x00,
+    0xe6,
+    0xcf,
+    0xe1,
+    0x9e,
+    0xa8,
+    0x2c,
+    0x63,
+    0x16,
+    0x01,
+    0x3f,
+    0x58,
+    0xe2,
+    0x89,
+    0xa9,
+    0x0d,
+    0x38,
+    0x34,
+    0x1b,
+    0xab,
+    0x33,
+    0xff,
+    0xb0,
+    0xbb,
+    0x48,
+    0x0c,
+    0x5f,
+    0xb9,
+    0xb1,
+    0xcd,
+    0x2e,
+    0xc5,
+    0xf3,
+    0xdb,
+    0x47,
+    0xe5,
+    0xa5,
+    0x9c,
+    0x77,
+    0x0a,
+    0xa6,
+    0x20,
+    0x68,
+    0xfe,
+    0x7f,
+    0xc1,
+    0xad,
 };
 
 #if defined(_MSC_VER) && defined(_ARM_)
-# pragma optimize("g",off)
+#pragma optimize("g", off)
 #endif
 
 /*
@@ -60,7 +294,7 @@ void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits)
     unsigned int c, d;
 
     k = (unsigned char *)&(key->data[0]);
-    *k = 0;                     /* for if there is a zero length key */
+    *k = 0; /* for if there is a zero length key */
 
     if (len > 128)
         len = 128;
@@ -100,5 +334,5 @@ void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits)
 }
 
 #if defined(_MSC_VER)
-# pragma optimize("",on)
+#pragma optimize("", on)
 #endif
diff --git a/crypto/rc2/rc2cfb64.c b/crypto/rc2/rc2cfb64.c
index 19612d933383d..ccc69fa6bf8da 100644
--- a/crypto/rc2/rc2cfb64.c
+++ b/crypto/rc2/rc2cfb64.c
@@ -23,8 +23,8 @@
  */
 
 void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, RC2_KEY *schedule, unsigned char *ivec,
-                       int *num, int encrypt)
+    long length, RC2_KEY *schedule, unsigned char *ivec,
+    int *num, int encrypt)
 {
     register unsigned long v0, v1, t;
     register int n = *num;
diff --git a/crypto/rc2/rc2ofb64.c b/crypto/rc2/rc2ofb64.c
index 82c34b3aab02c..b659b72a1005e 100644
--- a/crypto/rc2/rc2ofb64.c
+++ b/crypto/rc2/rc2ofb64.c
@@ -22,8 +22,8 @@
  * used is contained in *num;
  */
 void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, RC2_KEY *schedule, unsigned char *ivec,
-                       int *num)
+    long length, RC2_KEY *schedule, unsigned char *ivec,
+    int *num)
 {
     register unsigned long v0, v1, t;
     register int n = *num;
diff --git a/crypto/rc4/rc4_enc.c b/crypto/rc4/rc4_enc.c
index 4015332757e31..e4f9addb918f6 100644
--- a/crypto/rc4/rc4_enc.c
+++ b/crypto/rc4/rc4_enc.c
@@ -25,7 +25,7 @@
  */
 
 void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
-         unsigned char *outdata)
+    unsigned char *outdata)
 {
     register RC4_INT *d;
     register RC4_INT x, y, tx, ty;
@@ -35,13 +35,13 @@ void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
     y = key->y;
     d = key->data;
 
-#define LOOP(in,out) \
-                x=((x+1)&0xff); \
-                tx=d[x]; \
-                y=(tx+y)&0xff; \
-                d[x]=ty=d[y]; \
-                d[y]=tx; \
-                (out) = d[(tx+ty)&0xff]^ (in);
+#define LOOP(in, out)     \
+    x = ((x + 1) & 0xff); \
+    tx = d[x];            \
+    y = (tx + y) & 0xff;  \
+    d[x] = ty = d[y];     \
+    d[y] = tx;            \
+    (out) = d[(tx + ty) & 0xff] ^ (in);
 
     i = len >> 3;
     if (i) {
@@ -82,8 +82,7 @@ void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
             if (--i == 0)
                 break;
             LOOP(indata[6], outdata[6]);
-            if (--i == 0)
-                break;
+            break;
         }
     }
     key->x = x;
diff --git a/crypto/rc4/rc4_local.h b/crypto/rc4/rc4_local.h
index f8cf9a89b3eb2..0a84cb701e684 100644
--- a/crypto/rc4/rc4_local.h
+++ b/crypto/rc4/rc4_local.h
@@ -8,9 +8,9 @@
  */
 
 #ifndef OSSL_CRYPTO_RC4_LOCAL_H
-# define OSSL_CRYPTO_RC4_LOCAL_H
+#define OSSL_CRYPTO_RC4_LOCAL_H
 
-# include <openssl/opensslconf.h>
-# include "internal/cryptlib.h"
+#include <openssl/opensslconf.h>
+#include "internal/cryptlib.h"
 
 #endif
diff --git a/crypto/rc4/rc4_skey.c b/crypto/rc4/rc4_skey.c
index 3797eff3e2b7f..34421745dbf3b 100644
--- a/crypto/rc4/rc4_skey.c
+++ b/crypto/rc4/rc4_skey.c
@@ -45,12 +45,15 @@ void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data)
     key->y = 0;
     id1 = id2 = 0;
 
-#define SK_LOOP(d,n) { \
-                tmp=d[(n)]; \
-                id2 = (data[id1] + tmp + id2) & 0xff; \
-                if (++id1 == len) id1=0; \
-                d[(n)]=d[id2]; \
-                d[id2]=tmp; }
+#define SK_LOOP(d, n)                         \
+    {                                         \
+        tmp = d[(n)];                         \
+        id2 = (data[id1] + tmp + id2) & 0xff; \
+        if (++id1 == len)                     \
+            id1 = 0;                          \
+        d[(n)] = d[id2];                      \
+        d[id2] = tmp;                         \
+    }
 
     for (i = 0; i < 256; i++)
         d[i] = i;
diff --git a/crypto/rc5/rc5_ecb.c b/crypto/rc5/rc5_ecb.c
index e533b9ea7e199..cddd40221c779 100644
--- a/crypto/rc5/rc5_ecb.c
+++ b/crypto/rc5/rc5_ecb.c
@@ -18,7 +18,7 @@
 #include <openssl/opensslv.h>
 
 void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                        RC5_32_KEY *ks, int encrypt)
+    RC5_32_KEY *ks, int encrypt)
 {
     unsigned long l, d[2];
 
diff --git a/crypto/rc5/rc5_enc.c b/crypto/rc5/rc5_enc.c
index 2f9feee0e0f86..31ecd29dccb37 100644
--- a/crypto/rc5/rc5_enc.c
+++ b/crypto/rc5/rc5_enc.c
@@ -18,8 +18,8 @@
 #include "rc5_local.h"
 
 void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, RC5_32_KEY *ks, unsigned char *iv,
-                        int encrypt)
+    long length, RC5_32_KEY *ks, unsigned char *iv,
+    int encrypt)
 {
     register unsigned long tin0, tin1;
     register unsigned long tout0, tout1, xor0, xor1;
diff --git a/crypto/rc5/rc5_local.h b/crypto/rc5/rc5_local.h
index 4ba8745ca5bb9..57a1642c97e68 100644
--- a/crypto/rc5/rc5_local.h
+++ b/crypto/rc5/rc5_local.h
@@ -10,116 +10,136 @@
 #include <stdlib.h>
 
 #undef c2l
-#define c2l(c,l)        (l =((unsigned long)(*((c)++)))    , \
-                         l|=((unsigned long)(*((c)++)))<< 8L, \
-                         l|=((unsigned long)(*((c)++)))<<16L, \
-                         l|=((unsigned long)(*((c)++)))<<24L)
+#define c2l(c, l) (l = ((unsigned long)(*((c)++))), \
+    l |= ((unsigned long)(*((c)++))) << 8L,         \
+    l |= ((unsigned long)(*((c)++))) << 16L,        \
+    l |= ((unsigned long)(*((c)++))) << 24L)
 
 /* NOTE - c is not incremented as per c2l */
 #undef c2ln
-#define c2ln(c,l1,l2,n) { \
-                        c+=n; \
-                        l1=l2=0; \
-                        switch (n) { \
-                        case 8: l2 =((unsigned long)(*(--(c))))<<24L; \
-                        /* fall through */                               \
-                        case 7: l2|=((unsigned long)(*(--(c))))<<16L; \
-                        /* fall through */                               \
-                        case 6: l2|=((unsigned long)(*(--(c))))<< 8L; \
-                        /* fall through */                               \
-                        case 5: l2|=((unsigned long)(*(--(c))));      \
-                        /* fall through */                               \
-                        case 4: l1 =((unsigned long)(*(--(c))))<<24L; \
-                        /* fall through */                               \
-                        case 3: l1|=((unsigned long)(*(--(c))))<<16L; \
-                        /* fall through */                               \
-                        case 2: l1|=((unsigned long)(*(--(c))))<< 8L; \
-                        /* fall through */                               \
-                        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)))) << 24L;  \
+        /* fall through */                            \
+        case 7:                                       \
+            l2 |= ((unsigned long)(*(--(c)))) << 16L; \
+        /* fall through */                            \
+        case 6:                                       \
+            l2 |= ((unsigned long)(*(--(c)))) << 8L;  \
+        /* fall through */                            \
+        case 5:                                       \
+            l2 |= ((unsigned long)(*(--(c))));        \
+        /* fall through */                            \
+        case 4:                                       \
+            l1 = ((unsigned long)(*(--(c)))) << 24L;  \
+        /* fall through */                            \
+        case 3:                                       \
+            l1 |= ((unsigned long)(*(--(c)))) << 16L; \
+        /* fall through */                            \
+        case 2:                                       \
+            l1 |= ((unsigned long)(*(--(c)))) << 8L;  \
+        /* fall through */                            \
+        case 1:                                       \
+            l1 |= ((unsigned long)(*(--(c))));        \
+        }                                             \
+    }
 
 #undef l2c
-#define l2c(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>24L)&0xff))
+#define l2c(l, c) (*((c)++) = (unsigned char)(((l)) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 8L) & 0xff),          \
+    *((c)++) = (unsigned char)(((l) >> 16L) & 0xff),         \
+    *((c)++) = (unsigned char)(((l) >> 24L) & 0xff))
 
 /* NOTE - c is not incremented as per l2c */
 #undef l2cn
-#define l2cn(l1,l2,c,n) { \
-                        c+=n; \
-                        switch (n) { \
-                        case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \
-                        /* fall through */                                     \
-                        case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \
-                        /* fall through */                                     \
-                        case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \
-                        /* fall through */                                     \
-                        case 5: *(--(c))=(unsigned char)(((l2)     )&0xff); \
-                        /* fall through */                                     \
-                        case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \
-                        /* fall through */                                     \
-                        case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \
-                        /* fall through */                                     \
-                        case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \
-                        /* fall through */                                     \
-                        case 1: *(--(c))=(unsigned char)(((l1)     )&0xff); \
-                                } \
-                        }
+#define l2cn(l1, l2, c, n)                                    \
+    {                                                         \
+        c += n;                                               \
+        switch (n) {                                          \
+        case 8:                                               \
+            *(--(c)) = (unsigned char)(((l2) >> 24L) & 0xff); \
+        /* fall through */                                    \
+        case 7:                                               \
+            *(--(c)) = (unsigned char)(((l2) >> 16L) & 0xff); \
+        /* fall through */                                    \
+        case 6:                                               \
+            *(--(c)) = (unsigned char)(((l2) >> 8L) & 0xff);  \
+        /* fall through */                                    \
+        case 5:                                               \
+            *(--(c)) = (unsigned char)(((l2)) & 0xff);        \
+        /* fall through */                                    \
+        case 4:                                               \
+            *(--(c)) = (unsigned char)(((l1) >> 24L) & 0xff); \
+        /* fall through */                                    \
+        case 3:                                               \
+            *(--(c)) = (unsigned char)(((l1) >> 16L) & 0xff); \
+        /* fall through */                                    \
+        case 2:                                               \
+            *(--(c)) = (unsigned char)(((l1) >> 8L) & 0xff);  \
+        /* fall through */                                    \
+        case 1:                                               \
+            *(--(c)) = (unsigned char)(((l1)) & 0xff);        \
+        }                                                     \
+    }
 
 #if (defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER))
-# define ROTATE_l32(a,n)     _lrotl(a,n)
-# define ROTATE_r32(a,n)     _lrotr(a,n)
+#define ROTATE_l32(a, n) _lrotl(a, n)
+#define ROTATE_r32(a, n) _lrotr(a, n)
 #elif defined(__ICC)
-# define ROTATE_l32(a,n)     _rotl(a,n)
-# define ROTATE_r32(a,n)     _rotr(a,n)
-#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
-# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-#  define ROTATE_l32(a,n)       ({ register unsigned int ret;   \
-                                        asm ("roll %%cl,%0"     \
-                                                : "=r"(ret)     \
-                                                : "c"(n),"0"((unsigned int)(a)) \
-                                                : "cc");        \
-                                        ret;                    \
-                                })
-#  define ROTATE_r32(a,n)       ({ register unsigned int ret;   \
-                                        asm ("rorl %%cl,%0"     \
-                                                : "=r"(ret)     \
-                                                : "c"(n),"0"((unsigned int)(a)) \
-                                                : "cc");        \
-                                        ret;                    \
-                                })
-# endif
+#define ROTATE_l32(a, n) _rotl(a, n)
+#define ROTATE_r32(a, n) _rotr(a, n)
+#elif defined(__GNUC__) && __GNUC__ >= 2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
+#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
+#define ROTATE_l32(a, n) ({              \
+    register unsigned int ret;           \
+    asm("roll %%cl,%0"                   \
+        : "=r"(ret)                      \
+        : "c"(n), "0"((unsigned int)(a)) \
+        : "cc");                         \
+    ret;                                 \
+})
+#define ROTATE_r32(a, n) ({              \
+    register unsigned int ret;           \
+    asm("rorl %%cl,%0"                   \
+        : "=r"(ret)                      \
+        : "c"(n), "0"((unsigned int)(a)) \
+        : "cc");                         \
+    ret;                                 \
+})
+#endif
 #endif
 #ifndef ROTATE_l32
-# define ROTATE_l32(a,n)     (((a)<<(n&0x1f))|(((a)&0xffffffff)>>((32-n)&0x1f)))
+#define ROTATE_l32(a, n) (((a) << (n & 0x1f)) | (((a) & 0xffffffff) >> ((32 - n) & 0x1f)))
 #endif
 #ifndef ROTATE_r32
-# define ROTATE_r32(a,n)     (((a)<<((32-n)&0x1f))|(((a)&0xffffffff)>>(n&0x1f)))
+#define ROTATE_r32(a, n) (((a) << ((32 - n) & 0x1f)) | (((a) & 0xffffffff) >> (n & 0x1f)))
 #endif
 
-#define RC5_32_MASK     0xffffffffL
+#define RC5_32_MASK 0xffffffffL
 
-#define RC5_32_P        0xB7E15163L
-#define RC5_32_Q        0x9E3779B9L
+#define RC5_32_P 0xB7E15163L
+#define RC5_32_Q 0x9E3779B9L
 
-#define E_RC5_32(a,b,s,n) \
-        a^=b; \
-        a=ROTATE_l32(a,b); \
-        a+=s[n]; \
-        a&=RC5_32_MASK; \
-        b^=a; \
-        b=ROTATE_l32(b,a); \
-        b+=s[n+1]; \
-        b&=RC5_32_MASK;
+#define E_RC5_32(a, b, s, n) \
+    a ^= b;                  \
+    a = ROTATE_l32(a, b);    \
+    a += s[n];               \
+    a &= RC5_32_MASK;        \
+    b ^= a;                  \
+    b = ROTATE_l32(b, a);    \
+    b += s[n + 1];           \
+    b &= RC5_32_MASK;
 
-#define D_RC5_32(a,b,s,n) \
-        b-=s[n+1]; \
-        b&=RC5_32_MASK; \
-        b=ROTATE_r32(b,a); \
-        b^=a; \
-        a-=s[n]; \
-        a&=RC5_32_MASK; \
-        a=ROTATE_r32(a,b); \
-        a^=b;
+#define D_RC5_32(a, b, s, n) \
+    b -= s[n + 1];           \
+    b &= RC5_32_MASK;        \
+    b = ROTATE_r32(b, a);    \
+    b ^= a;                  \
+    a -= s[n];               \
+    a &= RC5_32_MASK;        \
+    a = ROTATE_r32(a, b);    \
+    a ^= b;
diff --git a/crypto/rc5/rc5_skey.c b/crypto/rc5/rc5_skey.c
index a08b940badf6d..cafb50f22a429 100644
--- a/crypto/rc5/rc5_skey.c
+++ b/crypto/rc5/rc5_skey.c
@@ -17,7 +17,7 @@
 #include "rc5_local.h"
 
 int RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
-                   int rounds)
+    int rounds)
 {
     RC5_32_INT L[64], l, ll, A, B, *S, k;
     int i, j, m, c, t, ii, jj;
@@ -25,8 +25,7 @@ int RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
     if (len > 255)
         return 0;
 
-    if ((rounds != RC5_16_ROUNDS) &&
-        (rounds != RC5_12_ROUNDS) && (rounds != RC5_8_ROUNDS))
+    if ((rounds != RC5_16_ROUNDS) && (rounds != RC5_12_ROUNDS) && (rounds != RC5_8_ROUNDS))
         rounds = RC5_16_ROUNDS;
 
     key->rounds = rounds;
diff --git a/crypto/rc5/rc5cfb64.c b/crypto/rc5/rc5cfb64.c
index 9088eb7eddaea..f2f4b9bdfb3bc 100644
--- a/crypto/rc5/rc5cfb64.c
+++ b/crypto/rc5/rc5cfb64.c
@@ -23,8 +23,8 @@
  */
 
 void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                          long length, RC5_32_KEY *schedule,
-                          unsigned char *ivec, int *num, int encrypt)
+    long length, RC5_32_KEY *schedule,
+    unsigned char *ivec, int *num, int encrypt)
 {
     register unsigned long v0, v1, t;
     register int n = *num;
diff --git a/crypto/rc5/rc5ofb64.c b/crypto/rc5/rc5ofb64.c
index b1128b1f4806e..30487521f22f4 100644
--- a/crypto/rc5/rc5ofb64.c
+++ b/crypto/rc5/rc5ofb64.c
@@ -22,8 +22,8 @@
  * used is contained in *num;
  */
 void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                          long length, RC5_32_KEY *schedule,
-                          unsigned char *ivec, int *num)
+    long length, RC5_32_KEY *schedule,
+    unsigned char *ivec, int *num)
 {
     register unsigned long v0, v1, t;
     register int n = *num;
diff --git a/crypto/rcu_internal.h b/crypto/rcu_internal.h
index fb718580ef1e6..3408923ebaa39 100644
--- a/crypto/rcu_internal.h
+++ b/crypto/rcu_internal.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OPENSSL_RCU_INTERNAL_H
-# define OPENSSL_RCU_INTERNAL_H
-# pragma once
+#define OPENSSL_RCU_INTERNAL_H
+#pragma once
 
 struct rcu_qp;
 
diff --git a/crypto/ripemd/rmd_dgst.c b/crypto/ripemd/rmd_dgst.c
index 77b9d32d2b142..708408cd86cbb 100644
--- a/crypto/ripemd/rmd_dgst.c
+++ b/crypto/ripemd/rmd_dgst.c
@@ -19,7 +19,7 @@
 
 #ifdef RMD160_ASM
 void ripemd160_block_x86(RIPEMD160_CTX *c, unsigned long *p, size_t num);
-# define ripemd160_block ripemd160_block_x86
+#define ripemd160_block ripemd160_block_x86
 #else
 void ripemd160_block(RIPEMD160_CTX *c, unsigned long *p, size_t num);
 #endif
@@ -36,23 +36,23 @@ int RIPEMD160_Init(RIPEMD160_CTX *c)
 }
 
 #ifndef ripemd160_block_data_order
-# ifdef X
-#  undef X
-# endif
+#ifdef X
+#undef X
+#endif
 void ripemd160_block_data_order(RIPEMD160_CTX *ctx, const void *p, size_t num)
 {
     const unsigned char *data = p;
     register unsigned MD32_REG_T A, B, C, D, E;
     unsigned MD32_REG_T a, b, c, d, e, l;
-# ifndef MD32_XARRAY
+#ifndef MD32_XARRAY
     /* See comment in crypto/sha/sha_local.h for details. */
     unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
         XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
-#  define X(i)   XX##i
-# else
+#define X(i) XX##i
+#else
     RIPEMD160_LONG XX[16];
-#  define X(i)   XX[i]
-# endif
+#define X(i) XX[i]
+#endif
 
     for (; num--;) {
 
@@ -282,7 +282,6 @@ void ripemd160_block_data_order(RIPEMD160_CTX *ctx, const void *p, size_t num)
         ctx->D = ctx->E + a + B;
         ctx->E = ctx->A + b + C;
         ctx->A = D;
-
     }
 }
 #endif
diff --git a/crypto/ripemd/rmd_local.h b/crypto/ripemd/rmd_local.h
index 325cb98cc3090..f2934a7332f13 100644
--- a/crypto/ripemd/rmd_local.h
+++ b/crypto/ripemd/rmd_local.h
@@ -17,71 +17,87 @@
  * FOR EXPLANATIONS ON FOLLOWING "CODE."
  */
 #ifdef RMD160_ASM
-# if defined(__i386) || defined(__i386__) || defined(_M_IX86)
-#  define ripemd160_block_data_order ripemd160_block_asm_data_order
-# endif
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
+#define ripemd160_block_data_order ripemd160_block_asm_data_order
+#endif
 #endif
 
 void ripemd160_block_data_order(RIPEMD160_CTX *c, const void *p, size_t num);
 
 #define DATA_ORDER_IS_LITTLE_ENDIAN
 
-#define HASH_LONG               RIPEMD160_LONG
-#define HASH_CTX                RIPEMD160_CTX
-#define HASH_CBLOCK             RIPEMD160_CBLOCK
-#define HASH_UPDATE             RIPEMD160_Update
-#define HASH_TRANSFORM          RIPEMD160_Transform
-#define HASH_FINAL              RIPEMD160_Final
-#define HASH_MAKE_STRING(c,s)   do {    \
-        unsigned long ll;               \
-        ll=(c)->A; (void)HOST_l2c(ll,(s));      \
-        ll=(c)->B; (void)HOST_l2c(ll,(s));      \
-        ll=(c)->C; (void)HOST_l2c(ll,(s));      \
-        ll=(c)->D; (void)HOST_l2c(ll,(s));      \
-        ll=(c)->E; (void)HOST_l2c(ll,(s));      \
-        } while (0)
-#define HASH_BLOCK_DATA_ORDER   ripemd160_block_data_order
+#define HASH_LONG RIPEMD160_LONG
+#define HASH_CTX RIPEMD160_CTX
+#define HASH_CBLOCK RIPEMD160_CBLOCK
+#define HASH_UPDATE RIPEMD160_Update
+#define HASH_TRANSFORM RIPEMD160_Transform
+#define HASH_FINAL RIPEMD160_Final
+#define HASH_MAKE_STRING(c, s)   \
+    do {                         \
+        unsigned long ll;        \
+        ll = (c)->A;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->B;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->C;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->D;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->E;             \
+        (void)HOST_l2c(ll, (s)); \
+    } while (0)
+#define HASH_BLOCK_DATA_ORDER ripemd160_block_data_order
 
 #include "crypto/md32_common.h"
 
 /*
  * Transformed F2 and F4 are courtesy of Wei Dai
  */
-#define F1(x,y,z)       ((x) ^ (y) ^ (z))
-#define F2(x,y,z)       ((((y) ^ (z)) & (x)) ^ (z))
-#define F3(x,y,z)       (((~(y)) | (x)) ^ (z))
-#define F4(x,y,z)       ((((x) ^ (y)) & (z)) ^ (y))
-#define F5(x,y,z)       (((~(z)) | (y)) ^ (x))
+#define F1(x, y, z) ((x) ^ (y) ^ (z))
+#define F2(x, y, z) ((((y) ^ (z)) & (x)) ^ (z))
+#define F3(x, y, z) (((~(y)) | (x)) ^ (z))
+#define F4(x, y, z) ((((x) ^ (y)) & (z)) ^ (y))
+#define F5(x, y, z) (((~(z)) | (y)) ^ (x))
 
-#define RIPEMD160_A     0x67452301L
-#define RIPEMD160_B     0xEFCDAB89L
-#define RIPEMD160_C     0x98BADCFEL
-#define RIPEMD160_D     0x10325476L
-#define RIPEMD160_E     0xC3D2E1F0L
+#define RIPEMD160_A 0x67452301L
+#define RIPEMD160_B 0xEFCDAB89L
+#define RIPEMD160_C 0x98BADCFEL
+#define RIPEMD160_D 0x10325476L
+#define RIPEMD160_E 0xC3D2E1F0L
 
 #include "rmdconst.h"
 
-#define RIP1(a,b,c,d,e,w,s) { \
-        a+=F1(b,c,d)+X(w); \
-        a=ROTATE(a,s)+e; \
-        c=ROTATE(c,10); }
+#define RIP1(a, b, c, d, e, w, s) \
+    {                             \
+        a += F1(b, c, d) + X(w);  \
+        a = ROTATE(a, s) + e;     \
+        c = ROTATE(c, 10);        \
+    }
 
-#define RIP2(a,b,c,d,e,w,s,K) { \
-        a+=F2(b,c,d)+X(w)+K; \
-        a=ROTATE(a,s)+e; \
-        c=ROTATE(c,10); }
+#define RIP2(a, b, c, d, e, w, s, K) \
+    {                                \
+        a += F2(b, c, d) + X(w) + K; \
+        a = ROTATE(a, s) + e;        \
+        c = ROTATE(c, 10);           \
+    }
 
-#define RIP3(a,b,c,d,e,w,s,K) { \
-        a+=F3(b,c,d)+X(w)+K; \
-        a=ROTATE(a,s)+e; \
-        c=ROTATE(c,10); }
+#define RIP3(a, b, c, d, e, w, s, K) \
+    {                                \
+        a += F3(b, c, d) + X(w) + K; \
+        a = ROTATE(a, s) + e;        \
+        c = ROTATE(c, 10);           \
+    }
 
-#define RIP4(a,b,c,d,e,w,s,K) { \
-        a+=F4(b,c,d)+X(w)+K; \
-        a=ROTATE(a,s)+e; \
-        c=ROTATE(c,10); }
+#define RIP4(a, b, c, d, e, w, s, K) \
+    {                                \
+        a += F4(b, c, d) + X(w) + K; \
+        a = ROTATE(a, s) + e;        \
+        c = ROTATE(c, 10);           \
+    }
 
-#define RIP5(a,b,c,d,e,w,s,K) { \
-        a+=F5(b,c,d)+X(w)+K; \
-        a=ROTATE(a,s)+e; \
-        c=ROTATE(c,10); }
+#define RIP5(a, b, c, d, e, w, s, K) \
+    {                                \
+        a += F5(b, c, d) + X(w) + K; \
+        a = ROTATE(a, s) + e;        \
+        c = ROTATE(c, 10);           \
+    }
diff --git a/crypto/ripemd/rmdconst.h b/crypto/ripemd/rmdconst.h
index 0e19410ade108..f9daf1b09f261 100644
--- a/crypto/ripemd/rmdconst.h
+++ b/crypto/ripemd/rmdconst.h
@@ -19,332 +19,332 @@
 #define KR3 0x7A6D76E9L
 #define KR4 0x00000000L
 
-#define WL00  0
+#define WL00 0
 #define SL00 11
-#define WL01  1
+#define WL01 1
 #define SL01 14
-#define WL02  2
+#define WL02 2
 #define SL02 15
-#define WL03  3
+#define WL03 3
 #define SL03 12
-#define WL04  4
-#define SL04  5
-#define WL05  5
-#define SL05  8
-#define WL06  6
-#define SL06  7
-#define WL07  7
-#define SL07  9
-#define WL08  8
+#define WL04 4
+#define SL04 5
+#define WL05 5
+#define SL05 8
+#define WL06 6
+#define SL06 7
+#define WL07 7
+#define SL07 9
+#define WL08 8
 #define SL08 11
-#define WL09  9
+#define WL09 9
 #define SL09 13
 #define WL10 10
 #define SL10 14
 #define WL11 11
 #define SL11 15
 #define WL12 12
-#define SL12  6
+#define SL12 6
 #define WL13 13
-#define SL13  7
+#define SL13 7
 #define WL14 14
-#define SL14  9
+#define SL14 9
 #define WL15 15
-#define SL15  8
+#define SL15 8
 
-#define WL16  7
-#define SL16  7
-#define WL17  4
-#define SL17  6
+#define WL16 7
+#define SL16 7
+#define WL17 4
+#define SL17 6
 #define WL18 13
-#define SL18  8
-#define WL19  1
+#define SL18 8
+#define WL19 1
 #define SL19 13
 #define WL20 10
 #define SL20 11
-#define WL21  6
-#define SL21  9
+#define WL21 6
+#define SL21 9
 #define WL22 15
-#define SL22  7
-#define WL23  3
+#define SL22 7
+#define WL23 3
 #define SL23 15
 #define WL24 12
-#define SL24  7
-#define WL25  0
+#define SL24 7
+#define WL25 0
 #define SL25 12
-#define WL26  9
+#define WL26 9
 #define SL26 15
-#define WL27  5
-#define SL27  9
-#define WL28  2
+#define WL27 5
+#define SL27 9
+#define WL28 2
 #define SL28 11
 #define WL29 14
-#define SL29  7
+#define SL29 7
 #define WL30 11
 #define SL30 13
-#define WL31  8
+#define WL31 8
 #define SL31 12
 
-#define WL32  3
+#define WL32 3
 #define SL32 11
 #define WL33 10
 #define SL33 13
 #define WL34 14
-#define SL34  6
-#define WL35  4
-#define SL35  7
-#define WL36  9
+#define SL34 6
+#define WL35 4
+#define SL35 7
+#define WL36 9
 #define SL36 14
 #define WL37 15
-#define SL37  9
-#define WL38  8
+#define SL37 9
+#define WL38 8
 #define SL38 13
-#define WL39  1
+#define WL39 1
 #define SL39 15
-#define WL40  2
+#define WL40 2
 #define SL40 14
-#define WL41  7
-#define SL41  8
-#define WL42  0
+#define WL41 7
+#define SL41 8
+#define WL42 0
 #define SL42 13
-#define WL43  6
-#define SL43  6
+#define WL43 6
+#define SL43 6
 #define WL44 13
-#define SL44  5
+#define SL44 5
 #define WL45 11
 #define SL45 12
-#define WL46  5
-#define SL46  7
+#define WL46 5
+#define SL46 7
 #define WL47 12
-#define SL47  5
+#define SL47 5
 
-#define WL48  1
+#define WL48 1
 #define SL48 11
-#define WL49  9
+#define WL49 9
 #define SL49 12
 #define WL50 11
 #define SL50 14
 #define WL51 10
 #define SL51 15
-#define WL52  0
+#define WL52 0
 #define SL52 14
-#define WL53  8
+#define WL53 8
 #define SL53 15
 #define WL54 12
-#define SL54  9
-#define WL55  4
-#define SL55  8
+#define SL54 9
+#define WL55 4
+#define SL55 8
 #define WL56 13
-#define SL56  9
-#define WL57  3
+#define SL56 9
+#define WL57 3
 #define SL57 14
-#define WL58  7
-#define SL58  5
+#define WL58 7
+#define SL58 5
 #define WL59 15
-#define SL59  6
+#define SL59 6
 #define WL60 14
-#define SL60  8
-#define WL61  5
-#define SL61  6
-#define WL62  6
-#define SL62  5
-#define WL63  2
+#define SL60 8
+#define WL61 5
+#define SL61 6
+#define WL62 6
+#define SL62 5
+#define WL63 2
 #define SL63 12
 
-#define WL64  4
-#define SL64  9
-#define WL65  0
+#define WL64 4
+#define SL64 9
+#define WL65 0
 #define SL65 15
-#define WL66  5
-#define SL66  5
-#define WL67  9
+#define WL66 5
+#define SL66 5
+#define WL67 9
 #define SL67 11
-#define WL68  7
-#define SL68  6
+#define WL68 7
+#define SL68 6
 #define WL69 12
-#define SL69  8
-#define WL70  2
+#define SL69 8
+#define WL70 2
 #define SL70 13
 #define WL71 10
 #define SL71 12
 #define WL72 14
-#define SL72  5
-#define WL73  1
+#define SL72 5
+#define WL73 1
 #define SL73 12
-#define WL74  3
+#define WL74 3
 #define SL74 13
-#define WL75  8
+#define WL75 8
 #define SL75 14
 #define WL76 11
 #define SL76 11
-#define WL77  6
-#define SL77  8
+#define WL77 6
+#define SL77 8
 #define WL78 15
-#define SL78  5
+#define SL78 5
 #define WL79 13
-#define SL79  6
+#define SL79 6
 
-#define WR00  5
-#define SR00  8
+#define WR00 5
+#define SR00 8
 #define WR01 14
-#define SR01  9
-#define WR02  7
-#define SR02  9
-#define WR03  0
+#define SR01 9
+#define WR02 7
+#define SR02 9
+#define WR03 0
 #define SR03 11
-#define WR04  9
+#define WR04 9
 #define SR04 13
-#define WR05  2
+#define WR05 2
 #define SR05 15
 #define WR06 11
 #define SR06 15
-#define WR07  4
-#define SR07  5
+#define WR07 4
+#define SR07 5
 #define WR08 13
-#define SR08  7
-#define WR09  6
-#define SR09  7
+#define SR08 7
+#define WR09 6
+#define SR09 7
 #define WR10 15
-#define SR10  8
-#define WR11  8
+#define SR10 8
+#define WR11 8
 #define SR11 11
-#define WR12  1
+#define WR12 1
 #define SR12 14
 #define WR13 10
 #define SR13 14
-#define WR14  3
+#define WR14 3
 #define SR14 12
 #define WR15 12
-#define SR15  6
+#define SR15 6
 
-#define WR16  6
-#define SR16  9
+#define WR16 6
+#define SR16 9
 #define WR17 11
 #define SR17 13
-#define WR18  3
+#define WR18 3
 #define SR18 15
-#define WR19  7
-#define SR19  7
-#define WR20  0
+#define WR19 7
+#define SR19 7
+#define WR20 0
 #define SR20 12
 #define WR21 13
-#define SR21  8
-#define WR22  5
-#define SR22  9
+#define SR21 8
+#define WR22 5
+#define SR22 9
 #define WR23 10
 #define SR23 11
 #define WR24 14
-#define SR24  7
+#define SR24 7
 #define WR25 15
-#define SR25  7
-#define WR26  8
+#define SR25 7
+#define WR26 8
 #define SR26 12
 #define WR27 12
-#define SR27  7
-#define WR28  4
-#define SR28  6
-#define WR29  9
+#define SR27 7
+#define WR28 4
+#define SR28 6
+#define WR29 9
 #define SR29 15
-#define WR30  1
+#define WR30 1
 #define SR30 13
-#define WR31  2
+#define WR31 2
 #define SR31 11
 
 #define WR32 15
-#define SR32  9
-#define WR33  5
-#define SR33  7
-#define WR34  1
+#define SR32 9
+#define WR33 5
+#define SR33 7
+#define WR34 1
 #define SR34 15
-#define WR35  3
+#define WR35 3
 #define SR35 11
-#define WR36  7
-#define SR36  8
+#define WR36 7
+#define SR36 8
 #define WR37 14
-#define SR37  6
-#define WR38  6
-#define SR38  6
-#define WR39  9
+#define SR37 6
+#define WR38 6
+#define SR38 6
+#define WR39 9
 #define SR39 14
 #define WR40 11
 #define SR40 12
-#define WR41  8
+#define WR41 8
 #define SR41 13
 #define WR42 12
-#define SR42  5
-#define WR43  2
+#define SR42 5
+#define WR43 2
 #define SR43 14
 #define WR44 10
 #define SR44 13
-#define WR45  0
+#define WR45 0
 #define SR45 13
-#define WR46  4
-#define SR46  7
+#define WR46 4
+#define SR46 7
 #define WR47 13
-#define SR47  5
+#define SR47 5
 
-#define WR48  8
+#define WR48 8
 #define SR48 15
-#define WR49  6
-#define SR49  5
-#define WR50  4
-#define SR50  8
-#define WR51  1
+#define WR49 6
+#define SR49 5
+#define WR50 4
+#define SR50 8
+#define WR51 1
 #define SR51 11
-#define WR52  3
+#define WR52 3
 #define SR52 14
 #define WR53 11
 #define SR53 14
 #define WR54 15
-#define SR54  6
-#define WR55  0
+#define SR54 6
+#define WR55 0
 #define SR55 14
-#define WR56  5
-#define SR56  6
+#define WR56 5
+#define SR56 6
 #define WR57 12
-#define SR57  9
-#define WR58  2
+#define SR57 9
+#define WR58 2
 #define SR58 12
 #define WR59 13
-#define SR59  9
-#define WR60  9
+#define SR59 9
+#define WR60 9
 #define SR60 12
-#define WR61  7
-#define SR61  5
+#define WR61 7
+#define SR61 5
 #define WR62 10
 #define SR62 15
 #define WR63 14
-#define SR63  8
+#define SR63 8
 
 #define WR64 12
-#define SR64  8
+#define SR64 8
 #define WR65 15
-#define SR65  5
+#define SR65 5
 #define WR66 10
 #define SR66 12
-#define WR67  4
-#define SR67  9
-#define WR68  1
+#define WR67 4
+#define SR67 9
+#define WR68 1
 #define SR68 12
-#define WR69  5
-#define SR69  5
-#define WR70  8
+#define WR69 5
+#define SR69 5
+#define WR70 8
 #define SR70 14
-#define WR71  7
-#define SR71  6
-#define WR72  6
-#define SR72  8
-#define WR73  2
+#define WR71 7
+#define SR71 6
+#define WR72 6
+#define SR72 8
+#define WR73 2
 #define SR73 13
 #define WR74 13
-#define SR74  6
+#define SR74 6
 #define WR75 14
-#define SR75  5
-#define WR76  0
+#define SR75 5
+#define WR76 0
 #define SR76 15
-#define WR77  3
+#define WR77 3
 #define SR77 13
-#define WR78  9
+#define WR78 9
 #define SR78 11
 #define WR79 11
 #define SR79 11
diff --git a/crypto/riscv32cpuid.pl b/crypto/riscv32cpuid.pl
index 5ee7df0ea63b3..9d42ef6b89500 100644
--- a/crypto/riscv32cpuid.pl
+++ b/crypto/riscv32cpuid.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
+# 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
@@ -94,7 +94,8 @@
 .globl riscv_vlen_asm
 .type riscv_vlen_asm,\@function
 riscv_vlen_asm:
-    csrr $ret, vlenb
+    # 0xc22 is CSR vlenb
+    csrr $ret, 0xc22
     slli $ret, $ret, 3
     ret
 .size riscv_vlen_asm,.-riscv_vlen_asm
diff --git a/crypto/riscv64cpuid.pl b/crypto/riscv64cpuid.pl
index 5dcdc5c584cda..5c0d3c429a894 100644
--- a/crypto/riscv64cpuid.pl
+++ b/crypto/riscv64cpuid.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+# 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
@@ -94,7 +94,8 @@
 .globl riscv_vlen_asm
 .type riscv_vlen_asm,\@function
 riscv_vlen_asm:
-    csrr $ret, vlenb
+    # 0xc22 is CSR vlenb
+    csrr $ret, 0xc22
     slli $ret, $ret, 3
     ret
 .size riscv_vlen_asm,.-riscv_vlen_asm
diff --git a/crypto/riscvcap.c b/crypto/riscvcap.c
index cf089be43b34d..f6db84bf16b67 100644
--- a/crypto/riscvcap.c
+++ b/crypto/riscvcap.c
@@ -18,10 +18,10 @@
 #include "crypto/riscv_arch.h"
 
 #ifdef OSSL_RISCV_HWPROBE
-# include <unistd.h>
-# include <sys/syscall.h>
-# include <asm/hwprobe.h>
-# include <sys/auxv.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <asm/hwprobe.h>
+#include <sys/auxv.h>
 #endif
 
 extern size_t riscv_vlen_asm(void);
@@ -76,16 +76,15 @@ static void parse_env(const char *envstr)
         BIO_snprintf(buf, BUFLEN, "_%s", RISCV_capabilities[i].name);
         if (strstr(envstrupper, buf) != NULL) {
             /* Match, set relevant bit in OPENSSL_riscvcap_P[] */
-            OPENSSL_riscvcap_P[RISCV_capabilities[i].index] |=
-                (1 << RISCV_capabilities[i].bit_offset);
+            OPENSSL_riscvcap_P[RISCV_capabilities[i].index] |= (1 << RISCV_capabilities[i].bit_offset);
         }
     }
 }
 
 #ifdef OSSL_RISCV_HWPROBE
 static long riscv_hwprobe(struct riscv_hwprobe *pairs, size_t pair_count,
-                          size_t cpu_count, unsigned long *cpus,
-                          unsigned int flags)
+    size_t cpu_count, unsigned long *cpus,
+    unsigned int flags)
 {
     return syscall(__NR_riscv_hwprobe, pairs, pair_count, cpu_count, cpus, flags);
 }
@@ -103,12 +102,11 @@ static void hwprobe_to_cap(void)
         for (size_t i = 0; i < kRISCVNumCaps; ++i) {
             for (size_t j = 0; j != OSSL_RISCV_HWPROBE_PAIR_COUNT; ++j) {
                 if (pairs[j].key == RISCV_capabilities[i].hwprobe_key
-                        && (pairs[j].value & RISCV_capabilities[i].hwprobe_value)
-                           != 0)
+                    && (pairs[j].value & RISCV_capabilities[i].hwprobe_value)
+                        != 0)
                     if (!IS_IN_DEPEND_VECTOR(RISCV_capabilities[i].bit_offset) || VECTOR_CAPABLE)
                         /* Match, set relevant bit in OPENSSL_riscvcap_P[] */
-                        OPENSSL_riscvcap_P[RISCV_capabilities[i].index] |=
-                            (1 << RISCV_capabilities[i].bit_offset);
+                        OPENSSL_riscvcap_P[RISCV_capabilities[i].index] |= (1 << RISCV_capabilities[i].bit_offset);
             }
         }
     }
@@ -120,9 +118,9 @@ size_t riscv_vlen(void)
     return vlen;
 }
 
-# if defined(__GNUC__) && __GNUC__>=2
-__attribute__ ((constructor))
-# endif
+#if defined(__GNUC__) && __GNUC__ >= 2
+__attribute__((constructor))
+#endif
 void OPENSSL_cpuid_setup(void)
 {
     char *e;
diff --git a/crypto/rsa/rsa_acvp_test_params.c b/crypto/rsa/rsa_acvp_test_params.c
index fddc1e0994127..77e1c39c3e079 100644
--- a/crypto/rsa/rsa_acvp_test_params.c
+++ b/crypto/rsa/rsa_acvp_test_params.c
@@ -92,22 +92,22 @@ int ossl_rsa_acvp_test_set_params(RSA *r, const OSSL_PARAM params[])
 
     /* Set the input parameters */
     if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_TEST_XP1)) != NULL
-         && !OSSL_PARAM_get_BN(p, &t->Xp1))
+        && !OSSL_PARAM_get_BN(p, &t->Xp1))
         goto err;
     if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_TEST_XP2)) != NULL
-         && !OSSL_PARAM_get_BN(p, &t->Xp2))
+        && !OSSL_PARAM_get_BN(p, &t->Xp2))
         goto err;
     if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_TEST_XP)) != NULL
-         && !OSSL_PARAM_get_BN(p, &t->Xp))
+        && !OSSL_PARAM_get_BN(p, &t->Xp))
         goto err;
     if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_TEST_XQ1)) != NULL
-         && !OSSL_PARAM_get_BN(p, &t->Xq1))
+        && !OSSL_PARAM_get_BN(p, &t->Xq1))
         goto err;
     if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_TEST_XQ2)) != NULL
-         && !OSSL_PARAM_get_BN(p, &t->Xq2))
+        && !OSSL_PARAM_get_BN(p, &t->Xq2))
         goto err;
     if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_TEST_XQ)) != NULL
-         && !OSSL_PARAM_get_BN(p, &t->Xq))
+        && !OSSL_PARAM_get_BN(p, &t->Xq))
         goto err;
 
     /* Setup the output parameters */
@@ -133,17 +133,17 @@ int ossl_rsa_acvp_test_get_params(RSA *r, OSSL_PARAM params[])
     t = r->acvp_test;
     if (t != NULL) {
         if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_RSA_TEST_P1)) != NULL
-             && !OSSL_PARAM_set_BN(p, t->p1))
-                    return 0;
+            && !OSSL_PARAM_set_BN(p, t->p1))
+            return 0;
         if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_RSA_TEST_P2)) != NULL
-             && !OSSL_PARAM_set_BN(p, t->p2))
-                    return 0;
+            && !OSSL_PARAM_set_BN(p, t->p2))
+            return 0;
         if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_RSA_TEST_Q1)) != NULL
-             && !OSSL_PARAM_set_BN(p, t->q1))
-                    return 0;
+            && !OSSL_PARAM_set_BN(p, t->q1))
+            return 0;
         if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_RSA_TEST_Q2)) != NULL
-             && !OSSL_PARAM_set_BN(p, t->q2))
-                    return 0;
+            && !OSSL_PARAM_set_BN(p, t->q2))
+            return 0;
     }
     return 1;
 }
@@ -164,4 +164,3 @@ void ossl_rsa_acvp_test_free(RSA_ACVP_TEST *t)
         OPENSSL_free(t);
     }
 }
-
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
index 42b03fb2fd62d..1eac38695d827 100644
--- a/crypto/rsa/rsa_ameth.c
+++ b/crypto/rsa/rsa_ameth.c
@@ -27,7 +27,7 @@
 
 /* Set any parameters associated with pkey */
 static int rsa_param_encode(const EVP_PKEY *pkey,
-                            ASN1_STRING **pstr, int *pstrtype)
+    ASN1_STRING **pstr, int *pstrtype)
 {
     const RSA *rsa = pkey->pkey.rsa;
 
@@ -65,7 +65,7 @@ static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
         return 0;
     }
     if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(pkey->ameth->pkey_id),
-                               strtype, str, penc, penclen))
+            strtype, str, penc, penclen))
         return 1;
 
     OPENSSL_free(penc);
@@ -116,7 +116,7 @@ static int rsa_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
      * cards.
      */
     if (((RSA_flags(a->pkey.rsa) & RSA_METHOD_FLAG_NO_CHECK))
-            || (RSA_flags(b->pkey.rsa) & RSA_METHOD_FLAG_NO_CHECK)) {
+        || (RSA_flags(b->pkey.rsa) & RSA_METHOD_FLAG_NO_CHECK)) {
         return 1;
     }
 
@@ -127,7 +127,7 @@ static int rsa_pub_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
 }
 
 static int old_rsa_priv_decode(EVP_PKEY *pkey,
-                               const unsigned char **pder, int derlen)
+    const unsigned char **pder, int derlen)
 {
     RSA *rsa;
 
@@ -160,7 +160,7 @@ static int rsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
     }
 
     if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(pkey->ameth->pkey_id), 0,
-                         strtype, str, rk, rklen)) {
+            strtype, str, rk, rklen)) {
         ERR_raise(ERR_LIB_RSA, ERR_R_ASN1_LIB);
         ASN1_STRING_free(str);
         OPENSSL_clear_free(rk, rklen);
@@ -203,7 +203,7 @@ static void int_rsa_free(EVP_PKEY *pkey)
 }
 
 static int rsa_pss_param_print(BIO *bp, int pss_key, RSA_PSS_PARAMS *pss,
-                               int indent)
+    int indent)
 {
     int rv = 0;
     X509_ALGOR *maskHash = NULL;
@@ -291,10 +291,9 @@ static int rsa_pss_param_print(BIO *bp, int pss_key, RSA_PSS_PARAMS *pss,
 
     rv = 1;
 
- err:
+err:
     X509_ALGOR_free(maskHash);
     return rv;
-
 }
 
 static int pkey_rsa_print(BIO *bp, const EVP_PKEY *pkey, int off, int priv)
@@ -311,12 +310,13 @@ static int pkey_rsa_print(BIO *bp, const EVP_PKEY *pkey, int off, int priv)
     if (!BIO_indent(bp, off, 128))
         goto err;
 
-    if (BIO_printf(bp, "%s ", pkey_is_pss(pkey) ?  "RSA-PSS" : "RSA") <= 0)
+    if (BIO_printf(bp, "%s ", pkey_is_pss(pkey) ? "RSA-PSS" : "RSA") <= 0)
         goto err;
 
     if (priv && x->d) {
         if (BIO_printf(bp, "Private-Key: (%d bit, %d primes)\n",
-                       mod_len, ex_primes <= 0 ? 2 : ex_primes + 2) <= 0)
+                mod_len, ex_primes <= 0 ? 2 : ex_primes + 2)
+            <= 0)
             goto err;
         str = "modulus:";
         s = "publicExponent:";
@@ -382,24 +382,24 @@ static int pkey_rsa_print(BIO *bp, const EVP_PKEY *pkey, int off, int priv)
     if (pkey_is_pss(pkey) && !rsa_pss_param_print(bp, 1, x->pss, off))
         goto err;
     ret = 1;
- err:
+err:
     return ret;
 }
 
 static int rsa_pub_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                         ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return pkey_rsa_print(bp, pkey, indent, 0);
 }
 
 static int rsa_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent,
-                          ASN1_PCTX *ctx)
+    ASN1_PCTX *ctx)
 {
     return pkey_rsa_print(bp, pkey, indent, 1);
 }
 
 static int rsa_sig_print(BIO *bp, const X509_ALGOR *sigalg,
-                         const ASN1_STRING *sig, int indent, ASN1_PCTX *pctx)
+    const ASN1_STRING *sig, int indent, ASN1_PCTX *pctx)
 {
     if (OBJ_obj2nid(sigalg->algorithm) == EVP_PKEY_RSA_PSS) {
         int rv;
@@ -427,7 +427,7 @@ static int rsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
     case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
         if (pkey->pkey.rsa->pss != NULL) {
             if (!ossl_rsa_pss_get_param(pkey->pkey.rsa->pss, &md, &mgf1md,
-                                        &min_saltlen)) {
+                    &min_saltlen)) {
                 ERR_raise(ERR_LIB_RSA, ERR_R_INTERNAL_ERROR);
                 return 0;
             }
@@ -492,7 +492,7 @@ static RSA_PSS_PARAMS *rsa_ctx_to_pss(EVP_PKEY_CTX *pkctx)
 }
 
 RSA_PSS_PARAMS *ossl_rsa_pss_params_create(const EVP_MD *sigmd,
-                                           const EVP_MD *mgf1md, int saltlen)
+    const EVP_MD *mgf1md, int saltlen)
 {
     RSA_PSS_PARAMS *pss = RSA_PSS_PARAMS_new();
 
@@ -514,7 +514,7 @@ RSA_PSS_PARAMS *ossl_rsa_pss_params_create(const EVP_MD *sigmd,
     if (!ossl_x509_algor_new_from_md(&pss->maskHash, mgf1md))
         goto err;
     return pss;
- err:
+err:
     RSA_PSS_PARAMS_free(pss);
     return NULL;
 }
@@ -539,7 +539,7 @@ 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)
 {
     int rv = -1;
     int saltlen;
@@ -584,13 +584,13 @@ int ossl_rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx,
     /* Carry on */
     rv = 1;
 
- err:
+err:
     RSA_PSS_PARAMS_free(pss);
     return rv;
 }
 
 static int rsa_pss_verify_param(const EVP_MD **pmd, const EVP_MD **pmgf1md,
-                                int *psaltlen, int *ptrailerField)
+    int *psaltlen, int *ptrailerField)
 {
     if (psaltlen != NULL && *psaltlen < 0) {
         ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_SALT_LENGTH);
@@ -608,7 +608,7 @@ static int rsa_pss_verify_param(const EVP_MD **pmd, const EVP_MD **pmgf1md,
 }
 
 int ossl_rsa_pss_get_param(const RSA_PSS_PARAMS *pss, const EVP_MD **pmd,
-                           const EVP_MD **pmgf1md, int *psaltlen)
+    const EVP_MD **pmgf1md, int *psaltlen)
 {
     /*
      * Callers do not care about the trailer field, and yet, we must
@@ -621,7 +621,7 @@ int ossl_rsa_pss_get_param(const RSA_PSS_PARAMS *pss, const EVP_MD **pmd,
     int trailerField = 0;
 
     return ossl_rsa_pss_get_param_unverified(pss, pmd, pmgf1md, psaltlen,
-                                             &trailerField)
+               &trailerField)
         && rsa_pss_verify_param(pmd, pmgf1md, psaltlen, &trailerField);
 }
 
@@ -631,8 +631,8 @@ int ossl_rsa_pss_get_param(const RSA_PSS_PARAMS *pss, const EVP_MD **pmd,
  */
 
 static int rsa_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it,
-                           const void *asn, const X509_ALGOR *sigalg,
-                           const ASN1_BIT_STRING *sig, EVP_PKEY *pkey)
+    const void *asn, const X509_ALGOR *sigalg,
+    const ASN1_BIT_STRING *sig, EVP_PKEY *pkey)
 {
     /* Sanity check: make sure it is PSS */
     if (OBJ_obj2nid(sigalg->algorithm) != EVP_PKEY_RSA_PSS) {
@@ -647,8 +647,8 @@ static int rsa_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it,
 }
 
 static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *asn,
-                         X509_ALGOR *alg1, X509_ALGOR *alg2,
-                         ASN1_BIT_STRING *sig)
+    X509_ALGOR *alg1, X509_ALGOR *alg2,
+    ASN1_BIT_STRING *sig)
 {
     int pad_mode;
     EVP_PKEY_CTX *pkctx = EVP_MD_CTX_get_pkey_ctx(ctx);
@@ -678,16 +678,16 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *asn,
                     return 0;
                 }
                 if (!X509_ALGOR_set0(alg2, OBJ_nid2obj(EVP_PKEY_RSA_PSS),
-                                     V_ASN1_SEQUENCE, os2)) {
+                        V_ASN1_SEQUENCE, os2)) {
                     ASN1_STRING_free(os1);
                     ASN1_STRING_free(os2);
                     return 0;
                 }
             }
             if (!X509_ALGOR_set0(alg1, OBJ_nid2obj(EVP_PKEY_RSA_PSS),
-                                 V_ASN1_SEQUENCE, os1)) {
-                    ASN1_STRING_free(os1);
-                    return 0;
+                    V_ASN1_SEQUENCE, os1)) {
+                ASN1_STRING_free(os1);
+                return 0;
             }
             return 3;
         }
@@ -720,7 +720,7 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *asn,
 }
 
 static int rsa_sig_info_set(X509_SIG_INFO *siginf, const X509_ALGOR *sigalg,
-                            const ASN1_STRING *sig)
+    const ASN1_STRING *sig)
 {
     int rv = 0;
     int mdnid, saltlen, md_size;
@@ -745,8 +745,8 @@ static int rsa_sig_info_set(X509_SIG_INFO *siginf, const X509_ALGOR *sigalg,
      * match and salt length must equal digest size
      */
     if ((mdnid == NID_sha256 || mdnid == NID_sha384 || mdnid == NID_sha512)
-            && mdnid == EVP_MD_get_type(mgf1md)
-            && saltlen == md_size)
+        && mdnid == EVP_MD_get_type(mgf1md)
+        && saltlen == md_size)
         flags = X509_SIG_INFO_TLS;
     else
         flags = 0;
@@ -769,9 +769,9 @@ static int rsa_sig_info_set(X509_SIG_INFO *siginf, const X509_ALGOR *sigalg,
     else if (mdnid == NID_md5)
         secbits = 39;
     X509_SIG_INFO_set(siginf, mdnid, EVP_PKEY_RSA_PSS, secbits,
-                      flags);
+        flags);
     rv = 1;
-    err:
+err:
     RSA_PSS_PARAMS_free(pss);
     return rv;
 }
@@ -791,9 +791,9 @@ static size_t rsa_pkey_dirty_cnt(const EVP_PKEY *pkey)
  * checks in this method since the caller tests EVP_KEYMGMT_is_a() first.
  */
 static int rsa_int_export_to(const EVP_PKEY *from, int rsa_type,
-                             void *to_keydata,
-                             OSSL_FUNC_keymgmt_import_fn *importer,
-                             OSSL_LIB_CTX *libctx, const char *propq)
+    void *to_keydata,
+    OSSL_FUNC_keymgmt_import_fn *importer,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     RSA *rsa = from->pkey.rsa;
     OSSL_PARAM_BLD *tmpl = OSSL_PARAM_BLD_new();
@@ -820,14 +820,14 @@ static int rsa_int_export_to(const EVP_PKEY *from, int rsa_type,
         RSA_PSS_PARAMS_30 pss_params;
 
         if (!ossl_rsa_pss_get_param_unverified(rsa->pss, &md, &mgf1md,
-                                               &saltlen, &trailerfield))
+                &saltlen, &trailerfield))
             goto err;
         md_nid = EVP_MD_get_type(md);
         mgf1md_nid = EVP_MD_get_type(mgf1md);
         if (!ossl_rsa_pss_params_30_set_defaults(&pss_params)
             || !ossl_rsa_pss_params_30_set_hashalg(&pss_params, md_nid)
             || !ossl_rsa_pss_params_30_set_maskgenhashalg(&pss_params,
-                                                          mgf1md_nid)
+                mgf1md_nid)
             || !ossl_rsa_pss_params_30_set_saltlen(&pss_params, saltlen)
             || !ossl_rsa_pss_params_30_todata(&pss_params, tmpl, NULL))
             goto err;
@@ -840,19 +840,21 @@ static int rsa_int_export_to(const EVP_PKEY *from, int rsa_type,
     /* We export, the provider imports */
     rv = importer(to_keydata, selection, params);
 
- err:
+err:
     OSSL_PARAM_free(params);
     OSSL_PARAM_BLD_free(tmpl);
     return rv;
 }
 
 static int rsa_int_import_from(const OSSL_PARAM params[], void *vpctx,
-                               int rsa_type)
+    int rsa_type)
 {
     EVP_PKEY_CTX *pctx = vpctx;
     EVP_PKEY *pkey = EVP_PKEY_CTX_get0_pkey(pctx);
     RSA *rsa = ossl_rsa_new_with_ctx(pctx->libctx);
-    RSA_PSS_PARAMS_30 rsa_pss_params = { 0, };
+    RSA_PSS_PARAMS_30 rsa_pss_params = {
+        0,
+    };
     int pss_defaults_set = 0;
     int ok = 0;
 
@@ -865,7 +867,7 @@ static int rsa_int_import_from(const OSSL_PARAM params[], void *vpctx,
     RSA_set_flags(rsa, rsa_type);
 
     if (!ossl_rsa_pss_params_30_fromdata(&rsa_pss_params, &pss_defaults_set,
-                                         params, pctx->libctx))
+            params, pctx->libctx))
         goto err;
 
     switch (rsa_type) {
@@ -891,7 +893,8 @@ static int rsa_int_import_from(const OSSL_PARAM params[], void *vpctx,
             const EVP_MD *mgf1md = EVP_get_digestbynid(mgf1mdnid);
 
             if ((rsa->pss = ossl_rsa_pss_params_create(md, mgf1md,
-                                                       saltlen)) == NULL)
+                     saltlen))
+                == NULL)
                 goto err;
         }
         break;
@@ -912,26 +915,26 @@ static int rsa_int_import_from(const OSSL_PARAM params[], void *vpctx,
         break;
     }
 
- err:
+err:
     if (!ok)
         RSA_free(rsa);
     return ok;
 }
 
 static int rsa_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
-                              OSSL_FUNC_keymgmt_import_fn *importer,
-                              OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_FUNC_keymgmt_import_fn *importer,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     return rsa_int_export_to(from, RSA_FLAG_TYPE_RSA, to_keydata,
-                             importer, libctx, propq);
+        importer, libctx, propq);
 }
 
 static int rsa_pss_pkey_export_to(const EVP_PKEY *from, void *to_keydata,
-                                  OSSL_FUNC_keymgmt_import_fn *importer,
-                                  OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_FUNC_keymgmt_import_fn *importer,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     return rsa_int_export_to(from, RSA_FLAG_TYPE_RSASSAPSS, to_keydata,
-                             importer, libctx, propq);
+        importer, libctx, propq);
 }
 
 static int rsa_pkey_import_from(const OSSL_PARAM params[], void *vpctx)
@@ -963,91 +966,88 @@ static int rsa_pkey_copy(EVP_PKEY *to, EVP_PKEY *from)
 }
 
 const EVP_PKEY_ASN1_METHOD ossl_rsa_asn1_meths[2] = {
-    {
-     EVP_PKEY_RSA,
-     EVP_PKEY_RSA,
-     ASN1_PKEY_SIGPARAM_NULL,
-
-     "RSA",
-     "OpenSSL RSA method",
-
-     rsa_pub_decode,
-     rsa_pub_encode,
-     rsa_pub_cmp,
-     rsa_pub_print,
-
-     rsa_priv_decode,
-     rsa_priv_encode,
-     rsa_priv_print,
-
-     int_rsa_size,
-     rsa_bits,
-     rsa_security_bits,
-
-     0, 0, 0, 0, 0, 0,
-
-     rsa_sig_print,
-     int_rsa_free,
-     rsa_pkey_ctrl,
-     old_rsa_priv_decode,
-     old_rsa_priv_encode,
-     rsa_item_verify,
-     rsa_item_sign,
-     rsa_sig_info_set,
-     rsa_pkey_check,
-
-     0, 0,
-     0, 0, 0, 0,
-
-     rsa_pkey_dirty_cnt,
-     rsa_pkey_export_to,
-     rsa_pkey_import_from,
-     rsa_pkey_copy
-    },
-
-    {
-     EVP_PKEY_RSA2,
-     EVP_PKEY_RSA,
-     ASN1_PKEY_ALIAS}
+    { EVP_PKEY_RSA,
+        EVP_PKEY_RSA,
+        ASN1_PKEY_SIGPARAM_NULL,
+
+        "RSA",
+        "OpenSSL RSA method",
+
+        rsa_pub_decode,
+        rsa_pub_encode,
+        rsa_pub_cmp,
+        rsa_pub_print,
+
+        rsa_priv_decode,
+        rsa_priv_encode,
+        rsa_priv_print,
+
+        int_rsa_size,
+        rsa_bits,
+        rsa_security_bits,
+
+        0, 0, 0, 0, 0, 0,
+
+        rsa_sig_print,
+        int_rsa_free,
+        rsa_pkey_ctrl,
+        old_rsa_priv_decode,
+        old_rsa_priv_encode,
+        rsa_item_verify,
+        rsa_item_sign,
+        rsa_sig_info_set,
+        rsa_pkey_check,
+
+        0, 0,
+        0, 0, 0, 0,
+
+        rsa_pkey_dirty_cnt,
+        rsa_pkey_export_to,
+        rsa_pkey_import_from,
+        rsa_pkey_copy },
+
+    { EVP_PKEY_RSA2,
+        EVP_PKEY_RSA,
+        ASN1_PKEY_ALIAS }
 };
 
 const EVP_PKEY_ASN1_METHOD ossl_rsa_pss_asn1_meth = {
-     EVP_PKEY_RSA_PSS,
-     EVP_PKEY_RSA_PSS,
-     ASN1_PKEY_SIGPARAM_NULL,
-
-     "RSA-PSS",
-     "OpenSSL RSA-PSS method",
-
-     rsa_pub_decode,
-     rsa_pub_encode,
-     rsa_pub_cmp,
-     rsa_pub_print,
-
-     rsa_priv_decode,
-     rsa_priv_encode,
-     rsa_priv_print,
-
-     int_rsa_size,
-     rsa_bits,
-     rsa_security_bits,
-
-     0, 0, 0, 0, 0, 0,
-
-     rsa_sig_print,
-     int_rsa_free,
-     rsa_pkey_ctrl,
-     0, 0,
-     rsa_item_verify,
-     rsa_item_sign,
-     rsa_sig_info_set,
-     rsa_pkey_check,
-
-     0, 0,
-     0, 0, 0, 0,
-
-     rsa_pkey_dirty_cnt,
-     rsa_pss_pkey_export_to,
-     rsa_pss_pkey_import_from,
-     rsa_pkey_copy
+    EVP_PKEY_RSA_PSS,
+    EVP_PKEY_RSA_PSS,
+    ASN1_PKEY_SIGPARAM_NULL,
+
+    "RSA-PSS",
+    "OpenSSL RSA-PSS method",
+
+    rsa_pub_decode,
+    rsa_pub_encode,
+    rsa_pub_cmp,
+    rsa_pub_print,
+
+    rsa_priv_decode,
+    rsa_priv_encode,
+    rsa_priv_print,
+
+    int_rsa_size,
+    rsa_bits,
+    rsa_security_bits,
+
+    0, 0, 0, 0, 0, 0,
+
+    rsa_sig_print,
+    int_rsa_free,
+    rsa_pkey_ctrl,
+    0, 0,
+    rsa_item_verify,
+    rsa_item_sign,
+    rsa_sig_info_set,
+    rsa_pkey_check,
+
+    0, 0,
+    0, 0, 0, 0,
+
+    rsa_pkey_dirty_cnt,
+    rsa_pss_pkey_export_to,
+    rsa_pss_pkey_import_from,
+    rsa_pkey_copy
 };
diff --git a/crypto/rsa/rsa_asn1.c b/crypto/rsa/rsa_asn1.c
index c14cdf415e9d0..bdd83b414b1cf 100644
--- a/crypto/rsa/rsa_asn1.c
+++ b/crypto/rsa/rsa_asn1.c
@@ -26,7 +26,7 @@
  * RSA keys.
  */
 static int rsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                  void *exarg)
+    void *exarg)
 {
     if (operation == ASN1_OP_NEW_PRE) {
         *pval = (ASN1_VALUE *)RSA_new();
@@ -49,33 +49,32 @@ static int rsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 
 /* Based on definitions in RFC 8017 appendix A.1.2 */
 ASN1_SEQUENCE(RSA_PRIME_INFO) = {
-        ASN1_SIMPLE(RSA_PRIME_INFO, r, CBIGNUM),
-        ASN1_SIMPLE(RSA_PRIME_INFO, d, CBIGNUM),
-        ASN1_SIMPLE(RSA_PRIME_INFO, t, CBIGNUM),
+    ASN1_SIMPLE(RSA_PRIME_INFO, r, CBIGNUM),
+    ASN1_SIMPLE(RSA_PRIME_INFO, d, CBIGNUM),
+    ASN1_SIMPLE(RSA_PRIME_INFO, t, CBIGNUM),
 } ASN1_SEQUENCE_END(RSA_PRIME_INFO)
 
 ASN1_SEQUENCE_cb(RSAPrivateKey, rsa_cb) = {
-        ASN1_EMBED(RSA, version, INT32),
-        ASN1_SIMPLE(RSA, n, BIGNUM),
-        ASN1_SIMPLE(RSA, e, BIGNUM),
-        ASN1_SIMPLE(RSA, d, CBIGNUM),
-        ASN1_SIMPLE(RSA, p, CBIGNUM),
-        ASN1_SIMPLE(RSA, q, CBIGNUM),
-        ASN1_SIMPLE(RSA, dmp1, CBIGNUM),
-        ASN1_SIMPLE(RSA, dmq1, CBIGNUM),
-        ASN1_SIMPLE(RSA, iqmp, CBIGNUM),
-        ASN1_SEQUENCE_OF_OPT(RSA, prime_infos, RSA_PRIME_INFO)
+    ASN1_EMBED(RSA, version, INT32),
+    ASN1_SIMPLE(RSA, n, BIGNUM),
+    ASN1_SIMPLE(RSA, e, BIGNUM),
+    ASN1_SIMPLE(RSA, d, CBIGNUM),
+    ASN1_SIMPLE(RSA, p, CBIGNUM),
+    ASN1_SIMPLE(RSA, q, CBIGNUM),
+    ASN1_SIMPLE(RSA, dmp1, CBIGNUM),
+    ASN1_SIMPLE(RSA, dmq1, CBIGNUM),
+    ASN1_SIMPLE(RSA, iqmp, CBIGNUM),
+    ASN1_SEQUENCE_OF_OPT(RSA, prime_infos, RSA_PRIME_INFO)
 } ASN1_SEQUENCE_END_cb(RSA, RSAPrivateKey)
 
-
 ASN1_SEQUENCE_cb(RSAPublicKey, rsa_cb) = {
-        ASN1_SIMPLE(RSA, n, BIGNUM),
-        ASN1_SIMPLE(RSA, e, BIGNUM),
+    ASN1_SIMPLE(RSA, n, BIGNUM),
+    ASN1_SIMPLE(RSA, e, BIGNUM),
 } ASN1_SEQUENCE_END_cb(RSA, RSAPublicKey)
 
 /* Free up maskHash */
 static int rsa_pss_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                      void *exarg)
+    void *exarg)
 {
     if (operation == ASN1_OP_FREE_PRE) {
         RSA_PSS_PARAMS *pss = (RSA_PSS_PARAMS *)*pval;
@@ -85,10 +84,10 @@ static int rsa_pss_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_SEQUENCE_cb(RSA_PSS_PARAMS, rsa_pss_cb) = {
-        ASN1_EXP_OPT(RSA_PSS_PARAMS, hashAlgorithm, X509_ALGOR,0),
-        ASN1_EXP_OPT(RSA_PSS_PARAMS, maskGenAlgorithm, X509_ALGOR,1),
-        ASN1_EXP_OPT(RSA_PSS_PARAMS, saltLength, ASN1_INTEGER,2),
-        ASN1_EXP_OPT(RSA_PSS_PARAMS, trailerField, ASN1_INTEGER,3)
+    ASN1_EXP_OPT(RSA_PSS_PARAMS, hashAlgorithm, X509_ALGOR, 0),
+    ASN1_EXP_OPT(RSA_PSS_PARAMS, maskGenAlgorithm, X509_ALGOR, 1),
+    ASN1_EXP_OPT(RSA_PSS_PARAMS, saltLength, ASN1_INTEGER, 2),
+    ASN1_EXP_OPT(RSA_PSS_PARAMS, trailerField, ASN1_INTEGER, 3)
 } ASN1_SEQUENCE_END_cb(RSA_PSS_PARAMS, RSA_PSS_PARAMS)
 
 IMPLEMENT_ASN1_FUNCTIONS(RSA_PSS_PARAMS)
@@ -96,7 +95,7 @@ IMPLEMENT_ASN1_DUP_FUNCTION(RSA_PSS_PARAMS)
 
 /* Free up maskHash */
 static int rsa_oaep_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                       void *exarg)
+    void *exarg)
 {
     if (operation == ASN1_OP_FREE_PRE) {
         RSA_OAEP_PARAMS *oaep = (RSA_OAEP_PARAMS *)*pval;
@@ -106,9 +105,9 @@ static int rsa_oaep_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_SEQUENCE_cb(RSA_OAEP_PARAMS, rsa_oaep_cb) = {
-        ASN1_EXP_OPT(RSA_OAEP_PARAMS, hashFunc, X509_ALGOR, 0),
-        ASN1_EXP_OPT(RSA_OAEP_PARAMS, maskGenFunc, X509_ALGOR, 1),
-        ASN1_EXP_OPT(RSA_OAEP_PARAMS, pSourceFunc, X509_ALGOR, 2),
+    ASN1_EXP_OPT(RSA_OAEP_PARAMS, hashFunc, X509_ALGOR, 0),
+    ASN1_EXP_OPT(RSA_OAEP_PARAMS, maskGenFunc, X509_ALGOR, 1),
+    ASN1_EXP_OPT(RSA_OAEP_PARAMS, pSourceFunc, X509_ALGOR, 2),
 } ASN1_SEQUENCE_END_cb(RSA_OAEP_PARAMS, RSA_OAEP_PARAMS)
 
 IMPLEMENT_ASN1_FUNCTIONS(RSA_OAEP_PARAMS)
diff --git a/crypto/rsa/rsa_backend.c b/crypto/rsa/rsa_backend.c
index d6864dc237cd1..3315c50014fdc 100644
--- a/crypto/rsa/rsa_backend.c
+++ b/crypto/rsa/rsa_backend.c
@@ -19,8 +19,8 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #ifndef FIPS_MODULE
-# include <openssl/x509.h>
-# include "crypto/asn1.h"
+#include <openssl/x509.h>
+#include "crypto/asn1.h"
 #endif
 #include "internal/sizes.h"
 #include "internal/param_build_set.h"
@@ -36,7 +36,7 @@
 DEFINE_STACK_OF(BIGNUM)
 
 static int collect_numbers(STACK_OF(BIGNUM) *numbers,
-                           const OSSL_PARAM params[], const char *names[])
+    const OSSL_PARAM params[], const char *names[])
 {
     const OSSL_PARAM *p = NULL;
     int i;
@@ -63,7 +63,7 @@ static int collect_numbers(STACK_OF(BIGNUM) *numbers,
 
 int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
 {
-    const OSSL_PARAM *param_n, *param_e,  *param_d = NULL;
+    const OSSL_PARAM *param_n, *param_e, *param_d = NULL;
     const OSSL_PARAM *param_p, *param_q = NULL;
     const OSSL_PARAM *param_derive = NULL;
     BIGNUM *p = NULL, *q = NULL, *n = NULL, *e = NULL, *d = NULL;
@@ -87,7 +87,7 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
     if (include_private) {
 
         param_derive = OSSL_PARAM_locate_const(params,
-                                           OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ);
+            OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ);
         if ((param_derive != NULL)
             && !OSSL_PARAM_get_int(param_derive, &derive_from_pq))
             goto err;
@@ -111,7 +111,6 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
                 ERR_raise(ERR_LIB_RSA, ERR_R_PASSED_NULL_PARAMETER);
                 goto err;
             }
-
         }
     }
 
@@ -123,11 +122,11 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
 
     if (is_private) {
         if (!collect_numbers(factors = sk_BIGNUM_new_null(), params,
-                             ossl_rsa_mp_factor_names)
+                ossl_rsa_mp_factor_names)
             || !collect_numbers(exps = sk_BIGNUM_new_null(), params,
-                                ossl_rsa_mp_exp_names)
+                ossl_rsa_mp_exp_names)
             || !collect_numbers(coeffs = sk_BIGNUM_new_null(), params,
-                                ossl_rsa_mp_coeff_names))
+                ossl_rsa_mp_coeff_names))
             goto err;
 
         if (derive_from_pq && sk_BIGNUM_num(exps) == 0
@@ -155,7 +154,7 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
             if (sk_BIGNUM_num(factors) == 2) {
                 /* for 2 factors we can use the sp800 functions to do this */
                 if (!RSA_set0_factors(rsa, sk_BIGNUM_value(factors, 0),
-                                      sk_BIGNUM_value(factors, 1))) {
+                        sk_BIGNUM_value(factors, 1))) {
                     ERR_raise(ERR_LIB_RSA, ERR_R_INTERNAL_ERROR);
                     goto err;
                 }
@@ -173,8 +172,8 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
                  * the call to ossl_rsa_set0_all_params
                  */
                 if (!ossl_rsa_sp800_56b_derive_params_from_pq(rsa,
-                                                              RSA_bits(rsa),
-                                                              NULL, ctx)) {
+                        RSA_bits(rsa),
+                        NULL, ctx)) {
                     ERR_raise(ERR_LIB_RSA, ERR_R_INTERNAL_ERROR);
                     goto err;
                 }
@@ -185,9 +184,9 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
                  * for each additional prime
                  */
                 if (!ossl_rsa_multiprime_derive(rsa, RSA_bits(rsa),
-                                                sk_BIGNUM_num(factors),
-                                                rsa->e, factors, exps,
-                                                coeffs)) {
+                        sk_BIGNUM_num(factors),
+                        rsa->e, factors, exps,
+                        coeffs)) {
                     ERR_raise(ERR_LIB_RSA, ERR_R_INTERNAL_ERROR);
                     goto err;
                 }
@@ -222,16 +221,16 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
             || sk_BIGNUM_num(exps) != 0
             || sk_BIGNUM_num(coeffs) != 0) {
             ERR_raise_data(ERR_LIB_RSA, ERR_R_INTERNAL_ERROR,
-                           "There are %d, %d, %d elements left on our factors, exps, coeffs stacks\n",
-                           sk_BIGNUM_num(factors), sk_BIGNUM_num(exps),
-                           sk_BIGNUM_num(coeffs));
+                "There are %d, %d, %d elements left on our factors, exps, coeffs stacks\n",
+                sk_BIGNUM_num(factors), sk_BIGNUM_num(exps),
+                sk_BIGNUM_num(coeffs));
             goto err;
         }
     }
 
     if (!ossl_rsa_check_factors(rsa)) {
         ERR_raise_data(ERR_LIB_RSA, RSA_R_INVALID_KEYPAIR,
-                       "RSA factors/exponents are too big for for n-modulus\n");
+            "RSA factors/exponents are too big for for n-modulus\n");
         goto err;
     }
 
@@ -243,7 +242,7 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
     BN_CTX_free(ctx);
     return 1;
 
- err:
+err:
     BN_free(n);
     BN_free(e);
     BN_free(d);
@@ -257,7 +256,7 @@ int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private)
 DEFINE_SPECIAL_STACK_OF_CONST(BIGNUM_const, BIGNUM)
 
 int ossl_rsa_todata(RSA *rsa, OSSL_PARAM_BLD *bld, OSSL_PARAM params[],
-                    int include_private)
+    int include_private)
 {
     int ret = 0;
     const BIGNUM *rsa_d = NULL, *rsa_n = NULL, *rsa_e = NULL;
@@ -279,15 +278,15 @@ int ossl_rsa_todata(RSA *rsa, OSSL_PARAM_BLD *bld, OSSL_PARAM params[],
     if (include_private && rsa_d != NULL) {
 
         if (!ossl_param_build_set_bn(bld, params, OSSL_PKEY_PARAM_RSA_D,
-                                     rsa_d)
+                rsa_d)
             || !ossl_param_build_set_multi_key_bn(bld, params,
-                                                  ossl_rsa_mp_factor_names,
-                                                  factors)
+                ossl_rsa_mp_factor_names,
+                factors)
             || !ossl_param_build_set_multi_key_bn(bld, params,
-                                                  ossl_rsa_mp_exp_names, exps)
+                ossl_rsa_mp_exp_names, exps)
             || !ossl_param_build_set_multi_key_bn(bld, params,
-                                                  ossl_rsa_mp_coeff_names,
-                                                  coeffs))
+                ossl_rsa_mp_coeff_names,
+                coeffs))
             goto err;
     }
 
@@ -297,7 +296,7 @@ int ossl_rsa_todata(RSA *rsa, OSSL_PARAM_BLD *bld, OSSL_PARAM params[],
         ossl_rsa_acvp_test_get_params(rsa, params);
 #endif
     ret = 1;
- err:
+err:
     sk_BIGNUM_const_free(factors);
     sk_BIGNUM_const_free(exps);
     sk_BIGNUM_const_free(coeffs);
@@ -305,7 +304,7 @@ int ossl_rsa_todata(RSA *rsa, OSSL_PARAM_BLD *bld, OSSL_PARAM params[],
 }
 
 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[])
 {
     if (!ossl_rsa_pss_params_30_is_unrestricted(pss)) {
         int hashalg_nid = ossl_rsa_pss_params_30_hashalg(pss);
@@ -314,17 +313,16 @@ int ossl_rsa_pss_params_30_todata(const RSA_PSS_PARAMS_30 *pss,
         int saltlen = ossl_rsa_pss_params_30_saltlen(pss);
         int default_hashalg_nid = ossl_rsa_pss_params_30_hashalg(NULL);
         int default_maskgenalg_nid = ossl_rsa_pss_params_30_maskgenalg(NULL);
-        int default_maskgenhashalg_nid =
-                ossl_rsa_pss_params_30_maskgenhashalg(NULL);
-        const char *mdname =
-            (hashalg_nid == default_hashalg_nid
-             ? NULL : ossl_rsa_oaeppss_nid2name(hashalg_nid));
-        const char *mgfname =
-            (maskgenalg_nid == default_maskgenalg_nid
-             ? NULL : ossl_rsa_oaeppss_nid2name(maskgenalg_nid));
-        const char *mgf1mdname =
-            (maskgenhashalg_nid == default_maskgenhashalg_nid
-             ? NULL : ossl_rsa_oaeppss_nid2name(maskgenhashalg_nid));
+        int default_maskgenhashalg_nid = ossl_rsa_pss_params_30_maskgenhashalg(NULL);
+        const char *mdname = (hashalg_nid == default_hashalg_nid
+                ? NULL
+                : ossl_rsa_oaeppss_nid2name(hashalg_nid));
+        const char *mgfname = (maskgenalg_nid == default_maskgenalg_nid
+                ? NULL
+                : ossl_rsa_oaeppss_nid2name(maskgenalg_nid));
+        const char *mgf1mdname = (maskgenhashalg_nid == default_maskgenhashalg_nid
+                ? NULL
+                : ossl_rsa_oaeppss_nid2name(maskgenhashalg_nid));
         const char *key_md = OSSL_PKEY_PARAM_RSA_DIGEST;
         const char *key_mgf = OSSL_PKEY_PARAM_RSA_MASKGENFUNC;
         const char *key_mgf1_md = OSSL_PKEY_PARAM_RSA_MGF1_DIGEST;
@@ -336,13 +334,13 @@ int ossl_rsa_pss_params_30_todata(const RSA_PSS_PARAMS_30 *pss,
          * if it has a default value; saltlen.
          */
         if ((mdname != NULL
-             && !ossl_param_build_set_utf8_string(bld, params, key_md, mdname))
+                && !ossl_param_build_set_utf8_string(bld, params, key_md, mdname))
             || (mgfname != NULL
                 && !ossl_param_build_set_utf8_string(bld, params,
-                                                     key_mgf, mgfname))
+                    key_mgf, mgfname))
             || (mgf1mdname != NULL
                 && !ossl_param_build_set_utf8_string(bld, params,
-                                                     key_mgf1_md, mgf1mdname))
+                    key_mgf1_md, mgf1mdname))
             || (!ossl_param_build_set_int(bld, params, key_saltlen, saltlen)))
             return 0;
     }
@@ -350,11 +348,11 @@ int ossl_rsa_pss_params_30_todata(const RSA_PSS_PARAMS_30 *pss,
 }
 
 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)
 {
-    const OSSL_PARAM *param_md, *param_mgf, *param_mgf1md,  *param_saltlen;
+    const OSSL_PARAM *param_md, *param_mgf, *param_mgf1md, *param_saltlen;
     const OSSL_PARAM *param_propq;
     const char *propq = NULL;
     EVP_MD *md = NULL, *mgf1md = NULL;
@@ -363,16 +361,11 @@ int ossl_rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params,
 
     if (pss_params == NULL)
         return 0;
-    param_propq =
-        OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_DIGEST_PROPS);
-    param_md =
-        OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_DIGEST);
-    param_mgf =
-        OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_MASKGENFUNC);
-    param_mgf1md =
-        OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_MGF1_DIGEST);
-    param_saltlen =
-        OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_PSS_SALTLEN);
+    param_propq = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_DIGEST_PROPS);
+    param_md = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_DIGEST);
+    param_mgf = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_MASKGENFUNC);
+    param_mgf1md = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_MGF1_DIGEST);
+    param_saltlen = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_RSA_PSS_SALTLEN);
 
     if (param_propq != NULL) {
         if (param_propq->data_type == OSSL_PARAM_UTF8_STRING)
@@ -401,7 +394,8 @@ int ossl_rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params,
             return 0;
 
         if (OPENSSL_strcasecmp(param_mgf->data,
-                               ossl_rsa_mgf_nid2name(default_maskgenalg_nid)) != 0)
+                ossl_rsa_mgf_nid2name(default_maskgenalg_nid))
+            != 0)
             return 0;
     }
 
@@ -420,7 +414,7 @@ int ossl_rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params,
 
         if ((md = EVP_MD_fetch(libctx, mdname, propq)) == NULL
             || !ossl_rsa_pss_params_30_set_hashalg(pss_params,
-                                                   ossl_rsa_oaeppss_md2nid(md)))
+                ossl_rsa_oaeppss_md2nid(md)))
             goto err;
     }
 
@@ -434,7 +428,7 @@ int ossl_rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params,
 
         if ((mgf1md = EVP_MD_fetch(libctx, mgf1mdname, propq)) == NULL
             || !ossl_rsa_pss_params_30_set_maskgenhashalg(
-                    pss_params, ossl_rsa_oaeppss_md2nid(mgf1md)))
+                pss_params, ossl_rsa_oaeppss_md2nid(mgf1md)))
             goto err;
     }
 
@@ -446,7 +440,7 @@ int ossl_rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params,
 
     ret = 1;
 
- err:
+err:
     EVP_MD_free(md);
     EVP_MD_free(mgf1md);
     return ret;
@@ -552,13 +546,13 @@ RSA *ossl_rsa_dup(const RSA *rsa, int selection)
         }
     }
     if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_RSA,
-                            &dupkey->ex_data, &rsa->ex_data))
+            &dupkey->ex_data, &rsa->ex_data))
         goto err;
 #endif
 
     return dupkey;
 
- err:
+err:
     RSA_free(dupkey);
     return NULL;
 }
@@ -569,7 +563,7 @@ RSA_PSS_PARAMS *ossl_rsa_pss_decode(const X509_ALGOR *alg)
     RSA_PSS_PARAMS *pss;
 
     pss = ASN1_TYPE_unpack_sequence(ASN1_ITEM_rptr(RSA_PSS_PARAMS),
-                                    alg->parameter);
+        alg->parameter);
 
     if (pss == NULL)
         return NULL;
@@ -607,17 +601,17 @@ static int ossl_rsa_sync_to_pss_params_30(RSA *rsa)
          * be checked, eventually.
          */
         if (!ossl_rsa_pss_get_param_unverified(legacy_pss, &md, &mgf1md,
-                                               &saltlen, &trailerField))
+                &saltlen, &trailerField))
             return 0;
         md_nid = EVP_MD_get_type(md);
         mgf1md_nid = EVP_MD_get_type(mgf1md);
         if (!ossl_rsa_pss_params_30_set_defaults(&pss_params)
             || !ossl_rsa_pss_params_30_set_hashalg(&pss_params, md_nid)
             || !ossl_rsa_pss_params_30_set_maskgenhashalg(&pss_params,
-                                                          mgf1md_nid)
+                mgf1md_nid)
             || !ossl_rsa_pss_params_30_set_saltlen(&pss_params, saltlen)
             || !ossl_rsa_pss_params_30_set_trailerfield(&pss_params,
-                                                        trailerField))
+                trailerField))
             return 0;
         *pss = pss_params;
     }
@@ -625,8 +619,8 @@ static int ossl_rsa_sync_to_pss_params_30(RSA *rsa)
 }
 
 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_30 pss_params;
 
@@ -680,7 +674,7 @@ 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)
 {
     const unsigned char *p;
     RSA *rsa;
diff --git a/crypto/rsa/rsa_chk.c b/crypto/rsa/rsa_chk.c
index 0df254676adfa..5a12804f49784 100644
--- a/crypto/rsa/rsa_chk.c
+++ b/crypto/rsa/rsa_chk.c
@@ -27,7 +27,7 @@ static int rsa_validate_keypair_multiprime(const RSA *key, BN_GENCB *cb)
     RSA_PRIME_INFO *pinfo;
 
     if (key->p == NULL || key->q == NULL || key->n == NULL
-            || key->e == NULL || key->d == NULL) {
+        || key->e == NULL || key->d == NULL) {
         ERR_raise(ERR_LIB_RSA, RSA_R_VALUE_MISSING);
         return 0;
     }
@@ -36,7 +36,7 @@ static int rsa_validate_keypair_multiprime(const RSA *key, BN_GENCB *cb)
     if (key->version == RSA_ASN1_VERSION_MULTI) {
         ex_primes = sk_RSA_PRIME_INFO_num(key->prime_infos);
         if (ex_primes <= 0
-                || (ex_primes + 2) > ossl_rsa_multip_cap(BN_num_bits(key->n))) {
+            || (ex_primes + 2) > ossl_rsa_multip_cap(BN_num_bits(key->n))) {
             ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_MULTI_PRIME_KEY);
             return 0;
         }
@@ -49,7 +49,7 @@ static int rsa_validate_keypair_multiprime(const RSA *key, BN_GENCB *cb)
     m = BN_new();
     ctx = BN_CTX_new_ex(key->libctx);
     if (i == NULL || j == NULL || k == NULL || l == NULL
-            || m == NULL || ctx == NULL) {
+        || m == NULL || ctx == NULL) {
         ret = -1;
         ERR_raise(ERR_LIB_RSA, ERR_R_BN_LIB);
         goto err;
@@ -223,7 +223,7 @@ static int rsa_validate_keypair_multiprime(const RSA *key, BN_GENCB *cb)
         }
     }
 
- err:
+err:
     BN_free(i);
     BN_free(j);
     BN_free(k);
@@ -262,8 +262,8 @@ int RSA_check_key_ex(const RSA *key, BN_GENCB *cb)
 {
 #ifdef FIPS_MODULE
     return ossl_rsa_validate_public(key)
-           && ossl_rsa_validate_private(key)
-           && ossl_rsa_validate_pairwise(key);
+        && ossl_rsa_validate_private(key)
+        && ossl_rsa_validate_pairwise(key);
 #else
     return rsa_validate_keypair_multiprime(key, cb);
 #endif /* FIPS_MODULE */
diff --git a/crypto/rsa/rsa_crpt.c b/crypto/rsa/rsa_crpt.c
index 21c922e60968c..a62f20946da57 100644
--- a/crypto/rsa/rsa_crpt.c
+++ b/crypto/rsa/rsa_crpt.c
@@ -31,25 +31,25 @@ int RSA_size(const RSA *r)
 }
 
 int RSA_public_encrypt(int flen, const unsigned char *from, unsigned char *to,
-                       RSA *rsa, int padding)
+    RSA *rsa, int padding)
 {
     return rsa->meth->rsa_pub_enc(flen, from, to, rsa, padding);
 }
 
 int RSA_private_encrypt(int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding)
+    unsigned char *to, RSA *rsa, int padding)
 {
     return rsa->meth->rsa_priv_enc(flen, from, to, rsa, padding);
 }
 
 int RSA_private_decrypt(int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding)
+    unsigned char *to, RSA *rsa, int padding)
 {
     return rsa->meth->rsa_priv_dec(flen, from, to, rsa, padding);
 }
 
 int RSA_public_decrypt(int flen, const unsigned char *from, unsigned char *to,
-                       RSA *rsa, int padding)
+    RSA *rsa, int padding)
 {
     return rsa->meth->rsa_pub_dec(flen, from, to, rsa, padding);
 }
@@ -81,12 +81,12 @@ int RSA_blinding_on(RSA *rsa, BN_CTX *ctx)
     rsa->flags |= RSA_FLAG_BLINDING;
     rsa->flags &= ~RSA_FLAG_NO_BLINDING;
     ret = 1;
- err:
+err:
     return ret;
 }
 
 static BIGNUM *rsa_get_public_exp(const BIGNUM *d, const BIGNUM *p,
-                                  const BIGNUM *q, BN_CTX *ctx)
+    const BIGNUM *q, BN_CTX *ctx)
 {
     BIGNUM *ret = NULL, *r0, *r1, *r2;
 
@@ -108,7 +108,7 @@ static BIGNUM *rsa_get_public_exp(const BIGNUM *d, const BIGNUM *p,
         goto err;
 
     ret = BN_mod_inverse(NULL, d, r0, ctx);
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -153,7 +153,7 @@ BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *in_ctx)
         BN_with_flags(n, rsa->n, BN_FLG_CONSTTIME);
 
         ret = BN_BLINDING_create_param(NULL, e, n, ctx, rsa->meth->bn_mod_exp,
-                                       rsa->_method_mod_n);
+            rsa->_method_mod_n);
         /* We MUST free n before any further use of rsa->n */
         BN_free(n);
     }
@@ -164,7 +164,7 @@ BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *in_ctx)
 
     BN_BLINDING_set_current_thread(ret);
 
- err:
+err:
     BN_CTX_end(ctx);
     if (ctx != in_ctx)
         BN_CTX_free(ctx);
diff --git a/crypto/rsa/rsa_depr.c b/crypto/rsa/rsa_depr.c
index 3cc89b26a99c7..ad60c0fdf413a 100644
--- a/crypto/rsa/rsa_depr.c
+++ b/crypto/rsa/rsa_depr.c
@@ -27,7 +27,7 @@
 #include <openssl/rsa.h>
 
 RSA *RSA_generate_key(int bits, unsigned long e_value,
-                      void (*callback) (int, int, void *), void *cb_arg)
+    void (*callback)(int, int, void *), void *cb_arg)
 {
     int i;
     BN_GENCB *cb = BN_GENCB_new();
@@ -54,7 +54,7 @@ RSA *RSA_generate_key(int bits, unsigned long e_value,
         BN_GENCB_free(cb);
         return rsa;
     }
- err:
+err:
     BN_free(e);
     RSA_free(rsa);
     BN_GENCB_free(cb);
diff --git a/crypto/rsa/rsa_err.c b/crypto/rsa/rsa_err.c
index 269971c07b8da..8f20f68efed83 100644
--- a/crypto/rsa/rsa_err.c
+++ b/crypto/rsa/rsa_err.c
@@ -15,143 +15,143 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA RSA_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_ALGORITHM_MISMATCH), "algorithm mismatch"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_E_VALUE), "bad e value"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_FIXED_HEADER_DECRYPT),
-    "bad fixed header decrypt"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_PAD_BYTE_COUNT), "bad pad byte count"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_SIGNATURE), "bad signature"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BLOCK_TYPE_IS_NOT_01),
-    "block type is not 01"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BLOCK_TYPE_IS_NOT_02),
-    "block type is not 02"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_GREATER_THAN_MOD_LEN),
-    "data greater than mod len"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_LARGE), "data too large"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE),
-    "data too large for key size"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_LARGE_FOR_MODULUS),
-    "data too large for modulus"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_SMALL), "data too small"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE),
-    "data too small for key size"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DIGEST_DOES_NOT_MATCH),
-    "digest does not match"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DIGEST_NOT_ALLOWED), "digest not allowed"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY),
-    "digest too big for rsa key"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DMP1_NOT_CONGRUENT_TO_D),
-    "dmp1 not congruent to d"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DMQ1_NOT_CONGRUENT_TO_D),
-    "dmq1 not congruent to d"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_D_E_NOT_CONGRUENT_TO_1),
-    "d e not congruent to 1"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_FIRST_OCTET_INVALID),
-    "first octet invalid"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE),
-    "illegal or unsupported padding mode"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_DIGEST), "invalid digest"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_DIGEST_LENGTH),
-    "invalid digest length"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_HEADER), "invalid header"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_KEYPAIR), "invalid keypair"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_KEY_LENGTH), "invalid key length"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_LABEL), "invalid label"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_LENGTH), "invalid length"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MESSAGE_LENGTH),
-    "invalid message length"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MGF1_MD), "invalid mgf1 md"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MODULUS), "invalid modulus"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MULTI_PRIME_KEY),
-    "invalid multi prime key"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_OAEP_PARAMETERS),
-    "invalid oaep parameters"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PADDING), "invalid padding"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PADDING_MODE),
-    "invalid padding mode"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PSS_PARAMETERS),
-    "invalid pss parameters"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PSS_SALTLEN),
-    "invalid pss saltlen"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_REQUEST), "invalid request"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_SALT_LENGTH),
-    "invalid salt length"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_STRENGTH), "invalid strength"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_TRAILER), "invalid trailer"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_X931_DIGEST),
-    "invalid x931 digest"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_IQMP_NOT_INVERSE_OF_Q),
-    "iqmp not inverse of q"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_KEY_PRIME_NUM_INVALID),
-    "key prime num invalid"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_KEY_SIZE_TOO_SMALL), "key size too small"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_LAST_OCTET_INVALID), "last octet invalid"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MGF1_DIGEST_NOT_ALLOWED),
-    "mgf1 digest not allowed"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MISSING_PRIVATE_KEY),
-    "missing private key"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MODULUS_TOO_LARGE), "modulus too large"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MP_COEFFICIENT_NOT_INVERSE_OF_R),
-    "mp coefficient not inverse of r"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MP_EXPONENT_NOT_CONGRUENT_TO_D),
-    "mp exponent not congruent to d"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MP_R_NOT_PRIME), "mp r not prime"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_NO_PUBLIC_EXPONENT), "no public exponent"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_NULL_BEFORE_BLOCK_MISSING),
-    "null before block missing"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_N_DOES_NOT_EQUAL_PRODUCT_OF_PRIMES),
-    "n does not equal product of primes"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_N_DOES_NOT_EQUAL_P_Q),
-    "n does not equal p q"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_OAEP_DECODING_ERROR),
-    "oaep decoding error"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),
-    "operation not supported for this keytype"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PADDING_CHECK_FAILED),
-    "padding check failed"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PAIRWISE_TEST_FAILURE),
-    "pairwise test failure"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PKCS_DECODING_ERROR),
-    "pkcs decoding error"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PSS_SALTLEN_TOO_SMALL),
-    "pss saltlen too small"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PUB_EXPONENT_OUT_OF_RANGE),
-    "pub exponent out of range"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_P_NOT_PRIME), "p not prime"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_Q_NOT_PRIME), "q not prime"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_RANDOMNESS_SOURCE_STRENGTH_INSUFFICIENT),
-    "randomness source strength insufficient"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED),
-    "rsa operations not supported"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SLEN_CHECK_FAILED),
-    "salt length check failed"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SLEN_RECOVERY_FAILED),
-    "salt length recovery failed"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SSLV3_ROLLBACK_ATTACK),
-    "sslv3 rollback attack"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD),
-    "the asn1 object identifier is not known for this md"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_ALGORITHM_TYPE),
-    "unknown algorithm type"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_DIGEST), "unknown digest"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_MASK_DIGEST),
-    "unknown mask digest"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_PADDING_TYPE),
-    "unknown padding type"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_ENCRYPTION_TYPE),
-    "unsupported encryption type"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_LABEL_SOURCE),
-    "unsupported label source"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_MASK_ALGORITHM),
-    "unsupported mask algorithm"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_MASK_PARAMETER),
-    "unsupported mask parameter"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_SIGNATURE_TYPE),
-    "unsupported signature type"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_VALUE_MISSING), "value missing"},
-    {ERR_PACK(ERR_LIB_RSA, 0, RSA_R_WRONG_SIGNATURE_LENGTH),
-    "wrong signature length"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_ALGORITHM_MISMATCH), "algorithm mismatch" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_E_VALUE), "bad e value" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_FIXED_HEADER_DECRYPT),
+        "bad fixed header decrypt" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_PAD_BYTE_COUNT), "bad pad byte count" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BAD_SIGNATURE), "bad signature" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BLOCK_TYPE_IS_NOT_01),
+        "block type is not 01" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_BLOCK_TYPE_IS_NOT_02),
+        "block type is not 02" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_GREATER_THAN_MOD_LEN),
+        "data greater than mod len" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_LARGE), "data too large" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE),
+        "data too large for key size" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_LARGE_FOR_MODULUS),
+        "data too large for modulus" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_SMALL), "data too small" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE),
+        "data too small for key size" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DIGEST_DOES_NOT_MATCH),
+        "digest does not match" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DIGEST_NOT_ALLOWED), "digest not allowed" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY),
+        "digest too big for rsa key" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DMP1_NOT_CONGRUENT_TO_D),
+        "dmp1 not congruent to d" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_DMQ1_NOT_CONGRUENT_TO_D),
+        "dmq1 not congruent to d" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_D_E_NOT_CONGRUENT_TO_1),
+        "d e not congruent to 1" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_FIRST_OCTET_INVALID),
+        "first octet invalid" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE),
+        "illegal or unsupported padding mode" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_DIGEST), "invalid digest" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_DIGEST_LENGTH),
+        "invalid digest length" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_HEADER), "invalid header" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_KEYPAIR), "invalid keypair" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_KEY_LENGTH), "invalid key length" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_LABEL), "invalid label" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_LENGTH), "invalid length" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MESSAGE_LENGTH),
+        "invalid message length" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MGF1_MD), "invalid mgf1 md" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MODULUS), "invalid modulus" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_MULTI_PRIME_KEY),
+        "invalid multi prime key" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_OAEP_PARAMETERS),
+        "invalid oaep parameters" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PADDING), "invalid padding" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PADDING_MODE),
+        "invalid padding mode" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PSS_PARAMETERS),
+        "invalid pss parameters" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_PSS_SALTLEN),
+        "invalid pss saltlen" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_REQUEST), "invalid request" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_SALT_LENGTH),
+        "invalid salt length" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_STRENGTH), "invalid strength" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_TRAILER), "invalid trailer" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_INVALID_X931_DIGEST),
+        "invalid x931 digest" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_IQMP_NOT_INVERSE_OF_Q),
+        "iqmp not inverse of q" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_KEY_PRIME_NUM_INVALID),
+        "key prime num invalid" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_KEY_SIZE_TOO_SMALL), "key size too small" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_LAST_OCTET_INVALID), "last octet invalid" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MGF1_DIGEST_NOT_ALLOWED),
+        "mgf1 digest not allowed" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MISSING_PRIVATE_KEY),
+        "missing private key" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MODULUS_TOO_LARGE), "modulus too large" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MP_COEFFICIENT_NOT_INVERSE_OF_R),
+        "mp coefficient not inverse of r" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MP_EXPONENT_NOT_CONGRUENT_TO_D),
+        "mp exponent not congruent to d" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_MP_R_NOT_PRIME), "mp r not prime" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_NO_PUBLIC_EXPONENT), "no public exponent" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_NULL_BEFORE_BLOCK_MISSING),
+        "null before block missing" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_N_DOES_NOT_EQUAL_PRODUCT_OF_PRIMES),
+        "n does not equal product of primes" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_N_DOES_NOT_EQUAL_P_Q),
+        "n does not equal p q" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_OAEP_DECODING_ERROR),
+        "oaep decoding error" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),
+        "operation not supported for this keytype" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PADDING_CHECK_FAILED),
+        "padding check failed" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PAIRWISE_TEST_FAILURE),
+        "pairwise test failure" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PKCS_DECODING_ERROR),
+        "pkcs decoding error" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PSS_SALTLEN_TOO_SMALL),
+        "pss saltlen too small" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_PUB_EXPONENT_OUT_OF_RANGE),
+        "pub exponent out of range" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_P_NOT_PRIME), "p not prime" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_Q_NOT_PRIME), "q not prime" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_RANDOMNESS_SOURCE_STRENGTH_INSUFFICIENT),
+        "randomness source strength insufficient" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_RSA_OPERATIONS_NOT_SUPPORTED),
+        "rsa operations not supported" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SLEN_CHECK_FAILED),
+        "salt length check failed" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SLEN_RECOVERY_FAILED),
+        "salt length recovery failed" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_SSLV3_ROLLBACK_ATTACK),
+        "sslv3 rollback attack" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD),
+        "the asn1 object identifier is not known for this md" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_ALGORITHM_TYPE),
+        "unknown algorithm type" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_DIGEST), "unknown digest" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_MASK_DIGEST),
+        "unknown mask digest" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNKNOWN_PADDING_TYPE),
+        "unknown padding type" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_ENCRYPTION_TYPE),
+        "unsupported encryption type" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_LABEL_SOURCE),
+        "unsupported label source" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_MASK_ALGORITHM),
+        "unsupported mask algorithm" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_MASK_PARAMETER),
+        "unsupported mask parameter" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_UNSUPPORTED_SIGNATURE_TYPE),
+        "unsupported signature type" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_VALUE_MISSING), "value missing" },
+    { ERR_PACK(ERR_LIB_RSA, 0, RSA_R_WRONG_SIGNATURE_LENGTH),
+        "wrong signature length" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
index f76bb7748369f..554f9d349b857 100644
--- a/crypto/rsa/rsa_gen.c
+++ b/crypto/rsa/rsa_gen.c
@@ -29,7 +29,7 @@
 
 static int rsa_keygen_pairwise_test(RSA *rsa, OSSL_CALLBACK *cb, void *cbarg);
 static int rsa_keygen(OSSL_LIB_CTX *libctx, RSA *rsa, int bits, int primes,
-                      BIGNUM *e_value, BN_GENCB *cb, int pairwise_test);
+    BIGNUM *e_value, BN_GENCB *cb, int pairwise_test);
 
 /*
  * NB: this wrapper would normally be placed in rsa_lib.c and the static
@@ -44,17 +44,17 @@ int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb)
         return rsa->meth->rsa_keygen(rsa, bits, e_value, cb);
 
     return RSA_generate_multi_prime_key(rsa, bits, RSA_DEFAULT_PRIME_NUM,
-                                        e_value, cb);
+        e_value, cb);
 }
 
 int RSA_generate_multi_prime_key(RSA *rsa, int bits, int primes,
-                                 BIGNUM *e_value, BN_GENCB *cb)
+    BIGNUM *e_value, BN_GENCB *cb)
 {
 #ifndef FIPS_MODULE
     /* multi-prime is only supported with the builtin key generation */
     if (rsa->meth->rsa_multi_prime_keygen != NULL) {
         return rsa->meth->rsa_multi_prime_keygen(rsa, bits, primes,
-                                                 e_value, cb);
+            e_value, cb);
     } else if (rsa->meth->rsa_keygen != NULL) {
         /*
          * However, if rsa->meth implements only rsa_keygen, then we
@@ -80,10 +80,10 @@ DEFINE_STACK_OF(BIGNUM)
  */
 #ifndef FIPS_MODULE
 int ossl_rsa_multiprime_derive(RSA *rsa, int bits, int primes,
-                               BIGNUM *e_value,
-                               STACK_OF(BIGNUM) *factors,
-                               STACK_OF(BIGNUM) *exps,
-                               STACK_OF(BIGNUM) *coeffs)
+    BIGNUM *e_value,
+    STACK_OF(BIGNUM) *factors,
+    STACK_OF(BIGNUM) *exps,
+    STACK_OF(BIGNUM) *coeffs)
 {
     STACK_OF(BIGNUM) *pplist = NULL, *pdlist = NULL;
     BIGNUM *factor = NULL, *newpp = NULL, *newpd = NULL;
@@ -225,7 +225,8 @@ int ossl_rsa_multiprime_derive(RSA *rsa, int bits, int primes,
         goto err;
 
     if (BN_mod_inverse(iqmp, sk_BIGNUM_value(factors, 1),
-                       sk_BIGNUM_value(factors, 0), ctx) == NULL)
+            sk_BIGNUM_value(factors, 0), ctx)
+        == NULL)
         goto err;
     if (!sk_BIGNUM_insert(coeffs, iqmp, sk_BIGNUM_num(coeffs)))
         goto err;
@@ -237,7 +238,8 @@ int ossl_rsa_multiprime_derive(RSA *rsa, int bits, int primes,
         if (newcoeff == NULL)
             goto err;
         if (BN_mod_inverse(newcoeff, newpp, sk_BIGNUM_value(factors, i),
-                           ctx) == NULL)
+                ctx)
+            == NULL)
             goto err;
         if (!sk_BIGNUM_insert(coeffs, newcoeff, sk_BIGNUM_num(coeffs)))
             goto err;
@@ -245,7 +247,7 @@ int ossl_rsa_multiprime_derive(RSA *rsa, int bits, int primes,
     }
 
     ret = 1;
- err:
+err:
     BN_free(newcoeff);
     BN_free(newexp);
     BN_free(dval);
@@ -261,7 +263,7 @@ int ossl_rsa_multiprime_derive(RSA *rsa, int bits, int primes,
 }
 
 static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
-                                 BIGNUM *e_value, BN_GENCB *cb)
+    BIGNUM *e_value, BN_GENCB *cb)
 {
     BIGNUM *r0 = NULL, *r1 = NULL, *r2 = NULL, *tmp, *tmp2, *prime;
     int n = 0, bitsr[RSA_MAX_PRIME_NUM], bitse = 0;
@@ -350,7 +352,7 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
         if (rsa->prime_infos != NULL) {
             /* could this happen? */
             sk_RSA_PRIME_INFO_pop_free(rsa->prime_infos,
-                                       ossl_rsa_multip_info_free);
+                ossl_rsa_multip_info_free);
         }
         rsa->prime_infos = prime_infos;
 
@@ -382,9 +384,9 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
         BN_set_flags(prime, BN_FLG_CONSTTIME);
 
         for (;;) {
- redo:
+        redo:
             if (!BN_generate_prime_ex2(prime, bitsr[i] + adj, 0, NULL, NULL,
-                                       cb, ctx))
+                    cb, ctx))
                 goto err;
             /*
              * prime should not be equal to p, q, r_3...
@@ -402,7 +404,8 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
                         prev_prime = rsa->q;
                     else
                         prev_prime = sk_RSA_PRIME_INFO_value(prime_infos,
-                                                             j - 2)->r;
+                            j - 2)
+                                         ->r;
 
                     if (!BN_cmp(prime, prev_prime)) {
                         goto redo;
@@ -551,15 +554,14 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
             goto err;
     }
 
-
     BN_set_flags(r0, BN_FLG_CONSTTIME);
     if (BN_mod_inverse(rsa->d, rsa->e, r0, ctx) == NULL) {
-        goto err;               /* d */
+        goto err; /* d */
     }
 
     /* derive any missing exponents and coefficients */
     if (!ossl_rsa_multiprime_derive(rsa, bits, primes, e_value,
-                                    factors, exps, coeffs))
+            factors, exps, coeffs))
         goto err;
 
     /*
@@ -567,7 +569,7 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
      * and the first coeff is in iqmp, so pop those off the stack
      * Note, the first 2 factors/exponents are already tracked by p and q
      * assign dmp1/dmq1 and iqmp
-     * the remaining pinfo values are separately allocated, so copy and delete 
+     * the remaining pinfo values are separately allocated, so copy and delete
      * those
      */
     BN_clear_free(sk_BIGNUM_delete(factors, 0));
@@ -592,7 +594,7 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
             goto err;
     }
     ok = 1;
- err:
+err:
     sk_BIGNUM_free(factors);
     sk_BIGNUM_free(exps);
     sk_BIGNUM_free(coeffs);
@@ -607,7 +609,7 @@ static int rsa_multiprime_keygen(RSA *rsa, int bits, int primes,
 #endif /* FIPS_MODULE */
 
 static int rsa_keygen(OSSL_LIB_CTX *libctx, RSA *rsa, int bits, int primes,
-                      BIGNUM *e_value, BN_GENCB *cb, int pairwise_test)
+    BIGNUM *e_value, BN_GENCB *cb, int pairwise_test)
 {
     int ok = 0;
 
@@ -620,8 +622,8 @@ static int rsa_keygen(OSSL_LIB_CTX *libctx, RSA *rsa, int bits, int primes,
      * public exponent <= 2^16 will use the older rsa_multiprime_keygen().
      */
     if (primes == 2
-            && bits >= 2048
-            && (e_value == NULL || BN_num_bits(e_value) > 16))
+        && bits >= 2048
+        && (e_value == NULL || BN_num_bits(e_value) > 16))
         ok = ossl_rsa_sp800_56b_generate_key(rsa, bits, e_value, cb);
     else
         ok = rsa_multiprime_keygen(rsa, bits, primes, e_value, cb);
@@ -682,12 +684,12 @@ static int rsa_keygen(OSSL_LIB_CTX *libctx, RSA *rsa, int bits, int primes,
 static int rsa_keygen_pairwise_test(RSA *rsa, OSSL_CALLBACK *cb, void *cbarg)
 {
     int ret = 0;
-    unsigned int plaintxt_len;
     unsigned char *plaintxt = NULL;
-    unsigned int ciphertxt_len;
     unsigned char *ciphertxt = NULL;
     unsigned char *decoded = NULL;
-    unsigned int decoded_len;
+    int plaintxt_len;
+    int ciphertxt_len;
+    int decoded_len;
     int padding = RSA_NO_PADDING;
     OSSL_SELF_TEST *st = NULL;
 
@@ -695,7 +697,7 @@ static int rsa_keygen_pairwise_test(RSA *rsa, OSSL_CALLBACK *cb, void *cbarg)
     if (st == NULL)
         goto err;
     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
-                           OSSL_SELF_TEST_DESC_PCT_RSA);
+        OSSL_SELF_TEST_DESC_PCT_RSA);
 
     /*
      * For RSA_NO_PADDING, RSA_public_encrypt() and RSA_private_decrypt()
@@ -714,16 +716,16 @@ static int rsa_keygen_pairwise_test(RSA *rsa, OSSL_CALLBACK *cb, void *cbarg)
     plaintxt[plaintxt_len - 1] = 2;
 
     ciphertxt_len = RSA_public_encrypt(plaintxt_len, plaintxt, ciphertxt, rsa,
-                                       padding);
+        padding);
     if (ciphertxt_len <= 0)
         goto err;
 
     OSSL_SELF_TEST_oncorrupt_byte(st, ciphertxt);
 
     decoded_len = RSA_private_decrypt(ciphertxt_len, ciphertxt, decoded, rsa,
-                                      padding);
+        padding);
     if (decoded_len != plaintxt_len
-        || memcmp(decoded, plaintxt,  decoded_len) != 0)
+        || memcmp(decoded, plaintxt, decoded_len) != 0)
         goto err;
 
     ret = 1;
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index d9ceb80880056..746767cbd206b 100644
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -16,7 +16,7 @@
 #include <openssl/crypto.h>
 #include <openssl/core_names.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include <openssl/evp.h>
 #include <openssl/param_build.h>
@@ -128,7 +128,7 @@ static RSA *rsa_new_intern(ENGINE *engine, OSSL_LIB_CTX *libctx)
 
     return ret;
 
- err:
+err:
     RSA_free(ret);
     return NULL;
 }
@@ -232,10 +232,10 @@ static const unsigned int scale = 1 << 18;
 static const unsigned int cbrt_scale = 1 << (2 * 18 / 3);
 
 /* Define some constants, none exceed 32 bits */
-static const unsigned int log_2  = 0x02c5c8;    /* scale * log(2) */
-static const unsigned int log_e  = 0x05c551;    /* scale * log2(M_E) */
-static const unsigned int c1_923 = 0x07b126;    /* scale * 1.923 */
-static const unsigned int c4_690 = 0x12c28f;    /* scale * 4.690 */
+static const unsigned int log_2 = 0x02c5c8; /* scale * log(2) */
+static const unsigned int log_e = 0x05c551; /* scale * log2(M_E) */
+static const unsigned int c1_923 = 0x07b126; /* scale * 1.923 */
+static const unsigned int c4_690 = 0x12c28f; /* scale * 4.690 */
 
 /*
  * Multiply two scaled integers together and rescale the result.
@@ -331,19 +331,19 @@ uint16_t ossl_ifc_ffc_compute_security_bits(int n)
      * the standards but are defined to be canonical.
      */
     switch (n) {
-    case 2048:      /* SP 800-56B rev 2 Appendix D and FIPS 140-2 IG 7.5 */
+    case 2048: /* SP 800-56B rev 2 Appendix D and FIPS 140-2 IG 7.5 */
         return 112;
-    case 3072:      /* SP 800-56B rev 2 Appendix D and FIPS 140-2 IG 7.5 */
+    case 3072: /* SP 800-56B rev 2 Appendix D and FIPS 140-2 IG 7.5 */
         return 128;
-    case 4096:      /* SP 800-56B rev 2 Appendix D */
+    case 4096: /* SP 800-56B rev 2 Appendix D */
         return 152;
-    case 6144:      /* SP 800-56B rev 2 Appendix D */
+    case 6144: /* SP 800-56B rev 2 Appendix D */
         return 176;
-    case 7680:      /* FIPS 140-2 IG 7.5 */
+    case 7680: /* FIPS 140-2 IG 7.5 */
         return 192;
-    case 8192:      /* SP 800-56B rev 2 Appendix D */
+    case 8192: /* SP 800-56B rev 2 Appendix D */
         return 200;
-    case 15360:     /* FIPS 140-2 IG 7.5 */
+    case 15360: /* FIPS 140-2 IG 7.5 */
         return 256;
     }
 
@@ -373,15 +373,13 @@ uint16_t ossl_ifc_ffc_compute_security_bits(int n)
     x = n * (uint64_t)log_2;
     lx = ilog_e(x);
     y = (uint16_t)((mul2(c1_923, icbrt64(mul2(mul2(x, lx), lx))) - c4_690)
-                   / log_2);
+        / log_2);
     y = (y + 4) & ~7;
     if (y > cap)
         y = cap;
     return y;
 }
 
-
-
 int RSA_security_bits(const RSA *rsa)
 {
     int bits = BN_num_bits(rsa->n);
@@ -486,7 +484,7 @@ int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp)
  * and related functions to let user pass a triplet?
  */
 int RSA_set0_multi_prime_params(RSA *r, BIGNUM *primes[], BIGNUM *exps[],
-                                BIGNUM *coeffs[], int pnum)
+    BIGNUM *coeffs[], int pnum)
 {
     STACK_OF(RSA_PRIME_INFO) *prime_infos, *old = NULL;
     RSA_PRIME_INFO *pinfo;
@@ -544,7 +542,7 @@ int RSA_set0_multi_prime_params(RSA *r, BIGNUM *primes[], BIGNUM *exps[],
     r->dirty_cnt++;
 
     return 1;
- err:
+err:
     /* r, d, t should not be freed */
     sk_RSA_PRIME_INFO_pop_free(prime_infos, ossl_rsa_multip_info_free_ex);
     return 0;
@@ -552,7 +550,7 @@ int RSA_set0_multi_prime_params(RSA *r, BIGNUM *primes[], BIGNUM *exps[],
 #endif
 
 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)
 {
     if (n != NULL)
         *n = r->n;
@@ -603,8 +601,8 @@ int RSA_get0_multi_prime_factors(const RSA *r, const BIGNUM *primes[])
 #endif
 
 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)
 {
     if (dmp1 != NULL)
         *dmp1 = r->dmp1;
@@ -616,7 +614,7 @@ void RSA_get0_crt_params(const RSA *r,
 
 #ifndef FIPS_MODULE
 int RSA_get0_multi_prime_crt_params(const RSA *r, const BIGNUM *exps[],
-                                    const BIGNUM *coeffs[])
+    const BIGNUM *coeffs[])
 {
     int pnum;
 
@@ -743,7 +741,7 @@ int RSA_pkey_ctx_ctrl(EVP_PKEY_CTX *ctx, int optype, int cmd, int p1, void *p2)
         && ctx->pmeth->pkey_id != EVP_PKEY_RSA
         && ctx->pmeth->pkey_id != EVP_PKEY_RSA_PSS)
         return -1;
-     return EVP_PKEY_CTX_ctrl(ctx, -1, optype, cmd, p1, p2);
+    return EVP_PKEY_CTX_ctrl(ctx, -1, optype, cmd, p1, p2);
 }
 #endif
 
@@ -754,8 +752,8 @@ DEFINE_STACK_OF(BIGNUM)
  * stack values as they are consumed and set in the RSA key.
  */
 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)
 {
 #ifndef FIPS_MODULE
     STACK_OF(RSA_PRIME_INFO) *prime_infos, *old_infos = NULL;
@@ -772,7 +770,7 @@ int ossl_rsa_set0_all_params(RSA *r, STACK_OF(BIGNUM) *primes,
         return 0;
 
     if (!RSA_set0_factors(r, sk_BIGNUM_value(primes, 0),
-                          sk_BIGNUM_value(primes, 1)))
+            sk_BIGNUM_value(primes, 1)))
         return 0;
 
     /*
@@ -790,9 +788,9 @@ int ossl_rsa_set0_all_params(RSA *r, STACK_OF(BIGNUM) *primes,
         && pnum == sk_BIGNUM_num(coeffs) + 1) {
 
         if (!RSA_set0_crt_params(r, sk_BIGNUM_value(exps, 0),
-                                 sk_BIGNUM_value(exps, 1),
-                                 sk_BIGNUM_value(coeffs, 0)))
-        return 0;
+                sk_BIGNUM_value(exps, 1),
+                sk_BIGNUM_value(coeffs, 0)))
+            return 0;
 
         /* as above, once we consume the above params, delete them from the list */
         sk_BIGNUM_delete(exps, 0);
@@ -862,7 +860,7 @@ int ossl_rsa_set0_all_params(RSA *r, STACK_OF(BIGNUM) *primes,
 
     return 1;
 #ifndef FIPS_MODULE
- err:
+err:
     /* r, d, t should not be freed */
     sk_RSA_PRIME_INFO_pop_free(prime_infos, ossl_rsa_multip_info_free_ex);
     return 0;
@@ -872,8 +870,8 @@ int ossl_rsa_set0_all_params(RSA *r, STACK_OF(BIGNUM) *primes,
 DEFINE_SPECIAL_STACK_OF_CONST(BIGNUM_const, BIGNUM)
 
 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)
 {
 #ifndef FIPS_MODULE
     RSA_PRIME_INFO *pinfo;
@@ -906,7 +904,7 @@ int ossl_rsa_get0_all_params(RSA *r, STACK_OF(BIGNUM_const) *primes,
     return 1;
 }
 
-#define safe_BN_num_bits(_k_)  (((_k_) == NULL) ? 0 : BN_num_bits((_k_)))
+#define safe_BN_num_bits(_k_) (((_k_) == NULL) ? 0 : BN_num_bits((_k_)))
 int ossl_rsa_check_factors(RSA *r)
 {
     int valid = 0;
@@ -959,11 +957,11 @@ int ossl_rsa_check_factors(RSA *r)
 #ifndef FIPS_MODULE
 /* Helpers to set or get diverse hash algorithm names */
 static int int_set_rsa_md_name(EVP_PKEY_CTX *ctx,
-                               /* For checks */
-                               int keytype, int optype,
-                               /* For EVP_PKEY_CTX_set_params() */
-                               const char *mdkey, const char *mdname,
-                               const char *propkey, const char *mdprops)
+    /* For checks */
+    int keytype, int optype,
+    /* For EVP_PKEY_CTX_set_params() */
+    const char *mdkey, const char *mdname,
+    const char *propkey, const char *mdprops)
 {
     OSSL_PARAM params[3], *p = params;
 
@@ -999,11 +997,11 @@ static int int_set_rsa_md_name(EVP_PKEY_CTX *ctx,
 
 /* Helpers to set or get diverse hash algorithm names */
 static int int_get_rsa_md_name(EVP_PKEY_CTX *ctx,
-                               /* For checks */
-                               int keytype, int optype,
-                               /* For EVP_PKEY_CTX_get_params() */
-                               const char *mdkey,
-                               char *mdname, size_t mdnamesize)
+    /* For checks */
+    int keytype, int optype,
+    /* For EVP_PKEY_CTX_get_params() */
+    const char *mdkey,
+    char *mdname, size_t mdnamesize)
 {
     OSSL_PARAM params[2], *p = params;
 
@@ -1040,7 +1038,7 @@ static int int_get_rsa_md_name(EVP_PKEY_CTX *ctx,
 int EVP_PKEY_CTX_set_rsa_padding(EVP_PKEY_CTX *ctx, int pad_mode)
 {
     return RSA_pkey_ctx_ctrl(ctx, -1, EVP_PKEY_CTRL_RSA_PADDING,
-                             pad_mode, NULL);
+        pad_mode, NULL);
 }
 
 /*
@@ -1050,7 +1048,7 @@ 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)
 {
     return RSA_pkey_ctx_ctrl(ctx, -1, EVP_PKEY_CTRL_GET_RSA_PADDING,
-                             0, pad_mode);
+        0, pad_mode);
 }
 
 /*
@@ -1060,16 +1058,16 @@ int EVP_PKEY_CTX_get_rsa_padding(EVP_PKEY_CTX *ctx, int *pad_mode)
 int EVP_PKEY_CTX_set_rsa_pss_keygen_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
-                             EVP_PKEY_CTRL_MD, 0, (void *)(md));
+        EVP_PKEY_CTRL_MD, 0, (void *)(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)
 {
     return int_set_rsa_md_name(ctx, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
-                               OSSL_PKEY_PARAM_RSA_DIGEST, mdname,
-                               OSSL_PKEY_PARAM_RSA_DIGEST_PROPS, mdprops);
+        OSSL_PKEY_PARAM_RSA_DIGEST, mdname,
+        OSSL_PKEY_PARAM_RSA_DIGEST_PROPS, mdprops);
 }
 
 /*
@@ -1083,24 +1081,23 @@ int EVP_PKEY_CTX_set_rsa_oaep_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
         return -1;
 
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,
-                             EVP_PKEY_CTRL_RSA_OAEP_MD, 0, (void *)(md));
+        EVP_PKEY_CTRL_RSA_OAEP_MD, 0, (void *)(md));
 }
 
 int EVP_PKEY_CTX_set_rsa_oaep_md_name(EVP_PKEY_CTX *ctx, const char *mdname,
-                                      const char *mdprops)
+    const char *mdprops)
 {
-    return
-        int_set_rsa_md_name(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,
-                            OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST, mdname,
-                            OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST_PROPS, mdprops);
+    return int_set_rsa_md_name(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,
+        OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST, mdname,
+        OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST_PROPS, mdprops);
 }
 
 int EVP_PKEY_CTX_get_rsa_oaep_md_name(EVP_PKEY_CTX *ctx, char *name,
-                                      size_t namesize)
+    size_t namesize)
 {
     return int_get_rsa_md_name(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,
-                               OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST,
-                               name, namesize);
+        OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST,
+        name, namesize);
 }
 
 /*
@@ -1114,7 +1111,7 @@ int EVP_PKEY_CTX_get_rsa_oaep_md(EVP_PKEY_CTX *ctx, const EVP_MD **md)
         return -1;
 
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_CRYPT,
-                             EVP_PKEY_CTRL_GET_RSA_OAEP_MD, 0, (void *)md);
+        EVP_PKEY_CTRL_GET_RSA_OAEP_MD, 0, (void *)md);
 }
 
 /*
@@ -1124,24 +1121,24 @@ int EVP_PKEY_CTX_get_rsa_oaep_md(EVP_PKEY_CTX *ctx, const EVP_MD **md)
 int EVP_PKEY_CTX_set_rsa_mgf1_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
 {
     return RSA_pkey_ctx_ctrl(ctx, EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
-                             EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)(md));
+        EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)(md));
 }
 
 int EVP_PKEY_CTX_set_rsa_mgf1_md_name(EVP_PKEY_CTX *ctx, const char *mdname,
-                                      const char *mdprops)
+    const char *mdprops)
 {
     return int_set_rsa_md_name(ctx, -1,
-                               EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
-                               OSSL_PKEY_PARAM_MGF1_DIGEST, mdname,
-                               OSSL_PKEY_PARAM_MGF1_PROPERTIES, mdprops);
+        EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
+        OSSL_PKEY_PARAM_MGF1_DIGEST, mdname,
+        OSSL_PKEY_PARAM_MGF1_PROPERTIES, mdprops);
 }
 
 int EVP_PKEY_CTX_get_rsa_mgf1_md_name(EVP_PKEY_CTX *ctx, char *name,
-                                      size_t namesize)
+    size_t namesize)
 {
     return int_get_rsa_md_name(ctx, -1,
-                               EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
-                               OSSL_PKEY_PARAM_MGF1_DIGEST, name, namesize);
+        EVP_PKEY_OP_TYPE_CRYPT | EVP_PKEY_OP_TYPE_SIG,
+        OSSL_PKEY_PARAM_MGF1_DIGEST, name, namesize);
 }
 
 /*
@@ -1151,15 +1148,15 @@ int EVP_PKEY_CTX_get_rsa_mgf1_md_name(EVP_PKEY_CTX *ctx, char *name,
 int EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
 {
     return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
-                             EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)(md));
+        EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)(md));
 }
 
 int EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md_name(EVP_PKEY_CTX *ctx,
-                                                 const char *mdname)
+    const char *mdname)
 {
     return int_set_rsa_md_name(ctx, EVP_PKEY_RSA_PSS, EVP_PKEY_OP_KEYGEN,
-                               OSSL_PKEY_PARAM_MGF1_DIGEST, mdname,
-                               NULL, NULL);
+        OSSL_PKEY_PARAM_MGF1_DIGEST, mdname,
+        NULL, NULL);
 }
 
 /*
@@ -1169,7 +1166,7 @@ int EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md_name(EVP_PKEY_CTX *ctx,
 int EVP_PKEY_CTX_get_rsa_mgf1_md(EVP_PKEY_CTX *ctx, const EVP_MD **md)
 {
     return RSA_pkey_ctx_ctrl(ctx, EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
-                             EVP_PKEY_CTRL_GET_RSA_MGF1_MD, 0, (void *)(md));
+        EVP_PKEY_CTRL_GET_RSA_MGF1_MD, 0, (void *)(md));
 }
 
 int EVP_PKEY_CTX_set0_rsa_oaep_label(EVP_PKEY_CTX *ctx, void *label, int llen)
@@ -1199,7 +1196,7 @@ int EVP_PKEY_CTX_set0_rsa_oaep_label(EVP_PKEY_CTX *ctx, void *label, int llen)
 
     /* Cast away the const. This is read only so should be safe */
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL,
-                                             (void *)plabel, (size_t)llen);
+        (void *)plabel, (size_t)llen);
     *p++ = OSSL_PARAM_construct_end();
 
     ret = evp_pkey_ctx_set_params_strict(ctx, rsa_params);
@@ -1227,7 +1224,7 @@ int EVP_PKEY_CTX_get0_rsa_oaep_label(EVP_PKEY_CTX *ctx, unsigned char **label)
         return -1;
 
     *p++ = OSSL_PARAM_construct_octet_ptr(OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL,
-                                          (void **)label, 0);
+        (void **)label, 0);
     *p++ = OSSL_PARAM_construct_end();
 
     if (!EVP_PKEY_CTX_get_params(ctx, rsa_params))
@@ -1257,7 +1254,7 @@ int EVP_PKEY_CTX_set_rsa_pss_saltlen(EVP_PKEY_CTX *ctx, int saltlen)
      * EVP_PKEY_OP_TYPE_SIG
      */
     return RSA_pkey_ctx_ctrl(ctx, EVP_PKEY_OP_TYPE_SIG,
-                             EVP_PKEY_CTRL_RSA_PSS_SALTLEN, saltlen, NULL);
+        EVP_PKEY_CTRL_RSA_PSS_SALTLEN, saltlen, NULL);
 }
 
 /*
@@ -1276,7 +1273,7 @@ int EVP_PKEY_CTX_get_rsa_pss_saltlen(EVP_PKEY_CTX *ctx, int *saltlen)
      * EVP_PKEY_OP_TYPE_SIG
      */
     return RSA_pkey_ctx_ctrl(ctx, EVP_PKEY_OP_TYPE_SIG,
-                             EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, 0, saltlen);
+        EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, 0, saltlen);
 }
 
 int EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen(EVP_PKEY_CTX *ctx, int saltlen)
@@ -1293,7 +1290,7 @@ int EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen(EVP_PKEY_CTX *ctx, int saltlen)
         return -1;
 
     *p++ = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_PSS_SALTLEN,
-                                    &saltlen);
+        &saltlen);
     *p++ = OSSL_PARAM_construct_end();
 
     return evp_pkey_ctx_set_params_strict(ctx, pad_params);
@@ -1324,7 +1321,7 @@ int EVP_PKEY_CTX_set_rsa_keygen_bits(EVP_PKEY_CTX *ctx, int bits)
 int EVP_PKEY_CTX_set_rsa_keygen_pubexp(EVP_PKEY_CTX *ctx, BIGNUM *pubexp)
 {
     int ret = RSA_pkey_ctx_ctrl(ctx, EVP_PKEY_OP_KEYGEN,
-                                EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp);
+        EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp);
 
     /*
      * Satisfy memory semantics for pre-3.0 callers of
@@ -1353,7 +1350,7 @@ int EVP_PKEY_CTX_set1_rsa_keygen_pubexp(EVP_PKEY_CTX *ctx, BIGNUM *pubexp)
             return 0;
     }
     ret = EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN,
-                            EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp);
+        EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp);
     if (evp_pkey_ctx_is_legacy(ctx) && ret <= 0)
         BN_free(pubexp);
     return ret;
diff --git a/crypto/rsa/rsa_local.h b/crypto/rsa/rsa_local.h
index db9eb2a1dfb2b..924d125ff51bb 100644
--- a/crypto/rsa/rsa_local.h
+++ b/crypto/rsa/rsa_local.h
@@ -13,7 +13,7 @@
 #include "internal/refcount.h"
 #include "crypto/rsa.h"
 
-#define RSA_MAX_PRIME_NUM       5
+#define RSA_MAX_PRIME_NUM 5
 
 typedef struct rsa_prime_info_st {
     BIGNUM *r;
@@ -102,23 +102,23 @@ struct rsa_st {
 
 struct rsa_meth_st {
     char *name;
-    int (*rsa_pub_enc) (int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding);
-    int (*rsa_pub_dec) (int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding);
-    int (*rsa_priv_enc) (int flen, const unsigned char *from,
-                         unsigned char *to, RSA *rsa, int padding);
-    int (*rsa_priv_dec) (int flen, const unsigned char *from,
-                         unsigned char *to, RSA *rsa, int padding);
+    int (*rsa_pub_enc)(int flen, const unsigned char *from,
+        unsigned char *to, RSA *rsa, int padding);
+    int (*rsa_pub_dec)(int flen, const unsigned char *from,
+        unsigned char *to, RSA *rsa, int padding);
+    int (*rsa_priv_enc)(int flen, const unsigned char *from,
+        unsigned char *to, RSA *rsa, int padding);
+    int (*rsa_priv_dec)(int flen, const unsigned char *from,
+        unsigned char *to, RSA *rsa, int padding);
     /* Can be null */
-    int (*rsa_mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
+    int (*rsa_mod_exp)(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
     /* Can be null */
-    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);
     /* called at new */
-    int (*init) (RSA *rsa);
+    int (*init)(RSA *rsa);
     /* called at free */
-    int (*finish) (RSA *rsa);
+    int (*finish)(RSA *rsa);
     /* RSA_METHOD_FLAG_* things */
     int flags;
     /* may be needed! */
@@ -129,36 +129,36 @@ struct rsa_meth_st {
      * this to work the RSA_public_decrypt() and RSA_private_encrypt() should
      * *NOT* be used. RSA_sign(), RSA_verify() should be used instead.
      */
-    int (*rsa_sign) (int type,
-                     const unsigned char *m, unsigned int m_length,
-                     unsigned char *sigret, unsigned int *siglen,
-                     const RSA *rsa);
-    int (*rsa_verify) (int dtype, const unsigned char *m,
-                       unsigned int m_length, const unsigned char *sigbuf,
-                       unsigned int siglen, const RSA *rsa);
+    int (*rsa_sign)(int type,
+        const unsigned char *m, unsigned int m_length,
+        unsigned char *sigret, unsigned int *siglen,
+        const RSA *rsa);
+    int (*rsa_verify)(int dtype, const unsigned char *m,
+        unsigned int m_length, const unsigned char *sigbuf,
+        unsigned int siglen, const RSA *rsa);
     /*
      * If this callback is NULL, the builtin software RSA key-gen will be
      * used. This is for behavioural compatibility whilst the code gets
      * rewired, but one day it would be nice to assume there are no such
      * things as "builtin software" implementations.
      */
-    int (*rsa_keygen) (RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
-    int (*rsa_multi_prime_keygen) (RSA *rsa, int bits, int primes,
-                                   BIGNUM *e, BN_GENCB *cb);
+    int (*rsa_keygen)(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
+    int (*rsa_multi_prime_keygen)(RSA *rsa, int bits, int primes,
+        BIGNUM *e, BN_GENCB *cb);
 };
 
 /* Macros to test if a pkey or ctx is for a PSS key */
 #define pkey_is_pss(pkey) (pkey->ameth->pkey_id == EVP_PKEY_RSA_PSS)
 #define pkey_ctx_is_pss(ctx) (ctx->pmeth->pkey_id == EVP_PKEY_RSA_PSS)
 int ossl_rsa_multiprime_derive(RSA *rsa, int bits, int primes,
-                                 BIGNUM *e_value,
-                                 STACK_OF(BIGNUM) *factors, STACK_OF(BIGNUM) *exps,
-                                 STACK_OF(BIGNUM) *coeffs);
+    BIGNUM *e_value,
+    STACK_OF(BIGNUM) *factors, STACK_OF(BIGNUM) *exps,
+    STACK_OF(BIGNUM) *coeffs);
 
 RSA_PSS_PARAMS *ossl_rsa_pss_params_create(const EVP_MD *sigmd,
-                                           const EVP_MD *mgf1md, int saltlen);
+    const EVP_MD *mgf1md, int saltlen);
 int ossl_rsa_pss_get_param(const RSA_PSS_PARAMS *pss, const EVP_MD **pmd,
-                           const EVP_MD **pmgf1md, int *psaltlen);
+    const EVP_MD **pmgf1md, int *psaltlen);
 /* internal function to clear and free multi-prime parameters */
 void ossl_rsa_multip_info_free_ex(RSA_PRIME_INFO *pinfo);
 void ossl_rsa_multip_info_free(RSA_PRIME_INFO *pinfo);
@@ -168,10 +168,10 @@ int ossl_rsa_multip_cap(int bits);
 
 int ossl_rsa_sp800_56b_validate_strength(int nbits, int strength);
 int ossl_rsa_check_pminusq_diff(BIGNUM *diff, const BIGNUM *p, const BIGNUM *q,
-                                int nbits);
+    int nbits);
 int ossl_rsa_get_lcm(BN_CTX *ctx, const BIGNUM *p, const BIGNUM *q,
-                     BIGNUM *lcm, BIGNUM *gcd, BIGNUM *p1, BIGNUM *q1,
-                     BIGNUM *p1q1);
+    BIGNUM *lcm, BIGNUM *gcd, BIGNUM *p1, BIGNUM *q1,
+    BIGNUM *p1q1);
 
 int ossl_rsa_check_public_exponent(const BIGNUM *e);
 int ossl_rsa_check_private_exponent(const RSA *rsa, int nbits, BN_CTX *ctx);
@@ -183,18 +183,18 @@ int ossl_rsa_sp800_56b_pairwise_test(RSA *rsa, BN_CTX *ctx);
 int ossl_rsa_sp800_56b_check_public(const RSA *rsa);
 int ossl_rsa_sp800_56b_check_private(const RSA *rsa);
 int ossl_rsa_sp800_56b_check_keypair(const RSA *rsa, const BIGNUM *efixed,
-                                     int strength, int nbits);
+    int strength, int nbits);
 int ossl_rsa_sp800_56b_generate_key(RSA *rsa, int nbits, const BIGNUM *efixed,
-                                    BN_GENCB *cb);
+    BN_GENCB *cb);
 
 int ossl_rsa_sp800_56b_derive_params_from_pq(RSA *rsa, int nbits,
-                                             const BIGNUM *e, BN_CTX *ctx);
+    const BIGNUM *e, BN_CTX *ctx);
 int ossl_rsa_fips186_4_gen_prob_primes(RSA *rsa, RSA_ACVP_TEST *test,
-                                       int nbits, const BIGNUM *e, BN_CTX *ctx,
-                                       BN_GENCB *cb);
+    int nbits, const BIGNUM *e, BN_CTX *ctx,
+    BN_GENCB *cb);
 
 int ossl_rsa_padding_add_PKCS1_type_2_ex(OSSL_LIB_CTX *libctx, unsigned char *to,
-                                         int tlen, const unsigned char *from,
-                                         int flen);
+    int tlen, const unsigned char *from,
+    int flen);
 
 #endif /* OSSL_CRYPTO_RSA_LOCAL_H */
diff --git a/crypto/rsa/rsa_meth.c b/crypto/rsa/rsa_meth.c
index f04098bd08cc6..d3dc37fb71ed0 100644
--- a/crypto/rsa/rsa_meth.c
+++ b/crypto/rsa/rsa_meth.c
@@ -99,190 +99,180 @@ int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)
     return 1;
 }
 
-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)
 {
     return meth->rsa_pub_enc;
 }
 
 int RSA_meth_set_pub_enc(RSA_METHOD *meth,
-                         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))
 {
     meth->rsa_pub_enc = pub_enc;
     return 1;
 }
 
-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)
 {
     return meth->rsa_pub_dec;
 }
 
 int RSA_meth_set_pub_dec(RSA_METHOD *meth,
-                         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))
 {
     meth->rsa_pub_dec = pub_dec;
     return 1;
 }
 
-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)
 {
     return meth->rsa_priv_enc;
 }
 
 int RSA_meth_set_priv_enc(RSA_METHOD *meth,
-                          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))
 {
     meth->rsa_priv_enc = priv_enc;
     return 1;
 }
 
-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)
 {
     return meth->rsa_priv_dec;
 }
 
 int RSA_meth_set_priv_dec(RSA_METHOD *meth,
-                          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))
 {
     meth->rsa_priv_dec = priv_dec;
     return 1;
 }
 
-    /* Can be null */
-int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth))
-    (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx)
+/* Can be null */
+int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth))(BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx)
 {
     return meth->rsa_mod_exp;
 }
 
 int RSA_meth_set_mod_exp(RSA_METHOD *meth,
-                         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))
 {
     meth->rsa_mod_exp = mod_exp;
     return 1;
 }
 
-    /* Can be null */
-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)
+/* Can be null */
+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)
 {
     return meth->bn_mod_exp;
 }
 
 int RSA_meth_set_bn_mod_exp(RSA_METHOD *meth,
-                            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))
 {
     meth->bn_mod_exp = bn_mod_exp;
     return 1;
 }
 
-    /* called at new */
-int (*RSA_meth_get_init(const RSA_METHOD *meth)) (RSA *rsa)
+/* called at new */
+int (*RSA_meth_get_init(const RSA_METHOD *meth))(RSA *rsa)
 {
     return meth->init;
 }
 
-int RSA_meth_set_init(RSA_METHOD *meth, int (*init) (RSA *rsa))
+int RSA_meth_set_init(RSA_METHOD *meth, int (*init)(RSA *rsa))
 {
     meth->init = init;
     return 1;
 }
 
-    /* called at free */
-int (*RSA_meth_get_finish(const RSA_METHOD *meth)) (RSA *rsa)
+/* called at free */
+int (*RSA_meth_get_finish(const RSA_METHOD *meth))(RSA *rsa)
 {
     return meth->finish;
 }
 
-int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
+int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish)(RSA *rsa))
 {
     meth->finish = finish;
     return 1;
 }
 
-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)
 {
     return meth->rsa_sign;
 }
 
 int RSA_meth_set_sign(RSA_METHOD *meth,
-                      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))
 {
     meth->rsa_sign = sign;
     return 1;
 }
 
-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)
 {
     return meth->rsa_verify;
 }
 
 int RSA_meth_set_verify(RSA_METHOD *meth,
-                        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))
 {
     meth->rsa_verify = verify;
     return 1;
 }
 
-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)
 {
     return meth->rsa_keygen;
 }
 
 int RSA_meth_set_keygen(RSA_METHOD *meth,
-                        int (*keygen) (RSA *rsa, int bits, BIGNUM *e,
-                                       BN_GENCB *cb))
+    int (*keygen)(RSA *rsa, int bits, BIGNUM *e,
+        BN_GENCB *cb))
 {
     meth->rsa_keygen = keygen;
     return 1;
 }
 
-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)
 {
     return meth->rsa_multi_prime_keygen;
 }
 
 int RSA_meth_set_multi_prime_keygen(RSA_METHOD *meth,
-                                    int (*keygen) (RSA *rsa, int bits,
-                                                   int primes, BIGNUM *e,
-                                                   BN_GENCB *cb))
+    int (*keygen)(RSA *rsa, int bits,
+        int primes, BIGNUM *e,
+        BN_GENCB *cb))
 {
     meth->rsa_multi_prime_keygen = keygen;
     return 1;
diff --git a/crypto/rsa/rsa_mp.c b/crypto/rsa/rsa_mp.c
index 542daecc1f48a..d73af13528f4c 100644
--- a/crypto/rsa/rsa_mp.c
+++ b/crypto/rsa/rsa_mp.c
@@ -46,7 +46,7 @@ RSA_PRIME_INFO *ossl_rsa_multip_info_new(void)
 
     return pinfo;
 
- err:
+err:
     BN_free(pinfo->r);
     BN_free(pinfo->d);
     BN_free(pinfo->t);
@@ -90,7 +90,7 @@ int ossl_rsa_multip_calc_product(RSA *rsa)
     }
 
     rv = 1;
- err:
+err:
     BN_CTX_free(ctx);
     return rv;
 }
diff --git a/crypto/rsa/rsa_none.c b/crypto/rsa/rsa_none.c
index df93525fc5b8e..6a83bf3ea382f 100644
--- a/crypto/rsa/rsa_none.c
+++ b/crypto/rsa/rsa_none.c
@@ -18,7 +18,7 @@
 #include <openssl/rsa.h>
 
 int RSA_padding_add_none(unsigned char *to, int tlen,
-                         const unsigned char *from, int flen)
+    const unsigned char *from, int flen)
 {
     if (flen > tlen) {
         ERR_raise(ERR_LIB_RSA, RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
@@ -35,7 +35,7 @@ int RSA_padding_add_none(unsigned char *to, int tlen,
 }
 
 int RSA_padding_check_none(unsigned char *to, int tlen,
-                           const unsigned char *from, int flen, int num)
+    const unsigned char *from, int flen, int num)
 {
 
     if (flen > tlen) {
diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
index 5a1c080fcd14c..453205b56cf85 100644
--- a/crypto/rsa/rsa_oaep.c
+++ b/crypto/rsa/rsa_oaep.c
@@ -37,11 +37,11 @@
 #include "rsa_local.h"
 
 int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
-                               const unsigned char *from, int flen,
-                               const unsigned char *param, int plen)
+    const unsigned char *from, int flen,
+    const unsigned char *param, int plen)
 {
     return ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(NULL, to, tlen, from, flen,
-                                                   param, plen, NULL, NULL);
+        param, plen, NULL, NULL);
 }
 
 /*
@@ -52,11 +52,11 @@ int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
  * to avoid complicating an already difficult enough function.
  */
 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 rv = 0;
     int i, emlen = tlen - 1;
@@ -142,34 +142,34 @@ int ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(OSSL_LIB_CTX *libctx,
         seed[i] ^= seedmask[i];
     rv = 1;
 
- err:
+err:
     OPENSSL_cleanse(seedmask, sizeof(seedmask));
     OPENSSL_clear_free(dbmask, dbmask_len);
     return rv;
 }
 
 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)
 {
     return ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(NULL, to, tlen, from, flen,
-                                                   param, plen, md, mgf1md);
+        param, plen, md, mgf1md);
 }
 
 int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,
-                                 const unsigned char *from, int flen, int num,
-                                 const unsigned char *param, int plen)
+    const unsigned char *from, int flen, int num,
+    const unsigned char *param, int plen)
 {
     return RSA_padding_check_PKCS1_OAEP_mgf1(to, tlen, from, flen, num,
-                                             param, plen, NULL, NULL);
+        param, plen, NULL, NULL);
 }
 
 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)
 {
     int i, dblen = 0, mlen = -1, one_index = 0, msg_index;
     unsigned int good = 0, found_one_byte, mask;
@@ -179,7 +179,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
      * Y || maskedSeed || maskedDB
      */
     unsigned char *db = NULL, *em = NULL, seed[EVP_MAX_MD_SIZE],
-        phash[EVP_MAX_MD_SIZE];
+                  phash[EVP_MAX_MD_SIZE];
     int mdlen;
 
     if (md == NULL) {
@@ -278,7 +278,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
         unsigned int equals1 = constant_time_eq(db[i], 1);
         unsigned int equals0 = constant_time_is_zero(db[i]);
         one_index = constant_time_select_int(~found_one_byte & equals1,
-                                             i, one_index);
+            i, one_index);
         found_one_byte |= equals1;
         good &= (found_one_byte | equals0);
     }
@@ -309,7 +309,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
      * The loop below has overall complexity of O(N*log(N)).
      */
     tlen = constant_time_select_int(constant_time_lt(dblen - mdlen - 1, tlen),
-                                    dblen - mdlen - 1, tlen);
+        dblen - mdlen - 1, tlen);
     for (msg_index = 1; msg_index < dblen - mdlen - 1; msg_index <<= 1) {
         mask = ~constant_time_eq(msg_index & (dblen - mdlen - 1 - mlen), 0);
         for (i = mdlen + 1; i < dblen - msg_index; i++)
@@ -332,7 +332,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
     ERR_raise(ERR_LIB_RSA, RSA_R_OAEP_DECODING_ERROR);
     err_clear_last_constant_time(1 & good);
 #endif
- cleanup:
+cleanup:
     OPENSSL_cleanse(seed, sizeof(seed));
     OPENSSL_clear_free(db, dblen);
     OPENSSL_clear_free(em, num);
@@ -348,7 +348,7 @@ int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
  * The range checking steps inm the process are performed outside.
  */
 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)
 {
     long i, outlen = 0;
     unsigned char cnt[4];
@@ -386,7 +386,7 @@ int PKCS1_MGF1(unsigned char *mask, long len,
         }
     }
     rv = 0;
- err:
+err:
     OPENSSL_cleanse(md, sizeof(md));
     EVP_MD_CTX_free(c);
     return rv;
diff --git a/crypto/rsa/rsa_ossl.c b/crypto/rsa/rsa_ossl.c
index 0c0c73c65c67a..2fcf02a9ab05d 100644
--- a/crypto/rsa/rsa_ossl.c
+++ b/crypto/rsa/rsa_ossl.c
@@ -22,55 +22,55 @@
 #include <openssl/hmac.h>
 
 static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
-                                  unsigned char *to, RSA *rsa, int padding);
+    unsigned char *to, RSA *rsa, int padding);
 static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
-                                   unsigned char *to, RSA *rsa, int padding);
+    unsigned char *to, RSA *rsa, int padding);
 static int rsa_ossl_public_decrypt(int flen, const unsigned char *from,
-                                  unsigned char *to, RSA *rsa, int padding);
+    unsigned char *to, RSA *rsa, int padding);
 static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
-                                   unsigned char *to, RSA *rsa, int padding);
+    unsigned char *to, RSA *rsa, int padding);
 static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa,
-                           BN_CTX *ctx);
+    BN_CTX *ctx);
 static int rsa_ossl_init(RSA *rsa);
 static int rsa_ossl_finish(RSA *rsa);
 #ifdef S390X_MOD_EXP
 static int rsa_ossl_s390x_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa,
-                                BN_CTX *ctx);
+    BN_CTX *ctx);
 static RSA_METHOD rsa_pkcs1_ossl_meth = {
     "OpenSSL PKCS#1 RSA",
     rsa_ossl_public_encrypt,
-    rsa_ossl_public_decrypt,     /* signature verification */
-    rsa_ossl_private_encrypt,    /* signing */
+    rsa_ossl_public_decrypt, /* signature verification */
+    rsa_ossl_private_encrypt, /* signing */
     rsa_ossl_private_decrypt,
     rsa_ossl_s390x_mod_exp,
     s390x_mod_exp,
     rsa_ossl_init,
     rsa_ossl_finish,
-    RSA_FLAG_FIPS_METHOD,       /* flags */
+    RSA_FLAG_FIPS_METHOD, /* flags */
     NULL,
-    0,                          /* rsa_sign */
-    0,                          /* rsa_verify */
-    NULL,                       /* rsa_keygen */
-    NULL                        /* rsa_multi_prime_keygen */
+    0, /* rsa_sign */
+    0, /* rsa_verify */
+    NULL, /* rsa_keygen */
+    NULL /* rsa_multi_prime_keygen */
 };
 #else
 static RSA_METHOD rsa_pkcs1_ossl_meth = {
     "OpenSSL PKCS#1 RSA",
     rsa_ossl_public_encrypt,
-    rsa_ossl_public_decrypt,     /* signature verification */
-    rsa_ossl_private_encrypt,    /* signing */
+    rsa_ossl_public_decrypt, /* signature verification */
+    rsa_ossl_private_encrypt, /* signing */
     rsa_ossl_private_decrypt,
     rsa_ossl_mod_exp,
-    BN_mod_exp_mont,            /* XXX probably we should not use Montgomery
-                                 * if e == 3 */
+    BN_mod_exp_mont, /* XXX probably we should not use Montgomery
+                      * if e == 3 */
     rsa_ossl_init,
     rsa_ossl_finish,
-    RSA_FLAG_FIPS_METHOD,       /* flags */
+    RSA_FLAG_FIPS_METHOD, /* flags */
     NULL,
-    0,                          /* rsa_sign */
-    0,                          /* rsa_verify */
-    NULL,                       /* rsa_keygen */
-    NULL                        /* rsa_multi_prime_keygen */
+    0, /* rsa_sign */
+    0, /* rsa_verify */
+    NULL, /* rsa_keygen */
+    NULL /* rsa_multi_prime_keygen */
 };
 #endif
 
@@ -97,7 +97,7 @@ const RSA_METHOD *RSA_null_method(void)
 }
 
 static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
-                                  unsigned char *to, RSA *rsa, int padding)
+    unsigned char *to, RSA *rsa, int padding)
 {
     BIGNUM *f, *ret;
     int i, num = 0, r = -1;
@@ -135,12 +135,12 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
     switch (padding) {
     case RSA_PKCS1_PADDING:
         i = ossl_rsa_padding_add_PKCS1_type_2_ex(rsa->libctx, buf, num,
-                                                 from, flen);
+            from, flen);
         break;
     case RSA_PKCS1_OAEP_PADDING:
         i = ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(rsa->libctx, buf, num,
-                                                    from, flen, NULL, 0,
-                                                    NULL, NULL);
+            from, flen, NULL, 0,
+            NULL, NULL);
         break;
     case RSA_NO_PADDING:
         i = RSA_padding_add_none(buf, num, from, flen);
@@ -169,8 +169,8 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
             goto err;
         }
         if (nminus1 == NULL
-                || BN_copy(nminus1, rsa->n) == NULL
-                || !BN_sub_word(nminus1, 1))
+            || BN_copy(nminus1, rsa->n) == NULL
+            || !BN_sub_word(nminus1, 1))
             goto err;
         if (BN_ucmp(f, nminus1) >= 0) {
             ERR_raise(ERR_LIB_RSA, RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
@@ -188,11 +188,11 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
 
     if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
         if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock,
-                                    rsa->n, ctx))
+                rsa->n, ctx))
             goto err;
 
     if (!rsa->meth->bn_mod_exp(ret, f, rsa->e, rsa->n, ctx,
-                               rsa->_method_mod_n))
+            rsa->_method_mod_n))
         goto err;
 
     /*
@@ -200,7 +200,7 @@ static int rsa_ossl_public_encrypt(int flen, const unsigned char *from,
      * the length of the modulus.
      */
     r = BN_bn2binpad(ret, to, num);
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     OPENSSL_clear_free(buf, num);
@@ -256,13 +256,13 @@ static BN_BLINDING *rsa_get_blinding(RSA *rsa, int *local, BN_CTX *ctx)
         ret = rsa->mt_blinding;
     }
 
- err:
+err:
     CRYPTO_THREAD_unlock(rsa->lock);
     return ret;
 }
 
 static int rsa_blinding_convert(BN_BLINDING *b, BIGNUM *f, BIGNUM *unblind,
-                                BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (unblind == NULL) {
         /*
@@ -286,7 +286,7 @@ static int rsa_blinding_convert(BN_BLINDING *b, BIGNUM *f, BIGNUM *unblind,
 }
 
 static int rsa_blinding_invert(BN_BLINDING *b, BIGNUM *f, BIGNUM *unblind,
-                               BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     /*
      * For local blinding, unblind is set to NULL, and BN_BLINDING_invert_ex
@@ -302,7 +302,7 @@ static int rsa_blinding_invert(BN_BLINDING *b, BIGNUM *f, BIGNUM *unblind,
 
 /* signing */
 static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
-                                   unsigned char *to, RSA *rsa, int padding)
+    unsigned char *to, RSA *rsa, int padding)
 {
     BIGNUM *f, *ret, *res;
     int i, num = 0, r = -1;
@@ -355,7 +355,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
 
     if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
         if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock,
-                                    rsa->n, ctx))
+                rsa->n, ctx))
             goto err;
 
     if (!(rsa->flags & RSA_FLAG_NO_BLINDING)) {
@@ -375,11 +375,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
             goto err;
     }
 
-    if ((rsa->flags & RSA_FLAG_EXT_PKEY) ||
-        (rsa->version == RSA_ASN1_VERSION_MULTI) ||
-        ((rsa->p != NULL) &&
-         (rsa->q != NULL) &&
-         (rsa->dmp1 != NULL) && (rsa->dmq1 != NULL) && (rsa->iqmp != NULL))) {
+    if ((rsa->flags & RSA_FLAG_EXT_PKEY) || (rsa->version == RSA_ASN1_VERSION_MULTI) || ((rsa->p != NULL) && (rsa->q != NULL) && (rsa->dmp1 != NULL) && (rsa->dmq1 != NULL) && (rsa->iqmp != NULL))) {
         if (!rsa->meth->rsa_mod_exp(ret, f, rsa, ctx))
             goto err;
     } else {
@@ -396,7 +392,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
         BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
 
         if (!rsa->meth->bn_mod_exp(ret, f, d, rsa->n, ctx,
-                                   rsa->_method_mod_n)) {
+                rsa->_method_mod_n)) {
             BN_free(d);
             goto err;
         }
@@ -424,7 +420,7 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
      * the length of the modulus.
      */
     r = BN_bn2binpad(res, to, num);
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     OPENSSL_clear_free(buf, num);
@@ -432,13 +428,13 @@ static int rsa_ossl_private_encrypt(int flen, const unsigned char *from,
 }
 
 static int derive_kdk(int flen, const unsigned char *from, RSA *rsa,
-                      unsigned char *buf, int num, unsigned char *kdk)
+    unsigned char *buf, int num, unsigned char *kdk)
 {
     int ret = 0;
     HMAC_CTX *hmac = NULL;
     EVP_MD *md = NULL;
     unsigned int md_len = SHA256_DIGEST_LENGTH;
-    unsigned char d_hash[SHA256_DIGEST_LENGTH] = {0};
+    unsigned char d_hash[SHA256_DIGEST_LENGTH] = { 0 };
     /*
      * because we use d as a handle to rsa->d we need to keep it local and
      * free before any further use of rsa->d
@@ -510,19 +506,19 @@ static int derive_kdk(int flen, const unsigned char *from, RSA *rsa,
     }
     ret = 1;
 
- err:
+err:
     HMAC_CTX_free(hmac);
     EVP_MD_free(md);
     return ret;
 }
 
 static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
-                                   unsigned char *to, RSA *rsa, int padding)
+    unsigned char *to, RSA *rsa, int padding)
 {
     BIGNUM *f, *ret;
     int j, num = 0, r = -1;
     unsigned char *buf = NULL;
-    unsigned char kdk[SHA256_DIGEST_LENGTH] = {0};
+    unsigned char kdk[SHA256_DIGEST_LENGTH] = { 0 };
     BN_CTX *ctx = NULL;
     int local_blinding = 0;
     /*
@@ -585,8 +581,8 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
             goto err;
         }
         if (nminus1 == NULL
-                || BN_copy(nminus1, rsa->n) == NULL
-                || !BN_sub_word(nminus1, 1))
+            || BN_copy(nminus1, rsa->n) == NULL
+            || !BN_sub_word(nminus1, 1))
             goto err;
         if (BN_ucmp(f, nminus1) >= 0) {
             ERR_raise(ERR_LIB_RSA, RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
@@ -602,7 +598,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
     }
     if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
         if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock,
-                                    rsa->n, ctx))
+                rsa->n, ctx))
             goto err;
 
     if (!(rsa->flags & RSA_FLAG_NO_BLINDING)) {
@@ -623,11 +619,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
     }
 
     /* do the decrypt */
-    if ((rsa->flags & RSA_FLAG_EXT_PKEY) ||
-        (rsa->version == RSA_ASN1_VERSION_MULTI) ||
-        ((rsa->p != NULL) &&
-         (rsa->q != NULL) &&
-         (rsa->dmp1 != NULL) && (rsa->dmq1 != NULL) && (rsa->iqmp != NULL))) {
+    if ((rsa->flags & RSA_FLAG_EXT_PKEY) || (rsa->version == RSA_ASN1_VERSION_MULTI) || ((rsa->p != NULL) && (rsa->q != NULL) && (rsa->dmp1 != NULL) && (rsa->dmq1 != NULL) && (rsa->iqmp != NULL))) {
         if (!rsa->meth->rsa_mod_exp(ret, f, rsa, ctx))
             goto err;
     } else {
@@ -643,7 +635,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
         }
         BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
         if (!rsa->meth->bn_mod_exp(ret, f, d, rsa->n, ctx,
-                                   rsa->_method_mod_n)) {
+                rsa->_method_mod_n)) {
             BN_free(d);
             goto err;
         }
@@ -695,7 +687,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
     err_clear_last_constant_time(1 & ~constant_time_msb(r));
 #endif
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     OPENSSL_clear_free(buf, num);
@@ -704,7 +696,7 @@ static int rsa_ossl_private_decrypt(int flen, const unsigned char *from,
 
 /* signature verification */
 static int rsa_ossl_public_decrypt(int flen, const unsigned char *from,
-                                  unsigned char *to, RSA *rsa, int padding)
+    unsigned char *to, RSA *rsa, int padding)
 {
     BIGNUM *f, *ret;
     int i, num = 0, r = -1;
@@ -762,11 +754,11 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from,
 
     if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
         if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock,
-                                    rsa->n, ctx))
+                rsa->n, ctx))
             goto err;
 
     if (!rsa->meth->bn_mod_exp(ret, f, rsa->e, rsa->n, ctx,
-                               rsa->_method_mod_n))
+            rsa->_method_mod_n))
         goto err;
 
     /* For X9.31: Assuming e is odd it does a 12 mod 16 test */
@@ -795,7 +787,7 @@ static int rsa_ossl_public_decrypt(int flen, const unsigned char *from,
     if (r < 0)
         ERR_raise(ERR_LIB_RSA, RSA_R_PADDING_CHECK_FAILED);
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     OPENSSL_clear_free(buf, num);
@@ -826,7 +818,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
 #ifndef FIPS_MODULE
     if (rsa->version == RSA_ASN1_VERSION_MULTI
         && ((ex_primes = sk_RSA_PRIME_INFO_num(rsa->prime_infos)) <= 0
-             || ex_primes > RSA_MAX_PRIME_NUM - 2))
+            || ex_primes > RSA_MAX_PRIME_NUM - 2))
         goto err;
 #endif
 
@@ -841,11 +833,11 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
          * BN_FLG_CONSTTIME flag
          */
         if (!(BN_with_flags(factor, rsa->p, BN_FLG_CONSTTIME),
-              BN_MONT_CTX_set_locked(&rsa->_method_mod_p, rsa->lock,
-                                     factor, ctx))
+                BN_MONT_CTX_set_locked(&rsa->_method_mod_p, rsa->lock,
+                    factor, ctx))
             || !(BN_with_flags(factor, rsa->q, BN_FLG_CONSTTIME),
-                 BN_MONT_CTX_set_locked(&rsa->_method_mod_q, rsa->lock,
-                                        factor, ctx))) {
+                BN_MONT_CTX_set_locked(&rsa->_method_mod_q, rsa->lock,
+                    factor, ctx))) {
             BN_free(factor);
             goto err;
         }
@@ -866,14 +858,14 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
 
         smooth = (rsa->meth->bn_mod_exp == BN_mod_exp_mont)
 #ifndef FIPS_MODULE
-                 && (ex_primes == 0)
+            && (ex_primes == 0)
 #endif
-                 && (BN_num_bits(rsa->q) == BN_num_bits(rsa->p));
+            && (BN_num_bits(rsa->q) == BN_num_bits(rsa->p));
     }
 
     if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
         if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n, rsa->lock,
-                                    rsa->n, ctx))
+                rsa->n, ctx))
             goto err;
 
     if (smooth) {
@@ -897,10 +889,10 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
              *    r1 = r1^dmp1 mod p
              */
             || !BN_mod_exp_mont_consttime_x2(m1, m1, rsa->dmq1, rsa->q,
-                                             rsa->_method_mod_q,
-                                             r1, r1, rsa->dmp1, rsa->p,
-                                             rsa->_method_mod_p,
-                                             ctx)
+                rsa->_method_mod_q,
+                r1, r1, rsa->dmp1, rsa->p,
+                rsa->_method_mod_p,
+                ctx)
             /* r1 = (r1 - m1) mod p */
             /*
              * bn_mod_sub_fixed_top is not regular modular subtraction,
@@ -913,7 +905,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
             /* r1 = r1 * iqmp mod p */
             || !bn_to_mont_fixed_top(r1, r1, rsa->_method_mod_p, ctx)
             || !bn_mul_mont_fixed_top(r1, r1, rsa->iqmp, rsa->_method_mod_p,
-                                      ctx)
+                ctx)
             /* r0 = r1 * q + m1 */
             || !bn_mul_fixed_top(r0, r1, rsa->q, ctx)
             || !bn_mod_add_fixed_top(r0, r0, m1, rsa->n))
@@ -944,7 +936,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
 
             /* compute r1^dmq1 mod q */
             if (!rsa->meth->bn_mod_exp(m1, r1, dmq1, rsa->q, ctx,
-                                       rsa->_method_mod_q)) {
+                    rsa->_method_mod_q)) {
                 BN_free(c);
                 BN_free(dmq1);
                 goto err;
@@ -970,7 +962,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
 
         /* compute r1^dmp1 mod p */
         if (!rsa->meth->bn_mod_exp(r0, r1, dmp1, rsa->p, ctx,
-                                   rsa->_method_mod_p)) {
+                rsa->_method_mod_p)) {
             BN_free(dmp1);
             goto err;
         }
@@ -1107,16 +1099,16 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
     }
 #endif
 
- tail:
+tail:
     if (rsa->e && rsa->n) {
         if (rsa->meth->bn_mod_exp == BN_mod_exp_mont) {
             if (!BN_mod_exp_mont(vrfy, r0, rsa->e, rsa->n, ctx,
-                                 rsa->_method_mod_n))
+                    rsa->_method_mod_n))
                 goto err;
         } else {
             bn_correct_top(r0);
             if (!rsa->meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx,
-                                       rsa->_method_mod_n))
+                    rsa->_method_mod_n))
                 goto err;
         }
         /*
@@ -1130,7 +1122,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
         if (BN_is_zero(vrfy)) {
             bn_correct_top(r0);
             ret = 1;
-            goto err;   /* not actually error */
+            goto err; /* not actually error */
         }
         if (!BN_mod(vrfy, vrfy, rsa->n, ctx))
             goto err;
@@ -1150,7 +1142,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
             BN_with_flags(d, rsa->d, BN_FLG_CONSTTIME);
 
             if (!rsa->meth->bn_mod_exp(r0, I, d, rsa->n, ctx,
-                                       rsa->_method_mod_n)) {
+                    rsa->_method_mod_n)) {
                 BN_free(d);
                 goto err;
             }
@@ -1168,7 +1160,7 @@ static int rsa_ossl_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
      */
     bn_correct_top(r0);
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
@@ -1199,7 +1191,7 @@ static int rsa_ossl_finish(RSA *rsa)
 
 #ifdef S390X_MOD_EXP
 static int rsa_ossl_s390x_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa,
-                                BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     if (rsa->version != RSA_ASN1_VERSION_MULTI) {
         if (s390x_crt(r0, i, rsa->p, rsa->q, rsa->dmp1, rsa->dmq1, rsa->iqmp) == 1)
diff --git a/crypto/rsa/rsa_pk1.c b/crypto/rsa/rsa_pk1.c
index 7655ef9a97dc0..47fe112be4297 100644
--- a/crypto/rsa/rsa_pk1.c
+++ b/crypto/rsa/rsa_pk1.c
@@ -28,9 +28,8 @@
 #include "crypto/rsa.h"
 #include "rsa_local.h"
 
-
 int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
-                                 const unsigned char *from, int flen)
+    const unsigned char *from, int flen)
 {
     int j;
     unsigned char *p;
@@ -43,7 +42,7 @@ int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
     p = (unsigned char *)to;
 
     *(p++) = 0;
-    *(p++) = 1;                 /* Private Key BT (Block Type) */
+    *(p++) = 1; /* Private Key BT (Block Type) */
 
     /* pad out with 0xff data */
     j = tlen - 3 - flen;
@@ -55,8 +54,8 @@ int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
 }
 
 int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
-                                   const unsigned char *from, int flen,
-                                   int num)
+    const unsigned char *from, int flen,
+    int num)
 {
     int i, j;
     const unsigned char *p;
@@ -88,9 +87,9 @@ int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
     }
 
     /* scan over padding data */
-    j = flen - 1;               /* one for type. */
+    j = flen - 1; /* one for type. */
     for (i = 0; i < j; i++) {
-        if (*p != 0xff) {       /* should decrypt to 0xff */
+        if (*p != 0xff) { /* should decrypt to 0xff */
             if (*p == 0) {
                 p++;
                 break;
@@ -111,7 +110,7 @@ int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
         ERR_raise(ERR_LIB_RSA, RSA_R_BAD_PAD_BYTE_COUNT);
         return -1;
     }
-    i++;                        /* Skip over the '\0' */
+    i++; /* Skip over the '\0' */
     j -= i;
     if (j > tlen) {
         ERR_raise(ERR_LIB_RSA, RSA_R_DATA_TOO_LARGE);
@@ -123,8 +122,8 @@ int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
 }
 
 int ossl_rsa_padding_add_PKCS1_type_2_ex(OSSL_LIB_CTX *libctx, unsigned char *to,
-                                         int tlen, const unsigned char *from,
-                                         int flen)
+    int tlen, const unsigned char *from,
+    int flen)
 {
     int i, j;
     unsigned char *p;
@@ -140,7 +139,7 @@ int ossl_rsa_padding_add_PKCS1_type_2_ex(OSSL_LIB_CTX *libctx, unsigned char *to
     p = (unsigned char *)to;
 
     *(p++) = 0;
-    *(p++) = 2;                 /* Public Key BT (Block Type) */
+    *(p++) = 2; /* Public Key BT (Block Type) */
 
     /* pad out with non-zero random data */
     j = tlen - 3 - flen;
@@ -163,14 +162,14 @@ int ossl_rsa_padding_add_PKCS1_type_2_ex(OSSL_LIB_CTX *libctx, unsigned char *to
 }
 
 int RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen,
-                                 const unsigned char *from, int flen)
+    const unsigned char *from, int flen)
 {
     return ossl_rsa_padding_add_PKCS1_type_2_ex(NULL, to, tlen, from, flen);
 }
 
 int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
-                                   const unsigned char *from, int flen,
-                                   int num)
+    const unsigned char *from, int flen,
+    int num)
 {
     int i;
     /* |em| is the encoded message, zero-padded to exactly |num| bytes */
@@ -216,7 +215,7 @@ int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
         unsigned int equals0 = constant_time_is_zero(em[i]);
 
         zero_index = constant_time_select_int(~found_zero_byte & equals0,
-                                              i, zero_index);
+            i, zero_index);
         found_zero_byte |= equals0;
     }
 
@@ -250,7 +249,7 @@ int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
      * The loop below has overall complexity of O(N*log(N)).
      */
     tlen = constant_time_select_int(constant_time_lt(num - RSA_PKCS1_PADDING_SIZE, tlen),
-                                    num - RSA_PKCS1_PADDING_SIZE, tlen);
+        num - RSA_PKCS1_PADDING_SIZE, tlen);
     for (msg_index = 1; msg_index < num - RSA_PKCS1_PADDING_SIZE; msg_index <<= 1) {
         mask = ~constant_time_eq(msg_index & (num - RSA_PKCS1_PADDING_SIZE - mlen), 0);
         for (i = RSA_PKCS1_PADDING_SIZE; i < num - msg_index; i++)
@@ -275,12 +274,11 @@ int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
     return constant_time_select_int(good, mlen, -1);
 }
 
-
 static int ossl_rsa_prf(OSSL_LIB_CTX *ctx,
-                        unsigned char *to, int tlen,
-                        const char *label, int llen,
-                        const unsigned char *kdk,
-                        uint16_t bitlen)
+    unsigned char *to, int tlen,
+    const char *label, int llen,
+    const unsigned char *kdk,
+    uint16_t bitlen)
 {
     int pos;
     int ret = -1;
@@ -387,9 +385,9 @@ static int ossl_rsa_prf(OSSL_LIB_CTX *ctx,
  * remaining padding bytes
  */
 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)
 {
 /*
  * We need to generate a random length for the synthetic message, to avoid
@@ -434,8 +432,9 @@ int ossl_rsa_padding_check_PKCS1_type_2(OSSL_LIB_CTX *ctx,
 
     /* decide how long the random message should be */
     if (ossl_rsa_prf(ctx, candidate_lengths, sizeof(candidate_lengths),
-                     "length", 6, kdk,
-                     MAX_LEN_GEN_TRIES * sizeof(len_candidate) * 8) < 0)
+            "length", 6, kdk,
+            MAX_LEN_GEN_TRIES * sizeof(len_candidate) * 8)
+        < 0)
         goto err;
 
     /*
@@ -454,7 +453,7 @@ int ossl_rsa_padding_check_PKCS1_type_2(OSSL_LIB_CTX *ctx,
 
     synthetic_length = 0;
     for (i = 0; i < MAX_LEN_GEN_TRIES * (int)sizeof(len_candidate);
-            i += sizeof(len_candidate)) {
+        i += sizeof(len_candidate)) {
         len_candidate = (candidate_lengths[i] << 8) | candidate_lengths[i + 1];
         len_candidate &= len_mask;
 
@@ -474,7 +473,7 @@ int ossl_rsa_padding_check_PKCS1_type_2(OSSL_LIB_CTX *ctx,
     for (i = 2; i < flen; i++) {
         unsigned int equals0 = constant_time_is_zero(from[i]);
         zero_index = constant_time_select_int(~found_zero_byte & equals0,
-                                              i, zero_index);
+            i, zero_index);
         found_zero_byte |= equals0;
     }
 
@@ -545,10 +544,10 @@ int ossl_rsa_padding_check_PKCS1_type_2(OSSL_LIB_CTX *ctx,
  * https://tools.ietf.org/html/rfc5246#section-7.4.7.1).
  */
 int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *libctx,
-                                            unsigned char *to, size_t tlen,
-                                            const unsigned char *from,
-                                            size_t flen, int client_version,
-                                            int alt_version)
+    unsigned char *to, size_t tlen,
+    const unsigned char *from,
+    size_t flen, int client_version,
+    int alt_version)
 {
     unsigned int i, good, version_good;
     unsigned char rand_premaster_secret[SSL_MAX_MASTER_KEY_LENGTH];
@@ -558,7 +557,7 @@ int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *libctx,
      * we've been called incorrectly. We can fail immediately.
      */
     if (flen < RSA_PKCS1_PADDING_SIZE + SSL_MAX_MASTER_KEY_LENGTH
-            || tlen < SSL_MAX_MASTER_KEY_LENGTH) {
+        || tlen < SSL_MAX_MASTER_KEY_LENGTH) {
         ERR_raise(ERR_LIB_RSA, RSA_R_PKCS_DECODING_ERROR);
         return -1;
     }
@@ -568,7 +567,8 @@ int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *libctx,
      * to decrypt.
      */
     if (RAND_priv_bytes_ex(libctx, rand_premaster_secret,
-                           sizeof(rand_premaster_secret), 0) <= 0) {
+            sizeof(rand_premaster_secret), 0)
+        <= 0) {
         ERR_raise(ERR_LIB_RSA, ERR_R_INTERNAL_ERROR);
         return -1;
     }
@@ -581,7 +581,6 @@ int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *libctx,
         good &= ~constant_time_is_zero_8(from[i]);
     good &= constant_time_is_zero_8(from[flen - SSL_MAX_MASTER_KEY_LENGTH - 1]);
 
-
     /*
      * If the version in the decrypted pre-master secret is correct then
      * version_good will be 0xff, otherwise it'll be zero. The
@@ -590,12 +589,10 @@ int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *libctx,
      * check as a "bad version oracle". Thus version checks are done in
      * constant time and are treated like any other decryption error.
      */
-    version_good =
-        constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH],
-                         (client_version >> 8) & 0xff);
-    version_good &=
-        constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH + 1],
-                         client_version & 0xff);
+    version_good = constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH],
+        (client_version >> 8) & 0xff);
+    version_good &= constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH + 1],
+        client_version & 0xff);
 
     /*
      * The premaster secret must contain the same version number as the
@@ -610,27 +607,23 @@ int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *libctx,
     if (alt_version > 0) {
         unsigned int workaround_good;
 
-        workaround_good =
-            constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH],
-                             (alt_version >> 8) & 0xff);
-        workaround_good &=
-            constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH + 1],
-                             alt_version & 0xff);
+        workaround_good = constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH],
+            (alt_version >> 8) & 0xff);
+        workaround_good &= constant_time_eq(from[flen - SSL_MAX_MASTER_KEY_LENGTH + 1],
+            alt_version & 0xff);
         version_good |= workaround_good;
     }
 
     good &= version_good;
 
-
     /*
      * Now copy the result over to the to buffer if good, or random data if
      * not good.
      */
     for (i = 0; i < SSL_MAX_MASTER_KEY_LENGTH; i++) {
-        to[i] =
-            constant_time_select_8(good,
-                                   from[flen - SSL_MAX_MASTER_KEY_LENGTH + i],
-                                   rand_premaster_secret[i]);
+        to[i] = constant_time_select_8(good,
+            from[flen - SSL_MAX_MASTER_KEY_LENGTH + i],
+            rand_premaster_secret[i]);
     }
 
     /*
diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c
index 8f89f748e7aad..9e1cae485c2d0 100644
--- a/crypto/rsa/rsa_pmeth.c
+++ b/crypto/rsa/rsa_pmeth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-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
@@ -115,8 +115,7 @@ static int setup_tbuf(RSA_PKEY_CTX *ctx, EVP_PKEY_CTX *pk)
 {
     if (ctx->tbuf != NULL)
         return 1;
-    if ((ctx->tbuf =
-            OPENSSL_malloc(RSA_size(EVP_PKEY_get0_RSA(pk->pkey)))) == NULL)
+    if ((ctx->tbuf = OPENSSL_malloc(RSA_size(EVP_PKEY_get0_RSA(pk->pkey)))) == NULL)
         return 0;
     return 1;
 }
@@ -133,8 +132,8 @@ static void pkey_rsa_cleanup(EVP_PKEY_CTX *ctx)
 }
 
 static int pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
-                         size_t *siglen, const unsigned char *tbs,
-                         size_t tbslen)
+    size_t *siglen, const unsigned char *tbs,
+    size_t tbslen)
 {
     int ret;
     RSA_PKEY_CTX *rctx = ctx->data;
@@ -179,11 +178,11 @@ static int pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
             memcpy(rctx->tbuf, tbs, tbslen);
             rctx->tbuf[tbslen] = RSA_X931_hash_id(EVP_MD_get_type(rctx->md));
             ret = RSA_private_encrypt(tbslen + 1, rctx->tbuf,
-                                      sig, rsa, RSA_X931_PADDING);
+                sig, rsa, RSA_X931_PADDING);
         } else if (rctx->pad_mode == RSA_PKCS1_PADDING) {
             unsigned int sltmp;
             ret = RSA_sign(EVP_MD_get_type(rctx->md),
-                           tbs, tbslen, sig, &sltmp, rsa);
+                tbs, tbslen, sig, &sltmp, rsa);
             if (ret <= 0)
                 return ret;
             ret = sltmp;
@@ -191,12 +190,12 @@ static int pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
             if (!setup_tbuf(rctx, ctx))
                 return -1;
             if (!RSA_padding_add_PKCS1_PSS_mgf1(rsa,
-                                                rctx->tbuf, tbs,
-                                                rctx->md, rctx->mgf1md,
-                                                rctx->saltlen))
+                    rctx->tbuf, tbs,
+                    rctx->md, rctx->mgf1md,
+                    rctx->saltlen))
                 return -1;
             ret = RSA_private_encrypt(RSA_size(rsa), rctx->tbuf,
-                                      sig, rsa, RSA_NO_PADDING);
+                sig, rsa, RSA_NO_PADDING);
         } else {
             return -1;
         }
@@ -210,8 +209,8 @@ static int pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig,
 }
 
 static int pkey_rsa_verifyrecover(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 ret;
     RSA_PKEY_CTX *rctx = ctx->data;
@@ -227,8 +226,8 @@ static int pkey_rsa_verifyrecover(EVP_PKEY_CTX *ctx,
             if (!setup_tbuf(rctx, ctx))
                 return -1;
             ret = RSA_public_decrypt(siglen, sig, rctx->tbuf, rsa,
-                                     RSA_X931_PADDING);
-            if (ret < 1)
+                RSA_X931_PADDING);
+            if (ret <= 0)
                 return 0;
             ret--;
             if (rctx->tbuf[ret] != RSA_X931_hash_id(EVP_MD_get_type(rctx->md))) {
@@ -244,8 +243,8 @@ static int pkey_rsa_verifyrecover(EVP_PKEY_CTX *ctx,
         } else if (rctx->pad_mode == RSA_PKCS1_PADDING) {
             size_t sltmp;
             ret = ossl_rsa_verify(EVP_MD_get_type(rctx->md),
-                                  NULL, 0, rout, &sltmp,
-                                  sig, siglen, rsa);
+                NULL, 0, rout, &sltmp,
+                sig, siglen, rsa);
             if (ret <= 0)
                 return 0;
             ret = sltmp;
@@ -255,15 +254,15 @@ static int pkey_rsa_verifyrecover(EVP_PKEY_CTX *ctx,
     } else {
         ret = RSA_public_decrypt(siglen, sig, rout, rsa, rctx->pad_mode);
     }
-    if (ret < 0)
+    if (ret <= 0)
         return ret;
     *routlen = ret;
     return 1;
 }
 
 static int pkey_rsa_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)
 {
     RSA_PKEY_CTX *rctx = ctx->data;
     /*
@@ -278,7 +277,7 @@ static int pkey_rsa_verify(EVP_PKEY_CTX *ctx,
     if (rctx->md) {
         if (rctx->pad_mode == RSA_PKCS1_PADDING)
             return RSA_verify(EVP_MD_get_type(rctx->md), tbs, tbslen,
-                              sig, siglen, rsa);
+                sig, siglen, rsa);
         md_size = EVP_MD_get_size(rctx->md);
         if (md_size <= 0) {
             ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_DIGEST_LENGTH);
@@ -296,12 +295,12 @@ static int pkey_rsa_verify(EVP_PKEY_CTX *ctx,
             if (!setup_tbuf(rctx, ctx))
                 return -1;
             ret = RSA_public_decrypt(siglen, sig, rctx->tbuf,
-                                     rsa, RSA_NO_PADDING);
+                rsa, RSA_NO_PADDING);
             if (ret <= 0)
                 return 0;
             ret = RSA_verify_PKCS1_PSS_mgf1(rsa, tbs,
-                                            rctx->md, rctx->mgf1md,
-                                            rctx->tbuf, rctx->saltlen);
+                rctx->md, rctx->mgf1md,
+                rctx->tbuf, rctx->saltlen);
             if (ret <= 0)
                 return 0;
             return 1;
@@ -312,8 +311,8 @@ static int pkey_rsa_verify(EVP_PKEY_CTX *ctx,
         if (!setup_tbuf(rctx, ctx))
             return -1;
         rslen = RSA_public_decrypt(siglen, sig, rctx->tbuf,
-                                   rsa, rctx->pad_mode);
-        if (rslen == 0)
+            rsa, rctx->pad_mode);
+        if (rslen <= 0)
             return 0;
     }
 
@@ -321,12 +320,11 @@ static int pkey_rsa_verify(EVP_PKEY_CTX *ctx,
         return 0;
 
     return 1;
-
 }
 
 static int pkey_rsa_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 ret;
     RSA_PKEY_CTX *rctx = ctx->data;
@@ -342,10 +340,10 @@ static int pkey_rsa_encrypt(EVP_PKEY_CTX *ctx,
         if (!setup_tbuf(rctx, ctx))
             return -1;
         if (!RSA_padding_add_PKCS1_OAEP_mgf1(rctx->tbuf, klen,
-                                             in, inlen,
-                                             rctx->oaep_label,
-                                             rctx->oaep_labellen,
-                                             rctx->md, rctx->mgf1md))
+                in, inlen,
+                rctx->oaep_label,
+                rctx->oaep_labellen,
+                rctx->md, rctx->mgf1md))
             return -1;
         ret = RSA_public_encrypt(klen, rctx->tbuf, out, rsa, RSA_NO_PADDING);
     } else {
@@ -358,8 +356,8 @@ static int pkey_rsa_encrypt(EVP_PKEY_CTX *ctx,
 }
 
 static int pkey_rsa_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 ret;
     int pad_mode;
@@ -378,13 +376,12 @@ static int pkey_rsa_decrypt(EVP_PKEY_CTX *ctx,
         if (ret <= 0)
             return ret;
         ret = RSA_padding_check_PKCS1_OAEP_mgf1(out, ret, rctx->tbuf,
-                                                ret, ret,
-                                                rctx->oaep_label,
-                                                rctx->oaep_labellen,
-                                                rctx->md, rctx->mgf1md);
+            ret, ret,
+            rctx->oaep_label,
+            rctx->oaep_labellen,
+            rctx->md, rctx->mgf1md);
     } else {
-        if (rctx->pad_mode == RSA_PKCS1_PADDING &&
-              rctx->implicit_rejection == 0)
+        if (rctx->pad_mode == RSA_PKCS1_PADDING && rctx->implicit_rejection == 0)
             pad_mode = RSA_PKCS1_NO_IMPLICIT_REJECT_PADDING;
         else
             pad_mode = rctx->pad_mode;
@@ -439,7 +436,6 @@ static int check_padding_md(const EVP_MD *md, int padding)
         default:
             ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_DIGEST);
             return 0;
-
         }
     }
 
@@ -457,8 +453,7 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
             if (!check_padding_md(rctx->md, p1))
                 return 0;
             if (p1 == RSA_PKCS1_PSS_PADDING) {
-                if (!(ctx->operation &
-                      (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY)))
+                if (!(ctx->operation & (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY)))
                     goto bad_pad;
                 if (!rctx->md)
                     rctx->md = EVP_sha1();
@@ -474,7 +469,7 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
             rctx->pad_mode = p1;
             return 1;
         }
- bad_pad:
+    bad_pad:
         ERR_raise(ERR_LIB_RSA, RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE);
         return -2;
 
@@ -505,7 +500,7 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                     return -2;
                 }
                 if ((p1 == RSA_PSS_SALTLEN_DIGEST
-                     && rctx->min_saltlen > md_size)
+                        && rctx->min_saltlen > md_size)
                     || (p1 >= 0 && p1 < rctx->min_saltlen)) {
                     ERR_raise(ERR_LIB_RSA, RSA_R_PSS_SALTLEN_TOO_SMALL);
                     return 0;
@@ -631,7 +626,7 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 #ifndef OPENSSL_NO_CMS
     case EVP_PKEY_CTRL_CMS_SIGN:
 #endif
-    return 1;
+        return 1;
 
     case EVP_PKEY_CTRL_PKCS7_ENCRYPT:
     case EVP_PKEY_CTRL_PKCS7_DECRYPT:
@@ -639,8 +634,8 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
     case EVP_PKEY_CTRL_CMS_DECRYPT:
     case EVP_PKEY_CTRL_CMS_ENCRYPT:
 #endif
-    if (!pkey_ctx_is_pss(ctx))
-        return 1;
+        if (!pkey_ctx_is_pss(ctx))
+            return 1;
     /* fall through */
     case EVP_PKEY_CTRL_PEER_KEY:
         ERR_raise(ERR_LIB_RSA, RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
@@ -648,12 +643,11 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 
     default:
         return -2;
-
     }
 }
 
 static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx,
-                             const char *type, const char *value)
+    const char *type, const char *value)
 {
     if (value == NULL) {
         ERR_raise(ERR_LIB_RSA, RSA_R_VALUE_MISSING);
@@ -720,18 +714,18 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx,
 
     if (strcmp(type, "rsa_mgf1_md") == 0)
         return EVP_PKEY_CTX_md(ctx,
-                               EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
-                               EVP_PKEY_CTRL_RSA_MGF1_MD, value);
+            EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT,
+            EVP_PKEY_CTRL_RSA_MGF1_MD, value);
 
     if (pkey_ctx_is_pss(ctx)) {
 
         if (strcmp(type, "rsa_pss_keygen_mgf1_md") == 0)
             return EVP_PKEY_CTX_md(ctx, EVP_PKEY_OP_KEYGEN,
-                                   EVP_PKEY_CTRL_RSA_MGF1_MD, value);
+                EVP_PKEY_CTRL_RSA_MGF1_MD, value);
 
         if (strcmp(type, "rsa_pss_keygen_md") == 0)
             return EVP_PKEY_CTX_md(ctx, EVP_PKEY_OP_KEYGEN,
-                                   EVP_PKEY_CTRL_MD, value);
+                EVP_PKEY_CTRL_MD, value);
 
         if (strcmp(type, "rsa_pss_keygen_saltlen") == 0) {
             int saltlen = atoi(value);
@@ -742,7 +736,7 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx,
 
     if (strcmp(type, "rsa_oaep_md") == 0)
         return EVP_PKEY_CTX_md(ctx, EVP_PKEY_OP_TYPE_CRYPT,
-                               EVP_PKEY_CTRL_RSA_OAEP_MD, value);
+            EVP_PKEY_CTRL_RSA_OAEP_MD, value);
 
     if (strcmp(type, "rsa_oaep_label") == 0) {
         unsigned char *lab;
@@ -772,8 +766,9 @@ static int rsa_set_pss_param(RSA *rsa, EVP_PKEY_CTX *ctx)
     if (rctx->md == NULL && rctx->mgf1md == NULL && rctx->saltlen == -2)
         return 1;
     rsa->pss = ossl_rsa_pss_params_create(rctx->md, rctx->mgf1md,
-                                          rctx->saltlen == -2
-                                          ? 0 : rctx->saltlen);
+        rctx->saltlen == -2
+            ? 0
+            : rctx->saltlen);
     if (rsa->pss == NULL)
         return 0;
     return 1;
@@ -805,7 +800,7 @@ static int pkey_rsa_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
         pcb = NULL;
     }
     ret = RSA_generate_multi_prime_key(rsa, rctx->nbits, rctx->primes,
-                                       rctx->pub_exp, pcb);
+        rctx->pub_exp, pcb);
     BN_GENCB_free(pcb);
     if (ret > 0 && !rsa_set_pss_param(rsa, ctx)) {
         RSA_free(rsa);
diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c
index a2bc198a89369..98d6e70346438 100644
--- a/crypto/rsa/rsa_pss.c
+++ b/crypto/rsa/rsa_pss.c
@@ -25,26 +25,26 @@
 static const unsigned char zeroes[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
 #if defined(_MSC_VER) && defined(_ARM_)
-# pragma optimize("g", off)
+#pragma optimize("g", off)
 #endif
 
 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)
 {
     return RSA_verify_PKCS1_PSS_mgf1(rsa, mHash, Hash, NULL, EM, sLen);
 }
 
 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)
 {
     return ossl_rsa_verify_PKCS1_PSS_mgf1(rsa, mHash, Hash, mgf1Hash, EM, &sLen);
 }
 
 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 i;
     int ret = 0;
@@ -114,17 +114,18 @@ int ossl_rsa_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
         DB[i] ^= EM[i];
     if (MSBits)
         DB[0] &= 0xFF >> (8 - MSBits);
-    for (i = 0; DB[i] == 0 && i < (maskedDBLen - 1); i++) ;
+    for (i = 0; DB[i] == 0 && i < (maskedDBLen - 1); i++)
+        ;
     if (DB[i++] != 0x1) {
         ERR_raise(ERR_LIB_RSA, RSA_R_SLEN_RECOVERY_FAILED);
         goto err;
     }
     if (sLen != RSA_PSS_SALTLEN_AUTO
-            && sLen != RSA_PSS_SALTLEN_AUTO_DIGEST_MAX
-            && (maskedDBLen - i) != sLen) {
+        && sLen != RSA_PSS_SALTLEN_AUTO_DIGEST_MAX
+        && (maskedDBLen - i) != sLen) {
         ERR_raise_data(ERR_LIB_RSA, RSA_R_SLEN_CHECK_FAILED,
-                       "expected: %d retrieved: %d", sLen,
-                       maskedDBLen - i);
+            "expected: %d retrieved: %d", sLen,
+            maskedDBLen - i);
         goto err;
     } else {
         sLen = maskedDBLen - i;
@@ -147,33 +148,32 @@ int ossl_rsa_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
     }
 
     *sLenOut = sLen;
- err:
+err:
     OPENSSL_free(DB);
     EVP_MD_CTX_free(ctx);
 
     return ret;
-
 }
 
 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)
 {
     return RSA_padding_add_PKCS1_PSS_mgf1(rsa, EM, mHash, Hash, NULL, sLen);
 }
 
 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)
 {
     return ossl_rsa_padding_add_PKCS1_PSS_mgf1(rsa, EM, mHash, Hash, mgf1Hash, &sLen);
 }
 
 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)
 {
     int i;
     int ret = 0;
@@ -207,7 +207,7 @@ int ossl_rsa_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
     if (sLen == RSA_PSS_SALTLEN_DIGEST) {
         sLen = hLen;
     } else if (sLen == RSA_PSS_SALTLEN_MAX_SIGN
-               || sLen == RSA_PSS_SALTLEN_AUTO) {
+        || sLen == RSA_PSS_SALTLEN_AUTO) {
         sLen = RSA_PSS_SALTLEN_MAX;
     } else if (sLen == RSA_PSS_SALTLEN_AUTO_DIGEST_MAX) {
         sLen = RSA_PSS_SALTLEN_MAX;
@@ -282,12 +282,11 @@ int ossl_rsa_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
     ret = 1;
 
     *sLenOut = sLen;
- err:
+err:
     EVP_MD_CTX_free(ctx);
     OPENSSL_clear_free(salt, (size_t)sLen); /* salt != NULL implies sLen > 0 */
 
     return ret;
-
 }
 
 /*
@@ -313,13 +312,13 @@ int ossl_rsa_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
  *     }
  */
 static const RSA_PSS_PARAMS_30 default_RSASSA_PSS_params = {
-    NID_sha1,                    /* default hashAlgorithm */
+    NID_sha1, /* default hashAlgorithm */
     {
-        NID_mgf1,                /* default maskGenAlgorithm */
-        NID_sha1                 /* default MGF1 hash */
+        NID_mgf1, /* default maskGenAlgorithm */
+        NID_sha1 /* default MGF1 hash */
     },
-    20,                          /* default saltLength */
-    1                            /* default trailerField (0xBC) */
+    20, /* default saltLength */
+    1 /* default trailerField (0xBC) */
 };
 
 int ossl_rsa_pss_params_30_set_defaults(RSA_PSS_PARAMS_30 *rsa_pss_params)
@@ -332,22 +331,25 @@ int ossl_rsa_pss_params_30_set_defaults(RSA_PSS_PARAMS_30 *rsa_pss_params)
 
 int ossl_rsa_pss_params_30_is_unrestricted(const RSA_PSS_PARAMS_30 *rsa_pss_params)
 {
-    static RSA_PSS_PARAMS_30 pss_params_cmp = { 0, };
+    static RSA_PSS_PARAMS_30 pss_params_cmp = {
+        0,
+    };
 
     return rsa_pss_params == NULL
         || memcmp(rsa_pss_params, &pss_params_cmp,
-                  sizeof(*rsa_pss_params)) == 0;
+               sizeof(*rsa_pss_params))
+        == 0;
 }
 
 int ossl_rsa_pss_params_30_copy(RSA_PSS_PARAMS_30 *to,
-                                const RSA_PSS_PARAMS_30 *from)
+    const RSA_PSS_PARAMS_30 *from)
 {
     memcpy(to, from, sizeof(*to));
     return 1;
 }
 
 int ossl_rsa_pss_params_30_set_hashalg(RSA_PSS_PARAMS_30 *rsa_pss_params,
-                                       int hashalg_nid)
+    int hashalg_nid)
 {
     if (rsa_pss_params == NULL)
         return 0;
@@ -356,7 +358,7 @@ int ossl_rsa_pss_params_30_set_hashalg(RSA_PSS_PARAMS_30 *rsa_pss_params,
 }
 
 int ossl_rsa_pss_params_30_set_maskgenhashalg(RSA_PSS_PARAMS_30 *rsa_pss_params,
-                                              int maskgenhashalg_nid)
+    int maskgenhashalg_nid)
 {
     if (rsa_pss_params == NULL)
         return 0;
@@ -365,7 +367,7 @@ int ossl_rsa_pss_params_30_set_maskgenhashalg(RSA_PSS_PARAMS_30 *rsa_pss_params,
 }
 
 int ossl_rsa_pss_params_30_set_saltlen(RSA_PSS_PARAMS_30 *rsa_pss_params,
-                                       int saltlen)
+    int saltlen)
 {
     if (rsa_pss_params == NULL)
         return 0;
@@ -374,7 +376,7 @@ int ossl_rsa_pss_params_30_set_saltlen(RSA_PSS_PARAMS_30 *rsa_pss_params,
 }
 
 int ossl_rsa_pss_params_30_set_trailerfield(RSA_PSS_PARAMS_30 *rsa_pss_params,
-                                            int trailerfield)
+    int trailerfield)
 {
     if (rsa_pss_params == NULL)
         return 0;
@@ -418,5 +420,5 @@ int ossl_rsa_pss_params_30_trailerfield(const RSA_PSS_PARAMS_30 *rsa_pss_params)
 }
 
 #if defined(_MSC_VER)
-# pragma optimize("",on)
+#pragma optimize("", on)
 #endif
diff --git a/crypto/rsa/rsa_saos.c b/crypto/rsa/rsa_saos.c
index dc96b6dada2fd..afcc4c9a4d8b7 100644
--- a/crypto/rsa/rsa_saos.c
+++ b/crypto/rsa/rsa_saos.c
@@ -21,9 +21,9 @@
 #include <openssl/x509.h>
 
 int RSA_sign_ASN1_OCTET_STRING(int type,
-                               const unsigned char *m, unsigned int m_len,
-                               unsigned char *sigret, unsigned int *siglen,
-                               RSA *rsa)
+    const unsigned char *m, unsigned int m_len,
+    unsigned char *sigret, unsigned int *siglen,
+    RSA *rsa)
 {
     ASN1_OCTET_STRING sig;
     int i, j, ret = 1;
@@ -55,9 +55,9 @@ int RSA_sign_ASN1_OCTET_STRING(int type,
 }
 
 int RSA_verify_ASN1_OCTET_STRING(int dtype,
-                                 const unsigned char *m,
-                                 unsigned int m_len, unsigned char *sigbuf,
-                                 unsigned int siglen, RSA *rsa)
+    const unsigned char *m,
+    unsigned int m_len, unsigned char *sigbuf,
+    unsigned int siglen, RSA *rsa)
 {
     int i, ret = 0;
     unsigned char *s;
@@ -82,13 +82,12 @@ int RSA_verify_ASN1_OCTET_STRING(int dtype,
     if (sig == NULL)
         goto err;
 
-    if (((unsigned int)sig->length != m_len) ||
-        (memcmp(m, sig->data, m_len) != 0)) {
+    if (((unsigned int)sig->length != m_len) || (memcmp(m, sig->data, m_len) != 0)) {
         ERR_raise(ERR_LIB_RSA, RSA_R_BAD_SIGNATURE);
     } else {
         ret = 1;
     }
- err:
+err:
     ASN1_OCTET_STRING_free(sig);
     OPENSSL_clear_free(s, (unsigned int)siglen);
     return ret;
diff --git a/crypto/rsa/rsa_schemes.c b/crypto/rsa/rsa_schemes.c
index 435f44e0161ca..f487f840f8cb2 100644
--- a/crypto/rsa/rsa_schemes.c
+++ b/crypto/rsa/rsa_schemes.c
@@ -15,8 +15,8 @@
 #include "crypto/rsa.h"
 
 static int meth2nid(const void *meth,
-                    int (*meth_is_a)(const void *meth, const char *name),
-                    const OSSL_ITEM *items, size_t items_n)
+    int (*meth_is_a)(const void *meth, const char *name),
+    const OSSL_ITEM *items, size_t items_n)
 {
     size_t i;
 
@@ -53,13 +53,13 @@ static const char *nid2name(int meth, const OSSL_ITEM *items, size_t items_n)
  * }
  */
 static const OSSL_ITEM oaeppss_name_nid_map[] = {
-    { NID_sha1,         OSSL_DIGEST_NAME_SHA1         },
-    { NID_sha224,       OSSL_DIGEST_NAME_SHA2_224     },
-    { NID_sha256,       OSSL_DIGEST_NAME_SHA2_256     },
-    { NID_sha384,       OSSL_DIGEST_NAME_SHA2_384     },
-    { NID_sha512,       OSSL_DIGEST_NAME_SHA2_512     },
-    { NID_sha512_224,   OSSL_DIGEST_NAME_SHA2_512_224 },
-    { NID_sha512_256,   OSSL_DIGEST_NAME_SHA2_512_256 },
+    { NID_sha1, OSSL_DIGEST_NAME_SHA1 },
+    { NID_sha224, OSSL_DIGEST_NAME_SHA2_224 },
+    { NID_sha256, OSSL_DIGEST_NAME_SHA2_256 },
+    { NID_sha384, OSSL_DIGEST_NAME_SHA2_384 },
+    { NID_sha512, OSSL_DIGEST_NAME_SHA2_512 },
+    { NID_sha512_224, OSSL_DIGEST_NAME_SHA2_512_224 },
+    { NID_sha512_256, OSSL_DIGEST_NAME_SHA2_512_256 },
 };
 
 static int md_is_a(const void *md, const char *name)
@@ -70,7 +70,7 @@ static int md_is_a(const void *md, const char *name)
 int ossl_rsa_oaeppss_md2nid(const EVP_MD *md)
 {
     return meth2nid(md, md_is_a,
-                    oaeppss_name_nid_map, OSSL_NELEM(oaeppss_name_nid_map));
+        oaeppss_name_nid_map, OSSL_NELEM(oaeppss_name_nid_map));
 }
 
 const char *ossl_rsa_oaeppss_nid2name(int md)
diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c
index 78e4bad69e49a..41a659cde616f 100644
--- a/crypto/rsa/rsa_sign.c
+++ b/crypto/rsa/rsa_sign.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -19,24 +19,24 @@
 #include <openssl/rsa.h>
 #include <openssl/objects.h>
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_MD2
-#  include <openssl/md2.h> /* uses MD2_DIGEST_LENGTH */
-# endif
-# ifndef OPENSSL_NO_MD4
-#  include <openssl/md4.h> /* uses MD4_DIGEST_LENGTH */
-# endif
-# ifndef OPENSSL_NO_MD5
-#  include <openssl/md5.h> /* uses MD5_DIGEST_LENGTH */
-# endif
-# ifndef OPENSSL_NO_MDC2
-#  include <openssl/mdc2.h> /* uses MDC2_DIGEST_LENGTH */
-# endif
-# ifndef OPENSSL_NO_RMD160
-#  include <openssl/ripemd.h> /* uses RIPEMD160_DIGEST_LENGTH */
-# endif
-# ifndef OPENSSL_NO_SM3
-#  include "internal/sm3.h" /* uses SM3_DIGEST_LENGTH */
-# endif
+#ifndef OPENSSL_NO_MD2
+#include <openssl/md2.h> /* uses MD2_DIGEST_LENGTH */
+#endif
+#ifndef OPENSSL_NO_MD4
+#include <openssl/md4.h> /* uses MD4_DIGEST_LENGTH */
+#endif
+#ifndef OPENSSL_NO_MD5
+#include <openssl/md5.h> /* uses MD5_DIGEST_LENGTH */
+#endif
+#ifndef OPENSSL_NO_MDC2
+#include <openssl/mdc2.h> /* uses MDC2_DIGEST_LENGTH */
+#endif
+#ifndef OPENSSL_NO_RMD160
+#include <openssl/ripemd.h> /* uses RIPEMD160_DIGEST_LENGTH */
+#endif
+#ifndef OPENSSL_NO_SM3
+#include "internal/sm3.h" /* uses SM3_DIGEST_LENGTH */
+#endif
 #endif
 #include <openssl/sha.h> /* uses SHA???_DIGEST_LENGTH */
 #include "crypto/rsa.h"
@@ -77,74 +77,74 @@
 #define ASN1_OID 0x06
 
 /* SHA OIDs are of the form: (2 16 840 1 101 3 4 2 |n|) */
-#define ENCODE_DIGESTINFO_SHA(name, n, sz)                                     \
-static const unsigned char digestinfo_##name##_der[] = {                       \
-    ASN1_SEQUENCE, 0x11 + sz,                                                  \
-      ASN1_SEQUENCE, 0x0d,                                                     \
-        ASN1_OID, 0x09, 2 * 40 + 16, 0x86, 0x48, 1, 101, 3, 4, 2, n,           \
-        ASN1_NULL, 0x00,                                                       \
-      ASN1_OCTET_STRING, sz                                                    \
-};
+#define ENCODE_DIGESTINFO_SHA(name, n, sz)                           \
+    static const unsigned char digestinfo_##name##_der[] = {         \
+        ASN1_SEQUENCE, 0x11 + sz,                                    \
+        ASN1_SEQUENCE, 0x0d,                                         \
+        ASN1_OID, 0x09, 2 * 40 + 16, 0x86, 0x48, 1, 101, 3, 4, 2, n, \
+        ASN1_NULL, 0x00,                                             \
+        ASN1_OCTET_STRING, sz                                        \
+    };
 
 /* MD2, MD4 and MD5 OIDs are of the form: (1 2 840 113549 2 |n|) */
-#define ENCODE_DIGESTINFO_MD(name, n, sz)                                      \
-static const unsigned char digestinfo_##name##_der[] = {                       \
-    ASN1_SEQUENCE, 0x10 + sz,                                                  \
-      ASN1_SEQUENCE, 0x0c,                                                     \
-        ASN1_OID, 0x08, 1 * 40 + 2, 0x86, 0x48, 0x86, 0xf7, 0x0d, 2, n,        \
-        ASN1_NULL, 0x00,                                                       \
-      ASN1_OCTET_STRING, sz                                                    \
-};
+#define ENCODE_DIGESTINFO_MD(name, n, sz)                               \
+    static const unsigned char digestinfo_##name##_der[] = {            \
+        ASN1_SEQUENCE, 0x10 + sz,                                       \
+        ASN1_SEQUENCE, 0x0c,                                            \
+        ASN1_OID, 0x08, 1 * 40 + 2, 0x86, 0x48, 0x86, 0xf7, 0x0d, 2, n, \
+        ASN1_NULL, 0x00,                                                \
+        ASN1_OCTET_STRING, sz                                           \
+    };
 
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_MD2
+#ifndef OPENSSL_NO_MD2
 ENCODE_DIGESTINFO_MD(md2, 0x02, MD2_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_MD4
+#endif
+#ifndef OPENSSL_NO_MD4
 ENCODE_DIGESTINFO_MD(md4, 0x03, MD4_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_MD5
+#endif
+#ifndef OPENSSL_NO_MD5
 ENCODE_DIGESTINFO_MD(md5, 0x05, MD5_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_MDC2
+#endif
+#ifndef OPENSSL_NO_MDC2
 /* MDC-2 (2 5 8 3 101) */
 static const unsigned char digestinfo_mdc2_der[] = {
     ASN1_SEQUENCE, 0x0c + MDC2_DIGEST_LENGTH,
-      ASN1_SEQUENCE, 0x08,
-        ASN1_OID, 0x04, 2 * 40 + 5, 8, 3, 101,
-        ASN1_NULL, 0x00,
-      ASN1_OCTET_STRING, MDC2_DIGEST_LENGTH
+    ASN1_SEQUENCE, 0x08,
+    ASN1_OID, 0x04, 2 * 40 + 5, 8, 3, 101,
+    ASN1_NULL, 0x00,
+    ASN1_OCTET_STRING, MDC2_DIGEST_LENGTH
 };
-# endif
-# ifndef OPENSSL_NO_RMD160
+#endif
+#ifndef OPENSSL_NO_RMD160
 /* RIPEMD160 (1 3 36 3 2 1) */
 static const unsigned char digestinfo_ripemd160_der[] = {
     ASN1_SEQUENCE, 0x0d + RIPEMD160_DIGEST_LENGTH,
-      ASN1_SEQUENCE, 0x09,
-        ASN1_OID, 0x05, 1 * 40 + 3, 36, 3, 2, 1,
-        ASN1_NULL, 0x00,
-      ASN1_OCTET_STRING, RIPEMD160_DIGEST_LENGTH
+    ASN1_SEQUENCE, 0x09,
+    ASN1_OID, 0x05, 1 * 40 + 3, 36, 3, 2, 1,
+    ASN1_NULL, 0x00,
+    ASN1_OCTET_STRING, RIPEMD160_DIGEST_LENGTH
 };
-# endif
-# ifndef OPENSSL_NO_SM3
+#endif
+#ifndef OPENSSL_NO_SM3
 /* SM3 (1 2 156 10197 1 401) */
 static const unsigned char digestinfo_sm3_der[] = {
-    ASN1_SEQUENCE, 0x0f + SM3_DIGEST_LENGTH,
-      ASN1_SEQUENCE, 0x0c,
-        ASN1_OID, 0x08, 1 * 40 + 2, 0x81, 0x1c, 0xcf, 0x55, 1, 0x83, 0x78,
-        ASN1_NULL, 0x00,
-      ASN1_OCTET_STRING, SM3_DIGEST_LENGTH
+    ASN1_SEQUENCE, 0x10 + SM3_DIGEST_LENGTH,
+    ASN1_SEQUENCE, 0x0c,
+    ASN1_OID, 0x08, 1 * 40 + 2, 0x81, 0x1c, 0xcf, 0x55, 1, 0x83, 0x78,
+    ASN1_NULL, 0x00,
+    ASN1_OCTET_STRING, SM3_DIGEST_LENGTH
 };
-# endif
+#endif
 #endif /* FIPS_MODULE */
 
 /* SHA-1 (1 3 14 3 2 26) */
 static const unsigned char digestinfo_sha1_der[] = {
     ASN1_SEQUENCE, 0x0d + SHA_DIGEST_LENGTH,
-      ASN1_SEQUENCE, 0x09,
-        ASN1_OID, 0x05, 1 * 40 + 3, 14, 3, 2, 26,
-        ASN1_NULL, 0x00,
-      ASN1_OCTET_STRING, SHA_DIGEST_LENGTH
+    ASN1_SEQUENCE, 0x09,
+    ASN1_OID, 0x05, 1 * 40 + 3, 14, 3, 2, 26,
+    ASN1_NULL, 0x00,
+    ASN1_OCTET_STRING, SHA_DIGEST_LENGTH
 };
 
 ENCODE_DIGESTINFO_SHA(sha256, 0x01, SHA256_DIGEST_LENGTH)
@@ -158,93 +158,92 @@ ENCODE_DIGESTINFO_SHA(sha3_256, 0x08, SHA256_DIGEST_LENGTH)
 ENCODE_DIGESTINFO_SHA(sha3_384, 0x09, SHA384_DIGEST_LENGTH)
 ENCODE_DIGESTINFO_SHA(sha3_512, 0x0a, SHA512_DIGEST_LENGTH)
 
-#define MD_CASE(name)                                                          \
-    case NID_##name:                                                           \
-        *len = sizeof(digestinfo_##name##_der);                                \
+#define MD_CASE(name)                           \
+    case NID_##name:                            \
+        *len = sizeof(digestinfo_##name##_der); \
         return digestinfo_##name##_der;
 
 const unsigned char *ossl_rsa_digestinfo_encoding(int md_nid, size_t *len)
 {
     switch (md_nid) {
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_MDC2
-    MD_CASE(mdc2)
-# endif
-# ifndef OPENSSL_NO_MD2
-    MD_CASE(md2)
-# endif
-# ifndef OPENSSL_NO_MD4
-    MD_CASE(md4)
-# endif
-# ifndef OPENSSL_NO_MD5
-    MD_CASE(md5)
-# endif
-# ifndef OPENSSL_NO_RMD160
-    MD_CASE(ripemd160)
-# endif
-# ifndef OPENSSL_NO_SM3
-    MD_CASE(sm3)
-# endif
+#ifndef OPENSSL_NO_MDC2
+        MD_CASE(mdc2)
+#endif
+#ifndef OPENSSL_NO_MD2
+        MD_CASE(md2)
+#endif
+#ifndef OPENSSL_NO_MD4
+        MD_CASE(md4)
+#endif
+#ifndef OPENSSL_NO_MD5
+        MD_CASE(md5)
+#endif
+#ifndef OPENSSL_NO_RMD160
+        MD_CASE(ripemd160)
+#endif
+#ifndef OPENSSL_NO_SM3
+        MD_CASE(sm3)
+#endif
 #endif /* FIPS_MODULE */
-    MD_CASE(sha1)
-    MD_CASE(sha224)
-    MD_CASE(sha256)
-    MD_CASE(sha384)
-    MD_CASE(sha512)
-    MD_CASE(sha512_224)
-    MD_CASE(sha512_256)
-    MD_CASE(sha3_224)
-    MD_CASE(sha3_256)
-    MD_CASE(sha3_384)
-    MD_CASE(sha3_512)
+        MD_CASE(sha1)
+        MD_CASE(sha224)
+        MD_CASE(sha256)
+        MD_CASE(sha384)
+        MD_CASE(sha512)
+        MD_CASE(sha512_224)
+        MD_CASE(sha512_256)
+        MD_CASE(sha3_224)
+        MD_CASE(sha3_256)
+        MD_CASE(sha3_384)
+        MD_CASE(sha3_512)
     default:
         return NULL;
     }
 }
 
-#define MD_NID_CASE(name, sz)                                                  \
-    case NID_##name:                                                           \
+#define MD_NID_CASE(name, sz) \
+    case NID_##name:          \
         return sz;
 
 static int digest_sz_from_nid(int nid)
 {
     switch (nid) {
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_MDC2
-    MD_NID_CASE(mdc2, MDC2_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_MD2
-    MD_NID_CASE(md2, MD2_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_MD4
-    MD_NID_CASE(md4, MD4_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_MD5
-    MD_NID_CASE(md5, MD5_DIGEST_LENGTH)
-# endif
-# ifndef OPENSSL_NO_RMD160
-    MD_NID_CASE(ripemd160, RIPEMD160_DIGEST_LENGTH)
-# endif
+#ifndef OPENSSL_NO_MDC2
+        MD_NID_CASE(mdc2, MDC2_DIGEST_LENGTH)
+#endif
+#ifndef OPENSSL_NO_MD2
+        MD_NID_CASE(md2, MD2_DIGEST_LENGTH)
+#endif
+#ifndef OPENSSL_NO_MD4
+        MD_NID_CASE(md4, MD4_DIGEST_LENGTH)
+#endif
+#ifndef OPENSSL_NO_MD5
+        MD_NID_CASE(md5, MD5_DIGEST_LENGTH)
+#endif
+#ifndef OPENSSL_NO_RMD160
+        MD_NID_CASE(ripemd160, RIPEMD160_DIGEST_LENGTH)
+#endif
 #endif /* FIPS_MODULE */
-    MD_NID_CASE(sha1, SHA_DIGEST_LENGTH)
-    MD_NID_CASE(sha224, SHA224_DIGEST_LENGTH)
-    MD_NID_CASE(sha256, SHA256_DIGEST_LENGTH)
-    MD_NID_CASE(sha384, SHA384_DIGEST_LENGTH)
-    MD_NID_CASE(sha512, SHA512_DIGEST_LENGTH)
-    MD_NID_CASE(sha512_224, SHA224_DIGEST_LENGTH)
-    MD_NID_CASE(sha512_256, SHA256_DIGEST_LENGTH)
-    MD_NID_CASE(sha3_224, SHA224_DIGEST_LENGTH)
-    MD_NID_CASE(sha3_256, SHA256_DIGEST_LENGTH)
-    MD_NID_CASE(sha3_384, SHA384_DIGEST_LENGTH)
-    MD_NID_CASE(sha3_512, SHA512_DIGEST_LENGTH)
+        MD_NID_CASE(sha1, SHA_DIGEST_LENGTH)
+        MD_NID_CASE(sha224, SHA224_DIGEST_LENGTH)
+        MD_NID_CASE(sha256, SHA256_DIGEST_LENGTH)
+        MD_NID_CASE(sha384, SHA384_DIGEST_LENGTH)
+        MD_NID_CASE(sha512, SHA512_DIGEST_LENGTH)
+        MD_NID_CASE(sha512_224, SHA224_DIGEST_LENGTH)
+        MD_NID_CASE(sha512_256, SHA256_DIGEST_LENGTH)
+        MD_NID_CASE(sha3_224, SHA224_DIGEST_LENGTH)
+        MD_NID_CASE(sha3_256, SHA256_DIGEST_LENGTH)
+        MD_NID_CASE(sha3_384, SHA384_DIGEST_LENGTH)
+        MD_NID_CASE(sha3_512, SHA512_DIGEST_LENGTH)
     default:
         return 0;
     }
 }
 
-
 /* Size of an SSL signature: MD5+SHA1 */
-#define SSL_SIG_LENGTH  36
+#define SSL_SIG_LENGTH 36
 
 /*
  * Encodes a DigestInfo prefix of hash |type| and digest |m|, as
@@ -256,7 +255,7 @@ static int digest_sz_from_nid(int nid)
  * |*out| with OPENSSL_free(). Otherwise, it returns zero.
  */
 static int encode_pkcs1(unsigned char **out, size_t *out_len, int type,
-                        const unsigned char *m, size_t m_len)
+    const unsigned char *m, size_t m_len)
 {
     size_t di_prefix_len, dig_info_len;
     const unsigned char *di_prefix;
@@ -269,7 +268,7 @@ static int encode_pkcs1(unsigned char **out, size_t *out_len, int type,
     di_prefix = ossl_rsa_digestinfo_encoding(type, &di_prefix_len);
     if (di_prefix == NULL) {
         ERR_raise(ERR_LIB_RSA,
-                  RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD);
+            RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD);
         return 0;
     }
     dig_info_len = di_prefix_len + m_len;
@@ -285,7 +284,7 @@ static int encode_pkcs1(unsigned char **out, size_t *out_len, int type,
 }
 
 int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
-             unsigned char *sigret, unsigned int *siglen, RSA *rsa)
+    unsigned char *sigret, unsigned int *siglen, RSA *rsa)
 {
     int encrypt_len, ret = 0;
     size_t encoded_len = 0;
@@ -321,7 +320,7 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
         goto err;
     }
     encrypt_len = RSA_private_encrypt((int)encoded_len, encoded, sigret, rsa,
-                                      RSA_PKCS1_PADDING);
+        RSA_PKCS1_PADDING);
     if (encrypt_len <= 0)
         goto err;
 
@@ -343,8 +342,8 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
  * It returns one on successful verification or zero otherwise.
  */
 int ossl_rsa_verify(int type, 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 char *rm, size_t *prm_len,
+    const unsigned char *sigbuf, size_t siglen, RSA *rsa)
 {
     int len, ret = 0;
     size_t decrypt_len, encoded_len = 0;
@@ -361,7 +360,7 @@ int ossl_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
         goto err;
 
     len = RSA_public_decrypt((int)siglen, sigbuf, decrypt_buf, rsa,
-                             RSA_PKCS1_PADDING);
+        RSA_PKCS1_PADDING);
     if (len <= 0)
         goto err;
     decrypt_len = len;
@@ -393,7 +392,7 @@ int ossl_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
             }
         }
     } else if (type == NID_mdc2 && decrypt_len == 2 + 16
-               && decrypt_buf[0] == 0x04 && decrypt_buf[1] == 0x10) {
+        && decrypt_buf[0] == 0x04 && decrypt_buf[1] == 0x10) {
         /*
          * Oddball MDC2 case: signature can be OCTET STRING. check for correct
          * tag and length octets.
@@ -438,7 +437,7 @@ int ossl_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
             goto err;
 
         if (encoded_len != decrypt_len
-                || memcmp(encoded, decrypt_buf, encoded_len) != 0) {
+            || memcmp(encoded, decrypt_buf, encoded_len) != 0) {
             ERR_raise(ERR_LIB_RSA, RSA_R_BAD_SIGNATURE);
             goto err;
         }
@@ -459,7 +458,7 @@ int ossl_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
 }
 
 int RSA_verify(int type, const unsigned char *m, unsigned int m_len,
-               const unsigned char *sigbuf, unsigned int siglen, RSA *rsa)
+    const unsigned char *sigbuf, unsigned int siglen, RSA *rsa)
 {
 
     if (rsa->meth->rsa_verify != NULL)
diff --git a/crypto/rsa/rsa_sp800_56b_check.c b/crypto/rsa/rsa_sp800_56b_check.c
index b9aafdfe69d09..603398893397a 100644
--- a/crypto/rsa/rsa_sp800_56b_check.c
+++ b/crypto/rsa/rsa_sp800_56b_check.c
@@ -46,30 +46,30 @@ int ossl_rsa_check_crt_components(const RSA *rsa, BN_CTX *ctx)
         ret = 0;
     }
     ret = ret
-          /* p1 = p -1 */
-          && (BN_copy(p1, rsa->p) != NULL)
-          && BN_sub_word(p1, 1)
-          /* q1 = q - 1 */
-          && (BN_copy(q1, rsa->q) != NULL)
-          && BN_sub_word(q1, 1)
-          /* (a) 1 < dP < (p – 1). */
-          && (BN_cmp(rsa->dmp1, BN_value_one()) > 0)
-          && (BN_cmp(rsa->dmp1, p1) < 0)
-          /* (b) 1 < dQ < (q - 1). */
-          && (BN_cmp(rsa->dmq1, BN_value_one()) > 0)
-          && (BN_cmp(rsa->dmq1, q1) < 0)
-          /* (c) 1 < qInv < p */
-          && (BN_cmp(rsa->iqmp, BN_value_one()) > 0)
-          && (BN_cmp(rsa->iqmp, rsa->p) < 0)
-          /* (d) 1 = (dP . e) mod (p - 1)*/
-          && BN_mod_mul(r, rsa->dmp1, rsa->e, p1, ctx)
-          && BN_is_one(r)
-          /* (e) 1 = (dQ . e) mod (q - 1) */
-          && BN_mod_mul(r, rsa->dmq1, rsa->e, q1, ctx)
-          && BN_is_one(r)
-          /* (f) 1 = (qInv . q) mod p */
-          && BN_mod_mul(r, rsa->iqmp, rsa->q, rsa->p, ctx)
-          && BN_is_one(r);
+        /* p1 = p -1 */
+        && (BN_copy(p1, rsa->p) != NULL)
+        && BN_sub_word(p1, 1)
+        /* q1 = q - 1 */
+        && (BN_copy(q1, rsa->q) != NULL)
+        && BN_sub_word(q1, 1)
+        /* (a) 1 < dP < (p – 1). */
+        && (BN_cmp(rsa->dmp1, BN_value_one()) > 0)
+        && (BN_cmp(rsa->dmp1, p1) < 0)
+        /* (b) 1 < dQ < (q - 1). */
+        && (BN_cmp(rsa->dmq1, BN_value_one()) > 0)
+        && (BN_cmp(rsa->dmq1, q1) < 0)
+        /* (c) 1 < qInv < p */
+        && (BN_cmp(rsa->iqmp, BN_value_one()) > 0)
+        && (BN_cmp(rsa->iqmp, rsa->p) < 0)
+        /* (d) 1 = (dP . e) mod (p - 1)*/
+        && BN_mod_mul(r, rsa->dmp1, rsa->e, p1, ctx)
+        && BN_is_one(r)
+        /* (e) 1 = (dQ . e) mod (q - 1) */
+        && BN_mod_mul(r, rsa->dmq1, rsa->e, q1, ctx)
+        && BN_is_one(r)
+        /* (f) 1 = (qInv . q) mod p */
+        && BN_mod_mul(r, rsa->iqmp, rsa->q, rsa->p, ctx)
+        && BN_is_one(r);
     BN_clear(r);
     BN_clear(p1);
     BN_clear(q1);
@@ -140,8 +140,8 @@ int ossl_rsa_check_prime_factor(BIGNUM *p, BIGNUM *e, int nbits, BN_CTX *ctx)
 
     /* (Steps 5 a-b) prime test */
     if (BN_check_prime(p, ctx, NULL) != 1
-            /* (Step 5c) (√2)(2^(nbits/2 - 1) <= p <= 2^(nbits/2 - 1) */
-            || ossl_rsa_check_prime_factor_range(p, nbits, ctx) != 1)
+        /* (Step 5c) (√2)(2^(nbits/2 - 1) <= p <= 2^(nbits/2 - 1) */
+        || ossl_rsa_check_prime_factor_range(p, nbits, ctx) != 1)
         return 0;
 
     BN_CTX_start(ctx);
@@ -155,11 +155,11 @@ int ossl_rsa_check_prime_factor(BIGNUM *p, BIGNUM *e, int nbits, BN_CTX *ctx)
         ret = 0;
     }
     ret = ret
-          /* (Step 5d) GCD(p-1, e) = 1 */
-          && (BN_copy(p1, p) != NULL)
-          && BN_sub_word(p1, 1)
-          && BN_gcd(gcd, p1, e, ctx)
-          && BN_is_one(gcd);
+        /* (Step 5d) GCD(p-1, e) = 1 */
+        && (BN_copy(p1, p) != NULL)
+        && BN_sub_word(p1, 1)
+        && BN_gcd(gcd, p1, e, ctx)
+        && BN_is_one(gcd);
 
     BN_clear(p1);
     BN_CTX_end(ctx);
@@ -200,14 +200,15 @@ int ossl_rsa_check_private_exponent(const RSA *rsa, int nbits, BN_CTX *ctx)
         ret = 0;
     }
     ret = (ret
-          /* LCM(p - 1, q - 1) */
-          && (ossl_rsa_get_lcm(ctx, rsa->p, rsa->q, lcm, gcd, p1, q1,
-                               p1q1) == 1)
-          /* (Step 6a) d < LCM(p - 1, q - 1) */
-          && (BN_cmp(rsa->d, lcm) < 0)
-          /* (Step 6b) 1 = (e . d) mod LCM(p - 1, q - 1) */
-          && BN_mod_mul(r, rsa->e, rsa->d, lcm, ctx)
-          && BN_is_one(r));
+        /* LCM(p - 1, q - 1) */
+        && (ossl_rsa_get_lcm(ctx, rsa->p, rsa->q, lcm, gcd, p1, q1,
+                p1q1)
+            == 1)
+        /* (Step 6a) d < LCM(p - 1, q - 1) */
+        && (BN_cmp(rsa->d, lcm) < 0)
+        /* (Step 6b) 1 = (e . d) mod LCM(p - 1, q - 1) */
+        && BN_mod_mul(r, rsa->e, rsa->d, lcm, ctx)
+        && BN_is_one(r));
 
     BN_clear(r);
     BN_clear(p1);
@@ -240,7 +241,7 @@ int ossl_rsa_check_public_exponent(const BIGNUM *e)
  * i.e- numbits(p-q-1) > (nbits/2 -100)
  */
 int ossl_rsa_check_pminusq_diff(BIGNUM *diff, const BIGNUM *p, const BIGNUM *q,
-                           int nbits)
+    int nbits)
 {
     int bitlen = (nbits >> 1) - 100;
 
@@ -263,14 +264,14 @@ int ossl_rsa_check_pminusq_diff(BIGNUM *diff, const BIGNUM *p, const BIGNUM *q,
  * BN_FLG_CONSTTIME.
  */
 int ossl_rsa_get_lcm(BN_CTX *ctx, const BIGNUM *p, const BIGNUM *q,
-                     BIGNUM *lcm, BIGNUM *gcd, BIGNUM *p1, BIGNUM *q1,
-                     BIGNUM *p1q1)
+    BIGNUM *lcm, BIGNUM *gcd, BIGNUM *p1, BIGNUM *q1,
+    BIGNUM *p1q1)
 {
-    return BN_sub(p1, p, BN_value_one())    /* p-1 */
-           && BN_sub(q1, q, BN_value_one()) /* q-1 */
-           && BN_mul(p1q1, p1, q1, ctx)     /* (p-1)(q-1) */
-           && BN_gcd(gcd, p1, q1, ctx)
-           && BN_div(lcm, NULL, p1q1, gcd, ctx); /* LCM((p-1, q-1)) */
+    return BN_sub(p1, p, BN_value_one()) /* p-1 */
+        && BN_sub(q1, q, BN_value_one()) /* q-1 */
+        && BN_mul(p1q1, p1, q1, ctx) /* (p-1)(q-1) */
+        && BN_gcd(gcd, p1, q1, ctx)
+        && BN_div(lcm, NULL, p1q1, gcd, ctx); /* LCM((p-1, q-1)) */
 }
 
 /*
@@ -334,9 +335,7 @@ int ossl_rsa_sp800_56b_check_public(const RSA *rsa)
 #ifdef FIPS_MODULE
     if (ret != 1 || status != BN_PRIMETEST_COMPOSITE_NOT_POWER_OF_PRIME) {
 #else
-    if (ret != 1 || (status != BN_PRIMETEST_COMPOSITE_NOT_POWER_OF_PRIME
-                     && (nbits >= RSA_MIN_MODULUS_BITS
-                         || status != BN_PRIMETEST_COMPOSITE_WITH_FACTOR))) {
+    if (ret != 1 || (status != BN_PRIMETEST_COMPOSITE_NOT_POWER_OF_PRIME && (nbits >= RSA_MIN_MODULUS_BITS || status != BN_PRIMETEST_COMPOSITE_WITH_FACTOR))) {
 #endif
         ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_MODULUS);
         ret = 0;
@@ -372,17 +371,17 @@ int ossl_rsa_sp800_56b_check_private(const RSA *rsa)
  *     6.4.1.3.3 "rsakpv2 - crt"
  */
 int ossl_rsa_sp800_56b_check_keypair(const RSA *rsa, const BIGNUM *efixed,
-                                     int strength, int nbits)
+    int strength, int nbits)
 {
     int ret = 0;
     BN_CTX *ctx = NULL;
     BIGNUM *r = NULL;
 
     if (rsa->p == NULL
-            || rsa->q == NULL
-            || rsa->e == NULL
-            || rsa->d == NULL
-            || rsa->n == NULL) {
+        || rsa->q == NULL
+        || rsa->e == NULL
+        || rsa->d == NULL
+        || rsa->n == NULL) {
         ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_REQUEST);
         return 0;
     }
@@ -431,12 +430,12 @@ int ossl_rsa_sp800_56b_check_keypair(const RSA *rsa, const BIGNUM *efixed,
 
     /* (Step 5): check prime factors p & q */
     ret = ossl_rsa_check_prime_factor(rsa->p, rsa->e, nbits, ctx)
-          && ossl_rsa_check_prime_factor(rsa->q, rsa->e, nbits, ctx)
-          && (ossl_rsa_check_pminusq_diff(r, rsa->p, rsa->q, nbits) > 0)
-          /* (Step 6): Check the private exponent d */
-          && ossl_rsa_check_private_exponent(rsa, nbits, ctx)
-          /* 6.4.1.2.3 (Step 7): Check the CRT components */
-          && ossl_rsa_check_crt_components(rsa, ctx);
+        && ossl_rsa_check_prime_factor(rsa->q, rsa->e, nbits, ctx)
+        && (ossl_rsa_check_pminusq_diff(r, rsa->p, rsa->q, nbits) > 0)
+        /* (Step 6): Check the private exponent d */
+        && ossl_rsa_check_private_exponent(rsa, nbits, ctx)
+        /* 6.4.1.2.3 (Step 7): Check the CRT components */
+        && ossl_rsa_check_crt_components(rsa, ctx);
     if (ret != 1)
         ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_KEYPAIR);
 
diff --git a/crypto/rsa/rsa_sp800_56b_gen.c b/crypto/rsa/rsa_sp800_56b_gen.c
index c741cf3c3b0cf..ec80136e2e359 100644
--- a/crypto/rsa/rsa_sp800_56b_gen.c
+++ b/crypto/rsa/rsa_sp800_56b_gen.c
@@ -53,8 +53,8 @@
  *     (Required for CAVS testing).
  */
 int ossl_rsa_fips186_4_gen_prob_primes(RSA *rsa, RSA_ACVP_TEST *test,
-                                       int nbits, const BIGNUM *e, BN_CTX *ctx,
-                                       BN_GENCB *cb)
+    int nbits, const BIGNUM *e, BN_CTX *ctx,
+    BN_GENCB *cb)
 {
     int ret = 0, ok;
     /* Temp allocated BIGNUMS */
@@ -120,12 +120,12 @@ int ossl_rsa_fips186_4_gen_prob_primes(RSA *rsa, RSA_ACVP_TEST *test,
 
     /* (Step 4) Generate p, Xp */
     if (!ossl_bn_rsa_fips186_4_gen_prob_primes(rsa->p, Xpo, p1, p2, Xp, Xp1, Xp2,
-                                               nbits, e, ctx, cb))
+            nbits, e, ctx, cb))
         goto err;
     for (;;) {
         /* (Step 5) Generate q, Xq*/
         if (!ossl_bn_rsa_fips186_4_gen_prob_primes(rsa->q, Xqo, q1, q2, Xq, Xq1,
-                                                   Xq2, nbits, e, ctx, cb))
+                Xq2, nbits, e, ctx, cb))
             goto err;
 
         /* (Step 6) |Xp - Xq| > 2^(nbitlen/2 - 100) */
@@ -203,7 +203,7 @@ static int rsa_validate_rng_strength(EVP_RAND_CTX *rng, int nbits)
      */
     if (EVP_RAND_get_strength(rng) < ossl_ifc_ffc_compute_security_bits(nbits)) {
         ERR_raise(ERR_LIB_RSA,
-                  RSA_R_RANDOMNESS_SOURCE_STRENGTH_INSUFFICIENT);
+            RSA_R_RANDOMNESS_SOURCE_STRENGTH_INSUFFICIENT);
         return 0;
     }
 #endif
@@ -235,7 +235,7 @@ static int rsa_validate_rng_strength(EVP_RAND_CTX *rng, int nbits)
  * already set in the RSA key and do not need to be recalculated.
  */
 int ossl_rsa_sp800_56b_derive_params_from_pq(RSA *rsa, int nbits,
-                                             const BIGNUM *e, BN_CTX *ctx)
+    const BIGNUM *e, BN_CTX *ctx)
 {
     int ret = -1;
     BIGNUM *p1, *q1, *lcm, *p1q1, *gcd;
@@ -363,7 +363,7 @@ int ossl_rsa_sp800_56b_derive_params_from_pq(RSA *rsa, int nbits,
  * Returns: 1 if successfully generated otherwise it returns 0.
  */
 int ossl_rsa_sp800_56b_generate_key(RSA *rsa, int nbits, const BIGNUM *efixed,
-                                    BN_GENCB *cb)
+    BN_GENCB *cb)
 {
     int ret = 0;
     int ok;
@@ -381,7 +381,7 @@ int ossl_rsa_sp800_56b_generate_key(RSA *rsa, int nbits, const BIGNUM *efixed,
         return 0;
 
     /* Check that the RNG is capable of generating a key this large */
-   if (!rsa_validate_rng_strength(RAND_get0_private(rsa->libctx), nbits))
+    if (!rsa_validate_rng_strength(RAND_get0_private(rsa->libctx), nbits))
         return 0;
 
     ctx = BN_CTX_new_ex(rsa->libctx);
@@ -447,9 +447,9 @@ int ossl_rsa_sp800_56b_pairwise_test(RSA *rsa, BN_CTX *ctx)
     BN_set_flags(k, BN_FLG_CONSTTIME);
 
     ret = (BN_set_word(k, 2)
-           && BN_mod_exp(tmp, k, rsa->e, rsa->n, ctx)
-           && BN_mod_exp(tmp, tmp, rsa->d, rsa->n, ctx)
-           && BN_cmp(k, tmp) == 0);
+        && BN_mod_exp(tmp, k, rsa->e, rsa->n, ctx)
+        && BN_mod_exp(tmp, tmp, rsa->d, rsa->n, ctx)
+        && BN_cmp(k, tmp) == 0);
     if (ret == 0)
         ERR_raise(ERR_LIB_RSA, RSA_R_PAIRWISE_TEST_FAILURE);
 err:
diff --git a/crypto/rsa/rsa_x931.c b/crypto/rsa/rsa_x931.c
index f84ea9815c8c5..3c8f1364eae8c 100644
--- a/crypto/rsa/rsa_x931.c
+++ b/crypto/rsa/rsa_x931.c
@@ -41,7 +41,7 @@
  *     flen The size of the input hash + 1 (trailer byte)
  */
 int RSA_padding_add_X931(unsigned char *to, int tlen,
-                         const unsigned char *from, int flen)
+    const unsigned char *from, int flen)
 {
     int j;
     unsigned char *p;
@@ -77,7 +77,7 @@ int RSA_padding_add_X931(unsigned char *to, int tlen,
 }
 
 int RSA_padding_check_X931(unsigned char *to, int tlen,
-                           const unsigned char *from, int flen, int num)
+    const unsigned char *from, int flen, int num)
 {
     int i = 0, j;
     const unsigned char *p;
@@ -142,7 +142,6 @@ int RSA_X931_hash_id(int nid)
 
     case NID_sha512:
         return 0x35;
-
     }
     return -1;
 }
diff --git a/crypto/rsa/rsa_x931g.c b/crypto/rsa/rsa_x931g.c
index 290e95b468544..e706722fc2936 100644
--- a/crypto/rsa/rsa_x931g.c
+++ b/crypto/rsa/rsa_x931g.c
@@ -23,9 +23,9 @@
 /* X9.31 RSA key derivation and generation */
 
 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 *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 *r0 = NULL, *r1 = NULL, *r2 = NULL, *r3 = NULL;
     BN_CTX *ctx = NULL, *ctx2 = NULL;
@@ -65,7 +65,7 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
             goto err;
 
         if (!BN_X931_derive_prime_ex(rsa->p, p1, p2,
-                                     Xp, Xp1, Xp2, e, ctx, cb))
+                Xp, Xp1, Xp2, e, ctx, cb))
             goto err;
     }
 
@@ -74,7 +74,7 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
         if (rsa->q == NULL)
             goto err;
         if (!BN_X931_derive_prime_ex(rsa->q, q1, q2,
-                                     Xq, Xq1, Xq2, e, ctx, cb))
+                Xq, Xq1, Xq2, e, ctx, cb))
             goto err;
     }
 
@@ -98,17 +98,17 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
 
     /* calculate d */
     if (!BN_sub(r1, rsa->p, BN_value_one()))
-        goto err;               /* p-1 */
+        goto err; /* p-1 */
     if (!BN_sub(r2, rsa->q, BN_value_one()))
-        goto err;               /* q-1 */
+        goto err; /* q-1 */
     if (!BN_mul(r0, r1, r2, ctx))
-        goto err;               /* (p-1)(q-1) */
+        goto err; /* (p-1)(q-1) */
 
     if (!BN_gcd(r3, r1, r2, ctx))
         goto err;
 
     if (!BN_div(r0, NULL, r0, r3, ctx))
-        goto err;               /* LCM((p-1)(q-1)) */
+        goto err; /* LCM((p-1)(q-1)) */
 
     ctx2 = BN_CTX_new();
     if (ctx2 == NULL)
@@ -139,7 +139,7 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
 
     rsa->dirty_cnt++;
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     BN_CTX_free(ctx2);
@@ -148,7 +148,7 @@ int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1,
 }
 
 int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e,
-                             BN_GENCB *cb)
+    BN_GENCB *cb)
 {
     int ok = 0;
     BIGNUM *Xp = NULL, *Xq = NULL;
@@ -174,11 +174,11 @@ int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e,
     /* Generate two primes from Xp, Xq */
 
     if (!BN_X931_generate_prime_ex(rsa->p, NULL, NULL, NULL, NULL, Xp,
-                                   e, ctx, cb))
+            e, ctx, cb))
         goto error;
 
     if (!BN_X931_generate_prime_ex(rsa->q, NULL, NULL, NULL, NULL, Xq,
-                                   e, ctx, cb))
+            e, ctx, cb))
         goto error;
 
     /*
@@ -187,13 +187,13 @@ int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e,
      */
 
     if (!RSA_X931_derive_ex(rsa, NULL, NULL, NULL, NULL,
-                            NULL, NULL, NULL, NULL, NULL, NULL, e, cb))
+            NULL, NULL, NULL, NULL, NULL, NULL, e, cb))
         goto error;
 
     rsa->dirty_cnt++;
     ok = 1;
 
- error:
+error:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
 
@@ -201,5 +201,4 @@ int RSA_X931_generate_key_ex(RSA *rsa, int bits, const BIGNUM *e,
         return 1;
 
     return 0;
-
 }
diff --git a/crypto/s390x_arch.h b/crypto/s390x_arch.h
index e8830b7eedc58..c3a805b3594a4 100644
--- a/crypto/s390x_arch.h
+++ b/crypto/s390x_arch.h
@@ -8,49 +8,49 @@
  */
 
 #ifndef OSSL_CRYPTO_S390X_ARCH_H
-# define OSSL_CRYPTO_S390X_ARCH_H
+#define OSSL_CRYPTO_S390X_ARCH_H
 
-# ifndef __ASSEMBLER__
+#ifndef __ASSEMBLER__
 
 #include "crypto/bn.h"
 
 void s390x_kimd(const unsigned char *in, size_t len, unsigned int fc,
-                void *param);
+    void *param);
 void s390x_klmd(const unsigned char *in, size_t inlen, unsigned char *out,
-                size_t outlen, unsigned int fc, void *param);
+    size_t outlen, unsigned int fc, void *param);
 void s390x_km(const unsigned char *in, size_t len, unsigned char *out,
-              unsigned int fc, void *param);
+    unsigned int fc, void *param);
 void s390x_kmac(const unsigned char *in, size_t len, unsigned int fc,
-                void *param);
+    void *param);
 void s390x_kmo(const unsigned char *in, size_t len, unsigned char *out,
-               unsigned int fc, void *param);
+    unsigned int fc, void *param);
 void s390x_kmf(const unsigned char *in, size_t len, unsigned char *out,
-               unsigned int fc, void *param);
+    unsigned int fc, void *param);
 void s390x_kma(const unsigned char *aad, size_t alen, const unsigned char *in,
-               size_t len, unsigned char *out, unsigned int fc, void *param);
+    size_t len, unsigned char *out, unsigned int fc, void *param);
 int s390x_pcc(unsigned int fc, void *param);
 int s390x_kdsa(unsigned int fc, void *param, const unsigned char *in,
-               size_t len);
+    size_t len);
 
 void s390x_flip_endian32(unsigned char dst[32], const unsigned char src[32]);
 void s390x_flip_endian64(unsigned char dst[64], const unsigned char src[64]);
 
 int s390x_x25519_mul(unsigned char u_dst[32],
-                     const unsigned char u_src[32],
-                     const unsigned char d_src[32]);
+    const unsigned char u_src[32],
+    const unsigned char d_src[32]);
 int s390x_x448_mul(unsigned char u_dst[56],
-                   const unsigned char u_src[56],
-                   const unsigned char d_src[56]);
+    const unsigned char u_src[56],
+    const unsigned char d_src[56]);
 int s390x_ed25519_mul(unsigned char x_dst[32],
-                      unsigned char y_dst[32],
-                      const unsigned char x_src[32],
-                      const unsigned char y_src[32],
-                      const unsigned char d_src[32]);
+    unsigned char y_dst[32],
+    const unsigned char x_src[32],
+    const unsigned char y_src[32],
+    const unsigned char d_src[32]);
 int s390x_ed448_mul(unsigned char x_dst[57],
-                    unsigned char y_dst[57],
-                    const unsigned char x_src[57],
-                    const unsigned char y_src[57],
-                    const unsigned char d_src[57]);
+    unsigned char y_dst[57],
+    const unsigned char x_src[57],
+    const unsigned char y_src[57],
+    const unsigned char d_src[57]);
 
 /*
  * The field elements of OPENSSL_s390xcap_P are the 64-bit words returned by
@@ -74,133 +74,133 @@ struct OPENSSL_s390xcap_st {
     unsigned long long kdsa[2];
 };
 
-#  if defined(__GNUC__) && defined(__linux)
+#if defined(__GNUC__) && defined(__linux)
 __attribute__((visibility("hidden")))
-#  endif
+#endif
 extern struct OPENSSL_s390xcap_st OPENSSL_s390xcap_P;
 
-#  ifdef S390X_MOD_EXP
-#   if defined(__GNUC__) && defined(__linux)
+#ifdef S390X_MOD_EXP
+#if defined(__GNUC__) && defined(__linux)
 __attribute__((visibility("hidden")))
-#   endif
+#endif
 extern int OPENSSL_s390xcex;
-#   if defined(__GNUC__) && defined(__linux)
+#if defined(__GNUC__) && defined(__linux)
 __attribute__((visibility("hidden")))
-#   endif
+#endif
 extern int OPENSSL_s390xcex_nodev;
-#  endif
+#endif
 
 /* Max number of 64-bit words currently returned by STFLE */
-#  define S390X_STFLE_MAX       3
+#define S390X_STFLE_MAX 3
 
 /* convert facility bit number or function code to bit mask */
-#  define S390X_CAPBIT(i)       (1ULL << (63 - (i) % 64))
+#define S390X_CAPBIT(i) (1ULL << (63 - (i) % 64))
 
-# endif
+#endif
 
 /* OPENSSL_s390xcap_P offsets [bytes] */
-# define S390X_STFLE            0x00
-# define S390X_KIMD             0x20
-# define S390X_KLMD             0x30
-# define S390X_KM               0x40
-# define S390X_KMC              0x50
-# define S390X_KMAC             0x60
-# define S390X_KMCTR            0x70
-# define S390X_KMO              0x80
-# define S390X_KMF              0x90
-# define S390X_PRNO             0xa0
-# define S390X_KMA              0xb0
-# define S390X_PCC              0xc0
-# define S390X_KDSA             0xd0
+#define S390X_STFLE 0x00
+#define S390X_KIMD 0x20
+#define S390X_KLMD 0x30
+#define S390X_KM 0x40
+#define S390X_KMC 0x50
+#define S390X_KMAC 0x60
+#define S390X_KMCTR 0x70
+#define S390X_KMO 0x80
+#define S390X_KMF 0x90
+#define S390X_PRNO 0xa0
+#define S390X_KMA 0xb0
+#define S390X_PCC 0xc0
+#define S390X_KDSA 0xd0
 
 /* Facility Bit Numbers */
-# define S390X_MSA              17      /* message-security-assist */
-# define S390X_STCKF            25      /* store-clock-fast */
-# define S390X_MSA5             57      /* message-security-assist-ext. 5 */
-# define S390X_MSA3             76      /* message-security-assist-ext. 3 */
-# define S390X_MSA4             77      /* message-security-assist-ext. 4 */
-# define S390X_MSA12            86      /* message-security-assist-ext. 12 */
-# define S390X_VX               129     /* vector */
-# define S390X_VXD              134     /* vector packed decimal */
-# define S390X_VXE              135     /* vector enhancements 1 */
-# define S390X_MSA8             146     /* message-security-assist-ext. 8 */
-# define S390X_MSA9             155     /* message-security-assist-ext. 9 */
+#define S390X_MSA 17 /* message-security-assist */
+#define S390X_STCKF 25 /* store-clock-fast */
+#define S390X_MSA5 57 /* message-security-assist-ext. 5 */
+#define S390X_MSA3 76 /* message-security-assist-ext. 3 */
+#define S390X_MSA4 77 /* message-security-assist-ext. 4 */
+#define S390X_MSA12 86 /* message-security-assist-ext. 12 */
+#define S390X_VX 129 /* vector */
+#define S390X_VXD 134 /* vector packed decimal */
+#define S390X_VXE 135 /* vector enhancements 1 */
+#define S390X_MSA8 146 /* message-security-assist-ext. 8 */
+#define S390X_MSA9 155 /* message-security-assist-ext. 9 */
 
 /* Function Codes */
 
 /* all instructions */
-# define S390X_QUERY            0
+#define S390X_QUERY 0
 
 /* kimd/klmd */
-# define S390X_SHA_1            1
-# define S390X_SHA_256          2
-# define S390X_SHA_512          3
-# define S390X_SHA3_224         32
-# define S390X_SHA3_256         33
-# define S390X_SHA3_384         34
-# define S390X_SHA3_512         35
-# define S390X_KECCAK_224       32
-# define S390X_KECCAK_256       33
-# define S390X_KECCAK_384       34
-# define S390X_KECCAK_512       35
-# define S390X_SHAKE_128        36
-# define S390X_SHAKE_256        37
-# define S390X_GHASH            65
+#define S390X_SHA_1 1
+#define S390X_SHA_256 2
+#define S390X_SHA_512 3
+#define S390X_SHA3_224 32
+#define S390X_SHA3_256 33
+#define S390X_SHA3_384 34
+#define S390X_SHA3_512 35
+#define S390X_KECCAK_224 32
+#define S390X_KECCAK_256 33
+#define S390X_KECCAK_384 34
+#define S390X_KECCAK_512 35
+#define S390X_SHAKE_128 36
+#define S390X_SHAKE_256 37
+#define S390X_GHASH 65
 
 /* km/kmc/kmac/kmctr/kmo/kmf/kma */
-# define S390X_AES_128          18
-# define S390X_AES_192          19
-# define S390X_AES_256          20
+#define S390X_AES_128 18
+#define S390X_AES_192 19
+#define S390X_AES_256 20
 
 /* km */
-# define S390X_XTS_AES_128      50
-# define S390X_XTS_AES_256      52
-# define S390X_XTS_AES_128_MSA10 82
-# define S390X_XTS_AES_256_MSA10 84
+#define S390X_XTS_AES_128 50
+#define S390X_XTS_AES_256 52
+#define S390X_XTS_AES_128_MSA10 82
+#define S390X_XTS_AES_256_MSA10 84
 
 /* kmac */
-# define S390X_HMAC_SHA_224     112
-# define S390X_HMAC_SHA_256     113
-# define S390X_HMAC_SHA_384     114
-# define S390X_HMAC_SHA_512     115
+#define S390X_HMAC_SHA_224 112
+#define S390X_HMAC_SHA_256 113
+#define S390X_HMAC_SHA_384 114
+#define S390X_HMAC_SHA_512 115
 
 /* prno */
-# define S390X_SHA_512_DRNG     3
-# define S390X_TRNG             114
+#define S390X_SHA_512_DRNG 3
+#define S390X_TRNG 114
 
 /* pcc */
-# define S390X_SCALAR_MULTIPLY_P256     64
-# define S390X_SCALAR_MULTIPLY_P384     65
-# define S390X_SCALAR_MULTIPLY_P521     66
-# define S390X_SCALAR_MULTIPLY_ED25519  72
-# define S390X_SCALAR_MULTIPLY_ED448    73
-# define S390X_SCALAR_MULTIPLY_X25519   80
-# define S390X_SCALAR_MULTIPLY_X448     81
+#define S390X_SCALAR_MULTIPLY_P256 64
+#define S390X_SCALAR_MULTIPLY_P384 65
+#define S390X_SCALAR_MULTIPLY_P521 66
+#define S390X_SCALAR_MULTIPLY_ED25519 72
+#define S390X_SCALAR_MULTIPLY_ED448 73
+#define S390X_SCALAR_MULTIPLY_X25519 80
+#define S390X_SCALAR_MULTIPLY_X448 81
 
 /* kdsa */
-# define S390X_ECDSA_VERIFY_P256        1
-# define S390X_ECDSA_VERIFY_P384        2
-# define S390X_ECDSA_VERIFY_P521        3
-# define S390X_ECDSA_SIGN_P256          9
-# define S390X_ECDSA_SIGN_P384          10
-# define S390X_ECDSA_SIGN_P521          11
-# define S390X_EDDSA_VERIFY_ED25519     32
-# define S390X_EDDSA_VERIFY_ED448       36
-# define S390X_EDDSA_SIGN_ED25519       40
-# define S390X_EDDSA_SIGN_ED448         44
+#define S390X_ECDSA_VERIFY_P256 1
+#define S390X_ECDSA_VERIFY_P384 2
+#define S390X_ECDSA_VERIFY_P521 3
+#define S390X_ECDSA_SIGN_P256 9
+#define S390X_ECDSA_SIGN_P384 10
+#define S390X_ECDSA_SIGN_P521 11
+#define S390X_EDDSA_VERIFY_ED25519 32
+#define S390X_EDDSA_VERIFY_ED448 36
+#define S390X_EDDSA_SIGN_ED25519 40
+#define S390X_EDDSA_SIGN_ED448 44
 
 /* Register 0 Flags */
-# define S390X_DECRYPT          0x80
-# define S390X_KMA_LPC          0x100
-# define S390X_KMA_LAAD         0x200
-# define S390X_KMA_HS           0x400
-# define S390X_KDSA_D           0x80
-# define S390X_KIMD_NIP         0x8000
-# define S390X_KLMD_DUFOP       0x4000
-# define S390X_KLMD_NIP         0x8000
-# define S390X_KLMD_PS          0x100
-# define S390X_KMAC_IKP         0x8000
-# define S390X_KMAC_IIMP        0x4000
-# define S390X_KMAC_CCUP        0x2000
+#define S390X_DECRYPT 0x80
+#define S390X_KMA_LPC 0x100
+#define S390X_KMA_LAAD 0x200
+#define S390X_KMA_HS 0x400
+#define S390X_KDSA_D 0x80
+#define S390X_KIMD_NIP 0x8000
+#define S390X_KLMD_DUFOP 0x4000
+#define S390X_KLMD_NIP 0x8000
+#define S390X_KLMD_PS 0x100
+#define S390X_KMAC_IKP 0x8000
+#define S390X_KMAC_IIMP 0x4000
+#define S390X_KMAC_CCUP 0x2000
 
 #endif
diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c
index 82b2654fb5948..9498f6c734c88 100644
--- a/crypto/s390xcap.c
+++ b/crypto/s390xcap.c
@@ -17,52 +17,56 @@
 #include "s390x_arch.h"
 
 #if defined(OPENSSL_SYS_LINUX) && !defined(FIPS_MODULE)
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <fcntl.h>
-# include <asm/zcrypt.h>
-# include <sys/ioctl.h>
-# include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <asm/zcrypt.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
 #endif
 
 #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-# if __GLIBC_PREREQ(2, 16)
-#  include <sys/auxv.h>
-#  if defined(HWCAP_S390_STFLE) && defined(HWCAP_S390_VX)
-#   define OSSL_IMPLEMENT_GETAUXVAL
-#  endif
-# endif
+#if __GLIBC_PREREQ(2, 16)
+#include <sys/auxv.h>
+#if defined(HWCAP_S390_STFLE) && defined(HWCAP_S390_VX)
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
+#endif
 #endif
 
-#define LEN     128
+#define LEN 128
 #define STR_(S) #S
-#define STR(S)  STR_(S)
-
-#define TOK_FUNC(NAME)                                                  \
-    (sscanf(tok_begin,                                                  \
-            " " STR(NAME) " : %" STR(LEN) "[^:] : "                     \
-            "%" STR(LEN) "s %" STR(LEN) "s ",                           \
-            tok[0], tok[1], tok[2]) == 2) {                             \
-                                                                        \
-        off = (tok[0][0] == '~') ? 1 : 0;                               \
-        if (sscanf(tok[0] + off, "%llx", &cap->NAME[0]) != 1)           \
-            goto ret;                                                   \
-        if (off)                                                        \
-            cap->NAME[0] = ~cap->NAME[0];                               \
-                                                                        \
-        off = (tok[1][0] == '~') ? 1 : 0;                               \
-        if (sscanf(tok[1] + off, "%llx", &cap->NAME[1]) != 1)           \
-            goto ret;                                                   \
-        if (off)                                                        \
-            cap->NAME[1] = ~cap->NAME[1];                               \
+#define STR(S) STR_(S)
+
+#define TOK_FUNC(NAME)                                                   \
+    (sscanf(tok_begin,                                                   \
+         " " STR(NAME) " : %" STR(LEN) "[^:] : "                         \
+                                       "%" STR(LEN) "s %" STR(LEN) "s ", \
+         tok[0], tok[1], tok[2])                                         \
+        == 2)                                                            \
+    {                                                                    \
+                                                                         \
+        off = (tok[0][0] == '~') ? 1 : 0;                                \
+        if (sscanf(tok[0] + off, "%llx", &cap->NAME[0]) != 1)            \
+            goto ret;                                                    \
+        if (off)                                                         \
+            cap->NAME[0] = ~cap->NAME[0];                                \
+                                                                         \
+        off = (tok[1][0] == '~') ? 1 : 0;                                \
+        if (sscanf(tok[1] + off, "%llx", &cap->NAME[1]) != 1)            \
+            goto ret;                                                    \
+        if (off)                                                         \
+            cap->NAME[1] = ~cap->NAME[1];                                \
     }
 
-#define TOK_CPU_ALIAS(NAME, STRUCT_NAME)                                \
-    (sscanf(tok_begin,                                                  \
-            " %" STR(LEN) "s %" STR(LEN) "s ",                          \
-            tok[0], tok[1]) == 1                                        \
-     && !strcmp(tok[0], #NAME)) {                                       \
-            memcpy(cap, &STRUCT_NAME, sizeof(*cap));                    \
+#define TOK_CPU_ALIAS(NAME, STRUCT_NAME)         \
+    (sscanf(tok_begin,                           \
+         " %" STR(LEN) "s %" STR(LEN) "s ",      \
+         tok[0], tok[1])                         \
+            == 1                                 \
+        && !strcmp(tok[0], #NAME))               \
+    {                                            \
+        memcpy(cap, &STRUCT_NAME, sizeof(*cap)); \
     }
 
 #define TOK_CPU(NAME) TOK_CPU_ALIAS(NAME, NAME)
@@ -90,12 +94,12 @@ int OPENSSL_s390xcex;
 int OPENSSL_s390xcex_nodev;
 
 #if defined(__GNUC__)
-__attribute__ ((visibility("hidden")))
+__attribute__((visibility("hidden")))
 #endif
 void OPENSSL_s390x_cleanup(void);
 
 #if defined(__GNUC__)
-__attribute__ ((visibility("hidden")))
+__attribute__((visibility("hidden")))
 #endif
 void OPENSSL_s390x_cleanup(void)
 {
@@ -107,7 +111,7 @@ void OPENSSL_s390x_cleanup(void)
 #endif
 
 #if defined(__GNUC__) && defined(__linux)
-__attribute__ ((visibility("hidden")))
+__attribute__((visibility("hidden")))
 #endif
 void OPENSSL_cpuid_setup(void)
 {
@@ -131,8 +135,8 @@ void OPENSSL_cpuid_setup(void)
         /* protection against disabled vector facility */
         if (!(hwcap & HWCAP_S390_VX)) {
             OPENSSL_s390xcap_P.stfle[2] &= ~(S390X_CAPBIT(S390X_VX)
-                                             | S390X_CAPBIT(S390X_VXD)
-                                             | S390X_CAPBIT(S390X_VXE));
+                | S390X_CAPBIT(S390X_VXD)
+                | S390X_CAPBIT(S390X_VXE));
         }
     }
 #else
@@ -161,8 +165,8 @@ void OPENSSL_cpuid_setup(void)
             OPENSSL_vx_probe();
         } else {
             OPENSSL_s390xcap_P.stfle[2] &= ~(S390X_CAPBIT(S390X_VX)
-                                             | S390X_CAPBIT(S390X_VXD)
-                                             | S390X_CAPBIT(S390X_VXE));
+                | S390X_CAPBIT(S390X_VXD)
+                | S390X_CAPBIT(S390X_VXE));
         }
 
         sigaction(SIGFPE, &oact_fpe, NULL);
@@ -235,19 +239,19 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
      * Facility detection would fail on real hw (no STFLE).
      */
     static const struct OPENSSL_s390xcap_st z900 = {
-        /*.stfle  = */{0ULL, 0ULL, 0ULL, 0ULL},
-        /*.kimd   = */{0ULL, 0ULL},
-        /*.klmd   = */{0ULL, 0ULL},
-        /*.km     = */{0ULL, 0ULL},
-        /*.kmc    = */{0ULL, 0ULL},
-        /*.kmac   = */{0ULL, 0ULL},
-        /*.kmctr  = */{0ULL, 0ULL},
-        /*.kmo    = */{0ULL, 0ULL},
-        /*.kmf    = */{0ULL, 0ULL},
-        /*.prno   = */{0ULL, 0ULL},
-        /*.kma    = */{0ULL, 0ULL},
-        /*.pcc    = */{0ULL, 0ULL},
-        /*.kdsa   = */{0ULL, 0ULL},
+        /*.stfle  = */ { 0ULL, 0ULL, 0ULL, 0ULL },
+        /*.kimd   = */ { 0ULL, 0ULL },
+        /*.klmd   = */ { 0ULL, 0ULL },
+        /*.km     = */ { 0ULL, 0ULL },
+        /*.kmc    = */ { 0ULL, 0ULL },
+        /*.kmac   = */ { 0ULL, 0ULL },
+        /*.kmctr  = */ { 0ULL, 0ULL },
+        /*.kmo    = */ { 0ULL, 0ULL },
+        /*.kmf    = */ { 0ULL, 0ULL },
+        /*.prno   = */ { 0ULL, 0ULL },
+        /*.kma    = */ { 0ULL, 0ULL },
+        /*.pcc    = */ { 0ULL, 0ULL },
+        /*.kdsa   = */ { 0ULL, 0ULL },
     };
 
     /*-
@@ -255,27 +259,20 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
      * Implements MSA. Facility detection would fail on real hw (no STFLE).
      */
     static const struct OPENSSL_s390xcap_st z990 = {
-        /*.stfle  = */{S390X_CAPBIT(S390X_MSA),
-                       0ULL, 0ULL, 0ULL},
-        /*.kimd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1),
-                       0ULL},
-        /*.klmd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1),
-                       0ULL},
-        /*.km     = */{S390X_CAPBIT(S390X_QUERY),
-                       0ULL},
-        /*.kmc    = */{S390X_CAPBIT(S390X_QUERY),
-                       0ULL},
-        /*.kmac   = */{S390X_CAPBIT(S390X_QUERY),
-                       0ULL},
-        /*.kmctr  = */{0ULL, 0ULL},
-        /*.kmo    = */{0ULL, 0ULL},
-        /*.kmf    = */{0ULL, 0ULL},
-        /*.prno   = */{0ULL, 0ULL},
-        /*.kma    = */{0ULL, 0ULL},
-        /*.pcc    = */{0ULL, 0ULL},
-        /*.kdsa   = */{0ULL, 0ULL},
+        /*.stfle  = */ { S390X_CAPBIT(S390X_MSA),
+            0ULL, 0ULL, 0ULL },
+        /*.kimd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1), 0ULL },
+        /*.klmd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1), 0ULL },
+        /*.km     = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+        /*.kmc    = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+        /*.kmac   = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+        /*.kmctr  = */ { 0ULL, 0ULL },
+        /*.kmo    = */ { 0ULL, 0ULL },
+        /*.kmf    = */ { 0ULL, 0ULL },
+        /*.prno   = */ { 0ULL, 0ULL },
+        /*.kma    = */ { 0ULL, 0ULL },
+        /*.pcc    = */ { 0ULL, 0ULL },
+        /*.kdsa   = */ { 0ULL, 0ULL },
     };
 
     /*-
@@ -283,32 +280,21 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
      * Implements MSA and MSA1.
      */
     static const struct OPENSSL_s390xcap_st z9 = {
-        /*.stfle  = */{S390X_CAPBIT(S390X_MSA)
-                       | S390X_CAPBIT(S390X_STCKF),
-                       0ULL, 0ULL, 0ULL},
-        /*.kimd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256),
-                       0ULL},
-        /*.klmd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256),
-                       0ULL},
-        /*.km     = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128),
-                       0ULL},
-        /*.kmc    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128),
-                       0ULL},
-        /*.kmac   = */{S390X_CAPBIT(S390X_QUERY),
-                       0ULL},
-        /*.kmctr  = */{0ULL, 0ULL},
-        /*.kmo    = */{0ULL, 0ULL},
-        /*.kmf    = */{0ULL, 0ULL},
-        /*.prno   = */{0ULL, 0ULL},
-        /*.kma    = */{0ULL, 0ULL},
-        /*.pcc    = */{0ULL, 0ULL},
-        /*.kdsa   = */{0ULL, 0ULL},
+        /*.stfle  = */ { S390X_CAPBIT(S390X_MSA)
+                | S390X_CAPBIT(S390X_STCKF),
+            0ULL, 0ULL, 0ULL },
+        /*.kimd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256), 0ULL },
+        /*.klmd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256), 0ULL },
+        /*.km     = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128), 0ULL },
+        /*.kmc    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128), 0ULL },
+        /*.kmac   = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+        /*.kmctr  = */ { 0ULL, 0ULL },
+        /*.kmo    = */ { 0ULL, 0ULL },
+        /*.kmf    = */ { 0ULL, 0ULL },
+        /*.prno   = */ { 0ULL, 0ULL },
+        /*.kma    = */ { 0ULL, 0ULL },
+        /*.pcc    = */ { 0ULL, 0ULL },
+        /*.kdsa   = */ { 0ULL, 0ULL },
     };
 
     /*-
@@ -316,38 +302,21 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
      * Implements MSA and MSA1-2.
      */
     static const struct OPENSSL_s390xcap_st z10 = {
-        /*.stfle  = */{S390X_CAPBIT(S390X_MSA)
-                       | S390X_CAPBIT(S390X_STCKF),
-                       0ULL, 0ULL, 0ULL},
-        /*.kimd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256)
-                       | S390X_CAPBIT(S390X_SHA_512),
-                       0ULL},
-        /*.klmd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256)
-                       | S390X_CAPBIT(S390X_SHA_512),
-                       0ULL},
-        /*.km     = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmc    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmac   = */{S390X_CAPBIT(S390X_QUERY),
-                       0ULL},
-        /*.kmctr  = */{0ULL, 0ULL},
-        /*.kmo    = */{0ULL, 0ULL},
-        /*.kmf    = */{0ULL, 0ULL},
-        /*.prno   = */{0ULL, 0ULL},
-        /*.kma    = */{0ULL, 0ULL},
-        /*.pcc    = */{0ULL, 0ULL},
-        /*.kdsa   = */{0ULL, 0ULL},
+        /*.stfle  = */ { S390X_CAPBIT(S390X_MSA)
+                | S390X_CAPBIT(S390X_STCKF),
+            0ULL, 0ULL, 0ULL },
+        /*.kimd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), 0ULL },
+        /*.klmd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), 0ULL },
+        /*.km     = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmc    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmac   = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+        /*.kmctr  = */ { 0ULL, 0ULL },
+        /*.kmo    = */ { 0ULL, 0ULL },
+        /*.kmf    = */ { 0ULL, 0ULL },
+        /*.prno   = */ { 0ULL, 0ULL },
+        /*.kma    = */ { 0ULL, 0ULL },
+        /*.pcc    = */ { 0ULL, 0ULL },
+        /*.kdsa   = */ { 0ULL, 0ULL },
     };
 
     /*-
@@ -355,58 +324,23 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
      * Implements MSA and MSA1-4.
      */
     static const struct OPENSSL_s390xcap_st z196 = {
-        /*.stfle  = */{S390X_CAPBIT(S390X_MSA)
-                       | S390X_CAPBIT(S390X_STCKF),
-                       S390X_CAPBIT(S390X_MSA3)
-                       | S390X_CAPBIT(S390X_MSA4),
-                       0ULL, 0ULL},
-        /*.kimd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256)
-                       | S390X_CAPBIT(S390X_SHA_512),
-                       S390X_CAPBIT(S390X_GHASH)},
-        /*.klmd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256)
-                       | S390X_CAPBIT(S390X_SHA_512),
-                       0ULL},
-        /*.km     = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256)
-                       | S390X_CAPBIT(S390X_XTS_AES_128)
-                       | S390X_CAPBIT(S390X_XTS_AES_256),
-                       0ULL},
-        /*.kmc    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmac   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmctr  = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmo    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmf    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.prno   = */{0ULL, 0ULL},
-        /*.kma    = */{0ULL, 0ULL},
-        /*.pcc    = */{S390X_CAPBIT(S390X_QUERY),
-                       0ULL},
-        /*.kdsa   = */{0ULL, 0ULL},
+        /*.stfle  = */ { S390X_CAPBIT(S390X_MSA)
+                | S390X_CAPBIT(S390X_STCKF),
+            S390X_CAPBIT(S390X_MSA3)
+                | S390X_CAPBIT(S390X_MSA4),
+            0ULL, 0ULL },
+        /*.kimd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), S390X_CAPBIT(S390X_GHASH) },
+        /*.klmd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), 0ULL },
+        /*.km     = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256) | S390X_CAPBIT(S390X_XTS_AES_128) | S390X_CAPBIT(S390X_XTS_AES_256), 0ULL },
+        /*.kmc    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmac   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmctr  = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmo    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmf    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.prno   = */ { 0ULL, 0ULL },
+        /*.kma    = */ { 0ULL, 0ULL },
+        /*.pcc    = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+        /*.kdsa   = */ { 0ULL, 0ULL },
     };
 
     /*-
@@ -414,58 +348,23 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
      * Implements MSA and MSA1-4.
      */
     static const struct OPENSSL_s390xcap_st zEC12 = {
-        /*.stfle  = */{S390X_CAPBIT(S390X_MSA)
-                       | S390X_CAPBIT(S390X_STCKF),
-                       S390X_CAPBIT(S390X_MSA3)
-                       | S390X_CAPBIT(S390X_MSA4),
-                       0ULL, 0ULL},
-        /*.kimd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256)
-                       | S390X_CAPBIT(S390X_SHA_512),
-                   S390X_CAPBIT(S390X_GHASH)},
-        /*.klmd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256)
-                       | S390X_CAPBIT(S390X_SHA_512),
-                       0ULL},
-        /*.km     = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256)
-                       | S390X_CAPBIT(S390X_XTS_AES_128)
-                       | S390X_CAPBIT(S390X_XTS_AES_256),
-                       0ULL},
-        /*.kmc    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmac   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmctr  = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmo    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmf    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.prno   = */{0ULL, 0ULL},
-        /*.kma    = */{0ULL, 0ULL},
-        /*.pcc    = */{S390X_CAPBIT(S390X_QUERY),
-                       0ULL},
-        /*.kdsa   = */{0ULL, 0ULL},
+        /*.stfle  = */ { S390X_CAPBIT(S390X_MSA)
+                | S390X_CAPBIT(S390X_STCKF),
+            S390X_CAPBIT(S390X_MSA3)
+                | S390X_CAPBIT(S390X_MSA4),
+            0ULL, 0ULL },
+        /*.kimd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), S390X_CAPBIT(S390X_GHASH) },
+        /*.klmd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), 0ULL },
+        /*.km     = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256) | S390X_CAPBIT(S390X_XTS_AES_128) | S390X_CAPBIT(S390X_XTS_AES_256), 0ULL },
+        /*.kmc    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmac   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmctr  = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmo    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmf    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.prno   = */ { 0ULL, 0ULL },
+        /*.kma    = */ { 0ULL, 0ULL },
+        /*.pcc    = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+        /*.kdsa   = */ { 0ULL, 0ULL },
     };
 
     /*-
@@ -473,62 +372,25 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
      * Implements MSA and MSA1-5.
      */
     static const struct OPENSSL_s390xcap_st z13 = {
-        /*.stfle  = */{S390X_CAPBIT(S390X_MSA)
-                       | S390X_CAPBIT(S390X_STCKF)
-                       | S390X_CAPBIT(S390X_MSA5),
-                       S390X_CAPBIT(S390X_MSA3)
-                       | S390X_CAPBIT(S390X_MSA4),
-                       S390X_CAPBIT(S390X_VX),
-                       0ULL},
-        /*.kimd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256)
-                       | S390X_CAPBIT(S390X_SHA_512),
-                       S390X_CAPBIT(S390X_GHASH)},
-        /*.klmd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256)
-                       | S390X_CAPBIT(S390X_SHA_512),
-                       0ULL},
-        /*.km     = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256)
-                       | S390X_CAPBIT(S390X_XTS_AES_128)
-                       | S390X_CAPBIT(S390X_XTS_AES_256),
-                       0ULL},
-        /*.kmc    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmac   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmctr  = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmo    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmf    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.prno   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_512_DRNG),
-                       0ULL},
-        /*.kma    = */{0ULL, 0ULL},
-        /*.pcc    = */{S390X_CAPBIT(S390X_QUERY),
-                       0ULL},
-        /*.kdsa   = */{0ULL, 0ULL},
+        /*.stfle  = */ { S390X_CAPBIT(S390X_MSA)
+                | S390X_CAPBIT(S390X_STCKF)
+                | S390X_CAPBIT(S390X_MSA5),
+            S390X_CAPBIT(S390X_MSA3)
+                | S390X_CAPBIT(S390X_MSA4),
+            S390X_CAPBIT(S390X_VX),
+            0ULL },
+        /*.kimd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), S390X_CAPBIT(S390X_GHASH) },
+        /*.klmd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512), 0ULL },
+        /*.km     = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256) | S390X_CAPBIT(S390X_XTS_AES_128) | S390X_CAPBIT(S390X_XTS_AES_256), 0ULL },
+        /*.kmc    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmac   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmctr  = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmo    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmf    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.prno   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_512_DRNG), 0ULL },
+        /*.kma    = */ { 0ULL, 0ULL },
+        /*.pcc    = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+        /*.kdsa   = */ { 0ULL, 0ULL },
     };
 
     /*-
@@ -536,81 +398,28 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
      * Implements MSA and MSA1-8.
      */
     static const struct OPENSSL_s390xcap_st z14 = {
-        /*.stfle  = */{S390X_CAPBIT(S390X_MSA)
-                       | S390X_CAPBIT(S390X_STCKF)
-                       | S390X_CAPBIT(S390X_MSA5),
-                       S390X_CAPBIT(S390X_MSA3)
-                       | S390X_CAPBIT(S390X_MSA4),
-                       S390X_CAPBIT(S390X_VX)
-                       | S390X_CAPBIT(S390X_VXD)
-                       | S390X_CAPBIT(S390X_VXE)
-                       | S390X_CAPBIT(S390X_MSA8),
-                       0ULL},
-        /*.kimd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256)
-                       | S390X_CAPBIT(S390X_SHA_512)
-                       | S390X_CAPBIT(S390X_SHA3_224)
-                       | S390X_CAPBIT(S390X_SHA3_256)
-                       | S390X_CAPBIT(S390X_SHA3_384)
-                       | S390X_CAPBIT(S390X_SHA3_512)
-                       | S390X_CAPBIT(S390X_SHAKE_128)
-                       | S390X_CAPBIT(S390X_SHAKE_256),
-                       S390X_CAPBIT(S390X_GHASH)},
-        /*.klmd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256)
-                       | S390X_CAPBIT(S390X_SHA_512)
-                       | S390X_CAPBIT(S390X_SHA3_224)
-                       | S390X_CAPBIT(S390X_SHA3_256)
-                       | S390X_CAPBIT(S390X_SHA3_384)
-                       | S390X_CAPBIT(S390X_SHA3_512)
-                       | S390X_CAPBIT(S390X_SHAKE_128)
-                       | S390X_CAPBIT(S390X_SHAKE_256),
-                       0ULL},
-        /*.km     = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256)
-                       | S390X_CAPBIT(S390X_XTS_AES_128)
-                       | S390X_CAPBIT(S390X_XTS_AES_256),
-                       0ULL},
-        /*.kmc    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmac   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmctr  = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmo    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmf    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.prno   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_512_DRNG),
-                       S390X_CAPBIT(S390X_TRNG)},
-        /*.kma    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.pcc    = */{S390X_CAPBIT(S390X_QUERY),
-                       0ULL},
-        /*.kdsa   = */{0ULL, 0ULL},
+        /*.stfle  = */ { S390X_CAPBIT(S390X_MSA)
+                | S390X_CAPBIT(S390X_STCKF)
+                | S390X_CAPBIT(S390X_MSA5),
+            S390X_CAPBIT(S390X_MSA3)
+                | S390X_CAPBIT(S390X_MSA4),
+            S390X_CAPBIT(S390X_VX)
+                | S390X_CAPBIT(S390X_VXD)
+                | S390X_CAPBIT(S390X_VXE)
+                | S390X_CAPBIT(S390X_MSA8),
+            0ULL },
+        /*.kimd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512) | S390X_CAPBIT(S390X_SHA3_224) | S390X_CAPBIT(S390X_SHA3_256) | S390X_CAPBIT(S390X_SHA3_384) | S390X_CAPBIT(S390X_SHA3_512) | S390X_CAPBIT(S390X_SHAKE_128) | S390X_CAPBIT(S390X_SHAKE_256), S390X_CAPBIT(S390X_GHASH) },
+        /*.klmd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512) | S390X_CAPBIT(S390X_SHA3_224) | S390X_CAPBIT(S390X_SHA3_256) | S390X_CAPBIT(S390X_SHA3_384) | S390X_CAPBIT(S390X_SHA3_512) | S390X_CAPBIT(S390X_SHAKE_128) | S390X_CAPBIT(S390X_SHAKE_256), 0ULL },
+        /*.km     = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256) | S390X_CAPBIT(S390X_XTS_AES_128) | S390X_CAPBIT(S390X_XTS_AES_256), 0ULL },
+        /*.kmc    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmac   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmctr  = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmo    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmf    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.prno   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_512_DRNG), S390X_CAPBIT(S390X_TRNG) },
+        /*.kma    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.pcc    = */ { S390X_CAPBIT(S390X_QUERY), 0ULL },
+        /*.kdsa   = */ { 0ULL, 0ULL },
     };
 
     /*-
@@ -618,99 +427,29 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
      * Implements MSA and MSA1-9.
      */
     static const struct OPENSSL_s390xcap_st z15 = {
-        /*.stfle  = */{S390X_CAPBIT(S390X_MSA)
-                       | S390X_CAPBIT(S390X_STCKF)
-                       | S390X_CAPBIT(S390X_MSA5),
-                       S390X_CAPBIT(S390X_MSA3)
-                       | S390X_CAPBIT(S390X_MSA4),
-                       S390X_CAPBIT(S390X_VX)
-                       | S390X_CAPBIT(S390X_VXD)
-                       | S390X_CAPBIT(S390X_VXE)
-                       | S390X_CAPBIT(S390X_MSA8)
-                       | S390X_CAPBIT(S390X_MSA9),
-                       0ULL},
-        /*.kimd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256)
-                       | S390X_CAPBIT(S390X_SHA_512)
-                       | S390X_CAPBIT(S390X_SHA3_224)
-                       | S390X_CAPBIT(S390X_SHA3_256)
-                       | S390X_CAPBIT(S390X_SHA3_384)
-                       | S390X_CAPBIT(S390X_SHA3_512)
-                       | S390X_CAPBIT(S390X_SHAKE_128)
-                       | S390X_CAPBIT(S390X_SHAKE_256),
-                       S390X_CAPBIT(S390X_GHASH)},
-        /*.klmd   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_1)
-                       | S390X_CAPBIT(S390X_SHA_256)
-                       | S390X_CAPBIT(S390X_SHA_512)
-                       | S390X_CAPBIT(S390X_SHA3_224)
-                       | S390X_CAPBIT(S390X_SHA3_256)
-                       | S390X_CAPBIT(S390X_SHA3_384)
-                       | S390X_CAPBIT(S390X_SHA3_512)
-                       | S390X_CAPBIT(S390X_SHAKE_128)
-                       | S390X_CAPBIT(S390X_SHAKE_256),
-                       0ULL},
-        /*.km     = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256)
-                       | S390X_CAPBIT(S390X_XTS_AES_128)
-                       | S390X_CAPBIT(S390X_XTS_AES_256),
-                       0ULL},
-        /*.kmc    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmac   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmctr  = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmo    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.kmf    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.prno   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_SHA_512_DRNG),
-                       S390X_CAPBIT(S390X_TRNG)},
-        /*.kma    = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_AES_128)
-                       | S390X_CAPBIT(S390X_AES_192)
-                       | S390X_CAPBIT(S390X_AES_256),
-                       0ULL},
-        /*.pcc    = */{S390X_CAPBIT(S390X_QUERY),
-                       S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P256)
-                       | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P384)
-                       | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P521)
-                       | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED25519)
-                       | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED448)
-                       | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519)
-                       | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448)},
-        /*.kdsa   = */{S390X_CAPBIT(S390X_QUERY)
-                       | S390X_CAPBIT(S390X_ECDSA_VERIFY_P256)
-                       | S390X_CAPBIT(S390X_ECDSA_VERIFY_P384)
-                       | S390X_CAPBIT(S390X_ECDSA_VERIFY_P521)
-                       | S390X_CAPBIT(S390X_ECDSA_SIGN_P256)
-                       | S390X_CAPBIT(S390X_ECDSA_SIGN_P384)
-                       | S390X_CAPBIT(S390X_ECDSA_SIGN_P521)
-                       | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED25519)
-                       | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED448)
-                       | S390X_CAPBIT(S390X_EDDSA_SIGN_ED25519)
-                       | S390X_CAPBIT(S390X_EDDSA_SIGN_ED448),
-                       0ULL},
+        /*.stfle  = */ { S390X_CAPBIT(S390X_MSA)
+                | S390X_CAPBIT(S390X_STCKF)
+                | S390X_CAPBIT(S390X_MSA5),
+            S390X_CAPBIT(S390X_MSA3)
+                | S390X_CAPBIT(S390X_MSA4),
+            S390X_CAPBIT(S390X_VX)
+                | S390X_CAPBIT(S390X_VXD)
+                | S390X_CAPBIT(S390X_VXE)
+                | S390X_CAPBIT(S390X_MSA8)
+                | S390X_CAPBIT(S390X_MSA9),
+            0ULL },
+        /*.kimd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512) | S390X_CAPBIT(S390X_SHA3_224) | S390X_CAPBIT(S390X_SHA3_256) | S390X_CAPBIT(S390X_SHA3_384) | S390X_CAPBIT(S390X_SHA3_512) | S390X_CAPBIT(S390X_SHAKE_128) | S390X_CAPBIT(S390X_SHAKE_256), S390X_CAPBIT(S390X_GHASH) },
+        /*.klmd   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_1) | S390X_CAPBIT(S390X_SHA_256) | S390X_CAPBIT(S390X_SHA_512) | S390X_CAPBIT(S390X_SHA3_224) | S390X_CAPBIT(S390X_SHA3_256) | S390X_CAPBIT(S390X_SHA3_384) | S390X_CAPBIT(S390X_SHA3_512) | S390X_CAPBIT(S390X_SHAKE_128) | S390X_CAPBIT(S390X_SHAKE_256), 0ULL },
+        /*.km     = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256) | S390X_CAPBIT(S390X_XTS_AES_128) | S390X_CAPBIT(S390X_XTS_AES_256), 0ULL },
+        /*.kmc    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmac   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmctr  = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmo    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.kmf    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.prno   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_SHA_512_DRNG), S390X_CAPBIT(S390X_TRNG) },
+        /*.kma    = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_AES_128) | S390X_CAPBIT(S390X_AES_192) | S390X_CAPBIT(S390X_AES_256), 0ULL },
+        /*.pcc    = */ { S390X_CAPBIT(S390X_QUERY), S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P256) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P384) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P521) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED25519) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_ED448) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X25519) | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_X448) },
+        /*.kdsa   = */ { S390X_CAPBIT(S390X_QUERY) | S390X_CAPBIT(S390X_ECDSA_VERIFY_P256) | S390X_CAPBIT(S390X_ECDSA_VERIFY_P384) | S390X_CAPBIT(S390X_ECDSA_VERIFY_P521) | S390X_CAPBIT(S390X_ECDSA_SIGN_P256) | S390X_CAPBIT(S390X_ECDSA_SIGN_P384) | S390X_CAPBIT(S390X_ECDSA_SIGN_P521) | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED25519) | S390X_CAPBIT(S390X_EDDSA_VERIFY_ED448) | S390X_CAPBIT(S390X_EDDSA_SIGN_ED25519) | S390X_CAPBIT(S390X_EDDSA_SIGN_ED448), 0ULL },
     };
 
     /*-
@@ -736,9 +475,9 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
     while (tok_begin != NULL) {
         /* stfle token */
         if ((n = sscanf(tok_begin,
-                        " stfle : %" STR(LEN) "[^:] : "
-                        "%" STR(LEN) "[^:] : %" STR(LEN) "s ",
-                        tok[0], tok[1], tok[2]))) {
+                 " stfle : %" STR(LEN) "[^:] : "
+                                       "%" STR(LEN) "[^:] : %" STR(LEN) "s ",
+                 tok[0], tok[1], tok[2]))) {
             for (i = 0; i < n; i++) {
                 off = (tok[i][0] == '~') ? 1 : 0;
                 if (sscanf(tok[i] + off, "%llx", &cap->stfle[i]) != 1)
@@ -749,37 +488,20 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap, int *cex)
         }
 
         /* query function tokens */
-        else if TOK_FUNC(kimd)
-        else if TOK_FUNC(klmd)
-        else if TOK_FUNC(km)
-        else if TOK_FUNC(kmc)
-        else if TOK_FUNC(kmac)
-        else if TOK_FUNC(kmctr)
-        else if TOK_FUNC(kmo)
-        else if TOK_FUNC(kmf)
-        else if TOK_FUNC(prno)
-        else if TOK_FUNC(kma)
-        else if TOK_FUNC(pcc)
-        else if TOK_FUNC(kdsa)
-
-        /* CPU model tokens */
-        else if TOK_CPU(z900)
-        else if TOK_CPU(z990)
-        else if TOK_CPU(z9)
-        else if TOK_CPU(z10)
-        else if TOK_CPU(z196)
-        else if TOK_CPU(zEC12)
-        else if TOK_CPU(z13)
-        else if TOK_CPU(z14)
-        else if TOK_CPU(z15)
-        else if TOK_CPU_ALIAS(z16, z15)
-
-        /* nocex to deactivate cex support */
-        else if (sscanf(tok_begin, " %" STR(LEN) "s %" STR(LEN) "s ",
-                        tok[0], tok[1]) == 1
-                && !strcmp(tok[0], "nocex")) {
-            *cex = 0;
-        }
+        else if TOK_FUNC (kimd)
+            else if TOK_FUNC (klmd) else if TOK_FUNC (km) else if TOK_FUNC (kmc) else if TOK_FUNC (kmac) else if TOK_FUNC (kmctr) else if TOK_FUNC (kmo) else if TOK_FUNC (kmf) else if TOK_FUNC (prno) else if TOK_FUNC (kma) else if TOK_FUNC (pcc) else if TOK_FUNC (kdsa)
+
+                /* CPU model tokens */
+                else if TOK_CPU (z900) else if TOK_CPU (z990) else if TOK_CPU (z9) else if TOK_CPU (z10) else if TOK_CPU (z196) else if TOK_CPU (zEC12) else if TOK_CPU (z13) else if TOK_CPU (z14) else if TOK_CPU (z15) else if TOK_CPU_ALIAS (z16, z15)
+
+                /* nocex to deactivate cex support */
+                else if (sscanf(tok_begin, " %" STR(LEN) "s %" STR(LEN) "s ",
+                             tok[0], tok[1])
+                        == 1
+                    && !strcmp(tok[0], "nocex"))
+            {
+                *cex = 0;
+            }
 
         /* whitespace(ignored) or invalid tokens */
         else {
diff --git a/crypto/s390xcpuid.pl b/crypto/s390xcpuid.pl
index bb2f68810d52e..254d5aecb13ee 100755
--- a/crypto/s390xcpuid.pl
+++ b/crypto/s390xcpuid.pl
@@ -481,16 +481,12 @@
 s390x_kdsa:
 	lr	%r0,$fc
 	l${g}r	%r1,$param
-	lhi	%r2,0
 
 	.long	0xb93a0004	# kdsa %r0,$in
 	brc	1,.-4		# pay attention to "partial completion"
-	brc	7,.Lkdsa_err	# if CC==0 return 0, else return 1
-.Lkdsa_out:
+	ipm	%r2		# load program mask and
+	srl	%r2,28		# extract cc
 	br	$ra
-.Lkdsa_err:
-	lhi	%r2,1
-	j	.Lkdsa_out
 .size	s390x_kdsa,.-s390x_kdsa
 ___
 }
diff --git a/crypto/seed/seed.c b/crypto/seed/seed.c
index de3b3958ea606..7811f24d830c4 100644
--- a/crypto/seed/seed.c
+++ b/crypto/seed/seed.c
@@ -40,411 +40,400 @@
  */
 #include "internal/deprecated.h"
 
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
-# ifdef _WIN32
-#  include <memory.h>
-# endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef _WIN32
+#include <memory.h>
+#endif
 
-# include <openssl/seed.h>
-# include "seed_local.h"
+#include <openssl/seed.h>
+#include "seed_local.h"
 
-# ifdef SS                      /* can get defined on Solaris by inclusion of
-                                 * <stdlib.h> */
-#  undef SS
-# endif
+#ifdef SS /* can get defined on Solaris by inclusion of \
+           * <stdlib.h> */
+#undef SS
+#endif
 
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
 
-#  define G_FUNC(v)       \
-        SS[0][(unsigned char)      (v) & 0xff] ^ \
-        SS[1][(unsigned char) ((v)>>8) & 0xff] ^ \
-        SS[2][(unsigned char)((v)>>16) & 0xff] ^ \
-        SS[3][(unsigned char)((v)>>24) & 0xff]
+#define G_FUNC(v) \
+    SS[0][(unsigned char)(v) & 0xff] ^ SS[1][(unsigned char)((v) >> 8) & 0xff] ^ SS[2][(unsigned char)((v) >> 16) & 0xff] ^ SS[3][(unsigned char)((v) >> 24) & 0xff]
 
 static const seed_word SS[4][256] = {
     { 0x2989a1a8, 0x05858184, 0x16c6d2d4, 0x13c3d3d0,
-      0x14445054, 0x1d0d111c, 0x2c8ca0ac, 0x25052124,
-      0x1d4d515c, 0x03434340, 0x18081018, 0x1e0e121c,
-      0x11415150, 0x3cccf0fc, 0x0acac2c8, 0x23436360,
-      0x28082028, 0x04444044, 0x20002020, 0x1d8d919c,
-      0x20c0e0e0, 0x22c2e2e0, 0x08c8c0c8, 0x17071314,
-      0x2585a1a4, 0x0f8f838c, 0x03030300, 0x3b4b7378,
-      0x3b8bb3b8, 0x13031310, 0x12c2d2d0, 0x2ecee2ec,
-      0x30407070, 0x0c8c808c, 0x3f0f333c, 0x2888a0a8,
-      0x32023230, 0x1dcdd1dc, 0x36c6f2f4, 0x34447074,
-      0x2ccce0ec, 0x15859194, 0x0b0b0308, 0x17475354,
-      0x1c4c505c, 0x1b4b5358, 0x3d8db1bc, 0x01010100,
-      0x24042024, 0x1c0c101c, 0x33437370, 0x18889098,
-      0x10001010, 0x0cccc0cc, 0x32c2f2f0, 0x19c9d1d8,
-      0x2c0c202c, 0x27c7e3e4, 0x32427270, 0x03838380,
-      0x1b8b9398, 0x11c1d1d0, 0x06868284, 0x09c9c1c8,
-      0x20406060, 0x10405050, 0x2383a3a0, 0x2bcbe3e8,
-      0x0d0d010c, 0x3686b2b4, 0x1e8e929c, 0x0f4f434c,
-      0x3787b3b4, 0x1a4a5258, 0x06c6c2c4, 0x38487078,
-      0x2686a2a4, 0x12021210, 0x2f8fa3ac, 0x15c5d1d4,
-      0x21416160, 0x03c3c3c0, 0x3484b0b4, 0x01414140,
-      0x12425250, 0x3d4d717c, 0x0d8d818c, 0x08080008,
-      0x1f0f131c, 0x19899198, 0x00000000, 0x19091118,
-      0x04040004, 0x13435350, 0x37c7f3f4, 0x21c1e1e0,
-      0x3dcdf1fc, 0x36467274, 0x2f0f232c, 0x27072324,
-      0x3080b0b0, 0x0b8b8388, 0x0e0e020c, 0x2b8ba3a8,
-      0x2282a2a0, 0x2e4e626c, 0x13839390, 0x0d4d414c,
-      0x29496168, 0x3c4c707c, 0x09090108, 0x0a0a0208,
-      0x3f8fb3bc, 0x2fcfe3ec, 0x33c3f3f0, 0x05c5c1c4,
-      0x07878384, 0x14041014, 0x3ecef2fc, 0x24446064,
-      0x1eced2dc, 0x2e0e222c, 0x0b4b4348, 0x1a0a1218,
-      0x06060204, 0x21012120, 0x2b4b6368, 0x26466264,
-      0x02020200, 0x35c5f1f4, 0x12829290, 0x0a8a8288,
-      0x0c0c000c, 0x3383b3b0, 0x3e4e727c, 0x10c0d0d0,
-      0x3a4a7278, 0x07474344, 0x16869294, 0x25c5e1e4,
-      0x26062224, 0x00808080, 0x2d8da1ac, 0x1fcfd3dc,
-      0x2181a1a0, 0x30003030, 0x37073334, 0x2e8ea2ac,
-      0x36063234, 0x15051114, 0x22022220, 0x38083038,
-      0x34c4f0f4, 0x2787a3a4, 0x05454144, 0x0c4c404c,
-      0x01818180, 0x29c9e1e8, 0x04848084, 0x17879394,
-      0x35053134, 0x0bcbc3c8, 0x0ecec2cc, 0x3c0c303c,
-      0x31417170, 0x11011110, 0x07c7c3c4, 0x09898188,
-      0x35457174, 0x3bcbf3f8, 0x1acad2d8, 0x38c8f0f8,
-      0x14849094, 0x19495158, 0x02828280, 0x04c4c0c4,
-      0x3fcff3fc, 0x09494148, 0x39093138, 0x27476364,
-      0x00c0c0c0, 0x0fcfc3cc, 0x17c7d3d4, 0x3888b0b8,
-      0x0f0f030c, 0x0e8e828c, 0x02424240, 0x23032320,
-      0x11819190, 0x2c4c606c, 0x1bcbd3d8, 0x2484a0a4,
-      0x34043034, 0x31c1f1f0, 0x08484048, 0x02c2c2c0,
-      0x2f4f636c, 0x3d0d313c, 0x2d0d212c, 0x00404040,
-      0x3e8eb2bc, 0x3e0e323c, 0x3c8cb0bc, 0x01c1c1c0,
-      0x2a8aa2a8, 0x3a8ab2b8, 0x0e4e424c, 0x15455154,
-      0x3b0b3338, 0x1cccd0dc, 0x28486068, 0x3f4f737c,
-      0x1c8c909c, 0x18c8d0d8, 0x0a4a4248, 0x16465254,
-      0x37477374, 0x2080a0a0, 0x2dcde1ec, 0x06464244,
-      0x3585b1b4, 0x2b0b2328, 0x25456164, 0x3acaf2f8,
-      0x23c3e3e0, 0x3989b1b8, 0x3181b1b0, 0x1f8f939c,
-      0x1e4e525c, 0x39c9f1f8, 0x26c6e2e4, 0x3282b2b0,
-      0x31013130, 0x2acae2e8, 0x2d4d616c, 0x1f4f535c,
-      0x24c4e0e4, 0x30c0f0f0, 0x0dcdc1cc, 0x08888088,
-      0x16061214, 0x3a0a3238, 0x18485058, 0x14c4d0d4,
-      0x22426260, 0x29092128, 0x07070304, 0x33033330,
-      0x28c8e0e8, 0x1b0b1318, 0x05050104, 0x39497178,
-      0x10809090, 0x2a4a6268, 0x2a0a2228, 0x1a8a9298
-    },
+        0x14445054, 0x1d0d111c, 0x2c8ca0ac, 0x25052124,
+        0x1d4d515c, 0x03434340, 0x18081018, 0x1e0e121c,
+        0x11415150, 0x3cccf0fc, 0x0acac2c8, 0x23436360,
+        0x28082028, 0x04444044, 0x20002020, 0x1d8d919c,
+        0x20c0e0e0, 0x22c2e2e0, 0x08c8c0c8, 0x17071314,
+        0x2585a1a4, 0x0f8f838c, 0x03030300, 0x3b4b7378,
+        0x3b8bb3b8, 0x13031310, 0x12c2d2d0, 0x2ecee2ec,
+        0x30407070, 0x0c8c808c, 0x3f0f333c, 0x2888a0a8,
+        0x32023230, 0x1dcdd1dc, 0x36c6f2f4, 0x34447074,
+        0x2ccce0ec, 0x15859194, 0x0b0b0308, 0x17475354,
+        0x1c4c505c, 0x1b4b5358, 0x3d8db1bc, 0x01010100,
+        0x24042024, 0x1c0c101c, 0x33437370, 0x18889098,
+        0x10001010, 0x0cccc0cc, 0x32c2f2f0, 0x19c9d1d8,
+        0x2c0c202c, 0x27c7e3e4, 0x32427270, 0x03838380,
+        0x1b8b9398, 0x11c1d1d0, 0x06868284, 0x09c9c1c8,
+        0x20406060, 0x10405050, 0x2383a3a0, 0x2bcbe3e8,
+        0x0d0d010c, 0x3686b2b4, 0x1e8e929c, 0x0f4f434c,
+        0x3787b3b4, 0x1a4a5258, 0x06c6c2c4, 0x38487078,
+        0x2686a2a4, 0x12021210, 0x2f8fa3ac, 0x15c5d1d4,
+        0x21416160, 0x03c3c3c0, 0x3484b0b4, 0x01414140,
+        0x12425250, 0x3d4d717c, 0x0d8d818c, 0x08080008,
+        0x1f0f131c, 0x19899198, 0x00000000, 0x19091118,
+        0x04040004, 0x13435350, 0x37c7f3f4, 0x21c1e1e0,
+        0x3dcdf1fc, 0x36467274, 0x2f0f232c, 0x27072324,
+        0x3080b0b0, 0x0b8b8388, 0x0e0e020c, 0x2b8ba3a8,
+        0x2282a2a0, 0x2e4e626c, 0x13839390, 0x0d4d414c,
+        0x29496168, 0x3c4c707c, 0x09090108, 0x0a0a0208,
+        0x3f8fb3bc, 0x2fcfe3ec, 0x33c3f3f0, 0x05c5c1c4,
+        0x07878384, 0x14041014, 0x3ecef2fc, 0x24446064,
+        0x1eced2dc, 0x2e0e222c, 0x0b4b4348, 0x1a0a1218,
+        0x06060204, 0x21012120, 0x2b4b6368, 0x26466264,
+        0x02020200, 0x35c5f1f4, 0x12829290, 0x0a8a8288,
+        0x0c0c000c, 0x3383b3b0, 0x3e4e727c, 0x10c0d0d0,
+        0x3a4a7278, 0x07474344, 0x16869294, 0x25c5e1e4,
+        0x26062224, 0x00808080, 0x2d8da1ac, 0x1fcfd3dc,
+        0x2181a1a0, 0x30003030, 0x37073334, 0x2e8ea2ac,
+        0x36063234, 0x15051114, 0x22022220, 0x38083038,
+        0x34c4f0f4, 0x2787a3a4, 0x05454144, 0x0c4c404c,
+        0x01818180, 0x29c9e1e8, 0x04848084, 0x17879394,
+        0x35053134, 0x0bcbc3c8, 0x0ecec2cc, 0x3c0c303c,
+        0x31417170, 0x11011110, 0x07c7c3c4, 0x09898188,
+        0x35457174, 0x3bcbf3f8, 0x1acad2d8, 0x38c8f0f8,
+        0x14849094, 0x19495158, 0x02828280, 0x04c4c0c4,
+        0x3fcff3fc, 0x09494148, 0x39093138, 0x27476364,
+        0x00c0c0c0, 0x0fcfc3cc, 0x17c7d3d4, 0x3888b0b8,
+        0x0f0f030c, 0x0e8e828c, 0x02424240, 0x23032320,
+        0x11819190, 0x2c4c606c, 0x1bcbd3d8, 0x2484a0a4,
+        0x34043034, 0x31c1f1f0, 0x08484048, 0x02c2c2c0,
+        0x2f4f636c, 0x3d0d313c, 0x2d0d212c, 0x00404040,
+        0x3e8eb2bc, 0x3e0e323c, 0x3c8cb0bc, 0x01c1c1c0,
+        0x2a8aa2a8, 0x3a8ab2b8, 0x0e4e424c, 0x15455154,
+        0x3b0b3338, 0x1cccd0dc, 0x28486068, 0x3f4f737c,
+        0x1c8c909c, 0x18c8d0d8, 0x0a4a4248, 0x16465254,
+        0x37477374, 0x2080a0a0, 0x2dcde1ec, 0x06464244,
+        0x3585b1b4, 0x2b0b2328, 0x25456164, 0x3acaf2f8,
+        0x23c3e3e0, 0x3989b1b8, 0x3181b1b0, 0x1f8f939c,
+        0x1e4e525c, 0x39c9f1f8, 0x26c6e2e4, 0x3282b2b0,
+        0x31013130, 0x2acae2e8, 0x2d4d616c, 0x1f4f535c,
+        0x24c4e0e4, 0x30c0f0f0, 0x0dcdc1cc, 0x08888088,
+        0x16061214, 0x3a0a3238, 0x18485058, 0x14c4d0d4,
+        0x22426260, 0x29092128, 0x07070304, 0x33033330,
+        0x28c8e0e8, 0x1b0b1318, 0x05050104, 0x39497178,
+        0x10809090, 0x2a4a6268, 0x2a0a2228, 0x1a8a9298 },
     { 0x38380830, 0xe828c8e0, 0x2c2d0d21, 0xa42686a2,
-      0xcc0fcfc3, 0xdc1eced2, 0xb03383b3, 0xb83888b0,
-      0xac2f8fa3, 0x60204060, 0x54154551, 0xc407c7c3,
-      0x44044440, 0x6c2f4f63, 0x682b4b63, 0x581b4b53,
-      0xc003c3c3, 0x60224262, 0x30330333, 0xb43585b1,
-      0x28290921, 0xa02080a0, 0xe022c2e2, 0xa42787a3,
-      0xd013c3d3, 0x90118191, 0x10110111, 0x04060602,
-      0x1c1c0c10, 0xbc3c8cb0, 0x34360632, 0x480b4b43,
-      0xec2fcfe3, 0x88088880, 0x6c2c4c60, 0xa82888a0,
-      0x14170713, 0xc404c4c0, 0x14160612, 0xf434c4f0,
-      0xc002c2c2, 0x44054541, 0xe021c1e1, 0xd416c6d2,
-      0x3c3f0f33, 0x3c3d0d31, 0x8c0e8e82, 0x98188890,
-      0x28280820, 0x4c0e4e42, 0xf436c6f2, 0x3c3e0e32,
-      0xa42585a1, 0xf839c9f1, 0x0c0d0d01, 0xdc1fcfd3,
-      0xd818c8d0, 0x282b0b23, 0x64264662, 0x783a4a72,
-      0x24270723, 0x2c2f0f23, 0xf031c1f1, 0x70324272,
-      0x40024242, 0xd414c4d0, 0x40014141, 0xc000c0c0,
-      0x70334373, 0x64274763, 0xac2c8ca0, 0x880b8b83,
-      0xf437c7f3, 0xac2d8da1, 0x80008080, 0x1c1f0f13,
-      0xc80acac2, 0x2c2c0c20, 0xa82a8aa2, 0x34340430,
-      0xd012c2d2, 0x080b0b03, 0xec2ecee2, 0xe829c9e1,
-      0x5c1d4d51, 0x94148490, 0x18180810, 0xf838c8f0,
-      0x54174753, 0xac2e8ea2, 0x08080800, 0xc405c5c1,
-      0x10130313, 0xcc0dcdc1, 0x84068682, 0xb83989b1,
-      0xfc3fcff3, 0x7c3d4d71, 0xc001c1c1, 0x30310131,
-      0xf435c5f1, 0x880a8a82, 0x682a4a62, 0xb03181b1,
-      0xd011c1d1, 0x20200020, 0xd417c7d3, 0x00020202,
-      0x20220222, 0x04040400, 0x68284860, 0x70314171,
-      0x04070703, 0xd81bcbd3, 0x9c1d8d91, 0x98198991,
-      0x60214161, 0xbc3e8eb2, 0xe426c6e2, 0x58194951,
-      0xdc1dcdd1, 0x50114151, 0x90108090, 0xdc1cccd0,
-      0x981a8a92, 0xa02383a3, 0xa82b8ba3, 0xd010c0d0,
-      0x80018181, 0x0c0f0f03, 0x44074743, 0x181a0a12,
-      0xe023c3e3, 0xec2ccce0, 0x8c0d8d81, 0xbc3f8fb3,
-      0x94168692, 0x783b4b73, 0x5c1c4c50, 0xa02282a2,
-      0xa02181a1, 0x60234363, 0x20230323, 0x4c0d4d41,
-      0xc808c8c0, 0x9c1e8e92, 0x9c1c8c90, 0x383a0a32,
-      0x0c0c0c00, 0x2c2e0e22, 0xb83a8ab2, 0x6c2e4e62,
-      0x9c1f8f93, 0x581a4a52, 0xf032c2f2, 0x90128292,
-      0xf033c3f3, 0x48094941, 0x78384870, 0xcc0cccc0,
-      0x14150511, 0xf83bcbf3, 0x70304070, 0x74354571,
-      0x7c3f4f73, 0x34350531, 0x10100010, 0x00030303,
-      0x64244460, 0x6c2d4d61, 0xc406c6c2, 0x74344470,
-      0xd415c5d1, 0xb43484b0, 0xe82acae2, 0x08090901,
-      0x74364672, 0x18190911, 0xfc3ecef2, 0x40004040,
-      0x10120212, 0xe020c0e0, 0xbc3d8db1, 0x04050501,
-      0xf83acaf2, 0x00010101, 0xf030c0f0, 0x282a0a22,
-      0x5c1e4e52, 0xa82989a1, 0x54164652, 0x40034343,
-      0x84058581, 0x14140410, 0x88098981, 0x981b8b93,
-      0xb03080b0, 0xe425c5e1, 0x48084840, 0x78394971,
-      0x94178793, 0xfc3cccf0, 0x1c1e0e12, 0x80028282,
-      0x20210121, 0x8c0c8c80, 0x181b0b13, 0x5c1f4f53,
-      0x74374773, 0x54144450, 0xb03282b2, 0x1c1d0d11,
-      0x24250521, 0x4c0f4f43, 0x00000000, 0x44064642,
-      0xec2dcde1, 0x58184850, 0x50124252, 0xe82bcbe3,
-      0x7c3e4e72, 0xd81acad2, 0xc809c9c1, 0xfc3dcdf1,
-      0x30300030, 0x94158591, 0x64254561, 0x3c3c0c30,
-      0xb43686b2, 0xe424c4e0, 0xb83b8bb3, 0x7c3c4c70,
-      0x0c0e0e02, 0x50104050, 0x38390931, 0x24260622,
-      0x30320232, 0x84048480, 0x68294961, 0x90138393,
-      0x34370733, 0xe427c7e3, 0x24240420, 0xa42484a0,
-      0xc80bcbc3, 0x50134353, 0x080a0a02, 0x84078783,
-      0xd819c9d1, 0x4c0c4c40, 0x80038383, 0x8c0f8f83,
-      0xcc0ecec2, 0x383b0b33, 0x480a4a42, 0xb43787b3
-    },
+        0xcc0fcfc3, 0xdc1eced2, 0xb03383b3, 0xb83888b0,
+        0xac2f8fa3, 0x60204060, 0x54154551, 0xc407c7c3,
+        0x44044440, 0x6c2f4f63, 0x682b4b63, 0x581b4b53,
+        0xc003c3c3, 0x60224262, 0x30330333, 0xb43585b1,
+        0x28290921, 0xa02080a0, 0xe022c2e2, 0xa42787a3,
+        0xd013c3d3, 0x90118191, 0x10110111, 0x04060602,
+        0x1c1c0c10, 0xbc3c8cb0, 0x34360632, 0x480b4b43,
+        0xec2fcfe3, 0x88088880, 0x6c2c4c60, 0xa82888a0,
+        0x14170713, 0xc404c4c0, 0x14160612, 0xf434c4f0,
+        0xc002c2c2, 0x44054541, 0xe021c1e1, 0xd416c6d2,
+        0x3c3f0f33, 0x3c3d0d31, 0x8c0e8e82, 0x98188890,
+        0x28280820, 0x4c0e4e42, 0xf436c6f2, 0x3c3e0e32,
+        0xa42585a1, 0xf839c9f1, 0x0c0d0d01, 0xdc1fcfd3,
+        0xd818c8d0, 0x282b0b23, 0x64264662, 0x783a4a72,
+        0x24270723, 0x2c2f0f23, 0xf031c1f1, 0x70324272,
+        0x40024242, 0xd414c4d0, 0x40014141, 0xc000c0c0,
+        0x70334373, 0x64274763, 0xac2c8ca0, 0x880b8b83,
+        0xf437c7f3, 0xac2d8da1, 0x80008080, 0x1c1f0f13,
+        0xc80acac2, 0x2c2c0c20, 0xa82a8aa2, 0x34340430,
+        0xd012c2d2, 0x080b0b03, 0xec2ecee2, 0xe829c9e1,
+        0x5c1d4d51, 0x94148490, 0x18180810, 0xf838c8f0,
+        0x54174753, 0xac2e8ea2, 0x08080800, 0xc405c5c1,
+        0x10130313, 0xcc0dcdc1, 0x84068682, 0xb83989b1,
+        0xfc3fcff3, 0x7c3d4d71, 0xc001c1c1, 0x30310131,
+        0xf435c5f1, 0x880a8a82, 0x682a4a62, 0xb03181b1,
+        0xd011c1d1, 0x20200020, 0xd417c7d3, 0x00020202,
+        0x20220222, 0x04040400, 0x68284860, 0x70314171,
+        0x04070703, 0xd81bcbd3, 0x9c1d8d91, 0x98198991,
+        0x60214161, 0xbc3e8eb2, 0xe426c6e2, 0x58194951,
+        0xdc1dcdd1, 0x50114151, 0x90108090, 0xdc1cccd0,
+        0x981a8a92, 0xa02383a3, 0xa82b8ba3, 0xd010c0d0,
+        0x80018181, 0x0c0f0f03, 0x44074743, 0x181a0a12,
+        0xe023c3e3, 0xec2ccce0, 0x8c0d8d81, 0xbc3f8fb3,
+        0x94168692, 0x783b4b73, 0x5c1c4c50, 0xa02282a2,
+        0xa02181a1, 0x60234363, 0x20230323, 0x4c0d4d41,
+        0xc808c8c0, 0x9c1e8e92, 0x9c1c8c90, 0x383a0a32,
+        0x0c0c0c00, 0x2c2e0e22, 0xb83a8ab2, 0x6c2e4e62,
+        0x9c1f8f93, 0x581a4a52, 0xf032c2f2, 0x90128292,
+        0xf033c3f3, 0x48094941, 0x78384870, 0xcc0cccc0,
+        0x14150511, 0xf83bcbf3, 0x70304070, 0x74354571,
+        0x7c3f4f73, 0x34350531, 0x10100010, 0x00030303,
+        0x64244460, 0x6c2d4d61, 0xc406c6c2, 0x74344470,
+        0xd415c5d1, 0xb43484b0, 0xe82acae2, 0x08090901,
+        0x74364672, 0x18190911, 0xfc3ecef2, 0x40004040,
+        0x10120212, 0xe020c0e0, 0xbc3d8db1, 0x04050501,
+        0xf83acaf2, 0x00010101, 0xf030c0f0, 0x282a0a22,
+        0x5c1e4e52, 0xa82989a1, 0x54164652, 0x40034343,
+        0x84058581, 0x14140410, 0x88098981, 0x981b8b93,
+        0xb03080b0, 0xe425c5e1, 0x48084840, 0x78394971,
+        0x94178793, 0xfc3cccf0, 0x1c1e0e12, 0x80028282,
+        0x20210121, 0x8c0c8c80, 0x181b0b13, 0x5c1f4f53,
+        0x74374773, 0x54144450, 0xb03282b2, 0x1c1d0d11,
+        0x24250521, 0x4c0f4f43, 0x00000000, 0x44064642,
+        0xec2dcde1, 0x58184850, 0x50124252, 0xe82bcbe3,
+        0x7c3e4e72, 0xd81acad2, 0xc809c9c1, 0xfc3dcdf1,
+        0x30300030, 0x94158591, 0x64254561, 0x3c3c0c30,
+        0xb43686b2, 0xe424c4e0, 0xb83b8bb3, 0x7c3c4c70,
+        0x0c0e0e02, 0x50104050, 0x38390931, 0x24260622,
+        0x30320232, 0x84048480, 0x68294961, 0x90138393,
+        0x34370733, 0xe427c7e3, 0x24240420, 0xa42484a0,
+        0xc80bcbc3, 0x50134353, 0x080a0a02, 0x84078783,
+        0xd819c9d1, 0x4c0c4c40, 0x80038383, 0x8c0f8f83,
+        0xcc0ecec2, 0x383b0b33, 0x480a4a42, 0xb43787b3 },
     { 0xa1a82989, 0x81840585, 0xd2d416c6, 0xd3d013c3,
-      0x50541444, 0x111c1d0d, 0xa0ac2c8c, 0x21242505,
-      0x515c1d4d, 0x43400343, 0x10181808, 0x121c1e0e,
-      0x51501141, 0xf0fc3ccc, 0xc2c80aca, 0x63602343,
-      0x20282808, 0x40440444, 0x20202000, 0x919c1d8d,
-      0xe0e020c0, 0xe2e022c2, 0xc0c808c8, 0x13141707,
-      0xa1a42585, 0x838c0f8f, 0x03000303, 0x73783b4b,
-      0xb3b83b8b, 0x13101303, 0xd2d012c2, 0xe2ec2ece,
-      0x70703040, 0x808c0c8c, 0x333c3f0f, 0xa0a82888,
-      0x32303202, 0xd1dc1dcd, 0xf2f436c6, 0x70743444,
-      0xe0ec2ccc, 0x91941585, 0x03080b0b, 0x53541747,
-      0x505c1c4c, 0x53581b4b, 0xb1bc3d8d, 0x01000101,
-      0x20242404, 0x101c1c0c, 0x73703343, 0x90981888,
-      0x10101000, 0xc0cc0ccc, 0xf2f032c2, 0xd1d819c9,
-      0x202c2c0c, 0xe3e427c7, 0x72703242, 0x83800383,
-      0x93981b8b, 0xd1d011c1, 0x82840686, 0xc1c809c9,
-      0x60602040, 0x50501040, 0xa3a02383, 0xe3e82bcb,
-      0x010c0d0d, 0xb2b43686, 0x929c1e8e, 0x434c0f4f,
-      0xb3b43787, 0x52581a4a, 0xc2c406c6, 0x70783848,
-      0xa2a42686, 0x12101202, 0xa3ac2f8f, 0xd1d415c5,
-      0x61602141, 0xc3c003c3, 0xb0b43484, 0x41400141,
-      0x52501242, 0x717c3d4d, 0x818c0d8d, 0x00080808,
-      0x131c1f0f, 0x91981989, 0x00000000, 0x11181909,
-      0x00040404, 0x53501343, 0xf3f437c7, 0xe1e021c1,
-      0xf1fc3dcd, 0x72743646, 0x232c2f0f, 0x23242707,
-      0xb0b03080, 0x83880b8b, 0x020c0e0e, 0xa3a82b8b,
-      0xa2a02282, 0x626c2e4e, 0x93901383, 0x414c0d4d,
-      0x61682949, 0x707c3c4c, 0x01080909, 0x02080a0a,
-      0xb3bc3f8f, 0xe3ec2fcf, 0xf3f033c3, 0xc1c405c5,
-      0x83840787, 0x10141404, 0xf2fc3ece, 0x60642444,
-      0xd2dc1ece, 0x222c2e0e, 0x43480b4b, 0x12181a0a,
-      0x02040606, 0x21202101, 0x63682b4b, 0x62642646,
-      0x02000202, 0xf1f435c5, 0x92901282, 0x82880a8a,
-      0x000c0c0c, 0xb3b03383, 0x727c3e4e, 0xd0d010c0,
-      0x72783a4a, 0x43440747, 0x92941686, 0xe1e425c5,
-      0x22242606, 0x80800080, 0xa1ac2d8d, 0xd3dc1fcf,
-      0xa1a02181, 0x30303000, 0x33343707, 0xa2ac2e8e,
-      0x32343606, 0x11141505, 0x22202202, 0x30383808,
-      0xf0f434c4, 0xa3a42787, 0x41440545, 0x404c0c4c,
-      0x81800181, 0xe1e829c9, 0x80840484, 0x93941787,
-      0x31343505, 0xc3c80bcb, 0xc2cc0ece, 0x303c3c0c,
-      0x71703141, 0x11101101, 0xc3c407c7, 0x81880989,
-      0x71743545, 0xf3f83bcb, 0xd2d81aca, 0xf0f838c8,
-      0x90941484, 0x51581949, 0x82800282, 0xc0c404c4,
-      0xf3fc3fcf, 0x41480949, 0x31383909, 0x63642747,
-      0xc0c000c0, 0xc3cc0fcf, 0xd3d417c7, 0xb0b83888,
-      0x030c0f0f, 0x828c0e8e, 0x42400242, 0x23202303,
-      0x91901181, 0x606c2c4c, 0xd3d81bcb, 0xa0a42484,
-      0x30343404, 0xf1f031c1, 0x40480848, 0xc2c002c2,
-      0x636c2f4f, 0x313c3d0d, 0x212c2d0d, 0x40400040,
-      0xb2bc3e8e, 0x323c3e0e, 0xb0bc3c8c, 0xc1c001c1,
-      0xa2a82a8a, 0xb2b83a8a, 0x424c0e4e, 0x51541545,
-      0x33383b0b, 0xd0dc1ccc, 0x60682848, 0x737c3f4f,
-      0x909c1c8c, 0xd0d818c8, 0x42480a4a, 0x52541646,
-      0x73743747, 0xa0a02080, 0xe1ec2dcd, 0x42440646,
-      0xb1b43585, 0x23282b0b, 0x61642545, 0xf2f83aca,
-      0xe3e023c3, 0xb1b83989, 0xb1b03181, 0x939c1f8f,
-      0x525c1e4e, 0xf1f839c9, 0xe2e426c6, 0xb2b03282,
-      0x31303101, 0xe2e82aca, 0x616c2d4d, 0x535c1f4f,
-      0xe0e424c4, 0xf0f030c0, 0xc1cc0dcd, 0x80880888,
-      0x12141606, 0x32383a0a, 0x50581848, 0xd0d414c4,
-      0x62602242, 0x21282909, 0x03040707, 0x33303303,
-      0xe0e828c8, 0x13181b0b, 0x01040505, 0x71783949,
-      0x90901080, 0x62682a4a, 0x22282a0a, 0x92981a8a
-    },
+        0x50541444, 0x111c1d0d, 0xa0ac2c8c, 0x21242505,
+        0x515c1d4d, 0x43400343, 0x10181808, 0x121c1e0e,
+        0x51501141, 0xf0fc3ccc, 0xc2c80aca, 0x63602343,
+        0x20282808, 0x40440444, 0x20202000, 0x919c1d8d,
+        0xe0e020c0, 0xe2e022c2, 0xc0c808c8, 0x13141707,
+        0xa1a42585, 0x838c0f8f, 0x03000303, 0x73783b4b,
+        0xb3b83b8b, 0x13101303, 0xd2d012c2, 0xe2ec2ece,
+        0x70703040, 0x808c0c8c, 0x333c3f0f, 0xa0a82888,
+        0x32303202, 0xd1dc1dcd, 0xf2f436c6, 0x70743444,
+        0xe0ec2ccc, 0x91941585, 0x03080b0b, 0x53541747,
+        0x505c1c4c, 0x53581b4b, 0xb1bc3d8d, 0x01000101,
+        0x20242404, 0x101c1c0c, 0x73703343, 0x90981888,
+        0x10101000, 0xc0cc0ccc, 0xf2f032c2, 0xd1d819c9,
+        0x202c2c0c, 0xe3e427c7, 0x72703242, 0x83800383,
+        0x93981b8b, 0xd1d011c1, 0x82840686, 0xc1c809c9,
+        0x60602040, 0x50501040, 0xa3a02383, 0xe3e82bcb,
+        0x010c0d0d, 0xb2b43686, 0x929c1e8e, 0x434c0f4f,
+        0xb3b43787, 0x52581a4a, 0xc2c406c6, 0x70783848,
+        0xa2a42686, 0x12101202, 0xa3ac2f8f, 0xd1d415c5,
+        0x61602141, 0xc3c003c3, 0xb0b43484, 0x41400141,
+        0x52501242, 0x717c3d4d, 0x818c0d8d, 0x00080808,
+        0x131c1f0f, 0x91981989, 0x00000000, 0x11181909,
+        0x00040404, 0x53501343, 0xf3f437c7, 0xe1e021c1,
+        0xf1fc3dcd, 0x72743646, 0x232c2f0f, 0x23242707,
+        0xb0b03080, 0x83880b8b, 0x020c0e0e, 0xa3a82b8b,
+        0xa2a02282, 0x626c2e4e, 0x93901383, 0x414c0d4d,
+        0x61682949, 0x707c3c4c, 0x01080909, 0x02080a0a,
+        0xb3bc3f8f, 0xe3ec2fcf, 0xf3f033c3, 0xc1c405c5,
+        0x83840787, 0x10141404, 0xf2fc3ece, 0x60642444,
+        0xd2dc1ece, 0x222c2e0e, 0x43480b4b, 0x12181a0a,
+        0x02040606, 0x21202101, 0x63682b4b, 0x62642646,
+        0x02000202, 0xf1f435c5, 0x92901282, 0x82880a8a,
+        0x000c0c0c, 0xb3b03383, 0x727c3e4e, 0xd0d010c0,
+        0x72783a4a, 0x43440747, 0x92941686, 0xe1e425c5,
+        0x22242606, 0x80800080, 0xa1ac2d8d, 0xd3dc1fcf,
+        0xa1a02181, 0x30303000, 0x33343707, 0xa2ac2e8e,
+        0x32343606, 0x11141505, 0x22202202, 0x30383808,
+        0xf0f434c4, 0xa3a42787, 0x41440545, 0x404c0c4c,
+        0x81800181, 0xe1e829c9, 0x80840484, 0x93941787,
+        0x31343505, 0xc3c80bcb, 0xc2cc0ece, 0x303c3c0c,
+        0x71703141, 0x11101101, 0xc3c407c7, 0x81880989,
+        0x71743545, 0xf3f83bcb, 0xd2d81aca, 0xf0f838c8,
+        0x90941484, 0x51581949, 0x82800282, 0xc0c404c4,
+        0xf3fc3fcf, 0x41480949, 0x31383909, 0x63642747,
+        0xc0c000c0, 0xc3cc0fcf, 0xd3d417c7, 0xb0b83888,
+        0x030c0f0f, 0x828c0e8e, 0x42400242, 0x23202303,
+        0x91901181, 0x606c2c4c, 0xd3d81bcb, 0xa0a42484,
+        0x30343404, 0xf1f031c1, 0x40480848, 0xc2c002c2,
+        0x636c2f4f, 0x313c3d0d, 0x212c2d0d, 0x40400040,
+        0xb2bc3e8e, 0x323c3e0e, 0xb0bc3c8c, 0xc1c001c1,
+        0xa2a82a8a, 0xb2b83a8a, 0x424c0e4e, 0x51541545,
+        0x33383b0b, 0xd0dc1ccc, 0x60682848, 0x737c3f4f,
+        0x909c1c8c, 0xd0d818c8, 0x42480a4a, 0x52541646,
+        0x73743747, 0xa0a02080, 0xe1ec2dcd, 0x42440646,
+        0xb1b43585, 0x23282b0b, 0x61642545, 0xf2f83aca,
+        0xe3e023c3, 0xb1b83989, 0xb1b03181, 0x939c1f8f,
+        0x525c1e4e, 0xf1f839c9, 0xe2e426c6, 0xb2b03282,
+        0x31303101, 0xe2e82aca, 0x616c2d4d, 0x535c1f4f,
+        0xe0e424c4, 0xf0f030c0, 0xc1cc0dcd, 0x80880888,
+        0x12141606, 0x32383a0a, 0x50581848, 0xd0d414c4,
+        0x62602242, 0x21282909, 0x03040707, 0x33303303,
+        0xe0e828c8, 0x13181b0b, 0x01040505, 0x71783949,
+        0x90901080, 0x62682a4a, 0x22282a0a, 0x92981a8a },
     { 0x08303838, 0xc8e0e828, 0x0d212c2d, 0x86a2a426,
-      0xcfc3cc0f, 0xced2dc1e, 0x83b3b033, 0x88b0b838,
-      0x8fa3ac2f, 0x40606020, 0x45515415, 0xc7c3c407,
-      0x44404404, 0x4f636c2f, 0x4b63682b, 0x4b53581b,
-      0xc3c3c003, 0x42626022, 0x03333033, 0x85b1b435,
-      0x09212829, 0x80a0a020, 0xc2e2e022, 0x87a3a427,
-      0xc3d3d013, 0x81919011, 0x01111011, 0x06020406,
-      0x0c101c1c, 0x8cb0bc3c, 0x06323436, 0x4b43480b,
-      0xcfe3ec2f, 0x88808808, 0x4c606c2c, 0x88a0a828,
-      0x07131417, 0xc4c0c404, 0x06121416, 0xc4f0f434,
-      0xc2c2c002, 0x45414405, 0xc1e1e021, 0xc6d2d416,
-      0x0f333c3f, 0x0d313c3d, 0x8e828c0e, 0x88909818,
-      0x08202828, 0x4e424c0e, 0xc6f2f436, 0x0e323c3e,
-      0x85a1a425, 0xc9f1f839, 0x0d010c0d, 0xcfd3dc1f,
-      0xc8d0d818, 0x0b23282b, 0x46626426, 0x4a72783a,
-      0x07232427, 0x0f232c2f, 0xc1f1f031, 0x42727032,
-      0x42424002, 0xc4d0d414, 0x41414001, 0xc0c0c000,
-      0x43737033, 0x47636427, 0x8ca0ac2c, 0x8b83880b,
-      0xc7f3f437, 0x8da1ac2d, 0x80808000, 0x0f131c1f,
-      0xcac2c80a, 0x0c202c2c, 0x8aa2a82a, 0x04303434,
-      0xc2d2d012, 0x0b03080b, 0xcee2ec2e, 0xc9e1e829,
-      0x4d515c1d, 0x84909414, 0x08101818, 0xc8f0f838,
-      0x47535417, 0x8ea2ac2e, 0x08000808, 0xc5c1c405,
-      0x03131013, 0xcdc1cc0d, 0x86828406, 0x89b1b839,
-      0xcff3fc3f, 0x4d717c3d, 0xc1c1c001, 0x01313031,
-      0xc5f1f435, 0x8a82880a, 0x4a62682a, 0x81b1b031,
-      0xc1d1d011, 0x00202020, 0xc7d3d417, 0x02020002,
-      0x02222022, 0x04000404, 0x48606828, 0x41717031,
-      0x07030407, 0xcbd3d81b, 0x8d919c1d, 0x89919819,
-      0x41616021, 0x8eb2bc3e, 0xc6e2e426, 0x49515819,
-      0xcdd1dc1d, 0x41515011, 0x80909010, 0xccd0dc1c,
-      0x8a92981a, 0x83a3a023, 0x8ba3a82b, 0xc0d0d010,
-      0x81818001, 0x0f030c0f, 0x47434407, 0x0a12181a,
-      0xc3e3e023, 0xcce0ec2c, 0x8d818c0d, 0x8fb3bc3f,
-      0x86929416, 0x4b73783b, 0x4c505c1c, 0x82a2a022,
-      0x81a1a021, 0x43636023, 0x03232023, 0x4d414c0d,
-      0xc8c0c808, 0x8e929c1e, 0x8c909c1c, 0x0a32383a,
-      0x0c000c0c, 0x0e222c2e, 0x8ab2b83a, 0x4e626c2e,
-      0x8f939c1f, 0x4a52581a, 0xc2f2f032, 0x82929012,
-      0xc3f3f033, 0x49414809, 0x48707838, 0xccc0cc0c,
-      0x05111415, 0xcbf3f83b, 0x40707030, 0x45717435,
-      0x4f737c3f, 0x05313435, 0x00101010, 0x03030003,
-      0x44606424, 0x4d616c2d, 0xc6c2c406, 0x44707434,
-      0xc5d1d415, 0x84b0b434, 0xcae2e82a, 0x09010809,
-      0x46727436, 0x09111819, 0xcef2fc3e, 0x40404000,
-      0x02121012, 0xc0e0e020, 0x8db1bc3d, 0x05010405,
-      0xcaf2f83a, 0x01010001, 0xc0f0f030, 0x0a22282a,
-      0x4e525c1e, 0x89a1a829, 0x46525416, 0x43434003,
-      0x85818405, 0x04101414, 0x89818809, 0x8b93981b,
-      0x80b0b030, 0xc5e1e425, 0x48404808, 0x49717839,
-      0x87939417, 0xccf0fc3c, 0x0e121c1e, 0x82828002,
-      0x01212021, 0x8c808c0c, 0x0b13181b, 0x4f535c1f,
-      0x47737437, 0x44505414, 0x82b2b032, 0x0d111c1d,
-      0x05212425, 0x4f434c0f, 0x00000000, 0x46424406,
-      0xcde1ec2d, 0x48505818, 0x42525012, 0xcbe3e82b,
-      0x4e727c3e, 0xcad2d81a, 0xc9c1c809, 0xcdf1fc3d,
-      0x00303030, 0x85919415, 0x45616425, 0x0c303c3c,
-      0x86b2b436, 0xc4e0e424, 0x8bb3b83b, 0x4c707c3c,
-      0x0e020c0e, 0x40505010, 0x09313839, 0x06222426,
-      0x02323032, 0x84808404, 0x49616829, 0x83939013,
-      0x07333437, 0xc7e3e427, 0x04202424, 0x84a0a424,
-      0xcbc3c80b, 0x43535013, 0x0a02080a, 0x87838407,
-      0xc9d1d819, 0x4c404c0c, 0x83838003, 0x8f838c0f,
-      0xcec2cc0e, 0x0b33383b, 0x4a42480a, 0x87b3b437
-    }
+        0xcfc3cc0f, 0xced2dc1e, 0x83b3b033, 0x88b0b838,
+        0x8fa3ac2f, 0x40606020, 0x45515415, 0xc7c3c407,
+        0x44404404, 0x4f636c2f, 0x4b63682b, 0x4b53581b,
+        0xc3c3c003, 0x42626022, 0x03333033, 0x85b1b435,
+        0x09212829, 0x80a0a020, 0xc2e2e022, 0x87a3a427,
+        0xc3d3d013, 0x81919011, 0x01111011, 0x06020406,
+        0x0c101c1c, 0x8cb0bc3c, 0x06323436, 0x4b43480b,
+        0xcfe3ec2f, 0x88808808, 0x4c606c2c, 0x88a0a828,
+        0x07131417, 0xc4c0c404, 0x06121416, 0xc4f0f434,
+        0xc2c2c002, 0x45414405, 0xc1e1e021, 0xc6d2d416,
+        0x0f333c3f, 0x0d313c3d, 0x8e828c0e, 0x88909818,
+        0x08202828, 0x4e424c0e, 0xc6f2f436, 0x0e323c3e,
+        0x85a1a425, 0xc9f1f839, 0x0d010c0d, 0xcfd3dc1f,
+        0xc8d0d818, 0x0b23282b, 0x46626426, 0x4a72783a,
+        0x07232427, 0x0f232c2f, 0xc1f1f031, 0x42727032,
+        0x42424002, 0xc4d0d414, 0x41414001, 0xc0c0c000,
+        0x43737033, 0x47636427, 0x8ca0ac2c, 0x8b83880b,
+        0xc7f3f437, 0x8da1ac2d, 0x80808000, 0x0f131c1f,
+        0xcac2c80a, 0x0c202c2c, 0x8aa2a82a, 0x04303434,
+        0xc2d2d012, 0x0b03080b, 0xcee2ec2e, 0xc9e1e829,
+        0x4d515c1d, 0x84909414, 0x08101818, 0xc8f0f838,
+        0x47535417, 0x8ea2ac2e, 0x08000808, 0xc5c1c405,
+        0x03131013, 0xcdc1cc0d, 0x86828406, 0x89b1b839,
+        0xcff3fc3f, 0x4d717c3d, 0xc1c1c001, 0x01313031,
+        0xc5f1f435, 0x8a82880a, 0x4a62682a, 0x81b1b031,
+        0xc1d1d011, 0x00202020, 0xc7d3d417, 0x02020002,
+        0x02222022, 0x04000404, 0x48606828, 0x41717031,
+        0x07030407, 0xcbd3d81b, 0x8d919c1d, 0x89919819,
+        0x41616021, 0x8eb2bc3e, 0xc6e2e426, 0x49515819,
+        0xcdd1dc1d, 0x41515011, 0x80909010, 0xccd0dc1c,
+        0x8a92981a, 0x83a3a023, 0x8ba3a82b, 0xc0d0d010,
+        0x81818001, 0x0f030c0f, 0x47434407, 0x0a12181a,
+        0xc3e3e023, 0xcce0ec2c, 0x8d818c0d, 0x8fb3bc3f,
+        0x86929416, 0x4b73783b, 0x4c505c1c, 0x82a2a022,
+        0x81a1a021, 0x43636023, 0x03232023, 0x4d414c0d,
+        0xc8c0c808, 0x8e929c1e, 0x8c909c1c, 0x0a32383a,
+        0x0c000c0c, 0x0e222c2e, 0x8ab2b83a, 0x4e626c2e,
+        0x8f939c1f, 0x4a52581a, 0xc2f2f032, 0x82929012,
+        0xc3f3f033, 0x49414809, 0x48707838, 0xccc0cc0c,
+        0x05111415, 0xcbf3f83b, 0x40707030, 0x45717435,
+        0x4f737c3f, 0x05313435, 0x00101010, 0x03030003,
+        0x44606424, 0x4d616c2d, 0xc6c2c406, 0x44707434,
+        0xc5d1d415, 0x84b0b434, 0xcae2e82a, 0x09010809,
+        0x46727436, 0x09111819, 0xcef2fc3e, 0x40404000,
+        0x02121012, 0xc0e0e020, 0x8db1bc3d, 0x05010405,
+        0xcaf2f83a, 0x01010001, 0xc0f0f030, 0x0a22282a,
+        0x4e525c1e, 0x89a1a829, 0x46525416, 0x43434003,
+        0x85818405, 0x04101414, 0x89818809, 0x8b93981b,
+        0x80b0b030, 0xc5e1e425, 0x48404808, 0x49717839,
+        0x87939417, 0xccf0fc3c, 0x0e121c1e, 0x82828002,
+        0x01212021, 0x8c808c0c, 0x0b13181b, 0x4f535c1f,
+        0x47737437, 0x44505414, 0x82b2b032, 0x0d111c1d,
+        0x05212425, 0x4f434c0f, 0x00000000, 0x46424406,
+        0xcde1ec2d, 0x48505818, 0x42525012, 0xcbe3e82b,
+        0x4e727c3e, 0xcad2d81a, 0xc9c1c809, 0xcdf1fc3d,
+        0x00303030, 0x85919415, 0x45616425, 0x0c303c3c,
+        0x86b2b436, 0xc4e0e424, 0x8bb3b83b, 0x4c707c3c,
+        0x0e020c0e, 0x40505010, 0x09313839, 0x06222426,
+        0x02323032, 0x84808404, 0x49616829, 0x83939013,
+        0x07333437, 0xc7e3e427, 0x04202424, 0x84a0a424,
+        0xcbc3c80b, 0x43535013, 0x0a02080a, 0x87838407,
+        0xc9d1d819, 0x4c404c0c, 0x83838003, 0x8f838c0f,
+        0xcec2cc0e, 0x0b33383b, 0x4a42480a, 0x87b3b437 }
 };
 
 #else
 
 /* on x86_64 >5x size reduction at 40% performance penalty */
 static const unsigned char SEED_Sbox[2][256] = {
-{
-      0xA9, 0x85, 0xD6, 0xD3, 0x54, 0x1D, 0xAC, 0x25,
-      0x5D, 0x43, 0x18, 0x1E, 0x51, 0xFC, 0xCA, 0x63,
-      0x28, 0x44, 0x20, 0x9D, 0xE0, 0xE2, 0xC8, 0x17,
-      0xA5, 0x8F, 0x03, 0x7B, 0xBB, 0x13, 0xD2, 0xEE,
-      0x70, 0x8C, 0x3F, 0xA8, 0x32, 0xDD, 0xF6, 0x74,
-      0xEC, 0x95, 0x0B, 0x57, 0x5C, 0x5B, 0xBD, 0x01,
-      0x24, 0x1C, 0x73, 0x98, 0x10, 0xCC, 0xF2, 0xD9,
-      0x2C, 0xE7, 0x72, 0x83, 0x9B, 0xD1, 0x86, 0xC9,
-      0x60, 0x50, 0xA3, 0xEB, 0x0D, 0xB6, 0x9E, 0x4F,
-      0xB7, 0x5A, 0xC6, 0x78, 0xA6, 0x12, 0xAF, 0xD5,
-      0x61, 0xC3, 0xB4, 0x41, 0x52, 0x7D, 0x8D, 0x08,
-      0x1F, 0x99, 0x00, 0x19, 0x04, 0x53, 0xF7, 0xE1,
-      0xFD, 0x76, 0x2F, 0x27, 0xB0, 0x8B, 0x0E, 0xAB,
-      0xA2, 0x6E, 0x93, 0x4D, 0x69, 0x7C, 0x09, 0x0A,
-      0xBF, 0xEF, 0xF3, 0xC5, 0x87, 0x14, 0xFE, 0x64,
-      0xDE, 0x2E, 0x4B, 0x1A, 0x06, 0x21, 0x6B, 0x66,
-      0x02, 0xF5, 0x92, 0x8A, 0x0C, 0xB3, 0x7E, 0xD0,
-      0x7A, 0x47, 0x96, 0xE5, 0x26, 0x80, 0xAD, 0xDF,
-      0xA1, 0x30, 0x37, 0xAE, 0x36, 0x15, 0x22, 0x38,
-      0xF4, 0xA7, 0x45, 0x4C, 0x81, 0xE9, 0x84, 0x97,
-      0x35, 0xCB, 0xCE, 0x3C, 0x71, 0x11, 0xC7, 0x89,
-      0x75, 0xFB, 0xDA, 0xF8, 0x94, 0x59, 0x82, 0xC4,
-      0xFF, 0x49, 0x39, 0x67, 0xC0, 0xCF, 0xD7, 0xB8,
-      0x0F, 0x8E, 0x42, 0x23, 0x91, 0x6C, 0xDB, 0xA4,
-      0x34, 0xF1, 0x48, 0xC2, 0x6F, 0x3D, 0x2D, 0x40,
-      0xBE, 0x3E, 0xBC, 0xC1, 0xAA, 0xBA, 0x4E, 0x55,
-      0x3B, 0xDC, 0x68, 0x7F, 0x9C, 0xD8, 0x4A, 0x56,
-      0x77, 0xA0, 0xED, 0x46, 0xB5, 0x2B, 0x65, 0xFA,
-      0xE3, 0xB9, 0xB1, 0x9F, 0x5E, 0xF9, 0xE6, 0xB2,
-      0x31, 0xEA, 0x6D, 0x5F, 0xE4, 0xF0, 0xCD, 0x88,
-      0x16, 0x3A, 0x58, 0xD4, 0x62, 0x29, 0x07, 0x33,
-      0xE8, 0x1B, 0x05, 0x79, 0x90, 0x6A, 0x2A, 0x9A
-    },
-    {
-      0x38, 0xE8, 0x2D, 0xA6, 0xCF, 0xDE, 0xB3, 0xB8,
-      0xAF, 0x60, 0x55, 0xC7, 0x44, 0x6F, 0x6B, 0x5B,
-      0xC3, 0x62, 0x33, 0xB5, 0x29, 0xA0, 0xE2, 0xA7,
-      0xD3, 0x91, 0x11, 0x06, 0x1C, 0xBC, 0x36, 0x4B,
-      0xEF, 0x88, 0x6C, 0xA8, 0x17, 0xC4, 0x16, 0xF4,
-      0xC2, 0x45, 0xE1, 0xD6, 0x3F, 0x3D, 0x8E, 0x98,
-      0x28, 0x4E, 0xF6, 0x3E, 0xA5, 0xF9, 0x0D, 0xDF,
-      0xD8, 0x2B, 0x66, 0x7A, 0x27, 0x2F, 0xF1, 0x72,
-      0x42, 0xD4, 0x41, 0xC0, 0x73, 0x67, 0xAC, 0x8B,
-      0xF7, 0xAD, 0x80, 0x1F, 0xCA, 0x2C, 0xAA, 0x34,
-      0xD2, 0x0B, 0xEE, 0xE9, 0x5D, 0x94, 0x18, 0xF8,
-      0x57, 0xAE, 0x08, 0xC5, 0x13, 0xCD, 0x86, 0xB9,
-      0xFF, 0x7D, 0xC1, 0x31, 0xF5, 0x8A, 0x6A, 0xB1,
-      0xD1, 0x20, 0xD7, 0x02, 0x22, 0x04, 0x68, 0x71,
-      0x07, 0xDB, 0x9D, 0x99, 0x61, 0xBE, 0xE6, 0x59,
-      0xDD, 0x51, 0x90, 0xDC, 0x9A, 0xA3, 0xAB, 0xD0,
-      0x81, 0x0F, 0x47, 0x1A, 0xE3, 0xEC, 0x8D, 0xBF,
-      0x96, 0x7B, 0x5C, 0xA2, 0xA1, 0x63, 0x23, 0x4D,
-      0xC8, 0x9E, 0x9C, 0x3A, 0x0C, 0x2E, 0xBA, 0x6E,
-      0x9F, 0x5A, 0xF2, 0x92, 0xF3, 0x49, 0x78, 0xCC,
-      0x15, 0xFB, 0x70, 0x75, 0x7F, 0x35, 0x10, 0x03,
-      0x64, 0x6D, 0xC6, 0x74, 0xD5, 0xB4, 0xEA, 0x09,
-      0x76, 0x19, 0xFE, 0x40, 0x12, 0xE0, 0xBD, 0x05,
-      0xFA, 0x01, 0xF0, 0x2A, 0x5E, 0xA9, 0x56, 0x43,
-      0x85, 0x14, 0x89, 0x9B, 0xB0, 0xE5, 0x48, 0x79,
-      0x97, 0xFC, 0x1E, 0x82, 0x21, 0x8C, 0x1B, 0x5F,
-      0x77, 0x54, 0xB2, 0x1D, 0x25, 0x4F, 0x00, 0x46,
-      0xED, 0x58, 0x52, 0xEB, 0x7E, 0xDA, 0xC9, 0xFD,
-      0x30, 0x95, 0x65, 0x3C, 0xB6, 0xE4, 0xBB, 0x7C,
-      0x0E, 0x50, 0x39, 0x26, 0x32, 0x84, 0x69, 0x93,
-      0x37, 0xE7, 0x24, 0xA4, 0xCB, 0x53, 0x0A, 0x87,
-      0xD9, 0x4C, 0x83, 0x8F, 0xCE, 0x3B, 0x4A, 0xB7
-    }
+    { 0xA9, 0x85, 0xD6, 0xD3, 0x54, 0x1D, 0xAC, 0x25,
+        0x5D, 0x43, 0x18, 0x1E, 0x51, 0xFC, 0xCA, 0x63,
+        0x28, 0x44, 0x20, 0x9D, 0xE0, 0xE2, 0xC8, 0x17,
+        0xA5, 0x8F, 0x03, 0x7B, 0xBB, 0x13, 0xD2, 0xEE,
+        0x70, 0x8C, 0x3F, 0xA8, 0x32, 0xDD, 0xF6, 0x74,
+        0xEC, 0x95, 0x0B, 0x57, 0x5C, 0x5B, 0xBD, 0x01,
+        0x24, 0x1C, 0x73, 0x98, 0x10, 0xCC, 0xF2, 0xD9,
+        0x2C, 0xE7, 0x72, 0x83, 0x9B, 0xD1, 0x86, 0xC9,
+        0x60, 0x50, 0xA3, 0xEB, 0x0D, 0xB6, 0x9E, 0x4F,
+        0xB7, 0x5A, 0xC6, 0x78, 0xA6, 0x12, 0xAF, 0xD5,
+        0x61, 0xC3, 0xB4, 0x41, 0x52, 0x7D, 0x8D, 0x08,
+        0x1F, 0x99, 0x00, 0x19, 0x04, 0x53, 0xF7, 0xE1,
+        0xFD, 0x76, 0x2F, 0x27, 0xB0, 0x8B, 0x0E, 0xAB,
+        0xA2, 0x6E, 0x93, 0x4D, 0x69, 0x7C, 0x09, 0x0A,
+        0xBF, 0xEF, 0xF3, 0xC5, 0x87, 0x14, 0xFE, 0x64,
+        0xDE, 0x2E, 0x4B, 0x1A, 0x06, 0x21, 0x6B, 0x66,
+        0x02, 0xF5, 0x92, 0x8A, 0x0C, 0xB3, 0x7E, 0xD0,
+        0x7A, 0x47, 0x96, 0xE5, 0x26, 0x80, 0xAD, 0xDF,
+        0xA1, 0x30, 0x37, 0xAE, 0x36, 0x15, 0x22, 0x38,
+        0xF4, 0xA7, 0x45, 0x4C, 0x81, 0xE9, 0x84, 0x97,
+        0x35, 0xCB, 0xCE, 0x3C, 0x71, 0x11, 0xC7, 0x89,
+        0x75, 0xFB, 0xDA, 0xF8, 0x94, 0x59, 0x82, 0xC4,
+        0xFF, 0x49, 0x39, 0x67, 0xC0, 0xCF, 0xD7, 0xB8,
+        0x0F, 0x8E, 0x42, 0x23, 0x91, 0x6C, 0xDB, 0xA4,
+        0x34, 0xF1, 0x48, 0xC2, 0x6F, 0x3D, 0x2D, 0x40,
+        0xBE, 0x3E, 0xBC, 0xC1, 0xAA, 0xBA, 0x4E, 0x55,
+        0x3B, 0xDC, 0x68, 0x7F, 0x9C, 0xD8, 0x4A, 0x56,
+        0x77, 0xA0, 0xED, 0x46, 0xB5, 0x2B, 0x65, 0xFA,
+        0xE3, 0xB9, 0xB1, 0x9F, 0x5E, 0xF9, 0xE6, 0xB2,
+        0x31, 0xEA, 0x6D, 0x5F, 0xE4, 0xF0, 0xCD, 0x88,
+        0x16, 0x3A, 0x58, 0xD4, 0x62, 0x29, 0x07, 0x33,
+        0xE8, 0x1B, 0x05, 0x79, 0x90, 0x6A, 0x2A, 0x9A },
+    { 0x38, 0xE8, 0x2D, 0xA6, 0xCF, 0xDE, 0xB3, 0xB8,
+        0xAF, 0x60, 0x55, 0xC7, 0x44, 0x6F, 0x6B, 0x5B,
+        0xC3, 0x62, 0x33, 0xB5, 0x29, 0xA0, 0xE2, 0xA7,
+        0xD3, 0x91, 0x11, 0x06, 0x1C, 0xBC, 0x36, 0x4B,
+        0xEF, 0x88, 0x6C, 0xA8, 0x17, 0xC4, 0x16, 0xF4,
+        0xC2, 0x45, 0xE1, 0xD6, 0x3F, 0x3D, 0x8E, 0x98,
+        0x28, 0x4E, 0xF6, 0x3E, 0xA5, 0xF9, 0x0D, 0xDF,
+        0xD8, 0x2B, 0x66, 0x7A, 0x27, 0x2F, 0xF1, 0x72,
+        0x42, 0xD4, 0x41, 0xC0, 0x73, 0x67, 0xAC, 0x8B,
+        0xF7, 0xAD, 0x80, 0x1F, 0xCA, 0x2C, 0xAA, 0x34,
+        0xD2, 0x0B, 0xEE, 0xE9, 0x5D, 0x94, 0x18, 0xF8,
+        0x57, 0xAE, 0x08, 0xC5, 0x13, 0xCD, 0x86, 0xB9,
+        0xFF, 0x7D, 0xC1, 0x31, 0xF5, 0x8A, 0x6A, 0xB1,
+        0xD1, 0x20, 0xD7, 0x02, 0x22, 0x04, 0x68, 0x71,
+        0x07, 0xDB, 0x9D, 0x99, 0x61, 0xBE, 0xE6, 0x59,
+        0xDD, 0x51, 0x90, 0xDC, 0x9A, 0xA3, 0xAB, 0xD0,
+        0x81, 0x0F, 0x47, 0x1A, 0xE3, 0xEC, 0x8D, 0xBF,
+        0x96, 0x7B, 0x5C, 0xA2, 0xA1, 0x63, 0x23, 0x4D,
+        0xC8, 0x9E, 0x9C, 0x3A, 0x0C, 0x2E, 0xBA, 0x6E,
+        0x9F, 0x5A, 0xF2, 0x92, 0xF3, 0x49, 0x78, 0xCC,
+        0x15, 0xFB, 0x70, 0x75, 0x7F, 0x35, 0x10, 0x03,
+        0x64, 0x6D, 0xC6, 0x74, 0xD5, 0xB4, 0xEA, 0x09,
+        0x76, 0x19, 0xFE, 0x40, 0x12, 0xE0, 0xBD, 0x05,
+        0xFA, 0x01, 0xF0, 0x2A, 0x5E, 0xA9, 0x56, 0x43,
+        0x85, 0x14, 0x89, 0x9B, 0xB0, 0xE5, 0x48, 0x79,
+        0x97, 0xFC, 0x1E, 0x82, 0x21, 0x8C, 0x1B, 0x5F,
+        0x77, 0x54, 0xB2, 0x1D, 0x25, 0x4F, 0x00, 0x46,
+        0xED, 0x58, 0x52, 0xEB, 0x7E, 0xDA, 0xC9, 0xFD,
+        0x30, 0x95, 0x65, 0x3C, 0xB6, 0xE4, 0xBB, 0x7C,
+        0x0E, 0x50, 0x39, 0x26, 0x32, 0x84, 0x69, 0x93,
+        0x37, 0xE7, 0x24, 0xA4, 0xCB, 0x53, 0x0A, 0x87,
+        0xD9, 0x4C, 0x83, 0x8F, 0xCE, 0x3B, 0x4A, 0xB7 }
 };
 
 static unsigned int G_FUNC(unsigned int v)
 {
     unsigned int s0, s1, s2, s3, ret;
 
-    s0 = SEED_Sbox[0][(unsigned char)      (v) & 0xff];
-    s1 = SEED_Sbox[1][(unsigned char)((v)>> 8) & 0xff];
-    s2 = SEED_Sbox[0][(unsigned char)((v)>>16) & 0xff];
-    s3 = SEED_Sbox[1][(unsigned char)((v)>>24) & 0xff];
+    s0 = SEED_Sbox[0][(unsigned char)(v) & 0xff];
+    s1 = SEED_Sbox[1][(unsigned char)((v) >> 8) & 0xff];
+    s2 = SEED_Sbox[0][(unsigned char)((v) >> 16) & 0xff];
+    s3 = SEED_Sbox[1][(unsigned char)((v) >> 24) & 0xff];
 
-    ret  = ((s0 & 0xFC) ^ (s1 & 0xF3) ^ (s2 & 0xCF) ^ (s3 & 0x3F));
+    ret = ((s0 & 0xFC) ^ (s1 & 0xF3) ^ (s2 & 0xCF) ^ (s3 & 0x3F));
     ret |= ((s0 & 0xF3) ^ (s1 & 0xCF) ^ (s2 & 0x3F) ^ (s3 & 0xFC)) << 8;
     ret |= ((s0 & 0xCF) ^ (s1 & 0x3F) ^ (s2 & 0xFC) ^ (s3 & 0xF3)) << 16;
     ret |= ((s0 & 0x3F) ^ (s1 & 0xFC) ^ (s2 & 0xF3) ^ (s3 & 0xCF)) << 24;
 
     return ret;
 }
-# endif
+#endif
 
 /* key schedule constants - golden ratio */
-# define KC0     0x9e3779b9
-# define KC1     0x3c6ef373
-# define KC2     0x78dde6e6
-# define KC3     0xf1bbcdcc
-# define KC4     0xe3779b99
-# define KC5     0xc6ef3733
-# define KC6     0x8dde6e67
-# define KC7     0x1bbcdccf
-# define KC8     0x3779b99e
-# define KC9     0x6ef3733c
-# define KC10    0xdde6e678
-# define KC11    0xbbcdccf1
-# define KC12    0x779b99e3
-# define KC13    0xef3733c6
-# define KC14    0xde6e678d
-# define KC15    0xbcdccf1b
+#define KC0 0x9e3779b9
+#define KC1 0x3c6ef373
+#define KC2 0x78dde6e6
+#define KC3 0xf1bbcdcc
+#define KC4 0xe3779b99
+#define KC5 0xc6ef3733
+#define KC6 0x8dde6e67
+#define KC7 0x1bbcdccf
+#define KC8 0x3779b99e
+#define KC9 0x6ef3733c
+#define KC10 0xdde6e678
+#define KC11 0xbbcdccf1
+#define KC12 0x779b99e3
+#define KC13 0xef3733c6
+#define KC14 0xde6e678d
+#define KC15 0xbcdccf1b
 
-# if defined(OPENSSL_SMALL_FOOTPRINT)
+#if defined(OPENSSL_SMALL_FOOTPRINT)
 static const seed_word KC[] = {
     KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7,
     KC8, KC9, KC10, KC11, KC12, KC13, KC14, KC15
 };
-# endif
+#endif
 
 void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
-                  SEED_KEY_SCHEDULE *ks)
+    SEED_KEY_SCHEDULE *ks)
 {
     seed_word x1, x2, x3, x4;
     seed_word t0, t1;
@@ -460,7 +449,7 @@ void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
     KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC1);
     KEYUPDATE_TEMP(t0, t1, &ks->data[2]);
 
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
     KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC2);
     KEYUPDATE_TEMP(t0, t1, &ks->data[4]);
     KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC3);
@@ -489,7 +478,7 @@ void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
     KEYUPDATE_TEMP(t0, t1, &ks->data[28]);
     KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC15);
     KEYUPDATE_TEMP(t0, t1, &ks->data[30]);
-# else
+#else
     {
         int i;
         for (i = 2; i < 16; i += 2) {
@@ -499,12 +488,12 @@ void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
             KEYUPDATE_TEMP(t0, t1, &ks->data[i * 2 + 2]);
         }
     }
-# endif
+#endif
 }
 
 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)
 {
     seed_word x1, x2, x3, x4;
     seed_word t0, t1;
@@ -514,7 +503,7 @@ void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
     char2word(s + 8, x3);
     char2word(s + 12, x4);
 
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
     E_SEED(t0, t1, x1, x2, x3, x4, 0);
     E_SEED(t0, t1, x3, x4, x1, x2, 2);
     E_SEED(t0, t1, x1, x2, x3, x4, 4);
@@ -531,7 +520,7 @@ void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
     E_SEED(t0, t1, x3, x4, x1, x2, 26);
     E_SEED(t0, t1, x1, x2, x3, x4, 28);
     E_SEED(t0, t1, x3, x4, x1, x2, 30);
-# else
+#else
     {
         int i;
         for (i = 0; i < 30; i += 4) {
@@ -539,7 +528,7 @@ void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
             E_SEED(t0, t1, x3, x4, x1, x2, i + 2);
         }
     }
-# endif
+#endif
 
     word2char(x3, d);
     word2char(x4, d + 4);
@@ -548,8 +537,8 @@ void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
 }
 
 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)
 {
     seed_word x1, x2, x3, x4;
     seed_word t0, t1;
@@ -559,7 +548,7 @@ void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
     char2word(s + 8, x3);
     char2word(s + 12, x4);
 
-# if !defined(OPENSSL_SMALL_FOOTPRINT)
+#if !defined(OPENSSL_SMALL_FOOTPRINT)
     E_SEED(t0, t1, x1, x2, x3, x4, 30);
     E_SEED(t0, t1, x3, x4, x1, x2, 28);
     E_SEED(t0, t1, x1, x2, x3, x4, 26);
@@ -576,16 +565,15 @@ void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
     E_SEED(t0, t1, x3, x4, x1, x2, 4);
     E_SEED(t0, t1, x1, x2, x3, x4, 2);
     E_SEED(t0, t1, x3, x4, x1, x2, 0);
-# else
+#else
     {
         int i;
         for (i = 30; i > 0; i -= 4) {
             E_SEED(t0, t1, x1, x2, x3, x4, i);
             E_SEED(t0, t1, x3, x4, x1, x2, i - 2);
-
         }
     }
-# endif
+#endif
 
     word2char(x3, d);
     word2char(x4, d + 4);
@@ -593,4 +581,4 @@ void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
     word2char(x2, d + 12);
 }
 
-#endif                          /* OPENSSL_NO_SEED */
+#endif /* OPENSSL_NO_SEED */
diff --git a/crypto/seed/seed_cbc.c b/crypto/seed/seed_cbc.c
index d5a324fd4443b..a783d3b7aab8a 100644
--- a/crypto/seed/seed_cbc.c
+++ b/crypto/seed/seed_cbc.c
@@ -17,13 +17,13 @@
 #include <openssl/modes.h>
 
 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)
+    size_t len, const SEED_KEY_SCHEDULE *ks,
+    unsigned char ivec[SEED_BLOCK_SIZE], int enc)
 {
     if (enc)
         CRYPTO_cbc128_encrypt(in, out, len, ks, ivec,
-                              (block128_f) SEED_encrypt);
+            (block128_f)SEED_encrypt);
     else
         CRYPTO_cbc128_decrypt(in, out, len, ks, ivec,
-                              (block128_f) SEED_decrypt);
+            (block128_f)SEED_decrypt);
 }
diff --git a/crypto/seed/seed_cfb.c b/crypto/seed/seed_cfb.c
index 24fbfbf746e32..4e39babac5607 100644
--- a/crypto/seed/seed_cfb.c
+++ b/crypto/seed/seed_cfb.c
@@ -17,10 +17,10 @@
 #include <openssl/modes.h>
 
 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)
 {
     CRYPTO_cfb128_encrypt(in, out, len, ks, ivec, num, enc,
-                          (block128_f) SEED_encrypt);
+        (block128_f)SEED_encrypt);
 }
diff --git a/crypto/seed/seed_ecb.c b/crypto/seed/seed_ecb.c
index 9f357511cd944..0317a31d523d7 100644
--- a/crypto/seed/seed_ecb.c
+++ b/crypto/seed/seed_ecb.c
@@ -16,7 +16,7 @@
 #include <openssl/seed.h>
 
 void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      const SEED_KEY_SCHEDULE *ks, int enc)
+    const SEED_KEY_SCHEDULE *ks, int enc)
 {
     if (enc)
         SEED_encrypt(in, out, ks);
diff --git a/crypto/seed/seed_local.h b/crypto/seed/seed_local.h
index dd40ee69deb68..6f0b9e7a4390c 100644
--- a/crypto/seed/seed_local.h
+++ b/crypto/seed/seed_local.h
@@ -33,80 +33,79 @@
  *
  */
 #ifndef OSSL_CRYPTO_SEED_LOCAL_H
-# define OSSL_CRYPTO_SEED_LOCAL_H
+#define OSSL_CRYPTO_SEED_LOCAL_H
 
-# include <openssl/e_os2.h>
-# include <openssl/seed.h>
+#include <openssl/e_os2.h>
+#include <openssl/seed.h>
 
-# ifdef SEED_LONG               /* need 32-bit type */
+#ifdef SEED_LONG /* need 32-bit type */
 typedef unsigned long seed_word;
-# else
+#else
 typedef unsigned int seed_word;
-# endif
+#endif
 
+#define char2word(c, i) \
+    (i) = ((((seed_word)(c)[0]) << 24) | (((seed_word)(c)[1]) << 16) | (((seed_word)(c)[2]) << 8) | ((seed_word)(c)[3]))
 
-# define char2word(c, i)  \
-        (i) = ((((seed_word)(c)[0]) << 24) | (((seed_word)(c)[1]) << 16) | (((seed_word)(c)[2]) << 8) | ((seed_word)(c)[3]))
+#define word2char(l, c)                             \
+    *((c) + 0) = (unsigned char)((l) >> 24) & 0xff; \
+    *((c) + 1) = (unsigned char)((l) >> 16) & 0xff; \
+    *((c) + 2) = (unsigned char)((l) >> 8) & 0xff;  \
+    *((c) + 3) = (unsigned char)((l)) & 0xff
 
-# define word2char(l, c)  \
-        *((c)+0) = (unsigned char)((l)>>24) & 0xff; \
-        *((c)+1) = (unsigned char)((l)>>16) & 0xff; \
-        *((c)+2) = (unsigned char)((l)>> 8) & 0xff; \
-        *((c)+3) = (unsigned char)((l))     & 0xff
+#define KEYSCHEDULE_UPDATE0(T0, T1, X1, X2, X3, X4, KC) \
+    (T0) = (X3);                                        \
+    (X3) = (((X3) << 8) ^ ((X4) >> 24)) & 0xffffffff;   \
+    (X4) = (((X4) << 8) ^ ((T0) >> 24)) & 0xffffffff;   \
+    (T0) = ((X1) + (X3) - (KC)) & 0xffffffff;           \
+    (T1) = ((X2) + (KC) - (X4)) & 0xffffffff
 
-# define KEYSCHEDULE_UPDATE0(T0, T1, X1, X2, X3, X4, KC)  \
-        (T0) = (X3);                                     \
-        (X3) = (((X3)<<8) ^ ((X4)>>24)) & 0xffffffff;    \
-        (X4) = (((X4)<<8) ^ ((T0)>>24)) & 0xffffffff;    \
-        (T0) = ((X1) + (X3) - (KC))     & 0xffffffff;    \
-        (T1) = ((X2) + (KC) - (X4))     & 0xffffffff
+#define KEYSCHEDULE_UPDATE1(T0, T1, X1, X2, X3, X4, KC) \
+    (T0) = (X1);                                        \
+    (X1) = (((X1) >> 8) ^ ((X2) << 24)) & 0xffffffff;   \
+    (X2) = (((X2) >> 8) ^ ((T0) << 24)) & 0xffffffff;   \
+    (T0) = ((X1) + (X3) - (KC)) & 0xffffffff;           \
+    (T1) = ((X2) + (KC) - (X4)) & 0xffffffff
 
-# define KEYSCHEDULE_UPDATE1(T0, T1, X1, X2, X3, X4, KC)  \
-        (T0) = (X1);                                     \
-        (X1) = (((X1)>>8) ^ ((X2)<<24)) & 0xffffffff;    \
-        (X2) = (((X2)>>8) ^ ((T0)<<24)) & 0xffffffff;    \
-        (T0) = ((X1) + (X3) - (KC))     & 0xffffffff;     \
-        (T1) = ((X2) + (KC) - (X4))     & 0xffffffff
+#define KEYUPDATE_TEMP(T0, T1, K) \
+    (K)[0] = G_FUNC((T0));        \
+    (K)[1] = G_FUNC((T1))
 
-# define KEYUPDATE_TEMP(T0, T1, K)   \
-        (K)[0] = G_FUNC((T0));      \
-        (K)[1] = G_FUNC((T1))
+#define XOR_SEEDBLOCK(DST, SRC) \
+    ((DST))[0] ^= ((SRC))[0];   \
+    ((DST))[1] ^= ((SRC))[1];   \
+    ((DST))[2] ^= ((SRC))[2];   \
+    ((DST))[3] ^= ((SRC))[3]
 
-# define XOR_SEEDBLOCK(DST, SRC)      \
-        ((DST))[0] ^= ((SRC))[0];    \
-        ((DST))[1] ^= ((SRC))[1];    \
-        ((DST))[2] ^= ((SRC))[2];    \
-        ((DST))[3] ^= ((SRC))[3]
+#define MOV_SEEDBLOCK(DST, SRC) \
+    ((DST))[0] = ((SRC))[0];    \
+    ((DST))[1] = ((SRC))[1];    \
+    ((DST))[2] = ((SRC))[2];    \
+    ((DST))[3] = ((SRC))[3]
 
-# define MOV_SEEDBLOCK(DST, SRC)      \
-        ((DST))[0] = ((SRC))[0];     \
-        ((DST))[1] = ((SRC))[1];     \
-        ((DST))[2] = ((SRC))[2];     \
-        ((DST))[3] = ((SRC))[3]
+#define CHAR2WORD(C, I)         \
+    char2word((C), (I)[0]);     \
+    char2word((C + 4), (I)[1]); \
+    char2word((C + 8), (I)[2]); \
+    char2word((C + 12), (I)[3])
 
-# define CHAR2WORD(C, I)              \
-        char2word((C),    (I)[0]);    \
-        char2word((C+4),  (I)[1]);    \
-        char2word((C+8),  (I)[2]);    \
-        char2word((C+12), (I)[3])
+#define WORD2CHAR(I, C)         \
+    word2char((I)[0], (C));     \
+    word2char((I)[1], (C + 4)); \
+    word2char((I)[2], (C + 8)); \
+    word2char((I)[3], (C + 12))
 
-# define WORD2CHAR(I, C)              \
-        word2char((I)[0], (C));       \
-        word2char((I)[1], (C+4));     \
-        word2char((I)[2], (C+8));     \
-        word2char((I)[3], (C+12))
+#define E_SEED(T0, T1, X1, X2, X3, X4, rbase) \
+    (T0) = (X3) ^ (ks->data)[(rbase)];        \
+    (T1) = (X4) ^ (ks->data)[(rbase) + 1];    \
+    (T1) ^= (T0);                             \
+    (T1) = G_FUNC((T1));                      \
+    (T0) = ((T0) + (T1)) & 0xffffffff;        \
+    (T0) = G_FUNC((T0));                      \
+    (T1) = ((T1) + (T0)) & 0xffffffff;        \
+    (T1) = G_FUNC((T1));                      \
+    (T0) = ((T0) + (T1)) & 0xffffffff;        \
+    (X1) ^= (T0);                             \
+    (X2) ^= (T1)
 
-# define E_SEED(T0, T1, X1, X2, X3, X4, rbase)   \
-        (T0) = (X3) ^ (ks->data)[(rbase)];       \
-        (T1) = (X4) ^ (ks->data)[(rbase)+1];     \
-        (T1) ^= (T0);                            \
-        (T1) = G_FUNC((T1));                     \
-        (T0) = ((T0) + (T1)) & 0xffffffff;       \
-        (T0) = G_FUNC((T0));                     \
-        (T1) = ((T1) + (T0)) & 0xffffffff;       \
-        (T1) = G_FUNC((T1));                     \
-        (T0) = ((T0) + (T1)) & 0xffffffff;       \
-        (X1) ^= (T0);                            \
-        (X2) ^= (T1)
-
-#endif                          /* OSSL_CRYPTO_SEED_LOCAL_H */
+#endif /* OSSL_CRYPTO_SEED_LOCAL_H */
diff --git a/crypto/seed/seed_ofb.c b/crypto/seed/seed_ofb.c
index b2e905331d9ff..c51e1ba46b110 100644
--- a/crypto/seed/seed_ofb.c
+++ b/crypto/seed/seed_ofb.c
@@ -17,9 +17,9 @@
 #include <openssl/modes.h>
 
 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)
+    size_t len, const SEED_KEY_SCHEDULE *ks,
+    unsigned char ivec[SEED_BLOCK_SIZE], int *num)
 {
     CRYPTO_ofb128_encrypt(in, out, len, ks, ivec, num,
-                          (block128_f) SEED_encrypt);
+        (block128_f)SEED_encrypt);
 }
diff --git a/crypto/self_test_core.c b/crypto/self_test_core.c
index 1496a37b80961..b8226c43ccf80 100644
--- a/crypto/self_test_core.c
+++ b/crypto/self_test_core.c
@@ -50,7 +50,7 @@ static SELF_TEST_CB *get_self_test_callback(OSSL_LIB_CTX *libctx)
 }
 
 void OSSL_SELF_TEST_set_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK *cb,
-                                 void *cbarg)
+    void *cbarg)
 {
     SELF_TEST_CB *stcb = get_self_test_callback(libctx);
 
@@ -61,7 +61,7 @@ void OSSL_SELF_TEST_set_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK *cb,
 }
 
 void OSSL_SELF_TEST_get_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK **cb,
-                                 void **cbarg)
+    void **cbarg)
 {
     SELF_TEST_CB *stcb = get_self_test_callback(libctx);
 
@@ -77,15 +77,12 @@ static void self_test_setparams(OSSL_SELF_TEST *st)
     size_t n = 0;
 
     if (st->cb != NULL) {
-        st->params[n++] =
-            OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_SELF_TEST_PHASE,
-                                             (char *)st->phase, 0);
-        st->params[n++] =
-            OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_SELF_TEST_TYPE,
-                                             (char *)st->type, 0);
-        st->params[n++] =
-            OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_SELF_TEST_DESC,
-                                             (char *)st->desc, 0);
+        st->params[n++] = OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_SELF_TEST_PHASE,
+            (char *)st->phase, 0);
+        st->params[n++] = OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_SELF_TEST_TYPE,
+            (char *)st->type, 0);
+        st->params[n++] = OSSL_PARAM_construct_utf8_string(OSSL_PROV_PARAM_SELF_TEST_DESC,
+            (char *)st->desc, 0);
     }
     st->params[n++] = OSSL_PARAM_construct_end();
 }
@@ -113,7 +110,7 @@ void OSSL_SELF_TEST_free(OSSL_SELF_TEST *st)
 
 /* Can be used during application testing to log that a test has started. */
 void OSSL_SELF_TEST_onbegin(OSSL_SELF_TEST *st, const char *type,
-                            const char *desc)
+    const char *desc)
 {
     if (st != NULL && st->cb != NULL) {
         st->phase = OSSL_SELF_TEST_PHASE_START;
@@ -131,8 +128,7 @@ void OSSL_SELF_TEST_onbegin(OSSL_SELF_TEST *st, const char *type,
 void OSSL_SELF_TEST_onend(OSSL_SELF_TEST *st, int ret)
 {
     if (st != NULL && st->cb != NULL) {
-        st->phase =
-            (ret == 1 ? OSSL_SELF_TEST_PHASE_PASS : OSSL_SELF_TEST_PHASE_FAIL);
+        st->phase = (ret == 1 ? OSSL_SELF_TEST_PHASE_PASS : OSSL_SELF_TEST_PHASE_FAIL);
         self_test_setparams(st);
         (void)st->cb(st->params, st->cb_arg);
 
diff --git a/crypto/sha/keccak1600.c b/crypto/sha/keccak1600.c
index 5d6abeb463a15..59e688ce4333f 100644
--- a/crypto/sha/keccak1600.c
+++ b/crypto/sha/keccak1600.c
@@ -14,7 +14,7 @@
 #include "internal/nelem.h"
 
 size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
-                   size_t r);
+    size_t r);
 void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r, int next);
 
 #if !defined(KECCAK1600_ASM) || !defined(SELFTEST)
@@ -22,33 +22,27 @@ void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r, in
 /*
  * Choose some sensible defaults
  */
-#if !defined(KECCAK_REF) && !defined(KECCAK_1X) && !defined(KECCAK_1X_ALT) && \
-    !defined(KECCAK_2X) && !defined(KECCAK_INPLACE)
-# define KECCAK_2X      /* default to KECCAK_2X variant */
+#if !defined(KECCAK_REF) && !defined(KECCAK_1X) && !defined(KECCAK_1X_ALT) && !defined(KECCAK_2X) && !defined(KECCAK_INPLACE)
+#define KECCAK_2X /* default to KECCAK_2X variant */
 #endif
 
-#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
-    (defined(__x86_64) && !defined(__BMI__)) || defined(_M_X64) || \
-    defined(__mips) || defined(__riscv) || defined(__s390__) || \
-    defined(__EMSCRIPTEN__)
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || (defined(__x86_64) && !defined(__BMI__)) || defined(_M_X64) || defined(__mips) || defined(__riscv) || defined(__s390__) || defined(__EMSCRIPTEN__)
 /*
  * These don't have "and with complement" instruction, so minimize amount
  * of "not"-s. Implemented only in the [default] KECCAK_2X variant.
  */
-# define KECCAK_COMPLEMENTING_TRANSFORM
+#define KECCAK_COMPLEMENTING_TRANSFORM
 #endif
 
-#if defined(__x86_64__) || defined(__aarch64__) || \
-    defined(__mips64) || defined(__ia64) || \
-    (defined(__VMS) && !defined(__vax))
+#if defined(__x86_64__) || defined(__aarch64__) || defined(__mips64) || defined(__ia64) || (defined(__VMS) && !defined(__vax))
 /*
  * These are available even in ILP32 flavours, but even then they are
  * capable of performing 64-bit operations as efficiently as in *P64.
  * Since it's not given that we can use sizeof(void *), just shunt it.
  */
-# define BIT_INTERLEAVE (0)
+#define BIT_INTERLEAVE (0)
 #else
-# define BIT_INTERLEAVE (sizeof(void *) < 8)
+#define BIT_INTERLEAVE (sizeof(void *) < 8)
 #endif
 
 #define ROL32(a, offset) (((a) << (offset)) | ((a) >> ((32 - (offset)) & 31)))
@@ -58,7 +52,7 @@ static uint64_t ROL64(uint64_t val, int offset)
     if (offset == 0) {
         return val;
     } else if (!BIT_INTERLEAVE) {
-        return (val << offset) | (val >> (64-offset));
+        return (val << offset) | (val >> (64 - offset));
     } else {
         uint32_t hi = (uint32_t)(val >> 32), lo = (uint32_t)val;
 
@@ -79,11 +73,11 @@ static uint64_t ROL64(uint64_t val, int offset)
 }
 
 static const unsigned char rhotates[5][5] = {
-    {  0,  1, 62, 28, 27 },
-    { 36, 44,  6, 55, 20 },
-    {  3, 10, 43, 25, 39 },
-    { 41, 45, 15, 21,  8 },
-    { 18,  2, 61, 56, 14 }
+    { 0, 1, 62, 28, 27 },
+    { 36, 44, 6, 55, 20 },
+    { 3, 10, 43, 25, 39 },
+    { 41, 45, 15, 21, 8 },
+    { 18, 2, 61, 56, 14 }
 };
 
 static const uint64_t iotas[] = {
@@ -263,8 +257,8 @@ static void KeccakF1600(uint64_t A[5][5])
  */
 static void Round(uint64_t A[5][5], size_t i)
 {
-    uint64_t C[5], E[2];        /* registers */
-    uint64_t D[5], T[2][5];     /* memory    */
+    uint64_t C[5], E[2]; /* registers */
+    uint64_t D[5], T[2][5]; /* memory    */
 
     assert(i < OSSL_NELEM(iotas));
 
@@ -287,11 +281,11 @@ static void Round(uint64_t A[5][5], size_t i)
     T[0][3] = A[0][3] ^ C[2]; /* D[3] */
     T[0][4] = A[0][4] ^ E[1]; /* D[4] */
 
-    C[3] = ROL64(A[3][3] ^ C[2], rhotates[3][3]);   /* D[3] */
-    C[4] = ROL64(A[4][4] ^ E[1], rhotates[4][4]);   /* D[4] */
-    C[0] =       A[0][0] ^ C[0]; /* rotate by 0 */  /* D[0] */
-    C[2] = ROL64(A[2][2] ^ C[1], rhotates[2][2]);   /* D[2] */
-    C[1] = ROL64(A[1][1] ^ E[0], rhotates[1][1]);   /* D[1] */
+    C[3] = ROL64(A[3][3] ^ C[2], rhotates[3][3]); /* D[3] */
+    C[4] = ROL64(A[4][4] ^ E[1], rhotates[4][4]); /* D[4] */
+    C[0] = A[0][0] ^ C[0]; /* rotate by 0 */ /* D[0] */
+    C[2] = ROL64(A[2][2] ^ C[1], rhotates[2][2]); /* D[2] */
+    C[1] = ROL64(A[1][1] ^ E[0], rhotates[1][1]); /* D[1] */
 #else
     D[0] = ROL64(C[1], 1) ^ C[4];
     D[1] = ROL64(C[2], 1) ^ C[0];
@@ -305,7 +299,7 @@ static void Round(uint64_t A[5][5], size_t i)
     T[0][3] = A[0][3] ^ D[3];
     T[0][4] = A[0][4] ^ D[4];
 
-    C[0] =       A[0][0] ^ D[0]; /* rotate by 0 */
+    C[0] = A[0][0] ^ D[0]; /* rotate by 0 */
     C[1] = ROL64(A[1][1] ^ D[1], rhotates[1][1]);
     C[2] = ROL64(A[2][2] ^ D[2], rhotates[2][2]);
     C[3] = ROL64(A[3][3] ^ D[3], rhotates[3][3]);
@@ -323,11 +317,11 @@ static void Round(uint64_t A[5][5], size_t i)
     T[1][3] = A[1][3] ^ (E[1] = D[3]);
     T[1][4] = A[2][4] ^ (C[2] = D[4]); /* borrow T[1][4] */
 
-    C[0] = ROL64(T[0][3],        rhotates[0][3]);
-    C[1] = ROL64(A[1][4] ^ C[2], rhotates[1][4]);   /* D[4] */
-    C[2] = ROL64(A[2][0] ^ C[3], rhotates[2][0]);   /* D[0] */
-    C[3] = ROL64(A[3][1] ^ C[4], rhotates[3][1]);   /* D[1] */
-    C[4] = ROL64(A[4][2] ^ E[0], rhotates[4][2]);   /* D[2] */
+    C[0] = ROL64(T[0][3], rhotates[0][3]);
+    C[1] = ROL64(A[1][4] ^ C[2], rhotates[1][4]); /* D[4] */
+    C[2] = ROL64(A[2][0] ^ C[3], rhotates[2][0]); /* D[0] */
+    C[3] = ROL64(A[3][1] ^ C[4], rhotates[3][1]); /* D[1] */
+    C[4] = ROL64(A[4][2] ^ E[0], rhotates[4][2]); /* D[2] */
 
     A[1][0] = C[0] ^ (~C[1] & C[2]);
     A[1][1] = C[1] ^ (~C[2] & C[3]);
@@ -335,8 +329,8 @@ static void Round(uint64_t A[5][5], size_t i)
     A[1][3] = C[3] ^ (~C[4] & C[0]);
     A[1][4] = C[4] ^ (~C[0] & C[1]);
 
-    C[0] = ROL64(T[0][1],        rhotates[0][1]);
-    C[1] = ROL64(T[1][2],        rhotates[1][2]);
+    C[0] = ROL64(T[0][1], rhotates[0][1]);
+    C[1] = ROL64(T[1][2], rhotates[1][2]);
     C[2] = ROL64(A[2][3] ^ D[3], rhotates[2][3]);
     C[3] = ROL64(A[3][4] ^ D[4], rhotates[3][4]);
     C[4] = ROL64(A[4][0] ^ D[0], rhotates[4][0]);
@@ -347,9 +341,9 @@ static void Round(uint64_t A[5][5], size_t i)
     A[2][3] = C[3] ^ (~C[4] & C[0]);
     A[2][4] = C[4] ^ (~C[0] & C[1]);
 
-    C[0] = ROL64(T[0][4],        rhotates[0][4]);
-    C[1] = ROL64(T[1][0],        rhotates[1][0]);
-    C[2] = ROL64(T[1][1],        rhotates[2][1]); /* originally A[2][1] */
+    C[0] = ROL64(T[0][4], rhotates[0][4]);
+    C[1] = ROL64(T[1][0], rhotates[1][0]);
+    C[2] = ROL64(T[1][1], rhotates[2][1]); /* originally A[2][1] */
     C[3] = ROL64(A[3][2] ^ D[2], rhotates[3][2]);
     C[4] = ROL64(A[4][3] ^ D[3], rhotates[4][3]);
 
@@ -359,10 +353,10 @@ static void Round(uint64_t A[5][5], size_t i)
     A[3][3] = C[3] ^ (~C[4] & C[0]);
     A[3][4] = C[4] ^ (~C[0] & C[1]);
 
-    C[0] = ROL64(T[0][2],        rhotates[0][2]);
-    C[1] = ROL64(T[1][3],        rhotates[1][3]);
-    C[2] = ROL64(T[1][4],        rhotates[2][4]); /* originally A[2][4] */
-    C[3] = ROL64(T[0][0],        rhotates[3][0]); /* originally A[3][0] */
+    C[0] = ROL64(T[0][2], rhotates[0][2]);
+    C[1] = ROL64(T[1][3], rhotates[1][3]);
+    C[2] = ROL64(T[1][4], rhotates[2][4]); /* originally A[2][4] */
+    C[3] = ROL64(T[0][0], rhotates[3][0]); /* originally A[3][0] */
     C[4] = ROL64(A[4][1] ^ D[1], rhotates[4][1]);
 
     A[4][0] = C[0] ^ (~C[1] & C[2]);
@@ -401,8 +395,8 @@ static void Round(uint64_t A[5][5], size_t i)
     C[3] = A[0][3] ^ A[1][3] ^ A[2][3] ^ A[3][3] ^ A[4][3];
     C[4] = A[0][4] ^ A[1][4] ^ A[2][4] ^ A[3][4] ^ A[4][4];
 
-    D[1] = C[0] ^  ROL64(C[2], 1);
-    D[2] = C[1] ^  ROL64(C[3], 1);
+    D[1] = C[0] ^ ROL64(C[2], 1);
+    D[2] = C[1] ^ ROL64(C[3], 1);
     D[3] = C[2] ^= ROL64(C[4], 1);
     D[4] = C[3] ^= ROL64(C[0], 1);
     D[0] = C[4] ^= ROL64(C[1], 1);
@@ -467,10 +461,10 @@ static void Round(uint64_t A[5][5], size_t i)
     A[1][2] = ROL64(A[2][0], rhotates[2][0]);
     A[3][1] = ROL64(A[1][0], rhotates[1][0]);
 
-    A[1][0] = ROL64(C[3],    rhotates[0][3]);
-    A[2][0] = ROL64(C[1],    rhotates[0][1]);
-    A[3][0] = ROL64(C[4],    rhotates[0][4]);
-    A[4][0] = ROL64(C[2],    rhotates[0][2]);
+    A[1][0] = ROL64(C[3], rhotates[0][3]);
+    A[2][0] = ROL64(C[1], rhotates[0][1]);
+    A[3][0] = ROL64(C[4], rhotates[0][4]);
+    A[4][0] = ROL64(C[2], rhotates[0][2]);
 
     C[0] = A[0][0];
     C[1] = A[1][0];
@@ -485,8 +479,8 @@ static void Round(uint64_t A[5][5], size_t i)
     A[1][2] ^= (~A[1][3] & A[1][4]);
     A[0][3] ^= (~A[0][4] & C[0]);
     A[1][3] ^= (~A[1][4] & C[1]);
-    A[0][4] ^= (~C[0]    & D[0]);
-    A[1][4] ^= (~C[1]    & D[1]);
+    A[0][4] ^= (~C[0] & D[0]);
+    A[1][4] ^= (~C[1] & D[1]);
 
     C[2] = A[2][0];
     C[3] = A[3][0];
@@ -501,8 +495,8 @@ static void Round(uint64_t A[5][5], size_t i)
     A[3][2] ^= (~A[3][3] & A[3][4]);
     A[2][3] ^= (~A[2][4] & C[2]);
     A[3][3] ^= (~A[3][4] & C[3]);
-    A[2][4] ^= (~C[2]    & D[2]);
-    A[3][4] ^= (~C[3]    & D[3]);
+    A[2][4] ^= (~C[2] & D[2]);
+    A[3][4] ^= (~C[3] & D[3]);
 
     C[4] = A[4][0];
     D[4] = A[4][1];
@@ -511,7 +505,7 @@ static void Round(uint64_t A[5][5], size_t i)
     A[4][1] ^= (~A[4][2] & A[4][3]);
     A[4][2] ^= (~A[4][3] & A[4][4]);
     A[4][3] ^= (~A[4][4] & C[4]);
-    A[4][4] ^= (~C[4]    & D[4]);
+    A[4][4] ^= (~C[4] & D[4]);
     A[0][0] ^= iotas[i];
 }
 
@@ -552,18 +546,18 @@ static void Round(uint64_t R[5][5], uint64_t A[5][5], size_t i)
     D[3] = ROL64(C[4], 1) ^ C[2];
     D[4] = ROL64(C[0], 1) ^ C[3];
 
-    C[0] =       A[0][0] ^ D[0]; /* rotate by 0 */
+    C[0] = A[0][0] ^ D[0]; /* rotate by 0 */
     C[1] = ROL64(A[1][1] ^ D[1], rhotates[1][1]);
     C[2] = ROL64(A[2][2] ^ D[2], rhotates[2][2]);
     C[3] = ROL64(A[3][3] ^ D[3], rhotates[3][3]);
     C[4] = ROL64(A[4][4] ^ D[4], rhotates[4][4]);
 
 #ifdef KECCAK_COMPLEMENTING_TRANSFORM
-    R[0][0] = C[0] ^ ( C[1] | C[2]) ^ iotas[i];
+    R[0][0] = C[0] ^ (C[1] | C[2]) ^ iotas[i];
     R[0][1] = C[1] ^ (~C[2] | C[3]);
-    R[0][2] = C[2] ^ ( C[3] & C[4]);
-    R[0][3] = C[3] ^ ( C[4] | C[0]);
-    R[0][4] = C[4] ^ ( C[0] & C[1]);
+    R[0][2] = C[2] ^ (C[3] & C[4]);
+    R[0][3] = C[3] ^ (C[4] | C[0]);
+    R[0][4] = C[4] ^ (C[0] & C[1]);
 #else
     R[0][0] = C[0] ^ (~C[1] & C[2]) ^ iotas[i];
     R[0][1] = C[1] ^ (~C[2] & C[3]);
@@ -579,11 +573,11 @@ static void Round(uint64_t R[5][5], uint64_t A[5][5], size_t i)
     C[4] = ROL64(A[4][2] ^ D[2], rhotates[4][2]);
 
 #ifdef KECCAK_COMPLEMENTING_TRANSFORM
-    R[1][0] = C[0] ^ (C[1] |  C[2]);
-    R[1][1] = C[1] ^ (C[2] &  C[3]);
+    R[1][0] = C[0] ^ (C[1] | C[2]);
+    R[1][1] = C[1] ^ (C[2] & C[3]);
     R[1][2] = C[2] ^ (C[3] | ~C[4]);
-    R[1][3] = C[3] ^ (C[4] |  C[0]);
-    R[1][4] = C[4] ^ (C[0] &  C[1]);
+    R[1][3] = C[3] ^ (C[4] | C[0]);
+    R[1][4] = C[4] ^ (C[0] & C[1]);
 #else
     R[1][0] = C[0] ^ (~C[1] & C[2]);
     R[1][1] = C[1] ^ (~C[2] & C[3]);
@@ -599,11 +593,11 @@ static void Round(uint64_t R[5][5], uint64_t A[5][5], size_t i)
     C[4] = ROL64(A[4][0] ^ D[0], rhotates[4][0]);
 
 #ifdef KECCAK_COMPLEMENTING_TRANSFORM
-    R[2][0] =  C[0] ^ ( C[1] | C[2]);
-    R[2][1] =  C[1] ^ ( C[2] & C[3]);
-    R[2][2] =  C[2] ^ (~C[3] & C[4]);
-    R[2][3] = ~C[3] ^ ( C[4] | C[0]);
-    R[2][4] =  C[4] ^ ( C[0] & C[1]);
+    R[2][0] = C[0] ^ (C[1] | C[2]);
+    R[2][1] = C[1] ^ (C[2] & C[3]);
+    R[2][2] = C[2] ^ (~C[3] & C[4]);
+    R[2][3] = ~C[3] ^ (C[4] | C[0]);
+    R[2][4] = C[4] ^ (C[0] & C[1]);
 #else
     R[2][0] = C[0] ^ (~C[1] & C[2]);
     R[2][1] = C[1] ^ (~C[2] & C[3]);
@@ -619,11 +613,11 @@ static void Round(uint64_t R[5][5], uint64_t A[5][5], size_t i)
     C[4] = ROL64(A[4][3] ^ D[3], rhotates[4][3]);
 
 #ifdef KECCAK_COMPLEMENTING_TRANSFORM
-    R[3][0] =  C[0] ^ ( C[1] & C[2]);
-    R[3][1] =  C[1] ^ ( C[2] | C[3]);
-    R[3][2] =  C[2] ^ (~C[3] | C[4]);
-    R[3][3] = ~C[3] ^ ( C[4] & C[0]);
-    R[3][4] =  C[4] ^ ( C[0] | C[1]);
+    R[3][0] = C[0] ^ (C[1] & C[2]);
+    R[3][1] = C[1] ^ (C[2] | C[3]);
+    R[3][2] = C[2] ^ (~C[3] | C[4]);
+    R[3][3] = ~C[3] ^ (C[4] & C[0]);
+    R[3][4] = C[4] ^ (C[0] | C[1]);
 #else
     R[3][0] = C[0] ^ (~C[1] & C[2]);
     R[3][1] = C[1] ^ (~C[2] & C[3]);
@@ -639,11 +633,11 @@ static void Round(uint64_t R[5][5], uint64_t A[5][5], size_t i)
     C[4] = ROL64(A[4][1] ^ D[1], rhotates[4][1]);
 
 #ifdef KECCAK_COMPLEMENTING_TRANSFORM
-    R[4][0] =  C[0] ^ (~C[1] & C[2]);
-    R[4][1] = ~C[1] ^ ( C[2] | C[3]);
-    R[4][2] =  C[2] ^ ( C[3] & C[4]);
-    R[4][3] =  C[3] ^ ( C[4] | C[0]);
-    R[4][4] =  C[4] ^ ( C[0] & C[1]);
+    R[4][0] = C[0] ^ (~C[1] & C[2]);
+    R[4][1] = ~C[1] ^ (C[2] | C[3]);
+    R[4][2] = C[2] ^ (C[3] & C[4]);
+    R[4][3] = C[3] ^ (C[4] | C[0]);
+    R[4][4] = C[4] ^ (C[0] & C[1]);
 #else
     R[4][0] = C[0] ^ (~C[1] & C[2]);
     R[4][1] = C[1] ^ (~C[2] & C[3]);
@@ -682,7 +676,7 @@ static void KeccakF1600(uint64_t A[5][5])
 #endif
 }
 
-#else   /* define KECCAK_INPLACE to compile this code path */
+#else /* define KECCAK_INPLACE to compile this code path */
 /*
  * This implementation is KECCAK_1X from above combined 4 times with
  * a twist that allows to omit temporary storage and perform in-place
@@ -711,7 +705,7 @@ static void FourRounds(uint64_t A[5][5], size_t i)
     D[3] = ROL64(C[4], 1) ^ C[2];
     D[4] = ROL64(C[0], 1) ^ C[3];
 
-    B[0] =       A[0][0] ^ D[0]; /* rotate by 0 */
+    B[0] = A[0][0] ^ D[0]; /* rotate by 0 */
     B[1] = ROL64(A[1][1] ^ D[1], rhotates[1][1]);
     B[2] = ROL64(A[2][2] ^ D[2], rhotates[2][2]);
     B[3] = ROL64(A[3][3] ^ D[3], rhotates[3][3]);
@@ -778,7 +772,7 @@ static void FourRounds(uint64_t A[5][5], size_t i)
     D[3] = ROL64(C[4], 1) ^ C[2];
     D[4] = ROL64(C[0], 1) ^ C[3];
 
-    B[0] =       A[0][0] ^ D[0]; /* rotate by 0 */
+    B[0] = A[0][0] ^ D[0]; /* rotate by 0 */
     B[1] = ROL64(A[3][1] ^ D[1], rhotates[1][1]);
     B[2] = ROL64(A[1][2] ^ D[2], rhotates[2][2]);
     B[3] = ROL64(A[4][3] ^ D[3], rhotates[3][3]);
@@ -845,7 +839,7 @@ static void FourRounds(uint64_t A[5][5], size_t i)
     D[3] = ROL64(C[4], 1) ^ C[2];
     D[4] = ROL64(C[0], 1) ^ C[3];
 
-    B[0] =       A[0][0] ^ D[0]; /* rotate by 0 */
+    B[0] = A[0][0] ^ D[0]; /* rotate by 0 */
     B[1] = ROL64(A[2][1] ^ D[1], rhotates[1][1]);
     B[2] = ROL64(A[4][2] ^ D[2], rhotates[2][2]);
     B[3] = ROL64(A[1][3] ^ D[3], rhotates[3][3]);
@@ -912,7 +906,7 @@ static void FourRounds(uint64_t A[5][5], size_t i)
     D[3] = ROL64(C[4], 1) ^ C[2];
     D[4] = ROL64(C[0], 1) ^ C[3];
 
-    B[0] =       A[0][0] ^ D[0]; /* rotate by 0 */
+    B[0] = A[0][0] ^ D[0]; /* rotate by 0 */
     B[1] = ROL64(A[0][1] ^ D[1], rhotates[1][1]);
     B[2] = ROL64(A[0][2] ^ D[2], rhotates[2][2]);
     B[3] = ROL64(A[0][3] ^ D[3], rhotates[3][3]);
@@ -991,28 +985,44 @@ static uint64_t BitInterleave(uint64_t Ai)
         uint32_t t0, t1;
 
         t0 = lo & 0x55555555;
-        t0 |= t0 >> 1;  t0 &= 0x33333333;
-        t0 |= t0 >> 2;  t0 &= 0x0f0f0f0f;
-        t0 |= t0 >> 4;  t0 &= 0x00ff00ff;
-        t0 |= t0 >> 8;  t0 &= 0x0000ffff;
+        t0 |= t0 >> 1;
+        t0 &= 0x33333333;
+        t0 |= t0 >> 2;
+        t0 &= 0x0f0f0f0f;
+        t0 |= t0 >> 4;
+        t0 &= 0x00ff00ff;
+        t0 |= t0 >> 8;
+        t0 &= 0x0000ffff;
 
         t1 = hi & 0x55555555;
-        t1 |= t1 >> 1;  t1 &= 0x33333333;
-        t1 |= t1 >> 2;  t1 &= 0x0f0f0f0f;
-        t1 |= t1 >> 4;  t1 &= 0x00ff00ff;
-        t1 |= t1 >> 8;  t1 <<= 16;
+        t1 |= t1 >> 1;
+        t1 &= 0x33333333;
+        t1 |= t1 >> 2;
+        t1 &= 0x0f0f0f0f;
+        t1 |= t1 >> 4;
+        t1 &= 0x00ff00ff;
+        t1 |= t1 >> 8;
+        t1 <<= 16;
 
         lo &= 0xaaaaaaaa;
-        lo |= lo << 1;  lo &= 0xcccccccc;
-        lo |= lo << 2;  lo &= 0xf0f0f0f0;
-        lo |= lo << 4;  lo &= 0xff00ff00;
-        lo |= lo << 8;  lo >>= 16;
+        lo |= lo << 1;
+        lo &= 0xcccccccc;
+        lo |= lo << 2;
+        lo &= 0xf0f0f0f0;
+        lo |= lo << 4;
+        lo &= 0xff00ff00;
+        lo |= lo << 8;
+        lo >>= 16;
 
         hi &= 0xaaaaaaaa;
-        hi |= hi << 1;  hi &= 0xcccccccc;
-        hi |= hi << 2;  hi &= 0xf0f0f0f0;
-        hi |= hi << 4;  hi &= 0xff00ff00;
-        hi |= hi << 8;  hi &= 0xffff0000;
+        hi |= hi << 1;
+        hi &= 0xcccccccc;
+        hi |= hi << 2;
+        hi &= 0xf0f0f0f0;
+        hi |= hi << 4;
+        hi &= 0xff00ff00;
+        hi |= hi << 8;
+        hi &= 0xffff0000;
 
         Ai = ((uint64_t)(hi | lo) << 32) | (t1 | t0);
     }
@@ -1027,28 +1037,44 @@ static uint64_t BitDeinterleave(uint64_t Ai)
         uint32_t t0, t1;
 
         t0 = lo & 0x0000ffff;
-        t0 |= t0 << 8;  t0 &= 0x00ff00ff;
-        t0 |= t0 << 4;  t0 &= 0x0f0f0f0f;
-        t0 |= t0 << 2;  t0 &= 0x33333333;
-        t0 |= t0 << 1;  t0 &= 0x55555555;
+        t0 |= t0 << 8;
+        t0 &= 0x00ff00ff;
+        t0 |= t0 << 4;
+        t0 &= 0x0f0f0f0f;
+        t0 |= t0 << 2;
+        t0 &= 0x33333333;
+        t0 |= t0 << 1;
+        t0 &= 0x55555555;
 
         t1 = hi << 16;
-        t1 |= t1 >> 8;  t1 &= 0xff00ff00;
-        t1 |= t1 >> 4;  t1 &= 0xf0f0f0f0;
-        t1 |= t1 >> 2;  t1 &= 0xcccccccc;
-        t1 |= t1 >> 1;  t1 &= 0xaaaaaaaa;
+        t1 |= t1 >> 8;
+        t1 &= 0xff00ff00;
+        t1 |= t1 >> 4;
+        t1 &= 0xf0f0f0f0;
+        t1 |= t1 >> 2;
+        t1 &= 0xcccccccc;
+        t1 |= t1 >> 1;
+        t1 &= 0xaaaaaaaa;
 
         lo >>= 16;
-        lo |= lo << 8;  lo &= 0x00ff00ff;
-        lo |= lo << 4;  lo &= 0x0f0f0f0f;
-        lo |= lo << 2;  lo &= 0x33333333;
-        lo |= lo << 1;  lo &= 0x55555555;
+        lo |= lo << 8;
+        lo &= 0x00ff00ff;
+        lo |= lo << 4;
+        lo &= 0x0f0f0f0f;
+        lo |= lo << 2;
+        lo &= 0x33333333;
+        lo |= lo << 1;
+        lo &= 0x55555555;
 
         hi &= 0xffff0000;
-        hi |= hi >> 8;  hi &= 0xff00ff00;
-        hi |= hi >> 4;  hi &= 0xf0f0f0f0;
-        hi |= hi >> 2;  hi &= 0xcccccccc;
-        hi |= hi >> 1;  hi &= 0xaaaaaaaa;
+        hi |= hi >> 8;
+        hi &= 0xff00ff00;
+        hi |= hi >> 4;
+        hi &= 0xf0f0f0f0;
+        hi |= hi >> 2;
+        hi &= 0xcccccccc;
+        hi |= hi >> 1;
+        hi &= 0xaaaaaaaa;
 
         Ai = ((uint64_t)(hi | lo) << 32) | (t1 | t0);
     }
@@ -1067,7 +1093,7 @@ static uint64_t BitDeinterleave(uint64_t Ai)
  * caller's responsibility.
  */
 size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
-                   size_t r)
+    size_t r)
 {
     uint64_t *A_flat = (uint64_t *)A;
     size_t i, w = r / 8;
@@ -1076,10 +1102,7 @@ size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
 
     while (len >= r) {
         for (i = 0; i < w; i++) {
-            uint64_t Ai = (uint64_t)inp[0]       | (uint64_t)inp[1] << 8  |
-                          (uint64_t)inp[2] << 16 | (uint64_t)inp[3] << 24 |
-                          (uint64_t)inp[4] << 32 | (uint64_t)inp[5] << 40 |
-                          (uint64_t)inp[6] << 48 | (uint64_t)inp[7] << 56;
+            uint64_t Ai = (uint64_t)inp[0] | (uint64_t)inp[1] << 8 | (uint64_t)inp[2] << 16 | (uint64_t)inp[3] << 24 | (uint64_t)inp[4] << 32 | (uint64_t)inp[5] << 40 | (uint64_t)inp[6] << 48 | (uint64_t)inp[7] << 56;
             inp += 8;
 
             A_flat[i] ^= BitInterleave(Ai);
@@ -1101,7 +1124,7 @@ size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
  * and |next| must be 0.
  */
 void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r,
-                  int next)
+    int next)
 {
     uint64_t *A_flat = (uint64_t *)A;
     size_t i, w = r / 8;
@@ -1151,7 +1174,7 @@ void SHA3_squeeze(uint64_t A[5][5], unsigned char *out, size_t len, size_t r,
  */
 
 void SHA3_sponge(const unsigned char *inp, size_t len,
-                 unsigned char *out, size_t d, size_t r)
+    unsigned char *out, size_t d, size_t r)
 {
     uint64_t A[5][5];
 
@@ -1160,7 +1183,7 @@ void SHA3_sponge(const unsigned char *inp, size_t len,
     SHA3_squeeze(A, out, d, r);
 }
 
-# include <stdio.h>
+#include <stdio.h>
 
 int main(void)
 {
diff --git a/crypto/sha/sha256.c b/crypto/sha/sha256.c
index 6a19657bf8093..0268e09dde948 100644
--- a/crypto/sha/sha256.c
+++ b/crypto/sha/sha256.c
@@ -73,9 +73,9 @@ int SHA224_Final(unsigned char *md, SHA256_CTX *c)
 
 #define DATA_ORDER_IS_BIG_ENDIAN
 
-#define HASH_LONG               SHA_LONG
-#define HASH_CTX                SHA256_CTX
-#define HASH_CBLOCK             SHA_CBLOCK
+#define HASH_LONG SHA_LONG
+#define HASH_CTX SHA256_CTX
+#define HASH_CBLOCK SHA_CBLOCK
 
 /*
  * Note that FIPS180-2 discusses "Truncation of the Hash Function Output."
@@ -85,47 +85,52 @@ int SHA224_Final(unsigned char *md, SHA256_CTX *c)
  * Idea behind separate cases for pre-defined lengths is to let the
  * compiler decide if it's appropriate to unroll small loops.
  */
-#define HASH_MAKE_STRING(c,s)   do {    \
-        unsigned long ll;               \
-        unsigned int  nn;               \
-        switch ((c)->md_len) {          \
-            case SHA256_192_DIGEST_LENGTH: \
-                for (nn=0;nn<SHA256_192_DIGEST_LENGTH/4;nn++) { \
-                    ll=(c)->h[nn]; (void)HOST_l2c(ll,(s));      \
-                }                       \
-                break;                  \
-            case SHA224_DIGEST_LENGTH:  \
-                for (nn=0;nn<SHA224_DIGEST_LENGTH/4;nn++) {     \
-                    ll=(c)->h[nn]; (void)HOST_l2c(ll,(s));      \
-                }                       \
-                break;                  \
-            case SHA256_DIGEST_LENGTH:  \
-                for (nn=0;nn<SHA256_DIGEST_LENGTH/4;nn++) {     \
-                    ll=(c)->h[nn]; (void)HOST_l2c(ll,(s));      \
-                }                       \
-                break;                  \
-            default:                    \
-                if ((c)->md_len > SHA256_DIGEST_LENGTH) \
-                    return 0;                           \
-                for (nn=0;nn<(c)->md_len/4;nn++) {              \
-                    ll=(c)->h[nn]; (void)HOST_l2c(ll,(s));      \
-                }                       \
-                break;                  \
-        }                               \
+#define HASH_MAKE_STRING(c, s)                                      \
+    do {                                                            \
+        unsigned long ll;                                           \
+        unsigned int nn;                                            \
+        switch ((c)->md_len) {                                      \
+        case SHA256_192_DIGEST_LENGTH:                              \
+            for (nn = 0; nn < SHA256_192_DIGEST_LENGTH / 4; nn++) { \
+                ll = (c)->h[nn];                                    \
+                (void)HOST_l2c(ll, (s));                            \
+            }                                                       \
+            break;                                                  \
+        case SHA224_DIGEST_LENGTH:                                  \
+            for (nn = 0; nn < SHA224_DIGEST_LENGTH / 4; nn++) {     \
+                ll = (c)->h[nn];                                    \
+                (void)HOST_l2c(ll, (s));                            \
+            }                                                       \
+            break;                                                  \
+        case SHA256_DIGEST_LENGTH:                                  \
+            for (nn = 0; nn < SHA256_DIGEST_LENGTH / 4; nn++) {     \
+                ll = (c)->h[nn];                                    \
+                (void)HOST_l2c(ll, (s));                            \
+            }                                                       \
+            break;                                                  \
+        default:                                                    \
+            if ((c)->md_len > SHA256_DIGEST_LENGTH)                 \
+                return 0;                                           \
+            for (nn = 0; nn < (c)->md_len / 4; nn++) {              \
+                ll = (c)->h[nn];                                    \
+                (void)HOST_l2c(ll, (s));                            \
+            }                                                       \
+            break;                                                  \
+        }                                                           \
     } while (0)
 
-#define HASH_UPDATE             SHA256_Update
-#define HASH_TRANSFORM          SHA256_Transform
-#define HASH_FINAL              SHA256_Final
-#define HASH_BLOCK_DATA_ORDER   sha256_block_data_order
+#define HASH_UPDATE SHA256_Update
+#define HASH_TRANSFORM SHA256_Transform
+#define HASH_FINAL SHA256_Final
+#define HASH_BLOCK_DATA_ORDER sha256_block_data_order
 #ifndef SHA256_ASM
 static
 #else
-# ifdef INCLUDE_C_SHA256
+#ifdef INCLUDE_C_SHA256
 void sha256_block_data_order_c(SHA256_CTX *ctx, const void *in, size_t num);
-# endif /* INCLUDE_C_SHA256 */
+#endif /* INCLUDE_C_SHA256 */
 #endif /* SHA256_ASM */
-void sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num);
+    void sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num);
 
 #include "crypto/md32_common.h"
 
@@ -149,68 +154,67 @@ static const SHA_LONG K256[64] = {
     0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
 };
 
-# ifndef PEDANTIC
-#  if defined(__GNUC__) && __GNUC__>=2 && \
-      !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-#   if defined(__riscv_zknh)
-#    define Sigma0(x) ({ MD32_REG_T ret;            \
+#ifndef PEDANTIC
+#if defined(__GNUC__) && __GNUC__ >= 2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+#if defined(__riscv_zknh)
+#define Sigma0(x) ({ MD32_REG_T ret;            \
                         asm ("sha256sum0 %0, %1"    \
                         : "=r"(ret)                 \
-                        : "r"(x)); ret;             })
-#    define Sigma1(x) ({ MD32_REG_T ret;            \
+                        : "r"(x)); ret; })
+#define Sigma1(x) ({ MD32_REG_T ret;            \
                         asm ("sha256sum1 %0, %1"    \
                         : "=r"(ret)                 \
-                        : "r"(x)); ret;             })
-#    define sigma0(x) ({ MD32_REG_T ret;            \
+                        : "r"(x)); ret; })
+#define sigma0(x) ({ MD32_REG_T ret;            \
                         asm ("sha256sig0 %0, %1"    \
                         : "=r"(ret)                 \
-                        : "r"(x)); ret;             })
-#    define sigma1(x) ({ MD32_REG_T ret;            \
+                        : "r"(x)); ret; })
+#define sigma1(x) ({ MD32_REG_T ret;            \
                         asm ("sha256sig1 %0, %1"    \
                         : "=r"(ret)                 \
-                        : "r"(x)); ret;             })
-#   endif
-#   if defined(__riscv_zbt) || defined(__riscv_zpn)
-#    define Ch(x,y,z) ({  MD32_REG_T ret;                           \
+                        : "r"(x)); ret; })
+#endif
+#if defined(__riscv_zbt) || defined(__riscv_zpn)
+#define Ch(x, y, z) ({  MD32_REG_T ret;                           \
                         asm (".insn r4 0x33, 1, 0x3, %0, %2, %1, %3"\
                         : "=r"(ret)                                 \
-                        : "r"(x), "r"(y), "r"(z)); ret;             })
-#    define Maj(x,y,z) ({ MD32_REG_T ret;                           \
+                        : "r"(x), "r"(y), "r"(z)); ret; })
+#define Maj(x, y, z) ({ MD32_REG_T ret;                           \
                         asm (".insn r4 0x33, 1, 0x3, %0, %2, %1, %3"\
                         : "=r"(ret)                                 \
-                        : "r"(x^z), "r"(y), "r"(x)); ret;           })
-#   endif
-#  endif
-# endif
+                        : "r"(x^z), "r"(y), "r"(x)); ret; })
+#endif
+#endif
+#endif
 
 /*
  * FIPS specification refers to right rotations, while our ROTATE macro
  * is left one. This is why you might notice that rotation coefficients
  * differ from those observed in FIPS document by 32-N...
  */
-# ifndef Sigma0
-#  define Sigma0(x)       (ROTATE((x),30) ^ ROTATE((x),19) ^ ROTATE((x),10))
-# endif
-# ifndef Sigma1
-#  define Sigma1(x)       (ROTATE((x),26) ^ ROTATE((x),21) ^ ROTATE((x),7))
-# endif
-# ifndef sigma0
-#  define sigma0(x)       (ROTATE((x),25) ^ ROTATE((x),14) ^ ((x)>>3))
-# endif
-# ifndef sigma1
-#  define sigma1(x)       (ROTATE((x),15) ^ ROTATE((x),13) ^ ((x)>>10))
-# endif
-# ifndef Ch
-#  define Ch(x,y,z)       (((x) & (y)) ^ ((~(x)) & (z)))
-# endif
-# ifndef Maj
-#  define Maj(x,y,z)      (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-# endif
-
-# ifdef OPENSSL_SMALL_FOOTPRINT
+#ifndef Sigma0
+#define Sigma0(x) (ROTATE((x), 30) ^ ROTATE((x), 19) ^ ROTATE((x), 10))
+#endif
+#ifndef Sigma1
+#define Sigma1(x) (ROTATE((x), 26) ^ ROTATE((x), 21) ^ ROTATE((x), 7))
+#endif
+#ifndef sigma0
+#define sigma0(x) (ROTATE((x), 25) ^ ROTATE((x), 14) ^ ((x) >> 3))
+#endif
+#ifndef sigma1
+#define sigma1(x) (ROTATE((x), 15) ^ ROTATE((x), 13) ^ ((x) >> 10))
+#endif
+#ifndef Ch
+#define Ch(x, y, z) (((x) & (y)) ^ ((~(x)) & (z)))
+#endif
+#ifndef Maj
+#define Maj(x, y, z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+#endif
+
+#ifdef OPENSSL_SMALL_FOOTPRINT
 
 static void sha256_block_data_order(SHA256_CTX *ctx, const void *in,
-                                    size_t num)
+    size_t num)
 {
     unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1, T2;
     SHA_LONG X[16], l;
@@ -270,28 +274,34 @@ static void sha256_block_data_order(SHA256_CTX *ctx, const void *in,
         ctx->h[5] += f;
         ctx->h[6] += g;
         ctx->h[7] += h;
-
     }
 }
 
-# else
+#else
 
-#  define ROUND_00_15(i,a,b,c,d,e,f,g,h)          do {    \
-        T1 += h + Sigma1(e) + Ch(e,f,g) + K256[i];      \
-        h = Sigma0(a) + Maj(a,b,c);                     \
-        d += T1;        h += T1;                } while (0)
+#define ROUND_00_15(i, a, b, c, d, e, f, g, h)       \
+    do {                                             \
+        T1 += h + Sigma1(e) + Ch(e, f, g) + K256[i]; \
+        h = Sigma0(a) + Maj(a, b, c);                \
+        d += T1;                                     \
+        h += T1;                                     \
+    } while (0)
 
-#  define ROUND_16_63(i,a,b,c,d,e,f,g,h,X)        do {    \
-        s0 = X[(i+1)&0x0f];     s0 = sigma0(s0);        \
-        s1 = X[(i+14)&0x0f];    s1 = sigma1(s1);        \
-        T1 = X[(i)&0x0f] += s0 + s1 + X[(i+9)&0x0f];    \
-        ROUND_00_15(i,a,b,c,d,e,f,g,h);         } while (0)
+#define ROUND_16_63(i, a, b, c, d, e, f, g, h, X)          \
+    do {                                                   \
+        s0 = X[(i + 1) & 0x0f];                            \
+        s0 = sigma0(s0);                                   \
+        s1 = X[(i + 14) & 0x0f];                           \
+        s1 = sigma1(s1);                                   \
+        T1 = X[(i) & 0x0f] += s0 + s1 + X[(i + 9) & 0x0f]; \
+        ROUND_00_15(i, a, b, c, d, e, f, g, h);            \
+    } while (0)
 
 #ifdef INCLUDE_C_SHA256
 void sha256_block_data_order_c(SHA256_CTX *ctx, const void *in, size_t num)
 #else
 static void sha256_block_data_order(SHA256_CTX *ctx, const void *in,
-                                    size_t num)
+    size_t num)
 #endif
 {
     unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1;
@@ -421,9 +431,8 @@ static void sha256_block_data_order(SHA256_CTX *ctx, const void *in,
         ctx->h[5] += f;
         ctx->h[6] += g;
         ctx->h[7] += h;
-
     }
 }
 
-# endif
-#endif                         /* SHA256_ASM */
+#endif
+#endif /* SHA256_ASM */
diff --git a/crypto/sha/sha3.c b/crypto/sha/sha3.c
index 951d5c88838b0..21e1070beed27 100644
--- a/crypto/sha/sha3.c
+++ b/crypto/sha/sha3.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #if defined(__s390x__) && defined(OPENSSL_CPUID_OBJ)
-# include "crypto/s390x_arch.h"
+#include "crypto/s390x_arch.h"
 #endif
 #include "internal/sha3.h"
 
@@ -62,7 +62,7 @@ int ossl_sha3_update(KECCAK1600_CTX *ctx, const void *_inp, size_t len)
         || ctx->xof_state == XOF_STATE_FINAL)
         return 0;
 
-    if ((num = ctx->bufsz) != 0) {      /* process intermediate buffer? */
+    if ((num = ctx->bufsz) != 0) { /* process intermediate buffer? */
         rem = bsz - num;
 
         if (len < rem) {
diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c
index ac5e9233b9aaa..4c3a3b6c093da 100644
--- a/crypto/sha/sha512.c
+++ b/crypto/sha/sha512.c
@@ -59,20 +59,16 @@
 #include "internal/cryptlib.h"
 #include "crypto/sha.h"
 
-#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
-    defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || \
-    defined(__s390__) || defined(__s390x__) || \
-    defined(__aarch64__) || \
-    defined(SHA512_ASM)
-# define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || defined(__s390__) || defined(__s390x__) || defined(__aarch64__) || defined(SHA512_ASM)
+#define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA
 #endif
 
 #if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-# define U64(C)     C##UI64
+#define U64(C) C##UI64
 #elif defined(__arch64__)
-# define U64(C)     C##UL
+#define U64(C) C##UL
 #else
-# define U64(C)     C##ULL
+#define U64(C) C##ULL
 #endif
 
 int sha512_224_init(SHA512_CTX *c)
@@ -150,18 +146,18 @@ int SHA512_Init(SHA512_CTX *c)
 #ifndef SHA512_ASM
 static
 #else
-# ifdef INCLUDE_C_SHA512
+#ifdef INCLUDE_C_SHA512
 void sha512_block_data_order_c(SHA512_CTX *ctx, const void *in, size_t num);
-# endif
 #endif
-void sha512_block_data_order(SHA512_CTX *ctx, const void *in, size_t num);
+#endif
+    void sha512_block_data_order(SHA512_CTX *ctx, const void *in, size_t num);
 
 int SHA512_Final(unsigned char *md, SHA512_CTX *c)
 {
     unsigned char *p = (unsigned char *)c->u.p;
     size_t n = c->num;
 
-    p[n] = 0x80;                /* There always is a room for one */
+    p[n] = 0x80; /* There always is a room for one */
     n++;
     if (n > (sizeof(c->u) - 16)) {
         memset(p + n, 0, sizeof(c->u) - n);
@@ -170,7 +166,7 @@ int SHA512_Final(unsigned char *md, SHA512_CTX *c)
     }
 
     memset(p + n, 0, sizeof(c->u) - 16 - n);
-#ifdef  B_ENDIAN
+#ifdef B_ENDIAN
     c->u.d[SHA_LBLOCK - 2] = c->Nh;
     c->u.d[SHA_LBLOCK - 1] = c->Nl;
 #else
@@ -289,11 +285,11 @@ int SHA512_Update(SHA512_CTX *c, const void *_data, size_t len)
     if (len == 0)
         return 1;
 
-    l = (c->Nl + (((SHA_LONG64) len) << 3)) & U64(0xffffffffffffffff);
+    l = (c->Nl + (((SHA_LONG64)len) << 3)) & U64(0xffffffffffffffff);
     if (l < c->Nl)
         c->Nh++;
     if (sizeof(len) >= 8)
-        c->Nh += (((SHA_LONG64) len) >> 61);
+        c->Nh += (((SHA_LONG64)len) >> 61);
     c->Nl = l;
 
     if (c->num != 0) {
@@ -314,12 +310,12 @@ int SHA512_Update(SHA512_CTX *c, const void *_data, size_t len)
         if ((size_t)data % sizeof(c->u.d[0]) != 0)
             while (len >= sizeof(c->u))
                 memcpy(p, data, sizeof(c->u)),
-                sha512_block_data_order(c, p, 1),
-                len -= sizeof(c->u), data += sizeof(c->u);
+                    sha512_block_data_order(c, p, 1),
+                    len -= sizeof(c->u), data += sizeof(c->u);
         else
 #endif
             sha512_block_data_order(c, data, len / sizeof(c->u)),
-            data += len, len %= sizeof(c->u), data -= len;
+                data += len, len %= sizeof(c->u), data -= len;
     }
 
     if (len != 0)
@@ -386,58 +382,56 @@ static const SHA_LONG64 K512[80] = {
     U64(0x5fcb6fab3ad6faec), U64(0x6c44198c4a475817)
 };
 
-# ifndef PEDANTIC
-#  if defined(__GNUC__) && __GNUC__>=2 && \
-      !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-#   if defined(__x86_64) || defined(__x86_64__)
-#    define ROTR(a,n)    ({ SHA_LONG64 ret;             \
+#ifndef PEDANTIC
+#if defined(__GNUC__) && __GNUC__ >= 2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+#if defined(__x86_64) || defined(__x86_64__)
+#define ROTR(a, n) ({ SHA_LONG64 ret;             \
                                 asm ("rorq %1,%0"       \
                                 : "=r"(ret)             \
                                 : "J"(n),"0"(a)         \
-                                : "cc"); ret;           })
-#    if !defined(B_ENDIAN)
-#     define PULL64(x) ({ SHA_LONG64 ret=*((const SHA_LONG64 *)(&(x)));  \
+                                : "cc"); ret; })
+#if !defined(B_ENDIAN)
+#define PULL64(x) ({ SHA_LONG64 ret=*((const SHA_LONG64 *)(&(x)));  \
                                 asm ("bswapq    %0"             \
                                 : "=r"(ret)                     \
-                                : "0"(ret)); ret;               })
-#    endif
-#   elif (defined(__i386) || defined(__i386__)) && !defined(B_ENDIAN)
-#    if defined(I386_ONLY)
-#     define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
+                                : "0"(ret)); ret; })
+#endif
+#elif (defined(__i386) || defined(__i386__)) && !defined(B_ENDIAN)
+#if defined(I386_ONLY)
+#define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
                           unsigned int hi=p[0],lo=p[1];          \
                                 asm("xchgb %%ah,%%al;xchgb %%dh,%%dl;"\
                                     "roll $16,%%eax; roll $16,%%edx; "\
                                     "xchgb %%ah,%%al;xchgb %%dh,%%dl;"\
                                 : "=a"(lo),"=d"(hi)             \
                                 : "0"(lo),"1"(hi) : "cc");      \
-                                ((SHA_LONG64)hi)<<32|lo;        })
-#    else
-#     define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
+                                ((SHA_LONG64)hi)<<32|lo; })
+#else
+#define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
                           unsigned int hi=p[0],lo=p[1];         \
                                 asm ("bswapl %0; bswapl %1;"    \
                                 : "=r"(lo),"=r"(hi)             \
                                 : "0"(lo),"1"(hi));             \
-                                ((SHA_LONG64)hi)<<32|lo;        })
-#    endif
-#   elif (defined(_ARCH_PPC) && defined(__64BIT__)) || defined(_ARCH_PPC64)
-#    define ROTR(a,n)    ({ SHA_LONG64 ret;             \
+                                ((SHA_LONG64)hi)<<32|lo; })
+#endif
+#elif (defined(_ARCH_PPC) && defined(__64BIT__)) || defined(_ARCH_PPC64)
+#define ROTR(a, n) ({ SHA_LONG64 ret;             \
                                 asm ("rotrdi %0,%1,%2"  \
                                 : "=r"(ret)             \
-                                : "r"(a),"K"(n)); ret;  })
-#   elif defined(__aarch64__)
-#    define ROTR(a,n)    ({ SHA_LONG64 ret;             \
+                                : "r"(a),"K"(n)); ret; })
+#elif defined(__aarch64__)
+#define ROTR(a, n) ({ SHA_LONG64 ret;             \
                                 asm ("ror %0,%1,%2"     \
                                 : "=r"(ret)             \
-                                : "r"(a),"I"(n)); ret;  })
-#    if  defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
-        __BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__
-#     define PULL64(x)   ({ SHA_LONG64 ret;                     \
+                                : "r"(a),"I"(n)); ret; })
+#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define PULL64(x) ({ SHA_LONG64 ret;                     \
                                 asm ("rev       %0,%1"          \
                                 : "=r"(ret)                     \
                                 : "r"(*((const SHA_LONG64 *)(&(x))))); ret; })
-#    endif
-#   elif (defined(__riscv_zbkb) || defined(__riscv_zbb)) && __riscv_xlen == 32
-#    define PULL64(x) ({ SHA_LONG64 ret;                                        \
+#endif
+#elif (defined(__riscv_zbkb) || defined(__riscv_zbb)) && __riscv_xlen == 32
+#define PULL64(x) ({ SHA_LONG64 ret;                                        \
                         unsigned int *r = (unsigned int *)(&(ret));             \
                         const unsigned int *p = (const unsigned int *)(&(x));   \
                         asm ("rev8 %0, %1"                                      \
@@ -445,66 +439,66 @@ static const SHA_LONG64 K512[80] = {
                         : "r" (p[1]));                                          \
                         asm ("rev8 %0, %1"                                      \
                         : "=r"(r[1])                                            \
-                        : "r" (p[0])); ret;                                     })
-#   elif (defined(__riscv_zbkb) || defined(__riscv_zbb)) && __riscv_xlen == 64
-#    define PULL64(x) ({ SHA_LONG64 ret;    \
+                        : "r" (p[0])); ret; })
+#elif (defined(__riscv_zbkb) || defined(__riscv_zbb)) && __riscv_xlen == 64
+#define PULL64(x) ({ SHA_LONG64 ret;    \
                         asm ("rev8 %0, %1"  \
                         : "=r"(ret)         \
-                        : "r"(x)); ret;     })
-#   endif
-#   if defined(__riscv_zknh) && __riscv_xlen == 32
-#    define Sigma0(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret));    \
+                        : "r"(x)); ret; })
+#endif
+#if defined(__riscv_zknh) && __riscv_xlen == 32
+#define Sigma0(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret));    \
                         const unsigned int *p = (const unsigned int *)(&(x));           \
                         asm ("sha512sum0r %0, %1, %2"                                   \
                         : "=r"(r[0])                                                    \
                         : "r" (p[0]), "r" (p[1]));                                      \
                         asm ("sha512sum0r %0, %2, %1"                                   \
                         : "=r"(r[1])                                                    \
-                        : "r" (p[0]), "r" (p[1])); ret;                                 })
-#    define Sigma1(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret));    \
+                        : "r" (p[0]), "r" (p[1])); ret; })
+#define Sigma1(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret));    \
                         const unsigned int *p = (const unsigned int *)(&(x));           \
                         asm ("sha512sum1r %0, %1, %2"                                   \
                         : "=r"(r[0])                                                    \
                         : "r" (p[0]), "r" (p[1]));                                      \
                         asm ("sha512sum1r %0, %2, %1"                                   \
                         : "=r"(r[1])                                                    \
-                        : "r" (p[0]), "r" (p[1])); ret;                                 })
-#    define sigma0(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret));    \
+                        : "r" (p[0]), "r" (p[1])); ret; })
+#define sigma0(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret));    \
                         const unsigned int *p = (const unsigned int *)(&(x));           \
                         asm ("sha512sig0l %0, %1, %2"                                   \
                         : "=r"(r[0])                                                    \
                         : "r" (p[0]), "r" (p[1]));                                      \
                         asm ("sha512sig0h %0, %2, %1"                                   \
                         : "=r"(r[1])                                                    \
-                        : "r" (p[0]), "r" (p[1])); ret;                                 })
-#    define sigma1(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret));    \
+                        : "r" (p[0]), "r" (p[1])); ret; })
+#define sigma1(x) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret));    \
                         const unsigned int *p = (const unsigned int *)(&(x));           \
                         asm ("sha512sig1l %0, %1, %2"                                   \
                         : "=r"(r[0])                                                    \
                         : "r" (p[0]), "r" (p[1]));                                      \
                         asm ("sha512sig1h %0, %2, %1"                                   \
                         : "=r"(r[1])                                                    \
-                        : "r" (p[0]), "r" (p[1])); ret;                                 })
-#   elif defined(__riscv_zknh) && __riscv_xlen == 64
-#    define Sigma0(x) ({ SHA_LONG64 ret;            \
+                        : "r" (p[0]), "r" (p[1])); ret; })
+#elif defined(__riscv_zknh) && __riscv_xlen == 64
+#define Sigma0(x) ({ SHA_LONG64 ret;            \
                         asm ("sha512sum0 %0, %1"    \
                         : "=r"(ret)                 \
-                        : "r"(x)); ret;             })
-#    define Sigma1(x) ({ SHA_LONG64 ret;            \
+                        : "r"(x)); ret; })
+#define Sigma1(x) ({ SHA_LONG64 ret;            \
                         asm ("sha512sum1 %0, %1"    \
                         : "=r"(ret)                 \
-                        : "r"(x)); ret;             })
-#    define sigma0(x) ({ SHA_LONG64 ret;            \
+                        : "r"(x)); ret; })
+#define sigma0(x) ({ SHA_LONG64 ret;            \
                         asm ("sha512sig0 %0, %1"    \
                         : "=r"(ret)                 \
-                        : "r"(x)); ret;             })
-#    define sigma1(x) ({ SHA_LONG64 ret;            \
+                        : "r"(x)); ret; })
+#define sigma1(x) ({ SHA_LONG64 ret;            \
                         asm ("sha512sig1 %0, %1"    \
                         : "=r"(ret)                 \
-                        : "r"(x)); ret;             })
-#   endif
-#   if (defined(__riscv_zbt) || defined(__riscv_zpn)) && __riscv_xlen == 32
-#    define Ch(x,y,z) ({  SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret));   \
+                        : "r"(x)); ret; })
+#endif
+#if (defined(__riscv_zbt) || defined(__riscv_zpn)) && __riscv_xlen == 32
+#define Ch(x, y, z) ({  SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret));   \
                         const unsigned int *xp = (const unsigned int *)(&(x));          \
                         const unsigned int *yp = (const unsigned int *)(&(y));          \
                         const unsigned int *zp = (const unsigned int *)(&(z));          \
@@ -513,8 +507,8 @@ static const SHA_LONG64 K512[80] = {
                         : "r"(xp[0]), "r"(yp[0]), "r"(zp[0]));                          \
                         asm (".insn r4 0x33, 1, 0x3, %0, %2, %1, %3\n\t"                \
                         : "=r"(r[1])                                                    \
-                        : "r"(xp[1]), "r"(yp[1]), "r"(zp[1])); ret;                     })
-#    define Maj(x,y,z) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret));   \
+                        : "r"(xp[1]), "r"(yp[1]), "r"(zp[1])); ret; })
+#define Maj(x, y, z) ({ SHA_LONG64 ret; unsigned int *r = (unsigned int *)(&(ret));   \
                         const unsigned int *xp = (const unsigned int *)(&(x));          \
                         const unsigned int *yp = (const unsigned int *)(&(y));          \
                         const unsigned int *zp = (const unsigned int *)(&(z));          \
@@ -523,83 +517,71 @@ static const SHA_LONG64 K512[80] = {
                         : "r"(xp[0]^zp[0]), "r"(yp[0]), "r"(zp[0]));                    \
                         asm (".insn r4 0x33, 1, 0x3, %0, %2, %1, %3\n\t"                \
                         : "=r"(r[1])                                                    \
-                        : "r"(xp[1]^zp[1]), "r"(yp[1]), "r"(zp[1])); ret;               })
-#   elif (defined(__riscv_zbt) || defined(__riscv_zpn)) && __riscv_xlen == 64
-#    define Ch(x,y,z) ({  SHA_LONG64 ret;                           \
+                        : "r"(xp[1]^zp[1]), "r"(yp[1]), "r"(zp[1])); ret; })
+#elif (defined(__riscv_zbt) || defined(__riscv_zpn)) && __riscv_xlen == 64
+#define Ch(x, y, z) ({  SHA_LONG64 ret;                           \
                         asm (".insn r4 0x33, 1, 0x3, %0, %2, %1, %3"\
                         : "=r"(ret)                                 \
-                        : "r"(x), "r"(y), "r"(z)); ret;             })
-#    define Maj(x,y,z) ({ SHA_LONG64 ret;                           \
+                        : "r"(x), "r"(y), "r"(z)); ret; })
+#define Maj(x, y, z) ({ SHA_LONG64 ret;                           \
                         asm (".insn r4 0x33, 1, 0x3, %0, %2, %1, %3"\
                         : "=r"(ret)                                 \
-                        : "r"(x^z), "r"(y), "r"(x)); ret;           })
-#   endif
-#  elif defined(_MSC_VER)
-#   if defined(_WIN64)         /* applies to both IA-64 and AMD64 */
-#    pragma intrinsic(_rotr64)
-#    define ROTR(a,n)    _rotr64((a),n)
-#   endif
-#   if defined(_M_IX86) && !defined(OPENSSL_NO_ASM) && \
-       !defined(OPENSSL_NO_INLINE_ASM)
-#    if defined(I386_ONLY)
+                        : "r"(x^z), "r"(y), "r"(x)); ret; })
+#endif
+#elif defined(_MSC_VER)
+#if defined(_WIN64) /* applies to both IA-64 and AMD64 */
+#pragma intrinsic(_rotr64)
+#define ROTR(a, n) _rotr64((a), n)
+#endif
+#if defined(_M_IX86) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+#if defined(I386_ONLY)
 static SHA_LONG64 __fastcall __pull64be(const void *x)
 {
-    _asm mov  edx,[ecx + 0]
-    _asm mov  eax,[ecx + 4]
-    _asm xchg dh, dl
-    _asm xchg ah, al
-    _asm rol  edx, 16
-    _asm rol  eax, 16
-    _asm xchg dh, dl
-    _asm xchg ah, al
+    _asm mov edx, [ecx + 0] _asm mov eax, [ecx + 4] _asm xchg dh, dl _asm xchg ah, al _asm rol edx, 16 _asm rol eax, 16 _asm xchg dh, dl _asm xchg ah, al
 }
-#    else
-static SHA_LONG64 __fastcall __pull64be(const void *x)
-{
-    _asm mov   edx,[ecx + 0]
-    _asm mov   eax,[ecx + 4]
-    _asm bswap edx
-    _asm bswap eax
+#else
+static SHA_LONG64 __fastcall __pull64be(const void *x) {
+    _asm mov edx, [ecx + 0] _asm mov eax, [ecx + 4] _asm bswap edx _asm bswap eax
 }
-#    endif
-#    define PULL64(x) __pull64be(&(x))
-#   endif
-#  endif
-# endif
-# ifndef PULL64
-#  define B(x,j)    (((SHA_LONG64)(*(((const unsigned char *)(&x))+j)))<<((7-j)*8))
-#  define PULL64(x) (B(x,0)|B(x,1)|B(x,2)|B(x,3)|B(x,4)|B(x,5)|B(x,6)|B(x,7))
-# endif
-# ifndef ROTR
-#  define ROTR(x,s)       (((x)>>s) | (x)<<(64-s))
-# endif
-# ifndef Sigma0
-#  define Sigma0(x)       (ROTR((x),28) ^ ROTR((x),34) ^ ROTR((x),39))
-# endif
-# ifndef Sigma1
-#  define Sigma1(x)       (ROTR((x),14) ^ ROTR((x),18) ^ ROTR((x),41))
-# endif
-# ifndef sigma0
-#  define sigma0(x)       (ROTR((x),1)  ^ ROTR((x),8)  ^ ((x)>>7))
-# endif
-# ifndef sigma1
-#  define sigma1(x)       (ROTR((x),19) ^ ROTR((x),61) ^ ((x)>>6))
-# endif
-# ifndef Ch
-#  define Ch(x,y,z)       (((x) & (y)) ^ ((~(x)) & (z)))
-# endif
-# ifndef Maj
-#  define Maj(x,y,z)      (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-# endif
-
-# if defined(__i386) || defined(__i386__) || defined(_M_IX86)
+#endif
+#define PULL64(x) __pull64be(&(x))
+#endif
+#endif
+#endif
+#ifndef PULL64
+#define B(x, j) (((SHA_LONG64)(*(((const unsigned char *)(&x)) + j))) << ((7 - j) * 8))
+#define PULL64(x) (B(x, 0) | B(x, 1) | B(x, 2) | B(x, 3) | B(x, 4) | B(x, 5) | B(x, 6) | B(x, 7))
+#endif
+#ifndef ROTR
+#define ROTR(x, s) (((x) >> s) | (x) << (64 - s))
+#endif
+#ifndef Sigma0
+#define Sigma0(x) (ROTR((x), 28) ^ ROTR((x), 34) ^ ROTR((x), 39))
+#endif
+#ifndef Sigma1
+#define Sigma1(x) (ROTR((x), 14) ^ ROTR((x), 18) ^ ROTR((x), 41))
+#endif
+#ifndef sigma0
+#define sigma0(x) (ROTR((x), 1) ^ ROTR((x), 8) ^ ((x) >> 7))
+#endif
+#ifndef sigma1
+#define sigma1(x) (ROTR((x), 19) ^ ROTR((x), 61) ^ ((x) >> 6))
+#endif
+#ifndef Ch
+#define Ch(x, y, z) (((x) & (y)) ^ ((~(x)) & (z)))
+#endif
+#ifndef Maj
+#define Maj(x, y, z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+#endif
+
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
 /*
  * This code should give better results on 32-bit CPU with less than
  * ~24 registers, both size and performance wise...
  */
 
 static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
-                                    size_t num)
+    size_t num)
 {
     const SHA_LONG64 *W = in;
     SHA_LONG64 A, E, T;
@@ -619,11 +601,11 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
         F[7] = ctx->h[7];
 
         for (i = 0; i < 16; i++, F--) {
-#  ifdef B_ENDIAN
+#ifdef B_ENDIAN
             T = W[i];
-#  else
+#else
             T = PULL64(W[i]);
-#  endif
+#endif
             F[0] = A;
             F[4] = E;
             F[8] = T;
@@ -658,10 +640,10 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
     }
 }
 
-# elif defined(OPENSSL_SMALL_FOOTPRINT)
+#elif defined(OPENSSL_SMALL_FOOTPRINT)
 
 static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
-                                    size_t num)
+    size_t num)
 {
     const SHA_LONG64 *W = in;
     SHA_LONG64 a, b, c, d, e, f, g, h, s0, s1, T1, T2;
@@ -680,11 +662,11 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
         h = ctx->h[7];
 
         for (i = 0; i < 16; i++) {
-#  ifdef B_ENDIAN
+#ifdef B_ENDIAN
             T1 = X[i] = W[i];
-#  else
+#else
             T1 = X[i] = PULL64(W[i]);
-#  endif
+#endif
             T1 += h + Sigma1(e) + Ch(e, f, g) + K512[i];
             T2 = Sigma0(a) + Maj(a, b, c);
             h = g;
@@ -729,23 +711,30 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
     }
 }
 
-# else
-#  define ROUND_00_15(i,a,b,c,d,e,f,g,h)        do {    \
-        T1 += h + Sigma1(e) + Ch(e,f,g) + K512[i];      \
-        h = Sigma0(a) + Maj(a,b,c);                     \
-        d += T1;        h += T1;                        } while (0)
-
-#  define ROUND_16_80(i,j,a,b,c,d,e,f,g,h,X)    do {    \
-        s0 = X[(j+1)&0x0f];     s0 = sigma0(s0);        \
-        s1 = X[(j+14)&0x0f];    s1 = sigma1(s1);        \
-        T1 = X[(j)&0x0f] += s0 + s1 + X[(j+9)&0x0f];    \
-        ROUND_00_15(i+j,a,b,c,d,e,f,g,h);               } while (0)
+#else
+#define ROUND_00_15(i, a, b, c, d, e, f, g, h)       \
+    do {                                             \
+        T1 += h + Sigma1(e) + Ch(e, f, g) + K512[i]; \
+        h = Sigma0(a) + Maj(a, b, c);                \
+        d += T1;                                     \
+        h += T1;                                     \
+    } while (0)
+
+#define ROUND_16_80(i, j, a, b, c, d, e, f, g, h, X)       \
+    do {                                                   \
+        s0 = X[(j + 1) & 0x0f];                            \
+        s0 = sigma0(s0);                                   \
+        s1 = X[(j + 14) & 0x0f];                           \
+        s1 = sigma1(s1);                                   \
+        T1 = X[(j) & 0x0f] += s0 + s1 + X[(j + 9) & 0x0f]; \
+        ROUND_00_15(i + j, a, b, c, d, e, f, g, h);        \
+    } while (0)
 
 #ifdef INCLUDE_C_SHA512
 void sha512_block_data_order_c(SHA512_CTX *ctx, const void *in, size_t num)
 #else
 static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
-                                    size_t num)
+    size_t num)
 #endif
 {
     const SHA_LONG64 *W = in;
@@ -764,7 +753,7 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
         g = ctx->h[6];
         h = ctx->h[7];
 
-#  ifdef B_ENDIAN
+#ifdef B_ENDIAN
         T1 = X[0] = W[0];
         ROUND_00_15(0, a, b, c, d, e, f, g, h);
         T1 = X[1] = W[1];
@@ -797,7 +786,7 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
         ROUND_00_15(14, c, d, e, f, g, h, a, b);
         T1 = X[15] = W[15];
         ROUND_00_15(15, b, c, d, e, f, g, h, a);
-#  else
+#else
         T1 = X[0] = PULL64(W[0]);
         ROUND_00_15(0, a, b, c, d, e, f, g, h);
         T1 = X[1] = PULL64(W[1]);
@@ -830,7 +819,7 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
         ROUND_00_15(14, c, d, e, f, g, h, a, b);
         T1 = X[15] = PULL64(W[15]);
         ROUND_00_15(15, b, c, d, e, f, g, h, a);
-#  endif
+#endif
 
         for (i = 16; i < 80; i += 16) {
             ROUND_16_80(i, 0, a, b, c, d, e, f, g, h, X);
@@ -864,6 +853,6 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
     }
 }
 
-# endif
+#endif
 
-#endif                         /* SHA512_ASM */
+#endif /* SHA512_ASM */
diff --git a/crypto/sha/sha_local.h b/crypto/sha/sha_local.h
index 81de72ba4f906..3879c57526ca4 100644
--- a/crypto/sha/sha_local.h
+++ b/crypto/sha/sha_local.h
@@ -16,26 +16,31 @@
 
 #define DATA_ORDER_IS_BIG_ENDIAN
 
-#define HASH_LONG               SHA_LONG
-#define HASH_CTX                SHA_CTX
-#define HASH_CBLOCK             SHA_CBLOCK
-#define HASH_MAKE_STRING(c,s)   do {    \
-        unsigned long ll;               \
-        ll=(c)->h0; (void)HOST_l2c(ll,(s));     \
-        ll=(c)->h1; (void)HOST_l2c(ll,(s));     \
-        ll=(c)->h2; (void)HOST_l2c(ll,(s));     \
-        ll=(c)->h3; (void)HOST_l2c(ll,(s));     \
-        ll=(c)->h4; (void)HOST_l2c(ll,(s));     \
-        } while (0)
-
-#define HASH_UPDATE                     SHA1_Update
-#define HASH_TRANSFORM                  SHA1_Transform
-#define HASH_FINAL                      SHA1_Final
-#define HASH_INIT                       SHA1_Init
-#define HASH_BLOCK_DATA_ORDER           sha1_block_data_order
-#define Xupdate(a,ix,ia,ib,ic,id)       ( (a)=(ia^ib^ic^id),    \
-                                          ix=(a)=ROTATE((a),1)  \
-                                        )
+#define HASH_LONG SHA_LONG
+#define HASH_CTX SHA_CTX
+#define HASH_CBLOCK SHA_CBLOCK
+#define HASH_MAKE_STRING(c, s)   \
+    do {                         \
+        unsigned long ll;        \
+        ll = (c)->h0;            \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->h1;            \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->h2;            \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->h3;            \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->h4;            \
+        (void)HOST_l2c(ll, (s)); \
+    } while (0)
+
+#define HASH_UPDATE SHA1_Update
+#define HASH_TRANSFORM SHA1_Transform
+#define HASH_FINAL SHA1_Final
+#define HASH_INIT SHA1_Init
+#define HASH_BLOCK_DATA_ORDER sha1_block_data_order
+#define Xupdate(a, ix, ia, ib, ic, id) ((a) = (ia ^ ib ^ ic ^ id), \
+    ix = (a) = ROTATE((a), 1))
 
 #ifndef SHA1_ASM
 static void sha1_block_data_order(SHA_CTX *c, const void *p, size_t num);
@@ -75,75 +80,75 @@ int HASH_INIT(SHA_CTX *c)
  * I've just become aware of another tweak to be made, again from Wei Dai,
  * in F_40_59, (x&a)|(y&a) -> (x|y)&a
  */
-#define F_00_19(b,c,d)  ((((c) ^ (d)) & (b)) ^ (d))
-#define F_20_39(b,c,d)  ((b) ^ (c) ^ (d))
-#define F_40_59(b,c,d)  (((b) & (c)) | (((b)|(c)) & (d)))
-#define F_60_79(b,c,d)  F_20_39(b,c,d)
+#define F_00_19(b, c, d) ((((c) ^ (d)) & (b)) ^ (d))
+#define F_20_39(b, c, d) ((b) ^ (c) ^ (d))
+#define F_40_59(b, c, d) (((b) & (c)) | (((b) | (c)) & (d)))
+#define F_60_79(b, c, d) F_20_39(b, c, d)
 
 #ifndef OPENSSL_SMALL_FOOTPRINT
 
-# define BODY_00_15(i,a,b,c,d,e,f,xi) \
-        (f)=xi+(e)+K_00_19+ROTATE((a),5)+F_00_19((b),(c),(d)); \
-        (b)=ROTATE((b),30);
-
-# define BODY_16_19(i,a,b,c,d,e,f,xi,xa,xb,xc,xd) \
-        Xupdate(f,xi,xa,xb,xc,xd); \
-        (f)+=(e)+K_00_19+ROTATE((a),5)+F_00_19((b),(c),(d)); \
-        (b)=ROTATE((b),30);
-
-# define BODY_20_31(i,a,b,c,d,e,f,xi,xa,xb,xc,xd) \
-        Xupdate(f,xi,xa,xb,xc,xd); \
-        (f)+=(e)+K_20_39+ROTATE((a),5)+F_20_39((b),(c),(d)); \
-        (b)=ROTATE((b),30);
-
-# define BODY_32_39(i,a,b,c,d,e,f,xa,xb,xc,xd) \
-        Xupdate(f,xa,xa,xb,xc,xd); \
-        (f)+=(e)+K_20_39+ROTATE((a),5)+F_20_39((b),(c),(d)); \
-        (b)=ROTATE((b),30);
-
-# define BODY_40_59(i,a,b,c,d,e,f,xa,xb,xc,xd) \
-        Xupdate(f,xa,xa,xb,xc,xd); \
-        (f)+=(e)+K_40_59+ROTATE((a),5)+F_40_59((b),(c),(d)); \
-        (b)=ROTATE((b),30);
-
-# define BODY_60_79(i,a,b,c,d,e,f,xa,xb,xc,xd) \
-        Xupdate(f,xa,xa,xb,xc,xd); \
-        (f)=xa+(e)+K_60_79+ROTATE((a),5)+F_60_79((b),(c),(d)); \
-        (b)=ROTATE((b),30);
-
-# ifdef X
-#  undef X
-# endif
-# ifndef MD32_XARRAY
-  /*
-   * Originally X was an array. As it's automatic it's natural
-   * to expect RISC compiler to accommodate at least part of it in
-   * the register bank, isn't it? Unfortunately not all compilers
-   * "find" this expectation reasonable:-( On order to make such
-   * compilers generate better code I replace X[] with a bunch of
-   * X0, X1, etc. See the function body below...
-   */
-#  define X(i)   XX##i
-# else
-  /*
-   * However! Some compilers (most notably HP C) get overwhelmed by
-   * that many local variables so that we have to have the way to
-   * fall down to the original behavior.
-   */
-#  define X(i)   XX[i]
-# endif
-
-# if !defined(SHA1_ASM)
+#define BODY_00_15(i, a, b, c, d, e, f, xi)                             \
+    (f) = xi + (e) + K_00_19 + ROTATE((a), 5) + F_00_19((b), (c), (d)); \
+    (b) = ROTATE((b), 30);
+
+#define BODY_16_19(i, a, b, c, d, e, f, xi, xa, xb, xc, xd)         \
+    Xupdate(f, xi, xa, xb, xc, xd);                                 \
+    (f) += (e) + K_00_19 + ROTATE((a), 5) + F_00_19((b), (c), (d)); \
+    (b) = ROTATE((b), 30);
+
+#define BODY_20_31(i, a, b, c, d, e, f, xi, xa, xb, xc, xd)         \
+    Xupdate(f, xi, xa, xb, xc, xd);                                 \
+    (f) += (e) + K_20_39 + ROTATE((a), 5) + F_20_39((b), (c), (d)); \
+    (b) = ROTATE((b), 30);
+
+#define BODY_32_39(i, a, b, c, d, e, f, xa, xb, xc, xd)             \
+    Xupdate(f, xa, xa, xb, xc, xd);                                 \
+    (f) += (e) + K_20_39 + ROTATE((a), 5) + F_20_39((b), (c), (d)); \
+    (b) = ROTATE((b), 30);
+
+#define BODY_40_59(i, a, b, c, d, e, f, xa, xb, xc, xd)             \
+    Xupdate(f, xa, xa, xb, xc, xd);                                 \
+    (f) += (e) + K_40_59 + ROTATE((a), 5) + F_40_59((b), (c), (d)); \
+    (b) = ROTATE((b), 30);
+
+#define BODY_60_79(i, a, b, c, d, e, f, xa, xb, xc, xd)                 \
+    Xupdate(f, xa, xa, xb, xc, xd);                                     \
+    (f) = xa + (e) + K_60_79 + ROTATE((a), 5) + F_60_79((b), (c), (d)); \
+    (b) = ROTATE((b), 30);
+
+#ifdef X
+#undef X
+#endif
+#ifndef MD32_XARRAY
+/*
+ * Originally X was an array. As it's automatic it's natural
+ * to expect RISC compiler to accommodate at least part of it in
+ * the register bank, isn't it? Unfortunately not all compilers
+ * "find" this expectation reasonable:-( On order to make such
+ * compilers generate better code I replace X[] with a bunch of
+ * X0, X1, etc. See the function body below...
+ */
+#define X(i) XX##i
+#else
+/*
+ * However! Some compilers (most notably HP C) get overwhelmed by
+ * that many local variables so that we have to have the way to
+ * fall down to the original behavior.
+ */
+#define X(i) XX[i]
+#endif
+
+#if !defined(SHA1_ASM)
 static void HASH_BLOCK_DATA_ORDER(SHA_CTX *c, const void *p, size_t num)
 {
     const unsigned char *data = p;
     register unsigned MD32_REG_T A, B, C, D, E, T, l;
-#  ifndef MD32_XARRAY
+#ifndef MD32_XARRAY
     unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
         XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15;
-#  else
+#else
     SHA_LONG XX[16];
-#  endif
+#endif
 
     A = c->h0;
     B = c->h1;
@@ -326,43 +331,52 @@ static void HASH_BLOCK_DATA_ORDER(SHA_CTX *c, const void *p, size_t num)
         C = c->h2;
         D = c->h3;
         E = c->h4;
-
     }
 }
-# endif
-
-#else                           /* OPENSSL_SMALL_FOOTPRINT */
-
-# define BODY_00_15(xi)           do {   \
-        T=E+K_00_19+F_00_19(B,C,D);     \
-        E=D, D=C, C=ROTATE(B,30), B=A;  \
-        A=ROTATE(A,5)+T+xi;         } while(0)
-
-# define BODY_16_19(xa,xb,xc,xd)  do {   \
-        Xupdate(T,xa,xa,xb,xc,xd);      \
-        T+=E+K_00_19+F_00_19(B,C,D);    \
-        E=D, D=C, C=ROTATE(B,30), B=A;  \
-        A=ROTATE(A,5)+T;            } while(0)
-
-# define BODY_20_39(xa,xb,xc,xd)  do {   \
-        Xupdate(T,xa,xa,xb,xc,xd);      \
-        T+=E+K_20_39+F_20_39(B,C,D);    \
-        E=D, D=C, C=ROTATE(B,30), B=A;  \
-        A=ROTATE(A,5)+T;            } while(0)
-
-# define BODY_40_59(xa,xb,xc,xd)  do {   \
-        Xupdate(T,xa,xa,xb,xc,xd);      \
-        T+=E+K_40_59+F_40_59(B,C,D);    \
-        E=D, D=C, C=ROTATE(B,30), B=A;  \
-        A=ROTATE(A,5)+T;            } while(0)
-
-# define BODY_60_79(xa,xb,xc,xd)  do {   \
-        Xupdate(T,xa,xa,xb,xc,xd);      \
-        T=E+K_60_79+F_60_79(B,C,D);     \
-        E=D, D=C, C=ROTATE(B,30), B=A;  \
-        A=ROTATE(A,5)+T+xa;         } while(0)
-
-# if !defined(SHA1_ASM)
+#endif
+
+#else /* OPENSSL_SMALL_FOOTPRINT */
+
+#define BODY_00_15(xi)                          \
+    do {                                        \
+        T = E + K_00_19 + F_00_19(B, C, D);     \
+        E = D, D = C, C = ROTATE(B, 30), B = A; \
+        A = ROTATE(A, 5) + T + xi;              \
+    } while (0)
+
+#define BODY_16_19(xa, xb, xc, xd)              \
+    do {                                        \
+        Xupdate(T, xa, xa, xb, xc, xd);         \
+        T += E + K_00_19 + F_00_19(B, C, D);    \
+        E = D, D = C, C = ROTATE(B, 30), B = A; \
+        A = ROTATE(A, 5) + T;                   \
+    } while (0)
+
+#define BODY_20_39(xa, xb, xc, xd)              \
+    do {                                        \
+        Xupdate(T, xa, xa, xb, xc, xd);         \
+        T += E + K_20_39 + F_20_39(B, C, D);    \
+        E = D, D = C, C = ROTATE(B, 30), B = A; \
+        A = ROTATE(A, 5) + T;                   \
+    } while (0)
+
+#define BODY_40_59(xa, xb, xc, xd)              \
+    do {                                        \
+        Xupdate(T, xa, xa, xb, xc, xd);         \
+        T += E + K_40_59 + F_40_59(B, C, D);    \
+        E = D, D = C, C = ROTATE(B, 30), B = A; \
+        A = ROTATE(A, 5) + T;                   \
+    } while (0)
+
+#define BODY_60_79(xa, xb, xc, xd)              \
+    do {                                        \
+        Xupdate(T, xa, xa, xb, xc, xd);         \
+        T = E + K_60_79 + F_60_79(B, C, D);     \
+        E = D, D = C, C = ROTATE(B, 30), B = A; \
+        A = ROTATE(A, 5) + T + xa;              \
+    } while (0)
+
+#if !defined(SHA1_ASM)
 static void HASH_BLOCK_DATA_ORDER(SHA_CTX *c, const void *p, size_t num)
 {
     const unsigned char *data = p;
@@ -387,15 +401,15 @@ static void HASH_BLOCK_DATA_ORDER(SHA_CTX *c, const void *p, size_t num)
         }
         for (; i < 24; i++) {
             BODY_20_39(X[i & 15], X[(i + 2) & 15], X[(i + 8) & 15],
-                       X[(i + 13) & 15]);
+                X[(i + 13) & 15]);
         }
         for (i = 0; i < 20; i++) {
             BODY_40_59(X[(i + 8) & 15], X[(i + 10) & 15], X[i & 15],
-                       X[(i + 5) & 15]);
+                X[(i + 5) & 15]);
         }
         for (i = 4; i < 24; i++) {
             BODY_60_79(X[(i + 8) & 15], X[(i + 10) & 15], X[i & 15],
-                       X[(i + 5) & 15]);
+                X[(i + 5) & 15]);
         }
 
         c->h0 = (c->h0 + A) & 0xffffffffL;
@@ -412,9 +426,8 @@ static void HASH_BLOCK_DATA_ORDER(SHA_CTX *c, const void *p, size_t num)
         C = c->h2;
         D = c->h3;
         E = c->h4;
-
     }
 }
-# endif
+#endif
 
 #endif
diff --git a/crypto/sha/sha_ppc.c b/crypto/sha/sha_ppc.c
index accf19d8a2319..9853a2321ad83 100644
--- a/crypto/sha/sha_ppc.c
+++ b/crypto/sha/sha_ppc.c
@@ -19,8 +19,7 @@ void sha256_block_ppc(void *ctx, const void *inp, size_t len);
 void sha256_block_data_order(void *ctx, const void *inp, size_t len);
 void sha256_block_data_order(void *ctx, const void *inp, size_t len)
 {
-    OPENSSL_ppccap_P & PPC_CRYPTO207 ? sha256_block_p8(ctx, inp, len) :
-        sha256_block_ppc(ctx, inp, len);
+    OPENSSL_ppccap_P &PPC_CRYPTO207 ? sha256_block_p8(ctx, inp, len) : sha256_block_ppc(ctx, inp, len);
 }
 
 void sha512_block_p8(void *ctx, const void *inp, size_t len);
@@ -28,6 +27,5 @@ void sha512_block_ppc(void *ctx, const void *inp, size_t len);
 void sha512_block_data_order(void *ctx, const void *inp, size_t len);
 void sha512_block_data_order(void *ctx, const void *inp, size_t len)
 {
-    OPENSSL_ppccap_P & PPC_CRYPTO207 ? sha512_block_p8(ctx, inp, len) :
-        sha512_block_ppc(ctx, inp, len);
+    OPENSSL_ppccap_P &PPC_CRYPTO207 ? sha512_block_p8(ctx, inp, len) : sha512_block_ppc(ctx, inp, len);
 }
diff --git a/crypto/sha/sha_riscv.c b/crypto/sha/sha_riscv.c
index c4a77a3d0bd55..61ceaa22a4bd8 100644
--- a/crypto/sha/sha_riscv.c
+++ b/crypto/sha/sha_riscv.c
@@ -15,14 +15,13 @@
 #include "crypto/riscv_arch.h"
 
 void sha256_block_data_order_zvkb_zvknha_or_zvknhb(void *ctx, const void *in,
-                                                   size_t num);
+    size_t num);
 void sha256_block_data_order_c(void *ctx, const void *in, size_t num);
 void sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num);
 
 void sha256_block_data_order(SHA256_CTX *ctx, const void *in, size_t num)
 {
-    if (RISCV_HAS_ZVKB() && (RISCV_HAS_ZVKNHA() || RISCV_HAS_ZVKNHB()) &&
-        riscv_vlen() >= 128) {
+    if (RISCV_HAS_ZVKB() && (RISCV_HAS_ZVKNHA() || RISCV_HAS_ZVKNHB()) && riscv_vlen() >= 128) {
         sha256_block_data_order_zvkb_zvknha_or_zvknhb(ctx, in, num);
     } else {
         sha256_block_data_order_c(ctx, in, num);
diff --git a/crypto/siphash/siphash.c b/crypto/siphash/siphash.c
index e2be3ca597fb7..da978db094a5a 100644
--- a/crypto/siphash/siphash.c
+++ b/crypto/siphash/siphash.c
@@ -31,38 +31,35 @@
 
 #define ROTL(x, b) (uint64_t)(((x) << (b)) | ((x) >> (64 - (b))))
 
-#define U32TO8_LE(p, v)                                                        \
-    (p)[0] = (uint8_t)((v));                                                   \
-    (p)[1] = (uint8_t)((v) >> 8);                                              \
-    (p)[2] = (uint8_t)((v) >> 16);                                             \
+#define U32TO8_LE(p, v)            \
+    (p)[0] = (uint8_t)((v));       \
+    (p)[1] = (uint8_t)((v) >> 8);  \
+    (p)[2] = (uint8_t)((v) >> 16); \
     (p)[3] = (uint8_t)((v) >> 24);
 
-#define U64TO8_LE(p, v)                                                        \
-    U32TO8_LE((p), (uint32_t)((v)));                                           \
+#define U64TO8_LE(p, v)              \
+    U32TO8_LE((p), (uint32_t)((v))); \
     U32TO8_LE((p) + 4, (uint32_t)((v) >> 32));
 
-#define U8TO64_LE(p)                                                           \
-    (((uint64_t)((p)[0])) | ((uint64_t)((p)[1]) << 8) |                        \
-     ((uint64_t)((p)[2]) << 16) | ((uint64_t)((p)[3]) << 24) |                 \
-     ((uint64_t)((p)[4]) << 32) | ((uint64_t)((p)[5]) << 40) |                 \
-     ((uint64_t)((p)[6]) << 48) | ((uint64_t)((p)[7]) << 56))
-
-#define SIPROUND                                                               \
-    do {                                                                       \
-        v0 += v1;                                                              \
-        v1 = ROTL(v1, 13);                                                     \
-        v1 ^= v0;                                                              \
-        v0 = ROTL(v0, 32);                                                     \
-        v2 += v3;                                                              \
-        v3 = ROTL(v3, 16);                                                     \
-        v3 ^= v2;                                                              \
-        v0 += v3;                                                              \
-        v3 = ROTL(v3, 21);                                                     \
-        v3 ^= v0;                                                              \
-        v2 += v1;                                                              \
-        v1 = ROTL(v1, 17);                                                     \
-        v1 ^= v2;                                                              \
-        v2 = ROTL(v2, 32);                                                     \
+#define U8TO64_LE(p) \
+    (((uint64_t)((p)[0])) | ((uint64_t)((p)[1]) << 8) | ((uint64_t)((p)[2]) << 16) | ((uint64_t)((p)[3]) << 24) | ((uint64_t)((p)[4]) << 32) | ((uint64_t)((p)[5]) << 40) | ((uint64_t)((p)[6]) << 48) | ((uint64_t)((p)[7]) << 56))
+
+#define SIPROUND           \
+    do {                   \
+        v0 += v1;          \
+        v1 = ROTL(v1, 13); \
+        v1 ^= v0;          \
+        v0 = ROTL(v0, 32); \
+        v2 += v3;          \
+        v3 = ROTL(v3, 16); \
+        v3 ^= v2;          \
+        v0 += v3;          \
+        v3 = ROTL(v3, 21); \
+        v3 ^= v0;          \
+        v2 += v1;          \
+        v1 = ROTL(v1, 17); \
+        v1 ^= v2;          \
+        v2 = ROTL(v2, 32); \
     } while (0)
 
 size_t SipHash_ctx_size(void)
@@ -172,7 +169,7 @@ void SipHash_Update(SIPHASH *ctx, const unsigned char *in, size_t inlen)
             SIPROUND;
         v0 ^= m;
     }
-    left = inlen & (SIPHASH_BLOCK_SIZE-1); /* gets put into leavings */
+    left = inlen & (SIPHASH_BLOCK_SIZE - 1); /* gets put into leavings */
     end = in + inlen - left;
 
     for (; in != end; in += 8) {
@@ -224,7 +221,7 @@ int SipHash_Final(SIPHASH *ctx, unsigned char *out, size_t outlen)
         b |= ((uint64_t)ctx->leavings[2]) << 16;
         /* fall through */
     case 2:
-        b |= ((uint64_t)ctx->leavings[1]) <<  8;
+        b |= ((uint64_t)ctx->leavings[1]) << 8;
         /* fall through */
     case 1:
         b |= ((uint64_t)ctx->leavings[0]);
@@ -242,14 +239,14 @@ int SipHash_Final(SIPHASH *ctx, unsigned char *out, size_t outlen)
         v2 ^= 0xff;
     for (i = 0; i < ctx->drounds; ++i)
         SIPROUND;
-    b = v0 ^ v1 ^ v2  ^ v3;
+    b = v0 ^ v1 ^ v2 ^ v3;
     U64TO8_LE(out, b);
     if (ctx->hash_size == SIPHASH_MIN_DIGEST_SIZE)
         return 1;
     v1 ^= 0xdd;
     for (i = 0; i < ctx->drounds; ++i)
         SIPROUND;
-    b = v0 ^ v1 ^ v2  ^ v3;
+    b = v0 ^ v1 ^ v2 ^ v3;
     U64TO8_LE(out + 8, b);
     return 1;
 }
diff --git a/crypto/sleep.c b/crypto/sleep.c
index dbd0f7802576b..9273995be682b 100644
--- a/crypto/sleep.c
+++ b/crypto/sleep.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -9,12 +9,13 @@
 
 #include <openssl/crypto.h>
 #include "internal/e_os.h"
+#include "internal/time.h"
 
 /* system-specific variants defining OSSL_sleep() */
-#if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)
+#if (defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__)) && !defined(OPENSSL_USE_SLEEP_BUSYLOOP)
 
-# if defined(OPENSSL_USE_USLEEP)                        \
-    || defined(__DJGPP__)                               \
+#if defined(OPENSSL_USE_USLEEP) \
+    || defined(__DJGPP__)       \
     || (defined(__TANDEM) && defined(_REENTRANT))
 
 /*
@@ -25,8 +26,8 @@
  * usleep, if it turns out that nanosleep() is unavailable.
  */
 
-#  include <unistd.h>
-void OSSL_sleep(uint64_t millis)
+#include <unistd.h>
+static void ossl_sleep_millis(uint64_t millis)
 {
     unsigned int s = (unsigned int)(millis / 1000);
     unsigned int us = (unsigned int)((millis % 1000) * 1000);
@@ -42,33 +43,33 @@ void OSSL_sleep(uint64_t millis)
     usleep(us);
 }
 
-# elif defined(__TANDEM) && !defined(_REENTRANT)
+#elif defined(__TANDEM) && !defined(_REENTRANT)
 
-#  include <cextdecs.h(PROCESS_DELAY_)>
-void OSSL_sleep(uint64_t millis)
+#include <cextdecs.h(PROCESS_DELAY_)>
+static void ossl_sleep_millis(uint64_t millis)
 {
     /* HPNS does not support usleep for non threaded apps */
     PROCESS_DELAY_(millis * 1000);
 }
 
-# else
+#else
 
 /* nanosleep is defined by POSIX.1-2001 */
-#  include <time.h>
-void OSSL_sleep(uint64_t millis)
+#include <time.h>
+static void ossl_sleep_millis(uint64_t millis)
 {
     struct timespec ts;
 
-    ts.tv_sec = (long int) (millis / 1000);
-    ts.tv_nsec = (long int) (millis % 1000) * 1000000ul;
+    ts.tv_sec = (long int)(millis / 1000);
+    ts.tv_nsec = (long int)(millis % 1000) * 1000000ul;
     nanosleep(&ts, NULL);
 }
 
-# endif
+#endif
 #elif defined(_WIN32) && !defined(OPENSSL_SYS_UEFI)
-# include <windows.h>
+#include <windows.h>
 
-void OSSL_sleep(uint64_t millis)
+static void ossl_sleep_millis(uint64_t millis)
 {
     /*
      * Windows' Sleep() takes a DWORD argument, which is smaller than
@@ -83,7 +84,7 @@ void OSSL_sleep(uint64_t millis)
 
 #else
 /* Fallback to a busy wait */
-# include "internal/time.h"
+#define USE_SLEEP_SECS
 
 static void ossl_sleep_secs(uint64_t secs)
 {
@@ -105,12 +106,30 @@ static void ossl_sleep_millis(uint64_t millis)
         = ossl_time_add(ossl_time_now(), ossl_ms2time(millis));
 
     while (ossl_time_compare(ossl_time_now(), finish) < 0)
-        /* busy wait */ ;
+        /* busy wait */;
 }
+#endif /* defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) */
 
 void OSSL_sleep(uint64_t millis)
 {
-    ossl_sleep_secs(millis / 1000);
-    ossl_sleep_millis(millis % 1000);
+    OSSL_TIME now = ossl_time_now();
+    OSSL_TIME finish = ossl_time_add(now, ossl_ms2time(millis));
+    uint64_t left = millis;
+
+#if defined(USE_SLEEP_SECS)
+    do {
+        ossl_sleep_secs(left / 1000);
+        now = ossl_time_now();
+        left = ossl_time2ms(ossl_time_subtract(finish, now));
+    } while (ossl_time_compare(now, finish) < 0 && left > 1000);
+
+    if (ossl_time_compare(now, finish) >= 0)
+        return;
+#endif
+
+    do {
+        ossl_sleep_millis(left);
+        now = ossl_time_now();
+        left = ossl_time2ms(ossl_time_subtract(finish, now));
+    } while (ossl_time_compare(now, finish) < 0);
 }
-#endif /* defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) */
diff --git a/crypto/slh_dsa/slh_adrs.c b/crypto/slh_dsa/slh_adrs.c
index 595a129c5a99c..e6fbfe6b8c7b4 100644
--- a/crypto/slh_dsa/slh_adrs.c
+++ b/crypto/slh_dsa/slh_adrs.c
@@ -11,28 +11,28 @@
 #include "slh_adrs.h"
 
 /* See FIPS 205 - Section 4.3 Table 1  Uncompressed Addresses */
-#define SLH_ADRS_OFF_LAYER_ADR      0
-#define SLH_ADRS_OFF_TREE_ADR       4
-#define SLH_ADRS_OFF_TYPE           16
-#define SLH_ADRS_OFF_KEYPAIR_ADDR   20
-#define SLH_ADRS_OFF_CHAIN_ADDR     24
-#define SLH_ADRS_OFF_HASH_ADDR      28
-#define SLH_ADRS_OFF_TREE_INDEX     SLH_ADRS_OFF_HASH_ADDR
-#define SLH_ADRS_SIZE_TYPE          4
+#define SLH_ADRS_OFF_LAYER_ADR 0
+#define SLH_ADRS_OFF_TREE_ADR 4
+#define SLH_ADRS_OFF_TYPE 16
+#define SLH_ADRS_OFF_KEYPAIR_ADDR 20
+#define SLH_ADRS_OFF_CHAIN_ADDR 24
+#define SLH_ADRS_OFF_HASH_ADDR 28
+#define SLH_ADRS_OFF_TREE_INDEX SLH_ADRS_OFF_HASH_ADDR
+#define SLH_ADRS_SIZE_TYPE 4
 /* Number of bytes after type to clear */
-#define SLH_ADRS_SIZE_TYPECLEAR     SLH_ADRS_SIZE - (SLH_ADRS_OFF_TYPE + SLH_ADRS_SIZE_TYPE)
-#define SLH_ADRS_SIZE_KEYPAIR_ADDR  4
+#define SLH_ADRS_SIZE_TYPECLEAR SLH_ADRS_SIZE - (SLH_ADRS_OFF_TYPE + SLH_ADRS_SIZE_TYPE)
+#define SLH_ADRS_SIZE_KEYPAIR_ADDR 4
 
 /* See FIPS 205 - Section 11.2 Table 3 Compressed Addresses */
-#define SLH_ADRSC_OFF_LAYER_ADR     0
-#define SLH_ADRSC_OFF_TREE_ADR      1
-#define SLH_ADRSC_OFF_TYPE          9
-#define SLH_ADRSC_OFF_KEYPAIR_ADDR  10
-#define SLH_ADRSC_OFF_CHAIN_ADDR    14
-#define SLH_ADRSC_OFF_HASH_ADDR     18
-#define SLH_ADRSC_OFF_TREE_INDEX    SLH_ADRSC_OFF_HASH_ADDR
-#define SLH_ADRSC_SIZE_TYPE         1
-#define SLH_ADRSC_SIZE_TYPECLEAR    SLH_ADRS_SIZE_TYPECLEAR
+#define SLH_ADRSC_OFF_LAYER_ADR 0
+#define SLH_ADRSC_OFF_TREE_ADR 1
+#define SLH_ADRSC_OFF_TYPE 9
+#define SLH_ADRSC_OFF_KEYPAIR_ADDR 10
+#define SLH_ADRSC_OFF_CHAIN_ADDR 14
+#define SLH_ADRSC_OFF_HASH_ADDR 18
+#define SLH_ADRSC_OFF_TREE_INDEX SLH_ADRSC_OFF_HASH_ADDR
+#define SLH_ADRSC_SIZE_TYPE 1
+#define SLH_ADRSC_SIZE_TYPECLEAR SLH_ADRS_SIZE_TYPECLEAR
 #define SLH_ADRSC_SIZE_KEYPAIR_ADDR SLH_ADRS_SIZE_KEYPAIR_ADDR
 
 #define slh_adrs_set_tree_height slh_adrs_set_chain_address
@@ -91,7 +91,7 @@ static void slh_adrs_set_keypair_address(uint8_t *adrs, uint32_t in)
 static void slh_adrs_copy_keypair_address(uint8_t *dst, const uint8_t *src)
 {
     memcpy(dst + SLH_ADRS_OFF_KEYPAIR_ADDR, src + SLH_ADRS_OFF_KEYPAIR_ADDR,
-           SLH_ADRS_SIZE_KEYPAIR_ADDR);
+        SLH_ADRS_SIZE_KEYPAIR_ADDR);
 }
 static void slh_adrs_set_chain_address(uint8_t *adrs, uint32_t in)
 {
@@ -131,7 +131,7 @@ static void slh_adrsc_set_keypair_address(uint8_t *adrsc, uint32_t in)
 static void slh_adrsc_copy_keypair_address(uint8_t *dst, const uint8_t *src)
 {
     memcpy(dst + SLH_ADRSC_OFF_KEYPAIR_ADDR, src + SLH_ADRSC_OFF_KEYPAIR_ADDR,
-           SLH_ADRSC_SIZE_KEYPAIR_ADDR);
+        SLH_ADRSC_SIZE_KEYPAIR_ADDR);
 }
 static void slh_adrsc_set_chain_address(uint8_t *adrsc, uint32_t in)
 {
diff --git a/crypto/slh_dsa/slh_adrs.h b/crypto/slh_dsa/slh_adrs.h
index e8219ebfb8570..556d0ad28635e 100644
--- a/crypto/slh_dsa/slh_adrs.h
+++ b/crypto/slh_dsa/slh_adrs.h
@@ -20,39 +20,39 @@
  * The compressed format is discussed in Section 11.2.
  */
 
-#define SLH_ADRS_SIZE     32 /* size of the ADRS blob */
-#define SLH_ADRSC_SIZE    22 /* size of a compact ADRS blob */
+#define SLH_ADRS_SIZE 32 /* size of the ADRS blob */
+#define SLH_ADRSC_SIZE 22 /* size of a compact ADRS blob */
 #define SLH_ADRS_SIZE_MAX SLH_ADRS_SIZE
 
 /* 7 Different types of addresses */
-#define SLH_ADRS_TYPE_WOTS_HASH  0
-#define SLH_ADRS_TYPE_WOTS_PK    1
-#define SLH_ADRS_TYPE_TREE       2
-#define SLH_ADRS_TYPE_FORS_TREE  3
+#define SLH_ADRS_TYPE_WOTS_HASH 0
+#define SLH_ADRS_TYPE_WOTS_PK 1
+#define SLH_ADRS_TYPE_TREE 2
+#define SLH_ADRS_TYPE_FORS_TREE 3
 #define SLH_ADRS_TYPE_FORS_ROOTS 4
-#define SLH_ADRS_TYPE_WOTS_PRF   5
-#define SLH_ADRS_TYPE_FORS_PRF   6
+#define SLH_ADRS_TYPE_WOTS_PRF 5
+#define SLH_ADRS_TYPE_FORS_PRF 6
 
 #define SLH_ADRS_DECLARE(a) uint8_t a[SLH_ADRS_SIZE_MAX]
 #define SLH_ADRS_FUNC_DECLARE(ctx, adrsf) \
     const SLH_ADRS_FUNC *adrsf = ctx->adrs_func
 #define SLH_ADRS_FN_DECLARE(adrsf, t) OSSL_SLH_ADRS_FUNC_##t *t = adrsf->t
 
-typedef void (OSSL_SLH_ADRS_FUNC_zero)(uint8_t *adrs);
-typedef void (OSSL_SLH_ADRS_FUNC_copy)(uint8_t *dst, const uint8_t *src);
-typedef void (OSSL_SLH_ADRS_FUNC_copy_keypair_address)(uint8_t *dst, const uint8_t *src);
+typedef void(OSSL_SLH_ADRS_FUNC_zero)(uint8_t *adrs);
+typedef void(OSSL_SLH_ADRS_FUNC_copy)(uint8_t *dst, const uint8_t *src);
+typedef void(OSSL_SLH_ADRS_FUNC_copy_keypair_address)(uint8_t *dst, const uint8_t *src);
 /*
  * Note that the tree address is actually 12 bytes in uncompressed format,
  * but we only use 8 bytes
  */
-typedef void (OSSL_SLH_ADRS_FUNC_set_tree_address)(uint8_t *adrs, uint64_t in);
-typedef void (OSSL_SLH_ADRS_FUNC_set_layer_address)(uint8_t *adrs, uint32_t layer);
-typedef void (OSSL_SLH_ADRS_FUNC_set_type_and_clear)(uint8_t *adrs, uint32_t type);
-typedef void (OSSL_SLH_ADRS_FUNC_set_keypair_address)(uint8_t *adrs, uint32_t in);
-typedef void (OSSL_SLH_ADRS_FUNC_set_chain_address)(uint8_t *adrs, uint32_t in);
-typedef void (OSSL_SLH_ADRS_FUNC_set_tree_height)(uint8_t *adrs, uint32_t in);
-typedef void (OSSL_SLH_ADRS_FUNC_set_hash_address)(uint8_t *adrs, uint32_t in);
-typedef void (OSSL_SLH_ADRS_FUNC_set_tree_index)(uint8_t *adrs, uint32_t in);
+typedef void(OSSL_SLH_ADRS_FUNC_set_tree_address)(uint8_t *adrs, uint64_t in);
+typedef void(OSSL_SLH_ADRS_FUNC_set_layer_address)(uint8_t *adrs, uint32_t layer);
+typedef void(OSSL_SLH_ADRS_FUNC_set_type_and_clear)(uint8_t *adrs, uint32_t type);
+typedef void(OSSL_SLH_ADRS_FUNC_set_keypair_address)(uint8_t *adrs, uint32_t in);
+typedef void(OSSL_SLH_ADRS_FUNC_set_chain_address)(uint8_t *adrs, uint32_t in);
+typedef void(OSSL_SLH_ADRS_FUNC_set_tree_height)(uint8_t *adrs, uint32_t in);
+typedef void(OSSL_SLH_ADRS_FUNC_set_hash_address)(uint8_t *adrs, uint32_t in);
+typedef void(OSSL_SLH_ADRS_FUNC_set_tree_index)(uint8_t *adrs, uint32_t in);
 
 typedef struct slh_adrs_func_st {
     OSSL_SLH_ADRS_FUNC_set_layer_address *set_layer_address;
diff --git a/crypto/slh_dsa/slh_dsa.c b/crypto/slh_dsa/slh_dsa.c
index 7ee465447dd98..77c20daceb34f 100644
--- a/crypto/slh_dsa/slh_dsa.c
+++ b/crypto/slh_dsa/slh_dsa.c
@@ -18,7 +18,7 @@
 #define MD_LEN(params) (((params)->k * (params)->a + 7) >> 3)
 
 static int get_tree_ids(PACKET *pkt, const SLH_DSA_PARAMS *params,
-                        uint64_t *tree_id, uint32_t *leaf_id);
+    uint64_t *tree_id, uint32_t *leaf_id);
 
 /**
  * @brief SLH-DSA Signature generation
@@ -40,9 +40,9 @@ static int get_tree_ids(PACKET *pkt, const SLH_DSA_PARAMS *params,
  * @returns 1 if the signature generation succeeded or 0 otherwise.
  */
 static int slh_sign_internal(SLH_DSA_HASH_CTX *hctx,
-                             const uint8_t *msg, size_t msg_len,
-                             uint8_t *sig, size_t *sig_len, size_t sig_size,
-                             const uint8_t *opt_rand)
+    const uint8_t *msg, size_t msg_len,
+    uint8_t *sig, size_t *sig_len, size_t sig_size,
+    const uint8_t *opt_rand)
 {
     int ret = 0;
     const SLH_DSA_KEY *priv = hctx->key;
@@ -71,7 +71,7 @@ static int slh_sign_internal(SLH_DSA_HASH_CTX *hctx,
 
     if (sig_size < sig_len_expected) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_SIGNATURE_SIZE,
-                       "is %zu, should be at least %zu", sig_size, sig_len_expected);
+            "is %zu, should be at least %zu", sig_size, sig_len_expected);
         return 0;
     }
     /* Exit if private key is not set */
@@ -83,7 +83,7 @@ static int slh_sign_internal(SLH_DSA_HASH_CTX *hctx,
     if (!WPACKET_init_static_len(wpkt, sig, sig_len_expected, 0))
         return 0;
     if (!PACKET_buf_init(rpkt, m_digest, params->m))
-        return 0;
+        goto err;
 
     pk_seed = SLH_DSA_PK_SEED(priv);
     sk_seed = SLH_DSA_SK_SEED(priv);
@@ -95,13 +95,13 @@ static int slh_sign_internal(SLH_DSA_HASH_CTX *hctx,
     /* calculate Randomness value r, and output to the SLH-DSA signature */
     r = WPACKET_get_curr(wpkt);
     if (!hashf->PRF_MSG(hctx, SLH_DSA_SK_PRF(priv), opt_rand, msg, msg_len, wpkt)
-            /* generate a digest of size |params->m| bytes where m is (30..49) */
-            || !hashf->H_MSG(hctx, r, pk_seed, SLH_DSA_PK_ROOT(priv), msg, msg_len,
-                             m_digest, sizeof(m_digest))
-            /* Grab the first md_len bytes of m_digest to use in fors_sign() */
-            || !PACKET_get_bytes(rpkt, &md, md_len)
-            /* Grab remaining bytes from m_digest to select tree and leaf id's */
-            || !get_tree_ids(rpkt, params, &tree_id, &leaf_id))
+        /* generate a digest of size |params->m| bytes where m is (30..49) */
+        || !hashf->H_MSG(hctx, r, pk_seed, SLH_DSA_PK_ROOT(priv), msg, msg_len,
+            m_digest, sizeof(m_digest))
+        /* Grab the first md_len bytes of m_digest to use in fors_sign() */
+        || !PACKET_get_bytes(rpkt, &md, md_len)
+        /* Grab remaining bytes from m_digest to select tree and leaf id's */
+        || !get_tree_ids(rpkt, params, &tree_id, &leaf_id))
         goto err;
 
     adrsf->set_tree_address(adrs, tree_id);
@@ -115,13 +115,13 @@ static int slh_sign_internal(SLH_DSA_HASH_CTX *hctx,
         && PACKET_buf_init(rpkt, sig_fors, WPACKET_get_curr(wpkt) - sig_fors)
         /* Calculate the FORS public key using the generated FORS signature */
         && ossl_slh_fors_pk_from_sig(hctx, rpkt, md, pk_seed, adrs,
-                                     pk_fors, sizeof(pk_fors))
+            pk_fors, sizeof(pk_fors))
         /* Generate ht signature and append to the SLH-DSA signature */
         && ossl_slh_ht_sign(hctx, pk_fors, sk_seed, pk_seed, tree_id, leaf_id,
-                            wpkt);
+            wpkt);
     *sig_len = sig_len_expected;
     ret = 1;
- err:
+err:
     if (!WPACKET_finish(wpkt))
         ret = 0;
     return ret;
@@ -145,8 +145,8 @@ static int slh_sign_internal(SLH_DSA_HASH_CTX *hctx,
  * @returns 1 if the signature verification succeeded or 0 otherwise.
  */
 static int slh_verify_internal(SLH_DSA_HASH_CTX *hctx,
-                               const uint8_t *msg, size_t msg_len,
-                               const uint8_t *sig, size_t sig_len)
+    const uint8_t *msg, size_t msg_len,
+    const uint8_t *sig, size_t sig_len)
 {
     const SLH_DSA_KEY *pub = hctx->key;
     SLH_HASH_FUNC_DECLARE(pub, hashf);
@@ -173,7 +173,7 @@ static int slh_verify_internal(SLH_DSA_HASH_CTX *hctx,
 
     /* Exit if signature is invalid size */
     if (sig_len != params->sig_len
-            || !PACKET_buf_init(sig_rpkt, sig, sig_len))
+        || !PACKET_buf_init(sig_rpkt, sig, sig_len))
         return 0;
     if (!PACKET_get_bytes(sig_rpkt, &r, n))
         return 0;
@@ -184,7 +184,7 @@ static int slh_verify_internal(SLH_DSA_HASH_CTX *hctx,
     pk_root = SLH_DSA_PK_ROOT(pub);
 
     if (!hashf->H_MSG(hctx, r, pk_seed, pk_root, msg, msg_len,
-                      m_digest, sizeof(m_digest)))
+            m_digest, sizeof(m_digest)))
         return 0;
 
     /*
@@ -193,17 +193,17 @@ static int slh_verify_internal(SLH_DSA_HASH_CTX *hctx,
      * from the remaining bytes in m_digest.
      */
     if (!PACKET_buf_init(m_digest_rpkt, m_digest, sizeof(m_digest))
-            || !PACKET_get_bytes(m_digest_rpkt, &md, md_len)
-            || !get_tree_ids(m_digest_rpkt, params, &tree_id, &leaf_id))
+        || !PACKET_get_bytes(m_digest_rpkt, &md, md_len)
+        || !get_tree_ids(m_digest_rpkt, params, &tree_id, &leaf_id))
         return 0;
 
     adrsf->set_tree_address(adrs, tree_id);
     adrsf->set_type_and_clear(adrs, SLH_ADRS_TYPE_FORS_TREE);
     adrsf->set_keypair_address(adrs, leaf_id);
     return ossl_slh_fors_pk_from_sig(hctx, sig_rpkt, md, pk_seed, adrs,
-                                     pk_fors, sizeof(pk_fors))
+               pk_fors, sizeof(pk_fors))
         && ossl_slh_ht_verify(hctx, pk_fors, sig_rpkt, pk_seed,
-                              tree_id, leaf_id, pk_root)
+            tree_id, leaf_id, pk_root)
         && PACKET_remaining(sig_rpkt) == 0;
 }
 
@@ -229,8 +229,8 @@ static int slh_verify_internal(SLH_DSA_HASH_CTX *hctx,
  * is 0 then it returns |msg|. NULL is returned if there is a failure.
  */
 static uint8_t *msg_encode(const uint8_t *msg, size_t msg_len,
-                           const uint8_t *ctx, size_t ctx_len, int encode,
-                           uint8_t *tmp, size_t tmp_len, size_t *out_len)
+    const uint8_t *ctx, size_t ctx_len, int encode,
+    uint8_t *tmp, size_t tmp_len, size_t *out_len)
 {
     uint8_t *encoded = NULL;
     size_t encoded_len;
@@ -265,10 +265,10 @@ static uint8_t *msg_encode(const uint8_t *msg, size_t msg_len,
  * @returns 1 on success, or 0 on error.
  */
 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)
 {
     uint8_t m_tmp[1024], *m = m_tmp;
     size_t m_len = 0;
@@ -276,7 +276,7 @@ int ossl_slh_dsa_sign(SLH_DSA_HASH_CTX *slh_ctx,
 
     if (sig != NULL) {
         m = msg_encode(msg, msg_len, ctx, ctx_len, encode, m_tmp, sizeof(m_tmp),
-                       &m_len);
+            &m_len);
         if (m == NULL)
             return 0;
     }
@@ -291,9 +291,9 @@ int ossl_slh_dsa_sign(SLH_DSA_HASH_CTX *slh_ctx,
  * @returns 1 on success, or 0 on error.
  */
 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)
 {
     uint8_t *m;
     size_t m_len;
@@ -301,7 +301,7 @@ int ossl_slh_dsa_verify(SLH_DSA_HASH_CTX *slh_ctx,
     int ret = 0;
 
     m = msg_encode(msg, msg_len, ctx, ctx_len, encode, m_tmp, sizeof(m_tmp),
-                   &m_len);
+        &m_len);
     if (m == NULL)
         return 0;
 
@@ -332,7 +332,7 @@ static uint64_t bytes_to_u64_be(const uint8_t *in, size_t in_len)
  * The sizes are determined by the |params| parameter set.
  */
 static int get_tree_ids(PACKET *rpkt, const SLH_DSA_PARAMS *params,
-                        uint64_t *tree_id, uint32_t *leaf_id)
+    uint64_t *tree_id, uint32_t *leaf_id)
 {
     const uint8_t *tree_id_bytes, *leaf_id_bytes;
     uint32_t tree_id_len, leaf_id_len;
@@ -342,7 +342,7 @@ static int get_tree_ids(PACKET *rpkt, const SLH_DSA_PARAMS *params,
     leaf_id_len = ((params->hm + 7) >> 3); /* 1 or 2 bytes */
 
     if (!PACKET_get_bytes(rpkt, &tree_id_bytes, tree_id_len)
-            || !PACKET_get_bytes(rpkt, &leaf_id_bytes, leaf_id_len))
+        || !PACKET_get_bytes(rpkt, &leaf_id_bytes, leaf_id_len))
         return 0;
 
     /*
diff --git a/crypto/slh_dsa/slh_dsa_hash_ctx.c b/crypto/slh_dsa/slh_dsa_hash_ctx.c
index 47dd8f2590104..9dca01acf5ffc 100644
--- a/crypto/slh_dsa/slh_dsa_hash_ctx.c
+++ b/crypto/slh_dsa/slh_dsa_hash_ctx.c
@@ -55,7 +55,7 @@ SLH_DSA_HASH_CTX *ossl_slh_dsa_hash_ctx_new(const SLH_DSA_KEY *key)
         }
     }
     return ret;
- err:
+err:
     ossl_slh_dsa_hash_ctx_free(ret);
     return NULL;
 }
@@ -77,7 +77,7 @@ SLH_DSA_HASH_CTX *ossl_slh_dsa_hash_ctx_dup(const SLH_DSA_HASH_CTX *src)
     ret->key = src->key;
 
     if (src->md_ctx != NULL
-            && (ret->md_ctx = EVP_MD_CTX_dup(src->md_ctx)) == NULL)
+        && (ret->md_ctx = EVP_MD_CTX_dup(src->md_ctx)) == NULL)
         goto err;
     if (src->md_big_ctx != NULL) {
         if (src->md_big_ctx != src->md_ctx) {
@@ -88,10 +88,10 @@ SLH_DSA_HASH_CTX *ossl_slh_dsa_hash_ctx_dup(const SLH_DSA_HASH_CTX *src)
         }
     }
     if (src->hmac_ctx != NULL
-            && (ret->hmac_ctx = EVP_MAC_CTX_dup(src->hmac_ctx)) == NULL)
+        && (ret->hmac_ctx = EVP_MAC_CTX_dup(src->hmac_ctx)) == NULL)
         goto err;
     return ret;
- err:
+err:
     ossl_slh_dsa_hash_ctx_free(ret);
     return NULL;
 }
diff --git a/crypto/slh_dsa/slh_dsa_key.c b/crypto/slh_dsa/slh_dsa_key.c
index d71d55c258292..2fa59a659892c 100644
--- a/crypto/slh_dsa/slh_dsa_key.c
+++ b/crypto/slh_dsa/slh_dsa_key.c
@@ -61,7 +61,7 @@ static int slh_dsa_key_hash_init(SLH_DSA_KEY *key)
     key->adrs_func = ossl_slh_get_adrs_fn(is_shake == 0);
     key->hash_func = ossl_slh_get_hash_fn(is_shake);
     return 1;
- err:
+err:
     slh_dsa_key_hash_cleanup(key);
     return 0;
 }
@@ -76,6 +76,17 @@ static void slh_dsa_key_hash_dup(SLH_DSA_KEY *dst, const SLH_DSA_KEY *src)
         EVP_MAC_up_ref(src->hmac);
 }
 
+/**
+ * @brief Return the libctx associated with a SLH_DSA_KEY object
+ *
+ * @param key A SLH_DSA_KEY to extract the libctx from.
+ * @returns The new OSSL_LIB_CTX object on success, or NULL failure
+ */
+OSSL_LIB_CTX *ossl_slh_dsa_key_get0_libctx(const SLH_DSA_KEY *key)
+{
+    return key != NULL ? key->libctx : NULL;
+}
+
 /**
  * @brief Create a new SLH_DSA_KEY object
  *
@@ -85,7 +96,7 @@ static void slh_dsa_key_hash_dup(SLH_DSA_KEY *dst, const SLH_DSA_KEY *src)
  * @returns The new SLH_DSA_KEY object on success, or NULL on malloc failure
  */
 SLH_DSA_KEY *ossl_slh_dsa_key_new(OSSL_LIB_CTX *libctx, const char *propq,
-                                  const char *alg)
+    const char *alg)
 {
     SLH_DSA_KEY *ret;
     const SLH_DSA_PARAMS *params = ossl_slh_dsa_params_get(alg);
@@ -106,7 +117,7 @@ SLH_DSA_KEY *ossl_slh_dsa_key_new(OSSL_LIB_CTX *libctx, const char *propq,
             goto err;
     }
     return ret;
- err:
+err:
     ossl_slh_dsa_key_free(ret);
     return NULL;
 }
@@ -160,7 +171,7 @@ SLH_DSA_KEY *ossl_slh_dsa_key_dup(const SLH_DSA_KEY *src, int selection)
         }
     }
     return ret;
- err:
+err:
     ossl_slh_dsa_key_free(ret);
     return NULL;
 }
@@ -176,7 +187,7 @@ SLH_DSA_KEY *ossl_slh_dsa_key_dup(const SLH_DSA_KEY *src, int selection)
  * @returns 1 if the keys are equal otherwise it returns 0.
  */
 int ossl_slh_dsa_key_equal(const SLH_DSA_KEY *key1, const SLH_DSA_KEY *key2,
-                           int selection)
+    int selection)
 {
     int key_checked = 0;
 
@@ -193,10 +204,11 @@ int ossl_slh_dsa_key_equal(const SLH_DSA_KEY *key1, const SLH_DSA_KEY *key2,
             }
         }
         if (!key_checked
-                && (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
+            && (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
             if (key1->has_priv && key2->has_priv) {
                 if (memcmp(key1->priv, key2->priv,
-                           key1->params->pk_len) != 0)
+                        key1->params->pk_len)
+                    != 0)
                     return 0;
                 key_checked = 1;
             }
@@ -212,7 +224,7 @@ int ossl_slh_dsa_key_has(const SLH_DSA_KEY *key, int selection)
         if (key->pub == NULL)
             return 0; /* No public key */
         if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0
-                && key->has_priv == 0)
+            && key->has_priv == 0)
             return 0; /* No private key */
         return 1;
     }
@@ -235,6 +247,15 @@ int ossl_slh_dsa_key_pairwise_check(const SLH_DSA_KEY *key)
     return ret;
 }
 
+void ossl_slh_dsa_key_reset(SLH_DSA_KEY *key)
+{
+    key->pub = NULL;
+    if (key->has_priv) {
+        key->has_priv = 0;
+        OPENSSL_cleanse(key->priv, sizeof(key->priv));
+    }
+}
+
 /**
  * @brief Load a SLH_DSA key from raw data.
  *
@@ -245,7 +266,7 @@ int ossl_slh_dsa_key_pairwise_check(const SLH_DSA_KEY *key)
  * @returns 1 on success, or 0 on failure.
  */
 int ossl_slh_dsa_key_fromdata(SLH_DSA_KEY *key, const OSSL_PARAM params[],
-                              int include_private)
+    int include_private)
 {
     size_t priv_len, key_len, data_len = 0;
     const OSSL_PARAM *param_priv = NULL, *param_pub = NULL;
@@ -287,15 +308,13 @@ int ossl_slh_dsa_key_fromdata(SLH_DSA_KEY *key, const OSSL_PARAM params[],
     p = SLH_DSA_PUB(key);
     param_pub = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
     if (param_pub == NULL
-            || !OSSL_PARAM_get_octet_string(param_pub, &p, key_len, &data_len)
-            || data_len != key_len)
+        || !OSSL_PARAM_get_octet_string(param_pub, &p, key_len, &data_len)
+        || data_len != key_len)
         goto err;
     key->pub = p;
     return 1;
- err:
-    key->pub = NULL;
-    key->has_priv = 0;
-    OPENSSL_cleanse(key->priv, priv_len);
+err:
+    ossl_slh_dsa_key_reset(key);
     return 0;
 }
 
@@ -311,7 +330,7 @@ int ossl_slh_dsa_key_fromdata(SLH_DSA_KEY *key, const OSSL_PARAM params[],
  * @returns 1 if the root key is generated or compared successfully, or 0 on error.
  */
 static int slh_dsa_compute_pk_root(SLH_DSA_HASH_CTX *ctx, SLH_DSA_KEY *out,
-                                   int validate)
+    int validate)
 {
     const SLH_DSA_KEY *key = ctx->key;
     SLH_ADRS_FUNC_DECLARE(key, adrsf);
@@ -327,7 +346,7 @@ static int slh_dsa_compute_pk_root(SLH_DSA_HASH_CTX *ctx, SLH_DSA_KEY *out,
 
     /* Generate the ROOT public key */
     return ossl_slh_xmss_node(ctx, SLH_DSA_SK_SEED(key), 0, params->hm,
-                              SLH_DSA_PK_SEED(key), adrs, dst, n)
+               SLH_DSA_PK_SEED(key), adrs, dst, n)
         && (validate == 0 || memcmp(dst, SLH_DSA_PK_ROOT(out), n) == 0);
 }
 
@@ -346,12 +365,12 @@ static int slh_dsa_compute_pk_root(SLH_DSA_HASH_CTX *ctx, SLH_DSA_KEY *out,
  * @returns 1 if the key is generated or 0 otherwise.
  */
 int ossl_slh_dsa_generate_key(SLH_DSA_HASH_CTX *ctx, SLH_DSA_KEY *out,
-                              OSSL_LIB_CTX *lib_ctx,
-                              const uint8_t *entropy, size_t entropy_len)
+    OSSL_LIB_CTX *lib_ctx,
+    const uint8_t *entropy, size_t entropy_len)
 {
     size_t n = out->params->n;
     size_t secret_key_len = 2 * n; /* The length of SK_SEED + SK_PRF */
-    size_t pk_seed_len = n;        /* The length of PK_SEED */
+    size_t pk_seed_len = n; /* The length of PK_SEED */
     size_t entropy_len_expected = secret_key_len + pk_seed_len;
     uint8_t *priv = SLH_DSA_PRIV(out);
     uint8_t *pub = SLH_DSA_PUB(out);
@@ -362,7 +381,7 @@ int ossl_slh_dsa_generate_key(SLH_DSA_HASH_CTX *ctx, SLH_DSA_KEY *out,
         memcpy(priv, entropy, entropy_len_expected);
     } else {
         if (RAND_priv_bytes_ex(lib_ctx, priv, secret_key_len, 0) <= 0
-                || RAND_bytes_ex(lib_ctx, pub, pk_seed_len, 0) <= 0)
+            || RAND_bytes_ex(lib_ctx, pub, pk_seed_len, 0) <= 0)
             goto err;
     }
     if (!slh_dsa_compute_pk_root(ctx, out, 0))
@@ -471,20 +490,20 @@ int ossl_slh_dsa_key_to_text(BIO *out, const SLH_DSA_KEY *key, int selection)
     if (ossl_slh_dsa_key_get_pub(key) == NULL) {
         /* Regardless of the |selection|, there must be a public key */
         ERR_raise_data(ERR_LIB_PROV, PROV_R_MISSING_KEY,
-                       "no %s key material available", name);
+            "no %s key material available", name);
         return 0;
     }
 
     if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
         if (ossl_slh_dsa_key_get_priv(key) == NULL) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_MISSING_KEY,
-                           "no %s key material available", name);
+                "no %s key material available", name);
             return 0;
         }
         if (BIO_printf(out, "%s Private-Key:\n", name) <= 0)
             return 0;
         if (!ossl_bio_print_labeled_buf(out, "priv:", ossl_slh_dsa_key_get_priv(key),
-                                        ossl_slh_dsa_key_get_priv_len(key)))
+                ossl_slh_dsa_key_get_priv_len(key)))
             return 0;
     } else if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
         if (BIO_printf(out, "%s Public-Key:\n", name) <= 0)
@@ -492,7 +511,7 @@ int ossl_slh_dsa_key_to_text(BIO *out, const SLH_DSA_KEY *key, int selection)
     }
 
     if (!ossl_bio_print_labeled_buf(out, "pub:", ossl_slh_dsa_key_get_pub(key),
-                                    ossl_slh_dsa_key_get_pub_len(key)))
+            ossl_slh_dsa_key_get_pub_len(key)))
         return 0;
 
     return 1;
diff --git a/crypto/slh_dsa/slh_dsa_key.h b/crypto/slh_dsa/slh_dsa_key.h
index f8fb68e6efde9..37b7aa1b16ad6 100644
--- a/crypto/slh_dsa/slh_dsa_key.h
+++ b/crypto/slh_dsa/slh_dsa_key.h
@@ -11,7 +11,7 @@
 
 #define SLH_DSA_MAX_N 32
 #define SLH_DSA_SK_SEED(key) ((key)->priv)
-#define SLH_DSA_SK_PRF(key)  ((key)->priv + (key)->params->n)
+#define SLH_DSA_SK_PRF(key) ((key)->priv + (key)->params->n)
 #define SLH_DSA_PK_SEED(key) ((key)->priv + (key)->params->n * 2)
 #define SLH_DSA_PK_ROOT(key) ((key)->priv + (key)->params->n * 3)
 #define SLH_DSA_PUB(key) SLH_DSA_PK_SEED(key)
diff --git a/crypto/slh_dsa/slh_dsa_local.h b/crypto/slh_dsa/slh_dsa_local.h
index 2373589740314..57dfc1eb13011 100644
--- a/crypto/slh_dsa/slh_dsa_local.h
+++ b/crypto/slh_dsa/slh_dsa_local.h
@@ -47,49 +47,49 @@
  */
 struct slh_dsa_hash_ctx_st {
     const SLH_DSA_KEY *key; /* This key is not owned by this object */
-    EVP_MD_CTX *md_ctx;     /* Either SHAKE OR SHA-256 */
+    EVP_MD_CTX *md_ctx; /* Either SHAKE OR SHA-256 */
     EVP_MD_CTX *md_big_ctx; /* Either SHA-512 or points to |md_ctx| for SHA-256*/
-    EVP_MAC_CTX *hmac_ctx;  /* required by SHA algorithms for PRFmsg() */
-    int hmac_digest_used;   /* Used for lazy init of hmac_ctx digest */
+    EVP_MAC_CTX *hmac_ctx; /* required by SHA algorithms for PRFmsg() */
+    int hmac_digest_used; /* Used for lazy init of hmac_ctx digest */
 };
 
 __owur int ossl_slh_wots_pk_gen(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
-                                const uint8_t *pk_seed, uint8_t *adrs,
-                                uint8_t *pk_out, size_t pk_out_len);
+    const uint8_t *pk_seed, uint8_t *adrs,
+    uint8_t *pk_out, size_t pk_out_len);
 __owur int ossl_slh_wots_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
-                              const uint8_t *sk_seed, const uint8_t *pk_seed,
-                              uint8_t *adrs, WPACKET *sig_wpkt);
+    const uint8_t *sk_seed, const uint8_t *pk_seed,
+    uint8_t *adrs, WPACKET *sig_wpkt);
 __owur int ossl_slh_wots_pk_from_sig(SLH_DSA_HASH_CTX *ctx,
-                                     PACKET *sig_rpkt, const uint8_t *msg,
-                                     const uint8_t *pk_seed, uint8_t *adrs,
-                                     uint8_t *pk_out, size_t pk_out_len);
+    PACKET *sig_rpkt, const uint8_t *msg,
+    const uint8_t *pk_seed, uint8_t *adrs,
+    uint8_t *pk_out, size_t pk_out_len);
 
 __owur int ossl_slh_xmss_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
-                              uint32_t node_id, uint32_t height,
-                              const uint8_t *pk_seed, uint8_t *adrs,
-                              uint8_t *pk_out, size_t pk_out_len);
+    uint32_t node_id, uint32_t height,
+    const uint8_t *pk_seed, uint8_t *adrs,
+    uint8_t *pk_out, size_t pk_out_len);
 __owur int ossl_slh_xmss_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
-                              const uint8_t *sk_seed, uint32_t node_id,
-                              const uint8_t *pk_seed, uint8_t *adrs,
-                              WPACKET *sig_wpkt);
+    const uint8_t *sk_seed, uint32_t node_id,
+    const uint8_t *pk_seed, uint8_t *adrs,
+    WPACKET *sig_wpkt);
 __owur int ossl_slh_xmss_pk_from_sig(SLH_DSA_HASH_CTX *ctx, uint32_t node_id,
-                                     PACKET *sig_rpkt, const uint8_t *msg,
-                                     const uint8_t *pk_seed, uint8_t *adrs,
-                                     uint8_t *pk_out, size_t pk_out_len);
+    PACKET *sig_rpkt, const uint8_t *msg,
+    const uint8_t *pk_seed, uint8_t *adrs,
+    uint8_t *pk_out, size_t pk_out_len);
 
 __owur int ossl_slh_ht_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
-                            const uint8_t *sk_seed, const uint8_t *pk_seed,
-                            uint64_t tree_id, uint32_t leaf_id,
-                            WPACKET *sig_wpkt);
+    const uint8_t *sk_seed, const uint8_t *pk_seed,
+    uint64_t tree_id, uint32_t leaf_id,
+    WPACKET *sig_wpkt);
 __owur int ossl_slh_ht_verify(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
-                              PACKET *sig_rpkt, const uint8_t *pk_seed,
-                              uint64_t tree_id, uint32_t leaf_id,
-                              const uint8_t *pk_root);
+    PACKET *sig_rpkt, const uint8_t *pk_seed,
+    uint64_t tree_id, uint32_t leaf_id,
+    const uint8_t *pk_root);
 
 __owur int ossl_slh_fors_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *md,
-                              const uint8_t *sk_seed, const uint8_t *pk_seed,
-                              uint8_t *adrs, WPACKET *sig_wpkt);
+    const uint8_t *sk_seed, const uint8_t *pk_seed,
+    uint8_t *adrs, WPACKET *sig_wpkt);
 __owur int ossl_slh_fors_pk_from_sig(SLH_DSA_HASH_CTX *ctx, PACKET *sig_rpkt,
-                                     const uint8_t *md, const uint8_t *pk_seed,
-                                     uint8_t *adrs,
-                                     uint8_t *pk_out, size_t pk_out_len);
+    const uint8_t *md, const uint8_t *pk_seed,
+    uint8_t *adrs,
+    uint8_t *pk_out, size_t pk_out_len);
diff --git a/crypto/slh_dsa/slh_fors.c b/crypto/slh_dsa/slh_fors.c
index eca46442614a9..78587589db428 100644
--- a/crypto/slh_dsa/slh_fors.c
+++ b/crypto/slh_dsa/slh_fors.c
@@ -13,12 +13,12 @@
 #include "slh_dsa_key.h"
 
 /* k = 14, 17, 22, 33, 35 (number of trees) */
-#define SLH_MAX_K           35
+#define SLH_MAX_K 35
 /* a = 6, 8, 9, 12 or 14  - There are (2^a) merkle trees */
-#define SLH_MAX_A           9
+#define SLH_MAX_A 9
 
-#define SLH_MAX_K_TIMES_A      (SLH_MAX_A * SLH_MAX_K)
-#define SLH_MAX_ROOTS          (SLH_MAX_K_TIMES_A * SLH_MAX_N)
+#define SLH_MAX_K_TIMES_A (SLH_MAX_A * SLH_MAX_K)
+#define SLH_MAX_ROOTS (SLH_MAX_K_TIMES_A * SLH_MAX_N)
 
 static void slh_base_2b(const uint8_t *in, uint32_t b, uint32_t *out, size_t out_len);
 
@@ -39,8 +39,8 @@ static void slh_base_2b(const uint8_t *in, uint32_t b, uint32_t *out, size_t out
  * @returns 1 on success, or 0 on error.
  */
 static int slh_fors_sk_gen(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
-                           const uint8_t *pk_seed, uint8_t *adrs, uint32_t id,
-                           uint8_t *pk_out, size_t pk_out_len)
+    const uint8_t *pk_seed, uint8_t *adrs, uint32_t id,
+    uint8_t *pk_out, size_t pk_out_len)
 {
     const SLH_DSA_KEY *key = ctx->key;
     SLH_ADRS_DECLARE(sk_adrs);
@@ -75,8 +75,8 @@ static int slh_fors_sk_gen(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
  * @returns 1 on success, or 0 on error.
  */
 static int slh_fors_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
-                         const uint8_t *pk_seed, uint8_t *adrs, uint32_t node_id,
-                         uint32_t height, uint8_t *node, size_t node_len)
+    const uint8_t *pk_seed, uint8_t *adrs, uint32_t node_id,
+    uint32_t height, uint8_t *node, size_t node_len)
 {
     int ret = 0;
     const SLH_DSA_KEY *key = ctx->key;
@@ -96,9 +96,9 @@ static int slh_fors_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
         return ret;
     } else {
         if (!slh_fors_node(ctx, sk_seed, pk_seed, adrs, 2 * node_id, height - 1,
-                           lnode, sizeof(rnode))
-                || !slh_fors_node(ctx, sk_seed, pk_seed, adrs, 2 * node_id + 1,
-                                  height - 1, rnode, sizeof(rnode)))
+                lnode, sizeof(rnode))
+            || !slh_fors_node(ctx, sk_seed, pk_seed, adrs, 2 * node_id + 1,
+                height - 1, rnode, sizeof(rnode)))
             return 0;
         adrsf->set_tree_height(adrs, height);
         adrsf->set_tree_index(adrs, node_id);
@@ -129,8 +129,8 @@ static int slh_fors_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
  * @returns 1 on success, or 0 on error.
  */
 int ossl_slh_fors_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *md,
-                       const uint8_t *sk_seed, const uint8_t *pk_seed,
-                       uint8_t *adrs, WPACKET *sig_wpkt)
+    const uint8_t *sk_seed, const uint8_t *pk_seed,
+    uint8_t *adrs, WPACKET *sig_wpkt)
 {
     const SLH_DSA_KEY *key = ctx->key;
     uint32_t tree_id, layer, s, tree_offset;
@@ -163,8 +163,8 @@ int ossl_slh_fors_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *md,
         tree_offset = tree_id_times_two_power_a;
 
         if (!slh_fors_sk_gen(ctx, sk_seed, pk_seed, adrs,
-                             node_id + tree_id_times_two_power_a, out, sizeof(out))
-                || !WPACKET_memcpy(sig_wpkt, out, n))
+                node_id + tree_id_times_two_power_a, out, sizeof(out))
+            || !WPACKET_memcpy(sig_wpkt, out, n))
             return 0;
 
         /*
@@ -177,7 +177,7 @@ int ossl_slh_fors_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *md,
         for (layer = 0; layer < a; ++layer) {
             s = node_id ^ 1; /* XOR gets the index of the other child in a binary tree */
             if (!slh_fors_node(ctx, sk_seed, pk_seed, adrs,
-                               s + tree_offset, layer, out, sizeof(out)))
+                    s + tree_offset, layer, out, sizeof(out)))
                 return 0;
             node_id >>= 1; /* Get the parent node id */
             tree_offset >>= 1; /* Each layer up has half as many nodes */
@@ -208,8 +208,8 @@ int ossl_slh_fors_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *md,
  * @returns 1 on success, or 0 on error.
  */
 int ossl_slh_fors_pk_from_sig(SLH_DSA_HASH_CTX *ctx, PACKET *fors_sig_rpkt,
-                              const uint8_t *md, const uint8_t *pk_seed,
-                              uint8_t *adrs, uint8_t *pk_out, size_t pk_out_len)
+    const uint8_t *md, const uint8_t *pk_seed,
+    uint8_t *adrs, uint8_t *pk_out, size_t pk_out_len)
 {
     const SLH_DSA_KEY *key = ctx->key;
     int ret = 0;
@@ -250,8 +250,8 @@ int ossl_slh_fors_pk_from_sig(SLH_DSA_HASH_CTX *ctx, PACKET *fors_sig_rpkt,
 
         /* Regenerate the public key of the leaf */
         if (!PACKET_get_bytes(fors_sig_rpkt, &sk, n)
-                || !WPACKET_allocate_bytes(wroot_pkt, n, &node0)
-                || !F(ctx, pk_seed, adrs, sk, n, node0, n))
+            || !WPACKET_allocate_bytes(wroot_pkt, n, &node0)
+            || !F(ctx, pk_seed, adrs, sk, n, node0, n))
             goto err;
 
         /* This omits the copying of the nodes that the FIPS 205 code does */
@@ -285,7 +285,7 @@ int ossl_slh_fors_pk_from_sig(SLH_DSA_HASH_CTX *ctx, PACKET *fors_sig_rpkt,
     adrsf->set_type_and_clear(pk_adrs, SLH_ADRS_TYPE_FORS_ROOTS);
     adrsf->copy_keypair_address(pk_adrs, adrs);
     ret = hashf->T(ctx, pk_seed, pk_adrs, roots, roots_len, pk_out, pk_out_len);
- err:
+err:
     if (!WPACKET_finish(wroot_pkt))
         ret = 0;
     return ret;
@@ -303,7 +303,7 @@ int ossl_slh_fors_pk_from_sig(SLH_DSA_HASH_CTX *ctx, PACKET *fors_sig_rpkt,
  * @param out_len The size of |out|
  */
 static void slh_base_2b(const uint8_t *in, uint32_t b,
-                        uint32_t *out, size_t out_len)
+    uint32_t *out, size_t out_len)
 {
     size_t consumed = 0;
     uint32_t bits = 0;
diff --git a/crypto/slh_dsa/slh_hash.c b/crypto/slh_dsa/slh_hash.c
index 6a8d6bab03c13..bd112f1cb0dba 100644
--- a/crypto/slh_dsa/slh_hash.c
+++ b/crypto/slh_dsa/slh_hash.c
@@ -33,64 +33,64 @@ static OSSL_SLH_HASHFUNC_H slh_h_shake;
 static OSSL_SLH_HASHFUNC_T slh_t_shake;
 
 static ossl_inline int xof_digest_3(EVP_MD_CTX *ctx,
-                                    const uint8_t *in1, size_t in1_len,
-                                    const uint8_t *in2, size_t in2_len,
-                                    const uint8_t *in3, size_t in3_len,
-                                    uint8_t *out, size_t out_len)
+    const uint8_t *in1, size_t in1_len,
+    const uint8_t *in2, size_t in2_len,
+    const uint8_t *in3, size_t in3_len,
+    uint8_t *out, size_t out_len)
 {
     return (EVP_DigestInit_ex2(ctx, NULL, NULL) == 1
-            && EVP_DigestUpdate(ctx, in1, in1_len) == 1
-            && EVP_DigestUpdate(ctx, in2, in2_len) == 1
-            && EVP_DigestUpdate(ctx, in3, in3_len) == 1
-            && EVP_DigestFinalXOF(ctx, out, out_len) == 1);
+        && EVP_DigestUpdate(ctx, in1, in1_len) == 1
+        && EVP_DigestUpdate(ctx, in2, in2_len) == 1
+        && EVP_DigestUpdate(ctx, in3, in3_len) == 1
+        && EVP_DigestFinalXOF(ctx, out, out_len) == 1);
 }
 
 static ossl_inline int xof_digest_4(EVP_MD_CTX *ctx,
-                                    const uint8_t *in1, size_t in1_len,
-                                    const uint8_t *in2, size_t in2_len,
-                                    const uint8_t *in3, size_t in3_len,
-                                    const uint8_t *in4, size_t in4_len,
-                                    uint8_t *out, size_t out_len)
+    const uint8_t *in1, size_t in1_len,
+    const uint8_t *in2, size_t in2_len,
+    const uint8_t *in3, size_t in3_len,
+    const uint8_t *in4, size_t in4_len,
+    uint8_t *out, size_t out_len)
 {
     return (EVP_DigestInit_ex2(ctx, NULL, NULL) == 1
-            && EVP_DigestUpdate(ctx, in1, in1_len) == 1
-            && EVP_DigestUpdate(ctx, in2, in2_len) == 1
-            && EVP_DigestUpdate(ctx, in3, in3_len) == 1
-            && EVP_DigestUpdate(ctx, in4, in4_len) == 1
-            && EVP_DigestFinalXOF(ctx, out, out_len) == 1);
+        && EVP_DigestUpdate(ctx, in1, in1_len) == 1
+        && EVP_DigestUpdate(ctx, in2, in2_len) == 1
+        && EVP_DigestUpdate(ctx, in3, in3_len) == 1
+        && EVP_DigestUpdate(ctx, in4, in4_len) == 1
+        && EVP_DigestFinalXOF(ctx, out, out_len) == 1);
 }
 
 /* See FIPS 205 Section 11.1 */
 static int
 slh_hmsg_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *r,
-               const uint8_t *pk_seed, const uint8_t *pk_root,
-               const uint8_t *msg, size_t msg_len,
-               uint8_t *out, size_t out_len)
+    const uint8_t *pk_seed, const uint8_t *pk_root,
+    const uint8_t *msg, size_t msg_len,
+    uint8_t *out, size_t out_len)
 {
     const SLH_DSA_PARAMS *params = ctx->key->params;
     size_t m = params->m;
     size_t n = params->n;
 
     return xof_digest_4(ctx->md_ctx, r, n, pk_seed, n, pk_root, n,
-                        msg, msg_len, out, m);
+        msg, msg_len, out, m);
 }
 
 static int
 slh_prf_shake(SLH_DSA_HASH_CTX *ctx,
-              const uint8_t *pk_seed, const uint8_t *sk_seed,
-              const uint8_t *adrs, uint8_t *out, size_t out_len)
+    const uint8_t *pk_seed, const uint8_t *sk_seed,
+    const uint8_t *adrs, uint8_t *out, size_t out_len)
 {
     const SLH_DSA_PARAMS *params = ctx->key->params;
     size_t n = params->n;
 
     return xof_digest_3(ctx->md_ctx, pk_seed, n, adrs, SLH_ADRS_SIZE,
-                        sk_seed, n, out, n);
+        sk_seed, n, out, n);
 }
 
 static int
 slh_prf_msg_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_prf,
-                  const uint8_t *opt_rand, const uint8_t *msg, size_t msg_len,
-                  WPACKET *pkt)
+    const uint8_t *opt_rand, const uint8_t *msg, size_t msg_len,
+    WPACKET *pkt)
 {
     unsigned char out[SLH_MAX_N];
     const SLH_DSA_PARAMS *params = ctx->key->params;
@@ -102,7 +102,7 @@ slh_prf_msg_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_prf,
 
 static int
 slh_f_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed, const uint8_t *adrs,
-            const uint8_t *m1, size_t m1_len, uint8_t *out, size_t out_len)
+    const uint8_t *m1, size_t m1_len, uint8_t *out, size_t out_len)
 {
     const SLH_DSA_PARAMS *params = ctx->key->params;
     size_t n = params->n;
@@ -112,7 +112,7 @@ slh_f_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed, const uint8_t *adrs,
 
 static int
 slh_h_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed, const uint8_t *adrs,
-            const uint8_t *m1, const uint8_t *m2, uint8_t *out, size_t out_len)
+    const uint8_t *m1, const uint8_t *m2, uint8_t *out, size_t out_len)
 {
     const SLH_DSA_PARAMS *params = ctx->key->params;
     size_t n = params->n;
@@ -122,7 +122,7 @@ slh_h_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed, const uint8_t *adrs,
 
 static int
 slh_t_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed, const uint8_t *adrs,
-            const uint8_t *ml, size_t ml_len, uint8_t *out, size_t out_len)
+    const uint8_t *ml, size_t ml_len, uint8_t *out, size_t out_len)
 {
     const SLH_DSA_PARAMS *params = ctx->key->params;
     size_t n = params->n;
@@ -132,24 +132,24 @@ slh_t_shake(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed, const uint8_t *adrs,
 
 static ossl_inline int
 digest_4(EVP_MD_CTX *ctx,
-         const uint8_t *in1, size_t in1_len, const uint8_t *in2, size_t in2_len,
-         const uint8_t *in3, size_t in3_len, const uint8_t *in4, size_t in4_len,
-         uint8_t *out)
+    const uint8_t *in1, size_t in1_len, const uint8_t *in2, size_t in2_len,
+    const uint8_t *in3, size_t in3_len, const uint8_t *in4, size_t in4_len,
+    uint8_t *out)
 {
     return (EVP_DigestInit_ex2(ctx, NULL, NULL) == 1
-            && EVP_DigestUpdate(ctx, in1, in1_len) == 1
-            && EVP_DigestUpdate(ctx, in2, in2_len) == 1
-            && EVP_DigestUpdate(ctx, in3, in3_len) == 1
-            && EVP_DigestUpdate(ctx, in4, in4_len) == 1
-            && EVP_DigestFinal_ex(ctx, out, NULL) == 1);
+        && EVP_DigestUpdate(ctx, in1, in1_len) == 1
+        && EVP_DigestUpdate(ctx, in2, in2_len) == 1
+        && EVP_DigestUpdate(ctx, in3, in3_len) == 1
+        && EVP_DigestUpdate(ctx, in4, in4_len) == 1
+        && EVP_DigestFinal_ex(ctx, out, NULL) == 1);
 }
 
 /* FIPS 205 Section 11.2.1 and 11.2.2 */
 
 static int
 slh_hmsg_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *r, const uint8_t *pk_seed,
-              const uint8_t *pk_root, const uint8_t *msg, size_t msg_len,
-              uint8_t *out, size_t out_len)
+    const uint8_t *pk_root, const uint8_t *msg, size_t msg_len,
+    uint8_t *out, size_t out_len)
 {
     const SLH_DSA_PARAMS *params = hctx->key->params;
     size_t m = params->m;
@@ -158,24 +158,27 @@ slh_hmsg_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *r, const uint8_t *pk_seed,
     int sz = EVP_MD_get_size(hctx->key->md_big);
     size_t seed_len = (size_t)sz + 2 * n;
 
+    if (sz <= 0)
+        return 0;
+
     memcpy(seed, r, n);
     memcpy(seed + n, pk_seed, n);
     return digest_4(hctx->md_big_ctx, r, n, pk_seed, n, pk_root, n, msg, msg_len,
-                    seed + 2 * n)
+               seed + 2 * n)
         && (PKCS1_MGF1(out, m, seed, seed_len, hctx->key->md_big) == 0);
 }
 
 static int
 slh_prf_msg_sha2(SLH_DSA_HASH_CTX *hctx,
-                 const uint8_t *sk_prf, const uint8_t *opt_rand,
-                 const uint8_t *msg, size_t msg_len, WPACKET *pkt)
+    const uint8_t *sk_prf, const uint8_t *opt_rand,
+    const uint8_t *msg, size_t msg_len, WPACKET *pkt)
 {
     int ret;
     const SLH_DSA_KEY *key = hctx->key;
     EVP_MAC_CTX *mctx = hctx->hmac_ctx;
     const SLH_DSA_PARAMS *prms = key->params;
     size_t n = prms->n;
-    uint8_t mac[MAX_DIGEST_SIZE] = {0};
+    uint8_t mac[MAX_DIGEST_SIZE] = { 0 };
     OSSL_PARAM *p = NULL;
     OSSL_PARAM params[3];
 
@@ -188,10 +191,10 @@ slh_prf_msg_sha2(SLH_DSA_HASH_CTX *hctx,
         p = params;
         /* The underlying digest to be used */
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
-                                                (char *)EVP_MD_get0_name(key->md_big), 0);
+            (char *)EVP_MD_get0_name(key->md_big), 0);
         if (key->propq != NULL)
             *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_PROPERTIES,
-                                                    (char *)key->propq, 0);
+                (char *)key->propq, 0);
         *p = OSSL_PARAM_construct_end();
         p = params;
         hctx->hmac_digest_used = 1;
@@ -207,14 +210,14 @@ slh_prf_msg_sha2(SLH_DSA_HASH_CTX *hctx,
 
 static ossl_inline int
 do_hash(EVP_MD_CTX *ctx, size_t n, const uint8_t *pk_seed, const uint8_t *adrs,
-        const uint8_t *m, size_t m_len, size_t b, uint8_t *out, size_t out_len)
+    const uint8_t *m, size_t m_len, size_t b, uint8_t *out, size_t out_len)
 {
     int ret;
     uint8_t zeros[128] = { 0 };
     uint8_t digest[MAX_DIGEST_SIZE];
 
     ret = digest_4(ctx, pk_seed, n, zeros, b - n, adrs, SLH_ADRSC_SIZE,
-                   m, m_len, digest);
+        m, m_len, digest);
     /* Truncated returned value is n = 16 bytes */
     memcpy(out, digest, n);
     return ret;
@@ -222,26 +225,26 @@ do_hash(EVP_MD_CTX *ctx, size_t n, const uint8_t *pk_seed, const uint8_t *adrs,
 
 static int
 slh_prf_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *pk_seed,
-             const uint8_t *sk_seed, const uint8_t *adrs,
-             uint8_t *out, size_t out_len)
+    const uint8_t *sk_seed, const uint8_t *adrs,
+    uint8_t *out, size_t out_len)
 {
     size_t n = hctx->key->params->n;
 
     return do_hash(hctx->md_ctx, n, pk_seed, adrs, sk_seed, n,
-                   OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1, out, out_len);
+        OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1, out, out_len);
 }
 
 static int
 slh_f_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *pk_seed, const uint8_t *adrs,
-           const uint8_t *m1, size_t m1_len, uint8_t *out, size_t out_len)
+    const uint8_t *m1, size_t m1_len, uint8_t *out, size_t out_len)
 {
     return do_hash(hctx->md_ctx, hctx->key->params->n, pk_seed, adrs, m1, m1_len,
-                   OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1, out, out_len);
+        OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1, out, out_len);
 }
 
 static int
 slh_h_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *pk_seed, const uint8_t *adrs,
-           const uint8_t *m1, const uint8_t *m2, uint8_t *out, size_t out_len)
+    const uint8_t *m1, const uint8_t *m2, uint8_t *out, size_t out_len)
 {
     uint8_t m[SLH_MAX_N * 2];
     const SLH_DSA_PARAMS *prms = hctx->key->params;
@@ -250,38 +253,34 @@ slh_h_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *pk_seed, const uint8_t *adrs,
     memcpy(m, m1, n);
     memcpy(m + n, m2, n);
     return do_hash(hctx->md_big_ctx, n, pk_seed, adrs, m, 2 * n,
-                   prms->sha2_h_and_t_bound, out, out_len);
+        prms->sha2_h_and_t_bound, out, out_len);
 }
 
 static int
 slh_t_sha2(SLH_DSA_HASH_CTX *hctx, const uint8_t *pk_seed, const uint8_t *adrs,
-           const uint8_t *ml, size_t ml_len, uint8_t *out, size_t out_len)
+    const uint8_t *ml, size_t ml_len, uint8_t *out, size_t out_len)
 {
     const SLH_DSA_PARAMS *prms = hctx->key->params;
 
     return do_hash(hctx->md_big_ctx, prms->n, pk_seed, adrs, ml, ml_len,
-                   prms->sha2_h_and_t_bound, out, out_len);
+        prms->sha2_h_and_t_bound, out, out_len);
 }
 
 const SLH_HASH_FUNC *ossl_slh_get_hash_fn(int is_shake)
 {
     static const SLH_HASH_FUNC methods[] = {
-        {
-            slh_hmsg_shake,
+        { slh_hmsg_shake,
             slh_prf_shake,
             slh_prf_msg_shake,
             slh_f_shake,
             slh_h_shake,
-            slh_t_shake
-        },
-        {
-            slh_hmsg_sha2,
+            slh_t_shake },
+        { slh_hmsg_sha2,
             slh_prf_sha2,
             slh_prf_msg_sha2,
             slh_f_sha2,
             slh_h_sha2,
-            slh_t_sha2
-        }
+            slh_t_sha2 }
     };
     return &methods[is_shake ? 0 : 1];
 }
diff --git a/crypto/slh_dsa/slh_hash.h b/crypto/slh_dsa/slh_hash.h
index 3033b657ab9ed..51e542139f8c1 100644
--- a/crypto/slh_dsa/slh_hash.h
+++ b/crypto/slh_dsa/slh_hash.h
@@ -8,49 +8,49 @@
  */
 
 #ifndef OSSL_CRYPTO_SLH_HASH_H
-# define OSSL_CRYPTO_SLH_HASH_H
-# pragma once
+#define OSSL_CRYPTO_SLH_HASH_H
+#pragma once
 
-# include <openssl/e_os2.h>
-# include "slh_adrs.h"
-# include "internal/packet.h"
+#include <openssl/e_os2.h>
+#include "slh_adrs.h"
+#include "internal/packet.h"
 
-# define SLH_HASH_FUNC_DECLARE(ctx, hashf)            \
-    const SLH_HASH_FUNC *hashf = ctx->hash_func       \
+#define SLH_HASH_FUNC_DECLARE(ctx, hashf) \
+    const SLH_HASH_FUNC *hashf = ctx->hash_func
 
-# define SLH_HASH_FN_DECLARE(hashf, t) OSSL_SLH_HASHFUNC_##t * t = hashf->t
+#define SLH_HASH_FN_DECLARE(hashf, t) OSSL_SLH_HASHFUNC_##t *t = hashf->t
 
 /*
  * @params out is |m| bytes which ranges from (30..49) bytes
  */
-typedef int (OSSL_SLH_HASHFUNC_H_MSG)(SLH_DSA_HASH_CTX *ctx, const uint8_t *r,
-                                      const uint8_t *pk_seed, const uint8_t *pk_root,
-                                      const uint8_t *msg, size_t msg_len,
-                                      uint8_t *out, size_t out_len);
+typedef int(OSSL_SLH_HASHFUNC_H_MSG)(SLH_DSA_HASH_CTX *ctx, const uint8_t *r,
+    const uint8_t *pk_seed, const uint8_t *pk_root,
+    const uint8_t *msg, size_t msg_len,
+    uint8_t *out, size_t out_len);
 
-typedef int (OSSL_SLH_HASHFUNC_PRF)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
-                                    const uint8_t *sk_seed, const uint8_t *adrs,
-                                    uint8_t *out, size_t out_len);
+typedef int(OSSL_SLH_HASHFUNC_PRF)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
+    const uint8_t *sk_seed, const uint8_t *adrs,
+    uint8_t *out, size_t out_len);
 
-typedef int (OSSL_SLH_HASHFUNC_PRF_MSG)(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_prf,
-                                        const uint8_t *opt_rand,
-                                        const uint8_t *msg, size_t msg_len,
-                                        WPACKET *pkt);
+typedef int(OSSL_SLH_HASHFUNC_PRF_MSG)(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_prf,
+    const uint8_t *opt_rand,
+    const uint8_t *msg, size_t msg_len,
+    WPACKET *pkt);
 
-typedef int (OSSL_SLH_HASHFUNC_F)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
-                                  const uint8_t *adrs,
-                                  const uint8_t *m1, size_t m1_len,
-                                  uint8_t *out, size_t out_len);
+typedef int(OSSL_SLH_HASHFUNC_F)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
+    const uint8_t *adrs,
+    const uint8_t *m1, size_t m1_len,
+    uint8_t *out, size_t out_len);
 
-typedef int (OSSL_SLH_HASHFUNC_H)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
-                                  const uint8_t *adrs,
-                                  const uint8_t *m1, const uint8_t *m2,
-                                  uint8_t *out, size_t out_len);
+typedef int(OSSL_SLH_HASHFUNC_H)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
+    const uint8_t *adrs,
+    const uint8_t *m1, const uint8_t *m2,
+    uint8_t *out, size_t out_len);
 
-typedef int (OSSL_SLH_HASHFUNC_T)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
-                                  const uint8_t *adrs,
-                                  const uint8_t *m1, size_t m1_len,
-                                  uint8_t *out, size_t out_len);
+typedef int(OSSL_SLH_HASHFUNC_T)(SLH_DSA_HASH_CTX *ctx, const uint8_t *pk_seed,
+    const uint8_t *adrs,
+    const uint8_t *m1, size_t m1_len,
+    uint8_t *out, size_t out_len);
 
 typedef struct slh_hash_func_st {
     OSSL_SLH_HASHFUNC_H_MSG *H_MSG;
diff --git a/crypto/slh_dsa/slh_hypertree.c b/crypto/slh_dsa/slh_hypertree.c
index e9debef6ffcc9..bc352bf5bc3a2 100644
--- a/crypto/slh_dsa/slh_hypertree.c
+++ b/crypto/slh_dsa/slh_hypertree.c
@@ -29,9 +29,9 @@
  * @returns 1 on success, or 0 on error.
  */
 int ossl_slh_ht_sign(SLH_DSA_HASH_CTX *ctx,
-                     const uint8_t *msg, const uint8_t *sk_seed,
-                     const uint8_t *pk_seed,
-                     uint64_t tree_id, uint32_t leaf_id, WPACKET *sig_wpkt)
+    const uint8_t *msg, const uint8_t *sk_seed,
+    const uint8_t *pk_seed,
+    uint64_t tree_id, uint32_t leaf_id, WPACKET *sig_wpkt)
 {
     const SLH_DSA_KEY *key = ctx->key;
     SLH_ADRS_FUNC_DECLARE(key, adrsf);
@@ -69,7 +69,7 @@ int ossl_slh_ht_sign(SLH_DSA_HASH_CTX *ctx,
         adrsf->set_tree_address(adrs, tree_id);
         psig = WPACKET_get_curr(sig_wpkt);
         if (!ossl_slh_xmss_sign(ctx, root, sk_seed, leaf_id, pk_seed, adrs,
-                                sig_wpkt))
+                sig_wpkt))
             return 0;
         /*
          * On the last loop it skips getting the public key since it is not needed
@@ -78,10 +78,10 @@ int ossl_slh_ht_sign(SLH_DSA_HASH_CTX *ctx,
          */
         if (layer < d - 1) {
             if (!PACKET_buf_init(xmss_sig_rpkt, psig,
-                                 WPACKET_get_curr(sig_wpkt) - psig))
+                    WPACKET_get_curr(sig_wpkt) - psig))
                 return 0;
             if (!ossl_slh_xmss_pk_from_sig(ctx, leaf_id, xmss_sig_rpkt, root,
-                                           pk_seed, adrs, root, sizeof(root)))
+                    pk_seed, adrs, root, sizeof(root)))
                 return 0;
             leaf_id = tree_id & mask;
             tree_id >>= hm;
@@ -105,8 +105,8 @@ int ossl_slh_ht_sign(SLH_DSA_HASH_CTX *ctx,
  * @returns 1 if the computed XMSS public key matches pk_root, or 0 otherwise.
  */
 int ossl_slh_ht_verify(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg, PACKET *sig_pkt,
-                       const uint8_t *pk_seed, uint64_t tree_id, uint32_t leaf_id,
-                       const uint8_t *pk_root)
+    const uint8_t *pk_seed, uint64_t tree_id, uint32_t leaf_id,
+    const uint8_t *pk_root)
 {
     const SLH_DSA_KEY *key = ctx->key;
     SLH_ADRS_FUNC_DECLARE(key, adrsf);
@@ -126,7 +126,7 @@ int ossl_slh_ht_verify(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg, PACKET *sig_pk
         adrsf->set_layer_address(adrs, layer);
         adrsf->set_tree_address(adrs, tree_id);
         if (!ossl_slh_xmss_pk_from_sig(ctx, leaf_id, sig_pkt, node,
-                                       pk_seed, adrs, node, sizeof(node)))
+                pk_seed, adrs, node, sizeof(node)))
             return 0;
         leaf_id = tree_id & mask;
         tree_id >>= tree_height;
diff --git a/crypto/slh_dsa/slh_params.c b/crypto/slh_dsa/slh_params.c
index 7e6011116a9ec..42c70cfaeb29b 100644
--- a/crypto/slh_dsa/slh_params.c
+++ b/crypto/slh_dsa/slh_params.c
@@ -81,33 +81,32 @@
 #define OSSL_SLH_DSA_256F_PUB_BYTES 64
 #define OSSL_SLH_DSA_256F_SIG_BYTES 49856
 
-#define OSSL_SLH_PARAMS(name)                   \
-    OSSL_SLH_DSA_##name##_N,                    \
-    OSSL_SLH_DSA_##name##_H,                    \
-    OSSL_SLH_DSA_##name##_D,                    \
-    OSSL_SLH_DSA_##name##_H_DASH,               \
-    OSSL_SLH_DSA_##name##_A,                    \
-    OSSL_SLH_DSA_##name##_K,                    \
-    OSSL_SLH_DSA_##name##_M,                    \
-    OSSL_SLH_DSA_##name##_SECURITY_CATEGORY,    \
-    OSSL_SLH_DSA_##name##_PUB_BYTES,            \
-    OSSL_SLH_DSA_##name##_SIG_BYTES             \
-
+#define OSSL_SLH_PARAMS(name)                    \
+    OSSL_SLH_DSA_##name##_N,                     \
+        OSSL_SLH_DSA_##name##_H,                 \
+        OSSL_SLH_DSA_##name##_D,                 \
+        OSSL_SLH_DSA_##name##_H_DASH,            \
+        OSSL_SLH_DSA_##name##_A,                 \
+        OSSL_SLH_DSA_##name##_K,                 \
+        OSSL_SLH_DSA_##name##_M,                 \
+        OSSL_SLH_DSA_##name##_SECURITY_CATEGORY, \
+        OSSL_SLH_DSA_##name##_PUB_BYTES,         \
+        OSSL_SLH_DSA_##name##_SIG_BYTES
 
 static const SLH_DSA_PARAMS slh_dsa_params[] = {
-    {"SLH-DSA-SHA2-128s",  NID_SLH_DSA_SHA2_128s,  0, OSSL_SLH_PARAMS(128S), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1},
-    {"SLH-DSA-SHAKE-128s", NID_SLH_DSA_SHAKE_128s, 1, OSSL_SLH_PARAMS(128S)},
-    {"SLH-DSA-SHA2-128f",  NID_SLH_DSA_SHA2_128f,  0, OSSL_SLH_PARAMS(128F), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1},
-    {"SLH-DSA-SHAKE-128f", NID_SLH_DSA_SHAKE_128f, 1, OSSL_SLH_PARAMS(128F)},
-    {"SLH-DSA-SHA2-192s",  NID_SLH_DSA_SHA2_192s,  0, OSSL_SLH_PARAMS(192S), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2},
-    {"SLH-DSA-SHAKE-192s", NID_SLH_DSA_SHAKE_192s, 1, OSSL_SLH_PARAMS(192S)},
-    {"SLH-DSA-SHA2-192f",  NID_SLH_DSA_SHA2_192f,  0, OSSL_SLH_PARAMS(192F), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2},
-    {"SLH-DSA-SHAKE-192f", NID_SLH_DSA_SHAKE_192f, 1, OSSL_SLH_PARAMS(192F)},
-    {"SLH-DSA-SHA2-256s",  NID_SLH_DSA_SHA2_256s,  0, OSSL_SLH_PARAMS(256S), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2},
-    {"SLH-DSA-SHAKE-256s", NID_SLH_DSA_SHAKE_256s, 1, OSSL_SLH_PARAMS(256S)},
-    {"SLH-DSA-SHA2-256f",  NID_SLH_DSA_SHA2_256f,  0, OSSL_SLH_PARAMS(256F), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2},
-    {"SLH-DSA-SHAKE-256f", NID_SLH_DSA_SHAKE_256f, 1, OSSL_SLH_PARAMS(256F)},
-    {NULL},
+    { "SLH-DSA-SHA2-128s", NID_SLH_DSA_SHA2_128s, 0, OSSL_SLH_PARAMS(128S), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1 },
+    { "SLH-DSA-SHAKE-128s", NID_SLH_DSA_SHAKE_128s, 1, OSSL_SLH_PARAMS(128S) },
+    { "SLH-DSA-SHA2-128f", NID_SLH_DSA_SHA2_128f, 0, OSSL_SLH_PARAMS(128F), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND1 },
+    { "SLH-DSA-SHAKE-128f", NID_SLH_DSA_SHAKE_128f, 1, OSSL_SLH_PARAMS(128F) },
+    { "SLH-DSA-SHA2-192s", NID_SLH_DSA_SHA2_192s, 0, OSSL_SLH_PARAMS(192S), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2 },
+    { "SLH-DSA-SHAKE-192s", NID_SLH_DSA_SHAKE_192s, 1, OSSL_SLH_PARAMS(192S) },
+    { "SLH-DSA-SHA2-192f", NID_SLH_DSA_SHA2_192f, 0, OSSL_SLH_PARAMS(192F), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2 },
+    { "SLH-DSA-SHAKE-192f", NID_SLH_DSA_SHAKE_192f, 1, OSSL_SLH_PARAMS(192F) },
+    { "SLH-DSA-SHA2-256s", NID_SLH_DSA_SHA2_256s, 0, OSSL_SLH_PARAMS(256S), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2 },
+    { "SLH-DSA-SHAKE-256s", NID_SLH_DSA_SHAKE_256s, 1, OSSL_SLH_PARAMS(256S) },
+    { "SLH-DSA-SHA2-256f", NID_SLH_DSA_SHA2_256f, 0, OSSL_SLH_PARAMS(256F), OSSL_SLH_DSA_SHA2_NUM_ZEROS_H_AND_T_BOUND2 },
+    { "SLH-DSA-SHAKE-256f", NID_SLH_DSA_SHAKE_256f, 1, OSSL_SLH_PARAMS(256F) },
+    { NULL },
 };
 
 /**
diff --git a/crypto/slh_dsa/slh_params.h b/crypto/slh_dsa/slh_params.h
index 6a006d445abac..fea14d5d6a8cc 100644
--- a/crypto/slh_dsa/slh_params.h
+++ b/crypto/slh_dsa/slh_params.h
@@ -23,13 +23,13 @@ typedef struct slh_dsa_params_st {
     const char *alg;
     int type;
     int is_shake;
-    uint32_t n;  /* Security parameter (Hash output size in bytes) (16, 24, 32) */
-    uint32_t h;  /* The total height of the tree (63, 64, 66, 68). #keypairs = 2^h */
-    uint32_t d;  /* The number of tree layers (7, 8, 17, 22) */
+    uint32_t n; /* Security parameter (Hash output size in bytes) (16, 24, 32) */
+    uint32_t h; /* The total height of the tree (63, 64, 66, 68). #keypairs = 2^h */
+    uint32_t d; /* The number of tree layers (7, 8, 17, 22) */
     uint32_t hm; /* The height (h') of each merkle tree. (h = hm * d ) */
-    uint32_t a;  /* Height of a FORS tree */
-    uint32_t k;  /* The number of FORS trees */
-    uint32_t m;  /* The size of H_MSG() output */
+    uint32_t a; /* Height of a FORS tree */
+    uint32_t k; /* The number of FORS trees */
+    uint32_t m; /* The size of H_MSG() output */
     uint32_t security_category;
     uint32_t pk_len;
     uint32_t sig_len;
diff --git a/crypto/slh_dsa/slh_wots.c b/crypto/slh_dsa/slh_wots.c
index 2776cc07c419a..ea278fcd84121 100644
--- a/crypto/slh_dsa/slh_wots.c
+++ b/crypto/slh_dsa/slh_wots.c
@@ -31,7 +31,7 @@
  * @param out The returned array of nibbles, with a size of 2*|in_len|
  */
 static ossl_inline void slh_bytes_to_nibbles(const uint8_t *in, size_t in_len,
-                                             uint8_t *out)
+    uint8_t *out)
 {
     size_t consumed = 0;
 
@@ -49,7 +49,7 @@ static ossl_inline void slh_bytes_to_nibbles(const uint8_t *in, size_t in_len,
  * which does a complicated base2^b(tobyte()) operation.
  */
 static ossl_inline void compute_checksum_nibbles(const uint8_t *in, size_t in_len,
-                                                 uint8_t *out)
+    uint8_t *out)
 {
     size_t i;
     uint16_t csum = 0;
@@ -90,8 +90,8 @@ static ossl_inline void compute_checksum_nibbles(const uint8_t *in, size_t in_le
  * @returns 1 on success, or 0 on error.
  */
 static int slh_wots_chain(SLH_DSA_HASH_CTX *ctx, const uint8_t *in,
-                          uint8_t start_index, uint8_t steps,
-                          const uint8_t *pk_seed, uint8_t *adrs, WPACKET *wpkt)
+    uint8_t start_index, uint8_t steps,
+    const uint8_t *pk_seed, uint8_t *adrs, WPACKET *wpkt)
 {
     const SLH_DSA_KEY *key = ctx->key;
     SLH_HASH_FUNC_DECLARE(key, hashf);
@@ -136,8 +136,8 @@ static int slh_wots_chain(SLH_DSA_HASH_CTX *ctx, const uint8_t *in,
  * @returns 1 on success, or 0 on error.
  */
 int ossl_slh_wots_pk_gen(SLH_DSA_HASH_CTX *ctx,
-                         const uint8_t *sk_seed, const uint8_t *pk_seed,
-                         uint8_t *adrs, uint8_t *pk_out, size_t pk_out_len)
+    const uint8_t *sk_seed, const uint8_t *pk_seed,
+    uint8_t *adrs, uint8_t *pk_out, size_t pk_out_len)
 {
     int ret = 0;
     const SLH_DSA_KEY *key = ctx->key;
@@ -201,8 +201,8 @@ int ossl_slh_wots_pk_gen(SLH_DSA_HASH_CTX *ctx,
  * @returns 1 on success, or 0 on error.
  */
 int ossl_slh_wots_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
-                       const uint8_t *sk_seed, const uint8_t *pk_seed,
-                       uint8_t *adrs, WPACKET *sig_wpkt)
+    const uint8_t *sk_seed, const uint8_t *pk_seed,
+    uint8_t *adrs, WPACKET *sig_wpkt)
 {
     int ret = 0;
     const SLH_DSA_KEY *key = ctx->key;
@@ -211,7 +211,7 @@ int ossl_slh_wots_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
     size_t i;
     size_t n = key->params->n;
     size_t len1 = SLH_WOTS_LEN1(n); /* 2 * n = the msg length in nibbles */
-    size_t len = len1 + SLH_WOTS_LEN2;  /* 2 * n + 3 (3 checksum nibbles) */
+    size_t len = len1 + SLH_WOTS_LEN2; /* 2 * n + 3 (3 checksum nibbles) */
 
     SLH_ADRS_DECLARE(sk_adrs);
     SLH_HASH_FUNC_DECLARE(key, hashf);
@@ -239,7 +239,7 @@ int ossl_slh_wots_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
         set_chain_address(adrs, i);
         /* compute chain i signature */
         if (!slh_wots_chain(ctx, sk, 0, msg_and_csum_nibbles[i],
-                            pk_seed, adrs, sig_wpkt))
+                pk_seed, adrs, sig_wpkt))
             goto err;
     }
     ret = 1;
@@ -264,9 +264,9 @@ int ossl_slh_wots_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
  * @returns 1 on success, or 0 on error.
  */
 int ossl_slh_wots_pk_from_sig(SLH_DSA_HASH_CTX *ctx,
-                              PACKET *sig_rpkt, const uint8_t *msg,
-                              const uint8_t *pk_seed, uint8_t *adrs,
-                              uint8_t *pk_out, size_t pk_out_len)
+    PACKET *sig_rpkt, const uint8_t *msg,
+    const uint8_t *pk_seed, uint8_t *adrs,
+    uint8_t *pk_out, size_t pk_out_len)
 {
     int ret = 0;
     const SLH_DSA_KEY *key = ctx->key;
@@ -275,7 +275,7 @@ int ossl_slh_wots_pk_from_sig(SLH_DSA_HASH_CTX *ctx,
     size_t n = key->params->n;
     size_t len1 = SLH_WOTS_LEN1(n);
     size_t len = len1 + SLH_WOTS_LEN2; /* 2n + 3 */
-    const uint8_t *sig_i;  /* Pointer into |sig_rpkt| buffer */
+    const uint8_t *sig_i; /* Pointer into |sig_rpkt| buffer */
     uint8_t tmp[SLH_WOTS_LEN_MAX * SLH_MAX_N];
     WPACKET pkt, *tmp_pkt = &pkt;
     size_t tmp_len = 0;
@@ -295,9 +295,9 @@ int ossl_slh_wots_pk_from_sig(SLH_DSA_HASH_CTX *ctx,
     for (i = 0; i < len; ++i) {
         set_chain_address(adrs, i);
         if (!PACKET_get_bytes(sig_rpkt, &sig_i, n)
-                || !slh_wots_chain(ctx, sig_i, msg_and_csum_nibbles[i],
-                                   NIBBLE_MASK - msg_and_csum_nibbles[i],
-                                   pk_seed, adrs, tmp_pkt))
+            || !slh_wots_chain(ctx, sig_i, msg_and_csum_nibbles[i],
+                NIBBLE_MASK - msg_and_csum_nibbles[i],
+                pk_seed, adrs, tmp_pkt))
             goto err;
     }
     /* compress the computed public key value */
@@ -307,8 +307,8 @@ int ossl_slh_wots_pk_from_sig(SLH_DSA_HASH_CTX *ctx,
     if (!WPACKET_get_total_written(tmp_pkt, &tmp_len))
         goto err;
     ret = hashf->T(ctx, pk_seed, wots_pk_adrs, tmp, tmp_len,
-                   pk_out, pk_out_len);
- err:
+        pk_out, pk_out_len);
+err:
     if (!WPACKET_finish(tmp_pkt))
         ret = 0;
     return ret;
diff --git a/crypto/slh_dsa/slh_xmss.c b/crypto/slh_dsa/slh_xmss.c
index c78a1571c6424..dae036c6a2189 100644
--- a/crypto/slh_dsa/slh_xmss.c
+++ b/crypto/slh_dsa/slh_xmss.c
@@ -33,9 +33,9 @@
  * @returns 1 on success, or 0 on error.
  */
 int ossl_slh_xmss_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
-                       uint32_t node_id, uint32_t h,
-                       const uint8_t *pk_seed, uint8_t *adrs,
-                       uint8_t *pk_out, size_t pk_out_len)
+    uint32_t node_id, uint32_t h,
+    const uint8_t *pk_seed, uint8_t *adrs,
+    uint8_t *pk_out, size_t pk_out_len)
 {
     const SLH_DSA_KEY *key = ctx->key;
     SLH_ADRS_FUNC_DECLARE(key, adrsf);
@@ -45,15 +45,15 @@ int ossl_slh_xmss_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
         adrsf->set_type_and_clear(adrs, SLH_ADRS_TYPE_WOTS_HASH);
         adrsf->set_keypair_address(adrs, node_id);
         if (!ossl_slh_wots_pk_gen(ctx, sk_seed, pk_seed, adrs,
-                                  pk_out, pk_out_len))
+                pk_out, pk_out_len))
             return 0;
     } else {
         uint8_t lnode[SLH_MAX_N], rnode[SLH_MAX_N];
 
         if (!ossl_slh_xmss_node(ctx, sk_seed, 2 * node_id, h - 1, pk_seed, adrs,
-                                lnode, sizeof(lnode))
-                || !ossl_slh_xmss_node(ctx, sk_seed, 2 * node_id + 1, h - 1,
-                                       pk_seed, adrs, rnode, sizeof(rnode)))
+                lnode, sizeof(lnode))
+            || !ossl_slh_xmss_node(ctx, sk_seed, 2 * node_id + 1, h - 1,
+                pk_seed, adrs, rnode, sizeof(rnode)))
             return 0;
         adrsf->set_type_and_clear(adrs, SLH_ADRS_TYPE_TREE);
         adrsf->set_tree_height(adrs, h);
@@ -83,8 +83,8 @@ int ossl_slh_xmss_node(SLH_DSA_HASH_CTX *ctx, const uint8_t *sk_seed,
  * @returns 1 on success, or 0 on error.
  */
 int ossl_slh_xmss_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
-                       const uint8_t *sk_seed, uint32_t node_id,
-                       const uint8_t *pk_seed, uint8_t *adrs, WPACKET *sig_wpkt)
+    const uint8_t *sk_seed, uint32_t node_id,
+    const uint8_t *pk_seed, uint8_t *adrs, WPACKET *sig_wpkt)
 {
     const SLH_DSA_KEY *key = ctx->key;
     SLH_ADRS_FUNC_DECLARE(key, adrsf);
@@ -108,8 +108,8 @@ int ossl_slh_xmss_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
     adrsf->copy(adrs, tmp_adrs);
     for (h = 0; h < hm; ++h) {
         if (!WPACKET_allocate_bytes(sig_wpkt, auth_path_len, &auth_path)
-                || !ossl_slh_xmss_node(ctx, sk_seed, id ^ 1, h, pk_seed, adrs,
-                                       auth_path, auth_path_len))
+            || !ossl_slh_xmss_node(ctx, sk_seed, id ^ 1, h, pk_seed, adrs,
+                auth_path, auth_path_len))
             return 0;
         id >>= 1;
     }
@@ -137,9 +137,9 @@ int ossl_slh_xmss_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *msg,
  * @returns 1 on success, or 0 on error.
  */
 int ossl_slh_xmss_pk_from_sig(SLH_DSA_HASH_CTX *ctx, uint32_t node_id,
-                              PACKET *sig_rpkt, const uint8_t *msg,
-                              const uint8_t *pk_seed, uint8_t *adrs,
-                              uint8_t *pk_out, size_t pk_out_len)
+    PACKET *sig_rpkt, const uint8_t *msg,
+    const uint8_t *pk_seed, uint8_t *adrs,
+    uint8_t *pk_out, size_t pk_out_len)
 {
     const SLH_DSA_KEY *key = ctx->key;
     SLH_HASH_FUNC_DECLARE(key, hashf);
@@ -156,7 +156,7 @@ int ossl_slh_xmss_pk_from_sig(SLH_DSA_HASH_CTX *ctx, uint32_t node_id,
     adrsf->set_type_and_clear(adrs, SLH_ADRS_TYPE_WOTS_HASH);
     adrsf->set_keypair_address(adrs, node_id);
     if (!ossl_slh_wots_pk_from_sig(ctx, sig_rpkt, msg, pk_seed, adrs,
-                                   node, pk_out_len))
+            node, pk_out_len))
         return 0;
 
     adrsf->set_type_and_clear(adrs, SLH_ADRS_TYPE_TREE);
diff --git a/crypto/sm2/sm2_crypt.c b/crypto/sm2/sm2_crypt.c
index 0e5017cff608d..b1c2ef6b630af 100644
--- a/crypto/sm2/sm2_crypt.c
+++ b/crypto/sm2/sm2_crypt.c
@@ -67,7 +67,7 @@ static int is_all_zeros(const unsigned char *msg, size_t msglen)
 }
 
 int ossl_sm2_plaintext_size(const unsigned char *ct, size_t ct_size,
-                            size_t *pt_size)
+    size_t *pt_size)
 {
     struct SM2_Ciphertext_st *sm2_ctext = NULL;
 
@@ -85,7 +85,7 @@ int ossl_sm2_plaintext_size(const unsigned char *ct, size_t ct_size,
 }
 
 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)
 {
     const size_t field_size = ec_field_size(EC_KEY_get0_group(key));
     const int md_size = EVP_MD_get_size(digest);
@@ -96,8 +96,8 @@ int ossl_sm2_ciphertext_size(const EC_KEY *key, const EVP_MD *digest,
 
     /* Integer and string are simple type; set constructed = 0, means primitive and definite length encoding. */
     sz = 2 * ASN1_object_size(0, field_size + 1, V_ASN1_INTEGER)
-         + ASN1_object_size(0, md_size, V_ASN1_OCTET_STRING)
-         + ASN1_object_size(0, msg_len, V_ASN1_OCTET_STRING);
+        + ASN1_object_size(0, md_size, V_ASN1_OCTET_STRING)
+        + ASN1_object_size(0, msg_len, V_ASN1_OCTET_STRING);
     /* Sequence is structured type; set constructed = 1, means constructed and definite length encoding. */
     *ct_size = ASN1_object_size(1, sz, V_ASN1_SEQUENCE);
 
@@ -105,9 +105,9 @@ int ossl_sm2_ciphertext_size(const EC_KEY *key, const EVP_MD *digest,
 }
 
 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 rc = 0, ciphertext_leni;
     size_t i;
@@ -182,7 +182,7 @@ int ossl_sm2_encrypt(const EC_KEY *key,
 
     msg_mask = OPENSSL_zalloc(msg_len);
     if (msg_mask == NULL)
-       goto done;
+        goto done;
 
 again:
     if (!BN_priv_rand_range_ex(k, order, 0, ctx)) {
@@ -191,22 +191,22 @@ int ossl_sm2_encrypt(const EC_KEY *key,
     }
 
     if (!EC_POINT_mul(group, kG, k, NULL, NULL, ctx)
-            || !EC_POINT_get_affine_coordinates(group, kG, x1, y1, ctx)
-            || !EC_POINT_mul(group, kP, NULL, P, k, ctx)
-            || !EC_POINT_get_affine_coordinates(group, kP, x2, y2, ctx)) {
+        || !EC_POINT_get_affine_coordinates(group, kG, x1, y1, ctx)
+        || !EC_POINT_mul(group, kP, NULL, P, k, ctx)
+        || !EC_POINT_get_affine_coordinates(group, kP, x2, y2, ctx)) {
         ERR_raise(ERR_LIB_SM2, ERR_R_EC_LIB);
         goto done;
     }
 
     if (BN_bn2binpad(x2, x2y2, field_size) < 0
-            || BN_bn2binpad(y2, x2y2 + field_size, field_size) < 0) {
+        || BN_bn2binpad(y2, x2y2 + field_size, field_size) < 0) {
         ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
         goto done;
     }
 
     /* X9.63 with no salt happens to match the KDF used in SM2 */
     if (!ossl_ecdh_kdf_X9_63(msg_mask, msg_len, x2y2, 2 * field_size, NULL, 0,
-                             digest, libctx, propq)) {
+            digest, libctx, propq)) {
         ERR_raise(ERR_LIB_SM2, ERR_R_EVP_LIB);
         goto done;
     }
@@ -225,10 +225,10 @@ int ossl_sm2_encrypt(const EC_KEY *key,
         goto done;
     }
     if (EVP_DigestInit(hash, fetched_digest) == 0
-            || EVP_DigestUpdate(hash, x2y2, field_size) == 0
-            || EVP_DigestUpdate(hash, msg, msg_len) == 0
-            || EVP_DigestUpdate(hash, x2y2 + field_size, field_size) == 0
-            || EVP_DigestFinal(hash, C3, NULL) == 0) {
+        || EVP_DigestUpdate(hash, x2y2, field_size) == 0
+        || EVP_DigestUpdate(hash, msg, msg_len) == 0
+        || EVP_DigestUpdate(hash, x2y2 + field_size, field_size) == 0
+        || EVP_DigestFinal(hash, C3, NULL) == 0) {
         ERR_raise(ERR_LIB_SM2, ERR_R_EVP_LIB);
         goto done;
     }
@@ -239,11 +239,11 @@ int ossl_sm2_encrypt(const EC_KEY *key,
     ctext_struct.C2 = ASN1_OCTET_STRING_new();
 
     if (ctext_struct.C3 == NULL || ctext_struct.C2 == NULL) {
-       ERR_raise(ERR_LIB_SM2, ERR_R_ASN1_LIB);
-       goto done;
+        ERR_raise(ERR_LIB_SM2, ERR_R_ASN1_LIB);
+        goto done;
     }
     if (!ASN1_OCTET_STRING_set(ctext_struct.C3, C3, C3_size)
-            || !ASN1_OCTET_STRING_set(ctext_struct.C2, msg_mask, msg_len)) {
+        || !ASN1_OCTET_STRING_set(ctext_struct.C2, msg_mask, msg_len)) {
         ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
         goto done;
     }
@@ -258,7 +258,7 @@ int ossl_sm2_encrypt(const EC_KEY *key,
 
     rc = 1;
 
- done:
+done:
     EVP_MD_free(fetched_digest);
     ASN1_OCTET_STRING_free(ctext_struct.C2);
     ASN1_OCTET_STRING_free(ctext_struct.C3);
@@ -273,9 +273,9 @@ int ossl_sm2_encrypt(const EC_KEY *key,
 }
 
 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)
 {
     int rc = 0;
     int i;
@@ -298,7 +298,7 @@ int ossl_sm2_decrypt(const EC_KEY *key,
     const char *propq = ossl_ec_key_get0_propq(key);
 
     if (field_size == 0 || hash_size <= 0)
-       goto done;
+        goto done;
 
     memset(ptext_buf, 0xFF, *ptext_len);
 
@@ -351,18 +351,18 @@ int ossl_sm2_decrypt(const EC_KEY *key,
     }
 
     if (!EC_POINT_set_affine_coordinates(group, C1, sm2_ctext->C1x,
-                                         sm2_ctext->C1y, ctx)
-            || !EC_POINT_mul(group, C1, NULL, C1, EC_KEY_get0_private_key(key),
-                             ctx)
-            || !EC_POINT_get_affine_coordinates(group, C1, x2, y2, ctx)) {
+            sm2_ctext->C1y, ctx)
+        || !EC_POINT_mul(group, C1, NULL, C1, EC_KEY_get0_private_key(key),
+            ctx)
+        || !EC_POINT_get_affine_coordinates(group, C1, x2, y2, ctx)) {
         ERR_raise(ERR_LIB_SM2, ERR_R_EC_LIB);
         goto done;
     }
 
     if (BN_bn2binpad(x2, x2y2, field_size) < 0
-            || BN_bn2binpad(y2, x2y2 + field_size, field_size) < 0
-            || !ossl_ecdh_kdf_X9_63(msg_mask, msg_len, x2y2, 2 * field_size,
-                                    NULL, 0, digest, libctx, propq)) {
+        || BN_bn2binpad(y2, x2y2 + field_size, field_size) < 0
+        || !ossl_ecdh_kdf_X9_63(msg_mask, msg_len, x2y2, 2 * field_size,
+            NULL, 0, digest, libctx, propq)) {
         ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
         goto done;
     }
@@ -382,10 +382,10 @@ int ossl_sm2_decrypt(const EC_KEY *key,
     }
 
     if (!EVP_DigestInit(hash, digest)
-            || !EVP_DigestUpdate(hash, x2y2, field_size)
-            || !EVP_DigestUpdate(hash, ptext_buf, msg_len)
-            || !EVP_DigestUpdate(hash, x2y2 + field_size, field_size)
-            || !EVP_DigestFinal(hash, computed_C3, NULL)) {
+        || !EVP_DigestUpdate(hash, x2y2, field_size)
+        || !EVP_DigestUpdate(hash, ptext_buf, msg_len)
+        || !EVP_DigestUpdate(hash, x2y2 + field_size, field_size)
+        || !EVP_DigestFinal(hash, computed_C3, NULL)) {
         ERR_raise(ERR_LIB_SM2, ERR_R_EVP_LIB);
         goto done;
     }
@@ -398,7 +398,7 @@ int ossl_sm2_decrypt(const EC_KEY *key,
     rc = 1;
     *ptext_len = msg_len;
 
- done:
+done:
     if (rc == 0)
         memset(ptext_buf, 0, *ptext_len);
 
diff --git a/crypto/sm2/sm2_err.c b/crypto/sm2/sm2_err.c
index d420d4e597d19..2cb3de1c9ef16 100644
--- a/crypto/sm2/sm2_err.c
+++ b/crypto/sm2/sm2_err.c
@@ -13,36 +13,36 @@
 
 #ifndef OPENSSL_NO_SM2
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA SM2_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ASN1_ERROR), "asn1 error"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_BAD_SIGNATURE), "bad signature"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_BUFFER_TOO_SMALL), "buffer too small"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_DIST_ID_TOO_LARGE), "dist id too large"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ID_NOT_SET), "id not set"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ID_TOO_LARGE), "id too large"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_CURVE), "invalid curve"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_DIGEST), "invalid digest"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_DIGEST_TYPE),
-    "invalid digest type"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_ENCODING), "invalid encoding"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_FIELD), "invalid field"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_PRIVATE_KEY),
-    "invalid private key"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_NO_PARAMETERS_SET), "no parameters set"},
-    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_USER_ID_TOO_LARGE), "user id too large"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ASN1_ERROR), "asn1 error" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_BAD_SIGNATURE), "bad signature" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_BUFFER_TOO_SMALL), "buffer too small" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_DIST_ID_TOO_LARGE), "dist id too large" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ID_NOT_SET), "id not set" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ID_TOO_LARGE), "id too large" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_CURVE), "invalid curve" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_DIGEST), "invalid digest" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_DIGEST_TYPE),
+        "invalid digest type" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_ENCODING), "invalid encoding" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_FIELD), "invalid field" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_PRIVATE_KEY),
+        "invalid private key" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_NO_PARAMETERS_SET), "no parameters set" },
+    { ERR_PACK(ERR_LIB_SM2, 0, SM2_R_USER_ID_TOO_LARGE), "user id too large" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_SM2_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(SM2_str_reasons[0].error) == NULL)
         ERR_load_strings_const(SM2_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/sm2/sm2_key.c b/crypto/sm2/sm2_key.c
index e3a10d38e7d22..ce8e7087db81e 100644
--- a/crypto/sm2/sm2_key.c
+++ b/crypto/sm2/sm2_key.c
@@ -27,9 +27,9 @@ int ossl_sm2_key_private_check(const EC_KEY *eckey)
     const BIGNUM *priv_key = NULL, *order = NULL;
 
     if (eckey == NULL
-            || (group = EC_KEY_get0_group(eckey)) == NULL
-            || (priv_key = EC_KEY_get0_private_key(eckey)) == NULL
-            || (order = EC_GROUP_get0_order(group)) == NULL) {
+        || (group = EC_KEY_get0_group(eckey)) == NULL
+        || (priv_key = EC_KEY_get0_private_key(eckey)) == NULL
+        || (order = EC_GROUP_get0_order(group)) == NULL) {
         ERR_raise(ERR_LIB_SM2, ERR_R_PASSED_NULL_PARAMETER);
         return 0;
     }
@@ -45,7 +45,7 @@ int ossl_sm2_key_private_check(const EC_KEY *eckey)
     }
     ret = 1;
 
- end:
+end:
     BN_free(max);
     return ret;
 }
diff --git a/crypto/sm2/sm2_sign.c b/crypto/sm2/sm2_sign.c
index 28cf95cc48c9d..590a7309748f8 100644
--- a/crypto/sm2/sm2_sign.c
+++ b/crypto/sm2/sm2_sign.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2025 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2017 Ribose Inc. All Rights Reserved.
  * Ported from Ribose contributions from Botan.
  *
@@ -21,10 +21,10 @@
 #include <string.h>
 
 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)
 {
     int rc = 0;
     const EC_GROUP *group = EC_KEY_get0_group(key);
@@ -115,31 +115,31 @@ int ossl_sm2_compute_z_digest(uint8_t *out,
         goto done;
 
     if (BN_bn2binpad(a, buf, p_bytes) < 0
-            || !EVP_DigestUpdate(hash, buf, p_bytes)
-            || BN_bn2binpad(b, buf, p_bytes) < 0
-            || !EVP_DigestUpdate(hash, buf, p_bytes)
-            || !EC_POINT_get_affine_coordinates(group,
-                                                EC_GROUP_get0_generator(group),
-                                                xG, yG, ctx)
-            || BN_bn2binpad(xG, buf, p_bytes) < 0
-            || !EVP_DigestUpdate(hash, buf, p_bytes)
-            || BN_bn2binpad(yG, buf, p_bytes) < 0
-            || !EVP_DigestUpdate(hash, buf, p_bytes)
-            || !EC_POINT_get_affine_coordinates(group,
-                                                pubkey,
-                                                xA, yA, ctx)
-            || BN_bn2binpad(xA, buf, p_bytes) < 0
-            || !EVP_DigestUpdate(hash, buf, p_bytes)
-            || BN_bn2binpad(yA, buf, p_bytes) < 0
-            || !EVP_DigestUpdate(hash, buf, p_bytes)
-            || !EVP_DigestFinal(hash, out, NULL)) {
+        || !EVP_DigestUpdate(hash, buf, p_bytes)
+        || BN_bn2binpad(b, buf, p_bytes) < 0
+        || !EVP_DigestUpdate(hash, buf, p_bytes)
+        || !EC_POINT_get_affine_coordinates(group,
+            EC_GROUP_get0_generator(group),
+            xG, yG, ctx)
+        || BN_bn2binpad(xG, buf, p_bytes) < 0
+        || !EVP_DigestUpdate(hash, buf, p_bytes)
+        || BN_bn2binpad(yG, buf, p_bytes) < 0
+        || !EVP_DigestUpdate(hash, buf, p_bytes)
+        || !EC_POINT_get_affine_coordinates(group,
+            pubkey,
+            xA, yA, ctx)
+        || BN_bn2binpad(xA, buf, p_bytes) < 0
+        || !EVP_DigestUpdate(hash, buf, p_bytes)
+        || BN_bn2binpad(yA, buf, p_bytes) < 0
+        || !EVP_DigestUpdate(hash, buf, p_bytes)
+        || !EVP_DigestFinal(hash, out, NULL)) {
         ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
         goto done;
     }
 
     rc = 1;
 
- done:
+done:
     OPENSSL_free(buf);
     BN_CTX_free(ctx);
     EVP_MD_CTX_free(hash);
@@ -147,10 +147,10 @@ int ossl_sm2_compute_z_digest(uint8_t *out,
 }
 
 static BIGNUM *sm2_compute_msg_hash(const EVP_MD *digest,
-                                    const EC_KEY *key,
-                                    const uint8_t *id,
-                                    const size_t id_len,
-                                    const uint8_t *msg, size_t msg_len)
+    const EC_KEY *key,
+    const uint8_t *id,
+    const size_t id_len,
+    const uint8_t *msg, size_t msg_len)
 {
     EVP_MD_CTX *hash = EVP_MD_CTX_new();
     const int md_size = EVP_MD_get_size(digest);
@@ -185,10 +185,10 @@ static BIGNUM *sm2_compute_msg_hash(const EVP_MD *digest,
     }
 
     if (!EVP_DigestInit(hash, fetched_digest)
-            || !EVP_DigestUpdate(hash, z, md_size)
-            || !EVP_DigestUpdate(hash, msg, msg_len)
-               /* reuse z buffer to hold H(Z || M) */
-            || !EVP_DigestFinal(hash, z, NULL)) {
+        || !EVP_DigestUpdate(hash, z, md_size)
+        || !EVP_DigestUpdate(hash, msg, msg_len)
+        /* reuse z buffer to hold H(Z || M) */
+        || !EVP_DigestFinal(hash, z, NULL)) {
         ERR_raise(ERR_LIB_SM2, ERR_R_EVP_LIB);
         goto done;
     }
@@ -197,7 +197,7 @@ static BIGNUM *sm2_compute_msg_hash(const EVP_MD *digest,
     if (e == NULL)
         ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
 
- done:
+done:
     EVP_MD_free(fetched_digest);
     OPENSSL_free(z);
     EVP_MD_CTX_free(hash);
@@ -220,6 +220,10 @@ static ECDSA_SIG *sm2_sig_gen(const EC_KEY *key, const BIGNUM *e)
     BIGNUM *tmp = NULL;
     OSSL_LIB_CTX *libctx = ossl_ec_key_get_libctx(key);
 
+    if (dA == NULL) {
+        ERR_raise(ERR_LIB_SM2, SM2_R_INVALID_PRIVATE_KEY);
+        goto done;
+    }
     kG = EC_POINT_new(group);
     if (kG == NULL) {
         ERR_raise(ERR_LIB_SM2, ERR_R_EC_LIB);
@@ -269,9 +273,9 @@ static ECDSA_SIG *sm2_sig_gen(const EC_KEY *key, const BIGNUM *e)
         }
 
         if (!EC_POINT_mul(group, kG, k, NULL, NULL, ctx)
-                || !EC_POINT_get_affine_coordinates(group, kG, x1, NULL,
-                                                    ctx)
-                || !BN_mod_add(r, e, x1, order, ctx)) {
+            || !EC_POINT_get_affine_coordinates(group, kG, x1, NULL,
+                ctx)
+            || !BN_mod_add(r, e, x1, order, ctx)) {
             ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
             goto done;
         }
@@ -289,10 +293,10 @@ static ECDSA_SIG *sm2_sig_gen(const EC_KEY *key, const BIGNUM *e)
             continue;
 
         if (!BN_add(s, dA, BN_value_one())
-                || !ossl_ec_group_do_inverse_ord(group, s, s, ctx)
-                || !BN_mod_mul(tmp, dA, r, order, ctx)
-                || !BN_sub(tmp, k, tmp)
-                || !BN_mod_mul(s, s, tmp, order, ctx)) {
+            || !ossl_ec_group_do_inverse_ord(group, s, s, ctx)
+            || !BN_mod_mul(tmp, dA, r, order, ctx)
+            || !BN_sub(tmp, k, tmp)
+            || !BN_mod_mul(s, s, tmp, order, ctx)) {
             ERR_raise(ERR_LIB_SM2, ERR_R_BN_LIB);
             goto done;
         }
@@ -307,12 +311,12 @@ static ECDSA_SIG *sm2_sig_gen(const EC_KEY *key, const BIGNUM *e)
             goto done;
         }
 
-         /* takes ownership of r and s */
+        /* takes ownership of r and s */
         ECDSA_SIG_set0(sig, r, s);
         break;
     }
 
- done:
+done:
     if (sig == NULL) {
         BN_free(r);
         BN_free(s);
@@ -324,7 +328,7 @@ static ECDSA_SIG *sm2_sig_gen(const EC_KEY *key, const BIGNUM *e)
 }
 
 static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig,
-                          const BIGNUM *e)
+    const BIGNUM *e)
 {
     int ret = 0;
     const EC_GROUP *group = EC_KEY_get0_group(key);
@@ -369,9 +373,9 @@ static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig,
     ECDSA_SIG_get0(sig, &r, &s);
 
     if (BN_cmp(r, BN_value_one()) < 0
-            || BN_cmp(s, BN_value_one()) < 0
-            || BN_cmp(order, r) <= 0
-            || BN_cmp(order, s) <= 0) {
+        || BN_cmp(s, BN_value_one()) < 0
+        || BN_cmp(order, r) <= 0
+        || BN_cmp(order, s) <= 0) {
         ERR_raise(ERR_LIB_SM2, SM2_R_BAD_SIGNATURE);
         goto done;
     }
@@ -387,7 +391,7 @@ static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig,
     }
 
     if (!EC_POINT_mul(group, pt, s, EC_KEY_get0_public_key(key), t, ctx)
-            || !EC_POINT_get_affine_coordinates(group, pt, x1, NULL, ctx)) {
+        || !EC_POINT_get_affine_coordinates(group, pt, x1, NULL, ctx)) {
         ERR_raise(ERR_LIB_SM2, ERR_R_EC_LIB);
         goto done;
     }
@@ -400,7 +404,7 @@ static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig,
     if (BN_cmp(r, t) == 0)
         ret = 1;
 
- done:
+done:
     BN_CTX_end(ctx);
     EC_POINT_free(pt);
     BN_CTX_free(ctx);
@@ -408,10 +412,10 @@ static int sm2_sig_verify(const EC_KEY *key, const ECDSA_SIG *sig,
 }
 
 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)
 {
     BIGNUM *e = NULL;
     ECDSA_SIG *sig = NULL;
@@ -424,17 +428,17 @@ ECDSA_SIG *ossl_sm2_do_sign(const EC_KEY *key,
 
     sig = sm2_sig_gen(key, e);
 
- done:
+done:
     BN_free(e);
     return sig;
 }
 
 int ossl_sm2_do_verify(const EC_KEY *key,
-                       const EVP_MD *digest,
-                       const ECDSA_SIG *sig,
-                       const uint8_t *id,
-                       const size_t id_len,
-                       const uint8_t *msg, size_t msg_len)
+    const EVP_MD *digest,
+    const ECDSA_SIG *sig,
+    const uint8_t *id,
+    const size_t id_len,
+    const uint8_t *msg, size_t msg_len)
 {
     BIGNUM *e = NULL;
     int ret = 0;
@@ -447,14 +451,14 @@ int ossl_sm2_do_verify(const EC_KEY *key,
 
     ret = sm2_sig_verify(key, sig, e);
 
- done:
+done:
     BN_free(e);
     return ret;
 }
 
 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)
 {
     BIGNUM *e = NULL;
     ECDSA_SIG *s = NULL;
@@ -468,8 +472,8 @@ int ossl_sm2_internal_sign(const unsigned char *dgst, int dgstlen,
 
     e = BN_bin2bn(dgst, dgstlen, NULL);
     if (e == NULL) {
-       ERR_raise(ERR_LIB_SM2, ERR_R_BN_LIB);
-       goto done;
+        ERR_raise(ERR_LIB_SM2, ERR_R_BN_LIB);
+        goto done;
     }
 
     s = sm2_sig_gen(eckey, e);
@@ -480,22 +484,22 @@ int ossl_sm2_internal_sign(const unsigned char *dgst, int dgstlen,
 
     sigleni = i2d_ECDSA_SIG(s, &sig);
     if (sigleni < 0) {
-       ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
-       goto done;
+        ERR_raise(ERR_LIB_SM2, ERR_R_INTERNAL_ERROR);
+        goto done;
     }
     *siglen = (unsigned int)sigleni;
 
     ret = 1;
 
- done:
+done:
     ECDSA_SIG_free(s);
     BN_free(e);
     return ret;
 }
 
 int ossl_sm2_internal_verify(const unsigned char *dgst, int dgstlen,
-                             const unsigned char *sig, int sig_len,
-                             EC_KEY *eckey)
+    const unsigned char *sig, int sig_len,
+    EC_KEY *eckey)
 {
     ECDSA_SIG *s = NULL;
     BIGNUM *e = NULL;
@@ -528,7 +532,7 @@ int ossl_sm2_internal_verify(const unsigned char *dgst, int dgstlen,
 
     ret = sm2_sig_verify(eckey, s, e);
 
- done:
+done:
     OPENSSL_free(der);
     BN_free(e);
     ECDSA_SIG_free(s);
diff --git a/crypto/sm3/asm/sm3-armv8.pl b/crypto/sm3/asm/sm3-armv8.pl
index 1437f028922cc..f36e0e2be98cf 100644
--- a/crypto/sm3/asm/sm3-armv8.pl
+++ b/crypto/sm3/asm/sm3-armv8.pl
@@ -153,13 +153,13 @@ ()
 
 .Loop:
 	// load input
-	ld1     {$s0.16b-$s3.16b}, [$pdata], #64
+	ld1     {$s0.4s-$s3.4s}, [$pdata], #64
 	sub     $num, $num, #1
 
 	mov     $bkstate1.16b, $state1.16b
 	mov     $bkstate2.16b, $state2.16b
 
-#ifndef __ARMEB__
+#ifndef __AARCH64EB__
 	rev32   $s0.16b, $s0.16b
 	rev32   $s1.16b, $s1.16b
 	rev32   $s2.16b, $s2.16b
diff --git a/crypto/sm3/legacy_sm3.c b/crypto/sm3/legacy_sm3.c
index c81f3b4ab45d4..7f5ee97807a38 100644
--- a/crypto/sm3/legacy_sm3.c
+++ b/crypto/sm3/legacy_sm3.c
@@ -8,7 +8,6 @@
  * https://www.openssl.org/source/license.html
  */
 
-
 #include "crypto/evp.h"
 #include "../evp/legacy_meth.h"
 #include "internal/sm3.h"
@@ -22,7 +21,7 @@ static const EVP_MD sm3_md = {
     0,
     EVP_ORIG_GLOBAL,
     LEGACY_EVP_MD_METH_TABLE(sm3_int_init, sm3_int_update, sm3_int_final, NULL,
-                             SM3_CBLOCK),
+        SM3_CBLOCK),
 };
 
 const EVP_MD *EVP_sm3(void)
diff --git a/crypto/sm3/sm3.c b/crypto/sm3/sm3.c
index ff78fb763e007..ebdbd8bdb9359 100644
--- a/crypto/sm3/sm3.c
+++ b/crypto/sm3/sm3.c
@@ -46,9 +46,9 @@ void ossl_sm3_block_data_order(SM3_CTX *ctx, const void *p, size_t num)
         H = ctx->H;
 
         /*
-        * We have to load all message bytes immediately since SM3 reads
-        * them slightly out of order.
-        */
+         * We have to load all message bytes immediately since SM3 reads
+         * them slightly out of order.
+         */
         (void)HOST_c2l(data, W00);
         (void)HOST_c2l(data, W01);
         (void)HOST_c2l(data, W02);
diff --git a/crypto/sm3/sm3_local.h b/crypto/sm3/sm3_local.h
index 897418aee1702..762f3bb7e968f 100644
--- a/crypto/sm3/sm3_local.h
+++ b/crypto/sm3/sm3_local.h
@@ -14,43 +14,51 @@
 
 #define DATA_ORDER_IS_BIG_ENDIAN
 
-#define HASH_LONG               SM3_WORD
-#define HASH_CTX                SM3_CTX
-#define HASH_CBLOCK             SM3_CBLOCK
-#define HASH_UPDATE             ossl_sm3_update
-#define HASH_TRANSFORM          ossl_sm3_transform
-#define HASH_FINAL              ossl_sm3_final
-#define HASH_MAKE_STRING(c, s)              \
-      do {                                  \
-        unsigned long ll;                   \
-        ll=(c)->A; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->B; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->C; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->D; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->E; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->F; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->G; (void)HOST_l2c(ll, (s)); \
-        ll=(c)->H; (void)HOST_l2c(ll, (s)); \
-      } while (0)
+#define HASH_LONG SM3_WORD
+#define HASH_CTX SM3_CTX
+#define HASH_CBLOCK SM3_CBLOCK
+#define HASH_UPDATE ossl_sm3_update
+#define HASH_TRANSFORM ossl_sm3_transform
+#define HASH_FINAL ossl_sm3_final
+#define HASH_MAKE_STRING(c, s)   \
+    do {                         \
+        unsigned long ll;        \
+        ll = (c)->A;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->B;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->C;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->D;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->E;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->F;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->G;             \
+        (void)HOST_l2c(ll, (s)); \
+        ll = (c)->H;             \
+        (void)HOST_l2c(ll, (s)); \
+    } while (0)
 
 #if defined(OPENSSL_SM3_ASM)
-# if defined(__aarch64__) || defined(_M_ARM64)
-#  include "crypto/arm_arch.h"
-#  define HWSM3_CAPABLE (OPENSSL_armcap_P & ARMV8_SM3)
+#if defined(__aarch64__) || defined(_M_ARM64)
+#include "crypto/arm_arch.h"
+#define HWSM3_CAPABLE (OPENSSL_armcap_P & ARMV8_SM3)
 void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
-# endif
-# if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-#  include "crypto/riscv_arch.h"
-#  define HWSM3_CAPABLE 1
+#endif
+#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
+#include "crypto/riscv_arch.h"
+#define HWSM3_CAPABLE 1
 void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
-# endif
+#endif
 #endif
 
 #if defined(HWSM3_CAPABLE)
-# define HASH_BLOCK_DATA_ORDER (HWSM3_CAPABLE ? ossl_hwsm3_block_data_order \
-                                              : ossl_sm3_block_data_order)
+#define HASH_BLOCK_DATA_ORDER (HWSM3_CAPABLE ? ossl_hwsm3_block_data_order \
+                                             : ossl_sm3_block_data_order)
 #else
-# define HASH_BLOCK_DATA_ORDER   ossl_sm3_block_data_order
+#define HASH_BLOCK_DATA_ORDER ossl_sm3_block_data_order
 #endif
 
 void ossl_sm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
@@ -59,55 +67,54 @@ void ossl_sm3_transform(SM3_CTX *c, const unsigned char *data);
 #include "crypto/md32_common.h"
 
 #ifndef PEDANTIC
-# if defined(__GNUC__) && __GNUC__>=2 && \
-     !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-#  if defined(__riscv_zksh)
-#   define P0(x) ({ MD32_REG_T ret;        \
+#if defined(__GNUC__) && __GNUC__ >= 2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+#if defined(__riscv_zksh)
+#define P0(x) ({ MD32_REG_T ret;        \
                        asm ("sm3p0 %0, %1" \
                        : "=r"(ret)         \
-                       : "r"(x)); ret;     })
-#   define P1(x) ({ MD32_REG_T ret;        \
+                       : "r"(x)); ret; })
+#define P1(x) ({ MD32_REG_T ret;        \
                        asm ("sm3p1 %0, %1" \
                        : "=r"(ret)         \
-                       : "r"(x)); ret;     })
-#  endif
-# endif
+                       : "r"(x)); ret; })
+#endif
+#endif
 #endif
 
 #ifndef P0
-# define P0(X) (X ^ ROTATE(X, 9) ^ ROTATE(X, 17))
+#define P0(X) (X ^ ROTATE(X, 9) ^ ROTATE(X, 17))
 #endif
 #ifndef P1
-# define P1(X) (X ^ ROTATE(X, 15) ^ ROTATE(X, 23))
+#define P1(X) (X ^ ROTATE(X, 15) ^ ROTATE(X, 23))
 #endif
 
-#define FF0(X,Y,Z) (X ^ Y ^ Z)
-#define GG0(X,Y,Z) (X ^ Y ^ Z)
-
-#define FF1(X,Y,Z) ((X & Y) | ((X | Y) & Z))
-#define GG1(X,Y,Z) ((Z ^ (X & (Y ^ Z))))
-
-#define EXPAND(W0,W7,W13,W3,W10) \
-   (P1(W0 ^ W7 ^ ROTATE(W13, 15)) ^ ROTATE(W3, 7) ^ W10)
-
-#define RND(A, B, C, D, E, F, G, H, TJ, Wi, Wj, FF, GG)           \
-     do {                                                         \
-       const SM3_WORD A12 = ROTATE(A, 12);                        \
-       const SM3_WORD A12_SM = A12 + E + TJ;                      \
-       const SM3_WORD SS1 = ROTATE(A12_SM, 7);                    \
-       const SM3_WORD TT1 = FF(A, B, C) + D + (SS1 ^ A12) + (Wj); \
-       const SM3_WORD TT2 = GG(E, F, G) + H + SS1 + Wi;           \
-       B = ROTATE(B, 9);                                          \
-       D = TT1;                                                   \
-       F = ROTATE(F, 19);                                         \
-       H = P0(TT2);                                               \
-     } while(0)
-
-#define R1(A,B,C,D,E,F,G,H,TJ,Wi,Wj) \
-   RND(A,B,C,D,E,F,G,H,TJ,Wi,Wj,FF0,GG0)
-
-#define R2(A,B,C,D,E,F,G,H,TJ,Wi,Wj) \
-   RND(A,B,C,D,E,F,G,H,TJ,Wi,Wj,FF1,GG1)
+#define FF0(X, Y, Z) (X ^ Y ^ Z)
+#define GG0(X, Y, Z) (X ^ Y ^ Z)
+
+#define FF1(X, Y, Z) ((X & Y) | ((X | Y) & Z))
+#define GG1(X, Y, Z) ((Z ^ (X & (Y ^ Z))))
+
+#define EXPAND(W0, W7, W13, W3, W10) \
+    (P1(W0 ^ W7 ^ ROTATE(W13, 15)) ^ ROTATE(W3, 7) ^ W10)
+
+#define RND(A, B, C, D, E, F, G, H, TJ, Wi, Wj, FF, GG)            \
+    do {                                                           \
+        const SM3_WORD A12 = ROTATE(A, 12);                        \
+        const SM3_WORD A12_SM = A12 + E + TJ;                      \
+        const SM3_WORD SS1 = ROTATE(A12_SM, 7);                    \
+        const SM3_WORD TT1 = FF(A, B, C) + D + (SS1 ^ A12) + (Wj); \
+        const SM3_WORD TT2 = GG(E, F, G) + H + SS1 + Wi;           \
+        B = ROTATE(B, 9);                                          \
+        D = TT1;                                                   \
+        F = ROTATE(F, 19);                                         \
+        H = P0(TT2);                                               \
+    } while (0)
+
+#define R1(A, B, C, D, E, F, G, H, TJ, Wi, Wj) \
+    RND(A, B, C, D, E, F, G, H, TJ, Wi, Wj, FF0, GG0)
+
+#define R2(A, B, C, D, E, F, G, H, TJ, Wi, Wj) \
+    RND(A, B, C, D, E, F, G, H, TJ, Wi, Wj, FF1, GG1)
 
 #define SM3_A 0x7380166fUL
 #define SM3_B 0x4914b2b9UL
diff --git a/crypto/sm4/asm/sm4-armv8.pl b/crypto/sm4/asm/sm4-armv8.pl
index 8003df41ab292..1fe12dead49b9 100755
--- a/crypto/sm4/asm/sm4-armv8.pl
+++ b/crypto/sm4/asm/sm4-armv8.pl
@@ -32,7 +32,7 @@ ()
 my $dst = shift;
 my $src = shift;
 $code.=<<___;
-#ifndef __ARMEB__
+#ifndef __AARCH64EB__
 	rev32	$dst.16b,$src.16b
 #endif
 ___
@@ -404,7 +404,7 @@ ()
 	&enc_blk($ivec);
 	&rev32($ivec,$ivec);
 $code.=<<___;
-	st1	{$ivec.16b},[$out],#16
+	st1	{$ivec.4s},[$out],#16
 	b.ne	1b
 	b	3f
 .Ldec:
@@ -485,11 +485,11 @@ ()
 $code.=<<___;
 	eor	@dat[0].16b,@dat[0].16b,$ivec.16b
 	mov	$ivec.16b,@in[0].16b
-	st1	{@dat[0].16b},[$out],#16
+	st1	{@dat[0].4s},[$out],#16
 	b.ne	1b
 3:
 	// save back IV
-	st1	{$ivec.16b},[$ivp]
+	st1	{$ivec.4s},[$ivp]
 	ldp	d8,d9,[sp],#16
 	ret
 .size	${prefix}_cbc_encrypt,.-${prefix}_cbc_encrypt
diff --git a/crypto/sm4/asm/vpsm4_ex-armv8.pl b/crypto/sm4/asm/vpsm4_ex-armv8.pl
index 2a1916268d163..e8e33735852ec 100644
--- a/crypto/sm4/asm/vpsm4_ex-armv8.pl
+++ b/crypto/sm4/asm/vpsm4_ex-armv8.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022-2025 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2022-2026 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -559,13 +559,25 @@ ()
 .Lshuffles:
 	.quad 0x0B0A090807060504,0x030201000F0E0D0C
 .Lxts_magic:
+#ifndef __AARCH64EB__
 	.quad 0x0101010101010187,0x0101010101010101
+#else
+	.quad 0x0101010101010101,0x0101010101010187
+#endif
 .Lsbox_magic:
+#ifndef __AARCH64EB__
 	.quad 0x0b0e0104070a0d00,0x0306090c0f020508
 	.quad 0x62185a2042387a00,0x22581a6002783a40
 	.quad 0x15df62a89e54e923,0xc10bb67c4a803df7
 	.quad 0xb9aa6b78c1d21300,0x1407c6d56c7fbead
 	.quad 0x6404462679195b3b,0xe383c1a1fe9edcbc
+#else
+	.quad 0x0306090c0f020508,0x0b0e0104070a0d00
+	.quad 0x22581a6002783a40,0x62185a2042387a00
+	.quad 0xc10bb67c4a803df7,0x15df62a89e54e923
+	.quad 0x1407c6d56c7fbead,0xb9aa6b78c1d21300
+	.quad 0xe383c1a1fe9edcbc,0x6404462679195b3b
+#endif
 	.quad 0x0f0f0f0f0f0f0f0f,0x0f0f0f0f0f0f0f0f
 
 .size	_${prefix}_consts,.-_${prefix}_consts
diff --git a/crypto/sm4/sm4.c b/crypto/sm4/sm4.c
index 194ef7e4bbf0e..87e090dd5fe5c 100644
--- a/crypto/sm4/sm4.c
+++ b/crypto/sm4/sm4.c
@@ -83,7 +83,8 @@ static const uint32_t SM4_SBOX_T0[256] = {
     0x35F2C7C7, 0x2D092424, 0xD1C61717, 0xD66FB9B9, 0xDEC51B1B, 0x94861212,
     0x78186060, 0x30F3C3C3, 0x897CF5F5, 0x5CEFB3B3, 0xD23AE8E8, 0xACDF7373,
     0x794C3535, 0xA0208080, 0x9D78E5E5, 0x56EDBBBB, 0x235E7D7D, 0xC63EF8F8,
-    0x8BD45F5F, 0xE7C82F2F, 0xDD39E4E4, 0x68492121 };
+    0x8BD45F5F, 0xE7C82F2F, 0xDD39E4E4, 0x68492121
+};
 
 static uint32_t SM4_SBOX_T1[256] = {
     0x5B8ED55B, 0x42D09242, 0xA74DEAA7, 0xFB06FDFB, 0x33FCCF33, 0x8765E287,
@@ -128,7 +129,8 @@ static uint32_t SM4_SBOX_T1[256] = {
     0xC735F2C7, 0x242D0924, 0x17D1C617, 0xB9D66FB9, 0x1BDEC51B, 0x12948612,
     0x60781860, 0xC330F3C3, 0xF5897CF5, 0xB35CEFB3, 0xE8D23AE8, 0x73ACDF73,
     0x35794C35, 0x80A02080, 0xE59D78E5, 0xBB56EDBB, 0x7D235E7D, 0xF8C63EF8,
-    0x5F8BD45F, 0x2FE7C82F, 0xE4DD39E4, 0x21684921};
+    0x5F8BD45F, 0x2FE7C82F, 0xE4DD39E4, 0x21684921
+};
 
 static uint32_t SM4_SBOX_T2[256] = {
     0x5B5B8ED5, 0x4242D092, 0xA7A74DEA, 0xFBFB06FD, 0x3333FCCF, 0x878765E2,
@@ -173,7 +175,8 @@ static uint32_t SM4_SBOX_T2[256] = {
     0xC7C735F2, 0x24242D09, 0x1717D1C6, 0xB9B9D66F, 0x1B1BDEC5, 0x12129486,
     0x60607818, 0xC3C330F3, 0xF5F5897C, 0xB3B35CEF, 0xE8E8D23A, 0x7373ACDF,
     0x3535794C, 0x8080A020, 0xE5E59D78, 0xBBBB56ED, 0x7D7D235E, 0xF8F8C63E,
-    0x5F5F8BD4, 0x2F2FE7C8, 0xE4E4DD39, 0x21216849};
+    0x5F5F8BD4, 0x2F2FE7C8, 0xE4E4DD39, 0x21216849
+};
 
 static uint32_t SM4_SBOX_T3[256] = {
     0xD55B5B8E, 0x924242D0, 0xEAA7A74D, 0xFDFBFB06, 0xCF3333FC, 0xE2878765,
@@ -218,7 +221,8 @@ static uint32_t SM4_SBOX_T3[256] = {
     0xF2C7C735, 0x0924242D, 0xC61717D1, 0x6FB9B9D6, 0xC51B1BDE, 0x86121294,
     0x18606078, 0xF3C3C330, 0x7CF5F589, 0xEFB3B35C, 0x3AE8E8D2, 0xDF7373AC,
     0x4C353579, 0x208080A0, 0x78E5E59D, 0xEDBBBB56, 0x5E7D7D23, 0x3EF8F8C6,
-    0xD45F5F8B, 0xC82F2FE7, 0x39E4E4DD, 0x49212168};
+    0xD45F5F8B, 0xC82F2FE7, 0x39E4E4DD, 0x49212168
+};
 
 static ossl_inline uint32_t rotl(uint32_t a, uint8_t n)
 {
@@ -227,10 +231,7 @@ static ossl_inline uint32_t rotl(uint32_t a, uint8_t n)
 
 static ossl_inline uint32_t load_u32_be(const uint8_t *b, uint32_t n)
 {
-    return ((uint32_t)b[4 * n] << 24) |
-           ((uint32_t)b[4 * n + 1] << 16) |
-           ((uint32_t)b[4 * n + 2] << 8) |
-           ((uint32_t)b[4 * n + 3]);
+    return ((uint32_t)b[4 * n] << 24) | ((uint32_t)b[4 * n + 1] << 16) | ((uint32_t)b[4 * n + 2] << 8) | ((uint32_t)b[4 * n + 3]);
 }
 
 static ossl_inline void store_u32_be(uint32_t v, uint8_t *b)
@@ -265,10 +266,7 @@ static ossl_inline uint32_t SM4_T_slow(uint32_t X)
 
 static ossl_inline uint32_t SM4_T(uint32_t X)
 {
-    return SM4_SBOX_T0[(uint8_t)(X >> 24)] ^
-           SM4_SBOX_T1[(uint8_t)(X >> 16)] ^
-           SM4_SBOX_T2[(uint8_t)(X >> 8)] ^
-           SM4_SBOX_T3[(uint8_t)X];
+    return SM4_SBOX_T0[(uint8_t)(X >> 24)] ^ SM4_SBOX_T1[(uint8_t)(X >> 16)] ^ SM4_SBOX_T2[(uint8_t)(X >> 8)] ^ SM4_SBOX_T3[(uint8_t)X];
 }
 
 static ossl_inline uint32_t SM4_key_sub(uint32_t X)
@@ -314,7 +312,7 @@ int ossl_sm4_set_key(const uint8_t *key, SM4_KEY *ks)
         K[1] ^= SM4_key_sub(K[2] ^ K[3] ^ K[0] ^ CK[i + 1]);
         K[2] ^= SM4_key_sub(K[3] ^ K[0] ^ K[1] ^ CK[i + 2]);
         K[3] ^= SM4_key_sub(K[0] ^ K[1] ^ K[2] ^ CK[i + 3]);
-        ks->rk[i    ] = K[0];
+        ks->rk[i] = K[0];
         ks->rk[i + 1] = K[1];
         ks->rk[i + 2] = K[2];
         ks->rk[i + 3] = K[3];
@@ -323,13 +321,13 @@ int ossl_sm4_set_key(const uint8_t *key, SM4_KEY *ks)
     return 1;
 }
 
-#define SM4_RNDS(k0, k1, k2, k3, F)          \
-      do {                                   \
-         B0 ^= F(B1 ^ B2 ^ B3 ^ ks->rk[k0]); \
-         B1 ^= F(B0 ^ B2 ^ B3 ^ ks->rk[k1]); \
-         B2 ^= F(B0 ^ B1 ^ B3 ^ ks->rk[k2]); \
-         B3 ^= F(B0 ^ B1 ^ B2 ^ ks->rk[k3]); \
-      } while(0)
+#define SM4_RNDS(k0, k1, k2, k3, F)         \
+    do {                                    \
+        B0 ^= F(B1 ^ B2 ^ B3 ^ ks->rk[k0]); \
+        B1 ^= F(B0 ^ B2 ^ B3 ^ ks->rk[k1]); \
+        B2 ^= F(B0 ^ B1 ^ B3 ^ ks->rk[k2]); \
+        B3 ^= F(B0 ^ B1 ^ B2 ^ ks->rk[k3]); \
+    } while (0)
 
 void ossl_sm4_encrypt(const uint8_t *in, uint8_t *out, const SM4_KEY *ks)
 {
@@ -342,9 +340,9 @@ void ossl_sm4_encrypt(const uint8_t *in, uint8_t *out, const SM4_KEY *ks)
      * Uses byte-wise sbox in the first and last rounds to provide some
      * protection from cache based side channels.
      */
-    SM4_RNDS( 0,  1,  2,  3, SM4_T_slow);
-    SM4_RNDS( 4,  5,  6,  7, SM4_T);
-    SM4_RNDS( 8,  9, 10, 11, SM4_T);
+    SM4_RNDS(0, 1, 2, 3, SM4_T_slow);
+    SM4_RNDS(4, 5, 6, 7, SM4_T);
+    SM4_RNDS(8, 9, 10, 11, SM4_T);
     SM4_RNDS(12, 13, 14, 15, SM4_T);
     SM4_RNDS(16, 17, 18, 19, SM4_T);
     SM4_RNDS(20, 21, 22, 23, SM4_T);
@@ -369,9 +367,9 @@ void ossl_sm4_decrypt(const uint8_t *in, uint8_t *out, const SM4_KEY *ks)
     SM4_RNDS(23, 22, 21, 20, SM4_T);
     SM4_RNDS(19, 18, 17, 16, SM4_T);
     SM4_RNDS(15, 14, 13, 12, SM4_T);
-    SM4_RNDS(11, 10,  9,  8, SM4_T);
-    SM4_RNDS( 7,  6,  5,  4, SM4_T);
-    SM4_RNDS( 3,  2,  1,  0, SM4_T_slow);
+    SM4_RNDS(11, 10, 9, 8, SM4_T);
+    SM4_RNDS(7, 6, 5, 4, SM4_T);
+    SM4_RNDS(3, 2, 1, 0, SM4_T_slow);
 
     store_u32_be(B3, out);
     store_u32_be(B2, out + 4);
diff --git a/crypto/sparcv9cap.c b/crypto/sparcv9cap.c
index 53c0c3e0456be..b7f109581f544 100644
--- a/crypto/sparcv9cap.c
+++ b/crypto/sparcv9cap.c
@@ -19,9 +19,10 @@
 #include "crypto/sparc_arch.h"
 
 #if defined(__GNUC__) && defined(__linux)
-__attribute__ ((visibility("hidden")))
+__attribute__((visibility("hidden")))
 #endif
-unsigned int OPENSSL_sparcv9cap_P[2] = { SPARCV9_TICK_PRIVILEGED, 0 };
+unsigned int OPENSSL_sparcv9cap_P[2]
+    = { SPARCV9_TICK_PRIVILEGED, 0 };
 
 unsigned long _sparcv9_rdtick(void);
 void _sparcv9_vis1_probe(void);
@@ -49,8 +50,7 @@ uint32_t OPENSSL_rdtsc(void)
 
 size_t OPENSSL_instrument_bus(unsigned int *out, size_t cnt)
 {
-    if ((OPENSSL_sparcv9cap_P[0] & (SPARCV9_TICK_PRIVILEGED | SPARCV9_BLK)) ==
-        SPARCV9_BLK)
+    if ((OPENSSL_sparcv9cap_P[0] & (SPARCV9_TICK_PRIVILEGED | SPARCV9_BLK)) == SPARCV9_BLK)
         return _sparcv9_vis1_instrument_bus(out, cnt);
     else
         return 0;
@@ -58,8 +58,7 @@ size_t OPENSSL_instrument_bus(unsigned int *out, size_t cnt)
 
 size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
 {
-    if ((OPENSSL_sparcv9cap_P[0] & (SPARCV9_TICK_PRIVILEGED | SPARCV9_BLK)) ==
-        SPARCV9_BLK)
+    if ((OPENSSL_sparcv9cap_P[0] & (SPARCV9_TICK_PRIVILEGED | SPARCV9_BLK)) == SPARCV9_BLK)
         return _sparcv9_vis1_instrument_bus2(out, cnt, max);
     else
         return 0;
@@ -72,14 +71,14 @@ static void common_handler(int sig)
 }
 
 #if defined(__sun) && defined(__SVR4)
-# if defined(__GNUC__) && __GNUC__>=2
-extern unsigned int getisax(unsigned int vec[], unsigned int sz) __attribute__ ((weak));
-# elif defined(__SUNPRO_C)
+#if defined(__GNUC__) && __GNUC__ >= 2
+extern unsigned int getisax(unsigned int vec[], unsigned int sz) __attribute__((weak));
+#elif defined(__SUNPRO_C)
 #pragma weak getisax
 extern unsigned int getisax(unsigned int vec[], unsigned int sz);
-# else
-static unsigned int (*getisax) (unsigned int vec[], unsigned int sz) = NULL;
-# endif
+#else
+static unsigned int (*getisax)(unsigned int vec[], unsigned int sz) = NULL;
+#endif
 #endif
 
 void OPENSSL_cpuid_setup(void)
@@ -104,36 +103,47 @@ void OPENSSL_cpuid_setup(void)
     if (getisax != NULL) {
         unsigned int vec[2] = { 0, 0 };
 
-        if (getisax (vec,2)) {
-            if (vec[0]&0x00020) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS1;
-            if (vec[0]&0x00040) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS2;
-            if (vec[0]&0x00080) OPENSSL_sparcv9cap_P[0] |= SPARCV9_BLK;
-            if (vec[0]&0x00100) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FMADD;
-            if (vec[0]&0x00400) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS3;
-            if (vec[0]&0x01000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJHPCACE;
-            if (vec[0]&0x02000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJDESX;
-            if (vec[0]&0x08000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_IMA;
-            if (vec[0]&0x10000) OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJAESX;
-            if (vec[1]&0x00008) OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS4;
+        if (getisax(vec, 2)) {
+            if (vec[0] & 0x00020)
+                OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS1;
+            if (vec[0] & 0x00040)
+                OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS2;
+            if (vec[0] & 0x00080)
+                OPENSSL_sparcv9cap_P[0] |= SPARCV9_BLK;
+            if (vec[0] & 0x00100)
+                OPENSSL_sparcv9cap_P[0] |= SPARCV9_FMADD;
+            if (vec[0] & 0x00400)
+                OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS3;
+            if (vec[0] & 0x01000)
+                OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJHPCACE;
+            if (vec[0] & 0x02000)
+                OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJDESX;
+            if (vec[0] & 0x08000)
+                OPENSSL_sparcv9cap_P[0] |= SPARCV9_IMA;
+            if (vec[0] & 0x10000)
+                OPENSSL_sparcv9cap_P[0] |= SPARCV9_FJAESX;
+            if (vec[1] & 0x00008)
+                OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS4;
 
             /* reconstruct %cfr copy */
-            OPENSSL_sparcv9cap_P[1] = (vec[0]>>17)&0x3ff;
-            OPENSSL_sparcv9cap_P[1] |= (OPENSSL_sparcv9cap_P[1]&CFR_MONTMUL)<<1;
-            if (vec[0]&0x20000000) OPENSSL_sparcv9cap_P[1] |= CFR_CRC32C;
-            if (vec[1]&0x00000020) OPENSSL_sparcv9cap_P[1] |= CFR_XMPMUL;
-            if (vec[1]&0x00000040)
-                OPENSSL_sparcv9cap_P[1] |= CFR_XMONTMUL|CFR_XMONTSQR;
+            OPENSSL_sparcv9cap_P[1] = (vec[0] >> 17) & 0x3ff;
+            OPENSSL_sparcv9cap_P[1] |= (OPENSSL_sparcv9cap_P[1] & CFR_MONTMUL) << 1;
+            if (vec[0] & 0x20000000)
+                OPENSSL_sparcv9cap_P[1] |= CFR_CRC32C;
+            if (vec[1] & 0x00000020)
+                OPENSSL_sparcv9cap_P[1] |= CFR_XMPMUL;
+            if (vec[1] & 0x00000040)
+                OPENSSL_sparcv9cap_P[1] |= CFR_XMONTMUL | CFR_XMONTSQR;
 
             /* Some heuristics */
             /* all known VIS2-capable CPUs have unprivileged tick counter */
-            if (OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS2)
+            if (OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS2)
                 OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED;
 
             OPENSSL_sparcv9cap_P[0] |= SPARCV9_PREFER_FPU;
 
             /* detect UltraSPARC-Tx, see sparccpud.S for details... */
-            if ((OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS1) &&
-                _sparcv9_vis1_instrument() >= 12)
+            if ((OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS1) && _sparcv9_vis1_instrument() >= 12)
                 OPENSSL_sparcv9cap_P[0] &= ~(SPARCV9_VIS1 | SPARCV9_PREFER_FPU);
         }
 
@@ -150,9 +160,9 @@ void OPENSSL_cpuid_setup(void)
     sigfillset(&all_masked);
     sigdelset(&all_masked, SIGILL);
     sigdelset(&all_masked, SIGTRAP);
-# ifdef SIGEMT
+#ifdef SIGEMT
     sigdelset(&all_masked, SIGEMT);
-# endif
+#endif
     sigdelset(&all_masked, SIGFPE);
     sigdelset(&all_masked, SIGBUS);
     sigdelset(&all_masked, SIGSEGV);
@@ -208,8 +218,7 @@ void OPENSSL_cpuid_setup(void)
      * loop on UltraSPARC II running Solaris. Things might be
      * different on Linux...
      */
-    if ((OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS3) &&
-        sigsetjmp(common_jmp, 1) == 0) {
+    if ((OPENSSL_sparcv9cap_P[0] & SPARCV9_VIS3) && sigsetjmp(common_jmp, 1) == 0) {
         OPENSSL_sparcv9cap_P[1] = (unsigned int)_sparcv9_rdcfr();
     }
 
@@ -220,12 +229,12 @@ void OPENSSL_cpuid_setup(void)
 
     if (sizeof(size_t) == 8)
         OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK;
-# ifdef __linux
+#ifdef __linux
     else {
         int ret = syscall(340);
 
         if (ret >= 0 && ret & 1)
             OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK;
     }
-# endif
+#endif
 }
diff --git a/crypto/sparse_array.c b/crypto/sparse_array.c
index a41936517e72f..24c7fe64a2f61 100644
--- a/crypto/sparse_array.c
+++ b/crypto/sparse_array.c
@@ -31,9 +31,9 @@
  * will be three.
  */
 #ifndef OPENSSL_SA_BLOCK_BITS
-# define OPENSSL_SA_BLOCK_BITS           4
+#define OPENSSL_SA_BLOCK_BITS 4
 #elif OPENSSL_SA_BLOCK_BITS < 2 || OPENSSL_SA_BLOCK_BITS > (BN_BITS2 - 1)
-# error OPENSSL_SA_BLOCK_BITS is out of range
+#error OPENSSL_SA_BLOCK_BITS is out of range
 #endif
 
 /*
@@ -41,12 +41,12 @@
  *    the number of pointers in a tree node;
  *    a bit mask to quickly extract an index and
  *    the maximum depth of the tree structure.
-  */
-#define SA_BLOCK_MAX            (1 << OPENSSL_SA_BLOCK_BITS)
-#define SA_BLOCK_MASK           (SA_BLOCK_MAX - 1)
-#define SA_BLOCK_MAX_LEVELS     (((int)sizeof(ossl_uintmax_t) * 8 \
-                                  + OPENSSL_SA_BLOCK_BITS - 1) \
-                                 / OPENSSL_SA_BLOCK_BITS)
+ */
+#define SA_BLOCK_MAX (1 << OPENSSL_SA_BLOCK_BITS)
+#define SA_BLOCK_MASK (SA_BLOCK_MAX - 1)
+#define SA_BLOCK_MAX_LEVELS (((int)sizeof(ossl_uintmax_t) * 8 \
+                                 + OPENSSL_SA_BLOCK_BITS - 1) \
+    / OPENSSL_SA_BLOCK_BITS)
 
 struct sparse_array_st {
     int levels;
@@ -63,7 +63,7 @@ OPENSSL_SA *ossl_sa_new(void)
 }
 
 static void sa_doall(const OPENSSL_SA *sa, void (*node)(void **),
-                     void (*leaf)(ossl_uintmax_t, void *, void *), void *arg)
+    void (*leaf)(ossl_uintmax_t, void *, void *), void *arg)
 {
     int i[SA_BLOCK_MAX_LEVELS];
     void *nodes[SA_BLOCK_MAX_LEVELS];
@@ -74,7 +74,7 @@ static void sa_doall(const OPENSSL_SA *sa, void (*node)(void **),
     nodes[0] = sa->nodes;
     while (l >= 0) {
         const int n = i[l];
-        void ** const p = nodes[l];
+        void **const p = nodes[l];
 
         if (n >= SA_BLOCK_MAX) {
             if (p != NULL && node != NULL)
@@ -141,8 +141,8 @@ 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 *arg)
+    void (*leaf)(ossl_uintmax_t, void *, void *),
+    void *arg)
 {
     if (sa != NULL)
         sa_doall(sa, NULL, leaf, arg);
@@ -165,7 +165,7 @@ void *ossl_sa_get(const OPENSSL_SA *sa, ossl_uintmax_t n)
         p = sa->nodes;
         for (level = sa->levels - 1; p != NULL && level > 0; level--)
             p = (void **)p[(n >> (OPENSSL_SA_BLOCK_BITS * level))
-                           & SA_BLOCK_MASK];
+                & SA_BLOCK_MASK];
         r = p == NULL ? NULL : p[n & SA_BLOCK_MASK];
     }
     return r;
@@ -189,7 +189,7 @@ int ossl_sa_set(OPENSSL_SA *sa, ossl_uintmax_t posn, void *val)
         if ((n >>= OPENSSL_SA_BLOCK_BITS) == 0)
             break;
 
-    for (;sa->levels < level; sa->levels++) {
+    for (; sa->levels < level; sa->levels++) {
         p = alloc_node();
         if (p == NULL)
             return 0;
diff --git a/crypto/srp/srp_lib.c b/crypto/srp/srp_lib.c
index df0d3720ff0dd..23fa0dba72e60 100644
--- a/crypto/srp/srp_lib.c
+++ b/crypto/srp/srp_lib.c
@@ -15,16 +15,16 @@
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #ifndef OPENSSL_NO_SRP
-# include "internal/cryptlib.h"
-# include <openssl/sha.h>
-# include <openssl/srp.h>
-# include <openssl/evp.h>
-# include "crypto/bn_srp.h"
+#include "internal/cryptlib.h"
+#include <openssl/sha.h>
+#include <openssl/srp.h>
+#include <openssl/evp.h>
+#include "crypto/bn_srp.h"
 
 /* calculate = SHA1(PAD(x) || PAD(y)) */
 
 static BIGNUM *srp_Calc_xy(const BIGNUM *x, const BIGNUM *y, const BIGNUM *N,
-                           OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     unsigned char digest[SHA_DIGEST_LENGTH];
     unsigned char *tmp = NULL;
@@ -46,22 +46,22 @@ static BIGNUM *srp_Calc_xy(const BIGNUM *x, const BIGNUM *y, const BIGNUM *N,
         || !EVP_Digest(tmp, numN * 2, digest, NULL, sha1, NULL))
         goto err;
     res = BN_bin2bn(digest, sizeof(digest), NULL);
- err:
+err:
     EVP_MD_free(sha1);
     OPENSSL_free(tmp);
     return res;
 }
 
 static BIGNUM *srp_Calc_k(const BIGNUM *N, const BIGNUM *g,
-                          OSSL_LIB_CTX *libctx,
-                          const char *propq)
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     /* k = SHA1(N | PAD(g)) -- tls-srp RFC 5054 */
     return srp_Calc_xy(N, g, N, libctx, propq);
 }
 
 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)
 {
     /* u = SHA1(PAD(A) || PAD(B) ) -- tls-srp RFC 5054 */
     return srp_Calc_xy(A, B, N, libctx, propq);
@@ -74,7 +74,7 @@ BIGNUM *SRP_Calc_u(const BIGNUM *A, const BIGNUM *B, const BIGNUM *N)
 }
 
 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)
 {
     BIGNUM *tmp = NULL, *S = NULL;
     BN_CTX *bn_ctx;
@@ -97,25 +97,23 @@ BIGNUM *SRP_Calc_server_key(const BIGNUM *A, const BIGNUM *v, const BIGNUM *u,
         BN_free(S);
         S = NULL;
     }
- err:
+err:
     BN_CTX_free(bn_ctx);
     BN_clear_free(tmp);
     return S;
 }
 
 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)
 {
     BIGNUM *kv = NULL, *gb = NULL;
     BIGNUM *B = NULL, *k = NULL;
     BN_CTX *bn_ctx;
 
-    if (b == NULL || N == NULL || g == NULL || v == NULL ||
-        (bn_ctx = BN_CTX_new_ex(libctx)) == NULL)
+    if (b == NULL || N == NULL || g == NULL || v == NULL || (bn_ctx = BN_CTX_new_ex(libctx)) == NULL)
         return NULL;
 
-    if ((kv = BN_new()) == NULL ||
-        (gb = BN_new()) == NULL || (B = BN_new()) == NULL)
+    if ((kv = BN_new()) == NULL || (gb = BN_new()) == NULL || (B = BN_new()) == NULL)
         goto err;
 
     /* B = g**b + k*v */
@@ -127,7 +125,7 @@ BIGNUM *SRP_Calc_B_ex(const BIGNUM *b, const BIGNUM *N, const BIGNUM *g,
         BN_free(B);
         B = NULL;
     }
- err:
+err:
     BN_CTX_free(bn_ctx);
     BN_clear_free(kv);
     BN_clear_free(gb);
@@ -136,13 +134,13 @@ BIGNUM *SRP_Calc_B_ex(const BIGNUM *b, const BIGNUM *N, const BIGNUM *g,
 }
 
 BIGNUM *SRP_Calc_B(const BIGNUM *b, const BIGNUM *N, const BIGNUM *g,
-                   const BIGNUM *v)
+    const BIGNUM *v)
 {
     return SRP_Calc_B_ex(b, N, g, v, NULL, NULL);
 }
 
 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)
 {
     unsigned char dig[SHA_DIGEST_LENGTH];
     EVP_MD_CTX *ctxt;
@@ -181,7 +179,7 @@ BIGNUM *SRP_Calc_x_ex(const BIGNUM *s, const char *user, const char *pass,
 
     res = BN_bin2bn(dig, sizeof(dig), NULL);
 
- err:
+err:
     EVP_MD_free(sha1);
     OPENSSL_free(cs);
     EVP_MD_CTX_free(ctxt);
@@ -210,8 +208,8 @@ BIGNUM *SRP_Calc_A(const BIGNUM *a, const BIGNUM *N, const BIGNUM *g)
 }
 
 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)
 {
     BIGNUM *tmp = NULL, *tmp2 = NULL, *tmp3 = NULL, *k = NULL, *K = NULL;
     BIGNUM *xtmp = NULL;
@@ -221,10 +219,7 @@ BIGNUM *SRP_Calc_client_key_ex(const BIGNUM *N, const BIGNUM *B, const BIGNUM *g
         || a == NULL || (bn_ctx = BN_CTX_new_ex(libctx)) == NULL)
         return NULL;
 
-    if ((tmp = BN_new()) == NULL ||
-        (tmp2 = BN_new()) == NULL ||
-        (tmp3 = BN_new()) == NULL ||
-        (xtmp = BN_new()) == NULL)
+    if ((tmp = BN_new()) == NULL || (tmp2 = BN_new()) == NULL || (tmp3 = BN_new()) == NULL || (xtmp = BN_new()) == NULL)
         goto err;
 
     BN_with_flags(xtmp, x, BN_FLG_CONSTTIME);
@@ -247,7 +242,7 @@ BIGNUM *SRP_Calc_client_key_ex(const BIGNUM *N, const BIGNUM *B, const BIGNUM *g
         K = NULL;
     }
 
- err:
+err:
     BN_CTX_free(bn_ctx);
     BN_free(xtmp);
     BN_clear_free(tmp);
@@ -258,7 +253,7 @@ BIGNUM *SRP_Calc_client_key_ex(const BIGNUM *N, const BIGNUM *B, const BIGNUM *g
 }
 
 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)
 {
     return SRP_Calc_client_key_ex(N, B, g, x, a, u, NULL, NULL);
 }
@@ -278,7 +273,7 @@ int SRP_Verify_B_mod_N(const BIGNUM *B, const BIGNUM *N)
     if (!BN_nnmod(r, B, N, bn_ctx))
         goto err;
     ret = !BN_is_zero(r);
- err:
+err:
     BN_CTX_free(bn_ctx);
     BN_free(r);
     return ret;
@@ -291,16 +286,16 @@ int SRP_Verify_A_mod_N(const BIGNUM *A, const BIGNUM *N)
 }
 
 static SRP_gN knowngN[] = {
-    {"8192", &ossl_bn_generator_19, &ossl_bn_group_8192},
-    {"6144", &ossl_bn_generator_5, &ossl_bn_group_6144},
-    {"4096", &ossl_bn_generator_5, &ossl_bn_group_4096},
-    {"3072", &ossl_bn_generator_5, &ossl_bn_group_3072},
-    {"2048", &ossl_bn_generator_2, &ossl_bn_group_2048},
-    {"1536", &ossl_bn_generator_2, &ossl_bn_group_1536},
-    {"1024", &ossl_bn_generator_2, &ossl_bn_group_1024},
+    { "8192", &ossl_bn_generator_19, &ossl_bn_group_8192 },
+    { "6144", &ossl_bn_generator_5, &ossl_bn_group_6144 },
+    { "4096", &ossl_bn_generator_5, &ossl_bn_group_4096 },
+    { "3072", &ossl_bn_generator_5, &ossl_bn_group_3072 },
+    { "2048", &ossl_bn_generator_2, &ossl_bn_group_2048 },
+    { "1536", &ossl_bn_generator_2, &ossl_bn_group_1536 },
+    { "1024", &ossl_bn_generator_2, &ossl_bn_group_1024 },
 };
 
-# define KNOWN_GN_NUMBER sizeof(knowngN) / sizeof(SRP_gN)
+#define KNOWN_GN_NUMBER sizeof(knowngN) / sizeof(SRP_gN)
 
 /*
  * Check if G and N are known parameters. The values have been generated
diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 5f626d70555ca..be87473bfc5d8 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -15,18 +15,18 @@
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #ifndef OPENSSL_NO_SRP
-# include "internal/cryptlib.h"
-# include "crypto/evp.h"
-# include <openssl/sha.h>
-# include <openssl/srp.h>
-# include <openssl/evp.h>
-# include <openssl/buffer.h>
-# include <openssl/rand.h>
-# include <openssl/txt_db.h>
-# include <openssl/err.h>
-
-# define SRP_RANDOM_SALT_LEN 20
-# define MAX_LEN 2500
+#include "internal/cryptlib.h"
+#include "crypto/evp.h"
+#include <openssl/sha.h>
+#include <openssl/srp.h>
+#include <openssl/evp.h>
+#include <openssl/buffer.h>
+#include <openssl/rand.h>
+#include <openssl/txt_db.h>
+#include <openssl/err.h>
+
+#define SRP_RANDOM_SALT_LEN 20
+#define MAX_LEN 2500
 
 /*
  * Note that SRP uses its own variant of base 64 encoding. A different base64
@@ -84,7 +84,7 @@ static int t_fromb64(unsigned char *a, size_t alen, const char *src)
 
     /* Add any encoded padding that is required */
     if (padsize != 0
-            && EVP_DecodeUpdate(ctx, a, &outl, pad, padsize) < 0) {
+        && EVP_DecodeUpdate(ctx, a, &outl, pad, padsize) < 0) {
         outl = -1;
         goto err;
     }
@@ -120,7 +120,7 @@ static int t_fromb64(unsigned char *a, size_t alen, const char *src)
         outl -= padsize;
     }
 
- err:
+err:
     EVP_ENCODE_CTX_free(ctx);
 
     return outl;
@@ -134,15 +134,14 @@ static int t_tob64(char *dst, const unsigned char *src, int size)
 {
     EVP_ENCODE_CTX *ctx = EVP_ENCODE_CTX_new();
     int outl = 0, outl2 = 0;
-    unsigned char pad[2] = {0, 0};
+    unsigned char pad[2] = { 0, 0 };
     size_t leadz = 0;
 
     if (ctx == NULL)
         return 0;
 
     EVP_EncodeInit(ctx);
-    evp_encode_ctx_set_flags(ctx, EVP_ENCODE_CTX_NO_NEWLINES
-                                  | EVP_ENCODE_CTX_USE_SRP_ALPHABET);
+    evp_encode_ctx_set_flags(ctx, EVP_ENCODE_CTX_NO_NEWLINES | EVP_ENCODE_CTX_USE_SRP_ALPHABET);
 
     /*
      * We pad at the front with zero bytes until the length is a multiple of 3
@@ -151,14 +150,14 @@ static int t_tob64(char *dst, const unsigned char *src, int size)
      */
     leadz = 3 - (size % 3);
     if (leadz != 3
-            && !EVP_EncodeUpdate(ctx, (unsigned char *)dst, &outl, pad,
-                                 leadz)) {
+        && !EVP_EncodeUpdate(ctx, (unsigned char *)dst, &outl, pad,
+            leadz)) {
         EVP_ENCODE_CTX_free(ctx);
         return 0;
     }
 
     if (!EVP_EncodeUpdate(ctx, (unsigned char *)dst + outl, &outl2, src,
-                          size)) {
+            size)) {
         EVP_ENCODE_CTX_free(ctx);
         return 0;
     }
@@ -203,14 +202,14 @@ SRP_user_pwd *SRP_user_pwd_new(void)
 }
 
 void SRP_user_pwd_set_gN(SRP_user_pwd *vinfo, const BIGNUM *g,
-                         const BIGNUM *N)
+    const BIGNUM *N)
 {
     vinfo->N = N;
     vinfo->g = g;
 }
 
 int SRP_user_pwd_set1_ids(SRP_user_pwd *vinfo, const char *id,
-                          const char *info)
+    const char *info)
 {
     OPENSSL_free(vinfo->id);
     OPENSSL_free(vinfo->info);
@@ -222,7 +221,7 @@ int SRP_user_pwd_set1_ids(SRP_user_pwd *vinfo, const char *id,
 }
 
 static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s,
-                               const char *v)
+    const char *v)
 {
     unsigned char tmp[MAX_LEN];
     int len;
@@ -242,7 +241,7 @@ static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s,
     if (vinfo->s == NULL)
         goto err;
     return 1;
- err:
+err:
     BN_free(vinfo->v);
     vinfo->v = NULL;
     return 0;
@@ -269,8 +268,8 @@ static SRP_user_pwd *srp_user_pwd_dup(SRP_user_pwd *src)
     SRP_user_pwd_set_gN(ret, src->g, src->N);
     if (!SRP_user_pwd_set1_ids(ret, src->id, src->info)
         || !SRP_user_pwd_set0_sv(ret, BN_dup(src->s), BN_dup(src->v))) {
-            SRP_user_pwd_free(ret);
-            return NULL;
+        SRP_user_pwd_free(ret);
+        return NULL;
     }
     return ret;
 }
@@ -329,7 +328,7 @@ static SRP_gN_cache *SRP_gN_new_init(const char *ch)
         return newgN;
 
     OPENSSL_free(newgN->b64_bn);
- err:
+err:
     OPENSSL_free(newgN);
     return NULL;
 }
@@ -371,7 +370,7 @@ static BIGNUM *SRP_gN_place_bn(STACK_OF(SRP_gN_cache) *gN_cache, char *ch)
         if (strcmp(cache->b64_bn, ch) == 0)
             return cache->bn;
     }
-    {                           /* it is the first time that we find it */
+    { /* it is the first time that we find it */
         SRP_gN_cache *newgN = SRP_gN_new_init(ch);
         if (newgN) {
             if (sk_SRP_gN_cache_insert(gN_cache, newgN, 0) > 0)
@@ -441,9 +440,9 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file)
 
             if ((gN->id = OPENSSL_strdup(pp[DB_srpid])) == NULL
                 || (gN->N = SRP_gN_place_bn(vb->gN_cache, pp[DB_srpverifier]))
-                        == NULL
+                    == NULL
                 || (gN->g = SRP_gN_place_bn(vb->gN_cache, pp[DB_srpsalt]))
-                        == NULL
+                    == NULL
                 || sk_SRP_gN_insert(SRP_gN_tab, gN, 0) == 0)
                 goto err;
 
@@ -462,13 +461,11 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file)
                     goto err;
 
                 SRP_user_pwd_set_gN(user_pwd, lgN->g, lgN->N);
-                if (!SRP_user_pwd_set1_ids
-                    (user_pwd, pp[DB_srpid], pp[DB_srpinfo]))
+                if (!SRP_user_pwd_set1_ids(user_pwd, pp[DB_srpid], pp[DB_srpinfo]))
                     goto err;
 
                 error_code = SRP_ERR_VBASE_BN_LIB;
-                if (!SRP_user_pwd_set_sv
-                    (user_pwd, pp[DB_srpsalt], pp[DB_srpverifier]))
+                if (!SRP_user_pwd_set_sv(user_pwd, pp[DB_srpsalt], pp[DB_srpverifier]))
                     goto err;
 
                 if (sk_SRP_user_pwd_insert(vb->users_pwd, user_pwd, 0) == 0)
@@ -491,7 +488,7 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file)
     }
     error_code = SRP_NO_ERROR;
 
- err:
+err:
     /*
      * there may be still some leaks to fix, if this fails, the application
      * terminates most likely
@@ -510,7 +507,6 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file)
     sk_SRP_gN_free(SRP_gN_tab);
 
     return error_code;
-
 }
 
 static SRP_user_pwd *find_user(SRP_VBASE *vb, char *username)
@@ -537,7 +533,7 @@ int SRP_VBASE_add0_user(SRP_VBASE *vb, SRP_user_pwd *user_pwd)
     return 1;
 }
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 /*
  * DEPRECATED: use SRP_VBASE_get1_by_user instead.
  * This method ignores the configured seed and fails for an unknown user.
@@ -548,7 +544,7 @@ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username)
 {
     return find_user(vb, username);
 }
-# endif
+#endif
 
 /*
  * Ownership of the returned pointer is released to the caller.
@@ -568,11 +564,10 @@ SRP_user_pwd *SRP_VBASE_get1_by_user(SRP_VBASE *vb, char *username)
     if ((user = find_user(vb, username)) != NULL)
         return srp_user_pwd_dup(user);
 
-    if ((vb->seed_key == NULL) ||
-        (vb->default_g == NULL) || (vb->default_N == NULL))
+    if ((vb->seed_key == NULL) || (vb->default_g == NULL) || (vb->default_N == NULL))
         return NULL;
 
-/* if the user is unknown we set parameters as well if we have a seed_key */
+    /* if the user is unknown we set parameters as well if we have a seed_key */
 
     if ((user = SRP_user_pwd_new()) == NULL)
         return NULL;
@@ -599,11 +594,11 @@ SRP_user_pwd *SRP_VBASE_get1_by_user(SRP_VBASE *vb, char *username)
     EVP_MD_free(md);
     md = NULL;
     if (SRP_user_pwd_set0_sv(user,
-                             BN_bin2bn(digs, SHA_DIGEST_LENGTH, NULL),
-                             BN_bin2bn(digv, SHA_DIGEST_LENGTH, NULL)))
+            BN_bin2bn(digs, SHA_DIGEST_LENGTH, NULL),
+            BN_bin2bn(digv, SHA_DIGEST_LENGTH, NULL)))
         return user;
 
- err:
+err:
     EVP_MD_free(md);
     EVP_MD_CTX_free(ctxt);
     SRP_user_pwd_free(user);
@@ -614,8 +609,8 @@ SRP_user_pwd *SRP_VBASE_get1_by_user(SRP_VBASE *vb, char *username)
  * create a verifier (*salt,*verifier,g and N are in base64)
  */
 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)
 {
     int len;
     char *result = NULL, *vf = NULL;
@@ -626,8 +621,7 @@ char *SRP_create_verifier_ex(const char *user, const char *pass, char **salt,
     char *defgNid = NULL;
     int vfsize = 0;
 
-    if ((user == NULL) ||
-        (pass == NULL) || (salt == NULL) || (verifier == NULL))
+    if ((user == NULL) || (pass == NULL) || (salt == NULL) || (verifier == NULL))
         goto err;
 
     if (N) {
@@ -667,7 +661,7 @@ char *SRP_create_verifier_ex(const char *user, const char *pass, char **salt,
         goto err;
 
     if (!SRP_create_verifier_BN_ex(user, pass, &s, &v, N_bn, g_bn, libctx,
-                                   propq))
+            propq))
         goto err;
 
     if (BN_bn2bin(v, tmp) < 0)
@@ -695,7 +689,7 @@ char *SRP_create_verifier_ex(const char *user, const char *pass, char **salt,
     vf = NULL;
     result = defgNid;
 
- err:
+err:
     BN_free(N_bn_alloc);
     BN_free(g_bn_alloc);
     OPENSSL_clear_free(vf, vfsize);
@@ -705,7 +699,7 @@ char *SRP_create_verifier_ex(const char *user, const char *pass, char **salt,
 }
 
 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)
 {
     return SRP_create_verifier_ex(user, pass, salt, verifier, N, g, NULL, NULL);
 }
@@ -720,9 +714,9 @@ char *SRP_create_verifier(const char *user, const char *pass, char **salt,
  * BIGNUMS.
  */
 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)
 {
     int result = 0;
     BIGNUM *x = NULL;
@@ -730,10 +724,7 @@ int SRP_create_verifier_BN_ex(const char *user, const char *pass, BIGNUM **salt,
     unsigned char tmp2[MAX_LEN];
     BIGNUM *salttmp = NULL, *verif;
 
-    if ((user == NULL) ||
-        (pass == NULL) ||
-        (salt == NULL) ||
-        (verifier == NULL) || (N == NULL) || (g == NULL) || (bn_ctx == NULL))
+    if ((user == NULL) || (pass == NULL) || (salt == NULL) || (verifier == NULL) || (N == NULL) || (g == NULL) || (bn_ctx == NULL))
         goto err;
 
     if (*salt == NULL) {
@@ -764,7 +755,7 @@ int SRP_create_verifier_BN_ex(const char *user, const char *pass, BIGNUM **salt,
     *salt = salttmp;
     *verifier = verif;
 
- err:
+err:
     if (salt != NULL && *salt != salttmp)
         BN_clear_free(salttmp);
     BN_clear_free(x);
@@ -773,10 +764,10 @@ int SRP_create_verifier_BN_ex(const char *user, const char *pass, BIGNUM **salt,
 }
 
 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)
 {
     return SRP_create_verifier_BN_ex(user, pass, salt, verifier, N, g, NULL,
-                                     NULL);
+        NULL);
 }
 #endif
diff --git a/crypto/ssl_err.c b/crypto/ssl_err.c
index b791daf5489a9..6b88675200a9c 100644
--- a/crypto/ssl_err.c
+++ b/crypto/ssl_err.c
@@ -15,612 +15,612 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA SSL_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY),
-     "application data after close notify"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_APP_DATA_IN_HANDSHAKE),
-     "app data in handshake"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT),
-     "attempt to reuse session in different context"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_AT_LEAST_TLS_1_2_NEEDED_IN_SUITEB_MODE),
-     "at least (D)TLS 1.2 needed in Suite B mode"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_CERTIFICATE), "bad certificate"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_CHANGE_CIPHER_SPEC),
-     "bad change cipher spec"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_CIPHER), "bad cipher"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_COMPRESSION_ALGORITHM),
-     "bad compression algorithm"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DATA), "bad data"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DATA_RETURNED_BY_CALLBACK),
-     "bad data returned by callback"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DECOMPRESSION), "bad decompression"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DH_VALUE), "bad dh value"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DIGEST_LENGTH), "bad digest length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_EARLY_DATA), "bad early data"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_ECC_CERT), "bad ecc cert"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_ECPOINT), "bad ecpoint"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_EXTENSION), "bad extension"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HANDSHAKE_LENGTH),
-     "bad handshake length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HANDSHAKE_STATE),
-     "bad handshake state"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HELLO_REQUEST), "bad hello request"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HRR_VERSION), "bad hrr version"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_KEY_SHARE), "bad key share"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_KEY_UPDATE), "bad key update"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_LEGACY_VERSION), "bad legacy version"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_LENGTH), "bad length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PACKET), "bad packet"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PACKET_LENGTH), "bad packet length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PROTOCOL_VERSION_NUMBER),
-     "bad protocol version number"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PSK), "bad psk"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PSK_IDENTITY), "bad psk identity"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_RECORD_TYPE), "bad record type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_RSA_ENCRYPT), "bad rsa encrypt"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SIGNATURE), "bad signature"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRP_A_LENGTH), "bad srp a length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRP_PARAMETERS), "bad srp parameters"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRTP_MKI_VALUE), "bad srtp mki value"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST),
-     "bad srtp protection profile list"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SSL_FILETYPE), "bad ssl filetype"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_VALUE), "bad value"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_WRITE_RETRY), "bad write retry"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BINDER_DOES_NOT_VERIFY),
-     "binder does not verify"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BIO_NOT_SET), "bio not set"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BLOCK_CIPHER_PAD_IS_WRONG),
-     "block cipher pad is wrong"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BN_LIB), "bn lib"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CALLBACK_FAILED), "callback failed"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CANNOT_CHANGE_CIPHER),
-     "cannot change cipher"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CANNOT_GET_GROUP_NAME),
-     "cannot get group name"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CA_DN_LENGTH_MISMATCH),
-     "ca dn length mismatch"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CA_KEY_TOO_SMALL), "ca key too small"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CA_MD_TOO_WEAK), "ca md too weak"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CCS_RECEIVED_EARLY), "ccs received early"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CERTIFICATE_VERIFY_FAILED),
-     "certificate verify failed"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CERT_CB_ERROR), "cert cb error"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CERT_LENGTH_MISMATCH),
-     "cert length mismatch"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CIPHERSUITE_DIGEST_HAS_CHANGED),
-     "ciphersuite digest has changed"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CIPHER_CODE_WRONG_LENGTH),
-     "cipher code wrong length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CLIENTHELLO_TLSEXT), "clienthello tlsext"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSED_LENGTH_TOO_LONG),
-     "compressed length too long"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_DISABLED),
-     "compression disabled"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_FAILURE),
-     "compression failure"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE),
-     "compression id not within private range"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_LIBRARY_ERROR),
-     "compression library error"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CONNECTION_TYPE_NOT_SET),
-     "connection type not set"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CONN_USE_ONLY), "conn use only"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CONTEXT_NOT_DANE_ENABLED),
-     "context not dane enabled"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COOKIE_GEN_CALLBACK_FAILURE),
-     "cookie gen callback failure"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COOKIE_MISMATCH), "cookie mismatch"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COPY_PARAMETERS_FAILED),
-     "copy parameters failed"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CUSTOM_EXT_HANDLER_ALREADY_INSTALLED),
-     "custom ext handler already installed"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_ALREADY_ENABLED),
-     "dane already enabled"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_CANNOT_OVERRIDE_MTYPE_FULL),
-     "dane cannot override mtype full"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_NOT_ENABLED), "dane not enabled"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_CERTIFICATE),
-     "dane tlsa bad certificate"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_CERTIFICATE_USAGE),
-     "dane tlsa bad certificate usage"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_DATA_LENGTH),
-     "dane tlsa bad data length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_DIGEST_LENGTH),
-     "dane tlsa bad digest length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_MATCHING_TYPE),
-     "dane tlsa bad matching type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_PUBLIC_KEY),
-     "dane tlsa bad public key"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_SELECTOR),
-     "dane tlsa bad selector"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_NULL_DATA),
-     "dane tlsa null data"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DATA_BETWEEN_CCS_AND_FINISHED),
-     "data between ccs and finished"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DATA_LENGTH_TOO_LONG),
-     "data length too long"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DECRYPTION_FAILED), "decryption failed"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC),
-     "decryption failed or bad record mac"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DH_KEY_TOO_SMALL), "dh key too small"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG),
-     "dh public value length is wrong"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DIGEST_CHECK_FAILED),
-     "digest check failed"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DOMAIN_USE_ONLY), "domain use only"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DTLS_MESSAGE_TOO_BIG),
-     "dtls message too big"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DUPLICATE_COMPRESSION_ID),
-     "duplicate compression id"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ECC_CERT_NOT_FOR_SIGNING),
-     "ecc cert not for signing"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ECDH_REQUIRED_FOR_SUITEB_MODE),
-     "ecdh required for suiteb mode"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EE_KEY_TOO_SMALL), "ee key too small"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EMPTY_RAW_PUBLIC_KEY),
-     "empty raw public key"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST),
-     "empty srtp protection profile list"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ENCRYPTED_LENGTH_TOO_LONG),
-     "encrypted length too long"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST),
-     "error in received cipher list"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ERROR_IN_SYSTEM_DEFAULT_CONFIG),
-     "error in system default config"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN),
-     "error setting tlsa base domain"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXCEEDS_MAX_FRAGMENT_SIZE),
-     "exceeds max fragment size"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXCESSIVE_MESSAGE_SIZE),
-     "excessive message size"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXTENSION_NOT_RECEIVED),
-     "extension not received"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXTRA_DATA_IN_MESSAGE),
-     "extra data in message"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXT_LENGTH_MISMATCH),
-     "ext length mismatch"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FAILED_TO_GET_PARAMETER),
-     "failed to get parameter"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FAILED_TO_INIT_ASYNC),
-     "failed to init async"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE),
-     "feature negotiation not complete"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FEATURE_NOT_RENEGOTIABLE),
-     "feature not renegotiable"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FRAGMENTED_CLIENT_HELLO),
-     "fragmented client hello"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_GOT_A_FIN_BEFORE_A_CCS),
-     "got a fin before a ccs"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_HTTPS_PROXY_REQUEST),
-     "https proxy request"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_HTTP_REQUEST), "http request"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ILLEGAL_POINT_COMPRESSION),
-     "illegal point compression"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ILLEGAL_SUITEB_DIGEST),
-     "illegal Suite B digest"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INAPPROPRIATE_FALLBACK),
-     "inappropriate fallback"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_COMPRESSION),
-     "inconsistent compression"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EARLY_DATA_ALPN),
-     "inconsistent early data alpn"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EARLY_DATA_SNI),
-     "inconsistent early data sni"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EXTMS), "inconsistent extms"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INSUFFICIENT_SECURITY),
-     "insufficient security"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_ALERT), "invalid alert"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CCS_MESSAGE),
-     "invalid ccs message"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CERTIFICATE_OR_ALG),
-     "invalid certificate or alg"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_COMMAND), "invalid command"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_COMPRESSION_ALGORITHM),
-     "invalid compression algorithm"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CONFIG), "invalid config"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CONFIGURATION_NAME),
-     "invalid configuration name"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CONTEXT), "invalid context"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CT_VALIDATION_TYPE),
-     "invalid ct validation type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_KEY_UPDATE_TYPE),
-     "invalid key update type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_MAX_EARLY_DATA),
-     "invalid max early data"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_NULL_CMD_NAME),
-     "invalid null cmd name"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_RAW_PUBLIC_KEY),
-     "invalid raw public key"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_RECORD), "invalid record"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SEQUENCE_NUMBER),
-     "invalid sequence number"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SERVERINFO_DATA),
-     "invalid serverinfo data"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SESSION_ID), "invalid session id"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SRP_USERNAME),
-     "invalid srp username"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_STATUS_RESPONSE),
-     "invalid status response"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_TICKET_KEYS_LENGTH),
-     "invalid ticket keys length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED),
-     "legacy sigalg disallowed or unsupported"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LENGTH_MISMATCH), "length mismatch"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LENGTH_TOO_LONG), "length too long"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LENGTH_TOO_SHORT), "length too short"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LIBRARY_BUG), "library bug"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LIBRARY_HAS_NO_CIPHERS),
-     "library has no ciphers"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LISTENER_USE_ONLY), "listener use only"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MAXIMUM_ENCRYPTED_PKTS_REACHED),
-     "maximum encrypted pkts reached"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_DSA_SIGNING_CERT),
-     "missing dsa signing cert"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_ECDSA_SIGNING_CERT),
-     "missing ecdsa signing cert"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_FATAL), "missing fatal"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_PARAMETERS), "missing parameters"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_PSK_KEX_MODES_EXTENSION),
-     "missing psk kex modes extension"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_QUIC_TLS_FUNCTIONS),
-     "missing quic tls functions"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_CERTIFICATE),
-     "missing rsa certificate"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_ENCRYPTING_CERT),
-     "missing rsa encrypting cert"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_SIGNING_CERT),
-     "missing rsa signing cert"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SIGALGS_EXTENSION),
-     "missing sigalgs extension"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SIGNING_CERT),
-     "missing signing cert"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SRP_PARAM),
-     "can't find SRP server param"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SUPPORTED_GROUPS_EXTENSION),
-     "missing supported groups extension"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SUPPORTED_VERSIONS_EXTENSION),
-     "missing supported versions extension"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_TMP_DH_KEY), "missing tmp dh key"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_TMP_ECDH_KEY),
-     "missing tmp ecdh key"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA),
-     "mixed handshake and non handshake data"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_ON_RECORD_BOUNDARY),
-     "not on record boundary"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_REPLACING_CERTIFICATE),
-     "not replacing certificate"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_SERVER), "not server"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_APPLICATION_PROTOCOL),
-     "no application protocol"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CERTIFICATES_RETURNED),
-     "no certificates returned"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CERTIFICATE_ASSIGNED),
-     "no certificate assigned"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CERTIFICATE_SET), "no certificate set"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CHANGE_FOLLOWING_HRR),
-     "no change following hrr"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CIPHERS_AVAILABLE),
-     "no ciphers available"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CIPHERS_SPECIFIED),
-     "no ciphers specified"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CIPHER_MATCH), "no cipher match"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CLIENT_CERT_METHOD),
-     "no client cert method"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_COMPRESSION_SPECIFIED),
-     "no compression specified"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_COOKIE_CALLBACK_SET),
-     "no cookie callback set"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),
-     "Peer haven't sent GOST certificate, required for selected ciphersuite"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_METHOD_SPECIFIED),
-     "no method specified"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_PEM_EXTENSIONS), "no pem extensions"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_PRIVATE_KEY_ASSIGNED),
-     "no private key assigned"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_PROTOCOLS_AVAILABLE),
-     "no protocols available"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_RENEGOTIATION), "no renegotiation"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_REQUIRED_DIGEST), "no required digest"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SHARED_CIPHER), "no shared cipher"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SHARED_GROUPS), "no shared groups"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS),
-     "no shared signature algorithms"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SRTP_PROFILES), "no srtp profiles"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_STREAM), "no stream"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_DIGEST_ALGORITHM),
-     "no suitable digest algorithm"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_GROUPS), "no suitable groups"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_KEY_SHARE),
-     "no suitable key share"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_RECORD_LAYER),
-     "no suitable record layer"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM),
-     "no suitable signature algorithm"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_VALID_SCTS), "no valid scts"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_VERIFY_COOKIE_CALLBACK),
-     "no verify cookie callback"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NULL_SSL_CTX), "null ssl ctx"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NULL_SSL_METHOD_PASSED),
-     "null ssl method passed"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OCSP_CALLBACK_FAILURE),
-     "ocsp callback failure"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED),
-     "old session cipher not returned"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED),
-     "old session compression algorithm not returned"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OVERFLOW_ERROR), "overflow error"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PACKET_LENGTH_TOO_LONG),
-     "packet length too long"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PARSE_TLSEXT), "parse tlsext"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PATH_TOO_LONG), "path too long"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE),
-     "peer did not return a certificate"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PEM_NAME_BAD_PREFIX),
-     "pem name bad prefix"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PEM_NAME_TOO_SHORT), "pem name too short"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PIPELINE_FAILURE), "pipeline failure"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_POLL_REQUEST_NOT_SUPPORTED),
-     "poll request not supported"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR),
-     "post handshake auth encoding err"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PRIVATE_KEY_MISMATCH),
-     "private key mismatch"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PROTOCOL_IS_SHUTDOWN),
-     "protocol is shutdown"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PSK_IDENTITY_NOT_FOUND),
-     "psk identity not found"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PSK_NO_CLIENT_CB), "psk no client cb"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PSK_NO_SERVER_CB), "psk no server cb"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_QUIC_HANDSHAKE_LAYER_ERROR),
-     "quic handshake layer error"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_QUIC_NETWORK_ERROR), "quic network error"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_QUIC_PROTOCOL_ERROR),
-     "quic protocol error"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_READ_BIO_NOT_SET), "read bio not set"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_READ_TIMEOUT_EXPIRED),
-     "read timeout expired"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORDS_NOT_RELEASED),
-     "records not released"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORD_LAYER_FAILURE),
-     "record layer failure"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORD_LENGTH_MISMATCH),
-     "record length mismatch"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORD_TOO_SMALL), "record too small"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REMOTE_PEER_ADDRESS_NOT_SET),
-     "remote peer address not set"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RENEGOTIATE_EXT_TOO_LONG),
-     "renegotiate ext too long"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RENEGOTIATION_ENCODING_ERR),
-     "renegotiation encoding err"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RENEGOTIATION_MISMATCH),
-     "renegotiation mismatch"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUEST_PENDING), "request pending"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUEST_SENT), "request sent"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUIRED_CIPHER_MISSING),
-     "required cipher missing"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING),
-     "required compression algorithm missing"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING),
-     "scsv received when renegotiating"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SCT_VERIFICATION_FAILED),
-     "sct verification failed"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SEQUENCE_CTR_WRAPPED),
-     "sequence ctr wrapped"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SERVERHELLO_TLSEXT), "serverhello tlsext"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED),
-     "session id context uninitialized"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHUTDOWN_WHILE_IN_INIT),
-     "shutdown while in init"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SIGNATURE_ALGORITHMS_ERROR),
-     "signature algorithms error"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE),
-     "signature for non signing certificate"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRP_A_CALC), "error with the srp params"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES),
-     "srtp could not allocate profiles"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG),
-     "srtp protection profile list too long"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE),
-     "srtp unknown protection profile"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH),
-     "ssl3 ext invalid max fragment length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_EXT_INVALID_SERVERNAME),
-     "ssl3 ext invalid servername"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE),
-     "ssl3 ext invalid servername type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_SESSION_ID_TOO_LONG),
-     "ssl3 session id too long"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_BAD_CERTIFICATE),
-     "ssl/tls alert bad certificate"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_BAD_RECORD_MAC),
-     "ssl/tls alert bad record mac"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED),
-     "ssl/tls alert certificate expired"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED),
-     "ssl/tls alert certificate revoked"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN),
-     "ssl/tls alert certificate unknown"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE),
-     "ssl/tls alert decompression failure"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE),
-     "ssl/tls alert handshake failure"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER),
-     "ssl/tls alert illegal parameter"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_NO_CERTIFICATE),
-     "ssl/tls alert no certificate"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE),
-     "ssl/tls alert unexpected message"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE),
-     "ssl/tls alert unsupported certificate"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_COMMAND_SECTION_EMPTY),
-     "ssl command section empty"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_COMMAND_SECTION_NOT_FOUND),
-     "ssl command section not found"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION),
-     "ssl ctx has no default ssl version"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_HANDSHAKE_FAILURE),
-     "ssl handshake failure"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS),
-     "ssl library has no ciphers"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_NEGATIVE_LENGTH),
-     "ssl negative length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SECTION_EMPTY), "ssl section empty"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SECTION_NOT_FOUND),
-     "ssl section not found"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_CALLBACK_FAILED),
-     "ssl session id callback failed"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_CONFLICT),
-     "ssl session id conflict"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG),
-     "ssl session id context too long"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH),
-     "ssl session id has bad length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_TOO_LONG),
-     "ssl session id too long"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_VERSION_MISMATCH),
-     "ssl session version mismatch"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STILL_IN_INIT), "still in init"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_COUNT_LIMITED),
-     "stream count limited"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_FINISHED), "stream finished"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_RECV_ONLY), "stream recv only"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_RESET), "stream reset"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_SEND_ONLY), "stream send only"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED),
-     "tlsv13 alert certificate required"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV13_ALERT_MISSING_EXTENSION),
-     "tlsv13 alert missing extension"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_ACCESS_DENIED),
-     "tlsv1 alert access denied"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_DECODE_ERROR),
-     "tlsv1 alert decode error"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_DECRYPTION_FAILED),
-     "tlsv1 alert decryption failed"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_DECRYPT_ERROR),
-     "tlsv1 alert decrypt error"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION),
-     "tlsv1 alert export restriction"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK),
-     "tlsv1 alert inappropriate fallback"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY),
-     "tlsv1 alert insufficient security"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_INTERNAL_ERROR),
-     "tlsv1 alert internal error"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL),
-     "tlsv1 alert no application protocol"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_NO_RENEGOTIATION),
-     "tlsv1 alert no renegotiation"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_PROTOCOL_VERSION),
-     "tlsv1 alert protocol version"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_RECORD_OVERFLOW),
-     "tlsv1 alert record overflow"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_UNKNOWN_CA),
-     "tlsv1 alert unknown ca"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY),
-     "tlsv1 alert unknown psk identity"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_USER_CANCELLED),
-     "tlsv1 alert user cancelled"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE),
-     "tlsv1 bad certificate hash value"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE),
-     "tlsv1 bad certificate status response"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE),
-     "tlsv1 certificate unobtainable"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_UNRECOGNIZED_NAME),
-     "tlsv1 unrecognized name"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_UNSUPPORTED_EXTENSION),
-     "tlsv1 unsupported extension"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL),
-     "tls illegal exporter label"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST),
-     "tls invalid ecpointformat list"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TOO_MANY_KEY_UPDATES),
-     "too many key updates"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TOO_MANY_WARN_ALERTS),
-     "too many warn alerts"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TOO_MUCH_EARLY_DATA),
-     "too much early data"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS),
-     "unable to find ecdh parameters"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS),
-     "unable to find public key parameters"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES),
-     "unable to load ssl3 md5 routines"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES),
-     "unable to load ssl3 sha1 routines"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_CCS_MESSAGE),
-     "unexpected ccs message"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_END_OF_EARLY_DATA),
-     "unexpected end of early data"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_EOF_WHILE_READING),
-     "unexpected eof while reading"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_MESSAGE), "unexpected message"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_RECORD), "unexpected record"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNINITIALIZED), "uninitialized"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_ALERT_TYPE), "unknown alert type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CERTIFICATE_TYPE),
-     "unknown certificate type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CIPHER_RETURNED),
-     "unknown cipher returned"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CIPHER_TYPE),
-     "unknown cipher type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CMD_NAME), "unknown cmd name"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_COMMAND), "unknown command"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_DIGEST), "unknown digest"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE),
-     "unknown key exchange type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_MANDATORY_PARAMETER),
-     "unknown mandatory parameter"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_PKEY_TYPE), "unknown pkey type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_PROTOCOL), "unknown protocol"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_SSL_VERSION),
-     "unknown ssl version"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_STATE), "unknown state"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED),
-     "unsafe legacy renegotiation disabled"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSOLICITED_EXTENSION),
-     "unsolicited extension"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM),
-     "unsupported compression algorithm"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_CONFIG_VALUE),
-     "unsupported config value"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS),
-     "unsupported config value class"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_CONFIG_VALUE_OP),
-     "unsupported config value op"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_ELLIPTIC_CURVE),
-     "unsupported elliptic curve"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_PROTOCOL),
-     "unsupported protocol"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_SSL_VERSION),
-     "unsupported ssl version"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_STATUS_TYPE),
-     "unsupported status type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_WRITE_FLAG),
-     "unsupported write flag"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_USE_SRTP_NOT_NEGOTIATED),
-     "use srtp not negotiated"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_VERSION_TOO_HIGH), "version too high"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_VERSION_TOO_LOW), "version too low"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CERTIFICATE_TYPE),
-     "wrong certificate type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CIPHER_RETURNED),
-     "wrong cipher returned"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CURVE), "wrong curve"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_RPK_TYPE), "wrong rpk type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_LENGTH),
-     "wrong signature length"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_SIZE),
-     "wrong signature size"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_TYPE),
-     "wrong signature type"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SSL_VERSION), "wrong ssl version"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_VERSION_NUMBER),
-     "wrong version number"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_X509_LIB), "x509 lib"},
-    {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_X509_VERIFICATION_SETUP_PROBLEMS),
-     "x509 verification setup problems"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY),
+        "application data after close notify" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_APP_DATA_IN_HANDSHAKE),
+        "app data in handshake" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT),
+        "attempt to reuse session in different context" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_AT_LEAST_TLS_1_2_NEEDED_IN_SUITEB_MODE),
+        "at least (D)TLS 1.2 needed in Suite B mode" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_CERTIFICATE), "bad certificate" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_CHANGE_CIPHER_SPEC),
+        "bad change cipher spec" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_CIPHER), "bad cipher" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_COMPRESSION_ALGORITHM),
+        "bad compression algorithm" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DATA), "bad data" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DATA_RETURNED_BY_CALLBACK),
+        "bad data returned by callback" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DECOMPRESSION), "bad decompression" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DH_VALUE), "bad dh value" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_DIGEST_LENGTH), "bad digest length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_EARLY_DATA), "bad early data" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_ECC_CERT), "bad ecc cert" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_ECPOINT), "bad ecpoint" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_EXTENSION), "bad extension" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HANDSHAKE_LENGTH),
+        "bad handshake length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HANDSHAKE_STATE),
+        "bad handshake state" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HELLO_REQUEST), "bad hello request" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_HRR_VERSION), "bad hrr version" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_KEY_SHARE), "bad key share" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_KEY_UPDATE), "bad key update" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_LEGACY_VERSION), "bad legacy version" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_LENGTH), "bad length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PACKET), "bad packet" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PACKET_LENGTH), "bad packet length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PROTOCOL_VERSION_NUMBER),
+        "bad protocol version number" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PSK), "bad psk" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_PSK_IDENTITY), "bad psk identity" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_RECORD_TYPE), "bad record type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_RSA_ENCRYPT), "bad rsa encrypt" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SIGNATURE), "bad signature" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRP_A_LENGTH), "bad srp a length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRP_PARAMETERS), "bad srp parameters" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRTP_MKI_VALUE), "bad srtp mki value" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST),
+        "bad srtp protection profile list" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_SSL_FILETYPE), "bad ssl filetype" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_VALUE), "bad value" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BAD_WRITE_RETRY), "bad write retry" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BINDER_DOES_NOT_VERIFY),
+        "binder does not verify" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BIO_NOT_SET), "bio not set" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BLOCK_CIPHER_PAD_IS_WRONG),
+        "block cipher pad is wrong" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_BN_LIB), "bn lib" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CALLBACK_FAILED), "callback failed" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CANNOT_CHANGE_CIPHER),
+        "cannot change cipher" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CANNOT_GET_GROUP_NAME),
+        "cannot get group name" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CA_DN_LENGTH_MISMATCH),
+        "ca dn length mismatch" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CA_KEY_TOO_SMALL), "ca key too small" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CA_MD_TOO_WEAK), "ca md too weak" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CCS_RECEIVED_EARLY), "ccs received early" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CERTIFICATE_VERIFY_FAILED),
+        "certificate verify failed" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CERT_CB_ERROR), "cert cb error" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CERT_LENGTH_MISMATCH),
+        "cert length mismatch" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CIPHERSUITE_DIGEST_HAS_CHANGED),
+        "ciphersuite digest has changed" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CIPHER_CODE_WRONG_LENGTH),
+        "cipher code wrong length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CLIENTHELLO_TLSEXT), "clienthello tlsext" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSED_LENGTH_TOO_LONG),
+        "compressed length too long" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_DISABLED),
+        "compression disabled" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_FAILURE),
+        "compression failure" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE),
+        "compression id not within private range" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COMPRESSION_LIBRARY_ERROR),
+        "compression library error" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CONNECTION_TYPE_NOT_SET),
+        "connection type not set" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CONN_USE_ONLY), "conn use only" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CONTEXT_NOT_DANE_ENABLED),
+        "context not dane enabled" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COOKIE_GEN_CALLBACK_FAILURE),
+        "cookie gen callback failure" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COOKIE_MISMATCH), "cookie mismatch" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_COPY_PARAMETERS_FAILED),
+        "copy parameters failed" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_CUSTOM_EXT_HANDLER_ALREADY_INSTALLED),
+        "custom ext handler already installed" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_ALREADY_ENABLED),
+        "dane already enabled" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_CANNOT_OVERRIDE_MTYPE_FULL),
+        "dane cannot override mtype full" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_NOT_ENABLED), "dane not enabled" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_CERTIFICATE),
+        "dane tlsa bad certificate" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_CERTIFICATE_USAGE),
+        "dane tlsa bad certificate usage" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_DATA_LENGTH),
+        "dane tlsa bad data length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_DIGEST_LENGTH),
+        "dane tlsa bad digest length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_MATCHING_TYPE),
+        "dane tlsa bad matching type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_PUBLIC_KEY),
+        "dane tlsa bad public key" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_BAD_SELECTOR),
+        "dane tlsa bad selector" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DANE_TLSA_NULL_DATA),
+        "dane tlsa null data" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DATA_BETWEEN_CCS_AND_FINISHED),
+        "data between ccs and finished" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DATA_LENGTH_TOO_LONG),
+        "data length too long" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DECRYPTION_FAILED), "decryption failed" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC),
+        "decryption failed or bad record mac" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DH_KEY_TOO_SMALL), "dh key too small" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG),
+        "dh public value length is wrong" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DIGEST_CHECK_FAILED),
+        "digest check failed" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DOMAIN_USE_ONLY), "domain use only" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DTLS_MESSAGE_TOO_BIG),
+        "dtls message too big" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_DUPLICATE_COMPRESSION_ID),
+        "duplicate compression id" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ECC_CERT_NOT_FOR_SIGNING),
+        "ecc cert not for signing" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ECDH_REQUIRED_FOR_SUITEB_MODE),
+        "ecdh required for suiteb mode" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EE_KEY_TOO_SMALL), "ee key too small" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EMPTY_RAW_PUBLIC_KEY),
+        "empty raw public key" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST),
+        "empty srtp protection profile list" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ENCRYPTED_LENGTH_TOO_LONG),
+        "encrypted length too long" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST),
+        "error in received cipher list" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ERROR_IN_SYSTEM_DEFAULT_CONFIG),
+        "error in system default config" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN),
+        "error setting tlsa base domain" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXCEEDS_MAX_FRAGMENT_SIZE),
+        "exceeds max fragment size" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXCESSIVE_MESSAGE_SIZE),
+        "excessive message size" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXTENSION_NOT_RECEIVED),
+        "extension not received" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXTRA_DATA_IN_MESSAGE),
+        "extra data in message" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_EXT_LENGTH_MISMATCH),
+        "ext length mismatch" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FAILED_TO_GET_PARAMETER),
+        "failed to get parameter" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FAILED_TO_INIT_ASYNC),
+        "failed to init async" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE),
+        "feature negotiation not complete" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FEATURE_NOT_RENEGOTIABLE),
+        "feature not renegotiable" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_FRAGMENTED_CLIENT_HELLO),
+        "fragmented client hello" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_GOT_A_FIN_BEFORE_A_CCS),
+        "got a fin before a ccs" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_HTTPS_PROXY_REQUEST),
+        "https proxy request" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_HTTP_REQUEST), "http request" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ILLEGAL_POINT_COMPRESSION),
+        "illegal point compression" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_ILLEGAL_SUITEB_DIGEST),
+        "illegal Suite B digest" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INAPPROPRIATE_FALLBACK),
+        "inappropriate fallback" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_COMPRESSION),
+        "inconsistent compression" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EARLY_DATA_ALPN),
+        "inconsistent early data alpn" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EARLY_DATA_SNI),
+        "inconsistent early data sni" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EXTMS), "inconsistent extms" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INSUFFICIENT_SECURITY),
+        "insufficient security" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_ALERT), "invalid alert" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CCS_MESSAGE),
+        "invalid ccs message" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CERTIFICATE_OR_ALG),
+        "invalid certificate or alg" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_COMMAND), "invalid command" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_COMPRESSION_ALGORITHM),
+        "invalid compression algorithm" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CONFIG), "invalid config" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CONFIGURATION_NAME),
+        "invalid configuration name" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CONTEXT), "invalid context" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_CT_VALIDATION_TYPE),
+        "invalid ct validation type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_KEY_UPDATE_TYPE),
+        "invalid key update type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_MAX_EARLY_DATA),
+        "invalid max early data" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_NULL_CMD_NAME),
+        "invalid null cmd name" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_RAW_PUBLIC_KEY),
+        "invalid raw public key" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_RECORD), "invalid record" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SEQUENCE_NUMBER),
+        "invalid sequence number" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SERVERINFO_DATA),
+        "invalid serverinfo data" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SESSION_ID), "invalid session id" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_SRP_USERNAME),
+        "invalid srp username" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_STATUS_RESPONSE),
+        "invalid status response" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_TICKET_KEYS_LENGTH),
+        "invalid ticket keys length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED),
+        "legacy sigalg disallowed or unsupported" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LENGTH_MISMATCH), "length mismatch" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LENGTH_TOO_LONG), "length too long" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LENGTH_TOO_SHORT), "length too short" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LIBRARY_BUG), "library bug" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LIBRARY_HAS_NO_CIPHERS),
+        "library has no ciphers" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_LISTENER_USE_ONLY), "listener use only" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MAXIMUM_ENCRYPTED_PKTS_REACHED),
+        "maximum encrypted pkts reached" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_DSA_SIGNING_CERT),
+        "missing dsa signing cert" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_ECDSA_SIGNING_CERT),
+        "missing ecdsa signing cert" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_FATAL), "missing fatal" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_PARAMETERS), "missing parameters" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_PSK_KEX_MODES_EXTENSION),
+        "missing psk kex modes extension" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_QUIC_TLS_FUNCTIONS),
+        "missing quic tls functions" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_CERTIFICATE),
+        "missing rsa certificate" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_ENCRYPTING_CERT),
+        "missing rsa encrypting cert" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_RSA_SIGNING_CERT),
+        "missing rsa signing cert" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SIGALGS_EXTENSION),
+        "missing sigalgs extension" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SIGNING_CERT),
+        "missing signing cert" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SRP_PARAM),
+        "can't find SRP server param" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SUPPORTED_GROUPS_EXTENSION),
+        "missing supported groups extension" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_SUPPORTED_VERSIONS_EXTENSION),
+        "missing supported versions extension" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_TMP_DH_KEY), "missing tmp dh key" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MISSING_TMP_ECDH_KEY),
+        "missing tmp ecdh key" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA),
+        "mixed handshake and non handshake data" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_ON_RECORD_BOUNDARY),
+        "not on record boundary" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_REPLACING_CERTIFICATE),
+        "not replacing certificate" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NOT_SERVER), "not server" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_APPLICATION_PROTOCOL),
+        "no application protocol" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CERTIFICATES_RETURNED),
+        "no certificates returned" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CERTIFICATE_ASSIGNED),
+        "no certificate assigned" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CERTIFICATE_SET), "no certificate set" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CHANGE_FOLLOWING_HRR),
+        "no change following hrr" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CIPHERS_AVAILABLE),
+        "no ciphers available" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CIPHERS_SPECIFIED),
+        "no ciphers specified" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CIPHER_MATCH), "no cipher match" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_CLIENT_CERT_METHOD),
+        "no client cert method" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_COMPRESSION_SPECIFIED),
+        "no compression specified" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_COOKIE_CALLBACK_SET),
+        "no cookie callback set" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),
+        "Peer haven't sent GOST certificate, required for selected ciphersuite" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_METHOD_SPECIFIED),
+        "no method specified" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_PEM_EXTENSIONS), "no pem extensions" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_PRIVATE_KEY_ASSIGNED),
+        "no private key assigned" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_PROTOCOLS_AVAILABLE),
+        "no protocols available" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_RENEGOTIATION), "no renegotiation" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_REQUIRED_DIGEST), "no required digest" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SHARED_CIPHER), "no shared cipher" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SHARED_GROUPS), "no shared groups" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS),
+        "no shared signature algorithms" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SRTP_PROFILES), "no srtp profiles" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_STREAM), "no stream" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_DIGEST_ALGORITHM),
+        "no suitable digest algorithm" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_GROUPS), "no suitable groups" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_KEY_SHARE),
+        "no suitable key share" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_RECORD_LAYER),
+        "no suitable record layer" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM),
+        "no suitable signature algorithm" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_VALID_SCTS), "no valid scts" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NO_VERIFY_COOKIE_CALLBACK),
+        "no verify cookie callback" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NULL_SSL_CTX), "null ssl ctx" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_NULL_SSL_METHOD_PASSED),
+        "null ssl method passed" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OCSP_CALLBACK_FAILURE),
+        "ocsp callback failure" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED),
+        "old session cipher not returned" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED),
+        "old session compression algorithm not returned" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_OVERFLOW_ERROR), "overflow error" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PACKET_LENGTH_TOO_LONG),
+        "packet length too long" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PARSE_TLSEXT), "parse tlsext" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PATH_TOO_LONG), "path too long" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE),
+        "peer did not return a certificate" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PEM_NAME_BAD_PREFIX),
+        "pem name bad prefix" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PEM_NAME_TOO_SHORT), "pem name too short" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PIPELINE_FAILURE), "pipeline failure" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_POLL_REQUEST_NOT_SUPPORTED),
+        "poll request not supported" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR),
+        "post handshake auth encoding err" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PRIVATE_KEY_MISMATCH),
+        "private key mismatch" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PROTOCOL_IS_SHUTDOWN),
+        "protocol is shutdown" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PSK_IDENTITY_NOT_FOUND),
+        "psk identity not found" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PSK_NO_CLIENT_CB), "psk no client cb" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_PSK_NO_SERVER_CB), "psk no server cb" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_QUIC_HANDSHAKE_LAYER_ERROR),
+        "quic handshake layer error" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_QUIC_NETWORK_ERROR), "quic network error" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_QUIC_PROTOCOL_ERROR),
+        "quic protocol error" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_READ_BIO_NOT_SET), "read bio not set" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_READ_TIMEOUT_EXPIRED),
+        "read timeout expired" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORDS_NOT_RELEASED),
+        "records not released" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORD_LAYER_FAILURE),
+        "record layer failure" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORD_LENGTH_MISMATCH),
+        "record length mismatch" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RECORD_TOO_SMALL), "record too small" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REMOTE_PEER_ADDRESS_NOT_SET),
+        "remote peer address not set" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RENEGOTIATE_EXT_TOO_LONG),
+        "renegotiate ext too long" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RENEGOTIATION_ENCODING_ERR),
+        "renegotiation encoding err" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_RENEGOTIATION_MISMATCH),
+        "renegotiation mismatch" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUEST_PENDING), "request pending" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUEST_SENT), "request sent" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUIRED_CIPHER_MISSING),
+        "required cipher missing" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING),
+        "required compression algorithm missing" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING),
+        "scsv received when renegotiating" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SCT_VERIFICATION_FAILED),
+        "sct verification failed" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SEQUENCE_CTR_WRAPPED),
+        "sequence ctr wrapped" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SERVERHELLO_TLSEXT), "serverhello tlsext" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED),
+        "session id context uninitialized" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHUTDOWN_WHILE_IN_INIT),
+        "shutdown while in init" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SIGNATURE_ALGORITHMS_ERROR),
+        "signature algorithms error" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE),
+        "signature for non signing certificate" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRP_A_CALC), "error with the srp params" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES),
+        "srtp could not allocate profiles" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG),
+        "srtp protection profile list too long" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE),
+        "srtp unknown protection profile" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH),
+        "ssl3 ext invalid max fragment length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_EXT_INVALID_SERVERNAME),
+        "ssl3 ext invalid servername" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE),
+        "ssl3 ext invalid servername type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL3_SESSION_ID_TOO_LONG),
+        "ssl3 session id too long" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_BAD_CERTIFICATE),
+        "ssl/tls alert bad certificate" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_BAD_RECORD_MAC),
+        "ssl/tls alert bad record mac" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED),
+        "ssl/tls alert certificate expired" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED),
+        "ssl/tls alert certificate revoked" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN),
+        "ssl/tls alert certificate unknown" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE),
+        "ssl/tls alert decompression failure" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE),
+        "ssl/tls alert handshake failure" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER),
+        "ssl/tls alert illegal parameter" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_NO_CERTIFICATE),
+        "ssl/tls alert no certificate" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE),
+        "ssl/tls alert unexpected message" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE),
+        "ssl/tls alert unsupported certificate" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_COMMAND_SECTION_EMPTY),
+        "ssl command section empty" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_COMMAND_SECTION_NOT_FOUND),
+        "ssl command section not found" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION),
+        "ssl ctx has no default ssl version" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_HANDSHAKE_FAILURE),
+        "ssl handshake failure" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS),
+        "ssl library has no ciphers" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_NEGATIVE_LENGTH),
+        "ssl negative length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SECTION_EMPTY), "ssl section empty" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SECTION_NOT_FOUND),
+        "ssl section not found" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_CALLBACK_FAILED),
+        "ssl session id callback failed" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_CONFLICT),
+        "ssl session id conflict" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG),
+        "ssl session id context too long" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH),
+        "ssl session id has bad length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_ID_TOO_LONG),
+        "ssl session id too long" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SSL_SESSION_VERSION_MISMATCH),
+        "ssl session version mismatch" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STILL_IN_INIT), "still in init" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_COUNT_LIMITED),
+        "stream count limited" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_FINISHED), "stream finished" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_RECV_ONLY), "stream recv only" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_RESET), "stream reset" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_STREAM_SEND_ONLY), "stream send only" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED),
+        "tlsv13 alert certificate required" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV13_ALERT_MISSING_EXTENSION),
+        "tlsv13 alert missing extension" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_ACCESS_DENIED),
+        "tlsv1 alert access denied" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_DECODE_ERROR),
+        "tlsv1 alert decode error" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_DECRYPTION_FAILED),
+        "tlsv1 alert decryption failed" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_DECRYPT_ERROR),
+        "tlsv1 alert decrypt error" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION),
+        "tlsv1 alert export restriction" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK),
+        "tlsv1 alert inappropriate fallback" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY),
+        "tlsv1 alert insufficient security" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_INTERNAL_ERROR),
+        "tlsv1 alert internal error" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL),
+        "tlsv1 alert no application protocol" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_NO_RENEGOTIATION),
+        "tlsv1 alert no renegotiation" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_PROTOCOL_VERSION),
+        "tlsv1 alert protocol version" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_RECORD_OVERFLOW),
+        "tlsv1 alert record overflow" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_UNKNOWN_CA),
+        "tlsv1 alert unknown ca" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY),
+        "tlsv1 alert unknown psk identity" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_ALERT_USER_CANCELLED),
+        "tlsv1 alert user cancelled" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE),
+        "tlsv1 bad certificate hash value" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE),
+        "tlsv1 bad certificate status response" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE),
+        "tlsv1 certificate unobtainable" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_UNRECOGNIZED_NAME),
+        "tlsv1 unrecognized name" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLSV1_UNSUPPORTED_EXTENSION),
+        "tlsv1 unsupported extension" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL),
+        "tls illegal exporter label" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST),
+        "tls invalid ecpointformat list" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TOO_MANY_KEY_UPDATES),
+        "too many key updates" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TOO_MANY_WARN_ALERTS),
+        "too many warn alerts" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_TOO_MUCH_EARLY_DATA),
+        "too much early data" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS),
+        "unable to find ecdh parameters" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS),
+        "unable to find public key parameters" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES),
+        "unable to load ssl3 md5 routines" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES),
+        "unable to load ssl3 sha1 routines" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_CCS_MESSAGE),
+        "unexpected ccs message" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_END_OF_EARLY_DATA),
+        "unexpected end of early data" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_EOF_WHILE_READING),
+        "unexpected eof while reading" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_MESSAGE), "unexpected message" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNEXPECTED_RECORD), "unexpected record" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNINITIALIZED), "uninitialized" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_ALERT_TYPE), "unknown alert type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CERTIFICATE_TYPE),
+        "unknown certificate type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CIPHER_RETURNED),
+        "unknown cipher returned" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CIPHER_TYPE),
+        "unknown cipher type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_CMD_NAME), "unknown cmd name" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_COMMAND), "unknown command" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_DIGEST), "unknown digest" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE),
+        "unknown key exchange type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_MANDATORY_PARAMETER),
+        "unknown mandatory parameter" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_PKEY_TYPE), "unknown pkey type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_PROTOCOL), "unknown protocol" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_SSL_VERSION),
+        "unknown ssl version" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNKNOWN_STATE), "unknown state" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED),
+        "unsafe legacy renegotiation disabled" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSOLICITED_EXTENSION),
+        "unsolicited extension" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM),
+        "unsupported compression algorithm" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_CONFIG_VALUE),
+        "unsupported config value" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS),
+        "unsupported config value class" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_CONFIG_VALUE_OP),
+        "unsupported config value op" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_ELLIPTIC_CURVE),
+        "unsupported elliptic curve" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_PROTOCOL),
+        "unsupported protocol" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_SSL_VERSION),
+        "unsupported ssl version" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_STATUS_TYPE),
+        "unsupported status type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_UNSUPPORTED_WRITE_FLAG),
+        "unsupported write flag" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_USE_SRTP_NOT_NEGOTIATED),
+        "use srtp not negotiated" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_VERSION_TOO_HIGH), "version too high" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_VERSION_TOO_LOW), "version too low" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CERTIFICATE_TYPE),
+        "wrong certificate type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CIPHER_RETURNED),
+        "wrong cipher returned" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_CURVE), "wrong curve" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_RPK_TYPE), "wrong rpk type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_LENGTH),
+        "wrong signature length" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_SIZE),
+        "wrong signature size" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SIGNATURE_TYPE),
+        "wrong signature type" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_SSL_VERSION), "wrong ssl version" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_WRONG_VERSION_NUMBER),
+        "wrong version number" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_X509_LIB), "x509 lib" },
+    { ERR_PACK(ERR_LIB_SSL, 0, SSL_R_X509_VERIFICATION_SETUP_PROBLEMS),
+        "x509 verification setup problems" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/sslerr.h b/crypto/sslerr.h
index 14644f429de87..968f27b00a6be 100644
--- a/crypto/sslerr.h
+++ b/crypto/sslerr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_SSLERR_H
-# define OSSL_SSLERR_H
-# pragma once
+#define OSSL_SSLERR_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_SSL_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index e813989624707..633e9f1bf2444 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -13,7 +13,7 @@
 #include "internal/safe_math.h"
 #include <openssl/stack.h>
 #include <errno.h>
-#include <openssl/e_os2.h>      /* For ossl_inline */
+#include <openssl/e_os2.h> /* For ossl_inline */
 
 OSSL_SAFE_MATH_SIGNED(int, int)
 
@@ -22,7 +22,8 @@ OSSL_SAFE_MATH_SIGNED(int, int)
  */
 static const int min_nodes = 4;
 static const int max_nodes = SIZE_MAX / sizeof(void *) < INT_MAX
-    ? (int)(SIZE_MAX / sizeof(void *)) : INT_MAX;
+    ? (int)(SIZE_MAX / sizeof(void *))
+    : INT_MAX;
 
 struct stack_st {
     int num;
@@ -33,7 +34,7 @@ struct stack_st {
 };
 
 OPENSSL_sk_compfunc OPENSSL_sk_set_cmp_func(OPENSSL_STACK *sk,
-                                            OPENSSL_sk_compfunc c)
+    OPENSSL_sk_compfunc c)
 {
     OPENSSL_sk_compfunc old = sk->comp;
 
@@ -74,14 +75,14 @@ OPENSSL_STACK *OPENSSL_sk_dup(const OPENSSL_STACK *sk)
     memcpy(ret->data, sk->data, sizeof(void *) * sk->num);
     return ret;
 
- err:
+err:
     OPENSSL_sk_free(ret);
     return NULL;
 }
 
 OPENSSL_STACK *OPENSSL_sk_deep_copy(const OPENSSL_STACK *sk,
-                                    OPENSSL_sk_copyfunc copy_func,
-                                    OPENSSL_sk_freefunc free_func)
+    OPENSSL_sk_copyfunc copy_func,
+    OPENSSL_sk_freefunc free_func)
 {
     OPENSSL_STACK *ret;
     int i;
@@ -122,7 +123,7 @@ OPENSSL_STACK *OPENSSL_sk_deep_copy(const OPENSSL_STACK *sk,
     }
     return ret;
 
- err:
+err:
     OPENSSL_sk_free(ret);
     return NULL;
 }
@@ -273,7 +274,7 @@ int OPENSSL_sk_insert(OPENSSL_STACK *st, const void *data, int loc)
         st->data[st->num] = data;
     } else {
         memmove(&st->data[loc + 1], &st->data[loc],
-                sizeof(st->data[0]) * (st->num - loc));
+            sizeof(st->data[0]) * (st->num - loc));
         st->data[loc] = data;
     }
     st->num++;
@@ -287,7 +288,7 @@ static ossl_inline void *internal_delete(OPENSSL_STACK *st, int loc)
 
     if (loc != st->num - 1)
         memmove(&st->data[loc], &st->data[loc + 1],
-                sizeof(st->data[0]) * (st->num - loc - 1));
+            sizeof(st->data[0]) * (st->num - loc - 1));
     st->num--;
 
     return (void *)ret;
@@ -315,7 +316,7 @@ void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc)
 }
 
 static int internal_find(OPENSSL_STACK *st, const void *data,
-                         int ret_val_options, int *pnum_matched)
+    int ret_val_options, int *pnum_matched)
 {
     const void *r;
     int i, count = 0;
@@ -360,7 +361,7 @@ static int internal_find(OPENSSL_STACK *st, const void *data,
     if (pnum_matched != NULL)
         ret_val_options |= OSSL_BSEARCH_FIRST_VALUE_ON_MATCH;
     r = ossl_bsearch(&data, st->data, st->num, sizeof(void *), st->comp,
-                     ret_val_options);
+        ret_val_options);
 
     if (pnum_matched != NULL) {
         *pnum = 0;
@@ -468,7 +469,7 @@ void *OPENSSL_sk_set(OPENSSL_STACK *st, int i, const void *data)
     }
     if (i < 0 || i >= st->num) {
         ERR_raise_data(ERR_LIB_CRYPTO, ERR_R_PASSED_INVALID_ARGUMENT,
-                       "i=%d", i);
+            "i=%d", i);
         return NULL;
     }
     st->data[i] = data;
diff --git a/crypto/store/store_err.c b/crypto/store/store_err.c
index ec62b358c589b..ee35151cc34bb 100644
--- a/crypto/store/store_err.c
+++ b/crypto/store/store_err.c
@@ -15,52 +15,52 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA OSSL_STORE_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_AMBIGUOUS_CONTENT_TYPE),
-    "ambiguous content type"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_BAD_PASSWORD_READ),
-    "bad password read"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC),
-    "error verifying pkcs12 mac"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_FINGERPRINT_SIZE_DOES_NOT_MATCH_DIGEST),
-    "fingerprint size does not match digest"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_INVALID_SCHEME),
-    "invalid scheme"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_IS_NOT_A), "is not a"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_LOADER_INCOMPLETE),
-    "loader incomplete"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_LOADING_STARTED),
-    "loading started"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_CERTIFICATE),
-    "not a certificate"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_CRL), "not a crl"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_NAME), "not a name"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_PRIVATE_KEY),
-    "not a private key"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_PUBLIC_KEY),
-    "not a public key"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_PARAMETERS),
-    "not parameters"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NO_LOADERS_FOUND),
-    "no loaders found"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_PASSPHRASE_CALLBACK_ERROR),
-    "passphrase callback error"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_PATH_MUST_BE_ABSOLUTE),
-    "path must be absolute"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES),
-    "search only supported for directories"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED),
-    "ui process interrupted or cancelled"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNREGISTERED_SCHEME),
-    "unregistered scheme"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_CONTENT_TYPE),
-    "unsupported content type"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_OPERATION),
-    "unsupported operation"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_SEARCH_TYPE),
-    "unsupported search type"},
-    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_URI_AUTHORITY_UNSUPPORTED),
-    "uri authority unsupported"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_AMBIGUOUS_CONTENT_TYPE),
+        "ambiguous content type" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_BAD_PASSWORD_READ),
+        "bad password read" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC),
+        "error verifying pkcs12 mac" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_FINGERPRINT_SIZE_DOES_NOT_MATCH_DIGEST),
+        "fingerprint size does not match digest" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_INVALID_SCHEME),
+        "invalid scheme" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_IS_NOT_A), "is not a" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_LOADER_INCOMPLETE),
+        "loader incomplete" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_LOADING_STARTED),
+        "loading started" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_CERTIFICATE),
+        "not a certificate" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_CRL), "not a crl" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_NAME), "not a name" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_PRIVATE_KEY),
+        "not a private key" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_A_PUBLIC_KEY),
+        "not a public key" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NOT_PARAMETERS),
+        "not parameters" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_NO_LOADERS_FOUND),
+        "no loaders found" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_PASSPHRASE_CALLBACK_ERROR),
+        "passphrase callback error" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_PATH_MUST_BE_ABSOLUTE),
+        "path must be absolute" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES),
+        "search only supported for directories" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED),
+        "ui process interrupted or cancelled" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNREGISTERED_SCHEME),
+        "unregistered scheme" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_CONTENT_TYPE),
+        "unsupported content type" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_OPERATION),
+        "unsupported operation" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_UNSUPPORTED_SEARCH_TYPE),
+        "unsupported search type" },
+    { ERR_PACK(ERR_LIB_OSSL_STORE, 0, OSSL_STORE_R_URI_AUTHORITY_UNSUPPORTED),
+        "uri authority unsupported" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c
index 505d606f4a9ba..7c111541388ca 100644
--- a/crypto/store/store_lib.c
+++ b/crypto/store/store_lib.c
@@ -33,38 +33,39 @@
 static int ossl_store_close_it(OSSL_STORE_CTX *ctx);
 
 static int loader_set_params(OSSL_STORE_LOADER *loader,
-                             OSSL_STORE_LOADER_CTX *loader_ctx,
-                             const OSSL_PARAM params[], const char *propq)
+    OSSL_STORE_LOADER_CTX *loader_ctx,
+    const OSSL_PARAM params[], const char *propq)
 {
-   if (params != NULL) {
-       if (!loader->p_set_ctx_params(loader_ctx, params))
-           return 0;
-   }
+    if (params != NULL) {
+        if (!loader->p_set_ctx_params(loader_ctx, params))
+            return 0;
+    }
 
-   if (propq != NULL) {
-       OSSL_PARAM propp[2];
+    if (propq != NULL) {
+        OSSL_PARAM propp[2];
 
-       if (OSSL_PARAM_locate_const(params,
-                                   OSSL_STORE_PARAM_PROPERTIES) != NULL)
-           /* use the propq from params */
-           return 1;
+        if (OSSL_PARAM_locate_const(params,
+                OSSL_STORE_PARAM_PROPERTIES)
+            != NULL)
+            /* use the propq from params */
+            return 1;
 
-       propp[0] = OSSL_PARAM_construct_utf8_string(OSSL_STORE_PARAM_PROPERTIES,
-                                                   (char *)propq, 0);
-       propp[1] = OSSL_PARAM_construct_end();
+        propp[0] = OSSL_PARAM_construct_utf8_string(OSSL_STORE_PARAM_PROPERTIES,
+            (char *)propq, 0);
+        propp[1] = OSSL_PARAM_construct_end();
 
-       if (!loader->p_set_ctx_params(loader_ctx, propp))
-           return 0;
+        if (!loader->p_set_ctx_params(loader_ctx, propp))
+            return 0;
     }
     return 1;
 }
 
 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)
 {
     struct ossl_passphrase_data_st pwdata = { 0 };
     const OSSL_STORE_LOADER *loader = NULL;
@@ -77,6 +78,11 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
     size_t schemes_n = 0;
     size_t i;
 
+    if (uri == NULL) {
+        ERR_raise(ERR_LIB_OSSL_STORE, ERR_R_PASSED_NULL_PARAMETER);
+        return 0;
+    }
+
     /*
      * Put the file scheme first.  If the uri does represent an existing file,
      * possible device name and all, then it should be loaded.  Only a failed
@@ -96,7 +102,7 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
         *p++ = '\0';
         if (OPENSSL_strcasecmp(scheme_copy, "file") != 0) {
             if (HAS_PREFIX(p, "//"))
-                schemes_n--;         /* Invalidate the file scheme */
+                schemes_n--; /* Invalidate the file scheme */
             schemes[schemes_n++] = scheme_copy;
         }
     }
@@ -128,7 +134,7 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
             no_loader_found = 0;
             if (loader->open_ex != NULL)
                 loader_ctx = loader->open_ex(loader, uri, libctx, propq,
-                                             ui_method, ui_data);
+                    ui_method, ui_data);
             else
                 loader_ctx = loader->open(loader, uri, ui_method, ui_data);
         } else {
@@ -136,23 +142,17 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
         }
 #endif
         if (loader == NULL
-            && (fetched_loader =
-                OSSL_STORE_LOADER_fetch(libctx, scheme, propq)) != NULL) {
-            const OSSL_PROVIDER *provider =
-                OSSL_STORE_LOADER_get0_provider(fetched_loader);
+            && (fetched_loader = OSSL_STORE_LOADER_fetch(libctx, scheme, propq)) != NULL) {
+            const OSSL_PROVIDER *provider = OSSL_STORE_LOADER_get0_provider(fetched_loader);
             void *provctx = OSSL_PROVIDER_get0_provider_ctx(provider);
 
             no_loader_found = 0;
             if (fetched_loader->p_open_ex != NULL) {
-                loader_ctx =
-                    fetched_loader->p_open_ex(provctx, uri, params,
-                                              ossl_pw_passphrase_callback_dec,
-                                              &pwdata);
+                loader_ctx = fetched_loader->p_open_ex(provctx, uri, params,
+                    ossl_pw_passphrase_callback_dec,
+                    &pwdata);
             } else {
-                if (fetched_loader->p_open != NULL &&
-                    (loader_ctx = fetched_loader->p_open(provctx, uri)) != NULL &&
-                    !loader_set_params(fetched_loader, loader_ctx,
-                                       params, propq)) {
+                if (fetched_loader->p_open != NULL && (loader_ctx = fetched_loader->p_open(provctx, uri)) != NULL && !loader_set_params(fetched_loader, loader_ctx, params, propq)) {
                     (void)fetched_loader->p_close(loader_ctx);
                     loader_ctx = NULL;
                 }
@@ -207,14 +207,16 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
 
     return ctx;
 
- err:
+err:
     ERR_clear_last_mark();
     if (loader_ctx != NULL) {
         /*
          * Temporary structure so OSSL_STORE_close() can work even when
          * |ctx| couldn't be allocated properly
          */
-        OSSL_STORE_CTX tmpctx = { NULL, };
+        OSSL_STORE_CTX tmpctx = {
+            NULL,
+        };
 
         tmpctx.fetched_loader = fetched_loader;
         tmpctx.loader = loader;
@@ -236,12 +238,12 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
 }
 
 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)
+    const UI_METHOD *ui_method, void *ui_data,
+    OSSL_STORE_post_process_info_fn post_process,
+    void *post_process_data)
 {
     return OSSL_STORE_open_ex(uri, NULL, NULL, ui_method, ui_data, NULL,
-                              post_process, post_process_data);
+        post_process, post_process_data);
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -264,19 +266,17 @@ int OSSL_STORE_vctrl(OSSL_STORE_CTX *ctx, int cmd, va_list args)
             OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
 
             switch (cmd) {
-            case OSSL_STORE_C_USE_SECMEM:
-                {
-                    int on = *(va_arg(args, int *));
+            case OSSL_STORE_C_USE_SECMEM: {
+                int on = *(va_arg(args, int *));
 
-                    params[0] = OSSL_PARAM_construct_int("use_secmem", &on);
-                }
-                break;
+                params[0] = OSSL_PARAM_construct_int("use_secmem", &on);
+            } break;
             default:
                 break;
             }
 
             return ctx->fetched_loader->p_set_ctx_params(ctx->loader_ctx,
-                                                         params);
+                params);
         }
     } else if (ctx->loader->ctrl != NULL) {
         return ctx->loader->ctrl(ctx->loader_ctx, cmd, args);
@@ -295,7 +295,7 @@ int OSSL_STORE_expect(OSSL_STORE_CTX *ctx, int expected_type)
     int ret = 1;
 
     if (ctx == NULL
-            || expected_type < 0 || expected_type > OSSL_STORE_INFO_CRL) {
+        || expected_type < 0 || expected_type > OSSL_STORE_INFO_CRL) {
         ERR_raise(ERR_LIB_OSSL_STORE, ERR_R_PASSED_INVALID_ARGUMENT);
         return 0;
     }
@@ -309,8 +309,7 @@ int OSSL_STORE_expect(OSSL_STORE_CTX *ctx, int expected_type)
         && ctx->fetched_loader->p_set_ctx_params != NULL) {
         OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
 
-        params[0] =
-            OSSL_PARAM_construct_int(OSSL_STORE_PARAM_EXPECT, &expected_type);
+        params[0] = OSSL_PARAM_construct_int(OSSL_STORE_PARAM_EXPECT, &expected_type);
         ret = ctx->fetched_loader->p_set_ctx_params(ctx->loader_ctx, params);
     }
 #ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -354,49 +353,51 @@ int OSSL_STORE_find(OSSL_STORE_CTX *ctx, const OSSL_STORE_SEARCH *search)
             return 0;
         }
 
-        ret = 0;                 /* Assume the worst */
+        ret = 0; /* Assume the worst */
 
         switch (search->search_type) {
         case OSSL_STORE_SEARCH_BY_NAME:
             if ((name_der_sz = i2d_X509_NAME(search->name,
-                                             (unsigned char **)&name_der)) > 0
+                     (unsigned char **)&name_der))
+                    > 0
                 && OSSL_PARAM_BLD_push_octet_string(bld,
-                                                    OSSL_STORE_PARAM_SUBJECT,
-                                                    name_der, name_der_sz))
+                    OSSL_STORE_PARAM_SUBJECT,
+                    name_der, name_der_sz))
                 ret = 1;
             break;
         case OSSL_STORE_SEARCH_BY_ISSUER_SERIAL:
             if ((name_der_sz = i2d_X509_NAME(search->name,
-                                             (unsigned char **)&name_der)) > 0
+                     (unsigned char **)&name_der))
+                    > 0
                 && (number = ASN1_INTEGER_to_BN(search->serial, NULL)) != NULL
                 && OSSL_PARAM_BLD_push_octet_string(bld,
-                                                    OSSL_STORE_PARAM_ISSUER,
-                                                    name_der, name_der_sz)
+                    OSSL_STORE_PARAM_ISSUER,
+                    name_der, name_der_sz)
                 && OSSL_PARAM_BLD_push_BN(bld, OSSL_STORE_PARAM_SERIAL,
-                                          number))
+                    number))
                 ret = 1;
             break;
         case OSSL_STORE_SEARCH_BY_KEY_FINGERPRINT:
             if (OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_STORE_PARAM_DIGEST,
-                                                EVP_MD_get0_name(search->digest),
-                                                0)
+                    EVP_MD_get0_name(search->digest),
+                    0)
                 && OSSL_PARAM_BLD_push_octet_string(bld,
-                                                    OSSL_STORE_PARAM_FINGERPRINT,
-                                                    search->string,
-                                                    search->stringlength))
+                    OSSL_STORE_PARAM_FINGERPRINT,
+                    search->string,
+                    search->stringlength))
                 ret = 1;
             break;
         case OSSL_STORE_SEARCH_BY_ALIAS:
             if (OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_STORE_PARAM_ALIAS,
-                                                (char *)search->string,
-                                                search->stringlength))
+                    (char *)search->string,
+                    search->stringlength))
                 ret = 1;
             break;
         }
         if (ret) {
             params = OSSL_PARAM_BLD_to_param(bld);
             ret = ctx->fetched_loader->p_set_ctx_params(ctx->loader_ctx,
-                                                        params);
+                params);
             OSSL_PARAM_free(params);
         }
         OSSL_PARAM_BLD_free(bld);
@@ -421,19 +422,13 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx)
     OSSL_STORE_INFO *v = NULL;
 
     ctx->loading = 1;
- again:
+again:
     if (OSSL_STORE_eof(ctx))
         return NULL;
 
     if (ctx->loader != NULL)
         OSSL_TRACE(STORE, "Loading next object\n");
 
-    if (ctx->cached_info != NULL
-        && sk_OSSL_STORE_INFO_num(ctx->cached_info) == 0) {
-        sk_OSSL_STORE_INFO_free(ctx->cached_info);
-        ctx->cached_info = NULL;
-    }
-
     if (ctx->cached_info != NULL) {
         v = sk_OSSL_STORE_INFO_shift(ctx->cached_info);
     } else {
@@ -445,10 +440,10 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx)
             ctx->error_flag = 0;
 
             if (!ctx->fetched_loader->p_load(ctx->loader_ctx,
-                                             ossl_store_handle_load_result,
-                                             &load_data,
-                                             ossl_pw_passphrase_callback_dec,
-                                             &ctx->pwdata)) {
+                    ossl_store_handle_load_result,
+                    &load_data,
+                    ossl_pw_passphrase_callback_dec,
+                    &ctx->pwdata)) {
                 ctx->error_flag = 1;
                 return NULL;
             }
@@ -457,8 +452,8 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx)
 #ifndef OPENSSL_NO_DEPRECATED_3_0
         if (ctx->fetched_loader == NULL)
             v = ctx->loader->load(ctx->loader_ctx,
-                                  ctx->pwdata._.ui_method.ui_method,
-                                  ctx->pwdata._.ui_method.ui_method_data);
+                ctx->pwdata._.ui_method.ui_method,
+                ctx->pwdata._.ui_method.ui_method_data);
 #endif
     }
 
@@ -489,19 +484,19 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx)
 
     if (v != NULL)
         OSSL_TRACE1(STORE, "Got a %s\n",
-                    OSSL_STORE_INFO_type_string(OSSL_STORE_INFO_get_type(v)));
+            OSSL_STORE_INFO_type_string(OSSL_STORE_INFO_get_type(v)));
 
     return v;
 }
 
 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[])
 {
     OSSL_STORE_LOADER *fetched_loader = NULL;
     char scheme[256], *p;
     int res = 0;
-    struct ossl_passphrase_data_st pwdata = {0};
+    struct ossl_passphrase_data_st pwdata = { 0 };
 
     OPENSSL_strlcpy(scheme, uri, sizeof(scheme));
     if ((p = strchr(scheme, ':')) != NULL)
@@ -520,8 +515,7 @@ int OSSL_STORE_delete(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
     fetched_loader = OSSL_STORE_LOADER_fetch(libctx, scheme, propq);
 
     if (fetched_loader != NULL && fetched_loader->p_delete != NULL) {
-        const OSSL_PROVIDER *provider =
-            OSSL_STORE_LOADER_get0_provider(fetched_loader);
+        const OSSL_PROVIDER *provider = OSSL_STORE_LOADER_get0_provider(fetched_loader);
         void *provctx = OSSL_PROVIDER_get0_provider_ctx(provider);
 
         /*
@@ -530,8 +524,8 @@ int OSSL_STORE_delete(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
          */
         OSSL_TRACE1(STORE, "Performing URI delete %s\n", uri);
         res = fetched_loader->p_delete(provctx, uri, params,
-                                       ossl_pw_passphrase_callback_dec,
-                                       &pwdata);
+            ossl_pw_passphrase_callback_dec,
+            &pwdata);
     }
     /* Clear any internally cached passphrase */
     (void)ossl_pw_clear_passphrase_cache(&pwdata);
@@ -556,14 +550,23 @@ int OSSL_STORE_error(OSSL_STORE_CTX *ctx)
 
 int OSSL_STORE_eof(OSSL_STORE_CTX *ctx)
 {
-    int ret = 1;
+    int ret = 0;
 
-    if (ctx->fetched_loader != NULL)
-        ret = ctx->loader->p_eof(ctx->loader_ctx);
+    if (ctx->cached_info != NULL
+        && sk_OSSL_STORE_INFO_num(ctx->cached_info) == 0) {
+        sk_OSSL_STORE_INFO_free(ctx->cached_info);
+        ctx->cached_info = NULL;
+    }
+
+    if (ctx->cached_info == NULL) {
+        ret = 1;
+        if (ctx->fetched_loader != NULL)
+            ret = ctx->loader->p_eof(ctx->loader_ctx);
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-    if (ctx->fetched_loader == NULL)
-        ret = ctx->loader->eof(ctx->loader_ctx);
+        if (ctx->fetched_loader == NULL)
+            ret = ctx->loader->eof(ctx->loader_ctx);
 #endif
+    }
     return ret != 0;
 }
 
@@ -858,8 +861,7 @@ int OSSL_STORE_supports_search(OSSL_STORE_CTX *ctx, int search_type)
     int ret = 0;
 
     if (ctx->fetched_loader != NULL) {
-        void *provctx =
-            ossl_provider_ctx(OSSL_STORE_LOADER_get0_provider(ctx->fetched_loader));
+        void *provctx = ossl_provider_ctx(OSSL_STORE_LOADER_get0_provider(ctx->fetched_loader));
         const OSSL_PARAM *params;
         const OSSL_PARAM *p_subject = NULL;
         const OSSL_PARAM *p_issuer = NULL;
@@ -874,8 +876,7 @@ int OSSL_STORE_supports_search(OSSL_STORE_CTX *ctx, int search_type)
         p_subject = OSSL_PARAM_locate_const(params, OSSL_STORE_PARAM_SUBJECT);
         p_issuer = OSSL_PARAM_locate_const(params, OSSL_STORE_PARAM_ISSUER);
         p_serial = OSSL_PARAM_locate_const(params, OSSL_STORE_PARAM_SERIAL);
-        p_fingerprint =
-            OSSL_PARAM_locate_const(params, OSSL_STORE_PARAM_FINGERPRINT);
+        p_fingerprint = OSSL_PARAM_locate_const(params, OSSL_STORE_PARAM_FINGERPRINT);
         p_alias = OSSL_PARAM_locate_const(params, OSSL_STORE_PARAM_ALIAS);
 
         switch (search_type) {
@@ -920,7 +921,7 @@ 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 *search = OPENSSL_zalloc(sizeof(*search));
 
@@ -934,8 +935,9 @@ OSSL_STORE_SEARCH *OSSL_STORE_SEARCH_by_issuer_serial(X509_NAME *name,
 }
 
 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 *search = OPENSSL_zalloc(sizeof(*search));
     int md_size;
@@ -951,9 +953,9 @@ OSSL_STORE_SEARCH *OSSL_STORE_SEARCH_by_key_fingerprint(const EVP_MD *digest,
 
     if (digest != NULL && len != (size_t)md_size) {
         ERR_raise_data(ERR_LIB_OSSL_STORE,
-                       OSSL_STORE_R_FINGERPRINT_SIZE_DOES_NOT_MATCH_DIGEST,
-                       "%s size is %d, fingerprint size is %zu",
-                       EVP_MD_get0_name(digest), md_size, len);
+            OSSL_STORE_R_FINGERPRINT_SIZE_DOES_NOT_MATCH_DIGEST,
+            "%s size is %d, fingerprint size is %zu",
+            EVP_MD_get0_name(digest), md_size, len);
         OPENSSL_free(search);
         return NULL;
     }
@@ -996,13 +998,14 @@ 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)
 {
     return criterion->serial;
 }
 
 const unsigned char *OSSL_STORE_SEARCH_get0_bytes(const OSSL_STORE_SEARCH
-                                                  *criterion, size_t *length)
+                                                      *criterion,
+    size_t *length)
 {
     *length = criterion->stringlength;
     return criterion->string;
@@ -1019,11 +1022,11 @@ const EVP_MD *OSSL_STORE_SEARCH_get0_digest(const OSSL_STORE_SEARCH *criterion)
 }
 
 OSSL_STORE_CTX *OSSL_STORE_attach(BIO *bp, 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)
 {
     const OSSL_STORE_LOADER *loader = NULL;
     OSSL_STORE_LOADER *fetched_loader = NULL;
@@ -1038,13 +1041,11 @@ OSSL_STORE_CTX *OSSL_STORE_attach(BIO *bp, const char *scheme,
 #ifndef OPENSSL_NO_DEPRECATED_3_0
     if ((loader = ossl_store_get0_loader_int(scheme)) != NULL)
         loader_ctx = loader->attach(loader, bp, libctx, propq,
-                                    ui_method, ui_data);
+            ui_method, ui_data);
 #endif
     if (loader == NULL
-        && (fetched_loader =
-            OSSL_STORE_LOADER_fetch(libctx, scheme, propq)) != NULL) {
-        const OSSL_PROVIDER *provider =
-            OSSL_STORE_LOADER_get0_provider(fetched_loader);
+        && (fetched_loader = OSSL_STORE_LOADER_fetch(libctx, scheme, propq)) != NULL) {
+        const OSSL_PROVIDER *provider = OSSL_STORE_LOADER_get0_provider(fetched_loader);
         void *provctx = OSSL_PROVIDER_get0_provider_ctx(provider);
         OSSL_CORE_BIO *cbio = ossl_core_bio_new_from_bio(bp);
 
@@ -1054,7 +1055,7 @@ OSSL_STORE_CTX *OSSL_STORE_attach(BIO *bp, const char *scheme,
             OSSL_STORE_LOADER_free(fetched_loader);
             fetched_loader = NULL;
         } else if (!loader_set_params(fetched_loader, loader_ctx,
-                                      params, propq)) {
+                       params, propq)) {
             (void)fetched_loader->p_close(loader_ctx);
             OSSL_STORE_LOADER_free(fetched_loader);
             fetched_loader = NULL;
diff --git a/crypto/store/store_local.h b/crypto/store/store_local.h
index 6ad79180a091f..f57313e9dfc47 100644
--- a/crypto/store/store_local.h
+++ b/crypto/store/store_local.h
@@ -26,18 +26,18 @@
 struct ossl_store_info_st {
     int type;
     union {
-        void *data;              /* used internally as generic pointer */
+        void *data; /* used internally as generic pointer */
 
         struct {
             char *name;
             char *desc;
-        } name;                  /* when type == OSSL_STORE_INFO_NAME */
+        } name; /* when type == OSSL_STORE_INFO_NAME */
 
-        EVP_PKEY *params;        /* when type == OSSL_STORE_INFO_PARAMS */
-        EVP_PKEY *pubkey;        /* when type == OSSL_STORE_INFO_PUBKEY */
-        EVP_PKEY *pkey;          /* when type == OSSL_STORE_INFO_PKEY */
-        X509 *x509;              /* when type == OSSL_STORE_INFO_CERT */
-        X509_CRL *crl;           /* when type == OSSL_STORE_INFO_CRL */
+        EVP_PKEY *params; /* when type == OSSL_STORE_INFO_PARAMS */
+        EVP_PKEY *pubkey; /* when type == OSSL_STORE_INFO_PUBKEY */
+        EVP_PKEY *pkey; /* when type == OSSL_STORE_INFO_PKEY */
+        X509 *x509; /* when type == OSSL_STORE_INFO_CERT */
+        X509_CRL *crl; /* when type == OSSL_STORE_INFO_CRL */
     } _;
 };
 DEFINE_STACK_OF(OSSL_STORE_INFO)
@@ -167,12 +167,12 @@ int ossl_store_file_detach_pem_bio_int(OSSL_STORE_LOADER_CTX *ctx);
  * -------------------
  */
 OSSL_STORE_LOADER *ossl_store_loader_fetch(OSSL_LIB_CTX *libctx,
-                                           const char *scheme,
-                                           const char *properties);
+    const char *scheme,
+    const char *properties);
 
 /* Standard function to handle the result from OSSL_FUNC_store_load() */
 struct ossl_load_result_data_st {
-    OSSL_STORE_INFO *v;          /* To be filled in */
+    OSSL_STORE_INFO *v; /* To be filled in */
     OSSL_STORE_CTX *ctx;
 };
 OSSL_CALLBACK ossl_store_handle_load_result;
diff --git a/crypto/store/store_meth.c b/crypto/store/store_meth.c
index 7cf69d229086c..09252df009610 100644
--- a/crypto/store/store_meth.c
+++ b/crypto/store/store_meth.c
@@ -74,9 +74,9 @@ static void free_loader(void *method)
 /* Data to be passed through ossl_method_construct() */
 struct loader_data_st {
     OSSL_LIB_CTX *libctx;
-    int scheme_id;               /* For get_loader_from_store() */
-    const char *scheme;          /* For get_loader_from_store() */
-    const char *propquery;       /* For get_loader_from_store() */
+    int scheme_id; /* For get_loader_from_store() */
+    const char *scheme; /* For get_loader_from_store() */
+    const char *propquery; /* For get_loader_from_store() */
 
     OSSL_METHOD_STORE *tmp_store; /* For get_tmp_loader_store() */
 
@@ -98,7 +98,7 @@ static void *get_tmp_loader_store(void *data)
     return methdata->tmp_store;
 }
 
- static void dealloc_tmp_loader_store(void *store)
+static void dealloc_tmp_loader_store(void *store)
 {
     if (store != NULL)
         ossl_method_store_free(store);
@@ -134,7 +134,7 @@ static int unreserve_loader_store(void *store, void *data)
 
 /* Get loader methods from a store, or put one in */
 static void *get_loader_from_store(void *store, const OSSL_PROVIDER **prov,
-                                   void *data)
+    void *data)
 {
     struct loader_data_st *methdata = data;
     void *method = NULL;
@@ -156,9 +156,9 @@ static void *get_loader_from_store(void *store, const OSSL_PROVIDER **prov,
 }
 
 static int put_loader_in_store(void *store, void *method,
-                               const OSSL_PROVIDER *prov,
-                               const char *scheme, const char *propdef,
-                               void *data)
+    const OSSL_PROVIDER *prov,
+    const char *scheme, const char *propdef,
+    void *data)
 {
     struct loader_data_st *methdata = data;
     OSSL_NAMEMAP *namemap;
@@ -172,11 +172,11 @@ static int put_loader_in_store(void *store, void *method,
         return 0;
 
     return ossl_method_store_add(store, prov, id, propdef, method,
-                                 up_ref_loader, free_loader);
+        up_ref_loader, free_loader);
 }
 
 static void *loader_from_algorithm(int scheme_id, const OSSL_ALGORITHM *algodef,
-                                   OSSL_PROVIDER *prov)
+    OSSL_PROVIDER *prov)
 {
     OSSL_STORE_LOADER *loader = NULL;
     const OSSL_DISPATCH *fns = algodef->implementation;
@@ -199,8 +199,7 @@ static void *loader_from_algorithm(int scheme_id, const OSSL_ALGORITHM *algodef,
             break;
         case OSSL_FUNC_STORE_SETTABLE_CTX_PARAMS:
             if (loader->p_settable_ctx_params == NULL)
-                loader->p_settable_ctx_params =
-                    OSSL_FUNC_store_settable_ctx_params(fns);
+                loader->p_settable_ctx_params = OSSL_FUNC_store_settable_ctx_params(fns);
             break;
         case OSSL_FUNC_STORE_SET_CTX_PARAMS:
             if (loader->p_set_ctx_params == NULL)
@@ -251,7 +250,7 @@ static void *loader_from_algorithm(int scheme_id, const OSSL_ALGORITHM *algodef,
  * then call loader_from_algorithm() with that identity number.
  */
 static void *construct_loader(const OSSL_ALGORITHM *algodef,
-                              OSSL_PROVIDER *prov, void *data)
+    OSSL_PROVIDER *prov, void *data)
 {
     /*
      * This function is only called if get_loader_from_store() returned
@@ -289,7 +288,7 @@ static void destruct_loader(void *method, void *data)
 /* Fetching support.  Can fetch by numeric identity or by scheme */
 static OSSL_STORE_LOADER *
 inner_loader_fetch(struct loader_data_st *methdata,
-                   const char *scheme, const char *properties)
+    const char *scheme, const char *properties)
 {
     OSSL_METHOD_STORE *store = get_loader_store(methdata->libctx);
     OSSL_NAMEMAP *namemap = ossl_namemap_stored(methdata->libctx);
@@ -329,8 +328,9 @@ inner_loader_fetch(struct loader_data_st *methdata,
         methdata->propquery = propq;
         methdata->flag_construct_error_occurred = 0;
         if ((method = ossl_method_construct(methdata->libctx, OSSL_OP_STORE,
-                                            &prov, 0 /* !force_cache */,
-                                            &mcm, methdata)) != NULL) {
+                 &prov, 0 /* !force_cache */,
+                 &mcm, methdata))
+            != NULL) {
             /*
              * If construction did create a method for us, we know that there
              * is a correct scheme_id, since those have already been calculated
@@ -339,7 +339,7 @@ inner_loader_fetch(struct loader_data_st *methdata,
             if (id == 0)
                 id = ossl_namemap_name2num(namemap, scheme);
             ossl_method_store_cache_set(store, prov, id, propq, method,
-                                        up_ref_loader, free_loader);
+                up_ref_loader, free_loader);
         }
 
         /*
@@ -351,29 +351,28 @@ inner_loader_fetch(struct loader_data_st *methdata,
 
     if ((id != 0 || scheme != NULL) && method == NULL) {
         int code = unsupported ? ERR_R_UNSUPPORTED : ERR_R_FETCH_FAILED;
-        const char *helpful_msg =
-            unsupported
-            ? ( "No store loader found. For standard store loaders you need "
-                "at least one of the default or base providers available. "
-                "Did you forget to load them? Info: " )
+        const char *helpful_msg = unsupported
+            ? ("No store loader found. For standard store loaders you need "
+               "at least one of the default or base providers available. "
+               "Did you forget to load them? Info: ")
             : "";
 
         if (scheme == NULL)
             scheme = ossl_namemap_num2name(namemap, id, 0);
         ERR_raise_data(ERR_LIB_OSSL_STORE, code,
-                       "%s%s, Scheme (%s : %d), Properties (%s)",
-                       helpful_msg,
-                       ossl_lib_ctx_get_descriptor(methdata->libctx),
-                       scheme == NULL ? "<null>" : scheme, id,
-                       properties == NULL ? "<null>" : properties);
+            "%s%s, Scheme (%s : %d), Properties (%s)",
+            helpful_msg,
+            ossl_lib_ctx_get_descriptor(methdata->libctx),
+            scheme == NULL ? "<null>" : scheme, id,
+            properties == NULL ? "<null>" : properties);
     }
 
     return method;
 }
 
 OSSL_STORE_LOADER *OSSL_STORE_LOADER_fetch(OSSL_LIB_CTX *libctx,
-                                           const char *scheme,
-                                           const char *properties)
+    const char *scheme,
+    const char *properties)
 {
     struct loader_data_st methdata;
     void *method;
@@ -467,9 +466,9 @@ static void do_one(ossl_unused int id, void *method, void *arg)
 }
 
 void OSSL_STORE_LOADER_do_all_provided(OSSL_LIB_CTX *libctx,
-                                       void (*user_fn)(OSSL_STORE_LOADER *loader,
-                                                       void *arg),
-                                       void *user_arg)
+    void (*user_fn)(OSSL_STORE_LOADER *loader,
+        void *arg),
+    void *user_arg)
 {
     struct loader_data_st methdata;
     struct do_one_data_st data;
@@ -487,8 +486,8 @@ void OSSL_STORE_LOADER_do_all_provided(OSSL_LIB_CTX *libctx,
 }
 
 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)
 {
     if (loader == NULL)
         return 0;
diff --git a/crypto/store/store_register.c b/crypto/store/store_register.c
index 6f73e197200dd..461d512bea060 100644
--- a/crypto/store/store_register.c
+++ b/crypto/store/store_register.c
@@ -62,71 +62,70 @@ const char *OSSL_STORE_LOADER_get0_scheme(const OSSL_STORE_LOADER *loader)
 }
 
 int OSSL_STORE_LOADER_set_open(OSSL_STORE_LOADER *loader,
-                               OSSL_STORE_open_fn open_function)
+    OSSL_STORE_open_fn open_function)
 {
     loader->open = open_function;
     return 1;
 }
 
-int OSSL_STORE_LOADER_set_open_ex
-    (OSSL_STORE_LOADER *loader,
-     OSSL_STORE_open_ex_fn open_ex_function)
+int OSSL_STORE_LOADER_set_open_ex(OSSL_STORE_LOADER *loader,
+    OSSL_STORE_open_ex_fn open_ex_function)
 {
     loader->open_ex = open_ex_function;
     return 1;
 }
 
 int OSSL_STORE_LOADER_set_attach(OSSL_STORE_LOADER *loader,
-                                 OSSL_STORE_attach_fn attach_function)
+    OSSL_STORE_attach_fn attach_function)
 {
     loader->attach = attach_function;
     return 1;
 }
 
 int OSSL_STORE_LOADER_set_ctrl(OSSL_STORE_LOADER *loader,
-                               OSSL_STORE_ctrl_fn ctrl_function)
+    OSSL_STORE_ctrl_fn ctrl_function)
 {
     loader->ctrl = ctrl_function;
     return 1;
 }
 
 int OSSL_STORE_LOADER_set_expect(OSSL_STORE_LOADER *loader,
-                                 OSSL_STORE_expect_fn expect_function)
+    OSSL_STORE_expect_fn expect_function)
 {
     loader->expect = expect_function;
     return 1;
 }
 
 int OSSL_STORE_LOADER_set_find(OSSL_STORE_LOADER *loader,
-                               OSSL_STORE_find_fn find_function)
+    OSSL_STORE_find_fn find_function)
 {
     loader->find = find_function;
     return 1;
 }
 
 int OSSL_STORE_LOADER_set_load(OSSL_STORE_LOADER *loader,
-                               OSSL_STORE_load_fn load_function)
+    OSSL_STORE_load_fn load_function)
 {
     loader->load = load_function;
     return 1;
 }
 
 int OSSL_STORE_LOADER_set_eof(OSSL_STORE_LOADER *loader,
-                              OSSL_STORE_eof_fn eof_function)
+    OSSL_STORE_eof_fn eof_function)
 {
     loader->eof = eof_function;
     return 1;
 }
 
 int OSSL_STORE_LOADER_set_error(OSSL_STORE_LOADER *loader,
-                                OSSL_STORE_error_fn error_function)
+    OSSL_STORE_error_fn error_function)
 {
     loader->error = error_function;
     return 1;
 }
 
 int OSSL_STORE_LOADER_set_close(OSSL_STORE_LOADER *loader,
-                                OSSL_STORE_close_fn close_function)
+    OSSL_STORE_close_fn close_function)
 {
     loader->closefn = close_function;
     return 1;
@@ -142,7 +141,7 @@ static unsigned long store_loader_hash(const OSSL_STORE_LOADER *v)
 }
 
 static int store_loader_cmp(const OSSL_STORE_LOADER *a,
-                            const OSSL_STORE_LOADER *b)
+    const OSSL_STORE_LOADER *b)
 {
     assert(a->scheme != NULL && b->scheme != NULL);
     return strcmp(a->scheme, b->scheme);
@@ -153,7 +152,7 @@ static int ossl_store_register_init(void)
 {
     if (loader_register == NULL) {
         loader_register = lh_OSSL_STORE_LOADER_new(store_loader_hash,
-                                                   store_loader_cmp);
+            store_loader_cmp);
     }
     return loader_register != NULL;
 }
@@ -171,13 +170,13 @@ int ossl_store_register_loader_int(OSSL_STORE_LOADER *loader)
      */
     if (ossl_isalpha(*scheme))
         while (*scheme != '\0'
-               && (ossl_isalpha(*scheme)
-                   || ossl_isdigit(*scheme)
-                   || strchr("+-.", *scheme) != NULL))
+            && (ossl_isalpha(*scheme)
+                || ossl_isdigit(*scheme)
+                || strchr("+-.", *scheme) != NULL))
             scheme++;
     if (*scheme != '\0') {
         ERR_raise_data(ERR_LIB_OSSL_STORE, OSSL_STORE_R_INVALID_SCHEME,
-                       "scheme=%s", loader->scheme);
+            "scheme=%s", loader->scheme);
         return 0;
     }
 
@@ -233,9 +232,10 @@ const OSSL_STORE_LOADER *ossl_store_get0_loader_int(const char *scheme)
     if (!ossl_store_register_init())
         ERR_raise(ERR_LIB_OSSL_STORE, ERR_R_INTERNAL_ERROR);
     else if ((loader = lh_OSSL_STORE_LOADER_retrieve(loader_register,
-                                                     &template)) == NULL)
+                  &template))
+        == NULL)
         ERR_raise_data(ERR_LIB_OSSL_STORE, OSSL_STORE_R_UNREGISTERED_SCHEME,
-                       "scheme=%s", scheme);
+            "scheme=%s", scheme);
 
     CRYPTO_THREAD_unlock(registry_lock);
 
@@ -264,9 +264,10 @@ OSSL_STORE_LOADER *ossl_store_unregister_loader_int(const char *scheme)
     if (!ossl_store_register_init())
         ERR_raise(ERR_LIB_OSSL_STORE, ERR_R_INTERNAL_ERROR);
     else if ((loader = lh_OSSL_STORE_LOADER_delete(loader_register,
-                                                   &template)) == NULL)
+                  &template))
+        == NULL)
         ERR_raise_data(ERR_LIB_OSSL_STORE, OSSL_STORE_R_UNREGISTERED_SCHEME,
-                       "scheme=%s", scheme);
+            "scheme=%s", scheme);
 
     CRYPTO_THREAD_unlock(registry_lock);
 
@@ -290,9 +291,10 @@ void ossl_store_destroy_loaders_int(void)
  */
 
 IMPLEMENT_LHASH_DOALL_ARG_CONST(OSSL_STORE_LOADER, void);
-int OSSL_STORE_do_all_loaders(void (*do_function) (const OSSL_STORE_LOADER
-                                                   *loader, void *do_arg),
-                              void *do_arg)
+int OSSL_STORE_do_all_loaders(void (*do_function)(const OSSL_STORE_LOADER
+                                                      *loader,
+                                  void *do_arg),
+    void *do_arg)
 {
     if (ossl_store_register_init())
         lh_OSSL_STORE_LOADER_doall_void(loader_register, do_function, do_arg);
diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c
index b5e50557c2386..84f306f1c7a17 100644
--- a/crypto/store/store_result.c
+++ b/crypto/store/store_result.c
@@ -32,7 +32,7 @@
  * numbers, negative ones should be fine.  They must never slip out from
  * this translation unit anyway.
  */
-# define OSSL_OBJECT_PKCS12 -1
+#define OSSL_OBJECT_PKCS12 -1
 #endif
 
 /*
@@ -75,22 +75,21 @@ struct extracted_param_data_st {
 
 static int try_name(struct extracted_param_data_st *, OSSL_STORE_INFO **);
 static int try_key(struct extracted_param_data_st *, OSSL_STORE_INFO **,
-                   OSSL_STORE_CTX *, const OSSL_PROVIDER *,
-                   OSSL_LIB_CTX *, const char *);
+    OSSL_STORE_CTX *, const OSSL_PROVIDER *,
+    OSSL_LIB_CTX *, const char *);
 static int try_cert(struct extracted_param_data_st *, OSSL_STORE_INFO **,
-                    OSSL_LIB_CTX *, const char *);
+    OSSL_LIB_CTX *, const char *);
 static int try_crl(struct extracted_param_data_st *, OSSL_STORE_INFO **,
-                   OSSL_LIB_CTX *, const char *);
+    OSSL_LIB_CTX *, const char *);
 static int try_pkcs12(struct extracted_param_data_st *, OSSL_STORE_INFO **,
-                      OSSL_STORE_CTX *, OSSL_LIB_CTX *, const char *);
+    OSSL_STORE_CTX *, OSSL_LIB_CTX *, const char *);
 
 int ossl_store_handle_load_result(const OSSL_PARAM params[], void *arg)
 {
     struct ossl_load_result_data_st *cbdata = arg;
     OSSL_STORE_INFO **v = &cbdata->v;
     OSSL_STORE_CTX *ctx = cbdata->ctx;
-    const OSSL_PROVIDER *provider =
-        OSSL_STORE_LOADER_get0_provider(ctx->fetched_loader);
+    const OSSL_PROVIDER *provider = OSSL_STORE_LOADER_get0_provider(ctx->fetched_loader);
     OSSL_LIB_CTX *libctx = ossl_provider_libctx(provider);
     const char *propq = ctx->properties;
     const OSSL_PARAM *p;
@@ -109,7 +108,7 @@ int ossl_store_handle_load_result(const OSSL_PARAM params[], void *arg)
     p = OSSL_PARAM_locate_const(params, OSSL_OBJECT_PARAM_DATA);
     if (p != NULL
         && !OSSL_PARAM_get_octet_string_ptr(p, &helper_data.octet_data,
-                                            &helper_data.octet_data_size)
+            &helper_data.octet_data_size)
         && !OSSL_PARAM_get_utf8_string_ptr(p, &helper_data.utf8_data))
         return 0;
     p = OSSL_PARAM_locate_const(params, OSSL_OBJECT_PARAM_DATA_STRUCTURE);
@@ -121,8 +120,7 @@ int ossl_store_handle_load_result(const OSSL_PARAM params[], void *arg)
         && !OSSL_PARAM_get_utf8_string_ptr(p, &helper_data.input_type))
         return 0;
     p = OSSL_PARAM_locate_const(params, OSSL_OBJECT_PARAM_REFERENCE);
-    if (p != NULL && !OSSL_PARAM_get_octet_string_ptr(p, &helper_data.ref,
-                                                      &helper_data.ref_size))
+    if (p != NULL && !OSSL_PARAM_get_octet_string_ptr(p, &helper_data.ref, &helper_data.ref_size))
         return 0;
     p = OSSL_PARAM_locate_const(params, OSSL_OBJECT_PARAM_DESC);
     if (p != NULL && !OSSL_PARAM_get_utf8_string_ptr(p, &helper_data.desc))
@@ -153,11 +151,22 @@ int ossl_store_handle_load_result(const OSSL_PARAM params[], void *arg)
         goto err;
     ERR_pop_to_mark();
 
-    if (*v == NULL)
-        ERR_raise(ERR_LIB_OSSL_STORE, ERR_R_UNSUPPORTED);
+    if (*v == NULL) {
+        const char *hint = "";
+
+        if (!OSSL_PROVIDER_available(libctx, "default"))
+            hint = ":maybe need to load the default provider?";
+        if (provider != NULL)
+            ERR_raise_data(ERR_LIB_OSSL_STORE, ERR_R_UNSUPPORTED, "provider=%s%s",
+                OSSL_PROVIDER_get0_name(provider), hint);
+        else if (hint[0] != '\0')
+            ERR_raise_data(ERR_LIB_OSSL_STORE, ERR_R_UNSUPPORTED, "%s", hint);
+        else
+            ERR_raise(ERR_LIB_OSSL_STORE, ERR_R_UNSUPPORTED);
+    }
 
     return (*v != NULL);
- err:
+err:
     ERR_clear_last_mark();
     return 0;
 }
@@ -190,9 +199,9 @@ static int try_name(struct extracted_param_data_st *data, OSSL_STORE_INFO **v)
  */
 
 static EVP_PKEY *try_key_ref(struct extracted_param_data_st *data,
-                             OSSL_STORE_CTX *ctx,
-                             const OSSL_PROVIDER *provider,
-                             OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_STORE_CTX *ctx,
+    const OSSL_PROVIDER *provider,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     EVP_PKEY *pk = NULL;
     EVP_KEYMGMT *keymgmt = NULL;
@@ -220,8 +229,7 @@ static EVP_PKEY *try_key_ref(struct extracted_param_data_st *data,
             keydata = evp_keymgmt_load(keymgmt, data->ref, data->ref_size);
         } else {
             struct evp_keymgmt_util_try_import_data_st import_data;
-            OSSL_FUNC_store_export_object_fn *export_object =
-                ctx->fetched_loader->p_export_object;
+            OSSL_FUNC_store_export_object_fn *export_object = ctx->fetched_loader->p_export_object;
 
             import_data.keymgmt = keymgmt;
             import_data.keydata = NULL;
@@ -233,9 +241,9 @@ static EVP_PKEY *try_key_ref(struct extracted_param_data_st *data,
                  * |import_data.keydata| is as much an indicator.
                  */
                 (void)export_object(ctx->loader_ctx,
-                                    data->ref, data->ref_size,
-                                    &evp_keymgmt_util_try_import,
-                                    &import_data);
+                    data->ref, data->ref_size,
+                    &evp_keymgmt_util_try_import,
+                    &import_data);
             }
 
             keydata = import_data.keydata;
@@ -244,7 +252,7 @@ static EVP_PKEY *try_key_ref(struct extracted_param_data_st *data,
         if (keydata == NULL && try_fallback > 0) {
             EVP_KEYMGMT_free(keymgmt);
             keymgmt = evp_keymgmt_fetch_from_prov((OSSL_PROVIDER *)provider,
-                                                  data->data_type, propq);
+                data->data_type, propq);
             if (keymgmt != NULL) {
                 ERR_pop_to_mark();
                 ERR_set_mark();
@@ -263,10 +271,10 @@ static EVP_PKEY *try_key_ref(struct extracted_param_data_st *data,
 }
 
 static EVP_PKEY *try_key_value(struct extracted_param_data_st *data,
-                               OSSL_STORE_CTX *ctx,
-                               OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg,
-                               OSSL_LIB_CTX *libctx, const char *propq,
-                               int *harderr)
+    OSSL_STORE_CTX *ctx,
+    OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg,
+    OSSL_LIB_CTX *libctx, const char *propq,
+    int *harderr)
 {
     EVP_PKEY *pk = NULL;
     OSSL_DECODER_CTX *decoderctx = NULL;
@@ -281,8 +289,7 @@ static EVP_PKEY *try_key_value(struct extracted_param_data_st *data,
         selection = OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
         break;
     case OSSL_STORE_INFO_PUBKEY:
-        selection =
-            OSSL_KEYMGMT_SELECT_PUBLIC_KEY
+        selection = OSSL_KEYMGMT_SELECT_PUBLIC_KEY
             | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
         break;
     case OSSL_STORE_INFO_PKEY:
@@ -292,10 +299,9 @@ static EVP_PKEY *try_key_value(struct extracted_param_data_st *data,
         return NULL;
     }
 
-    decoderctx =
-        OSSL_DECODER_CTX_new_for_pkey(&pk, data->input_type, data->data_structure,
-                                      data->data_type, selection, libctx,
-                                      propq);
+    decoderctx = OSSL_DECODER_CTX_new_for_pkey(&pk, data->input_type, data->data_structure,
+        data->data_type, selection, libctx,
+        propq);
     (void)OSSL_DECODER_CTX_set_passphrase_cb(decoderctx, cb, cbarg);
 
     /* No error if this couldn't be decoded */
@@ -311,10 +317,10 @@ static EVP_PKEY *try_key_value(struct extracted_param_data_st *data,
 typedef OSSL_STORE_INFO *store_info_new_fn(EVP_PKEY *);
 
 static EVP_PKEY *try_key_value_legacy(struct extracted_param_data_st *data,
-                                      store_info_new_fn **store_info_new,
-                                      OSSL_STORE_CTX *ctx,
-                                      OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg,
-                                      OSSL_LIB_CTX *libctx, const char *propq)
+    store_info_new_fn **store_info_new,
+    OSSL_STORE_CTX *ctx,
+    OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     EVP_PKEY *pk = NULL;
     const unsigned char *der = data->octet_data, *derp;
@@ -360,8 +366,8 @@ static EVP_PKEY *try_key_value_legacy(struct extracted_param_data_st *data,
                  * will be NULL on error anyway.
                  */
                 PKCS12_pbe_crypt(alg, pbuf, plen,
-                                 oct->data, oct->length,
-                                 &new_der, &len, 0);
+                    oct->data, oct->length,
+                    &new_der, &len, 0);
                 der_len = len;
                 der = new_der;
             }
@@ -393,8 +399,8 @@ static EVP_PKEY *try_key_value_legacy(struct extracted_param_data_st *data,
 }
 
 static int try_key(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
-                   OSSL_STORE_CTX *ctx, const OSSL_PROVIDER *provider,
-                   OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_STORE_CTX *ctx, const OSSL_PROVIDER *provider,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     store_info_new_fn *store_info_new = NULL;
     int harderr = 0;
@@ -430,7 +436,7 @@ static int try_key(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
              */
             if (pk == NULL && harderr == 0)
                 pk = try_key_value_legacy(data, &store_info_new, ctx,
-                                          cb, cbarg, libctx, propq);
+                    cb, cbarg, libctx, propq);
         }
 
         if (pk != NULL) {
@@ -448,7 +454,7 @@ static int try_key(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
                 if (evp_keymgmt_util_has(pk, OSSL_KEYMGMT_SELECT_PRIVATE_KEY))
                     store_info_new = OSSL_STORE_INFO_new_PKEY;
                 else if (evp_keymgmt_util_has(pk,
-                                              OSSL_KEYMGMT_SELECT_PUBLIC_KEY))
+                             OSSL_KEYMGMT_SELECT_PUBLIC_KEY))
                     store_info_new = OSSL_STORE_INFO_new_PUBKEY;
                 else
                     store_info_new = OSSL_STORE_INFO_new_PARAMS;
@@ -464,7 +470,7 @@ static int try_key(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
 }
 
 static int try_cert(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
-                    OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     if (data->object_type == OSSL_OBJECT_UNKNOWN
         || data->object_type == OSSL_OBJECT_CERT) {
@@ -489,10 +495,12 @@ static int try_cert(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
             ignore_trusted = 0;
 
         if (d2i_X509_AUX(&cert, (const unsigned char **)&data->octet_data,
-                         data->octet_data_size) == NULL
+                data->octet_data_size)
+                == NULL
             && (!ignore_trusted
                 || d2i_X509(&cert, (const unsigned char **)&data->octet_data,
-                            data->octet_data_size) == NULL)) {
+                       data->octet_data_size)
+                    == NULL)) {
             X509_free(cert);
             cert = NULL;
         }
@@ -510,14 +518,14 @@ static int try_cert(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
 }
 
 static int try_crl(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
-                   OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     if (data->object_type == OSSL_OBJECT_UNKNOWN
         || data->object_type == OSSL_OBJECT_CRL) {
         X509_CRL *crl;
 
         crl = d2i_X509_CRL(NULL, (const unsigned char **)&data->octet_data,
-                           data->octet_data_size);
+            data->octet_data_size);
 
         if (crl != NULL)
             /* We determined the object type */
@@ -538,8 +546,8 @@ static int try_crl(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
 }
 
 static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
-                      OSSL_STORE_CTX *ctx,
-                      OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_STORE_CTX *ctx,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     int ok = 1;
 
@@ -549,7 +557,7 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
         PKCS12 *p12;
 
         p12 = d2i_PKCS12(NULL, (const unsigned char **)&data->octet_data,
-                         data->octet_data_size);
+            data->octet_data_size);
 
         if (p12 != NULL) {
             char *pass = NULL;
@@ -561,7 +569,7 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
 
             data->object_type = OSSL_OBJECT_PKCS12;
 
-            ok = 0;              /* Assume decryption or parse error */
+            ok = 0; /* Assume decryption or parse error */
 
             if (!PKCS12_mac_present(p12)
                 || PKCS12_verify_mac(p12, NULL, 0)) {
@@ -572,16 +580,16 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
                 static char prompt_info[] = "PKCS12 import pass phrase";
                 OSSL_PARAM pw_params[] = {
                     OSSL_PARAM_utf8_string(OSSL_PASSPHRASE_PARAM_INFO,
-                                           prompt_info,
-                                           sizeof(prompt_info) - 1),
+                        prompt_info,
+                        sizeof(prompt_info) - 1),
                     OSSL_PARAM_END
                 };
 
                 if (!ossl_pw_get_passphrase(tpass, sizeof(tpass) - 1,
-                                            &tpass_len,
-                                            pw_params, 0, &ctx->pwdata)) {
+                        &tpass_len,
+                        pw_params, 0, &ctx->pwdata)) {
                     ERR_raise(ERR_LIB_OSSL_STORE,
-                              OSSL_STORE_R_PASSPHRASE_CALLBACK_ERROR);
+                        OSSL_STORE_R_PASSPHRASE_CALLBACK_ERROR);
                     goto p12_end;
                 }
                 pass = tpass;
@@ -592,9 +600,8 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
                 pass[tpass_len] = '\0';
                 if (!PKCS12_verify_mac(p12, pass, tpass_len)) {
                     ERR_raise_data(ERR_LIB_OSSL_STORE,
-                                   OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC,
-                                   tpass_len == 0 ? "empty password" :
-                                   "maybe wrong password");
+                        OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC,
+                        tpass_len == 0 ? "empty password" : "maybe wrong password");
                     goto p12_end;
                 }
             }
@@ -605,7 +612,7 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
                 OSSL_STORE_INFO *osi_cert = NULL;
                 OSSL_STORE_INFO *osi_ca = NULL;
 
-                ok = 1;          /* Parsing went through correctly! */
+                ok = 1; /* Parsing went through correctly! */
 
                 if ((infos = sk_OSSL_STORE_INFO_new_null()) != NULL) {
                     if (pkey != NULL) {
@@ -649,7 +656,7 @@ static int try_pkcs12(struct extracted_param_data_st *data, OSSL_STORE_INFO **v,
                 }
                 ctx->cached_info = infos;
             }
-         p12_end:
+        p12_end:
             OPENSSL_cleanse(tpass, sizeof(tpass));
             PKCS12_free(p12);
         }
diff --git a/crypto/store/store_strings.c b/crypto/store/store_strings.c
index 45c3f52acbf41..a5d0b6312cf9e 100644
--- a/crypto/store/store_strings.c
+++ b/crypto/store/store_strings.c
@@ -12,12 +12,12 @@
 #include "internal/nelem.h"
 
 static char *type_strings[] = {
-    "Name",                      /* OSSL_STORE_INFO_NAME */
-    "Parameters",                /* OSSL_STORE_INFO_PARAMS */
-    "Public key",                /* OSSL_STORE_INFO_PUBKEY */
-    "Pkey",                      /* OSSL_STORE_INFO_PKEY */
-    "Certificate",               /* OSSL_STORE_INFO_CERT */
-    "CRL"                        /* OSSL_STORE_INFO_CRL */
+    "Name", /* OSSL_STORE_INFO_NAME */
+    "Parameters", /* OSSL_STORE_INFO_PARAMS */
+    "Public key", /* OSSL_STORE_INFO_PUBKEY */
+    "Pkey", /* OSSL_STORE_INFO_PKEY */
+    "Certificate", /* OSSL_STORE_INFO_CERT */
+    "CRL" /* OSSL_STORE_INFO_CRL */
 };
 
 const char *OSSL_STORE_INFO_type_string(int type)
diff --git a/crypto/thread/arch.c b/crypto/thread/arch.c
index 7c139a6a60cf8..d02e9ead45809 100644
--- a/crypto/thread/arch.c
+++ b/crypto/thread/arch.c
@@ -11,7 +11,7 @@
 #include <internal/thread_arch.h>
 
 CRYPTO_THREAD *ossl_crypto_thread_native_start(CRYPTO_THREAD_ROUTINE routine,
-                                               void *data, int joinable)
+    void *data, int joinable)
 {
     CRYPTO_THREAD *handle;
 
diff --git a/crypto/thread/arch/thread_none.c b/crypto/thread/arch/thread_none.c
index 10a804f1b78ee..531f628025e58 100644
--- a/crypto/thread/arch/thread_none.c
+++ b/crypto/thread/arch/thread_none.c
@@ -63,7 +63,7 @@ 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)
 {
 }
 
diff --git a/crypto/thread/arch/thread_posix.c b/crypto/thread/arch/thread_posix.c
index 7650ddc85abee..1b285a690e48f 100644
--- a/crypto/thread/arch/thread_posix.c
+++ b/crypto/thread/arch/thread_posix.c
@@ -10,10 +10,10 @@
 #include <internal/thread_arch.h>
 
 #if defined(OPENSSL_THREADS_POSIX)
-# define _GNU_SOURCE
-# include <errno.h>
-# include <sys/types.h>
-# include <unistd.h>
+#define _GNU_SOURCE
+#include <errno.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 static void *thread_start_thunk(void *vthread)
 {
@@ -68,7 +68,7 @@ int ossl_crypto_thread_native_perform_join(CRYPTO_THREAD *thread, CRYPTO_THREAD_
     if (thread == NULL || thread->handle == NULL)
         return 0;
 
-    handle = (pthread_t *) thread->handle;
+    handle = (pthread_t *)thread->handle;
     if (pthread_join(*handle, &thread_retval) != 0)
         return 0;
 
@@ -162,7 +162,7 @@ CRYPTO_CONDVAR *ossl_crypto_condvar_new(void)
         OPENSSL_free(cv_p);
         return NULL;
     }
-    return (CRYPTO_CONDVAR *) cv_p;
+    return (CRYPTO_CONDVAR *)cv_p;
 }
 
 void ossl_crypto_condvar_wait(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *mutex)
@@ -176,7 +176,7 @@ 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)
 {
     pthread_cond_t *cv_p = (pthread_cond_t *)cv;
     pthread_mutex_t *mutex_p = (pthread_mutex_t *)mutex;
diff --git a/crypto/thread/arch/thread_win.c b/crypto/thread/arch/thread_win.c
index fc0c2147701e7..541d0586eb0ae 100644
--- a/crypto/thread/arch/thread_win.c
+++ b/crypto/thread/arch/thread_win.c
@@ -10,8 +10,8 @@
 #include <internal/thread_arch.h>
 
 #if defined(OPENSSL_THREADS_WINNT)
-# include <process.h>
-# include <windows.h>
+#include <process.h>
+#include <windows.h>
 
 static unsigned __stdcall thread_start_thunk(LPVOID vthread)
 {
@@ -61,7 +61,7 @@ int ossl_crypto_thread_native_perform_join(CRYPTO_THREAD *thread, CRYPTO_THREAD_
     if (thread == NULL || thread->handle == NULL)
         return 0;
 
-    handle = (HANDLE *) thread->handle;
+    handle = (HANDLE *)thread->handle;
     if (WaitForSingleObject(*handle, INFINITE) != WAIT_OBJECT_0)
         return 0;
 
@@ -172,8 +172,8 @@ static int determine_timeout(OSSL_TIME deadline, DWORD *w_timeout_p)
     return 1;
 }
 
-# if defined(OPENSSL_THREADS_WINNT_LEGACY)
-#  include <assert.h>
+#if defined(OPENSSL_THREADS_WINNT_LEGACY)
+#include <assert.h>
 
 /*
  * Win32, before Vista, did not have an OS-provided condition variable
@@ -280,9 +280,9 @@ static int determine_timeout(OSSL_TIME deadline, DWORD *w_timeout_p)
  *
  */
 typedef struct legacy_condvar_st {
-    CRYPTO_MUTEX    *int_m;       /* internal mutex */
-    HANDLE          sema;         /* main wait semaphore */
-    HANDLE          prewait_sema; /* prewait semaphore */
+    CRYPTO_MUTEX *int_m; /* internal mutex */
+    HANDLE sema; /* main wait semaphore */
+    HANDLE prewait_sema; /* prewait semaphore */
     /*
      * All of the following fields are protected by int_m.
      *
@@ -290,11 +290,11 @@ typedef struct legacy_condvar_st {
      * num_wait. num_wait can decrease for other reasons (for example due to a
      * wait operation timing out).
      */
-    size_t          num_wait;     /* Num. threads currently blocked */
-    size_t          num_wake;     /* Num. threads due to wake up */
-    size_t          num_prewait;  /* Num. threads in prewait */
-    size_t          gen;          /* Prewait generation */
-    int             closed;       /* Is closed? */
+    size_t num_wait; /* Num. threads currently blocked */
+    size_t num_wake; /* Num. threads due to wake up */
+    size_t num_prewait; /* Num. threads in prewait */
+    size_t gen; /* Prewait generation */
+    int closed; /* Is closed? */
 } LEGACY_CONDVAR;
 
 CRYPTO_CONDVAR *ossl_crypto_condvar_new(void)
@@ -322,10 +322,10 @@ CRYPTO_CONDVAR *ossl_crypto_condvar_new(void)
         return NULL;
     }
 
-    cv->num_wait      = 0;
-    cv->num_wake      = 0;
-    cv->num_prewait   = 0;
-    cv->closed        = 0;
+    cv->num_wait = 0;
+    cv->num_wake = 0;
+    cv->num_prewait = 0;
+    cv->closed = 0;
 
     return (CRYPTO_CONDVAR *)cv;
 }
@@ -355,7 +355,7 @@ static uint32_t obj_wait(HANDLE h, OSSL_TIME deadline)
 }
 
 void ossl_crypto_condvar_wait_timeout(CRYPTO_CONDVAR *cv_, CRYPTO_MUTEX *ext_m,
-                                      OSSL_TIME deadline)
+    OSSL_TIME deadline)
 {
     LEGACY_CONDVAR *cv = (LEGACY_CONDVAR *)cv_;
     int closed, set_prewait = 0, have_orig_gen = 0;
@@ -499,9 +499,9 @@ void ossl_crypto_condvar_broadcast(CRYPTO_CONDVAR *cv_)
         return;
     }
 
-    cv->num_wake  += num_wake;
-    cv->num_wait  -= num_wake;
-    cv->closed     = 1;
+    cv->num_wake += num_wake;
+    cv->num_wait -= num_wake;
+    cv->closed = 1;
 
     ossl_crypto_mutex_unlock(cv->int_m);
     ReleaseSemaphore(cv->sema, num_wake, NULL);
@@ -529,7 +529,7 @@ void ossl_crypto_condvar_signal(CRYPTO_CONDVAR *cv_)
     ReleaseSemaphore(cv->sema, 1, NULL);
 }
 
-# else
+#else
 
 CRYPTO_CONDVAR *ossl_crypto_condvar_new(void)
 {
@@ -552,7 +552,7 @@ 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)
 {
     DWORD timeout;
     CONDITION_VARIABLE *cv_p = (CONDITION_VARIABLE *)cv;
@@ -589,7 +589,7 @@ void ossl_crypto_condvar_free(CRYPTO_CONDVAR **cv)
     *cv_p = NULL;
 }
 
-# endif
+#endif
 
 void ossl_crypto_mem_barrier(void)
 {
diff --git a/crypto/thread/internal.c b/crypto/thread/internal.c
index 61486c8d4d586..eada15ec8852f 100644
--- a/crypto/thread/internal.c
+++ b/crypto/thread/internal.c
@@ -38,7 +38,7 @@ uint64_t ossl_get_avail_threads(OSSL_LIB_CTX *ctx)
 }
 
 void *ossl_crypto_thread_start(OSSL_LIB_CTX *ctx, CRYPTO_THREAD_ROUTINE start,
-                               void *data)
+    void *data)
 {
     CRYPTO_THREAD *thread;
     OSSL_LIB_CTX_THREADS *tdata = OSSL_LIB_CTX_GET_THREADS(ctx);
@@ -67,7 +67,7 @@ void *ossl_crypto_thread_start(OSSL_LIB_CTX *ctx, CRYPTO_THREAD_ROUTINE start,
     thread->ctx = ctx;
 
 fail:
-    return (void *) thread;
+    return (void *)thread;
 }
 
 int ossl_crypto_thread_join(void *vhandle, CRYPTO_THREAD_RETVAL *retval)
@@ -107,7 +107,7 @@ ossl_inline uint64_t ossl_get_avail_threads(OSSL_LIB_CTX *ctx)
 }
 
 void *ossl_crypto_thread_start(OSSL_LIB_CTX *ctx, CRYPTO_THREAD_ROUTINE start,
-                               void *data)
+    void *data)
 {
     return NULL;
 }
@@ -146,7 +146,7 @@ void *ossl_threads_ctx_new(OSSL_LIB_CTX *ctx)
 
 void ossl_threads_ctx_free(void *vdata)
 {
-    OSSL_LIB_CTX_THREADS *t = (OSSL_LIB_CTX_THREADS *) vdata;
+    OSSL_LIB_CTX_THREADS *t = (OSSL_LIB_CTX_THREADS *)vdata;
 
     if (t == NULL)
         return;
diff --git a/crypto/threads_lib.c b/crypto/threads_lib.c
index 240ef726ec789..25807ef4a898a 100644
--- a/crypto/threads_lib.c
+++ b/crypto/threads_lib.c
@@ -9,7 +9,7 @@
 #include <openssl/crypto.h>
 
 #ifdef OPENSSL_SYS_UNIX
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 
 void OPENSSL_fork_prepare(void)
 {
@@ -23,5 +23,5 @@ void OPENSSL_fork_child(void)
 {
 }
 
-# endif
+#endif
 #endif
diff --git a/crypto/threads_none.c b/crypto/threads_none.c
index 240b7d9fdcfe0..f107d909c9055 100644
--- a/crypto/threads_none.c
+++ b/crypto/threads_none.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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
@@ -10,21 +10,22 @@
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
 #include "internal/rcu.h"
+#include "crypto/cryptlib.h"
 #include "rcu_internal.h"
 
 #if !defined(OPENSSL_THREADS) || defined(CRYPTO_TDEBUG)
 
-# if defined(OPENSSL_SYS_UNIX)
-#  include <sys/types.h>
-#  include <unistd.h>
-# endif
+#if defined(OPENSSL_SYS_UNIX)
+#include <sys/types.h>
+#include <unistd.h>
+#endif
 
 struct rcu_lock_st {
     struct rcu_cb_item *cb_items;
 };
 
 CRYPTO_RCU_LOCK *ossl_rcu_lock_new(int num_writers,
-                                   ossl_unused OSSL_LIB_CTX *ctx)
+    ossl_unused OSSL_LIB_CTX *ctx)
 {
     struct rcu_lock_st *lock;
 
@@ -130,7 +131,8 @@ int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
     return 1;
 }
 
-void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock) {
+void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock)
+{
     if (lock == NULL)
         return;
 
@@ -151,20 +153,35 @@ int CRYPTO_THREAD_run_once(CRYPTO_ONCE *once, void (*init)(void))
     return 1;
 }
 
-# define OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX 256
+#define OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX 256
 
-static void *thread_local_storage[OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX];
+struct thread_local_storage_entry {
+    void *data;
+    uint8_t used;
+};
+
+static struct thread_local_storage_entry thread_local_storage[OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX];
 
 int CRYPTO_THREAD_init_local(CRYPTO_THREAD_LOCAL *key, void (*cleanup)(void *))
 {
-    static unsigned int thread_local_key = 0;
+    int entry_idx = 0;
 
-    if (thread_local_key >= OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX)
+#ifndef FIPS_MODULE
+    if (!ossl_init_thread())
         return 0;
+#endif
 
-    *key = thread_local_key++;
+    for (entry_idx = 0; entry_idx < OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX; entry_idx++) {
+        if (!thread_local_storage[entry_idx].used)
+            break;
+    }
+
+    if (entry_idx == OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX)
+        return 0;
 
-    thread_local_storage[*key] = NULL;
+    *key = entry_idx;
+    thread_local_storage[*key].used = 1;
+    thread_local_storage[*key].data = NULL;
 
     return 1;
 }
@@ -174,7 +191,7 @@ void *CRYPTO_THREAD_get_local(CRYPTO_THREAD_LOCAL *key)
     if (*key >= OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX)
         return NULL;
 
-    return thread_local_storage[*key];
+    return thread_local_storage[*key].data;
 }
 
 int CRYPTO_THREAD_set_local(CRYPTO_THREAD_LOCAL *key, void *val)
@@ -182,20 +199,25 @@ int CRYPTO_THREAD_set_local(CRYPTO_THREAD_LOCAL *key, void *val)
     if (*key >= OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX)
         return 0;
 
-    thread_local_storage[*key] = val;
+    thread_local_storage[*key].data = val;
 
     return 1;
 }
 
 int CRYPTO_THREAD_cleanup_local(CRYPTO_THREAD_LOCAL *key)
 {
+    if (*key >= OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX)
+        return 0;
+
+    thread_local_storage[*key].used = 0;
+    thread_local_storage[*key].data = NULL;
     *key = OPENSSL_CRYPTO_THREAD_LOCAL_KEY_MAX + 1;
     return 1;
 }
 
 CRYPTO_THREAD_ID CRYPTO_THREAD_get_current_id(void)
 {
-    return 0;
+    return 1;
 }
 
 int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b)
@@ -206,41 +228,41 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b)
 int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
 {
     *val += amount;
-    *ret  = *val;
+    *ret = *val;
 
     return 1;
 }
 
 int CRYPTO_atomic_add64(uint64_t *val, uint64_t op, uint64_t *ret,
-                        CRYPTO_RWLOCK *lock)
+    CRYPTO_RWLOCK *lock)
 {
     *val += op;
-    *ret  = *val;
+    *ret = *val;
 
     return 1;
 }
 
 int CRYPTO_atomic_and(uint64_t *val, uint64_t op, uint64_t *ret,
-                      CRYPTO_RWLOCK *lock)
+    CRYPTO_RWLOCK *lock)
 {
     *val &= op;
-    *ret  = *val;
+    *ret = *val;
 
     return 1;
 }
 
 int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
-                     CRYPTO_RWLOCK *lock)
+    CRYPTO_RWLOCK *lock)
 {
     *val |= op;
-    *ret  = *val;
+    *ret = *val;
 
     return 1;
 }
 
 int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
 {
-    *ret  = *val;
+    *ret = *val;
 
     return 1;
 }
@@ -266,10 +288,10 @@ int openssl_init_fork_handlers(void)
 
 int openssl_get_fork_id(void)
 {
-# if defined(OPENSSL_SYS_UNIX)
+#if defined(OPENSSL_SYS_UNIX)
     return getpid();
-# else
+#else
     return 0;
-# endif
+#endif
 }
 #endif
diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index 6b8fc258dc7d1..b1a4a63a2748d 100644
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -17,25 +17,27 @@
 #include "rcu_internal.h"
 
 #if defined(__clang__) && defined(__has_feature)
-# if __has_feature(thread_sanitizer)
-#  define __SANITIZE_THREAD__
-# endif
+#if __has_feature(thread_sanitizer)
+#define __SANITIZE_THREAD__
+#endif
 #endif
 
 #if defined(__SANITIZE_THREAD__)
-# include <sanitizer/tsan_interface.h>
-# define TSAN_FAKE_UNLOCK(x)   __tsan_mutex_pre_unlock((x), 0); \
-__tsan_mutex_post_unlock((x), 0)
-
-# define TSAN_FAKE_LOCK(x)  __tsan_mutex_pre_lock((x), 0); \
-__tsan_mutex_post_lock((x), 0, 0)
+#include <sanitizer/tsan_interface.h>
+#define TSAN_FAKE_UNLOCK(x)          \
+    __tsan_mutex_pre_unlock((x), 0); \
+    __tsan_mutex_post_unlock((x), 0)
+
+#define TSAN_FAKE_LOCK(x)          \
+    __tsan_mutex_pre_lock((x), 0); \
+    __tsan_mutex_post_lock((x), 0, 0)
 #else
-# define TSAN_FAKE_UNLOCK(x)
-# define TSAN_FAKE_LOCK(x)
+#define TSAN_FAKE_UNLOCK(x)
+#define TSAN_FAKE_LOCK(x)
 #endif
 
 #if defined(__sun)
-# include <atomic.h>
+#include <atomic.h>
 #endif
 
 #if defined(__apple_build_version__) && __apple_build_version__ < 6000000
@@ -47,25 +49,27 @@ __tsan_mutex_post_lock((x), 0, 0)
  *
  * See: https://github.com/llvm/llvm-project/commit/a4c2602b714e6c6edb98164550a5ae829b2de760
  */
-# define BROKEN_CLANG_ATOMICS
+#define BROKEN_CLANG_ATOMICS
 #endif
 
 #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)
 
-# if defined(OPENSSL_SYS_UNIX)
-#  include <sys/types.h>
-#  include <unistd.h>
-# endif
+#if defined(OPENSSL_SYS_UNIX)
+#include <sys/types.h>
+#include <unistd.h>
+#endif
 
-# include <assert.h>
+#include <assert.h>
 
 /*
  * The Non-Stop KLT thread model currently seems broken in its rwlock
  * implementation
+ * Likewise is there a problem with the glibc implementation on riscv.
  */
-# if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_)
-#  define USE_RWLOCK
-# endif
+#if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_) \
+    && !defined(__riscv)
+#define USE_RWLOCK
+#endif
 
 /*
  * For all GNU/clang atomic builtins, we also need fallbacks, to cover all
@@ -91,34 +95,34 @@ __tsan_mutex_post_lock((x), 0, 0)
  */
 typedef void *pvoid;
 
-# if defined(__GNUC__) && defined(__ATOMIC_ACQUIRE) && !defined(BROKEN_CLANG_ATOMICS) \
+#if defined(__GNUC__) && defined(__ATOMIC_ACQUIRE) && !defined(BROKEN_CLANG_ATOMICS) \
     && !defined(USE_ATOMIC_FALLBACKS)
-#  define ATOMIC_LOAD_N(t, p, o) __atomic_load_n(p, o)
-#  define ATOMIC_STORE_N(t, p, v, o) __atomic_store_n(p, v, o)
-#  define ATOMIC_STORE(t, p, v, o) __atomic_store(p, v, o)
-#  define ATOMIC_ADD_FETCH(p, v, o) __atomic_add_fetch(p, v, o)
-#  define ATOMIC_SUB_FETCH(p, v, o) __atomic_sub_fetch(p, v, o)
-# else
+#define ATOMIC_LOAD_N(t, p, o) __atomic_load_n(p, o)
+#define ATOMIC_STORE_N(t, p, v, o) __atomic_store_n(p, v, o)
+#define ATOMIC_STORE(t, p, v, o) __atomic_store(p, v, o)
+#define ATOMIC_ADD_FETCH(p, v, o) __atomic_add_fetch(p, v, o)
+#define ATOMIC_SUB_FETCH(p, v, o) __atomic_sub_fetch(p, v, o)
+#else
 static pthread_mutex_t atomic_sim_lock = PTHREAD_MUTEX_INITIALIZER;
 
-#  define IMPL_fallback_atomic_load_n(t)                        \
-    static ossl_inline t fallback_atomic_load_n_##t(t *p)            \
-    {                                                           \
-        t ret;                                                  \
-                                                                \
-        pthread_mutex_lock(&atomic_sim_lock);                   \
-        ret = *p;                                               \
-        pthread_mutex_unlock(&atomic_sim_lock);                 \
-        return ret;                                             \
+#define IMPL_fallback_atomic_load_n(t)                    \
+    static ossl_inline t fallback_atomic_load_n_##t(t *p) \
+    {                                                     \
+        t ret;                                            \
+                                                          \
+        pthread_mutex_lock(&atomic_sim_lock);             \
+        ret = *p;                                         \
+        pthread_mutex_unlock(&atomic_sim_lock);           \
+        return ret;                                       \
     }
 IMPL_fallback_atomic_load_n(uint32_t)
-IMPL_fallback_atomic_load_n(uint64_t)
-IMPL_fallback_atomic_load_n(pvoid)
+    IMPL_fallback_atomic_load_n(uint64_t)
+        IMPL_fallback_atomic_load_n(pvoid)
 
-#  define ATOMIC_LOAD_N(t, p, o) fallback_atomic_load_n_##t(p)
+#define ATOMIC_LOAD_N(t, p, o) fallback_atomic_load_n_##t(p)
 
-#  define IMPL_fallback_atomic_store_n(t)                       \
-    static ossl_inline t fallback_atomic_store_n_##t(t *p, t v)      \
+#define IMPL_fallback_atomic_store_n(t)                         \
+    static ossl_inline t fallback_atomic_store_n_##t(t *p, t v) \
     {                                                           \
         t ret;                                                  \
                                                                 \
@@ -128,29 +132,29 @@ IMPL_fallback_atomic_load_n(pvoid)
         pthread_mutex_unlock(&atomic_sim_lock);                 \
         return ret;                                             \
     }
-IMPL_fallback_atomic_store_n(uint32_t)
+            IMPL_fallback_atomic_store_n(uint32_t)
 
-#  define ATOMIC_STORE_N(t, p, v, o) fallback_atomic_store_n_##t(p, v)
+#define ATOMIC_STORE_N(t, p, v, o) fallback_atomic_store_n_##t(p, v)
 
-#  define IMPL_fallback_atomic_store(t)                         \
-    static ossl_inline void fallback_atomic_store_##t(t *p, t *v)    \
-    {                                                           \
-        pthread_mutex_lock(&atomic_sim_lock);                   \
-        *p = *v;                                                \
-        pthread_mutex_unlock(&atomic_sim_lock);                 \
+#define IMPL_fallback_atomic_store(t)                             \
+    static ossl_inline void fallback_atomic_store_##t(t *p, t *v) \
+    {                                                             \
+        pthread_mutex_lock(&atomic_sim_lock);                     \
+        *p = *v;                                                  \
+        pthread_mutex_unlock(&atomic_sim_lock);                   \
     }
-IMPL_fallback_atomic_store(pvoid)
+                IMPL_fallback_atomic_store(pvoid)
 
-#  define ATOMIC_STORE(t, p, v, o) fallback_atomic_store_##t(p, v)
+#define ATOMIC_STORE(t, p, v, o) fallback_atomic_store_##t(p, v)
 
-/*
- * The fallbacks that follow don't need any per type implementation, as
- * they are designed for uint64_t only.  If there comes a time when multiple
- * types need to be covered, it's relatively easy to refactor them the same
- * way as the fallbacks above.
- */
+    /*
+     * The fallbacks that follow don't need any per type implementation, as
+     * they are designed for uint64_t only.  If there comes a time when multiple
+     * types need to be covered, it's relatively easy to refactor them the same
+     * way as the fallbacks above.
+     */
 
-static ossl_inline uint64_t fallback_atomic_add_fetch(uint64_t *p, uint64_t v)
+    static ossl_inline uint64_t fallback_atomic_add_fetch(uint64_t *p, uint64_t v)
 {
     uint64_t ret;
 
@@ -161,7 +165,7 @@ static ossl_inline uint64_t fallback_atomic_add_fetch(uint64_t *p, uint64_t v)
     return ret;
 }
 
-#  define ATOMIC_ADD_FETCH(p, v, o) fallback_atomic_add_fetch(p, v)
+#define ATOMIC_ADD_FETCH(p, v, o) fallback_atomic_add_fetch(p, v)
 
 static ossl_inline uint64_t fallback_atomic_sub_fetch(uint64_t *p, uint64_t v)
 {
@@ -174,8 +178,8 @@ static ossl_inline uint64_t fallback_atomic_sub_fetch(uint64_t *p, uint64_t v)
     return ret;
 }
 
-#  define ATOMIC_SUB_FETCH(p, v, o) fallback_atomic_sub_fetch(p, v)
-# endif
+#define ATOMIC_SUB_FETCH(p, v, o) fallback_atomic_sub_fetch(p, v)
+#endif
 
 /*
  * This is the core of an rcu lock. It tracks the readers and writers for the
@@ -193,7 +197,7 @@ struct thread_qp {
     CRYPTO_RCU_LOCK *lock;
 };
 
-# define MAX_QPS 10
+#define MAX_QPS 10
 /*
  * This is the per thread tracking data
  * that is assigned to each thread participating
@@ -217,13 +221,12 @@ struct rcu_lock_st {
     /* The context we are being created against */
     OSSL_LIB_CTX *ctx;
 
-    /* rcu generation counter for in-order retirement */
-    uint32_t id_ctr;
-
-    /* TODO: can be moved before id_ctr for better alignment */
     /* Array of quiescent points for synchronization */
     struct rcu_qp *qp_group;
 
+    /* rcu generation counter for in-order retirement */
+    uint32_t id_ctr;
+
     /* Number of elements in qp_group array */
     uint32_t group_count;
 
@@ -262,6 +265,8 @@ static struct rcu_qp *get_hold_current_qp(struct rcu_lock_st *lock)
 
     /* get the current qp index */
     for (;;) {
+        qp_idx = ATOMIC_LOAD_N(uint32_t, &lock->reader_idx, __ATOMIC_RELAXED);
+
         /*
          * Notes on use of __ATOMIC_ACQUIRE
          * We need to ensure the following:
@@ -272,20 +277,16 @@ static struct rcu_qp *get_hold_current_qp(struct rcu_lock_st *lock)
          * of the lock is flushed from a local cpu cache so that we see any
          * updates prior to the load.  This is a non-issue on cache coherent
          * systems like x86, but is relevant on other arches
-         * Note: This applies to the reload below as well
          */
-        qp_idx = ATOMIC_LOAD_N(uint32_t, &lock->reader_idx, __ATOMIC_ACQUIRE);
-
         ATOMIC_ADD_FETCH(&lock->qp_group[qp_idx].users, (uint64_t)1,
-                         __ATOMIC_ACQUIRE);
+            __ATOMIC_ACQUIRE);
 
         /* if the idx hasn't changed, we're good, else try again */
-        if (qp_idx == ATOMIC_LOAD_N(uint32_t, &lock->reader_idx,
-                                    __ATOMIC_RELAXED))
+        if (qp_idx == ATOMIC_LOAD_N(uint32_t, &lock->reader_idx, __ATOMIC_ACQUIRE))
             break;
 
         ATOMIC_SUB_FETCH(&lock->qp_group[qp_idx].users, (uint64_t)1,
-                         __ATOMIC_RELAXED);
+            __ATOMIC_RELAXED);
     }
 
     return &lock->qp_group[qp_idx];
@@ -359,7 +360,7 @@ void ossl_rcu_read_unlock(CRYPTO_RCU_LOCK *lock)
             data->thread_qps[i].depth--;
             if (data->thread_qps[i].depth == 0) {
                 ret = ATOMIC_SUB_FETCH(&data->thread_qps[i].qp->users,
-                                       (uint64_t)1, __ATOMIC_RELEASE);
+                    (uint64_t)1, __ATOMIC_RELEASE);
                 OPENSSL_assert(ret != UINT64_MAX);
                 data->thread_qps[i].qp = NULL;
                 data->thread_qps[i].lock = NULL;
@@ -399,14 +400,24 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock, uint32_t *curr_id)
     lock->writers_alloced++;
 
     /* increment the allocation index */
-    lock->current_alloc_idx =
-        (lock->current_alloc_idx + 1) % lock->group_count;
+    lock->current_alloc_idx = (lock->current_alloc_idx + 1) % lock->group_count;
 
     *curr_id = lock->id_ctr;
     lock->id_ctr++;
 
+    /*
+     * make the current state of everything visible by this release
+     * when get_hold_current_qp acquires the next qp
+     */
     ATOMIC_STORE_N(uint32_t, &lock->reader_idx, lock->current_alloc_idx,
-                   __ATOMIC_RELAXED);
+        __ATOMIC_RELEASE);
+
+    /*
+     * this should make sure that the new value of reader_idx is visible in
+     * get_hold_current_qp, directly after incrementing the users count
+     */
+    ATOMIC_ADD_FETCH(&lock->qp_group[current_idx].users, (uint64_t)0,
+        __ATOMIC_RELEASE);
 
     /* wake up any waiters */
     pthread_cond_signal(&lock->alloc_signal);
@@ -422,13 +433,10 @@ static void retire_qp(CRYPTO_RCU_LOCK *lock, struct rcu_qp *qp)
     pthread_mutex_unlock(&lock->alloc_lock);
 }
 
-/* TODO: count should be unsigned, e.g uint32_t */
-/* a negative value could result in unexpected behaviour */
 static struct rcu_qp *allocate_new_qp_group(CRYPTO_RCU_LOCK *lock,
-                                            int count)
+    uint32_t count)
 {
-    struct rcu_qp *new =
-        OPENSSL_zalloc(sizeof(*new) * count);
+    struct rcu_qp *new = OPENSSL_zalloc(sizeof(*new) * count);
 
     lock->group_count = count;
     return new;
@@ -471,6 +479,8 @@ void ossl_synchronize_rcu(CRYPTO_RCU_LOCK *lock)
      * prior __ATOMIC_RELEASE write operation in ossl_rcu_read_unlock
      * is visible prior to our read
      * however this is likely just necessary to silence a tsan warning
+     * because the read side should not do any write operation
+     * outside the atomic itself
      */
     do {
         count = ATOMIC_LOAD_N(uint64_t, &qp->users, __ATOMIC_ACQUIRE);
@@ -497,8 +507,7 @@ void ossl_synchronize_rcu(CRYPTO_RCU_LOCK *lock)
  */
 int ossl_rcu_call(CRYPTO_RCU_LOCK *lock, rcu_cb_fn cb, void *data)
 {
-    struct rcu_cb_item *new =
-        OPENSSL_zalloc(sizeof(*new));
+    struct rcu_cb_item *new = OPENSSL_zalloc(sizeof(*new));
 
     if (new == NULL)
         return 0;
@@ -527,10 +536,10 @@ CRYPTO_RCU_LOCK *ossl_rcu_lock_new(int num_writers, OSSL_LIB_CTX *ctx)
     struct rcu_lock_st *new;
 
     /*
-     * We need a minimum of 3 qp's
+     * We need a minimum of 2 qp's
      */
-    if (num_writers < 3)
-        num_writers = 3;
+    if (num_writers < 2)
+        num_writers = 2;
 
     ctx = ossl_lib_ctx_get_concrete(ctx);
     if (ctx == NULL)
@@ -546,8 +555,6 @@ CRYPTO_RCU_LOCK *ossl_rcu_lock_new(int num_writers, OSSL_LIB_CTX *ctx)
     pthread_mutex_init(&new->alloc_lock, NULL);
     pthread_cond_init(&new->prior_signal, NULL);
     pthread_cond_init(&new->alloc_signal, NULL);
-    /* By default our first writer is already alloced */
-    new->writers_alloced = 1;
 
     new->qp_group = allocate_new_qp_group(new, num_writers);
     if (new->qp_group == NULL) {
@@ -575,7 +582,7 @@ void ossl_rcu_lock_free(CRYPTO_RCU_LOCK *lock)
 
 CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
 {
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
     CRYPTO_RWLOCK *lock;
 
     if ((lock = OPENSSL_zalloc(sizeof(pthread_rwlock_t))) == NULL)
@@ -586,7 +593,7 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
         OPENSSL_free(lock);
         return NULL;
     }
-# else
+#else
     pthread_mutexattr_t attr;
     CRYPTO_RWLOCK *lock;
 
@@ -598,13 +605,13 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
      * We don't use recursive mutexes, but try to catch errors if we do.
      */
     pthread_mutexattr_init(&attr);
-#  if !defined (__TANDEM) && !defined (_SPT_MODEL_)
-#   if !defined(NDEBUG) && !defined(OPENSSL_NO_MUTEX_ERRORCHECK)
+#if !defined(__TANDEM) && !defined(_SPT_MODEL_)
+#if !defined(NDEBUG) && !defined(OPENSSL_NO_MUTEX_ERRORCHECK)
     pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
-#   endif
-#  else
+#endif
+#else
     /* The SPT Thread Library does not define MUTEX attributes. */
-#  endif
+#endif
 
     if (pthread_mutex_init(lock, &attr) != 0) {
         pthread_mutexattr_destroy(&attr);
@@ -613,52 +620,52 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
     }
 
     pthread_mutexattr_destroy(&attr);
-# endif
+#endif
 
     return lock;
 }
 
 __owur int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock)
 {
-# ifdef USE_RWLOCK
-    if (pthread_rwlock_rdlock(lock) != 0)
+#ifdef USE_RWLOCK
+    if (!ossl_assert(pthread_rwlock_rdlock(lock) == 0))
         return 0;
-# else
+#else
     if (pthread_mutex_lock(lock) != 0) {
         assert(errno != EDEADLK && errno != EBUSY);
         return 0;
     }
-# endif
+#endif
 
     return 1;
 }
 
 __owur int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock)
 {
-# ifdef USE_RWLOCK
-    if (pthread_rwlock_wrlock(lock) != 0)
+#ifdef USE_RWLOCK
+    if (!ossl_assert(pthread_rwlock_wrlock(lock) == 0))
         return 0;
-# else
+#else
     if (pthread_mutex_lock(lock) != 0) {
         assert(errno != EDEADLK && errno != EBUSY);
         return 0;
     }
-# endif
+#endif
 
     return 1;
 }
 
 int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
 {
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
     if (pthread_rwlock_unlock(lock) != 0)
         return 0;
-# else
+#else
     if (pthread_mutex_unlock(lock) != 0) {
         assert(errno != EPERM);
         return 0;
     }
-# endif
+#endif
 
     return 1;
 }
@@ -668,11 +675,11 @@ void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock)
     if (lock == NULL)
         return;
 
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
     pthread_rwlock_destroy(lock);
-# else
+#else
     pthread_mutex_destroy(lock);
-# endif
+#endif
     OPENSSL_free(lock);
 
     return;
@@ -688,6 +695,12 @@ int CRYPTO_THREAD_run_once(CRYPTO_ONCE *once, void (*init)(void))
 
 int CRYPTO_THREAD_init_local(CRYPTO_THREAD_LOCAL *key, void (*cleanup)(void *))
 {
+
+#ifndef FIPS_MODULE
+    if (!ossl_init_thread())
+        return 0;
+#endif
+
     if (pthread_key_create(key, cleanup) != 0)
         return 0;
 
@@ -727,23 +740,23 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b)
 
 int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
 {
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
     if (__atomic_is_lock_free(sizeof(*val), val)) {
         *ret = __atomic_add_fetch(val, amount, __ATOMIC_ACQ_REL);
         return 1;
     }
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
     /* This will work for all future Solaris versions. */
     if (ret != NULL) {
         *ret = atomic_add_int_nv((volatile unsigned int *)val, amount);
         return 1;
     }
-# endif
+#endif
     if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
         return 0;
 
     *val += amount;
-    *ret  = *val;
+    *ret = *val;
 
     if (!CRYPTO_THREAD_unlock(lock))
         return 0;
@@ -752,24 +765,24 @@ 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)
 {
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
     if (__atomic_is_lock_free(sizeof(*val), val)) {
         *ret = __atomic_add_fetch(val, op, __ATOMIC_ACQ_REL);
         return 1;
     }
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
     /* This will work for all future Solaris versions. */
     if (ret != NULL) {
         *ret = atomic_add_64_nv(val, op);
         return 1;
     }
-# endif
+#endif
     if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
         return 0;
     *val += op;
-    *ret  = *val;
+    *ret = *val;
 
     if (!CRYPTO_THREAD_unlock(lock))
         return 0;
@@ -778,24 +791,24 @@ int CRYPTO_atomic_add64(uint64_t *val, uint64_t op, uint64_t *ret,
 }
 
 int CRYPTO_atomic_and(uint64_t *val, uint64_t op, uint64_t *ret,
-                      CRYPTO_RWLOCK *lock)
+    CRYPTO_RWLOCK *lock)
 {
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
     if (__atomic_is_lock_free(sizeof(*val), val)) {
         *ret = __atomic_and_fetch(val, op, __ATOMIC_ACQ_REL);
         return 1;
     }
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
     /* This will work for all future Solaris versions. */
     if (ret != NULL) {
         *ret = atomic_and_64_nv(val, op);
         return 1;
     }
-# endif
+#endif
     if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
         return 0;
     *val &= op;
-    *ret  = *val;
+    *ret = *val;
 
     if (!CRYPTO_THREAD_unlock(lock))
         return 0;
@@ -804,24 +817,24 @@ int CRYPTO_atomic_and(uint64_t *val, uint64_t op, uint64_t *ret,
 }
 
 int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
-                     CRYPTO_RWLOCK *lock)
+    CRYPTO_RWLOCK *lock)
 {
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
     if (__atomic_is_lock_free(sizeof(*val), val)) {
         *ret = __atomic_or_fetch(val, op, __ATOMIC_ACQ_REL);
         return 1;
     }
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
     /* This will work for all future Solaris versions. */
     if (ret != NULL) {
         *ret = atomic_or_64_nv(val, op);
         return 1;
     }
-# endif
+#endif
     if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
         return 0;
     *val |= op;
-    *ret  = *val;
+    *ret = *val;
 
     if (!CRYPTO_THREAD_unlock(lock))
         return 0;
@@ -831,21 +844,21 @@ int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
 
 int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
 {
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
     if (__atomic_is_lock_free(sizeof(*val), val)) {
         __atomic_load(val, ret, __ATOMIC_ACQUIRE);
         return 1;
     }
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
     /* This will work for all future Solaris versions. */
     if (ret != NULL) {
         *ret = atomic_or_64_nv(val, 0);
         return 1;
     }
-# endif
+#endif
     if (lock == NULL || !CRYPTO_THREAD_read_lock(lock))
         return 0;
-    *ret  = *val;
+    *ret = *val;
     if (!CRYPTO_THREAD_unlock(lock))
         return 0;
 
@@ -854,21 +867,21 @@ int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
 
 int CRYPTO_atomic_store(uint64_t *dst, uint64_t val, CRYPTO_RWLOCK *lock)
 {
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
     if (__atomic_is_lock_free(sizeof(*dst), dst)) {
         __atomic_store(dst, &val, __ATOMIC_RELEASE);
         return 1;
     }
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
     /* This will work for all future Solaris versions. */
     if (dst != NULL) {
         atomic_swap_64(dst, val);
         return 1;
     }
-# endif
+#endif
     if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
         return 0;
-    *dst  = val;
+    *dst = val;
     if (!CRYPTO_THREAD_unlock(lock))
         return 0;
 
@@ -877,33 +890,33 @@ int CRYPTO_atomic_store(uint64_t *dst, uint64_t val, CRYPTO_RWLOCK *lock)
 
 int CRYPTO_atomic_load_int(int *val, int *ret, CRYPTO_RWLOCK *lock)
 {
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
+#if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && !defined(BROKEN_CLANG_ATOMICS)
     if (__atomic_is_lock_free(sizeof(*val), val)) {
         __atomic_load(val, ret, __ATOMIC_ACQUIRE);
         return 1;
     }
-# elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
+#elif defined(__sun) && (defined(__SunOS_5_10) || defined(__SunOS_5_11))
     /* This will work for all future Solaris versions. */
     if (ret != NULL) {
         *ret = (int)atomic_or_uint_nv((unsigned int *)val, 0);
         return 1;
     }
-# endif
+#endif
     if (lock == NULL || !CRYPTO_THREAD_read_lock(lock))
         return 0;
-    *ret  = *val;
+    *ret = *val;
     if (!CRYPTO_THREAD_unlock(lock))
         return 0;
 
     return 1;
 }
 
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
 int openssl_init_fork_handlers(void)
 {
     return 1;
 }
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 
 int openssl_get_fork_id(void)
 {
diff --git a/crypto/threads_win.c b/crypto/threads_win.c
index 084125b4aad9c..51d489cdf03b9 100644
--- a/crypto/threads_win.c
+++ b/crypto/threads_win.c
@@ -8,10 +8,10 @@
  */
 
 #if defined(_WIN32)
-# include <windows.h>
-# if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
-#  define USE_RWLOCK
-# endif
+#include <windows.h>
+#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
+#define USE_RWLOCK
+#endif
 #endif
 #include <assert.h>
 
@@ -24,7 +24,7 @@
  */
 
 #if ((defined(_MSC_VER) && defined(_M_IX86) && _MSC_VER <= 1600) || (defined(__MINGW32__) && !defined(__MINGW64__)))
-# define NO_INTERLOCKEDOR64
+#define NO_INTERLOCKEDOR64
 #endif
 
 #include <openssl/crypto.h>
@@ -36,12 +36,12 @@
 
 #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && defined(OPENSSL_SYS_WINDOWS)
 
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
 typedef struct {
     SRWLOCK lock;
     int exclusive;
 } CRYPTO_win_rwlock;
-# endif
+#endif
 
 /*
  * This defines a quescent point (qp)
@@ -59,7 +59,7 @@ struct thread_qp {
     CRYPTO_RCU_LOCK *lock;
 };
 
-# define MAX_QPS 10
+#define MAX_QPS 10
 /*
  * This is the per thread tracking data
  * that is assigned to each thread participating
@@ -83,13 +83,12 @@ struct rcu_lock_st {
     /* The context we are being created against */
     OSSL_LIB_CTX *ctx;
 
-    /* rcu generation counter for in-order retirement */
-    uint32_t id_ctr;
-
-    /* TODO: can be moved before id_ctr for better alignment */
     /* Array of quiescent points for synchronization */
     struct rcu_qp *qp_group;
 
+    /* rcu generation counter for in-order retirement */
+    uint32_t id_ctr;
+
     /* Number of elements in qp_group array */
     uint32_t group_count;
 
@@ -124,13 +123,10 @@ struct rcu_lock_st {
     CRYPTO_RWLOCK *rw_lock;
 };
 
-/* TODO: count should be unsigned, e.g uint32_t */
-/* a negative value could result in unexpected behaviour */
 static struct rcu_qp *allocate_new_qp_group(struct rcu_lock_st *lock,
-                                            int count)
+    uint32_t count)
 {
-    struct rcu_qp *new =
-        OPENSSL_zalloc(sizeof(*new) * count);
+    struct rcu_qp *new = OPENSSL_zalloc(sizeof(*new) * count);
 
     lock->group_count = count;
     return new;
@@ -141,10 +137,10 @@ CRYPTO_RCU_LOCK *ossl_rcu_lock_new(int num_writers, OSSL_LIB_CTX *ctx)
     struct rcu_lock_st *new;
 
     /*
-     * We need a minimum of 3 qps
+     * We need a minimum of 2 qps
      */
-    if (num_writers < 3)
-        num_writers = 3;
+    if (num_writers < 2)
+        num_writers = 2;
 
     ctx = ossl_lib_ctx_get_concrete(ctx);
     if (ctx == NULL)
@@ -163,8 +159,6 @@ CRYPTO_RCU_LOCK *ossl_rcu_lock_new(int num_writers, OSSL_LIB_CTX *ctx)
     new->alloc_lock = ossl_crypto_mutex_new();
     new->prior_lock = ossl_crypto_mutex_new();
     new->qp_group = allocate_new_qp_group(new, num_writers);
-    /* By default the first qp is already alloced */
-    new->writers_alloced = 1;
     if (new->qp_group == NULL
         || new->alloc_signal == NULL
         || new->prior_signal == NULL
@@ -184,7 +178,6 @@ CRYPTO_RCU_LOCK *ossl_rcu_lock_new(int num_writers, OSSL_LIB_CTX *ctx)
     }
 
     return new;
-
 }
 
 void ossl_rcu_lock_free(CRYPTO_RCU_LOCK *lock)
@@ -209,15 +202,15 @@ static ossl_inline struct rcu_qp *get_hold_current_qp(CRYPTO_RCU_LOCK *lock)
     /* get the current qp index */
     for (;;) {
         CRYPTO_atomic_load_int((int *)&lock->reader_idx, (int *)&qp_idx,
-                               lock->rw_lock);
+            lock->rw_lock);
         CRYPTO_atomic_add64(&lock->qp_group[qp_idx].users, (uint64_t)1, &tmp64,
-                            lock->rw_lock);
+            lock->rw_lock);
         CRYPTO_atomic_load_int((int *)&lock->reader_idx, (int *)&tmp,
-                               lock->rw_lock);
+            lock->rw_lock);
         if (qp_idx == tmp)
             break;
         CRYPTO_atomic_add64(&lock->qp_group[qp_idx].users, (uint64_t)-1, &tmp64,
-                            lock->rw_lock);
+            lock->rw_lock);
     }
 
     return &lock->qp_group[qp_idx];
@@ -294,8 +287,8 @@ void ossl_rcu_read_unlock(CRYPTO_RCU_LOCK *lock)
             data->thread_qps[i].depth--;
             if (data->thread_qps[i].depth == 0) {
                 CRYPTO_atomic_add64(&data->thread_qps[i].qp->users,
-                                    (uint64_t)-1, (uint64_t *)&ret,
-                                    lock->rw_lock);
+                    (uint64_t)-1, (uint64_t *)&ret,
+                    lock->rw_lock);
                 OPENSSL_assert(ret >= 0);
                 data->thread_qps[i].qp = NULL;
                 data->thread_qps[i].lock = NULL;
@@ -330,8 +323,7 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock, uint32_t *curr_id)
     lock->writers_alloced++;
 
     /* increment the allocation index */
-    lock->current_alloc_idx =
-        (lock->current_alloc_idx + 1) % lock->group_count;
+    lock->current_alloc_idx = (lock->current_alloc_idx + 1) % lock->group_count;
 
     /* get and insert a new id */
     *curr_id = lock->id_ctr;
@@ -339,13 +331,13 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock, uint32_t *curr_id)
 
     /* update the reader index to be the prior qp */
     tmp = lock->current_alloc_idx;
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
     CRYPTO_THREAD_write_lock(lock->rw_lock);
     lock->reader_idx = tmp;
     CRYPTO_THREAD_unlock(lock->rw_lock);
-# else
+#else
     InterlockedExchange((LONG volatile *)&lock->reader_idx, tmp);
-# endif
+#endif
 
     /* wake up any waiters */
     ossl_crypto_condvar_broadcast(lock->alloc_signal);
@@ -354,7 +346,7 @@ static struct rcu_qp *update_qp(CRYPTO_RCU_LOCK *lock, uint32_t *curr_id)
 }
 
 static void retire_qp(CRYPTO_RCU_LOCK *lock,
-                      struct rcu_qp *qp)
+    struct rcu_qp *qp)
 {
     ossl_crypto_mutex_lock(lock->alloc_lock);
     lock->writers_alloced--;
@@ -362,7 +354,6 @@ static void retire_qp(CRYPTO_RCU_LOCK *lock,
     ossl_crypto_mutex_unlock(lock->alloc_lock);
 }
 
-
 void ossl_synchronize_rcu(CRYPTO_RCU_LOCK *lock)
 {
     struct rcu_qp *qp;
@@ -404,7 +395,6 @@ void ossl_synchronize_rcu(CRYPTO_RCU_LOCK *lock)
 
     /* and we're done */
     return;
-
 }
 
 /*
@@ -433,14 +423,13 @@ void *ossl_rcu_uptr_deref(void **p)
 
 void ossl_rcu_assign_uptr(void **p, void **v)
 {
-    InterlockedExchangePointer((void * volatile *)p, (void *)*v);
+    InterlockedExchangePointer((void *volatile *)p, (void *)*v);
 }
 
-
 CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
 {
     CRYPTO_RWLOCK *lock;
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
     CRYPTO_win_rwlock *rwlock;
 
     if ((lock = OPENSSL_zalloc(sizeof(CRYPTO_win_rwlock))) == NULL)
@@ -448,54 +437,54 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
         return NULL;
     rwlock = lock;
     InitializeSRWLock(&rwlock->lock);
-# else
+#else
 
     if ((lock = OPENSSL_zalloc(sizeof(CRITICAL_SECTION))) == NULL)
         /* Don't set error, to avoid recursion blowup. */
         return NULL;
 
-#  if !defined(_WIN32_WCE)
+#if !defined(_WIN32_WCE)
     /* 0x400 is the spin count value suggested in the documentation */
     if (!InitializeCriticalSectionAndSpinCount(lock, 0x400)) {
         OPENSSL_free(lock);
         return NULL;
     }
-#  else
+#else
     InitializeCriticalSection(lock);
-#  endif
-# endif
+#endif
+#endif
 
     return lock;
 }
 
 __owur int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock)
 {
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
     CRYPTO_win_rwlock *rwlock = lock;
 
     AcquireSRWLockShared(&rwlock->lock);
-# else
+#else
     EnterCriticalSection(lock);
-# endif
+#endif
     return 1;
 }
 
 __owur int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock)
 {
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
     CRYPTO_win_rwlock *rwlock = lock;
 
     AcquireSRWLockExclusive(&rwlock->lock);
     rwlock->exclusive = 1;
-# else
+#else
     EnterCriticalSection(lock);
-# endif
+#endif
     return 1;
 }
 
 int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
 {
-# ifdef USE_RWLOCK
+#ifdef USE_RWLOCK
     CRYPTO_win_rwlock *rwlock = lock;
 
     if (rwlock->exclusive) {
@@ -504,9 +493,9 @@ int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
     } else {
         ReleaseSRWLockShared(&rwlock->lock);
     }
-# else
+#else
     LeaveCriticalSection(lock);
-# endif
+#endif
     return 1;
 }
 
@@ -515,17 +504,17 @@ void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock)
     if (lock == NULL)
         return;
 
-# ifndef USE_RWLOCK
+#ifndef USE_RWLOCK
     DeleteCriticalSection(lock);
-# endif
+#endif
     OPENSSL_free(lock);
 
     return;
 }
 
-# define ONCE_UNINITED     0
-# define ONCE_ININIT       1
-# define ONCE_DONE         2
+#define ONCE_UNINITED 0
+#define ONCE_ININIT 1
+#define ONCE_DONE 2
 
 /*
  * We don't use InitOnceExecuteOnce because that isn't available in WinXP which
@@ -553,6 +542,12 @@ int CRYPTO_THREAD_run_once(CRYPTO_ONCE *once, void (*init)(void))
 
 int CRYPTO_THREAD_init_local(CRYPTO_THREAD_LOCAL *key, void (*cleanup)(void *))
 {
+
+#ifndef FIPS_MODULE
+    if (!ossl_init_thread())
+        return 0;
+#endif
+
     *key = TlsAlloc();
     if (*key == TLS_OUT_OF_INDEXES)
         return 0;
@@ -612,7 +607,7 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b)
 
 int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
 {
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
     if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
         return 0;
     *val += amount;
@@ -622,17 +617,17 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
         return 0;
 
     return 1;
-# else
+#else
     *ret = (int)InterlockedExchangeAdd((LONG volatile *)val, (LONG)amount)
         + amount;
     return 1;
-# endif
+#endif
 }
 
 int CRYPTO_atomic_add64(uint64_t *val, uint64_t op, uint64_t *ret,
-                        CRYPTO_RWLOCK *lock)
+    CRYPTO_RWLOCK *lock)
 {
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
     if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
         return 0;
     *val += op;
@@ -642,16 +637,16 @@ int CRYPTO_atomic_add64(uint64_t *val, uint64_t op, uint64_t *ret,
         return 0;
 
     return 1;
-# else
+#else
     *ret = (uint64_t)InterlockedAdd64((LONG64 volatile *)val, (LONG64)op);
     return 1;
-# endif
+#endif
 }
 
 int CRYPTO_atomic_and(uint64_t *val, uint64_t op, uint64_t *ret,
-                      CRYPTO_RWLOCK *lock)
+    CRYPTO_RWLOCK *lock)
 {
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
     if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
         return 0;
     *val &= op;
@@ -661,16 +656,16 @@ int CRYPTO_atomic_and(uint64_t *val, uint64_t op, uint64_t *ret,
         return 0;
 
     return 1;
-# else
+#else
     *ret = (uint64_t)InterlockedAnd64((LONG64 volatile *)val, (LONG64)op) & op;
     return 1;
-# endif
+#endif
 }
 
 int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
-                     CRYPTO_RWLOCK *lock)
+    CRYPTO_RWLOCK *lock)
 {
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
     if (lock == NULL || !CRYPTO_THREAD_write_lock(lock))
         return 0;
     *val |= op;
@@ -680,15 +675,15 @@ int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
         return 0;
 
     return 1;
-# else
+#else
     *ret = (uint64_t)InterlockedOr64((LONG64 volatile *)val, (LONG64)op) | op;
     return 1;
-# endif
+#endif
 }
 
 int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
 {
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
     if (lock == NULL || !CRYPTO_THREAD_read_lock(lock))
         return 0;
     *ret = *val;
@@ -696,15 +691,15 @@ int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
         return 0;
 
     return 1;
-# else
+#else
     *ret = (uint64_t)InterlockedOr64((LONG64 volatile *)val, 0);
     return 1;
-# endif
+#endif
 }
 
 int CRYPTO_atomic_store(uint64_t *dst, uint64_t val, CRYPTO_RWLOCK *lock)
 {
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
     if (lock == NULL || !CRYPTO_THREAD_read_lock(lock))
         return 0;
     *dst = val;
@@ -712,15 +707,15 @@ int CRYPTO_atomic_store(uint64_t *dst, uint64_t val, CRYPTO_RWLOCK *lock)
         return 0;
 
     return 1;
-# else
+#else
     InterlockedExchange64(dst, val);
     return 1;
-# endif
+#endif
 }
 
 int CRYPTO_atomic_load_int(int *val, int *ret, CRYPTO_RWLOCK *lock)
 {
-# if (defined(NO_INTERLOCKEDOR64))
+#if (defined(NO_INTERLOCKEDOR64))
     if (lock == NULL || !CRYPTO_THREAD_read_lock(lock))
         return 0;
     *ret = *val;
@@ -728,11 +723,11 @@ int CRYPTO_atomic_load_int(int *val, int *ret, CRYPTO_RWLOCK *lock)
         return 0;
 
     return 1;
-# else
+#else
     /* On Windows, LONG (but not long) is always the same size as int. */
     *ret = (int)InterlockedOr((LONG volatile *)val, 0);
     return 1;
-# endif
+#endif
 }
 
 int openssl_init_fork_handlers(void)
diff --git a/crypto/time.c b/crypto/time.c
index a6ab6cd12722e..c8380ca9301c8 100644
--- a/crypto/time.c
+++ b/crypto/time.c
@@ -26,24 +26,24 @@ OSSL_TIME ossl_time_now(void)
     GetSystemTime(&st);
     SystemTimeToFileTime(&st, &now.ft);
     /* re-bias to 1/1/1970 */
-# ifdef  __MINGW32__
+#ifdef __MINGW32__
     now.ul -= 116444736000000000ULL;
-# else
+#else
     now.ul -= 116444736000000000UI64;
-# endif
+#endif
     r.t = ((uint64_t)now.ul) * (OSSL_TIME_SECOND / 10000000);
-#else   /* defined(_WIN32) */
+#else /* defined(_WIN32) */
     struct timeval t;
 
     if (gettimeofday(&t, NULL) < 0) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling gettimeofday()");
+            "calling gettimeofday()");
         return ossl_time_zero();
     }
     if (t.tv_sec <= 0)
         r.t = t.tv_usec <= 0 ? 0 : t.tv_usec * OSSL_TIME_US;
     else
         r.t = ((uint64_t)t.tv_sec * 1000000 + t.tv_usec) * OSSL_TIME_US;
-#endif  /* defined(_WIN32) */
+#endif /* defined(_WIN32) */
     return r;
 }
diff --git a/crypto/trace.c b/crypto/trace.c
index fbd4bf2914018..01a0f84273f4c 100644
--- a/crypto/trace.c
+++ b/crypto/trace.c
@@ -24,7 +24,7 @@
 
 static CRYPTO_RWLOCK *trace_lock = NULL;
 
-static const BIO  *current_channel = NULL;
+static const BIO *current_channel = NULL;
 
 /*-
  * INTERNAL TRACE CHANNEL IMPLEMENTATION
@@ -36,7 +36,7 @@ static const BIO  *current_channel = NULL;
  * callback function.
  */
 static int trace_write(BIO *b, const char *buf,
-                               size_t num, size_t *written);
+    size_t num, size_t *written);
 static int trace_puts(BIO *b, const char *str);
 static long trace_ctrl(BIO *channel, int cmd, long argl, void *argp);
 static int trace_free(BIO *b);
@@ -45,15 +45,15 @@ static const BIO_METHOD trace_method = {
     BIO_TYPE_SOURCE_SINK,
     "trace",
     trace_write,
-    NULL,                        /* old write */
-    NULL,                        /* read_ex */
-    NULL,                        /* read */
+    NULL, /* old write */
+    NULL, /* read_ex */
+    NULL, /* read */
     trace_puts,
-    NULL,                        /* gets */
-    trace_ctrl,                  /* ctrl */
-    NULL,                        /* create */
-    trace_free,                  /* free */
-    NULL,                        /* callback_ctrl */
+    NULL, /* gets */
+    trace_ctrl, /* ctrl */
+    NULL, /* create */
+    trace_free, /* free */
+    NULL, /* callback_ctrl */
 };
 
 struct trace_data_st {
@@ -63,11 +63,11 @@ struct trace_data_st {
 };
 
 static int trace_write(BIO *channel,
-                       const char *buf, size_t num, size_t *written)
+    const char *buf, size_t num, size_t *written)
 {
     struct trace_data_st *ctx = BIO_get_data(channel);
     size_t cnt = ctx->callback(buf, num, ctx->category, OSSL_TRACE_CTRL_WRITE,
-                               ctx->data);
+        ctx->data);
 
     *written = cnt;
     return cnt != 0;
@@ -96,7 +96,7 @@ static long trace_ctrl(BIO *channel, int cmd, long argl, void *argp)
     default:
         break;
     }
-    return -2;                   /* Unsupported */
+    return -2; /* Unsupported */
 }
 
 static int trace_free(BIO *channel)
@@ -114,35 +114,36 @@ static int trace_free(BIO *channel)
 
 /* Helper struct and macro to get name string to number mapping */
 struct trace_category_st {
-    const char * const name;
+    const char *const name;
     const int num;
 };
-#define TRACE_CATEGORY_(name)       { #name, OSSL_TRACE_CATEGORY_##name }
+#define TRACE_CATEGORY_(name) { #name, OSSL_TRACE_CATEGORY_##name }
 
 static const struct trace_category_st
-    trace_categories[OSSL_TRACE_CATEGORY_NUM] = {
-    TRACE_CATEGORY_(ALL),
-    TRACE_CATEGORY_(TRACE),
-    TRACE_CATEGORY_(INIT),
-    TRACE_CATEGORY_(TLS),
-    TRACE_CATEGORY_(TLS_CIPHER),
-    TRACE_CATEGORY_(CONF),
-    TRACE_CATEGORY_(ENGINE_TABLE),
-    TRACE_CATEGORY_(ENGINE_REF_COUNT),
-    TRACE_CATEGORY_(PKCS5V2),
-    TRACE_CATEGORY_(PKCS12_KEYGEN),
-    TRACE_CATEGORY_(PKCS12_DECRYPT),
-    TRACE_CATEGORY_(X509V3_POLICY),
-    TRACE_CATEGORY_(BN_CTX),
-    TRACE_CATEGORY_(CMP),
-    TRACE_CATEGORY_(STORE),
-    TRACE_CATEGORY_(DECODER),
-    TRACE_CATEGORY_(ENCODER),
-    TRACE_CATEGORY_(REF_COUNT),
-    TRACE_CATEGORY_(HTTP),
-    TRACE_CATEGORY_(PROVIDER),
-    TRACE_CATEGORY_(QUERY),
-}; /* KEEP THIS LIST IN SYNC with #define OSSL_TRACE_CATEGORY_... in trace.h */
+    trace_categories[OSSL_TRACE_CATEGORY_NUM]
+    = {
+          TRACE_CATEGORY_(ALL),
+          TRACE_CATEGORY_(TRACE),
+          TRACE_CATEGORY_(INIT),
+          TRACE_CATEGORY_(TLS),
+          TRACE_CATEGORY_(TLS_CIPHER),
+          TRACE_CATEGORY_(CONF),
+          TRACE_CATEGORY_(ENGINE_TABLE),
+          TRACE_CATEGORY_(ENGINE_REF_COUNT),
+          TRACE_CATEGORY_(PKCS5V2),
+          TRACE_CATEGORY_(PKCS12_KEYGEN),
+          TRACE_CATEGORY_(PKCS12_DECRYPT),
+          TRACE_CATEGORY_(X509V3_POLICY),
+          TRACE_CATEGORY_(BN_CTX),
+          TRACE_CATEGORY_(CMP),
+          TRACE_CATEGORY_(STORE),
+          TRACE_CATEGORY_(DECODER),
+          TRACE_CATEGORY_(ENCODER),
+          TRACE_CATEGORY_(REF_COUNT),
+          TRACE_CATEGORY_(HTTP),
+          TRACE_CATEGORY_(PROVIDER),
+          TRACE_CATEGORY_(QUERY),
+      }; /* KEEP THIS LIST IN SYNC with #define OSSL_TRACE_CATEGORY_... in trace.h */
 
 const char *OSSL_trace_get_category_name(int num)
 {
@@ -176,7 +177,8 @@ int OSSL_trace_get_category_num(const char *name)
 
 /* We use one trace channel for each trace category */
 static struct {
-    enum { SIMPLE_CHANNEL, CALLBACK_CHANNEL } type;
+    enum { SIMPLE_CHANNEL,
+        CALLBACK_CHANNEL } type;
     BIO *bio;
     char *prefix;
     char *suffix;
@@ -199,17 +201,17 @@ static int trace_attach_cb(int category, int type, const void *data)
     switch (type) {
     case CHANNEL:
         OSSL_TRACE2(TRACE, "Attach channel %p to category '%s'\n",
-                    data, trace_categories[category].name);
+            data, trace_categories[category].name);
         break;
     case PREFIX:
         OSSL_TRACE2(TRACE, "Attach prefix \"%s\" to category '%s'\n",
-                    (const char *)data, trace_categories[category].name);
+            (const char *)data, trace_categories[category].name);
         break;
     case SUFFIX:
         OSSL_TRACE2(TRACE, "Attach suffix \"%s\" to category '%s'\n",
-                    (const char *)data, trace_categories[category].name);
+            (const char *)data, trace_categories[category].name);
         break;
-    default:                     /* No clue */
+    default: /* No clue */
         break;
     }
     return 1;
@@ -220,17 +222,17 @@ static int trace_detach_cb(int category, int type, const void *data)
     switch (type) {
     case CHANNEL:
         OSSL_TRACE2(TRACE, "Detach channel %p from category '%s'\n",
-                    data, trace_categories[category].name);
+            data, trace_categories[category].name);
         break;
     case PREFIX:
         OSSL_TRACE2(TRACE, "Detach prefix \"%s\" from category '%s'\n",
-                    (const char *)data, trace_categories[category].name);
+            (const char *)data, trace_categories[category].name);
         break;
     case SUFFIX:
         OSSL_TRACE2(TRACE, "Detach suffix \"%s\" from category '%s'\n",
-                    (const char *)data, trace_categories[category].name);
+            (const char *)data, trace_categories[category].name);
         break;
-    default:                     /* No clue */
+    default: /* No clue */
         break;
     }
     return 1;
@@ -244,9 +246,9 @@ DEFINE_RUN_ONCE_STATIC(ossl_trace_init)
 }
 
 static int set_trace_data(int category, int type, BIO **channel,
-                          const char **prefix, const char **suffix,
-                          int (*attach_cb)(int, int, const void *),
-                          int (*detach_cb)(int, int, const void *))
+    const char **prefix, const char **suffix,
+    int (*attach_cb)(int, int, const void *),
+    int (*detach_cb)(int, int, const void *))
 {
     BIO *curr_channel = NULL;
     char *curr_prefix = NULL;
@@ -349,11 +351,11 @@ void ossl_trace_cleanup(void)
         if (category == OSSL_TRACE_CATEGORY_TRACE)
             continue;
         set_trace_data(category, 0, &channel, &prefix, &suffix,
-                       trace_attach_cb, trace_detach_cb);
+            trace_attach_cb, trace_detach_cb);
     }
     set_trace_data(OSSL_TRACE_CATEGORY_TRACE, 0, &channel,
-                   &prefix, &suffix,
-                   trace_attach_cb, trace_detach_cb);
+        &prefix, &suffix,
+        trace_attach_cb, trace_detach_cb);
     CRYPTO_THREAD_lock_free(trace_lock);
 #endif
 }
@@ -363,7 +365,7 @@ int OSSL_trace_set_channel(int category, BIO *channel)
 #ifndef OPENSSL_NO_TRACE
     if (category >= 0 && category < OSSL_TRACE_CATEGORY_NUM)
         return set_trace_data(category, SIMPLE_CHANNEL, &channel, NULL, NULL,
-                              trace_attach_cb, trace_detach_cb);
+            trace_attach_cb, trace_detach_cb);
 #endif
     return 0;
 }
@@ -374,18 +376,18 @@ static int trace_attach_w_callback_cb(int category, int type, const void *data)
     switch (type) {
     case CHANNEL:
         OSSL_TRACE2(TRACE,
-                    "Attach channel %p to category '%s' (with callback)\n",
-                    data, trace_categories[category].name);
+            "Attach channel %p to category '%s' (with callback)\n",
+            data, trace_categories[category].name);
         break;
     case PREFIX:
         OSSL_TRACE2(TRACE, "Attach prefix \"%s\" to category '%s'\n",
-                    (const char *)data, trace_categories[category].name);
+            (const char *)data, trace_categories[category].name);
         break;
     case SUFFIX:
         OSSL_TRACE2(TRACE, "Attach suffix \"%s\" to category '%s'\n",
-                    (const char *)data, trace_categories[category].name);
+            (const char *)data, trace_categories[category].name);
         break;
-    default:                     /* No clue */
+    default: /* No clue */
         break;
     }
     return 1;
@@ -403,8 +405,7 @@ int OSSL_trace_set_callback(int category, OSSL_trace_cb callback, void *data)
 
     if (callback != NULL) {
         if ((channel = BIO_new(&trace_method)) == NULL
-            || (trace_data =
-                OPENSSL_zalloc(sizeof(struct trace_data_st))) == NULL)
+            || (trace_data = OPENSSL_zalloc(sizeof(struct trace_data_st))) == NULL)
             goto err;
 
         trace_data->callback = callback;
@@ -415,12 +416,12 @@ int OSSL_trace_set_callback(int category, OSSL_trace_cb callback, void *data)
     }
 
     if (!set_trace_data(category, CALLBACK_CHANNEL, &channel, NULL, NULL,
-                        trace_attach_w_callback_cb, trace_detach_cb))
+            trace_attach_w_callback_cb, trace_detach_cb))
         goto err;
 
     return 1;
 
- err:
+err:
     BIO_free(channel);
     OPENSSL_free(trace_data);
 #endif
@@ -433,7 +434,7 @@ int OSSL_trace_set_prefix(int category, const char *prefix)
 #ifndef OPENSSL_NO_TRACE
     if (category >= 0 && category < OSSL_TRACE_CATEGORY_NUM)
         return set_trace_data(category, 0, NULL, &prefix, NULL,
-                              trace_attach_cb, trace_detach_cb);
+            trace_attach_cb, trace_detach_cb);
 #endif
     return 0;
 }
@@ -443,7 +444,7 @@ int OSSL_trace_set_suffix(int category, const char *suffix)
 #ifndef OPENSSL_NO_TRACE
     if (category >= 0 && category < OSSL_TRACE_CATEGORY_NUM)
         return set_trace_data(category, 0, NULL, NULL, &suffix,
-                              trace_attach_cb, trace_detach_cb);
+            trace_attach_cb, trace_detach_cb);
 #endif
     return 0;
 }
@@ -496,7 +497,7 @@ BIO *OSSL_trace_begin(int category)
             break;
         case CALLBACK_CHANNEL:
             (void)BIO_ctrl(channel, OSSL_TRACE_CTRL_BEGIN,
-                           prefix == NULL ? 0 : strlen(prefix), prefix);
+                prefix == NULL ? 0 : strlen(prefix), prefix);
             break;
         }
     }
@@ -525,7 +526,7 @@ void OSSL_trace_end(int category, BIO *channel)
             break;
         case CALLBACK_CHANNEL:
             (void)BIO_ctrl(channel, OSSL_TRACE_CTRL_END,
-                           suffix == NULL ? 0 : strlen(suffix), suffix);
+                suffix == NULL ? 0 : strlen(suffix), suffix);
             break;
         }
         current_channel = NULL;
@@ -535,14 +536,14 @@ void OSSL_trace_end(int category, BIO *channel)
 }
 
 int OSSL_trace_string(BIO *out, int text, int full,
-                      const unsigned char *data, size_t size)
+    const unsigned char *data, size_t size)
 {
     unsigned char buf[OSSL_TRACE_STRING_MAX + 1];
     int len, i;
 
     if (!full && size > OSSL_TRACE_STRING_MAX) {
         BIO_printf(out, "[len %zu limited to %d]: ",
-                   size, OSSL_TRACE_STRING_MAX);
+            size, OSSL_TRACE_STRING_MAX);
         len = OSSL_TRACE_STRING_MAX;
     } else {
         len = (int)size;
@@ -550,7 +551,8 @@ int OSSL_trace_string(BIO *out, int text, int full,
     if (!text) { /* mask control characters while preserving newlines */
         for (i = 0; i < len; i++, data++)
             buf[i] = (char)*data != '\n' && ossl_iscntrl((int)*data)
-                ? ' ' : *data;
+                ? ' '
+                : *data;
         if (len == 0 || data[-1] != '\n')
             buf[len++] = '\n';
         data = buf;
diff --git a/crypto/ts/ts_asn1.c b/crypto/ts/ts_asn1.c
index ba3195eab8b36..93a741d04d749 100644
--- a/crypto/ts/ts_asn1.c
+++ b/crypto/ts/ts_asn1.c
@@ -13,16 +13,16 @@
 #include "ts_local.h"
 
 ASN1_SEQUENCE(TS_MSG_IMPRINT) = {
-        ASN1_SIMPLE(TS_MSG_IMPRINT, hash_algo, X509_ALGOR),
-        ASN1_SIMPLE(TS_MSG_IMPRINT, hashed_msg, ASN1_OCTET_STRING)
+    ASN1_SIMPLE(TS_MSG_IMPRINT, hash_algo, X509_ALGOR),
+    ASN1_SIMPLE(TS_MSG_IMPRINT, hashed_msg, ASN1_OCTET_STRING)
 } static_ASN1_SEQUENCE_END(TS_MSG_IMPRINT)
 
-IMPLEMENT_ASN1_FUNCTIONS(TS_MSG_IMPRINT)
+    IMPLEMENT_ASN1_FUNCTIONS(TS_MSG_IMPRINT)
 IMPLEMENT_ASN1_DUP_FUNCTION(TS_MSG_IMPRINT)
 TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT **a)
 {
     return ASN1_d2i_bio_of(TS_MSG_IMPRINT, TS_MSG_IMPRINT_new,
-                           d2i_TS_MSG_IMPRINT, bp, a);
+        d2i_TS_MSG_IMPRINT, bp, a);
 }
 
 int i2d_TS_MSG_IMPRINT_bio(BIO *bp, const TS_MSG_IMPRINT *a)
@@ -33,7 +33,7 @@ int i2d_TS_MSG_IMPRINT_bio(BIO *bp, const TS_MSG_IMPRINT *a)
 TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a)
 {
     return ASN1_d2i_fp_of(TS_MSG_IMPRINT, TS_MSG_IMPRINT_new,
-                          d2i_TS_MSG_IMPRINT, fp, a);
+        d2i_TS_MSG_IMPRINT, fp, a);
 }
 
 int i2d_TS_MSG_IMPRINT_fp(FILE *fp, const TS_MSG_IMPRINT *a)
@@ -43,15 +43,15 @@ int i2d_TS_MSG_IMPRINT_fp(FILE *fp, const TS_MSG_IMPRINT *a)
 #endif
 
 ASN1_SEQUENCE(TS_REQ) = {
-        ASN1_SIMPLE(TS_REQ, version, ASN1_INTEGER),
-        ASN1_SIMPLE(TS_REQ, msg_imprint, TS_MSG_IMPRINT),
-        ASN1_OPT(TS_REQ, policy_id, ASN1_OBJECT),
-        ASN1_OPT(TS_REQ, nonce, ASN1_INTEGER),
-        ASN1_OPT(TS_REQ, cert_req, ASN1_FBOOLEAN),
-        ASN1_IMP_SEQUENCE_OF_OPT(TS_REQ, extensions, X509_EXTENSION, 0)
+    ASN1_SIMPLE(TS_REQ, version, ASN1_INTEGER),
+    ASN1_SIMPLE(TS_REQ, msg_imprint, TS_MSG_IMPRINT),
+    ASN1_OPT(TS_REQ, policy_id, ASN1_OBJECT),
+    ASN1_OPT(TS_REQ, nonce, ASN1_INTEGER),
+    ASN1_OPT(TS_REQ, cert_req, ASN1_FBOOLEAN),
+    ASN1_IMP_SEQUENCE_OF_OPT(TS_REQ, extensions, X509_EXTENSION, 0)
 } static_ASN1_SEQUENCE_END(TS_REQ)
 
-IMPLEMENT_ASN1_FUNCTIONS(TS_REQ)
+    IMPLEMENT_ASN1_FUNCTIONS(TS_REQ)
 IMPLEMENT_ASN1_DUP_FUNCTION(TS_REQ)
 TS_REQ *d2i_TS_REQ_bio(BIO *bp, TS_REQ **a)
 {
@@ -75,33 +75,33 @@ int i2d_TS_REQ_fp(FILE *fp, const TS_REQ *a)
 #endif
 
 ASN1_SEQUENCE(TS_ACCURACY) = {
-        ASN1_OPT(TS_ACCURACY, seconds, ASN1_INTEGER),
-        ASN1_IMP_OPT(TS_ACCURACY, millis, ASN1_INTEGER, 0),
-        ASN1_IMP_OPT(TS_ACCURACY, micros, ASN1_INTEGER, 1)
+    ASN1_OPT(TS_ACCURACY, seconds, ASN1_INTEGER),
+    ASN1_IMP_OPT(TS_ACCURACY, millis, ASN1_INTEGER, 0),
+    ASN1_IMP_OPT(TS_ACCURACY, micros, ASN1_INTEGER, 1)
 } static_ASN1_SEQUENCE_END(TS_ACCURACY)
 
-IMPLEMENT_ASN1_FUNCTIONS(TS_ACCURACY)
+    IMPLEMENT_ASN1_FUNCTIONS(TS_ACCURACY)
 IMPLEMENT_ASN1_DUP_FUNCTION(TS_ACCURACY)
 
 ASN1_SEQUENCE(TS_TST_INFO) = {
-        ASN1_SIMPLE(TS_TST_INFO, version, ASN1_INTEGER),
-        ASN1_SIMPLE(TS_TST_INFO, policy_id, ASN1_OBJECT),
-        ASN1_SIMPLE(TS_TST_INFO, msg_imprint, TS_MSG_IMPRINT),
-        ASN1_SIMPLE(TS_TST_INFO, serial, ASN1_INTEGER),
-        ASN1_SIMPLE(TS_TST_INFO, time, ASN1_GENERALIZEDTIME),
-        ASN1_OPT(TS_TST_INFO, accuracy, TS_ACCURACY),
-        ASN1_OPT(TS_TST_INFO, ordering, ASN1_FBOOLEAN),
-        ASN1_OPT(TS_TST_INFO, nonce, ASN1_INTEGER),
-        ASN1_EXP_OPT(TS_TST_INFO, tsa, GENERAL_NAME, 0),
-        ASN1_IMP_SEQUENCE_OF_OPT(TS_TST_INFO, extensions, X509_EXTENSION, 1)
+    ASN1_SIMPLE(TS_TST_INFO, version, ASN1_INTEGER),
+    ASN1_SIMPLE(TS_TST_INFO, policy_id, ASN1_OBJECT),
+    ASN1_SIMPLE(TS_TST_INFO, msg_imprint, TS_MSG_IMPRINT),
+    ASN1_SIMPLE(TS_TST_INFO, serial, ASN1_INTEGER),
+    ASN1_SIMPLE(TS_TST_INFO, time, ASN1_GENERALIZEDTIME),
+    ASN1_OPT(TS_TST_INFO, accuracy, TS_ACCURACY),
+    ASN1_OPT(TS_TST_INFO, ordering, ASN1_FBOOLEAN),
+    ASN1_OPT(TS_TST_INFO, nonce, ASN1_INTEGER),
+    ASN1_EXP_OPT(TS_TST_INFO, tsa, GENERAL_NAME, 0),
+    ASN1_IMP_SEQUENCE_OF_OPT(TS_TST_INFO, extensions, X509_EXTENSION, 1)
 } static_ASN1_SEQUENCE_END(TS_TST_INFO)
 
-IMPLEMENT_ASN1_FUNCTIONS(TS_TST_INFO)
+    IMPLEMENT_ASN1_FUNCTIONS(TS_TST_INFO)
 IMPLEMENT_ASN1_DUP_FUNCTION(TS_TST_INFO)
 TS_TST_INFO *d2i_TS_TST_INFO_bio(BIO *bp, TS_TST_INFO **a)
 {
     return ASN1_d2i_bio_of(TS_TST_INFO, TS_TST_INFO_new, d2i_TS_TST_INFO, bp,
-                           a);
+        a);
 }
 
 int i2d_TS_TST_INFO_bio(BIO *bp, const TS_TST_INFO *a)
@@ -112,7 +112,7 @@ int i2d_TS_TST_INFO_bio(BIO *bp, const TS_TST_INFO *a)
 TS_TST_INFO *d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a)
 {
     return ASN1_d2i_fp_of(TS_TST_INFO, TS_TST_INFO_new, d2i_TS_TST_INFO, fp,
-                          a);
+        a);
 }
 
 int i2d_TS_TST_INFO_fp(FILE *fp, const TS_TST_INFO *a)
@@ -122,12 +122,12 @@ int i2d_TS_TST_INFO_fp(FILE *fp, const TS_TST_INFO *a)
 #endif
 
 ASN1_SEQUENCE(TS_STATUS_INFO) = {
-        ASN1_SIMPLE(TS_STATUS_INFO, status, ASN1_INTEGER),
-        ASN1_SEQUENCE_OF_OPT(TS_STATUS_INFO, text, ASN1_UTF8STRING),
-        ASN1_OPT(TS_STATUS_INFO, failure_info, ASN1_BIT_STRING)
+    ASN1_SIMPLE(TS_STATUS_INFO, status, ASN1_INTEGER),
+    ASN1_SEQUENCE_OF_OPT(TS_STATUS_INFO, text, ASN1_UTF8STRING),
+    ASN1_OPT(TS_STATUS_INFO, failure_info, ASN1_BIT_STRING)
 } static_ASN1_SEQUENCE_END(TS_STATUS_INFO)
 
-IMPLEMENT_ASN1_FUNCTIONS(TS_STATUS_INFO)
+    IMPLEMENT_ASN1_FUNCTIONS(TS_STATUS_INFO)
 IMPLEMENT_ASN1_DUP_FUNCTION(TS_STATUS_INFO)
 
 static int ts_resp_set_tst_info(TS_RESP *a)
@@ -156,7 +156,7 @@ static int ts_resp_set_tst_info(TS_RESP *a)
 }
 
 static int ts_resp_cb(int op, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                      void *exarg)
+    void *exarg)
 {
     TS_RESP *ts_resp = (TS_RESP *)*pval;
     if (op == ASN1_OP_NEW_POST) {
@@ -171,11 +171,11 @@ static int ts_resp_cb(int op, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_SEQUENCE_cb(TS_RESP, ts_resp_cb) = {
-        ASN1_SIMPLE(TS_RESP, status_info, TS_STATUS_INFO),
-        ASN1_OPT(TS_RESP, token, PKCS7),
+    ASN1_SIMPLE(TS_RESP, status_info, TS_STATUS_INFO),
+    ASN1_OPT(TS_RESP, token, PKCS7),
 } static_ASN1_SEQUENCE_END_cb(TS_RESP, TS_RESP)
 
-IMPLEMENT_ASN1_FUNCTIONS(TS_RESP)
+    IMPLEMENT_ASN1_FUNCTIONS(TS_RESP)
 
 IMPLEMENT_ASN1_DUP_FUNCTION(TS_RESP)
 
diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c
index 7e57858f42950..3d718fc7382ea 100644
--- a/crypto/ts/ts_conf.c
+++ b/crypto/ts/ts_conf.c
@@ -20,28 +20,28 @@
 #include <openssl/conf_api.h>
 
 /* Macro definitions for the configuration file. */
-#define BASE_SECTION                    "tsa"
-#define ENV_DEFAULT_TSA                 "default_tsa"
-#define ENV_SERIAL                      "serial"
-#define ENV_CRYPTO_DEVICE               "crypto_device"
-#define ENV_SIGNER_CERT                 "signer_cert"
-#define ENV_CERTS                       "certs"
-#define ENV_SIGNER_KEY                  "signer_key"
-#define ENV_SIGNER_DIGEST               "signer_digest"
-#define ENV_DEFAULT_POLICY              "default_policy"
-#define ENV_OTHER_POLICIES              "other_policies"
-#define ENV_DIGESTS                     "digests"
-#define ENV_ACCURACY                    "accuracy"
-#define ENV_ORDERING                    "ordering"
-#define ENV_TSA_NAME                    "tsa_name"
-#define ENV_ESS_CERT_ID_CHAIN           "ess_cert_id_chain"
-#define ENV_VALUE_SECS                  "secs"
-#define ENV_VALUE_MILLISECS             "millisecs"
-#define ENV_VALUE_MICROSECS             "microsecs"
-#define ENV_CLOCK_PRECISION_DIGITS      "clock_precision_digits"
-#define ENV_VALUE_YES                   "yes"
-#define ENV_VALUE_NO                    "no"
-#define ENV_ESS_CERT_ID_ALG             "ess_cert_id_alg"
+#define BASE_SECTION "tsa"
+#define ENV_DEFAULT_TSA "default_tsa"
+#define ENV_SERIAL "serial"
+#define ENV_CRYPTO_DEVICE "crypto_device"
+#define ENV_SIGNER_CERT "signer_cert"
+#define ENV_CERTS "certs"
+#define ENV_SIGNER_KEY "signer_key"
+#define ENV_SIGNER_DIGEST "signer_digest"
+#define ENV_DEFAULT_POLICY "default_policy"
+#define ENV_OTHER_POLICIES "other_policies"
+#define ENV_DIGESTS "digests"
+#define ENV_ACCURACY "accuracy"
+#define ENV_ORDERING "ordering"
+#define ENV_TSA_NAME "tsa_name"
+#define ENV_ESS_CERT_ID_CHAIN "ess_cert_id_chain"
+#define ENV_VALUE_SECS "secs"
+#define ENV_VALUE_MILLISECS "millisecs"
+#define ENV_VALUE_MICROSECS "microsecs"
+#define ENV_CLOCK_PRECISION_DIGITS "clock_precision_digits"
+#define ENV_VALUE_YES "yes"
+#define ENV_VALUE_NO "no"
+#define ENV_ESS_CERT_ID_ALG "ess_cert_id_alg"
 
 /* Function definitions for certificate and key loading. */
 
@@ -57,7 +57,7 @@ X509 *TS_CONF_load_cert(const char *file)
 #endif
         goto end;
     x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);
- end:
+end:
     if (x == NULL)
         ERR_raise(ERR_LIB_TS, TS_R_CANNOT_LOAD_CERT);
     BIO_free(cert);
@@ -93,7 +93,7 @@ STACK_OF(X509) *TS_CONF_load_certs(const char *file)
             xi->x509 = NULL;
         }
     }
- end:
+end:
     if (othercerts == NULL)
         ERR_raise(ERR_LIB_TS, TS_R_CANNOT_LOAD_CERT);
     sk_X509_INFO_pop_free(allcerts, X509_INFO_free);
@@ -113,7 +113,7 @@ EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass)
 #endif
         goto end;
     pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, (char *)pass);
- end:
+end:
     if (pkey == NULL)
         ERR_raise(ERR_LIB_TS, TS_R_CANNOT_LOAD_KEY);
     BIO_free(key);
@@ -143,7 +143,7 @@ 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)
 {
     int ret = 0;
     char *serial = NCONF_get_string(conf, section, ENV_SERIAL);
@@ -154,14 +154,14 @@ int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,
     TS_RESP_CTX_set_serial_cb(ctx, cb, serial);
 
     ret = 1;
- err:
+err:
     return ret;
 }
 
 #ifndef OPENSSL_NO_ENGINE
 
 int TS_CONF_set_crypto_device(CONF *conf, const char *section,
-                              const char *device)
+    const char *device)
 {
     int ret = 0;
 
@@ -173,7 +173,7 @@ int TS_CONF_set_crypto_device(CONF *conf, const char *section,
         goto err;
     }
     ret = 1;
- err:
+err:
     return ret;
 }
 
@@ -193,10 +193,10 @@ int TS_CONF_set_default_engine(const char *name)
         goto err;
     ret = 1;
 
- err:
+err:
     if (!ret)
         ERR_raise_data(ERR_LIB_TS, TS_R_COULD_NOT_SET_ENGINE,
-                       "engine:%s", name);
+            "engine:%s", name);
     ENGINE_free(e);
     return ret;
 }
@@ -204,7 +204,7 @@ 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 ret = 0;
     X509 *cert_obj = NULL;
@@ -222,13 +222,13 @@ int TS_CONF_set_signer_cert(CONF *conf, const char *section,
         goto err;
 
     ret = 1;
- err:
+err:
     X509_free(cert_obj);
     return ret;
 }
 
 int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,
-                      TS_RESP_CTX *ctx)
+    TS_RESP_CTX *ctx)
 {
     int ret = 0;
     STACK_OF(X509) *certs_obj = NULL;
@@ -242,16 +242,16 @@ int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,
         goto err;
     if (!TS_RESP_CTX_set_certs(ctx, certs_obj))
         goto err;
- end:
+end:
     ret = 1;
- err:
+err:
     OSSL_STACK_OF_X509_free(certs_obj);
     return ret;
 }
 
 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 ret = 0;
     EVP_PKEY *key_obj = NULL;
@@ -267,13 +267,13 @@ int TS_CONF_set_signer_key(CONF *conf, const char *section,
         goto err;
 
     ret = 1;
- err:
+err:
     EVP_PKEY_free(key_obj);
     return ret;
 }
 
 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 ret = 0;
     const EVP_MD *sign_md = NULL;
@@ -292,12 +292,12 @@ int TS_CONF_set_signer_digest(CONF *conf, const char *section,
         goto err;
 
     ret = 1;
- err:
+err:
     return ret;
 }
 
 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 ret = 0;
     ASN1_OBJECT *policy_obj = NULL;
@@ -316,7 +316,7 @@ int TS_CONF_set_def_policy(CONF *conf, const char *section,
         goto err;
 
     ret = 1;
- err:
+err:
     ASN1_OBJECT_free(policy_obj);
     return ret;
 }
@@ -342,13 +342,15 @@ int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx)
             ts_CONF_invalid(section, ENV_OTHER_POLICIES);
             goto err;
         }
-        if (!TS_RESP_CTX_add_policy(ctx, objtmp))
+        if (!TS_RESP_CTX_add_policy(ctx, objtmp)) {
+            ASN1_OBJECT_free(objtmp);
             goto err;
+        }
         ASN1_OBJECT_free(objtmp);
     }
 
     ret = 1;
- err:
+err:
     sk_CONF_VALUE_pop_free(list, X509V3_conf_free);
     return ret;
 }
@@ -386,7 +388,7 @@ int TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx)
     }
 
     ret = 1;
- err:
+err:
     sk_CONF_VALUE_pop_free(list, X509V3_conf_free);
     return ret;
 }
@@ -423,13 +425,13 @@ int TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx)
         goto err;
 
     ret = 1;
- err:
+err:
     sk_CONF_VALUE_pop_free(list, X509V3_conf_free);
     return ret;
 }
 
 int TS_CONF_set_clock_precision_digits(const CONF *conf, const char *section,
-                                       TS_RESP_CTX *ctx)
+    TS_RESP_CTX *ctx)
 {
     int ret = 0;
     long digits = 0;
@@ -447,12 +449,12 @@ int TS_CONF_set_clock_precision_digits(const CONF *conf, const char *section,
         goto err;
 
     return 1;
- err:
+err:
     return ret;
 }
 
 static int ts_CONF_add_flag(CONF *conf, const char *section,
-                            const char *field, int flag, TS_RESP_CTX *ctx)
+    const char *field, int flag, TS_RESP_CTX *ctx)
 {
     const char *value = NCONF_get_string(conf, section, field);
 
@@ -479,14 +481,14 @@ 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)
 {
     return ts_CONF_add_flag(conf, section, ENV_ESS_CERT_ID_CHAIN,
-                            TS_ESS_CERT_ID_CHAIN, ctx);
+        TS_ESS_CERT_ID_CHAIN, ctx);
 }
 
 int TS_CONF_set_ess_cert_id_digest(CONF *conf, const char *section,
-                                   TS_RESP_CTX *ctx)
+    TS_RESP_CTX *ctx)
 {
     int ret = 0;
     const EVP_MD *cert_md = NULL;
diff --git a/crypto/ts/ts_err.c b/crypto/ts/ts_err.c
index 46e89beee8a24..fa3f6bc1696b7 100644
--- a/crypto/ts/ts_err.c
+++ b/crypto/ts/ts_err.c
@@ -14,76 +14,76 @@
 
 #ifndef OPENSSL_NO_TS
 
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA TS_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_BAD_PKCS7_TYPE), "bad pkcs7 type"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_BAD_TYPE), "bad type"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_CANNOT_LOAD_CERT), "cannot load certificate"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_CANNOT_LOAD_KEY), "cannot load private key"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_CERTIFICATE_VERIFY_ERROR),
-    "certificate verify error"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_COULD_NOT_SET_ENGINE),
-    "could not set engine"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_COULD_NOT_SET_TIME), "could not set time"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_DETACHED_CONTENT), "detached content"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_ESS_ADD_SIGNING_CERT_ERROR),
-    "ess add signing cert error"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_ESS_ADD_SIGNING_CERT_V2_ERROR),
-    "ess add signing cert v2 error"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_ESS_SIGNING_CERTIFICATE_ERROR),
-    "ess signing certificate error"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_INVALID_NULL_POINTER),
-    "invalid null pointer"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE),
-    "invalid signer certificate purpose"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_MESSAGE_IMPRINT_MISMATCH),
-    "message imprint mismatch"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_NONCE_MISMATCH), "nonce mismatch"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_NONCE_NOT_RETURNED), "nonce not returned"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_NO_CONTENT), "no content"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_NO_TIME_STAMP_TOKEN), "no time stamp token"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_PKCS7_ADD_SIGNATURE_ERROR),
-    "pkcs7 add signature error"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR),
-    "pkcs7 add signed attr error"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_PKCS7_TO_TS_TST_INFO_FAILED),
-    "pkcs7 to ts tst info failed"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_POLICY_MISMATCH), "policy mismatch"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
-    "private key does not match certificate"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_RESPONSE_SETUP_ERROR),
-    "response setup error"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_SIGNATURE_FAILURE), "signature failure"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_THERE_MUST_BE_ONE_SIGNER),
-    "there must be one signer"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_TIME_SYSCALL_ERROR), "time syscall error"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_TOKEN_NOT_PRESENT), "token not present"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_TOKEN_PRESENT), "token present"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_TSA_NAME_MISMATCH), "tsa name mismatch"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_TSA_UNTRUSTED), "tsa untrusted"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_TST_INFO_SETUP_ERROR),
-    "tst info setup error"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_TS_DATASIGN), "ts datasign"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_UNACCEPTABLE_POLICY), "unacceptable policy"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_UNSUPPORTED_MD_ALGORITHM),
-    "unsupported md algorithm"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_UNSUPPORTED_VERSION), "unsupported version"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_VAR_BAD_VALUE), "var bad value"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_VAR_LOOKUP_FAILURE),
-    "cannot find config variable"},
-    {ERR_PACK(ERR_LIB_TS, 0, TS_R_WRONG_CONTENT_TYPE), "wrong content type"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_BAD_PKCS7_TYPE), "bad pkcs7 type" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_BAD_TYPE), "bad type" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_CANNOT_LOAD_CERT), "cannot load certificate" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_CANNOT_LOAD_KEY), "cannot load private key" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_CERTIFICATE_VERIFY_ERROR),
+        "certificate verify error" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_COULD_NOT_SET_ENGINE),
+        "could not set engine" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_COULD_NOT_SET_TIME), "could not set time" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_DETACHED_CONTENT), "detached content" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_ESS_ADD_SIGNING_CERT_ERROR),
+        "ess add signing cert error" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_ESS_ADD_SIGNING_CERT_V2_ERROR),
+        "ess add signing cert v2 error" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_ESS_SIGNING_CERTIFICATE_ERROR),
+        "ess signing certificate error" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_INVALID_NULL_POINTER),
+        "invalid null pointer" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE),
+        "invalid signer certificate purpose" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_MESSAGE_IMPRINT_MISMATCH),
+        "message imprint mismatch" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_NONCE_MISMATCH), "nonce mismatch" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_NONCE_NOT_RETURNED), "nonce not returned" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_NO_CONTENT), "no content" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_NO_TIME_STAMP_TOKEN), "no time stamp token" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_PKCS7_ADD_SIGNATURE_ERROR),
+        "pkcs7 add signature error" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR),
+        "pkcs7 add signed attr error" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_PKCS7_TO_TS_TST_INFO_FAILED),
+        "pkcs7 to ts tst info failed" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_POLICY_MISMATCH), "policy mismatch" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),
+        "private key does not match certificate" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_RESPONSE_SETUP_ERROR),
+        "response setup error" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_SIGNATURE_FAILURE), "signature failure" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_THERE_MUST_BE_ONE_SIGNER),
+        "there must be one signer" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_TIME_SYSCALL_ERROR), "time syscall error" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_TOKEN_NOT_PRESENT), "token not present" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_TOKEN_PRESENT), "token present" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_TSA_NAME_MISMATCH), "tsa name mismatch" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_TSA_UNTRUSTED), "tsa untrusted" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_TST_INFO_SETUP_ERROR),
+        "tst info setup error" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_TS_DATASIGN), "ts datasign" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_UNACCEPTABLE_POLICY), "unacceptable policy" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_UNSUPPORTED_MD_ALGORITHM),
+        "unsupported md algorithm" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_UNSUPPORTED_VERSION), "unsupported version" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_VAR_BAD_VALUE), "var bad value" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_VAR_LOOKUP_FAILURE),
+        "cannot find config variable" },
+    { ERR_PACK(ERR_LIB_TS, 0, TS_R_WRONG_CONTENT_TYPE), "wrong content type" },
+    { 0, NULL }
 };
 
-# endif
+#endif
 
 int ossl_err_load_TS_strings(void)
 {
-# ifndef OPENSSL_NO_ERR
+#ifndef OPENSSL_NO_ERR
     if (ERR_reason_error_string(TS_str_reasons[0].error) == NULL)
         ERR_load_strings_const(TS_str_reasons);
-# endif
+#endif
     return 1;
 }
 #else
diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c
index 5a99c9df17594..d6a279a16dfb2 100644
--- a/crypto/ts/ts_lib.c
+++ b/crypto/ts/ts_lib.c
@@ -74,7 +74,7 @@ int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg)
 {
     int i = OBJ_obj2nid(alg->algorithm);
     return BIO_printf(bio, "Hash Algorithm: %s\n",
-                      (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
+        (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
 }
 
 int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a)
@@ -86,7 +86,7 @@ int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a)
     BIO_printf(bio, "Message data:\n");
     msg = a->hashed_msg;
     BIO_dump_indent(bio, (const char *)ASN1_STRING_get0_data(msg),
-                    ASN1_STRING_length(msg), 4);
+        ASN1_STRING_length(msg), 4);
 
     return 1;
 }
diff --git a/crypto/ts/ts_local.h b/crypto/ts/ts_local.h
index b0dbd5fdd933d..7aebad0948eec 100644
--- a/crypto/ts/ts_local.h
+++ b/crypto/ts/ts_local.h
@@ -103,23 +103,23 @@ struct TS_resp_ctx {
     EVP_PKEY *signer_key;
     const EVP_MD *signer_md;
     const EVP_MD *ess_cert_id_digest;
-    STACK_OF(X509) *certs;      /* Certs to include in signed data. */
+    STACK_OF(X509) *certs; /* Certs to include in signed data. */
     STACK_OF(ASN1_OBJECT) *policies; /* Acceptable policies. */
     ASN1_OBJECT *default_policy; /* It may appear in policies, too. */
-    STACK_OF(EVP_MD) *mds;      /* Acceptable message digests. */
-    ASN1_INTEGER *seconds;      /* accuracy, 0 means not specified. */
-    ASN1_INTEGER *millis;       /* accuracy, 0 means not specified. */
-    ASN1_INTEGER *micros;       /* accuracy, 0 means not specified. */
+    STACK_OF(EVP_MD) *mds; /* Acceptable message digests. */
+    ASN1_INTEGER *seconds; /* accuracy, 0 means not specified. */
+    ASN1_INTEGER *millis; /* accuracy, 0 means not specified. */
+    ASN1_INTEGER *micros; /* accuracy, 0 means not specified. */
     unsigned clock_precision_digits; /* fraction of seconds in timestamp
                                       * token. */
-    unsigned flags;             /* Optional info, see values above. */
+    unsigned flags; /* Optional info, see values above. */
     /* Callback functions. */
     TS_serial_cb serial_cb;
-    void *serial_cb_data;       /* User data for serial_cb. */
+    void *serial_cb_data; /* User data for serial_cb. */
     TS_time_cb time_cb;
-    void *time_cb_data;         /* User data for time_cb. */
+    void *time_cb_data; /* User data for time_cb. */
     TS_extension_cb extension_cb;
-    void *extension_cb_data;    /* User data for extension_cb. */
+    void *extension_cb_data; /* User data for extension_cb. */
     /* These members are used only while creating the response. */
     TS_REQ *request;
     TS_RESP *response;
diff --git a/crypto/ts/ts_req_print.c b/crypto/ts/ts_req_print.c
index 968816ae28583..9d8f905ce0a6c 100644
--- a/crypto/ts/ts_req_print.c
+++ b/crypto/ts/ts_req_print.c
@@ -43,7 +43,7 @@ int TS_REQ_print_bio(BIO *bio, TS_REQ *a)
     BIO_write(bio, "\n", 1);
 
     BIO_printf(bio, "Certificate required: %s\n",
-               a->cert_req ? "yes" : "no");
+        a->cert_req ? "yes" : "no");
 
     TS_ext_print_bio(bio, a->extensions);
 
diff --git a/crypto/ts/ts_rsp_print.c b/crypto/ts/ts_rsp_print.c
index ca2d8a6dc1541..6d64de84bd826 100644
--- a/crypto/ts/ts_rsp_print.c
+++ b/crypto/ts/ts_rsp_print.c
@@ -21,10 +21,9 @@ struct status_map_st {
 };
 
 static int ts_status_map_print(BIO *bio, const struct status_map_st *a,
-                               const ASN1_BIT_STRING *v);
+    const ASN1_BIT_STRING *v);
 static int ts_ACCURACY_print_bio(BIO *bio, const TS_ACCURACY *accuracy);
 
-
 int TS_RESP_print_bio(BIO *bio, TS_RESP *a)
 {
     BIO_printf(bio, "Status info:\n");
@@ -50,24 +49,24 @@ int TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a)
         "Revoked."
     };
     static const struct status_map_st failure_map[] = {
-        {TS_INFO_BAD_ALG,
-         "unrecognized or unsupported algorithm identifier"},
-        {TS_INFO_BAD_REQUEST,
-         "transaction not permitted or supported"},
-        {TS_INFO_BAD_DATA_FORMAT,
-         "the data submitted has the wrong format"},
-        {TS_INFO_TIME_NOT_AVAILABLE,
-         "the TSA's time source is not available"},
-        {TS_INFO_UNACCEPTED_POLICY,
-         "the requested TSA policy is not supported by the TSA"},
-        {TS_INFO_UNACCEPTED_EXTENSION,
-         "the requested extension is not supported by the TSA"},
-        {TS_INFO_ADD_INFO_NOT_AVAILABLE,
-         "the additional information requested could not be understood "
-         "or is not available"},
-        {TS_INFO_SYSTEM_FAILURE,
-         "the request cannot be handled due to system failure"},
-        {-1, NULL}
+        { TS_INFO_BAD_ALG,
+            "unrecognized or unsupported algorithm identifier" },
+        { TS_INFO_BAD_REQUEST,
+            "transaction not permitted or supported" },
+        { TS_INFO_BAD_DATA_FORMAT,
+            "the data submitted has the wrong format" },
+        { TS_INFO_TIME_NOT_AVAILABLE,
+            "the TSA's time source is not available" },
+        { TS_INFO_UNACCEPTED_POLICY,
+            "the requested TSA policy is not supported by the TSA" },
+        { TS_INFO_UNACCEPTED_EXTENSION,
+            "the requested extension is not supported by the TSA" },
+        { TS_INFO_ADD_INFO_NOT_AVAILABLE,
+            "the additional information requested could not be understood "
+            "or is not available" },
+        { TS_INFO_SYSTEM_FAILURE,
+            "the request cannot be handled due to system failure" },
+        { -1, NULL }
     };
     long status;
     int i, lines = 0;
@@ -100,7 +99,7 @@ int TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a)
 }
 
 static int ts_status_map_print(BIO *bio, const struct status_map_st *a,
-                               const ASN1_BIT_STRING *v)
+    const ASN1_BIT_STRING *v)
 {
     int lines = 0;
 
diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c
index 2465aede8560b..b8648ce7b9527 100644
--- a/crypto/ts/ts_rsp_sign.c
+++ b/crypto/ts/ts_rsp_sign.c
@@ -30,15 +30,14 @@ static void ts_RESP_CTX_cleanup(TS_RESP_CTX *ctx);
 static int ts_RESP_check_request(TS_RESP_CTX *ctx);
 static ASN1_OBJECT *ts_RESP_get_policy(TS_RESP_CTX *ctx);
 static TS_TST_INFO *ts_RESP_create_tst_info(TS_RESP_CTX *ctx,
-                                            ASN1_OBJECT *policy);
+    ASN1_OBJECT *policy);
 static int ts_RESP_process_extensions(TS_RESP_CTX *ctx);
 static int ts_RESP_sign(TS_RESP_CTX *ctx);
 
 static int ts_TST_INFO_content_new(PKCS7 *p7);
 
-static ASN1_GENERALIZEDTIME
-*TS_RESP_set_genTime_with_precision(ASN1_GENERALIZEDTIME *, long, long,
-                                    unsigned);
+static ASN1_GENERALIZEDTIME *TS_RESP_set_genTime_with_precision(ASN1_GENERALIZEDTIME *, long, long,
+    unsigned);
 
 /* Default callback for response generation. */
 static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *ctx, void *data)
@@ -51,16 +50,16 @@ static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *ctx, void *data)
         goto err;
     return serial;
 
- err:
+err:
     ERR_raise(ERR_LIB_TS, ERR_R_ASN1_LIB);
     TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                "Error during serial number generation.");
+        "Error during serial number generation.");
     ASN1_INTEGER_free(serial);
     return NULL;
 }
 
 static int def_time_cb(struct TS_resp_ctx *ctx, void *data,
-                       long *sec, long *usec)
+    long *sec, long *usec)
 {
     OSSL_TIME t;
     struct timeval tv;
@@ -69,7 +68,7 @@ static int def_time_cb(struct TS_resp_ctx *ctx, void *data,
     if (ossl_time_is_zero(t)) {
         ERR_raise(ERR_LIB_TS, TS_R_TIME_SYSCALL_ERROR);
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                    "Time is not available.");
+            "Time is not available.");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_TIME_NOT_AVAILABLE);
         return 0;
     }
@@ -81,10 +80,10 @@ static int def_time_cb(struct TS_resp_ctx *ctx, void *data,
 }
 
 static int def_extension_cb(struct TS_resp_ctx *ctx, X509_EXTENSION *ext,
-                            void *data)
+    void *data)
 {
     TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                "Unsupported extension.");
+        "Unsupported extension.");
     TS_RESP_CTX_add_failure_info(ctx, TS_INFO_UNACCEPTED_EXTENSION);
     return 0;
 }
@@ -129,7 +128,7 @@ void TS_RESP_CTX_free(TS_RESP_CTX *ctx)
     OSSL_STACK_OF_X509_free(ctx->certs);
     sk_ASN1_OBJECT_pop_free(ctx->policies, ASN1_OBJECT_free);
     ASN1_OBJECT_free(ctx->default_policy);
-    sk_EVP_MD_free(ctx->mds);   /* No EVP_MD_free method exists. */
+    sk_EVP_MD_free(ctx->mds); /* No EVP_MD_free method exists. */
     ASN1_INTEGER_free(ctx->seconds);
     ASN1_INTEGER_free(ctx->millis);
     ASN1_INTEGER_free(ctx->micros);
@@ -174,7 +173,7 @@ int TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *def_policy)
     if ((ctx->default_policy = OBJ_dup(def_policy)) == NULL)
         goto err;
     return 1;
- err:
+err:
     ERR_raise(ERR_LIB_TS, ERR_R_OBJ_LIB);
     return 0;
 }
@@ -206,7 +205,7 @@ int TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, const ASN1_OBJECT *policy)
     }
 
     return 1;
- err:
+err:
     ASN1_OBJECT_free(copy);
     return 0;
 }
@@ -220,21 +219,21 @@ int TS_RESP_CTX_add_md(TS_RESP_CTX *ctx, const EVP_MD *md)
         goto err;
 
     return 1;
- err:
+err:
     ERR_raise(ERR_LIB_TS, ERR_R_CRYPTO_LIB);
     return 0;
 }
 
-#define TS_RESP_CTX_accuracy_free(ctx)          \
-        ASN1_INTEGER_free(ctx->seconds);        \
-        ctx->seconds = NULL;                    \
-        ASN1_INTEGER_free(ctx->millis);         \
-        ctx->millis = NULL;                     \
-        ASN1_INTEGER_free(ctx->micros);         \
-        ctx->micros = NULL;
+#define TS_RESP_CTX_accuracy_free(ctx) \
+    ASN1_INTEGER_free(ctx->seconds);   \
+    ctx->seconds = NULL;               \
+    ASN1_INTEGER_free(ctx->millis);    \
+    ctx->millis = NULL;                \
+    ASN1_INTEGER_free(ctx->micros);    \
+    ctx->micros = NULL;
 
 int TS_RESP_CTX_set_accuracy(TS_RESP_CTX *ctx,
-                             int secs, int millis, int micros)
+    int secs, int millis, int micros)
 {
 
     TS_RESP_CTX_accuracy_free(ctx);
@@ -252,7 +251,7 @@ int TS_RESP_CTX_set_accuracy(TS_RESP_CTX *ctx,
         goto err;
 
     return 1;
- err:
+err:
     TS_RESP_CTX_accuracy_free(ctx);
     ERR_raise(ERR_LIB_TS, ERR_R_ASN1_LIB);
     return 0;
@@ -276,14 +275,14 @@ void TS_RESP_CTX_set_time_cb(TS_RESP_CTX *ctx, TS_time_cb cb, void *data)
 }
 
 void TS_RESP_CTX_set_extension_cb(TS_RESP_CTX *ctx,
-                                  TS_extension_cb cb, void *data)
+    TS_extension_cb cb, void *data)
 {
     ctx->extension_cb = cb;
     ctx->extension_cb_data = data;
 }
 
 int TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx,
-                                int status, const char *text)
+    int status, const char *text)
 {
     TS_STATUS_INFO *si = NULL;
     ASN1_UTF8STRING *utf8_text = NULL;
@@ -312,21 +311,21 @@ int TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx,
             ERR_raise(ERR_LIB_TS, ERR_R_CRYPTO_LIB);
             goto err;
         }
-        utf8_text = NULL;       /* Ownership is lost. */
+        utf8_text = NULL; /* Ownership is lost. */
     }
     if (!TS_RESP_set_status_info(ctx->response, si)) {
         ERR_raise(ERR_LIB_TS, ERR_R_TS_LIB);
         goto err;
     }
     ret = 1;
- err:
+err:
     TS_STATUS_INFO_free(si);
     ASN1_UTF8STRING_free(utf8_text);
     return ret;
 }
 
 int TS_RESP_CTX_set_status_info_cond(TS_RESP_CTX *ctx,
-                                     int status, const char *text)
+    int status, const char *text)
 {
     int ret = 1;
     TS_STATUS_INFO *si = ctx->response->status_info;
@@ -346,7 +345,7 @@ int TS_RESP_CTX_add_failure_info(TS_RESP_CTX *ctx, int failure)
     if (!ASN1_BIT_STRING_set_bit(si->failure_info, failure, 1))
         goto err;
     return 1;
- err:
+err:
     ERR_raise(ERR_LIB_TS, ERR_R_ASN1_LIB);
     return 0;
 }
@@ -362,7 +361,7 @@ TS_TST_INFO *TS_RESP_CTX_get_tst_info(TS_RESP_CTX *ctx)
 }
 
 int TS_RESP_CTX_set_clock_precision_digits(TS_RESP_CTX *ctx,
-                                           unsigned precision)
+    unsigned precision)
 {
     if (precision > TS_MAX_CLOCK_PRECISION_DIGITS)
         return 0;
@@ -385,7 +384,7 @@ TS_RESP *TS_RESP_create_response(TS_RESP_CTX *ctx, BIO *req_bio)
     }
     if ((ctx->request = d2i_TS_REQ_bio(req_bio, NULL)) == NULL) {
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                    "Bad request format or system error.");
+            "Bad request format or system error.");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_DATA_FORMAT);
         goto end;
     }
@@ -403,21 +402,22 @@ TS_RESP *TS_RESP_create_response(TS_RESP_CTX *ctx, BIO *req_bio)
         goto end;
     result = 1;
 
- end:
+end:
     if (!result) {
         ERR_raise(ERR_LIB_TS, TS_R_RESPONSE_SETUP_ERROR);
         if (ctx->response != NULL) {
             if (TS_RESP_CTX_set_status_info_cond(ctx,
-                                                 TS_STATUS_REJECTION,
-                                                 "Error during response "
-                                                 "generation.") == 0) {
+                    TS_STATUS_REJECTION,
+                    "Error during response "
+                    "generation.")
+                == 0) {
                 TS_RESP_free(ctx->response);
                 ctx->response = NULL;
             }
         }
     }
     response = ctx->response;
-    ctx->response = NULL;       /* Ownership will be returned to caller. */
+    ctx->response = NULL; /* Ownership will be returned to caller. */
     ts_RESP_CTX_cleanup(ctx);
     return response;
 }
@@ -454,7 +454,7 @@ static int ts_RESP_check_request(TS_RESP_CTX *ctx)
 
     if (TS_REQ_get_version(request) != 1) {
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                    "Bad request version.");
+            "Bad request version.");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_REQUEST);
         return 0;
     }
@@ -469,8 +469,8 @@ static int ts_RESP_check_request(TS_RESP_CTX *ctx)
     }
     if (!md) {
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                    "Message digest algorithm is "
-                                    "not supported.");
+            "Message digest algorithm is "
+            "not supported.");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_ALG);
         return 0;
     }
@@ -481,15 +481,15 @@ static int ts_RESP_check_request(TS_RESP_CTX *ctx)
 
     if (md_alg->parameter && ASN1_TYPE_get(md_alg->parameter) != V_ASN1_NULL) {
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                    "Superfluous message digest "
-                                    "parameter.");
+            "Superfluous message digest "
+            "parameter.");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_ALG);
         return 0;
     }
     digest = msg_imprint->hashed_msg;
     if (digest->length != md_size) {
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                    "Bad message digest.");
+            "Bad message digest.");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_BAD_DATA_FORMAT);
         return 0;
     }
@@ -520,7 +520,8 @@ static ASN1_OBJECT *ts_RESP_get_policy(TS_RESP_CTX *ctx)
     if (policy == NULL) {
         ERR_raise(ERR_LIB_TS, TS_R_UNACCEPTABLE_POLICY);
         TS_RESP_CTX_set_status_info(ctx, TS_STATUS_REJECTION,
-                                    "Requested policy is not " "supported.");
+            "Requested policy is not "
+            "supported.");
         TS_RESP_CTX_add_failure_info(ctx, TS_INFO_UNACCEPTED_POLICY);
     }
     return policy;
@@ -528,7 +529,7 @@ static ASN1_OBJECT *ts_RESP_get_policy(TS_RESP_CTX *ctx)
 
 /* Creates the TS_TST_INFO object based on the settings of the context. */
 static TS_TST_INFO *ts_RESP_create_tst_info(TS_RESP_CTX *ctx,
-                                            ASN1_OBJECT *policy)
+    ASN1_OBJECT *policy)
 {
     int result = 0;
     TS_TST_INFO *tst_info = NULL;
@@ -551,9 +552,9 @@ static TS_TST_INFO *ts_RESP_create_tst_info(TS_RESP_CTX *ctx,
         || !TS_TST_INFO_set_serial(tst_info, serial))
         goto end;
     if (!ctx->time_cb(ctx, ctx->time_cb_data, &sec, &usec)
-        || (asn1_time =
-            TS_RESP_set_genTime_with_precision(NULL, sec, usec,
-                                        ctx->clock_precision_digits)) == NULL
+        || (asn1_time = TS_RESP_set_genTime_with_precision(NULL, sec, usec,
+                ctx->clock_precision_digits))
+            == NULL
         || !TS_TST_INFO_set_time(tst_info, asn1_time))
         goto end;
 
@@ -581,8 +582,7 @@ static TS_TST_INFO *ts_RESP_create_tst_info(TS_RESP_CTX *ctx,
         if ((tsa_name = GENERAL_NAME_new()) == NULL)
             goto end;
         tsa_name->type = GEN_DIRNAME;
-        tsa_name->d.dirn =
-            X509_NAME_dup(X509_get_subject_name(ctx->signer_cert));
+        tsa_name->d.dirn = X509_NAME_dup(X509_get_subject_name(ctx->signer_cert));
         if (!tsa_name->d.dirn)
             goto end;
         if (!TS_TST_INFO_set_tsa(tst_info, tsa_name))
@@ -590,14 +590,14 @@ static TS_TST_INFO *ts_RESP_create_tst_info(TS_RESP_CTX *ctx,
     }
 
     result = 1;
- end:
+end:
     if (!result) {
         TS_TST_INFO_free(tst_info);
         tst_info = NULL;
         ERR_raise(ERR_LIB_TS, TS_R_TST_INFO_SETUP_ERROR);
         TS_RESP_CTX_set_status_info_cond(ctx, TS_STATUS_REJECTION,
-                                         "Error during TSTInfo "
-                                         "generation.");
+            "Error during TSTInfo "
+            "generation.");
     }
     GENERAL_NAME_free(tsa_name);
     TS_ACCURACY_free(accuracy);
@@ -622,7 +622,7 @@ static int ts_RESP_process_extensions(TS_RESP_CTX *ctx)
          * For lack of better information, I'm placing a NULL there instead.
          * The callback can pick its own address out from the ctx anyway...
          */
-        ok = (*ctx->extension_cb) (ctx, ext, NULL);
+        ok = (*ctx->extension_cb)(ctx, ext, NULL);
     }
 
     return ok;
@@ -630,7 +630,7 @@ static int ts_RESP_process_extensions(TS_RESP_CTX *ctx)
 
 /* Functions for signing the TS_TST_INFO structure of the context. */
 static int ossl_ess_add1_signing_cert(PKCS7_SIGNER_INFO *si,
-                                      const ESS_SIGNING_CERT *sc)
+    const ESS_SIGNING_CERT *sc)
 {
     ASN1_STRING *seq = NULL;
     int len = i2d_ESS_SIGNING_CERT(sc, NULL);
@@ -648,12 +648,16 @@ static int ossl_ess_add1_signing_cert(PKCS7_SIGNER_INFO *si,
     }
 
     OPENSSL_free(pp);
-    return PKCS7_add_signed_attribute(si, NID_id_smime_aa_signingCertificate,
-                                      V_ASN1_SEQUENCE, seq);
+    if (!PKCS7_add_signed_attribute(si, NID_id_smime_aa_signingCertificate,
+            V_ASN1_SEQUENCE, seq)) {
+        ASN1_STRING_free(seq);
+        return 0;
+    }
+    return 1;
 }
 
 static int ossl_ess_add1_signing_cert_v2(PKCS7_SIGNER_INFO *si,
-                                         const ESS_SIGNING_CERT_V2 *sc)
+    const ESS_SIGNING_CERT_V2 *sc)
 {
     ASN1_STRING *seq = NULL;
     int len = i2d_ESS_SIGNING_CERT_V2(sc, NULL);
@@ -671,8 +675,12 @@ static int ossl_ess_add1_signing_cert_v2(PKCS7_SIGNER_INFO *si,
     }
 
     OPENSSL_free(pp);
-    return PKCS7_add_signed_attribute(si, NID_id_smime_aa_signingCertificateV2,
-                                      V_ASN1_SEQUENCE, seq);
+    if (!PKCS7_add_signed_attribute(si, NID_id_smime_aa_signingCertificateV2,
+            V_ASN1_SEQUENCE, seq)) {
+        ASN1_STRING_free(seq);
+        return 0;
+    }
+    return 1;
 }
 
 static int ts_RESP_sign(TS_RESP_CTX *ctx)
@@ -680,7 +688,7 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx)
     int ret = 0;
     PKCS7 *p7 = NULL;
     PKCS7_SIGNER_INFO *si;
-    STACK_OF(X509) *certs;      /* Certificates to include in sc. */
+    STACK_OF(X509) *certs; /* Certificates to include in sc. */
     ESS_SIGNING_CERT_V2 *sc2 = NULL;
     ESS_SIGNING_CERT *sc = NULL;
     ASN1_OBJECT *oid;
@@ -716,19 +724,20 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx)
         signer_md = EVP_MD_fetch(ctx->libctx, "SHA256", ctx->propq);
     else if (EVP_MD_get0_provider(ctx->signer_md) == NULL)
         signer_md = EVP_MD_fetch(ctx->libctx, EVP_MD_get0_name(ctx->signer_md),
-                                 ctx->propq);
+            ctx->propq);
     else
         signer_md = (EVP_MD *)ctx->signer_md;
 
     if ((si = PKCS7_add_signature(p7, ctx->signer_cert,
-                                  ctx->signer_key, signer_md)) == NULL) {
+             ctx->signer_key, signer_md))
+        == NULL) {
         ERR_raise(ERR_LIB_TS, TS_R_PKCS7_ADD_SIGNATURE_ERROR);
         goto err;
     }
 
     oid = OBJ_nid2obj(NID_id_smime_ct_TSTInfo);
     if (!PKCS7_add_signed_attribute(si, NID_pkcs9_contentType,
-                                    V_ASN1_OBJECT, oid)) {
+            V_ASN1_OBJECT, oid)) {
         ERR_raise(ERR_LIB_TS, TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR);
         goto err;
     }
@@ -737,7 +746,8 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx)
     if (ctx->ess_cert_id_digest == NULL
         || EVP_MD_is_a(ctx->ess_cert_id_digest, SN_sha1)) {
         if ((sc = OSSL_ESS_signing_cert_new_init(ctx->signer_cert,
-                                                 certs, 0)) == NULL)
+                 certs, 0))
+            == NULL)
             goto err;
 
         if (!ossl_ess_add1_signing_cert(si, sc)) {
@@ -746,7 +756,7 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx)
         }
     } else {
         sc2 = OSSL_ESS_signing_cert_v2_new_init(ctx->ess_cert_id_digest,
-                                                ctx->signer_cert, certs, 0);
+            ctx->signer_cert, certs, 0);
         if (sc2 == NULL)
             goto err;
 
@@ -771,18 +781,18 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx)
         goto err;
     }
     TS_RESP_set_tst_info(ctx->response, p7, ctx->tst_info);
-    p7 = NULL;                  /* Ownership is lost. */
-    ctx->tst_info = NULL;       /* Ownership is lost. */
+    p7 = NULL; /* Ownership is lost. */
+    ctx->tst_info = NULL; /* Ownership is lost. */
 
     ret = 1;
- err:
+err:
     if (signer_md != ctx->signer_md)
         EVP_MD_free(signer_md);
 
     if (!ret)
         TS_RESP_CTX_set_status_info_cond(ctx, TS_STATUS_REJECTION,
-                                         "Error during signature "
-                                         "generation.");
+            "Error during signature "
+            "generation.");
     BIO_free_all(p7bio);
     ESS_SIGNING_CERT_V2_free(sc2);
     ESS_SIGNING_CERT_free(sc);
@@ -811,15 +821,15 @@ static int ts_TST_INFO_content_new(PKCS7 *p7)
         goto err;
 
     return 1;
- err:
+err:
     ASN1_OCTET_STRING_free(octet_string);
     PKCS7_free(ret);
     return 0;
 }
 
 static ASN1_GENERALIZEDTIME *TS_RESP_set_genTime_with_precision(
-        ASN1_GENERALIZEDTIME *asn1_time, long sec, long usec,
-        unsigned precision)
+    ASN1_GENERALIZEDTIME *asn1_time, long sec, long usec,
+    unsigned precision)
 {
     time_t time_sec = (time_t)sec;
     struct tm *tm = NULL, tm_result;
@@ -841,9 +851,9 @@ static ASN1_GENERALIZEDTIME *TS_RESP_set_genTime_with_precision(
      * fraction-of-second details".
      */
     p += BIO_snprintf(p, p_end - p,
-                      "%04d%02d%02d%02d%02d%02d",
-                      tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-                      tm->tm_hour, tm->tm_min, tm->tm_sec);
+        "%04d%02d%02d%02d%02d%02d",
+        tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
+        tm->tm_hour, tm->tm_min, tm->tm_sec);
     if (precision > 0) {
         BIO_snprintf(p, 2 + precision, ".%06ld", usec);
         p += strlen(p);
@@ -864,7 +874,7 @@ static ASN1_GENERALIZEDTIME *TS_RESP_set_genTime_with_precision(
          * this loop even if all the digits are zero.
          */
         while (*--p == '0')
-             continue;
+            continue;
         if (*p != '.')
             ++p;
     }
@@ -880,7 +890,7 @@ static ASN1_GENERALIZEDTIME *TS_RESP_set_genTime_with_precision(
     }
     return asn1_time;
 
- err:
+err:
     ERR_raise(ERR_LIB_TS, TS_R_COULD_NOT_SET_TIME);
     return NULL;
 }
diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c
index 0d9fa01e4337f..bc5473421129e 100644
--- a/crypto/ts/ts_rsp_verify.c
+++ b/crypto/ts/ts_rsp_verify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2006-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -17,32 +17,32 @@
 #include "ts_local.h"
 
 static int ts_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,
-                          X509 *signer, STACK_OF(X509) **chain);
+    X509 *signer, STACK_OF(X509) **chain);
 static int ts_check_signing_certs(const PKCS7_SIGNER_INFO *si,
-                                  const STACK_OF(X509) *chain);
+    const STACK_OF(X509) *chain);
 
 static int int_ts_RESP_verify_token(TS_VERIFY_CTX *ctx,
-                                    PKCS7 *token, TS_TST_INFO *tst_info);
+    PKCS7 *token, TS_TST_INFO *tst_info);
 static int ts_check_status_info(TS_RESP *response);
 static char *ts_get_status_text(STACK_OF(ASN1_UTF8STRING) *text);
 static int ts_check_policy(const ASN1_OBJECT *req_oid,
-                           const TS_TST_INFO *tst_info);
+    const TS_TST_INFO *tst_info);
 static int ts_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
-                              X509_ALGOR **md_alg,
-                              unsigned char **imprint, unsigned *imprint_len);
+    X509_ALGOR **md_alg,
+    unsigned char **imprint, unsigned *imprint_len);
 static int ts_check_imprints(X509_ALGOR *algor_a,
-                             const unsigned char *imprint_a, unsigned len_a,
-                             TS_TST_INFO *tst_info);
+    const unsigned char *imprint_a, unsigned len_a,
+    TS_TST_INFO *tst_info);
 static int ts_check_nonces(const ASN1_INTEGER *a, TS_TST_INFO *tst_info);
 static int ts_check_signer_name(GENERAL_NAME *tsa_name, X509 *signer);
 static int ts_find_name(STACK_OF(GENERAL_NAME) *gen_names,
-                        GENERAL_NAME *name);
+    GENERAL_NAME *name);
 
 /*
  * This must be large enough to hold all values in ts_status_text (with
  * comma separator) or all text fields in ts_failure_info (also with comma).
  */
-#define TS_STATUS_BUF_SIZE      256
+#define TS_STATUS_BUF_SIZE 256
 
 /*
  * Local mapping between response codes and descriptions.
@@ -56,23 +56,22 @@ static const char *ts_status_text[] = {
     "revocationNotification"
 };
 
-#define TS_STATUS_TEXT_SIZE     OSSL_NELEM(ts_status_text)
+#define TS_STATUS_TEXT_SIZE OSSL_NELEM(ts_status_text)
 
 static struct {
     int code;
     const char *text;
 } ts_failure_info[] = {
-    {TS_INFO_BAD_ALG, "badAlg"},
-    {TS_INFO_BAD_REQUEST, "badRequest"},
-    {TS_INFO_BAD_DATA_FORMAT, "badDataFormat"},
-    {TS_INFO_TIME_NOT_AVAILABLE, "timeNotAvailable"},
-    {TS_INFO_UNACCEPTED_POLICY, "unacceptedPolicy"},
-    {TS_INFO_UNACCEPTED_EXTENSION, "unacceptedExtension"},
-    {TS_INFO_ADD_INFO_NOT_AVAILABLE, "addInfoNotAvailable"},
-    {TS_INFO_SYSTEM_FAILURE, "systemFailure"}
+    { TS_INFO_BAD_ALG, "badAlg" },
+    { TS_INFO_BAD_REQUEST, "badRequest" },
+    { TS_INFO_BAD_DATA_FORMAT, "badDataFormat" },
+    { TS_INFO_TIME_NOT_AVAILABLE, "timeNotAvailable" },
+    { TS_INFO_UNACCEPTED_POLICY, "unacceptedPolicy" },
+    { TS_INFO_UNACCEPTED_EXTENSION, "unacceptedExtension" },
+    { TS_INFO_ADD_INFO_NOT_AVAILABLE, "addInfoNotAvailable" },
+    { TS_INFO_SYSTEM_FAILURE, "systemFailure" }
 };
 
-
 /*-
  * This function carries out the following tasks:
  *      - Checks if there is one and only one signer.
@@ -86,7 +85,7 @@ static struct {
  *      - Returns the signer certificate in 'signer', if 'signer' is not NULL.
  */
 int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
-                             X509_STORE *store, X509 **signer_out)
+    X509_STORE *store, X509 **signer_out)
 {
     STACK_OF(PKCS7_SIGNER_INFO) *sinfos = NULL;
     PKCS7_SIGNER_INFO *si;
@@ -127,11 +126,10 @@ int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
         goto err;
     signer = sk_X509_value(signers, 0);
 
-    untrusted = sk_X509_new_reserve(NULL, sk_X509_num(certs)
-                                    + sk_X509_num(token->d.sign->cert));
+    untrusted = sk_X509_new_reserve(NULL, sk_X509_num(certs) + sk_X509_num(token->d.sign->cert));
     if (untrusted == NULL
-            || !X509_add_certs(untrusted, certs, 0)
-            || !X509_add_certs(untrusted, token->d.sign->cert, 0))
+        || !X509_add_certs(untrusted, certs, 0)
+        || !X509_add_certs(untrusted, token->d.sign->cert, 0))
         goto err;
     if (!ts_verify_cert(store, untrusted, signer, &chain))
         goto err;
@@ -157,7 +155,7 @@ int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
     }
     ret = 1;
 
- err:
+err:
     BIO_free_all(p7bio);
     sk_X509_free(untrusted);
     OSSL_STACK_OF_X509_free(chain);
@@ -171,7 +169,7 @@ int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
  * freeing the vector.
  */
 static int ts_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,
-                          X509 *signer, STACK_OF(X509) **chain)
+    X509 *signer, STACK_OF(X509) **chain)
 {
     X509_STORE_CTX *cert_ctx = NULL;
     int i;
@@ -190,7 +188,7 @@ static int ts_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted,
     if (i <= 0) {
         int j = X509_STORE_CTX_get_error(cert_ctx);
         ERR_raise_data(ERR_LIB_TS, TS_R_CERTIFICATE_VERIFY_ERROR,
-                       "Verify error:%s", X509_verify_cert_error_string(j));
+            "Verify error:%s", X509_verify_cert_error_string(j));
         goto err;
     }
     *chain = X509_STORE_CTX_get1_chain(cert_ctx);
@@ -211,27 +209,26 @@ static ESS_SIGNING_CERT *ossl_ess_get_signing_cert(const PKCS7_SIGNER_INFO *si)
     const unsigned char *p;
 
     attr = PKCS7_get_signed_attribute(si, NID_id_smime_aa_signingCertificate);
-    if (attr == NULL)
+    if (attr == NULL || attr->type != V_ASN1_SEQUENCE)
         return NULL;
     p = attr->value.sequence->data;
     return d2i_ESS_SIGNING_CERT(NULL, &p, attr->value.sequence->length);
 }
 
-static
-ESS_SIGNING_CERT_V2 *ossl_ess_get_signing_cert_v2(const PKCS7_SIGNER_INFO *si)
+static ESS_SIGNING_CERT_V2 *ossl_ess_get_signing_cert_v2(const PKCS7_SIGNER_INFO *si)
 {
     ASN1_TYPE *attr;
     const unsigned char *p;
 
     attr = PKCS7_get_signed_attribute(si, NID_id_smime_aa_signingCertificateV2);
-    if (attr == NULL)
+    if (attr == NULL || attr->type != V_ASN1_SEQUENCE)
         return NULL;
     p = attr->value.sequence->data;
     return d2i_ESS_SIGNING_CERT_V2(NULL, &p, attr->value.sequence->length);
 }
 
 static int ts_check_signing_certs(const PKCS7_SIGNER_INFO *si,
-                                  const STACK_OF(X509) *chain)
+    const STACK_OF(X509) *chain)
 {
     ESS_SIGNING_CERT *ss = ossl_ess_get_signing_cert(si);
     ESS_SIGNING_CERT_V2 *ssv2 = ossl_ess_get_signing_cert_v2(si);
@@ -260,7 +257,7 @@ int TS_RESP_verify_response(TS_VERIFY_CTX *ctx, TS_RESP *response)
         goto err;
     ret = 1;
 
- err:
+err:
     return ret;
 }
 
@@ -292,7 +289,7 @@ int TS_RESP_verify_token(TS_VERIFY_CTX *ctx, PKCS7 *token)
  *      - Check if the TSA name is the expected TSA.
  */
 static int int_ts_RESP_verify_token(TS_VERIFY_CTX *ctx,
-                                    PKCS7 *token, TS_TST_INFO *tst_info)
+    PKCS7 *token, TS_TST_INFO *tst_info)
 {
     X509 *signer = NULL;
     GENERAL_NAME *tsa_name = tst_info->tsa;
@@ -304,7 +301,7 @@ static int int_ts_RESP_verify_token(TS_VERIFY_CTX *ctx,
 
     /* Some options require us to also check the signature */
     if (((flags & TS_VFY_SIGNER) && tsa_name != NULL)
-            || (flags & TS_VFY_TSA_NAME)) {
+        || (flags & TS_VFY_TSA_NAME)) {
         flags |= TS_VFY_SIGNATURE;
     }
 
@@ -321,11 +318,11 @@ static int int_ts_RESP_verify_token(TS_VERIFY_CTX *ctx,
         goto err;
     if ((flags & TS_VFY_IMPRINT)
         && !ts_check_imprints(ctx->md_alg, ctx->imprint, ctx->imprint_len,
-                              tst_info))
+            tst_info))
         goto err;
     if ((flags & TS_VFY_DATA)
         && (!ts_compute_imprint(ctx->data, tst_info,
-                                &md_alg, &imprint, &imprint_len)
+                &md_alg, &imprint, &imprint_len)
             || !ts_check_imprints(md_alg, imprint, imprint_len, tst_info)))
         goto err;
     if ((flags & TS_VFY_NONCE)
@@ -343,7 +340,7 @@ static int int_ts_RESP_verify_token(TS_VERIFY_CTX *ctx,
     }
     ret = 1;
 
- err:
+err:
     X509_free(signer);
     X509_ALGOR_free(md_alg);
     OPENSSL_free(imprint);
@@ -362,7 +359,7 @@ static int ts_check_status_info(TS_RESP *response)
         return 1;
 
     /* There was an error, get the description in status_text. */
-    if (0 <= status && status < (long) OSSL_NELEM(ts_status_text))
+    if (0 <= status && status < (long)OSSL_NELEM(ts_status_text))
         status_text = ts_status_text[status];
     else
         status_text = "unknown code";
@@ -377,7 +374,7 @@ static int ts_check_status_info(TS_RESP *response)
         int first = 1;
         for (i = 0; i < (int)OSSL_NELEM(ts_failure_info); ++i) {
             if (ASN1_BIT_STRING_get_bit(info->failure_info,
-                                        ts_failure_info[i].code)) {
+                    ts_failure_info[i].code)) {
                 if (!first)
                     strcat(failure_text, ",");
                 else
@@ -390,10 +387,10 @@ static int ts_check_status_info(TS_RESP *response)
         strcpy(failure_text, "unspecified");
 
     ERR_raise_data(ERR_LIB_TS, TS_R_NO_TIME_STAMP_TOKEN,
-                   "status code: %s, status text: %s, failure codes: %s",
-                   status_text,
-                   embedded_status_text ? embedded_status_text : "unspecified",
-                   failure_text);
+        "status code: %s, status text: %s, failure codes: %s",
+        status_text,
+        embedded_status_text ? embedded_status_text : "unspecified",
+        failure_text);
     OPENSSL_free(embedded_status_text);
 
     return 0;
@@ -405,7 +402,7 @@ static char *ts_get_status_text(STACK_OF(ASN1_UTF8STRING) *text)
 }
 
 static int ts_check_policy(const ASN1_OBJECT *req_oid,
-                           const TS_TST_INFO *tst_info)
+    const TS_TST_INFO *tst_info)
 {
     const ASN1_OBJECT *resp_oid = tst_info->policy_id;
 
@@ -418,8 +415,8 @@ static int ts_check_policy(const ASN1_OBJECT *req_oid,
 }
 
 static int ts_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
-                              X509_ALGOR **md_alg,
-                              unsigned char **imprint, unsigned *imprint_len)
+    X509_ALGOR **md_alg,
+    unsigned char **imprint, unsigned *imprint_len)
 {
     TS_MSG_IMPRINT *msg_imprint = tst_info->msg_imprint;
     X509_ALGOR *md_alg_resp = msg_imprint->hash_algo;
@@ -474,7 +471,7 @@ static int ts_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
     EVP_MD_CTX_free(md_ctx);
 
     return 1;
- err:
+err:
     EVP_MD_CTX_free(md_ctx);
     EVP_MD_free(md);
     X509_ALGOR_free(*md_alg);
@@ -486,8 +483,8 @@ static int ts_compute_imprint(BIO *data, TS_TST_INFO *tst_info,
 }
 
 static int ts_check_imprints(X509_ALGOR *algor_a,
-                             const unsigned char *imprint_a, unsigned len_a,
-                             TS_TST_INFO *tst_info)
+    const unsigned char *imprint_a, unsigned len_a,
+    TS_TST_INFO *tst_info)
 {
     TS_MSG_IMPRINT *b = tst_info->msg_imprint;
     X509_ALGOR *algor_b = b->hash_algo;
@@ -499,15 +496,14 @@ static int ts_check_imprints(X509_ALGOR *algor_a,
 
         /* The parameter must be NULL in both. */
         if ((algor_a->parameter
-             && ASN1_TYPE_get(algor_a->parameter) != V_ASN1_NULL)
+                && ASN1_TYPE_get(algor_a->parameter) != V_ASN1_NULL)
             || (algor_b->parameter
                 && ASN1_TYPE_get(algor_b->parameter) != V_ASN1_NULL))
             goto err;
     }
 
-    ret = len_a == (unsigned)ASN1_STRING_length(b->hashed_msg) &&
-        memcmp(imprint_a, ASN1_STRING_get0_data(b->hashed_msg), len_a) == 0;
- err:
+    ret = len_a == (unsigned)ASN1_STRING_length(b->hashed_msg) && memcmp(imprint_a, ASN1_STRING_get0_data(b->hashed_msg), len_a) == 0;
+err:
     if (!ret)
         ERR_raise(ERR_LIB_TS, TS_R_MESSAGE_IMPRINT_MISMATCH);
     return ret;
diff --git a/crypto/ts/ts_verify_ctx.c b/crypto/ts/ts_verify_ctx.c
index 4b6a3ada9b2b1..ec9993ed9f051 100644
--- a/crypto/ts/ts_verify_ctx.c
+++ b/crypto/ts/ts_verify_ctx.c
@@ -78,7 +78,7 @@ int TS_VERIFY_CTX_set0_store(TS_VERIFY_CTX *ctx, X509_STORE *s)
 
 #ifndef OPENSSL_NO_DEPRECATED_3_4
 STACK_OF(X509) *TS_VERIFY_CTX_set_certs(TS_VERIFY_CTX *ctx,
-                                        STACK_OF(X509) *certs)
+    STACK_OF(X509) *certs)
 {
     ctx->certs = certs;
     return ctx->certs;
@@ -94,7 +94,7 @@ int TS_VERIFY_CTX_set0_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs)
 
 #ifndef OPENSSL_NO_DEPRECATED_3_4
 unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
-                                         unsigned char *hexstr, long len)
+    unsigned char *hexstr, long len)
 {
     OPENSSL_free(ctx->imprint);
     ctx->imprint = hexstr;
@@ -104,7 +104,7 @@ unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
 #endif
 
 int TS_VERIFY_CTX_set0_imprint(TS_VERIFY_CTX *ctx,
-                              unsigned char *hexstr, long len)
+    unsigned char *hexstr, long len)
 {
     OPENSSL_free(ctx->imprint);
     ctx->imprint = hexstr;
@@ -176,7 +176,7 @@ TS_VERIFY_CTX *TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx)
         ret->flags &= ~TS_VFY_NONCE;
 
     return ret;
- err:
+err:
     if (ctx)
         TS_VERIFY_CTX_cleanup(ctx);
     else
diff --git a/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c
index 25fe9bf64bf7b..efa33c6f972fe 100644
--- a/crypto/txt_db/txt_db.c
+++ b/crypto/txt_db/txt_db.c
@@ -113,7 +113,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num)
     }
     BUF_MEM_free(buf);
     return ret;
- err:
+err:
     BUF_MEM_free(buf);
     if (ret != NULL) {
         sk_OPENSSL_PSTRING_free(ret->data);
@@ -125,7 +125,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num)
 }
 
 OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx,
-                                    OPENSSL_STRING *value)
+    OPENSSL_STRING *value)
 {
     OPENSSL_STRING *ret;
     LHASH_OF(OPENSSL_STRING) *lh;
@@ -144,8 +144,8 @@ OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx,
     return ret;
 }
 
-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)
 {
     LHASH_OF(OPENSSL_STRING) *idx;
     OPENSSL_STRING *r, *k;
@@ -226,7 +226,7 @@ long TXT_DB_write(BIO *out, TXT_DB *db)
         tot += j;
     }
     ret = tot;
- err:
+err:
     BUF_MEM_free(buf);
     return ret;
 }
@@ -238,7 +238,7 @@ int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
 
     for (i = 0; i < db->num_fields; i++) {
         if (db->index[i] != NULL) {
-            if ((db->qual[i] != NULL) && (db->qual[i] (row) == 0))
+            if ((db->qual[i] != NULL) && (db->qual[i](row) == 0))
                 continue;
             r = lh_OPENSSL_STRING_retrieve(db->index[i], row);
             if (r != NULL) {
@@ -252,7 +252,7 @@ int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
 
     for (i = 0; i < db->num_fields; i++) {
         if (db->index[i] != NULL) {
-            if ((db->qual[i] != NULL) && (db->qual[i] (row) == 0))
+            if ((db->qual[i] != NULL) && (db->qual[i](row) == 0))
                 continue;
             (void)lh_OPENSSL_STRING_insert(db->index[i], row);
             if (lh_OPENSSL_STRING_retrieve(db->index[i], row) == NULL)
@@ -263,16 +263,16 @@ int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
         goto err1;
     return 1;
 
- err1:
+err1:
     db->error = DB_ERROR_MALLOC;
     while (i-- > 0) {
         if (db->index[i] != NULL) {
-            if ((db->qual[i] != NULL) && (db->qual[i] (row) == 0))
+            if ((db->qual[i] != NULL) && (db->qual[i](row) == 0))
                 continue;
             (void)lh_OPENSSL_STRING_delete(db->index[i], row);
         }
     }
- err:
+err:
     return 0;
 }
 
@@ -297,7 +297,7 @@ void TXT_DB_free(TXT_DB *db)
              */
             p = sk_OPENSSL_PSTRING_value(db->data, i);
             max = p[db->num_fields]; /* last address */
-            if (max == NULL) {  /* new row */
+            if (max == NULL) { /* new row */
                 for (n = 0; n < db->num_fields; n++)
                     OPENSSL_free(p[n]);
             } else {
diff --git a/crypto/ui/ui_err.c b/crypto/ui/ui_err.c
index 9b9c12133270e..1c21b3a4f7454 100644
--- a/crypto/ui/ui_err.c
+++ b/crypto/ui/ui_err.c
@@ -15,24 +15,24 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA UI_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_COMMON_OK_AND_CANCEL_CHARACTERS),
-    "common ok and cancel characters"},
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_INDEX_TOO_LARGE), "index too large"},
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_INDEX_TOO_SMALL), "index too small"},
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_NO_RESULT_BUFFER), "no result buffer"},
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_PROCESSING_ERROR), "processing error"},
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_RESULT_TOO_LARGE), "result too large"},
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_RESULT_TOO_SMALL), "result too small"},
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_SYSASSIGN_ERROR), "sys$assign error"},
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_SYSDASSGN_ERROR), "sys$dassgn error"},
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_SYSQIOW_ERROR), "sys$qiow error"},
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_UNKNOWN_CONTROL_COMMAND),
-    "unknown control command"},
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_UNKNOWN_TTYGET_ERRNO_VALUE),
-    "unknown ttyget errno value"},
-    {ERR_PACK(ERR_LIB_UI, 0, UI_R_USER_DATA_DUPLICATION_UNSUPPORTED),
-    "user data duplication unsupported"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_COMMON_OK_AND_CANCEL_CHARACTERS),
+        "common ok and cancel characters" },
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_INDEX_TOO_LARGE), "index too large" },
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_INDEX_TOO_SMALL), "index too small" },
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_NO_RESULT_BUFFER), "no result buffer" },
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_PROCESSING_ERROR), "processing error" },
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_RESULT_TOO_LARGE), "result too large" },
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_RESULT_TOO_SMALL), "result too small" },
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_SYSASSIGN_ERROR), "sys$assign error" },
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_SYSDASSGN_ERROR), "sys$dassgn error" },
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_SYSQIOW_ERROR), "sys$qiow error" },
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_UNKNOWN_CONTROL_COMMAND),
+        "unknown control command" },
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_UNKNOWN_TTYGET_ERRNO_VALUE),
+        "unknown ttyget errno value" },
+    { ERR_PACK(ERR_LIB_UI, 0, UI_R_USER_DATA_DUPLICATION_UNSUPPORTED),
+        "user data duplication unsupported" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c
index a8756af1cdeab..79c8ecc907d1f 100644
--- a/crypto/ui/ui_lib.c
+++ b/crypto/ui/ui_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-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
@@ -93,16 +93,17 @@ static int allocate_string_stack(UI *ui)
 }
 
 static UI_STRING *general_allocate_prompt(UI *ui, const char *prompt,
-                                          int prompt_freeable,
-                                          enum UI_string_types type,
-                                          int input_flags, char *result_buf)
+    int prompt_freeable,
+    enum UI_string_types type,
+    int input_flags, char *result_buf)
 {
     UI_STRING *ret = NULL;
 
     if (prompt == NULL) {
         ERR_raise(ERR_LIB_UI, ERR_R_PASSED_NULL_PARAMETER);
     } else if ((type == UIT_PROMPT || type == UIT_VERIFY
-                || type == UIT_BOOLEAN) && result_buf == NULL) {
+                   || type == UIT_BOOLEAN)
+        && result_buf == NULL) {
         ERR_raise(ERR_LIB_UI, UI_R_NO_RESULT_BUFFER);
     } else if ((ret = OPENSSL_zalloc(sizeof(*ret))) != NULL) {
         ret->out_string = prompt;
@@ -115,14 +116,14 @@ static UI_STRING *general_allocate_prompt(UI *ui, const char *prompt,
 }
 
 static int general_allocate_string(UI *ui, const char *prompt,
-                                   int prompt_freeable,
-                                   enum UI_string_types type, int input_flags,
-                                   char *result_buf, int minsize, int maxsize,
-                                   const char *test_buf)
+    int prompt_freeable,
+    enum UI_string_types type, int input_flags,
+    char *result_buf, int minsize, int maxsize,
+    const char *test_buf)
 {
     int ret = -1;
     UI_STRING *s = general_allocate_prompt(ui, prompt, prompt_freeable,
-                                           type, input_flags, result_buf);
+        type, input_flags, result_buf);
 
     if (s != NULL) {
         if (allocate_string_stack(ui) >= 0) {
@@ -142,13 +143,13 @@ static int general_allocate_string(UI *ui, const char *prompt,
 }
 
 static int general_allocate_boolean(UI *ui,
-                                    const char *prompt,
-                                    const char *action_desc,
-                                    const char *ok_chars,
-                                    const char *cancel_chars,
-                                    int prompt_freeable,
-                                    enum UI_string_types type,
-                                    int input_flags, char *result_buf)
+    const char *prompt,
+    const char *action_desc,
+    const char *ok_chars,
+    const char *cancel_chars,
+    int prompt_freeable,
+    enum UI_string_types type,
+    int input_flags, char *result_buf)
 {
     int ret = -1;
     UI_STRING *s;
@@ -166,7 +167,7 @@ static int general_allocate_boolean(UI *ui,
         }
 
         s = general_allocate_prompt(ui, prompt, prompt_freeable,
-                                    type, input_flags, result_buf);
+            type, input_flags, result_buf);
 
         if (s != NULL) {
             if (allocate_string_stack(ui) >= 0) {
@@ -193,18 +194,19 @@ static int general_allocate_boolean(UI *ui,
  * direct reference to the prompt.
  */
 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)
 {
     return general_allocate_string(ui, prompt, 0,
-                                   UIT_PROMPT, flags, result_buf, minsize,
-                                   maxsize, NULL);
+        UIT_PROMPT, flags, result_buf, minsize,
+        maxsize, NULL);
 }
 
 /* Same as UI_add_input_string(), excepts it takes a copy of the prompt */
 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)
 {
     char *prompt_copy = NULL;
+    int ret;
 
     if (prompt != NULL) {
         prompt_copy = OPENSSL_strdup(prompt);
@@ -212,25 +214,30 @@ int UI_dup_input_string(UI *ui, const char *prompt, int flags,
             return 0;
     }
 
-    return general_allocate_string(ui, prompt_copy, 1,
-                                   UIT_PROMPT, flags, result_buf, minsize,
-                                   maxsize, NULL);
+    ret = general_allocate_string(ui, prompt_copy, 1,
+        UIT_PROMPT, flags, result_buf, minsize,
+        maxsize, NULL);
+    if (ret <= 0)
+        OPENSSL_free(prompt_copy);
+
+    return ret;
 }
 
 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)
 {
     return general_allocate_string(ui, prompt, 0,
-                                   UIT_VERIFY, flags, result_buf, minsize,
-                                   maxsize, test_buf);
+        UIT_VERIFY, flags, result_buf, minsize,
+        maxsize, 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)
 {
     char *prompt_copy = NULL;
+    int ret;
 
     if (prompt != NULL) {
         prompt_copy = OPENSSL_strdup(prompt);
@@ -238,28 +245,32 @@ int UI_dup_verify_string(UI *ui, const char *prompt, int flags,
             return -1;
     }
 
-    return general_allocate_string(ui, prompt_copy, 1,
-                                   UIT_VERIFY, flags, result_buf, minsize,
-                                   maxsize, test_buf);
+    ret = general_allocate_string(ui, prompt_copy, 1,
+        UIT_VERIFY, flags, result_buf, minsize,
+        maxsize, test_buf);
+    if (ret <= 0)
+        OPENSSL_free(prompt_copy);
+    return ret;
 }
 
 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)
 {
     return general_allocate_boolean(ui, prompt, action_desc,
-                                    ok_chars, cancel_chars, 0, UIT_BOOLEAN,
-                                    flags, result_buf);
+        ok_chars, cancel_chars, 0, UIT_BOOLEAN,
+        flags, 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)
 {
     char *prompt_copy = NULL;
     char *action_desc_copy = NULL;
     char *ok_chars_copy = NULL;
     char *cancel_chars_copy = NULL;
+    int ret;
 
     if (prompt != NULL) {
         prompt_copy = OPENSSL_strdup(prompt);
@@ -285,10 +296,15 @@ int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
             goto err;
     }
 
-    return general_allocate_boolean(ui, prompt_copy, action_desc_copy,
-                                    ok_chars_copy, cancel_chars_copy, 1,
-                                    UIT_BOOLEAN, flags, result_buf);
- err:
+    ret = general_allocate_boolean(ui, prompt_copy, action_desc_copy,
+        ok_chars_copy, cancel_chars_copy, 1,
+        UIT_BOOLEAN, flags, result_buf);
+    if (ret <= 0)
+        goto err;
+
+    return ret;
+
+err:
     OPENSSL_free(prompt_copy);
     OPENSSL_free(action_desc_copy);
     OPENSSL_free(ok_chars_copy);
@@ -299,12 +315,13 @@ int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
 int UI_add_info_string(UI *ui, const char *text)
 {
     return general_allocate_string(ui, text, 0, UIT_INFO, 0, NULL, 0, 0,
-                                   NULL);
+        NULL);
 }
 
 int UI_dup_info_string(UI *ui, const char *text)
 {
     char *text_copy = NULL;
+    int ret;
 
     if (text != NULL) {
         text_copy = OPENSSL_strdup(text);
@@ -312,31 +329,39 @@ int UI_dup_info_string(UI *ui, const char *text)
             return -1;
     }
 
-    return general_allocate_string(ui, text_copy, 1, UIT_INFO, 0, NULL,
-                                   0, 0, NULL);
+    ret = general_allocate_string(ui, text_copy, 1, UIT_INFO, 0, NULL,
+        0, 0, NULL);
+    if (ret <= 0)
+        OPENSSL_free(text_copy);
+    return ret;
 }
 
 int UI_add_error_string(UI *ui, const char *text)
 {
     return general_allocate_string(ui, text, 0, UIT_ERROR, 0, NULL, 0, 0,
-                                   NULL);
+        NULL);
 }
 
 int UI_dup_error_string(UI *ui, const char *text)
 {
     char *text_copy = NULL;
+    int ret;
 
     if (text != NULL) {
         text_copy = OPENSSL_strdup(text);
         if (text_copy == NULL)
             return -1;
     }
-    return general_allocate_string(ui, text_copy, 1, UIT_ERROR, 0, NULL,
-                                   0, 0, NULL);
+
+    ret = general_allocate_string(ui, text_copy, 1, UIT_ERROR, 0, NULL,
+        0, 0, NULL);
+    if (ret <= 0)
+        OPENSSL_free(text_copy);
+    return ret;
 }
 
 char *UI_construct_prompt(UI *ui, const char *phrase_desc,
-                          const char *object_name)
+    const char *object_name)
 {
     char *prompt = NULL;
 
@@ -462,14 +487,14 @@ int UI_process(UI *ui)
 
     if (ui->flags & UI_FLAG_PRINT_ERRORS)
         ERR_print_errors_cb((int (*)(const char *, size_t, void *))
-                            print_error, (void *)ui);
+                                print_error,
+            (void *)ui);
 
     for (i = 0; i < sk_UI_STRING_num(ui->strings); i++) {
         if (ui->meth->ui_write_string != NULL
             && (ui->meth->ui_write_string(ui,
-                                          sk_UI_STRING_value(ui->strings, i))
-                <= 0))
-        {
+                    sk_UI_STRING_value(ui->strings, i))
+                <= 0)) {
             state = "writing strings";
             ok = -1;
             goto err;
@@ -478,15 +503,15 @@ int UI_process(UI *ui)
 
     if (ui->meth->ui_flush != NULL)
         switch (ui->meth->ui_flush(ui)) {
-        case -1:               /* Interrupt/Cancel/something... */
+        case -1: /* Interrupt/Cancel/something... */
             ui->flags &= ~UI_FLAG_REDOABLE;
             ok = -2;
             goto err;
-        case 0:                /* Errors */
+        case 0: /* Errors */
             state = "flushing";
             ok = -1;
             goto err;
-        default:               /* Success */
+        default: /* Success */
             ok = 0;
             break;
         }
@@ -494,17 +519,17 @@ int UI_process(UI *ui)
     for (i = 0; i < sk_UI_STRING_num(ui->strings); i++) {
         if (ui->meth->ui_read_string != NULL) {
             switch (ui->meth->ui_read_string(ui,
-                                             sk_UI_STRING_value(ui->strings,
-                                                                i))) {
-            case -1:           /* Interrupt/Cancel/something... */
+                sk_UI_STRING_value(ui->strings,
+                    i))) {
+            case -1: /* Interrupt/Cancel/something... */
                 ui->flags &= ~UI_FLAG_REDOABLE;
                 ok = -2;
                 goto err;
-            case 0:            /* Errors */
+            case 0: /* Errors */
                 state = "reading strings";
                 ok = -1;
                 goto err;
-            default:           /* Success */
+            default: /* Success */
                 ok = 0;
                 break;
             }
@@ -516,7 +541,7 @@ int UI_process(UI *ui)
     }
 
     state = NULL;
- err:
+err:
     if (ui->meth->ui_close_session != NULL
         && ui->meth->ui_close_session(ui) <= 0) {
         if (state == NULL)
@@ -529,24 +554,23 @@ int UI_process(UI *ui)
     return ok;
 }
 
-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))
 {
     if (ui == NULL) {
         ERR_raise(ERR_LIB_UI, ERR_R_PASSED_NULL_PARAMETER);
         return -1;
     }
     switch (cmd) {
-    case UI_CTRL_PRINT_ERRORS:
-        {
-            int save_flag = ! !(ui->flags & UI_FLAG_PRINT_ERRORS);
-            if (i)
-                ui->flags |= UI_FLAG_PRINT_ERRORS;
-            else
-                ui->flags &= ~UI_FLAG_PRINT_ERRORS;
-            return save_flag;
-        }
+    case UI_CTRL_PRINT_ERRORS: {
+        int save_flag = !!(ui->flags & UI_FLAG_PRINT_ERRORS);
+        if (i)
+            ui->flags |= UI_FLAG_PRINT_ERRORS;
+        else
+            ui->flags &= ~UI_FLAG_PRINT_ERRORS;
+        return save_flag;
+    }
     case UI_CTRL_IS_REDOABLE:
-        return ! !(ui->flags & UI_FLAG_REDOABLE);
+        return !!(ui->flags & UI_FLAG_REDOABLE);
     default:
         break;
     }
@@ -582,7 +606,7 @@ UI_METHOD *UI_create_method(const char *name)
     if ((ui_method = OPENSSL_zalloc(sizeof(*ui_method))) == NULL
         || (ui_method->name = OPENSSL_strdup(name)) == NULL
         || !CRYPTO_new_ex_data(CRYPTO_EX_INDEX_UI_METHOD, ui_method,
-                               &ui_method->ex_data)) {
+            &ui_method->ex_data)) {
 
         if (ui_method != NULL) {
             if (ui_method->name != NULL)
@@ -609,13 +633,13 @@ void UI_destroy_method(UI_METHOD *ui_method)
     if (ui_method == NULL)
         return;
     CRYPTO_free_ex_data(CRYPTO_EX_INDEX_UI_METHOD, ui_method,
-                        &ui_method->ex_data);
+        &ui_method->ex_data);
     OPENSSL_free(ui_method->name);
     ui_method->name = NULL;
     OPENSSL_free(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))
 {
     if (method != NULL) {
         method->ui_open_session = opener;
@@ -625,7 +649,7 @@ 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 (*writer)(UI *ui, UI_STRING *uis))
 {
     if (method != NULL) {
         method->ui_write_string = writer;
@@ -634,7 +658,7 @@ int UI_method_set_writer(UI_METHOD *method,
     return -1;
 }
 
-int UI_method_set_flusher(UI_METHOD *method, int (*flusher) (UI *ui))
+int UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui))
 {
     if (method != NULL) {
         method->ui_flush = flusher;
@@ -644,7 +668,7 @@ 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 (*reader)(UI *ui, UI_STRING *uis))
 {
     if (method != NULL) {
         method->ui_read_string = reader;
@@ -653,7 +677,7 @@ int UI_method_set_reader(UI_METHOD *method,
     return -1;
 }
 
-int UI_method_set_closer(UI_METHOD *method, int (*closer) (UI *ui))
+int UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui))
 {
     if (method != NULL) {
         method->ui_close_session = closer;
@@ -663,8 +687,8 @@ 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))
 {
     if (method != NULL) {
         method->ui_duplicate_data = duplicator;
@@ -675,9 +699,9 @@ int UI_method_set_data_duplicator(UI_METHOD *method,
 }
 
 int UI_method_set_prompt_constructor(UI_METHOD *method,
-                                     char *(*prompt_constructor) (UI *ui,
-                                                                  const char *,
-                                                                  const char *))
+    char *(*prompt_constructor)(UI *ui,
+        const char *,
+        const char *))
 {
     if (method != NULL) {
         method->ui_construct_prompt = prompt_constructor;
@@ -691,57 +715,56 @@ int UI_method_set_ex_data(UI_METHOD *method, int idx, void *data)
     return CRYPTO_set_ex_data(&method->ex_data, idx, data);
 }
 
-int (*UI_method_get_opener(const UI_METHOD *method)) (UI *)
+int (*UI_method_get_opener(const UI_METHOD *method))(UI *)
 {
     if (method != NULL)
         return method->ui_open_session;
     return NULL;
 }
 
-int (*UI_method_get_writer(const UI_METHOD *method)) (UI *, UI_STRING *)
+int (*UI_method_get_writer(const UI_METHOD *method))(UI *, UI_STRING *)
 {
     if (method != NULL)
         return method->ui_write_string;
     return NULL;
 }
 
-int (*UI_method_get_flusher(const UI_METHOD *method)) (UI *)
+int (*UI_method_get_flusher(const UI_METHOD *method))(UI *)
 {
     if (method != NULL)
         return method->ui_flush;
     return NULL;
 }
 
-int (*UI_method_get_reader(const UI_METHOD *method)) (UI *, UI_STRING *)
+int (*UI_method_get_reader(const UI_METHOD *method))(UI *, UI_STRING *)
 {
     if (method != NULL)
         return method->ui_read_string;
     return NULL;
 }
 
-int (*UI_method_get_closer(const UI_METHOD *method)) (UI *)
+int (*UI_method_get_closer(const UI_METHOD *method))(UI *)
 {
     if (method != NULL)
         return method->ui_close_session;
     return NULL;
 }
 
-char *(*UI_method_get_prompt_constructor(const UI_METHOD *method))
-    (UI *, const char *, const char *)
+char *(*UI_method_get_prompt_constructor(const UI_METHOD *method))(UI *, const char *, const char *)
 {
     if (method != NULL)
         return method->ui_construct_prompt;
     return NULL;
 }
 
-void *(*UI_method_get_data_duplicator(const UI_METHOD *method)) (UI *, void *)
+void *(*UI_method_get_data_duplicator(const UI_METHOD *method))(UI *, void *)
 {
     if (method != NULL)
         return method->ui_duplicate_data;
     return NULL;
 }
 
-void (*UI_method_get_data_destructor(const UI_METHOD *method)) (UI *, void *)
+void (*UI_method_get_data_destructor(const UI_METHOD *method))(UI *, void *)
 {
     if (method != NULL)
         return method->ui_destroy_data;
@@ -873,17 +896,17 @@ int UI_set_result_ex(UI *ui, UI_STRING *uis, const char *result, int len)
         if (len < uis->_.string_data.result_minsize) {
             ui->flags |= UI_FLAG_REDOABLE;
             ERR_raise_data(ERR_LIB_UI, UI_R_RESULT_TOO_SMALL,
-                           "You must type in %d to %d characters",
-                           uis->_.string_data.result_minsize,
-                           uis->_.string_data.result_maxsize);
+                "You must type in %d to %d characters",
+                uis->_.string_data.result_minsize,
+                uis->_.string_data.result_maxsize);
             return -1;
         }
         if (len > uis->_.string_data.result_maxsize) {
             ui->flags |= UI_FLAG_REDOABLE;
             ERR_raise_data(ERR_LIB_UI, UI_R_RESULT_TOO_LARGE,
-                           "You must type in %d to %d characters",
-                           uis->_.string_data.result_minsize,
-                           uis->_.string_data.result_maxsize);
+                "You must type in %d to %d characters",
+                uis->_.string_data.result_minsize,
+                uis->_.string_data.result_maxsize);
             return -1;
         }
 
@@ -897,27 +920,26 @@ int UI_set_result_ex(UI *ui, UI_STRING *uis, const char *result, int len)
             uis->result_buf[len] = '\0';
         uis->result_len = len;
         break;
-    case UIT_BOOLEAN:
-        {
-            const char *p;
+    case UIT_BOOLEAN: {
+        const char *p;
 
-            if (uis->result_buf == NULL) {
-                ERR_raise(ERR_LIB_UI, UI_R_NO_RESULT_BUFFER);
-                return -1;
-            }
+        if (uis->result_buf == NULL) {
+            ERR_raise(ERR_LIB_UI, UI_R_NO_RESULT_BUFFER);
+            return -1;
+        }
 
-            uis->result_buf[0] = '\0';
-            for (p = result; *p; p++) {
-                if (strchr(uis->_.boolean_data.ok_chars, *p)) {
-                    uis->result_buf[0] = uis->_.boolean_data.ok_chars[0];
-                    break;
-                }
-                if (strchr(uis->_.boolean_data.cancel_chars, *p)) {
-                    uis->result_buf[0] = uis->_.boolean_data.cancel_chars[0];
-                    break;
-                }
+        uis->result_buf[0] = '\0';
+        for (p = result; *p; p++) {
+            if (strchr(uis->_.boolean_data.ok_chars, *p)) {
+                uis->result_buf[0] = uis->_.boolean_data.ok_chars[0];
+                break;
+            }
+            if (strchr(uis->_.boolean_data.cancel_chars, *p)) {
+                uis->result_buf[0] = uis->_.boolean_data.cancel_chars[0];
+                break;
             }
         }
+    }
     case UIT_NONE:
     case UIT_INFO:
     case UIT_ERROR:
diff --git a/crypto/ui/ui_local.h b/crypto/ui/ui_local.h
index 36b3e6194b0a1..7bd5eff69291e 100644
--- a/crypto/ui/ui_local.h
+++ b/crypto/ui/ui_local.h
@@ -8,14 +8,14 @@
  */
 
 #ifndef OSSL_CRYPTO_UI_LOCAL_H
-# define OSSL_CRYPTO_UI_LOCAL_H
+#define OSSL_CRYPTO_UI_LOCAL_H
 
-# include <openssl/ui.h>
-# include <openssl/crypto.h>
+#include <openssl/ui.h>
+#include <openssl/crypto.h>
 
-# ifdef _
-#  undef _
-# endif
+#ifdef _
+#undef _
+#endif
 
 struct ui_method_st {
     char *name;
@@ -28,21 +28,21 @@ struct ui_method_st {
      * whatever. This function should use the ex_data structure to save
      * intermediate data.
      */
-    int (*ui_open_session) (UI *ui);
-    int (*ui_write_string) (UI *ui, UI_STRING *uis);
+    int (*ui_open_session)(UI *ui);
+    int (*ui_write_string)(UI *ui, UI_STRING *uis);
     /*
      * Flush the output.  If a GUI dialog box is used, this function can be
      * used to actually display it.
      */
-    int (*ui_flush) (UI *ui);
-    int (*ui_read_string) (UI *ui, UI_STRING *uis);
-    int (*ui_close_session) (UI *ui);
+    int (*ui_flush)(UI *ui);
+    int (*ui_read_string)(UI *ui, UI_STRING *uis);
+    int (*ui_close_session)(UI *ui);
     /*
      * Duplicate the ui_data that often comes alongside a ui_method.  This
      * allows some backends to save away UI information for later use.
      */
-    void *(*ui_duplicate_data) (UI *ui, void *ui_data);
-    void (*ui_destroy_data) (UI *ui, void *ui_data);
+    void *(*ui_duplicate_data)(UI *ui, void *ui_data);
+    void (*ui_destroy_data)(UI *ui, void *ui_data);
     /*
      * Construct a prompt in a user-defined manner.  object_desc is a textual
      * short description of the object, for example "pass phrase", and
@@ -50,8 +50,8 @@ struct ui_method_st {
      * name. The returned string shall always be allocated on the heap with
      * OPENSSL_malloc(), and need to be free'd with OPENSSL_free().
      */
-    char *(*ui_construct_prompt) (UI *ui, const char *object_desc,
-                                  const char *object_name);
+    char *(*ui_construct_prompt)(UI *ui, const char *object_desc,
+        const char *object_name);
     /*
      * UI_METHOD specific application data.
      */
@@ -59,18 +59,18 @@ struct ui_method_st {
 };
 
 struct ui_string_st {
-    enum UI_string_types type;  /* Input */
-    const char *out_string;     /* Input */
-    int input_flags;            /* Flags from the user */
+    enum UI_string_types type; /* Input */
+    const char *out_string; /* Input */
+    int input_flags; /* Flags from the user */
     /*
      * The following parameters are completely irrelevant for UIT_INFO, and
      * can therefore be set to 0 or NULL
      */
-    char *result_buf;           /* Input and Output: If not NULL,
-                                 * user-defined with size in result_maxsize.
-                                 * Otherwise, it may be allocated by the UI
-                                 * routine, meaning result_minsize is going
-                                 * to be overwritten. */
+    char *result_buf; /* Input and Output: If not NULL,
+                       * user-defined with size in result_maxsize.
+                       * Otherwise, it may be allocated by the UI
+                       * routine, meaning result_minsize is going
+                       * to be overwritten. */
     size_t result_len;
     union {
         struct {
@@ -87,8 +87,8 @@ struct ui_string_st {
         } boolean_data;
     } _;
 
-# define OUT_STRING_FREEABLE 0x01
-    int flags;                  /* flags for internal use */
+#define OUT_STRING_FREEABLE 0x01
+    int flags; /* flags for internal use */
 };
 
 struct ui_st {
@@ -98,9 +98,9 @@ struct ui_st {
                                    * echoing status.  */
     void *user_data;
     CRYPTO_EX_DATA ex_data;
-# define UI_FLAG_REDOABLE        0x0001
-# define UI_FLAG_DUPL_DATA       0x0002 /* user_data was duplicated */
-# define UI_FLAG_PRINT_ERRORS    0x0100
+#define UI_FLAG_REDOABLE 0x0001
+#define UI_FLAG_DUPL_DATA 0x0002 /* user_data was duplicated */
+#define UI_FLAG_PRINT_ERRORS 0x0100
     int flags;
 
     CRYPTO_RWLOCK *lock;
diff --git a/crypto/ui/ui_null.c b/crypto/ui/ui_null.c
index f002448d2cd4a..999f21bc2a167 100644
--- a/crypto/ui/ui_null.c
+++ b/crypto/ui/ui_null.c
@@ -11,11 +11,11 @@
 
 static const UI_METHOD ui_null = {
     "OpenSSL NULL UI",
-    NULL,                        /* opener */
-    NULL,                        /* writer */
-    NULL,                        /* flusher */
-    NULL,                        /* reader */
-    NULL,                        /* closer */
+    NULL, /* opener */
+    NULL, /* writer */
+    NULL, /* flusher */
+    NULL, /* reader */
+    NULL, /* closer */
     NULL
 };
 
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 544415e5b1123..41823a739f401 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -19,52 +19,52 @@
  * sigaction and fileno included. -pedantic would be more appropriate for the
  * intended purposes, but we can't prevent users from adding -ansi.
  */
-# if defined(OPENSSL_SYS_VXWORKS)
-#  include <sys/types.h>
-# endif
-
-# if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
-#  ifndef _POSIX_C_SOURCE
-#   define _POSIX_C_SOURCE 2
-#  endif
-# endif
-# include <signal.h>
-# include <stdio.h>
-# include <string.h>
-# include <errno.h>
-
-# if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS)
-#  include <unistd.h>
+#if defined(OPENSSL_SYS_VXWORKS)
+#include <sys/types.h>
+#endif
+
+#if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 2
+#endif
+#endif
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS)
+#include <unistd.h>
 /*
  * If unistd.h defines _POSIX_VERSION, we conclude that we are on a POSIX
  * system and have sigaction and termios.
  */
-#  if defined(_POSIX_VERSION) && _POSIX_VERSION>=199309L
+#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 199309L
 
-#   define SIGACTION
-#   if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
-#    define TERMIOS
-#   endif
+#define SIGACTION
+#if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
+#define TERMIOS
+#endif
 
-#  endif
-# endif
+#endif
+#endif
 
-# include "ui_local.h"
-# include "internal/cryptlib.h"
+#include "ui_local.h"
+#include "internal/cryptlib.h"
 
-# ifdef OPENSSL_SYS_VMS          /* prototypes for sys$whatever */
-#  include <starlet.h>
-#  ifdef __DECC
-#   pragma message disable DOLLARID
-#  endif
-# endif
+#ifdef OPENSSL_SYS_VMS /* prototypes for sys$whatever */
+#include <starlet.h>
+#ifdef __DECC
+#pragma message disable DOLLARID
+#endif
+#endif
 
-# ifdef WIN_CONSOLE_BUG
-#  include <windows.h>
-#  ifndef OPENSSL_SYS_WINCE
-#   include <wincon.h>
-#  endif
-# endif
+#ifdef WIN_CONSOLE_BUG
+#include <windows.h>
+#ifndef OPENSSL_SYS_WINCE
+#include <wincon.h>
+#endif
+#endif
 
 /*
  * There are 6 types of terminal interface supported, TERMIO, TERMIOS, VMS,
@@ -78,87 +78,87 @@
  * may eventually opt to remove its use entirely.
  */
 
-# if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
+#if !defined(TERMIOS) && !defined(TERMIO) && !defined(SGTTY)
 
-#  if defined(_LIBC)
-#   undef  TERMIOS
-#   define TERMIO
-#   undef  SGTTY
+#if defined(_LIBC)
+#undef TERMIOS
+#define TERMIO
+#undef SGTTY
 /*
  * We know that VMS, MSDOS, VXWORKS, use entirely other mechanisms.
  */
-#  elif !defined(OPENSSL_SYS_VMS) \
-        && !defined(OPENSSL_SYS_MSDOS) \
-        && !defined(OPENSSL_SYS_VXWORKS)
-#   define TERMIOS
-#   undef  TERMIO
-#   undef  SGTTY
-#  endif
-
-# endif
-
-# if defined(OPENSSL_SYS_VXWORKS)
-#  undef TERMIOS
-#  undef TERMIO
-#  undef SGTTY
-# endif
-
-# ifdef TERMIOS
-#  include <termios.h>
-#  define TTY_STRUCT             struct termios
-#  define TTY_FLAGS              c_lflag
-#  define TTY_get(tty,data)      tcgetattr(tty,data)
-#  define TTY_set(tty,data)      tcsetattr(tty,TCSANOW,data)
-# endif
-
-# ifdef TERMIO
-#  include <termio.h>
-#  define TTY_STRUCT             struct termio
-#  define TTY_FLAGS              c_lflag
-#  define TTY_get(tty,data)      ioctl(tty,TCGETA,data)
-#  define TTY_set(tty,data)      ioctl(tty,TCSETA,data)
-# endif
-
-# ifdef SGTTY
-#  include <sgtty.h>
-#  define TTY_STRUCT             struct sgttyb
-#  define TTY_FLAGS              sg_flags
-#  define TTY_get(tty,data)      ioctl(tty,TIOCGETP,data)
-#  define TTY_set(tty,data)      ioctl(tty,TIOCSETP,data)
-# endif
-
-# if !defined(_LIBC) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) && ! (defined(OPENSSL_SYS_TANDEM) && defined(_SPT_MODEL_))
-#  include <sys/ioctl.h>
-# endif
-
-# ifdef OPENSSL_SYS_MSDOS
-#  include <conio.h>
-# endif
-
-# ifdef OPENSSL_SYS_VMS
-#  include <ssdef.h>
-#  include <iodef.h>
-#  include <ttdef.h>
-#  include <descrip.h>
+#elif !defined(OPENSSL_SYS_VMS)    \
+    && !defined(OPENSSL_SYS_MSDOS) \
+    && !defined(OPENSSL_SYS_VXWORKS)
+#define TERMIOS
+#undef TERMIO
+#undef SGTTY
+#endif
+
+#endif
+
+#if defined(OPENSSL_SYS_VXWORKS)
+#undef TERMIOS
+#undef TERMIO
+#undef SGTTY
+#endif
+
+#ifdef TERMIOS
+#include <termios.h>
+#define TTY_STRUCT struct termios
+#define TTY_FLAGS c_lflag
+#define TTY_get(tty, data) tcgetattr(tty, data)
+#define TTY_set(tty, data) tcsetattr(tty, TCSANOW, data)
+#endif
+
+#ifdef TERMIO
+#include <termio.h>
+#define TTY_STRUCT struct termio
+#define TTY_FLAGS c_lflag
+#define TTY_get(tty, data) ioctl(tty, TCGETA, data)
+#define TTY_set(tty, data) ioctl(tty, TCSETA, data)
+#endif
+
+#ifdef SGTTY
+#include <sgtty.h>
+#define TTY_STRUCT struct sgttyb
+#define TTY_FLAGS sg_flags
+#define TTY_get(tty, data) ioctl(tty, TIOCGETP, data)
+#define TTY_set(tty, data) ioctl(tty, TIOCSETP, data)
+#endif
+
+#if !defined(_LIBC) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) && !(defined(OPENSSL_SYS_TANDEM) && defined(_SPT_MODEL_))
+#include <sys/ioctl.h>
+#endif
+
+#ifdef OPENSSL_SYS_MSDOS
+#include <conio.h>
+#endif
+
+#ifdef OPENSSL_SYS_VMS
+#include <ssdef.h>
+#include <iodef.h>
+#include <ttdef.h>
+#include <descrip.h>
 struct IOSB {
     short iosb$w_value;
     short iosb$w_count;
     long iosb$l_info;
 };
-# endif
+#endif
 
-# ifndef NX509_SIG
-#  define NX509_SIG 32
-# endif
+#ifndef NX509_SIG
+#define NX509_SIG 32
+#endif
 
 /* Define globals.  They are protected by a lock */
-# ifdef SIGACTION
+#ifdef SIGACTION
 static struct sigaction savsig[NX509_SIG];
-# else
-static void (*savsig[NX509_SIG]) (int);
-# endif
+#else
+static void (*savsig[NX509_SIG])(int);
+#endif
 
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
 static struct IOSB iosb;
 static $DESCRIPTOR(terminal, "TT");
 static long tty_orig[3], tty_new[3]; /* XXX Is there any guarantee that this
@@ -166,26 +166,26 @@ static long tty_orig[3], tty_new[3]; /* XXX Is there any guarantee that this
                                       * structures? */
 static long status;
 static unsigned short channel = 0;
-# elif defined(_WIN32) && !defined(_WIN32_WCE)
+#elif defined(_WIN32) && !defined(_WIN32_WCE)
 static DWORD tty_orig, tty_new;
-# else
-#  if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
+#else
+#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
 static TTY_STRUCT tty_orig, tty_new;
-#  endif
-# endif
+#endif
+#endif
 static FILE *tty_in, *tty_out;
 static int is_a_tty;
 
 /* Declare static functions */
-# if !defined(OPENSSL_SYS_WINCE)
+#if !defined(OPENSSL_SYS_WINCE)
 static int read_till_nl(FILE *);
 static void recsig(int);
 static void pushsig(void);
 static void popsig(void);
-# endif
-# if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
+#endif
+#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
 static int noecho_fgets(char *buf, int size, FILE *tty);
-# endif
+#endif
 static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl);
 
 static int read_string(UI *ui, UI_STRING *uis);
@@ -227,20 +227,20 @@ static int read_string(UI *ui, UI_STRING *uis)
         fputs(UI_get0_action_string(uis), tty_out);
         fflush(tty_out);
         return read_string_inner(ui, uis,
-                                 UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO,
-                                 0);
+            UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO,
+            0);
     case UIT_PROMPT:
         fputs(UI_get0_output_string(uis), tty_out);
         fflush(tty_out);
         return read_string_inner(ui, uis,
-                                 UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO,
-                                 1);
+            UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO,
+            1);
     case UIT_VERIFY:
         fprintf(tty_out, "Verifying - %s", UI_get0_output_string(uis));
         fflush(tty_out);
         if ((ok = read_string_inner(ui, uis,
-                                    UI_get_input_flags(uis) &
-                                    UI_INPUT_FLAG_ECHO, 1)) <= 0)
+                 UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO, 1))
+            <= 0)
             return ok;
         if (strcmp(UI_get0_result_string(uis), UI_get0_test_string(uis)) != 0) {
             fprintf(tty_out, "Verify failure\n");
@@ -256,11 +256,11 @@ static int read_string(UI *ui, UI_STRING *uis)
     return 1;
 }
 
-# if !defined(OPENSSL_SYS_WINCE)
+#if !defined(OPENSSL_SYS_WINCE)
 /* Internal functions to read a string without echoing */
 static int read_till_nl(FILE *in)
 {
-#  define SIZE 4
+#define SIZE 4
     char buf[SIZE + 1];
 
     do {
@@ -271,7 +271,7 @@ static int read_till_nl(FILE *in)
 }
 
 static volatile sig_atomic_t intr_signal;
-# endif
+#endif
 
 static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
 {
@@ -279,7 +279,7 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
     int ok;
     char result[BUFSIZ];
     int maxsize = BUFSIZ - 1;
-# if !defined(OPENSSL_SYS_WINCE)
+#if !defined(OPENSSL_SYS_WINCE)
     char *p = NULL;
     int echo_eol = !echo;
 
@@ -295,48 +295,46 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
     ps = 2;
 
     result[0] = '\0';
-#  if defined(_WIN32)
+#if defined(_WIN32)
     if (is_a_tty) {
         DWORD numread;
-#   if defined(CP_UTF8)
+#if defined(CP_UTF8)
         if (GetEnvironmentVariableW(L"OPENSSL_WIN32_UTF8", NULL, 0) != 0) {
             WCHAR wresult[BUFSIZ];
 
             if (ReadConsoleW(GetStdHandle(STD_INPUT_HANDLE),
-                         wresult, maxsize, &numread, NULL)) {
-                if (numread >= 2 &&
-                    wresult[numread-2] == L'\r' &&
-                    wresult[numread-1] == L'\n') {
-                    wresult[numread-2] = L'\n';
+                    wresult, maxsize, &numread, NULL)) {
+                if (numread >= 2 && wresult[numread - 2] == L'\r' && wresult[numread - 1] == L'\n') {
+                    wresult[numread - 2] = L'\n';
                     numread--;
                 }
                 wresult[numread] = '\0';
                 if (WideCharToMultiByte(CP_UTF8, 0, wresult, -1,
-                                        result, sizeof(result), NULL, 0) > 0)
+                        result, sizeof(result), NULL, 0)
+                    > 0)
                     p = result;
 
                 OPENSSL_cleanse(wresult, sizeof(wresult));
             }
         } else
-#   endif
-        if (ReadConsoleA(GetStdHandle(STD_INPUT_HANDLE),
-                         result, maxsize, &numread, NULL)) {
-            if (numread >= 2 &&
-                result[numread-2] == '\r' && result[numread-1] == '\n') {
-                result[numread-2] = '\n';
+#endif
+            if (ReadConsoleA(GetStdHandle(STD_INPUT_HANDLE),
+                    result, maxsize, &numread, NULL)) {
+            if (numread >= 2 && result[numread - 2] == '\r' && result[numread - 1] == '\n') {
+                result[numread - 2] = '\n';
                 numread--;
             }
             result[numread] = '\0';
             p = result;
         }
     } else
-#  elif defined(OPENSSL_SYS_MSDOS)
+#elif defined(OPENSSL_SYS_MSDOS)
     if (!echo) {
         noecho_fgets(result, maxsize, tty_in);
-        p = result;             /* FIXME: noecho_fgets doesn't return errors */
+        p = result; /* FIXME: noecho_fgets doesn't return errors */
     } else
-#  endif
-    p = fgets(result, maxsize, tty_in);
+#endif
+        p = fgets(result, maxsize, tty_in);
     if (p == NULL)
         goto error;
     if (feof(tty_in))
@@ -351,7 +349,7 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
     if (UI_set_result(ui, uis, result) >= 0)
         ok = 1;
 
- error:
+error:
     if (intr_signal == SIGINT)
         ok = -1;
     if (echo_eol)
@@ -361,9 +359,9 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
 
     if (ps >= 1)
         popsig();
-# else
+#else
     ok = 1;
-# endif
+#endif
 
     OPENSSL_cleanse(result, BUFSIZ);
     return ok;
@@ -376,10 +374,10 @@ static int open_console(UI *ui)
         return 0;
     is_a_tty = 1;
 
-# if defined(OPENSSL_SYS_VXWORKS)
+#if defined(OPENSSL_SYS_VXWORKS)
     tty_in = stdin;
     tty_out = stderr;
-# elif defined(_WIN32) && !defined(_WIN32_WCE)
+#elif defined(_WIN32) && !defined(_WIN32_WCE)
     if ((tty_out = fopen("conout$", "w")) == NULL)
         tty_out = stderr;
 
@@ -390,162 +388,162 @@ static int open_console(UI *ui)
         if ((tty_in = fopen("conin$", "r")) == NULL)
             tty_in = stdin;
     }
-# else
-#  ifdef OPENSSL_SYS_MSDOS
-#   define DEV_TTY "con"
-#  else
-#   define DEV_TTY "/dev/tty"
-#  endif
+#else
+#ifdef OPENSSL_SYS_MSDOS
+#define DEV_TTY "con"
+#else
+#define DEV_TTY "/dev/tty"
+#endif
     if ((tty_in = fopen(DEV_TTY, "r")) == NULL)
         tty_in = stdin;
     if ((tty_out = fopen(DEV_TTY, "w")) == NULL)
         tty_out = stderr;
-# endif
+#endif
 
-# if defined(TTY_get) && !defined(OPENSSL_SYS_VMS)
+#if defined(TTY_get) && !defined(OPENSSL_SYS_VMS)
     if (TTY_get(fileno(tty_in), &tty_orig) == -1) {
-#  ifdef ENOTTY
+#ifdef ENOTTY
         if (errno == ENOTTY)
             is_a_tty = 0;
         else
-#  endif
-#  ifdef EINVAL
+#endif
+#ifdef EINVAL
             /*
              * Ariel Glenn reports that solaris can return EINVAL instead.
              * This should be ok
              */
-        if (errno == EINVAL)
-            is_a_tty = 0;
-        else
-#  endif
-#  ifdef ENXIO
-            /*
-             * Solaris can return ENXIO.
-             * This should be ok
-             */
-        if (errno == ENXIO)
-            is_a_tty = 0;
-        else
-#  endif
-#  ifdef EIO
-            /*
-             * Linux can return EIO.
-             * This should be ok
-             */
-        if (errno == EIO)
-            is_a_tty = 0;
-        else
-#  endif
-#  ifdef EPERM
-            /*
-             * Linux can return EPERM (Operation not permitted),
-             * e.g. if a daemon executes openssl via fork()+execve()
-             * This should be ok
-             */
-        if (errno == EPERM)
-            is_a_tty = 0;
-        else
-#  endif
-#  ifdef ENODEV
-            /*
-             * MacOS X returns ENODEV (Operation not supported by device),
-             * which seems appropriate.
-             */
-        if (errno == ENODEV)
+            if (errno == EINVAL)
                 is_a_tty = 0;
-        else
-#  endif
-            {
-                ERR_raise_data(ERR_LIB_UI, UI_R_UNKNOWN_TTYGET_ERRNO_VALUE,
-                               "errno=%d", errno);
-                return 0;
-            }
+            else
+#endif
+#ifdef ENXIO
+                /*
+                 * Solaris can return ENXIO.
+                 * This should be ok
+                 */
+                if (errno == ENXIO)
+                    is_a_tty = 0;
+                else
+#endif
+#ifdef EIO
+                    /*
+                     * Linux can return EIO.
+                     * This should be ok
+                     */
+                    if (errno == EIO)
+                        is_a_tty = 0;
+                    else
+#endif
+#ifdef EPERM
+                        /*
+                         * Linux can return EPERM (Operation not permitted),
+                         * e.g. if a daemon executes openssl via fork()+execve()
+                         * This should be ok
+                         */
+                        if (errno == EPERM)
+                            is_a_tty = 0;
+                        else
+#endif
+#ifdef ENODEV
+                            /*
+                             * MacOS X returns ENODEV (Operation not supported by device),
+                             * which seems appropriate.
+                             */
+                            if (errno == ENODEV)
+                                is_a_tty = 0;
+                            else
+#endif
+                            {
+                                ERR_raise_data(ERR_LIB_UI, UI_R_UNKNOWN_TTYGET_ERRNO_VALUE,
+                                    "errno=%d", errno);
+                                return 0;
+                            }
     }
-# endif
-# ifdef OPENSSL_SYS_VMS
+#endif
+#ifdef OPENSSL_SYS_VMS
     status = sys$assign(&terminal, &channel, 0, 0);
 
     /* if there isn't a TT device, something is very wrong */
     if (status != SS$_NORMAL) {
         ERR_raise_data(ERR_LIB_UI, UI_R_SYSASSIGN_ERROR,
-                       "status=%%X%08X", status);
+            "status=%%X%08X", status);
         return 0;
     }
 
     status = sys$qiow(0, channel, IO$_SENSEMODE, &iosb, 0, 0, tty_orig, 12,
-                      0, 0, 0, 0);
+        0, 0, 0, 0);
 
     /* If IO$_SENSEMODE doesn't work, this is not a terminal device */
     if ((status != SS$_NORMAL) || (iosb.iosb$w_value != SS$_NORMAL))
         is_a_tty = 0;
-# endif
+#endif
     return 1;
 }
 
 static int noecho_console(UI *ui)
 {
-# ifdef TTY_FLAGS
+#ifdef TTY_FLAGS
     memcpy(&(tty_new), &(tty_orig), sizeof(tty_orig));
     tty_new.TTY_FLAGS &= ~ECHO;
-# endif
+#endif
 
-# if defined(TTY_set) && !defined(OPENSSL_SYS_VMS)
+#if defined(TTY_set) && !defined(OPENSSL_SYS_VMS)
     if (is_a_tty && (TTY_set(fileno(tty_in), &tty_new) == -1))
         return 0;
-# endif
-# ifdef OPENSSL_SYS_VMS
+#endif
+#ifdef OPENSSL_SYS_VMS
     if (is_a_tty) {
         tty_new[0] = tty_orig[0];
         tty_new[1] = tty_orig[1] | TT$M_NOECHO;
         tty_new[2] = tty_orig[2];
         status = sys$qiow(0, channel, IO$_SETMODE, &iosb, 0, 0, tty_new, 12,
-                          0, 0, 0, 0);
+            0, 0, 0, 0);
         if ((status != SS$_NORMAL) || (iosb.iosb$w_value != SS$_NORMAL)) {
             ERR_raise_data(ERR_LIB_UI, UI_R_SYSQIOW_ERROR,
-                           "status=%%X%08X, iosb.iosb$w_value=%%X%08X",
-                           status, iosb.iosb$w_value);
+                "status=%%X%08X, iosb.iosb$w_value=%%X%08X",
+                status, iosb.iosb$w_value);
             return 0;
         }
     }
-# endif
-# if defined(_WIN32) && !defined(_WIN32_WCE)
+#endif
+#if defined(_WIN32) && !defined(_WIN32_WCE)
     if (is_a_tty) {
         tty_new = tty_orig;
         tty_new &= ~ENABLE_ECHO_INPUT;
         SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), tty_new);
     }
-# endif
+#endif
     return 1;
 }
 
 static int echo_console(UI *ui)
 {
-# if defined(TTY_set) && !defined(OPENSSL_SYS_VMS)
+#if defined(TTY_set) && !defined(OPENSSL_SYS_VMS)
     memcpy(&(tty_new), &(tty_orig), sizeof(tty_orig));
     if (is_a_tty && (TTY_set(fileno(tty_in), &tty_new) == -1))
         return 0;
-# endif
-# ifdef OPENSSL_SYS_VMS
+#endif
+#ifdef OPENSSL_SYS_VMS
     if (is_a_tty) {
         tty_new[0] = tty_orig[0];
         tty_new[1] = tty_orig[1];
         tty_new[2] = tty_orig[2];
         status = sys$qiow(0, channel, IO$_SETMODE, &iosb, 0, 0, tty_new, 12,
-                          0, 0, 0, 0);
+            0, 0, 0, 0);
         if ((status != SS$_NORMAL) || (iosb.iosb$w_value != SS$_NORMAL)) {
             ERR_raise_data(ERR_LIB_UI, UI_R_SYSQIOW_ERROR,
-                           "status=%%X%08X, iosb.iosb$w_value=%%X%08X",
-                           status, iosb.iosb$w_value);
+                "status=%%X%08X, iosb.iosb$w_value=%%X%08X",
+                status, iosb.iosb$w_value);
             return 0;
         }
     }
-# endif
-# if defined(_WIN32) && !defined(_WIN32_WCE)
+#endif
+#if defined(_WIN32) && !defined(_WIN32_WCE)
     if (is_a_tty) {
         tty_new = tty_orig;
         SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), tty_new);
     }
-# endif
+#endif
     return 1;
 }
 
@@ -557,104 +555,104 @@ static int close_console(UI *ui)
         fclose(tty_in);
     if (tty_out != stderr)
         fclose(tty_out);
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
     status = sys$dassgn(channel);
     if (status != SS$_NORMAL) {
         ERR_raise_data(ERR_LIB_UI, UI_R_SYSDASSGN_ERROR,
-                       "status=%%X%08X", status);
+            "status=%%X%08X", status);
         ret = 0;
     }
-# endif
+#endif
     CRYPTO_THREAD_unlock(ui->lock);
 
     return ret;
 }
 
-# if !defined(OPENSSL_SYS_WINCE)
+#if !defined(OPENSSL_SYS_WINCE)
 /* Internal functions to handle signals and act on them */
 static void pushsig(void)
 {
-#  ifndef OPENSSL_SYS_WIN32
+#ifndef OPENSSL_SYS_WIN32
     int i;
-#  endif
-#  ifdef SIGACTION
+#endif
+#ifdef SIGACTION
     struct sigaction sa;
 
     memset(&sa, 0, sizeof(sa));
     sa.sa_handler = recsig;
-#  endif
+#endif
 
-#  ifdef OPENSSL_SYS_WIN32
+#ifdef OPENSSL_SYS_WIN32
     savsig[SIGABRT] = signal(SIGABRT, recsig);
     savsig[SIGFPE] = signal(SIGFPE, recsig);
     savsig[SIGILL] = signal(SIGILL, recsig);
     savsig[SIGINT] = signal(SIGINT, recsig);
     savsig[SIGSEGV] = signal(SIGSEGV, recsig);
     savsig[SIGTERM] = signal(SIGTERM, recsig);
-#  else
+#else
     for (i = 1; i < NX509_SIG; i++) {
-#   ifdef SIGUSR1
+#ifdef SIGUSR1
         if (i == SIGUSR1)
             continue;
-#   endif
-#   ifdef SIGUSR2
+#endif
+#ifdef SIGUSR2
         if (i == SIGUSR2)
             continue;
-#   endif
-#   ifdef SIGKILL
-        if (i == SIGKILL)       /* We can't make any action on that. */
+#endif
+#ifdef SIGKILL
+        if (i == SIGKILL) /* We can't make any action on that. */
             continue;
-#   endif
-#   ifdef SIGACTION
+#endif
+#ifdef SIGACTION
         sigaction(i, &sa, &savsig[i]);
-#   else
+#else
         savsig[i] = signal(i, recsig);
-#   endif
+#endif
     }
-#  endif
+#endif
 
-#  ifdef SIGWINCH
+#ifdef SIGWINCH
     signal(SIGWINCH, SIG_DFL);
-#  endif
+#endif
 }
 
 static void popsig(void)
 {
-#  ifdef OPENSSL_SYS_WIN32
+#ifdef OPENSSL_SYS_WIN32
     signal(SIGABRT, savsig[SIGABRT]);
     signal(SIGFPE, savsig[SIGFPE]);
     signal(SIGILL, savsig[SIGILL]);
     signal(SIGINT, savsig[SIGINT]);
     signal(SIGSEGV, savsig[SIGSEGV]);
     signal(SIGTERM, savsig[SIGTERM]);
-#  else
+#else
     int i;
     for (i = 1; i < NX509_SIG; i++) {
-#   ifdef SIGUSR1
+#ifdef SIGUSR1
         if (i == SIGUSR1)
             continue;
-#   endif
-#   ifdef SIGUSR2
+#endif
+#ifdef SIGUSR2
         if (i == SIGUSR2)
             continue;
-#   endif
-#   ifdef SIGACTION
+#endif
+#ifdef SIGACTION
         sigaction(i, &savsig[i], NULL);
-#   else
+#else
         signal(i, savsig[i]);
-#   endif
+#endif
     }
-#  endif
+#endif
 }
 
 static void recsig(int i)
 {
     intr_signal = i;
 }
-# endif
+#endif
 
 /* Internal functions specific for Windows */
-# if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
+#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32)
 static int noecho_fgets(char *buf, int size, FILE *tty)
 {
     int i;
@@ -667,11 +665,11 @@ static int noecho_fgets(char *buf, int size, FILE *tty)
             break;
         }
         size--;
-#  if defined(_WIN32)
+#if defined(_WIN32)
         i = _getch();
-#  else
+#else
         i = getch();
-#  endif
+#endif
         if (i == '\r')
             i = '\n';
         *(p++) = i;
@@ -680,7 +678,7 @@ static int noecho_fgets(char *buf, int size, FILE *tty)
             break;
         }
     }
-#  ifdef WIN_CONSOLE_BUG
+#ifdef WIN_CONSOLE_BUG
     /*
      * Win95 has several evil console bugs: one of these is that the last
      * character read using getch() is passed to the next read: this is
@@ -692,16 +690,16 @@ static int noecho_fgets(char *buf, int size, FILE *tty)
         inh = GetStdHandle(STD_INPUT_HANDLE);
         FlushConsoleInputBuffer(inh);
     }
-#  endif
+#endif
     return strlen(buf);
 }
-# endif
+#endif
 
 static UI_METHOD ui_openssl = {
     "OpenSSL default user interface",
     open_console,
     write_string,
-    NULL,                       /* No flusher is needed for command lines */
+    NULL, /* No flusher is needed for command lines */
     read_string,
     close_console,
     NULL
diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c
index 554bf7985659e..a8b3c1d44c666 100644
--- a/crypto/ui/ui_util.c
+++ b/crypto/ui/ui_util.c
@@ -8,7 +8,7 @@
  */
 
 #include <string.h>
-#include <openssl/pem.h>         /* PEM_def_callback() */
+#include <openssl/pem.h> /* PEM_def_callback() */
 #include "internal/thread_once.h"
 #include "ui_local.h"
 
@@ -17,20 +17,19 @@
 #endif
 
 int UI_UTIL_read_pw_string(char *buf, int length, const char *prompt,
-                           int verify)
+    int verify)
 {
     char buff[BUFSIZ];
     int ret;
 
-    ret =
-        UI_UTIL_read_pw(buf, buff, (length > BUFSIZ) ? BUFSIZ : length,
-                        prompt, verify);
+    ret = UI_UTIL_read_pw(buf, buff, (length > BUFSIZ) ? BUFSIZ : length,
+        prompt, verify);
     OPENSSL_cleanse(buff, BUFSIZ);
     return ret;
 }
 
 int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt,
-                    int verify)
+    int verify)
 {
     int ok = -2;
     UI *ui;
@@ -60,7 +59,7 @@ struct pem_password_cb_data {
 };
 
 static void ui_new_method_data(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                               int idx, long argl, void *argp)
+    int idx, long argl, void *argp)
 {
     /*
      * Do nothing, the data is allocated externally and assigned later with
@@ -69,7 +68,7 @@ static void ui_new_method_data(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
 }
 
 static int ui_dup_method_data(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
-                              void **pptr, int idx, long argl, void *argp)
+    void **pptr, int idx, long argl, void *argp)
 {
     if (*pptr != NULL) {
         *pptr = OPENSSL_memdup(*pptr, sizeof(struct pem_password_cb_data));
@@ -80,7 +79,7 @@ static int ui_dup_method_data(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
 }
 
 static void ui_free_method_data(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                                int idx, long argl, void *argp)
+    int idx, long argl, void *argp)
 {
     OPENSSL_free(ptr);
 }
@@ -90,9 +89,9 @@ static int ui_method_data_index = -1;
 DEFINE_RUN_ONCE_STATIC(ui_method_data_index_init)
 {
     ui_method_data_index = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI_METHOD,
-                                                   0, NULL, ui_new_method_data,
-                                                   ui_dup_method_data,
-                                                   ui_free_method_data);
+        0, NULL, ui_new_method_data,
+        ui_dup_method_data,
+        ui_free_method_data);
     return 1;
 }
 
@@ -103,28 +102,26 @@ static int ui_open(UI *ui)
 static int ui_read(UI *ui, UI_STRING *uis)
 {
     switch (UI_get_string_type(uis)) {
-    case UIT_PROMPT:
-        {
-            int len;
-            char result[PEM_BUFSIZE + 1]; /* reserve one byte at the end */
-            const struct pem_password_cb_data *data =
-                UI_method_get_ex_data(UI_get_method(ui), ui_method_data_index);
-            int maxsize = UI_get_result_maxsize(uis);
-
-            if (maxsize > PEM_BUFSIZE)
-                maxsize = PEM_BUFSIZE;
-            len = data->cb(result, maxsize, data->rwflag,
-                           UI_get0_user_data(ui));
-            if (len > maxsize)
-                return -1;
-            if (len >= 0)
-                result[len] = '\0';
-            if (len < 0)
-                return len;
-            if (UI_set_result_ex(ui, uis, result, len) >= 0)
-                return 1;
-            return 0;
-        }
+    case UIT_PROMPT: {
+        int len;
+        char result[PEM_BUFSIZE + 1]; /* reserve one byte at the end */
+        const struct pem_password_cb_data *data = UI_method_get_ex_data(UI_get_method(ui), ui_method_data_index);
+        int maxsize = UI_get_result_maxsize(uis);
+
+        if (maxsize > PEM_BUFSIZE)
+            maxsize = PEM_BUFSIZE;
+        len = data->cb(result, maxsize, data->rwflag,
+            UI_get0_user_data(ui));
+        if (len > maxsize)
+            return -1;
+        if (len >= 0)
+            result[len] = '\0';
+        if (len < 0)
+            return len;
+        if (UI_set_result_ex(ui, uis, result, len) >= 0)
+            return 1;
+        return 0;
+    }
     case UIT_VERIFY:
     case UIT_NONE:
     case UIT_BOOLEAN:
diff --git a/crypto/uid.c b/crypto/uid.c
index 45b63a431e082..c0c62909fdfcb 100644
--- a/crypto/uid.c
+++ b/crypto/uid.c
@@ -19,7 +19,7 @@ int OPENSSL_issetugid(void)
 
 #elif defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) || defined(__DragonFly__) || (defined(__GLIBC__) && defined(__FreeBSD_kernel__))
 
-# include <unistd.h>
+#include <unistd.h>
 
 int OPENSSL_issetugid(void)
 {
@@ -28,28 +28,28 @@ int OPENSSL_issetugid(void)
 
 #else
 
-# include <unistd.h>
-# include <sys/types.h>
+#include <unistd.h>
+#include <sys/types.h>
 
-# if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-#  if __GLIBC_PREREQ(2, 16)
-#   include <sys/auxv.h>
-#   define OSSL_IMPLEMENT_GETAUXVAL
-#  endif
-# elif defined(__ANDROID_API__)
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2, 16)
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
+#elif defined(__ANDROID_API__)
 /* see https://developer.android.google.cn/ndk/guides/cpu-features */
-#  if __ANDROID_API__ >= 18
-#   include <sys/auxv.h>
-#   define OSSL_IMPLEMENT_GETAUXVAL
-#  endif
-# endif
+#if __ANDROID_API__ >= 18
+#include <sys/auxv.h>
+#define OSSL_IMPLEMENT_GETAUXVAL
+#endif
+#endif
 
 int OPENSSL_issetugid(void)
 {
-# ifdef OSSL_IMPLEMENT_GETAUXVAL
+#ifdef OSSL_IMPLEMENT_GETAUXVAL
     return getauxval(AT_SECURE) != 0;
-# else
+#else
     return getuid() != geteuid() || getgid() != getegid();
-# endif
+#endif
 }
 #endif
diff --git a/crypto/vms_rms.h b/crypto/vms_rms.h
index ae74ba68294e0..fed6cd0fc33b2 100644
--- a/crypto/vms_rms.h
+++ b/crypto/vms_rms.h
@@ -9,50 +9,52 @@
 
 #ifdef NAML$C_MAXRSS
 
-# define CC_RMS_NAMX cc$rms_naml
-# define FAB_NAMX fab$l_naml
-# define FAB_OR_NAML( fab, naml) naml
-# define FAB_OR_NAML_DNA naml$l_long_defname
-# define FAB_OR_NAML_DNS naml$l_long_defname_size
-# define FAB_OR_NAML_FNA naml$l_long_filename
-# define FAB_OR_NAML_FNS naml$l_long_filename_size
-# define NAMX_ESA naml$l_long_expand
-# define NAMX_ESL naml$l_long_expand_size
-# define NAMX_ESS naml$l_long_expand_alloc
-# define NAMX_NOP naml$b_nop
-# define SET_NAMX_NO_SHORT_UPCASE( nam) nam.naml$v_no_short_upcase = 1
+#define CC_RMS_NAMX cc$rms_naml
+#define FAB_NAMX fab$l_naml
+#define FAB_OR_NAML(fab, naml) naml
+#define FAB_OR_NAML_DNA naml$l_long_defname
+#define FAB_OR_NAML_DNS naml$l_long_defname_size
+#define FAB_OR_NAML_FNA naml$l_long_filename
+#define FAB_OR_NAML_FNS naml$l_long_filename_size
+#define NAMX_ESA naml$l_long_expand
+#define NAMX_ESL naml$l_long_expand_size
+#define NAMX_ESS naml$l_long_expand_alloc
+#define NAMX_NOP naml$b_nop
+#define SET_NAMX_NO_SHORT_UPCASE(nam) nam.naml$v_no_short_upcase = 1
 
-# if __INITIAL_POINTER_SIZE == 64
-#  define NAMX_DNA_FNA_SET(fab) fab.fab$l_dna = (__char_ptr32) -1; \
-   fab.fab$l_fna = (__char_ptr32) -1;
-# else                          /* __INITIAL_POINTER_SIZE == 64 */
-#  define NAMX_DNA_FNA_SET(fab) fab.fab$l_dna = (char *) -1; \
-   fab.fab$l_fna = (char *) -1;
-# endif                         /* __INITIAL_POINTER_SIZE == 64 [else] */
+#if __INITIAL_POINTER_SIZE == 64
+#define NAMX_DNA_FNA_SET(fab)           \
+    fab.fab$l_dna = (__char_ptr32) - 1; \
+    fab.fab$l_fna = (__char_ptr32) - 1;
+#else /* __INITIAL_POINTER_SIZE == 64 */
+#define NAMX_DNA_FNA_SET(fab)   \
+    fab.fab$l_dna = (char *)-1; \
+    fab.fab$l_fna = (char *)-1;
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
 
-# define NAMX_MAXRSS NAML$C_MAXRSS
-# define NAMX_STRUCT NAML
+#define NAMX_MAXRSS NAML$C_MAXRSS
+#define NAMX_STRUCT NAML
 
-#else                           /* def NAML$C_MAXRSS */
+#else /* def NAML$C_MAXRSS */
 
-# define CC_RMS_NAMX cc$rms_nam
-# define FAB_NAMX fab$l_nam
-# define FAB_OR_NAML( fab, naml) fab
-# define FAB_OR_NAML_DNA fab$l_dna
-# define FAB_OR_NAML_DNS fab$b_dns
-# define FAB_OR_NAML_FNA fab$l_fna
-# define FAB_OR_NAML_FNS fab$b_fns
-# define NAMX_ESA nam$l_esa
-# define NAMX_ESL nam$b_esl
-# define NAMX_ESS nam$b_ess
-# define NAMX_NOP nam$b_nop
-# define NAMX_DNA_FNA_SET(fab)
-# define NAMX_MAXRSS NAM$C_MAXRSS
-# define NAMX_STRUCT NAM
-# ifdef NAM$M_NO_SHORT_UPCASE
-#  define SET_NAMX_NO_SHORT_UPCASE( nam) naml.naml$v_no_short_upcase = 1
-# else                          /* def NAM$M_NO_SHORT_UPCASE */
-#  define SET_NAMX_NO_SHORT_UPCASE( nam)
-# endif                         /* def NAM$M_NO_SHORT_UPCASE [else] */
+#define CC_RMS_NAMX cc$rms_nam
+#define FAB_NAMX fab$l_nam
+#define FAB_OR_NAML(fab, naml) fab
+#define FAB_OR_NAML_DNA fab$l_dna
+#define FAB_OR_NAML_DNS fab$b_dns
+#define FAB_OR_NAML_FNA fab$l_fna
+#define FAB_OR_NAML_FNS fab$b_fns
+#define NAMX_ESA nam$l_esa
+#define NAMX_ESL nam$b_esl
+#define NAMX_ESS nam$b_ess
+#define NAMX_NOP nam$b_nop
+#define NAMX_DNA_FNA_SET(fab)
+#define NAMX_MAXRSS NAM$C_MAXRSS
+#define NAMX_STRUCT NAM
+#ifdef NAM$M_NO_SHORT_UPCASE
+#define SET_NAMX_NO_SHORT_UPCASE(nam) naml.naml$v_no_short_upcase = 1
+#else /* def NAM$M_NO_SHORT_UPCASE */
+#define SET_NAMX_NO_SHORT_UPCASE(nam)
+#endif /* def NAM$M_NO_SHORT_UPCASE [else] */
 
-#endif                          /* def NAML$C_MAXRSS [else] */
+#endif /* def NAML$C_MAXRSS [else] */
diff --git a/crypto/whrlpool/wp_block.c b/crypto/whrlpool/wp_block.c
index bcf7a199ed0e8..dab8cf979357f 100644
--- a/crypto/whrlpool/wp_block.c
+++ b/crypto/whrlpool/wp_block.c
@@ -55,27 +55,24 @@ typedef unsigned long u64;
 typedef unsigned long long u64;
 #endif
 
-#define ROUNDS  10
+#define ROUNDS 10
 
 #define STRICT_ALIGNMENT
-#if !defined(PEDANTIC) && (defined(__i386) || defined(__i386__) || \
-                           defined(__x86_64) || defined(__x86_64__) || \
-                           defined(_M_IX86) || defined(_M_AMD64) || \
-                           defined(_M_X64))
+#if !defined(PEDANTIC) && (defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
 /*
  * Well, formally there're couple of other architectures, which permit
  * unaligned loads, specifically those not crossing cache lines, IA-64 and
  * PowerPC...
  */
-# undef STRICT_ALIGNMENT
+#undef STRICT_ALIGNMENT
 #endif
 
 #ifndef STRICT_ALIGNMENT
-# ifdef __GNUC__
+#ifdef __GNUC__
 typedef u64 u64_a1 __attribute((__aligned__(1)));
-# else
+#else
 typedef u64 u64_a1;
-# endif
+#endif
 #endif
 
 #if defined(__GNUC__) && !defined(STRICT_ALIGNMENT)
@@ -86,70 +83,73 @@ typedef u64 u64_aX;
 
 #undef SMALL_REGISTER_BANK
 #if defined(__i386) || defined(__i386__) || defined(_M_IX86)
-# define SMALL_REGISTER_BANK
-# if defined(WHIRLPOOL_ASM)
-#  ifndef OPENSSL_SMALL_FOOTPRINT
+#define SMALL_REGISTER_BANK
+#if defined(WHIRLPOOL_ASM)
+#ifndef OPENSSL_SMALL_FOOTPRINT
 /*
  * it appears that for elder non-MMX
  * CPUs this is actually faster!
  */
-#   define OPENSSL_SMALL_FOOTPRINT
-#  endif
-#  define GO_FOR_MMX(ctx,inp,num)     do {                    \
-        void whirlpool_block_mmx(void *,const void *,size_t);   \
-        if (!(OPENSSL_ia32cap_P[0] & (1<<23)))  break;          \
-        whirlpool_block_mmx(ctx->H.c,inp,num);  return;         \
-                                        } while (0)
-# endif
+#define OPENSSL_SMALL_FOOTPRINT
+#endif
+#define GO_FOR_MMX(ctx, inp, num)                               \
+    do {                                                        \
+        void whirlpool_block_mmx(void *, const void *, size_t); \
+        if (!(OPENSSL_ia32cap_P[0] & (1 << 23)))                \
+            break;                                              \
+        whirlpool_block_mmx(ctx->H.c, inp, num);                \
+        return;                                                 \
+    } while (0)
+#endif
 #endif
 
 #undef ROTATE
 #ifndef PEDANTIC
-# if defined(_MSC_VER)
-#  if defined(_WIN64)            /* applies to both IA-64 and AMD64 */
-#   include <stdlib.h>
-#   pragma intrinsic(_rotl64)
-#   define ROTATE(a,n) _rotl64((a),n)
-#  endif
-# elif defined(__GNUC__) && __GNUC__>=2
-#  if defined(__x86_64) || defined(__x86_64__)
-#   if defined(L_ENDIAN)
-#    define ROTATE(a,n)       ({ u64 ret; asm ("rolq %1,%0"   \
+#if defined(_MSC_VER)
+#if defined(_WIN64) /* applies to both IA-64 and AMD64 */
+#include <stdlib.h>
+#pragma intrinsic(_rotl64)
+#define ROTATE(a, n) _rotl64((a), n)
+#endif
+#elif defined(__GNUC__) && __GNUC__ >= 2
+#if defined(__x86_64) || defined(__x86_64__)
+#if defined(L_ENDIAN)
+#define ROTATE(a, n) ({ u64 ret; asm ("rolq %1,%0"   \
                                    : "=r"(ret) : "J"(n),"0"(a) : "cc"); ret; })
-#   elif defined(B_ENDIAN)
-       /*
-        * Most will argue that x86_64 is always little-endian. Well, yes, but
-        * then we have stratus.com who has modified gcc to "emulate"
-        * big-endian on x86. Is there evidence that they [or somebody else]
-        * won't do same for x86_64? Naturally no. And this line is waiting
-        * ready for that brave soul:-)
-        */
-#    define ROTATE(a,n)       ({ u64 ret; asm ("rorq %1,%0"   \
+#elif defined(B_ENDIAN)
+/*
+ * Most will argue that x86_64 is always little-endian. Well, yes, but
+ * then we have stratus.com who has modified gcc to "emulate"
+ * big-endian on x86. Is there evidence that they [or somebody else]
+ * won't do same for x86_64? Naturally no. And this line is waiting
+ * ready for that brave soul:-)
+ */
+#define ROTATE(a, n) ({ u64 ret; asm ("rorq %1,%0"   \
                                    : "=r"(ret) : "J"(n),"0"(a) : "cc"); ret; })
-#   endif
-#  elif defined(__ia64) || defined(__ia64__)
-#   if defined(L_ENDIAN)
-#    define ROTATE(a,n)       ({ u64 ret; asm ("shrp %0=%1,%1,%2"     \
+#endif
+#elif defined(__ia64) || defined(__ia64__)
+#if defined(L_ENDIAN)
+#define ROTATE(a, n) ({ u64 ret; asm ("shrp %0=%1,%1,%2"     \
                                    : "=r"(ret) : "r"(a),"M"(64-(n))); ret; })
-#   elif defined(B_ENDIAN)
-#    define ROTATE(a,n)       ({ u64 ret; asm ("shrp %0=%1,%1,%2"     \
+#elif defined(B_ENDIAN)
+#define ROTATE(a, n) ({ u64 ret; asm ("shrp %0=%1,%1,%2"     \
                                    : "=r"(ret) : "r"(a),"M"(n)); ret; })
-#   endif
-#  endif
-# endif
+#endif
+#endif
+#endif
 #endif
 
 #if defined(OPENSSL_SMALL_FOOTPRINT)
-# if !defined(ROTATE)
-#  if defined(L_ENDIAN)         /* little-endians have to rotate left */
-#   define ROTATE(i,n)       ((i)<<(n) ^ (i)>>(64-n))
-#  elif defined(B_ENDIAN)       /* big-endians have to rotate right */
-#   define ROTATE(i,n)       ((i)>>(n) ^ (i)<<(64-n))
-#  endif
-# endif
-# if defined(ROTATE) && !defined(STRICT_ALIGNMENT)
-#  define STRICT_ALIGNMENT      /* ensure smallest table size */
-# endif
+#if !defined(ROTATE)
+#if defined(L_ENDIAN) /* little-endians have to rotate left */
+#define ROTATE(i, n) ((i) << (n) ^ (i) >> (64 - n))
+#elif defined(B_ENDIAN) /* big-endians have to rotate right */
+#define ROTATE(i, n) ((i) >> (n) ^ (i) << (64 - n))
+#endif
+#endif
+#if defined(ROTATE) && !defined(STRICT_ALIGNMENT)
+#define STRICT_ALIGNMENT /* ensure smallest table size */
+#endif
 #endif
 
 /*
@@ -176,325 +176,322 @@ typedef u64 u64_aX;
  * Hand-coded assembler would be another alternative:-)
  */
 #ifdef STRICT_ALIGNMENT
-# if defined(ROTATE)
-#  define N   1
-#  define LL(c0,c1,c2,c3,c4,c5,c6,c7) c0,c1,c2,c3,c4,c5,c6,c7
-#  define C0(K,i)     (Cx.q[K.c[(i)*8+0]])
-#  define C1(K,i)     ROTATE(Cx.q[K.c[(i)*8+1]],8)
-#  define C2(K,i)     ROTATE(Cx.q[K.c[(i)*8+2]],16)
-#  define C3(K,i)     ROTATE(Cx.q[K.c[(i)*8+3]],24)
-#  define C4(K,i)     ROTATE(Cx.q[K.c[(i)*8+4]],32)
-#  define C5(K,i)     ROTATE(Cx.q[K.c[(i)*8+5]],40)
-#  define C6(K,i)     ROTATE(Cx.q[K.c[(i)*8+6]],48)
-#  define C7(K,i)     ROTATE(Cx.q[K.c[(i)*8+7]],56)
-# else
-#  define N   8
-#  define LL(c0,c1,c2,c3,c4,c5,c6,c7) c0,c1,c2,c3,c4,c5,c6,c7, \
-                                        c7,c0,c1,c2,c3,c4,c5,c6, \
-                                        c6,c7,c0,c1,c2,c3,c4,c5, \
-                                        c5,c6,c7,c0,c1,c2,c3,c4, \
-                                        c4,c5,c6,c7,c0,c1,c2,c3, \
-                                        c3,c4,c5,c6,c7,c0,c1,c2, \
-                                        c2,c3,c4,c5,c6,c7,c0,c1, \
-                                        c1,c2,c3,c4,c5,c6,c7,c0
-#  define C0(K,i)     (Cx.q[0+8*K.c[(i)*8+0]])
-#  define C1(K,i)     (Cx.q[1+8*K.c[(i)*8+1]])
-#  define C2(K,i)     (Cx.q[2+8*K.c[(i)*8+2]])
-#  define C3(K,i)     (Cx.q[3+8*K.c[(i)*8+3]])
-#  define C4(K,i)     (Cx.q[4+8*K.c[(i)*8+4]])
-#  define C5(K,i)     (Cx.q[5+8*K.c[(i)*8+5]])
-#  define C6(K,i)     (Cx.q[6+8*K.c[(i)*8+6]])
-#  define C7(K,i)     (Cx.q[7+8*K.c[(i)*8+7]])
-# endif
+#if defined(ROTATE)
+#define N 1
+#define LL(c0, c1, c2, c3, c4, c5, c6, c7) c0, c1, c2, c3, c4, c5, c6, c7
+#define C0(K, i) (Cx.q[K.c[(i) * 8 + 0]])
+#define C1(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 1]], 8)
+#define C2(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 2]], 16)
+#define C3(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 3]], 24)
+#define C4(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 4]], 32)
+#define C5(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 5]], 40)
+#define C6(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 6]], 48)
+#define C7(K, i) ROTATE(Cx.q[K.c[(i) * 8 + 7]], 56)
+#else
+#define N 8
+#define LL(c0, c1, c2, c3, c4, c5, c6, c7) c0, c1, c2, c3, c4, c5, c6, c7, \
+                                           c7, c0, c1, c2, c3, c4, c5, c6, \
+                                           c6, c7, c0, c1, c2, c3, c4, c5, \
+                                           c5, c6, c7, c0, c1, c2, c3, c4, \
+                                           c4, c5, c6, c7, c0, c1, c2, c3, \
+                                           c3, c4, c5, c6, c7, c0, c1, c2, \
+                                           c2, c3, c4, c5, c6, c7, c0, c1, \
+                                           c1, c2, c3, c4, c5, c6, c7, c0
+#define C0(K, i) (Cx.q[0 + 8 * K.c[(i) * 8 + 0]])
+#define C1(K, i) (Cx.q[1 + 8 * K.c[(i) * 8 + 1]])
+#define C2(K, i) (Cx.q[2 + 8 * K.c[(i) * 8 + 2]])
+#define C3(K, i) (Cx.q[3 + 8 * K.c[(i) * 8 + 3]])
+#define C4(K, i) (Cx.q[4 + 8 * K.c[(i) * 8 + 4]])
+#define C5(K, i) (Cx.q[5 + 8 * K.c[(i) * 8 + 5]])
+#define C6(K, i) (Cx.q[6 + 8 * K.c[(i) * 8 + 6]])
+#define C7(K, i) (Cx.q[7 + 8 * K.c[(i) * 8 + 7]])
+#endif
 #else
-# define N     2
-# define LL(c0,c1,c2,c3,c4,c5,c6,c7)   c0,c1,c2,c3,c4,c5,c6,c7, \
-                                        c0,c1,c2,c3,c4,c5,c6,c7
-# define C0(K,i)       (((u64*)(Cx.c+0))[2*K.c[(i)*8+0]])
-# define C1(K,i)       (((u64_a1*)(Cx.c+7))[2*K.c[(i)*8+1]])
-# define C2(K,i)       (((u64_a1*)(Cx.c+6))[2*K.c[(i)*8+2]])
-# define C3(K,i)       (((u64_a1*)(Cx.c+5))[2*K.c[(i)*8+3]])
-# define C4(K,i)       (((u64_a1*)(Cx.c+4))[2*K.c[(i)*8+4]])
-# define C5(K,i)       (((u64_a1*)(Cx.c+3))[2*K.c[(i)*8+5]])
-# define C6(K,i)       (((u64_a1*)(Cx.c+2))[2*K.c[(i)*8+6]])
-# define C7(K,i)       (((u64_a1*)(Cx.c+1))[2*K.c[(i)*8+7]])
+#define N 2
+#define LL(c0, c1, c2, c3, c4, c5, c6, c7) c0, c1, c2, c3, c4, c5, c6, c7, \
+                                           c0, c1, c2, c3, c4, c5, c6, c7
+#define C0(K, i) (((u64 *)(Cx.c + 0))[2 * K.c[(i) * 8 + 0]])
+#define C1(K, i) (((u64_a1 *)(Cx.c + 7))[2 * K.c[(i) * 8 + 1]])
+#define C2(K, i) (((u64_a1 *)(Cx.c + 6))[2 * K.c[(i) * 8 + 2]])
+#define C3(K, i) (((u64_a1 *)(Cx.c + 5))[2 * K.c[(i) * 8 + 3]])
+#define C4(K, i) (((u64_a1 *)(Cx.c + 4))[2 * K.c[(i) * 8 + 4]])
+#define C5(K, i) (((u64_a1 *)(Cx.c + 3))[2 * K.c[(i) * 8 + 5]])
+#define C6(K, i) (((u64_a1 *)(Cx.c + 2))[2 * K.c[(i) * 8 + 6]])
+#define C7(K, i) (((u64_a1 *)(Cx.c + 1))[2 * K.c[(i) * 8 + 7]])
 #endif
 
-static const
-    union {
+static const union {
     u8 c[(256 * N + ROUNDS) * sizeof(u64)];
     u64 q[(256 * N + ROUNDS)];
 } Cx = {
-        {
-            /* Note endian-neutral representation:-) */
-            LL(0x18, 0x18, 0x60, 0x18, 0xc0, 0x78, 0x30, 0xd8),
-            LL(0x23, 0x23, 0x8c, 0x23, 0x05, 0xaf, 0x46, 0x26),
-            LL(0xc6, 0xc6, 0x3f, 0xc6, 0x7e, 0xf9, 0x91, 0xb8),
-            LL(0xe8, 0xe8, 0x87, 0xe8, 0x13, 0x6f, 0xcd, 0xfb),
-            LL(0x87, 0x87, 0x26, 0x87, 0x4c, 0xa1, 0x13, 0xcb),
-            LL(0xb8, 0xb8, 0xda, 0xb8, 0xa9, 0x62, 0x6d, 0x11),
-            LL(0x01, 0x01, 0x04, 0x01, 0x08, 0x05, 0x02, 0x09),
-            LL(0x4f, 0x4f, 0x21, 0x4f, 0x42, 0x6e, 0x9e, 0x0d),
-            LL(0x36, 0x36, 0xd8, 0x36, 0xad, 0xee, 0x6c, 0x9b),
-            LL(0xa6, 0xa6, 0xa2, 0xa6, 0x59, 0x04, 0x51, 0xff),
-            LL(0xd2, 0xd2, 0x6f, 0xd2, 0xde, 0xbd, 0xb9, 0x0c),
-            LL(0xf5, 0xf5, 0xf3, 0xf5, 0xfb, 0x06, 0xf7, 0x0e),
-            LL(0x79, 0x79, 0xf9, 0x79, 0xef, 0x80, 0xf2, 0x96),
-            LL(0x6f, 0x6f, 0xa1, 0x6f, 0x5f, 0xce, 0xde, 0x30),
-            LL(0x91, 0x91, 0x7e, 0x91, 0xfc, 0xef, 0x3f, 0x6d),
-            LL(0x52, 0x52, 0x55, 0x52, 0xaa, 0x07, 0xa4, 0xf8),
-            LL(0x60, 0x60, 0x9d, 0x60, 0x27, 0xfd, 0xc0, 0x47),
-            LL(0xbc, 0xbc, 0xca, 0xbc, 0x89, 0x76, 0x65, 0x35),
-            LL(0x9b, 0x9b, 0x56, 0x9b, 0xac, 0xcd, 0x2b, 0x37),
-            LL(0x8e, 0x8e, 0x02, 0x8e, 0x04, 0x8c, 0x01, 0x8a),
-            LL(0xa3, 0xa3, 0xb6, 0xa3, 0x71, 0x15, 0x5b, 0xd2),
-            LL(0x0c, 0x0c, 0x30, 0x0c, 0x60, 0x3c, 0x18, 0x6c),
-            LL(0x7b, 0x7b, 0xf1, 0x7b, 0xff, 0x8a, 0xf6, 0x84),
-            LL(0x35, 0x35, 0xd4, 0x35, 0xb5, 0xe1, 0x6a, 0x80),
-            LL(0x1d, 0x1d, 0x74, 0x1d, 0xe8, 0x69, 0x3a, 0xf5),
-            LL(0xe0, 0xe0, 0xa7, 0xe0, 0x53, 0x47, 0xdd, 0xb3),
-            LL(0xd7, 0xd7, 0x7b, 0xd7, 0xf6, 0xac, 0xb3, 0x21),
-            LL(0xc2, 0xc2, 0x2f, 0xc2, 0x5e, 0xed, 0x99, 0x9c),
-            LL(0x2e, 0x2e, 0xb8, 0x2e, 0x6d, 0x96, 0x5c, 0x43),
-            LL(0x4b, 0x4b, 0x31, 0x4b, 0x62, 0x7a, 0x96, 0x29),
-            LL(0xfe, 0xfe, 0xdf, 0xfe, 0xa3, 0x21, 0xe1, 0x5d),
-            LL(0x57, 0x57, 0x41, 0x57, 0x82, 0x16, 0xae, 0xd5),
-            LL(0x15, 0x15, 0x54, 0x15, 0xa8, 0x41, 0x2a, 0xbd),
-            LL(0x77, 0x77, 0xc1, 0x77, 0x9f, 0xb6, 0xee, 0xe8),
-            LL(0x37, 0x37, 0xdc, 0x37, 0xa5, 0xeb, 0x6e, 0x92),
-            LL(0xe5, 0xe5, 0xb3, 0xe5, 0x7b, 0x56, 0xd7, 0x9e),
-            LL(0x9f, 0x9f, 0x46, 0x9f, 0x8c, 0xd9, 0x23, 0x13),
-            LL(0xf0, 0xf0, 0xe7, 0xf0, 0xd3, 0x17, 0xfd, 0x23),
-            LL(0x4a, 0x4a, 0x35, 0x4a, 0x6a, 0x7f, 0x94, 0x20),
-            LL(0xda, 0xda, 0x4f, 0xda, 0x9e, 0x95, 0xa9, 0x44),
-            LL(0x58, 0x58, 0x7d, 0x58, 0xfa, 0x25, 0xb0, 0xa2),
-            LL(0xc9, 0xc9, 0x03, 0xc9, 0x06, 0xca, 0x8f, 0xcf),
-            LL(0x29, 0x29, 0xa4, 0x29, 0x55, 0x8d, 0x52, 0x7c),
-            LL(0x0a, 0x0a, 0x28, 0x0a, 0x50, 0x22, 0x14, 0x5a),
-            LL(0xb1, 0xb1, 0xfe, 0xb1, 0xe1, 0x4f, 0x7f, 0x50),
-            LL(0xa0, 0xa0, 0xba, 0xa0, 0x69, 0x1a, 0x5d, 0xc9),
-            LL(0x6b, 0x6b, 0xb1, 0x6b, 0x7f, 0xda, 0xd6, 0x14),
-            LL(0x85, 0x85, 0x2e, 0x85, 0x5c, 0xab, 0x17, 0xd9),
-            LL(0xbd, 0xbd, 0xce, 0xbd, 0x81, 0x73, 0x67, 0x3c),
-            LL(0x5d, 0x5d, 0x69, 0x5d, 0xd2, 0x34, 0xba, 0x8f),
-            LL(0x10, 0x10, 0x40, 0x10, 0x80, 0x50, 0x20, 0x90),
-            LL(0xf4, 0xf4, 0xf7, 0xf4, 0xf3, 0x03, 0xf5, 0x07),
-            LL(0xcb, 0xcb, 0x0b, 0xcb, 0x16, 0xc0, 0x8b, 0xdd),
-            LL(0x3e, 0x3e, 0xf8, 0x3e, 0xed, 0xc6, 0x7c, 0xd3),
-            LL(0x05, 0x05, 0x14, 0x05, 0x28, 0x11, 0x0a, 0x2d),
-            LL(0x67, 0x67, 0x81, 0x67, 0x1f, 0xe6, 0xce, 0x78),
-            LL(0xe4, 0xe4, 0xb7, 0xe4, 0x73, 0x53, 0xd5, 0x97),
-            LL(0x27, 0x27, 0x9c, 0x27, 0x25, 0xbb, 0x4e, 0x02),
-            LL(0x41, 0x41, 0x19, 0x41, 0x32, 0x58, 0x82, 0x73),
-            LL(0x8b, 0x8b, 0x16, 0x8b, 0x2c, 0x9d, 0x0b, 0xa7),
-            LL(0xa7, 0xa7, 0xa6, 0xa7, 0x51, 0x01, 0x53, 0xf6),
-            LL(0x7d, 0x7d, 0xe9, 0x7d, 0xcf, 0x94, 0xfa, 0xb2),
-            LL(0x95, 0x95, 0x6e, 0x95, 0xdc, 0xfb, 0x37, 0x49),
-            LL(0xd8, 0xd8, 0x47, 0xd8, 0x8e, 0x9f, 0xad, 0x56),
-            LL(0xfb, 0xfb, 0xcb, 0xfb, 0x8b, 0x30, 0xeb, 0x70),
-            LL(0xee, 0xee, 0x9f, 0xee, 0x23, 0x71, 0xc1, 0xcd),
-            LL(0x7c, 0x7c, 0xed, 0x7c, 0xc7, 0x91, 0xf8, 0xbb),
-            LL(0x66, 0x66, 0x85, 0x66, 0x17, 0xe3, 0xcc, 0x71),
-            LL(0xdd, 0xdd, 0x53, 0xdd, 0xa6, 0x8e, 0xa7, 0x7b),
-            LL(0x17, 0x17, 0x5c, 0x17, 0xb8, 0x4b, 0x2e, 0xaf),
-            LL(0x47, 0x47, 0x01, 0x47, 0x02, 0x46, 0x8e, 0x45),
-            LL(0x9e, 0x9e, 0x42, 0x9e, 0x84, 0xdc, 0x21, 0x1a),
-            LL(0xca, 0xca, 0x0f, 0xca, 0x1e, 0xc5, 0x89, 0xd4),
-            LL(0x2d, 0x2d, 0xb4, 0x2d, 0x75, 0x99, 0x5a, 0x58),
-            LL(0xbf, 0xbf, 0xc6, 0xbf, 0x91, 0x79, 0x63, 0x2e),
-            LL(0x07, 0x07, 0x1c, 0x07, 0x38, 0x1b, 0x0e, 0x3f),
-            LL(0xad, 0xad, 0x8e, 0xad, 0x01, 0x23, 0x47, 0xac),
-            LL(0x5a, 0x5a, 0x75, 0x5a, 0xea, 0x2f, 0xb4, 0xb0),
-            LL(0x83, 0x83, 0x36, 0x83, 0x6c, 0xb5, 0x1b, 0xef),
-            LL(0x33, 0x33, 0xcc, 0x33, 0x85, 0xff, 0x66, 0xb6),
-            LL(0x63, 0x63, 0x91, 0x63, 0x3f, 0xf2, 0xc6, 0x5c),
-            LL(0x02, 0x02, 0x08, 0x02, 0x10, 0x0a, 0x04, 0x12),
-            LL(0xaa, 0xaa, 0x92, 0xaa, 0x39, 0x38, 0x49, 0x93),
-            LL(0x71, 0x71, 0xd9, 0x71, 0xaf, 0xa8, 0xe2, 0xde),
-            LL(0xc8, 0xc8, 0x07, 0xc8, 0x0e, 0xcf, 0x8d, 0xc6),
-            LL(0x19, 0x19, 0x64, 0x19, 0xc8, 0x7d, 0x32, 0xd1),
-            LL(0x49, 0x49, 0x39, 0x49, 0x72, 0x70, 0x92, 0x3b),
-            LL(0xd9, 0xd9, 0x43, 0xd9, 0x86, 0x9a, 0xaf, 0x5f),
-            LL(0xf2, 0xf2, 0xef, 0xf2, 0xc3, 0x1d, 0xf9, 0x31),
-            LL(0xe3, 0xe3, 0xab, 0xe3, 0x4b, 0x48, 0xdb, 0xa8),
-            LL(0x5b, 0x5b, 0x71, 0x5b, 0xe2, 0x2a, 0xb6, 0xb9),
-            LL(0x88, 0x88, 0x1a, 0x88, 0x34, 0x92, 0x0d, 0xbc),
-            LL(0x9a, 0x9a, 0x52, 0x9a, 0xa4, 0xc8, 0x29, 0x3e),
-            LL(0x26, 0x26, 0x98, 0x26, 0x2d, 0xbe, 0x4c, 0x0b),
-            LL(0x32, 0x32, 0xc8, 0x32, 0x8d, 0xfa, 0x64, 0xbf),
-            LL(0xb0, 0xb0, 0xfa, 0xb0, 0xe9, 0x4a, 0x7d, 0x59),
-            LL(0xe9, 0xe9, 0x83, 0xe9, 0x1b, 0x6a, 0xcf, 0xf2),
-            LL(0x0f, 0x0f, 0x3c, 0x0f, 0x78, 0x33, 0x1e, 0x77),
-            LL(0xd5, 0xd5, 0x73, 0xd5, 0xe6, 0xa6, 0xb7, 0x33),
-            LL(0x80, 0x80, 0x3a, 0x80, 0x74, 0xba, 0x1d, 0xf4),
-            LL(0xbe, 0xbe, 0xc2, 0xbe, 0x99, 0x7c, 0x61, 0x27),
-            LL(0xcd, 0xcd, 0x13, 0xcd, 0x26, 0xde, 0x87, 0xeb),
-            LL(0x34, 0x34, 0xd0, 0x34, 0xbd, 0xe4, 0x68, 0x89),
-            LL(0x48, 0x48, 0x3d, 0x48, 0x7a, 0x75, 0x90, 0x32),
-            LL(0xff, 0xff, 0xdb, 0xff, 0xab, 0x24, 0xe3, 0x54),
-            LL(0x7a, 0x7a, 0xf5, 0x7a, 0xf7, 0x8f, 0xf4, 0x8d),
-            LL(0x90, 0x90, 0x7a, 0x90, 0xf4, 0xea, 0x3d, 0x64),
-            LL(0x5f, 0x5f, 0x61, 0x5f, 0xc2, 0x3e, 0xbe, 0x9d),
-            LL(0x20, 0x20, 0x80, 0x20, 0x1d, 0xa0, 0x40, 0x3d),
-            LL(0x68, 0x68, 0xbd, 0x68, 0x67, 0xd5, 0xd0, 0x0f),
-            LL(0x1a, 0x1a, 0x68, 0x1a, 0xd0, 0x72, 0x34, 0xca),
-            LL(0xae, 0xae, 0x82, 0xae, 0x19, 0x2c, 0x41, 0xb7),
-            LL(0xb4, 0xb4, 0xea, 0xb4, 0xc9, 0x5e, 0x75, 0x7d),
-            LL(0x54, 0x54, 0x4d, 0x54, 0x9a, 0x19, 0xa8, 0xce),
-            LL(0x93, 0x93, 0x76, 0x93, 0xec, 0xe5, 0x3b, 0x7f),
-            LL(0x22, 0x22, 0x88, 0x22, 0x0d, 0xaa, 0x44, 0x2f),
-            LL(0x64, 0x64, 0x8d, 0x64, 0x07, 0xe9, 0xc8, 0x63),
-            LL(0xf1, 0xf1, 0xe3, 0xf1, 0xdb, 0x12, 0xff, 0x2a),
-            LL(0x73, 0x73, 0xd1, 0x73, 0xbf, 0xa2, 0xe6, 0xcc),
-            LL(0x12, 0x12, 0x48, 0x12, 0x90, 0x5a, 0x24, 0x82),
-            LL(0x40, 0x40, 0x1d, 0x40, 0x3a, 0x5d, 0x80, 0x7a),
-            LL(0x08, 0x08, 0x20, 0x08, 0x40, 0x28, 0x10, 0x48),
-            LL(0xc3, 0xc3, 0x2b, 0xc3, 0x56, 0xe8, 0x9b, 0x95),
-            LL(0xec, 0xec, 0x97, 0xec, 0x33, 0x7b, 0xc5, 0xdf),
-            LL(0xdb, 0xdb, 0x4b, 0xdb, 0x96, 0x90, 0xab, 0x4d),
-            LL(0xa1, 0xa1, 0xbe, 0xa1, 0x61, 0x1f, 0x5f, 0xc0),
-            LL(0x8d, 0x8d, 0x0e, 0x8d, 0x1c, 0x83, 0x07, 0x91),
-            LL(0x3d, 0x3d, 0xf4, 0x3d, 0xf5, 0xc9, 0x7a, 0xc8),
-            LL(0x97, 0x97, 0x66, 0x97, 0xcc, 0xf1, 0x33, 0x5b),
-            LL(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
-            LL(0xcf, 0xcf, 0x1b, 0xcf, 0x36, 0xd4, 0x83, 0xf9),
-            LL(0x2b, 0x2b, 0xac, 0x2b, 0x45, 0x87, 0x56, 0x6e),
-            LL(0x76, 0x76, 0xc5, 0x76, 0x97, 0xb3, 0xec, 0xe1),
-            LL(0x82, 0x82, 0x32, 0x82, 0x64, 0xb0, 0x19, 0xe6),
-            LL(0xd6, 0xd6, 0x7f, 0xd6, 0xfe, 0xa9, 0xb1, 0x28),
-            LL(0x1b, 0x1b, 0x6c, 0x1b, 0xd8, 0x77, 0x36, 0xc3),
-            LL(0xb5, 0xb5, 0xee, 0xb5, 0xc1, 0x5b, 0x77, 0x74),
-            LL(0xaf, 0xaf, 0x86, 0xaf, 0x11, 0x29, 0x43, 0xbe),
-            LL(0x6a, 0x6a, 0xb5, 0x6a, 0x77, 0xdf, 0xd4, 0x1d),
-            LL(0x50, 0x50, 0x5d, 0x50, 0xba, 0x0d, 0xa0, 0xea),
-            LL(0x45, 0x45, 0x09, 0x45, 0x12, 0x4c, 0x8a, 0x57),
-            LL(0xf3, 0xf3, 0xeb, 0xf3, 0xcb, 0x18, 0xfb, 0x38),
-            LL(0x30, 0x30, 0xc0, 0x30, 0x9d, 0xf0, 0x60, 0xad),
-            LL(0xef, 0xef, 0x9b, 0xef, 0x2b, 0x74, 0xc3, 0xc4),
-            LL(0x3f, 0x3f, 0xfc, 0x3f, 0xe5, 0xc3, 0x7e, 0xda),
-            LL(0x55, 0x55, 0x49, 0x55, 0x92, 0x1c, 0xaa, 0xc7),
-            LL(0xa2, 0xa2, 0xb2, 0xa2, 0x79, 0x10, 0x59, 0xdb),
-            LL(0xea, 0xea, 0x8f, 0xea, 0x03, 0x65, 0xc9, 0xe9),
-            LL(0x65, 0x65, 0x89, 0x65, 0x0f, 0xec, 0xca, 0x6a),
-            LL(0xba, 0xba, 0xd2, 0xba, 0xb9, 0x68, 0x69, 0x03),
-            LL(0x2f, 0x2f, 0xbc, 0x2f, 0x65, 0x93, 0x5e, 0x4a),
-            LL(0xc0, 0xc0, 0x27, 0xc0, 0x4e, 0xe7, 0x9d, 0x8e),
-            LL(0xde, 0xde, 0x5f, 0xde, 0xbe, 0x81, 0xa1, 0x60),
-            LL(0x1c, 0x1c, 0x70, 0x1c, 0xe0, 0x6c, 0x38, 0xfc),
-            LL(0xfd, 0xfd, 0xd3, 0xfd, 0xbb, 0x2e, 0xe7, 0x46),
-            LL(0x4d, 0x4d, 0x29, 0x4d, 0x52, 0x64, 0x9a, 0x1f),
-            LL(0x92, 0x92, 0x72, 0x92, 0xe4, 0xe0, 0x39, 0x76),
-            LL(0x75, 0x75, 0xc9, 0x75, 0x8f, 0xbc, 0xea, 0xfa),
-            LL(0x06, 0x06, 0x18, 0x06, 0x30, 0x1e, 0x0c, 0x36),
-            LL(0x8a, 0x8a, 0x12, 0x8a, 0x24, 0x98, 0x09, 0xae),
-            LL(0xb2, 0xb2, 0xf2, 0xb2, 0xf9, 0x40, 0x79, 0x4b),
-            LL(0xe6, 0xe6, 0xbf, 0xe6, 0x63, 0x59, 0xd1, 0x85),
-            LL(0x0e, 0x0e, 0x38, 0x0e, 0x70, 0x36, 0x1c, 0x7e),
-            LL(0x1f, 0x1f, 0x7c, 0x1f, 0xf8, 0x63, 0x3e, 0xe7),
-            LL(0x62, 0x62, 0x95, 0x62, 0x37, 0xf7, 0xc4, 0x55),
-            LL(0xd4, 0xd4, 0x77, 0xd4, 0xee, 0xa3, 0xb5, 0x3a),
-            LL(0xa8, 0xa8, 0x9a, 0xa8, 0x29, 0x32, 0x4d, 0x81),
-            LL(0x96, 0x96, 0x62, 0x96, 0xc4, 0xf4, 0x31, 0x52),
-            LL(0xf9, 0xf9, 0xc3, 0xf9, 0x9b, 0x3a, 0xef, 0x62),
-            LL(0xc5, 0xc5, 0x33, 0xc5, 0x66, 0xf6, 0x97, 0xa3),
-            LL(0x25, 0x25, 0x94, 0x25, 0x35, 0xb1, 0x4a, 0x10),
-            LL(0x59, 0x59, 0x79, 0x59, 0xf2, 0x20, 0xb2, 0xab),
-            LL(0x84, 0x84, 0x2a, 0x84, 0x54, 0xae, 0x15, 0xd0),
-            LL(0x72, 0x72, 0xd5, 0x72, 0xb7, 0xa7, 0xe4, 0xc5),
-            LL(0x39, 0x39, 0xe4, 0x39, 0xd5, 0xdd, 0x72, 0xec),
-            LL(0x4c, 0x4c, 0x2d, 0x4c, 0x5a, 0x61, 0x98, 0x16),
-            LL(0x5e, 0x5e, 0x65, 0x5e, 0xca, 0x3b, 0xbc, 0x94),
-            LL(0x78, 0x78, 0xfd, 0x78, 0xe7, 0x85, 0xf0, 0x9f),
-            LL(0x38, 0x38, 0xe0, 0x38, 0xdd, 0xd8, 0x70, 0xe5),
-            LL(0x8c, 0x8c, 0x0a, 0x8c, 0x14, 0x86, 0x05, 0x98),
-            LL(0xd1, 0xd1, 0x63, 0xd1, 0xc6, 0xb2, 0xbf, 0x17),
-            LL(0xa5, 0xa5, 0xae, 0xa5, 0x41, 0x0b, 0x57, 0xe4),
-            LL(0xe2, 0xe2, 0xaf, 0xe2, 0x43, 0x4d, 0xd9, 0xa1),
-            LL(0x61, 0x61, 0x99, 0x61, 0x2f, 0xf8, 0xc2, 0x4e),
-            LL(0xb3, 0xb3, 0xf6, 0xb3, 0xf1, 0x45, 0x7b, 0x42),
-            LL(0x21, 0x21, 0x84, 0x21, 0x15, 0xa5, 0x42, 0x34),
-            LL(0x9c, 0x9c, 0x4a, 0x9c, 0x94, 0xd6, 0x25, 0x08),
-            LL(0x1e, 0x1e, 0x78, 0x1e, 0xf0, 0x66, 0x3c, 0xee),
-            LL(0x43, 0x43, 0x11, 0x43, 0x22, 0x52, 0x86, 0x61),
-            LL(0xc7, 0xc7, 0x3b, 0xc7, 0x76, 0xfc, 0x93, 0xb1),
-            LL(0xfc, 0xfc, 0xd7, 0xfc, 0xb3, 0x2b, 0xe5, 0x4f),
-            LL(0x04, 0x04, 0x10, 0x04, 0x20, 0x14, 0x08, 0x24),
-            LL(0x51, 0x51, 0x59, 0x51, 0xb2, 0x08, 0xa2, 0xe3),
-            LL(0x99, 0x99, 0x5e, 0x99, 0xbc, 0xc7, 0x2f, 0x25),
-            LL(0x6d, 0x6d, 0xa9, 0x6d, 0x4f, 0xc4, 0xda, 0x22),
-            LL(0x0d, 0x0d, 0x34, 0x0d, 0x68, 0x39, 0x1a, 0x65),
-            LL(0xfa, 0xfa, 0xcf, 0xfa, 0x83, 0x35, 0xe9, 0x79),
-            LL(0xdf, 0xdf, 0x5b, 0xdf, 0xb6, 0x84, 0xa3, 0x69),
-            LL(0x7e, 0x7e, 0xe5, 0x7e, 0xd7, 0x9b, 0xfc, 0xa9),
-            LL(0x24, 0x24, 0x90, 0x24, 0x3d, 0xb4, 0x48, 0x19),
-            LL(0x3b, 0x3b, 0xec, 0x3b, 0xc5, 0xd7, 0x76, 0xfe),
-            LL(0xab, 0xab, 0x96, 0xab, 0x31, 0x3d, 0x4b, 0x9a),
-            LL(0xce, 0xce, 0x1f, 0xce, 0x3e, 0xd1, 0x81, 0xf0),
-            LL(0x11, 0x11, 0x44, 0x11, 0x88, 0x55, 0x22, 0x99),
-            LL(0x8f, 0x8f, 0x06, 0x8f, 0x0c, 0x89, 0x03, 0x83),
-            LL(0x4e, 0x4e, 0x25, 0x4e, 0x4a, 0x6b, 0x9c, 0x04),
-            LL(0xb7, 0xb7, 0xe6, 0xb7, 0xd1, 0x51, 0x73, 0x66),
-            LL(0xeb, 0xeb, 0x8b, 0xeb, 0x0b, 0x60, 0xcb, 0xe0),
-            LL(0x3c, 0x3c, 0xf0, 0x3c, 0xfd, 0xcc, 0x78, 0xc1),
-            LL(0x81, 0x81, 0x3e, 0x81, 0x7c, 0xbf, 0x1f, 0xfd),
-            LL(0x94, 0x94, 0x6a, 0x94, 0xd4, 0xfe, 0x35, 0x40),
-            LL(0xf7, 0xf7, 0xfb, 0xf7, 0xeb, 0x0c, 0xf3, 0x1c),
-            LL(0xb9, 0xb9, 0xde, 0xb9, 0xa1, 0x67, 0x6f, 0x18),
-            LL(0x13, 0x13, 0x4c, 0x13, 0x98, 0x5f, 0x26, 0x8b),
-            LL(0x2c, 0x2c, 0xb0, 0x2c, 0x7d, 0x9c, 0x58, 0x51),
-            LL(0xd3, 0xd3, 0x6b, 0xd3, 0xd6, 0xb8, 0xbb, 0x05),
-            LL(0xe7, 0xe7, 0xbb, 0xe7, 0x6b, 0x5c, 0xd3, 0x8c),
-            LL(0x6e, 0x6e, 0xa5, 0x6e, 0x57, 0xcb, 0xdc, 0x39),
-            LL(0xc4, 0xc4, 0x37, 0xc4, 0x6e, 0xf3, 0x95, 0xaa),
-            LL(0x03, 0x03, 0x0c, 0x03, 0x18, 0x0f, 0x06, 0x1b),
-            LL(0x56, 0x56, 0x45, 0x56, 0x8a, 0x13, 0xac, 0xdc),
-            LL(0x44, 0x44, 0x0d, 0x44, 0x1a, 0x49, 0x88, 0x5e),
-            LL(0x7f, 0x7f, 0xe1, 0x7f, 0xdf, 0x9e, 0xfe, 0xa0),
-            LL(0xa9, 0xa9, 0x9e, 0xa9, 0x21, 0x37, 0x4f, 0x88),
-            LL(0x2a, 0x2a, 0xa8, 0x2a, 0x4d, 0x82, 0x54, 0x67),
-            LL(0xbb, 0xbb, 0xd6, 0xbb, 0xb1, 0x6d, 0x6b, 0x0a),
-            LL(0xc1, 0xc1, 0x23, 0xc1, 0x46, 0xe2, 0x9f, 0x87),
-            LL(0x53, 0x53, 0x51, 0x53, 0xa2, 0x02, 0xa6, 0xf1),
-            LL(0xdc, 0xdc, 0x57, 0xdc, 0xae, 0x8b, 0xa5, 0x72),
-            LL(0x0b, 0x0b, 0x2c, 0x0b, 0x58, 0x27, 0x16, 0x53),
-            LL(0x9d, 0x9d, 0x4e, 0x9d, 0x9c, 0xd3, 0x27, 0x01),
-            LL(0x6c, 0x6c, 0xad, 0x6c, 0x47, 0xc1, 0xd8, 0x2b),
-            LL(0x31, 0x31, 0xc4, 0x31, 0x95, 0xf5, 0x62, 0xa4),
-            LL(0x74, 0x74, 0xcd, 0x74, 0x87, 0xb9, 0xe8, 0xf3),
-            LL(0xf6, 0xf6, 0xff, 0xf6, 0xe3, 0x09, 0xf1, 0x15),
-            LL(0x46, 0x46, 0x05, 0x46, 0x0a, 0x43, 0x8c, 0x4c),
-            LL(0xac, 0xac, 0x8a, 0xac, 0x09, 0x26, 0x45, 0xa5),
-            LL(0x89, 0x89, 0x1e, 0x89, 0x3c, 0x97, 0x0f, 0xb5),
-            LL(0x14, 0x14, 0x50, 0x14, 0xa0, 0x44, 0x28, 0xb4),
-            LL(0xe1, 0xe1, 0xa3, 0xe1, 0x5b, 0x42, 0xdf, 0xba),
-            LL(0x16, 0x16, 0x58, 0x16, 0xb0, 0x4e, 0x2c, 0xa6),
-            LL(0x3a, 0x3a, 0xe8, 0x3a, 0xcd, 0xd2, 0x74, 0xf7),
-            LL(0x69, 0x69, 0xb9, 0x69, 0x6f, 0xd0, 0xd2, 0x06),
-            LL(0x09, 0x09, 0x24, 0x09, 0x48, 0x2d, 0x12, 0x41),
-            LL(0x70, 0x70, 0xdd, 0x70, 0xa7, 0xad, 0xe0, 0xd7),
-            LL(0xb6, 0xb6, 0xe2, 0xb6, 0xd9, 0x54, 0x71, 0x6f),
-            LL(0xd0, 0xd0, 0x67, 0xd0, 0xce, 0xb7, 0xbd, 0x1e),
-            LL(0xed, 0xed, 0x93, 0xed, 0x3b, 0x7e, 0xc7, 0xd6),
-            LL(0xcc, 0xcc, 0x17, 0xcc, 0x2e, 0xdb, 0x85, 0xe2),
-            LL(0x42, 0x42, 0x15, 0x42, 0x2a, 0x57, 0x84, 0x68),
-            LL(0x98, 0x98, 0x5a, 0x98, 0xb4, 0xc2, 0x2d, 0x2c),
-            LL(0xa4, 0xa4, 0xaa, 0xa4, 0x49, 0x0e, 0x55, 0xed),
-            LL(0x28, 0x28, 0xa0, 0x28, 0x5d, 0x88, 0x50, 0x75),
-            LL(0x5c, 0x5c, 0x6d, 0x5c, 0xda, 0x31, 0xb8, 0x86),
-            LL(0xf8, 0xf8, 0xc7, 0xf8, 0x93, 0x3f, 0xed, 0x6b),
-            LL(0x86, 0x86, 0x22, 0x86, 0x44, 0xa4, 0x11, 0xc2),
-#define RC      (&(Cx.q[256*N]))
-            0x18, 0x23, 0xc6, 0xe8, 0x87, 0xb8, 0x01, 0x4f,
-            /* rc[ROUNDS] */
-            0x36, 0xa6, 0xd2, 0xf5, 0x79, 0x6f, 0x91, 0x52, 0x60, 0xbc, 0x9b,
-            0x8e, 0xa3, 0x0c, 0x7b, 0x35, 0x1d, 0xe0, 0xd7, 0xc2, 0x2e, 0x4b,
-            0xfe, 0x57, 0x15, 0x77, 0x37, 0xe5, 0x9f, 0xf0, 0x4a, 0xda, 0x58,
-            0xc9, 0x29, 0x0a, 0xb1, 0xa0, 0x6b, 0x85, 0xbd, 0x5d, 0x10, 0xf4,
-            0xcb, 0x3e, 0x05, 0x67, 0xe4, 0x27, 0x41, 0x8b, 0xa7, 0x7d, 0x95,
-            0xd8, 0xfb, 0xee, 0x7c, 0x66, 0xdd, 0x17, 0x47, 0x9e, 0xca, 0x2d,
-            0xbf, 0x07, 0xad, 0x5a, 0x83, 0x33
-        }
-    };
+    { /* Note endian-neutral representation:-) */
+        LL(0x18, 0x18, 0x60, 0x18, 0xc0, 0x78, 0x30, 0xd8),
+        LL(0x23, 0x23, 0x8c, 0x23, 0x05, 0xaf, 0x46, 0x26),
+        LL(0xc6, 0xc6, 0x3f, 0xc6, 0x7e, 0xf9, 0x91, 0xb8),
+        LL(0xe8, 0xe8, 0x87, 0xe8, 0x13, 0x6f, 0xcd, 0xfb),
+        LL(0x87, 0x87, 0x26, 0x87, 0x4c, 0xa1, 0x13, 0xcb),
+        LL(0xb8, 0xb8, 0xda, 0xb8, 0xa9, 0x62, 0x6d, 0x11),
+        LL(0x01, 0x01, 0x04, 0x01, 0x08, 0x05, 0x02, 0x09),
+        LL(0x4f, 0x4f, 0x21, 0x4f, 0x42, 0x6e, 0x9e, 0x0d),
+        LL(0x36, 0x36, 0xd8, 0x36, 0xad, 0xee, 0x6c, 0x9b),
+        LL(0xa6, 0xa6, 0xa2, 0xa6, 0x59, 0x04, 0x51, 0xff),
+        LL(0xd2, 0xd2, 0x6f, 0xd2, 0xde, 0xbd, 0xb9, 0x0c),
+        LL(0xf5, 0xf5, 0xf3, 0xf5, 0xfb, 0x06, 0xf7, 0x0e),
+        LL(0x79, 0x79, 0xf9, 0x79, 0xef, 0x80, 0xf2, 0x96),
+        LL(0x6f, 0x6f, 0xa1, 0x6f, 0x5f, 0xce, 0xde, 0x30),
+        LL(0x91, 0x91, 0x7e, 0x91, 0xfc, 0xef, 0x3f, 0x6d),
+        LL(0x52, 0x52, 0x55, 0x52, 0xaa, 0x07, 0xa4, 0xf8),
+        LL(0x60, 0x60, 0x9d, 0x60, 0x27, 0xfd, 0xc0, 0x47),
+        LL(0xbc, 0xbc, 0xca, 0xbc, 0x89, 0x76, 0x65, 0x35),
+        LL(0x9b, 0x9b, 0x56, 0x9b, 0xac, 0xcd, 0x2b, 0x37),
+        LL(0x8e, 0x8e, 0x02, 0x8e, 0x04, 0x8c, 0x01, 0x8a),
+        LL(0xa3, 0xa3, 0xb6, 0xa3, 0x71, 0x15, 0x5b, 0xd2),
+        LL(0x0c, 0x0c, 0x30, 0x0c, 0x60, 0x3c, 0x18, 0x6c),
+        LL(0x7b, 0x7b, 0xf1, 0x7b, 0xff, 0x8a, 0xf6, 0x84),
+        LL(0x35, 0x35, 0xd4, 0x35, 0xb5, 0xe1, 0x6a, 0x80),
+        LL(0x1d, 0x1d, 0x74, 0x1d, 0xe8, 0x69, 0x3a, 0xf5),
+        LL(0xe0, 0xe0, 0xa7, 0xe0, 0x53, 0x47, 0xdd, 0xb3),
+        LL(0xd7, 0xd7, 0x7b, 0xd7, 0xf6, 0xac, 0xb3, 0x21),
+        LL(0xc2, 0xc2, 0x2f, 0xc2, 0x5e, 0xed, 0x99, 0x9c),
+        LL(0x2e, 0x2e, 0xb8, 0x2e, 0x6d, 0x96, 0x5c, 0x43),
+        LL(0x4b, 0x4b, 0x31, 0x4b, 0x62, 0x7a, 0x96, 0x29),
+        LL(0xfe, 0xfe, 0xdf, 0xfe, 0xa3, 0x21, 0xe1, 0x5d),
+        LL(0x57, 0x57, 0x41, 0x57, 0x82, 0x16, 0xae, 0xd5),
+        LL(0x15, 0x15, 0x54, 0x15, 0xa8, 0x41, 0x2a, 0xbd),
+        LL(0x77, 0x77, 0xc1, 0x77, 0x9f, 0xb6, 0xee, 0xe8),
+        LL(0x37, 0x37, 0xdc, 0x37, 0xa5, 0xeb, 0x6e, 0x92),
+        LL(0xe5, 0xe5, 0xb3, 0xe5, 0x7b, 0x56, 0xd7, 0x9e),
+        LL(0x9f, 0x9f, 0x46, 0x9f, 0x8c, 0xd9, 0x23, 0x13),
+        LL(0xf0, 0xf0, 0xe7, 0xf0, 0xd3, 0x17, 0xfd, 0x23),
+        LL(0x4a, 0x4a, 0x35, 0x4a, 0x6a, 0x7f, 0x94, 0x20),
+        LL(0xda, 0xda, 0x4f, 0xda, 0x9e, 0x95, 0xa9, 0x44),
+        LL(0x58, 0x58, 0x7d, 0x58, 0xfa, 0x25, 0xb0, 0xa2),
+        LL(0xc9, 0xc9, 0x03, 0xc9, 0x06, 0xca, 0x8f, 0xcf),
+        LL(0x29, 0x29, 0xa4, 0x29, 0x55, 0x8d, 0x52, 0x7c),
+        LL(0x0a, 0x0a, 0x28, 0x0a, 0x50, 0x22, 0x14, 0x5a),
+        LL(0xb1, 0xb1, 0xfe, 0xb1, 0xe1, 0x4f, 0x7f, 0x50),
+        LL(0xa0, 0xa0, 0xba, 0xa0, 0x69, 0x1a, 0x5d, 0xc9),
+        LL(0x6b, 0x6b, 0xb1, 0x6b, 0x7f, 0xda, 0xd6, 0x14),
+        LL(0x85, 0x85, 0x2e, 0x85, 0x5c, 0xab, 0x17, 0xd9),
+        LL(0xbd, 0xbd, 0xce, 0xbd, 0x81, 0x73, 0x67, 0x3c),
+        LL(0x5d, 0x5d, 0x69, 0x5d, 0xd2, 0x34, 0xba, 0x8f),
+        LL(0x10, 0x10, 0x40, 0x10, 0x80, 0x50, 0x20, 0x90),
+        LL(0xf4, 0xf4, 0xf7, 0xf4, 0xf3, 0x03, 0xf5, 0x07),
+        LL(0xcb, 0xcb, 0x0b, 0xcb, 0x16, 0xc0, 0x8b, 0xdd),
+        LL(0x3e, 0x3e, 0xf8, 0x3e, 0xed, 0xc6, 0x7c, 0xd3),
+        LL(0x05, 0x05, 0x14, 0x05, 0x28, 0x11, 0x0a, 0x2d),
+        LL(0x67, 0x67, 0x81, 0x67, 0x1f, 0xe6, 0xce, 0x78),
+        LL(0xe4, 0xe4, 0xb7, 0xe4, 0x73, 0x53, 0xd5, 0x97),
+        LL(0x27, 0x27, 0x9c, 0x27, 0x25, 0xbb, 0x4e, 0x02),
+        LL(0x41, 0x41, 0x19, 0x41, 0x32, 0x58, 0x82, 0x73),
+        LL(0x8b, 0x8b, 0x16, 0x8b, 0x2c, 0x9d, 0x0b, 0xa7),
+        LL(0xa7, 0xa7, 0xa6, 0xa7, 0x51, 0x01, 0x53, 0xf6),
+        LL(0x7d, 0x7d, 0xe9, 0x7d, 0xcf, 0x94, 0xfa, 0xb2),
+        LL(0x95, 0x95, 0x6e, 0x95, 0xdc, 0xfb, 0x37, 0x49),
+        LL(0xd8, 0xd8, 0x47, 0xd8, 0x8e, 0x9f, 0xad, 0x56),
+        LL(0xfb, 0xfb, 0xcb, 0xfb, 0x8b, 0x30, 0xeb, 0x70),
+        LL(0xee, 0xee, 0x9f, 0xee, 0x23, 0x71, 0xc1, 0xcd),
+        LL(0x7c, 0x7c, 0xed, 0x7c, 0xc7, 0x91, 0xf8, 0xbb),
+        LL(0x66, 0x66, 0x85, 0x66, 0x17, 0xe3, 0xcc, 0x71),
+        LL(0xdd, 0xdd, 0x53, 0xdd, 0xa6, 0x8e, 0xa7, 0x7b),
+        LL(0x17, 0x17, 0x5c, 0x17, 0xb8, 0x4b, 0x2e, 0xaf),
+        LL(0x47, 0x47, 0x01, 0x47, 0x02, 0x46, 0x8e, 0x45),
+        LL(0x9e, 0x9e, 0x42, 0x9e, 0x84, 0xdc, 0x21, 0x1a),
+        LL(0xca, 0xca, 0x0f, 0xca, 0x1e, 0xc5, 0x89, 0xd4),
+        LL(0x2d, 0x2d, 0xb4, 0x2d, 0x75, 0x99, 0x5a, 0x58),
+        LL(0xbf, 0xbf, 0xc6, 0xbf, 0x91, 0x79, 0x63, 0x2e),
+        LL(0x07, 0x07, 0x1c, 0x07, 0x38, 0x1b, 0x0e, 0x3f),
+        LL(0xad, 0xad, 0x8e, 0xad, 0x01, 0x23, 0x47, 0xac),
+        LL(0x5a, 0x5a, 0x75, 0x5a, 0xea, 0x2f, 0xb4, 0xb0),
+        LL(0x83, 0x83, 0x36, 0x83, 0x6c, 0xb5, 0x1b, 0xef),
+        LL(0x33, 0x33, 0xcc, 0x33, 0x85, 0xff, 0x66, 0xb6),
+        LL(0x63, 0x63, 0x91, 0x63, 0x3f, 0xf2, 0xc6, 0x5c),
+        LL(0x02, 0x02, 0x08, 0x02, 0x10, 0x0a, 0x04, 0x12),
+        LL(0xaa, 0xaa, 0x92, 0xaa, 0x39, 0x38, 0x49, 0x93),
+        LL(0x71, 0x71, 0xd9, 0x71, 0xaf, 0xa8, 0xe2, 0xde),
+        LL(0xc8, 0xc8, 0x07, 0xc8, 0x0e, 0xcf, 0x8d, 0xc6),
+        LL(0x19, 0x19, 0x64, 0x19, 0xc8, 0x7d, 0x32, 0xd1),
+        LL(0x49, 0x49, 0x39, 0x49, 0x72, 0x70, 0x92, 0x3b),
+        LL(0xd9, 0xd9, 0x43, 0xd9, 0x86, 0x9a, 0xaf, 0x5f),
+        LL(0xf2, 0xf2, 0xef, 0xf2, 0xc3, 0x1d, 0xf9, 0x31),
+        LL(0xe3, 0xe3, 0xab, 0xe3, 0x4b, 0x48, 0xdb, 0xa8),
+        LL(0x5b, 0x5b, 0x71, 0x5b, 0xe2, 0x2a, 0xb6, 0xb9),
+        LL(0x88, 0x88, 0x1a, 0x88, 0x34, 0x92, 0x0d, 0xbc),
+        LL(0x9a, 0x9a, 0x52, 0x9a, 0xa4, 0xc8, 0x29, 0x3e),
+        LL(0x26, 0x26, 0x98, 0x26, 0x2d, 0xbe, 0x4c, 0x0b),
+        LL(0x32, 0x32, 0xc8, 0x32, 0x8d, 0xfa, 0x64, 0xbf),
+        LL(0xb0, 0xb0, 0xfa, 0xb0, 0xe9, 0x4a, 0x7d, 0x59),
+        LL(0xe9, 0xe9, 0x83, 0xe9, 0x1b, 0x6a, 0xcf, 0xf2),
+        LL(0x0f, 0x0f, 0x3c, 0x0f, 0x78, 0x33, 0x1e, 0x77),
+        LL(0xd5, 0xd5, 0x73, 0xd5, 0xe6, 0xa6, 0xb7, 0x33),
+        LL(0x80, 0x80, 0x3a, 0x80, 0x74, 0xba, 0x1d, 0xf4),
+        LL(0xbe, 0xbe, 0xc2, 0xbe, 0x99, 0x7c, 0x61, 0x27),
+        LL(0xcd, 0xcd, 0x13, 0xcd, 0x26, 0xde, 0x87, 0xeb),
+        LL(0x34, 0x34, 0xd0, 0x34, 0xbd, 0xe4, 0x68, 0x89),
+        LL(0x48, 0x48, 0x3d, 0x48, 0x7a, 0x75, 0x90, 0x32),
+        LL(0xff, 0xff, 0xdb, 0xff, 0xab, 0x24, 0xe3, 0x54),
+        LL(0x7a, 0x7a, 0xf5, 0x7a, 0xf7, 0x8f, 0xf4, 0x8d),
+        LL(0x90, 0x90, 0x7a, 0x90, 0xf4, 0xea, 0x3d, 0x64),
+        LL(0x5f, 0x5f, 0x61, 0x5f, 0xc2, 0x3e, 0xbe, 0x9d),
+        LL(0x20, 0x20, 0x80, 0x20, 0x1d, 0xa0, 0x40, 0x3d),
+        LL(0x68, 0x68, 0xbd, 0x68, 0x67, 0xd5, 0xd0, 0x0f),
+        LL(0x1a, 0x1a, 0x68, 0x1a, 0xd0, 0x72, 0x34, 0xca),
+        LL(0xae, 0xae, 0x82, 0xae, 0x19, 0x2c, 0x41, 0xb7),
+        LL(0xb4, 0xb4, 0xea, 0xb4, 0xc9, 0x5e, 0x75, 0x7d),
+        LL(0x54, 0x54, 0x4d, 0x54, 0x9a, 0x19, 0xa8, 0xce),
+        LL(0x93, 0x93, 0x76, 0x93, 0xec, 0xe5, 0x3b, 0x7f),
+        LL(0x22, 0x22, 0x88, 0x22, 0x0d, 0xaa, 0x44, 0x2f),
+        LL(0x64, 0x64, 0x8d, 0x64, 0x07, 0xe9, 0xc8, 0x63),
+        LL(0xf1, 0xf1, 0xe3, 0xf1, 0xdb, 0x12, 0xff, 0x2a),
+        LL(0x73, 0x73, 0xd1, 0x73, 0xbf, 0xa2, 0xe6, 0xcc),
+        LL(0x12, 0x12, 0x48, 0x12, 0x90, 0x5a, 0x24, 0x82),
+        LL(0x40, 0x40, 0x1d, 0x40, 0x3a, 0x5d, 0x80, 0x7a),
+        LL(0x08, 0x08, 0x20, 0x08, 0x40, 0x28, 0x10, 0x48),
+        LL(0xc3, 0xc3, 0x2b, 0xc3, 0x56, 0xe8, 0x9b, 0x95),
+        LL(0xec, 0xec, 0x97, 0xec, 0x33, 0x7b, 0xc5, 0xdf),
+        LL(0xdb, 0xdb, 0x4b, 0xdb, 0x96, 0x90, 0xab, 0x4d),
+        LL(0xa1, 0xa1, 0xbe, 0xa1, 0x61, 0x1f, 0x5f, 0xc0),
+        LL(0x8d, 0x8d, 0x0e, 0x8d, 0x1c, 0x83, 0x07, 0x91),
+        LL(0x3d, 0x3d, 0xf4, 0x3d, 0xf5, 0xc9, 0x7a, 0xc8),
+        LL(0x97, 0x97, 0x66, 0x97, 0xcc, 0xf1, 0x33, 0x5b),
+        LL(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
+        LL(0xcf, 0xcf, 0x1b, 0xcf, 0x36, 0xd4, 0x83, 0xf9),
+        LL(0x2b, 0x2b, 0xac, 0x2b, 0x45, 0x87, 0x56, 0x6e),
+        LL(0x76, 0x76, 0xc5, 0x76, 0x97, 0xb3, 0xec, 0xe1),
+        LL(0x82, 0x82, 0x32, 0x82, 0x64, 0xb0, 0x19, 0xe6),
+        LL(0xd6, 0xd6, 0x7f, 0xd6, 0xfe, 0xa9, 0xb1, 0x28),
+        LL(0x1b, 0x1b, 0x6c, 0x1b, 0xd8, 0x77, 0x36, 0xc3),
+        LL(0xb5, 0xb5, 0xee, 0xb5, 0xc1, 0x5b, 0x77, 0x74),
+        LL(0xaf, 0xaf, 0x86, 0xaf, 0x11, 0x29, 0x43, 0xbe),
+        LL(0x6a, 0x6a, 0xb5, 0x6a, 0x77, 0xdf, 0xd4, 0x1d),
+        LL(0x50, 0x50, 0x5d, 0x50, 0xba, 0x0d, 0xa0, 0xea),
+        LL(0x45, 0x45, 0x09, 0x45, 0x12, 0x4c, 0x8a, 0x57),
+        LL(0xf3, 0xf3, 0xeb, 0xf3, 0xcb, 0x18, 0xfb, 0x38),
+        LL(0x30, 0x30, 0xc0, 0x30, 0x9d, 0xf0, 0x60, 0xad),
+        LL(0xef, 0xef, 0x9b, 0xef, 0x2b, 0x74, 0xc3, 0xc4),
+        LL(0x3f, 0x3f, 0xfc, 0x3f, 0xe5, 0xc3, 0x7e, 0xda),
+        LL(0x55, 0x55, 0x49, 0x55, 0x92, 0x1c, 0xaa, 0xc7),
+        LL(0xa2, 0xa2, 0xb2, 0xa2, 0x79, 0x10, 0x59, 0xdb),
+        LL(0xea, 0xea, 0x8f, 0xea, 0x03, 0x65, 0xc9, 0xe9),
+        LL(0x65, 0x65, 0x89, 0x65, 0x0f, 0xec, 0xca, 0x6a),
+        LL(0xba, 0xba, 0xd2, 0xba, 0xb9, 0x68, 0x69, 0x03),
+        LL(0x2f, 0x2f, 0xbc, 0x2f, 0x65, 0x93, 0x5e, 0x4a),
+        LL(0xc0, 0xc0, 0x27, 0xc0, 0x4e, 0xe7, 0x9d, 0x8e),
+        LL(0xde, 0xde, 0x5f, 0xde, 0xbe, 0x81, 0xa1, 0x60),
+        LL(0x1c, 0x1c, 0x70, 0x1c, 0xe0, 0x6c, 0x38, 0xfc),
+        LL(0xfd, 0xfd, 0xd3, 0xfd, 0xbb, 0x2e, 0xe7, 0x46),
+        LL(0x4d, 0x4d, 0x29, 0x4d, 0x52, 0x64, 0x9a, 0x1f),
+        LL(0x92, 0x92, 0x72, 0x92, 0xe4, 0xe0, 0x39, 0x76),
+        LL(0x75, 0x75, 0xc9, 0x75, 0x8f, 0xbc, 0xea, 0xfa),
+        LL(0x06, 0x06, 0x18, 0x06, 0x30, 0x1e, 0x0c, 0x36),
+        LL(0x8a, 0x8a, 0x12, 0x8a, 0x24, 0x98, 0x09, 0xae),
+        LL(0xb2, 0xb2, 0xf2, 0xb2, 0xf9, 0x40, 0x79, 0x4b),
+        LL(0xe6, 0xe6, 0xbf, 0xe6, 0x63, 0x59, 0xd1, 0x85),
+        LL(0x0e, 0x0e, 0x38, 0x0e, 0x70, 0x36, 0x1c, 0x7e),
+        LL(0x1f, 0x1f, 0x7c, 0x1f, 0xf8, 0x63, 0x3e, 0xe7),
+        LL(0x62, 0x62, 0x95, 0x62, 0x37, 0xf7, 0xc4, 0x55),
+        LL(0xd4, 0xd4, 0x77, 0xd4, 0xee, 0xa3, 0xb5, 0x3a),
+        LL(0xa8, 0xa8, 0x9a, 0xa8, 0x29, 0x32, 0x4d, 0x81),
+        LL(0x96, 0x96, 0x62, 0x96, 0xc4, 0xf4, 0x31, 0x52),
+        LL(0xf9, 0xf9, 0xc3, 0xf9, 0x9b, 0x3a, 0xef, 0x62),
+        LL(0xc5, 0xc5, 0x33, 0xc5, 0x66, 0xf6, 0x97, 0xa3),
+        LL(0x25, 0x25, 0x94, 0x25, 0x35, 0xb1, 0x4a, 0x10),
+        LL(0x59, 0x59, 0x79, 0x59, 0xf2, 0x20, 0xb2, 0xab),
+        LL(0x84, 0x84, 0x2a, 0x84, 0x54, 0xae, 0x15, 0xd0),
+        LL(0x72, 0x72, 0xd5, 0x72, 0xb7, 0xa7, 0xe4, 0xc5),
+        LL(0x39, 0x39, 0xe4, 0x39, 0xd5, 0xdd, 0x72, 0xec),
+        LL(0x4c, 0x4c, 0x2d, 0x4c, 0x5a, 0x61, 0x98, 0x16),
+        LL(0x5e, 0x5e, 0x65, 0x5e, 0xca, 0x3b, 0xbc, 0x94),
+        LL(0x78, 0x78, 0xfd, 0x78, 0xe7, 0x85, 0xf0, 0x9f),
+        LL(0x38, 0x38, 0xe0, 0x38, 0xdd, 0xd8, 0x70, 0xe5),
+        LL(0x8c, 0x8c, 0x0a, 0x8c, 0x14, 0x86, 0x05, 0x98),
+        LL(0xd1, 0xd1, 0x63, 0xd1, 0xc6, 0xb2, 0xbf, 0x17),
+        LL(0xa5, 0xa5, 0xae, 0xa5, 0x41, 0x0b, 0x57, 0xe4),
+        LL(0xe2, 0xe2, 0xaf, 0xe2, 0x43, 0x4d, 0xd9, 0xa1),
+        LL(0x61, 0x61, 0x99, 0x61, 0x2f, 0xf8, 0xc2, 0x4e),
+        LL(0xb3, 0xb3, 0xf6, 0xb3, 0xf1, 0x45, 0x7b, 0x42),
+        LL(0x21, 0x21, 0x84, 0x21, 0x15, 0xa5, 0x42, 0x34),
+        LL(0x9c, 0x9c, 0x4a, 0x9c, 0x94, 0xd6, 0x25, 0x08),
+        LL(0x1e, 0x1e, 0x78, 0x1e, 0xf0, 0x66, 0x3c, 0xee),
+        LL(0x43, 0x43, 0x11, 0x43, 0x22, 0x52, 0x86, 0x61),
+        LL(0xc7, 0xc7, 0x3b, 0xc7, 0x76, 0xfc, 0x93, 0xb1),
+        LL(0xfc, 0xfc, 0xd7, 0xfc, 0xb3, 0x2b, 0xe5, 0x4f),
+        LL(0x04, 0x04, 0x10, 0x04, 0x20, 0x14, 0x08, 0x24),
+        LL(0x51, 0x51, 0x59, 0x51, 0xb2, 0x08, 0xa2, 0xe3),
+        LL(0x99, 0x99, 0x5e, 0x99, 0xbc, 0xc7, 0x2f, 0x25),
+        LL(0x6d, 0x6d, 0xa9, 0x6d, 0x4f, 0xc4, 0xda, 0x22),
+        LL(0x0d, 0x0d, 0x34, 0x0d, 0x68, 0x39, 0x1a, 0x65),
+        LL(0xfa, 0xfa, 0xcf, 0xfa, 0x83, 0x35, 0xe9, 0x79),
+        LL(0xdf, 0xdf, 0x5b, 0xdf, 0xb6, 0x84, 0xa3, 0x69),
+        LL(0x7e, 0x7e, 0xe5, 0x7e, 0xd7, 0x9b, 0xfc, 0xa9),
+        LL(0x24, 0x24, 0x90, 0x24, 0x3d, 0xb4, 0x48, 0x19),
+        LL(0x3b, 0x3b, 0xec, 0x3b, 0xc5, 0xd7, 0x76, 0xfe),
+        LL(0xab, 0xab, 0x96, 0xab, 0x31, 0x3d, 0x4b, 0x9a),
+        LL(0xce, 0xce, 0x1f, 0xce, 0x3e, 0xd1, 0x81, 0xf0),
+        LL(0x11, 0x11, 0x44, 0x11, 0x88, 0x55, 0x22, 0x99),
+        LL(0x8f, 0x8f, 0x06, 0x8f, 0x0c, 0x89, 0x03, 0x83),
+        LL(0x4e, 0x4e, 0x25, 0x4e, 0x4a, 0x6b, 0x9c, 0x04),
+        LL(0xb7, 0xb7, 0xe6, 0xb7, 0xd1, 0x51, 0x73, 0x66),
+        LL(0xeb, 0xeb, 0x8b, 0xeb, 0x0b, 0x60, 0xcb, 0xe0),
+        LL(0x3c, 0x3c, 0xf0, 0x3c, 0xfd, 0xcc, 0x78, 0xc1),
+        LL(0x81, 0x81, 0x3e, 0x81, 0x7c, 0xbf, 0x1f, 0xfd),
+        LL(0x94, 0x94, 0x6a, 0x94, 0xd4, 0xfe, 0x35, 0x40),
+        LL(0xf7, 0xf7, 0xfb, 0xf7, 0xeb, 0x0c, 0xf3, 0x1c),
+        LL(0xb9, 0xb9, 0xde, 0xb9, 0xa1, 0x67, 0x6f, 0x18),
+        LL(0x13, 0x13, 0x4c, 0x13, 0x98, 0x5f, 0x26, 0x8b),
+        LL(0x2c, 0x2c, 0xb0, 0x2c, 0x7d, 0x9c, 0x58, 0x51),
+        LL(0xd3, 0xd3, 0x6b, 0xd3, 0xd6, 0xb8, 0xbb, 0x05),
+        LL(0xe7, 0xe7, 0xbb, 0xe7, 0x6b, 0x5c, 0xd3, 0x8c),
+        LL(0x6e, 0x6e, 0xa5, 0x6e, 0x57, 0xcb, 0xdc, 0x39),
+        LL(0xc4, 0xc4, 0x37, 0xc4, 0x6e, 0xf3, 0x95, 0xaa),
+        LL(0x03, 0x03, 0x0c, 0x03, 0x18, 0x0f, 0x06, 0x1b),
+        LL(0x56, 0x56, 0x45, 0x56, 0x8a, 0x13, 0xac, 0xdc),
+        LL(0x44, 0x44, 0x0d, 0x44, 0x1a, 0x49, 0x88, 0x5e),
+        LL(0x7f, 0x7f, 0xe1, 0x7f, 0xdf, 0x9e, 0xfe, 0xa0),
+        LL(0xa9, 0xa9, 0x9e, 0xa9, 0x21, 0x37, 0x4f, 0x88),
+        LL(0x2a, 0x2a, 0xa8, 0x2a, 0x4d, 0x82, 0x54, 0x67),
+        LL(0xbb, 0xbb, 0xd6, 0xbb, 0xb1, 0x6d, 0x6b, 0x0a),
+        LL(0xc1, 0xc1, 0x23, 0xc1, 0x46, 0xe2, 0x9f, 0x87),
+        LL(0x53, 0x53, 0x51, 0x53, 0xa2, 0x02, 0xa6, 0xf1),
+        LL(0xdc, 0xdc, 0x57, 0xdc, 0xae, 0x8b, 0xa5, 0x72),
+        LL(0x0b, 0x0b, 0x2c, 0x0b, 0x58, 0x27, 0x16, 0x53),
+        LL(0x9d, 0x9d, 0x4e, 0x9d, 0x9c, 0xd3, 0x27, 0x01),
+        LL(0x6c, 0x6c, 0xad, 0x6c, 0x47, 0xc1, 0xd8, 0x2b),
+        LL(0x31, 0x31, 0xc4, 0x31, 0x95, 0xf5, 0x62, 0xa4),
+        LL(0x74, 0x74, 0xcd, 0x74, 0x87, 0xb9, 0xe8, 0xf3),
+        LL(0xf6, 0xf6, 0xff, 0xf6, 0xe3, 0x09, 0xf1, 0x15),
+        LL(0x46, 0x46, 0x05, 0x46, 0x0a, 0x43, 0x8c, 0x4c),
+        LL(0xac, 0xac, 0x8a, 0xac, 0x09, 0x26, 0x45, 0xa5),
+        LL(0x89, 0x89, 0x1e, 0x89, 0x3c, 0x97, 0x0f, 0xb5),
+        LL(0x14, 0x14, 0x50, 0x14, 0xa0, 0x44, 0x28, 0xb4),
+        LL(0xe1, 0xe1, 0xa3, 0xe1, 0x5b, 0x42, 0xdf, 0xba),
+        LL(0x16, 0x16, 0x58, 0x16, 0xb0, 0x4e, 0x2c, 0xa6),
+        LL(0x3a, 0x3a, 0xe8, 0x3a, 0xcd, 0xd2, 0x74, 0xf7),
+        LL(0x69, 0x69, 0xb9, 0x69, 0x6f, 0xd0, 0xd2, 0x06),
+        LL(0x09, 0x09, 0x24, 0x09, 0x48, 0x2d, 0x12, 0x41),
+        LL(0x70, 0x70, 0xdd, 0x70, 0xa7, 0xad, 0xe0, 0xd7),
+        LL(0xb6, 0xb6, 0xe2, 0xb6, 0xd9, 0x54, 0x71, 0x6f),
+        LL(0xd0, 0xd0, 0x67, 0xd0, 0xce, 0xb7, 0xbd, 0x1e),
+        LL(0xed, 0xed, 0x93, 0xed, 0x3b, 0x7e, 0xc7, 0xd6),
+        LL(0xcc, 0xcc, 0x17, 0xcc, 0x2e, 0xdb, 0x85, 0xe2),
+        LL(0x42, 0x42, 0x15, 0x42, 0x2a, 0x57, 0x84, 0x68),
+        LL(0x98, 0x98, 0x5a, 0x98, 0xb4, 0xc2, 0x2d, 0x2c),
+        LL(0xa4, 0xa4, 0xaa, 0xa4, 0x49, 0x0e, 0x55, 0xed),
+        LL(0x28, 0x28, 0xa0, 0x28, 0x5d, 0x88, 0x50, 0x75),
+        LL(0x5c, 0x5c, 0x6d, 0x5c, 0xda, 0x31, 0xb8, 0x86),
+        LL(0xf8, 0xf8, 0xc7, 0xf8, 0x93, 0x3f, 0xed, 0x6b),
+        LL(0x86, 0x86, 0x22, 0x86, 0x44, 0xa4, 0x11, 0xc2),
+#define RC (&(Cx.q[256 * N]))
+        0x18, 0x23, 0xc6, 0xe8, 0x87, 0xb8, 0x01, 0x4f,
+        /* rc[ROUNDS] */
+        0x36, 0xa6, 0xd2, 0xf5, 0x79, 0x6f, 0x91, 0x52, 0x60, 0xbc, 0x9b,
+        0x8e, 0xa3, 0x0c, 0x7b, 0x35, 0x1d, 0xe0, 0xd7, 0xc2, 0x2e, 0x4b,
+        0xfe, 0x57, 0x15, 0x77, 0x37, 0xe5, 0x9f, 0xf0, 0x4a, 0xda, 0x58,
+        0xc9, 0x29, 0x0a, 0xb1, 0xa0, 0x6b, 0x85, 0xbd, 0x5d, 0x10, 0xf4,
+        0xcb, 0x3e, 0x05, 0x67, 0xe4, 0x27, 0x41, 0x8b, 0xa7, 0x7d, 0x95,
+        0xd8, 0xfb, 0xee, 0x7c, 0x66, 0xdd, 0x17, 0x47, 0x9e, 0xca, 0x2d,
+        0xbf, 0x07, 0xad, 0x5a, 0x83, 0x33 }
+};
 
 void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
 {
@@ -518,17 +515,11 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
         for (r = 0; r < ROUNDS; r++) {
             for (i = 0; i < 8; i++) {
                 L[i] = i ? 0 : RC[r];
-                L[i] ^= C0(K, i) ^ C1(K, (i - 1) & 7) ^
-                    C2(K, (i - 2) & 7) ^ C3(K, (i - 3) & 7) ^
-                    C4(K, (i - 4) & 7) ^ C5(K, (i - 5) & 7) ^
-                    C6(K, (i - 6) & 7) ^ C7(K, (i - 7) & 7);
+                L[i] ^= C0(K, i) ^ C1(K, (i - 1) & 7) ^ C2(K, (i - 2) & 7) ^ C3(K, (i - 3) & 7) ^ C4(K, (i - 4) & 7) ^ C5(K, (i - 5) & 7) ^ C6(K, (i - 6) & 7) ^ C7(K, (i - 7) & 7);
             }
             memcpy(K.q, L, 64);
             for (i = 0; i < 8; i++) {
-                L[i] ^= C0(S, i) ^ C1(S, (i - 1) & 7) ^
-                    C2(S, (i - 2) & 7) ^ C3(S, (i - 3) & 7) ^
-                    C4(S, (i - 4) & 7) ^ C5(S, (i - 5) & 7) ^
-                    C6(S, (i - 6) & 7) ^ C7(S, (i - 7) & 7);
+                L[i] ^= C0(S, i) ^ C1(S, (i - 1) & 7) ^ C2(S, (i - 2) & 7) ^ C3(S, (i - 3) & 7) ^ C4(S, (i - 4) & 7) ^ C5(S, (i - 5) & 7) ^ C6(S, (i - 6) & 7) ^ C7(S, (i - 7) & 7);
             }
             memcpy(S.q, L, 64);
         }
@@ -537,7 +528,7 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
 #else
         u64 L0, L1, L2, L3, L4, L5, L6, L7;
 
-# ifdef STRICT_ALIGNMENT
+#ifdef STRICT_ALIGNMENT
         if ((size_t)p & 7) {
             memcpy(S.c, p, 64);
             S.q[0] ^= (K.q[0] = H->q[0]);
@@ -549,7 +540,7 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
             S.q[6] ^= (K.q[6] = H->q[6]);
             S.q[7] ^= (K.q[7] = H->q[7]);
         } else
-# endif
+#endif
         {
             const u64_aX *pa = (const u64_aX *)p;
             S.q[0] = (K.q[0] = H->q[0]) ^ pa[0];
@@ -563,23 +554,15 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
         }
 
         for (r = 0; r < ROUNDS; r++) {
-# ifdef SMALL_REGISTER_BANK
-            L0 = C0(K, 0) ^ C1(K, 7) ^ C2(K, 6) ^ C3(K, 5) ^
-                C4(K, 4) ^ C5(K, 3) ^ C6(K, 2) ^ C7(K, 1) ^ RC[r];
-            L1 = C0(K, 1) ^ C1(K, 0) ^ C2(K, 7) ^ C3(K, 6) ^
-                C4(K, 5) ^ C5(K, 4) ^ C6(K, 3) ^ C7(K, 2);
-            L2 = C0(K, 2) ^ C1(K, 1) ^ C2(K, 0) ^ C3(K, 7) ^
-                C4(K, 6) ^ C5(K, 5) ^ C6(K, 4) ^ C7(K, 3);
-            L3 = C0(K, 3) ^ C1(K, 2) ^ C2(K, 1) ^ C3(K, 0) ^
-                C4(K, 7) ^ C5(K, 6) ^ C6(K, 5) ^ C7(K, 4);
-            L4 = C0(K, 4) ^ C1(K, 3) ^ C2(K, 2) ^ C3(K, 1) ^
-                C4(K, 0) ^ C5(K, 7) ^ C6(K, 6) ^ C7(K, 5);
-            L5 = C0(K, 5) ^ C1(K, 4) ^ C2(K, 3) ^ C3(K, 2) ^
-                C4(K, 1) ^ C5(K, 0) ^ C6(K, 7) ^ C7(K, 6);
-            L6 = C0(K, 6) ^ C1(K, 5) ^ C2(K, 4) ^ C3(K, 3) ^
-                C4(K, 2) ^ C5(K, 1) ^ C6(K, 0) ^ C7(K, 7);
-            L7 = C0(K, 7) ^ C1(K, 6) ^ C2(K, 5) ^ C3(K, 4) ^
-                C4(K, 3) ^ C5(K, 2) ^ C6(K, 1) ^ C7(K, 0);
+#ifdef SMALL_REGISTER_BANK
+            L0 = C0(K, 0) ^ C1(K, 7) ^ C2(K, 6) ^ C3(K, 5) ^ C4(K, 4) ^ C5(K, 3) ^ C6(K, 2) ^ C7(K, 1) ^ RC[r];
+            L1 = C0(K, 1) ^ C1(K, 0) ^ C2(K, 7) ^ C3(K, 6) ^ C4(K, 5) ^ C5(K, 4) ^ C6(K, 3) ^ C7(K, 2);
+            L2 = C0(K, 2) ^ C1(K, 1) ^ C2(K, 0) ^ C3(K, 7) ^ C4(K, 6) ^ C5(K, 5) ^ C6(K, 4) ^ C7(K, 3);
+            L3 = C0(K, 3) ^ C1(K, 2) ^ C2(K, 1) ^ C3(K, 0) ^ C4(K, 7) ^ C5(K, 6) ^ C6(K, 5) ^ C7(K, 4);
+            L4 = C0(K, 4) ^ C1(K, 3) ^ C2(K, 2) ^ C3(K, 1) ^ C4(K, 0) ^ C5(K, 7) ^ C6(K, 6) ^ C7(K, 5);
+            L5 = C0(K, 5) ^ C1(K, 4) ^ C2(K, 3) ^ C3(K, 2) ^ C4(K, 1) ^ C5(K, 0) ^ C6(K, 7) ^ C7(K, 6);
+            L6 = C0(K, 6) ^ C1(K, 5) ^ C2(K, 4) ^ C3(K, 3) ^ C4(K, 2) ^ C5(K, 1) ^ C6(K, 0) ^ C7(K, 7);
+            L7 = C0(K, 7) ^ C1(K, 6) ^ C2(K, 5) ^ C3(K, 4) ^ C4(K, 3) ^ C5(K, 2) ^ C6(K, 1) ^ C7(K, 0);
 
             K.q[0] = L0;
             K.q[1] = L1;
@@ -590,22 +573,14 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
             K.q[6] = L6;
             K.q[7] = L7;
 
-            L0 ^= C0(S, 0) ^ C1(S, 7) ^ C2(S, 6) ^ C3(S, 5) ^
-                C4(S, 4) ^ C5(S, 3) ^ C6(S, 2) ^ C7(S, 1);
-            L1 ^= C0(S, 1) ^ C1(S, 0) ^ C2(S, 7) ^ C3(S, 6) ^
-                C4(S, 5) ^ C5(S, 4) ^ C6(S, 3) ^ C7(S, 2);
-            L2 ^= C0(S, 2) ^ C1(S, 1) ^ C2(S, 0) ^ C3(S, 7) ^
-                C4(S, 6) ^ C5(S, 5) ^ C6(S, 4) ^ C7(S, 3);
-            L3 ^= C0(S, 3) ^ C1(S, 2) ^ C2(S, 1) ^ C3(S, 0) ^
-                C4(S, 7) ^ C5(S, 6) ^ C6(S, 5) ^ C7(S, 4);
-            L4 ^= C0(S, 4) ^ C1(S, 3) ^ C2(S, 2) ^ C3(S, 1) ^
-                C4(S, 0) ^ C5(S, 7) ^ C6(S, 6) ^ C7(S, 5);
-            L5 ^= C0(S, 5) ^ C1(S, 4) ^ C2(S, 3) ^ C3(S, 2) ^
-                C4(S, 1) ^ C5(S, 0) ^ C6(S, 7) ^ C7(S, 6);
-            L6 ^= C0(S, 6) ^ C1(S, 5) ^ C2(S, 4) ^ C3(S, 3) ^
-                C4(S, 2) ^ C5(S, 1) ^ C6(S, 0) ^ C7(S, 7);
-            L7 ^= C0(S, 7) ^ C1(S, 6) ^ C2(S, 5) ^ C3(S, 4) ^
-                C4(S, 3) ^ C5(S, 2) ^ C6(S, 1) ^ C7(S, 0);
+            L0 ^= C0(S, 0) ^ C1(S, 7) ^ C2(S, 6) ^ C3(S, 5) ^ C4(S, 4) ^ C5(S, 3) ^ C6(S, 2) ^ C7(S, 1);
+            L1 ^= C0(S, 1) ^ C1(S, 0) ^ C2(S, 7) ^ C3(S, 6) ^ C4(S, 5) ^ C5(S, 4) ^ C6(S, 3) ^ C7(S, 2);
+            L2 ^= C0(S, 2) ^ C1(S, 1) ^ C2(S, 0) ^ C3(S, 7) ^ C4(S, 6) ^ C5(S, 5) ^ C6(S, 4) ^ C7(S, 3);
+            L3 ^= C0(S, 3) ^ C1(S, 2) ^ C2(S, 1) ^ C3(S, 0) ^ C4(S, 7) ^ C5(S, 6) ^ C6(S, 5) ^ C7(S, 4);
+            L4 ^= C0(S, 4) ^ C1(S, 3) ^ C2(S, 2) ^ C3(S, 1) ^ C4(S, 0) ^ C5(S, 7) ^ C6(S, 6) ^ C7(S, 5);
+            L5 ^= C0(S, 5) ^ C1(S, 4) ^ C2(S, 3) ^ C3(S, 2) ^ C4(S, 1) ^ C5(S, 0) ^ C6(S, 7) ^ C7(S, 6);
+            L6 ^= C0(S, 6) ^ C1(S, 5) ^ C2(S, 4) ^ C3(S, 3) ^ C4(S, 2) ^ C5(S, 1) ^ C6(S, 0) ^ C7(S, 7);
+            L7 ^= C0(S, 7) ^ C1(S, 6) ^ C2(S, 5) ^ C3(S, 4) ^ C4(S, 3) ^ C5(S, 2) ^ C6(S, 1) ^ C7(S, 0);
 
             S.q[0] = L0;
             S.q[1] = L1;
@@ -615,7 +590,7 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
             S.q[5] = L5;
             S.q[6] = L6;
             S.q[7] = L7;
-# else
+#else
             L0 = C0(K, 0);
             L1 = C1(K, 0);
             L2 = C2(K, 0);
@@ -778,16 +753,16 @@ void whirlpool_block(WHIRLPOOL_CTX *ctx, const void *inp, size_t n)
             S.q[5] = L5;
             S.q[6] = L6;
             S.q[7] = L7;
-# endif
+#endif
         }
 
-# ifdef STRICT_ALIGNMENT
+#ifdef STRICT_ALIGNMENT
         if ((size_t)p & 7) {
             int i;
             for (i = 0; i < 64; i++)
                 H->c[i] ^= S.c[i] ^ p[i];
         } else
-# endif
+#endif
         {
             const u64_aX *pa = (const u64_aX *)p;
             H->q[0] ^= S.q[0] ^ pa[0];
diff --git a/crypto/whrlpool/wp_dgst.c b/crypto/whrlpool/wp_dgst.c
index 3f970deb9c7be..beb29c6968633 100644
--- a/crypto/whrlpool/wp_dgst.c
+++ b/crypto/whrlpool/wp_dgst.c
@@ -93,7 +93,7 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
 {
     size_t n;
     unsigned int bitoff = c->bitoff,
-        bitrem = bitoff % 8, inpgap = (8 - (unsigned int)bits % 8) & 7;
+                 bitrem = bitoff % 8, inpgap = (8 - (unsigned int)bits % 8) & 7;
     const unsigned char *inp = _inp;
 
     /*
@@ -102,15 +102,15 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
      * to detect overflows.
      */
     c->bitlen[0] += bits;
-    if (c->bitlen[0] < bits) {  /* overflow */
+    if (c->bitlen[0] < bits) { /* overflow */
         n = 1;
         do {
             c->bitlen[n]++;
         } while (c->bitlen[n] == 0
-                 && ++n < (WHIRLPOOL_COUNTER / sizeof(size_t)));
+            && ++n < (WHIRLPOOL_COUNTER / sizeof(size_t)));
     }
 #ifndef OPENSSL_SMALL_FOOTPRINT
- reconsider:
+reconsider:
     if (inpgap == 0 && bitrem == 0) { /* byte-oriented loop */
         while (bits) {
             if (bitoff == 0 && (n = bits / WHIRLPOOL_BBLOCK)) {
@@ -136,7 +136,7 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
                 c->bitoff = bitoff;
             }
         }
-    } else                      /* bit-oriented loop */
+    } else /* bit-oriented loop */
 #endif
     {
         /*-
@@ -160,9 +160,9 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
                 c->data[byteoff++] |= inp[0] & (0xff >> inpgap);
                 inpgap = 8 - inpgap;
                 bitoff += inpgap;
-                bitrem = 0;     /* bitoff%8 */
+                bitrem = 0; /* bitoff%8 */
                 bits -= inpgap;
-                inpgap = 0;     /* bits%8 */
+                inpgap = 0; /* bits%8 */
                 inp++;
                 if (bitoff == WHIRLPOOL_BBLOCK) {
                     whirlpool_block(c, c->data, 1);
@@ -172,7 +172,7 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
                 goto reconsider;
             } else
 #endif
-            if (bits > 8) {
+                if (bits > 8) {
                 b = ((inp[0] << inpgap) | (inp[1] >> (8 - inpgap)));
                 b &= 0xff;
                 if (bitrem)
@@ -189,7 +189,7 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
                 }
                 if (bitrem)
                     c->data[byteoff] = b << (8 - bitrem);
-            } else {            /* remaining less than or equal to 8 bits */
+            } else { /* remaining less than or equal to 8 bits */
 
                 b = (inp[0] << inpgap) & 0xff;
                 if (bitrem)
@@ -233,7 +233,7 @@ int WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c)
     }
     if (byteoff < (WHIRLPOOL_BBLOCK / 8 - WHIRLPOOL_COUNTER))
         memset(&c->data[byteoff], 0,
-               (WHIRLPOOL_BBLOCK / 8 - WHIRLPOOL_COUNTER) - byteoff);
+            (WHIRLPOOL_BBLOCK / 8 - WHIRLPOOL_COUNTER) - byteoff);
     /* smash 256-bit c->bitlen in big-endian order */
     p = &c->data[WHIRLPOOL_BBLOCK / 8 - 1]; /* last byte in c->data */
     for (i = 0; i < WHIRLPOOL_COUNTER / sizeof(size_t); i++)
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index bdcdc4555bdcf..e8b7ca152b2c2 100644
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -7,13 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 
-#if defined (__TANDEM) && defined (_SPT_MODEL_)
-  /*
-   * These definitions have to come first in SPT due to scoping of the
-   * declarations in c99 associated with SPT use of stat.
-   */
-# include <sys/types.h>
-# include <sys/stat.h>
+#if defined(__TANDEM) && defined(_SPT_MODEL_)
+/*
+ * These definitions have to come first in SPT due to scoping of the
+ * declarations in c99 associated with SPT use of stat.
+ */
+#include <sys/types.h>
+#include <sys/stat.h>
 #endif
 
 #include "internal/e_os.h"
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 
 #ifndef OPENSSL_NO_POSIX_IO
-# include <sys/stat.h>
+#include <sys/stat.h>
 #endif
 
 #include <openssl/x509.h>
@@ -49,29 +49,29 @@ typedef struct lookup_dir_st {
 } BY_DIR;
 
 static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
-                    char **retp);
+    char **retp);
 
 static int new_dir(X509_LOOKUP *lu);
 static void free_dir(X509_LOOKUP *lu);
 static int add_cert_dir(BY_DIR *ctx, const char *dir, int type);
 static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
-                               const X509_NAME *name, X509_OBJECT *ret);
+    const X509_NAME *name, X509_OBJECT *ret);
 static int get_cert_by_subject_ex(X509_LOOKUP *xl, 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);
 static X509_LOOKUP_METHOD x509_dir_lookup = {
     "Load certs from files in a directory",
-    new_dir,                         /* new_item */
-    free_dir,                        /* free */
-    NULL,                            /* init */
-    NULL,                            /* shutdown */
-    dir_ctrl,                        /* ctrl */
-    get_cert_by_subject,             /* get_by_subject */
-    NULL,                            /* get_by_issuer_serial */
-    NULL,                            /* get_by_fingerprint */
-    NULL,                            /* get_by_alias */
-    get_cert_by_subject_ex,          /* get_by_subject_ex */
-    NULL,                            /* ctrl_ex */
+    new_dir, /* new_item */
+    free_dir, /* free */
+    NULL, /* init */
+    NULL, /* shutdown */
+    dir_ctrl, /* ctrl */
+    get_cert_by_subject, /* get_by_subject */
+    NULL, /* get_by_issuer_serial */
+    NULL, /* get_by_fingerprint */
+    NULL, /* get_by_alias */
+    get_cert_by_subject_ex, /* get_by_subject_ex */
+    NULL, /* ctrl_ex */
 };
 
 X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void)
@@ -80,7 +80,7 @@ X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void)
 }
 
 static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
-                    char **retp)
+    char **retp)
 {
     int ret = 0;
     BY_DIR *ld = (BY_DIR *)ctx->method_data;
@@ -94,7 +94,7 @@ static int dir_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
                 ret = add_cert_dir(ld, dir, X509_FILETYPE_PEM);
             else
                 ret = add_cert_dir(ld, X509_get_default_cert_dir(),
-                                   X509_FILETYPE_PEM);
+                    X509_FILETYPE_PEM);
             if (!ret) {
                 ERR_raise(ERR_LIB_X509, X509_R_LOADING_CERT_DIR);
             }
@@ -126,7 +126,7 @@ static int new_dir(X509_LOOKUP *lu)
     lu->method_data = a;
     return 1;
 
- err:
+err:
     OPENSSL_free(a);
     return 0;
 }
@@ -137,7 +137,7 @@ static void by_dir_hash_free(BY_DIR_HASH *hash)
 }
 
 static int by_dir_hash_cmp(const BY_DIR_HASH *const *a,
-                           const BY_DIR_HASH *const *b)
+    const BY_DIR_HASH *const *b)
 {
     if ((*a)->hash > (*b)->hash)
         return 1;
@@ -220,8 +220,8 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
 }
 
 static int get_cert_by_subject_ex(X509_LOOKUP *xl, 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)
 {
     BY_DIR *ctx;
     union {
@@ -311,17 +311,17 @@ static int get_cert_by_subject_ex(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
                  * should be added.
                  */
                 BIO_snprintf(b->data, b->max,
-                             "%s%08lx.%s%d", ent->dir, h, postfix, k);
+                    "%s%08lx.%s%d", ent->dir, h, postfix, k);
             } else
 #endif
             {
                 BIO_snprintf(b->data, b->max,
-                             "%s%c%08lx.%s%d", ent->dir, c, h, postfix, k);
+                    "%s%c%08lx.%s%d", ent->dir, c, h, postfix, k);
             }
 #ifndef OPENSSL_NO_POSIX_IO
-# ifdef _WIN32
-#  define stat _stat
-# endif
+#ifdef _WIN32
+#define stat _stat
+#endif
             {
                 struct stat st;
                 if (stat(b->data, &st) < 0)
@@ -331,7 +331,8 @@ static int get_cert_by_subject_ex(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
             /* found one. */
             if (type == X509_LU_X509) {
                 if ((X509_load_cert_file_ex(xl, b->data, ent->dir_type, libctx,
-                                            propq)) == 0)
+                        propq))
+                    == 0)
                     break;
             } else if (type == X509_LU_CRL) {
                 if ((X509_load_crl_file(xl, b->data, ent->dir_type)) == 0)
@@ -401,7 +402,6 @@ static int get_cert_by_subject_ex(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
             }
 
             CRYPTO_THREAD_unlock(ctx->lock);
-
         }
 
         if (tmp != NULL) {
@@ -418,7 +418,7 @@ static int get_cert_by_subject_ex(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
             goto finish;
         }
     }
- finish:
+finish:
     /* If we changed anything, resort the objects for faster lookup */
     if (X509_STORE_lock(xl->store_ctx)) {
         if (!sk_X509_OBJECT_is_sorted(xl->store_ctx->objs)) {
@@ -432,7 +432,7 @@ static int get_cert_by_subject_ex(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
 }
 
 static int get_cert_by_subject(X509_LOOKUP *xl, X509_LOOKUP_TYPE type,
-                               const X509_NAME *name, X509_OBJECT *ret)
+    const X509_NAME *name, X509_OBJECT *ret)
 {
     return get_cert_by_subject_ex(xl, type, name, ret, NULL, NULL);
 }
diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
index f594ab3cf2452..5c99557649ec7 100644
--- a/crypto/x509/by_file.c
+++ b/crypto/x509/by_file.c
@@ -18,25 +18,24 @@
 #include "x509_local.h"
 
 static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
-                        long argl, char **ret);
+    long argl, char **ret);
 static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argc,
-                           long argl, char **ret, OSSL_LIB_CTX *libctx,
-                           const char *propq);
-
+    long argl, char **ret, OSSL_LIB_CTX *libctx,
+    const char *propq);
 
 static X509_LOOKUP_METHOD x509_file_lookup = {
     "Load file into cache",
-    NULL,                       /* new_item */
-    NULL,                       /* free */
-    NULL,                       /* init */
-    NULL,                       /* shutdown */
-    by_file_ctrl,               /* ctrl */
-    NULL,                       /* get_by_subject */
-    NULL,                       /* get_by_issuer_serial */
-    NULL,                       /* get_by_fingerprint */
-    NULL,                       /* get_by_alias */
-    NULL,                       /* get_by_subject_ex */
-    by_file_ctrl_ex,            /* ctrl_ex */
+    NULL, /* new_item */
+    NULL, /* free */
+    NULL, /* init */
+    NULL, /* shutdown */
+    by_file_ctrl, /* ctrl */
+    NULL, /* get_by_subject */
+    NULL, /* get_by_issuer_serial */
+    NULL, /* get_by_fingerprint */
+    NULL, /* get_by_alias */
+    NULL, /* get_by_subject_ex */
+    by_file_ctrl_ex, /* ctrl_ex */
 };
 
 X509_LOOKUP_METHOD *X509_LOOKUP_file(void)
@@ -45,8 +44,8 @@ X509_LOOKUP_METHOD *X509_LOOKUP_file(void)
 }
 
 static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
-                           long argl, char **ret, OSSL_LIB_CTX *libctx,
-                           const char *propq)
+    long argl, char **ret, OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     int ok = 0;
     const char *file;
@@ -57,21 +56,25 @@ static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
             file = ossl_safe_getenv(X509_get_default_cert_file_env());
             if (file)
                 ok = (X509_load_cert_crl_file_ex(ctx, file, X509_FILETYPE_PEM,
-                                                 libctx, propq) != 0);
+                          libctx, propq)
+                    != 0);
             else
                 ok = (X509_load_cert_crl_file_ex(
-                         ctx, X509_get_default_cert_file(),
-                         X509_FILETYPE_PEM, libctx, propq) != 0);
+                          ctx, X509_get_default_cert_file(),
+                          X509_FILETYPE_PEM, libctx, propq)
+                    != 0);
 
             if (!ok)
                 ERR_raise(ERR_LIB_X509, X509_R_LOADING_DEFAULTS);
         } else {
             if (argl == X509_FILETYPE_PEM)
                 ok = (X509_load_cert_crl_file_ex(ctx, argp, X509_FILETYPE_PEM,
-                                                 libctx, propq) != 0);
+                          libctx, propq)
+                    != 0);
             else
                 ok = (X509_load_cert_file_ex(ctx, argp, (int)argl, libctx,
-                                             propq) != 0);
+                          propq)
+                    != 0);
         }
         break;
     }
@@ -79,13 +82,13 @@ static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
 }
 
 static int by_file_ctrl(X509_LOOKUP *ctx, int cmd,
-                        const char *argp, long argl, char **ret)
+    const char *argp, long argl, char **ret)
 {
     return by_file_ctrl_ex(ctx, cmd, argp, argl, ret, NULL, NULL);
 }
 
 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)
 {
     BIO *in = NULL;
     int count = 0;
@@ -113,8 +116,7 @@ int X509_load_cert_file_ex(X509_LOOKUP *ctx, const char *file, int type,
         for (;;) {
             ERR_set_mark();
             if (PEM_read_bio_X509_AUX(in, &x, NULL, "") == NULL) {
-                if ((ERR_GET_REASON(ERR_peek_last_error()) ==
-                     PEM_R_NO_START_LINE) && (count > 0)) {
+                if ((ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) && (count > 0)) {
                     ERR_pop_to_mark();
                     break;
                 } else {
@@ -156,7 +158,7 @@ int X509_load_cert_file_ex(X509_LOOKUP *ctx, const char *file, int type,
         ERR_raise(ERR_LIB_X509, X509_R_BAD_X509_FILETYPE);
         goto err;
     }
- err:
+err:
     X509_free(x);
     BIO_free(in);
     return count;
@@ -189,8 +191,7 @@ int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
         for (;;) {
             x = PEM_read_bio_X509_CRL(in, NULL, NULL, "");
             if (x == NULL) {
-                if ((ERR_GET_REASON(ERR_peek_last_error()) ==
-                     PEM_R_NO_START_LINE) && (count > 0)) {
+                if ((ERR_GET_REASON(ERR_peek_last_error()) == PEM_R_NO_START_LINE) && (count > 0)) {
                     ERR_clear_error();
                     break;
                 } else {
@@ -222,14 +223,14 @@ int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
         ERR_raise(ERR_LIB_X509, X509_R_BAD_X509_FILETYPE);
         goto err;
     }
- err:
+err:
     X509_CRL_free(x);
     BIO_free(in);
     return count;
 }
 
 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)
 {
     STACK_OF(X509_INFO) *inf = NULL;
     X509_INFO *itmp = NULL;
@@ -272,7 +273,7 @@ int X509_load_cert_crl_file_ex(X509_LOOKUP *ctx, const char *file, int type,
     }
     if (count == 0)
         ERR_raise(ERR_LIB_X509, X509_R_NO_CERTIFICATE_OR_CRL_FOUND);
- err:
+err:
     sk_X509_INFO_pop_free(inf, X509_INFO_free);
     return count;
 }
@@ -281,4 +282,3 @@ int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type)
 {
     return X509_load_cert_crl_file_ex(ctx, file, type, NULL, NULL);
 }
-
diff --git a/crypto/x509/by_store.c b/crypto/x509/by_store.c
index d1e186f4fc2d6..7fc8a3a545e18 100644
--- a/crypto/x509/by_store.c
+++ b/crypto/x509/by_store.c
@@ -7,22 +7,31 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include <openssl/safestack.h>
 #include <openssl/store.h>
 #include "internal/cryptlib.h"
 #include "crypto/x509.h"
 #include "x509_local.h"
 
+typedef struct cached_store_st {
+    char *uri;
+    OSSL_LIB_CTX *libctx;
+    char *propq;
+} CACHED_STORE;
+
+DEFINE_STACK_OF(CACHED_STORE)
+
 /* Generic object loader, given expected type and criterion */
-static int cache_objects(X509_LOOKUP *lctx, const char *uri,
-                         const OSSL_STORE_SEARCH *criterion,
-                         int depth, OSSL_LIB_CTX *libctx, const char *propq)
+static int cache_objects(X509_LOOKUP *lctx, CACHED_STORE *store,
+    const OSSL_STORE_SEARCH *criterion, int depth)
 {
     int ok = 0;
-    OSSL_STORE_CTX *ctx = NULL;
+    OSSL_STORE_CTX *ctx;
     X509_STORE *xstore = X509_LOOKUP_get_store(lctx);
 
-    if ((ctx = OSSL_STORE_open_ex(uri, libctx, propq, NULL, NULL, NULL,
-                                  NULL, NULL)) == NULL)
+    if ((ctx = OSSL_STORE_open_ex(store->uri, store->libctx, store->propq,
+             NULL, NULL, NULL, NULL, NULL))
+        == NULL)
         return 0;
 
     /*
@@ -62,9 +71,14 @@ static int cache_objects(X509_LOOKUP *lctx, const char *uri,
              * This is an entry in the "directory" represented by the current
              * uri.  if |depth| allows, dive into it.
              */
-            if (depth > 0)
-                ok = cache_objects(lctx, OSSL_STORE_INFO_get0_NAME(info),
-                                   criterion, depth - 1, libctx, propq);
+            if (depth > 0) {
+                CACHED_STORE substore;
+
+                substore.uri = (char *)OSSL_STORE_INFO_get0_NAME(info);
+                substore.libctx = store->libctx;
+                substore.propq = store->propq;
+                ok = cache_objects(lctx, &substore, criterion, depth - 1);
+            }
         } else {
             /*
              * We know that X509_STORE_add_{cert|crl} increments the object's
@@ -74,11 +88,11 @@ static int cache_objects(X509_LOOKUP *lctx, const char *uri,
             switch (infotype) {
             case OSSL_STORE_INFO_CERT:
                 ok = X509_STORE_add_cert(xstore,
-                                         OSSL_STORE_INFO_get0_CERT(info));
+                    OSSL_STORE_INFO_get0_CERT(info));
                 break;
             case OSSL_STORE_INFO_CRL:
                 ok = X509_STORE_add_crl(xstore,
-                                        OSSL_STORE_INFO_get0_CRL(info));
+                    OSSL_STORE_INFO_get0_CRL(info));
                 break;
             }
         }
@@ -92,47 +106,77 @@ static int cache_objects(X509_LOOKUP *lctx, const char *uri,
     return ok;
 }
 
-
-/* Because OPENSSL_free is a macro and for C type match */
-static void free_uri(OPENSSL_STRING data)
+static void free_store(CACHED_STORE *store)
 {
-    OPENSSL_free(data);
+    if (store != NULL) {
+        OPENSSL_free(store->uri);
+        OPENSSL_free(store->propq);
+        OPENSSL_free(store);
+    }
 }
 
 static void by_store_free(X509_LOOKUP *ctx)
 {
-    STACK_OF(OPENSSL_STRING) *uris = X509_LOOKUP_get_method_data(ctx);
-    sk_OPENSSL_STRING_pop_free(uris, free_uri);
+    STACK_OF(CACHED_STORE) *stores = X509_LOOKUP_get_method_data(ctx);
+    sk_CACHED_STORE_pop_free(stores, free_store);
 }
 
 static int by_store_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
-                            long argl, char **retp, OSSL_LIB_CTX *libctx,
-                            const char *propq)
+    long argl, char **retp, OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     switch (cmd) {
     case X509_L_ADD_STORE:
         if (argp != NULL) {
-            STACK_OF(OPENSSL_STRING) *uris = X509_LOOKUP_get_method_data(ctx);
-            char *data = OPENSSL_strdup(argp);
+            STACK_OF(CACHED_STORE) *stores = X509_LOOKUP_get_method_data(ctx);
+            CACHED_STORE *store = OPENSSL_zalloc(sizeof(*store));
+            OSSL_STORE_CTX *sctx;
 
-            if (data == NULL) {
+            if (store == NULL) {
                 return 0;
             }
-            if (uris == NULL) {
-                uris = sk_OPENSSL_STRING_new_null();
-                X509_LOOKUP_set_method_data(ctx, uris);
+
+            store->uri = OPENSSL_strdup(argp);
+            store->libctx = libctx;
+            if (propq != NULL)
+                store->propq = OPENSSL_strdup(propq);
+            /*
+             * We open this to check for errors now - so we can report those
+             * errors early.
+             */
+            sctx = OSSL_STORE_open_ex(argp, libctx, propq, NULL, NULL,
+                NULL, NULL, NULL);
+            if (sctx == NULL
+                || (propq != NULL && store->propq == NULL)
+                || store->uri == NULL) {
+                OSSL_STORE_close(sctx);
+                free_store(store);
+                return 0;
             }
-            if (sk_OPENSSL_STRING_push(uris, data) <= 0) {
-                OPENSSL_free(data);
+            OSSL_STORE_close(sctx);
+
+            if (stores == NULL) {
+                stores = sk_CACHED_STORE_new_null();
+                if (stores != NULL)
+                    X509_LOOKUP_set_method_data(ctx, stores);
+            }
+            if (stores == NULL || sk_CACHED_STORE_push(stores, store) <= 0) {
+                free_store(store);
                 return 0;
             }
             return 1;
         }
         /* NOP if no URI is given. */
         return 1;
-    case X509_L_LOAD_STORE:
+    case X509_L_LOAD_STORE: {
         /* This is a shortcut for quick loading of specific containers */
-        return cache_objects(ctx, argp, NULL, 0, libctx, propq);
+        CACHED_STORE store;
+
+        store.uri = (char *)argp;
+        store.libctx = libctx;
+        store.propq = (char *)propq;
+        return cache_objects(ctx, &store, NULL, 0);
+    }
     default:
         /* Unsupported command */
         return 0;
@@ -140,22 +184,21 @@ static int by_store_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp,
 }
 
 static int by_store_ctrl(X509_LOOKUP *ctx, int cmd,
-                         const char *argp, long argl, char **retp)
+    const char *argp, long argl, char **retp)
 {
     return by_store_ctrl_ex(ctx, cmd, argp, argl, retp, NULL, NULL);
 }
 
 static int by_store(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                    const OSSL_STORE_SEARCH *criterion, X509_OBJECT *ret,
-                    OSSL_LIB_CTX *libctx, const char *propq)
+    const OSSL_STORE_SEARCH *criterion, X509_OBJECT *ret)
 {
-    STACK_OF(OPENSSL_STRING) *uris = X509_LOOKUP_get_method_data(ctx);
+    STACK_OF(CACHED_STORE) *stores = X509_LOOKUP_get_method_data(ctx);
     int i;
     int ok = 0;
 
-    for (i = 0; i < sk_OPENSSL_STRING_num(uris); i++) {
-        ok = cache_objects(ctx, sk_OPENSSL_STRING_value(uris, i), criterion,
-                           1 /* depth */, libctx, propq);
+    for (i = 0; i < sk_CACHED_STORE_num(stores); i++) {
+        ok = cache_objects(ctx, sk_CACHED_STORE_value(stores, i), criterion,
+            1 /* depth */);
 
         if (ok)
             break;
@@ -163,21 +206,24 @@ static int by_store(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
     return ok;
 }
 
-static int by_store_subject_ex(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                               const X509_NAME *name, X509_OBJECT *ret,
-                               OSSL_LIB_CTX *libctx, const char *propq)
+static int by_store_subject(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
+    const X509_NAME *name, X509_OBJECT *ret)
 {
-    OSSL_STORE_SEARCH *criterion =
-        OSSL_STORE_SEARCH_by_name((X509_NAME *)name); /* won't modify it */
-    int ok = by_store(ctx, type, criterion, ret, libctx, propq);
-    STACK_OF(X509_OBJECT) *store_objects =
-        X509_STORE_get0_objects(X509_LOOKUP_get_store(ctx));
+    OSSL_STORE_SEARCH *criterion = OSSL_STORE_SEARCH_by_name((X509_NAME *)name); /* won't modify it */
+    int ok = by_store(ctx, type, criterion, ret);
+    STACK_OF(X509_OBJECT) *store_objects = X509_STORE_get0_objects(X509_LOOKUP_get_store(ctx));
     X509_OBJECT *tmp = NULL;
 
     OSSL_STORE_SEARCH_free(criterion);
 
-    if (ok)
+    if (ok) {
+        X509_STORE *store = X509_LOOKUP_get_store(ctx);
+
+        if (!ossl_x509_store_read_lock(store))
+            return 0;
         tmp = X509_OBJECT_retrieve_by_subject(store_objects, type, name);
+        X509_STORE_unlock(store);
+    }
 
     ok = 0;
     if (tmp != NULL) {
@@ -217,12 +263,6 @@ static int by_store_subject_ex(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
     return ok;
 }
 
-static int by_store_subject(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                            const X509_NAME *name, X509_OBJECT *ret)
-{
-    return by_store_subject_ex(ctx, type, name, ret, NULL, NULL);
-}
-
 /*
  * We lack the implementations for get_by_issuer_serial, get_by_fingerprint
  * and get_by_alias.  There's simply not enough support in the X509_LOOKUP
@@ -231,16 +271,16 @@ static int by_store_subject(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
 
 static X509_LOOKUP_METHOD x509_store_lookup = {
     "Load certs from STORE URIs",
-    NULL,                        /* new_item */
-    by_store_free,               /* free */
-    NULL,                        /* init */
-    NULL,                        /* shutdown */
-    by_store_ctrl,               /* ctrl */
-    by_store_subject,            /* get_by_subject */
-    NULL,                        /* get_by_issuer_serial */
-    NULL,                        /* get_by_fingerprint */
-    NULL,                        /* get_by_alias */
-    by_store_subject_ex,
+    NULL, /* new_item */
+    by_store_free, /* free */
+    NULL, /* init */
+    NULL, /* shutdown */
+    by_store_ctrl, /* ctrl */
+    by_store_subject, /* get_by_subject */
+    NULL, /* get_by_issuer_serial */
+    NULL, /* get_by_fingerprint */
+    NULL, /* get_by_alias */
+    NULL, /* get_by_subject_ex */
     by_store_ctrl_ex
 };
 
diff --git a/crypto/x509/pcy_cache.c b/crypto/x509/pcy_cache.c
index 2d1d4cd367c03..d1ee35377bda3 100644
--- a/crypto/x509/pcy_cache.c
+++ b/crypto/x509/pcy_cache.c
@@ -15,7 +15,7 @@
 #include "pcy_local.h"
 
 static int policy_data_cmp(const X509_POLICY_DATA *const *a,
-                           const X509_POLICY_DATA *const *b);
+    const X509_POLICY_DATA *const *b);
 static int policy_cache_set_int(long *out, ASN1_INTEGER *value);
 
 /*
@@ -24,7 +24,7 @@ static int policy_cache_set_int(long *out, ASN1_INTEGER *value);
  */
 
 static int policy_cache_create(X509 *x,
-                               CERTIFICATEPOLICIES *policies, int crit)
+    CERTIFICATEPOLICIES *policies, int crit)
 {
     int i, num, ret = 0;
     X509_POLICY_CACHE *cache = x->policy_cache;
@@ -54,7 +54,7 @@ static int policy_cache_create(X509 *x,
                 goto bad_policy;
             }
             cache->anyPolicy = data;
-        } else if (sk_X509_POLICY_DATA_find(cache->data, data) >=0) {
+        } else if (sk_X509_POLICY_DATA_find(cache->data, data) >= 0) {
             ret = -1;
             goto bad_policy;
         } else if (!sk_X509_POLICY_DATA_push(cache->data, data)) {
@@ -67,11 +67,11 @@ static int policy_cache_create(X509 *x,
     sk_X509_POLICY_DATA_sort(cache->data);
     ret = 1;
 
- bad_policy:
+bad_policy:
     if (ret == -1)
         x->ex_flags |= EXFLAG_INVALID_POLICY;
     ossl_policy_data_free(data);
- just_cleanup:
+just_cleanup:
     sk_POLICYINFO_pop_free(policies, POLICYINFO_free);
     if (ret <= 0) {
         sk_X509_POLICY_DATA_pop_free(cache->data, ossl_policy_data_free);
@@ -116,10 +116,10 @@ static int policy_cache_new(X509 *x)
             && !ext_pcons->inhibitPolicyMapping)
             goto bad_cache;
         if (!policy_cache_set_int(&cache->explicit_skip,
-                                  ext_pcons->requireExplicitPolicy))
+                ext_pcons->requireExplicitPolicy))
             goto bad_cache;
         if (!policy_cache_set_int(&cache->map_skip,
-                                  ext_pcons->inhibitPolicyMapping))
+                ext_pcons->inhibitPolicyMapping))
             goto bad_cache;
     }
 
@@ -165,14 +165,13 @@ static int policy_cache_new(X509 *x)
         goto bad_cache;
     goto just_cleanup;
 
- bad_cache:
+bad_cache:
     x->ex_flags |= EXFLAG_INVALID_POLICY;
 
- just_cleanup:
+just_cleanup:
     POLICY_CONSTRAINTS_free(ext_pcons);
     ASN1_INTEGER_free(ext_any);
     return 1;
-
 }
 
 void ossl_policy_cache_free(X509_POLICY_CACHE *cache)
@@ -195,11 +194,10 @@ const X509_POLICY_CACHE *ossl_policy_cache_set(X509 *x)
     }
 
     return x->policy_cache;
-
 }
 
 X509_POLICY_DATA *ossl_policy_cache_find_data(const X509_POLICY_CACHE *cache,
-                                              const ASN1_OBJECT *id)
+    const ASN1_OBJECT *id)
 {
     int idx;
     X509_POLICY_DATA tmp;
@@ -209,7 +207,7 @@ X509_POLICY_DATA *ossl_policy_cache_find_data(const X509_POLICY_CACHE *cache,
 }
 
 static int policy_data_cmp(const X509_POLICY_DATA *const *a,
-                           const X509_POLICY_DATA *const *b)
+    const X509_POLICY_DATA *const *b)
 {
     return OBJ_cmp((*a)->valid_policy, (*b)->valid_policy);
 }
diff --git a/crypto/x509/pcy_data.c b/crypto/x509/pcy_data.c
index 8e8b91a781358..dda2ed2a534d7 100644
--- a/crypto/x509/pcy_data.c
+++ b/crypto/x509/pcy_data.c
@@ -36,7 +36,7 @@ void ossl_policy_data_free(X509_POLICY_DATA *data)
  */
 
 X509_POLICY_DATA *ossl_policy_data_new(POLICYINFO *policy,
-                                       const ASN1_OBJECT *cid, int crit)
+    const ASN1_OBJECT *cid, int crit)
 {
     X509_POLICY_DATA *ret;
     ASN1_OBJECT *id;
diff --git a/crypto/x509/pcy_lib.c b/crypto/x509/pcy_lib.c
index c4740a0a30c57..abb3ead909c4b 100644
--- a/crypto/x509/pcy_lib.c
+++ b/crypto/x509/pcy_lib.c
@@ -25,25 +25,23 @@ 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)
 {
     if (!tree || (i < 0) || (i >= tree->nlevel))
         return NULL;
     return tree->levels + i;
 }
 
-STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_policies(const
-                                                           X509_POLICY_TREE
-                                                           *tree)
+STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_policies(const X509_POLICY_TREE
+        *tree)
 {
     if (!tree)
         return NULL;
     return tree->auth_policies;
 }
 
-STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_user_policies(const
-                                                                X509_POLICY_TREE
-                                                                *tree)
+STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_user_policies(const X509_POLICY_TREE
+        *tree)
 {
     if (!tree)
         return NULL;
@@ -90,9 +88,8 @@ const ASN1_OBJECT *X509_policy_node_get0_policy(const X509_POLICY_NODE *node)
     return node->data->valid_policy;
 }
 
-STACK_OF(POLICYQUALINFO) *X509_policy_node_get0_qualifiers(const
-                                                           X509_POLICY_NODE
-                                                           *node)
+STACK_OF(POLICYQUALINFO) *X509_policy_node_get0_qualifiers(const X509_POLICY_NODE
+        *node)
 {
     if (!node)
         return NULL;
@@ -100,7 +97,7 @@ STACK_OF(POLICYQUALINFO) *X509_policy_node_get0_qualifiers(const
 }
 
 const X509_POLICY_NODE *X509_policy_node_get0_parent(const X509_POLICY_NODE
-                                                     *node)
+        *node)
 {
     if (!node)
         return NULL;
diff --git a/crypto/x509/pcy_local.h b/crypto/x509/pcy_local.h
index 523f3e35feeba..957ea59723bab 100644
--- a/crypto/x509/pcy_local.h
+++ b/crypto/x509/pcy_local.h
@@ -35,30 +35,30 @@ struct X509_POLICY_DATA_st {
  * extension. If policy mapping is not active its references get deleted.
  */
 
-#define POLICY_DATA_FLAG_MAPPED                 0x1
+#define POLICY_DATA_FLAG_MAPPED 0x1
 
 /*
  * This flag indicates the data doesn't correspond to a policy in Certificate
  * Policies: it has been mapped to any policy.
  */
 
-#define POLICY_DATA_FLAG_MAPPED_ANY             0x2
+#define POLICY_DATA_FLAG_MAPPED_ANY 0x2
 
 /* AND with flags to see if any mapping has occurred */
 
-#define POLICY_DATA_FLAG_MAP_MASK               0x3
+#define POLICY_DATA_FLAG_MAP_MASK 0x3
 
 /* qualifiers are shared and shouldn't be freed */
 
-#define POLICY_DATA_FLAG_SHARED_QUALIFIERS      0x4
+#define POLICY_DATA_FLAG_SHARED_QUALIFIERS 0x4
 
 /* Parent node is an extra node and should be freed */
 
-#define POLICY_DATA_FLAG_EXTRA_NODE             0x8
+#define POLICY_DATA_FLAG_EXTRA_NODE 0x8
 
 /* Corresponding CertificatePolicies is critical */
 
-#define POLICY_DATA_FLAG_CRITICAL               0x10
+#define POLICY_DATA_FLAG_CRITICAL 0x10
 
 /* This structure is cached with a certificate */
 
@@ -131,7 +131,7 @@ struct X509_POLICY_TREE_st {
 };
 
 /* Set if anyPolicy present in user policies */
-#define POLICY_FLAG_ANY_POLICY          0x2
+#define POLICY_FLAG_ANY_POLICY 0x2
 
 /* Useful macros */
 
@@ -141,11 +141,11 @@ struct X509_POLICY_TREE_st {
 /* Internal functions */
 
 X509_POLICY_DATA *ossl_policy_data_new(POLICYINFO *policy, const ASN1_OBJECT *id,
-                                       int crit);
+    int crit);
 void ossl_policy_data_free(X509_POLICY_DATA *data);
 
 X509_POLICY_DATA *ossl_policy_cache_find_data(const X509_POLICY_CACHE *cache,
-                                              const ASN1_OBJECT *id);
+    const ASN1_OBJECT *id);
 int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps);
 
 STACK_OF(X509_POLICY_NODE) *ossl_policy_node_cmp_new(void);
@@ -153,19 +153,19 @@ STACK_OF(X509_POLICY_NODE) *ossl_policy_node_cmp_new(void);
 void ossl_policy_cache_free(X509_POLICY_CACHE *cache);
 
 X509_POLICY_NODE *ossl_policy_level_find_node(const X509_POLICY_LEVEL *level,
-                                              const X509_POLICY_NODE *parent,
-                                              const ASN1_OBJECT *id);
+    const X509_POLICY_NODE *parent,
+    const ASN1_OBJECT *id);
 
 X509_POLICY_NODE *ossl_policy_tree_find_sk(STACK_OF(X509_POLICY_NODE) *sk,
-                                           const ASN1_OBJECT *id);
+    const ASN1_OBJECT *id);
 
 X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
-                                             X509_POLICY_DATA *data,
-                                             X509_POLICY_NODE *parent,
-                                             X509_POLICY_TREE *tree,
-                                             int extra_data);
+    X509_POLICY_DATA *data,
+    X509_POLICY_NODE *parent,
+    X509_POLICY_TREE *tree,
+    int extra_data);
 void ossl_policy_node_free(X509_POLICY_NODE *node);
 int ossl_policy_node_match(const X509_POLICY_LEVEL *lvl,
-                           const X509_POLICY_NODE *node, const ASN1_OBJECT *oid);
+    const X509_POLICY_NODE *node, const ASN1_OBJECT *oid);
 
 const X509_POLICY_CACHE *ossl_policy_cache_set(X509 *x);
diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c
index 60dfd1e3203b0..cc192211e9d84 100644
--- a/crypto/x509/pcy_map.c
+++ b/crypto/x509/pcy_map.c
@@ -48,8 +48,8 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
         /* Create a NODE from anyPolicy */
         if (data == NULL) {
             data = ossl_policy_data_new(NULL, map->issuerDomainPolicy,
-                                        cache->anyPolicy->flags
-                                        & POLICY_DATA_FLAG_CRITICAL);
+                cache->anyPolicy->flags
+                    & POLICY_DATA_FLAG_CRITICAL);
             if (data == NULL)
                 goto bad_mapping;
             data->qualifier_set = cache->anyPolicy->qualifier_set;
@@ -65,15 +65,13 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
         } else
             data->flags |= POLICY_DATA_FLAG_MAPPED;
         if (!sk_ASN1_OBJECT_push(data->expected_policy_set,
-                                 map->subjectDomainPolicy))
+                map->subjectDomainPolicy))
             goto bad_mapping;
         map->subjectDomainPolicy = NULL;
-
     }
 
     ret = 1;
- bad_mapping:
+bad_mapping:
     sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free);
     return ret;
-
 }
diff --git a/crypto/x509/pcy_node.c b/crypto/x509/pcy_node.c
index c6e7af5ab1985..cbb421ddf45c0 100644
--- a/crypto/x509/pcy_node.c
+++ b/crypto/x509/pcy_node.c
@@ -15,7 +15,7 @@
 #include "pcy_local.h"
 
 static int node_cmp(const X509_POLICY_NODE *const *a,
-                    const X509_POLICY_NODE *const *b)
+    const X509_POLICY_NODE *const *b)
 {
     return OBJ_cmp((*a)->data->valid_policy, (*b)->data->valid_policy);
 }
@@ -26,7 +26,7 @@ STACK_OF(X509_POLICY_NODE) *ossl_policy_node_cmp_new(void)
 }
 
 X509_POLICY_NODE *ossl_policy_tree_find_sk(STACK_OF(X509_POLICY_NODE) *nodes,
-                                           const ASN1_OBJECT *id)
+    const ASN1_OBJECT *id)
 {
     X509_POLICY_DATA n;
     X509_POLICY_NODE l;
@@ -37,12 +37,11 @@ X509_POLICY_NODE *ossl_policy_tree_find_sk(STACK_OF(X509_POLICY_NODE) *nodes,
 
     idx = sk_X509_POLICY_NODE_find(nodes, &l);
     return sk_X509_POLICY_NODE_value(nodes, idx);
-
 }
 
 X509_POLICY_NODE *ossl_policy_level_find_node(const X509_POLICY_LEVEL *level,
-                                              const X509_POLICY_NODE *parent,
-                                              const ASN1_OBJECT *id)
+    const X509_POLICY_NODE *parent,
+    const ASN1_OBJECT *id)
 {
     X509_POLICY_NODE *node;
     int i;
@@ -57,10 +56,10 @@ X509_POLICY_NODE *ossl_policy_level_find_node(const X509_POLICY_LEVEL *level,
 }
 
 X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
-                                             X509_POLICY_DATA *data,
-                                             X509_POLICY_NODE *parent,
-                                             X509_POLICY_TREE *tree,
-                                             int extra_data)
+    X509_POLICY_DATA *data,
+    X509_POLICY_NODE *parent,
+    X509_POLICY_TREE *tree,
+    int extra_data)
 {
     X509_POLICY_NODE *node;
 
@@ -112,15 +111,15 @@ X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
 
     return node;
 
- extra_data_error:
+extra_data_error:
     if (level != NULL) {
         if (level->anyPolicy == node)
             level->anyPolicy = NULL;
         else
-            (void) sk_X509_POLICY_NODE_pop(level->nodes);
+            (void)sk_X509_POLICY_NODE_pop(level->nodes);
     }
 
- node_error:
+node_error:
     ossl_policy_node_free(node);
     return NULL;
 }
@@ -136,7 +135,7 @@ void ossl_policy_node_free(X509_POLICY_NODE *node)
  */
 
 int ossl_policy_node_match(const X509_POLICY_LEVEL *lvl,
-                           const X509_POLICY_NODE *node, const ASN1_OBJECT *oid)
+    const X509_POLICY_NODE *node, const ASN1_OBJECT *oid)
 {
     int i;
     ASN1_OBJECT *policy_oid;
@@ -155,5 +154,4 @@ int ossl_policy_node_match(const X509_POLICY_LEVEL *lvl,
             return 1;
     }
     return 0;
-
 }
diff --git a/crypto/x509/pcy_tree.c b/crypto/x509/pcy_tree.c
index 7c5d7e838ec30..1d91e49cece13 100644
--- a/crypto/x509/pcy_tree.c
+++ b/crypto/x509/pcy_tree.c
@@ -22,14 +22,14 @@
  * door on CVE-2023-0464.
  */
 #ifndef OPENSSL_POLICY_TREE_NODES_MAX
-# define OPENSSL_POLICY_TREE_NODES_MAX 1000
+#define OPENSSL_POLICY_TREE_NODES_MAX 1000
 #endif
 
 static void exnode_free(X509_POLICY_NODE *node);
 
 static void expected_print(BIO *channel,
-                           X509_POLICY_LEVEL *lev, X509_POLICY_NODE *node,
-                           int indent)
+    X509_POLICY_LEVEL *lev, X509_POLICY_NODE *node,
+    int indent)
 {
     if ((lev->flags & X509_V_FLAG_INHIBIT_MAP)
         || !(node->data->flags & POLICY_DATA_FLAG_MAP_MASK))
@@ -51,8 +51,8 @@ static void expected_print(BIO *channel,
 }
 
 static void tree_print(BIO *channel,
-                       char *str, X509_POLICY_TREE *tree,
-                       X509_POLICY_LEVEL *curr)
+    char *str, X509_POLICY_TREE *tree,
+    X509_POLICY_LEVEL *curr)
 {
     X509_POLICY_LEVEL *plev;
 
@@ -63,15 +63,14 @@ static void tree_print(BIO *channel,
 
     BIO_printf(channel, "Level print after %s\n", str);
     BIO_printf(channel, "Printing Up to Level %ld\n",
-               (long)(curr - tree->levels));
+        (long)(curr - tree->levels));
     for (plev = tree->levels; plev != curr; plev++) {
         int i;
 
         BIO_printf(channel, "Level %ld, flags = %x\n",
-                   (long)(plev - tree->levels), plev->flags);
+            (long)(plev - tree->levels), plev->flags);
         for (i = 0; i < sk_X509_POLICY_NODE_num(plev->nodes); i++) {
-            X509_POLICY_NODE *node =
-                sk_X509_POLICY_NODE_value(plev->nodes, i);
+            X509_POLICY_NODE *node = sk_X509_POLICY_NODE_value(plev->nodes, i);
 
             X509_POLICY_NODE_print(channel, node, 2);
             expected_print(channel, plev, node, 2);
@@ -82,10 +81,12 @@ static void tree_print(BIO *channel,
     }
 }
 
-#define TREE_PRINT(str, tree, curr) \
-    OSSL_TRACE_BEGIN(X509V3_POLICY) { \
+#define TREE_PRINT(str, tree, curr)                             \
+    OSSL_TRACE_BEGIN(X509V3_POLICY)                             \
+    {                                                           \
         tree_print(trc_out, "before tree_prune()", tree, curr); \
-    } OSSL_TRACE_END(X509V3_POLICY)
+    }                                                           \
+    OSSL_TRACE_END(X509V3_POLICY)
 
 /*-
  * Return value: <= 0 on error, or positive bit mask:
@@ -95,7 +96,7 @@ static void tree_print(BIO *channel,
  * X509_PCY_TREE_EXPLICIT: explicit policy required
  */
 static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
-                     unsigned int flags)
+    unsigned int flags)
 {
     X509_POLICY_TREE *tree;
     X509_POLICY_LEVEL *level;
@@ -103,9 +104,9 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
     X509_POLICY_DATA *data = NULL;
     int ret = X509_PCY_TREE_VALID;
     int n = sk_X509_num(certs) - 1; /* RFC5280 paths omit the TA */
-    int explicit_policy = (flags & X509_V_FLAG_EXPLICIT_POLICY) ? 0 : n+1;
-    int any_skip = (flags & X509_V_FLAG_INHIBIT_ANY) ? 0 : n+1;
-    int map_skip = (flags & X509_V_FLAG_INHIBIT_MAP) ? 0 : n+1;
+    int explicit_policy = (flags & X509_V_FLAG_EXPLICIT_POLICY) ? 0 : n + 1;
+    int any_skip = (flags & X509_V_FLAG_INHIBIT_ANY) ? 0 : n + 1;
+    int map_skip = (flags & X509_V_FLAG_INHIBIT_MAP) ? 0 : n + 1;
     int i;
 
     *ptree = NULL;
@@ -144,8 +145,8 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
      * policy is required we're done.
      */
     for (i = n - 1;
-         i >= 0 && (explicit_policy > 0 || (ret & X509_PCY_TREE_EMPTY) == 0);
-         i--) {
+        i >= 0 && (explicit_policy > 0 || (ret & X509_PCY_TREE_EMPTY) == 0);
+        i--) {
         X509 *x = sk_X509_value(certs, i);
         uint32_t ex_flags = X509_get_extension_flags(x);
 
@@ -186,14 +187,15 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
      * policies of anyPolicy.  (RFC 5280 has the TA at depth 0 and the leaf at
      * depth n, we have the leaf at depth 0 and the TA at depth n).
      */
-    if ((tree->levels = OPENSSL_zalloc(sizeof(*tree->levels)*(n+1))) == NULL) {
+    if ((tree->levels = OPENSSL_zalloc(sizeof(*tree->levels) * (n + 1))) == NULL) {
         OPENSSL_free(tree);
         return X509_PCY_TREE_INTERNAL;
     }
-    tree->nlevel = n+1;
+    tree->nlevel = n + 1;
     level = tree->levels;
     if ((data = ossl_policy_data_new(NULL,
-                                     OBJ_nid2obj(NID_any_policy), 0)) == NULL)
+             OBJ_nid2obj(NID_any_policy), 0))
+        == NULL)
         goto bad_tree;
     if (ossl_policy_level_add_node(level, data, NULL, tree, 1) == NULL) {
         ossl_policy_data_free(data);
@@ -247,7 +249,7 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
     *ptree = tree;
     return ret;
 
- bad_tree:
+bad_tree:
     X509_policy_tree_free(tree);
     return X509_PCY_TREE_INTERNAL;
 }
@@ -256,8 +258,8 @@ static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
  * Return value: 1 on success, 0 otherwise
  */
 static int tree_link_matching_nodes(X509_POLICY_LEVEL *curr,
-                                    X509_POLICY_DATA *data,
-                                    X509_POLICY_TREE *tree)
+    X509_POLICY_DATA *data,
+    X509_POLICY_TREE *tree)
 {
     X509_POLICY_LEVEL *last = curr - 1;
     int i, matched = 0;
@@ -286,8 +288,8 @@ static int tree_link_matching_nodes(X509_POLICY_LEVEL *curr,
  * Return value: 1 on success, 0 otherwise.
  */
 static int tree_link_nodes(X509_POLICY_LEVEL *curr,
-                           const X509_POLICY_CACHE *cache,
-                           X509_POLICY_TREE *tree)
+    const X509_POLICY_CACHE *cache,
+    X509_POLICY_TREE *tree)
 {
     int i;
 
@@ -308,9 +310,9 @@ static int tree_link_nodes(X509_POLICY_LEVEL *curr,
  * Return value: 1 on success, 0 otherwise.
  */
 static int tree_add_unmatched(X509_POLICY_LEVEL *curr,
-                              const X509_POLICY_CACHE *cache,
-                              const ASN1_OBJECT *id,
-                              X509_POLICY_NODE *node, X509_POLICY_TREE *tree)
+    const X509_POLICY_CACHE *cache,
+    const ASN1_OBJECT *id,
+    X509_POLICY_NODE *node, X509_POLICY_TREE *tree)
 {
     X509_POLICY_DATA *data;
 
@@ -337,8 +339,8 @@ static int tree_add_unmatched(X509_POLICY_LEVEL *curr,
  * Return value: 1 on success, 0 otherwise.
  */
 static int tree_link_unmatched(X509_POLICY_LEVEL *curr,
-                               const X509_POLICY_CACHE *cache,
-                               X509_POLICY_NODE *node, X509_POLICY_TREE *tree)
+    const X509_POLICY_CACHE *cache,
+    X509_POLICY_NODE *node, X509_POLICY_TREE *tree)
 {
     const X509_POLICY_LEVEL *last = curr - 1;
     int i;
@@ -364,7 +366,6 @@ static int tree_link_unmatched(X509_POLICY_LEVEL *curr,
             if (!tree_add_unmatched(curr, cache, oid, node, tree))
                 return 0;
         }
-
     }
     return 1;
 }
@@ -373,8 +374,8 @@ static int tree_link_unmatched(X509_POLICY_LEVEL *curr,
  * Return value: 1 on success, 0 otherwise
  */
 static int tree_link_any(X509_POLICY_LEVEL *curr,
-                         const X509_POLICY_CACHE *cache,
-                         X509_POLICY_TREE *tree)
+    const X509_POLICY_CACHE *cache,
+    X509_POLICY_TREE *tree)
 {
     int i;
     X509_POLICY_NODE *node;
@@ -387,9 +388,7 @@ static int tree_link_any(X509_POLICY_LEVEL *curr,
             return 0;
     }
     /* Finally add link to anyPolicy */
-    if (last->anyPolicy &&
-            ossl_policy_level_add_node(curr, cache->anyPolicy,
-                                       last->anyPolicy, tree, 0) == NULL)
+    if (last->anyPolicy && ossl_policy_level_add_node(curr, cache->anyPolicy, last->anyPolicy, tree, 0) == NULL)
         return 0;
     return 1;
 }
@@ -453,10 +452,9 @@ static int tree_prune(X509_POLICY_TREE *tree, X509_POLICY_LEVEL *curr)
  * Return value: 1 on success, 0 otherwise.
  */
 static int tree_add_auth_node(STACK_OF(X509_POLICY_NODE) **pnodes,
-                              X509_POLICY_NODE *pcy)
+    X509_POLICY_NODE *pcy)
 {
-    if (*pnodes == NULL &&
-        (*pnodes = ossl_policy_node_cmp_new()) == NULL)
+    if (*pnodes == NULL && (*pnodes = ossl_policy_node_cmp_new()) == NULL)
         return 0;
     if (sk_X509_POLICY_NODE_find(*pnodes, pcy) >= 0)
         return 1;
@@ -480,7 +478,7 @@ static int tree_add_auth_node(STACK_OF(X509_POLICY_NODE) **pnodes,
  *  TREE_CALC_OK_DOFREE on success and pnodes needs to be freed
  */
 static int tree_calculate_authority_set(X509_POLICY_TREE *tree,
-                                        STACK_OF(X509_POLICY_NODE) **pnodes)
+    STACK_OF(X509_POLICY_NODE) **pnodes)
 {
     X509_POLICY_LEVEL *curr;
     X509_POLICY_NODE *node, *anyptr;
@@ -529,8 +527,8 @@ static int tree_calculate_authority_set(X509_POLICY_TREE *tree,
  * Return value: 1 on success, 0 otherwise.
  */
 static int tree_calculate_user_set(X509_POLICY_TREE *tree,
-                                   STACK_OF(ASN1_OBJECT) *policy_oids,
-                                   STACK_OF(X509_POLICY_NODE) *auth_nodes)
+    STACK_OF(ASN1_OBJECT) *policy_oids,
+    STACK_OF(X509_POLICY_NODE) *auth_nodes)
 {
     int i;
     X509_POLICY_NODE *node;
@@ -572,7 +570,7 @@ static int tree_calculate_user_set(X509_POLICY_TREE *tree,
             extra->flags = POLICY_DATA_FLAG_SHARED_QUALIFIERS
                 | POLICY_DATA_FLAG_EXTRA_NODE;
             node = ossl_policy_level_add_node(NULL, extra, anyPolicy->parent,
-                                              tree, 1);
+                tree, 1);
             if (node == NULL) {
                 ossl_policy_data_free(extra);
                 return 0;
@@ -647,7 +645,6 @@ void X509_policy_tree_free(X509_POLICY_TREE *tree)
     sk_X509_POLICY_DATA_pop_free(tree->extra_data, ossl_policy_data_free);
     OPENSSL_free(tree->levels);
     OPENSSL_free(tree);
-
 }
 
 /*-
@@ -659,8 +656,8 @@ void X509_policy_tree_free(X509_POLICY_TREE *tree)
  *  X509_PCY_TREE_VALID:    Success (null tree if empty or bare TA)
  */
 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)
 {
     int init_ret;
     int ret;
@@ -719,7 +716,7 @@ int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy,
     }
     return X509_PCY_TREE_VALID;
 
- error:
+error:
     X509_policy_tree_free(tree);
     return X509_PCY_TREE_INTERNAL;
 }
diff --git a/crypto/x509/standard_exts.h b/crypto/x509/standard_exts.h
index 7449fb0ff62ac..a05213e903286 100644
--- a/crypto/x509/standard_exts.h
+++ b/crypto/x509/standard_exts.h
@@ -34,9 +34,7 @@ static const X509V3_EXT_METHOD *standard_exts[] = {
     &ossl_v3_ext_ku,
     &ossl_v3_delta_crl,
     &ossl_v3_crl_reason,
-#ifndef OPENSSL_NO_OCSP
     &ossl_v3_crl_invdate,
-#endif
     &ossl_v3_sxnet,
     &ossl_v3_info,
     &ossl_v3_audit_identity,
@@ -56,9 +54,7 @@ static const X509V3_EXT_METHOD *standard_exts[] = {
     &ossl_v3_policy_constraints,
     &ossl_v3_targeting_information,
     &ossl_v3_no_rev_avail,
-#ifndef OPENSSL_NO_OCSP
     &ossl_v3_crl_hold,
-#endif
     &ossl_v3_pci,
     &ossl_v3_name_constraints,
     &ossl_v3_policy_mappings,
@@ -101,4 +97,3 @@ static const X509V3_EXT_METHOD *standard_exts[] = {
 /* Number of standard extensions */
 
 #define STANDARD_EXTENSION_COUNT OSSL_NELEM(standard_exts)
-
diff --git a/crypto/x509/t_acert.c b/crypto/x509/t_acert.c
index 088454bc65b29..1ee6b9eacb05f 100644
--- a/crypto/x509/t_acert.c
+++ b/crypto/x509/t_acert.c
@@ -63,11 +63,12 @@ static int print_attribute(BIO *bp, X509_ATTRIBUTE *a)
             if (BIO_puts(bp, "\n") <= 0)
                 goto err;
             ASN1_parse_dump(bp, at->value.sequence->data,
-                            at->value.sequence->length, i, 1);
+                at->value.sequence->length, i, 1);
             break;
         default:
             if (BIO_printf(bp, "unable to print attribute of type 0x%X\n",
-                           type) < 0)
+                    type)
+                < 0)
                 goto err;
             break;
         }
@@ -78,7 +79,7 @@ static int print_attribute(BIO *bp, X509_ATTRIBUTE *a)
 }
 
 int X509_ACERT_print_ex(BIO *bp, X509_ACERT *x, unsigned long nmflags,
-                        unsigned long cflag)
+    unsigned long cflag)
 {
     int i;
     char mlch = ' ';
@@ -100,7 +101,8 @@ int X509_ACERT_print_ex(BIO *bp, X509_ACERT *x, unsigned long nmflags,
         l = X509_ACERT_get_version(x);
         if (l == X509_ACERT_VERSION_2) {
             if (BIO_printf(bp, "%8sVersion: %ld (0x%lx)\n", "", l + 1,
-                           (unsigned long)l) <= 0)
+                    (unsigned long)l)
+                <= 0)
                 goto err;
         } else {
             if (BIO_printf(bp, "%8sVersion: Unknown (%ld)\n", "", l) <= 0)
diff --git a/crypto/x509/t_crl.c b/crypto/x509/t_crl.c
index e77a77978a831..106616a6912a6 100644
--- a/crypto/x509/t_crl.c
+++ b/crypto/x509/t_crl.c
@@ -34,7 +34,7 @@ int X509_CRL_print_fp(FILE *fp, X509_CRL *x)
 
 int X509_CRL_print(BIO *out, X509_CRL *x)
 {
-  return X509_CRL_print_ex(out, x, XN_FLAG_COMPAT);
+    return X509_CRL_print_ex(out, x, XN_FLAG_COMPAT);
 }
 
 int X509_CRL_print_ex(BIO *out, X509_CRL *x, unsigned long nmflag)
@@ -68,7 +68,7 @@ int X509_CRL_print_ex(BIO *out, X509_CRL *x, unsigned long nmflag)
     BIO_printf(out, "\n");
 
     X509V3_extensions_print(out, "CRL extensions",
-                            X509_CRL_get0_extensions(x), 0, 8);
+        X509_CRL_get0_extensions(x), 0, 8);
 
     rev = X509_CRL_get_REVOKED(x);
 
@@ -85,10 +85,9 @@ int X509_CRL_print_ex(BIO *out, X509_CRL *x, unsigned long nmflag)
         ASN1_TIME_print(out, X509_REVOKED_get0_revocationDate(r));
         BIO_printf(out, "\n");
         X509V3_extensions_print(out, "CRL entry extensions",
-                                X509_REVOKED_get0_extensions(r), 0, 8);
+            X509_REVOKED_get0_extensions(r), 0, 8);
     }
     X509_signature_print(out, sig_alg, sig);
 
     return 1;
-
 }
diff --git a/crypto/x509/t_req.c b/crypto/x509/t_req.c
index 63626c0d98109..fc7f4c74e7710 100644
--- a/crypto/x509/t_req.c
+++ b/crypto/x509/t_req.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -35,12 +35,12 @@ int X509_REQ_print_fp(FILE *fp, X509_REQ *x)
 #endif
 
 int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
-                      unsigned long cflag)
+    unsigned long cflag)
 {
     long l;
     int i;
     EVP_PKEY *pkey;
-    STACK_OF(X509_EXTENSION) *exts;
+    STACK_OF(X509_EXTENSION) *exts = NULL;
     char mlch = ' ';
     int nmindent = 0, printok = 0;
 
@@ -72,7 +72,8 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
         if (BIO_printf(bp, "        Subject:%c", mlch) <= 0)
             goto err;
         if (X509_NAME_print_ex(bp, X509_REQ_get_subject_name(x),
-            nmindent, nmflags) < printok)
+                nmindent, nmflags)
+            < printok)
             goto err;
         if (BIO_write(bp, "\n", 1) <= 0)
             goto err;
@@ -128,10 +129,10 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
                     ii = 0;
                     count = X509_ATTRIBUTE_count(a);
                     if (count == 0) {
-                      ERR_raise(ERR_LIB_X509, X509_R_INVALID_ATTRIBUTES);
-                      return 0;
+                        ERR_raise(ERR_LIB_X509, X509_R_INVALID_ATTRIBUTES);
+                        return 0;
                     }
- get_next:
+                get_next:
                     at = X509_ATTRIBUTE_get0_type(a, ii);
                     type = at->type;
                     bs = at->value.asn1_string;
@@ -148,7 +149,7 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
                 case V_ASN1_UTF8STRING:
                 case V_ASN1_IA5STRING:
                     if (BIO_write(bp, (char *)bs->data, bs->length)
-                            != bs->length)
+                        != bs->length)
                         goto err;
                     if (BIO_puts(bp, "\n") <= 0)
                         goto err;
@@ -184,13 +185,15 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
                 if (!X509V3_EXT_print(bp, ex, cflag, 20)) {
                     if (BIO_printf(bp, "%20s", "") <= 0
                         || ASN1_STRING_print(bp,
-                                             X509_EXTENSION_get_data(ex)) <= 0)
+                               X509_EXTENSION_get_data(ex))
+                            <= 0)
                         goto err;
                 }
                 if (BIO_write(bp, "\n", 1) <= 0)
                     goto err;
             }
             sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
+            exts = NULL;
         }
     }
 
@@ -203,7 +206,8 @@ int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflags,
     }
 
     return 1;
- err:
+err:
+    sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
     ERR_raise(ERR_LIB_X509, ERR_R_BUF_LIB);
     return 0;
 }
diff --git a/crypto/x509/t_x509.c b/crypto/x509/t_x509.c
index 7d693669cd369..ca27520183662 100644
--- a/crypto/x509/t_x509.c
+++ b/crypto/x509/t_x509.c
@@ -29,7 +29,7 @@ int X509_print_fp(FILE *fp, X509 *x)
 }
 
 int X509_print_ex_fp(FILE *fp, X509 *x, unsigned long nmflag,
-                     unsigned long cflag)
+    unsigned long cflag)
 {
     BIO *b;
     int ret;
@@ -51,7 +51,7 @@ int X509_print(BIO *bp, X509 *x)
 }
 
 int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags,
-                  unsigned long cflag)
+    unsigned long cflag)
 {
     long l;
     int ret = 0;
@@ -129,8 +129,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags,
     if (!(cflag & X509_FLAG_NO_SUBJECT)) {
         if (BIO_printf(bp, "        Subject:%c", mlch) <= 0)
             goto err;
-        if (X509_NAME_print_ex
-            (bp, X509_get_subject_name(x), nmindent, nmflags) < printok)
+        if (X509_NAME_print_ex(bp, X509_get_subject_name(x), nmindent, nmflags) < printok)
             goto err;
         if (BIO_write(bp, "\n", 1) <= 0)
             goto err;
@@ -176,7 +175,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags,
 
     if (!(cflag & X509_FLAG_NO_EXTENSIONS)
         && !X509V3_extensions_print(bp, "X509v3 extensions",
-                                    X509_get0_extensions(x), cflag, 8))
+            X509_get0_extensions(x), cflag, 8))
         goto err;
 
     if (!(cflag & X509_FLAG_NO_SIGDUMP)) {
@@ -191,7 +190,7 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags,
             goto err;
     }
     ret = 1;
- err:
+err:
     return ret;
 }
 
@@ -219,7 +218,8 @@ int X509_ocspid_print(BIO *bp, X509 *x)
         goto err;
     if ((der = dertmp = OPENSSL_malloc(derlen)) == NULL)
         goto err;
-    i2d_X509_NAME(subj, &dertmp);
+    if (i2d_X509_NAME(subj, &dertmp) < 0)
+        goto err;
 
     md = EVP_MD_fetch(x->libctx, SN_sha1, x->propq);
     if (md == NULL)
@@ -245,7 +245,7 @@ int X509_ocspid_print(BIO *bp, X509 *x)
         goto err;
 
     if (!EVP_Digest(ASN1_STRING_get0_data(keybstr),
-                    ASN1_STRING_length(keybstr), SHA1md, NULL, md, NULL))
+            ASN1_STRING_length(keybstr), SHA1md, NULL, md, NULL))
         goto err;
     for (i = 0; i < SHA_DIGEST_LENGTH; i++) {
         if (BIO_printf(bp, "%02X", SHA1md[i]) <= 0)
@@ -255,7 +255,7 @@ int X509_ocspid_print(BIO *bp, X509 *x)
     EVP_MD_free(md);
 
     return 1;
- err:
+err:
     OPENSSL_free(der);
     EVP_MD_free(md);
     return 0;
@@ -285,7 +285,7 @@ int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent)
 }
 
 int X509_signature_print(BIO *bp, const X509_ALGOR *sigalg,
-                         const ASN1_STRING *sig)
+    const ASN1_STRING *sig)
 {
     int sig_nid;
     int indent = 4;
@@ -333,7 +333,7 @@ int X509_aux_print(BIO *out, X509 *x, int indent)
             else
                 first = 0;
             OBJ_obj2txt(oidstr, sizeof(oidstr),
-                        sk_ASN1_OBJECT_value(trust, i), 0);
+                sk_ASN1_OBJECT_value(trust, i), 0);
             BIO_puts(out, oidstr);
         }
         BIO_puts(out, "\n");
@@ -348,7 +348,7 @@ int X509_aux_print(BIO *out, X509 *x, int indent)
             else
                 first = 0;
             OBJ_obj2txt(oidstr, sizeof(oidstr),
-                        sk_ASN1_OBJECT_value(reject, i), 0);
+                sk_ASN1_OBJECT_value(reject, i), 0);
             BIO_puts(out, oidstr);
         }
         BIO_puts(out, "\n");
@@ -373,13 +373,12 @@ int X509_aux_print(BIO *out, X509 *x, int indent)
 
 int ossl_x509_print_ex_brief(BIO *bio, X509 *cert, unsigned long neg_cflags)
 {
-    unsigned long flags = ASN1_STRFLGS_RFC2253 | ASN1_STRFLGS_ESC_QUOTE |
-        XN_FLAG_SEP_CPLUS_SPC | XN_FLAG_FN_SN;
+    unsigned long flags = ASN1_STRFLGS_RFC2253 | ASN1_STRFLGS_ESC_QUOTE | XN_FLAG_SEP_CPLUS_SPC | XN_FLAG_FN_SN;
 
     if (cert == NULL)
         return BIO_printf(bio, "    (no certificate)\n") > 0;
     if (BIO_printf(bio, "    certificate\n") <= 0
-            || !X509_print_ex(bio, cert, flags, ~X509_FLAG_NO_SUBJECT))
+        || !X509_print_ex(bio, cert, flags, ~X509_FLAG_NO_SUBJECT))
         return 0;
     if (X509_check_issued((X509 *)cert, cert) == X509_V_OK) {
         if (BIO_printf(bio, "        self-issued\n") <= 0)
@@ -390,7 +389,7 @@ int ossl_x509_print_ex_brief(BIO *bio, X509 *cert, unsigned long neg_cflags)
             return 0;
     }
     if (!X509_print_ex(bio, cert, flags,
-                       ~(X509_FLAG_NO_SERIAL | X509_FLAG_NO_VALIDITY)))
+            ~(X509_FLAG_NO_SERIAL | X509_FLAG_NO_VALIDITY)))
         return 0;
     if (X509_cmp_current_time(X509_get0_notBefore(cert)) > 0)
         if (BIO_printf(bio, "        not yet valid\n") <= 0)
@@ -399,7 +398,7 @@ int ossl_x509_print_ex_brief(BIO *bio, X509 *cert, unsigned long neg_cflags)
         if (BIO_printf(bio, "        no more valid\n") <= 0)
             return 0;
     return X509_print_ex(bio, cert, flags,
-                         ~neg_cflags & ~X509_FLAG_EXTENSIONS_ONLY_KID);
+        ~neg_cflags & ~X509_FLAG_EXTENSIONS_ONLY_KID);
 }
 
 static int print_certs(BIO *bio, const STACK_OF(X509) *certs)
@@ -416,10 +415,10 @@ static int print_certs(BIO *bio, const STACK_OF(X509) *certs)
             if (!ossl_x509_print_ex_brief(bio, cert, 0))
                 return 0;
             if (!X509V3_extensions_print(bio, NULL,
-                                         X509_get0_extensions(cert),
-                                         X509_FLAG_EXTENSIONS_ONLY_KID, 8))
+                    X509_get0_extensions(cert),
+                    X509_FLAG_EXTENSIONS_ONLY_KID, 8))
                 return 0;
-            }
+        }
     }
     return 1;
 }
@@ -447,11 +446,11 @@ int X509_STORE_CTX_print_verify_cb(int ok, X509_STORE_CTX *ctx)
         if (bio == NULL)
             return 0;
         BIO_printf(bio, "%s at depth = %d error = %d (%s)\n",
-                   X509_STORE_CTX_get0_parent_ctx(ctx) != NULL
-                   ? "CRL path validation"
-                   : "Certificate verification",
-                   X509_STORE_CTX_get_error_depth(ctx),
-                   cert_error, X509_verify_cert_error_string(cert_error));
+            X509_STORE_CTX_get0_parent_ctx(ctx) != NULL
+                ? "CRL path validation"
+                : "Certificate verification",
+            X509_STORE_CTX_get_error_depth(ctx),
+            cert_error, X509_verify_cert_error_string(cert_error));
         {
             X509_STORE *ts = X509_STORE_CTX_get0_store(ctx);
             X509_VERIFY_PARAM *vpm = X509_STORE_get0_param(ts);
@@ -483,14 +482,14 @@ int X509_STORE_CTX_print_verify_cb(int ok, X509_STORE_CTX *ctx)
 
         BIO_printf(bio, "Failure for:\n");
         ossl_x509_print_ex_brief(bio, X509_STORE_CTX_get_current_cert(ctx),
-                                 X509_FLAG_NO_EXTENSIONS);
+            X509_FLAG_NO_EXTENSIONS);
         if (cert_error == X509_V_ERR_CERT_UNTRUSTED
-                || cert_error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT
-                || cert_error == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN
-                || cert_error == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT
-                || cert_error == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY
-                || cert_error == X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER
-                || cert_error == X509_V_ERR_STORE_LOOKUP) {
+            || cert_error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT
+            || cert_error == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN
+            || cert_error == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT
+            || cert_error == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY
+            || cert_error == X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER
+            || cert_error == X509_V_ERR_STORE_LOOKUP) {
             BIO_printf(bio, "Non-trusted certs:\n");
             print_certs(bio, X509_STORE_CTX_get0_untrusted(ctx));
             BIO_printf(bio, "Certs in trust store:\n");
diff --git a/crypto/x509/v3_aaa.c b/crypto/x509/v3_aaa.c
index 719216b302d3d..64d0791eb4d0f 100644
--- a/crypto/x509/v3_aaa.c
+++ b/crypto/x509/v3_aaa.c
@@ -15,21 +15,20 @@
 
 ASN1_CHOICE(OSSL_ALLOWED_ATTRIBUTES_CHOICE) = {
     ASN1_IMP(OSSL_ALLOWED_ATTRIBUTES_CHOICE, choice.attributeType, ASN1_OBJECT,
-             OSSL_AAA_ATTRIBUTE_TYPE),
+        OSSL_AAA_ATTRIBUTE_TYPE),
     ASN1_IMP(OSSL_ALLOWED_ATTRIBUTES_CHOICE, choice.attributeTypeandValues,
-             X509_ATTRIBUTE, OSSL_AAA_ATTRIBUTE_VALUES),
+        X509_ATTRIBUTE, OSSL_AAA_ATTRIBUTE_VALUES),
 } ASN1_CHOICE_END(OSSL_ALLOWED_ATTRIBUTES_CHOICE)
 
 ASN1_SEQUENCE(OSSL_ALLOWED_ATTRIBUTES_ITEM) = {
     ASN1_IMP_SET_OF(OSSL_ALLOWED_ATTRIBUTES_ITEM, attributes,
-                    OSSL_ALLOWED_ATTRIBUTES_CHOICE, 0),
+        OSSL_ALLOWED_ATTRIBUTES_CHOICE, 0),
     /* This MUST be EXPLICIT, because it contains a CHOICE. */
     ASN1_EXP(OSSL_ALLOWED_ATTRIBUTES_ITEM, holderDomain, GENERAL_NAME, 1),
 } ASN1_SEQUENCE_END(OSSL_ALLOWED_ATTRIBUTES_ITEM)
 
-ASN1_ITEM_TEMPLATE(OSSL_ALLOWED_ATTRIBUTES_SYNTAX) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, OSSL_ALLOWED_ATTRIBUTES_SYNTAX,
-                          OSSL_ALLOWED_ATTRIBUTES_ITEM)
+ASN1_ITEM_TEMPLATE(OSSL_ALLOWED_ATTRIBUTES_SYNTAX) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, OSSL_ALLOWED_ATTRIBUTES_SYNTAX,
+    OSSL_ALLOWED_ATTRIBUTES_ITEM)
 ASN1_ITEM_TEMPLATE_END(OSSL_ALLOWED_ATTRIBUTES_SYNTAX)
 
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_ALLOWED_ATTRIBUTES_CHOICE)
@@ -37,8 +36,8 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_ALLOWED_ATTRIBUTES_ITEM)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_ALLOWED_ATTRIBUTES_SYNTAX)
 
 static int i2r_ALLOWED_ATTRIBUTES_CHOICE(X509V3_EXT_METHOD *method,
-                                         OSSL_ALLOWED_ATTRIBUTES_CHOICE *a,
-                                         BIO *out, int indent)
+    OSSL_ALLOWED_ATTRIBUTES_CHOICE *a,
+    BIO *out, int indent)
 {
     ASN1_OBJECT *attr_obj;
     int attr_nid, j;
@@ -77,8 +76,8 @@ static int i2r_ALLOWED_ATTRIBUTES_CHOICE(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_ALLOWED_ATTRIBUTES_ITEM(X509V3_EXT_METHOD *method,
-                                       OSSL_ALLOWED_ATTRIBUTES_ITEM *aai,
-                                       BIO *out, int indent)
+    OSSL_ALLOWED_ATTRIBUTES_ITEM *aai,
+    BIO *out, int indent)
 {
     int i;
     OSSL_ALLOWED_ATTRIBUTES_CHOICE *a;
@@ -100,8 +99,8 @@ static int i2r_ALLOWED_ATTRIBUTES_ITEM(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_ALLOWED_ATTRIBUTES_SYNTAX(X509V3_EXT_METHOD *method,
-                                         OSSL_ALLOWED_ATTRIBUTES_SYNTAX *aaa,
-                                         BIO *out, int indent)
+    OSSL_ALLOWED_ATTRIBUTES_SYNTAX *aaa,
+    BIO *out, int indent)
 {
     int i;
     OSSL_ALLOWED_ATTRIBUTES_ITEM *aai;
diff --git a/crypto/x509/v3_ac_tgt.c b/crypto/x509/v3_ac_tgt.c
index 1752569e3021e..4fe14070369a1 100644
--- a/crypto/x509/v3_ac_tgt.c
+++ b/crypto/x509/v3_ac_tgt.c
@@ -20,20 +20,20 @@
 #include "crypto/asn1.h"
 
 static int i2r_ISSUER_SERIAL(X509V3_EXT_METHOD *method,
-                             OSSL_ISSUER_SERIAL *iss,
-                             BIO *out, int indent);
+    OSSL_ISSUER_SERIAL *iss,
+    BIO *out, int indent);
 static int i2r_OBJECT_DIGEST_INFO(X509V3_EXT_METHOD *method,
-                                  OSSL_OBJECT_DIGEST_INFO *odi,
-                                  BIO *out, int indent);
+    OSSL_OBJECT_DIGEST_INFO *odi,
+    BIO *out, int indent);
 static int i2r_TARGET_CERT(X509V3_EXT_METHOD *method,
-                           OSSL_TARGET_CERT *tc,
-                           BIO *out, int indent);
+    OSSL_TARGET_CERT *tc,
+    BIO *out, int indent);
 static int i2r_TARGET(X509V3_EXT_METHOD *method,
-                      OSSL_TARGET *target,
-                      BIO *out, int indent);
+    OSSL_TARGET *target,
+    BIO *out, int indent);
 static int i2r_TARGETING_INFORMATION(X509V3_EXT_METHOD *method,
-                                     OSSL_TARGETING_INFORMATION *tinfo,
-                                     BIO *out, int indent);
+    OSSL_TARGETING_INFORMATION *tinfo,
+    BIO *out, int indent);
 
 ASN1_SEQUENCE(OSSL_ISSUER_SERIAL) = {
     ASN1_SEQUENCE_OF(OSSL_ISSUER_SERIAL, issuer, GENERAL_NAME),
@@ -41,31 +41,32 @@ ASN1_SEQUENCE(OSSL_ISSUER_SERIAL) = {
     ASN1_OPT(OSSL_ISSUER_SERIAL, issuerUID, ASN1_BIT_STRING),
 } static_ASN1_SEQUENCE_END(OSSL_ISSUER_SERIAL)
 
-ASN1_SEQUENCE(OSSL_OBJECT_DIGEST_INFO) = {
-    ASN1_EMBED(OSSL_OBJECT_DIGEST_INFO, digestedObjectType, ASN1_ENUMERATED),
-    ASN1_OPT(OSSL_OBJECT_DIGEST_INFO, otherObjectTypeID, ASN1_OBJECT),
-    ASN1_EMBED(OSSL_OBJECT_DIGEST_INFO, digestAlgorithm, X509_ALGOR),
-    ASN1_EMBED(OSSL_OBJECT_DIGEST_INFO, objectDigest, ASN1_BIT_STRING),
-} static_ASN1_SEQUENCE_END(OSSL_OBJECT_DIGEST_INFO)
-
-ASN1_SEQUENCE(OSSL_TARGET_CERT) = {
-    ASN1_SIMPLE(OSSL_TARGET_CERT, targetCertificate, OSSL_ISSUER_SERIAL),
-    ASN1_OPT(OSSL_TARGET_CERT, targetName, GENERAL_NAME),
-    ASN1_OPT(OSSL_TARGET_CERT, certDigestInfo, OSSL_OBJECT_DIGEST_INFO),
-} static_ASN1_SEQUENCE_END(OSSL_TARGET_CERT)
-
-ASN1_CHOICE(OSSL_TARGET) = {
-    ASN1_EXP(OSSL_TARGET, choice.targetName, GENERAL_NAME, 0),
-    ASN1_EXP(OSSL_TARGET, choice.targetGroup, GENERAL_NAME, 1),
-    ASN1_IMP(OSSL_TARGET, choice.targetCert, OSSL_TARGET_CERT, 2),
-} ASN1_CHOICE_END(OSSL_TARGET)
-
-ASN1_ITEM_TEMPLATE(OSSL_TARGETS) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Targets, OSSL_TARGET)
+    ASN1_SEQUENCE(OSSL_OBJECT_DIGEST_INFO)
+    = {
+          ASN1_EMBED(OSSL_OBJECT_DIGEST_INFO, digestedObjectType, ASN1_ENUMERATED),
+          ASN1_OPT(OSSL_OBJECT_DIGEST_INFO, otherObjectTypeID, ASN1_OBJECT),
+          ASN1_EMBED(OSSL_OBJECT_DIGEST_INFO, digestAlgorithm, X509_ALGOR),
+          ASN1_EMBED(OSSL_OBJECT_DIGEST_INFO, objectDigest, ASN1_BIT_STRING),
+      } static_ASN1_SEQUENCE_END(OSSL_OBJECT_DIGEST_INFO)
+
+        ASN1_SEQUENCE(OSSL_TARGET_CERT)
+    = {
+          ASN1_SIMPLE(OSSL_TARGET_CERT, targetCertificate, OSSL_ISSUER_SERIAL),
+          ASN1_OPT(OSSL_TARGET_CERT, targetName, GENERAL_NAME),
+          ASN1_OPT(OSSL_TARGET_CERT, certDigestInfo, OSSL_OBJECT_DIGEST_INFO),
+      } static_ASN1_SEQUENCE_END(OSSL_TARGET_CERT)
+
+        ASN1_CHOICE(OSSL_TARGET)
+    = {
+          ASN1_EXP(OSSL_TARGET, choice.targetName, GENERAL_NAME, 0),
+          ASN1_EXP(OSSL_TARGET, choice.targetGroup, GENERAL_NAME, 1),
+          ASN1_IMP(OSSL_TARGET, choice.targetCert, OSSL_TARGET_CERT, 2),
+      } ASN1_CHOICE_END(OSSL_TARGET)
+
+ASN1_ITEM_TEMPLATE(OSSL_TARGETS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Targets, OSSL_TARGET)
 ASN1_ITEM_TEMPLATE_END(OSSL_TARGETS)
 
-ASN1_ITEM_TEMPLATE(OSSL_TARGETING_INFORMATION) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, TargetingInformation, OSSL_TARGETS)
+ASN1_ITEM_TEMPLATE(OSSL_TARGETING_INFORMATION) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, TargetingInformation, OSSL_TARGETS)
 ASN1_ITEM_TEMPLATE_END(OSSL_TARGETING_INFORMATION)
 
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_TARGET)
@@ -73,8 +74,8 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_TARGETS)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_TARGETING_INFORMATION)
 
 static int i2r_ISSUER_SERIAL(X509V3_EXT_METHOD *method,
-                             OSSL_ISSUER_SERIAL *iss,
-                             BIO *out, int indent)
+    OSSL_ISSUER_SERIAL *iss,
+    BIO *out, int indent)
 {
     if (iss->issuer != NULL) {
         BIO_printf(out, "%*sIssuer Names:\n", indent, "");
@@ -99,8 +100,8 @@ static int i2r_ISSUER_SERIAL(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_OBJECT_DIGEST_INFO(X509V3_EXT_METHOD *method,
-                           OSSL_OBJECT_DIGEST_INFO *odi,
-                           BIO *out, int indent)
+    OSSL_OBJECT_DIGEST_INFO *odi,
+    BIO *out, int indent)
 {
     int64_t dot = 0;
     int sig_nid;
@@ -157,8 +158,8 @@ static int i2r_OBJECT_DIGEST_INFO(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_TARGET_CERT(X509V3_EXT_METHOD *method,
-                           OSSL_TARGET_CERT *tc,
-                           BIO *out, int indent)
+    OSSL_TARGET_CERT *tc,
+    BIO *out, int indent)
 {
     BIO_printf(out, "%*s", indent, "");
     if (tc->targetCertificate != NULL) {
@@ -179,8 +180,8 @@ static int i2r_TARGET_CERT(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_TARGET(X509V3_EXT_METHOD *method,
-                      OSSL_TARGET *target,
-                      BIO *out, int indent)
+    OSSL_TARGET *target,
+    BIO *out, int indent)
 {
     switch (target->type) {
     case OSSL_TGT_TARGET_NAME:
@@ -202,8 +203,8 @@ static int i2r_TARGET(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_TARGETS(X509V3_EXT_METHOD *method,
-                      OSSL_TARGETS *targets,
-                      BIO *out, int indent)
+    OSSL_TARGETS *targets,
+    BIO *out, int indent)
 {
     int i;
     OSSL_TARGET *target;
@@ -217,8 +218,8 @@ static int i2r_TARGETS(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_TARGETING_INFORMATION(X509V3_EXT_METHOD *method,
-                                     OSSL_TARGETING_INFORMATION *tinfo,
-                                     BIO *out, int indent)
+    OSSL_TARGETING_INFORMATION *tinfo,
+    BIO *out, int indent)
 {
     int i;
     OSSL_TARGETS *targets;
diff --git a/crypto/x509/v3_addr.c b/crypto/x509/v3_addr.c
index ac0e1e66d9586..c8e865477c6bd 100644
--- a/crypto/x509/v3_addr.c
+++ b/crypto/x509/v3_addr.c
@@ -40,25 +40,24 @@ ASN1_SEQUENCE(IPAddressRange) = {
 
 ASN1_CHOICE(IPAddressOrRange) = {
     ASN1_SIMPLE(IPAddressOrRange, u.addressPrefix, ASN1_BIT_STRING),
-    ASN1_SIMPLE(IPAddressOrRange, u.addressRange,  IPAddressRange)
+    ASN1_SIMPLE(IPAddressOrRange, u.addressRange, IPAddressRange)
 } ASN1_CHOICE_END(IPAddressOrRange)
 
 ASN1_CHOICE(IPAddressChoice) = {
-    ASN1_SIMPLE(IPAddressChoice,      u.inherit,           ASN1_NULL),
+    ASN1_SIMPLE(IPAddressChoice, u.inherit, ASN1_NULL),
     ASN1_SEQUENCE_OF(IPAddressChoice, u.addressesOrRanges, IPAddressOrRange)
 } ASN1_CHOICE_END(IPAddressChoice)
 
 ASN1_SEQUENCE(IPAddressFamily) = {
-    ASN1_SIMPLE(IPAddressFamily, addressFamily,   ASN1_OCTET_STRING),
+    ASN1_SIMPLE(IPAddressFamily, addressFamily, ASN1_OCTET_STRING),
     ASN1_SIMPLE(IPAddressFamily, ipAddressChoice, IPAddressChoice)
 } ASN1_SEQUENCE_END(IPAddressFamily)
 
-ASN1_ITEM_TEMPLATE(IPAddrBlocks) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
-                          IPAddrBlocks, IPAddressFamily)
+ASN1_ITEM_TEMPLATE(IPAddrBlocks) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+    IPAddrBlocks, IPAddressFamily)
 static_ASN1_ITEM_TEMPLATE_END(IPAddrBlocks)
 
-IMPLEMENT_ASN1_FUNCTIONS(IPAddressRange)
+    IMPLEMENT_ASN1_FUNCTIONS(IPAddressRange)
 IMPLEMENT_ASN1_FUNCTIONS(IPAddressOrRange)
 IMPLEMENT_ASN1_FUNCTIONS(IPAddressChoice)
 IMPLEMENT_ASN1_FUNCTIONS(IPAddressFamily)
@@ -66,7 +65,7 @@ IMPLEMENT_ASN1_FUNCTIONS(IPAddressFamily)
 /*
  * How much buffer space do we need for a raw address?
  */
-# define ADDR_RAW_BUF_LEN 16
+#define ADDR_RAW_BUF_LEN 16
 
 /*
  * What's the address length associated with this AFI?
@@ -89,9 +88,9 @@ static int length_from_afi(const unsigned afi)
 unsigned int X509v3_addr_get_afi(const IPAddressFamily *f)
 {
     if (f == NULL
-            || f->addressFamily == NULL
-            || f->addressFamily->data == NULL
-            || f->addressFamily->length < 2)
+        || f->addressFamily == NULL
+        || f->addressFamily->data == NULL
+        || f->addressFamily->length < 2)
         return 0;
     return (f->addressFamily->data[0] << 8) | f->addressFamily->data[1];
 }
@@ -101,8 +100,8 @@ unsigned int X509v3_addr_get_afi(const IPAddressFamily *f)
  * At the moment this is coded for simplicity, not speed.
  */
 static int addr_expand(unsigned char *addr,
-                       const ASN1_BIT_STRING *bs,
-                       const int length, const unsigned char fill)
+    const ASN1_BIT_STRING *bs,
+    const int length, const unsigned char fill)
 {
     if (bs->length < 0 || bs->length > length)
         return 0;
@@ -124,14 +123,14 @@ static int addr_expand(unsigned char *addr,
 /*
  * Extract the prefix length from a bitstring.
  */
-# define addr_prefixlen(bs) ((int)((bs)->length * 8 - ((bs)->flags & 7)))
+#define addr_prefixlen(bs) ((int)((bs)->length * 8 - ((bs)->flags & 7)))
 
 /*
  * i2r handler for one address bitstring.
  */
 static int i2r_address(BIO *out,
-                       const unsigned afi,
-                       const unsigned char fill, const ASN1_BIT_STRING *bs)
+    const unsigned afi,
+    const unsigned char fill, const ASN1_BIT_STRING *bs)
 {
     unsigned char addr[ADDR_RAW_BUF_LEN];
     int i, n;
@@ -148,10 +147,11 @@ static int i2r_address(BIO *out,
         if (!addr_expand(addr, bs, 16, fill))
             return 0;
         for (n = 16; n > 1 && addr[n - 1] == 0x00 && addr[n - 2] == 0x00;
-             n -= 2) ;
+            n -= 2)
+            ;
         for (i = 0; i < n; i += 2)
             BIO_printf(out, "%x%s", (addr[i] << 8) | addr[i + 1],
-                       (i < 14 ? ":" : ""));
+                (i < 14 ? ":" : ""));
         if (i < 16)
             BIO_puts(out, ":");
         if (i == 0)
@@ -170,9 +170,9 @@ static int i2r_address(BIO *out,
  * i2r handler for a sequence of addresses and ranges.
  */
 static int i2r_IPAddressOrRanges(BIO *out,
-                                 const int indent,
-                                 const IPAddressOrRanges *aors,
-                                 const unsigned afi)
+    const int indent,
+    const IPAddressOrRanges *aors,
+    const unsigned afi)
 {
     int i;
 
@@ -203,7 +203,7 @@ static int i2r_IPAddressOrRanges(BIO *out,
  * i2r handler for an IPAddrBlocks extension.
  */
 static int i2r_IPAddrBlocks(const X509V3_EXT_METHOD *method,
-                            void *ext, BIO *out, int indent)
+    void *ext, BIO *out, int indent)
 {
     const IPAddrBlocks *addr = ext;
     int i;
@@ -251,7 +251,7 @@ static int i2r_IPAddrBlocks(const X509V3_EXT_METHOD *method,
                 break;
             default:
                 BIO_printf(out, " (Unknown SAFI %u)",
-                           (unsigned)f->addressFamily->data[2]);
+                    (unsigned)f->addressFamily->data[2]);
                 break;
             }
         }
@@ -262,9 +262,8 @@ static int i2r_IPAddrBlocks(const X509V3_EXT_METHOD *method,
         case IPAddressChoice_addressesOrRanges:
             BIO_puts(out, ":\n");
             if (!i2r_IPAddressOrRanges(out,
-                                       indent + 2,
-                                       f->ipAddressChoice->
-                                       u.addressesOrRanges, afi))
+                    indent + 2,
+                    f->ipAddressChoice->u.addressesOrRanges, afi))
                 return 0;
             break;
         }
@@ -283,7 +282,7 @@ static int i2r_IPAddrBlocks(const X509V3_EXT_METHOD *method,
  * for garbage input, tough noogies.
  */
 static int IPAddressOrRange_cmp(const IPAddressOrRange *a,
-                                const IPAddressOrRange *b, const int length)
+    const IPAddressOrRange *b, const int length)
 {
     unsigned char addr_a[ADDR_RAW_BUF_LEN], addr_b[ADDR_RAW_BUF_LEN];
     int prefixlen_a = 0, prefixlen_b = 0;
@@ -330,7 +329,7 @@ static int IPAddressOrRange_cmp(const IPAddressOrRange *a,
  * comparison routines are only allowed two arguments.
  */
 static int v4IPAddressOrRange_cmp(const IPAddressOrRange *const *a,
-                                  const IPAddressOrRange *const *b)
+    const IPAddressOrRange *const *b)
 {
     return IPAddressOrRange_cmp(*a, *b, 4);
 }
@@ -340,7 +339,7 @@ static int v4IPAddressOrRange_cmp(const IPAddressOrRange *const *a,
  * comparison routines are only allowed two arguments.
  */
 static int v6IPAddressOrRange_cmp(const IPAddressOrRange *const *a,
-                                  const IPAddressOrRange *const *b)
+    const IPAddressOrRange *const *b)
 {
     return IPAddressOrRange_cmp(*a, *b, 16);
 }
@@ -350,7 +349,7 @@ static int v6IPAddressOrRange_cmp(const IPAddressOrRange *const *a,
  * See last paragraph of RFC 3779 2.2.3.7.
  */
 static int range_should_be_prefix(const unsigned char *min,
-                                  const unsigned char *max, const int length)
+    const unsigned char *max, const int length)
 {
     unsigned char mask;
     int i, j;
@@ -362,8 +361,10 @@ static int range_should_be_prefix(const unsigned char *min,
      */
     assert(memcmp(min, max, length) <= 0);
 
-    for (i = 0; i < length && min[i] == max[i]; i++) ;
-    for (j = length - 1; j >= 0 && min[j] == 0x00 && max[j] == 0xFF; j--) ;
+    for (i = 0; i < length && min[i] == max[i]; i++)
+        ;
+    for (j = length - 1; j >= 0 && min[j] == 0x00 && max[j] == 0xFF; j--)
+        ;
     if (i < j)
         return -1;
     if (i > j)
@@ -404,7 +405,7 @@ static int range_should_be_prefix(const unsigned char *min,
  * Construct a prefix.
  */
 static int make_addressPrefix(IPAddressOrRange **result, unsigned char *addr,
-                              const int prefixlen, const int afilen)
+    const int prefixlen, const int afilen)
 {
     int bytelen = (prefixlen + 7) / 8, bitlen = prefixlen % 8;
     IPAddressOrRange *aor;
@@ -414,8 +415,7 @@ static int make_addressPrefix(IPAddressOrRange **result, unsigned char *addr,
     if ((aor = IPAddressOrRange_new()) == NULL)
         return 0;
     aor->type = IPAddressOrRange_addressPrefix;
-    if (aor->u.addressPrefix == NULL &&
-        (aor->u.addressPrefix = ASN1_BIT_STRING_new()) == NULL)
+    if (aor->u.addressPrefix == NULL && (aor->u.addressPrefix = ASN1_BIT_STRING_new()) == NULL)
         goto err;
     if (!ASN1_BIT_STRING_set(aor->u.addressPrefix, addr, bytelen))
         goto err;
@@ -426,7 +426,7 @@ static int make_addressPrefix(IPAddressOrRange **result, unsigned char *addr,
     *result = aor;
     return 1;
 
- err:
+err:
     IPAddressOrRange_free(aor);
     return 0;
 }
@@ -437,8 +437,8 @@ static int make_addressPrefix(IPAddressOrRange **result, unsigned char *addr,
  * the rest of the code considerably.
  */
 static int make_addressRange(IPAddressOrRange **result,
-                             unsigned char *min,
-                             unsigned char *max, const int length)
+    unsigned char *min,
+    unsigned char *max, const int length)
 {
     IPAddressOrRange *aor;
     int i, prefixlen;
@@ -454,14 +454,13 @@ static int make_addressRange(IPAddressOrRange **result,
     aor->type = IPAddressOrRange_addressRange;
     if ((aor->u.addressRange = IPAddressRange_new()) == NULL)
         goto err;
-    if (aor->u.addressRange->min == NULL &&
-        (aor->u.addressRange->min = ASN1_BIT_STRING_new()) == NULL)
+    if (aor->u.addressRange->min == NULL && (aor->u.addressRange->min = ASN1_BIT_STRING_new()) == NULL)
         goto err;
-    if (aor->u.addressRange->max == NULL &&
-        (aor->u.addressRange->max = ASN1_BIT_STRING_new()) == NULL)
+    if (aor->u.addressRange->max == NULL && (aor->u.addressRange->max = ASN1_BIT_STRING_new()) == NULL)
         goto err;
 
-    for (i = length; i > 0 && min[i - 1] == 0x00; --i) ;
+    for (i = length; i > 0 && min[i - 1] == 0x00; --i)
+        ;
     if (!ASN1_BIT_STRING_set(aor->u.addressRange->min, min, i))
         goto err;
     ossl_asn1_string_set_bits_left(aor->u.addressRange->min, 0);
@@ -474,7 +473,8 @@ static int make_addressRange(IPAddressOrRange **result,
         aor->u.addressRange->min->flags |= 8 - j;
     }
 
-    for (i = length; i > 0 && max[i - 1] == 0xFF; --i) ;
+    for (i = length; i > 0 && max[i - 1] == 0xFF; --i)
+        ;
     if (!ASN1_BIT_STRING_set(aor->u.addressRange->max, max, i))
         goto err;
     ossl_asn1_string_set_bits_left(aor->u.addressRange->max, 0);
@@ -490,7 +490,7 @@ static int make_addressRange(IPAddressOrRange **result,
     *result = aor;
     return 1;
 
- err:
+err:
     IPAddressOrRange_free(aor);
     return 0;
 }
@@ -499,8 +499,8 @@ static int make_addressRange(IPAddressOrRange **result,
  * Construct a new address family or find an existing one.
  */
 static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,
-                                             const unsigned afi,
-                                             const unsigned *safi)
+    const unsigned afi,
+    const unsigned *safi)
 {
     IPAddressFamily *f;
     unsigned char key[3];
@@ -518,18 +518,15 @@ static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,
 
     for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
         f = sk_IPAddressFamily_value(addr, i);
-        if (f->addressFamily->length == keylen &&
-            !memcmp(f->addressFamily->data, key, keylen))
+        if (f->addressFamily->length == keylen && !memcmp(f->addressFamily->data, key, keylen))
             return f;
     }
 
     if ((f = IPAddressFamily_new()) == NULL)
         goto err;
-    if (f->ipAddressChoice == NULL &&
-        (f->ipAddressChoice = IPAddressChoice_new()) == NULL)
+    if (f->ipAddressChoice == NULL && (f->ipAddressChoice = IPAddressChoice_new()) == NULL)
         goto err;
-    if (f->addressFamily == NULL &&
-        (f->addressFamily = ASN1_OCTET_STRING_new()) == NULL)
+    if (f->addressFamily == NULL && (f->addressFamily = ASN1_OCTET_STRING_new()) == NULL)
         goto err;
     if (!ASN1_OCTET_STRING_set(f->addressFamily, key, keylen))
         goto err;
@@ -538,7 +535,7 @@ static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,
 
     return f;
 
- err:
+err:
     IPAddressFamily_free(f);
     return NULL;
 }
@@ -547,20 +544,15 @@ static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,
  * Add an inheritance element.
  */
 int X509v3_addr_add_inherit(IPAddrBlocks *addr,
-                            const unsigned afi, const unsigned *safi)
+    const unsigned afi, const unsigned *safi)
 {
     IPAddressFamily *f = make_IPAddressFamily(addr, afi, safi);
 
-    if (f == NULL ||
-        f->ipAddressChoice == NULL ||
-        (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges &&
-         f->ipAddressChoice->u.addressesOrRanges != NULL))
+    if (f == NULL || f->ipAddressChoice == NULL || (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges && f->ipAddressChoice->u.addressesOrRanges != NULL))
         return 0;
-    if (f->ipAddressChoice->type == IPAddressChoice_inherit &&
-        f->ipAddressChoice->u.inherit != NULL)
+    if (f->ipAddressChoice->type == IPAddressChoice_inherit && f->ipAddressChoice->u.inherit != NULL)
         return 1;
-    if (f->ipAddressChoice->u.inherit == NULL &&
-        (f->ipAddressChoice->u.inherit = ASN1_NULL_new()) == NULL)
+    if (f->ipAddressChoice->u.inherit == NULL && (f->ipAddressChoice->u.inherit = ASN1_NULL_new()) == NULL)
         return 0;
     f->ipAddressChoice->type = IPAddressChoice_inherit;
     return 1;
@@ -570,16 +562,13 @@ int X509v3_addr_add_inherit(IPAddrBlocks *addr,
  * Construct an IPAddressOrRange sequence, or return an existing one.
  */
 static IPAddressOrRanges *make_prefix_or_range(IPAddrBlocks *addr,
-                                               const unsigned afi,
-                                               const unsigned *safi)
+    const unsigned afi,
+    const unsigned *safi)
 {
     IPAddressFamily *f = make_IPAddressFamily(addr, afi, safi);
     IPAddressOrRanges *aors = NULL;
 
-    if (f == NULL ||
-        f->ipAddressChoice == NULL ||
-        (f->ipAddressChoice->type == IPAddressChoice_inherit &&
-         f->ipAddressChoice->u.inherit != NULL))
+    if (f == NULL || f->ipAddressChoice == NULL || (f->ipAddressChoice->type == IPAddressChoice_inherit && f->ipAddressChoice->u.inherit != NULL))
         return NULL;
     if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges)
         aors = f->ipAddressChoice->u.addressesOrRanges;
@@ -604,15 +593,15 @@ static IPAddressOrRanges *make_prefix_or_range(IPAddrBlocks *addr,
  * Add a prefix.
  */
 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)
 {
     IPAddressOrRanges *aors = make_prefix_or_range(addr, afi, safi);
     IPAddressOrRange *aor;
 
     if (aors == NULL
-            || !make_addressPrefix(&aor, a, prefixlen, length_from_afi(afi)))
+        || !make_addressPrefix(&aor, a, prefixlen, length_from_afi(afi)))
         return 0;
     if (sk_IPAddressOrRange_push(aors, aor))
         return 1;
@@ -624,9 +613,9 @@ int X509v3_addr_add_prefix(IPAddrBlocks *addr,
  * Add a range.
  */
 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)
 {
     IPAddressOrRanges *aors = make_prefix_or_range(addr, afi, safi);
     IPAddressOrRange *aor;
@@ -646,17 +635,15 @@ int X509v3_addr_add_range(IPAddrBlocks *addr,
  * Extract min and max values from an IPAddressOrRange.
  */
 static int extract_min_max(IPAddressOrRange *aor,
-                           unsigned char *min, unsigned char *max, int length)
+    unsigned char *min, unsigned char *max, int length)
 {
     if (aor == NULL || min == NULL || max == NULL)
         return 0;
     switch (aor->type) {
     case IPAddressOrRange_addressPrefix:
-        return (addr_expand(min, aor->u.addressPrefix, length, 0x00) &&
-                addr_expand(max, aor->u.addressPrefix, length, 0xFF));
+        return (addr_expand(min, aor->u.addressPrefix, length, 0x00) && addr_expand(max, aor->u.addressPrefix, length, 0xFF));
     case IPAddressOrRange_addressRange:
-        return (addr_expand(min, aor->u.addressRange->min, length, 0x00) &&
-                addr_expand(max, aor->u.addressRange->max, length, 0xFF));
+        return (addr_expand(min, aor->u.addressRange->min, length, 0x00) && addr_expand(max, aor->u.addressRange->max, length, 0xFF));
     }
     return 0;
 }
@@ -665,17 +652,13 @@ static int extract_min_max(IPAddressOrRange *aor,
  * Public wrapper for extract_min_max().
  */
 int X509v3_addr_get_range(IPAddressOrRange *aor,
-                          const unsigned afi,
-                          unsigned char *min,
-                          unsigned char *max, const int length)
+    const unsigned afi,
+    unsigned char *min,
+    unsigned char *max, const int length)
 {
     int afi_length = length_from_afi(afi);
 
-    if (aor == NULL || min == NULL || max == NULL ||
-        afi_length == 0 || length < afi_length ||
-        (aor->type != IPAddressOrRange_addressPrefix &&
-         aor->type != IPAddressOrRange_addressRange) ||
-        !extract_min_max(aor, min, max, afi_length))
+    if (aor == NULL || min == NULL || max == NULL || afi_length == 0 || length < afi_length || (aor->type != IPAddressOrRange_addressPrefix && aor->type != IPAddressOrRange_addressRange) || !extract_min_max(aor, min, max, afi_length))
         return 0;
 
     return afi_length;
@@ -692,7 +675,7 @@ int X509v3_addr_get_range(IPAddressOrRange *aor,
  * would have expected and is what the following code implements.
  */
 static int IPAddressFamily_cmp(const IPAddressFamily *const *a_,
-                               const IPAddressFamily *const *b_)
+    const IPAddressFamily *const *b_)
 {
     const ASN1_OCTET_STRING *a = (*a_)->addressFamily;
     const ASN1_OCTET_STRING *b = (*b_)->addressFamily;
@@ -775,31 +758,28 @@ int X509v3_addr_is_canonical(IPAddrBlocks *addr)
             IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, j);
             IPAddressOrRange *b = sk_IPAddressOrRange_value(aors, j + 1);
 
-            if (!extract_min_max(a, a_min, a_max, length) ||
-                !extract_min_max(b, b_min, b_max, length))
+            if (!extract_min_max(a, a_min, a_max, length) || !extract_min_max(b, b_min, b_max, length))
                 return 0;
 
             /*
              * Punt misordered list, overlapping start, or inverted range.
              */
-            if (memcmp(a_min, b_min, length) >= 0 ||
-                memcmp(a_min, a_max, length) > 0 ||
-                memcmp(b_min, b_max, length) > 0)
+            if (memcmp(a_min, b_min, length) >= 0 || memcmp(a_min, a_max, length) > 0 || memcmp(b_min, b_max, length) > 0)
                 return 0;
 
             /*
              * Punt if adjacent or overlapping.  Check for adjacency by
              * subtracting one from b_min first.
              */
-            for (k = length - 1; k >= 0 && b_min[k]-- == 0x00; k--) ;
+            for (k = length - 1; k >= 0 && b_min[k]-- == 0x00; k--)
+                ;
             if (memcmp(a_max, b_min, length) >= 0)
                 return 0;
 
             /*
              * Check for range that should be expressed as a prefix.
              */
-            if (a->type == IPAddressOrRange_addressRange &&
-                range_should_be_prefix(a_min, a_max, length) >= 0)
+            if (a->type == IPAddressOrRange_addressRange && range_should_be_prefix(a_min, a_max, length) >= 0)
                 return 0;
         }
 
@@ -814,8 +794,7 @@ int X509v3_addr_is_canonical(IPAddrBlocks *addr)
             if (a != NULL && a->type == IPAddressOrRange_addressRange) {
                 if (!extract_min_max(a, a_min, a_max, length))
                     return 0;
-                if (memcmp(a_min, a_max, length) > 0 ||
-                    range_should_be_prefix(a_min, a_max, length) >= 0)
+                if (memcmp(a_min, a_max, length) > 0 || range_should_be_prefix(a_min, a_max, length) >= 0)
                     return 0;
             }
         }
@@ -831,7 +810,7 @@ int X509v3_addr_is_canonical(IPAddrBlocks *addr)
  * Whack an IPAddressOrRanges into canonical form.
  */
 static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors,
-                                      const unsigned afi)
+    const unsigned afi)
 {
     int i, j, length = length_from_afi(afi);
 
@@ -849,15 +828,13 @@ static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors,
         unsigned char a_min[ADDR_RAW_BUF_LEN], a_max[ADDR_RAW_BUF_LEN];
         unsigned char b_min[ADDR_RAW_BUF_LEN], b_max[ADDR_RAW_BUF_LEN];
 
-        if (!extract_min_max(a, a_min, a_max, length) ||
-            !extract_min_max(b, b_min, b_max, length))
+        if (!extract_min_max(a, a_min, a_max, length) || !extract_min_max(b, b_min, b_max, length))
             return 0;
 
         /*
          * Punt inverted ranges.
          */
-        if (memcmp(a_min, a_max, length) > 0 ||
-            memcmp(b_min, b_max, length) > 0)
+        if (memcmp(a_min, a_max, length) > 0 || memcmp(b_min, b_max, length) > 0)
             return 0;
 
         /*
@@ -870,7 +847,8 @@ static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors,
          * Merge if a and b are adjacent.  We check for
          * adjacency by subtracting one from b_min first.
          */
-        for (j = length - 1; j >= 0 && b_min[j]-- == 0x00; j--) ;
+        for (j = length - 1; j >= 0 && b_min[j]-- == 0x00; j--)
+            ;
         if (memcmp(a_max, b_min, length) == 0) {
             IPAddressOrRange *merged;
 
@@ -923,10 +901,7 @@ int X509v3_addr_canonize(IPAddrBlocks *addr)
         if (!IPAddressFamily_check_len(f))
             return 0;
 
-        if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges &&
-            !IPAddressOrRanges_canonize(f->ipAddressChoice->
-                                        u.addressesOrRanges,
-                                        X509v3_addr_get_afi(f)))
+        if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges && !IPAddressOrRanges_canonize(f->ipAddressChoice->u.addressesOrRanges, X509v3_addr_get_afi(f)))
             return 0;
     }
     (void)sk_IPAddressFamily_set_cmp_func(addr, IPAddressFamily_cmp);
@@ -940,8 +915,8 @@ int X509v3_addr_canonize(IPAddrBlocks *addr)
  * v2i handler for the IPAddrBlocks extension.
  */
 static void *v2i_IPAddrBlocks(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)
 {
     static const char v4addr_chars[] = "0123456789.";
     static const char v6addr_chars[] = "0123456789.:abcdefABCDEF";
@@ -973,7 +948,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
             safi = &safi_;
         } else {
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_EXTENSION_NAME_ERROR,
-                           "%s", val->name);
+                "%s", val->name);
             goto err;
         }
 
@@ -1042,9 +1017,9 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
         case '/':
             prefixlen = (int)strtoul(s + i2, &t, 10);
             if (t == s + i2
-                    || *t != '\0'
-                    || prefixlen > (length * 8)
-                    || prefixlen < 0) {
+                || *t != '\0'
+                || prefixlen > (length * 8)
+                || prefixlen < 0) {
                 ERR_raise(ERR_LIB_X509V3, X509V3_R_EXTENSION_VALUE_ERROR);
                 X509V3_conf_add_error_name_value(val);
                 goto err;
@@ -1100,7 +1075,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
         goto err;
     return addr;
 
- err:
+err:
     OPENSSL_free(s);
     sk_IPAddressFamily_pop_free(addr, IPAddressFamily_free);
     return NULL;
@@ -1110,17 +1085,17 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
  * OpenSSL dispatch
  */
 const X509V3_EXT_METHOD ossl_v3_addr = {
-    NID_sbgp_ipAddrBlock,       /* nid */
-    0,                          /* flags */
+    NID_sbgp_ipAddrBlock, /* nid */
+    0, /* flags */
     ASN1_ITEM_ref(IPAddrBlocks), /* template */
-    0, 0, 0, 0,                 /* old functions, ignored */
-    0,                          /* i2s */
-    0,                          /* s2i */
-    0,                          /* i2v */
-    v2i_IPAddrBlocks,           /* v2i */
-    i2r_IPAddrBlocks,           /* i2r */
-    0,                          /* r2i */
-    NULL                        /* extension-specific data */
+    0, 0, 0, 0, /* old functions, ignored */
+    0, /* i2s */
+    0, /* s2i */
+    0, /* i2v */
+    v2i_IPAddrBlocks, /* v2i */
+    i2r_IPAddrBlocks, /* i2r */
+    0, /* r2i */
+    NULL /* extension-specific data */
 };
 
 /*
@@ -1145,7 +1120,7 @@ int X509v3_addr_inherits(IPAddrBlocks *addr)
  * Figure out whether parent contains child.
  */
 static int addr_contains(IPAddressOrRanges *parent,
-                         IPAddressOrRanges *child, int length)
+    IPAddressOrRanges *child, int length)
 {
     unsigned char p_min[ADDR_RAW_BUF_LEN], p_max[ADDR_RAW_BUF_LEN];
     unsigned char c_min[ADDR_RAW_BUF_LEN], c_max[ADDR_RAW_BUF_LEN];
@@ -1159,13 +1134,13 @@ static int addr_contains(IPAddressOrRanges *parent,
     p = 0;
     for (c = 0; c < sk_IPAddressOrRange_num(child); c++) {
         if (!extract_min_max(sk_IPAddressOrRange_value(child, c),
-                             c_min, c_max, length))
+                c_min, c_max, length))
             return 0;
         for (;; p++) {
             if (p >= sk_IPAddressOrRange_num(parent))
                 return 0;
             if (!extract_min_max(sk_IPAddressOrRange_value(parent, p),
-                                 p_min, p_max, length))
+                    p_min, p_max, length))
                 return 0;
             if (memcmp(p_max, c_max, length) < 0)
                 continue;
@@ -1202,8 +1177,8 @@ int X509v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b)
         if (!IPAddressFamily_check_len(fa) || !IPAddressFamily_check_len(fb))
             return 0;
         if (!addr_contains(fb->ipAddressChoice->u.addressesOrRanges,
-                           fa->ipAddressChoice->u.addressesOrRanges,
-                           length_from_afi(X509v3_addr_get_afi(fb))))
+                fa->ipAddressChoice->u.addressesOrRanges,
+                length_from_afi(X509v3_addr_get_afi(fb))))
             return 0;
     }
     return 1;
@@ -1212,18 +1187,18 @@ int X509v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b)
 /*
  * Validation error handling via callback.
  */
-# define validation_err(_err_)            \
-    do {                                  \
-        if (ctx != NULL) {                \
-            ctx->error = _err_;           \
-            ctx->error_depth = i;         \
-            ctx->current_cert = x;        \
-            rv = ctx->verify_cb(0, ctx);  \
-        } else {                          \
-            rv = 0;                       \
-        }                                 \
-        if (rv == 0)                      \
-            goto done;                    \
+#define validation_err(_err_)            \
+    do {                                 \
+        if (ctx != NULL) {               \
+            ctx->error = _err_;          \
+            ctx->error_depth = i;        \
+            ctx->current_cert = x;       \
+            rv = ctx->verify_cb(0, ctx); \
+        } else {                         \
+            rv = 0;                      \
+        }                                \
+        if (rv == 0)                     \
+            goto done;                   \
     } while (0)
 
 /*
@@ -1235,16 +1210,16 @@ int X509v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b)
  * X509_V_OK.
  */
 static int addr_validate_path_internal(X509_STORE_CTX *ctx,
-                                       STACK_OF(X509) *chain,
-                                       IPAddrBlocks *ext)
+    STACK_OF(X509) *chain,
+    IPAddrBlocks *ext)
 {
     IPAddrBlocks *child = NULL;
     int i, j, ret = 0, rv;
     X509 *x;
 
     if (!ossl_assert(chain != NULL && sk_X509_num(chain) > 0)
-            || !ossl_assert(ctx != NULL || ext != NULL)
-            || !ossl_assert(ctx == NULL || ctx->verify_cb != NULL)) {
+        || !ossl_assert(ctx != NULL || ext != NULL)
+        || !ossl_assert(ctx == NULL || ctx->verify_cb != NULL)) {
         if (ctx != NULL)
             ctx->error = X509_V_ERR_UNSPECIFIED;
         return 0;
@@ -1298,17 +1273,15 @@ static int addr_validate_path_internal(X509_STORE_CTX *ctx,
             continue;
         }
         (void)sk_IPAddressFamily_set_cmp_func(x->rfc3779_addr,
-                                              IPAddressFamily_cmp);
+            IPAddressFamily_cmp);
         sk_IPAddressFamily_sort(x->rfc3779_addr);
         for (j = 0; j < sk_IPAddressFamily_num(child); j++) {
             IPAddressFamily *fc = sk_IPAddressFamily_value(child, j);
             int k = sk_IPAddressFamily_find(x->rfc3779_addr, fc);
-            IPAddressFamily *fp =
-                sk_IPAddressFamily_value(x->rfc3779_addr, k);
+            IPAddressFamily *fp = sk_IPAddressFamily_value(x->rfc3779_addr, k);
 
             if (fp == NULL) {
-                if (fc->ipAddressChoice->type ==
-                    IPAddressChoice_addressesOrRanges) {
+                if (fc->ipAddressChoice->type == IPAddressChoice_addressesOrRanges) {
                     validation_err(X509_V_ERR_UNNESTED_RESOURCE);
                     break;
                 }
@@ -1318,12 +1291,11 @@ static int addr_validate_path_internal(X509_STORE_CTX *ctx,
             if (!IPAddressFamily_check_len(fc) || !IPAddressFamily_check_len(fp))
                 goto done;
 
-            if (fp->ipAddressChoice->type ==
-                IPAddressChoice_addressesOrRanges) {
+            if (fp->ipAddressChoice->type == IPAddressChoice_addressesOrRanges) {
                 if (fc->ipAddressChoice->type == IPAddressChoice_inherit
                     || addr_contains(fp->ipAddressChoice->u.addressesOrRanges,
-                                     fc->ipAddressChoice->u.addressesOrRanges,
-                                     length_from_afi(X509v3_addr_get_afi(fc))))
+                        fc->ipAddressChoice->u.addressesOrRanges,
+                        length_from_afi(X509v3_addr_get_afi(fc))))
                     (void)sk_IPAddressFamily_set(child, j, fp);
                 else
                     validation_err(X509_V_ERR_UNNESTED_RESOURCE);
@@ -1347,12 +1319,12 @@ static int addr_validate_path_internal(X509_STORE_CTX *ctx,
         }
     }
     ret = 1;
- done:
+done:
     sk_IPAddressFamily_free(child);
     return ret;
 }
 
-# undef validation_err
+#undef validation_err
 
 /*
  * RFC 3779 2.3 path validation -- called from X509_verify_cert().
@@ -1360,8 +1332,8 @@ static int addr_validate_path_internal(X509_STORE_CTX *ctx,
 int X509v3_addr_validate_path(X509_STORE_CTX *ctx)
 {
     if (ctx->chain == NULL
-            || sk_X509_num(ctx->chain) == 0
-            || ctx->verify_cb == NULL) {
+        || sk_X509_num(ctx->chain) == 0
+        || ctx->verify_cb == NULL) {
         ctx->error = X509_V_ERR_UNSPECIFIED;
         return 0;
     }
@@ -1373,7 +1345,7 @@ int X509v3_addr_validate_path(X509_STORE_CTX *ctx)
  * Test whether chain covers extension.
  */
 int X509v3_addr_validate_resource_set(STACK_OF(X509) *chain,
-                                      IPAddrBlocks *ext, int allow_inheritance)
+    IPAddrBlocks *ext, int allow_inheritance)
 {
     if (ext == NULL)
         return 1;
diff --git a/crypto/x509/v3_admis.c b/crypto/x509/v3_admis.c
index 8f9e95c44a703..607d408376ef8 100644
--- a/crypto/x509/v3_admis.c
+++ b/crypto/x509/v3_admis.c
@@ -51,26 +51,26 @@ IMPLEMENT_ASN1_FUNCTIONS(ADMISSIONS)
 IMPLEMENT_ASN1_FUNCTIONS(ADMISSION_SYNTAX)
 
 static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in,
-                                BIO *bp, int ind);
+    BIO *bp, int ind);
 
 const X509V3_EXT_METHOD ossl_v3_ext_admission = {
-    NID_x509ExtAdmission,   /* .ext_nid = */
-    0,                      /* .ext_flags = */
+    NID_x509ExtAdmission, /* .ext_nid = */
+    0, /* .ext_flags = */
     ASN1_ITEM_ref(ADMISSION_SYNTAX), /* .it = */
     NULL, NULL, NULL, NULL,
-    NULL,                   /* .i2s = */
-    NULL,                   /* .s2i = */
-    NULL,                   /* .i2v = */
-    NULL,                   /* .v2i = */
-    &i2r_ADMISSION_SYNTAX,  /* .i2r = */
-    NULL,                   /* .r2i = */
-    NULL                    /* extension-specific data */
+    NULL, /* .i2s = */
+    NULL, /* .s2i = */
+    NULL, /* .i2v = */
+    NULL, /* .v2i = */
+    &i2r_ADMISSION_SYNTAX, /* .i2r = */
+    NULL, /* .r2i = */
+    NULL /* extension-specific data */
 };
 
 static int i2r_NAMING_AUTHORITY(const struct v3_ext_method *method, void *in,
-                                BIO *bp, int ind)
+    BIO *bp, int ind)
 {
-    NAMING_AUTHORITY *namingAuthority = (NAMING_AUTHORITY *) in;
+    NAMING_AUTHORITY *namingAuthority = (NAMING_AUTHORITY *)in;
 
     if (namingAuthority == NULL)
         return 0;
@@ -93,7 +93,8 @@ static int i2r_NAMING_AUTHORITY(const struct v3_ext_method *method, void *in,
         OBJ_obj2txt(objbuf, sizeof(objbuf), namingAuthority->namingAuthorityId, 1);
 
         if (BIO_printf(bp, "%s%s%s%s\n", ln ? ln : "",
-                       ln ? " (" : "", objbuf, ln ? ")" : "") <= 0)
+                ln ? " (" : "", objbuf, ln ? ")" : "")
+            <= 0)
             goto err;
     }
     if (namingAuthority->namingAuthorityText != NULL) {
@@ -115,7 +116,7 @@ static int i2r_NAMING_AUTHORITY(const struct v3_ext_method *method, void *in,
 }
 
 static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in,
-                                BIO *bp, int ind)
+    BIO *bp, int ind)
 {
     ADMISSION_SYNTAX *admission = (ADMISSION_SYNTAX *)in;
     int i, j, k;
@@ -189,8 +190,9 @@ static int i2r_ADMISSION_SYNTAX(const struct v3_ext_method *method, void *in,
 
                     OBJ_obj2txt(objbuf, sizeof(objbuf), obj, 1);
                     if (BIO_printf(bp, "%*s      %s%s%s%s\n", ind, "",
-                                   ln ? ln : "", ln ? " (" : "",
-                                   objbuf, ln ? ")" : "") <= 0)
+                            ln ? ln : "", ln ? " (" : "",
+                            objbuf, ln ? ")" : "")
+                        <= 0)
                         goto err;
                 }
             }
@@ -241,7 +243,7 @@ const GENERAL_NAME *ADMISSION_SYNTAX_get0_admissionAuthority(const ADMISSION_SYN
 }
 
 void ADMISSION_SYNTAX_set0_admissionAuthority(ADMISSION_SYNTAX *as,
-                                              GENERAL_NAME *aa)
+    GENERAL_NAME *aa)
 {
     GENERAL_NAME_free(as->admissionAuthority);
     as->admissionAuthority = aa;
@@ -253,7 +255,7 @@ const STACK_OF(ADMISSIONS) *ADMISSION_SYNTAX_get0_contentsOfAdmissions(const ADM
 }
 
 void ADMISSION_SYNTAX_set0_contentsOfAdmissions(ADMISSION_SYNTAX *as,
-                                                STACK_OF(ADMISSIONS) *a)
+    STACK_OF(ADMISSIONS) *a)
 {
     sk_ADMISSIONS_pop_free(as->contentsOfAdmissions, ADMISSIONS_free);
     as->contentsOfAdmissions = a;
@@ -298,7 +300,7 @@ const ASN1_OCTET_STRING *PROFESSION_INFO_get0_addProfessionInfo(const PROFESSION
 }
 
 void PROFESSION_INFO_set0_addProfessionInfo(PROFESSION_INFO *pi,
-                                            ASN1_OCTET_STRING *aos)
+    ASN1_OCTET_STRING *aos)
 {
     ASN1_OCTET_STRING_free(pi->addProfessionInfo);
     pi->addProfessionInfo = aos;
@@ -310,7 +312,7 @@ const NAMING_AUTHORITY *PROFESSION_INFO_get0_namingAuthority(const PROFESSION_IN
 }
 
 void PROFESSION_INFO_set0_namingAuthority(PROFESSION_INFO *pi,
-                                          NAMING_AUTHORITY *na)
+    NAMING_AUTHORITY *na)
 {
     NAMING_AUTHORITY_free(pi->namingAuthority);
     pi->namingAuthority = na;
@@ -322,7 +324,7 @@ const STACK_OF(ASN1_STRING) *PROFESSION_INFO_get0_professionItems(const PROFESSI
 }
 
 void PROFESSION_INFO_set0_professionItems(PROFESSION_INFO *pi,
-                                          STACK_OF(ASN1_STRING) *as)
+    STACK_OF(ASN1_STRING) *as)
 {
     sk_ASN1_STRING_pop_free(pi->professionItems, ASN1_STRING_free);
     pi->professionItems = as;
@@ -334,7 +336,7 @@ const STACK_OF(ASN1_OBJECT) *PROFESSION_INFO_get0_professionOIDs(const PROFESSIO
 }
 
 void PROFESSION_INFO_set0_professionOIDs(PROFESSION_INFO *pi,
-                                         STACK_OF(ASN1_OBJECT) *po)
+    STACK_OF(ASN1_OBJECT) *po)
 {
     sk_ASN1_OBJECT_pop_free(pi->professionOIDs, ASN1_OBJECT_free);
     pi->professionOIDs = po;
@@ -346,7 +348,7 @@ const ASN1_PRINTABLESTRING *PROFESSION_INFO_get0_registrationNumber(const PROFES
 }
 
 void PROFESSION_INFO_set0_registrationNumber(PROFESSION_INFO *pi,
-                                             ASN1_PRINTABLESTRING *rn)
+    ASN1_PRINTABLESTRING *rn)
 {
     ASN1_PRINTABLESTRING_free(pi->registrationNumber);
     pi->registrationNumber = rn;
diff --git a/crypto/x509/v3_admis.h b/crypto/x509/v3_admis.h
index 1e82c0f4a33fe..75a07c1fcdff1 100644
--- a/crypto/x509/v3_admis.h
+++ b/crypto/x509/v3_admis.h
@@ -8,31 +8,31 @@
  */
 
 #ifndef OSSL_CRYPTO_X509_V3_ADMIS_H
-# define OSSL_CRYPTO_X509_V3_ADMIS_H
+#define OSSL_CRYPTO_X509_V3_ADMIS_H
 
 struct NamingAuthority_st {
-    ASN1_OBJECT* namingAuthorityId;
-    ASN1_IA5STRING* namingAuthorityUrl;
-    ASN1_STRING* namingAuthorityText;          /* i.e. DIRECTORYSTRING */
+    ASN1_OBJECT *namingAuthorityId;
+    ASN1_IA5STRING *namingAuthorityUrl;
+    ASN1_STRING *namingAuthorityText; /* i.e. DIRECTORYSTRING */
 };
 
 struct ProfessionInfo_st {
-    NAMING_AUTHORITY* namingAuthority;
-    STACK_OF(ASN1_STRING)* professionItems;    /* i.e. DIRECTORYSTRING */
-    STACK_OF(ASN1_OBJECT)* professionOIDs;
-    ASN1_PRINTABLESTRING* registrationNumber;
-    ASN1_OCTET_STRING* addProfessionInfo;
+    NAMING_AUTHORITY *namingAuthority;
+    STACK_OF(ASN1_STRING) *professionItems; /* i.e. DIRECTORYSTRING */
+    STACK_OF(ASN1_OBJECT) *professionOIDs;
+    ASN1_PRINTABLESTRING *registrationNumber;
+    ASN1_OCTET_STRING *addProfessionInfo;
 };
 
 struct Admissions_st {
-    GENERAL_NAME* admissionAuthority;
-    NAMING_AUTHORITY* namingAuthority;
-    STACK_OF(PROFESSION_INFO)* professionInfos;
+    GENERAL_NAME *admissionAuthority;
+    NAMING_AUTHORITY *namingAuthority;
+    STACK_OF(PROFESSION_INFO) *professionInfos;
 };
 
 struct AdmissionSyntax_st {
-    GENERAL_NAME* admissionAuthority;
-    STACK_OF(ADMISSIONS)* contentsOfAdmissions;
+    GENERAL_NAME *admissionAuthority;
+    STACK_OF(ADMISSIONS) *contentsOfAdmissions;
 };
 
 #endif
diff --git a/crypto/x509/v3_akeya.c b/crypto/x509/v3_akeya.c
index aae8c21e73c2f..0d5691a117cbd 100644
--- a/crypto/x509/v3_akeya.c
+++ b/crypto/x509/v3_akeya.c
@@ -15,9 +15,9 @@
 #include <openssl/x509v3.h>
 
 ASN1_SEQUENCE(AUTHORITY_KEYID) = {
-        ASN1_IMP_OPT(AUTHORITY_KEYID, keyid, ASN1_OCTET_STRING, 0),
-        ASN1_IMP_SEQUENCE_OF_OPT(AUTHORITY_KEYID, issuer, GENERAL_NAME, 1),
-        ASN1_IMP_OPT(AUTHORITY_KEYID, serial, ASN1_INTEGER, 2)
+    ASN1_IMP_OPT(AUTHORITY_KEYID, keyid, ASN1_OCTET_STRING, 0),
+    ASN1_IMP_SEQUENCE_OF_OPT(AUTHORITY_KEYID, issuer, GENERAL_NAME, 1),
+    ASN1_IMP_OPT(AUTHORITY_KEYID, serial, ASN1_INTEGER, 2)
 } ASN1_SEQUENCE_END(AUTHORITY_KEYID)
 
 IMPLEMENT_ASN1_FUNCTIONS(AUTHORITY_KEYID)
diff --git a/crypto/x509/v3_akid.c b/crypto/x509/v3_akid.c
index de93dae70edc7..08c751b77cfde 100644
--- a/crypto/x509/v3_akid.c
+++ b/crypto/x509/v3_akid.c
@@ -17,28 +17,28 @@
 #include "ext_dat.h"
 
 static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
-                                                 AUTHORITY_KEYID *akeyid,
-                                                 STACK_OF(CONF_VALUE)
-                                                 *extlist);
+    AUTHORITY_KEYID *akeyid,
+    STACK_OF(CONF_VALUE)
+        *extlist);
 static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
-                                            X509V3_CTX *ctx,
-                                            STACK_OF(CONF_VALUE) *values);
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *values);
 
 const X509V3_EXT_METHOD ossl_v3_akey_id = {
     NID_authority_key_identifier,
     X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_KEYID),
     0, 0, 0, 0,
     0, 0,
-    (X509V3_EXT_I2V) i2v_AUTHORITY_KEYID,
+    (X509V3_EXT_I2V)i2v_AUTHORITY_KEYID,
     (X509V3_EXT_V2I)v2i_AUTHORITY_KEYID,
     0, 0,
     NULL
 };
 
 static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
-                                                 AUTHORITY_KEYID *akeyid,
-                                                 STACK_OF(CONF_VALUE)
-                                                 *extlist)
+    AUTHORITY_KEYID *akeyid,
+    STACK_OF(CONF_VALUE)
+        *extlist)
 {
     char *tmp = NULL;
     STACK_OF(CONF_VALUE) *origextlist = extlist, *tmpextlist;
@@ -50,7 +50,7 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
             return NULL;
         }
         if (!X509V3_add_value((akeyid->issuer || akeyid->serial) ? "keyid" : NULL,
-                              tmp, &extlist)) {
+                tmp, &extlist)) {
             OPENSSL_free(tmp);
             ERR_raise(ERR_LIB_X509V3, ERR_R_X509_LIB);
             goto err;
@@ -78,7 +78,7 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
         OPENSSL_free(tmp);
     }
     return extlist;
- err:
+err:
     if (origextlist == NULL)
         sk_CONF_VALUE_pop_free(extlist, X509V3_conf_free);
     return NULL;
@@ -94,8 +94,8 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
  * this is always included.
  */
 static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
-                                            X509V3_CTX *ctx,
-                                            STACK_OF(CONF_VALUE) *values)
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *values)
 {
     char keyid = 0, issuer = 0;
     int i, n = sk_CONF_VALUE_num(values);
@@ -121,7 +121,7 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
         cnf = sk_CONF_VALUE_value(values, i);
         if (cnf->value != NULL && strcmp(cnf->value, "always") != 0) {
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_UNKNOWN_OPTION,
-                           "name=%s option=%s", cnf->name, cnf->value);
+                "name=%s option=%s", cnf->name, cnf->value);
             goto err;
         }
         if (strcmp(cnf->name, "keyid") == 0 && keyid == 0) {
@@ -133,14 +133,14 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
             if (cnf->value != NULL)
                 issuer = 2;
         } else if (strcmp(cnf->name, "none") == 0
-                   || strcmp(cnf->name, "keyid") == 0
-                   || strcmp(cnf->name, "issuer") == 0) {
+            || strcmp(cnf->name, "keyid") == 0
+            || strcmp(cnf->name, "issuer") == 0) {
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_BAD_VALUE,
-                           "name=%s", cnf->name);
+                "name=%s", cnf->name);
             goto err;
         } else {
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_UNKNOWN_VALUE,
-                           "name=%s", cnf->name);
+                "name=%s", cnf->name);
             goto err;
         }
     }
@@ -224,7 +224,7 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
 
     return akeyid;
 
- err:
+err:
     sk_GENERAL_NAME_free(gens);
     GENERAL_NAME_free(gen);
     X509_NAME_free(isname);
diff --git a/crypto/x509/v3_asid.c b/crypto/x509/v3_asid.c
index e08e11d587eb4..a2c7553a72447 100644
--- a/crypto/x509/v3_asid.c
+++ b/crypto/x509/v3_asid.c
@@ -32,23 +32,23 @@
  */
 
 ASN1_SEQUENCE(ASRange) = {
-  ASN1_SIMPLE(ASRange, min, ASN1_INTEGER),
-  ASN1_SIMPLE(ASRange, max, ASN1_INTEGER)
+    ASN1_SIMPLE(ASRange, min, ASN1_INTEGER),
+    ASN1_SIMPLE(ASRange, max, ASN1_INTEGER)
 } ASN1_SEQUENCE_END(ASRange)
 
 ASN1_CHOICE(ASIdOrRange) = {
-  ASN1_SIMPLE(ASIdOrRange, u.id,    ASN1_INTEGER),
-  ASN1_SIMPLE(ASIdOrRange, u.range, ASRange)
+    ASN1_SIMPLE(ASIdOrRange, u.id, ASN1_INTEGER),
+    ASN1_SIMPLE(ASIdOrRange, u.range, ASRange)
 } ASN1_CHOICE_END(ASIdOrRange)
 
 ASN1_CHOICE(ASIdentifierChoice) = {
-  ASN1_SIMPLE(ASIdentifierChoice,      u.inherit,       ASN1_NULL),
-  ASN1_SEQUENCE_OF(ASIdentifierChoice, u.asIdsOrRanges, ASIdOrRange)
+    ASN1_SIMPLE(ASIdentifierChoice, u.inherit, ASN1_NULL),
+    ASN1_SEQUENCE_OF(ASIdentifierChoice, u.asIdsOrRanges, ASIdOrRange)
 } ASN1_CHOICE_END(ASIdentifierChoice)
 
 ASN1_SEQUENCE(ASIdentifiers) = {
-  ASN1_EXP_OPT(ASIdentifiers, asnum, ASIdentifierChoice, 0),
-  ASN1_EXP_OPT(ASIdentifiers, rdi,   ASIdentifierChoice, 1)
+    ASN1_EXP_OPT(ASIdentifiers, asnum, ASIdentifierChoice, 0),
+    ASN1_EXP_OPT(ASIdentifiers, rdi, ASIdentifierChoice, 1)
 } ASN1_SEQUENCE_END(ASIdentifiers)
 
 IMPLEMENT_ASN1_FUNCTIONS(ASRange)
@@ -60,8 +60,8 @@ IMPLEMENT_ASN1_FUNCTIONS(ASIdentifiers)
  * i2r method for an ASIdentifierChoice.
  */
 static int i2r_ASIdentifierChoice(BIO *out,
-                                  ASIdentifierChoice *choice,
-                                  int indent, const char *msg)
+    ASIdentifierChoice *choice,
+    int indent, const char *msg)
 {
     int i;
     char *s;
@@ -74,8 +74,7 @@ static int i2r_ASIdentifierChoice(BIO *out,
         break;
     case ASIdentifierChoice_asIdsOrRanges:
         for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges); i++) {
-            ASIdOrRange *aor =
-                sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
+            ASIdOrRange *aor = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
             switch (aor->type) {
             case ASIdOrRange_id:
                 if ((s = i2s_ASN1_INTEGER(NULL, aor->u.id)) == NULL)
@@ -108,38 +107,33 @@ static int i2r_ASIdentifierChoice(BIO *out,
  * i2r method for an ASIdentifier extension.
  */
 static int i2r_ASIdentifiers(const X509V3_EXT_METHOD *method,
-                             void *ext, BIO *out, int indent)
+    void *ext, BIO *out, int indent)
 {
     ASIdentifiers *asid = ext;
     return (i2r_ASIdentifierChoice(out, asid->asnum, indent,
-                                   "Autonomous System Numbers") &&
-            i2r_ASIdentifierChoice(out, asid->rdi, indent,
-                                   "Routing Domain Identifiers"));
+                "Autonomous System Numbers")
+        && i2r_ASIdentifierChoice(out, asid->rdi, indent,
+            "Routing Domain Identifiers"));
 }
 
 /*
  * Sort comparison function for a sequence of ASIdOrRange elements.
  */
 static int ASIdOrRange_cmp(const ASIdOrRange *const *a_,
-                           const ASIdOrRange *const *b_)
+    const ASIdOrRange *const *b_)
 {
     const ASIdOrRange *a = *a_, *b = *b_;
 
-    assert((a->type == ASIdOrRange_id && a->u.id != NULL) ||
-           (a->type == ASIdOrRange_range && a->u.range != NULL &&
-            a->u.range->min != NULL && a->u.range->max != NULL));
+    assert((a->type == ASIdOrRange_id && a->u.id != NULL) || (a->type == ASIdOrRange_range && a->u.range != NULL && a->u.range->min != NULL && a->u.range->max != NULL));
 
-    assert((b->type == ASIdOrRange_id && b->u.id != NULL) ||
-           (b->type == ASIdOrRange_range && b->u.range != NULL &&
-            b->u.range->min != NULL && b->u.range->max != NULL));
+    assert((b->type == ASIdOrRange_id && b->u.id != NULL) || (b->type == ASIdOrRange_range && b->u.range != NULL && b->u.range->min != NULL && b->u.range->max != NULL));
 
     if (a->type == ASIdOrRange_id && b->type == ASIdOrRange_id)
         return ASN1_INTEGER_cmp(a->u.id, b->u.id);
 
     if (a->type == ASIdOrRange_range && b->type == ASIdOrRange_range) {
         int r = ASN1_INTEGER_cmp(a->u.range->min, b->u.range->min);
-        return r != 0 ? r : ASN1_INTEGER_cmp(a->u.range->max,
-                                             b->u.range->max);
+        return r != 0 ? r : ASN1_INTEGER_cmp(a->u.range->max, b->u.range->max);
     }
 
     if (a->type == ASIdOrRange_id)
@@ -183,7 +177,7 @@ int X509v3_asid_add_inherit(ASIdentifiers *asid, int which)
  * Add an ID or range to an ASIdentifierChoice.
  */
 int X509v3_asid_add_id_or_range(ASIdentifiers *asid,
-                                int which, ASN1_INTEGER *min, ASN1_INTEGER *max)
+    int which, ASN1_INTEGER *min, ASN1_INTEGER *max)
 {
     ASIdentifierChoice **choice;
     ASIdOrRange *aor;
@@ -233,7 +227,7 @@ int X509v3_asid_add_id_or_range(ASIdentifiers *asid,
         goto err;
     return 1;
 
- err:
+err:
     ASIdOrRange_free(aor);
     return 0;
 }
@@ -242,7 +236,7 @@ int X509v3_asid_add_id_or_range(ASIdentifiers *asid,
  * Extract min and max values from an ASIdOrRange.
  */
 static int extract_min_max(ASIdOrRange *aor,
-                           ASN1_INTEGER **min, ASN1_INTEGER **max)
+    ASN1_INTEGER **min, ASN1_INTEGER **max)
 {
     if (!ossl_assert(aor != NULL))
         return 0;
@@ -279,8 +273,7 @@ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
     /*
      * If not a list, or if empty list, it's broken.
      */
-    if (choice->type != ASIdentifierChoice_asIdsOrRanges ||
-        sk_ASIdOrRange_num(choice->u.asIdsOrRanges) == 0)
+    if (choice->type != ASIdentifierChoice_asIdsOrRanges || sk_ASIdOrRange_num(choice->u.asIdsOrRanges) == 0)
         return 0;
 
     /*
@@ -289,33 +282,27 @@ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
     for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) {
         ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
         ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1);
-        ASN1_INTEGER *a_min = NULL, *a_max = NULL, *b_min = NULL, *b_max =
-            NULL;
+        ASN1_INTEGER *a_min = NULL, *a_max = NULL, *b_min = NULL, *b_max = NULL;
 
         if (!extract_min_max(a, &a_min, &a_max)
-                || !extract_min_max(b, &b_min, &b_max))
+            || !extract_min_max(b, &b_min, &b_max))
             goto done;
 
         /*
          * Punt misordered list, overlapping start, or inverted range.
          */
-        if (ASN1_INTEGER_cmp(a_min, b_min) >= 0 ||
-            ASN1_INTEGER_cmp(a_min, a_max) > 0 ||
-            ASN1_INTEGER_cmp(b_min, b_max) > 0)
+        if (ASN1_INTEGER_cmp(a_min, b_min) >= 0 || ASN1_INTEGER_cmp(a_min, a_max) > 0 || ASN1_INTEGER_cmp(b_min, b_max) > 0)
             goto done;
 
         /*
          * Calculate a_max + 1 to check for adjacency.
          */
-        if ((bn == NULL && (bn = BN_new()) == NULL) ||
-            ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
-            !BN_add_word(bn, 1)) {
+        if ((bn == NULL && (bn = BN_new()) == NULL) || ASN1_INTEGER_to_BN(a_max, bn) == NULL || !BN_add_word(bn, 1)) {
             ERR_raise(ERR_LIB_X509V3, ERR_R_BN_LIB);
             goto done;
         }
 
-        if ((a_max_plus_one =
-                BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) {
+        if ((a_max_plus_one = BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) {
             a_max_plus_one = orig;
             ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
             goto done;
@@ -337,14 +324,14 @@ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
         ASN1_INTEGER *a_min, *a_max;
         if (a != NULL && a->type == ASIdOrRange_range) {
             if (!extract_min_max(a, &a_min, &a_max)
-                    || ASN1_INTEGER_cmp(a_min, a_max) > 0)
+                || ASN1_INTEGER_cmp(a_min, a_max) > 0)
                 goto done;
         }
     }
 
     ret = 1;
 
- done:
+done:
     ASN1_INTEGER_free(a_max_plus_one);
     BN_free(bn);
     return ret;
@@ -355,9 +342,7 @@ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
  */
 int X509v3_asid_is_canonical(ASIdentifiers *asid)
 {
-    return (asid == NULL ||
-            (ASIdentifierChoice_is_canonical(asid->asnum) &&
-             ASIdentifierChoice_is_canonical(asid->rdi)));
+    return (asid == NULL || (ASIdentifierChoice_is_canonical(asid->asnum) && ASIdentifierChoice_is_canonical(asid->rdi)));
 }
 
 /*
@@ -379,8 +364,7 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
     /*
      * If not a list, or if empty list, it's broken.
      */
-    if (choice->type != ASIdentifierChoice_asIdsOrRanges ||
-        sk_ASIdOrRange_num(choice->u.asIdsOrRanges) == 0) {
+    if (choice->type != ASIdentifierChoice_asIdsOrRanges || sk_ASIdOrRange_num(choice->u.asIdsOrRanges) == 0) {
         ERR_raise(ERR_LIB_X509V3, X509V3_R_EXTENSION_VALUE_ERROR);
         return 0;
     }
@@ -397,11 +381,10 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
     for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) {
         ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
         ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1);
-        ASN1_INTEGER *a_min = NULL, *a_max = NULL, *b_min = NULL, *b_max =
-            NULL;
+        ASN1_INTEGER *a_min = NULL, *a_max = NULL, *b_min = NULL, *b_max = NULL;
 
         if (!extract_min_max(a, &a_min, &a_max)
-                || !extract_min_max(b, &b_min, &b_max))
+            || !extract_min_max(b, &b_min, &b_max))
             goto done;
 
         /*
@@ -413,8 +396,7 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
         /*
          * Punt inverted ranges.
          */
-        if (ASN1_INTEGER_cmp(a_min, a_max) > 0 ||
-            ASN1_INTEGER_cmp(b_min, b_max) > 0)
+        if (ASN1_INTEGER_cmp(a_min, a_max) > 0 || ASN1_INTEGER_cmp(b_min, b_max) > 0)
             goto done;
 
         /*
@@ -428,15 +410,12 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
         /*
          * Calculate a_max + 1 to check for adjacency.
          */
-        if ((bn == NULL && (bn = BN_new()) == NULL) ||
-            ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
-            !BN_add_word(bn, 1)) {
+        if ((bn == NULL && (bn = BN_new()) == NULL) || ASN1_INTEGER_to_BN(a_max, bn) == NULL || !BN_add_word(bn, 1)) {
             ERR_raise(ERR_LIB_X509V3, ERR_R_BN_LIB);
             goto done;
         }
 
-        if ((a_max_plus_one =
-                 BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) {
+        if ((a_max_plus_one = BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) {
             a_max_plus_one = orig;
             ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
             goto done;
@@ -485,7 +464,7 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
         ASN1_INTEGER *a_min, *a_max;
         if (a != NULL && a->type == ASIdOrRange_range) {
             if (!extract_min_max(a, &a_min, &a_max)
-                    || ASN1_INTEGER_cmp(a_min, a_max) > 0)
+                || ASN1_INTEGER_cmp(a_min, a_max) > 0)
                 goto done;
         }
     }
@@ -496,7 +475,7 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
 
     ret = 1;
 
- done:
+done:
     ASN1_INTEGER_free(a_max_plus_one);
     BN_free(bn);
     return ret;
@@ -507,17 +486,15 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
  */
 int X509v3_asid_canonize(ASIdentifiers *asid)
 {
-    return (asid == NULL ||
-            (ASIdentifierChoice_canonize(asid->asnum) &&
-             ASIdentifierChoice_canonize(asid->rdi)));
+    return (asid == NULL || (ASIdentifierChoice_canonize(asid->asnum) && ASIdentifierChoice_canonize(asid->rdi)));
 }
 
 /*
  * v2i method for an ASIdentifier extension.
  */
 static void *v2i_ASIdentifiers(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)
 {
     ASN1_INTEGER *min = NULL, *max = NULL;
     ASIdentifiers *asid = NULL;
@@ -624,7 +601,7 @@ static void *v2i_ASIdentifiers(const struct v3_ext_method *method,
         goto err;
     return asid;
 
- err:
+err:
     ASIdentifiers_free(asid);
     ASN1_INTEGER_free(min);
     ASN1_INTEGER_free(max);
@@ -635,17 +612,17 @@ static void *v2i_ASIdentifiers(const struct v3_ext_method *method,
  * OpenSSL dispatch.
  */
 const X509V3_EXT_METHOD ossl_v3_asid = {
-    NID_sbgp_autonomousSysNum,  /* nid */
-    0,                          /* flags */
+    NID_sbgp_autonomousSysNum, /* nid */
+    0, /* flags */
     ASN1_ITEM_ref(ASIdentifiers), /* template */
-    0, 0, 0, 0,                 /* old functions, ignored */
-    0,                          /* i2s */
-    0,                          /* s2i */
-    0,                          /* i2v */
-    v2i_ASIdentifiers,          /* v2i */
-    i2r_ASIdentifiers,          /* i2r */
-    0,                          /* r2i */
-    NULL                        /* extension-specific data */
+    0, 0, 0, 0, /* old functions, ignored */
+    0, /* i2s */
+    0, /* s2i */
+    0, /* i2v */
+    v2i_ASIdentifiers, /* v2i */
+    i2r_ASIdentifiers, /* i2r */
+    0, /* r2i */
+    NULL /* extension-specific data */
 };
 
 /*
@@ -653,11 +630,7 @@ const X509V3_EXT_METHOD ossl_v3_asid = {
  */
 int X509v3_asid_inherits(ASIdentifiers *asid)
 {
-    return (asid != NULL &&
-            ((asid->asnum != NULL &&
-              asid->asnum->type == ASIdentifierChoice_inherit) ||
-             (asid->rdi != NULL &&
-              asid->rdi->type == ASIdentifierChoice_inherit)));
+    return (asid != NULL && ((asid->asnum != NULL && asid->asnum->type == ASIdentifierChoice_inherit) || (asid->rdi != NULL && asid->rdi->type == ASIdentifierChoice_inherit)));
 }
 
 /*
@@ -681,7 +654,7 @@ static int asid_contains(ASIdOrRanges *parent, ASIdOrRanges *child)
             if (p >= sk_ASIdOrRange_num(parent))
                 return 0;
             if (!extract_min_max(sk_ASIdOrRange_value(parent, p), &p_min,
-                                 &p_max))
+                    &p_max))
                 return 0;
             if (ASN1_INTEGER_cmp(p_max, c_max) < 0)
                 continue;
@@ -711,55 +684,54 @@ int X509v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b)
         return 0;
 
     subset = a->asnum == NULL
-             || (b->asnum != NULL
-                 && asid_contains(b->asnum->u.asIdsOrRanges,
-                                  a->asnum->u.asIdsOrRanges));
+        || (b->asnum != NULL
+            && asid_contains(b->asnum->u.asIdsOrRanges,
+                a->asnum->u.asIdsOrRanges));
     if (!subset)
         return 0;
 
     return a->rdi == NULL
-           || (b->rdi != NULL
-               && asid_contains(b->rdi->u.asIdsOrRanges,
-                                a->rdi->u.asIdsOrRanges));
+        || (b->rdi != NULL
+            && asid_contains(b->rdi->u.asIdsOrRanges,
+                a->rdi->u.asIdsOrRanges));
 }
 
 /*
  * Validation error handling via callback.
  */
-#define validation_err(_err_)           \
-  do {                                  \
-    if (ctx != NULL) {                  \
-      ctx->error = _err_;               \
-      ctx->error_depth = i;             \
-      ctx->current_cert = x;            \
-      ret = ctx->verify_cb(0, ctx);     \
-    } else {                            \
-      ret = 0;                          \
-    }                                   \
-    if (!ret)                           \
-      goto done;                        \
-  } while (0)
+#define validation_err(_err_)             \
+    do {                                  \
+        if (ctx != NULL) {                \
+            ctx->error = _err_;           \
+            ctx->error_depth = i;         \
+            ctx->current_cert = x;        \
+            ret = ctx->verify_cb(0, ctx); \
+        } else {                          \
+            ret = 0;                      \
+        }                                 \
+        if (!ret)                         \
+            goto done;                    \
+    } while (0)
 
 /*
  * Core code for RFC 3779 3.3 path validation.
  */
 static int asid_validate_path_internal(X509_STORE_CTX *ctx,
-                                       STACK_OF(X509) *chain,
-                                       ASIdentifiers *ext)
+    STACK_OF(X509) *chain,
+    ASIdentifiers *ext)
 {
     ASIdOrRanges *child_as = NULL, *child_rdi = NULL;
     int i, ret = 1, inherit_as = 0, inherit_rdi = 0;
     X509 *x;
 
     if (!ossl_assert(chain != NULL && sk_X509_num(chain) > 0)
-            || !ossl_assert(ctx != NULL || ext != NULL)
-            || !ossl_assert(ctx == NULL || ctx->verify_cb != NULL)) {
+        || !ossl_assert(ctx != NULL || ext != NULL)
+        || !ossl_assert(ctx == NULL || ctx->verify_cb != NULL)) {
         if (ctx != NULL)
             ctx->error = X509_V_ERR_UNSPECIFIED;
         return 0;
     }
 
-
     /*
      * Figure out where to start.  If we don't have an extension to
      * check, we're done.  Otherwise, check canonical form and
@@ -820,12 +792,10 @@ static int asid_validate_path_internal(X509_STORE_CTX *ctx,
             child_as = NULL;
             inherit_as = 0;
         }
-        if (x->rfc3779_asid->asnum != NULL &&
-            x->rfc3779_asid->asnum->type ==
-            ASIdentifierChoice_asIdsOrRanges) {
+        if (x->rfc3779_asid->asnum != NULL && x->rfc3779_asid->asnum->type == ASIdentifierChoice_asIdsOrRanges) {
             if (inherit_as
                 || asid_contains(x->rfc3779_asid->asnum->u.asIdsOrRanges,
-                                 child_as)) {
+                    child_as)) {
                 child_as = x->rfc3779_asid->asnum->u.asIdsOrRanges;
                 inherit_as = 0;
             } else {
@@ -837,11 +807,8 @@ static int asid_validate_path_internal(X509_STORE_CTX *ctx,
             child_rdi = NULL;
             inherit_rdi = 0;
         }
-        if (x->rfc3779_asid->rdi != NULL &&
-            x->rfc3779_asid->rdi->type == ASIdentifierChoice_asIdsOrRanges) {
-            if (inherit_rdi ||
-                asid_contains(x->rfc3779_asid->rdi->u.asIdsOrRanges,
-                              child_rdi)) {
+        if (x->rfc3779_asid->rdi != NULL && x->rfc3779_asid->rdi->type == ASIdentifierChoice_asIdsOrRanges) {
+            if (inherit_rdi || asid_contains(x->rfc3779_asid->rdi->u.asIdsOrRanges, child_rdi)) {
                 child_rdi = x->rfc3779_asid->rdi->u.asIdsOrRanges;
                 inherit_rdi = 0;
             } else {
@@ -859,15 +826,13 @@ static int asid_validate_path_internal(X509_STORE_CTX *ctx,
         return 0;
     }
     if (x->rfc3779_asid != NULL) {
-        if (x->rfc3779_asid->asnum != NULL &&
-            x->rfc3779_asid->asnum->type == ASIdentifierChoice_inherit)
+        if (x->rfc3779_asid->asnum != NULL && x->rfc3779_asid->asnum->type == ASIdentifierChoice_inherit)
             validation_err(X509_V_ERR_UNNESTED_RESOURCE);
-        if (x->rfc3779_asid->rdi != NULL &&
-            x->rfc3779_asid->rdi->type == ASIdentifierChoice_inherit)
+        if (x->rfc3779_asid->rdi != NULL && x->rfc3779_asid->rdi->type == ASIdentifierChoice_inherit)
             validation_err(X509_V_ERR_UNNESTED_RESOURCE);
     }
 
- done:
+done:
     return ret;
 }
 
@@ -879,8 +844,8 @@ static int asid_validate_path_internal(X509_STORE_CTX *ctx,
 int X509v3_asid_validate_path(X509_STORE_CTX *ctx)
 {
     if (ctx->chain == NULL
-            || sk_X509_num(ctx->chain) == 0
-            || ctx->verify_cb == NULL) {
+        || sk_X509_num(ctx->chain) == 0
+        || ctx->verify_cb == NULL) {
         ctx->error = X509_V_ERR_UNSPECIFIED;
         return 0;
     }
@@ -892,7 +857,7 @@ int X509v3_asid_validate_path(X509_STORE_CTX *ctx)
  * Test whether chain covers extension.
  */
 int X509v3_asid_validate_resource_set(STACK_OF(X509) *chain,
-                                      ASIdentifiers *ext, int allow_inheritance)
+    ASIdentifiers *ext, int allow_inheritance)
 {
     if (ext == NULL)
         return 1;
@@ -903,4 +868,4 @@ int X509v3_asid_validate_resource_set(STACK_OF(X509) *chain,
     return asid_validate_path_internal(NULL, chain, ext);
 }
 
-#endif                          /* OPENSSL_NO_RFC3779 */
+#endif /* OPENSSL_NO_RFC3779 */
diff --git a/crypto/x509/v3_attrdesc.c b/crypto/x509/v3_attrdesc.c
index 45958e9affdc7..997241fac0d6c 100644
--- a/crypto/x509/v3_attrdesc.c
+++ b/crypto/x509/v3_attrdesc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2024-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
@@ -47,8 +47,8 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_PRIVILEGE_POLICY_ID)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_ATTRIBUTE_DESCRIPTOR)
 
 static int i2r_HASH(X509V3_EXT_METHOD *method,
-                    OSSL_HASH *hash,
-                    BIO *out, int indent)
+    OSSL_HASH *hash,
+    BIO *out, int indent)
 {
     if (BIO_printf(out, "%*sAlgorithm: ", indent, "") <= 0)
         return 0;
@@ -60,19 +60,22 @@ static int i2r_HASH(X509V3_EXT_METHOD *method,
         if (BIO_printf(out, "%*sParameter: ", indent, "") <= 0)
             return 0;
         if (ossl_print_attribute_value(out, 0, hash->algorithmIdentifier->parameter,
-                                       indent + 4) <= 0)
+                indent + 4)
+            <= 0)
             return 0;
         if (BIO_puts(out, "\n") <= 0)
             return 0;
     }
     if (BIO_printf(out, "%*sHash Value: ", indent, "") <= 0)
         return 0;
+    if (hash->hashValue == NULL)
+        return 0;
     return ossl_bio_print_hex(out, hash->hashValue->data, hash->hashValue->length);
 }
 
 static int i2r_INFO_SYNTAX_POINTER(X509V3_EXT_METHOD *method,
-                                   OSSL_INFO_SYNTAX_POINTER *pointer,
-                                   BIO *out, int indent)
+    OSSL_INFO_SYNTAX_POINTER *pointer,
+    BIO *out, int indent)
 {
     if (BIO_printf(out, "%*sNames:\n", indent, "") <= 0)
         return 0;
@@ -90,8 +93,8 @@ static int i2r_INFO_SYNTAX_POINTER(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_OSSL_INFO_SYNTAX(X509V3_EXT_METHOD *method,
-                                OSSL_INFO_SYNTAX *info,
-                                BIO *out, int indent)
+    OSSL_INFO_SYNTAX *info,
+    BIO *out, int indent)
 {
     switch (info->type) {
     case OSSL_INFO_SYNTAX_TYPE_CONTENT:
@@ -113,8 +116,8 @@ static int i2r_OSSL_INFO_SYNTAX(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_OSSL_PRIVILEGE_POLICY_ID(X509V3_EXT_METHOD *method,
-                                        OSSL_PRIVILEGE_POLICY_ID *ppid,
-                                        BIO *out, int indent)
+    OSSL_PRIVILEGE_POLICY_ID *ppid,
+    BIO *out, int indent)
 {
     char buf[80];
 
@@ -129,8 +132,8 @@ static int i2r_OSSL_PRIVILEGE_POLICY_ID(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_OSSL_ATTRIBUTE_DESCRIPTOR(X509V3_EXT_METHOD *method,
-                                         OSSL_ATTRIBUTE_DESCRIPTOR *ad,
-                                         BIO *out, int indent)
+    OSSL_ATTRIBUTE_DESCRIPTOR *ad,
+    BIO *out, int indent)
 {
     char buf[80];
 
@@ -142,7 +145,8 @@ static int i2r_OSSL_ATTRIBUTE_DESCRIPTOR(X509V3_EXT_METHOD *method,
     if (BIO_printf(out, "%*sSyntax:\n", indent, "") <= 0)
         return 0;
     if (BIO_printf(out, "%*s%.*s", indent + 4, "",
-                   ad->attributeSyntax->length, ad->attributeSyntax->data) <= 0)
+            ad->attributeSyntax->length, ad->attributeSyntax->data)
+        <= 0)
         return 0;
     if (BIO_puts(out, "\n\n") <= 0)
         return 0;
@@ -152,7 +156,8 @@ static int i2r_OSSL_ATTRIBUTE_DESCRIPTOR(X509V3_EXT_METHOD *method,
     }
     if (ad->description != NULL) {
         if (BIO_printf(out, "%*sDescription: %.*s\n", indent, "",
-                       ad->description->length, ad->description->data) <= 0)
+                ad->description->length, ad->description->data)
+            <= 0)
             return 0;
     }
     if (BIO_printf(out, "%*sDomination Rule:\n", indent, "") <= 0)
diff --git a/crypto/x509/v3_attrmap.c b/crypto/x509/v3_attrmap.c
index a01e6556ea1e4..614e3e26e9f38 100644
--- a/crypto/x509/v3_attrmap.c
+++ b/crypto/x509/v3_attrmap.c
@@ -29,13 +29,12 @@ ASN1_SEQUENCE(OSSL_ATTRIBUTE_VALUE_MAPPING) = {
 
 ASN1_CHOICE(OSSL_ATTRIBUTE_MAPPING) = {
     ASN1_IMP(OSSL_ATTRIBUTE_MAPPING, choice.typeMappings,
-             OSSL_ATTRIBUTE_TYPE_MAPPING, OSSL_ATTR_MAP_TYPE),
+        OSSL_ATTRIBUTE_TYPE_MAPPING, OSSL_ATTR_MAP_TYPE),
     ASN1_IMP(OSSL_ATTRIBUTE_MAPPING, choice.typeValueMappings,
-             OSSL_ATTRIBUTE_VALUE_MAPPING, OSSL_ATTR_MAP_VALUE),
+        OSSL_ATTRIBUTE_VALUE_MAPPING, OSSL_ATTR_MAP_VALUE),
 } ASN1_CHOICE_END(OSSL_ATTRIBUTE_MAPPING)
 
-ASN1_ITEM_TEMPLATE(OSSL_ATTRIBUTE_MAPPINGS) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, OSSL_ATTRIBUTE_MAPPINGS, OSSL_ATTRIBUTE_MAPPING)
+ASN1_ITEM_TEMPLATE(OSSL_ATTRIBUTE_MAPPINGS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, OSSL_ATTRIBUTE_MAPPINGS, OSSL_ATTRIBUTE_MAPPING)
 ASN1_ITEM_TEMPLATE_END(OSSL_ATTRIBUTE_MAPPINGS)
 
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_ATAV)
@@ -45,8 +44,8 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_ATTRIBUTE_MAPPING)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_ATTRIBUTE_MAPPINGS)
 
 static int i2r_ATTRIBUTE_MAPPING(X509V3_EXT_METHOD *method,
-                                 OSSL_ATTRIBUTE_MAPPING *am,
-                                 BIO *out, int indent)
+    OSSL_ATTRIBUTE_MAPPING *am,
+    BIO *out, int indent)
 {
     ASN1_OBJECT *local_type, *remote_type;
     int local_attr_nid, remote_attr_nid;
@@ -86,8 +85,8 @@ static int i2r_ATTRIBUTE_MAPPING(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_ATTRIBUTE_MAPPINGS(X509V3_EXT_METHOD *method,
-                                  OSSL_ATTRIBUTE_MAPPINGS *ams,
-                                  BIO *out, int indent)
+    OSSL_ATTRIBUTE_MAPPINGS *ams,
+    BIO *out, int indent)
 {
     int i;
     OSSL_ATTRIBUTE_MAPPING *am;
diff --git a/crypto/x509/v3_authattid.c b/crypto/x509/v3_authattid.c
index 65d9bb67eda36..829593ed6c8a3 100644
--- a/crypto/x509/v3_authattid.c
+++ b/crypto/x509/v3_authattid.c
@@ -16,15 +16,14 @@
 
 DECLARE_ASN1_ITEM(OSSL_ISSUER_SERIAL)
 
-ASN1_ITEM_TEMPLATE(OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX, OSSL_ISSUER_SERIAL)
+ASN1_ITEM_TEMPLATE(OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX, OSSL_ISSUER_SERIAL)
 ASN1_ITEM_TEMPLATE_END(OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX)
 
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX)
 
 static int i2r_ISSUER_SERIAL(X509V3_EXT_METHOD *method,
-                             OSSL_ISSUER_SERIAL *iss,
-                             BIO *out, int indent)
+    OSSL_ISSUER_SERIAL *iss,
+    BIO *out, int indent)
 {
     if (iss->issuer != NULL) {
         BIO_printf(out, "%*sIssuer Names:\n", indent, "");
@@ -49,8 +48,8 @@ static int i2r_ISSUER_SERIAL(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_auth_attr_id(X509V3_EXT_METHOD *method,
-                            OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX *aids,
-                            BIO *out, int indent)
+    OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX *aids,
+    BIO *out, int indent)
 {
     int i;
     OSSL_ISSUER_SERIAL *aid;
diff --git a/crypto/x509/v3_battcons.c b/crypto/x509/v3_battcons.c
index fd767fe7d72e4..3d030664027af 100644
--- a/crypto/x509/v3_battcons.c
+++ b/crypto/x509/v3_battcons.c
@@ -18,7 +18,7 @@ static STACK_OF(CONF_VALUE) *i2v_OSSL_BASIC_ATTR_CONSTRAINTS(
     X509V3_EXT_METHOD *method,
     OSSL_BASIC_ATTR_CONSTRAINTS *battcons,
     STACK_OF(CONF_VALUE)
-    *extlist);
+        *extlist);
 static OSSL_BASIC_ATTR_CONSTRAINTS *v2i_OSSL_BASIC_ATTR_CONSTRAINTS(
     X509V3_EXT_METHOD *method,
     X509V3_CTX *ctx,
@@ -29,7 +29,7 @@ const X509V3_EXT_METHOD ossl_v3_battcons = {
     ASN1_ITEM_ref(OSSL_BASIC_ATTR_CONSTRAINTS),
     0, 0, 0, 0,
     0, 0,
-    (X509V3_EXT_I2V) i2v_OSSL_BASIC_ATTR_CONSTRAINTS,
+    (X509V3_EXT_I2V)i2v_OSSL_BASIC_ATTR_CONSTRAINTS,
     (X509V3_EXT_V2I)v2i_OSSL_BASIC_ATTR_CONSTRAINTS,
     NULL, NULL,
     NULL
@@ -80,7 +80,7 @@ static OSSL_BASIC_ATTR_CONSTRAINTS *v2i_OSSL_BASIC_ATTR_CONSTRAINTS(
         }
     }
     return battcons;
- err:
+err:
     OSSL_BASIC_ATTR_CONSTRAINTS_free(battcons);
     return NULL;
 }
diff --git a/crypto/x509/v3_bcons.c b/crypto/x509/v3_bcons.c
index 17962ed43f011..b909966f024df 100644
--- a/crypto/x509/v3_bcons.c
+++ b/crypto/x509/v3_bcons.c
@@ -17,35 +17,35 @@
 #include "x509_local.h"
 
 static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
-                                                   BASIC_CONSTRAINTS *bcons,
-                                                   STACK_OF(CONF_VALUE)
-                                                   *extlist);
+    BASIC_CONSTRAINTS *bcons,
+    STACK_OF(CONF_VALUE)
+        *extlist);
 static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
-                                                X509V3_CTX *ctx,
-                                                STACK_OF(CONF_VALUE) *values);
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *values);
 
 const X509V3_EXT_METHOD ossl_v3_bcons = {
     NID_basic_constraints, 0,
     ASN1_ITEM_ref(BASIC_CONSTRAINTS),
     0, 0, 0, 0,
     0, 0,
-    (X509V3_EXT_I2V) i2v_BASIC_CONSTRAINTS,
+    (X509V3_EXT_I2V)i2v_BASIC_CONSTRAINTS,
     (X509V3_EXT_V2I)v2i_BASIC_CONSTRAINTS,
     NULL, NULL,
     NULL
 };
 
 ASN1_SEQUENCE(BASIC_CONSTRAINTS) = {
-        ASN1_OPT(BASIC_CONSTRAINTS, ca, ASN1_FBOOLEAN),
-        ASN1_OPT(BASIC_CONSTRAINTS, pathlen, ASN1_INTEGER)
+    ASN1_OPT(BASIC_CONSTRAINTS, ca, ASN1_FBOOLEAN),
+    ASN1_OPT(BASIC_CONSTRAINTS, pathlen, ASN1_INTEGER)
 } ASN1_SEQUENCE_END(BASIC_CONSTRAINTS)
 
 IMPLEMENT_ASN1_FUNCTIONS(BASIC_CONSTRAINTS)
 
 static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
-                                                   BASIC_CONSTRAINTS *bcons,
-                                                   STACK_OF(CONF_VALUE)
-                                                   *extlist)
+    BASIC_CONSTRAINTS *bcons,
+    STACK_OF(CONF_VALUE)
+        *extlist)
 {
     X509V3_add_value_bool("CA", bcons->ca, &extlist);
     X509V3_add_value_int("pathlen", bcons->pathlen, &extlist);
@@ -53,8 +53,8 @@ static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
 }
 
 static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
-                                                X509V3_CTX *ctx,
-                                                STACK_OF(CONF_VALUE) *values)
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *values)
 {
     BASIC_CONSTRAINTS *bcons = NULL;
     CONF_VALUE *val;
@@ -79,7 +79,7 @@ static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
         }
     }
     return bcons;
- err:
+err:
     BASIC_CONSTRAINTS_free(bcons);
     return NULL;
 }
diff --git a/crypto/x509/v3_bitst.c b/crypto/x509/v3_bitst.c
index d41c95b5138f6..be478127b7d1c 100644
--- a/crypto/x509/v3_bitst.c
+++ b/crypto/x509/v3_bitst.c
@@ -14,38 +14,36 @@
 #include "ext_dat.h"
 
 static BIT_STRING_BITNAME ns_cert_type_table[] = {
-    {0, "SSL Client", "client"},
-    {1, "SSL Server", "server"},
-    {2, "S/MIME", "email"},
-    {3, "Object Signing", "objsign"},
-    {4, "Unused", "reserved"},
-    {5, "SSL CA", "sslCA"},
-    {6, "S/MIME CA", "emailCA"},
-    {7, "Object Signing CA", "objCA"},
-    {-1, NULL, NULL}
+    { 0, "SSL Client", "client" },
+    { 1, "SSL Server", "server" },
+    { 2, "S/MIME", "email" },
+    { 3, "Object Signing", "objsign" },
+    { 4, "Unused", "reserved" },
+    { 5, "SSL CA", "sslCA" },
+    { 6, "S/MIME CA", "emailCA" },
+    { 7, "Object Signing CA", "objCA" },
+    { -1, NULL, NULL }
 };
 
 static BIT_STRING_BITNAME key_usage_type_table[] = {
-    {0, "Digital Signature", "digitalSignature"},
-    {1, "Non Repudiation", "nonRepudiation"},
-    {2, "Key Encipherment", "keyEncipherment"},
-    {3, "Data Encipherment", "dataEncipherment"},
-    {4, "Key Agreement", "keyAgreement"},
-    {5, "Certificate Sign", "keyCertSign"},
-    {6, "CRL Sign", "cRLSign"},
-    {7, "Encipher Only", "encipherOnly"},
-    {8, "Decipher Only", "decipherOnly"},
-    {-1, NULL, NULL}
+    { 0, "Digital Signature", "digitalSignature" },
+    { 1, "Non Repudiation", "nonRepudiation" },
+    { 2, "Key Encipherment", "keyEncipherment" },
+    { 3, "Data Encipherment", "dataEncipherment" },
+    { 4, "Key Agreement", "keyAgreement" },
+    { 5, "Certificate Sign", "keyCertSign" },
+    { 6, "CRL Sign", "cRLSign" },
+    { 7, "Encipher Only", "encipherOnly" },
+    { 8, "Decipher Only", "decipherOnly" },
+    { -1, NULL, NULL }
 };
 
-const X509V3_EXT_METHOD ossl_v3_nscert =
-EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table);
-const X509V3_EXT_METHOD ossl_v3_key_usage =
-EXT_BITSTRING(NID_key_usage, key_usage_type_table);
+const X509V3_EXT_METHOD ossl_v3_nscert = EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table);
+const X509V3_EXT_METHOD ossl_v3_key_usage = EXT_BITSTRING(NID_key_usage, key_usage_type_table);
 
 STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                                          ASN1_BIT_STRING *bits,
-                                          STACK_OF(CONF_VALUE) *ret)
+    ASN1_BIT_STRING *bits,
+    STACK_OF(CONF_VALUE) *ret)
 {
     BIT_STRING_BITNAME *bnam;
     for (bnam = method->usr_data; bnam->lname; bnam++) {
@@ -56,8 +54,8 @@ STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
 }
 
 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)
 {
     CONF_VALUE *val;
     ASN1_BIT_STRING *bs;
@@ -82,7 +80,7 @@ ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
         }
         if (!bnam->lname) {
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT,
-                           "%s", val->name);
+                "%s", val->name);
             ASN1_BIT_STRING_free(bs);
             return NULL;
         }
diff --git a/crypto/x509/v3_conf.c b/crypto/x509/v3_conf.c
index c575a43459ead..f9350d638130e 100644
--- a/crypto/x509/v3_conf.c
+++ b/crypto/x509/v3_conf.c
@@ -20,20 +20,20 @@
 static int v3_check_critical(const char **value);
 static int v3_check_generic(const char **value);
 static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
-                                    int crit, const char *value);
+    int crit, const char *value);
 static X509_EXTENSION *v3_generic_extension(const char *ext, const char *value,
-                                            int crit, int type,
-                                            X509V3_CTX *ctx);
+    int crit, int type,
+    X509V3_CTX *ctx);
 static char *conf_lhash_get_string(void *db, const char *section, const char *value);
 static STACK_OF(CONF_VALUE) *conf_lhash_get_section(void *db, const char *section);
 static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
-                                  int ext_nid, int crit, void *ext_struc);
+    int ext_nid, int crit, void *ext_struc);
 static unsigned char *generic_asn1(const char *value, X509V3_CTX *ctx,
-                                   long *ext_len);
+    long *ext_len);
 
 static X509_EXTENSION *X509V3_EXT_nconf_int(CONF *conf, X509V3_CTX *ctx,
-                                            const char *section,
-                                            const char *name, const char *value)
+    const char *section,
+    const char *name, const char *value)
 {
     int crit;
     int ext_type;
@@ -46,23 +46,23 @@ static X509_EXTENSION *X509V3_EXT_nconf_int(CONF *conf, X509V3_CTX *ctx,
     if (!ret) {
         if (section != NULL)
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_ERROR_IN_EXTENSION,
-                           "section=%s, name=%s, value=%s",
-                           section, name, value);
+                "section=%s, name=%s, value=%s",
+                section, name, value);
         else
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_ERROR_IN_EXTENSION,
-                           "name=%s, value=%s", name, value);
+                "name=%s, value=%s", name, value);
     }
     return ret;
 }
 
 X509_EXTENSION *X509V3_EXT_nconf(CONF *conf, X509V3_CTX *ctx, const char *name,
-                                 const char *value)
+    const char *value)
 {
     return X509V3_EXT_nconf_int(conf, ctx, NULL, name, value);
 }
 
 X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid,
-                                     const char *value)
+    const char *value)
 {
     int crit;
     int ext_type;
@@ -70,14 +70,14 @@ X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid,
     crit = v3_check_critical(&value);
     if ((ext_type = v3_check_generic(&value)))
         return v3_generic_extension(OBJ_nid2sn(ext_nid),
-                                    value, crit, ext_type, ctx);
+            value, crit, ext_type, ctx);
     return do_ext_nconf(conf, ctx, ext_nid, crit, value);
 }
 
 /* CONF *conf:  Config file    */
 /* char *value:  Value    */
 static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
-                                    int crit, const char *value)
+    int crit, const char *value)
 {
     const X509V3_EXT_METHOD *method;
     X509_EXTENSION *ext;
@@ -100,7 +100,7 @@ static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
             nval = X509V3_parse_list(value);
         if (nval == NULL || sk_CONF_VALUE_num(nval) <= 0) {
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_EXTENSION_STRING,
-                           "name=%s,section=%s", OBJ_nid2sn(ext_nid), value);
+                "name=%s,section=%s", OBJ_nid2sn(ext_nid), value);
             if (*value != '@')
                 sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
             return NULL;
@@ -122,7 +122,7 @@ static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
             return NULL;
     } else {
         ERR_raise_data(ERR_LIB_X509V3, X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED,
-                       "name=%s", OBJ_nid2sn(ext_nid));
+            "name=%s", OBJ_nid2sn(ext_nid));
         return NULL;
     }
 
@@ -132,11 +132,10 @@ static X509_EXTENSION *do_ext_nconf(CONF *conf, X509V3_CTX *ctx, int ext_nid,
     else
         method->ext_free(ext_struc);
     return ext;
-
 }
 
 static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
-                                  int ext_nid, int crit, void *ext_struc)
+    int ext_nid, int crit, void *ext_struc)
 {
     unsigned char *ext_der = NULL;
     int ext_len;
@@ -146,8 +145,7 @@ static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
     /* Convert internal representation to DER */
     if (method->it) {
         ext_der = NULL;
-        ext_len =
-            ASN1_item_i2d(ext_struc, &ext_der, ASN1_ITEM_ptr(method->it));
+        ext_len = ASN1_item_i2d(ext_struc, &ext_der, ASN1_ITEM_ptr(method->it));
         if (ext_len < 0) {
             ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
             goto err;
@@ -182,11 +180,10 @@ static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method,
 
     return ext;
 
- err:
+err:
     OPENSSL_free(ext_der);
     ASN1_OCTET_STRING_free(ext_oct);
     return NULL;
-
 }
 
 /* Given an internal structure, nid and critical flag create an extension */
@@ -236,8 +233,8 @@ static int v3_check_generic(const char **value)
 
 /* Create a generic extension: for now just handle DER type */
 static X509_EXTENSION *v3_generic_extension(const char *ext, const char *value,
-                                            int crit, int gen_type,
-                                            X509V3_CTX *ctx)
+    int crit, int gen_type,
+    X509V3_CTX *ctx)
 {
     unsigned char *ext_der = NULL;
     long ext_len = 0;
@@ -247,7 +244,7 @@ static X509_EXTENSION *v3_generic_extension(const char *ext, const char *value,
 
     if ((obj = OBJ_txt2obj(ext, 0)) == NULL) {
         ERR_raise_data(ERR_LIB_X509V3, X509V3_R_EXTENSION_NAME_ERROR,
-                       "name=%s", ext);
+            "name=%s", ext);
         goto err;
     }
 
@@ -258,7 +255,7 @@ static X509_EXTENSION *v3_generic_extension(const char *ext, const char *value,
 
     if (ext_der == NULL) {
         ERR_raise_data(ERR_LIB_X509V3, X509V3_R_EXTENSION_VALUE_ERROR,
-                       "value=%s", value);
+            "value=%s", value);
         goto err;
     }
 
@@ -273,16 +270,15 @@ static X509_EXTENSION *v3_generic_extension(const char *ext, const char *value,
 
     extension = X509_EXTENSION_create_by_OBJ(NULL, obj, crit, oct);
 
- err:
+err:
     ASN1_OBJECT_free(obj);
     ASN1_OCTET_STRING_free(oct);
     OPENSSL_free(ext_der);
     return extension;
-
 }
 
 static unsigned char *generic_asn1(const char *value, X509V3_CTX *ctx,
-                                   long *ext_len)
+    long *ext_len)
 {
     ASN1_TYPE *typ;
     unsigned char *ext_der = NULL;
@@ -311,7 +307,7 @@ static void delete_ext(STACK_OF(X509_EXTENSION) *sk, X509_EXTENSION *dext)
  * Note that on error new elements may have been added to *sk if sk != NULL.
  */
 int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, const char *section,
-                            STACK_OF(X509_EXTENSION) **sk)
+    STACK_OF(X509_EXTENSION) **sk)
 {
     X509_EXTENSION *ext;
     STACK_OF(CONF_VALUE) *nval;
@@ -337,7 +333,8 @@ int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, const char *section,
                 val = sk_CONF_VALUE_value(nval, akid);
         }
         if ((ext = X509V3_EXT_nconf_int(conf, ctx, val->section,
-                                        val->name, val->value)) == NULL)
+                 val->name, val->value))
+            == NULL)
             return 0;
         if (sk != NULL) {
             if (ctx->flags == X509V3_CTX_REPLACE)
@@ -357,7 +354,7 @@ int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, const char *section,
  * Note that on error new elements may remain added to cert if cert != NULL.
  */
 int X509V3_EXT_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
-                         X509 *cert)
+    X509 *cert)
 {
     STACK_OF(X509_EXTENSION) **sk = NULL;
     if (cert != NULL)
@@ -370,7 +367,7 @@ int X509V3_EXT_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
  * Note that on error new elements may remain added to crl if crl != NULL.
  */
 int X509V3_EXT_CRL_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
-                             X509_CRL *crl)
+    X509_CRL *crl)
 {
     STACK_OF(X509_EXTENSION) **sk = NULL;
     if (crl != NULL)
@@ -383,7 +380,7 @@ int X509V3_EXT_CRL_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
  * Note that on error new elements may remain added to req if req != NULL.
  */
 int X509V3_EXT_REQ_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
-                             X509_REQ *req)
+    X509_REQ *req)
 {
     STACK_OF(X509_EXTENSION) *exts = NULL;
     int ret = X509V3_EXT_add_nconf_sk(conf, ctx, section, &exts);
@@ -462,7 +459,7 @@ void X509V3_set_nconf(X509V3_CTX *ctx, CONF *conf)
 }
 
 void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subj, X509_REQ *req,
-                    X509_CRL *crl, int flags)
+    X509_CRL *crl, int flags)
 {
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_X509V3, ERR_R_PASSED_NULL_PARAMETER);
@@ -496,7 +493,7 @@ int X509V3_set_issuer_pkey(X509V3_CTX *ctx, EVP_PKEY *pkey)
 /* Old conf compatibility functions */
 
 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)
 {
     CONF *ctmp;
     X509_EXTENSION *ret;
@@ -511,7 +508,7 @@ X509_EXTENSION *X509V3_EXT_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
 }
 
 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)
 {
     CONF *ctmp;
     X509_EXTENSION *ret;
@@ -553,7 +550,7 @@ void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH_OF(CONF_VALUE) *lhash)
 }
 
 int X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                        const char *section, X509 *cert)
+    const char *section, X509 *cert)
 {
     CONF *ctmp;
     int ret;
@@ -570,7 +567,7 @@ int X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
 /* Same as above but for a CRL */
 
 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)
 {
     CONF *ctmp;
     int ret;
@@ -587,7 +584,7 @@ int X509V3_EXT_CRL_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
 /* Add extensions to certificate request */
 
 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)
 {
     CONF *ctmp;
     int ret;
diff --git a/crypto/x509/v3_cpols.c b/crypto/x509/v3_cpols.c
index fcf8728937db4..ab37f9dff6250 100644
--- a/crypto/x509/v3_cpols.c
+++ b/crypto/x509/v3_cpols.c
@@ -21,16 +21,16 @@
 /* Certificate policies extension support: this one is a bit complex... */
 
 static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol,
-                       BIO *out, int indent);
+    BIO *out, int indent);
 static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
-                                         X509V3_CTX *ctx, const char *value);
+    X509V3_CTX *ctx, const char *value);
 static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals,
-                             int indent);
+    int indent);
 static void print_notice(BIO *out, USERNOTICE *notice, int indent);
 static POLICYINFO *policy_section(X509V3_CTX *ctx,
-                                  STACK_OF(CONF_VALUE) *polstrs, int ia5org);
+    STACK_OF(CONF_VALUE) *polstrs, int ia5org);
 static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
-                                      STACK_OF(CONF_VALUE) *unot, int ia5org);
+    STACK_OF(CONF_VALUE) *unot, int ia5org);
 static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums, STACK_OF(CONF_VALUE) *nos);
 static int displaytext_str2tag(const char *tagstr, unsigned int *tag_len);
 static int displaytext_get_tag_len(const char *tagstr);
@@ -45,15 +45,14 @@ const X509V3_EXT_METHOD ossl_v3_cpols = {
     NULL
 };
 
-ASN1_ITEM_TEMPLATE(CERTIFICATEPOLICIES) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, CERTIFICATEPOLICIES, POLICYINFO)
+ASN1_ITEM_TEMPLATE(CERTIFICATEPOLICIES) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, CERTIFICATEPOLICIES, POLICYINFO)
 ASN1_ITEM_TEMPLATE_END(CERTIFICATEPOLICIES)
 
 IMPLEMENT_ASN1_FUNCTIONS(CERTIFICATEPOLICIES)
 
 ASN1_SEQUENCE(POLICYINFO) = {
-        ASN1_SIMPLE(POLICYINFO, policyid, ASN1_OBJECT),
-        ASN1_SEQUENCE_OF_OPT(POLICYINFO, qualifiers, POLICYQUALINFO)
+    ASN1_SIMPLE(POLICYINFO, policyid, ASN1_OBJECT),
+    ASN1_SEQUENCE_OF_OPT(POLICYINFO, qualifiers, POLICYQUALINFO)
 } ASN1_SEQUENCE_END(POLICYINFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(POLICYINFO)
@@ -61,33 +60,33 @@ IMPLEMENT_ASN1_FUNCTIONS(POLICYINFO)
 ASN1_ADB_TEMPLATE(policydefault) = ASN1_SIMPLE(POLICYQUALINFO, d.other, ASN1_ANY);
 
 ASN1_ADB(POLICYQUALINFO) = {
-        ADB_ENTRY(NID_id_qt_cps, ASN1_SIMPLE(POLICYQUALINFO, d.cpsuri, ASN1_IA5STRING)),
-        ADB_ENTRY(NID_id_qt_unotice, ASN1_SIMPLE(POLICYQUALINFO, d.usernotice, USERNOTICE))
+    ADB_ENTRY(NID_id_qt_cps, ASN1_SIMPLE(POLICYQUALINFO, d.cpsuri, ASN1_IA5STRING)),
+    ADB_ENTRY(NID_id_qt_unotice, ASN1_SIMPLE(POLICYQUALINFO, d.usernotice, USERNOTICE))
 } ASN1_ADB_END(POLICYQUALINFO, 0, pqualid, 0, &policydefault_tt, NULL);
 
 ASN1_SEQUENCE(POLICYQUALINFO) = {
-        ASN1_SIMPLE(POLICYQUALINFO, pqualid, ASN1_OBJECT),
-        ASN1_ADB_OBJECT(POLICYQUALINFO)
+    ASN1_SIMPLE(POLICYQUALINFO, pqualid, ASN1_OBJECT),
+    ASN1_ADB_OBJECT(POLICYQUALINFO)
 } ASN1_SEQUENCE_END(POLICYQUALINFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(POLICYQUALINFO)
 
 ASN1_SEQUENCE(USERNOTICE) = {
-        ASN1_OPT(USERNOTICE, noticeref, NOTICEREF),
-        ASN1_OPT(USERNOTICE, exptext, DISPLAYTEXT)
+    ASN1_OPT(USERNOTICE, noticeref, NOTICEREF),
+    ASN1_OPT(USERNOTICE, exptext, DISPLAYTEXT)
 } ASN1_SEQUENCE_END(USERNOTICE)
 
 IMPLEMENT_ASN1_FUNCTIONS(USERNOTICE)
 
 ASN1_SEQUENCE(NOTICEREF) = {
-        ASN1_SIMPLE(NOTICEREF, organization, DISPLAYTEXT),
-        ASN1_SEQUENCE_OF(NOTICEREF, noticenos, ASN1_INTEGER)
+    ASN1_SIMPLE(NOTICEREF, organization, DISPLAYTEXT),
+    ASN1_SEQUENCE_OF(NOTICEREF, noticenos, ASN1_INTEGER)
 } ASN1_SEQUENCE_END(NOTICEREF)
 
 IMPLEMENT_ASN1_FUNCTIONS(NOTICEREF)
 
 static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
-                                         X509V3_CTX *ctx, const char *value)
+    X509V3_CTX *ctx, const char *value)
 {
     STACK_OF(POLICYINFO) *pols;
     char *pstr;
@@ -127,7 +126,7 @@ static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
             polsect = X509V3_get_section(ctx, pstr + 1);
             if (polsect == NULL) {
                 ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_SECTION,
-                               "%s", cnf->name);
+                    "%s", cnf->name);
                 goto err;
             }
             pol = policy_section(ctx, polsect, ia5org);
@@ -137,8 +136,8 @@ static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
         } else {
             if ((pobj = OBJ_txt2obj(cnf->name, 0)) == NULL) {
                 ERR_raise_data(ERR_LIB_X509V3,
-                               X509V3_R_INVALID_OBJECT_IDENTIFIER,
-                               "%s", cnf->name);
+                    X509V3_R_INVALID_OBJECT_IDENTIFIER,
+                    "%s", cnf->name);
                 goto err;
             }
             pol = POLICYINFO_new();
@@ -157,14 +156,14 @@ static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
     }
     sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
     return pols;
- err:
+err:
     sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
     sk_POLICYINFO_pop_free(pols, POLICYINFO_free);
     return NULL;
 }
 
 static POLICYINFO *policy_section(X509V3_CTX *ctx,
-                                  STACK_OF(CONF_VALUE) *polstrs, int ia5org)
+    STACK_OF(CONF_VALUE) *polstrs, int ia5org)
 {
     int i;
     CONF_VALUE *cnf;
@@ -208,7 +207,7 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx,
                 goto err;
             }
             if (!ASN1_STRING_set(qual->d.cpsuri, cnf->value,
-                                 strlen(cnf->value))) {
+                    strlen(cnf->value))) {
                 ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
                 goto err;
             }
@@ -250,7 +249,7 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx,
 
     return pol;
 
- err:
+err:
     POLICYINFO_free(pol);
     return NULL;
 }
@@ -289,7 +288,7 @@ static int displaytext_str2tag(const char *tagstr, unsigned int *tag_len)
 }
 
 static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
-                                      STACK_OF(CONF_VALUE) *unot, int ia5org)
+    STACK_OF(CONF_VALUE) *unot, int ia5org)
 {
     int i, ret, len, tag;
     unsigned int tag_len;
@@ -344,7 +343,7 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
             else
                 nref->organization->type = V_ASN1_VISIBLESTRING;
             if (!ASN1_STRING_set(nref->organization, cnf->value,
-                                 strlen(cnf->value))) {
+                    strlen(cnf->value))) {
                 ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
                 goto err;
             }
@@ -378,15 +377,14 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
         }
     }
 
-    if (not->noticeref &&
-        (!not->noticeref->noticenos || !not->noticeref->organization)) {
+    if (not->noticeref && (!not->noticeref->noticenos || !not->noticeref->organization)) {
         ERR_raise(ERR_LIB_X509V3, X509V3_R_NEED_ORGANIZATION_AND_NUMBERS);
         goto err;
     }
 
     return qual;
 
- err:
+err:
     POLICYQUALINFO_free(qual);
     return NULL;
 }
@@ -414,7 +412,7 @@ static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums, STACK_OF(CONF_VALUE) *nos)
 }
 
 static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol,
-                       BIO *out, int indent)
+    BIO *out, int indent)
 {
     int i;
     POLICYINFO *pinfo;
@@ -434,7 +432,7 @@ static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol,
 }
 
 static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals,
-                             int indent)
+    int indent)
 {
     POLICYQUALINFO *qualinfo;
     int i;
@@ -445,8 +443,8 @@ static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals,
         switch (OBJ_obj2nid(qualinfo->pqualid)) {
         case NID_id_qt_cps:
             BIO_printf(out, "%*sCPS: %.*s", indent, "",
-                       qualinfo->d.cpsuri->length,
-                       qualinfo->d.cpsuri->data);
+                qualinfo->d.cpsuri->length,
+                qualinfo->d.cpsuri->data);
             break;
 
         case NID_id_qt_unotice:
@@ -470,10 +468,10 @@ static void print_notice(BIO *out, USERNOTICE *notice, int indent)
         NOTICEREF *ref;
         ref = notice->noticeref;
         BIO_printf(out, "%*sOrganization: %.*s\n", indent, "",
-                   ref->organization->length,
-                   ref->organization->data);
+            ref->organization->length,
+            ref->organization->data);
         BIO_printf(out, "%*sNumber%s: ", indent, "",
-                   sk_ASN1_INTEGER_num(ref->noticenos) > 1 ? "s" : "");
+            sk_ASN1_INTEGER_num(ref->noticenos) > 1 ? "s" : "");
         for (i = 0; i < sk_ASN1_INTEGER_num(ref->noticenos); i++) {
             ASN1_INTEGER *num;
             char *tmp;
@@ -495,8 +493,8 @@ static void print_notice(BIO *out, USERNOTICE *notice, int indent)
     }
     if (notice->exptext)
         BIO_printf(out, "%*sExplicit Text: %.*s", indent, "",
-                   notice->exptext->length,
-                   notice->exptext->data);
+            notice->exptext->length,
+            notice->exptext->data);
 }
 
 void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent)
@@ -508,11 +506,10 @@ void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent)
     i2a_ASN1_OBJECT(out, dat->valid_policy);
     BIO_puts(out, "\n");
     BIO_printf(out, "%*s%s\n", indent + 2, "",
-               node_data_critical(dat) ? "Critical" : "Non Critical");
+        node_data_critical(dat) ? "Critical" : "Non Critical");
     if (dat->qualifier_set) {
         print_qualifiers(out, dat->qualifier_set, indent + 2);
         BIO_puts(out, "\n");
-    }
-    else
+    } else
         BIO_printf(out, "%*sNo Qualifiers\n", indent + 2, "");
 }
diff --git a/crypto/x509/v3_crld.c b/crypto/x509/v3_crld.c
index 140b279d2f367..56715439a4a40 100644
--- a/crypto/x509/v3_crld.c
+++ b/crypto/x509/v3_crld.c
@@ -19,9 +19,9 @@
 #include "x509_local.h"
 
 static void *v2i_crld(const X509V3_EXT_METHOD *method,
-                      X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
+    X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
 static int i2r_crldp(const X509V3_EXT_METHOD *method, void *pcrldp, BIO *out,
-                     int indent);
+    int indent);
 
 const X509V3_EXT_METHOD ossl_v3_crld = {
     NID_crl_distribution_points, 0, ASN1_ITEM_ref(CRL_DIST_POINTS),
@@ -44,7 +44,7 @@ const X509V3_EXT_METHOD ossl_v3_freshest_crl = {
 };
 
 static STACK_OF(GENERAL_NAME) *gnames_from_sectname(X509V3_CTX *ctx,
-                                                    char *sect)
+    char *sect)
 {
     STACK_OF(CONF_VALUE) *gnsect;
     STACK_OF(GENERAL_NAME) *gens;
@@ -65,7 +65,7 @@ static STACK_OF(GENERAL_NAME) *gnames_from_sectname(X509V3_CTX *ctx,
 }
 
 static int set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx,
-                               CONF_VALUE *cnf)
+    CONF_VALUE *cnf)
 {
     STACK_OF(GENERAL_NAME) *fnm = NULL;
     STACK_OF(X509_NAME_ENTRY) *rnm = NULL;
@@ -103,7 +103,8 @@ static int set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx,
          * Since its a name fragment can't have more than one RDNSequence
          */
         if (sk_X509_NAME_ENTRY_value(rnm,
-                                     sk_X509_NAME_ENTRY_num(rnm) - 1)->set) {
+                sk_X509_NAME_ENTRY_num(rnm) - 1)
+                ->set) {
             ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_MULTIPLE_RDNS);
             goto err;
         }
@@ -128,23 +129,23 @@ static int set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx,
 
     return 1;
 
- err:
+err:
     sk_GENERAL_NAME_pop_free(fnm, GENERAL_NAME_free);
     sk_X509_NAME_ENTRY_pop_free(rnm, X509_NAME_ENTRY_free);
     return -1;
 }
 
 static const BIT_STRING_BITNAME reason_flags[] = {
-    {0, "Unused", "unused"},
-    {1, "Key Compromise", "keyCompromise"},
-    {2, "CA Compromise", "CACompromise"},
-    {3, "Affiliation Changed", "affiliationChanged"},
-    {4, "Superseded", "superseded"},
-    {5, "Cessation Of Operation", "cessationOfOperation"},
-    {6, "Certificate Hold", "certificateHold"},
-    {7, "Privilege Withdrawn", "privilegeWithdrawn"},
-    {8, "AA Compromise", "AACompromise"},
-    {-1, NULL, NULL}
+    { 0, "Unused", "unused" },
+    { 1, "Key Compromise", "keyCompromise" },
+    { 2, "CA Compromise", "CACompromise" },
+    { 3, "Affiliation Changed", "affiliationChanged" },
+    { 4, "Superseded", "superseded" },
+    { 5, "Cessation Of Operation", "cessationOfOperation" },
+    { 6, "Certificate Hold", "certificateHold" },
+    { 7, "Privilege Withdrawn", "privilegeWithdrawn" },
+    { 8, "AA Compromise", "AACompromise" },
+    { -1, NULL, NULL }
 };
 
 static int set_reasons(ASN1_BIT_STRING **preas, char *value)
@@ -177,13 +178,13 @@ static int set_reasons(ASN1_BIT_STRING **preas, char *value)
     }
     ret = 1;
 
- err:
+err:
     sk_CONF_VALUE_pop_free(rsk, X509V3_conf_free);
     return ret;
 }
 
 static int print_reasons(BIO *out, const char *rname,
-                         ASN1_BIT_STRING *rflags, int indent)
+    ASN1_BIT_STRING *rflags, int indent)
 {
     int first = 1;
     const BIT_STRING_BITNAME *pbn;
@@ -205,7 +206,7 @@ static int print_reasons(BIO *out, const char *rname,
 }
 
 static DIST_POINT *crldp_from_section(X509V3_CTX *ctx,
-                                      STACK_OF(CONF_VALUE) *nval)
+    STACK_OF(CONF_VALUE) *nval)
 {
     int i;
     CONF_VALUE *cnf;
@@ -233,13 +234,13 @@ static DIST_POINT *crldp_from_section(X509V3_CTX *ctx,
 
     return point;
 
- err:
+err:
     DIST_POINT_free(point);
     return NULL;
 }
 
 static void *v2i_crld(const X509V3_EXT_METHOD *method,
-                      X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+    X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
     STACK_OF(DIST_POINT) *crld;
     GENERAL_NAMES *gens = NULL;
@@ -295,7 +296,7 @@ static void *v2i_crld(const X509V3_EXT_METHOD *method,
     }
     return crld;
 
- err:
+err:
     GENERAL_NAME_free(gen);
     GENERAL_NAMES_free(gens);
     sk_DIST_POINT_pop_free(crld, DIST_POINT_free);
@@ -303,7 +304,7 @@ static void *v2i_crld(const X509V3_EXT_METHOD *method,
 }
 
 static int dpn_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                  void *exarg)
+    void *exarg)
 {
     DIST_POINT_NAME *dpn = (DIST_POINT_NAME *)*pval;
 
@@ -319,45 +320,42 @@ static int dpn_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
     return 1;
 }
 
-
 ASN1_CHOICE_cb(DIST_POINT_NAME, dpn_cb) = {
-        ASN1_IMP_SEQUENCE_OF(DIST_POINT_NAME, name.fullname, GENERAL_NAME, 0),
-        ASN1_IMP_SET_OF(DIST_POINT_NAME, name.relativename, X509_NAME_ENTRY, 1)
+    ASN1_IMP_SEQUENCE_OF(DIST_POINT_NAME, name.fullname, GENERAL_NAME, 0),
+    ASN1_IMP_SET_OF(DIST_POINT_NAME, name.relativename, X509_NAME_ENTRY, 1)
 } ASN1_CHOICE_END_cb(DIST_POINT_NAME, DIST_POINT_NAME, type)
 
-
 IMPLEMENT_ASN1_FUNCTIONS(DIST_POINT_NAME)
 IMPLEMENT_ASN1_DUP_FUNCTION(DIST_POINT_NAME)
 
 ASN1_SEQUENCE(DIST_POINT) = {
-        ASN1_EXP_OPT(DIST_POINT, distpoint, DIST_POINT_NAME, 0),
-        ASN1_IMP_OPT(DIST_POINT, reasons, ASN1_BIT_STRING, 1),
-        ASN1_IMP_SEQUENCE_OF_OPT(DIST_POINT, CRLissuer, GENERAL_NAME, 2)
+    ASN1_EXP_OPT(DIST_POINT, distpoint, DIST_POINT_NAME, 0),
+    ASN1_IMP_OPT(DIST_POINT, reasons, ASN1_BIT_STRING, 1),
+    ASN1_IMP_SEQUENCE_OF_OPT(DIST_POINT, CRLissuer, GENERAL_NAME, 2)
 } ASN1_SEQUENCE_END(DIST_POINT)
 
 IMPLEMENT_ASN1_FUNCTIONS(DIST_POINT)
 
-ASN1_ITEM_TEMPLATE(CRL_DIST_POINTS) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, CRLDistributionPoints, DIST_POINT)
+ASN1_ITEM_TEMPLATE(CRL_DIST_POINTS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, CRLDistributionPoints, DIST_POINT)
 ASN1_ITEM_TEMPLATE_END(CRL_DIST_POINTS)
 
 IMPLEMENT_ASN1_FUNCTIONS(CRL_DIST_POINTS)
 
 ASN1_SEQUENCE(ISSUING_DIST_POINT) = {
-        ASN1_EXP_OPT(ISSUING_DIST_POINT, distpoint, DIST_POINT_NAME, 0),
-        ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyuser, ASN1_FBOOLEAN, 1),
-        ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyCA, ASN1_FBOOLEAN, 2),
-        ASN1_IMP_OPT(ISSUING_DIST_POINT, onlysomereasons, ASN1_BIT_STRING, 3),
-        ASN1_IMP_OPT(ISSUING_DIST_POINT, indirectCRL, ASN1_FBOOLEAN, 4),
-        ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyattr, ASN1_FBOOLEAN, 5)
+    ASN1_EXP_OPT(ISSUING_DIST_POINT, distpoint, DIST_POINT_NAME, 0),
+    ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyuser, ASN1_FBOOLEAN, 1),
+    ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyCA, ASN1_FBOOLEAN, 2),
+    ASN1_IMP_OPT(ISSUING_DIST_POINT, onlysomereasons, ASN1_BIT_STRING, 3),
+    ASN1_IMP_OPT(ISSUING_DIST_POINT, indirectCRL, ASN1_FBOOLEAN, 4),
+    ASN1_IMP_OPT(ISSUING_DIST_POINT, onlyattr, ASN1_FBOOLEAN, 5)
 } ASN1_SEQUENCE_END(ISSUING_DIST_POINT)
 
 IMPLEMENT_ASN1_FUNCTIONS(ISSUING_DIST_POINT)
 
 static int i2r_idp(const X509V3_EXT_METHOD *method, void *pidp, BIO *out,
-                   int indent);
+    int indent);
 static void *v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
-                     STACK_OF(CONF_VALUE) *nval);
+    STACK_OF(CONF_VALUE) *nval);
 
 const X509V3_EXT_METHOD ossl_v3_idp = {
     NID_issuing_distribution_point, X509V3_EXT_MULTILINE,
@@ -371,7 +369,7 @@ const X509V3_EXT_METHOD ossl_v3_idp = {
 };
 
 static void *v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
-                     STACK_OF(CONF_VALUE) *nval)
+    STACK_OF(CONF_VALUE) *nval)
 {
     ISSUING_DIST_POINT *idp = NULL;
     CONF_VALUE *cnf;
@@ -414,7 +412,7 @@ static void *v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
     }
     return idp;
 
- err:
+err:
     ISSUING_DIST_POINT_free(idp);
     return NULL;
 }
@@ -436,7 +434,7 @@ static int print_distpoint(BIO *out, DIST_POINT_NAME *dpn, int indent)
 }
 
 static int i2r_idp(const X509V3_EXT_METHOD *method, void *pidp, BIO *out,
-                   int indent)
+    int indent)
 {
     ISSUING_DIST_POINT *idp = pidp;
     if (idp->distpoint)
@@ -460,7 +458,7 @@ static int i2r_idp(const X509V3_EXT_METHOD *method, void *pidp, BIO *out,
 }
 
 static int i2r_crldp(const X509V3_EXT_METHOD *method, void *pcrldp, BIO *out,
-                     int indent)
+    int indent)
 {
     STACK_OF(DIST_POINT) *crld = pcrldp;
     DIST_POINT *point;
@@ -481,6 +479,49 @@ static int i2r_crldp(const X509V3_EXT_METHOD *method, void *pcrldp, BIO *out,
     return 1;
 }
 
+static int i2r_crl_invdate(const X509V3_EXT_METHOD *method, void *date,
+    BIO *out, int indent);
+static int i2r_object(const X509V3_EXT_METHOD *method, void *obj, BIO *out,
+    int indent);
+
+const X509V3_EXT_METHOD ossl_v3_crl_invdate = {
+    NID_invalidity_date, 0, ASN1_ITEM_ref(ASN1_GENERALIZEDTIME),
+    0, 0, 0, 0,
+    0, 0,
+    0, 0,
+    i2r_crl_invdate, 0,
+    NULL
+};
+
+const X509V3_EXT_METHOD ossl_v3_crl_hold = {
+    NID_hold_instruction_code, 0, ASN1_ITEM_ref(ASN1_OBJECT),
+    0, 0, 0, 0,
+    0, 0,
+    0, 0,
+    i2r_object, 0,
+    NULL
+};
+
+static int i2r_crl_invdate(const X509V3_EXT_METHOD *method, void *date,
+    BIO *bp, int ind)
+{
+    if (BIO_printf(bp, "%*s", ind, "") <= 0)
+        return 0;
+    if (!ASN1_GENERALIZEDTIME_print(bp, date))
+        return 0;
+    return 1;
+}
+
+static int i2r_object(const X509V3_EXT_METHOD *method, void *oid, BIO *bp,
+    int ind)
+{
+    if (BIO_printf(bp, "%*s", ind, "") <= 0)
+        return 0;
+    if (i2a_ASN1_OBJECT(bp, oid) <= 0)
+        return 0;
+    return 1;
+}
+
 /* Append any nameRelativeToCRLIssuer in dpn to iname, set in dpn->dpname */
 int DIST_POINT_set_dpname(DIST_POINT_NAME *dpn, const X509_NAME *iname)
 {
@@ -504,7 +545,7 @@ int DIST_POINT_set_dpname(DIST_POINT_NAME *dpn, const X509_NAME *iname)
     if (i2d_X509_NAME(dpn->dpname, NULL) >= 0)
         return 1;
 
- err:
+err:
     X509_NAME_free(dpn->dpname);
     dpn->dpname = NULL;
     return 0;
@@ -527,7 +568,7 @@ static int print_boolean(BIO *out, ASN1_BOOLEAN b)
 }
 
 static OSSL_AA_DIST_POINT *aaidp_from_section(X509V3_CTX *ctx,
-                                              STACK_OF(CONF_VALUE) *nval)
+    STACK_OF(CONF_VALUE) *nval)
 {
     int i, ret;
     CONF_VALUE *cnf;
@@ -562,13 +603,13 @@ static OSSL_AA_DIST_POINT *aaidp_from_section(X509V3_CTX *ctx,
 
     return point;
 
- err:
+err:
     OSSL_AA_DIST_POINT_free(point);
     return NULL;
 }
 
 static void *v2i_aaidp(const X509V3_EXT_METHOD *method,
-                       X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+    X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
     GENERAL_NAMES *gens = NULL;
     GENERAL_NAME *gen = NULL;
@@ -613,7 +654,7 @@ static void *v2i_aaidp(const X509V3_EXT_METHOD *method,
     }
     return point;
 
- err:
+err:
     OSSL_AA_DIST_POINT_free(point);
     GENERAL_NAME_free(gen);
     GENERAL_NAMES_free(gens);
@@ -621,7 +662,7 @@ static void *v2i_aaidp(const X509V3_EXT_METHOD *method,
 }
 
 static int i2r_aaidp(const X509V3_EXT_METHOD *method, void *dp, BIO *out,
-                     int indent)
+    int indent)
 {
     OSSL_AA_DIST_POINT *pdp = dp;
 
@@ -649,7 +690,8 @@ static int i2r_aaidp(const X509V3_EXT_METHOD *method, void *dp, BIO *out,
     }
     if (pdp->containsAACerts) {
         if (BIO_printf(out, "%*sContains Attribute Authority (AA) Certificates: ",
-                       indent, "") <= 0)
+                indent, "")
+            <= 0)
             return 0;
         if (print_boolean(out, pdp->containsAACerts) <= 0)
             return 0;
@@ -658,8 +700,9 @@ static int i2r_aaidp(const X509V3_EXT_METHOD *method, void *dp, BIO *out,
     }
     if (pdp->containsSOAPublicKeyCerts) {
         if (BIO_printf(out,
-                       "%*sContains Source Of Authority (SOA) Public Key Certificates: ",
-                       indent, "") <= 0)
+                "%*sContains Source Of Authority (SOA) Public Key Certificates: ",
+                indent, "")
+            <= 0)
             return 0;
         if (print_boolean(out, pdp->containsSOAPublicKeyCerts) <= 0)
             return 0;
diff --git a/crypto/x509/v3_enum.c b/crypto/x509/v3_enum.c
index b73a6d55162bb..56d44c855f14a 100644
--- a/crypto/x509/v3_enum.c
+++ b/crypto/x509/v3_enum.c
@@ -13,20 +13,20 @@
 #include "ext_dat.h"
 
 static ENUMERATED_NAMES crl_reasons[] = {
-    {CRL_REASON_UNSPECIFIED, "Unspecified", "unspecified"},
-    {CRL_REASON_KEY_COMPROMISE, "Key Compromise", "keyCompromise"},
-    {CRL_REASON_CA_COMPROMISE, "CA Compromise", "CACompromise"},
-    {CRL_REASON_AFFILIATION_CHANGED, "Affiliation Changed",
-     "affiliationChanged"},
-    {CRL_REASON_SUPERSEDED, "Superseded", "superseded"},
-    {CRL_REASON_CESSATION_OF_OPERATION,
-     "Cessation Of Operation", "cessationOfOperation"},
-    {CRL_REASON_CERTIFICATE_HOLD, "Certificate Hold", "certificateHold"},
-    {CRL_REASON_REMOVE_FROM_CRL, "Remove From CRL", "removeFromCRL"},
-    {CRL_REASON_PRIVILEGE_WITHDRAWN, "Privilege Withdrawn",
-     "privilegeWithdrawn"},
-    {CRL_REASON_AA_COMPROMISE, "AA Compromise", "AACompromise"},
-    {-1, NULL, NULL}
+    { CRL_REASON_UNSPECIFIED, "Unspecified", "unspecified" },
+    { CRL_REASON_KEY_COMPROMISE, "Key Compromise", "keyCompromise" },
+    { CRL_REASON_CA_COMPROMISE, "CA Compromise", "CACompromise" },
+    { CRL_REASON_AFFILIATION_CHANGED, "Affiliation Changed",
+        "affiliationChanged" },
+    { CRL_REASON_SUPERSEDED, "Superseded", "superseded" },
+    { CRL_REASON_CESSATION_OF_OPERATION,
+        "Cessation Of Operation", "cessationOfOperation" },
+    { CRL_REASON_CERTIFICATE_HOLD, "Certificate Hold", "certificateHold" },
+    { CRL_REASON_REMOVE_FROM_CRL, "Remove From CRL", "removeFromCRL" },
+    { CRL_REASON_PRIVILEGE_WITHDRAWN, "Privilege Withdrawn",
+        "privilegeWithdrawn" },
+    { CRL_REASON_AA_COMPROMISE, "AA Compromise", "AACompromise" },
+    { -1, NULL, NULL }
 };
 
 const X509V3_EXT_METHOD ossl_v3_crl_reason = {
@@ -39,7 +39,7 @@ const X509V3_EXT_METHOD ossl_v3_crl_reason = {
 };
 
 char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method,
-                                const ASN1_ENUMERATED *e)
+    const ASN1_ENUMERATED *e)
 {
     ENUMERATED_NAMES *enam;
     long strval;
diff --git a/crypto/x509/v3_extku.c b/crypto/x509/v3_extku.c
index cb95c5bb79c75..8aabd8f48dc3c 100644
--- a/crypto/x509/v3_extku.c
+++ b/crypto/x509/v3_extku.c
@@ -15,11 +15,11 @@
 #include "ext_dat.h"
 
 static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
-                                    X509V3_CTX *ctx,
-                                    STACK_OF(CONF_VALUE) *nval);
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *nval);
 static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
-                                                    *method, void *eku, STACK_OF(CONF_VALUE)
-                                                    *extlist);
+                                                        *method,
+    void *eku, STACK_OF(CONF_VALUE) *extlist);
 
 const X509V3_EXT_METHOD ossl_v3_ext_ku = {
     NID_ext_key_usage, 0,
@@ -68,15 +68,14 @@ const X509V3_EXT_METHOD ossl_v3_acc_priv_policies = {
     NULL
 };
 
-ASN1_ITEM_TEMPLATE(EXTENDED_KEY_USAGE) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, EXTENDED_KEY_USAGE, ASN1_OBJECT)
+ASN1_ITEM_TEMPLATE(EXTENDED_KEY_USAGE) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, EXTENDED_KEY_USAGE, ASN1_OBJECT)
 ASN1_ITEM_TEMPLATE_END(EXTENDED_KEY_USAGE)
 
 IMPLEMENT_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
 
 static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
-                                                    *method, void *a, STACK_OF(CONF_VALUE)
-                                                    *ext_list)
+                                                        *method,
+    void *a, STACK_OF(CONF_VALUE) *ext_list)
 {
     EXTENDED_KEY_USAGE *eku = a;
     int i;
@@ -91,8 +90,8 @@ static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
 }
 
 static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
-                                    X509V3_CTX *ctx,
-                                    STACK_OF(CONF_VALUE) *nval)
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *nval)
 {
     EXTENDED_KEY_USAGE *extku;
     char *extval;
@@ -117,10 +116,10 @@ static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
         if ((objtmp = OBJ_txt2obj(extval, 0)) == NULL) {
             sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free);
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_OBJECT_IDENTIFIER,
-                           "%s", extval);
+                "%s", extval);
             return NULL;
         }
-        sk_ASN1_OBJECT_push(extku, objtmp);  /* no failure as it was reserved */
+        sk_ASN1_OBJECT_push(extku, objtmp); /* no failure as it was reserved */
     }
     return extku;
 }
diff --git a/crypto/x509/v3_genn.c b/crypto/x509/v3_genn.c
index fd48b519278ed..d63168a77a507 100644
--- a/crypto/x509/v3_genn.c
+++ b/crypto/x509/v3_genn.c
@@ -14,39 +14,38 @@
 #include <openssl/x509v3.h>
 
 ASN1_SEQUENCE(OTHERNAME) = {
-        ASN1_SIMPLE(OTHERNAME, type_id, ASN1_OBJECT),
-        /* Maybe have a true ANY DEFINED BY later */
-        ASN1_EXP(OTHERNAME, value, ASN1_ANY, 0)
+    ASN1_SIMPLE(OTHERNAME, type_id, ASN1_OBJECT),
+    /* Maybe have a true ANY DEFINED BY later */
+    ASN1_EXP(OTHERNAME, value, ASN1_ANY, 0)
 } ASN1_SEQUENCE_END(OTHERNAME)
 
 IMPLEMENT_ASN1_FUNCTIONS(OTHERNAME)
 
 ASN1_SEQUENCE(EDIPARTYNAME) = {
-        /* DirectoryString is a CHOICE type so use explicit tagging */
-        ASN1_EXP_OPT(EDIPARTYNAME, nameAssigner, DIRECTORYSTRING, 0),
-        ASN1_EXP(EDIPARTYNAME, partyName, DIRECTORYSTRING, 1)
+    /* DirectoryString is a CHOICE type so use explicit tagging */
+    ASN1_EXP_OPT(EDIPARTYNAME, nameAssigner, DIRECTORYSTRING, 0),
+    ASN1_EXP(EDIPARTYNAME, partyName, DIRECTORYSTRING, 1)
 } ASN1_SEQUENCE_END(EDIPARTYNAME)
 
 IMPLEMENT_ASN1_FUNCTIONS(EDIPARTYNAME)
 
 ASN1_CHOICE(GENERAL_NAME) = {
-        ASN1_IMP(GENERAL_NAME, d.otherName, OTHERNAME, GEN_OTHERNAME),
-        ASN1_IMP(GENERAL_NAME, d.rfc822Name, ASN1_IA5STRING, GEN_EMAIL),
-        ASN1_IMP(GENERAL_NAME, d.dNSName, ASN1_IA5STRING, GEN_DNS),
-        /* Don't decode this */
-        ASN1_IMP(GENERAL_NAME, d.x400Address, ASN1_SEQUENCE, GEN_X400),
-        /* X509_NAME is a CHOICE type so use EXPLICIT */
-        ASN1_EXP(GENERAL_NAME, d.directoryName, X509_NAME, GEN_DIRNAME),
-        ASN1_IMP(GENERAL_NAME, d.ediPartyName, EDIPARTYNAME, GEN_EDIPARTY),
-        ASN1_IMP(GENERAL_NAME, d.uniformResourceIdentifier, ASN1_IA5STRING, GEN_URI),
-        ASN1_IMP(GENERAL_NAME, d.iPAddress, ASN1_OCTET_STRING, GEN_IPADD),
-        ASN1_IMP(GENERAL_NAME, d.registeredID, ASN1_OBJECT, GEN_RID)
+    ASN1_IMP(GENERAL_NAME, d.otherName, OTHERNAME, GEN_OTHERNAME),
+    ASN1_IMP(GENERAL_NAME, d.rfc822Name, ASN1_IA5STRING, GEN_EMAIL),
+    ASN1_IMP(GENERAL_NAME, d.dNSName, ASN1_IA5STRING, GEN_DNS),
+    /* Don't decode this */
+    ASN1_IMP(GENERAL_NAME, d.x400Address, ASN1_SEQUENCE, GEN_X400),
+    /* X509_NAME is a CHOICE type so use EXPLICIT */
+    ASN1_EXP(GENERAL_NAME, d.directoryName, X509_NAME, GEN_DIRNAME),
+    ASN1_IMP(GENERAL_NAME, d.ediPartyName, EDIPARTYNAME, GEN_EDIPARTY),
+    ASN1_IMP(GENERAL_NAME, d.uniformResourceIdentifier, ASN1_IA5STRING, GEN_URI),
+    ASN1_IMP(GENERAL_NAME, d.iPAddress, ASN1_OCTET_STRING, GEN_IPADD),
+    ASN1_IMP(GENERAL_NAME, d.registeredID, ASN1_OBJECT, GEN_RID)
 } ASN1_CHOICE_END(GENERAL_NAME)
 
 IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAME)
 
-ASN1_ITEM_TEMPLATE(GENERAL_NAMES) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, GENERAL_NAME)
+ASN1_ITEM_TEMPLATE(GENERAL_NAMES) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, GENERAL_NAME)
 ASN1_ITEM_TEMPLATE_END(GENERAL_NAMES)
 
 IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAMES)
@@ -54,8 +53,8 @@ IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAMES)
 GENERAL_NAME *GENERAL_NAME_dup(const GENERAL_NAME *a)
 {
     return (GENERAL_NAME *)ASN1_dup((i2d_of_void *)i2d_GENERAL_NAME,
-                                    (d2i_of_void *)d2i_GENERAL_NAME,
-                                    (char *)a);
+        (d2i_of_void *)d2i_GENERAL_NAME,
+        (char *)a);
 }
 
 int GENERAL_NAME_set1_X509_NAME(GENERAL_NAME **tgt, const X509_NAME *src)
@@ -82,7 +81,7 @@ int GENERAL_NAME_set1_X509_NAME(GENERAL_NAME **tgt, const X509_NAME *src)
     *tgt = name;
     return 1;
 
- err:
+err:
     GENERAL_NAME_free(name);
     return 0;
 }
@@ -244,7 +243,7 @@ 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)
 {
     OTHERNAME *oth;
     oth = OTHERNAME_new();
@@ -258,7 +257,7 @@ int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
 }
 
 int GENERAL_NAME_get0_otherName(const GENERAL_NAME *gen,
-                                ASN1_OBJECT **poid, ASN1_TYPE **pvalue)
+    ASN1_OBJECT **poid, ASN1_TYPE **pvalue)
 {
     if (gen->type != GEN_OTHERNAME)
         return 0;
diff --git a/crypto/x509/v3_group_ac.c b/crypto/x509/v3_group_ac.c
index 9a2b69deceb43..d73d1b6d151f6 100644
--- a/crypto/x509/v3_group_ac.c
+++ b/crypto/x509/v3_group_ac.c
@@ -15,14 +15,14 @@
 #include "ext_dat.h"
 
 static int i2r_GROUP_AC(X509V3_EXT_METHOD *method,
-                        void *su, BIO *out,
-                        int indent)
+    void *su, BIO *out,
+    int indent)
 {
     return 1;
 }
 
 static void *r2i_GROUP_AC(X509V3_EXT_METHOD *method,
-                          X509V3_CTX *ctx, const char *value)
+    X509V3_CTX *ctx, const char *value)
 {
     return ASN1_NULL_new();
 }
diff --git a/crypto/x509/v3_ia5.c b/crypto/x509/v3_ia5.c
index 7b799358727e0..8a438f816ce91 100644
--- a/crypto/x509/v3_ia5.c
+++ b/crypto/x509/v3_ia5.c
@@ -39,7 +39,7 @@ 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)
 {
     ASN1_IA5STRING *ia5;
     if (str == NULL) {
@@ -56,6 +56,6 @@ ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
     }
 #ifdef CHARSET_EBCDIC
     ebcdic2ascii(ia5->data, ia5->data, ia5->length);
-#endif                          /* CHARSET_EBCDIC */
+#endif /* CHARSET_EBCDIC */
     return ia5;
 }
diff --git a/crypto/x509/v3_ind_iss.c b/crypto/x509/v3_ind_iss.c
index ff41ba7bed023..850a002186607 100644
--- a/crypto/x509/v3_ind_iss.c
+++ b/crypto/x509/v3_ind_iss.c
@@ -15,14 +15,14 @@
 #include "ext_dat.h"
 
 static int i2r_INDIRECT_ISSUER(X509V3_EXT_METHOD *method,
-                        void *su, BIO *out,
-                        int indent)
+    void *su, BIO *out,
+    int indent)
 {
     return 1;
 }
 
 static void *r2i_INDIRECT_ISSUER(X509V3_EXT_METHOD *method,
-                          X509V3_CTX *ctx, const char *value)
+    X509V3_CTX *ctx, const char *value)
 {
     return ASN1_NULL_new();
 }
diff --git a/crypto/x509/v3_info.c b/crypto/x509/v3_info.c
index 7e4d9313d8290..35100fdd9ddf0 100644
--- a/crypto/x509/v3_info.c
+++ b/crypto/x509/v3_info.c
@@ -16,44 +16,43 @@
 #include "ext_dat.h"
 
 static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
-                                                       *method, AUTHORITY_INFO_ACCESS
-                                                       *ainfo, STACK_OF(CONF_VALUE)
-                                                       *ret);
+                                                           *method,
+    AUTHORITY_INFO_ACCESS
+        *ainfo,
+    STACK_OF(CONF_VALUE)
+        *ret);
 static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
-                                                        *method,
-                                                        X509V3_CTX *ctx,
-                                                        STACK_OF(CONF_VALUE)
-                                                        *nval);
+                                                            *method,
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE)
+        *nval);
 
 const X509V3_EXT_METHOD ossl_v3_info = { NID_info_access, X509V3_EXT_MULTILINE,
     ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
     0, 0, 0, 0,
     0, 0,
-    (X509V3_EXT_I2V) i2v_AUTHORITY_INFO_ACCESS,
+    (X509V3_EXT_I2V)i2v_AUTHORITY_INFO_ACCESS,
     (X509V3_EXT_V2I)v2i_AUTHORITY_INFO_ACCESS,
     0, 0,
-    NULL
-};
+    NULL };
 
 const X509V3_EXT_METHOD ossl_v3_sinfo = { NID_sinfo_access, X509V3_EXT_MULTILINE,
     ASN1_ITEM_ref(AUTHORITY_INFO_ACCESS),
     0, 0, 0, 0,
     0, 0,
-    (X509V3_EXT_I2V) i2v_AUTHORITY_INFO_ACCESS,
+    (X509V3_EXT_I2V)i2v_AUTHORITY_INFO_ACCESS,
     (X509V3_EXT_V2I)v2i_AUTHORITY_INFO_ACCESS,
     0, 0,
-    NULL
-};
+    NULL };
 
 ASN1_SEQUENCE(ACCESS_DESCRIPTION) = {
-        ASN1_SIMPLE(ACCESS_DESCRIPTION, method, ASN1_OBJECT),
-        ASN1_SIMPLE(ACCESS_DESCRIPTION, location, GENERAL_NAME)
+    ASN1_SIMPLE(ACCESS_DESCRIPTION, method, ASN1_OBJECT),
+    ASN1_SIMPLE(ACCESS_DESCRIPTION, location, GENERAL_NAME)
 } ASN1_SEQUENCE_END(ACCESS_DESCRIPTION)
 
 IMPLEMENT_ASN1_FUNCTIONS(ACCESS_DESCRIPTION)
 
-ASN1_ITEM_TEMPLATE(AUTHORITY_INFO_ACCESS) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, ACCESS_DESCRIPTION)
+ASN1_ITEM_TEMPLATE(AUTHORITY_INFO_ACCESS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, ACCESS_DESCRIPTION)
 ASN1_ITEM_TEMPLATE_END(AUTHORITY_INFO_ACCESS)
 
 IMPLEMENT_ASN1_FUNCTIONS(AUTHORITY_INFO_ACCESS)
@@ -92,17 +91,17 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(
         return sk_CONF_VALUE_new_null();
 
     return tret;
- err:
+err:
     if (ret == NULL && tret != NULL)
         sk_CONF_VALUE_pop_free(tret, X509V3_conf_free);
     return NULL;
 }
 
 static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
-                                                        *method,
-                                                        X509V3_CTX *ctx,
-                                                        STACK_OF(CONF_VALUE)
-                                                        *nval)
+                                                            *method,
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE)
+        *nval)
 {
     AUTHORITY_INFO_ACCESS *ainfo = NULL;
     CONF_VALUE *cnf, ctmp;
@@ -136,14 +135,14 @@ static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
         acc->method = OBJ_txt2obj(objtmp, 0);
         if (!acc->method) {
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_BAD_OBJECT,
-                           "value=%s", objtmp);
+                "value=%s", objtmp);
             OPENSSL_free(objtmp);
             goto err;
         }
         OPENSSL_free(objtmp);
     }
     return ainfo;
- err:
+err:
     sk_ACCESS_DESCRIPTION_pop_free(ainfo, ACCESS_DESCRIPTION_free);
     return NULL;
 }
diff --git a/crypto/x509/v3_int.c b/crypto/x509/v3_int.c
index dae26a5ba9d74..d6d0d72fed834 100644
--- a/crypto/x509/v3_int.c
+++ b/crypto/x509/v3_int.c
@@ -29,7 +29,7 @@ const X509V3_EXT_METHOD ossl_v3_delta_crl = {
 };
 
 static void *s2i_asn1_int(X509V3_EXT_METHOD *meth, X509V3_CTX *ctx,
-                          const char *value)
+    const char *value)
 {
     return s2i_ASN1_INTEGER(meth, value);
 }
diff --git a/crypto/x509/v3_iobo.c b/crypto/x509/v3_iobo.c
index 23f991f6b6c97..84d729325d57d 100644
--- a/crypto/x509/v3_iobo.c
+++ b/crypto/x509/v3_iobo.c
@@ -11,8 +11,8 @@
 #include "ext_dat.h"
 
 static int i2r_ISSUED_ON_BEHALF_OF(X509V3_EXT_METHOD *method,
-                                   GENERAL_NAME *gn, BIO *out,
-                                   int indent)
+    GENERAL_NAME *gn, BIO *out,
+    int indent)
 {
     if (BIO_printf(out, "%*s", indent, "") <= 0)
         return 0;
diff --git a/crypto/x509/v3_ist.c b/crypto/x509/v3_ist.c
index b7ce4bb919155..2401c2fbfe80b 100644
--- a/crypto/x509/v3_ist.c
+++ b/crypto/x509/v3_ist.c
@@ -23,17 +23,16 @@
  */
 
 ASN1_SEQUENCE(ISSUER_SIGN_TOOL) = {
-        ASN1_SIMPLE(ISSUER_SIGN_TOOL, signTool, ASN1_UTF8STRING),
-        ASN1_SIMPLE(ISSUER_SIGN_TOOL, cATool, ASN1_UTF8STRING),
-        ASN1_SIMPLE(ISSUER_SIGN_TOOL, signToolCert, ASN1_UTF8STRING),
-        ASN1_SIMPLE(ISSUER_SIGN_TOOL, cAToolCert, ASN1_UTF8STRING)
+    ASN1_SIMPLE(ISSUER_SIGN_TOOL, signTool, ASN1_UTF8STRING),
+    ASN1_SIMPLE(ISSUER_SIGN_TOOL, cATool, ASN1_UTF8STRING),
+    ASN1_SIMPLE(ISSUER_SIGN_TOOL, signToolCert, ASN1_UTF8STRING),
+    ASN1_SIMPLE(ISSUER_SIGN_TOOL, cAToolCert, ASN1_UTF8STRING)
 } ASN1_SEQUENCE_END(ISSUER_SIGN_TOOL)
 
 IMPLEMENT_ASN1_FUNCTIONS(ISSUER_SIGN_TOOL)
 
-
 static ISSUER_SIGN_TOOL *v2i_issuer_sign_tool(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
-                        STACK_OF(CONF_VALUE) *nval)
+    STACK_OF(CONF_VALUE) *nval)
 {
     ISSUER_SIGN_TOOL *ist = ISSUER_SIGN_TOOL_new();
     int i;
@@ -93,8 +92,8 @@ static ISSUER_SIGN_TOOL *v2i_issuer_sign_tool(X509V3_EXT_METHOD *method, X509V3_
 }
 
 static int i2r_issuer_sign_tool(X509V3_EXT_METHOD *method,
-                                 ISSUER_SIGN_TOOL *ist, BIO *out,
-                                 int indent)
+    ISSUER_SIGN_TOOL *ist, BIO *out,
+    int indent)
 {
     int new_line = 0;
 
@@ -135,15 +134,15 @@ static int i2r_issuer_sign_tool(X509V3_EXT_METHOD *method,
 }
 
 const X509V3_EXT_METHOD ossl_v3_issuer_sign_tool = {
-    NID_issuerSignTool,                   /* nid */
-    X509V3_EXT_MULTILINE,                 /* flags */
-    ASN1_ITEM_ref(ISSUER_SIGN_TOOL),      /* template */
-    0, 0, 0, 0,                           /* old functions, ignored */
-    0,                                    /* i2s */
-    0,                                    /* s2i */
-    0,                                    /* i2v */
+    NID_issuerSignTool, /* nid */
+    X509V3_EXT_MULTILINE, /* flags */
+    ASN1_ITEM_ref(ISSUER_SIGN_TOOL), /* template */
+    0, 0, 0, 0, /* old functions, ignored */
+    0, /* i2s */
+    0, /* s2i */
+    0, /* i2v */
     (X509V3_EXT_V2I)v2i_issuer_sign_tool, /* v2i */
     (X509V3_EXT_I2R)i2r_issuer_sign_tool, /* i2r */
-    0,                                    /* r2i */
-    NULL                                  /* extension-specific data */
+    0, /* r2i */
+    NULL /* extension-specific data */
 };
diff --git a/crypto/x509/v3_lib.c b/crypto/x509/v3_lib.c
index 077b22c863ec6..fe6c235c5d187 100644
--- a/crypto/x509/v3_lib.c
+++ b/crypto/x509/v3_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-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
@@ -19,7 +19,7 @@
 static STACK_OF(X509V3_EXT_METHOD) *ext_list = NULL;
 
 static int ext_cmp(const X509V3_EXT_METHOD *const *a,
-                   const X509V3_EXT_METHOD *const *b);
+    const X509V3_EXT_METHOD *const *b);
 static void ext_list_free(X509V3_EXT_METHOD *ext);
 
 int X509V3_EXT_add(X509V3_EXT_METHOD *ext)
@@ -37,22 +37,22 @@ int X509V3_EXT_add(X509V3_EXT_METHOD *ext)
 }
 
 static int ext_cmp(const X509V3_EXT_METHOD *const *a,
-                   const X509V3_EXT_METHOD *const *b)
+    const X509V3_EXT_METHOD *const *b)
 {
     return ((*a)->ext_nid - (*b)->ext_nid);
 }
 
 DECLARE_OBJ_BSEARCH_CMP_FN(const X509V3_EXT_METHOD *,
-                           const X509V3_EXT_METHOD *, ext);
+    const X509V3_EXT_METHOD *, ext);
 IMPLEMENT_OBJ_BSEARCH_CMP_FN(const X509V3_EXT_METHOD *,
-                             const X509V3_EXT_METHOD *, ext);
+    const X509V3_EXT_METHOD *, ext);
 
 #include "standard_exts.h"
 
 const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid)
 {
     X509V3_EXT_METHOD tmp;
-    const X509V3_EXT_METHOD *t = &tmp, *const *ret;
+    const X509V3_EXT_METHOD *t = &tmp, *const * ret;
     int idx;
 
     if (nid < 0)
@@ -100,7 +100,11 @@ int X509V3_EXT_add_alias(int nid_to, int nid_from)
     *tmpext = *ext;
     tmpext->ext_nid = nid_to;
     tmpext->ext_flags |= X509V3_EXT_DYNAMIC;
-    return X509V3_EXT_add(tmpext);
+    if (!X509V3_EXT_add(tmpext)) {
+        OPENSSL_free(tmpext);
+        return 0;
+    }
+    return 1;
 }
 
 void X509V3_EXT_cleanup(void)
@@ -161,7 +165,7 @@ 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)
 {
     int lastpos, i;
     X509_EXTENSION *ex, *found_ex = NULL;
@@ -217,7 +221,7 @@ void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
  */
 
 int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
-                    int crit, unsigned long flags)
+    int crit, unsigned long flags)
 {
     int errcode, extidx = -1;
     X509_EXTENSION *ext = NULL, *extmp;
@@ -253,8 +257,7 @@ int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
         /*
          * If replace existing or delete, error since extension must exist
          */
-        if ((ext_op == X509V3_ADD_REPLACE_EXISTING) ||
-            (ext_op == X509V3_ADD_DELETE)) {
+        if ((ext_op == X509V3_ADD_REPLACE_EXISTING) || (ext_op == X509V3_ADD_DELETE)) {
             errcode = X509V3_R_EXTENSION_NOT_FOUND;
             goto err;
         }
@@ -291,14 +294,14 @@ int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
     *x = ret;
     return 1;
 
- m_fail:
+m_fail:
     /* ERR_raise(ERR_LIB_X509V3, ERR_R_CRYPTO_LIB); */
     if (ret != *x)
         sk_X509_EXTENSION_free(ret);
     X509_EXTENSION_free(ext);
     return -1;
 
- err:
+err:
     if (!(flags & X509V3_ADD_SILENT))
         ERR_raise(ERR_LIB_X509V3, errcode);
     return 0;
diff --git a/crypto/x509/v3_ncons.c b/crypto/x509/v3_ncons.c
index 51208ce789196..2d4b23685b0e0 100644
--- a/crypto/x509/v3_ncons.c
+++ b/crypto/x509/v3_ncons.c
@@ -25,18 +25,18 @@
 OSSL_SAFE_MATH_SIGNED(int, int)
 
 static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
-                                  X509V3_CTX *ctx,
-                                  STACK_OF(CONF_VALUE) *nval);
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *nval);
 static int i2r_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, void *a,
-                                BIO *bp, int ind);
+    BIO *bp, int ind);
 static int do_i2r_name_constraints(const X509V3_EXT_METHOD *method,
-                                   STACK_OF(GENERAL_SUBTREE) *trees, BIO *bp,
-                                   int ind, const char *name);
+    STACK_OF(GENERAL_SUBTREE) *trees, BIO *bp,
+    int ind, const char *name);
 static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip);
 
 static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc);
 static int nc_match_single(int effective_type, GENERAL_NAME *gen,
-                           GENERAL_NAME *base);
+    GENERAL_NAME *base);
 static int nc_dn(const X509_NAME *sub, const X509_NAME *nm);
 static int nc_dns(ASN1_IA5STRING *sub, ASN1_IA5STRING *dns);
 static int nc_email(ASN1_IA5STRING *sub, ASN1_IA5STRING *eml);
@@ -75,37 +75,36 @@ const X509V3_EXT_METHOD ossl_v3_delegated_name_constraints = {
 };
 
 ASN1_SEQUENCE(GENERAL_SUBTREE) = {
-        ASN1_SIMPLE(GENERAL_SUBTREE, base, GENERAL_NAME),
-        ASN1_IMP_OPT(GENERAL_SUBTREE, minimum, ASN1_INTEGER, 0),
-        ASN1_IMP_OPT(GENERAL_SUBTREE, maximum, ASN1_INTEGER, 1)
+    ASN1_SIMPLE(GENERAL_SUBTREE, base, GENERAL_NAME),
+    ASN1_IMP_OPT(GENERAL_SUBTREE, minimum, ASN1_INTEGER, 0),
+    ASN1_IMP_OPT(GENERAL_SUBTREE, maximum, ASN1_INTEGER, 1)
 } ASN1_SEQUENCE_END(GENERAL_SUBTREE)
 
 ASN1_SEQUENCE(NAME_CONSTRAINTS) = {
-        ASN1_IMP_SEQUENCE_OF_OPT(NAME_CONSTRAINTS, permittedSubtrees,
-                                                        GENERAL_SUBTREE, 0),
-        ASN1_IMP_SEQUENCE_OF_OPT(NAME_CONSTRAINTS, excludedSubtrees,
-                                                        GENERAL_SUBTREE, 1),
+    ASN1_IMP_SEQUENCE_OF_OPT(NAME_CONSTRAINTS, permittedSubtrees,
+        GENERAL_SUBTREE, 0),
+    ASN1_IMP_SEQUENCE_OF_OPT(NAME_CONSTRAINTS, excludedSubtrees,
+        GENERAL_SUBTREE, 1),
 } ASN1_SEQUENCE_END(NAME_CONSTRAINTS)
 
-
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(GENERAL_SUBTREE)
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(NAME_CONSTRAINTS)
 
-
 #define IA5_OFFSET_LEN(ia5base, offset) \
     ((ia5base)->length - ((unsigned char *)(offset) - (ia5base)->data))
 
 /* Like memchr but for ASN1_IA5STRING. Additionally you can specify the
  * starting point to search from
  */
-# define ia5memchr(str, start, c) memchr(start, c, IA5_OFFSET_LEN(str, start))
+#define ia5memchr(str, start, c) memchr(start, c, IA5_OFFSET_LEN(str, start))
 
 /* Like memrrchr but for ASN1_IA5STRING */
 static char *ia5memrchr(ASN1_IA5STRING *str, int c)
 {
     int i;
 
-    for (i = str->length; i > 0 && str->data[i - 1] != c; i--);
+    for (i = str->length; i > 0 && str->data[i - 1] != c; i--)
+        ;
 
     if (i == 0)
         return NULL;
@@ -147,7 +146,7 @@ static int ia5ncasecmp(const char *s1, const char *s2, size_t n)
 }
 
 static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
-                                  X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+    X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
     int i;
     CONF_VALUE tval, *val;
@@ -193,7 +192,7 @@ static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
 
     return ncons;
 
- err:
+err:
     NAME_CONSTRAINTS_free(ncons);
     GENERAL_SUBTREE_free(sub);
 
@@ -201,21 +200,21 @@ static void *v2i_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method,
 }
 
 static int i2r_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, void *a,
-                                BIO *bp, int ind)
+    BIO *bp, int ind)
 {
     NAME_CONSTRAINTS *ncons = a;
     do_i2r_name_constraints(method, ncons->permittedSubtrees,
-                            bp, ind, "Permitted");
+        bp, ind, "Permitted");
     if (ncons->permittedSubtrees && ncons->excludedSubtrees)
         BIO_puts(bp, "\n");
     do_i2r_name_constraints(method, ncons->excludedSubtrees,
-                            bp, ind, "Excluded");
+        bp, ind, "Excluded");
     return 1;
 }
 
 static int do_i2r_name_constraints(const X509V3_EXT_METHOD *method,
-                                   STACK_OF(GENERAL_SUBTREE) *trees,
-                                   BIO *bp, int ind, const char *name)
+    STACK_OF(GENERAL_SUBTREE) *trees,
+    BIO *bp, int ind, const char *name)
 {
     GENERAL_SUBTREE *tree;
     int i;
@@ -237,7 +236,8 @@ static int do_i2r_name_constraints(const X509V3_EXT_METHOD *method,
 static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip)
 {
     /* ip->length should be 8 or 32 and len1 == len2 == 4 or len1 == len2 == 16 */
-    int len1 = ip->length >= 16 ? 16 : ip->length >= 4 ? 4 : ip->length;
+    int len1 = ip->length >= 16 ? 16 : ip->length >= 4 ? 4
+                                                       : ip->length;
     int len2 = ip->length - len1;
     char *ip1 = ossl_ipaddr_to_asc(ip->data, len1);
     char *ip2 = ossl_ipaddr_to_asc(ip->data + len1, len2);
@@ -289,10 +289,10 @@ int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc)
      * constraints causing a computationally expensive name constraints check.
      */
     if (!add_lengths(&name_count, X509_NAME_entry_count(nm),
-                     sk_GENERAL_NAME_num(x->altname))
+            sk_GENERAL_NAME_num(x->altname))
         || !add_lengths(&constraint_count,
-                        sk_GENERAL_SUBTREE_num(nc->permittedSubtrees),
-                        sk_GENERAL_SUBTREE_num(nc->excludedSubtrees))
+            sk_GENERAL_SUBTREE_num(nc->permittedSubtrees),
+            sk_GENERAL_SUBTREE_num(nc->excludedSubtrees))
         || (name_count > 0 && constraint_count > NAME_CHECK_MAX / name_count))
         return X509_V_ERR_UNSPECIFIED;
 
@@ -326,7 +326,6 @@ int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc)
             if (r != X509_V_OK)
                 return r;
         }
-
     }
 
     for (i = 0; i < sk_GENERAL_NAME_num(x->altname); i++) {
@@ -337,7 +336,6 @@ int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc)
     }
 
     return X509_V_OK;
-
 }
 
 static int cn2dnsid(ASN1_STRING *cn, unsigned char **dnsid, size_t *idlen)
@@ -482,7 +480,8 @@ int NAME_CONSTRAINTS_check_CN(X509 *x, NAME_CONSTRAINTS *nc)
  * Return nonzero if the GeneralSubtree has valid 'minimum' field
  * (must be absent or 0) and valid 'maximum' field (must be absent).
  */
-static int nc_minmax_valid(GENERAL_SUBTREE *sub) {
+static int nc_minmax_valid(GENERAL_SUBTREE *sub)
+{
     BIGNUM *bn = NULL;
     int ok = 1;
 
@@ -510,8 +509,7 @@ static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc)
      * the otherName field may contain EAI email address treated specially
      * according to RFC 8398, section 6
      */
-    if (effective_type == GEN_OTHERNAME &&
-        (OBJ_obj2nid(gen->d.otherName->type_id) == NID_id_on_SmtpUTF8Mailbox)) {
+    if (effective_type == GEN_OTHERNAME && (OBJ_obj2nid(gen->d.otherName->type_id) == NID_id_on_SmtpUTF8Mailbox)) {
         effective_type = GEN_EMAIL;
     }
 
@@ -523,9 +521,7 @@ static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc)
     for (i = 0; i < sk_GENERAL_SUBTREE_num(nc->permittedSubtrees); i++) {
         sub = sk_GENERAL_SUBTREE_value(nc->permittedSubtrees, i);
         if (effective_type != sub->base->type
-            || (effective_type == GEN_OTHERNAME &&
-                OBJ_cmp(gen->d.otherName->type_id,
-                        sub->base->d.otherName->type_id) != 0))
+            || (effective_type == GEN_OTHERNAME && OBJ_cmp(gen->d.otherName->type_id, sub->base->d.otherName->type_id) != 0))
             continue;
         if (!nc_minmax_valid(sub))
             return X509_V_ERR_SUBTREE_MINMAX;
@@ -549,9 +545,7 @@ static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc)
     for (i = 0; i < sk_GENERAL_SUBTREE_num(nc->excludedSubtrees); i++) {
         sub = sk_GENERAL_SUBTREE_value(nc->excludedSubtrees, i);
         if (effective_type != sub->base->type
-            || (effective_type == GEN_OTHERNAME &&
-                OBJ_cmp(gen->d.otherName->type_id,
-                        sub->base->d.otherName->type_id) != 0))
+            || (effective_type == GEN_OTHERNAME && OBJ_cmp(gen->d.otherName->type_id, sub->base->d.otherName->type_id) != 0))
             continue;
         if (!nc_minmax_valid(sub))
             return X509_V_ERR_SUBTREE_MINMAX;
@@ -561,15 +555,13 @@ static int nc_match(GENERAL_NAME *gen, NAME_CONSTRAINTS *nc)
             return X509_V_ERR_EXCLUDED_VIOLATION;
         else if (r != X509_V_ERR_PERMITTED_VIOLATION)
             return r;
-
     }
 
     return X509_V_OK;
-
 }
 
 static int nc_match_single(int effective_type, GENERAL_NAME *gen,
-                           GENERAL_NAME *base)
+    GENERAL_NAME *base)
 {
     switch (gen->type) {
     case GEN_OTHERNAME:
@@ -596,7 +588,7 @@ static int nc_match_single(int effective_type, GENERAL_NAME *gen,
 
     case GEN_URI:
         return nc_uri(gen->d.uniformResourceIdentifier,
-                      base->d.uniformResourceIdentifier);
+            base->d.uniformResourceIdentifier);
 
     case GEN_IPADD:
         return nc_ip(gen->d.iPAddress, base->d.iPAddress);
@@ -604,7 +596,6 @@ static int nc_match_single(int effective_type, GENERAL_NAME *gen,
     default:
         return X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE;
     }
-
 }
 
 /*
@@ -653,7 +644,6 @@ static int nc_dns(ASN1_IA5STRING *dns, ASN1_IA5STRING *base)
         return X509_V_ERR_PERMITTED_VIOLATION;
 
     return X509_V_OK;
-
 }
 
 /*
@@ -723,12 +713,12 @@ static int nc_email_eai(ASN1_TYPE *emltype, ASN1_IA5STRING *base)
     emlptr = emlat + 1;
     emlhostlen = IA5_OFFSET_LEN(eml, emlptr);
     if (emlhostlen != strlen(ulabel)
-            || ia5ncasecmp(ulabel, emlptr, emlhostlen) != 0) {
+        || ia5ncasecmp(ulabel, emlptr, emlhostlen) != 0) {
         ret = X509_V_ERR_PERMITTED_VIOLATION;
         goto end;
     }
 
- end:
+end:
     OPENSSL_free(baseptr);
     return ret;
 }
@@ -759,8 +749,7 @@ static int nc_email(ASN1_IA5STRING *eml, ASN1_IA5STRING *base)
         if (baseat != baseptr) {
             if ((baseat - baseptr) != (emlat - emlptr))
                 return X509_V_ERR_PERMITTED_VIOLATION;
-            if (memchr(baseptr, 0, baseat - baseptr) ||
-                memchr(emlptr, 0, emlat - emlptr))
+            if (memchr(baseptr, 0, baseat - baseptr) || memchr(emlptr, 0, emlat - emlptr))
                 return X509_V_ERR_UNSUPPORTED_NAME_SYNTAX;
             /* Case sensitive match of local part */
             if (strncmp(baseptr, emlptr, emlat - emlptr))
@@ -777,7 +766,6 @@ static int nc_email(ASN1_IA5STRING *eml, ASN1_IA5STRING *base)
         return X509_V_ERR_PERMITTED_VIOLATION;
 
     return X509_V_OK;
-
 }
 
 static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base)
@@ -800,7 +788,7 @@ static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base)
     /* Make sure the scheme is there */
     if (scheme == NULL || *scheme == '\0') {
         ERR_raise_data(ERR_LIB_X509V3, X509_V_ERR_UNSUPPORTED_NAME_SYNTAX,
-                       "x509: missing scheme in URI: %s\n", uri_copy);
+            "x509: missing scheme in URI: %s\n", uri_copy);
         OPENSSL_free(uri_copy);
         ret = X509_V_ERR_UNSUPPORTED_NAME_SYNTAX;
         goto end;
@@ -834,7 +822,6 @@ static int nc_uri(ASN1_IA5STRING *uri, ASN1_IA5STRING *base)
 end:
     OPENSSL_free(host);
     return ret;
-
 }
 
 static int nc_ip(ASN1_OCTET_STRING *ip, ASN1_OCTET_STRING *base)
@@ -865,5 +852,4 @@ static int nc_ip(ASN1_OCTET_STRING *ip, ASN1_OCTET_STRING *base)
             return X509_V_ERR_PERMITTED_VIOLATION;
 
     return X509_V_OK;
-
 }
diff --git a/crypto/x509/v3_no_ass.c b/crypto/x509/v3_no_ass.c
index 873e20a751c71..ee012c38e2990 100644
--- a/crypto/x509/v3_no_ass.c
+++ b/crypto/x509/v3_no_ass.c
@@ -15,14 +15,14 @@
 #include "ext_dat.h"
 
 static int i2r_NO_ASSERTION(X509V3_EXT_METHOD *method,
-                            void *su, BIO *out,
-                            int indent)
+    void *su, BIO *out,
+    int indent)
 {
     return 1;
 }
 
 static void *r2i_NO_ASSERTION(X509V3_EXT_METHOD *method,
-                              X509V3_CTX *ctx, const char *value)
+    X509V3_CTX *ctx, const char *value)
 {
     return ASN1_NULL_new();
 }
diff --git a/crypto/x509/v3_no_rev_avail.c b/crypto/x509/v3_no_rev_avail.c
index 849feda5ec007..ab84b3a27d0c9 100644
--- a/crypto/x509/v3_no_rev_avail.c
+++ b/crypto/x509/v3_no_rev_avail.c
@@ -15,14 +15,14 @@
 #include "ext_dat.h"
 
 static int i2r_NO_REV_AVAIL(X509V3_EXT_METHOD *method,
-                            void *su, BIO *out,
-                            int indent)
+    void *su, BIO *out,
+    int indent)
 {
     return 1;
 }
 
 static void *r2i_NO_REV_AVAIL(X509V3_EXT_METHOD *method,
-                            X509V3_CTX *ctx, const char *value)
+    X509V3_CTX *ctx, const char *value)
 {
     return ASN1_NULL_new();
 }
diff --git a/crypto/x509/v3_pci.c b/crypto/x509/v3_pci.c
index 1549a244ac877..8adbd84135097 100644
--- a/crypto/x509/v3_pci.c
+++ b/crypto/x509/v3_pci.c
@@ -50,22 +50,29 @@
 #include "ext_dat.h"
 
 static int i2r_pci(X509V3_EXT_METHOD *method, PROXY_CERT_INFO_EXTENSION *ext,
-                   BIO *out, int indent);
+    BIO *out, int indent);
 static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
-                                          X509V3_CTX *ctx, char *str);
+    X509V3_CTX *ctx, char *str);
 
 const X509V3_EXT_METHOD ossl_v3_pci = {
-    NID_proxyCertInfo, 0, ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION),
-    0, 0, 0, 0,
-    0, 0,
-    NULL, NULL,
+    NID_proxyCertInfo,
+    0,
+    ASN1_ITEM_ref(PROXY_CERT_INFO_EXTENSION),
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    NULL,
+    NULL,
     (X509V3_EXT_I2R)i2r_pci,
     (X509V3_EXT_R2I)r2i_pci,
     NULL,
 };
 
 static int i2r_pci(X509V3_EXT_METHOD *method, PROXY_CERT_INFO_EXTENSION *pci,
-                   BIO *out, int indent)
+    BIO *out, int indent)
 {
     BIO_printf(out, "%*sPath Length Constraint: ", indent, "");
     if (pci->pcPathLengthConstraint)
@@ -77,14 +84,14 @@ static int i2r_pci(X509V3_EXT_METHOD *method, PROXY_CERT_INFO_EXTENSION *pci,
     i2a_ASN1_OBJECT(out, pci->proxyPolicy->policyLanguage);
     if (pci->proxyPolicy->policy && pci->proxyPolicy->policy->data)
         BIO_printf(out, "\n%*sPolicy Text: %.*s", indent, "",
-                   pci->proxyPolicy->policy->length,
-                   pci->proxyPolicy->policy->data);
+            pci->proxyPolicy->policy->length,
+            pci->proxyPolicy->policy->data);
     return 1;
 }
 
 static int process_pci_value(CONF_VALUE *val,
-                             ASN1_OBJECT **language, ASN1_INTEGER **pathlen,
-                             ASN1_OCTET_STRING **policy)
+    ASN1_OBJECT **language, ASN1_INTEGER **pathlen,
+    ASN1_OCTET_STRING **policy)
 {
     int free_policy = 0;
 
@@ -102,7 +109,7 @@ static int process_pci_value(CONF_VALUE *val,
     } else if (strcmp(val->name, "pathlen") == 0) {
         if (*pathlen) {
             ERR_raise(ERR_LIB_X509V3,
-                      X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED);
+                X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED);
             X509V3_conf_err(val);
             return 0;
         }
@@ -126,8 +133,7 @@ static int process_pci_value(CONF_VALUE *val,
             free_policy = 1;
         }
         if (CHECK_AND_SKIP_PREFIX(valp, "hex:")) {
-            unsigned char *tmp_data2 =
-                OPENSSL_hexstr2buf(valp, &val_len);
+            unsigned char *tmp_data2 = OPENSSL_hexstr2buf(valp, &val_len);
 
             if (!tmp_data2) {
                 X509V3_conf_err(val);
@@ -135,11 +141,11 @@ static int process_pci_value(CONF_VALUE *val,
             }
 
             tmp_data = OPENSSL_realloc((*policy)->data,
-                                       (*policy)->length + val_len + 1);
+                (*policy)->length + val_len + 1);
             if (tmp_data) {
                 (*policy)->data = tmp_data;
                 memcpy(&(*policy)->data[(*policy)->length],
-                       tmp_data2, val_len);
+                    tmp_data2, val_len);
                 (*policy)->length += val_len;
                 (*policy)->data[(*policy)->length] = '\0';
             } else {
@@ -165,12 +171,12 @@ static int process_pci_value(CONF_VALUE *val,
                 goto err;
             }
             while ((n = BIO_read(b, buf, sizeof(buf))) > 0
-                   || (n == 0 && BIO_should_retry(b))) {
+                || (n == 0 && BIO_should_retry(b))) {
                 if (!n)
                     continue;
 
                 tmp_data = OPENSSL_realloc((*policy)->data,
-                                           (*policy)->length + n + 1);
+                    (*policy)->length + n + 1);
 
                 if (!tmp_data) {
                     OPENSSL_free((*policy)->data);
@@ -196,11 +202,11 @@ static int process_pci_value(CONF_VALUE *val,
         } else if (CHECK_AND_SKIP_PREFIX(valp, "text:")) {
             val_len = strlen(valp);
             tmp_data = OPENSSL_realloc((*policy)->data,
-                                       (*policy)->length + val_len + 1);
+                (*policy)->length + val_len + 1);
             if (tmp_data) {
                 (*policy)->data = tmp_data;
                 memcpy(&(*policy)->data[(*policy)->length],
-                       val->value + 5, val_len);
+                    val->value + 5, val_len);
                 (*policy)->length += val_len;
                 (*policy)->data[(*policy)->length] = '\0';
             } else {
@@ -225,7 +231,7 @@ static int process_pci_value(CONF_VALUE *val,
         }
     }
     return 1;
- err:
+err:
     if (free_policy) {
         ASN1_OCTET_STRING_free(*policy);
         *policy = NULL;
@@ -234,7 +240,7 @@ static int process_pci_value(CONF_VALUE *val,
 }
 
 static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
-                                          X509V3_CTX *ctx, char *value)
+    X509V3_CTX *ctx, char *value)
 {
     PROXY_CERT_INFO_EXTENSION *pci = NULL;
     STACK_OF(CONF_VALUE) *vals;
@@ -263,9 +269,8 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
                 goto err;
             }
             for (j = 0; success_p && j < sk_CONF_VALUE_num(sect); j++) {
-                success_p =
-                    process_pci_value(sk_CONF_VALUE_value(sect, j),
-                                      &language, &pathlen, &policy);
+                success_p = process_pci_value(sk_CONF_VALUE_value(sect, j),
+                    &language, &pathlen, &policy);
             }
             X509V3_section_free(ctx, sect);
             if (!success_p)
@@ -281,13 +286,13 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
     /* Language is mandatory */
     if (!language) {
         ERR_raise(ERR_LIB_X509V3,
-                  X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED);
+            X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED);
         goto err;
     }
     i = OBJ_obj2nid(language);
     if ((i == NID_Independent || i == NID_id_ppl_inheritAll) && policy) {
         ERR_raise(ERR_LIB_X509V3,
-                  X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY);
+            X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY);
         goto err;
     }
 
@@ -304,7 +309,7 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
     pci->pcPathLengthConstraint = pathlen;
     pathlen = NULL;
     goto end;
- err:
+err:
     ASN1_OBJECT_free(language);
     ASN1_INTEGER_free(pathlen);
     pathlen = NULL;
@@ -312,7 +317,7 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method,
     policy = NULL;
     PROXY_CERT_INFO_EXTENSION_free(pci);
     pci = NULL;
- end:
+end:
     sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
     return pci;
 }
diff --git a/crypto/x509/v3_pcia.c b/crypto/x509/v3_pcia.c
index 478de610ae920..427b263c2eb99 100644
--- a/crypto/x509/v3_pcia.c
+++ b/crypto/x509/v3_pcia.c
@@ -48,15 +48,15 @@
 #include <openssl/x509v3.h>
 
 ASN1_SEQUENCE(PROXY_POLICY) = {
-        ASN1_SIMPLE(PROXY_POLICY, policyLanguage, ASN1_OBJECT),
-        ASN1_OPT(PROXY_POLICY, policy, ASN1_OCTET_STRING)
+    ASN1_SIMPLE(PROXY_POLICY, policyLanguage, ASN1_OBJECT),
+    ASN1_OPT(PROXY_POLICY, policy, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(PROXY_POLICY)
 
 IMPLEMENT_ASN1_FUNCTIONS(PROXY_POLICY)
 
 ASN1_SEQUENCE(PROXY_CERT_INFO_EXTENSION) = {
-        ASN1_OPT(PROXY_CERT_INFO_EXTENSION, pcPathLengthConstraint, ASN1_INTEGER),
-        ASN1_SIMPLE(PROXY_CERT_INFO_EXTENSION, proxyPolicy, PROXY_POLICY)
+    ASN1_OPT(PROXY_CERT_INFO_EXTENSION, pcPathLengthConstraint, ASN1_INTEGER),
+    ASN1_SIMPLE(PROXY_CERT_INFO_EXTENSION, proxyPolicy, PROXY_POLICY)
 } ASN1_SEQUENCE_END(PROXY_CERT_INFO_EXTENSION)
 
 IMPLEMENT_ASN1_FUNCTIONS(PROXY_CERT_INFO_EXTENSION)
diff --git a/crypto/x509/v3_pcons.c b/crypto/x509/v3_pcons.c
index 72c2364b05684..e8c3d242d9ac9 100644
--- a/crypto/x509/v3_pcons.c
+++ b/crypto/x509/v3_pcons.c
@@ -16,11 +16,11 @@
 #include "ext_dat.h"
 
 static STACK_OF(CONF_VALUE) *i2v_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD
-                                                    *method, void *bcons, STACK_OF(CONF_VALUE)
-                                                    *extlist);
+                                                        *method,
+    void *bcons, STACK_OF(CONF_VALUE) *extlist);
 static void *v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method,
-                                    X509V3_CTX *ctx,
-                                    STACK_OF(CONF_VALUE) *values);
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *values);
 
 const X509V3_EXT_METHOD ossl_v3_policy_constraints = {
     NID_policy_constraints, 0,
@@ -34,27 +34,27 @@ const X509V3_EXT_METHOD ossl_v3_policy_constraints = {
 };
 
 ASN1_SEQUENCE(POLICY_CONSTRAINTS) = {
-        ASN1_IMP_OPT(POLICY_CONSTRAINTS, requireExplicitPolicy, ASN1_INTEGER,0),
-        ASN1_IMP_OPT(POLICY_CONSTRAINTS, inhibitPolicyMapping, ASN1_INTEGER,1)
+    ASN1_IMP_OPT(POLICY_CONSTRAINTS, requireExplicitPolicy, ASN1_INTEGER, 0),
+    ASN1_IMP_OPT(POLICY_CONSTRAINTS, inhibitPolicyMapping, ASN1_INTEGER, 1)
 } ASN1_SEQUENCE_END(POLICY_CONSTRAINTS)
 
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(POLICY_CONSTRAINTS)
 
 static STACK_OF(CONF_VALUE) *i2v_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD
-                                                    *method, void *a, STACK_OF(CONF_VALUE)
-                                                    *extlist)
+                                                        *method,
+    void *a, STACK_OF(CONF_VALUE) *extlist)
 {
     POLICY_CONSTRAINTS *pcons = a;
     X509V3_add_value_int("Require Explicit Policy",
-                         pcons->requireExplicitPolicy, &extlist);
+        pcons->requireExplicitPolicy, &extlist);
     X509V3_add_value_int("Inhibit Policy Mapping",
-                         pcons->inhibitPolicyMapping, &extlist);
+        pcons->inhibitPolicyMapping, &extlist);
     return extlist;
 }
 
 static void *v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method,
-                                    X509V3_CTX *ctx,
-                                    STACK_OF(CONF_VALUE) *values)
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *values)
 {
     POLICY_CONSTRAINTS *pcons = NULL;
     CONF_VALUE *val;
@@ -74,18 +74,18 @@ static void *v2i_POLICY_CONSTRAINTS(const X509V3_EXT_METHOD *method,
                 goto err;
         } else {
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_NAME,
-                           "%s", val->name);
+                "%s", val->name);
             goto err;
         }
     }
     if (pcons->inhibitPolicyMapping == NULL
-            && pcons->requireExplicitPolicy == NULL) {
+        && pcons->requireExplicitPolicy == NULL) {
         ERR_raise(ERR_LIB_X509V3, X509V3_R_ILLEGAL_EMPTY_EXTENSION);
         goto err;
     }
 
     return pcons;
- err:
+err:
     POLICY_CONSTRAINTS_free(pcons);
     return NULL;
 }
diff --git a/crypto/x509/v3_pku.c b/crypto/x509/v3_pku.c
index 8f7e7d6813003..4c3f623703324 100644
--- a/crypto/x509/v3_pku.c
+++ b/crypto/x509/v3_pku.c
@@ -15,8 +15,8 @@
 #include "ext_dat.h"
 
 static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method,
-                                 PKEY_USAGE_PERIOD *usage, BIO *out,
-                                 int indent);
+    PKEY_USAGE_PERIOD *usage, BIO *out,
+    int indent);
 
 const X509V3_EXT_METHOD ossl_v3_pkey_usage_period = {
     NID_private_key_usage_period, 0, ASN1_ITEM_ref(PKEY_USAGE_PERIOD),
@@ -27,15 +27,15 @@ const X509V3_EXT_METHOD ossl_v3_pkey_usage_period = {
 };
 
 ASN1_SEQUENCE(PKEY_USAGE_PERIOD) = {
-        ASN1_IMP_OPT(PKEY_USAGE_PERIOD, notBefore, ASN1_GENERALIZEDTIME, 0),
-        ASN1_IMP_OPT(PKEY_USAGE_PERIOD, notAfter, ASN1_GENERALIZEDTIME, 1)
+    ASN1_IMP_OPT(PKEY_USAGE_PERIOD, notBefore, ASN1_GENERALIZEDTIME, 0),
+    ASN1_IMP_OPT(PKEY_USAGE_PERIOD, notAfter, ASN1_GENERALIZEDTIME, 1)
 } ASN1_SEQUENCE_END(PKEY_USAGE_PERIOD)
 
 IMPLEMENT_ASN1_FUNCTIONS(PKEY_USAGE_PERIOD)
 
 static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method,
-                                 PKEY_USAGE_PERIOD *usage, BIO *out,
-                                 int indent)
+    PKEY_USAGE_PERIOD *usage, BIO *out,
+    int indent)
 {
     BIO_printf(out, "%*s", indent, "");
     if (usage->notBefore) {
diff --git a/crypto/x509/v3_pmaps.c b/crypto/x509/v3_pmaps.c
index e5d7dddc0ac8f..cd6af2e83953e 100644
--- a/crypto/x509/v3_pmaps.c
+++ b/crypto/x509/v3_pmaps.c
@@ -15,10 +15,10 @@
 #include "ext_dat.h"
 
 static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
-                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
+    X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
 static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD
-                                                 *method, void *pmps, STACK_OF(CONF_VALUE)
-                                                 *extlist);
+                                                     *method,
+    void *pmps, STACK_OF(CONF_VALUE) *extlist);
 
 const X509V3_EXT_METHOD ossl_v3_policy_mappings = {
     NID_policy_mappings, 0,
@@ -32,20 +32,19 @@ const X509V3_EXT_METHOD ossl_v3_policy_mappings = {
 };
 
 ASN1_SEQUENCE(POLICY_MAPPING) = {
-        ASN1_SIMPLE(POLICY_MAPPING, issuerDomainPolicy, ASN1_OBJECT),
-        ASN1_SIMPLE(POLICY_MAPPING, subjectDomainPolicy, ASN1_OBJECT)
+    ASN1_SIMPLE(POLICY_MAPPING, issuerDomainPolicy, ASN1_OBJECT),
+    ASN1_SIMPLE(POLICY_MAPPING, subjectDomainPolicy, ASN1_OBJECT)
 } ASN1_SEQUENCE_END(POLICY_MAPPING)
 
-ASN1_ITEM_TEMPLATE(POLICY_MAPPINGS) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, POLICY_MAPPINGS,
-                                                                POLICY_MAPPING)
+ASN1_ITEM_TEMPLATE(POLICY_MAPPINGS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, POLICY_MAPPINGS,
+    POLICY_MAPPING)
 ASN1_ITEM_TEMPLATE_END(POLICY_MAPPINGS)
 
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(POLICY_MAPPING)
 
 static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD
-                                                 *method, void *a, STACK_OF(CONF_VALUE)
-                                                 *ext_list)
+                                                     *method,
+    void *a, STACK_OF(CONF_VALUE) *ext_list)
 {
     POLICY_MAPPINGS *pmaps = a;
     POLICY_MAPPING *pmap;
@@ -63,7 +62,7 @@ static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD
 }
 
 static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
-                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+    X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
     POLICY_MAPPING *pmap = NULL;
     ASN1_OBJECT *obj1 = NULL, *obj2 = NULL;
@@ -81,14 +80,14 @@ static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
         val = sk_CONF_VALUE_value(nval, i);
         if (!val->value || !val->name) {
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_OBJECT_IDENTIFIER,
-                           "%s", val->name);
+                "%s", val->name);
             goto err;
         }
         obj1 = OBJ_txt2obj(val->name, 0);
         obj2 = OBJ_txt2obj(val->value, 0);
         if (!obj1 || !obj2) {
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_INVALID_OBJECT_IDENTIFIER,
-                           "%s", val->name);
+                "%s", val->name);
             goto err;
         }
         pmap = POLICY_MAPPING_new();
@@ -102,7 +101,7 @@ static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
         sk_POLICY_MAPPING_push(pmaps, pmap); /* no failure as it was reserved */
     }
     return pmaps;
- err:
+err:
     ASN1_OBJECT_free(obj1);
     ASN1_OBJECT_free(obj2);
     sk_POLICY_MAPPING_pop_free(pmaps, POLICY_MAPPING_free);
diff --git a/crypto/x509/v3_prn.c b/crypto/x509/v3_prn.c
index 1e4516a713c24..088cffed69f01 100644
--- a/crypto/x509/v3_prn.c
+++ b/crypto/x509/v3_prn.c
@@ -17,12 +17,12 @@
 /* Extension printing routines */
 
 static int unknown_ext_print(BIO *out, const unsigned char *ext, int extlen,
-                             unsigned long flag, int indent, int supported);
+    unsigned long flag, int indent, int supported);
 
 /* Print out a name+value stack */
 
 void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
-                        int ml)
+    int ml)
 {
     int i;
     CONF_VALUE *nval;
@@ -38,8 +38,7 @@ void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
             if (i > 0)
                 BIO_printf(out, "\n");
             BIO_printf(out, "%*s", indent, "");
-        }
-        else if (i > 0)
+        } else if (i > 0)
             BIO_printf(out, ", ");
         nval = sk_CONF_VALUE_value(val, i);
         if (!nval->name)
@@ -68,7 +67,7 @@ void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
 /* Main routine: print out a general extension */
 
 int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
-                     int indent)
+    int indent)
 {
     void *ext_str = NULL;
     char *value = NULL;
@@ -119,14 +118,14 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
             goto err;
         }
         X509V3_EXT_val_prn(out, nval, indent,
-                           method->ext_flags & X509V3_EXT_MULTILINE);
+            method->ext_flags & X509V3_EXT_MULTILINE);
     } else if (method->i2r) {
         if (!method->i2r(method, ext_str, out, indent))
             ok = 0;
     } else
         ok = 0;
 
- err:
+err:
     sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
     OPENSSL_free(value);
     if (method->it)
@@ -137,8 +136,8 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
 }
 
 int X509V3_extensions_print(BIO *bp, 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 i, j;
 
@@ -157,8 +156,8 @@ int X509V3_extensions_print(BIO *bp, const char *title,
         ex = sk_X509_EXTENSION_value(exts, i);
         obj = X509_EXTENSION_get_object(ex);
         if ((flag & X509_FLAG_EXTENSIONS_ONLY_KID) != 0
-                && OBJ_obj2nid(obj) != NID_subject_key_identifier
-                && OBJ_obj2nid(obj) != NID_authority_key_identifier)
+            && OBJ_obj2nid(obj) != NID_subject_key_identifier
+            && OBJ_obj2nid(obj) != NID_authority_key_identifier)
             continue;
         if (indent && BIO_printf(bp, "%*s", indent, "") <= 0)
             return 0;
@@ -177,7 +176,7 @@ int X509V3_extensions_print(BIO *bp, const char *title,
 }
 
 static int unknown_ext_print(BIO *out, const unsigned char *ext, int extlen,
-                             unsigned long flag, int indent, int supported)
+    unsigned long flag, int indent, int supported)
 {
     switch (flag & X509V3_EXT_UNKNOWN_MASK) {
 
diff --git a/crypto/x509/v3_purp.c b/crypto/x509/v3_purp.c
index 4688aaeea4125..3c1bdd84a7e93 100644
--- a/crypto/x509/v3_purp.c
+++ b/crypto/x509/v3_purp.c
@@ -18,55 +18,55 @@
 
 static int check_ssl_ca(const X509 *x);
 static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x,
-                                    int non_leaf);
+    int non_leaf);
 static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x,
-                                    int non_leaf);
+    int non_leaf);
 static int check_purpose_ns_ssl_server(const X509_PURPOSE *xp, const X509 *x,
-                                       int non_leaf);
+    int non_leaf);
 static int purpose_smime(const X509 *x, int non_leaf);
 static int check_purpose_smime_sign(const X509_PURPOSE *xp, const X509 *x,
-                                    int non_leaf);
+    int non_leaf);
 static int check_purpose_smime_encrypt(const X509_PURPOSE *xp, const X509 *x,
-                                       int non_leaf);
+    int non_leaf);
 static int check_purpose_crl_sign(const X509_PURPOSE *xp, const X509 *x,
-                                  int non_leaf);
+    int non_leaf);
 static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x,
-                                        int non_leaf);
+    int non_leaf);
 static int check_purpose_code_sign(const X509_PURPOSE *xp, const X509 *x,
-                                        int non_leaf);
+    int non_leaf);
 static int no_check_purpose(const X509_PURPOSE *xp, const X509 *x,
-                            int non_leaf);
+    int non_leaf);
 static int check_purpose_ocsp_helper(const X509_PURPOSE *xp, const X509 *x,
-                                     int non_leaf);
+    int non_leaf);
 
 static int xp_cmp(const X509_PURPOSE *const *a, const X509_PURPOSE *const *b);
 static void xptable_free(X509_PURPOSE *p);
 
 /* note that the id must be unique and for the standard entries == idx + 1 */
 static X509_PURPOSE xstandard[] = {
-    {X509_PURPOSE_SSL_CLIENT, X509_TRUST_SSL_CLIENT, 0,
-     check_purpose_ssl_client, "SSL client", "sslclient", NULL},
-    {X509_PURPOSE_SSL_SERVER, X509_TRUST_SSL_SERVER, 0,
-     check_purpose_ssl_server, "SSL server", "sslserver", NULL},
-    {X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0,
-     check_purpose_ns_ssl_server, "Netscape SSL server", "nssslserver", NULL},
-    {X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign,
-     "S/MIME signing", "smimesign", NULL},
-    {X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0,
-     check_purpose_smime_encrypt, "S/MIME encryption", "smimeencrypt", NULL},
-    {X509_PURPOSE_CRL_SIGN, X509_TRUST_COMPAT, 0, check_purpose_crl_sign,
-     "CRL signing", "crlsign", NULL},
-    {X509_PURPOSE_ANY, X509_TRUST_DEFAULT, 0, no_check_purpose,
-     "Any Purpose", "any",
-     NULL},
-    {X509_PURPOSE_OCSP_HELPER, X509_TRUST_COMPAT, 0, check_purpose_ocsp_helper,
-     "OCSP helper", "ocsphelper", NULL},
-    {X509_PURPOSE_TIMESTAMP_SIGN, X509_TRUST_TSA, 0,
-     check_purpose_timestamp_sign, "Time Stamp signing", "timestampsign",
-     NULL},
-    {X509_PURPOSE_CODE_SIGN, X509_TRUST_OBJECT_SIGN, 0,
-     check_purpose_code_sign, "Code signing", "codesign",
-     NULL},
+    { X509_PURPOSE_SSL_CLIENT, X509_TRUST_SSL_CLIENT, 0,
+        check_purpose_ssl_client, "SSL client", "sslclient", NULL },
+    { X509_PURPOSE_SSL_SERVER, X509_TRUST_SSL_SERVER, 0,
+        check_purpose_ssl_server, "SSL server", "sslserver", NULL },
+    { X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0,
+        check_purpose_ns_ssl_server, "Netscape SSL server", "nssslserver", NULL },
+    { X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign,
+        "S/MIME signing", "smimesign", NULL },
+    { X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0,
+        check_purpose_smime_encrypt, "S/MIME encryption", "smimeencrypt", NULL },
+    { X509_PURPOSE_CRL_SIGN, X509_TRUST_COMPAT, 0, check_purpose_crl_sign,
+        "CRL signing", "crlsign", NULL },
+    { X509_PURPOSE_ANY, X509_TRUST_DEFAULT, 0, no_check_purpose,
+        "Any Purpose", "any",
+        NULL },
+    { X509_PURPOSE_OCSP_HELPER, X509_TRUST_COMPAT, 0, check_purpose_ocsp_helper,
+        "OCSP helper", "ocsphelper", NULL },
+    { X509_PURPOSE_TIMESTAMP_SIGN, X509_TRUST_TSA, 0,
+        check_purpose_timestamp_sign, "Time Stamp signing", "timestampsign",
+        NULL },
+    { X509_PURPOSE_CODE_SIGN, X509_TRUST_OBJECT_SIGN, 0,
+        check_purpose_code_sign, "Code signing", "codesign",
+        NULL },
 };
 
 #define X509_PURPOSE_COUNT OSSL_NELEM(xstandard)
@@ -174,8 +174,8 @@ int X509_PURPOSE_get_by_id(int purpose)
  * May also be used to modify existing entry, including changing its 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)
 {
     int old_id = 0;
     int idx;
@@ -186,7 +186,7 @@ int X509_PURPOSE_add(int id, int trust, int flags,
         return 0;
     }
     if (trust < X509_TRUST_DEFAULT || name == NULL || sname == NULL || ck == NULL) {
-        ERR_raise(ERR_LIB_X509, ERR_R_PASSED_INVALID_ARGUMENT);
+        ERR_raise(ERR_LIB_X509V3, ERR_R_PASSED_INVALID_ARGUMENT);
         return 0;
     }
 
@@ -250,7 +250,7 @@ int X509_PURPOSE_add(int id, int trust, int flags,
         (void)sk_X509_PURPOSE_set(xptable, idx, ptmp);
     }
     return 1;
- err:
+err:
     if (idx == -1) {
         OPENSSL_free(ptmp->name);
         OPENSSL_free(ptmp->sname);
@@ -317,22 +317,22 @@ int X509_supported_extension(X509_EXTENSION *ex)
      */
     static const int supported_nids[] = {
         NID_netscape_cert_type, /* 71 */
-        NID_key_usage,          /* 83 */
-        NID_subject_alt_name,   /* 85 */
-        NID_basic_constraints,  /* 87 */
+        NID_key_usage, /* 83 */
+        NID_subject_alt_name, /* 85 */
+        NID_basic_constraints, /* 87 */
         NID_certificate_policies, /* 89 */
         NID_crl_distribution_points, /* 103 */
-        NID_ext_key_usage,      /* 126 */
+        NID_ext_key_usage, /* 126 */
 #ifndef OPENSSL_NO_RFC3779
-        NID_sbgp_ipAddrBlock,   /* 290 */
+        NID_sbgp_ipAddrBlock, /* 290 */
         NID_sbgp_autonomousSysNum, /* 291 */
 #endif
         NID_id_pkix_OCSP_noCheck, /* 369 */
         NID_policy_constraints, /* 401 */
-        NID_proxyCertInfo,      /* 663 */
-        NID_name_constraints,   /* 666 */
-        NID_policy_mappings,    /* 747 */
-        NID_inhibit_any_policy  /* 748 */
+        NID_proxyCertInfo, /* 663 */
+        NID_name_constraints, /* 666 */
+        NID_policy_mappings, /* 747 */
+        NID_inhibit_any_policy /* 748 */
     };
 
     int ex_nid = OBJ_obj2nid(X509_EXTENSION_get_object(ex));
@@ -413,7 +413,8 @@ static int check_sig_alg_match(const EVP_PKEY *issuer_key, const X509 *subject)
     if (issuer_key == NULL)
         return X509_V_ERR_NO_ISSUER_PUBLIC_KEY;
     if (OBJ_find_sigid_algs(OBJ_obj2nid(subject->cert_info.signature.algorithm),
-                            NULL, &subj_sig_nid) == 0)
+            NULL, &subj_sig_nid)
+        == 0)
         return X509_V_ERR_UNSUPPORTED_SIGNATURE_ALGORITHM;
     if (EVP_PKEY_is_a(issuer_key, OBJ_nid2sn(subj_sig_nid))
         || (EVP_PKEY_is_a(issuer_key, "RSA") && subj_sig_nid == NID_rsassaPss))
@@ -597,8 +598,8 @@ int ossl_x509v3_cache_extensions(X509 *x)
     if (X509_NAME_cmp(X509_get_subject_name(x), X509_get_issuer_name(x)) == 0) {
         x->ex_flags |= EXFLAG_SI; /* Cert is self-issued */
         if (X509_check_akid(x, x->akid) == X509_V_OK /* SKID matches AKID */
-                /* .. and the signature alg matches the PUBKEY alg: */
-                && check_sig_alg_match(X509_get0_pubkey(x), x) == X509_V_OK)
+            /* .. and the signature alg matches the PUBKEY alg: */
+            && check_sig_alg_match(X509_get0_pubkey(x), x) == X509_V_OK)
             x->ex_flags |= EXFLAG_SS; /* indicate self-signed */
         /* This is very related to ossl_x509_likely_issued(x, x) == X509_V_OK */
     }
@@ -708,7 +709,7 @@ static int check_ca(const X509 *x)
             return 4;
         /* Older certificates could have Netscape-specific CA types */
         else if ((x->ex_flags & EXFLAG_NSCERT) != 0
-                 && (x->ex_nscert & NS_ANY_CA) != 0)
+            && (x->ex_nscert & NS_ANY_CA) != 0)
             return 5;
         /* Can this still be regarded a CA certificate?  I doubt it. */
         return 0;
@@ -749,7 +750,7 @@ static int check_ssl_ca(const X509 *x)
 }
 
 static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x,
-                                    int non_leaf)
+    int non_leaf)
 {
     if (xku_reject(x, XKU_SSL_CLIENT))
         return 0;
@@ -773,7 +774,7 @@ static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x,
     KU_DIGITAL_SIGNATURE | KU_KEY_ENCIPHERMENT | KU_KEY_AGREEMENT
 
 static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x,
-                                    int non_leaf)
+    int non_leaf)
 {
     if (xku_reject(x, XKU_SSL_SERVER | XKU_SGC))
         return 0;
@@ -786,11 +787,10 @@ static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x,
         return 0;
 
     return 1;
-
 }
 
 static int check_purpose_ns_ssl_server(const X509_PURPOSE *xp, const X509 *x,
-                                       int non_leaf)
+    int non_leaf)
 {
     int ret = check_purpose_ssl_server(xp, x, non_leaf);
 
@@ -826,7 +826,7 @@ static int purpose_smime(const X509 *x, int non_leaf)
 }
 
 static int check_purpose_smime_sign(const X509_PURPOSE *xp, const X509 *x,
-                                    int non_leaf)
+    int non_leaf)
 {
     int ret = purpose_smime(x, non_leaf);
 
@@ -836,7 +836,7 @@ static int check_purpose_smime_sign(const X509_PURPOSE *xp, const X509 *x,
 }
 
 static int check_purpose_smime_encrypt(const X509_PURPOSE *xp, const X509 *x,
-                                       int non_leaf)
+    int non_leaf)
 {
     int ret = purpose_smime(x, non_leaf);
 
@@ -846,7 +846,7 @@ static int check_purpose_smime_encrypt(const X509_PURPOSE *xp, const X509 *x,
 }
 
 static int check_purpose_crl_sign(const X509_PURPOSE *xp, const X509 *x,
-                                  int non_leaf)
+    int non_leaf)
 {
     if (non_leaf) {
         int ca_ret = check_ca(x);
@@ -861,7 +861,7 @@ static int check_purpose_crl_sign(const X509_PURPOSE *xp, const X509 *x,
  * is valid. Additional checks must be made on the chain.
  */
 static int check_purpose_ocsp_helper(const X509_PURPOSE *xp, const X509 *x,
-                                     int non_leaf)
+    int non_leaf)
 {
     /*
      * Must be a valid CA.  Should we really support the "I don't know" value
@@ -874,7 +874,7 @@ static int check_purpose_ocsp_helper(const X509_PURPOSE *xp, const X509 *x,
 }
 
 static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x,
-                                        int non_leaf)
+    int non_leaf)
 {
     int i_ext;
 
@@ -900,8 +900,7 @@ static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x,
      * be rejected).
      */
     if ((x->ex_flags & EXFLAG_KUSAGE) != 0
-        && ((x->ex_kusage & ~(KU_NON_REPUDIATION | KU_DIGITAL_SIGNATURE)) ||
-            !(x->ex_kusage & (KU_NON_REPUDIATION | KU_DIGITAL_SIGNATURE))))
+        && ((x->ex_kusage & ~(KU_NON_REPUDIATION | KU_DIGITAL_SIGNATURE)) || !(x->ex_kusage & (KU_NON_REPUDIATION | KU_DIGITAL_SIGNATURE))))
         return 0;
 
     /* Only timestamp key usage is permitted and it's required. */
@@ -911,13 +910,13 @@ static int check_purpose_timestamp_sign(const X509_PURPOSE *xp, const X509 *x,
     /* Extended Key Usage MUST be critical */
     i_ext = X509_get_ext_by_NID(x, NID_ext_key_usage, -1);
     if (i_ext >= 0
-            && !X509_EXTENSION_get_critical(X509_get_ext((X509 *)x, i_ext)))
+        && !X509_EXTENSION_get_critical(X509_get_ext((X509 *)x, i_ext)))
         return 0;
     return 1;
 }
 
 static int check_purpose_code_sign(const X509_PURPOSE *xp, const X509 *x,
-                                   int non_leaf)
+    int non_leaf)
 {
     int i_ext;
 
@@ -967,11 +966,10 @@ static int check_purpose_code_sign(const X509_PURPOSE *xp, const X509 *x,
         return 0;
 
     return 1;
-
 }
 
 static int no_check_purpose(const X509_PURPOSE *xp, const X509 *x,
-                            int non_leaf)
+    int non_leaf)
 {
     return 1;
 }
@@ -1004,12 +1002,13 @@ int ossl_x509_likely_issued(X509 *issuer, X509 *subject)
     int ret;
 
     if (X509_NAME_cmp(X509_get_subject_name(issuer),
-                      X509_get_issuer_name(subject)) != 0)
+            X509_get_issuer_name(subject))
+        != 0)
         return X509_V_ERR_SUBJECT_ISSUER_MISMATCH;
 
     /* set issuer->skid and subject->akid */
     if (!ossl_x509v3_cache_extensions(issuer)
-            || !ossl_x509v3_cache_extensions(subject))
+        || !ossl_x509v3_cache_extensions(subject))
         return X509_V_ERR_UNSPECIFIED;
 
     ret = X509_check_akid(issuer, subject->akid);
@@ -1044,12 +1043,10 @@ int X509_check_akid(const X509 *issuer, const AUTHORITY_KEYID *akid)
         return X509_V_OK;
 
     /* Check key ids (if present) */
-    if (akid->keyid && issuer->skid &&
-        ASN1_OCTET_STRING_cmp(akid->keyid, issuer->skid))
+    if (akid->keyid && issuer->skid && ASN1_OCTET_STRING_cmp(akid->keyid, issuer->skid))
         return X509_V_ERR_AKID_SKID_MISMATCH;
     /* Check serial number */
-    if (akid->serial &&
-        ASN1_INTEGER_cmp(X509_get0_serialNumber(issuer), akid->serial))
+    if (akid->serial && ASN1_INTEGER_cmp(X509_get0_serialNumber(issuer), akid->serial))
         return X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH;
     /* Check issuer name */
     if (akid->issuer) {
@@ -1135,7 +1132,7 @@ long X509_get_pathlen(X509 *x)
 {
     /* Called for side effect of caching extensions */
     if (X509_check_purpose(x, -1, 0) != 1
-            || (x->ex_flags & EXFLAG_BCONS) == 0)
+        || (x->ex_flags & EXFLAG_BCONS) == 0)
         return -1;
     return x->ex_pathlen;
 }
@@ -1144,7 +1141,7 @@ long X509_get_proxy_pathlen(X509 *x)
 {
     /* Called for side effect of caching extensions */
     if (X509_check_purpose(x, -1, 0) != 1
-            || (x->ex_flags & EXFLAG_PROXY) == 0)
+        || (x->ex_flags & EXFLAG_PROXY) == 0)
         return -1;
     return x->ex_pcpathlen;
 }
diff --git a/crypto/x509/v3_rolespec.c b/crypto/x509/v3_rolespec.c
index 57111b1f0f115..bffaa71706bdb 100644
--- a/crypto/x509/v3_rolespec.c
+++ b/crypto/x509/v3_rolespec.c
@@ -21,16 +21,15 @@ ASN1_SEQUENCE(OSSL_ROLE_SPEC_CERT_ID) = {
 
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_ROLE_SPEC_CERT_ID)
 
-ASN1_ITEM_TEMPLATE(OSSL_ROLE_SPEC_CERT_ID_SYNTAX) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF,
-                          0, OSSL_ROLE_SPEC_CERT_ID_SYNTAX, OSSL_ROLE_SPEC_CERT_ID)
+ASN1_ITEM_TEMPLATE(OSSL_ROLE_SPEC_CERT_ID_SYNTAX) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF,
+    0, OSSL_ROLE_SPEC_CERT_ID_SYNTAX, OSSL_ROLE_SPEC_CERT_ID)
 ASN1_ITEM_TEMPLATE_END(OSSL_ROLE_SPEC_CERT_ID_SYNTAX)
 
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_ROLE_SPEC_CERT_ID_SYNTAX)
 
 static int i2r_OSSL_ROLE_SPEC_CERT_ID(X509V3_EXT_METHOD *method,
-                                      OSSL_ROLE_SPEC_CERT_ID *rscid,
-                                      BIO *out, int indent)
+    OSSL_ROLE_SPEC_CERT_ID *rscid,
+    BIO *out, int indent)
 {
     if (BIO_printf(out, "%*sRole Name: ", indent, "") <= 0)
         return 0;
@@ -62,8 +61,8 @@ static int i2r_OSSL_ROLE_SPEC_CERT_ID(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_OSSL_ROLE_SPEC_CERT_ID_SYNTAX(X509V3_EXT_METHOD *method,
-                                             OSSL_ROLE_SPEC_CERT_ID_SYNTAX *rscids,
-                                             BIO *out, int indent)
+    OSSL_ROLE_SPEC_CERT_ID_SYNTAX *rscids,
+    BIO *out, int indent)
 {
     OSSL_ROLE_SPEC_CERT_ID *rscid;
     int i;
@@ -72,8 +71,9 @@ static int i2r_OSSL_ROLE_SPEC_CERT_ID_SYNTAX(X509V3_EXT_METHOD *method,
         if (i > 0 && BIO_puts(out, "\n") <= 0)
             return 0;
         if (BIO_printf(out,
-                       "%*sRole Specification Certificate Identifier #%d:\n",
-                       indent, "", i + 1) <= 0)
+                "%*sRole Specification Certificate Identifier #%d:\n",
+                indent, "", i + 1)
+            <= 0)
             return 0;
         rscid = sk_OSSL_ROLE_SPEC_CERT_ID_value(rscids, i);
         if (i2r_OSSL_ROLE_SPEC_CERT_ID(method, rscid, out, indent + 4) != 1)
diff --git a/crypto/x509/v3_san.c b/crypto/x509/v3_san.c
index bc13c088d549b..76170bcb95163 100644
--- a/crypto/x509/v3_san.c
+++ b/crypto/x509/v3_san.c
@@ -16,41 +16,41 @@
 #include "ext_dat.h"
 
 static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
-                                      X509V3_CTX *ctx,
-                                      STACK_OF(CONF_VALUE) *nval);
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *nval);
 static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
-                                     X509V3_CTX *ctx,
-                                     STACK_OF(CONF_VALUE) *nval);
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *nval);
 static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p);
 static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens);
 static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
 static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx);
 
 const X509V3_EXT_METHOD ossl_v3_alt[3] = {
-    {NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
-     0, 0, 0, 0,
-     0, 0,
-     (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
-     (X509V3_EXT_V2I)v2i_subject_alt,
-     NULL, NULL, NULL},
-
-    {NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
-     0, 0, 0, 0,
-     0, 0,
-     (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
-     (X509V3_EXT_V2I)v2i_issuer_alt,
-     NULL, NULL, NULL},
-
-    {NID_certificate_issuer, 0, ASN1_ITEM_ref(GENERAL_NAMES),
-     0, 0, 0, 0,
-     0, 0,
-     (X509V3_EXT_I2V) i2v_GENERAL_NAMES,
-     NULL, NULL, NULL, NULL},
+    { NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
+        0, 0, 0, 0,
+        0, 0,
+        (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
+        (X509V3_EXT_V2I)v2i_subject_alt,
+        NULL, NULL, NULL },
+
+    { NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES),
+        0, 0, 0, 0,
+        0, 0,
+        (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
+        (X509V3_EXT_V2I)v2i_issuer_alt,
+        NULL, NULL, NULL },
+
+    { NID_certificate_issuer, 0, ASN1_ITEM_ref(GENERAL_NAMES),
+        0, 0, 0, 0,
+        0, 0,
+        (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
+        NULL, NULL, NULL, NULL },
 };
 
 STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
-                                        GENERAL_NAMES *gens,
-                                        STACK_OF(CONF_VALUE) *ret)
+    GENERAL_NAMES *gens,
+    STACK_OF(CONF_VALUE) *ret)
 {
     int i;
     GENERAL_NAME *gen;
@@ -77,8 +77,8 @@ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
 }
 
 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)
 {
     char othername[300];
     char oline[256], *tmp;
@@ -88,64 +88,64 @@ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
         switch (OBJ_obj2nid(gen->d.otherName->type_id)) {
         case NID_id_on_SmtpUTF8Mailbox:
             if (gen->d.otherName->value->type != V_ASN1_UTF8STRING
-                    || !x509v3_add_len_value_uchar("othername: SmtpUTF8Mailbox",
-                            gen->d.otherName->value->value.utf8string->data,
-                            gen->d.otherName->value->value.utf8string->length,
-                            &ret))
+                || !x509v3_add_len_value_uchar("othername: SmtpUTF8Mailbox",
+                    gen->d.otherName->value->value.utf8string->data,
+                    gen->d.otherName->value->value.utf8string->length,
+                    &ret))
                 return NULL;
             break;
         case NID_XmppAddr:
             if (gen->d.otherName->value->type != V_ASN1_UTF8STRING
-                    || !x509v3_add_len_value_uchar("othername: XmppAddr",
-                            gen->d.otherName->value->value.utf8string->data,
-                            gen->d.otherName->value->value.utf8string->length,
-                            &ret))
+                || !x509v3_add_len_value_uchar("othername: XmppAddr",
+                    gen->d.otherName->value->value.utf8string->data,
+                    gen->d.otherName->value->value.utf8string->length,
+                    &ret))
                 return NULL;
             break;
         case NID_SRVName:
             if (gen->d.otherName->value->type != V_ASN1_IA5STRING
-                    || !x509v3_add_len_value_uchar("othername: SRVName",
-                            gen->d.otherName->value->value.ia5string->data,
-                            gen->d.otherName->value->value.ia5string->length,
-                            &ret))
+                || !x509v3_add_len_value_uchar("othername: SRVName",
+                    gen->d.otherName->value->value.ia5string->data,
+                    gen->d.otherName->value->value.ia5string->length,
+                    &ret))
                 return NULL;
             break;
         case NID_ms_upn:
             if (gen->d.otherName->value->type != V_ASN1_UTF8STRING
-                    || !x509v3_add_len_value_uchar("othername: UPN",
-                            gen->d.otherName->value->value.utf8string->data,
-                            gen->d.otherName->value->value.utf8string->length,
-                            &ret))
+                || !x509v3_add_len_value_uchar("othername: UPN",
+                    gen->d.otherName->value->value.utf8string->data,
+                    gen->d.otherName->value->value.utf8string->length,
+                    &ret))
                 return NULL;
             break;
         case NID_NAIRealm:
             if (gen->d.otherName->value->type != V_ASN1_UTF8STRING
-                    || !x509v3_add_len_value_uchar("othername: NAIRealm",
-                            gen->d.otherName->value->value.utf8string->data,
-                            gen->d.otherName->value->value.utf8string->length,
-                            &ret))
+                || !x509v3_add_len_value_uchar("othername: NAIRealm",
+                    gen->d.otherName->value->value.utf8string->data,
+                    gen->d.otherName->value->value.utf8string->length,
+                    &ret))
                 return NULL;
             break;
         default:
             if (OBJ_obj2txt(oline, sizeof(oline), gen->d.otherName->type_id, 0) > 0)
                 BIO_snprintf(othername, sizeof(othername), "othername: %s",
-                             oline);
+                    oline);
             else
                 OPENSSL_strlcpy(othername, "othername", sizeof(othername));
 
             /* check if the value is something printable */
             if (gen->d.otherName->value->type == V_ASN1_IA5STRING) {
                 if (x509v3_add_len_value_uchar(othername,
-                             gen->d.otherName->value->value.ia5string->data,
-                             gen->d.otherName->value->value.ia5string->length,
-                             &ret))
+                        gen->d.otherName->value->value.ia5string->data,
+                        gen->d.otherName->value->value.ia5string->length,
+                        &ret))
                     return ret;
             }
             if (gen->d.otherName->value->type == V_ASN1_UTF8STRING) {
                 if (x509v3_add_len_value_uchar(othername,
-                             gen->d.otherName->value->value.utf8string->data,
-                             gen->d.otherName->value->value.utf8string->length,
-                             &ret))
+                        gen->d.otherName->value->value.utf8string->data,
+                        gen->d.otherName->value->value.utf8string->length,
+                        &ret))
                     return ret;
             }
             if (!X509V3_add_value(othername, "<unsupported>", &ret))
@@ -166,25 +166,25 @@ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
 
     case GEN_EMAIL:
         if (!x509v3_add_len_value_uchar("email", gen->d.ia5->data,
-                                        gen->d.ia5->length, &ret))
+                gen->d.ia5->length, &ret))
             return NULL;
         break;
 
     case GEN_DNS:
         if (!x509v3_add_len_value_uchar("DNS", gen->d.ia5->data,
-                                        gen->d.ia5->length, &ret))
+                gen->d.ia5->length, &ret))
             return NULL;
         break;
 
     case GEN_URI:
         if (!x509v3_add_len_value_uchar("URI", gen->d.ia5->data,
-                                        gen->d.ia5->length, &ret))
+                gen->d.ia5->length, &ret))
             return NULL;
         break;
 
     case GEN_DIRNAME:
         if (X509_NAME_oneline(gen->d.dirn, oline, sizeof(oline)) == NULL
-                || !X509V3_add_value("DirName", oline, &ret))
+            || !X509V3_add_value("DirName", oline, &ret))
             return NULL;
         break;
 
@@ -214,9 +214,9 @@ int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
         nid = OBJ_obj2nid(gen->d.otherName->type_id);
         /* Validate the types are as we expect before we use them */
         if ((nid == NID_SRVName
-             && gen->d.otherName->value->type != V_ASN1_IA5STRING)
-                || (nid != NID_SRVName
-                    && gen->d.otherName->value->type != V_ASN1_UTF8STRING)) {
+                && gen->d.otherName->value->type != V_ASN1_IA5STRING)
+            || (nid != NID_SRVName
+                && gen->d.otherName->value->type != V_ASN1_UTF8STRING)) {
             BIO_printf(out, "othername:<unsupported>");
             break;
         }
@@ -224,28 +224,28 @@ int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
         switch (nid) {
         case NID_id_on_SmtpUTF8Mailbox:
             BIO_printf(out, "othername:SmtpUTF8Mailbox:%.*s",
-                       gen->d.otherName->value->value.utf8string->length,
-                       gen->d.otherName->value->value.utf8string->data);
+                gen->d.otherName->value->value.utf8string->length,
+                gen->d.otherName->value->value.utf8string->data);
             break;
         case NID_XmppAddr:
             BIO_printf(out, "othername:XmppAddr:%.*s",
-                       gen->d.otherName->value->value.utf8string->length,
-                       gen->d.otherName->value->value.utf8string->data);
+                gen->d.otherName->value->value.utf8string->length,
+                gen->d.otherName->value->value.utf8string->data);
             break;
         case NID_SRVName:
             BIO_printf(out, "othername:SRVName:%.*s",
-                       gen->d.otherName->value->value.ia5string->length,
-                       gen->d.otherName->value->value.ia5string->data);
+                gen->d.otherName->value->value.ia5string->length,
+                gen->d.otherName->value->value.ia5string->data);
             break;
         case NID_ms_upn:
             BIO_printf(out, "othername:UPN:%.*s",
-                       gen->d.otherName->value->value.utf8string->length,
-                       gen->d.otherName->value->value.utf8string->data);
+                gen->d.otherName->value->value.utf8string->length,
+                gen->d.otherName->value->value.utf8string->data);
             break;
         case NID_NAIRealm:
             BIO_printf(out, "othername:NAIRealm:%.*s",
-                       gen->d.otherName->value->value.utf8string->length,
-                       gen->d.otherName->value->value.utf8string->data);
+                gen->d.otherName->value->value.utf8string->length,
+                gen->d.otherName->value->value.utf8string->data);
             break;
         default:
             BIO_printf(out, "othername:<unsupported>");
@@ -299,8 +299,8 @@ int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen)
 }
 
 static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
-                                     X509V3_CTX *ctx,
-                                     STACK_OF(CONF_VALUE) *nval)
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *nval)
 {
     const int num = sk_CONF_VALUE_num(nval);
     GENERAL_NAMES *gens = sk_GENERAL_NAME_new_reserve(NULL, num);
@@ -326,7 +326,7 @@ static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
         }
     }
     return gens;
- err:
+err:
     sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
     return NULL;
 }
@@ -363,21 +363,20 @@ static int copy_issuer(X509V3_CTX *ctx, GENERAL_NAMES *gens)
 
     for (i = 0; i < num; i++) {
         gen = sk_GENERAL_NAME_value(ialt, i);
-        sk_GENERAL_NAME_push(gens, gen);     /* no failure as it was reserved */
+        sk_GENERAL_NAME_push(gens, gen); /* no failure as it was reserved */
     }
     sk_GENERAL_NAME_free(ialt);
 
     return 1;
 
- err:
+err:
     sk_GENERAL_NAME_free(ialt);
     return 0;
-
 }
 
 static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
-                                      X509V3_CTX *ctx,
-                                      STACK_OF(CONF_VALUE) *nval)
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *nval)
 {
     GENERAL_NAMES *gens;
     CONF_VALUE *cnf;
@@ -397,7 +396,7 @@ static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
             if (!copy_email(ctx, gens, 0))
                 goto err;
         } else if (ossl_v3_name_cmp(cnf->name, "email") == 0
-                   && cnf->value && strcmp(cnf->value, "move") == 0) {
+            && cnf->value && strcmp(cnf->value, "move") == 0) {
             if (!copy_email(ctx, gens, 1))
                 goto err;
         } else {
@@ -408,7 +407,7 @@ static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
         }
     }
     return gens;
- err:
+err:
     sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
     return NULL;
 }
@@ -433,13 +432,12 @@ static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
         return 0;
     }
     /* Find the subject name */
-    nm = ctx->subject_cert != NULL ?
-        X509_get_subject_name(ctx->subject_cert) :
-        X509_REQ_get_subject_name(ctx->subject_req);
+    nm = ctx->subject_cert != NULL ? X509_get_subject_name(ctx->subject_cert) : X509_REQ_get_subject_name(ctx->subject_req);
 
     /* Now add any email address(es) to STACK */
     while ((i = X509_NAME_get_index_by_NID(nm,
-                                           NID_pkcs9_emailAddress, i)) >= 0) {
+                NID_pkcs9_emailAddress, i))
+        >= 0) {
         ne = X509_NAME_get_entry(nm, i);
         email = ASN1_STRING_dup(X509_NAME_ENTRY_get_data(ne));
         if (move_p) {
@@ -463,15 +461,14 @@ static int copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
 
     return 1;
 
- err:
+err:
     GENERAL_NAME_free(gen);
     ASN1_IA5STRING_free(email);
     return 0;
-
 }
 
 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)
 {
     GENERAL_NAME *gen;
     GENERAL_NAMES *gens;
@@ -489,24 +486,24 @@ GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
         cnf = sk_CONF_VALUE_value(nval, i);
         if ((gen = v2i_GENERAL_NAME(method, ctx, cnf)) == NULL)
             goto err;
-        sk_GENERAL_NAME_push(gens, gen);    /* no failure as it was reserved */
+        sk_GENERAL_NAME_push(gens, gen); /* no failure as it was reserved */
     }
     return gens;
- err:
+err:
     sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
     return NULL;
 }
 
 GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
-                               X509V3_CTX *ctx, CONF_VALUE *cnf)
+    X509V3_CTX *ctx, CONF_VALUE *cnf)
 {
     return v2i_GENERAL_NAME_ex(NULL, method, ctx, cnf, 0);
 }
 
 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)
 {
     char is_string = 0;
     GENERAL_NAME *gen = NULL;
@@ -533,17 +530,15 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
         is_string = 1;
         break;
 
-    case GEN_RID:
-        {
-            ASN1_OBJECT *obj;
-            if ((obj = OBJ_txt2obj(value, 0)) == NULL) {
-                ERR_raise_data(ERR_LIB_X509V3, X509V3_R_BAD_OBJECT,
-                               "value=%s", value);
-                goto err;
-            }
-            gen->d.rid = obj;
+    case GEN_RID: {
+        ASN1_OBJECT *obj;
+        if ((obj = OBJ_txt2obj(value, 0)) == NULL) {
+            ERR_raise_data(ERR_LIB_X509V3, X509V3_R_BAD_OBJECT,
+                "value=%s", value);
+            goto err;
         }
-        break;
+        gen->d.rid = obj;
+    } break;
 
     case GEN_IPADD:
         if (is_nc)
@@ -552,7 +547,7 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
             gen->d.ip = a2i_IPADDRESS(value);
         if (gen->d.ip == NULL) {
             ERR_raise_data(ERR_LIB_X509V3, X509V3_R_BAD_IP_ADDRESS,
-                           "value=%s", value);
+                "value=%s", value);
             goto err;
         }
         break;
@@ -576,9 +571,7 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
     }
 
     if (is_string) {
-        if ((gen->d.ia5 = ASN1_IA5STRING_new()) == NULL ||
-            !ASN1_STRING_set(gen->d.ia5, (unsigned char *)value,
-                             strlen(value))) {
+        if ((gen->d.ia5 = ASN1_IA5STRING_new()) == NULL || !ASN1_STRING_set(gen->d.ia5, (unsigned char *)value, strlen(value))) {
             ASN1_IA5STRING_free(gen->d.ia5);
             gen->d.ia5 = NULL;
             ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
@@ -590,15 +583,15 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
 
     return gen;
 
- err:
+err:
     if (!out)
         GENERAL_NAME_free(gen);
     return NULL;
 }
 
 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)
 {
     int type;
 
@@ -628,12 +621,11 @@ GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
         type = GEN_OTHERNAME;
     else {
         ERR_raise_data(ERR_LIB_X509V3, X509V3_R_UNSUPPORTED_OPTION,
-                       "name=%s", name);
+            "name=%s", name);
         return NULL;
     }
 
     return a2i_GENERAL_NAME(out, method, ctx, type, value, is_nc);
-
 }
 
 static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
@@ -662,7 +654,7 @@ static int do_othername(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
         goto err;
     return 1;
 
- err:
+err:
     OTHERNAME_free(gen->d.otherName);
     gen->d.otherName = NULL;
     return 0;
@@ -679,7 +671,7 @@ static int do_dirname(GENERAL_NAME *gen, const char *value, X509V3_CTX *ctx)
     sk = X509V3_get_section(ctx, value);
     if (!sk) {
         ERR_raise_data(ERR_LIB_X509V3, X509V3_R_SECTION_NOT_FOUND,
-                       "section=%s", value);
+            "section=%s", value);
         goto err;
     }
     /* FIXME: should allow other character types... */
diff --git a/crypto/x509/v3_sda.c b/crypto/x509/v3_sda.c
index a27c31711ad74..a3ecc3318dc70 100644
--- a/crypto/x509/v3_sda.c
+++ b/crypto/x509/v3_sda.c
@@ -12,15 +12,14 @@
 #include <crypto/x509.h>
 #include "ext_dat.h"
 
-ASN1_ITEM_TEMPLATE(OSSL_ATTRIBUTES_SYNTAX) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Attributes, X509_ATTRIBUTE)
+ASN1_ITEM_TEMPLATE(OSSL_ATTRIBUTES_SYNTAX) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Attributes, X509_ATTRIBUTE)
 ASN1_ITEM_TEMPLATE_END(OSSL_ATTRIBUTES_SYNTAX)
 
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_ATTRIBUTES_SYNTAX)
 
 static int i2r_ATTRIBUTES_SYNTAX(X509V3_EXT_METHOD *method,
-                                 OSSL_ATTRIBUTES_SYNTAX *attrlst,
-                                 BIO *out, int indent)
+    OSSL_ATTRIBUTES_SYNTAX *attrlst,
+    BIO *out, int indent)
 {
     X509_ATTRIBUTE *attr;
     ASN1_TYPE *av;
@@ -54,8 +53,7 @@ static int i2r_ATTRIBUTES_SYNTAX(X509V3_EXT_METHOD *method,
         }
 
         if (X509_ATTRIBUTE_count(attr)) {
-            for (j = 0; j < X509_ATTRIBUTE_count(attr); j++)
-            {
+            for (j = 0; j < X509_ATTRIBUTE_count(attr); j++) {
                 av = X509_ATTRIBUTE_get0_type(attr, j);
                 if (ossl_print_attribute_value(out, attr_nid, av, indent + 4) <= 0)
                     return 0;
diff --git a/crypto/x509/v3_single_use.c b/crypto/x509/v3_single_use.c
index 50da6e1770074..98a1a64a67a2a 100644
--- a/crypto/x509/v3_single_use.c
+++ b/crypto/x509/v3_single_use.c
@@ -15,14 +15,14 @@
 #include "ext_dat.h"
 
 static int i2r_SINGLE_USE(X509V3_EXT_METHOD *method,
-                        void *su, BIO *out,
-                        int indent)
+    void *su, BIO *out,
+    int indent)
 {
     return 1;
 }
 
 static void *r2i_SINGLE_USE(X509V3_EXT_METHOD *method,
-                          X509V3_CTX *ctx, const char *value)
+    X509V3_CTX *ctx, const char *value)
 {
     return ASN1_NULL_new();
 }
diff --git a/crypto/x509/v3_skid.c b/crypto/x509/v3_skid.c
index 8657f4cdf2b08..469ff70e80e58 100644
--- a/crypto/x509/v3_skid.c
+++ b/crypto/x509/v3_skid.c
@@ -14,7 +14,7 @@
 #include "ext_dat.h"
 
 static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
-                                      X509V3_CTX *ctx, char *str);
+    X509V3_CTX *ctx, char *str);
 const X509V3_EXT_METHOD ossl_v3_skey_id = {
     NID_subject_key_identifier, 0, ASN1_ITEM_ref(ASN1_OCTET_STRING),
     0, 0, 0, 0,
@@ -25,13 +25,13 @@ const X509V3_EXT_METHOD ossl_v3_skey_id = {
 };
 
 char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-                            const ASN1_OCTET_STRING *oct)
+    const ASN1_OCTET_STRING *oct)
 {
     return OPENSSL_buf2hexstr(oct->data, oct->length);
 }
 
 ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-                                         X509V3_CTX *ctx, const char *str)
+    X509V3_CTX *ctx, const char *str)
 {
     ASN1_OCTET_STRING *oct;
     long length;
@@ -49,7 +49,6 @@ ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
     oct->length = length;
 
     return oct;
-
 }
 
 ASN1_OCTET_STRING *ossl_x509_pubkey_hash(X509_PUBKEY *pubkey)
@@ -78,7 +77,7 @@ ASN1_OCTET_STRING *ossl_x509_pubkey_hash(X509_PUBKEY *pubkey)
 
     X509_PUBKEY_get0_param(NULL, &pk, &pklen, NULL, pubkey);
     if (EVP_Digest(pk, pklen, pkey_dig, &diglen, md, NULL)
-            && ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) {
+        && ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) {
         EVP_MD_free(md);
         return oct;
     }
@@ -89,7 +88,7 @@ ASN1_OCTET_STRING *ossl_x509_pubkey_hash(X509_PUBKEY *pubkey)
 }
 
 static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
-                                      X509V3_CTX *ctx, char *str)
+    X509V3_CTX *ctx, char *str)
 {
     if (strcmp(str, "none") == 0)
         return ASN1_OCTET_STRING_new(); /* dummy */
@@ -105,7 +104,5 @@ static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
         return NULL;
     }
 
-    return ossl_x509_pubkey_hash(ctx->subject_cert != NULL ?
-                                 ctx->subject_cert->cert_info.key :
-                                 ctx->subject_req->req_info.pubkey);
+    return ossl_x509_pubkey_hash(ctx->subject_cert != NULL ? ctx->subject_cert->cert_info.key : ctx->subject_req->req_info.pubkey);
 }
diff --git a/crypto/x509/v3_soa_id.c b/crypto/x509/v3_soa_id.c
index 8be5bd8aa5a30..ab56384c2d625 100644
--- a/crypto/x509/v3_soa_id.c
+++ b/crypto/x509/v3_soa_id.c
@@ -15,14 +15,14 @@
 #include "ext_dat.h"
 
 static int i2r_SOA_IDENTIFIER(X509V3_EXT_METHOD *method,
-                              void *su, BIO *out,
-                              int indent)
+    void *su, BIO *out,
+    int indent)
 {
     return 1;
 }
 
 static void *r2i_SOA_IDENTIFIER(X509V3_EXT_METHOD *method,
-                                X509V3_CTX *ctx, const char *value)
+    X509V3_CTX *ctx, const char *value)
 {
     return ASN1_NULL_new();
 }
diff --git a/crypto/x509/v3_sxnet.c b/crypto/x509/v3_sxnet.c
index 507945f829551..a27afcfb9dacf 100644
--- a/crypto/x509/v3_sxnet.c
+++ b/crypto/x509/v3_sxnet.c
@@ -20,10 +20,10 @@
 #define SXNET_TEST
 
 static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
-                     int indent);
+    int indent);
 #ifdef SXNET_TEST
 static SXNET *sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
-                        STACK_OF(CONF_VALUE) *nval);
+    STACK_OF(CONF_VALUE) *nval);
 #endif
 const X509V3_EXT_METHOD ossl_v3_sxnet = {
     NID_sxnet, X509V3_EXT_MULTILINE, ASN1_ITEM_ref(SXNET),
@@ -41,21 +41,21 @@ const X509V3_EXT_METHOD ossl_v3_sxnet = {
 };
 
 ASN1_SEQUENCE(SXNETID) = {
-        ASN1_SIMPLE(SXNETID, zone, ASN1_INTEGER),
-        ASN1_SIMPLE(SXNETID, user, ASN1_OCTET_STRING)
+    ASN1_SIMPLE(SXNETID, zone, ASN1_INTEGER),
+    ASN1_SIMPLE(SXNETID, user, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(SXNETID)
 
 IMPLEMENT_ASN1_FUNCTIONS(SXNETID)
 
 ASN1_SEQUENCE(SXNET) = {
-        ASN1_SIMPLE(SXNET, version, ASN1_INTEGER),
-        ASN1_SEQUENCE_OF(SXNET, ids, SXNETID)
+    ASN1_SIMPLE(SXNET, version, ASN1_INTEGER),
+    ASN1_SEQUENCE_OF(SXNET, ids, SXNETID)
 } ASN1_SEQUENCE_END(SXNET)
 
 IMPLEMENT_ASN1_FUNCTIONS(SXNET)
 
 static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
-                     int indent)
+    int indent)
 {
     int64_t v;
     char *tmp;
@@ -67,8 +67,8 @@ static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
      * LONG_MAX since that would cause on overflow.
      */
     if (!ASN1_INTEGER_get_int64(&v, sx->version)
-            || v >= LONG_MAX
-            || v < LONG_MIN) {
+        || v >= LONG_MAX
+        || v < LONG_MIN) {
         BIO_printf(out, "%*sVersion: <unsupported>", indent, "");
     } else {
         long vl = (long)v;
@@ -96,7 +96,7 @@ static int sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out,
  */
 
 static SXNET *sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
-                        STACK_OF(CONF_VALUE) *nval)
+    STACK_OF(CONF_VALUE) *nval)
 {
     CONF_VALUE *cnf;
     SXNET *sx = NULL;
@@ -106,7 +106,7 @@ static SXNET *sxnet_v2i(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
         if (!SXNET_add_id_asc(&sx, cnf->name, cnf->value, -1)) {
             SXNET_free(sx);
             return NULL;
-	}
+        }
     }
     return sx;
 }
@@ -135,7 +135,7 @@ int SXNET_add_id_asc(SXNET **psx, const char *zone, const char *user, int userle
 /* Add an id given the zone as an unsigned long */
 
 int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user,
-                       int userlen)
+    int userlen)
 {
     ASN1_INTEGER *izone;
 
@@ -158,7 +158,7 @@ int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user,
  */
 
 int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, const char *user,
-                         int userlen)
+    int userlen)
 {
     SXNET *sx = NULL;
     SXNETID *id = NULL;
@@ -196,7 +196,7 @@ int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, const char *user,
         goto err;
     }
 
-    if (!ASN1_OCTET_STRING_set(id->user, (const unsigned char *)user, userlen)){
+    if (!ASN1_OCTET_STRING_set(id->user, (const unsigned char *)user, userlen)) {
         ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
         goto err;
     }
@@ -209,7 +209,7 @@ int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, const char *user,
     *psx = sx;
     return 1;
 
- err:
+err:
     SXNETID_free(id);
     if (*psx == NULL)
         SXNET_free(sx);
diff --git a/crypto/x509/v3_timespec.c b/crypto/x509/v3_timespec.c
index 30f6590826fd8..c23b94ad085fe 100644
--- a/crypto/x509/v3_timespec.c
+++ b/crypto/x509/v3_timespec.c
@@ -125,8 +125,8 @@ IMPLEMENT_ASN1_FUNCTIONS(OSSL_TIME_SPEC)
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_TIME_PERIOD)
 
 static int i2r_OSSL_TIME_SPEC_ABSOLUTE(X509V3_EXT_METHOD *method,
-                                       OSSL_TIME_SPEC_ABSOLUTE *time,
-                                       BIO *out, int indent)
+    OSSL_TIME_SPEC_ABSOLUTE *time,
+    BIO *out, int indent)
 {
     if (time->startTime != NULL && time->endTime != NULL) {
         if (!BIO_puts(out, "Any time between "))
@@ -156,8 +156,8 @@ static int i2r_OSSL_TIME_SPEC_ABSOLUTE(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_OSSL_DAY_TIME(X509V3_EXT_METHOD *method,
-                             OSSL_DAY_TIME *dt,
-                             BIO *out, int indent)
+    OSSL_DAY_TIME *dt,
+    BIO *out, int indent)
 {
     int64_t h = 0;
     int64_t m = 0;
@@ -170,12 +170,13 @@ static int i2r_OSSL_DAY_TIME(X509V3_EXT_METHOD *method,
     if (dt->minute && !ASN1_INTEGER_get_int64(&s, dt->second))
         return 0;
     return BIO_printf(out, "%02lld:%02lld:%02lld",
-                      (long long int)h, (long long int)m, (long long int)s) > 0;
+               (long long int)h, (long long int)m, (long long int)s)
+        > 0;
 }
 
 static int i2r_OSSL_DAY_TIME_BAND(X509V3_EXT_METHOD *method,
-                                  OSSL_DAY_TIME_BAND *band,
-                                  BIO *out, int indent)
+    OSSL_DAY_TIME_BAND *band,
+    BIO *out, int indent)
 {
     if (band->startDayTime) {
         if (!i2r_OSSL_DAY_TIME(method, band->startDayTime, out, indent))
@@ -335,8 +336,8 @@ static int print_bit_named_day(BIO *out, ASN1_BIT_STRING *bs)
 }
 
 static int i2r_OSSL_PERIOD(X509V3_EXT_METHOD *method,
-                           OSSL_TIME_PERIOD *p,
-                           BIO *out, int indent)
+    OSSL_TIME_PERIOD *p,
+    BIO *out, int indent)
 {
     int i;
     OSSL_DAY_TIME_BAND *band;
@@ -534,8 +535,8 @@ static int i2r_OSSL_PERIOD(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_OSSL_TIME_SPEC_TIME(X509V3_EXT_METHOD *method,
-                                   OSSL_TIME_SPEC_TIME *time,
-                                   BIO *out, int indent)
+    OSSL_TIME_SPEC_TIME *time,
+    BIO *out, int indent)
 {
     OSSL_TIME_PERIOD *tp;
     int i;
@@ -565,8 +566,8 @@ static int i2r_OSSL_TIME_SPEC_TIME(X509V3_EXT_METHOD *method,
 }
 
 static int i2r_OSSL_TIME_SPEC(X509V3_EXT_METHOD *method,
-                              OSSL_TIME_SPEC *time,
-                              BIO *out, int indent)
+    OSSL_TIME_SPEC *time,
+    BIO *out, int indent)
 {
     int64_t tz;
 
diff --git a/crypto/x509/v3_tlsf.c b/crypto/x509/v3_tlsf.c
index 85dea65f359cf..a56907ae7a817 100644
--- a/crypto/x509/v3_tlsf.c
+++ b/crypto/x509/v3_tlsf.c
@@ -17,17 +17,16 @@
 #include "x509_local.h"
 
 static STACK_OF(CONF_VALUE) *i2v_TLS_FEATURE(const X509V3_EXT_METHOD *method,
-                                             TLS_FEATURE *tls_feature,
-                                             STACK_OF(CONF_VALUE) *ext_list);
+    TLS_FEATURE *tls_feature,
+    STACK_OF(CONF_VALUE) *ext_list);
 static TLS_FEATURE *v2i_TLS_FEATURE(const X509V3_EXT_METHOD *method,
-                                    X509V3_CTX *ctx,
-                                    STACK_OF(CONF_VALUE) *nval);
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *nval);
 
-ASN1_ITEM_TEMPLATE(TLS_FEATURE) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, TLS_FEATURE, ASN1_INTEGER)
+ASN1_ITEM_TEMPLATE(TLS_FEATURE) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, TLS_FEATURE, ASN1_INTEGER)
 static_ASN1_ITEM_TEMPLATE_END(TLS_FEATURE)
 
-IMPLEMENT_ASN1_ALLOC_FUNCTIONS(TLS_FEATURE)
+    IMPLEMENT_ASN1_ALLOC_FUNCTIONS(TLS_FEATURE)
 
 const X509V3_EXT_METHOD ossl_v3_tls_feature = {
     NID_tlsfeature, 0,
@@ -40,7 +39,6 @@ const X509V3_EXT_METHOD ossl_v3_tls_feature = {
     NULL
 };
 
-
 typedef struct {
     long num;
     const char *name;
@@ -58,8 +56,8 @@ static TLS_FEATURE_NAME tls_feature_tbl[] = {
  * returned.
  */
 static STACK_OF(CONF_VALUE) *i2v_TLS_FEATURE(const X509V3_EXT_METHOD *method,
-                                             TLS_FEATURE *tls_feature,
-                                             STACK_OF(CONF_VALUE) *ext_list)
+    TLS_FEATURE *tls_feature,
+    STACK_OF(CONF_VALUE) *ext_list)
 {
     int i;
     size_t j;
@@ -85,7 +83,7 @@ static STACK_OF(CONF_VALUE) *i2v_TLS_FEATURE(const X509V3_EXT_METHOD *method,
  * error, NULL is returned.
  */
 static TLS_FEATURE *v2i_TLS_FEATURE(const X509V3_EXT_METHOD *method,
-                                    X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+    X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
     TLS_FEATURE *tlsf;
     char *extval, *endptr;
@@ -114,8 +112,7 @@ static TLS_FEATURE *v2i_TLS_FEATURE(const X509V3_EXT_METHOD *method,
             tlsextid = tls_feature_tbl[j].num;
         else {
             tlsextid = strtol(extval, &endptr, 10);
-            if (((*endptr) != '\0') || (extval == endptr) || (tlsextid < 0) ||
-                (tlsextid > 65535)) {
+            if (((*endptr) != '\0') || (extval == endptr) || (tlsextid < 0) || (tlsextid > 65535)) {
                 ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_SYNTAX);
                 X509V3_conf_add_error_name_value(val);
                 goto err;
@@ -123,8 +120,8 @@ static TLS_FEATURE *v2i_TLS_FEATURE(const X509V3_EXT_METHOD *method,
         }
 
         if ((ai = ASN1_INTEGER_new()) == NULL
-                || !ASN1_INTEGER_set(ai, tlsextid)
-                || sk_ASN1_INTEGER_push(tlsf, ai) <= 0) {
+            || !ASN1_INTEGER_set(ai, tlsextid)
+            || sk_ASN1_INTEGER_push(tlsf, ai) <= 0) {
             ERR_raise(ERR_LIB_X509V3, ERR_R_ASN1_LIB);
             goto err;
         }
@@ -133,7 +130,7 @@ static TLS_FEATURE *v2i_TLS_FEATURE(const X509V3_EXT_METHOD *method,
     }
     return tlsf;
 
- err:
+err:
     sk_ASN1_INTEGER_pop_free(tlsf, ASN1_INTEGER_free);
     ASN1_INTEGER_free(ai);
     return NULL;
diff --git a/crypto/x509/v3_usernotice.c b/crypto/x509/v3_usernotice.c
index cc99132525043..9bf1502f75897 100644
--- a/crypto/x509/v3_usernotice.c
+++ b/crypto/x509/v3_usernotice.c
@@ -11,8 +11,7 @@
 #include <openssl/x509v3.h>
 #include "ext_dat.h"
 
-ASN1_ITEM_TEMPLATE(OSSL_USER_NOTICE_SYNTAX) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_USER_NOTICE_SYNTAX, USERNOTICE)
+ASN1_ITEM_TEMPLATE(OSSL_USER_NOTICE_SYNTAX) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, OSSL_USER_NOTICE_SYNTAX, USERNOTICE)
 ASN1_ITEM_TEMPLATE_END(OSSL_USER_NOTICE_SYNTAX)
 
 IMPLEMENT_ASN1_FUNCTIONS(OSSL_USER_NOTICE_SYNTAX)
@@ -27,11 +26,13 @@ static int print_notice(BIO *out, USERNOTICE *notice, int indent)
         NOTICEREF *ref;
         ref = notice->noticeref;
         if (BIO_printf(out, "%*sOrganization: %.*s\n", indent, "",
-                   ref->organization->length,
-                   ref->organization->data) <= 0)
+                ref->organization->length,
+                ref->organization->data)
+            <= 0)
             return 0;
         if (BIO_printf(out, "%*sNumber%s: ", indent, "",
-                   sk_ASN1_INTEGER_num(ref->noticenos) > 1 ? "s" : "") <= 0)
+                sk_ASN1_INTEGER_num(ref->noticenos) > 1 ? "s" : "")
+            <= 0)
             return 0;
         for (i = 0; i < sk_ASN1_INTEGER_num(ref->noticenos); i++) {
             num = sk_ASN1_INTEGER_value(ref->noticenos, i);
@@ -57,13 +58,14 @@ static int print_notice(BIO *out, USERNOTICE *notice, int indent)
         return 1;
 
     return BIO_printf(out, "%*sExplicit Text: %.*s", indent, "",
-                notice->exptext->length,
-                notice->exptext->data) >= 0;
+               notice->exptext->length,
+               notice->exptext->data)
+        >= 0;
 }
 
 static int i2r_USER_NOTICE_SYNTAX(X509V3_EXT_METHOD *method,
-                                  OSSL_USER_NOTICE_SYNTAX *uns,
-                                  BIO *out, int indent)
+    OSSL_USER_NOTICE_SYNTAX *uns,
+    BIO *out, int indent)
 {
     int i;
     USERNOTICE *unotice;
diff --git a/crypto/x509/v3_utf8.c b/crypto/x509/v3_utf8.c
index 22345c3a65eb6..d3b4f8a16f9aa 100644
--- a/crypto/x509/v3_utf8.c
+++ b/crypto/x509/v3_utf8.c
@@ -21,13 +21,12 @@
  * Russian Federal Law 63 "Digital Sign" is available here:  http://www.consultant.ru/document/cons_doc_LAW_112701/
  */
 
-
 const X509V3_EXT_METHOD ossl_v3_utf8_list[1] = {
     EXT_UTF8STRING(NID_subjectSignTool),
 };
 
 char *i2s_ASN1_UTF8STRING(X509V3_EXT_METHOD *method,
-                          ASN1_UTF8STRING *utf8)
+    ASN1_UTF8STRING *utf8)
 {
     char *tmp;
 
@@ -43,7 +42,7 @@ char *i2s_ASN1_UTF8STRING(X509V3_EXT_METHOD *method,
 }
 
 ASN1_UTF8STRING *s2i_ASN1_UTF8STRING(X509V3_EXT_METHOD *method,
-                                     X509V3_CTX *ctx, const char *str)
+    X509V3_CTX *ctx, const char *str)
 {
     ASN1_UTF8STRING *utf8;
     if (str == NULL) {
@@ -61,6 +60,6 @@ ASN1_UTF8STRING *s2i_ASN1_UTF8STRING(X509V3_EXT_METHOD *method,
     }
 #ifdef CHARSET_EBCDIC
     ebcdic2ascii(utf8->data, utf8->data, utf8->length);
-#endif                          /* CHARSET_EBCDIC */
+#endif /* CHARSET_EBCDIC */
     return utf8;
 }
diff --git a/crypto/x509/v3_utl.c b/crypto/x509/v3_utl.c
index 60aa31a7c7587..a3ee50e5cee79 100644
--- a/crypto/x509/v3_utl.c
+++ b/crypto/x509/v3_utl.c
@@ -25,10 +25,10 @@
 static char *strip_spaces(char *name);
 static int sk_strcmp(const char *const *a, const char *const *b);
 static STACK_OF(OPENSSL_STRING) *get_email(const X509_NAME *name,
-                                           GENERAL_NAMES *gens);
+    GENERAL_NAMES *gens);
 static void str_free(OPENSSL_STRING str);
 static int append_ia5(STACK_OF(OPENSSL_STRING) **sk,
-                      const ASN1_IA5STRING *email);
+    const ASN1_IA5STRING *email);
 
 static int ipv4_from_asc(unsigned char *v4, const char *in);
 static int ipv6_from_asc(unsigned char *v6, const char *in);
@@ -38,7 +38,7 @@ static int ipv6_hex(unsigned char *out, const char *in, int inlen);
 /* Add a CONF_VALUE name value pair to stack */
 
 static int x509v3_add_len_value(const char *name, const char *value,
-                                size_t vallen, STACK_OF(CONF_VALUE) **extlist)
+    size_t vallen, STACK_OF(CONF_VALUE) **extlist)
 {
     CONF_VALUE *vtmp = NULL;
     char *tname = NULL, *tvalue = NULL;
@@ -66,7 +66,7 @@ static int x509v3_add_len_value(const char *name, const char *value,
     if (!sk_CONF_VALUE_push(*extlist, vtmp))
         goto err;
     return 1;
- err:
+err:
     if (sk_allocated) {
         sk_CONF_VALUE_free(*extlist);
         *extlist = NULL;
@@ -78,23 +78,23 @@ static int x509v3_add_len_value(const char *name, const char *value,
 }
 
 int X509V3_add_value(const char *name, const char *value,
-                     STACK_OF(CONF_VALUE) **extlist)
+    STACK_OF(CONF_VALUE) **extlist)
 {
     return x509v3_add_len_value(name, value,
-                                value != NULL ? strlen((const char *)value) : 0,
-                                extlist);
+        value != NULL ? strlen((const char *)value) : 0,
+        extlist);
 }
 
 int X509V3_add_value_uchar(const char *name, const unsigned char *value,
-                           STACK_OF(CONF_VALUE) **extlist)
+    STACK_OF(CONF_VALUE) **extlist)
 {
     return x509v3_add_len_value(name, (const char *)value,
-                                value != NULL ? strlen((const char *)value) : 0,
-                                extlist);
+        value != NULL ? strlen((const char *)value) : 0,
+        extlist);
 }
 
 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)
 {
     return x509v3_add_len_value(name, (const char *)value, vallen, extlist);
 }
@@ -112,7 +112,7 @@ void X509V3_conf_free(CONF_VALUE *conf)
 }
 
 int X509V3_add_value_bool(const char *name, int asn1_bool,
-                          STACK_OF(CONF_VALUE) **extlist)
+    STACK_OF(CONF_VALUE) **extlist)
 {
     if (asn1_bool)
         return X509V3_add_value(name, "TRUE", extlist);
@@ -120,7 +120,7 @@ int X509V3_add_value_bool(const char *name, int asn1_bool,
 }
 
 int X509V3_add_value_bool_nf(const char *name, int asn1_bool,
-                             STACK_OF(CONF_VALUE) **extlist)
+    STACK_OF(CONF_VALUE) **extlist)
 {
     if (asn1_bool)
         return X509V3_add_value(name, "TRUE", extlist);
@@ -249,7 +249,7 @@ ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *method, const char *value)
 }
 
 int X509V3_add_value_int(const char *name, const ASN1_INTEGER *aint,
-                         STACK_OF(CONF_VALUE) **extlist)
+    STACK_OF(CONF_VALUE) **extlist)
 {
     char *strtmp;
     int ret;
@@ -287,7 +287,7 @@ int X509V3_get_value_bool(const CONF_VALUE *value, int *asn1_bool)
         *asn1_bool = 0;
         return 1;
     }
- err:
+err:
     ERR_raise(ERR_LIB_X509V3, X509V3_R_INVALID_BOOLEAN_STRING);
     X509V3_conf_add_error_name_value(value);
     return 0;
@@ -305,8 +305,8 @@ int X509V3_get_value_int(const CONF_VALUE *value, ASN1_INTEGER **aint)
     return 1;
 }
 
-#define HDR_NAME        1
-#define HDR_VALUE       2
+#define HDR_NAME 1
+#define HDR_VALUE 2
 
 /*
  * #define DEBUG
@@ -328,7 +328,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
     ntmp = NULL;
     /* Go through all characters */
     for (p = linebuf, q = linebuf; (c = *p) && (c != '\r') && (c != '\n');
-         p++) {
+        p++) {
 
         switch (state) {
         case HDR_NAME:
@@ -370,7 +370,6 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
                 ntmp = NULL;
                 q = p + 1;
             }
-
         }
     }
 
@@ -396,11 +395,10 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
     OPENSSL_free(linebuf);
     return values;
 
- err:
+err:
     OPENSSL_free(linebuf);
     sk_CONF_VALUE_pop_free(values, X509V3_conf_free);
     return NULL;
-
 }
 
 /* Delete leading and trailing spaces from a string */
@@ -424,7 +422,6 @@ static char *strip_spaces(char *name)
     return p;
 }
 
-
 /*
  * V2I name comparison function: returns zero if 'name' matches cmp or cmp.*
  */
@@ -472,8 +469,7 @@ STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x)
         ACCESS_DESCRIPTION *ad = sk_ACCESS_DESCRIPTION_value(info, i);
         if (OBJ_obj2nid(ad->method) == NID_ad_OCSP) {
             if (ad->location->type == GEN_URI) {
-                if (!append_ia5
-                    (&ret, ad->location->d.uniformResourceIdentifier))
+                if (!append_ia5(&ret, ad->location->d.uniformResourceIdentifier))
                     break;
             }
         }
@@ -497,7 +493,7 @@ STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x)
 }
 
 static STACK_OF(OPENSSL_STRING) *get_email(const X509_NAME *name,
-                                           GENERAL_NAMES *gens)
+    GENERAL_NAMES *gens)
 {
     STACK_OF(OPENSSL_STRING) *ret = NULL;
     X509_NAME_ENTRY *ne;
@@ -508,7 +504,8 @@ static STACK_OF(OPENSSL_STRING) *get_email(const X509_NAME *name,
     /* Now add any email address(es) to STACK */
     /* First supplied X509_NAME */
     while ((i = X509_NAME_get_index_by_NID(name,
-                                           NID_pkcs9_emailAddress, i)) >= 0) {
+                NID_pkcs9_emailAddress, i))
+        >= 0) {
         ne = X509_NAME_get_entry(name, i);
         email = X509_NAME_ENTRY_get_data(ne);
         if (!append_ia5(&ret, email))
@@ -530,7 +527,7 @@ static void str_free(OPENSSL_STRING str)
 }
 
 static int append_ia5(STACK_OF(OPENSSL_STRING) **sk,
-                      const ASN1_IA5STRING *email)
+    const ASN1_IA5STRING *email)
 {
     char *emtmp;
 
@@ -572,14 +569,14 @@ void X509_email_free(STACK_OF(OPENSSL_STRING) *sk)
     sk_OPENSSL_STRING_pop_free(sk, str_free);
 }
 
-typedef int (*equal_fn) (const unsigned char *pattern, size_t pattern_len,
-                         const unsigned char *subject, size_t subject_len,
-                         unsigned int flags);
+typedef int (*equal_fn)(const unsigned char *pattern, size_t pattern_len,
+    const unsigned char *subject, size_t subject_len,
+    unsigned int flags);
 
 /* Skip pattern prefix to match "wildcard" subject */
 static void skip_prefix(const unsigned char **p, size_t *plen,
-                        size_t subject_len,
-                        unsigned int flags)
+    size_t subject_len,
+    unsigned int flags)
 {
     const unsigned char *pattern = *p;
     size_t pattern_len = *plen;
@@ -594,8 +591,7 @@ static void skip_prefix(const unsigned char **p, size_t *plen,
         return;
 
     while (pattern_len > subject_len && *pattern) {
-        if ((flags & X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS) &&
-            *pattern == '.')
+        if ((flags & X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS) && *pattern == '.')
             break;
         ++pattern;
         --pattern_len;
@@ -610,8 +606,8 @@ static void skip_prefix(const unsigned char **p, size_t *plen,
 
 /* Compare while ASCII ignoring case. */
 static int equal_nocase(const unsigned char *pattern, size_t pattern_len,
-                        const unsigned char *subject, size_t subject_len,
-                        unsigned int flags)
+    const unsigned char *subject, size_t subject_len,
+    unsigned int flags)
 {
     skip_prefix(&pattern, &pattern_len, subject_len, flags);
     if (pattern_len != subject_len)
@@ -640,8 +636,8 @@ static int equal_nocase(const unsigned char *pattern, size_t pattern_len,
 
 /* Compare using memcmp. */
 static int equal_case(const unsigned char *pattern, size_t pattern_len,
-                      const unsigned char *subject, size_t subject_len,
-                      unsigned int flags)
+    const unsigned char *subject, size_t subject_len,
+    unsigned int flags)
 {
     skip_prefix(&pattern, &pattern_len, subject_len, flags);
     if (pattern_len != subject_len)
@@ -654,8 +650,8 @@ static int equal_case(const unsigned char *pattern, size_t pattern_len,
  * case-insensitive manner.
  */
 static int equal_email(const unsigned char *a, size_t a_len,
-                       const unsigned char *b, size_t b_len,
-                       unsigned int unused_flags)
+    const unsigned char *b, size_t b_len,
+    unsigned int unused_flags)
 {
     size_t i = a_len;
 
@@ -684,9 +680,9 @@ static int equal_email(const unsigned char *a, size_t a_len,
  * characters in-between are valid.
  */
 static int wildcard_match(const unsigned char *prefix, size_t prefix_len,
-                          const unsigned char *suffix, size_t suffix_len,
-                          const unsigned char *subject, size_t subject_len,
-                          unsigned int flags)
+    const unsigned char *suffix, size_t suffix_len,
+    const unsigned char *subject, size_t subject_len,
+    unsigned int flags)
 {
     const unsigned char *wildcard_start;
     const unsigned char *wildcard_end;
@@ -714,8 +710,7 @@ static int wildcard_match(const unsigned char *prefix, size_t prefix_len,
             allow_multi = 1;
     }
     /* IDNA labels cannot match partial wildcards */
-    if (!allow_idna &&
-        subject_len >= 4 && HAS_CASE_PREFIX((const char *)subject, "xn--"))
+    if (!allow_idna && subject_len >= 4 && HAS_CASE_PREFIX((const char *)subject, "xn--"))
         return 0;
     /* The wildcard may match a literal '*' */
     if (wildcard_end == wildcard_start + 1 && *wildcard_start == '*')
@@ -726,21 +721,18 @@ static int wildcard_match(const unsigned char *prefix, size_t prefix_len,
      * allow_multi is set.
      */
     for (p = wildcard_start; p != wildcard_end; ++p)
-        if (!(('0' <= *p && *p <= '9') ||
-              ('A' <= *p && *p <= 'Z') ||
-              ('a' <= *p && *p <= 'z') ||
-              *p == '-' || (allow_multi && *p == '.')))
+        if (!(('0' <= *p && *p <= '9') || ('A' <= *p && *p <= 'Z') || ('a' <= *p && *p <= 'z') || *p == '-' || (allow_multi && *p == '.')))
             return 0;
     return 1;
 }
 
-#define LABEL_START     (1 << 0)
-#define LABEL_END       (1 << 1)
-#define LABEL_HYPHEN    (1 << 2)
-#define LABEL_IDNA      (1 << 3)
+#define LABEL_START (1 << 0)
+#define LABEL_END (1 << 1)
+#define LABEL_HYPHEN (1 << 2)
+#define LABEL_IDNA (1 << 3)
 
 static const unsigned char *valid_star(const unsigned char *p, size_t len,
-                                       unsigned int flags)
+    unsigned int flags)
 {
     const unsigned char *star = 0;
     size_t i;
@@ -772,8 +764,8 @@ static const unsigned char *valid_star(const unsigned char *p, size_t len,
             star = &p[i];
             state &= ~LABEL_START;
         } else if (('a' <= p[i] && p[i] <= 'z')
-                   || ('A' <= p[i] && p[i] <= 'Z')
-                   || ('0' <= p[i] && p[i] <= '9')) {
+            || ('A' <= p[i] && p[i] <= 'Z')
+            || ('0' <= p[i] && p[i] <= '9')) {
             if ((state & LABEL_START) != 0
                 && len - i >= 4 && HAS_CASE_PREFIX((const char *)&p[i], "xn--"))
                 state |= LABEL_IDNA;
@@ -804,8 +796,8 @@ static const unsigned char *valid_star(const unsigned char *p, size_t len,
 
 /* Compare using wildcards. */
 static int equal_wildcard(const unsigned char *pattern, size_t pattern_len,
-                          const unsigned char *subject, size_t subject_len,
-                          unsigned int flags)
+    const unsigned char *subject, size_t subject_len,
+    unsigned int flags)
 {
     const unsigned char *star = NULL;
 
@@ -817,10 +809,10 @@ static int equal_wildcard(const unsigned char *pattern, size_t pattern_len,
         star = valid_star(pattern, pattern_len, flags);
     if (star == NULL)
         return equal_nocase(pattern, pattern_len,
-                            subject, subject_len, flags);
+            subject, subject_len, flags);
     return wildcard_match(pattern, star - pattern,
-                          star + 1, (pattern + pattern_len) - star - 1,
-                          subject, subject_len, flags);
+        star + 1, (pattern + pattern_len) - star - 1,
+        subject, subject_len, flags);
 }
 
 /*
@@ -830,8 +822,8 @@ static int equal_wildcard(const unsigned char *pattern, size_t pattern_len,
  */
 
 static int do_check_string(const ASN1_STRING *a, int cmp_type, equal_fn equal,
-                           unsigned int flags, const char *b, size_t blen,
-                           char **peername)
+    unsigned int flags, const char *b, size_t blen,
+    char **peername)
 {
     int rv = 0;
 
@@ -874,7 +866,7 @@ static int do_check_string(const ASN1_STRING *a, int cmp_type, equal_fn equal,
 }
 
 static int do_x509_check(X509 *x, const char *chk, size_t chklen,
-                         unsigned int flags, int check_type, char **peername)
+    unsigned int flags, int check_type, char **peername)
 {
     GENERAL_NAMES *gens = NULL;
     const X509_NAME *name = NULL;
@@ -920,7 +912,7 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
             default:
                 continue;
             case GEN_OTHERNAME:
-		switch (OBJ_obj2nid(gen->d.otherName->type_id)) {
+                switch (OBJ_obj2nid(gen->d.otherName->type_id)) {
                 default:
                     continue;
                 case NID_id_on_SmtpUTF8Mailbox:
@@ -976,7 +968,8 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
             san_present = 1;
             /* Positive on success, negative on error! */
             if ((rv = do_check_string(cstr, alt_type, equal, flags,
-                                      chk, chklen, peername)) != 0)
+                     chk, chklen, peername))
+                != 0)
                 break;
         }
         GENERAL_NAMES_free(gens);
@@ -998,14 +991,15 @@ static int do_x509_check(X509 *x, const char *chk, size_t chklen,
 
         /* Positive on success, negative on error! */
         if ((rv = do_check_string(str, -1, equal, flags,
-                                  chk, chklen, peername)) != 0)
+                 chk, chklen, peername))
+            != 0)
             return rv;
     }
     return 0;
 }
 
 int X509_check_host(X509 *x, const char *chk, size_t chklen,
-                    unsigned int flags, char **peername)
+    unsigned int flags, char **peername)
 {
     if (chk == NULL)
         return -2;
@@ -1024,7 +1018,7 @@ int X509_check_host(X509 *x, const char *chk, size_t chklen,
 }
 
 int X509_check_email(X509 *x, const char *chk, size_t chklen,
-                     unsigned int flags)
+    unsigned int flags)
 {
     if (chk == NULL)
         return -2;
@@ -1043,7 +1037,7 @@ int X509_check_email(X509 *x, const char *chk, size_t chklen,
 }
 
 int X509_check_ip(X509 *x, const unsigned char *chk, size_t chklen,
-                  unsigned int flags)
+    unsigned int flags)
 {
     if (chk == NULL)
         return -2;
@@ -1078,8 +1072,8 @@ char *ossl_ipaddr_to_asc(unsigned char *p, int len)
         break;
     case 16: /* IPv6 */
         for (out = buf, i = 8, remain = sizeof(buf);
-             i-- > 0 && bytes >= 0;
-             remain -= bytes, out += bytes) {
+            i-- > 0 && bytes >= 0;
+            remain -= bytes, out += bytes) {
             const char *template = (i > 0 ? "%X:" : "%X");
 
             bytes = BIO_snprintf(out, remain, template, p[0] << 8 | p[1]);
@@ -1158,7 +1152,7 @@ ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc)
 
     return ret;
 
- err:
+err:
     OPENSSL_free(iptmp);
     ASN1_OCTET_STRING_free(ret);
     return NULL;
@@ -1185,7 +1179,8 @@ int ossl_a2i_ipadd(unsigned char *ipout, const char *ipasc)
  * to the component, and advances *str to the first unconsumed character. On
  * invalid input, it returns zero.
  */
-static int get_ipv4_component(uint8_t *out_byte, const char **str) {
+static int get_ipv4_component(uint8_t *out_byte, const char **str)
+{
     /* Store a slightly larger intermediary so the overflow check is easier. */
     uint32_t out = 0;
 
@@ -1204,7 +1199,7 @@ static int get_ipv4_component(uint8_t *out_byte, const char **str) {
             return 1;
         }
         if (out == 0) {
-	    /* Reject extra leading zeros. Parsers sometimes treat them as
+            /* Reject extra leading zeros. Parsers sometimes treat them as
              * octal, so accepting them would misinterpret input.
              */
             return 0;
@@ -1231,7 +1226,7 @@ static int ipv4_from_asc(unsigned char *v4, const char *in)
         || !get_ipv4_component(&v4[1], &in) || !get_ipv4_dot(&in)
         || !get_ipv4_component(&v4[2], &in) || !get_ipv4_dot(&in)
         || !get_ipv4_component(&v4[3], &in) || *in != '\0') {
-         return 0;
+        return 0;
     }
     return 1;
 }
@@ -1275,7 +1270,7 @@ static int ipv6_from_asc(unsigned char *v6, const char *in)
         /* More than three zeroes is an error */
         if (v6stat.zero_cnt > 3) {
             return 0;
-        /* Can only have three zeroes if nothing else present */
+            /* Can only have three zeroes if nothing else present */
         } else if (v6stat.zero_cnt == 3) {
             if (v6stat.total > 0)
                 return 0;
@@ -1302,8 +1297,8 @@ static int ipv6_from_asc(unsigned char *v6, const char *in)
         /* Copy final part */
         if (v6stat.total != v6stat.zero_pos)
             memcpy(v6 + v6stat.zero_pos + 16 - v6stat.total,
-                   v6stat.tmp + v6stat.zero_pos,
-                   v6stat.total - v6stat.zero_pos);
+                v6stat.tmp + v6stat.zero_pos,
+                v6stat.total - v6stat.zero_pos);
     } else {
         memcpy(v6, v6stat.tmp, 16);
     }
@@ -1373,7 +1368,7 @@ static int ipv6_hex(unsigned char *out, const char *in, int inlen)
 }
 
 int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
-                             unsigned long chtype)
+    unsigned long chtype)
 {
     CONF_VALUE *v;
     int i, mval, spec_char, plus_char;
@@ -1393,7 +1388,7 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
             spec_char = ((*p == ':') || (*p == ',') || (*p == '.'));
 #else
             spec_char = ((*p == os_toascii[':']) || (*p == os_toascii[','])
-                         || (*p == os_toascii['.']));
+                || (*p == os_toascii['.']));
 #endif
             if (spec_char) {
                 p++;
@@ -1414,10 +1409,9 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
             mval = 0;
         }
         if (!X509_NAME_add_entry_by_txt(nm, type, chtype,
-                                        (unsigned char *)v->value, -1, -1,
-                                        mval))
+                (unsigned char *)v->value, -1, -1,
+                mval))
             return 0;
-
     }
     return 1;
 }
diff --git a/crypto/x509/v3err.c b/crypto/x509/v3err.c
index b03bc8524ce7d..96a27aaf488f2 100644
--- a/crypto/x509/v3err.c
+++ b/crypto/x509/v3err.c
@@ -15,129 +15,129 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA X509V3_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_IP_ADDRESS), "bad ip address"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_OBJECT), "bad object"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_OPTION), "bad option"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_VALUE), "bad value"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BN_DEC2BN_ERROR), "bn dec2bn error"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BN_TO_ASN1_INTEGER_ERROR),
-     "bn to asn1 integer error"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_DIRNAME_ERROR), "dirname error"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_DISTPOINT_ALREADY_SET),
-     "distpoint already set"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_DUPLICATE_ZONE_ID),
-     "duplicate zone id"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EMPTY_KEY_USAGE), "empty key usage"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ERROR_CONVERTING_ZONE),
-     "error converting zone"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ERROR_CREATING_EXTENSION),
-     "error creating extension"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ERROR_IN_EXTENSION),
-     "error in extension"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXPECTED_A_SECTION_NAME),
-     "expected a section name"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_EXISTS),
-     "extension exists"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_NAME_ERROR),
-     "extension name error"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_NOT_FOUND),
-     "extension not found"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED),
-     "extension setting not supported"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_VALUE_ERROR),
-     "extension value error"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ILLEGAL_EMPTY_EXTENSION),
-     "illegal empty extension"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INCORRECT_POLICY_SYNTAX_TAG),
-     "incorrect policy syntax tag"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_ASNUMBER),
-     "invalid asnumber"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_ASRANGE), "invalid asrange"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_BOOLEAN_STRING),
-     "invalid boolean string"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_CERTIFICATE),
-     "invalid certificate"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EMPTY_NAME),
-     "invalid empty name"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EXTENSION_STRING),
-     "invalid extension string"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_INHERITANCE),
-     "invalid inheritance"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_IPADDRESS),
-     "invalid ipaddress"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_MULTIPLE_RDNS),
-     "invalid multiple rdns"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NAME), "invalid name"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_ARGUMENT),
-     "invalid null argument"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_VALUE),
-     "invalid null value"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NUMBER), "invalid number"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NUMBERS), "invalid numbers"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_OBJECT_IDENTIFIER),
-     "invalid object identifier"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_OPTION), "invalid option"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_POLICY_IDENTIFIER),
-     "invalid policy identifier"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_PROXY_POLICY_SETTING),
-     "invalid proxy policy setting"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_PURPOSE), "invalid purpose"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_SAFI), "invalid safi"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_SECTION), "invalid section"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_SYNTAX), "invalid syntax"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ISSUER_DECODE_ERROR),
-     "issuer decode error"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_MISSING_VALUE), "missing value"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NEED_ORGANIZATION_AND_NUMBERS),
-     "need organization and numbers"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NEGATIVE_PATHLEN),
-     "negative pathlen"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_CONFIG_DATABASE),
-     "no config database"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_ISSUER_CERTIFICATE),
-     "no issuer certificate"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_ISSUER_DETAILS),
-     "no issuer details"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_POLICY_IDENTIFIER),
-     "no policy identifier"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED),
-     "no proxy cert policy language defined"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_PUBLIC_KEY), "no public key"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_SUBJECT_DETAILS),
-     "no subject details"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_OPERATION_NOT_DEFINED),
-     "operation not defined"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_OTHERNAME_ERROR), "othername error"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED),
-     "policy language already defined"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_PATH_LENGTH),
-     "policy path length"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED),
-     "policy path length already defined"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY),
-     "policy when proxy language requires no policy"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_PURPOSE_NOT_UNIQUE),
-     "purpose not unique"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_SECTION_NOT_FOUND),
-     "section not found"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS),
-     "unable to get issuer details"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNABLE_TO_GET_ISSUER_KEYID),
-     "unable to get issuer keyid"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT),
-     "unknown bit string argument"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_EXTENSION),
-     "unknown extension"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_EXTENSION_NAME),
-     "unknown extension name"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_OPTION), "unknown option"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_VALUE), "unknown value"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNSUPPORTED_OPTION),
-     "unsupported option"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNSUPPORTED_TYPE),
-     "unsupported type"},
-    {ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_USER_TOO_LONG), "user too long"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_IP_ADDRESS), "bad ip address" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_OBJECT), "bad object" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_OPTION), "bad option" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BAD_VALUE), "bad value" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BN_DEC2BN_ERROR), "bn dec2bn error" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_BN_TO_ASN1_INTEGER_ERROR),
+        "bn to asn1 integer error" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_DIRNAME_ERROR), "dirname error" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_DISTPOINT_ALREADY_SET),
+        "distpoint already set" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_DUPLICATE_ZONE_ID),
+        "duplicate zone id" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EMPTY_KEY_USAGE), "empty key usage" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ERROR_CONVERTING_ZONE),
+        "error converting zone" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ERROR_CREATING_EXTENSION),
+        "error creating extension" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ERROR_IN_EXTENSION),
+        "error in extension" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXPECTED_A_SECTION_NAME),
+        "expected a section name" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_EXISTS),
+        "extension exists" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_NAME_ERROR),
+        "extension name error" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_NOT_FOUND),
+        "extension not found" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED),
+        "extension setting not supported" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_EXTENSION_VALUE_ERROR),
+        "extension value error" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ILLEGAL_EMPTY_EXTENSION),
+        "illegal empty extension" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INCORRECT_POLICY_SYNTAX_TAG),
+        "incorrect policy syntax tag" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_ASNUMBER),
+        "invalid asnumber" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_ASRANGE), "invalid asrange" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_BOOLEAN_STRING),
+        "invalid boolean string" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_CERTIFICATE),
+        "invalid certificate" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EMPTY_NAME),
+        "invalid empty name" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_EXTENSION_STRING),
+        "invalid extension string" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_INHERITANCE),
+        "invalid inheritance" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_IPADDRESS),
+        "invalid ipaddress" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_MULTIPLE_RDNS),
+        "invalid multiple rdns" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NAME), "invalid name" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_ARGUMENT),
+        "invalid null argument" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NULL_VALUE),
+        "invalid null value" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NUMBER), "invalid number" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_NUMBERS), "invalid numbers" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_OBJECT_IDENTIFIER),
+        "invalid object identifier" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_OPTION), "invalid option" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_POLICY_IDENTIFIER),
+        "invalid policy identifier" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_PROXY_POLICY_SETTING),
+        "invalid proxy policy setting" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_PURPOSE), "invalid purpose" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_SAFI), "invalid safi" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_SECTION), "invalid section" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_INVALID_SYNTAX), "invalid syntax" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_ISSUER_DECODE_ERROR),
+        "issuer decode error" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_MISSING_VALUE), "missing value" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NEED_ORGANIZATION_AND_NUMBERS),
+        "need organization and numbers" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NEGATIVE_PATHLEN),
+        "negative pathlen" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_CONFIG_DATABASE),
+        "no config database" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_ISSUER_CERTIFICATE),
+        "no issuer certificate" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_ISSUER_DETAILS),
+        "no issuer details" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_POLICY_IDENTIFIER),
+        "no policy identifier" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED),
+        "no proxy cert policy language defined" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_PUBLIC_KEY), "no public key" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_NO_SUBJECT_DETAILS),
+        "no subject details" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_OPERATION_NOT_DEFINED),
+        "operation not defined" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_OTHERNAME_ERROR), "othername error" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED),
+        "policy language already defined" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_PATH_LENGTH),
+        "policy path length" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED),
+        "policy path length already defined" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY),
+        "policy when proxy language requires no policy" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_PURPOSE_NOT_UNIQUE),
+        "purpose not unique" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_SECTION_NOT_FOUND),
+        "section not found" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS),
+        "unable to get issuer details" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNABLE_TO_GET_ISSUER_KEYID),
+        "unable to get issuer keyid" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT),
+        "unknown bit string argument" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_EXTENSION),
+        "unknown extension" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_EXTENSION_NAME),
+        "unknown extension name" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_OPTION), "unknown option" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNKNOWN_VALUE), "unknown value" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNSUPPORTED_OPTION),
+        "unsupported option" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_UNSUPPORTED_TYPE),
+        "unsupported type" },
+    { ERR_PACK(ERR_LIB_X509V3, 0, X509V3_R_USER_TOO_LONG), "user too long" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/x509/x509_acert.c b/crypto/x509/x509_acert.c
index d97648ca0c4ac..6369bd52c16b6 100644
--- a/crypto/x509/x509_acert.c
+++ b/crypto/x509/x509_acert.c
@@ -91,9 +91,9 @@ static X509_NAME *get_dirName(const GENERAL_NAMES *names)
 }
 
 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)
 {
     if (digestedObjectType != NULL)
         *digestedObjectType = ASN1_ENUMERATED_get(&o->digestedObjectType);
@@ -124,8 +124,8 @@ 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)
 {
     if (psig != NULL)
         *psig = &x->signature;
@@ -200,7 +200,7 @@ 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)
 {
     return X509at_get_attr_by_OBJ(x->acinfo->attributes, obj, lastpos);
 }
@@ -223,7 +223,7 @@ 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)
 {
     STACK_OF(X509_ATTRIBUTE) **attrs = &x->acinfo->attributes;
 
@@ -231,7 +231,7 @@ int X509_ACERT_add1_attr_by_OBJ(X509_ACERT *x, const ASN1_OBJECT *obj,
 }
 
 int X509_ACERT_add1_attr_by_NID(X509_ACERT *x, int nid, int type,
-                                const void *bytes, int len)
+    const void *bytes, int len)
 {
     STACK_OF(X509_ATTRIBUTE) **attrs = &x->acinfo->attributes;
 
@@ -239,7 +239,7 @@ int X509_ACERT_add1_attr_by_NID(X509_ACERT *x, int nid, int type,
 }
 
 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)
 {
     STACK_OF(X509_ATTRIBUTE) **attrs = &x->acinfo->attributes;
 
@@ -262,7 +262,7 @@ static int check_asn1_attribute(const char **value)
 }
 
 int X509_ACERT_add_attr_nconf(CONF *conf, const char *section,
-                              X509_ACERT *acert)
+    X509_ACERT *acert)
 {
     int ret = 0, i;
     STACK_OF(CONF_VALUE) *attr_sk = NCONF_get_section(conf, section);
@@ -276,7 +276,7 @@ int X509_ACERT_add_attr_nconf(CONF *conf, const char *section,
 
         if (value == NULL) {
             ERR_raise_data(ERR_LIB_X509, X509_R_INVALID_ATTRIBUTES,
-                           "name=%s,section=%s",v->name, section);
+                "name=%s,section=%s", v->name, section);
             goto err;
         }
 
@@ -291,7 +291,7 @@ int X509_ACERT_add_attr_nconf(CONF *conf, const char *section,
             att_len = i2d_ASN1_TYPE(asn1, &att_data);
 
             ret = X509_ACERT_add1_attr_by_txt(acert, v->name, V_ASN1_SEQUENCE,
-                                              att_data, att_len);
+                att_data, att_len);
             OPENSSL_free(att_data);
             ASN1_TYPE_free(asn1);
 
@@ -299,9 +299,9 @@ int X509_ACERT_add_attr_nconf(CONF *conf, const char *section,
                 goto err;
         } else {
             ret = X509_ACERT_add1_attr_by_txt(acert, v->name,
-                                              V_ASN1_OCTET_STRING,
-                                              (unsigned char *)value,
-                                              strlen(value));
+                V_ASN1_OCTET_STRING,
+                (unsigned char *)value,
+                strlen(value));
             if (!ret)
                 goto err;
         }
@@ -317,7 +317,7 @@ 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)
 {
     return X509V3_add1_i2d(&x->acinfo->extensions, nid, value, crit, flags);
 }
diff --git a/crypto/x509/x509_acert.h b/crypto/x509/x509_acert.h
index f6d212bdbd562..c7065ad92c65e 100644
--- a/crypto/x509/x509_acert.h
+++ b/crypto/x509/x509_acert.h
@@ -8,11 +8,11 @@
  */
 
 #ifndef OSSL_CRYPTO_X509_X509_ACERT_H
-# define OSSL_CRYPTO_X509_X509_ACERT_H
+#define OSSL_CRYPTO_X509_X509_ACERT_H
 
 #include <crypto/x509_acert.h>
 
-# define X509_ACERT_ISSUER_V2 1
+#define X509_ACERT_ISSUER_V2 1
 
 DECLARE_ASN1_ITEM(OSSL_OBJECT_DIGEST_INFO)
 DECLARE_ASN1_ITEM(OSSL_ISSUER_SERIAL)
diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
index b21aa4d299409..a0fb445472738 100644
--- a/crypto/x509/x509_att.c
+++ b/crypto/x509/x509_att.c
@@ -24,7 +24,7 @@ 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)
 {
     const ASN1_OBJECT *obj = OBJ_nid2obj(nid);
 
@@ -34,7 +34,7 @@ int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid,
 }
 
 int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
-                           const ASN1_OBJECT *obj, int lastpos)
+    const ASN1_OBJECT *obj, int lastpos)
 {
     int n;
     X509_ATTRIBUTE *ex;
@@ -80,7 +80,7 @@ X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc)
 }
 
 STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
-                                                const X509_ATTRIBUTE *attr)
+    const X509_ATTRIBUTE *attr)
 {
     X509_ATTRIBUTE *new_attr = NULL;
     STACK_OF(X509_ATTRIBUTE) *sk = NULL;
@@ -108,7 +108,7 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
     if (*x == NULL)
         *x = sk;
     return sk;
- err:
+err:
     X509_ATTRIBUTE_free(new_attr);
     if (*x == NULL)
         sk_X509_ATTRIBUTE_free(sk);
@@ -116,7 +116,7 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
 }
 
 STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
-                                           X509_ATTRIBUTE *attr)
+    X509_ATTRIBUTE *attr)
 {
     if (x == NULL || attr == NULL) {
         ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
@@ -124,7 +124,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
     }
     if (*x != NULL && X509at_get_attr_by_OBJ(*x, attr->object, -1) != -1) {
         ERR_raise_data(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE,
-                       "name=%s", OBJ_nid2sn(OBJ_obj2nid(attr->object)));
+            "name=%s", OBJ_nid2sn(OBJ_obj2nid(attr->object)));
         return NULL;
     }
 
@@ -132,10 +132,10 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
 }
 
 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)
 {
     X509_ATTRIBUTE *attr;
     STACK_OF(X509_ATTRIBUTE) *ret;
@@ -149,10 +149,11 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE)
 }
 
 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)
 {
     if (x == NULL || obj == NULL) {
         ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
@@ -160,7 +161,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE)
     }
     if (*x != NULL && X509at_get_attr_by_OBJ(*x, obj, -1) != -1) {
         ERR_raise_data(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE,
-                       "name=%s", OBJ_nid2sn(OBJ_obj2nid(obj)));
+            "name=%s", OBJ_nid2sn(OBJ_obj2nid(obj)));
         return NULL;
     }
 
@@ -168,9 +169,9 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE)
 }
 
 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)
 {
     X509_ATTRIBUTE *attr;
     STACK_OF(X509_ATTRIBUTE) *ret;
@@ -184,9 +185,10 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE)
 }
 
 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)
 {
     if (x == NULL) {
         ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
@@ -194,7 +196,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE)
     }
     if (*x != NULL && X509at_get_attr_by_NID(*x, nid, -1) != -1) {
         ERR_raise_data(ERR_LIB_X509, X509_R_DUPLICATE_ATTRIBUTE,
-                       "name=%s", OBJ_nid2sn(nid));
+            "name=%s", OBJ_nid2sn(nid));
         return NULL;
     }
 
@@ -202,10 +204,10 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE)
 }
 
 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)
 {
     X509_ATTRIBUTE *attr;
     STACK_OF(X509_ATTRIBUTE) *ret;
@@ -219,10 +221,11 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
 }
 
 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)
 {
     X509_ATTRIBUTE *attr;
     STACK_OF(X509_ATTRIBUTE) *ret;
@@ -236,7 +239,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
 }
 
 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)
 {
     int i = X509at_get_attr_by_OBJ(x, obj, lastpos);
     X509_ATTRIBUTE *at;
@@ -266,8 +269,8 @@ STACK_OF(X509_ATTRIBUTE) *ossl_x509at_dup(const STACK_OF(X509_ATTRIBUTE) *x)
 }
 
 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)
 {
     ASN1_OBJECT *obj = OBJ_nid2obj(nid);
     X509_ATTRIBUTE *ret;
@@ -283,9 +286,9 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
 }
 
 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 *ret;
 
@@ -306,23 +309,23 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,
     if (attr != NULL && *attr == NULL)
         *attr = ret;
     return ret;
- err:
+err:
     if (attr == NULL || ret != *attr)
         X509_ATTRIBUTE_free(ret);
     return NULL;
 }
 
 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)
 {
     ASN1_OBJECT *obj = OBJ_txt2obj(atrname, 0);
     X509_ATTRIBUTE *nattr;
 
     if (obj == NULL) {
         ERR_raise_data(ERR_LIB_X509, X509_R_INVALID_FIELD_NAME,
-                       "name=%s", atrname);
+            "name=%s", atrname);
         return NULL;
     }
     nattr = X509_ATTRIBUTE_create_by_OBJ(attr, obj, type, bytes, len);
@@ -342,7 +345,7 @@ 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)
 {
     ASN1_TYPE *ttmp = NULL;
     ASN1_STRING *stmp = NULL;
@@ -354,7 +357,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
     }
     if ((attrtype & MBSTRING_FLAG) != 0) {
         stmp = ASN1_STRING_set_by_NID(NULL, data, len, attrtype,
-                                      OBJ_obj2nid(attr->object));
+            OBJ_obj2nid(attr->object));
         if (stmp == NULL) {
             ERR_raise(ERR_LIB_X509, ERR_R_ASN1_LIB);
             return 0;
@@ -395,7 +398,7 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
         goto err;
     }
     return 1;
- err:
+err:
     ASN1_TYPE_free(ttmp);
     ASN1_STRING_free(stmp);
     return 0;
@@ -418,15 +421,15 @@ ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr)
 }
 
 void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx,
-                               int atrtype, void *data)
+    int atrtype, void *data)
 {
     ASN1_TYPE *ttmp = X509_ATTRIBUTE_get0_type(attr, idx);
 
     if (ttmp == NULL)
         return NULL;
     if (atrtype == V_ASN1_BOOLEAN
-            || atrtype == V_ASN1_NULL
-            || atrtype != ASN1_TYPE_get(ttmp)) {
+        || atrtype == V_ASN1_NULL
+        || atrtype != ASN1_TYPE_get(ttmp)) {
         ERR_raise(ERR_LIB_X509, X509_R_WRONG_TYPE);
         return NULL;
     }
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index de34fa5cc2cd4..6d9848d234e37 100644
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -55,16 +55,13 @@ unsigned long X509_issuer_and_serial_hash(X509 *a)
         goto err;
     if (!EVP_DigestUpdate(ctx, (unsigned char *)f, strlen(f)))
         goto err;
-    if (!EVP_DigestUpdate
-        (ctx, (unsigned char *)a->cert_info.serialNumber.data,
-         (unsigned long)a->cert_info.serialNumber.length))
+    if (!EVP_DigestUpdate(ctx, (unsigned char *)a->cert_info.serialNumber.data,
+            (unsigned long)a->cert_info.serialNumber.length))
         goto err;
     if (!EVP_DigestFinal_ex(ctx, &(md[0]), NULL))
         goto err;
-    ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) |
-           ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)
-        ) & 0xffffffffL;
- err:
+    ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) | ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)) & 0xffffffffL;
+err:
     OPENSSL_free(f);
     EVP_MD_free(digest);
     EVP_MD_CTX_free(ctx);
@@ -92,7 +89,7 @@ int X509_CRL_match(const X509_CRL *a, const X509_CRL *b)
     int rv;
 
     if ((a->flags & EXFLAG_NO_FINGERPRINT) == 0
-            && (b->flags & EXFLAG_NO_FINGERPRINT) == 0)
+        && (b->flags & EXFLAG_NO_FINGERPRINT) == 0)
         rv = memcmp(a->sha1_hash, b->sha1_hash, SHA_DIGEST_LENGTH);
     else
         return -2;
@@ -164,7 +161,7 @@ int X509_cmp(const X509 *a, const X509 *b)
     (void)X509_check_purpose((X509 *)b, -1, 0);
 
     if ((a->ex_flags & EXFLAG_NO_FINGERPRINT) == 0
-            && (b->ex_flags & EXFLAG_NO_FINGERPRINT) == 0)
+        && (b->ex_flags & EXFLAG_NO_FINGERPRINT) == 0)
         rv = memcmp(a->sha1_hash, b->sha1_hash, SHA_DIGEST_LENGTH);
     if (rv != 0)
         return rv < 0 ? -1 : 1;
@@ -176,7 +173,7 @@ int X509_cmp(const X509 *a, const X509 *b)
         if (a->cert_info.enc.len > b->cert_info.enc.len)
             return 1;
         rv = memcmp(a->cert_info.enc.enc,
-                    b->cert_info.enc.enc, a->cert_info.enc.len);
+            b->cert_info.enc.enc, a->cert_info.enc.len);
     }
     return rv < 0 ? -1 : rv > 0;
 }
@@ -219,7 +216,7 @@ int X509_add_cert(STACK_OF(X509) *sk, X509 *cert, int flags)
     if ((flags & X509_ADD_FLAG_UP_REF) != 0 && !X509_up_ref(cert))
         return 0;
     if (!sk_X509_insert(sk, cert,
-                        (flags & X509_ADD_FLAG_PREPEND) != 0 ? 0 : -1)) {
+            (flags & X509_ADD_FLAG_PREPEND) != 0 ? 0 : -1)) {
         if ((flags & X509_ADD_FLAG_UP_REF) != 0)
             X509_free(cert);
         ERR_raise(ERR_LIB_X509, ERR_R_CRYPTO_LIB);
@@ -239,7 +236,7 @@ int X509_add_certs(STACK_OF(X509) *sk, STACK_OF(X509) *certs, int flags)
 }
 
 int ossl_x509_add_certs_new(STACK_OF(X509) **p_sk, STACK_OF(X509) *certs,
-                            int flags)
+    int flags)
 /* compiler would allow 'const' for the certs, yet they may get up-ref'ed */
 {
     int n = sk_X509_num(certs /* may be NULL */);
@@ -291,7 +288,7 @@ int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b)
 }
 
 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 ret = 0;
     unsigned char md[SHA_DIGEST_LENGTH];
@@ -304,9 +301,7 @@ unsigned long X509_NAME_hash_ex(const X509_NAME *x, OSSL_LIB_CTX *libctx,
         *ok = 0;
     if (i2d_ret >= 0 && sha1 != NULL
         && EVP_Digest(x->canon_enc, x->canon_enclen, md, NULL, sha1, NULL)) {
-        ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) |
-               ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)
-               ) & 0xffffffffL;
+        ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) | ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)) & 0xffffffffL;
         if (ok != NULL)
             *ok = 1;
     }
@@ -336,11 +331,9 @@ unsigned long X509_NAME_hash_old(const X509_NAME *x)
     if (EVP_DigestInit_ex(md_ctx, md5, NULL)
         && EVP_DigestUpdate(md_ctx, x->bytes->data, x->bytes->length)
         && EVP_DigestFinal_ex(md_ctx, md, NULL))
-        ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) |
-               ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)
-            ) & 0xffffffffL;
+        ret = (((unsigned long)md[0]) | ((unsigned long)md[1] << 8L) | ((unsigned long)md[2] << 16L) | ((unsigned long)md[3] << 24L)) & 0xffffffffL;
 
- end:
+end:
     EVP_MD_CTX_free(md_ctx);
     EVP_MD_free(md5);
 
@@ -350,7 +343,7 @@ unsigned long X509_NAME_hash_old(const X509_NAME *x)
 
 /* Search a stack of X509 for a match */
 X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, const X509_NAME *name,
-                                     const ASN1_INTEGER *serial)
+    const ASN1_INTEGER *serial)
 {
     int i;
     X509 x, *x509 = NULL;
@@ -448,7 +441,7 @@ static int check_suite_b(EVP_PKEY *pkey, int sign_nid, unsigned long *pflags)
         return X509_V_ERR_SUITE_B_INVALID_ALGORITHM;
 
     if (!EVP_PKEY_get_group_name(pkey, curve_name, sizeof(curve_name),
-                                 &curve_name_len))
+            &curve_name_len))
         return X509_V_ERR_SUITE_B_INVALID_CURVE;
 
     curve_nid = OBJ_txt2nid(curve_name);
@@ -475,7 +468,7 @@ static int check_suite_b(EVP_PKEY *pkey, int sign_nid, unsigned long *pflags)
 }
 
 int X509_chain_check_suiteb(int *perror_depth, X509 *x, STACK_OF(X509) *chain,
-                            unsigned long flags)
+    unsigned long flags)
 {
     int rv, i, sign_nid;
     EVP_PKEY *pk;
@@ -531,11 +524,12 @@ int X509_chain_check_suiteb(int *perror_depth, X509 *x, STACK_OF(X509) *chain,
 
     /* Final check: root CA signature */
     rv = check_suite_b(pk, X509_get_signature_nid(x), &tflags);
- end:
+end:
     if (rv != X509_V_OK) {
         /* Invalid signature or LOS errors are for previous cert */
         if ((rv == X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM
-             || rv == X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED) && i)
+                || rv == X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED)
+            && i)
             i--;
         /*
          * If we have LOS error and flags changed then we are signing P-384
@@ -560,7 +554,7 @@ int X509_CRL_check_suiteb(X509_CRL *crl, EVP_PKEY *pk, unsigned long flags)
 
 #else
 int X509_chain_check_suiteb(int *perror_depth, X509 *x, STACK_OF(X509) *chain,
-                            unsigned long flags)
+    unsigned long flags)
 {
     return 0;
 }
@@ -592,7 +586,7 @@ STACK_OF(X509) *X509_chain_up_ref(STACK_OF(X509) *chain)
     }
     return ret;
 
- err:
+err:
     while (i-- > 0)
         X509_free(sk_X509_value(ret, i));
     sk_X509_free(ret);
diff --git a/crypto/x509/x509_d2.c b/crypto/x509/x509_d2.c
index dd18bcd586344..010cdb9c7b8fc 100644
--- a/crypto/x509/x509_d2.c
+++ b/crypto/x509/x509_d2.c
@@ -13,7 +13,7 @@
 #include <openssl/x509.h>
 
 int X509_STORE_set_default_paths_ex(X509_STORE *ctx, OSSL_LIB_CTX *libctx,
-                                    const char *propq)
+    const char *propq)
 {
     X509_LOOKUP *lookup;
 
@@ -48,14 +48,15 @@ int X509_STORE_set_default_paths(X509_STORE *ctx)
 }
 
 int X509_STORE_load_file_ex(X509_STORE *ctx, const char *file,
-                            OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     X509_LOOKUP *lookup;
 
     if (file == NULL
         || (lookup = X509_STORE_add_lookup(ctx, X509_LOOKUP_file())) == NULL
         || X509_LOOKUP_load_file_ex(lookup, file, X509_FILETYPE_PEM, libctx,
-                                    propq) <= 0)
+               propq)
+            <= 0)
         return 0;
 
     return 1;
@@ -79,7 +80,7 @@ int X509_STORE_load_path(X509_STORE *ctx, const char *path)
 }
 
 int X509_STORE_load_store_ex(X509_STORE *ctx, const char *uri,
-                             OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     X509_LOOKUP *lookup;
 
@@ -97,8 +98,8 @@ int X509_STORE_load_store(X509_STORE *ctx, const char *uri)
 }
 
 int X509_STORE_load_locations_ex(X509_STORE *ctx, const char *file,
-                                 const char *path, OSSL_LIB_CTX *libctx,
-                                 const char *propq)
+    const char *path, OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     if (file == NULL && path == NULL)
         return 0;
@@ -110,7 +111,7 @@ int X509_STORE_load_locations_ex(X509_STORE *ctx, const char *file,
 }
 
 int X509_STORE_load_locations(X509_STORE *ctx, const char *file,
-                              const char *path)
+    const char *path)
 {
     return X509_STORE_load_locations_ex(ctx, file, path, NULL, NULL);
 }
diff --git a/crypto/x509/x509_def.c b/crypto/x509/x509_def.c
index 7d5b642c4502b..5a6ecaf47618e 100644
--- a/crypto/x509/x509_def.c
+++ b/crypto/x509/x509_def.c
@@ -16,7 +16,7 @@
 
 #if defined(_WIN32)
 
-static char x509_private_dir[MAX_PATH + 1]; 
+static char x509_private_dir[MAX_PATH + 1];
 static char *x509_private_dirptr = NULL;
 
 static char x509_cert_area[MAX_PATH + 1];
@@ -67,7 +67,7 @@ DEFINE_RUN_ONCE_STATIC(do_openssldir_setup)
 
 const char *X509_get_default_private_dir(void)
 {
-#if defined (_WIN32)
+#if defined(_WIN32)
     RUN_ONCE(&openssldir_setup_init, do_openssldir_setup);
     return x509_private_dirptr;
 #else
@@ -77,7 +77,7 @@ const char *X509_get_default_private_dir(void)
 
 const char *X509_get_default_cert_area(void)
 {
-#if defined (_WIN32)
+#if defined(_WIN32)
     RUN_ONCE(&openssldir_setup_init, do_openssldir_setup);
     return x509_cert_areaptr;
 #else
@@ -87,7 +87,7 @@ const char *X509_get_default_cert_area(void)
 
 const char *X509_get_default_cert_dir(void)
 {
-#if defined (_WIN32)
+#if defined(_WIN32)
     RUN_ONCE(&openssldir_setup_init, do_openssldir_setup);
     return x509_cert_dirptr;
 #else
@@ -97,7 +97,7 @@ const char *X509_get_default_cert_dir(void)
 
 const char *X509_get_default_cert_file(void)
 {
-#if defined (_WIN32)
+#if defined(_WIN32)
     RUN_ONCE(&openssldir_setup_init, do_openssldir_setup);
     return x509_cert_fileptr;
 #else
diff --git a/crypto/x509/x509_err.c b/crypto/x509/x509_err.c
index 607d38f3be3c2..3d6e8768f8bf9 100644
--- a/crypto/x509/x509_err.c
+++ b/crypto/x509/x509_err.c
@@ -15,75 +15,75 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA X509_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_AKID_MISMATCH), "akid mismatch"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_BAD_SELECTOR), "bad selector"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_BAD_X509_FILETYPE), "bad x509 filetype"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_BASE64_DECODE_ERROR),
-    "base64 decode error"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_CANT_CHECK_DH_KEY), "can't check dh key"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_CERTIFICATE_VERIFICATION_FAILED),
-    "certificate verification failed"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_CERT_ALREADY_IN_HASH_TABLE),
-    "cert already in hash table"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_CRL_ALREADY_DELTA), "crl already delta"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_CRL_VERIFY_FAILURE),
-    "crl verify failure"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_DUPLICATE_ATTRIBUTE),
-    "duplicate attribute"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_ERROR_GETTING_MD_BY_NID),
-    "error getting md by nid"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_ERROR_USING_SIGINF_SET),
-    "error using siginf set"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_IDP_MISMATCH), "idp mismatch"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_ATTRIBUTES),
-    "invalid attributes"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_DIRECTORY), "invalid directory"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_DISTPOINT), "invalid distpoint"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_FIELD_NAME),
-    "invalid field name"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_TRUST), "invalid trust"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_ISSUER_MISMATCH), "issuer mismatch"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_KEY_TYPE_MISMATCH), "key type mismatch"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_KEY_VALUES_MISMATCH),
-    "key values mismatch"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_LOADING_CERT_DIR), "loading cert dir"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_LOADING_DEFAULTS), "loading defaults"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_METHOD_NOT_SUPPORTED),
-    "method not supported"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_NAME_TOO_LONG), "name too long"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_NEWER_CRL_NOT_NEWER),
-    "newer crl not newer"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CERTIFICATE_FOUND),
-    "no certificate found"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CERTIFICATE_OR_CRL_FOUND),
-    "no certificate or crl found"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CERT_SET_FOR_US_TO_VERIFY),
-    "no cert set for us to verify"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CRL_FOUND), "no crl found"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CRL_NUMBER), "no crl number"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_PUBLIC_KEY_DECODE_ERROR),
-    "public key decode error"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_PUBLIC_KEY_ENCODE_ERROR),
-    "public key encode error"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_SHOULD_RETRY), "should retry"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN),
-    "unable to find parameters in chain"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY),
-    "unable to get certs public key"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_KEY_TYPE), "unknown key type"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_NID), "unknown nid"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_PURPOSE_ID),
-    "unknown purpose id"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_SIGID_ALGS),
-    "unknown sigid algs"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_TRUST_ID), "unknown trust id"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNSUPPORTED_ALGORITHM),
-    "unsupported algorithm"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_UNSUPPORTED_VERSION),
-    "unsupported version"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_WRONG_LOOKUP_TYPE), "wrong lookup type"},
-    {ERR_PACK(ERR_LIB_X509, 0, X509_R_WRONG_TYPE), "wrong type"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_AKID_MISMATCH), "akid mismatch" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_BAD_SELECTOR), "bad selector" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_BAD_X509_FILETYPE), "bad x509 filetype" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_BASE64_DECODE_ERROR),
+        "base64 decode error" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_CANT_CHECK_DH_KEY), "can't check dh key" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_CERTIFICATE_VERIFICATION_FAILED),
+        "certificate verification failed" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_CERT_ALREADY_IN_HASH_TABLE),
+        "cert already in hash table" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_CRL_ALREADY_DELTA), "crl already delta" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_CRL_VERIFY_FAILURE),
+        "crl verify failure" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_DUPLICATE_ATTRIBUTE),
+        "duplicate attribute" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_ERROR_GETTING_MD_BY_NID),
+        "error getting md by nid" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_ERROR_USING_SIGINF_SET),
+        "error using siginf set" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_IDP_MISMATCH), "idp mismatch" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_ATTRIBUTES),
+        "invalid attributes" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_DIRECTORY), "invalid directory" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_DISTPOINT), "invalid distpoint" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_FIELD_NAME),
+        "invalid field name" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_INVALID_TRUST), "invalid trust" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_ISSUER_MISMATCH), "issuer mismatch" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_KEY_TYPE_MISMATCH), "key type mismatch" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_KEY_VALUES_MISMATCH),
+        "key values mismatch" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_LOADING_CERT_DIR), "loading cert dir" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_LOADING_DEFAULTS), "loading defaults" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_METHOD_NOT_SUPPORTED),
+        "method not supported" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_NAME_TOO_LONG), "name too long" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_NEWER_CRL_NOT_NEWER),
+        "newer crl not newer" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CERTIFICATE_FOUND),
+        "no certificate found" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CERTIFICATE_OR_CRL_FOUND),
+        "no certificate or crl found" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CERT_SET_FOR_US_TO_VERIFY),
+        "no cert set for us to verify" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CRL_FOUND), "no crl found" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_NO_CRL_NUMBER), "no crl number" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_PUBLIC_KEY_DECODE_ERROR),
+        "public key decode error" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_PUBLIC_KEY_ENCODE_ERROR),
+        "public key encode error" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_SHOULD_RETRY), "should retry" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN),
+        "unable to find parameters in chain" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY),
+        "unable to get certs public key" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_KEY_TYPE), "unknown key type" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_NID), "unknown nid" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_PURPOSE_ID),
+        "unknown purpose id" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_SIGID_ALGS),
+        "unknown sigid algs" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNKNOWN_TRUST_ID), "unknown trust id" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNSUPPORTED_ALGORITHM),
+        "unsupported algorithm" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_UNSUPPORTED_VERSION),
+        "unsupported version" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_WRONG_LOOKUP_TYPE), "wrong lookup type" },
+    { ERR_PACK(ERR_LIB_X509, 0, X509_R_WRONG_TYPE), "wrong type" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c
index a7b85857bdadc..e0b54d6daf88b 100644
--- a/crypto/x509/x509_ext.c
+++ b/crypto/x509/x509_ext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -27,7 +27,7 @@ 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)
 {
     return X509v3_get_ext_by_OBJ(x->crl.extensions, obj, lastpos);
 }
@@ -42,9 +42,21 @@ X509_EXTENSION *X509_CRL_get_ext(const X509_CRL *x, int loc)
     return X509v3_get_ext(x->crl.extensions, loc);
 }
 
+static X509_EXTENSION *delete_ext(STACK_OF(X509_EXTENSION) **sk, int loc)
+{
+    X509_EXTENSION *ret = X509v3_delete_ext(*sk, loc);
+
+    /* Empty extension lists are omitted. */
+    if (*sk != NULL && sk_X509_EXTENSION_num(*sk) == 0) {
+        sk_X509_EXTENSION_pop_free(*sk, X509_EXTENSION_free);
+        *sk = NULL;
+    }
+    return ret;
+}
+
 X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc)
 {
-    return X509v3_delete_ext(x->crl.extensions, loc);
+    return delete_ext(&x->crl.extensions, loc);
 }
 
 void *X509_CRL_get_ext_d2i(const X509_CRL *x, int nid, int *crit, int *idx)
@@ -53,7 +65,7 @@ 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)
 {
     return X509V3_add1_i2d(&x->crl.extensions, nid, value, crit, flags);
 }
@@ -80,8 +92,7 @@ int X509_get_ext_by_OBJ(const X509 *x, const ASN1_OBJECT *obj, int lastpos)
 
 int X509_get_ext_by_critical(const X509 *x, int crit, int lastpos)
 {
-    return (X509v3_get_ext_by_critical
-            (x->cert_info.extensions, crit, lastpos));
+    return (X509v3_get_ext_by_critical(x->cert_info.extensions, crit, lastpos));
 }
 
 X509_EXTENSION *X509_get_ext(const X509 *x, int loc)
@@ -91,7 +102,7 @@ X509_EXTENSION *X509_get_ext(const X509 *x, int loc)
 
 X509_EXTENSION *X509_delete_ext(X509 *x, int loc)
 {
-    return X509v3_delete_ext(x->cert_info.extensions, loc);
+    return delete_ext(&x->cert_info.extensions, loc);
 }
 
 int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc)
@@ -105,10 +116,10 @@ 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)
 {
     return X509V3_add1_i2d(&x->cert_info.extensions, nid, value, crit,
-                           flags);
+        flags);
 }
 
 int X509_REVOKED_get_ext_count(const X509_REVOKED *x)
@@ -122,7 +133,7 @@ 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)
 {
     return X509v3_get_ext_by_OBJ(x->extensions, obj, lastpos);
 }
@@ -139,7 +150,7 @@ X509_EXTENSION *X509_REVOKED_get_ext(const X509_REVOKED *x, int loc)
 
 X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *x, int loc)
 {
-    return X509v3_delete_ext(x->extensions, loc);
+    return delete_ext(&x->extensions, loc);
 }
 
 int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc)
@@ -153,7 +164,7 @@ void *X509_REVOKED_get_ext_d2i(const X509_REVOKED *x, int nid, int *crit, int *i
 }
 
 int X509_REVOKED_add1_ext_i2d(X509_REVOKED *x, int nid, void *value, int crit,
-                              unsigned long flags)
+    unsigned long flags)
 {
     return X509V3_add1_i2d(&x->extensions, nid, value, crit, flags);
 }
diff --git a/crypto/x509/x509_local.h b/crypto/x509/x509_local.h
index 1393da201339a..07c158369fa90 100644
--- a/crypto/x509/x509_local.h
+++ b/crypto/x509/x509_local.h
@@ -20,22 +20,22 @@
 
 struct X509_VERIFY_PARAM_st {
     char *name;
-    time_t check_time;          /* Time to use */
-    uint32_t inh_flags;         /* Inheritance flags */
-    unsigned long flags;        /* Various verify flags */
-    int purpose;                /* purpose to check untrusted certificates */
-    int trust;                  /* trust setting to check */
-    int depth;                  /* Verify depth */
-    int auth_level;             /* Security level for chain verification */
+    time_t check_time; /* Time to use */
+    uint32_t inh_flags; /* Inheritance flags */
+    unsigned long flags; /* Various verify flags */
+    int purpose; /* purpose to check untrusted certificates */
+    int trust; /* trust setting to check */
+    int depth; /* Verify depth */
+    int auth_level; /* Security level for chain verification */
     STACK_OF(ASN1_OBJECT) *policies; /* Permissible policies */
     /* Peer identity details */
     STACK_OF(OPENSSL_STRING) *hosts; /* Set of acceptable names */
-    unsigned int hostflags;     /* Flags to control matching features */
-    char *peername;             /* Matching hostname in peer certificate */
-    char *email;                /* If not NULL email address to match */
+    unsigned int hostflags; /* Flags to control matching features */
+    char *peername; /* Matching hostname in peer certificate */
+    char *email; /* If not NULL email address to match */
     size_t emaillen;
-    unsigned char *ip;          /* If not NULL IP address to match */
-    size_t iplen;               /* Length of IP address */
+    unsigned char *ip; /* If not NULL IP address to match */
+    size_t iplen; /* Length of IP address */
 };
 
 /* No error callback if depth < 0 */
@@ -60,50 +60,50 @@ struct X509_extension_st {
  * redirected to more efficient callbacks: for example a CRL entry database.
  */
 
-#define X509_CRL_METHOD_DYNAMIC         1
+#define X509_CRL_METHOD_DYNAMIC 1
 
 struct x509_crl_method_st {
     int flags;
-    int (*crl_init) (X509_CRL *crl);
-    int (*crl_free) (X509_CRL *crl);
-    int (*crl_lookup) (X509_CRL *crl, X509_REVOKED **ret,
-                       const ASN1_INTEGER *ser, const X509_NAME *issuer);
-    int (*crl_verify) (X509_CRL *crl, EVP_PKEY *pk);
+    int (*crl_init)(X509_CRL *crl);
+    int (*crl_free)(X509_CRL *crl);
+    int (*crl_lookup)(X509_CRL *crl, X509_REVOKED **ret,
+        const ASN1_INTEGER *ser, const X509_NAME *issuer);
+    int (*crl_verify)(X509_CRL *crl, EVP_PKEY *pk);
 };
 
 struct x509_lookup_method_st {
     char *name;
-    int (*new_item) (X509_LOOKUP *ctx);
-    void (*free) (X509_LOOKUP *ctx);
-    int (*init) (X509_LOOKUP *ctx);
-    int (*shutdown) (X509_LOOKUP *ctx);
-    int (*ctrl) (X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
-                 char **ret);
-    int (*get_by_subject) (X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                           const X509_NAME *name, X509_OBJECT *ret);
-    int (*get_by_issuer_serial) (X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                                 const X509_NAME *name,
-                                 const ASN1_INTEGER *serial,
-                                 X509_OBJECT *ret);
-    int (*get_by_fingerprint) (X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                               const unsigned char *bytes, int len,
-                               X509_OBJECT *ret);
-    int (*get_by_alias) (X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                         const char *str, int len, X509_OBJECT *ret);
-    int (*get_by_subject_ex) (X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                              const X509_NAME *name, X509_OBJECT *ret,
-                              OSSL_LIB_CTX *libctx, const char *propq);
-    int (*ctrl_ex) (X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
-                    char **ret, OSSL_LIB_CTX *libctx, const char *propq);
+    int (*new_item)(X509_LOOKUP *ctx);
+    void (*free)(X509_LOOKUP *ctx);
+    int (*init)(X509_LOOKUP *ctx);
+    int (*shutdown)(X509_LOOKUP *ctx);
+    int (*ctrl)(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
+        char **ret);
+    int (*get_by_subject)(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
+        const X509_NAME *name, X509_OBJECT *ret);
+    int (*get_by_issuer_serial)(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
+        const X509_NAME *name,
+        const ASN1_INTEGER *serial,
+        X509_OBJECT *ret);
+    int (*get_by_fingerprint)(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
+        const unsigned char *bytes, int len,
+        X509_OBJECT *ret);
+    int (*get_by_alias)(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
+        const char *str, int len, X509_OBJECT *ret);
+    int (*get_by_subject_ex)(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
+        const X509_NAME *name, X509_OBJECT *ret,
+        OSSL_LIB_CTX *libctx, const char *propq);
+    int (*ctrl_ex)(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
+        char **ret, OSSL_LIB_CTX *libctx, const char *propq);
 };
 
 /* This is the functions plus an instance of the local variables. */
 struct x509_lookup_st {
-    int init;                   /* have we been started */
-    int skip;                   /* don't use us. */
+    int init; /* have we been started */
+    int skip; /* don't use us. */
     X509_LOOKUP_METHOD *method; /* the functions */
-    void *method_data;          /* method data */
-    X509_STORE *store_ctx;      /* who owns us */
+    void *method_data; /* method data */
+    X509_STORE *store_ctx; /* who owns us */
 };
 
 /*
@@ -113,36 +113,36 @@ struct x509_lookup_st {
  */
 struct x509_store_st {
     /* The following is a cache of trusted certs */
-    int cache;                  /* if true, stash any hits */
+    int cache; /* if true, stash any hits */
     STACK_OF(X509_OBJECT) *objs; /* Cache of all objects */
     /* These are external lookup methods */
     STACK_OF(X509_LOOKUP) *get_cert_methods;
     X509_VERIFY_PARAM *param;
     /* 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);
     CRYPTO_EX_DATA ex_data;
     CRYPTO_REF_COUNT references;
     CRYPTO_RWLOCK *lock;
@@ -158,4 +158,5 @@ DEFINE_STACK_OF(STACK_OF_X509_NAME_ENTRY)
 int ossl_x509_likely_issued(X509 *issuer, X509 *subject);
 int ossl_x509_signing_allowed(const X509 *issuer, const X509 *subject);
 int ossl_x509_store_ctx_get_by_subject(const X509_STORE_CTX *ctx, X509_LOOKUP_TYPE type,
-                                       const X509_NAME *name, X509_OBJECT *ret);
+    const X509_NAME *name, X509_OBJECT *ret);
+int ossl_x509_store_read_lock(X509_STORE *xs);
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index 9270a0745fbb7..af8035bce8448 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -35,7 +35,7 @@ void X509_LOOKUP_free(X509_LOOKUP *ctx)
     if (ctx == NULL)
         return;
     if ((ctx->method != NULL) && (ctx->method->free != NULL))
-        (*ctx->method->free) (ctx);
+        (*ctx->method->free)(ctx);
     OPENSSL_free(ctx);
 }
 
@@ -44,7 +44,7 @@ int X509_STORE_lock(X509_STORE *xs)
     return CRYPTO_THREAD_write_lock(xs->lock);
 }
 
-static int x509_store_read_lock(X509_STORE *xs)
+int ossl_x509_store_read_lock(X509_STORE *xs)
 {
     return CRYPTO_THREAD_read_lock(xs->lock);
 }
@@ -75,7 +75,7 @@ int X509_LOOKUP_shutdown(X509_LOOKUP *ctx)
 }
 
 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)
 {
     if (ctx->method == NULL)
         return -1;
@@ -87,14 +87,14 @@ int X509_LOOKUP_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
 }
 
 int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
-                     char **ret)
+    char **ret)
 {
     return X509_LOOKUP_ctrl_ex(ctx, cmd, argc, argl, ret, NULL, NULL);
 }
 
 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)
 {
     if (ctx->skip
         || ctx->method == NULL
@@ -103,21 +103,21 @@ int X509_LOOKUP_by_subject_ex(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
         return 0;
     if (ctx->method->get_by_subject_ex != NULL)
         return ctx->method->get_by_subject_ex(ctx, type, name, ret, libctx,
-                                              propq);
+            propq);
     else
         return ctx->method->get_by_subject(ctx, type, name, ret);
 }
 
 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)
 {
     return X509_LOOKUP_by_subject_ex(ctx, type, name, ret, NULL, NULL);
 }
 
 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)
 {
     if ((ctx->method == NULL) || (ctx->method->get_by_issuer_serial == NULL))
         return 0;
@@ -125,8 +125,8 @@ int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
 }
 
 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)
 {
     if ((ctx->method == NULL) || (ctx->method->get_by_fingerprint == NULL))
         return 0;
@@ -134,7 +134,7 @@ int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
 }
 
 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)
 {
     if ((ctx->method == NULL) || (ctx->method->get_by_alias == NULL))
         return 0;
@@ -158,7 +158,7 @@ X509_STORE *X509_LOOKUP_get_store(const X509_LOOKUP *ctx)
 }
 
 static int x509_object_cmp(const X509_OBJECT *const *a,
-                           const X509_OBJECT *const *b)
+    const X509_OBJECT *const *b)
 {
     int ret;
 
@@ -296,8 +296,8 @@ X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *xs, X509_LOOKUP_METHOD *m)
 
 /* Also fill the cache (ctx->store->objs) with all matching certificates. */
 X509_OBJECT *X509_STORE_CTX_get_obj_by_subject(X509_STORE_CTX *ctx,
-                                               X509_LOOKUP_TYPE type,
-                                               const X509_NAME *name)
+    X509_LOOKUP_TYPE type,
+    const X509_NAME *name)
 {
     X509_OBJECT *ret = X509_OBJECT_new();
 
@@ -318,7 +318,7 @@ X509_OBJECT *X509_STORE_CTX_get_obj_by_subject(X509_STORE_CTX *ctx,
  * -1 on failure
  */
 int ossl_x509_store_ctx_get_by_subject(const X509_STORE_CTX *ctx, X509_LOOKUP_TYPE type,
-                                       const X509_NAME *name, X509_OBJECT *ret)
+    const X509_NAME *name, X509_OBJECT *ret)
 {
     X509_STORE *store = ctx->store;
     X509_LOOKUP *lu;
@@ -331,7 +331,7 @@ int ossl_x509_store_ctx_get_by_subject(const X509_STORE_CTX *ctx, X509_LOOKUP_TY
     stmp.type = X509_LU_NONE;
     stmp.data.x509 = NULL;
 
-    if (!x509_store_read_lock(store))
+    if (!ossl_x509_store_read_lock(store))
         return 0;
     /* Should already be sorted...but just in case */
     if (!sk_X509_OBJECT_is_sorted(store->objs)) {
@@ -356,7 +356,7 @@ int ossl_x509_store_ctx_get_by_subject(const X509_STORE_CTX *ctx, X509_LOOKUP_TY
             if (lu->method == NULL)
                 return -1;
             j = X509_LOOKUP_by_subject_ex(lu, type, name, &stmp,
-                                          ctx->libctx, ctx->propq);
+                ctx->libctx, ctx->propq);
             if (j != 0) { /* non-zero value is considered success here */
                 tmp = &stmp;
                 break;
@@ -377,8 +377,8 @@ int ossl_x509_store_ctx_get_by_subject(const X509_STORE_CTX *ctx, X509_LOOKUP_TY
 
 /* Also fill the cache |ctx->store->objs| with all matching certificates. */
 int X509_STORE_CTX_get_by_subject(const X509_STORE_CTX *ctx,
-                                  X509_LOOKUP_TYPE type,
-                                  const X509_NAME *name, X509_OBJECT *ret)
+    X509_LOOKUP_TYPE type,
+    const X509_NAME *name, X509_OBJECT *ret)
 {
     return ossl_x509_store_ctx_get_by_subject(ctx, type, name, ret) > 0;
 }
@@ -408,7 +408,6 @@ static int x509_store_add(X509_STORE *store, void *x, int crl)
     }
 
     if (!X509_STORE_lock(store)) {
-        obj->type = X509_LU_NONE;
         X509_OBJECT_free(obj);
         return 0;
     }
@@ -421,7 +420,7 @@ static int x509_store_add(X509_STORE *store, void *x, int crl)
     }
     X509_STORE_unlock(store);
 
-    if (added == 0)             /* obj not pushed */
+    if (added == 0) /* obj not pushed */
         X509_OBJECT_free(obj);
 
     return ret;
@@ -533,7 +532,7 @@ void X509_OBJECT_free(X509_OBJECT *a)
 
 /* Returns -1 if not found, but also on error */
 static int x509_object_idx_cnt(STACK_OF(X509_OBJECT) *h, X509_LOOKUP_TYPE type,
-                               const X509_NAME *name, int *pnmatch)
+    const X509_NAME *name, int *pnmatch)
 {
     X509_OBJECT stmp;
     X509 x509_s;
@@ -561,15 +560,15 @@ static int x509_object_idx_cnt(STACK_OF(X509_OBJECT) *h, X509_LOOKUP_TYPE type,
 
 /* Assumes h is locked for read if applicable */
 int X509_OBJECT_idx_by_subject(STACK_OF(X509_OBJECT) *h, X509_LOOKUP_TYPE type,
-                               const X509_NAME *name)
+    const X509_NAME *name)
 {
     return x509_object_idx_cnt(h, type, name, NULL);
 }
 
 /* Assumes h is locked for read if applicable */
 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)
 {
     int idx = X509_OBJECT_idx_by_subject(h, type, name);
 
@@ -604,11 +603,11 @@ STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *store)
         return NULL;
     }
 
-    if (!x509_store_read_lock(store))
+    if (!ossl_x509_store_read_lock(store))
         return NULL;
 
     objs = sk_X509_OBJECT_deep_copy(store->objs, x509_object_dup,
-                                    X509_OBJECT_free);
+        X509_OBJECT_free);
     X509_STORE_unlock(store);
     return objs;
 }
@@ -640,9 +639,9 @@ STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *store)
     X509_STORE_unlock(store);
     return sk;
 
- err:
+err:
     X509_STORE_unlock(store);
- out_free:
+out_free:
     OSSL_STACK_OF_X509_free(sk);
     return NULL;
 }
@@ -652,7 +651,7 @@ STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *store)
  * Returns NULL on internal/fatal error, empty stack if not found.
  */
 STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *ctx,
-                                          const X509_NAME *nm)
+    const X509_NAME *nm)
 {
     int i, idx, cnt;
     STACK_OF(X509) *sk = NULL;
@@ -695,14 +694,14 @@ STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *ctx,
             return NULL;
         }
     }
- end:
+end:
     X509_STORE_unlock(store);
     return sk;
 }
 
 /* Returns NULL on internal/fatal error, empty stack if not found */
 STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(const X509_STORE_CTX *ctx,
-                                             const X509_NAME *nm)
+    const X509_NAME *nm)
 {
     int i = 1, idx, cnt;
     STACK_OF(X509_CRL) *sk;
@@ -748,7 +747,7 @@ STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(const X509_STORE_CTX *ctx,
 }
 
 X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h,
-                                        X509_OBJECT *x)
+    X509_OBJECT *x)
 {
     int idx, i, num;
     X509_OBJECT *obj;
@@ -761,7 +760,7 @@ X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h,
     for (i = idx, num = sk_X509_OBJECT_num(h); i < num; i++) {
         obj = sk_X509_OBJECT_value(h, i);
         if (x509_object_cmp((const X509_OBJECT **)&obj,
-                            (const X509_OBJECT **)&x))
+                (const X509_OBJECT **)&x))
             return NULL;
         if (x->type == X509_LU_X509) {
             if (!X509_cmp(obj->data.x509, x->data.x509))
@@ -818,7 +817,7 @@ 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)
+    X509_STORE_CTX_verify_cb verify_cb)
 {
     xs->verify_cb = verify_cb;
 }
@@ -829,7 +828,7 @@ 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)
 {
     xs->get_issuer = get_issuer;
 }
@@ -840,7 +839,7 @@ 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)
 {
     xs->check_issued = check_issued;
 }
@@ -851,7 +850,7 @@ X509_STORE_CTX_check_issued_fn X509_STORE_get_check_issued(const X509_STORE *xs)
 }
 
 void X509_STORE_set_check_revocation(X509_STORE *xs,
-                                     X509_STORE_CTX_check_revocation_fn cb)
+    X509_STORE_CTX_check_revocation_fn cb)
 {
     xs->check_revocation = cb;
 }
@@ -862,7 +861,7 @@ X509_STORE_CTX_check_revocation_fn X509_STORE_get_check_revocation(const X509_ST
 }
 
 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)
 {
     xs->get_crl = get_crl;
 }
@@ -873,7 +872,7 @@ 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)
 {
     xs->check_crl = check_crl;
 }
@@ -884,7 +883,7 @@ 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)
 {
     xs->cert_crl = cert_crl;
 }
@@ -895,7 +894,7 @@ 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)
 {
     xs->check_policy = check_policy;
 }
@@ -906,7 +905,7 @@ X509_STORE_CTX_check_policy_fn X509_STORE_get_check_policy(const X509_STORE *xs)
 }
 
 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)
 {
     xs->lookup_certs = lookup_certs;
 }
@@ -917,7 +916,7 @@ X509_STORE_CTX_lookup_certs_fn X509_STORE_get_lookup_certs(const X509_STORE *xs)
 }
 
 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)
 {
     xs->lookup_crls = lookup_crls;
 }
@@ -928,7 +927,7 @@ 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)
 {
     xs->cleanup = cleanup;
 }
diff --git a/crypto/x509/x509_meth.c b/crypto/x509/x509_meth.c
index 305fe4c6d390c..e7b228a33f339 100644
--- a/crypto/x509/x509_meth.c
+++ b/crypto/x509/x509_meth.c
@@ -42,55 +42,51 @@ 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 (*new_item)(X509_LOOKUP *ctx))
 {
     method->new_item = new_item;
     return 1;
 }
 
-int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD* method))
-    (X509_LOOKUP *ctx)
+int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD *method))(X509_LOOKUP *ctx)
 {
     return method->new_item;
 }
 
 int X509_LOOKUP_meth_set_free(
     X509_LOOKUP_METHOD *method,
-    void (*free_fn) (X509_LOOKUP *ctx))
+    void (*free_fn)(X509_LOOKUP *ctx))
 {
     method->free = free_fn;
     return 1;
 }
 
-void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD* method))
-    (X509_LOOKUP *ctx)
+void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD *method))(X509_LOOKUP *ctx)
 {
     return method->free;
 }
 
 int X509_LOOKUP_meth_set_init(X509_LOOKUP_METHOD *method,
-                              int (*init) (X509_LOOKUP *ctx))
+    int (*init)(X509_LOOKUP *ctx))
 {
     method->init = init;
     return 1;
 }
 
-int (*X509_LOOKUP_meth_get_init(const X509_LOOKUP_METHOD* method))
-    (X509_LOOKUP *ctx)
+int (*X509_LOOKUP_meth_get_init(const X509_LOOKUP_METHOD *method))(X509_LOOKUP *ctx)
 {
     return method->init;
 }
 
 int X509_LOOKUP_meth_set_shutdown(
     X509_LOOKUP_METHOD *method,
-    int (*shutdown) (X509_LOOKUP *ctx))
+    int (*shutdown)(X509_LOOKUP *ctx))
 {
     method->shutdown = shutdown;
     return 1;
 }
 
-int (*X509_LOOKUP_meth_get_shutdown(const X509_LOOKUP_METHOD* method))
-    (X509_LOOKUP *ctx)
+int (*X509_LOOKUP_meth_get_shutdown(const X509_LOOKUP_METHOD *method))(X509_LOOKUP *ctx)
 {
     return method->shutdown;
 }
@@ -121,7 +117,6 @@ X509_LOOKUP_get_by_subject_fn X509_LOOKUP_meth_get_get_by_subject(
     return method->get_by_subject;
 }
 
-
 int X509_LOOKUP_meth_set_get_by_issuer_serial(X509_LOOKUP_METHOD *method,
     X509_LOOKUP_get_by_issuer_serial_fn get_by_issuer_serial)
 {
@@ -130,12 +125,11 @@ int X509_LOOKUP_meth_set_get_by_issuer_serial(X509_LOOKUP_METHOD *method,
 }
 
 X509_LOOKUP_get_by_issuer_serial_fn
-    X509_LOOKUP_meth_get_get_by_issuer_serial(const X509_LOOKUP_METHOD *method)
+X509_LOOKUP_meth_get_get_by_issuer_serial(const X509_LOOKUP_METHOD *method)
 {
     return method->get_by_issuer_serial;
 }
 
-
 int X509_LOOKUP_meth_set_get_by_fingerprint(X509_LOOKUP_METHOD *method,
     X509_LOOKUP_get_by_fingerprint_fn get_by_fingerprint)
 {
@@ -150,7 +144,7 @@ X509_LOOKUP_get_by_fingerprint_fn X509_LOOKUP_meth_get_get_by_fingerprint(
 }
 
 int X509_LOOKUP_meth_set_get_by_alias(X509_LOOKUP_METHOD *method,
-                                      X509_LOOKUP_get_by_alias_fn get_by_alias)
+    X509_LOOKUP_get_by_alias_fn get_by_alias)
 {
     method->get_by_alias = get_by_alias;
     return 1;
@@ -161,4 +155,3 @@ X509_LOOKUP_get_by_alias_fn X509_LOOKUP_meth_get_get_by_alias(
 {
     return method->get_by_alias;
 }
-
diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index a55ee1a73e231..2b313dd52be90 100644
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -20,7 +20,7 @@
  * anything encountered in practice.
  */
 
-#define NAME_ONELINE_MAX    (1024 * 1024)
+#define NAME_ONELINE_MAX (1024 * 1024)
 
 char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
 {
@@ -58,7 +58,7 @@ char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
         return buf;
     }
 
-    len--;                      /* space for '\0' */
+    len--; /* space for '\0' */
     l = 0;
     for (i = 0; i < sk_X509_NAME_ENTRY_num(a->entries); i++) {
         ne = sk_X509_NAME_ENTRY_value(a->entries, i);
@@ -77,11 +77,7 @@ char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
         }
         q = ne->value->data;
 #ifdef CHARSET_EBCDIC
-        if (type == V_ASN1_GENERALSTRING ||
-            type == V_ASN1_VISIBLESTRING ||
-            type == V_ASN1_PRINTABLESTRING ||
-            type == V_ASN1_TELETEXSTRING ||
-            type == V_ASN1_IA5STRING) {
+        if (type == V_ASN1_GENERALSTRING || type == V_ASN1_VISIBLESTRING || type == V_ASN1_PRINTABLESTRING || type == V_ASN1_TELETEXSTRING || type == V_ASN1_IA5STRING) {
             if (num > (int)sizeof(ebcdic_buf))
                 num = sizeof(ebcdic_buf);
             ascii2ebcdic(ebcdic_buf, q, num);
@@ -110,8 +106,7 @@ char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
             l2++;
             if (q[j] == '/' || q[j] == '+')
                 l2++; /* char needs to be escaped */
-            else if ((ossl_toascii(q[j]) < ossl_toascii(' ')) ||
-                     (ossl_toascii(q[j]) > ossl_toascii('~')))
+            else if ((ossl_toascii(q[j]) < ossl_toascii(' ')) || (ossl_toascii(q[j]) > ossl_toascii('~')))
                 l2 += 3;
         }
 
@@ -134,7 +129,7 @@ char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
         p += l1;
         *(p++) = '=';
 
-#ifndef CHARSET_EBCDIC          /* q was assigned above already. */
+#ifndef CHARSET_EBCDIC /* q was assigned above already. */
         q = ne->value->data;
 #endif
 
@@ -176,9 +171,9 @@ char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
     if (i == 0)
         *p = '\0';
     return p;
- buferr:
+buferr:
     ERR_raise(ERR_LIB_X509, ERR_R_BUF_LIB);
- end:
+end:
     BUF_MEM_free(b);
     return NULL;
 }
diff --git a/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c
index a6ea8e36a0301..b373a2caa420b 100644
--- a/crypto/x509/x509_r2x.c
+++ b/crypto/x509/x509_r2x.c
@@ -37,8 +37,8 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
             goto err;
         if (!ASN1_INTEGER_set(xi->version, 2))
             goto err;
-/*-     xi->extensions=ri->attributes; <- bad, should not ever be done
-        ri->attributes=NULL; */
+        /*-     xi->extensions=ri->attributes; <- bad, should not ever be done
+                ri->attributes=NULL; */
     }
 
     xn = X509_REQ_get_subject_name(r);
@@ -49,8 +49,7 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
 
     if (X509_gmtime_adj(xi->validity.notBefore, 0) == NULL)
         goto err;
-    if (X509_gmtime_adj(xi->validity.notAfter, (long)60 * 60 * 24 * days) ==
-        NULL)
+    if (X509_gmtime_adj(xi->validity.notAfter, (long)60 * 60 * 24 * days) == NULL)
         goto err;
 
     pubkey = X509_REQ_get0_pubkey(r);
@@ -61,7 +60,7 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
         goto err;
     return ret;
 
- err:
+err:
     X509_free(ret);
     return NULL;
 }
diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
index 4085b587a5e18..b968c3f41ba00 100644
--- a/crypto/x509/x509_req.c
+++ b/crypto/x509/x509_req.c
@@ -38,7 +38,7 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
     ri->version->data = OPENSSL_malloc(1);
     if (ri->version->data == NULL)
         goto err;
-    ri->version->data[0] = 0;   /* version == 0 */
+    ri->version->data[0] = 0; /* version == 0 */
 
     if (!X509_REQ_set_subject_name(ret, X509_get_subject_name(x)))
         goto err;
@@ -55,7 +55,7 @@ X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
             goto err;
     }
     return ret;
- err:
+err:
     X509_REQ_free(ret);
     return NULL;
 }
@@ -118,7 +118,7 @@ void X509_REQ_set_extension_nids(int *nids)
 }
 
 static STACK_OF(X509_EXTENSION) *get_extensions_by_nid(const X509_REQ *req,
-                                                       int nid)
+    int nid)
 {
     X509_ATTRIBUTE *attr;
     ASN1_TYPE *ext = NULL;
@@ -136,7 +136,7 @@ static STACK_OF(X509_EXTENSION) *get_extensions_by_nid(const X509_REQ *req,
     p = ext->value.sequence->data;
     return (STACK_OF(X509_EXTENSION) *)
         ASN1_item_d2i(NULL, &p, ext->value.sequence->length,
-                      ASN1_ITEM_rptr(X509_EXTENSIONS));
+            ASN1_ITEM_rptr(X509_EXTENSIONS));
 }
 
 STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(OSSL_FUTURE_CONST X509_REQ *req)
@@ -163,7 +163,7 @@ STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(OSSL_FUTURE_CONST X509_REQ *re
  * in case we want to create a non standard one.
  */
 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 extlen;
     int rv = 0;
@@ -183,9 +183,8 @@ int X509_REQ_add_extensions_nid(X509_REQ *req,
     }
 
     /* Generate encoding of extensions */
-    extlen = ASN1_item_i2d((const ASN1_VALUE *)
-                           (mod_exts == NULL ? exts : mod_exts),
-                           &ext, ASN1_ITEM_rptr(X509_EXTENSIONS));
+    extlen = ASN1_item_i2d((const ASN1_VALUE *)(mod_exts == NULL ? exts : mod_exts),
+        &ext, ASN1_ITEM_rptr(X509_EXTENSIONS));
     if (extlen <= 0)
         goto end;
     if (mod_exts != NULL) {
@@ -199,7 +198,7 @@ int X509_REQ_add_extensions_nid(X509_REQ *req,
     rv = X509_REQ_add1_attr_by_NID(req, nid, V_ASN1_SEQUENCE, ext, extlen);
     OPENSSL_free(ext);
 
- end:
+end:
     sk_X509_EXTENSION_pop_free(mod_exts, X509_EXTENSION_free);
     return rv;
 }
@@ -223,7 +222,7 @@ 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)
 {
     return X509at_get_attr_by_OBJ(req->req_info.attributes, obj, lastpos);
 }
@@ -260,45 +259,45 @@ 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)
 {
     if (req == NULL) {
         ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
         return 0;
     }
     if (!X509at_add1_attr_by_OBJ(&req->req_info.attributes, obj,
-                                 type, bytes, len))
+            type, bytes, len))
         return 0;
     req->req_info.enc.modified = 1;
     return 1;
 }
 
 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)
 {
     if (req == NULL) {
         ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
         return 0;
     }
     if (!X509at_add1_attr_by_NID(&req->req_info.attributes, nid,
-                                 type, bytes, len))
+            type, bytes, len))
         return 0;
     req->req_info.enc.modified = 1;
     return 1;
 }
 
 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)
 {
     if (req == NULL) {
         ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
         return 0;
     }
     if (!X509at_add1_attr_by_txt(&req->req_info.attributes, attrname,
-                                 type, bytes, len))
+            type, bytes, len))
         return 0;
     req->req_info.enc.modified = 1;
     return 1;
@@ -315,7 +314,7 @@ X509_NAME *X509_REQ_get_subject_name(const X509_REQ *req)
 }
 
 void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
-                             const X509_ALGOR **palg)
+    const X509_ALGOR **palg)
 {
     if (psig != NULL)
         *psig = req->signature;
diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index 0c9df51b3c7ea..e6912748ccdc4 100644
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.c
@@ -91,7 +91,7 @@ int X509_set1_notBefore(X509 *x, const ASN1_TIME *tm)
     if (x == NULL || tm == NULL)
         return 0;
     return ossl_x509_set1_time(&x->cert_info.enc.modified,
-                               &x->cert_info.validity.notBefore, tm);
+        &x->cert_info.validity.notBefore, tm);
 }
 
 int X509_set1_notAfter(X509 *x, const ASN1_TIME *tm)
@@ -99,7 +99,7 @@ int X509_set1_notAfter(X509 *x, const ASN1_TIME *tm)
     if (x == NULL || tm == NULL)
         return 0;
     return ossl_x509_set1_time(&x->cert_info.enc.modified,
-                               &x->cert_info.validity.notAfter, tm);
+        &x->cert_info.validity.notAfter, tm);
 }
 
 int X509_set_pubkey(X509 *x, EVP_PKEY *pkey)
@@ -165,7 +165,7 @@ 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)
 {
     if (piuid != NULL)
         *piuid = x->cert_info.issuerUID;
@@ -179,7 +179,7 @@ const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *x)
 }
 
 int X509_SIG_INFO_get(const X509_SIG_INFO *siginf, int *mdnid, int *pknid,
-                      int *secbits, uint32_t *flags)
+    int *secbits, uint32_t *flags)
 {
     if (mdnid != NULL)
         *mdnid = siginf->mdnid;
@@ -193,7 +193,7 @@ int X509_SIG_INFO_get(const X509_SIG_INFO *siginf, int *mdnid, int *pknid,
 }
 
 void X509_SIG_INFO_set(X509_SIG_INFO *siginf, int mdnid, int pknid,
-                       int secbits, uint32_t flags)
+    int secbits, uint32_t flags)
 {
     siginf->mdnid = mdnid;
     siginf->pknid = pknid;
@@ -202,7 +202,7 @@ void X509_SIG_INFO_set(X509_SIG_INFO *siginf, int mdnid, int pknid,
 }
 
 int X509_get_signature_info(X509 *x, int *mdnid, int *pknid, int *secbits,
-                            uint32_t *flags)
+    uint32_t *flags)
 {
     X509_check_purpose(x, -1, -1);
     return X509_SIG_INFO_get(&x->siginf, mdnid, pknid, secbits, flags);
@@ -210,7 +210,7 @@ int X509_get_signature_info(X509 *x, int *mdnid, int *pknid, int *secbits,
 
 /* Modify *siginf according to alg and sig. Return 1 on success, else 0. */
 static int x509_sig_info_init(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
-                              const ASN1_STRING *sig, const EVP_PKEY *pubkey)
+    const ASN1_STRING *sig, const EVP_PKEY *pubkey)
 {
     int pknid, mdnid, md_size;
     const EVP_MD *md;
@@ -221,7 +221,7 @@ static int x509_sig_info_init(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
     siginf->secbits = -1;
     siginf->flags = 0;
     if (!OBJ_find_sigid_algs(OBJ_obj2nid(alg->algorithm), &mdnid, &pknid)
-            || pknid == NID_undef) {
+        || pknid == NID_undef) {
         ERR_raise(ERR_LIB_X509, X509_R_UNKNOWN_SIGID_ALGS);
         return 0;
     }
@@ -233,8 +233,8 @@ static int x509_sig_info_init(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
         /* If we have one, use a custom handler for this algorithm */
         ameth = EVP_PKEY_asn1_find(NULL, pknid);
         if (ameth != NULL && ameth->siginf_set != NULL
-                && ameth->siginf_set(siginf, alg, sig))
-           break;
+            && ameth->siginf_set(siginf, alg, sig))
+            break;
         if (pubkey != NULL) {
             int secbits;
 
@@ -300,5 +300,5 @@ static int x509_sig_info_init(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
 int ossl_x509_init_sig_info(X509 *x)
 {
     return x509_sig_info_init(&x->siginf, &x->sig_alg, &x->signature,
-                              X509_PUBKEY_get0(x->cert_info.key));
+        X509_PUBKEY_get0(x->cert_info.key));
 }
diff --git a/crypto/x509/x509_trust.c b/crypto/x509/x509_trust.c
index 1a4345f2fec0a..5c8c81764e6cf 100644
--- a/crypto/x509/x509_trust.c
+++ b/crypto/x509/x509_trust.c
@@ -20,7 +20,7 @@ static int trust_1oid(X509_TRUST *trust, X509 *x, int flags);
 static int trust_compat(X509_TRUST *trust, X509 *x, int flags);
 
 static int obj_trust(int id, X509 *x, int flags);
-static int (*default_trust) (int id, X509 *x, int flags) = obj_trust;
+static int (*default_trust)(int id, X509 *x, int flags) = obj_trust;
 
 /*
  * WARNING: the following table should be kept in order of trust and without
@@ -29,23 +29,23 @@ static int (*default_trust) (int id, X509 *x, int flags) = obj_trust;
  */
 
 static X509_TRUST trstandard[] = {
-    {X509_TRUST_COMPAT, 0, trust_compat, "compatible", 0, NULL},
-    {X509_TRUST_SSL_CLIENT, 0, trust_1oidany, "SSL Client", NID_client_auth,
-     NULL},
-    {X509_TRUST_SSL_SERVER, 0, trust_1oidany, "SSL Server", NID_server_auth,
-     NULL},
-    {X509_TRUST_EMAIL, 0, trust_1oidany, "S/MIME email", NID_email_protect,
-     NULL},
-    {X509_TRUST_OBJECT_SIGN, 0, trust_1oidany, "Object Signer", NID_code_sign,
-     NULL},
-    {X509_TRUST_OCSP_SIGN, 0, trust_1oid, "OCSP responder", NID_OCSP_sign,
-     NULL},
-    {X509_TRUST_OCSP_REQUEST, 0, trust_1oid, "OCSP request", NID_ad_OCSP,
-     NULL},
-    {X509_TRUST_TSA, 0, trust_1oidany, "TSA server", NID_time_stamp, NULL}
+    { X509_TRUST_COMPAT, 0, trust_compat, "compatible", 0, NULL },
+    { X509_TRUST_SSL_CLIENT, 0, trust_1oidany, "SSL Client", NID_client_auth,
+        NULL },
+    { X509_TRUST_SSL_SERVER, 0, trust_1oidany, "SSL Server", NID_server_auth,
+        NULL },
+    { X509_TRUST_EMAIL, 0, trust_1oidany, "S/MIME email", NID_email_protect,
+        NULL },
+    { X509_TRUST_OBJECT_SIGN, 0, trust_1oidany, "Object Signer", NID_code_sign,
+        NULL },
+    { X509_TRUST_OCSP_SIGN, 0, trust_1oid, "OCSP responder", NID_OCSP_sign,
+        NULL },
+    { X509_TRUST_OCSP_REQUEST, 0, trust_1oid, "OCSP request", NID_ad_OCSP,
+        NULL },
+    { X509_TRUST_TSA, 0, trust_1oidany, "TSA server", NID_time_stamp, NULL }
 };
 
-#define X509_TRUST_COUNT        OSSL_NELEM(trstandard)
+#define X509_TRUST_COUNT OSSL_NELEM(trstandard)
 
 static STACK_OF(X509_TRUST) *trtable = NULL;
 
@@ -54,9 +54,10 @@ static int tr_cmp(const X509_TRUST *const *a, const X509_TRUST *const *b)
     return (*a)->trust - (*b)->trust;
 }
 
-int (*X509_TRUST_set_default(int (*trust) (int, X509 *, int))) (int, X509 *,
-                                                                int) {
-    int (*oldtrust) (int, X509 *, int);
+int (*X509_TRUST_set_default(int (*trust)(int, X509 *, int)))(int, X509 *,
+    int)
+{
+    int (*oldtrust)(int, X509 *, int);
     oldtrust = default_trust;
     default_trust = trust;
     return oldtrust;
@@ -71,7 +72,7 @@ int X509_check_trust(X509 *x, int id, int flags)
     /* We get this as a default value */
     if (id == X509_TRUST_DEFAULT)
         return obj_trust(NID_anyExtendedKeyUsage, x,
-                         flags | X509_TRUST_DO_SS_COMPAT);
+            flags | X509_TRUST_DO_SS_COMPAT);
     idx = X509_TRUST_get_by_id(id);
     if (idx < 0)
         return default_trust(id, x, flags);
@@ -123,8 +124,8 @@ int X509_TRUST_set(int *t, int trust)
     return 1;
 }
 
-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)
 {
     int idx;
     X509_TRUST *trtmp;
@@ -173,7 +174,7 @@ int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int),
         }
     }
     return 1;
- err:
+err:
     if (idx < 0) {
         OPENSSL_free(trtmp->name);
         OPENSSL_free(trtmp);
@@ -257,8 +258,7 @@ static int obj_trust(int id, X509 *x, int flags)
             ASN1_OBJECT *obj = sk_ASN1_OBJECT_value(ax->reject, i);
             int nid = OBJ_obj2nid(obj);
 
-            if (nid == id || (nid == NID_anyExtendedKeyUsage &&
-                (flags & X509_TRUST_OK_ANY_EKU)))
+            if (nid == id || (nid == NID_anyExtendedKeyUsage && (flags & X509_TRUST_OK_ANY_EKU)))
                 return X509_TRUST_REJECTED;
         }
     }
@@ -268,8 +268,7 @@ static int obj_trust(int id, X509 *x, int flags)
             ASN1_OBJECT *obj = sk_ASN1_OBJECT_value(ax->trust, i);
             int nid = OBJ_obj2nid(obj);
 
-            if (nid == id || (nid == NID_anyExtendedKeyUsage &&
-                (flags & X509_TRUST_OK_ANY_EKU)))
+            if (nid == id || (nid == NID_anyExtendedKeyUsage && (flags & X509_TRUST_OK_ANY_EKU)))
                 return X509_TRUST_TRUSTED;
         }
         /*
diff --git a/crypto/x509/x509_txt.c b/crypto/x509/x509_txt.c
index e825ce2db8b98..b88bd290d0af5 100644
--- a/crypto/x509/x509_txt.c
+++ b/crypto/x509/x509_txt.c
@@ -102,8 +102,7 @@ const char *X509_verify_cert_error_string(long n)
     case X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE:
         return "key usage does not include digital signature";
     case X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED:
-        return
-            "proxy certificates not allowed, please set the appropriate flag";
+        return "proxy certificates not allowed, please set the appropriate flag";
     case X509_V_ERR_INVALID_EXTENSION:
         return "invalid or inconsistent certificate extension";
     case X509_V_ERR_INVALID_POLICY_EXTENSION:
diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
index 9c4ee2bf5fffa..611a5dabd6183 100644
--- a/crypto/x509/x509_v3.c
+++ b/crypto/x509/x509_v3.c
@@ -28,7 +28,7 @@ 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 lastpos)
 {
     ASN1_OBJECT *obj;
 
@@ -39,7 +39,7 @@ int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x, int nid,
 }
 
 int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk,
-                          const ASN1_OBJECT *obj, int lastpos)
+    const ASN1_OBJECT *obj, int lastpos)
 {
     int n;
     X509_EXTENSION *ex;
@@ -59,7 +59,7 @@ int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *sk,
 }
 
 int X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *sk, int crit,
-                               int lastpos)
+    int lastpos)
 {
     int n, c;
     X509_EXTENSION *ex;
@@ -99,7 +99,7 @@ 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)
 {
     X509_EXTENSION *new_ex = NULL;
     int n;
@@ -135,7 +135,7 @@ STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
     if (*x == NULL)
         *x = sk;
     return sk;
- err:
+err:
     X509_EXTENSION_free(new_ex);
     if (x != NULL && *x == NULL)
         sk_X509_EXTENSION_free(sk);
@@ -144,7 +144,7 @@ STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
 
 /* This returns NULL also in non-error case *target == NULL && sk_X509_EXTENSION_num(exts) <= 0 */
 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 i;
 
@@ -173,8 +173,8 @@ STACK_OF(X509_EXTENSION) *X509v3_add_extensions(STACK_OF(X509_EXTENSION) **targe
 }
 
 X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid,
-                                             int crit,
-                                             ASN1_OCTET_STRING *data)
+    int crit,
+    ASN1_OCTET_STRING *data)
 {
     ASN1_OBJECT *obj;
     X509_EXTENSION *ret;
@@ -191,8 +191,8 @@ X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex, int nid,
 }
 
 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)
 {
     X509_EXTENSION *ret;
 
@@ -214,7 +214,7 @@ X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
     if ((ex != NULL) && (*ex == NULL))
         *ex = ret;
     return ret;
- err:
+err:
     if ((ex == NULL) || (ret != *ex))
         X509_EXTENSION_free(ret);
     return NULL;
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 5cdf929e4f1e5..8f1b9f58cacdb 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -30,16 +30,16 @@
 
 /* CRL score values */
 
-#define CRL_SCORE_NOCRITICAL    0x100 /* No unhandled critical extensions */
-#define CRL_SCORE_SCOPE         0x080 /* certificate is within CRL scope */
-#define CRL_SCORE_TIME          0x040 /* CRL times valid */
-#define CRL_SCORE_ISSUER_NAME   0x020 /* Issuer name matches certificate */
+#define CRL_SCORE_NOCRITICAL 0x100 /* No unhandled critical extensions */
+#define CRL_SCORE_SCOPE 0x080 /* certificate is within CRL scope */
+#define CRL_SCORE_TIME 0x040 /* CRL times valid */
+#define CRL_SCORE_ISSUER_NAME 0x020 /* Issuer name matches certificate */
 #define CRL_SCORE_VALID /* If this score or above CRL is probably valid */ \
     (CRL_SCORE_NOCRITICAL | CRL_SCORE_TIME | CRL_SCORE_SCOPE)
-#define CRL_SCORE_ISSUER_CERT   0x018 /* CRL issuer is certificate issuer */
-#define CRL_SCORE_SAME_PATH     0x008 /* CRL issuer is on certificate path */
-#define CRL_SCORE_AKID          0x004 /* CRL issuer matches CRL AKID */
-#define CRL_SCORE_TIME_DELTA    0x002 /* Have a delta CRL with valid times */
+#define CRL_SCORE_ISSUER_CERT 0x018 /* CRL issuer is certificate issuer */
+#define CRL_SCORE_SAME_PATH 0x008 /* CRL issuer is on certificate path */
+#define CRL_SCORE_AKID 0x004 /* CRL issuer matches CRL AKID */
+#define CRL_SCORE_TIME_DELTA 0x002 /* Have a delta CRL with valid times */
 
 static int x509_verify_x509(X509_STORE_CTX *ctx);
 static int x509_verify_rpk(X509_STORE_CTX *ctx);
@@ -64,20 +64,20 @@ static int check_sig_level(X509_STORE_CTX *ctx, X509 *cert);
 static int check_curve(X509 *cert);
 
 static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer,
-                         unsigned int *preasons, X509_CRL *crl, X509 *x);
+    unsigned int *preasons, X509_CRL *crl, X509 *x);
 static int get_crl_delta(X509_STORE_CTX *ctx,
-                         X509_CRL **pcrl, X509_CRL **pdcrl, X509 *x);
+    X509_CRL **pcrl, X509_CRL **pdcrl, X509 *x);
 static void get_delta_sk(X509_STORE_CTX *ctx, X509_CRL **dcrl,
-                         int *pcrl_score, X509_CRL *base,
-                         STACK_OF(X509_CRL) *crls);
+    int *pcrl_score, X509_CRL *base,
+    STACK_OF(X509_CRL) *crls);
 static void crl_akid_check(X509_STORE_CTX *ctx, X509_CRL *crl, X509 **pissuer,
-                           int *pcrl_score);
+    int *pcrl_score);
 static int crl_crldp_check(X509 *x, X509_CRL *crl, int crl_score,
-                           unsigned int *preasons);
+    unsigned int *preasons);
 static int check_crl_path(X509_STORE_CTX *ctx, X509 *x);
 static int check_crl_chain(X509_STORE_CTX *ctx,
-                           STACK_OF(X509) *cert_path,
-                           STACK_OF(X509) *crl_path);
+    STACK_OF(X509) *cert_path,
+    STACK_OF(X509) *crl_path);
 
 static int internal_verify(X509_STORE_CTX *ctx);
 
@@ -167,9 +167,9 @@ static int verify_cb_cert(X509_STORE_CTX *ctx, X509 *x, int depth, int err)
     return ctx->verify_cb(0, ctx);
 }
 
-#define CB_FAIL_IF(cond, ctx, cert, depth, err) \
+#define CB_FAIL_IF(cond, ctx, cert, depth, err)               \
     if ((cond) && verify_cb_cert(ctx, cert, depth, err) == 0) \
-        return 0
+    return 0
 
 /*-
  * Inform the verify callback of an error, CRL-specific variant.  Here, the
@@ -201,13 +201,13 @@ static int check_auth_level(X509_STORE_CTX *ctx)
          * check the security of issuer keys.
          */
         CB_FAIL_IF(i > 0 && !check_cert_key_level(ctx, cert),
-                   ctx, cert, i, X509_V_ERR_CA_KEY_TOO_SMALL);
+            ctx, cert, i, X509_V_ERR_CA_KEY_TOO_SMALL);
         /*
          * We also check the signature algorithm security of all certificates
          * except those of the trust anchor at index num-1.
          */
         CB_FAIL_IF(i < num - 1 && !check_sig_level(ctx, cert),
-                   ctx, cert, i, X509_V_ERR_CA_MD_TOO_WEAK);
+            ctx, cert, i, X509_V_ERR_CA_MD_TOO_WEAK);
     }
     return 1;
 }
@@ -225,7 +225,6 @@ static int verify_rpk(X509_STORE_CTX *ctx)
     return !!ctx->verify_cb(ctx->error == X509_V_OK, ctx);
 }
 
-
 /*-
  * Returns -1 on internal error.
  * Sadly, returns 0 also on internal error in ctx->verify_cb().
@@ -244,7 +243,7 @@ static int verify_chain(X509_STORE_CTX *ctx)
         return ok;
 
     err = X509_chain_check_suiteb(&ctx->error_depth, NULL, ctx->chain,
-                                  ctx->param->flags);
+        ctx->param->flags);
     CB_FAIL_IF(err != X509_V_OK, ctx, NULL, ctx->error_depth, err);
 
     /* Verify chain signatures and expiration times */
@@ -351,7 +350,7 @@ static int x509_verify_x509(X509_STORE_CTX *ctx)
 
     /* If the peer's public key is too weak, we can stop early. */
     CB_FAIL_IF(!check_cert_key_level(ctx, ctx->cert),
-               ctx, ctx->cert, 0, X509_V_ERR_EE_KEY_TOO_SMALL);
+        ctx, ctx->cert, 0, X509_V_ERR_EE_KEY_TOO_SMALL);
 
     ret = DANETLS_ENABLED(ctx->dane) ? dane_verify(ctx) : verify_chain(ctx);
 
@@ -387,10 +386,10 @@ static int sk_X509_contains(STACK_OF(X509) *sk, X509 *cert)
  * Likely it would be good if build_chain() sets |check_signing_allowed|.
  * Yet if |sk| is a list of trusted certs, as with X509_STORE_CTX_set0_trusted_stack(),
  * better not set |check_signing_allowed|.
- * Maybe not touch X509_STORE_CTX_get1_issuer(), for API backward compatiblity.
+ * Maybe not touch X509_STORE_CTX_get1_issuer(), for API backward compatibility.
  */
 static X509 *get0_best_issuer_sk(X509_STORE_CTX *ctx, int check_signing_allowed,
-                                 int no_dup, STACK_OF(X509) *sk, X509 *x)
+    int no_dup, STACK_OF(X509) *sk, X509 *x)
 {
     int i;
     X509 *candidate, *issuer = NULL;
@@ -413,8 +412,9 @@ static X509 *get0_best_issuer_sk(X509_STORE_CTX *ctx, int check_signing_allowed,
              * date so we return nearest match if no certificate time is OK.
              */
             if (issuer == NULL
-                    || ASN1_TIME_compare(X509_get0_notAfter(candidate),
-                                         X509_get0_notAfter(issuer)) > 0)
+                || ASN1_TIME_compare(X509_get0_notAfter(candidate),
+                       X509_get0_notAfter(issuer))
+                    > 0)
                 issuer = candidate;
         }
     }
@@ -462,7 +462,7 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x)
     if (*issuer != NULL)
         ret = X509_up_ref(*issuer) ? 1 : -1;
     OSSL_STACK_OF_X509_free(certs);
- end:
+end:
     X509_OBJECT_free(obj);
     return ret;
 }
@@ -524,7 +524,7 @@ static STACK_OF(X509) *lookup_certs_sk(X509_STORE_CTX *ctx, const X509_NAME *nm)
  * Sadly, returns 0 also on internal error in ctx->verify_cb().
  */
 static int check_purpose(X509_STORE_CTX *ctx, X509 *x, int purpose, int depth,
-                         int must_be_ca)
+    int must_be_ca)
 {
     int tr_ok = X509_TRUST_UNTRUSTED;
 
@@ -597,24 +597,23 @@ static int check_extensions(X509_STORE_CTX *ctx)
         allow_proxy_certs = 0;
         purpose = X509_PURPOSE_CRL_SIGN;
     } else {
-        allow_proxy_certs =
-            (ctx->param->flags & X509_V_FLAG_ALLOW_PROXY_CERTS) != 0;
+        allow_proxy_certs = (ctx->param->flags & X509_V_FLAG_ALLOW_PROXY_CERTS) != 0;
         purpose = ctx->param->purpose;
     }
 
     for (i = 0; i < num; i++) {
         x = sk_X509_value(ctx->chain, i);
         CB_FAIL_IF((ctx->param->flags & X509_V_FLAG_IGNORE_CRITICAL) == 0
-                       && (x->ex_flags & EXFLAG_CRITICAL) != 0,
-                   ctx, x, i, X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION);
+                && (x->ex_flags & EXFLAG_CRITICAL) != 0,
+            ctx, x, i, X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION);
         CB_FAIL_IF(!allow_proxy_certs && (x->ex_flags & EXFLAG_PROXY) != 0,
-                   ctx, x, i, X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED);
+            ctx, x, i, X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED);
         ret = X509_check_ca(x);
         switch (must_be_ca) {
         case -1:
             CB_FAIL_IF((ctx->param->flags & X509_V_FLAG_X509_STRICT) != 0
-                           && ret != 1 && ret != 0,
-                       ctx, x, i, X509_V_ERR_INVALID_CA);
+                    && ret != 1 && ret != 0,
+                ctx, x, i, X509_V_ERR_INVALID_CA);
             break;
         case 0:
             CB_FAIL_IF(ret != 0, ctx, x, i, X509_V_ERR_INVALID_NON_CA);
@@ -622,9 +621,10 @@ static int check_extensions(X509_STORE_CTX *ctx)
         default:
             /* X509_V_FLAG_X509_STRICT is implicit for intermediate CAs */
             CB_FAIL_IF(ret == 0
-                       || ((i + 1 < num
+                    || ((i + 1 < num
                             || (ctx->param->flags & X509_V_FLAG_X509_STRICT) != 0)
-                           && ret != 1), ctx, x, i, X509_V_ERR_INVALID_CA);
+                        && ret != 1),
+                ctx, x, i, X509_V_ERR_INVALID_CA);
             break;
         }
         if (num > 1) {
@@ -647,62 +647,63 @@ static int check_extensions(X509_STORE_CTX *ctx)
             /* Check Basic Constraints according to RFC 5280 section 4.2.1.9 */
             if (x->ex_pathlen != -1) {
                 CB_FAIL_IF((x->ex_flags & EXFLAG_CA) == 0,
-                           ctx, x, i, X509_V_ERR_PATHLEN_INVALID_FOR_NON_CA);
+                    ctx, x, i, X509_V_ERR_PATHLEN_INVALID_FOR_NON_CA);
                 CB_FAIL_IF((x->ex_kusage & KU_KEY_CERT_SIGN) == 0, ctx,
-                           x, i, X509_V_ERR_PATHLEN_WITHOUT_KU_KEY_CERT_SIGN);
+                    x, i, X509_V_ERR_PATHLEN_WITHOUT_KU_KEY_CERT_SIGN);
             }
             CB_FAIL_IF((x->ex_flags & EXFLAG_CA) != 0
-                           && (x->ex_flags & EXFLAG_BCONS) != 0
-                           && (x->ex_flags & EXFLAG_BCONS_CRITICAL) == 0,
-                       ctx, x, i, X509_V_ERR_CA_BCONS_NOT_CRITICAL);
+                    && (x->ex_flags & EXFLAG_BCONS) != 0
+                    && (x->ex_flags & EXFLAG_BCONS_CRITICAL) == 0,
+                ctx, x, i, X509_V_ERR_CA_BCONS_NOT_CRITICAL);
             /* Check Key Usage according to RFC 5280 section 4.2.1.3 */
             if ((x->ex_flags & EXFLAG_CA) != 0) {
                 CB_FAIL_IF((x->ex_flags & EXFLAG_KUSAGE) == 0,
-                           ctx, x, i, X509_V_ERR_CA_CERT_MISSING_KEY_USAGE);
+                    ctx, x, i, X509_V_ERR_CA_CERT_MISSING_KEY_USAGE);
             } else {
                 CB_FAIL_IF((x->ex_kusage & KU_KEY_CERT_SIGN) != 0, ctx, x, i,
-                           X509_V_ERR_KU_KEY_CERT_SIGN_INVALID_FOR_NON_CA);
+                    X509_V_ERR_KU_KEY_CERT_SIGN_INVALID_FOR_NON_CA);
             }
             /* Check issuer is non-empty acc. to RFC 5280 section 4.1.2.4 */
             CB_FAIL_IF(X509_NAME_entry_count(X509_get_issuer_name(x)) == 0,
-                       ctx, x, i, X509_V_ERR_ISSUER_NAME_EMPTY);
+                ctx, x, i, X509_V_ERR_ISSUER_NAME_EMPTY);
             /* Check subject is non-empty acc. to RFC 5280 section 4.1.2.6 */
             CB_FAIL_IF(((x->ex_flags & EXFLAG_CA) != 0
-                        || (x->ex_kusage & KU_CRL_SIGN) != 0
-                        || x->altname == NULL)
-                       && X509_NAME_entry_count(X509_get_subject_name(x)) == 0,
-                       ctx, x, i, X509_V_ERR_SUBJECT_NAME_EMPTY);
+                           || (x->ex_kusage & KU_CRL_SIGN) != 0
+                           || x->altname == NULL)
+                    && X509_NAME_entry_count(X509_get_subject_name(x)) == 0,
+                ctx, x, i, X509_V_ERR_SUBJECT_NAME_EMPTY);
             CB_FAIL_IF(X509_NAME_entry_count(X509_get_subject_name(x)) == 0
-                           && x->altname != NULL
-                           && (x->ex_flags & EXFLAG_SAN_CRITICAL) == 0,
-                       ctx, x, i, X509_V_ERR_EMPTY_SUBJECT_SAN_NOT_CRITICAL);
+                    && x->altname != NULL
+                    && (x->ex_flags & EXFLAG_SAN_CRITICAL) == 0,
+                ctx, x, i, X509_V_ERR_EMPTY_SUBJECT_SAN_NOT_CRITICAL);
             /* Check SAN is non-empty according to RFC 5280 section 4.2.1.6 */
             CB_FAIL_IF(x->altname != NULL
-                           && sk_GENERAL_NAME_num(x->altname) <= 0,
-                       ctx, x, i, X509_V_ERR_EMPTY_SUBJECT_ALT_NAME);
+                    && sk_GENERAL_NAME_num(x->altname) <= 0,
+                ctx, x, i, X509_V_ERR_EMPTY_SUBJECT_ALT_NAME);
             /* Check sig alg consistency acc. to RFC 5280 section 4.1.1.2 */
             CB_FAIL_IF(X509_ALGOR_cmp(&x->sig_alg, &x->cert_info.signature) != 0,
-                       ctx, x, i, X509_V_ERR_SIGNATURE_ALGORITHM_INCONSISTENCY);
+                ctx, x, i, X509_V_ERR_SIGNATURE_ALGORITHM_INCONSISTENCY);
             CB_FAIL_IF(x->akid != NULL
-                           && (x->ex_flags & EXFLAG_AKID_CRITICAL) != 0,
-                       ctx, x, i, X509_V_ERR_AUTHORITY_KEY_IDENTIFIER_CRITICAL);
+                    && (x->ex_flags & EXFLAG_AKID_CRITICAL) != 0,
+                ctx, x, i, X509_V_ERR_AUTHORITY_KEY_IDENTIFIER_CRITICAL);
             CB_FAIL_IF(x->skid != NULL
-                           && (x->ex_flags & EXFLAG_SKID_CRITICAL) != 0,
-                       ctx, x, i, X509_V_ERR_SUBJECT_KEY_IDENTIFIER_CRITICAL);
+                    && (x->ex_flags & EXFLAG_SKID_CRITICAL) != 0,
+                ctx, x, i, X509_V_ERR_SUBJECT_KEY_IDENTIFIER_CRITICAL);
             if (X509_get_version(x) >= X509_VERSION_3) {
                 /* Check AKID presence acc. to RFC 5280 section 4.2.1.1 */
                 CB_FAIL_IF(i + 1 < num /*
                                         * this means not last cert in chain,
                                         * taken as "generated by conforming CAs"
                                         */
-                           && (x->akid == NULL || x->akid->keyid == NULL), ctx,
-                           x, i, X509_V_ERR_MISSING_AUTHORITY_KEY_IDENTIFIER);
+                        && (x->akid == NULL || x->akid->keyid == NULL),
+                    ctx,
+                    x, i, X509_V_ERR_MISSING_AUTHORITY_KEY_IDENTIFIER);
                 /* Check SKID presence acc. to RFC 5280 section 4.2.1.2 */
                 CB_FAIL_IF((x->ex_flags & EXFLAG_CA) != 0 && x->skid == NULL,
-                           ctx, x, i, X509_V_ERR_MISSING_SUBJECT_KEY_IDENTIFIER);
+                    ctx, x, i, X509_V_ERR_MISSING_SUBJECT_KEY_IDENTIFIER);
             } else {
                 CB_FAIL_IF(sk_X509_EXTENSION_num(X509_get0_extensions(x)) > 0,
-                           ctx, x, i, X509_V_ERR_EXTENSIONS_REQUIRE_VERSION_3);
+                    ctx, x, i, X509_V_ERR_EXTENSIONS_REQUIRE_VERSION_3);
             }
         }
 
@@ -711,8 +712,8 @@ static int check_extensions(X509_STORE_CTX *ctx)
             return 0;
         /* Check path length */
         CB_FAIL_IF(i > 1 && x->ex_pathlen != -1
-                       && plen > x->ex_pathlen + proxy_path_length,
-                   ctx, x, i, X509_V_ERR_PATH_LENGTH_EXCEEDED);
+                && plen > x->ex_pathlen + proxy_path_length,
+            ctx, x, i, X509_V_ERR_PATH_LENGTH_EXCEEDED);
         /* Increment path length if not a self-issued intermediate CA */
         if (i > 0 && (x->ex_flags & EXFLAG_SI) == 0)
             plen++;
@@ -735,7 +736,7 @@ static int check_extensions(X509_STORE_CTX *ctx)
              */
             if (x->ex_pcpathlen != -1) {
                 CB_FAIL_IF(proxy_path_length > x->ex_pcpathlen,
-                           ctx, x, i, X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED);
+                    ctx, x, i, X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED);
                 proxy_path_length = x->ex_pcpathlen;
             }
             proxy_path_length++;
@@ -821,7 +822,7 @@ static int check_name_constraints(X509_STORE_CTX *ctx)
              */
             if (X509_NAME_ENTRY_set(X509_NAME_get_entry(tmpsubject, last_loc))
                 == X509_NAME_ENTRY_set(X509_NAME_get_entry(tmpsubject,
-                                                           last_loc - 1))) {
+                    last_loc - 1))) {
                 err = X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION;
                 goto proxy_name_done;
             }
@@ -868,9 +869,11 @@ static int check_name_constraints(X509_STORE_CTX *ctx)
                 /* If EE certificate check commonName too */
                 if (rv == X509_V_OK && i == 0
                     && (ctx->param->hostflags
-                        & X509_CHECK_FLAG_NEVER_CHECK_SUBJECT) == 0
+                           & X509_CHECK_FLAG_NEVER_CHECK_SUBJECT)
+                        == 0
                     && ((ctx->param->hostflags
-                         & X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT) != 0
+                            & X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT)
+                            != 0
                         || (ret = has_san_id(x, GEN_DNS)) == 0))
                     rv = NAME_CONSTRAINTS_check_CN(x, nc);
                 if (ret < 0)
@@ -924,7 +927,7 @@ static int check_id(X509_STORE_CTX *ctx)
             return 0;
     }
     if (vpm->email != NULL
-            && X509_check_email(x, vpm->email, vpm->emaillen, 0) <= 0) {
+        && X509_check_email(x, vpm->email, vpm->emaillen, 0) <= 0) {
         if (!check_id_error(ctx, X509_V_ERR_EMAIL_MISMATCH))
             return 0;
     }
@@ -982,7 +985,7 @@ static int check_trust(X509_STORE_CTX *ctx, int num_untrusted)
     }
 
     if (num_untrusted == num
-            && (ctx->param->flags & X509_V_FLAG_PARTIAL_CHAIN) != 0) {
+        && (ctx->param->flags & X509_V_FLAG_PARTIAL_CHAIN) != 0) {
         /*
          * Last-resort call with no new trusted certificates, check the leaf
          * for a direct trust store match.
@@ -1018,11 +1021,12 @@ static int check_trust(X509_STORE_CTX *ctx, int num_untrusted)
      */
     return X509_TRUST_UNTRUSTED;
 
- rejected:
+rejected:
     return verify_cb_cert(ctx, x, i, X509_V_ERR_CERT_REJECTED) == 0
-        ? X509_TRUST_REJECTED : X509_TRUST_UNTRUSTED;
+        ? X509_TRUST_REJECTED
+        : X509_TRUST_UNTRUSTED;
 
- trusted:
+trusted:
     if (!DANETLS_ENABLED(dane))
         return X509_TRUST_TRUSTED;
     if (dane->pdpth < 0)
@@ -1077,10 +1081,20 @@ static int check_cert(X509_STORE_CTX *ctx)
         unsigned int last_reasons = ctx->current_reasons;
 
         /* Try to retrieve relevant CRL */
-        if (ctx->get_crl != NULL)
+        if (ctx->get_crl != NULL) {
+            X509 *crl_issuer = NULL;
+            unsigned int reasons = 0;
+
             ok = ctx->get_crl(ctx, &crl, x);
-        else
+            if (crl != NULL) {
+                ctx->current_crl_score = get_crl_score(ctx, &crl_issuer,
+                    &reasons, crl, x);
+                ctx->current_issuer = crl_issuer;
+                ctx->current_reasons = reasons;
+            }
+        } else {
             ok = get_crl_delta(ctx, &crl, &dcrl, x);
+        }
         /* If error looking up CRL, nothing we can do except notify callback */
         if (!ok) {
             ok = verify_cb_crl(ctx, X509_V_ERR_UNABLE_TO_GET_CRL);
@@ -1109,6 +1123,7 @@ static int check_cert(X509_STORE_CTX *ctx)
                 goto done;
         }
 
+        ctx->current_crl = NULL;
         X509_CRL_free(crl);
         X509_CRL_free(dcrl);
         crl = NULL;
@@ -1122,7 +1137,7 @@ static int check_cert(X509_STORE_CTX *ctx)
             goto done;
         }
     }
- done:
+done:
     X509_CRL_free(crl);
     X509_CRL_free(dcrl);
 
@@ -1183,8 +1198,8 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify)
 }
 
 static int get_crl_sk(X509_STORE_CTX *ctx, X509_CRL **pcrl, X509_CRL **pdcrl,
-                      X509 **pissuer, int *pscore, unsigned int *preasons,
-                      STACK_OF(X509_CRL) *crls)
+    X509 **pissuer, int *pscore, unsigned int *preasons,
+    STACK_OF(X509_CRL) *crls)
 {
     int i, crl_score, best_score = *pscore;
     unsigned int reasons, best_reasons = 0;
@@ -1203,7 +1218,8 @@ static int get_crl_sk(X509_STORE_CTX *ctx, X509_CRL **pcrl, X509_CRL **pdcrl,
             int day, sec;
 
             if (ASN1_TIME_diff(&day, &sec, X509_CRL_get0_lastUpdate(best_crl),
-                               X509_CRL_get0_lastUpdate(crl)) == 0)
+                    X509_CRL_get0_lastUpdate(crl))
+                == 0)
                 continue;
             /*
              * ASN1_TIME_diff never returns inconsistent signs for |day|
@@ -1280,7 +1296,8 @@ static int check_delta_base(X509_CRL *delta, X509_CRL *base)
         return 0;
     /* Issuer names must match */
     if (X509_NAME_cmp(X509_CRL_get_issuer(base),
-                      X509_CRL_get_issuer(delta)) != 0)
+            X509_CRL_get_issuer(delta))
+        != 0)
         return 0;
     /* AKID and IDP must match */
     if (!crl_extension_match(delta, base, NID_authority_key_identifier))
@@ -1299,7 +1316,7 @@ static int check_delta_base(X509_CRL *delta, X509_CRL *base)
  * retrieve a chain of deltas...
  */
 static void get_delta_sk(X509_STORE_CTX *ctx, X509_CRL **dcrl, int *pscore,
-                         X509_CRL *base, STACK_OF(X509_CRL) *crls)
+    X509_CRL *base, STACK_OF(X509_CRL) *crls)
 {
     X509_CRL *delta;
     int i;
@@ -1335,7 +1352,7 @@ static void get_delta_sk(X509_STORE_CTX *ctx, X509_CRL **dcrl, int *pscore,
  * is rejected, otherwise reasons is updated.
  */
 static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer,
-                         unsigned int *preasons, X509_CRL *crl, X509 *x)
+    unsigned int *preasons, X509_CRL *crl, X509 *x)
 {
     int crl_score = 0;
     unsigned int tmp_reasons = *preasons, crl_reasons;
@@ -1391,11 +1408,10 @@ static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer,
     *preasons = tmp_reasons;
 
     return crl_score;
-
 }
 
 static void crl_akid_check(X509_STORE_CTX *ctx, X509_CRL *crl,
-                           X509 **pissuer, int *pcrl_score)
+    X509 **pissuer, int *pcrl_score)
 {
     X509 *crl_issuer = NULL;
     const X509_NAME *cnm = X509_CRL_get_issuer(crl);
@@ -1454,7 +1470,7 @@ static void crl_akid_check(X509_STORE_CTX *ctx, X509_CRL *crl,
  */
 static int check_crl_path(X509_STORE_CTX *ctx, X509 *x)
 {
-    X509_STORE_CTX crl_ctx = {0};
+    X509_STORE_CTX crl_ctx = { 0 };
     int ret;
 
     /* Don't allow recursive CRL path validation */
@@ -1477,7 +1493,7 @@ static int check_crl_path(X509_STORE_CTX *ctx, X509 *x)
 
     /* Check chain is acceptable */
     ret = check_crl_chain(ctx, ctx->chain, crl_ctx.chain);
- err:
+err:
     X509_STORE_CTX_cleanup(&crl_ctx);
     return ret;
 }
@@ -1491,8 +1507,8 @@ static int check_crl_path(X509_STORE_CTX *ctx, X509 *x)
  * RFC5280 version
  */
 static int check_crl_chain(X509_STORE_CTX *ctx,
-                           STACK_OF(X509) *cert_path,
-                           STACK_OF(X509) *crl_path)
+    STACK_OF(X509) *cert_path,
+    STACK_OF(X509) *crl_path)
 {
     X509 *cert_ta = sk_X509_value(cert_path, sk_X509_num(cert_path) - 1);
     X509 *crl_ta = sk_X509_value(crl_path, sk_X509_num(crl_path) - 1);
@@ -1560,7 +1576,6 @@ static int idp_check_dp(DIST_POINT_NAME *a, DIST_POINT_NAME *b)
     }
 
     return 0;
-
 }
 
 static int crldp_check_crlissuer(DIST_POINT *dp, X509_CRL *crl, int crl_score)
@@ -1584,7 +1599,7 @@ static int crldp_check_crlissuer(DIST_POINT *dp, X509_CRL *crl, int crl_score)
 
 /* Check CRLDP and IDP */
 static int crl_crldp_check(X509 *x, X509_CRL *crl, int crl_score,
-                           unsigned int *preasons)
+    unsigned int *preasons)
 {
     int i;
 
@@ -1603,14 +1618,14 @@ static int crl_crldp_check(X509 *x, X509_CRL *crl, int crl_score,
 
         if (crldp_check_crlissuer(dp, crl, crl_score)) {
             if (crl->idp == NULL
-                    || idp_check_dp(dp->distpoint, crl->idp->distpoint)) {
+                || idp_check_dp(dp->distpoint, crl->idp->distpoint)) {
                 *preasons &= dp->dp_reasons;
                 return 1;
             }
         }
     }
     return (crl->idp == NULL || crl->idp->distpoint == NULL)
-            && (crl_score & CRL_SCORE_ISSUER_NAME) != 0;
+        && (crl_score & CRL_SCORE_ISSUER_NAME) != 0;
 }
 
 /*
@@ -1618,7 +1633,7 @@ static int crl_crldp_check(X509 *x, X509_CRL *crl, int crl_score,
  * to find a delta CRL too
  */
 static int get_crl_delta(X509_STORE_CTX *ctx,
-                         X509_CRL **pcrl, X509_CRL **pdcrl, X509 *x)
+    X509_CRL **pcrl, X509_CRL **pdcrl, X509 *x)
 {
     int ok;
     X509 *issuer = NULL;
@@ -1630,7 +1645,7 @@ static int get_crl_delta(X509_STORE_CTX *ctx,
 
     reasons = ctx->current_reasons;
     ok = get_crl_sk(ctx, &crl, &dcrl,
-                    &issuer, &crl_score, &reasons, ctx->crls);
+        &issuer, &crl_score, &reasons, ctx->crls);
     if (ok)
         goto done;
 
@@ -1645,7 +1660,7 @@ static int get_crl_delta(X509_STORE_CTX *ctx,
 
     sk_X509_CRL_pop_free(skcrl, X509_CRL_free);
 
- done:
+done:
     /* If we got any kind of CRL use it and return success */
     if (crl != NULL) {
         ctx->current_issuer = issuer;
@@ -1669,10 +1684,10 @@ static int check_crl(X509_STORE_CTX *ctx, X509_CRL *crl)
     /* If we have an alternative CRL issuer cert use that */
     if (ctx->current_issuer != NULL) {
         issuer = ctx->current_issuer;
-    /*
-     * Else find CRL issuer: if not last certificate then issuer is next
-     * certificate in chain.
-     */
+        /*
+         * Else find CRL issuer: if not last certificate then issuer is next
+         * certificate in chain.
+         */
     } else if (cnum < chnum) {
         issuer = sk_X509_value(ctx->chain, cnum + 1);
     } else {
@@ -1680,8 +1695,7 @@ static int check_crl(X509_STORE_CTX *ctx, X509_CRL *crl)
         if (!ossl_assert(issuer != NULL))
             return 0;
         /* If not self-issued, can't check signature */
-        if (!ctx->check_issued(ctx, issuer, issuer) &&
-            !verify_cb_crl(ctx, X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER))
+        if (!ctx->check_issued(ctx, issuer, issuer) && !verify_cb_crl(ctx, X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER))
             return 0;
     }
 
@@ -1693,33 +1707,25 @@ static int check_crl(X509_STORE_CTX *ctx, X509_CRL *crl)
      */
     if (crl->base_crl_number == NULL) {
         /* Check for cRLSign bit if keyUsage present */
-        if ((issuer->ex_flags & EXFLAG_KUSAGE) != 0 &&
-            (issuer->ex_kusage & KU_CRL_SIGN) == 0 &&
-            !verify_cb_crl(ctx, X509_V_ERR_KEYUSAGE_NO_CRL_SIGN))
+        if ((issuer->ex_flags & EXFLAG_KUSAGE) != 0 && (issuer->ex_kusage & KU_CRL_SIGN) == 0 && !verify_cb_crl(ctx, X509_V_ERR_KEYUSAGE_NO_CRL_SIGN))
             return 0;
 
-        if ((ctx->current_crl_score & CRL_SCORE_SCOPE) == 0 &&
-            !verify_cb_crl(ctx, X509_V_ERR_DIFFERENT_CRL_SCOPE))
+        if ((ctx->current_crl_score & CRL_SCORE_SCOPE) == 0 && !verify_cb_crl(ctx, X509_V_ERR_DIFFERENT_CRL_SCOPE))
             return 0;
 
-        if ((ctx->current_crl_score & CRL_SCORE_SAME_PATH) == 0 &&
-            check_crl_path(ctx, ctx->current_issuer) <= 0 &&
-            !verify_cb_crl(ctx, X509_V_ERR_CRL_PATH_VALIDATION_ERROR))
+        if ((ctx->current_crl_score & CRL_SCORE_SAME_PATH) == 0 && check_crl_path(ctx, ctx->current_issuer) <= 0 && !verify_cb_crl(ctx, X509_V_ERR_CRL_PATH_VALIDATION_ERROR))
             return 0;
 
-        if ((crl->idp_flags & IDP_INVALID) != 0 &&
-            !verify_cb_crl(ctx, X509_V_ERR_INVALID_EXTENSION))
+        if ((crl->idp_flags & IDP_INVALID) != 0 && !verify_cb_crl(ctx, X509_V_ERR_INVALID_EXTENSION))
             return 0;
     }
 
-    if ((ctx->current_crl_score & CRL_SCORE_TIME) == 0 &&
-        !check_crl_time(ctx, crl, 1))
+    if ((ctx->current_crl_score & CRL_SCORE_TIME) == 0 && !check_crl_time(ctx, crl, 1))
         return 0;
 
     /* Attempt to get issuer certificate public key */
     ikey = X509_get0_pubkey(issuer);
-    if (ikey == NULL &&
-        !verify_cb_crl(ctx, X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY))
+    if (ikey == NULL && !verify_cb_crl(ctx, X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY))
         return 0;
 
     if (ikey != NULL) {
@@ -1728,8 +1734,7 @@ static int check_crl(X509_STORE_CTX *ctx, X509_CRL *crl)
         if (rv != X509_V_OK && !verify_cb_crl(ctx, rv))
             return 0;
         /* Verify CRL signature */
-        if (X509_CRL_verify(crl, ikey) <= 0 &&
-            !verify_cb_crl(ctx, X509_V_ERR_CRL_SIGNATURE_FAILURE))
+        if (X509_CRL_verify(crl, ikey) <= 0 && !verify_cb_crl(ctx, X509_V_ERR_CRL_SIGNATURE_FAILURE))
             return 0;
     }
     return 1;
@@ -1747,8 +1752,7 @@ static int cert_crl(X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x)
      * change the meaning of CRL entries.
      */
     if ((ctx->param->flags & X509_V_FLAG_IGNORE_CRITICAL) == 0
-        && (crl->flags & EXFLAG_CRITICAL) != 0 &&
-        !verify_cb_crl(ctx, X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION))
+        && (crl->flags & EXFLAG_CRITICAL) != 0 && !verify_cb_crl(ctx, X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION))
         return 0;
     /*
      * Look for serial number of certificate in CRL.  If found, make sure
@@ -1787,7 +1791,7 @@ static int check_policy(X509_STORE_CTX *ctx)
         goto memerr;
     }
     ret = X509_policy_check(&ctx->tree, &ctx->explicit_policy, ctx->chain,
-                            ctx->param->policies, ctx->param->flags);
+        ctx->param->policies, ctx->param->flags);
     if (ctx->bare_ta_signed)
         (void)sk_X509_pop(ctx->chain);
 
@@ -1806,7 +1810,7 @@ static int check_policy(X509_STORE_CTX *ctx)
             if ((x->ex_flags & EXFLAG_INVALID_POLICY) != 0)
                 cbcalled = 1;
             CB_FAIL_IF((x->ex_flags & EXFLAG_INVALID_POLICY) != 0,
-                       ctx, x, i, X509_V_ERR_INVALID_POLICY_EXTENSION);
+                ctx, x, i, X509_V_ERR_INVALID_POLICY_EXTENSION);
         }
         if (!cbcalled) {
             /* Should not be able to get here */
@@ -1840,7 +1844,7 @@ static int check_policy(X509_STORE_CTX *ctx)
 
     return 1;
 
- memerr:
+memerr:
     ctx->error = X509_V_ERR_OUT_OF_MEM;
     return -1;
 }
@@ -1908,15 +1912,15 @@ static int internal_verify(X509_STORE_CTX *ctx)
          */
         xi = NULL;
     } else if (ossl_x509_likely_issued(xi, xi) != X509_V_OK
-               /* exceptional case: last cert in the chain is not self-issued */
-               && ((ctx->param->flags & X509_V_FLAG_PARTIAL_CHAIN) == 0)) {
+        /* exceptional case: last cert in the chain is not self-issued */
+        && ((ctx->param->flags & X509_V_FLAG_PARTIAL_CHAIN) == 0)) {
         if (n > 0) {
             n--;
             ctx->error_depth = n;
             xs = sk_X509_value(ctx->chain, n);
         } else {
             CB_FAIL_IF(1, ctx, xi, 0,
-                       X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE);
+                X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE);
         }
         /*
          * The below code will certainly not do a
@@ -1966,15 +1970,16 @@ static int internal_verify(X509_STORE_CTX *ctx)
              * we are free to ignore any key usage restrictions on such certs.
              */
             int ret = xs == xi && (xi->ex_flags & EXFLAG_CA) == 0
-                ? X509_V_OK : ossl_x509_signing_allowed(xi, xs);
+                ? X509_V_OK
+                : ossl_x509_signing_allowed(xi, xs);
 
             CB_FAIL_IF(ret != X509_V_OK, ctx, xi, issuer_depth, ret);
             if ((pkey = X509_get0_pubkey(xi)) == NULL) {
                 CB_FAIL_IF(1, ctx, xi, issuer_depth,
-                           X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY);
+                    X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY);
             } else {
                 CB_FAIL_IF(X509_verify(xs, pkey) <= 0,
-                           ctx, xs, n, X509_V_ERR_CERT_SIGNATURE_FAILURE);
+                    ctx, xs, n, X509_V_ERR_CERT_SIGNATURE_FAILURE);
             }
         }
 
@@ -2072,7 +2077,7 @@ int X509_cmp_time(const ASN1_TIME *ctm, time_t *cmp_time)
      */
     ret = (day >= 0 && sec >= 0) ? -1 : 1;
 
- err:
+err:
     ASN1_TIME_free(asn1_cmp_time);
     return ret;
 }
@@ -2082,7 +2087,7 @@ int X509_cmp_time(const ASN1_TIME *ctm, time_t *cmp_time)
  * or else 1 if it is past the end, or -1 if it is before the start
  */
 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)
 {
     time_t ref_time;
     time_t *time = NULL;
@@ -2113,7 +2118,7 @@ ASN1_TIME *X509_time_adj(ASN1_TIME *s, long offset_sec, time_t *in_tm)
 }
 
 ASN1_TIME *X509_time_adj_ex(ASN1_TIME *s,
-                            int offset_day, long offset_sec, time_t *in_tm)
+    int offset_day, long offset_sec, time_t *in_tm)
 {
     time_t t;
 
@@ -2172,7 +2177,7 @@ int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain)
  * Sadly, returns NULL also on internal error.
  */
 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)
 {
     X509_CRL *crl = NULL;
     int i;
@@ -2190,7 +2195,8 @@ X509_CRL *X509_CRL_diff(X509_CRL *base, X509_CRL *newer,
     }
     /* Issuer names must match */
     if (X509_NAME_cmp(X509_CRL_get_issuer(base),
-                      X509_CRL_get_issuer(newer)) != 0) {
+            X509_CRL_get_issuer(newer))
+        != 0) {
         ERR_raise(ERR_LIB_X509, X509_R_ISSUER_MISMATCH);
         return NULL;
     }
@@ -2209,8 +2215,7 @@ X509_CRL *X509_CRL_diff(X509_CRL *base, X509_CRL *newer,
         return NULL;
     }
     /* CRLs must verify */
-    if (skey != NULL && (X509_CRL_verify(base, skey) <= 0 ||
-                         X509_CRL_verify(newer, skey) <= 0)) {
+    if (skey != NULL && (X509_CRL_verify(base, skey) <= 0 || X509_CRL_verify(newer, skey) <= 0)) {
         ERR_raise(ERR_LIB_X509, X509_R_CRL_VERIFY_FAILURE);
         return NULL;
     }
@@ -2287,7 +2292,7 @@ X509_CRL *X509_CRL_diff(X509_CRL *base, X509_CRL *newer,
 
     return crl;
 
- err:
+err:
     X509_CRL_free(crl);
     return NULL;
 }
@@ -2404,7 +2409,7 @@ int X509_STORE_CTX_set_trust(X509_STORE_CTX *ctx, int trust)
  * client/server.
  */
 int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
-                                   int purpose, int trust)
+    int purpose, int trust)
 {
     int idx;
 
@@ -2490,7 +2495,6 @@ void X509_STORE_CTX_free(X509_STORE_CTX *ctx)
     OPENSSL_free(ctx);
 }
 
-
 int X509_STORE_CTX_init_rpk(X509_STORE_CTX *ctx, X509_STORE *store, EVP_PKEY *rpk)
 {
     if (!X509_STORE_CTX_init(ctx, store, NULL, NULL))
@@ -2500,7 +2504,7 @@ int X509_STORE_CTX_init_rpk(X509_STORE_CTX *ctx, X509_STORE *store, EVP_PKEY *rp
 }
 
 int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
-                        STACK_OF(X509) *chain)
+    STACK_OF(X509) *chain)
 {
     if (ctx == NULL) {
         ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
@@ -2621,11 +2625,11 @@ int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
     }
 
     if (CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509_STORE_CTX, ctx,
-                           &ctx->ex_data))
+            &ctx->ex_data))
         return 1;
     ERR_raise(ERR_LIB_X509, ERR_R_CRYPTO_LIB);
 
- err:
+err:
     /*
      * On error clean up allocated storage, if the store context was not
      * allocated with X509_STORE_CTX_new() this is our last chance to do so.
@@ -2682,15 +2686,15 @@ 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)
 {
     X509_VERIFY_PARAM_set_time(ctx->param, t);
 }
 
 void X509_STORE_CTX_set_current_reasons(X509_STORE_CTX *ctx,
-                                        unsigned int current_reasons)
+    unsigned int current_reasons)
 {
-   ctx->current_reasons = current_reasons;
+    ctx->current_reasons = current_reasons;
 }
 
 X509 *X509_STORE_CTX_get0_cert(const X509_STORE_CTX *ctx)
@@ -2720,7 +2724,7 @@ void X509_STORE_CTX_set0_verified_chain(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_cb)
+    X509_STORE_CTX_verify_cb verify_cb)
 {
     ctx->verify_cb = verify_cb;
 }
@@ -2731,7 +2735,7 @@ X509_STORE_CTX_verify_cb X509_STORE_CTX_get_verify_cb(const X509_STORE_CTX *ctx)
 }
 
 void X509_STORE_CTX_set_verify(X509_STORE_CTX *ctx,
-                               X509_STORE_CTX_verify_fn verify)
+    X509_STORE_CTX_verify_fn verify)
 {
     ctx->verify = verify;
 }
@@ -2765,9 +2769,9 @@ X509_STORE_CTX_get_crl_fn X509_STORE_CTX_get_get_crl(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)
 {
-   ctx->get_crl = get_crl;
+    ctx->get_crl = get_crl;
 }
 
 X509_STORE_CTX_check_crl_fn
@@ -2849,7 +2853,7 @@ void X509_STORE_CTX_set0_dane(X509_STORE_CTX *ctx, SSL_DANE *dane)
 }
 
 static unsigned char *dane_i2d(X509 *cert, uint8_t selector,
-                               unsigned int *i2dlen)
+    unsigned int *i2dlen)
 {
     unsigned char *buf = NULL;
     int len;
@@ -3003,8 +3007,7 @@ static int dane_match_cert(X509_STORE_CTX *ctx, X509 *cert, int depth)
          * DANE match is dispositive, but with PKIX we still need to build a
          * full chain.
          */
-        if (cmplen == t->dlen &&
-            memcmp(cmpbuf, t->data, cmplen) == 0) {
+        if (cmplen == t->dlen && memcmp(cmpbuf, t->data, cmplen) == 0) {
             if (DANETLS_USAGE_BIT(usage) & DANETLS_DANE_MASK)
                 matched = 1;
             if (matched || dane->mdpth < 0) {
@@ -3064,10 +3067,7 @@ static int check_dane_pkeys(X509_STORE_CTX *ctx)
 
     for (i = 0; i < recnum; ++i) {
         t = sk_danetls_record_value(dane->trecs, i);
-        if (t->usage != DANETLS_USAGE_DANE_TA ||
-            t->selector != DANETLS_SELECTOR_SPKI ||
-            t->mtype != DANETLS_MATCHING_FULL ||
-            X509_verify(cert, t->spki) <= 0)
+        if (t->usage != DANETLS_USAGE_DANE_TA || t->selector != DANETLS_SELECTOR_SPKI || t->mtype != DANETLS_MATCHING_FULL || X509_verify(cert, t->spki) <= 0)
             continue;
 
         /* Clear any PKIX-?? matches that failed to extend to a full chain */
@@ -3228,8 +3228,7 @@ static int dane_verify(X509_STORE_CTX *ctx)
         if (!check_leaf_suiteb(ctx, cert))
             return 0;
         /* Callback invoked as needed */
-        if ((dane->flags & DANE_FLAG_NO_DANE_EE_NAMECHECKS) == 0 &&
-            !check_id(ctx))
+        if ((dane->flags & DANE_FLAG_NO_DANE_EE_NAMECHECKS) == 0 && !check_id(ctx))
             return 0;
         /* Bypass internal_verify(), issue depth 0 success callback */
         ctx->error_depth = 0;
@@ -3297,7 +3296,7 @@ static int build_chain(X509_STORE_CTX *ctx)
         goto int_err;
 
 #define S_DOUNTRUSTED (1 << 0) /* Search untrusted chain */
-#define S_DOTRUSTED   (1 << 1) /* Search trusted store */
+#define S_DOTRUSTED (1 << 1) /* Search trusted store */
 #define S_DOALTERNATE (1 << 2) /* Retry with pruned alternate chain */
     /*
      * Set up search policy, untrusted if possible, trusted-first if enabled,
@@ -3437,14 +3436,12 @@ static int build_chain(X509_STORE_CTX *ctx)
                         X509_free(sk_X509_pop(ctx->chain));
                     ctx->num_untrusted = num;
 
-                    if (DANETLS_ENABLED(dane) &&
-                        dane->mdpth >= ctx->num_untrusted) {
+                    if (DANETLS_ENABLED(dane) && dane->mdpth >= ctx->num_untrusted) {
                         dane->mdpth = -1;
                         X509_free(dane->mcert);
                         dane->mcert = NULL;
                     }
-                    if (DANETLS_ENABLED(dane) &&
-                        dane->pdpth >= ctx->num_untrusted)
+                    if (DANETLS_ENABLED(dane) && dane->pdpth >= ctx->num_untrusted)
                         dane->pdpth = -1;
                 }
 
@@ -3515,8 +3512,7 @@ static int build_chain(X509_STORE_CTX *ctx)
                 if ((search & S_DOALTERNATE) != 0 && --alt_untrusted > 0)
                     continue;
                 /* Still no luck and no fallbacks left? */
-                if (!may_alternate || (search & S_DOALTERNATE) != 0 ||
-                    ctx->num_untrusted < 2)
+                if (!may_alternate || (search & S_DOALTERNATE) != 0 || ctx->num_untrusted < 2)
                     break;
                 /* Search for a trusted issuer of a shorter chain */
                 search |= S_DOALTERNATE;
@@ -3532,8 +3528,7 @@ static int build_chain(X509_STORE_CTX *ctx)
             if (!ossl_assert(num == ctx->num_untrusted))
                 goto int_err;
             curr = sk_X509_value(ctx->chain, num - 1);
-            issuer = (X509_self_signed(curr, 0) > 0 || num > max_depth) ?
-                NULL : get0_best_issuer_sk(ctx, 0, 1 /* no_dup */, sk_untrusted, curr);
+            issuer = (X509_self_signed(curr, 0) > 0 || num > max_depth) ? NULL : get0_best_issuer_sk(ctx, 0, 1 /* no_dup */, sk_untrusted, curr);
             if (issuer == NULL) {
                 /*
                  * Once we have reached a self-signed cert or num > max_depth
@@ -3598,36 +3593,36 @@ static int build_chain(X509_STORE_CTX *ctx)
             break;
         }
         CB_FAIL_IF(num > max_depth,
-                   ctx, NULL, num - 1, X509_V_ERR_CERT_CHAIN_TOO_LONG);
+            ctx, NULL, num - 1, X509_V_ERR_CERT_CHAIN_TOO_LONG);
         CB_FAIL_IF(DANETLS_ENABLED(dane)
-                       && (!DANETLS_HAS_PKIX(dane) || dane->pdpth >= 0),
-                   ctx, NULL, num - 1, X509_V_ERR_DANE_NO_MATCH);
+                && (!DANETLS_HAS_PKIX(dane) || dane->pdpth >= 0),
+            ctx, NULL, num - 1, X509_V_ERR_DANE_NO_MATCH);
         if (X509_self_signed(sk_X509_value(ctx->chain, num - 1), 0) > 0)
             return verify_cb_cert(ctx, NULL, num - 1,
-                                  num == 1
-                                  ? X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT
-                                  : X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN);
+                num == 1
+                    ? X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT
+                    : X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN);
         return verify_cb_cert(ctx, NULL, num - 1,
-                              ctx->num_untrusted < num
-                              ? X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT
-                              : X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY);
+            ctx->num_untrusted < num
+                ? X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT
+                : X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY);
     }
 
- int_err:
+int_err:
     ERR_raise(ERR_LIB_X509, ERR_R_INTERNAL_ERROR);
     ctx->error = X509_V_ERR_UNSPECIFIED;
     sk_X509_free(sk_untrusted);
     return -1;
 
- memerr:
+memerr:
     ctx->error = X509_V_ERR_OUT_OF_MEM;
     sk_X509_free(sk_untrusted);
     return -1;
 }
 
 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 finish_chain = store != NULL;
     X509_STORE_CTX *ctx;
@@ -3662,7 +3657,7 @@ STACK_OF(X509) *X509_build_chain(X509 *target, STACK_OF(X509) *certs,
         result = NULL;
     }
 
- err:
+err:
     X509_STORE_CTX_free(ctx);
     return result;
 }
@@ -3727,10 +3722,9 @@ static int check_curve(X509 *cert)
     if (EVP_PKEY_get_id(pkey) != EVP_PKEY_EC)
         return 1;
 
-    ret =
-        EVP_PKEY_get_int_param(pkey,
-                               OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS,
-                               &val);
+    ret = EVP_PKEY_get_int_param(pkey,
+        OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS,
+        &val);
     return ret == 1 ? !val : -1;
 }
 
diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index 6f1cfd9320ee9..ca66f78d2e4e0 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -34,7 +34,7 @@ static void str_free(char *s)
 }
 
 static int int_x509_param_set_hosts(X509_VERIFY_PARAM *vpm, int mode,
-                                    const char *name, size_t namelen)
+    const char *name, size_t namelen)
 {
     char *copy;
 
@@ -45,7 +45,7 @@ static int int_x509_param_set_hosts(X509_VERIFY_PARAM *vpm, int mode,
     if (namelen == 0 || name == NULL)
         namelen = name ? strlen(name) : 0;
     else if (name != NULL
-             && memchr(name, '\0', namelen > 1 ? namelen - 1 : namelen) != NULL)
+        && memchr(name, '\0', namelen > 1 ? namelen - 1 : namelen) != NULL)
         return 0;
     if (namelen > 0 && name[namelen - 1] == '\0')
         --namelen;
@@ -61,8 +61,7 @@ static int int_x509_param_set_hosts(X509_VERIFY_PARAM *vpm, int mode,
     if (copy == NULL)
         return 0;
 
-    if (vpm->hosts == NULL &&
-        (vpm->hosts = sk_OPENSSL_STRING_new_null()) == NULL) {
+    if (vpm->hosts == NULL && (vpm->hosts = sk_OPENSSL_STRING_new_null()) == NULL) {
         OPENSSL_free(copy);
         return 0;
     }
@@ -144,12 +143,12 @@ void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param)
 
 /* Macro to test and copy a field if necessary */
 
-#define x509_verify_param_copy(field, def) \
+#define x509_verify_param_copy(field, def)       \
     if (test_x509_verify_param_copy(field, def)) \
         dest->field = src->field;
 
 int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest,
-                              const X509_VERIFY_PARAM *src)
+    const X509_VERIFY_PARAM *src)
 {
     unsigned long inh_flags;
     int to_default, to_overwrite;
@@ -196,8 +195,7 @@ int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest,
         sk_OPENSSL_STRING_pop_free(dest->hosts, str_free);
         dest->hosts = NULL;
         if (src->hosts != NULL) {
-            dest->hosts =
-                sk_OPENSSL_STRING_deep_copy(src->hosts, str_copy, str_free);
+            dest->hosts = sk_OPENSSL_STRING_deep_copy(src->hosts, str_copy, str_free);
             if (dest->hosts == NULL)
                 return 0;
         }
@@ -217,7 +215,7 @@ int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest,
 }
 
 int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to,
-                           const X509_VERIFY_PARAM *from)
+    const X509_VERIFY_PARAM *from)
 {
     unsigned long save_flags;
     int ret;
@@ -234,7 +232,7 @@ int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to,
 }
 
 static int int_x509_param_set1(char **pdest, size_t *pdestlen,
-                               const char *src, size_t srclen)
+    const char *src, size_t srclen)
 {
     char *tmp;
 
@@ -274,7 +272,7 @@ int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param, unsigned long flags)
 }
 
 int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
-                                  unsigned long flags)
+    unsigned long flags)
 {
     param->flags &= ~flags;
     return 1;
@@ -334,7 +332,7 @@ 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)
 {
     if (param->policies == NULL) {
         param->policies = sk_ASN1_OBJECT_new_null();
@@ -348,7 +346,7 @@ int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param,
 }
 
 int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param,
-                                    STACK_OF(ASN1_OBJECT) *policies)
+    STACK_OF(ASN1_OBJECT) *policies)
 {
     int i;
     ASN1_OBJECT *oid, *doid;
@@ -388,19 +386,19 @@ 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)
 {
     return int_x509_param_set_hosts(param, SET_HOST, name, namelen);
 }
 
 int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param,
-                                const char *name, size_t namelen)
+    const char *name, size_t namelen)
 {
     return int_x509_param_set_hosts(param, ADD_HOST, name, namelen);
 }
 
 void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
-                                     unsigned int flags)
+    unsigned int flags)
 {
     param->hostflags = flags;
 }
@@ -421,7 +419,7 @@ char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *param)
  * the target peername.
  */
 void X509_VERIFY_PARAM_move_peername(X509_VERIFY_PARAM *to,
-                                     X509_VERIFY_PARAM *from)
+    X509_VERIFY_PARAM *from)
 {
     char *peername = (from != NULL) ? from->peername : NULL;
 
@@ -439,14 +437,13 @@ 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)
 {
     return int_x509_param_set1(&param->email, &param->emaillen,
-                               email, emaillen);
+        email, emaillen);
 }
 
-static unsigned char
-*int_X509_VERIFY_PARAM_get0_ip(X509_VERIFY_PARAM *param, size_t *plen)
+static unsigned char *int_X509_VERIFY_PARAM_get0_ip(X509_VERIFY_PARAM *param, size_t *plen)
 {
     if (param == NULL || param->ip == NULL) {
         ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
@@ -466,14 +463,14 @@ 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)
 {
     if (iplen != 0 && iplen != 4 && iplen != 16) {
         ERR_raise(ERR_LIB_X509, ERR_R_PASSED_INVALID_ARGUMENT);
         return 0;
     }
     return int_x509_param_set1((char **)&param->ip, &param->iplen,
-                               (char *)ip, iplen);
+        (char *)ip, iplen);
 }
 
 int X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *param, const char *ipasc)
@@ -510,78 +507,66 @@ const char *X509_VERIFY_PARAM_get0_name(const X509_VERIFY_PARAM *param)
  */
 
 static const X509_VERIFY_PARAM default_table[] = {
-    {
-     "code_sign",               /* Code sign parameters */
-     0,                         /* check time to use */
-     0,                         /* inheritance flags */
-     0,                         /* flags */
-     X509_PURPOSE_CODE_SIGN,    /* purpose */
-     X509_TRUST_OBJECT_SIGN,    /* trust */
-     -1,                        /* depth */
-     -1,                        /* auth_level */
-     NULL,                      /* policies */
-     vpm_empty_id
-    },
-    {
-     "default",                 /* X509 default parameters */
-     0,                         /* check time to use */
-     0,                         /* inheritance flags */
-     X509_V_FLAG_TRUSTED_FIRST, /* flags */
-     0,                         /* purpose */
-     0,                         /* trust */
-     100,                       /* depth */
-     -1,                        /* auth_level */
-     NULL,                      /* policies */
-     vpm_empty_id
-    },
-    {
-     "pkcs7",                   /* S/MIME sign parameters */
-     0,                         /* check time to use */
-     0,                         /* inheritance flags */
-     0,                         /* flags */
-     X509_PURPOSE_SMIME_SIGN,   /* purpose */
-     X509_TRUST_EMAIL,          /* trust */
-     -1,                        /* depth */
-     -1,                        /* auth_level */
-     NULL,                      /* policies */
-     vpm_empty_id
-    },
-    {
-     "smime_sign",              /* S/MIME sign parameters */
-     0,                         /* check time to use */
-     0,                         /* inheritance flags */
-     0,                         /* flags */
-     X509_PURPOSE_SMIME_SIGN,   /* purpose */
-     X509_TRUST_EMAIL,          /* trust */
-     -1,                        /* depth */
-     -1,                        /* auth_level */
-     NULL,                      /* policies */
-     vpm_empty_id
-    },
-    {
-     "ssl_client",              /* SSL/TLS client parameters */
-     0,                         /* check time to use */
-     0,                         /* inheritance flags */
-     0,                         /* flags */
-     X509_PURPOSE_SSL_CLIENT,   /* purpose */
-     X509_TRUST_SSL_CLIENT,     /* trust */
-     -1,                        /* depth */
-     -1,                        /* auth_level */
-     NULL,                      /* policies */
-     vpm_empty_id
-    },
-    {
-     "ssl_server",              /* SSL/TLS server parameters */
-     0,                         /* check time to use */
-     0,                         /* inheritance flags */
-     0,                         /* flags */
-     X509_PURPOSE_SSL_SERVER,   /* purpose */
-     X509_TRUST_SSL_SERVER,     /* trust */
-     -1,                        /* depth */
-     -1,                        /* auth_level */
-     NULL,                      /* policies */
-     vpm_empty_id
-    }
+    { "code_sign", /* Code sign parameters */
+        0, /* check time to use */
+        0, /* inheritance flags */
+        0, /* flags */
+        X509_PURPOSE_CODE_SIGN, /* purpose */
+        X509_TRUST_OBJECT_SIGN, /* trust */
+        -1, /* depth */
+        -1, /* auth_level */
+        NULL, /* policies */
+        vpm_empty_id },
+    { "default", /* X509 default parameters */
+        0, /* check time to use */
+        0, /* inheritance flags */
+        X509_V_FLAG_TRUSTED_FIRST, /* flags */
+        0, /* purpose */
+        0, /* trust */
+        100, /* depth */
+        -1, /* auth_level */
+        NULL, /* policies */
+        vpm_empty_id },
+    { "pkcs7", /* S/MIME sign parameters */
+        0, /* check time to use */
+        0, /* inheritance flags */
+        0, /* flags */
+        X509_PURPOSE_SMIME_SIGN, /* purpose */
+        X509_TRUST_EMAIL, /* trust */
+        -1, /* depth */
+        -1, /* auth_level */
+        NULL, /* policies */
+        vpm_empty_id },
+    { "smime_sign", /* S/MIME sign parameters */
+        0, /* check time to use */
+        0, /* inheritance flags */
+        0, /* flags */
+        X509_PURPOSE_SMIME_SIGN, /* purpose */
+        X509_TRUST_EMAIL, /* trust */
+        -1, /* depth */
+        -1, /* auth_level */
+        NULL, /* policies */
+        vpm_empty_id },
+    { "ssl_client", /* SSL/TLS client parameters */
+        0, /* check time to use */
+        0, /* inheritance flags */
+        0, /* flags */
+        X509_PURPOSE_SSL_CLIENT, /* purpose */
+        X509_TRUST_SSL_CLIENT, /* trust */
+        -1, /* depth */
+        -1, /* auth_level */
+        NULL, /* policies */
+        vpm_empty_id },
+    { "ssl_server", /* SSL/TLS server parameters */
+        0, /* check time to use */
+        0, /* inheritance flags */
+        0, /* flags */
+        X509_PURPOSE_SSL_SERVER, /* purpose */
+        X509_TRUST_SSL_SERVER, /* trust */
+        -1, /* depth */
+        -1, /* auth_level */
+        NULL, /* policies */
+        vpm_empty_id }
 };
 
 static STACK_OF(X509_VERIFY_PARAM) *param_table = NULL;
@@ -595,7 +580,7 @@ DECLARE_OBJ_BSEARCH_CMP_FN(X509_VERIFY_PARAM, X509_VERIFY_PARAM, table);
 IMPLEMENT_OBJ_BSEARCH_CMP_FN(X509_VERIFY_PARAM, X509_VERIFY_PARAM, table);
 
 static int param_cmp(const X509_VERIFY_PARAM *const *a,
-                     const X509_VERIFY_PARAM *const *b)
+    const X509_VERIFY_PARAM *const *b)
 {
     return strcmp((*a)->name, (*b)->name);
 }
@@ -635,6 +620,11 @@ const X509_VERIFY_PARAM *X509_VERIFY_PARAM_get0(int id)
 {
     int num = OSSL_NELEM(default_table);
 
+    if (id < 0) {
+        ERR_raise(ERR_LIB_X509, ERR_R_PASSED_INVALID_ARGUMENT);
+        return NULL;
+    }
+
     if (id < num)
         return default_table + id;
     return sk_X509_VERIFY_PARAM_value(param_table, id - num);
diff --git a/crypto/x509/x509aset.c b/crypto/x509/x509aset.c
index 8200ea444021e..03afc4ae566de 100644
--- a/crypto/x509/x509aset.c
+++ b/crypto/x509/x509aset.c
@@ -75,9 +75,9 @@ static int replace_dirName(GENERAL_NAMES **names, const X509_NAME *dirName)
 }
 
 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)
 {
 
     if (ASN1_ENUMERATED_set(&o->digestedObjectType, digestedObjectType) <= 0)
@@ -93,19 +93,19 @@ int OSSL_OBJECT_DIGEST_INFO_set1_digest(OSSL_OBJECT_DIGEST_INFO *o,
 }
 
 int OSSL_ISSUER_SERIAL_set1_issuer(OSSL_ISSUER_SERIAL *isss,
-                                   const X509_NAME *issuer)
+    const X509_NAME *issuer)
 {
     return replace_dirName(&isss->issuer, issuer);
 }
 
 int OSSL_ISSUER_SERIAL_set1_serial(OSSL_ISSUER_SERIAL *isss,
-                                   const ASN1_INTEGER *serial)
+    const ASN1_INTEGER *serial)
 {
     return ASN1_STRING_copy(&isss->serial, serial);
 }
 
 int OSSL_ISSUER_SERIAL_set1_issuerUID(OSSL_ISSUER_SERIAL *isss,
-                                      const ASN1_BIT_STRING *uid)
+    const ASN1_BIT_STRING *uid)
 {
     ASN1_BIT_STRING_free(isss->issuerUID);
     isss->issuerUID = ASN1_STRING_dup(uid);
@@ -128,14 +128,14 @@ void X509_ACERT_set0_holder_entityName(X509_ACERT *x, GENERAL_NAMES *names)
 }
 
 void X509_ACERT_set0_holder_baseCertId(X509_ACERT *x,
-                                       OSSL_ISSUER_SERIAL *isss)
+    OSSL_ISSUER_SERIAL *isss)
 {
     OSSL_ISSUER_SERIAL_free(x->acinfo->holder.baseCertificateID);
     x->acinfo->holder.baseCertificateID = isss;
 }
 
 void X509_ACERT_set0_holder_digest(X509_ACERT *x,
-                                   OSSL_OBJECT_DIGEST_INFO *dinfo)
+    OSSL_OBJECT_DIGEST_INFO *dinfo)
 {
     OSSL_OBJECT_DIGEST_INFO_free(x->acinfo->holder.objectDigestInfo);
     x->acinfo->holder.objectDigestInfo = dinfo;
diff --git a/crypto/x509/x509cset.c b/crypto/x509/x509cset.c
index e5dd4d5c3a3dd..6c86bb0d5e073 100644
--- a/crypto/x509/x509cset.c
+++ b/crypto/x509/x509cset.c
@@ -126,7 +126,7 @@ 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)
 {
     if (psig != NULL)
         *psig = &crl->signature;
@@ -168,8 +168,7 @@ int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial)
     return 1;
 }
 
-const STACK_OF(X509_EXTENSION) *X509_REVOKED_get0_extensions(const
-                                                             X509_REVOKED *r)
+const STACK_OF(X509_EXTENSION) *X509_REVOKED_get0_extensions(const X509_REVOKED *r)
 {
     return r->extensions;
 }
diff --git a/crypto/x509/x509name.c b/crypto/x509/x509name.c
index 75ff07d899da3..5ecc14c1833b0 100644
--- a/crypto/x509/x509name.c
+++ b/crypto/x509/x509name.c
@@ -17,7 +17,7 @@
 #include "crypto/x509.h"
 
 int X509_NAME_get_text_by_NID(const X509_NAME *name, int nid,
-                              char *buf, int len)
+    char *buf, int len)
 {
     ASN1_OBJECT *obj;
 
@@ -28,7 +28,7 @@ int X509_NAME_get_text_by_NID(const X509_NAME *name, int nid,
 }
 
 int X509_NAME_get_text_by_OBJ(const X509_NAME *name, const ASN1_OBJECT *obj,
-                              char *buf, int len)
+    char *buf, int len)
 {
     int i;
     const ASN1_STRING *data;
@@ -69,7 +69,7 @@ int X509_NAME_get_index_by_NID(const X509_NAME *name, int nid, int lastpos)
 
 /* NOTE: you should be passing -1, not 0 as lastpos */
 int X509_NAME_get_index_by_OBJ(const X509_NAME *name, const ASN1_OBJECT *obj,
-                               int lastpos)
+    int lastpos)
 {
     int n;
     X509_NAME_ENTRY *ne;
@@ -139,8 +139,8 @@ X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
 }
 
 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)
 {
     X509_NAME_ENTRY *ne;
     int ret;
@@ -154,8 +154,8 @@ int X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type
 }
 
 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 *ne;
     int ret;
@@ -168,8 +168,8 @@ int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
 }
 
 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 *ne;
     int ret;
@@ -186,7 +186,7 @@ int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
  * guy we are about to stomp on.
  */
 int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc,
-                        int set)
+    int set)
 {
     X509_NAME_ENTRY *new_name = NULL;
     int n, i, inc;
@@ -210,7 +210,7 @@ int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc,
         } else {
             set = sk_X509_NAME_ENTRY_value(sk, loc - 1)->set;
         }
-    } else {                    /* if (set >= 0) */
+    } else { /* if (set >= 0) */
 
         if (loc >= n) {
             if (loc != 0)
@@ -234,15 +234,15 @@ int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne, int loc,
             sk_X509_NAME_ENTRY_value(sk, i)->set += 1;
     }
     return 1;
- err:
+err:
     X509_NAME_ENTRY_free(new_name);
     return 0;
 }
 
 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)
 {
     ASN1_OBJECT *obj;
     X509_NAME_ENTRY *nentry;
@@ -250,7 +250,7 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
     obj = OBJ_txt2obj(field, 0);
     if (obj == NULL) {
         ERR_raise_data(ERR_LIB_X509, X509_R_INVALID_FIELD_NAME,
-                       "name=%s", field);
+            "name=%s", field);
         return NULL;
     }
     nentry = X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);
@@ -259,9 +259,9 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
 }
 
 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)
 {
     ASN1_OBJECT *obj;
     X509_NAME_ENTRY *nentry;
@@ -277,9 +277,9 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
 }
 
 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)
 {
     X509_NAME_ENTRY *ret;
 
@@ -297,7 +297,7 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
     if ((ne != NULL) && (*ne == NULL))
         *ne = ret;
     return ret;
- err:
+err:
     if ((ne == NULL) || (ret != *ne))
         X509_NAME_ENTRY_free(ret);
     return NULL;
@@ -315,7 +315,7 @@ 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)
 {
     int i;
 
@@ -323,8 +323,10 @@ int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
         return 0;
     if ((type > 0) && (type & MBSTRING_FLAG))
         return ASN1_STRING_set_by_NID(&ne->value, bytes,
-                                      len, type,
-                                      OBJ_obj2nid(ne->object)) ? 1 : 0;
+                   len, type,
+                   OBJ_obj2nid(ne->object))
+            ? 1
+            : 0;
     if (len < 0)
         len = strlen((const char *)bytes);
     i = ASN1_STRING_set(ne->value, bytes, len);
diff --git a/crypto/x509/x509type.c b/crypto/x509/x509type.c
index 79fd5e7db6091..6a499a91da7ed 100644
--- a/crypto/x509/x509type.c
+++ b/crypto/x509/x509type.c
@@ -32,7 +32,7 @@ int X509_certificate_type(const X509 *x, const EVP_PKEY *pkey)
     switch (EVP_PKEY_get_id(pk)) {
     case EVP_PKEY_RSA:
         ret = EVP_PK_RSA | EVP_PKT_SIGN;
-/*              if (!sign only extension) */
+        /*              if (!sign only extension) */
         ret |= EVP_PKT_ENC;
         break;
     case EVP_PKEY_RSA_PSS:
diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c
index 845b53837edcb..1de8274c28cf3 100644
--- a/crypto/x509/x_all.c
+++ b/crypto/x509/x_all.c
@@ -36,12 +36,12 @@ int X509_verify(X509 *a, EVP_PKEY *r)
         return 0;
 
     return ASN1_item_verify_ex(ASN1_ITEM_rptr(X509_CINF), &a->sig_alg,
-                               &a->signature, &a->cert_info,
-                               a->distinguishing_id, r, a->libctx, a->propq);
+        &a->signature, &a->cert_info,
+        a->distinguishing_id, r, a->libctx, a->propq);
 }
 
 int X509_REQ_verify_ex(X509_REQ *a, EVP_PKEY *r, OSSL_LIB_CTX *libctx,
-                       const char *propq)
+    const char *propq)
 {
     if (X509_REQ_get_version(a) != X509_REQ_VERSION_1) {
         ERR_raise(ERR_LIB_X509, X509_R_UNSUPPORTED_VERSION);
@@ -49,8 +49,8 @@ int X509_REQ_verify_ex(X509_REQ *a, EVP_PKEY *r, OSSL_LIB_CTX *libctx,
     }
 
     return ASN1_item_verify_ex(ASN1_ITEM_rptr(X509_REQ_INFO), &a->sig_alg,
-                               a->signature, &a->req_info, a->distinguishing_id,
-                               r, libctx, propq);
+        a->signature, &a->req_info, a->distinguishing_id,
+        r, libctx, propq);
 }
 
 int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r)
@@ -64,14 +64,14 @@ int X509_ACERT_verify(X509_ACERT *a, EVP_PKEY *r)
         return 0;
 
     return ASN1_item_verify_ex(ASN1_ITEM_rptr(X509_ACERT_INFO), &a->sig_alg,
-                               &a->signature, a->acinfo,
-                               NULL, r, NULL, NULL);
+        &a->signature, a->acinfo,
+        NULL, r, NULL, NULL);
 }
 
 int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r)
 {
     return ASN1_item_verify(ASN1_ITEM_rptr(NETSCAPE_SPKAC),
-                            &a->sig_algor, a->signature, a->spkac, r);
+        &a->sig_algor, a->signature, a->spkac, r);
 }
 
 int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
@@ -81,7 +81,7 @@ int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
         return 0;
     }
     if (sk_X509_EXTENSION_num(X509_get0_extensions(x)) > 0
-            && !X509_set_version(x, X509_VERSION_3))
+        && !X509_set_version(x, X509_VERSION_3))
         return 0;
 
     /*
@@ -93,8 +93,8 @@ int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
      */
     x->cert_info.enc.modified = 1;
     return ASN1_item_sign_ex(ASN1_ITEM_rptr(X509_CINF), &x->cert_info.signature,
-                             &x->sig_alg, &x->signature, &x->cert_info, NULL,
-                             pkey, md, x->libctx, x->propq);
+        &x->sig_alg, &x->signature, &x->cert_info, NULL,
+        pkey, md, x->libctx, x->propq);
 }
 
 int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx)
@@ -104,25 +104,24 @@ int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx)
         return 0;
     }
     if (sk_X509_EXTENSION_num(X509_get0_extensions(x)) > 0
-            && !X509_set_version(x, X509_VERSION_3))
+        && !X509_set_version(x, X509_VERSION_3))
         return 0;
     x->cert_info.enc.modified = 1;
     return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_CINF),
-                              &x->cert_info.signature,
-                              &x->sig_alg, &x->signature, &x->cert_info, ctx);
+        &x->cert_info.signature,
+        &x->sig_alg, &x->signature, &x->cert_info, ctx);
 }
 
 static ASN1_VALUE *simple_get_asn1(const char *url, BIO *bio, BIO *rbio,
-                                   int timeout, const ASN1_ITEM *it)
+    int timeout, const ASN1_ITEM *it)
 {
 #ifndef OPENSSL_NO_HTTP
-    size_t max_resp_len = (it == ASN1_ITEM_rptr(X509_CRL)) ?
-        OSSL_HTTP_DEFAULT_MAX_CRL_LEN : OSSL_HTTP_DEFAULT_MAX_RESP_LEN;
+    size_t max_resp_len = (it == ASN1_ITEM_rptr(X509_CRL)) ? OSSL_HTTP_DEFAULT_MAX_CRL_LEN : OSSL_HTTP_DEFAULT_MAX_RESP_LEN;
     BIO *mem = OSSL_HTTP_get(url, NULL /* proxy */, NULL /* no_proxy */,
-                             bio, rbio, NULL /* cb */, NULL /* arg */,
-                             1024 /* buf_size */, NULL /* headers */,
-                             NULL /* expected_ct */, 1 /* expect_asn1 */,
-                             max_resp_len, timeout);
+        bio, rbio, NULL /* cb */, NULL /* arg */,
+        1024 /* buf_size */, NULL /* headers */,
+        NULL /* expected_ct */, 1 /* expect_asn1 */,
+        max_resp_len, timeout);
     ASN1_VALUE *res = ASN1_item_d2i_bio(it, mem, NULL);
 
     BIO_free(mem);
@@ -135,7 +134,7 @@ static ASN1_VALUE *simple_get_asn1(const char *url, BIO *bio, BIO *rbio,
 X509 *X509_load_http(const char *url, BIO *bio, BIO *rbio, int timeout)
 {
     return (X509 *)simple_get_asn1(url, bio, rbio, timeout,
-                                   ASN1_ITEM_rptr(X509));
+        ASN1_ITEM_rptr(X509));
 }
 
 int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md)
@@ -146,8 +145,8 @@ int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md)
     }
     x->req_info.enc.modified = 1;
     return ASN1_item_sign_ex(ASN1_ITEM_rptr(X509_REQ_INFO), &x->sig_alg, NULL,
-                             x->signature, &x->req_info, NULL,
-                             pkey, md, x->libctx, x->propq);
+        x->signature, &x->req_info, NULL,
+        pkey, md, x->libctx, x->propq);
 }
 
 int X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx)
@@ -158,8 +157,8 @@ int X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx)
     }
     x->req_info.enc.modified = 1;
     return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_REQ_INFO),
-                              &x->sig_alg, NULL, x->signature, &x->req_info,
-                              ctx);
+        &x->sig_alg, NULL, x->signature, &x->req_info,
+        ctx);
 }
 
 int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md)
@@ -170,8 +169,8 @@ int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md)
     }
     x->crl.enc.modified = 1;
     return ASN1_item_sign_ex(ASN1_ITEM_rptr(X509_CRL_INFO), &x->crl.sig_alg,
-                             &x->sig_alg, &x->signature, &x->crl, NULL,
-                             pkey, md, x->libctx, x->propq);
+        &x->sig_alg, &x->signature, &x->crl, NULL,
+        pkey, md, x->libctx, x->propq);
 }
 
 int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx)
@@ -182,36 +181,35 @@ int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx)
     }
     x->crl.enc.modified = 1;
     return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_CRL_INFO),
-                              &x->crl.sig_alg, &x->sig_alg, &x->signature,
-                              &x->crl, ctx);
+        &x->crl.sig_alg, &x->sig_alg, &x->signature,
+        &x->crl, ctx);
 }
 
 X509_CRL *X509_CRL_load_http(const char *url, BIO *bio, BIO *rbio, int timeout)
 {
     return (X509_CRL *)simple_get_asn1(url, bio, rbio, timeout,
-                                       ASN1_ITEM_rptr(X509_CRL));
+        ASN1_ITEM_rptr(X509_CRL));
 }
 
 int X509_ACERT_sign(X509_ACERT *x, EVP_PKEY *pkey, const EVP_MD *md)
 {
     return ASN1_item_sign_ex(ASN1_ITEM_rptr(X509_ACERT_INFO), &x->sig_alg,
-                             &x->acinfo->signature,
-                             &x->signature, x->acinfo, NULL,
-                             pkey, md, NULL, NULL);
+        &x->acinfo->signature,
+        &x->signature, x->acinfo, NULL,
+        pkey, md, NULL, NULL);
 }
 
 int X509_ACERT_sign_ctx(X509_ACERT *x, EVP_MD_CTX *ctx)
 {
     return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_ACERT_INFO),
-                              &x->sig_alg, &x->acinfo->signature, &x->signature,
-                              x->acinfo, ctx);
+        &x->sig_alg, &x->acinfo->signature, &x->signature,
+        x->acinfo, ctx);
 }
 
 int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md)
 {
-    return
-        ASN1_item_sign_ex(ASN1_ITEM_rptr(NETSCAPE_SPKAC), &x->sig_algor, NULL,
-                          x->signature, x->spkac, NULL, pkey, md, NULL, NULL);
+    return ASN1_item_sign_ex(ASN1_ITEM_rptr(NETSCAPE_SPKAC), &x->sig_algor, NULL,
+        x->signature, x->spkac, NULL, pkey, md, NULL, NULL);
 }
 
 #ifndef OPENSSL_NO_STDIO
@@ -326,8 +324,7 @@ X509_REQ *d2i_X509_REQ_bio(BIO *bp, X509_REQ **req)
         propq = (*req)->propq;
     }
 
-    return
-        ASN1_item_d2i_bio_ex(ASN1_ITEM_rptr(X509_REQ), bp, req, libctx, propq);
+    return ASN1_item_d2i_bio_ex(ASN1_ITEM_rptr(X509_REQ), bp, req, libctx, propq);
 }
 
 int i2d_X509_REQ_bio(BIO *bp, const X509_REQ *req)
@@ -354,8 +351,9 @@ RSA *d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa)
 RSA *d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa)
 {
     return ASN1_d2i_fp((void *(*)(void))
-                       RSA_new, (D2I_OF(void)) d2i_RSA_PUBKEY, fp,
-                       (void **)rsa);
+                           RSA_new,
+        (D2I_OF(void))d2i_RSA_PUBKEY, fp,
+        (void **)rsa);
 }
 
 int i2d_RSAPublicKey_fp(FILE *fp, const RSA *rsa)
@@ -400,7 +398,7 @@ int i2d_RSA_PUBKEY_bio(BIO *bp, const RSA *rsa)
 }
 
 #ifndef OPENSSL_NO_DSA
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa)
 {
     return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSAPrivateKey, fp, dsa);
@@ -420,7 +418,7 @@ int i2d_DSA_PUBKEY_fp(FILE *fp, const DSA *dsa)
 {
     return ASN1_i2d_fp_of(DSA, i2d_DSA_PUBKEY, fp, dsa);
 }
-# endif
+#endif
 
 DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa)
 {
@@ -445,7 +443,7 @@ int i2d_DSA_PUBKEY_bio(BIO *bp, const DSA *dsa)
 #endif
 
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 EC_KEY *d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey)
 {
     return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, fp, eckey);
@@ -465,7 +463,7 @@ int i2d_ECPrivateKey_fp(FILE *fp, const EC_KEY *eckey)
 {
     return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey);
 }
-# endif
+#endif
 EC_KEY *d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey)
 {
     return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, bp, eckey);
@@ -488,7 +486,7 @@ int i2d_ECPrivateKey_bio(BIO *bp, const EC_KEY *eckey)
 #endif
 
 int X509_pubkey_digest(const X509 *data, const EVP_MD *type,
-                       unsigned char *md, unsigned int *len)
+    unsigned char *md, unsigned int *len)
 {
     ASN1_BIT_STRING *key = X509_get0_pubkey_bitstr(data);
 
@@ -498,10 +496,10 @@ int X509_pubkey_digest(const X509 *data, const EVP_MD *type,
 }
 
 int X509_digest(const X509 *cert, const EVP_MD *md, unsigned char *data,
-                unsigned int *len)
+    unsigned int *len)
 {
     if (EVP_MD_is_a(md, SN_sha1) && (cert->ex_flags & EXFLAG_SET) != 0
-            && (cert->ex_flags & EXFLAG_NO_FINGERPRINT) == 0) {
+        && (cert->ex_flags & EXFLAG_NO_FINGERPRINT) == 0) {
         /* Asking for SHA1 and we already computed it. */
         if (len != NULL)
             *len = sizeof(cert->sha1_hash);
@@ -509,12 +507,12 @@ int X509_digest(const X509 *cert, const EVP_MD *md, unsigned char *data,
         return 1;
     }
     return ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(X509), md, (char *)cert,
-                                    data, len, cert->libctx, cert->propq);
+        data, len, cert->libctx, cert->propq);
 }
 
 /* calculate cert digest using the same hash algorithm as in its signature */
 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)
 {
     unsigned int len;
     unsigned char hash[EVP_MAX_MD_SIZE];
@@ -546,8 +544,8 @@ ASN1_OCTET_STRING *X509_digest_sig(const X509 *cert,
 
             if (pss == NULL
                 || !ossl_rsa_pss_get_param_unverified(pss, &mmd, &mgf1md,
-                                                      &saltlen,
-                                                      &trailerfield)
+                    &saltlen,
+                    &trailerfield)
                 || mmd == NULL) {
                 RSA_PSS_PARAMS_free(pss);
                 ERR_raise(ERR_LIB_X509, X509_R_UNSUPPORTED_ALGORITHM);
@@ -556,7 +554,8 @@ ASN1_OCTET_STRING *X509_digest_sig(const X509 *cert,
             RSA_PSS_PARAMS_free(pss);
             /* Fetch explicitly and do not fallback */
             if ((md = EVP_MD_fetch(cert->libctx, EVP_MD_get0_name(mmd),
-                                   cert->propq)) == NULL)
+                     cert->propq))
+                == NULL)
                 /* Error code from fetch is sufficient */
                 return NULL;
         } else if (pknid != NID_undef) {
@@ -573,7 +572,8 @@ ASN1_OCTET_STRING *X509_digest_sig(const X509 *cert,
                 break;
             }
             if ((md = EVP_MD_fetch(cert->libctx, md_name,
-                                   cert->propq)) == NULL)
+                     cert->propq))
+                == NULL)
                 return NULL;
             if (md_is_fallback != NULL)
                 *md_is_fallback = 1;
@@ -583,13 +583,14 @@ ASN1_OCTET_STRING *X509_digest_sig(const X509 *cert,
             return NULL;
         }
     } else if ((md = EVP_MD_fetch(cert->libctx, OBJ_nid2sn(mdnid),
-                                  cert->propq)) == NULL
-               && (md = (EVP_MD *)EVP_get_digestbynid(mdnid)) == NULL) {
+                    cert->propq))
+            == NULL
+        && (md = (EVP_MD *)EVP_get_digestbynid(mdnid)) == NULL) {
         ERR_raise(ERR_LIB_X509, X509_R_UNSUPPORTED_ALGORITHM);
         return NULL;
     }
     if (!X509_digest(cert, md, hash, &len)
-            || (new = ASN1_OCTET_STRING_new()) == NULL)
+        || (new = ASN1_OCTET_STRING_new()) == NULL)
         goto err;
     if (ASN1_OCTET_STRING_set(new, hash, len)) {
         if (md_used != NULL)
@@ -599,53 +600,51 @@ ASN1_OCTET_STRING *X509_digest_sig(const X509 *cert,
         return new;
     }
     ASN1_OCTET_STRING_free(new);
- err:
+err:
     EVP_MD_free(md);
     return NULL;
 }
 
 int X509_CRL_digest(const X509_CRL *data, const EVP_MD *type,
-                    unsigned char *md, unsigned int *len)
+    unsigned char *md, unsigned int *len)
 {
     if (type == NULL) {
         ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER);
         return 0;
     }
     if (EVP_MD_is_a(type, SN_sha1)
-            && (data->flags & EXFLAG_SET) != 0
-            && (data->flags & EXFLAG_NO_FINGERPRINT) == 0) {
+        && (data->flags & EXFLAG_SET) != 0
+        && (data->flags & EXFLAG_NO_FINGERPRINT) == 0) {
         /* Asking for SHA1; always computed in CRL d2i. */
         if (len != NULL)
             *len = sizeof(data->sha1_hash);
         memcpy(md, data->sha1_hash, sizeof(data->sha1_hash));
         return 1;
     }
-    return
-        ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(X509_CRL), type, (char *)data,
-                                 md, len, data->libctx, data->propq);
+    return ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(X509_CRL), type, (char *)data,
+        md, len, data->libctx, data->propq);
 }
 
 int X509_REQ_digest(const X509_REQ *data, const EVP_MD *type,
-                    unsigned char *md, unsigned int *len)
+    unsigned char *md, unsigned int *len)
 {
-    return
-        ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(X509_REQ), type, (char *)data,
-                                 md, len, data->libctx, data->propq);
+    return ossl_asn1_item_digest_ex(ASN1_ITEM_rptr(X509_REQ), type, (char *)data,
+        md, len, data->libctx, data->propq);
 }
 
 int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type,
-                     unsigned char *md, unsigned int *len)
+    unsigned char *md, unsigned int *len)
 {
     return ASN1_item_digest(ASN1_ITEM_rptr(X509_NAME), type, (char *)data,
-                            md, len);
+        md, len);
 }
 
 int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,
-                                   const EVP_MD *type, unsigned char *md,
-                                   unsigned int *len)
+    const EVP_MD *type, unsigned char *md,
+    unsigned int *len)
 {
     return ASN1_item_digest(ASN1_ITEM_rptr(PKCS7_ISSUER_AND_SERIAL), type,
-                            (char *)data, md, len);
+        (char *)data, md, len);
 }
 
 #ifndef OPENSSL_NO_STDIO
@@ -674,7 +673,7 @@ int i2d_PKCS8_bio(BIO *bp, const X509_SIG *p8)
 X509_PUBKEY *d2i_X509_PUBKEY_fp(FILE *fp, X509_PUBKEY **xpk)
 {
     return ASN1_d2i_fp_of(X509_PUBKEY, X509_PUBKEY_new, d2i_X509_PUBKEY,
-                          fp, xpk);
+        fp, xpk);
 }
 
 int i2d_X509_PUBKEY_fp(FILE *fp, const X509_PUBKEY *xpk)
@@ -686,7 +685,7 @@ int i2d_X509_PUBKEY_fp(FILE *fp, const X509_PUBKEY *xpk)
 X509_PUBKEY *d2i_X509_PUBKEY_bio(BIO *bp, X509_PUBKEY **xpk)
 {
     return ASN1_d2i_bio_of(X509_PUBKEY, X509_PUBKEY_new, d2i_X509_PUBKEY,
-                           bp, xpk);
+        bp, xpk);
 }
 
 int i2d_X509_PUBKEY_bio(BIO *bp, const X509_PUBKEY *xpk)
@@ -696,16 +695,16 @@ int i2d_X509_PUBKEY_bio(BIO *bp, const X509_PUBKEY *xpk)
 
 #ifndef OPENSSL_NO_STDIO
 PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,
-                                                PKCS8_PRIV_KEY_INFO **p8inf)
+    PKCS8_PRIV_KEY_INFO **p8inf)
 {
     return ASN1_d2i_fp_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new,
-                          d2i_PKCS8_PRIV_KEY_INFO, fp, p8inf);
+        d2i_PKCS8_PRIV_KEY_INFO, fp, p8inf);
 }
 
 int i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, const PKCS8_PRIV_KEY_INFO *p8inf)
 {
     return ASN1_i2d_fp_of(PKCS8_PRIV_KEY_INFO, i2d_PKCS8_PRIV_KEY_INFO, fp,
-                          p8inf);
+        p8inf);
 }
 
 int i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, const EVP_PKEY *key)
@@ -732,7 +731,7 @@ EVP_PKEY *d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a)
 }
 
 EVP_PKEY *d2i_PrivateKey_ex_fp(FILE *fp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
-                               const char *propq)
+    const char *propq)
 {
     BIO *b;
     void *ret;
@@ -753,7 +752,7 @@ 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)
 {
     BIO *b;
     void *ret;
@@ -776,16 +775,16 @@ EVP_PKEY *d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a)
 #endif
 
 PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
-                                                 PKCS8_PRIV_KEY_INFO **p8inf)
+    PKCS8_PRIV_KEY_INFO **p8inf)
 {
     return ASN1_d2i_bio_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new,
-                           d2i_PKCS8_PRIV_KEY_INFO, bp, p8inf);
+        d2i_PKCS8_PRIV_KEY_INFO, bp, p8inf);
 }
 
 int i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, const PKCS8_PRIV_KEY_INFO *p8inf)
 {
     return ASN1_i2d_bio_of(PKCS8_PRIV_KEY_INFO, i2d_PKCS8_PRIV_KEY_INFO, bp,
-                           p8inf);
+        p8inf);
 }
 
 int i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, const EVP_PKEY *key)
@@ -812,7 +811,7 @@ EVP_PKEY *d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a)
 }
 
 EVP_PKEY *d2i_PrivateKey_ex_bio(BIO *bp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
-                                const char *propq)
+    const char *propq)
 {
     BUF_MEM *b = NULL;
     const unsigned char *p;
@@ -825,7 +824,7 @@ EVP_PKEY *d2i_PrivateKey_ex_bio(BIO *bp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
 
     p = (unsigned char *)b->data;
     ret = d2i_AutoPrivateKey_ex(a, &p, len, libctx, propq);
- err:
+err:
     BUF_MEM_free(b);
     return ret;
 }
@@ -836,7 +835,7 @@ 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)
 {
     BUF_MEM *b = NULL;
     const unsigned char *p;
@@ -849,7 +848,7 @@ EVP_PKEY *d2i_PUBKEY_ex_bio(BIO *bp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
 
     p = (unsigned char *)b->data;
     ret = d2i_PUBKEY_ex(a, &p, len, libctx, propq);
- err:
+err:
     BUF_MEM_free(b);
     return ret;
 }
diff --git a/crypto/x509/x_attrib.c b/crypto/x509/x_attrib.c
index 0bae13dd7377f..f4c225a8ff2be 100644
--- a/crypto/x509/x_attrib.c
+++ b/crypto/x509/x_attrib.c
@@ -27,8 +27,8 @@
  */
 
 ASN1_SEQUENCE(X509_ATTRIBUTE) = {
-        ASN1_SIMPLE(X509_ATTRIBUTE, object, ASN1_OBJECT),
-        ASN1_SET_OF(X509_ATTRIBUTE, set, ASN1_ANY)
+    ASN1_SIMPLE(X509_ATTRIBUTE, object, ASN1_OBJECT),
+    ASN1_SET_OF(X509_ATTRIBUTE, set, ASN1_ANY)
 } ASN1_SEQUENCE_END(X509_ATTRIBUTE)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_ATTRIBUTE)
@@ -52,13 +52,14 @@ X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value)
 
     ASN1_TYPE_set(val, atrtype, value);
     return ret;
- err:
+err:
     X509_ATTRIBUTE_free(ret);
     ASN1_TYPE_free(val);
     return NULL;
 }
 
-static int print_oid(BIO *out, const ASN1_OBJECT *oid) {
+static int print_oid(BIO *out, const ASN1_OBJECT *oid)
+{
     const char *ln;
     char objbuf[80];
     int rc;
@@ -67,15 +68,15 @@ static int print_oid(BIO *out, const ASN1_OBJECT *oid) {
         return 0;
     ln = OBJ_nid2ln(OBJ_obj2nid(oid));
     rc = (ln != NULL)
-           ? BIO_printf(out, "%s (%s)", objbuf, ln)
-           : BIO_printf(out, "%s", objbuf);
+        ? BIO_printf(out, "%s (%s)", objbuf, ln)
+        : BIO_printf(out, "%s", objbuf);
     return (rc >= 0);
 }
 
 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)
 {
     ASN1_STRING *str;
     unsigned char *value;
@@ -105,14 +106,14 @@ int ossl_print_attribute_value(BIO *out,
         if (BIO_printf(out, "%*s", indent, "") < 0)
             return 0;
         return ossl_bio_print_hex(out, av->value.bit_string->data,
-                                  av->value.bit_string->length);
+            av->value.bit_string->length);
 
     case V_ASN1_OCTET_STRING:
     case V_ASN1_VIDEOTEXSTRING:
         if (BIO_printf(out, "%*s", indent, "") < 0)
             return 0;
         return ossl_bio_print_hex(out, av->value.octet_string->data,
-                                  av->value.octet_string->length);
+            av->value.octet_string->length);
 
     case V_ASN1_NULL:
         return BIO_printf(out, "%*sNULL", indent, "") >= 4;
@@ -131,22 +132,24 @@ int ossl_print_attribute_value(BIO *out,
     case V_ASN1_GRAPHICSTRING:
     case V_ASN1_OBJECT_DESCRIPTOR:
         return BIO_printf(out, "%*s%.*s", indent, "",
-                          av->value.generalstring->length,
-                          av->value.generalstring->data) >= 0;
+                   av->value.generalstring->length,
+                   av->value.generalstring->data)
+            >= 0;
 
-    /* EXTERNAL would go here. */
-    /* EMBEDDED PDV would go here. */
+        /* EXTERNAL would go here. */
+        /* EMBEDDED PDV would go here. */
 
     case V_ASN1_UTF8STRING:
         return BIO_printf(out, "%*s%.*s", indent, "",
-                          av->value.utf8string->length,
-                          av->value.utf8string->data) >= 0;
+                   av->value.utf8string->length,
+                   av->value.utf8string->data)
+            >= 0;
 
     case V_ASN1_REAL:
         return BIO_printf(out, "%*sREAL", indent, "") >= 4;
 
-    /* RELATIVE-OID would go here. */
-    /* TIME would go here. */
+        /* RELATIVE-OID would go here. */
+        /* TIME would go here. */
 
     case V_ASN1_SEQUENCE:
         switch (obj_nid) {
@@ -169,8 +172,8 @@ int ossl_print_attribute_value(BIO *out,
              */
             value = av->value.sequence->data;
             xn = d2i_X509_NAME(NULL,
-                               (const unsigned char **)&value,
-                               av->value.sequence->length);
+                (const unsigned char **)&value,
+                av->value.sequence->length);
             if (xn == NULL) {
                 BIO_puts(out, "(COULD NOT DECODE DISTINGUISHED NAME)\n");
                 return 0;
@@ -184,11 +187,13 @@ int ossl_print_attribute_value(BIO *out,
             break;
         }
         return ASN1_parse_dump(out, av->value.sequence->data,
-                               av->value.sequence->length, indent, 1) > 0;
+                   av->value.sequence->length, indent, 1)
+            > 0;
 
     case V_ASN1_SET:
         return ASN1_parse_dump(out, av->value.set->data,
-                               av->value.set->length, indent, 1) > 0;
+                   av->value.set->length, indent, 1)
+            > 0;
 
     /*
      * UTCTime ::= [UNIVERSAL 23] IMPLICIT VisibleString
@@ -200,23 +205,27 @@ int ossl_print_attribute_value(BIO *out,
     case V_ASN1_GENERALIZEDTIME:
     case V_ASN1_NUMERICSTRING:
         return BIO_printf(out, "%*s%.*s", indent, "",
-                          av->value.visiblestring->length,
-                          av->value.visiblestring->data) >= 0;
+                   av->value.visiblestring->length,
+                   av->value.visiblestring->data)
+            >= 0;
 
     case V_ASN1_PRINTABLESTRING:
         return BIO_printf(out, "%*s%.*s", indent, "",
-                          av->value.printablestring->length,
-                          av->value.printablestring->data) >= 0;
+                   av->value.printablestring->length,
+                   av->value.printablestring->data)
+            >= 0;
 
     case V_ASN1_T61STRING:
         return BIO_printf(out, "%*s%.*s", indent, "",
-                          av->value.t61string->length,
-                          av->value.t61string->data) >= 0;
+                   av->value.t61string->length,
+                   av->value.t61string->data)
+            >= 0;
 
     case V_ASN1_IA5STRING:
         return BIO_printf(out, "%*s%.*s", indent, "",
-                          av->value.ia5string->length,
-                          av->value.ia5string->data) >= 0;
+                   av->value.ia5string->length,
+                   av->value.ia5string->data)
+            >= 0;
 
     /* UniversalString would go here. */
     /* CHARACTER STRING would go here. */
@@ -231,9 +240,10 @@ int ossl_print_attribute_value(BIO *out,
     /* Would it be appropriate to just hexdump? */
     default:
         return BIO_printf(out,
-                          "%*s<Unsupported tag %d>",
-                          indent,
-                          "",
-                          av->type) >= 0;
+                   "%*s<Unsupported tag %d>",
+                   indent,
+                   "",
+                   av->type)
+            >= 0;
     }
 }
diff --git a/crypto/x509/x_crl.c b/crypto/x509/x_crl.c
index 2601a019f87e3..4a93abb8ca3f9 100644
--- a/crypto/x509/x_crl.c
+++ b/crypto/x509/x_crl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -16,19 +16,19 @@
 #include "x509_local.h"
 
 static int X509_REVOKED_cmp(const X509_REVOKED *const *a,
-                            const X509_REVOKED *const *b);
+    const X509_REVOKED *const *b);
 static int setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp);
 
 ASN1_SEQUENCE(X509_REVOKED) = {
-        ASN1_EMBED(X509_REVOKED, serialNumber, ASN1_INTEGER),
-        ASN1_SIMPLE(X509_REVOKED, revocationDate, ASN1_TIME),
-        ASN1_SEQUENCE_OF_OPT(X509_REVOKED, extensions, X509_EXTENSION)
+    ASN1_EMBED(X509_REVOKED, serialNumber, ASN1_INTEGER),
+    ASN1_SIMPLE(X509_REVOKED, revocationDate, ASN1_TIME),
+    ASN1_SEQUENCE_OF_OPT(X509_REVOKED, extensions, X509_EXTENSION)
 } ASN1_SEQUENCE_END(X509_REVOKED)
 
 static int def_crl_verify(X509_CRL *crl, EVP_PKEY *r);
 static int def_crl_lookup(X509_CRL *crl,
-                          X509_REVOKED **ret, const ASN1_INTEGER *serial,
-                          const X509_NAME *issuer);
+    X509_REVOKED **ret, const ASN1_INTEGER *serial,
+    const X509_NAME *issuer);
 
 static X509_CRL_METHOD int_crl_meth = {
     0,
@@ -45,7 +45,7 @@ static const X509_CRL_METHOD *default_crl_method = &int_crl_meth;
  * revoked field.
  */
 static int crl_inf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                      void *exarg)
+    void *exarg)
 {
     X509_CRL_INFO *a = (X509_CRL_INFO *)*pval;
 
@@ -63,15 +63,14 @@ static int crl_inf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
     return 1;
 }
 
-
 ASN1_SEQUENCE_enc(X509_CRL_INFO, enc, crl_inf_cb) = {
-        ASN1_OPT(X509_CRL_INFO, version, ASN1_INTEGER),
-        ASN1_EMBED(X509_CRL_INFO, sig_alg, X509_ALGOR),
-        ASN1_SIMPLE(X509_CRL_INFO, issuer, X509_NAME),
-        ASN1_SIMPLE(X509_CRL_INFO, lastUpdate, ASN1_TIME),
-        ASN1_OPT(X509_CRL_INFO, nextUpdate, ASN1_TIME),
-        ASN1_SEQUENCE_OF_OPT(X509_CRL_INFO, revoked, X509_REVOKED),
-        ASN1_EXP_SEQUENCE_OF_OPT(X509_CRL_INFO, extensions, X509_EXTENSION, 0)
+    ASN1_OPT(X509_CRL_INFO, version, ASN1_INTEGER),
+    ASN1_EMBED(X509_CRL_INFO, sig_alg, X509_ALGOR),
+    ASN1_SIMPLE(X509_CRL_INFO, issuer, X509_NAME),
+    ASN1_SIMPLE(X509_CRL_INFO, lastUpdate, ASN1_TIME),
+    ASN1_OPT(X509_CRL_INFO, nextUpdate, ASN1_TIME),
+    ASN1_SEQUENCE_OF_OPT(X509_CRL_INFO, revoked, X509_REVOKED),
+    ASN1_EXP_SEQUENCE_OF_OPT(X509_CRL_INFO, extensions, X509_EXTENSION, 0)
 } ASN1_SEQUENCE_END_enc(X509_CRL_INFO, X509_CRL_INFO)
 
 /*
@@ -96,7 +95,7 @@ static int crl_set_issuers(X509_CRL *crl)
         X509_EXTENSION *ext;
 
         gtmp = X509_REVOKED_get_ext_d2i(rev,
-                                        NID_certificate_issuer, &j, NULL);
+            NID_certificate_issuer, &j, NULL);
         if (gtmp == NULL && j != -1) {
             crl->flags |= EXFLAG_INVALID;
             return 1;
@@ -144,11 +143,9 @@ static int crl_set_issuers(X509_CRL *crl)
                 break;
             }
         }
-
     }
 
     return 1;
-
 }
 
 /*
@@ -156,7 +153,7 @@ static int crl_set_issuers(X509_CRL *crl)
  * and hash of the whole CRL or set EXFLAG_NO_FINGERPRINT if this fails.
  */
 static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                  void *exarg)
+    void *exarg)
 {
     X509_CRL *crl = (X509_CRL *)*pval;
     STACK_OF(X509_EXTENSION) *exts;
@@ -193,30 +190,29 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         if (!X509_CRL_digest(crl, EVP_sha1(), crl->sha1_hash, NULL))
             crl->flags |= EXFLAG_NO_FINGERPRINT;
         crl->idp = X509_CRL_get_ext_d2i(crl,
-                                        NID_issuing_distribution_point, &i,
-                                        NULL);
+            NID_issuing_distribution_point, &i,
+            NULL);
         if (crl->idp != NULL) {
             if (!setup_idp(crl, crl->idp))
                 crl->flags |= EXFLAG_INVALID;
-        }
-        else if (i != -1) {
+        } else if (i != -1) {
             crl->flags |= EXFLAG_INVALID;
         }
 
         crl->akid = X509_CRL_get_ext_d2i(crl,
-                                         NID_authority_key_identifier, &i,
-                                         NULL);
+            NID_authority_key_identifier, &i,
+            NULL);
         if (crl->akid == NULL && i != -1)
             crl->flags |= EXFLAG_INVALID;
 
         crl->crl_number = X509_CRL_get_ext_d2i(crl,
-                                               NID_crl_number, &i, NULL);
+            NID_crl_number, &i, NULL);
         if (crl->crl_number == NULL && i != -1)
             crl->flags |= EXFLAG_INVALID;
 
         crl->base_crl_number = X509_CRL_get_ext_d2i(crl,
-                                                    NID_delta_crl, &i,
-                                                    NULL);
+            NID_delta_crl, &i,
+            NULL);
         if (crl->base_crl_number == NULL && i != -1)
             crl->flags |= EXFLAG_INVALID;
         /* Delta CRLs must have CRL number */
@@ -272,14 +268,12 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         sk_GENERAL_NAMES_pop_free(crl->issuers, GENERAL_NAMES_free);
         OPENSSL_free(crl->propq);
         break;
-    case ASN1_OP_DUP_POST:
-        {
-            X509_CRL *old = exarg;
+    case ASN1_OP_DUP_POST: {
+        X509_CRL *old = exarg;
 
-            if (!ossl_x509_crl_set0_libctx(crl, old->libctx, old->propq))
-                return 0;
-        }
-        break;
+        if (!ossl_x509_crl_set0_libctx(crl, old->libctx, old->propq))
+            return 0;
+    } break;
     }
     return 1;
 }
@@ -289,6 +283,7 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 static int setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp)
 {
     int idp_only = 0;
+    int ret = 0;
 
     /* Set various flags according to IDP */
     crl->idp_flags |= IDP_PRESENT;
@@ -320,13 +315,23 @@ static int setup_idp(X509_CRL *crl, ISSUING_DIST_POINT *idp)
         crl->idp_reasons &= CRLDP_ALL_REASONS;
     }
 
-    return DIST_POINT_set_dpname(idp->distpoint, X509_CRL_get_issuer(crl));
+    ret = DIST_POINT_set_dpname(idp->distpoint, X509_CRL_get_issuer(crl));
+
+    /*
+     * RFC5280 specifies that if onlyContainsUserCerts, onlyContainsCACerts,
+     * indirectCRL, and OnlyContainsAttributeCerts are all FALSE, there must
+     * be either a distributionPoint field or an onlySomeReasons field present.
+     */
+    if (crl->idp_flags == IDP_PRESENT && idp->distpoint == NULL)
+        crl->idp_flags |= IDP_INVALID;
+
+    return ret;
 }
 
 ASN1_SEQUENCE_ref(X509_CRL, crl_cb) = {
-        ASN1_EMBED(X509_CRL, crl, X509_CRL_INFO),
-        ASN1_EMBED(X509_CRL, sig_alg, X509_ALGOR),
-        ASN1_EMBED(X509_CRL, signature, ASN1_BIT_STRING)
+    ASN1_EMBED(X509_CRL, crl, X509_CRL_INFO),
+    ASN1_EMBED(X509_CRL, sig_alg, X509_ALGOR),
+    ASN1_EMBED(X509_CRL, signature, ASN1_BIT_STRING)
 } ASN1_SEQUENCE_END_ref(X509_CRL, X509_CRL)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_REVOKED)
@@ -340,10 +345,10 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_CRL)
 IMPLEMENT_ASN1_DUP_FUNCTION(X509_CRL)
 
 static int X509_REVOKED_cmp(const X509_REVOKED *const *a,
-                            const X509_REVOKED *const *b)
+    const X509_REVOKED *const *b)
 {
     return (ASN1_STRING_cmp((ASN1_STRING *)&(*a)->serialNumber,
-                            (ASN1_STRING *)&(*b)->serialNumber));
+        (ASN1_STRING *)&(*b)->serialNumber));
 }
 
 X509_CRL *X509_CRL_new_ex(OSSL_LIB_CTX *libctx, const char *propq)
@@ -381,7 +386,7 @@ int X509_CRL_verify(X509_CRL *crl, EVP_PKEY *r)
 }
 
 int X509_CRL_get0_by_serial(X509_CRL *crl,
-                            X509_REVOKED **ret, const ASN1_INTEGER *serial)
+    X509_REVOKED **ret, const ASN1_INTEGER *serial)
 {
     if (crl->meth->crl_lookup)
         return crl->meth->crl_lookup(crl, ret, serial, NULL);
@@ -392,20 +397,20 @@ int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x)
 {
     if (crl->meth->crl_lookup)
         return crl->meth->crl_lookup(crl, ret,
-                                     X509_get0_serialNumber(x),
-                                     X509_get_issuer_name(x));
+            X509_get0_serialNumber(x),
+            X509_get_issuer_name(x));
     return 0;
 }
 
 static int def_crl_verify(X509_CRL *crl, EVP_PKEY *r)
 {
     return ASN1_item_verify_ex(ASN1_ITEM_rptr(X509_CRL_INFO),
-                               &crl->sig_alg, &crl->signature, &crl->crl, NULL,
-                               r, crl->libctx, crl->propq);
+        &crl->sig_alg, &crl->signature, &crl->crl, NULL,
+        r, crl->libctx, crl->propq);
 }
 
 static int crl_revoked_issuer_match(X509_CRL *crl, const X509_NAME *nm,
-                                    X509_REVOKED *rev)
+    X509_REVOKED *rev)
 {
     int i;
 
@@ -428,12 +433,11 @@ static int crl_revoked_issuer_match(X509_CRL *crl, const X509_NAME *nm,
             return 1;
     }
     return 0;
-
 }
 
 static int def_crl_lookup(X509_CRL *crl,
-                          X509_REVOKED **ret, const ASN1_INTEGER *serial,
-                          const X509_NAME *issuer)
+    X509_REVOKED **ret, const ASN1_INTEGER *serial,
+    const X509_NAME *issuer)
 {
     X509_REVOKED rtmp, *rev;
     int idx, num;
@@ -479,14 +483,14 @@ void X509_CRL_set_default_method(const X509_CRL_METHOD *meth)
         default_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 *ser,
-                                                        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 *ser,
+        const X509_NAME *issuer),
+    int (*crl_verify)(X509_CRL *crl,
+        EVP_PKEY *pk))
 {
     X509_CRL_METHOD *m = OPENSSL_malloc(sizeof(*m));
 
@@ -518,7 +522,7 @@ void *X509_CRL_get_meth_data(X509_CRL *crl)
 }
 
 int ossl_x509_crl_set0_libctx(X509_CRL *x, OSSL_LIB_CTX *libctx,
-                              const char *propq)
+    const char *propq)
 {
     if (x != NULL) {
         x->libctx = libctx;
diff --git a/crypto/x509/x_exten.c b/crypto/x509/x_exten.c
index f4be4dd0d6b8b..51b268433dff6 100644
--- a/crypto/x509/x_exten.c
+++ b/crypto/x509/x_exten.c
@@ -14,13 +14,12 @@
 #include "x509_local.h"
 
 ASN1_SEQUENCE(X509_EXTENSION) = {
-        ASN1_SIMPLE(X509_EXTENSION, object, ASN1_OBJECT),
-        ASN1_OPT(X509_EXTENSION, critical, ASN1_FBOOLEAN),
-        ASN1_EMBED(X509_EXTENSION, value, ASN1_OCTET_STRING)
+    ASN1_SIMPLE(X509_EXTENSION, object, ASN1_OBJECT),
+    ASN1_OPT(X509_EXTENSION, critical, ASN1_FBOOLEAN),
+    ASN1_EMBED(X509_EXTENSION, value, ASN1_OCTET_STRING)
 } ASN1_SEQUENCE_END(X509_EXTENSION)
 
-ASN1_ITEM_TEMPLATE(X509_EXTENSIONS) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Extension, X509_EXTENSION)
+ASN1_ITEM_TEMPLATE(X509_EXTENSIONS) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Extension, X509_EXTENSION)
 ASN1_ITEM_TEMPLATE_END(X509_EXTENSIONS)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_EXTENSION)
diff --git a/crypto/x509/x_ietfatt.c b/crypto/x509/x_ietfatt.c
index dd1c0ab347089..df68878dad437 100644
--- a/crypto/x509/x_ietfatt.c
+++ b/crypto/x509/x_ietfatt.c
@@ -56,20 +56,19 @@ ASN1_SEQUENCE(OSSL_IETF_ATTR_SYNTAX) = {
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(OSSL_IETF_ATTR_SYNTAX)
 IMPLEMENT_ASN1_ALLOC_FUNCTIONS(OSSL_IETF_ATTR_SYNTAX_VALUE)
 
-OSSL_IETF_ATTR_SYNTAX *d2i_OSSL_IETF_ATTR_SYNTAX (OSSL_IETF_ATTR_SYNTAX **a,
-                                                  const unsigned char **in,
-                                                  long len)
+OSSL_IETF_ATTR_SYNTAX *d2i_OSSL_IETF_ATTR_SYNTAX(OSSL_IETF_ATTR_SYNTAX **a,
+    const unsigned char **in,
+    long len)
 {
     OSSL_IETF_ATTR_SYNTAX *ias;
     int i;
 
-    ias = (OSSL_IETF_ATTR_SYNTAX *) ASN1_item_d2i((ASN1_VALUE **)a, in, len,
-                                                  OSSL_IETF_ATTR_SYNTAX_it());
+    ias = (OSSL_IETF_ATTR_SYNTAX *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
+        OSSL_IETF_ATTR_SYNTAX_it());
     if (ias == NULL)
         return ias;
 
-    for (i = 0; i < sk_OSSL_IETF_ATTR_SYNTAX_VALUE_num(ias->values); i++)
-    {
+    for (i = 0; i < sk_OSSL_IETF_ATTR_SYNTAX_VALUE_num(ias->values); i++) {
         OSSL_IETF_ATTR_SYNTAX_VALUE *val;
 
         val = sk_OSSL_IETF_ATTR_SYNTAX_VALUE_value(ias->values, i);
@@ -89,8 +88,8 @@ OSSL_IETF_ATTR_SYNTAX *d2i_OSSL_IETF_ATTR_SYNTAX (OSSL_IETF_ATTR_SYNTAX **a,
     return NULL;
 }
 
-int i2d_OSSL_IETF_ATTR_SYNTAX (const OSSL_IETF_ATTR_SYNTAX *a,
-                               unsigned char **out)
+int i2d_OSSL_IETF_ATTR_SYNTAX(const OSSL_IETF_ATTR_SYNTAX *a,
+    unsigned char **out)
 {
     return ASN1_item_i2d((const ASN1_VALUE *)a, out, OSSL_IETF_ATTR_SYNTAX_it());
 }
@@ -110,14 +109,14 @@ 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)
 {
     GENERAL_NAMES_free(a->policyAuthority);
     a->policyAuthority = names;
 }
 
 void *OSSL_IETF_ATTR_SYNTAX_get0_value(const OSSL_IETF_ATTR_SYNTAX *a,
-                                       int ind, int *type)
+    int ind, int *type)
 {
     OSSL_IETF_ATTR_SYNTAX_VALUE *val;
 
@@ -141,7 +140,7 @@ void *OSSL_IETF_ATTR_SYNTAX_get0_value(const OSSL_IETF_ATTR_SYNTAX *a,
 }
 
 int OSSL_IETF_ATTR_SYNTAX_add1_value(OSSL_IETF_ATTR_SYNTAX *a, int type,
-                                     void *data)
+    void *data)
 {
     OSSL_IETF_ATTR_SYNTAX_VALUE *val;
 
@@ -200,8 +199,7 @@ int OSSL_IETF_ATTR_SYNTAX_print(BIO *bp, OSSL_IETF_ATTR_SYNTAX *a, int indent)
             if (BIO_printf(bp, "%*s", indent, "") <= 0)
                 goto err;
 
-            if (GENERAL_NAME_print(bp, sk_GENERAL_NAME_value(a->policyAuthority,
-                                                             i)) <= 0)
+            if (GENERAL_NAME_print(bp, sk_GENERAL_NAME_value(a->policyAuthority, i)) <= 0)
                 goto err;
 
             if (BIO_printf(bp, "\n") <= 0)
@@ -223,7 +221,7 @@ int OSSL_IETF_ATTR_SYNTAX_print(BIO *bp, OSSL_IETF_ATTR_SYNTAX *a, int indent)
         switch (ietf_type) {
         case OSSL_IETFAS_OID:
             OBJ_obj2txt(oidstr, sizeof(oidstr), attr_value, 0);
-            BIO_printf(bp, "%.*s", (int) sizeof(oidstr), oidstr);
+            BIO_printf(bp, "%.*s", (int)sizeof(oidstr), oidstr);
             break;
         case OSSL_IETFAS_OCTETS:
         case OSSL_IETFAS_STRING:
diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c
index bcb480f58fd9d..91a1dd2a750f9 100644
--- a/crypto/x509/x_name.c
+++ b/crypto/x509/x_name.c
@@ -24,28 +24,28 @@
 #define X509_NAME_MAX (1024 * 1024)
 
 static int x509_name_ex_d2i(ASN1_VALUE **val,
-                            const unsigned char **in, long len,
-                            const ASN1_ITEM *it,
-                            int tag, int aclass, char opt, ASN1_TLC *ctx);
+    const unsigned char **in, long len,
+    const ASN1_ITEM *it,
+    int tag, int aclass, char opt, ASN1_TLC *ctx);
 
 static int x509_name_ex_i2d(const ASN1_VALUE **val, unsigned char **out,
-                            const ASN1_ITEM *it, int tag, int aclass);
+    const ASN1_ITEM *it, int tag, int aclass);
 static int x509_name_ex_new(ASN1_VALUE **val, const ASN1_ITEM *it);
 static void x509_name_ex_free(ASN1_VALUE **val, const ASN1_ITEM *it);
 
 static int x509_name_encode(X509_NAME *a);
 static int x509_name_canon(X509_NAME *a);
 static int asn1_string_canon(ASN1_STRING *out, const ASN1_STRING *in);
-static int i2d_name_canon(const STACK_OF(STACK_OF_X509_NAME_ENTRY) * intname,
-                          unsigned char **in);
+static int i2d_name_canon(const STACK_OF(STACK_OF_X509_NAME_ENTRY) *intname,
+    unsigned char **in);
 
 static int x509_name_ex_print(BIO *out, const ASN1_VALUE **pval,
-                              int indent,
-                              const char *fname, const ASN1_PCTX *pctx);
+    int indent,
+    const char *fname, const ASN1_PCTX *pctx);
 
 ASN1_SEQUENCE(X509_NAME_ENTRY) = {
-        ASN1_SIMPLE(X509_NAME_ENTRY, object, ASN1_OBJECT),
-        ASN1_SIMPLE(X509_NAME_ENTRY, value, ASN1_PRINTABLE)
+    ASN1_SIMPLE(X509_NAME_ENTRY, object, ASN1_OBJECT),
+    ASN1_SIMPLE(X509_NAME_ENTRY, value, ASN1_PRINTABLE)
 } ASN1_SEQUENCE_END(X509_NAME_ENTRY)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_NAME_ENTRY)
@@ -56,30 +56,30 @@ IMPLEMENT_ASN1_DUP_FUNCTION(X509_NAME_ENTRY)
  * declare two template wrappers for this
  */
 
-ASN1_ITEM_TEMPLATE(X509_NAME_ENTRIES) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, RDNS, X509_NAME_ENTRY)
+ASN1_ITEM_TEMPLATE(X509_NAME_ENTRIES) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_OF, 0, RDNS, X509_NAME_ENTRY)
 static_ASN1_ITEM_TEMPLATE_END(X509_NAME_ENTRIES)
 
-ASN1_ITEM_TEMPLATE(X509_NAME_INTERNAL) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Name, X509_NAME_ENTRIES)
+    ASN1_ITEM_TEMPLATE(X509_NAME_INTERNAL)
+    = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, Name, X509_NAME_ENTRIES)
 static_ASN1_ITEM_TEMPLATE_END(X509_NAME_INTERNAL)
 
-/*
- * Normally that's where it would end: we'd have two nested STACK structures
- * representing the ASN1. Unfortunately X509_NAME uses a completely different
- * form and caches encodings so we have to process the internal form and
- * convert to the external form.
- */
+    /*
+     * Normally that's where it would end: we'd have two nested STACK structures
+     * representing the ASN1. Unfortunately X509_NAME uses a completely different
+     * form and caches encodings so we have to process the internal form and
+     * convert to the external form.
+     */
 
-static const ASN1_EXTERN_FUNCS x509_name_ff = {
-    NULL,
-    x509_name_ex_new,
-    x509_name_ex_free,
-    0,                          /* Default clear behaviour is OK */
-    x509_name_ex_d2i,
-    x509_name_ex_i2d,
-    x509_name_ex_print
-};
+    static const ASN1_EXTERN_FUNCS x509_name_ff
+    = {
+          NULL,
+          x509_name_ex_new,
+          x509_name_ex_free,
+          0, /* Default clear behaviour is OK */
+          x509_name_ex_d2i,
+          x509_name_ex_i2d,
+          x509_name_ex_print
+      };
 
 IMPLEMENT_EXTERN_ASN1(X509_NAME, V_ASN1_SEQUENCE, x509_name_ff)
 
@@ -105,7 +105,7 @@ static int x509_name_ex_new(ASN1_VALUE **val, const ASN1_ITEM *it)
     *val = (ASN1_VALUE *)ret;
     return 1;
 
- err:
+err:
     if (ret) {
         sk_X509_NAME_ENTRY_free(ret->entries);
         OPENSSL_free(ret);
@@ -139,9 +139,9 @@ static void local_sk_X509_NAME_ENTRY_pop_free(STACK_OF(X509_NAME_ENTRY) *ne)
 }
 
 static int x509_name_ex_d2i(ASN1_VALUE **val,
-                            const unsigned char **in, long len,
-                            const ASN1_ITEM *it, int tag, int aclass,
-                            char opt, ASN1_TLC *ctx)
+    const unsigned char **in, long len,
+    const ASN1_ITEM *it, int tag, int aclass,
+    char opt, ASN1_TLC *ctx)
 {
     const unsigned char *p = *in, *q;
     union {
@@ -166,8 +166,8 @@ static int x509_name_ex_d2i(ASN1_VALUE **val,
 
     /* Get internal representation of Name */
     ret = ASN1_item_ex_d2i(&intname.a,
-                           &p, len, ASN1_ITEM_rptr(X509_NAME_INTERNAL),
-                           tag, aclass, opt, ctx);
+        &p, len, ASN1_ITEM_rptr(X509_NAME_INTERNAL),
+        tag, aclass, opt, ctx);
 
     if (ret <= 0)
         return ret;
@@ -196,23 +196,23 @@ static int x509_name_ex_d2i(ASN1_VALUE **val,
     if (!ret)
         goto err;
     sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname.s,
-                                         local_sk_X509_NAME_ENTRY_free);
+        local_sk_X509_NAME_ENTRY_free);
     nm.x->modified = 0;
     *val = nm.a;
     *in = p;
     return ret;
 
- err:
+err:
     if (nm.x != NULL)
         X509_NAME_free(nm.x);
     sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname.s,
-                                         local_sk_X509_NAME_ENTRY_pop_free);
+        local_sk_X509_NAME_ENTRY_pop_free);
     ERR_raise(ERR_LIB_ASN1, ERR_R_NESTED_ASN1_ERROR);
     return 0;
 }
 
 static int x509_name_ex_i2d(const ASN1_VALUE **val, unsigned char **out,
-                            const ASN1_ITEM *it, int tag, int aclass)
+    const ASN1_ITEM *it, int tag, int aclass)
 {
     int ret;
     X509_NAME *a = (X509_NAME *)*val;
@@ -266,32 +266,33 @@ static int x509_name_encode(X509_NAME *a)
             goto cerr;
     }
     len = ASN1_item_ex_i2d(&intname.a, NULL,
-                           ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);
+        ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);
     if (!BUF_MEM_grow(a->bytes, len)) {
         ERR_raise(ERR_LIB_ASN1, ERR_R_BUF_LIB);
         goto err;
     }
     p = (unsigned char *)a->bytes->data;
     ASN1_item_ex_i2d(&intname.a,
-                     &p, ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);
+        &p, ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);
     sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname.s,
-                                         local_sk_X509_NAME_ENTRY_free);
+        local_sk_X509_NAME_ENTRY_free);
     a->modified = 0;
     return len;
- cerr:
+cerr:
     ERR_raise(ERR_LIB_ASN1, ERR_R_CRYPTO_LIB);
- err:
+err:
     sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname.s,
-                                         local_sk_X509_NAME_ENTRY_free);
+        local_sk_X509_NAME_ENTRY_free);
     return -1;
 }
 
 static int x509_name_ex_print(BIO *out, const ASN1_VALUE **pval,
-                              int indent,
-                              const char *fname, const ASN1_PCTX *pctx)
+    int indent,
+    const char *fname, const ASN1_PCTX *pctx)
 {
     if (X509_NAME_print_ex(out, (const X509_NAME *)*pval,
-                           indent, pctx->nm_flags) <= 0)
+            indent, pctx->nm_flags)
+        <= 0)
         return 0;
     return 2;
 }
@@ -375,17 +376,17 @@ static int x509_name_canon(X509_NAME *a)
 
     ret = 1;
 
- err:
+err:
     X509_NAME_ENTRY_free(tmpentry);
     sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname,
-                                         local_sk_X509_NAME_ENTRY_pop_free);
+        local_sk_X509_NAME_ENTRY_pop_free);
     return ret;
 }
 
 /* Bitmap of all the types of string that will be canonicalized. */
 
-#define ASN1_MASK_CANON \
-        (B_ASN1_UTF8STRING | B_ASN1_BMPSTRING | B_ASN1_UNIVERSALSTRING \
+#define ASN1_MASK_CANON                                                \
+    (B_ASN1_UTF8STRING | B_ASN1_BMPSTRING | B_ASN1_UNIVERSALSTRING     \
         | B_ASN1_PRINTABLESTRING | B_ASN1_T61STRING | B_ASN1_IA5STRING \
         | B_ASN1_VISIBLESTRING)
 
@@ -453,8 +454,7 @@ static int asn1_string_canon(ASN1_STRING *out, const ASN1_STRING *in)
             do {
                 from++;
                 i++;
-            }
-            while (ossl_isspace(*from));
+            } while (ossl_isspace(*from));
         } else {
             *to++ = ossl_tolower(*from);
             from++;
@@ -465,11 +465,10 @@ static int asn1_string_canon(ASN1_STRING *out, const ASN1_STRING *in)
     out->length = to - out->data;
 
     return 1;
-
 }
 
-static int i2d_name_canon(const STACK_OF(STACK_OF_X509_NAME_ENTRY) * _intname,
-                          unsigned char **in)
+static int i2d_name_canon(const STACK_OF(STACK_OF_X509_NAME_ENTRY) *_intname,
+    unsigned char **in)
 {
     int i, len, ltmp;
     const ASN1_VALUE *v;
@@ -479,7 +478,7 @@ static int i2d_name_canon(const STACK_OF(STACK_OF_X509_NAME_ENTRY) * _intname,
     for (i = 0; i < sk_ASN1_VALUE_num(intname); i++) {
         v = sk_ASN1_VALUE_value(intname, i);
         ltmp = ASN1_item_ex_i2d(&v, in,
-                                ASN1_ITEM_rptr(X509_NAME_ENTRIES), -1, -1);
+            ASN1_ITEM_rptr(X509_NAME_ENTRIES), -1, -1);
         if (ltmp < 0 || len > INT_MAX - ltmp)
             return -1;
         len += ltmp;
@@ -512,19 +511,15 @@ int X509_NAME_print(BIO *bp, const X509_NAME *name, int obase)
         OPENSSL_free(b);
         return 1;
     }
-    s = b + 1;                  /* skip the first slash */
+    s = b + 1; /* skip the first slash */
 
     c = s;
     for (;;) {
-        if (((*s == '/') &&
-             (ossl_isupper(s[1]) && ((s[2] == '=') ||
-                                (ossl_isupper(s[2]) && (s[3] == '='))
-              ))) || (*s == '\0'))
-        {
+        if (((*s == '/') && (ossl_isupper(s[1]) && ((s[2] == '=') || (ossl_isupper(s[2]) && (s[3] == '='))))) || (*s == '\0')) {
             i = s - c;
             if (BIO_write(bp, c, i) != i)
                 goto err;
-            c = s + 1;          /* skip following slash */
+            c = s + 1; /* skip following slash */
             if (*s != '\0') {
                 if (BIO_write(bp, ", ", 2) != 2)
                     goto err;
@@ -537,14 +532,14 @@ int X509_NAME_print(BIO *bp, const X509_NAME *name, int obase)
 
     OPENSSL_free(b);
     return 1;
- err:
+err:
     ERR_raise(ERR_LIB_X509, ERR_R_BUF_LIB);
     OPENSSL_free(b);
     return 0;
 }
 
 int X509_NAME_get0_der(const X509_NAME *nm, const unsigned char **pder,
-                       size_t *pderlen)
+    size_t *pderlen)
 {
     /* Make sure encoding is valid */
     if (i2d_X509_NAME(nm, NULL) <= 0)
diff --git a/crypto/x509/x_pubkey.c b/crypto/x509/x_pubkey.c
index 53639b2bfabac..4c75560ef2489 100644
--- a/crypto/x509/x_pubkey.c
+++ b/crypto/x509/x_pubkey.c
@@ -45,7 +45,7 @@ struct X509_pubkey_st {
 static int x509_pubkey_decode(EVP_PKEY **pk, const X509_PUBKEY *key);
 
 static int x509_pubkey_set0_libctx(X509_PUBKEY *x, OSSL_LIB_CTX *libctx,
-                                   const char *propq)
+    const char *propq)
 {
     if (x != NULL) {
         x->libctx = libctx;
@@ -61,21 +61,20 @@ static int x509_pubkey_set0_libctx(X509_PUBKEY *x, OSSL_LIB_CTX *libctx,
 }
 
 ASN1_SEQUENCE(X509_PUBKEY_INTERNAL) = {
-        ASN1_SIMPLE(X509_PUBKEY, algor, X509_ALGOR),
-        ASN1_SIMPLE(X509_PUBKEY, public_key, ASN1_BIT_STRING)
+    ASN1_SIMPLE(X509_PUBKEY, algor, X509_ALGOR),
+    ASN1_SIMPLE(X509_PUBKEY, public_key, ASN1_BIT_STRING)
 } static_ASN1_SEQUENCE_END_name(X509_PUBKEY, X509_PUBKEY_INTERNAL)
 
-X509_PUBKEY *ossl_d2i_X509_PUBKEY_INTERNAL(const unsigned char **pp,
-                                           long len, OSSL_LIB_CTX *libctx,
-                                           const char *propq)
+                                          X509_PUBKEY
+    * ossl_d2i_X509_PUBKEY_INTERNAL(const unsigned char **pp, long len, OSSL_LIB_CTX *libctx, const char *propq)
 {
     X509_PUBKEY *xpub = OPENSSL_zalloc(sizeof(*xpub));
 
     if (xpub == NULL)
         return NULL;
     return (X509_PUBKEY *)ASN1_item_d2i_ex((ASN1_VALUE **)&xpub, pp, len,
-                                           ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL),
-                                           libctx, propq);
+        ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL),
+        libctx, propq);
 }
 
 void ossl_X509_PUBKEY_INTERNAL_free(X509_PUBKEY *xpub)
@@ -102,14 +101,13 @@ static int x509_pubkey_ex_populate(ASN1_VALUE **pval, const ASN1_ITEM *it)
     X509_PUBKEY *pubkey = (X509_PUBKEY *)*pval;
 
     return (pubkey->algor != NULL
-            || (pubkey->algor = X509_ALGOR_new()) != NULL)
+               || (pubkey->algor = X509_ALGOR_new()) != NULL)
         && (pubkey->public_key != NULL
             || (pubkey->public_key = ASN1_BIT_STRING_new()) != NULL);
 }
 
-
 static int x509_pubkey_ex_new_ex(ASN1_VALUE **pval, const ASN1_ITEM *it,
-                                 OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     X509_PUBKEY *ret;
 
@@ -128,10 +126,10 @@ static int x509_pubkey_ex_new_ex(ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 static int x509_pubkey_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 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 unsigned char *in_saved = *in;
     size_t publen;
@@ -148,10 +146,14 @@ static int x509_pubkey_ex_d2i_ex(ASN1_VALUE **pval,
     }
 
     /* This ensures that |*in| advances properly no matter what */
-    if ((ret = ASN1_item_ex_d2i(pval, in, len,
-                                ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL),
-                                tag, aclass, opt, ctx)) <= 0)
+    if ((ret = asn1_item_embed_d2i(pval, in, len,
+             ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL),
+             tag, aclass, opt, ctx, 0,
+             NULL, NULL))
+        <= 0) {
+        x509_pubkey_ex_free(pval, it);
         return ret;
+    }
 
     publen = *in - in_saved;
     if (!ossl_assert(publen > 0)) {
@@ -187,9 +189,9 @@ static int x509_pubkey_ex_d2i_ex(ASN1_VALUE **pval,
         size_t slen = publen;
 
         /*
-        * The decoders don't know how to handle anything other than Universal
-        * class so we modify the data accordingly.
-        */
+         * The decoders don't know how to handle anything other than Universal
+         * class so we modify the data accordingly.
+         */
         if (aclass != V_ASN1_UNIVERSAL) {
             tmpbuf = OPENSSL_memdup(in_saved, publen);
             if (tmpbuf == NULL)
@@ -200,16 +202,17 @@ static int x509_pubkey_ex_d2i_ex(ASN1_VALUE **pval,
         p = in_saved;
 
         if (OBJ_obj2txt(txtoidname, sizeof(txtoidname),
-                        pubkey->algor->algorithm, 0) <= 0) {
+                pubkey->algor->algorithm, 0)
+            <= 0) {
             ERR_clear_last_mark();
             goto end;
         }
-        if ((dctx =
-             OSSL_DECODER_CTX_new_for_pkey(&pubkey->pkey,
-                                           "DER", "SubjectPublicKeyInfo",
-                                           txtoidname, EVP_PKEY_PUBLIC_KEY,
-                                           pubkey->libctx,
-                                           pubkey->propq)) != NULL)
+        if ((dctx = OSSL_DECODER_CTX_new_for_pkey(&pubkey->pkey,
+                 "DER", "SubjectPublicKeyInfo",
+                 txtoidname, EVP_PKEY_PUBLIC_KEY,
+                 pubkey->libctx,
+                 pubkey->propq))
+            != NULL)
             /*
              * As said higher up, we're being opportunistic.  In other words,
              * we don't care if we fail.
@@ -229,31 +232,31 @@ static int x509_pubkey_ex_d2i_ex(ASN1_VALUE **pval,
 
     ERR_pop_to_mark();
     ret = 1;
- end:
+end:
     OSSL_DECODER_CTX_free(dctx);
     OPENSSL_free(tmpbuf);
     return ret;
 }
 
 static int x509_pubkey_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)
 {
     return ASN1_item_ex_i2d(pval, out, ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL),
-                            tag, aclass);
+        tag, aclass);
 }
 
 static int x509_pubkey_ex_print(BIO *out, const ASN1_VALUE **pval, int indent,
-                                const char *fname, const ASN1_PCTX *pctx)
+    const char *fname, const ASN1_PCTX *pctx)
 {
     return ASN1_item_print(out, *pval, indent,
-                           ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL), pctx);
+        ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL), pctx);
 }
 
 static const ASN1_EXTERN_FUNCS x509_pubkey_ff = {
     NULL,
     NULL,
     x509_pubkey_ex_free,
-    0,                          /* Default clear behaviour is OK */
+    0, /* Default clear behaviour is OK */
     NULL,
     x509_pubkey_ex_i2d,
     x509_pubkey_ex_print,
@@ -289,16 +292,16 @@ X509_PUBKEY *X509_PUBKEY_dup(const X509_PUBKEY *a)
     if (!x509_pubkey_set0_libctx(pubkey, a->libctx, a->propq)) {
         ERR_raise(ERR_LIB_X509, ERR_R_X509_LIB);
         x509_pubkey_ex_free((ASN1_VALUE **)&pubkey,
-                            ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL));
+            ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL));
         return NULL;
     }
     if ((pubkey->algor = X509_ALGOR_dup(a->algor)) == NULL
         || (pubkey->public_key = ASN1_BIT_STRING_new()) == NULL
         || !ASN1_BIT_STRING_set(pubkey->public_key,
-                                a->public_key->data,
-                                a->public_key->length)) {
+            a->public_key->data,
+            a->public_key->length)) {
         x509_pubkey_ex_free((ASN1_VALUE **)&pubkey,
-                            ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL));
+            ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL));
         ERR_raise(ERR_LIB_X509, ERR_R_ASN1_LIB);
         return NULL;
     }
@@ -310,7 +313,7 @@ X509_PUBKEY *X509_PUBKEY_dup(const X509_PUBKEY *a)
             pubkey->flag_force_legacy = 1;
             if (x509_pubkey_decode(&pubkey->pkey, pubkey) <= 0) {
                 x509_pubkey_ex_free((ASN1_VALUE **)&pubkey,
-                                    ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL));
+                    ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL));
                 ERR_clear_last_mark();
                 return NULL;
             }
@@ -346,10 +349,9 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
     } else if (evp_pkey_is_provided(pkey)) {
         unsigned char *der = NULL;
         size_t derlen = 0;
-        OSSL_ENCODER_CTX *ectx =
-            OSSL_ENCODER_CTX_new_for_pkey(pkey, EVP_PKEY_PUBLIC_KEY,
-                                          "DER", "SubjectPublicKeyInfo",
-                                          NULL);
+        OSSL_ENCODER_CTX *ectx = OSSL_ENCODER_CTX_new_for_pkey(pkey, EVP_PKEY_PUBLIC_KEY,
+            "DER", "SubjectPublicKeyInfo",
+            NULL);
 
         if (OSSL_ENCODER_to_data(ectx, &der, &derlen)) {
             const unsigned char *pder = der;
@@ -389,7 +391,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
     pk->pkey = pkey;
     return 1;
 
- error:
+error:
     X509_PUBKEY_free(pk);
     return 0;
 }
@@ -447,7 +449,7 @@ static int x509_pubkey_decode(EVP_PKEY **ppkey, const X509_PUBKEY *key)
     *ppkey = pkey;
     return 1;
 
- error:
+error:
     EVP_PKEY_free(pkey);
     return 0;
 }
@@ -484,13 +486,12 @@ EVP_PKEY *X509_PUBKEY_get(const X509_PUBKEY *key)
  * or decode as X509_PUBKEY
  */
 static EVP_PKEY *d2i_PUBKEY_int(EVP_PKEY **a,
-                                const unsigned char **pp, long length,
-                                OSSL_LIB_CTX *libctx, const char *propq,
-                                unsigned int force_legacy,
-                                X509_PUBKEY *
-                                (*d2i_x509_pubkey)(X509_PUBKEY **a,
-                                                   const unsigned char **in,
-                                                   long len))
+    const unsigned char **pp, long length,
+    OSSL_LIB_CTX *libctx, const char *propq,
+    unsigned int force_legacy,
+    X509_PUBKEY *(*d2i_x509_pubkey)(X509_PUBKEY **a,
+        const unsigned char **in,
+        long len))
 {
     X509_PUBKEY *xpk, *xpk2 = NULL, **pxpk = NULL;
     EVP_PKEY *pktmp = NULL;
@@ -517,7 +518,7 @@ static EVP_PKEY *d2i_PUBKEY_int(EVP_PKEY **a,
         goto end;
     pktmp = X509_PUBKEY_get(xpk);
     X509_PUBKEY_free(xpk);
-    xpk2 = NULL;                 /* We know that xpk == xpk2 */
+    xpk2 = NULL; /* We know that xpk == xpk2 */
     if (pktmp == NULL)
         goto end;
     *pp = q;
@@ -525,20 +526,20 @@ static EVP_PKEY *d2i_PUBKEY_int(EVP_PKEY **a,
         EVP_PKEY_free(*a);
         *a = pktmp;
     }
- end:
+end:
     X509_PUBKEY_free(xpk2);
     return pktmp;
 }
 
 /* For the algorithm specific d2i functions further down */
 EVP_PKEY *ossl_d2i_PUBKEY_legacy(EVP_PKEY **a, const unsigned char **pp,
-                                 long length)
+    long length)
 {
     return d2i_PUBKEY_int(a, pp, length, NULL, NULL, 1, d2i_X509_PUBKEY);
 }
 
 EVP_PKEY *d2i_PUBKEY_ex(EVP_PKEY **a, const unsigned char **pp, long length,
-                        OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     return d2i_PUBKEY_int(a, pp, length, libctx, propq, 0, d2i_X509_PUBKEY);
 }
@@ -568,10 +569,9 @@ int i2d_PUBKEY(const EVP_PKEY *a, unsigned char **pp)
         }
         X509_PUBKEY_free(xpk);
     } else if (a->keymgmt != NULL) {
-        OSSL_ENCODER_CTX *ctx =
-            OSSL_ENCODER_CTX_new_for_pkey(a, EVP_PKEY_PUBLIC_KEY,
-                                          "DER", "SubjectPublicKeyInfo",
-                                          NULL);
+        OSSL_ENCODER_CTX *ctx = OSSL_ENCODER_CTX_new_for_pkey(a, EVP_PKEY_PUBLIC_KEY,
+            "DER", "SubjectPublicKeyInfo",
+            NULL);
         BIO *out = BIO_new(BIO_s_mem());
         BUF_MEM *buf = NULL;
 
@@ -836,9 +836,9 @@ int i2d_EC_PUBKEY(const EC_KEY *a, unsigned char **pp)
     return ret;
 }
 
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 ECX_KEY *ossl_d2i_ED25519_PUBKEY(ECX_KEY **a,
-                                 const unsigned char **pp, long length)
+    const unsigned char **pp, long length)
 {
     EVP_PKEY *pkey;
     ECX_KEY *key = NULL;
@@ -879,7 +879,7 @@ 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)
 {
     EVP_PKEY *pkey;
     ECX_KEY *key = NULL;
@@ -921,7 +921,7 @@ 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)
 {
     EVP_PKEY *pkey;
     ECX_KEY *key = NULL;
@@ -963,7 +963,7 @@ 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)
 {
     EVP_PKEY *pkey;
     ECX_KEY *key = NULL;
@@ -1004,19 +1004,19 @@ int ossl_i2d_X448_PUBKEY(const ECX_KEY *a, unsigned char **pp)
     return ret;
 }
 
-# endif /* OPENSSL_NO_ECX */
+#endif /* OPENSSL_NO_ECX */
 #endif
 
 void X509_PUBKEY_set0_public_key(X509_PUBKEY *pub,
-                                 unsigned char *penc, int penclen)
+    unsigned char *penc, int penclen)
 {
     ASN1_STRING_set0(pub->public_key, penc, penclen);
     ossl_asn1_string_set_bits_left(pub->public_key, 0);
 }
 
 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)
 {
     if (!X509_ALGOR_set0(pub->algor, aobj, ptype, pval))
         return 0;
@@ -1026,8 +1026,8 @@ int X509_PUBKEY_set0_param(X509_PUBKEY *pub, ASN1_OBJECT *aobj,
 }
 
 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)
 {
     if (ppkalg)
         *ppkalg = pub->algor->algorithm;
@@ -1069,7 +1069,7 @@ int X509_PUBKEY_eq(const X509_PUBKEY *a, const X509_PUBKEY *b)
 }
 
 int ossl_x509_PUBKEY_get0_libctx(OSSL_LIB_CTX **plibctx, const char **ppropq,
-                                 const X509_PUBKEY *key)
+    const X509_PUBKEY *key)
 {
     if (plibctx)
         *plibctx = key->libctx;
diff --git a/crypto/x509/x_req.c b/crypto/x509/x_req.c
index ca712386bd221..6f60df5b041d5 100644
--- a/crypto/x509/x_req.c
+++ b/crypto/x509/x_req.c
@@ -33,7 +33,7 @@
  */
 
 static int rinf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                   void *exarg)
+    void *exarg)
 {
     X509_REQ_INFO *rinf = (X509_REQ_INFO *)*pval;
 
@@ -46,7 +46,7 @@ static int rinf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 static int req_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                  void *exarg)
+    void *exarg)
 {
     X509_REQ *ret = (X509_REQ *)*pval;
 
@@ -62,66 +62,60 @@ static int req_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         ASN1_OCTET_STRING_free(ret->distinguishing_id);
         OPENSSL_free(ret->propq);
         break;
-    case ASN1_OP_DUP_POST:
-        {
-            X509_REQ *old = exarg;
+    case ASN1_OP_DUP_POST: {
+        X509_REQ *old = exarg;
 
-            if (!ossl_x509_req_set0_libctx(ret, old->libctx, old->propq))
-                return 0;
-            if (old->req_info.pubkey != NULL) {
-                EVP_PKEY *pkey = X509_PUBKEY_get0(old->req_info.pubkey);
-
-                if (pkey != NULL) {
-                    pkey = EVP_PKEY_dup(pkey);
-                    if (pkey == NULL) {
-                        ERR_raise(ERR_LIB_X509, ERR_R_EVP_LIB);
-                        return 0;
-                    }
-                    if (!X509_PUBKEY_set(&ret->req_info.pubkey, pkey)) {
-                        EVP_PKEY_free(pkey);
-                        ERR_raise(ERR_LIB_X509, ERR_R_INTERNAL_ERROR);
-                        return 0;
-                    }
+        if (!ossl_x509_req_set0_libctx(ret, old->libctx, old->propq))
+            return 0;
+        if (old->req_info.pubkey != NULL) {
+            EVP_PKEY *pkey = X509_PUBKEY_get0(old->req_info.pubkey);
+
+            if (pkey != NULL) {
+                pkey = EVP_PKEY_dup(pkey);
+                if (pkey == NULL) {
+                    ERR_raise(ERR_LIB_X509, ERR_R_EVP_LIB);
+                    return 0;
+                }
+                if (!X509_PUBKEY_set(&ret->req_info.pubkey, pkey)) {
                     EVP_PKEY_free(pkey);
+                    ERR_raise(ERR_LIB_X509, ERR_R_INTERNAL_ERROR);
+                    return 0;
                 }
+                EVP_PKEY_free(pkey);
             }
         }
-        break;
-    case ASN1_OP_GET0_LIBCTX:
-        {
-            OSSL_LIB_CTX **libctx = exarg;
+    } break;
+    case ASN1_OP_GET0_LIBCTX: {
+        OSSL_LIB_CTX **libctx = exarg;
 
-            *libctx = ret->libctx;
-        }
-        break;
-    case ASN1_OP_GET0_PROPQ:
-        {
-            const char **propq = exarg;
+        *libctx = ret->libctx;
+    } break;
+    case ASN1_OP_GET0_PROPQ: {
+        const char **propq = exarg;
 
-            *propq = ret->propq;
-        }
-        break;
+        *propq = ret->propq;
+    } break;
     }
 
     return 1;
 }
 
 ASN1_SEQUENCE_enc(X509_REQ_INFO, enc, rinf_cb) = {
-        ASN1_SIMPLE(X509_REQ_INFO, version, ASN1_INTEGER),
-        ASN1_SIMPLE(X509_REQ_INFO, subject, X509_NAME),
-        ASN1_SIMPLE(X509_REQ_INFO, pubkey, X509_PUBKEY),
-        /* This isn't really OPTIONAL but it gets round invalid
-         * encodings
-         */
-        ASN1_IMP_SET_OF_OPT(X509_REQ_INFO, attributes, X509_ATTRIBUTE, 0)
+    ASN1_SIMPLE(X509_REQ_INFO, version, ASN1_INTEGER),
+    ASN1_SIMPLE(X509_REQ_INFO, subject, X509_NAME),
+    ASN1_SIMPLE(X509_REQ_INFO, pubkey, X509_PUBKEY),
+    /* This isn't really OPTIONAL but it gets round invalid
+     * encodings
+     */
+    ASN1_IMP_SET_OF_OPT(X509_REQ_INFO, attributes, X509_ATTRIBUTE, 0)
 } ASN1_SEQUENCE_END_enc(X509_REQ_INFO, X509_REQ_INFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_REQ_INFO)
 
 ASN1_SEQUENCE_ref(X509_REQ, req_cb) = {
-        ASN1_EMBED(X509_REQ, req_info, X509_REQ_INFO),
-        ASN1_EMBED(X509_REQ, sig_alg, X509_ALGOR),
-        ASN1_SIMPLE(X509_REQ, signature, ASN1_BIT_STRING)
+    ASN1_EMBED(X509_REQ, req_info, X509_REQ_INFO),
+    ASN1_EMBED(X509_REQ, sig_alg, X509_ALGOR),
+    ASN1_SIMPLE(X509_REQ, signature, ASN1_BIT_STRING)
 } ASN1_SEQUENCE_END_ref(X509_REQ, X509_REQ)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_REQ)
@@ -145,7 +139,7 @@ ASN1_OCTET_STRING *X509_REQ_get0_distinguishing_id(X509_REQ *x)
  * Use X509_REQ_new_ex() instead if possible.
  */
 int ossl_x509_req_set0_libctx(X509_REQ *x, OSSL_LIB_CTX *libctx,
-                              const char *propq)
+    const char *propq)
 {
     if (x != NULL) {
         x->libctx = libctx;
diff --git a/crypto/x509/x_x509.c b/crypto/x509/x_x509.c
index 75c5c9223acce..107d9f2789fee 100644
--- a/crypto/x509/x_x509.c
+++ b/crypto/x509/x_x509.c
@@ -16,16 +16,16 @@
 #include "crypto/x509.h"
 
 ASN1_SEQUENCE_enc(X509_CINF, enc, 0) = {
-        ASN1_EXP_OPT(X509_CINF, version, ASN1_INTEGER, 0),
-        ASN1_EMBED(X509_CINF, serialNumber, ASN1_INTEGER),
-        ASN1_EMBED(X509_CINF, signature, X509_ALGOR),
-        ASN1_SIMPLE(X509_CINF, issuer, X509_NAME),
-        ASN1_EMBED(X509_CINF, validity, X509_VAL),
-        ASN1_SIMPLE(X509_CINF, subject, X509_NAME),
-        ASN1_SIMPLE(X509_CINF, key, X509_PUBKEY),
-        ASN1_IMP_OPT(X509_CINF, issuerUID, ASN1_BIT_STRING, 1),
-        ASN1_IMP_OPT(X509_CINF, subjectUID, ASN1_BIT_STRING, 2),
-        ASN1_EXP_SEQUENCE_OF_OPT(X509_CINF, extensions, X509_EXTENSION, 3)
+    ASN1_EXP_OPT(X509_CINF, version, ASN1_INTEGER, 0),
+    ASN1_EMBED(X509_CINF, serialNumber, ASN1_INTEGER),
+    ASN1_EMBED(X509_CINF, signature, X509_ALGOR),
+    ASN1_SIMPLE(X509_CINF, issuer, X509_NAME),
+    ASN1_EMBED(X509_CINF, validity, X509_VAL),
+    ASN1_SIMPLE(X509_CINF, subject, X509_NAME),
+    ASN1_SIMPLE(X509_CINF, key, X509_PUBKEY),
+    ASN1_IMP_OPT(X509_CINF, issuerUID, ASN1_BIT_STRING, 1),
+    ASN1_IMP_OPT(X509_CINF, subjectUID, ASN1_BIT_STRING, 2),
+    ASN1_EXP_SEQUENCE_OF_OPT(X509_CINF, extensions, X509_EXTENSION, 3)
 } ASN1_SEQUENCE_END_enc(X509_CINF, X509_CINF)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_CINF)
@@ -34,7 +34,7 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_CINF)
 extern void ossl_policy_cache_free(X509_POLICY_CACHE *cache);
 
 static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
-                   void *exarg)
+    void *exarg)
 {
     X509 *ret = (X509 *)*pval;
 
@@ -98,29 +98,23 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         OPENSSL_free(ret->propq);
         break;
 
-    case ASN1_OP_DUP_POST:
-        {
-            X509 *old = exarg;
+    case ASN1_OP_DUP_POST: {
+        X509 *old = exarg;
 
-            if (!ossl_x509_set0_libctx(ret, old->libctx, old->propq))
-                return 0;
-        }
-        break;
-    case ASN1_OP_GET0_LIBCTX:
-        {
-            OSSL_LIB_CTX **libctx = exarg;
+        if (!ossl_x509_set0_libctx(ret, old->libctx, old->propq))
+            return 0;
+    } break;
+    case ASN1_OP_GET0_LIBCTX: {
+        OSSL_LIB_CTX **libctx = exarg;
 
-            *libctx = ret->libctx;
-        }
-        break;
+        *libctx = ret->libctx;
+    } break;
 
-    case ASN1_OP_GET0_PROPQ:
-        {
-            const char **propq = exarg;
+    case ASN1_OP_GET0_PROPQ: {
+        const char **propq = exarg;
 
-            *propq = ret->propq;
-        }
-        break;
+        *propq = ret->propq;
+    } break;
 
     default:
         break;
@@ -130,9 +124,9 @@ static int x509_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 }
 
 ASN1_SEQUENCE_ref(X509, x509_cb) = {
-        ASN1_EMBED(X509, cert_info, X509_CINF),
-        ASN1_EMBED(X509, sig_alg, X509_ALGOR),
-        ASN1_EMBED(X509, signature, ASN1_BIT_STRING)
+    ASN1_EMBED(X509, cert_info, X509_CINF),
+    ASN1_EMBED(X509, sig_alg, X509_ALGOR),
+    ASN1_EMBED(X509, signature, ASN1_BIT_STRING)
 } ASN1_SEQUENCE_END_ref(X509, X509)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509)
@@ -208,7 +202,7 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length)
         goto err;
     *pp = q;
     return ret;
- err:
+err:
     if (freeret) {
         X509_free(ret);
         if (a)
@@ -291,7 +285,7 @@ int i2d_re_X509_tbs(X509 *x, unsigned char **pp)
 }
 
 void X509_get0_signature(const ASN1_BIT_STRING **psig,
-                         const X509_ALGOR **palg, const X509 *x)
+    const X509_ALGOR **palg, const X509 *x)
 {
     if (psig)
         *psig = &x->signature;
diff --git a/crypto/x509/x_x509a.c b/crypto/x509/x_x509a.c
index f7953c269e7cf..009ba6f773a4d 100644
--- a/crypto/x509/x_x509a.c
+++ b/crypto/x509/x_x509a.c
@@ -24,11 +24,11 @@
 static X509_CERT_AUX *aux_get(X509 *x);
 
 ASN1_SEQUENCE(X509_CERT_AUX) = {
-        ASN1_SEQUENCE_OF_OPT(X509_CERT_AUX, trust, ASN1_OBJECT),
-        ASN1_IMP_SEQUENCE_OF_OPT(X509_CERT_AUX, reject, ASN1_OBJECT, 0),
-        ASN1_OPT(X509_CERT_AUX, alias, ASN1_UTF8STRING),
-        ASN1_OPT(X509_CERT_AUX, keyid, ASN1_OCTET_STRING),
-        ASN1_IMP_SEQUENCE_OF_OPT(X509_CERT_AUX, other, X509_ALGOR, 1)
+    ASN1_SEQUENCE_OF_OPT(X509_CERT_AUX, trust, ASN1_OBJECT),
+    ASN1_IMP_SEQUENCE_OF_OPT(X509_CERT_AUX, reject, ASN1_OBJECT, 0),
+    ASN1_OPT(X509_CERT_AUX, alias, ASN1_UTF8STRING),
+    ASN1_OPT(X509_CERT_AUX, keyid, ASN1_OCTET_STRING),
+    ASN1_IMP_SEQUENCE_OF_OPT(X509_CERT_AUX, other, X509_ALGOR, 1)
 } ASN1_SEQUENCE_END(X509_CERT_AUX)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_CERT_AUX)
@@ -116,7 +116,7 @@ int X509_add1_trust_object(X509 *x, const ASN1_OBJECT *obj)
         goto err;
     if (!objtmp || sk_ASN1_OBJECT_push(aux->trust, objtmp))
         return 1;
- err:
+err:
     ASN1_OBJECT_free(objtmp);
     return 0;
 }
@@ -137,7 +137,7 @@ int X509_add1_reject_object(X509 *x, const ASN1_OBJECT *obj)
     if (sk_ASN1_OBJECT_push(aux->reject, objtmp) > 0)
         res = 1;
 
- err:
+err:
     if (!res)
         ASN1_OBJECT_free(objtmp);
     return res;
diff --git a/demos/bio/client-arg.c b/demos/bio/client-arg.c
index c4abdf5cd351e..e716ed72f41db 100644
--- a/demos/bio/client-arg.c
+++ b/demos/bio/client-arg.c
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
         BIO_write(out, tmpbuf, len);
     }
     ret = EXIT_SUCCESS;
- end:
+end:
     SSL_CONF_CTX_free(cctx);
     BIO_free_all(sbio);
     BIO_free(out);
diff --git a/demos/bio/client-conf.c b/demos/bio/client-conf.c
index 766f1b5299a5f..59835e6d5af6a 100644
--- a/demos/bio/client-conf.c
+++ b/demos/bio/client-conf.c
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
             continue;
         if (rv != -2) {
             fprintf(stderr, "Error processing %s = %s\n",
-                    cnf->name, cnf->value);
+                cnf->name, cnf->value);
             ERR_print_errors_fp(stderr);
             goto end;
         }
@@ -111,7 +111,7 @@ int main(int argc, char **argv)
     }
     ret = EXIT_SUCCESS;
 
- end:
+end:
     SSL_CONF_CTX_free(cctx);
     BIO_free_all(sbio);
     BIO_free(out);
diff --git a/demos/bio/saccept.c b/demos/bio/saccept.c
index 604051cda9662..7bc3df5b9852b 100644
--- a/demos/bio/saccept.c
+++ b/demos/bio/saccept.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-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
@@ -23,7 +23,7 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
-#define CERT_FILE       "server.pem"
+#define CERT_FILE "server.pem"
 
 static volatile int done = 0;
 
@@ -53,7 +53,8 @@ int main(int argc, char *argv[])
 {
     char *port = NULL;
     BIO *in = NULL;
-    BIO *ssl_bio, *tmp;
+    BIO *ssl_bio = NULL;
+    BIO *tmp;
     SSL_CTX *ctx;
     char buf[512];
     int ret = EXIT_FAILURE, i;
@@ -83,11 +84,12 @@ int main(int argc, char *argv[])
      * Basically it means the SSL BIO will be automatically setup
      */
     BIO_set_accept_bios(in, ssl_bio);
+    ssl_bio = NULL;
 
     /* Arrange to leave server loop on interrupt */
     sigsetup();
 
- again:
+again:
     /*
      * The first call will setup the accept socket, and the second will get a
      * socket.  In this loop, the first actual accept will occur in the
@@ -117,9 +119,10 @@ int main(int argc, char *argv[])
     }
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS)
         ERR_print_errors_fp(stderr);
     BIO_free(in);
+    BIO_free_all(ssl_bio);
     return ret;
 }
diff --git a/demos/bio/sconnect.c b/demos/bio/sconnect.c
index b4ad3df14b375..d9b099d0e6a3c 100644
--- a/demos/bio/sconnect.c
+++ b/demos/bio/sconnect.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-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
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #else
 #include <windows.h>
-# define sleep(x) Sleep(x*1000)
+#define sleep(x) Sleep(x * 1000)
 #endif
 
 #define HOSTPORT "localhost:4433"
@@ -63,7 +63,6 @@ int main(int argc, char *argv[])
     ssl = SSL_new(ssl_ctx);
     SSL_set_connect_state(ssl);
 
-
     /* Use it inside an SSL BIO */
     ssl_bio = BIO_new(BIO_f_ssl());
     BIO_set_ssl(ssl_bio, ssl, BIO_CLOSE);
@@ -74,8 +73,10 @@ int main(int argc, char *argv[])
 
     /* The BIO has parsed the host:port and even IPv6 literals in [] */
     hostname = BIO_get_conn_hostname(out);
-    if (!hostname || SSL_set1_host(ssl, hostname) <= 0)
+    if (!hostname || SSL_set1_host(ssl, hostname) <= 0) {
+        BIO_free(ssl_bio);
         goto err;
+    }
 
     BIO_set_nbio(out, 1);
     out = BIO_push(ssl_bio, out);
@@ -119,14 +120,14 @@ int main(int argc, char *argv[])
     ret = EXIT_SUCCESS;
     goto done;
 
- err:
+err:
     if (ERR_peek_error() == 0) { /* system call error */
         fprintf(stderr, "errno=%d ", errno);
         perror("error");
     } else {
         ERR_print_errors_fp(stderr);
     }
- done:
+done:
     BIO_free_all(out);
     SSL_CTX_free(ssl_ctx);
     return ret;
diff --git a/demos/bio/server-arg.c b/demos/bio/server-arg.c
index 60a87725a9dee..471c3b88df5bc 100644
--- a/demos/bio/server-arg.c
+++ b/demos/bio/server-arg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2013-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
@@ -23,7 +23,8 @@
 int main(int argc, char *argv[])
 {
     char *port = "*:4433";
-    BIO *ssl_bio, *tmp;
+    BIO *ssl_bio = NULL;
+    BIO *tmp;
     SSL_CTX *ctx;
     SSL_CONF_CTX *cctx;
     char buf[512];
@@ -86,7 +87,7 @@ int main(int argc, char *argv[])
         while (rv) {
             X509 *x = SSL_CTX_get0_certificate(ctx);
             X509_NAME_print_ex_fp(stdout, X509_get_subject_name(x), 0,
-                                  XN_FLAG_ONELINE);
+                XN_FLAG_ONELINE);
             printf("\n");
             rv = SSL_CTX_set_current_cert(ctx, SSL_CERT_SET_NEXT);
         }
@@ -105,8 +106,9 @@ int main(int argc, char *argv[])
      * Basically it means the SSL BIO will be automatically setup
      */
     BIO_set_accept_bios(in, ssl_bio);
+    ssl_bio = NULL;
 
- again:
+again:
     /*
      * The first call will setup the accept socket, and the second will get a
      * socket.  In this loop, the first actual accept will occur in the
@@ -136,9 +138,10 @@ int main(int argc, char *argv[])
     }
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS)
         ERR_print_errors_fp(stderr);
     BIO_free(in);
+    BIO_free_all(ssl_bio);
     return ret;
 }
diff --git a/demos/bio/server-cmod.c b/demos/bio/server-cmod.c
index 3642fbacf6cef..043417beecc54 100644
--- a/demos/bio/server-cmod.c
+++ b/demos/bio/server-cmod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-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
@@ -24,7 +24,8 @@ int main(int argc, char *argv[])
     unsigned char buf[512];
     char *port = "*:4433";
     BIO *in = NULL;
-    BIO *ssl_bio, *tmp;
+    BIO *ssl_bio = NULL;
+    BIO *tmp;
     SSL_CTX *ctx;
     int ret = EXIT_FAILURE, i;
 
@@ -52,8 +53,9 @@ int main(int argc, char *argv[])
      * Basically it means the SSL BIO will be automatically setup
      */
     BIO_set_accept_bios(in, ssl_bio);
+    ssl_bio = NULL;
 
- again:
+again:
     /*
      * The first call will setup the accept socket, and the second will get a
      * socket.  In this loop, the first actual accept will occur in the
@@ -86,9 +88,10 @@ int main(int argc, char *argv[])
     }
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS)
         ERR_print_errors_fp(stderr);
     BIO_free(in);
+    BIO_free_all(ssl_bio);
     return ret;
 }
diff --git a/demos/bio/server-conf.c b/demos/bio/server-conf.c
index 5e07a15e7bc70..a4e6bf8e58f6c 100644
--- a/demos/bio/server-conf.c
+++ b/demos/bio/server-conf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2013-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
@@ -25,7 +25,8 @@ int main(int argc, char *argv[])
 {
     char *port = "*:4433";
     BIO *in = NULL;
-    BIO *ssl_bio, *tmp;
+    BIO *ssl_bio = NULL;
+    BIO *tmp;
     SSL_CTX *ctx;
     SSL_CONF_CTX *cctx = NULL;
     CONF *conf = NULL;
@@ -67,7 +68,7 @@ int main(int argc, char *argv[])
             continue;
         if (rv != -2) {
             fprintf(stderr, "Error processing %s = %s\n",
-                    cnf->name, cnf->value);
+                cnf->name, cnf->value);
             ERR_print_errors_fp(stderr);
             goto err;
         }
@@ -97,8 +98,9 @@ int main(int argc, char *argv[])
      * Basically it means the SSL BIO will be automatically setup
      */
     BIO_set_accept_bios(in, ssl_bio);
+    ssl_bio = NULL;
 
- again:
+again:
     /*
      * The first call will setup the accept socket, and the second will get a
      * socket.  In this loop, the first actual accept will occur in the
@@ -131,9 +133,10 @@ int main(int argc, char *argv[])
     }
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS)
         ERR_print_errors_fp(stderr);
     BIO_free(in);
+    BIO_free_all(ssl_bio);
     return ret;
 }
diff --git a/demos/certs/mkcerts.sh b/demos/certs/mkcerts.sh
index 1825607fa33c4..89300a6c52c5d 100644
--- a/demos/certs/mkcerts.sh
+++ b/demos/certs/mkcerts.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 opensslcmd() {
-    LD_LIBRARY_PATH=../.. ../../apps/openssl $@
+    LD_LIBRARY_PATH=../.. ../../apps/openssl "$@"
 }
 
 OPENSSL_CONF=../../apps/openssl.cnf
diff --git a/demos/certs/ocspquery.sh b/demos/certs/ocspquery.sh
index 7cb8e76423bbc..b38e10ce2ef53 100644
--- a/demos/certs/ocspquery.sh
+++ b/demos/certs/ocspquery.sh
@@ -4,7 +4,7 @@
 # called.
 
 opensslcmd() {
-    LD_LIBRARY_PATH=../.. ../../apps/openssl $@
+    LD_LIBRARY_PATH=../.. ../../apps/openssl "$@"
 }
 
 OPENSSL_CONF=../../apps/openssl.cnf
diff --git a/demos/certs/ocsprun.sh b/demos/certs/ocsprun.sh
index 77fd62fcf1bb6..b2e927cd84dae 100644
--- a/demos/certs/ocsprun.sh
+++ b/demos/certs/ocsprun.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 opensslcmd() {
-    LD_LIBRARY_PATH=../.. ../../apps/openssl $@
+    LD_LIBRARY_PATH=../.. ../../apps/openssl "$@"
 }
 
 # Example of running an querying OpenSSL test OCSP responder.
@@ -18,4 +18,4 @@ opensslcmd version
 PORT=8888
 
 opensslcmd ocsp -port $PORT -index index.txt -CA intca.pem \
-	-rsigner resp.pem -rkey respkey.pem -rother intca.pem $*
+	-rsigner resp.pem -rkey respkey.pem -rother intca.pem "$@"
diff --git a/demos/cipher/aesccm.c b/demos/cipher/aesccm.c
index 55d2b5fe6d223..33cad06aa16e6 100644
--- a/demos/cipher/aesccm.c
+++ b/demos/cipher/aesccm.c
@@ -67,7 +67,6 @@ static const unsigned char ccm_tag[] = {
 static OSSL_LIB_CTX *libctx = NULL;
 static const char *propq = NULL;
 
-
 static int aes_ccm_encrypt(void)
 {
     int ret = 0;
@@ -96,10 +95,10 @@ static int aes_ccm_encrypt(void)
 
     /* Default nonce length for AES-CCM is 7 bytes (56 bits). */
     params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN,
-                                            &ccm_nonce_len);
+        &ccm_nonce_len);
     /* Set tag length */
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
-                                                  NULL, ccm_tag_len);
+        NULL, ccm_tag_len);
 
     /*
      * Initialise encrypt operation with the cipher & mode,
@@ -134,7 +133,7 @@ static int aes_ccm_encrypt(void)
 
     /* Get tag */
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
-                                                  outtag, ccm_tag_len);
+        outtag, ccm_tag_len);
     params[1] = OSSL_PARAM_construct_end();
 
     if (!EVP_CIPHER_CTX_get_params(ctx, params))
@@ -180,11 +179,11 @@ static int aes_ccm_decrypt(void)
 
     /* Set nonce length if default 96 bits is not appropriate */
     params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN,
-                                            &ccm_nonce_len);
+        &ccm_nonce_len);
     /* Set tag length */
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
-                                                  (unsigned char *)ccm_tag,
-                                                  sizeof(ccm_tag));
+        (unsigned char *)ccm_tag,
+        sizeof(ccm_tag));
     /*
      * Initialise decrypt operation with the cipher & mode,
      * nonce length and expected tag parameters.
diff --git a/demos/cipher/aesgcm.c b/demos/cipher/aesgcm.c
index 426e0823f28a3..0b3779fd4869b 100644
--- a/demos/cipher/aesgcm.c
+++ b/demos/cipher/aesgcm.c
@@ -94,7 +94,7 @@ static int aes_gcm_encrypt(void)
 
     /* Set IV length if default 96 bits is not appropriate */
     params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN,
-                                            &gcm_ivlen);
+        &gcm_ivlen);
 
     /*
      * Initialise an encrypt operation with the cipher/mode, key, IV and
@@ -124,7 +124,7 @@ static int aes_gcm_encrypt(void)
 
     /* Get tag */
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
-                                                  outtag, 16);
+        outtag, 16);
 
     if (!EVP_CIPHER_CTX_get_params(ctx, params))
         goto err;
@@ -169,7 +169,7 @@ static int aes_gcm_decrypt(void)
 
     /* Set IV length if default 96 bits is not appropriate */
     params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN,
-                                            &gcm_ivlen);
+        &gcm_ivlen);
 
     /*
      * Initialise an encrypt operation with the cipher/mode, key, IV and
@@ -192,7 +192,7 @@ static int aes_gcm_decrypt(void)
 
     /* Set expected tag value. */
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
-                                                  (void*)gcm_tag, sizeof(gcm_tag));
+        (void *)gcm_tag, sizeof(gcm_tag));
 
     if (!EVP_CIPHER_CTX_set_params(ctx, params))
         goto err;
diff --git a/demos/cipher/aeskeywrap.c b/demos/cipher/aeskeywrap.c
index bf036074f30cf..89de1e242c57e 100644
--- a/demos/cipher/aeskeywrap.c
+++ b/demos/cipher/aeskeywrap.c
@@ -27,22 +27,102 @@ static const unsigned char wrap_key[] = {
 
 /* Unique initialisation vector */
 static const unsigned char wrap_iv[] = {
-    0x99, 0xaa, 0x3e, 0x68, 0xed, 0x81, 0x73, 0xa0, 0xee, 0xd0, 0x66, 0x84,
-    0x99, 0xaa, 0x3e, 0x68,
+    0x99,
+    0xaa,
+    0x3e,
+    0x68,
+    0xed,
+    0x81,
+    0x73,
+    0xa0,
+    0xee,
+    0xd0,
+    0x66,
+    0x84,
+    0x99,
+    0xaa,
+    0x3e,
+    0x68,
 };
 
 /* Example plaintext to encrypt */
 static const unsigned char wrap_pt[] = {
-    0xad, 0x4f, 0xc9, 0xfc, 0x77, 0x69, 0xc9, 0xea, 0xfc, 0xdf, 0x00, 0xac,
-    0x34, 0xec, 0x40, 0xbc, 0x28, 0x3f, 0xa4, 0x5e, 0xd8, 0x99, 0xe4, 0x5d,
-    0x5e, 0x7a, 0xc4, 0xe6, 0xca, 0x7b, 0xa5, 0xb7,
+    0xad,
+    0x4f,
+    0xc9,
+    0xfc,
+    0x77,
+    0x69,
+    0xc9,
+    0xea,
+    0xfc,
+    0xdf,
+    0x00,
+    0xac,
+    0x34,
+    0xec,
+    0x40,
+    0xbc,
+    0x28,
+    0x3f,
+    0xa4,
+    0x5e,
+    0xd8,
+    0x99,
+    0xe4,
+    0x5d,
+    0x5e,
+    0x7a,
+    0xc4,
+    0xe6,
+    0xca,
+    0x7b,
+    0xa5,
+    0xb7,
 };
 
 /* Expected ciphertext value */
 static const unsigned char wrap_ct[] = {
-    0x97, 0x99, 0x55, 0xca, 0xf6, 0x3e, 0x95, 0x54, 0x39, 0xd6, 0xaf, 0x63, 0xff, 0x2c, 0xe3, 0x96,
-    0xf7, 0x0d, 0x2c, 0x9c, 0xc7, 0x43, 0xc0, 0xb6, 0x31, 0x43, 0xb9, 0x20, 0xac, 0x6b, 0xd3, 0x67,
-    0xad, 0x01, 0xaf, 0xa7, 0x32, 0x74, 0x26, 0x92,
+    0x97,
+    0x99,
+    0x55,
+    0xca,
+    0xf6,
+    0x3e,
+    0x95,
+    0x54,
+    0x39,
+    0xd6,
+    0xaf,
+    0x63,
+    0xff,
+    0x2c,
+    0xe3,
+    0x96,
+    0xf7,
+    0x0d,
+    0x2c,
+    0x9c,
+    0xc7,
+    0x43,
+    0xc0,
+    0xb6,
+    0x31,
+    0x43,
+    0xb9,
+    0x20,
+    0xac,
+    0x6b,
+    0xd3,
+    0x67,
+    0xad,
+    0x01,
+    0xaf,
+    0xa7,
+    0x32,
+    0x74,
+    0x26,
+    0x92,
 };
 
 /*
@@ -171,7 +251,7 @@ static int aes_wrap_decrypt(void)
 int main(int argc, char **argv)
 {
     if (!aes_wrap_encrypt())
-       return EXIT_FAILURE;
+        return EXIT_FAILURE;
 
     if (!aes_wrap_decrypt())
         return EXIT_FAILURE;
diff --git a/demos/cipher/ariacbc.c b/demos/cipher/ariacbc.c
index 4238a3db899c0..637dfcef0cfcc 100644
--- a/demos/cipher/ariacbc.c
+++ b/demos/cipher/ariacbc.c
@@ -27,8 +27,22 @@ static const unsigned char cbc_key[] = {
 
 /* Unique initialisation vector */
 static const unsigned char cbc_iv[] = {
-    0x99, 0xaa, 0x3e, 0x68, 0xed, 0x81, 0x73, 0xa0, 0xee, 0xd0, 0x66, 0x84,
-    0x99, 0xaa, 0x3e, 0x68,
+    0x99,
+    0xaa,
+    0x3e,
+    0x68,
+    0xed,
+    0x81,
+    0x73,
+    0xa0,
+    0xee,
+    0xd0,
+    0x66,
+    0x84,
+    0x99,
+    0xaa,
+    0x3e,
+    0x68,
 };
 
 /* Example plaintext to encrypt */
diff --git a/demos/cms/cms_comp.c b/demos/cms/cms_comp.c
index 30c5fc7fcf536..6445870a5b1fb 100644
--- a/demos/cms/cms_comp.c
+++ b/demos/cms/cms_comp.c
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
 
     ret = EXIT_SUCCESS;
 
- err:
+err:
 
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Compressing Data\n");
diff --git a/demos/cms/cms_ddec.c b/demos/cms/cms_ddec.c
index d119e9722226f..39c2f81556d13 100644
--- a/demos/cms/cms_ddec.c
+++ b/demos/cms/cms_ddec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-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
@@ -58,7 +58,7 @@ int main(int argc, char **argv)
     /* Open file containing detached content */
     dcont = BIO_new_file("smencr.out", "rb");
 
-    if (!in)
+    if (dcont == NULL)
         goto err;
 
     out = BIO_new_file("encrout.txt", "w");
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
 
     ret = EXIT_SUCCESS;
 
- err:
+err:
 
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Decrypting Data\n");
diff --git a/demos/cms/cms_dec.c b/demos/cms/cms_dec.c
index b15885eb18fa8..8be48e9b2d396 100644
--- a/demos/cms/cms_dec.c
+++ b/demos/cms/cms_dec.c
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
 
     ret = EXIT_SUCCESS;
 
- err:
+err:
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Decrypting Data\n");
         ERR_print_errors_fp(stderr);
diff --git a/demos/cms/cms_denc.c b/demos/cms/cms_denc.c
index 53b680f67484d..5c285bbfa2da3 100644
--- a/demos/cms/cms_denc.c
+++ b/demos/cms/cms_denc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2008-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
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
 
     dout = BIO_new_file("smencr.out", "wb");
 
-    if (!in)
+    if (in == NULL || dout == NULL)
         goto err;
 
     /* encrypt content */
@@ -78,7 +78,7 @@ int main(int argc, char **argv)
         goto err;
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Encrypting Data\n");
         ERR_print_errors_fp(stderr);
diff --git a/demos/cms/cms_enc.c b/demos/cms/cms_enc.c
index 1f69571a17fc5..686fddd136d52 100644
--- a/demos/cms/cms_enc.c
+++ b/demos/cms/cms_enc.c
@@ -76,7 +76,7 @@ int main(int argc, char **argv)
     printf("Encryption Successful\n");
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Encrypting Data\n");
         ERR_print_errors_fp(stderr);
diff --git a/demos/cms/cms_sign.c b/demos/cms/cms_sign.c
index 31e71e8b636c9..6a595c320f6dc 100644
--- a/demos/cms/cms_sign.c
+++ b/demos/cms/cms_sign.c
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
         goto err;
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Signing Data\n");
         ERR_print_errors_fp(stderr);
diff --git a/demos/cms/cms_sign2.c b/demos/cms/cms_sign2.c
index af3386eb76347..d5779389261a6 100644
--- a/demos/cms/cms_sign2.c
+++ b/demos/cms/cms_sign2.c
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
     printf("Signing Successful\n");
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Signing Data\n");
         ERR_print_errors_fp(stderr);
diff --git a/demos/cms/cms_uncomp.c b/demos/cms/cms_uncomp.c
index 13f1e756da1ea..99d2a5a9c8dcb 100644
--- a/demos/cms/cms_uncomp.c
+++ b/demos/cms/cms_uncomp.c
@@ -43,7 +43,7 @@ int main(int argc, char **argv)
         goto err;
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Uncompressing Data\n");
         ERR_print_errors_fp(stderr);
diff --git a/demos/cms/cms_ver.c b/demos/cms/cms_ver.c
index 43e9d0985408d..b454983d30276 100644
--- a/demos/cms/cms_ver.c
+++ b/demos/cms/cms_ver.c
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
 
     ret = EXIT_SUCCESS;
 
- err:
+err:
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Verifying Data\n");
         ERR_print_errors_fp(stderr);
diff --git a/demos/digest/BIO_f_md.c b/demos/digest/BIO_f_md.c
index 53b77a7315539..1e0e1416dfbe2 100644
--- a/demos/digest/BIO_f_md.c
+++ b/demos/digest/BIO_f_md.c
@@ -86,8 +86,8 @@ int main(int argc, char *argv[])
     }
     /* set our bio_digest BIO to digest data */
     if (BIO_set_md(bio_digest, md) != 1) {
-           fprintf(stderr, "BIO_set_md failed.\n");
-           goto cleanup;
+        fprintf(stderr, "BIO_set_md failed.\n");
+        goto cleanup;
     }
     /*-
      * We will use BIO chaining so that as we read, the digest gets updated
diff --git a/demos/digest/EVP_MD_demo.c b/demos/digest/EVP_MD_demo.c
index 2a66f7c2c1f04..622b8b1f876c3 100644
--- a/demos/digest/EVP_MD_demo.c
+++ b/demos/digest/EVP_MD_demo.c
@@ -24,56 +24,108 @@
  * more than once.
  */
 
-static const char *hamlet_1 =
-    "To be, or not to be, that is the question,\n"
-    "Whether tis nobler in the minde to suffer\n"
-    "The ſlings and arrowes of outragious fortune,\n"
-    "Or to take Armes again in a sea of troubles,\n"
-    "And by opposing, end them, to die to sleep;\n"
-    "No more, and by a sleep, to say we end\n"
-    "The heart-ache, and the thousand natural shocks\n"
-    "That flesh is heir to? tis a consumation\n"
-    "Devoutly to be wished. To die to sleep,\n"
-    "To sleepe, perchance to dreame, Aye, there's the rub,\n"
-    "For in that sleep of death what dreams may come\n"
-    "When we haue shuffled off this mortal coil\n"
-    "Must give us pause. There's the respect\n"
-    "That makes calamity of so long life:\n"
-    "For who would bear the Ships and Scorns of time,\n"
-    "The oppressor's wrong, the proud man's Contumely,\n"
-    "The pangs of dispised love, the Law's delay,\n"
-;
-static const char *hamlet_2 =
-    "The insolence of Office, and the spurns\n"
-    "That patient merit of the'unworthy takes,\n"
-    "When he himself might his Quietas make\n"
-    "With a bare bodkin? Who would fardels bear,\n"
-    "To grunt and sweat under a weary life,\n"
-    "But that the dread of something after death,\n"
-    "The undiscovered country, from whose bourn\n"
-    "No traveller returns, puzzles the will,\n"
-    "And makes us rather bear those ills we have,\n"
-    "Then fly to others we know not of?\n"
-    "Thus conscience does make cowards of us all,\n"
-    "And thus the native hue of Resolution\n"
-    "Is sickled o'er with the pale cast of Thought,\n"
-    "And enterprises of great pith and moment,\n"
-    "With this regard their currents turn awry,\n"
-    "And lose the name of Action. Soft you now,\n"
-    "The fair Ophelia? Nymph in thy Orisons\n"
-    "Be all my sins remember'd.\n"
-;
+static const char *hamlet_1 = "To be, or not to be, that is the question,\n"
+                              "Whether tis nobler in the minde to suffer\n"
+                              "The ſlings and arrowes of outragious fortune,\n"
+                              "Or to take Armes again in a sea of troubles,\n"
+                              "And by opposing, end them, to die to sleep;\n"
+                              "No more, and by a sleep, to say we end\n"
+                              "The heart-ache, and the thousand natural shocks\n"
+                              "That flesh is heir to? tis a consumation\n"
+                              "Devoutly to be wished. To die to sleep,\n"
+                              "To sleepe, perchance to dreame, Aye, there's the rub,\n"
+                              "For in that sleep of death what dreams may come\n"
+                              "When we haue shuffled off this mortal coil\n"
+                              "Must give us pause. There's the respect\n"
+                              "That makes calamity of so long life:\n"
+                              "For who would bear the Ships and Scorns of time,\n"
+                              "The oppressor's wrong, the proud man's Contumely,\n"
+                              "The pangs of dispised love, the Law's delay,\n";
+static const char *hamlet_2 = "The insolence of Office, and the spurns\n"
+                              "That patient merit of the'unworthy takes,\n"
+                              "When he himself might his Quietas make\n"
+                              "With a bare bodkin? Who would fardels bear,\n"
+                              "To grunt and sweat under a weary life,\n"
+                              "But that the dread of something after death,\n"
+                              "The undiscovered country, from whose bourn\n"
+                              "No traveller returns, puzzles the will,\n"
+                              "And makes us rather bear those ills we have,\n"
+                              "Then fly to others we know not of?\n"
+                              "Thus conscience does make cowards of us all,\n"
+                              "And thus the native hue of Resolution\n"
+                              "Is sickled o'er with the pale cast of Thought,\n"
+                              "And enterprises of great pith and moment,\n"
+                              "With this regard their currents turn awry,\n"
+                              "And lose the name of Action. Soft you now,\n"
+                              "The fair Ophelia? Nymph in thy Orisons\n"
+                              "Be all my sins remember'd.\n";
 
 /* The known value of the SHA3-512 digest of the above soliloqy */
 static const unsigned char known_answer[] = {
-    0xbb, 0x69, 0xf8, 0x09, 0x9c, 0x2e, 0x00, 0x3d,
-    0xa4, 0x29, 0x5f, 0x59, 0x4b, 0x89, 0xe4, 0xd9,
-    0xdb, 0xa2, 0xe5, 0xaf, 0xa5, 0x87, 0x73, 0x9d,
-    0x83, 0x72, 0xcf, 0xea, 0x84, 0x66, 0xc1, 0xf9,
-    0xc9, 0x78, 0xef, 0xba, 0x3d, 0xe9, 0xc1, 0xff,
-    0xa3, 0x75, 0xc7, 0x58, 0x74, 0x8e, 0x9c, 0x1d,
-    0x14, 0xd9, 0xdd, 0xd1, 0xfd, 0x24, 0x30, 0xd6,
-    0x81, 0xca, 0x8f, 0x78, 0x29, 0x19, 0x9a, 0xfe,
+    0xbb,
+    0x69,
+    0xf8,
+    0x09,
+    0x9c,
+    0x2e,
+    0x00,
+    0x3d,
+    0xa4,
+    0x29,
+    0x5f,
+    0x59,
+    0x4b,
+    0x89,
+    0xe4,
+    0xd9,
+    0xdb,
+    0xa2,
+    0xe5,
+    0xaf,
+    0xa5,
+    0x87,
+    0x73,
+    0x9d,
+    0x83,
+    0x72,
+    0xcf,
+    0xea,
+    0x84,
+    0x66,
+    0xc1,
+    0xf9,
+    0xc9,
+    0x78,
+    0xef,
+    0xba,
+    0x3d,
+    0xe9,
+    0xc1,
+    0xff,
+    0xa3,
+    0x75,
+    0xc7,
+    0x58,
+    0x74,
+    0x8e,
+    0x9c,
+    0x1d,
+    0x14,
+    0xd9,
+    0xdd,
+    0xd1,
+    0xfd,
+    0x24,
+    0x30,
+    0xd6,
+    0x81,
+    0xca,
+    0x8f,
+    0x78,
+    0x29,
+    0x19,
+    0x9a,
+    0xfe,
 };
 
 static int demonstrate_digest(void)
@@ -99,7 +151,7 @@ static int demonstrate_digest(void)
      * See providers(7) for details about algorithm fetching
      */
     message_digest = EVP_MD_fetch(library_context,
-                                  "SHA3-512", option_properties);
+        "SHA3-512", option_properties);
     if (message_digest == NULL) {
         fprintf(stderr, "EVP_MD_fetch could not find SHA3-512.");
         goto cleanup;
@@ -146,17 +198,17 @@ static int demonstrate_digest(void)
         fprintf(stderr, "EVP_DigestFinal() failed.\n");
         goto cleanup;
     }
-    for (j=0; j<digest_length; j++)  {
+    for (j = 0; j < digest_length; j++) {
         fprintf(stdout, "%02x", digest_value[j]);
     }
     fprintf(stdout, "\n");
     /* Check digest_value against the known answer */
     if ((size_t)digest_length != sizeof(known_answer)) {
         fprintf(stdout, "Digest length(%d) not equal to known answer length(%lu).\n",
-            digest_length, (unsigned long) sizeof(known_answer));
+            digest_length, (unsigned long)sizeof(known_answer));
     } else if (memcmp(digest_value, known_answer, digest_length) != 0) {
-        for (j=0; j<sizeof(known_answer); j++) {
-            fprintf(stdout, "%02x", known_answer[j] );
+        for (j = 0; j < sizeof(known_answer); j++) {
+            fprintf(stdout, "%02x", known_answer[j]);
         }
         fprintf(stdout, "\nDigest does not match known answer\n");
     } else {
diff --git a/demos/digest/EVP_MD_stdin.c b/demos/digest/EVP_MD_stdin.c
index 0a092dce1e0cc..5e4d7ca6f8f17 100644
--- a/demos/digest/EVP_MD_stdin.c
+++ b/demos/digest/EVP_MD_stdin.c
@@ -55,7 +55,7 @@ static int demonstrate_digest(BIO *input)
      * See providers(7) for details about algorithm fetching
      */
     message_digest = EVP_MD_fetch(library_context,
-                                  "SHA3-512", option_properties);
+        "SHA3-512", option_properties);
     if (message_digest == NULL) {
         fprintf(stderr, "EVP_MD_fetch could not find SHA3-512.");
         ERR_print_errors_fp(stderr);
@@ -104,7 +104,7 @@ static int demonstrate_digest(BIO *input)
         goto cleanup;
     }
     ret = 1;
-    for (ii=0; ii<digest_length; ii++) {
+    for (ii = 0; ii < digest_length; ii++) {
         fprintf(stdout, "%02x", digest_value[ii]);
     }
     fprintf(stdout, "\n");
diff --git a/demos/digest/EVP_MD_xof.c b/demos/digest/EVP_MD_xof.c
index 7fcaf4ba01675..f0c9de3e5fd62 100644
--- a/demos/digest/EVP_MD_xof.c
+++ b/demos/digest/EVP_MD_xof.c
@@ -31,9 +31,9 @@ static const char message[] = "This is a test message.";
 
 /* Expected output when an output length of 20 bytes is used. */
 static const unsigned char known_answer[] = {
-  0x52, 0x97, 0x93, 0x78, 0x27, 0x58, 0x7d, 0x62,
-  0x8b, 0x00, 0x25, 0xb5, 0xec, 0x39, 0x5e, 0x2d,
-  0x7f, 0x3e, 0xd4, 0x19
+    0x52, 0x97, 0x93, 0x78, 0x27, 0x58, 0x7d, 0x62,
+    0x8b, 0x00, 0x25, 0xb5, 0xec, 0x39, 0x5e, 0x2d,
+    0x7f, 0x3e, 0xd4, 0x19
 };
 
 /*
diff --git a/demos/encode/ec_encode.c b/demos/encode/ec_encode.c
index 4f15ce41e542b..a0647c54df1dd 100644
--- a/demos/encode/ec_encode.c
+++ b/demos/encode/ec_encode.c
@@ -44,8 +44,8 @@ static EVP_PKEY *load_key(OSSL_LIB_CTX *libctx, FILE *f, const char *passphrase)
      * if set to EVP_PKEY_PUBLIC_KEY, a public key will be required.
      */
     dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "PEM", NULL, "EC",
-                                         selection,
-                                         libctx, propq);
+        selection,
+        libctx, propq);
     if (dctx == NULL) {
         fprintf(stderr, "OSSL_DECODER_CTX_new_for_pkey() failed\n");
         goto cleanup;
@@ -62,8 +62,9 @@ static EVP_PKEY *load_key(OSSL_LIB_CTX *libctx, FILE *f, const char *passphrase)
      */
     if (passphrase != NULL) {
         if (OSSL_DECODER_CTX_set_passphrase(dctx,
-                                            (const unsigned char *)passphrase,
-                                            strlen(passphrase)) == 0) {
+                (const unsigned char *)passphrase,
+                strlen(passphrase))
+            == 0) {
             fprintf(stderr, "OSSL_DECODER_CTX_set_passphrase() failed\n");
             goto cleanup;
         }
@@ -152,8 +153,9 @@ static int store_key(EVP_PKEY *pkey, FILE *f, const char *passphrase)
 
         /* Set passphrase. */
         if (OSSL_ENCODER_CTX_set_passphrase(ectx,
-                                            (const unsigned char *)passphrase,
-                                            strlen(passphrase)) == 0) {
+                (const unsigned char *)passphrase,
+                strlen(passphrase))
+            == 0) {
             fprintf(stderr, "OSSL_ENCODER_CTX_set_passphrase() failed\n");
             goto cleanup;
         }
diff --git a/demos/encode/rsa_encode.c b/demos/encode/rsa_encode.c
index 8905ebe91f55f..b1ffc0c9b043d 100644
--- a/demos/encode/rsa_encode.c
+++ b/demos/encode/rsa_encode.c
@@ -44,8 +44,8 @@ static EVP_PKEY *load_key(OSSL_LIB_CTX *libctx, FILE *f, const char *passphrase)
      * if set to EVP_PKEY_PUBLIC_KEY, a public key will be required.
      */
     dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "PEM", NULL, "RSA",
-                                         selection,
-                                         libctx, propq);
+        selection,
+        libctx, propq);
     if (dctx == NULL) {
         fprintf(stderr, "OSSL_DECODER_CTX_new_for_pkey() failed\n");
         goto cleanup;
@@ -62,8 +62,9 @@ static EVP_PKEY *load_key(OSSL_LIB_CTX *libctx, FILE *f, const char *passphrase)
      */
     if (passphrase != NULL) {
         if (OSSL_DECODER_CTX_set_passphrase(dctx,
-                                            (const unsigned char *)passphrase,
-                                            strlen(passphrase)) == 0) {
+                (const unsigned char *)passphrase,
+                strlen(passphrase))
+            == 0) {
             fprintf(stderr, "OSSL_DECODER_CTX_set_passphrase() failed\n");
             goto cleanup;
         }
@@ -149,8 +150,9 @@ static int store_key(EVP_PKEY *pkey, FILE *f, const char *passphrase)
 
         /* Set passphrase. */
         if (OSSL_ENCODER_CTX_set_passphrase(ectx,
-                                            (const unsigned char *)passphrase,
-                                            strlen(passphrase)) == 0) {
+                (const unsigned char *)passphrase,
+                strlen(passphrase))
+            == 0) {
             fprintf(stderr, "OSSL_ENCODER_CTX_set_passphrase() failed\n");
             goto cleanup;
         }
diff --git a/demos/encrypt/rsa_encrypt.c b/demos/encrypt/rsa_encrypt.c
index d95b98551158e..3c8f7650192c2 100644
--- a/demos/encrypt/rsa_encrypt.c
+++ b/demos/encrypt/rsa_encrypt.c
@@ -23,11 +23,10 @@
 #include "rsa_encrypt.h"
 
 /* Input data to encrypt */
-static const unsigned char msg[] =
-    "To be, or not to be, that is the question,\n"
-    "Whether tis nobler in the minde to suffer\n"
-    "The slings and arrowes of outragious fortune,\n"
-    "Or to take Armes again in a sea of troubles";
+static const unsigned char msg[] = "To be, or not to be, that is the question,\n"
+                                   "Whether tis nobler in the minde to suffer\n"
+                                   "The slings and arrowes of outragious fortune,\n"
+                                   "Or to take Armes again in a sea of troubles";
 
 /*
  * For do_encrypt(), load an RSA public key from pub_key_der[].
@@ -51,7 +50,7 @@ static EVP_PKEY *get_key(OSSL_LIB_CTX *libctx, const char *propq, int public)
         data_len = sizeof(priv_key_der);
     }
     dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", NULL, "RSA",
-                                         selection, libctx, propq);
+        selection, libctx, propq);
     (void)OSSL_DECODER_from_data(dctx, &data, &data_len);
     OSSL_DECODER_CTX_free(dctx);
     return pkey;
@@ -64,20 +63,20 @@ static void set_optional_params(OSSL_PARAM *p, const char *propq)
 
     /* "pkcs1" is used by default if the padding mode is not set */
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_ASYM_CIPHER_PARAM_PAD_MODE,
-                                            OSSL_PKEY_RSA_PAD_MODE_OAEP, 0);
+        OSSL_PKEY_RSA_PAD_MODE_OAEP, 0);
     /* No oaep_label is used if this is not set */
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL,
-                                             label, sizeof(label));
+        label, sizeof(label));
     /* "SHA1" is used if this is not set */
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST,
-                                            "SHA256", 0);
+        "SHA256", 0);
     /*
      * If a non default property query needs to be specified when fetching the
      * OAEP digest then it needs to be specified here.
      */
     if (propq != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST_PROPS,
-                                                (char *)propq, 0);
+            (char *)propq, 0);
 
     /*
      * OSSL_ASYM_CIPHER_PARAM_MGF1_DIGEST and
@@ -94,8 +93,8 @@ static void set_optional_params(OSSL_PARAM *p, const char *propq)
  *
  */
 static int do_encrypt(OSSL_LIB_CTX *libctx,
-                      const unsigned char *in, size_t in_len,
-                      unsigned char **out, size_t *out_len)
+    const unsigned char *in, size_t in_len,
+    unsigned char **out, size_t *out_len)
 {
     int ret = 0, public = 1;
     size_t buf_len = 0;
@@ -128,7 +127,7 @@ static int do_encrypt(OSSL_LIB_CTX *libctx,
         goto cleanup;
     }
     buf = OPENSSL_zalloc(buf_len);
-    if (buf  == NULL) {
+    if (buf == NULL) {
         fprintf(stderr, "Malloc failed.\n");
         goto cleanup;
     }
@@ -152,7 +151,7 @@ static int do_encrypt(OSSL_LIB_CTX *libctx,
 }
 
 static int do_decrypt(OSSL_LIB_CTX *libctx, const unsigned char *in, size_t in_len,
-                      unsigned char **out, size_t *out_len)
+    unsigned char **out, size_t *out_len)
 {
     int ret = 0, public = 0;
     size_t buf_len = 0;
@@ -223,7 +222,7 @@ int main(void)
         goto cleanup;
     }
     if (!do_decrypt(libctx, encrypted, encrypted_len,
-                    &decrypted, &decrypted_len)) {
+            &decrypted, &decrypted_len)) {
         fprintf(stderr, "decryption failed.\n");
         goto cleanup;
     }
diff --git a/demos/encrypt/rsa_encrypt.h b/demos/encrypt/rsa_encrypt.h
index 8cb29391b2da8..be9ee66eda490 100644
--- a/demos/encrypt/rsa_encrypt.h
+++ b/demos/encrypt/rsa_encrypt.h
@@ -9,133 +9,1494 @@
 
 /* Private RSA key used for decryption */
 static const unsigned char priv_key_der[] = {
-    0x30, 0x82, 0x04, 0xa4, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00,
-    0xc2, 0x44, 0xbc, 0xcf, 0x5b, 0xca, 0xcd, 0x80, 0x77, 0xae, 0xf9, 0x7a,
-    0x34, 0xbb, 0x37, 0x6f, 0x5c, 0x76, 0x4c, 0xe4, 0xbb, 0x0c, 0x1d, 0xe7,
-    0xfe, 0x0f, 0xda, 0xcf, 0x8c, 0x56, 0x65, 0x72, 0x6e, 0x2c, 0xf9, 0xfd,
-    0x87, 0x43, 0xeb, 0x4c, 0x26, 0xb1, 0xd3, 0xf0, 0x87, 0xb1, 0x18, 0x68,
-    0x14, 0x7d, 0x3c, 0x2a, 0xfa, 0xc2, 0x5d, 0x70, 0x19, 0x11, 0x00, 0x2e,
-    0xb3, 0x9c, 0x8e, 0x38, 0x08, 0xbe, 0xe3, 0xeb, 0x7d, 0x6e, 0xc7, 0x19,
-    0xc6, 0x7f, 0x59, 0x48, 0x84, 0x1b, 0xe3, 0x27, 0x30, 0x46, 0x30, 0xd3,
-    0xfc, 0xfc, 0xb3, 0x35, 0x75, 0xc4, 0x31, 0x1a, 0xc0, 0xc2, 0x4c, 0x0b,
-    0xc7, 0x01, 0x95, 0xb2, 0xdc, 0x17, 0x77, 0x9b, 0x09, 0x15, 0x04, 0xbc,
-    0xdb, 0x57, 0x0b, 0x26, 0xda, 0x59, 0x54, 0x0d, 0x6e, 0xb7, 0x89, 0xbc,
-    0x53, 0x9d, 0x5f, 0x8c, 0xad, 0x86, 0x97, 0xd2, 0x48, 0x4f, 0x5c, 0x94,
-    0xdd, 0x30, 0x2f, 0xcf, 0xfc, 0xde, 0x20, 0x31, 0x25, 0x9d, 0x29, 0x25,
-    0x78, 0xb7, 0xd2, 0x5b, 0x5d, 0x99, 0x5b, 0x08, 0x12, 0x81, 0x79, 0x89,
-    0xa0, 0xcf, 0x8f, 0x40, 0xb1, 0x77, 0x72, 0x3b, 0x13, 0xfc, 0x55, 0x43,
-    0x70, 0x29, 0xd5, 0x41, 0xed, 0x31, 0x4b, 0x2d, 0x6c, 0x7d, 0xcf, 0x99,
-    0x5f, 0xd1, 0x72, 0x9f, 0x8b, 0x32, 0x96, 0xde, 0x5d, 0x8b, 0x19, 0x77,
-    0x75, 0xff, 0x09, 0xbf, 0x26, 0xe9, 0xd7, 0x3d, 0xc7, 0x1a, 0x81, 0xcf,
-    0x05, 0x1b, 0x89, 0xbf, 0x45, 0x32, 0xbf, 0x5e, 0xc9, 0xe3, 0x5c, 0x33,
-    0x4a, 0x72, 0x47, 0xf4, 0x24, 0xae, 0x9b, 0x38, 0x24, 0x76, 0x9a, 0xa2,
-    0x9a, 0x50, 0x50, 0x49, 0xf5, 0x26, 0xb9, 0x55, 0xa6, 0x47, 0xc9, 0x14,
-    0xa2, 0xca, 0xd4, 0xa8, 0x8a, 0x9f, 0xe9, 0x5a, 0x5a, 0x12, 0xaa, 0x30,
-    0xd5, 0x78, 0x8b, 0x39, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02, 0x82, 0x01,
-    0x00, 0x22, 0x5d, 0xb9, 0x8e, 0xef, 0x1c, 0x91, 0xbd, 0x03, 0xaf, 0x1a,
-    0xe8, 0x00, 0xf3, 0x0b, 0x8b, 0xf2, 0x2d, 0xe5, 0x4d, 0x63, 0x3f, 0x71,
-    0xfc, 0xeb, 0xc7, 0x4f, 0x3c, 0x7f, 0x05, 0x7b, 0x9d, 0xc2, 0x1a, 0xc7,
-    0xc0, 0x8f, 0x50, 0xb7, 0x0b, 0xba, 0x1e, 0xa4, 0x30, 0xfd, 0x38, 0x19,
-    0x6a, 0xb4, 0x11, 0x31, 0x77, 0x22, 0xf4, 0x06, 0x46, 0x81, 0xd0, 0xad,
-    0x99, 0x15, 0x62, 0x01, 0x10, 0xad, 0x8f, 0x63, 0x4f, 0x71, 0xd9, 0x8a,
-    0x74, 0x27, 0x56, 0xb8, 0xeb, 0x28, 0x9f, 0xac, 0x4f, 0xee, 0xec, 0xc3,
-    0xcf, 0x84, 0x86, 0x09, 0x87, 0xd0, 0x04, 0xfc, 0x70, 0xd0, 0x9f, 0xae,
-    0x87, 0x38, 0xd5, 0xb1, 0x6f, 0x3a, 0x1b, 0x16, 0xa8, 0x00, 0xf3, 0xcc,
-    0x6a, 0x42, 0x5d, 0x04, 0x16, 0x83, 0xf2, 0xe0, 0x79, 0x1d, 0xd8, 0x6f,
-    0x0f, 0xb7, 0x34, 0xf4, 0x45, 0xb5, 0x1e, 0xc5, 0xb5, 0x78, 0xa7, 0xd3,
-    0xa3, 0x23, 0x35, 0xbc, 0x7b, 0x01, 0x59, 0x7d, 0xee, 0xb9, 0x4f, 0xda,
-    0x28, 0xad, 0x5d, 0x25, 0xab, 0x66, 0x6a, 0xb0, 0x61, 0xf6, 0x12, 0xa7,
-    0xee, 0xd1, 0xe7, 0xb1, 0x8b, 0x91, 0x29, 0xba, 0xb5, 0xf8, 0x78, 0xc8,
-    0x6b, 0x76, 0x67, 0x32, 0xe8, 0xf3, 0x4e, 0x59, 0xba, 0xc1, 0x44, 0xc0,
-    0xec, 0x8d, 0x7c, 0x63, 0xb2, 0x6e, 0x0c, 0xb9, 0x33, 0x42, 0x0c, 0x8d,
-    0xae, 0x4e, 0x54, 0xc8, 0x8a, 0xef, 0xf9, 0x47, 0xc8, 0x99, 0x84, 0xc8,
-    0x46, 0xf6, 0xa6, 0x53, 0x59, 0xf8, 0x60, 0xe3, 0xd7, 0x1d, 0x10, 0x95,
-    0xf5, 0x6d, 0xf4, 0xa3, 0x18, 0x40, 0xd7, 0x14, 0x04, 0xac, 0x8c, 0x69,
-    0xd6, 0x14, 0xdc, 0xd8, 0xcc, 0xbc, 0x1c, 0xac, 0xd7, 0x21, 0x2b, 0x7e,
-    0x29, 0x88, 0x06, 0xa0, 0xf4, 0x06, 0x08, 0x14, 0x04, 0x4d, 0x32, 0x33,
-    0x84, 0x9c, 0x20, 0x8e, 0xcf, 0x02, 0x81, 0x81, 0x00, 0xf3, 0xf9, 0xbd,
-    0xd5, 0x43, 0x6f, 0x27, 0x4a, 0x92, 0xd6, 0x18, 0x3d, 0x4b, 0xf1, 0x77,
-    0x7c, 0xaf, 0xce, 0x01, 0x17, 0x98, 0xcb, 0xbe, 0x06, 0x86, 0x3a, 0x13,
-    0x72, 0x4b, 0x7c, 0x81, 0x51, 0x24, 0x5d, 0xc3, 0xe9, 0xa2, 0x63, 0x1e,
-    0x4a, 0xeb, 0x66, 0xae, 0x01, 0x5e, 0xa4, 0xa4, 0x74, 0x9e, 0xee, 0x32,
-    0xe5, 0x59, 0x1b, 0x37, 0xef, 0x7d, 0xb3, 0x42, 0x8c, 0x93, 0x8b, 0xd3,
-    0x1e, 0x83, 0x43, 0xb5, 0x88, 0x3e, 0x24, 0xeb, 0xdc, 0x92, 0x2d, 0xcc,
-    0x9a, 0x9d, 0xf1, 0x7d, 0x16, 0x71, 0xcb, 0x25, 0x47, 0x36, 0xb0, 0xc4,
-    0x6b, 0xc8, 0x53, 0x4a, 0x25, 0x80, 0x47, 0x77, 0xdb, 0x97, 0x13, 0x15,
-    0x0f, 0x4a, 0xfa, 0x0c, 0x6c, 0x44, 0x13, 0x2f, 0xbc, 0x9a, 0x6b, 0x13,
-    0x57, 0xfc, 0x42, 0xb9, 0xe9, 0xd3, 0x2e, 0xd2, 0x11, 0xf4, 0xc5, 0x84,
-    0x55, 0xd2, 0xdf, 0x1d, 0xa7, 0x02, 0x81, 0x81, 0x00, 0xcb, 0xd7, 0xd6,
-    0x9d, 0x71, 0xb3, 0x86, 0xbe, 0x68, 0xed, 0x67, 0xe1, 0x51, 0x92, 0x17,
-    0x60, 0x58, 0xb3, 0x2a, 0x56, 0xfd, 0x18, 0xfb, 0x39, 0x4b, 0x14, 0xc6,
-    0xf6, 0x67, 0x0e, 0x31, 0xe3, 0xb3, 0x2f, 0x1f, 0xec, 0x16, 0x1c, 0x23,
-    0x2b, 0x60, 0x36, 0xd1, 0xcb, 0x4a, 0x03, 0x6a, 0x3a, 0x4c, 0x8c, 0xf2,
-    0x73, 0x08, 0x23, 0x29, 0xda, 0xcb, 0xf7, 0xb6, 0x18, 0x97, 0xc6, 0xfe,
-    0xd4, 0x40, 0x06, 0x87, 0x9d, 0x6e, 0xbb, 0x5d, 0x14, 0x44, 0xc8, 0x19,
-    0xfa, 0x7f, 0x0c, 0xc5, 0x02, 0x92, 0x00, 0xbb, 0x2e, 0x4f, 0x50, 0xb0,
-    0x71, 0x9f, 0xf3, 0x94, 0x12, 0xb8, 0x6c, 0x5f, 0xe1, 0x83, 0x7b, 0xbc,
-    0x8c, 0x0a, 0x6f, 0x09, 0x6a, 0x35, 0x4f, 0xf9, 0xa4, 0x92, 0x93, 0xe3,
-    0xad, 0x36, 0x25, 0x28, 0x90, 0x85, 0xd2, 0x9f, 0x86, 0xfd, 0xd9, 0xa8,
-    0x61, 0xe9, 0xb2, 0xec, 0x1f, 0x02, 0x81, 0x81, 0x00, 0xdd, 0x1c, 0x52,
-    0xda, 0x2b, 0xc2, 0x5a, 0x26, 0xb0, 0xcb, 0x0d, 0xae, 0xc7, 0xdb, 0xf0,
-    0x41, 0x75, 0x87, 0x4a, 0xe0, 0x1a, 0xdf, 0x53, 0xb9, 0xcf, 0xfe, 0x64,
-    0x4f, 0x6a, 0x70, 0x4d, 0x36, 0xbf, 0xb1, 0xa6, 0xf3, 0x5f, 0xf3, 0x5a,
-    0xa9, 0xe5, 0x8b, 0xea, 0x59, 0x5d, 0x6f, 0xf3, 0x87, 0xa9, 0xde, 0x11,
-    0x0c, 0x60, 0x64, 0x55, 0x9e, 0x5c, 0x1a, 0x91, 0x4e, 0x9c, 0x0d, 0xd5,
-    0xe9, 0x4a, 0x67, 0x9b, 0xe6, 0xfd, 0x03, 0x33, 0x2b, 0x74, 0xe3, 0xc3,
-    0x11, 0xc1, 0xe0, 0xf1, 0x4f, 0xdd, 0x13, 0x92, 0x16, 0x67, 0x4f, 0x6e,
-    0xc4, 0x8c, 0x0a, 0x48, 0x21, 0x92, 0x8f, 0xb2, 0xe5, 0xb5, 0x96, 0x5a,
-    0xb8, 0xc0, 0x67, 0xbb, 0xc8, 0x87, 0x2d, 0xa8, 0x4e, 0xd2, 0xd8, 0x05,
-    0xf0, 0xf0, 0xb3, 0x7c, 0x90, 0x98, 0x8f, 0x4f, 0x5d, 0x6c, 0xab, 0x71,
-    0x92, 0xe2, 0x88, 0xc8, 0xf3, 0x02, 0x81, 0x81, 0x00, 0x99, 0x27, 0x5a,
-    0x00, 0x81, 0x65, 0x39, 0x5f, 0xe6, 0xc6, 0x38, 0xbe, 0x79, 0xe3, 0x21,
-    0xdd, 0x29, 0xc7, 0xb3, 0x90, 0x18, 0x29, 0xa4, 0xd7, 0xaf, 0x29, 0xb5,
-    0x33, 0x7c, 0xca, 0x95, 0x81, 0x57, 0x27, 0x98, 0xfc, 0x70, 0xc0, 0x43,
-    0x4c, 0x5b, 0xc5, 0xd4, 0x6a, 0xc0, 0xf9, 0x3f, 0xde, 0xfd, 0x95, 0x08,
-    0xb4, 0x94, 0xf0, 0x96, 0x89, 0xe5, 0xa6, 0x00, 0x13, 0x0a, 0x36, 0x61,
-    0x50, 0x67, 0xaa, 0x80, 0x4a, 0x30, 0xe0, 0x65, 0x56, 0xcd, 0x36, 0xeb,
-    0x0d, 0xe2, 0x57, 0x5d, 0xce, 0x48, 0x94, 0x74, 0x0e, 0x9f, 0x59, 0x28,
-    0xb8, 0xb6, 0x4c, 0xf4, 0x7b, 0xfc, 0x44, 0xb0, 0xe5, 0x67, 0x3c, 0x98,
-    0xb5, 0x3f, 0x41, 0x9d, 0xf9, 0x46, 0x85, 0x08, 0x34, 0x36, 0x4d, 0x17,
-    0x4b, 0x14, 0xdb, 0x66, 0x56, 0xef, 0xb5, 0x08, 0x57, 0x0c, 0x73, 0x74,
-    0xa7, 0xdc, 0x46, 0xaa, 0x51, 0x02, 0x81, 0x80, 0x1e, 0x50, 0x4c, 0xde,
-    0x9c, 0x60, 0x6d, 0xd7, 0x31, 0xf6, 0xd8, 0x4f, 0xc2, 0x25, 0x7d, 0x83,
-    0xb3, 0xe7, 0xed, 0x92, 0xe7, 0x28, 0x1e, 0xb3, 0x9b, 0xcb, 0xf2, 0x86,
-    0xa4, 0x49, 0x45, 0x5e, 0xba, 0x1d, 0xdb, 0x21, 0x5d, 0xdf, 0xeb, 0x3c,
-    0x5e, 0x01, 0xc6, 0x68, 0x25, 0x28, 0xe6, 0x1a, 0xbf, 0xc1, 0xa1, 0xc5,
-    0x92, 0x0b, 0x08, 0x43, 0x0e, 0x5a, 0xa3, 0x85, 0x8a, 0x65, 0xb4, 0x54,
-    0xa1, 0x4c, 0x20, 0xa2, 0x5a, 0x08, 0xf6, 0x90, 0x0d, 0x9a, 0xd7, 0x20,
-    0xf1, 0x10, 0x66, 0x28, 0x4c, 0x22, 0x56, 0xa6, 0xb9, 0xff, 0xd0, 0x6a,
-    0x62, 0x8c, 0x9f, 0xf8, 0x7c, 0xf4, 0xad, 0xd7, 0xe8, 0xf9, 0x87, 0x43,
-    0xbf, 0x73, 0x5b, 0x04, 0xc7, 0xd0, 0x77, 0xcc, 0xe3, 0xbe, 0xda, 0xc2,
-    0x07, 0xed, 0x8d, 0x2a, 0x15, 0x77, 0x1d, 0x53, 0x47, 0xe0, 0xa2, 0x11,
-    0x41, 0x0d, 0xe2, 0xe7,
+    0x30,
+    0x82,
+    0x04,
+    0xa4,
+    0x02,
+    0x01,
+    0x00,
+    0x02,
+    0x82,
+    0x01,
+    0x01,
+    0x00,
+    0xc2,
+    0x44,
+    0xbc,
+    0xcf,
+    0x5b,
+    0xca,
+    0xcd,
+    0x80,
+    0x77,
+    0xae,
+    0xf9,
+    0x7a,
+    0x34,
+    0xbb,
+    0x37,
+    0x6f,
+    0x5c,
+    0x76,
+    0x4c,
+    0xe4,
+    0xbb,
+    0x0c,
+    0x1d,
+    0xe7,
+    0xfe,
+    0x0f,
+    0xda,
+    0xcf,
+    0x8c,
+    0x56,
+    0x65,
+    0x72,
+    0x6e,
+    0x2c,
+    0xf9,
+    0xfd,
+    0x87,
+    0x43,
+    0xeb,
+    0x4c,
+    0x26,
+    0xb1,
+    0xd3,
+    0xf0,
+    0x87,
+    0xb1,
+    0x18,
+    0x68,
+    0x14,
+    0x7d,
+    0x3c,
+    0x2a,
+    0xfa,
+    0xc2,
+    0x5d,
+    0x70,
+    0x19,
+    0x11,
+    0x00,
+    0x2e,
+    0xb3,
+    0x9c,
+    0x8e,
+    0x38,
+    0x08,
+    0xbe,
+    0xe3,
+    0xeb,
+    0x7d,
+    0x6e,
+    0xc7,
+    0x19,
+    0xc6,
+    0x7f,
+    0x59,
+    0x48,
+    0x84,
+    0x1b,
+    0xe3,
+    0x27,
+    0x30,
+    0x46,
+    0x30,
+    0xd3,
+    0xfc,
+    0xfc,
+    0xb3,
+    0x35,
+    0x75,
+    0xc4,
+    0x31,
+    0x1a,
+    0xc0,
+    0xc2,
+    0x4c,
+    0x0b,
+    0xc7,
+    0x01,
+    0x95,
+    0xb2,
+    0xdc,
+    0x17,
+    0x77,
+    0x9b,
+    0x09,
+    0x15,
+    0x04,
+    0xbc,
+    0xdb,
+    0x57,
+    0x0b,
+    0x26,
+    0xda,
+    0x59,
+    0x54,
+    0x0d,
+    0x6e,
+    0xb7,
+    0x89,
+    0xbc,
+    0x53,
+    0x9d,
+    0x5f,
+    0x8c,
+    0xad,
+    0x86,
+    0x97,
+    0xd2,
+    0x48,
+    0x4f,
+    0x5c,
+    0x94,
+    0xdd,
+    0x30,
+    0x2f,
+    0xcf,
+    0xfc,
+    0xde,
+    0x20,
+    0x31,
+    0x25,
+    0x9d,
+    0x29,
+    0x25,
+    0x78,
+    0xb7,
+    0xd2,
+    0x5b,
+    0x5d,
+    0x99,
+    0x5b,
+    0x08,
+    0x12,
+    0x81,
+    0x79,
+    0x89,
+    0xa0,
+    0xcf,
+    0x8f,
+    0x40,
+    0xb1,
+    0x77,
+    0x72,
+    0x3b,
+    0x13,
+    0xfc,
+    0x55,
+    0x43,
+    0x70,
+    0x29,
+    0xd5,
+    0x41,
+    0xed,
+    0x31,
+    0x4b,
+    0x2d,
+    0x6c,
+    0x7d,
+    0xcf,
+    0x99,
+    0x5f,
+    0xd1,
+    0x72,
+    0x9f,
+    0x8b,
+    0x32,
+    0x96,
+    0xde,
+    0x5d,
+    0x8b,
+    0x19,
+    0x77,
+    0x75,
+    0xff,
+    0x09,
+    0xbf,
+    0x26,
+    0xe9,
+    0xd7,
+    0x3d,
+    0xc7,
+    0x1a,
+    0x81,
+    0xcf,
+    0x05,
+    0x1b,
+    0x89,
+    0xbf,
+    0x45,
+    0x32,
+    0xbf,
+    0x5e,
+    0xc9,
+    0xe3,
+    0x5c,
+    0x33,
+    0x4a,
+    0x72,
+    0x47,
+    0xf4,
+    0x24,
+    0xae,
+    0x9b,
+    0x38,
+    0x24,
+    0x76,
+    0x9a,
+    0xa2,
+    0x9a,
+    0x50,
+    0x50,
+    0x49,
+    0xf5,
+    0x26,
+    0xb9,
+    0x55,
+    0xa6,
+    0x47,
+    0xc9,
+    0x14,
+    0xa2,
+    0xca,
+    0xd4,
+    0xa8,
+    0x8a,
+    0x9f,
+    0xe9,
+    0x5a,
+    0x5a,
+    0x12,
+    0xaa,
+    0x30,
+    0xd5,
+    0x78,
+    0x8b,
+    0x39,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0x02,
+    0x82,
+    0x01,
+    0x00,
+    0x22,
+    0x5d,
+    0xb9,
+    0x8e,
+    0xef,
+    0x1c,
+    0x91,
+    0xbd,
+    0x03,
+    0xaf,
+    0x1a,
+    0xe8,
+    0x00,
+    0xf3,
+    0x0b,
+    0x8b,
+    0xf2,
+    0x2d,
+    0xe5,
+    0x4d,
+    0x63,
+    0x3f,
+    0x71,
+    0xfc,
+    0xeb,
+    0xc7,
+    0x4f,
+    0x3c,
+    0x7f,
+    0x05,
+    0x7b,
+    0x9d,
+    0xc2,
+    0x1a,
+    0xc7,
+    0xc0,
+    0x8f,
+    0x50,
+    0xb7,
+    0x0b,
+    0xba,
+    0x1e,
+    0xa4,
+    0x30,
+    0xfd,
+    0x38,
+    0x19,
+    0x6a,
+    0xb4,
+    0x11,
+    0x31,
+    0x77,
+    0x22,
+    0xf4,
+    0x06,
+    0x46,
+    0x81,
+    0xd0,
+    0xad,
+    0x99,
+    0x15,
+    0x62,
+    0x01,
+    0x10,
+    0xad,
+    0x8f,
+    0x63,
+    0x4f,
+    0x71,
+    0xd9,
+    0x8a,
+    0x74,
+    0x27,
+    0x56,
+    0xb8,
+    0xeb,
+    0x28,
+    0x9f,
+    0xac,
+    0x4f,
+    0xee,
+    0xec,
+    0xc3,
+    0xcf,
+    0x84,
+    0x86,
+    0x09,
+    0x87,
+    0xd0,
+    0x04,
+    0xfc,
+    0x70,
+    0xd0,
+    0x9f,
+    0xae,
+    0x87,
+    0x38,
+    0xd5,
+    0xb1,
+    0x6f,
+    0x3a,
+    0x1b,
+    0x16,
+    0xa8,
+    0x00,
+    0xf3,
+    0xcc,
+    0x6a,
+    0x42,
+    0x5d,
+    0x04,
+    0x16,
+    0x83,
+    0xf2,
+    0xe0,
+    0x79,
+    0x1d,
+    0xd8,
+    0x6f,
+    0x0f,
+    0xb7,
+    0x34,
+    0xf4,
+    0x45,
+    0xb5,
+    0x1e,
+    0xc5,
+    0xb5,
+    0x78,
+    0xa7,
+    0xd3,
+    0xa3,
+    0x23,
+    0x35,
+    0xbc,
+    0x7b,
+    0x01,
+    0x59,
+    0x7d,
+    0xee,
+    0xb9,
+    0x4f,
+    0xda,
+    0x28,
+    0xad,
+    0x5d,
+    0x25,
+    0xab,
+    0x66,
+    0x6a,
+    0xb0,
+    0x61,
+    0xf6,
+    0x12,
+    0xa7,
+    0xee,
+    0xd1,
+    0xe7,
+    0xb1,
+    0x8b,
+    0x91,
+    0x29,
+    0xba,
+    0xb5,
+    0xf8,
+    0x78,
+    0xc8,
+    0x6b,
+    0x76,
+    0x67,
+    0x32,
+    0xe8,
+    0xf3,
+    0x4e,
+    0x59,
+    0xba,
+    0xc1,
+    0x44,
+    0xc0,
+    0xec,
+    0x8d,
+    0x7c,
+    0x63,
+    0xb2,
+    0x6e,
+    0x0c,
+    0xb9,
+    0x33,
+    0x42,
+    0x0c,
+    0x8d,
+    0xae,
+    0x4e,
+    0x54,
+    0xc8,
+    0x8a,
+    0xef,
+    0xf9,
+    0x47,
+    0xc8,
+    0x99,
+    0x84,
+    0xc8,
+    0x46,
+    0xf6,
+    0xa6,
+    0x53,
+    0x59,
+    0xf8,
+    0x60,
+    0xe3,
+    0xd7,
+    0x1d,
+    0x10,
+    0x95,
+    0xf5,
+    0x6d,
+    0xf4,
+    0xa3,
+    0x18,
+    0x40,
+    0xd7,
+    0x14,
+    0x04,
+    0xac,
+    0x8c,
+    0x69,
+    0xd6,
+    0x14,
+    0xdc,
+    0xd8,
+    0xcc,
+    0xbc,
+    0x1c,
+    0xac,
+    0xd7,
+    0x21,
+    0x2b,
+    0x7e,
+    0x29,
+    0x88,
+    0x06,
+    0xa0,
+    0xf4,
+    0x06,
+    0x08,
+    0x14,
+    0x04,
+    0x4d,
+    0x32,
+    0x33,
+    0x84,
+    0x9c,
+    0x20,
+    0x8e,
+    0xcf,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xf3,
+    0xf9,
+    0xbd,
+    0xd5,
+    0x43,
+    0x6f,
+    0x27,
+    0x4a,
+    0x92,
+    0xd6,
+    0x18,
+    0x3d,
+    0x4b,
+    0xf1,
+    0x77,
+    0x7c,
+    0xaf,
+    0xce,
+    0x01,
+    0x17,
+    0x98,
+    0xcb,
+    0xbe,
+    0x06,
+    0x86,
+    0x3a,
+    0x13,
+    0x72,
+    0x4b,
+    0x7c,
+    0x81,
+    0x51,
+    0x24,
+    0x5d,
+    0xc3,
+    0xe9,
+    0xa2,
+    0x63,
+    0x1e,
+    0x4a,
+    0xeb,
+    0x66,
+    0xae,
+    0x01,
+    0x5e,
+    0xa4,
+    0xa4,
+    0x74,
+    0x9e,
+    0xee,
+    0x32,
+    0xe5,
+    0x59,
+    0x1b,
+    0x37,
+    0xef,
+    0x7d,
+    0xb3,
+    0x42,
+    0x8c,
+    0x93,
+    0x8b,
+    0xd3,
+    0x1e,
+    0x83,
+    0x43,
+    0xb5,
+    0x88,
+    0x3e,
+    0x24,
+    0xeb,
+    0xdc,
+    0x92,
+    0x2d,
+    0xcc,
+    0x9a,
+    0x9d,
+    0xf1,
+    0x7d,
+    0x16,
+    0x71,
+    0xcb,
+    0x25,
+    0x47,
+    0x36,
+    0xb0,
+    0xc4,
+    0x6b,
+    0xc8,
+    0x53,
+    0x4a,
+    0x25,
+    0x80,
+    0x47,
+    0x77,
+    0xdb,
+    0x97,
+    0x13,
+    0x15,
+    0x0f,
+    0x4a,
+    0xfa,
+    0x0c,
+    0x6c,
+    0x44,
+    0x13,
+    0x2f,
+    0xbc,
+    0x9a,
+    0x6b,
+    0x13,
+    0x57,
+    0xfc,
+    0x42,
+    0xb9,
+    0xe9,
+    0xd3,
+    0x2e,
+    0xd2,
+    0x11,
+    0xf4,
+    0xc5,
+    0x84,
+    0x55,
+    0xd2,
+    0xdf,
+    0x1d,
+    0xa7,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xcb,
+    0xd7,
+    0xd6,
+    0x9d,
+    0x71,
+    0xb3,
+    0x86,
+    0xbe,
+    0x68,
+    0xed,
+    0x67,
+    0xe1,
+    0x51,
+    0x92,
+    0x17,
+    0x60,
+    0x58,
+    0xb3,
+    0x2a,
+    0x56,
+    0xfd,
+    0x18,
+    0xfb,
+    0x39,
+    0x4b,
+    0x14,
+    0xc6,
+    0xf6,
+    0x67,
+    0x0e,
+    0x31,
+    0xe3,
+    0xb3,
+    0x2f,
+    0x1f,
+    0xec,
+    0x16,
+    0x1c,
+    0x23,
+    0x2b,
+    0x60,
+    0x36,
+    0xd1,
+    0xcb,
+    0x4a,
+    0x03,
+    0x6a,
+    0x3a,
+    0x4c,
+    0x8c,
+    0xf2,
+    0x73,
+    0x08,
+    0x23,
+    0x29,
+    0xda,
+    0xcb,
+    0xf7,
+    0xb6,
+    0x18,
+    0x97,
+    0xc6,
+    0xfe,
+    0xd4,
+    0x40,
+    0x06,
+    0x87,
+    0x9d,
+    0x6e,
+    0xbb,
+    0x5d,
+    0x14,
+    0x44,
+    0xc8,
+    0x19,
+    0xfa,
+    0x7f,
+    0x0c,
+    0xc5,
+    0x02,
+    0x92,
+    0x00,
+    0xbb,
+    0x2e,
+    0x4f,
+    0x50,
+    0xb0,
+    0x71,
+    0x9f,
+    0xf3,
+    0x94,
+    0x12,
+    0xb8,
+    0x6c,
+    0x5f,
+    0xe1,
+    0x83,
+    0x7b,
+    0xbc,
+    0x8c,
+    0x0a,
+    0x6f,
+    0x09,
+    0x6a,
+    0x35,
+    0x4f,
+    0xf9,
+    0xa4,
+    0x92,
+    0x93,
+    0xe3,
+    0xad,
+    0x36,
+    0x25,
+    0x28,
+    0x90,
+    0x85,
+    0xd2,
+    0x9f,
+    0x86,
+    0xfd,
+    0xd9,
+    0xa8,
+    0x61,
+    0xe9,
+    0xb2,
+    0xec,
+    0x1f,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xdd,
+    0x1c,
+    0x52,
+    0xda,
+    0x2b,
+    0xc2,
+    0x5a,
+    0x26,
+    0xb0,
+    0xcb,
+    0x0d,
+    0xae,
+    0xc7,
+    0xdb,
+    0xf0,
+    0x41,
+    0x75,
+    0x87,
+    0x4a,
+    0xe0,
+    0x1a,
+    0xdf,
+    0x53,
+    0xb9,
+    0xcf,
+    0xfe,
+    0x64,
+    0x4f,
+    0x6a,
+    0x70,
+    0x4d,
+    0x36,
+    0xbf,
+    0xb1,
+    0xa6,
+    0xf3,
+    0x5f,
+    0xf3,
+    0x5a,
+    0xa9,
+    0xe5,
+    0x8b,
+    0xea,
+    0x59,
+    0x5d,
+    0x6f,
+    0xf3,
+    0x87,
+    0xa9,
+    0xde,
+    0x11,
+    0x0c,
+    0x60,
+    0x64,
+    0x55,
+    0x9e,
+    0x5c,
+    0x1a,
+    0x91,
+    0x4e,
+    0x9c,
+    0x0d,
+    0xd5,
+    0xe9,
+    0x4a,
+    0x67,
+    0x9b,
+    0xe6,
+    0xfd,
+    0x03,
+    0x33,
+    0x2b,
+    0x74,
+    0xe3,
+    0xc3,
+    0x11,
+    0xc1,
+    0xe0,
+    0xf1,
+    0x4f,
+    0xdd,
+    0x13,
+    0x92,
+    0x16,
+    0x67,
+    0x4f,
+    0x6e,
+    0xc4,
+    0x8c,
+    0x0a,
+    0x48,
+    0x21,
+    0x92,
+    0x8f,
+    0xb2,
+    0xe5,
+    0xb5,
+    0x96,
+    0x5a,
+    0xb8,
+    0xc0,
+    0x67,
+    0xbb,
+    0xc8,
+    0x87,
+    0x2d,
+    0xa8,
+    0x4e,
+    0xd2,
+    0xd8,
+    0x05,
+    0xf0,
+    0xf0,
+    0xb3,
+    0x7c,
+    0x90,
+    0x98,
+    0x8f,
+    0x4f,
+    0x5d,
+    0x6c,
+    0xab,
+    0x71,
+    0x92,
+    0xe2,
+    0x88,
+    0xc8,
+    0xf3,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0x99,
+    0x27,
+    0x5a,
+    0x00,
+    0x81,
+    0x65,
+    0x39,
+    0x5f,
+    0xe6,
+    0xc6,
+    0x38,
+    0xbe,
+    0x79,
+    0xe3,
+    0x21,
+    0xdd,
+    0x29,
+    0xc7,
+    0xb3,
+    0x90,
+    0x18,
+    0x29,
+    0xa4,
+    0xd7,
+    0xaf,
+    0x29,
+    0xb5,
+    0x33,
+    0x7c,
+    0xca,
+    0x95,
+    0x81,
+    0x57,
+    0x27,
+    0x98,
+    0xfc,
+    0x70,
+    0xc0,
+    0x43,
+    0x4c,
+    0x5b,
+    0xc5,
+    0xd4,
+    0x6a,
+    0xc0,
+    0xf9,
+    0x3f,
+    0xde,
+    0xfd,
+    0x95,
+    0x08,
+    0xb4,
+    0x94,
+    0xf0,
+    0x96,
+    0x89,
+    0xe5,
+    0xa6,
+    0x00,
+    0x13,
+    0x0a,
+    0x36,
+    0x61,
+    0x50,
+    0x67,
+    0xaa,
+    0x80,
+    0x4a,
+    0x30,
+    0xe0,
+    0x65,
+    0x56,
+    0xcd,
+    0x36,
+    0xeb,
+    0x0d,
+    0xe2,
+    0x57,
+    0x5d,
+    0xce,
+    0x48,
+    0x94,
+    0x74,
+    0x0e,
+    0x9f,
+    0x59,
+    0x28,
+    0xb8,
+    0xb6,
+    0x4c,
+    0xf4,
+    0x7b,
+    0xfc,
+    0x44,
+    0xb0,
+    0xe5,
+    0x67,
+    0x3c,
+    0x98,
+    0xb5,
+    0x3f,
+    0x41,
+    0x9d,
+    0xf9,
+    0x46,
+    0x85,
+    0x08,
+    0x34,
+    0x36,
+    0x4d,
+    0x17,
+    0x4b,
+    0x14,
+    0xdb,
+    0x66,
+    0x56,
+    0xef,
+    0xb5,
+    0x08,
+    0x57,
+    0x0c,
+    0x73,
+    0x74,
+    0xa7,
+    0xdc,
+    0x46,
+    0xaa,
+    0x51,
+    0x02,
+    0x81,
+    0x80,
+    0x1e,
+    0x50,
+    0x4c,
+    0xde,
+    0x9c,
+    0x60,
+    0x6d,
+    0xd7,
+    0x31,
+    0xf6,
+    0xd8,
+    0x4f,
+    0xc2,
+    0x25,
+    0x7d,
+    0x83,
+    0xb3,
+    0xe7,
+    0xed,
+    0x92,
+    0xe7,
+    0x28,
+    0x1e,
+    0xb3,
+    0x9b,
+    0xcb,
+    0xf2,
+    0x86,
+    0xa4,
+    0x49,
+    0x45,
+    0x5e,
+    0xba,
+    0x1d,
+    0xdb,
+    0x21,
+    0x5d,
+    0xdf,
+    0xeb,
+    0x3c,
+    0x5e,
+    0x01,
+    0xc6,
+    0x68,
+    0x25,
+    0x28,
+    0xe6,
+    0x1a,
+    0xbf,
+    0xc1,
+    0xa1,
+    0xc5,
+    0x92,
+    0x0b,
+    0x08,
+    0x43,
+    0x0e,
+    0x5a,
+    0xa3,
+    0x85,
+    0x8a,
+    0x65,
+    0xb4,
+    0x54,
+    0xa1,
+    0x4c,
+    0x20,
+    0xa2,
+    0x5a,
+    0x08,
+    0xf6,
+    0x90,
+    0x0d,
+    0x9a,
+    0xd7,
+    0x20,
+    0xf1,
+    0x10,
+    0x66,
+    0x28,
+    0x4c,
+    0x22,
+    0x56,
+    0xa6,
+    0xb9,
+    0xff,
+    0xd0,
+    0x6a,
+    0x62,
+    0x8c,
+    0x9f,
+    0xf8,
+    0x7c,
+    0xf4,
+    0xad,
+    0xd7,
+    0xe8,
+    0xf9,
+    0x87,
+    0x43,
+    0xbf,
+    0x73,
+    0x5b,
+    0x04,
+    0xc7,
+    0xd0,
+    0x77,
+    0xcc,
+    0xe3,
+    0xbe,
+    0xda,
+    0xc2,
+    0x07,
+    0xed,
+    0x8d,
+    0x2a,
+    0x15,
+    0x77,
+    0x1d,
+    0x53,
+    0x47,
+    0xe0,
+    0xa2,
+    0x11,
+    0x41,
+    0x0d,
+    0xe2,
+    0xe7,
 };
 
 /* The matching public key used for encryption*/
 static const unsigned char pub_key_der[] = {
-    0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,
-    0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00,
-    0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xc2, 0x44, 0xbc,
-    0xcf, 0x5b, 0xca, 0xcd, 0x80, 0x77, 0xae, 0xf9, 0x7a, 0x34, 0xbb, 0x37,
-    0x6f, 0x5c, 0x76, 0x4c, 0xe4, 0xbb, 0x0c, 0x1d, 0xe7, 0xfe, 0x0f, 0xda,
-    0xcf, 0x8c, 0x56, 0x65, 0x72, 0x6e, 0x2c, 0xf9, 0xfd, 0x87, 0x43, 0xeb,
-    0x4c, 0x26, 0xb1, 0xd3, 0xf0, 0x87, 0xb1, 0x18, 0x68, 0x14, 0x7d, 0x3c,
-    0x2a, 0xfa, 0xc2, 0x5d, 0x70, 0x19, 0x11, 0x00, 0x2e, 0xb3, 0x9c, 0x8e,
-    0x38, 0x08, 0xbe, 0xe3, 0xeb, 0x7d, 0x6e, 0xc7, 0x19, 0xc6, 0x7f, 0x59,
-    0x48, 0x84, 0x1b, 0xe3, 0x27, 0x30, 0x46, 0x30, 0xd3, 0xfc, 0xfc, 0xb3,
-    0x35, 0x75, 0xc4, 0x31, 0x1a, 0xc0, 0xc2, 0x4c, 0x0b, 0xc7, 0x01, 0x95,
-    0xb2, 0xdc, 0x17, 0x77, 0x9b, 0x09, 0x15, 0x04, 0xbc, 0xdb, 0x57, 0x0b,
-    0x26, 0xda, 0x59, 0x54, 0x0d, 0x6e, 0xb7, 0x89, 0xbc, 0x53, 0x9d, 0x5f,
-    0x8c, 0xad, 0x86, 0x97, 0xd2, 0x48, 0x4f, 0x5c, 0x94, 0xdd, 0x30, 0x2f,
-    0xcf, 0xfc, 0xde, 0x20, 0x31, 0x25, 0x9d, 0x29, 0x25, 0x78, 0xb7, 0xd2,
-    0x5b, 0x5d, 0x99, 0x5b, 0x08, 0x12, 0x81, 0x79, 0x89, 0xa0, 0xcf, 0x8f,
-    0x40, 0xb1, 0x77, 0x72, 0x3b, 0x13, 0xfc, 0x55, 0x43, 0x70, 0x29, 0xd5,
-    0x41, 0xed, 0x31, 0x4b, 0x2d, 0x6c, 0x7d, 0xcf, 0x99, 0x5f, 0xd1, 0x72,
-    0x9f, 0x8b, 0x32, 0x96, 0xde, 0x5d, 0x8b, 0x19, 0x77, 0x75, 0xff, 0x09,
-    0xbf, 0x26, 0xe9, 0xd7, 0x3d, 0xc7, 0x1a, 0x81, 0xcf, 0x05, 0x1b, 0x89,
-    0xbf, 0x45, 0x32, 0xbf, 0x5e, 0xc9, 0xe3, 0x5c, 0x33, 0x4a, 0x72, 0x47,
-    0xf4, 0x24, 0xae, 0x9b, 0x38, 0x24, 0x76, 0x9a, 0xa2, 0x9a, 0x50, 0x50,
-    0x49, 0xf5, 0x26, 0xb9, 0x55, 0xa6, 0x47, 0xc9, 0x14, 0xa2, 0xca, 0xd4,
-    0xa8, 0x8a, 0x9f, 0xe9, 0x5a, 0x5a, 0x12, 0xaa, 0x30, 0xd5, 0x78, 0x8b,
-    0x39, 0x02, 0x03, 0x01, 0x00, 0x01,
+    0x30,
+    0x82,
+    0x01,
+    0x22,
+    0x30,
+    0x0d,
+    0x06,
+    0x09,
+    0x2a,
+    0x86,
+    0x48,
+    0x86,
+    0xf7,
+    0x0d,
+    0x01,
+    0x01,
+    0x01,
+    0x05,
+    0x00,
+    0x03,
+    0x82,
+    0x01,
+    0x0f,
+    0x00,
+    0x30,
+    0x82,
+    0x01,
+    0x0a,
+    0x02,
+    0x82,
+    0x01,
+    0x01,
+    0x00,
+    0xc2,
+    0x44,
+    0xbc,
+    0xcf,
+    0x5b,
+    0xca,
+    0xcd,
+    0x80,
+    0x77,
+    0xae,
+    0xf9,
+    0x7a,
+    0x34,
+    0xbb,
+    0x37,
+    0x6f,
+    0x5c,
+    0x76,
+    0x4c,
+    0xe4,
+    0xbb,
+    0x0c,
+    0x1d,
+    0xe7,
+    0xfe,
+    0x0f,
+    0xda,
+    0xcf,
+    0x8c,
+    0x56,
+    0x65,
+    0x72,
+    0x6e,
+    0x2c,
+    0xf9,
+    0xfd,
+    0x87,
+    0x43,
+    0xeb,
+    0x4c,
+    0x26,
+    0xb1,
+    0xd3,
+    0xf0,
+    0x87,
+    0xb1,
+    0x18,
+    0x68,
+    0x14,
+    0x7d,
+    0x3c,
+    0x2a,
+    0xfa,
+    0xc2,
+    0x5d,
+    0x70,
+    0x19,
+    0x11,
+    0x00,
+    0x2e,
+    0xb3,
+    0x9c,
+    0x8e,
+    0x38,
+    0x08,
+    0xbe,
+    0xe3,
+    0xeb,
+    0x7d,
+    0x6e,
+    0xc7,
+    0x19,
+    0xc6,
+    0x7f,
+    0x59,
+    0x48,
+    0x84,
+    0x1b,
+    0xe3,
+    0x27,
+    0x30,
+    0x46,
+    0x30,
+    0xd3,
+    0xfc,
+    0xfc,
+    0xb3,
+    0x35,
+    0x75,
+    0xc4,
+    0x31,
+    0x1a,
+    0xc0,
+    0xc2,
+    0x4c,
+    0x0b,
+    0xc7,
+    0x01,
+    0x95,
+    0xb2,
+    0xdc,
+    0x17,
+    0x77,
+    0x9b,
+    0x09,
+    0x15,
+    0x04,
+    0xbc,
+    0xdb,
+    0x57,
+    0x0b,
+    0x26,
+    0xda,
+    0x59,
+    0x54,
+    0x0d,
+    0x6e,
+    0xb7,
+    0x89,
+    0xbc,
+    0x53,
+    0x9d,
+    0x5f,
+    0x8c,
+    0xad,
+    0x86,
+    0x97,
+    0xd2,
+    0x48,
+    0x4f,
+    0x5c,
+    0x94,
+    0xdd,
+    0x30,
+    0x2f,
+    0xcf,
+    0xfc,
+    0xde,
+    0x20,
+    0x31,
+    0x25,
+    0x9d,
+    0x29,
+    0x25,
+    0x78,
+    0xb7,
+    0xd2,
+    0x5b,
+    0x5d,
+    0x99,
+    0x5b,
+    0x08,
+    0x12,
+    0x81,
+    0x79,
+    0x89,
+    0xa0,
+    0xcf,
+    0x8f,
+    0x40,
+    0xb1,
+    0x77,
+    0x72,
+    0x3b,
+    0x13,
+    0xfc,
+    0x55,
+    0x43,
+    0x70,
+    0x29,
+    0xd5,
+    0x41,
+    0xed,
+    0x31,
+    0x4b,
+    0x2d,
+    0x6c,
+    0x7d,
+    0xcf,
+    0x99,
+    0x5f,
+    0xd1,
+    0x72,
+    0x9f,
+    0x8b,
+    0x32,
+    0x96,
+    0xde,
+    0x5d,
+    0x8b,
+    0x19,
+    0x77,
+    0x75,
+    0xff,
+    0x09,
+    0xbf,
+    0x26,
+    0xe9,
+    0xd7,
+    0x3d,
+    0xc7,
+    0x1a,
+    0x81,
+    0xcf,
+    0x05,
+    0x1b,
+    0x89,
+    0xbf,
+    0x45,
+    0x32,
+    0xbf,
+    0x5e,
+    0xc9,
+    0xe3,
+    0x5c,
+    0x33,
+    0x4a,
+    0x72,
+    0x47,
+    0xf4,
+    0x24,
+    0xae,
+    0x9b,
+    0x38,
+    0x24,
+    0x76,
+    0x9a,
+    0xa2,
+    0x9a,
+    0x50,
+    0x50,
+    0x49,
+    0xf5,
+    0x26,
+    0xb9,
+    0x55,
+    0xa6,
+    0x47,
+    0xc9,
+    0x14,
+    0xa2,
+    0xca,
+    0xd4,
+    0xa8,
+    0x8a,
+    0x9f,
+    0xe9,
+    0x5a,
+    0x5a,
+    0x12,
+    0xaa,
+    0x30,
+    0xd5,
+    0x78,
+    0x8b,
+    0x39,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
 };
diff --git a/demos/guide/quic-client-block.c b/demos/guide/quic-client-block.c
index 9cbc3e0580000..80eccbab84722 100644
--- a/demos/guide/quic-client-block.c
+++ b/demos/guide/quic-client-block.c
@@ -16,9 +16,9 @@
 
 /* Include the appropriate header file for SOCK_DGRAM */
 #ifdef _WIN32 /* Windows */
-# include <winsock2.h>
+#include <winsock2.h>
 #else /* Linux/Unix */
-# include <sys/socket.h>
+#include <sys/socket.h>
 #endif
 
 #include <openssl/bio.h>
@@ -27,7 +27,7 @@
 
 /* Helper function to create a BIO connected to the server */
 static BIO *create_socket_bio(const char *hostname, const char *port,
-                              int family, BIO_ADDR **peer_addr)
+    int family, BIO_ADDR **peer_addr)
 {
     int sock = -1;
     BIO_ADDRINFO *res;
@@ -38,7 +38,7 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
      * Lookup IP address info for the server.
      */
     if (!BIO_lookup_ex(hostname, port, BIO_LOOKUP_CLIENT, family, SOCK_DGRAM, 0,
-                       &res))
+            &res))
         return NULL;
 
     /*
@@ -244,7 +244,7 @@ int main(int argc, char *argv[])
         goto end;
     }
     if (!SSL_write_ex2(ssl, request_end, strlen(request_end),
-                       SSL_WRITE_FLAG_CONCLUDE, &written)) {
+            SSL_WRITE_FLAG_CONCLUDE, &written)) {
         printf("Failed to write end of HTTP request\n");
         goto end;
     }
@@ -255,12 +255,12 @@ int main(int argc, char *argv[])
      */
     while (SSL_read_ex(ssl, buf, sizeof(buf), &readbytes)) {
         /*
-        * OpenSSL does not guarantee that the returned data is a string or
-        * that it is NUL terminated so we use fwrite() to write the exact
-        * number of bytes that we read. The data could be non-printable or
-        * have NUL characters in the middle of it. For this simple example
-        * we're going to print it to stdout anyway.
-        */
+         * OpenSSL does not guarantee that the returned data is a string or
+         * that it is NUL terminated so we use fwrite() to write the exact
+         * number of bytes that we read. The data could be non-printable or
+         * have NUL characters in the middle of it. For this simple example
+         * we're going to print it to stdout anyway.
+         */
         fwrite(buf, 1, readbytes, stdout);
     }
     /* In case the response didn't finish with a newline we add one now */
@@ -303,7 +303,7 @@ int main(int argc, char *argv[])
 
     default:
         /* Some other unexpected error occurred */
-        printf ("Failed reading remaining data\n");
+        printf("Failed reading remaining data\n");
         break;
     }
 
@@ -321,7 +321,7 @@ int main(int argc, char *argv[])
 
     /* Success! */
     res = EXIT_SUCCESS;
- end:
+end:
     /*
      * If something bad happened then we will dump the contents of the
      * OpenSSL error stack to stderr. There might be some useful diagnostic
diff --git a/demos/guide/quic-client-non-block.c b/demos/guide/quic-client-non-block.c
index 44462c552c692..9e8760dde24fc 100644
--- a/demos/guide/quic-client-non-block.c
+++ b/demos/guide/quic-client-non-block.c
@@ -16,10 +16,10 @@
 
 /* Include the appropriate header file for SOCK_DGRAM */
 #ifdef _WIN32 /* Windows */
-# include <winsock2.h>
+#include <winsock2.h>
 #else /* Linux/Unix */
-# include <sys/socket.h>
-# include <sys/select.h>
+#include <sys/socket.h>
+#include <sys/select.h>
 #endif
 
 #include <openssl/bio.h>
@@ -28,7 +28,7 @@
 
 /* Helper function to create a BIO connected to the server */
 static BIO *create_socket_bio(const char *hostname, const char *port,
-                              int family, BIO_ADDR **peer_addr)
+    int family, BIO_ADDR **peer_addr)
 {
     int sock = -1;
     BIO_ADDRINFO *res;
@@ -39,7 +39,7 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
      * Lookup IP address info for the server.
      */
     if (!BIO_lookup_ex(hostname, port, BIO_LOOKUP_CLIENT, family, SOCK_DGRAM, 0,
-                       &res))
+            &res))
         return NULL;
 
     /*
@@ -291,7 +291,7 @@ int main(int argc, char *argv[])
      * connection.
      */
     bio = create_socket_bio(hostname, port, ipv6 ? AF_INET6 : AF_INET,
-                            &peer_addr);
+        &peer_addr);
     if (bio == NULL) {
         printf("Failed to crete the BIO\n");
         goto end;
@@ -362,7 +362,7 @@ int main(int argc, char *argv[])
         goto end; /* Cannot retry: error */
     }
     while (!SSL_write_ex2(ssl, request_end, strlen(request_end),
-                          SSL_WRITE_FLAG_CONCLUDE, &written)) {
+        SSL_WRITE_FLAG_CONCLUDE, &written)) {
         if (handle_io_failure(ssl, 0) == 1)
             continue; /* Retry */
         printf("Failed to write end of HTTP request\n");
@@ -411,7 +411,7 @@ int main(int argc, char *argv[])
 
     /* Success! */
     res = EXIT_SUCCESS;
- end:
+end:
     /*
      * If something bad happened then we will dump the contents of the
      * OpenSSL error stack to stderr. There might be some useful diagnostic
diff --git a/demos/guide/quic-multi-stream.c b/demos/guide/quic-multi-stream.c
index 3b6abfce66fba..d08ab4dac19cb 100644
--- a/demos/guide/quic-multi-stream.c
+++ b/demos/guide/quic-multi-stream.c
@@ -16,9 +16,9 @@
 
 /* Include the appropriate header file for SOCK_DGRAM */
 #ifdef _WIN32 /* Windows */
-# include <winsock2.h>
+#include <winsock2.h>
 #else /* Linux/Unix */
-# include <sys/socket.h>
+#include <sys/socket.h>
 #endif
 
 #include <openssl/bio.h>
@@ -27,7 +27,7 @@
 
 /* Helper function to create a BIO connected to the server */
 static BIO *create_socket_bio(const char *hostname, const char *port,
-                              int family, BIO_ADDR **peer_addr)
+    int family, BIO_ADDR **peer_addr)
 {
     int sock = -1;
     BIO_ADDRINFO *res;
@@ -38,7 +38,7 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
      * Lookup IP address info for the server.
      */
     if (!BIO_lookup_ex(hostname, port, BIO_LOOKUP_CLIENT, family, SOCK_DGRAM, 0,
-                       &res))
+            &res))
         return NULL;
 
     /*
@@ -109,13 +109,13 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
 }
 
 static int write_a_request(SSL *stream, const char *request_start,
-                           const char *hostname)
+    const char *hostname)
 {
     const char *request_end = "\r\n\r\n";
     size_t written;
 
     if (!SSL_write_ex(stream, request_start, strlen(request_start),
-                      &written))
+            &written))
         return 0;
     if (!SSL_write_ex(stream, hostname, strlen(hostname), &written))
         return 0;
@@ -140,10 +140,8 @@ int main(int argc, char *argv[])
     int res = EXIT_FAILURE;
     int ret;
     unsigned char alpn[] = { 8, 'h', 't', 't', 'p', '/', '1', '.', '0' };
-    const char *request1_start =
-        "GET /request1.html HTTP/1.0\r\nConnection: close\r\nHost: ";
-    const char *request2_start =
-        "GET /request2.html HTTP/1.0\r\nConnection: close\r\nHost: ";
+    const char *request1_start = "GET /request1.html HTTP/1.0\r\nConnection: close\r\nHost: ";
+    const char *request2_start = "GET /request2.html HTTP/1.0\r\nConnection: close\r\nHost: ";
     size_t readbytes;
     char buf[160];
     BIO_ADDR *peer_addr = NULL;
@@ -300,12 +298,12 @@ int main(int argc, char *argv[])
      */
     while (SSL_read_ex(stream1, buf, sizeof(buf), &readbytes)) {
         /*
-        * OpenSSL does not guarantee that the returned data is a string or
-        * that it is NUL terminated so we use fwrite() to write the exact
-        * number of bytes that we read. The data could be non-printable or
-        * have NUL characters in the middle of it. For this simple example
-        * we're going to print it to stdout anyway.
-        */
+         * OpenSSL does not guarantee that the returned data is a string or
+         * that it is NUL terminated so we use fwrite() to write the exact
+         * number of bytes that we read. The data could be non-printable or
+         * have NUL characters in the middle of it. For this simple example
+         * we're going to print it to stdout anyway.
+         */
         fwrite(buf, 1, readbytes, stdout);
     }
     /* In case the response didn't finish with a newline we add one now */
@@ -348,7 +346,7 @@ int main(int argc, char *argv[])
 
     default:
         /* Some other unexpected error occurred */
-        printf ("Failed reading remaining data\n");
+        printf("Failed reading remaining data\n");
         break;
     }
 
@@ -402,7 +400,7 @@ int main(int argc, char *argv[])
         break;
 
     default:
-        printf ("Failed reading remaining data\n");
+        printf("Failed reading remaining data\n");
         break;
     }
 
@@ -420,7 +418,7 @@ int main(int argc, char *argv[])
 
     /* Success! */
     res = EXIT_SUCCESS;
- end:
+end:
     /*
      * If something bad happened then we will dump the contents of the
      * OpenSSL error stack to stderr. There might be some useful diagnostic
diff --git a/demos/guide/quic-server-block.c b/demos/guide/quic-server-block.c
index f9db25d276dde..b40e888d22ea7 100644
--- a/demos/guide/quic-server-block.c
+++ b/demos/guide/quic-server-block.c
@@ -16,14 +16,14 @@
 
 /* Include the appropriate header file for SOCK_STREAM */
 #ifdef _WIN32 /* Windows */
-# include <stdarg.h>
-# include <winsock2.h>
+#include <stdarg.h>
+#include <winsock2.h>
 #else /* Linux/Unix */
-# include <err.h>
-# include <sys/socket.h>
-# include <sys/select.h>
-# include <netinet/in.h>
-# include <unistd.h>
+#include <err.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <netinet/in.h>
+#include <unistd.h>
 #endif
 
 #include <openssl/bio.h>
@@ -67,20 +67,39 @@ static void warnx(const char *fmt, ...)
  * are accepted.
  */
 static const unsigned char alpn_ossltest[] = {
-    8,  'h', 't', 't', 'p', '/', '1', '.', '0',
-    10, 'h', 'q', '-', 'i', 'n', 't', 'e', 'r', 'o', 'p',
+    8,
+    'h',
+    't',
+    't',
+    'p',
+    '/',
+    '1',
+    '.',
+    '0',
+    10,
+    'h',
+    'q',
+    '-',
+    'i',
+    'n',
+    't',
+    'e',
+    'r',
+    'o',
+    'p',
 };
 
 /*
  * This callback validates and negotiates the desired ALPN on the server side.
  */
 static int select_alpn(SSL *ssl, const unsigned char **out,
-                       unsigned char *out_len, const unsigned char *in,
-                       unsigned int in_len, void *arg)
+    unsigned char *out_len, const unsigned char *in,
+    unsigned int in_len, void *arg)
 {
     if (SSL_select_next_proto((unsigned char **)out, out_len, alpn_ossltest,
-                              sizeof(alpn_ossltest), in,
-                              in_len) == OPENSSL_NPN_NEGOTIATED)
+            sizeof(alpn_ossltest), in,
+            in_len)
+        == OPENSSL_NPN_NEGOTIATED)
         return SSL_TLSEXT_ERR_OK;
     return SSL_TLSEXT_ERR_ALERT_FATAL;
 }
@@ -157,7 +176,7 @@ static SSL_CTX *create_ctx(const char *cert_path, const char *key_path)
 static int create_socket(uint16_t port)
 {
     int fd;
-    struct sockaddr_in sa = {0};
+    struct sockaddr_in sa = { 0 };
 
     /* Retrieve the file descriptor for a new UDP socket */
     if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
diff --git a/demos/guide/quic-server-non-block.c b/demos/guide/quic-server-non-block.c
index ee2bf5fb2bfca..cfb49d85964a6 100644
--- a/demos/guide/quic-server-non-block.c
+++ b/demos/guide/quic-server-non-block.c
@@ -16,14 +16,14 @@
 
 /* Include the appropriate header file for SOCK_STREAM */
 #ifdef _WIN32 /* Windows */
-# include <stdarg.h>
-# include <winsock2.h>
+#include <stdarg.h>
+#include <winsock2.h>
 #else /* Linux/Unix */
-# include <err.h>
-# include <sys/socket.h>
-# include <sys/select.h>
-# include <netinet/in.h>
-# include <unistd.h>
+#include <err.h>
+#include <sys/socket.h>
+#include <sys/select.h>
+#include <netinet/in.h>
+#include <unistd.h>
 #endif
 
 #include <openssl/bio.h>
@@ -67,20 +67,39 @@ static void warnx(const char *fmt, ...)
  * are accepted.
  */
 static const unsigned char alpn_ossltest[] = {
-    8,  'h', 't', 't', 'p', '/', '1', '.', '0',
-    10, 'h', 'q', '-', 'i', 'n', 't', 'e', 'r', 'o', 'p',
+    8,
+    'h',
+    't',
+    't',
+    'p',
+    '/',
+    '1',
+    '.',
+    '0',
+    10,
+    'h',
+    'q',
+    '-',
+    'i',
+    'n',
+    't',
+    'e',
+    'r',
+    'o',
+    'p',
 };
 
 /*
  * This callback validates and negotiates the desired ALPN on the server side.
  */
 static int select_alpn(SSL *ssl, const unsigned char **out,
-                       unsigned char *out_len, const unsigned char *in,
-                       unsigned int in_len, void *arg)
+    unsigned char *out_len, const unsigned char *in,
+    unsigned int in_len, void *arg)
 {
     if (SSL_select_next_proto((unsigned char **)out, out_len, alpn_ossltest,
-                              sizeof(alpn_ossltest), in,
-                              in_len) == OPENSSL_NPN_NEGOTIATED)
+            sizeof(alpn_ossltest), in,
+            in_len)
+        == OPENSSL_NPN_NEGOTIATED)
         return SSL_TLSEXT_ERR_OK;
     return SSL_TLSEXT_ERR_ALERT_FATAL;
 }
@@ -157,7 +176,7 @@ static SSL_CTX *create_ctx(const char *cert_path, const char *key_path)
 static int create_socket(uint16_t port)
 {
     int fd;
-    struct sockaddr_in sa = {0};
+    struct sockaddr_in sa = { 0 };
 
     /* Retrieve the file descriptor for a new UDP socket */
     if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
@@ -326,7 +345,7 @@ static int handle_io_failure(SSL *ssl, int res)
          */
         if (SSL_get_verify_result(ssl) != X509_V_OK)
             printf("Verify error: %s\n",
-                   X509_verify_cert_error_string(SSL_get_verify_result(ssl)));
+                X509_verify_cert_error_string(SSL_get_verify_result(ssl)));
         return -1;
 
     default:
@@ -391,7 +410,7 @@ static int run_quic_server(SSL_CTX *ctx, int fd)
         /* Read from client until the client sends a end of stream packet */
         while (!eof) {
             ret = SSL_read_ex(conn, buf + total_read, sizeof(buf) - total_read,
-                              &nread);
+                &nread);
             total_read += nread;
             if (total_read >= 8192) {
                 fprintf(stderr, "Could not fit all data into buffer\n");
@@ -414,8 +433,8 @@ static int run_quic_server(SSL_CTX *ctx, int fd)
 
         /* Echo client input */
         while (!SSL_write_ex2(conn, buf,
-                              total_read,
-                              SSL_WRITE_FLAG_CONCLUDE, &total_written)) {
+            total_read,
+            SSL_WRITE_FLAG_CONCLUDE, &total_written)) {
             if (handle_io_failure(conn, 0) == 1)
                 continue;
             fprintf(stderr, "Failed to write data\n");
@@ -424,7 +443,7 @@ static int run_quic_server(SSL_CTX *ctx, int fd)
 
         if (total_read != total_written)
             fprintf(stderr, "Failed to echo data [read: %lu, written: %lu]\n",
-                    total_read, total_written);
+                total_read, total_written);
 
         /*
          * Shut down the connection. We may need to call this multiple times
diff --git a/demos/guide/tls-client-block.c b/demos/guide/tls-client-block.c
index c6ba5850f7ff9..4536b1ffa0919 100644
--- a/demos/guide/tls-client-block.c
+++ b/demos/guide/tls-client-block.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
+ *  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
@@ -16,9 +16,9 @@
 
 /* Include the appropriate header file for SOCK_STREAM */
 #ifdef _WIN32 /* Windows */
-# include <winsock2.h>
+#include <winsock2.h>
 #else /* Linux/Unix */
-# include <sys/socket.h>
+#include <sys/socket.h>
 #endif
 
 #include <openssl/bio.h>
@@ -37,7 +37,7 @@ static BIO *create_socket_bio(const char *hostname, const char *port, int family
      * Lookup IP address info for the server.
      */
     if (!BIO_lookup_ex(hostname, port, BIO_LOOKUP_CLIENT, family, SOCK_STREAM, 0,
-                       &res))
+            &res))
         return NULL;
 
     /*
@@ -174,7 +174,7 @@ int main(int argc, char *argv[])
      */
     bio = create_socket_bio(hostname, port, ipv6 ? AF_INET6 : AF_INET);
     if (bio == NULL) {
-        printf("Failed to crete the BIO\n");
+        printf("Failed to create the BIO\n");
         goto end;
     }
     SSL_set_bio(ssl, bio, bio);
@@ -232,12 +232,12 @@ int main(int argc, char *argv[])
      */
     while (SSL_read_ex(ssl, buf, sizeof(buf), &readbytes)) {
         /*
-        * OpenSSL does not guarantee that the returned data is a string or
-        * that it is NUL terminated so we use fwrite() to write the exact
-        * number of bytes that we read. The data could be non-printable or
-        * have NUL characters in the middle of it. For this simple example
-        * we're going to print it to stdout anyway.
-        */
+         * OpenSSL does not guarantee that the returned data is a string or
+         * that it is NUL terminated so we use fwrite() to write the exact
+         * number of bytes that we read. The data could be non-printable or
+         * have NUL characters in the middle of it. For this simple example
+         * we're going to print it to stdout anyway.
+         */
         fwrite(buf, 1, readbytes, stdout);
     }
     /* In case the response didn't finish with a newline we add one now */
@@ -254,7 +254,7 @@ int main(int argc, char *argv[])
          * Some error occurred other than a graceful close down by the
          * peer.
          */
-        printf ("Failed reading remaining data\n");
+        printf("Failed reading remaining data\n");
         goto end;
     }
 
@@ -276,7 +276,7 @@ int main(int argc, char *argv[])
 
     /* Success! */
     res = EXIT_SUCCESS;
- end:
+end:
     /*
      * If something bad happened then we will dump the contents of the
      * OpenSSL error stack to stderr. There might be some useful diagnostic
diff --git a/demos/guide/tls-client-non-block.c b/demos/guide/tls-client-non-block.c
index 1e7856721925e..3103e6725b8e1 100644
--- a/demos/guide/tls-client-non-block.c
+++ b/demos/guide/tls-client-non-block.c
@@ -16,10 +16,10 @@
 
 /* Include the appropriate header file for SOCK_STREAM */
 #ifdef _WIN32 /* Windows */
-# include <winsock2.h>
+#include <winsock2.h>
 #else /* Linux/Unix */
-# include <sys/socket.h>
-# include <sys/select.h>
+#include <sys/socket.h>
+#include <sys/select.h>
 #endif
 
 #include <openssl/bio.h>
@@ -38,7 +38,7 @@ static BIO *create_socket_bio(const char *hostname, const char *port, int family
      * Lookup IP address info for the server.
      */
     if (!BIO_lookup_ex(hostname, port, BIO_LOOKUP_CLIENT, family, SOCK_STREAM, 0,
-                       &res))
+            &res))
         return NULL;
 
     /*
@@ -157,9 +157,9 @@ static int handle_io_failure(SSL *ssl, int res)
 
     case SSL_ERROR_SSL:
         /*
-        * If the failure is due to a verification error we can get more
-        * information about it from SSL_get_verify_result().
-        */
+         * If the failure is due to a verification error we can get more
+         * information about it from SSL_get_verify_result().
+         */
         if (SSL_get_verify_result(ssl) != X509_V_OK)
             printf("Verify error: %s\n",
                 X509_verify_cert_error_string(SSL_get_verify_result(ssl)));
@@ -356,7 +356,7 @@ int main(int argc, char *argv[])
 
     /* Success! */
     res = EXIT_SUCCESS;
- end:
+end:
     /*
      * If something bad happened then we will dump the contents of the
      * OpenSSL error stack to stderr. There might be some useful diagnostic
diff --git a/demos/guide/tls-server-block.c b/demos/guide/tls-server-block.c
index 45246ce4fe0fd..06a8bcf3a774b 100644
--- a/demos/guide/tls-server-block.c
+++ b/demos/guide/tls-server-block.c
@@ -16,12 +16,12 @@
 
 /* Include the appropriate header file for SOCK_STREAM */
 #ifdef _WIN32 /* Windows */
-# include <stdarg.h>
-# include <winsock2.h>
+#include <stdarg.h>
+#include <winsock2.h>
 #else /* Linux/Unix */
-# include <err.h>
-# include <sys/socket.h>
-# include <sys/select.h>
+#include <err.h>
+#include <sys/socket.h>
+#include <sys/select.h>
 #endif
 
 #include <openssl/bio.h>
@@ -264,8 +264,7 @@ int main(int argc, char *argv[])
         }
 
         while (SSL_read_ex(ssl, buf, sizeof(buf), &nread) > 0) {
-            if (SSL_write_ex(ssl, buf, nread, &nwritten) > 0 &&
-                nwritten == nread) {
+            if (SSL_write_ex(ssl, buf, nread, &nwritten) > 0 && nwritten == nread) {
                 total += nwritten;
                 continue;
             }
diff --git a/demos/http3/ossl-nghttp3-demo-server.c b/demos/http3/ossl-nghttp3-demo-server.c
index 2b44fb8b14211..73bb81cfbca74 100644
--- a/demos/http3/ossl-nghttp3-demo-server.c
+++ b/demos/http3/ossl-nghttp3-demo-server.c
@@ -18,37 +18,37 @@
 #include <sys/socket.h>
 
 #ifndef PATH_MAX
-# define PATH_MAX 255
+#define PATH_MAX 255
 #endif
 
 #define nghttp3_arraylen(A) (sizeof(A) / sizeof(*(A)))
 
 /* The crappy test wants 20 bytes */
 #define NULL_PAYLOAD "12345678901234567890"
-static uint8_t *nulldata = (uint8_t *) NULL_PAYLOAD;
+static uint8_t *nulldata = (uint8_t *)NULL_PAYLOAD;
 static size_t nulldata_sz = sizeof(NULL_PAYLOAD) - 1;
 
 /* The nghttp3 variable we need in the main part and read_from_ssl_ids */
 static nghttp3_settings settings;
 static const nghttp3_mem *mem;
-static nghttp3_callbacks callbacks = {0};
+static nghttp3_callbacks callbacks = { 0 };
 
 /* 3 streams created by the server and 4 by the client (one is bidi) */
 struct ssl_id {
-    SSL *s;      /* the stream openssl uses in SSL_read(),  SSL_write etc */
+    SSL *s; /* the stream openssl uses in SSL_read(),  SSL_write etc */
     uint64_t id; /* the stream identifier the nghttp3 uses */
-    int status;  /* 0 or one the below status and origin */
+    int status; /* 0 or one the below status and origin */
 };
 /* status and origin of the streams the possible values are: */
-#define CLIENTUNIOPEN  0x01 /* unidirectional open by the client (2, 6 and 10) */
-#define CLIENTCLOSED   0x02 /* closed by the client */
+#define CLIENTUNIOPEN 0x01 /* unidirectional open by the client (2, 6 and 10) */
+#define CLIENTCLOSED 0x02 /* closed by the client */
 #define CLIENTBIDIOPEN 0x04 /* bidirectional open by the client (something like 0, 4, 8 ...) */
-#define SERVERUNIOPEN  0x08 /* unidirectional open by the server (3, 7 and 11) */
-#define SERVERCLOSED   0x10 /* closed by the server (us) */
-#define TOBEREMOVED    0x20 /* marked for removing in read_from_ssl_ids, */
-                            /* it will be removed after processing all events */
-#define ISLISTENER     0x40 /* the stream is a listener from SSL_new_listener() */
-#define ISCONNECTION   0x80 /* the stream is a connection from SSL_accept_connection() */
+#define SERVERUNIOPEN 0x08 /* unidirectional open by the server (3, 7 and 11) */
+#define SERVERCLOSED 0x10 /* closed by the server (us) */
+#define TOBEREMOVED 0x20 /* marked for removing in read_from_ssl_ids, */
+/* it will be removed after processing all events */
+#define ISLISTENER 0x40 /* the stream is a listener from SSL_new_listener() */
+#define ISCONNECTION 0x80 /* the stream is a connection from SSL_accept_connection() */
 
 #define MAXSSL_IDS 20
 #define MAXURL 255
@@ -56,29 +56,29 @@ struct ssl_id {
 struct h3ssl {
     struct ssl_id ssl_ids[MAXSSL_IDS];
     int end_headers_received; /* h3 header received call back called */
-    int datadone;             /* h3 has given openssl all the data of the response */
-    int has_uni;              /* we have the 3 uni directional stream needed */
-    int close_done;           /* connection begins terminating EVENT_EC */
-    int close_wait;           /* we are waiting for a close or a new request */
-    int done;                 /* connection terminated EVENT_ECD, after EVENT_EC */
-    int new_conn;             /* a new connection has been received */
-    int received_from_two;    /* workaround for -607 on nghttp3_conn_read_stream on stream 2 */
-    int restart;              /* new request/response cycle started */
-    uint64_t id_bidi;         /* the id of the stream used to read request and send response */
-    char *fileprefix;         /* prefix of the directory to fetch files from */
-    char url[MAXURL];         /* url to serve the request */
-    uint8_t *ptr_data;        /* pointer to the data to send */
-    size_t ldata;             /* amount of bytes to send */
-    int offset_data;          /* offset to next data to send */
+    int datadone; /* h3 has given openssl all the data of the response */
+    int has_uni; /* we have the 3 uni directional stream needed */
+    int close_done; /* connection begins terminating EVENT_EC */
+    int close_wait; /* we are waiting for a close or a new request */
+    int done; /* connection terminated EVENT_ECD, after EVENT_EC */
+    int new_conn; /* a new connection has been received */
+    int received_from_two; /* workaround for -607 on nghttp3_conn_read_stream on stream 2 */
+    int restart; /* new request/response cycle started */
+    uint64_t id_bidi; /* the id of the stream used to read request and send response */
+    char *fileprefix; /* prefix of the directory to fetch files from */
+    char url[MAXURL]; /* url to serve the request */
+    uint8_t *ptr_data; /* pointer to the data to send */
+    size_t ldata; /* amount of bytes to send */
+    int offset_data; /* offset to next data to send */
 };
 
 static void make_nv(nghttp3_nv *nv, const char *name, const char *value)
 {
-    nv->name        = (uint8_t *)name;
-    nv->value       = (uint8_t *)value;
-    nv->namelen     = strlen(name);
-    nv->valuelen    = strlen(value);
-    nv->flags       = NGHTTP3_NV_FLAG_NONE;
+    nv->name = (uint8_t *)name;
+    nv->value = (uint8_t *)value;
+    nv->namelen = strlen(name);
+    nv->valuelen = strlen(value);
+    nv->flags = NGHTTP3_NV_FLAG_NONE;
 }
 
 static void init_ids(struct h3ssl *h3ssl)
@@ -184,7 +184,7 @@ static void remove_marked_ids(struct h3ssl *h3ssl)
     ssl_ids = h3ssl->ssl_ids;
     for (i = 0; i < MAXSSL_IDS; i++) {
         if (ssl_ids[i].status & TOBEREMOVED) {
-            printf("remove_id %llu\n", (unsigned long long) ssl_ids[i].id);
+            printf("remove_id %llu\n", (unsigned long long)ssl_ids[i].id);
             SSL_free(ssl_ids[i].s);
             ssl_ids[i].s = NULL;
             ssl_ids[i].id = UINT64_MAX;
@@ -203,7 +203,7 @@ static void set_id_status(uint64_t id, int status, struct h3ssl *h3ssl)
     ssl_ids = h3ssl->ssl_ids;
     for (i = 0; i < MAXSSL_IDS; i++) {
         if (ssl_ids[i].id == id) {
-            printf("set_id_status: %llu to %d\n", (unsigned long long) ssl_ids[i].id, status);
+            printf("set_id_status: %llu to %d\n", (unsigned long long)ssl_ids[i].id, status);
             ssl_ids[i].status = ssl_ids[i].status | status;
             return;
         }
@@ -220,7 +220,7 @@ static int get_id_status(uint64_t id, struct h3ssl *h3ssl)
     for (i = 0; i < MAXSSL_IDS; i++) {
         if (ssl_ids[i].id == id) {
             printf("get_id_status: %llu to %d\n",
-                   (unsigned long long) ssl_ids[i].id, ssl_ids[i].status);
+                (unsigned long long)ssl_ids[i].id, ssl_ids[i].status);
             return ssl_ids[i].status;
         }
     }
@@ -240,17 +240,17 @@ static int are_all_clientid_closed(struct h3ssl *h3ssl)
         if (ssl_ids[i].id == UINT64_MAX)
             continue;
         printf("are_all_clientid_closed: %llu status %d : %d\n",
-               (unsigned long long) ssl_ids[i].id, ssl_ids[i].status, CLIENTUNIOPEN | CLIENTCLOSED);
+            (unsigned long long)ssl_ids[i].id, ssl_ids[i].status, CLIENTUNIOPEN | CLIENTCLOSED);
         if (ssl_ids[i].status & CLIENTUNIOPEN) {
             if (ssl_ids[i].status & CLIENTCLOSED) {
                 printf("are_all_clientid_closed: %llu closed\n",
-                       (unsigned long long) ssl_ids[i].id);
+                    (unsigned long long)ssl_ids[i].id);
                 SSL_free(ssl_ids[i].s);
                 ssl_ids[i].s = NULL;
                 ssl_ids[i].id = UINT64_MAX;
                 continue;
             }
-            printf("are_all_clientid_closed: %llu open\n", (unsigned long long) ssl_ids[i].id);
+            printf("are_all_clientid_closed: %llu open\n", (unsigned long long)ssl_ids[i].id);
             return 0;
         }
     }
@@ -274,9 +274,9 @@ static void close_all_ids(struct h3ssl *h3ssl)
 }
 
 static int on_recv_header(nghttp3_conn *conn, int64_t stream_id, int32_t token,
-                          nghttp3_rcbuf *name, nghttp3_rcbuf *value,
-                          uint8_t flags, void *user_data,
-                          void *stream_user_data)
+    nghttp3_rcbuf *name, nghttp3_rcbuf *value,
+    uint8_t flags, void *user_data,
+    void *stream_user_data)
 {
     nghttp3_vec vname, vvalue;
     struct h3ssl *h3ssl = (struct h3ssl *)user_data;
@@ -310,7 +310,7 @@ static int on_recv_header(nghttp3_conn *conn, int64_t stream_id, int32_t token,
 }
 
 static int on_end_headers(nghttp3_conn *conn, int64_t stream_id, int fin,
-                          void *user_data, void *stream_user_data)
+    void *user_data, void *stream_user_data)
 {
     struct h3ssl *h3ssl = (struct h3ssl *)user_data;
 
@@ -320,8 +320,8 @@ static int on_end_headers(nghttp3_conn *conn, int64_t stream_id, int fin,
 }
 
 static int on_recv_data(nghttp3_conn *conn, int64_t stream_id,
-                        const uint8_t *data, size_t datalen,
-                        void *conn_user_data, void *stream_user_data)
+    const uint8_t *data, size_t datalen,
+    void *conn_user_data, void *stream_user_data)
 {
     fprintf(stderr, "on_recv_data! %ld\n", (unsigned long)datalen);
     fprintf(stderr, "on_recv_data! %.*s\n", (int)datalen, data);
@@ -329,7 +329,7 @@ static int on_recv_data(nghttp3_conn *conn, int64_t stream_id,
 }
 
 static int on_end_stream(nghttp3_conn *h3conn, int64_t stream_id,
-                         void *conn_user_data, void *stream_user_data)
+    void *conn_user_data, void *stream_user_data)
 {
     struct h3ssl *h3ssl = (struct h3ssl *)conn_user_data;
 
@@ -351,8 +351,8 @@ static int quic_server_read(nghttp3_conn *h3conn, SSL *stream, uint64_t id, stru
     ret = SSL_read(stream, msg2, l);
     if (ret <= 0) {
         fprintf(stderr, "SSL_read %d on %llu failed\n",
-                SSL_get_error(stream, ret),
-                (unsigned long long) id);
+            SSL_get_error(stream, ret),
+            (unsigned long long)id);
         switch (SSL_get_error(stream, ret)) {
         case SSL_ERROR_WANT_READ:
             return 0;
@@ -373,12 +373,12 @@ static int quic_server_read(nghttp3_conn *h3conn, SSL *stream, uint64_t id, stru
     }
 
     printf("nghttp3_conn_read_stream used %d of %d on %llu\n", r,
-           ret, (unsigned long long) id);
+        ret, (unsigned long long)id);
     if (r != ret) {
         /* chrome returns -607 on stream 2 */
         if (!nghttp3_err_is_fatal(r)) {
             printf("nghttp3_conn_read_stream used %d of %d (not fatal) on %llu\n", r,
-                   ret, (unsigned long long) id);
+                ret, (unsigned long long)id);
             if (id == 2)
                 h3ssl->received_from_two = 1;
             return 1;
@@ -409,7 +409,7 @@ static int quic_server_h3streams(nghttp3_conn *h3conn, struct h3ssl *h3ssl)
     rstream = SSL_new_stream(conn, SSL_STREAM_FLAG_UNI);
     if (rstream != NULL) {
         printf("=> Opened on %llu\n",
-               (unsigned long long)SSL_get_stream_id(rstream));
+            (unsigned long long)SSL_get_stream_id(rstream));
     } else {
         fprintf(stderr, "=> Stream == NULL!\n");
         goto err;
@@ -417,7 +417,7 @@ static int quic_server_h3streams(nghttp3_conn *h3conn, struct h3ssl *h3ssl)
     pstream = SSL_new_stream(conn, SSL_STREAM_FLAG_UNI);
     if (pstream != NULL) {
         printf("=> Opened on %llu\n",
-               (unsigned long long)SSL_get_stream_id(pstream));
+            (unsigned long long)SSL_get_stream_id(pstream));
     } else {
         fprintf(stderr, "=> Stream == NULL!\n");
         goto err;
@@ -425,7 +425,7 @@ static int quic_server_h3streams(nghttp3_conn *h3conn, struct h3ssl *h3ssl)
     cstream = SSL_new_stream(conn, SSL_STREAM_FLAG_UNI);
     if (cstream != NULL) {
         fprintf(stderr, "=> Opened on %llu\n",
-                (unsigned long long)SSL_get_stream_id(cstream));
+            (unsigned long long)SSL_get_stream_id(cstream));
         fflush(stderr);
     } else {
         fprintf(stderr, "=> Stream == NULL!\n");
@@ -443,9 +443,9 @@ static int quic_server_h3streams(nghttp3_conn *h3conn, struct h3ssl *h3ssl)
         goto err;
     }
     printf("control: %llu enc %llu dec %llu\n",
-           (unsigned long long)c_streamid,
-           (unsigned long long)p_streamid,
-           (unsigned long long)r_streamid);
+        (unsigned long long)c_streamid,
+        (unsigned long long)p_streamid,
+        (unsigned long long)r_streamid);
     add_id(SSL_get_stream_id(rstream), rstream, h3ssl);
     add_id(SSL_get_stream_id(pstream), pstream, h3ssl);
     add_id(SSL_get_stream_id(cstream), cstream, h3ssl);
@@ -464,8 +464,8 @@ static int read_from_ssl_ids(nghttp3_conn **curh3conn, struct h3ssl *h3ssl)
 {
     int hassomething = 0, i;
     struct ssl_id *ssl_ids = h3ssl->ssl_ids;
-    SSL_POLL_ITEM items[MAXSSL_IDS] = {0}, *item = items;
-    static const struct timeval nz_timeout = {0, 0};
+    SSL_POLL_ITEM items[MAXSSL_IDS] = { 0 }, *item = items;
+    static const struct timeval nz_timeout = { 0, 0 };
     size_t result_count = SIZE_MAX;
     int numitem = 0, ret;
     uint64_t processed_event = 0;
@@ -479,7 +479,7 @@ static int read_from_ssl_ids(nghttp3_conn **curh3conn, struct h3ssl *h3ssl)
     for (i = 0; i < MAXSSL_IDS; i++) {
         if (ssl_ids[i].s != NULL) {
             item->desc = SSL_as_poll_descriptor(ssl_ids[i].s);
-            item->events = UINT64_MAX;  /* TODO adjust to the event we need process */
+            item->events = UINT64_MAX; /* TODO adjust to the event we need process */
             item->revents = UINT64_MAX; /* TODO adjust to the event we need process */
             numitem++;
             item++;
@@ -496,7 +496,7 @@ static int read_from_ssl_ids(nghttp3_conn **curh3conn, struct h3ssl *h3ssl)
      * on an automatic basis.
      */
     ret = SSL_poll(items, numitem, sizeof(SSL_POLL_ITEM), &nz_timeout,
-                   SSL_POLL_FLAG_NO_HANDLE_EVENTS, &result_count);
+        SSL_POLL_FLAG_NO_HANDLE_EVENTS, &result_count);
     if (!ret) {
         fprintf(stderr, "SSL_poll failed\n");
         printf("SSL_poll failed\n");
@@ -555,7 +555,7 @@ static int read_from_ssl_ids(nghttp3_conn **curh3conn, struct h3ssl *h3ssl)
             nghttp3_conn_del(*curh3conn);
             nghttp3_settings_default(&settings);
             if (nghttp3_conn_server_new(curh3conn, &callbacks, &settings, mem,
-                                        h3ssl)) {
+                    h3ssl)) {
                 fprintf(stderr, "nghttp3_conn_client_new failed!\n");
                 exit(1);
             }
@@ -563,7 +563,7 @@ static int read_from_ssl_ids(nghttp3_conn **curh3conn, struct h3ssl *h3ssl)
             hassomething++;
 
             if (!SSL_set_incoming_stream_policy(conn,
-                                                SSL_INCOMING_STREAM_POLICY_ACCEPT, 0)) {
+                    SSL_INCOMING_STREAM_POLICY_ACCEPT, 0)) {
                 fprintf(stderr, "error while setting inccoming stream policy\n");
                 ret = -1;
                 goto err;
@@ -573,8 +573,7 @@ static int read_from_ssl_ids(nghttp3_conn **curh3conn, struct h3ssl *h3ssl)
             processed_event = processed_event | SSL_POLL_EVENT_IC;
         }
         /* SSL_accept_stream if SSL_POLL_EVENT_ISB or SSL_POLL_EVENT_ISU */
-        if ((item->revents & SSL_POLL_EVENT_ISB) ||
-            (item->revents & SSL_POLL_EVENT_ISU)) {
+        if ((item->revents & SSL_POLL_EVENT_ISB) || (item->revents & SSL_POLL_EVENT_ISU)) {
             SSL *stream = SSL_accept_stream(item->desc.value.ssl, 0);
             uint64_t new_id;
             int r;
@@ -584,8 +583,8 @@ static int read_from_ssl_ids(nghttp3_conn **curh3conn, struct h3ssl *h3ssl)
                 goto err;
             }
             new_id = SSL_get_stream_id(stream);
-            printf("=> Received connection on %lld %d\n", (unsigned long long) new_id,
-                   SSL_get_stream_type(stream));
+            printf("=> Received connection on %lld %d\n", (unsigned long long)new_id,
+                SSL_get_stream_type(stream));
             add_id(new_id, stream, h3ssl);
             if (h3ssl->close_wait) {
                 printf("in close_wait so we will have a new request\n");
@@ -738,8 +737,8 @@ static int read_from_ssl_ids(nghttp3_conn **curh3conn, struct h3ssl *h3ssl)
 
             id = SSL_get_stream_id(item->desc.value.ssl);
             printf("revent %llu (%d) on %llu NOT PROCESSED!\n",
-                   (unsigned long long)item->revents, SSL_POLL_EVENT_W,
-                   (unsigned long long)id);
+                (unsigned long long)item->revents, SSL_POLL_EVENT_W,
+                (unsigned long long)id);
         }
     }
     ret = hassomething;
@@ -756,8 +755,7 @@ static void handle_events_from_ids(struct h3ssl *h3ssl)
 
     ssl_ids = h3ssl->ssl_ids;
     for (i = 0; i < MAXSSL_IDS; i++) {
-        if (ssl_ids[i].s != NULL &&
-            (ssl_ids[i].status & ISCONNECTION || ssl_ids[i].status & ISLISTENER)) {
+        if (ssl_ids[i].s != NULL && (ssl_ids[i].status & ISCONNECTION || ssl_ids[i].status & ISLISTENER)) {
             if (SSL_handle_events(ssl_ids[i].s))
                 ERR_print_errors_fp(stderr);
         }
@@ -781,7 +779,7 @@ static size_t get_file_length(struct h3ssl *h3ssl)
     if (stat(filename, &st) == 0) {
         /* Only process regular files */
         if (S_ISREG(st.st_mode)) {
-            printf("get_file_length %s %lld\n", filename, (unsigned long long) st.st_size);
+            printf("get_file_length %s %lld\n", filename, (unsigned long long)st.st_size);
             return (size_t)st.st_size;
         }
     }
@@ -804,7 +802,7 @@ static char *get_file_data(struct h3ssl *h3ssl)
         strcat(filename, h3ssl->fileprefix);
     strcat(filename, h3ssl->url);
 
-    res = malloc(size+1);
+    res = malloc(size + 1);
     res[size] = '\0';
     fd = open(filename, O_RDONLY);
     if (read(fd, res, size) == -1) {
@@ -818,9 +816,9 @@ static char *get_file_data(struct h3ssl *h3ssl)
 }
 
 static nghttp3_ssize step_read_data(nghttp3_conn *conn, int64_t stream_id,
-                                    nghttp3_vec *vec, size_t veccnt,
-                                    uint32_t *pflags, void *user_data,
-                                    void *stream_user_data)
+    nghttp3_vec *vec, size_t veccnt,
+    uint32_t *pflags, void *user_data,
+    void *stream_user_data)
 {
     struct h3ssl *h3ssl = (struct h3ssl *)user_data;
 
@@ -850,8 +848,8 @@ static nghttp3_ssize step_read_data(nghttp3_conn *conn, int64_t stream_id,
 }
 
 static int quic_server_write(struct h3ssl *h3ssl, uint64_t streamid,
-                             uint8_t *buff, size_t len, uint64_t flags,
-                             size_t *written)
+    uint8_t *buff, size_t len, uint64_t flags,
+    size_t *written)
 {
     struct ssl_id *ssl_ids;
     int i;
@@ -859,19 +857,18 @@ static int quic_server_write(struct h3ssl *h3ssl, uint64_t streamid,
     ssl_ids = h3ssl->ssl_ids;
     for (i = 0; i < MAXSSL_IDS; i++) {
         if (ssl_ids[i].id == streamid) {
-            if (!SSL_write_ex2(ssl_ids[i].s, buff, len, flags, written) ||
-                *written != len) {
+            if (!SSL_write_ex2(ssl_ids[i].s, buff, len, flags, written) || *written != len) {
                 fprintf(stderr, "couldn't write on connection\n");
                 ERR_print_errors_fp(stderr);
                 return 0;
             }
             printf("written %lld on %lld flags %lld\n", (unsigned long long)len,
-                   (unsigned long long)streamid, (unsigned long long)flags);
+                (unsigned long long)streamid, (unsigned long long)flags);
             return 1;
         }
     }
     printf("quic_server_write %lld on %lld (NOT FOUND!)\n", (unsigned long long)len,
-           (unsigned long long)streamid);
+        (unsigned long long)streamid);
     return 0;
 }
 
@@ -883,19 +880,20 @@ static int quic_server_write(struct h3ssl *h3ssl, uint64_t streamid,
  */
 
 /* ALPN string for TLS handshake. We pretent h3-29 and h3 */
-static const unsigned char alpn_ossltest[] = { 5,   'h', '3', '-', '2',
-                                               '9', 2,   'h', '3' };
+static const unsigned char alpn_ossltest[] = { 5, 'h', '3', '-', '2',
+    '9', 2, 'h', '3' };
 
 /*
  * This callback validates and negotiates the desired ALPN on the server side.
  */
 static int select_alpn(SSL *ssl, const unsigned char **out,
-                       unsigned char *out_len, const unsigned char *in,
-                       unsigned int in_len, void *arg)
+    unsigned char *out_len, const unsigned char *in,
+    unsigned int in_len, void *arg)
 {
     if (SSL_select_next_proto((unsigned char **)out, out_len, alpn_ossltest,
-                              sizeof(alpn_ossltest), in,
-                              in_len) != OPENSSL_NPN_NEGOTIATED)
+            sizeof(alpn_ossltest), in,
+            in_len)
+        != OPENSSL_NPN_NEGOTIATED)
         return SSL_TLSEXT_ERR_ALERT_FATAL;
 
     return SSL_TLSEXT_ERR_OK;
@@ -939,7 +937,7 @@ static SSL_CTX *create_ctx(const char *cert_path, const char *key_path)
 static int create_socket(uint16_t port)
 {
     int fd = -1;
-    struct sockaddr_in sa = {0};
+    struct sockaddr_in sa = { 0 };
 
     if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
         fprintf(stderr, "cannot create socket");
@@ -1172,16 +1170,16 @@ static int run_quic_server(SSL_CTX *ctx, int fd)
         } else if (h3ssl.ldata == INT_MAX) {
             /* endless file for tests */
             sprintf(slength, "%zu", h3ssl.ldata);
-            h3ssl.ptr_data = (uint8_t *) malloc(4096);
+            h3ssl.ptr_data = (uint8_t *)malloc(4096);
             memset(h3ssl.ptr_data, 'A', 4096);
         } else {
             /* normal file we have opened */
             sprintf(slength, "%zu", h3ssl.ldata);
-            h3ssl.ptr_data = (uint8_t *) get_file_data(&h3ssl);
+            h3ssl.ptr_data = (uint8_t *)get_file_data(&h3ssl);
             if (h3ssl.ptr_data == NULL)
                 abort();
             printf("before nghttp3_conn_submit_response on %llu for %s ...\n",
-                   (unsigned long long) h3ssl.id_bidi, h3ssl.url);
+                (unsigned long long)h3ssl.id_bidi, h3ssl.url);
             if (strstr(h3ssl.url, ".png"))
                 make_nv(&resp[num_nv++], "content-type", "image/png");
             else if (strstr(h3ssl.url, ".ico"))
@@ -1198,7 +1196,7 @@ static int run_quic_server(SSL_CTX *ctx, int fd)
             fprintf(stderr, "nghttp3_conn_submit_response failed!\n");
             goto err;
         }
-        printf("nghttp3_conn_submit_response on %llu...\n", (unsigned long long) h3ssl.id_bidi);
+        printf("nghttp3_conn_submit_response on %llu...\n", (unsigned long long)h3ssl.id_bidi);
         for (;;) {
             nghttp3_vec vec[256];
             nghttp3_ssize sveccnt;
@@ -1206,15 +1204,15 @@ static int run_quic_server(SSL_CTX *ctx, int fd)
             int64_t streamid;
 
             sveccnt = nghttp3_conn_writev_stream(h3conn, &streamid, &fin, vec,
-                                                 nghttp3_arraylen(vec));
+                nghttp3_arraylen(vec));
             if (sveccnt <= 0) {
                 printf("nghttp3_conn_writev_stream done: %ld stream: %llu fin %d\n",
-                       (long int)sveccnt,
-                       (unsigned long long)streamid,
-                       fin);
+                    (long int)sveccnt,
+                    (unsigned long long)streamid,
+                    fin);
                 if (streamid != -1 && fin) {
                     printf("Sending end data on %llu fin %d\n",
-                           (unsigned long long) streamid, fin);
+                        (unsigned long long)streamid, fin);
                     nghttp3_conn_add_write_offset(h3conn, streamid, 0);
                     continue;
                 }
@@ -1229,18 +1227,18 @@ static int run_quic_server(SSL_CTX *ctx, int fd)
                 int flagwrite = 0;
 
                 printf("quic_server_write on %llu for %ld\n",
-                       (unsigned long long)streamid, (unsigned long)vec[i].len);
+                    (unsigned long long)streamid, (unsigned long)vec[i].len);
                 if (fin && i == sveccnt - 1)
                     flagwrite = SSL_WRITE_FLAG_CONCLUDE;
                 if (!quic_server_write(&h3ssl, streamid, vec[i].base,
-                                       vec[i].len, flagwrite, &numbytes)) {
+                        vec[i].len, flagwrite, &numbytes)) {
                     fprintf(stderr, "quic_server_write failed!\n");
                     goto err;
                 }
             }
             if (nghttp3_conn_add_write_offset(
-                                              h3conn, streamid,
-                                              (size_t)nghttp3_vec_len(vec, (size_t)sveccnt))) {
+                    h3conn, streamid,
+                    (size_t)nghttp3_vec_len(vec, (size_t)sveccnt))) {
                 fprintf(stderr, "nghttp3_conn_add_write_offset failed!\n");
                 goto err;
             }
@@ -1348,7 +1346,7 @@ int main(int argc, char **argv)
 
     if (argc < 4) {
         fprintf(stderr, "usage: %s <port> <server.crt> <server.key>\n",
-                argv[0]);
+            argv[0]);
         goto err;
     }
 
diff --git a/demos/http3/ossl-nghttp3-demo.c b/demos/http3/ossl-nghttp3-demo.c
index 2225b0cd584c4..e1c0f4ba14a6f 100644
--- a/demos/http3/ossl-nghttp3-demo.c
+++ b/demos/http3/ossl-nghttp3-demo.c
@@ -13,25 +13,25 @@ static int done;
 
 static void make_nv(nghttp3_nv *nv, const char *name, const char *value)
 {
-    nv->name        = (uint8_t *)name;
-    nv->value       = (uint8_t *)value;
-    nv->namelen     = strlen(name);
-    nv->valuelen    = strlen(value);
-    nv->flags       = NGHTTP3_NV_FLAG_NONE;
+    nv->name = (uint8_t *)name;
+    nv->value = (uint8_t *)value;
+    nv->namelen = strlen(name);
+    nv->valuelen = strlen(value);
+    nv->flags = NGHTTP3_NV_FLAG_NONE;
 }
 
 static int on_recv_header(nghttp3_conn *h3conn, int64_t stream_id,
-                          int32_t token,
-                          nghttp3_rcbuf *name, nghttp3_rcbuf *value,
-                          uint8_t flags,
-                          void *conn_user_data,
-                          void *stream_user_data)
+    int32_t token,
+    nghttp3_rcbuf *name, nghttp3_rcbuf *value,
+    uint8_t flags,
+    void *conn_user_data,
+    void *stream_user_data)
 {
     nghttp3_vec vname, vvalue;
 
     /* Received a single HTTP header. */
-    vname   = nghttp3_rcbuf_get_buf(name);
-    vvalue  = nghttp3_rcbuf_get_buf(value);
+    vname = nghttp3_rcbuf_get_buf(name);
+    vvalue = nghttp3_rcbuf_get_buf(value);
 
     fwrite(vname.base, vname.len, 1, stderr);
     fprintf(stderr, ": ");
@@ -42,16 +42,16 @@ static int on_recv_header(nghttp3_conn *h3conn, int64_t stream_id,
 }
 
 static int on_end_headers(nghttp3_conn *h3conn, int64_t stream_id,
-                          int fin,
-                          void *conn_user_data, void *stream_user_data)
+    int fin,
+    void *conn_user_data, void *stream_user_data)
 {
     fprintf(stderr, "\n");
     return 0;
 }
 
 static int on_recv_data(nghttp3_conn *h3conn, int64_t stream_id,
-                        const uint8_t *data, size_t datalen,
-                        void *conn_user_data, void *stream_user_data)
+    const uint8_t *data, size_t datalen,
+    void *conn_user_data, void *stream_user_data)
 {
     size_t wr;
 
@@ -61,7 +61,7 @@ static int on_recv_data(nghttp3_conn *h3conn, int64_t stream_id,
         if (ferror(stdout))
             return 1;
 
-        data    += wr;
+        data += wr;
         datalen -= wr;
     }
 
@@ -69,7 +69,7 @@ static int on_recv_data(nghttp3_conn *h3conn, int64_t stream_id,
 }
 
 static int on_end_stream(nghttp3_conn *h3conn, int64_t stream_id,
-                         void *conn_user_data, void *stream_user_data)
+    void *conn_user_data, void *stream_user_data)
 {
     /* HTTP transaction is done - set done flag so that we stop looping. */
     done = 1;
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
     SSL_CTX *ctx = NULL;
     OSSL_DEMO_H3_CONN *conn = NULL;
     nghttp3_nv nva[16];
-    nghttp3_callbacks callbacks = {0};
+    nghttp3_callbacks callbacks = { 0 };
     size_t num_nv = 0;
     const char *addr;
 
@@ -104,16 +104,17 @@ int main(int argc, char **argv)
         goto err;
 
     /* Setup callbacks. */
-    callbacks.recv_header   = on_recv_header;
-    callbacks.end_headers   = on_end_headers;
-    callbacks.recv_data     = on_recv_data;
-    callbacks.end_stream    = on_end_stream;
+    callbacks.recv_header = on_recv_header;
+    callbacks.end_headers = on_end_headers;
+    callbacks.recv_data = on_recv_data;
+    callbacks.end_stream = on_end_stream;
 
     /* Create connection. */
     if ((conn = OSSL_DEMO_H3_CONN_new_for_addr(ctx, addr, &callbacks,
-                                               NULL, NULL)) == NULL) {
+             NULL, NULL))
+        == NULL) {
         ERR_raise_data(ERR_LIB_USER, ERR_R_OPERATION_FAIL,
-                       "cannot create HTTP/3 connection");
+            "cannot create HTTP/3 connection");
         goto err;
     }
 
@@ -127,7 +128,7 @@ int main(int argc, char **argv)
     /* Submit request. */
     if (!OSSL_DEMO_H3_CONN_submit_request(conn, nva, num_nv, NULL, NULL)) {
         ERR_raise_data(ERR_LIB_USER, ERR_R_OPERATION_FAIL,
-                       "cannot submit HTTP/3 request");
+            "cannot submit HTTP/3 request");
         goto err;
     }
 
@@ -135,7 +136,7 @@ int main(int argc, char **argv)
     while (!done)
         if (!OSSL_DEMO_H3_CONN_handle_events(conn)) {
             ERR_raise_data(ERR_LIB_USER, ERR_R_OPERATION_FAIL,
-                           "cannot handle events");
+                "cannot handle events");
             goto err;
         }
 
diff --git a/demos/http3/ossl-nghttp3.c b/demos/http3/ossl-nghttp3.c
index be781f71982a4..de676c604f7b3 100644
--- a/demos/http3/ossl-nghttp3.c
+++ b/demos/http3/ossl-nghttp3.c
@@ -10,7 +10,7 @@
 #include <openssl/err.h>
 #include <assert.h>
 
-#define ARRAY_LEN(x) (sizeof(x)/sizeof((x)[0]))
+#define ARRAY_LEN(x) (sizeof(x) / sizeof((x)[0]))
 
 enum {
     OSSL_DEMO_H3_STREAM_TYPE_CTRL_SEND,
@@ -19,16 +19,16 @@ enum {
     OSSL_DEMO_H3_STREAM_TYPE_REQ,
 };
 
-#define BUF_SIZE    4096
+#define BUF_SIZE 4096
 
 struct ossl_demo_h3_stream_st {
-    uint64_t            id;             /* QUIC stream ID */
-    SSL                 *s;             /* QUIC stream SSL object */
-    int                 done_recv_fin;  /* Received FIN */
-    void                *user_data;
+    uint64_t id; /* QUIC stream ID */
+    SSL *s; /* QUIC stream SSL object */
+    int done_recv_fin; /* Received FIN */
+    void *user_data;
 
-    uint8_t             buf[BUF_SIZE];
-    size_t              buf_cur, buf_total;
+    uint8_t buf[BUF_SIZE];
+    size_t buf_cur, buf_total;
 };
 
 DEFINE_LHASH_OF_EX(OSSL_DEMO_H3_STREAM);
@@ -49,8 +49,10 @@ static unsigned long h3_stream_hash(const OSSL_DEMO_H3_STREAM *s)
 
 static int h3_stream_eq(const OSSL_DEMO_H3_STREAM *a, const OSSL_DEMO_H3_STREAM *b)
 {
-    if (a->id < b->id) return -1;
-    if (a->id > b->id) return 1;
+    if (a->id < b->id)
+        return -1;
+    if (a->id > b->id)
+        return 1;
     return 0;
 }
 
@@ -61,25 +63,25 @@ void *OSSL_DEMO_H3_STREAM_get_user_data(const OSSL_DEMO_H3_STREAM *s)
 
 struct ossl_demo_h3_conn_st {
     /* QUIC connection SSL object */
-    SSL                             *qconn;
+    SSL *qconn;
     /* BIO wrapping QCSO */
-    BIO                             *qconn_bio;
+    BIO *qconn_bio;
     /* HTTP/3 connection object */
-    nghttp3_conn                    *h3conn;
+    nghttp3_conn *h3conn;
     /* map of stream IDs to OSSL_DEMO_H3_STREAMs */
-    LHASH_OF(OSSL_DEMO_H3_STREAM)   *streams;
+    LHASH_OF(OSSL_DEMO_H3_STREAM) *streams;
     /* opaque user data pointer */
-    void                            *user_data;
+    void *user_data;
 
-    int                             pump_res;
-    size_t                          consumed_app_data;
+    int pump_res;
+    size_t consumed_app_data;
 
     /* Forwarding callbacks */
-    nghttp3_recv_data               recv_data_cb;
-    nghttp3_stream_close            stream_close_cb;
-    nghttp3_stop_sending            stop_sending_cb;
-    nghttp3_reset_stream            reset_stream_cb;
-    nghttp3_deferred_consume        deferred_consume_cb;
+    nghttp3_recv_data recv_data_cb;
+    nghttp3_stream_close stream_close_cb;
+    nghttp3_stop_sending stop_sending_cb;
+    nghttp3_reset_stream reset_stream_cb;
+    nghttp3_deferred_consume deferred_consume_cb;
 };
 
 void OSSL_DEMO_H3_CONN_free(OSSL_DEMO_H3_CONN *conn)
@@ -108,11 +110,11 @@ static OSSL_DEMO_H3_STREAM *h3_conn_create_stream(OSSL_DEMO_H3_CONN *conn, int t
 
     if ((s->s = SSL_new_stream(conn->qconn, flags)) == NULL) {
         ERR_raise_data(ERR_LIB_USER, ERR_R_INTERNAL_ERROR,
-                       "could not create QUIC stream object");
+            "could not create QUIC stream object");
         goto err;
     }
 
-    s->id   = SSL_get_stream_id(s->s);
+    s->id = SSL_get_stream_id(s->s);
     lh_OSSL_DEMO_H3_STREAM_insert(conn->streams, s);
     return s;
 
@@ -128,8 +130,8 @@ static OSSL_DEMO_H3_STREAM *h3_conn_accept_stream(OSSL_DEMO_H3_CONN *conn, SSL *
     if ((s = OPENSSL_zalloc(sizeof(OSSL_DEMO_H3_STREAM))) == NULL)
         return NULL;
 
-    s->id   = SSL_get_stream_id(qstream);
-    s->s    = qstream;
+    s->id = SSL_get_stream_id(qstream);
+    s->s = qstream;
     lh_OSSL_DEMO_H3_STREAM_insert(conn->streams, s);
     return s;
 }
@@ -144,8 +146,8 @@ static void h3_conn_remove_stream(OSSL_DEMO_H3_CONN *conn, OSSL_DEMO_H3_STREAM *
 }
 
 static int h3_conn_recv_data(nghttp3_conn *h3conn, int64_t stream_id,
-                             const uint8_t *data, size_t datalen,
-                             void *conn_user_data, void *stream_user_data)
+    const uint8_t *data, size_t datalen,
+    void *conn_user_data, void *stream_user_data)
 {
     OSSL_DEMO_H3_CONN *conn = conn_user_data;
 
@@ -154,12 +156,12 @@ static int h3_conn_recv_data(nghttp3_conn *h3conn, int64_t stream_id,
         return 0;
 
     return conn->recv_data_cb(h3conn, stream_id, data, datalen,
-                              conn_user_data, stream_user_data);
+        conn_user_data, stream_user_data);
 }
 
 static int h3_conn_stream_close(nghttp3_conn *h3conn, int64_t stream_id,
-                                uint64_t app_error_code,
-                                void *conn_user_data, void *stream_user_data)
+    uint64_t app_error_code,
+    void *conn_user_data, void *stream_user_data)
 {
     int ret = 0;
     OSSL_DEMO_H3_CONN *conn = conn_user_data;
@@ -167,15 +169,15 @@ static int h3_conn_stream_close(nghttp3_conn *h3conn, int64_t stream_id,
 
     if (conn->stream_close_cb != NULL)
         ret = conn->stream_close_cb(h3conn, stream_id, app_error_code,
-                                    conn_user_data, stream_user_data);
+            conn_user_data, stream_user_data);
 
     h3_conn_remove_stream(conn, stream);
     return ret;
 }
 
 static int h3_conn_stop_sending(nghttp3_conn *h3conn, int64_t stream_id,
-                                uint64_t app_error_code,
-                                void *conn_user_data, void *stream_user_data)
+    uint64_t app_error_code,
+    void *conn_user_data, void *stream_user_data)
 {
     int ret = 0;
     OSSL_DEMO_H3_CONN *conn = conn_user_data;
@@ -183,7 +185,7 @@ static int h3_conn_stop_sending(nghttp3_conn *h3conn, int64_t stream_id,
 
     if (conn->stop_sending_cb != NULL)
         ret = conn->stop_sending_cb(h3conn, stream_id, app_error_code,
-                                    conn_user_data, stream_user_data);
+            conn_user_data, stream_user_data);
 
     SSL_free(stream->s);
     stream->s = NULL;
@@ -191,17 +193,17 @@ static int h3_conn_stop_sending(nghttp3_conn *h3conn, int64_t stream_id,
 }
 
 static int h3_conn_reset_stream(nghttp3_conn *h3conn, int64_t stream_id,
-                                uint64_t app_error_code,
-                                void *conn_user_data, void *stream_user_data)
+    uint64_t app_error_code,
+    void *conn_user_data, void *stream_user_data)
 {
     int ret = 0;
     OSSL_DEMO_H3_CONN *conn = conn_user_data;
     OSSL_DEMO_H3_STREAM *stream = stream_user_data;
-    SSL_STREAM_RESET_ARGS args = {0};
+    SSL_STREAM_RESET_ARGS args = { 0 };
 
     if (conn->reset_stream_cb != NULL)
         ret = conn->reset_stream_cb(h3conn, stream_id, app_error_code,
-                                   conn_user_data, stream_user_data);
+            conn_user_data, stream_user_data);
 
     if (stream->s != NULL) {
         args.quic_error_code = app_error_code;
@@ -214,37 +216,37 @@ static int h3_conn_reset_stream(nghttp3_conn *h3conn, int64_t stream_id,
 }
 
 static int h3_conn_deferred_consume(nghttp3_conn *h3conn, int64_t stream_id,
-                                    size_t consumed,
-                                    void *conn_user_data, void *stream_user_data)
+    size_t consumed,
+    void *conn_user_data, void *stream_user_data)
 {
     int ret = 0;
     OSSL_DEMO_H3_CONN *conn = conn_user_data;
 
     if (conn->deferred_consume_cb != NULL)
         ret = conn->deferred_consume_cb(h3conn, stream_id, consumed,
-                                        conn_user_data, stream_user_data);
+            conn_user_data, stream_user_data);
 
     conn->consumed_app_data += consumed;
     return ret;
 }
 
 OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_conn(BIO *qconn_bio,
-                                                  const nghttp3_callbacks *callbacks,
-                                                  const nghttp3_settings *settings,
-                                                  void *user_data)
+    const nghttp3_callbacks *callbacks,
+    const nghttp3_settings *settings,
+    void *user_data)
 {
     int ec;
     OSSL_DEMO_H3_CONN *conn;
     OSSL_DEMO_H3_STREAM *s_ctl_send = NULL;
     OSSL_DEMO_H3_STREAM *s_qpenc_send = NULL;
     OSSL_DEMO_H3_STREAM *s_qpdec_send = NULL;
-    nghttp3_settings dsettings = {0};
-    nghttp3_callbacks intl_callbacks = {0};
-    static const unsigned char alpn[] = {2, 'h', '3'};
+    nghttp3_settings dsettings = { 0 };
+    nghttp3_callbacks intl_callbacks = { 0 };
+    static const unsigned char alpn[] = { 2, 'h', '3' };
 
     if (qconn_bio == NULL) {
         ERR_raise_data(ERR_LIB_USER, ERR_R_PASSED_NULL_PARAMETER,
-                       "QUIC connection BIO must be provided");
+            "QUIC connection BIO must be provided");
         return NULL;
     }
 
@@ -256,7 +258,7 @@ OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_conn(BIO *qconn_bio,
 
     if (BIO_get_ssl(qconn_bio, &conn->qconn) == 0) {
         ERR_raise_data(ERR_LIB_USER, ERR_R_PASSED_INVALID_ARGUMENT,
-                       "BIO must be an SSL BIO");
+            "BIO must be an SSL BIO");
         goto err;
     }
 
@@ -273,7 +275,7 @@ OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_conn(BIO *qconn_bio,
         if (SSL_set_alpn_protos(conn->qconn, alpn, sizeof(alpn))) {
             /* SSL_set_alpn_protos returns 1 on failure */
             ERR_raise_data(ERR_LIB_USER, ERR_R_INTERNAL_ERROR,
-                           "failed to configure ALPN");
+                "failed to configure ALPN");
             goto err;
         }
 
@@ -292,7 +294,7 @@ OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_conn(BIO *qconn_bio,
      */
     if (!SSL_set_default_stream_mode(conn->qconn, SSL_DEFAULT_STREAM_MODE_NONE)) {
         ERR_raise_data(ERR_LIB_USER, ERR_R_INTERNAL_ERROR,
-                       "failed to configure default stream mode");
+            "failed to configure default stream mode");
         goto err;
     }
 
@@ -305,15 +307,18 @@ OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_conn(BIO *qconn_bio,
      * in the event handling code below).
      */
     if ((s_ctl_send
-            = h3_conn_create_stream(conn, OSSL_DEMO_H3_STREAM_TYPE_CTRL_SEND)) == NULL)
+            = h3_conn_create_stream(conn, OSSL_DEMO_H3_STREAM_TYPE_CTRL_SEND))
+        == NULL)
         goto err;
 
     if ((s_qpenc_send
-            = h3_conn_create_stream(conn, OSSL_DEMO_H3_STREAM_TYPE_QPACK_ENC_SEND)) == NULL)
+            = h3_conn_create_stream(conn, OSSL_DEMO_H3_STREAM_TYPE_QPACK_ENC_SEND))
+        == NULL)
         goto err;
 
     if ((s_qpdec_send
-            = h3_conn_create_stream(conn, OSSL_DEMO_H3_STREAM_TYPE_QPACK_DEC_SEND)) == NULL)
+            = h3_conn_create_stream(conn, OSSL_DEMO_H3_STREAM_TYPE_QPACK_DEC_SEND))
+        == NULL)
         goto err;
 
     if (settings == NULL) {
@@ -328,25 +333,25 @@ OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_conn(BIO *qconn_bio,
      * We need to do some of our own processing when many of these events occur,
      * so we note the original callback functions and forward appropriately.
      */
-    conn->recv_data_cb          = intl_callbacks.recv_data;
-    conn->stream_close_cb       = intl_callbacks.stream_close;
-    conn->stop_sending_cb       = intl_callbacks.stop_sending;
-    conn->reset_stream_cb       = intl_callbacks.reset_stream;
-    conn->deferred_consume_cb   = intl_callbacks.deferred_consume;
-
-    intl_callbacks.recv_data        = h3_conn_recv_data;
-    intl_callbacks.stream_close     = h3_conn_stream_close;
-    intl_callbacks.stop_sending     = h3_conn_stop_sending;
-    intl_callbacks.reset_stream     = h3_conn_reset_stream;
+    conn->recv_data_cb = intl_callbacks.recv_data;
+    conn->stream_close_cb = intl_callbacks.stream_close;
+    conn->stop_sending_cb = intl_callbacks.stop_sending;
+    conn->reset_stream_cb = intl_callbacks.reset_stream;
+    conn->deferred_consume_cb = intl_callbacks.deferred_consume;
+
+    intl_callbacks.recv_data = h3_conn_recv_data;
+    intl_callbacks.stream_close = h3_conn_stream_close;
+    intl_callbacks.stop_sending = h3_conn_stop_sending;
+    intl_callbacks.reset_stream = h3_conn_reset_stream;
     intl_callbacks.deferred_consume = h3_conn_deferred_consume;
 
     /* Create the HTTP/3 client state. */
     ec = nghttp3_conn_client_new(&conn->h3conn, &intl_callbacks, settings,
-                                 NULL, conn);
+        NULL, conn);
     if (ec < 0) {
         ERR_raise_data(ERR_LIB_USER, ERR_R_INTERNAL_ERROR,
-                       "cannot create nghttp3 connection: %s (%d)",
-                       nghttp3_strerror(ec), ec);
+            "cannot create nghttp3 connection: %s (%d)",
+            nghttp3_strerror(ec), ec);
         goto err;
     }
 
@@ -361,18 +366,18 @@ OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_conn(BIO *qconn_bio,
     ec = nghttp3_conn_bind_control_stream(conn->h3conn, s_ctl_send->id);
     if (ec < 0) {
         ERR_raise_data(ERR_LIB_USER, ERR_R_INTERNAL_ERROR,
-                       "cannot bind nghttp3 control stream: %s (%d)",
-                       nghttp3_strerror(ec), ec);
+            "cannot bind nghttp3 control stream: %s (%d)",
+            nghttp3_strerror(ec), ec);
         goto err;
     }
 
     ec = nghttp3_conn_bind_qpack_streams(conn->h3conn,
-                                         s_qpenc_send->id,
-                                         s_qpdec_send->id);
+        s_qpenc_send->id,
+        s_qpdec_send->id);
     if (ec < 0) {
         ERR_raise_data(ERR_LIB_USER, ERR_R_INTERNAL_ERROR,
-                       "cannot bind nghttp3 QPACK streams: %s (%d)",
-                       nghttp3_strerror(ec), ec);
+            "cannot bind nghttp3 QPACK streams: %s (%d)",
+            nghttp3_strerror(ec), ec);
         goto err;
     }
 
@@ -389,9 +394,9 @@ OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_conn(BIO *qconn_bio,
 }
 
 OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_addr(SSL_CTX *ctx, const char *addr,
-                                                  const nghttp3_callbacks *callbacks,
-                                                  const nghttp3_settings *settings,
-                                                  void *user_data)
+    const nghttp3_callbacks *callbacks,
+    const nghttp3_settings *settings,
+    void *user_data)
 {
     BIO *qconn_bio = NULL;
     SSL *qconn = NULL;
@@ -426,7 +431,7 @@ OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_addr(SSL_CTX *ctx, const char *addr
         goto err;
 
     conn = OSSL_DEMO_H3_CONN_new_for_conn(qconn_bio, callbacks,
-                                          settings, user_data);
+        settings, user_data);
     if (conn == NULL)
         goto err;
 
@@ -492,17 +497,17 @@ static void h3_conn_pump_stream(OSSL_DEMO_H3_STREAM *s, void *conn_)
                 if (SSL_get_error(s->s, ec) == SSL_ERROR_ZERO_RETURN) {
                     /* Stream concluded normally. Pass FIN to HTTP/3 stack. */
                     ec = nghttp3_conn_read_stream(conn->h3conn, s->id, NULL, 0,
-                                                  /*fin=*/1);
+                        /*fin=*/1);
                     if (ec < 0) {
                         ERR_raise_data(ERR_LIB_USER, ERR_R_INTERNAL_ERROR,
-                                       "cannot pass FIN to nghttp3: %s (%d)",
-                                       nghttp3_strerror(ec), ec);
+                            "cannot pass FIN to nghttp3: %s (%d)",
+                            nghttp3_strerror(ec), ec);
                         goto err;
                     }
 
                     s->done_recv_fin = 1;
                 } else if (SSL_get_stream_read_state(s->s)
-                            == SSL_STREAM_STATE_RESET_REMOTE) {
+                    == SSL_STREAM_STATE_RESET_REMOTE) {
                     /* Stream was reset by peer. */
                     if (!SSL_get_stream_read_error_code(s->s, &aec))
                         goto err;
@@ -510,8 +515,8 @@ static void h3_conn_pump_stream(OSSL_DEMO_H3_STREAM *s, void *conn_)
                     ec = nghttp3_conn_close_stream(conn->h3conn, s->id, aec);
                     if (ec < 0) {
                         ERR_raise_data(ERR_LIB_USER, ERR_R_INTERNAL_ERROR,
-                                       "cannot mark stream as reset: %s (%d)",
-                                       nghttp3_strerror(ec), ec);
+                            "cannot mark stream as reset: %s (%d)",
+                            nghttp3_strerror(ec), ec);
                         goto err;
                     }
 
@@ -522,8 +527,8 @@ static void h3_conn_pump_stream(OSSL_DEMO_H3_STREAM *s, void *conn_)
                 }
             }
 
-            s->buf_cur      = 0;
-            s->buf_total    = num_bytes;
+            s->buf_cur = 0;
+            s->buf_total = num_bytes;
         }
 
         if (s->buf_cur == s->buf_total)
@@ -536,11 +541,11 @@ static void h3_conn_pump_stream(OSSL_DEMO_H3_STREAM *s, void *conn_)
          */
         assert(conn->consumed_app_data == 0);
         ec = nghttp3_conn_read_stream(conn->h3conn, s->id, s->buf + s->buf_cur,
-                                      s->buf_total - s->buf_cur, /*fin=*/0);
+            s->buf_total - s->buf_cur, /*fin=*/0);
         if (ec < 0) {
             ERR_raise_data(ERR_LIB_USER, ERR_R_INTERNAL_ERROR,
-                           "nghttp3 failed to process incoming data: %s (%d)",
-                           nghttp3_strerror(ec), ec);
+                "nghttp3 failed to process incoming data: %s (%d)",
+                nghttp3_strerror(ec), ec);
             goto err;
         }
 
@@ -568,7 +573,7 @@ int OSSL_DEMO_H3_CONN_handle_events(OSSL_DEMO_H3_CONN *conn)
     size_t i, num_vecs, written, total_written, total_len;
     int64_t stream_id;
     uint64_t flags;
-    nghttp3_vec vecs[8] = {0};
+    nghttp3_vec vecs[8] = { 0 };
     OSSL_DEMO_H3_STREAM key, *s;
     SSL *snew;
 
@@ -608,15 +613,15 @@ int OSSL_DEMO_H3_CONN_handle_events(OSSL_DEMO_H3_CONN *conn)
          * wants to *write* to the network.
          */
         ec = nghttp3_conn_writev_stream(conn->h3conn, &stream_id, &fin,
-                                        vecs, ARRAY_LEN(vecs));
+            vecs, ARRAY_LEN(vecs));
         if (ec < 0)
             return 0;
         if (ec == 0)
             break;
 
         /*
-	 * we let SSL_write_ex2(3) to conclude the stream for us (send FIN)
-	 * after all data are written.
+         * we let SSL_write_ex2(3) to conclude the stream for us (send FIN)
+         * after all data are written.
          */
         flags = (fin == 0) ? 0 : SSL_WRITE_FLAG_CONCLUDE;
 
@@ -624,7 +629,7 @@ int OSSL_DEMO_H3_CONN_handle_events(OSSL_DEMO_H3_CONN *conn)
         key.id = stream_id;
         if ((s = lh_OSSL_DEMO_H3_STREAM_retrieve(conn->streams, &key)) == NULL) {
             ERR_raise_data(ERR_LIB_USER, ERR_R_INTERNAL_ERROR,
-                           "no stream for ID %zd", stream_id);
+                "no stream for ID %zd", stream_id);
             return 0;
         }
 
@@ -648,7 +653,7 @@ int OSSL_DEMO_H3_CONN_handle_events(OSSL_DEMO_H3_CONN *conn)
                     nghttp3_conn_block_stream(conn->h3conn, stream_id);
                 } else {
                     ERR_raise_data(ERR_LIB_USER, ERR_R_INTERNAL_ERROR,
-                                   "writing HTTP/3 data to network failed");
+                        "writing HTTP/3 data to network failed");
                     return 0;
                 }
             } else {
@@ -707,16 +712,16 @@ int OSSL_DEMO_H3_CONN_handle_events(OSSL_DEMO_H3_CONN *conn)
 }
 
 int OSSL_DEMO_H3_CONN_submit_request(OSSL_DEMO_H3_CONN *conn,
-                                     const nghttp3_nv *nva, size_t nvlen,
-                                     const nghttp3_data_reader *dr,
-                                     void *user_data)
+    const nghttp3_nv *nva, size_t nvlen,
+    const nghttp3_data_reader *dr,
+    void *user_data)
 {
     int ec;
     OSSL_DEMO_H3_STREAM *s_req = NULL;
 
     if (conn == NULL) {
         ERR_raise_data(ERR_LIB_USER, ERR_R_PASSED_NULL_PARAMETER,
-                       "connection must be specified");
+            "connection must be specified");
         return 0;
     }
 
@@ -727,11 +732,11 @@ int OSSL_DEMO_H3_CONN_submit_request(OSSL_DEMO_H3_CONN *conn,
     s_req->user_data = user_data;
 
     ec = nghttp3_conn_submit_request(conn->h3conn, s_req->id, nva, nvlen,
-                                     dr, s_req);
+        dr, s_req);
     if (ec < 0) {
         ERR_raise_data(ERR_LIB_USER, ERR_R_INTERNAL_ERROR,
-                       "cannot submit HTTP/3 request: %s (%d)",
-                       nghttp3_strerror(ec), ec);
+            "cannot submit HTTP/3 request: %s (%d)",
+            nghttp3_strerror(ec), ec);
         goto err;
     }
 
diff --git a/demos/http3/ossl-nghttp3.h b/demos/http3/ossl-nghttp3.h
index ebf239657f08c..f5b98b1b5e70b 100644
--- a/demos/http3/ossl-nghttp3.h
+++ b/demos/http3/ossl-nghttp3.h
@@ -7,11 +7,11 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_NGHTTP3_H
-# define OSSL_NGHTTP3_H
+#define OSSL_NGHTTP3_H
 
-# include <openssl/bio.h>
-# include <openssl/ssl.h>
-# include <nghttp3/nghttp3.h>
+#include <openssl/bio.h>
+#include <openssl/ssl.h>
+#include <nghttp3/nghttp3.h>
 
 /*
  * ossl-nghttp3: Demo binding of nghttp3 to OpenSSL QUIC
@@ -46,9 +46,9 @@ typedef struct ossl_demo_h3_stream_st OSSL_DEMO_H3_STREAM;
  * Returns NULL on failure.
  */
 OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_conn(BIO *qconn_bio,
-                                                  const nghttp3_callbacks *callbacks,
-                                                  const nghttp3_settings *settings,
-                                                  void *user_data);
+    const nghttp3_callbacks *callbacks,
+    const nghttp3_settings *settings,
+    void *user_data);
 
 /*
  * Works identically to OSSL_DEMO_H3_CONN_new_for_conn except that it manages
@@ -61,10 +61,10 @@ OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_conn(BIO *qconn_bio,
  * SSL_METHOD.
  */
 OSSL_DEMO_H3_CONN *OSSL_DEMO_H3_CONN_new_for_addr(SSL_CTX *ctx,
-                                                  const char *addr,
-                                                  const nghttp3_callbacks *callbacks,
-                                                  const nghttp3_settings *settings,
-                                                  void *user_data);
+    const char *addr,
+    const nghttp3_callbacks *callbacks,
+    const nghttp3_settings *settings,
+    void *user_data);
 
 /* Equivalent to SSL_connect(OSSL_DEMO_H3_CONN_get0_connection(conn)). */
 int OSSL_DEMO_H3_CONN_connect(OSSL_DEMO_H3_CONN *conn);
@@ -98,9 +98,9 @@ int OSSL_DEMO_H3_CONN_handle_events(OSSL_DEMO_H3_CONN *conn);
  * OSSL_DEMO_H3_STREAM_get_user_data.
  */
 int OSSL_DEMO_H3_CONN_submit_request(OSSL_DEMO_H3_CONN *conn,
-                           const nghttp3_nv *hdr, size_t hdrlen,
-                           const nghttp3_data_reader *dr,
-                           void *stream_user_data);
+    const nghttp3_nv *hdr, size_t hdrlen,
+    const nghttp3_data_reader *dr,
+    void *stream_user_data);
 
 /*
  * Returns the user data value which was specified in
diff --git a/demos/kdf/argon2.c b/demos/kdf/argon2.c
index 6c542d54edcbd..6566c0c266082 100644
--- a/demos/kdf/argon2.c
+++ b/demos/kdf/argon2.c
@@ -61,15 +61,15 @@ static unsigned char ad[] = {
 /*
  * Argon2 cost parameters
  */
-static uint32_t memory_cost    = 32;
-static uint32_t iteration_cost =  3;
-static uint32_t parallel_cost  =  4;
+static uint32_t memory_cost = 32;
+static uint32_t iteration_cost = 3;
+static uint32_t parallel_cost = 4;
 
 static const unsigned char expected_output[] = {
-   0x0d, 0x64, 0x0d, 0xf5, 0x8d, 0x78, 0x76, 0x6c,
-   0x08, 0xc0, 0x37, 0xa3, 0x4a, 0x8b, 0x53, 0xc9,
-   0xd0, 0x1e, 0xf0, 0x45, 0x2d, 0x75, 0xb6, 0x5e,
-   0xb5, 0x25, 0x20, 0xe9, 0x6b, 0x01, 0xe6, 0x59
+    0x0d, 0x64, 0x0d, 0xf5, 0x8d, 0x78, 0x76, 0x6c,
+    0x08, 0xc0, 0x37, 0xa3, 0x4a, 0x8b, 0x53, 0xc9,
+    0xd0, 0x1e, 0xf0, 0x45, 0x2d, 0x75, 0xb6, 0x5e,
+    0xb5, 0x25, 0x20, 0xe9, 0x6b, 0x01, 0xe6, 0x59
 };
 
 int main(int argc, char **argv)
diff --git a/demos/kdf/hkdf.c b/demos/kdf/hkdf.c
index 9818d61afe6b8..4cdc3a2d2a916 100644
--- a/demos/kdf/hkdf.c
+++ b/demos/kdf/hkdf.c
@@ -72,16 +72,16 @@ int main(int argc, char **argv)
 
     /* Set the underlying hash function used to derive the key */
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            "SHA256", 0);
+        "SHA256", 0);
     /* Set input keying material */
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, hkdf_ikm,
-                                             sizeof(hkdf_ikm));
+        sizeof(hkdf_ikm));
     /* Set application specific information */
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, hkdf_info,
-                                             sizeof(hkdf_info));
+        sizeof(hkdf_info));
     /* Set salt */
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT, hkdf_salt,
-                                             sizeof(hkdf_salt));
+        sizeof(hkdf_salt));
     *p = OSSL_PARAM_construct_end();
 
     /* Derive the key */
diff --git a/demos/kdf/pbkdf2.c b/demos/kdf/pbkdf2.c
index 28a075513c251..8a42aae8cb289 100644
--- a/demos/kdf/pbkdf2.c
+++ b/demos/kdf/pbkdf2.c
@@ -86,15 +86,15 @@ int main(int argc, char **argv)
 
     /* Set password */
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD, password,
-                                             sizeof(password));
+        sizeof(password));
     /* Set salt */
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT, pbkdf2_salt,
-                                             sizeof(pbkdf2_salt));
+        sizeof(pbkdf2_salt));
     /* Set iteration count (default 2048) */
     *p++ = OSSL_PARAM_construct_uint(OSSL_KDF_PARAM_ITER, &pbkdf2_iterations);
     /* Set the underlying hash function used to derive the key */
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            "SHA256", 0);
+        "SHA256", 0);
     *p = OSSL_PARAM_construct_end();
 
     /* Derive the key */
diff --git a/demos/kdf/scrypt.c b/demos/kdf/scrypt.c
index a1c33f59638b4..d86871273bc1b 100644
--- a/demos/kdf/scrypt.c
+++ b/demos/kdf/scrypt.c
@@ -88,10 +88,10 @@ int main(int argc, char **argv)
 
     /* Set password */
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD, password,
-                                             sizeof(password));
+        sizeof(password));
     /* Set salt */
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT, scrypt_salt,
-                                             sizeof(scrypt_salt));
+        sizeof(scrypt_salt));
     /* Set N (default 1048576) */
     *p++ = OSSL_PARAM_construct_uint(OSSL_KDF_PARAM_SCRYPT_N, &scrypt_n);
     /* Set R (default 8) */
diff --git a/demos/keyexch/ecdh.c b/demos/keyexch/ecdh.c
index 908fc4cd45390..c04889324030c 100644
--- a/demos/keyexch/ecdh.c
+++ b/demos/keyexch/ecdh.c
@@ -25,11 +25,11 @@
 
 /* Object used to store information for a single Peer */
 typedef struct peer_data_st {
-    const char *name;               /* name of peer */
-    const char *curvename;          /* The shared curve name */
-    EVP_PKEY *priv;                 /* private keypair */
-    EVP_PKEY *pub;                  /* public key to send to other peer */
-    unsigned char *secret;          /* allocated shared secret buffer */
+    const char *name; /* name of peer */
+    const char *curvename; /* The shared curve name */
+    EVP_PKEY *priv; /* private keypair */
+    EVP_PKEY *pub; /* public key to send to other peer */
+    unsigned char *secret; /* allocated shared secret buffer */
     size_t secretlen;
 } PEER_DATA;
 
@@ -48,8 +48,8 @@ static int get_peer_public_key(PEER_DATA *peer, OSSL_LIB_CTX *libctx)
 
     /* Get the EC encoded public key data from the peers private key */
     if (!EVP_PKEY_get_octet_string_param(peer->priv, OSSL_PKEY_PARAM_PUB_KEY,
-                                         pubkeydata, sizeof(pubkeydata),
-                                         &pubkeylen))
+            pubkeydata, sizeof(pubkeydata),
+            &pubkeylen))
         return 0;
 
     /* Create a EC public key from the public key data */
@@ -57,13 +57,14 @@ static int get_peer_public_key(PEER_DATA *peer, OSSL_LIB_CTX *libctx)
     if (ctx == NULL)
         return 0;
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                 (char *)peer->curvename, 0);
+        (char *)peer->curvename, 0);
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_PUB_KEY,
-                                                  pubkeydata, pubkeylen);
+        pubkeydata, pubkeylen);
     params[2] = OSSL_PARAM_construct_end();
     ret = EVP_PKEY_fromdata_init(ctx) > 0
-          && (EVP_PKEY_fromdata(ctx, &peer->pub, EVP_PKEY_PUBLIC_KEY,
-                                params) > 0);
+        && (EVP_PKEY_fromdata(ctx, &peer->pub, EVP_PKEY_PUBLIC_KEY,
+                params)
+            > 0);
     EVP_PKEY_CTX_free(ctx);
     return ret;
 }
@@ -75,7 +76,7 @@ static int create_peer(PEER_DATA *peer, OSSL_LIB_CTX *libctx)
     OSSL_PARAM params[2];
 
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                 (char *)peer->curvename, 0);
+        (char *)peer->curvename, 0);
     params[1] = OSSL_PARAM_construct_end();
 
     ctx = EVP_PKEY_CTX_new_from_name(libctx, "EC", NULL);
@@ -83,9 +84,9 @@ static int create_peer(PEER_DATA *peer, OSSL_LIB_CTX *libctx)
         return 0;
 
     if (EVP_PKEY_keygen_init(ctx) <= 0
-            || !EVP_PKEY_CTX_set_params(ctx, params)
-            || EVP_PKEY_generate(ctx, &peer->priv) <= 0
-            || !get_peer_public_key(peer, libctx)) {
+        || !EVP_PKEY_CTX_set_params(ctx, params)
+        || EVP_PKEY_generate(ctx, &peer->priv) <= 0
+        || !get_peer_public_key(peer, libctx)) {
         EVP_PKEY_free(peer->priv);
         peer->priv = NULL;
         goto err;
@@ -103,7 +104,7 @@ static void destroy_peer(PEER_DATA *peer)
 }
 
 static int generate_secret(PEER_DATA *peerA, EVP_PKEY *peerBpub,
-                           OSSL_LIB_CTX *libctx)
+    OSSL_LIB_CTX *libctx)
 {
     unsigned char *secret = NULL;
     size_t secretlen = 0;
@@ -177,8 +178,8 @@ int main(void)
 {
     int ret = EXIT_FAILURE;
     /* Initialise the 2 peers that will share a secret */
-    PEER_DATA peer1 = {"peer 1", "P-256"};
-    PEER_DATA peer2 = {"peer 2", "P-256"};
+    PEER_DATA peer1 = { "peer 1", "P-256" };
+    PEER_DATA peer2 = { "peer 2", "P-256" };
     /*
      * Setting libctx to NULL uses the default library context
      * Use OSSL_LIB_CTX_new() to create a non default library context
@@ -187,7 +188,7 @@ int main(void)
 
     /* Each peer creates a (Ephemeral) keypair */
     if (!create_peer(&peer1, libctx)
-            || !create_peer(&peer2, libctx)) {
+        || !create_peer(&peer2, libctx)) {
         fprintf(stderr, "Create peer failed\n");
         goto cleanup;
     }
@@ -197,14 +198,14 @@ int main(void)
      * derive a shared secret
      */
     if (!generate_secret(&peer1, peer2.pub, libctx)
-            || !generate_secret(&peer2, peer1.pub, libctx)) {
+        || !generate_secret(&peer2, peer1.pub, libctx)) {
         fprintf(stderr, "Generate secrets failed\n");
         goto cleanup;
     }
 
     /* For illustrative purposes demonstrate that the derived secrets are equal */
     if (peer1.secretlen != peer2.secretlen
-            || CRYPTO_memcmp(peer1.secret, peer2.secret, peer1.secretlen) != 0) {
+        || CRYPTO_memcmp(peer1.secret, peer2.secret, peer1.secretlen) != 0) {
         fprintf(stderr, "Derived secrets do not match\n");
         goto cleanup;
     } else {
diff --git a/demos/keyexch/x25519.c b/demos/keyexch/x25519.c
index f0fb160a2fa43..43bdc01bec683 100644
--- a/demos/keyexch/x25519.c
+++ b/demos/keyexch/x25519.c
@@ -48,11 +48,11 @@ static const unsigned char expected_result[32] = {
 };
 
 typedef struct peer_data_st {
-    const char *name;               /* name of peer */
-    EVP_PKEY *privk;                /* privk generated for peer */
-    unsigned char pubk_data[32];    /* generated pubk to send to other peer */
+    const char *name; /* name of peer */
+    EVP_PKEY *privk; /* privk generated for peer */
+    unsigned char pubk_data[32]; /* generated pubk to send to other peer */
 
-    unsigned char *secret;          /* allocated shared secret buffer */
+    unsigned char *secret; /* allocated shared secret buffer */
     size_t secret_len;
 } PEER_DATA;
 
@@ -70,10 +70,9 @@ static int keyexch_x25519_before(
 
     /* Generate or load X25519 key for the peer */
     if (kat_privk_data != NULL)
-        local_peer->privk =
-            EVP_PKEY_new_raw_private_key_ex(libctx, "X25519", propq,
-                                            kat_privk_data,
-                                            sizeof(peer1_privk_data));
+        local_peer->privk = EVP_PKEY_new_raw_private_key_ex(libctx, "X25519", propq,
+            kat_privk_data,
+            sizeof(peer1_privk_data));
     else
         local_peer->privk = EVP_PKEY_Q_keygen(libctx, propq, "X25519");
 
@@ -84,10 +83,11 @@ static int keyexch_x25519_before(
 
     /* Get public key corresponding to the private key */
     if (EVP_PKEY_get_octet_string_param(local_peer->privk,
-                                        OSSL_PKEY_PARAM_PUB_KEY,
-                                        local_peer->pubk_data,
-                                        sizeof(local_peer->pubk_data),
-                                        &pubk_data_len) == 0) {
+            OSSL_PKEY_PARAM_PUB_KEY,
+            local_peer->pubk_data,
+            sizeof(local_peer->pubk_data),
+            &pubk_data_len)
+        == 0) {
         fprintf(stderr, "EVP_PKEY_get_octet_string_param() failed\n");
         goto end;
     }
@@ -95,7 +95,7 @@ static int keyexch_x25519_before(
     /* X25519 public keys are always 32 bytes */
     if (pubk_data_len != 32) {
         fprintf(stderr, "EVP_PKEY_get_octet_string_param() "
-                "yielded wrong length\n");
+                        "yielded wrong length\n");
         goto end;
     }
 
@@ -127,9 +127,8 @@ static int keyexch_x25519_after(
     local_peer->secret = NULL;
 
     /* Load public key for remote peer. */
-    remote_peer_pubk =
-        EVP_PKEY_new_raw_public_key_ex(libctx, "X25519", propq,
-                                       remote_peer_pubk_data, 32);
+    remote_peer_pubk = EVP_PKEY_new_raw_public_key_ex(libctx, "X25519", propq,
+        remote_peer_pubk_data, 32);
     if (remote_peer_pubk == NULL) {
         fprintf(stderr, "EVP_PKEY_new_raw_public_key_ex() failed\n");
         goto end;
@@ -179,7 +178,8 @@ static int keyexch_x25519_after(
 
     /* Derive the shared secret. */
     if (EVP_PKEY_derive(ctx, local_peer->secret,
-                        &local_peer->secret_len) == 0) {
+            &local_peer->secret_len)
+        == 0) {
         fprintf(stderr, "EVP_PKEY_derive() failed\n");
         goto end;
     }
@@ -204,7 +204,7 @@ static int keyexch_x25519(int use_kat)
 {
     int ret = 0;
     OSSL_LIB_CTX *libctx = NULL;
-    PEER_DATA peer1 = {"peer 1"}, peer2 = {"peer 2"};
+    PEER_DATA peer1 = { "peer 1" }, peer2 = { "peer 2" };
 
     /*
      * Each peer generates its private key and sends its public key
@@ -212,11 +212,13 @@ static int keyexch_x25519(int use_kat)
      * later use.
      */
     if (keyexch_x25519_before(libctx, use_kat ? peer1_privk_data : NULL,
-                              &peer1) == 0)
+            &peer1)
+        == 0)
         return 0;
 
     if (keyexch_x25519_before(libctx, use_kat ? peer2_privk_data : NULL,
-                              &peer2) == 0)
+            &peer2)
+        == 0)
         return 0;
 
     /*
@@ -244,8 +246,7 @@ static int keyexch_x25519(int use_kat)
     }
 
     /* If we are doing the KAT, the secret should equal our reference result. */
-    if (use_kat && CRYPTO_memcmp(peer1.secret, expected_result,
-                                 peer1.secret_len) != 0) {
+    if (use_kat && CRYPTO_memcmp(peer1.secret, expected_result, peer1.secret_len) != 0) {
         fprintf(stderr, "Did not get expected result\n");
         goto end;
     }
diff --git a/demos/mac/cmac-aes256.c b/demos/mac/cmac-aes256.c
index 64069cf3a8296..d091db714899e 100644
--- a/demos/mac/cmac-aes256.c
+++ b/demos/mac/cmac-aes256.c
@@ -26,36 +26,76 @@
  * It is done here solely for educational purposes.
  */
 static unsigned char key[] = {
-    0x6c, 0xde, 0x14, 0xf5, 0xd5, 0x2a, 0x4a, 0xdf,
-    0x12, 0x39, 0x1e, 0xbf, 0x36, 0xf9, 0x6a, 0x46,
-    0x48, 0xd0, 0xb6, 0x51, 0x89, 0xfc, 0x24, 0x85,
-    0xa8, 0x8d, 0xdf, 0x7e, 0x80, 0x14, 0xc8, 0xce,
+    0x6c,
+    0xde,
+    0x14,
+    0xf5,
+    0xd5,
+    0x2a,
+    0x4a,
+    0xdf,
+    0x12,
+    0x39,
+    0x1e,
+    0xbf,
+    0x36,
+    0xf9,
+    0x6a,
+    0x46,
+    0x48,
+    0xd0,
+    0xb6,
+    0x51,
+    0x89,
+    0xfc,
+    0x24,
+    0x85,
+    0xa8,
+    0x8d,
+    0xdf,
+    0x7e,
+    0x80,
+    0x14,
+    0xc8,
+    0xce,
 };
 
-static const unsigned char data[] =
-    "To be, or not to be, that is the question,\n"
-    "Whether tis nobler in the minde to suffer\n"
-    "The ſlings and arrowes of outragious fortune,\n"
-    "Or to take Armes again in a sea of troubles,\n"
-    "And by opposing, end them, to die to sleep;\n"
-    "No more, and by a sleep, to say we end\n"
-    "The heart-ache, and the thousand natural shocks\n"
-    "That flesh is heir to? tis a consumation\n"
-    "Devoutly to be wished. To die to sleep,\n"
-    "To sleepe, perchance to dreame, Aye, there's the rub,\n"
-    "For in that sleep of death what dreams may come\n"
-    "When we haue shuffled off this mortal coil\n"
-    "Must give us pause. There's the respect\n"
-    "That makes calamity of so long life:\n"
-    "For who would bear the Ships and Scorns of time,\n"
-    "The oppressor's wrong, the proud man's Contumely,\n"
-    "The pangs of dispised love, the Law's delay,\n"
-;
+static const unsigned char data[] = "To be, or not to be, that is the question,\n"
+                                    "Whether tis nobler in the minde to suffer\n"
+                                    "The ſlings and arrowes of outragious fortune,\n"
+                                    "Or to take Armes again in a sea of troubles,\n"
+                                    "And by opposing, end them, to die to sleep;\n"
+                                    "No more, and by a sleep, to say we end\n"
+                                    "The heart-ache, and the thousand natural shocks\n"
+                                    "That flesh is heir to? tis a consumation\n"
+                                    "Devoutly to be wished. To die to sleep,\n"
+                                    "To sleepe, perchance to dreame, Aye, there's the rub,\n"
+                                    "For in that sleep of death what dreams may come\n"
+                                    "When we haue shuffled off this mortal coil\n"
+                                    "Must give us pause. There's the respect\n"
+                                    "That makes calamity of so long life:\n"
+                                    "For who would bear the Ships and Scorns of time,\n"
+                                    "The oppressor's wrong, the proud man's Contumely,\n"
+                                    "The pangs of dispised love, the Law's delay,\n";
 
 /* The known value of the CMAC/AES256 MAC of the above soliloqy */
 static const unsigned char expected_output[] = {
-    0x67, 0x92, 0x32, 0x23, 0x50, 0x3d, 0xc5, 0xba,
-    0x78, 0xd4, 0x6d, 0x63, 0xf2, 0x2b, 0xe9, 0x56,
+    0x67,
+    0x92,
+    0x32,
+    0x23,
+    0x50,
+    0x3d,
+    0xc5,
+    0xba,
+    0x78,
+    0xd4,
+    0x6d,
+    0x63,
+    0xf2,
+    0x2b,
+    0xe9,
+    0x56,
 };
 
 /*
@@ -96,7 +136,7 @@ int main(void)
 
     /* The underlying cipher to be used */
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_CIPHER, cipher_name,
-                                            sizeof(cipher_name));
+        sizeof(cipher_name));
     *p = OSSL_PARAM_construct_end();
 
     /* Initialise the CMAC operation */
diff --git a/demos/mac/gmac.c b/demos/mac/gmac.c
index d4e350a2da65a..a8ae2eb0c5c3d 100644
--- a/demos/mac/gmac.c
+++ b/demos/mac/gmac.c
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
 
     /* GMAC requires a GCM mode cipher to be specified */
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_CIPHER,
-                                            "AES-128-GCM", 0);
+        "AES-128-GCM", 0);
 
     /*
      * If a non-default property query is required when fetching the GCM mode
@@ -95,11 +95,11 @@ int main(int argc, char **argv)
      */
     if (propq != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_PROPERTIES,
-                                                propq, 0);
+            propq, 0);
 
     /* Set the initialisation vector (IV) */
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_IV,
-                                             iv, sizeof(iv));
+        iv, sizeof(iv));
     *p = OSSL_PARAM_construct_end();
 
     /* Initialise the GMAC operation */
diff --git a/demos/mac/hmac-sha512.c b/demos/mac/hmac-sha512.c
index 47b5246a19abc..084c907778fca 100644
--- a/demos/mac/hmac-sha512.c
+++ b/demos/mac/hmac-sha512.c
@@ -26,46 +26,156 @@
  * It is done here solely for educational purposes.
  */
 static unsigned char key[] = {
-    0x25, 0xfd, 0x12, 0x99, 0xdf, 0xad, 0x1a, 0x03,
-    0x0a, 0x81, 0x3c, 0x2d, 0xcc, 0x05, 0xd1, 0x5c,
-    0x17, 0x7a, 0x36, 0x73, 0x17, 0xef, 0x41, 0x75,
-    0x71, 0x18, 0xe0, 0x1a, 0xda, 0x99, 0xc3, 0x61,
-    0x38, 0xb5, 0xb1, 0xe0, 0x82, 0x2c, 0x70, 0xa4,
-    0xc0, 0x8e, 0x5e, 0xf9, 0x93, 0x9f, 0xcf, 0xf7,
-    0x32, 0x4d, 0x0c, 0xbd, 0x31, 0x12, 0x0f, 0x9a,
-    0x15, 0xee, 0x82, 0xdb, 0x8d, 0x29, 0x54, 0x14,
+    0x25,
+    0xfd,
+    0x12,
+    0x99,
+    0xdf,
+    0xad,
+    0x1a,
+    0x03,
+    0x0a,
+    0x81,
+    0x3c,
+    0x2d,
+    0xcc,
+    0x05,
+    0xd1,
+    0x5c,
+    0x17,
+    0x7a,
+    0x36,
+    0x73,
+    0x17,
+    0xef,
+    0x41,
+    0x75,
+    0x71,
+    0x18,
+    0xe0,
+    0x1a,
+    0xda,
+    0x99,
+    0xc3,
+    0x61,
+    0x38,
+    0xb5,
+    0xb1,
+    0xe0,
+    0x82,
+    0x2c,
+    0x70,
+    0xa4,
+    0xc0,
+    0x8e,
+    0x5e,
+    0xf9,
+    0x93,
+    0x9f,
+    0xcf,
+    0xf7,
+    0x32,
+    0x4d,
+    0x0c,
+    0xbd,
+    0x31,
+    0x12,
+    0x0f,
+    0x9a,
+    0x15,
+    0xee,
+    0x82,
+    0xdb,
+    0x8d,
+    0x29,
+    0x54,
+    0x14,
 };
 
-static const unsigned char data[] =
-    "To be, or not to be, that is the question,\n"
-    "Whether tis nobler in the minde to suffer\n"
-    "The ſlings and arrowes of outragious fortune,\n"
-    "Or to take Armes again in a sea of troubles,\n"
-    "And by opposing, end them, to die to sleep;\n"
-    "No more, and by a sleep, to say we end\n"
-    "The heart-ache, and the thousand natural shocks\n"
-    "That flesh is heir to? tis a consumation\n"
-    "Devoutly to be wished. To die to sleep,\n"
-    "To sleepe, perchance to dreame, Aye, there's the rub,\n"
-    "For in that sleep of death what dreams may come\n"
-    "When we haue shuffled off this mortal coil\n"
-    "Must give us pause. There's the respect\n"
-    "That makes calamity of so long life:\n"
-    "For who would bear the Ships and Scorns of time,\n"
-    "The oppressor's wrong, the proud man's Contumely,\n"
-    "The pangs of dispised love, the Law's delay,\n"
-;
+static const unsigned char data[] = "To be, or not to be, that is the question,\n"
+                                    "Whether tis nobler in the minde to suffer\n"
+                                    "The ſlings and arrowes of outragious fortune,\n"
+                                    "Or to take Armes again in a sea of troubles,\n"
+                                    "And by opposing, end them, to die to sleep;\n"
+                                    "No more, and by a sleep, to say we end\n"
+                                    "The heart-ache, and the thousand natural shocks\n"
+                                    "That flesh is heir to? tis a consumation\n"
+                                    "Devoutly to be wished. To die to sleep,\n"
+                                    "To sleepe, perchance to dreame, Aye, there's the rub,\n"
+                                    "For in that sleep of death what dreams may come\n"
+                                    "When we haue shuffled off this mortal coil\n"
+                                    "Must give us pause. There's the respect\n"
+                                    "That makes calamity of so long life:\n"
+                                    "For who would bear the Ships and Scorns of time,\n"
+                                    "The oppressor's wrong, the proud man's Contumely,\n"
+                                    "The pangs of dispised love, the Law's delay,\n";
 
 /* The known value of the HMAC/SHA3-512 MAC of the above soliloqy */
 static const unsigned char expected_output[] = {
-    0x3b, 0x77, 0x5f, 0xf1, 0x4f, 0x9e, 0xb9, 0x23,
-    0x8f, 0xdc, 0xa0, 0x68, 0x15, 0x7b, 0x8a, 0xf1,
-    0x96, 0x23, 0xaa, 0x3c, 0x1f, 0xe9, 0xdc, 0x89,
-    0x11, 0x7d, 0x58, 0x07, 0xe7, 0x96, 0x17, 0xe3,
-    0x44, 0x8b, 0x03, 0x37, 0x91, 0xc0, 0x6e, 0x06,
-    0x7c, 0x54, 0xe4, 0xa4, 0xcc, 0xd5, 0x16, 0xbb,
-    0x5e, 0x4d, 0x64, 0x7d, 0x88, 0x23, 0xc9, 0xb7,
-    0x25, 0xda, 0xbe, 0x4b, 0xe4, 0xd5, 0x34, 0x30,
+    0x3b,
+    0x77,
+    0x5f,
+    0xf1,
+    0x4f,
+    0x9e,
+    0xb9,
+    0x23,
+    0x8f,
+    0xdc,
+    0xa0,
+    0x68,
+    0x15,
+    0x7b,
+    0x8a,
+    0xf1,
+    0x96,
+    0x23,
+    0xaa,
+    0x3c,
+    0x1f,
+    0xe9,
+    0xdc,
+    0x89,
+    0x11,
+    0x7d,
+    0x58,
+    0x07,
+    0xe7,
+    0x96,
+    0x17,
+    0xe3,
+    0x44,
+    0x8b,
+    0x03,
+    0x37,
+    0x91,
+    0xc0,
+    0x6e,
+    0x06,
+    0x7c,
+    0x54,
+    0xe4,
+    0xa4,
+    0xcc,
+    0xd5,
+    0x16,
+    0xbb,
+    0x5e,
+    0x4d,
+    0x64,
+    0x7d,
+    0x88,
+    0x23,
+    0xc9,
+    0xb7,
+    0x25,
+    0xda,
+    0xbe,
+    0x4b,
+    0xe4,
+    0xd5,
+    0x34,
+    0x30,
 };
 
 /*
@@ -107,7 +217,7 @@ int main(void)
 
     /* The underlying digest to be used */
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, digest_name,
-                                            sizeof(digest_name));
+        sizeof(digest_name));
     *p = OSSL_PARAM_construct_end();
 
     /* Initialise the HMAC operation */
diff --git a/demos/mac/poly1305.c b/demos/mac/poly1305.c
index 15c9c0097d97f..d5f4807c15e5d 100644
--- a/demos/mac/poly1305.c
+++ b/demos/mac/poly1305.c
@@ -151,7 +151,7 @@ int main(int argc, char **argv)
      * computation below.
      */
     if (!EVP_EncryptUpdate(aesctx, composite_key + 16, &aes_len,
-                           test_n, sizeof(test_n))) {
+            test_n, sizeof(test_n))) {
         fprintf(stderr, "EVP_EncryptUpdate() failed\n");
         goto end;
     }
diff --git a/demos/pkcs12/pkread.c b/demos/pkcs12/pkread.c
index 7deeef9ef0096..29bd9b21e19f7 100644
--- a/demos/pkcs12/pkread.c
+++ b/demos/pkcs12/pkread.c
@@ -30,7 +30,7 @@ static char *find_friendly_name(PKCS12 *p12)
     for (n = 0; n < sk_PKCS7_num(safes) && name == NULL; n++) {
         safe = sk_PKCS7_value(safes, n);
         if (OBJ_obj2nid(safe->type) != NID_pkcs7_data
-                || (bags = PKCS12_unpack_p7data(safe)) == NULL)
+            || (bags = PKCS12_unpack_p7data(safe)) == NULL)
             continue;
 
         for (m = 0; m < sk_PKCS12_SAFEBAG_num(bags) && name == NULL; m++) {
@@ -101,7 +101,7 @@ int main(int argc, char **argv)
 
     ret = EXIT_SUCCESS;
 
- err:
+err:
     OPENSSL_free(name);
     X509_free(cert);
     EVP_PKEY_free(pkey);
diff --git a/demos/pkey/EVP_PKEY_DSA_keygen.c b/demos/pkey/EVP_PKEY_DSA_keygen.c
index c335752a7fb15..1c38988dbbe7f 100644
--- a/demos/pkey/EVP_PKEY_DSA_keygen.c
+++ b/demos/pkey/EVP_PKEY_DSA_keygen.c
@@ -34,7 +34,7 @@ static EVP_PKEY *dsa_genparams(OSSL_LIB_CTX *libctx, const char *propq)
     }
 
     if (EVP_PKEY_paramgen_init(ctx) <= 0
-            || EVP_PKEY_paramgen(ctx, &dsaparamkey) <= 0) {
+        || EVP_PKEY_paramgen(ctx, &dsaparamkey) <= 0) {
         fprintf(stderr, "DSA paramgen failed\n");
         goto cleanup;
     }
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
 
     /* Generate a key using the dsa params */
     if (EVP_PKEY_keygen_init(ctx) <= 0
-            || EVP_PKEY_keygen(ctx, &dsakey) <= 0) {
+        || EVP_PKEY_keygen(ctx, &dsakey) <= 0) {
         fprintf(stderr, "DSA keygen failed\n");
         goto cleanup;
     }
diff --git a/demos/pkey/EVP_PKEY_DSA_paramfromdata.c b/demos/pkey/EVP_PKEY_DSA_paramfromdata.c
index ec7d69d54389d..62de0af8e5395 100644
--- a/demos/pkey/EVP_PKEY_DSA_paramfromdata.c
+++ b/demos/pkey/EVP_PKEY_DSA_paramfromdata.c
@@ -39,8 +39,8 @@ int main(int argc, char **argv)
     if (bld == NULL)
         goto cleanup;
     if (!OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_P, p)
-            || !OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_Q, q)
-            || !OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_G, g))
+        || !OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_Q, q)
+        || !OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_G, g))
         goto cleanup;
     params = OSSL_PARAM_BLD_to_param(bld);
     if (params == NULL)
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
     }
 
     if (EVP_PKEY_fromdata_init(ctx) <= 0
-            || EVP_PKEY_fromdata(ctx, &dsaparamkey, EVP_PKEY_KEY_PARAMETERS, params) <= 0) {
+        || EVP_PKEY_fromdata(ctx, &dsaparamkey, EVP_PKEY_KEY_PARAMETERS, params) <= 0) {
         fprintf(stderr, "EVP_PKEY_fromdata() failed\n");
         goto cleanup;
     }
diff --git a/demos/pkey/EVP_PKEY_DSA_paramgen.c b/demos/pkey/EVP_PKEY_DSA_paramgen.c
index ad879f0d7f8cc..6e4b17534d872 100644
--- a/demos/pkey/EVP_PKEY_DSA_paramgen.c
+++ b/demos/pkey/EVP_PKEY_DSA_paramgen.c
@@ -37,20 +37,20 @@ int main(int argc, char **argv)
      * for more information.
      */
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_TYPE,
-                                                 "fips186_4", 0);
+        "fips186_4", 0);
     params[1] = OSSL_PARAM_construct_uint(OSSL_PKEY_PARAM_FFC_PBITS, &pbits);
     params[2] = OSSL_PARAM_construct_uint(OSSL_PKEY_PARAM_FFC_QBITS, &qbits);
     params[3] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_FFC_GINDEX, &gindex);
     params[4] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_DIGEST,
-                                                 "SHA384", 0);
+        "SHA384", 0);
     params[5] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_DIGEST_PROPS,
-                                                 "provider=default", 0);
+        "provider=default", 0);
     params[6] = OSSL_PARAM_construct_end();
 
     /* Generate a dsa param key using optional params */
     if (EVP_PKEY_paramgen_init(ctx) <= 0
-            || EVP_PKEY_CTX_set_params(ctx, params) <= 0
-            || EVP_PKEY_paramgen(ctx, &dsaparamkey) <= 0) {
+        || EVP_PKEY_CTX_set_params(ctx, params) <= 0
+        || EVP_PKEY_paramgen(ctx, &dsaparamkey) <= 0) {
         fprintf(stderr, "DSA paramgen failed\n");
         goto cleanup;
     }
diff --git a/demos/pkey/EVP_PKEY_DSA_paramvalidate.c b/demos/pkey/EVP_PKEY_DSA_paramvalidate.c
index ac7e7905f6f95..9a34a4b3e8fa6 100644
--- a/demos/pkey/EVP_PKEY_DSA_paramvalidate.c
+++ b/demos/pkey/EVP_PKEY_DSA_paramvalidate.c
@@ -27,26 +27,24 @@
 #include "dsa.inc"
 
 /* The following values were output from the EVP_PKEY_DSA_paramgen demo */
-static const char dsapem[] =
-    "-----BEGIN DSA PARAMETERS-----\n"
-    "MIICLAKCAQEA1pobSR1FJ3+Tvi0J6Tk1PSV2owZey1Nuo847hGw/59VCS6RPQEqr\n"
-    "vp5fhbvBjupBeVGA/AMH6rI4i4h6jlhurrqH1CqUHVcDhJzxV668bMLiP3mIxg5o\n"
-    "9Yq8x6BnSOtH5Je0tpeE0/fEvvLjCwBUbwnwWxzjANcvDUEt9XYeRrtB2v52fr56\n"
-    "hVYz3wMMNog4CEDOLTvx7/84eVPuUeWDRQFH1EaHMdulP34KBcatEEpEZapkepng\n"
-    "nohm9sFSPQhq2utpkH7pNXdG0EILBtRDCvUpF5720a48LYofdggh2VEZfgElAGFk\n"
-    "dW/CkvyBDmGIzil5aTz4MMsdudaVYgzt6wIhAPsSGC42Qa+X0AFGvonb5nmfUVm/\n"
-    "8aC+tHk7Nb2AYLHXAoIBADx5C0H1+QHsmGKvuOaY+WKUt7aWUrEivD1zBMJAQ6bL\n"
-    "Wv9lbCq1CFHvVzojeOVpn872NqDEpkx4HTpvqhxWL5CkbN/HaGItsQzkD59AQg3v\n"
-    "4YsLlkesq9Jq6x/aWetJXWO36fszFv1gpD3NY3wliBvMYHx62jfc5suh9D3ZZvu7\n"
-    "PLGH4X4kcfzK/R2b0oVbEBjVTe5GMRYZRqnvfSW2f2fA7BzI1OL83UxDDe58cL2M\n"
-    "GcAoUYXOBAfZ37qLMm2juf+o5gCrT4CXfRPu6kbapt7V/YIc1nsNgeAOKKoFBHBQ\n"
-    "gc5u5G6G/j79FVoSDq9DYwTJcHPsU+eHj1uWHso1AjQ=\n"
-    "-----END DSA PARAMETERS-----\n";
-
-static const char hexseed[] =
-    "cba30ccd905aa7675a0b81769704bf3c"
-    "ccf2ca1892b2eaf6b9e2b38d9bf6affc"
-    "42ada55986d8a1772b442770954d0b65";
+static const char dsapem[] = "-----BEGIN DSA PARAMETERS-----\n"
+                             "MIICLAKCAQEA1pobSR1FJ3+Tvi0J6Tk1PSV2owZey1Nuo847hGw/59VCS6RPQEqr\n"
+                             "vp5fhbvBjupBeVGA/AMH6rI4i4h6jlhurrqH1CqUHVcDhJzxV668bMLiP3mIxg5o\n"
+                             "9Yq8x6BnSOtH5Je0tpeE0/fEvvLjCwBUbwnwWxzjANcvDUEt9XYeRrtB2v52fr56\n"
+                             "hVYz3wMMNog4CEDOLTvx7/84eVPuUeWDRQFH1EaHMdulP34KBcatEEpEZapkepng\n"
+                             "nohm9sFSPQhq2utpkH7pNXdG0EILBtRDCvUpF5720a48LYofdggh2VEZfgElAGFk\n"
+                             "dW/CkvyBDmGIzil5aTz4MMsdudaVYgzt6wIhAPsSGC42Qa+X0AFGvonb5nmfUVm/\n"
+                             "8aC+tHk7Nb2AYLHXAoIBADx5C0H1+QHsmGKvuOaY+WKUt7aWUrEivD1zBMJAQ6bL\n"
+                             "Wv9lbCq1CFHvVzojeOVpn872NqDEpkx4HTpvqhxWL5CkbN/HaGItsQzkD59AQg3v\n"
+                             "4YsLlkesq9Jq6x/aWetJXWO36fszFv1gpD3NY3wliBvMYHx62jfc5suh9D3ZZvu7\n"
+                             "PLGH4X4kcfzK/R2b0oVbEBjVTe5GMRYZRqnvfSW2f2fA7BzI1OL83UxDDe58cL2M\n"
+                             "GcAoUYXOBAfZ37qLMm2juf+o5gCrT4CXfRPu6kbapt7V/YIc1nsNgeAOKKoFBHBQ\n"
+                             "gc5u5G6G/j79FVoSDq9DYwTJcHPsU+eHj1uWHso1AjQ=\n"
+                             "-----END DSA PARAMETERS-----\n";
+
+static const char hexseed[] = "cba30ccd905aa7675a0b81769704bf3c"
+                              "ccf2ca1892b2eaf6b9e2b38d9bf6affc"
+                              "42ada55986d8a1772b442770954d0b65";
 static const int gindex = 42;
 static const int pcounter = 363;
 static const char digest[] = "SHA384";
@@ -56,7 +54,7 @@ static const char digest[] = "SHA384";
  * plus extra parameters.
  */
 static EVP_PKEY_CTX *create_merged_key(EVP_PKEY *dsaparams, const OSSL_PARAM *newparams,
-                                       OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     EVP_PKEY_CTX *out = NULL;
     EVP_PKEY_CTX *ctx = NULL;
@@ -81,8 +79,9 @@ static EVP_PKEY_CTX *create_merged_key(EVP_PKEY *dsaparams, const OSSL_PARAM *ne
         goto cleanup;
     }
     if (EVP_PKEY_fromdata_init(ctx) <= 0
-            || EVP_PKEY_fromdata(ctx, &pkey,
-                                 EVP_PKEY_KEY_PARAMETERS, mergedparams) <= 0) {
+        || EVP_PKEY_fromdata(ctx, &pkey,
+               EVP_PKEY_KEY_PARAMETERS, mergedparams)
+            <= 0) {
         fprintf(stderr, "EVP_PKEY_fromdata() failed\n");
         goto cleanup;
     }
@@ -154,10 +153,10 @@ int main(int argc, char **argv)
      * For illustration purposes it deliberately omits a required parameter.
      */
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_TYPE,
-                                                "fips186_4", 0);
+        "fips186_4", 0);
     /* Force it to do a proper validation by setting the seed */
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_FFC_SEED,
-                                                  (void *)seed, seedlen);
+        (void *)seed, seedlen);
     params[2] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_FFC_GINDEX, (int *)&gindex);
     params[3] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_FFC_PCOUNTER, (int *)&pcounter);
     params[4] = OSSL_PARAM_construct_end();
@@ -178,7 +177,7 @@ int main(int argc, char **argv)
      * needed
      */
     params[4] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_DIGEST,
-                                                 (char *)digest, 0);
+        (char *)digest, 0);
     params[5] = OSSL_PARAM_construct_end();
     ctx2 = create_merged_key(dsaparamskey, params, libctx, propq);
     if (ctx2 == NULL)
diff --git a/demos/pkey/EVP_PKEY_EC_keygen.c b/demos/pkey/EVP_PKEY_EC_keygen.c
index 76c6217975e03..c3da08060f1a9 100644
--- a/demos/pkey/EVP_PKEY_EC_keygen.c
+++ b/demos/pkey/EVP_PKEY_EC_keygen.c
@@ -53,13 +53,13 @@ static EVP_PKEY *do_ec_keygen(void)
     }
 
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                 (char *)curvename, 0);
+        (char *)curvename, 0);
     /*
      * This is an optional parameter.
      * For many curves where the cofactor is 1, setting this has no effect.
      */
     params[1] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_USE_COFACTOR_ECDH,
-                                         &use_cofactordh);
+        &use_cofactordh);
     params[2] = OSSL_PARAM_construct_end();
     if (!EVP_PKEY_CTX_set_params(genctx, params)) {
         fprintf(stderr, "EVP_PKEY_CTX_set_params() failed\n");
@@ -92,15 +92,15 @@ static int get_key_values(EVP_PKEY *pkey)
     size_t out_pubkey_len, out_privkey_len = 0;
 
     if (!EVP_PKEY_get_utf8_string_param(pkey, OSSL_PKEY_PARAM_GROUP_NAME,
-                                        out_curvename, sizeof(out_curvename),
-                                        NULL)) {
+            out_curvename, sizeof(out_curvename),
+            NULL)) {
         fprintf(stderr, "Failed to get curve name\n");
         goto cleanup;
     }
 
     if (!EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_PUB_KEY,
-                                        out_pubkey, sizeof(out_pubkey),
-                                        &out_pubkey_len)) {
+            out_pubkey, sizeof(out_pubkey),
+            &out_pubkey_len)) {
         fprintf(stderr, "Failed to get public key\n");
         goto cleanup;
     }
diff --git a/demos/pkey/EVP_PKEY_RSA_keygen.c b/demos/pkey/EVP_PKEY_RSA_keygen.c
index 62dd8405e77be..a889ab6f77d4b 100644
--- a/demos/pkey/EVP_PKEY_RSA_keygen.c
+++ b/demos/pkey/EVP_PKEY_RSA_keygen.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -254,7 +254,7 @@ int main(int argc, char **argv)
 
     if (argc > 1) {
         bits_i = atoi(argv[1]);
-        if (bits < 512) {
+        if (bits_i < 512) {
             fprintf(stderr, "Invalid RSA key size\n");
             return EXIT_FAILURE;
         }
diff --git a/demos/quic/server/server.c b/demos/quic/server/server.c
index 6b26ab845a657..ecd1c8adf822e 100644
--- a/demos/quic/server/server.c
+++ b/demos/quic/server/server.c
@@ -10,10 +10,10 @@
 #include <openssl/ssl.h>
 #include <openssl/quic.h>
 #ifdef _WIN32 /* Windows */
-# include <winsock2.h>
+#include <winsock2.h>
 #else /* Linux/Unix */
-# include <netinet/in.h>
-# include <unistd.h>
+#include <netinet/in.h>
+#include <unistd.h>
 #endif
 #include <assert.h>
 
@@ -30,13 +30,13 @@ static const unsigned char alpn_ossltest[] = {
 
 /* This callback validates and negotiates the desired ALPN on the server side. */
 static int select_alpn(SSL *ssl,
-                       const unsigned char **out, unsigned char *out_len,
-                       const unsigned char *in, unsigned int in_len,
-                       void *arg)
+    const unsigned char **out, unsigned char *out_len,
+    const unsigned char *in, unsigned int in_len,
+    void *arg)
 {
     if (SSL_select_next_proto((unsigned char **)out, out_len,
-                              alpn_ossltest, sizeof(alpn_ossltest), in, in_len)
-            != OPENSSL_NPN_NEGOTIATED)
+            alpn_ossltest, sizeof(alpn_ossltest), in, in_len)
+        != OPENSSL_NPN_NEGOTIATED)
         return SSL_TLSEXT_ERR_ALERT_FATAL;
 
     return SSL_TLSEXT_ERR_OK;
@@ -80,15 +80,15 @@ static SSL_CTX *create_ctx(const char *cert_path, const char *key_path)
 static int create_socket(uint16_t port)
 {
     int fd = -1;
-    struct sockaddr_in sa = {0};
+    struct sockaddr_in sa = { 0 };
 
     if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
         fprintf(stderr, "cannot create socket");
         goto err;
     }
 
-    sa.sin_family  = AF_INET;
-    sa.sin_port    = htons(port);
+    sa.sin_family = AF_INET;
+    sa.sin_port = htons(port);
 
     if (bind(fd, (const struct sockaddr *)&sa, sizeof(sa)) < 0) {
         fprintf(stderr, "cannot bind to %u\n", port);
diff --git a/demos/signature/EVP_DSA_Signature_demo.c b/demos/signature/EVP_DSA_Signature_demo.c
index de1efd2b490c7..191e0a322efc8 100644
--- a/demos/signature/EVP_DSA_Signature_demo.c
+++ b/demos/signature/EVP_DSA_Signature_demo.c
@@ -25,26 +25,22 @@
  * the soliloquy from Hamlet scene 1 act 3
  */
 
-static const char *hamlet_1 =
-    "To be, or not to be, that is the question,\n"
-    "Whether tis nobler in the minde to suffer\n"
-    "The slings and arrowes of outragious fortune,\n"
-    "Or to take Armes again in a sea of troubles,\n"
-;
-static const char *hamlet_2 =
-    "And by opposing, end them, to die to sleep;\n"
-    "No more, and by a sleep, to say we end\n"
-    "The heart-ache, and the thousand natural shocks\n"
-    "That flesh is heir to? tis a consumation\n"
-;
+static const char *hamlet_1 = "To be, or not to be, that is the question,\n"
+                              "Whether tis nobler in the minde to suffer\n"
+                              "The slings and arrowes of outragious fortune,\n"
+                              "Or to take Armes again in a sea of troubles,\n";
+static const char *hamlet_2 = "And by opposing, end them, to die to sleep;\n"
+                              "No more, and by a sleep, to say we end\n"
+                              "The heart-ache, and the thousand natural shocks\n"
+                              "That flesh is heir to? tis a consumation\n";
 
 static const char ALG[] = "DSA";
 static const char DIGEST[] = "SHA256";
 static const int NUMBITS = 2048;
-static const char * const PROPQUERY = NULL;
+static const char *const PROPQUERY = NULL;
 
 static int generate_dsa_params(OSSL_LIB_CTX *libctx,
-                               EVP_PKEY **p_params)
+    EVP_PKEY **p_params)
 {
     int ret = 0;
 
@@ -67,7 +63,7 @@ static int generate_dsa_params(OSSL_LIB_CTX *libctx,
 
     ret = 1;
 end:
-    if(ret != 1) {
+    if (ret != 1) {
         EVP_PKEY_free(params);
         params = NULL;
     }
@@ -81,8 +77,8 @@ static int generate_dsa_params(OSSL_LIB_CTX *libctx,
 }
 
 static int generate_dsa_key(OSSL_LIB_CTX *libctx,
-                            EVP_PKEY *params,
-                            EVP_PKEY **p_pkey)
+    EVP_PKEY *params,
+    EVP_PKEY **p_pkey)
 {
     int ret = 0;
 
@@ -90,7 +86,7 @@ static int generate_dsa_key(OSSL_LIB_CTX *libctx,
     EVP_PKEY *pkey = NULL;
 
     ctx = EVP_PKEY_CTX_new_from_pkey(libctx, params,
-                                     NULL);
+        NULL);
     if (ctx == NULL)
         goto end;
     if (EVP_PKEY_keygen_init(ctx) <= 0)
@@ -103,7 +99,7 @@ static int generate_dsa_key(OSSL_LIB_CTX *libctx,
 
     ret = 1;
 end:
-    if(ret != 1) {
+    if (ret != 1) {
         EVP_PKEY_free(pkey);
         pkey = NULL;
     }
@@ -121,7 +117,7 @@ static int generate_dsa_key(OSSL_LIB_CTX *libctx,
 }
 
 static int extract_public_key(const EVP_PKEY *pkey,
-                              OSSL_PARAM **p_public_key)
+    OSSL_PARAM **p_public_key)
 {
     int ret = 0;
     OSSL_PARAM *public_key = NULL;
@@ -141,7 +137,7 @@ static int extract_public_key(const EVP_PKEY *pkey,
 }
 
 static int extract_keypair(const EVP_PKEY *pkey,
-                           OSSL_PARAM **p_keypair)
+    OSSL_PARAM **p_keypair)
 {
     int ret = 0;
     OSSL_PARAM *keypair = NULL;
@@ -161,8 +157,8 @@ static int extract_keypair(const EVP_PKEY *pkey,
 }
 
 static int demo_sign(OSSL_LIB_CTX *libctx,
-                     size_t *p_sig_len, unsigned char **p_sig_value,
-                     OSSL_PARAM keypair[])
+    size_t *p_sig_len, unsigned char **p_sig_value,
+    OSSL_PARAM keypair[])
 {
     int ret = 0;
     size_t sig_len = 0;
@@ -226,8 +222,8 @@ static int demo_sign(OSSL_LIB_CTX *libctx,
 }
 
 static int demo_verify(OSSL_LIB_CTX *libctx,
-                       size_t sig_len, unsigned char *sig_value,
-                       OSSL_PARAM public_key[])
+    size_t sig_len, unsigned char *sig_value,
+    OSSL_PARAM public_key[])
 {
     int ret = 0;
     EVP_MD_CTX *ctx = NULL;
@@ -243,7 +239,7 @@ static int demo_verify(OSSL_LIB_CTX *libctx,
         goto end;
 
     ctx = EVP_MD_CTX_create();
-    if(ctx == NULL)
+    if (ctx == NULL)
         goto end;
 
     if (EVP_DigestVerifyInit_ex(ctx, NULL, DIGEST, libctx, NULL, pkey, NULL) != 1)
diff --git a/demos/signature/EVP_EC_Signature_demo.c b/demos/signature/EVP_EC_Signature_demo.c
index 9e4f8e45daddb..65e28b0a58d98 100644
--- a/demos/signature/EVP_EC_Signature_demo.c
+++ b/demos/signature/EVP_EC_Signature_demo.c
@@ -24,18 +24,14 @@
  * the soliloquy from Hamlet scene 1 act 3
  */
 
-static const char *hamlet_1 =
-    "To be, or not to be, that is the question,\n"
-    "Whether tis nobler in the minde to suffer\n"
-    "The slings and arrowes of outragious fortune,\n"
-    "Or to take Armes again in a sea of troubles,\n"
-;
-static const char *hamlet_2 =
-    "And by opposing, end them, to die to sleep;\n"
-    "No more, and by a sleep, to say we end\n"
-    "The heart-ache, and the thousand natural shocks\n"
-    "That flesh is heir to? tis a consumation\n"
-;
+static const char *hamlet_1 = "To be, or not to be, that is the question,\n"
+                              "Whether tis nobler in the minde to suffer\n"
+                              "The slings and arrowes of outragious fortune,\n"
+                              "Or to take Armes again in a sea of troubles,\n";
+static const char *hamlet_2 = "And by opposing, end them, to die to sleep;\n"
+                              "No more, and by a sleep, to say we end\n"
+                              "The heart-ache, and the thousand natural shocks\n"
+                              "That flesh is heir to? tis a consumation\n";
 
 /*
  * For demo_sign, load EC private key priv_key from priv_key_der[].
@@ -44,22 +40,22 @@ static const char *hamlet_2 =
 static EVP_PKEY *get_key(OSSL_LIB_CTX *libctx, const char *propq, int public)
 {
     OSSL_DECODER_CTX *dctx = NULL;
-    EVP_PKEY  *pkey = NULL;
+    EVP_PKEY *pkey = NULL;
     int selection;
     const unsigned char *data;
     size_t data_len;
 
     if (public) {
         selection = EVP_PKEY_PUBLIC_KEY;
-        data =  pub_key_der;
+        data = pub_key_der;
         data_len = sizeof(pub_key_der);
     } else {
-        selection =  EVP_PKEY_KEYPAIR;
+        selection = EVP_PKEY_KEYPAIR;
         data = priv_key_der;
         data_len = sizeof(priv_key_der);
     }
     dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", NULL, "EC",
-                                         selection, libctx, propq);
+        selection, libctx, propq);
     (void)OSSL_DECODER_from_data(dctx, &data, &data_len);
     OSSL_DECODER_CTX_free(dctx);
     if (pkey == NULL)
@@ -67,8 +63,8 @@ static EVP_PKEY *get_key(OSSL_LIB_CTX *libctx, const char *propq, int public)
     return pkey;
 }
 
-static int demo_sign(OSSL_LIB_CTX *libctx,  const char *sig_name,
-                     size_t *sig_out_len, unsigned char **sig_out_value)
+static int demo_sign(OSSL_LIB_CTX *libctx, const char *sig_name,
+    size_t *sig_out_len, unsigned char **sig_out_value)
 {
     int ret = 0, public = 0;
     size_t sig_len;
@@ -97,7 +93,7 @@ static int demo_sign(OSSL_LIB_CTX *libctx,  const char *sig_name,
      * sign provider.
      */
     if (!EVP_DigestSignInit_ex(sign_context, NULL, sig_name,
-                              libctx, NULL, priv_key, NULL)) {
+            libctx, NULL, priv_key, NULL)) {
         fprintf(stderr, "EVP_DigestSignInit_ex failed.\n");
         goto cleanup;
     }
@@ -148,7 +144,7 @@ static int demo_sign(OSSL_LIB_CTX *libctx,  const char *sig_name,
 }
 
 static int demo_verify(OSSL_LIB_CTX *libctx, const char *sig_name,
-                       size_t sig_len, unsigned char *sig_value)
+    size_t sig_len, unsigned char *sig_value)
 {
     int ret = 0, public = 1;
     const char *propq = NULL;
@@ -172,7 +168,7 @@ static int demo_verify(OSSL_LIB_CTX *libctx, const char *sig_name,
     }
     /* Verify */
     if (!EVP_DigestVerifyInit_ex(verify_context, NULL, sig_name,
-                                libctx, NULL, pub_key, NULL)) {
+            libctx, NULL, pub_key, NULL)) {
         fprintf(stderr, "EVP_DigestVerifyInit failed.\n");
         goto cleanup;
     }
diff --git a/demos/signature/EVP_EC_Signature_demo.h b/demos/signature/EVP_EC_Signature_demo.h
index aef3e60783e85..81957567931bb 100644
--- a/demos/signature/EVP_EC_Signature_demo.h
+++ b/demos/signature/EVP_EC_Signature_demo.h
@@ -9,68 +9,707 @@
 
 /* Signers private EC key */
 static const unsigned char priv_key_der[] = {
-0x30, 0x82, 0x01, 0x68, 0x02, 0x01, 0x01, 0x04, 0x20, 0x51, 0x77, 0xae,
-0xf4, 0x18, 0xf4, 0x6b, 0xc4, 0xe5, 0xbb, 0xe9, 0xe6, 0x9e, 0x6d, 0xb0,
-0xea, 0x12, 0xf9, 0xf3, 0xdb, 0x9d, 0x56, 0x59, 0xf7, 0x5a, 0x17, 0xd7,
-0xd1, 0xe4, 0xd7, 0x47, 0x28, 0xa0, 0x81, 0xfa, 0x30, 0x81, 0xf7, 0x02,
-0x01, 0x01, 0x30, 0x2c, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x01,
-0x01, 0x02, 0x21, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-0x30, 0x5b, 0x04, 0x20, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
-0x04, 0x20, 0x5a, 0xc6, 0x35, 0xd8, 0xaa, 0x3a, 0x93, 0xe7, 0xb3, 0xeb,
-0xbd, 0x55, 0x76, 0x98, 0x86, 0xbc, 0x65, 0x1d, 0x06, 0xb0, 0xcc, 0x53,
-0xb0, 0xf6, 0x3b, 0xce, 0x3c, 0x3e, 0x27, 0xd2, 0x60, 0x4b, 0x03, 0x15,
-0x00, 0xc4, 0x9d, 0x36, 0x08, 0x86, 0xe7, 0x04, 0x93, 0x6a, 0x66, 0x78,
-0xe1, 0x13, 0x9d, 0x26, 0xb7, 0x81, 0x9f, 0x7e, 0x90, 0x04, 0x41, 0x04,
-0x6b, 0x17, 0xd1, 0xf2, 0xe1, 0x2c, 0x42, 0x47, 0xf8, 0xbc, 0xe6, 0xe5,
-0x63, 0xa4, 0x40, 0xf2, 0x77, 0x03, 0x7d, 0x81, 0x2d, 0xeb, 0x33, 0xa0,
-0xf4, 0xa1, 0x39, 0x45, 0xd8, 0x98, 0xc2, 0x96, 0x4f, 0xe3, 0x42, 0xe2,
-0xfe, 0x1a, 0x7f, 0x9b, 0x8e, 0xe7, 0xeb, 0x4a, 0x7c, 0x0f, 0x9e, 0x16,
-0x2b, 0xce, 0x33, 0x57, 0x6b, 0x31, 0x5e, 0xce, 0xcb, 0xb6, 0x40, 0x68,
-0x37, 0xbf, 0x51, 0xf5, 0x02, 0x21, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00,
-0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc,
-0xe6, 0xfa, 0xad, 0xa7, 0x17, 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc,
-0x63, 0x25, 0x51, 0x02, 0x01, 0x01, 0xa1, 0x44, 0x03, 0x42, 0x00, 0x04,
-0x4f, 0xe7, 0x7b, 0xb6, 0xbb, 0x54, 0x42, 0x39, 0xed, 0x5d, 0xe5, 0x40,
-0xc8, 0xd8, 0x71, 0xca, 0x6d, 0x83, 0x71, 0xd1, 0x88, 0x2a, 0x65, 0x00,
-0x6c, 0xc6, 0x2f, 0x01, 0x31, 0x49, 0xbe, 0x76, 0x7a, 0x67, 0x6a, 0x28,
-0x33, 0xc7, 0x5b, 0xb9, 0x24, 0x45, 0x24, 0x6e, 0xf0, 0x6d, 0x2f, 0x34,
-0x06, 0x53, 0x73, 0x6a, 0xff, 0x90, 0x90, 0xc1, 0x6d, 0x9b, 0x94, 0x0d,
-0x0e, 0x1f, 0x95, 0x65,
+    0x30,
+    0x82,
+    0x01,
+    0x68,
+    0x02,
+    0x01,
+    0x01,
+    0x04,
+    0x20,
+    0x51,
+    0x77,
+    0xae,
+    0xf4,
+    0x18,
+    0xf4,
+    0x6b,
+    0xc4,
+    0xe5,
+    0xbb,
+    0xe9,
+    0xe6,
+    0x9e,
+    0x6d,
+    0xb0,
+    0xea,
+    0x12,
+    0xf9,
+    0xf3,
+    0xdb,
+    0x9d,
+    0x56,
+    0x59,
+    0xf7,
+    0x5a,
+    0x17,
+    0xd7,
+    0xd1,
+    0xe4,
+    0xd7,
+    0x47,
+    0x28,
+    0xa0,
+    0x81,
+    0xfa,
+    0x30,
+    0x81,
+    0xf7,
+    0x02,
+    0x01,
+    0x01,
+    0x30,
+    0x2c,
+    0x06,
+    0x07,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x01,
+    0x01,
+    0x02,
+    0x21,
+    0x00,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0x00,
+    0x00,
+    0x00,
+    0x01,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0x30,
+    0x5b,
+    0x04,
+    0x20,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0x00,
+    0x00,
+    0x00,
+    0x01,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xfc,
+    0x04,
+    0x20,
+    0x5a,
+    0xc6,
+    0x35,
+    0xd8,
+    0xaa,
+    0x3a,
+    0x93,
+    0xe7,
+    0xb3,
+    0xeb,
+    0xbd,
+    0x55,
+    0x76,
+    0x98,
+    0x86,
+    0xbc,
+    0x65,
+    0x1d,
+    0x06,
+    0xb0,
+    0xcc,
+    0x53,
+    0xb0,
+    0xf6,
+    0x3b,
+    0xce,
+    0x3c,
+    0x3e,
+    0x27,
+    0xd2,
+    0x60,
+    0x4b,
+    0x03,
+    0x15,
+    0x00,
+    0xc4,
+    0x9d,
+    0x36,
+    0x08,
+    0x86,
+    0xe7,
+    0x04,
+    0x93,
+    0x6a,
+    0x66,
+    0x78,
+    0xe1,
+    0x13,
+    0x9d,
+    0x26,
+    0xb7,
+    0x81,
+    0x9f,
+    0x7e,
+    0x90,
+    0x04,
+    0x41,
+    0x04,
+    0x6b,
+    0x17,
+    0xd1,
+    0xf2,
+    0xe1,
+    0x2c,
+    0x42,
+    0x47,
+    0xf8,
+    0xbc,
+    0xe6,
+    0xe5,
+    0x63,
+    0xa4,
+    0x40,
+    0xf2,
+    0x77,
+    0x03,
+    0x7d,
+    0x81,
+    0x2d,
+    0xeb,
+    0x33,
+    0xa0,
+    0xf4,
+    0xa1,
+    0x39,
+    0x45,
+    0xd8,
+    0x98,
+    0xc2,
+    0x96,
+    0x4f,
+    0xe3,
+    0x42,
+    0xe2,
+    0xfe,
+    0x1a,
+    0x7f,
+    0x9b,
+    0x8e,
+    0xe7,
+    0xeb,
+    0x4a,
+    0x7c,
+    0x0f,
+    0x9e,
+    0x16,
+    0x2b,
+    0xce,
+    0x33,
+    0x57,
+    0x6b,
+    0x31,
+    0x5e,
+    0xce,
+    0xcb,
+    0xb6,
+    0x40,
+    0x68,
+    0x37,
+    0xbf,
+    0x51,
+    0xf5,
+    0x02,
+    0x21,
+    0x00,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xbc,
+    0xe6,
+    0xfa,
+    0xad,
+    0xa7,
+    0x17,
+    0x9e,
+    0x84,
+    0xf3,
+    0xb9,
+    0xca,
+    0xc2,
+    0xfc,
+    0x63,
+    0x25,
+    0x51,
+    0x02,
+    0x01,
+    0x01,
+    0xa1,
+    0x44,
+    0x03,
+    0x42,
+    0x00,
+    0x04,
+    0x4f,
+    0xe7,
+    0x7b,
+    0xb6,
+    0xbb,
+    0x54,
+    0x42,
+    0x39,
+    0xed,
+    0x5d,
+    0xe5,
+    0x40,
+    0xc8,
+    0xd8,
+    0x71,
+    0xca,
+    0x6d,
+    0x83,
+    0x71,
+    0xd1,
+    0x88,
+    0x2a,
+    0x65,
+    0x00,
+    0x6c,
+    0xc6,
+    0x2f,
+    0x01,
+    0x31,
+    0x49,
+    0xbe,
+    0x76,
+    0x7a,
+    0x67,
+    0x6a,
+    0x28,
+    0x33,
+    0xc7,
+    0x5b,
+    0xb9,
+    0x24,
+    0x45,
+    0x24,
+    0x6e,
+    0xf0,
+    0x6d,
+    0x2f,
+    0x34,
+    0x06,
+    0x53,
+    0x73,
+    0x6a,
+    0xff,
+    0x90,
+    0x90,
+    0xc1,
+    0x6d,
+    0x9b,
+    0x94,
+    0x0d,
+    0x0e,
+    0x1f,
+    0x95,
+    0x65,
 };
 
 /* The matching public key used for verifying */
 static const unsigned char pub_key_der[] = {
-0x30, 0x82, 0x01, 0x4b, 0x30, 0x82, 0x01, 0x03, 0x06, 0x07, 0x2a, 0x86,
-0x48, 0xce, 0x3d, 0x02, 0x01, 0x30, 0x81, 0xf7, 0x02, 0x01, 0x01, 0x30,
-0x2c, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x01, 0x01, 0x02, 0x21,
-0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x30, 0x5b, 0x04,
-0x20, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x04, 0x20, 0x5a,
-0xc6, 0x35, 0xd8, 0xaa, 0x3a, 0x93, 0xe7, 0xb3, 0xeb, 0xbd, 0x55, 0x76,
-0x98, 0x86, 0xbc, 0x65, 0x1d, 0x06, 0xb0, 0xcc, 0x53, 0xb0, 0xf6, 0x3b,
-0xce, 0x3c, 0x3e, 0x27, 0xd2, 0x60, 0x4b, 0x03, 0x15, 0x00, 0xc4, 0x9d,
-0x36, 0x08, 0x86, 0xe7, 0x04, 0x93, 0x6a, 0x66, 0x78, 0xe1, 0x13, 0x9d,
-0x26, 0xb7, 0x81, 0x9f, 0x7e, 0x90, 0x04, 0x41, 0x04, 0x6b, 0x17, 0xd1,
-0xf2, 0xe1, 0x2c, 0x42, 0x47, 0xf8, 0xbc, 0xe6, 0xe5, 0x63, 0xa4, 0x40,
-0xf2, 0x77, 0x03, 0x7d, 0x81, 0x2d, 0xeb, 0x33, 0xa0, 0xf4, 0xa1, 0x39,
-0x45, 0xd8, 0x98, 0xc2, 0x96, 0x4f, 0xe3, 0x42, 0xe2, 0xfe, 0x1a, 0x7f,
-0x9b, 0x8e, 0xe7, 0xeb, 0x4a, 0x7c, 0x0f, 0x9e, 0x16, 0x2b, 0xce, 0x33,
-0x57, 0x6b, 0x31, 0x5e, 0xce, 0xcb, 0xb6, 0x40, 0x68, 0x37, 0xbf, 0x51,
-0xf5, 0x02, 0x21, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
-0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0xe6, 0xfa, 0xad,
-0xa7, 0x17, 0x9e, 0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x51,
-0x02, 0x01, 0x01, 0x03, 0x42, 0x00, 0x04, 0x4f, 0xe7, 0x7b, 0xb6, 0xbb,
-0x54, 0x42, 0x39, 0xed, 0x5d, 0xe5, 0x40, 0xc8, 0xd8, 0x71, 0xca, 0x6d,
-0x83, 0x71, 0xd1, 0x88, 0x2a, 0x65, 0x00, 0x6c, 0xc6, 0x2f, 0x01, 0x31,
-0x49, 0xbe, 0x76, 0x7a, 0x67, 0x6a, 0x28, 0x33, 0xc7, 0x5b, 0xb9, 0x24,
-0x45, 0x24, 0x6e, 0xf0, 0x6d, 0x2f, 0x34, 0x06, 0x53, 0x73, 0x6a, 0xff,
-0x90, 0x90, 0xc1, 0x6d, 0x9b, 0x94, 0x0d, 0x0e, 0x1f, 0x95, 0x65,
+    0x30,
+    0x82,
+    0x01,
+    0x4b,
+    0x30,
+    0x82,
+    0x01,
+    0x03,
+    0x06,
+    0x07,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x02,
+    0x01,
+    0x30,
+    0x81,
+    0xf7,
+    0x02,
+    0x01,
+    0x01,
+    0x30,
+    0x2c,
+    0x06,
+    0x07,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x01,
+    0x01,
+    0x02,
+    0x21,
+    0x00,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0x00,
+    0x00,
+    0x00,
+    0x01,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0x30,
+    0x5b,
+    0x04,
+    0x20,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0x00,
+    0x00,
+    0x00,
+    0x01,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xfc,
+    0x04,
+    0x20,
+    0x5a,
+    0xc6,
+    0x35,
+    0xd8,
+    0xaa,
+    0x3a,
+    0x93,
+    0xe7,
+    0xb3,
+    0xeb,
+    0xbd,
+    0x55,
+    0x76,
+    0x98,
+    0x86,
+    0xbc,
+    0x65,
+    0x1d,
+    0x06,
+    0xb0,
+    0xcc,
+    0x53,
+    0xb0,
+    0xf6,
+    0x3b,
+    0xce,
+    0x3c,
+    0x3e,
+    0x27,
+    0xd2,
+    0x60,
+    0x4b,
+    0x03,
+    0x15,
+    0x00,
+    0xc4,
+    0x9d,
+    0x36,
+    0x08,
+    0x86,
+    0xe7,
+    0x04,
+    0x93,
+    0x6a,
+    0x66,
+    0x78,
+    0xe1,
+    0x13,
+    0x9d,
+    0x26,
+    0xb7,
+    0x81,
+    0x9f,
+    0x7e,
+    0x90,
+    0x04,
+    0x41,
+    0x04,
+    0x6b,
+    0x17,
+    0xd1,
+    0xf2,
+    0xe1,
+    0x2c,
+    0x42,
+    0x47,
+    0xf8,
+    0xbc,
+    0xe6,
+    0xe5,
+    0x63,
+    0xa4,
+    0x40,
+    0xf2,
+    0x77,
+    0x03,
+    0x7d,
+    0x81,
+    0x2d,
+    0xeb,
+    0x33,
+    0xa0,
+    0xf4,
+    0xa1,
+    0x39,
+    0x45,
+    0xd8,
+    0x98,
+    0xc2,
+    0x96,
+    0x4f,
+    0xe3,
+    0x42,
+    0xe2,
+    0xfe,
+    0x1a,
+    0x7f,
+    0x9b,
+    0x8e,
+    0xe7,
+    0xeb,
+    0x4a,
+    0x7c,
+    0x0f,
+    0x9e,
+    0x16,
+    0x2b,
+    0xce,
+    0x33,
+    0x57,
+    0x6b,
+    0x31,
+    0x5e,
+    0xce,
+    0xcb,
+    0xb6,
+    0x40,
+    0x68,
+    0x37,
+    0xbf,
+    0x51,
+    0xf5,
+    0x02,
+    0x21,
+    0x00,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xbc,
+    0xe6,
+    0xfa,
+    0xad,
+    0xa7,
+    0x17,
+    0x9e,
+    0x84,
+    0xf3,
+    0xb9,
+    0xca,
+    0xc2,
+    0xfc,
+    0x63,
+    0x25,
+    0x51,
+    0x02,
+    0x01,
+    0x01,
+    0x03,
+    0x42,
+    0x00,
+    0x04,
+    0x4f,
+    0xe7,
+    0x7b,
+    0xb6,
+    0xbb,
+    0x54,
+    0x42,
+    0x39,
+    0xed,
+    0x5d,
+    0xe5,
+    0x40,
+    0xc8,
+    0xd8,
+    0x71,
+    0xca,
+    0x6d,
+    0x83,
+    0x71,
+    0xd1,
+    0x88,
+    0x2a,
+    0x65,
+    0x00,
+    0x6c,
+    0xc6,
+    0x2f,
+    0x01,
+    0x31,
+    0x49,
+    0xbe,
+    0x76,
+    0x7a,
+    0x67,
+    0x6a,
+    0x28,
+    0x33,
+    0xc7,
+    0x5b,
+    0xb9,
+    0x24,
+    0x45,
+    0x24,
+    0x6e,
+    0xf0,
+    0x6d,
+    0x2f,
+    0x34,
+    0x06,
+    0x53,
+    0x73,
+    0x6a,
+    0xff,
+    0x90,
+    0x90,
+    0xc1,
+    0x6d,
+    0x9b,
+    0x94,
+    0x0d,
+    0x0e,
+    0x1f,
+    0x95,
+    0x65,
 };
-
diff --git a/demos/signature/EVP_ED_Signature_demo.c b/demos/signature/EVP_ED_Signature_demo.c
index e5cb6f4de15fc..1cf8b56959c1c 100644
--- a/demos/signature/EVP_ED_Signature_demo.c
+++ b/demos/signature/EVP_ED_Signature_demo.c
@@ -19,17 +19,16 @@
 #include <openssl/core_names.h>
 
 /* A test message to be signed (TBS) */
-static const unsigned char hamlet[] =
-    "To be, or not to be, that is the question,\n"
-    "Whether tis nobler in the minde to suffer\n"
-    "The slings and arrowes of outragious fortune,\n"
-    "Or to take Armes again in a sea of troubles,\n";
+static const unsigned char hamlet[] = "To be, or not to be, that is the question,\n"
+                                      "Whether tis nobler in the minde to suffer\n"
+                                      "The slings and arrowes of outragious fortune,\n"
+                                      "Or to take Armes again in a sea of troubles,\n";
 
 static int demo_sign(EVP_PKEY *priv,
-                     const unsigned char *tbs, size_t tbs_len,
-                     OSSL_LIB_CTX *libctx,
-                     unsigned char **sig_out_value,
-                     size_t *sig_out_len)
+    const unsigned char *tbs, size_t tbs_len,
+    OSSL_LIB_CTX *libctx,
+    unsigned char **sig_out_value,
+    size_t *sig_out_len)
 {
     int ret = 0;
     size_t sig_len;
@@ -85,9 +84,9 @@ static int demo_sign(EVP_PKEY *priv,
 }
 
 static int demo_verify(EVP_PKEY *pub,
-                       const unsigned char *tbs, size_t tbs_len,
-                       const unsigned char *sig_value, size_t sig_len,
-                       OSSL_LIB_CTX *libctx)
+    const unsigned char *tbs, size_t tbs_len,
+    const unsigned char *sig_value, size_t sig_len,
+    OSSL_LIB_CTX *libctx)
 {
     int ret = 0;
     EVP_MD_CTX *verify_context = NULL;
@@ -103,7 +102,7 @@ static int demo_verify(EVP_PKEY *pub,
     }
     /* Initialize the verify context with a ED25519 public key */
     if (!EVP_DigestVerifyInit_ex(verify_context, NULL, NULL,
-                                 libctx, NULL, pub, NULL)) {
+            libctx, NULL, pub, NULL)) {
         fprintf(stderr, "EVP_DigestVerifyInit_ex failed.\n");
         goto cleanup;
     }
@@ -112,7 +111,7 @@ static int demo_verify(EVP_PKEY *pub,
      * The streaming EVP_DigestVerifyUpdate() API is not supported.
      */
     if (!EVP_DigestVerify(verify_context, sig_value, sig_len,
-                          tbs, tbs_len)) {
+            tbs, tbs_len)) {
         fprintf(stderr, "EVP_DigestVerify() failed.\n");
         goto cleanup;
     }
@@ -125,7 +124,7 @@ static int demo_verify(EVP_PKEY *pub,
 }
 
 static int create_key(OSSL_LIB_CTX *libctx,
-                      EVP_PKEY **privout, EVP_PKEY **pubout)
+    EVP_PKEY **privout, EVP_PKEY **pubout)
 {
     int ret = 0;
     EVP_PKEY *priv = NULL, *pub = NULL;
@@ -144,10 +143,10 @@ static int create_key(OSSL_LIB_CTX *libctx,
     }
 
     if (!EVP_PKEY_get_octet_string_param(priv,
-                                         OSSL_PKEY_PARAM_PUB_KEY,
-                                         pubdata,
-                                         sizeof(pubdata),
-                                         &pubdata_len)) {
+            OSSL_PKEY_PARAM_PUB_KEY,
+            pubdata,
+            sizeof(pubdata),
+            &pubdata_len)) {
         fprintf(stderr, "EVP_PKEY_get_octet_string_param() failed\n");
         goto end;
     }
@@ -186,12 +185,12 @@ int main(void)
     }
 
     if (!demo_sign(priv, hamlet, sizeof(hamlet), libctx,
-                   &sig_value, &sig_len)) {
+            &sig_value, &sig_len)) {
         fprintf(stderr, "demo_sign failed.\n");
         goto cleanup;
     }
     if (!demo_verify(pub, hamlet, sizeof(hamlet),
-                     sig_value, sig_len, libctx)) {
+            sig_value, sig_len, libctx)) {
         fprintf(stderr, "demo_verify failed.\n");
         goto cleanup;
     }
diff --git a/demos/signature/rsa_pss_direct.c b/demos/signature/rsa_pss_direct.c
index 097ad69f24b61..e5ae26d940809 100644
--- a/demos/signature/rsa_pss_direct.c
+++ b/demos/signature/rsa_pss_direct.c
@@ -21,7 +21,7 @@
  * The digest to be signed. This should be the output of a hash function.
  * Here we sign an all-zeroes digest for demonstration purposes.
  */
-static const unsigned char test_digest[32] = {0};
+static const unsigned char test_digest[32] = { 0 };
 
 /* A property query used for selecting algorithm implementations. */
 static const char *propq = NULL;
@@ -48,7 +48,7 @@ static int sign(OSSL_LIB_CTX *libctx, unsigned char **sig, size_t *sig_len)
     /* Load DER-encoded RSA private key. */
     ppriv_key = rsa_priv_key;
     pkey = d2i_PrivateKey_ex(EVP_PKEY_RSA, NULL, &ppriv_key,
-                             sizeof(rsa_priv_key), libctx, propq);
+        sizeof(rsa_priv_key), libctx, propq);
     if (pkey == NULL) {
         fprintf(stderr, "Failed to load private key\n");
         goto end;
@@ -86,7 +86,8 @@ static int sign(OSSL_LIB_CTX *libctx, unsigned char **sig, size_t *sig_len)
 
     /* Determine length of signature. */
     if (EVP_PKEY_sign(ctx, NULL, sig_len,
-                      test_digest, sizeof(test_digest)) == 0) {
+            test_digest, sizeof(test_digest))
+        == 0) {
         fprintf(stderr, "Failed to get signature length\n");
         goto end;
     }
@@ -100,7 +101,8 @@ static int sign(OSSL_LIB_CTX *libctx, unsigned char **sig, size_t *sig_len)
 
     /* Generate signature. */
     if (EVP_PKEY_sign(ctx, *sig, sig_len,
-                      test_digest, sizeof(test_digest)) != 1) {
+            test_digest, sizeof(test_digest))
+        != 1) {
         fprintf(stderr, "Failed to sign\n");
         goto end;
     }
@@ -169,9 +171,10 @@ static int verify(OSSL_LIB_CTX *libctx, const unsigned char *sig, size_t sig_len
 
     /* Verify signature. */
     if (EVP_PKEY_verify(ctx, sig, sig_len,
-                        test_digest, sizeof(test_digest)) == 0) {
+            test_digest, sizeof(test_digest))
+        == 0) {
         fprintf(stderr, "Failed to verify signature; "
-                "signature may be invalid\n");
+                        "signature may be invalid\n");
         goto end;
     }
 
diff --git a/demos/signature/rsa_pss_hash.c b/demos/signature/rsa_pss_hash.c
index 57d5c5ae195cc..5be3d9ece64b0 100644
--- a/demos/signature/rsa_pss_hash.c
+++ b/demos/signature/rsa_pss_hash.c
@@ -18,8 +18,7 @@
 #include "rsa_pss.h"
 
 /* The data to be signed. This will be hashed. */
-static const char test_message[] =
-    "This is an example message to be signed.";
+static const char test_message[] = "This is an example message to be signed.";
 
 /* A property query used for selecting algorithm implementations. */
 static const char *propq = NULL;
@@ -43,7 +42,7 @@ static int sign(OSSL_LIB_CTX *libctx, unsigned char **sig, size_t *sig_len)
     /* Load DER-encoded RSA private key. */
     ppriv_key = rsa_priv_key;
     pkey = d2i_PrivateKey_ex(EVP_PKEY_RSA, NULL, &ppriv_key,
-                             sizeof(rsa_priv_key), libctx, propq);
+        sizeof(rsa_priv_key), libctx, propq);
     if (pkey == NULL) {
         fprintf(stderr, "Failed to load private key\n");
         goto end;
@@ -58,11 +57,12 @@ static int sign(OSSL_LIB_CTX *libctx, unsigned char **sig, size_t *sig_len)
 
     /* Initialize MD context for signing. */
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_PAD_MODE,
-                                            OSSL_PKEY_RSA_PAD_MODE_PSS, 0);
+        OSSL_PKEY_RSA_PAD_MODE_PSS, 0);
     *p = OSSL_PARAM_construct_end();
 
     if (EVP_DigestSignInit_ex(mctx, NULL, "SHA256", libctx, propq,
-                              pkey, params) == 0) {
+            pkey, params)
+        == 0) {
         fprintf(stderr, "Failed to initialize signing context\n");
         goto end;
     }
@@ -136,11 +136,12 @@ static int verify(OSSL_LIB_CTX *libctx, const unsigned char *sig, size_t sig_len
 
     /* Initialize MD context for verification. */
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_PAD_MODE,
-                                            OSSL_PKEY_RSA_PAD_MODE_PSS, 0);
+        OSSL_PKEY_RSA_PAD_MODE_PSS, 0);
     *p = OSSL_PARAM_construct_end();
 
     if (EVP_DigestVerifyInit_ex(mctx, NULL, "SHA256", libctx, propq,
-                                pkey, params) == 0) {
+            pkey, params)
+        == 0) {
         fprintf(stderr, "Failed to initialize signing context\n");
         goto end;
     }
@@ -157,7 +158,7 @@ static int verify(OSSL_LIB_CTX *libctx, const unsigned char *sig, size_t sig_len
     /* Verify signature. */
     if (EVP_DigestVerifyFinal(mctx, sig, sig_len) == 0) {
         fprintf(stderr, "Failed to verify signature; "
-                "signature may be invalid\n");
+                        "signature may be invalid\n");
         goto end;
     }
 
diff --git a/demos/smime/smdec.c b/demos/smime/smdec.c
index f27c353f4046e..b66e2b94f7811 100644
--- a/demos/smime/smdec.c
+++ b/demos/smime/smdec.c
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
     printf("Success\n");
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Signing Data\n");
         ERR_print_errors_fp(stderr);
diff --git a/demos/smime/smenc.c b/demos/smime/smenc.c
index 2113e12d1cdaf..56316f20d76d1 100644
--- a/demos/smime/smenc.c
+++ b/demos/smime/smenc.c
@@ -75,7 +75,7 @@ int main(int argc, char **argv)
     printf("Success\n");
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Encrypting Data\n");
         ERR_print_errors_fp(stderr);
diff --git a/demos/smime/smsign.c b/demos/smime/smsign.c
index 3e27c931f6be1..01fac61f71569 100644
--- a/demos/smime/smsign.c
+++ b/demos/smime/smsign.c
@@ -75,7 +75,7 @@ int main(int argc, char **argv)
     printf("Success\n");
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Signing Data\n");
         ERR_print_errors_fp(stderr);
diff --git a/demos/smime/smsign2.c b/demos/smime/smsign2.c
index 5ad86f15f86e1..2820e3d1dc29c 100644
--- a/demos/smime/smsign2.c
+++ b/demos/smime/smsign2.c
@@ -82,7 +82,7 @@ int main(int argc, char **argv)
     printf("Success\n");
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Signing Data\n");
         ERR_print_errors_fp(stderr);
diff --git a/demos/smime/smver.c b/demos/smime/smver.c
index caa9ed304ff05..2905f7057d850 100644
--- a/demos/smime/smver.c
+++ b/demos/smime/smver.c
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
     printf("Verification Successful\n");
 
     ret = EXIT_SUCCESS;
- err:
+err:
     if (ret != EXIT_SUCCESS) {
         fprintf(stderr, "Error Verifying Data\n");
         ERR_print_errors_fp(stderr);
diff --git a/demos/sslecho/A-SSL-Docs.txt b/demos/sslecho/A-SSL-Docs.txt
index 865960e4bde51..8178d608de14d 100644
--- a/demos/sslecho/A-SSL-Docs.txt
+++ b/demos/sslecho/A-SSL-Docs.txt
@@ -4,9 +4,9 @@ OpenSSL API Documentation: https://www.openssl.org/docs
 
 Github: https://github.com/openssl/openssl
 
-OpenSSL Wiki: https://wiki.openssl.org/index.php/Main_Page
+OpenSSL Wiki: https://github.com/openssl/openssl/wiki
 
-Original Simple Server: https://wiki.openssl.org/index.php/Simple_TLS_Server
+Original Simple Server: https://github.com/openssl/openssl/wiki/Simple_TLS_Server
 
 ---------------------------------------------------------------
 
diff --git a/demos/sslecho/main.c b/demos/sslecho/main.c
index 3e5bcadce3eed..c954ce7ee07e2 100644
--- a/demos/sslecho/main.c
+++ b/demos/sslecho/main.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
+ *  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
@@ -23,17 +23,17 @@
 
 static const int server_port = 4433;
 
-typedef unsigned char   bool;
-#define true            1
-#define false           0
+typedef unsigned char flag;
+#define true 1
+#define false 0
 
 /*
  * This flag won't be useful until both accept/read (TCP & SSL) methods
  * can be called with a timeout. TBD.
  */
-static volatile bool    server_running = true;
+static volatile flag server_running = true;
 
-static int create_socket(bool isServer)
+static int create_socket(flag isServer)
 {
     int s;
     int optval = 1;
@@ -52,12 +52,12 @@ static int create_socket(bool isServer)
 
         /* Reuse the address; good for quick restarts */
         if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval))
-                < 0) {
+            < 0) {
             perror("setsockopt(SO_REUSEADDR) failed");
             exit(EXIT_FAILURE);
         }
 
-        if (bind(s, (struct sockaddr*) &addr, sizeof(addr)) < 0) {
+        if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
             perror("Unable to bind");
             exit(EXIT_FAILURE);
         }
@@ -71,7 +71,7 @@ static int create_socket(bool isServer)
     return s;
 }
 
-static SSL_CTX* create_context(bool isServer)
+static SSL_CTX *create_context(flag isServer)
 {
     const SSL_METHOD *method;
     SSL_CTX *ctx;
@@ -135,7 +135,7 @@ static void usage(void)
 #define BUFFERSIZE 1024
 int main(int argc, char **argv)
 {
-    bool isServer;
+    flag isServer;
     int result;
 
     SSL_CTX *ssl_ctx = NULL;
@@ -161,14 +161,14 @@ int main(int argc, char **argv)
     unsigned int addr_len = sizeof(addr);
 #endif
 
-#if !defined (OPENSSL_SYS_WINDOWS)
+#if !defined(OPENSSL_SYS_WINDOWS)
     /* ignore SIGPIPE so that server can continue running when client pipe closes abruptly */
     signal(SIGPIPE, SIG_IGN);
 #endif
 
     /* Splash */
     printf("\nsslecho : Simple Echo Client/Server : %s : %s\n\n", __DATE__,
-    __TIME__);
+        __TIME__);
 
     /* Need to know if client or server */
     if (argc < 2) {
@@ -206,8 +206,8 @@ int main(int argc, char **argv)
          */
         while (server_running) {
             /* Wait for TCP connection from client */
-            client_skt = accept(server_skt, (struct sockaddr*) &addr,
-                    &addr_len);
+            client_skt = accept(server_skt, (struct sockaddr *)&addr,
+                &addr_len);
             if (client_skt < 0) {
                 perror("Unable to accept");
                 exit(EXIT_FAILURE);
@@ -264,6 +264,11 @@ int main(int argc, char **argv)
                 SSL_shutdown(ssl);
                 SSL_free(ssl);
                 close(client_skt);
+                /*
+                 * Set client_skt to -1 to avoid double close when
+                 * server_running become false before next accept
+                 */
+                client_skt = -1;
             }
         }
         printf("Server exiting...\n");
@@ -283,7 +288,7 @@ int main(int argc, char **argv)
         inet_pton(AF_INET, rem_server_ip, &addr.sin_addr.s_addr);
         addr.sin_port = htons(server_port);
         /* Do TCP connect with server */
-        if (connect(client_skt, (struct sockaddr*) &addr, sizeof(addr)) != 0) {
+        if (connect(client_skt, (struct sockaddr *)&addr, sizeof(addr)) != 0) {
             perror("Unable to TCP connect to server");
             goto exit;
         } else {
diff --git a/doc/build.info b/doc/build.info
index bff57d5d50fb2..bb1f00f49b762 100644
--- a/doc/build.info
+++ b/doc/build.info
@@ -699,6 +699,10 @@ DEPEND[html/man3/BIO_set_callback.html]=man3/BIO_set_callback.pod
 GENERATE[html/man3/BIO_set_callback.html]=man3/BIO_set_callback.pod
 DEPEND[man/man3/BIO_set_callback.3]=man3/BIO_set_callback.pod
 GENERATE[man/man3/BIO_set_callback.3]=man3/BIO_set_callback.pod
+DEPEND[html/man3/BIO_set_flags.html]=man3/BIO_set_flags.pod
+GENERATE[html/man3/BIO_set_flags.html]=man3/BIO_set_flags.pod
+DEPEND[man/man3/BIO_set_flags.3]=man3/BIO_set_flags.pod
+GENERATE[man/man3/BIO_set_flags.3]=man3/BIO_set_flags.pod
 DEPEND[html/man3/BIO_should_retry.html]=man3/BIO_should_retry.pod
 GENERATE[html/man3/BIO_should_retry.html]=man3/BIO_should_retry.pod
 DEPEND[man/man3/BIO_should_retry.3]=man3/BIO_should_retry.pod
@@ -803,6 +807,10 @@ DEPEND[html/man3/CMS_EncryptedData_encrypt.html]=man3/CMS_EncryptedData_encrypt.
 GENERATE[html/man3/CMS_EncryptedData_encrypt.html]=man3/CMS_EncryptedData_encrypt.pod
 DEPEND[man/man3/CMS_EncryptedData_encrypt.3]=man3/CMS_EncryptedData_encrypt.pod
 GENERATE[man/man3/CMS_EncryptedData_encrypt.3]=man3/CMS_EncryptedData_encrypt.pod
+DEPEND[html/man3/CMS_EncryptedData_set1_key.html]=man3/CMS_EncryptedData_set1_key.pod
+GENERATE[html/man3/CMS_EncryptedData_set1_key.html]=man3/CMS_EncryptedData_set1_key.pod
+DEPEND[man/man3/CMS_EncryptedData_set1_key.3]=man3/CMS_EncryptedData_set1_key.pod
+GENERATE[man/man3/CMS_EncryptedData_set1_key.3]=man3/CMS_EncryptedData_set1_key.pod
 DEPEND[html/man3/CMS_EnvelopedData_create.html]=man3/CMS_EnvelopedData_create.pod
 GENERATE[html/man3/CMS_EnvelopedData_create.html]=man3/CMS_EnvelopedData_create.pod
 DEPEND[man/man3/CMS_EnvelopedData_create.3]=man3/CMS_EnvelopedData_create.pod
@@ -1127,6 +1135,10 @@ DEPEND[html/man3/EVP_BytesToKey.html]=man3/EVP_BytesToKey.pod
 GENERATE[html/man3/EVP_BytesToKey.html]=man3/EVP_BytesToKey.pod
 DEPEND[man/man3/EVP_BytesToKey.3]=man3/EVP_BytesToKey.pod
 GENERATE[man/man3/EVP_BytesToKey.3]=man3/EVP_BytesToKey.pod
+DEPEND[html/man3/EVP_CIPHER_CTX_get_app_data.html]=man3/EVP_CIPHER_CTX_get_app_data.pod
+GENERATE[html/man3/EVP_CIPHER_CTX_get_app_data.html]=man3/EVP_CIPHER_CTX_get_app_data.pod
+DEPEND[man/man3/EVP_CIPHER_CTX_get_app_data.3]=man3/EVP_CIPHER_CTX_get_app_data.pod
+GENERATE[man/man3/EVP_CIPHER_CTX_get_app_data.3]=man3/EVP_CIPHER_CTX_get_app_data.pod
 DEPEND[html/man3/EVP_CIPHER_CTX_get_cipher_data.html]=man3/EVP_CIPHER_CTX_get_cipher_data.pod
 GENERATE[html/man3/EVP_CIPHER_CTX_get_cipher_data.html]=man3/EVP_CIPHER_CTX_get_cipher_data.pod
 DEPEND[man/man3/EVP_CIPHER_CTX_get_cipher_data.3]=man3/EVP_CIPHER_CTX_get_cipher_data.pod
@@ -1603,6 +1615,10 @@ DEPEND[html/man3/OPENSSL_malloc.html]=man3/OPENSSL_malloc.pod
 GENERATE[html/man3/OPENSSL_malloc.html]=man3/OPENSSL_malloc.pod
 DEPEND[man/man3/OPENSSL_malloc.3]=man3/OPENSSL_malloc.pod
 GENERATE[man/man3/OPENSSL_malloc.3]=man3/OPENSSL_malloc.pod
+DEPEND[html/man3/OPENSSL_ppccap.html]=man3/OPENSSL_ppccap.pod
+GENERATE[html/man3/OPENSSL_ppccap.html]=man3/OPENSSL_ppccap.pod
+DEPEND[man/man3/OPENSSL_ppccap.3]=man3/OPENSSL_ppccap.pod
+GENERATE[man/man3/OPENSSL_ppccap.3]=man3/OPENSSL_ppccap.pod
 DEPEND[html/man3/OPENSSL_riscvcap.html]=man3/OPENSSL_riscvcap.pod
 GENERATE[html/man3/OPENSSL_riscvcap.html]=man3/OPENSSL_riscvcap.pod
 DEPEND[man/man3/OPENSSL_riscvcap.3]=man3/OPENSSL_riscvcap.pod
@@ -3220,6 +3236,7 @@ html/man3/BIO_s_null.html \
 html/man3/BIO_s_socket.html \
 html/man3/BIO_sendmmsg.html \
 html/man3/BIO_set_callback.html \
+html/man3/BIO_set_flags.html \
 html/man3/BIO_should_retry.html \
 html/man3/BIO_socket_wait.html \
 html/man3/BN_BLINDING_new.html \
@@ -3246,6 +3263,7 @@ html/man3/BUF_MEM_new.html \
 html/man3/CMAC_CTX.html \
 html/man3/CMS_EncryptedData_decrypt.html \
 html/man3/CMS_EncryptedData_encrypt.html \
+html/man3/CMS_EncryptedData_set1_key.html \
 html/man3/CMS_EnvelopedData_create.html \
 html/man3/CMS_add0_cert.html \
 html/man3/CMS_add1_recipient_cert.html \
@@ -3327,6 +3345,7 @@ html/man3/ERR_remove_state.html \
 html/man3/ERR_set_mark.html \
 html/man3/EVP_ASYM_CIPHER_free.html \
 html/man3/EVP_BytesToKey.html \
+html/man3/EVP_CIPHER_CTX_get_app_data.html \
 html/man3/EVP_CIPHER_CTX_get_cipher_data.html \
 html/man3/EVP_CIPHER_CTX_get_original_iv.html \
 html/man3/EVP_CIPHER_meth_new.html \
@@ -3446,6 +3465,7 @@ html/man3/OPENSSL_instrument_bus.html \
 html/man3/OPENSSL_load_builtin_modules.html \
 html/man3/OPENSSL_load_u16_le.html \
 html/man3/OPENSSL_malloc.html \
+html/man3/OPENSSL_ppccap.html \
 html/man3/OPENSSL_riscvcap.html \
 html/man3/OPENSSL_s390xcap.html \
 html/man3/OPENSSL_secure_malloc.html \
@@ -3892,6 +3912,7 @@ man/man3/BIO_s_null.3 \
 man/man3/BIO_s_socket.3 \
 man/man3/BIO_sendmmsg.3 \
 man/man3/BIO_set_callback.3 \
+man/man3/BIO_set_flags.3 \
 man/man3/BIO_should_retry.3 \
 man/man3/BIO_socket_wait.3 \
 man/man3/BN_BLINDING_new.3 \
@@ -3918,6 +3939,7 @@ man/man3/BUF_MEM_new.3 \
 man/man3/CMAC_CTX.3 \
 man/man3/CMS_EncryptedData_decrypt.3 \
 man/man3/CMS_EncryptedData_encrypt.3 \
+man/man3/CMS_EncryptedData_set1_key.3 \
 man/man3/CMS_EnvelopedData_create.3 \
 man/man3/CMS_add0_cert.3 \
 man/man3/CMS_add1_recipient_cert.3 \
@@ -3999,6 +4021,7 @@ man/man3/ERR_remove_state.3 \
 man/man3/ERR_set_mark.3 \
 man/man3/EVP_ASYM_CIPHER_free.3 \
 man/man3/EVP_BytesToKey.3 \
+man/man3/EVP_CIPHER_CTX_get_app_data.3 \
 man/man3/EVP_CIPHER_CTX_get_cipher_data.3 \
 man/man3/EVP_CIPHER_CTX_get_original_iv.3 \
 man/man3/EVP_CIPHER_meth_new.3 \
@@ -4118,6 +4141,7 @@ man/man3/OPENSSL_instrument_bus.3 \
 man/man3/OPENSSL_load_builtin_modules.3 \
 man/man3/OPENSSL_load_u16_le.3 \
 man/man3/OPENSSL_malloc.3 \
+man/man3/OPENSSL_ppccap.3 \
 man/man3/OPENSSL_riscvcap.3 \
 man/man3/OPENSSL_s390xcap.3 \
 man/man3/OPENSSL_secure_malloc.3 \
diff --git a/doc/designs/ML-KEM.md b/doc/designs/ML-KEM.md
index 267656dfba221..b1ca4098e0895 100644
--- a/doc/designs/ML-KEM.md
+++ b/doc/designs/ML-KEM.md
@@ -44,7 +44,7 @@ subsequent computations (encapsulation).
 Since the private key includes the public key as one of its components, the matrix
 is also pre-computed and stored with the private key, and then need not be
 regenerated during decapsulation.
-During encapsulation (typically peformed by servers), it is in principle
+During encapsulation (typically performed by servers), it is in principle
 possible to save space and compute the matrix elements *just-in-time*, as each
 matrix element is used exactly once.
 This is not currently implemented, and the matrix is pre-computed in full.
@@ -90,7 +90,7 @@ Keys can be generated via the usual **EVP_PKEY_generate()** and
 
 An explicit seed can be specified by setting the key generation
 **OSSL_PKEY_PARAM_ML_KEM_SEED** parameter to a 64-byte octet-string
-(concatentation of the **d** and **z** values (32-bytes each) in that order).
+(concatenation of the **d** and **z** values (32-bytes each) in that order).
 
 KEM API
 -------
diff --git a/doc/designs/ddd/ddd-01-conn-blocking.c b/doc/designs/ddd/ddd-01-conn-blocking.c
index d2df84d854982..d9e1a3fbae5eb 100644
--- a/doc/designs/ddd/ddd-01-conn-blocking.c
+++ b/doc/designs/ddd/ddd-01-conn-blocking.c
@@ -52,7 +52,7 @@ BIO *new_conn(SSL_CTX *ctx, const char *hostname)
     SSL *ssl = NULL;
     const char *bare_hostname;
 #ifdef USE_QUIC
-    static const unsigned char alpn[] = {5, 'd', 'u', 'm', 'm', 'y'};
+    static const unsigned char alpn[] = { 5, 'd', 'u', 'm', 'm', 'y' };
 #endif
 
     out = BIO_new_ssl_connect(ctx);
@@ -150,7 +150,7 @@ int main(int argc, char **argv)
 
     snprintf(host_port, sizeof(host_port), "%s:%s", argv[1], argv[2]);
     mlen = snprintf(msg, sizeof(msg),
-                    "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", argv[1]);
+        "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", argv[1]);
 
     ctx = create_ssl_ctx();
     if (ctx == NULL) {
diff --git a/doc/designs/ddd/ddd-02-conn-nonblocking-threads.c b/doc/designs/ddd/ddd-02-conn-nonblocking-threads.c
index 19d978bba078a..3d2c07918239a 100644
--- a/doc/designs/ddd/ddd-02-conn-nonblocking-threads.c
+++ b/doc/designs/ddd/ddd-02-conn-nonblocking-threads.c
@@ -65,7 +65,7 @@ APP_CONN *new_conn(SSL_CTX *ctx, const char *hostname)
     SSL *ssl = NULL;
     const char *bare_hostname;
 #ifdef USE_QUIC
-    static const unsigned char alpn[] = {5, 'd', 'u', 'm', 'm', 'y'};
+    static const unsigned char alpn[] = { 5, 'd', 'u', 'm', 'm', 'y' };
 #endif
 
     conn = calloc(1, sizeof(APP_CONN));
@@ -216,8 +216,8 @@ int get_conn_pending_tx(APP_CONN *conn)
 {
 #ifdef USE_QUIC
     return (SSL_net_read_desired(conn->ssl) ? POLLIN : 0)
-           | (SSL_net_write_desired(conn->ssl) ? POLLOUT : 0)
-           | POLLERR;
+        | (SSL_net_write_desired(conn->ssl) ? POLLOUT : 0)
+        | POLLERR;
 #else
     return (conn->tx_need_rx ? POLLIN : 0) | POLLOUT | POLLERR;
 #endif
@@ -273,7 +273,7 @@ int main(int argc, char **argv)
 
     snprintf(host_port, sizeof(host_port), "%s:%s", argv[1], argv[2]);
     tx_len = snprintf(tx_msg, sizeof(tx_msg),
-                      "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", argv[1]);
+        "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", argv[1]);
 
     ctx = create_ssl_ctx();
     if (ctx == NULL) {
@@ -296,7 +296,7 @@ int main(int argc, char **argv)
         } else if (l == -1) {
             fprintf(stderr, "tx error\n");
         } else if (l == -2) {
-            struct pollfd pfd = {0};
+            struct pollfd pfd = { 0 };
             pfd.fd = get_conn_fd(conn);
             pfd.events = get_conn_pending_tx(conn);
             if (poll(&pfd, 1, timeout) == 0) {
@@ -314,7 +314,7 @@ int main(int argc, char **argv)
         } else if (l == -1) {
             break;
         } else if (l == -2) {
-            struct pollfd pfd = {0};
+            struct pollfd pfd = { 0 };
             pfd.fd = get_conn_fd(conn);
             pfd.events = get_conn_pending_rx(conn);
             if (poll(&pfd, 1, timeout) == 0) {
diff --git a/doc/designs/ddd/ddd-02-conn-nonblocking.c b/doc/designs/ddd/ddd-02-conn-nonblocking.c
index a92892f6e1423..b24d3720e980c 100644
--- a/doc/designs/ddd/ddd-02-conn-nonblocking.c
+++ b/doc/designs/ddd/ddd-02-conn-nonblocking.c
@@ -65,7 +65,7 @@ APP_CONN *new_conn(SSL_CTX *ctx, const char *hostname)
     SSL *ssl = NULL;
     const char *bare_hostname;
 #ifdef USE_QUIC
-    static const unsigned char alpn[] = {5, 'd', 'u', 'm', 'm', 'y'};
+    static const unsigned char alpn[] = { 5, 'd', 'u', 'm', 'm', 'y' };
 #endif
 
     conn = calloc(1, sizeof(APP_CONN));
@@ -228,8 +228,8 @@ int get_conn_pending_tx(APP_CONN *conn)
 {
 #ifdef USE_QUIC
     return (SSL_net_read_desired(conn->ssl) ? POLLIN : 0)
-           | (SSL_net_write_desired(conn->ssl) ? POLLOUT : 0)
-           | POLLERR;
+        | (SSL_net_write_desired(conn->ssl) ? POLLOUT : 0)
+        | POLLERR;
 #else
     return (conn->tx_need_rx ? POLLIN : 0) | POLLOUT | POLLERR;
 #endif
@@ -302,13 +302,13 @@ void teardown_ctx(SSL_CTX *ctx)
 
 static inline void ms_to_timeval(struct timeval *t, int ms)
 {
-    t->tv_sec   = ms < 0 ? -1 : ms/1000;
-    t->tv_usec  = ms < 0 ? 0 : (ms%1000)*1000;
+    t->tv_sec = ms < 0 ? -1 : ms / 1000;
+    t->tv_usec = ms < 0 ? 0 : (ms % 1000) * 1000;
 }
 
 static inline int timeval_to_ms(const struct timeval *t)
 {
-    return t->tv_sec*1000 + t->tv_usec/1000;
+    return t->tv_sec * 1000 + t->tv_usec / 1000;
 }
 
 int main(int argc, char **argv)
@@ -336,7 +336,7 @@ int main(int argc, char **argv)
 
     snprintf(host_port, sizeof(host_port), "%s:%s", argv[1], argv[2]);
     tx_len = snprintf(tx_msg, sizeof(tx_msg),
-                      "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", argv[1]);
+        "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", argv[1]);
 
     ctx = create_ssl_ctx();
     if (ctx == NULL) {
@@ -362,7 +362,7 @@ int main(int argc, char **argv)
 #ifdef USE_QUIC
             struct timeval start, now, deadline, t;
 #endif
-            struct pollfd pfd = {0};
+            struct pollfd pfd = { 0 };
 
 #ifdef USE_QUIC
             ms_to_timeval(&t, get_conn_pump_timeout(conn));
@@ -406,7 +406,7 @@ int main(int argc, char **argv)
 #ifdef USE_QUIC
             struct timeval start, now, deadline, t;
 #endif
-            struct pollfd pfd = {0};
+            struct pollfd pfd = { 0 };
 
 #ifdef USE_QUIC
             ms_to_timeval(&t, get_conn_pump_timeout(conn));
diff --git a/doc/designs/ddd/ddd-03-fd-blocking.c b/doc/designs/ddd/ddd-03-fd-blocking.c
index c545714c3c5f6..5adde1a9d5558 100644
--- a/doc/designs/ddd/ddd-03-fd-blocking.c
+++ b/doc/designs/ddd/ddd-03-fd-blocking.c
@@ -51,7 +51,7 @@ SSL *new_conn(SSL_CTX *ctx, int fd, const char *bare_hostname)
 {
     SSL *ssl;
 #ifdef USE_QUIC
-    static const unsigned char alpn[] = {5, 'd', 'u', 'm', 'm', 'y'};
+    static const unsigned char alpn[] = { 5, 'd', 'u', 'm', 'm', 'y' };
 #endif
 
     ssl = SSL_new(ctx);
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
 {
     int rc, fd = -1, l, mlen, res = 1;
     static char msg[300];
-    struct addrinfo hints = {0}, *result = NULL;
+    struct addrinfo hints = { 0 }, *result = NULL;
     SSL *ssl = NULL;
     SSL_CTX *ctx = NULL;
     char buf[2048];
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
     }
 
     mlen = snprintf(msg, sizeof(msg),
-                    "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", argv[1]);
+        "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", argv[1]);
 
     ctx = create_ssl_ctx();
     if (ctx == NULL) {
@@ -157,9 +157,9 @@ int main(int argc, char **argv)
         goto fail;
     }
 
-    hints.ai_family     = AF_INET;
-    hints.ai_socktype   = SOCK_STREAM;
-    hints.ai_flags      = AI_PASSIVE;
+    hints.ai_family = AF_INET;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags = AI_PASSIVE;
     rc = getaddrinfo(argv[1], argv[2], &hints, &result);
     if (rc < 0) {
         fprintf(stderr, "cannot resolve\n");
diff --git a/doc/designs/ddd/ddd-04-fd-nonblocking.c b/doc/designs/ddd/ddd-04-fd-nonblocking.c
index d39827adf66a6..42caac8967690 100644
--- a/doc/designs/ddd/ddd-04-fd-nonblocking.c
+++ b/doc/designs/ddd/ddd-04-fd-nonblocking.c
@@ -58,7 +58,7 @@ APP_CONN *new_conn(SSL_CTX *ctx, int fd, const char *bare_hostname)
     APP_CONN *conn;
     SSL *ssl;
 #ifdef USE_QUIC
-    static const unsigned char alpn[] = {5, 'd', 'u', 'm', 'm', 'y'};
+    static const unsigned char alpn[] = { 5, 'd', 'u', 'm', 'm', 'y' };
 #endif
 
     conn = calloc(1, sizeof(APP_CONN));
@@ -121,13 +121,13 @@ int tx(APP_CONN *conn, const void *buf, int buf_len)
     if (l <= 0) {
         rc = SSL_get_error(conn->ssl, l);
         switch (rc) {
-            case SSL_ERROR_WANT_READ:
-                conn->tx_need_rx = 1;
-            case SSL_ERROR_WANT_CONNECT:
-            case SSL_ERROR_WANT_WRITE:
-                return -2;
-            default:
-                return -1;
+        case SSL_ERROR_WANT_READ:
+            conn->tx_need_rx = 1;
+        case SSL_ERROR_WANT_CONNECT:
+        case SSL_ERROR_WANT_WRITE:
+            return -2;
+        default:
+            return -1;
         }
     }
 
@@ -150,12 +150,12 @@ int rx(APP_CONN *conn, void *buf, int buf_len)
     if (l <= 0) {
         rc = SSL_get_error(conn->ssl, l);
         switch (rc) {
-            case SSL_ERROR_WANT_WRITE:
-                conn->rx_need_tx = 1;
-            case SSL_ERROR_WANT_READ:
-                return -2;
-            default:
-                return -1;
+        case SSL_ERROR_WANT_WRITE:
+            conn->rx_need_tx = 1;
+        case SSL_ERROR_WANT_READ:
+            return -2;
+        default:
+            return -1;
         }
     }
 
@@ -199,8 +199,8 @@ int get_conn_pending_tx(APP_CONN *conn)
 {
 #ifdef USE_QUIC
     return (SSL_net_read_desired(conn->ssl) ? POLLIN : 0)
-           | (SSL_net_write_desired(conn->ssl) ? POLLOUT : 0)
-           | POLLERR;
+        | (SSL_net_write_desired(conn->ssl) ? POLLOUT : 0)
+        | POLLERR;
 #else
     return (conn->tx_need_rx ? POLLIN : 0) | POLLOUT | POLLERR;
 #endif
@@ -270,7 +270,7 @@ void teardown_ctx(SSL_CTX *ctx)
 #include <sys/socket.h>
 #include <sys/signal.h>
 #ifdef USE_QUIC
-# include <sys/time.h>
+#include <sys/time.h>
 #endif
 #include <netdb.h>
 #include <unistd.h>
@@ -280,13 +280,13 @@ void teardown_ctx(SSL_CTX *ctx)
 
 static inline void ms_to_timeval(struct timeval *t, int ms)
 {
-    t->tv_sec   = ms < 0 ? -1 : ms/1000;
-    t->tv_usec  = ms < 0 ? 0 : (ms%1000)*1000;
+    t->tv_sec = ms < 0 ? -1 : ms / 1000;
+    t->tv_usec = ms < 0 ? 0 : (ms % 1000) * 1000;
 }
 
 static inline int timeval_to_ms(const struct timeval *t)
 {
-    return t->tv_sec*1000 + t->tv_usec/1000;
+    return t->tv_sec * 1000 + t->tv_usec / 1000;
 }
 
 #endif
@@ -304,7 +304,7 @@ int main(int argc, char **argv)
     int timeout = 2000 /* ms */;
 #endif
     APP_CONN *conn = NULL;
-    struct addrinfo hints = {0}, *result = NULL;
+    struct addrinfo hints = { 0 }, *result = NULL;
     SSL_CTX *ctx = NULL;
 
 #ifdef USE_QUIC
@@ -317,7 +317,7 @@ int main(int argc, char **argv)
     }
 
     tx_len = snprintf(tx_msg, sizeof(tx_msg),
-                      "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", argv[1]);
+        "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", argv[1]);
 
     ctx = create_ssl_ctx();
     if (ctx == NULL) {
@@ -325,9 +325,9 @@ int main(int argc, char **argv)
         goto fail;
     }
 
-    hints.ai_family     = AF_INET;
-    hints.ai_socktype   = SOCK_STREAM;
-    hints.ai_flags      = AI_PASSIVE;
+    hints.ai_family = AF_INET;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags = AI_PASSIVE;
     rc = getaddrinfo(argv[1], argv[2], &hints, &result);
     if (rc < 0) {
         fprintf(stderr, "cannot resolve\n");
@@ -377,7 +377,7 @@ int main(int argc, char **argv)
 #ifdef USE_QUIC
             struct timeval start, now, deadline, t;
 #endif
-            struct pollfd pfd = {0};
+            struct pollfd pfd = { 0 };
 
 #ifdef USE_QUIC
             ms_to_timeval(&t, get_conn_pump_timeout(conn));
@@ -421,7 +421,7 @@ int main(int argc, char **argv)
 #ifdef USE_QUIC
             struct timeval start, now, deadline, t;
 #endif
-            struct pollfd pfd = {0};
+            struct pollfd pfd = { 0 };
 
 #ifdef USE_QUIC
             ms_to_timeval(&t, get_conn_pump_timeout(conn));
diff --git a/doc/designs/ddd/ddd-05-mem-nonblocking.c b/doc/designs/ddd/ddd-05-mem-nonblocking.c
index 8e30016bb180a..33b156ccc5429 100644
--- a/doc/designs/ddd/ddd-05-mem-nonblocking.c
+++ b/doc/designs/ddd/ddd-05-mem-nonblocking.c
@@ -63,7 +63,7 @@ APP_CONN *new_conn(SSL_CTX *ctx, const char *bare_hostname)
     APP_CONN *conn;
     SSL *ssl;
 #ifdef USE_QUIC
-    static const unsigned char alpn[] = {5, 'd', 'u', 'm', 'm', 'y'};
+    static const unsigned char alpn[] = { 5, 'd', 'u', 'm', 'm', 'y' };
 #endif
 
     conn = calloc(1, sizeof(APP_CONN));
@@ -125,8 +125,8 @@ APP_CONN *new_conn(SSL_CTX *ctx, const char *bare_hostname)
     }
 #endif
 
-    conn->ssl_bio   = ssl_bio;
-    conn->net_bio   = net_bio;
+    conn->ssl_bio = ssl_bio;
+    conn->net_bio = net_bio;
     return conn;
 }
 
@@ -144,13 +144,13 @@ int tx(APP_CONN *conn, const void *buf, int buf_len)
     if (l <= 0) {
         rc = SSL_get_error(conn->ssl, l);
         switch (rc) {
-            case SSL_ERROR_WANT_READ:
-                conn->tx_need_rx = 1;
-            case SSL_ERROR_WANT_CONNECT:
-            case SSL_ERROR_WANT_WRITE:
-                return -2;
-            default:
-                return -1;
+        case SSL_ERROR_WANT_READ:
+            conn->tx_need_rx = 1;
+        case SSL_ERROR_WANT_CONNECT:
+        case SSL_ERROR_WANT_WRITE:
+            return -2;
+        default:
+            return -1;
         }
     } else {
         conn->tx_need_rx = 0;
@@ -173,12 +173,12 @@ int rx(APP_CONN *conn, void *buf, int buf_len)
     if (l <= 0) {
         rc = SSL_get_error(conn->ssl, l);
         switch (rc) {
-            case SSL_ERROR_WANT_WRITE:
-                conn->rx_need_tx = 1;
-            case SSL_ERROR_WANT_READ:
-                return -2;
-            default:
-                return -1;
+        case SSL_ERROR_WANT_WRITE:
+            conn->rx_need_tx = 1;
+        case SSL_ERROR_WANT_READ:
+            return -2;
+        default:
+            return -1;
         }
     } else {
         conn->rx_need_tx = 0;
@@ -245,8 +245,8 @@ int get_conn_pending_tx(APP_CONN *conn)
 {
 #ifdef USE_QUIC
     return (SSL_net_read_desired(conn->ssl) ? POLLIN : 0)
-           | (SSL_net_write_desired(conn->ssl) ? POLLOUT : 0)
-           | POLLERR;
+        | (SSL_net_write_desired(conn->ssl) ? POLLOUT : 0)
+        | POLLERR;
 #else
     return (conn->tx_need_rx ? POLLIN : 0) | POLLOUT | POLLERR;
 #endif
@@ -299,7 +299,7 @@ static int pump(APP_CONN *conn, int fd, int events, int timeout)
     int l, l2;
     char buf[2048]; /* QUIC: would need to be changed if < 1472 */
     size_t wspace;
-    struct pollfd pfd = {0};
+    struct pollfd pfd = { 0 };
 
     pfd.fd = fd;
     pfd.events = (events & (POLLIN | POLLERR));
@@ -308,7 +308,7 @@ static int pump(APP_CONN *conn, int fd, int events, int timeout)
     if (net_tx_avail(conn) > 0)
         pfd.events |= POLLOUT;
 
-    if ((pfd.events & (POLLIN|POLLOUT)) == 0)
+    if ((pfd.events & (POLLIN | POLLOUT)) == 0)
         return 1;
 
     if (poll(&pfd, 1, timeout) == 0)
@@ -319,21 +319,22 @@ static int pump(APP_CONN *conn, int fd, int events, int timeout)
             l = read(fd, buf, wspace > sizeof(buf) ? sizeof(buf) : wspace);
             if (l <= 0) {
                 switch (errno) {
-                    case EAGAIN:
+                case EAGAIN:
+                    goto stop;
+                default:
+                    if (l == 0) /* EOF */
                         goto stop;
-                    default:
-                        if (l == 0) /* EOF */
-                            goto stop;
 
-                        fprintf(stderr, "error on read: %d\n", errno);
-                        return -1;
+                    fprintf(stderr, "error on read: %d\n", errno);
+                    return -1;
                 }
                 break;
             }
             l2 = write_net_rx(conn, buf, l);
             if (l2 < l)
                 fprintf(stderr, "short write %d %d\n", l2, l);
-        } stop:;
+        }
+    stop:;
     }
 
     if (pfd.revents & POLLOUT) {
@@ -359,7 +360,7 @@ int main(int argc, char **argv)
     int l, tx_len;
     int timeout = 2000 /* ms */;
     APP_CONN *conn = NULL;
-    struct addrinfo hints = {0}, *result = NULL;
+    struct addrinfo hints = { 0 }, *result = NULL;
     SSL_CTX *ctx = NULL;
 
     if (argc < 3) {
@@ -368,8 +369,8 @@ int main(int argc, char **argv)
     }
 
     tx_len = snprintf(tx_msg, sizeof(tx_msg),
-                      "GET / HTTP/1.0\r\nHost: %s\r\n\r\n",
-                      argv[1]);
+        "GET / HTTP/1.0\r\nHost: %s\r\n\r\n",
+        argv[1]);
 
     ctx = create_ssl_ctx();
     if (ctx == NULL) {
@@ -377,9 +378,9 @@ int main(int argc, char **argv)
         goto fail;
     }
 
-    hints.ai_family     = AF_INET;
-    hints.ai_socktype   = SOCK_STREAM;
-    hints.ai_flags      = AI_PASSIVE;
+    hints.ai_family = AF_INET;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags = AI_PASSIVE;
     rc = getaddrinfo(argv[1], argv[2], &hints, &result);
     if (rc < 0) {
         fprintf(stderr, "cannot resolve\n");
diff --git a/doc/designs/ddd/ddd-06-mem-uv.c b/doc/designs/ddd/ddd-06-mem-uv.c
index b4e2164e91963..fd5eadc3c6ef7 100644
--- a/doc/designs/ddd/ddd-06-mem-uv.c
+++ b/doc/designs/ddd/ddd-06-mem-uv.c
@@ -3,16 +3,16 @@
 #include <uv.h>
 #include <assert.h>
 #ifdef USE_QUIC
-# include <sys/time.h>
+#include <sys/time.h>
 #endif
 
 typedef struct app_conn_st APP_CONN;
 typedef struct upper_write_op_st UPPER_WRITE_OP;
 typedef struct lower_write_op_st LOWER_WRITE_OP;
 
-typedef void (app_connect_cb)(APP_CONN *conn, int status, void *arg);
-typedef void (app_write_cb)(APP_CONN *conn, int status, void *arg);
-typedef void (app_read_cb)(APP_CONN *conn, void *buf, size_t buf_len, void *arg);
+typedef void(app_connect_cb)(APP_CONN *conn, int status, void *arg);
+typedef void(app_write_cb)(APP_CONN *conn, int status, void *arg);
+typedef void(app_read_cb)(APP_CONN *conn, void *buf, size_t buf_len, void *arg);
 
 #ifdef USE_QUIC
 static void set_timer(APP_CONN *conn);
@@ -32,7 +32,7 @@ static int setup_ssl(APP_CONN *conn, const char *hostname);
 #ifdef USE_QUIC
 static inline int timeval_to_ms(const struct timeval *t)
 {
-    return t->tv_sec*1000 + t->tv_usec/1000;
+    return t->tv_sec * 1000 + t->tv_usec / 1000;
 }
 #endif
 
@@ -42,12 +42,12 @@ static inline int timeval_to_ms(const struct timeval *t)
  * it is in WANT_READ.
  */
 struct upper_write_op_st {
-    struct upper_write_op_st   *prev, *next;
-    const uint8_t              *buf;
-    size_t                      buf_len, written;
-    APP_CONN                   *conn;
-    app_write_cb               *cb;
-    void                       *cb_arg;
+    struct upper_write_op_st *prev, *next;
+    const uint8_t *buf;
+    size_t buf_len, written;
+    APP_CONN *conn;
+    app_write_cb *cb;
+    void *cb_arg;
 };
 
 /*
@@ -55,37 +55,37 @@ struct upper_write_op_st {
  */
 struct lower_write_op_st {
 #ifdef USE_QUIC
-    uv_udp_send_t   w;
+    uv_udp_send_t w;
 #else
-    uv_write_t      w;
+    uv_write_t w;
 #endif
-    uv_buf_t        b;
-    uint8_t        *buf;
-    APP_CONN       *conn;
+    uv_buf_t b;
+    uint8_t *buf;
+    APP_CONN *conn;
 };
 
 /*
  * Application connection object.
  */
 struct app_conn_st {
-    SSL_CTX        *ctx;
-    SSL            *ssl;
-    BIO            *net_bio;
+    SSL_CTX *ctx;
+    SSL *ssl;
+    BIO *net_bio;
 #ifdef USE_QUIC
-    uv_udp_t        udp;
-    uv_timer_t      timer;
+    uv_udp_t udp;
+    uv_timer_t timer;
 #else
-    uv_stream_t    *stream;
-    uv_tcp_t        tcp;
-    uv_connect_t    tcp_connect;
+    uv_stream_t *stream;
+    uv_tcp_t tcp;
+    uv_connect_t tcp_connect;
 #endif
-    app_connect_cb *app_connect_cb;   /* called once handshake is done */
-    void           *app_connect_arg;
-    app_read_cb    *app_read_cb;      /* application's on-RX callback */
-    void           *app_read_arg;
-    const char     *hostname;
-    char            init_handshake, done_handshake, closed;
-    char           *teardown_done;
+    app_connect_cb *app_connect_cb; /* called once handshake is done */
+    void *app_connect_arg;
+    app_read_cb *app_read_cb; /* application's on-RX callback */
+    void *app_read_arg;
+    const char *hostname;
+    char init_handshake, done_handshake, closed;
+    char *teardown_done;
 
     UPPER_WRITE_OP *pending_upper_write_head, *pending_upper_write_tail;
 };
@@ -129,8 +129,8 @@ SSL_CTX *create_ssl_ctx(void)
  */
 
 APP_CONN *new_conn(SSL_CTX *ctx, const char *hostname,
-                   struct sockaddr *sa, socklen_t sa_len,
-                   app_connect_cb *cb, void *arg)
+    struct sockaddr *sa, socklen_t sa_len,
+    app_connect_cb *cb, void *arg)
 {
     int rc;
     APP_CONN *conn = NULL;
@@ -149,15 +149,15 @@ APP_CONN *new_conn(SSL_CTX *ctx, const char *hostname,
     uv_tcp_init(uv_default_loop(), &conn->tcp);
     conn->tcp.data = conn;
 
-    conn->stream            = (uv_stream_t *)&conn->tcp;
+    conn->stream = (uv_stream_t *)&conn->tcp;
 #endif
 
-    conn->app_connect_cb    = cb;
-    conn->app_connect_arg   = arg;
+    conn->app_connect_cb = cb;
+    conn->app_connect_arg = arg;
 #ifdef USE_QUIC
     rc = uv_udp_connect(&conn->udp, sa);
 #else
-    conn->tcp_connect.data  = conn;
+    conn->tcp_connect.data = conn;
     rc = uv_tcp_connect(&conn->tcp_connect, &conn->tcp, sa, tcp_connect_done);
 #endif
     if (rc < 0) {
@@ -169,8 +169,8 @@ APP_CONN *new_conn(SSL_CTX *ctx, const char *hostname,
         return NULL;
     }
 
-    conn->ctx       = ctx;
-    conn->hostname  = hostname;
+    conn->ctx = ctx;
+    conn->hostname = hostname;
 
 #ifdef USE_QUIC
     rc = setup_ssl(conn, hostname);
@@ -189,7 +189,7 @@ APP_CONN *new_conn(SSL_CTX *ctx, const char *hostname,
  */
 int app_read_start(APP_CONN *conn, app_read_cb *cb, void *arg)
 {
-    conn->app_read_cb  = cb;
+    conn->app_read_cb = cb;
     conn->app_read_arg = arg;
     set_rx(conn);
     return 0;
@@ -280,7 +280,7 @@ static void dequeue_upper_write_op(APP_CONN *conn)
 }
 
 static void net_read_alloc(uv_handle_t *handle,
-                           size_t suggested_size, uv_buf_t *buf)
+    size_t suggested_size, uv_buf_t *buf)
 {
 #ifdef USE_QUIC
     if (suggested_size < 1472)
@@ -288,7 +288,7 @@ static void net_read_alloc(uv_handle_t *handle,
 #endif
 
     buf->base = malloc(suggested_size);
-    buf->len  = suggested_size;
+    buf->len = suggested_size;
 }
 
 static void on_rx_push(APP_CONN *conn)
@@ -349,7 +349,7 @@ static void handle_pending_writes(APP_CONN *conn)
 
 #ifdef USE_QUIC
 static void net_read_done(uv_udp_t *stream, ssize_t nr, const uv_buf_t *buf,
-                          const struct sockaddr *addr, unsigned int flags)
+    const struct sockaddr *addr, unsigned int flags)
 #else
 static void net_read_done(uv_stream_t *stream, ssize_t nr, const uv_buf_t *buf)
 #endif
@@ -440,11 +440,11 @@ static void flush_write_buf(APP_CONN *conn)
     if (!op)
         return;
 
-    op->buf     = buf;
-    op->conn    = conn;
-    op->w.data  = op;
-    op->b.base  = (char *)buf;
-    op->b.len   = rd;
+    op->buf = buf;
+    op->conn = conn;
+    op->w.data = op;
+    op->b.base = (char *)buf;
+    op->b.len = rd;
 
 #ifdef USE_QUIC
     rc = uv_udp_send(&op->w, &conn->udp, &op->b, 1, NULL, net_write_done);
@@ -497,7 +497,7 @@ static int setup_ssl(APP_CONN *conn, const char *hostname)
     BIO *internal_bio = NULL, *net_bio = NULL;
     SSL *ssl = NULL;
 #ifdef USE_QUIC
-    static const unsigned char alpn[] = {5, 'd', 'u', 'm', 'm', 'y'};
+    static const unsigned char alpn[] = { 5, 'd', 'u', 'm', 'm', 'y' };
 #endif
 
     ssl = SSL_new(conn->ctx);
@@ -539,8 +539,8 @@ static int setup_ssl(APP_CONN *conn, const char *hostname)
     }
 #endif
 
-    conn->net_bio             = net_bio;
-    conn->ssl                 = ssl;
+    conn->net_bio = net_bio;
+    conn->ssl = ssl;
     return handshake_ssl(conn);
 }
 
@@ -634,11 +634,11 @@ static int write_deferred(APP_CONN *conn, const void *buf, size_t buf_len, app_w
     if (!op)
         return -1;
 
-    op->buf     = buf;
+    op->buf = buf;
     op->buf_len = buf_len;
-    op->conn    = conn;
-    op->cb      = cb;
-    op->cb_arg  = arg;
+    op->conn = conn;
+    op->cb = cb;
+    op->cb_arg = arg;
 
     enqueue_upper_write_op(conn, op);
     set_rx(conn);
@@ -657,7 +657,7 @@ static void teardown_continued(uv_handle_t *handle)
         return;
 #endif
 
-    for (op=conn->pending_upper_write_head; op; op=next_op) {
+    for (op = conn->pending_upper_write_head; op; op = next_op) {
         next_op = op->next;
         free(op);
     }
@@ -720,7 +720,7 @@ int main(int argc, char **argv)
     int rc = 1;
     SSL_CTX *ctx = NULL;
     APP_CONN *conn = NULL;
-    struct addrinfo hints = {0}, *result = NULL;
+    struct addrinfo hints = { 0 }, *result = NULL;
 
     if (argc < 3) {
         fprintf(stderr, "usage: %s host port\n", argv[0]);
@@ -728,15 +728,15 @@ int main(int argc, char **argv)
     }
 
     mlen = snprintf(tx_msg, sizeof(tx_msg),
-                    "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", argv[1]);
+        "GET / HTTP/1.0\r\nHost: %s\r\n\r\n", argv[1]);
 
     ctx = create_ssl_ctx();
     if (!ctx)
         goto fail;
 
-    hints.ai_family     = AF_INET;
-    hints.ai_socktype   = SOCK_STREAM;
-    hints.ai_flags      = AI_PASSIVE;
+    hints.ai_family = AF_INET;
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags = AI_PASSIVE;
     rc = getaddrinfo(argv[1], argv[2], &hints, &result);
     if (rc < 0) {
         fprintf(stderr, "cannot resolve\n");
diff --git a/doc/designs/evp_skey.md b/doc/designs/evp_skey.md
index 1c8e949669189..74ec53aef65ef 100644
--- a/doc/designs/evp_skey.md
+++ b/doc/designs/evp_skey.md
@@ -102,9 +102,9 @@ EVP_SKEY *EVP_SKEY_generate(OSSL_LIB_CTX *libctx, const char *skeymgmtname,
 EVP_SKEY *EVP_SKEY_import(OSSL_LIB_CTX *libctx, const char *skeymgmtname,
                           const char *propquery,
                           int selection, const OSSL_PARAM *params);
-EVP_SKEY *EVP_SKEY_import_raw(OSSL_LIB_CTX *libctx, const char *skeymgmtname,
-                              const char *key, size_t keylen,
-                              const char *propquery);
+EVP_SKEY *EVP_SKEY_import_raw_key(OSSL_LIB_CTX *libctx, const char *skeymgmtname,
+                                  unsigned char *key, size_t keylen,
+                                  const char *propquery);
 int EVP_SKEY_up_ref(EVP_SKEY *skey);
 void EVP_SKEY_free(EVP_SKEY *skey);
 ```
diff --git a/doc/designs/fetching-composite-algorithms.md b/doc/designs/fetching-composite-algorithms.md
index 1e3fa9996876d..c381aa7ccb0bc 100644
--- a/doc/designs/fetching-composite-algorithms.md
+++ b/doc/designs/fetching-composite-algorithms.md
@@ -20,19 +20,19 @@ Public API - Add variants of `EVP_PKEY_CTX` initializers
 
 As far as this design is concerned, these API sets are affected:
 
-- SIGNATURE (DigestSign and DigestVerify)
+- SIGNATURE
 - ASYM_CIPHER
 - KEYEXCH
 
-The proposal is to add these functions:
+The proposal is to add these initializer functions:
 
 ``` C
-EVP_DigestSignInit_ex2(EVP_PKEY_CTX **pctx,
-                       EVP_SIGNATURE *sig, EVP_PKEY *pkey,
-                       OSSL_LIB_CTX *libctx, const OSSL_PARAM params[]);
-EVP_DigestVerifyInit_ex2(EVP_PKEY_CTX **pctx,
-                         EVP_SIGNATURE *sig, EVP_PKEY *pkey,
-                         OSSL_LIB_CTX *libctx, const OSSL_PARAM params[]);
+int EVP_PKEY_sign_init_ex2(EVP_PKEY_CTX *pctx,
+                           EVP_SIGNATURE *algo, const OSSL_PARAM params[]);
+int EVP_PKEY_verify_init_ex2(EVP_PKEY_CTX *pctx,
+                             EVP_SIGNATURE *algo, const OSSL_PARAM params[]);
+int EVP_PKEY_verify_recover_init_ex2(EVP_PKEY_CTX *pctx,
+                                     EVP_SIGNATURE *algo, const OSSL_PARAM params[]);
 
 int EVP_PKEY_encrypt_init_ex2(EVP_PKEY_CTX *ctx, EVP_ASYM_CIPHER *asymciph,
                               const OSSL_PARAM params[]);
@@ -43,68 +43,12 @@ int EVP_PKEY_derive_init_ex2(EVP_PKEY_CTX *ctx, EVP_KEYEXCH *exchange,
                              const OSSL_PARAM params[]);
 ```
 
-Because `EVP_SIGNATURE`, `EVP_ASYM_CIPHER` and `EVP_KEYEXCH` aren't limited
-to composite algorithms, these functions can be used just as well with
-explicit fetches of simple algorithms, say "RSA".  In that case, the caller
-will need to pass necessary auxiliary parameters through the `OSSL_PARAM` or
-a call to a corresponding `set_params` function.
+Detailed proposal for these APIs will be or are prepared in other design
+documents:
 
-Requirements on the providers
------------------------------
-
-Because it's not immediately obvious from a composite algorithm name what
-key type it requires / supports, at least in code, allowing the use of an
-explicitly fetched implementation of a composite algorithm requires that
-providers cooperate by declaring what key type is required / supported by
-each algorithm.
-
-For non-composite operation algorithms (like "RSA"), this is not necessary,
-see the fallback strategies below.
-
-There are two ways this could be implemented:
-
-1.  through an added provider function that would work like keymgmt's
-    `query_operation_name` function, but would return a key type name
-    instead:
-
-    ``` C
-    # define OSSL_FUNC_SIGNATURE_QUERY_KEY_TYPE         26
-    OSSL_CORE_MAKE_FUNC(const char *, signature_query_key_type, (void))
-
-    # define OSSL_FUNC ASYM_CIPHER_QUERY_KEY_TYPE       12
-    OSSL_CORE_MAKE_FUNC(const char *, asym_cipher_query_key_type, (void))
-
-    # define OSSL_FUNC_KEYEXCH_QUERY_KEY_TYPE           11
-    OSSL_CORE_MAKE_FUNC(const char *, keyexch_query_key_type, (void))
-    ```
-
-2.  through a gettable `OSSL_PARAM`, using the param identity "keytype"
-
-Fallback strategies
--------------------
-
-Because existing providers haven't been updated to declare composite
-algorithms, or to respond to the key type query, some fallback strategies
-will be needed to find out if the `EVP_PKEY` key type is possible to use
-with the fetched algorithm:
-
--   Check if the fetched operation name matches the key type (keymgmt name)
-    of the `EVP_PKEY` that's involved in the operation.  For example, this
-    is useful when someone fetched the `EVP_SIGNATURE` "RSA".
--   Check if the fetched algorithm name matches the name returned by the
-    keymgmt's `query_operation_name` function.  For example, this is useful
-    when someone fetched the `EVP_SIGNATURE` "ECDSA", for which the key type
-    to use is "EC".
--   libcrypto currently has knowledge of some composite algorithm names and
-    what they are composed of, accessible with `OBJ_find_sigid_algs` and
-    similar functionality.  This knowledge is regarded legacy, but can be
-    used to figure out the key type.
-
-If none of these strategies work out, the operation initialization should
-fail.
-
-These strategies have their limitations, but the built-in legacy knowledge
-we currently have in libcrypto should be enough to cover most bases.
+- [Functions for explicitly fetched signature algorithms]
+- [Functions for explicitly fetched asym-cipher algorithms] (not yet designed)
+- [Functions for explicitly fetched keyexch algorithms] (not yet designed)
 
 -----
 
@@ -185,3 +129,7 @@ This is hurtful in multiple ways:
     use the result.
 -   It fails discoverability, for example through the `openssl list`
     command.
+
+<!-- links -->
+[Functions for explicitly fetched signature algorithms]:
+    functions-for-explicitly-fetched-signature-algorithms.md
diff --git a/doc/designs/functions-for-explicitly-fetched-signature-algorithms.md b/doc/designs/functions-for-explicitly-fetched-signature-algorithms.md
new file mode 100644
index 0000000000000..d474c588bd209
--- /dev/null
+++ b/doc/designs/functions-for-explicitly-fetched-signature-algorithms.md
@@ -0,0 +1,205 @@
+Functions for explicitly fetched PKEY algorithms
+================================================
+
+Quick background
+----------------
+
+There are several proposed designs that end up revolving around the same
+basic need, explicitly fetched signature algorithms.  The following method
+type is affected by this document:
+
+- `EVP_SIGNATURE`
+
+Public API - Add variants of `EVP_PKEY_CTX` functionality
+---------------------------------------------------------
+
+Through OTC discussions, it's been determined that the most suitable APIs to
+touch are the of `EVP_PKEY_` functions.
+Specifically, `EVP_PKEY_sign()`, `EVP_PKEY_verify()`, `EVP_PKEY_verify_recover()`
+and related functions.
+They can be extended to accept an explicitly fetched algorithm of the right
+type, and to be able to incrementally process indefinite length data streams
+when the fetched algorithm permits it (for example, RSA-SHA256).
+
+It must be made clear that the added functionality cannot be used to compose
+an algorithm from different parts.  For example, it's not possible to specify
+a `EVP_SIGNATURE` "RSA" and combine it with a parameter that specifies the
+hash "SHA256" to get the "RSA-SHA256" functionality.  For an `EVP_SIGNATURE`
+"RSA", the input is still expected to be a digest, or some other input that's
+limited to the modulus size of the RSA pkey.
+
+### Making things less confusing with distinct function names
+
+Until now, `EVP_PKEY_sign()` and friends were only expected to act on the
+pre-computed digest of a message (under the condition that proper flags
+and signature md are specified using functions like
+`EVP_PKEY_CTX_set_rsa_padding()` and `EVP_PKEY_CTX_set_signature_md()`),
+or to act as "primitive" [^1] functions (under the condition that proper
+flags are specified, like `RSA_NO_PADDING` for RSA signatures).
+
+This design proposes an extension to also allow full (not pre-hashed)
+messages to be passed, in a streaming style through an *update* and a
+*final* function.
+
+Discussions have revealed that it is potentially confusing to conflate the
+current functionality with streaming style functionality into the same name,
+so this design separates those out with specific init / update / final
+functions for that purpose.  For oneshot functionality, `EVP_PKEY_sign()`
+and `EVP_PKEY_verify()` remain supported.
+
+[^1]: the term "primitive" is borrowed from [PKCS#1](https://www.rfc-editor.org/rfc/rfc8017#section-5)
+
+### Making it possible to verify with an early signature
+
+Some more recent verification algorithms need to obtain the signature
+before processing the data.
+This is particularly important for streaming modes of operation.
+This design proposes a mechanism to accommodate these algorithms
+and modes of operation.
+
+New public API - API Reference
+------------------------------
+
+### For limited input size / oneshot signing with `EVP_SIGNATURE`
+
+``` C
+int EVP_PKEY_sign_init_ex2(EVP_PKEY_CTX *pctx,
+                           EVP_SIGNATURE *algo,
+                           const OSSL_PARAM params[]);
+```
+
+### For signing a stream with `EVP_SIGNATURE`
+
+``` C
+int EVP_PKEY_sign_message_init(EVP_PKEY_CTX *pctx,
+                               EVP_SIGNATURE *algo,
+                               const OSSL_PARAM params[]);
+int EVP_PKEY_sign_message_update(EVP_PKEY_CTX *ctx,
+                                 const unsigned char *in,
+                                 size_t inlen);
+int EVP_PKEY_sign_message_final(EVP_PKEY_CTX *ctx,
+                                unsigned char *sig,
+                                size_t *siglen);
+#define EVP_PKEY_sign_message(ctx,sig,siglen,tbs,tbslen) \
+    EVP_PKEY_sign(ctx,sig,siglen,tbs,tbslen)
+```
+
+### For limited input size / oneshot verification with `EVP_SIGNATURE`
+
+``` C
+int EVP_PKEY_verify_init_ex2(EVP_PKEY_CTX *pctx,
+                             EVP_SIGNATURE *algo,
+                             const OSSL_PARAM params[]);
+```
+
+### For verifying a stream with `EVP_SIGNATURE`
+
+``` C
+/* Initializers */
+int EVP_PKEY_verify_message_init(EVP_PKEY_CTX *pctx,
+                                 EVP_SIGNATURE *algo,
+                                 const OSSL_PARAM params[]);
+/* Signature setter */
+int EVP_PKEY_CTX_set_signature(EVP_PKEY_CTX *pctx,
+                               unsigned char *sig, size_t siglen,
+                               size_t sigsize);
+/* Update and final */
+int EVP_PKEY_verify_message_update(EVP_PKEY_CTX *ctx,
+                                   const unsigned char *in,
+                                   size_t inlen);
+int EVP_PKEY_verify_message_final(EVP_PKEY_CTX *ctx);
+
+#define EVP_PKEY_verify_message(ctx,sig,siglen,tbs,tbslen) \
+    EVP_PKEY_verify(ctx,sig,siglen,tbs,tbslen)
+```
+
+### For verify_recover with `EVP_SIGNATURE`
+
+Preliminary feedback suggests that a streaming interface is uninteresting for
+verify_recover, so we only specify a new init function.
+
+``` C
+/* Initializers */
+int EVP_PKEY_verify_recover_init_ex2(EVP_PKEY_CTX *pctx,
+                                     EVP_SIGNATURE *algo,
+                                     const OSSL_PARAM params[]);
+```
+
+Requirements on the providers
+-----------------------------
+
+Because it's not immediately obvious from a composite algorithm name what
+key type ("RSA", "EC", ...) it requires / supports, at least in code, allowing
+the use of an explicitly fetched implementation of a composite algorithm
+requires that providers cooperate by declaring what key type is required /
+supported by each algorithm.
+
+For non-composite operation algorithms (like "RSA"), this is not necessary,
+see the fallback strategies below.
+
+This is to be implemented through an added provider function that would work
+like keymgmt's `query_operation_name` function, but would return a NULL
+terminated array of key type name instead:
+
+``` C
+# define OSSL_FUNC_SIGNATURE_QUERY_KEY_TYPE         26
+OSSL_CORE_MAKE_FUNC(const char **, signature_query_key_type, (void))
+```
+
+Furthermore, the distinction of intent, i.e. whether the input is expected
+to be a pre-hashed digest or the original message, must be passed on to the
+provider.  Because we already distinguish that with function names in the
+public API, we use the same mapping in the provider interface.
+
+The already existing `signature_sign` and `signature_verify` remain as they
+are, and can be combined with message init calls.
+
+``` C
+# define OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_INIT      27
+# define OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_UPDATE    28
+# define OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_FINAL     29
+OSSL_CORE_MAKE_FUNC(int, signature_sign_message_init,
+                    (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))
+OSSL_CORE_MAKE_FUNC(int, signature_sign_message_final,
+                    (void *ctx, unsigned char *sig, size_t *siglen, size_t sigsize))
+
+# 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(int, signature_verify_message_init,
+                    (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))
+/*
+ * signature_verify_message_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))
+```
+
+Fallback strategies
+-------------------
+
+Because existing providers haven't been updated to respond to the key type
+query, some fallback strategies will be needed for the init calls that take
+an explicitly fetched `EVP_SIGNATURE` argument (they can at least be used
+for pre-hashed digest operations).  To find out if the `EVP_PKEY` key type
+is possible to use with the explicitly fetched algorithm, the following
+fallback strategies may be used.
+
+-   Check if the fetched operation name matches the key type (keymgmt name)
+    of the `EVP_PKEY` that's involved in the operation.  For example, this
+    is useful when someone fetched the `EVP_SIGNATURE` "RSA".  This requires
+    very little modification, as this is already done with the initializer
+    functions that fetch the algorithm implicitly.
+-   Check if the fetched algorithm name matches the name returned by the
+    keymgmt's `query_operation_name` function.  For example, this is useful
+    when someone fetched the `EVP_SIGNATURE` "ECDSA", for which the key type
+    to use is "EC".  This requires very little modification, as this is
+    already done with the initializer functions that fetch the algorithm
+    implicitly.
+
+If none of these strategies work out, the operation initialization should
+fail.
diff --git a/doc/designs/ml-dsa.md b/doc/designs/ml-dsa.md
index 2504b518890b2..efe8138fc5ec4 100644
--- a/doc/designs/ml-dsa.md
+++ b/doc/designs/ml-dsa.md
@@ -103,7 +103,7 @@ the API's used should be
 OpenSSL command line support
 ----------------------------
 
-For backwards compatability reasons `EVP_DigestSignInit_ex()`,
+For backwards compatibility reasons `EVP_DigestSignInit_ex()`,
 `EVP_DigestSign()`, `EVP_DigestVerifyInit_ex()` and `EVP_DigestVerify()` may
 also be used, but the digest passed in `mdname` must be NULL (i.e. it
 effectively behaves the same as above).
diff --git a/doc/designs/quic-design/quic-concurrency.md b/doc/designs/quic-design/quic-concurrency.md
index 55af2a94db981..1f8e23e336c96 100644
--- a/doc/designs/quic-design/quic-concurrency.md
+++ b/doc/designs/quic-design/quic-concurrency.md
@@ -386,7 +386,7 @@ int ossl_cml_write(QUIC_CML *cml, QUIC_CML_PIPE pipe_handle,
 /*
  * Returns the number of bytes a receiving pipe currently has waiting to be
  * read. The returned value may increase over time asynchronously but will only
- * decreate in response to an ossl_cml_read call.
+ * decrease in response to an ossl_cml_read call.
  */
 size_t ossl_cml_read_available(QUIC_CML *cml, QUIC_CML_PIPE pipe_handle);
 
diff --git a/doc/designs/quic-design/server/quic-polling.md b/doc/designs/quic-design/server/quic-polling.md
index 68b2c8a89d61e..cda4ffef5e5e4 100644
--- a/doc/designs/quic-design/server/quic-polling.md
+++ b/doc/designs/quic-design/server/quic-polling.md
@@ -1072,7 +1072,7 @@ typedef struct ssl_poll_event_st {
  * this, applications must still ensure no events in an SSL_POLL_EVENT
  * structure recorded from a previous call to this function are left over, which
  * may still reference that poll descriptor. Therefore, applications must still
- * excercise caution when freeing resources which are registered, or which were
+ * exercise caution when freeing resources which are registered, or which were
  * previously registered in a poll group.
  */
 #define SSL_POLL_FLAG_NO_HANDLE_EVENTS       (1U << 0)
@@ -1324,13 +1324,13 @@ void process_event(const SSL_POLL_EVENT *event)
         for (i = 0; i < nevents; ++i) {
             process_event(&events[i]); /* do something in application */
 
-            /* We have processed the event so now reenable it. */
+            /* We have processed the event so now re-enable it. */
             SSL_POLL_CHANGE_chflag(chg++, events[i].desc, events[i].instance,
                                    SSL_POLL_EVENT_FLAG_DISABLE, 0);
             ++nchanges;
         }
 
-        /* Reenable any event we processed and go to sleep again. */
+        /* Re-enable any event we processed and go to sleep again. */
         if (!SSL_POLL_GROUP_change_poll(pg, changes, nchanges, sizeof(changes[0]),
                                         events, OSSL_NELEM(events), sizeof(events[0]),
                                         NULL, 0, &nevents))
@@ -1419,7 +1419,7 @@ There are two kinds of polling that occur:
 Firstly, the `SSL_POLL_METHOD` object is defined abstractly as follows:
 
 ```c
-/* API (Psuedocode) */
+/* API (Pseudocode) */
 #define SSL_POLL_METHOD_CAP_IMMEDIATE  (1U << 0) /* supports immediate mode */
 #define SSL_POLL_METHOD_CAP_RETAINED   (1U << 1) /* supports retained mode */
 
diff --git a/crypto/bn/README.pod b/doc/internal/man3/bn_mul_words.pod
similarity index 91%
rename from crypto/bn/README.pod
rename to doc/internal/man3/bn_mul_words.pod
index 1286fc0d41325..d2d8e3397a144 100644
--- a/crypto/bn/README.pod
+++ b/doc/internal/man3/bn_mul_words.pod
@@ -8,7 +8,7 @@ bn_sqr_comba4, bn_sqr_comba8, bn_cmp_words, bn_mul_normal,
 bn_mul_low_normal, bn_mul_recursive, bn_mul_part_recursive,
 bn_mul_low_recursive, bn_sqr_normal, bn_sqr_recursive,
 bn_expand, bn_wexpand, bn_expand2, bn_fix_top, bn_check_top,
-bn_print, bn_dump, bn_set_max, bn_set_high, bn_set_low - BIGNUM
+mul, mul_add, sqr - BIGNUM
 library internal functions
 
 =head1 SYNOPSIS
@@ -45,21 +45,18 @@ library internal functions
  void bn_sqr_normal(BN_ULONG *r, BN_ULONG *a, int n, BN_ULONG *tmp);
  void bn_sqr_recursive(BN_ULONG *r, BN_ULONG *a, int n2, BN_ULONG *tmp);
 
- void mul(BN_ULONG r, BN_ULONG a, BN_ULONG w, BN_ULONG c);
- void mul_add(BN_ULONG r, BN_ULONG a, BN_ULONG w, BN_ULONG c);
- void sqr(BN_ULONG r0, BN_ULONG r1, BN_ULONG a);
-
  BIGNUM *bn_expand(BIGNUM *a, int bits);
  BIGNUM *bn_wexpand(BIGNUM *a, int n);
  BIGNUM *bn_expand2(BIGNUM *a, int n);
  void bn_fix_top(BIGNUM *a);
 
+The following are macros:
+
+ void mul(BN_ULONG r, BN_ULONG a, BN_ULONG w, BN_ULONG c);
+ void mul_add(BN_ULONG r, BN_ULONG a, BN_ULONG w, BN_ULONG c);
+ void sqr(BN_ULONG r0, BN_ULONG r1, BN_ULONG a);
+
  void bn_check_top(BIGNUM *a);
- void bn_print(BIGNUM *a);
- void bn_dump(BN_ULONG *d, int n);
- void bn_set_max(BIGNUM *a);
- void bn_set_high(BIGNUM *r, BIGNUM *a, int n);
- void bn_set_low(BIGNUM *r, BIGNUM *a, int n);
 
 =head1 DESCRIPTION
 
@@ -208,30 +205,23 @@ call bn_expand2(), which allocates a new B<d> array and copies the
 data.  They return B<NULL> on error, B<b> otherwise.
 
 The bn_fix_top() macro reduces B<a-E<gt>top> to point to the most
-significant non-zero word plus one when B<a> has shrunk.
+significant nonzero word plus one when B<a> has shrunk.
 
 =head2 Debugging
 
 bn_check_top() verifies that C<((a)-E<gt>top E<gt>= 0 && (a)-E<gt>top
 E<lt>= (a)-E<gt>dmax)>.  A violation will cause the program to abort.
 
-bn_print() prints B<a> to stderr. bn_dump() prints B<n> words at B<d>
-(in reverse order, i.e. most significant word first) to stderr.
-
-bn_set_max() makes B<a> a static number with a B<dmax> of its current size.
-This is used by bn_set_low() and bn_set_high() to make B<r> a read-only
-B<BIGNUM> that contains the B<n> low or high words of B<a>.
-
-If B<BN_DEBUG> is not defined, bn_check_top(), bn_print(), bn_dump()
-and bn_set_max() are defined as empty macros.
+If B<BN_DEBUG> is not defined, bn_check_top() is
+defined as an empty macro.
 
-=head1 SEE ALSO
+=head1 RETURN VALUES
 
-L<bn(3)>
+Described above.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-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
diff --git a/doc/internal/man3/ossl_cmp_certreq_new.pod b/doc/internal/man3/ossl_cmp_certreq_new.pod
index 37a234066d368..219ea7a5bcb26 100644
--- a/doc/internal/man3/ossl_cmp_certreq_new.pod
+++ b/doc/internal/man3/ossl_cmp_certreq_new.pod
@@ -150,7 +150,7 @@ The function does not protect the message if I<unprotectedErrors> is nonzero.
 
 =head1 NOTES
 
-CMP is specified in RFC 4210 (and CRMF in RFC 4211).
+CMP is specified in RFC 9810 (and CRMF in RFC 4211).
 
 =head1 RETURN VALUES
 
diff --git a/doc/internal/man3/ossl_cmp_ctx_set1_caPubs.pod b/doc/internal/man3/ossl_cmp_ctx_set1_caPubs.pod
index f3c45ed56c65b..3c5cf9f9a7e93 100644
--- a/doc/internal/man3/ossl_cmp_ctx_set1_caPubs.pod
+++ b/doc/internal/man3/ossl_cmp_ctx_set1_caPubs.pod
@@ -54,7 +54,7 @@ ossl_cmp_ctx_set1_recipNonce() sets the given recipient nonce in the context.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210 (and CRMF in RFC 4211).
+CMP is defined in RFC 9810.
 
 =head1 RETURN VALUES
 
diff --git a/doc/internal/man3/ossl_cmp_hdr_init.pod b/doc/internal/man3/ossl_cmp_hdr_init.pod
index a0804aa4cf2a4..61bdaad252bf1 100644
--- a/doc/internal/man3/ossl_cmp_hdr_init.pod
+++ b/doc/internal/man3/ossl_cmp_hdr_init.pod
@@ -72,7 +72,7 @@ PKIHeader to the given X509 Name value, without consuming the pointer.
 If B<nm> is NULL, recipient is set to the NULL DN (the empty list of strings).
 
 ossl_cmp_hdr_update_messagetime() (re-)sets the messageTime to the current
-system time. As written in RFC 4210, section 5.1.1:
+system time. As written in RFC 9810, section 5.1.1:
 The messageTime field contains the time at which the sender created the message.
 This may be useful to allow end entities to correct/check their local time for
 consistency with the time on a central system.
@@ -109,13 +109,13 @@ values in the given OSSL_CMP_CTX structure.
 This starts a new transaction in case ctx->transactionID is NULL.
 The sender name is copied from the subject of the client cert, if any,
 or else from the subject name provided for certification requests.
-As required by RFC 4210 section 5.1.1., if the sender name is not known
+As required by RFC 9810 section 5.1.1., if the sender name is not known
 to the client it set to the NULL-DN. In this case for identification at least
 the senderKID must be set, which we take from any referenceValue provided.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210 (and CRMF in RFC 4211).
+CMP is defined in RFC 9810.
 
 =head1 RETURN VALUES
 
diff --git a/doc/internal/man3/ossl_cmp_mock_srv_new.pod b/doc/internal/man3/ossl_cmp_mock_srv_new.pod
index 6f4f4fe86ba0c..165b68065063f 100644
--- a/doc/internal/man3/ossl_cmp_mock_srv_new.pod
+++ b/doc/internal/man3/ossl_cmp_mock_srv_new.pod
@@ -85,7 +85,7 @@ the client should wait for the next poll.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210 (and CRMF in RFC 4211).
+CMP is defined in RFC 9810 (and CRMF in RFC 4211).
 
 =head1 RETURN VALUES
 
diff --git a/doc/internal/man3/ossl_cmp_msg_check_update.pod b/doc/internal/man3/ossl_cmp_msg_check_update.pod
index d1513bf34f0c7..2a6a9fccb04c3 100644
--- a/doc/internal/man3/ossl_cmp_msg_check_update.pod
+++ b/doc/internal/man3/ossl_cmp_msg_check_update.pod
@@ -64,7 +64,7 @@ If all checks pass then ossl_cmp_msg_check_update()
 records in B<ctx> the senderNonce of the received message as the new recipNonce
 and learns the transaction ID if none is currently present in B<ctx>.
 
-Moreover, according to RFC 4210 section 5.3.2, if the message protection is
+Moreover, according to RFC 9810 section 5.3.2, if the message protection is
 PBM-based then any certificates in the caPubs field are added to the list of
 trusted certificates (if set via L<OSSL_CMP_CTX_set0_trusted(3)>).
 This way these certs are available for validating subsequent messages in the
diff --git a/doc/internal/man3/ossl_cmp_msg_create.pod b/doc/internal/man3/ossl_cmp_msg_create.pod
index d4294d3e9fa65..6a8321cd80bc0 100644
--- a/doc/internal/man3/ossl_cmp_msg_create.pod
+++ b/doc/internal/man3/ossl_cmp_msg_create.pod
@@ -107,7 +107,7 @@ Returns 1 on success, 0 on error.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210 (and CRMF in RFC 4211).
+CMP is defined in RFC 9810.
 
 =head1 RETURN VALUES
 
diff --git a/doc/internal/man3/ossl_cmp_msg_protect.pod b/doc/internal/man3/ossl_cmp_msg_protect.pod
index 7e14274f584ab..fce51c9840d2f 100644
--- a/doc/internal/man3/ossl_cmp_msg_protect.pod
+++ b/doc/internal/man3/ossl_cmp_msg_protect.pod
@@ -41,7 +41,7 @@ of the chain, i.e, the trust anchor (unless it is part of extraCertsOut).
 
 =head1 NOTES
 
-CMP is defined in RFC 4210 (and CRMF in RFC 4211).
+CMP is defined in RFC 9810.
 
 The I<ctx> parameter of ossl_cmp_msg_add_extraCerts()
 and thus also of ossl_cmp_msg_protect() cannot be made I<const>
diff --git a/doc/internal/man3/ossl_cmp_pkisi_get_status.pod b/doc/internal/man3/ossl_cmp_pkisi_get_status.pod
index e44bfd3f01904..df5acbf61d418 100644
--- a/doc/internal/man3/ossl_cmp_pkisi_get_status.pod
+++ b/doc/internal/man3/ossl_cmp_pkisi_get_status.pod
@@ -60,7 +60,7 @@ Uses data from I<ctx>, which in case of indirect POPO includes the private key.
 ossl_cmp_pkisi_get_status() returns the PKIStatus of I<si>, or -1 on error.
 
 ossl_cmp_PKIStatus_to_string() returns a human-readable string representing
-the PKIStatus values as specified in RFC 4210, Appendix F.
+the PKIStatus values as specified in RFC 9810, Appendix F.
 
 ossl_cmp_pkisi_get0_statusString() returns a direct pointer to the statusString
 field contained in I<si>.
@@ -73,7 +73,7 @@ with index I<index> in the PKIFailureInfo of the I<si>, or -1 on error.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210 (and CRMF in RFC 4211).
+CMP is defined in RFC 9810.
 
 =head1 RETURN VALUES
 
diff --git a/doc/internal/man3/ossl_namemap_new.pod b/doc/internal/man3/ossl_namemap_new.pod
index 7f4940fc93419..8879c592106b0 100644
--- a/doc/internal/man3/ossl_namemap_new.pod
+++ b/doc/internal/man3/ossl_namemap_new.pod
@@ -4,7 +4,7 @@
 
 ossl_namemap_new, ossl_namemap_free, ossl_namemap_stored, ossl_namemap_empty,
 ossl_namemap_add_name, ossl_namemap_add_names,
-ossl_namemap_name2num, ossl_namemap_name2num_n,
+ossl_namemap_name2num, ossl_namemap_name2num_n, ossl_namemap_num2name,
 ossl_namemap_doall_names
 - internal number E<lt>-E<gt> name map
 
@@ -23,6 +23,8 @@ ossl_namemap_doall_names
  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 *ossl_namemap_num2name(const OSSL_NAMEMAP *namemap, int number,
+                                   int idx);
  int ossl_namemap_doall_names(const OSSL_NAMEMAP *namemap, int number,
                               void (*fn)(const char *name, void *data),
                               void *data);
@@ -64,6 +66,9 @@ ossl_namemap_name2num_n() does the same thing as
 ossl_namemap_name2num(), but takes a string length I<name_len> as well,
 allowing the caller to use a fragment of a string as a name.
 
+ossl_namemap_num2name() finds the I<idx>th name associated with the
+id I<number>.
+
 ossl_namemap_doall_names() walks through all names associated with
 I<number> in the given I<namemap> and calls the function I<fn> for
 each of them.
@@ -88,9 +93,9 @@ to lock).
 ossl_namemap_add_name() returns the number associated with the added
 string, or zero on error.
 
-ossl_namemap_num2names() returns a pointer to a NULL-terminated list of
-pointers to the names corresponding to the given number, or NULL if
-it's undefined in the given B<OSSL_NAMEMAP>.
+ossl_namemap_num2name() returns a pointer to I<idx>th name associated
+with id I<number>, or NULL if it's undefined in the given
+B<OSSL_NAMEMAP>.
 
 ossl_namemap_name2num() and ossl_namemap_name2num_n() return the number
 corresponding to the given name, or 0 if it's undefined in the given
@@ -116,7 +121,7 @@ The functions described here were all added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-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
diff --git a/doc/man1/CA.pl.pod b/doc/man1/CA.pl.pod
index e05775cdca668..184382ee83358 100644
--- a/doc/man1/CA.pl.pod
+++ b/doc/man1/CA.pl.pod
@@ -6,6 +6,8 @@ CA.pl - friendlier interface for OpenSSL certificate programs
 
 =head1 SYNOPSIS
 
+=for openssl duplicate options
+
 B<CA.pl>
 B<-?> |
 B<-h> |
@@ -189,7 +191,7 @@ L<config(5)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-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
diff --git a/doc/man1/openssl-ciphers.pod.in b/doc/man1/openssl-ciphers.pod.in
index 5239beca1d692..69195bcdcbd00 100644
--- a/doc/man1/openssl-ciphers.pod.in
+++ b/doc/man1/openssl-ciphers.pod.in
@@ -17,7 +17,6 @@ B<openssl> B<ciphers>
 [B<-tls1_1>]
 [B<-tls1_2>]
 [B<-tls1_3>]
-[B<-s>]
 [B<-psk>]
 [B<-srp>]
 [B<-stdname>]
@@ -815,7 +814,7 @@ The support for TLS v1.3 integrity-only cipher suites was added in OpenSSL 3.4.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-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
diff --git a/doc/man1/openssl-cmp.pod.in b/doc/man1/openssl-cmp.pod.in
index f44615d1fc186..906143d2927d8 100644
--- a/doc/man1/openssl-cmp.pod.in
+++ b/doc/man1/openssl-cmp.pod.in
@@ -3,7 +3,7 @@
 
 =head1 NAME
 
-openssl-cmp - Certificate Management Protocol (CMP, RFC 4210) application
+openssl-cmp - Certificate Management Protocol (CMP, RFCs 9810 and 9811) application
 
 =head1 SYNOPSIS
 
@@ -171,7 +171,8 @@ Certificate verification options, for both CMP and TLS:
 =head1 DESCRIPTION
 
 The B<cmp> command is a client implementation for the Certificate
-Management Protocol (CMP) as defined in RFC4210.
+Management Protocol (CMP) as defined in RFCs 9810 and
+its HTTP(S) transfer as defined in RFC 9811.
 It can be used to request certificates from a CA server,
 update their certificates,
 request certificates to be revoked, and perform other types of CMP requests.
@@ -439,7 +440,7 @@ Request implicit confirmation of newly enrolled certificates.
 Do not send certificate confirmation message for newly enrolled certificate
 without requesting implicit confirmation
 to cope with broken servers not supporting implicit confirmation correctly.
-B<WARNING:> This leads to behavior violating RFC 4210.
+B<WARNING:> This leads to behavior violating RFC 9810.
 
 =item B<-certout> I<filename>
 
@@ -697,7 +698,7 @@ This applies to the following message types and contents:
 
 B<WARNING:> This setting leads to unspecified behavior and it is meant
 exclusively to allow interoperability with server implementations violating
-RFC 4210, e.g.:
+RFC 9810, e.g.:
 
 =over 4
 
@@ -813,7 +814,7 @@ This takes precedence over the B<-cert> and B<-key> options.
 The secret is used for creating MAC-based protection of outgoing messages
 and for validating incoming messages that have MAC-based protection.
 The algorithm used by default is Password-Based Message Authentication Code (PBM)
-as defined in RFC 4210 section 5.1.3.1.
+as defined in RFC 9810 section 5.1.3.1.
 
 For more information about the format of I<arg> see
 L<openssl-passphrase-options(1)>.
@@ -837,7 +838,7 @@ this "protection certificate", also called "signer certificate",
 will be included first in the extraCerts field of outgoing messages
 and the signature is done with the corresponding key.
 In Initialization Request (IR) messages this can be used for authenticating
-using an external entity certificate as defined in appendix E.7 of RFC 4210.
+using an external entity certificate as defined in appendix D.7 of RFC 9810.
 
 For Key Update Request (KUR) messages this is also used as
 the certificate to be updated if the B<-oldcert> option is not given.
@@ -880,7 +881,7 @@ L<openssl-passphrase-options(1)>.
 
 =item B<-digest> I<name>
 
-Specifies name of supported digest to use in RFC 4210's MSG_SIG_ALG
+Specifies name of supported digest to use in RFC 9810's MSG_SIG_ALG
 and as the one-way function (OWF) in C<MSG_MAC_ALG>.
 If applicable, this is used for message protection and
 proof-of-possession (POPO) signatures.
@@ -893,7 +894,7 @@ Specifies the name of the MAC algorithm in C<MSG_MAC_ALG>.
 To get the names of supported MAC algorithms use C<openssl list -mac-algorithms>
 and possibly combine such a name with the name of a supported digest algorithm,
 e.g., hmacWithSHA256.
-Defaults to C<hmac-sha1> as per RFC 4210.
+Defaults to C<hmac-sha1>, for backward compatibility with RFC 4210.
 
 =item B<-extracerts> I<filenames>|I<uris>
 
@@ -1113,6 +1114,7 @@ If the transaction contains more requests, the remaining ones are not saved.
 
 Save the first CMP requests created by the client to the given file and exit.
 Any options related to CMP servers and their responses are ignored.
+This option does not combine with the B<-port> option.
 
 This option is useful for supporting offline scenarios where the certificate
 request (or any other CMP request) is produced beforehand and sent out later.
@@ -1283,7 +1285,7 @@ Send response messages without CMP-level protection.
 
 In case of negative responses, server shall send unprotected error messages,
 certificate responses (IP/CP/KUP), and revocation responses (RP).
-WARNING: This setting leads to behavior violating RFC 4210.
+WARNING: This setting leads to behavior violating RFC 9810.
 
 =item B<-accept_unprotected>
 
@@ -1296,7 +1298,7 @@ So far this has no effect because the server does not accept any error messages.
 
 =item B<-accept_raverified>
 
-Accept RAVERIFED as proof of possession (POPO).
+Accept RAVERIFIED as proof of possession (POPO).
 
 =back
 
diff --git a/doc/man1/openssl-cms.pod.in b/doc/man1/openssl-cms.pod.in
index c0d45cb9d5161..13a436b076606 100644
--- a/doc/man1/openssl-cms.pod.in
+++ b/doc/man1/openssl-cms.pod.in
@@ -7,6 +7,8 @@ openssl-cms - CMS command
 
 =head1 SYNOPSIS
 
+=for openssl duplicate options
+
 B<openssl> B<cms>
 [B<-help>]
 
@@ -422,7 +424,7 @@ Currently, the AES variants with GCM mode are the only supported AEAD
 algorithms.
 
 If not specified, AES-256-CBC is used as the default. Only used with B<-encrypt> and
-B<-EncryptedData_create> commands.
+B<-EncryptedData_encrypt> commands.
 
 =item B<-wrap> I<cipher>
 
@@ -449,7 +451,7 @@ with caution: see the notes section below.
 =item B<-md> I<digest>
 
 Digest algorithm to use when signing or resigning. If not present then the
-default digest algorithm for the signing key will be used (usually SHA1).
+default digest algorithm for the signing key will be used (usually SHA-256).
 
 =item B<-signer> I<file>
 
@@ -782,7 +784,7 @@ The use of PSS with B<-sign>.
 
 The use of OAEP or non-RSA keys with B<-encrypt>.
 
-Additionally the B<-EncryptedData_create> and B<-data_create> type cannot
+Additionally the B<-EncryptedData_encrypt> and B<-data_create> type cannot
 be processed by the older L<openssl-smime(1)> command.
 
 =head1 EXAMPLES
@@ -929,7 +931,7 @@ The B<-digest> option was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2008-2025 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2008-2026 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man1/openssl-enc.pod.in b/doc/man1/openssl-enc.pod.in
index 4d7ff3dc77e78..fb4f72ed8a193 100644
--- a/doc/man1/openssl-enc.pod.in
+++ b/doc/man1/openssl-enc.pod.in
@@ -193,9 +193,12 @@ Print out the key and IV used.
 Print out the key and IV used then immediately exit: don't do any encryption
 or decryption.
 
-=item B<-bufsize> I<number>
+=item B<-bufsize> I<number>[B<k>]
 
 Set the buffer size for I/O.
+The maximum size that can be specified is B<2^31-1> (2147483647) bytes.
+The B<k> suffix can be specified to indicate that I<number> is provided
+in kibibytes (multiples of 1024 bytes).
 
 =item B<-nopad>
 
@@ -279,7 +282,7 @@ Some of the ciphers do not have large keys and others have security
 implications if not used correctly. A beginner is advised to just use
 a strong block cipher, such as AES, in CBC mode.
 
-All the block ciphers normally use PKCS#5 padding, also known as standard
+All the block ciphers normally use PKCS#7 padding, also known as standard
 block padding. This allows a rudimentary integrity or password check to
 be performed. However, since the chance of random data passing the test
 is better than 1 in 256 it isn't a very good test.
diff --git a/doc/man1/openssl-fipsinstall.pod.in b/doc/man1/openssl-fipsinstall.pod.in
index 9dd4f5a49ffe1..2db5acd242947 100644
--- a/doc/man1/openssl-fipsinstall.pod.in
+++ b/doc/man1/openssl-fipsinstall.pod.in
@@ -237,9 +237,7 @@ explicitly permitted by the various standards.
 
 =item B<-hkdf_digest_check>
 
-Configure the module to enable a run-time digest check when deriving a key by
-HKDF.
-See NIST SP 800-56Cr2 for details.
+This option is deprecated.
 
 =item B<-tls13_kdf_digest_check>
 
@@ -261,9 +259,7 @@ See NIST SP 800-135r1 for details.
 
 =item B<-sskdf_digest_check>
 
-Configure the module to enable a run-time digest check when deriving a key by
-SSKDF.
-See NIST SP 800-56Cr2 for details.
+This option is deprecated.
 
 =item B<-x963kdf_digest_check>
 
@@ -373,7 +369,7 @@ longer allowed.
 
 =item B<-self_test_oninstall>
 
-The converse of B<-self_test_oninstall>.  The two fields related to the
+The converse of B<-self_test_onload>.  The two fields related to the
 "test status indicator" and "MAC status indicator" are written to the
 output configuration file.
 This field is not relevant for an OpenSSL FIPS 140-3 provider, since this is no
@@ -493,7 +489,7 @@ B<-ecdh_cofactor_check>
 
 =head1 COPYRIGHT
 
-Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-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
diff --git a/doc/man1/openssl-pkcs12.pod.in b/doc/man1/openssl-pkcs12.pod.in
index a8d765392fd02..5859d3aded57d 100644
--- a/doc/man1/openssl-pkcs12.pod.in
+++ b/doc/man1/openssl-pkcs12.pod.in
@@ -7,6 +7,8 @@ openssl-pkcs12 - PKCS#12 file command
 
 =head1 SYNOPSIS
 
+=for openssl duplicate options
+
 B<openssl> B<pkcs12>
 [B<-help>]
 [B<-passin> I<arg>]
@@ -174,7 +176,7 @@ see the L</PKCS#12 output (export) options> section.
 =item B<-out> I<filename>
 
 The filename to write certificates and private keys to, standard output by
-default.  They are all written in PEM format.
+default. They are all written in PEM format.
 
 =item B<-info>
 
@@ -488,7 +490,7 @@ The B<-nodes> option was deprecated in OpenSSL 3.0, too; use B<-noenc> instead.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-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
diff --git a/doc/man1/openssl-pkeyutl.pod.in b/doc/man1/openssl-pkeyutl.pod.in
index 3c59957b8d8a1..c5fb8378e8b1c 100644
--- a/doc/man1/openssl-pkeyutl.pod.in
+++ b/doc/man1/openssl-pkeyutl.pod.in
@@ -437,10 +437,100 @@ for the B<-pkeyopt> B<digest> option.
 The X25519 and X448 algorithms support key derivation only. Currently there are
 no additional options.
 
+=head2 SLH-DSA ALGORITHMS
+
+The SLH-DSA algorithms (SLH-DSA-SHA2-128s, SLH-DSA-SHA2-128f, SLH-DSA-SHA2-192s, SLH-DSA-SHA2-192f, SLH-DSA-SHA2-256s, SLH-DSA-SHA2-256f) are post-quantum signature algorithms. When using SLH-DSA with pkeyutl, the following options are available:
+
+=over 4
+
+=item B<-sign>
+
+Sign the input data using an SLH-DSA private key. For example:
+
+  $ openssl pkeyutl -sign -in file.txt -inkey slhdsa.pem -out sig
+
+=item B<-verify>
+
+Verify the signature using an SLH-DSA public key. For example:
+
+  $ openssl pkeyutl -verify -in file.txt -inkey slhdsa.pem -sigfile sig
+
+=back
+
+See L<EVP_PKEY-SLH-DSA(7)> and L<EVP_SIGNATURE-SLH-DSA(7)> for additional details about the SLH-DSA algorithm and its implementation.
+
 =head1 ML-DSA-44, ML-DSA-65 AND ML-DSA-87 ALGORITHMS
 
-The B<ML-DSA> algorithms support signing and verification of "raw" messages.
-No preliminary hashing is performed.
+The ML-DSA algorithms are post-quantum signature algorithms that support signing and verification of "raw" messages.
+No preliminary hashing is performed. When using ML-DSA with pkeyutl, the following options are available:
+
+=over 4
+
+=item B<-sign>
+
+Sign the input data using an ML-DSA private key. For example:
+
+  $ openssl pkeyutl -sign -in file.txt -inkey mldsa65.pem -out sig
+
+=item B<-verify>
+
+Verify the signature using an ML-DSA public key. For example:
+
+  $ openssl pkeyutl -verify -in file.txt -inkey mldsa65.pem -sigfile sig
+
+=item B<-pkeyopt> I<opt>:I<value>
+
+Additional options for ML-DSA signing and verification:
+
+=over 4
+
+=item B<message-encoding>:I<value>
+
+Specifies the message encoding mode used for signing. This controls how the input message is processed before signing. Valid values are described in L<EVP_SIGNATURE-ML-DSA(7)>. For example:
+
+  $ openssl pkeyutl -sign -in file.txt -inkey mldsa65.pem -out sig -pkeyopt message-encoding:1
+
+=item B<test-entropy>:I<value>
+
+Specifies a test entropy value for deterministic signing. For example:
+
+  $ openssl pkeyutl -sign -in file.txt -inkey mldsa65.pem -out sig -pkeyopt test-entropy:abcdefghijklmnopqrstuvwxyz012345
+
+=item B<hextest-entropy>:I<value>
+
+Specifies a test entropy value in hex format. For example:
+
+  $ openssl pkeyutl -sign -in file.txt -inkey mldsa65.pem -out sig -pkeyopt hextest-entropy:000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
+
+=item B<deterministic>:I<value>
+
+Enables deterministic signing. For example:
+
+  $ openssl pkeyutl -sign -in file.txt -inkey mldsa65.pem -out sig -pkeyopt deterministic:1
+
+=item B<mu>:I<value>
+
+Specifies the mu parameter. For example:
+
+  $ echo -n "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" >file.txt
+  $ openssl pkeyutl -sign -in file.txt -inkey mldsa65.pem -out sig -pkeyopt mu:1
+
+=back
+
+=item B<context-string>:I<string>
+
+Specifies a context string for both signing and verification operations. The context string must be the same for verification to succeed. For example:
+
+  $ openssl pkeyutl -sign -in file.txt -inkey mldsa65.pem -out sig -pkeyopt context-string:mycontext
+  $ openssl pkeyutl -verify -in file.txt -inkey mldsa65.pem -sigfile sig -pkeyopt context-string:mycontext
+
+=item B<hexcontext-string>:I<string>
+
+Specifies a context string in hex format, allowing binary control values. For example:
+
+  $ openssl pkeyutl -sign -in file.txt -inkey mldsa65.pem -out sig -pkeyopt hexcontext-string:6d79636f6e74657874
+
+=back
 
 The signing operation supports a B<deterministic>:I<bool> option,
 with I<bool> set to C<1> if a deterministic signature is to be generated
@@ -450,7 +540,7 @@ A deterministic result can also be obtained by specifying an explicit
 entropy value via the B<hextest-entropy>:I<value> parameter.
 Deterministic B<ML-DSA> signing should only be used in tests.
 
-See L<EVP_SIGNATURE-ML-DSA(7)> for additional options and detail.
+See L<EVP_SIGNATURE-ML-DSA(7)> for additional details about the ML-DSA algorithms and their implementation.
 
 =head1 ML-KEM-512, ML-KEM-768 AND ML-KEM-1024 ALGORITHMS
 
@@ -549,6 +639,34 @@ Decrypt some data using a private key with OAEP padding using SHA256:
  openssl pkeyutl -decrypt -in file -inkey key.pem -out secret \
     -pkeyopt rsa_padding_mode:oaep -pkeyopt rsa_oaep_md:sha256
 
+Create an ML-DSA key pair and sign data with a specific context string:
+
+  $ openssl genpkey -algorithm ML-DSA-65 -out mldsa65.pem
+  $ openssl pkeyutl -sign -in file.txt -inkey mldsa65.pem -out sig -pkeyopt context-string:example
+
+Verify a signature using ML-DSA with the same context string:
+
+  $ openssl pkeyutl -verify -in file.txt -inkey mldsa65.pem -sigfile sig -pkeyopt context-string:example
+
+Generate an ML-KEM key pair and use it for encapsulation:
+
+  $ openssl genpkey -algorithm ML-KEM-768 -out mlkem768.pem
+  $ openssl pkey -in mlkem768.pem -pubout -out mlkem768_pub.pem
+  $ openssl pkeyutl -encap -inkey mlkem768_pub.pem -pubin -out ciphertext -secret shared_secret.bin
+
+Decapsulate a shared secret using an ML-KEM private key:
+
+  $ openssl pkeyutl -decap -inkey mlkem768.pem -in ciphertext -secret decapsulated_secret.bin
+
+Create an SLH-DSA key pair and sign data:
+
+  $ openssl genpkey -algorithm SLH-DSA-SHA2-128s -out slh-dsa.pem
+  $ openssl pkeyutl -sign -in file.txt -inkey slh-dsa.pem -out sig
+
+Verify a signature using SLH-DSA:
+
+  $ openssl pkeyutl -verify -in file.txt -inkey slh-dsa.pem -sigfile sig
+
 =head1 SEE ALSO
 
 L<openssl(1)>,
diff --git a/doc/man1/openssl-rehash.pod.in b/doc/man1/openssl-rehash.pod.in
index 380ad6dd2a46f..466ff42aea566 100644
--- a/doc/man1/openssl-rehash.pod.in
+++ b/doc/man1/openssl-rehash.pod.in
@@ -11,6 +11,8 @@ values
 
 =head1 SYNOPSIS
 
+=for openssl duplicate options
+
 B<openssl>
 B<rehash>
 [B<-h>]
@@ -147,7 +149,7 @@ L<openssl-x509(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2015-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
diff --git a/doc/man1/openssl-req.pod.in b/doc/man1/openssl-req.pod.in
index 4d386ec423cbd..a21147575c8bf 100644
--- a/doc/man1/openssl-req.pod.in
+++ b/doc/man1/openssl-req.pod.in
@@ -403,7 +403,7 @@ If an extension is added using this option that has the same OID as one
 defined in the extension section of the config file, it overrides that one.
 
 This option can be given multiple times.
-Doing so, the same key most not be given more than once.
+Doing so, the same key must not be given more than once.
 
 =item B<-precert>
 
diff --git a/doc/man1/openssl-s_client.pod.in b/doc/man1/openssl-s_client.pod.in
index 371439e97b93c..82c5917f60817 100644
--- a/doc/man1/openssl-s_client.pod.in
+++ b/doc/man1/openssl-s_client.pod.in
@@ -59,7 +59,6 @@ B<openssl> B<s_client>
 [B<-msg>]
 [B<-timeout>]
 [B<-mtu> I<size>]
-[B<-no_etm>]
 [B<-no_ems>]
 [B<-keymatexport> I<label>]
 [B<-keymatexportlen> I<len>]
@@ -84,29 +83,14 @@ B<openssl> B<s_client>
 [B<-max_pipelines>]
 [B<-read_buf>]
 [B<-ignore_unexpected_eof>]
-[B<-bugs>]
 [B<-no_tx_cert_comp>]
 [B<-no_rx_cert_comp>]
-[B<-comp>]
-[B<-no_comp>]
 [B<-brief>]
-[B<-legacy_server_connect>]
-[B<-no_legacy_server_connect>]
-[B<-allow_no_dhe_kex>]
-[B<-prefer_no_dhe_kex>]
-[B<-sigalgs> I<sigalglist>]
-[B<-curves> I<curvelist>]
-[B<-cipher> I<cipherlist>]
-[B<-ciphersuites> I<val>]
-[B<-serverpref>]
 [B<-starttls> I<protocol>]
-[B<-name> I<hostname>]
 [B<-xmpphost> I<hostname>]
 [B<-name> I<hostname>]
 [B<-tlsextdebug>]
-[B<-no_ticket>]
 [B<-sess_out> I<filename>]
-[B<-serverinfo> I<types>]
 [B<-sess_in> I<filename>]
 [B<-serverinfo> I<types>]
 [B<-status>]
@@ -485,10 +469,6 @@ Enable send/receive timeout on DTLS connections.
 
 Set MTU of the link layer to the specified size.
 
-=item B<-no_etm>
-
-Disable Encrypt-then-MAC negotiation.
-
 =item B<-no_ems>
 
 Disable Extended master secret negotiation.
@@ -527,12 +507,12 @@ by some servers.
 =item B<-ign_eof>
 
 Inhibit shutting down the connection when end of file is reached in the
-input.
+input. This implicitly turns on B<-nocommands> as well.
 
 =item B<-quiet>
 
 Inhibit printing of session and certificate information.  This implicitly
-turns on B<-ign_eof> as well.
+turns on B<-ign_eof> and B<-nocommands> as well.
 
 =item B<-no_ign_eof>
 
@@ -623,11 +603,6 @@ option is enabled the peer does not need to send the close_notify alert and a
 closed connection will be treated as if the close_notify alert was received.
 For more information on shutting down a connection, see L<SSL_shutdown(3)>.
 
-=item B<-bugs>
-
-There are several known bugs in SSL and TLS implementations. Adding this
-option enables various workarounds.
-
 =item B<-no_tx_cert_comp>
 
 Disables support for sending TLSv1.3 compressed certificates.
@@ -636,65 +611,11 @@ Disables support for sending TLSv1.3 compressed certificates.
 
 Disables support for receiving TLSv1.3 compressed certificate.
 
-=item B<-comp>
-
-Enables support for SSL/TLS compression.
-This option was introduced in OpenSSL 1.1.0.
-TLS compression is not recommended and is off by default as of
-OpenSSL 1.1.0. TLS compression can only be used in security level 1 or
-lower. From OpenSSL 3.2.0 and above the default security level is 2, so this
-option will have no effect without also changing the security level. Use the
-B<-cipher> option to change the security level. See L<openssl-ciphers(1)> for
-more information.
-
-=item B<-no_comp>
-
-Disables support for SSL/TLS compression.
-TLS compression is not recommended and is off by default as of
-OpenSSL 1.1.0.
-
 =item B<-brief>
 
 Only provide a brief summary of connection parameters instead of the
 normal verbose output.
 
-=item B<-sigalgs> I<sigalglist>
-
-Specifies the list of signature algorithms that are sent by the client.
-The server selects one entry in the list based on its preferences.
-For example strings, see L<SSL_CTX_set1_sigalgs(3)>
-
-=item B<-curves> I<curvelist>
-
-Specifies the list of supported curves to be sent by the client. The curve is
-ultimately selected by the server.
-
-The list of available groups includes various built-in named EC curves, as well
-as X25519 and X448, FFDHE groups, and any additional groups implemented in the
-default or 3rd-party providers.
-The commands below list the available groups for TLS 1.2 and TLS 1.3,
-respectively:
-
-    $ openssl list -tls1_2 -tls-groups
-    $ openssl list -tls1_3 -tls-groups
-
-=item B<-cipher> I<cipherlist>
-
-This allows the TLSv1.2 and below cipher list sent by the client to be modified.
-This list will be combined with any TLSv1.3 ciphersuites that have been
-configured. Although the server determines which ciphersuite is used it should
-take the first supported cipher in the list sent by the client. See
-L<openssl-ciphers(1)> for more information.
-
-=item B<-ciphersuites> I<val>
-
-This allows the TLSv1.3 ciphersuites sent by the client to be modified. This
-list will be combined with any TLSv1.2 and below ciphersuites that have been
-configured. Although the server determines which cipher suite is used it should
-take the first supported cipher in the list sent by the client. See
-L<openssl-ciphers(1)> for more information. The format for this list is a simple
-colon (":") separated list of TLSv1.3 ciphersuite names.
-
 =item B<-starttls> I<protocol>
 
 Send the protocol-specific message(s) to switch to TLS for communication.
@@ -729,10 +650,6 @@ this option is not specified, then "mail.example.com" will be used.
 
 Print out a hex dump of any TLS extensions received from the server.
 
-=item B<-no_ticket>
-
-Disable RFC4507bis session ticket support.
-
 =item B<-sess_out> I<filename>
 
 Output SSL session to I<filename>.
diff --git a/doc/man1/openssl-s_server.pod.in b/doc/man1/openssl-s_server.pod.in
index 976b808788402..4f2a63d9b69bb 100644
--- a/doc/man1/openssl-s_server.pod.in
+++ b/doc/man1/openssl-s_server.pod.in
@@ -7,6 +7,8 @@ openssl-s_server - SSL/TLS server program
 
 =head1 SYNOPSIS
 
+=for openssl duplicate options
+
 B<openssl> B<s_server>
 [B<-help>]
 [B<-port> I<+int>]
@@ -70,7 +72,6 @@ B<openssl> B<s_server>
 [B<-verify_quiet>]
 [B<-ign_eof>]
 [B<-no_ign_eof>]
-[B<-no_etm>]
 [B<-no_ems>]
 [B<-status>]
 [B<-status_verbose>]
@@ -91,30 +92,9 @@ B<openssl> B<s_server>
 [B<-max_pipelines> I<+int>]
 [B<-naccept> I<+int>]
 [B<-read_buf> I<+int>]
-[B<-bugs>]
 [B<-no_tx_cert_comp>]
 [B<-no_rx_cert_comp>]
-[B<-no_comp>]
-[B<-comp>]
-[B<-no_ticket>]
-[B<-serverpref>]
-[B<-legacy_renegotiation>]
-[B<-no_renegotiation>]
-[B<-no_resumption_on_reneg>]
-[B<-allow_no_dhe_kex>]
-[B<-prefer_no_dhe_kex>]
-[B<-prioritize_chacha>]
-[B<-strict>]
-[B<-sigalgs> I<val>]
-[B<-client_sigalgs> I<val>]
-[B<-groups> I<val>]
-[B<-curves> I<val>]
-[B<-named_curve> I<val>]
-[B<-cipher> I<val>]
-[B<-ciphersuites> I<val>]
 [B<-dhparam> I<infile>]
-[B<-record_padding> I<val>]
-[B<-debug_broken_protocol>]
 [B<-nbio>]
 [B<-psk_identity> I<val>]
 [B<-psk_hint> I<val>]
@@ -501,10 +481,6 @@ Ignore input EOF (default: when B<-quiet>).
 
 Do not ignore input EOF.
 
-=item B<-no_etm>
-
-Disable Encrypt-then-MAC negotiation.
-
 =item B<-no_ems>
 
 Disable Extended master secret negotiation.
@@ -613,11 +589,6 @@ effect if the buffer size is larger than the size that would otherwise be used
 and pipelining is in use (see L<SSL_CTX_set_default_read_buffer_len(3)> for
 further information).
 
-=item B<-bugs>
-
-There are several known bugs in SSL and TLS implementations. Adding this
-option enables various workarounds.
-
 =item B<-no_tx_cert_comp>
 
 Disables support for sending TLSv1.3 compressed certificates.
@@ -632,77 +603,12 @@ Disable negotiation of TLS compression.
 TLS compression is not recommended and is off by default as of
 OpenSSL 1.1.0.
 
-=item B<-comp>
-
-Enables support for SSL/TLS compression.
-This option was introduced in OpenSSL 1.1.0.
-TLS compression is not recommended and is off by default as of
-OpenSSL 1.1.0. TLS compression can only be used in security level 1 or
-lower. From OpenSSL 3.2.0 and above the default security level is 2, so this
-option will have no effect without also changing the security level. Use the
-B<-cipher> option to change the security level. See L<openssl-ciphers(1)> for
-more information.
-
-=item B<-no_ticket>
-
-Disable RFC4507bis session ticket support. This option has no effect if TLSv1.3
-is negotiated. See B<-num_tickets>.
-
 =item B<-num_tickets>
 
 Control the number of tickets that will be sent to the client after a full
 handshake in TLSv1.3. The default number of tickets is 2. This option does not
 affect the number of tickets sent after a resumption handshake.
 
-=item B<-serverpref>
-
-Use the server's cipher preferences, rather than the client's preferences.
-
-=item B<-prioritize_chacha>
-
-Prioritize ChaCha ciphers when preferred by clients. Requires B<-serverpref>.
-
-=item B<-no_resumption_on_reneg>
-
-Set the B<SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION> option.
-
-=item B<-client_sigalgs> I<val>
-
-Signature algorithms to support for client certificate authentication
-(colon-separated list).
-
-=item B<-named_curve> I<val>
-
-Specifies the elliptic curve to use. NOTE: this is single curve, not a list.
-
-The list of available groups includes various built-in named EC curves, as well
-as X25519 and X448, FFDHE groups, and any additional groups implemented in the
-default or 3rd-party providers.
-The commands below list the available groups for TLS 1.2 and TLS 1.3,
-respectively.
-
-    $ openssl list -tls1_2 -tls-groups
-    $ openssl list -tls1_3 -tls-groups
-
-=item B<-cipher> I<val>
-
-This allows the list of TLSv1.2 and below ciphersuites used by the server to be
-modified. This list is combined with any TLSv1.3 ciphersuites that have been
-configured. When the client sends a list of supported ciphers the first client
-cipher also included in the server list is used. Because the client specifies
-the preference order, the order of the server cipherlist is irrelevant. See
-L<openssl-ciphers(1)> for more information.
-
-=item B<-ciphersuites> I<val>
-
-This allows the list of TLSv1.3 ciphersuites used by the server to be modified.
-This list is combined with any TLSv1.2 and below ciphersuites that have been
-configured. When the client sends a list of supported ciphers the first client
-cipher also included in the server list is used. Because the client specifies
-the preference order, the order of the server cipherlist is irrelevant. See
-L<openssl-ciphers(1)> command for more information. The format for this list is
-a simple colon (":") separated list of TLSv1.3 ciphersuite names.
-
 =item B<-dhparam> I<infile>
 
 The DH parameter file to use. The ephemeral DH cipher suites generate keys
diff --git a/doc/man1/openssl-smime.pod.in b/doc/man1/openssl-smime.pod.in
index 845fb74e31ef6..0a8fe0136655f 100644
--- a/doc/man1/openssl-smime.pod.in
+++ b/doc/man1/openssl-smime.pod.in
@@ -130,7 +130,7 @@ See L<openssl-format-options(1)> for details.
 The key format; unspecified by default.
 See L<openssl-format-options(1)> for details.
 
-=item B<-stream>, B<-indef>, B<-noindef>
+=item B<-stream>, B<-indef>
 
 The B<-stream> and B<-indef> options are equivalent and enable streaming I/O
 for encoding operations. This permits single pass processing of data without
@@ -479,7 +479,7 @@ The B<-engine> option was deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-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
diff --git a/doc/man1/openssl-ts.pod.in b/doc/man1/openssl-ts.pod.in
index ecce6df8c76e5..202f218f31678 100644
--- a/doc/man1/openssl-ts.pod.in
+++ b/doc/man1/openssl-ts.pod.in
@@ -7,6 +7,8 @@ openssl-ts - Time Stamping Authority command
 
 =head1 SYNOPSIS
 
+=for openssl duplicate options
+
 B<openssl> B<ts>
 B<-help>
 
@@ -654,7 +656,7 @@ L<ossl_store-file(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2006-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-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
diff --git a/doc/man1/openssl-verification-options.pod b/doc/man1/openssl-verification-options.pod
index 676fbb38a5526..81a11c37f4c49 100644
--- a/doc/man1/openssl-verification-options.pod
+++ b/doc/man1/openssl-verification-options.pod
@@ -581,7 +581,7 @@ keyCertSign bit set if the keyUsage extension is present.
 
 The extKeyUsage (EKU) extension places additional restrictions on
 certificate use. If this extension is present (whether critical or not)
-in an end-entity certficiate, the key is allowed only for the uses specified,
+in an end-entity certificate, the key is allowed only for the uses specified,
 while the special EKU B<anyExtendedKeyUsage> allows for all uses.
 
 Note that according to RFC 5280 section 4.2.1.12,
@@ -639,7 +639,7 @@ This is used as a workaround if the basicConstraints extension is absent.
 =item B<Netscape SSL Server> (C<nssslserver>)
 
 In addition to what has been described for B<sslserver>, for a Netscape
-SSL client to connect to an SSL server, its EE certficate must have the
+SSL client to connect to an SSL server, its EE certificate must have the
 B<keyEncipherment> bit set if the keyUsage extension is present. This isn't
 always valid because some cipher suites use the key for digital signing.
 Otherwise it is the same as a normal SSL server.
@@ -660,19 +660,19 @@ This is used as a workaround if the basicConstraints extension is absent.
 
 =item B<S/MIME Signing> (C<smimesign>)
 
-In addition to the common S/MIME checks, for target certficiates
+In addition to the common S/MIME checks, for target certificates
 the key usage must allow for C<digitalSignature> and/or B<nonRepudiation>.
 
 =item B<S/MIME Encryption> (C<smimeencrypt>)
 
-In addition to the common S/MIME checks, for target certficiates
+In addition to the common S/MIME checks, for target certificates
 the key usage must allow for C<keyEncipherment>.
 
 =item B<CRL Signing> (C<crlsign>)
 
 For target certificates, the key usage must allow for C<cRLSign>.
 
-For all other certifcates the normal CA checks apply.
+For all other certificates the normal CA checks apply.
 Except in this case the basicConstraints extension must be present.
 
 =item B<OCSP Helper> (C<ocsphelper>)
@@ -680,7 +680,7 @@ Except in this case the basicConstraints extension must be present.
 For target certificates, no checks are performed at this stage,
 but special checks apply; see L<OCSP_basic_verify(3)>.
 
-For all other certifcates the normal CA checks apply.
+For all other certificates the normal CA checks apply.
 
 =item B<Timestamp Signing> (C<timestampsign>)
 
@@ -689,7 +689,7 @@ C<digitalSignature> and/or C<nonRepudiation> and must not include other bits.
 The EKU extension must be present and contain C<timeStamping> only.
 Moreover, it must be marked as critical.
 
-For all other certifcates the normal CA checks apply.
+For all other certificates the normal CA checks apply.
 
 =item B<Code Signing> (C<codesign>)
 
@@ -699,7 +699,7 @@ include <digitalSignature>, but must not include C<keyCertSign> nor C<cRLSign>.
 The EKU extension must be present and contain C<codeSign>,
 but must not include C<anyExtendedKeyUsage> nor C<serverAuth>.
 
-For all other certifcates the normal CA checks apply.
+For all other certificates the normal CA checks apply.
 
 =back
 
diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod
index c68f0f073d0bc..635b52aeb1208 100644
--- a/doc/man1/openssl.pod
+++ b/doc/man1/openssl.pod
@@ -6,6 +6,8 @@ openssl - OpenSSL command line program
 
 =head1 SYNOPSIS
 
+=for openssl duplicate options
+
 B<openssl>
 I<command>
 [ I<options> ... ]
@@ -720,7 +722,8 @@ For information about specific commands, see L<openssl-engine(1)>,
 L<openssl-rehash(1)>, and L<tsget(1)>.
 
 For information about querying or specifying CPU architecture flags, see
-L<OPENSSL_ia32cap(3)>, L<OPENSSL_s390xcap(3)> and L<OPENSSL_riscvcap(3)>.
+L<OPENSSL_ia32cap(3)>, L<OPENSSL_ppccap(3)>, L<OPENSSL_s390xcap(3)>,
+and L<OPENSSL_riscvcap(3)>.
 
 =head1 SEE ALSO
 
diff --git a/doc/man3/BIO_get_data.pod b/doc/man3/BIO_get_data.pod
index aeb6b1c7e9bab..0d1cb11cce491 100644
--- a/doc/man3/BIO_get_data.pod
+++ b/doc/man3/BIO_get_data.pod
@@ -18,7 +18,7 @@ BIO_get_shutdown - functions for managing BIO state information
 
 =head1 DESCRIPTION
 
-These functions are mainly useful when implementing a custom BIO.
+These functions can be used when implementing a custom BIO.
 
 The BIO_set_data() function associates the custom data pointed to by B<ptr> with
 the BIO. This data can subsequently be retrieved via a call to BIO_get_data().
@@ -36,6 +36,13 @@ The BIO_set_shutdown() and BIO_get_shutdown() functions set and get the state of
 this BIO's shutdown (i.e. BIO_CLOSE) flag. If set then the underlying resource
 is also closed when the BIO is freed.
 
+=head1 WARNINGS
+
+Do not use BIO_set_data(), BIO_get_data(), BIO_set_init(), BIO_get_init(), outside
+the implementation of a custom BIO.
+Calling BIO_set_data() on an existing BIO implementation with data that it does
+not expect will lead to unexpected results.
+
 =head1 RETURN VALUES
 
 BIO_get_data() returns a pointer to the implementation specific custom data
diff --git a/doc/man3/BIO_set_flags.pod b/doc/man3/BIO_set_flags.pod
new file mode 100644
index 0000000000000..7899cc3e5751e
--- /dev/null
+++ b/doc/man3/BIO_set_flags.pod
@@ -0,0 +1,194 @@
+=pod
+
+=head1 NAME
+
+BIO_set_flags, BIO_clear_flags, BIO_test_flags, BIO_get_flags,
+BIO_set_retry_read, BIO_set_retry_write, BIO_set_retry_special,
+BIO_clear_retry_flags, BIO_get_retry_flags
+- manipulate and interpret BIO flags
+
+=head1 SYNOPSIS
+
+ #include <openssl/bio.h>
+
+ void BIO_set_flags(BIO *b, int flags);
+ void BIO_clear_flags(BIO *b, int flags);
+ int  BIO_test_flags(const BIO *b, int flags);
+ int  BIO_get_flags(const BIO *b);
+
+ void BIO_set_retry_read(BIO *b);
+ void BIO_set_retry_write(BIO *b);
+ void BIO_set_retry_special(BIO *b);
+ void BIO_clear_retry_flags(BIO *b);
+ int  BIO_get_retry_flags(BIO *b);
+
+=head1 DESCRIPTION
+
+A B<BIO> has an internal set of bit flags that describe its state.  These
+functions and macros are used primarily by B<BIO> implementations and by code
+that builds B<BIO> chains to manipulate those flags.
+
+BIO_set_flags() sets the bits given in I<flags> in the B<BIO> I<b>.  Any bits
+already set in the B<BIO>'s flag word remain set.
+
+BIO_clear_flags() clears the bits given in I<flags> from the B<BIO> I<b>.  Any
+other bits in the flag word are left unchanged.
+
+BIO_test_flags() tests the bits given in I<flags> in the B<BIO> I<b> and
+returns a nonzero value if any of them are currently set and zero
+otherwise.
+
+BIO_get_flags() returns the current flag word from the B<BIO> I<b>.  This is
+equivalent to testing for all bits and returning the result.
+
+The following convenience macros are built on top of these primitives and are
+used to maintain the retry state of a BIO:
+
+BIO_set_retry_read() marks the B<BIO> I<b> as being in a retryable state
+by setting the B<BIO_FLAGS_SHOULD_RETRY> flag. In addition, it sets the
+B<BIO_FLAGS_READ> flag to indicate that the retry condition is
+associated with a read operation.
+
+BIO_set_retry_write() marks the B<BIO> I<b> as being in a retryable state
+by setting the B<BIO_FLAGS_SHOULD_RETRY> flag. In addition, it sets the
+B<BIO_FLAGS_WRITE> flag to indicate that the retry condition is
+associated with a write operation.
+
+BIO_set_retry_special() marks the B<BIO> I<b> as being in a retryable state
+by setting the B<BIO_FLAGS_SHOULD_RETRY> flag. In addition, it sets the
+B<BIO_FLAGS_IO_SPECIAL> flag to indicate that the retry condition is
+associated with a read operation some "special" condition.
+The precise meaning of this condition depends on the B<BIO> type.
+
+BIO_clear_retry_flags() clears all retry-related bits from I<b>, i.e.
+B<BIO_FLAGS_READ>, B<BIO_FLAGS_WRITE>, B<BIO_FLAGS_IO_SPECIAL>, and
+B<BIO_FLAGS_SHOULD_RETRY>.
+
+BIO_get_retry_flags() returns retry-related bits that are
+currently set in I<b>.  The result is a subset of
+B<BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY>.
+
+The retry bits are interpreted by the higher level macros
+BIO_should_read(), BIO_should_write(), BIO_should_io_special(),
+BIO_retry_type() and BIO_should_retry(), as documented in
+L<BIO_should_retry(3)>.  Application code will typically use those macros
+rather than manipulate the underlying flags directly.
+
+The following flag bits are currently defined for use with BIO_set_flags(),
+BIO_clear_flags() and BIO_test_flags():
+
+=over 4
+
+=item B<BIO_FLAGS_READ>
+
+The last I/O operation should be retried when the B<BIO> becomes readable.
+This flag is normally set by the B<BIO> implementation via BIO_set_retry_read()
+after a failed read operation.
+
+=item B<BIO_FLAGS_WRITE>
+
+The last I/O operation should be retried when the B<BIO> becomes writable.
+This flag is normally set by the B<BIO> implementation via BIO_set_retry_write()
+after a failed write operation.
+
+=item B<BIO_FLAGS_IO_SPECIAL>
+
+The last I/O operation should be retried when some "special" condition
+becomes true.  The precise meaning of this condition depends on the B<BIO>
+type and is usually obtained via BIO_get_retry_BIO() and
+BIO_get_retry_reason() as described in L<BIO_should_retry(3)>.
+This flag is normally set by the B<BIO> implementation via
+BIO_set_retry_special().
+
+=item B<BIO_FLAGS_RWS>
+
+The bitwise OR of B<BIO_FLAGS_READ>, B<BIO_FLAGS_WRITE> and
+B<BIO_FLAGS_IO_SPECIAL>.  This mask is used when clearing or extracting
+the retry-direction bits.
+
+=item B<BIO_FLAGS_SHOULD_RETRY>
+
+Set if the last I/O operation on the B<BIO> should be retried at a later time.
+If this bit is not set then the condition is treated as an error.
+This flag is normally set by the B<BIO> implementation.
+
+=item B<BIO_FLAGS_BASE64_NO_NL>
+
+When set on a base64 filter B<BIO> this flag disables the generation of
+newline characters in the encoded output and causes newlines to be ignored
+in the input.  See also L<BIO_f_base64(3)>.
+The flag has no effect on any other built-in B<BIO> types.
+
+=item B<BIO_FLAGS_MEM_RDONLY>
+
+When set on a memory B<BIO> this flag indicates that the underlying buffer is
+read only.  Attempts to write to such a B<BIO> will fail.
+The flag has no effect on any other built-in B<BIO> types.
+
+=item B<BIO_FLAGS_NONCLEAR_RST>
+
+On a memory B<BIO> this flag modifies the behaviour of BIO_reset().  When it
+is set, resetting the B<BIO> does not clear the underlying buffer but only
+resets the current read position.
+The flag has no effect on any other built-in B<BIO> types.
+
+=item B<BIO_FLAGS_IN_EOF>
+
+This flag may be used by a B<BIO> implementation to indicate that the end
+of the input stream has been reached.  However, B<BIO> types are not
+required to use this flag to signal end-of-file conditions; they may rely
+on other mechanisms such as system calls or by querying the next B<BIO> in a
+chain.  Applications must therefore not test this flag directly to
+determine whether EOF has been reached, and must use BIO_eof() instead.
+
+=back
+
+A range of additional flag values is reserved for internal use by OpenSSL
+to track kernel TLS (KTLS) state.  This range and the corresponding flag
+macros are not part of the public API and must not be used by applications.
+
+=head1 RETURN VALUES
+
+BIO_get_flags() returns a bit mask of the flags currently set on the B<BIO>.
+
+BIO_test_flags() returns a bit mask consisting of those flags from the
+argument that are currently set in the B<BIO>. Consequently, it returns a
+nonzero value if and only if at least one of the requested flags is set.
+
+BIO_get_retry_flags() returns a bit mask consisting of those flags from
+B<BIO_FLAGS_READ>, B<BIO_FLAGS_WRITE>, B<BIO_FLAGS_IO_SPECIAL>, and
+B<BIO_FLAGS_SHOULD_RETRY> that are currently set in the I<BIO>.
+
+=head1 NOTES
+
+Ordinary application code will rarely need to call BIO_set_flags(),
+BIO_clear_flags() or BIO_test_flags() directly.  They are intended for B<BIO>
+implementations and for code that forwards retry state from one B<BIO> in a
+chain to another.
+After a failed I/O operation, applications should normally use
+BIO_should_retry() and related macros as described in
+L<BIO_should_retry(3)> instead of inspecting the flags directly.
+
+These functions and macros are not thread-safe. If a single B<BIO>
+is accessed from multiple threads, the caller must provide appropriate
+external synchronisation.
+
+=head1 SEE ALSO
+
+L<BIO_should_retry(3)>, L<BIO_f_base64(3)>, L<bio(7)>
+
+=head1 HISTORY
+
+The functions and macros described here have been available in OpenSSL since
+at least 1.1.0 (B<BIO_FLAGS_IN_EOF> since 1.1.1).
+
+=head1 COPYRIGHT
+
+Copyright 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
+L<https://www.openssl.org/source/license.html>.
+
+=cut
diff --git a/doc/man3/BN_generate_prime.pod b/doc/man3/BN_generate_prime.pod
index accc8a749f0c3..6b8d1de19cd83 100644
--- a/doc/man3/BN_generate_prime.pod
+++ b/doc/man3/BN_generate_prime.pod
@@ -130,7 +130,7 @@ or all the tests passed.
 If B<p> passes all these tests, it is considered a probable prime.
 
 The test performed on B<p> are trial division by a number of small primes
-and rounds of the of the Miller-Rabin probabilistic primality test.
+and rounds of the Miller-Rabin probabilistic primality test.
 
 The functions do at least 64 rounds of the Miller-Rabin test giving a maximum
 false positive rate of 2^-128.
@@ -148,7 +148,7 @@ and BN_is_prime_fasttest() are deprecated.
 
 BN_is_prime_fasttest() and BN_is_prime() behave just like
 BN_is_prime_fasttest_ex() and BN_is_prime_ex() respectively, but with the old
-style call back.
+style callback.
 
 B<ctx> is a preallocated B<BN_CTX> (to save the overhead of allocating and
 freeing the structure in a loop), or B<NULL>.
@@ -246,7 +246,7 @@ BN_check_prime() was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-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
diff --git a/doc/man3/CMS_EncryptedData_decrypt.pod b/doc/man3/CMS_EncryptedData_decrypt.pod
index fe77701fe0171..80bbdcc95f35b 100644
--- a/doc/man3/CMS_EncryptedData_decrypt.pod
+++ b/doc/man3/CMS_EncryptedData_decrypt.pod
@@ -21,10 +21,10 @@ CMS_EncryptedData_decrypt, CMS_EnvelopedData_decrypt
 =head1 DESCRIPTION
 
 CMS_EncryptedData_decrypt() decrypts a I<cms> EncryptedData object using the
-symmetric I<key> of size I<keylen> bytes. I<out> is a BIO to write the content
-to and I<flags> is an optional set of flags.
-I<dcont> is used in the rare case where the encrypted content is detached. It
-will normally be set to NULL.
+symmetric I<key> of size I<keylen> bytes. AEAD cipher algorithms are not
+supported. I<out> is a BIO to write the content to and I<flags> is an optional
+set of flags. I<dcont> is used in the rare case where the encrypted content is
+detached. It will normally be set to NULL.
 
 The following flags can be passed in the I<flags> parameter.
 
diff --git a/doc/man3/CMS_EncryptedData_encrypt.pod b/doc/man3/CMS_EncryptedData_encrypt.pod
index d3c3b254be03a..5f19edcf9a929 100644
--- a/doc/man3/CMS_EncryptedData_encrypt.pod
+++ b/doc/man3/CMS_EncryptedData_encrypt.pod
@@ -34,7 +34,7 @@ B<CMS_PARTIAL>. Internally CMS_final() is called unless B<CMS_STREAM> and/or
 B<CMS_PARTIAL> is specified.
 
 The algorithm passed in the I<cipher> parameter must support ASN1 encoding of
-its parameters.
+its parameters. AEAD cipher algorithms are not supported.
 
 The B<CMS_ContentInfo> structure can be freed using L<CMS_ContentInfo_free(3)>.
 
diff --git a/doc/man3/CMS_EncryptedData_set1_key.pod b/doc/man3/CMS_EncryptedData_set1_key.pod
new file mode 100644
index 0000000000000..0722ef18d2f94
--- /dev/null
+++ b/doc/man3/CMS_EncryptedData_set1_key.pod
@@ -0,0 +1,39 @@
+=pod
+
+=head1 NAME
+
+CMS_EncryptedData_set1_key - Sets the cipher and key for
+CMS EncryptedData
+
+=head1 SYNOPSIS
+
+ #include <openssl/cms.h>
+
+ int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
+                                const unsigned char *key, size_t keylen);
+
+=head1 DESCRIPTION
+
+CMS_EncryptedData_set1_key() takes in a I<cms> EncryptedData object and sets
+the appropriate attributes to I<ciph>, it makes a copy of the symmetric I<key>
+of size I<keylen>. AEAD cipher algorithms are not supported.
+
+=head1 RETURN VALUES
+
+CMS_EncryptedData_set1_key() returns 0 if an error occurred otherwise
+returns 1.
+
+=head1 SEE ALSO
+
+L<CMS_EncryptedData_encrypt(3)>, L<CMS_EncryptedData_decrypt(3)>
+
+=head1 COPYRIGHT
+
+Copyright 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
+L<https://www.openssl.org/source/license.html>.
+
+=cut
diff --git a/doc/man3/CMS_get0_SignerInfos.pod b/doc/man3/CMS_get0_SignerInfos.pod
index 385726ced35fe..46dba9cde0828 100644
--- a/doc/man3/CMS_get0_SignerInfos.pod
+++ b/doc/man3/CMS_get0_SignerInfos.pod
@@ -38,7 +38,7 @@ CMS_SignerInfo_cert_cmp() compares the certificate B<cert> against the signer
 identifier B<si>. It returns zero if the comparison is successful and non zero
 if not.
 
-CMS_SignerInfo_set1_signer_cert() sets the signers certificate of B<si> to
+CMS_SignerInfo_set1_signer_cert() sets the signer's certificate of B<si> to
 B<signer>.
 
 =head1 NOTES
@@ -80,7 +80,7 @@ L<ERR_get_error(3)>, L<CMS_verify(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2008-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2008-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
diff --git a/doc/man3/CMS_sign.pod b/doc/man3/CMS_sign.pod
index 3380b1a1dd957..ce4f39f885c26 100644
--- a/doc/man3/CMS_sign.pod
+++ b/doc/man3/CMS_sign.pod
@@ -97,7 +97,7 @@ can be performed by obtaining the streaming ASN1 B<BIO> directly using
 BIO_new_CMS().
 
 If a signer is specified it will use the default digest for the signing
-algorithm. This is B<SHA1> for both RSA and DSA keys.
+algorithm. This is B<SHA256> for both RSA and DSA keys.
 
 If B<signcert> and B<pkey> are NULL then a certificates only CMS structure is
 output.
@@ -136,7 +136,7 @@ certificates in their I<certs> argument and no longer throw an error for them.
 
 =head1 COPYRIGHT
 
-Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2008-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
diff --git a/doc/man3/DEFINE_STACK_OF.pod b/doc/man3/DEFINE_STACK_OF.pod
index ff2074820f682..eeb882f291e4e 100644
--- a/doc/man3/DEFINE_STACK_OF.pod
+++ b/doc/man3/DEFINE_STACK_OF.pod
@@ -170,15 +170,14 @@ B<sk_I<TYPE>_set>() sets element I<idx> of I<sk> to I<ptr> replacing the current
 element. The new element value is returned or NULL if an error occurred:
 this will only happen if I<sk> is NULL or I<idx> is out of range.
 
-B<sk_I<TYPE>_find>() searches I<sk> for the element I<ptr>.  In the case
-where no comparison function has been specified, the function performs
-a linear search for a pointer equal to I<ptr>. The index of the first
-matching element is returned or B<-1> if there is no match. In the case
-where a comparison function has been specified, I<sk> is sorted and
-B<sk_I<TYPE>_find>() returns the index of a matching element or B<-1> if there
-is no match. Note that, in this case the comparison function will usually
-compare the values pointed to rather than the pointers themselves and
-the order of elements in I<sk> can change.
+B<sk_I<TYPE>_find>() searches I<sk> for the element I<ptr>. In the
+case where no comparison function has been specified, the function
+performs a linear search for a pointer equal to I<ptr>. In the case
+where a comparison function has been specified, the function performs
+a search for a element that the comparison function indicates is a
+match. If the stack is sorted, a binary search is used, otherwise, a
+linear search is used. B<sk_I<TYPE>_find>() returns the index of a
+matching element or B<-1> if there is no match.
 
 B<sk_I<TYPE>_find_ex>() operates like B<sk_I<TYPE>_find>() except when a
 comparison function has been specified and no matching element is found.
@@ -301,7 +300,7 @@ was changed to return 0 in this condition as for other errors.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-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
diff --git a/doc/man3/DTLS_set_timer_cb.pod b/doc/man3/DTLS_set_timer_cb.pod
index 5014e77d0fc89..618fd1f6ff0e9 100644
--- a/doc/man3/DTLS_set_timer_cb.pod
+++ b/doc/man3/DTLS_set_timer_cb.pod
@@ -20,6 +20,17 @@ This function sets an optional callback function for controlling the
 timeout interval on the DTLS protocol. The callback function will be
 called by DTLS for every new DTLS packet that is sent.
 
+The callback should return the timeout interval in micro seconds.
+
+The I<timer_us> parameter of the callback is the last set timeout
+interval returned. On the first invocation of the callback,
+this value will be 0.
+
+At the beginning of the connection, if no timeout callback has been
+set via DTLS_set_timer_cb(), the default timeout value is 1 second.
+For all subsequent timeouts, the default behavior is to double the
+duration up to a maximum of 1 minute.
+
 =head1 RETURN VALUES
 
 Returns void.
@@ -30,7 +41,7 @@ The DTLS_set_timer_cb() function was added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-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
diff --git a/doc/man3/EVP_CIPHER_CTX_get_app_data.pod b/doc/man3/EVP_CIPHER_CTX_get_app_data.pod
new file mode 100644
index 0000000000000..3865bb4390866
--- /dev/null
+++ b/doc/man3/EVP_CIPHER_CTX_get_app_data.pod
@@ -0,0 +1,38 @@
+=pod
+
+=head1 NAME
+
+EVP_CIPHER_CTX_get_app_data, EVP_CIPHER_CTX_set_app_data - Routines to
+inspect and modify application data related to EVP_CIPHER_CTX
+
+=head1 SYNOPSIS
+
+ #include <openssl/evp.h>
+
+ 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);
+
+=head1 DESCRIPTION
+
+The functions EVP_CIPHER_CTX_set_app_data() and EVP_CIPHER_CTX_get_app_data()
+associate an opaque, application-defined pointer with an EVP_CIPHER_CTX object.
+
+This pointer is not interpreted by the library and is reserved entirely for use
+by the application. It may be used to store arbitrary context or state that
+needs to be accessible wherever the corresponding EVP_CIPHER_CTX is available.
+
+=head1 RETURN VALUES
+
+The EVP_CIPHER_CTX_get_app_data() function returns a opaque pointer to the
+current application data for the EVP_CIPHER_CTX.
+
+=head1 COPYRIGHT
+
+Copyright 2026 The OpenSSL Project Authors. All Rights Reserved.
+
+Licensed under the Apache License 2.0 (the "License").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file LICENSE in the source distribution or at
+L<https://www.openssl.org/source/license.html>.
+
+=cut
diff --git a/doc/man3/EVP_EncryptInit.pod b/doc/man3/EVP_EncryptInit.pod
index 2c42e3969e03a..67ba852aaa87b 100644
--- a/doc/man3/EVP_EncryptInit.pod
+++ b/doc/man3/EVP_EncryptInit.pod
@@ -69,8 +69,6 @@ EVP_CIPHER_CTX_get_block_size,
 EVP_CIPHER_CTX_get_key_length,
 EVP_CIPHER_CTX_get_iv_length,
 EVP_CIPHER_CTX_get_tag_length,
-EVP_CIPHER_CTX_get_app_data,
-EVP_CIPHER_CTX_set_app_data,
 EVP_CIPHER_CTX_flags,
 EVP_CIPHER_CTX_set_flags,
 EVP_CIPHER_CTX_clear_flags,
@@ -228,8 +226,6 @@ EVP_CIPHER_CTX_mode
  int EVP_CIPHER_CTX_get_key_length(const EVP_CIPHER_CTX *ctx);
  int EVP_CIPHER_CTX_get_iv_length(const EVP_CIPHER_CTX *ctx);
  int EVP_CIPHER_CTX_get_tag_length(const EVP_CIPHER_CTX *ctx);
- void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx);
- void EVP_CIPHER_CTX_set_app_data(const EVP_CIPHER_CTX *ctx, void *data);
  int EVP_CIPHER_CTX_get_type(const EVP_CIPHER_CTX *ctx);
  int EVP_CIPHER_CTX_get_mode(const EVP_CIPHER_CTX *ctx);
  int EVP_CIPHER_CTX_get_num(const EVP_CIPHER_CTX *ctx);
@@ -850,7 +846,7 @@ See also EVP_CIPHER_CTX_get_key_length() and EVP_CIPHER_CTX_set_key_length().
 =item "tag" (B<OSSL_CIPHER_PARAM_AEAD_TAG>) <octet string>
 
 Gets or sets the AEAD tag for the associated cipher context I<ctx>.
-See L<EVP_EncryptInit(3)/AEAD Interface>.
+See L<EVP_EncryptInit(3)/AEAD INTERFACE>.
 
 =item "pipeline-tag" (B<OSSL_CIPHER_PARAM_PIPELINE_AEAD_TAG>) <octet ptr>
 
@@ -1457,6 +1453,9 @@ for failure.
 EVP_CIPHER_names_do_all() returns 1 if the callback was called for all names.
 A return value of 0 means that the callback was not called for any names.
 
+EVP_CIPHER_get_params(), EVP_CIPHER_CTX_get_params() and
+EVP_CIPHER_CTX_set_params() return 1 for success and 0 for failure.
+
 =head1 CIPHER LISTING
 
 All algorithms have a fixed key length unless otherwise stated.
@@ -1960,7 +1959,7 @@ rather than a 0 return value indicating an error.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2025 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2026 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man3/EVP_PKEY_CTX_new.pod b/doc/man3/EVP_PKEY_CTX_new.pod
index d7ac221f7c192..a15abc2c3e179 100644
--- a/doc/man3/EVP_PKEY_CTX_new.pod
+++ b/doc/man3/EVP_PKEY_CTX_new.pod
@@ -49,8 +49,11 @@ used when no B<EVP_PKEY> structure is associated with the operations,
 for example during parameter generation or key generation for some
 algorithms.
 
-EVP_PKEY_CTX_dup() duplicates the context I<ctx>. It is not supported for a
-keygen operation.
+EVP_PKEY_CTX_dup() duplicates the context I<ctx>.
+It is not supported for a keygen operation.
+It is however possible to duplicate a context freshly created via any of the
+above C<new> functions, provided L<EVP_PKEY_keygen_init(3)> has not yet been
+called on the source context, and then use the copy for key generation.
 
 EVP_PKEY_CTX_free() frees up the context I<ctx>.
 If I<ctx> is NULL, nothing is done.
@@ -122,7 +125,7 @@ added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2006-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-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
diff --git a/doc/man3/EVP_PKEY_encapsulate.pod b/doc/man3/EVP_PKEY_encapsulate.pod
index a82eaded592f5..e37599c4c417f 100644
--- a/doc/man3/EVP_PKEY_encapsulate.pod
+++ b/doc/man3/EVP_PKEY_encapsulate.pod
@@ -30,14 +30,14 @@ key that is used during encapsulation.
 
 The EVP_PKEY_encapsulate() function performs a public key encapsulation
 operation using I<ctx>.
-The shared secret writen to I<genkey> can be used as an input for key
+The shared secret written to I<genkey> can be used as an input for key
 derivation, typically for various symmetric algorithms.
 Its size is written to I<genkeylen>, which must be initialised to the
 size of the provided buffer.
 
 The ciphertext written to I<wrappedkey> is an encapsulated form, which
 is expected to be only usable by the holder of the private key corresponding
-to wthe public key associated with I<ctx>.
+to the public key associated with I<ctx>.
 This ciphertext is then communicated to the private-key holder, who can use
 L<EVP_PKEY_decapsulate(3)> to securely recover the same shared secret.
 
diff --git a/doc/man3/EVP_PKEY_keygen.pod b/doc/man3/EVP_PKEY_keygen.pod
index 9cdea5b362201..5e32676cb9a9b 100644
--- a/doc/man3/EVP_PKEY_keygen.pod
+++ b/doc/man3/EVP_PKEY_keygen.pod
@@ -86,10 +86,12 @@ If the callback returns 0 then the key generation operation is aborted and an
 error occurs. This might occur during a time consuming operation where
 a user clicks on a "cancel" button.
 
-The functions EVP_PKEY_CTX_set_app_data() and EVP_PKEY_CTX_get_app_data() set
-and retrieve an opaque pointer. This can be used to set some application
-defined value which can be retrieved in the callback: for example a handle
-which is used to update a "progress dialog".
+The functions EVP_PKEY_CTX_set_app_data() and EVP_PKEY_CTX_get_app_data()
+associate an opaque, application-defined pointer with an EVP_PKEY_CTX object.
+
+This pointer is not interpreted by the library and is reserved entirely for use
+by the application. It may be used to store arbitrary context or state that
+needs to be accessible wherever the corresponding EVP_PKEY_CTX is available.
 
 EVP_PKEY_Q_keygen() abstracts from the explicit use of B<EVP_PKEY_CTX> while
 providing a 'quick' but limited way of generating a new asymmetric key pair.
@@ -239,7 +241,7 @@ EVP_PKEY_Q_keygen() and EVP_PKEY_generate() were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2006-2025 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-2026 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man3/EVP_PKEY_new.pod b/doc/man3/EVP_PKEY_new.pod
index eccc21aac63fd..0a56600c2b60f 100644
--- a/doc/man3/EVP_PKEY_new.pod
+++ b/doc/man3/EVP_PKEY_new.pod
@@ -174,7 +174,7 @@ C<ML-DSA-87>,
 B<ML-KEM-512>,
 B<ML-KEM-768> and
 B<ML-KEM-1024>
-keys, which don't have legacy numeric I<NID> assigments, but their raw form is
+keys, which don't have legacy numeric I<NID> assignments, but their raw form is
 nevertheless available.
 
 
@@ -198,7 +198,7 @@ C<ML-DSA-87>,
 B<ML-KEM-512>,
 B<ML-KEM-768> and
 B<ML-KEM-1024>
-keys, which don't have legacy numeric I<NID> assigments, but their raw form is
+keys, which don't have legacy numeric I<NID> assignments, but their raw form is
 nevertheless available.
 
 EVP_PKEY_new_CMAC_key() works in the same way as EVP_PKEY_new_raw_private_key()
@@ -219,7 +219,19 @@ general private key without reference to any particular algorithm.
 The structure returned by EVP_PKEY_new() is empty. To add a private or public
 key to this empty structure use the appropriate functions described in
 L<EVP_PKEY_set1_RSA(3)>, L<EVP_PKEY_set1_DSA(3)>, L<EVP_PKEY_set1_DH(3)> or
-L<EVP_PKEY_set1_EC_KEY(3)>.
+L<EVP_PKEY_set1_EC_KEY(3)> for legacy key types implemented in internal
+OpenSSL providers.
+
+For fully provider-managed key types (see L<provider-keymgmt(7)>),
+possibly implemented in external providers, use functions such as
+L<EVP_PKEY_set1_encoded_public_key(3)> or L<EVP_PKEY_fromdata(3)>
+to populate key data.
+
+Generally caution is advised for using an B<EVP_PKEY> structure across
+different library contexts: In order for an B<EVP_PKEY> to be shared by
+multiple library contexts the providers associated with the library contexts
+must have key managers that support the key type and implement the
+OSSL_FUNC_keymgmt_import() and OSSL_FUNC_keymgmt_export() functions.
 
 =head1 RETURN VALUES
 
diff --git a/doc/man3/EVP_PKEY_sign.pod b/doc/man3/EVP_PKEY_sign.pod
index b88a9893f52fa..300f77889fd87 100644
--- a/doc/man3/EVP_PKEY_sign.pod
+++ b/doc/man3/EVP_PKEY_sign.pod
@@ -40,7 +40,7 @@ signing a pre-computed message digest using the algorithm given by I<algo> and
 the key given through L<EVP_PKEY_CTX_new(3)> or L<EVP_PKEY_CTX_new_from_pkey(3)>.
 A context I<ctx> without a pre-loaded key cannot be used with this function.
 This function provides almost the same functionality as EVP_PKEY_sign_init_ex(),
-but is uniquely intended to be used with a pre-computed messsage digest, and
+but is uniquely intended to be used with a pre-computed message digest, and
 allows pre-determining the exact conditions for that message digest, if a
 composite signature algorithm (such as RSA-SHA256) was fetched.
 Following a call to this function, setting parameters that modifies the digest
@@ -358,7 +358,7 @@ where added in OpenSSL 3.4.
 
 =head1 COPYRIGHT
 
-Copyright 2006-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2006-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
diff --git a/doc/man3/EVP_RAND.pod b/doc/man3/EVP_RAND.pod
index fdb9ef9dcfd11..b9abd245cd7e7 100644
--- a/doc/man3/EVP_RAND.pod
+++ b/doc/man3/EVP_RAND.pod
@@ -152,11 +152,8 @@ operating system.  If I<prediction_resistance> is specified, fresh entropy
 from a live source will be sought.  This call operates as per NIST SP 800-90A
 and SP 800-90C.
 
-EVP_RAND_nonce() creates a nonce in I<out> of maximum length I<outlen>
-bytes from the RAND I<ctx>. The function returns the length of the generated
-nonce. If I<out> is NULL, the length is still returned but no generation
-takes place. This allows a caller to dynamically allocate a buffer of the
-appropriate size.
+EVP_RAND_nonce() creates a nonce in I<out> of length I<outlen>
+bytes from the RAND I<ctx>.
 
 EVP_RAND_enable_locking() enables locking for the RAND I<ctx> and all of
 its parents.  After this I<ctx> will operate in a thread safe manner, albeit
@@ -385,7 +382,7 @@ EVP_RAND_CTX_free() does not return a value.
 
 EVP_RAND_CTX_up_ref() returns 1 on success, 0 on error.
 
-EVP_RAND_nonce() returns the length of the nonce.
+EVP_RAND_nonce() returns 1 on success, 0 on error.
 
 EVP_RAND_get_strength() returns the strength of the random number generator
 in bits.
@@ -417,7 +414,7 @@ The remaining functions were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-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
diff --git a/doc/man3/EVP_SKEY.pod b/doc/man3/EVP_SKEY.pod
index 27ad844d7ed42..5a2f9e1827044 100644
--- a/doc/man3/EVP_SKEY.pod
+++ b/doc/man3/EVP_SKEY.pod
@@ -21,7 +21,7 @@ EVP_SKEY_free, EVP_SKEY_is_a, EVP_SKEY_to_provider
                            const char *propquery,
                            int selection, const OSSL_PARAM *params);
  EVP_SKEY *EVP_SKEY_import_raw_key(OSSL_LIB_CTX *libctx, const char *skeymgmtname,
-                                   unsigned char *key, size_t *len,
+                                   unsigned char *key, size_t len,
                                    const char *propquery);
  int EVP_SKEY_export(const EVP_SKEY *skey, int selection,
                      OSSL_CALLBACK *export_cb, void *export_cbarg);
@@ -56,8 +56,10 @@ which is used by OpenSSL to store symmetric keys, assigns the
 B<EVP_SKEYMGMT> object associated with the key, and initializes the object from
 the B<params> argument.
 
-The EVP_SKEY_import_raw_key() function is a helper that creates an B<EVP_SKEY> object
-containing the raw byte representation of the symmetric keys.
+The EVP_SKEY_import_raw_key() function is a helper that creates an B<EVP_SKEY>
+object containing the raw byte representation of the symmetric keys from the
+buffer I<key> having length I<len>. The I<skeymgmtname> defines the name of the
+target B<EVP_SKEYMGMT> for the newly created key.
 
 The EVP_SKEY_export() function extracts values from a key I<skey> using the
 I<selection>.  I<selection> is described below. It uses a callback I<export_cb>
@@ -129,7 +131,7 @@ EVP_SKEY_up_ref() returns 1 for success and 0 on failure.
 EVP_SKEY_export() and EVP_SKEY_get0_raw_key() return 1 for success and 0 on failure.
 
 EVP_SKEY_get0_skeymgmt_name() and EVP_SKEY_get0_provider_name() return the
-names of the associated EVP_SKEYMGMT object and its provider correspondigly.
+names of the associated EVP_SKEYMGMT object and its provider correspondingly.
 
 EVP_SKEY_is_a() returns 1 if I<skey> has the key type I<name>,
 otherwise 0.
@@ -152,7 +154,7 @@ were introduced in OpenSSL 3.5.
 
 =head1 COPYRIGHT
 
-Copyright 2025 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2025-2026 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man3/EVP_aes_128_gcm.pod b/doc/man3/EVP_aes_128_gcm.pod
index 485705ea78890..9bac62b10b320 100644
--- a/doc/man3/EVP_aes_128_gcm.pod
+++ b/doc/man3/EVP_aes_128_gcm.pod
@@ -127,7 +127,7 @@ EVP_aes_256_ocb()
 
 AES for 128, 192 and 256 bit keys in CBC-MAC Mode (CCM), Galois Counter Mode
 (GCM) and OCB Mode respectively. These ciphers require additional control
-operations to function correctly, see the L<EVP_EncryptInit(3)/AEAD Interface>
+operations to function correctly, see the L<EVP_EncryptInit(3)/AEAD INTERFACE>
 section for details.
 
 =item EVP_aes_128_wrap(),
@@ -184,7 +184,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-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
diff --git a/doc/man3/EVP_aria_128_gcm.pod b/doc/man3/EVP_aria_128_gcm.pod
index 91aa75ec38717..74e21444db8fd 100644
--- a/doc/man3/EVP_aria_128_gcm.pod
+++ b/doc/man3/EVP_aria_128_gcm.pod
@@ -88,7 +88,7 @@ EVP_aria_256_gcm(),
 
 ARIA for 128, 192 and 256 bit keys in CBC-MAC Mode (CCM) and Galois Counter
 Mode (GCM). These ciphers require additional control operations to function
-correctly, see the L<EVP_EncryptInit(3)/AEAD Interface> section for details.
+correctly, see the L<EVP_EncryptInit(3)/AEAD INTERFACE> section for details.
 
 =back
 
@@ -113,7 +113,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-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
diff --git a/doc/man3/EVP_chacha20.pod b/doc/man3/EVP_chacha20.pod
index 7e80c8de40c9e..0dfce7389b782 100644
--- a/doc/man3/EVP_chacha20.pod
+++ b/doc/man3/EVP_chacha20.pod
@@ -36,7 +36,7 @@ With an initial counter of 42 (2a in hex) would be expressed as:
 Authenticated encryption with ChaCha20-Poly1305. Like EVP_chacha20(), the key
 is 256 bits and the IV is 96 bits. This supports additional authenticated data
 (AAD) and produces a 128-bit authentication tag. See the
-L<EVP_EncryptInit(3)/AEAD Interface> section for more information.
+L<EVP_EncryptInit(3)/AEAD INTERFACE> section for more information.
 
 =back
 
@@ -64,7 +64,7 @@ L<EVP_CIPHER_meth_new(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-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
diff --git a/doc/man3/OPENSSL_malloc.pod b/doc/man3/OPENSSL_malloc.pod
index d02eb47e9a6e4..bdbf596ec3a51 100644
--- a/doc/man3/OPENSSL_malloc.pod
+++ b/doc/man3/OPENSSL_malloc.pod
@@ -121,6 +121,10 @@ before ultimately calling OPENSSL_free(). If the argument to OPENSSL_free() is
 NULL, nothing is done.
 
 OPENSSL_cleanse() fills B<ptr> of size B<len> with a string of 0's.
+It is useful in cases when it is needed to ensure that memory (that contains
+sensitive information) is overwritten (for example, before it is reclaimed,
+or when it is stored on stack), and such operation is not optimised out
+by compiler optimisations such as dead store elimination (as memset(3) may be).
 Use OPENSSL_cleanse() with care if the memory is a mapping of a file.
 If the storage controller uses write compression, then it's possible
 that sensitive tail bytes will survive zeroization because the block of
diff --git a/doc/man3/OPENSSL_ppccap.pod b/doc/man3/OPENSSL_ppccap.pod
new file mode 100644
index 0000000000000..8434395f3c859
--- /dev/null
+++ b/doc/man3/OPENSSL_ppccap.pod
@@ -0,0 +1,155 @@
+=pod
+
+=head1 NAME
+
+OPENSSL_ppccap - the PowerPC processor capabilities vector
+
+=head1 SYNOPSIS
+
+ env OPENSSL_ppccap=... <application>
+
+=head1 DESCRIPTION
+
+libcrypto supports PowerPC instruction set extensions. These extensions are
+represented by bits in the PowerPC capabilities vector. When libcrypto
+initializes, it stores the results returned by PowerPC CPU capabilities detection
+logic in the PowerPC capabilities vector. The CPU capabilities detection methods
+are OS-dependent and use a combination of information gathered by the kernel
+during boot and probe functions that attempt to execute instructions and trap
+illegal instruction signals with a signal handler.
+
+To override the set of extensions available to an application, you can set the
+B<OPENSSL_ppccap> environment variable before you start the application. The
+environment variable is assigned a numerical value that denotes the bits in
+the PowerPC capabilities vector. The ppc_arch.h header file states that, "Flags'
+usage can appear ambiguous, because they are set rather to reflect OpenSSL
+performance preferences than actual processor capabilities."
+
+Multiple extensions are enabled by logically OR-ing the values that represent the
+desired extensions.
+
+B<Notes>: Enabling an extension on a CPU that does not support the extension
+will result in a SIGILL crash. On AIX, all vector instructions can be disabled
+with the schedo -ro allow_vmx=0 command. DO NOT USE THIS COMMAND to disable
+vector instructions in the OS when it is running on a CPU level that supports the
+instructions without also disabling them in libcrpto via the OPENSSL_ppccap
+environment variable or the application will crash with a SIGILL.
+
+Currently, the following extensions are defined:
+
+=over 4
+
+=item 0x01
+
+Name: B<PPC_FPU64>
+
+This flag is obsolete.
+
+=item 0x02
+
+Name: B<PPC_ALTIVEC>
+
+Meaning: Use AltiVec (aka VMX) instructions. In some but not all cases, this
+capability gates the use of later ISA vector instructions. The associated probe
+instruction is vor (vector logical or).
+
+Effect: Enables use of vector instructions but does not enable extensions added
+at specific ISA levels. However, disabling this capability disables a subset of
+vector extensions added at specific ISA levels even if they are otherwise
+enabled.
+
+=item 0x04
+
+Name: B<PPC_CRYPTO207>
+
+Meaning: Use instructions added in ISA level 2.07. The associated probe
+instruction instruction is vcipher (vector AES cipher round).
+
+Effect: Enables AES, SHA-2 sigma, and other ISA 2.07 instructions for AES, SHA-2,
+GHASH, and Poly1305.
+
+=item 0x08
+
+Name: B<PPC_FPU>
+
+Meaning: Use FPU instructions. The associated probe instruction is fmr (floating
+move register).
+
+Effect: Enables Poly1305 FPU implementation. The PPC_CRYPTO207 capability
+overrides this effect.
+
+=item 0x10
+
+Name: B<PPC_MADD300>
+
+Meaning: Use instructions added in ISA level 3.00. The associated probe
+instruction is maddhdu (multiply-add high doubleword unsigned).
+
+Effect: Enables use of the polynomial multiply and other ISA 3.00 instructions
+for AES-GCM, P-384, and P-521.
+
+=item 0x20
+
+Name: B<PPC_MFTB>
+
+Meaning: Use the mftb (move from time base) instruction. The associated probe
+instruction is mftb.
+
+Effect: Enables use of the mftb instruction to sample the lower 32 bits of the
+CPU time base register in order to acquire entropy. Considered obsolete.  The
+PPC_MFSPR268 capability overrides this capability.
+
+=item 0x40
+
+Name: B<PPC_MFSPR268>
+
+Meaning: Use the mfspr (move from special purpose register) instruction to
+read SPR 268. The associated probe instruction is mfspr 268.
+
+Effect: Enables use of the mfspr instruction to sample the lower 32 bits of the
+CPU time base register from SPR 268, the TBL (time base lower) register, in order
+to acquire entropy.
+
+=item 0x80
+
+Name: B<PPC_BRD31>
+
+Meaning: Use instructions added in ISA level 3.1. The associated probe instruction
+is brd (byte-reverse doubleword).
+
+Effect: Enables use of ISA 3.1 instructions in ChaCha20.
+
+=back
+
+=head1 RETURN VALUES
+
+Not available.
+
+=head1 EXAMPLES
+
+Check currently detected capabilities:
+
+ $ openssl info -cpusettings
+ OPENSSL_ppccap=0x2E
+
+The detected capabilities in the above example indicate that PPC_MFTB, PPC_FPU,
+PPC_CRYPTO207, PPC_MFSPR268, and PPC_ALTIVEC are enabled.
+
+Disable all instruction set extensions:
+
+ OPENSSL_ppccap=0x00
+
+Enable base AltiVec extensions:
+
+ OPENSSL_ppccap=0x02
+
+=head1 COPYRIGHT
+
+Copyright 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
+L<https://www.openssl.org/source/license.html>.
+
+=cut
diff --git a/doc/man3/OPENSSL_riscvcap.pod b/doc/man3/OPENSSL_riscvcap.pod
index 1ebf20826a7f1..3113b98f336fb 100644
--- a/doc/man3/OPENSSL_riscvcap.pod
+++ b/doc/man3/OPENSSL_riscvcap.pod
@@ -189,15 +189,21 @@ Not available.
 Check currently detected capabilities
 
  $ openssl info -cpusettings
- OPENSSL_riscvcap=ZBA_ZBB_ZBC_ZBS_V
+ OPENSSL_riscvcap=RV64GC_ZBA_ZBB_ZBC_ZBS_V vlen:256
+
+Note: The first word in the displayed capabilities is the RISC-V base
+architecture value, which is derived from the compiler configuration.
+It is therefore not overridable by the environment variable.
+When the V extension is given the riscv_vlen value is always displayed,
+there is no way to override the riscv_vlen by the environment variable.
 
 Disables all instruction set extensions:
 
- OPENSSL_riscvcap="rv64gc"
+ export OPENSSL_riscvcap="rv64gc"
 
 Only enable the vector extension:
 
- OPENSSL_riscvcap="rv64gc_v"
+ export OPENSSL_riscvcap="rv64gc_v"
 
 =head1 COPYRIGHT
 
diff --git a/doc/man3/OPENSSL_secure_malloc.pod b/doc/man3/OPENSSL_secure_malloc.pod
index 1bddd7737069b..dbc7073aac186 100644
--- a/doc/man3/OPENSSL_secure_malloc.pod
+++ b/doc/man3/OPENSSL_secure_malloc.pod
@@ -45,7 +45,12 @@ the program's dynamic memory area, where keys and other sensitive
 information might be stored, OpenSSL supports the concept of a "secure heap."
 The level and type of security guarantees depend on the operating system.
 It is a good idea to review the code and see if it addresses your
-threat model and concerns.
+threat model and concerns. It should be noted that the secure heap
+uses a single read/write lock, and therefore any operations
+that involve allocation or freeing of secure heap memory are serialised,
+blocking other threads. With that in mind, highly concurrent applications
+should enable the secure heap with caution and be aware of the performance
+implications for multi-threaded code.
 
 If a secure heap is used, then private key B<BIGNUM> values are stored there.
 This protects long-term storage of private keys, but will not necessarily
@@ -135,7 +140,7 @@ a B<size_t> in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2015-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2015-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
diff --git a/doc/man3/OSSL_CALLBACK.pod b/doc/man3/OSSL_CALLBACK.pod
index 5fa8a8f089161..5550819a94b49 100644
--- a/doc/man3/OSSL_CALLBACK.pod
+++ b/doc/man3/OSSL_CALLBACK.pod
@@ -47,15 +47,10 @@ Additional parameters can be passed with the L<OSSL_PARAM(3)> array I<params>,
 
 =back
 
-=begin comment RETURN VALUES doesn't make sense for a manual that only
-describes a type, but document checkers still want that section, and
-to have more than just the section title.
-
 =head1 RETURN VALUES
 
-txt
-
-=end comment
+Functions of type B<OSSL_CALLBACK> and B<OSSL_PASSPHRASE_CALLBACK>
+must return 1 on success and 0 on failure.
 
 =head1 SEE ALSO
 
@@ -67,7 +62,7 @@ The types described here were added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+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
diff --git a/doc/man3/OSSL_CMP_ATAV_set0.pod b/doc/man3/OSSL_CMP_ATAV_set0.pod
index 2fe37f7940785..8a184a13f836a 100644
--- a/doc/man3/OSSL_CMP_ATAV_set0.pod
+++ b/doc/man3/OSSL_CMP_ATAV_set0.pod
@@ -80,7 +80,7 @@ OSSL_CMP_ATAV_free() deallocates I<atav>. It is defined as a macro.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210. CRMF is defined in RFC 4211.
+CMP is defined in RFC 9810. CRMF is defined in RFC 4211.
 
 =head1 RETURN VALUES
 
diff --git a/doc/man3/OSSL_CMP_CTX_new.pod b/doc/man3/OSSL_CMP_CTX_new.pod
index 0df0e78367e9e..a966d9b17c9c5 100644
--- a/doc/man3/OSSL_CMP_CTX_new.pod
+++ b/doc/man3/OSSL_CMP_CTX_new.pod
@@ -106,7 +106,7 @@ OSSL_CMP_CTX_set1_senderNonce
  /* server authentication: */
  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);
+                                       const X509_NAME *name);
  #define OSSL_CMP_CTX_set0_trusted OSSL_CMP_CTX_set0_trustedStore
  int OSSL_CMP_CTX_set0_trustedStore(OSSL_CMP_CTX *ctx, X509_STORE *store);
  #define OSSL_CMP_CTX_get0_trusted OSSL_CMP_CTX_get0_trustedStore
@@ -214,147 +214,147 @@ The following options can be set:
 
 =item B<OSSL_CMP_OPT_LOG_VERBOSITY>
 
-        The level of severity needed for actually outputting log messages
-        due to errors, warnings, general info, debugging, etc.
-        Default is OSSL_CMP_LOG_INFO. See also L<OSSL_CMP_log_open(3)>.
+The level of severity needed for actually outputting log messages
+due to errors, warnings, general info, debugging, etc.
+Default is OSSL_CMP_LOG_INFO. See also L<OSSL_CMP_log_open(3)>.
 
 =item B<OSSL_CMP_OPT_KEEP_ALIVE>
 
-        If the given value is 0 then HTTP connections are not kept open
-        after receiving a response, which is the default behavior for HTTP 1.0.
-        If the value is 1 or 2 then persistent connections are requested.
-        If the value is 2 then persistent connections are required,
-        i.e., in case the server does not grant them an error occurs.
-        The default value is 1: prefer to keep the connection open.
+If the given value is 0 then HTTP connections are not kept open
+after receiving a response, which is the default behavior for HTTP 1.0.
+If the value is 1 or 2 then persistent connections are requested.
+If the value is 2 then persistent connections are required,
+i.e., in case the server does not grant them an error occurs.
+The default value is 1: prefer to keep the connection open.
 
 =item B<OSSL_CMP_OPT_MSG_TIMEOUT>
 
-        Number of seconds a CMP request-response message round trip
-        is allowed to take before a timeout error is returned.
-        A value <= 0 means no limitation (waiting indefinitely).
-        Default is to use the B<OSSL_CMP_OPT_TOTAL_TIMEOUT> setting.
+Number of seconds a CMP request-response message round trip
+is allowed to take before a timeout error is returned.
+A value <= 0 means no limitation (waiting indefinitely).
+Default is to use the B<OSSL_CMP_OPT_TOTAL_TIMEOUT> setting.
 
 =item B<OSSL_CMP_OPT_TOTAL_TIMEOUT>
 
-        Maximum total number of seconds a transaction may take,
-        including polling etc.
-        A value <= 0 means no limitation (waiting indefinitely).
-        Default is 0.
+Maximum total number of seconds a transaction may take,
+including polling etc.
+A value <= 0 means no limitation (waiting indefinitely).
+Default is 0.
 
 =item B<OSSL_CMP_OPT_USE_TLS>
 
-        Use this option to indicate to the HTTP implementation
-        whether TLS is going to be used for the connection (resulting in HTTPS).
-        The value 1 indicates that TLS is used for client-side HTTP connections,
-        which needs to be implemented via a callback function set by
-        OSSL_CMP_CTX_set_http_cb().
-        The value 0 indicates that TLS is not used.
-        Default is -1 for backward compatibility: TLS is used by the client side
-        if and only if OSSL_CMP_CTX_set_http_cb_arg() sets a non-NULL I<arg>.
+Use this option to indicate to the HTTP implementation
+whether TLS is going to be used for the connection (resulting in HTTPS).
+The value 1 indicates that TLS is used for client-side HTTP connections,
+which needs to be implemented via a callback function set by
+OSSL_CMP_CTX_set_http_cb().
+The value 0 indicates that TLS is not used.
+Default is -1 for backward compatibility: TLS is used by the client side
+if and only if OSSL_CMP_CTX_set_http_cb_arg() sets a non-NULL I<arg>.
 
 =item B<OSSL_CMP_OPT_VALIDITY_DAYS>
 
-        Number of days new certificates are asked to be valid for.
+Number of days new certificates are asked to be valid for.
 
 =item B<OSSL_CMP_OPT_SUBJECTALTNAME_NODEFAULT>
 
-        Do not take default Subject Alternative Names
-        from the reference certificate.
+Do not take default Subject Alternative Names
+from the reference certificate.
 
 =item B<OSSL_CMP_OPT_SUBJECTALTNAME_CRITICAL>
 
-        Demand that the given Subject Alternative Names are flagged as critical.
+Demand that the given Subject Alternative Names are flagged as critical.
 
 =item B<OSSL_CMP_OPT_POLICIES_CRITICAL>
 
-        Demand that the given policies are flagged as critical.
+Demand that the given policies are flagged as critical.
 
 =item B<OSSL_CMP_OPT_POPO_METHOD>
 
-        Select the proof of possession method to use. Possible values are:
+Select the proof of possession method to use. Possible values are:
 
-            OSSL_CRMF_POPO_NONE       - ProofOfPossession field omitted,
-                                        which implies central key generation
-            OSSL_CRMF_POPO_RAVERIFIED - assert that the RA has already
-                                        verified the PoPo
-            OSSL_CRMF_POPO_SIGNATURE  - sign a value with private key,
-                                        which is the default.
-            OSSL_CRMF_POPO_KEYENC     - decrypt the encrypted certificate
-                                        ("indirect method")
+    OSSL_CRMF_POPO_NONE       - ProofOfPossession field omitted,
+                                which implies central key generation
+    OSSL_CRMF_POPO_RAVERIFIED - assert that the RA has already
+                                verified the PoPo
+    OSSL_CRMF_POPO_SIGNATURE  - sign a value with private key,
+                                which is the default.
+    OSSL_CRMF_POPO_KEYENC     - decrypt the encrypted certificate
+                                ("indirect method")
 
-        Note that a signature-based POPO can only be produced if a private key
-        is provided as the newPkey or client's pkey component of the CMP context.
+Note that a signature-based POPO can only be produced if a private key
+is provided as the newPkey or client's pkey component of the CMP context.
 
 =item B<OSSL_CMP_OPT_DIGEST_ALGNID>
 
-        The NID of the digest algorithm to be used in RFC 4210's MSG_SIG_ALG
-        for signature-based message protection and Proof-of-Possession (POPO).
-        Default is SHA256.
+The NID of the digest algorithm to be used in RFC 9810's MSG_SIG_ALG
+for signature-based message protection and Proof-of-Possession (POPO).
+Default is SHA256.
 
 =item B<OSSL_CMP_OPT_OWF_ALGNID>
-        The NID of the digest algorithm to be used as one-way function (OWF)
-        for MAC-based message protection with password-based MAC (PBM).
-        See RFC 4210 section 5.1.3.1 for details.
-        Default is SHA256.
+The NID of the digest algorithm to be used as one-way function (OWF)
+for MAC-based message protection with password-based MAC (PBM).
+See RFC 9810 section 5.1.3.1 for details.
+Default is SHA256.
 
 =item B<OSSL_CMP_OPT_MAC_ALGNID>
-        The NID of the MAC algorithm to be used for message protection with PBM.
-        Default is HMAC-SHA1 as per RFC 4210.
+The NID of the MAC algorithm to be used for message protection with PBM.
+Default is HMAC-SHA1, for backward compatibility with RFC 4210.
 
 =item B<OSSL_CMP_OPT_REVOCATION_REASON>
 
-        The reason code to be included in a Revocation Request (RR);
-        values: 0..10 (RFC 5210, 5.3.1) or -1 for none, which is the default.
+The reason code to be included in a Revocation Request (RR);
+values: 0..10 (RFC 5210, 5.3.1) or -1 for none, which is the default.
 
 =item B<OSSL_CMP_OPT_IMPLICIT_CONFIRM>
 
-        Request server to enable implicit confirm mode, where the client
-        does not need to send confirmation upon receiving the
-        certificate. If the server does not enable implicit confirmation
-        in the return message, then confirmation is sent anyway.
+Request server to enable implicit confirm mode, where the client
+does not need to send confirmation upon receiving the
+certificate. If the server does not enable implicit confirmation
+in the return message, then confirmation is sent anyway.
 
 =item B<OSSL_CMP_OPT_DISABLE_CONFIRM>
 
-        Do not confirm enrolled certificates, to cope with broken servers
-        not supporting implicit confirmation correctly.
+Do not confirm enrolled certificates, to cope with broken servers
+not supporting implicit confirmation correctly.
 B<WARNING:> This setting leads to unspecified behavior and it is meant
 exclusively to allow interoperability with server implementations violating
-RFC 4210.
+RFC 9810.
 
 =item B<OSSL_CMP_OPT_UNPROTECTED_SEND>
 
-        Send request or response messages without CMP-level protection.
+Send request or response messages without CMP-level protection.
 
 =item B<OSSL_CMP_OPT_UNPROTECTED_ERRORS>
 
-        Accept unprotected error responses which are either explicitly
-        unprotected or where protection verification failed. Applies to regular
-        error messages as well as certificate responses (IP/CP/KUP) and
-        revocation responses (RP) with rejection.
+Accept unprotected error responses which are either explicitly
+unprotected or where protection verification failed. Applies to regular
+error messages as well as certificate responses (IP/CP/KUP) and
+revocation responses (RP) with rejection.
 B<WARNING:> This setting leads to unspecified behavior and it is meant
 exclusively to allow interoperability with server implementations violating
-RFC 4210.
+RFC 9810.
 
 =item B<OSSL_CMP_OPT_IGNORE_KEYUSAGE>
 
-        Ignore key usage restrictions in the signer's certificate when
-        validating signature-based protection in received CMP messages.
-        Else, 'digitalSignature' must be allowed by CMP signer certificates.
+Ignore key usage restrictions in the signer's certificate when
+validating signature-based protection in received CMP messages.
+Else, 'digitalSignature' must be allowed by CMP signer certificates.
 
 =item B<OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR>
 
-        Allow retrieving a trust anchor from extraCerts and using that
-        to validate the certificate chain of an IP message.
-        This is a quirk option added to support 3GPP TS 33.310.
+Allow retrieving a trust anchor from extraCerts and using that
+to validate the certificate chain of an IP message.
+This is a quirk option added to support 3GPP TS 33.310.
 
-        Note that using this option is dangerous as the certificate obtained
-        this way has not been authenticated (at least not at CMP level).
-        Taking it over as a trust anchor implements trust-on-first-use (TOFU).
+Note that using this option is dangerous as the certificate obtained
+this way has not been authenticated (at least not at CMP level).
+Taking it over as a trust anchor implements trust-on-first-use (TOFU).
 
 =item B<OSSL_CMP_OPT_NO_CACHE_EXTRACERTS>
 
-        Do not cache certificates received in the extraCerts CMP message field.
-        Otherwise they are stored to potentially help validate further messages.
+Do not cache certificates received in the extraCerts CMP message field.
+Otherwise they are stored to potentially help validate further messages.
 
 =back
 
@@ -543,7 +543,7 @@ messages that have MAC-based protection (protectionAlg = C<MSG_MAC_ALG>).
 
 OSSL_CMP_CTX_set1_referenceValue() sets the given referenceValue I<ref> with
 length I<len> in the given I<ctx> or clears it if the I<ref> argument is NULL.
-According to RFC 4210 section 5.1.1, if no value for the sender field in
+According to RFC 9810 section 5.1.1, if no value for the sender field in
 CMP message headers can be determined (i.e., no CMP signer certificate
 and no subject DN is set via OSSL_CMP_CTX_set1_subjectName()
 then the sender field will contain the NULL-DN
@@ -756,7 +756,7 @@ the I<ctx>. This will be used to validate the recipNonce in incoming messages.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210 (and CRMF in RFC 4211).
+CMP is defined in RFC 9810 (and CRMF in RFC 4211).
 
 =head1 RETURN VALUES
 
diff --git a/doc/man3/OSSL_CMP_HDR_get0_transactionID.pod b/doc/man3/OSSL_CMP_HDR_get0_transactionID.pod
index 6e79e9a0e3c39..a66d1b88b5a74 100644
--- a/doc/man3/OSSL_CMP_HDR_get0_transactionID.pod
+++ b/doc/man3/OSSL_CMP_HDR_get0_transactionID.pod
@@ -30,7 +30,7 @@ in the generalInfo field of the given PKIHeader.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210.
+CMP is defined in RFC 9810.
 
 =head1 RETURN VALUES
 
diff --git a/doc/man3/OSSL_CMP_ITAV_new_caCerts.pod b/doc/man3/OSSL_CMP_ITAV_new_caCerts.pod
index ce555d16e6ac1..f7f3a24494bff 100644
--- a/doc/man3/OSSL_CMP_ITAV_new_caCerts.pod
+++ b/doc/man3/OSSL_CMP_ITAV_new_caCerts.pod
@@ -173,7 +173,7 @@ B<algId> or B<rsaKeyLen> and assigns to I<*keySpec> a copy of the keySpec field.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210.
+CMP is defined in RFC 9810.
 
 =head1 RETURN VALUES
 
diff --git a/doc/man3/OSSL_CMP_ITAV_set0.pod b/doc/man3/OSSL_CMP_ITAV_set0.pod
index 13d7868a6debd..0b4c76e6a76a6 100644
--- a/doc/man3/OSSL_CMP_ITAV_set0.pod
+++ b/doc/man3/OSSL_CMP_ITAV_set0.pod
@@ -29,7 +29,7 @@ OSSL_CMP_ITAV_get0_certProfile
 
 =head1 DESCRIPTION
 
-ITAV is short for InfoTypeAndValue. This type is defined in RFC 4210
+ITAV is short for InfoTypeAndValue. This type is defined in RFC 9810
 section 5.3.19 and Appendix F. It is used at various places in CMP messages,
 e.g., in the generalInfo PKIHeader field, to hold a key-value pair.
 
@@ -61,7 +61,7 @@ It is an error if the infoType of I<itav> is not B<certProfile>.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210 and RFC 9480 (and CRMF in RFC 4211).
+CMP is defined in RFC 9810.
 
 OIDs to use as types in B<OSSL_CMP_ITAV> can be found at
 L<https://datatracker.ietf.org/doc/html/rfc9480#section-4.2.2>.
diff --git a/doc/man3/OSSL_CMP_MSG_get0_header.pod b/doc/man3/OSSL_CMP_MSG_get0_header.pod
index f8f535f30b026..9ba2211909288 100644
--- a/doc/man3/OSSL_CMP_MSG_get0_header.pod
+++ b/doc/man3/OSSL_CMP_MSG_get0_header.pod
@@ -114,7 +114,7 @@ to BIO I<bio>.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210.
+CMP is defined in RFC 9810.
 
 =head1 RETURN VALUES
 
diff --git a/doc/man3/OSSL_CMP_MSG_http_perform.pod b/doc/man3/OSSL_CMP_MSG_http_perform.pod
index c8d1a4fb47e7c..89dc637f0ed3b 100644
--- a/doc/man3/OSSL_CMP_MSG_http_perform.pod
+++ b/doc/man3/OSSL_CMP_MSG_http_perform.pod
@@ -43,8 +43,8 @@ such as L<OSSL_HTTP_proxy_connect(3)>.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210.
-HTTP transfer for CMP is defined in RFC 6712.
+CMP is defined in RFC 9810.
+HTTP transfer for CMP is defined in RFC 9811.
 
 =head1 RETURN VALUES
 
diff --git a/doc/man3/OSSL_CMP_SRV_CTX_new.pod b/doc/man3/OSSL_CMP_SRV_CTX_new.pod
index 7484a7a04966e..34862a090680a 100644
--- a/doc/man3/OSSL_CMP_SRV_CTX_new.pod
+++ b/doc/man3/OSSL_CMP_SRV_CTX_new.pod
@@ -107,6 +107,7 @@ which may be due to normal successful end of the transaction or due to an error.
 OSSL_CMP_CTX_server_perform() is an interface to
 OSSL_CMP_SRV_process_request() that can be used by a CMP client
 in the same way as L<OSSL_CMP_MSG_http_perform(3)>.
+In particular, the first parameter I<client_ctx> is the B<OSSL_CMP_CTX> of the client.
 The B<OSSL_CMP_SRV_CTX> must be set as I<transfer_cb_arg> of I<client_ctx>.
 
 OSSL_CMP_SRV_CTX_new() creates and initializes an B<OSSL_CMP_SRV_CTX> structure
@@ -157,7 +158,7 @@ confirmation of newly enrolled certificates if requested.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210 (and CRMF in RFC 4211).
+CMP is defined in RFC 9810 (and CRMF in RFC 4211).
 
 So far the CMP server implementation is limited to one request per CMP message
 (and consequently to at most one response component per CMP message).
diff --git a/doc/man3/OSSL_CMP_STATUSINFO_new.pod b/doc/man3/OSSL_CMP_STATUSINFO_new.pod
index 9c5ce577c7347..edca81133ad65 100644
--- a/doc/man3/OSSL_CMP_STATUSINFO_new.pod
+++ b/doc/man3/OSSL_CMP_STATUSINFO_new.pod
@@ -39,7 +39,7 @@ in the given buffer, with the given maximal length.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210 (and CRMF in RFC 4211).
+CMP is defined in RFC 9810.
 
 =head1 RETURN VALUES
 
diff --git a/doc/man3/OSSL_CMP_exec_certreq.pod b/doc/man3/OSSL_CMP_exec_certreq.pod
index ce6826c6754b3..1bc4d795b61ca 100644
--- a/doc/man3/OSSL_CMP_exec_certreq.pod
+++ b/doc/man3/OSSL_CMP_exec_certreq.pod
@@ -119,7 +119,7 @@ otherwise the issuer DN and serial number
 of the certificate set by L<OSSL_CMP_CTX_set1_oldCert(3)>,
 otherwise the subject DN and public key
 of the certificate signing request set by L<OSSL_CMP_CTX_set1_p10CSR(3)>.
-RFC 4210 is vague in which PKIStatus should be returned by the server.
+RFC 9810 is vague in which PKIStatus should be returned by the server.
 We take "accepted" and "grantedWithMods" as clear success and handle
 "revocationWarning" and "revocationNotification" just as warnings because CAs
 typically return them as an indication that the certificate was already revoked.
@@ -138,7 +138,7 @@ and returns the list of B<ITAV>s received in a genp response message.
 This can be used, for instance,
 with infoType C<signKeyPairTypes> to obtain the set of signature
 algorithm identifiers that the CA will certify for subject public keys.
-See RFC 4210 section 5.3.19 and appendix E.5 for details.
+See RFC 9810 section 5.3.19 and appendix D.5 for details.
 Functions implementing more specific genm/genp exchanges are described next.
 
 OSSL_CMP_get1_caCerts() uses a genm/genp message exchange with infoType caCerts
@@ -151,7 +151,7 @@ OSSL_CMP_get1_rootCaKeyUpdate() uses a genm request message
 with infoType rootCaCert to obtain from the CMP server referenced by I<ctx>
 in a genp response message with infoType rootCaKeyUpdate any update of the
 given root CA certificate I<oldWithOld> and verifies it as far as possible.
-See RFC 4210 section 4.4 for details.
+See RFC 9810 section 4.4 for details.
 On success it assigns to I<*newWithNew> the root certificate received.
 When the I<newWithOld> and I<oldWithNew> output parameters are not NULL,
 it assigns to them the corresponding transition certificates.
@@ -183,7 +183,7 @@ Both must be freed by the caller.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210 (and CRMF in RFC 4211).
+CMP is defined in RFC 9810 (and CRMF in RFC 4211).
 
 The CMP client implementation is limited to one request per CMP message
 (and consequently to at most one response component per CMP message).
diff --git a/doc/man3/OSSL_CMP_validate_msg.pod b/doc/man3/OSSL_CMP_validate_msg.pod
index af060a8eb8a01..25d0a1bb3c33b 100644
--- a/doc/man3/OSSL_CMP_validate_msg.pod
+++ b/doc/man3/OSSL_CMP_validate_msg.pod
@@ -60,7 +60,7 @@ verification callback) and non-trusted intermediate certs from the I<ctx>.
 
 =head1 NOTES
 
-CMP is defined in RFC 4210 (and CRMF in RFC 4211).
+CMP is defined in RFC 9810.
 
 =head1 RETURN VALUES
 
diff --git a/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod b/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod
index 6c095c0ee0e83..a8a5a36b68a95 100644
--- a/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod
+++ b/doc/man3/OSSL_CRMF_MSG_get0_tmpl.pod
@@ -92,7 +92,7 @@ of the given CertId I<cid>, which must be of ASN.1 type GEN_DIRNAME.
 OSSL_CRMF_ENCRYPTEDKEY_get1_encCert() decrypts the certificate in the given
 encryptedKey I<ecert>, using the private key I<pkey>, library context
 I<libctx> and property query string I<propq> (see L<OSSL_LIB_CTX(3)>).
-This is needed for the indirect POPO method as in RFC 4210 section 5.2.8.2.
+This is needed for the indirect POPO method as in RFC 9810 section 5.2.8.3.2.
 The function returns the decrypted certificate as a copy, leaving its ownership
 with the caller, who is responsible for freeing it.
 
@@ -109,7 +109,7 @@ On success, the function verifies the decrypted data as signed data,
 using the trust store I<ts> and any untrusted certificates in I<extra>.
 Doing so, it checks for the purpose "CMP Key Generation Authority" (cmKGA).
 
-OSSL_CRMF_ENCRYPTEDKEY_init_envdata() returns I<OSSL_CRMF_ENCRYPTEDKEY>, intialized with 
+OSSL_CRMF_ENCRYPTEDKEY_init_envdata() returns I<OSSL_CRMF_ENCRYPTEDKEY>, initialized with
 the enveloped data I<envdata>.
 
 OSSL_CRMF_ENCRYPTEDVALUE_decrypt() decrypts the encrypted value in the given
@@ -119,7 +119,7 @@ I<libctx> and property query string I<propq> (see L<OSSL_LIB_CTX(3)>).
 OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert() decrypts the certificate in the given
 encryptedValue I<ecert>, using the private key I<pkey>, library context
 I<libctx> and property query string I<propq> (see L<OSSL_LIB_CTX(3)>).
-This is needed for the indirect POPO method as in RFC 4210 section 5.2.8.2.
+This is needed for the indirect POPO method as in RFC 9810 section 5.2.8.3.2.
 The function returns the decrypted certificate as a copy, leaving its ownership
 with the caller, who is responsible for freeing it.
 
diff --git a/doc/man3/OSSL_CRMF_pbmp_new.pod b/doc/man3/OSSL_CRMF_pbmp_new.pod
index ff8b3c327cd21..66125f8c50fd7 100644
--- a/doc/man3/OSSL_CRMF_pbmp_new.pod
+++ b/doc/man3/OSSL_CRMF_pbmp_new.pod
@@ -43,14 +43,15 @@ for the random number generation (DRBG) and may be NULL for the default.
 
 The algorithms for the OWF (one-way function) and for the MAC (message
 authentication code) may be any with a NID defined in F<< <openssl/objects.h> >>.
-As specified by RFC 4210, these should include NID_hmac_sha1.
+For backward compatibility with RFC 4210, these should include NID_hmac_sha1.
 
-RFC 4210 recommends that the salt SHOULD be at least 8 bytes (64 bits) long,
+RFC 4210 recommended that the salt SHOULD be at least 8 bytes (64 bits) long,
 where 16 bytes is common.
 
 The iteration count must be at least 100, as stipulated by RFC 4211, and is
 limited to at most 100000 to avoid DoS through manipulated or otherwise
 malformed input.
+See RFC 9045 for currently suggested values.
 
 =head1 RETURN VALUES
 
diff --git a/doc/man3/OSSL_DECODER_CTX.pod b/doc/man3/OSSL_DECODER_CTX.pod
index 33b09c836db86..96111c4e32ddf 100644
--- a/doc/man3/OSSL_DECODER_CTX.pod
+++ b/doc/man3/OSSL_DECODER_CTX.pod
@@ -167,6 +167,13 @@ I<reference>, unpacks the object which it refers to, and exports it by
 creating an L<OSSL_PARAM(3)> array that it then passes to I<export_cb>,
 along with I<export_arg>.
 
+Note that functions OSSL_DECODER_CTX_set_selection(),
+OSSL_DECODER_CTX_set_output_type(), OSSL_DECODER_CTX_set_output_structure(),
+OSSL_DECODER_CTX_add_encoder(), OSSL_DECODER_CTX_add_extra(),
+OSSL_DECODER_CTX_set_construct(), OSSL_DECODER_CTX_set_construct_data(), and
+OSSL_DECODER_CTX_set_cleanup() shouldn't be used after the context is finalised,
+in particular after calling the function OSSL_DECODER_CTX_new_for_pkey().
+
 =head2 Constructor
 
 A B<OSSL_DECODER_CONSTRUCT> gets the following arguments:
diff --git a/doc/man3/OSSL_DECODER_CTX_new_for_pkey.pod b/doc/man3/OSSL_DECODER_CTX_new_for_pkey.pod
index e55212ad554b9..9539f21ccf92f 100644
--- a/doc/man3/OSSL_DECODER_CTX_new_for_pkey.pod
+++ b/doc/man3/OSSL_DECODER_CTX_new_for_pkey.pod
@@ -71,6 +71,10 @@ zero).  This helps the caller to distinguish between an error when creating
 the B<OSSL_ENCODER_CTX> and missing encoder implementation, and allows it to
 act accordingly.
 
+Note that OSSL_DECODER_CTX_new_for_pkey() finalises the OSSL_DECODER_CTX;
+after that the OSSL_DECODER_CTX_set_* and OSSL_DECODER_CTX_add_* functions
+described in L<OSSL_DECODER_CTX(3)> shouldn't be called.
+
 OSSL_DECODER_CTX_set_passphrase() gives the implementation a pass phrase to
 use when decrypting the encoded private key. Alternatively, a pass phrase
 callback may be specified with the following functions.
diff --git a/doc/man3/OSSL_ENCODER_CTX.pod b/doc/man3/OSSL_ENCODER_CTX.pod
index e9248c356a055..ab1bfa9c0c358 100644
--- a/doc/man3/OSSL_ENCODER_CTX.pod
+++ b/doc/man3/OSSL_ENCODER_CTX.pod
@@ -130,6 +130,13 @@ passed to the constructor every time it's called.
 OSSL_ENCODER_CTX_set_cleanup() sets the constructor data I<cleanup>
 function.  This is called by L<OSSL_ENCODER_CTX_free(3)>.
 
+Note that functions OSSL_ENCODER_CTX_set_selection(),
+OSSL_ENCODER_CTX_set_output_type(), OSSL_ENCODER_CTX_set_output_structure(),
+OSSL_ENCODER_CTX_add_encoder(), OSSL_ENCODER_CTX_add_extra(),
+OSSL_ENCODER_CTX_set_construct(), OSSL_ENCODER_CTX_set_construct_data(), and
+OSSL_ENCODER_CTX_set_cleanup() shouldn't be used after the context is finalised,
+in particular after calling the function OSSL_ENCODER_CTX_new_for_pkey().
+
 =head2 Constructor
 
 A B<OSSL_ENCODER_CONSTRUCT> gets the following arguments:
@@ -202,6 +209,12 @@ output type.
 OSSL_ENCODER_INSTANCE_get_output_structure() returns a string with the name
 of the output structure.
 
+=head1 NOTES AND BUGS
+
+The chain mechanism in ENCODE is not yet completely implemented.
+It affects functions such as OSSL_ENCODER_CTX_add_extra and the
+inner processing loop.
+
 =head1 SEE ALSO
 
 L<provider(7)>, L<OSSL_ENCODER(3)>
diff --git a/doc/man3/OSSL_ENCODER_CTX_new_for_pkey.pod b/doc/man3/OSSL_ENCODER_CTX_new_for_pkey.pod
index 3bf9c10e374e5..072659d07ecec 100644
--- a/doc/man3/OSSL_ENCODER_CTX_new_for_pkey.pod
+++ b/doc/man3/OSSL_ENCODER_CTX_new_for_pkey.pod
@@ -60,6 +60,10 @@ zero).  This helps the caller to distinguish between an error when creating
 the B<OSSL_ENCODER_CTX> and missing encoder implementation, and allows it to
 act accordingly.
 
+Note that OSSL_ENCODER_CTX_new_for_pkey() finalises the OSSL_ENCODER_CTX;
+after that the OSSL_ENCODER_CTX_set_* and OSSL_ENCODER_CTX_add_* functions
+described in L<OSSL_ENCODER_CTX(3)> shouldn't be called.
+
 OSSL_ENCODER_CTX_set_cipher() tells the implementation what cipher
 should be used to encrypt encoded keys.  The cipher is given by
 name I<cipher_name>.  The interpretation of that I<cipher_name> is
diff --git a/doc/man3/OSSL_PARAM.pod b/doc/man3/OSSL_PARAM.pod
index 22fd0f0d7dd7f..8a50db2b94d4c 100644
--- a/doc/man3/OSSL_PARAM.pod
+++ b/doc/man3/OSSL_PARAM.pod
@@ -356,7 +356,7 @@ could fill in the parameters like this:
 
 =head1 SEE ALSO
 
-L<openssl-core.h(7)>, L<OSSL_PARAM_get_int(3)>, L<OSSL_PARAM_dup(3)>
+L<openssl-core.h(7)>, L<OSSL_PARAM_get_int(3)>, L<OSSL_PARAM_dup(3)>, L<OSSL_PARAM_construct_utf8_string(3)>
 
 =head1 HISTORY
 
@@ -364,7 +364,7 @@ B<OSSL_PARAM> was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-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
diff --git a/doc/man3/OSSL_PARAM_int.pod b/doc/man3/OSSL_PARAM_int.pod
index dae0de083a62d..a2bcd535b0148 100644
--- a/doc/man3/OSSL_PARAM_int.pod
+++ b/doc/man3/OSSL_PARAM_int.pod
@@ -392,6 +392,29 @@ could fill in the parameters like this:
     if ((p = OSSL_PARAM_locate(params, "cookie")) != NULL)
         OSSL_PARAM_set_utf8_ptr(p, "cookie value");
 
+=head2 Example 3
+
+This example shows a special case where
+I<-Wincompatible-pointer-types-discards-qualifiers> may be set during
+compilation. The value for I<buf> cannot be a I<const char *> type string. An
+alternative in this case would be to use B<OSSL_PARAM> macro abbreviated calls
+rather than the specific callers which allows you to define the sha1 argument
+as a standard character array (I<char[]>).
+
+For example, this code:
+
+    OSSL_PARAM params[2];
+    params[0] = OSSL_PARAM_construct_utf8_string("digest", "SHA1", 0);
+    params[1] = OSSL_PARAM_construct_end();
+
+Can be made compatible with the following version:
+
+    char sha1[] = "SHA1"; /* sha1 is defined as char[] in this case */
+    OSSL_PARAM params[2];
+
+    params[0] = OSSL_PARAM_construct_utf8_string("digest", sha1, 0);
+    params[1] = OSSL_PARAM_construct_end();
+
 =head1 SEE ALSO
 
 L<openssl-core.h(7)>, L<OSSL_PARAM(3)>
@@ -402,7 +425,7 @@ These APIs were introduced in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-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
diff --git a/doc/man3/OSSL_PROVIDER.pod b/doc/man3/OSSL_PROVIDER.pod
index 1c1818a1f0651..f90b5d7a9efe9 100644
--- a/doc/man3/OSSL_PROVIDER.pod
+++ b/doc/man3/OSSL_PROVIDER.pod
@@ -206,7 +206,7 @@ I<capability>. For each capability of that name supported by the provider it
 will call the callback I<cb> and supply a set of L<OSSL_PARAM(3)>s describing the
 capability. It will also pass back the argument I<arg>. For more details about
 capabilities and what they can be used for please see
-L<provider-base(7)/CAPABILTIIES>.
+L<provider-base(7)/CAPABILITIES>.
 
 =head1 RETURN VALUES
 
diff --git a/doc/man3/OpenSSL_version.pod b/doc/man3/OpenSSL_version.pod
index e5dff33dcdda2..6b899cbe5438e 100644
--- a/doc/man3/OpenSSL_version.pod
+++ b/doc/man3/OpenSSL_version.pod
@@ -256,9 +256,16 @@ L<crypto(7)>
 The macros and functions described here were added in OpenSSL 3.0,
 except for OPENSSL_VERSION_NUMBER and OpenSSL_version_num().
 
+=head1 BUGS
+
+There was a discrepancy between this manual and commentary + code
+in F<< <openssl/opensslv.h> >>, where the latter suggested that the
+four least significant bits of B<OPENSSL_VERSION_NUMBER> could be
+C<0x0f> in released OpenSSL versions.
+
 =head1 COPYRIGHT
 
-Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2018-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
diff --git a/doc/man3/PEM_read_CMS.pod b/doc/man3/PEM_read_CMS.pod
index dbccf26cd893e..880e31481029b 100644
--- a/doc/man3/PEM_read_CMS.pod
+++ b/doc/man3/PEM_read_CMS.pod
@@ -84,9 +84,9 @@ see L<openssl_user_macros(7)>:
 
 =head1 DESCRIPTION
 
-All of the functions described on this page are deprecated.
-Applications should use OSSL_ENCODER_to_bio() and OSSL_DECODER_from_bio()
-instead.
+To replace the deprecated functions listed above, applications should use the
+B<EVP_PKEY> type and OSSL_DECODER_from_bio() and OSSL_ENCODER_to_bio() to
+read and write PEM data containing key parameters or private and public keys.
 
 In the description below, B<I<TYPE>> is used
 as a placeholder for any of the OpenSSL datatypes, such as B<X509>.
@@ -142,7 +142,7 @@ were deprecated in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 1998-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 1998-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
diff --git a/doc/man3/PKCS7_sign.pod b/doc/man3/PKCS7_sign.pod
index 1d997045fe142..5c55aa191def8 100644
--- a/doc/man3/PKCS7_sign.pod
+++ b/doc/man3/PKCS7_sign.pod
@@ -80,7 +80,7 @@ can be performed by obtaining the streaming ASN1 B<BIO> directly using
 BIO_new_PKCS7().
 
 If a signer is specified it will use the default digest for the signing
-algorithm. This is B<SHA1> for both RSA and DSA keys.
+algorithm. This is B<SHA256> for both RSA and DSA keys.
 
 The I<certs>, I<signcert> and I<pkey> parameters can all be
 NULL if the B<PKCS7_PARTIAL> flag is set. One or more signers can be added
@@ -122,7 +122,7 @@ The B<PKCS7_STREAM> flag was added in OpenSSL 1.0.0.
 
 =head1 COPYRIGHT
 
-Copyright 2002-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2002-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
diff --git a/doc/man3/RAND_load_file.pod b/doc/man3/RAND_load_file.pod
index baca54cb3c890..45570920ca95b 100644
--- a/doc/man3/RAND_load_file.pod
+++ b/doc/man3/RAND_load_file.pod
@@ -19,7 +19,11 @@ RAND_load_file, RAND_write_file, RAND_file_name - PRNG seed file
 RAND_load_file() reads a number of bytes from file B<filename> and
 adds them to the PRNG. If B<max_bytes> is nonnegative,
 up to B<max_bytes> are read;
-if B<max_bytes> is -1, the complete file is read.
+if B<max_bytes> is -1, the complete file is read (unless the file
+is not a regular file, in that case a fixed number of bytes,
+256 in the current implementation, is attempted to be read).
+RAND_load_file() can read less than the complete file or the requested number
+of bytes if it doesn't fit in the return value type.
 Do not load the same file multiple times unless its contents have
 been updated by RAND_write_file() between reads.
 Also, note that B<filename> should be adequately protected so that an
@@ -77,7 +81,7 @@ L<RAND(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-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
diff --git a/doc/man3/RSA_set_method.pod b/doc/man3/RSA_set_method.pod
index 21cfeed27b463..60c756ac40832 100644
--- a/doc/man3/RSA_set_method.pod
+++ b/doc/man3/RSA_set_method.pod
@@ -148,13 +148,7 @@ and RSA_get_method() return pointers to the respective RSA_METHODs.
 
 RSA_set_default_method() returns no value.
 
-RSA_set_method() returns a pointer to the old RSA_METHOD implementation
-that was replaced. However, this return value should probably be ignored
-because if it was supplied by an ENGINE, the pointer could be invalidated
-at any time if the ENGINE is unloaded (in fact it could be unloaded as a
-result of the RSA_set_method() function releasing its handle to the
-ENGINE). For this reason, the return type may be replaced with a B<void>
-declaration in a future release.
+RSA_set_method() returns 1 for success. It always succeeds.
 
 RSA_new_method() returns NULL and sets an error code that can be obtained
 by L<ERR_get_error(3)> if the allocation fails. Otherwise
diff --git a/doc/man3/SSL_CIPHER_get_name.pod b/doc/man3/SSL_CIPHER_get_name.pod
index 09b7280bdd581..a10942433aa76 100644
--- a/doc/man3/SSL_CIPHER_get_name.pod
+++ b/doc/man3/SSL_CIPHER_get_name.pod
@@ -37,7 +37,7 @@ SSL_CIPHER_get_protocol_id
  int SSL_CIPHER_is_aead(const SSL_CIPHER *c);
  const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr);
  uint32_t SSL_CIPHER_get_id(const SSL_CIPHER *c);
- uint32_t SSL_CIPHER_get_protocol_id(const SSL_CIPHER *c);
+ uint16_t SSL_CIPHER_get_protocol_id(const SSL_CIPHER *c);
 
 =head1 DESCRIPTION
 
@@ -203,7 +203,7 @@ The OPENSSL_cipher_name() function was added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-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
diff --git a/doc/man3/SSL_CONF_cmd.pod b/doc/man3/SSL_CONF_cmd.pod
index e2c1e6984703a..3e2de6e66be77 100644
--- a/doc/man3/SSL_CONF_cmd.pod
+++ b/doc/man3/SSL_CONF_cmd.pod
@@ -74,7 +74,7 @@ B<SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION>.
 
 =item B<-no_renegotiation>
 
-Disables all attempts at renegotiation in TLSv1.2 and earlier, same as setting
+Disables all attempts at renegotiation in (D)TLSv1.2 and earlier, same as setting
 B<SSL_OP_NO_RENEGOTIATION>.
 
 =item B<-no_resumption_on_reneg>
@@ -408,6 +408,11 @@ Padding attempts to pad TLSv1.3 records so that they are a multiple of the set
 length on send. A value of 0 or 1 turns off padding as relevant. Otherwise, the
 values must be >1 or <=16384.
 
+Note that, for QUIC objects, padding is always performed at the
+packet level, and so cannot be done at the record level.  Given that, when the
+config file is created, there is no knowledge of what kind of SSL objects are
+being created, this option is silently ignored for QUIC objects.
+
 =item B<SignatureAlgorithms>
 
 This sets the supported signature algorithms for TLSv1.2 and TLSv1.3.
diff --git a/doc/man3/SSL_CTX_set1_curves.pod b/doc/man3/SSL_CTX_set1_curves.pod
index ee5915372519b..017eefd3176a9 100755
--- a/doc/man3/SSL_CTX_set1_curves.pod
+++ b/doc/man3/SSL_CTX_set1_curves.pod
@@ -210,7 +210,9 @@ TLS versions, when a session has been resumed, it always reflects the group
 used for key exchange during the initial handshake (otherwise it is from the
 current, non-resumption, connection).  This can be called by either client or
 server. If the NID for the shared group is unknown then the value is set to the
-bitwise OR of TLSEXT_nid_unknown (0x1000000) and the id of the group.
+bitwise OR of TLSEXT_nid_unknown (0x1000000) and the id of the group. See also
+L<SSL_get0_group_name(3)> which returns the name of the negotiated group
+directly and is generally preferred over SSL_get_negotiated_group().
 
 SSL_CTX_get0_implemented_groups() populates a stack with the names of TLS
 groups that are compatible with the TLS version of the B<ctx> argument.
@@ -314,7 +316,8 @@ prefers "B", the server will trigger an HRR for "B".
 =head1 SEE ALSO
 
 L<ssl(7)>,
-L<SSL_CTX_add_extra_chain_cert(3)>
+L<SSL_CTX_add_extra_chain_cert(3)>,
+L<SSL_get0_group_name(3)>
 
 =head1 HISTORY
 
diff --git a/doc/man3/SSL_CTX_set_cert_verify_callback.pod b/doc/man3/SSL_CTX_set_cert_verify_callback.pod
index 4d510f3041d45..d93916f3b2482 100644
--- a/doc/man3/SSL_CTX_set_cert_verify_callback.pod
+++ b/doc/man3/SSL_CTX_set_cert_verify_callback.pod
@@ -63,6 +63,11 @@ on resumption, even though no chain is presented int that case.
 Moreover, the calling application will be informed about the detailed result of
 the verification procedure and may elect to base further decisions on it.
 
+I<callback> may call L<X509_verify_cert(3)> to run the built-in verification
+function. This may be useful if application wishes to dynamically reconfigure
+I<x509_store_ctx> before verification, or postprocess the result. In this case,
+L<X509_verify_cert(3)> will set the B<error> member as described above.
+
 Within I<x509_store_ctx>, I<callback> has access to the I<verify_callback>
 function set using L<SSL_CTX_set_verify(3)>.
 
diff --git a/doc/man3/SSL_CTX_set_client_hello_cb.pod b/doc/man3/SSL_CTX_set_client_hello_cb.pod
index 74468ab8ac156..6367c68a62502 100644
--- a/doc/man3/SSL_CTX_set_client_hello_cb.pod
+++ b/doc/man3/SSL_CTX_set_client_hello_cb.pod
@@ -69,6 +69,9 @@ holding the numerical value of the TLS extension types in the order they appear
 in the ClientHello.  B<*outlen> contains the number of elements in the array.
 In situations when the ClientHello has no extensions, the function will return
 success with B<*out> set to NULL and B<*outlen> set to 0.
+Note that SSL_client_hello_get1_extensions_present() returns only recognised
+extensions; therefore, unrecognised (including GREASE) extensions will not
+appear in the output.
 
 SSL_client_hello_get_extension_order() is similar to
 SSL_client_hello_get1_extensions_present(), without internal memory allocation.
@@ -101,8 +104,12 @@ not use a servername callback, in order to avoid unexpected behavior that
 occurs due to the relative order of processing between things like session
 resumption and the historical servername callback.
 
-The SSL_client_hello_* family of functions may only be called from code executing
-within a ClientHello callback.
+The SSL_client_hello_* family of functions may only be called from code
+executing within a ClientHello callback.
+
+The SSL_client_hello_get0_*() functions return raw ClientHello data, whereas
+SSL_client_hello_get1_extensions_present() returns only recognized extensions
+(so unknown/GREASE-extensions are not included).
 
 =head1 RETURN VALUES
 
diff --git a/doc/man3/SSL_CTX_set_domain_flags.pod b/doc/man3/SSL_CTX_set_domain_flags.pod
index 2f0911608435d..6c12642889570 100644
--- a/doc/man3/SSL_CTX_set_domain_flags.pod
+++ b/doc/man3/SSL_CTX_set_domain_flags.pod
@@ -42,7 +42,7 @@ Specifying this flag configures the Single-Threaded Concurrency Model (SCM).
 
 =item B<SSL_DOMAIN_FLAG_MULTI_THREAD>
 
-Speciyfing this flag configures the Contentive Concurrency Model (CCM) (unless
+Specifying this flag configures the Contentive Concurrency Model (CCM) (unless
 B<SSL_DOMAIN_FLAG_THREAD_ASSISTED> is also specified).
 
 If OpenSSL was built without thread support, this is identical to
@@ -106,7 +106,7 @@ L<SSL_new_domain(3)>, L<openssl-quic-concurrency(7)>
 
 =head1 HISTORY
 
-These functions were added in @QUIC_SERVER_VERSION@.
+These functions were added in OpenSSL 3.5.
 
 =head1 COPYRIGHT
 
diff --git a/doc/man3/SSL_CTX_set_min_proto_version.pod b/doc/man3/SSL_CTX_set_min_proto_version.pod
index 9a2da37ab7294..d9b61dcce9fde 100644
--- a/doc/man3/SSL_CTX_set_min_proto_version.pod
+++ b/doc/man3/SSL_CTX_set_min_proto_version.pod
@@ -31,9 +31,10 @@ L<SSL_CTX_set_options(3)> that also make it possible to disable
 specific protocol versions.
 Use these functions instead of disabling specific protocol versions.
 
-Setting the minimum or maximum version to 0, will enable protocol
+Setting the minimum or maximum version to 0 (default), will enable protocol
 versions down to the lowest version, or up to the highest version
-supported by the library, respectively.
+supported by the library, respectively. The supported versions might be
+controlled by system configuration.
 
 Getters return 0 in case B<ctx> or B<ssl> have been configured to
 automatically use the lowest or highest version supported by the library.
@@ -67,7 +68,7 @@ were added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-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
diff --git a/doc/man3/SSL_CTX_set_options.pod b/doc/man3/SSL_CTX_set_options.pod
index a6c922ecf92cc..fa344337b5f83 100644
--- a/doc/man3/SSL_CTX_set_options.pod
+++ b/doc/man3/SSL_CTX_set_options.pod
@@ -286,7 +286,7 @@ Do not query the MTU. Only affects DTLS connections.
 
 =item SSL_OP_NO_RENEGOTIATION
 
-Disable all renegotiation in TLSv1.2 and earlier. Do not send HelloRequest
+Disable all renegotiation in (D)TLSv1.2 and earlier. Do not send HelloRequest
 messages, and ignore renegotiation requests via ClientHello.
 
 =item SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
@@ -542,7 +542,7 @@ whether these macros are defined or not.
 
 =head1 COPYRIGHT
 
-Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001-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
diff --git a/doc/man3/SSL_CTX_set_psk_client_callback.pod b/doc/man3/SSL_CTX_set_psk_client_callback.pod
index dd302983fddeb..48d1bef4a39a2 100644
--- a/doc/man3/SSL_CTX_set_psk_client_callback.pod
+++ b/doc/man3/SSL_CTX_set_psk_client_callback.pod
@@ -93,6 +93,14 @@ be used as the basis for a PSK.
 Ownership of the SSL_SESSION object is passed to the OpenSSL library and so it
 should not be freed by the application.
 
+Note that as described above, the callback may be called a second time during a
+handshake. Since ownership of the SSL_SESSION is transferred to OpenSSL on each
+call, if the callback wishes to return the same SSL_SESSION pointer on a
+subsequent invocation, it must first call L<SSL_SESSION_up_ref(3)> to increment
+the reference count. Failure to do so will result in a use-after-free error.
+Alternatively, the callback may return a different SSL_SESSION object on each
+call (e.g., by calling L<SSL_SESSION_dup(3)>).
+
 It is also possible for the callback to succeed but not supply a PSK. In this
 case no PSK will be sent to the server but the handshake will continue. To do
 this the callback should return successfully and ensure that B<*sess> is
diff --git a/doc/man3/SSL_CTX_set_tmp_dh_callback.pod b/doc/man3/SSL_CTX_set_tmp_dh_callback.pod
index a14f334cfca8c..902cefdfa3663 100644
--- a/doc/man3/SSL_CTX_set_tmp_dh_callback.pod
+++ b/doc/man3/SSL_CTX_set_tmp_dh_callback.pod
@@ -58,9 +58,11 @@ the actual key is newly generated during the negotiation.
 Typically applications should use well known DH parameters that have built-in
 support in OpenSSL. The macros SSL_CTX_set_dh_auto() and SSL_set_dh_auto()
 configure OpenSSL to use the default built-in DH parameters for the B<SSL_CTX>
-and B<SSL> objects respectively. Passing a value of 1 in the I<onoff> parameter
-switches the feature on, and passing a value of 0 switches it off. The default
-setting is off.
+and B<SSL> objects respectively. Passing a value of 2 or 1 in the I<onoff>
+parameter switches it on. If the I<onoff> parameter is set to 2, it will force
+the DH key size to 1024 if the B<SSL_CTX> or B<SSL> security level
+L<SSL_CTX_set_security_level(3)> is 0 or 1. Passing a value of 0 switches
+it off. The default setting is off.
 
 If "auto" DH parameters are switched on then the parameters will be selected to
 be consistent with the size of the key associated with the server's certificate.
@@ -112,7 +114,7 @@ L<openssl-ciphers(1)>, L<openssl-dhparam(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2001-2022 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001-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
diff --git a/doc/man3/SSL_SESSION_get0_hostname.pod b/doc/man3/SSL_SESSION_get0_hostname.pod
index f7add16d7bdda..0140deee9a5e9 100644
--- a/doc/man3/SSL_SESSION_get0_hostname.pod
+++ b/doc/man3/SSL_SESSION_get0_hostname.pod
@@ -23,9 +23,10 @@ SSL_SESSION_set1_alpn_selected
 
 =head1 DESCRIPTION
 
-SSL_SESSION_get0_hostname() retrieves the SNI value that was sent by the
-client when the session was created if it was accepted by the server. Otherwise
-NULL is returned.
+SSL_SESSION_get0_hostname() retrieves the Server Name Indication (SNI) value
+that was sent by the client when the session was created if the server
+acknowledged the client's SNI extension by including an empty SNI extension
+in response. Otherwise NULL is returned.
 
 The value returned is a pointer to memory maintained within B<s> and
 should not be free'd.
@@ -44,8 +45,7 @@ B<alpn>.
 
 =head1 RETURN VALUES
 
-SSL_SESSION_get0_hostname() returns either a string or NULL based on if there
-is the SNI value sent by client.
+SSL_SESSION_get0_hostname() returns the SNI string if available, or NULL if not.
 
 SSL_SESSION_set1_hostname() returns 1 on success or 0 on error.
 
diff --git a/doc/man3/SSL_get0_group_name.pod b/doc/man3/SSL_get0_group_name.pod
index 9f43a7f2503dd..37bea2fc7bb6c 100644
--- a/doc/man3/SSL_get0_group_name.pod
+++ b/doc/man3/SSL_get0_group_name.pod
@@ -21,14 +21,15 @@ the key agreement of the current TLS session establishment.
 If non-NULL, SSL_get0_group_name() returns the name of the group that was used for
 the key agreement of the current TLS session establishment.
 If SSL_get0_group_name() returns NULL, an error occurred; possibly no TLS session
-has been established.
+has been established. See also L<SSL_get_negotiated_group(3)>.
 
 Note that the return value is valid only during the lifetime of the
 SSL object I<ssl>.
 
 =head1 SEE ALSO
 
-L<ssl(7)>
+L<ssl(7)>,
+L<SSL_get_negotiated_group(3)>
 
 =head1 HISTORY
 
@@ -36,7 +37,7 @@ This function was added in OpenSSL 3.2.
 
 =head1 COPYRIGHT
 
-Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
+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
diff --git a/doc/man3/SSL_get_error.pod b/doc/man3/SSL_get_error.pod
index 794598facb330..799e16dd5a3a3 100644
--- a/doc/man3/SSL_get_error.pod
+++ b/doc/man3/SSL_get_error.pod
@@ -23,7 +23,8 @@ current thread's OpenSSL error queue.  Thus, SSL_get_error() must be
 used in the same thread that performed the TLS/SSL I/O operation, and no
 other OpenSSL function calls should appear in between.  The current
 thread's error queue must be empty before the TLS/SSL I/O operation is
-attempted, or SSL_get_error() will not work reliably.
+attempted, or SSL_get_error() will not work reliably.  Emptying the
+current thread's error queue is done with L<ERR_clear_error(3)>.
 
 =head1 NOTES
 
@@ -181,9 +182,13 @@ connection and SSL_shutdown() must not be called.
 
 =back
 
+The OpenSSL error queue can be inspected with the B<ERR> family of functions,
+such as L<ERR_print_errors(3)> and L<ERR_peek_last_error_all(3)>.
+
 =head1 SEE ALSO
 
-L<ssl(7)>
+L<ssl(7)>,
+L<ERR_clear_error(3)>, ERR_print_errors(3), ERR_peek_last_error_all(3)
 
 =head1 HISTORY
 
diff --git a/doc/man3/SSL_key_update.pod b/doc/man3/SSL_key_update.pod
index 6238e67649e03..6f9f9b92365cc 100644
--- a/doc/man3/SSL_key_update.pod
+++ b/doc/man3/SSL_key_update.pod
@@ -53,7 +53,9 @@ such as SSL_read_ex() or SSL_write_ex() takes place on the connection a check
 will be performed to confirm that it is a suitable time to start a
 renegotiation. If so, then it will be initiated immediately. OpenSSL will not
 attempt to resume any session associated with the connection in the new
-handshake.
+handshake. Note that some servers will respond to reneogitation attempts with
+a "no_renegotiation" alert. An OpenSSL will immediately fail the connection in
+this case.
 
 When called from the client side, SSL_renegotiate_abbreviated() works in the
 same was as SSL_renegotiate() except that OpenSSL will attempt to resume the
@@ -118,7 +120,7 @@ OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2017-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
diff --git a/doc/man3/SSL_new_listener.pod b/doc/man3/SSL_new_listener.pod
index b830bd11bd174..291c103381e7e 100644
--- a/doc/man3/SSL_new_listener.pod
+++ b/doc/man3/SSL_new_listener.pod
@@ -130,6 +130,14 @@ connection is created and returned on success. If no incoming connection is
 available and the listener SSL object is configured in nonblocking mode, NULL is
 returned.
 
+The new SSL object returned from SSL_accept_connection() may or may not have
+completed its handshake at the point it is returned. Optionally, you may use the
+function L<SSL_is_init_finished(3)> to determine this. You may call the
+functions L<SSL_accept(3)>, L<SSL_do_handshake(3)> or L<SSL_handle_events(3)> to
+progress the state of the SSL object towards handshake completion. Other "I/O"
+functions may also implicitly progress the state of the handshake such as
+L<SSL_poll(3)>, L<SSL_read(3)> and L<SSL_write(3)>.
+
 The B<SSL_ACCEPT_CONNECTION_NO_BLOCK> flag may be specified to
 SSL_accept_connection(). If specified, the call does not block even if the
 listener SSL object is configured in blocking mode.
diff --git a/doc/man3/SSL_poll.pod b/doc/man3/SSL_poll.pod
index 87a1e42b17200..6047bd6750f8f 100644
--- a/doc/man3/SSL_poll.pod
+++ b/doc/man3/SSL_poll.pod
@@ -5,12 +5,14 @@
 SSL_poll,
 SSL_POLL_EVENT_NONE,
 SSL_POLL_EVENT_F,
+SSL_POLL_EVENT_EL,
 SSL_POLL_EVENT_EC,
 SSL_POLL_EVENT_ECD,
 SSL_POLL_EVENT_ER,
 SSL_POLL_EVENT_EW,
 SSL_POLL_EVENT_R,
 SSL_POLL_EVENT_W,
+SSL_POLL_EVENT_IC,
 SSL_POLL_EVENT_ISB,
 SSL_POLL_EVENT_ISU,
 SSL_POLL_EVENT_OSB,
@@ -35,27 +37,29 @@ SSL_POLL_FLAG_NO_HANDLE_EVENTS
  #define SSL_POLL_EVENT_NONE        0
 
  #define SSL_POLL_EVENT_F           /* F   (Failure) */
+ #define SSL_POLL_EVENT_EL          /* EL  (Exception on Listener) */
  #define SSL_POLL_EVENT_EC          /* EC  (Exception on Conn) */
  #define SSL_POLL_EVENT_ECD         /* ECD (Exception on Conn Drained) */
  #define SSL_POLL_EVENT_ER          /* ER  (Exception on Read) */
  #define SSL_POLL_EVENT_EW          /* EW  (Exception on Write) */
  #define SSL_POLL_EVENT_R           /* R   (Readable) */
  #define SSL_POLL_EVENT_W           /* W   (Writable) */
+ #define SSL_POLL_EVENT_IC          /* IC  (Incoming Connection) */
  #define SSL_POLL_EVENT_ISB         /* ISB (Incoming Stream: Bidi) */
  #define SSL_POLL_EVENT_ISU         /* ISU (Incoming Stream: Uni) */
  #define SSL_POLL_EVENT_OSB         /* OSB (Outgoing Stream: Bidi) */
  #define SSL_POLL_EVENT_OSU         /* OSU (Outgoing Stream: Uni) */
 
- #define SSL_POLL_EVENT_RW          /* R   | W         */
- #define SSL_POLL_EVENT_RE          /* R   | ER        */
- #define SSL_POLL_EVENT_WE          /* W   | EW        */
- #define SSL_POLL_EVENT_RWE         /* RE  | WE        */
- #define SSL_POLL_EVENT_E           /* EC  | ER  | EW  */
- #define SSL_POLL_EVENT_IS          /* ISB | ISU       */
- #define SSL_POLL_EVENT_ISE         /* IS  | EC        */
- #define SSL_POLL_EVENT_I           /* IS              */
- #define SSL_POLL_EVENT_OS          /* OSB | OSU       */
- #define SSL_POLL_EVENT_OSE         /* OS  | EC        */
+ #define SSL_POLL_EVENT_RW          /* R   | W               */
+ #define SSL_POLL_EVENT_RE          /* R   | ER              */
+ #define SSL_POLL_EVENT_WE          /* W   | EW              */
+ #define SSL_POLL_EVENT_RWE         /* RE  | WE              */
+ #define SSL_POLL_EVENT_E           /* EL  | EC  | ER  | EW  */
+ #define SSL_POLL_EVENT_IS          /* ISB | ISU             */
+ #define SSL_POLL_EVENT_ISE         /* IS  | EC              */
+ #define SSL_POLL_EVENT_I           /* IS                    */
+ #define SSL_POLL_EVENT_OS          /* OSB | OSU             */
+ #define SSL_POLL_EVENT_OSE         /* OS  | EC              */
 
  typedef struct ssl_poll_item_st {
      BIO_POLL_DESCRIPTOR desc;
diff --git a/doc/man3/SSL_set1_host.pod b/doc/man3/SSL_set1_host.pod
index c91a075a6a609..b65116a53f5f0 100644
--- a/doc/man3/SSL_set1_host.pod
+++ b/doc/man3/SSL_set1_host.pod
@@ -9,8 +9,8 @@ SSL server verification parameters
 
  #include <openssl/ssl.h>
 
- int SSL_set1_host(SSL *s, const char *hostname);
- int SSL_add1_host(SSL *s, const char *hostname);
+ int SSL_set1_host(SSL *s, const char *host);
+ int SSL_add1_host(SSL *s, const char *host);
  void SSL_set_hostflags(SSL *s, unsigned int flags);
  const char *SSL_get0_peername(SSL *s);
 
@@ -18,29 +18,36 @@ SSL server verification parameters
 
 These functions configure server hostname checks in the SSL client.
 
-SSL_set1_host() sets the expected DNS hostname to B<name> clearing
-any previously specified hostname.  If B<name> is NULL
-or the empty string, the list of hostnames is cleared and name
-checks are not performed on the peer certificate.  When a nonempty
-B<name> is specified, certificate verification automatically checks
-the peer hostname via L<X509_check_host(3)> with B<flags> as specified
+SSL_set1_host() sets in the verification parameters of I<s>
+the expected DNS hostname or IP address to I<host>,
+clearing any previously specified IP address and hostnames.
+If I<host> is NULL or the empty string, IP address
+and hostname checks are not performed on the peer certificate.
+When a nonempty I<host> is specified, certificate verification automatically
+checks the peer hostname via L<X509_check_host(3)> with I<flags> as specified
 via SSL_set_hostflags().  Clients that enable DANE TLSA authentication
 via L<SSL_dane_enable(3)> should leave it to that function to set
 the primary reference identifier of the peer, and should not call
 SSL_set1_host().
 
-SSL_add1_host() adds B<name> as an additional reference identifier
-that can match the peer's certificate.  Any previous names set via
-SSL_set1_host() or SSL_add1_host() are retained, no change is made
-if B<name> is NULL or empty.  When multiple names are configured,
-the peer is considered verified when any name matches.  This function
-is required for DANE TLSA in the presence of service name indirection
-via CNAME, MX or SRV records as specified in RFC7671, RFC7672 or
-RFC7673.
-
-SSL_set_hostflags() sets the B<flags> that will be passed to
+SSL_add1_host() adds I<host> as an additional reference identifier
+that can match the peer's certificate.  Any previous hostnames
+set via SSL_set1_host() or SSL_add1_host() are retained.
+Adding an IP address is allowed only if no IP address has been set before.
+No change is made if I<host> is NULL or empty.
+When an IP address and/or multiple hostnames are configured,
+the peer is considered verified when any of these matches.
+This function is required for DANE TLSA in the presence of service name indirection
+via CNAME, MX or SRV records as specified in RFCs 7671, 7672, and 7673.
+
+TLS clients are recommended to use SSL_set1_host() or SSL_add1_host()
+for server hostname or IP address validation,
+as well as L<SSL_set_tlsext_host_name(3)> for Server Name Indication (SNI),
+which may be crucial also for correct routing of the connection request.
+
+SSL_set_hostflags() sets the I<flags> that will be passed to
 L<X509_check_host(3)> when name checks are applicable, by default
-the B<flags> value is 0.  See L<X509_check_host(3)> for the list
+the I<flags> value is 0.  See L<X509_check_host(3)> for the list
 of available flags and their meaning.
 
 SSL_get0_peername() returns the DNS hostname or subject CommonName
@@ -51,13 +58,13 @@ of the reference identifiers configured via SSL_set1_host() or
 SSL_add1_host() starts with ".", which indicates a parent domain prefix
 rather than a fixed name, the matched peer name may be a sub-domain
 of the reference identifier.  The returned string is allocated by
-the library and is no longer valid once the associated B<ssl> handle
+the library and is no longer valid once the associated I<ssl> handle
 is cleared or freed, or a renegotiation takes place.  Applications
 must not free the return value.
 
 SSL clients are advised to use these functions in preference to
 explicitly calling L<X509_check_host(3)>.  Hostname checks may be out
-of scope with the RFC7671 DANE-EE(3) certificate usage, and the
+of scope with the RFC 7671 DANE-EE(3) certificate usage, and the
 internal check will be suppressed as appropriate when DANE is
 enabled.
 
@@ -66,8 +73,10 @@ enabled.
 SSL_set1_host() and SSL_add1_host() return 1 for success and 0 for
 failure.
 
+SSL_set_hostflags() returns nothing at all.
+
 SSL_get0_peername() returns NULL if peername verification is not
-applicable (as with RFC7671 DANE-EE(3)), or no trusted peername was
+applicable (as with RFC 7671 DANE-EE(3)), or no trusted peername was
 matched.  Otherwise, it returns the matched peername.  To determine
 whether verification succeeded call L<SSL_get_verify_result(3)>.
 
@@ -99,9 +108,8 @@ the lifetime of the SSL connection.
 =head1 SEE ALSO
 
 L<ssl(7)>,
-L<X509_check_host(3)>,
-L<SSL_get_verify_result(3)>.
-L<SSL_dane_enable(3)>.
+L<X509_check_host(3)>, L<SSL_set_tlsext_host_name(3)>,
+L<SSL_get_verify_result(3)>, L<SSL_dane_enable(3)>
 
 =head1 HISTORY
 
@@ -109,7 +117,7 @@ These functions were added in OpenSSL 1.1.0.
 
 =head1 COPYRIGHT
 
-Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2016-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
diff --git a/doc/man3/SSL_set_quic_tls_cbs.pod b/doc/man3/SSL_set_quic_tls_cbs.pod
index 618cc29bc74d8..65dab1d974b4b 100644
--- a/doc/man3/SSL_set_quic_tls_cbs.pod
+++ b/doc/man3/SSL_set_quic_tls_cbs.pod
@@ -70,6 +70,11 @@ given SSL object I<s>, a set of callbacks are supplied in an B<OSSL_DISPATCH>
 table via I<qtdis>. The I<arg> parameter will be passed as an argument when the
 various callbacks are called.
 
+The above callbacks are invoked, as needed, by SSL_do_handshake() and SSL_read() (including
+SSL_read_ex, SSL_peek, SSL_peek_ex). Once the SSL handshake is complete, the QUIC
+stack must arrange to call one of the SSL_read() variants whenever a post-handshake CRYPTO
+frame is received. The number of bytes requested may be zero.
+
 An B<OSSL_DISPATCH> table should consist of an array of B<OSSL_DISPATCH> entries
 where each entry is a function id, and a function pointer. The array should be
 terminated with an empty entry (i.e. a 0 function id, and a NULL function
@@ -110,7 +115,7 @@ ever be read by OpenSSL.
 
 The OSSL_FUNC_SSL_QUIC_TLS_yield_secret_fn callback (function id
 B<OSSL_FUNC_SSL_QUIC_TLS_YIELD_SECRET>) is called when a new secret has been
-established. The I<prot_level> argument identies the TLS protection level and
+established. The I<prot_level> argument identities the TLS protection level and
 will be one of B<OSSL_RECORD_PROTECTION_LEVEL_NONE>,
 B<OSSL_RECORD_PROTECTION_LEVEL_EARLY>, B<OSSL_RECORD_PROTECTION_LEVEL_HANDSHAKE>
 or B<OSSL_RECORD_PROTECTION_LEVEL_APPLICATION>. The I<direction> will either be
diff --git a/doc/man3/UI_new.pod b/doc/man3/UI_new.pod
index eb80f453d5c60..613dd4ce6dcec 100644
--- a/doc/man3/UI_new.pod
+++ b/doc/man3/UI_new.pod
@@ -159,17 +159,20 @@ With the description "pass phrase" and the filename "foo.key", that becomes
 string and may include encodings that will be processed by the other
 method functions.
 
-UI_add_user_data() adds a user data pointer for the method to use at any
+UI_add_user_data() sets the user data pointer for the method to use at any
 time.  The built-in UI method doesn't care about this info.  Note that several
-calls to this function doesn't add data, it replaces the previous blob
+calls to this function doesn't add data, it replaces the previous pointer
 with the one given as argument.
+The return value is the previously set user data pointer if it was set
+using UI_add_user_data() and thus the caller owns it, otherwise NULL.
 
 UI_dup_user_data() duplicates the user data and works as an alternative
 to UI_add_user_data() when the user data needs to be preserved for a longer
 duration, perhaps even the lifetime of the application.  The UI object takes
 ownership of this duplicate and will free it whenever it gets replaced or
 the UI is destroyed.  UI_dup_user_data() returns 0 on success, or -1 on memory
-allocation failure or if the method doesn't have a duplicator function.
+allocation failure or if the method doesn't have a duplicator and a destructor
+function.
 
 UI_get0_user_data() retrieves the data that has last been given to the
 UI with UI_add_user_data() or UI_dup_user_data.
@@ -224,6 +227,9 @@ is less than or equal to 0 otherwise.
 
 UI_construct_prompt() returns a string or NULL if an error occurred.
 
+UI_add_user_data() returns
+the user data pointer previously set using this function, otherwise NULL.
+
 UI_dup_user_data() returns 0 on success or -1 on error.
 
 UI_get0_result() returns a string or NULL on error.
@@ -245,7 +251,7 @@ The UI_dup_user_data() function was added in OpenSSL 1.1.1.
 
 =head1 COPYRIGHT
 
-Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001-2026 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man3/X509_STORE_CTX_new.pod b/doc/man3/X509_STORE_CTX_new.pod
index c219cee9d621c..76cb7000c2893 100644
--- a/doc/man3/X509_STORE_CTX_new.pod
+++ b/doc/man3/X509_STORE_CTX_new.pod
@@ -85,7 +85,7 @@ If I<ctx> is NULL nothing is done.
 X509_STORE_CTX_init() sets up I<ctx> for a subsequent verification operation.
 
 X509_STORE_CTX_init() initializes the internal state and resources of the
-given I<ctx>. Among others, it sets the verification parameters associcated
+given I<ctx>. Among others, it sets the verification parameters associated
 with the method name C<default>, which includes the C<any> purpose,
 and takes over callback function pointers from I<trust_store> (unless NULL).
 It must be called before each call to L<X509_verify_cert(3)> or
@@ -319,7 +319,7 @@ There is no need to call X509_STORE_CTX_cleanup() explicitly since OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2009-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2009-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
diff --git a/doc/man3/X509_STORE_get0_param.pod b/doc/man3/X509_STORE_get0_param.pod
index 95a1725bc3881..794b149e66164 100644
--- a/doc/man3/X509_STORE_get0_param.pod
+++ b/doc/man3/X509_STORE_get0_param.pod
@@ -25,8 +25,9 @@ parameters for I<xs>. The returned pointer must not be freed by the
 calling application
 
 X509_STORE_get1_objects() returns a snapshot of all objects in the store's X509
-cache. The cache contains B<X509> and B<X509_CRL> objects. The caller is
-responsible for freeing the returned list.
+cache. The cache contains B<X509> and B<X509_CRL> objects. The caller
+is responsible for freeing the returned list,
+using sk_X509_OBJECT_pop_free(sk, X509_OBJECT_free).
 
 X509_STORE_get0_objects() retrieves an internal pointer to the store's
 X509 object cache. The cache contains B<X509> and B<X509_CRL> objects. The
@@ -35,7 +36,8 @@ shared across multiple threads, it is not safe to use the result of this
 function. Use X509_STORE_get1_objects() instead, which avoids this problem.
 
 X509_STORE_get1_all_certs() returns a list of all certificates in the store.
-The caller is responsible for freeing the returned list.
+The caller is responsible for freeing the returned list
+with OSSL_STACK_OF_X509_free().
 
 =head1 RETURN VALUES
 
@@ -54,6 +56,7 @@ certificates on success, else NULL.
 
 =head1 SEE ALSO
 
+L<DEFINE_STACK_OF(3)>,
 L<X509_STORE_new(3)>
 
 =head1 HISTORY
diff --git a/doc/man3/X509_VERIFY_PARAM_set_flags.pod b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
index 297e8149590e9..267975778bdd2 100644
--- a/doc/man3/X509_VERIFY_PARAM_set_flags.pod
+++ b/doc/man3/X509_VERIFY_PARAM_set_flags.pod
@@ -255,8 +255,8 @@ ored together.
 B<X509_V_FLAG_CRL_CHECK> enables CRL checking for the certificate chain leaf
 certificate. An error occurs if a suitable CRL cannot be found.
 
-B<X509_V_FLAG_CRL_CHECK_ALL> enables CRL checking for the entire certificate
-chain.
+B<X509_V_FLAG_CRL_CHECK_ALL> expands CRL checking to the entire certificate
+chain if B<X509_V_FLAG_CRL_CHECK> has also been enabled, and is otherwise ignored.
 
 B<X509_V_FLAG_IGNORE_CRITICAL> disables critical extension checking. By default
 any unhandled critical extensions in certificates or (if checked) CRLs result
diff --git a/doc/man3/X509_check_purpose.pod b/doc/man3/X509_check_purpose.pod
index 4e152be8fa5d2..59440dc013d78 100644
--- a/doc/man3/X509_check_purpose.pod
+++ b/doc/man3/X509_check_purpose.pod
@@ -80,7 +80,7 @@ Unless the id stays the same for an existing entry, I<id> must be fresh,
 which can be achieved by using the result of X509_PURPOSE_get_unused_id().
 The function also sets in the entry the trust id I<trust>, the given I<flags>,
 the purpose (long) name I<name>, the short name I<sname>, the purpose checking
-funktion I<ck> of type B<int (*) (const X509_PURPOSE *, const X509 *, int)>,
+function I<ck> of type B<int (*) (const X509_PURPOSE *, const X509 *, int)>,
 and its user data I<arg> which may be retrieved via the B<X509_PURPOSE> pointer.
 
 X509_PURPOSE_cleanup() removes all purposes that are not pre-defined.
diff --git a/doc/man3/d2i_X509.pod b/doc/man3/d2i_X509.pod
index df5ea65e596ec..41e76ae8379b0 100644
--- a/doc/man3/d2i_X509.pod
+++ b/doc/man3/d2i_X509.pod
@@ -588,8 +588,13 @@ freed in the event of error and I<*a> is set to NULL.
 B<i2d_I<TYPE>>() returns the number of bytes successfully encoded or a negative
 value if an error occurs.
 
-B<i2d_I<TYPE>_bio>() and B<i2d_I<TYPE>_fp>() return 1 for success and 0 if an
-error occurs.
+B<i2d_I<TYPE>_bio>() and B<i2d_I<TYPE>_fp>(),
+as well as i2d_ASN1_bio_stream(),
+return 1 for success and 0 if an error occurs.
+
+On error, these functions may record the error in the OpenSSL error queue.
+That error queue can be inspected with the B<ERR> family of functions, such as
+L<ERR_print_errors(3)> and L<ERR_peek_last_error_all(3)>.
 
 =head1 EXAMPLES
 
@@ -703,6 +708,10 @@ structure has been modified after deserialization or previous
 serialization. This is because some objects cache the encoding for
 efficiency reasons.
 
+=head1 SEE ALSO
+
+ERR_print_errors(3), ERR_peek_last_error_all(3)
+
 =head1 HISTORY
 
 d2i_OSSL_ATTRIBUTES_SYNTAX(), d2i_OSSL_BASIC_ATTR_CONSTRAINTS(),
diff --git a/doc/man5/fips_config.pod b/doc/man5/fips_config.pod
index a25ced3383937..c3f7b8f3ab6b0 100644
--- a/doc/man5/fips_config.pod
+++ b/doc/man5/fips_config.pod
@@ -62,17 +62,11 @@ A version number for the fips install process. Should be 1.
 
 =item B<install-status>
 
-An indicator that the self-tests were successfully run.
-This should only be written after the module has
-successfully passed its self tests during installation.
-If this field is not present, then the self tests will run when the module
-loads.
+This field is deprecated and is no longer used.
 
 =item B<install-mac>
 
-A MAC of the value of the B<install-status> option, to prevent accidental
-changes to that value.
-It is written-to at the same time as B<install-status> is updated.
+This field is deprecated and is no longer used.
 
 =back
 
@@ -112,7 +106,7 @@ See L<openssl-fipsinstall(1)/OPTIONS> B<-signature_digest_check>
 
 =item B<hkdf-digest-check>
 
-See L<openssl-fipsinstall(1)/OPTIONS> B<-hkdf_digest_check>
+This option is deprecated.
 
 =item B<tls13-kdf-digest-check>
 
@@ -128,7 +122,7 @@ See L<openssl-fipsinstall(1)/OPTIONS> B<-sshkdf_digest_check>
 
 =item B<sskdf-digest-check>
 
-See L<openssl-fipsinstall(1)/OPTIONS> B<-sskdf_digest_check>
+This option is deprecated.
 
 =item B<x963kdf-digest-check>
 
@@ -233,7 +227,7 @@ This functionality was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-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
diff --git a/doc/man7/EVP_ASYM_CIPHER-RSA.pod b/doc/man7/EVP_ASYM_CIPHER-RSA.pod
index 171a3d130ec0d..2b8cf1c12fb82 100644
--- a/doc/man7/EVP_ASYM_CIPHER-RSA.pod
+++ b/doc/man7/EVP_ASYM_CIPHER-RSA.pod
@@ -27,7 +27,8 @@ The default provider understands these RSA padding modes in string form:
 
 This padding mode is no longer supported by the FIPS provider for key
 agreement and key transport.
-(This is a FIPS 140-3 requirement)
+(This is a FIPS 140-3 requirement).
+See L<openssl-fipsinstall(1)/OPTIONS> B<-rsa_pkcs15_pad_disabled>.
 
 =item "x931" (B<OSSL_PKEY_RSA_PAD_MODE_X931>)
 
@@ -109,7 +110,7 @@ L<OSSL_PROVIDER-FIPS(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
+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
diff --git a/doc/man7/EVP_PKEY-DSA.pod b/doc/man7/EVP_PKEY-DSA.pod
index f3bed36f88a40..d386d8868a1c3 100644
--- a/doc/man7/EVP_PKEY-DSA.pod
+++ b/doc/man7/EVP_PKEY-DSA.pod
@@ -119,7 +119,7 @@ The following sections of FIPS186-4:
 =head1 SEE ALSO
 
 L<EVP_PKEY-FFC(7)>,
-L<EVP_SIGNATURE-DSA(7)>
+L<EVP_SIGNATURE-DSA(7)>,
 L<EVP_PKEY(3)>,
 L<provider-keymgmt(7)>,
 L<EVP_KEYMGMT(3)>,
@@ -133,7 +133,7 @@ OpenSSL 3.4. See L<fips_module(7)/FIPS indicators> for more information.
 
 =head1 COPYRIGHT
 
-Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-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
diff --git a/doc/man7/EVP_PKEY-FFC.pod b/doc/man7/EVP_PKEY-FFC.pod
index 7c9848676b8c4..a28bb84e0a368 100644
--- a/doc/man7/EVP_PKEY-FFC.pod
+++ b/doc/man7/EVP_PKEY-FFC.pod
@@ -213,7 +213,7 @@ The following sections of FIPS186-4:
 L<EVP_PKEY-DSA(7)>,
 L<EVP_PKEY-DH(7)>,
 L<EVP_SIGNATURE-DSA(7)>,
-L<EVP_KEYEXCH-DH(7)>
+L<EVP_KEYEXCH-DH(7)>,
 L<EVP_KEYMGMT(3)>,
 L<EVP_PKEY(3)>,
 L<provider-keymgmt(7)>,
@@ -222,7 +222,7 @@ L<OSSL_PROVIDER-FIPS(7)>,
 
 =head1 COPYRIGHT
 
-Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-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
diff --git a/doc/man7/EVP_PKEY-ML-DSA.pod b/doc/man7/EVP_PKEY-ML-DSA.pod
index c647c4f5093e4..e87053b0a1832 100644
--- a/doc/man7/EVP_PKEY-ML-DSA.pod
+++ b/doc/man7/EVP_PKEY-ML-DSA.pod
@@ -19,7 +19,7 @@ and the private key I<priv>.
 Each of the different key types has an associated security category.
 This value is one of 2, 3 or 5 for key types B<ML-DSA-44>, B<ML-DSA-65>
 and B<ML-DSA-87> respectively, which correspond to security strengths of
-128, 192 and 256 repsectively.
+128, 192 and 256 respectively.
 
 =head2 Keygen Parameters
 
@@ -285,7 +285,7 @@ L<provider-keymgmt(7)>,
 L<EVP_PKEY_get_raw_private_key(3)>,
 L<EVP_PKEY_get_raw_public_key(3)>,
 L<EVP_PKEY_get1_encoded_public_key(3)>,
-LOSSL_PROVIDER_add_conf_parameter(3)>,
+L<OSSL_PROVIDER_add_conf_parameter(3)>,
 L<provider-keymgmt(7)>,
 L<EVP_SIGNATURE-ML-DSA(7)>
 
diff --git a/doc/man7/EVP_PKEY-ML-KEM.pod b/doc/man7/EVP_PKEY-ML-KEM.pod
index b83f5fb905259..be12a50ccff86 100644
--- a/doc/man7/EVP_PKEY-ML-KEM.pod
+++ b/doc/man7/EVP_PKEY-ML-KEM.pod
@@ -110,7 +110,7 @@ configuration options programmatically.
 
 =item C<ml-kem.import_pct_type> (B<OSSL_PKEY_PARAM_ML_KEM_IMPORT_PCT_TYPE>) <UTF8 string>
 
-When an B<ML-KEM> key is imported as an explict FIPS 203 B<dk> decapsulation
+When an B<ML-KEM> key is imported as an explicit FIPS 203 B<dk> decapsulation
 key, rather than a seed, a pairwise consistency test (PCT) is optionally
 performed.
 By default, or when this parameter is set explicitly to C<random>, the PCT
@@ -305,7 +305,7 @@ L<EVP_PKEY(3)>,
 L<EVP_PKEY_get_raw_private_key(3)>,
 L<EVP_PKEY_get_raw_public_key(3)>,
 L<EVP_PKEY_get1_encoded_public_key(3)>,
-LOSSL_PROVIDER_add_conf_parameter(3)>,
+L<OSSL_PROVIDER_add_conf_parameter(3)>,
 L<provider-keymgmt(7)>,
 L<EVP_KEM-ML-KEM(7)>
 
diff --git a/doc/man7/EVP_SIGNATURE-DSA.pod b/doc/man7/EVP_SIGNATURE-DSA.pod
index 2c0f0073a4fae..62730668f6078 100644
--- a/doc/man7/EVP_SIGNATURE-DSA.pod
+++ b/doc/man7/EVP_SIGNATURE-DSA.pod
@@ -3,7 +3,7 @@
 =head1 NAME
 
 EVP_SIGNATURE-DSA
-- The B<EVP_PKEY> DSA signature implementation
+- The EVP_PKEY B<DSA> signature implementation
 
 =head1 DESCRIPTION
 
diff --git a/doc/man7/EVP_SIGNATURE-ECDSA.pod b/doc/man7/EVP_SIGNATURE-ECDSA.pod
index bc75ed140814f..3cd8c3035324d 100644
--- a/doc/man7/EVP_SIGNATURE-ECDSA.pod
+++ b/doc/man7/EVP_SIGNATURE-ECDSA.pod
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-EVP_SIGNATURE-ECDSA - The EVP_PKEY ECDSA signature implementation.
+EVP_SIGNATURE-ECDSA - The EVP_PKEY B<ECDSA> signature implementation
 
 =head1 DESCRIPTION
 
diff --git a/doc/man7/EVP_SIGNATURE-ED25519.pod b/doc/man7/EVP_SIGNATURE-ED25519.pod
index 924f254aad0fc..489642b1b088e 100644
--- a/doc/man7/EVP_SIGNATURE-ED25519.pod
+++ b/doc/man7/EVP_SIGNATURE-ED25519.pod
@@ -6,7 +6,7 @@ EVP_SIGNATURE-ED25519,
 EVP_SIGNATURE-ED448,
 Ed25519,
 Ed448
-- EVP_PKEY Ed25519 and Ed448 support
+- The EVP_PKEY B<Ed25519> and B<Ed448> signature implementations
 
 =head1 DESCRIPTION
 
@@ -134,6 +134,9 @@ since version 1.1.1.
 Valid algorithm names are B<ed25519>, B<ed448> and B<eddsa>. If B<eddsa> is
 specified, then both Ed25519 and Ed448 are benchmarked.
 
+Since Ed25519ctx is not included in FIPS 186-5, it is not present
+in the FIPS provider.
+
 =head1 EXAMPLES
 
 To sign a message using an ED25519 EVP_PKEY structure:
diff --git a/doc/man7/EVP_SIGNATURE-HMAC.pod b/doc/man7/EVP_SIGNATURE-HMAC.pod
index 6628d9ebc2bcf..ca6ee914ce5a7 100644
--- a/doc/man7/EVP_SIGNATURE-HMAC.pod
+++ b/doc/man7/EVP_SIGNATURE-HMAC.pod
@@ -4,7 +4,7 @@
 
 EVP_SIGNATURE-HMAC, EVP_SIGNATURE-Siphash, EVP_SIGNATURE-Poly1305,
 EVP_SIGNATURE-CMAC
-- The legacy B<EVP_PKEY> MAC signature implementations
+- The legacy EVP_PKEY B<MAC> signature implementations
 
 =head1 DESCRIPTION
 
diff --git a/doc/man7/EVP_SIGNATURE-ML-DSA.pod b/doc/man7/EVP_SIGNATURE-ML-DSA.pod
index 3e7cc41b24242..a8621810fccbc 100644
--- a/doc/man7/EVP_SIGNATURE-ML-DSA.pod
+++ b/doc/man7/EVP_SIGNATURE-ML-DSA.pod
@@ -3,8 +3,8 @@
 =head1 NAME
 
 EVP_SIGNATURE-ML-DSA,
-EVP_SIGNATURE-ML-DSA-44, EVP_SIGNATURE-ML-DSA-65, EVP_SIGNATURE-ML-DSA-87,
-- EVP_SIGNATURE ML-DSA support
+EVP_SIGNATURE-ML-DSA-44, EVP_SIGNATURE-ML-DSA-65, EVP_SIGNATURE-ML-DSA-87
+- The EVP_PKEY B<ML-DSA> signature implementations
 
 =head1 DESCRIPTION
 
@@ -17,7 +17,7 @@ L<FIPS 204|https://csrc.nist.gov/pubs/fips/204/final> Section 4 Table 1.
 (The signatures range in size from ~2.5K to ~4.5K depending on the type chosen).
 There are 3 different security categories also depending on the type.
 
-L<EVP_SIGNATURE_fetch(3)> can be used to explicitely fetch one of the 3
+L<EVP_SIGNATURE_fetch(3)> can be used to explicitly fetch one of the 3
 algorithms which can then be used with L<EVP_PKEY_sign_message_init(3)>,
 L<EVP_PKEY_sign(3)>, L<EVP_PKEY_verify_message_init(3)>, and
 L<EVP_PKEY_verify(3)> to perform one-shot message signing or signature verification.
@@ -87,7 +87,7 @@ See L<EVP_PKEY-ML-DSA(7)> for information related to B<ML-DSA> keys.
 
 =head1 NOTES
 
-For backwards compatability reasons EVP_DigestSignInit_ex(), EVP_DigestSign(),
+For backwards compatibility reasons EVP_DigestSignInit_ex(), EVP_DigestSign(),
 EVP_DigestVerifyInit_ex() and EVP_DigestVerify() may also be used, but the digest
 passed in I<mdname> must be NULL.
 
@@ -113,7 +113,7 @@ To sign a message using an ML-DSA EVP_PKEY structure:
         EVP_PKEY_sign(sctx, sig, &sig_len, msg, msg_len);
         ...
         OPENSSL_free(sig);
-        EVP_SIGNATURE(sig_alg);
+        EVP_SIGNATURE_free(sig_alg);
         EVP_PKEY_CTX_free(sctx);
     }
 
diff --git a/doc/man7/EVP_SIGNATURE-RSA.pod b/doc/man7/EVP_SIGNATURE-RSA.pod
index 5dc27ac2838e6..fa082f48de077 100644
--- a/doc/man7/EVP_SIGNATURE-RSA.pod
+++ b/doc/man7/EVP_SIGNATURE-RSA.pod
@@ -3,7 +3,7 @@
 =head1 NAME
 
 EVP_SIGNATURE-RSA
-- The EVP_PKEY RSA signature implementation
+- The EVP_PKEY B<RSA> signature implementation
 
 =head1 DESCRIPTION
 
diff --git a/doc/man7/EVP_SIGNATURE-SLH-DSA.pod b/doc/man7/EVP_SIGNATURE-SLH-DSA.pod
index 9ca1e077484a9..0a16f3f413fa4 100644
--- a/doc/man7/EVP_SIGNATURE-SLH-DSA.pod
+++ b/doc/man7/EVP_SIGNATURE-SLH-DSA.pod
@@ -9,7 +9,7 @@ EVP_SIGNATURE-SLH-DSA-SHA2-256s, EVP_SIGNATURE-SLH-DSA-SHA2-256f,
 EVP_SIGNATURE-SLH-DSA-SHAKE-128s, EVP_SIGNATURE-SLH-DSA-SHAKE-128f,
 EVP_SIGNATURE-SLH-DSA-SHAKE-192s, EVP_SIGNATURE-SLH-DSA-SHAKE-192f,
 EVP_SIGNATURE-SLH-DSA-SHAKE-256s, EVP_SIGNATURE-SLH-DSA-SHAKE-256f
-- EVP_PKEY SLH-DSA support
+- The EVP_PKEY B<SLH-DSA> signature implementations
 
 =head1 DESCRIPTION
 
@@ -28,7 +28,7 @@ C<s> types have smaller signature sizes, and the C<f> variants are faster,
 (The signatures range from ~8K to ~50K depending on the type chosen). There are
 3 different security categories also depending on the type.
 
-L<EVP_SIGNATURE_fetch(3)> can be used to explicitely fetch one of the 12
+L<EVP_SIGNATURE_fetch(3)> can be used to explicitly fetch one of the 12
 algorithms which can then be used with L<EVP_PKEY_sign_message_init(3)>,
 L<EVP_PKEY_sign(3)>, L<EVP_PKEY_verify_message_init(3)>, and
 L<EVP_PKEY_verify(3)> to perform one-shot message signing or verification.
@@ -38,7 +38,7 @@ encodes the message internally as 0x00 || len(ctx) || ctx || message.
 where B<ctx> is some optional value of size 0x00..0xFF.
 OpenSSL also allows the message to not be encoded which is required for
 testing. OpenSSL does not support Pre Hash SLH-DSA Signature Generation, but this
-may be done by the user by doing Pre hash encoding externally and then chosing
+may be done by the user by doing Pre hash encoding externally and then choosing
 the option to not encode the message.
 
 =head2 SLH-DSA Signature Parameters
@@ -109,7 +109,7 @@ To sign a message using an SLH-DSA EVP_PKEY structure:
         EVP_PKEY_sign(sctx, sig, &sig_len, msg, msg_len);
         ...
         OPENSSL_free(sig);
-        EVP_SIGNATURE(sig_alg);
+        EVP_SIGNATURE_free(sig_alg);
         EVP_PKEY_CTX_free(sctx);
     }
 
diff --git a/doc/man7/OSSL_PROVIDER-FIPS.pod b/doc/man7/OSSL_PROVIDER-FIPS.pod
index 20d35fada87f5..d14005a89a1c3 100644
--- a/doc/man7/OSSL_PROVIDER-FIPS.pod
+++ b/doc/man7/OSSL_PROVIDER-FIPS.pod
@@ -14,7 +14,7 @@ accredited testing laboratory.
 =head2 Properties
 
 The implementations in this provider specifically have these properties
-defined:
+defined for approved algorithms:
 
 =over 4
 
@@ -41,20 +41,17 @@ query.  Including C<provider=fips> in your property query guarantees
 that the OpenSSL FIPS provider is used for cryptographic operations
 rather than other FIPS capable providers.
 
-=head2 Provider parameters
-
-See L<provider-base(7)/Provider parameters> for a list of base parameters.
-Additionally the OpenSSL FIPS provider also supports the following gettable
-parameters:
-
-=over 4
+=head2 Approved algorithms
 
-=item "security-checks" (B<OSSL_OSSL_PROV_PARAM_SECURITY_CHECKS>) <unsigned integer>
+Algorithms that are fetched using "fips=yes" may still be unapproved if certain
+conditions are not met. See L<fips_module(7)/FIPS indicators> for additional
+information.
 
-For further information refer to the L<openssl-fipsinstall(1)> option
-B<-no_security_checks>.
+=head2 Provider parameters
 
-=back
+See L<provider-base(7)/Provider parameters> for a list of base parameters.
+The OpenSSL FIPS provider also handles FIPS indicator related parameters as
+specified by L<fips_config(5)/FIPS indicator options>.
 
 =head1 OPERATIONS AND ALGORITHMS
 
@@ -84,8 +81,6 @@ The OpenSSL FIPS provider supports these operations and algorithms:
 
 =item 3DES, see L<EVP_CIPHER-DES(7)>
 
-This is an unapproved algorithm.
-
 =back
 
 =head2 Message Authentication Code (MAC)
@@ -212,21 +207,21 @@ for signature generation, but may be used for verification for legacy use cases.
 
 =item EC, see L<EVP_KEYMGMT-EC(7)>
 
-=item X25519, see L<EVP_KEYMGMT-X25519(7)>
-
-This is an unapproved algorithm.
-
-=item X448, see L<EVP_KEYMGMT-X448(7)>
+=item ED25519, see L<EVP_KEYMGMT-ED25519(7)>
 
-This is an unapproved algorithm.
+=item ED448, see L<EVP_KEYMGMT-ED448(7)>
 
-=item ED25519, see L<EVP_KEYMGMT-ED25519(7)>
+=item X25519, see L<EVP_KEYMGMT-X25519(7)>
 
 This is an unapproved algorithm.
+The FIPS 140-3 IG states that "Curves that are included in SP 800-186 but not
+included in SP 800-56Arev3 are not approved for key agreement".
 
-=item ED448, see L<EVP_KEYMGMT-ED448(7)>
+=item X448, see L<EVP_KEYMGMT-X448(7)>
 
 This is an unapproved algorithm.
+The FIPS 140-3 IG states that "Curves that are included in SP 800-186 but not"
+included in SP 800-56Arev3 are not approved for key agreement".
 
 =item TLS1-PRF
 
@@ -288,8 +283,11 @@ TEST-RAND is an unapproved algorithm.
 
 =head1 SELF TESTING
 
-One of the requirements for the FIPS module is self testing. An optional callback
-mechanism is available to return information to the user using
+A requirement of FIPS modules is to run cryptographic algorithm self tests.
+FIPS 140-3 requires known answer tests to be run on startup as well as
+conditional tests that run during cryptographic operations.
+
+An optional callback mechanism is available to return information to the user using
 L<OSSL_SELF_TEST_set_callback(3)>.
 
 The parameters passed to the callback are described in L<OSSL_SELF_TEST_new(3)>
@@ -311,12 +309,10 @@ Uses HMAC SHA256 on the module file to validate that the module has not been
 modified. The integrity value is compared to a value written to a configuration
 file during installation.
 
-=item "Install_Integrity" (B<OSSL_SELF_TEST_TYPE_INSTALL_INTEGRITY>)
+=item "KAT_Integrity" (B<OSSL_SELF_TEST_TYPE_KAT_INTEGRITY>)
 
-Uses HMAC SHA256 on a fixed string to validate that the installation process
-has already been performed and the self test KATS have already been tested,
-The integrity value is compared to a value written to a configuration
-file after successfully running the self tests during installation.
+Used during the Module Integrity test to perform a known answer test on
+HMAC SHA256 prior to using it.
 
 =item "KAT_Cipher" (B<OSSL_SELF_TEST_TYPE_KAT_CIPHER>)
 
@@ -360,24 +356,28 @@ Known answer test for a Deterministic Random Bit Generator.
 
 =item "Conditional_PCT" (B<OSSL_SELF_TEST_TYPE_PCT>)
 
-Conditional test that is run during the generation or importing of key pairs.
+Conditional test that is run during the generation of key pairs.
+
+=item "Import_PCT" (B<OSSL_SELF_TEST_TYPE_PCT_IMPORT>)
+
+Conditional test that is run during the import of key pairs.
+
+=item "Conditional_KAT" (B<OSSL_SELF_TEST_TYPE_PCT_KAT>)
+
+Conditional test run during generation that derive the public key from the
+private key and checks that the public key matches. This is a SP 800-56A requirement.
 
 =item "Continuous_RNG_Test" (B<OSSL_SELF_TEST_TYPE_CRNG>)
 
 Continuous random number generator test.
 
-=back
-
-The "Module_Integrity" self test is always run at startup.
-The "Install_Integrity" self test is used to check if the self tests have
-already been run at installation time. If they have already run then the
-self tests are not run on subsequent startups.
-All other self test categories are run once at installation time, except for the
-"Pairwise_Consistency_Test".
+=item "Install_Integrity" (B<OSSL_SELF_TEST_TYPE_INSTALL_INTEGRITY>)
 
-There is only one instance of the "Module_Integrity" and "Install_Integrity"
-self tests. All other self tests may have multiple instances.
+This is deprecated. The option is no longer used since FIPS 140-3 requires
+self tests to always run on startup. Previous FIPS 140-2 validations allowed
+the self tests to be run just once.
 
+=back
 
 The FIPS module passes the following descriptions(s) to OSSL_SELF_TEST_onbegin().
 
@@ -385,7 +385,7 @@ The FIPS module passes the following descriptions(s) to OSSL_SELF_TEST_onbegin()
 
 =item "HMAC" (B<OSSL_SELF_TEST_DESC_INTEGRITY_HMAC>)
 
-"Module_Integrity" and "Install_Integrity" use this.
+"Module_Integrity" uses this.
 
 =item "RSA" (B<OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1>)
 
@@ -559,19 +559,18 @@ validated versions alongside F<libcrypto> and F<libssl> compiled from any
 release within the same major release series.  This flexibility enables
 you to address bug fixes and CVEs that fall outside the FIPS boundary.
 
-The FIPS provider in OpenSSL 3.1 includes some non-FIPS validated algorithms,
-consequently the property query C<fips=yes> is mandatory for applications that
-want to operate in a FIPS approved manner.  The algorithms are:
-
-=over 4
-
-=item Triple DES ECB
-
-=item Triple DES CBC
-
-=item EdDSA
-
-=back
+You can load the FIPS provider into multiple library contexts as any other
+provider. However the following restriction applies. The FIPS provider cannot
+be used by multiple copies of OpenSSL libcrypto in a single process.
+
+As the provider saves core callbacks to the libcrypto obtained in the
+OSSL_provider_init() call to global data it will fail if subsequent
+invocations of its OSSL_provider_init() function yield different addresses
+of these callbacks than in the initial call. This happens when different
+copies of libcrypto are present in the memory of the process and both try
+to load the same FIPS provider. A workaround is to have a different copy
+of the FIPS provider loaded for each of the libcrypto instances in the
+process.
 
 =head1 SEE ALSO
 
diff --git a/doc/man7/openssl-env.pod b/doc/man7/openssl-env.pod
index 78043d5bd68a7..218eb93632ca3 100644
--- a/doc/man7/openssl-env.pod
+++ b/doc/man7/openssl-env.pod
@@ -61,7 +61,7 @@ Unless OpenSSL tracing support is generally disabled,
 enable trace output of specific parts of OpenSSL libraries, by name.
 This output usually makes sense only if you know OpenSSL internals well.
 
-The value of this environment varialble is a comma-separated list of names,
+The value of this environment variable is a comma-separated list of names,
 with the following available:
 
 =over 4
@@ -173,7 +173,8 @@ OpenSSL supports a number of different algorithm implementations for
 various machines and, by default, it determines which to use based on the
 processor capabilities and run time feature enquiry.  These environment
 variables can be used to exert more control over this selection process.
-See L<OPENSSL_ia32cap(3)>, L<OPENSSL_s390xcap(3)> and L<OPENSSL_riscvcap(3)>.
+See L<OPENSSL_ia32cap(3)>, L<OPENSSL_ppccap(3)>, L<OPENSSL_riscvcap(3)>,
+and L<OPENSSL_s390xcap(3)>.
 
 =item B<NO_PROXY>, B<HTTPS_PROXY>, B<HTTP_PROXY>
 
diff --git a/doc/man7/openssl-quic-concurrency.pod b/doc/man7/openssl-quic-concurrency.pod
index ded22a1e8b928..e79dd2a3a2c67 100644
--- a/doc/man7/openssl-quic-concurrency.pod
+++ b/doc/man7/openssl-quic-concurrency.pod
@@ -196,7 +196,7 @@ Specifying this flag configures the Single-Threaded Concurrency Model (SCM).
 
 =item B<SSL_DOMAIN_FLAG_MULTI_THREAD>
 
-Speciyfing this flag configures the Contentive Concurrency Model (CCM) (unless
+Specifying this flag configures the Contentive Concurrency Model (CCM) (unless
 B<SSL_DOMAIN_FLAG_THREAD_ASSISTED> is also specified).
 
 =item B<SSL_DOMAIN_FLAG_THREAD_ASSISTED>
diff --git a/doc/man7/openssl-quic.pod b/doc/man7/openssl-quic.pod
index 2379ce7fb9941..0e9e78b976257 100644
--- a/doc/man7/openssl-quic.pod
+++ b/doc/man7/openssl-quic.pod
@@ -566,7 +566,7 @@ L<SSL_accept_connection(3)>.
 
 =item L<SSL_accept_connection(3)>
 
-Accepts a new incoming connection for a listner SSL object. A new SSL object
+Accepts a new incoming connection for a listener SSL object. A new SSL object
 representing the accepted connection is created and returned on success. If no
 incoming connection is available and the listener SSL object is configured in
 nonblocking mode, NULL is returned.
@@ -895,6 +895,20 @@ that a call to L<SSL_handle_events(3)> is performed after the specified timeout
 
 =back
 
+=head1 WINDOWS APPLICATION NOTES
+
+QUIC protocol uses UDP sockets. The recvfrom() function on Windows may fail
+with C<WSAECONNRESET> error causing OpenSSL QUIC stack to enter permanent
+error, which prevents further communication over QUIC protocol. Applications
+should disable SIO_UDP_CONNRESET and SIO_UDP_NETRESET error notification
+on UDP sockets they pass to OpenSSL QUIC stack. More details can be found here:
+https://learn.microsoft.com/en-us/windows/win32/winsock/winsock-ioctls#sio_udp_connreset-opcode-setting-i-t3
+
+OpenSSL attempts to always disable SIO_UDP_CONNRESET and SIO_UDP_NETRESET
+on UDP sockets it receives from application, but no error is reported back
+if the respective C<WSAIoctl()> calls fail. Robust application should set those
+options itself so it can handle error notifications from C<WSAIoctl()> properly.
+
 =head1 SEE ALSO
 
 L<SSL_handle_events(3)>, L<SSL_get_event_timeout(3)>,
@@ -914,7 +928,7 @@ L<SSL_is_domain(3)>, L<SSL_get0_domain(3)>
 
 =head1 COPYRIGHT
 
-Copyright 2022-2025 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2022-2026 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy
diff --git a/doc/man7/ossl-guide-introduction.pod b/doc/man7/ossl-guide-introduction.pod
index 26d26fd1a3b9a..2211473d29b42 100644
--- a/doc/man7/ossl-guide-introduction.pod
+++ b/doc/man7/ossl-guide-introduction.pod
@@ -32,7 +32,7 @@ attempting to build OpenSSL from the source code.
 
 Some third parties also supply OpenSSL binaries (e.g. for Windows and some other
 platforms). The OpenSSL project maintains a list of these third parties at
-L<https://wiki.openssl.org/index.php/Binaries>.
+L<https://github.com/openssl/openssl/wiki/Binaries>.
 
 If you build and install OpenSSL from the source code then you should download
 the appropriate files for the version that you want to use from the link given
diff --git a/doc/man7/ossl-guide-libssl-introduction.pod b/doc/man7/ossl-guide-libssl-introduction.pod
index 3c1a5d73837f2..95664a811c332 100644
--- a/doc/man7/ossl-guide-libssl-introduction.pod
+++ b/doc/man7/ossl-guide-libssl-introduction.pod
@@ -67,7 +67,7 @@ that an application may need to use. They are summarised below.
 
 This structure is used to indicate the kind of connection you want to make, e.g.
 whether it is to represent the client or the server, and whether it is to use
-SSL/TLS, DTLS or QUIC (client only). It is passed as a parameter when creating
+SSL/TLS, DTLS or QUIC. It is passed as a parameter when creating
 the B<SSL_CTX>.
 
 =item B<SSL_SESSION> (SSL Session)
@@ -105,7 +105,7 @@ L<ossl-guide-quic-introduction(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-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
diff --git a/doc/man7/ossl-guide-migration.pod b/doc/man7/ossl-guide-migration.pod
index 13fa94674c4f7..0be64bed8496a 100644
--- a/doc/man7/ossl-guide-migration.pod
+++ b/doc/man7/ossl-guide-migration.pod
@@ -183,9 +183,9 @@ For more information, see L<OpenSSL_version(3)>.
 
 =head3 Other major new features
 
-=head4 Certificate Management Protocol (CMP, RFC 4210)
+=head4 Certificate Management Protocol (CMP, RFC 9810)
 
-This also covers CRMF (RFC 4211) and HTTP transfer (RFC 6712)
+This also covers CRMF (RFC 4211) and HTTP transfer (RFC 9811)
 See L<openssl-cmp(1)> and L<OSSL_CMP_exec_certreq(3)> as starting points.
 
 =head4 HTTP(S) client
@@ -617,13 +617,13 @@ The code needs to be amended to look like this:
 Support for TLSv1.3 has been added.
 
 This has a number of implications for SSL/TLS applications. See the
-L<TLS1.3 page|https://wiki.openssl.org/index.php/TLS1.3> for further details.
+L<TLS1.3 page|https://github.com/openssl/openssl/wiki/TLS1.3> for further details.
 
 =back
 
 More details about the breaking changes between OpenSSL versions 1.0.2 and 1.1.0
 can be found on the
-L<OpenSSL 1.1.0 Changes page|https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes>.
+L<OpenSSL 1.1.0 Changes page|https://github.com/openssl/openssl/wiki/OpenSSL_1.1.0_Changes>.
 
 =head3 Upgrading from the OpenSSL 2.0 FIPS Object Module
 
diff --git a/doc/man7/ossl-guide-tls-introduction.pod b/doc/man7/ossl-guide-tls-introduction.pod
index 19aabfbbb7a38..5789524324d15 100644
--- a/doc/man7/ossl-guide-tls-introduction.pod
+++ b/doc/man7/ossl-guide-tls-introduction.pod
@@ -74,7 +74,7 @@ TLSv1.2 is chosen.
 =head1 CERTIFICATES
 
 In order for a client to establish a connection to a server it must authenticate
-the identify of that server, i.e. it needs to confirm that the server is really
+the identity of that server, i.e. it needs to confirm that the server is really
 the server that it claims to be and not some imposter. In order to do this the
 server will send to the client a digital certificate (also commonly referred to
 as an X.509 certificate). The certificate contains various information about the
@@ -311,7 +311,7 @@ L<ossl-guide-tls-server-block(7)>, L<ossl-guide-quic-introduction(7)>
 
 =head1 COPYRIGHT
 
-Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
+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
diff --git a/doc/man7/provider-base.pod b/doc/man7/provider-base.pod
index ae4dd55c240d6..03dd5074fc08a 100644
--- a/doc/man7/provider-base.pod
+++ b/doc/man7/provider-base.pod
@@ -141,7 +141,8 @@ For example, the "function" core_gettable_params() has these:
  static ossl_inline OSSL_NAME_core_gettable_params_fn
      OSSL_FUNC_core_gettable_params(const OSSL_DISPATCH *opf);
 
-L<OSSL_DISPATCH(3)> arrays are indexed by numbers that are provided as
+L<OSSL_DISPATCH(3)> array entries contain a I<function_id> field that
+identifies the function. The I<function_id> numbers are provided as
 macros in L<openssl-core_dispatch.h(7)>, as follows:
 
 For I<in> (the L<OSSL_DISPATCH(3)> array passed from F<libcrypto> to the
@@ -154,6 +155,10 @@ provider):
  core_new_error                 OSSL_FUNC_CORE_NEW_ERROR
  core_set_error_debug           OSSL_FUNC_CORE_SET_ERROR_DEBUG
  core_vset_error                OSSL_FUNC_CORE_VSET_ERROR
+ core_set_error_mark            OSSL_FUNC_CORE_SET_ERROR_MARK
+ core_clear_last_error_mark     OSSL_FUNC_CORE_CLEAR_LAST_ERROR_MARK
+ core_pop_error_to_mark         OSSL_FUNC_CORE_POP_ERROR_TO_MARK
+ core_count_to_mark             OSSL_FUNC_CORE_COUNT_TO_MARK
  core_obj_add_sigid             OSSL_FUNC_CORE_OBJ_ADD_SIGID
  core_obj_create                OSSL_FUNC_CORE_OBJ_CREATE
  CRYPTO_malloc                  OSSL_FUNC_CRYPTO_MALLOC
@@ -270,6 +275,33 @@ error occurred or was reported.
 
 This corresponds to the OpenSSL function L<ERR_vset_error(3)>.
 
+=item core_set_error_mark()
+
+sets a mark on the current topmost error record if there is one.
+
+This corresponds to the OpenSSL function L<ERR_set_mark(3)>.
+
+=item core_clear_last_error_mark()
+
+removes the last mark added if there is one.
+
+This corresponds to the OpenSSL function L<ERR_clear_last_mark(3)>.
+
+=item core_pop_error_to_mark()
+
+pops the top of the error stack until a mark is found. The mark is then removed.
+If there is no mark, the whole stack is removed.
+
+This corresponds to the OpenSSL function L<ERR_pop_to_mark(3)>.
+
+=item core_count_to_mark()
+
+returns the number of entries on the error stack above the most recently
+marked entry, not including that entry. If there is no mark in the error stack,
+the number of entries in the error stack is returned.
+
+This corresponds to the OpenSSL function L<ERR_count_to_mark(3)>.
+
 =back
 
 The core_obj_create() function registers a new OID and associated short name
@@ -977,6 +1009,12 @@ L<provider(7)>
 The concept of providers and everything surrounding them was
 introduced in OpenSSL 3.0.
 
+Definitions for
+B<OSSL_CAPABILITY_TLS_SIGALG_MIN_DTLS>
+and
+B<OSSL_CAPABILITY_TLS_SIGALG_MAX_DTLS>
+were added in OpenSSL 3.5.
+
 =head1 COPYRIGHT
 
 Copyright 2019-2025 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man7/provider-cipher.pod b/doc/man7/provider-cipher.pod
index 93fdcfb1c0fa5..679c35e0f9ba5 100644
--- a/doc/man7/provider-cipher.pod
+++ b/doc/man7/provider-cipher.pod
@@ -134,8 +134,8 @@ In order to be a consistent set of functions there must at least be a complete
 set of "encrypt" functions, or a complete set of "decrypt" functions, or a
 single "cipher" function. Similarly, there can be a complete set of pipeline
 "encrypt" functions, and/or a complete set of pipeline "decrypt" functions.
-In all cases both the OSSL_FUNC_cipher_newctx and OSSL_FUNC_cipher_freectx functions must be
-present.
+In all cases the OSSL_FUNC_cipher_get_params and both OSSL_FUNC_cipher_newctx
+and OSSL_FUNC_cipher_freectx functions must be present.
 All other functions are optional.
 
 =head2 Context Management Functions
diff --git a/doc/man7/provider-decoder.pod b/doc/man7/provider-decoder.pod
index e968e661f7cf7..d19deec4af5b3 100644
--- a/doc/man7/provider-decoder.pod
+++ b/doc/man7/provider-decoder.pod
@@ -110,7 +110,9 @@ it decodes. For example, an implementation that decodes an RSA key
 should be named "RSA". Likewise, an implementation that decodes DER data
 from PEM input should be named "DER".
 
-Properties can be used to further specify details about an implementation:
+Properties, as defined in the L<OSSL_ALGORITHM(3)> array element of each
+decoder implementation, can be used to further specify details about an
+implementation:
 
 =over 4
 
@@ -302,7 +304,7 @@ The DECODER interface was introduced in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-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
diff --git a/doc/man7/provider-digest.pod b/doc/man7/provider-digest.pod
index 751321c84b20e..c44de648dcdfb 100644
--- a/doc/man7/provider-digest.pod
+++ b/doc/man7/provider-digest.pod
@@ -94,7 +94,8 @@ macros in L<openssl-core_dispatch.h(7)>, as follows:
 
 A digest algorithm implementation may not implement all of these functions.
 In order to be usable all or none of OSSL_FUNC_digest_newctx, OSSL_FUNC_digest_freectx,
-OSSL_FUNC_digest_init, OSSL_FUNC_digest_update and OSSL_FUNC_digest_final should be implemented.
+OSSL_FUNC_digest_init, OSSL_FUNC_digest_update, OSSL_FUNC_digest_final
+and OSSL_FUNC_digest_get_params should be implemented.
 All other functions are optional.
 
 =head2 Context Management Functions
@@ -287,7 +288,7 @@ OSSL_FUNC_digest_copyctx() was added in 3.5 version.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-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
diff --git a/doc/man7/provider-encoder.pod b/doc/man7/provider-encoder.pod
index f3e9ce5b16327..dadd33f9b0f6d 100644
--- a/doc/man7/provider-encoder.pod
+++ b/doc/man7/provider-encoder.pod
@@ -127,7 +127,9 @@ The name of an implementation should match the type of object it handles.
 For example, an implementation that encodes an RSA key should be named "RSA".
 Likewise, an implementation that further encodes DER should be named "DER".
 
-Properties can be used to further specify details about an implementation:
+Properties, as defined in the L<OSSL_ALGORITHM(3)> array element of each
+decoder implementation, can be used to further specify details about an
+implementation:
 
 =over 4
 
@@ -321,7 +323,7 @@ The ENCODER interface was introduced in OpenSSL 3.0.
 
 =head1 COPYRIGHT
 
-Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-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
diff --git a/doc/man7/provider-keymgmt.pod b/doc/man7/provider-keymgmt.pod
index f8235ac8a0afa..420b7cdbfcdaf 100644
--- a/doc/man7/provider-keymgmt.pod
+++ b/doc/man7/provider-keymgmt.pod
@@ -32,7 +32,7 @@ provider-keymgmt - The KEYMGMT library E<lt>-E<gt> provider functions
  void OSSL_FUNC_keymgmt_gen_cleanup(void *genctx);
 
  /* Key loading by object reference, also a constructor */
- void *OSSL_FUNC_keymgmt_load(const void *reference, size_t *reference_sz);
+ void *OSSL_FUNC_keymgmt_load(const void *reference, size_t reference_sz);
 
  /* Key object information */
  int OSSL_FUNC_keymgmt_get_params(void *keydata, OSSL_PARAM params[]);
diff --git a/doc/man7/provider-signature.pod b/doc/man7/provider-signature.pod
index 203223cd6bdec..3ef927feb5944 100644
--- a/doc/man7/provider-signature.pod
+++ b/doc/man7/provider-signature.pod
@@ -107,8 +107,7 @@ for further information.
 The signature (OSSL_OP_SIGNATURE) operation enables providers to implement
 signature algorithms and make them available to applications via the API
 functions L<EVP_PKEY_sign(3)>, L<EVP_PKEY_verify(3)>,
-and L<EVP_PKEY_verify_recover(3)> (as well
-as other related functions).
+and L<EVP_PKEY_verify_recover(3)> (as well as other related functions).
 
 All "functions" mentioned here are passed as function pointers between
 F<libcrypto> and the provider in L<OSSL_DISPATCH(3)> arrays via
@@ -179,32 +178,105 @@ set of "signature" functions, i.e. at least one of:
 
 =item OSSL_FUNC_signature_sign_init and OSSL_FUNC_signature_sign
 
+Used via L<EVP_PKEY_sign_init(3)> and L<EVP_PKEY_sign(3)>.
+These functions operate on pre-digested data (the "to be signed" or TBS value).
+
 =item OSSL_FUNC_signature_sign_message_init and OSSL_FUNC_signature_sign
 
+Used via L<EVP_PKEY_sign_message_init(3)> and L<EVP_PKEY_sign(3)> when signing a complete message.
+The implementation internally handles message digesting.
+
 =item OSSL_FUNC_signature_sign_message_init, OSSL_FUNC_signature_sign_message_update and OSSL_FUNC_signature_sign_message_final
 
+Streaming variant of message signing, used via L<EVP_PKEY_sign_message_init(3)>,
+L<EVP_PKEY_sign_message_update(3)>, and L<EVP_PKEY_sign_message_final(3)>.
+
 =item OSSL_FUNC_signature_verify_init and OSSL_FUNC_signature_verify
 
+Used via L<EVP_PKEY_verify_init(3)> and L<EVP_PKEY_verify(3)>.
+These functions operate on pre-digested data.
+
 =item OSSL_FUNC_signature_verify_message_init and OSSL_FUNC_signature_verify
 
+Used via L<EVP_PKEY_verify_message_init(3)> and L<EVP_PKEY_verify(3)> when verifying a complete message.
+The implementation internally handles message digesting.
+
 =item OSSL_FUNC_signature_verify_message_init, OSSL_FUNC_signature_verify_message_update and OSSL_FUNC_signature_verify_message_final
 
+Streaming variant of message verification, used via L<EVP_PKEY_verify_message_init(3)>,
+L<EVP_PKEY_verify_message_update(3)>, and L<EVP_PKEY_verify_message_final(3)>.
+
 =item OSSL_FUNC_signature_verify_recover_init and OSSL_FUNC_signature_verify_recover
 
+Used via L<EVP_PKEY_verify_recover_init(3)> and L<EVP_PKEY_verify_recover(3)>.
+Applicable only to signature schemes that support signature recovery (such as RSA).
+
 =item OSSL_FUNC_signature_digest_sign_init, OSSL_FUNC_signature_digest_sign_update and OSSL_FUNC_signature_digest_sign_final
 
+Streaming digest-sign variant, used via L<EVP_DigestSignInit(3)>,
+L<EVP_DigestSignUpdate(3)>, and L<EVP_DigestSignFinal(3)>.
+
 =item OSSL_FUNC_signature_digest_verify_init, OSSL_FUNC_signature_digest_verify_update and OSSL_FUNC_signature_digest_verify_final
 
+Streaming digest-verify variant, used via L<EVP_DigestVerifyInit(3)>,
+L<EVP_DigestVerifyUpdate(3)>, and L<EVP_DigestVerifyFinal(3)>.
+
 =item OSSL_FUNC_signature_digest_sign_init and OSSL_FUNC_signature_digest_sign
 
+One-shot digest-sign variant, used via L<EVP_DigestSign(3)>.
+
 =item OSSL_FUNC_signature_digest_verify_init and OSSL_FUNC_signature_digest_verify
 
+One-shot digest-verify variant, used via L<EVP_DigestVerify(3)>.
+
+=back
+
+B<Important Note for TLS Support:> For a provider signature implementation to
+be usable within F<libssl> for TLS connections, it B<must> implement the
+digest-sign and digest-verify functions
+(OSSL_FUNC_signature_digest_sign_init/update/final or the one-shot variant, and
+OSSL_FUNC_signature_digest_verify_init/update/final or the one-shot variant).
+The TLS handshake code in F<libssl> specifically requires these digest functions
+and will not use implementations that only provide the basic sign/verify functions
+(OSSL_FUNC_signature_sign_init/sign or OSSL_FUNC_signature_verify_init/verify).
+
+The choice of which function set to implement depends on your use case:
+
+=over 4
+
+=item *
+
+For general-purpose signature operations and TLS support: implement the
+digest-sign and digest-verify functions.
+
+=item *
+
+For operations on pre-digested data only: implement the basic sign and verify
+functions.
+
+=item *
+
+For signature schemes with recovery capability: additionally implement the
+verify-recover functions.
+
 =back
 
-OSSL_FUNC_signature_set_ctx_params and OSSL_FUNC_signature_settable_ctx_params are optional,
-but if one of them is present then the other one must also be present. The same
-applies to OSSL_FUNC_signature_get_ctx_params and OSSL_FUNC_signature_gettable_ctx_params, as
-well as the "md_params" functions. The OSSL_FUNC_signature_dupctx function is optional.
+The OSSL_FUNC_signature_set_ctx_params() and
+OSSL_FUNC_signature_settable_ctx_params() functions are optional,
+but if one of them is provided then the other one must also be provided.
+The same applies to the OSSL_FUNC_signature_get_ctx_params() and
+OSSL_FUNC_signature_gettable_ctx_params() functions,
+as well as the "md_params" functions.
+
+The OSSL_FUNC_signature_dupctx() function is optional.
+It is not yet used by OpenSSL.
+
+The OSSL_FUNC_signature_query_key_types() function is optional.
+When present, it should return a NULL-terminated array of strings
+indicating the key types supported by the provider for signature operations.
+Otherwise the signature algorithm name must match the given key
+or match the default signature algorithm name of the key,
+both checked using L<EVP_SIGNATURE_is_a(3)>.
 
 A signature algorithm must also implement some mechanism for generating,
 loading or importing keys via the key management (OSSL_OP_KEYMGMT) operation.
@@ -378,7 +450,7 @@ should be written to I<*siglen>. If I<sig> is NULL then the maximum length of
 the signature should be written to I<*siglen>.
 
 OSSL_FUNC_signature_digest_sign() implements a "one shot" digest sign operation
-previously started through OSSL_FUNC_signature_digeset_sign_init(). A previously
+previously started through OSSL_FUNC_signature_digest_sign_init(). A previously
 initialised signature context is passed in the I<ctx> parameter. The data to be
 signed is in I<tbs> which should be I<tbslen> bytes long. Unless I<sig> is NULL,
 the signature should be written to the location pointed to by the I<sig>
@@ -388,7 +460,7 @@ length of the signature should be written to I<*siglen>.
 
 =head2 Digest Verify Functions
 
-OSSL_FUNC_signature_digeset_verify_init() initialises a context for verifying given a
+OSSL_FUNC_signature_digest_verify_init() initialises a context for verifying given a
 provider side verification context in the I<ctx> parameter, and a pointer to a
 provider key object in the I<provkey> parameter.
 The I<params>, if not NULL, should be set on the context in a manner similar to
@@ -412,7 +484,7 @@ verification context is passed in the I<ctx> parameter. The signature to be
 verified is in I<sig> which is I<siglen> bytes long.
 
 OSSL_FUNC_signature_digest_verify() implements a "one shot" digest verify operation
-previously started through OSSL_FUNC_signature_digeset_verify_init(). A previously
+previously started through OSSL_FUNC_signature_digest_verify_init(). A previously
 initialised verification context is passed in the I<ctx> parameter. The data to be
 verified is in I<tbs> which should be I<tbslen> bytes long. The signature to be
 verified is in I<sig> which is I<siglen> bytes long.
@@ -470,8 +542,13 @@ The length of the "digest-size" parameter should not exceed that of a B<size_t>.
 
 =item "algorithm-id" (B<OSSL_SIGNATURE_PARAM_ALGORITHM_ID>) <octet string>
 
-Gets the DER encoded AlgorithmIdentifier that corresponds to the combination of
-signature algorithm and digest algorithm for the signature operation.
+Gets the DER-encoded AlgorithmIdentifier for the signature operation.
+This typically corresponds to the combination of a digest algorithm
+with a purely asymmetric signature algorithm, such as SHA256WithECDSA.
+
+The L<ASN1_item_sign_ctx(3)> function relies on this operation and is used by
+many other functions that sign ASN.1 structures such as X.509 certificates,
+certificate requests, and CRLs, as well as OCSP, CMP, and CMS messages.
 
 =item "nonce-type" (B<OSSL_SIGNATURE_PARAM_NONCE_TYPE>) <unsigned integer>
 
@@ -599,17 +676,35 @@ OSSL_FUNC_signature_gettable_ctx_params(), OSSL_FUNC_signature_settable_ctx_para
 OSSL_FUNC_signature_gettable_md_ctx_params() and OSSL_FUNC_signature_settable_md_ctx_params(),
 return the gettable or settable parameters in a constant L<OSSL_PARAM(3)> array.
 
-All other functions should return 1 for success or 0 on error.
+OSSL_FUNC_signature_query_key_types() should return a NULL-terminated array of strings.
+
+All verification functions should return 1 for success,
+0 for a non-matching signature, and a negative value for operation failure.
+
+All other functions should return 1 for success
+and 0 or a negative value for failure.
 
 =head1 SEE ALSO
 
-L<provider(7)>
+L<provider(7)>, L<provider-base(7)/Provider Functions>,
+L<OSSL_PARAM(3)>, L<OSSL_DISPATCH(3)>, L<OSSL_ALGORITHM(3)>,
+L<EVP_PKEY_sign(3)>, L<EVP_PKEY_verify(3)>, L<EVP_PKEY_verify_recover(3)>,
+L<EVP_SIGNATURE_is_a(3)>, L<ASN1_item_sign_ctx(3)>
 
 =head1 HISTORY
 
 The provider SIGNATURE interface was introduced in OpenSSL 3.0.
-The Signature Parameters "fips-indicator", "key-check" and "digest-check"
-were added in OpenSSL 3.4.
+
+The OSSL_FUNC_signature_sign_message_init(), OSSL_FUNC_signature_sign_message_update(),
+OSSL_FUNC_signature_sign_message_final(), OSSL_FUNC_signature_verify_message_init(),
+OSSL_FUNC_signature_verify_message_update() and OSSL_FUNC_signature_verify_message_final()
+functions were added in OpenSSL 3.4.
+
+The Signature Parameters "fips-indicator", "key-check" and "digest-check" were added in
+OpenSSL 3.4.
+
+Deterministic digital signature generation for ECDSA was added to the FIPS provider in OpenSSL
+3.6.
 
 =head1 COPYRIGHT
 
diff --git a/engines/e_afalg.c b/engines/e_afalg.c
index 22df8d50e11bd..366a534c9167f 100644
--- a/engines/e_afalg.c
+++ b/engines/e_afalg.c
@@ -12,7 +12,7 @@
 
 /* Required for vmsplice */
 #ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#define _GNU_SOURCE
 #endif
 #include <stdio.h>
 #include <string.h>
@@ -25,68 +25,69 @@
 
 #include <sys/socket.h>
 #include <linux/version.h>
-#define K_MAJ   4
-#define K_MIN1  1
-#define K_MIN2  0
-#if LINUX_VERSION_CODE < KERNEL_VERSION(K_MAJ, K_MIN1, K_MIN2) || \
-    !defined(AF_ALG)
-# ifndef PEDANTIC
-#  warning "AFALG ENGINE requires Kernel Headers >= 4.1.0"
-#  warning "Skipping Compilation of AFALG engine"
-# endif
+#define K_MAJ 4
+#define K_MIN1 1
+#define K_MIN2 0
+#if LINUX_VERSION_CODE < KERNEL_VERSION(K_MAJ, K_MIN1, K_MIN2) || !defined(AF_ALG)
+#ifndef PEDANTIC
+#warning "AFALG ENGINE requires Kernel Headers >= 4.1.0"
+#warning "Skipping Compilation of AFALG engine"
+#endif
 void engine_load_afalg_int(void);
 void engine_load_afalg_int(void)
 {
 }
 #else
 
-# include <linux/if_alg.h>
-# include <fcntl.h>
-# include <sys/utsname.h>
+#include <linux/if_alg.h>
+#include <fcntl.h>
+#include <sys/utsname.h>
 
-# include <linux/aio_abi.h>
-# include <sys/syscall.h>
-# include <errno.h>
+#include <linux/aio_abi.h>
+#include <sys/syscall.h>
+#include <errno.h>
 
+/* clang-format off */
 # include "e_afalg.h"
 # include "e_afalg_err.c"
+/* clang-format on */
 
-# ifndef SOL_ALG
-#  define SOL_ALG 279
-# endif
+#ifndef SOL_ALG
+#define SOL_ALG 279
+#endif
 
-# ifdef ALG_ZERO_COPY
-#  ifndef SPLICE_F_GIFT
-#   define SPLICE_F_GIFT    (0x08)
-#  endif
-# endif
+#ifdef ALG_ZERO_COPY
+#ifndef SPLICE_F_GIFT
+#define SPLICE_F_GIFT (0x08)
+#endif
+#endif
 
-# define ALG_AES_IV_LEN 16
-# define ALG_IV_LEN(len) (sizeof(struct af_alg_iv) + (len))
-# define ALG_OP_TYPE     unsigned int
-# define ALG_OP_LEN      (sizeof(ALG_OP_TYPE))
+#define ALG_AES_IV_LEN 16
+#define ALG_IV_LEN(len) (sizeof(struct af_alg_iv) + (len))
+#define ALG_OP_TYPE unsigned int
+#define ALG_OP_LEN (sizeof(ALG_OP_TYPE))
 
-# ifdef OPENSSL_NO_DYNAMIC_ENGINE
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 void engine_load_afalg_int(void);
-# endif
+#endif
 
 /* Local Linkage Functions */
 static int afalg_init_aio(afalg_aio *aio);
 static int afalg_fin_cipher_aio(afalg_aio *ptr, int sfd,
-                                unsigned char *buf, size_t len);
+    unsigned char *buf, size_t len);
 static int afalg_create_sk(afalg_ctx *actx, const char *ciphertype,
-                                const char *ciphername);
+    const char *ciphername);
 static int afalg_destroy(ENGINE *e);
 static int afalg_init(ENGINE *e);
 static int afalg_finish(ENGINE *e);
 static const EVP_CIPHER *afalg_aes_cbc(int nid);
 static cbc_handles *get_cipher_handle(int nid);
 static int afalg_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-                         const int **nids, int nid);
+    const int **nids, int nid);
 static int afalg_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 static int afalg_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inl);
+    const unsigned char *in, size_t inl);
 static int afalg_cipher_cleanup(EVP_CIPHER_CTX *ctx);
 static int afalg_chk_platform(void);
 
@@ -100,9 +101,9 @@ static int afalg_cipher_nids[] = {
     NID_aes_256_cbc,
 };
 
-static cbc_handles cbc_handle[] = {{AES_KEY_SIZE_128, NULL},
-                                    {AES_KEY_SIZE_192, NULL},
-                                    {AES_KEY_SIZE_256, NULL}};
+static cbc_handles cbc_handle[] = { { AES_KEY_SIZE_128, NULL },
+    { AES_KEY_SIZE_192, NULL },
+    { AES_KEY_SIZE_256, NULL } };
 
 static ossl_inline int io_setup(unsigned n, aio_context_t *ctx)
 {
@@ -126,19 +127,19 @@ static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb)
 
 /* A version of 'struct timespec' with 32-bit time_t and nanoseconds.  */
 struct __timespec32 {
-  __kernel_long_t tv_sec;
-  __kernel_long_t tv_nsec;
+    __kernel_long_t tv_sec;
+    __kernel_long_t tv_nsec;
 };
 
 static ossl_inline int io_getevents(aio_context_t ctx, long min, long max,
-                               struct io_event *events,
-                               struct timespec *timeout)
+    struct io_event *events,
+    struct timespec *timeout)
 {
 #if defined(__NR_io_pgetevents_time64)
     /* Check if we are a 32-bit architecture with a 64-bit time_t */
     if (sizeof(*timeout) != sizeof(struct __timespec32)) {
         int ret = syscall(__NR_io_pgetevents_time64, ctx, min, max, events,
-                          timeout, NULL);
+            timeout, NULL);
         if (ret == 0 || errno != ENOSYS)
             return ret;
     }
@@ -161,8 +162,8 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max,
         if (timeout && timeout->tv_sec == (long)timeout->tv_sec) {
             struct __timespec32 ts32;
 
-            ts32.tv_sec = (__kernel_long_t) timeout->tv_sec;
-            ts32.tv_nsec = (__kernel_long_t) timeout->tv_nsec;
+            ts32.tv_sec = (__kernel_long_t)timeout->tv_sec;
+            ts32.tv_nsec = (__kernel_long_t)timeout->tv_nsec;
 
             return syscall(__NR_io_getevents, ctx, min, max, events, &ts32);
         } else {
@@ -176,7 +177,7 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max,
 }
 
 static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key,
-                                 OSSL_ASYNC_FD waitfd, void *custom)
+    OSSL_ASYNC_FD waitfd, void *custom)
 {
     close(waitfd);
 }
@@ -197,7 +198,7 @@ static int afalg_setup_async_event_notification(afalg_aio *aio)
         }
         /* Get waitfd from ASYNC_WAIT_CTX if it is already set */
         ret = ASYNC_WAIT_CTX_get_fd(waitctx, engine_afalg_id,
-                                    &aio->efd, &custom);
+            &aio->efd, &custom);
         if (ret == 0) {
             /*
              * waitfd is not set in ASYNC_WAIT_CTX, create a new one
@@ -206,14 +207,14 @@ static int afalg_setup_async_event_notification(afalg_aio *aio)
             aio->efd = eventfd(0);
             if (aio->efd == -1) {
                 ALG_PERR("%s(%d): Failed to get eventfd : ", __FILE__,
-                         __LINE__);
+                    __LINE__);
                 AFALGerr(AFALG_F_AFALG_SETUP_ASYNC_EVENT_NOTIFICATION,
-                         AFALG_R_EVENTFD_FAILED);
+                    AFALG_R_EVENTFD_FAILED);
                 return 0;
             }
             ret = ASYNC_WAIT_CTX_set_wait_fd(waitctx, engine_afalg_id,
-                                             aio->efd, custom,
-                                             afalg_waitfd_cleanup);
+                aio->efd, custom,
+                afalg_waitfd_cleanup);
             if (ret == 0) {
                 ALG_WARN("%s(%d): Failed to set wait fd", __FILE__, __LINE__);
                 close(aio->efd);
@@ -222,7 +223,7 @@ static int afalg_setup_async_event_notification(afalg_aio *aio)
             /* make fd non-blocking in async mode */
             if (fcntl(aio->efd, F_SETFL, O_NONBLOCK) != 0) {
                 ALG_WARN("%s(%d): Failed to set event fd as NONBLOCKING",
-                         __FILE__, __LINE__);
+                    __FILE__, __LINE__);
             }
         }
         aio->mode = MODE_ASYNC;
@@ -232,7 +233,7 @@ static int afalg_setup_async_event_notification(afalg_aio *aio)
         if (aio->efd == -1) {
             ALG_PERR("%s(%d): Failed to get eventfd : ", __FILE__, __LINE__);
             AFALGerr(AFALG_F_AFALG_SETUP_ASYNC_EVENT_NOTIFICATION,
-                     AFALG_R_EVENTFD_FAILED);
+                AFALG_R_EVENTFD_FAILED);
             return 0;
         }
         aio->mode = MODE_SYNC;
@@ -261,7 +262,7 @@ static int afalg_init_aio(afalg_aio *aio)
 }
 
 static int afalg_fin_cipher_aio(afalg_aio *aio, int sfd, unsigned char *buf,
-                                size_t len)
+    size_t len)
 {
     int r;
     int retry = 0;
@@ -319,7 +320,7 @@ static int afalg_fin_cipher_aio(afalg_aio *aio, int sfd, unsigned char *buf,
             return 0;
         } else if (r == 0 || eval <= 0) {
             ALG_WARN("%s(%d): eventfd read %d bytes, eval = %lu\n", __FILE__,
-                     __LINE__, r, eval);
+                __LINE__, r, eval);
         }
         if (eval > 0) {
 
@@ -334,7 +335,7 @@ static int afalg_fin_cipher_aio(afalg_aio *aio, int sfd, unsigned char *buf,
 
             /* Get results of AIO read */
             r = io_getevents(aio->aio_ctx, 1, MAX_INFLIGHTS,
-                             events, &timeout);
+                events, &timeout);
             if (r > 0) {
                 /*
                  * events.res indicates the actual status of the operation.
@@ -349,7 +350,7 @@ static int afalg_fin_cipher_aio(afalg_aio *aio, int sfd, unsigned char *buf,
                         r = io_read(aio->aio_ctx, 1, &cb);
                         if (r < 0) {
                             ALG_PERR("%s(%d): retry %d for io_read failed : ",
-                                     __FILE__, __LINE__, retry);
+                                __FILE__, __LINE__, retry);
                             return 0;
                         }
                         continue;
@@ -370,9 +371,8 @@ static int afalg_fin_cipher_aio(afalg_aio *aio, int sfd, unsigned char *buf,
                          * Retries exceed for -EBUSY or unrecoverable error
                          * condition for this instance of operation.
                          */
-                        ALG_WARN
-                            ("%s(%d): Crypto Operation failed with code %lld\n",
-                             __FILE__, __LINE__, events[0].res);
+                        ALG_WARN("%s(%d): Crypto Operation failed with code %lld\n",
+                            __FILE__, __LINE__, events[0].res);
                         BIO_snprintf(strbuf, sizeof(strbuf), "%lld", op_ret);
                         switch (events[0].res) {
                         case -ENOMEM:
@@ -394,7 +394,7 @@ static int afalg_fin_cipher_aio(afalg_aio *aio, int sfd, unsigned char *buf,
                 return 0;
             } else {
                 ALG_WARN("%s(%d): io_geteventd read 0 bytes\n", __FILE__,
-                         __LINE__);
+                    __LINE__);
             }
         }
     } while (!done);
@@ -403,7 +403,7 @@ static int afalg_fin_cipher_aio(afalg_aio *aio, int sfd, unsigned char *buf,
 }
 
 static ossl_inline void afalg_set_op_sk(struct cmsghdr *cmsg,
-                                   const ALG_OP_TYPE op)
+    const ALG_OP_TYPE op)
 {
     cmsg->cmsg_level = SOL_ALG;
     cmsg->cmsg_type = ALG_SET_OP;
@@ -412,7 +412,7 @@ static ossl_inline void afalg_set_op_sk(struct cmsghdr *cmsg,
 }
 
 static void afalg_set_iv_sk(struct cmsghdr *cmsg, const unsigned char *iv,
-                            const unsigned int len)
+    const unsigned int len)
 {
     struct af_alg_iv *aiv;
 
@@ -425,7 +425,7 @@ static void afalg_set_iv_sk(struct cmsghdr *cmsg, const unsigned char *iv,
 }
 
 static ossl_inline int afalg_set_key(afalg_ctx *actx, const unsigned char *key,
-                                const int klen)
+    const int klen)
 {
     int ret;
     ret = setsockopt(actx->bfd, SOL_ALG, ALG_SET_KEY, key, klen);
@@ -438,7 +438,7 @@ static ossl_inline int afalg_set_key(afalg_ctx *actx, const unsigned char *key,
 }
 
 static int afalg_create_sk(afalg_ctx *actx, const char *ciphertype,
-                                const char *ciphername)
+    const char *ciphername)
 {
     struct sockaddr_alg sa;
     int r = -1;
@@ -447,8 +447,8 @@ static int afalg_create_sk(afalg_ctx *actx, const char *ciphertype,
 
     memset(&sa, 0, sizeof(sa));
     sa.salg_family = AF_ALG;
-    OPENSSL_strlcpy((char *) sa.salg_type, ciphertype, sizeof(sa.salg_type));
-    OPENSSL_strlcpy((char *) sa.salg_name, ciphername, sizeof(sa.salg_name));
+    OPENSSL_strlcpy((char *)sa.salg_type, ciphertype, sizeof(sa.salg_type));
+    OPENSSL_strlcpy((char *)sa.salg_name, ciphername, sizeof(sa.salg_name));
 
     actx->bfd = socket(AF_ALG, SOCK_SEQPACKET, 0);
     if (actx->bfd == -1) {
@@ -473,7 +473,7 @@ static int afalg_create_sk(afalg_ctx *actx, const char *ciphertype,
 
     return 1;
 
- err:
+err:
     if (actx->bfd >= 0)
         close(actx->bfd);
     if (actx->sfd >= 0)
@@ -483,16 +483,16 @@ static int afalg_create_sk(afalg_ctx *actx, const char *ciphertype,
 }
 
 static int afalg_start_cipher_sk(afalg_ctx *actx, const unsigned char *in,
-                                 size_t inl, const unsigned char *iv,
-                                 unsigned int enc)
+    size_t inl, const unsigned char *iv,
+    unsigned int enc)
 {
     struct msghdr msg;
     struct cmsghdr *cmsg;
     struct iovec iov;
     ssize_t sbytes;
-# ifdef ALG_ZERO_COPY
+#ifdef ALG_ZERO_COPY
     int ret;
-# endif
+#endif
     char cbuf[CMSG_SPACE(ALG_IV_LEN(ALG_AES_IV_LEN)) + CMSG_SPACE(ALG_OP_LEN)];
 
     memset(&msg, 0, sizeof(msg));
@@ -515,7 +515,7 @@ static int afalg_start_cipher_sk(afalg_ctx *actx, const unsigned char *in,
 
     msg.msg_flags = MSG_MORE;
 
-# ifdef ALG_ZERO_COPY
+#ifdef ALG_ZERO_COPY
     /*
      * ZERO_COPY mode
      * Works best when buffer is 4k aligned
@@ -530,7 +530,7 @@ static int afalg_start_cipher_sk(afalg_ctx *actx, const unsigned char *in,
     sbytes = sendmsg(actx->sfd, &msg, 0);
     if (sbytes < 0) {
         ALG_PERR("%s(%d): sendmsg failed for zero copy cipher operation : ",
-                 __FILE__, __LINE__);
+            __FILE__, __LINE__);
         return 0;
     }
 
@@ -549,7 +549,7 @@ static int afalg_start_cipher_sk(afalg_ctx *actx, const unsigned char *in,
         ALG_PERR("%s(%d): splice failed : ", __FILE__, __LINE__);
         return 0;
     }
-# else
+#else
     msg.msg_iovlen = 1;
     msg.msg_iov = &iov;
 
@@ -557,22 +557,22 @@ static int afalg_start_cipher_sk(afalg_ctx *actx, const unsigned char *in,
     sbytes = sendmsg(actx->sfd, &msg, 0);
     if (sbytes < 0) {
         ALG_PERR("%s(%d): sendmsg failed for cipher operation : ", __FILE__,
-                 __LINE__);
+            __LINE__);
         return 0;
     }
 
-    if (sbytes != (ssize_t) inl) {
+    if (sbytes != (ssize_t)inl) {
         ALG_WARN("Cipher operation send bytes %zd != inlen %zd\n", sbytes,
-                inl);
+            inl);
         return 0;
     }
-# endif
+#endif
 
     return 1;
 }
 
 static int afalg_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     int ciphertype;
     int ret, len;
@@ -604,13 +604,13 @@ static int afalg_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         break;
     default:
         ALG_WARN("%s(%d): Unsupported Cipher type %d\n", __FILE__, __LINE__,
-                 ciphertype);
+            ciphertype);
         return 0;
     }
 
     if (ALG_AES_IV_LEN != EVP_CIPHER_CTX_get_iv_length(ctx)) {
         ALG_WARN("%s(%d): Unsupported IV length :%d\n", __FILE__, __LINE__,
-                 EVP_CIPHER_CTX_get_iv_length(ctx));
+            EVP_CIPHER_CTX_get_iv_length(ctx));
         return 0;
     }
 
@@ -629,9 +629,9 @@ static int afalg_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     if (afalg_init_aio(&actx->aio) == 0)
         goto err;
 
-# ifdef ALG_ZERO_COPY
+#ifdef ALG_ZERO_COPY
     pipe(actx->zc_pipe);
-# endif
+#endif
 
     actx->init_done = MAGIC_INIT_NUM;
 
@@ -644,7 +644,7 @@ static int afalg_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static int afalg_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     afalg_ctx *actx;
     int ret;
@@ -652,14 +652,14 @@ static int afalg_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
     if (ctx == NULL || out == NULL || in == NULL) {
         ALG_WARN("NULL parameter passed to function %s(%d)\n", __FILE__,
-                 __LINE__);
+            __LINE__);
         return 0;
     }
 
-    actx = (afalg_ctx *) EVP_CIPHER_CTX_get_cipher_data(ctx);
+    actx = (afalg_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
     if (actx == NULL || actx->init_done != MAGIC_INIT_NUM) {
         ALG_WARN("%s afalg ctx passed\n",
-                 ctx == NULL ? "NULL" : "Uninitialised");
+            ctx == NULL ? "NULL" : "Uninitialised");
         return 0;
     }
 
@@ -673,8 +673,8 @@ static int afalg_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
     /* Send input data to kernel space */
     ret = afalg_start_cipher_sk(actx, (unsigned char *)in, inl,
-                                EVP_CIPHER_CTX_iv(ctx),
-                                EVP_CIPHER_CTX_is_encrypting(ctx));
+        EVP_CIPHER_CTX_iv(ctx),
+        EVP_CIPHER_CTX_is_encrypting(ctx));
     if (ret < 1) {
         return 0;
     }
@@ -686,7 +686,7 @@ static int afalg_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
     if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
         memcpy(EVP_CIPHER_CTX_iv_noconst(ctx), out + (inl - ALG_AES_IV_LEN),
-               ALG_AES_IV_LEN);
+            ALG_AES_IV_LEN);
     } else {
         memcpy(EVP_CIPHER_CTX_iv_noconst(ctx), nxtiv, ALG_AES_IV_LEN);
     }
@@ -700,20 +700,20 @@ static int afalg_cipher_cleanup(EVP_CIPHER_CTX *ctx)
 
     if (ctx == NULL) {
         ALG_WARN("NULL parameter passed to function %s(%d)\n", __FILE__,
-                 __LINE__);
+            __LINE__);
         return 0;
     }
 
-    actx = (afalg_ctx *) EVP_CIPHER_CTX_get_cipher_data(ctx);
+    actx = (afalg_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
     if (actx == NULL || actx->init_done != MAGIC_INIT_NUM)
         return 1;
 
     close(actx->sfd);
     close(actx->bfd);
-# ifdef ALG_ZERO_COPY
+#ifdef ALG_ZERO_COPY
     close(actx->zc_pipe[0]);
     close(actx->zc_pipe[1]);
-# endif
+#endif
     /* close efd in sync mode, async mode is closed in afalg_waitfd_cleanup() */
     if (actx->aio.mode == MODE_SYNC)
         close(actx->aio.efd);
@@ -741,33 +741,32 @@ static const EVP_CIPHER *afalg_aes_cbc(int nid)
     cbc_handles *cipher_handle = get_cipher_handle(nid);
 
     if (cipher_handle == NULL)
-            return NULL;
+        return NULL;
     if (cipher_handle->_hidden == NULL
-        && ((cipher_handle->_hidden =
-         EVP_CIPHER_meth_new(nid,
-                             AES_BLOCK_SIZE,
-                             cipher_handle->key_size)) == NULL
-        || !EVP_CIPHER_meth_set_iv_length(cipher_handle->_hidden,
-                                          AES_IV_LEN)
-        || !EVP_CIPHER_meth_set_flags(cipher_handle->_hidden,
-                                      EVP_CIPH_CBC_MODE |
-                                      EVP_CIPH_FLAG_DEFAULT_ASN1)
-        || !EVP_CIPHER_meth_set_init(cipher_handle->_hidden,
-                                     afalg_cipher_init)
-        || !EVP_CIPHER_meth_set_do_cipher(cipher_handle->_hidden,
-                                          afalg_do_cipher)
-        || !EVP_CIPHER_meth_set_cleanup(cipher_handle->_hidden,
-                                        afalg_cipher_cleanup)
-        || !EVP_CIPHER_meth_set_impl_ctx_size(cipher_handle->_hidden,
-                                              sizeof(afalg_ctx)))) {
+        && ((cipher_handle->_hidden = EVP_CIPHER_meth_new(nid,
+                 AES_BLOCK_SIZE,
+                 cipher_handle->key_size))
+                == NULL
+            || !EVP_CIPHER_meth_set_iv_length(cipher_handle->_hidden,
+                AES_IV_LEN)
+            || !EVP_CIPHER_meth_set_flags(cipher_handle->_hidden,
+                EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1)
+            || !EVP_CIPHER_meth_set_init(cipher_handle->_hidden,
+                afalg_cipher_init)
+            || !EVP_CIPHER_meth_set_do_cipher(cipher_handle->_hidden,
+                afalg_do_cipher)
+            || !EVP_CIPHER_meth_set_cleanup(cipher_handle->_hidden,
+                afalg_cipher_cleanup)
+            || !EVP_CIPHER_meth_set_impl_ctx_size(cipher_handle->_hidden,
+                sizeof(afalg_ctx)))) {
         EVP_CIPHER_meth_free(cipher_handle->_hidden);
-        cipher_handle->_hidden= NULL;
+        cipher_handle->_hidden = NULL;
     }
     return cipher_handle->_hidden;
 }
 
 static int afalg_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-                         const int **nids, int nid)
+    const int **nids, int nid)
 {
     int r = 1;
 
@@ -824,7 +823,7 @@ static int bind_afalg(ENGINE *e)
     return 1;
 }
 
-# ifndef OPENSSL_NO_DYNAMIC_ENGINE
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_helper(ENGINE *e, const char *id)
 {
     if (id && (strcmp(id, engine_afalg_id) != 0))
@@ -841,8 +840,8 @@ static int bind_helper(ENGINE *e, const char *id)
 }
 
 IMPLEMENT_DYNAMIC_CHECK_FN()
-    IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
-# endif
+IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
+#endif
 
 static int afalg_chk_platform(void)
 {
@@ -856,7 +855,7 @@ static int afalg_chk_platform(void)
     ret = uname(&ut);
     if (ret != 0) {
         AFALGerr(AFALG_F_AFALG_CHK_PLATFORM,
-                 AFALG_R_FAILED_TO_GET_PLATFORM_INFO);
+            AFALG_R_FAILED_TO_GET_PLATFORM_INFO);
         return 0;
     }
 
@@ -869,11 +868,11 @@ static int afalg_chk_platform(void)
     if (KERNEL_VERSION(kver[0], kver[1], kver[2])
         < KERNEL_VERSION(K_MAJ, K_MIN1, K_MIN2)) {
         ALG_ERR("ASYNC AFALG not supported this kernel(%d.%d.%d)\n",
-                 kver[0], kver[1], kver[2]);
+            kver[0], kver[1], kver[2]);
         ALG_ERR("ASYNC AFALG requires kernel version %d.%d.%d or later\n",
-                 K_MAJ, K_MIN1, K_MIN2);
+            K_MAJ, K_MIN1, K_MIN2);
         AFALGerr(AFALG_F_AFALG_CHK_PLATFORM,
-                 AFALG_R_KERNEL_DOES_NOT_SUPPORT_ASYNC_AFALG);
+            AFALG_R_KERNEL_DOES_NOT_SUPPORT_ASYNC_AFALG);
         return 0;
     }
 
@@ -888,7 +887,7 @@ static int afalg_chk_platform(void)
     return 1;
 }
 
-# ifdef OPENSSL_NO_DYNAMIC_ENGINE
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_afalg(void)
 {
     ENGINE *ret = ENGINE_new();
@@ -925,7 +924,7 @@ void engine_load_afalg_int(void)
      */
     ERR_pop_to_mark();
 }
-# endif
+#endif
 
 static int afalg_init(ENGINE *e)
 {
@@ -954,4 +953,4 @@ static int afalg_destroy(ENGINE *e)
     return 1;
 }
 
-#endif                          /* KERNEL VERSION */
+#endif /* KERNEL VERSION */
diff --git a/engines/e_afalg.h b/engines/e_afalg.h
index b8e4911d21ef0..e8ccf9515e9af 100644
--- a/engines/e_afalg.h
+++ b/engines/e_afalg.h
@@ -8,44 +8,43 @@
  */
 
 #ifndef OSSL_ENGINES_E_AFALG_H
-# define OSSL_ENGINES_E_AFALG_H
+#define OSSL_ENGINES_E_AFALG_H
 
-# if defined(__GNUC__) && __GNUC__ >= 4 && \
-     (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L)
-#  pragma GCC diagnostic ignored "-Wvariadic-macros"
-# endif
+#if defined(__GNUC__) && __GNUC__ >= 4 && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L)
+#pragma GCC diagnostic ignored "-Wvariadic-macros"
+#endif
 
-# ifdef ALG_DEBUG
-#  define ALG_DGB(x, ...) fprintf(stderr, "ALG_DBG: " x, __VA_ARGS__)
-#  define ALG_INFO(x, ...) fprintf(stderr, "ALG_INFO: " x, __VA_ARGS__)
-#  define ALG_WARN(x, ...) fprintf(stderr, "ALG_WARN: " x, __VA_ARGS__)
-# else
-#  define ALG_DGB(x, ...)
-#  define ALG_INFO(x, ...)
-#  define ALG_WARN(x, ...)
-# endif
+#ifdef ALG_DEBUG
+#define ALG_DGB(x, ...) fprintf(stderr, "ALG_DBG: " x, __VA_ARGS__)
+#define ALG_INFO(x, ...) fprintf(stderr, "ALG_INFO: " x, __VA_ARGS__)
+#define ALG_WARN(x, ...) fprintf(stderr, "ALG_WARN: " x, __VA_ARGS__)
+#else
+#define ALG_DGB(x, ...)
+#define ALG_INFO(x, ...)
+#define ALG_WARN(x, ...)
+#endif
 
-# define ALG_ERR(x, ...) fprintf(stderr, "ALG_ERR: " x, __VA_ARGS__)
-# define ALG_PERR(x, ...) \
-                do { \
-                    fprintf(stderr, "ALG_PERR: " x, __VA_ARGS__); \
-                    perror(NULL); \
-                } while(0)
-# define ALG_PWARN(x, ...) \
-                do { \
-                    fprintf(stderr, "ALG_PERR: " x, __VA_ARGS__); \
-                    perror(NULL); \
-                } while(0)
+#define ALG_ERR(x, ...) fprintf(stderr, "ALG_ERR: " x, __VA_ARGS__)
+#define ALG_PERR(x, ...)                              \
+    do {                                              \
+        fprintf(stderr, "ALG_PERR: " x, __VA_ARGS__); \
+        perror(NULL);                                 \
+    } while (0)
+#define ALG_PWARN(x, ...)                             \
+    do {                                              \
+        fprintf(stderr, "ALG_PERR: " x, __VA_ARGS__); \
+        perror(NULL);                                 \
+    } while (0)
 
-# ifndef AES_BLOCK_SIZE
-#  define AES_BLOCK_SIZE   16
-# endif
-# define AES_KEY_SIZE_128 16
-# define AES_KEY_SIZE_192 24
-# define AES_KEY_SIZE_256 32
-# define AES_IV_LEN       16
+#ifndef AES_BLOCK_SIZE
+#define AES_BLOCK_SIZE 16
+#endif
+#define AES_KEY_SIZE_128 16
+#define AES_KEY_SIZE_192 24
+#define AES_KEY_SIZE_256 32
+#define AES_IV_LEN 16
 
-# define MAX_INFLIGHTS 1
+#define MAX_INFLIGHTS 1
 
 typedef enum {
     MODE_UNINIT = 0,
@@ -79,15 +78,15 @@ typedef struct afalg_aio_st afalg_aio;
  * MAGIC Number to identify correct initialisation
  * of afalg_ctx.
  */
-# define MAGIC_INIT_NUM 0x1890671
+#define MAGIC_INIT_NUM 0x1890671
 
 struct afalg_ctx_st {
     int init_done;
     int sfd;
     int bfd;
-# ifdef ALG_ZERO_COPY
+#ifdef ALG_ZERO_COPY
     int zc_pipe[2];
-# endif
+#endif
     afalg_aio aio;
 };
 
diff --git a/engines/e_afalg_err.c b/engines/e_afalg_err.c
index fa38678e9e77f..bd134c7ca3469 100644
--- a/engines/e_afalg_err.c
+++ b/engines/e_afalg_err.c
@@ -14,24 +14,24 @@
 #ifndef OPENSSL_NO_ERR
 
 static ERR_STRING_DATA AFALG_str_reasons[] = {
-    {ERR_PACK(0, 0, AFALG_R_EVENTFD_FAILED), "eventfd failed"},
-    {ERR_PACK(0, 0, AFALG_R_FAILED_TO_GET_PLATFORM_INFO),
-    "failed to get platform info"},
-    {ERR_PACK(0, 0, AFALG_R_INIT_FAILED), "init failed"},
-    {ERR_PACK(0, 0, AFALG_R_IO_SETUP_FAILED), "io setup failed"},
-    {ERR_PACK(0, 0, AFALG_R_KERNEL_DOES_NOT_SUPPORT_AFALG),
-    "kernel does not support afalg"},
-    {ERR_PACK(0, 0, AFALG_R_KERNEL_DOES_NOT_SUPPORT_ASYNC_AFALG),
-    "kernel does not support async afalg"},
-    {ERR_PACK(0, 0, AFALG_R_KERNEL_OP_FAILED), "kernel op failed"},
-    {ERR_PACK(0, 0, AFALG_R_MEM_ALLOC_FAILED), "mem alloc failed"},
-    {ERR_PACK(0, 0, AFALG_R_SOCKET_ACCEPT_FAILED), "socket accept failed"},
-    {ERR_PACK(0, 0, AFALG_R_SOCKET_BIND_FAILED), "socket bind failed"},
-    {ERR_PACK(0, 0, AFALG_R_SOCKET_CREATE_FAILED), "socket create failed"},
-    {ERR_PACK(0, 0, AFALG_R_SOCKET_OPERATION_FAILED),
-    "socket operation failed"},
-    {ERR_PACK(0, 0, AFALG_R_SOCKET_SET_KEY_FAILED), "socket set key failed"},
-    {0, NULL}
+    { ERR_PACK(0, 0, AFALG_R_EVENTFD_FAILED), "eventfd failed" },
+    { ERR_PACK(0, 0, AFALG_R_FAILED_TO_GET_PLATFORM_INFO),
+        "failed to get platform info" },
+    { ERR_PACK(0, 0, AFALG_R_INIT_FAILED), "init failed" },
+    { ERR_PACK(0, 0, AFALG_R_IO_SETUP_FAILED), "io setup failed" },
+    { ERR_PACK(0, 0, AFALG_R_KERNEL_DOES_NOT_SUPPORT_AFALG),
+        "kernel does not support afalg" },
+    { ERR_PACK(0, 0, AFALG_R_KERNEL_DOES_NOT_SUPPORT_ASYNC_AFALG),
+        "kernel does not support async afalg" },
+    { ERR_PACK(0, 0, AFALG_R_KERNEL_OP_FAILED), "kernel op failed" },
+    { ERR_PACK(0, 0, AFALG_R_MEM_ALLOC_FAILED), "mem alloc failed" },
+    { ERR_PACK(0, 0, AFALG_R_SOCKET_ACCEPT_FAILED), "socket accept failed" },
+    { ERR_PACK(0, 0, AFALG_R_SOCKET_BIND_FAILED), "socket bind failed" },
+    { ERR_PACK(0, 0, AFALG_R_SOCKET_CREATE_FAILED), "socket create failed" },
+    { ERR_PACK(0, 0, AFALG_R_SOCKET_OPERATION_FAILED),
+        "socket operation failed" },
+    { ERR_PACK(0, 0, AFALG_R_SOCKET_SET_KEY_FAILED), "socket set key failed" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/engines/e_afalg_err.h b/engines/e_afalg_err.h
index 8328b21e8eaa4..085cb8350262a 100644
--- a/engines/e_afalg_err.h
+++ b/engines/e_afalg_err.h
@@ -9,31 +9,29 @@
  */
 
 #ifndef OSSL_E_AFALG_ERR_H
-# define OSSL_E_AFALG_ERR_H
-# pragma once
+#define OSSL_E_AFALG_ERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-
-
-# define AFALGerr(f, r) ERR_AFALG_error(0, (r), OPENSSL_FILE, OPENSSL_LINE)
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
 
+#define AFALGerr(f, r) ERR_AFALG_error(0, (r), OPENSSL_FILE, OPENSSL_LINE)
 
 /*
  * AFALG reason codes.
  */
-# define AFALG_R_EVENTFD_FAILED                           108
-# define AFALG_R_FAILED_TO_GET_PLATFORM_INFO              111
-# define AFALG_R_INIT_FAILED                              100
-# define AFALG_R_IO_SETUP_FAILED                          105
-# define AFALG_R_KERNEL_DOES_NOT_SUPPORT_AFALG            101
-# define AFALG_R_KERNEL_DOES_NOT_SUPPORT_ASYNC_AFALG      107
-# define AFALG_R_KERNEL_OP_FAILED                         112
-# define AFALG_R_MEM_ALLOC_FAILED                         102
-# define AFALG_R_SOCKET_ACCEPT_FAILED                     110
-# define AFALG_R_SOCKET_BIND_FAILED                       103
-# define AFALG_R_SOCKET_CREATE_FAILED                     109
-# define AFALG_R_SOCKET_OPERATION_FAILED                  104
-# define AFALG_R_SOCKET_SET_KEY_FAILED                    106
+#define AFALG_R_EVENTFD_FAILED 108
+#define AFALG_R_FAILED_TO_GET_PLATFORM_INFO 111
+#define AFALG_R_INIT_FAILED 100
+#define AFALG_R_IO_SETUP_FAILED 105
+#define AFALG_R_KERNEL_DOES_NOT_SUPPORT_AFALG 101
+#define AFALG_R_KERNEL_DOES_NOT_SUPPORT_ASYNC_AFALG 107
+#define AFALG_R_KERNEL_OP_FAILED 112
+#define AFALG_R_MEM_ALLOC_FAILED 102
+#define AFALG_R_SOCKET_ACCEPT_FAILED 110
+#define AFALG_R_SOCKET_BIND_FAILED 103
+#define AFALG_R_SOCKET_CREATE_FAILED 109
+#define AFALG_R_SOCKET_OPERATION_FAILED 104
+#define AFALG_R_SOCKET_SET_KEY_FAILED 106
 
 #endif
diff --git a/engines/e_capi.c b/engines/e_capi.c
index 3c15158b8aa64..447d072cba335 100644
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -11,28 +11,28 @@
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #ifdef _WIN32
-# ifndef _WIN32_WINNT
-#  define _WIN32_WINNT 0x0400
-# endif
-# include <windows.h>
-# include <wincrypt.h>
-
-# include <stdio.h>
-# include <string.h>
-# include <stdlib.h>
-# include <malloc.h>
-# ifndef alloca
-#  define alloca _alloca
-# endif
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0400
+#endif
+#include <windows.h>
+#include <wincrypt.h>
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <malloc.h>
+#ifndef alloca
+#define alloca _alloca
+#endif
 
-# include <openssl/crypto.h>
+#include <openssl/crypto.h>
 
-# ifndef OPENSSL_NO_CAPIENG
+#ifndef OPENSSL_NO_CAPIENG
 
-#  include <openssl/buffer.h>
-#  include <openssl/bn.h>
-#  include <openssl/rsa.h>
-#  include <openssl/dsa.h>
+#include <openssl/buffer.h>
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
 
 /*
  * This module uses several "new" interfaces, among which is
@@ -46,61 +46,61 @@
  * Yes, it's rather "weak" test and if compilation fails,
  * then re-configure with -DOPENSSL_NO_CAPIENG.
  */
-#  if defined(CERT_KEY_PROV_INFO_PROP_ID) && \
-    defined(CERT_STORE_PROV_SYSTEM_A) && \
-    defined(CERT_STORE_READONLY_FLAG)
-#   define __COMPILE_CAPIENG
-#  endif                        /* CERT_KEY_PROV_INFO_PROP_ID */
-# endif                         /* OPENSSL_NO_CAPIENG */
-#endif                          /* _WIN32 */
+#if defined(CERT_KEY_PROV_INFO_PROP_ID) && defined(CERT_STORE_PROV_SYSTEM_A) && defined(CERT_STORE_READONLY_FLAG)
+#define __COMPILE_CAPIENG
+#endif /* CERT_KEY_PROV_INFO_PROP_ID */
+#endif /* OPENSSL_NO_CAPIENG */
+#endif /* _WIN32 */
 
 #ifdef __COMPILE_CAPIENG
 
-# undef X509_EXTENSIONS
+#undef X509_EXTENSIONS
 
 /* Definitions which may be missing from earlier version of headers */
-# ifndef CERT_STORE_OPEN_EXISTING_FLAG
-#  define CERT_STORE_OPEN_EXISTING_FLAG                   0x00004000
-# endif
-
-# ifndef CERT_STORE_CREATE_NEW_FLAG
-#  define CERT_STORE_CREATE_NEW_FLAG                      0x00002000
-# endif
-
-# ifndef CERT_SYSTEM_STORE_CURRENT_USER
-#  define CERT_SYSTEM_STORE_CURRENT_USER                  0x00010000
-# endif
-
-# ifndef ALG_SID_SHA_256
-#  define ALG_SID_SHA_256   12
-# endif
-# ifndef ALG_SID_SHA_384
-#  define ALG_SID_SHA_384   13
-# endif
-# ifndef ALG_SID_SHA_512
-#  define ALG_SID_SHA_512   14
-# endif
-
-# ifndef CALG_SHA_256
-#  define CALG_SHA_256      (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_256)
-# endif
-# ifndef CALG_SHA_384
-#  define CALG_SHA_384      (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_384)
-# endif
-# ifndef CALG_SHA_512
-#  define CALG_SHA_512      (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_512)
-# endif
-
-# ifndef PROV_RSA_AES
-#  define PROV_RSA_AES 24
-# endif
-
-# include <openssl/engine.h>
-# include <openssl/pem.h>
-# include <openssl/x509v3.h>
+#ifndef CERT_STORE_OPEN_EXISTING_FLAG
+#define CERT_STORE_OPEN_EXISTING_FLAG 0x00004000
+#endif
+
+#ifndef CERT_STORE_CREATE_NEW_FLAG
+#define CERT_STORE_CREATE_NEW_FLAG 0x00002000
+#endif
+
+#ifndef CERT_SYSTEM_STORE_CURRENT_USER
+#define CERT_SYSTEM_STORE_CURRENT_USER 0x00010000
+#endif
 
+#ifndef ALG_SID_SHA_256
+#define ALG_SID_SHA_256 12
+#endif
+#ifndef ALG_SID_SHA_384
+#define ALG_SID_SHA_384 13
+#endif
+#ifndef ALG_SID_SHA_512
+#define ALG_SID_SHA_512 14
+#endif
+
+#ifndef CALG_SHA_256
+#define CALG_SHA_256 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_256)
+#endif
+#ifndef CALG_SHA_384
+#define CALG_SHA_384 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_384)
+#endif
+#ifndef CALG_SHA_512
+#define CALG_SHA_512 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_512)
+#endif
+
+#ifndef PROV_RSA_AES
+#define PROV_RSA_AES 24
+#endif
+
+#include <openssl/engine.h>
+#include <openssl/pem.h>
+#include <openssl/x509v3.h>
+
+/* clang-format off */
 # include "e_capi_err.h"
 # include "e_capi_err.c"
+/* clang-format on */
 
 static const char *engine_capi_id = "capi";
 static const char *engine_capi_name = "CryptoAPI ENGINE";
@@ -119,42 +119,42 @@ int capi_list_certs(CAPI_CTX *ctx, BIO *out, char *storename);
 void capi_free_key(CAPI_KEY *key);
 
 static PCCERT_CONTEXT capi_find_cert(CAPI_CTX *ctx, const char *id,
-                                     HCERTSTORE hstore);
+    HCERTSTORE hstore);
 
 CAPI_KEY *capi_find_key(CAPI_CTX *ctx, const char *id);
 
 static EVP_PKEY *capi_load_privkey(ENGINE *eng, const char *key_id,
-                                   UI_METHOD *ui_method, void *callback_data);
+    UI_METHOD *ui_method, void *callback_data);
 static int capi_rsa_sign(int dtype, const unsigned char *m,
-                         unsigned int m_len, unsigned char *sigret,
-                         unsigned int *siglen, const RSA *rsa);
+    unsigned int m_len, unsigned char *sigret,
+    unsigned int *siglen, const RSA *rsa);
 static int capi_rsa_priv_enc(int flen, const unsigned char *from,
-                             unsigned char *to, RSA *rsa, int padding);
+    unsigned char *to, RSA *rsa, int padding);
 static int capi_rsa_priv_dec(int flen, const unsigned char *from,
-                             unsigned char *to, RSA *rsa, int padding);
+    unsigned char *to, RSA *rsa, int padding);
 static int capi_rsa_free(RSA *rsa);
 
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
 static DSA_SIG *capi_dsa_do_sign(const unsigned char *digest, int dlen,
-                                 DSA *dsa);
+    DSA *dsa);
 static int capi_dsa_free(DSA *dsa);
-# endif
+#endif
 
 static int capi_load_ssl_client_cert(ENGINE *e, SSL *ssl,
-                                     STACK_OF(X509_NAME) *ca_dn, X509 **pcert,
-                                     EVP_PKEY **pkey, STACK_OF(X509) **pother,
-                                     UI_METHOD *ui_method,
-                                     void *callback_data);
+    STACK_OF(X509_NAME) *ca_dn, X509 **pcert,
+    EVP_PKEY **pkey, STACK_OF(X509) **pother,
+    UI_METHOD *ui_method,
+    void *callback_data);
 
 static int cert_select_simple(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs);
-# ifdef OPENSSL_CAPIENG_DIALOG
+#ifdef OPENSSL_CAPIENG_DIALOG
 static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs);
-# endif
+#endif
 
 void engine_load_capi_int(void);
 
 typedef PCCERT_CONTEXT(WINAPI *CERTDLG)(HCERTSTORE, HWND, LPCWSTR,
-                                        LPCWSTR, DWORD, DWORD, void *);
+    LPCWSTR, DWORD, DWORD, void *);
 typedef HWND(WINAPI *GETCONSWIN)(void);
 
 /*
@@ -162,8 +162,8 @@ typedef HWND(WINAPI *GETCONSWIN)(void);
  * global options and affects how other functions behave.
  */
 
-# define CAPI_DBG_TRACE  2
-# define CAPI_DBG_ERROR  1
+#define CAPI_DBG_TRACE 2
+#define CAPI_DBG_ERROR 1
 
 struct CAPI_CTX_st {
     int debug_level;
@@ -178,19 +178,19 @@ struct CAPI_CTX_st {
     /* System store flags */
     DWORD store_flags;
 /* Lookup string meanings in load_private_key */
-# define CAPI_LU_SUBSTR          1  /* Substring of subject: uses "storename" */
-# define CAPI_LU_FNAME           2  /* Friendly name: uses storename */
-# define CAPI_LU_CONTNAME        3  /* Container name: uses cspname, keytype */
+#define CAPI_LU_SUBSTR 1 /* Substring of subject: uses "storename" */
+#define CAPI_LU_FNAME 2 /* Friendly name: uses storename */
+#define CAPI_LU_CONTNAME 3 /* Container name: uses cspname, keytype */
     int lookup_method;
 /* Info to dump with dumpcerts option */
-# define CAPI_DMP_SUMMARY        0x1    /* Issuer and serial name strings */
-# define CAPI_DMP_FNAME          0x2    /* Friendly name */
-# define CAPI_DMP_FULL           0x4    /* Full X509_print dump */
-# define CAPI_DMP_PEM            0x8    /* Dump PEM format certificate */
-# define CAPI_DMP_PSKEY          0x10   /* Dump pseudo key (if possible) */
-# define CAPI_DMP_PKEYINFO       0x20   /* Dump key info (if possible) */
+#define CAPI_DMP_SUMMARY 0x1 /* Issuer and serial name strings */
+#define CAPI_DMP_FNAME 0x2 /* Friendly name */
+#define CAPI_DMP_FULL 0x4 /* Full X509_print dump */
+#define CAPI_DMP_PEM 0x8 /* Dump PEM format certificate */
+#define CAPI_DMP_PSKEY 0x10 /* Dump pseudo key (if possible) */
+#define CAPI_DMP_PKEYINFO 0x20 /* Dump key info (if possible) */
     DWORD dump_flags;
-    int (*client_cert_select) (ENGINE *e, SSL *ssl, STACK_OF(X509) *certs);
+    int (*client_cert_select)(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs);
     CERTDLG certselectdlg;
     GETCONSWIN getconswindow;
 };
@@ -198,84 +198,84 @@ struct CAPI_CTX_st {
 static CAPI_CTX *capi_ctx_new(void);
 static void capi_ctx_free(CAPI_CTX *ctx);
 static int capi_ctx_set_provname(CAPI_CTX *ctx, LPSTR pname, DWORD type,
-                                 int check);
+    int check);
 static int capi_ctx_set_provname_idx(CAPI_CTX *ctx, int idx);
 
-# define CAPI_CMD_LIST_CERTS             ENGINE_CMD_BASE
-# define CAPI_CMD_LOOKUP_CERT            (ENGINE_CMD_BASE + 1)
-# define CAPI_CMD_DEBUG_LEVEL            (ENGINE_CMD_BASE + 2)
-# define CAPI_CMD_DEBUG_FILE             (ENGINE_CMD_BASE + 3)
-# define CAPI_CMD_KEYTYPE                (ENGINE_CMD_BASE + 4)
-# define CAPI_CMD_LIST_CSPS              (ENGINE_CMD_BASE + 5)
-# define CAPI_CMD_SET_CSP_IDX            (ENGINE_CMD_BASE + 6)
-# define CAPI_CMD_SET_CSP_NAME           (ENGINE_CMD_BASE + 7)
-# define CAPI_CMD_SET_CSP_TYPE           (ENGINE_CMD_BASE + 8)
-# define CAPI_CMD_LIST_CONTAINERS        (ENGINE_CMD_BASE + 9)
-# define CAPI_CMD_LIST_OPTIONS           (ENGINE_CMD_BASE + 10)
-# define CAPI_CMD_LOOKUP_METHOD          (ENGINE_CMD_BASE + 11)
-# define CAPI_CMD_STORE_NAME             (ENGINE_CMD_BASE + 12)
-# define CAPI_CMD_STORE_FLAGS            (ENGINE_CMD_BASE + 13)
+#define CAPI_CMD_LIST_CERTS ENGINE_CMD_BASE
+#define CAPI_CMD_LOOKUP_CERT (ENGINE_CMD_BASE + 1)
+#define CAPI_CMD_DEBUG_LEVEL (ENGINE_CMD_BASE + 2)
+#define CAPI_CMD_DEBUG_FILE (ENGINE_CMD_BASE + 3)
+#define CAPI_CMD_KEYTYPE (ENGINE_CMD_BASE + 4)
+#define CAPI_CMD_LIST_CSPS (ENGINE_CMD_BASE + 5)
+#define CAPI_CMD_SET_CSP_IDX (ENGINE_CMD_BASE + 6)
+#define CAPI_CMD_SET_CSP_NAME (ENGINE_CMD_BASE + 7)
+#define CAPI_CMD_SET_CSP_TYPE (ENGINE_CMD_BASE + 8)
+#define CAPI_CMD_LIST_CONTAINERS (ENGINE_CMD_BASE + 9)
+#define CAPI_CMD_LIST_OPTIONS (ENGINE_CMD_BASE + 10)
+#define CAPI_CMD_LOOKUP_METHOD (ENGINE_CMD_BASE + 11)
+#define CAPI_CMD_STORE_NAME (ENGINE_CMD_BASE + 12)
+#define CAPI_CMD_STORE_FLAGS (ENGINE_CMD_BASE + 13)
 
 static const ENGINE_CMD_DEFN capi_cmd_defns[] = {
-    {CAPI_CMD_LIST_CERTS,
-     "list_certs",
-     "List all certificates in store",
-     ENGINE_CMD_FLAG_NO_INPUT},
-    {CAPI_CMD_LOOKUP_CERT,
-     "lookup_cert",
-     "Lookup and output certificates",
-     ENGINE_CMD_FLAG_STRING},
-    {CAPI_CMD_DEBUG_LEVEL,
-     "debug_level",
-     "debug level (1=errors, 2=trace)",
-     ENGINE_CMD_FLAG_NUMERIC},
-    {CAPI_CMD_DEBUG_FILE,
-     "debug_file",
-     "debugging filename)",
-     ENGINE_CMD_FLAG_STRING},
-    {CAPI_CMD_KEYTYPE,
-     "key_type",
-     "Key type: 1=AT_KEYEXCHANGE (default), 2=AT_SIGNATURE",
-     ENGINE_CMD_FLAG_NUMERIC},
-    {CAPI_CMD_LIST_CSPS,
-     "list_csps",
-     "List all CSPs",
-     ENGINE_CMD_FLAG_NO_INPUT},
-    {CAPI_CMD_SET_CSP_IDX,
-     "csp_idx",
-     "Set CSP by index",
-     ENGINE_CMD_FLAG_NUMERIC},
-    {CAPI_CMD_SET_CSP_NAME,
-     "csp_name",
-     "Set CSP name, (default CSP used if not specified)",
-     ENGINE_CMD_FLAG_STRING},
-    {CAPI_CMD_SET_CSP_TYPE,
-     "csp_type",
-     "Set CSP type, (default RSA_PROV_FULL)",
-     ENGINE_CMD_FLAG_NUMERIC},
-    {CAPI_CMD_LIST_CONTAINERS,
-     "list_containers",
-     "list container names",
-     ENGINE_CMD_FLAG_NO_INPUT},
-    {CAPI_CMD_LIST_OPTIONS,
-     "list_options",
-     "Set list options (1=summary,2=friendly name, 4=full printout, 8=PEM output, 16=XXX, "
-     "32=private key info)",
-     ENGINE_CMD_FLAG_NUMERIC},
-    {CAPI_CMD_LOOKUP_METHOD,
-     "lookup_method",
-     "Set key lookup method (1=substring, 2=friendlyname, 3=container name)",
-     ENGINE_CMD_FLAG_NUMERIC},
-    {CAPI_CMD_STORE_NAME,
-     "store_name",
-     "certificate store name, default \"MY\"",
-     ENGINE_CMD_FLAG_STRING},
-    {CAPI_CMD_STORE_FLAGS,
-     "store_flags",
-     "Certificate store flags: 1 = system store",
-     ENGINE_CMD_FLAG_NUMERIC},
-
-    {0, NULL, NULL, 0}
+    { CAPI_CMD_LIST_CERTS,
+        "list_certs",
+        "List all certificates in store",
+        ENGINE_CMD_FLAG_NO_INPUT },
+    { CAPI_CMD_LOOKUP_CERT,
+        "lookup_cert",
+        "Lookup and output certificates",
+        ENGINE_CMD_FLAG_STRING },
+    { CAPI_CMD_DEBUG_LEVEL,
+        "debug_level",
+        "debug level (1=errors, 2=trace)",
+        ENGINE_CMD_FLAG_NUMERIC },
+    { CAPI_CMD_DEBUG_FILE,
+        "debug_file",
+        "debugging filename)",
+        ENGINE_CMD_FLAG_STRING },
+    { CAPI_CMD_KEYTYPE,
+        "key_type",
+        "Key type: 1=AT_KEYEXCHANGE (default), 2=AT_SIGNATURE",
+        ENGINE_CMD_FLAG_NUMERIC },
+    { CAPI_CMD_LIST_CSPS,
+        "list_csps",
+        "List all CSPs",
+        ENGINE_CMD_FLAG_NO_INPUT },
+    { CAPI_CMD_SET_CSP_IDX,
+        "csp_idx",
+        "Set CSP by index",
+        ENGINE_CMD_FLAG_NUMERIC },
+    { CAPI_CMD_SET_CSP_NAME,
+        "csp_name",
+        "Set CSP name, (default CSP used if not specified)",
+        ENGINE_CMD_FLAG_STRING },
+    { CAPI_CMD_SET_CSP_TYPE,
+        "csp_type",
+        "Set CSP type, (default RSA_PROV_FULL)",
+        ENGINE_CMD_FLAG_NUMERIC },
+    { CAPI_CMD_LIST_CONTAINERS,
+        "list_containers",
+        "list container names",
+        ENGINE_CMD_FLAG_NO_INPUT },
+    { CAPI_CMD_LIST_OPTIONS,
+        "list_options",
+        "Set list options (1=summary,2=friendly name, 4=full printout, 8=PEM output, 16=XXX, "
+        "32=private key info)",
+        ENGINE_CMD_FLAG_NUMERIC },
+    { CAPI_CMD_LOOKUP_METHOD,
+        "lookup_method",
+        "Set key lookup method (1=substring, 2=friendlyname, 3=container name)",
+        ENGINE_CMD_FLAG_NUMERIC },
+    { CAPI_CMD_STORE_NAME,
+        "store_name",
+        "certificate store name, default \"MY\"",
+        ENGINE_CMD_FLAG_STRING },
+    { CAPI_CMD_STORE_FLAGS,
+        "store_flags",
+        "Certificate store flags: 1 = system store",
+        ENGINE_CMD_FLAG_NUMERIC },
+
+    { 0, NULL, NULL, 0 }
 };
 
 static int capi_idx = -1;
@@ -283,7 +283,7 @@ static int rsa_capi_idx = -1;
 static int dsa_capi_idx = -1;
 static int cert_capi_idx = -1;
 
-static int capi_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
+static int capi_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 {
     int ret = 1;
     CAPI_CTX *ctx;
@@ -390,27 +390,24 @@ static int capi_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
 
     BIO_free(out);
     return ret;
-
 }
 
 static RSA_METHOD *capi_rsa_method = NULL;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
 static DSA_METHOD *capi_dsa_method = NULL;
-# endif
+#endif
 
 static int use_aes_csp = 0;
-static const WCHAR rsa_aes_cspname[] =
-    L"Microsoft Enhanced RSA and AES Cryptographic Provider";
-static const WCHAR rsa_enh_cspname[] =
-    L"Microsoft Enhanced Cryptographic Provider v1.0";
+static const WCHAR rsa_aes_cspname[] = L"Microsoft Enhanced RSA and AES Cryptographic Provider";
+static const WCHAR rsa_enh_cspname[] = L"Microsoft Enhanced Cryptographic Provider v1.0";
 
 static int capi_init(ENGINE *e)
 {
     CAPI_CTX *ctx;
     const RSA_METHOD *ossl_rsa_meth;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
     const DSA_METHOD *ossl_dsa_meth;
-# endif
+#endif
     HCRYPTPROV hprov;
 
     if (capi_idx < 0) {
@@ -426,37 +423,37 @@ static int capi_init(ENGINE *e)
         rsa_capi_idx = RSA_get_ex_new_index(0, NULL, NULL, NULL, 0);
         ossl_rsa_meth = RSA_PKCS1_OpenSSL();
         if (!RSA_meth_set_pub_enc(capi_rsa_method,
-                                     RSA_meth_get_pub_enc(ossl_rsa_meth))
+                RSA_meth_get_pub_enc(ossl_rsa_meth))
             || !RSA_meth_set_pub_dec(capi_rsa_method,
-                                     RSA_meth_get_pub_dec(ossl_rsa_meth))
+                RSA_meth_get_pub_dec(ossl_rsa_meth))
             || !RSA_meth_set_priv_enc(capi_rsa_method, capi_rsa_priv_enc)
             || !RSA_meth_set_priv_dec(capi_rsa_method, capi_rsa_priv_dec)
             || !RSA_meth_set_mod_exp(capi_rsa_method,
-                                     RSA_meth_get_mod_exp(ossl_rsa_meth))
+                RSA_meth_get_mod_exp(ossl_rsa_meth))
             || !RSA_meth_set_bn_mod_exp(capi_rsa_method,
-                                        RSA_meth_get_bn_mod_exp(ossl_rsa_meth))
+                RSA_meth_get_bn_mod_exp(ossl_rsa_meth))
             || !RSA_meth_set_finish(capi_rsa_method, capi_rsa_free)
             || !RSA_meth_set_sign(capi_rsa_method, capi_rsa_sign)) {
             CAPIerr(CAPI_F_CAPI_INIT, ERR_R_RSA_LIB);
             goto err;
         }
 
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
         /* Setup DSA Method */
         dsa_capi_idx = DSA_get_ex_new_index(0, NULL, NULL, NULL, 0);
         ossl_dsa_meth = DSA_OpenSSL();
         if (!DSA_meth_set_sign(capi_dsa_method, capi_dsa_do_sign)
             || !DSA_meth_set_verify(capi_dsa_method,
-                                    DSA_meth_get_verify(ossl_dsa_meth))
+                DSA_meth_get_verify(ossl_dsa_meth))
             || !DSA_meth_set_finish(capi_dsa_method, capi_dsa_free)
             || !DSA_meth_set_mod_exp(capi_dsa_method,
-                                     DSA_meth_get_mod_exp(ossl_dsa_meth))
+                DSA_meth_get_mod_exp(ossl_dsa_meth))
             || !DSA_meth_set_bn_mod_exp(capi_dsa_method,
-                                    DSA_meth_get_bn_mod_exp(ossl_dsa_meth))) {
+                DSA_meth_get_bn_mod_exp(ossl_dsa_meth))) {
             CAPIerr(CAPI_F_CAPI_INIT, ERR_R_DSA_LIB);
             goto err;
         }
-# endif
+#endif
     }
 
     ctx = capi_ctx_new();
@@ -467,32 +464,30 @@ static int capi_init(ENGINE *e)
 
     ENGINE_set_ex_data(e, capi_idx, ctx);
 
-# ifdef OPENSSL_CAPIENG_DIALOG
+#ifdef OPENSSL_CAPIENG_DIALOG
     {
         HMODULE cryptui = LoadLibrary(TEXT("CRYPTUI.DLL"));
         HMODULE kernel = GetModuleHandle(TEXT("KERNEL32.DLL"));
         if (cryptui)
-            ctx->certselectdlg =
-                (CERTDLG) GetProcAddress(cryptui,
-                                         "CryptUIDlgSelectCertificateFromStore");
+            ctx->certselectdlg = (CERTDLG)GetProcAddress(cryptui,
+                "CryptUIDlgSelectCertificateFromStore");
         if (kernel)
-            ctx->getconswindow =
-                (GETCONSWIN) GetProcAddress(kernel, "GetConsoleWindow");
+            ctx->getconswindow = (GETCONSWIN)GetProcAddress(kernel, "GetConsoleWindow");
         if (cryptui && !OPENSSL_isservice())
             ctx->client_cert_select = cert_select_dialog;
     }
-# endif
+#endif
 
     /* See if there is RSA+AES CSP */
     if (CryptAcquireContextW(&hprov, NULL, rsa_aes_cspname, PROV_RSA_AES,
-                             CRYPT_VERIFYCONTEXT)) {
+            CRYPT_VERIFYCONTEXT)) {
         use_aes_csp = 1;
         CryptReleaseContext(hprov, 0);
     }
 
     return 1;
 
- err:
+err:
     return 0;
 }
 
@@ -500,10 +495,10 @@ static int capi_destroy(ENGINE *e)
 {
     RSA_meth_free(capi_rsa_method);
     capi_rsa_method = NULL;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
     DSA_meth_free(capi_dsa_method);
     capi_dsa_method = NULL;
-# endif
+#endif
     ERR_unload_CAPI_strings();
     return 1;
 }
@@ -536,11 +531,11 @@ static int bind_capi(ENGINE *e)
     capi_rsa_method = RSA_meth_new("CryptoAPI RSA method", 0);
     if (capi_rsa_method == NULL)
         return 0;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
     capi_dsa_method = DSA_meth_new("CryptoAPI DSA method", 0);
     if (capi_dsa_method == NULL)
         goto memerr;
-# endif
+#endif
     if (!ENGINE_set_id(e, engine_capi_id)
         || !ENGINE_set_name(e, engine_capi_name)
         || !ENGINE_set_flags(e, ENGINE_FLAGS_NO_REGISTER_ALL)
@@ -548,29 +543,29 @@ static int bind_capi(ENGINE *e)
         || !ENGINE_set_finish_function(e, capi_finish)
         || !ENGINE_set_destroy_function(e, capi_destroy)
         || !ENGINE_set_RSA(e, capi_rsa_method)
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
         || !ENGINE_set_DSA(e, capi_dsa_method)
-# endif
+#endif
         || !ENGINE_set_load_privkey_function(e, capi_load_privkey)
         || !ENGINE_set_load_ssl_client_cert_function(e,
-                                                     capi_load_ssl_client_cert)
+            capi_load_ssl_client_cert)
         || !ENGINE_set_cmd_defns(e, capi_cmd_defns)
         || !ENGINE_set_ctrl_function(e, capi_ctrl))
         goto memerr;
     ERR_load_CAPI_strings();
 
     return 1;
- memerr:
+memerr:
     RSA_meth_free(capi_rsa_method);
     capi_rsa_method = NULL;
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
     DSA_meth_free(capi_dsa_method);
     capi_dsa_method = NULL;
-# endif
+#endif
     return 0;
 }
 
-# ifndef OPENSSL_NO_DYNAMIC_ENGINE
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_helper(ENGINE *e, const char *id)
 {
     if (id && (strcmp(id, engine_capi_id) != 0))
@@ -582,7 +577,7 @@ static int bind_helper(ENGINE *e, const char *id)
 
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
-# else
+#else
 static ENGINE *engine_capi(void)
 {
     ENGINE *ret = ENGINE_new();
@@ -615,7 +610,7 @@ void engine_load_capi_int(void)
      */
     ERR_pop_to_mark();
 }
-# endif
+#endif
 
 static int lend_tobn(BIGNUM *bn, unsigned char *bin, int binlen)
 {
@@ -664,7 +659,7 @@ static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY *key)
         goto err;
     }
 
-    bh = (BLOBHEADER *) pubkey;
+    bh = (BLOBHEADER *)pubkey;
     if (bh->bType != PUBLICKEYBLOB) {
         CAPIerr(CAPI_F_CAPI_GET_PKEY, CAPI_R_INVALID_PUBLIC_KEY_BLOB);
         goto err;
@@ -674,12 +669,12 @@ static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY *key)
         DWORD rsa_modlen;
         BIGNUM *e = NULL, *n = NULL;
         unsigned char *rsa_modulus;
-        rp = (RSAPUBKEY *) (bh + 1);
+        rp = (RSAPUBKEY *)(bh + 1);
         if (rp->magic != 0x31415352) {
             char magstr[10];
             BIO_snprintf(magstr, 10, "%lx", rp->magic);
             CAPIerr(CAPI_F_CAPI_GET_PKEY,
-                    CAPI_R_INVALID_RSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER);
+                CAPI_R_INVALID_RSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER);
             ERR_add_error_data(2, "magic=0x", magstr);
             goto err;
         }
@@ -723,18 +718,18 @@ static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY *key)
         EVP_PKEY_assign_RSA(ret, rkey);
         rkey = NULL;
 
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
     } else if (bh->aiKeyAlg == CALG_DSS_SIGN) {
         DSSPUBKEY *dp;
         DWORD dsa_plen;
         unsigned char *btmp;
         BIGNUM *p, *q, *g, *pub_key;
-        dp = (DSSPUBKEY *) (bh + 1);
+        dp = (DSSPUBKEY *)(bh + 1);
         if (dp->magic != 0x31535344) {
             char magstr[10];
             BIO_snprintf(magstr, 10, "%lx", dp->magic);
             CAPIerr(CAPI_F_CAPI_GET_PKEY,
-                    CAPI_R_INVALID_DSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER);
+                CAPI_R_INVALID_DSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER);
             ERR_add_error_data(2, "magic=0x", magstr);
             goto err;
         }
@@ -789,30 +784,30 @@ static EVP_PKEY *capi_get_pkey(ENGINE *eng, CAPI_KEY *key)
 
         EVP_PKEY_assign_DSA(ret, dkey);
         dkey = NULL;
-# endif
+#endif
     } else {
         char algstr[10];
         BIO_snprintf(algstr, 10, "%ux", bh->aiKeyAlg);
         CAPIerr(CAPI_F_CAPI_GET_PKEY,
-                CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM);
+            CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM);
         ERR_add_error_data(2, "aiKeyAlg=0x", algstr);
         goto err;
     }
 
- err:
+err:
     OPENSSL_free(pubkey);
     if (!ret) {
         RSA_free(rkey);
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
         DSA_free(dkey);
-# endif
+#endif
     }
 
     return ret;
 }
 
 static EVP_PKEY *capi_load_privkey(ENGINE *eng, const char *key_id,
-                                   UI_METHOD *ui_method, void *callback_data)
+    UI_METHOD *ui_method, void *callback_data)
 {
     CAPI_CTX *ctx;
     CAPI_KEY *key;
@@ -834,20 +829,19 @@ static EVP_PKEY *capi_load_privkey(ENGINE *eng, const char *key_id,
     if (!ret)
         capi_free_key(key);
     return ret;
-
 }
 
 /* CryptoAPI RSA operations */
 
 int capi_rsa_priv_enc(int flen, const unsigned char *from,
-                      unsigned char *to, RSA *rsa, int padding)
+    unsigned char *to, RSA *rsa, int padding)
 {
     CAPIerr(CAPI_F_CAPI_RSA_PRIV_ENC, CAPI_R_FUNCTION_NOT_SUPPORTED);
     return -1;
 }
 
 int capi_rsa_sign(int dtype, const unsigned char *m, unsigned int m_len,
-                  unsigned char *sigret, unsigned int *siglen, const RSA *rsa)
+    unsigned char *sigret, unsigned int *siglen, const RSA *rsa)
 {
     ALG_ID alg;
     HCRYPTHASH hash;
@@ -891,14 +885,13 @@ int capi_rsa_sign(int dtype, const unsigned char *m, unsigned int m_len,
     case NID_md5_sha1:
         alg = CALG_SSL3_SHAMD5;
         break;
-    default:
-        {
-            char algstr[10];
-            BIO_snprintf(algstr, 10, "%x", dtype);
-            CAPIerr(CAPI_F_CAPI_RSA_SIGN, CAPI_R_UNSUPPORTED_ALGORITHM_NID);
-            ERR_add_error_data(2, "NID=0x", algstr);
-            return -1;
-        }
+    default: {
+        char algstr[10];
+        BIO_snprintf(algstr, 10, "%x", dtype);
+        CAPIerr(CAPI_F_CAPI_RSA_SIGN, CAPI_R_UNSUPPORTED_ALGORITHM_NID);
+        ERR_add_error_data(2, "NID=0x", algstr);
+        return -1;
+    }
     }
 
     /* Create the hash object */
@@ -935,14 +928,14 @@ int capi_rsa_sign(int dtype, const unsigned char *m, unsigned int m_len,
 
     /* Now cleanup */
 
- err:
+err:
     CryptDestroyHash(hash);
 
     return ret;
 }
 
 int capi_rsa_priv_dec(int flen, const unsigned char *from,
-                      unsigned char *to, RSA *rsa, int padding)
+    unsigned char *to, RSA *rsa, int padding)
 {
     int i;
     unsigned char *tmpbuf;
@@ -973,14 +966,13 @@ int capi_rsa_priv_dec(int flen, const unsigned char *from,
         flags = CRYPT_DECRYPT_RSA_NO_PADDING_CHECK;
         break;
 #endif
-    default:
-        {
-            char errstr[10];
-            BIO_snprintf(errstr, 10, "%d", padding);
-            CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, CAPI_R_UNSUPPORTED_PADDING);
-            ERR_add_error_data(2, "padding=", errstr);
-            return -1;
-        }
+    default: {
+        char errstr[10];
+        BIO_snprintf(errstr, 10, "%d", padding);
+        CAPIerr(CAPI_F_CAPI_RSA_PRIV_DEC, CAPI_R_UNSUPPORTED_PADDING);
+        ERR_add_error_data(2, "padding=", errstr);
+        return -1;
+    }
     }
 
     /* Create temp reverse order version of input */
@@ -1015,11 +1007,11 @@ static int capi_rsa_free(RSA *rsa)
     return 1;
 }
 
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
 /* CryptoAPI DSA operations */
 
 static DSA_SIG *capi_dsa_do_sign(const unsigned char *digest, int dlen,
-                                 DSA *dsa)
+    DSA *dsa)
 {
     HCRYPTHASH hash;
     DWORD slen;
@@ -1080,7 +1072,7 @@ static DSA_SIG *capi_dsa_do_sign(const unsigned char *digest, int dlen,
 
     /* Now cleanup */
 
- err:
+err:
     OPENSSL_cleanse(csigbuf, 40);
     CryptDestroyHash(hash);
     return ret;
@@ -1094,10 +1086,10 @@ static int capi_dsa_free(DSA *dsa)
     DSA_set_ex_data(dsa, dsa_capi_idx, 0);
     return 1;
 }
-# endif
+#endif
 
 static void capi_vtrace(CAPI_CTX *ctx, int level, char *format,
-                        va_list argptr)
+    va_list argptr)
 {
     BIO *out;
 
@@ -1144,8 +1136,8 @@ static char *wide_to_asc(LPCWSTR wstr)
     len_1 = wcslen(wstr) + 1;
 
     if (len_1 > INT_MAX) {
-	    CAPIerr(CAPI_F_WIDE_TO_ASC, CAPI_R_FUNCTION_NOT_SUPPORTED);
-	    return NULL;
+        CAPIerr(CAPI_F_WIDE_TO_ASC, CAPI_R_FUNCTION_NOT_SUPPORTED);
+        return NULL;
     }
 
     len_0 = (int)len_1; /* WideCharToMultiByte expects int */
@@ -1166,7 +1158,7 @@ static char *wide_to_asc(LPCWSTR wstr)
 }
 
 static int capi_get_provname(CAPI_CTX *ctx, LPSTR *pname, DWORD *ptype,
-                             DWORD idx)
+    DWORD idx)
 {
     DWORD len, err;
     LPTSTR name;
@@ -1200,7 +1192,7 @@ static int capi_get_provname(CAPI_CTX *ctx, LPSTR *pname, DWORD *ptype,
         *pname = (char *)name;
     }
     CAPI_trace(ctx, "capi_get_provname, returned name=%s, type=%d\n", *pname,
-               *ptype);
+        *ptype);
 
     return 1;
 }
@@ -1233,13 +1225,13 @@ static int capi_list_containers(CAPI_CTX *ctx, BIO *out)
     LPWSTR cspname = NULL;
 
     CAPI_trace(ctx, "Listing containers CSP=%s, type = %d\n", ctx->cspname,
-               ctx->csptype);
+        ctx->csptype);
     if (ctx->cspname != NULL) {
         if ((clen = MultiByteToWideChar(CP_ACP, 0, ctx->cspname, -1,
-                                        NULL, 0))) {
+                 NULL, 0))) {
             cspname = alloca(clen * sizeof(WCHAR));
             MultiByteToWideChar(CP_ACP, 0, ctx->cspname, -1, (WCHAR *)cspname,
-                                clen);
+                clen);
         }
         if (cspname == NULL) {
             CAPIerr(CAPI_F_CAPI_LIST_CONTAINERS, ERR_R_MALLOC_FAILURE);
@@ -1248,14 +1240,14 @@ static int capi_list_containers(CAPI_CTX *ctx, BIO *out)
         }
     }
     if (!CryptAcquireContextW(&hprov, NULL, cspname, ctx->csptype,
-                              CRYPT_VERIFYCONTEXT)) {
+            CRYPT_VERIFYCONTEXT)) {
         CAPIerr(CAPI_F_CAPI_LIST_CONTAINERS,
-                CAPI_R_CRYPTACQUIRECONTEXT_ERROR);
+            CAPI_R_CRYPTACQUIRECONTEXT_ERROR);
         capi_addlasterror();
         return 0;
     }
     if (!CryptGetProvParam(hprov, PP_ENUMCONTAINERS, NULL, &buflen,
-                           CRYPT_FIRST)) {
+            CRYPT_FIRST)) {
         CAPIerr(CAPI_F_CAPI_LIST_CONTAINERS, CAPI_R_ENUMCONTAINERS_ERROR);
         capi_addlasterror();
         CryptReleaseContext(hprov, 0);
@@ -1277,7 +1269,7 @@ static int capi_list_containers(CAPI_CTX *ctx, BIO *out)
         else
             flags = 0;
         if (!CryptGetProvParam(hprov, PP_ENUMCONTAINERS, (BYTE *)cname,
-                               &clen, flags)) {
+                &clen, flags)) {
             err = GetLastError();
             if (err == ERROR_NO_MORE_ITEMS)
                 goto done;
@@ -1286,18 +1278,18 @@ static int capi_list_containers(CAPI_CTX *ctx, BIO *out)
             goto err;
         }
         CAPI_trace(ctx, "Container name %s, len=%d, index=%d, flags=%d\n",
-                   cname, clen, idx, flags);
+            cname, clen, idx, flags);
         if (!cname[0] && (clen == buflen)) {
             CAPI_trace(ctx, "Enumerate bug: using workaround\n");
             goto done;
         }
         BIO_printf(out, "%lu. %s\n", idx, cname);
     }
- err:
+err:
 
     ret = 0;
 
- done:
+done:
     OPENSSL_free(cname);
     CryptReleaseContext(hprov, 0);
 
@@ -1305,21 +1297,21 @@ static int capi_list_containers(CAPI_CTX *ctx, BIO *out)
 }
 
 static CRYPT_KEY_PROV_INFO *capi_get_prov_info(CAPI_CTX *ctx,
-                                               PCCERT_CONTEXT cert)
+    PCCERT_CONTEXT cert)
 {
     DWORD len;
     CRYPT_KEY_PROV_INFO *pinfo;
 
     if (!CertGetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID,
-                                           NULL, &len))
+            NULL, &len))
         return NULL;
     pinfo = OPENSSL_malloc(len);
     if (pinfo == NULL)
         return NULL;
     if (!CertGetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID,
-                                           pinfo, &len)) {
+            pinfo, &len)) {
         CAPIerr(CAPI_F_CAPI_GET_PROV_INFO,
-                CAPI_R_ERROR_GETTING_KEY_PROVIDER_INFO);
+            CAPI_R_ERROR_GETTING_KEY_PROVIDER_INFO);
         capi_addlasterror();
         OPENSSL_free(pinfo);
         return NULL;
@@ -1328,7 +1320,7 @@ static CRYPT_KEY_PROV_INFO *capi_get_prov_info(CAPI_CTX *ctx,
 }
 
 static void capi_dump_prov_info(CAPI_CTX *ctx, BIO *out,
-                                CRYPT_KEY_PROV_INFO *pinfo)
+    CRYPT_KEY_PROV_INFO *pinfo)
 {
     char *provname = NULL, *contname = NULL;
 
@@ -1343,10 +1335,10 @@ static void capi_dump_prov_info(CAPI_CTX *ctx, BIO *out,
 
     BIO_printf(out, "  Private Key Info:\n");
     BIO_printf(out, "    Provider Name:  %s, Provider Type %lu\n", provname,
-               pinfo->dwProvType);
+        pinfo->dwProvType);
     BIO_printf(out, "    Container Name: %s, Key Type %lu\n", contname,
-               pinfo->dwKeySpec);
- err:
+        pinfo->dwKeySpec);
+err:
     OPENSSL_free(provname);
     OPENSSL_free(contname);
 }
@@ -1358,13 +1350,13 @@ static char *capi_cert_get_fname(CAPI_CTX *ctx, PCCERT_CONTEXT cert)
 
     CAPI_trace(ctx, "capi_cert_get_fname\n");
     if (!CertGetCertificateContextProperty(cert, CERT_FRIENDLY_NAME_PROP_ID,
-                                           NULL, &dlen))
+            NULL, &dlen))
         return NULL;
     wfname = OPENSSL_malloc(dlen);
     if (wfname == NULL)
         return NULL;
     if (CertGetCertificateContextProperty(cert, CERT_FRIENDLY_NAME_PROP_ID,
-                                          wfname, &dlen)) {
+            wfname, &dlen)) {
         char *fname = wide_to_asc(wfname);
         OPENSSL_free(wfname);
         return fname;
@@ -1429,7 +1421,7 @@ static HCERTSTORE capi_open_store(CAPI_CTX *ctx, char *storename)
     CAPI_trace(ctx, "Opening certificate store %s\n", storename);
 
     hstore = CertOpenStore(CERT_STORE_PROV_SYSTEM_A, 0, 0,
-                           ctx->store_flags, storename);
+        ctx->store_flags, storename);
     if (!hstore) {
         CAPIerr(CAPI_F_CAPI_OPEN_STORE, CAPI_R_ERROR_OPENING_STORE);
         capi_addlasterror();
@@ -1470,13 +1462,13 @@ int capi_list_certs(CAPI_CTX *ctx, BIO *out, char *id)
             capi_dump_cert(ctx, out, cert);
         }
     }
- err:
+err:
     CertCloseStore(hstore, 0);
     return ret;
 }
 
 static PCCERT_CONTEXT capi_find_cert(CAPI_CTX *ctx, const char *id,
-                                     HCERTSTORE hstore)
+    HCERTSTORE hstore)
 {
     PCCERT_CONTEXT cert = NULL;
     char *fname = NULL;
@@ -1484,7 +1476,7 @@ static PCCERT_CONTEXT capi_find_cert(CAPI_CTX *ctx, const char *id,
     switch (ctx->lookup_method) {
     case CAPI_LU_SUBSTR:
         return CertFindCertificateInStore(hstore, X509_ASN_ENCODING, 0,
-                                          CERT_FIND_SUBJECT_STR_A, id, NULL);
+            CERT_FIND_SUBJECT_STR_A, id, NULL);
     case CAPI_LU_FNAME:
         for (;;) {
             cert = CertEnumCertificatesInStore(hstore, cert);
@@ -1507,8 +1499,8 @@ static PCCERT_CONTEXT capi_find_cert(CAPI_CTX *ctx, const char *id,
 }
 
 static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const WCHAR *contname,
-                              const WCHAR *provname, DWORD ptype,
-                              DWORD keyspec)
+    const WCHAR *provname, DWORD ptype,
+    DWORD keyspec)
 {
     DWORD dwFlags = 0;
     CAPI_KEY *key = OPENSSL_malloc(sizeof(*key));
@@ -1516,8 +1508,7 @@ static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const WCHAR *contname,
     if (key == NULL)
         return NULL;
     /* If PROV_RSA_AES supported use it instead */
-    if (ptype == PROV_RSA_FULL && use_aes_csp &&
-        wcscmp(provname, rsa_enh_cspname) == 0) {
+    if (ptype == PROV_RSA_FULL && use_aes_csp && wcscmp(provname, rsa_enh_cspname) == 0) {
         provname = rsa_aes_cspname;
         ptype = PROV_RSA_AES;
     }
@@ -1530,14 +1521,14 @@ static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const WCHAR *contname,
         char *_provname = wide_to_asc(provname);
 
         CAPI_trace(ctx, "capi_get_key, contname=%s, provname=%s, type=%d\n",
-                   _contname, _provname, ptype);
+            _contname, _provname, ptype);
         OPENSSL_free(_provname);
         OPENSSL_free(_contname);
     }
     if (ctx->store_flags & CERT_SYSTEM_STORE_LOCAL_MACHINE)
         dwFlags = CRYPT_MACHINE_KEYSET;
     if (!CryptAcquireContextW(&key->hprov, contname, provname, ptype,
-                              dwFlags)) {
+            dwFlags)) {
         CAPIerr(CAPI_F_CAPI_GET_KEY, CAPI_R_CRYPTACQUIRECONTEXT_ERROR);
         capi_addlasterror();
         goto err;
@@ -1552,7 +1543,7 @@ static CAPI_KEY *capi_get_key(CAPI_CTX *ctx, const WCHAR *contname,
     key->pcert = NULL;
     return key;
 
- err:
+err:
     OPENSSL_free(key);
     return NULL;
 }
@@ -1566,7 +1557,7 @@ static CAPI_KEY *capi_get_cert_key(CAPI_CTX *ctx, PCCERT_CONTEXT cert)
 
     if (pinfo != NULL)
         key = capi_get_key(ctx, pinfo->pwszContainerName, pinfo->pwszProvName,
-                           pinfo->dwProvType, pinfo->dwKeySpec);
+            pinfo->dwProvType, pinfo->dwKeySpec);
 
     OPENSSL_free(pinfo);
     return key;
@@ -1592,23 +1583,14 @@ CAPI_KEY *capi_find_key(CAPI_CTX *ctx, const char *id)
         CertCloseStore(hstore, 0);
         break;
 
-    case CAPI_LU_CONTNAME:
-        {
-            WCHAR *contname, *provname;
-            DWORD len;
-
-            if ((len = MultiByteToWideChar(CP_ACP, 0, id, -1, NULL, 0)) &&
-                (contname = alloca(len * sizeof(WCHAR)),
-                 MultiByteToWideChar(CP_ACP, 0, id, -1, contname, len)) &&
-                (len = MultiByteToWideChar(CP_ACP, 0, ctx->cspname, -1,
-                                           NULL, 0)) &&
-                (provname = alloca(len * sizeof(WCHAR)),
-                 MultiByteToWideChar(CP_ACP, 0, ctx->cspname, -1,
-                                     provname, len)))
-                key = capi_get_key(ctx, contname, provname,
-                                   ctx->csptype, ctx->keytype);
-        }
-        break;
+    case CAPI_LU_CONTNAME: {
+        WCHAR *contname, *provname;
+        DWORD len;
+
+        if ((len = MultiByteToWideChar(CP_ACP, 0, id, -1, NULL, 0)) && (contname = alloca(len * sizeof(WCHAR)), MultiByteToWideChar(CP_ACP, 0, id, -1, contname, len)) && (len = MultiByteToWideChar(CP_ACP, 0, ctx->cspname, -1, NULL, 0)) && (provname = alloca(len * sizeof(WCHAR)), MultiByteToWideChar(CP_ACP, 0, ctx->cspname, -1, provname, len)))
+            key = capi_get_key(ctx, contname, provname,
+                ctx->csptype, ctx->keytype);
+    } break;
     }
 
     return key;
@@ -1636,8 +1618,7 @@ static CAPI_CTX *capi_ctx_new(void)
     ctx->csptype = PROV_RSA_FULL;
     ctx->dump_flags = CAPI_DMP_SUMMARY | CAPI_DMP_FNAME;
     ctx->keytype = AT_KEYEXCHANGE;
-    ctx->store_flags = CERT_STORE_OPEN_EXISTING_FLAG |
-        CERT_STORE_READONLY_FLAG | CERT_SYSTEM_STORE_CURRENT_USER;
+    ctx->store_flags = CERT_STORE_OPEN_EXISTING_FLAG | CERT_STORE_READONLY_FLAG | CERT_SYSTEM_STORE_CURRENT_USER;
     ctx->lookup_method = CAPI_LU_SUBSTR;
     ctx->client_cert_select = cert_select_simple;
     return ctx;
@@ -1656,7 +1637,7 @@ static void capi_ctx_free(CAPI_CTX *ctx)
 }
 
 static int capi_ctx_set_provname(CAPI_CTX *ctx, LPSTR pname, DWORD type,
-                                 int check)
+    int check)
 {
     LPSTR tmpcspname;
 
@@ -1670,10 +1651,9 @@ static int capi_ctx_set_provname(CAPI_CTX *ctx, LPSTR pname, DWORD type,
             name = alloca(len * sizeof(WCHAR));
             MultiByteToWideChar(CP_ACP, 0, pname, -1, (WCHAR *)name, len);
         }
-        if (name == NULL || !CryptAcquireContextW(&hprov, NULL, name, type,
-                                                  CRYPT_VERIFYCONTEXT)) {
+        if (name == NULL || !CryptAcquireContextW(&hprov, NULL, name, type, CRYPT_VERIFYCONTEXT)) {
             CAPIerr(CAPI_F_CAPI_CTX_SET_PROVNAME,
-                    CAPI_R_CRYPTACQUIRECONTEXT_ERROR);
+                CAPI_R_CRYPTACQUIRECONTEXT_ERROR);
             capi_addlasterror();
             return 0;
         }
@@ -1716,10 +1696,10 @@ static int cert_issuer_match(STACK_OF(X509_NAME) *ca_dn, X509 *x)
 }
 
 static int capi_load_ssl_client_cert(ENGINE *e, SSL *ssl,
-                                     STACK_OF(X509_NAME) *ca_dn, X509 **pcert,
-                                     EVP_PKEY **pkey, STACK_OF(X509) **pother,
-                                     UI_METHOD *ui_method,
-                                     void *callback_data)
+    STACK_OF(X509_NAME) *ca_dn, X509 **pcert,
+    EVP_PKEY **pkey, STACK_OF(X509) **pother,
+    UI_METHOD *ui_method,
+    void *callback_data)
 {
     STACK_OF(X509) *certs = NULL;
     X509 *x;
@@ -1817,7 +1797,6 @@ static int capi_load_ssl_client_cert(ENGINE *e, SSL *ssl,
     X509_set_ex_data(*pcert, cert_capi_idx, NULL);
 
     return 1;
-
 }
 
 /* Simple client cert selection function: always select first */
@@ -1827,7 +1806,7 @@ static int cert_select_simple(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
     return 0;
 }
 
-# ifdef OPENSSL_CAPIENG_DIALOG
+#ifdef OPENSSL_CAPIENG_DIALOG
 
 /*
  * More complex cert selection function, using standard function
@@ -1839,15 +1818,16 @@ static int cert_select_simple(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
  * versions of headers.
  */
 
-#  ifndef CRYPTUI_SELECT_LOCATION_COLUMN
-#   define CRYPTUI_SELECT_LOCATION_COLUMN                   0x000000010
-#   define CRYPTUI_SELECT_INTENDEDUSE_COLUMN                0x000000004
-#  endif
+#ifndef CRYPTUI_SELECT_LOCATION_COLUMN
+#define CRYPTUI_SELECT_LOCATION_COLUMN 0x000000010
+#define CRYPTUI_SELECT_INTENDEDUSE_COLUMN 0x000000004
+#endif
 
-#  define dlg_title L"OpenSSL Application SSL Client Certificate Selection"
-#  define dlg_prompt L"Select a certificate to use for authentication"
-#  define dlg_columns      CRYPTUI_SELECT_LOCATION_COLUMN \
-                        |CRYPTUI_SELECT_INTENDEDUSE_COLUMN
+#define dlg_title L"OpenSSL Application SSL Client Certificate Selection"
+#define dlg_prompt L"Select a certificate to use for authentication"
+#define dlg_columns                \
+    CRYPTUI_SELECT_LOCATION_COLUMN \
+    | CRYPTUI_SELECT_INTENDEDUSE_COLUMN
 
 static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
 {
@@ -1863,7 +1843,7 @@ static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
     ctx = ENGINE_get_ex_data(e, capi_idx);
     /* Create an in memory store of certificates */
     dstore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,
-                           CERT_STORE_CREATE_NEW_FLAG, NULL);
+        CERT_STORE_CREATE_NEW_FLAG, NULL);
     if (!dstore) {
         CAPIerr(CAPI_F_CERT_SELECT_DIALOG, CAPI_R_ERROR_CREATING_STORE);
         capi_addlasterror();
@@ -1875,12 +1855,11 @@ static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
         key = X509_get_ex_data(x, cert_capi_idx);
 
         if (!CertAddCertificateContextToStore(dstore, key->pcert,
-                                              CERT_STORE_ADD_NEW, NULL)) {
+                CERT_STORE_ADD_NEW, NULL)) {
             CAPIerr(CAPI_F_CERT_SELECT_DIALOG, CAPI_R_ERROR_ADDING_CERT);
             capi_addlasterror();
             goto err;
         }
-
     }
     hwnd = GetForegroundWindow();
     if (!hwnd)
@@ -1889,46 +1868,44 @@ static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
         hwnd = ctx->getconswindow();
     /* Call dialog to select one */
     cert = ctx->certselectdlg(dstore, hwnd, dlg_title, dlg_prompt,
-                              dlg_columns, 0, NULL);
+        dlg_columns, 0, NULL);
 
     /* Find matching cert from list */
     if (cert) {
         for (i = 0; i < sk_X509_num(certs); i++) {
             x = sk_X509_value(certs, i);
             key = X509_get_ex_data(x, cert_capi_idx);
-            if (CertCompareCertificate
-                (X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, cert->pCertInfo,
-                 key->pcert->pCertInfo)) {
+            if (CertCompareCertificate(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, cert->pCertInfo,
+                    key->pcert->pCertInfo)) {
                 idx = i;
                 break;
             }
         }
     }
 
- err:
+err:
     if (dstore)
         CertCloseStore(dstore, 0);
     return idx;
-
 }
-# endif
+#endif
 
-#else                           /* !__COMPILE_CAPIENG */
-# include <openssl/engine.h>
-# ifndef OPENSSL_NO_DYNAMIC_ENGINE
+#else /* !__COMPILE_CAPIENG */
+#include <openssl/engine.h>
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 OPENSSL_EXPORT
-    int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns);
+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)
+int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns)
 {
     return 0;
 }
 
 IMPLEMENT_DYNAMIC_CHECK_FN()
-# else
+#else
 void engine_load_capi_int(void);
 void engine_load_capi_int(void)
 {
 }
-# endif
+#endif
 #endif
diff --git a/engines/e_capi_err.c b/engines/e_capi_err.c
index 2588c15304468..3a7782958abd0 100644
--- a/engines/e_capi_err.c
+++ b/engines/e_capi_err.c
@@ -14,46 +14,46 @@
 #ifndef OPENSSL_NO_ERR
 
 static ERR_STRING_DATA CAPI_str_reasons[] = {
-    {ERR_PACK(0, 0, CAPI_R_CANT_CREATE_HASH_OBJECT), "can't create hash object"},
-    {ERR_PACK(0, 0, CAPI_R_CANT_FIND_CAPI_CONTEXT), "can't find capi context"},
-    {ERR_PACK(0, 0, CAPI_R_CANT_GET_KEY), "can't get key"},
-    {ERR_PACK(0, 0, CAPI_R_CANT_SET_HASH_VALUE), "can't set hash value"},
-    {ERR_PACK(0, 0, CAPI_R_CRYPTACQUIRECONTEXT_ERROR),
-    "cryptacquirecontext error"},
-    {ERR_PACK(0, 0, CAPI_R_CRYPTENUMPROVIDERS_ERROR),
-    "cryptenumproviders error"},
-    {ERR_PACK(0, 0, CAPI_R_DECRYPT_ERROR), "decrypt error"},
-    {ERR_PACK(0, 0, CAPI_R_ENGINE_NOT_INITIALIZED), "engine not initialized"},
-    {ERR_PACK(0, 0, CAPI_R_ENUMCONTAINERS_ERROR), "enumcontainers error"},
-    {ERR_PACK(0, 0, CAPI_R_ERROR_ADDING_CERT), "error adding cert"},
-    {ERR_PACK(0, 0, CAPI_R_ERROR_CREATING_STORE), "error creating store"},
-    {ERR_PACK(0, 0, CAPI_R_ERROR_GETTING_FRIENDLY_NAME),
-    "error getting friendly name"},
-    {ERR_PACK(0, 0, CAPI_R_ERROR_GETTING_KEY_PROVIDER_INFO),
-    "error getting key provider info"},
-    {ERR_PACK(0, 0, CAPI_R_ERROR_OPENING_STORE), "error opening store"},
-    {ERR_PACK(0, 0, CAPI_R_ERROR_SIGNING_HASH), "error signing hash"},
-    {ERR_PACK(0, 0, CAPI_R_FILE_OPEN_ERROR), "file open error"},
-    {ERR_PACK(0, 0, CAPI_R_FUNCTION_NOT_SUPPORTED), "function not supported"},
-    {ERR_PACK(0, 0, CAPI_R_GETUSERKEY_ERROR), "getuserkey error"},
-    {ERR_PACK(0, 0, CAPI_R_INVALID_DIGEST_LENGTH), "invalid digest length"},
-    {ERR_PACK(0, 0, CAPI_R_INVALID_DSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER),
-    "invalid dsa public key blob magic number"},
-    {ERR_PACK(0, 0, CAPI_R_INVALID_LOOKUP_METHOD), "invalid lookup method"},
-    {ERR_PACK(0, 0, CAPI_R_INVALID_PUBLIC_KEY_BLOB), "invalid public key blob"},
-    {ERR_PACK(0, 0, CAPI_R_INVALID_RSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER),
-    "invalid rsa public key blob magic number"},
-    {ERR_PACK(0, 0, CAPI_R_PUBKEY_EXPORT_ERROR), "pubkey export error"},
-    {ERR_PACK(0, 0, CAPI_R_PUBKEY_EXPORT_LENGTH_ERROR),
-    "pubkey export length error"},
-    {ERR_PACK(0, 0, CAPI_R_UNKNOWN_COMMAND), "unknown command"},
-    {ERR_PACK(0, 0, CAPI_R_UNSUPPORTED_ALGORITHM_NID),
-    "unsupported algorithm nid"},
-    {ERR_PACK(0, 0, CAPI_R_UNSUPPORTED_PADDING), "unsupported padding"},
-    {ERR_PACK(0, 0, CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM),
-    "unsupported public key algorithm"},
-    {ERR_PACK(0, 0, CAPI_R_WIN32_ERROR), "win32 error"},
-    {0, NULL}
+    { ERR_PACK(0, 0, CAPI_R_CANT_CREATE_HASH_OBJECT), "can't create hash object" },
+    { ERR_PACK(0, 0, CAPI_R_CANT_FIND_CAPI_CONTEXT), "can't find capi context" },
+    { ERR_PACK(0, 0, CAPI_R_CANT_GET_KEY), "can't get key" },
+    { ERR_PACK(0, 0, CAPI_R_CANT_SET_HASH_VALUE), "can't set hash value" },
+    { ERR_PACK(0, 0, CAPI_R_CRYPTACQUIRECONTEXT_ERROR),
+        "cryptacquirecontext error" },
+    { ERR_PACK(0, 0, CAPI_R_CRYPTENUMPROVIDERS_ERROR),
+        "cryptenumproviders error" },
+    { ERR_PACK(0, 0, CAPI_R_DECRYPT_ERROR), "decrypt error" },
+    { ERR_PACK(0, 0, CAPI_R_ENGINE_NOT_INITIALIZED), "engine not initialized" },
+    { ERR_PACK(0, 0, CAPI_R_ENUMCONTAINERS_ERROR), "enumcontainers error" },
+    { ERR_PACK(0, 0, CAPI_R_ERROR_ADDING_CERT), "error adding cert" },
+    { ERR_PACK(0, 0, CAPI_R_ERROR_CREATING_STORE), "error creating store" },
+    { ERR_PACK(0, 0, CAPI_R_ERROR_GETTING_FRIENDLY_NAME),
+        "error getting friendly name" },
+    { ERR_PACK(0, 0, CAPI_R_ERROR_GETTING_KEY_PROVIDER_INFO),
+        "error getting key provider info" },
+    { ERR_PACK(0, 0, CAPI_R_ERROR_OPENING_STORE), "error opening store" },
+    { ERR_PACK(0, 0, CAPI_R_ERROR_SIGNING_HASH), "error signing hash" },
+    { ERR_PACK(0, 0, CAPI_R_FILE_OPEN_ERROR), "file open error" },
+    { ERR_PACK(0, 0, CAPI_R_FUNCTION_NOT_SUPPORTED), "function not supported" },
+    { ERR_PACK(0, 0, CAPI_R_GETUSERKEY_ERROR), "getuserkey error" },
+    { ERR_PACK(0, 0, CAPI_R_INVALID_DIGEST_LENGTH), "invalid digest length" },
+    { ERR_PACK(0, 0, CAPI_R_INVALID_DSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER),
+        "invalid dsa public key blob magic number" },
+    { ERR_PACK(0, 0, CAPI_R_INVALID_LOOKUP_METHOD), "invalid lookup method" },
+    { ERR_PACK(0, 0, CAPI_R_INVALID_PUBLIC_KEY_BLOB), "invalid public key blob" },
+    { ERR_PACK(0, 0, CAPI_R_INVALID_RSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER),
+        "invalid rsa public key blob magic number" },
+    { ERR_PACK(0, 0, CAPI_R_PUBKEY_EXPORT_ERROR), "pubkey export error" },
+    { ERR_PACK(0, 0, CAPI_R_PUBKEY_EXPORT_LENGTH_ERROR),
+        "pubkey export length error" },
+    { ERR_PACK(0, 0, CAPI_R_UNKNOWN_COMMAND), "unknown command" },
+    { ERR_PACK(0, 0, CAPI_R_UNSUPPORTED_ALGORITHM_NID),
+        "unsupported algorithm nid" },
+    { ERR_PACK(0, 0, CAPI_R_UNSUPPORTED_PADDING), "unsupported padding" },
+    { ERR_PACK(0, 0, CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM),
+        "unsupported public key algorithm" },
+    { ERR_PACK(0, 0, CAPI_R_WIN32_ERROR), "win32 error" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/engines/e_capi_err.h b/engines/e_capi_err.h
index 480a8269d3ae8..8a0f58f2dadda 100644
--- a/engines/e_capi_err.h
+++ b/engines/e_capi_err.h
@@ -9,49 +9,47 @@
  */
 
 #ifndef OSSL_E_CAPI_ERR_H
-# define OSSL_E_CAPI_ERR_H
-# pragma once
+#define OSSL_E_CAPI_ERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-
-
-# define CAPIerr(f, r) ERR_CAPI_error(0, (r), OPENSSL_FILE, OPENSSL_LINE)
-# define ERR_R_CAPI_LIB ERR_CAPI_lib()
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
 
+#define CAPIerr(f, r) ERR_CAPI_error(0, (r), OPENSSL_FILE, OPENSSL_LINE)
+#define ERR_R_CAPI_LIB ERR_CAPI_lib()
 
 /*
  * CAPI reason codes.
  */
-# define CAPI_R_CANT_CREATE_HASH_OBJECT                   100
-# define CAPI_R_CANT_FIND_CAPI_CONTEXT                    101
-# define CAPI_R_CANT_GET_KEY                              102
-# define CAPI_R_CANT_SET_HASH_VALUE                       103
-# define CAPI_R_CRYPTACQUIRECONTEXT_ERROR                 104
-# define CAPI_R_CRYPTENUMPROVIDERS_ERROR                  105
-# define CAPI_R_DECRYPT_ERROR                             106
-# define CAPI_R_ENGINE_NOT_INITIALIZED                    107
-# define CAPI_R_ENUMCONTAINERS_ERROR                      108
-# define CAPI_R_ERROR_ADDING_CERT                         109
-# define CAPI_R_ERROR_CREATING_STORE                      110
-# define CAPI_R_ERROR_GETTING_FRIENDLY_NAME               111
-# define CAPI_R_ERROR_GETTING_KEY_PROVIDER_INFO           112
-# define CAPI_R_ERROR_OPENING_STORE                       113
-# define CAPI_R_ERROR_SIGNING_HASH                        114
-# define CAPI_R_FILE_OPEN_ERROR                           115
-# define CAPI_R_FUNCTION_NOT_SUPPORTED                    116
-# define CAPI_R_GETUSERKEY_ERROR                          117
-# define CAPI_R_INVALID_DIGEST_LENGTH                     118
-# define CAPI_R_INVALID_DSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER  119
-# define CAPI_R_INVALID_LOOKUP_METHOD                     120
-# define CAPI_R_INVALID_PUBLIC_KEY_BLOB                   121
-# define CAPI_R_INVALID_RSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER  122
-# define CAPI_R_PUBKEY_EXPORT_ERROR                       123
-# define CAPI_R_PUBKEY_EXPORT_LENGTH_ERROR                124
-# define CAPI_R_UNKNOWN_COMMAND                           125
-# define CAPI_R_UNSUPPORTED_ALGORITHM_NID                 126
-# define CAPI_R_UNSUPPORTED_PADDING                       127
-# define CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM          128
-# define CAPI_R_WIN32_ERROR                               129
+#define CAPI_R_CANT_CREATE_HASH_OBJECT 100
+#define CAPI_R_CANT_FIND_CAPI_CONTEXT 101
+#define CAPI_R_CANT_GET_KEY 102
+#define CAPI_R_CANT_SET_HASH_VALUE 103
+#define CAPI_R_CRYPTACQUIRECONTEXT_ERROR 104
+#define CAPI_R_CRYPTENUMPROVIDERS_ERROR 105
+#define CAPI_R_DECRYPT_ERROR 106
+#define CAPI_R_ENGINE_NOT_INITIALIZED 107
+#define CAPI_R_ENUMCONTAINERS_ERROR 108
+#define CAPI_R_ERROR_ADDING_CERT 109
+#define CAPI_R_ERROR_CREATING_STORE 110
+#define CAPI_R_ERROR_GETTING_FRIENDLY_NAME 111
+#define CAPI_R_ERROR_GETTING_KEY_PROVIDER_INFO 112
+#define CAPI_R_ERROR_OPENING_STORE 113
+#define CAPI_R_ERROR_SIGNING_HASH 114
+#define CAPI_R_FILE_OPEN_ERROR 115
+#define CAPI_R_FUNCTION_NOT_SUPPORTED 116
+#define CAPI_R_GETUSERKEY_ERROR 117
+#define CAPI_R_INVALID_DIGEST_LENGTH 118
+#define CAPI_R_INVALID_DSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER 119
+#define CAPI_R_INVALID_LOOKUP_METHOD 120
+#define CAPI_R_INVALID_PUBLIC_KEY_BLOB 121
+#define CAPI_R_INVALID_RSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER 122
+#define CAPI_R_PUBKEY_EXPORT_ERROR 123
+#define CAPI_R_PUBKEY_EXPORT_LENGTH_ERROR 124
+#define CAPI_R_UNKNOWN_COMMAND 125
+#define CAPI_R_UNSUPPORTED_ALGORITHM_NID 126
+#define CAPI_R_UNSUPPORTED_PADDING 127
+#define CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM 128
+#define CAPI_R_WIN32_ERROR 129
 
 #endif
diff --git a/engines/e_dasync.c b/engines/e_dasync.c
index 5f809e8321997..f801bcdd6d69b 100644
--- a/engines/e_dasync.c
+++ b/engines/e_dasync.c
@@ -20,7 +20,7 @@
 
 #include <openssl/opensslconf.h>
 #if defined(_WIN32)
-# include <windows.h>
+#include <windows.h>
 #endif
 
 #include <stdio.h>
@@ -38,38 +38,38 @@
 #include <openssl/modes.h>
 
 #if defined(OPENSSL_SYS_UNIX) && defined(OPENSSL_THREADS)
-# undef ASYNC_POSIX
-# define ASYNC_POSIX
-# include <unistd.h>
+#undef ASYNC_POSIX
+#define ASYNC_POSIX
+#include <unistd.h>
 #elif defined(_WIN32)
-# undef ASYNC_WIN
-# define ASYNC_WIN
+#undef ASYNC_WIN
+#define ASYNC_WIN
 #endif
 
+/* clang-format off */
 #include "e_dasync_err.c"
+/* clang-format on */
 
 /* Engine Id and Name */
 static const char *engine_dasync_id = "dasync";
 static const char *engine_dasync_name = "Dummy Async engine support";
 
-
 /* Engine Lifetime functions */
 static int dasync_destroy(ENGINE *e);
 static int dasync_init(ENGINE *e);
 static int dasync_finish(ENGINE *e);
 void engine_load_dasync_int(void);
 
-
 /* Set up digests. Just SHA1 for now */
 static int dasync_digests(ENGINE *e, const EVP_MD **digest,
-                          const int **nids, int nid);
+    const int **nids, int nid);
 
 static void dummy_pause_job(void);
 
 /* SHA1 */
 static int dasync_sha1_init(EVP_MD_CTX *ctx);
 static int dasync_sha1_update(EVP_MD_CTX *ctx, const void *data,
-                             size_t count);
+    size_t count);
 static int dasync_sha1_final(EVP_MD_CTX *ctx, unsigned char *md);
 
 /*
@@ -106,7 +106,7 @@ static int dasync_digest_nids(const int **nids)
 
 /* RSA */
 static int dasync_pkey(ENGINE *e, EVP_PKEY_METHOD **pmeth,
-                       const int **pnids, int nid);
+    const int **pnids, int nid);
 
 static int dasync_rsa_init(EVP_PKEY_CTX *ctx);
 static void dasync_rsa_cleanup(EVP_PKEY_CTX *ctx);
@@ -116,15 +116,15 @@ static int dasync_rsa_keygen_init(EVP_PKEY_CTX *ctx);
 static int dasync_rsa_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey);
 static int dasync_rsa_encrypt_init(EVP_PKEY_CTX *ctx);
 static int dasync_rsa_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out,
-                              size_t *outlen, const unsigned char *in,
-                              size_t inlen);
+    size_t *outlen, const unsigned char *in,
+    size_t inlen);
 static int dasync_rsa_decrypt_init(EVP_PKEY_CTX *ctx);
 static int dasync_rsa_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out,
-                              size_t *outlen, const unsigned char *in,
-                              size_t inlen);
+    size_t *outlen, const unsigned char *in,
+    size_t inlen);
 static int dasync_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2);
 static int dasync_rsa_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
-                               const char *value);
+    const char *value);
 
 static EVP_PKEY_METHOD *dasync_rsa;
 static const EVP_PKEY_METHOD *dasync_rsa_orig;
@@ -132,31 +132,31 @@ static const EVP_PKEY_METHOD *dasync_rsa_orig;
 /* AES */
 
 static int dasync_aes128_cbc_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
-                                  void *ptr);
+    void *ptr);
 static int dasync_aes128_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                                  const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 static int dasync_aes128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                    const unsigned char *in, size_t inl);
+    const unsigned char *in, size_t inl);
 static int dasync_aes128_cbc_cleanup(EVP_CIPHER_CTX *ctx);
 
 static int dasync_aes256_ctr_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
-                                  void *ptr);
+    void *ptr);
 static int dasync_aes256_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                                  const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 static int dasync_aes256_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                    const unsigned char *in, size_t inl);
+    const unsigned char *in, size_t inl);
 static int dasync_aes256_ctr_cleanup(EVP_CIPHER_CTX *ctx);
 
 static int dasync_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
-                                             int arg, void *ptr);
+    int arg, void *ptr);
 static int dasync_aes128_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
-                                                 const unsigned char *key,
-                                                 const unsigned char *iv,
-                                                 int enc);
+    const unsigned char *key,
+    const unsigned char *iv,
+    int enc);
 static int dasync_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx,
-                                               unsigned char *out,
-                                               const unsigned char *in,
-                                               size_t inl);
+    unsigned char *out,
+    const unsigned char *in,
+    size_t inl);
 static int dasync_aes128_cbc_hmac_sha1_cleanup(EVP_CIPHER_CTX *ctx);
 
 struct dasync_pipeline_ctx {
@@ -214,7 +214,7 @@ static void destroy_ciphers(void)
 }
 
 static int dasync_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-                                   const int **nids, int nid);
+    const int **nids, int nid);
 
 static int dasync_cipher_nids[] = {
     NID_aes_128_cbc,
@@ -228,20 +228,21 @@ static int bind_dasync(ENGINE *e)
     /* Setup RSA */
     if ((dasync_rsa_orig = EVP_PKEY_meth_find(EVP_PKEY_RSA)) == NULL
         || (dasync_rsa = EVP_PKEY_meth_new(EVP_PKEY_RSA,
-                                           EVP_PKEY_FLAG_AUTOARGLEN)) == NULL)
+                EVP_PKEY_FLAG_AUTOARGLEN))
+            == NULL)
         return 0;
     EVP_PKEY_meth_set_init(dasync_rsa, dasync_rsa_init);
     EVP_PKEY_meth_set_cleanup(dasync_rsa, dasync_rsa_cleanup);
     EVP_PKEY_meth_set_paramgen(dasync_rsa, dasync_rsa_paramgen_init,
-                               dasync_rsa_paramgen);
+        dasync_rsa_paramgen);
     EVP_PKEY_meth_set_keygen(dasync_rsa, dasync_rsa_keygen_init,
-                             dasync_rsa_keygen);
+        dasync_rsa_keygen);
     EVP_PKEY_meth_set_encrypt(dasync_rsa, dasync_rsa_encrypt_init,
-                              dasync_rsa_encrypt);
+        dasync_rsa_encrypt);
     EVP_PKEY_meth_set_decrypt(dasync_rsa, dasync_rsa_decrypt_init,
-                              dasync_rsa_decrypt);
+        dasync_rsa_decrypt);
     EVP_PKEY_meth_set_ctrl(dasync_rsa, dasync_rsa_ctrl,
-                           dasync_rsa_ctrl_str);
+        dasync_rsa_ctrl_str);
 
     /* Ensure the dasync error handling is set up */
     ERR_load_DASYNC_strings();
@@ -267,7 +268,7 @@ static int bind_dasync(ENGINE *e)
         || !EVP_MD_meth_set_result_size(_hidden_sha1_md, SHA_DIGEST_LENGTH)
         || !EVP_MD_meth_set_input_blocksize(_hidden_sha1_md, SHA_CBLOCK)
         || !EVP_MD_meth_set_app_datasize(_hidden_sha1_md,
-                                         sizeof(EVP_MD *) + sizeof(SHA_CTX))
+            sizeof(EVP_MD *) + sizeof(SHA_CTX))
         || !EVP_MD_meth_set_flags(_hidden_sha1_md, EVP_MD_FLAG_DIGALGID_ABSENT)
         || !EVP_MD_meth_set_init(_hidden_sha1_md, dasync_sha1_init)
         || !EVP_MD_meth_set_update(_hidden_sha1_md, dasync_sha1_update)
@@ -277,75 +278,75 @@ static int bind_dasync(ENGINE *e)
     }
 
     _hidden_aes_128_cbc = EVP_CIPHER_meth_new(NID_aes_128_cbc,
-                                              16 /* block size */,
-                                              16 /* key len */);
+        16 /* block size */,
+        16 /* key len */);
     if (_hidden_aes_128_cbc == NULL
-            || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_128_cbc,16)
-            || !EVP_CIPHER_meth_set_flags(_hidden_aes_128_cbc,
-                                          EVP_CIPH_FLAG_DEFAULT_ASN1
-                                          | EVP_CIPH_CBC_MODE
-                                          | EVP_CIPH_FLAG_PIPELINE
-                                          | EVP_CIPH_CUSTOM_COPY)
-            || !EVP_CIPHER_meth_set_init(_hidden_aes_128_cbc,
-                                         dasync_aes128_init_key)
-            || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_128_cbc,
-                                              dasync_aes128_cbc_cipher)
-            || !EVP_CIPHER_meth_set_cleanup(_hidden_aes_128_cbc,
-                                            dasync_aes128_cbc_cleanup)
-            || !EVP_CIPHER_meth_set_ctrl(_hidden_aes_128_cbc,
-                                         dasync_aes128_cbc_ctrl)
-            || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_128_cbc,
-                                sizeof(struct dasync_pipeline_ctx))) {
+        || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_128_cbc, 16)
+        || !EVP_CIPHER_meth_set_flags(_hidden_aes_128_cbc,
+            EVP_CIPH_FLAG_DEFAULT_ASN1
+                | EVP_CIPH_CBC_MODE
+                | EVP_CIPH_FLAG_PIPELINE
+                | EVP_CIPH_CUSTOM_COPY)
+        || !EVP_CIPHER_meth_set_init(_hidden_aes_128_cbc,
+            dasync_aes128_init_key)
+        || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_128_cbc,
+            dasync_aes128_cbc_cipher)
+        || !EVP_CIPHER_meth_set_cleanup(_hidden_aes_128_cbc,
+            dasync_aes128_cbc_cleanup)
+        || !EVP_CIPHER_meth_set_ctrl(_hidden_aes_128_cbc,
+            dasync_aes128_cbc_ctrl)
+        || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_128_cbc,
+            sizeof(struct dasync_pipeline_ctx))) {
         EVP_CIPHER_meth_free(_hidden_aes_128_cbc);
         _hidden_aes_128_cbc = NULL;
     }
 
     _hidden_aes_256_ctr = EVP_CIPHER_meth_new(NID_aes_256_ctr,
-                                              1  /* block size */,
-                                              32 /* key len */);
+        1 /* block size */,
+        32 /* key len */);
     if (_hidden_aes_256_ctr == NULL
-            || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_256_ctr,16)
-            || !EVP_CIPHER_meth_set_flags(_hidden_aes_256_ctr,
-                                          EVP_CIPH_FLAG_DEFAULT_ASN1
-                                          | EVP_CIPH_CTR_MODE
-                                          | EVP_CIPH_FLAG_PIPELINE
-                                          | EVP_CIPH_CUSTOM_COPY)
-            || !EVP_CIPHER_meth_set_init(_hidden_aes_256_ctr,
-                                         dasync_aes256_init_key)
-            || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_256_ctr,
-                                              dasync_aes256_ctr_cipher)
-            || !EVP_CIPHER_meth_set_cleanup(_hidden_aes_256_ctr,
-                                            dasync_aes256_ctr_cleanup)
-            || !EVP_CIPHER_meth_set_ctrl(_hidden_aes_256_ctr,
-                                         dasync_aes256_ctr_ctrl)
-            || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_256_ctr,
-                                sizeof(struct dasync_pipeline_ctx))) {
+        || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_256_ctr, 16)
+        || !EVP_CIPHER_meth_set_flags(_hidden_aes_256_ctr,
+            EVP_CIPH_FLAG_DEFAULT_ASN1
+                | EVP_CIPH_CTR_MODE
+                | EVP_CIPH_FLAG_PIPELINE
+                | EVP_CIPH_CUSTOM_COPY)
+        || !EVP_CIPHER_meth_set_init(_hidden_aes_256_ctr,
+            dasync_aes256_init_key)
+        || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_256_ctr,
+            dasync_aes256_ctr_cipher)
+        || !EVP_CIPHER_meth_set_cleanup(_hidden_aes_256_ctr,
+            dasync_aes256_ctr_cleanup)
+        || !EVP_CIPHER_meth_set_ctrl(_hidden_aes_256_ctr,
+            dasync_aes256_ctr_ctrl)
+        || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_256_ctr,
+            sizeof(struct dasync_pipeline_ctx))) {
         EVP_CIPHER_meth_free(_hidden_aes_256_ctr);
         _hidden_aes_256_ctr = NULL;
     }
 
     _hidden_aes_128_cbc_hmac_sha1 = EVP_CIPHER_meth_new(
-                                                NID_aes_128_cbc_hmac_sha1,
-                                                16 /* block size */,
-                                                16 /* key len */);
+        NID_aes_128_cbc_hmac_sha1,
+        16 /* block size */,
+        16 /* key len */);
     if (_hidden_aes_128_cbc_hmac_sha1 == NULL
-            || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_128_cbc_hmac_sha1,16)
-            || !EVP_CIPHER_meth_set_flags(_hidden_aes_128_cbc_hmac_sha1,
-                                            EVP_CIPH_CBC_MODE
-                                          | EVP_CIPH_FLAG_DEFAULT_ASN1
-                                          | EVP_CIPH_FLAG_AEAD_CIPHER
-                                          | EVP_CIPH_FLAG_PIPELINE
-                                          | EVP_CIPH_CUSTOM_COPY)
-            || !EVP_CIPHER_meth_set_init(_hidden_aes_128_cbc_hmac_sha1,
-                                         dasync_aes128_cbc_hmac_sha1_init_key)
-            || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_128_cbc_hmac_sha1,
-                                            dasync_aes128_cbc_hmac_sha1_cipher)
-            || !EVP_CIPHER_meth_set_cleanup(_hidden_aes_128_cbc_hmac_sha1,
-                                            dasync_aes128_cbc_hmac_sha1_cleanup)
-            || !EVP_CIPHER_meth_set_ctrl(_hidden_aes_128_cbc_hmac_sha1,
-                                         dasync_aes128_cbc_hmac_sha1_ctrl)
-            || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_128_cbc_hmac_sha1,
-                                sizeof(struct dasync_pipeline_ctx))) {
+        || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_128_cbc_hmac_sha1, 16)
+        || !EVP_CIPHER_meth_set_flags(_hidden_aes_128_cbc_hmac_sha1,
+            EVP_CIPH_CBC_MODE
+                | EVP_CIPH_FLAG_DEFAULT_ASN1
+                | EVP_CIPH_FLAG_AEAD_CIPHER
+                | EVP_CIPH_FLAG_PIPELINE
+                | EVP_CIPH_CUSTOM_COPY)
+        || !EVP_CIPHER_meth_set_init(_hidden_aes_128_cbc_hmac_sha1,
+            dasync_aes128_cbc_hmac_sha1_init_key)
+        || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_128_cbc_hmac_sha1,
+            dasync_aes128_cbc_hmac_sha1_cipher)
+        || !EVP_CIPHER_meth_set_cleanup(_hidden_aes_128_cbc_hmac_sha1,
+            dasync_aes128_cbc_hmac_sha1_cleanup)
+        || !EVP_CIPHER_meth_set_ctrl(_hidden_aes_128_cbc_hmac_sha1,
+            dasync_aes128_cbc_hmac_sha1_ctrl)
+        || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_128_cbc_hmac_sha1,
+            sizeof(struct dasync_pipeline_ctx))) {
         EVP_CIPHER_meth_free(_hidden_aes_128_cbc_hmac_sha1);
         _hidden_aes_128_cbc_hmac_sha1 = NULL;
     }
@@ -363,7 +364,7 @@ static void destroy_pkey(void)
     dasync_rsa = NULL;
 }
 
-# ifndef OPENSSL_NO_DYNAMIC_ENGINE
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_helper(ENGINE *e, const char *id)
 {
     if (id && (strcmp(id, engine_dasync_id) != 0))
@@ -374,8 +375,8 @@ static int bind_helper(ENGINE *e, const char *id)
 }
 
 IMPLEMENT_DYNAMIC_CHECK_FN()
-    IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
-# endif
+IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
+#endif
 
 static ENGINE *engine_dasync(void)
 {
@@ -414,13 +415,11 @@ static int dasync_init(ENGINE *e)
     return 1;
 }
 
-
 static int dasync_finish(ENGINE *e)
 {
     return 1;
 }
 
-
 static int dasync_destroy(ENGINE *e)
 {
     destroy_digests();
@@ -431,7 +430,7 @@ static int dasync_destroy(ENGINE *e)
 }
 
 static int dasync_pkey(ENGINE *e, EVP_PKEY_METHOD **pmeth,
-                       const int **pnids, int nid)
+    const int **pnids, int nid)
 {
     static const int rnid = EVP_PKEY_RSA;
 
@@ -450,7 +449,7 @@ static int dasync_pkey(ENGINE *e, EVP_PKEY_METHOD **pmeth,
 }
 
 static int dasync_digests(ENGINE *e, const EVP_MD **digest,
-                          const int **nids, int nid)
+    const int **nids, int nid)
 {
     int ok = 1;
     if (!digest) {
@@ -471,14 +470,13 @@ static int dasync_digests(ENGINE *e, const EVP_MD **digest,
 }
 
 static int dasync_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-                                   const int **nids, int nid)
+    const int **nids, int nid)
 {
     int ok = 1;
     if (cipher == NULL) {
         /* We are returning a list of supported nids */
         *nids = dasync_cipher_nids;
-        return (sizeof(dasync_cipher_nids) -
-                1) / sizeof(dasync_cipher_nids[0]);
+        return (sizeof(dasync_cipher_nids) - 1) / sizeof(dasync_cipher_nids[0]);
     }
     /* We are being asked for a specific cipher */
     switch (nid) {
@@ -500,7 +498,7 @@ static int dasync_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
 }
 
 static void wait_cleanup(ASYNC_WAIT_CTX *ctx, const void *key,
-                         OSSL_ASYNC_FD readfd, void *pvwritefd)
+    OSSL_ASYNC_FD readfd, void *pvwritefd)
 {
     OSSL_ASYNC_FD *pwritefd = (OSSL_ASYNC_FD *)pvwritefd;
 #if defined(ASYNC_WIN)
@@ -515,12 +513,13 @@ static void wait_cleanup(ASYNC_WAIT_CTX *ctx, const void *key,
 
 #define DUMMY_CHAR 'X'
 
-static void dummy_pause_job(void) {
+static void dummy_pause_job(void)
+{
     ASYNC_JOB *job;
     ASYNC_WAIT_CTX *waitctx;
     ASYNC_callback_fn callback;
     void *callback_arg;
-    OSSL_ASYNC_FD pipefds[2] = {0, 0};
+    OSSL_ASYNC_FD pipefds[2] = { 0, 0 };
     OSSL_ASYNC_FD *writefd;
 #if defined(ASYNC_WIN)
     DWORD numwritten, numread;
@@ -545,9 +544,8 @@ static void dummy_pause_job(void) {
         return;
     }
 
-
     if (ASYNC_WAIT_CTX_get_fd(waitctx, engine_dasync_id, &pipefds[0],
-                              (void **)&writefd)) {
+            (void **)&writefd)) {
         pipefds[1] = *writefd;
     } else {
         writefd = OPENSSL_malloc(sizeof(*writefd));
@@ -567,7 +565,7 @@ static void dummy_pause_job(void) {
         *writefd = pipefds[1];
 
         if (!ASYNC_WAIT_CTX_set_wait_fd(waitctx, engine_dasync_id, pipefds[0],
-                                        writefd, wait_cleanup)) {
+                writefd, wait_cleanup)) {
             wait_cleanup(waitctx, engine_dasync_id, pipefds[0], writefd);
             return;
         }
@@ -608,7 +606,7 @@ static int dasync_sha1_init(EVP_MD_CTX *ctx)
 }
 
 static int dasync_sha1_update(EVP_MD_CTX *ctx, const void *data,
-                             size_t count)
+    size_t count)
 {
     dummy_pause_job();
 
@@ -625,102 +623,97 @@ static int dasync_sha1_final(EVP_MD_CTX *ctx, unsigned char *md)
 /* Cipher helper functions */
 
 static int dasync_cipher_ctrl_helper(EVP_CIPHER_CTX *ctx, int type, int arg,
-                                     void *ptr, int aeadcapable,
-                                     const EVP_CIPHER *ciph)
+    void *ptr, int aeadcapable,
+    const EVP_CIPHER *ciph)
 {
     int ret;
-    struct dasync_pipeline_ctx *pipe_ctx =
-        (struct dasync_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+    struct dasync_pipeline_ctx *pipe_ctx = (struct dasync_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
 
     if (pipe_ctx == NULL)
         return 0;
 
     switch (type) {
-        case EVP_CTRL_COPY:
-            {
-                size_t sz = EVP_CIPHER_impl_ctx_size(ciph);
-                void *inner_cipher_data = OPENSSL_malloc(sz);
-
-                if (inner_cipher_data == NULL)
-                    return -1;
-                memcpy(inner_cipher_data, pipe_ctx->inner_cipher_data, sz);
-                pipe_ctx->inner_cipher_data = inner_cipher_data;
-            }
-            break;
+    case EVP_CTRL_COPY: {
+        size_t sz = EVP_CIPHER_impl_ctx_size(ciph);
+        void *inner_cipher_data = OPENSSL_malloc(sz);
 
-        case EVP_CTRL_SET_PIPELINE_OUTPUT_BUFS:
-            pipe_ctx->numpipes = arg;
-            pipe_ctx->outbufs = (unsigned char **)ptr;
-            break;
+        if (inner_cipher_data == NULL)
+            return -1;
+        memcpy(inner_cipher_data, pipe_ctx->inner_cipher_data, sz);
+        pipe_ctx->inner_cipher_data = inner_cipher_data;
+    } break;
 
-        case EVP_CTRL_SET_PIPELINE_INPUT_BUFS:
-            pipe_ctx->numpipes = arg;
-            pipe_ctx->inbufs = (unsigned char **)ptr;
-            break;
+    case EVP_CTRL_SET_PIPELINE_OUTPUT_BUFS:
+        pipe_ctx->numpipes = arg;
+        pipe_ctx->outbufs = (unsigned char **)ptr;
+        break;
 
-        case EVP_CTRL_SET_PIPELINE_INPUT_LENS:
-            pipe_ctx->numpipes = arg;
-            pipe_ctx->lens = (size_t *)ptr;
-            break;
+    case EVP_CTRL_SET_PIPELINE_INPUT_BUFS:
+        pipe_ctx->numpipes = arg;
+        pipe_ctx->inbufs = (unsigned char **)ptr;
+        break;
 
-        case EVP_CTRL_AEAD_SET_MAC_KEY:
-            if (!aeadcapable)
-                return -1;
-            EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx->inner_cipher_data);
-            ret = EVP_CIPHER_meth_get_ctrl(EVP_aes_128_cbc_hmac_sha1())
-                                          (ctx, type, arg, ptr);
-            EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx);
-            return ret;
-
-        case EVP_CTRL_AEAD_TLS1_AAD:
-        {
-            unsigned char *p = ptr;
-            unsigned int len;
-
-            if (!aeadcapable || arg != EVP_AEAD_TLS1_AAD_LEN)
-                return -1;
+    case EVP_CTRL_SET_PIPELINE_INPUT_LENS:
+        pipe_ctx->numpipes = arg;
+        pipe_ctx->lens = (size_t *)ptr;
+        break;
 
-            if (pipe_ctx->aadctr >= SSL_MAX_PIPELINES)
-                return -1;
+    case EVP_CTRL_AEAD_SET_MAC_KEY:
+        if (!aeadcapable)
+            return -1;
+        EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx->inner_cipher_data);
+        ret = EVP_CIPHER_meth_get_ctrl(EVP_aes_128_cbc_hmac_sha1())(ctx, type, arg, ptr);
+        EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx);
+        return ret;
 
-            memcpy(pipe_ctx->tlsaad[pipe_ctx->aadctr], ptr,
-                   EVP_AEAD_TLS1_AAD_LEN);
-            pipe_ctx->aadctr++;
+    case EVP_CTRL_AEAD_TLS1_AAD: {
+        unsigned char *p = ptr;
+        unsigned int len;
 
-            len = p[arg - 2] << 8 | p[arg - 1];
+        if (!aeadcapable || arg != EVP_AEAD_TLS1_AAD_LEN)
+            return -1;
 
-            if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
-                if ((p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
-                    if (len < AES_BLOCK_SIZE)
-                        return 0;
-                    len -= AES_BLOCK_SIZE;
-                }
+        if (pipe_ctx->aadctr >= SSL_MAX_PIPELINES)
+            return -1;
 
-                return ((len + SHA_DIGEST_LENGTH + AES_BLOCK_SIZE)
-                        & -AES_BLOCK_SIZE) - len;
-            } else {
-                return SHA_DIGEST_LENGTH;
+        memcpy(pipe_ctx->tlsaad[pipe_ctx->aadctr], ptr,
+            EVP_AEAD_TLS1_AAD_LEN);
+        pipe_ctx->aadctr++;
+
+        len = p[arg - 2] << 8 | p[arg - 1];
+
+        if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
+            if ((p[arg - 4] << 8 | p[arg - 3]) >= TLS1_1_VERSION) {
+                if (len < AES_BLOCK_SIZE)
+                    return 0;
+                len -= AES_BLOCK_SIZE;
             }
+
+            return ((len + SHA_DIGEST_LENGTH + AES_BLOCK_SIZE)
+                       & -AES_BLOCK_SIZE)
+                - len;
+        } else {
+            return SHA_DIGEST_LENGTH;
         }
+    }
 
-        default:
-            return 0;
+    default:
+        return 0;
     }
 
     return 1;
 }
 
 static int dasync_cipher_init_key_helper(EVP_CIPHER_CTX *ctx,
-                                         const unsigned char *key,
-                                         const unsigned char *iv, int enc,
-                                         const EVP_CIPHER *cipher)
+    const unsigned char *key,
+    const unsigned char *iv, int enc,
+    const EVP_CIPHER *cipher)
 {
     int ret;
-    struct dasync_pipeline_ctx *pipe_ctx =
-        (struct dasync_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+    struct dasync_pipeline_ctx *pipe_ctx = (struct dasync_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
 
     if (pipe_ctx->inner_cipher_data == NULL
-            && EVP_CIPHER_impl_ctx_size(cipher) != 0) {
+        && EVP_CIPHER_impl_ctx_size(cipher) != 0) {
         pipe_ctx->inner_cipher_data = OPENSSL_zalloc(
             EVP_CIPHER_impl_ctx_size(cipher));
         if (pipe_ctx->inner_cipher_data == NULL)
@@ -738,13 +731,12 @@ static int dasync_cipher_init_key_helper(EVP_CIPHER_CTX *ctx,
 }
 
 static int dasync_cipher_helper(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t inl,
-                                const EVP_CIPHER *cipher)
+    const unsigned char *in, size_t inl,
+    const EVP_CIPHER *cipher)
 {
     int ret = 1;
     unsigned int i, pipes;
-    struct dasync_pipeline_ctx *pipe_ctx =
-        (struct dasync_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+    struct dasync_pipeline_ctx *pipe_ctx = (struct dasync_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
 
     pipes = pipe_ctx->numpipes;
     EVP_CIPHER_CTX_set_cipher_data(ctx, pipe_ctx->inner_cipher_data);
@@ -752,26 +744,21 @@ static int dasync_cipher_helper(EVP_CIPHER_CTX *ctx, unsigned char *out,
         if (pipe_ctx->aadctr != 0) {
             if (pipe_ctx->aadctr != 1)
                 return -1;
-            EVP_CIPHER_meth_get_ctrl(cipher)
-                                    (ctx, EVP_CTRL_AEAD_TLS1_AAD,
-                                     EVP_AEAD_TLS1_AAD_LEN,
-                                     pipe_ctx->tlsaad[0]);
+            EVP_CIPHER_meth_get_ctrl(cipher)(ctx, EVP_CTRL_AEAD_TLS1_AAD,
+                EVP_AEAD_TLS1_AAD_LEN,
+                pipe_ctx->tlsaad[0]);
         }
-        ret = EVP_CIPHER_meth_get_do_cipher(cipher)
-                                           (ctx, out, in, inl);
+        ret = EVP_CIPHER_meth_get_do_cipher(cipher)(ctx, out, in, inl);
     } else {
         if (pipe_ctx->aadctr > 0 && pipe_ctx->aadctr != pipes)
             return -1;
         for (i = 0; i < pipes; i++) {
             if (pipe_ctx->aadctr > 0) {
-                EVP_CIPHER_meth_get_ctrl(cipher)
-                                        (ctx, EVP_CTRL_AEAD_TLS1_AAD,
-                                         EVP_AEAD_TLS1_AAD_LEN,
-                                         pipe_ctx->tlsaad[i]);
+                EVP_CIPHER_meth_get_ctrl(cipher)(ctx, EVP_CTRL_AEAD_TLS1_AAD,
+                    EVP_AEAD_TLS1_AAD_LEN,
+                    pipe_ctx->tlsaad[i]);
             }
-            ret = ret && EVP_CIPHER_meth_get_do_cipher(cipher)
-                                (ctx, pipe_ctx->outbufs[i], pipe_ctx->inbufs[i],
-                                 pipe_ctx->lens[i]);
+            ret = ret && EVP_CIPHER_meth_get_do_cipher(cipher)(ctx, pipe_ctx->outbufs[i], pipe_ctx->inbufs[i], pipe_ctx->lens[i]);
         }
         pipe_ctx->numpipes = 0;
     }
@@ -781,13 +768,12 @@ static int dasync_cipher_helper(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int dasync_cipher_cleanup_helper(EVP_CIPHER_CTX *ctx,
-                                        const EVP_CIPHER *cipher)
+    const EVP_CIPHER *cipher)
 {
-    struct dasync_pipeline_ctx *pipe_ctx =
-        (struct dasync_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+    struct dasync_pipeline_ctx *pipe_ctx = (struct dasync_pipeline_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
 
     OPENSSL_clear_free(pipe_ctx->inner_cipher_data,
-                       EVP_CIPHER_impl_ctx_size(cipher));
+        EVP_CIPHER_impl_ctx_size(cipher));
 
     return 1;
 }
@@ -797,19 +783,19 @@ static int dasync_cipher_cleanup_helper(EVP_CIPHER_CTX *ctx,
  */
 
 static int dasync_aes128_cbc_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
-                                  void *ptr)
+    void *ptr)
 {
     return dasync_cipher_ctrl_helper(ctx, type, arg, ptr, 0, EVP_aes_128_cbc());
 }
 
 static int dasync_aes128_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     return dasync_cipher_init_key_helper(ctx, key, iv, enc, EVP_aes_128_cbc());
 }
 
 static int dasync_aes128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     return dasync_cipher_helper(ctx, out, in, inl, EVP_aes_128_cbc());
 }
@@ -820,19 +806,19 @@ static int dasync_aes128_cbc_cleanup(EVP_CIPHER_CTX *ctx)
 }
 
 static int dasync_aes256_ctr_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
-                                  void *ptr)
+    void *ptr)
 {
     return dasync_cipher_ctrl_helper(ctx, type, arg, ptr, 0, EVP_aes_256_ctr());
 }
 
 static int dasync_aes256_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     return dasync_cipher_init_key_helper(ctx, key, iv, enc, EVP_aes_256_ctr());
 }
 
 static int dasync_aes256_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     return dasync_cipher_helper(ctx, out, in, inl, EVP_aes_256_ctr());
 }
@@ -842,34 +828,33 @@ static int dasync_aes256_ctr_cleanup(EVP_CIPHER_CTX *ctx)
     return dasync_cipher_cleanup_helper(ctx, EVP_aes_256_ctr());
 }
 
-
 /*
  * AES128 CBC HMAC SHA1 Implementation
  */
 
 static int dasync_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
-                                             int arg, void *ptr)
+    int arg, void *ptr)
 {
     return dasync_cipher_ctrl_helper(ctx, type, arg, ptr, 1, EVP_aes_128_cbc_hmac_sha1());
 }
 
 static int dasync_aes128_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
-                                                const unsigned char *key,
-                                                const unsigned char *iv,
-                                                int enc)
+    const unsigned char *key,
+    const unsigned char *iv,
+    int enc)
 {
     /*
      * We can safely assume that EVP_aes_128_cbc_hmac_sha1() != NULL,
      * see comment before the definition of dasync_aes_128_cbc_hmac_sha1().
      */
     return dasync_cipher_init_key_helper(ctx, key, iv, enc,
-                                         EVP_aes_128_cbc_hmac_sha1());
+        EVP_aes_128_cbc_hmac_sha1());
 }
 
 static int dasync_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx,
-                                               unsigned char *out,
-                                               const unsigned char *in,
-                                               size_t inl)
+    unsigned char *out,
+    const unsigned char *in,
+    size_t inl)
 {
     return dasync_cipher_helper(ctx, out, in, inl, EVP_aes_128_cbc_hmac_sha1());
 }
@@ -883,7 +868,6 @@ static int dasync_aes128_cbc_hmac_sha1_cleanup(EVP_CIPHER_CTX *ctx)
     return dasync_cipher_cleanup_helper(ctx, EVP_aes_128_cbc_hmac_sha1());
 }
 
-
 /*
  * RSA implementation
  */
@@ -951,12 +935,12 @@ static int dasync_rsa_encrypt_init(EVP_PKEY_CTX *ctx)
 }
 
 static int dasync_rsa_encrypt(EVP_PKEY_CTX *ctx, unsigned char *out,
-                              size_t *outlen, const unsigned char *in,
-                              size_t inlen)
+    size_t *outlen, const unsigned char *in,
+    size_t inlen)
 {
     static int (*pencryptfn)(EVP_PKEY_CTX *ctx, unsigned char *out,
-                             size_t *outlen, const unsigned char *in,
-                             size_t inlen);
+        size_t *outlen, const unsigned char *in,
+        size_t inlen);
 
     if (pencryptfn == NULL)
         EVP_PKEY_meth_get_encrypt(dasync_rsa_orig, NULL, &pencryptfn);
@@ -973,12 +957,12 @@ static int dasync_rsa_decrypt_init(EVP_PKEY_CTX *ctx)
 }
 
 static int dasync_rsa_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out,
-                              size_t *outlen, const unsigned char *in,
-                              size_t inlen)
+    size_t *outlen, const unsigned char *in,
+    size_t inlen)
 {
     static int (*pdecrypt)(EVP_PKEY_CTX *ctx, unsigned char *out,
-                             size_t *outlen, const unsigned char *in,
-                             size_t inlen);
+        size_t *outlen, const unsigned char *in,
+        size_t inlen);
 
     if (pdecrypt == NULL)
         EVP_PKEY_meth_get_decrypt(dasync_rsa_orig, NULL, &pdecrypt);
@@ -995,10 +979,10 @@ static int dasync_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 }
 
 static int dasync_rsa_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
-                               const char *value)
+    const char *value)
 {
     static int (*pctrl_str)(EVP_PKEY_CTX *ctx, const char *type,
-                            const char *value);
+        const char *value);
 
     if (pctrl_str == NULL)
         EVP_PKEY_meth_get_ctrl(dasync_rsa_orig, NULL, &pctrl_str);
diff --git a/engines/e_dasync_err.c b/engines/e_dasync_err.c
index 16021f3196dd3..eba72fa859ba7 100644
--- a/engines/e_dasync_err.c
+++ b/engines/e_dasync_err.c
@@ -14,8 +14,8 @@
 #ifndef OPENSSL_NO_ERR
 
 static ERR_STRING_DATA DASYNC_str_reasons[] = {
-    {ERR_PACK(0, 0, DASYNC_R_INIT_FAILED), "init failed"},
-    {0, NULL}
+    { ERR_PACK(0, 0, DASYNC_R_INIT_FAILED), "init failed" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/engines/e_dasync_err.h b/engines/e_dasync_err.h
index 7a067c6037a61..bb774f02c6493 100644
--- a/engines/e_dasync_err.h
+++ b/engines/e_dasync_err.h
@@ -9,19 +9,17 @@
  */
 
 #ifndef OSSL_E_DASYNC_ERR_H
-# define OSSL_E_DASYNC_ERR_H
-# pragma once
+#define OSSL_E_DASYNC_ERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-
-
-# define DASYNCerr(f, r) ERR_DASYNC_error(0, (r), OPENSSL_FILE, OPENSSL_LINE)
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
 
+#define DASYNCerr(f, r) ERR_DASYNC_error(0, (r), OPENSSL_FILE, OPENSSL_LINE)
 
 /*
  * DASYNC reason codes.
  */
-# define DASYNC_R_INIT_FAILED                             100
+#define DASYNC_R_INIT_FAILED 100
 
 #endif
diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c
index 1e1d9d12b83c7..f66c7f1c1cf4d 100644
--- a/engines/e_devcrypto.c
+++ b/engines/e_devcrypto.c
@@ -30,7 +30,7 @@
 /* #define ENGINE_DEVCRYPTO_DEBUG */
 
 #if CRYPTO_ALGORITHM_MIN < CRYPTO_ALGORITHM_MAX
-# define CHECK_BSD_STYLE_MACROS
+#define CHECK_BSD_STYLE_MACROS
 #endif
 
 #define engine_devcrypto_id "devcrypto"
@@ -52,8 +52,8 @@ typedef struct session_op session_op_t;
  */
 static int cfd = -1;
 #define DEVCRYPTO_REQUIRE_ACCELERATED 0 /* require confirmation of acceleration */
-#define DEVCRYPTO_USE_SOFTWARE        1 /* allow software drivers */
-#define DEVCRYPTO_REJECT_SOFTWARE     2 /* only disallow confirmed software drivers */
+#define DEVCRYPTO_USE_SOFTWARE 1 /* allow software drivers */
+#define DEVCRYPTO_REJECT_SOFTWARE 2 /* only disallow confirmed software drivers */
 
 #define DEVCRYPTO_DEFAULT_USE_SOFTDRIVERS DEVCRYPTO_REJECT_SOFTWARE
 static int use_softdrivers = DEVCRYPTO_DEFAULT_USE_SOFTDRIVERS;
@@ -64,17 +64,17 @@ static int use_softdrivers = DEVCRYPTO_DEFAULT_USE_SOFTDRIVERS;
  */
 struct driver_info_st {
     enum devcrypto_status_t {
-        DEVCRYPTO_STATUS_FAILURE         = -3, /* unusable for other reason */
-        DEVCRYPTO_STATUS_NO_CIOCCPHASH   = -2, /* hash state copy not supported */
+        DEVCRYPTO_STATUS_FAILURE = -3, /* unusable for other reason */
+        DEVCRYPTO_STATUS_NO_CIOCCPHASH = -2, /* hash state copy not supported */
         DEVCRYPTO_STATUS_NO_CIOCGSESSION = -1, /* session open failed */
-        DEVCRYPTO_STATUS_UNKNOWN         =  0, /* not tested yet */
-        DEVCRYPTO_STATUS_USABLE          =  1  /* algo can be used */
+        DEVCRYPTO_STATUS_UNKNOWN = 0, /* not tested yet */
+        DEVCRYPTO_STATUS_USABLE = 1 /* algo can be used */
     } status;
 
     enum devcrypto_accelerated_t {
-        DEVCRYPTO_NOT_ACCELERATED        = -1, /* software implemented */
-        DEVCRYPTO_ACCELERATION_UNKNOWN   =  0, /* acceleration support unknown */
-        DEVCRYPTO_ACCELERATED            =  1  /* hardware accelerated */
+        DEVCRYPTO_NOT_ACCELERATED = -1, /* software implemented */
+        DEVCRYPTO_ACCELERATION_UNKNOWN = 0, /* acceleration support unknown */
+        DEVCRYPTO_ACCELERATED = 1 /* hardware accelerated */
     } accelerated;
 
     char *driver_name;
@@ -84,7 +84,8 @@ struct driver_info_st {
 void engine_load_devcrypto_int(void);
 #endif
 
-static int clean_devcrypto_session(session_op_t *sess) {
+static int clean_devcrypto_session(session_op_t *sess)
+{
     if (ioctl(cfd, CIOCFSESSION, &sess->ses) < 0) {
         ERR_raise_data(ERR_LIB_SYS, errno, "calling ioctl()");
         return 0;
@@ -105,8 +106,8 @@ static int clean_devcrypto_session(session_op_t *sess) {
 
 struct cipher_ctx {
     session_op_t sess;
-    int op;                      /* COP_ENCRYPT or COP_DECRYPT */
-    unsigned long mode;          /* EVP_CIPH_*_MODE */
+    int op; /* COP_ENCRYPT or COP_DECRYPT */
+    unsigned long mode; /* EVP_CIPH_*_MODE */
 
     /* to handle ctr mode being a stream cipher */
     unsigned char partial[EVP_MAX_BLOCK_LENGTH];
@@ -142,7 +143,7 @@ static const struct cipher_data_st {
     { NID_aes_192_ctr, 16, 192 / 8, 16, EVP_CIPH_CTR_MODE, CRYPTO_AES_CTR },
     { NID_aes_256_ctr, 16, 256 / 8, 16, EVP_CIPH_CTR_MODE, CRYPTO_AES_CTR },
 #endif
-#if 0                            /* Not yet supported */
+#if 0 /* Not yet supported */
     { NID_aes_128_xts, 16, 128 / 8 * 2, 16, EVP_CIPH_XTS_MODE, CRYPTO_AES_XTS },
     { NID_aes_256_xts, 16, 256 / 8 * 2, 16, EVP_CIPH_XTS_MODE, CRYPTO_AES_XTS },
 #endif
@@ -151,18 +152,18 @@ static const struct cipher_data_st {
     { NID_aes_192_ecb, 16, 192 / 8, 0, EVP_CIPH_ECB_MODE, CRYPTO_AES_ECB },
     { NID_aes_256_ecb, 16, 256 / 8, 0, EVP_CIPH_ECB_MODE, CRYPTO_AES_ECB },
 #endif
-#if 0                            /* Not yet supported */
+#if 0 /* Not yet supported */
     { NID_aes_128_gcm, 16, 128 / 8, 16, EVP_CIPH_GCM_MODE, CRYPTO_AES_GCM },
     { NID_aes_192_gcm, 16, 192 / 8, 16, EVP_CIPH_GCM_MODE, CRYPTO_AES_GCM },
     { NID_aes_256_gcm, 16, 256 / 8, 16, EVP_CIPH_GCM_MODE, CRYPTO_AES_GCM },
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
     { NID_camellia_128_cbc, 16, 128 / 8, 16, EVP_CIPH_CBC_MODE,
-      CRYPTO_CAMELLIA_CBC },
+        CRYPTO_CAMELLIA_CBC },
     { NID_camellia_192_cbc, 16, 192 / 8, 16, EVP_CIPH_CBC_MODE,
-      CRYPTO_CAMELLIA_CBC },
+        CRYPTO_CAMELLIA_CBC },
     { NID_camellia_256_cbc, 16, 256 / 8, 16, EVP_CIPH_CBC_MODE,
-      CRYPTO_CAMELLIA_CBC },
+        CRYPTO_CAMELLIA_CBC },
 #endif
 };
 
@@ -203,17 +204,14 @@ static const struct cipher_data_st *get_cipher_data(int nid)
  */
 
 static int cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                       const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
-    struct cipher_ctx *cipher_ctx =
-        (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
-    const struct cipher_data_st *cipher_d =
-        get_cipher_data(EVP_CIPHER_CTX_get_nid(ctx));
+    struct cipher_ctx *cipher_ctx = (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+    const struct cipher_data_st *cipher_d = get_cipher_data(EVP_CIPHER_CTX_get_nid(ctx));
     int ret;
 
     /* cleanup a previous session */
-    if (cipher_ctx->sess.ses != 0 &&
-        clean_devcrypto_session(&cipher_ctx->sess) == 0)
+    if (cipher_ctx->sess.ses != 0 && clean_devcrypto_session(&cipher_ctx->sess) == 0)
         return 0;
 
     cipher_ctx->sess.cipher = cipher_d->devcryptoid;
@@ -223,9 +221,7 @@ static int cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
     cipher_ctx->mode = cipher_d->flags & EVP_CIPH_MODE;
     cipher_ctx->blocksize = cipher_d->blocksize;
 #ifdef CIOCGSESSION2
-    cipher_ctx->sess.crid = (use_softdrivers == DEVCRYPTO_USE_SOFTWARE) ?
-        CRYPTO_FLAG_SOFTWARE | CRYPTO_FLAG_HARDWARE :
-        CRYPTO_FLAG_HARDWARE;
+    cipher_ctx->sess.crid = (use_softdrivers == DEVCRYPTO_USE_SOFTWARE) ? CRYPTO_FLAG_SOFTWARE | CRYPTO_FLAG_HARDWARE : CRYPTO_FLAG_HARDWARE;
     ret = ioctl(cfd, CIOCGSESSION2, &cipher_ctx->sess);
 #else
     ret = ioctl(cfd, CIOCGSESSION, &cipher_ctx->sess);
@@ -239,10 +235,9 @@ static int cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 }
 
 static int cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
-    struct cipher_ctx *cipher_ctx =
-        (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+    struct cipher_ctx *cipher_ctx = (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
     struct crypt_op cryp;
     unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
 #if !defined(COP_FLAG_WRITE_IV)
@@ -302,11 +297,11 @@ static int cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
         case EVP_CIPH_CTR_MODE:
             nblocks = (inl + cipher_ctx->blocksize - 1)
-                      / cipher_ctx->blocksize;
+                / cipher_ctx->blocksize;
             do {
                 ivlen--;
                 nblocks += iv[ivlen];
-                iv[ivlen] = (uint8_t) nblocks;
+                iv[ivlen] = (uint8_t)nblocks;
                 nblocks >>= 8;
             } while (ivlen);
             break;
@@ -320,10 +315,9 @@ static int cipher_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int ctr_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                         const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
-    struct cipher_ctx *cipher_ctx =
-        (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+    struct cipher_ctx *cipher_ctx = (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
     size_t nblocks, len;
 
     /* initial partial block */
@@ -335,7 +329,7 @@ static int ctr_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
     /* full blocks */
     if (inl > cipher_ctx->blocksize) {
-        nblocks = inl/cipher_ctx->blocksize;
+        nblocks = inl / cipher_ctx->blocksize;
         len = nblocks * cipher_ctx->blocksize;
         if (cipher_do_cipher(ctx, out, in, len) < 1)
             return 0;
@@ -348,11 +342,12 @@ static int ctr_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     if (inl) {
         memset(cipher_ctx->partial, 0, cipher_ctx->blocksize);
         if (cipher_do_cipher(ctx, cipher_ctx->partial, cipher_ctx->partial,
-            cipher_ctx->blocksize) < 1)
+                cipher_ctx->blocksize)
+            < 1)
             return 0;
         while (inl--) {
             out[cipher_ctx->num] = in[cipher_ctx->num]
-                                   ^ cipher_ctx->partial[cipher_ctx->num];
+                ^ cipher_ctx->partial[cipher_ctx->num];
             cipher_ctx->num++;
         }
     }
@@ -360,10 +355,9 @@ static int ctr_do_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
     return 1;
 }
 
-static int cipher_ctrl(EVP_CIPHER_CTX *ctx, int type, int p1, void* p2)
+static int cipher_ctrl(EVP_CIPHER_CTX *ctx, int type, int p1, void *p2)
 {
-    struct cipher_ctx *cipher_ctx =
-        (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+    struct cipher_ctx *cipher_ctx = (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
     EVP_CIPHER_CTX *to_ctx = (EVP_CIPHER_CTX *)p2;
     struct cipher_ctx *to_cipher_ctx;
 
@@ -373,11 +367,10 @@ static int cipher_ctrl(EVP_CIPHER_CTX *ctx, int type, int p1, void* p2)
         if (cipher_ctx == NULL)
             return 1;
         /* when copying the context, a new session needs to be initialized */
-        to_cipher_ctx =
-            (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(to_ctx);
+        to_cipher_ctx = (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(to_ctx);
         memset(&to_cipher_ctx->sess, 0, sizeof(to_cipher_ctx->sess));
         return cipher_init(to_ctx, (void *)cipher_ctx->sess.key, EVP_CIPHER_CTX_iv(ctx),
-                           (cipher_ctx->op == COP_ENCRYPT));
+            (cipher_ctx->op == COP_ENCRYPT));
 
     case EVP_CTRL_INIT:
         memset(&cipher_ctx->sess, 0, sizeof(cipher_ctx->sess));
@@ -392,8 +385,7 @@ static int cipher_ctrl(EVP_CIPHER_CTX *ctx, int type, int p1, void* p2)
 
 static int cipher_cleanup(EVP_CIPHER_CTX *ctx)
 {
-    struct cipher_ctx *cipher_ctx =
-        (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
+    struct cipher_ctx *cipher_ctx = (struct cipher_ctx *)EVP_CIPHER_CTX_get_cipher_data(ctx);
 
     return clean_devcrypto_session(&cipher_ctx->sess);
 }
@@ -406,21 +398,22 @@ static int cipher_cleanup(EVP_CIPHER_CTX *ctx)
  */
 static int known_cipher_nids[OSSL_NELEM(cipher_data)];
 static int known_cipher_nids_amount = -1; /* -1 indicates not yet initialised */
-static EVP_CIPHER *known_cipher_methods[OSSL_NELEM(cipher_data)] = { NULL, };
+static EVP_CIPHER *known_cipher_methods[OSSL_NELEM(cipher_data)] = {
+    NULL,
+};
 static int selected_ciphers[OSSL_NELEM(cipher_data)];
 static struct driver_info_st cipher_driver_info[OSSL_NELEM(cipher_data)];
 
-
 static int devcrypto_test_cipher(size_t cipher_data_index)
 {
     return (cipher_driver_info[cipher_data_index].status == DEVCRYPTO_STATUS_USABLE
-            && selected_ciphers[cipher_data_index] == 1
-            && (cipher_driver_info[cipher_data_index].accelerated
-                    == DEVCRYPTO_ACCELERATED
-                || use_softdrivers == DEVCRYPTO_USE_SOFTWARE
-                || (cipher_driver_info[cipher_data_index].accelerated
-                        != DEVCRYPTO_NOT_ACCELERATED
-                    && use_softdrivers == DEVCRYPTO_REJECT_SOFTWARE)));
+        && selected_ciphers[cipher_data_index] == 1
+        && (cipher_driver_info[cipher_data_index].accelerated
+                == DEVCRYPTO_ACCELERATED
+            || use_softdrivers == DEVCRYPTO_USE_SOFTWARE
+            || (cipher_driver_info[cipher_data_index].accelerated
+                    != DEVCRYPTO_NOT_ACCELERATED
+                && use_softdrivers == DEVCRYPTO_REJECT_SOFTWARE)));
 }
 
 static void prepare_cipher_methods(void)
@@ -441,7 +434,7 @@ static void prepare_cipher_methods(void)
     sess.key = (void *)"01234567890123456789012345678901234567890123456789";
 
     for (i = 0, known_cipher_nids_amount = 0;
-         i < OSSL_NELEM(cipher_data); i++) {
+        i < OSSL_NELEM(cipher_data); i++) {
 
         selected_ciphers[i] = 1;
         /*
@@ -475,28 +468,25 @@ static void prepare_cipher_methods(void)
 
         cipher_mode = cipher_data[i].flags & EVP_CIPH_MODE;
 
-        if ((known_cipher_methods[i] =
-                 EVP_CIPHER_meth_new(cipher_data[i].nid,
-                                     cipher_mode == EVP_CIPH_CTR_MODE ? 1 :
-                                                    cipher_data[i].blocksize,
-                                     cipher_data[i].keylen)) == NULL
+        if ((known_cipher_methods[i] = EVP_CIPHER_meth_new(cipher_data[i].nid,
+                 cipher_mode == EVP_CIPH_CTR_MODE ? 1 : cipher_data[i].blocksize,
+                 cipher_data[i].keylen))
+                == NULL
             || !EVP_CIPHER_meth_set_iv_length(known_cipher_methods[i],
-                                              cipher_data[i].ivlen)
+                cipher_data[i].ivlen)
             || !EVP_CIPHER_meth_set_flags(known_cipher_methods[i],
-                                          cipher_data[i].flags
-                                          | EVP_CIPH_CUSTOM_COPY
-                                          | EVP_CIPH_CTRL_INIT
-                                          | EVP_CIPH_FLAG_DEFAULT_ASN1)
+                cipher_data[i].flags
+                    | EVP_CIPH_CUSTOM_COPY
+                    | EVP_CIPH_CTRL_INIT
+                    | EVP_CIPH_FLAG_DEFAULT_ASN1)
             || !EVP_CIPHER_meth_set_init(known_cipher_methods[i], cipher_init)
             || !EVP_CIPHER_meth_set_do_cipher(known_cipher_methods[i],
-                                     cipher_mode == EVP_CIPH_CTR_MODE ?
-                                              ctr_do_cipher :
-                                              cipher_do_cipher)
+                cipher_mode == EVP_CIPH_CTR_MODE ? ctr_do_cipher : cipher_do_cipher)
             || !EVP_CIPHER_meth_set_ctrl(known_cipher_methods[i], cipher_ctrl)
             || !EVP_CIPHER_meth_set_cleanup(known_cipher_methods[i],
-                                            cipher_cleanup)
+                cipher_cleanup)
             || !EVP_CIPHER_meth_set_impl_ctx_size(known_cipher_methods[i],
-                                                  sizeof(struct cipher_ctx))) {
+                sizeof(struct cipher_ctx))) {
             cipher_driver_info[i].status = DEVCRYPTO_STATUS_FAILURE;
             EVP_CIPHER_meth_free(known_cipher_methods[i]);
             known_cipher_methods[i] = NULL;
@@ -506,17 +496,15 @@ static void prepare_cipher_methods(void)
             cipher_driver_info[i].accelerated = accelerated;
             fop.crid = sess.crid;
             if (ioctl(cfd, CIOCFINDDEV, &fop) == 0) {
-                cipher_driver_info[i].driver_name =
-                    OPENSSL_strndup(fop.name, sizeof(fop.name));
+                cipher_driver_info[i].driver_name = OPENSSL_strndup(fop.name, sizeof(fop.name));
             }
 #elif defined(CIOCGSESSINFO)
             siop.ses = sess.ses;
             if (ioctl(cfd, CIOCGSESSINFO, &siop) < 0) {
                 cipher_driver_info[i].accelerated = DEVCRYPTO_ACCELERATION_UNKNOWN;
             } else {
-                cipher_driver_info[i].driver_name =
-                    OPENSSL_strndup(siop.cipher_info.cra_driver_name,
-                                    CRYPTODEV_MAX_ALG_NAME);
+                cipher_driver_info[i].driver_name = OPENSSL_strndup(siop.cipher_info.cra_driver_name,
+                    CRYPTODEV_MAX_ALG_NAME);
                 if (!(siop.flags & SIOP_FLAG_KERNEL_DRIVER_ONLY))
                     cipher_driver_info[i].accelerated = DEVCRYPTO_NOT_ACCELERATED;
                 else
@@ -526,8 +514,7 @@ static void prepare_cipher_methods(void)
         }
         ioctl(cfd, CIOCFSESSION, &sess.ses);
         if (devcrypto_test_cipher(i)) {
-            known_cipher_nids[known_cipher_nids_amount++] =
-                cipher_data[i].nid;
+            known_cipher_nids[known_cipher_nids_amount++] = cipher_data[i].nid;
         }
     }
 }
@@ -579,7 +566,7 @@ static void destroy_all_cipher_methods(void)
 }
 
 static int devcrypto_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-                             const int **nids, int nid)
+    const int **nids, int nid)
 {
     if (cipher == NULL)
         return get_cipher_nids(nids);
@@ -624,22 +611,21 @@ static void dump_cipher_info(void)
     size_t i;
     const char *name;
 
-    fprintf (stderr, "Information about ciphers supported by the /dev/crypto"
-             " engine:\n");
+    fprintf(stderr, "Information about ciphers supported by the /dev/crypto"
+                    " engine:\n");
 #ifndef CIOCGSESSINFO
     fprintf(stderr, "CIOCGSESSINFO (session info call) unavailable\n");
 #endif
     for (i = 0; i < OSSL_NELEM(cipher_data); i++) {
         name = OBJ_nid2sn(cipher_data[i].nid);
-        fprintf (stderr, "Cipher %s, NID=%d, /dev/crypto info: id=%d, ",
-                 name ? name : "unknown", cipher_data[i].nid,
-                 cipher_data[i].devcryptoid);
+        fprintf(stderr, "Cipher %s, NID=%d, /dev/crypto info: id=%d, ",
+            name ? name : "unknown", cipher_data[i].nid,
+            cipher_data[i].devcryptoid);
         if (cipher_driver_info[i].status == DEVCRYPTO_STATUS_NO_CIOCGSESSION) {
-            fprintf (stderr, "CIOCGSESSION (session open call) failed\n");
+            fprintf(stderr, "CIOCGSESSION (session open call) failed\n");
             continue;
         }
-        fprintf (stderr, "driver=%s ", cipher_driver_info[i].driver_name ?
-                 cipher_driver_info[i].driver_name : "unknown");
+        fprintf(stderr, "driver=%s ", cipher_driver_info[i].driver_name ? cipher_driver_info[i].driver_name : "unknown");
         if (cipher_driver_info[i].accelerated == DEVCRYPTO_ACCELERATED)
             fprintf(stderr, "(hw accelerated)");
         else if (cipher_driver_info[i].accelerated == DEVCRYPTO_NOT_ACCELERATED)
@@ -647,7 +633,7 @@ static void dump_cipher_info(void)
         else
             fprintf(stderr, "(acceleration status unknown)");
         if (cipher_driver_info[i].status == DEVCRYPTO_STATUS_FAILURE)
-            fprintf (stderr, ". Cipher setup failed");
+            fprintf(stderr, ". Cipher setup failed");
         fprintf(stderr, "\n");
     }
     fprintf(stderr, "\n");
@@ -690,9 +676,9 @@ static const struct digest_data_st {
 #endif
     { NID_sha1, SHA_CBLOCK, 20, CRYPTO_SHA1 },
 #ifndef OPENSSL_NO_RMD160
-# if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_RIPEMD160)
+#if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_RIPEMD160)
     { NID_ripemd160, /* RIPEMD160_CBLOCK */ 64, 20, CRYPTO_RIPEMD160 },
-# endif
+#endif
 #endif
 #if !defined(CHECK_BSD_STYLE_MACROS) || defined(CRYPTO_SHA2_224)
     { NID_sha224, SHA256_CBLOCK, 224 / 8, CRYPTO_SHA2_224 },
@@ -746,10 +732,8 @@ static const struct digest_data_st *get_digest_data(int nid)
 
 static int digest_init(EVP_MD_CTX *ctx)
 {
-    struct digest_ctx *digest_ctx =
-        (struct digest_ctx *)EVP_MD_CTX_get0_md_data(ctx);
-    const struct digest_data_st *digest_d =
-        get_digest_data(EVP_MD_CTX_get_type(ctx));
+    struct digest_ctx *digest_ctx = (struct digest_ctx *)EVP_MD_CTX_get0_md_data(ctx);
+    const struct digest_data_st *digest_d = get_digest_data(EVP_MD_CTX_get_type(ctx));
 
     digest_ctx->init_called = 1;
 
@@ -763,7 +747,7 @@ static int digest_init(EVP_MD_CTX *ctx)
 }
 
 static int digest_op(struct digest_ctx *ctx, const void *src, size_t srclen,
-                     void *res, unsigned int flags)
+    void *res, unsigned int flags)
 {
     struct crypt_op cryp;
 
@@ -779,8 +763,7 @@ static int digest_op(struct digest_ctx *ctx, const void *src, size_t srclen,
 
 static int digest_update(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
-    struct digest_ctx *digest_ctx =
-        (struct digest_ctx *)EVP_MD_CTX_get0_md_data(ctx);
+    struct digest_ctx *digest_ctx = (struct digest_ctx *)EVP_MD_CTX_get0_md_data(ctx);
 
     if (count == 0)
         return 1;
@@ -801,8 +784,7 @@ static int digest_update(EVP_MD_CTX *ctx, const void *data, size_t count)
 
 static int digest_final(EVP_MD_CTX *ctx, unsigned char *md)
 {
-    struct digest_ctx *digest_ctx =
-        (struct digest_ctx *)EVP_MD_CTX_get0_md_data(ctx);
+    struct digest_ctx *digest_ctx = (struct digest_ctx *)EVP_MD_CTX_get0_md_data(ctx);
 
     if (md == NULL || digest_ctx == NULL)
         return 0;
@@ -819,10 +801,8 @@ static int digest_final(EVP_MD_CTX *ctx, unsigned char *md)
 
 static int digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
 {
-    struct digest_ctx *digest_from =
-        (struct digest_ctx *)EVP_MD_CTX_get0_md_data(from);
-    struct digest_ctx *digest_to =
-        (struct digest_ctx *)EVP_MD_CTX_get0_md_data(to);
+    struct digest_ctx *digest_from = (struct digest_ctx *)EVP_MD_CTX_get0_md_data(from);
+    struct digest_ctx *digest_to = (struct digest_ctx *)EVP_MD_CTX_get0_md_data(to);
     struct cphash_op cphash;
 
     if (digest_from == NULL || digest_from->init_called != 1)
@@ -844,8 +824,7 @@ static int digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from)
 
 static int digest_cleanup(EVP_MD_CTX *ctx)
 {
-    struct digest_ctx *digest_ctx =
-        (struct digest_ctx *)EVP_MD_CTX_get0_md_data(ctx);
+    struct digest_ctx *digest_ctx = (struct digest_ctx *)EVP_MD_CTX_get0_md_data(ctx);
 
     if (digest_ctx == NULL)
         return 1;
@@ -861,20 +840,22 @@ static int digest_cleanup(EVP_MD_CTX *ctx)
  */
 static int known_digest_nids[OSSL_NELEM(digest_data)];
 static int known_digest_nids_amount = -1; /* -1 indicates not yet initialised */
-static EVP_MD *known_digest_methods[OSSL_NELEM(digest_data)] = { NULL, };
+static EVP_MD *known_digest_methods[OSSL_NELEM(digest_data)] = {
+    NULL,
+};
 static int selected_digests[OSSL_NELEM(digest_data)];
 static struct driver_info_st digest_driver_info[OSSL_NELEM(digest_data)];
 
 static int devcrypto_test_digest(size_t digest_data_index)
 {
     return (digest_driver_info[digest_data_index].status == DEVCRYPTO_STATUS_USABLE
-            && selected_digests[digest_data_index] == 1
-            && (digest_driver_info[digest_data_index].accelerated
-                    == DEVCRYPTO_ACCELERATED
-                || use_softdrivers == DEVCRYPTO_USE_SOFTWARE
-                || (digest_driver_info[digest_data_index].accelerated
-                        != DEVCRYPTO_NOT_ACCELERATED
-                    && use_softdrivers == DEVCRYPTO_REJECT_SOFTWARE)));
+        && selected_digests[digest_data_index] == 1
+        && (digest_driver_info[digest_data_index].accelerated
+                == DEVCRYPTO_ACCELERATED
+            || use_softdrivers == DEVCRYPTO_USE_SOFTWARE
+            || (digest_driver_info[digest_data_index].accelerated
+                    != DEVCRYPTO_NOT_ACCELERATED
+                && use_softdrivers == DEVCRYPTO_REJECT_SOFTWARE)));
 }
 
 static void rebuild_known_digest_nids(ENGINE *e)
@@ -904,7 +885,7 @@ static void prepare_digest_methods(void)
     memset(&sess2, 0, sizeof(sess2));
 
     for (i = 0, known_digest_nids_amount = 0; i < OSSL_NELEM(digest_data);
-         i++) {
+        i++) {
 
         selected_digests[i] = 1;
 
@@ -924,9 +905,8 @@ static void prepare_digest_methods(void)
         if (ioctl(cfd, CIOCGSESSINFO, &siop) < 0) {
             digest_driver_info[i].accelerated = DEVCRYPTO_ACCELERATION_UNKNOWN;
         } else {
-            digest_driver_info[i].driver_name =
-                OPENSSL_strndup(siop.hash_info.cra_driver_name,
-                                CRYPTODEV_MAX_ALG_NAME);
+            digest_driver_info[i].driver_name = OPENSSL_strndup(siop.hash_info.cra_driver_name,
+                CRYPTODEV_MAX_ALG_NAME);
             if (siop.flags & SIOP_FLAG_KERNEL_DRIVER_ONLY)
                 digest_driver_info[i].accelerated = DEVCRYPTO_ACCELERATED;
             else
@@ -947,25 +927,26 @@ static void prepare_digest_methods(void)
             goto finish;
         }
         if ((known_digest_methods[i] = EVP_MD_meth_new(digest_data[i].nid,
-                                                       NID_undef)) == NULL
+                 NID_undef))
+                == NULL
             || !EVP_MD_meth_set_input_blocksize(known_digest_methods[i],
-                                                digest_data[i].blocksize)
+                digest_data[i].blocksize)
             || !EVP_MD_meth_set_result_size(known_digest_methods[i],
-                                            digest_data[i].digestlen)
+                digest_data[i].digestlen)
             || !EVP_MD_meth_set_init(known_digest_methods[i], digest_init)
             || !EVP_MD_meth_set_update(known_digest_methods[i], digest_update)
             || !EVP_MD_meth_set_final(known_digest_methods[i], digest_final)
             || !EVP_MD_meth_set_copy(known_digest_methods[i], digest_copy)
             || !EVP_MD_meth_set_cleanup(known_digest_methods[i], digest_cleanup)
             || !EVP_MD_meth_set_app_datasize(known_digest_methods[i],
-                                             sizeof(struct digest_ctx))) {
+                sizeof(struct digest_ctx))) {
             digest_driver_info[i].status = DEVCRYPTO_STATUS_FAILURE;
             EVP_MD_meth_free(known_digest_methods[i]);
             known_digest_methods[i] = NULL;
             goto finish;
         }
         digest_driver_info[i].status = DEVCRYPTO_STATUS_USABLE;
-finish:
+    finish:
         ioctl(cfd, CIOCFSESSION, &sess1.ses);
         if (sess2.ses != 0)
             ioctl(cfd, CIOCFSESSION, &sess2.ses);
@@ -1009,7 +990,7 @@ static void destroy_all_digest_methods(void)
 }
 
 static int devcrypto_digests(ENGINE *e, const EVP_MD **digest,
-                             const int **nids, int nid)
+    const int **nids, int nid)
 {
     if (digest == NULL)
         return get_digest_nids(nids);
@@ -1054,20 +1035,20 @@ static void dump_digest_info(void)
     size_t i;
     const char *name;
 
-    fprintf (stderr, "Information about digests supported by the /dev/crypto"
-             " engine:\n");
+    fprintf(stderr, "Information about digests supported by the /dev/crypto"
+                    " engine:\n");
 #ifndef CIOCGSESSINFO
     fprintf(stderr, "CIOCGSESSINFO (session info call) unavailable\n");
 #endif
 
     for (i = 0; i < OSSL_NELEM(digest_data); i++) {
         name = OBJ_nid2sn(digest_data[i].nid);
-        fprintf (stderr, "Digest %s, NID=%d, /dev/crypto info: id=%d, driver=%s",
-                 name ? name : "unknown", digest_data[i].nid,
-                 digest_data[i].devcryptoid,
-                 digest_driver_info[i].driver_name ? digest_driver_info[i].driver_name : "unknown");
+        fprintf(stderr, "Digest %s, NID=%d, /dev/crypto info: id=%d, driver=%s",
+            name ? name : "unknown", digest_data[i].nid,
+            digest_data[i].devcryptoid,
+            digest_driver_info[i].driver_name ? digest_driver_info[i].driver_name : "unknown");
         if (digest_driver_info[i].status == DEVCRYPTO_STATUS_NO_CIOCGSESSION) {
-            fprintf (stderr, ". CIOCGSESSION (session open) failed\n");
+            fprintf(stderr, ". CIOCGSESSION (session open) failed\n");
             continue;
         }
         if (digest_driver_info[i].accelerated == DEVCRYPTO_ACCELERATED)
@@ -1077,7 +1058,7 @@ static void dump_digest_info(void)
         else
             fprintf(stderr, " (acceleration status unknown)");
         if (cipher_driver_info[i].status == DEVCRYPTO_STATUS_FAILURE)
-            fprintf (stderr, ". Cipher setup failed\n");
+            fprintf(stderr, ". Cipher setup failed\n");
         else if (digest_driver_info[i].status == DEVCRYPTO_STATUS_NO_CIOCCPHASH)
             fprintf(stderr, ", CIOCCPHASH failed\n");
         else
@@ -1101,38 +1082,33 @@ static void dump_digest_info(void)
 
 static const ENGINE_CMD_DEFN devcrypto_cmds[] = {
 #if defined(CIOCGSESSINFO) || defined(CIOCGSESSION2)
-   {DEVCRYPTO_CMD_USE_SOFTDRIVERS,
-    "USE_SOFTDRIVERS",
-    "specifies whether to use software (not accelerated) drivers ("
-        OPENSSL_MSTR(DEVCRYPTO_REQUIRE_ACCELERATED) "=use only accelerated drivers, "
-        OPENSSL_MSTR(DEVCRYPTO_USE_SOFTWARE) "=allow all drivers, "
-        OPENSSL_MSTR(DEVCRYPTO_REJECT_SOFTWARE)
-        "=use if acceleration can't be determined) [default="
-        OPENSSL_MSTR(DEVCRYPTO_DEFAULT_USE_SOFTDRIVERS) "]",
-    ENGINE_CMD_FLAG_NUMERIC},
+    { DEVCRYPTO_CMD_USE_SOFTDRIVERS,
+        "USE_SOFTDRIVERS",
+        "specifies whether to use software (not accelerated) drivers (" OPENSSL_MSTR(DEVCRYPTO_REQUIRE_ACCELERATED) "=use only accelerated drivers, " OPENSSL_MSTR(DEVCRYPTO_USE_SOFTWARE) "=allow all drivers, " OPENSSL_MSTR(DEVCRYPTO_REJECT_SOFTWARE) "=use if acceleration can't be determined) [default=" OPENSSL_MSTR(DEVCRYPTO_DEFAULT_USE_SOFTDRIVERS) "]",
+        ENGINE_CMD_FLAG_NUMERIC },
 #endif
 
-   {DEVCRYPTO_CMD_CIPHERS,
-    "CIPHERS",
-    "either ALL, NONE, or a comma-separated list of ciphers to enable [default=ALL]",
-    ENGINE_CMD_FLAG_STRING},
+    { DEVCRYPTO_CMD_CIPHERS,
+        "CIPHERS",
+        "either ALL, NONE, or a comma-separated list of ciphers to enable [default=ALL]",
+        ENGINE_CMD_FLAG_STRING },
 
 #ifdef IMPLEMENT_DIGEST
-   {DEVCRYPTO_CMD_DIGESTS,
-    "DIGESTS",
-    "either ALL, NONE, or a comma-separated list of digests to enable [default=ALL]",
-    ENGINE_CMD_FLAG_STRING},
+    { DEVCRYPTO_CMD_DIGESTS,
+        "DIGESTS",
+        "either ALL, NONE, or a comma-separated list of digests to enable [default=ALL]",
+        ENGINE_CMD_FLAG_STRING },
 #endif
 
-   {DEVCRYPTO_CMD_DUMP_INFO,
-    "DUMP_INFO",
-    "dump info about each algorithm to stderr; use 'openssl engine -pre DUMP_INFO devcrypto'",
-    ENGINE_CMD_FLAG_NO_INPUT},
+    { DEVCRYPTO_CMD_DUMP_INFO,
+        "DUMP_INFO",
+        "dump info about each algorithm to stderr; use 'openssl engine -pre DUMP_INFO devcrypto'",
+        ENGINE_CMD_FLAG_NO_INPUT },
 
-   {0, NULL, NULL, 0}
+    { 0, NULL, NULL, 0 }
 };
 
-static int devcrypto_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
+static int devcrypto_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 {
     int *new_list;
     switch (cmd) {
@@ -1162,10 +1138,10 @@ static int devcrypto_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
             return 1;
         if (OPENSSL_strcasecmp((const char *)p, "ALL") == 0) {
             devcrypto_select_all_ciphers(selected_ciphers);
-        } else if (OPENSSL_strcasecmp((const char*)p, "NONE") == 0) {
+        } else if (OPENSSL_strcasecmp((const char *)p, "NONE") == 0) {
             memset(selected_ciphers, 0, sizeof(selected_ciphers));
         } else {
-            new_list=OPENSSL_zalloc(sizeof(selected_ciphers));
+            new_list = OPENSSL_zalloc(sizeof(selected_ciphers));
             if (!CONF_parse_list(p, ',', 1, cryptodev_select_cipher_cb, new_list)) {
                 OPENSSL_free(new_list);
                 return 0;
@@ -1182,10 +1158,10 @@ static int devcrypto_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void))
             return 1;
         if (OPENSSL_strcasecmp((const char *)p, "ALL") == 0) {
             devcrypto_select_all_digests(selected_digests);
-        } else if (OPENSSL_strcasecmp((const char*)p, "NONE") == 0) {
+        } else if (OPENSSL_strcasecmp((const char *)p, "NONE") == 0) {
             memset(selected_digests, 0, sizeof(selected_digests));
         } else {
-            new_list=OPENSSL_zalloc(sizeof(selected_digests));
+            new_list = OPENSSL_zalloc(sizeof(selected_digests));
             if (!CONF_parse_list(p, ',', 1, cryptodev_select_digest_cb, new_list)) {
                 OPENSSL_free(new_list);
                 return 0;
@@ -1276,7 +1252,8 @@ static int devcrypto_unload(ENGINE *e)
     return 1;
 }
 
-static int bind_devcrypto(ENGINE *e) {
+static int bind_devcrypto(ENGINE *e)
+{
 
     if (!ENGINE_set_id(e, engine_devcrypto_id)
         || !ENGINE_set_name(e, "/dev/crypto engine")
@@ -1316,17 +1293,17 @@ static int bind_devcrypto(ENGINE *e) {
  */
 #if 0
         && ENGINE_set_RSA(e, devcrypto_rsa)
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
         && ENGINE_set_DSA(e, devcrypto_dsa)
-# endif
-# ifndef OPENSSL_NO_DH
+#endif
+#ifndef OPENSSL_NO_DH
         && ENGINE_set_DH(e, devcrypto_dh)
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
         && ENGINE_set_EC(e, devcrypto_ec)
-# endif
 #endif
-        );
+#endif
+    );
 }
 
 #ifdef OPENSSL_NO_DYNAMIC_ENGINE
@@ -1354,7 +1331,7 @@ void engine_load_devcrypto_int(void)
      * If the "add" worked, it gets a structural reference. So either way, we
      * release our just-created reference.
      */
-    ENGINE_free(e);          /* Loose our local reference */
+    ENGINE_free(e); /* Loose our local reference */
     /*
      * If the "add" didn't work, it was probably a conflict because it was
      * already added (eg. someone calling ENGINE_load_blah then calling
diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c
index 21e0ed25f8b3b..1141c1535dbc8 100644
--- a/engines/e_loader_attic.c
+++ b/engines/e_loader_attic.c
@@ -21,29 +21,31 @@
 #include <assert.h>
 
 #include <openssl/bio.h>
-#include <openssl/dsa.h>         /* For d2i_DSAPrivateKey */
+#include <openssl/dsa.h> /* For d2i_DSAPrivateKey */
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
-#include <openssl/pkcs12.h>      /* For the PKCS8 stuff o.O */
-#include <openssl/rsa.h>         /* For d2i_RSAPrivateKey */
+#include <openssl/pkcs12.h> /* For the PKCS8 stuff o.O */
+#include <openssl/rsa.h> /* For d2i_RSAPrivateKey */
 #include <openssl/safestack.h>
 #include <openssl/store.h>
 #include <openssl/ui.h>
 #include <openssl/engine.h>
-#include <openssl/x509.h>        /* For the PKCS8 stuff o.O */
-#include "internal/asn1.h"       /* For asn1_d2i_read_bio */
+#include <openssl/x509.h> /* For the PKCS8 stuff o.O */
+#include "internal/asn1.h" /* For asn1_d2i_read_bio */
 #include "internal/o_dir.h"
 #include "internal/cryptlib.h"
-#include "crypto/ctype.h"        /* For ossl_isdigit */
-#include "crypto/pem.h"          /* For PVK and "blob" PEM headers */
+#include "crypto/ctype.h" /* For ossl_isdigit */
+#include "crypto/pem.h" /* For PVK and "blob" PEM headers */
 
+/* clang-format off */
 #include "e_loader_attic_err.c"
+/* clang-format on */
 
 DEFINE_STACK_OF(OSSL_STORE_INFO)
 
 #ifndef S_ISDIR
-# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
+#define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
 #endif
 
 /*-
@@ -52,8 +54,8 @@ DEFINE_STACK_OF(OSSL_STORE_INFO)
  */
 
 static char *file_get_pass(const UI_METHOD *ui_method, char *pass,
-                           size_t maxsize, const char *desc, const char *info,
-                           void *data)
+    size_t maxsize, const char *desc, const char *info,
+    void *data)
 {
     UI *ui = UI_new();
     char *prompt = NULL;
@@ -71,7 +73,8 @@ static char *file_get_pass(const UI_METHOD *ui_method, char *pass,
         ATTICerr(0, ERR_R_UI_LIB);
         pass = NULL;
     } else if (UI_add_input_string(ui, prompt, UI_INPUT_FLAG_DEFAULT_PWD,
-                                    pass, 0, maxsize - 1) <= 0) {
+                   pass, 0, maxsize - 1)
+        <= 0) {
         ATTICerr(0, ERR_R_UI_LIB);
         pass = NULL;
     } else {
@@ -102,8 +105,8 @@ struct pem_pass_data {
 };
 
 static int file_fill_pem_pass_data(struct pem_pass_data *pass_data,
-                                   const char *desc, const char *info,
-                                   const UI_METHOD *ui_method, void *ui_data)
+    const char *desc, const char *info,
+    const UI_METHOD *ui_method, void *ui_data)
 {
     if (pass_data == NULL)
         return 0;
@@ -119,8 +122,8 @@ static int file_get_pem_pass(char *buf, int num, int w, void *data)
 {
     struct pem_pass_data *pass_data = data;
     char *pass = file_get_pass(pass_data->ui_method, buf, num,
-                               pass_data->prompt_desc, pass_data->prompt_info,
-                               pass_data->data);
+        pass_data->prompt_desc, pass_data->prompt_info,
+        pass_data->data);
 
     return pass == NULL ? 0 : strlen(pass);
 }
@@ -158,7 +161,7 @@ static int check_suffix(const char *str, const char *suffix)
  * new PEM name.
  */
 /* Negative numbers are never used for public OSSL_STORE_INFO types */
-#define STORE_INFO_EMBEDDED       -1
+#define STORE_INFO_EMBEDDED -1
 
 /* This is the embedded data */
 struct embedded_st {
@@ -185,7 +188,7 @@ static void store_info_free(OSSL_STORE_INFO *info)
 }
 
 static OSSL_STORE_INFO *new_EMBEDDED(const char *new_pem_name,
-                                     BUF_MEM *embedded)
+    BUF_MEM *embedded)
 {
     OSSL_STORE_INFO *info = NULL;
     struct embedded_st *data = NULL;
@@ -199,8 +202,7 @@ static OSSL_STORE_INFO *new_EMBEDDED(const char *new_pem_name,
     }
 
     data->blob = embedded;
-    data->pem_name =
-        new_pem_name == NULL ? NULL : OPENSSL_strdup(new_pem_name);
+    data->pem_name = new_pem_name == NULL ? NULL : OPENSSL_strdup(new_pem_name);
 
     if (new_pem_name != NULL && data->pem_name == NULL) {
         store_info_free(info);
@@ -254,14 +256,14 @@ static OSSL_STORE_INFO *new_EMBEDDED(const char *new_pem_name,
  *    an OSSL_STORE_INFO
  */
 typedef OSSL_STORE_INFO *(*file_try_decode_fn)(const char *pem_name,
-                                               const char *pem_header,
-                                               const unsigned char *blob,
-                                               size_t len, void **handler_ctx,
-                                               int *matchcount,
-                                               const UI_METHOD *ui_method,
-                                               void *ui_data, const char *uri,
-                                               OSSL_LIB_CTX *libctx,
-                                               const char *propq);
+    const char *pem_header,
+    const unsigned char *blob,
+    size_t len, void **handler_ctx,
+    int *matchcount,
+    const UI_METHOD *ui_method,
+    void *ui_data, const char *uri,
+    OSSL_LIB_CTX *libctx,
+    const char *propq);
 /*
  * The eof function should return 1 if there's no more data to be found
  * with the handler_ctx, otherwise 0.  This is only used when the handler is
@@ -291,14 +293,14 @@ typedef struct file_handler_st {
  * then serving them one piece at a time.
  */
 static OSSL_STORE_INFO *try_decode_PKCS12(const char *pem_name,
-                                          const char *pem_header,
-                                          const unsigned char *blob,
-                                          size_t len, void **pctx,
-                                          int *matchcount,
-                                          const UI_METHOD *ui_method,
-                                          void *ui_data, const char *uri,
-                                          OSSL_LIB_CTX *libctx,
-                                          const char *propq)
+    const char *pem_header,
+    const unsigned char *blob,
+    size_t len, void **pctx,
+    int *matchcount,
+    const UI_METHOD *ui_method,
+    void *ui_data, const char *uri,
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     OSSL_STORE_INFO *store_info = NULL;
     STACK_OF(OSSL_STORE_INFO) *ctx = *pctx;
@@ -326,8 +328,9 @@ static OSSL_STORE_INFO *try_decode_PKCS12(const char *pem_name,
                 pass = "";
             } else {
                 if ((pass = file_get_pass(ui_method, tpass, PEM_BUFSIZE,
-                                          "PKCS12 import", uri,
-                                          ui_data)) == NULL) {
+                         "PKCS12 import", uri,
+                         ui_data))
+                    == NULL) {
                     ATTICerr(0, ATTIC_R_PASSPHRASE_CALLBACK_ERROR);
                     goto p12_end;
                 }
@@ -386,7 +389,7 @@ static OSSL_STORE_INFO *try_decode_PKCS12(const char *pem_name,
                 *pctx = ctx;
             }
         }
-     p12_end:
+    p12_end:
         PKCS12_free(p12);
         if (ctx == NULL)
             return NULL;
@@ -426,15 +429,15 @@ static FILE_HANDLER PKCS12_handler = {
  * decoding process will then start over with the new blob.
  */
 static OSSL_STORE_INFO *try_decode_PKCS8Encrypted(const char *pem_name,
-                                                  const char *pem_header,
-                                                  const unsigned char *blob,
-                                                  size_t len, void **pctx,
-                                                  int *matchcount,
-                                                  const UI_METHOD *ui_method,
-                                                  void *ui_data,
-                                                  const char *uri,
-                                                  OSSL_LIB_CTX *libctx,
-                                                  const char *propq)
+    const char *pem_header,
+    const unsigned char *blob,
+    size_t len, void **pctx,
+    int *matchcount,
+    const UI_METHOD *ui_method,
+    void *ui_data,
+    const char *uri,
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     X509_SIG *p8 = NULL;
     char kbuf[PEM_BUFSIZE];
@@ -463,15 +466,16 @@ static OSSL_STORE_INFO *try_decode_PKCS8Encrypted(const char *pem_name,
     }
 
     if ((pass = file_get_pass(ui_method, kbuf, PEM_BUFSIZE,
-                              "PKCS8 decrypt pass phrase", uri,
-                              ui_data)) == NULL) {
+             "PKCS8 decrypt pass phrase", uri,
+             ui_data))
+        == NULL) {
         ATTICerr(0, ATTIC_R_BAD_PASSWORD_READ);
         goto nop8;
     }
 
     X509_SIG_get0(p8, &dalg, &doct);
     if (!PKCS12_pbe_crypt(dalg, pass, strlen(pass), doct->data, doct->length,
-                          &new_data, &new_data_len, 0))
+            &new_data, &new_data_len, 0))
         goto nop8;
 
     mem->data = (char *)new_data;
@@ -486,7 +490,7 @@ static OSSL_STORE_INFO *try_decode_PKCS8Encrypted(const char *pem_name,
     }
 
     return store_info;
- nop8:
+nop8:
     X509_SIG_free(p8);
     BUF_MEM_free(mem);
     return NULL;
@@ -503,14 +507,14 @@ static FILE_HANDLER PKCS8Encrypted_handler = {
  * the PEM name).
  */
 static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name,
-                                              const char *pem_header,
-                                              const unsigned char *blob,
-                                              size_t len, void **pctx,
-                                              int *matchcount,
-                                              const UI_METHOD *ui_method,
-                                              void *ui_data, const char *uri,
-                                              OSSL_LIB_CTX *libctx,
-                                              const char *propq)
+    const char *pem_header,
+    const unsigned char *blob,
+    size_t len, void **pctx,
+    int *matchcount,
+    const UI_METHOD *ui_method,
+    void *ui_data, const char *uri,
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     OSSL_STORE_INFO *store_info = NULL;
     EVP_PKEY *pkey = NULL;
@@ -518,8 +522,7 @@ static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name,
 
     if (pem_name != NULL) {
         if (strcmp(pem_name, PEM_STRING_PKCS8INF) == 0) {
-            PKCS8_PRIV_KEY_INFO *p8inf =
-                d2i_PKCS8_PRIV_KEY_INFO(NULL, &blob, len);
+            PKCS8_PRIV_KEY_INFO *p8inf = d2i_PKCS8_PRIV_KEY_INFO(NULL, &blob, len);
 
             *matchcount = 1;
             if (p8inf != NULL)
@@ -531,12 +534,13 @@ static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name,
 
             if ((slen = check_suffix(pem_name, "PRIVATE KEY")) > 0
                 && (ameth = EVP_PKEY_asn1_find_str(NULL, pem_name,
-                                                   slen)) != NULL
+                        slen))
+                    != NULL
                 && EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL,
-                                           ameth)) {
+                    ameth)) {
                 *matchcount = 1;
                 pkey = d2i_PrivateKey_ex(pkey_id, NULL, &blob, len,
-                                         libctx, propq);
+                    libctx, propq);
             }
         }
     } else {
@@ -545,8 +549,7 @@ static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name,
         ENGINE *curengine = ENGINE_get_first();
 
         while (curengine != NULL) {
-            ENGINE_PKEY_ASN1_METHS_PTR asn1meths =
-                ENGINE_get_pkey_asn1_meths(curengine);
+            ENGINE_PKEY_ASN1_METHS_PTR asn1meths = ENGINE_get_pkey_asn1_meths(curengine);
 
             if (asn1meths != NULL) {
                 const int *nids = NULL;
@@ -560,15 +563,15 @@ static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name,
 
                     if (!asn1meths(curengine, &ameth2, NULL, nids[i])
                         || !EVP_PKEY_asn1_get0_info(&pkey_id, NULL,
-                                                    &pkey_flags, NULL, NULL,
-                                                    ameth2)
+                            &pkey_flags, NULL, NULL,
+                            ameth2)
                         || (pkey_flags & ASN1_PKEY_ALIAS) != 0)
                         continue;
 
                     ERR_set_mark(); /* prevent flooding error queue */
                     tmp_pkey = d2i_PrivateKey_ex(pkey_id, NULL,
-                                                 &tmp_blob, len,
-                                                 libctx, propq);
+                        &tmp_blob, len,
+                        libctx, propq);
                     if (tmp_pkey != NULL) {
                         if (pkey != NULL)
                             EVP_PKEY_free(tmp_pkey);
@@ -590,13 +593,13 @@ static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name,
 
             ameth = EVP_PKEY_asn1_get0(i);
             if (!EVP_PKEY_asn1_get0_info(&pkey_id, NULL, &pkey_flags, NULL,
-                                         NULL, ameth)
+                    NULL, ameth)
                 || (pkey_flags & ASN1_PKEY_ALIAS) != 0)
                 continue;
 
             ERR_set_mark(); /* prevent flooding error queue */
             tmp_pkey = d2i_PrivateKey_ex(pkey_id, NULL, &tmp_blob, len,
-                                         libctx, propq);
+                libctx, propq);
             if (tmp_pkey != NULL) {
                 if (pkey != NULL)
                     EVP_PKEY_free(tmp_pkey);
@@ -632,14 +635,14 @@ static FILE_HANDLER PrivateKey_handler = {
  * Public key decoder.  Only supports SubjectPublicKeyInfo formatted keys.
  */
 static OSSL_STORE_INFO *try_decode_PUBKEY(const char *pem_name,
-                                          const char *pem_header,
-                                          const unsigned char *blob,
-                                          size_t len, void **pctx,
-                                          int *matchcount,
-                                          const UI_METHOD *ui_method,
-                                          void *ui_data, const char *uri,
-                                          OSSL_LIB_CTX *libctx,
-                                          const char *propq)
+    const char *pem_header,
+    const unsigned char *blob,
+    size_t len, void **pctx,
+    int *matchcount,
+    const UI_METHOD *ui_method,
+    void *ui_data, const char *uri,
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     OSSL_STORE_INFO *store_info = NULL;
     EVP_PKEY *pkey = NULL;
@@ -668,14 +671,14 @@ static FILE_HANDLER PUBKEY_handler = {
  * Key parameter decoder.
  */
 static OSSL_STORE_INFO *try_decode_params(const char *pem_name,
-                                          const char *pem_header,
-                                          const unsigned char *blob,
-                                          size_t len, void **pctx,
-                                          int *matchcount,
-                                          const UI_METHOD *ui_method,
-                                          void *ui_data, const char *uri,
-                                          OSSL_LIB_CTX *libctx,
-                                          const char *propq)
+    const char *pem_header,
+    const unsigned char *blob,
+    size_t len, void **pctx,
+    int *matchcount,
+    const UI_METHOD *ui_method,
+    void *ui_data, const char *uri,
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     OSSL_STORE_INFO *store_info = NULL;
     EVP_PKEY *pkey = NULL;
@@ -688,7 +691,7 @@ static OSSL_STORE_INFO *try_decode_params(const char *pem_name,
         if ((slen = check_suffix(pem_name, "PARAMETERS")) > 0
             && (ameth = EVP_PKEY_asn1_find_str(NULL, pem_name, slen)) != NULL
             && EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL,
-                                       ameth)) {
+                ameth)) {
             *matchcount = 1;
             pkey = d2i_KeyParams(pkey_id, NULL, &blob, len);
         }
@@ -702,7 +705,7 @@ static OSSL_STORE_INFO *try_decode_params(const char *pem_name,
 
             ameth = EVP_PKEY_asn1_get0(i);
             if (!EVP_PKEY_asn1_get0_info(&pkey_id, NULL, &pkey_flags, NULL,
-                                         NULL, ameth)
+                    NULL, ameth)
                 || (pkey_flags & ASN1_PKEY_ALIAS) != 0)
                 continue;
 
@@ -745,15 +748,15 @@ static FILE_HANDLER params_handler = {
  * X.509 certificate decoder.
  */
 static OSSL_STORE_INFO *try_decode_X509Certificate(const char *pem_name,
-                                                   const char *pem_header,
-                                                   const unsigned char *blob,
-                                                   size_t len, void **pctx,
-                                                   int *matchcount,
-                                                   const UI_METHOD *ui_method,
-                                                   void *ui_data,
-                                                   const char *uri,
-                                                   OSSL_LIB_CTX *libctx,
-                                                   const char *propq)
+    const char *pem_header,
+    const unsigned char *blob,
+    size_t len, void **pctx,
+    int *matchcount,
+    const UI_METHOD *ui_method,
+    void *ui_data,
+    const char *uri,
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     OSSL_STORE_INFO *store_info = NULL;
     X509 *cert = NULL;
@@ -771,7 +774,7 @@ static OSSL_STORE_INFO *try_decode_X509Certificate(const char *pem_name,
         if (strcmp(pem_name, PEM_STRING_X509_TRUSTED) == 0)
             ignore_trusted = 0;
         else if (strcmp(pem_name, PEM_STRING_X509_OLD) != 0
-                 && strcmp(pem_name, PEM_STRING_X509) != 0)
+            && strcmp(pem_name, PEM_STRING_X509) != 0)
             /* No match */
             return NULL;
         *matchcount = 1;
@@ -802,14 +805,14 @@ static FILE_HANDLER X509Certificate_handler = {
  * X.509 CRL decoder.
  */
 static OSSL_STORE_INFO *try_decode_X509CRL(const char *pem_name,
-                                           const char *pem_header,
-                                           const unsigned char *blob,
-                                           size_t len, void **pctx,
-                                           int *matchcount,
-                                           const UI_METHOD *ui_method,
-                                           void *ui_data, const char *uri,
-                                           OSSL_LIB_CTX *libctx,
-                                           const char *propq)
+    const char *pem_header,
+    const unsigned char *blob,
+    size_t len, void **pctx,
+    int *matchcount,
+    const UI_METHOD *ui_method,
+    void *ui_data, const char *uri,
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     OSSL_STORE_INFO *store_info = NULL;
     X509_CRL *crl = NULL;
@@ -850,22 +853,21 @@ static const FILE_HANDLER *file_handlers[] = {
     &PrivateKey_handler,
 };
 
-
 /*-
  *  The loader itself
  *  -----------------
  */
 
 struct ossl_store_loader_ctx_st {
-    char *uri;                   /* The URI we currently try to load */
+    char *uri; /* The URI we currently try to load */
     enum {
         is_raw = 0,
         is_pem,
         is_dir
     } type;
     int errcnt;
-#define FILE_FLAG_SECMEM         (1<<0)
-#define FILE_FLAG_ATTACHED       (1<<1)
+#define FILE_FLAG_SECMEM (1 << 0)
+#define FILE_FLAG_ATTACHED (1 << 1)
     unsigned int flags;
     union {
         struct { /* Used with is_raw and is_pem */
@@ -926,7 +928,9 @@ static void OSSL_STORE_LOADER_CTX_free(OSSL_STORE_LOADER_CTX *ctx)
 static int file_find_type(OSSL_STORE_LOADER_CTX *ctx)
 {
     BIO *buff = NULL;
-    char peekbuf[4096] = { 0, };
+    char peekbuf[4096] = {
+        0,
+    };
 
     if ((buff = BIO_new(BIO_f_buffer())) == NULL)
         return 0;
@@ -940,16 +944,15 @@ static int file_find_type(OSSL_STORE_LOADER_CTX *ctx)
     return 1;
 }
 
-static OSSL_STORE_LOADER_CTX *file_open_ex
-    (const OSSL_STORE_LOADER *loader, const char *uri,
-     OSSL_LIB_CTX *libctx, const char *propq,
-     const UI_METHOD *ui_method, void *ui_data)
+static OSSL_STORE_LOADER_CTX *file_open_ex(const OSSL_STORE_LOADER *loader, const char *uri,
+    OSSL_LIB_CTX *libctx, const char *propq,
+    const UI_METHOD *ui_method, void *ui_data)
 {
     OSSL_STORE_LOADER_CTX *ctx = NULL;
     struct stat st;
     struct {
         const char *path;
-        unsigned int check_absolute:1;
+        unsigned int check_absolute : 1;
     } path_data[2];
     size_t path_data_n = 0, i;
     const char *path, *p = uri, *q;
@@ -969,9 +972,9 @@ static OSSL_STORE_LOADER_CTX *file_open_ex
     if (CHECK_AND_SKIP_CASE_PREFIX(p, "file:")) {
         q = p;
         if (CHECK_AND_SKIP_PREFIX(q, "//")) {
-            path_data_n--;           /* Invalidate using the full URI */
+            path_data_n--; /* Invalidate using the full URI */
             if (CHECK_AND_SKIP_CASE_PREFIX(q, "localhost/")
-                    || CHECK_AND_SKIP_PREFIX(q, "/")) {
+                || CHECK_AND_SKIP_PREFIX(q, "/")) {
                 p = q - 1;
             } else {
                 ATTICerr(0, ATTIC_R_URI_AUTHORITY_UNSUPPORTED);
@@ -995,7 +998,6 @@ static OSSL_STORE_LOADER_CTX *file_open_ex
         path_data[path_data_n++].path = p;
     }
 
-
     for (i = 0, path = NULL; path == NULL && i < path_data_n; i++) {
         /*
          * If the scheme "file" was an explicit part of the URI, the path must
@@ -1009,8 +1011,8 @@ static OSSL_STORE_LOADER_CTX *file_open_ex
 
         if (stat(path_data[i].path, &st) < 0) {
             ERR_raise_data(ERR_LIB_SYS, errno,
-                           "calling stat(%s)",
-                           path_data[i].path);
+                "calling stat(%s)",
+                path_data[i].path);
         } else {
             path = path_data[i].path;
         }
@@ -1040,7 +1042,7 @@ static OSSL_STORE_LOADER_CTX *file_open_ex
             ctx->_.dir.end_reached = 1;
         }
     } else if ((ctx->_.file.file = BIO_new_file(path, "rb")) == NULL
-               || !file_find_type(ctx)) {
+        || !file_find_type(ctx)) {
         BIO_free_all(ctx->_.file.file);
         goto err;
     }
@@ -1052,22 +1054,20 @@ static OSSL_STORE_LOADER_CTX *file_open_ex
     ctx->libctx = libctx;
 
     return ctx;
- err:
+err:
     OSSL_STORE_LOADER_CTX_free(ctx);
     return NULL;
 }
 
-static OSSL_STORE_LOADER_CTX *file_open
-    (const OSSL_STORE_LOADER *loader, const char *uri,
-     const UI_METHOD *ui_method, void *ui_data)
+static OSSL_STORE_LOADER_CTX *file_open(const OSSL_STORE_LOADER *loader, const char *uri,
+    const UI_METHOD *ui_method, void *ui_data)
 {
     return file_open_ex(loader, uri, NULL, NULL, ui_method, ui_data);
 }
 
-static OSSL_STORE_LOADER_CTX *file_attach
-    (const OSSL_STORE_LOADER *loader, BIO *bp,
-     OSSL_LIB_CTX *libctx, const char *propq,
-     const UI_METHOD *ui_method, void *ui_data)
+static OSSL_STORE_LOADER_CTX *file_attach(const OSSL_STORE_LOADER *loader, BIO *bp,
+    OSSL_LIB_CTX *libctx, const char *propq,
+    const UI_METHOD *ui_method, void *ui_data)
 {
     OSSL_STORE_LOADER_CTX *ctx = NULL;
 
@@ -1095,24 +1095,22 @@ static int file_ctrl(OSSL_STORE_LOADER_CTX *ctx, int cmd, va_list args)
     int ret = 1;
 
     switch (cmd) {
-    case OSSL_STORE_C_USE_SECMEM:
-        {
-            int on = *(va_arg(args, int *));
+    case OSSL_STORE_C_USE_SECMEM: {
+        int on = *(va_arg(args, int *));
 
-            switch (on) {
-            case 0:
-                ctx->flags &= ~FILE_FLAG_SECMEM;
-                break;
-            case 1:
-                ctx->flags |= FILE_FLAG_SECMEM;
-                break;
-            default:
-                ATTICerr(0, ERR_R_PASSED_INVALID_ARGUMENT);
-                ret = 0;
-                break;
-            }
+        switch (on) {
+        case 0:
+            ctx->flags &= ~FILE_FLAG_SECMEM;
+            break;
+        case 1:
+            ctx->flags |= FILE_FLAG_SECMEM;
+            break;
+        default:
+            ATTICerr(0, ERR_R_PASSED_INVALID_ARGUMENT);
+            ret = 0;
+            break;
         }
-        break;
+    } break;
     default:
         break;
     }
@@ -1127,7 +1125,7 @@ static int file_expect(OSSL_STORE_LOADER_CTX *ctx, int expected)
 }
 
 static int file_find(OSSL_STORE_LOADER_CTX *ctx,
-                     const OSSL_STORE_SEARCH *search)
+    const OSSL_STORE_SEARCH *search)
 {
     /*
      * If ctx == NULL, the library is looking to know if this loader supports
@@ -1146,9 +1144,9 @@ static int file_find(OSSL_STORE_LOADER_CTX *ctx,
         }
 
         hash = X509_NAME_hash_ex(OSSL_STORE_SEARCH_get0_name(search),
-                                 NULL, NULL, NULL);
+            NULL, NULL, NULL);
         BIO_snprintf(ctx->_.dir.search_name, sizeof(ctx->_.dir.search_name),
-                     "%08lx", hash);
+            "%08lx", hash);
         return 1;
     }
 
@@ -1158,85 +1156,82 @@ static int file_find(OSSL_STORE_LOADER_CTX *ctx,
 }
 
 static OSSL_STORE_INFO *file_load_try_decode(OSSL_STORE_LOADER_CTX *ctx,
-                                             const char *pem_name,
-                                             const char *pem_header,
-                                             unsigned char *data, size_t len,
-                                             const UI_METHOD *ui_method,
-                                             void *ui_data, int *matchcount)
+    const char *pem_name,
+    const char *pem_header,
+    unsigned char *data, size_t len,
+    const UI_METHOD *ui_method,
+    void *ui_data, int *matchcount)
 {
     OSSL_STORE_INFO *result = NULL;
     BUF_MEM *new_mem = NULL;
     char *new_pem_name = NULL;
     int t = 0;
 
- again:
-    {
-        size_t i = 0;
-        void *handler_ctx = NULL;
-        const FILE_HANDLER **matching_handlers =
-            OPENSSL_zalloc(sizeof(*matching_handlers)
-                           * OSSL_NELEM(file_handlers));
+again: {
+    size_t i = 0;
+    void *handler_ctx = NULL;
+    const FILE_HANDLER **matching_handlers = OPENSSL_zalloc(sizeof(*matching_handlers)
+        * OSSL_NELEM(file_handlers));
 
-        if (matching_handlers == NULL)
-            goto err;
+    if (matching_handlers == NULL)
+        goto err;
 
-        *matchcount = 0;
-        for (i = 0; i < OSSL_NELEM(file_handlers); i++) {
-            const FILE_HANDLER *handler = file_handlers[i];
-            int try_matchcount = 0;
-            void *tmp_handler_ctx = NULL;
-            OSSL_STORE_INFO *tmp_result;
-            unsigned long err;
-
-            ERR_set_mark();
-            tmp_result =
-                handler->try_decode(pem_name, pem_header, data, len,
-                                    &tmp_handler_ctx, &try_matchcount,
-                                    ui_method, ui_data, ctx->uri,
-                                    ctx->libctx, ctx->propq);
-            /* avoid flooding error queue with low-level ASN.1 parse errors */
-            err = ERR_peek_last_error();
-            if (ERR_GET_LIB(err) == ERR_LIB_ASN1
-                    && ERR_GET_REASON(err) == ERR_R_NESTED_ASN1_ERROR)
-                ERR_pop_to_mark();
-            else
-                ERR_clear_last_mark();
-
-            if (try_matchcount > 0) {
-
-                matching_handlers[*matchcount] = handler;
-
-                if (handler_ctx)
+    *matchcount = 0;
+    for (i = 0; i < OSSL_NELEM(file_handlers); i++) {
+        const FILE_HANDLER *handler = file_handlers[i];
+        int try_matchcount = 0;
+        void *tmp_handler_ctx = NULL;
+        OSSL_STORE_INFO *tmp_result;
+        unsigned long err;
+
+        ERR_set_mark();
+        tmp_result = handler->try_decode(pem_name, pem_header, data, len,
+            &tmp_handler_ctx, &try_matchcount,
+            ui_method, ui_data, ctx->uri,
+            ctx->libctx, ctx->propq);
+        /* avoid flooding error queue with low-level ASN.1 parse errors */
+        err = ERR_peek_last_error();
+        if (ERR_GET_LIB(err) == ERR_LIB_ASN1
+            && ERR_GET_REASON(err) == ERR_R_NESTED_ASN1_ERROR)
+            ERR_pop_to_mark();
+        else
+            ERR_clear_last_mark();
+
+        if (try_matchcount > 0) {
+
+            matching_handlers[*matchcount] = handler;
+
+            if (handler_ctx)
+                handler->destroy_ctx(&handler_ctx);
+            handler_ctx = tmp_handler_ctx;
+
+            if ((*matchcount += try_matchcount) > 1) {
+                /* more than one match => ambiguous, kill any result */
+                store_info_free(result);
+                store_info_free(tmp_result);
+                if (handler->destroy_ctx != NULL)
                     handler->destroy_ctx(&handler_ctx);
-                handler_ctx = tmp_handler_ctx;
-
-                if ((*matchcount += try_matchcount) > 1) {
-                    /* more than one match => ambiguous, kill any result */
-                    store_info_free(result);
-                    store_info_free(tmp_result);
-                    if (handler->destroy_ctx != NULL)
-                        handler->destroy_ctx(&handler_ctx);
-                    handler_ctx = NULL;
-                    tmp_result = NULL;
-                    result = NULL;
-                }
-                if (result == NULL)
-                    result = tmp_result;
-                if (result == NULL) /* e.g., PKCS#12 file decryption error */
-                    break;
+                handler_ctx = NULL;
+                tmp_result = NULL;
+                result = NULL;
             }
+            if (result == NULL)
+                result = tmp_result;
+            if (result == NULL) /* e.g., PKCS#12 file decryption error */
+                break;
         }
+    }
 
-        if (result != NULL
-                && *matchcount == 1 && matching_handlers[0]->repeatable) {
-            ctx->_.file.last_handler = matching_handlers[0];
-            ctx->_.file.last_handler_ctx = handler_ctx;
-        }
-
-        OPENSSL_free(matching_handlers);
+    if (result != NULL
+        && *matchcount == 1 && matching_handlers[0]->repeatable) {
+        ctx->_.file.last_handler = matching_handlers[0];
+        ctx->_.file.last_handler_ctx = handler_ctx;
     }
 
- err:
+    OPENSSL_free(matching_handlers);
+}
+
+err:
     OPENSSL_free(new_pem_name);
     BUF_MEM_free(new_mem);
 
@@ -1261,19 +1256,18 @@ static OSSL_STORE_INFO *file_load_try_decode(OSSL_STORE_LOADER_CTX *ctx,
 }
 
 static OSSL_STORE_INFO *file_load_try_repeat(OSSL_STORE_LOADER_CTX *ctx,
-                                             const UI_METHOD *ui_method,
-                                             void *ui_data)
+    const UI_METHOD *ui_method,
+    void *ui_data)
 {
     OSSL_STORE_INFO *result = NULL;
     int try_matchcount = 0;
 
     if (ctx->_.file.last_handler != NULL) {
-        result =
-            ctx->_.file.last_handler->try_decode(NULL, NULL, NULL, 0,
-                                                 &ctx->_.file.last_handler_ctx,
-                                                 &try_matchcount,
-                                                 ui_method, ui_data, ctx->uri,
-                                                 ctx->libctx, ctx->propq);
+        result = ctx->_.file.last_handler->try_decode(NULL, NULL, NULL, 0,
+            &ctx->_.file.last_handler_ctx,
+            &try_matchcount,
+            ui_method, ui_data, ctx->uri,
+            ctx->libctx, ctx->propq);
 
         if (result == NULL) {
             ctx->_.file.last_handler->destroy_ctx(&ctx->_.file.last_handler_ctx);
@@ -1292,13 +1286,13 @@ static void pem_free_flag(void *pem_data, int secure, size_t num)
         OPENSSL_free(pem_data);
 }
 static int file_read_pem(BIO *bp, char **pem_name, char **pem_header,
-                         unsigned char **data, long *len,
-                         const UI_METHOD *ui_method, void *ui_data,
-                         const char *uri, int secure)
+    unsigned char **data, long *len,
+    const UI_METHOD *ui_method, void *ui_data,
+    const char *uri, int secure)
 {
     int i = secure
         ? PEM_read_bio_ex(bp, pem_name, pem_header, data, len,
-                          PEM_FLAG_SECURE | PEM_FLAG_EAY_COMPATIBLE)
+              PEM_FLAG_SECURE | PEM_FLAG_EAY_COMPATIBLE)
         : PEM_read_bio(bp, pem_name, pem_header, data, len);
 
     if (i <= 0)
@@ -1316,9 +1310,9 @@ static int file_read_pem(BIO *bp, char **pem_name, char **pem_header,
 
         if (!PEM_get_EVP_CIPHER_INFO(*pem_header, &cipher)
             || !file_fill_pem_pass_data(&pass_data, "PEM pass phrase", uri,
-                                        ui_method, ui_data)
+                ui_method, ui_data)
             || !PEM_do_header(&cipher, *data, len, file_get_pem_pass,
-                              &pass_data)) {
+                &pass_data)) {
             return 0;
         }
     }
@@ -1333,13 +1327,16 @@ static OSSL_STORE_INFO *file_try_read_msblob(BIO *bp, int *matchcount)
     {
         unsigned int magic = 0, bitlen = 0;
         int isdss = 0;
-        unsigned char peekbuf[16] = { 0, };
+        unsigned char peekbuf[16] = {
+            0,
+        };
         const unsigned char *p = peekbuf;
 
         if (BIO_buffer_peek(bp, peekbuf, sizeof(peekbuf)) <= 0)
             return 0;
         if (ossl_do_blob_header(&p, sizeof(peekbuf), &magic, &bitlen,
-                                 &isdss, &ispub) <= 0)
+                &isdss, &ispub)
+            <= 0)
             return 0;
     }
 
@@ -1361,15 +1358,17 @@ static OSSL_STORE_INFO *file_try_read_msblob(BIO *bp, int *matchcount)
 }
 
 static OSSL_STORE_INFO *file_try_read_PVK(BIO *bp, const UI_METHOD *ui_method,
-                                          void *ui_data, const char *uri,
-                                          int *matchcount)
+    void *ui_data, const char *uri,
+    int *matchcount)
 {
     OSSL_STORE_INFO *result = NULL;
 
     {
         unsigned int saltlen = 0, keylen = 0;
         int isdss = -1;
-        unsigned char peekbuf[24] = { 0, };
+        unsigned char peekbuf[24] = {
+            0,
+        };
         const unsigned char *p = peekbuf;
 
         if (BIO_buffer_peek(bp, peekbuf, sizeof(peekbuf)) <= 0)
@@ -1385,7 +1384,7 @@ static OSSL_STORE_INFO *file_try_read_PVK(BIO *bp, const UI_METHOD *ui_method,
         struct pem_pass_data pass_data;
 
         if (!file_fill_pem_pass_data(&pass_data, "PVK pass phrase", uri,
-                                     ui_method, ui_data)
+                ui_method, ui_data)
             || (tmp = b2i_PVK_bio(bp, file_get_pem_pass, &pass_data)) == NULL
             || (result = OSSL_STORE_INFO_new_PKEY(tmp)) == NULL) {
             EVP_PKEY_free(tmp);
@@ -1411,7 +1410,7 @@ static int file_read_asn1(BIO *bp, unsigned char **data, long *len)
 }
 
 static int file_name_to_uri(OSSL_STORE_LOADER_CTX *ctx, const char *name,
-                            char **data)
+    char **data)
 {
     assert(name != NULL);
     assert(data != NULL);
@@ -1496,8 +1495,8 @@ static int file_name_check(OSSL_STORE_LOADER_CTX *ctx, const char *name)
 static int file_eof(OSSL_STORE_LOADER_CTX *ctx);
 static int file_error(OSSL_STORE_LOADER_CTX *ctx);
 static OSSL_STORE_INFO *file_load(OSSL_STORE_LOADER_CTX *ctx,
-                                  const UI_METHOD *ui_method,
-                                  void *ui_data)
+    const UI_METHOD *ui_method,
+    void *ui_data)
 {
     OSSL_STORE_INFO *result = NULL;
 
@@ -1542,7 +1541,7 @@ static OSSL_STORE_INFO *file_load(OSSL_STORE_LOADER_CTX *ctx,
     } else {
         int matchcount = -1;
 
-     again:
+    again:
         result = file_load_try_repeat(ctx, ui_method, ui_data);
         if (result != NULL)
             return result;
@@ -1551,25 +1550,27 @@ static OSSL_STORE_INFO *file_load(OSSL_STORE_LOADER_CTX *ctx,
             return NULL;
 
         do {
-            char *pem_name = NULL;      /* PEM record name */
-            char *pem_header = NULL;    /* PEM record header */
+            char *pem_name = NULL; /* PEM record name */
+            char *pem_header = NULL; /* PEM record header */
             unsigned char *data = NULL; /* DER encoded data */
-            long len = 0;               /* DER encoded data length */
+            long len = 0; /* DER encoded data length */
 
             matchcount = -1;
             if (ctx->type == is_pem) {
                 if (!file_read_pem(ctx->_.file.file, &pem_name, &pem_header,
-                                   &data, &len, ui_method, ui_data, ctx->uri,
-                                   (ctx->flags & FILE_FLAG_SECMEM) != 0)) {
+                        &data, &len, ui_method, ui_data, ctx->uri,
+                        (ctx->flags & FILE_FLAG_SECMEM) != 0)) {
                     ctx->errcnt++;
                     goto endloop;
                 }
             } else {
                 if ((result = file_try_read_msblob(ctx->_.file.file,
-                                                   &matchcount)) != NULL
+                         &matchcount))
+                        != NULL
                     || (result = file_try_read_PVK(ctx->_.file.file,
-                                                   ui_method, ui_data, ctx->uri,
-                                                   &matchcount)) != NULL)
+                            ui_method, ui_data, ctx->uri,
+                            &matchcount))
+                        != NULL)
                     goto endloop;
 
                 if (!file_read_asn1(ctx->_.file.file, &data, &len)) {
@@ -1579,7 +1580,7 @@ static OSSL_STORE_INFO *file_load(OSSL_STORE_LOADER_CTX *ctx,
             }
 
             result = file_load_try_decode(ctx, pem_name, pem_header, data, len,
-                                          ui_method, ui_data, &matchcount);
+                ui_method, ui_data, &matchcount);
 
             if (result != NULL)
                 goto endloop;
@@ -1609,7 +1610,7 @@ static OSSL_STORE_INFO *file_load(OSSL_STORE_LOADER_CTX *ctx,
             if (matchcount > 0)
                 ctx->errcnt++;
 
-         endloop:
+        endloop:
             pem_free_flag(pem_name, (ctx->flags & FILE_FLAG_SECMEM) != 0, 0);
             pem_free_flag(pem_header, (ctx->flags & FILE_FLAG_SECMEM) != 0, 0);
             pem_free_flag(data, (ctx->flags & FILE_FLAG_SECMEM) != 0, len);
@@ -1687,13 +1688,11 @@ static int loader_attic_init(ENGINE *e)
     return 1;
 }
 
-
 static int loader_attic_finish(ENGINE *e)
 {
     return 1;
 }
 
-
 static int loader_attic_destroy(ENGINE *e)
 {
     OSSL_STORE_LOADER *loader = OSSL_STORE_unregister_loader("file");
@@ -1742,7 +1741,7 @@ static int bind_loader_attic(ENGINE *e)
 }
 
 #ifdef OPENSSL_NO_DYNAMIC_ENGINE
-# error "Only allowed as dynamically shared object"
+#error "Only allowed as dynamically shared object"
 #endif
 
 static int bind_helper(ENGINE *e, const char *id)
@@ -1755,4 +1754,4 @@ static int bind_helper(ENGINE *e, const char *id)
 }
 
 IMPLEMENT_DYNAMIC_CHECK_FN()
-    IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
+IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
diff --git a/engines/e_loader_attic_err.c b/engines/e_loader_attic_err.c
index d7c71463d8ccc..749b0b415bac0 100644
--- a/engines/e_loader_attic_err.c
+++ b/engines/e_loader_attic_err.c
@@ -14,25 +14,25 @@
 #ifndef OPENSSL_NO_ERR
 
 static ERR_STRING_DATA ATTIC_str_reasons[] = {
-    {ERR_PACK(0, 0, ATTIC_R_AMBIGUOUS_CONTENT_TYPE), "ambiguous content type"},
-    {ERR_PACK(0, 0, ATTIC_R_BAD_PASSWORD_READ), "bad password read"},
-    {ERR_PACK(0, 0, ATTIC_R_ERROR_VERIFYING_PKCS12_MAC),
-    "error verifying pkcs12 mac"},
-    {ERR_PACK(0, 0, ATTIC_R_INIT_FAILED), "init failed"},
-    {ERR_PACK(0, 0, ATTIC_R_PASSPHRASE_CALLBACK_ERROR),
-    "passphrase callback error"},
-    {ERR_PACK(0, 0, ATTIC_R_PATH_MUST_BE_ABSOLUTE), "path must be absolute"},
-    {ERR_PACK(0, 0, ATTIC_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES),
-    "search only supported for directories"},
-    {ERR_PACK(0, 0, ATTIC_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED),
-    "ui process interrupted or cancelled"},
-    {ERR_PACK(0, 0, ATTIC_R_UNSUPPORTED_CONTENT_TYPE),
-    "unsupported content type"},
-    {ERR_PACK(0, 0, ATTIC_R_UNSUPPORTED_SEARCH_TYPE),
-    "unsupported search type"},
-    {ERR_PACK(0, 0, ATTIC_R_URI_AUTHORITY_UNSUPPORTED),
-    "uri authority unsupported"},
-    {0, NULL}
+    { ERR_PACK(0, 0, ATTIC_R_AMBIGUOUS_CONTENT_TYPE), "ambiguous content type" },
+    { ERR_PACK(0, 0, ATTIC_R_BAD_PASSWORD_READ), "bad password read" },
+    { ERR_PACK(0, 0, ATTIC_R_ERROR_VERIFYING_PKCS12_MAC),
+        "error verifying pkcs12 mac" },
+    { ERR_PACK(0, 0, ATTIC_R_INIT_FAILED), "init failed" },
+    { ERR_PACK(0, 0, ATTIC_R_PASSPHRASE_CALLBACK_ERROR),
+        "passphrase callback error" },
+    { ERR_PACK(0, 0, ATTIC_R_PATH_MUST_BE_ABSOLUTE), "path must be absolute" },
+    { ERR_PACK(0, 0, ATTIC_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES),
+        "search only supported for directories" },
+    { ERR_PACK(0, 0, ATTIC_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED),
+        "ui process interrupted or cancelled" },
+    { ERR_PACK(0, 0, ATTIC_R_UNSUPPORTED_CONTENT_TYPE),
+        "unsupported content type" },
+    { ERR_PACK(0, 0, ATTIC_R_UNSUPPORTED_SEARCH_TYPE),
+        "unsupported search type" },
+    { ERR_PACK(0, 0, ATTIC_R_URI_AUTHORITY_UNSUPPORTED),
+        "uri authority unsupported" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/engines/e_loader_attic_err.h b/engines/e_loader_attic_err.h
index b4a144f4cbca1..eab95c102d532 100644
--- a/engines/e_loader_attic_err.h
+++ b/engines/e_loader_attic_err.h
@@ -9,29 +9,27 @@
  */
 
 #ifndef OSSL_E_LOADER_ATTIC_ERR_H
-# define OSSL_E_LOADER_ATTIC_ERR_H
-# pragma once
+#define OSSL_E_LOADER_ATTIC_ERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-
-
-# define ATTICerr(f, r) ERR_ATTIC_error(0, (r), OPENSSL_FILE, OPENSSL_LINE)
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
 
+#define ATTICerr(f, r) ERR_ATTIC_error(0, (r), OPENSSL_FILE, OPENSSL_LINE)
 
 /*
  * ATTIC reason codes.
  */
-# define ATTIC_R_AMBIGUOUS_CONTENT_TYPE                   100
-# define ATTIC_R_BAD_PASSWORD_READ                        101
-# define ATTIC_R_ERROR_VERIFYING_PKCS12_MAC               102
-# define ATTIC_R_INIT_FAILED                              103
-# define ATTIC_R_PASSPHRASE_CALLBACK_ERROR                104
-# define ATTIC_R_PATH_MUST_BE_ABSOLUTE                    105
-# define ATTIC_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES    106
-# define ATTIC_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED      107
-# define ATTIC_R_UNSUPPORTED_CONTENT_TYPE                 108
-# define ATTIC_R_UNSUPPORTED_SEARCH_TYPE                  109
-# define ATTIC_R_URI_AUTHORITY_UNSUPPORTED                110
+#define ATTIC_R_AMBIGUOUS_CONTENT_TYPE 100
+#define ATTIC_R_BAD_PASSWORD_READ 101
+#define ATTIC_R_ERROR_VERIFYING_PKCS12_MAC 102
+#define ATTIC_R_INIT_FAILED 103
+#define ATTIC_R_PASSPHRASE_CALLBACK_ERROR 104
+#define ATTIC_R_PATH_MUST_BE_ABSOLUTE 105
+#define ATTIC_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES 106
+#define ATTIC_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED 107
+#define ATTIC_R_UNSUPPORTED_CONTENT_TYPE 108
+#define ATTIC_R_UNSUPPORTED_SEARCH_TYPE 109
+#define ATTIC_R_URI_AUTHORITY_UNSUPPORTED 110
 
 #endif
diff --git a/engines/e_ossltest.c b/engines/e_ossltest.c
index 19dda64d1f5fd..348396209d200 100644
--- a/engines/e_ossltest.c
+++ b/engines/e_ossltest.c
@@ -41,29 +41,29 @@
 #include <openssl/pem.h>
 #include <crypto/evp.h>
 
+/* clang-format off */
 #include "e_ossltest_err.c"
+/* clang-format on */
 
 /* Engine Id and Name */
 static const char *engine_ossltest_id = "ossltest";
 static const char *engine_ossltest_name = "OpenSSL Test engine support";
 
-
 /* Engine Lifetime functions */
 static int ossltest_destroy(ENGINE *e);
 static int ossltest_init(ENGINE *e);
 static int ossltest_finish(ENGINE *e);
 void ENGINE_load_ossltest(void);
 
-
 /* Set up digests */
 static int ossltest_digests(ENGINE *e, const EVP_MD **digest,
-                          const int **nids, int nid);
+    const int **nids, int nid);
 static const RAND_METHOD *ossltest_rand_method(void);
 
 /* MD5 */
 static int digest_md5_init(EVP_MD_CTX *ctx);
 static int digest_md5_update(EVP_MD_CTX *ctx, const void *data,
-                             size_t count);
+    size_t count);
 static int digest_md5_final(EVP_MD_CTX *ctx, unsigned char *md);
 
 static EVP_MD *_hidden_md5_md = NULL;
@@ -76,7 +76,7 @@ static const EVP_MD *digest_md5(void)
             || !EVP_MD_meth_set_result_size(md, MD5_DIGEST_LENGTH)
             || !EVP_MD_meth_set_input_blocksize(md, MD5_CBLOCK)
             || !EVP_MD_meth_set_app_datasize(md,
-                                             sizeof(EVP_MD *) + sizeof(MD5_CTX))
+                sizeof(EVP_MD *) + sizeof(MD5_CTX))
             || !EVP_MD_meth_set_flags(md, 0)
             || !EVP_MD_meth_set_init(md, digest_md5_init)
             || !EVP_MD_meth_set_update(md, digest_md5_update)
@@ -92,7 +92,7 @@ static const EVP_MD *digest_md5(void)
 /* SHA1 */
 static int digest_sha1_init(EVP_MD_CTX *ctx);
 static int digest_sha1_update(EVP_MD_CTX *ctx, const void *data,
-                              size_t count);
+    size_t count);
 static int digest_sha1_final(EVP_MD_CTX *ctx, unsigned char *md);
 
 static EVP_MD *_hidden_sha1_md = NULL;
@@ -105,7 +105,7 @@ static const EVP_MD *digest_sha1(void)
             || !EVP_MD_meth_set_result_size(md, SHA_DIGEST_LENGTH)
             || !EVP_MD_meth_set_input_blocksize(md, SHA_CBLOCK)
             || !EVP_MD_meth_set_app_datasize(md,
-                                             sizeof(EVP_MD *) + sizeof(SHA_CTX))
+                sizeof(EVP_MD *) + sizeof(SHA_CTX))
             || !EVP_MD_meth_set_flags(md, EVP_MD_FLAG_DIGALGID_ABSENT)
             || !EVP_MD_meth_set_init(md, digest_sha1_init)
             || !EVP_MD_meth_set_update(md, digest_sha1_update)
@@ -121,7 +121,7 @@ static const EVP_MD *digest_sha1(void)
 /* SHA256 */
 static int digest_sha256_init(EVP_MD_CTX *ctx);
 static int digest_sha256_update(EVP_MD_CTX *ctx, const void *data,
-                                size_t count);
+    size_t count);
 static int digest_sha256_final(EVP_MD_CTX *ctx, unsigned char *md);
 
 static EVP_MD *_hidden_sha256_md = NULL;
@@ -134,7 +134,7 @@ static const EVP_MD *digest_sha256(void)
             || !EVP_MD_meth_set_result_size(md, SHA256_DIGEST_LENGTH)
             || !EVP_MD_meth_set_input_blocksize(md, SHA256_CBLOCK)
             || !EVP_MD_meth_set_app_datasize(md,
-                                             sizeof(EVP_MD *) + sizeof(SHA256_CTX))
+                sizeof(EVP_MD *) + sizeof(SHA256_CTX))
             || !EVP_MD_meth_set_flags(md, EVP_MD_FLAG_DIGALGID_ABSENT)
             || !EVP_MD_meth_set_init(md, digest_sha256_init)
             || !EVP_MD_meth_set_update(md, digest_sha256_update)
@@ -150,12 +150,12 @@ static const EVP_MD *digest_sha256(void)
 /* SHA384/SHA512 */
 static int digest_sha384_init(EVP_MD_CTX *ctx);
 static int digest_sha384_update(EVP_MD_CTX *ctx, const void *data,
-                                size_t count);
+    size_t count);
 static int digest_sha384_final(EVP_MD_CTX *ctx, unsigned char *md);
 
 static int digest_sha512_init(EVP_MD_CTX *ctx);
 static int digest_sha512_update(EVP_MD_CTX *ctx, const void *data,
-                                size_t count);
+    size_t count);
 static int digest_sha512_final(EVP_MD_CTX *ctx, unsigned char *md);
 
 static EVP_MD *_hidden_sha384_md = NULL;
@@ -168,7 +168,7 @@ static const EVP_MD *digest_sha384(void)
             || !EVP_MD_meth_set_result_size(md, SHA384_DIGEST_LENGTH)
             || !EVP_MD_meth_set_input_blocksize(md, SHA512_CBLOCK)
             || !EVP_MD_meth_set_app_datasize(md,
-                                             sizeof(EVP_MD *) + sizeof(SHA512_CTX))
+                sizeof(EVP_MD *) + sizeof(SHA512_CTX))
             || !EVP_MD_meth_set_flags(md, EVP_MD_FLAG_DIGALGID_ABSENT)
             || !EVP_MD_meth_set_init(md, digest_sha384_init)
             || !EVP_MD_meth_set_update(md, digest_sha384_update)
@@ -190,7 +190,7 @@ static const EVP_MD *digest_sha512(void)
             || !EVP_MD_meth_set_result_size(md, SHA512_DIGEST_LENGTH)
             || !EVP_MD_meth_set_input_blocksize(md, SHA512_CBLOCK)
             || !EVP_MD_meth_set_app_datasize(md,
-                                             sizeof(EVP_MD *) + sizeof(SHA512_CTX))
+                sizeof(EVP_MD *) + sizeof(SHA512_CTX))
             || !EVP_MD_meth_set_flags(md, EVP_MD_FLAG_DIGALGID_ABSENT)
             || !EVP_MD_meth_set_init(md, digest_sha512_init)
             || !EVP_MD_meth_set_update(md, digest_sha512_update)
@@ -242,7 +242,7 @@ static int ossltest_digest_nids(const int **nids)
 
 /* Setup ciphers */
 static int ossltest_ciphers(ENGINE *, const EVP_CIPHER **,
-                            const int **, int);
+    const int **, int);
 
 static int ossltest_cipher_nids[] = {
     NID_aes_128_cbc, NID_aes_128_gcm,
@@ -252,30 +252,30 @@ static int ossltest_cipher_nids[] = {
 /* AES128 */
 
 static int ossltest_aes128_init_key(EVP_CIPHER_CTX *ctx,
-                                    const unsigned char *key,
-                                    const unsigned char *iv, int enc);
+    const unsigned char *key,
+    const unsigned char *iv, int enc);
 static int ossltest_aes128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                      const unsigned char *in, size_t inl);
+    const unsigned char *in, size_t inl);
 static int ossltest_aes128_gcm_init_key(EVP_CIPHER_CTX *ctx,
-                                        const unsigned char *key,
-                                        const unsigned char *iv, int enc);
+    const unsigned char *key,
+    const unsigned char *iv, int enc);
 static int ossltest_aes128_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                      const unsigned char *in, size_t inl);
+    const unsigned char *in, size_t inl);
 static int ossltest_aes128_gcm_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
-                                    void *ptr);
+    void *ptr);
 static int ossltest_aes128_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
-                                                  const unsigned char *key,
-                                                  const unsigned char *iv,
-                                                  int enc);
+    const unsigned char *key,
+    const unsigned char *iv,
+    int enc);
 static int ossltest_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx,
-                                                unsigned char *out,
-                                                const unsigned char *in,
-                                                size_t inl);
+    unsigned char *out,
+    const unsigned char *in,
+    size_t inl);
 static int ossltest_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
-                                              int arg, void *ptr);
+    int arg, void *ptr);
 
 typedef struct {
-    size_t payload_length;      /* AAD length in decrypt case */
+    size_t payload_length; /* AAD length in decrypt case */
     unsigned int tls_ver;
 } EVP_AES_HMAC_SHA1;
 
@@ -284,18 +284,19 @@ static const EVP_CIPHER *ossltest_aes_128_cbc(void)
 {
     if (_hidden_aes_128_cbc == NULL
         && ((_hidden_aes_128_cbc = EVP_CIPHER_meth_new(NID_aes_128_cbc,
-                                                       16 /* block size */,
-                                                       16 /* key len */)) == NULL
-            || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_128_cbc,16)
+                 16 /* block size */,
+                 16 /* key len */))
+                == NULL
+            || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_128_cbc, 16)
             || !EVP_CIPHER_meth_set_flags(_hidden_aes_128_cbc,
-                                          EVP_CIPH_FLAG_DEFAULT_ASN1
-                                          | EVP_CIPH_CBC_MODE)
+                EVP_CIPH_FLAG_DEFAULT_ASN1
+                    | EVP_CIPH_CBC_MODE)
             || !EVP_CIPHER_meth_set_init(_hidden_aes_128_cbc,
-                                         ossltest_aes128_init_key)
+                ossltest_aes128_init_key)
             || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_128_cbc,
-                                              ossltest_aes128_cbc_cipher)
+                ossltest_aes128_cbc_cipher)
             || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_128_cbc,
-                    EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc())))) {
+                EVP_CIPHER_impl_ctx_size(EVP_aes_128_cbc())))) {
         EVP_CIPHER_meth_free(_hidden_aes_128_cbc);
         _hidden_aes_128_cbc = NULL;
     }
@@ -304,28 +305,29 @@ static const EVP_CIPHER *ossltest_aes_128_cbc(void)
 
 static EVP_CIPHER *_hidden_aes_128_gcm = NULL;
 
-#define AES_GCM_FLAGS   (EVP_CIPH_FLAG_DEFAULT_ASN1 \
-                | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
-                | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
-                | EVP_CIPH_CUSTOM_COPY |EVP_CIPH_FLAG_AEAD_CIPHER \
-                | EVP_CIPH_GCM_MODE)
+#define AES_GCM_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1      \
+    | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
+    | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT   \
+    | EVP_CIPH_CUSTOM_COPY | EVP_CIPH_FLAG_AEAD_CIPHER \
+    | EVP_CIPH_GCM_MODE)
 
 static const EVP_CIPHER *ossltest_aes_128_gcm(void)
 {
     if (_hidden_aes_128_gcm == NULL
         && ((_hidden_aes_128_gcm = EVP_CIPHER_meth_new(NID_aes_128_gcm,
-                                                       1 /* block size */,
-                                                       16 /* key len */)) == NULL
-            || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_128_gcm,12)
+                 1 /* block size */,
+                 16 /* key len */))
+                == NULL
+            || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_128_gcm, 12)
             || !EVP_CIPHER_meth_set_flags(_hidden_aes_128_gcm, AES_GCM_FLAGS)
             || !EVP_CIPHER_meth_set_init(_hidden_aes_128_gcm,
-                                         ossltest_aes128_gcm_init_key)
+                ossltest_aes128_gcm_init_key)
             || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_128_gcm,
-                                              ossltest_aes128_gcm_cipher)
+                ossltest_aes128_gcm_cipher)
             || !EVP_CIPHER_meth_set_ctrl(_hidden_aes_128_gcm,
-                                              ossltest_aes128_gcm_ctrl)
+                ossltest_aes128_gcm_ctrl)
             || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_128_gcm,
-                    EVP_CIPHER_impl_ctx_size(EVP_aes_128_gcm())))) {
+                EVP_CIPHER_impl_ctx_size(EVP_aes_128_gcm())))) {
         EVP_CIPHER_meth_free(_hidden_aes_128_gcm);
         _hidden_aes_128_gcm = NULL;
     }
@@ -338,25 +340,25 @@ static const EVP_CIPHER *ossltest_aes_128_cbc_hmac_sha1(void)
 {
     if (_hidden_aes_128_cbc_hmac_sha1 == NULL
         && ((_hidden_aes_128_cbc_hmac_sha1
-             = EVP_CIPHER_meth_new(NID_aes_128_cbc_hmac_sha1,
-                                   16 /* block size */,
-                                   16 /* key len */)) == NULL
-            || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_128_cbc_hmac_sha1,16)
+                = EVP_CIPHER_meth_new(NID_aes_128_cbc_hmac_sha1,
+                    16 /* block size */,
+                    16 /* key len */))
+                == NULL
+            || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_128_cbc_hmac_sha1, 16)
             || !EVP_CIPHER_meth_set_flags(_hidden_aes_128_cbc_hmac_sha1,
-                   EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 |
-                   EVP_CIPH_FLAG_AEAD_CIPHER)
+                EVP_CIPH_CBC_MODE | EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_FLAG_AEAD_CIPHER)
             || !EVP_CIPHER_meth_set_init(_hidden_aes_128_cbc_hmac_sha1,
-                   ossltest_aes128_cbc_hmac_sha1_init_key)
+                ossltest_aes128_cbc_hmac_sha1_init_key)
             || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_128_cbc_hmac_sha1,
-                   ossltest_aes128_cbc_hmac_sha1_cipher)
+                ossltest_aes128_cbc_hmac_sha1_cipher)
             || !EVP_CIPHER_meth_set_ctrl(_hidden_aes_128_cbc_hmac_sha1,
-                                         ossltest_aes128_cbc_hmac_sha1_ctrl)
+                ossltest_aes128_cbc_hmac_sha1_ctrl)
             || !EVP_CIPHER_meth_set_set_asn1_params(_hidden_aes_128_cbc_hmac_sha1,
-                   EVP_CIPH_FLAG_DEFAULT_ASN1 ? NULL : EVP_CIPHER_set_asn1_iv)
+                EVP_CIPH_FLAG_DEFAULT_ASN1 ? NULL : EVP_CIPHER_set_asn1_iv)
             || !EVP_CIPHER_meth_set_get_asn1_params(_hidden_aes_128_cbc_hmac_sha1,
-                   EVP_CIPH_FLAG_DEFAULT_ASN1 ? NULL : EVP_CIPHER_get_asn1_iv)
+                EVP_CIPH_FLAG_DEFAULT_ASN1 ? NULL : EVP_CIPHER_get_asn1_iv)
             || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_128_cbc_hmac_sha1,
-                   sizeof(EVP_AES_HMAC_SHA1)))) {
+                sizeof(EVP_AES_HMAC_SHA1)))) {
         EVP_CIPHER_meth_free(_hidden_aes_128_cbc_hmac_sha1);
         _hidden_aes_128_cbc_hmac_sha1 = NULL;
     }
@@ -375,7 +377,7 @@ static void destroy_ciphers(void)
 
 /* Key loading */
 static EVP_PKEY *load_key(ENGINE *eng, const char *key_id, int pub,
-                          UI_METHOD *ui_method, void *ui_data)
+    UI_METHOD *ui_method, void *ui_data)
 {
     BIO *in;
     EVP_PKEY *key;
@@ -384,7 +386,7 @@ static EVP_PKEY *load_key(ENGINE *eng, const char *key_id, int pub,
         return NULL;
 
     fprintf(stderr, "[ossltest]Loading %s key %s\n",
-            pub ? "Public" : "Private", key_id);
+        pub ? "Public" : "Private", key_id);
     in = BIO_new_file(key_id, "r");
     if (!in)
         return NULL;
@@ -397,18 +399,17 @@ static EVP_PKEY *load_key(ENGINE *eng, const char *key_id, int pub,
 }
 
 static EVP_PKEY *ossltest_load_privkey(ENGINE *eng, const char *key_id,
-                                       UI_METHOD *ui_method, void *ui_data)
+    UI_METHOD *ui_method, void *ui_data)
 {
     return load_key(eng, key_id, 0, ui_method, ui_data);
 }
 
 static EVP_PKEY *ossltest_load_pubkey(ENGINE *eng, const char *key_id,
-                                      UI_METHOD *ui_method, void *ui_data)
+    UI_METHOD *ui_method, void *ui_data)
 {
     return load_key(eng, key_id, 1, ui_method, ui_data);
 }
 
-
 static int bind_ossltest(ENGINE *e)
 {
     /* Ensure the ossltest error handling is set up */
@@ -442,7 +443,7 @@ static int bind_helper(ENGINE *e, const char *id)
 }
 
 IMPLEMENT_DYNAMIC_CHECK_FN()
-    IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
+IMPLEMENT_DYNAMIC_BIND_FN(bind_helper)
 #endif
 
 static ENGINE *engine_ossltest(void)
@@ -468,19 +469,16 @@ void ENGINE_load_ossltest(void)
     ERR_clear_error();
 }
 
-
 static int ossltest_init(ENGINE *e)
 {
     return 1;
 }
 
-
 static int ossltest_finish(ENGINE *e)
 {
     return 1;
 }
 
-
 static int ossltest_destroy(ENGINE *e)
 {
     destroy_digests();
@@ -490,7 +488,7 @@ static int ossltest_destroy(ENGINE *e)
 }
 
 static int ossltest_digests(ENGINE *e, const EVP_MD **digest,
-                          const int **nids, int nid)
+    const int **nids, int nid)
 {
     int ok = 1;
     if (!digest) {
@@ -523,14 +521,14 @@ static int ossltest_digests(ENGINE *e, const EVP_MD **digest,
 }
 
 static int ossltest_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-                          const int **nids, int nid)
+    const int **nids, int nid)
 {
     int ok = 1;
     if (!cipher) {
         /* We are returning a list of supported nids */
         *nids = ossltest_cipher_nids;
         return (sizeof(ossltest_cipher_nids) - 1)
-               / sizeof(ossltest_cipher_nids[0]);
+            / sizeof(ossltest_cipher_nids[0]);
     }
     /* We are being asked for a specific cipher */
     switch (nid) {
@@ -555,7 +553,7 @@ static void fill_known_data(unsigned char *md, unsigned int len)
 {
     unsigned int i;
 
-    for (i=0; i<len; i++) {
+    for (i = 0; i < len; i++) {
         md[i] = (unsigned char)(i & 0xff);
     }
 }
@@ -568,11 +566,11 @@ static void fill_known_data(unsigned char *md, unsigned int len)
  */
 static int digest_md5_init(EVP_MD_CTX *ctx)
 {
-   return EVP_MD_meth_get_init(EVP_md5())(ctx);
+    return EVP_MD_meth_get_init(EVP_md5())(ctx);
 }
 
 static int digest_md5_update(EVP_MD_CTX *ctx, const void *data,
-                             size_t count)
+    size_t count)
 {
     return EVP_MD_meth_get_update(EVP_md5())(ctx, data, count);
 }
@@ -596,7 +594,7 @@ static int digest_sha1_init(EVP_MD_CTX *ctx)
 }
 
 static int digest_sha1_update(EVP_MD_CTX *ctx, const void *data,
-                              size_t count)
+    size_t count)
 {
     return EVP_MD_meth_get_update(EVP_sha1())(ctx, data, count);
 }
@@ -620,7 +618,7 @@ static int digest_sha256_init(EVP_MD_CTX *ctx)
 }
 
 static int digest_sha256_update(EVP_MD_CTX *ctx, const void *data,
-                                size_t count)
+    size_t count)
 {
     return EVP_MD_meth_get_update(EVP_sha256())(ctx, data, count);
 }
@@ -644,7 +642,7 @@ static int digest_sha384_init(EVP_MD_CTX *ctx)
 }
 
 static int digest_sha384_update(EVP_MD_CTX *ctx, const void *data,
-                                size_t count)
+    size_t count)
 {
     return EVP_MD_meth_get_update(EVP_sha384())(ctx, data, count);
 }
@@ -668,7 +666,7 @@ static int digest_sha512_init(EVP_MD_CTX *ctx)
 }
 
 static int digest_sha512_update(EVP_MD_CTX *ctx, const void *data,
-                                size_t count)
+    size_t count)
 {
     return EVP_MD_meth_get_update(EVP_sha512())(ctx, data, count);
 }
@@ -688,14 +686,14 @@ static int digest_sha512_final(EVP_MD_CTX *ctx, unsigned char *md)
  */
 
 static int ossltest_aes128_init_key(EVP_CIPHER_CTX *ctx,
-                                    const unsigned char *key,
-                                    const unsigned char *iv, int enc)
+    const unsigned char *key,
+    const unsigned char *iv, int enc)
 {
-    return EVP_CIPHER_meth_get_init(EVP_aes_128_cbc()) (ctx, key, iv, enc);
+    return EVP_CIPHER_meth_get_init(EVP_aes_128_cbc())(ctx, key, iv, enc);
 }
 
 static int ossltest_aes128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                      const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     unsigned char *tmpbuf;
     int ret;
@@ -722,14 +720,14 @@ static int ossltest_aes128_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int ossltest_aes128_gcm_init_key(EVP_CIPHER_CTX *ctx,
-                                        const unsigned char *key,
-                                        const unsigned char *iv, int enc)
+    const unsigned char *key,
+    const unsigned char *iv, int enc)
 {
-    return EVP_CIPHER_meth_get_init(EVP_aes_128_gcm()) (ctx, key, iv, enc);
+    return EVP_CIPHER_meth_get_init(EVP_aes_128_gcm())(ctx, key, iv, enc);
 }
 
 static int ossltest_aes128_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                      const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     unsigned char *tmpbuf = OPENSSL_malloc(inl);
 
@@ -753,7 +751,7 @@ static int ossltest_aes128_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int ossltest_aes128_gcm_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
-                                    void *ptr)
+    void *ptr)
 {
     /* Pass the ctrl down */
     int ret = EVP_CIPHER_meth_get_ctrl(EVP_aes_128_gcm())(ctx, type, arg, ptr);
@@ -774,13 +772,13 @@ static int ossltest_aes128_gcm_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
     return 1;
 }
 
-#define NO_PAYLOAD_LENGTH       ((size_t)-1)
-# define data(ctx) ((EVP_AES_HMAC_SHA1 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
+#define NO_PAYLOAD_LENGTH ((size_t)-1)
+#define data(ctx) ((EVP_AES_HMAC_SHA1 *)EVP_CIPHER_CTX_get_cipher_data(ctx))
 
 static int ossltest_aes128_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
-                                                  const unsigned char *inkey,
-                                                  const unsigned char *iv,
-                                                  int enc)
+    const unsigned char *inkey,
+    const unsigned char *iv,
+    int enc)
 {
     EVP_AES_HMAC_SHA1 *key = data(ctx);
     key->payload_length = NO_PAYLOAD_LENGTH;
@@ -788,9 +786,9 @@ static int ossltest_aes128_cbc_hmac_sha1_init_key(EVP_CIPHER_CTX *ctx,
 }
 
 static int ossltest_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx,
-                                                unsigned char *out,
-                                                const unsigned char *in,
-                                                size_t len)
+    unsigned char *out,
+    const unsigned char *in,
+    size_t len)
 {
     EVP_AES_HMAC_SHA1 *key = data(ctx);
     unsigned int l;
@@ -804,14 +802,12 @@ static int ossltest_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx,
     if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
         if (plen == NO_PAYLOAD_LENGTH)
             plen = len;
-        else if (len !=
-                 ((plen + SHA_DIGEST_LENGTH +
-                   AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
+        else if (len != ((plen + SHA_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
             return 0;
 
         memmove(out, in, plen);
 
-        if (plen != len) {      /* "TLS" mode of operation */
+        if (plen != len) { /* "TLS" mode of operation */
             /* calculate HMAC and append it to payload */
             fill_known_data(out + plen, SHA_DIGEST_LENGTH);
 
@@ -853,7 +849,7 @@ static int ossltest_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx,
 }
 
 static int ossltest_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
-                                              int arg, void *ptr)
+    int arg, void *ptr)
 {
     EVP_AES_HMAC_SHA1 *key = data(ctx);
 
@@ -861,36 +857,34 @@ static int ossltest_aes128_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type,
     case EVP_CTRL_AEAD_SET_MAC_KEY:
         return 1;
 
-    case EVP_CTRL_AEAD_TLS1_AAD:
-        {
-            unsigned char *p = ptr;
-            unsigned int len;
-
-            if (arg != EVP_AEAD_TLS1_AAD_LEN)
-                return -1;
-
-            len = p[arg - 2] << 8 | p[arg - 1];
-            key->tls_ver = p[arg - 4] << 8 | p[arg - 3];
-
-            if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
-                key->payload_length = len;
-                if (key->tls_ver >= TLS1_1_VERSION) {
-                    if (len < AES_BLOCK_SIZE)
-                        return 0;
-                    len -= AES_BLOCK_SIZE;
-                    p[arg - 2] = len >> 8;
-                    p[arg - 1] = len;
-                }
-
-                return (int)(((len + SHA_DIGEST_LENGTH +
-                               AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
-                             - len);
-            } else {
-                key->payload_length = arg;
-
-                return SHA_DIGEST_LENGTH;
+    case EVP_CTRL_AEAD_TLS1_AAD: {
+        unsigned char *p = ptr;
+        unsigned int len;
+
+        if (arg != EVP_AEAD_TLS1_AAD_LEN)
+            return -1;
+
+        len = p[arg - 2] << 8 | p[arg - 1];
+        key->tls_ver = p[arg - 4] << 8 | p[arg - 3];
+
+        if (EVP_CIPHER_CTX_is_encrypting(ctx)) {
+            key->payload_length = len;
+            if (key->tls_ver >= TLS1_1_VERSION) {
+                if (len < AES_BLOCK_SIZE)
+                    return 0;
+                len -= AES_BLOCK_SIZE;
+                p[arg - 2] = len >> 8;
+                p[arg - 1] = len;
             }
+
+            return (int)(((len + SHA_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
+                - len);
+        } else {
+            key->payload_length = arg;
+
+            return SHA_DIGEST_LENGTH;
         }
+    }
     default:
         return -1;
     }
diff --git a/engines/e_ossltest_err.c b/engines/e_ossltest_err.c
index f229aeb4384ca..d43b715dd5cf0 100644
--- a/engines/e_ossltest_err.c
+++ b/engines/e_ossltest_err.c
@@ -14,8 +14,8 @@
 #ifndef OPENSSL_NO_ERR
 
 static ERR_STRING_DATA OSSLTEST_str_reasons[] = {
-    {ERR_PACK(0, 0, OSSLTEST_R_INIT_FAILED), "init failed"},
-    {0, NULL}
+    { ERR_PACK(0, 0, OSSLTEST_R_INIT_FAILED), "init failed" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/engines/e_ossltest_err.h b/engines/e_ossltest_err.h
index c89409079be7d..75dbeeeee7b57 100644
--- a/engines/e_ossltest_err.h
+++ b/engines/e_ossltest_err.h
@@ -9,19 +9,17 @@
  */
 
 #ifndef OSSL_E_OSSLTEST_ERR_H
-# define OSSL_E_OSSLTEST_ERR_H
-# pragma once
+#define OSSL_E_OSSLTEST_ERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-
-
-# define OSSLTESTerr(f, r) ERR_OSSLTEST_error(0, (r), OPENSSL_FILE, OPENSSL_LINE)
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
 
+#define OSSLTESTerr(f, r) ERR_OSSLTEST_error(0, (r), OPENSSL_FILE, OPENSSL_LINE)
 
 /*
  * OSSLTEST reason codes.
  */
-# define OSSLTEST_R_INIT_FAILED                           100
+#define OSSLTEST_R_INIT_FAILED 100
 
 #endif
diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index 7e0cfc21fc9b8..8eba5ecf0863a 100644
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -32,20 +32,20 @@
  * doesn't exist elsewhere, but it even can't be compiled on other platforms!
  */
 
-# undef COMPILE_PADLOCKENG
-# if defined(PADLOCK_ASM)
-#  define COMPILE_PADLOCKENG
-#  ifdef OPENSSL_NO_DYNAMIC_ENGINE
+#undef COMPILE_PADLOCKENG
+#if defined(PADLOCK_ASM)
+#define COMPILE_PADLOCKENG
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *ENGINE_padlock(void);
-#  endif
-# endif
+#endif
+#endif
 
-# ifdef OPENSSL_NO_DYNAMIC_ENGINE
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 void engine_load_padlock_int(void);
 void engine_load_padlock_int(void)
 {
 /* On non-x86 CPUs it just returns. */
-#  ifdef COMPILE_PADLOCKENG
+#ifdef COMPILE_PADLOCKENG
     ENGINE *toadd = ENGINE_padlock();
     if (!toadd)
         return;
@@ -62,12 +62,12 @@ void engine_load_padlock_int(void)
      * ENGINE_load_builtin_engines() perhaps).
      */
     ERR_pop_to_mark();
-#  endif
+#endif
 }
 
-# endif
+#endif
 
-# ifdef COMPILE_PADLOCKENG
+#ifdef COMPILE_PADLOCKENG
 
 /* Function for ENGINE detection and control */
 static int padlock_available(void);
@@ -78,7 +78,7 @@ static RAND_METHOD padlock_rand;
 
 /* Cipher Stuff */
 static int padlock_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-                           const int **nids, int nid);
+    const int **nids, int nid);
 
 /* Engine names */
 static const char *padlock_id = "padlock";
@@ -104,16 +104,12 @@ static int padlock_bind_helper(ENGINE *e)
 
     /* Generate a nice engine name with available features */
     BIO_snprintf(padlock_name, sizeof(padlock_name),
-                 "VIA PadLock (%s, %s)",
-                 padlock_use_rng ? "RNG" : "no-RNG",
-                 padlock_use_ace ? "ACE" : "no-ACE");
+        "VIA PadLock (%s, %s)",
+        padlock_use_rng ? "RNG" : "no-RNG",
+        padlock_use_ace ? "ACE" : "no-ACE");
 
     /* Register everything or return with an error */
-    if (!ENGINE_set_id(e, padlock_id) ||
-        !ENGINE_set_name(e, padlock_name) ||
-        !ENGINE_set_init_function(e, padlock_init) ||
-        (padlock_use_ace && !ENGINE_set_ciphers(e, padlock_ciphers)) ||
-        (padlock_use_rng && !ENGINE_set_RAND(e, &padlock_rand))) {
+    if (!ENGINE_set_id(e, padlock_id) || !ENGINE_set_name(e, padlock_name) || !ENGINE_set_init_function(e, padlock_init) || (padlock_use_ace && !ENGINE_set_ciphers(e, padlock_ciphers)) || (padlock_use_rng && !ENGINE_set_RAND(e, &padlock_rand))) {
         return 0;
     }
 
@@ -121,7 +117,7 @@ static int padlock_bind_helper(ENGINE *e)
     return 1;
 }
 
-#  ifdef OPENSSL_NO_DYNAMIC_ENGINE
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 /* Constructor */
 static ENGINE *ENGINE_padlock(void)
 {
@@ -138,7 +134,7 @@ static ENGINE *ENGINE_padlock(void)
 
     return eng;
 }
-#  endif
+#endif
 
 /* Check availability of the engine */
 static int padlock_init(ENGINE *e)
@@ -146,24 +142,26 @@ static int padlock_init(ENGINE *e)
     return (padlock_use_rng || padlock_use_ace);
 }
 
-#  ifndef AES_ASM
+#ifndef AES_ASM
 static int padlock_aes_set_encrypt_key(const unsigned char *userKey,
-                                       const int bits,
-                                       AES_KEY *key);
+    const int bits,
+    AES_KEY *key);
 static int padlock_aes_set_decrypt_key(const unsigned char *userKey,
-                                       const int bits,
-                                       AES_KEY *key);
-#   define AES_ASM
-#   define AES_set_encrypt_key padlock_aes_set_encrypt_key
-#   define AES_set_decrypt_key padlock_aes_set_decrypt_key
+    const int bits,
+    AES_KEY *key);
+#define AES_ASM
+#define AES_set_encrypt_key padlock_aes_set_encrypt_key
+#define AES_set_decrypt_key padlock_aes_set_decrypt_key
+/* clang-format off */
 #   include "../crypto/aes/aes_core.c"
-#  endif
+/* clang-format on */
+#endif
 
 /*
  * This stuff is needed if this ENGINE is being compiled into a
  * self-contained shared-library.
  */
-#  ifndef OPENSSL_NO_DYNAMIC_ENGINE
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int padlock_bind_fn(ENGINE *e, const char *id)
 {
     if (id && (strcmp(id, padlock_id) != 0)) {
@@ -179,38 +177,38 @@ static int padlock_bind_fn(ENGINE *e, const char *id)
 
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(padlock_bind_fn)
-#  endif                       /* !OPENSSL_NO_DYNAMIC_ENGINE */
+#endif /* !OPENSSL_NO_DYNAMIC_ENGINE */
 /* ===== Here comes the "real" engine ===== */
 
 /* Some AES-related constants */
-#  define AES_BLOCK_SIZE          16
-#  define AES_KEY_SIZE_128        16
-#  define AES_KEY_SIZE_192        24
-#  define AES_KEY_SIZE_256        32
-    /*
-     * Here we store the status information relevant to the current context.
-     */
-    /*
-     * BIG FAT WARNING: Inline assembler in PADLOCK_XCRYPT_ASM() depends on
-     * the order of items in this structure.  Don't blindly modify, reorder,
-     * etc!
-     */
+#define AES_BLOCK_SIZE 16
+#define AES_KEY_SIZE_128 16
+#define AES_KEY_SIZE_192 24
+#define AES_KEY_SIZE_256 32
+/*
+ * Here we store the status information relevant to the current context.
+ */
+/*
+ * BIG FAT WARNING: Inline assembler in PADLOCK_XCRYPT_ASM() depends on
+ * the order of items in this structure.  Don't blindly modify, reorder,
+ * etc!
+ */
 struct padlock_cipher_data {
     unsigned char iv[AES_BLOCK_SIZE]; /* Initialization vector */
     union {
         unsigned int pad[4];
         struct {
-            int rounds:4;
-            int dgst:1;         /* n/a in C3 */
-            int align:1;        /* n/a in C3 */
-            int ciphr:1;        /* n/a in C3 */
-            unsigned int keygen:1;
-            int interm:1;
-            unsigned int encdec:1;
-            int ksize:2;
+            int rounds : 4;
+            int dgst : 1; /* n/a in C3 */
+            int align : 1; /* n/a in C3 */
+            int ciphr : 1; /* n/a in C3 */ /* codespell:ignore */
+            unsigned int keygen : 1;
+            int interm : 1; /* codespell:ignore */
+            unsigned int encdec : 1;
+            int ksize : 2;
         } b;
-    } cword;                    /* Control word */
-    AES_KEY ks;                 /* Encryption key */
+    } cword; /* Control word */
+    AES_KEY ks; /* Encryption key */
 };
 
 /* Interface to assembler module */
@@ -219,17 +217,17 @@ void padlock_key_bswap(AES_KEY *key);
 void padlock_verify_context(struct padlock_cipher_data *ctx);
 void padlock_reload_key(void);
 void padlock_aes_block(void *out, const void *inp,
-                       struct padlock_cipher_data *ctx);
+    struct padlock_cipher_data *ctx);
 int padlock_ecb_encrypt(void *out, const void *inp,
-                        struct padlock_cipher_data *ctx, size_t len);
+    struct padlock_cipher_data *ctx, size_t len);
 int padlock_cbc_encrypt(void *out, const void *inp,
-                        struct padlock_cipher_data *ctx, size_t len);
+    struct padlock_cipher_data *ctx, size_t len);
 int padlock_cfb_encrypt(void *out, const void *inp,
-                        struct padlock_cipher_data *ctx, size_t len);
+    struct padlock_cipher_data *ctx, size_t len);
 int padlock_ofb_encrypt(void *out, const void *inp,
-                        struct padlock_cipher_data *ctx, size_t len);
+    struct padlock_cipher_data *ctx, size_t len);
 int padlock_ctr32_encrypt(void *out, const void *inp,
-                          struct padlock_cipher_data *ctx, size_t len);
+    struct padlock_cipher_data *ctx, size_t len);
 int padlock_xstore(void *out, int edx);
 void padlock_sha1_oneshot(void *ctx, const void *inp, size_t len);
 void padlock_sha1(void *ctx, const void *inp, size_t len);
@@ -252,29 +250,29 @@ static int padlock_available(void)
 
 /* ===== AES encryption/decryption ===== */
 
-#  if defined(NID_aes_128_cfb128) && ! defined (NID_aes_128_cfb)
-#   define NID_aes_128_cfb NID_aes_128_cfb128
-#  endif
+#if defined(NID_aes_128_cfb128) && !defined(NID_aes_128_cfb)
+#define NID_aes_128_cfb NID_aes_128_cfb128
+#endif
 
-#  if defined(NID_aes_128_ofb128) && ! defined (NID_aes_128_ofb)
-#   define NID_aes_128_ofb NID_aes_128_ofb128
-#  endif
+#if defined(NID_aes_128_ofb128) && !defined(NID_aes_128_ofb)
+#define NID_aes_128_ofb NID_aes_128_ofb128
+#endif
 
-#  if defined(NID_aes_192_cfb128) && ! defined (NID_aes_192_cfb)
-#   define NID_aes_192_cfb NID_aes_192_cfb128
-#  endif
+#if defined(NID_aes_192_cfb128) && !defined(NID_aes_192_cfb)
+#define NID_aes_192_cfb NID_aes_192_cfb128
+#endif
 
-#  if defined(NID_aes_192_ofb128) && ! defined (NID_aes_192_ofb)
-#   define NID_aes_192_ofb NID_aes_192_ofb128
-#  endif
+#if defined(NID_aes_192_ofb128) && !defined(NID_aes_192_ofb)
+#define NID_aes_192_ofb NID_aes_192_ofb128
+#endif
 
-#  if defined(NID_aes_256_cfb128) && ! defined (NID_aes_256_cfb)
-#   define NID_aes_256_cfb NID_aes_256_cfb128
-#  endif
+#if defined(NID_aes_256_cfb128) && !defined(NID_aes_256_cfb)
+#define NID_aes_256_cfb NID_aes_256_cfb128
+#endif
 
-#  if defined(NID_aes_256_ofb128) && ! defined (NID_aes_256_ofb)
-#   define NID_aes_256_ofb NID_aes_256_ofb128
-#  endif
+#if defined(NID_aes_256_ofb128) && !defined(NID_aes_256_ofb)
+#define NID_aes_256_ofb NID_aes_256_ofb128
+#endif
 
 /* List of supported ciphers. */
 static const int padlock_cipher_nids[] = {
@@ -297,29 +295,27 @@ static const int padlock_cipher_nids[] = {
     NID_aes_256_ctr
 };
 
-static int padlock_cipher_nids_num = (sizeof(padlock_cipher_nids) /
-                                      sizeof(padlock_cipher_nids[0]));
+static int padlock_cipher_nids_num = (sizeof(padlock_cipher_nids) / sizeof(padlock_cipher_nids[0]));
 
 /* Function prototypes ... */
 static int padlock_aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                                const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 
-#  define NEAREST_ALIGNED(ptr) ( (unsigned char *)(ptr) +         \
-        ( (0x10 - ((size_t)(ptr) & 0x0F)) & 0x0F )      )
-#  define ALIGNED_CIPHER_DATA(ctx) ((struct padlock_cipher_data *)\
+#define NEAREST_ALIGNED(ptr) ((unsigned char *)(ptr) + ((0x10 - ((size_t)(ptr) & 0x0F)) & 0x0F))
+#define ALIGNED_CIPHER_DATA(ctx) ((struct padlock_cipher_data *) \
         NEAREST_ALIGNED(EVP_CIPHER_CTX_get_cipher_data(ctx)))
 
 static int
 padlock_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
-                   const unsigned char *in_arg, size_t nbytes)
+    const unsigned char *in_arg, size_t nbytes)
 {
     return padlock_ecb_encrypt(out_arg, in_arg,
-                               ALIGNED_CIPHER_DATA(ctx), nbytes);
+        ALIGNED_CIPHER_DATA(ctx), nbytes);
 }
 
 static int
 padlock_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
-                   const unsigned char *in_arg, size_t nbytes)
+    const unsigned char *in_arg, size_t nbytes)
 {
     struct padlock_cipher_data *cdata = ALIGNED_CIPHER_DATA(ctx);
     int ret;
@@ -332,22 +328,23 @@ padlock_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
 
 static int
 padlock_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
-                   const unsigned char *in_arg, size_t nbytes)
+    const unsigned char *in_arg, size_t nbytes)
 {
     struct padlock_cipher_data *cdata = ALIGNED_CIPHER_DATA(ctx);
     size_t chunk;
 
-    if ((chunk = EVP_CIPHER_CTX_get_num(ctx))) {   /* borrow chunk variable */
+    if ((chunk = EVP_CIPHER_CTX_get_num(ctx))) { /* borrow chunk variable */
         unsigned char *ivp = EVP_CIPHER_CTX_iv_noconst(ctx);
 
         if (chunk >= AES_BLOCK_SIZE)
-            return 0;           /* bogus value */
+            return 0; /* bogus value */
 
         if (EVP_CIPHER_CTX_is_encrypting(ctx))
             while (chunk < AES_BLOCK_SIZE && nbytes != 0) {
                 ivp[chunk] = *(out_arg++) = *(in_arg++) ^ ivp[chunk];
                 chunk++, nbytes--;
-        } else
+            }
+        else
             while (chunk < AES_BLOCK_SIZE && nbytes != 0) {
                 unsigned char c = *(in_arg++);
                 *(out_arg++) = c ^ ivp[chunk];
@@ -403,7 +400,7 @@ padlock_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
 
 static int
 padlock_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
-                   const unsigned char *in_arg, size_t nbytes)
+    const unsigned char *in_arg, size_t nbytes)
 {
     struct padlock_cipher_data *cdata = ALIGNED_CIPHER_DATA(ctx);
     size_t chunk;
@@ -411,11 +408,11 @@ padlock_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
     /*
      * ctx->num is maintained in byte-oriented modes, such as CFB and OFB...
      */
-    if ((chunk = EVP_CIPHER_CTX_get_num(ctx))) {   /* borrow chunk variable */
+    if ((chunk = EVP_CIPHER_CTX_get_num(ctx))) { /* borrow chunk variable */
         unsigned char *ivp = EVP_CIPHER_CTX_iv_noconst(ctx);
 
         if (chunk >= AES_BLOCK_SIZE)
-            return 0;           /* bogus value */
+            return 0; /* bogus value */
 
         while (chunk < AES_BLOCK_SIZE && nbytes != 0) {
             *(out_arg++) = *(in_arg++) ^ ivp[chunk];
@@ -442,9 +439,9 @@ padlock_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
         out_arg += chunk;
         in_arg += chunk;
         EVP_CIPHER_CTX_set_num(ctx, nbytes);
-        padlock_reload_key();   /* empirically found */
+        padlock_reload_key(); /* empirically found */
         padlock_aes_block(ivp, ivp, cdata);
-        padlock_reload_key();   /* empirically found */
+        padlock_reload_key(); /* empirically found */
         while (nbytes) {
             *(out_arg++) = *(in_arg++) ^ *ivp;
             ivp++, nbytes--;
@@ -457,9 +454,9 @@ padlock_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
 }
 
 static void padlock_ctr32_encrypt_glue(const unsigned char *in,
-                                       unsigned char *out, size_t blocks,
-                                       struct padlock_cipher_data *ctx,
-                                       const unsigned char *ivec)
+    unsigned char *out, size_t blocks,
+    struct padlock_cipher_data *ctx,
+    const unsigned char *ivec)
 {
     memcpy(ctx->iv, ivec, AES_BLOCK_SIZE);
     padlock_ctr32_encrypt(out, in, ctx, AES_BLOCK_SIZE * blocks);
@@ -467,7 +464,7 @@ static void padlock_ctr32_encrypt_glue(const unsigned char *in,
 
 static int
 padlock_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
-                   const unsigned char *in_arg, size_t nbytes)
+    const unsigned char *in_arg, size_t nbytes)
 {
     struct padlock_cipher_data *cdata = ALIGNED_CIPHER_DATA(ctx);
     int n = EVP_CIPHER_CTX_get_num(ctx);
@@ -478,52 +475,52 @@ padlock_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
     num = (unsigned int)n;
 
     CRYPTO_ctr128_encrypt_ctr32(in_arg, out_arg, nbytes,
-                                cdata, EVP_CIPHER_CTX_iv_noconst(ctx),
-                                EVP_CIPHER_CTX_buf_noconst(ctx), &num,
-                                (ctr128_f) padlock_ctr32_encrypt_glue);
+        cdata, EVP_CIPHER_CTX_iv_noconst(ctx),
+        EVP_CIPHER_CTX_buf_noconst(ctx), &num,
+        (ctr128_f)padlock_ctr32_encrypt_glue);
 
     EVP_CIPHER_CTX_set_num(ctx, (size_t)num);
     return 1;
 }
 
-#  define EVP_CIPHER_block_size_ECB       AES_BLOCK_SIZE
-#  define EVP_CIPHER_block_size_CBC       AES_BLOCK_SIZE
-#  define EVP_CIPHER_block_size_OFB       1
-#  define EVP_CIPHER_block_size_CFB       1
-#  define EVP_CIPHER_block_size_CTR       1
+#define EVP_CIPHER_block_size_ECB AES_BLOCK_SIZE
+#define EVP_CIPHER_block_size_CBC AES_BLOCK_SIZE
+#define EVP_CIPHER_block_size_OFB 1
+#define EVP_CIPHER_block_size_CFB 1
+#define EVP_CIPHER_block_size_CTR 1
 
 /*
  * Declaring so many ciphers by hand would be a pain. Instead introduce a bit
  * of preprocessor magic :-)
  */
-#  define DECLARE_AES_EVP(ksize,lmode,umode)      \
-static EVP_CIPHER *_hidden_aes_##ksize##_##lmode = NULL; \
-static const EVP_CIPHER *padlock_aes_##ksize##_##lmode(void) \
-{                                                                       \
-    if (_hidden_aes_##ksize##_##lmode == NULL                           \
-        && ((_hidden_aes_##ksize##_##lmode =                            \
-             EVP_CIPHER_meth_new(NID_aes_##ksize##_##lmode,             \
-                                 EVP_CIPHER_block_size_##umode,         \
-                                 AES_KEY_SIZE_##ksize)) == NULL         \
-            || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_##ksize##_##lmode, \
-                                              AES_BLOCK_SIZE)           \
-            || !EVP_CIPHER_meth_set_flags(_hidden_aes_##ksize##_##lmode, \
-                                          0 | EVP_CIPH_##umode##_MODE)  \
-            || !EVP_CIPHER_meth_set_init(_hidden_aes_##ksize##_##lmode, \
-                                         padlock_aes_init_key)          \
-            || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_##ksize##_##lmode, \
-                                              padlock_##lmode##_cipher) \
-            || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_##ksize##_##lmode, \
-                                                  sizeof(struct padlock_cipher_data) + 16) \
-            || !EVP_CIPHER_meth_set_set_asn1_params(_hidden_aes_##ksize##_##lmode, \
-                                                    EVP_CIPHER_set_asn1_iv) \
-            || !EVP_CIPHER_meth_set_get_asn1_params(_hidden_aes_##ksize##_##lmode, \
-                                                    EVP_CIPHER_get_asn1_iv))) { \
-        EVP_CIPHER_meth_free(_hidden_aes_##ksize##_##lmode);            \
-        _hidden_aes_##ksize##_##lmode = NULL;                           \
-    }                                                                   \
-    return _hidden_aes_##ksize##_##lmode;                               \
-}
+#define DECLARE_AES_EVP(ksize, lmode, umode)                                                    \
+    static EVP_CIPHER *_hidden_aes_##ksize##_##lmode = NULL;                                    \
+    static const EVP_CIPHER *padlock_aes_##ksize##_##lmode(void)                                \
+    {                                                                                           \
+        if (_hidden_aes_##ksize##_##lmode == NULL                                               \
+            && ((_hidden_aes_##ksize##_##lmode = EVP_CIPHER_meth_new(NID_aes_##ksize##_##lmode, \
+                     EVP_CIPHER_block_size_##umode,                                             \
+                     AES_KEY_SIZE_##ksize))                                                     \
+                    == NULL                                                                     \
+                || !EVP_CIPHER_meth_set_iv_length(_hidden_aes_##ksize##_##lmode,                \
+                    AES_BLOCK_SIZE)                                                             \
+                || !EVP_CIPHER_meth_set_flags(_hidden_aes_##ksize##_##lmode,                    \
+                    0 | EVP_CIPH_##umode##_MODE)                                                \
+                || !EVP_CIPHER_meth_set_init(_hidden_aes_##ksize##_##lmode,                     \
+                    padlock_aes_init_key)                                                       \
+                || !EVP_CIPHER_meth_set_do_cipher(_hidden_aes_##ksize##_##lmode,                \
+                    padlock_##lmode##_cipher)                                                   \
+                || !EVP_CIPHER_meth_set_impl_ctx_size(_hidden_aes_##ksize##_##lmode,            \
+                    sizeof(struct padlock_cipher_data) + 16)                                    \
+                || !EVP_CIPHER_meth_set_set_asn1_params(_hidden_aes_##ksize##_##lmode,          \
+                    EVP_CIPHER_set_asn1_iv)                                                     \
+                || !EVP_CIPHER_meth_set_get_asn1_params(_hidden_aes_##ksize##_##lmode,          \
+                    EVP_CIPHER_get_asn1_iv))) {                                                 \
+            EVP_CIPHER_meth_free(_hidden_aes_##ksize##_##lmode);                                \
+            _hidden_aes_##ksize##_##lmode = NULL;                                               \
+        }                                                                                       \
+        return _hidden_aes_##ksize##_##lmode;                                                   \
+    }
 
 DECLARE_AES_EVP(128, ecb, ECB)
 DECLARE_AES_EVP(128, cbc, CBC)
@@ -545,7 +542,7 @@ DECLARE_AES_EVP(256, ctr, CTR)
 
 static int
 padlock_ciphers(ENGINE *e, const EVP_CIPHER **cipher, const int **nids,
-                int nid)
+    int nid)
 {
     /* No specific cipher => return a list of supported nids ... */
     if (!cipher) {
@@ -615,14 +612,14 @@ padlock_ciphers(ENGINE *e, const EVP_CIPHER **cipher, const int **nids,
 /* Prepare the encryption key for PadLock usage */
 static int
 padlock_aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                     const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     struct padlock_cipher_data *cdata;
     int key_len = EVP_CIPHER_CTX_get_key_length(ctx) * 8;
     unsigned long mode = EVP_CIPHER_CTX_get_mode(ctx);
 
     if (key == NULL)
-        return 0;               /* ERROR */
+        return 0; /* ERROR */
 
     cdata = ALIGNED_CIPHER_DATA(ctx);
     memset(cdata, 0, sizeof(*cdata));
@@ -699,28 +696,28 @@ static int padlock_rand_bytes(unsigned char *output, int count)
     while (count >= 8) {
         eax = padlock_xstore(output, 0);
         if (!(eax & (1 << 6)))
-            return 0;           /* RNG disabled */
+            return 0; /* RNG disabled */
         /* this ---vv--- covers DC bias, Raw Bits and String Filter */
         if (eax & (0x1F << 10))
             return 0;
         if ((eax & 0x1F) == 0)
-            continue;           /* no data, retry... */
+            continue; /* no data, retry... */
         if ((eax & 0x1F) != 8)
-            return 0;           /* fatal failure...  */
+            return 0; /* fatal failure...  */
         output += 8;
         count -= 8;
     }
     while (count > 0) {
         eax = padlock_xstore(&buf, 3);
         if (!(eax & (1 << 6)))
-            return 0;           /* RNG disabled */
+            return 0; /* RNG disabled */
         /* this ---vv--- covers DC bias, Raw Bits and String Filter */
         if (eax & (0x1F << 10))
             return 0;
         if ((eax & 0x1F) == 0)
-            continue;           /* no data, retry... */
+            continue; /* no data, retry... */
         if ((eax & 0x1F) != 1)
-            return 0;           /* fatal failure...  */
+            return 0; /* fatal failure...  */
         *output++ = (unsigned char)buf;
         count--;
     }
@@ -737,27 +734,27 @@ static int padlock_rand_status(void)
 
 /* Prepare structure for registration */
 static RAND_METHOD padlock_rand = {
-    NULL,                       /* seed */
-    padlock_rand_bytes,         /* bytes */
-    NULL,                       /* cleanup */
-    NULL,                       /* add */
-    padlock_rand_bytes,         /* pseudorand */
-    padlock_rand_status,        /* rand status */
+    NULL, /* seed */
+    padlock_rand_bytes, /* bytes */
+    NULL, /* cleanup */
+    NULL, /* add */
+    padlock_rand_bytes, /* pseudorand */
+    padlock_rand_status, /* rand status */
 };
 
-# endif                        /* COMPILE_PADLOCKENG */
-#endif                         /* !OPENSSL_NO_PADLOCKENG */
+#endif /* COMPILE_PADLOCKENG */
+#endif /* !OPENSSL_NO_PADLOCKENG */
 
 #if defined(OPENSSL_NO_PADLOCKENG) || !defined(COMPILE_PADLOCKENG)
-# ifndef OPENSSL_NO_DYNAMIC_ENGINE
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 OPENSSL_EXPORT
-    int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns);
+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)
+int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns)
 {
     return 0;
 }
 
 IMPLEMENT_DYNAMIC_CHECK_FN()
-# endif
+#endif
 #endif
diff --git a/exporters/cmake/OpenSSLConfig.cmake.in b/exporters/cmake/OpenSSLConfig.cmake.in
index 766aebe3d4b74..c023e78eafb93 100644
--- a/exporters/cmake/OpenSSLConfig.cmake.in
+++ b/exporters/cmake/OpenSSLConfig.cmake.in
@@ -2,7 +2,6 @@
 {-
    use lib catdir($config{sourcedir}, 'Configurations');
    use platform;
-   use Data::Dumper;
 
    our %lib_info = (
        map { my %x = ();
diff --git a/fuzz/asn1.c b/fuzz/asn1.c
index febb296ce924c..340d64923fd24 100644
--- a/fuzz/asn1.c
+++ b/fuzz/asn1.c
@@ -211,88 +211,87 @@ static ASN1_ITEM_EXP *item_type[] = {
 
 static ASN1_PCTX *pctx;
 
-#define DO_TEST(TYPE, D2I, I2D, PRINT) { \
-    const unsigned char *p = buf; \
-    unsigned char *der = NULL; \
-    TYPE *type = D2I(NULL, &p, len); \
-    \
-    if (type != NULL) { \
-        int len2; \
-        BIO *bio = BIO_new(BIO_s_null()); \
-        \
-        if (bio != NULL) { \
-            PRINT(bio, type); \
-            BIO_free(bio); \
-        } \
-        len2 = I2D(type, &der); \
-        if (len2 != 0) {} \
-        OPENSSL_free(der); \
-        TYPE ## _free(type); \
-    } \
-}
-
-#define DO_TEST_PRINT_OFFSET(TYPE, D2I, I2D, PRINT) { \
-    const unsigned char *p = buf; \
-    unsigned char *der = NULL; \
-    TYPE *type = D2I(NULL, &p, len); \
-    \
-    if (type != NULL) { \
-        BIO *bio = BIO_new(BIO_s_null()); \
-        \
-        if (bio != NULL) { \
-            PRINT(bio, type, 0); \
-            BIO_free(bio); \
-        } \
-        I2D(type, &der); \
-        OPENSSL_free(der); \
-        TYPE ## _free(type); \
-    } \
-}
-
-#define DO_TEST_PRINT_PCTX(TYPE, D2I, I2D, PRINT) { \
-    const unsigned char *p = buf; \
-    unsigned char *der = NULL; \
-    TYPE *type = D2I(NULL, &p, len); \
-    \
-    if (type != NULL) { \
-        BIO *bio = BIO_new(BIO_s_null()); \
-        \
-        if (bio != NULL) { \
-            PRINT(bio, type, 0, pctx); \
-            BIO_free(bio); \
-        } \
-        I2D(type, &der); \
-        OPENSSL_free(der); \
-        TYPE ## _free(type); \
-    } \
-}
+#define DO_TEST(TYPE, D2I, I2D, PRINT)        \
+    {                                         \
+        const unsigned char *p = buf;         \
+        unsigned char *der = NULL;            \
+        TYPE *type = D2I(NULL, &p, len);      \
+                                              \
+        if (type != NULL) {                   \
+            int len2;                         \
+            BIO *bio = BIO_new(BIO_s_null()); \
+                                              \
+            if (bio != NULL) {                \
+                PRINT(bio, type);             \
+                BIO_free(bio);                \
+            }                                 \
+            len2 = I2D(type, &der);           \
+            if (len2 != 0) { }                \
+            OPENSSL_free(der);                \
+            TYPE##_free(type);                \
+        }                                     \
+    }
 
+#define DO_TEST_PRINT_OFFSET(TYPE, D2I, I2D, PRINT) \
+    {                                               \
+        const unsigned char *p = buf;               \
+        unsigned char *der = NULL;                  \
+        TYPE *type = D2I(NULL, &p, len);            \
+                                                    \
+        if (type != NULL) {                         \
+            BIO *bio = BIO_new(BIO_s_null());       \
+                                                    \
+            if (bio != NULL) {                      \
+                PRINT(bio, type, 0);                \
+                BIO_free(bio);                      \
+            }                                       \
+            I2D(type, &der);                        \
+            OPENSSL_free(der);                      \
+            TYPE##_free(type);                      \
+        }                                           \
+    }
 
-#define DO_TEST_NO_PRINT(TYPE, D2I, I2D) { \
-    const unsigned char *p = buf; \
-    unsigned char *der = NULL; \
-    TYPE *type = D2I(NULL, &p, len); \
-    \
-    if (type != NULL) { \
-        BIO *bio = BIO_new(BIO_s_null()); \
-        \
-        BIO_free(bio); \
-        I2D(type, &der); \
-        OPENSSL_free(der); \
-        TYPE ## _free(type); \
-    } \
-}
+#define DO_TEST_PRINT_PCTX(TYPE, D2I, I2D, PRINT) \
+    {                                             \
+        const unsigned char *p = buf;             \
+        unsigned char *der = NULL;                \
+        TYPE *type = D2I(NULL, &p, len);          \
+                                                  \
+        if (type != NULL) {                       \
+            BIO *bio = BIO_new(BIO_s_null());     \
+                                                  \
+            if (bio != NULL) {                    \
+                PRINT(bio, type, 0, pctx);        \
+                BIO_free(bio);                    \
+            }                                     \
+            I2D(type, &der);                      \
+            OPENSSL_free(der);                    \
+            TYPE##_free(type);                    \
+        }                                         \
+    }
 
+#define DO_TEST_NO_PRINT(TYPE, D2I, I2D)      \
+    {                                         \
+        const unsigned char *p = buf;         \
+        unsigned char *der = NULL;            \
+        TYPE *type = D2I(NULL, &p, len);      \
+                                              \
+        if (type != NULL) {                   \
+            BIO *bio = BIO_new(BIO_s_null()); \
+                                              \
+            BIO_free(bio);                    \
+            I2D(type, &der);                  \
+            OPENSSL_free(der);                \
+            TYPE##_free(type);                \
+        }                                     \
+    }
 
 int FuzzerInitialize(int *argc, char ***argv)
 {
     FuzzerSetRand();
     pctx = ASN1_PCTX_new();
-    ASN1_PCTX_set_flags(pctx, ASN1_PCTX_FLAGS_SHOW_ABSENT |
-        ASN1_PCTX_FLAGS_SHOW_SEQUENCE | ASN1_PCTX_FLAGS_SHOW_SSOF |
-        ASN1_PCTX_FLAGS_SHOW_TYPE | ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME);
-    ASN1_PCTX_set_str_flags(pctx, ASN1_STRFLGS_UTF8_CONVERT |
-        ASN1_STRFLGS_SHOW_TYPE | ASN1_STRFLGS_DUMP_ALL);
+    ASN1_PCTX_set_flags(pctx, ASN1_PCTX_FLAGS_SHOW_ABSENT | ASN1_PCTX_FLAGS_SHOW_SEQUENCE | ASN1_PCTX_FLAGS_SHOW_SSOF | ASN1_PCTX_FLAGS_SHOW_TYPE | ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME);
+    ASN1_PCTX_set_str_flags(pctx, ASN1_STRFLGS_UTF8_CONVERT | ASN1_STRFLGS_SHOW_TYPE | ASN1_STRFLGS_DUMP_ALL);
 
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);
@@ -306,7 +305,6 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 {
     int n;
 
-
     for (n = 0; item_type[n] != NULL; ++n) {
         const uint8_t *b = buf;
         unsigned char *der = NULL;
@@ -351,22 +349,22 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 #endif
 #ifndef OPENSSL_NO_DSA
     DO_TEST_NO_PRINT(DSA_SIG, d2i_DSA_SIG, i2d_DSA_SIG);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     DO_TEST_NO_PRINT(DSA, d2i_DSAPrivateKey, i2d_DSAPrivateKey);
     DO_TEST_NO_PRINT(DSA, d2i_DSAPublicKey, i2d_DSAPublicKey);
     DO_TEST_NO_PRINT(DSA, d2i_DSAparams, i2d_DSAparams);
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_DEPRECATED_3_0
     DO_TEST_NO_PRINT(RSA, d2i_RSAPublicKey, i2d_RSAPublicKey);
 #endif
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     DO_TEST_PRINT_OFFSET(EC_GROUP, d2i_ECPKParameters, i2d_ECPKParameters, ECPKParameters_print);
     DO_TEST_PRINT_OFFSET(EC_KEY, d2i_ECPrivateKey, i2d_ECPrivateKey, EC_KEY_print);
     DO_TEST(EC_KEY, d2i_ECParameters, i2d_ECParameters, ECParameters_print);
     DO_TEST_NO_PRINT(ECDSA_SIG, d2i_ECDSA_SIG, i2d_ECDSA_SIG);
-# endif
+#endif
 #endif
     DO_TEST_PRINT_PCTX(EVP_PKEY, d2i_AutoPrivateKey, i2d_PrivateKey, EVP_PKEY_print_private);
     DO_TEST(SSL_SESSION, d2i_SSL_SESSION, i2d_SSL_SESSION, SSL_SESSION_print);
diff --git a/fuzz/bignum.c b/fuzz/bignum.c
index 08da6fb197f5b..66b41faf108ad 100644
--- a/fuzz/bignum.c
+++ b/fuzz/bignum.c
@@ -18,7 +18,6 @@
 #include <openssl/err.h>
 #include "fuzzer.h"
 
-
 int FuzzerInitialize(int *argc, char ***argv)
 {
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
@@ -92,7 +91,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
         putchar('\n');
     }
 
- done:
+done:
     OPENSSL_assert(success);
     BN_free(b1);
     BN_free(b2);
diff --git a/fuzz/bndiv.c b/fuzz/bndiv.c
index d9467b5e8b412..7b48ac3dd9558 100644
--- a/fuzz/bndiv.c
+++ b/fuzz/bndiv.c
@@ -87,7 +87,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
         success = (BN_is_negative(b3) != BN_is_negative(b2) || BN_is_zero(b3))
             && (BN_is_negative(b4) || BN_is_zero(b4));
     else
-        success = (BN_is_negative(b3) == BN_is_negative(b2)  || BN_is_zero(b3))
+        success = (BN_is_negative(b3) == BN_is_negative(b2) || BN_is_zero(b3))
             && (!BN_is_negative(b4) || BN_is_zero(b4));
     OPENSSL_assert(BN_mul(b5, b3, b2, ctx));
     OPENSSL_assert(BN_add(b5, b5, b4));
@@ -105,15 +105,15 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
         BN_print_fp(stdout, b5);
         putchar('\n');
         printf("%d %d %d %d %d %d %d\n", BN_is_negative(b1),
-               BN_is_negative(b2),
-               BN_is_negative(b3), BN_is_negative(b4), BN_is_zero(b4),
-               BN_is_negative(b3) != BN_is_negative(b2)
-               && (BN_is_negative(b4) || BN_is_zero(b4)),
-               BN_cmp(b5, b1));
+            BN_is_negative(b2),
+            BN_is_negative(b3), BN_is_negative(b4), BN_is_zero(b4),
+            BN_is_negative(b3) != BN_is_negative(b2)
+                && (BN_is_negative(b4) || BN_is_zero(b4)),
+            BN_cmp(b5, b1));
         puts("----\n");
     }
 
- done:
+done:
     OPENSSL_assert(success);
     ERR_clear_error();
 
diff --git a/fuzz/client.c b/fuzz/client.c
index 1754add50967d..d5125af994ad0 100644
--- a/fuzz/client.c
+++ b/fuzz/client.c
@@ -23,7 +23,12 @@ static int idx;
 
 #define FUZZTIME 1485898104
 
-#define TIME_IMPL(t) { if (t != NULL) *t = FUZZTIME; return FUZZTIME; }
+#define TIME_IMPL(t)       \
+    {                      \
+        if (t != NULL)     \
+            *t = FUZZTIME; \
+        return FUZZTIME;   \
+    }
 
 /*
  * This might not work in all cases (and definitely not on Windows
@@ -36,7 +41,7 @@ static int idx;
 time_t time(time_t *t) TIME_IMPL(t)
 #endif
 
-int FuzzerInitialize(int *argc, char ***argv)
+    int FuzzerInitialize(int *argc, char ***argv)
 {
     STACK_OF(SSL_COMP) *comp_methods;
 
@@ -94,7 +99,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
             }
         }
     }
- end:
+end:
     SSL_free(client);
     ERR_clear_error();
     SSL_CTX_free(ctx);
diff --git a/fuzz/cmp.c b/fuzz/cmp.c
index 16d2fade225d5..64ef6e34a9e0f 100644
--- a/fuzz/cmp.c
+++ b/fuzz/cmp.c
@@ -33,17 +33,17 @@ static OSSL_CMP_MSG *transfer_cb(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req)
     if (num_responses++ > 2)
         return NULL; /* prevent loops due to repeated pollRep */
     return OSSL_CMP_MSG_dup((OSSL_CMP_MSG *)
-                            OSSL_CMP_CTX_get_transfer_cb_arg(ctx));
+            OSSL_CMP_CTX_get_transfer_cb_arg(ctx));
 }
 
 static int print_noop(const char *func, const char *file, int line,
-                      OSSL_CMP_severity level, const char *msg)
+    OSSL_CMP_severity level, const char *msg)
 {
     return 1;
 }
 
 static int allow_unprotected(const OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *rep,
-                             int invalid_protection, int expected_type)
+    int invalid_protection, int expected_type)
 {
     return 1;
 }
@@ -58,10 +58,10 @@ static void cmp_client_process_response(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
     ctx->popoMethod = OSSL_CRMF_POPO_NONE; /* satisfy ossl_cmp_certReq_new() */
     ctx->oldCert = X509_new(); /* satisfy crm_new() and ossl_cmp_rr_new() */
     if (!OSSL_CMP_CTX_set1_secretValue(ctx, (unsigned char *)"",
-                                       0) /* prevent too unspecific error */
-            || ctx->oldCert == NULL
-            || name == NULL || !X509_set_issuer_name(ctx->oldCert, name)
-            || serial == NULL || !X509_set_serialNumber(ctx->oldCert, serial))
+            0) /* prevent too unspecific error */
+        || ctx->oldCert == NULL
+        || name == NULL || !X509_set_issuer_name(ctx->oldCert, name)
+        || serial == NULL || !X509_set_serialNumber(ctx->oldCert, serial))
         goto err;
 
     (void)OSSL_CMP_CTX_set_transfer_cb(ctx, transfer_cb);
@@ -88,81 +88,81 @@ static void cmp_client_process_response(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg)
         break;
     case OSSL_CMP_PKIBODY_GENP:
         sk_OSSL_CMP_ITAV_pop_free(OSSL_CMP_exec_GENM_ses(ctx),
-                                  OSSL_CMP_ITAV_free);
+            OSSL_CMP_ITAV_free);
         break;
     default:
         (void)ossl_cmp_msg_check_update(ctx, msg, allow_unprotected, 0);
         break;
     }
- err:
+err:
     X509_NAME_free(name);
     ASN1_INTEGER_free(serial);
 }
 
 static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
-                                            const OSSL_CMP_MSG *cert_req,
-                                            int certReqId,
-                                            const OSSL_CRMF_MSG *crm,
-                                            const X509_REQ *p10cr,
-                                            X509 **certOut,
-                                            STACK_OF(X509) **chainOut,
-                                            STACK_OF(X509) **caPubs)
+    const OSSL_CMP_MSG *cert_req,
+    int certReqId,
+    const OSSL_CRMF_MSG *crm,
+    const X509_REQ *p10cr,
+    X509 **certOut,
+    STACK_OF(X509) **chainOut,
+    STACK_OF(X509) **caPubs)
 {
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
     return NULL;
 }
 
 static OSSL_CMP_PKISI *process_rr(OSSL_CMP_SRV_CTX *srv_ctx,
-                                  const OSSL_CMP_MSG *rr,
-                                  const X509_NAME *issuer,
-                                  const ASN1_INTEGER *serial)
+    const OSSL_CMP_MSG *rr,
+    const X509_NAME *issuer,
+    const ASN1_INTEGER *serial)
 {
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
     return NULL;
 }
 
 static int process_genm(OSSL_CMP_SRV_CTX *srv_ctx,
-                        const OSSL_CMP_MSG *genm,
-                        const STACK_OF(OSSL_CMP_ITAV) *in,
-                        STACK_OF(OSSL_CMP_ITAV) **out)
+    const OSSL_CMP_MSG *genm,
+    const STACK_OF(OSSL_CMP_ITAV) *in,
+    STACK_OF(OSSL_CMP_ITAV) **out)
 {
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
     return 0;
 }
 
 static void process_error(OSSL_CMP_SRV_CTX *srv_ctx, const OSSL_CMP_MSG *error,
-                          const OSSL_CMP_PKISI *statusInfo,
-                          const ASN1_INTEGER *errorCode,
-                          const OSSL_CMP_PKIFREETEXT *errorDetails)
+    const OSSL_CMP_PKISI *statusInfo,
+    const ASN1_INTEGER *errorCode,
+    const OSSL_CMP_PKIFREETEXT *errorDetails)
 {
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
 }
 
 static int process_certConf(OSSL_CMP_SRV_CTX *srv_ctx,
-                            const OSSL_CMP_MSG *certConf, int certReqId,
-                            const ASN1_OCTET_STRING *certHash,
-                            const OSSL_CMP_PKISI *si)
+    const OSSL_CMP_MSG *certConf, int certReqId,
+    const ASN1_OCTET_STRING *certHash,
+    const OSSL_CMP_PKISI *si)
 {
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
     return 0;
 }
 
 static int process_pollReq(OSSL_CMP_SRV_CTX *srv_ctx,
-                           const OSSL_CMP_MSG *pollReq, int certReqId,
-                           OSSL_CMP_MSG **certReq, int64_t *check_after)
+    const OSSL_CMP_MSG *pollReq, int certReqId,
+    OSSL_CMP_MSG **certReq, int64_t *check_after)
 {
     ERR_raise(ERR_LIB_CMP, CMP_R_ERROR_PROCESSING_MESSAGE);
     return 0;
 }
 
 static int clean_transaction(ossl_unused OSSL_CMP_SRV_CTX *srv_ctx,
-                             ossl_unused const ASN1_OCTET_STRING *id)
+    ossl_unused const ASN1_OCTET_STRING *id)
 {
     return 1;
 }
 
 static int delayed_delivery(ossl_unused OSSL_CMP_SRV_CTX *srv_ctx,
-                            ossl_unused const OSSL_CMP_MSG *req)
+    ossl_unused const OSSL_CMP_MSG *req)
 {
     return 0;
 }
@@ -185,19 +185,19 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 
         i2d_OSSL_CMP_MSG_bio(out, msg);
         ASN1_item_print(out, (ASN1_VALUE *)msg, 4,
-                        ASN1_ITEM_rptr(OSSL_CMP_MSG), NULL);
+            ASN1_ITEM_rptr(OSSL_CMP_MSG), NULL);
         BIO_free(out);
 
         if (client_ctx != NULL)
             cmp_client_process_response(client_ctx, msg);
         if (srv_ctx != NULL
             && OSSL_CMP_CTX_set_log_cb(OSSL_CMP_SRV_CTX_get0_cmp_ctx(srv_ctx),
-                                       print_noop)
+                print_noop)
             && OSSL_CMP_SRV_CTX_init(srv_ctx, NULL, process_cert_request,
-                                     process_rr, process_genm, process_error,
-                                     process_certConf, process_pollReq)
+                process_rr, process_genm, process_error,
+                process_certConf, process_pollReq)
             && OSSL_CMP_SRV_CTX_init_trans(srv_ctx, delayed_delivery,
-                                           clean_transaction))
+                clean_transaction))
             OSSL_CMP_MSG_free(OSSL_CMP_SRV_process_request(srv_ctx, msg));
 
         OSSL_CMP_CTX_free(client_ctx);
diff --git a/fuzz/decoder.c b/fuzz/decoder.c
index 6d8ddbe6406ad..3a9a48ad21806 100644
--- a/fuzz/decoder.c
+++ b/fuzz/decoder.c
@@ -20,18 +20,13 @@ int FuzzerInitialize(int *argc, char ***argv)
     FuzzerSetRand();
 
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS
-                        | OPENSSL_INIT_ADD_ALL_CIPHERS
-                        | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
+            | OPENSSL_INIT_ADD_ALL_CIPHERS
+            | OPENSSL_INIT_ADD_ALL_DIGESTS,
+        NULL);
 
     pctx = ASN1_PCTX_new();
-    ASN1_PCTX_set_flags(pctx, ASN1_PCTX_FLAGS_SHOW_ABSENT
-                              | ASN1_PCTX_FLAGS_SHOW_SEQUENCE
-                              | ASN1_PCTX_FLAGS_SHOW_SSOF
-                              | ASN1_PCTX_FLAGS_SHOW_TYPE
-                              | ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME);
-    ASN1_PCTX_set_str_flags(pctx, ASN1_STRFLGS_UTF8_CONVERT
-                                  | ASN1_STRFLGS_SHOW_TYPE
-                                  | ASN1_STRFLGS_DUMP_ALL);
+    ASN1_PCTX_set_flags(pctx, ASN1_PCTX_FLAGS_SHOW_ABSENT | ASN1_PCTX_FLAGS_SHOW_SEQUENCE | ASN1_PCTX_FLAGS_SHOW_SSOF | ASN1_PCTX_FLAGS_SHOW_TYPE | ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME);
+    ASN1_PCTX_set_str_flags(pctx, ASN1_STRFLGS_UTF8_CONVERT | ASN1_STRFLGS_SHOW_TYPE | ASN1_STRFLGS_DUMP_ALL);
 
     ERR_clear_error();
     CRYPTO_free_ex_index(0, -1);
@@ -47,7 +42,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 
     bio = BIO_new(BIO_s_null());
     dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, NULL, NULL, NULL, 0, NULL,
-                                                NULL);
+        NULL);
     if (dctx == NULL) {
         return 0;
     }
diff --git a/fuzz/driver.c b/fuzz/driver.c
index 337b8de5eb517..96c93e559ede7 100644
--- a/fuzz/driver.c
+++ b/fuzz/driver.c
@@ -32,7 +32,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len)
 
 #define BUF_SIZE 65536
 
-int main(int argc, char** argv)
+int main(int argc, char **argv)
 {
     FuzzerInitialize(&argc, &argv);
 
diff --git a/fuzz/dtlsclient.c b/fuzz/dtlsclient.c
index 0e239d991d80c..0cbed3ea6b1e0 100644
--- a/fuzz/dtlsclient.c
+++ b/fuzz/dtlsclient.c
@@ -23,7 +23,12 @@ static int idx;
 
 #define FUZZTIME 1485898104
 
-#define TIME_IMPL(t) { if (t != NULL) *t = FUZZTIME; return FUZZTIME; }
+#define TIME_IMPL(t)       \
+    {                      \
+        if (t != NULL)     \
+            *t = FUZZTIME; \
+        return FUZZTIME;   \
+    }
 
 /*
  * This might not work in all cases (and definitely not on Windows
@@ -36,7 +41,7 @@ static int idx;
 time_t time(time_t *t) TIME_IMPL(t)
 #endif
 
-int FuzzerInitialize(int *argc, char ***argv)
+    int FuzzerInitialize(int *argc, char ***argv)
 {
     STACK_OF(SSL_COMP) *comp_methods;
 
@@ -94,7 +99,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
             }
         }
     }
- end:
+end:
     SSL_free(client);
     ERR_clear_error();
     SSL_CTX_free(ctx);
diff --git a/fuzz/dtlsserver.c b/fuzz/dtlsserver.c
index 68ddb1e6e6834..9261e819d1f90 100644
--- a/fuzz/dtlsserver.c
+++ b/fuzz/dtlsserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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.
@@ -50,89 +50,1328 @@ a2vbz3gpOsl87U0c01JCl9SZXDSO09w=
 -----END CERTIFICATE-----
  */
 static const uint8_t RSACertificatePEM[] = {
-0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49,
-0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x44,
-0x6f, 0x7a, 0x43, 0x43, 0x41, 0x6f, 0x75, 0x67, 0x41, 0x77, 0x49, 0x42, 0x41, 0x67, 0x49, 0x55,
-0x53, 0x4b, 0x77, 0x51, 0x44, 0x31, 0x71, 0x52, 0x74, 0x53, 0x2b, 0x6c, 0x72, 0x69, 0x64, 0x61,
-0x77, 0x6d, 0x61, 0x59, 0x4b, 0x36, 0x63, 0x65, 0x6a, 0x32, 0x6b, 0x77, 0x44, 0x51, 0x59, 0x4a,
-0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x4c, 0x0a, 0x42, 0x51, 0x41,
-0x77, 0x59, 0x54, 0x45, 0x4c, 0x4d, 0x41, 0x6b, 0x47, 0x41, 0x31, 0x55, 0x45, 0x42, 0x68, 0x4d,
-0x43, 0x62, 0x6d, 0x38, 0x78, 0x43, 0x7a, 0x41, 0x4a, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x67,
-0x4d, 0x41, 0x6d, 0x35, 0x76, 0x4d, 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51,
-0x48, 0x44, 0x41, 0x4a, 0x75, 0x62, 0x7a, 0x45, 0x4c, 0x4d, 0x41, 0x6b, 0x47, 0x0a, 0x41, 0x31,
-0x55, 0x45, 0x43, 0x67, 0x77, 0x43, 0x62, 0x6d, 0x38, 0x78, 0x43, 0x7a, 0x41, 0x4a, 0x42, 0x67,
-0x4e, 0x56, 0x42, 0x41, 0x73, 0x4d, 0x41, 0x6d, 0x35, 0x76, 0x4d, 0x51, 0x73, 0x77, 0x43, 0x51,
-0x59, 0x44, 0x56, 0x51, 0x51, 0x44, 0x44, 0x41, 0x4a, 0x75, 0x62, 0x7a, 0x45, 0x52, 0x4d, 0x41,
-0x38, 0x47, 0x43, 0x53, 0x71, 0x47, 0x53, 0x49, 0x62, 0x33, 0x44, 0x51, 0x45, 0x4a, 0x0a, 0x41,
-0x52, 0x59, 0x43, 0x62, 0x6d, 0x38, 0x77, 0x48, 0x68, 0x63, 0x4e, 0x4d, 0x6a, 0x51, 0x77, 0x4d,
-0x6a, 0x49, 0x34, 0x4d, 0x54, 0x6b, 0x7a, 0x4e, 0x7a, 0x45, 0x77, 0x57, 0x68, 0x63, 0x4e, 0x4d,
-0x6a, 0x55, 0x77, 0x4d, 0x6a, 0x49, 0x33, 0x4d, 0x54, 0x6b, 0x7a, 0x4e, 0x7a, 0x45, 0x77, 0x57,
-0x6a, 0x42, 0x68, 0x4d, 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44, 0x56, 0x51, 0x51, 0x47, 0x0a,
-0x45, 0x77, 0x4a, 0x75, 0x62, 0x7a, 0x45, 0x4c, 0x4d, 0x41, 0x6b, 0x47, 0x41, 0x31, 0x55, 0x45,
-0x43, 0x41, 0x77, 0x43, 0x62, 0x6d, 0x38, 0x78, 0x43, 0x7a, 0x41, 0x4a, 0x42, 0x67, 0x4e, 0x56,
-0x42, 0x41, 0x63, 0x4d, 0x41, 0x6d, 0x35, 0x76, 0x4d, 0x51, 0x73, 0x77, 0x43, 0x51, 0x59, 0x44,
-0x56, 0x51, 0x51, 0x4b, 0x44, 0x41, 0x4a, 0x75, 0x62, 0x7a, 0x45, 0x4c, 0x4d, 0x41, 0x6b, 0x47,
-0x0a, 0x41, 0x31, 0x55, 0x45, 0x43, 0x77, 0x77, 0x43, 0x62, 0x6d, 0x38, 0x78, 0x43, 0x7a, 0x41,
-0x4a, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x4d, 0x4d, 0x41, 0x6d, 0x35, 0x76, 0x4d, 0x52, 0x45,
-0x77, 0x44, 0x77, 0x59, 0x4a, 0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x6b,
-0x42, 0x46, 0x67, 0x4a, 0x75, 0x62, 0x7a, 0x43, 0x43, 0x41, 0x53, 0x49, 0x77, 0x44, 0x51, 0x59,
-0x4a, 0x0a, 0x4b, 0x6f, 0x5a, 0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x42, 0x42, 0x51,
-0x41, 0x44, 0x67, 0x67, 0x45, 0x50, 0x41, 0x44, 0x43, 0x43, 0x41, 0x51, 0x6f, 0x43, 0x67, 0x67,
-0x45, 0x42, 0x41, 0x4c, 0x57, 0x5a, 0x42, 0x39, 0x4d, 0x74, 0x61, 0x73, 0x30, 0x56, 0x39, 0x53,
-0x79, 0x61, 0x2b, 0x55, 0x68, 0x45, 0x61, 0x62, 0x77, 0x7a, 0x73, 0x33, 0x45, 0x6f, 0x6c, 0x2b,
-0x2f, 0x4d, 0x0a, 0x68, 0x77, 0x55, 0x46, 0x57, 0x49, 0x46, 0x72, 0x72, 0x38, 0x74, 0x56, 0x79,
-0x59, 0x76, 0x67, 0x38, 0x58, 0x73, 0x2f, 0x4b, 0x6e, 0x43, 0x32, 0x56, 0x61, 0x45, 0x70, 0x6e,
-0x45, 0x6c, 0x74, 0x42, 0x4e, 0x4c, 0x61, 0x4f, 0x41, 0x44, 0x5a, 0x47, 0x55, 0x75, 0x58, 0x7a,
-0x7a, 0x35, 0x45, 0x62, 0x63, 0x63, 0x62, 0x32, 0x69, 0x31, 0x38, 0x67, 0x68, 0x76, 0x4d, 0x44,
-0x58, 0x35, 0x6f, 0x0a, 0x4f, 0x77, 0x41, 0x41, 0x69, 0x64, 0x4c, 0x33, 0x74, 0x76, 0x36, 0x6c,
-0x68, 0x38, 0x2f, 0x56, 0x75, 0x6a, 0x38, 0x74, 0x70, 0x4c, 0x41, 0x35, 0x33, 0x53, 0x44, 0x52,
-0x35, 0x56, 0x54, 0x51, 0x63, 0x78, 0x69, 0x74, 0x69, 0x70, 0x73, 0x63, 0x63, 0x6a, 0x61, 0x63,
-0x48, 0x44, 0x66, 0x74, 0x54, 0x71, 0x44, 0x41, 0x37, 0x2b, 0x39, 0x34, 0x53, 0x54, 0x54, 0x38,
-0x51, 0x53, 0x48, 0x74, 0x0a, 0x57, 0x75, 0x35, 0x46, 0x6d, 0x58, 0x50, 0x4b, 0x76, 0x4a, 0x4c,
-0x6d, 0x50, 0x75, 0x4b, 0x51, 0x4a, 0x4d, 0x62, 0x4f, 0x4a, 0x53, 0x47, 0x44, 0x4a, 0x4c, 0x76,
-0x64, 0x54, 0x2f, 0x30, 0x64, 0x79, 0x4d, 0x39, 0x61, 0x55, 0x33, 0x78, 0x4b, 0x77, 0x36, 0x34,
-0x69, 0x76, 0x37, 0x53, 0x33, 0x6c, 0x61, 0x45, 0x52, 0x57, 0x79, 0x57, 0x34, 0x2f, 0x4f, 0x65,
-0x6d, 0x4d, 0x51, 0x58, 0x73, 0x0a, 0x69, 0x2b, 0x6b, 0x62, 0x61, 0x6e, 0x70, 0x56, 0x4e, 0x4a,
-0x56, 0x6d, 0x71, 0x54, 0x74, 0x53, 0x2b, 0x71, 0x2f, 0x46, 0x79, 0x59, 0x76, 0x76, 0x72, 0x31,
-0x4e, 0x70, 0x58, 0x30, 0x4f, 0x63, 0x2f, 0x41, 0x35, 0x48, 0x32, 0x48, 0x59, 0x51, 0x36, 0x66,
-0x36, 0x50, 0x33, 0x6e, 0x76, 0x4a, 0x32, 0x32, 0x49, 0x4f, 0x58, 0x6f, 0x49, 0x63, 0x4e, 0x6a,
-0x49, 0x31, 0x46, 0x6d, 0x4b, 0x62, 0x0a, 0x58, 0x33, 0x4e, 0x4a, 0x48, 0x65, 0x74, 0x48, 0x58,
-0x74, 0x79, 0x5a, 0x4b, 0x58, 0x63, 0x66, 0x70, 0x69, 0x7a, 0x6c, 0x6a, 0x73, 0x4e, 0x76, 0x62,
-0x66, 0x66, 0x73, 0x4c, 0x36, 0x74, 0x77, 0x78, 0x6a, 0x6a, 0x43, 0x52, 0x33, 0x4a, 0x64, 0x55,
-0x71, 0x50, 0x31, 0x78, 0x45, 0x43, 0x65, 0x75, 0x6f, 0x4c, 0x42, 0x4d, 0x7a, 0x6b, 0x43, 0x41,
-0x77, 0x45, 0x41, 0x41, 0x61, 0x4e, 0x54, 0x0a, 0x4d, 0x46, 0x45, 0x77, 0x48, 0x51, 0x59, 0x44,
-0x56, 0x52, 0x30, 0x4f, 0x42, 0x42, 0x59, 0x45, 0x46, 0x4b, 0x5a, 0x32, 0x62, 0x39, 0x49, 0x4a,
-0x33, 0x59, 0x57, 0x43, 0x59, 0x79, 0x4d, 0x6b, 0x52, 0x4f, 0x6a, 0x74, 0x6a, 0x46, 0x37, 0x43,
-0x78, 0x73, 0x66, 0x61, 0x4d, 0x42, 0x38, 0x47, 0x41, 0x31, 0x55, 0x64, 0x49, 0x77, 0x51, 0x59,
-0x4d, 0x42, 0x61, 0x41, 0x46, 0x4b, 0x5a, 0x32, 0x0a, 0x62, 0x39, 0x49, 0x4a, 0x33, 0x59, 0x57,
-0x43, 0x59, 0x79, 0x4d, 0x6b, 0x52, 0x4f, 0x6a, 0x74, 0x6a, 0x46, 0x37, 0x43, 0x78, 0x73, 0x66,
-0x61, 0x4d, 0x41, 0x38, 0x47, 0x41, 0x31, 0x55, 0x64, 0x45, 0x77, 0x45, 0x42, 0x2f, 0x77, 0x51,
-0x46, 0x4d, 0x41, 0x4d, 0x42, 0x41, 0x66, 0x38, 0x77, 0x44, 0x51, 0x59, 0x4a, 0x4b, 0x6f, 0x5a,
-0x49, 0x68, 0x76, 0x63, 0x4e, 0x41, 0x51, 0x45, 0x4c, 0x0a, 0x42, 0x51, 0x41, 0x44, 0x67, 0x67,
-0x45, 0x42, 0x41, 0x47, 0x4a, 0x6f, 0x48, 0x44, 0x54, 0x73, 0x41, 0x69, 0x75, 0x52, 0x74, 0x41,
-0x43, 0x54, 0x47, 0x69, 0x47, 0x7a, 0x2f, 0x6f, 0x79, 0x4e, 0x5a, 0x66, 0x48, 0x2f, 0x4f, 0x55,
-0x4a, 0x61, 0x69, 0x6a, 0x55, 0x4d, 0x61, 0x4c, 0x62, 0x48, 0x64, 0x2f, 0x4a, 0x47, 0x32, 0x4c,
-0x36, 0x67, 0x74, 0x70, 0x41, 0x43, 0x59, 0x59, 0x32, 0x62, 0x0a, 0x41, 0x6f, 0x4c, 0x6b, 0x49,
-0x63, 0x43, 0x6c, 0x33, 0x38, 0x6e, 0x73, 0x4c, 0x59, 0x4d, 0x4c, 0x5a, 0x33, 0x32, 0x42, 0x62,
-0x63, 0x35, 0x6a, 0x6e, 0x50, 0x2f, 0x51, 0x79, 0x33, 0x64, 0x32, 0x48, 0x4b, 0x73, 0x54, 0x4a,
-0x35, 0x49, 0x74, 0x34, 0x71, 0x78, 0x44, 0x67, 0x74, 0x62, 0x74, 0x70, 0x55, 0x38, 0x65, 0x35,
-0x4d, 0x68, 0x45, 0x65, 0x4a, 0x6f, 0x65, 0x4d, 0x48, 0x4f, 0x43, 0x0a, 0x66, 0x69, 0x7a, 0x62,
-0x63, 0x57, 0x63, 0x37, 0x57, 0x37, 0x6d, 0x32, 0x53, 0x4c, 0x66, 0x70, 0x65, 0x51, 0x4a, 0x57,
-0x4d, 0x67, 0x75, 0x32, 0x44, 0x61, 0x30, 0x48, 0x59, 0x45, 0x44, 0x53, 0x2f, 0x78, 0x7a, 0x4c,
-0x6e, 0x37, 0x70, 0x78, 0x51, 0x67, 0x5a, 0x70, 0x4f, 0x72, 0x4d, 0x51, 0x37, 0x49, 0x68, 0x69,
-0x31, 0x6a, 0x77, 0x58, 0x66, 0x4b, 0x46, 0x71, 0x49, 0x49, 0x61, 0x6c, 0x0a, 0x67, 0x36, 0x53,
-0x69, 0x6a, 0x52, 0x47, 0x58, 0x68, 0x37, 0x6f, 0x6e, 0x45, 0x41, 0x78, 0x45, 0x6d, 0x4b, 0x4c,
-0x6b, 0x70, 0x56, 0x51, 0x52, 0x71, 0x36, 0x33, 0x33, 0x42, 0x59, 0x50, 0x56, 0x36, 0x6f, 0x64,
-0x78, 0x74, 0x58, 0x44, 0x68, 0x78, 0x79, 0x4a, 0x4b, 0x79, 0x47, 0x6a, 0x53, 0x4a, 0x73, 0x51,
-0x6f, 0x4b, 0x76, 0x39, 0x6f, 0x43, 0x46, 0x32, 0x6b, 0x41, 0x64, 0x41, 0x69, 0x0a, 0x43, 0x76,
-0x76, 0x61, 0x74, 0x71, 0x52, 0x57, 0x52, 0x77, 0x67, 0x49, 0x65, 0x6c, 0x6e, 0x31, 0x53, 0x77,
-0x39, 0x45, 0x65, 0x36, 0x63, 0x54, 0x59, 0x5a, 0x43, 0x47, 0x32, 0x55, 0x2b, 0x2f, 0x55, 0x66,
-0x2b, 0x4c, 0x73, 0x37, 0x66, 0x6a, 0x4e, 0x38, 0x74, 0x72, 0x62, 0x2f, 0x53, 0x68, 0x6d, 0x78,
-0x6f, 0x38, 0x64, 0x6f, 0x2f, 0x6e, 0x70, 0x42, 0x6e, 0x7a, 0x38, 0x6a, 0x2b, 0x31, 0x0a, 0x61,
-0x32, 0x76, 0x62, 0x7a, 0x33, 0x67, 0x70, 0x4f, 0x73, 0x6c, 0x38, 0x37, 0x55, 0x30, 0x63, 0x30,
-0x31, 0x4a, 0x43, 0x6c, 0x39, 0x53, 0x5a, 0x58, 0x44, 0x53, 0x4f, 0x30, 0x39, 0x77, 0x3d, 0x0a,
-0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x43, 0x45, 0x52, 0x54, 0x49, 0x46, 0x49,
-0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x42,
+    0x45,
+    0x47,
+    0x49,
+    0x4e,
+    0x20,
+    0x43,
+    0x45,
+    0x52,
+    0x54,
+    0x49,
+    0x46,
+    0x49,
+    0x43,
+    0x41,
+    0x54,
+    0x45,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x0a,
+    0x4d,
+    0x49,
+    0x49,
+    0x44,
+    0x6f,
+    0x7a,
+    0x43,
+    0x43,
+    0x41,
+    0x6f,
+    0x75,
+    0x67,
+    0x41,
+    0x77,
+    0x49,
+    0x42,
+    0x41,
+    0x67,
+    0x49,
+    0x55,
+    0x53,
+    0x4b,
+    0x77,
+    0x51,
+    0x44,
+    0x31,
+    0x71,
+    0x52,
+    0x74,
+    0x53,
+    0x2b,
+    0x6c,
+    0x72,
+    0x69,
+    0x64,
+    0x61,
+    0x77,
+    0x6d,
+    0x61,
+    0x59,
+    0x4b,
+    0x36,
+    0x63,
+    0x65,
+    0x6a,
+    0x32,
+    0x6b,
+    0x77,
+    0x44,
+    0x51,
+    0x59,
+    0x4a,
+    0x4b,
+    0x6f,
+    0x5a,
+    0x49,
+    0x68,
+    0x76,
+    0x63,
+    0x4e,
+    0x41,
+    0x51,
+    0x45,
+    0x4c,
+    0x0a,
+    0x42,
+    0x51,
+    0x41,
+    0x77,
+    0x59,
+    0x54,
+    0x45,
+    0x4c,
+    0x4d,
+    0x41,
+    0x6b,
+    0x47,
+    0x41,
+    0x31,
+    0x55,
+    0x45,
+    0x42,
+    0x68,
+    0x4d,
+    0x43,
+    0x62,
+    0x6d,
+    0x38,
+    0x78,
+    0x43,
+    0x7a,
+    0x41,
+    0x4a,
+    0x42,
+    0x67,
+    0x4e,
+    0x56,
+    0x42,
+    0x41,
+    0x67,
+    0x4d,
+    0x41,
+    0x6d,
+    0x35,
+    0x76,
+    0x4d,
+    0x51,
+    0x73,
+    0x77,
+    0x43,
+    0x51,
+    0x59,
+    0x44,
+    0x56,
+    0x51,
+    0x51,
+    0x48,
+    0x44,
+    0x41,
+    0x4a,
+    0x75,
+    0x62,
+    0x7a,
+    0x45,
+    0x4c,
+    0x4d,
+    0x41,
+    0x6b,
+    0x47,
+    0x0a,
+    0x41,
+    0x31,
+    0x55,
+    0x45,
+    0x43,
+    0x67,
+    0x77,
+    0x43,
+    0x62,
+    0x6d,
+    0x38,
+    0x78,
+    0x43,
+    0x7a,
+    0x41,
+    0x4a,
+    0x42,
+    0x67,
+    0x4e,
+    0x56,
+    0x42,
+    0x41,
+    0x73,
+    0x4d,
+    0x41,
+    0x6d,
+    0x35,
+    0x76,
+    0x4d,
+    0x51,
+    0x73,
+    0x77,
+    0x43,
+    0x51,
+    0x59,
+    0x44,
+    0x56,
+    0x51,
+    0x51,
+    0x44,
+    0x44,
+    0x41,
+    0x4a,
+    0x75,
+    0x62,
+    0x7a,
+    0x45,
+    0x52,
+    0x4d,
+    0x41,
+    0x38,
+    0x47,
+    0x43,
+    0x53,
+    0x71,
+    0x47,
+    0x53,
+    0x49,
+    0x62,
+    0x33,
+    0x44,
+    0x51,
+    0x45,
+    0x4a,
+    0x0a,
+    0x41,
+    0x52,
+    0x59,
+    0x43,
+    0x62,
+    0x6d,
+    0x38,
+    0x77,
+    0x48,
+    0x68,
+    0x63,
+    0x4e,
+    0x4d,
+    0x6a,
+    0x51,
+    0x77,
+    0x4d,
+    0x6a,
+    0x49,
+    0x34,
+    0x4d,
+    0x54,
+    0x6b,
+    0x7a,
+    0x4e,
+    0x7a,
+    0x45,
+    0x77,
+    0x57,
+    0x68,
+    0x63,
+    0x4e,
+    0x4d,
+    0x6a,
+    0x55,
+    0x77,
+    0x4d,
+    0x6a,
+    0x49,
+    0x33,
+    0x4d,
+    0x54,
+    0x6b,
+    0x7a,
+    0x4e,
+    0x7a,
+    0x45,
+    0x77,
+    0x57,
+    0x6a,
+    0x42,
+    0x68,
+    0x4d,
+    0x51,
+    0x73,
+    0x77,
+    0x43,
+    0x51,
+    0x59,
+    0x44,
+    0x56,
+    0x51,
+    0x51,
+    0x47,
+    0x0a,
+    0x45,
+    0x77,
+    0x4a,
+    0x75,
+    0x62,
+    0x7a,
+    0x45,
+    0x4c,
+    0x4d,
+    0x41,
+    0x6b,
+    0x47,
+    0x41,
+    0x31,
+    0x55,
+    0x45,
+    0x43,
+    0x41,
+    0x77,
+    0x43,
+    0x62,
+    0x6d,
+    0x38,
+    0x78,
+    0x43,
+    0x7a,
+    0x41,
+    0x4a,
+    0x42,
+    0x67,
+    0x4e,
+    0x56,
+    0x42,
+    0x41,
+    0x63,
+    0x4d,
+    0x41,
+    0x6d,
+    0x35,
+    0x76,
+    0x4d,
+    0x51,
+    0x73,
+    0x77,
+    0x43,
+    0x51,
+    0x59,
+    0x44,
+    0x56,
+    0x51,
+    0x51,
+    0x4b,
+    0x44,
+    0x41,
+    0x4a,
+    0x75,
+    0x62,
+    0x7a,
+    0x45,
+    0x4c,
+    0x4d,
+    0x41,
+    0x6b,
+    0x47,
+    0x0a,
+    0x41,
+    0x31,
+    0x55,
+    0x45,
+    0x43,
+    0x77,
+    0x77,
+    0x43,
+    0x62,
+    0x6d,
+    0x38,
+    0x78,
+    0x43,
+    0x7a,
+    0x41,
+    0x4a,
+    0x42,
+    0x67,
+    0x4e,
+    0x56,
+    0x42,
+    0x41,
+    0x4d,
+    0x4d,
+    0x41,
+    0x6d,
+    0x35,
+    0x76,
+    0x4d,
+    0x52,
+    0x45,
+    0x77,
+    0x44,
+    0x77,
+    0x59,
+    0x4a,
+    0x4b,
+    0x6f,
+    0x5a,
+    0x49,
+    0x68,
+    0x76,
+    0x63,
+    0x4e,
+    0x41,
+    0x51,
+    0x6b,
+    0x42,
+    0x46,
+    0x67,
+    0x4a,
+    0x75,
+    0x62,
+    0x7a,
+    0x43,
+    0x43,
+    0x41,
+    0x53,
+    0x49,
+    0x77,
+    0x44,
+    0x51,
+    0x59,
+    0x4a,
+    0x0a,
+    0x4b,
+    0x6f,
+    0x5a,
+    0x49,
+    0x68,
+    0x76,
+    0x63,
+    0x4e,
+    0x41,
+    0x51,
+    0x45,
+    0x42,
+    0x42,
+    0x51,
+    0x41,
+    0x44,
+    0x67,
+    0x67,
+    0x45,
+    0x50,
+    0x41,
+    0x44,
+    0x43,
+    0x43,
+    0x41,
+    0x51,
+    0x6f,
+    0x43,
+    0x67,
+    0x67,
+    0x45,
+    0x42,
+    0x41,
+    0x4c,
+    0x57,
+    0x5a,
+    0x42,
+    0x39,
+    0x4d,
+    0x74,
+    0x61,
+    0x73,
+    0x30,
+    0x56,
+    0x39,
+    0x53,
+    0x79,
+    0x61,
+    0x2b,
+    0x55,
+    0x68,
+    0x45,
+    0x61,
+    0x62,
+    0x77,
+    0x7a,
+    0x73,
+    0x33,
+    0x45,
+    0x6f,
+    0x6c,
+    0x2b,
+    0x2f,
+    0x4d,
+    0x0a,
+    0x68,
+    0x77,
+    0x55,
+    0x46,
+    0x57,
+    0x49,
+    0x46,
+    0x72,
+    0x72,
+    0x38,
+    0x74,
+    0x56,
+    0x79,
+    0x59,
+    0x76,
+    0x67,
+    0x38,
+    0x58,
+    0x73,
+    0x2f,
+    0x4b,
+    0x6e,
+    0x43,
+    0x32,
+    0x56,
+    0x61,
+    0x45,
+    0x70,
+    0x6e,
+    0x45,
+    0x6c,
+    0x74,
+    0x42,
+    0x4e,
+    0x4c,
+    0x61,
+    0x4f,
+    0x41,
+    0x44,
+    0x5a,
+    0x47,
+    0x55,
+    0x75,
+    0x58,
+    0x7a,
+    0x7a,
+    0x35,
+    0x45,
+    0x62,
+    0x63,
+    0x63,
+    0x62,
+    0x32,
+    0x69,
+    0x31,
+    0x38,
+    0x67,
+    0x68,
+    0x76,
+    0x4d,
+    0x44,
+    0x58,
+    0x35,
+    0x6f,
+    0x0a,
+    0x4f,
+    0x77,
+    0x41,
+    0x41,
+    0x69,
+    0x64,
+    0x4c,
+    0x33,
+    0x74,
+    0x76,
+    0x36,
+    0x6c,
+    0x68,
+    0x38,
+    0x2f,
+    0x56,
+    0x75,
+    0x6a,
+    0x38,
+    0x74,
+    0x70,
+    0x4c,
+    0x41,
+    0x35,
+    0x33,
+    0x53,
+    0x44,
+    0x52,
+    0x35,
+    0x56,
+    0x54,
+    0x51,
+    0x63,
+    0x78,
+    0x69,
+    0x74,
+    0x69,
+    0x70,
+    0x73,
+    0x63,
+    0x63,
+    0x6a,
+    0x61,
+    0x63,
+    0x48,
+    0x44,
+    0x66,
+    0x74,
+    0x54,
+    0x71,
+    0x44,
+    0x41,
+    0x37,
+    0x2b,
+    0x39,
+    0x34,
+    0x53,
+    0x54,
+    0x54,
+    0x38,
+    0x51,
+    0x53,
+    0x48,
+    0x74,
+    0x0a,
+    0x57,
+    0x75,
+    0x35,
+    0x46,
+    0x6d,
+    0x58,
+    0x50,
+    0x4b,
+    0x76,
+    0x4a,
+    0x4c,
+    0x6d,
+    0x50,
+    0x75,
+    0x4b,
+    0x51,
+    0x4a,
+    0x4d,
+    0x62,
+    0x4f,
+    0x4a,
+    0x53,
+    0x47,
+    0x44,
+    0x4a,
+    0x4c,
+    0x76,
+    0x64,
+    0x54,
+    0x2f,
+    0x30,
+    0x64,
+    0x79,
+    0x4d,
+    0x39,
+    0x61,
+    0x55,
+    0x33,
+    0x78,
+    0x4b,
+    0x77,
+    0x36,
+    0x34,
+    0x69,
+    0x76,
+    0x37,
+    0x53,
+    0x33,
+    0x6c,
+    0x61,
+    0x45,
+    0x52,
+    0x57,
+    0x79,
+    0x57,
+    0x34,
+    0x2f,
+    0x4f,
+    0x65,
+    0x6d,
+    0x4d,
+    0x51,
+    0x58,
+    0x73,
+    0x0a,
+    0x69,
+    0x2b,
+    0x6b,
+    0x62,
+    0x61,
+    0x6e,
+    0x70,
+    0x56,
+    0x4e,
+    0x4a,
+    0x56,
+    0x6d,
+    0x71,
+    0x54,
+    0x74,
+    0x53,
+    0x2b,
+    0x71,
+    0x2f,
+    0x46,
+    0x79,
+    0x59,
+    0x76,
+    0x76,
+    0x72,
+    0x31,
+    0x4e,
+    0x70,
+    0x58,
+    0x30,
+    0x4f,
+    0x63,
+    0x2f,
+    0x41,
+    0x35,
+    0x48,
+    0x32,
+    0x48,
+    0x59,
+    0x51,
+    0x36,
+    0x66,
+    0x36,
+    0x50,
+    0x33,
+    0x6e,
+    0x76,
+    0x4a,
+    0x32,
+    0x32,
+    0x49,
+    0x4f,
+    0x58,
+    0x6f,
+    0x49,
+    0x63,
+    0x4e,
+    0x6a,
+    0x49,
+    0x31,
+    0x46,
+    0x6d,
+    0x4b,
+    0x62,
+    0x0a,
+    0x58,
+    0x33,
+    0x4e,
+    0x4a,
+    0x48,
+    0x65,
+    0x74,
+    0x48,
+    0x58,
+    0x74,
+    0x79,
+    0x5a,
+    0x4b,
+    0x58,
+    0x63,
+    0x66,
+    0x70,
+    0x69,
+    0x7a,
+    0x6c,
+    0x6a,
+    0x73,
+    0x4e,
+    0x76,
+    0x62,
+    0x66,
+    0x66,
+    0x73,
+    0x4c,
+    0x36,
+    0x74,
+    0x77,
+    0x78,
+    0x6a,
+    0x6a,
+    0x43,
+    0x52,
+    0x33,
+    0x4a,
+    0x64,
+    0x55,
+    0x71,
+    0x50,
+    0x31,
+    0x78,
+    0x45,
+    0x43,
+    0x65,
+    0x75,
+    0x6f,
+    0x4c,
+    0x42,
+    0x4d,
+    0x7a,
+    0x6b,
+    0x43,
+    0x41,
+    0x77,
+    0x45,
+    0x41,
+    0x41,
+    0x61,
+    0x4e,
+    0x54,
+    0x0a,
+    0x4d,
+    0x46,
+    0x45,
+    0x77,
+    0x48,
+    0x51,
+    0x59,
+    0x44,
+    0x56,
+    0x52,
+    0x30,
+    0x4f,
+    0x42,
+    0x42,
+    0x59,
+    0x45,
+    0x46,
+    0x4b,
+    0x5a,
+    0x32,
+    0x62,
+    0x39,
+    0x49,
+    0x4a,
+    0x33,
+    0x59,
+    0x57,
+    0x43,
+    0x59,
+    0x79,
+    0x4d,
+    0x6b,
+    0x52,
+    0x4f,
+    0x6a,
+    0x74,
+    0x6a,
+    0x46,
+    0x37,
+    0x43,
+    0x78,
+    0x73,
+    0x66,
+    0x61,
+    0x4d,
+    0x42,
+    0x38,
+    0x47,
+    0x41,
+    0x31,
+    0x55,
+    0x64,
+    0x49,
+    0x77,
+    0x51,
+    0x59,
+    0x4d,
+    0x42,
+    0x61,
+    0x41,
+    0x46,
+    0x4b,
+    0x5a,
+    0x32,
+    0x0a,
+    0x62,
+    0x39,
+    0x49,
+    0x4a,
+    0x33,
+    0x59,
+    0x57,
+    0x43,
+    0x59,
+    0x79,
+    0x4d,
+    0x6b,
+    0x52,
+    0x4f,
+    0x6a,
+    0x74,
+    0x6a,
+    0x46,
+    0x37,
+    0x43,
+    0x78,
+    0x73,
+    0x66,
+    0x61,
+    0x4d,
+    0x41,
+    0x38,
+    0x47,
+    0x41,
+    0x31,
+    0x55,
+    0x64,
+    0x45,
+    0x77,
+    0x45,
+    0x42,
+    0x2f,
+    0x77,
+    0x51,
+    0x46,
+    0x4d,
+    0x41,
+    0x4d,
+    0x42,
+    0x41,
+    0x66,
+    0x38,
+    0x77,
+    0x44,
+    0x51,
+    0x59,
+    0x4a,
+    0x4b,
+    0x6f,
+    0x5a,
+    0x49,
+    0x68,
+    0x76,
+    0x63,
+    0x4e,
+    0x41,
+    0x51,
+    0x45,
+    0x4c,
+    0x0a,
+    0x42,
+    0x51,
+    0x41,
+    0x44,
+    0x67,
+    0x67,
+    0x45,
+    0x42,
+    0x41,
+    0x47,
+    0x4a,
+    0x6f,
+    0x48,
+    0x44,
+    0x54,
+    0x73,
+    0x41,
+    0x69,
+    0x75,
+    0x52,
+    0x74,
+    0x41,
+    0x43,
+    0x54,
+    0x47,
+    0x69,
+    0x47,
+    0x7a,
+    0x2f,
+    0x6f,
+    0x79,
+    0x4e,
+    0x5a,
+    0x66,
+    0x48,
+    0x2f,
+    0x4f,
+    0x55,
+    0x4a,
+    0x61,
+    0x69,
+    0x6a,
+    0x55,
+    0x4d,
+    0x61,
+    0x4c,
+    0x62,
+    0x48,
+    0x64,
+    0x2f,
+    0x4a,
+    0x47,
+    0x32,
+    0x4c,
+    0x36,
+    0x67,
+    0x74,
+    0x70,
+    0x41,
+    0x43,
+    0x59,
+    0x59,
+    0x32,
+    0x62,
+    0x0a,
+    0x41,
+    0x6f,
+    0x4c,
+    0x6b,
+    0x49,
+    0x63,
+    0x43,
+    0x6c,
+    0x33,
+    0x38,
+    0x6e,
+    0x73,
+    0x4c,
+    0x59,
+    0x4d,
+    0x4c,
+    0x5a,
+    0x33,
+    0x32,
+    0x42,
+    0x62,
+    0x63,
+    0x35,
+    0x6a,
+    0x6e,
+    0x50,
+    0x2f,
+    0x51,
+    0x79,
+    0x33,
+    0x64,
+    0x32,
+    0x48,
+    0x4b,
+    0x73,
+    0x54,
+    0x4a,
+    0x35,
+    0x49,
+    0x74,
+    0x34,
+    0x71,
+    0x78,
+    0x44,
+    0x67,
+    0x74,
+    0x62,
+    0x74,
+    0x70,
+    0x55,
+    0x38,
+    0x65,
+    0x35,
+    0x4d,
+    0x68,
+    0x45,
+    0x65,
+    0x4a,
+    0x6f,
+    0x65,
+    0x4d,
+    0x48,
+    0x4f,
+    0x43,
+    0x0a,
+    0x66,
+    0x69,
+    0x7a,
+    0x62,
+    0x63,
+    0x57,
+    0x63,
+    0x37,
+    0x57,
+    0x37,
+    0x6d,
+    0x32,
+    0x53,
+    0x4c,
+    0x66,
+    0x70,
+    0x65,
+    0x51,
+    0x4a,
+    0x57,
+    0x4d,
+    0x67,
+    0x75,
+    0x32,
+    0x44,
+    0x61,
+    0x30,
+    0x48,
+    0x59,
+    0x45,
+    0x44,
+    0x53,
+    0x2f,
+    0x78,
+    0x7a,
+    0x4c,
+    0x6e,
+    0x37,
+    0x70,
+    0x78,
+    0x51,
+    0x67,
+    0x5a,
+    0x70,
+    0x4f,
+    0x72,
+    0x4d,
+    0x51,
+    0x37,
+    0x49,
+    0x68,
+    0x69,
+    0x31,
+    0x6a,
+    0x77,
+    0x58,
+    0x66,
+    0x4b,
+    0x46,
+    0x71,
+    0x49,
+    0x49,
+    0x61,
+    0x6c,
+    0x0a,
+    0x67,
+    0x36,
+    0x53,
+    0x69,
+    0x6a,
+    0x52,
+    0x47,
+    0x58,
+    0x68,
+    0x37,
+    0x6f,
+    0x6e,
+    0x45,
+    0x41,
+    0x78,
+    0x45,
+    0x6d,
+    0x4b,
+    0x4c,
+    0x6b,
+    0x70,
+    0x56,
+    0x51,
+    0x52,
+    0x71,
+    0x36,
+    0x33,
+    0x33,
+    0x42,
+    0x59,
+    0x50,
+    0x56,
+    0x36,
+    0x6f,
+    0x64,
+    0x78,
+    0x74,
+    0x58,
+    0x44,
+    0x68,
+    0x78,
+    0x79,
+    0x4a,
+    0x4b,
+    0x79,
+    0x47,
+    0x6a,
+    0x53,
+    0x4a,
+    0x73,
+    0x51,
+    0x6f,
+    0x4b,
+    0x76,
+    0x39,
+    0x6f,
+    0x43,
+    0x46,
+    0x32,
+    0x6b,
+    0x41,
+    0x64,
+    0x41,
+    0x69,
+    0x0a,
+    0x43,
+    0x76,
+    0x76,
+    0x61,
+    0x74,
+    0x71,
+    0x52,
+    0x57,
+    0x52,
+    0x77,
+    0x67,
+    0x49,
+    0x65,
+    0x6c,
+    0x6e,
+    0x31,
+    0x53,
+    0x77,
+    0x39,
+    0x45,
+    0x65,
+    0x36,
+    0x63,
+    0x54,
+    0x59,
+    0x5a,
+    0x43,
+    0x47,
+    0x32,
+    0x55,
+    0x2b,
+    0x2f,
+    0x55,
+    0x66,
+    0x2b,
+    0x4c,
+    0x73,
+    0x37,
+    0x66,
+    0x6a,
+    0x4e,
+    0x38,
+    0x74,
+    0x72,
+    0x62,
+    0x2f,
+    0x53,
+    0x68,
+    0x6d,
+    0x78,
+    0x6f,
+    0x38,
+    0x64,
+    0x6f,
+    0x2f,
+    0x6e,
+    0x70,
+    0x42,
+    0x6e,
+    0x7a,
+    0x38,
+    0x6a,
+    0x2b,
+    0x31,
+    0x0a,
+    0x61,
+    0x32,
+    0x76,
+    0x62,
+    0x7a,
+    0x33,
+    0x67,
+    0x70,
+    0x4f,
+    0x73,
+    0x6c,
+    0x38,
+    0x37,
+    0x55,
+    0x30,
+    0x63,
+    0x30,
+    0x31,
+    0x4a,
+    0x43,
+    0x6c,
+    0x39,
+    0x53,
+    0x5a,
+    0x58,
+    0x44,
+    0x53,
+    0x4f,
+    0x30,
+    0x39,
+    0x77,
+    0x3d,
+    0x0a,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x45,
+    0x4e,
+    0x44,
+    0x20,
+    0x43,
+    0x45,
+    0x52,
+    0x54,
+    0x49,
+    0x46,
+    0x49,
+    0x43,
+    0x41,
+    0x54,
+    0x45,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x0a,
 };
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -167,118 +1406,1715 @@ hljAVnB9v6NMfcRERTx10SUc
 -----END PRIVATE KEY-----
  */
 static const uint8_t RSAPrivateKeyPEM[] = {
-0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41,
-0x54, 0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x45,
-0x76, 0x67, 0x49, 0x42, 0x41, 0x44, 0x41, 0x4e, 0x42, 0x67, 0x6b, 0x71, 0x68, 0x6b, 0x69, 0x47,
-0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x45, 0x46, 0x41, 0x41, 0x53, 0x43, 0x42, 0x4b, 0x67, 0x77,
-0x67, 0x67, 0x53, 0x6b, 0x41, 0x67, 0x45, 0x41, 0x41, 0x6f, 0x49, 0x42, 0x41, 0x51, 0x43, 0x31,
-0x6d, 0x51, 0x66, 0x54, 0x4c, 0x57, 0x72, 0x4e, 0x46, 0x66, 0x55, 0x73, 0x0a, 0x6d, 0x76, 0x6c,
-0x49, 0x52, 0x47, 0x6d, 0x38, 0x4d, 0x37, 0x4e, 0x78, 0x4b, 0x4a, 0x66, 0x76, 0x7a, 0x49, 0x63,
-0x46, 0x42, 0x56, 0x69, 0x42, 0x61, 0x36, 0x2f, 0x4c, 0x56, 0x63, 0x6d, 0x4c, 0x34, 0x50, 0x46,
-0x37, 0x50, 0x79, 0x70, 0x77, 0x74, 0x6c, 0x57, 0x68, 0x4b, 0x5a, 0x78, 0x4a, 0x62, 0x51, 0x54,
-0x53, 0x32, 0x6a, 0x67, 0x41, 0x32, 0x52, 0x6c, 0x4c, 0x6c, 0x38, 0x38, 0x2b, 0x0a, 0x52, 0x47,
-0x33, 0x48, 0x47, 0x39, 0x6f, 0x74, 0x66, 0x49, 0x49, 0x62, 0x7a, 0x41, 0x31, 0x2b, 0x61, 0x44,
-0x73, 0x41, 0x41, 0x49, 0x6e, 0x53, 0x39, 0x37, 0x62, 0x2b, 0x70, 0x59, 0x66, 0x50, 0x31, 0x62,
-0x6f, 0x2f, 0x4c, 0x61, 0x53, 0x77, 0x4f, 0x64, 0x30, 0x67, 0x30, 0x65, 0x56, 0x55, 0x30, 0x48,
-0x4d, 0x59, 0x72, 0x59, 0x71, 0x62, 0x48, 0x48, 0x49, 0x32, 0x6e, 0x42, 0x77, 0x33, 0x0a, 0x37,
-0x55, 0x36, 0x67, 0x77, 0x4f, 0x2f, 0x76, 0x65, 0x45, 0x6b, 0x30, 0x2f, 0x45, 0x45, 0x68, 0x37,
-0x56, 0x72, 0x75, 0x52, 0x5a, 0x6c, 0x7a, 0x79, 0x72, 0x79, 0x53, 0x35, 0x6a, 0x37, 0x69, 0x6b,
-0x43, 0x54, 0x47, 0x7a, 0x69, 0x55, 0x68, 0x67, 0x79, 0x53, 0x37, 0x33, 0x55, 0x2f, 0x39, 0x48,
-0x63, 0x6a, 0x50, 0x57, 0x6c, 0x4e, 0x38, 0x53, 0x73, 0x4f, 0x75, 0x49, 0x72, 0x2b, 0x30, 0x0a,
-0x74, 0x35, 0x57, 0x68, 0x45, 0x56, 0x73, 0x6c, 0x75, 0x50, 0x7a, 0x6e, 0x70, 0x6a, 0x45, 0x46,
-0x37, 0x49, 0x76, 0x70, 0x47, 0x32, 0x70, 0x36, 0x56, 0x54, 0x53, 0x56, 0x5a, 0x71, 0x6b, 0x37,
-0x55, 0x76, 0x71, 0x76, 0x78, 0x63, 0x6d, 0x4c, 0x37, 0x36, 0x39, 0x54, 0x61, 0x56, 0x39, 0x44,
-0x6e, 0x50, 0x77, 0x4f, 0x52, 0x39, 0x68, 0x32, 0x45, 0x4f, 0x6e, 0x2b, 0x6a, 0x39, 0x35, 0x37,
-0x0a, 0x79, 0x64, 0x74, 0x69, 0x44, 0x6c, 0x36, 0x43, 0x48, 0x44, 0x59, 0x79, 0x4e, 0x52, 0x5a,
-0x69, 0x6d, 0x31, 0x39, 0x7a, 0x53, 0x52, 0x33, 0x72, 0x52, 0x31, 0x37, 0x63, 0x6d, 0x53, 0x6c,
-0x33, 0x48, 0x36, 0x59, 0x73, 0x35, 0x59, 0x37, 0x44, 0x62, 0x32, 0x33, 0x33, 0x37, 0x43, 0x2b,
-0x72, 0x63, 0x4d, 0x59, 0x34, 0x77, 0x6b, 0x64, 0x79, 0x58, 0x56, 0x4b, 0x6a, 0x39, 0x63, 0x52,
-0x41, 0x0a, 0x6e, 0x72, 0x71, 0x43, 0x77, 0x54, 0x4d, 0x35, 0x41, 0x67, 0x4d, 0x42, 0x41, 0x41,
-0x45, 0x43, 0x67, 0x67, 0x45, 0x41, 0x46, 0x4f, 0x44, 0x2b, 0x58, 0x46, 0x4a, 0x5a, 0x65, 0x44,
-0x44, 0x78, 0x47, 0x6d, 0x72, 0x4c, 0x42, 0x48, 0x73, 0x52, 0x4b, 0x52, 0x6c, 0x4d, 0x70, 0x56,
-0x4d, 0x45, 0x66, 0x51, 0x61, 0x6e, 0x38, 0x33, 0x54, 0x55, 0x34, 0x7a, 0x52, 0x74, 0x5a, 0x74,
-0x52, 0x37, 0x0a, 0x4d, 0x73, 0x44, 0x76, 0x49, 0x72, 0x74, 0x31, 0x64, 0x72, 0x59, 0x51, 0x44,
-0x46, 0x4b, 0x4c, 0x62, 0x49, 0x6e, 0x44, 0x52, 0x7a, 0x62, 0x64, 0x76, 0x34, 0x4d, 0x32, 0x66,
-0x46, 0x46, 0x38, 0x2b, 0x32, 0x7a, 0x45, 0x72, 0x6d, 0x4c, 0x4f, 0x5a, 0x2f, 0x4a, 0x72, 0x78,
-0x79, 0x52, 0x6a, 0x33, 0x4d, 0x66, 0x42, 0x47, 0x4e, 0x50, 0x33, 0x42, 0x4c, 0x47, 0x45, 0x63,
-0x61, 0x79, 0x34, 0x0a, 0x65, 0x37, 0x58, 0x59, 0x44, 0x78, 0x47, 0x42, 0x59, 0x4e, 0x32, 0x57,
-0x52, 0x67, 0x4b, 0x37, 0x2b, 0x6b, 0x39, 0x70, 0x48, 0x45, 0x6f, 0x2f, 0x71, 0x47, 0x76, 0x52,
-0x32, 0x65, 0x4f, 0x43, 0x2f, 0x77, 0x38, 0x69, 0x76, 0x69, 0x72, 0x51, 0x71, 0x31, 0x6a, 0x4b,
-0x47, 0x66, 0x52, 0x79, 0x7a, 0x4b, 0x4c, 0x4d, 0x6c, 0x4a, 0x36, 0x64, 0x38, 0x51, 0x6b, 0x37,
-0x4f, 0x79, 0x78, 0x5a, 0x0a, 0x6e, 0x30, 0x75, 0x33, 0x76, 0x32, 0x45, 0x4a, 0x39, 0x43, 0x57,
-0x6f, 0x4e, 0x44, 0x67, 0x55, 0x48, 0x34, 0x65, 0x78, 0x43, 0x69, 0x6c, 0x2f, 0x4f, 0x65, 0x34,
-0x68, 0x35, 0x57, 0x41, 0x35, 0x39, 0x78, 0x54, 0x35, 0x4e, 0x41, 0x6b, 0x78, 0x34, 0x52, 0x55,
-0x6f, 0x6a, 0x73, 0x4a, 0x69, 0x45, 0x78, 0x57, 0x5a, 0x70, 0x7a, 0x54, 0x2f, 0x56, 0x58, 0x31,
-0x64, 0x32, 0x31, 0x6d, 0x4e, 0x0a, 0x57, 0x4d, 0x62, 0x35, 0x45, 0x4f, 0x38, 0x65, 0x79, 0x69,
-0x36, 0x46, 0x79, 0x5a, 0x6c, 0x41, 0x63, 0x62, 0x39, 0x4d, 0x49, 0x44, 0x30, 0x6b, 0x4d, 0x46,
-0x36, 0x51, 0x33, 0x68, 0x55, 0x76, 0x2b, 0x6a, 0x54, 0x77, 0x2b, 0x58, 0x39, 0x79, 0x69, 0x67,
-0x2b, 0x33, 0x42, 0x39, 0x62, 0x67, 0x32, 0x5a, 0x30, 0x49, 0x2b, 0x49, 0x4b, 0x48, 0x6c, 0x39,
-0x49, 0x6e, 0x53, 0x68, 0x6b, 0x43, 0x0a, 0x6e, 0x64, 0x59, 0x6e, 0x34, 0x61, 0x64, 0x30, 0x7a,
-0x64, 0x2f, 0x67, 0x67, 0x4d, 0x56, 0x6b, 0x6c, 0x6f, 0x6f, 0x6d, 0x68, 0x34, 0x75, 0x61, 0x53,
-0x71, 0x5a, 0x78, 0x55, 0x69, 0x33, 0x79, 0x77, 0x74, 0x73, 0x7a, 0x5a, 0x6b, 0x52, 0x62, 0x7a,
-0x51, 0x4b, 0x42, 0x67, 0x51, 0x44, 0x37, 0x50, 0x76, 0x78, 0x31, 0x45, 0x72, 0x4b, 0x6d, 0x35,
-0x6c, 0x5a, 0x44, 0x41, 0x53, 0x32, 0x62, 0x0a, 0x62, 0x34, 0x72, 0x6c, 0x74, 0x7a, 0x71, 0x4a,
-0x52, 0x55, 0x45, 0x4b, 0x79, 0x45, 0x71, 0x6a, 0x71, 0x7a, 0x50, 0x7a, 0x67, 0x61, 0x73, 0x4f,
-0x61, 0x30, 0x6a, 0x57, 0x45, 0x71, 0x2f, 0x66, 0x78, 0x75, 0x47, 0x63, 0x2f, 0x62, 0x69, 0x78,
-0x67, 0x2f, 0x45, 0x42, 0x61, 0x51, 0x38, 0x79, 0x79, 0x54, 0x47, 0x59, 0x64, 0x49, 0x59, 0x79,
-0x72, 0x37, 0x44, 0x4b, 0x59, 0x59, 0x6a, 0x43, 0x0a, 0x30, 0x41, 0x47, 0x56, 0x6e, 0x42, 0x43,
-0x68, 0x30, 0x2b, 0x54, 0x46, 0x55, 0x44, 0x42, 0x31, 0x6b, 0x66, 0x77, 0x6b, 0x62, 0x65, 0x66,
-0x32, 0x62, 0x38, 0x79, 0x75, 0x66, 0x51, 0x2f, 0x76, 0x4a, 0x77, 0x63, 0x4f, 0x4a, 0x2b, 0x35,
-0x6b, 0x42, 0x58, 0x51, 0x5a, 0x78, 0x38, 0x2b, 0x4c, 0x38, 0x55, 0x39, 0x69, 0x57, 0x4b, 0x41,
-0x4e, 0x58, 0x78, 0x6b, 0x45, 0x65, 0x43, 0x58, 0x32, 0x0a, 0x69, 0x57, 0x50, 0x5a, 0x50, 0x7a,
-0x35, 0x32, 0x70, 0x54, 0x54, 0x59, 0x6c, 0x66, 0x39, 0x30, 0x50, 0x4c, 0x7a, 0x45, 0x57, 0x36,
-0x51, 0x79, 0x44, 0x77, 0x4b, 0x42, 0x67, 0x51, 0x43, 0x35, 0x43, 0x4b, 0x79, 0x66, 0x55, 0x77,
-0x78, 0x33, 0x42, 0x61, 0x32, 0x69, 0x58, 0x74, 0x66, 0x49, 0x72, 0x65, 0x79, 0x50, 0x71, 0x44,
-0x6f, 0x62, 0x62, 0x79, 0x62, 0x79, 0x54, 0x45, 0x59, 0x6b, 0x0a, 0x61, 0x79, 0x41, 0x32, 0x6f,
-0x45, 0x6c, 0x53, 0x64, 0x65, 0x6a, 0x67, 0x56, 0x6b, 0x57, 0x77, 0x4a, 0x2b, 0x71, 0x37, 0x37,
-0x67, 0x77, 0x72, 0x6e, 0x46, 0x35, 0x50, 0x65, 0x39, 0x7a, 0x62, 0x70, 0x55, 0x42, 0x6f, 0x63,
-0x37, 0x56, 0x4a, 0x6a, 0x72, 0x52, 0x68, 0x55, 0x6f, 0x6a, 0x49, 0x37, 0x4c, 0x4f, 0x79, 0x53,
-0x79, 0x74, 0x6f, 0x33, 0x57, 0x59, 0x59, 0x6f, 0x63, 0x7a, 0x58, 0x0a, 0x4c, 0x70, 0x72, 0x7a,
-0x50, 0x6e, 0x6a, 0x32, 0x79, 0x45, 0x56, 0x65, 0x56, 0x32, 0x6c, 0x72, 0x54, 0x53, 0x36, 0x6c,
-0x4b, 0x4e, 0x70, 0x64, 0x72, 0x61, 0x4f, 0x38, 0x51, 0x5a, 0x63, 0x53, 0x44, 0x37, 0x6d, 0x55,
-0x55, 0x6d, 0x69, 0x4e, 0x52, 0x5a, 0x6e, 0x6f, 0x50, 0x4b, 0x31, 0x36, 0x4d, 0x6d, 0x39, 0x71,
-0x6a, 0x6b, 0x6b, 0x32, 0x39, 0x48, 0x6e, 0x59, 0x37, 0x4d, 0x73, 0x71, 0x0a, 0x70, 0x6b, 0x69,
-0x4f, 0x67, 0x34, 0x68, 0x75, 0x4e, 0x77, 0x4b, 0x42, 0x67, 0x51, 0x43, 0x6b, 0x68, 0x32, 0x48,
-0x42, 0x74, 0x4f, 0x58, 0x6a, 0x48, 0x2f, 0x47, 0x62, 0x58, 0x56, 0x6b, 0x6c, 0x63, 0x63, 0x30,
-0x4f, 0x6b, 0x34, 0x65, 0x30, 0x76, 0x76, 0x4a, 0x53, 0x41, 0x6b, 0x6e, 0x47, 0x6c, 0x6d, 0x57,
-0x6c, 0x37, 0x2b, 0x4d, 0x35, 0x78, 0x51, 0x33, 0x6b, 0x69, 0x6b, 0x59, 0x38, 0x0a, 0x44, 0x37,
-0x78, 0x4e, 0x46, 0x32, 0x58, 0x73, 0x63, 0x59, 0x2f, 0x51, 0x73, 0x61, 0x44, 0x76, 0x54, 0x41,
-0x75, 0x37, 0x58, 0x34, 0x74, 0x47, 0x42, 0x41, 0x47, 0x4d, 0x39, 0x6f, 0x51, 0x64, 0x74, 0x79,
-0x4e, 0x69, 0x65, 0x74, 0x6e, 0x31, 0x62, 0x35, 0x4a, 0x66, 0x6d, 0x42, 0x79, 0x7a, 0x30, 0x55,
-0x37, 0x42, 0x2b, 0x47, 0x73, 0x76, 0x32, 0x5a, 0x53, 0x37, 0x4b, 0x31, 0x44, 0x55, 0x0a, 0x39,
-0x73, 0x54, 0x4c, 0x41, 0x32, 0x45, 0x38, 0x68, 0x4d, 0x6d, 0x37, 0x33, 0x44, 0x70, 0x51, 0x31,
-0x55, 0x78, 0x38, 0x42, 0x62, 0x65, 0x43, 0x4b, 0x69, 0x56, 0x79, 0x35, 0x4d, 0x39, 0x50, 0x66,
-0x44, 0x63, 0x7a, 0x33, 0x42, 0x4f, 0x6d, 0x6c, 0x4a, 0x64, 0x66, 0x77, 0x68, 0x4b, 0x51, 0x5a,
-0x76, 0x6e, 0x69, 0x79, 0x48, 0x52, 0x6c, 0x42, 0x77, 0x4b, 0x42, 0x67, 0x51, 0x43, 0x48, 0x0a,
-0x2f, 0x73, 0x41, 0x68, 0x4f, 0x63, 0x44, 0x6e, 0x6d, 0x64, 0x7a, 0x4d, 0x67, 0x6a, 0x6a, 0x47,
-0x33, 0x6b, 0x34, 0x49, 0x4a, 0x2f, 0x54, 0x4e, 0x52, 0x52, 0x79, 0x79, 0x36, 0x53, 0x79, 0x45,
-0x68, 0x39, 0x66, 0x64, 0x54, 0x6d, 0x47, 0x56, 0x6f, 0x65, 0x50, 0x50, 0x50, 0x70, 0x6c, 0x70,
-0x70, 0x32, 0x7a, 0x33, 0x51, 0x7a, 0x62, 0x65, 0x74, 0x73, 0x62, 0x36, 0x56, 0x47, 0x63, 0x33,
-0x0a, 0x61, 0x48, 0x57, 0x32, 0x54, 0x35, 0x54, 0x6d, 0x77, 0x32, 0x51, 0x41, 0x51, 0x39, 0x45,
-0x56, 0x48, 0x43, 0x50, 0x57, 0x33, 0x7a, 0x6a, 0x41, 0x6b, 0x6a, 0x6a, 0x2f, 0x30, 0x61, 0x76,
-0x6b, 0x57, 0x2f, 0x53, 0x32, 0x34, 0x79, 0x75, 0x30, 0x39, 0x65, 0x31, 0x47, 0x4d, 0x61, 0x6a,
-0x68, 0x6e, 0x4a, 0x43, 0x30, 0x41, 0x78, 0x71, 0x37, 0x7a, 0x32, 0x75, 0x51, 0x61, 0x67, 0x54,
-0x47, 0x0a, 0x32, 0x5a, 0x66, 0x6b, 0x55, 0x38, 0x31, 0x55, 0x52, 0x39, 0x75, 0x65, 0x76, 0x54,
-0x6f, 0x6a, 0x6e, 0x66, 0x34, 0x56, 0x71, 0x77, 0x35, 0x55, 0x76, 0x63, 0x72, 0x77, 0x6a, 0x4e,
-0x6d, 0x6d, 0x4e, 0x79, 0x45, 0x4d, 0x33, 0x63, 0x2f, 0x67, 0x63, 0x51, 0x4b, 0x42, 0x67, 0x48,
-0x61, 0x32, 0x64, 0x54, 0x35, 0x73, 0x76, 0x7a, 0x4d, 0x31, 0x6a, 0x52, 0x65, 0x69, 0x4f, 0x33,
-0x56, 0x74, 0x0a, 0x64, 0x41, 0x55, 0x44, 0x7a, 0x74, 0x47, 0x4b, 0x55, 0x45, 0x33, 0x63, 0x6c,
-0x50, 0x56, 0x33, 0x35, 0x4c, 0x32, 0x78, 0x6d, 0x4a, 0x65, 0x4a, 0x44, 0x58, 0x50, 0x4f, 0x71,
-0x43, 0x4c, 0x33, 0x71, 0x6f, 0x5a, 0x39, 0x41, 0x36, 0x68, 0x48, 0x6d, 0x44, 0x77, 0x36, 0x67,
-0x6d, 0x67, 0x38, 0x32, 0x67, 0x51, 0x44, 0x51, 0x65, 0x4a, 0x62, 0x4c, 0x2f, 0x2b, 0x6a, 0x4b,
-0x6b, 0x6f, 0x6e, 0x0a, 0x65, 0x36, 0x61, 0x74, 0x48, 0x2f, 0x44, 0x66, 0x72, 0x2b, 0x4d, 0x34,
-0x6e, 0x50, 0x66, 0x74, 0x39, 0x4c, 0x74, 0x34, 0x66, 0x4f, 0x41, 0x57, 0x4f, 0x51, 0x33, 0x74,
-0x44, 0x73, 0x44, 0x75, 0x43, 0x6b, 0x4f, 0x4d, 0x6a, 0x53, 0x54, 0x6e, 0x38, 0x63, 0x4c, 0x4d,
-0x5a, 0x4c, 0x47, 0x63, 0x77, 0x54, 0x32, 0x48, 0x31, 0x48, 0x32, 0x76, 0x42, 0x6f, 0x63, 0x4d,
-0x2b, 0x55, 0x54, 0x64, 0x0a, 0x68, 0x6c, 0x6a, 0x41, 0x56, 0x6e, 0x42, 0x39, 0x76, 0x36, 0x4e,
-0x4d, 0x66, 0x63, 0x52, 0x45, 0x52, 0x54, 0x78, 0x31, 0x30, 0x53, 0x55, 0x63, 0x0a, 0x2d, 0x2d,
-0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4b,
-0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x42,
+    0x45,
+    0x47,
+    0x49,
+    0x4e,
+    0x20,
+    0x50,
+    0x52,
+    0x49,
+    0x56,
+    0x41,
+    0x54,
+    0x45,
+    0x20,
+    0x4b,
+    0x45,
+    0x59,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x0a,
+    0x4d,
+    0x49,
+    0x49,
+    0x45,
+    0x76,
+    0x67,
+    0x49,
+    0x42,
+    0x41,
+    0x44,
+    0x41,
+    0x4e,
+    0x42,
+    0x67,
+    0x6b,
+    0x71,
+    0x68,
+    0x6b,
+    0x69,
+    0x47,
+    0x39,
+    0x77,
+    0x30,
+    0x42,
+    0x41,
+    0x51,
+    0x45,
+    0x46,
+    0x41,
+    0x41,
+    0x53,
+    0x43,
+    0x42,
+    0x4b,
+    0x67,
+    0x77,
+    0x67,
+    0x67,
+    0x53,
+    0x6b,
+    0x41,
+    0x67,
+    0x45,
+    0x41,
+    0x41,
+    0x6f,
+    0x49,
+    0x42,
+    0x41,
+    0x51,
+    0x43,
+    0x31,
+    0x6d,
+    0x51,
+    0x66,
+    0x54,
+    0x4c,
+    0x57,
+    0x72,
+    0x4e,
+    0x46,
+    0x66,
+    0x55,
+    0x73,
+    0x0a,
+    0x6d,
+    0x76,
+    0x6c,
+    0x49,
+    0x52,
+    0x47,
+    0x6d,
+    0x38,
+    0x4d,
+    0x37,
+    0x4e,
+    0x78,
+    0x4b,
+    0x4a,
+    0x66,
+    0x76,
+    0x7a,
+    0x49,
+    0x63,
+    0x46,
+    0x42,
+    0x56,
+    0x69,
+    0x42,
+    0x61,
+    0x36,
+    0x2f,
+    0x4c,
+    0x56,
+    0x63,
+    0x6d,
+    0x4c,
+    0x34,
+    0x50,
+    0x46,
+    0x37,
+    0x50,
+    0x79,
+    0x70,
+    0x77,
+    0x74,
+    0x6c,
+    0x57,
+    0x68,
+    0x4b,
+    0x5a,
+    0x78,
+    0x4a,
+    0x62,
+    0x51,
+    0x54,
+    0x53,
+    0x32,
+    0x6a,
+    0x67,
+    0x41,
+    0x32,
+    0x52,
+    0x6c,
+    0x4c,
+    0x6c,
+    0x38,
+    0x38,
+    0x2b,
+    0x0a,
+    0x52,
+    0x47,
+    0x33,
+    0x48,
+    0x47,
+    0x39,
+    0x6f,
+    0x74,
+    0x66,
+    0x49,
+    0x49,
+    0x62,
+    0x7a,
+    0x41,
+    0x31,
+    0x2b,
+    0x61,
+    0x44,
+    0x73,
+    0x41,
+    0x41,
+    0x49,
+    0x6e,
+    0x53,
+    0x39,
+    0x37,
+    0x62,
+    0x2b,
+    0x70,
+    0x59,
+    0x66,
+    0x50,
+    0x31,
+    0x62,
+    0x6f,
+    0x2f,
+    0x4c,
+    0x61,
+    0x53,
+    0x77,
+    0x4f,
+    0x64,
+    0x30,
+    0x67,
+    0x30,
+    0x65,
+    0x56,
+    0x55,
+    0x30,
+    0x48,
+    0x4d,
+    0x59,
+    0x72,
+    0x59,
+    0x71,
+    0x62,
+    0x48,
+    0x48,
+    0x49,
+    0x32,
+    0x6e,
+    0x42,
+    0x77,
+    0x33,
+    0x0a,
+    0x37,
+    0x55,
+    0x36,
+    0x67,
+    0x77,
+    0x4f,
+    0x2f,
+    0x76,
+    0x65,
+    0x45,
+    0x6b,
+    0x30,
+    0x2f,
+    0x45,
+    0x45,
+    0x68,
+    0x37,
+    0x56,
+    0x72,
+    0x75,
+    0x52,
+    0x5a,
+    0x6c,
+    0x7a,
+    0x79,
+    0x72,
+    0x79,
+    0x53,
+    0x35,
+    0x6a,
+    0x37,
+    0x69,
+    0x6b,
+    0x43,
+    0x54,
+    0x47,
+    0x7a,
+    0x69,
+    0x55,
+    0x68,
+    0x67,
+    0x79,
+    0x53,
+    0x37,
+    0x33,
+    0x55,
+    0x2f,
+    0x39,
+    0x48,
+    0x63,
+    0x6a,
+    0x50,
+    0x57,
+    0x6c,
+    0x4e,
+    0x38,
+    0x53,
+    0x73,
+    0x4f,
+    0x75,
+    0x49,
+    0x72,
+    0x2b,
+    0x30,
+    0x0a,
+    0x74,
+    0x35,
+    0x57,
+    0x68,
+    0x45,
+    0x56,
+    0x73,
+    0x6c,
+    0x75,
+    0x50,
+    0x7a,
+    0x6e,
+    0x70,
+    0x6a,
+    0x45,
+    0x46,
+    0x37,
+    0x49,
+    0x76,
+    0x70,
+    0x47,
+    0x32,
+    0x70,
+    0x36,
+    0x56,
+    0x54,
+    0x53,
+    0x56,
+    0x5a,
+    0x71,
+    0x6b,
+    0x37,
+    0x55,
+    0x76,
+    0x71,
+    0x76,
+    0x78,
+    0x63,
+    0x6d,
+    0x4c,
+    0x37,
+    0x36,
+    0x39,
+    0x54,
+    0x61,
+    0x56,
+    0x39,
+    0x44,
+    0x6e,
+    0x50,
+    0x77,
+    0x4f,
+    0x52,
+    0x39,
+    0x68,
+    0x32,
+    0x45,
+    0x4f,
+    0x6e,
+    0x2b,
+    0x6a,
+    0x39,
+    0x35,
+    0x37,
+    0x0a,
+    0x79,
+    0x64,
+    0x74,
+    0x69,
+    0x44,
+    0x6c,
+    0x36,
+    0x43,
+    0x48,
+    0x44,
+    0x59,
+    0x79,
+    0x4e,
+    0x52,
+    0x5a,
+    0x69,
+    0x6d,
+    0x31,
+    0x39,
+    0x7a,
+    0x53,
+    0x52,
+    0x33,
+    0x72,
+    0x52,
+    0x31,
+    0x37,
+    0x63,
+    0x6d,
+    0x53,
+    0x6c,
+    0x33,
+    0x48,
+    0x36,
+    0x59,
+    0x73,
+    0x35,
+    0x59,
+    0x37,
+    0x44,
+    0x62,
+    0x32,
+    0x33,
+    0x33,
+    0x37,
+    0x43,
+    0x2b,
+    0x72,
+    0x63,
+    0x4d,
+    0x59,
+    0x34,
+    0x77,
+    0x6b,
+    0x64,
+    0x79,
+    0x58,
+    0x56,
+    0x4b,
+    0x6a,
+    0x39,
+    0x63,
+    0x52,
+    0x41,
+    0x0a,
+    0x6e,
+    0x72,
+    0x71,
+    0x43,
+    0x77,
+    0x54,
+    0x4d,
+    0x35,
+    0x41,
+    0x67,
+    0x4d,
+    0x42,
+    0x41,
+    0x41,
+    0x45,
+    0x43,
+    0x67,
+    0x67,
+    0x45,
+    0x41,
+    0x46,
+    0x4f,
+    0x44,
+    0x2b,
+    0x58,
+    0x46,
+    0x4a,
+    0x5a,
+    0x65,
+    0x44,
+    0x44,
+    0x78,
+    0x47,
+    0x6d,
+    0x72,
+    0x4c,
+    0x42,
+    0x48,
+    0x73,
+    0x52,
+    0x4b,
+    0x52,
+    0x6c,
+    0x4d,
+    0x70,
+    0x56,
+    0x4d,
+    0x45,
+    0x66,
+    0x51,
+    0x61,
+    0x6e,
+    0x38,
+    0x33,
+    0x54,
+    0x55,
+    0x34,
+    0x7a,
+    0x52,
+    0x74,
+    0x5a,
+    0x74,
+    0x52,
+    0x37,
+    0x0a,
+    0x4d,
+    0x73,
+    0x44,
+    0x76,
+    0x49,
+    0x72,
+    0x74,
+    0x31,
+    0x64,
+    0x72,
+    0x59,
+    0x51,
+    0x44,
+    0x46,
+    0x4b,
+    0x4c,
+    0x62,
+    0x49,
+    0x6e,
+    0x44,
+    0x52,
+    0x7a,
+    0x62,
+    0x64,
+    0x76,
+    0x34,
+    0x4d,
+    0x32,
+    0x66,
+    0x46,
+    0x46,
+    0x38,
+    0x2b,
+    0x32,
+    0x7a,
+    0x45,
+    0x72,
+    0x6d,
+    0x4c,
+    0x4f,
+    0x5a,
+    0x2f,
+    0x4a,
+    0x72,
+    0x78,
+    0x79,
+    0x52,
+    0x6a,
+    0x33,
+    0x4d,
+    0x66,
+    0x42,
+    0x47,
+    0x4e,
+    0x50,
+    0x33,
+    0x42,
+    0x4c,
+    0x47,
+    0x45,
+    0x63,
+    0x61,
+    0x79,
+    0x34,
+    0x0a,
+    0x65,
+    0x37,
+    0x58,
+    0x59,
+    0x44,
+    0x78,
+    0x47,
+    0x42,
+    0x59,
+    0x4e,
+    0x32,
+    0x57,
+    0x52,
+    0x67,
+    0x4b,
+    0x37,
+    0x2b,
+    0x6b,
+    0x39,
+    0x70,
+    0x48,
+    0x45,
+    0x6f,
+    0x2f,
+    0x71,
+    0x47,
+    0x76,
+    0x52,
+    0x32,
+    0x65,
+    0x4f,
+    0x43,
+    0x2f,
+    0x77,
+    0x38,
+    0x69,
+    0x76,
+    0x69,
+    0x72,
+    0x51,
+    0x71,
+    0x31,
+    0x6a,
+    0x4b,
+    0x47,
+    0x66,
+    0x52,
+    0x79,
+    0x7a,
+    0x4b,
+    0x4c,
+    0x4d,
+    0x6c,
+    0x4a,
+    0x36,
+    0x64,
+    0x38,
+    0x51,
+    0x6b,
+    0x37,
+    0x4f,
+    0x79,
+    0x78,
+    0x5a,
+    0x0a,
+    0x6e,
+    0x30,
+    0x75,
+    0x33,
+    0x76,
+    0x32,
+    0x45,
+    0x4a,
+    0x39,
+    0x43,
+    0x57,
+    0x6f,
+    0x4e,
+    0x44,
+    0x67,
+    0x55,
+    0x48,
+    0x34,
+    0x65,
+    0x78,
+    0x43,
+    0x69,
+    0x6c,
+    0x2f,
+    0x4f,
+    0x65,
+    0x34,
+    0x68,
+    0x35,
+    0x57,
+    0x41,
+    0x35,
+    0x39,
+    0x78,
+    0x54,
+    0x35,
+    0x4e,
+    0x41,
+    0x6b,
+    0x78,
+    0x34,
+    0x52,
+    0x55,
+    0x6f,
+    0x6a,
+    0x73,
+    0x4a,
+    0x69,
+    0x45,
+    0x78,
+    0x57,
+    0x5a,
+    0x70,
+    0x7a,
+    0x54,
+    0x2f,
+    0x56,
+    0x58,
+    0x31,
+    0x64,
+    0x32,
+    0x31,
+    0x6d,
+    0x4e,
+    0x0a,
+    0x57,
+    0x4d,
+    0x62,
+    0x35,
+    0x45,
+    0x4f,
+    0x38,
+    0x65,
+    0x79,
+    0x69,
+    0x36,
+    0x46,
+    0x79,
+    0x5a,
+    0x6c,
+    0x41,
+    0x63,
+    0x62,
+    0x39,
+    0x4d,
+    0x49,
+    0x44,
+    0x30,
+    0x6b,
+    0x4d,
+    0x46,
+    0x36,
+    0x51,
+    0x33,
+    0x68,
+    0x55,
+    0x76,
+    0x2b,
+    0x6a,
+    0x54,
+    0x77,
+    0x2b,
+    0x58,
+    0x39,
+    0x79,
+    0x69,
+    0x67,
+    0x2b,
+    0x33,
+    0x42,
+    0x39,
+    0x62,
+    0x67,
+    0x32,
+    0x5a,
+    0x30,
+    0x49,
+    0x2b,
+    0x49,
+    0x4b,
+    0x48,
+    0x6c,
+    0x39,
+    0x49,
+    0x6e,
+    0x53,
+    0x68,
+    0x6b,
+    0x43,
+    0x0a,
+    0x6e,
+    0x64,
+    0x59,
+    0x6e,
+    0x34,
+    0x61,
+    0x64,
+    0x30,
+    0x7a,
+    0x64,
+    0x2f,
+    0x67,
+    0x67,
+    0x4d,
+    0x56,
+    0x6b,
+    0x6c,
+    0x6f,
+    0x6f,
+    0x6d,
+    0x68,
+    0x34,
+    0x75,
+    0x61,
+    0x53,
+    0x71,
+    0x5a,
+    0x78,
+    0x55,
+    0x69,
+    0x33,
+    0x79,
+    0x77,
+    0x74,
+    0x73,
+    0x7a,
+    0x5a,
+    0x6b,
+    0x52,
+    0x62,
+    0x7a,
+    0x51,
+    0x4b,
+    0x42,
+    0x67,
+    0x51,
+    0x44,
+    0x37,
+    0x50,
+    0x76,
+    0x78,
+    0x31,
+    0x45,
+    0x72,
+    0x4b,
+    0x6d,
+    0x35,
+    0x6c,
+    0x5a,
+    0x44,
+    0x41,
+    0x53,
+    0x32,
+    0x62,
+    0x0a,
+    0x62,
+    0x34,
+    0x72,
+    0x6c,
+    0x74,
+    0x7a,
+    0x71,
+    0x4a,
+    0x52,
+    0x55,
+    0x45,
+    0x4b,
+    0x79,
+    0x45,
+    0x71,
+    0x6a,
+    0x71,
+    0x7a,
+    0x50,
+    0x7a,
+    0x67,
+    0x61,
+    0x73,
+    0x4f,
+    0x61,
+    0x30,
+    0x6a,
+    0x57,
+    0x45,
+    0x71,
+    0x2f,
+    0x66,
+    0x78,
+    0x75,
+    0x47,
+    0x63,
+    0x2f,
+    0x62,
+    0x69,
+    0x78,
+    0x67,
+    0x2f,
+    0x45,
+    0x42,
+    0x61,
+    0x51,
+    0x38,
+    0x79,
+    0x79,
+    0x54,
+    0x47,
+    0x59,
+    0x64,
+    0x49,
+    0x59,
+    0x79,
+    0x72,
+    0x37,
+    0x44,
+    0x4b,
+    0x59,
+    0x59,
+    0x6a,
+    0x43,
+    0x0a,
+    0x30,
+    0x41,
+    0x47,
+    0x56,
+    0x6e,
+    0x42,
+    0x43,
+    0x68,
+    0x30,
+    0x2b,
+    0x54,
+    0x46,
+    0x55,
+    0x44,
+    0x42,
+    0x31,
+    0x6b,
+    0x66,
+    0x77,
+    0x6b,
+    0x62,
+    0x65,
+    0x66,
+    0x32,
+    0x62,
+    0x38,
+    0x79,
+    0x75,
+    0x66,
+    0x51,
+    0x2f,
+    0x76,
+    0x4a,
+    0x77,
+    0x63,
+    0x4f,
+    0x4a,
+    0x2b,
+    0x35,
+    0x6b,
+    0x42,
+    0x58,
+    0x51,
+    0x5a,
+    0x78,
+    0x38,
+    0x2b,
+    0x4c,
+    0x38,
+    0x55,
+    0x39,
+    0x69,
+    0x57,
+    0x4b,
+    0x41,
+    0x4e,
+    0x58,
+    0x78,
+    0x6b,
+    0x45,
+    0x65,
+    0x43,
+    0x58,
+    0x32,
+    0x0a,
+    0x69,
+    0x57,
+    0x50,
+    0x5a,
+    0x50,
+    0x7a,
+    0x35,
+    0x32,
+    0x70,
+    0x54,
+    0x54,
+    0x59,
+    0x6c,
+    0x66,
+    0x39,
+    0x30,
+    0x50,
+    0x4c,
+    0x7a,
+    0x45,
+    0x57,
+    0x36,
+    0x51,
+    0x79,
+    0x44,
+    0x77,
+    0x4b,
+    0x42,
+    0x67,
+    0x51,
+    0x43,
+    0x35,
+    0x43,
+    0x4b,
+    0x79,
+    0x66,
+    0x55,
+    0x77,
+    0x78,
+    0x33,
+    0x42,
+    0x61,
+    0x32,
+    0x69,
+    0x58,
+    0x74,
+    0x66,
+    0x49,
+    0x72,
+    0x65,
+    0x79,
+    0x50,
+    0x71,
+    0x44,
+    0x6f,
+    0x62,
+    0x62,
+    0x79,
+    0x62,
+    0x79,
+    0x54,
+    0x45,
+    0x59,
+    0x6b,
+    0x0a,
+    0x61,
+    0x79,
+    0x41,
+    0x32,
+    0x6f,
+    0x45,
+    0x6c,
+    0x53,
+    0x64,
+    0x65,
+    0x6a,
+    0x67,
+    0x56,
+    0x6b,
+    0x57,
+    0x77,
+    0x4a,
+    0x2b,
+    0x71,
+    0x37,
+    0x37,
+    0x67,
+    0x77,
+    0x72,
+    0x6e,
+    0x46,
+    0x35,
+    0x50,
+    0x65,
+    0x39,
+    0x7a,
+    0x62,
+    0x70,
+    0x55,
+    0x42,
+    0x6f,
+    0x63,
+    0x37,
+    0x56,
+    0x4a,
+    0x6a,
+    0x72,
+    0x52,
+    0x68,
+    0x55,
+    0x6f,
+    0x6a,
+    0x49,
+    0x37,
+    0x4c,
+    0x4f,
+    0x79,
+    0x53,
+    0x79,
+    0x74,
+    0x6f,
+    0x33,
+    0x57,
+    0x59,
+    0x59,
+    0x6f,
+    0x63,
+    0x7a,
+    0x58,
+    0x0a,
+    0x4c,
+    0x70,
+    0x72,
+    0x7a,
+    0x50,
+    0x6e,
+    0x6a,
+    0x32,
+    0x79,
+    0x45,
+    0x56,
+    0x65,
+    0x56,
+    0x32,
+    0x6c,
+    0x72,
+    0x54,
+    0x53,
+    0x36,
+    0x6c,
+    0x4b,
+    0x4e,
+    0x70,
+    0x64,
+    0x72,
+    0x61,
+    0x4f,
+    0x38,
+    0x51,
+    0x5a,
+    0x63,
+    0x53,
+    0x44,
+    0x37,
+    0x6d,
+    0x55,
+    0x55,
+    0x6d,
+    0x69,
+    0x4e,
+    0x52,
+    0x5a,
+    0x6e,
+    0x6f,
+    0x50,
+    0x4b,
+    0x31,
+    0x36,
+    0x4d,
+    0x6d,
+    0x39,
+    0x71,
+    0x6a,
+    0x6b,
+    0x6b,
+    0x32,
+    0x39,
+    0x48,
+    0x6e,
+    0x59,
+    0x37,
+    0x4d,
+    0x73,
+    0x71,
+    0x0a,
+    0x70,
+    0x6b,
+    0x69,
+    0x4f,
+    0x67,
+    0x34,
+    0x68,
+    0x75,
+    0x4e,
+    0x77,
+    0x4b,
+    0x42,
+    0x67,
+    0x51,
+    0x43,
+    0x6b,
+    0x68,
+    0x32,
+    0x48,
+    0x42,
+    0x74,
+    0x4f,
+    0x58,
+    0x6a,
+    0x48,
+    0x2f,
+    0x47,
+    0x62,
+    0x58,
+    0x56,
+    0x6b,
+    0x6c,
+    0x63,
+    0x63,
+    0x30,
+    0x4f,
+    0x6b,
+    0x34,
+    0x65,
+    0x30,
+    0x76,
+    0x76,
+    0x4a,
+    0x53,
+    0x41,
+    0x6b,
+    0x6e,
+    0x47,
+    0x6c,
+    0x6d,
+    0x57,
+    0x6c,
+    0x37,
+    0x2b,
+    0x4d,
+    0x35,
+    0x78,
+    0x51,
+    0x33,
+    0x6b,
+    0x69,
+    0x6b,
+    0x59,
+    0x38,
+    0x0a,
+    0x44,
+    0x37,
+    0x78,
+    0x4e,
+    0x46,
+    0x32,
+    0x58,
+    0x73,
+    0x63,
+    0x59,
+    0x2f,
+    0x51,
+    0x73,
+    0x61,
+    0x44,
+    0x76,
+    0x54,
+    0x41,
+    0x75,
+    0x37,
+    0x58,
+    0x34,
+    0x74,
+    0x47,
+    0x42,
+    0x41,
+    0x47,
+    0x4d,
+    0x39,
+    0x6f,
+    0x51,
+    0x64,
+    0x74,
+    0x79,
+    0x4e,
+    0x69,
+    0x65,
+    0x74,
+    0x6e,
+    0x31,
+    0x62,
+    0x35,
+    0x4a,
+    0x66,
+    0x6d,
+    0x42,
+    0x79,
+    0x7a,
+    0x30,
+    0x55,
+    0x37,
+    0x42,
+    0x2b,
+    0x47,
+    0x73,
+    0x76,
+    0x32,
+    0x5a,
+    0x53,
+    0x37,
+    0x4b,
+    0x31,
+    0x44,
+    0x55,
+    0x0a,
+    0x39,
+    0x73,
+    0x54,
+    0x4c,
+    0x41,
+    0x32,
+    0x45,
+    0x38,
+    0x68,
+    0x4d,
+    0x6d,
+    0x37,
+    0x33,
+    0x44,
+    0x70,
+    0x51,
+    0x31,
+    0x55,
+    0x78,
+    0x38,
+    0x42,
+    0x62,
+    0x65,
+    0x43,
+    0x4b,
+    0x69,
+    0x56,
+    0x79,
+    0x35,
+    0x4d,
+    0x39,
+    0x50,
+    0x66,
+    0x44,
+    0x63,
+    0x7a,
+    0x33,
+    0x42,
+    0x4f,
+    0x6d,
+    0x6c,
+    0x4a,
+    0x64,
+    0x66,
+    0x77,
+    0x68,
+    0x4b,
+    0x51,
+    0x5a,
+    0x76,
+    0x6e,
+    0x69,
+    0x79,
+    0x48,
+    0x52,
+    0x6c,
+    0x42,
+    0x77,
+    0x4b,
+    0x42,
+    0x67,
+    0x51,
+    0x43,
+    0x48,
+    0x0a,
+    0x2f,
+    0x73,
+    0x41,
+    0x68,
+    0x4f,
+    0x63,
+    0x44,
+    0x6e,
+    0x6d,
+    0x64,
+    0x7a,
+    0x4d,
+    0x67,
+    0x6a,
+    0x6a,
+    0x47,
+    0x33,
+    0x6b,
+    0x34,
+    0x49,
+    0x4a,
+    0x2f,
+    0x54,
+    0x4e,
+    0x52,
+    0x52,
+    0x79,
+    0x79,
+    0x36,
+    0x53,
+    0x79,
+    0x45,
+    0x68,
+    0x39,
+    0x66,
+    0x64,
+    0x54,
+    0x6d,
+    0x47,
+    0x56,
+    0x6f,
+    0x65,
+    0x50,
+    0x50,
+    0x50,
+    0x70,
+    0x6c,
+    0x70,
+    0x70,
+    0x32,
+    0x7a,
+    0x33,
+    0x51,
+    0x7a,
+    0x62,
+    0x65,
+    0x74,
+    0x73,
+    0x62,
+    0x36,
+    0x56,
+    0x47,
+    0x63,
+    0x33,
+    0x0a,
+    0x61,
+    0x48,
+    0x57,
+    0x32,
+    0x54,
+    0x35,
+    0x54,
+    0x6d,
+    0x77,
+    0x32,
+    0x51,
+    0x41,
+    0x51,
+    0x39,
+    0x45,
+    0x56,
+    0x48,
+    0x43,
+    0x50,
+    0x57,
+    0x33,
+    0x7a,
+    0x6a,
+    0x41,
+    0x6b,
+    0x6a,
+    0x6a,
+    0x2f,
+    0x30,
+    0x61,
+    0x76,
+    0x6b,
+    0x57,
+    0x2f,
+    0x53,
+    0x32,
+    0x34,
+    0x79,
+    0x75,
+    0x30,
+    0x39,
+    0x65,
+    0x31,
+    0x47,
+    0x4d,
+    0x61,
+    0x6a,
+    0x68,
+    0x6e,
+    0x4a,
+    0x43,
+    0x30,
+    0x41,
+    0x78,
+    0x71,
+    0x37,
+    0x7a,
+    0x32,
+    0x75,
+    0x51,
+    0x61,
+    0x67,
+    0x54,
+    0x47,
+    0x0a,
+    0x32,
+    0x5a,
+    0x66,
+    0x6b,
+    0x55,
+    0x38,
+    0x31,
+    0x55,
+    0x52,
+    0x39,
+    0x75,
+    0x65,
+    0x76,
+    0x54,
+    0x6f,
+    0x6a,
+    0x6e,
+    0x66,
+    0x34,
+    0x56,
+    0x71,
+    0x77,
+    0x35,
+    0x55,
+    0x76,
+    0x63,
+    0x72,
+    0x77,
+    0x6a,
+    0x4e,
+    0x6d,
+    0x6d,
+    0x4e,
+    0x79,
+    0x45,
+    0x4d,
+    0x33,
+    0x63,
+    0x2f,
+    0x67,
+    0x63,
+    0x51,
+    0x4b,
+    0x42,
+    0x67,
+    0x48,
+    0x61,
+    0x32,
+    0x64,
+    0x54,
+    0x35,
+    0x73,
+    0x76,
+    0x7a,
+    0x4d,
+    0x31,
+    0x6a,
+    0x52,
+    0x65,
+    0x69,
+    0x4f,
+    0x33,
+    0x56,
+    0x74,
+    0x0a,
+    0x64,
+    0x41,
+    0x55,
+    0x44,
+    0x7a,
+    0x74,
+    0x47,
+    0x4b,
+    0x55,
+    0x45,
+    0x33,
+    0x63,
+    0x6c,
+    0x50,
+    0x56,
+    0x33,
+    0x35,
+    0x4c,
+    0x32,
+    0x78,
+    0x6d,
+    0x4a,
+    0x65,
+    0x4a,
+    0x44,
+    0x58,
+    0x50,
+    0x4f,
+    0x71,
+    0x43,
+    0x4c,
+    0x33,
+    0x71,
+    0x6f,
+    0x5a,
+    0x39,
+    0x41,
+    0x36,
+    0x68,
+    0x48,
+    0x6d,
+    0x44,
+    0x77,
+    0x36,
+    0x67,
+    0x6d,
+    0x67,
+    0x38,
+    0x32,
+    0x67,
+    0x51,
+    0x44,
+    0x51,
+    0x65,
+    0x4a,
+    0x62,
+    0x4c,
+    0x2f,
+    0x2b,
+    0x6a,
+    0x4b,
+    0x6b,
+    0x6f,
+    0x6e,
+    0x0a,
+    0x65,
+    0x36,
+    0x61,
+    0x74,
+    0x48,
+    0x2f,
+    0x44,
+    0x66,
+    0x72,
+    0x2b,
+    0x4d,
+    0x34,
+    0x6e,
+    0x50,
+    0x66,
+    0x74,
+    0x39,
+    0x4c,
+    0x74,
+    0x34,
+    0x66,
+    0x4f,
+    0x41,
+    0x57,
+    0x4f,
+    0x51,
+    0x33,
+    0x74,
+    0x44,
+    0x73,
+    0x44,
+    0x75,
+    0x43,
+    0x6b,
+    0x4f,
+    0x4d,
+    0x6a,
+    0x53,
+    0x54,
+    0x6e,
+    0x38,
+    0x63,
+    0x4c,
+    0x4d,
+    0x5a,
+    0x4c,
+    0x47,
+    0x63,
+    0x77,
+    0x54,
+    0x32,
+    0x48,
+    0x31,
+    0x48,
+    0x32,
+    0x76,
+    0x42,
+    0x6f,
+    0x63,
+    0x4d,
+    0x2b,
+    0x55,
+    0x54,
+    0x64,
+    0x0a,
+    0x68,
+    0x6c,
+    0x6a,
+    0x41,
+    0x56,
+    0x6e,
+    0x42,
+    0x39,
+    0x76,
+    0x36,
+    0x4e,
+    0x4d,
+    0x66,
+    0x63,
+    0x52,
+    0x45,
+    0x52,
+    0x54,
+    0x78,
+    0x31,
+    0x30,
+    0x53,
+    0x55,
+    0x63,
+    0x0a,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x45,
+    0x4e,
+    0x44,
+    0x20,
+    0x50,
+    0x52,
+    0x49,
+    0x56,
+    0x41,
+    0x54,
+    0x45,
+    0x20,
+    0x4b,
+    0x45,
+    0x59,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x2d,
+    0x0a,
 };
 #endif
 
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /*
 -----BEGIN EC PRIVATE KEY-----
 MHcCAQEEIJLyl7hJjpQL/RhP1x2zS79xdiPJQB683gWeqcqHPeZkoAoGCCqGSM49
@@ -307,7 +3143,7 @@ static const char ECDSAPrivateKeyPEM[] = {
     0x4e, 0x44, 0x20, 0x45, 0x43, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54,
     0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a
 };
-# endif
+#endif
 
 /*
 -----BEGIN CERTIFICATE-----
@@ -555,7 +3391,12 @@ static int idx;
 
 #define FUZZTIME 1485898104
 
-#define TIME_IMPL(t) { if (t != NULL) *t = FUZZTIME; return FUZZTIME; }
+#define TIME_IMPL(t)       \
+    {                      \
+        if (t != NULL)     \
+            *t = FUZZTIME; \
+        return FUZZTIME;   \
+    }
 
 /*
  * This might not work in all cases (and definitely not on Windows
@@ -568,7 +3409,7 @@ static int idx;
 time_t time(time_t *t) TIME_IMPL(t)
 #endif
 
-int FuzzerInitialize(int *argc, char ***argv)
+    int FuzzerInitialize(int *argc, char ***argv)
 {
     STACK_OF(SSL_COMP) *comp_methods;
 
@@ -590,10 +3431,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     SSL *server;
     BIO *in;
     BIO *out;
-#if !defined(OPENSSL_NO_EC)                     \
-    || (!defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0))
     BIO *bio_buf;
-#endif
     SSL_CTX *ctx;
     int ret;
 #ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -604,9 +3442,9 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 #endif
     X509 *cert;
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
     EC_KEY *ecdsakey = NULL;
-# endif
+#endif
 #endif
 #if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
     DSA *dsakey = NULL;
@@ -648,7 +3486,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     X509_free(cert);
 
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     /* ECDSA */
     bio_buf = BIO_new(BIO_s_mem());
     OPENSSL_assert((size_t)BIO_write(bio_buf, ECDSAPrivateKeyPEM, sizeof(ECDSAPrivateKeyPEM)) == sizeof(ECDSAPrivateKeyPEM));
@@ -661,7 +3499,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     ret = SSL_CTX_use_PrivateKey(ctx, pkey);
     OPENSSL_assert(ret == 1);
     EVP_PKEY_free(pkey);
-# endif
+#endif
     bio_buf = BIO_new(BIO_s_mem());
     OPENSSL_assert((size_t)BIO_write(bio_buf, ECDSACertPEM, sizeof(ECDSACertPEM)) == sizeof(ECDSACertPEM));
     cert = PEM_read_bio_X509(bio_buf, NULL, NULL, NULL);
diff --git a/fuzz/fuzz_rand.c b/fuzz/fuzz_rand.c
index d3351147ec8cd..9937fc9dd1520 100644
--- a/fuzz/fuzz_rand.c
+++ b/fuzz/fuzz_rand.c
@@ -23,7 +23,7 @@ static OSSL_FUNC_rand_get_ctx_params_fn fuzz_rand_get_ctx_params;
 static OSSL_FUNC_rand_enable_locking_fn fuzz_rand_enable_locking;
 
 static void *fuzz_rand_newctx(
-         void *provctx, void *parent, const OSSL_DISPATCH *parent_dispatch)
+    void *provctx, void *parent, const OSSL_DISPATCH *parent_dispatch)
 {
     int *st = OPENSSL_malloc(sizeof(*st));
 
@@ -38,11 +38,11 @@ static void fuzz_rand_freectx(ossl_unused void *vrng)
 }
 
 static int fuzz_rand_instantiate(ossl_unused void *vrng,
-                                 ossl_unused unsigned int strength,
-                                 ossl_unused int prediction_resistance,
-                                 ossl_unused const unsigned char *pstr,
-                                 ossl_unused size_t pstr_len,
-                                 ossl_unused const OSSL_PARAM params[])
+    ossl_unused unsigned int strength,
+    ossl_unused int prediction_resistance,
+    ossl_unused const unsigned char *pstr,
+    ossl_unused size_t pstr_len,
+    ossl_unused const OSSL_PARAM params[])
 {
     *(int *)vrng = EVP_RAND_STATE_READY;
     return 1;
@@ -55,11 +55,11 @@ static int fuzz_rand_uninstantiate(ossl_unused void *vrng)
 }
 
 static int fuzz_rand_generate(ossl_unused void *vdrbg,
-                              unsigned char *out, size_t outlen,
-                              ossl_unused unsigned int strength,
-                              ossl_unused int prediction_resistance,
-                              ossl_unused const unsigned char *adin,
-                              ossl_unused size_t adinlen)
+    unsigned char *out, size_t outlen,
+    ossl_unused unsigned int strength,
+    ossl_unused int prediction_resistance,
+    ossl_unused const unsigned char *adin,
+    ossl_unused size_t adinlen)
 {
     unsigned char val = 1;
     size_t i;
@@ -93,7 +93,7 @@ static int fuzz_rand_get_ctx_params(void *vrng, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *fuzz_rand_gettable_ctx_params(ossl_unused void *vrng,
-                                                       ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_int(OSSL_RAND_PARAM_STATE, NULL),
@@ -112,8 +112,8 @@ static const OSSL_DISPATCH fuzz_rand_functions[] = {
     { OSSL_FUNC_RAND_GENERATE, (void (*)(void))fuzz_rand_generate },
     { OSSL_FUNC_RAND_ENABLE_LOCKING, (void (*)(void))fuzz_rand_enable_locking },
     { OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS,
-      (void(*)(void))fuzz_rand_gettable_ctx_params },
-    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void(*)(void))fuzz_rand_get_ctx_params },
+        (void (*)(void))fuzz_rand_gettable_ctx_params },
+    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void (*)(void))fuzz_rand_get_ctx_params },
     OSSL_DISPATCH_END
 };
 
@@ -123,8 +123,8 @@ static const OSSL_ALGORITHM fuzz_rand_rand[] = {
 };
 
 static const OSSL_ALGORITHM *fuzz_rand_query(void *provctx,
-                                             int operation_id,
-                                             int *no_cache)
+    int operation_id,
+    int *no_cache)
 {
     *no_cache = 0;
     switch (operation_id) {
@@ -142,8 +142,8 @@ static const OSSL_DISPATCH fuzz_rand_method[] = {
 };
 
 static int fuzz_rand_provider_init(const OSSL_CORE_HANDLE *handle,
-                                   const OSSL_DISPATCH *in,
-                                   const OSSL_DISPATCH **out, void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out, void **provctx)
 {
     *provctx = OSSL_LIB_CTX_new();
     if (*provctx == NULL)
diff --git a/fuzz/fuzzer.h b/fuzz/fuzzer.h
index 76eda2ce5d3f4..bf2cce8da1f60 100644
--- a/fuzz/fuzzer.h
+++ b/fuzz/fuzzer.h
@@ -8,8 +8,8 @@
  * or in the file LICENSE in the source distribution.
  */
 
-#include <stddef.h>              /* for size_t */
-#include <openssl/e_os2.h>       /* for uint8_t */
+#include <stddef.h> /* for size_t */
+#include <openssl/e_os2.h> /* for uint8_t */
 
 int FuzzerTestOneInput(const uint8_t *buf, size_t len);
 int FuzzerInitialize(int *argc, char ***argv);
diff --git a/fuzz/hashtable.c b/fuzz/hashtable.c
index 38d22950763e5..5e168aad3e783 100644
--- a/fuzz/hashtable.c
+++ b/fuzz/hashtable.c
@@ -52,13 +52,13 @@ static HT *fuzzer_table = NULL;
 /*
  * Operational values
  */
-#define OP_INSERT  0
-#define OP_DELETE  1
-#define OP_LOOKUP  2
-#define OP_FLUSH   3
+#define OP_INSERT 0
+#define OP_DELETE 1
+#define OP_LOOKUP 2
+#define OP_FLUSH 3
 #define OP_FOREACH 4
-#define OP_FILTER  5
-#define OP_END     6 
+#define OP_FILTER 5
+#define OP_END 6
 
 #define OP_MASK 0x3f
 #define INSERT_REPLACE_MASK 0x40
@@ -99,7 +99,7 @@ static void fuzz_free_cb(HT_VALUE *v)
 
 int FuzzerInitialize(int *argc, char ***argv)
 {
-    HT_CONFIG fuzz_conf = {NULL, fuzz_free_cb, NULL, 0, 1};
+    HT_CONFIG fuzz_conf = { NULL, fuzz_free_cb, NULL, 0, 1 };
 
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
     ERR_clear_error();
@@ -152,7 +152,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     /*
      * Now do our operation
      */
-    switch(OPERATION(op_flags)) {
+    switch (OPERATION(op_flags)) {
     case OP_INSERT:
         valptr = &prediction_table[keyval];
 
@@ -183,10 +183,10 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
          */
         if (IS_REPLACE(op_flags))
             rc = ossl_ht_fz_FUZZER_VALUE_insert(fuzzer_table, TO_HT_KEY(&key),
-                                                valptr, &lval);
+                valptr, &lval);
         else
             rc = ossl_ht_fz_FUZZER_VALUE_insert(fuzzer_table, TO_HT_KEY(&key),
-                                                valptr, NULL);
+                valptr, NULL);
 
         if (rc == -1)
             /* failed to grow the hash table due to too many collisions */
@@ -323,7 +323,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 
     case OP_FLUSH:
         /*
-         * only flush the table rarely 
+         * only flush the table rarely
          */
         if ((flushes % 100000) != 1) {
             skipped_values++;
@@ -341,7 +341,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
         /*
          * now check to make sure everything is free
          */
-       for (i = 0; i < USHRT_MAX; i++)
+        for (i = 0; i < USHRT_MAX; i++)
             OPENSSL_assert((prediction_table[i].flags & FZ_FLAG_ALLOCATED) == 0);
 
         /* good flush */
diff --git a/fuzz/ml-dsa.c b/fuzz/ml-dsa.c
index 1088f9d054fae..fdede95772e69 100644
--- a/fuzz/ml-dsa.c
+++ b/fuzz/ml-dsa.c
@@ -79,8 +79,8 @@ static uint8_t *consume_size_t(const uint8_t *buf, size_t *len, size_t *val)
  * @return 1 if a key type is successfully selected, 0 on failure.
  */
 static int select_keytype_and_size(uint8_t **buf, size_t *len,
-                                   char **keytype, size_t *keylen,
-                                   int only_valid)
+    char **keytype, size_t *keylen,
+    int only_valid)
 {
     uint16_t keysize;
     uint16_t modulus = 6;
@@ -157,7 +157,7 @@ static int select_keytype_and_size(uint8_t **buf, size_t *len,
  *       and should be freed appropriately using `EVP_PKEY_free()`.
  */
 static void create_ml_dsa_raw_key(uint8_t **buf, size_t *len,
-                                  void **key1, void **key2)
+    void **key1, void **key2)
 {
     EVP_PKEY *pubkey;
     char *keytype = NULL;
@@ -217,7 +217,7 @@ static void create_ml_dsa_raw_key(uint8_t **buf, size_t *len,
 }
 
 static int keygen_ml_dsa_real_key_helper(uint8_t **buf, size_t *len,
-                                         EVP_PKEY **key)
+    EVP_PKEY **key)
 {
     char *keytype = NULL;
     size_t keylen = 0;
@@ -274,7 +274,7 @@ static int keygen_ml_dsa_real_key_helper(uint8_t **buf, size_t *len,
  *       and should be freed using `EVP_PKEY_free()`.
  */
 static void keygen_ml_dsa_real_key(uint8_t **buf, size_t *len,
-                                   void **key1, void **key2)
+    void **key1, void **key2)
 {
     if (!keygen_ml_dsa_real_key_helper(buf, len, (EVP_PKEY **)key1)
         || !keygen_ml_dsa_real_key_helper(buf, len, (EVP_PKEY **)key2))
@@ -296,7 +296,7 @@ static void keygen_ml_dsa_real_key(uint8_t **buf, size_t *len,
  * @param[out] out2  Unused output parameter (reserved for future use).
  */
 static void ml_dsa_sign_verify(uint8_t **buf, size_t *len, void *key1,
-                               void *in2, void **out1, void **out2)
+    void *in2, void **out1, void **out2)
 {
     EVP_PKEY *key = (EVP_PKEY *)key1;
     EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_from_pkey(NULL, key, NULL);
@@ -308,7 +308,7 @@ static void ml_dsa_sign_verify(uint8_t **buf, size_t *len, void *key1,
     const char *alg = EVP_PKEY_get0_type_name(key);
     const OSSL_PARAM params[] = {
         OSSL_PARAM_octet_string("context-string",
-                                (unsigned char *)"A context string", 16),
+            (unsigned char *)"A context string", 16),
         OSSL_PARAM_END
     };
 
@@ -375,7 +375,7 @@ static void ml_dsa_sign_verify(uint8_t **buf, size_t *len, void *key1,
  * @param[out] out2  Unused output parameter (reserved for future use).
  */
 static void ml_dsa_digest_sign_verify(uint8_t **buf, size_t *len, void *key1,
-                                      void *in2, void **out1, void **out2)
+    void *in2, void **out1, void **out2)
 {
     EVP_PKEY *key = (EVP_PKEY *)key1;
     EVP_MD_CTX *ctx = EVP_MD_CTX_new();
@@ -385,7 +385,7 @@ static void ml_dsa_digest_sign_verify(uint8_t **buf, size_t *len, void *key1,
     unsigned char *tbs = NULL;
     const OSSL_PARAM params[] = {
         OSSL_PARAM_octet_string("context-string",
-                                (unsigned char *)"A context string", 16),
+            (unsigned char *)"A context string", 16),
         OSSL_PARAM_END
     };
 
@@ -423,7 +423,8 @@ static void ml_dsa_digest_sign_verify(uint8_t **buf, size_t *len, void *key1,
 
     if ((ctx = EVP_MD_CTX_new()) == NULL
         || EVP_DigestVerifyInit_ex(ctx, NULL, NULL, NULL, "?fips=true", key,
-                                   params) <= 0
+               params)
+            <= 0
         || EVP_DigestVerify(ctx, sig, sig_len, tbs, tbslen) <= 0) {
         fprintf(stderr, "Failed to verify digest with EVP_DigestVerify\n");
         goto err;
@@ -456,7 +457,7 @@ static void ml_dsa_digest_sign_verify(uint8_t **buf, size_t *len, void *key1,
  *       logs an error and cleans up allocated resources.
  */
 static void ml_dsa_export_import(uint8_t **buf, size_t *len, void *key1,
-                                 void *key2, void **out1, void **out2)
+    void *key2, void **out1, void **out2)
 {
     EVP_PKEY *alice = (EVP_PKEY *)key1;
     EVP_PKEY *new_key = NULL;
@@ -501,7 +502,7 @@ static void ml_dsa_export_import(uint8_t **buf, size_t *len, void *key1,
  * @param out2  Unused parameter (purpose unclear).
  */
 static void ml_dsa_compare(uint8_t **buf, size_t *len, void *key1,
-                           void *key2, void **out1, void **out2)
+    void *key2, void **out1, void **out2)
 {
     EVP_PKEY *alice = (EVP_PKEY *)key1;
     EVP_PKEY *bob = (EVP_PKEY *)key2;
@@ -525,7 +526,7 @@ static void ml_dsa_compare(uint8_t **buf, size_t *len, void *key1,
  *       object or NULL. Passing NULL is safe and has no effect.
  */
 static void cleanup_ml_dsa_keys(void *key1, void *key2,
-                                void *key3, void *key4)
+    void *key3, void *key4)
 {
     EVP_PKEY_free((EVP_PKEY *)key1);
     EVP_PKEY_free((EVP_PKEY *)key2);
@@ -570,7 +571,7 @@ struct op_table_entry {
      * @param out2  Pointer to store the second output of the operation.
      */
     void (*doit)(uint8_t **buf, size_t *len, void *in1, void *in2,
-                 void **out1, void **out2);
+        void **out1, void **out2);
 
     /**
      * @brief Function pointer for cleaning up after the operation.
@@ -584,43 +585,36 @@ struct op_table_entry {
 };
 
 static struct op_table_entry ops[] = {
-    {
-        "Generate ML-DSA raw key",
+    { "Generate ML-DSA raw key",
         "Try generate a raw keypair using random data. Usually fails",
         create_ml_dsa_raw_key,
         NULL,
-        cleanup_ml_dsa_keys
-    }, {
-        "Generate ML-DSA keypair, using EVP_PKEY_keygen",
+        cleanup_ml_dsa_keys },
+    { "Generate ML-DSA keypair, using EVP_PKEY_keygen",
         "Generates a real ML-DSA keypair, should always work",
         keygen_ml_dsa_real_key,
         NULL,
-        cleanup_ml_dsa_keys
-    }, {
-        "Do a sign/verify operation on a key",
+        cleanup_ml_dsa_keys },
+    { "Do a sign/verify operation on a key",
         "Generate key, sign random data, verify it, should work",
         keygen_ml_dsa_real_key,
         ml_dsa_sign_verify,
-        cleanup_ml_dsa_keys
-    }, {
-        "Do a digest sign/verify operation on a key",
+        cleanup_ml_dsa_keys },
+    { "Do a digest sign/verify operation on a key",
         "Generate key, digest sign random data, verify it, should work",
         keygen_ml_dsa_real_key,
         ml_dsa_digest_sign_verify,
-        cleanup_ml_dsa_keys
-    }, {
-        "Do an export/import of key data",
+        cleanup_ml_dsa_keys },
+    { "Do an export/import of key data",
         "Exercise EVP_PKEY_todata/fromdata",
         keygen_ml_dsa_real_key,
         ml_dsa_export_import,
-        cleanup_ml_dsa_keys
-    }, {
-        "Compare keys for equality",
+        cleanup_ml_dsa_keys },
+    { "Compare keys for equality",
         "Compare key1/key1 and key1/key2 for equality",
         keygen_ml_dsa_real_key,
         ml_dsa_compare,
-        cleanup_ml_dsa_keys
-    }
+        cleanup_ml_dsa_keys }
 };
 
 int FuzzerInitialize(int *argc, char ***argv)
diff --git a/fuzz/ml-kem.c b/fuzz/ml-kem.c
index 7cf6e96960348..a3184e8f32180 100644
--- a/fuzz/ml-kem.c
+++ b/fuzz/ml-kem.c
@@ -59,8 +59,8 @@ static uint8_t *consume_uint8t(const uint8_t *buf, size_t *len, uint8_t *val)
  * @return 1 if a key type is successfully selected, 0 on failure.
  */
 static int select_keytype_and_size(uint8_t **buf, size_t *len,
-                                   char **keytype, size_t *keylen,
-                                   int only_valid)
+    char **keytype, size_t *keylen,
+    int only_valid)
 {
     uint16_t keysize;
     uint16_t modulus = 6;
@@ -138,7 +138,7 @@ static int select_keytype_and_size(uint8_t **buf, size_t *len,
  *       and should be freed appropriately using `EVP_PKEY_free()`.
  */
 static void create_mlkem_raw_key(uint8_t **buf, size_t *len,
-                                 void **key1, void **key2)
+    void **key1, void **key2)
 {
     EVP_PKEY *pubkey;
     char *keytype = NULL;
@@ -200,7 +200,7 @@ static void create_mlkem_raw_key(uint8_t **buf, size_t *len,
  *       and should be freed using `EVP_PKEY_free()`.
  */
 static void keygen_mlkem_real_key(uint8_t **buf, size_t *len,
-                                  void **key1, void **key2)
+    void **key1, void **key2)
 {
     char *keytype = NULL;
     size_t keylen = 0;
@@ -267,7 +267,7 @@ static void keygen_mlkem_real_key(uint8_t **buf, size_t *len,
  * @param[out] out2  Unused output parameter (reserved for future use).
  */
 static void mlkem_encap_decap(uint8_t **buf, size_t *len, void *key1, void *in2,
-                              void **out1, void **out2)
+    void **out1, void **out2)
 {
     EVP_PKEY *key = (EVP_PKEY *)key1;
     EVP_PKEY_CTX *ctx;
@@ -310,7 +310,8 @@ static void mlkem_encap_decap(uint8_t **buf, size_t *len, void *key1, void *in2,
     }
 
     if (EVP_PKEY_decapsulate(ctx, unwrappedkey, &unwrappedkey_len,
-                             wrapkey, wrapkey_len) <= 0) {
+            wrapkey, wrapkey_len)
+        <= 0) {
         fprintf(stderr, "Failed to decap key\n");
         goto err;
     }
@@ -403,7 +404,7 @@ static void do_derive(EVP_PKEY *key, EVP_PKEY *peer, uint8_t **shared, size_t *s
  *       supports this.
  */
 static void mlkem_kex(uint8_t **buf, size_t *len, void *key1, void *key2,
-                      void **out1, void **out2)
+    void **out1, void **out2)
 {
     EVP_PKEY *alice = (EVP_PKEY *)key1;
     EVP_PKEY *bob = (EVP_PKEY *)key2;
@@ -440,7 +441,7 @@ static void mlkem_kex(uint8_t **buf, size_t *len, void *key1, void *key2,
  *       logs an error and cleans up allocated resources.
  */
 static void mlkem_export_import(uint8_t **buf, size_t *len, void *key1,
-                                void *key2, void **out1, void **out2)
+    void *key2, void **out1, void **out2)
 {
     EVP_PKEY *alice = (EVP_PKEY *)key1;
     EVP_PKEY *new = NULL;
@@ -485,7 +486,7 @@ static void mlkem_export_import(uint8_t **buf, size_t *len, void *key1,
  * @param out2  Unused parameter (purpose unclear).
  */
 static void mlkem_compare(uint8_t **buf, size_t *len, void *key1,
-                          void *key2, void **out1, void **out2)
+    void *key2, void **out1, void **out2)
 {
     EVP_PKEY *alice = (EVP_PKEY *)key1;
     EVP_PKEY *bob = (EVP_PKEY *)key2;
@@ -509,7 +510,7 @@ static void mlkem_compare(uint8_t **buf, size_t *len, void *key1,
  *       object or NULL. Passing NULL is safe and has no effect.
  */
 static void cleanup_mlkem_keys(void *key1, void *key2,
-                               void *key3, void *key4)
+    void *key3, void *key4)
 {
     EVP_PKEY_free((EVP_PKEY *)key1);
     EVP_PKEY_free((EVP_PKEY *)key2);
@@ -555,7 +556,7 @@ struct op_table_entry {
      * @param out2  Pointer to store the second output of the operation.
      */
     void (*doit)(uint8_t **buf, size_t *len, void *in1, void *in2,
-                 void **out1, void **out2);
+        void **out1, void **out2);
 
     /**
      * @brief Function pointer for cleaning up after the operation.
@@ -569,43 +570,36 @@ struct op_table_entry {
 };
 
 static struct op_table_entry ops[] = {
-    {
-        "Generate ML-KEM raw key",
+    { "Generate ML-KEM raw key",
         "Try generate a raw keypair using random data. Usually fails",
         create_mlkem_raw_key,
         NULL,
-        cleanup_mlkem_keys
-    }, {
-        "Generate ML-KEM keypair, using EVP_PKEY_keygen",
+        cleanup_mlkem_keys },
+    { "Generate ML-KEM keypair, using EVP_PKEY_keygen",
         "Generates a real ML-KEM keypair, should always work",
         keygen_mlkem_real_key,
         NULL,
-        cleanup_mlkem_keys
-    }, {
-        "Do a key encap/decap operation on a key",
+        cleanup_mlkem_keys },
+    { "Do a key encap/decap operation on a key",
         "Generate key, encap it, decap it and compare, should work",
         keygen_mlkem_real_key,
         mlkem_encap_decap,
-        cleanup_mlkem_keys
-    }, {
-        "Do a key exchange operation on two keys",
+        cleanup_mlkem_keys },
+    { "Do a key exchange operation on two keys",
         "Gen keys, do a key exchange both ways and compare",
         keygen_mlkem_real_key,
         mlkem_kex,
-        cleanup_mlkem_keys
-    }, {
-        "Do an export/import of key data",
+        cleanup_mlkem_keys },
+    { "Do an export/import of key data",
         "Exercise EVP_PKEY_todata/fromdata",
         keygen_mlkem_real_key,
         mlkem_export_import,
-        cleanup_mlkem_keys
-    }, {
-        "Compare keys for equality",
+        cleanup_mlkem_keys },
+    { "Compare keys for equality",
         "Compare key1/key1 and key1/key2 for equality",
         keygen_mlkem_real_key,
         mlkem_compare,
-        cleanup_mlkem_keys
-    }
+        cleanup_mlkem_keys }
 };
 
 int FuzzerInitialize(int *argc, char ***argv)
@@ -640,7 +634,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
         return -1;
     /*
      * Get the first byte of the buffer to tell us what operation
-     * to preform
+     * to perform
      */
     buffer_cursor = consume_uint8t(buf, &len, &operation);
     if (buffer_cursor == NULL)
diff --git a/fuzz/pem.c b/fuzz/pem.c
index cc2969f6bedb8..79c49041e455d 100644
--- a/fuzz/pem.c
+++ b/fuzz/pem.c
@@ -33,10 +33,10 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     in = BIO_new(BIO_s_mem());
     OPENSSL_assert((size_t)BIO_write(in, buf + 1, len - 1) == len - 1);
     if (PEM_read_bio_ex(in, &name, &header, &data, &outlen, buf[0]) == 1) {
-	/* Try to read all the data we get to see if allocated properly. */
+        /* Try to read all the data we get to see if allocated properly. */
         BIO_write(in, name, strlen(name));
-	BIO_write(in, header, strlen(header));
-	BIO_write(in, data, outlen);
+        BIO_write(in, header, strlen(header));
+        BIO_write(in, data, outlen);
     }
     if (buf[0] & PEM_FLAG_SECURE) {
         OPENSSL_secure_free(name);
diff --git a/fuzz/provider.c b/fuzz/provider.c
index 492d249c7db33..8234a7e8dca64 100644
--- a/fuzz/provider.c
+++ b/fuzz/provider.c
@@ -16,32 +16,33 @@
 #include <openssl/provider.h>
 #include "fuzzer.h"
 
-#define DEFINE_ALGORITHMS(name, evp) DEFINE_STACK_OF(evp) \
-    static int cmp_##evp(const evp *const *a, const evp *const *b); \
-    static void collect_##evp(evp *obj, void *stack); \
-    static void init_##name(OSSL_LIB_CTX *libctx); \
-    static void cleanup_##name(void); \
-    static STACK_OF(evp) *name##_collection; \
-    static int cmp_##evp(const evp *const *a, const evp *const *b) \
-    { \
-        return strcmp(OSSL_PROVIDER_get0_name(evp##_get0_provider(*a)), \
-                      OSSL_PROVIDER_get0_name(evp##_get0_provider(*b))); \
-    } \
-    static void collect_##evp(evp *obj, void *stack) \
-    { \
-        STACK_OF(evp) *obj_stack = stack;  \
-        \
-        if (sk_##evp##_push(obj_stack, obj) > 0) \
-            evp##_up_ref(obj); \
-    } \
-    static void init_##name(OSSL_LIB_CTX *libctx) \
-    { \
-        name##_collection = sk_##evp##_new(cmp_##evp); \
+#define DEFINE_ALGORITHMS(name, evp)                                     \
+    DEFINE_STACK_OF(evp)                                                 \
+    static int cmp_##evp(const evp *const *a, const evp *const *b);      \
+    static void collect_##evp(evp *obj, void *stack);                    \
+    static void init_##name(OSSL_LIB_CTX *libctx);                       \
+    static void cleanup_##name(void);                                    \
+    static STACK_OF(evp) *name##_collection;                             \
+    static int cmp_##evp(const evp *const *a, const evp *const *b)       \
+    {                                                                    \
+        return strcmp(OSSL_PROVIDER_get0_name(evp##_get0_provider(*a)),  \
+            OSSL_PROVIDER_get0_name(evp##_get0_provider(*b)));           \
+    }                                                                    \
+    static void collect_##evp(evp *obj, void *stack)                     \
+    {                                                                    \
+        STACK_OF(evp) *obj_stack = stack;                                \
+                                                                         \
+        if (sk_##evp##_push(obj_stack, obj) > 0)                         \
+            evp##_up_ref(obj);                                           \
+    }                                                                    \
+    static void init_##name(OSSL_LIB_CTX *libctx)                        \
+    {                                                                    \
+        name##_collection = sk_##evp##_new(cmp_##evp);                   \
         evp##_do_all_provided(libctx, collect_##evp, name##_collection); \
-    } \
-    static void cleanup_##name(void) \
-    { \
-        sk_##evp##_pop_free(name##_collection, evp##_free); \
+    }                                                                    \
+    static void cleanup_##name(void)                                     \
+    {                                                                    \
+        sk_##evp##_pop_free(name##_collection, evp##_free);              \
     }
 
 DEFINE_ALGORITHMS(digests, EVP_MD)
@@ -111,7 +112,7 @@ static int read_uint(const uint8_t **buf, size_t *len, uint64_t **res)
     }
 
     *res = OPENSSL_malloc(sizeof(uint64_t));
-    **res = (uint64_t) **buf;
+    **res = (uint64_t)**buf;
 
     *buf += sizeof(uint64_t);
     *len -= sizeof(uint64_t);
@@ -129,7 +130,7 @@ static int read_int(const uint8_t **buf, size_t *len, int64_t **res)
     }
 
     *res = OPENSSL_malloc(sizeof(int64_t));
-    **res = (int64_t) **buf;
+    **res = (int64_t)**buf;
 
     *buf += sizeof(int64_t);
     *len -= sizeof(int64_t);
@@ -147,7 +148,7 @@ static int read_double(const uint8_t **buf, size_t *len, double **res)
     }
 
     *res = OPENSSL_malloc(sizeof(double));
-    **res = (double) **buf;
+    **res = (double)**buf;
 
     *buf += sizeof(double);
     *len -= sizeof(double);
@@ -160,7 +161,7 @@ static int read_utf8_string(const uint8_t **buf, size_t *len, char **res)
     size_t found_len;
     int r;
 
-    found_len = OPENSSL_strnlen((const char *) *buf, *len);
+    found_len = OPENSSL_strnlen((const char *)*buf, *len);
 
     if (found_len == *len) {
         r = -1;
@@ -169,9 +170,9 @@ static int read_utf8_string(const uint8_t **buf, size_t *len, char **res)
 
     found_len++; /* skip over the \0 byte */
 
-    r = (int) found_len;
+    r = (int)found_len;
 
-    *res = (char *) *buf;
+    *res = (char *)*buf;
     *len -= found_len;
     *buf = *buf + found_len; /* continue after the \0 byte */
 end:
@@ -198,8 +199,7 @@ static int read_octet_string(const uint8_t **buf, size_t *len, char **res)
     int found = 0;
 
     for (i = 0; i < *len; ++i) {
-        if (*ptr == 0xFF &&
-            (i + 1 < *len && *(ptr + 1) == 0xFF)) {
+        if (*ptr == 0xFF && (i + 1 < *len && *(ptr + 1) == 0xFF)) {
             ptr++;
             found = 1;
             break;
@@ -212,7 +212,7 @@ static int read_octet_string(const uint8_t **buf, size_t *len, char **res)
         goto end;
     }
 
-    *res = (char *) *buf;
+    *res = (char *)*buf;
 
     r = ptr - *buf;
     *len -= r;
@@ -245,18 +245,17 @@ static uint64_t UITERS = 1;
 static int64_t BLOCKSIZE = 8;
 static uint64_t UBLOCKSIZE = 8;
 
-
 static void free_params(OSSL_PARAM *param)
 {
     for (; param != NULL && param->key != NULL; param++) {
         switch (param->data_type) {
-            case OSSL_PARAM_INTEGER:
-            case OSSL_PARAM_UNSIGNED_INTEGER:
-            case OSSL_PARAM_REAL:
-                if (param->data != NULL) {
-                    OPENSSL_free(param->data);
-                }
-                break;
+        case OSSL_PARAM_INTEGER:
+        case OSSL_PARAM_UNSIGNED_INTEGER:
+        case OSSL_PARAM_REAL:
+            if (param->data != NULL) {
+                OPENSSL_free(param->data);
+            }
+            break;
         }
     }
 }
@@ -270,7 +269,7 @@ static OSSL_PARAM *fuzz_params(OSSL_PARAM *param, const uint8_t **buf, size_t *l
     for (p = param; p != NULL && p->key != NULL; p++)
         p_num++;
 
-    fuzzed_parameters = OPENSSL_zalloc(sizeof(OSSL_PARAM) *(p_num + 1));
+    fuzzed_parameters = OPENSSL_zalloc(sizeof(OSSL_PARAM) * (p_num + 1));
     p = fuzzed_parameters;
 
     for (; param != NULL && param->key != NULL; param++) {
@@ -391,8 +390,8 @@ static int do_evp_cipher(const EVP_CIPHER *evp_cipher, const OSSL_PARAM param[])
 {
     unsigned char outbuf[1024];
     int outlen, tmplen;
-    unsigned char key[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
-    unsigned char iv[] = {1, 2, 3, 4, 5, 6, 7, 8};
+    unsigned char key[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
+    unsigned char iv[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
     const char intext[] = "text";
     EVP_CIPHER_CTX *ctx;
 
@@ -409,7 +408,7 @@ static int do_evp_cipher(const EVP_CIPHER *evp_cipher, const OSSL_PARAM param[])
         return 0;
     }
 
-    if (!EVP_EncryptUpdate(ctx, outbuf, &outlen, (const unsigned char *) intext, strlen(intext))) {
+    if (!EVP_EncryptUpdate(ctx, outbuf, &outlen, (const unsigned char *)intext, strlen(intext))) {
         /* Error */
         EVP_CIPHER_CTX_free(ctx);
         return 0;
@@ -466,8 +465,8 @@ static int do_evp_mac(EVP_MAC *evp_mac, const OSSL_PARAM params[])
     size_t final_l;
 
     if ((ctx = EVP_MAC_CTX_new(evp_mac)) == NULL
-        || !EVP_MAC_init(ctx, (const unsigned char *) key, strlen(key),
-                         params)) {
+        || !EVP_MAC_init(ctx, (const unsigned char *)key, strlen(key),
+            params)) {
         r = 0;
         goto end;
     }
@@ -477,7 +476,7 @@ static int do_evp_mac(EVP_MAC *evp_mac, const OSSL_PARAM params[])
         goto end;
     }
 
-    if (!EVP_MAC_update(ctx, (unsigned char *) text, sizeof(text))) {
+    if (!EVP_MAC_update(ctx, (unsigned char *)text, sizeof(text))) {
         r = 0;
         goto end;
     }
@@ -578,18 +577,18 @@ static int do_evp_md(EVP_MD *evp_md, const OSSL_PARAM params[])
     return r;
 }
 
-#define EVP_FUZZ(source, evp, f) \
-    do { \
-        evp *alg = sk_##evp##_value(source, *algorithm % sk_##evp##_num(source)); \
-        OSSL_PARAM *fuzzed_params; \
-        \
-        if (alg == NULL) \
-            break; \
-        fuzzed_params = fuzz_params((OSSL_PARAM*) evp##_settable_ctx_params(alg), &buf, &len); \
-        if (fuzzed_params != NULL) \
-            f(alg, fuzzed_params); \
-        free_params(fuzzed_params); \
-        OSSL_PARAM_free(fuzzed_params); \
+#define EVP_FUZZ(source, evp, f)                                                               \
+    do {                                                                                       \
+        evp *alg = sk_##evp##_value(source, *algorithm % sk_##evp##_num(source));              \
+        OSSL_PARAM *fuzzed_params;                                                             \
+                                                                                               \
+        if (alg == NULL)                                                                       \
+            break;                                                                             \
+        fuzzed_params = fuzz_params((OSSL_PARAM *)evp##_settable_ctx_params(alg), &buf, &len); \
+        if (fuzzed_params != NULL)                                                             \
+            f(alg, fuzzed_params);                                                             \
+        free_params(fuzzed_params);                                                            \
+        OSSL_PARAM_free(fuzzed_params);                                                        \
     } while (0);
 
 int FuzzerTestOneInput(const uint8_t *buf, size_t len)
diff --git a/fuzz/quic-client.c b/fuzz/quic-client.c
index 9c20869abefa6..42716148e25bd 100644
--- a/fuzz/quic-client.c
+++ b/fuzz/quic-client.c
@@ -43,23 +43,23 @@ int FuzzerInitialize(int *argc, char ***argv)
     return 1;
 }
 
-#define HANDSHAKING      0
-#define READING          1
-#define WRITING          2
+#define HANDSHAKING 0
+#define READING 1
+#define WRITING 2
 #define ACCEPTING_STREAM 3
-#define CREATING_STREAM  4
-#define SWAPPING_STREAM  5
+#define CREATING_STREAM 4
+#define SWAPPING_STREAM 5
 
 int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 {
     SSL *client = NULL, *stream = NULL;
-    SSL *allstreams[] = {NULL, NULL, NULL, NULL};
+    SSL *allstreams[] = { NULL, NULL, NULL, NULL };
     size_t i, thisstream = 0, numstreams = 1;
     BIO *in;
     BIO *out;
     SSL_CTX *ctx;
     BIO_ADDR *peer_addr = NULL;
-    struct in_addr ina = {0};
+    struct in_addr ina = { 0 };
     struct timeval tv;
     int state = HANDSHAKING;
     uint8_t tmp[1024];
@@ -88,7 +88,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     ina.s_addr = htonl(0x7f000001UL);
 
     if (!BIO_ADDR_rawmake(peer_addr, AF_INET, &ina, sizeof(ina), htons(4433)))
-       goto end;
+        goto end;
 
     SSL_set_tlsext_host_name(client, "localhost");
     in = BIO_new(BIO_s_dgram_mem());
@@ -112,8 +112,8 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     SSL_set_connect_state(client);
 
     if (!SSL_set_incoming_stream_policy(client,
-                                        SSL_INCOMING_STREAM_POLICY_ACCEPT,
-                                        0))
+            SSL_INCOMING_STREAM_POLICY_ACCEPT,
+            0))
         goto end;
 
     allstreams[0] = stream = client;
@@ -178,11 +178,11 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
                 state = READING;
                 ret = 1;
                 if (numstreams == OSSL_NELEM(allstreams)
-                        || SSL_get_accept_stream_queue_len(client) == 0)
+                    || SSL_get_accept_stream_queue_len(client) == 0)
                     break;
                 thisstream = numstreams;
                 stream = allstreams[numstreams++]
-                        = SSL_accept_stream(client, 0);
+                    = SSL_accept_stream(client, 0);
                 if (stream == NULL)
                     goto end;
                 break;
@@ -232,7 +232,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
                 break;
             } else {
                 nxttimeout = ossl_time_add(fake_now,
-                                           ossl_time_from_timeval(tv));
+                    ossl_time_from_timeval(tv));
                 if (len > 3 && ossl_time_compare(nxttimeout, nxtpkt) >= 0) {
                     fake_now = nxtpkt;
                     break;
@@ -249,11 +249,11 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
             break;
 
         if (size > 0)
-            BIO_write(in, buf+2, size);
+            BIO_write(in, buf + 2, size);
         len -= size + 2;
         buf += size + 2;
     }
- end:
+end:
     for (i = 0; i < numstreams; i++)
         SSL_free(allstreams[i]);
     ERR_clear_error();
diff --git a/fuzz/quic-lcidm.c b/fuzz/quic-lcidm.c
index 4c206e631f971..49a2a2dc474f2 100644
--- a/fuzz/quic-lcidm.c
+++ b/fuzz/quic-lcidm.c
@@ -48,7 +48,7 @@ enum {
     CMD_LOOKUP
 };
 
-#define MAX_CMDS    10000
+#define MAX_CMDS 5000
 
 static int get_cid(PACKET *pkt, QUIC_CONN_ID *cid)
 {
@@ -106,7 +106,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
             }
 
             ossl_quic_lcidm_enrol_odcid(lcidm, (void *)(uintptr_t)arg_opaque,
-                                        &arg_cid);
+                &arg_cid);
             break;
 
         case CMD_RETIRE_ODCID:
@@ -125,7 +125,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
             }
 
             ossl_quic_lcidm_generate_initial(lcidm, (void *)(uintptr_t)arg_opaque,
-                                             &cid_out);
+                &cid_out);
             break;
 
         case CMD_GENERATE:
@@ -135,7 +135,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
             }
 
             ossl_quic_lcidm_generate(lcidm, (void *)(uintptr_t)arg_opaque,
-                                     &ncid_frame);
+                &ncid_frame);
             break;
 
         case CMD_RETIRE:
@@ -146,9 +146,9 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
             }
 
             ossl_quic_lcidm_retire(lcidm, (void *)(uintptr_t)arg_opaque,
-                                   arg_retire_prior_to,
-                                   NULL, &cid_out,
-                                   &seq_num_out, &did_retire);
+                arg_retire_prior_to,
+                NULL, &cid_out,
+                &seq_num_out, &did_retire);
             break;
 
         case CMD_CULL:
diff --git a/fuzz/quic-server.c b/fuzz/quic-server.c
index 881f4585a3a3a..d9677b826f554 100644
--- a/fuzz/quic-server.c
+++ b/fuzz/quic-server.c
@@ -43,20 +43,20 @@ int FuzzerInitialize(int *argc, char ***argv)
     return 1;
 }
 
-#define HANDSHAKING      0
-#define READING          1
-#define WRITING          2
+#define HANDSHAKING 0
+#define READING 1
+#define WRITING 2
 #define ACCEPTING_STREAM 3
-#define CREATING_STREAM  4
-#define SWAPPING_STREAM  5
+#define CREATING_STREAM 4
+#define SWAPPING_STREAM 5
 
 /*
  * This callback validates and negotiates the desired ALPN on the server side.
  * Accept any ALPN.
  */
 static int select_alpn(SSL *ssl, const unsigned char **out,
-                       unsigned char *out_len, const unsigned char *in,
-                       unsigned int in_len, void *arg)
+    unsigned char *out_len, const unsigned char *in,
+    unsigned int in_len, void *arg)
 {
     return SSL_TLSEXT_ERR_OK;
 }
@@ -64,7 +64,7 @@ static int select_alpn(SSL *ssl, const unsigned char **out,
 int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 {
     SSL *server = NULL, *stream = NULL;
-    SSL *allstreams[] = {NULL, NULL, NULL, NULL};
+    SSL *allstreams[] = { NULL, NULL, NULL, NULL };
     size_t i, thisstream = 0, numstreams = 1;
     BIO *in;
     BIO *out;
@@ -169,7 +169,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
                 state = READING;
                 ret = 1;
                 if (numstreams == OSSL_NELEM(allstreams)
-                        || SSL_get_accept_stream_queue_len(server) == 0)
+                    || SSL_get_accept_stream_queue_len(server) == 0)
                     break;
                 thisstream = numstreams;
                 stream = allstreams[numstreams++] = SSL_accept_stream(server, 0);
@@ -222,7 +222,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
                 break;
             } else {
                 nxttimeout = ossl_time_add(fake_now,
-                                           ossl_time_from_timeval(tv));
+                    ossl_time_from_timeval(tv));
                 if (len > 3 && ossl_time_compare(nxttimeout, nxtpkt) >= 0) {
                     fake_now = nxtpkt;
                     break;
@@ -243,7 +243,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
         len -= size + 2;
         buf += size + 2;
     }
- end:
+end:
     for (i = 0; i < numstreams; i++)
         SSL_free(allstreams[i]);
     ERR_clear_error();
diff --git a/fuzz/quic-srtm.c b/fuzz/quic-srtm.c
index 9bb5db5d81a8f..a7897da710372 100644
--- a/fuzz/quic-srtm.c
+++ b/fuzz/quic-srtm.c
@@ -74,11 +74,11 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
             if (!PACKET_get_net_8(&pkt, &arg_opaque)
                 || !PACKET_get_net_8(&pkt, &arg_seq_num)
                 || !PACKET_copy_bytes(&pkt, arg_token.token,
-                                      sizeof(arg_token.token)))
+                    sizeof(arg_token.token)))
                 continue; /* just stop */
 
             ossl_quic_srtm_add(srtm, (void *)(uintptr_t)arg_opaque,
-                               arg_seq_num, &arg_token);
+                arg_seq_num, &arg_token);
             ossl_quic_srtm_check(srtm);
             break;
 
@@ -88,7 +88,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
                 continue; /* just stop */
 
             ossl_quic_srtm_remove(srtm, (void *)(uintptr_t)arg_opaque,
-                                  arg_seq_num);
+                arg_seq_num);
             ossl_quic_srtm_check(srtm);
             break;
 
@@ -102,12 +102,12 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 
         case CMD_LOOKUP:
             if (!PACKET_copy_bytes(&pkt, arg_token.token,
-                                   sizeof(arg_token.token))
+                    sizeof(arg_token.token))
                 || !PACKET_get_net_8(&pkt, &arg_idx))
                 continue; /* just stop */
 
             ossl_quic_srtm_lookup(srtm, &arg_token, (size_t)arg_idx,
-                                  NULL, NULL);
+                NULL, NULL);
             ossl_quic_srtm_check(srtm);
             break;
 
diff --git a/fuzz/server.c b/fuzz/server.c
index d058f1c2d8b38..ea3392f0d57a4 100644
--- a/fuzz/server.c
+++ b/fuzz/server.c
@@ -26,180 +26,1979 @@
 #include "fuzzer.h"
 
 static const uint8_t kCertificateDER[] = {
-    0x30, 0x82, 0x02, 0xff, 0x30, 0x82, 0x01, 0xe7, 0xa0, 0x03, 0x02, 0x01,
-    0x02, 0x02, 0x11, 0x00, 0xb1, 0x84, 0xee, 0x34, 0x99, 0x98, 0x76, 0xfb,
-    0x6f, 0xb2, 0x15, 0xc8, 0x47, 0x79, 0x05, 0x9b, 0x30, 0x0d, 0x06, 0x09,
-    0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30,
-    0x12, 0x31, 0x10, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x07,
-    0x41, 0x63, 0x6d, 0x65, 0x20, 0x43, 0x6f, 0x30, 0x1e, 0x17, 0x0d, 0x31,
-    0x35, 0x31, 0x31, 0x30, 0x37, 0x30, 0x30, 0x32, 0x34, 0x35, 0x36, 0x5a,
-    0x17, 0x0d, 0x31, 0x36, 0x31, 0x31, 0x30, 0x36, 0x30, 0x30, 0x32, 0x34,
-    0x35, 0x36, 0x5a, 0x30, 0x12, 0x31, 0x10, 0x30, 0x0e, 0x06, 0x03, 0x55,
-    0x04, 0x0a, 0x13, 0x07, 0x41, 0x63, 0x6d, 0x65, 0x20, 0x43, 0x6f, 0x30,
-    0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7,
-    0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30,
-    0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xce, 0x47, 0xcb, 0x11,
-    0xbb, 0xd2, 0x9d, 0x8e, 0x9e, 0xd2, 0x1e, 0x14, 0xaf, 0xc7, 0xea, 0xb6,
-    0xc9, 0x38, 0x2a, 0x6f, 0xb3, 0x7e, 0xfb, 0xbc, 0xfc, 0x59, 0x42, 0xb9,
-    0x56, 0xf0, 0x4c, 0x3f, 0xf7, 0x31, 0x84, 0xbe, 0xac, 0x03, 0x9e, 0x71,
-    0x91, 0x85, 0xd8, 0x32, 0xbd, 0x00, 0xea, 0xac, 0x65, 0xf6, 0x03, 0xc8,
-    0x0f, 0x8b, 0xfd, 0x6e, 0x58, 0x88, 0x04, 0x41, 0x92, 0x74, 0xa6, 0x57,
-    0x2e, 0x8e, 0x88, 0xd5, 0x3d, 0xda, 0x14, 0x3e, 0x63, 0x88, 0x22, 0xe3,
-    0x53, 0xe9, 0xba, 0x39, 0x09, 0xac, 0xfb, 0xd0, 0x4c, 0xf2, 0x3c, 0x20,
-    0xd6, 0x97, 0xe6, 0xed, 0xf1, 0x62, 0x1e, 0xe5, 0xc9, 0x48, 0xa0, 0xca,
-    0x2e, 0x3c, 0x14, 0x5a, 0x82, 0xd4, 0xed, 0xb1, 0xe3, 0x43, 0xc1, 0x2a,
-    0x59, 0xa5, 0xb9, 0xc8, 0x48, 0xa7, 0x39, 0x23, 0x74, 0xa7, 0x37, 0xb0,
-    0x6f, 0xc3, 0x64, 0x99, 0x6c, 0xa2, 0x82, 0xc8, 0xf6, 0xdb, 0x86, 0x40,
-    0xce, 0xd1, 0x85, 0x9f, 0xce, 0x69, 0xf4, 0x15, 0x2a, 0x23, 0xca, 0xea,
-    0xb7, 0x7b, 0xdf, 0xfb, 0x43, 0x5f, 0xff, 0x7a, 0x49, 0x49, 0x0e, 0xe7,
-    0x02, 0x51, 0x45, 0x13, 0xe8, 0x90, 0x64, 0x21, 0x0c, 0x26, 0x2b, 0x5d,
-    0xfc, 0xe4, 0xb5, 0x86, 0x89, 0x43, 0x22, 0x4c, 0xf3, 0x3b, 0xf3, 0x09,
-    0xc4, 0xa4, 0x10, 0x80, 0xf2, 0x46, 0xe2, 0x46, 0x8f, 0x76, 0x50, 0xbf,
-    0xaf, 0x2b, 0x90, 0x1b, 0x78, 0xc7, 0xcf, 0xc1, 0x77, 0xd0, 0xfb, 0xa9,
-    0xfb, 0xc9, 0x66, 0x5a, 0xc5, 0x9b, 0x31, 0x41, 0x67, 0x01, 0xbe, 0x33,
-    0x10, 0xba, 0x05, 0x58, 0xed, 0x76, 0x53, 0xde, 0x5d, 0xc1, 0xe8, 0xbb,
-    0x9f, 0xf1, 0xcd, 0xfb, 0xdf, 0x64, 0x7f, 0xd7, 0x18, 0xab, 0x0f, 0x94,
-    0x28, 0x95, 0x4a, 0xcc, 0x6a, 0xa9, 0x50, 0xc7, 0x05, 0x47, 0x10, 0x41,
-    0x02, 0x03, 0x01, 0x00, 0x01, 0xa3, 0x50, 0x30, 0x4e, 0x30, 0x0e, 0x06,
-    0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x05,
-    0xa0, 0x30, 0x13, 0x06, 0x03, 0x55, 0x1d, 0x25, 0x04, 0x0c, 0x30, 0x0a,
-    0x06, 0x08, 0x2b, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01, 0x30, 0x0c,
-    0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00,
-    0x30, 0x19, 0x06, 0x03, 0x55, 0x1d, 0x11, 0x04, 0x12, 0x30, 0x10, 0x82,
-    0x0e, 0x66, 0x75, 0x7a, 0x7a, 0x2e, 0x62, 0x6f, 0x72, 0x69, 0x6e, 0x67,
-    0x73, 0x73, 0x6c, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7,
-    0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x92,
-    0xde, 0xef, 0x96, 0x06, 0x7b, 0xff, 0x71, 0x7d, 0x4e, 0xa0, 0x7d, 0xae,
-    0xb8, 0x22, 0xb4, 0x2c, 0xf7, 0x96, 0x9c, 0x37, 0x1d, 0x8f, 0xe7, 0xd9,
-    0x47, 0xff, 0x3f, 0xe9, 0x35, 0x95, 0x0e, 0xdd, 0xdc, 0x7f, 0xc8, 0x8a,
-    0x1e, 0x36, 0x1d, 0x38, 0x47, 0xfc, 0x76, 0xd2, 0x1f, 0x98, 0xa1, 0x36,
-    0xac, 0xc8, 0x70, 0x38, 0x0a, 0x3d, 0x51, 0x8d, 0x0f, 0x03, 0x1b, 0xef,
-    0x62, 0xa1, 0xcb, 0x2b, 0x4a, 0x8c, 0x12, 0x2b, 0x54, 0x50, 0x9a, 0x6b,
-    0xfe, 0xaf, 0xd9, 0xf6, 0xbf, 0x58, 0x11, 0x58, 0x5e, 0xe5, 0x86, 0x1e,
-    0x3b, 0x6b, 0x30, 0x7e, 0x72, 0x89, 0xe8, 0x6b, 0x7b, 0xb7, 0xaf, 0xef,
-    0x8b, 0xa9, 0x3e, 0xb0, 0xcd, 0x0b, 0xef, 0xb0, 0x0c, 0x96, 0x2b, 0xc5,
-    0x3b, 0xd5, 0xf1, 0xc2, 0xae, 0x3a, 0x60, 0xd9, 0x0f, 0x75, 0x37, 0x55,
-    0x4d, 0x62, 0xd2, 0xed, 0x96, 0xac, 0x30, 0x6b, 0xda, 0xa1, 0x48, 0x17,
-    0x96, 0x23, 0x85, 0x9a, 0x57, 0x77, 0xe9, 0x22, 0xa2, 0x37, 0x03, 0xba,
-    0x49, 0x77, 0x40, 0x3b, 0x76, 0x4b, 0xda, 0xc1, 0x04, 0x57, 0x55, 0x34,
-    0x22, 0x83, 0x45, 0x29, 0xab, 0x2e, 0x11, 0xff, 0x0d, 0xab, 0x55, 0xb1,
-    0xa7, 0x58, 0x59, 0x05, 0x25, 0xf9, 0x1e, 0x3d, 0xb7, 0xac, 0x04, 0x39,
-    0x2c, 0xf9, 0xaf, 0xb8, 0x68, 0xfb, 0x8e, 0x35, 0x71, 0x32, 0xff, 0x70,
-    0xe9, 0x46, 0x6d, 0x5c, 0x06, 0x90, 0x88, 0x23, 0x48, 0x0c, 0x50, 0xeb,
-    0x0a, 0xa9, 0xae, 0xe8, 0xfc, 0xbe, 0xa5, 0x76, 0x94, 0xd7, 0x64, 0x22,
-    0x38, 0x98, 0x17, 0xa4, 0x3a, 0xa7, 0x59, 0x9f, 0x1d, 0x3b, 0x75, 0x90,
-    0x1a, 0x81, 0xef, 0x19, 0xfb, 0x2b, 0xb7, 0xa7, 0x64, 0x61, 0x22, 0xa4,
-    0x6f, 0x7b, 0xfa, 0x58, 0xbb, 0x8c, 0x4e, 0x77, 0x67, 0xd0, 0x5d, 0x58,
-    0x76, 0x8a, 0xbb,
+    0x30,
+    0x82,
+    0x02,
+    0xff,
+    0x30,
+    0x82,
+    0x01,
+    0xe7,
+    0xa0,
+    0x03,
+    0x02,
+    0x01,
+    0x02,
+    0x02,
+    0x11,
+    0x00,
+    0xb1,
+    0x84,
+    0xee,
+    0x34,
+    0x99,
+    0x98,
+    0x76,
+    0xfb,
+    0x6f,
+    0xb2,
+    0x15,
+    0xc8,
+    0x47,
+    0x79,
+    0x05,
+    0x9b,
+    0x30,
+    0x0d,
+    0x06,
+    0x09,
+    0x2a,
+    0x86,
+    0x48,
+    0x86,
+    0xf7,
+    0x0d,
+    0x01,
+    0x01,
+    0x0b,
+    0x05,
+    0x00,
+    0x30,
+    0x12,
+    0x31,
+    0x10,
+    0x30,
+    0x0e,
+    0x06,
+    0x03,
+    0x55,
+    0x04,
+    0x0a,
+    0x13,
+    0x07,
+    0x41,
+    0x63,
+    0x6d,
+    0x65,
+    0x20,
+    0x43,
+    0x6f,
+    0x30,
+    0x1e,
+    0x17,
+    0x0d,
+    0x31,
+    0x35,
+    0x31,
+    0x31,
+    0x30,
+    0x37,
+    0x30,
+    0x30,
+    0x32,
+    0x34,
+    0x35,
+    0x36,
+    0x5a,
+    0x17,
+    0x0d,
+    0x31,
+    0x36,
+    0x31,
+    0x31,
+    0x30,
+    0x36,
+    0x30,
+    0x30,
+    0x32,
+    0x34,
+    0x35,
+    0x36,
+    0x5a,
+    0x30,
+    0x12,
+    0x31,
+    0x10,
+    0x30,
+    0x0e,
+    0x06,
+    0x03,
+    0x55,
+    0x04,
+    0x0a,
+    0x13,
+    0x07,
+    0x41,
+    0x63,
+    0x6d,
+    0x65,
+    0x20,
+    0x43,
+    0x6f,
+    0x30,
+    0x82,
+    0x01,
+    0x22,
+    0x30,
+    0x0d,
+    0x06,
+    0x09,
+    0x2a,
+    0x86,
+    0x48,
+    0x86,
+    0xf7,
+    0x0d,
+    0x01,
+    0x01,
+    0x01,
+    0x05,
+    0x00,
+    0x03,
+    0x82,
+    0x01,
+    0x0f,
+    0x00,
+    0x30,
+    0x82,
+    0x01,
+    0x0a,
+    0x02,
+    0x82,
+    0x01,
+    0x01,
+    0x00,
+    0xce,
+    0x47,
+    0xcb,
+    0x11,
+    0xbb,
+    0xd2,
+    0x9d,
+    0x8e,
+    0x9e,
+    0xd2,
+    0x1e,
+    0x14,
+    0xaf,
+    0xc7,
+    0xea,
+    0xb6,
+    0xc9,
+    0x38,
+    0x2a,
+    0x6f,
+    0xb3,
+    0x7e,
+    0xfb,
+    0xbc,
+    0xfc,
+    0x59,
+    0x42,
+    0xb9,
+    0x56,
+    0xf0,
+    0x4c,
+    0x3f,
+    0xf7,
+    0x31,
+    0x84,
+    0xbe,
+    0xac,
+    0x03,
+    0x9e,
+    0x71,
+    0x91,
+    0x85,
+    0xd8,
+    0x32,
+    0xbd,
+    0x00,
+    0xea,
+    0xac,
+    0x65,
+    0xf6,
+    0x03,
+    0xc8,
+    0x0f,
+    0x8b,
+    0xfd,
+    0x6e,
+    0x58,
+    0x88,
+    0x04,
+    0x41,
+    0x92,
+    0x74,
+    0xa6,
+    0x57,
+    0x2e,
+    0x8e,
+    0x88,
+    0xd5,
+    0x3d,
+    0xda,
+    0x14,
+    0x3e,
+    0x63,
+    0x88,
+    0x22,
+    0xe3,
+    0x53,
+    0xe9,
+    0xba,
+    0x39,
+    0x09,
+    0xac,
+    0xfb,
+    0xd0,
+    0x4c,
+    0xf2,
+    0x3c,
+    0x20,
+    0xd6,
+    0x97,
+    0xe6,
+    0xed,
+    0xf1,
+    0x62,
+    0x1e,
+    0xe5,
+    0xc9,
+    0x48,
+    0xa0,
+    0xca,
+    0x2e,
+    0x3c,
+    0x14,
+    0x5a,
+    0x82,
+    0xd4,
+    0xed,
+    0xb1,
+    0xe3,
+    0x43,
+    0xc1,
+    0x2a,
+    0x59,
+    0xa5,
+    0xb9,
+    0xc8,
+    0x48,
+    0xa7,
+    0x39,
+    0x23,
+    0x74,
+    0xa7,
+    0x37,
+    0xb0,
+    0x6f,
+    0xc3,
+    0x64,
+    0x99,
+    0x6c,
+    0xa2,
+    0x82,
+    0xc8,
+    0xf6,
+    0xdb,
+    0x86,
+    0x40,
+    0xce,
+    0xd1,
+    0x85,
+    0x9f,
+    0xce,
+    0x69,
+    0xf4,
+    0x15,
+    0x2a,
+    0x23,
+    0xca,
+    0xea,
+    0xb7,
+    0x7b,
+    0xdf,
+    0xfb,
+    0x43,
+    0x5f,
+    0xff,
+    0x7a,
+    0x49,
+    0x49,
+    0x0e,
+    0xe7,
+    0x02,
+    0x51,
+    0x45,
+    0x13,
+    0xe8,
+    0x90,
+    0x64,
+    0x21,
+    0x0c,
+    0x26,
+    0x2b,
+    0x5d,
+    0xfc,
+    0xe4,
+    0xb5,
+    0x86,
+    0x89,
+    0x43,
+    0x22,
+    0x4c,
+    0xf3,
+    0x3b,
+    0xf3,
+    0x09,
+    0xc4,
+    0xa4,
+    0x10,
+    0x80,
+    0xf2,
+    0x46,
+    0xe2,
+    0x46,
+    0x8f,
+    0x76,
+    0x50,
+    0xbf,
+    0xaf,
+    0x2b,
+    0x90,
+    0x1b,
+    0x78,
+    0xc7,
+    0xcf,
+    0xc1,
+    0x77,
+    0xd0,
+    0xfb,
+    0xa9,
+    0xfb,
+    0xc9,
+    0x66,
+    0x5a,
+    0xc5,
+    0x9b,
+    0x31,
+    0x41,
+    0x67,
+    0x01,
+    0xbe,
+    0x33,
+    0x10,
+    0xba,
+    0x05,
+    0x58,
+    0xed,
+    0x76,
+    0x53,
+    0xde,
+    0x5d,
+    0xc1,
+    0xe8,
+    0xbb,
+    0x9f,
+    0xf1,
+    0xcd,
+    0xfb,
+    0xdf,
+    0x64,
+    0x7f,
+    0xd7,
+    0x18,
+    0xab,
+    0x0f,
+    0x94,
+    0x28,
+    0x95,
+    0x4a,
+    0xcc,
+    0x6a,
+    0xa9,
+    0x50,
+    0xc7,
+    0x05,
+    0x47,
+    0x10,
+    0x41,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0xa3,
+    0x50,
+    0x30,
+    0x4e,
+    0x30,
+    0x0e,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x0f,
+    0x01,
+    0x01,
+    0xff,
+    0x04,
+    0x04,
+    0x03,
+    0x02,
+    0x05,
+    0xa0,
+    0x30,
+    0x13,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x25,
+    0x04,
+    0x0c,
+    0x30,
+    0x0a,
+    0x06,
+    0x08,
+    0x2b,
+    0x06,
+    0x01,
+    0x05,
+    0x05,
+    0x07,
+    0x03,
+    0x01,
+    0x30,
+    0x0c,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x13,
+    0x01,
+    0x01,
+    0xff,
+    0x04,
+    0x02,
+    0x30,
+    0x00,
+    0x30,
+    0x19,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x11,
+    0x04,
+    0x12,
+    0x30,
+    0x10,
+    0x82,
+    0x0e,
+    0x66,
+    0x75,
+    0x7a,
+    0x7a,
+    0x2e,
+    0x62,
+    0x6f,
+    0x72,
+    0x69,
+    0x6e,
+    0x67,
+    0x73,
+    0x73,
+    0x6c,
+    0x30,
+    0x0d,
+    0x06,
+    0x09,
+    0x2a,
+    0x86,
+    0x48,
+    0x86,
+    0xf7,
+    0x0d,
+    0x01,
+    0x01,
+    0x0b,
+    0x05,
+    0x00,
+    0x03,
+    0x82,
+    0x01,
+    0x01,
+    0x00,
+    0x92,
+    0xde,
+    0xef,
+    0x96,
+    0x06,
+    0x7b,
+    0xff,
+    0x71,
+    0x7d,
+    0x4e,
+    0xa0,
+    0x7d,
+    0xae,
+    0xb8,
+    0x22,
+    0xb4,
+    0x2c,
+    0xf7,
+    0x96,
+    0x9c,
+    0x37,
+    0x1d,
+    0x8f,
+    0xe7,
+    0xd9,
+    0x47,
+    0xff,
+    0x3f,
+    0xe9,
+    0x35,
+    0x95,
+    0x0e,
+    0xdd,
+    0xdc,
+    0x7f,
+    0xc8,
+    0x8a,
+    0x1e,
+    0x36,
+    0x1d,
+    0x38,
+    0x47,
+    0xfc,
+    0x76,
+    0xd2,
+    0x1f,
+    0x98,
+    0xa1,
+    0x36,
+    0xac,
+    0xc8,
+    0x70,
+    0x38,
+    0x0a,
+    0x3d,
+    0x51,
+    0x8d,
+    0x0f,
+    0x03,
+    0x1b,
+    0xef,
+    0x62,
+    0xa1,
+    0xcb,
+    0x2b,
+    0x4a,
+    0x8c,
+    0x12,
+    0x2b,
+    0x54,
+    0x50,
+    0x9a,
+    0x6b,
+    0xfe,
+    0xaf,
+    0xd9,
+    0xf6,
+    0xbf,
+    0x58,
+    0x11,
+    0x58,
+    0x5e,
+    0xe5,
+    0x86,
+    0x1e,
+    0x3b,
+    0x6b,
+    0x30,
+    0x7e,
+    0x72,
+    0x89,
+    0xe8,
+    0x6b,
+    0x7b,
+    0xb7,
+    0xaf,
+    0xef,
+    0x8b,
+    0xa9,
+    0x3e,
+    0xb0,
+    0xcd,
+    0x0b,
+    0xef,
+    0xb0,
+    0x0c,
+    0x96,
+    0x2b,
+    0xc5,
+    0x3b,
+    0xd5,
+    0xf1,
+    0xc2,
+    0xae,
+    0x3a,
+    0x60,
+    0xd9,
+    0x0f,
+    0x75,
+    0x37,
+    0x55,
+    0x4d,
+    0x62,
+    0xd2,
+    0xed,
+    0x96,
+    0xac,
+    0x30,
+    0x6b,
+    0xda,
+    0xa1,
+    0x48,
+    0x17,
+    0x96,
+    0x23,
+    0x85,
+    0x9a,
+    0x57,
+    0x77,
+    0xe9,
+    0x22,
+    0xa2,
+    0x37,
+    0x03,
+    0xba,
+    0x49,
+    0x77,
+    0x40,
+    0x3b,
+    0x76,
+    0x4b,
+    0xda,
+    0xc1,
+    0x04,
+    0x57,
+    0x55,
+    0x34,
+    0x22,
+    0x83,
+    0x45,
+    0x29,
+    0xab,
+    0x2e,
+    0x11,
+    0xff,
+    0x0d,
+    0xab,
+    0x55,
+    0xb1,
+    0xa7,
+    0x58,
+    0x59,
+    0x05,
+    0x25,
+    0xf9,
+    0x1e,
+    0x3d,
+    0xb7,
+    0xac,
+    0x04,
+    0x39,
+    0x2c,
+    0xf9,
+    0xaf,
+    0xb8,
+    0x68,
+    0xfb,
+    0x8e,
+    0x35,
+    0x71,
+    0x32,
+    0xff,
+    0x70,
+    0xe9,
+    0x46,
+    0x6d,
+    0x5c,
+    0x06,
+    0x90,
+    0x88,
+    0x23,
+    0x48,
+    0x0c,
+    0x50,
+    0xeb,
+    0x0a,
+    0xa9,
+    0xae,
+    0xe8,
+    0xfc,
+    0xbe,
+    0xa5,
+    0x76,
+    0x94,
+    0xd7,
+    0x64,
+    0x22,
+    0x38,
+    0x98,
+    0x17,
+    0xa4,
+    0x3a,
+    0xa7,
+    0x59,
+    0x9f,
+    0x1d,
+    0x3b,
+    0x75,
+    0x90,
+    0x1a,
+    0x81,
+    0xef,
+    0x19,
+    0xfb,
+    0x2b,
+    0xb7,
+    0xa7,
+    0x64,
+    0x61,
+    0x22,
+    0xa4,
+    0x6f,
+    0x7b,
+    0xfa,
+    0x58,
+    0xbb,
+    0x8c,
+    0x4e,
+    0x77,
+    0x67,
+    0xd0,
+    0x5d,
+    0x58,
+    0x76,
+    0x8a,
+    0xbb,
 };
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 static const uint8_t kRSAPrivateKeyDER[] = {
-    0x30, 0x82, 0x04, 0xa5, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00,
-    0xce, 0x47, 0xcb, 0x11, 0xbb, 0xd2, 0x9d, 0x8e, 0x9e, 0xd2, 0x1e, 0x14,
-    0xaf, 0xc7, 0xea, 0xb6, 0xc9, 0x38, 0x2a, 0x6f, 0xb3, 0x7e, 0xfb, 0xbc,
-    0xfc, 0x59, 0x42, 0xb9, 0x56, 0xf0, 0x4c, 0x3f, 0xf7, 0x31, 0x84, 0xbe,
-    0xac, 0x03, 0x9e, 0x71, 0x91, 0x85, 0xd8, 0x32, 0xbd, 0x00, 0xea, 0xac,
-    0x65, 0xf6, 0x03, 0xc8, 0x0f, 0x8b, 0xfd, 0x6e, 0x58, 0x88, 0x04, 0x41,
-    0x92, 0x74, 0xa6, 0x57, 0x2e, 0x8e, 0x88, 0xd5, 0x3d, 0xda, 0x14, 0x3e,
-    0x63, 0x88, 0x22, 0xe3, 0x53, 0xe9, 0xba, 0x39, 0x09, 0xac, 0xfb, 0xd0,
-    0x4c, 0xf2, 0x3c, 0x20, 0xd6, 0x97, 0xe6, 0xed, 0xf1, 0x62, 0x1e, 0xe5,
-    0xc9, 0x48, 0xa0, 0xca, 0x2e, 0x3c, 0x14, 0x5a, 0x82, 0xd4, 0xed, 0xb1,
-    0xe3, 0x43, 0xc1, 0x2a, 0x59, 0xa5, 0xb9, 0xc8, 0x48, 0xa7, 0x39, 0x23,
-    0x74, 0xa7, 0x37, 0xb0, 0x6f, 0xc3, 0x64, 0x99, 0x6c, 0xa2, 0x82, 0xc8,
-    0xf6, 0xdb, 0x86, 0x40, 0xce, 0xd1, 0x85, 0x9f, 0xce, 0x69, 0xf4, 0x15,
-    0x2a, 0x23, 0xca, 0xea, 0xb7, 0x7b, 0xdf, 0xfb, 0x43, 0x5f, 0xff, 0x7a,
-    0x49, 0x49, 0x0e, 0xe7, 0x02, 0x51, 0x45, 0x13, 0xe8, 0x90, 0x64, 0x21,
-    0x0c, 0x26, 0x2b, 0x5d, 0xfc, 0xe4, 0xb5, 0x86, 0x89, 0x43, 0x22, 0x4c,
-    0xf3, 0x3b, 0xf3, 0x09, 0xc4, 0xa4, 0x10, 0x80, 0xf2, 0x46, 0xe2, 0x46,
-    0x8f, 0x76, 0x50, 0xbf, 0xaf, 0x2b, 0x90, 0x1b, 0x78, 0xc7, 0xcf, 0xc1,
-    0x77, 0xd0, 0xfb, 0xa9, 0xfb, 0xc9, 0x66, 0x5a, 0xc5, 0x9b, 0x31, 0x41,
-    0x67, 0x01, 0xbe, 0x33, 0x10, 0xba, 0x05, 0x58, 0xed, 0x76, 0x53, 0xde,
-    0x5d, 0xc1, 0xe8, 0xbb, 0x9f, 0xf1, 0xcd, 0xfb, 0xdf, 0x64, 0x7f, 0xd7,
-    0x18, 0xab, 0x0f, 0x94, 0x28, 0x95, 0x4a, 0xcc, 0x6a, 0xa9, 0x50, 0xc7,
-    0x05, 0x47, 0x10, 0x41, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02, 0x82, 0x01,
-    0x01, 0x00, 0xa8, 0x47, 0xb9, 0x4a, 0x06, 0x47, 0x93, 0x71, 0x3d, 0xef,
-    0x7b, 0xca, 0xb4, 0x7c, 0x0a, 0xe6, 0x82, 0xd0, 0xe7, 0x0d, 0xa9, 0x08,
-    0xf6, 0xa4, 0xfd, 0xd8, 0x73, 0xae, 0x6f, 0x56, 0x29, 0x5e, 0x25, 0x72,
-    0xa8, 0x30, 0x44, 0x73, 0xcf, 0x56, 0x26, 0xb9, 0x61, 0xde, 0x42, 0x81,
-    0xf4, 0xf0, 0x1f, 0x5d, 0xcb, 0x47, 0xf2, 0x26, 0xe9, 0xe0, 0x93, 0x28,
-    0xa3, 0x10, 0x3b, 0x42, 0x1e, 0x51, 0x11, 0x12, 0x06, 0x5e, 0xaf, 0xce,
-    0xb0, 0xa5, 0x14, 0xdd, 0x82, 0x58, 0xa1, 0xa4, 0x12, 0xdf, 0x65, 0x1d,
-    0x51, 0x70, 0x64, 0xd5, 0x58, 0x68, 0x11, 0xa8, 0x6a, 0x23, 0xc2, 0xbf,
-    0xa1, 0x25, 0x24, 0x47, 0xb3, 0xa4, 0x3c, 0x83, 0x96, 0xb7, 0x1f, 0xf4,
-    0x44, 0xd4, 0xd1, 0xe9, 0xfc, 0x33, 0x68, 0x5e, 0xe2, 0x68, 0x99, 0x9c,
-    0x91, 0xe8, 0x72, 0xc9, 0xd7, 0x8c, 0x80, 0x20, 0x8e, 0x77, 0x83, 0x4d,
-    0xe4, 0xab, 0xf9, 0x74, 0xa1, 0xdf, 0xd3, 0xc0, 0x0d, 0x5b, 0x05, 0x51,
-    0xc2, 0x6f, 0xb2, 0x91, 0x02, 0xec, 0xc0, 0x02, 0x1a, 0x5c, 0x91, 0x05,
-    0xf1, 0xe3, 0xfa, 0x65, 0xc2, 0xad, 0x24, 0xe6, 0xe5, 0x3c, 0xb6, 0x16,
-    0xf1, 0xa1, 0x67, 0x1a, 0x9d, 0x37, 0x56, 0xbf, 0x01, 0xd7, 0x3b, 0x35,
-    0x30, 0x57, 0x73, 0xf4, 0xf0, 0x5e, 0xa7, 0xe8, 0x0a, 0xc1, 0x94, 0x17,
-    0xcf, 0x0a, 0xbd, 0xf5, 0x31, 0xa7, 0x2d, 0xf7, 0xf5, 0xd9, 0x8c, 0xc2,
-    0x01, 0xbd, 0xda, 0x16, 0x8e, 0xb9, 0x30, 0x40, 0xa6, 0x6e, 0xbd, 0xcd,
-    0x4d, 0x84, 0x67, 0x4e, 0x0b, 0xce, 0xd5, 0xef, 0xf8, 0x08, 0x63, 0x02,
-    0xc6, 0xc7, 0xf7, 0x67, 0x92, 0xe2, 0x23, 0x9d, 0x27, 0x22, 0x1d, 0xc6,
-    0x67, 0x5e, 0x66, 0xbf, 0x03, 0xb8, 0xa9, 0x67, 0xd4, 0x39, 0xd8, 0x75,
-    0xfa, 0xe8, 0xed, 0x56, 0xb8, 0x81, 0x02, 0x81, 0x81, 0x00, 0xf7, 0x46,
-    0x68, 0xc6, 0x13, 0xf8, 0xba, 0x0f, 0x83, 0xdb, 0x05, 0xa8, 0x25, 0x00,
-    0x70, 0x9c, 0x9e, 0x8b, 0x12, 0x34, 0x0d, 0x96, 0xcf, 0x0d, 0x98, 0x9b,
-    0x8d, 0x9c, 0x96, 0x78, 0xd1, 0x3c, 0x01, 0x8c, 0xb9, 0x35, 0x5c, 0x20,
-    0x42, 0xb4, 0x38, 0xe3, 0xd6, 0x54, 0xe7, 0x55, 0xd6, 0x26, 0x8a, 0x0c,
-    0xf6, 0x1f, 0xe0, 0x04, 0xc1, 0x22, 0x42, 0x19, 0x61, 0xc4, 0x94, 0x7c,
-    0x07, 0x2e, 0x80, 0x52, 0xfe, 0x8d, 0xe6, 0x92, 0x3a, 0x91, 0xfe, 0x72,
-    0x99, 0xe1, 0x2a, 0x73, 0x76, 0xb1, 0x24, 0x20, 0x67, 0xde, 0x28, 0xcb,
-    0x0e, 0xe6, 0x52, 0xb5, 0xfa, 0xfb, 0x8b, 0x1e, 0x6a, 0x1d, 0x09, 0x26,
-    0xb9, 0xa7, 0x61, 0xba, 0xf8, 0x79, 0xd2, 0x66, 0x57, 0x28, 0xd7, 0x31,
-    0xb5, 0x0b, 0x27, 0x19, 0x1e, 0x6f, 0x46, 0xfc, 0x54, 0x95, 0xeb, 0x78,
-    0x01, 0xb6, 0xd9, 0x79, 0x5a, 0x4d, 0x02, 0x81, 0x81, 0x00, 0xd5, 0x8f,
-    0x16, 0x53, 0x2f, 0x57, 0x93, 0xbf, 0x09, 0x75, 0xbf, 0x63, 0x40, 0x3d,
-    0x27, 0xfd, 0x23, 0x21, 0xde, 0x9b, 0xe9, 0x73, 0x3f, 0x49, 0x02, 0xd2,
-    0x38, 0x96, 0xcf, 0xc3, 0xba, 0x92, 0x07, 0x87, 0x52, 0xa9, 0x35, 0xe3,
-    0x0c, 0xe4, 0x2f, 0x05, 0x7b, 0x37, 0xa5, 0x40, 0x9c, 0x3b, 0x94, 0xf7,
-    0xad, 0xa0, 0xee, 0x3a, 0xa8, 0xfb, 0x1f, 0x11, 0x1f, 0xd8, 0x9a, 0x80,
-    0x42, 0x3d, 0x7f, 0xa4, 0xb8, 0x9a, 0xaa, 0xea, 0x72, 0xc1, 0xe3, 0xed,
-    0x06, 0x60, 0x92, 0x37, 0xf9, 0xba, 0xfb, 0x9e, 0xed, 0x05, 0xa6, 0xd4,
-    0x72, 0x68, 0x4f, 0x63, 0xfe, 0xd6, 0x10, 0x0d, 0x4f, 0x0a, 0x93, 0xc6,
-    0xb9, 0xd7, 0xaf, 0xfd, 0xd9, 0x57, 0x7d, 0xcb, 0x75, 0xe8, 0x93, 0x2b,
-    0xae, 0x4f, 0xea, 0xd7, 0x30, 0x0b, 0x58, 0x44, 0x82, 0x0f, 0x84, 0x5d,
-    0x62, 0x11, 0x78, 0xea, 0x5f, 0xc5, 0x02, 0x81, 0x81, 0x00, 0x82, 0x0c,
-    0xc1, 0xe6, 0x0b, 0x72, 0xf1, 0x48, 0x5f, 0xac, 0xbd, 0x98, 0xe5, 0x7d,
-    0x09, 0xbd, 0x15, 0x95, 0x47, 0x09, 0xa1, 0x6c, 0x03, 0x91, 0xbf, 0x05,
-    0x70, 0xc1, 0x3e, 0x52, 0x64, 0x99, 0x0e, 0xa7, 0x98, 0x70, 0xfb, 0xf6,
-    0xeb, 0x9e, 0x25, 0x9d, 0x8e, 0x88, 0x30, 0xf2, 0xf0, 0x22, 0x6c, 0xd0,
-    0xcc, 0x51, 0x8f, 0x5c, 0x70, 0xc7, 0x37, 0xc4, 0x69, 0xab, 0x1d, 0xfc,
-    0xed, 0x3a, 0x03, 0xbb, 0xa2, 0xad, 0xb6, 0xea, 0x89, 0x6b, 0x67, 0x4b,
-    0x96, 0xaa, 0xd9, 0xcc, 0xc8, 0x4b, 0xfa, 0x18, 0x21, 0x08, 0xb2, 0xa3,
-    0xb9, 0x3e, 0x61, 0x99, 0xdc, 0x5a, 0x97, 0x9c, 0x73, 0x6a, 0xb9, 0xf9,
-    0x68, 0x03, 0x24, 0x5f, 0x55, 0x77, 0x9c, 0xb4, 0xbe, 0x7a, 0x78, 0x53,
-    0x68, 0x48, 0x69, 0x53, 0xc8, 0xb1, 0xf5, 0xbf, 0x98, 0x2d, 0x11, 0x1e,
-    0x98, 0xa8, 0x36, 0x50, 0xa0, 0xb1, 0x02, 0x81, 0x81, 0x00, 0x90, 0x88,
-    0x30, 0x71, 0xc7, 0xfe, 0x9b, 0x6d, 0x95, 0x37, 0x6d, 0x79, 0xfc, 0x85,
-    0xe7, 0x44, 0x78, 0xbc, 0x79, 0x6e, 0x47, 0x86, 0xc9, 0xf3, 0xdd, 0xc6,
-    0xec, 0xa9, 0x94, 0x9f, 0x40, 0xeb, 0x87, 0xd0, 0xdb, 0xee, 0xcd, 0x1b,
-    0x87, 0x23, 0xff, 0x76, 0xd4, 0x37, 0x8a, 0xcd, 0xb9, 0x6e, 0xd1, 0x98,
-    0xf6, 0x97, 0x8d, 0xe3, 0x81, 0x6d, 0xc3, 0x4e, 0xd1, 0xa0, 0xc4, 0x9f,
-    0xbd, 0x34, 0xe5, 0xe8, 0x53, 0x4f, 0xca, 0x10, 0xb5, 0xed, 0xe7, 0x16,
-    0x09, 0x54, 0xde, 0x60, 0xa7, 0xd1, 0x16, 0x6e, 0x2e, 0xb7, 0xbe, 0x7a,
-    0xd5, 0x9b, 0x26, 0xef, 0xe4, 0x0e, 0x77, 0xfa, 0xa9, 0xdd, 0xdc, 0xb9,
-    0x88, 0x19, 0x23, 0x70, 0xc7, 0xe1, 0x60, 0xaf, 0x8c, 0x73, 0x04, 0xf7,
-    0x71, 0x17, 0x81, 0x36, 0x75, 0xbb, 0x97, 0xd7, 0x75, 0xb6, 0x8e, 0xbc,
-    0xac, 0x9c, 0x6a, 0x9b, 0x24, 0x89, 0x02, 0x81, 0x80, 0x5a, 0x2b, 0xc7,
-    0x6b, 0x8c, 0x65, 0xdb, 0x04, 0x73, 0xab, 0x25, 0xe1, 0x5b, 0xbc, 0x3c,
-    0xcf, 0x5a, 0x3c, 0x04, 0xae, 0x97, 0x2e, 0xfd, 0xa4, 0x97, 0x1f, 0x05,
-    0x17, 0x27, 0xac, 0x7c, 0x30, 0x85, 0xb4, 0x82, 0x3f, 0x5b, 0xb7, 0x94,
-    0x3b, 0x7f, 0x6c, 0x0c, 0xc7, 0x16, 0xc6, 0xa0, 0xbd, 0x80, 0xb0, 0x81,
-    0xde, 0xa0, 0x23, 0xa6, 0xf6, 0x75, 0x33, 0x51, 0x35, 0xa2, 0x75, 0x55,
-    0x70, 0x4d, 0x42, 0xbb, 0xcf, 0x54, 0xe4, 0xdb, 0x2d, 0x88, 0xa0, 0x7a,
-    0xf2, 0x17, 0xa7, 0xdd, 0x13, 0x44, 0x9f, 0x5f, 0x6b, 0x2c, 0x42, 0x42,
-    0x8b, 0x13, 0x4d, 0xf9, 0x5b, 0xf8, 0x33, 0x42, 0xd9, 0x9e, 0x50, 0x1c,
-    0x7c, 0xbc, 0xfa, 0x62, 0x85, 0x0b, 0xcf, 0x99, 0xda, 0x9e, 0x04, 0x90,
-    0xb2, 0xc6, 0xb2, 0x0a, 0x2a, 0x7c, 0x6d, 0x6a, 0x40, 0xfc, 0xf5, 0x50,
-    0x98, 0x46, 0x89, 0x82, 0x40,
+    0x30,
+    0x82,
+    0x04,
+    0xa5,
+    0x02,
+    0x01,
+    0x00,
+    0x02,
+    0x82,
+    0x01,
+    0x01,
+    0x00,
+    0xce,
+    0x47,
+    0xcb,
+    0x11,
+    0xbb,
+    0xd2,
+    0x9d,
+    0x8e,
+    0x9e,
+    0xd2,
+    0x1e,
+    0x14,
+    0xaf,
+    0xc7,
+    0xea,
+    0xb6,
+    0xc9,
+    0x38,
+    0x2a,
+    0x6f,
+    0xb3,
+    0x7e,
+    0xfb,
+    0xbc,
+    0xfc,
+    0x59,
+    0x42,
+    0xb9,
+    0x56,
+    0xf0,
+    0x4c,
+    0x3f,
+    0xf7,
+    0x31,
+    0x84,
+    0xbe,
+    0xac,
+    0x03,
+    0x9e,
+    0x71,
+    0x91,
+    0x85,
+    0xd8,
+    0x32,
+    0xbd,
+    0x00,
+    0xea,
+    0xac,
+    0x65,
+    0xf6,
+    0x03,
+    0xc8,
+    0x0f,
+    0x8b,
+    0xfd,
+    0x6e,
+    0x58,
+    0x88,
+    0x04,
+    0x41,
+    0x92,
+    0x74,
+    0xa6,
+    0x57,
+    0x2e,
+    0x8e,
+    0x88,
+    0xd5,
+    0x3d,
+    0xda,
+    0x14,
+    0x3e,
+    0x63,
+    0x88,
+    0x22,
+    0xe3,
+    0x53,
+    0xe9,
+    0xba,
+    0x39,
+    0x09,
+    0xac,
+    0xfb,
+    0xd0,
+    0x4c,
+    0xf2,
+    0x3c,
+    0x20,
+    0xd6,
+    0x97,
+    0xe6,
+    0xed,
+    0xf1,
+    0x62,
+    0x1e,
+    0xe5,
+    0xc9,
+    0x48,
+    0xa0,
+    0xca,
+    0x2e,
+    0x3c,
+    0x14,
+    0x5a,
+    0x82,
+    0xd4,
+    0xed,
+    0xb1,
+    0xe3,
+    0x43,
+    0xc1,
+    0x2a,
+    0x59,
+    0xa5,
+    0xb9,
+    0xc8,
+    0x48,
+    0xa7,
+    0x39,
+    0x23,
+    0x74,
+    0xa7,
+    0x37,
+    0xb0,
+    0x6f,
+    0xc3,
+    0x64,
+    0x99,
+    0x6c,
+    0xa2,
+    0x82,
+    0xc8,
+    0xf6,
+    0xdb,
+    0x86,
+    0x40,
+    0xce,
+    0xd1,
+    0x85,
+    0x9f,
+    0xce,
+    0x69,
+    0xf4,
+    0x15,
+    0x2a,
+    0x23,
+    0xca,
+    0xea,
+    0xb7,
+    0x7b,
+    0xdf,
+    0xfb,
+    0x43,
+    0x5f,
+    0xff,
+    0x7a,
+    0x49,
+    0x49,
+    0x0e,
+    0xe7,
+    0x02,
+    0x51,
+    0x45,
+    0x13,
+    0xe8,
+    0x90,
+    0x64,
+    0x21,
+    0x0c,
+    0x26,
+    0x2b,
+    0x5d,
+    0xfc,
+    0xe4,
+    0xb5,
+    0x86,
+    0x89,
+    0x43,
+    0x22,
+    0x4c,
+    0xf3,
+    0x3b,
+    0xf3,
+    0x09,
+    0xc4,
+    0xa4,
+    0x10,
+    0x80,
+    0xf2,
+    0x46,
+    0xe2,
+    0x46,
+    0x8f,
+    0x76,
+    0x50,
+    0xbf,
+    0xaf,
+    0x2b,
+    0x90,
+    0x1b,
+    0x78,
+    0xc7,
+    0xcf,
+    0xc1,
+    0x77,
+    0xd0,
+    0xfb,
+    0xa9,
+    0xfb,
+    0xc9,
+    0x66,
+    0x5a,
+    0xc5,
+    0x9b,
+    0x31,
+    0x41,
+    0x67,
+    0x01,
+    0xbe,
+    0x33,
+    0x10,
+    0xba,
+    0x05,
+    0x58,
+    0xed,
+    0x76,
+    0x53,
+    0xde,
+    0x5d,
+    0xc1,
+    0xe8,
+    0xbb,
+    0x9f,
+    0xf1,
+    0xcd,
+    0xfb,
+    0xdf,
+    0x64,
+    0x7f,
+    0xd7,
+    0x18,
+    0xab,
+    0x0f,
+    0x94,
+    0x28,
+    0x95,
+    0x4a,
+    0xcc,
+    0x6a,
+    0xa9,
+    0x50,
+    0xc7,
+    0x05,
+    0x47,
+    0x10,
+    0x41,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0x02,
+    0x82,
+    0x01,
+    0x01,
+    0x00,
+    0xa8,
+    0x47,
+    0xb9,
+    0x4a,
+    0x06,
+    0x47,
+    0x93,
+    0x71,
+    0x3d,
+    0xef,
+    0x7b,
+    0xca,
+    0xb4,
+    0x7c,
+    0x0a,
+    0xe6,
+    0x82,
+    0xd0,
+    0xe7,
+    0x0d,
+    0xa9,
+    0x08,
+    0xf6,
+    0xa4,
+    0xfd,
+    0xd8,
+    0x73,
+    0xae,
+    0x6f,
+    0x56,
+    0x29,
+    0x5e,
+    0x25,
+    0x72,
+    0xa8,
+    0x30,
+    0x44,
+    0x73,
+    0xcf,
+    0x56,
+    0x26,
+    0xb9,
+    0x61,
+    0xde,
+    0x42,
+    0x81,
+    0xf4,
+    0xf0,
+    0x1f,
+    0x5d,
+    0xcb,
+    0x47,
+    0xf2,
+    0x26,
+    0xe9,
+    0xe0,
+    0x93,
+    0x28,
+    0xa3,
+    0x10,
+    0x3b,
+    0x42,
+    0x1e,
+    0x51,
+    0x11,
+    0x12,
+    0x06,
+    0x5e,
+    0xaf,
+    0xce,
+    0xb0,
+    0xa5,
+    0x14,
+    0xdd,
+    0x82,
+    0x58,
+    0xa1,
+    0xa4,
+    0x12,
+    0xdf,
+    0x65,
+    0x1d,
+    0x51,
+    0x70,
+    0x64,
+    0xd5,
+    0x58,
+    0x68,
+    0x11,
+    0xa8,
+    0x6a,
+    0x23,
+    0xc2,
+    0xbf,
+    0xa1,
+    0x25,
+    0x24,
+    0x47,
+    0xb3,
+    0xa4,
+    0x3c,
+    0x83,
+    0x96,
+    0xb7,
+    0x1f,
+    0xf4,
+    0x44,
+    0xd4,
+    0xd1,
+    0xe9,
+    0xfc,
+    0x33,
+    0x68,
+    0x5e,
+    0xe2,
+    0x68,
+    0x99,
+    0x9c,
+    0x91,
+    0xe8,
+    0x72,
+    0xc9,
+    0xd7,
+    0x8c,
+    0x80,
+    0x20,
+    0x8e,
+    0x77,
+    0x83,
+    0x4d,
+    0xe4,
+    0xab,
+    0xf9,
+    0x74,
+    0xa1,
+    0xdf,
+    0xd3,
+    0xc0,
+    0x0d,
+    0x5b,
+    0x05,
+    0x51,
+    0xc2,
+    0x6f,
+    0xb2,
+    0x91,
+    0x02,
+    0xec,
+    0xc0,
+    0x02,
+    0x1a,
+    0x5c,
+    0x91,
+    0x05,
+    0xf1,
+    0xe3,
+    0xfa,
+    0x65,
+    0xc2,
+    0xad,
+    0x24,
+    0xe6,
+    0xe5,
+    0x3c,
+    0xb6,
+    0x16,
+    0xf1,
+    0xa1,
+    0x67,
+    0x1a,
+    0x9d,
+    0x37,
+    0x56,
+    0xbf,
+    0x01,
+    0xd7,
+    0x3b,
+    0x35,
+    0x30,
+    0x57,
+    0x73,
+    0xf4,
+    0xf0,
+    0x5e,
+    0xa7,
+    0xe8,
+    0x0a,
+    0xc1,
+    0x94,
+    0x17,
+    0xcf,
+    0x0a,
+    0xbd,
+    0xf5,
+    0x31,
+    0xa7,
+    0x2d,
+    0xf7,
+    0xf5,
+    0xd9,
+    0x8c,
+    0xc2,
+    0x01,
+    0xbd,
+    0xda,
+    0x16,
+    0x8e,
+    0xb9,
+    0x30,
+    0x40,
+    0xa6,
+    0x6e,
+    0xbd,
+    0xcd,
+    0x4d,
+    0x84,
+    0x67,
+    0x4e,
+    0x0b,
+    0xce,
+    0xd5,
+    0xef,
+    0xf8,
+    0x08,
+    0x63,
+    0x02,
+    0xc6,
+    0xc7,
+    0xf7,
+    0x67,
+    0x92,
+    0xe2,
+    0x23,
+    0x9d,
+    0x27,
+    0x22,
+    0x1d,
+    0xc6,
+    0x67,
+    0x5e,
+    0x66,
+    0xbf,
+    0x03,
+    0xb8,
+    0xa9,
+    0x67,
+    0xd4,
+    0x39,
+    0xd8,
+    0x75,
+    0xfa,
+    0xe8,
+    0xed,
+    0x56,
+    0xb8,
+    0x81,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xf7,
+    0x46,
+    0x68,
+    0xc6,
+    0x13,
+    0xf8,
+    0xba,
+    0x0f,
+    0x83,
+    0xdb,
+    0x05,
+    0xa8,
+    0x25,
+    0x00,
+    0x70,
+    0x9c,
+    0x9e,
+    0x8b,
+    0x12,
+    0x34,
+    0x0d,
+    0x96,
+    0xcf,
+    0x0d,
+    0x98,
+    0x9b,
+    0x8d,
+    0x9c,
+    0x96,
+    0x78,
+    0xd1,
+    0x3c,
+    0x01,
+    0x8c,
+    0xb9,
+    0x35,
+    0x5c,
+    0x20,
+    0x42,
+    0xb4,
+    0x38,
+    0xe3,
+    0xd6,
+    0x54,
+    0xe7,
+    0x55,
+    0xd6,
+    0x26,
+    0x8a,
+    0x0c,
+    0xf6,
+    0x1f,
+    0xe0,
+    0x04,
+    0xc1,
+    0x22,
+    0x42,
+    0x19,
+    0x61,
+    0xc4,
+    0x94,
+    0x7c,
+    0x07,
+    0x2e,
+    0x80,
+    0x52,
+    0xfe,
+    0x8d,
+    0xe6,
+    0x92,
+    0x3a,
+    0x91,
+    0xfe,
+    0x72,
+    0x99,
+    0xe1,
+    0x2a,
+    0x73,
+    0x76,
+    0xb1,
+    0x24,
+    0x20,
+    0x67,
+    0xde,
+    0x28,
+    0xcb,
+    0x0e,
+    0xe6,
+    0x52,
+    0xb5,
+    0xfa,
+    0xfb,
+    0x8b,
+    0x1e,
+    0x6a,
+    0x1d,
+    0x09,
+    0x26,
+    0xb9,
+    0xa7,
+    0x61,
+    0xba,
+    0xf8,
+    0x79,
+    0xd2,
+    0x66,
+    0x57,
+    0x28,
+    0xd7,
+    0x31,
+    0xb5,
+    0x0b,
+    0x27,
+    0x19,
+    0x1e,
+    0x6f,
+    0x46,
+    0xfc,
+    0x54,
+    0x95,
+    0xeb,
+    0x78,
+    0x01,
+    0xb6,
+    0xd9,
+    0x79,
+    0x5a,
+    0x4d,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xd5,
+    0x8f,
+    0x16,
+    0x53,
+    0x2f,
+    0x57,
+    0x93,
+    0xbf,
+    0x09,
+    0x75,
+    0xbf,
+    0x63,
+    0x40,
+    0x3d,
+    0x27,
+    0xfd,
+    0x23,
+    0x21,
+    0xde,
+    0x9b,
+    0xe9,
+    0x73,
+    0x3f,
+    0x49,
+    0x02,
+    0xd2,
+    0x38,
+    0x96,
+    0xcf,
+    0xc3,
+    0xba,
+    0x92,
+    0x07,
+    0x87,
+    0x52,
+    0xa9,
+    0x35,
+    0xe3,
+    0x0c,
+    0xe4,
+    0x2f,
+    0x05,
+    0x7b,
+    0x37,
+    0xa5,
+    0x40,
+    0x9c,
+    0x3b,
+    0x94,
+    0xf7,
+    0xad,
+    0xa0,
+    0xee,
+    0x3a,
+    0xa8,
+    0xfb,
+    0x1f,
+    0x11,
+    0x1f,
+    0xd8,
+    0x9a,
+    0x80,
+    0x42,
+    0x3d,
+    0x7f,
+    0xa4,
+    0xb8,
+    0x9a,
+    0xaa,
+    0xea,
+    0x72,
+    0xc1,
+    0xe3,
+    0xed,
+    0x06,
+    0x60,
+    0x92,
+    0x37,
+    0xf9,
+    0xba,
+    0xfb,
+    0x9e,
+    0xed,
+    0x05,
+    0xa6,
+    0xd4,
+    0x72,
+    0x68,
+    0x4f,
+    0x63,
+    0xfe,
+    0xd6,
+    0x10,
+    0x0d,
+    0x4f,
+    0x0a,
+    0x93,
+    0xc6,
+    0xb9,
+    0xd7,
+    0xaf,
+    0xfd,
+    0xd9,
+    0x57,
+    0x7d,
+    0xcb,
+    0x75,
+    0xe8,
+    0x93,
+    0x2b,
+    0xae,
+    0x4f,
+    0xea,
+    0xd7,
+    0x30,
+    0x0b,
+    0x58,
+    0x44,
+    0x82,
+    0x0f,
+    0x84,
+    0x5d,
+    0x62,
+    0x11,
+    0x78,
+    0xea,
+    0x5f,
+    0xc5,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0x82,
+    0x0c,
+    0xc1,
+    0xe6,
+    0x0b,
+    0x72,
+    0xf1,
+    0x48,
+    0x5f,
+    0xac,
+    0xbd,
+    0x98,
+    0xe5,
+    0x7d,
+    0x09,
+    0xbd,
+    0x15,
+    0x95,
+    0x47,
+    0x09,
+    0xa1,
+    0x6c,
+    0x03,
+    0x91,
+    0xbf,
+    0x05,
+    0x70,
+    0xc1,
+    0x3e,
+    0x52,
+    0x64,
+    0x99,
+    0x0e,
+    0xa7,
+    0x98,
+    0x70,
+    0xfb,
+    0xf6,
+    0xeb,
+    0x9e,
+    0x25,
+    0x9d,
+    0x8e,
+    0x88,
+    0x30,
+    0xf2,
+    0xf0,
+    0x22,
+    0x6c,
+    0xd0,
+    0xcc,
+    0x51,
+    0x8f,
+    0x5c,
+    0x70,
+    0xc7,
+    0x37,
+    0xc4,
+    0x69,
+    0xab,
+    0x1d,
+    0xfc,
+    0xed,
+    0x3a,
+    0x03,
+    0xbb,
+    0xa2,
+    0xad,
+    0xb6,
+    0xea,
+    0x89,
+    0x6b,
+    0x67,
+    0x4b,
+    0x96,
+    0xaa,
+    0xd9,
+    0xcc,
+    0xc8,
+    0x4b,
+    0xfa,
+    0x18,
+    0x21,
+    0x08,
+    0xb2,
+    0xa3,
+    0xb9,
+    0x3e,
+    0x61,
+    0x99,
+    0xdc,
+    0x5a,
+    0x97,
+    0x9c,
+    0x73,
+    0x6a,
+    0xb9,
+    0xf9,
+    0x68,
+    0x03,
+    0x24,
+    0x5f,
+    0x55,
+    0x77,
+    0x9c,
+    0xb4,
+    0xbe,
+    0x7a,
+    0x78,
+    0x53,
+    0x68,
+    0x48,
+    0x69,
+    0x53,
+    0xc8,
+    0xb1,
+    0xf5,
+    0xbf,
+    0x98,
+    0x2d,
+    0x11,
+    0x1e,
+    0x98,
+    0xa8,
+    0x36,
+    0x50,
+    0xa0,
+    0xb1,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0x90,
+    0x88,
+    0x30,
+    0x71,
+    0xc7,
+    0xfe,
+    0x9b,
+    0x6d,
+    0x95,
+    0x37,
+    0x6d,
+    0x79,
+    0xfc,
+    0x85,
+    0xe7,
+    0x44,
+    0x78,
+    0xbc,
+    0x79,
+    0x6e,
+    0x47,
+    0x86,
+    0xc9,
+    0xf3,
+    0xdd,
+    0xc6,
+    0xec,
+    0xa9,
+    0x94,
+    0x9f,
+    0x40,
+    0xeb,
+    0x87,
+    0xd0,
+    0xdb,
+    0xee,
+    0xcd,
+    0x1b,
+    0x87,
+    0x23,
+    0xff,
+    0x76,
+    0xd4,
+    0x37,
+    0x8a,
+    0xcd,
+    0xb9,
+    0x6e,
+    0xd1,
+    0x98,
+    0xf6,
+    0x97,
+    0x8d,
+    0xe3,
+    0x81,
+    0x6d,
+    0xc3,
+    0x4e,
+    0xd1,
+    0xa0,
+    0xc4,
+    0x9f,
+    0xbd,
+    0x34,
+    0xe5,
+    0xe8,
+    0x53,
+    0x4f,
+    0xca,
+    0x10,
+    0xb5,
+    0xed,
+    0xe7,
+    0x16,
+    0x09,
+    0x54,
+    0xde,
+    0x60,
+    0xa7,
+    0xd1,
+    0x16,
+    0x6e,
+    0x2e,
+    0xb7,
+    0xbe,
+    0x7a,
+    0xd5,
+    0x9b,
+    0x26,
+    0xef,
+    0xe4,
+    0x0e,
+    0x77,
+    0xfa,
+    0xa9,
+    0xdd,
+    0xdc,
+    0xb9,
+    0x88,
+    0x19,
+    0x23,
+    0x70,
+    0xc7,
+    0xe1,
+    0x60,
+    0xaf,
+    0x8c,
+    0x73,
+    0x04,
+    0xf7,
+    0x71,
+    0x17,
+    0x81,
+    0x36,
+    0x75,
+    0xbb,
+    0x97,
+    0xd7,
+    0x75,
+    0xb6,
+    0x8e,
+    0xbc,
+    0xac,
+    0x9c,
+    0x6a,
+    0x9b,
+    0x24,
+    0x89,
+    0x02,
+    0x81,
+    0x80,
+    0x5a,
+    0x2b,
+    0xc7,
+    0x6b,
+    0x8c,
+    0x65,
+    0xdb,
+    0x04,
+    0x73,
+    0xab,
+    0x25,
+    0xe1,
+    0x5b,
+    0xbc,
+    0x3c,
+    0xcf,
+    0x5a,
+    0x3c,
+    0x04,
+    0xae,
+    0x97,
+    0x2e,
+    0xfd,
+    0xa4,
+    0x97,
+    0x1f,
+    0x05,
+    0x17,
+    0x27,
+    0xac,
+    0x7c,
+    0x30,
+    0x85,
+    0xb4,
+    0x82,
+    0x3f,
+    0x5b,
+    0xb7,
+    0x94,
+    0x3b,
+    0x7f,
+    0x6c,
+    0x0c,
+    0xc7,
+    0x16,
+    0xc6,
+    0xa0,
+    0xbd,
+    0x80,
+    0xb0,
+    0x81,
+    0xde,
+    0xa0,
+    0x23,
+    0xa6,
+    0xf6,
+    0x75,
+    0x33,
+    0x51,
+    0x35,
+    0xa2,
+    0x75,
+    0x55,
+    0x70,
+    0x4d,
+    0x42,
+    0xbb,
+    0xcf,
+    0x54,
+    0xe4,
+    0xdb,
+    0x2d,
+    0x88,
+    0xa0,
+    0x7a,
+    0xf2,
+    0x17,
+    0xa7,
+    0xdd,
+    0x13,
+    0x44,
+    0x9f,
+    0x5f,
+    0x6b,
+    0x2c,
+    0x42,
+    0x42,
+    0x8b,
+    0x13,
+    0x4d,
+    0xf9,
+    0x5b,
+    0xf8,
+    0x33,
+    0x42,
+    0xd9,
+    0x9e,
+    0x50,
+    0x1c,
+    0x7c,
+    0xbc,
+    0xfa,
+    0x62,
+    0x85,
+    0x0b,
+    0xcf,
+    0x99,
+    0xda,
+    0x9e,
+    0x04,
+    0x90,
+    0xb2,
+    0xc6,
+    0xb2,
+    0x0a,
+    0x2a,
+    0x7c,
+    0x6d,
+    0x6a,
+    0x40,
+    0xfc,
+    0xf5,
+    0x50,
+    0x98,
+    0x46,
+    0x89,
+    0x82,
+    0x40,
 };
 #endif
 
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /*
  *  -----BEGIN EC PRIVATE KEY-----
  *  MHcCAQEEIJLyl7hJjpQL/RhP1x2zS79xdiPJQB683gWeqcqHPeZkoAoGCCqGSM49
@@ -228,7 +2027,7 @@ static const char ECDSAPrivateKeyPEM[] = {
     0x4e, 0x44, 0x20, 0x45, 0x43, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41, 0x54,
     0x45, 0x20, 0x4b, 0x45, 0x59, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a
 };
-# endif
+#endif
 
 /*
  * -----BEGIN CERTIFICATE-----
@@ -476,7 +2275,12 @@ static int idx;
 
 #define FUZZTIME 1485898104
 
-#define TIME_IMPL(t) { if (t != NULL) *t = FUZZTIME; return FUZZTIME; }
+#define TIME_IMPL(t)       \
+    {                      \
+        if (t != NULL)     \
+            *t = FUZZTIME; \
+        return FUZZTIME;   \
+    }
 
 /*
  * This might not work in all cases (and definitely not on Windows
@@ -489,7 +2293,7 @@ static int idx;
 time_t time(time_t *t) TIME_IMPL(t)
 #endif
 
-int FuzzerInitialize(int *argc, char ***argv)
+    int FuzzerInitialize(int *argc, char ***argv)
 {
     STACK_OF(SSL_COMP) *comp_methods;
 
@@ -511,7 +2315,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     SSL *server;
     BIO *in;
     BIO *out;
-#if !defined(OPENSSL_NO_EC)                     \
+#if !defined(OPENSSL_NO_EC) \
     || (!defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0))
     BIO *bio_buf;
 #endif
@@ -526,9 +2330,9 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
 #endif
     X509 *cert;
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
     EC_KEY *ecdsakey = NULL;
-# endif
+#endif
 #endif
 #if !defined(OPENSSL_NO_DSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
     DSA *dsakey = NULL;
@@ -566,7 +2370,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     X509_free(cert);
 
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     /* ECDSA */
     bio_buf = BIO_new(BIO_s_mem());
     OPENSSL_assert((size_t)BIO_write(bio_buf, ECDSAPrivateKeyPEM, sizeof(ECDSAPrivateKeyPEM)) == sizeof(ECDSAPrivateKeyPEM));
@@ -579,7 +2383,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     ret = SSL_CTX_use_PrivateKey(ctx, pkey);
     OPENSSL_assert(ret == 1);
     EVP_PKEY_free(pkey);
-# endif
+#endif
     bio_buf = BIO_new(BIO_s_mem());
     OPENSSL_assert((size_t)BIO_write(bio_buf, ECDSACertPEM, sizeof(ECDSACertPEM)) == sizeof(ECDSACertPEM));
     cert = PEM_read_bio_X509(bio_buf, NULL, NULL, NULL);
@@ -620,7 +2424,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
     SSL_set_bio(server, in, out);
     SSL_set_accept_state(server);
 
-    opt = (uint8_t)buf[len-1];
+    opt = (uint8_t)buf[len - 1];
     len--;
 
     OPENSSL_assert((size_t)BIO_write(in, buf, len) == len);
diff --git a/fuzz/slh-dsa.c b/fuzz/slh-dsa.c
index dada29a62d6a4..17238bcf8b3b0 100644
--- a/fuzz/slh-dsa.c
+++ b/fuzz/slh-dsa.c
@@ -59,7 +59,7 @@ static uint8_t *consume_uint8t(const uint8_t *buf, size_t *len, uint8_t *val)
  *         or NULL on failure.
  */
 static EVP_PKEY *slh_dsa_gen_key(const char *name, uint32_t keysize,
-                                 OSSL_PARAM params[], uint8_t *param_broken)
+    OSSL_PARAM params[], uint8_t *param_broken)
 {
     EVP_PKEY_CTX *ctx;
     EVP_PKEY *new = NULL;
@@ -166,7 +166,7 @@ static const char *select_keytype(uint8_t selector, uint32_t *keysize)
  * @param out2 Pointer to store the second generated key.
  */
 static void slh_dsa_gen_keys(uint8_t **buf, size_t *len,
-                             void **out1, void **out2)
+    void **out1, void **out2)
 {
     uint8_t selector = 0;
     const char *keytype = NULL;
@@ -203,7 +203,7 @@ static void slh_dsa_gen_keys(uint8_t **buf, size_t *len,
  *             other key generation functions).
  */
 static void slh_dsa_gen_key_with_params(uint8_t **buf, size_t *len,
-                                        void **out1, void **out2)
+    void **out1, void **out2)
 {
     uint8_t selector = 0;
     const char *keytype = NULL;
@@ -241,7 +241,7 @@ static void slh_dsa_gen_key_with_params(uint8_t **buf, size_t *len,
         broken = (bufptr == NULL) ? 1 : 0;
 
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_PUB_KEY,
-                                                  (char *)bufptr, buflen);
+        (char *)bufptr, buflen);
 
     buflen = keysize * 2;
     /* select an invalid length if the 4th bit is true  */
@@ -255,7 +255,7 @@ static void slh_dsa_gen_key_with_params(uint8_t **buf, size_t *len,
     if (!broken)
         broken = (bufptr == NULL) ? 1 : 0;
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_PRIV_KEY,
-                                                  (char *)bufptr, buflen);
+        (char *)bufptr, buflen);
 
     params[2] = OSSL_PARAM_construct_end();
 
@@ -304,7 +304,7 @@ static void slh_dsa_clean_keys(void *in1, void *in2, void *out1, void *out2)
  * @param out2 Unused output parameter (placeholder for consistency).
  */
 static void slh_dsa_sign_verify(uint8_t **buf, size_t *len, void *key1,
-                                void *key2, void **out1, void **out2)
+    void *key2, void **out1, void **out2)
 {
     EVP_PKEY_CTX *ctx = NULL;
     EVP_PKEY *key = NULL;
@@ -348,18 +348,18 @@ static void slh_dsa_sign_verify(uint8_t **buf, size_t *len, void *key1,
 
     if (selector & 0x1)
         params[paramidx++] = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_CONTEXT_STRING,
-                                                               msg, msg_len);
+            msg, msg_len);
 
     if (selector & 0x2) {
         intval1 = selector & 0x4;
         params[paramidx++] = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_MESSAGE_ENCODING,
-                                                      &intval1);
+            &intval1);
     }
 
     if (selector & 0x8) {
         intval2 = selector & 0x10;
         params[paramidx++] = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_DETERMINISTIC,
-                                                      &intval2);
+            &intval2);
     }
 
     params[paramidx] = OSSL_PARAM_construct_end();
@@ -378,7 +378,7 @@ static void slh_dsa_sign_verify(uint8_t **buf, size_t *len, void *key1,
     /*
      * the context_string parameter can be no more than 255 bytes, so if
      * our random input buffer is greater than that, we expect failure above,
-     * which we check for.  In that event, theres nothing more we can do here
+     * which we check for.  In that event, there's nothing more we can do here
      * so bail out
      */
     if (expect_init_rc == 0)
@@ -415,7 +415,7 @@ static void slh_dsa_sign_verify(uint8_t **buf, size_t *len, void *key1,
  * @param out2 Unused output parameter (placeholder for consistency).
  */
 static void slh_dsa_export_import(uint8_t **buf, size_t *len, void *key1,
-                                  void *key2, void **out1, void **out2)
+    void *key2, void **out1, void **out2)
 {
     int rc;
     EVP_PKEY *alice = (EVP_PKEY *)key1;
@@ -439,7 +439,7 @@ static void slh_dsa_export_import(uint8_t **buf, size_t *len, void *key1,
      * EVP_PKEY returns:
      * 1 if the keys are equivalent
      * 0 if the keys are not equivalent
-     * -1 if the key types are differnt
+     * -1 if the key types are different
      * -2 if the operation is not supported
      */
     OPENSSL_assert(EVP_PKEY_eq(alice, new) == 1);
@@ -509,7 +509,7 @@ struct op_table_entry {
      * @param out2  Pointer to store the second output of the operation.
      */
     void (*doit)(uint8_t **buf, size_t *len, void *in1, void *in2,
-                 void **out1, void **out2);
+        void **out1, void **out2);
 
     /**
      * @brief Function pointer for cleaning up after the operation.
@@ -523,27 +523,22 @@ struct op_table_entry {
 };
 
 static struct op_table_entry ops[] = {
-    {
-        "Generate SLH-DSA keys",
+    { "Generate SLH-DSA keys",
         slh_dsa_gen_keys,
         NULL,
-        slh_dsa_clean_keys
-    }, {
-        "Generate SLH-DSA keys with params",
+        slh_dsa_clean_keys },
+    { "Generate SLH-DSA keys with params",
         slh_dsa_gen_key_with_params,
         NULL,
-        slh_dsa_clean_keys
-    }, {
-        "SLH-DSA Export/Import",
+        slh_dsa_clean_keys },
+    { "SLH-DSA Export/Import",
         slh_dsa_gen_keys,
         slh_dsa_export_import,
-        slh_dsa_clean_keys
-    }, {
-        "SLH-DSA sign and verify",
+        slh_dsa_clean_keys },
+    { "SLH-DSA sign and verify",
         NULL,
         slh_dsa_sign_verify,
-        slh_dsa_clean_keys
-    }
+        slh_dsa_clean_keys }
 };
 
 int FuzzerInitialize(int *argc, char ***argv)
@@ -578,7 +573,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
         return -1;
     /*
      * Get the first byte of the buffer to tell us what operation
-     * to preform
+     * to perform
      */
     buffer_cursor = consume_uint8t(buf, &len, &operation);
     if (buffer_cursor == NULL)
diff --git a/fuzz/smime.c b/fuzz/smime.c
index 8a4deff2f64b1..18c92ace513d9 100644
--- a/fuzz/smime.c
+++ b/fuzz/smime.c
@@ -32,7 +32,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
             STACK_OF(X509_ALGOR) *algs;
 
             PKCS7_cert_from_signer_info(p7,
-                                        sk_PKCS7_SIGNER_INFO_value(p7si, i));
+                sk_PKCS7_SIGNER_INFO_value(p7si, i));
             algs = PKCS7_get_smimecap(sk_PKCS7_SIGNER_INFO_value(p7si, i));
             sk_X509_ALGOR_pop_free(algs, X509_ALGOR_free);
         }
diff --git a/fuzz/test-corpus.c b/fuzz/test-corpus.c
index aaeec778603f7..783df1a07688f 100644
--- a/fuzz/test-corpus.c
+++ b/fuzz/test-corpus.c
@@ -23,16 +23,16 @@
 #include "internal/o_dir.h"
 
 #if defined(_WIN32) && defined(_MAX_PATH) && !defined(PATH_MAX)
-# define PATH_MAX _MAX_PATH
+#define PATH_MAX _MAX_PATH
 #endif
 
 #ifndef PATH_MAX
-# define PATH_MAX 4096
+#define PATH_MAX 4096
 #endif
 
-# if !defined(S_ISREG)
-#   define S_ISREG(m) ((m) & S_IFREG)
-# endif
+#if !defined(S_ISREG)
+#define S_ISREG(m) ((m) & S_IFREG)
+#endif
 
 static void testfile(const char *pathname)
 {
@@ -58,7 +58,8 @@ static void testfile(const char *pathname)
     fclose(f);
 }
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
     int n;
 
     FuzzerInitialize(&argc, &argv);
diff --git a/fuzz/v3name.c b/fuzz/v3name.c
index 2c7f94e17f8c8..6c330b353565e 100644
--- a/fuzz/v3name.c
+++ b/fuzz/v3name.c
@@ -19,7 +19,8 @@ int FuzzerInitialize(int *argc, char ***argv)
     return 1;
 }
 
-int FuzzerTestOneInput(const uint8_t* data, size_t size){
+int FuzzerTestOneInput(const uint8_t *data, size_t size)
+{
     GENERAL_NAME *namesa;
     GENERAL_NAME *namesb;
 
diff --git a/fuzz/x509.c b/fuzz/x509.c
index 8db8556f278a2..da96a29e32aa6 100644
--- a/fuzz/x509.c
+++ b/fuzz/x509.c
@@ -19,7 +19,8 @@ int FuzzerInitialize(int *argc, char ***argv)
 {
     FuzzerSetRand();
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS
-       | OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
+            | OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS,
+        NULL);
     ERR_clear_error();
     CRYPTO_free_ex_index(0, -1);
     return 1;
@@ -130,7 +131,7 @@ int FuzzerTestOneInput(const uint8_t *buf, size_t len)
         if (id == NULL)
             goto err;
         OCSP_resp_find_status(bs, id, &status, &reason, &revtime, &thisupd,
-                              &nextupd);
+            &nextupd);
     }
 
 err:
diff --git a/gost-engine b/gost-engine
index ede3886cc5507..74b1f4fddbc2d 160000
--- a/gost-engine
+++ b/gost-engine
@@ -1 +1 @@
-Subproject commit ede3886cc5507c2ba000ab9b057f198da03e8766
+Subproject commit 74b1f4fddbc2d6de969815b1992ddc1ae7c643fe
diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h
index 140b78e7cd975..a6765d20d8565 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 */
-
-# 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
+    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
 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 */
-
-#  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)
+    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)
 /* 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 */
-
-# 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(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)      )
+    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(__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))
 
 /* 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_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_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_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_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
-
-#  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 */
+#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_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_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_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_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_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 */
-
-# endif /* HWAES_CAPABLE */
+    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 /* OSSL_AES_PLATFORM_H */
diff --git a/include/crypto/aria.h b/include/crypto/aria.h
index 21a9932e847cb..75b812c5d635d 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 8461c1be8d210..1a890fc6bbd89 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 3eadb9ec3c545..6f37428cfbc22 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 6441386bbc4a7..62fdfd5e9bf2a 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 7bc0dbb65b798..394d16de4f225 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 574e0af733ba4..6a653247abf5d 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 e38b981ab544b..f30975213efc1 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 7377963900374..952840be5e661 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 dbc901b145ea5..1c1126fee069f 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 6d12c20e0212e..a634a6f8f8817 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 131e30fa71dfe..96b3a8dfba141 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 54976d95b5a80..21caac21f548c 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 2af2c2ecf7de6..694cdda884fe8 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 df55b68f8bc6d..4f4eba949e176 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 8cadadf68aa02..02ed385c059a3 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 2bd1637384661..ea3ac24d270cf 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 f53530ae23529..f9fd933682e54 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 0fd9c6de711af..b12b70cc8b07d 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 fc9645127d12d..4e0474290bb55 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 f1a27e04993b6..8216e7fcf74bc 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 39a956bfd362f..242de6fc2f2ff 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 d7df9a2c02e82..f4a2389907a93 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 760bc796be4d8..0af2d31516f81 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 22f6922183b58..a299ebbb8c3af 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 15299a0828566..fcb914faeb65b 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 d7badc43793c0..c1aadca3652da 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 07ea1ddd0acc8..e0210c664f76a 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 51232d18c2446..89f25c049df19 100644
--- a/include/crypto/dh.h
+++ b/include/crypto/dh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-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
@@ -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,28 +35,28 @@ 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);
 int ossl_dh_check_priv_key(const DH *dh, const BIGNUM *priv_key, int *ret);
-int ossl_dh_check_pairwise(const DH *dh);
+int ossl_dh_check_pairwise(const DH *dh, int return_on_null_numbers);
 
 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 519327f795742..00ea8fe667ba5 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 b08a42c7f2861..73a61e7a88baa 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 fde8358fc96db..f4a886b1ac534 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 12de11ade8da1..8cd634a6e603f 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 da85a7bd88d7d..22f614cccd3e5 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 782526bf85651..22003a3025ca6 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 0e8828e546650..f388b2e000e81 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);
-
-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_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]);
-
+    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);
+
+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_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 6240438d6d2aa..7d278e50360f4 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 56c458234bdd8..db930a5dc2d06 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 737c841d645a9..e5d3c572c88a3 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 15ec6fd0390a9..05a2eceb553bf 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 7acde5f8a4f5b..c29752117e407 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 8df2df11ededb..7766d05cd92fb 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 3f1eed3ff6322..456a64c943b1f 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 (*digest_custom) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx);
-} /* EVP_PKEY_METHOD */ ;
+    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 */;
 
 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))
-
-#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;\
-}
+    ((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_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_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_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_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; }
-
-#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_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_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)
+    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_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_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, \
@@ -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 66160bb105152..1a91b62fce568 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 827d61a235d67..f5550aa167fa6 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 0f64869f54ba0..73af3cead3a57 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 46214f3237ccb..6cc60d8d0d7d0 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 0df86dfb8c8c1..d1b65b84f4dc0 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 67d55697e9e3d..dbe91923647c3 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 d03ca83d00f2c..918d4e04b5401 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 ec9948241c350..47fc698aa135c 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 f9529b2a2f720..d05a0324c0b4c 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 f739fe03ad4e4..c37f32d2e64d8 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 b255ff5c6488e..3a2aa02261049 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 114971c607cdc..d1f1a52102704 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 9caa9af4a25f7..bf0e6bf607492 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 c195190bf8f6f..68d071b936fa4 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 ba54f3bdcbe1a..a7e1a2c28c75e 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 d999396a2f5cb..5945853ab1722 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 2e1c85c1f74fa..85efa7a5a4769 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 f7c1a165b45b9..712614c9c8808 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
-
-# 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
+#define OSSL_CRYPTO_RAND_H
+#pragma once
+
+#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
 
 /*
  * 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 d76040924dfa4..f37d264f3359f 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 3a7332673433a..b6c91c7f98069 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 1d78eb78f0aa5..9894b714d74a1 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 dcb465cbcae07..98423bc85fa80 100644
--- a/include/crypto/rsa.h
+++ b/include/crypto/rsa.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-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
@@ -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 9b23500b37083..d295eef80d233 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 58f49681dc63b..56fe8d2573d4d 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 99bcf0ff88355..fed23f1a667b5 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 0d0767fcf481b..3ffdc055e695f 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 8dc58bd32106a..b4f04a80c8a55 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 cf1e21215f9e7..b823a312b04c3 100644
--- a/include/crypto/slh_dsa.h
+++ b/include/crypto/slh_dsa.h
@@ -10,40 +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);
@@ -55,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 9ab6c0b722364..246d644c27974 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 706f4d69dec28..3dc4f7d93a100 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
-
-# endif
-
-# ifdef  __cplusplus
+#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
+
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/sm4.h b/include/crypto/sm4.h
index e21ec81ca6a8f..d97e3f55dec3e 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 3df1b4256de7a..e6f663ef55dea 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 447e715bf2051..34a01d46d3988 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 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 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 */
 
 /*
  * 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 */
-
-# if defined(OPENSSL_PIC) && !defined(__PIC__)
-#  define __PIC__
-# endif
-
-# if defined(__SUNPRO_C) && defined(__sparcv9) && !defined(__arch64__)
-#  define __arch64__
-# endif
-
+#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(__SUNPRO_C) && defined(__sparcv9) && !defined(__arch64__)
+#define __arch64__
+#endif
+
+/* clang-format off */
 # define SPARC_PIC_THUNK(reg)    \
         .align  32;             \
 .Lpic_thunk:                    \
@@ -74,30 +75,38 @@
         or      reg,%lo(_GLOBAL_OFFSET_TABLE_+4), reg;  \
         add     %o7, reg, reg
 # endif
-
-# 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)
-
-# 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)
-
-# endif
-
+/* clang-format on */
+
+#if defined(__arch64__)
+
+/* clang-format off */
+#define SPARC_LOAD_ADDRESS(SYM, reg) \
+    setx SYM, %o7, reg;
+/* clang-format on */
+#define LDPTR ldx
+/* clang-format off */
+#define SIZE_T_CC %xcc
+/* clang-format on */
+#define STACK_FRAME 192
+#define STACK_BIAS 2047
+#define STACK_7thARG (STACK_BIAS + 176)
+
+#else
+
+#define SPARC_LOAD_ADDRESS(SYM, reg) \
+    set SYM, reg;
+#define LDPTR ld
+/* clang-format off */
+#define SIZE_T_CC %icc
+/* clang-format on */
+#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
+
+/* clang-format off */
 # ifdef __PIC__
 #  undef SPARC_LOAD_ADDRESS
 #  undef SPARC_LOAD_ADDRESS_LEAF
@@ -114,9 +123,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 7ef7428379897..d2629000eeafc 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 9b7be71acd6f6..677e619fab47d 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 c46d845f8e417..33bed4cc24b86 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 2f34ba319de87..31c9da41f3d68 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 2bdd4a38be77e..8a9d0029d495f 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 789077a89f3ec..dbd149679135e 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 8439c1be6104c..fa085edeb8a28 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;
@@ -292,6 +292,7 @@ struct pkcs8_priv_key_info_st {
     X509_ALGOR *pkeyalg;
     ASN1_OCTET_STRING *pkey;
     STACK_OF(X509_ATTRIBUTE) *attributes;
+    ASN1_OCTET_STRING *kpub;
 };
 
 struct X509_sig_st {
@@ -316,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 79cb07ba365ac..083133c8e3473 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 c7c7d25e97f7e..4d4572861bc6f 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 66d3ad92f865b..b3874fc472153 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 36dbe0fcd32d3..509e5986cee66 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 9481f4c985e00..371421139c428 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 072f404a2c52f..911147b0009e8 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 64c0d4c327243..bfce90afafef5 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 d32b64a25fde3..9cf2314fa19f9 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 0c0415b777bd4..5de7279691a82 100644
--- a/include/internal/common.h
+++ b/include/internal/common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -8,40 +8,40 @@
  */
 
 #ifndef OSSL_INTERNAL_COMMON_H
-# define OSSL_INTERNAL_COMMON_H
-# pragma once
-
-# include <stdlib.h>
-# include <string.h>
-# include "openssl/configuration.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 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
+#define OSSL_INTERNAL_COMMON_H
+#pragma once
+
+#include <stdlib.h>
+#include <string.h>
+#include "openssl/configuration.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 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
 __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"
-
-# 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 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
+
+#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 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 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 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 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 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 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))
 
 /* 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 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 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 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 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)
 
 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 6960427542995..a0151e2b5014f 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 8c6c29cd2c5f6..e4fb787798ac1 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 4a2df34da9f23..34f2b78329d5e 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);
 }
@@ -322,29 +320,41 @@ static ossl_inline size_t value_barrier_s(size_t a)
     return r;
 }
 
+/* Convenience method for unsigned char. */
+static ossl_inline unsigned char value_barrier_8(unsigned char a)
+{
+#if !defined(OPENSSL_NO_ASM) && defined(__GNUC__)
+    unsigned char r;
+    __asm__("" : "=r"(r) : "0"(a));
+#else
+    volatile unsigned char r = a;
+#endif
+    return r;
+}
+
 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));
 }
@@ -352,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);
 }
@@ -378,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 &= mask;
+    xor&= value_barrier_32(mask);
     *a ^= xor;
     *b ^= xor;
 }
@@ -398,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 &= mask;
+    xor&= value_barrier_64(mask);
     *a ^= xor;
     *b ^= xor;
 }
@@ -420,16 +430,16 @@ 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;
 
     for (i = 0; i < len; i++) {
         tmp = a[i] ^ b[i];
-        tmp &= mask;
+        tmp &= value_barrier_8(mask);
         a[i] ^= tmp;
         b[i] ^= tmp;
     }
@@ -441,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;
@@ -467,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 03adb66bd342f..ea4b57e18bbbc 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 9e37320d83305..e5f918d8e679b 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 da442f8a86f7a..50aec7e7f4fef 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
-
-# ifdef OPENSSL_USE_APPLINK
-#  define BIO_FLAGS_UPLINK_INTERNAL 0x8000
-#  include "ms/uplink.h"
-# else
-#  define BIO_FLAGS_UPLINK_INTERNAL 0
-# endif
+#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
 
-# 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_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_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
 /* 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 a3d78a7f8050d..9c040eedc6833 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 a313a015459ea..2675c49f72262 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 8d6db8f066251..fe2d462caa9ff 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 5f0313fe38425..5568530459377 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 160ddb98db149..0f3edbff99c81 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 b1719e8377f40..3b1de62fccc4a 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 0c546c1d9460f..d287d910554bb 100644
--- a/include/internal/e_os.h
+++ b/include/internal/e_os.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -8,254 +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
-
-# 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))
-
-#  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_IFMT
-#   define S_IFMT      _S_IFMT
-#  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>
-#   ifdef _WIN64
-#    define strlen(s) _strlen31(s)
-/* cut strings to 2GB */
-static __inline unsigned int _strlen31(const char *str)
-{
-    unsigned int len = 0;
-    while (*str && len < 0x80000000U)
-        str++, len++;
-    return len & 0x7FFFFFFF;
-}
-#   endif   /* def(_WIN64) */
-#   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
+#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
+
+#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__ */
+
+#ifndef S_IFDIR
+#define S_IFDIR _S_IFDIR
+#endif
+
+#ifndef S_IFMT
+#define S_IFMT _S_IFMT
+#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
 FILE *__iob_func(void);
-#     define stdin  (&__iob_func()[0])
-#     define stdout (&__iob_func()[1])
-#     define stderr (&__iob_func()[2])
-#    endif
-#   endif
-#  endif
-
-#  include <io.h>
-#  include <fcntl.h>
-
-#  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 stdin (&__iob_func()[0])
+#define stdout (&__iob_func()[1])
+#define stderr (&__iob_func()[2])
+#endif
+#endif
+#endif
+
+#include <io.h>
+#include <fcntl.h>
+
+#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
 
 /* 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
-
-# else                          /* The non-microsoft world */
-
-#  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:
-
-     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.
-
-     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)
-
-#   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
-
-#   define LIST_SEPARATOR_CHAR ':'
-#   define EXIT(n)             exit(n)
-#  endif
-
-# 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 */
+
+#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:
+
+   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.
+
+   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)
+
+#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
+
+#define LIST_SEPARATOR_CHAR ':'
+#define EXIT(n) exit(n)
+#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
@@ -265,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
@@ -321,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
-
-# 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
+#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
+
+#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
@@ -349,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 72a38a529f5b9..c2a08ebed1a1e 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 d7ad2097f459d..239f4c3e7fecc 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 7d5a73b1bb1fa..51c10873cd3ca 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 d8a308f0b46f1..41b28ac473114 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 edd8381e8df43..fd56b07e94bf0 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 3f70c0de93c55..2e02ff77b7b48 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 cabc7beed4a78..78d7c859d59db 100644
--- a/include/internal/hashfunc.h
+++ b/include/internal/hashfunc.h
@@ -8,9 +8,10 @@
  */
 
 #ifndef OPENSSL_HASHFUNC_H
-# define OPENSSL_HASHFUNC_H
+#define OPENSSL_HASHFUNC_H
 
-# include <openssl/e_os2.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 ccbc470db7228..bc44e43678a36 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;                                 \
-}
-
-#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);                              \
+    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);
 
 /*
  * 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 e1da5e0596fbf..9c52ba469386e 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 e7d9a6d922e7c..973debe525c5b 100644
--- a/include/internal/json_enc.h
+++ b/include/internal/json_enc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -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);
 
@@ -202,9 +202,6 @@ void ossl_json_u64(OSSL_JSON_ENC *json, uint64_t value);
 /* Encode a JSON integer from an int64_t. */
 void ossl_json_i64(OSSL_JSON_ENC *json, int64_t value);
 
-/* Encode a JSON number from a 64-bit floating point value. */
-void ossl_json_f64(OSSL_JSON_ENC *json, double value);
-
 /*
  * Encode a JSON UTF-8 string from a zero-terminated string. The string passed
  * can be freed immediately following the call to this function.
diff --git a/include/internal/ktls.h b/include/internal/ktls.h
index 072653dc5eeb9..83f66b9dba939 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
-
-# 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>
-
-#   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
+#define HEADER_INTERNAL_KTLS
+#pragma once
+
+#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>
+
+#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__ */
-
-#  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 <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 TCP_ULP
-#    define TCP_ULP 31
-#   endif
-
-#   ifndef TLS_RX
-#    define TLS_RX                  2
-#   endif
+#endif /* __FreeBSD__ */
+
+#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 <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 TCP_ULP
+#define TCP_ULP 31
+#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 a40f7fe6c2492..8bb0b741bed12 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 a3a3414869ae4..f74a7d72d5052 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 b758513b4caec..d0b2c39596ec8 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 4a93a24756375..38d9d102fe85b 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
-
-
-# ifndef INT128_MAX
-#  if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__ == 16
+#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
 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 add34d14be118..d715a5dd3fe34 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 6fcd345ce28de..e5de4d43283f6 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 5173b4675d8df..783ede37715e0 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 3518f008f009b..c7785a12e6161 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 f34db21951c5e..cb1378b3908ad 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 3fbd0cf954c53..d0d309886d9a5 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 54d997b0d90b2..803622867b732 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 5be03bf131c88..067c8815961e9 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 3adff4994003e..b63634c678d53 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 fbee53f11e840..94e2c90955d7e 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 6909a1919c3dd..1b4050a81f52c 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,16 +56,19 @@ 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);
 
+/* Force loading of fallback providers if necessary */
+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);
@@ -80,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
@@ -100,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 b81bfe7e4b967..0455f21b48c94 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_END()                                                  \
-            ossl_qlog_event_end(qlog_instance);                             \
-        }                                                                   \
+#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_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 43d62360805a4..e885bfd503071 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 c271dfca2e1db..c0617da4855f6 100644
--- a/include/internal/quic_ackm.h
+++ b/include/internal/quic_ackm.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -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);
+    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 dbd439dd0cf50..94214655c030c 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 56ebcb930ed61..0b2a3a4cb2d6f 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);
-
-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);
+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);
 
 /*
  * 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 4476481fef9ba..b917b966abeb4 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 d0781e61cf0f2..a1bb344dc4688 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 23e3fd4932eb8..30feb03b7f425 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 86d1c692b4f03..44895f77f6a85 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 923bd43bc328e..007e84dd9a9e5 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 c1644e4d8ef22..4ea7a2e0d2262 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 accfe049b52d3..66421e8ac1b77 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 6a4dde81da9be..5a2c9352378bf 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 657d86329c6e6..c8d4ad470f588 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 fd102241b294b..aa734f3643311 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 e47ce52e6f312..dffc37d7549e7 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 12e21cb518b7a..8adc94d161ab2 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 8e0cd6a2c9270..287837b2a5610 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,23 @@ 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.
+ * Occasionally we use a temporary qrx to do packet validation on quic frames
+ * that are not yet associated with a channel, and in the event a validation is
+ * successful AND we allocate a new qrx for the newly created channel, we need
+ * to migrate the largest_pn values recorded in the tmp qrx to the channel qrx.
+ * If we don't then PN decoding fails in cases where the initial PN is a large value.
+ * This function does that migration for us
+ */
+void ossl_qrx_update_pn_space(OSSL_QRX *src, OSSL_QRX *dst);
 
 /*
  * Informs the QRX that it can now discard key material for a given EL. The QRX
@@ -189,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
@@ -210,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;
 };
 
 /*
@@ -311,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
@@ -328,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
@@ -503,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
@@ -529,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
  * ==============
@@ -554,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 e84523f895ca7..b2be046f8c61c 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 97e630d924e0c..61ab925462344 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 c90964a7c16c1..648341e9c8f00 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 8ed1dcb137e38..1a22cc3f387aa 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 a25e71aa81ed3..69c9df09e71e7 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 d60c285e22950..1a8f55da5df28 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 acfeb0d515052..f714d10477166 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);
@@ -72,13 +72,13 @@ __owur const SSL_CIPHER *ossl_quic_get_cipher(unsigned int u);
 int ossl_quic_renegotiate_check(SSL *ssl, int initok);
 
 int ossl_quic_do_handshake(SSL *s);
-void ossl_quic_set_connect_state(SSL *s);
-void ossl_quic_set_accept_state(SSL *s);
+int ossl_quic_set_connect_state(SSL *s, int raiseerrs);
+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 2fca69b0d181b..e6a7ebfb84135 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 d446dadc50477..824d4b896967f 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 76834e7434385..3d249009efa13 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 12d9750ad3315..fbfac146dab0a 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 eb385bb7ff979..707f7df9e37c0 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;
 
     /*
@@ -96,14 +96,16 @@ int ossl_quic_tls_configure(QUIC_TLS *qtls);
 /* Advance the state machine */
 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 fb37427996413..f462ce0c00901 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 30439bd8535e5..91516b1876a13 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 b76308e5878f2..d94a79620d27b 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
-
-# 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
+#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"
+
+#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 5df6ad46cb309..d3f96807e21af 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 0913b370546f2..8636912cd9edc 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 d4b70b229c323..61012f6da7d10 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 cd01feb036285..f2efabaeba16c 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
-
-# include "internal/e_os.h"
-# include "internal/time.h"
-# include "internal/quic_types.h"
-# include "internal/packet_quic.h"
-
-# 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_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_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"
+
+#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_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_IS_STREAM(x) \
+#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) \
     (((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 8688253eaeefa..657bad58b050e 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 90160e8da71d9..a89794c0c8ad2 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 b36c74c7f3b7f..eedded636c2f5 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 8de230f343ac1..61eb78ae41205 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
-
-# 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
+#define OSSL_INTERNAL_REFCOUNT_H
+#pragma once
+
+#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(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 436f1ca146284..cc70bfaeac9ab 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 ec2035714f756..794fccf40a68a 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 ecfb281f40aab..dda5cc48f0118 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 aebdd6eb8f533..d67aa1e19f553 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 713a7466ae06d..49c381e394e9e 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 6d0c643c3f199..a4b6c6e6a9e5c 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 db1d61f0523cc..32a05ae9ef713 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 8e2f4414b52e7..877bbd7145b00 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
-
-# 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
-
-# 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
+#define OSSL_INTERNAL_SOCKETS_H
+#pragma once
+
+#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
+
+#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
 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,156 +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
-
-# 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
-
-#  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 <poll.h>
-#   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_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 INVALID_SOCKET
-#   define INVALID_SOCKET      (-1)
-#  endif
-# 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
+
+#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
+
+#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
+
+#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
 
 /*
  * 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
-
-# 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_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)
+
+#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 8a0c797496724..5093f779e2411 100644
--- a/include/internal/ssl.h
+++ b/include/internal/ssl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -10,15 +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
 
 #endif
diff --git a/include/internal/ssl3_cbc.h b/include/internal/ssl3_cbc.h
index 4fb5da1906e2f..4c102693a0fbc 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 86c134569883f..ec6dbffa924a7 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
-
-# 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 OSSL_SSL_UNWRAP_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) \
     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
-
-# 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_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_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 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 IS_QUIC_CS(ssl) ((ssl) != NULL                                \
-                           && ((ssl)->type == SSL_TYPE_QUIC_CONNECTION  \
-                               || (ssl)->type == SSL_TYPE_QUIC_XSO))
-
-#  define IS_QUIC(ssl)                                                  \
+#endif
+
+#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_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_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 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 IS_QUIC_CS(ssl) ((ssl) != NULL          \
+    && ((ssl)->type == SSL_TYPE_QUIC_CONNECTION \
+        || (ssl)->type == SSL_TYPE_QUIC_XSO))
+
+#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 fd7f7e333183d..a7cec01bf627e 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 62dc4eec0ba7c..a41ed3227031e 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
 
 /*****************************************************************************
  *                                                                           *
@@ -26,6 +26,8 @@ typedef enum {
     WORK_FINISHED_STOP,
     /* We're done working move onto the next thing */
     WORK_FINISHED_CONTINUE,
+    /* We're done writing, start reading (or vice versa) */
+    WORK_FINISHED_SWAP,
     /* We're working on phase A */
     WORK_MORE_A,
     /* We're working on phase B */
@@ -80,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);
 
@@ -141,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);
@@ -164,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 33bae51e49cc5..01433c3061529 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 8c5bad77635eb..eaff038567ee3 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 aba9362e8d6f1..d7fc08a8afaaa 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"
-
-# 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
-
-# include <openssl/crypto.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(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>
 
 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 d6cb2eeec3bc1..8c969441f3d77 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 140dc1f338811..2a54c491f16ff 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 14f2f47f76cd6..1fd41993ea791 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 e37e9f0b4390e..36f4671c66b92 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 a840df0b24ceb..87dbaba78f12c 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 dcb29b33f3cca..fd8ba4b6afa3c 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 a6de8352d6802..4ef53cd69c2f3 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 d0f9dfc6f1cdb..2b6c683988266 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 68391c73a1f9e..fd1fb05a1c902 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
-
-# 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>
-
-# include <openssl/types.h>
-# include <openssl/bn.h>
-
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-#ifdef  __cplusplus
+#define OPENSSL_ASN1_H
+#pragma once
+
+#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>
+
+#include <openssl/types.h>
+#include <openssl/bn.h>
+
+#ifdef OPENSSL_BUILD_SHLIBCRYPTO
+#undef OPENSSL_EXTERN
+#define OPENSSL_EXTERN OPENSSL_EXPORT
+#endif
+
+#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 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 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 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_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_DISPLAYTEXT \
-                        B_ASN1_IA5STRING| \
-                        B_ASN1_VISIBLESTRING| \
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UTF8STRING
+#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_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
 
 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)
-
-# ifdef  __cplusplus
+#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
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h
index 8fd85ed881124..91756141b0f83 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 b536fe51a20ac..ca8bbc2517daf 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_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(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)
 
 /* 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_END(stname) 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 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_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_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_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_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_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_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_SEQUENCE(tname) \
+    static const ASN1_TEMPLATE tname##_seq_tt[]
+
+#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 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 ASN1_NDEF_SEQUENCE(tname) \
+    ASN1_SEQUENCE(tname)
+
+#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_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_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_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_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_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_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 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 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 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(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_END(stname) 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 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 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)
 
 /* 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_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 ASN1_ADB_TEMPLATE(name) \
-        static const ASN1_TEMPLATE name##_tt
+#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 ADB_ENTRY(val, template) { val, template }
+
+#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_EXTERN_ASN1(sname, tag, fptrs) \
-        ASN1_ITEM_start(sname) \
-                ASN1_ITYPE_EXTERN, \
-                tag, \
-                NULL, \
-                0, \
-                &fptrs, \
-                0, \
-                #sname \
-        ASN1_ITEM_end(sname)
+#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)
 
 /* 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_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_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_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_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_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_ASN1_DUP_FUNCTION(stname) \
-        stname * stname##_dup(const stname *x) \
-        { \
+#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_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_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_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_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_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)                \
+    {                                                    \
         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 826ffb993497a..904438560f4de 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 c093f7be4547a..41bd4a0391ad2 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 228e00e0a6dd3..ba8e81e7084bf 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_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_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_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_PEEK           29/* BIO_f_buffer special */
-# define BIO_CTRL_SET_FILENAME   30/* BIO_s_file special */
+#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 */
 
 /* 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_SET_PEEK_MODE      71
+#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
 
 /*
  * 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_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_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
 
 /*
  * 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_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
+#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)
+
+#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_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_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
 /* 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_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_EX_ARG                        153
-# define BIO_C_GET_EX_ARG                        154
-
-# define BIO_C_SET_CONNECT_MODE                  155
-
-# 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_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)
-
-# ifndef OPENSSL_NO_SOCK
+#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_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_CONNECT_MODE 155
+
+#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_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)
+
+#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_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_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)
 /* ...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 e4fdb64974fc0..b4ee5c68beec1 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 667d6423912bd..49c74e946ce7c 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 ea706dca7f2f0..d210b8bddd511 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
-
-# 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>
-
-#ifdef  __cplusplus
+#define OPENSSL_BN_H
+#pragma once
+
+#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>
+
+#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 7c3f6ef3d4ba5..dbbcd699bba48 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 5773b986bd217..09b35e8e18e85 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 d18b1f8f07351..4fa0da44be232 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 3c8f34b291827..393f34b1c3d3d 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)
-
-# 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(__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
+#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(__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)
+
+#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 88c2279e90f11..aec94e4efc942 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 0bf217beab23e..af943124821d9 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 f50861836f48f..c72da7ecdcb04 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 d659331fa38fa..b600aa6bbdd38 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 9a168922bfcec..a0ee20f473a17 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 62137aa8d1f58..b07ac6d6c6db1 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 0ae75abdfe6fe..dc87758514a72 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 5cfe07dbb3a34..8c12c5664fd15 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 bd1efdc568e99..c29de506ff8bf 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 1948d37f1a009..90ec7c1144be7 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 5663287089c9e..0ebd2b9e0342e 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
-
-# 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
-
-#ifdef  __cplusplus
+#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/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
 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 ed67d5778f1d3..f3f3c640853ad 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 a8798e792412b..0b984dd65d4d0 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 86077d0a6f5d6..4e7bff16c7b27 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 17cefaa443352..f2d2be19d0674 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 18c199182e34a..a883173ddd2ab 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 690a38206a35e..65faa5f2cf128 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,294 +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
-
-
-OSSL_CORE_MAKE_FUNC(OSSL_CORE_BIO *, BIO_new_file, (const char *filename,
-                                                    const char *mode))
+#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_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_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_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))
 
 /* 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
+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))
@@ -363,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
-
-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))
+#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))
 
 /*-
  * Key management
@@ -637,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
-
-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))
+#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(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))
 
 /*-
@@ -916,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
@@ -1102,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 d53cac43327ca..897a7a94cc5ba 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 62ccf39d3259c..df0c79436d880 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 3fab255a3fd56..3d9cbf4320b5f 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 a9b04e0ebb218..22153940eeb90 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 e0ace5e5a064c..696eabb5b49e2 100644
--- a/include/openssl/crypto.h.in
+++ b/include/openssl/crypto.h.in
@@ -1,7 +1,7 @@
 /*
  * {- join("\n * ", @autowarntext) -}
  *
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -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(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_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)
 
 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
-
-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);
+#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);
 __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,74 +282,74 @@ 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)
-
-#  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_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 */
+
+#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);
-OSSL_CRYPTO_ALLOC void *CRYPTO_memdup(const void *str, size_t siz, const char *file, int line);
-OSSL_CRYPTO_ALLOC char *CRYPTO_strdup(const char *str, const char *file, int line);
-OSSL_CRYPTO_ALLOC char *CRYPTO_strndup(const char *str, size_t s, 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);
 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 7fa79cf385412..626e3e9be57bd 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 ccab33a5d4f07..b1388a5b57b36 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 3fc2aaa9427ea..a6103980d4304 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
-
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CT_H
-# endif
-
-# 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
-extern "C" {
-# endif
+#define OPENSSL_CT_H
+#pragma once
+
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_CT_H
+#endif
 
+#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
+extern "C" {
+#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 935d32d8b144b..950b7b388cc78 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 d4ee2cf41340c..8194c2492acb8 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 4212a38bca2ad..5fdeace4f971a 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 09798a616ffbd..daaef4e820b6c 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 97024929a40de..6d0abe2d217d2 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
-
-# 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_CHECK_MAX_MODULUS_BITS
-#   define OPENSSL_DH_CHECK_MAX_MODULUS_BITS  32768
-#  endif
-
-#  define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024
-
-#  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
-
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#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_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
+
+#define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024
+
+#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
+
+#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 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_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 DH_CHECK_P_NOT_STRONG_PRIME DH_CHECK_P_NOT_SAFE_PRIME
+
+#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((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 2997d7d4c2c8d..753659be16f82 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 109878e68863e..61baa64bee7e9 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
-
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_DSA_H
-# endif
-
-# include <openssl/opensslconf.h>
-# include <openssl/types.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
-
-# ifdef  __cplusplus
+#define OPENSSL_DSA_H
+#pragma once
+
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_DSA_H
+#endif
+
+#include <openssl/opensslconf.h>
+#include <openssl/types.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
+
+#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 26ada57d80abc..cc5f4bfbb7c3a 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 5dc6b5419c275..0b42948d02d8c 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 b8c61079159fa..86a572bb12e3f 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 0e17487504992..c0f1c547db72b 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 e0ae1aa84e4a2..f2171bb055464 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 e1cbe982287b6..cdde09ca62b66 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
-
-# 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)
+#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)
 
 /* 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_ECC_MAX_FIELD_BITS
-#   define OPENSSL_ECC_MAX_FIELD_BITS 661
-#  endif
-
-#  include <openssl/params.h>
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#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
+
+#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));
-
-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_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_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_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 */
-
-#  define EVP_EC_gen(curve) \
+    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_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_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_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_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) \
     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)
-
-#  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
+/* 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
+
+#endif
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h
index f15f91f6bf05f..e4d26aa111512 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 c37a6f16f23cc..9138c07276b69 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 5e318b145370a..e07174c3acd23 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 5b4b504be7db3..73f6d86aaf704 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
-
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_ENGINE_H
-# endif
-
-# 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
+#define OPENSSL_ENGINE_H
+#pragma once
+
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_ENGINE_H
+#endif
+
+#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
 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
-
-#  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
+#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
 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 d439b6827e60d..7cdfb8aa64882 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 9143704c098e2..d451f82eca655 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_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
+#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
+
+#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)) )
-
-# 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
+#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
 
 /*
  * 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 d1a685b98e3ef..62aaec1726e00 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 165ce7c437517..46881293cb071 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 e5da1e64151bd..e83ad13183466 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
-
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_ENVELOPE_H
-# endif
-
-# include <stdarg.h>
-
-# 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>
-
-# 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 OPENSSL_EVP_H
+#pragma once
+
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_ENVELOPE_H
+#endif
+
+#include <stdarg.h>
+
+#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>
+
+#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
-
-# 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
-
-# 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 PKCS5_DEFAULT_ITER 2048
+
+#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
+
+#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 )
-
-#ifdef  __cplusplus
+#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
 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_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_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
-
-# 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
+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);
+
+#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
+
+#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_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_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)
-
-# ifdef CONST_STRICT
+#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_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
 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);
-
-# 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);
+    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);
 
 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 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 (*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_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_ALG_CTRL               0x1000
-
-# define EVP_PKEY_FLAG_AUTOARGLEN        2
+#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_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 c51e07cad98f3..06dd95f4e2541 100644
--- a/include/openssl/evperr.h
+++ b/include/openssl/evperr.h
@@ -1,6 +1,6 @@
 /*
  * Generated by util/mkerr.pl DO NOT EDIT
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -9,134 +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_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 fa481fc611313..3e310bb4a8f2a 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 c53012a862113..0f951dbc4ddd6 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 f9e1bff3f7478..cb866b22787b0 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 482acd22c38b2..12496ffe60ee8 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_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_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_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 d7aa570725053..91aa923282a23 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 ae7f00cac0a12..adac95018691d 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 1f9bb3b3c71fc..674a941b1a3ab 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 3ea0122188642..66d6f4234a65c 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 0983230a488af..d06ca6c69de96 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_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_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
 
 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 963d766dfc850..a2c1f24e046df 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 63a9c53bfaf8d..522724980ef20 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 296723ec4237e..de34b4640d490 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 5d4cb77e71cb1..10d9a0f216266 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 6c150a6cb24ce..d60fe4a667dab 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 77a577340f714..0ec3d1ce956da 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 5a7ee289d1d07..46c96525deee0 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 1c9016345820c..fe5b0e2b7b89d 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 e19079912ba24..df11114569f24 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 ee71e26458ff7..bbce70f3652cc 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 cc9f3c51b059c..de1f1db97d6d5 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_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_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 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 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)
 
 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 585217f6f7d13..2927561135f20 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 e2cc2716b56bd..d2cfd9c1163bb 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
-
-
-# ifndef OPENSSL_NO_OCSP
-
-#  include <openssl/x509.h>
-#  include <openssl/x509v3.h>
-#  include <openssl/safestack.h>
-#  include <openssl/ocsperr.h>
-
-#  ifdef __cplusplus
+#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
+
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/safestack.h>
+#include <openssl/ocsperr.h>
+
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
 /* Various flags and values */
 
-#  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_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
 
 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 46a0523c2de4d..18e035e8a4e10 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 1e83371f1a432..4a8d78efff70a 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 3f47a2ac08f05..58b290ea55afb 100644
--- a/include/openssl/opensslv.h.in
+++ b/include/openssl/opensslv.h.in
@@ -1,7 +1,7 @@
 /*
  * {- join("\n * ", @autowarntext) -}
  *
- * Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-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
@@ -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,41 +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 */
 
-/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
-# ifdef OPENSSL_VERSION_PRE_RELEASE
-#  define _OPENSSL_VERSION_PRE_RELEASE 0x0L
-# else
-#  define _OPENSSL_VERSION_PRE_RELEASE 0xfL
-# endif
+/* 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)        \
-      |_OPENSSL_VERSION_PRE_RELEASE )
+      |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 82a58988ff2d7..a562299b9f9ad 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 f29fdb2963d35..be6a0252100ea 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 d4b855dffb1fe..73e0d41b71791 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 94424e6c209eb..fa64aaf4ca27f 100644
--- a/include/openssl/pem.h
+++ b/include/openssl/pem.h
@@ -8,62 +8,63 @@
  */
 
 #ifndef OPENSSL_PEM_H
-# define OPENSSL_PEM_H
-# pragma once
-
-# 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
-
-#ifdef  __cplusplus
+#define OPENSSL_PEM_H
+#pragma once
+
+#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
+
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-# 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_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_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_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
@@ -71,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)
-
-# 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 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
+
+#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)                        \
     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
-
-# 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);                    \
+#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_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
-
-# 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
-
-# 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
-
-# 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)
-
-# 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)
+#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)
+
+#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)
+
+#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_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
+
+#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 */
 
@@ -221,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)
-
-#  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) /**/
+#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) /**/
 
-# 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)
@@ -452,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);
 
@@ -534,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 a8a5325bd4bae..6d3ab2abf8893 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 3530775bdc634..eb3c9a1d94fa1 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 097afba368d0f..67d0bdb23ae89 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
-
-# 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
+#define OPENSSL_PKCS12_H
+#pragma once
+
+#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
 
 #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 abce3736289b6..2ad38f88ff5d5 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 57e45dc2fb6d2..1d57255ae7470 100644
--- a/include/openssl/pkcs7.h.in
+++ b/include/openssl/pkcs7.h.in
@@ -9,34 +9,35 @@
  * 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
-
-# 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/symhacks.h>
-# include <openssl/types.h>
-# include <openssl/pkcs7err.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
+#define OPENSSL_PKCS7_H
+#pragma once
+
+#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/symhacks.h>
+#include <openssl/types.h>
+#include <openssl/pkcs7err.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*-
 Encryption_ID           DES-CBC
@@ -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 ceb1a50198671..358fe1018fb2d 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 76d01e1eb89c4..269c3b8057378 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 0d61b733dc59b..3dff4b75482ff 100644
--- a/include/openssl/proverr.h
+++ b/include/openssl/proverr.h
@@ -9,161 +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_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 514435773b12e..c34beea201f2f 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 8eacc631eb12c..657969bc8acb9 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 4e59e50f7839e..7272309fba702 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 5e1e6d7996c5f..6107cdd48167d 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 ff633fd80f168..7da28f7c72c36 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 600b2885df1bf..92dce0c405224 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 de833523102ae..2e91e98540977 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 900ee317b9287..a72d1dad0a176 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 167427d3c4866..a06d4f0a02728 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
-
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_RSA_H
-# endif
-
-# 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
-
-# ifdef  __cplusplus
+#define OPENSSL_RSA_H
+#pragma once
+
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_RSA_H
+#endif
+
+#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
+
+#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));
-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 (*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);
 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 c58463c7c19f2..8432f5f6552dd 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 6b36607928ff8..a88409ba4151e 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 edb218ae6e2dd..8c2b20a4d801d 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 2d39e096eeab4..de736794a99a6 100644
--- a/include/openssl/self_test.h
+++ b/include/openssl/self_test.h
@@ -8,105 +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_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_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 163a7d588af93..52b02661f6244 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 dfbe845b8387d..6d2350d2e48ed 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);
-
-#  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_SRP_INDEX    'I'
-#  define DB_SRP_VALID    'V'
-#  define DB_SRP_REVOKED  'R'
-#  define DB_SRP_MODIF    'v'
+    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 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'
 
 /* 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 2c2c334443c42..3b716e124b38a 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 b3420799683b5..bdcc68529be57 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
-
-# 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/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
+#define OPENSSL_SSL_H
+#pragma once
+
+#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/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
 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_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_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_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_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_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_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_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_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_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 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 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
 /* 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_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_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_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);
-
-# 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
+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
 /* 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_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_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
 
 /*
  * 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_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_ST_CONNECT 0x1000
+#define SSL_ST_ACCEPT 0x2000
+
+#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
 
 /* 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
-
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define OpenSSL_add_ssl_algorithms()   SSL_library_init()
-#  define SSLeay_add_ssl_algorithms()    SSL_library_init()
-# endif
+#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
 
 /* 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 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 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)
 
 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
-
-# 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_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
+
+#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_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_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, \
         (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_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
+#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
+
+#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,28 +1830,28 @@ 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);
 __owur int SSL_CTX_set_trust(SSL_CTX *ctx, int trust);
 __owur int SSL_set_trust(SSL *ssl, int trust);
 
-__owur int SSL_set1_host(SSL *s, const char *hostname);
-__owur int SSL_add1_host(SSL *s, const char *hostname);
+__owur int SSL_set1_host(SSL *s, const char *host);
+__owur int SSL_add1_host(SSL *s, const char *host);
 __owur const char *SSL_get0_peername(SSL *s);
 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_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_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_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);
-
-#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
+    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
 __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);
-
-# 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_EVENT_HANDLING_MODE_INHERIT      0
-# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT     1
-# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT     2
+    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_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
 
 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))
-
-# 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_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)
+        (value))
+
+#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_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 428ead0540e91..67d1d0291a160 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 4f076c6c9dfb9..f35b6eadb0f7b 100644
--- a/include/openssl/ssl3.h
+++ b/include/openssl/ssl3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -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_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_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_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_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_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_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_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_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_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"
 
 /*
  * 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_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_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
-
-# 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
+#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_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_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
 
 /*
  * This is the maximum MAC (digest) size used by the SSL library. Currently
@@ -163,195 +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)
-
-# define SSL3_MD_CLIENT_FINISHED_CONST   "\x43\x4C\x4E\x54"
-# define SSL3_MD_SERVER_FINISHED_CONST   "\x53\x52\x56\x52"
+#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"
 
 /* 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_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 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)
 
 /* 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_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_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_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
 /*
  * 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) */
-
-# 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
+/* 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
 
 /* 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)
-
-#ifdef  __cplusplus
+#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
 }
 #endif
 #endif
diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index 53e0decbe6768..6993255b199f1 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 4c353671c7e88..8cf1ebd7b026f 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 f0c5c54765af5..82ef52ab72a73 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 e6ea3cf87886a..53c68516f8eef 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_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_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 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 00529c88b59a6..a61bee11125f9 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 816f8f9989104..d04139545385c 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 3926ce54d78b5..6d86e0e355186 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 8e9b110bb303b..931ee790fb01f 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 TLS1_VERSION_MAJOR              0x03
-# define TLS1_VERSION_MINOR              0x01
-
-# 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_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_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 TLS_ANY_VERSION 0x10000
+
+#define TLS1_VERSION_MAJOR 0x03
+#define TLS1_VERSION_MINOR 0x01
+
+#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_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_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_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_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
 
 /* 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_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_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
 
 /* 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_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_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_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_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_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_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_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
 
 /* 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_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_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"
 
 /* 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_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_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_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_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_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_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_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"
 
 /* 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_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_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_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_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"
 
 /* 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_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_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"
 
 /* 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_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_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_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_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_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_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_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"
 
 /* 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 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
+#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
+
+#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 2ca07f748f514..ff0fba7295897 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 31c78b55a4024..edb6ca17bd7ae 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
-
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_TS_H
-# endif
-
-# 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
+#define OPENSSL_TS_H
+#pragma once
+
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_TS_H
+#endif
+
+#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
 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 e1b943e42dbd3..0bec94a37cd36 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 af169a309ebcc..64e9d4c04e764 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
-
-# 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>
-
-# 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
+#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/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
+
+#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 344d892a9ea7f..e4d105c991977 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 eb9a580fa8f4a..cbc1b65390562 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 473b04ed1138e..5201b0311df6f 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 05ba463246265..cff913453fdd4 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 809b9c645d43a..d7ce34482b084 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
-
-# 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>
-
-# 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
-
-#ifdef  __cplusplus
+#define OPENSSL_X509_H
+#pragma once
+
+#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>
+
+#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
+
+#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_STDIO
+#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
 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 bf4395eec6aa5..e136de04dcfe6 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 2a402f2161370..ce9d7bb9b1ded 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_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_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_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_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_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_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_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_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_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_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
 
 /* 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 77b91c8b2cff3..7123a725e8254 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 baf8b5ab1cffb..29231d22decb7 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
-
-# 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
+#define OPENSSL_X509V3_H
+#pragma once
+
+#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
 
 #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 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 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
 
 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 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 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_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 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 X509_PURPOSE_DYNAMIC    0x1
-# define X509_PURPOSE_DYNAMIC_NAME       0x2
+#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 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
 
 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");
 -}
-
-# 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
+/* 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_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 4bbcfc230237b..19f938626bd84 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
diff --git a/ms/applink.c b/ms/applink.c
index 601d016633a11..40aa9466757fb 100644
--- a/ms/applink.c
+++ b/ms/applink.c
@@ -7,31 +7,31 @@
  * https://www.openssl.org/source/license.html
  */
 
-#define APPLINK_STDIN   1
-#define APPLINK_STDOUT  2
-#define APPLINK_STDERR  3
+#define APPLINK_STDIN 1
+#define APPLINK_STDOUT 2
+#define APPLINK_STDERR 3
 #define APPLINK_FPRINTF 4
-#define APPLINK_FGETS   5
-#define APPLINK_FREAD   6
-#define APPLINK_FWRITE  7
+#define APPLINK_FGETS 5
+#define APPLINK_FREAD 6
+#define APPLINK_FWRITE 7
 #define APPLINK_FSETMOD 8
-#define APPLINK_FEOF    9
-#define APPLINK_FCLOSE  10      /* should not be used */
-
-#define APPLINK_FOPEN   11      /* solely for completeness */
-#define APPLINK_FSEEK   12
-#define APPLINK_FTELL   13
-#define APPLINK_FFLUSH  14
-#define APPLINK_FERROR  15
+#define APPLINK_FEOF 9
+#define APPLINK_FCLOSE 10 /* should not be used */
+
+#define APPLINK_FOPEN 11 /* solely for completeness */
+#define APPLINK_FSEEK 12
+#define APPLINK_FTELL 13
+#define APPLINK_FFLUSH 14
+#define APPLINK_FERROR 15
 #define APPLINK_CLEARERR 16
-#define APPLINK_FILENO  17      /* to be used with below */
+#define APPLINK_FILENO 17 /* to be used with below */
 
-#define APPLINK_OPEN    18      /* formally can't be used, as flags can vary */
-#define APPLINK_READ    19
-#define APPLINK_WRITE   20
-#define APPLINK_LSEEK   21
-#define APPLINK_CLOSE   22
-#define APPLINK_MAX     22      /* always same as last macro */
+#define APPLINK_OPEN 18 /* formally can't be used, as flags can vary */
+#define APPLINK_READ 19
+#define APPLINK_WRITE 20
+#define APPLINK_LSEEK 21
+#define APPLINK_CLOSE 22
+#define APPLINK_MAX 22 /* always same as last macro */
 
 #ifndef APPMACROS_ONLY
 
@@ -41,17 +41,17 @@
  * following included header files.  You will need to put these
  * include lines somewhere in the file that is including applink.c.
  */
-# ifndef APPLINK_NO_INCLUDES
-#  include <stdio.h>
-#  include <io.h>
-#  include <fcntl.h>
-# endif
-
-# ifdef __BORLANDC__
-   /* _lseek in <io.h> is a function-like macro so we can't take its address */
-#  undef _lseek
-#  define _lseek lseek
-# endif
+#ifndef APPLINK_NO_INCLUDES
+#include <stdio.h>
+#include <io.h>
+#include <fcntl.h>
+#endif
+
+#ifdef __BORLANDC__
+/* _lseek in <io.h> is a function-like macro so we can't take its address */
+#undef _lseek
+#define _lseek lseek
+#endif
 
 static void *app_stdin(void)
 {
@@ -97,23 +97,21 @@ static int app_fsetmod(FILE *fp, char mod)
 extern "C" {
 #endif
 
-__declspec(dllexport)
-void **
-# if defined(__BORLANDC__)
-/*
- * __stdcall appears to be the only way to get the name
- * decoration right with Borland C. Otherwise it works
- * purely incidentally, as we pass no parameters.
- */
-__stdcall
-# else
-__cdecl
-# endif
-OPENSSL_Applink(void)
+__declspec(dllexport) void **
+#if defined(__BORLANDC__)
+    /*
+     * __stdcall appears to be the only way to get the name
+     * decoration right with Borland C. Otherwise it works
+     * purely incidentally, as we pass no parameters.
+     */
+    __stdcall
+#else
+    __cdecl
+#endif
+    OPENSSL_Applink(void)
 {
     static int once = 1;
-    static void *OPENSSL_ApplinkTable[APPLINK_MAX + 1] =
-        { (void *)APPLINK_MAX };
+    static void *OPENSSL_ApplinkTable[APPLINK_MAX + 1] = { (void *)APPLINK_MAX };
 
     if (once) {
         OPENSSL_ApplinkTable[APPLINK_STDIN] = app_stdin;
diff --git a/ms/uplink.c b/ms/uplink.c
index 48f31838fc78f..dae851e438400 100644
--- a/ms/uplink.c
+++ b/ms/uplink.c
@@ -8,13 +8,13 @@
  */
 
 #if (defined(_WIN64) || defined(_WIN32_WCE)) && !defined(UNICODE)
-# define UNICODE
+#define UNICODE
 #endif
 #if defined(UNICODE) && !defined(_UNICODE)
-# define _UNICODE
+#define _UNICODE
 #endif
 #if defined(_UNICODE) && !defined(UNICODE)
-# define UNICODE
+#define UNICODE
 #endif
 
 #include <windows.h>
@@ -36,7 +36,7 @@ void OPENSSL_Uplink(volatile void **table, int index)
     static HMODULE volatile apphandle = NULL;
     static void **volatile applinktable = NULL;
     int len;
-    void (*func) (void) = unimplemented;
+    void (*func)(void) = unimplemented;
     HANDLE h;
     void **p;
 
@@ -56,32 +56,32 @@ void OPENSSL_Uplink(volatile void **table, int index)
      */
     do {
         len = _sntprintf(msg, sizeof(msg) / sizeof(TCHAR),
-                         _T("OPENSSL_Uplink(%p,%02X): "), table, index);
+            _T("OPENSSL_Uplink(%p,%02X): "), table, index);
         _tcscpy(msg + len, _T("unimplemented function"));
 
         if ((h = apphandle) == NULL) {
             if ((h = GetModuleHandle(NULL)) == NULL) {
-                apphandle = (HMODULE) - 1;
+                apphandle = (HMODULE)-1;
                 _tcscpy(msg + len, _T("no host application"));
                 break;
             }
             apphandle = h;
         }
-        if ((h = apphandle) == (HMODULE) - 1) /* revalidate */
+        if ((h = apphandle) == (HMODULE)-1) /* revalidate */
             break;
 
         if (applinktable == NULL) {
-            void **(*applink) ();
+            void **(*applink)();
 
             applink = (void **(*)())GetProcAddress(h, "OPENSSL_Applink");
             if (applink == NULL) {
-                apphandle = (HMODULE) - 1;
+                apphandle = (HMODULE)-1;
                 _tcscpy(msg + len, _T("no OPENSSL_Applink"));
                 break;
             }
-            p = (*applink) ();
+            p = (*applink)();
             if (p == NULL) {
-                apphandle = (HMODULE) - 1;
+                apphandle = (HMODULE)-1;
                 _tcscpy(msg + len, _T("no ApplinkTable"));
                 break;
             }
@@ -100,45 +100,85 @@ void OPENSSL_Uplink(volatile void **table, int index)
 }
 
 #if (defined(_MSC_VER) || defined(__BORLANDC__)) && defined(_M_IX86)
-# if defined(_MSC_VER)
-#  define LAZY(i)         \
-__declspec(naked) static void lazy##i (void) {  \
-        _asm    push i                          \
-        _asm    push OFFSET OPENSSL_UplinkTable \
-        _asm    call OPENSSL_Uplink             \
-        _asm    add  esp,8                      \
-        _asm    jmp  OPENSSL_UplinkTable+4*i    }
-# elif defined(__BORLANDC__) && defined(__clang__)
+#if defined(_MSC_VER)
+#define LAZY(i)                                                                                                                        \
+    __declspec(naked) static void lazy##i(void)                                                                                        \
+    {                                                                                                                                  \
+        _asm push i _asm push OFFSET OPENSSL_UplinkTable _asm call OPENSSL_Uplink _asm add esp, 8 _asm jmp OPENSSL_UplinkTable + 4 * i \
+    }
+#elif defined(__BORLANDC__) && defined(__clang__)
 void *OPENSSL_UplinkTable[26]; /* C++Builder requires declaration before use */
-#  define LAZY(i)         \
-__declspec(naked) static void lazy##i (void) { \
-    __asm__("pushl $" #i "; "                  \
-            "pushl %0; "                       \
-            "call  %P1; "                      \
-            "addl  $8, %%esp; "                \
-            "jmp   *%2 "                       \
-            : /* no outputs */                 \
-            : "i" (OPENSSL_UplinkTable),       \
-              "i" (OPENSSL_Uplink),            \
-              "m" (OPENSSL_UplinkTable[i]));   }
-# endif
+#define LAZY(i)                                 \
+    __declspec(naked) static void lazy##i(void) \
+    {                                           \
+        __asm__("pushl $" #i "; "               \
+                "pushl %0; "                    \
+                "call  %P1; "                   \
+                "addl  $8, %%esp; "             \
+                "jmp   *%2 "                    \
+            : /* no outputs */                  \
+            : "i"(OPENSSL_UplinkTable),         \
+            "i"(OPENSSL_Uplink),                \
+            "m"(OPENSSL_UplinkTable[i]));       \
+    }
+#endif
 
-# if APPLINK_MAX>25
-#  error "Add more stubs..."
-# endif
+#if APPLINK_MAX > 25
+#error "Add more stubs..."
+#endif
 /* make some in advance... */
-LAZY(1) LAZY(2) LAZY(3) LAZY(4) LAZY(5)
-    LAZY(6) LAZY(7) LAZY(8) LAZY(9) LAZY(10)
-    LAZY(11) LAZY(12) LAZY(13) LAZY(14) LAZY(15)
-    LAZY(16) LAZY(17) LAZY(18) LAZY(19) LAZY(20)
-    LAZY(21) LAZY(22) LAZY(23) LAZY(24) LAZY(25)
+LAZY(1)
+LAZY(2)
+LAZY(3)
+LAZY(4)
+LAZY(5)
+LAZY(6)
+LAZY(7)
+LAZY(8)
+LAZY(9)
+LAZY(10)
+LAZY(11)
+LAZY(12)
+LAZY(13)
+LAZY(14)
+LAZY(15)
+LAZY(16)
+LAZY(17)
+LAZY(18)
+LAZY(19)
+LAZY(20)
+LAZY(21)
+LAZY(22)
+LAZY(23)
+LAZY(24)
+LAZY(25)
 void *OPENSSL_UplinkTable[] = {
     (void *)APPLINK_MAX,
-    lazy1, lazy2, lazy3, lazy4, lazy5,
-    lazy6, lazy7, lazy8, lazy9, lazy10,
-    lazy11, lazy12, lazy13, lazy14, lazy15,
-    lazy16, lazy17, lazy18, lazy19, lazy20,
-    lazy21, lazy22, lazy23, lazy24, lazy25,
+    lazy1,
+    lazy2,
+    lazy3,
+    lazy4,
+    lazy5,
+    lazy6,
+    lazy7,
+    lazy8,
+    lazy9,
+    lazy10,
+    lazy11,
+    lazy12,
+    lazy13,
+    lazy14,
+    lazy15,
+    lazy16,
+    lazy17,
+    lazy18,
+    lazy19,
+    lazy20,
+    lazy21,
+    lazy22,
+    lazy23,
+    lazy24,
+    lazy25,
 };
 #endif
 
diff --git a/ms/uplink.h b/ms/uplink.h
index b9cc1f9dd40ff..06825b68ad582 100644
--- a/ms/uplink.h
+++ b/ms/uplink.h
@@ -12,27 +12,27 @@
 
 extern void *OPENSSL_UplinkTable[];
 
-#define UP_stdin  (*(void *(*)(void))OPENSSL_UplinkTable[APPLINK_STDIN])()
+#define UP_stdin (*(void *(*)(void))OPENSSL_UplinkTable[APPLINK_STDIN])()
 #define UP_stdout (*(void *(*)(void))OPENSSL_UplinkTable[APPLINK_STDOUT])()
 #define UP_stderr (*(void *(*)(void))OPENSSL_UplinkTable[APPLINK_STDERR])()
-#define UP_fprintf (*(int (*)(void *,const char *,...))OPENSSL_UplinkTable[APPLINK_FPRINTF])
-#define UP_fgets  (*(char *(*)(char *,int,void *))OPENSSL_UplinkTable[APPLINK_FGETS])
-#define UP_fread  (*(size_t (*)(void *,size_t,size_t,void *))OPENSSL_UplinkTable[APPLINK_FREAD])
-#define UP_fwrite (*(size_t (*)(const void *,size_t,size_t,void *))OPENSSL_UplinkTable[APPLINK_FWRITE])
-#define UP_fsetmod (*(int (*)(void *,char))OPENSSL_UplinkTable[APPLINK_FSETMOD])
-#define UP_feof   (*(int (*)(void *))OPENSSL_UplinkTable[APPLINK_FEOF])
+#define UP_fprintf (*(int (*)(void *, const char *, ...))OPENSSL_UplinkTable[APPLINK_FPRINTF])
+#define UP_fgets (*(char *(*)(char *, int, void *))OPENSSL_UplinkTable[APPLINK_FGETS])
+#define UP_fread (*(size_t (*)(void *, size_t, size_t, void *))OPENSSL_UplinkTable[APPLINK_FREAD])
+#define UP_fwrite (*(size_t (*)(const void *, size_t, size_t, void *))OPENSSL_UplinkTable[APPLINK_FWRITE])
+#define UP_fsetmod (*(int (*)(void *, char))OPENSSL_UplinkTable[APPLINK_FSETMOD])
+#define UP_feof (*(int (*)(void *))OPENSSL_UplinkTable[APPLINK_FEOF])
 #define UP_fclose (*(int (*)(void *))OPENSSL_UplinkTable[APPLINK_FCLOSE])
 
-#define UP_fopen  (*(void *(*)(const char *,const char *))OPENSSL_UplinkTable[APPLINK_FOPEN])
-#define UP_fseek  (*(int (*)(void *,long,int))OPENSSL_UplinkTable[APPLINK_FSEEK])
-#define UP_ftell  (*(long (*)(void *))OPENSSL_UplinkTable[APPLINK_FTELL])
+#define UP_fopen (*(void *(*)(const char *, const char *))OPENSSL_UplinkTable[APPLINK_FOPEN])
+#define UP_fseek (*(int (*)(void *, long, int))OPENSSL_UplinkTable[APPLINK_FSEEK])
+#define UP_ftell (*(long (*)(void *))OPENSSL_UplinkTable[APPLINK_FTELL])
 #define UP_fflush (*(int (*)(void *))OPENSSL_UplinkTable[APPLINK_FFLUSH])
 #define UP_ferror (*(int (*)(void *))OPENSSL_UplinkTable[APPLINK_FERROR])
 #define UP_clearerr (*(void (*)(void *))OPENSSL_UplinkTable[APPLINK_CLEARERR])
 #define UP_fileno (*(int (*)(void *))OPENSSL_UplinkTable[APPLINK_FILENO])
 
-#define UP_open   (*(int (*)(const char *,int,...))OPENSSL_UplinkTable[APPLINK_OPEN])
-#define UP_read   (*(ossl_ssize_t (*)(int,void *,size_t))OPENSSL_UplinkTable[APPLINK_READ])
-#define UP_write  (*(ossl_ssize_t (*)(int,const void *,size_t))OPENSSL_UplinkTable[APPLINK_WRITE])
-#define UP_lseek  (*(long (*)(int,long,int))OPENSSL_UplinkTable[APPLINK_LSEEK])
-#define UP_close  (*(int (*)(int))OPENSSL_UplinkTable[APPLINK_CLOSE])
+#define UP_open (*(int (*)(const char *, int, ...))OPENSSL_UplinkTable[APPLINK_OPEN])
+#define UP_read (*(ossl_ssize_t (*)(int, void *, size_t))OPENSSL_UplinkTable[APPLINK_READ])
+#define UP_write (*(ossl_ssize_t (*)(int, const void *, size_t))OPENSSL_UplinkTable[APPLINK_WRITE])
+#define UP_lseek (*(long (*)(int, long, int))OPENSSL_UplinkTable[APPLINK_LSEEK])
+#define UP_close (*(int (*)(int))OPENSSL_UplinkTable[APPLINK_CLOSE])
diff --git a/pkcs11-provider b/pkcs11-provider
index 898b1079d9545..663dea335c80b 160000
--- a/pkcs11-provider
+++ b/pkcs11-provider
@@ -1 +1 @@
-Subproject commit 898b1079d95453dc5d0f378dd15a75b99252caf3
+Subproject commit 663dea335c80bec7fd96d544ff875af08d6461a9
diff --git a/providers/baseprov.c b/providers/baseprov.c
index c7c72cbc8e650..16d2f91bb1ac1 100644
--- a/providers/baseprov.c
+++ b/providers/baseprov.c
@@ -53,7 +53,7 @@ static int base_get_params(void *provctx, OSSL_PARAM params[])
 
     p = OSSL_PARAM_locate(params, OSSL_PROV_PARAM_NAME);
     if (p != NULL
-            && !OSSL_PARAM_set_utf8_ptr(p, "OpenSSL Base Provider"))
+        && !OSSL_PARAM_set_utf8_ptr(p, "OpenSSL Base Provider"))
         return 0;
     p = OSSL_PARAM_locate(params, OSSL_PROV_PARAM_VERSION);
     if (p != NULL && !OSSL_PARAM_set_utf8_ptr(p, OPENSSL_VERSION_STR))
@@ -83,7 +83,7 @@ static const OSSL_ALGORITHM base_decoder[] = {
 };
 
 static const OSSL_ALGORITHM base_store[] = {
-#define STORE(name, _fips, func_table)                           \
+#define STORE(name, _fips, func_table) \
     { name, "provider=base,fips=" _fips, (func_table) },
 
 #include "stores.inc"
@@ -100,7 +100,7 @@ static const OSSL_ALGORITHM base_rands[] = {
 };
 
 static const OSSL_ALGORITHM *base_query(void *provctx, int operation_id,
-                                         int *no_cache)
+    int *no_cache)
 {
     *no_cache = 0;
     switch (operation_id) {
@@ -126,7 +126,7 @@ static void base_teardown(void *provctx)
 static const OSSL_DISPATCH base_dispatch_table[] = {
     { OSSL_FUNC_PROVIDER_TEARDOWN, (void (*)(void))base_teardown },
     { OSSL_FUNC_PROVIDER_GETTABLE_PARAMS,
-      (void (*)(void))base_gettable_params },
+        (void (*)(void))base_gettable_params },
     { OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))base_get_params },
     { OSSL_FUNC_PROVIDER_QUERY_OPERATION, (void (*)(void))base_query },
     OSSL_DISPATCH_END
@@ -135,8 +135,8 @@ static const OSSL_DISPATCH base_dispatch_table[] = {
 OSSL_provider_init_fn ossl_base_provider_init;
 
 int ossl_base_provider_init(const OSSL_CORE_HANDLE *handle,
-                            const OSSL_DISPATCH *in, const OSSL_DISPATCH **out,
-                            void **provctx)
+    const OSSL_DISPATCH *in, const OSSL_DISPATCH **out,
+    void **provctx)
 {
     OSSL_FUNC_core_get_libctx_fn *c_get_libctx = NULL;
     BIO_METHOD *corebiometh;
@@ -172,13 +172,13 @@ int ossl_base_provider_init(const OSSL_CORE_HANDLE *handle,
      * create their own library context.
      */
     if ((*provctx = ossl_prov_ctx_new()) == NULL
-            || (corebiometh = ossl_bio_prov_init_bio_method()) == NULL) {
+        || (corebiometh = ossl_bio_prov_init_bio_method()) == NULL) {
         ossl_prov_ctx_free(*provctx);
         *provctx = NULL;
         return 0;
     }
     ossl_prov_ctx_set0_libctx(*provctx,
-                                       (OSSL_LIB_CTX *)c_get_libctx(handle));
+        (OSSL_LIB_CTX *)c_get_libctx(handle));
     ossl_prov_ctx_set0_handle(*provctx, handle);
     ossl_prov_ctx_set0_core_bio_method(*provctx, corebiometh);
     ossl_prov_ctx_set0_core_get_params(*provctx, c_get_params);
diff --git a/providers/common/bio_prov.c b/providers/common/bio_prov.c
index baf923c7b3c60..90f24f1d1c278 100644
--- a/providers/common/bio_prov.c
+++ b/providers/common/bio_prov.c
@@ -88,7 +88,7 @@ OSSL_CORE_BIO *ossl_prov_bio_new_membuf(const char *filename, int len)
 }
 
 int ossl_prov_bio_read_ex(OSSL_CORE_BIO *bio, void *data, size_t data_len,
-                          size_t *bytes_read)
+    size_t *bytes_read)
 {
     if (c_bio_read_ex == NULL)
         return 0;
@@ -96,7 +96,7 @@ int ossl_prov_bio_read_ex(OSSL_CORE_BIO *bio, void *data, size_t data_len,
 }
 
 int ossl_prov_bio_write_ex(OSSL_CORE_BIO *bio, const void *data, size_t data_len,
-                           size_t *written)
+    size_t *written)
 {
     if (c_bio_write_ex == NULL)
         return 0;
@@ -162,13 +162,13 @@ int ossl_prov_bio_printf(OSSL_CORE_BIO *bio, const char *format, ...)
 /* No direct BIO support in the FIPS module */
 
 static int bio_core_read_ex(BIO *bio, char *data, size_t data_len,
-                            size_t *bytes_read)
+    size_t *bytes_read)
 {
     return ossl_prov_bio_read_ex(BIO_get_data(bio), data, data_len, bytes_read);
 }
 
 static int bio_core_write_ex(BIO *bio, const char *data, size_t data_len,
-                             size_t *written)
+    size_t *written)
 {
     return ossl_prov_bio_write_ex(BIO_get_data(bio), data, data_len, written);
 }
@@ -209,13 +209,13 @@ BIO_METHOD *ossl_bio_prov_init_bio_method(void)
 
     corebiometh = BIO_meth_new(BIO_TYPE_CORE_TO_PROV, "BIO to Core filter");
     if (corebiometh == NULL
-            || !BIO_meth_set_write_ex(corebiometh, bio_core_write_ex)
-            || !BIO_meth_set_read_ex(corebiometh, bio_core_read_ex)
-            || !BIO_meth_set_puts(corebiometh, bio_core_puts)
-            || !BIO_meth_set_gets(corebiometh, bio_core_gets)
-            || !BIO_meth_set_ctrl(corebiometh, bio_core_ctrl)
-            || !BIO_meth_set_create(corebiometh, bio_core_new)
-            || !BIO_meth_set_destroy(corebiometh, bio_core_free)) {
+        || !BIO_meth_set_write_ex(corebiometh, bio_core_write_ex)
+        || !BIO_meth_set_read_ex(corebiometh, bio_core_read_ex)
+        || !BIO_meth_set_puts(corebiometh, bio_core_puts)
+        || !BIO_meth_set_gets(corebiometh, bio_core_gets)
+        || !BIO_meth_set_ctrl(corebiometh, bio_core_ctrl)
+        || !BIO_meth_set_create(corebiometh, bio_core_new)
+        || !BIO_meth_set_destroy(corebiometh, bio_core_free)) {
         BIO_meth_free(corebiometh);
         return NULL;
     }
diff --git a/providers/common/capabilities.c b/providers/common/capabilities.c
index 0c3a0daa41825..eb96627a67e24 100644
--- a/providers/common/capabilities.c
+++ b/providers/common/capabilities.c
@@ -24,16 +24,15 @@
  * If none of EC, DH OR ML-KEM are available then we have no TLS-GROUP
  * capabilities.
  */
-#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH) || \
-    !defined(OPENSSL_NO_ML_KEM)
+#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_ML_KEM)
 typedef struct tls_group_constants_st {
-    unsigned int group_id;   /* Group ID */
-    unsigned int secbits;    /* Bits of security */
-    int mintls;              /* Minimum TLS version, -1 unsupported */
-    int maxtls;              /* Maximum TLS version (or 0 for undefined) */
-    int mindtls;             /* Minimum DTLS version, -1 unsupported */
-    int maxdtls;             /* Maximum DTLS version (or 0 for undefined) */
-    int is_kem;              /* Indicates utility as KEM */
+    unsigned int group_id; /* Group ID */
+    unsigned int secbits; /* Bits of security */
+    int mintls; /* Minimum TLS version, -1 unsupported */
+    int maxtls; /* Maximum TLS version (or 0 for undefined) */
+    int mindtls; /* Minimum DTLS version, -1 unsupported */
+    int maxdtls; /* Maximum DTLS version (or 0 for undefined) */
+    int is_kem; /* Indicates utility as KEM */
 } TLS_GROUP_CONSTANTS;
 
 /*
@@ -94,32 +93,32 @@ static const TLS_GROUP_CONSTANTS group_list[] = {
     /* 43 */ { OSSL_TLS_GROUP_ID_SecP384r1MLKEM1024, ML_KEM_1024_SECBITS, TLS1_3_VERSION, 0, -1, -1, 1 },
 };
 
-#define TLS_GROUP_ENTRY(tlsname, realname, algorithm, idx) \
-    { \
-        OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_GROUP_NAME, \
-                               tlsname, \
-                               sizeof(tlsname)), \
+#define TLS_GROUP_ENTRY(tlsname, realname, algorithm, idx)              \
+    {                                                                   \
+        OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_GROUP_NAME,          \
+            tlsname,                                                    \
+            sizeof(tlsname)),                                           \
         OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_GROUP_NAME_INTERNAL, \
-                               realname, \
-                               sizeof(realname)), \
-        OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_GROUP_ALG, \
-                               algorithm, \
-                               sizeof(algorithm)), \
-        OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_GROUP_ID, \
-                        (unsigned int *)&group_list[idx].group_id), \
-        OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_GROUP_SECURITY_BITS, \
-                        (unsigned int *)&group_list[idx].secbits), \
-        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MIN_TLS, \
-                        (unsigned int *)&group_list[idx].mintls), \
-        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MAX_TLS, \
-                        (unsigned int *)&group_list[idx].maxtls), \
-        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MIN_DTLS, \
-                        (unsigned int *)&group_list[idx].mindtls), \
-        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MAX_DTLS, \
-                        (unsigned int *)&group_list[idx].maxdtls), \
-        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_IS_KEM, \
-                       (unsigned int *)&group_list[idx].is_kem), \
-        OSSL_PARAM_END \
+            realname,                                                   \
+            sizeof(realname)),                                          \
+        OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_GROUP_ALG,           \
+            algorithm,                                                  \
+            sizeof(algorithm)),                                         \
+        OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_GROUP_ID,                   \
+            (unsigned int *)&group_list[idx].group_id),                 \
+        OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_GROUP_SECURITY_BITS,        \
+            (unsigned int *)&group_list[idx].secbits),                  \
+        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MIN_TLS,               \
+            (unsigned int *)&group_list[idx].mintls),                   \
+        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MAX_TLS,               \
+            (unsigned int *)&group_list[idx].maxtls),                   \
+        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MIN_DTLS,              \
+            (unsigned int *)&group_list[idx].mindtls),                  \
+        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MAX_DTLS,              \
+            (unsigned int *)&group_list[idx].maxdtls),                  \
+        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_IS_KEM,                \
+            (unsigned int *)&group_list[idx].is_kem),                   \
+        OSSL_PARAM_END                                                  \
     }
 
 /*-
@@ -152,79 +151,79 @@ static const TLS_GROUP_CONSTANTS group_list[] = {
  * and those added later (FFDHE, brainpool, ML-KEM)
  */
 static const OSSL_PARAM param_group_list[][11] = {
-# ifndef OPENSSL_NO_EC
-#  if !defined(OPENSSL_NO_ML_KEM)
-#   if !defined(OPENSSL_NO_ECX)
+#ifndef OPENSSL_NO_EC
+#if !defined(OPENSSL_NO_ML_KEM)
+#if !defined(OPENSSL_NO_ECX)
     TLS_GROUP_ENTRY("X25519MLKEM768", "", "X25519MLKEM768", 41),
-#   endif
-#  endif
-#  ifndef FIPS_MODULE
+#endif
+#endif
+#ifndef FIPS_MODULE
     TLS_GROUP_ENTRY("x25519", "X25519", "X25519", 28),
     TLS_GROUP_ENTRY("x448", "X448", "X448", 29),
-#  endif
+#endif
     TLS_GROUP_ENTRY("secp256r1", "prime256v1", "EC", 22),
     TLS_GROUP_ENTRY("P-256", "prime256v1", "EC", 22), /* Alias of above */
     TLS_GROUP_ENTRY("secp384r1", "secp384r1", "EC", 23),
     TLS_GROUP_ENTRY("P-384", "secp384r1", "EC", 23), /* Alias of above */
     TLS_GROUP_ENTRY("secp521r1", "secp521r1", "EC", 24),
     TLS_GROUP_ENTRY("P-521", "secp521r1", "EC", 24), /* Alias of above */
-# endif /* OPENSSL_NO_EC */
-# ifndef OPENSSL_NO_DH
+#endif /* OPENSSL_NO_EC */
+#ifndef OPENSSL_NO_DH
     /* Security bit values for FFDHE groups are as per RFC 7919 */
     TLS_GROUP_ENTRY("ffdhe2048", "ffdhe2048", "DH", 33),
     TLS_GROUP_ENTRY("ffdhe3072", "ffdhe3072", "DH", 34),
-# endif
-# if !defined(OPENSSL_NO_ML_KEM)
+#endif
+#if !defined(OPENSSL_NO_ML_KEM)
     /* https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8 */
     TLS_GROUP_ENTRY("MLKEM512", "", "ML-KEM-512", 38),
     TLS_GROUP_ENTRY("MLKEM768", "", "ML-KEM-768", 39),
     TLS_GROUP_ENTRY("MLKEM1024", "", "ML-KEM-1024", 40),
-# endif
-# ifndef OPENSSL_NO_EC
-#  ifndef FIPS_MODULE
+#endif
+#ifndef OPENSSL_NO_EC
+#ifndef FIPS_MODULE
     TLS_GROUP_ENTRY("brainpoolP256r1", "brainpoolP256r1", "EC", 25),
     TLS_GROUP_ENTRY("brainpoolP384r1", "brainpoolP384r1", "EC", 26),
     TLS_GROUP_ENTRY("brainpoolP512r1", "brainpoolP512r1", "EC", 27),
     TLS_GROUP_ENTRY("brainpoolP256r1tls13", "brainpoolP256r1", "EC", 30),
     TLS_GROUP_ENTRY("brainpoolP384r1tls13", "brainpoolP384r1", "EC", 31),
     TLS_GROUP_ENTRY("brainpoolP512r1tls13", "brainpoolP512r1", "EC", 32),
-#  endif
-#  ifndef OPENSSL_NO_ML_KEM
+#endif
+#ifndef OPENSSL_NO_ML_KEM
     TLS_GROUP_ENTRY("SecP256r1MLKEM768", "", "SecP256r1MLKEM768", 42),
     TLS_GROUP_ENTRY("SecP384r1MLKEM1024", "", "SecP384r1MLKEM1024", 43),
-#  endif
-# endif
-# ifndef OPENSSL_NO_DH
+#endif
+#endif
+#ifndef OPENSSL_NO_DH
     TLS_GROUP_ENTRY("ffdhe4096", "ffdhe4096", "DH", 35),
     TLS_GROUP_ENTRY("ffdhe6144", "ffdhe6144", "DH", 36),
     TLS_GROUP_ENTRY("ffdhe8192", "ffdhe8192", "DH", 37),
-# endif
-# ifndef OPENSSL_NO_TLS_DEPRECATED_EC
-#  ifndef OPENSSL_NO_EC2M
+#endif
+#ifndef OPENSSL_NO_TLS_DEPRECATED_EC
+#ifndef OPENSSL_NO_EC2M
     TLS_GROUP_ENTRY("sect163k1", "sect163k1", "EC", 0),
     TLS_GROUP_ENTRY("K-163", "sect163k1", "EC", 0), /* Alias of above */
-#  endif
-#  ifndef FIPS_MODULE
+#endif
+#ifndef FIPS_MODULE
     TLS_GROUP_ENTRY("sect163r1", "sect163r1", "EC", 1),
-#  endif
-#  ifndef OPENSSL_NO_EC2M
+#endif
+#ifndef OPENSSL_NO_EC2M
     TLS_GROUP_ENTRY("sect163r2", "sect163r2", "EC", 2),
     TLS_GROUP_ENTRY("B-163", "sect163r2", "EC", 2), /* Alias of above */
-#  endif
-#  ifndef FIPS_MODULE
+#endif
+#ifndef FIPS_MODULE
     TLS_GROUP_ENTRY("sect193r1", "sect193r1", "EC", 3),
     TLS_GROUP_ENTRY("sect193r2", "sect193r2", "EC", 4),
-#  endif
-#  ifndef OPENSSL_NO_EC2M
+#endif
+#ifndef OPENSSL_NO_EC2M
     TLS_GROUP_ENTRY("sect233k1", "sect233k1", "EC", 5),
     TLS_GROUP_ENTRY("K-233", "sect233k1", "EC", 5), /* Alias of above */
     TLS_GROUP_ENTRY("sect233r1", "sect233r1", "EC", 6),
     TLS_GROUP_ENTRY("B-233", "sect233r1", "EC", 6), /* Alias of above */
-#  endif
-#  ifndef FIPS_MODULE
+#endif
+#ifndef FIPS_MODULE
     TLS_GROUP_ENTRY("sect239k1", "sect239k1", "EC", 7),
-#  endif
-#  ifndef OPENSSL_NO_EC2M
+#endif
+#ifndef OPENSSL_NO_EC2M
     TLS_GROUP_ENTRY("sect283k1", "sect283k1", "EC", 8),
     TLS_GROUP_ENTRY("K-283", "sect283k1", "EC", 8), /* Alias of above */
     TLS_GROUP_ENTRY("sect283r1", "sect283r1", "EC", 9),
@@ -237,24 +236,24 @@ static const OSSL_PARAM param_group_list[][11] = {
     TLS_GROUP_ENTRY("K-571", "sect571k1", "EC", 12), /* Alias of above */
     TLS_GROUP_ENTRY("sect571r1", "sect571r1", "EC", 13),
     TLS_GROUP_ENTRY("B-571", "sect571r1", "EC", 13), /* Alias of above */
-#  endif
-#  ifndef FIPS_MODULE
+#endif
+#ifndef FIPS_MODULE
     TLS_GROUP_ENTRY("secp160k1", "secp160k1", "EC", 14),
     TLS_GROUP_ENTRY("secp160r1", "secp160r1", "EC", 15),
     TLS_GROUP_ENTRY("secp160r2", "secp160r2", "EC", 16),
     TLS_GROUP_ENTRY("secp192k1", "secp192k1", "EC", 17),
-#  endif
+#endif
     TLS_GROUP_ENTRY("secp192r1", "prime192v1", "EC", 18),
     TLS_GROUP_ENTRY("P-192", "prime192v1", "EC", 18), /* Alias of above */
-#  ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
     TLS_GROUP_ENTRY("secp224k1", "secp224k1", "EC", 19),
-#  endif
+#endif
     TLS_GROUP_ENTRY("secp224r1", "secp224r1", "EC", 20),
     TLS_GROUP_ENTRY("P-224", "secp224r1", "EC", 20), /* Alias of above */
-#  ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
     TLS_GROUP_ENTRY("secp256k1", "secp256k1", "EC", 21),
-#  endif
-# endif /* !defined(OPENSSL_NO_TLS_DEPRECATED_EC) */
+#endif
+#endif /* !defined(OPENSSL_NO_TLS_DEPRECATED_EC) */
 };
 #endif /* !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_ML_KEM) */
 
@@ -277,11 +276,11 @@ static int tls_group_capability(OSSL_CALLBACK *cb, void *arg)
 
 typedef struct tls_sigalg_constants_st {
     unsigned int code_point;
-    unsigned int sec_bits;    /* Bits of security */
-    int min_tls;              /* Minimum TLS version, -1 unsupported */
-    int max_tls;              /* Maximum TLS version (or 0 for undefined) */
-    int min_dtls;             /* Minimum DTLS version, -1 unsupported */
-    int max_dtls;             /* Maximum DTLS version (or 0 for undefined) */
+    unsigned int sec_bits; /* Bits of security */
+    int min_tls; /* Minimum TLS version, -1 unsupported */
+    int max_tls; /* Maximum TLS version (or 0 for undefined) */
+    int min_dtls; /* Minimum DTLS version, -1 unsupported */
+    int max_dtls; /* Maximum DTLS version (or 0 for undefined) */
 } TLS_SIGALG_CONSTANTS;
 
 static const TLS_SIGALG_CONSTANTS sigalg_constants_list[3] = {
@@ -290,27 +289,27 @@ static const TLS_SIGALG_CONSTANTS sigalg_constants_list[3] = {
     { 0x0906, 256, TLS1_3_VERSION, 0, -1, -1 },
 };
 
-# define TLS_SIGALG_ENTRY(tlsname, algorithm, oid, idx)                         \
-    {                                                                           \
-        OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_IANA_NAME,            \
-                               tlsname, sizeof(tlsname)),                       \
-        OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_NAME,                 \
-                               algorithm, sizeof(algorithm)),                   \
-        OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_OID,                  \
-                               oid, sizeof(oid)),                               \
-        OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_SIGALG_CODE_POINT,                  \
-                        (unsigned int *)&sigalg_constants_list[idx].code_point),\
-        OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_SIGALG_SECURITY_BITS,               \
-                        (unsigned int *)&sigalg_constants_list[idx].sec_bits),  \
-        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MIN_TLS,                      \
-                       (unsigned int *)&sigalg_constants_list[idx].min_tls),    \
-        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MAX_TLS,                      \
-                       (unsigned int *)&sigalg_constants_list[idx].max_tls),    \
-        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MIN_DTLS,                     \
-                       (unsigned int *)&sigalg_constants_list[idx].min_dtls),   \
-        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MAX_DTLS,                     \
-                       (unsigned int *)&sigalg_constants_list[idx].max_dtls),   \
-        OSSL_PARAM_END                                                          \
+#define TLS_SIGALG_ENTRY(tlsname, algorithm, oid, idx)               \
+    {                                                                \
+        OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_IANA_NAME, \
+            tlsname, sizeof(tlsname)),                               \
+        OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_NAME,      \
+            algorithm, sizeof(algorithm)),                           \
+        OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_OID,       \
+            oid, sizeof(oid)),                                       \
+        OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_SIGALG_CODE_POINT,       \
+            (unsigned int *)&sigalg_constants_list[idx].code_point), \
+        OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_SIGALG_SECURITY_BITS,    \
+            (unsigned int *)&sigalg_constants_list[idx].sec_bits),   \
+        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MIN_TLS,           \
+            (unsigned int *)&sigalg_constants_list[idx].min_tls),    \
+        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MAX_TLS,           \
+            (unsigned int *)&sigalg_constants_list[idx].max_tls),    \
+        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MIN_DTLS,          \
+            (unsigned int *)&sigalg_constants_list[idx].min_dtls),   \
+        OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MAX_DTLS,          \
+            (unsigned int *)&sigalg_constants_list[idx].max_dtls),   \
+        OSSL_PARAM_END                                               \
     }
 
 static const OSSL_PARAM param_sigalg_list[][10] = {
@@ -333,7 +332,7 @@ static int tls_sigalg_capability(OSSL_CALLBACK *cb, void *arg)
 }
 
 int ossl_prov_get_capabilities(void *provctx, const char *capability,
-                               OSSL_CALLBACK *cb, void *arg)
+    OSSL_CALLBACK *cb, void *arg)
 {
     if (OPENSSL_strcasecmp(capability, "TLS-GROUP") == 0)
         return tls_group_capability(cb, arg);
diff --git a/providers/common/der/der_digests_gen.c.in b/providers/common/der/der_digests_gen.c.in
index 9b6da1dafb1c1..b08c6685f6ba6 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 dd581567e87ab..cd944b7771432 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_dsa_key.c b/providers/common/der/der_dsa_key.c
index dc7b2fe8faa6b..4b0ac7974fa85 100644
--- a/providers/common/der/der_dsa_key.c
+++ b/providers/common/der/der_dsa_key.c
@@ -22,6 +22,6 @@ int ossl_DER_w_algorithmIdentifier_DSA(WPACKET *pkt, int tag, DSA *dsa)
     return ossl_DER_w_begin_sequence(pkt, tag)
         /* No parameters (yet?) */
         && ossl_DER_w_precompiled(pkt, -1, ossl_der_oid_id_dsa,
-                                  sizeof(ossl_der_oid_id_dsa))
+            sizeof(ossl_der_oid_id_dsa))
         && ossl_DER_w_end_sequence(pkt, tag);
 }
diff --git a/providers/common/der/der_dsa_sig.c b/providers/common/der/der_dsa_sig.c
index 07225b7b119b5..753e444c17bff 100644
--- a/providers/common/der/der_dsa_sig.c
+++ b/providers/common/der/der_dsa_sig.c
@@ -17,14 +17,14 @@
 #include "internal/packet.h"
 #include "prov/der_dsa.h"
 
-#define MD_CASE(name)                                                   \
-    case NID_##name:                                                    \
-        precompiled = ossl_der_oid_id_dsa_with_##name;                  \
-        precompiled_sz = sizeof(ossl_der_oid_id_dsa_with_##name);       \
+#define MD_CASE(name)                                             \
+    case NID_##name:                                              \
+        precompiled = ossl_der_oid_id_dsa_with_##name;            \
+        precompiled_sz = sizeof(ossl_der_oid_id_dsa_with_##name); \
         break;
 
 int ossl_DER_w_algorithmIdentifier_DSA_with_MD(WPACKET *pkt, int tag,
-                                               DSA *dsa, int mdnid)
+    DSA *dsa, int mdnid)
 {
     const unsigned char *precompiled = NULL;
     size_t precompiled_sz = 0;
diff --git a/providers/common/der/der_ec_gen.c.in b/providers/common/der/der_ec_gen.c.in
index ec47686ebe2b2..5270a1e15a52f 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_ec_key.c b/providers/common/der/der_ec_key.c
index ae0775af5340a..c4547c7135cad 100644
--- a/providers/common/der/der_ec_key.c
+++ b/providers/common/der/der_ec_key.c
@@ -16,6 +16,6 @@ int ossl_DER_w_algorithmIdentifier_EC(WPACKET *pkt, int cont, EC_KEY *ec)
     return ossl_DER_w_begin_sequence(pkt, cont)
         /* No parameters (yet?) */
         && ossl_DER_w_precompiled(pkt, -1, ossl_der_oid_id_ecPublicKey,
-                                  sizeof(ossl_der_oid_id_ecPublicKey))
+            sizeof(ossl_der_oid_id_ecPublicKey))
         && ossl_DER_w_end_sequence(pkt, cont);
 }
diff --git a/providers/common/der/der_ec_sig.c b/providers/common/der/der_ec_sig.c
index 25b672dab2f19..63170e72374c5 100644
--- a/providers/common/der/der_ec_sig.c
+++ b/providers/common/der/der_ec_sig.c
@@ -12,20 +12,20 @@
 #include "prov/der_ec.h"
 
 /* Aliases so we can have a uniform MD_CASE */
-#define ossl_der_oid_id_ecdsa_with_sha1   ossl_der_oid_ecdsa_with_SHA1
+#define ossl_der_oid_id_ecdsa_with_sha1 ossl_der_oid_ecdsa_with_SHA1
 #define ossl_der_oid_id_ecdsa_with_sha224 ossl_der_oid_ecdsa_with_SHA224
 #define ossl_der_oid_id_ecdsa_with_sha256 ossl_der_oid_ecdsa_with_SHA256
 #define ossl_der_oid_id_ecdsa_with_sha384 ossl_der_oid_ecdsa_with_SHA384
 #define ossl_der_oid_id_ecdsa_with_sha512 ossl_der_oid_ecdsa_with_SHA512
 
-#define MD_CASE(name)                                                   \
-    case NID_##name:                                                    \
-        precompiled = ossl_der_oid_id_ecdsa_with_##name;                \
-        precompiled_sz = sizeof(ossl_der_oid_id_ecdsa_with_##name);     \
+#define MD_CASE(name)                                               \
+    case NID_##name:                                                \
+        precompiled = ossl_der_oid_id_ecdsa_with_##name;            \
+        precompiled_sz = sizeof(ossl_der_oid_id_ecdsa_with_##name); \
         break;
 
 int ossl_DER_w_algorithmIdentifier_ECDSA_with_MD(WPACKET *pkt, int cont,
-                                                 EC_KEY *ec, int mdnid)
+    EC_KEY *ec, int mdnid)
 {
     const unsigned char *precompiled = NULL;
     size_t precompiled_sz = 0;
diff --git a/providers/common/der/der_ecx_gen.c.in b/providers/common/der/der_ecx_gen.c.in
index bcd45b6e4d523..e0d83e225f669 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_ecx_key.c b/providers/common/der/der_ecx_key.c
index c00a11cac8eec..fba5c3b0d81e6 100644
--- a/providers/common/der/der_ecx_key.c
+++ b/providers/common/der/der_ecx_key.c
@@ -16,7 +16,7 @@ int ossl_DER_w_algorithmIdentifier_X25519(WPACKET *pkt, int cont, ECX_KEY *ec)
     return ossl_DER_w_begin_sequence(pkt, cont)
         /* No parameters (yet?) */
         && ossl_DER_w_precompiled(pkt, -1, ossl_der_oid_id_X25519,
-                                  sizeof(ossl_der_oid_id_X25519))
+            sizeof(ossl_der_oid_id_X25519))
         && ossl_DER_w_end_sequence(pkt, cont);
 }
 
@@ -25,7 +25,7 @@ int ossl_DER_w_algorithmIdentifier_X448(WPACKET *pkt, int cont, ECX_KEY *ec)
     return ossl_DER_w_begin_sequence(pkt, cont)
         /* No parameters (yet?) */
         && ossl_DER_w_precompiled(pkt, -1, ossl_der_oid_id_X448,
-                                  sizeof(ossl_der_oid_id_X448))
+            sizeof(ossl_der_oid_id_X448))
         && ossl_DER_w_end_sequence(pkt, cont);
 }
 
@@ -34,7 +34,7 @@ int ossl_DER_w_algorithmIdentifier_ED25519(WPACKET *pkt, int cont, ECX_KEY *ec)
     return ossl_DER_w_begin_sequence(pkt, cont)
         /* No parameters (yet?) */
         && ossl_DER_w_precompiled(pkt, -1, ossl_der_oid_id_Ed25519,
-                                  sizeof(ossl_der_oid_id_Ed25519))
+            sizeof(ossl_der_oid_id_Ed25519))
         && ossl_DER_w_end_sequence(pkt, cont);
 }
 
@@ -43,6 +43,6 @@ int ossl_DER_w_algorithmIdentifier_ED448(WPACKET *pkt, int cont, ECX_KEY *ec)
     return ossl_DER_w_begin_sequence(pkt, cont)
         /* No parameters (yet?) */
         && ossl_DER_w_precompiled(pkt, -1, ossl_der_oid_id_Ed448,
-                                  sizeof(ossl_der_oid_id_Ed448))
+            sizeof(ossl_der_oid_id_Ed448))
         && ossl_DER_w_end_sequence(pkt, cont);
 }
diff --git a/providers/common/der/der_ml_dsa_gen.c.in b/providers/common/der/der_ml_dsa_gen.c.in
index 0097fc7a0c24f..30f42f32cf84a 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 0560f649e8e07..78526caba8e72 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_rsa_key.c b/providers/common/der/der_rsa_key.c
index 893970575f9f3..c7cd800fe1c4b 100644
--- a/providers/common/der/der_rsa_key.c
+++ b/providers/common/der/der_rsa_key.c
@@ -53,10 +53,10 @@
  * around that, we make them non-static, and declare them an extra time to
  * avoid compilers complaining about definitions without declarations.
  */
-#define DER_AID_V_sha1Identifier                                        \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                                   \
-        DER_OID_SZ_id_sha1 + DER_SZ_NULL,                               \
-        DER_OID_V_id_sha1,                                              \
+#define DER_AID_V_sha1Identifier          \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,   \
+        DER_OID_SZ_id_sha1 + DER_SZ_NULL, \
+        DER_OID_V_id_sha1,                \
         DER_V_NULL
 extern const unsigned char ossl_der_aid_sha1Identifier[];
 const unsigned char ossl_der_aid_sha1Identifier[] = {
@@ -64,10 +64,10 @@ const unsigned char ossl_der_aid_sha1Identifier[] = {
 };
 #define DER_AID_SZ_sha1Identifier sizeof(ossl_der_aid_sha1Identifier)
 
-#define DER_AID_V_sha224Identifier                                      \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                                   \
-        DER_OID_SZ_id_sha224 + DER_SZ_NULL,                             \
-        DER_OID_V_id_sha224,                                            \
+#define DER_AID_V_sha224Identifier          \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,     \
+        DER_OID_SZ_id_sha224 + DER_SZ_NULL, \
+        DER_OID_V_id_sha224,                \
         DER_V_NULL
 extern const unsigned char ossl_der_aid_sha224Identifier[];
 const unsigned char ossl_der_aid_sha224Identifier[] = {
@@ -75,10 +75,10 @@ const unsigned char ossl_der_aid_sha224Identifier[] = {
 };
 #define DER_AID_SZ_sha224Identifier sizeof(ossl_der_aid_sha224Identifier)
 
-#define DER_AID_V_sha256Identifier                                      \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                                   \
-        DER_OID_SZ_id_sha256 + DER_SZ_NULL,                             \
-        DER_OID_V_id_sha256,                                            \
+#define DER_AID_V_sha256Identifier          \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,     \
+        DER_OID_SZ_id_sha256 + DER_SZ_NULL, \
+        DER_OID_V_id_sha256,                \
         DER_V_NULL
 extern const unsigned char ossl_der_aid_sha256Identifier[];
 const unsigned char ossl_der_aid_sha256Identifier[] = {
@@ -86,10 +86,10 @@ const unsigned char ossl_der_aid_sha256Identifier[] = {
 };
 #define DER_AID_SZ_sha256Identifier sizeof(ossl_der_aid_sha256Identifier)
 
-#define DER_AID_V_sha384Identifier                                      \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                                   \
-        DER_OID_SZ_id_sha384 + DER_SZ_NULL,                             \
-        DER_OID_V_id_sha384,                                            \
+#define DER_AID_V_sha384Identifier          \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,     \
+        DER_OID_SZ_id_sha384 + DER_SZ_NULL, \
+        DER_OID_V_id_sha384,                \
         DER_V_NULL
 extern const unsigned char ossl_der_aid_sha384Identifier[];
 const unsigned char ossl_der_aid_sha384Identifier[] = {
@@ -97,10 +97,10 @@ const unsigned char ossl_der_aid_sha384Identifier[] = {
 };
 #define DER_AID_SZ_sha384Identifier sizeof(ossl_der_aid_sha384Identifier)
 
-#define DER_AID_V_sha512Identifier                                      \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                                   \
-        DER_OID_SZ_id_sha512 + DER_SZ_NULL,                             \
-        DER_OID_V_id_sha512,                                            \
+#define DER_AID_V_sha512Identifier          \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,     \
+        DER_OID_SZ_id_sha512 + DER_SZ_NULL, \
+        DER_OID_V_id_sha512,                \
         DER_V_NULL
 extern const unsigned char ossl_der_aid_sha512Identifier[];
 const unsigned char ossl_der_aid_sha512Identifier[] = {
@@ -108,10 +108,10 @@ const unsigned char ossl_der_aid_sha512Identifier[] = {
 };
 #define DER_AID_SZ_sha512Identifier sizeof(ossl_der_aid_sha512Identifier)
 
-#define DER_AID_V_sha512_224Identifier                                  \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                                   \
-        DER_OID_SZ_id_sha512_224 + DER_SZ_NULL,                         \
-        DER_OID_V_id_sha512_224,                                        \
+#define DER_AID_V_sha512_224Identifier          \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,         \
+        DER_OID_SZ_id_sha512_224 + DER_SZ_NULL, \
+        DER_OID_V_id_sha512_224,                \
         DER_V_NULL
 extern const unsigned char ossl_der_aid_sha512_224Identifier[];
 const unsigned char ossl_der_aid_sha512_224Identifier[] = {
@@ -119,10 +119,10 @@ const unsigned char ossl_der_aid_sha512_224Identifier[] = {
 };
 #define DER_AID_SZ_sha512_224Identifier sizeof(ossl_der_aid_sha512_224Identifier)
 
-#define DER_AID_V_sha512_256Identifier                                  \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                                   \
-        DER_OID_SZ_id_sha512_256 + DER_SZ_NULL,                         \
-        DER_OID_V_id_sha512_256,                                        \
+#define DER_AID_V_sha512_256Identifier          \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,         \
+        DER_OID_SZ_id_sha512_256 + DER_SZ_NULL, \
+        DER_OID_V_id_sha512_256,                \
         DER_V_NULL
 extern const unsigned char ossl_der_aid_sha512_256Identifier[];
 const unsigned char ossl_der_aid_sha512_256Identifier[] = {
@@ -160,11 +160,11 @@ const unsigned char ossl_der_aid_sha512_256Identifier[] = {
  * mgf1SHA512Identifier  AlgorithmIdentifier  ::=
  *                      { id-mgf1, sha512Identifier }
  */
-#if 0                            /* Currently unused */
-#define DER_AID_V_mgf1SHA1Identifier                                    \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                                   \
-        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha1Identifier,                 \
-        DER_OID_V_id_mgf1,                                              \
+#if 0 /* Currently unused */
+#define DER_AID_V_mgf1SHA1Identifier                    \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,                 \
+        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha1Identifier, \
+        DER_OID_V_id_mgf1,                              \
         DER_AID_V_sha1Identifier
 static const unsigned char der_aid_mgf1SHA1Identifier[] = {
     DER_AID_V_mgf1SHA1Identifier
@@ -172,71 +172,70 @@ static const unsigned char der_aid_mgf1SHA1Identifier[] = {
 #define DER_AID_SZ_mgf1SHA1Identifier sizeof(der_aid_mgf1SHA1Identifier)
 #endif
 
-#define DER_AID_V_mgf1SHA224Identifier                          \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                           \
-        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha224Identifier,       \
-        DER_OID_V_id_mgf1,                                      \
+#define DER_AID_V_mgf1SHA224Identifier                    \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,                   \
+        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha224Identifier, \
+        DER_OID_V_id_mgf1,                                \
         DER_AID_V_sha224Identifier
 static const unsigned char der_aid_mgf1SHA224Identifier[] = {
     DER_AID_V_mgf1SHA224Identifier
 };
 #define DER_AID_SZ_mgf1SHA224Identifier sizeof(der_aid_mgf1SHA224Identifier)
 
-#define DER_AID_V_mgf1SHA256Identifier                          \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                           \
-        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha256Identifier,       \
-        DER_OID_V_id_mgf1,                                      \
+#define DER_AID_V_mgf1SHA256Identifier                    \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,                   \
+        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha256Identifier, \
+        DER_OID_V_id_mgf1,                                \
         DER_AID_V_sha256Identifier
 static const unsigned char der_aid_mgf1SHA256Identifier[] = {
     DER_AID_V_mgf1SHA256Identifier
 };
 #define DER_AID_SZ_mgf1SHA256Identifier sizeof(der_aid_mgf1SHA256Identifier)
 
-#define DER_AID_V_mgf1SHA384Identifier                          \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                           \
-        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha384Identifier,       \
-        DER_OID_V_id_mgf1,                                      \
+#define DER_AID_V_mgf1SHA384Identifier                    \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,                   \
+        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha384Identifier, \
+        DER_OID_V_id_mgf1,                                \
         DER_AID_V_sha384Identifier
 static const unsigned char der_aid_mgf1SHA384Identifier[] = {
     DER_AID_V_mgf1SHA384Identifier
 };
 #define DER_AID_SZ_mgf1SHA384Identifier sizeof(der_aid_mgf1SHA384Identifier)
 
-#define DER_AID_V_mgf1SHA512Identifier                          \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                           \
-        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha512Identifier,       \
-        DER_OID_V_id_mgf1,                                      \
+#define DER_AID_V_mgf1SHA512Identifier                    \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,                   \
+        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha512Identifier, \
+        DER_OID_V_id_mgf1,                                \
         DER_AID_V_sha512Identifier
 static const unsigned char der_aid_mgf1SHA512Identifier[] = {
     DER_AID_V_mgf1SHA512Identifier
 };
 #define DER_AID_SZ_mgf1SHA512Identifier sizeof(der_aid_mgf1SHA512Identifier)
 
-#define DER_AID_V_mgf1SHA512_224Identifier                      \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                           \
-        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha512_224Identifier,   \
-        DER_OID_V_id_mgf1,                                      \
+#define DER_AID_V_mgf1SHA512_224Identifier                    \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,                       \
+        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha512_224Identifier, \
+        DER_OID_V_id_mgf1,                                    \
         DER_AID_V_sha512_224Identifier
 static const unsigned char der_aid_mgf1SHA512_224Identifier[] = {
     DER_AID_V_mgf1SHA512_224Identifier
 };
 #define DER_AID_SZ_mgf1SHA512_224Identifier sizeof(der_aid_mgf1SHA512_224Identifier)
 
-#define DER_AID_V_mgf1SHA512_256Identifier                      \
-    DER_P_SEQUENCE|DER_F_CONSTRUCTED,                           \
-        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha512_256Identifier,   \
-        DER_OID_V_id_mgf1,                                      \
+#define DER_AID_V_mgf1SHA512_256Identifier                    \
+    DER_P_SEQUENCE | DER_F_CONSTRUCTED,                       \
+        DER_OID_SZ_id_mgf1 + DER_AID_SZ_sha512_256Identifier, \
+        DER_OID_V_id_mgf1,                                    \
         DER_AID_V_sha512_256Identifier
 static const unsigned char der_aid_mgf1SHA512_256Identifier[] = {
     DER_AID_V_mgf1SHA512_256Identifier
 };
 #define DER_AID_SZ_mgf1SHA512_256Identifier sizeof(der_aid_mgf1SHA512_256Identifier)
 
-
-#define MGF1_SHA_CASE(bits, var)                                \
-    case NID_sha##bits:                                         \
-        var = der_aid_mgf1SHA##bits##Identifier;                \
-        var##_sz = sizeof(der_aid_mgf1SHA##bits##Identifier);   \
+#define MGF1_SHA_CASE(bits, var)                              \
+    case NID_sha##bits:                                       \
+        var = der_aid_mgf1SHA##bits##Identifier;              \
+        var##_sz = sizeof(der_aid_mgf1SHA##bits##Identifier); \
         break;
 
 /*-
@@ -245,7 +244,7 @@ static const unsigned char der_aid_mgf1SHA512_256Identifier[] = {
  * MaskGenAlgorithm ::= AlgorithmIdentifier { {PKCS1MGFAlgorithms} }
  */
 static int DER_w_MaskGenAlgorithm(WPACKET *pkt, int tag,
-                                  const RSA_PSS_PARAMS_30 *pss)
+    const RSA_PSS_PARAMS_30 *pss)
 {
     if (pss != NULL && ossl_rsa_pss_params_30_maskgenalg(pss) == NID_mgf1) {
         int maskgenhashalg_nid = ossl_rsa_pss_params_30_maskgenhashalg(pss);
@@ -274,14 +273,14 @@ static int DER_w_MaskGenAlgorithm(WPACKET *pkt, int tag,
     return 0;
 }
 
-#define OAEP_PSS_MD_CASE(name, var)                                     \
-    case NID_##name:                                                    \
-        var = ossl_der_aid_##name##Identifier;                          \
-        var##_sz = sizeof(ossl_der_aid_##name##Identifier);             \
+#define OAEP_PSS_MD_CASE(name, var)                         \
+    case NID_##name:                                        \
+        var = ossl_der_aid_##name##Identifier;              \
+        var##_sz = sizeof(ossl_der_aid_##name##Identifier); \
         break;
 
 int ossl_DER_w_RSASSA_PSS_params(WPACKET *pkt, int tag,
-                                 const RSA_PSS_PARAMS_30 *pss)
+    const RSA_PSS_PARAMS_30 *pss)
 {
     int hashalg_nid, default_hashalg_nid;
     int saltlen, default_saltlen;
@@ -298,7 +297,7 @@ int ossl_DER_w_RSASSA_PSS_params(WPACKET *pkt, int tag,
      * that the key is restricted.
      */
     if (!ossl_assert(pss != NULL
-                     && !ossl_rsa_pss_params_30_is_unrestricted(pss)))
+            && !ossl_rsa_pss_params_30_is_unrestricted(pss)))
         return 0;
 
     hashalg_nid = ossl_rsa_pss_params_30_hashalg(pss);
@@ -358,15 +357,15 @@ int ossl_DER_w_RSASSA_PSS_params(WPACKET *pkt, int tag,
 /* Aliases so we can have a uniform RSA_CASE */
 #define ossl_der_oid_rsassaPss ossl_der_oid_id_RSASSA_PSS
 
-#define RSA_CASE(name, var)                                             \
-    var##_nid = NID_##name;                                             \
-    var##_oid = ossl_der_oid_##name;                                    \
-    var##_oid_sz = sizeof(ossl_der_oid_##name);                         \
+#define RSA_CASE(name, var)                     \
+    var##_nid = NID_##name;                     \
+    var##_oid = ossl_der_oid_##name;            \
+    var##_oid_sz = sizeof(ossl_der_oid_##name); \
     break;
 
 int ossl_DER_w_algorithmIdentifier_RSA_PSS(WPACKET *pkt, int tag,
-                                           int rsa_type,
-                                           const RSA_PSS_PARAMS_30 *pss)
+    int rsa_type,
+    const RSA_PSS_PARAMS_30 *pss)
 {
     int rsa_nid = NID_undef;
     const unsigned char *rsa_oid = NULL;
@@ -396,5 +395,5 @@ int ossl_DER_w_algorithmIdentifier_RSA(WPACKET *pkt, int tag, RSA *rsa)
     RSA_PSS_PARAMS_30 *pss_params = ossl_rsa_get0_pss_params_30(rsa);
 
     return ossl_DER_w_algorithmIdentifier_RSA_PSS(pkt, tag, rsa_type,
-                                                  pss_params);
+        pss_params);
 }
diff --git a/providers/common/der/der_rsa_sig.c b/providers/common/der/der_rsa_sig.c
index 08d00641e9b31..5da03f8922ae9 100644
--- a/providers/common/der/der_rsa_sig.c
+++ b/providers/common/der/der_rsa_sig.c
@@ -24,14 +24,14 @@
 #define ossl_der_oid_mdc2WithRSAEncryption \
     ossl_der_oid_mdc2WithRSASignature
 
-#define MD_with_RSA_CASE(name, var)                                     \
-    case NID_##name:                                                    \
-        var = ossl_der_oid_##name##WithRSAEncryption;                   \
-        var##_sz = sizeof(ossl_der_oid_##name##WithRSAEncryption);      \
+#define MD_with_RSA_CASE(name, var)                                \
+    case NID_##name:                                               \
+        var = ossl_der_oid_##name##WithRSAEncryption;              \
+        var##_sz = sizeof(ossl_der_oid_##name##WithRSAEncryption); \
         break;
 
 int ossl_DER_w_algorithmIdentifier_MDWithRSAEncryption(WPACKET *pkt, int tag,
-                                                       int mdnid)
+    int mdnid)
 {
     const unsigned char *precompiled = NULL;
     size_t precompiled_sz = 0;
diff --git a/providers/common/der/der_slh_dsa_gen.c.in b/providers/common/der/der_slh_dsa_gen.c.in
index c337c9e50dc89..41f43cccc10e2 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_slh_dsa_key.c b/providers/common/der/der_slh_dsa_key.c
index f3c1663f5ce63..f8bea7db01c9b 100644
--- a/providers/common/der/der_slh_dsa_key.c
+++ b/providers/common/der/der_slh_dsa_key.c
@@ -12,10 +12,10 @@
 #include "internal/packet.h"
 #include "prov/der_slh_dsa.h"
 
-#define CASE_OID(nid, name)                  \
-    case nid:                                \
-        alg = ossl_der_oid_##name;           \
-        len = sizeof(ossl_der_oid_##name);   \
+#define CASE_OID(nid, name)                \
+    case nid:                              \
+        alg = ossl_der_oid_##name;         \
+        len = sizeof(ossl_der_oid_##name); \
         break
 
 int ossl_DER_w_algorithmIdentifier_SLH_DSA(WPACKET *pkt, int tag, SLH_DSA_KEY *key)
@@ -37,8 +37,8 @@ int ossl_DER_w_algorithmIdentifier_SLH_DSA(WPACKET *pkt, int tag, SLH_DSA_KEY *k
         CASE_OID(NID_SLH_DSA_SHAKE_192f, id_slh_dsa_shake_192f);
         CASE_OID(NID_SLH_DSA_SHAKE_256s, id_slh_dsa_shake_256s);
         CASE_OID(NID_SLH_DSA_SHAKE_256f, id_slh_dsa_shake_256f);
-        default:
-            return 0;
+    default:
+        return 0;
     }
     return ossl_DER_w_begin_sequence(pkt, tag)
         /* No parameters */
diff --git a/providers/common/der/der_sm2_gen.c.in b/providers/common/der/der_sm2_gen.c.in
index ac28307bfb7de..4c7be185d2efb 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_sm2_key.c b/providers/common/der/der_sm2_key.c
index d0b7e3aa2854d..8e57ffe939445 100644
--- a/providers/common/der/der_sm2_key.c
+++ b/providers/common/der/der_sm2_key.c
@@ -18,6 +18,6 @@ int ossl_DER_w_algorithmIdentifier_SM2(WPACKET *pkt, int cont, EC_KEY *ec)
         /* No parameters (yet?) */
         /* It seems SM2 identifier is the same as id_ecPublidKey */
         && ossl_DER_w_precompiled(pkt, -1, ossl_der_oid_id_ecPublicKey,
-                                  sizeof(ossl_der_oid_id_ecPublicKey))
+            sizeof(ossl_der_oid_id_ecPublicKey))
         && ossl_DER_w_end_sequence(pkt, cont);
 }
diff --git a/providers/common/der/der_sm2_sig.c b/providers/common/der/der_sm2_sig.c
index 085e2c7cb5341..ede5f9a87340b 100644
--- a/providers/common/der/der_sm2_sig.c
+++ b/providers/common/der/der_sm2_sig.c
@@ -12,16 +12,16 @@
 #include "prov/der_sm2.h"
 
 /* Aliases so we can have a uniform MD_CASE */
-#define ossl_der_oid_id_sm2_with_sm3   ossl_der_oid_sm2_with_SM3
+#define ossl_der_oid_id_sm2_with_sm3 ossl_der_oid_sm2_with_SM3
 
-#define MD_CASE(name)                                                   \
-    case NID_##name:                                                    \
-        precompiled = ossl_der_oid_id_sm2_with_##name;                  \
-        precompiled_sz = sizeof(ossl_der_oid_id_sm2_with_##name);       \
+#define MD_CASE(name)                                             \
+    case NID_##name:                                              \
+        precompiled = ossl_der_oid_id_sm2_with_##name;            \
+        precompiled_sz = sizeof(ossl_der_oid_id_sm2_with_##name); \
         break;
 
 int ossl_DER_w_algorithmIdentifier_SM2_with_MD(WPACKET *pkt, int cont,
-                                               EC_KEY *ec, int mdnid)
+    EC_KEY *ec, int mdnid)
 {
     const unsigned char *precompiled = NULL;
     size_t precompiled_sz = 0;
diff --git a/providers/common/der/der_wrap_gen.c.in b/providers/common/der/der_wrap_gen.c.in
index d3a6bb909257b..11864907b4f9a 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/digest_to_nid.c b/providers/common/digest_to_nid.c
index 5a0448c0093fb..450aee0135c82 100644
--- a/providers/common/digest_to_nid.c
+++ b/providers/common/digest_to_nid.c
@@ -41,17 +41,17 @@ int ossl_digest_get_approved_nid(const EVP_MD *md)
 {
     /* TODO: FIPS 180-5 RFC 8692 RFC 8702 allow SHAKE */
     static const OSSL_ITEM name_to_nid[] = {
-        { NID_sha1,      OSSL_DIGEST_NAME_SHA1      },
-        { NID_sha224,    OSSL_DIGEST_NAME_SHA2_224  },
-        { NID_sha256,    OSSL_DIGEST_NAME_SHA2_256  },
-        { NID_sha384,    OSSL_DIGEST_NAME_SHA2_384  },
-        { NID_sha512,    OSSL_DIGEST_NAME_SHA2_512  },
+        { NID_sha1, OSSL_DIGEST_NAME_SHA1 },
+        { NID_sha224, OSSL_DIGEST_NAME_SHA2_224 },
+        { NID_sha256, OSSL_DIGEST_NAME_SHA2_256 },
+        { NID_sha384, OSSL_DIGEST_NAME_SHA2_384 },
+        { NID_sha512, OSSL_DIGEST_NAME_SHA2_512 },
         { NID_sha512_224, OSSL_DIGEST_NAME_SHA2_512_224 },
         { NID_sha512_256, OSSL_DIGEST_NAME_SHA2_512_256 },
-        { NID_sha3_224,  OSSL_DIGEST_NAME_SHA3_224  },
-        { NID_sha3_256,  OSSL_DIGEST_NAME_SHA3_256  },
-        { NID_sha3_384,  OSSL_DIGEST_NAME_SHA3_384  },
-        { NID_sha3_512,  OSSL_DIGEST_NAME_SHA3_512  },
+        { NID_sha3_224, OSSL_DIGEST_NAME_SHA3_224 },
+        { NID_sha3_256, OSSL_DIGEST_NAME_SHA3_256 },
+        { NID_sha3_384, OSSL_DIGEST_NAME_SHA3_384 },
+        { NID_sha3_512, OSSL_DIGEST_NAME_SHA3_512 },
     };
 
     return ossl_digest_md_to_nid(md, name_to_nid, OSSL_NELEM(name_to_nid));
diff --git a/providers/common/include/prov/bio.h b/providers/common/include/prov/bio.h
index da7e7e87f593c..244199524803a 100644
--- a/providers/common/include/prov/bio.h
+++ b/providers/common/include/prov/bio.h
@@ -17,9 +17,9 @@ int ossl_prov_bio_from_dispatch(const OSSL_DISPATCH *fns);
 OSSL_CORE_BIO *ossl_prov_bio_new_file(const char *filename, const char *mode);
 OSSL_CORE_BIO *ossl_prov_bio_new_membuf(const char *filename, int len);
 int ossl_prov_bio_read_ex(OSSL_CORE_BIO *bio, void *data, size_t data_len,
-                          size_t *bytes_read);
+    size_t *bytes_read);
 int ossl_prov_bio_write_ex(OSSL_CORE_BIO *bio, const void *data, size_t data_len,
-                           size_t *written);
+    size_t *written);
 int ossl_prov_bio_gets(OSSL_CORE_BIO *bio, char *buf, int size);
 int ossl_prov_bio_puts(OSSL_CORE_BIO *bio, const char *str);
 int ossl_prov_bio_ctrl(OSSL_CORE_BIO *bio, int cmd, long num, void *ptr);
diff --git a/providers/common/include/prov/der_digests.h.in b/providers/common/include/prov/der_digests.h.in
index f8f89973398b4..b1bfbddaa17ae 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 75e44a16f176c..dc671b9c5a47d 100644
--- a/providers/common/include/prov/der_dsa.h.in
+++ b/providers/common/include/prov/der_dsa.h.in
@@ -12,14 +12,16 @@
 #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);
 /* Signature */
 int ossl_DER_w_algorithmIdentifier_DSA_with_MD(WPACKET *pkt, int tag,
-                                               DSA *dsa, int mdnid);
+    DSA *dsa, int mdnid);
diff --git a/providers/common/include/prov/der_ec.h.in b/providers/common/include/prov/der_ec.h.in
index ebc9bb0310e8a..5fc79c59d21d9 100644
--- a/providers/common/include/prov/der_ec.h.in
+++ b/providers/common/include/prov/der_ec.h.in
@@ -13,14 +13,16 @@
 #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);
 /* Signature */
 int ossl_DER_w_algorithmIdentifier_ECDSA_with_MD(WPACKET *pkt, int cont,
-                                                 EC_KEY *ec, int mdnid);
+    EC_KEY *ec, int mdnid);
diff --git a/providers/common/include/prov/der_ecx.h.in b/providers/common/include/prov/der_ecx.h.in
index 2ca86fb1dd7d6..2e22899a6b667 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_ml_dsa.h.in b/providers/common/include/prov/der_ml_dsa.h.in
index 07f0f3f4ac97f..f78be87fa6789 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 97e5377358cc9..b8524d76cece7 100644
--- a/providers/common/include/prov/der_rsa.h.in
+++ b/providers/common/include/prov/der_rsa.h.in
@@ -13,21 +13,23 @@
 #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,
-                                 const RSA_PSS_PARAMS_30 *pss);
+    const RSA_PSS_PARAMS_30 *pss);
 /* Subject Public Key Info */
 int ossl_DER_w_algorithmIdentifier_RSA(WPACKET *pkt, int tag, RSA *rsa);
 int ossl_DER_w_algorithmIdentifier_RSA_PSS(WPACKET *pkt, int tag,
-                                           int rsa_type,
-                                           const RSA_PSS_PARAMS_30 *pss);
+    int rsa_type,
+    const RSA_PSS_PARAMS_30 *pss);
 /* Signature */
 int ossl_DER_w_algorithmIdentifier_MDWithRSAEncryption(WPACKET *pkt, int tag,
-                                                       int mdnid);
+    int mdnid);
diff --git a/providers/common/include/prov/der_slh_dsa.h.in b/providers/common/include/prov/der_slh_dsa.h.in
index 017a3daa183a7..ae83c122d69bc 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 f4f2bd72ee90b..b616b9e74845b 100644
--- a/providers/common/include/prov/der_sm2.h.in
+++ b/providers/common/include/prov/der_sm2.h.in
@@ -13,14 +13,16 @@
 #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);
 /* Signature */
 int ossl_DER_w_algorithmIdentifier_SM2_with_MD(WPACKET *pkt, int cont,
-                                               EC_KEY *ec, int mdnid);
+    EC_KEY *ec, int mdnid);
diff --git a/providers/common/include/prov/der_wrap.h.in b/providers/common/include/prov/der_wrap.h.in
index a20f3d45ec877..7b314b6edadd3 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 */
diff --git a/providers/common/include/prov/proverr.h b/providers/common/include/prov/proverr.h
index 87a84e9c21f8b..a2829caed0fd0 100644
--- a/providers/common/include/prov/proverr.h
+++ b/providers/common/include/prov/proverr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_PROVERR_H
-# define OSSL_PROVERR_H
-# pragma once
+#define OSSL_PROVERR_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_PROV_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/providers/common/include/prov/provider_ctx.h b/providers/common/include/prov/provider_ctx.h
index d5d3dc6ee7952..4d022980c032d 100644
--- a/providers/common/include/prov/provider_ctx.h
+++ b/providers/common/include/prov/provider_ctx.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef OSSL_PROV_PROVIDER_CTX_H
-# define OSSL_PROV_PROVIDER_CTX_H
+#define OSSL_PROV_PROVIDER_CTX_H
 
-# include <openssl/types.h>
-# include <openssl/crypto.h>
-# include <openssl/bio.h>
-# include <openssl/core.h>
-# include <openssl/core_dispatch.h>
+#include <openssl/types.h>
+#include <openssl/crypto.h>
+#include <openssl/bio.h>
+#include <openssl/core.h>
+#include <openssl/core_dispatch.h>
 
 typedef struct prov_ctx_st {
     const OSSL_CORE_HANDLE *handle;
-    OSSL_LIB_CTX *libctx;         /* For all provider modules */
+    OSSL_LIB_CTX *libctx; /* For all provider modules */
     BIO_METHOD *corebiometh;
     OSSL_FUNC_core_get_params_fn *core_get_params;
 } PROV_CTX;
@@ -27,7 +27,7 @@ typedef struct prov_ctx_st {
  * To be used anywhere the library context needs to be passed, such as to
  * fetching functions.
  */
-# define PROV_LIBCTX_OF(provctx)        \
+#define PROV_LIBCTX_OF(provctx) \
     ossl_prov_ctx_get0_libctx((provctx))
 
 PROV_CTX *ossl_prov_ctx_new(void);
@@ -35,9 +35,8 @@ void ossl_prov_ctx_free(PROV_CTX *ctx);
 void ossl_prov_ctx_set0_libctx(PROV_CTX *ctx, OSSL_LIB_CTX *libctx);
 void ossl_prov_ctx_set0_handle(PROV_CTX *ctx, const OSSL_CORE_HANDLE *handle);
 void ossl_prov_ctx_set0_core_bio_method(PROV_CTX *ctx, BIO_METHOD *corebiometh);
-void
-ossl_prov_ctx_set0_core_get_params(PROV_CTX *ctx,
-                                   OSSL_FUNC_core_get_params_fn *c_get_params);
+void ossl_prov_ctx_set0_core_get_params(PROV_CTX *ctx,
+    OSSL_FUNC_core_get_params_fn *c_get_params);
 OSSL_LIB_CTX *ossl_prov_ctx_get0_libctx(PROV_CTX *ctx);
 const OSSL_CORE_HANDLE *ossl_prov_ctx_get0_handle(PROV_CTX *ctx);
 BIO_METHOD *ossl_prov_ctx_get0_core_bio_method(PROV_CTX *ctx);
diff --git a/providers/common/include/prov/provider_util.h b/providers/common/include/prov/provider_util.h
index 9cbe7932e72dd..503e632186d13 100644
--- a/providers/common/include/prov/provider_util.h
+++ b/providers/common/include/prov/provider_util.h
@@ -16,11 +16,11 @@ typedef struct {
      * the cipher, always.  |alloc_cipher| only holds a reference to an
      * explicitly fetched cipher.
      */
-    const EVP_CIPHER *cipher;   /* cipher */
-    EVP_CIPHER *alloc_cipher;   /* fetched cipher */
+    const EVP_CIPHER *cipher; /* cipher */
+    EVP_CIPHER *alloc_cipher; /* fetched cipher */
 
     /* Conditions for legacy EVP_CIPHER uses */
-    ENGINE *engine;             /* cipher engine */
+    ENGINE *engine; /* cipher engine */
 } PROV_CIPHER;
 
 typedef struct {
@@ -29,11 +29,11 @@ typedef struct {
      * the digest, always.  |alloc_md| only holds a reference to an explicitly
      * fetched digest.
      */
-    const EVP_MD *md;           /* digest */
-    EVP_MD *alloc_md;           /* fetched digest */
+    const EVP_MD *md; /* digest */
+    EVP_MD *alloc_md; /* fetched digest */
 
     /* Conditions for legacy EVP_MD uses */
-    ENGINE *engine;             /* digest engine */
+    ENGINE *engine; /* digest engine */
 } PROV_DIGEST;
 
 /* Cipher functions */
@@ -44,8 +44,8 @@ typedef struct {
  * non-provider based implementations.
  */
 int ossl_prov_cipher_load_from_params(PROV_CIPHER *pc,
-                                      const OSSL_PARAM params[],
-                                      OSSL_LIB_CTX *ctx);
+    const OSSL_PARAM params[],
+    OSSL_LIB_CTX *ctx);
 
 /* Reset the PROV_CIPHER fields and free any allocated cipher reference */
 void ossl_prov_cipher_reset(PROV_CIPHER *pc);
@@ -64,7 +64,7 @@ ENGINE *ossl_prov_cipher_engine(const PROV_CIPHER *pc);
  * propquery. Store the result in the PROV_DIGEST and return the fetched md.
  */
 const EVP_MD *ossl_prov_digest_fetch(PROV_DIGEST *pd, OSSL_LIB_CTX *libctx,
-                                     const char *mdname, const char *propquery);
+    const char *mdname, const char *propquery);
 
 /*
  * Load a digest from the specified parameters with the specified context.
@@ -73,8 +73,8 @@ const EVP_MD *ossl_prov_digest_fetch(PROV_DIGEST *pd, OSSL_LIB_CTX *libctx,
  * non-provider based implementations.
  */
 int ossl_prov_digest_load_from_params(PROV_DIGEST *pd,
-                                      const OSSL_PARAM params[],
-                                      OSSL_LIB_CTX *ctx);
+    const OSSL_PARAM params[],
+    OSSL_LIB_CTX *ctx);
 
 /* Reset the PROV_DIGEST fields and free any allocated digest reference */
 void ossl_prov_digest_reset(PROV_DIGEST *pd);
@@ -95,13 +95,13 @@ void ossl_prov_digest_set_md(PROV_DIGEST *pd, EVP_MD *md);
  * from the supplied params (if non NULL) are used instead.
  */
 int ossl_prov_set_macctx(EVP_MAC_CTX *macctx,
-                         const OSSL_PARAM params[],
-                         const char *ciphername,
-                         const char *mdname,
-                         const char *engine,
-                         const char *properties,
-                         const unsigned char *key,
-                         size_t keylen);
+    const OSSL_PARAM params[],
+    const char *ciphername,
+    const char *mdname,
+    const char *engine,
+    const char *properties,
+    const unsigned char *key,
+    size_t keylen);
 
 /* MAC functions */
 /*
@@ -121,11 +121,11 @@ int ossl_prov_set_macctx(EVP_MAC_CTX *macctx,
  * ignored.
  */
 int ossl_prov_macctx_load_from_params(EVP_MAC_CTX **macctx,
-                                      const OSSL_PARAM params[],
-                                      const char *macname,
-                                      const char *ciphername,
-                                      const char *mdname,
-                                      OSSL_LIB_CTX *ctx);
+    const OSSL_PARAM params[],
+    const char *macname,
+    const char *ciphername,
+    const char *mdname,
+    OSSL_LIB_CTX *ctx);
 
 typedef struct ag_capable_st {
     OSSL_ALGORITHM alg;
@@ -137,8 +137,8 @@ typedef struct ag_capable_st {
  * If this method is NULL or the method returns 1 then the algorithm is added.
  */
 void ossl_prov_cache_exported_algorithms(const OSSL_ALGORITHM_CAPABLE *in,
-                                         OSSL_ALGORITHM *out);
+    OSSL_ALGORITHM *out);
 
 /* Duplicate a lump of memory safely */
 int ossl_prov_memdup(const void *src, size_t src_len,
-                     unsigned char **dest, size_t *dest_len);
+    unsigned char **dest, size_t *dest_len);
diff --git a/providers/common/provider_ctx.c b/providers/common/provider_ctx.c
index db01002c46e41..648c00a0e0e21 100644
--- a/providers/common/provider_ctx.c
+++ b/providers/common/provider_ctx.c
@@ -40,9 +40,8 @@ void ossl_prov_ctx_set0_core_bio_method(PROV_CTX *ctx, BIO_METHOD *corebiometh)
         ctx->corebiometh = corebiometh;
 }
 
-void
-ossl_prov_ctx_set0_core_get_params(PROV_CTX *ctx,
-                                   OSSL_FUNC_core_get_params_fn *c_get_params)
+void ossl_prov_ctx_set0_core_get_params(PROV_CTX *ctx,
+    OSSL_FUNC_core_get_params_fn *c_get_params)
 {
     if (ctx != NULL)
         ctx->core_get_params = c_get_params;
@@ -87,9 +86,9 @@ ossl_prov_ctx_get_param(PROV_CTX *ctx, const char *name, const char *defval)
         || ctx->core_get_params == NULL)
         return defval;
 
-    param[0].key = (char *) name;
+    param[0].key = (char *)name;
     param[0].data_type = OSSL_PARAM_UTF8_PTR;
-    param[0].data = (void *) &val;
+    param[0].data = (void *)&val;
     param[0].data_size = sizeof(val);
     param[0].return_size = OSSL_PARAM_UNMODIFIED;
 
@@ -112,9 +111,9 @@ int ossl_prov_ctx_get_bool_param(PROV_CTX *ctx, const char *name, int defval)
             || (OPENSSL_strcasecmp(val, "on") == 0))
             return 1;
         else if ((strcmp(val, "0") == 0)
-                 || (OPENSSL_strcasecmp(val, "no") == 0)
-                 || (OPENSSL_strcasecmp(val, "false") == 0)
-                 || (OPENSSL_strcasecmp(val, "off") == 0))
+            || (OPENSSL_strcasecmp(val, "no") == 0)
+            || (OPENSSL_strcasecmp(val, "false") == 0)
+            || (OPENSSL_strcasecmp(val, "off") == 0))
             return 0;
     }
     return defval;
diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c
index ea727e8334d50..170bb7f63af85 100644
--- a/providers/common/provider_err.c
+++ b/providers/common/provider_err.c
@@ -15,242 +15,244 @@
 #ifndef OPENSSL_NO_ERR
 
 static const ERR_STRING_DATA PROV_str_reasons[] = {
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ADDITIONAL_INPUT_TOO_LONG),
-     "additional input too long"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ALGORITHM_MISMATCH),
-     "algorithm mismatch"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ALREADY_INSTANTIATED),
-     "already instantiated"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_BAD_DECRYPT), "bad decrypt"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_BAD_ENCODING), "bad encoding"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_BAD_LENGTH), "bad length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_BAD_TLS_CLIENT_VERSION),
-     "bad tls client version"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_BN_ERROR), "bn error"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_CIPHER_OPERATION_FAILED),
-     "cipher operation failed"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_COFACTOR_REQUIRED), "cofactor required"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_DERIVATION_FUNCTION_INIT_FAILED),
-     "derivation function init failed"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_DIGEST_NOT_ALLOWED),
-     "digest not allowed"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_EMS_NOT_ENABLED), "ems not enabled"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ENTROPY_SOURCE_FAILED_CONTINUOUS_TESTS),
-     "entropy source failed continuous tests"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ENTROPY_SOURCE_STRENGTH_TOO_WEAK),
-     "entropy source strength too weak"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ERROR_INSTANTIATING_DRBG),
-     "error instantiating drbg"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ERROR_RETRIEVING_ENTROPY),
-     "error retrieving entropy"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ERROR_RETRIEVING_NONCE),
-     "error retrieving nonce"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_DURING_DERIVATION),
-     "failed during derivation"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_TO_CREATE_LOCK),
-     "failed to create lock"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_TO_DECRYPT), "failed to decrypt"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_TO_GENERATE_KEY),
-     "failed to generate key"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_TO_GET_PARAMETER),
-     "failed to get parameter"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_TO_SET_PARAMETER),
-     "failed to set parameter"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_TO_SIGN), "failed to sign"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FINAL_CALL_OUT_OF_ORDER),
-     "final call out of order"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FIPS_MODULE_CONDITIONAL_ERROR),
-     "fips module conditional error"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FIPS_MODULE_ENTERING_ERROR_STATE),
-     "fips module entering error state"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FIPS_MODULE_IN_ERROR_STATE),
-     "fips module in error state"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_GENERATE_ERROR), "generate error"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE),
-     "illegal or unsupported padding mode"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INDICATOR_INTEGRITY_FAILURE),
-     "indicator integrity failure"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INIT_CALL_OUT_OF_ORDER),
-     "init call out of order"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INSUFFICIENT_DRBG_STRENGTH),
-     "insufficient drbg strength"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_AAD), "invalid aad"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_AEAD), "invalid aead"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_CONFIG_DATA),
-     "invalid config data"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_CONSTANT_LENGTH),
-     "invalid constant length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_CURVE), "invalid curve"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_CUSTOM_LENGTH),
-     "invalid custom length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_DATA), "invalid data"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_DIGEST), "invalid digest"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_DIGEST_LENGTH),
-     "invalid digest length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_DIGEST_SIZE),
-     "invalid digest size"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION),
-     "invalid eddsa instance for attempted operation"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_INPUT_LENGTH),
-     "invalid input length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_ITERATION_COUNT),
-     "invalid iteration count"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_IV_LENGTH), "invalid iv length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_KDF), "invalid kdf"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_KEY), "invalid key"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_KEY_LENGTH),
-     "invalid key length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_MAC), "invalid mac"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_MEMORY_SIZE),
-     "invalid memory size"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_MGF1_MD), "invalid mgf1 md"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_MODE), "invalid mode"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_OUTPUT_LENGTH),
-     "invalid output length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_PADDING_MODE),
-     "invalid padding mode"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_PREHASHED_DIGEST_LENGTH),
-     "invalid prehashed digest length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_PUBINFO), "invalid pubinfo"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_SALT_LENGTH),
-     "invalid salt length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_SEED_LENGTH),
-     "invalid seed length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_SIGNATURE_SIZE),
-     "invalid signature size"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_STATE), "invalid state"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_TAG), "invalid tag"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_TAG_LENGTH),
-     "invalid tag length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_THREAD_POOL_SIZE),
-     "invalid thread pool size"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_UKM_LENGTH),
-     "invalid ukm length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_X931_DIGEST),
-     "invalid x931 digest"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_IN_ERROR_STATE), "in error state"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_KEY_SETUP_FAILED), "key setup failed"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_KEY_SIZE_TOO_SMALL),
-     "key size too small"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_LENGTH_TOO_LARGE), "length too large"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISMATCHING_DOMAIN_PARAMETERS),
-     "mismatching domain parameters"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_CEK_ALG), "missing cek alg"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_CIPHER), "missing cipher"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_CONFIG_DATA),
-     "missing config data"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_CONSTANT), "missing constant"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_KEY), "missing key"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_MAC), "missing mac"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_MESSAGE_DIGEST),
-     "missing message digest"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_OID), "missing OID"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_PASS), "missing pass"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_SALT), "missing salt"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_SECRET), "missing secret"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_SEED), "missing seed"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_SESSION_ID),
-     "missing session id"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_TYPE), "missing type"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_XCGHASH), "missing xcghash"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ML_DSA_NO_FORMAT), "ml dsa no format"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ML_KEM_NO_FORMAT), "ml kem no format"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MODULE_INTEGRITY_FAILURE),
-     "module integrity failure"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_A_PRIVATE_KEY), "not a private key"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_A_PUBLIC_KEY), "not a public key"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_INSTANTIATED), "not instantiated"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_PARAMETERS), "not parameters"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_SUPPORTED), "not supported"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_XOF_OR_INVALID_LENGTH),
-     "not xof or invalid length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NO_INSTANCE_ALLOWED),
-     "no instance allowed"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NO_KEY_SET), "no key set"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NO_PARAMETERS_SET), "no parameters set"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NULL_LENGTH_POINTER),
-     "null length pointer"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NULL_OUTPUT_BUFFER),
-     "null output buffer"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ONESHOT_CALL_OUT_OF_ORDER),
-     "oneshot call out of order"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),
-     "operation not supported for this keytype"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_OUTPUT_BUFFER_TOO_SMALL),
-     "output buffer too small"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PARENT_CANNOT_GENERATE_RANDOM_NUMBERS),
-     "parent cannot generate random numbers"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PARENT_CANNOT_SUPPLY_ENTROPY_SEED),
-     "parent cannot supply entropy seed"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PARENT_LOCKING_NOT_ENABLED),
-     "parent locking not enabled"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PARENT_STRENGTH_TOO_WEAK),
-     "parent strength too weak"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PATH_MUST_BE_ABSOLUTE),
-     "path must be absolute"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PERSONALISATION_STRING_TOO_LONG),
-     "personalisation string too long"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PSS_SALTLEN_TOO_SMALL),
-     "pss saltlen too small"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_REQUEST_TOO_LARGE_FOR_DRBG),
-     "request too large for drbg"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_REQUIRE_CTR_MODE_CIPHER),
-     "require ctr mode cipher"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_RESEED_ERROR), "reseed error"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES),
-     "search only supported for directories"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_SEED_SOURCES_MUST_NOT_HAVE_A_PARENT),
-     "seed sources must not have a parent"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_SELF_TEST_KAT_FAILURE),
-     "self test kat failure"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_SELF_TEST_POST_FAILURE),
-     "self test post failure"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_TAG_NOT_NEEDED), "tag not needed"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_TAG_NOT_SET), "tag not set"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_TOO_MANY_RECORDS), "too many records"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_FIND_CIPHERS),
-     "unable to find ciphers"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_GET_PARENT_STRENGTH),
-     "unable to get parent strength"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_GET_PASSPHRASE),
-     "unable to get passphrase"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_INITIALISE_CIPHERS),
-     "unable to initialise ciphers"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_LOAD_SHA256),
-     "unable to load sha256"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_LOCK_PARENT),
-     "unable to lock parent"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_RESEED), "unable to reseed"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNEXPECTED_KEY_PARAMETERS),
-     "unexpected key parameters"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNSUPPORTED_CEK_ALG),
-     "unsupported cek alg"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNSUPPORTED_KEY_SIZE),
-     "unsupported key size"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNSUPPORTED_MAC_TYPE),
-     "unsupported mac type"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNSUPPORTED_NUMBER_OF_ROUNDS),
-     "unsupported number of rounds"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNSUPPORTED_SELECTION),
-     "unsupported selection"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UPDATE_CALL_OUT_OF_ORDER),
-     "update call out of order"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_URI_AUTHORITY_UNSUPPORTED),
-     "uri authority unsupported"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_VALUE_ERROR), "value error"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_WRONG_CIPHERTEXT_SIZE),
-     "wrong ciphertext size"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_WRONG_FINAL_BLOCK_LENGTH),
-     "wrong final block length"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_WRONG_OUTPUT_BUFFER_SIZE),
-     "wrong output buffer size"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_XOF_DIGESTS_NOT_ALLOWED),
-     "xof digests not allowed"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_XTS_DATA_UNIT_IS_TOO_LARGE),
-     "xts data unit is too large"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_XTS_DUPLICATED_KEYS),
-     "xts duplicated keys"},
-    {0, NULL}
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ADDITIONAL_INPUT_TOO_LONG),
+        "additional input too long" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ALGORITHM_MISMATCH),
+        "algorithm mismatch" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ALREADY_INSTANTIATED),
+        "already instantiated" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_BAD_DECRYPT), "bad decrypt" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_BAD_ENCODING), "bad encoding" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_BAD_LENGTH), "bad length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_BAD_TLS_CLIENT_VERSION),
+        "bad tls client version" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_BN_ERROR), "bn error" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_CIPHER_OPERATION_FAILED),
+        "cipher operation failed" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_COFACTOR_REQUIRED), "cofactor required" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_DERIVATION_FUNCTION_INIT_FAILED),
+        "derivation function init failed" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_DIGEST_NOT_ALLOWED),
+        "digest not allowed" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_EMS_NOT_ENABLED), "ems not enabled" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ENTROPY_SOURCE_FAILED_CONTINUOUS_TESTS),
+        "entropy source failed continuous tests" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ENTROPY_SOURCE_STRENGTH_TOO_WEAK),
+        "entropy source strength too weak" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ERROR_INSTANTIATING_DRBG),
+        "error instantiating drbg" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ERROR_RETRIEVING_ENTROPY),
+        "error retrieving entropy" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ERROR_RETRIEVING_NONCE),
+        "error retrieving nonce" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_DURING_DERIVATION),
+        "failed during derivation" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_TO_CREATE_LOCK),
+        "failed to create lock" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_TO_DECRYPT), "failed to decrypt" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_TO_GENERATE_KEY),
+        "failed to generate key" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_TO_GET_PARAMETER),
+        "failed to get parameter" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_TO_SET_PARAMETER),
+        "failed to set parameter" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FAILED_TO_SIGN), "failed to sign" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FINAL_CALL_OUT_OF_ORDER),
+        "final call out of order" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FIPS_MODULE_CONDITIONAL_ERROR),
+        "fips module conditional error" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FIPS_MODULE_ENTERING_ERROR_STATE),
+        "fips module entering error state" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FIPS_MODULE_IMPORT_PCT_ERROR),
+        "fips module import pct error" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_FIPS_MODULE_IN_ERROR_STATE),
+        "fips module in error state" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_GENERATE_ERROR), "generate error" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE),
+        "illegal or unsupported padding mode" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INDICATOR_INTEGRITY_FAILURE),
+        "indicator integrity failure" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INIT_CALL_OUT_OF_ORDER),
+        "init call out of order" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INSUFFICIENT_DRBG_STRENGTH),
+        "insufficient drbg strength" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_AAD), "invalid aad" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_AEAD), "invalid aead" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_CONFIG_DATA),
+        "invalid config data" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_CONSTANT_LENGTH),
+        "invalid constant length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_CURVE), "invalid curve" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_CUSTOM_LENGTH),
+        "invalid custom length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_DATA), "invalid data" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_DIGEST), "invalid digest" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_DIGEST_LENGTH),
+        "invalid digest length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_DIGEST_SIZE),
+        "invalid digest size" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION),
+        "invalid eddsa instance for attempted operation" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_INPUT_LENGTH),
+        "invalid input length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_ITERATION_COUNT),
+        "invalid iteration count" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_IV_LENGTH), "invalid iv length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_KDF), "invalid kdf" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_KEY), "invalid key" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_KEY_LENGTH),
+        "invalid key length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_MAC), "invalid mac" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_MEMORY_SIZE),
+        "invalid memory size" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_MGF1_MD), "invalid mgf1 md" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_MODE), "invalid mode" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_OUTPUT_LENGTH),
+        "invalid output length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_PADDING_MODE),
+        "invalid padding mode" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_PREHASHED_DIGEST_LENGTH),
+        "invalid prehashed digest length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_PUBINFO), "invalid pubinfo" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_SALT_LENGTH),
+        "invalid salt length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_SEED_LENGTH),
+        "invalid seed length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_SIGNATURE_SIZE),
+        "invalid signature size" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_STATE), "invalid state" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_TAG), "invalid tag" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_TAG_LENGTH),
+        "invalid tag length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_THREAD_POOL_SIZE),
+        "invalid thread pool size" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_UKM_LENGTH),
+        "invalid ukm length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_X931_DIGEST),
+        "invalid x931 digest" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_IN_ERROR_STATE), "in error state" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_KEY_SETUP_FAILED), "key setup failed" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_KEY_SIZE_TOO_SMALL),
+        "key size too small" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_LENGTH_TOO_LARGE), "length too large" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISMATCHING_DOMAIN_PARAMETERS),
+        "mismatching domain parameters" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_CEK_ALG), "missing cek alg" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_CIPHER), "missing cipher" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_CONFIG_DATA),
+        "missing config data" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_CONSTANT), "missing constant" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_KEY), "missing key" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_MAC), "missing mac" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_MESSAGE_DIGEST),
+        "missing message digest" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_OID), "missing OID" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_PASS), "missing pass" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_SALT), "missing salt" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_SECRET), "missing secret" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_SEED), "missing seed" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_SESSION_ID),
+        "missing session id" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_TYPE), "missing type" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_XCGHASH), "missing xcghash" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ML_DSA_NO_FORMAT), "ml dsa no format" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ML_KEM_NO_FORMAT), "ml kem no format" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MODULE_INTEGRITY_FAILURE),
+        "module integrity failure" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_A_PRIVATE_KEY), "not a private key" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_A_PUBLIC_KEY), "not a public key" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_INSTANTIATED), "not instantiated" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_PARAMETERS), "not parameters" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_SUPPORTED), "not supported" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_XOF_OR_INVALID_LENGTH),
+        "not xof or invalid length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NO_INSTANCE_ALLOWED),
+        "no instance allowed" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NO_KEY_SET), "no key set" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NO_PARAMETERS_SET), "no parameters set" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NULL_LENGTH_POINTER),
+        "null length pointer" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NULL_OUTPUT_BUFFER),
+        "null output buffer" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ONESHOT_CALL_OUT_OF_ORDER),
+        "oneshot call out of order" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),
+        "operation not supported for this keytype" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_OUTPUT_BUFFER_TOO_SMALL),
+        "output buffer too small" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PARENT_CANNOT_GENERATE_RANDOM_NUMBERS),
+        "parent cannot generate random numbers" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PARENT_CANNOT_SUPPLY_ENTROPY_SEED),
+        "parent cannot supply entropy seed" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PARENT_LOCKING_NOT_ENABLED),
+        "parent locking not enabled" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PARENT_STRENGTH_TOO_WEAK),
+        "parent strength too weak" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PATH_MUST_BE_ABSOLUTE),
+        "path must be absolute" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PERSONALISATION_STRING_TOO_LONG),
+        "personalisation string too long" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_PSS_SALTLEN_TOO_SMALL),
+        "pss saltlen too small" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_REQUEST_TOO_LARGE_FOR_DRBG),
+        "request too large for drbg" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_REQUIRE_CTR_MODE_CIPHER),
+        "require ctr mode cipher" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_RESEED_ERROR), "reseed error" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES),
+        "search only supported for directories" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_SEED_SOURCES_MUST_NOT_HAVE_A_PARENT),
+        "seed sources must not have a parent" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_SELF_TEST_KAT_FAILURE),
+        "self test kat failure" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_SELF_TEST_POST_FAILURE),
+        "self test post failure" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_TAG_NOT_NEEDED), "tag not needed" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_TAG_NOT_SET), "tag not set" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_TOO_MANY_RECORDS), "too many records" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_FIND_CIPHERS),
+        "unable to find ciphers" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_GET_PARENT_STRENGTH),
+        "unable to get parent strength" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_GET_PASSPHRASE),
+        "unable to get passphrase" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_INITIALISE_CIPHERS),
+        "unable to initialise ciphers" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_LOAD_SHA256),
+        "unable to load sha256" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_LOCK_PARENT),
+        "unable to lock parent" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_RESEED), "unable to reseed" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNEXPECTED_KEY_PARAMETERS),
+        "unexpected key parameters" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNSUPPORTED_CEK_ALG),
+        "unsupported cek alg" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNSUPPORTED_KEY_SIZE),
+        "unsupported key size" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNSUPPORTED_MAC_TYPE),
+        "unsupported mac type" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNSUPPORTED_NUMBER_OF_ROUNDS),
+        "unsupported number of rounds" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNSUPPORTED_SELECTION),
+        "unsupported selection" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UPDATE_CALL_OUT_OF_ORDER),
+        "update call out of order" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_URI_AUTHORITY_UNSUPPORTED),
+        "uri authority unsupported" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_VALUE_ERROR), "value error" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_WRONG_CIPHERTEXT_SIZE),
+        "wrong ciphertext size" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_WRONG_FINAL_BLOCK_LENGTH),
+        "wrong final block length" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_WRONG_OUTPUT_BUFFER_SIZE),
+        "wrong output buffer size" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_XOF_DIGESTS_NOT_ALLOWED),
+        "xof digests not allowed" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_XTS_DATA_UNIT_IS_TOO_LARGE),
+        "xts data unit is too large" },
+    { ERR_PACK(ERR_LIB_PROV, 0, PROV_R_XTS_DUPLICATED_KEYS),
+        "xts duplicated keys" },
+    { 0, NULL }
 };
 
 #endif
diff --git a/providers/common/provider_seeding.c b/providers/common/provider_seeding.c
index 544344f30a996..14be2018c2a10 100644
--- a/providers/common/provider_seeding.c
+++ b/providers/common/provider_seeding.c
@@ -27,7 +27,7 @@ static OSSL_FUNC_cleanup_user_nonce_fn *c_cleanup_user_nonce = NULL;
  * to the FIPS provider, this is the wrong one.  We need to convert this
  * to the correct core handle before up-calling libcrypto.
  */
-# define CORE_HANDLE(provctx) \
+#define CORE_HANDLE(provctx) \
     FIPS_get_core_handle(ossl_prov_ctx_get0_libctx(provctx))
 #else
 /*
@@ -35,7 +35,7 @@ static OSSL_FUNC_cleanup_user_nonce_fn *c_cleanup_user_nonce = NULL;
  * seed source is instantiated.  However, that might not apply for third
  * party providers, so this is retained for compatibility.
  */
-# define CORE_HANDLE(provctx) ossl_prov_ctx_get0_handle(provctx)
+#define CORE_HANDLE(provctx) ossl_prov_ctx_get0_handle(provctx)
 #endif
 
 int ossl_prov_seeding_from_dispatch(const OSSL_DISPATCH *fns)
@@ -46,8 +46,13 @@ int ossl_prov_seeding_from_dispatch(const OSSL_DISPATCH *fns)
          * multiple versions of libcrypto (e.g. one static and one dynamic), but
          * sharing a single fips.so. We do a simple sanity check here.
          */
-#define set_func(c, f) \
-    do { if (c == NULL) c = f; else if (c != f) return 0; } while (0)
+#define set_func(c, f)   \
+    do {                 \
+        if (c == NULL)   \
+            c = f;       \
+        else if (c != f) \
+            return 0;    \
+    } while (0)
         switch (fns->function_id) {
         case OSSL_FUNC_GET_ENTROPY:
             set_func(c_get_entropy, OSSL_FUNC_get_entropy(fns));
@@ -80,7 +85,7 @@ int ossl_prov_seeding_from_dispatch(const OSSL_DISPATCH *fns)
 }
 
 size_t ossl_prov_get_entropy(PROV_CTX *prov_ctx, unsigned char **pout,
-                             int entropy, size_t min_len, size_t max_len)
+    int entropy, size_t min_len, size_t max_len)
 {
     const OSSL_CORE_HANDLE *handle = CORE_HANDLE(prov_ctx);
 
@@ -92,7 +97,7 @@ size_t ossl_prov_get_entropy(PROV_CTX *prov_ctx, unsigned char **pout,
 }
 
 void ossl_prov_cleanup_entropy(PROV_CTX *prov_ctx, unsigned char *buf,
-                               size_t len)
+    size_t len)
 {
     const OSSL_CORE_HANDLE *handle = CORE_HANDLE(prov_ctx);
 
@@ -103,8 +108,8 @@ void ossl_prov_cleanup_entropy(PROV_CTX *prov_ctx, unsigned char *buf,
 }
 
 size_t ossl_prov_get_nonce(PROV_CTX *prov_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)
 {
     const OSSL_CORE_HANDLE *handle = CORE_HANDLE(prov_ctx);
 
diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c
index 15b6834afb7f5..88d69bc10d653 100644
--- a/providers/common/provider_util.c
+++ b/providers/common/provider_util.c
@@ -15,8 +15,8 @@
 #include <openssl/err.h>
 #include <openssl/proverr.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
-# include "crypto/evp.h"
+#include <openssl/engine.h>
+#include "crypto/evp.h"
 #endif
 #include "prov/providercommon.h"
 #include "prov/provider_util.h"
@@ -49,7 +49,7 @@ int ossl_prov_cipher_copy(PROV_CIPHER *dst, const PROV_CIPHER *src)
 }
 
 static int load_common(const OSSL_PARAM params[], const char **propquery,
-                       ENGINE **engine)
+    ENGINE **engine)
 {
     const OSSL_PARAM *p;
 
@@ -89,8 +89,8 @@ static int load_common(const OSSL_PARAM params[], const char **propquery,
 }
 
 int ossl_prov_cipher_load_from_params(PROV_CIPHER *pc,
-                                      const OSSL_PARAM params[],
-                                      OSSL_LIB_CTX *ctx)
+    const OSSL_PARAM params[],
+    OSSL_LIB_CTX *ctx)
 {
     const OSSL_PARAM *p;
     const char *propquery;
@@ -165,7 +165,7 @@ int ossl_prov_digest_copy(PROV_DIGEST *dst, const PROV_DIGEST *src)
 }
 
 const EVP_MD *ossl_prov_digest_fetch(PROV_DIGEST *pd, OSSL_LIB_CTX *libctx,
-                                     const char *mdname, const char *propquery)
+    const char *mdname, const char *propquery)
 {
     EVP_MD_free(pd->alloc_md);
     pd->md = pd->alloc_md = EVP_MD_fetch(libctx, mdname, propquery);
@@ -174,8 +174,8 @@ const EVP_MD *ossl_prov_digest_fetch(PROV_DIGEST *pd, OSSL_LIB_CTX *libctx,
 }
 
 int ossl_prov_digest_load_from_params(PROV_DIGEST *pd,
-                                      const OSSL_PARAM params[],
-                                      OSSL_LIB_CTX *ctx)
+    const OSSL_PARAM params[],
+    OSSL_LIB_CTX *ctx)
 {
     const OSSL_PARAM *p;
     const char *propquery;
@@ -228,13 +228,13 @@ ENGINE *ossl_prov_digest_engine(const PROV_DIGEST *pd)
 }
 
 int ossl_prov_set_macctx(EVP_MAC_CTX *macctx,
-                         const OSSL_PARAM params[],
-                         const char *ciphername,
-                         const char *mdname,
-                         const char *engine,
-                         const char *properties,
-                         const unsigned char *key,
-                         size_t keylen)
+    const OSSL_PARAM params[],
+    const char *ciphername,
+    const char *mdname,
+    const char *engine,
+    const char *properties,
+    const unsigned char *key,
+    size_t keylen)
 {
     const OSSL_PARAM *p;
     OSSL_PARAM mac_params[6], *mp = mac_params;
@@ -242,7 +242,8 @@ int ossl_prov_set_macctx(EVP_MAC_CTX *macctx,
     if (params != NULL) {
         if (mdname == NULL) {
             if ((p = OSSL_PARAM_locate_const(params,
-                                            OSSL_ALG_PARAM_DIGEST)) != NULL) {
+                     OSSL_ALG_PARAM_DIGEST))
+                != NULL) {
                 if (p->data_type != OSSL_PARAM_UTF8_STRING)
                     return 0;
                 mdname = p->data;
@@ -250,7 +251,8 @@ int ossl_prov_set_macctx(EVP_MAC_CTX *macctx,
         }
         if (ciphername == NULL) {
             if ((p = OSSL_PARAM_locate_const(params,
-                                            OSSL_ALG_PARAM_CIPHER)) != NULL) {
+                     OSSL_ALG_PARAM_CIPHER))
+                != NULL) {
                 if (p->data_type != OSSL_PARAM_UTF8_STRING)
                     return 0;
                 ciphername = p->data;
@@ -258,7 +260,7 @@ int ossl_prov_set_macctx(EVP_MAC_CTX *macctx,
         }
         if (engine == NULL) {
             if ((p = OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_ENGINE))
-                    != NULL) {
+                != NULL) {
                 if (p->data_type != OSSL_PARAM_UTF8_STRING)
                     return 0;
                 engine = p->data;
@@ -268,37 +270,36 @@ int ossl_prov_set_macctx(EVP_MAC_CTX *macctx,
 
     if (mdname != NULL)
         *mp++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
-                                                 (char *)mdname, 0);
+            (char *)mdname, 0);
     if (ciphername != NULL)
         *mp++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_CIPHER,
-                                                 (char *)ciphername, 0);
+            (char *)ciphername, 0);
     if (properties != NULL)
         *mp++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_PROPERTIES,
-                                                 (char *)properties, 0);
+            (char *)properties, 0);
 
 #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
     if (engine != NULL)
         *mp++ = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_ENGINE,
-                                                 (char *) engine, 0);
+            (char *)engine, 0);
 #endif
 
     if (key != NULL)
         *mp++ = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
-                                                  (unsigned char *)key,
-                                                  keylen);
+            (unsigned char *)key,
+            keylen);
 
     *mp = OSSL_PARAM_construct_end();
 
     return EVP_MAC_CTX_set_params(macctx, mac_params);
-
 }
 
 int ossl_prov_macctx_load_from_params(EVP_MAC_CTX **macctx,
-                                      const OSSL_PARAM params[],
-                                      const char *macname,
-                                      const char *ciphername,
-                                      const char *mdname,
-                                      OSSL_LIB_CTX *libctx)
+    const OSSL_PARAM params[],
+    const char *macname,
+    const char *ciphername,
+    const char *mdname,
+    OSSL_LIB_CTX *libctx)
 {
     const OSSL_PARAM *p;
     const char *properties = NULL;
@@ -310,7 +311,8 @@ int ossl_prov_macctx_load_from_params(EVP_MAC_CTX **macctx,
         macname = p->data;
     }
     if ((p = OSSL_PARAM_locate_const(params,
-                                     OSSL_ALG_PARAM_PROPERTIES)) != NULL) {
+             OSSL_ALG_PARAM_PROPERTIES))
+        != NULL) {
         if (p->data_type != OSSL_PARAM_UTF8_STRING)
             return 0;
         properties = p->data;
@@ -336,7 +338,7 @@ int ossl_prov_macctx_load_from_params(EVP_MAC_CTX **macctx,
         return 1;
 
     if (ossl_prov_set_macctx(*macctx, params, ciphername, mdname, NULL,
-                             properties, NULL, 0))
+            properties, NULL, 0))
         return 1;
 
     EVP_MAC_CTX_free(*macctx);
@@ -345,7 +347,7 @@ int ossl_prov_macctx_load_from_params(EVP_MAC_CTX **macctx,
 }
 
 void ossl_prov_cache_exported_algorithms(const OSSL_ALGORITHM_CAPABLE *in,
-                                         OSSL_ALGORITHM *out)
+    OSSL_ALGORITHM *out)
 {
     int i, j;
 
@@ -360,7 +362,7 @@ void ossl_prov_cache_exported_algorithms(const OSSL_ALGORITHM_CAPABLE *in,
 
 /* Duplicate a lump of memory safely */
 int ossl_prov_memdup(const void *src, size_t src_len,
-                     unsigned char **dest, size_t *dest_len)
+    unsigned char **dest, size_t *dest_len)
 {
     if (src != NULL) {
         if ((*dest = OPENSSL_memdup(src, src_len)) == NULL)
diff --git a/providers/common/securitycheck.c b/providers/common/securitycheck.c
index 8ef8dc2a811c4..e883ff4865561 100644
--- a/providers/common/securitycheck.c
+++ b/providers/common/securitycheck.c
@@ -42,16 +42,17 @@ int ossl_rsa_key_op_get_protect(const RSA *rsa, int operation, int *outprotect)
     case EVP_PKEY_OP_DECAPSULATE:
     case EVP_PKEY_OP_DECRYPT:
         if (RSA_test_flags(rsa,
-                           RSA_FLAG_TYPE_MASK) == RSA_FLAG_TYPE_RSASSAPSS) {
+                RSA_FLAG_TYPE_MASK)
+            == RSA_FLAG_TYPE_RSASSAPSS) {
             ERR_raise_data(ERR_LIB_PROV,
-                           PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE,
-                           "operation: %d", operation);
+                PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE,
+                "operation: %d", operation);
             return 0;
         }
         break;
     default:
         ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                       "invalid operation: %d", operation);
+            "invalid operation: %d", operation);
         return 0;
     }
     *outprotect = protect;
@@ -178,10 +179,10 @@ int ossl_dsa_check_key(const DSA *dsa, int sign)
             return 1;
     }
 
-     /* Valid sizes for both sign and verify */
-    if (L == 2048 && (N == 224 || N == 256))    /* 112 bits */
+    /* Valid sizes for both sign and verify */
+    if (L == 2048 && (N == 224 || N == 256)) /* 112 bits */
         return 1;
-    return (L == 3072 && N == 256);             /* 128 bits */
+    return (L == 3072 && N == 256); /* 128 bits */
 }
 #endif /* OPENSSL_NO_DSA */
 
diff --git a/providers/common/securitycheck_default.c b/providers/common/securitycheck_default.c
index dd71fd91ebe65..42823ffe14cb9 100644
--- a/providers/common/securitycheck_default.c
+++ b/providers/common/securitycheck_default.c
@@ -27,13 +27,13 @@ int ossl_digest_rsa_sign_get_md_nid(const EVP_MD *md)
     int mdnid;
 
     static const OSSL_ITEM name_to_nid[] = {
-        { NID_md5,       OSSL_DIGEST_NAME_MD5       },
-        { NID_md5_sha1,  OSSL_DIGEST_NAME_MD5_SHA1  },
-        { NID_md2,       OSSL_DIGEST_NAME_MD2       },
-        { NID_md4,       OSSL_DIGEST_NAME_MD4       },
-        { NID_mdc2,      OSSL_DIGEST_NAME_MDC2      },
+        { NID_md5, OSSL_DIGEST_NAME_MD5 },
+        { NID_md5_sha1, OSSL_DIGEST_NAME_MD5_SHA1 },
+        { NID_md2, OSSL_DIGEST_NAME_MD2 },
+        { NID_md4, OSSL_DIGEST_NAME_MD4 },
+        { NID_mdc2, OSSL_DIGEST_NAME_MDC2 },
         { NID_ripemd160, OSSL_DIGEST_NAME_RIPEMD160 },
-        { NID_sm3,       OSSL_DIGEST_NAME_SM3 },
+        { NID_sm3, OSSL_DIGEST_NAME_SM3 },
     };
 
     mdnid = ossl_digest_get_approved_nid(md);
diff --git a/providers/common/securitycheck_fips.c b/providers/common/securitycheck_fips.c
index c02fa960c0969..e676417022821 100644
--- a/providers/common/securitycheck_fips.c
+++ b/providers/common/securitycheck_fips.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-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
@@ -34,27 +34,27 @@ int ossl_digest_rsa_sign_get_md_nid(const EVP_MD *md)
 }
 
 int ossl_fips_ind_rsa_key_check(OSSL_FIPS_IND *ind, int id,
-                                OSSL_LIB_CTX *libctx,
-                                const RSA *rsa, const char *desc, int protect)
+    OSSL_LIB_CTX *libctx,
+    const RSA *rsa, const char *desc, int protect)
 {
     int key_approved = ossl_rsa_check_key_size(rsa, protect);
 
     if (!key_approved) {
         if (!ossl_FIPS_IND_on_unapproved(ind, id, libctx, desc, "Key size",
-                                         ossl_fips_config_securitycheck_enabled)) {
-                ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH,
-                               "operation: %s", desc);
+                ossl_fips_config_securitycheck_enabled)) {
+            ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH,
+                "operation: %s", desc);
             return 0;
         }
     }
     return 1;
 }
 
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
 int ossl_fips_ind_ec_key_check(OSSL_FIPS_IND *ind, int id,
-                               OSSL_LIB_CTX *libctx,
-                               const EC_GROUP *group, const char *desc,
-                               int protect)
+    OSSL_LIB_CTX *libctx,
+    const EC_GROUP *group, const char *desc,
+    int protect)
 {
     int curve_allowed, strength_allowed;
 
@@ -66,7 +66,7 @@ int ossl_fips_ind_ec_key_check(OSSL_FIPS_IND *ind, int id,
 
     if (!strength_allowed || !curve_allowed) {
         if (!ossl_FIPS_IND_on_unapproved(ind, id, libctx, desc, "EC Key",
-                                         ossl_fips_config_securitycheck_enabled)) {
+                ossl_fips_config_securitycheck_enabled)) {
             if (!curve_allowed)
                 ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_CURVE);
             if (!strength_allowed)
@@ -79,15 +79,15 @@ int ossl_fips_ind_ec_key_check(OSSL_FIPS_IND *ind, int id,
 #endif
 
 int ossl_fips_ind_digest_exch_check(OSSL_FIPS_IND *ind, int id,
-                                    OSSL_LIB_CTX *libctx,
-                                    const EVP_MD *md, const char *desc)
+    OSSL_LIB_CTX *libctx,
+    const EVP_MD *md, const char *desc)
 {
     int nid = ossl_digest_get_approved_nid(md);
     int approved = (nid != NID_undef && nid != NID_sha1);
 
     if (!approved) {
         if (!ossl_FIPS_IND_on_unapproved(ind, id, libctx, desc, "Digest",
-                                         ossl_fips_config_securitycheck_enabled)) {
+                ossl_fips_config_securitycheck_enabled)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_DIGEST);
             return 0;
         }
@@ -96,21 +96,36 @@ int ossl_fips_ind_digest_exch_check(OSSL_FIPS_IND *ind, int id,
 }
 
 int ossl_fips_ind_digest_sign_check(OSSL_FIPS_IND *ind, int id,
-                                    OSSL_LIB_CTX *libctx,
-                                    int nid, int sha1_allowed,
-                                    const char *desc,
-                                    OSSL_FIPS_IND_CHECK_CB *config_check_f)
+    OSSL_LIB_CTX *libctx,
+    int nid, int sha1_allowed,
+    int sha512_trunc_allowed,
+    const char *desc,
+    OSSL_FIPS_IND_CHECK_CB *config_check_f)
 {
     int approved;
+    const char *op = "none";
 
-    if (nid == NID_undef)
+    switch (nid) {
+    case NID_undef:
         approved = 0;
-    else
-        approved = sha1_allowed || nid != NID_sha1;
+        break;
+    case NID_sha512_224:
+    case NID_sha512_256:
+        approved = sha512_trunc_allowed;
+        op = "Digest Truncated SHA512";
+        break;
+    case NID_sha1:
+        approved = sha1_allowed;
+        op = "Digest SHA1";
+        break;
+    default:
+        approved = 1;
+        break;
+    }
 
     if (!approved) {
-        if (!ossl_FIPS_IND_on_unapproved(ind, id, libctx, desc, "Digest SHA1",
-                                         config_check_f)) {
+        if (!ossl_FIPS_IND_on_unapproved(ind, id, libctx, desc, op,
+                config_check_f)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_DIGEST);
             return 0;
         }
diff --git a/providers/defltprov.c b/providers/defltprov.c
index eee2178b4168b..90655395c1193 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -125,9 +125,9 @@ static const OSSL_ALGORITHM deflt_digests[] = {
      * the KMAC-128 and KMAC-256.
      */
     { PROV_NAMES_KECCAK_KMAC_128, "provider=default",
-      ossl_keccak_kmac_128_functions },
+        ossl_keccak_kmac_128_functions },
     { PROV_NAMES_KECCAK_KMAC_256, "provider=default",
-      ossl_keccak_kmac_256_functions },
+        ossl_keccak_kmac_256_functions },
 
     /* Our primary name:NIST name */
     { PROV_NAMES_SHAKE_128, "provider=default", ossl_shake_128_functions },
@@ -222,13 +222,13 @@ static const OSSL_ALGORITHM_CAPABLE deflt_ciphers[] = {
     ALG(PROV_NAMES_AES_192_WRAP_PAD_INV, ossl_aes192wrappadinv_functions),
     ALG(PROV_NAMES_AES_128_WRAP_PAD_INV, ossl_aes128wrappadinv_functions),
     ALGC(PROV_NAMES_AES_128_CBC_HMAC_SHA1, ossl_aes128cbc_hmac_sha1_functions,
-         ossl_cipher_capable_aes_cbc_hmac_sha1),
+        ossl_cipher_capable_aes_cbc_hmac_sha1),
     ALGC(PROV_NAMES_AES_256_CBC_HMAC_SHA1, ossl_aes256cbc_hmac_sha1_functions,
-         ossl_cipher_capable_aes_cbc_hmac_sha1),
+        ossl_cipher_capable_aes_cbc_hmac_sha1),
     ALGC(PROV_NAMES_AES_128_CBC_HMAC_SHA256, ossl_aes128cbc_hmac_sha256_functions,
         ossl_cipher_capable_aes_cbc_hmac_sha256),
     ALGC(PROV_NAMES_AES_256_CBC_HMAC_SHA256, ossl_aes256cbc_hmac_sha256_functions,
-         ossl_cipher_capable_aes_cbc_hmac_sha256),
+        ossl_cipher_capable_aes_cbc_hmac_sha256),
 #ifndef OPENSSL_NO_ARIA
     ALG(PROV_NAMES_ARIA_256_GCM, ossl_aria256gcm_functions),
     ALG(PROV_NAMES_ARIA_192_GCM, ossl_aria192gcm_functions),
@@ -309,9 +309,9 @@ static const OSSL_ALGORITHM_CAPABLE deflt_ciphers[] = {
 #endif /* OPENSSL_NO_SM4 */
 #ifndef OPENSSL_NO_CHACHA
     ALG(PROV_NAMES_ChaCha20, ossl_chacha20_functions),
-# ifndef OPENSSL_NO_POLY1305
+#ifndef OPENSSL_NO_POLY1305
     ALG(PROV_NAMES_ChaCha20_Poly1305, ossl_chacha20_ossl_poly1305_functions),
-# endif /* OPENSSL_NO_POLY1305 */
+#endif /* OPENSSL_NO_POLY1305 */
 #endif /* OPENSSL_NO_CHACHA */
     { { NULL, NULL, NULL }, NULL }
 };
@@ -341,7 +341,7 @@ static const OSSL_ALGORITHM deflt_macs[] = {
 static const OSSL_ALGORITHM deflt_kdfs[] = {
     { PROV_NAMES_HKDF, "provider=default", ossl_kdf_hkdf_functions },
     { PROV_NAMES_TLS1_3_KDF, "provider=default",
-      ossl_kdf_tls1_3_kdf_functions },
+        ossl_kdf_tls1_3_kdf_functions },
     { PROV_NAMES_SSKDF, "provider=default", ossl_kdf_sskdf_functions },
     { PROV_NAMES_PBKDF2, "provider=default", ossl_kdf_pbkdf2_functions },
     { PROV_NAMES_PKCS12KDF, "provider=default", ossl_kdf_pkcs12_functions },
@@ -355,7 +355,7 @@ static const OSSL_ALGORITHM deflt_kdfs[] = {
 #endif
     { PROV_NAMES_KRB5KDF, "provider=default", ossl_kdf_krb5kdf_functions },
     { PROV_NAMES_HMAC_DRBG_KDF, "provider=default",
-      ossl_kdf_hmac_drbg_functions },
+        ossl_kdf_hmac_drbg_functions },
 #ifndef OPENSSL_NO_ARGON2
     { PROV_NAMES_ARGON2I, "provider=default", ossl_kdf_argon2i_functions },
     { PROV_NAMES_ARGON2D, "provider=default", ossl_kdf_argon2d_functions },
@@ -370,15 +370,15 @@ static const OSSL_ALGORITHM deflt_keyexch[] = {
 #endif
 #ifndef OPENSSL_NO_EC
     { PROV_NAMES_ECDH, "provider=default", ossl_ecdh_keyexch_functions },
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
     { PROV_NAMES_X25519, "provider=default", ossl_x25519_keyexch_functions },
     { PROV_NAMES_X448, "provider=default", ossl_x448_keyexch_functions },
-# endif
+#endif
 #endif
     { PROV_NAMES_TLS1_PRF, "provider=default", ossl_kdf_tls1_prf_keyexch_functions },
     { PROV_NAMES_HKDF, "provider=default", ossl_kdf_hkdf_keyexch_functions },
     { PROV_NAMES_SCRYPT, "provider=default",
-      ossl_kdf_scrypt_keyexch_functions },
+        ossl_kdf_scrypt_keyexch_functions },
     { NULL, NULL, NULL }
 };
 
@@ -426,13 +426,13 @@ static const OSSL_ALGORITHM deflt_signature[] = {
     { PROV_NAMES_RSA_SM3, "provider=default", ossl_rsa_sm3_signature_functions },
 #endif
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
     { PROV_NAMES_ED25519, "provider=default", ossl_ed25519_signature_functions },
     { PROV_NAMES_ED25519ph, "provider=default", ossl_ed25519ph_signature_functions },
     { PROV_NAMES_ED25519ctx, "provider=default", ossl_ed25519ctx_signature_functions },
     { PROV_NAMES_ED448, "provider=default", ossl_ed448_signature_functions },
     { PROV_NAMES_ED448ph, "provider=default", ossl_ed448ph_signature_functions },
-# endif
+#endif
     { PROV_NAMES_ECDSA, "provider=default", ossl_ecdsa_signature_functions },
     { PROV_NAMES_ECDSA_SHA1, "provider=default", ossl_ecdsa_sha1_signature_functions },
     { PROV_NAMES_ECDSA_SHA224, "provider=default", ossl_ecdsa_sha224_signature_functions },
@@ -443,9 +443,9 @@ static const OSSL_ALGORITHM deflt_signature[] = {
     { PROV_NAMES_ECDSA_SHA3_256, "provider=default", ossl_ecdsa_sha3_256_signature_functions },
     { PROV_NAMES_ECDSA_SHA3_384, "provider=default", ossl_ecdsa_sha3_384_signature_functions },
     { PROV_NAMES_ECDSA_SHA3_512, "provider=default", ossl_ecdsa_sha3_512_signature_functions },
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
     { PROV_NAMES_SM2, "provider=default", ossl_sm2_signature_functions },
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_ML_DSA
     { PROV_NAMES_ML_DSA_44, "provider=default", ossl_ml_dsa_44_signature_functions },
@@ -454,39 +454,39 @@ static const OSSL_ALGORITHM deflt_signature[] = {
 #endif
     { PROV_NAMES_HMAC, "provider=default", ossl_mac_legacy_hmac_signature_functions },
     { PROV_NAMES_SIPHASH, "provider=default",
-      ossl_mac_legacy_siphash_signature_functions },
+        ossl_mac_legacy_siphash_signature_functions },
 #ifndef OPENSSL_NO_POLY1305
     { PROV_NAMES_POLY1305, "provider=default",
-      ossl_mac_legacy_poly1305_signature_functions },
+        ossl_mac_legacy_poly1305_signature_functions },
 #endif
 #ifndef OPENSSL_NO_CMAC
     { PROV_NAMES_CMAC, "provider=default", ossl_mac_legacy_cmac_signature_functions },
 #endif
 #ifndef OPENSSL_NO_SLH_DSA
     { PROV_NAMES_SLH_DSA_SHA2_128S, "provider=default",
-      ossl_slh_dsa_sha2_128s_signature_functions, PROV_DESCS_SLH_DSA_SHA2_128S },
+        ossl_slh_dsa_sha2_128s_signature_functions, PROV_DESCS_SLH_DSA_SHA2_128S },
     { PROV_NAMES_SLH_DSA_SHA2_128F, "provider=default",
-      ossl_slh_dsa_sha2_128f_signature_functions, PROV_DESCS_SLH_DSA_SHA2_128F },
+        ossl_slh_dsa_sha2_128f_signature_functions, PROV_DESCS_SLH_DSA_SHA2_128F },
     { PROV_NAMES_SLH_DSA_SHA2_192S, "provider=default",
-      ossl_slh_dsa_sha2_192s_signature_functions, PROV_DESCS_SLH_DSA_SHA2_192S },
+        ossl_slh_dsa_sha2_192s_signature_functions, PROV_DESCS_SLH_DSA_SHA2_192S },
     { PROV_NAMES_SLH_DSA_SHA2_192F, "provider=default",
-      ossl_slh_dsa_sha2_192f_signature_functions, PROV_DESCS_SLH_DSA_SHA2_192F },
+        ossl_slh_dsa_sha2_192f_signature_functions, PROV_DESCS_SLH_DSA_SHA2_192F },
     { PROV_NAMES_SLH_DSA_SHA2_256S, "provider=default",
-      ossl_slh_dsa_sha2_256s_signature_functions, PROV_DESCS_SLH_DSA_SHA2_256S },
+        ossl_slh_dsa_sha2_256s_signature_functions, PROV_DESCS_SLH_DSA_SHA2_256S },
     { PROV_NAMES_SLH_DSA_SHA2_256F, "provider=default",
-      ossl_slh_dsa_sha2_256f_signature_functions, PROV_DESCS_SLH_DSA_SHA2_256F },
+        ossl_slh_dsa_sha2_256f_signature_functions, PROV_DESCS_SLH_DSA_SHA2_256F },
     { PROV_NAMES_SLH_DSA_SHAKE_128S, "provider=default",
-      ossl_slh_dsa_shake_128s_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_128S },
+        ossl_slh_dsa_shake_128s_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_128S },
     { PROV_NAMES_SLH_DSA_SHAKE_128F, "provider=default",
-      ossl_slh_dsa_shake_128f_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_128F },
+        ossl_slh_dsa_shake_128f_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_128F },
     { PROV_NAMES_SLH_DSA_SHAKE_192S, "provider=default",
-      ossl_slh_dsa_shake_192s_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_192S },
+        ossl_slh_dsa_shake_192s_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_192S },
     { PROV_NAMES_SLH_DSA_SHAKE_192F, "provider=default",
-      ossl_slh_dsa_shake_192f_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_192F },
+        ossl_slh_dsa_shake_192f_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_192F },
     { PROV_NAMES_SLH_DSA_SHAKE_256S, "provider=default",
-      ossl_slh_dsa_shake_256s_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_256S },
+        ossl_slh_dsa_shake_256s_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_256S },
     { PROV_NAMES_SLH_DSA_SHAKE_256F, "provider=default",
-      ossl_slh_dsa_shake_256f_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_256F },
+        ossl_slh_dsa_shake_256f_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_256F },
 #endif /* OPENSSL_NO_SLH_DSA */
     { NULL, NULL, NULL }
 };
@@ -502,24 +502,24 @@ static const OSSL_ALGORITHM deflt_asym_cipher[] = {
 static const OSSL_ALGORITHM deflt_asym_kem[] = {
     { PROV_NAMES_RSA, "provider=default", ossl_rsa_asym_kem_functions },
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
     { PROV_NAMES_X25519, "provider=default", ossl_ecx_asym_kem_functions },
     { PROV_NAMES_X448, "provider=default", ossl_ecx_asym_kem_functions },
-# endif
+#endif
     { PROV_NAMES_EC, "provider=default", ossl_ec_asym_kem_functions },
 #endif
 #ifndef OPENSSL_NO_ML_KEM
     { PROV_NAMES_ML_KEM_512, "provider=default", ossl_ml_kem_asym_kem_functions },
     { PROV_NAMES_ML_KEM_768, "provider=default", ossl_ml_kem_asym_kem_functions },
     { PROV_NAMES_ML_KEM_1024, "provider=default", ossl_ml_kem_asym_kem_functions },
-# if !defined(OPENSSL_NO_ECX)
+#if !defined(OPENSSL_NO_ECX)
     { "X25519MLKEM768", "provider=default", ossl_mlx_kem_asym_kem_functions },
     { "X448MLKEM1024", "provider=default", ossl_mlx_kem_asym_kem_functions },
-# endif
-# if !defined(OPENSSL_NO_EC)
+#endif
+#if !defined(OPENSSL_NO_EC)
     { "SecP256r1MLKEM768", "provider=default", ossl_mlx_kem_asym_kem_functions },
     { "SecP384r1MLKEM1024", "provider=default", ossl_mlx_kem_asym_kem_functions },
-# endif
+#endif
 #endif
     { NULL, NULL, NULL }
 };
@@ -527,116 +527,116 @@ static const OSSL_ALGORITHM deflt_asym_kem[] = {
 static const OSSL_ALGORITHM deflt_keymgmt[] = {
 #ifndef OPENSSL_NO_DH
     { PROV_NAMES_DH, "provider=default", ossl_dh_keymgmt_functions,
-      PROV_DESCS_DH },
+        PROV_DESCS_DH },
     { PROV_NAMES_DHX, "provider=default", ossl_dhx_keymgmt_functions,
-      PROV_DESCS_DHX },
+        PROV_DESCS_DHX },
 #endif
 #ifndef OPENSSL_NO_DSA
     { PROV_NAMES_DSA, "provider=default", ossl_dsa_keymgmt_functions,
-      PROV_DESCS_DSA},
+        PROV_DESCS_DSA },
 #endif
     { PROV_NAMES_RSA, "provider=default", ossl_rsa_keymgmt_functions,
-      PROV_DESCS_RSA },
+        PROV_DESCS_RSA },
     { PROV_NAMES_RSA_PSS, "provider=default", ossl_rsapss_keymgmt_functions,
-      PROV_DESCS_RSA_PSS },
+        PROV_DESCS_RSA_PSS },
 #ifndef OPENSSL_NO_EC
     { PROV_NAMES_EC, "provider=default", ossl_ec_keymgmt_functions,
-      PROV_DESCS_EC },
-# ifndef OPENSSL_NO_ECX
+        PROV_DESCS_EC },
+#ifndef OPENSSL_NO_ECX
     { PROV_NAMES_X25519, "provider=default", ossl_x25519_keymgmt_functions,
-      PROV_DESCS_X25519 },
+        PROV_DESCS_X25519 },
     { PROV_NAMES_X448, "provider=default", ossl_x448_keymgmt_functions,
-      PROV_DESCS_X448 },
+        PROV_DESCS_X448 },
     { PROV_NAMES_ED25519, "provider=default", ossl_ed25519_keymgmt_functions,
-      PROV_DESCS_ED25519 },
+        PROV_DESCS_ED25519 },
     { PROV_NAMES_ED448, "provider=default", ossl_ed448_keymgmt_functions,
-      PROV_DESCS_ED448 },
-# endif
+        PROV_DESCS_ED448 },
+#endif
 #endif
 #ifndef OPENSSL_NO_ML_DSA
     { PROV_NAMES_ML_DSA_44, "provider=default", ossl_ml_dsa_44_keymgmt_functions,
-      PROV_DESCS_ML_DSA_44 },
+        PROV_DESCS_ML_DSA_44 },
     { PROV_NAMES_ML_DSA_65, "provider=default", ossl_ml_dsa_65_keymgmt_functions,
-      PROV_DESCS_ML_DSA_65 },
+        PROV_DESCS_ML_DSA_65 },
     { PROV_NAMES_ML_DSA_87, "provider=default", ossl_ml_dsa_87_keymgmt_functions,
-      PROV_DESCS_ML_DSA_87 },
+        PROV_DESCS_ML_DSA_87 },
 #endif /* OPENSSL_NO_ML_DSA */
     { PROV_NAMES_TLS1_PRF, "provider=default", ossl_kdf_keymgmt_functions,
-      PROV_DESCS_TLS1_PRF_SIGN },
+        PROV_DESCS_TLS1_PRF_SIGN },
     { PROV_NAMES_HKDF, "provider=default", ossl_kdf_keymgmt_functions,
-      PROV_DESCS_HKDF_SIGN },
+        PROV_DESCS_HKDF_SIGN },
     { PROV_NAMES_SCRYPT, "provider=default", ossl_kdf_keymgmt_functions,
-      PROV_DESCS_SCRYPT_SIGN },
+        PROV_DESCS_SCRYPT_SIGN },
     { PROV_NAMES_HMAC, "provider=default", ossl_mac_legacy_keymgmt_functions,
-      PROV_DESCS_HMAC_SIGN },
+        PROV_DESCS_HMAC_SIGN },
     { PROV_NAMES_SIPHASH, "provider=default", ossl_mac_legacy_keymgmt_functions,
-      PROV_DESCS_SIPHASH_SIGN },
+        PROV_DESCS_SIPHASH_SIGN },
 #ifndef OPENSSL_NO_POLY1305
     { PROV_NAMES_POLY1305, "provider=default", ossl_mac_legacy_keymgmt_functions,
-      PROV_DESCS_POLY1305_SIGN },
+        PROV_DESCS_POLY1305_SIGN },
 #endif
 #ifndef OPENSSL_NO_CMAC
     { PROV_NAMES_CMAC, "provider=default", ossl_cmac_legacy_keymgmt_functions,
-      PROV_DESCS_CMAC_SIGN },
+        PROV_DESCS_CMAC_SIGN },
 #endif
 #ifndef OPENSSL_NO_SM2
     { PROV_NAMES_SM2, "provider=default", ossl_sm2_keymgmt_functions,
-      PROV_DESCS_SM2 },
+        PROV_DESCS_SM2 },
 #endif
 #ifndef OPENSSL_NO_ML_KEM
     { PROV_NAMES_ML_KEM_512, "provider=default", ossl_ml_kem_512_keymgmt_functions,
-      PROV_DESCS_ML_KEM_512 },
+        PROV_DESCS_ML_KEM_512 },
     { PROV_NAMES_ML_KEM_768, "provider=default", ossl_ml_kem_768_keymgmt_functions,
-      PROV_DESCS_ML_KEM_768 },
+        PROV_DESCS_ML_KEM_768 },
     { PROV_NAMES_ML_KEM_1024, "provider=default", ossl_ml_kem_1024_keymgmt_functions,
-      PROV_DESCS_ML_KEM_1024 },
-# if !defined(OPENSSL_NO_ECX)
+        PROV_DESCS_ML_KEM_1024 },
+#if !defined(OPENSSL_NO_ECX)
     { PROV_NAMES_X25519MLKEM768, "provider=default", ossl_mlx_x25519_kem_kmgmt_functions,
-      PROV_DESCS_X25519MLKEM768 },
+        PROV_DESCS_X25519MLKEM768 },
     { PROV_NAMES_X448MLKEM1024, "provider=default", ossl_mlx_x448_kem_kmgmt_functions,
-      PROV_DESCS_X448MLKEM1024 },
-# endif
-# if !defined(OPENSSL_NO_EC)
+        PROV_DESCS_X448MLKEM1024 },
+#endif
+#if !defined(OPENSSL_NO_EC)
     { PROV_NAMES_SecP256r1MLKEM768, "provider=default", ossl_mlx_p256_kem_kmgmt_functions,
-      PROV_DESCS_SecP256r1MLKEM768 },
+        PROV_DESCS_SecP256r1MLKEM768 },
     { PROV_NAMES_SecP384r1MLKEM1024, "provider=default", ossl_mlx_p384_kem_kmgmt_functions,
-      PROV_DESCS_SecP384r1MLKEM1024 },
-# endif
+        PROV_DESCS_SecP384r1MLKEM1024 },
+#endif
 #endif
 #ifndef OPENSSL_NO_SLH_DSA
     { PROV_NAMES_SLH_DSA_SHA2_128S, "provider=default", ossl_slh_dsa_sha2_128s_keymgmt_functions,
-      PROV_DESCS_SLH_DSA_SHA2_128S },
+        PROV_DESCS_SLH_DSA_SHA2_128S },
     { PROV_NAMES_SLH_DSA_SHA2_128F, "provider=default", ossl_slh_dsa_sha2_128f_keymgmt_functions,
-      PROV_DESCS_SLH_DSA_SHA2_128F },
+        PROV_DESCS_SLH_DSA_SHA2_128F },
     { PROV_NAMES_SLH_DSA_SHA2_192S, "provider=default", ossl_slh_dsa_sha2_192s_keymgmt_functions,
-      PROV_DESCS_SLH_DSA_SHA2_192S },
+        PROV_DESCS_SLH_DSA_SHA2_192S },
     { PROV_NAMES_SLH_DSA_SHA2_192F, "provider=default", ossl_slh_dsa_sha2_192f_keymgmt_functions,
-      PROV_DESCS_SLH_DSA_SHA2_192F },
+        PROV_DESCS_SLH_DSA_SHA2_192F },
     { PROV_NAMES_SLH_DSA_SHA2_256S, "provider=default", ossl_slh_dsa_sha2_256s_keymgmt_functions,
-      PROV_DESCS_SLH_DSA_SHA2_256S },
+        PROV_DESCS_SLH_DSA_SHA2_256S },
     { PROV_NAMES_SLH_DSA_SHA2_256F, "provider=default", ossl_slh_dsa_sha2_256f_keymgmt_functions,
-      PROV_DESCS_SLH_DSA_SHA2_256F },
+        PROV_DESCS_SLH_DSA_SHA2_256F },
     { PROV_NAMES_SLH_DSA_SHAKE_128S, "provider=default", ossl_slh_dsa_shake_128s_keymgmt_functions,
-      PROV_DESCS_SLH_DSA_SHAKE_128S },
+        PROV_DESCS_SLH_DSA_SHAKE_128S },
     { PROV_NAMES_SLH_DSA_SHAKE_128F, "provider=default", ossl_slh_dsa_shake_128f_keymgmt_functions,
-      PROV_DESCS_SLH_DSA_SHAKE_128F },
+        PROV_DESCS_SLH_DSA_SHAKE_128F },
     { PROV_NAMES_SLH_DSA_SHAKE_192S, "provider=default", ossl_slh_dsa_shake_192s_keymgmt_functions,
-      PROV_DESCS_SLH_DSA_SHAKE_192S },
+        PROV_DESCS_SLH_DSA_SHAKE_192S },
     { PROV_NAMES_SLH_DSA_SHAKE_192F, "provider=default", ossl_slh_dsa_shake_192f_keymgmt_functions,
-      PROV_DESCS_SLH_DSA_SHAKE_192F },
+        PROV_DESCS_SLH_DSA_SHAKE_192F },
     { PROV_NAMES_SLH_DSA_SHAKE_256S, "provider=default", ossl_slh_dsa_shake_256s_keymgmt_functions,
-      PROV_DESCS_SLH_DSA_SHAKE_256S },
+        PROV_DESCS_SLH_DSA_SHAKE_256S },
     { PROV_NAMES_SLH_DSA_SHAKE_256F, "provider=default", ossl_slh_dsa_shake_256f_keymgmt_functions,
-      PROV_DESCS_SLH_DSA_SHAKE_256F },
+        PROV_DESCS_SLH_DSA_SHAKE_256F },
 #endif /* OPENSSL_NO_SLH_DSA */
     { NULL, NULL, NULL }
 };
 
 static const OSSL_ALGORITHM deflt_skeymgmt[] = {
     { PROV_NAMES_AES, "provider=default", ossl_aes_skeymgmt_functions,
-      PROV_DESCS_AES },
+        PROV_DESCS_AES },
     { PROV_NAMES_GENERIC, "provider=default", ossl_generic_skeymgmt_functions,
-      PROV_DESCS_GENERIC },
+        PROV_DESCS_GENERIC },
     { NULL, NULL, NULL }
 };
 
@@ -655,7 +655,7 @@ static const OSSL_ALGORITHM deflt_decoder[] = {
 };
 
 static const OSSL_ALGORITHM deflt_store[] = {
-#define STORE(name, _fips, func_table)                           \
+#define STORE(name, _fips, func_table) \
     { name, "provider=default,fips=" _fips, (func_table) },
 
 #include "stores.inc"
@@ -664,7 +664,7 @@ static const OSSL_ALGORITHM deflt_store[] = {
 };
 
 static const OSSL_ALGORITHM *deflt_query(void *provctx, int operation_id,
-                                         int *no_cache)
+    int *no_cache)
 {
     *no_cache = 0;
     switch (operation_id) {
@@ -700,7 +700,6 @@ static const OSSL_ALGORITHM *deflt_query(void *provctx, int operation_id,
     return NULL;
 }
 
-
 static void deflt_teardown(void *provctx)
 {
     BIO_meth_free(ossl_prov_ctx_get0_core_bio_method(provctx));
@@ -714,22 +713,22 @@ static const OSSL_DISPATCH deflt_dispatch_table[] = {
     { OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))deflt_get_params },
     { OSSL_FUNC_PROVIDER_QUERY_OPERATION, (void (*)(void))deflt_query },
     { OSSL_FUNC_PROVIDER_GET_CAPABILITIES,
-      (void (*)(void))ossl_prov_get_capabilities },
+        (void (*)(void))ossl_prov_get_capabilities },
     OSSL_DISPATCH_END
 };
 
 OSSL_provider_init_fn ossl_default_provider_init;
 
 int ossl_default_provider_init(const OSSL_CORE_HANDLE *handle,
-                               const OSSL_DISPATCH *in,
-                               const OSSL_DISPATCH **out,
-                               void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     OSSL_FUNC_core_get_libctx_fn *c_get_libctx = NULL;
     BIO_METHOD *corebiometh;
 
     if (!ossl_prov_bio_from_dispatch(in)
-            || !ossl_prov_seeding_from_dispatch(in))
+        || !ossl_prov_seeding_from_dispatch(in))
         return 0;
     for (; in->function_id != 0; in++) {
         switch (in->function_id) {
@@ -760,13 +759,13 @@ int ossl_default_provider_init(const OSSL_CORE_HANDLE *handle,
      * create their own library context.
      */
     if ((*provctx = ossl_prov_ctx_new()) == NULL
-            || (corebiometh = ossl_bio_prov_init_bio_method()) == NULL) {
+        || (corebiometh = ossl_bio_prov_init_bio_method()) == NULL) {
         ossl_prov_ctx_free(*provctx);
         *provctx = NULL;
         return 0;
     }
     ossl_prov_ctx_set0_libctx(*provctx,
-                                       (OSSL_LIB_CTX *)c_get_libctx(handle));
+        (OSSL_LIB_CTX *)c_get_libctx(handle));
     ossl_prov_ctx_set0_handle(*provctx, handle);
     ossl_prov_ctx_set0_core_bio_method(*provctx, corebiometh);
     ossl_prov_ctx_set0_core_get_params(*provctx, c_get_params);
diff --git a/providers/fips-sources.checksums b/providers/fips-sources.checksums
index ec5de5d85f2b3..7ce2f739bf5f3 100644
--- a/providers/fips-sources.checksums
+++ b/providers/fips-sources.checksums
@@ -1,8 +1,8 @@
-0e22ea0cf34ef3871e30df0bc302dc29352d38001d1622ddb78a27a374b6aee8  crypto/aes/aes_cbc.c
-c049a936d74100fcced225f575d46662792a6a0039777d2d4df0cf61eff90a68  crypto/aes/aes_core.c
+1adbe13eff4750e389446101753e40402977dacf1493eb7ba053654bb37bd0e8  crypto/aes/aes_cbc.c
+a328908d0d04366e7160884001170c494751a2555e935b7ba3feab88a0b977f8  crypto/aes/aes_core.c
 3fac41ce96acb9189eac2d5571425c3ff33a34c884ae7e275e1fd3068b5fc662  crypto/aes/aes_ecb.c
-c1e674d08683a25bc053f6233f73a0d0b3a90aafe591ff57b702c7da1582e4a5  crypto/aes/aes_local.h
-a2466f18da5847c7d9fbced17524633c10ce024671a72f53f9c9c55b9b9923dd  crypto/aes/aes_misc.c
+da4942231014063d9e4fe1db91b6eb1b8f233904d169f3f1b8be7c6a59728d2e  crypto/aes/aes_local.h
+7414fa4526ba20ee966125e8f7e428e4c75cd9021a79f1151a4bacb28d2f10da  crypto/aes/aes_misc.c
 6979c133f76f4623e62e6e970deae70fa025e713a72b71aead5a048d49e47f6f  crypto/aes/asm/aes-586.pl
 92be9ff608331a432e95247a8f4fb9e46897d0cb76f2b6db809b61d44287964a  crypto/aes/asm/aes-armv4.pl
 953897f86e2de9fa27ef411155ab3aed133af94885f1507e76449c142da78656  crypto/aes/asm/aes-c64xplus.pl
@@ -16,7 +16,7 @@ e1f3805332eb811d9d0c9377b67fe0681063364f1af84d8598f7daa30da65b4d  crypto/aes/asm
 ecd9bdfaf25cdd3d8ec0c50cb4306d98374da1c6056e27e0cf31a057dc5ee150  crypto/aes/asm/aes-riscv64-zvkb-zvkned.pl
 d372152dac004b96a89f8531256bd05597ca0b614b444bb02aee93238dcf83ab  crypto/aes/asm/aes-riscv64-zvkned.pl
 f0388e17ba4268ed0b562da60e0780072180a824a379b79fafb60e25b8da3b52  crypto/aes/asm/aes-riscv64.pl
-ecbfe826f4c514810c3ee20e265f4f621149694c298554b2682e5de4f029f14f  crypto/aes/asm/aes-s390x.pl
+290ae2a09826d24e83763415a021e328d41a163f41cff8c9e3b882e973677f33  crypto/aes/asm/aes-s390x.pl
 ee4e8cacef972942d2a89c1a83c984df9cad87c61a54383403c5c4864c403ba1  crypto/aes/asm/aes-sparcv9.pl
 391497550eaca253f64b2aba7ba2e53c6bae7dff01583bc6bfc12e930bb7e217  crypto/aes/asm/aes-x86_64.pl
 c56c324667b67d726e040d70379efba5b270e2937f403c1b5979018b836903c7  crypto/aes/asm/aesfx-sparcv9.pl
@@ -25,10 +25,10 @@ f525e1bca51d39adcd411cbf8f874fe1441b23a6f614644da78dfd8544d13b23  crypto/aes/asm
 895f94d7befb90e82f9d300ed8f870e790101f30ba72b249a2c503f07aec7dd2  crypto/aes/asm/aesni-sha256-x86_64.pl
 4ff74d4e629a88ef5a9e3d3f5b340fc0a4793d16d7cc7f1b70da62512a856248  crypto/aes/asm/aesni-x86.pl
 25881237d026cebd96877a2ea2729db1ce512875cb2a10ca0cd1d6ddf4b51a3b  crypto/aes/asm/aesni-x86_64.pl
-6286718895d4520bb7d3d96d34b5f8454bd0784ed664083470f5079574adf0c6  crypto/aes/asm/aesni-xts-avx512.pl
+6047359ad3967168812fbc8a95cb851b72c09f7846be2f03ec2ab93531a9c2bd  crypto/aes/asm/aesni-xts-avx512.pl
 0489a10fbb1a8ca3652848d5c1e14e519501e189bad3e5827a573c26df359691  crypto/aes/asm/aesp8-ppc.pl
 e397a5781893e97dd90a5a52049633be12a43f379ec5751bca2a6350c39444c8  crypto/aes/asm/aest4-sparcv9.pl
-901a977a566f51788186ed566438db09d2331894f9de9ace1aa7e267dae3fe74  crypto/aes/asm/aesv8-armx.pl
+578142d03bc47353952fca2027eb63ec97ce9a1379c0f3c7ac0fdf110eb3378b  crypto/aes/asm/aesv8-armx.pl
 5e8005fdb6641df465bdda20c3476f7176e6bcd63d5073044a0c02a327c7f172  crypto/aes/asm/bsaes-armv7.pl
 12cd3c8a9ce7153c577ff6238d81ec1947dfc43ee80cb15ee886cdf811969417  crypto/aes/asm/bsaes-armv8.pl
 c72f6cbf3b9900d956e05003ec8df758b29b43519c7801d677c3f992bc589d4e  crypto/aes/asm/bsaes-x86_64.pl
@@ -39,9 +39,9 @@ c3541865cd02d81101cdbab4877ed82772e6980d2c677b9008b38fa1b26d36d4  crypto/aes/asm
 c6935d2ab7925022cb3d76446536ff01b1a1b8eb7eac619d034a29aad17ed45f  crypto/aes/asm/vpaes-x86_64.pl
 2bc67270155e2d6c7da87d9070e005ee79cea18311004907edfd6a078003532a  crypto/alphacpuid.pl
 269e52f8867c13ca75d2f88ec1f89b692cb8c6c3ee89abe2fd3c1821925191d8  crypto/arm64cpuid.pl
-b8159910cabf7c32267e27b8e98f184fdb9b717b363639a055d8e74c5f10038e  crypto/armcap.c
+7a7c1d063be476f35442b0b056cfad0cf62190b603304abd283906ab40590167  crypto/armcap.c
 d9f923daabe7537d1063b182f9f220655abd182ef4c55a0194a7ee8d6030b5bd  crypto/armv4cpuid.pl
-16739d54200fb81ca7835b5814f965022a2ab41589c7787e2697e3ea72d4fafa  crypto/asn1_dsa.c
+e886d814c34492504cc9a2451c67fd8c0b4e83e8618f931632400cfe522b6e4d  crypto/asn1_dsa.c
 819c9fd2b0cae9aab81c3cbd1815c2e22949d75f132f649b5883812d0bbaa39a  crypto/bn/asm/alpha-mont.pl
 565edec9b6fa0702c07ab2f7507b0a45fb2ab649ed509fd79013ea7378bb5891  crypto/bn/asm/armv4-gf2m.pl
 5469ab174b62361c6ced8f5c1007c462700761c1aae72f0d2928ca39e57d47a1  crypto/bn/asm/armv4-mont.pl
@@ -58,14 +58,14 @@ b27ec5181e387e812925bb26823b830f49d7a6e4971b6d11ea583f5632a1504b  crypto/bn/asm/
 59cd27e1e10c4984b7fb684b27f491e7634473b1bcff197a07e0ca653124aa9a  crypto/bn/asm/ppc.pl
 0b3350f56d423a4df918a08e90c7c66227c4449a9f9c44096eacc254ebc65f9f  crypto/bn/asm/ppc64-mont-fixed.pl
 a25be64867ab837d93855af232e2bfa71b85b2c6f00e35e620fdc5618187fb6f  crypto/bn/asm/ppc64-mont.pl
-a6982e91f35fbcefe897106b3f5c8957359fb58b74beac12bdcb8d3b7daa15f5  crypto/bn/asm/rsaz-2k-avx512.pl
-9ff806a5dc4320c73cdf717161185b3515bb56e893f098e617ebb16b25ed9006  crypto/bn/asm/rsaz-2k-avxifma.pl
-df7268cd5461269db0d8d1ef62c2d9ff6608eb0c071e798b06ad9ddfcbef1a31  crypto/bn/asm/rsaz-3k-avx512.pl
-a36293b89332a4fb8ef4f3013c26bc5bb42290ec255a699b15b4e72285f49886  crypto/bn/asm/rsaz-3k-avxifma.pl
-9ae9cf7a926eea6543237eb4c537860a36e6373e9091e2c581868871ba84fd74  crypto/bn/asm/rsaz-4k-avx512.pl
-2cd3ac19df2f322e518aba881dc98423c3aafcef8cec6c8611f870fdf6d54d7d  crypto/bn/asm/rsaz-4k-avxifma.pl
+b3aad31ab658eceaa9c5e734e19f39c33991f4839ab55b0cec8018020b1a305e  crypto/bn/asm/rsaz-2k-avx512.pl
+760cc579b8b464991177a337487bb32e22317cb47f69927232da76171c973954  crypto/bn/asm/rsaz-2k-avxifma.pl
+e914311420ae4486ab6000cc6ab424f04d8a042bda40ab8f288348dc9f0eb595  crypto/bn/asm/rsaz-3k-avx512.pl
+b8424d830f41a038f3c98d8664c6cf7d2d3e1748cdce260db41fa3c74f1d88d9  crypto/bn/asm/rsaz-3k-avxifma.pl
+e13bd2df8c591052ddf16a839072f43353841f9f35e0ac95f836511838dbc771  crypto/bn/asm/rsaz-4k-avx512.pl
+afcf51a732c80eadae1650e22e4af34904112a8b95467087a16d9d2394934730  crypto/bn/asm/rsaz-4k-avxifma.pl
 6e47bf041e51d8086c4933c2a5da3ce6d1b136592984754461d59aa81e4995a6  crypto/bn/asm/rsaz-avx2.pl
-149842bf63d1ef1895a251a83d9941fc3ed744dab359b42d635d04cc8d2f2864  crypto/bn/asm/rsaz-x86_64.pl
+b42f6cf0fbf9eae58343df9629e7a9e5b8814195ea0c9882d7b143a0841cc018  crypto/bn/asm/rsaz-x86_64.pl
 30fedf48dfc5fec1c2044b6c226dd9fc42a92522cc589797a23a79d452bdd2cf  crypto/bn/asm/s390x-gf2m.pl
 590388d69d7ac3a0e9af4014792f4f0fdb9552719e8fb48ebc7e5dfca2a491d4  crypto/bn/asm/s390x-mont.pl
 aa02597f3dc09cfbc190aedb75711859ba0f3efff87067ebfba1ec78ebee40d7  crypto/bn/asm/s390x.S
@@ -79,80 +79,80 @@ d404375a21d33396824a3da212d6646d4f3150dd141ee4b4a250aefae3482efb  crypto/bn/asm/
 d24f3e97239c8eed5efc721521b025b7256c15e67a54ea6b5c4cf8f7cd0f89ea  crypto/bn/asm/vis3-mont.pl
 89278854f44d95be916516609ce6f79dcd346bab52574b9b6336a9952aa94bee  crypto/bn/asm/x86-gf2m.pl
 90d4ae234c08267adce9ed38d56e0edc223f7480cb9605f5d7399d0b3914c6be  crypto/bn/asm/x86-mont.pl
-d444ca73875e97e0ea88b20e4c02f2fcf3850e8b9311e3b67a2d04fe2796d543  crypto/bn/asm/x86_64-gcc.c
+0e3e572cd864bcb9222cdad7ca4e8dae4250f6f76c2b66e1f0e46df1cc0cf371  crypto/bn/asm/x86_64-gcc.c
 709ddee92e9222ee0ed27bfb90db556e85e2d302e4a9131afa25fdc14c4d858f  crypto/bn/asm/x86_64-gf2m.pl
 da7f7780d27eed164797e5334cd45b35d9c113e86afaca051463aef9a8fd787c  crypto/bn/asm/x86_64-mont.pl
-c3217af276175509230fcf4f8c169aab36729b474c3887f730ec018395abea1c  crypto/bn/asm/x86_64-mont5.pl
+efe70ef06b5d92539f8a239c98c0261d93a15b3e418ca87d97ec569da9e6e9d3  crypto/bn/asm/x86_64-mont5.pl
 0ea8185a037a2951bb3d1e590bbbdeac305176d5e618f3e43a04c09733a9de34  crypto/bn/bn_add.c
-964c7eecef99ef56997cbb90b6560d41e0e90bb1f87dcc5e2a1bf177851c005f  crypto/bn/bn_asm.c
-22269bec400abc2d4b38f250134070680075aa320a1a8a2e0c4dcd33fd66cd8c  crypto/bn/bn_blind.c
-7b761d541e3b7f6a3f2b14a09b2b3836a079a845cf67a54db4853e3fd38277c6  crypto/bn/bn_const.c
+529933a6592cf82abde515dae10db17833a16ec29cb89ec577c0a184838fe27b  crypto/bn/bn_asm.c
+feef3a84a40034291286882d483ac23ab55631c3c93f40ba0ea98944916ff3ec  crypto/bn/bn_blind.c
+d3b5f02a17ba1c71261f6dad0d4785846567c8a03368d41fc1a6ee7c45aaff78  crypto/bn/bn_const.c
 eee3d2710144b0e860c57e84f5adc6b2bf64fc27cbd202a8ca2630aefed3b84c  crypto/bn/bn_conv.c
-f53d3804456b787be45ace2b33b7a323e5e4fb6cfbe3aa3b6696e3ce0a640baa  crypto/bn/bn_ctx.c
-d94295953ab91469fe2b9da2a542b8ea11ac38551ecde8f8202b7f645c2dea16  crypto/bn/bn_dh.c
-74b63a4515894592b7241fb30b91b21510beaa3d397809e3d74bc9a73e879d18  crypto/bn/bn_div.c
-a14183415e8de385964b0045af6d155a0c9dfbc5f0bd11cb4b848c31eac086af  crypto/bn/bn_exp.c
-ec2b6e3af6df473a23e7f1a8522f2554cb0eb5d34e3282458c4a66d242278434  crypto/bn/bn_exp2.c
-98b2c9a4ffa3063731a10d74318a9f0b808bfa0bb9a5e1c2faca4121a2390d76  crypto/bn/bn_gcd.c
-6c5c69c03d5390467aecb5344c7928f62122e47a4e0e2742af9ee1610dd233a1  crypto/bn/bn_gf2m.c
+282f06fbdeb991d90337787c6407020e940b6d5e187a06866f1a7787c10a0c1b  crypto/bn/bn_ctx.c
+d84752b5835e9072cb93de0241f1f701933c61283a27679c1ba34e2bbd1bbf76  crypto/bn/bn_dh.c
+4824f271f0ddc487b5991fbd92f7f7695aeeac234e076078f37da027999cdd88  crypto/bn/bn_div.c
+306a4a4b671f299da0201719862a3ab4f76cd4a13d4d0baa214478603e5cf15d  crypto/bn/bn_exp.c
+ce5219203bf869561297978d6d416357a441864cd801865503dfd455c481960c  crypto/bn/bn_exp2.c
+18ac3f6fe64225f72243689199839ea2ce2aa61d80b084bc4cd9efe1c7cc9d89  crypto/bn/bn_gcd.c
+b643fdcd91ad7dfcfa97a0bb235221b024b8a77faa7890f0bcb9681ea2c64c49  crypto/bn/bn_gf2m.c
 73ee247467879d4ec984c9900dfe7761233c5b889b8762be37c7e8fdd6d1d210  crypto/bn/bn_intern.c
-602ed46fbfe12c899dfb7d9d99ff0dbfff96b454fce3cd02817f3e2488dd9192  crypto/bn/bn_kron.c
-b0b02639e782fe3a5ed41f2248ad485ccc2a2bc1132a1326b8fa204066c2aa12  crypto/bn/bn_lib.c
-d5beb9fbac2ff5dc3ccbdfa4d1aabca7225c778cff4e3b05b6d6c63e182637f5  crypto/bn/bn_local.h
-929c636ccc31899f366717c1adf691d69534c2329aa79bb3edc2ad1935204ecb  crypto/bn/bn_mod.c
-e1fd447361388b6f1290971543149db346c9e6871ccbf54143c61a5872746bef  crypto/bn/bn_mont.c
-2da73a76b746a47d8cf8ec8b3e0708c2a34e810abde4b4f1241a49e7f5bb2b60  crypto/bn/bn_mpi.c
-76982b18b0803d59b33168b260677e7412970757d3b9513de5c80025290f211d  crypto/bn/bn_mul.c
-6bf1d67ea493401f7765647828d3f426305fd0686cc89956c9d205922b7ab4db  crypto/bn/bn_nist.c
-5377e9596c3b9a3153ce75004599dce1f0fef23612d4e086cc936a87d4d5fa99  crypto/bn/bn_prime.c
+ff147e5e032cc7c772b73a91fc6e24d8d9516e642d29354445d1f82d64b1d924  crypto/bn/bn_kron.c
+df9aebbdcca87fc5715dde430687fb516d8de0dac70c8910409fb73d6dd2305b  crypto/bn/bn_lib.c
+830e1932da4e8b409250a9dca0275b853a8d12bd6575649148aee5331180bbcd  crypto/bn/bn_local.h
+364600145964d5154224fdda2c94ca6fdab2907837a385550b242350be7a1197  crypto/bn/bn_mod.c
+39a8fe0bb625b4c11b74998ce6fd99b7655228aaa7d7ad3076f61741937ae14d  crypto/bn/bn_mont.c
+c2a5230efbda6844b7b2eb10447b054496ae5029130d332536de6c3b12dc58a3  crypto/bn/bn_mpi.c
+488dde761d25fb2eabd8acbea5b3b83520db7733480fab6499f60b8bf680b1ed  crypto/bn/bn_mul.c
+e80177361897632ac9f013415dee8f6d2d942a8b51a4daf84fc7ba51d9d75270  crypto/bn/bn_nist.c
+c7e1d12f14b20e0e34870060459581afcdd58d80097248de5187b9e72bbd7cf0  crypto/bn/bn_prime.c
 c56ad3073108a0de21c5820a48beae2bccdbf5aa8075ec21738878222eb9adc3  crypto/bn/bn_prime.h
-4e1f3e71cdb05d41608224d1837da6f261d5f60a570be1045c10738e1e6646ff  crypto/bn/bn_rand.c
+af5af7057643ee8d35e3a2d5f7b55e37647db46700f2818edc295d727450d521  crypto/bn/bn_rand.c
 b5cc902624b3af2149c9ea91f9d18bea56302144e87dfe49105ec6789b73764b  crypto/bn/bn_recp.c
-669a157968afe07588507a2e9e35c1c4df9c2b0a95cd9c21404b0bfa21be0d37  crypto/bn/bn_rsa_fips186_4.c
+4ff6338c3d30ed029b3e4fe509e08d9abf2e84b61c14bf466f642f097a8b7036  crypto/bn/bn_rsa_fips186_4.c
 6889866bca4673bccb8adf870859a867757ccd3c8ad4652675615afff710add3  crypto/bn/bn_shift.c
-622e90766b29e0d25f46474429aebda8eba2246835b9e85dc26da7cdbd49334f  crypto/bn/bn_sqr.c
-42c8ce944c889abcfcf089d0ad2744b7587696d8d7785efa91b3f7ec53dc062a  crypto/bn/bn_sqrt.c
-24e62baa56e02f2db6454e10168b7c7fa7638db9221b9acda1803d43f38f36e0  crypto/bn/bn_word.c
-ec684bfc01a74492150e930fe6d6cc5586be48b9674bbd7a492efa517d04c340  crypto/bn/rsaz_exp.c
-2c8c8217197cc7ce0c987c44c1de6752ad385c4934600de8b1be181b4893234a  crypto/bn/rsaz_exp.h
-ad80d38930e576afdf55dfd88c3c7ddfa390cb474b9b1b72d8a37fa0dde177db  crypto/bn/rsaz_exp_x2.c
-834db8ff36006e5cb53e09ca6c44290124bd23692f4341ea6563b66fcade4cea  crypto/bsearch.c
+97559e9e071a06b8cffa37b7df27af638de84c51d5da190a879752f39e2b6368  crypto/bn/bn_sqr.c
+c748baddfec6734bb50facbadf151a1f22f8a885c677acfb08b4f814e96f0d52  crypto/bn/bn_sqrt.c
+f42996cdd94f18fe0858552be7123e75cb3ced0ebd7dcb90a0c73740090dcac9  crypto/bn/bn_word.c
+2f048ca8e8ddc5e2b8b82775197f79334381dd90bab417b2855bfeee07b99db8  crypto/bn/rsaz_exp.c
+b89075a1c43de2e27a29db217c11c1fb4ec04f4270d0106c0679dd44f98eee58  crypto/bn/rsaz_exp.h
+3c934b8abf163b95caf236647153d42d8d48f10f2f5f8b21c013362b1cb8aa8b  crypto/bn/rsaz_exp_x2.c
+21ddcc6948e81597c9b9e9823311cd1c315708819e85f29d5ff80dc72e14e562  crypto/bsearch.c
 82117f6a7cfc31fc86ecd9629bd3bf614126b8e8b2c23717a03ff5c1db7c3c5c  crypto/buffer/buffer.c
 5f43844b5d8665de9ab895f93599150a327d73ec2674bbf7d7c512d30163022d  crypto/c64xpluscpuid.pl
 205f0be0317343b17003f261b427008aad1b31aacc6979c4557fc837e9548b92  crypto/cmac/cmac.c
 1d2760fae983b7fdba8fbb63b0f357dc161f6d0f0695f6b73e8d92ed19899185  crypto/context.c
-67c2367871b9350a7f7af5be903d6bcca9ebdbff0e9a9bd9f61b56bef5b76696  crypto/core_algorithm.c
+ce92403350443d08cab02566b928013eabaf2d5ff5e2947f7e6d322cb8ec82fc  crypto/core_algorithm.c
 ab29529cca1308302d852999f2790c404a4dc0ef8cd6653260739f70b2f22758  crypto/core_fetch.c
-61111a5f2eba07860b1ae2b6512c9cfb30cb7f580db5606fe1c22f1fa7599f2f  crypto/core_namemap.c
-819f75bcb1cbd6633381ec9ad043152ae2ec1f71471650864f2cb8c88612cab5  crypto/cpuid.c
-a6732e22ccb49cf51fc9dbf23f6059774b70ecc3d7e848c5df112a2d3c179027  crypto/cryptlib.c
+0e3519aec0d93b0700d1175616b8bfca9c045989fad515d2202dd7dff9caa5ac  crypto/core_namemap.c
+a62f653b8a6ee765be704980425617e04e1d242f9735efaf35fc6e00815ff2a7  crypto/cpuid.c
+a73118d14eeb232ff250ae908204ddd7cf33deba5f3ca68a2dbb51b020946b0e  crypto/cryptlib.c
 66dbfc58916709d5a6913777346083247942a8d9458ee9b2bf443f0ea4988d64  crypto/ctype.c
-51e56541daea6d4a26d5bae2ea458414063bf08b045bab8df370f6695903e0a5  crypto/der_writer.c
-fea3ba4225df97aee90690adf387625b746d8edfdc5af2357ee65151a3d236ac  crypto/des/des_enc.c
-3c5e1c156ebc771701f0adbcfcd099d700796255991c1bf79bd2ca78fc009c87  crypto/des/des_local.h
+b9fabcf8480b8c9c7847a0c9af0fcc13b6c4b4a4558d5e445e6409221e6f8113  crypto/der_writer.c
+135ef65f7602432f8c87ad18fdd90b867f1c46b1c631522d56181fbed2106b05  crypto/des/des_enc.c
+7c2cea4c850398158b4aff172b242de0cc436b66f62fc701ccca3fe5489925a5  crypto/des/des_local.h
 eeef5722ad56bf1af2ff71681bcc8b8525bc7077e973c98cee920ce9bcc66c81  crypto/des/ecb3_enc.c
-04d4cc355200b57f1e7d265a2cebdf094df1eb6e96621b533adddc3d60d31fbe  crypto/des/fcrypt_b.c
+c1e015556147b40c854bf0ab275c54235f99001d04c6d49f158fba6865eb5439  crypto/des/fcrypt_b.c
 499513b3ad386fe694c4e04b3c8a9fd4c4e18fc44bb6c4f94d6bf2d9362a3a5a  crypto/des/ncbc_enc.c
-9549901d6f0f96cd17bd76c2b6cb33fb25641707bfdb8ed34aab250c34f7f4f6  crypto/des/set_key.c
-8344811b14d151f6cd40a7bc45c8f4a1106252b119c1d5e6a589a023f39b107d  crypto/des/spr.h
-a54b1b60cf48ca89dfb3f71d299794dd6c2e462c576b0fe583d1448f819c80ea  crypto/dh/dh_backend.c
-24cf9462da6632c52b726041271f8a43dfb3f74414abe460d9cc9c7fd2fd2d7d  crypto/dh/dh_check.c
+dc2e7899593032fdf0fcab18f5549c52f12bad2225aac9a08c4622ffee34b193  crypto/des/set_key.c
+41b7fc5e67814311b878684e3f29cff60e228f1516f670d81bf43130f2668ae8  crypto/des/spr.h
+b842e39f34996d74cdc9b9be5fc93c27fc91ef6141fae83163e09f6b0eff1e09  crypto/dh/dh_backend.c
+091ec05b6316cce34305ae8f8014043c7c9b72098aa1abe9c35dcbcdb4b77cd0  crypto/dh/dh_check.c
 c117ac4fd24369c7813ac9dc9685640700a82bb32b0f7e038e85afd6c8db75c7  crypto/dh/dh_gen.c
-6b17861887b2535159b9e6ca4f927767dad3e71b6e8be50055bc784f78e92d64  crypto/dh/dh_group_params.c
+1149e214ed664540434912e284730a3c87385172e4c6d1c944ea56659e2dd762  crypto/dh/dh_group_params.c
 a539a8930035fee3b723d74a1d13e931ff69a2b523c83d4a2d0d9db6c78ba902  crypto/dh/dh_kdf.c
-af27b02f3fc5c176bc9f61bc9a67475c5a2a81bce4999f2676311a96059b8dbd  crypto/dh/dh_key.c
+8ecf50b2e54727d9ae05b2cb03b3162986eba6a03c20dce82b67195cb11e5adb  crypto/dh/dh_key.c
 7eae94965827bc5b0178269e85c77d6671c85255dc1f05e90b0f14500c765cce  crypto/dh/dh_lib.c
-8300775d88db0a1aa26a77eb49d6c4f7252e7fee69e1440de4c40edadc9da044  crypto/dh/dh_local.h
-bbcf4fc3067ac462a27d7277973180b7dc140df9262a686c7fbe4318ca01f7b8  crypto/dsa/dsa_backend.c
+a9166c3cc60f4281e9d471c64145e0a78fc9dc43b8bc9e5de96d91eb7d277da3  crypto/dh/dh_local.h
+40065939139ac28aa52838aa54d257da82fce73504557f7a9ad34d13824e0cb9  crypto/dsa/dsa_backend.c
 786d6c65ced7ee4e25f5dd7c3150259ec95b6aa321a7590d905757b8139f8230  crypto/dsa/dsa_check.c
 ae727bf6319eb57e682de35d75ea357921987953b3688365c710e7fba51c7c58  crypto/dsa/dsa_gen.c
-9978d27e9fc8ff152830ebb781f71338e56a5e116f29c1c2d59a5a112d86362a  crypto/dsa/dsa_key.c
+dee83cb278b3f712a62bd3477bdecf7b83e6df38ada2f3e1ca043d37327e2da4  crypto/dsa/dsa_key.c
 7d44106570c0ff9a44de874ea2daeaa87ea4c814fef6af0a26f655120a54f529  crypto/dsa/dsa_lib.c
-f261f9d4f83ecc51ab58de89083e9af4ba4a4c922ccd06b0d628f4b60fc104ec  crypto/dsa/dsa_local.h
-d270b56fd894090319c9491ef745c34bc43add82daecf742916c64a4e956c765  crypto/dsa/dsa_ossl.c
+98ce52d325d2409d7851f1e1226755136f115c884d227d2ae3e4f9b61fc323b8  crypto/dsa/dsa_local.h
+3428bc7602f344f8b8d4a5807b0a7e982cbead1ec28be73ad77b5f849b034993  crypto/dsa/dsa_ossl.c
 3a38575de4b1409653f330f241848e6c7b554dec44c2415a5ae1baf90fb47ac0  crypto/dsa/dsa_sign.c
 53fa10cc87ac63e35df661882852dc46ae68e6fee83b842f1aeefe00b8900ee1  crypto/dsa/dsa_vrf.c
-62fbc4465a5b37dc794bee277dd216d77917e715c2bb5d37a7e1735e80ad0f8d  crypto/ec/asm/ecp_nistp384-ppc64.pl
+5335741d0f6c1afac107c9ec66e6b5436bd2164535f114c23cdc2a199560c28a  crypto/ec/asm/ecp_nistp384-ppc64.pl
 d9722ad8c6b6e209865a921f3cda831d09bf54a55cacd1edd9802edb6559190a  crypto/ec/asm/ecp_nistp521-ppc64.pl
 78ad06b88fcc8689a3a846b82f9ee01546e5734acd1bccf2494e523b71dc74d1  crypto/ec/asm/ecp_nistz256-armv4.pl
 9463569b439ccee629540d5e02b586f9cc6a87ff382066efe430ac0b85bca281  crypto/ec/asm/ecp_nistz256-armv8.pl
@@ -162,114 +162,114 @@ cfe7e75a2fddc87a7251684469a8808b9da82b2f5725eafad5806920f89932bd  crypto/ec/asm/
 afa4497cfbf9ef7805e42ae6a61c7d983e8a789b270d498a07785570ab85a9fa  crypto/ec/asm/ecp_nistz256-x86_64.pl
 cc727533130f5f1a29229929b3d4e8454585d647be25d6344f3c6a0240998368  crypto/ec/asm/x25519-ppc64.pl
 ee897e230964511baa0d1bf95fb938312407a40a88ebe01476879c2763e5f732  crypto/ec/asm/x25519-x86_64.pl
-d0e81e6185fd589094e06854460cce0d070cc10901ff993c36312fd58420908a  crypto/ec/curve25519.c
-5daf9f524cd63dd95a2136535b27f2b3d90966562ea5766f4b2d1cd4fccf2502  crypto/ec/curve448/arch_32/f_impl32.c
-063dac1e4a9573c47532123e9e03e3532a7473cc3e146521ba9ec6f486ddf3b1  crypto/ec/curve448/arch_64/arch_intrinsics.h
-43423b7ee85a5c740c1d81499ee06f4a17732c7731a598e7429d5e402ee77cf4  crypto/ec/curve448/arch_64/f_impl.h
-75c8103fddef2b6a1b43245e7b4fa2fc8507aacc61dd8916d1a28e1c28c86623  crypto/ec/curve448/arch_64/f_impl64.c
-242421aa2568931f2d175a0cfd1ca3927fddbc31e89187417cce50ad6376a344  crypto/ec/curve448/curve448.c
-a6c70707c520234ccd111562f012e1abf83c43b20b3b36c339ef1ea0369a9e5f  crypto/ec/curve448/curve448_local.h
-178fb9863c33174b633c2e7607160b1bedb506d66cc06d53382d87431441f306  crypto/ec/curve448/curve448_tables.c
-f30e13bba5a136ab9ba5225c98b9b94c2cd73fb3aef60f9dcde3cd471cfa1ca4  crypto/ec/curve448/curve448utils.h
-4a45e7828831fbe9f282f933cda54b12cd393ec9bffe5c0ace8e4d1c4d5d6358  crypto/ec/curve448/ed448.h
-de75ada19d49a0943cc1badf4b258c4d827e6c33921a1a412f9a0e37f2728d0c  crypto/ec/curve448/eddsa.c
-9f712e7397b10f1dc88a6d18ff38dcda13d09c02775f3682f2b8698715b1095a  crypto/ec/curve448/f_generic.c
-070daafb9a532ebb8bc0af8b1341254f0cd3e8932a8c8a2dca7baeef6678768b  crypto/ec/curve448/field.h
-514014f9fa7835056aab1e6df5511fd7de8ecef3cfcada8e0eadec9b727b419c  crypto/ec/curve448/point_448.h
-1ff6e467d72530c71d21c310180d04a24f0a9cb41168fba94b43309ecdda3888  crypto/ec/curve448/scalar.c
-3052a044afae2e91b677542fc8b34b3ec9d033e0c6562b0d43098cfb34ab3c9d  crypto/ec/curve448/word.h
-ae1637d89287c9d22a34bdc0d67f6e01262a2f8dcef9b61369dba8c334f5a80d  crypto/ec/ec2_oct.c
-9965a95c878438eb94bb0c21876b5a971f47b91f9d22f9c93cf7209a184cd1d1  crypto/ec/ec2_smpl.c
+2e7b5d2a3eff0b8a90c1de3f28a7bf59b1057e7694c0e36909e774343cef609f  crypto/ec/curve25519.c
+784c03c3f81fd0c363cd0500fbd95f3e49c65f47a249f7ba25fad42a41d3eea2  crypto/ec/curve448/arch_32/f_impl32.c
+8e75602d4d492316d318bac147eaa09d87b0eeda0d450e18683d935673ab61b0  crypto/ec/curve448/arch_64/arch_intrinsics.h
+4cccf81b42c6b8caff7a641280b2b01400c5ca94f8124eeca774569c19e155e3  crypto/ec/curve448/arch_64/f_impl.h
+fc28c768e210c98e8d77c7c57c48eacede226083b95c58dd0bdfdc4efb12cbfb  crypto/ec/curve448/arch_64/f_impl64.c
+385a8c6b68b212ab7ea8acd47cd2e0601a0b3ce7356e28b84842aa9acc1437fe  crypto/ec/curve448/curve448.c
+92a1cca23f4c139e679f61726d17d475a5eae016460b9cdaaf5b2d996d940ca5  crypto/ec/curve448/curve448_local.h
+6bc188cae67754cfdc9e4420ca2a208292f34c0c3aa5a25930146b92111e9640  crypto/ec/curve448/curve448_tables.c
+8d6546f15baec96755625593a9bc7f781092fa4dde846ba6b488a31585b47a8e  crypto/ec/curve448/curve448utils.h
+490496e1c06d1f3ba9474ddd98e07fe11cac2838dd3937f35541f69ae798e67a  crypto/ec/curve448/ed448.h
+b65aa613ee9f74bfc7fd00be16087c431bdf092a7e6943238eee9e54ca3adf00  crypto/ec/curve448/eddsa.c
+5aa20e2a4a9ae3a30d7400f3d666238f890004c3dfb66933873e7daa0026fe3e  crypto/ec/curve448/f_generic.c
+81ab2c5bcf5b036f649804f494e1b2ee5d5b2f900dd56b5dc55bac04a63a57ad  crypto/ec/curve448/field.h
+77bc6dd8c7d14a21760eb5e0dbf336eecc78835faa2f6f846824798303109d41  crypto/ec/curve448/point_448.h
+6d007474cb42b16f98059f6eea6c09ef23552049207558fe46d071a613c8a314  crypto/ec/curve448/scalar.c
+c0b5e93f120c7a5e0c0aba9877a445d0f5db85440491853b182266ee5f323361  crypto/ec/curve448/word.h
+f4490c0b575b79e63a897b1e85a87ede2645a2c521e67db461b3192884450d9d  crypto/ec/ec2_oct.c
+5d3567b3b6d3922fd82641acff29ed12b1028e83eb0c175132ce7f3470b9db6c  crypto/ec/ec2_smpl.c
 a1f22814f501780591da20de5e724895438094824fce440fd026850c46ad8149  crypto/ec/ec_asn1.c
-805c42cf4deff93ceb8553c9d572f46e08d148a4de3ed8695a6db290b00b92f1  crypto/ec/ec_backend.c
+dfbccf591879eecbd9ed75da1fbe6c7b1672d07648fd43b37755dfe248253bb2  crypto/ec/ec_backend.c
 7f19cebad4a94db291464b0d93006a87d15ccec93b94f725052a1037107a96be  crypto/ec/ec_check.c
-b5d1182daa207e0f27b817801da96af15c8f13a9ceeb04fcc66b45d36f67f6aa  crypto/ec/ec_curve.c
+f3991bfc65a7371b84afd0cc328e3cbd4736edf7267e4b731dd82677bfab047a  crypto/ec/ec_curve.c
 8cfd0dcfb5acbf6105691a2d5e2826dba1ff3906707bc9dd6ff9bffcc306468f  crypto/ec/ec_cvt.c
-e656516aa9a322c3b6568cd37fb432ce1bc48369abdeb13eb99d3c38f2fc8c6c  crypto/ec/ec_key.c
-93f35d2e21d49bb6780d200fda8486edd4a7123956337ba535720bb547a47c4a  crypto/ec/ec_kmeth.c
-4c5e0cd2b6db049b41098ca7ea1f5c920926392f9fe356d076eae35002b69298  crypto/ec/ec_lib.c
-9f86576ca885dd5523879dfdf928c5781bd13d2dbe626a90a785d04184c7a8bc  crypto/ec/ec_local.h
-fd70a4598ab61576535d06417b3b3e367f928e6cc0b20b690326e64076c95068  crypto/ec/ec_mult.c
-7a777b96560b44bbb9965f099ebc31ee6c8057b9778e854b0f9f3b4125f8dcda  crypto/ec/ec_oct.c
+add58bcaf43a28e66b3a6ec1f70ed9b0b4a4a0d40230e903a26a1ff1129649e0  crypto/ec/ec_key.c
+35515133fb3c33c5736a9f744e835b9fc0775193357ab2492f11d0f63503c65e  crypto/ec/ec_kmeth.c
+ad6f566595be1d72ef97be7322949092c4530da57793ef5b722025738882410d  crypto/ec/ec_lib.c
+0d113ac5dbdb420ba3d1c060f4fa3300fc0a81b571a919c2b176022fdca89878  crypto/ec/ec_local.h
+b545e4539ef2483982f35ee05866060478722e329cfbc4990293b46ccfe5c93c  crypto/ec/ec_mult.c
+c2a81f5f56d304038183ba6b02fdcba8767833f61773ec483e73b330b67ae59b  crypto/ec/ec_oct.c
 c7fba2f2c33f67dafa23caef8c3abd12f5336274a9a07d412b83be0366969ee6  crypto/ec/ecdh_kdf.c
 b86a943ae62145438a7214539ceb3e0de5a30e17a6e59742c6e30991db730ab6  crypto/ec/ecdh_ossl.c
-8515ff7e69bc5387e97de76f3663f49c4901ab942d51b36035cf3f9e9c147406  crypto/ec/ecdsa_ossl.c
-b6baa42b16e8df69a12e0ab101033100cddc808ec2682ba1574373e6ec86ae93  crypto/ec/ecdsa_sign.c
+b75bc58f7c1a7996e227a0f22ab6c644ce987836cdcf1c5b794b936855ac984f  crypto/ec/ecdsa_ossl.c
+927661d7d67d93209ce21691d4604c25a3f643eef924e8bf1c03d29f196bef22  crypto/ec/ecdsa_sign.c
 f686cea8c8a3259d95c1e6142813d9da47b6d624c62f26c7e4a16d5607cddb35  crypto/ec/ecdsa_vrf.c
 141cfc1459214555b623517a054a9e8d5e4065a11301237b7247be2c6f397a0a  crypto/ec/ecp_mont.c
 13b30f34aeeb0c98747239bfe91b5f0f14e91b2c1f11db62ebb5950c7219daa0  crypto/ec/ecp_nist.c
-ac6fd7dc1c025f97bfc1bc6da7bae92d2acab96679a3b783ec1b3d062ff7e6bd  crypto/ec/ecp_nistz256.c
-51cb98e7e9c241e33261589f0d74103238baaa850e333c61ff1da360e127518a  crypto/ec/ecp_oct.c
-9cf3bacc8a990f6dffe369c28f2f47b192c8d17178185acec601e3fee5b05fac  crypto/ec/ecp_smpl.c
-43f81968983e9a466b7dc9cffe64302418703f7a66adcbac4b7c4d8cb19c9af5  crypto/ec/ecx_backend.c
+a42137b3d46051e9205d6f1eeb45b83e517f2b8a5ba8d23d7254374cb25c6fcd  crypto/ec/ecp_nistz256.c
+f38971ee893608f00d1ddd77d889aac9558509bda62d2e1b3eecd9bfa0c29095  crypto/ec/ecp_oct.c
+3a6441d716d7157abe8e9a2edb80d462257bbf602aafbb219463392352b088be  crypto/ec/ecp_smpl.c
+99571b1724562bdb06b03fe1d7f6f19ffb7f1a9df543bf74127b54948957a7ce  crypto/ec/ecx_backend.c
 5ee19c357c318b2948ff5d9118a626a6207af2b2eade7d8536051d4a522668d3  crypto/ec/ecx_backend.h
-2be4ca60082891bdc99f8c6ebc5392c1f0a7a53f0bcf18dcf5497a7aee0b9c84  crypto/ec/ecx_key.c
-62136e558017c5c3b2c60ac22f1bfed252519c6a8595f9725356bca1a0c70ea8  crypto/evp/asymcipher.c
-80da494704c8fc54fea36e5de7100a6c2fdcc5f8c50f43ac477df5f56fa57e58  crypto/evp/dh_support.c
-bc9f3b827e3d29ac485fff9fb1c8f71d7e2bcd883ccc44c776de2f620081df58  crypto/evp/digest.c
-838277f228cd3025cf95a9cd435e5606ad1fb5d207bbb057aa29892e6a657c55  crypto/evp/ec_support.c
-74b24b40447a9d614265a5a9738c6398e588f950c40d4a501828666bb5bfa1f4  crypto/evp/evp_enc.c
-baccbd623a94ba350c07e0811033ad66a2c892ef51ccb051b4a65bf2ba625a85  crypto/evp/evp_fetch.c
-52b4aba9e2beb9d382ebd09daf44009e5ddaeae8d3434546e2884ab8ea481d7a  crypto/evp/evp_lib.c
-32949d15dfc1a3049eb3000ddc10db077eb442e1fa224b2541aa1fcc6137d80e  crypto/evp/evp_local.h
-eaaf795148c5dd99c4194d076c029c843f3aee0c37afeb0dac43a86fd931ac68  crypto/evp/evp_rand.c
-2a128617ec0178e9eeacbe41d75a5530755f41ea524cd124607543cf73456a0c  crypto/evp/evp_utils.c
-71d13f4d28acc1752c7278e784ac893b699d5aa45d3c68db26dce524b9ad7fba  crypto/evp/exchange.c
+8e50fd1e60ad1ac824e704375096e41f4ae535e533a3334d78c481e34d9d0fb8  crypto/ec/ecx_key.c
+3ba8412897cbf17881fbf23cec27a487b2c587348e1f859ec44e47f366877249  crypto/evp/asymcipher.c
+1f64d4752074f954af4f290788e4332e3874ba3282bd03d3e1d1f5ce4b0888bc  crypto/evp/dh_support.c
+da3140dbda8a35cfe4a0748892a3e381e3988a94ddb945c2371922bb3010d96d  crypto/evp/digest.c
+4ffc3fc5ee5f0dcadf1516f1cc29338f0f4d85c59881c06d5a777cf4e47a6d5f  crypto/evp/ec_support.c
+6f8a9bb4d8da878aab6bf5f4bef286a0045fee1b140a1f9151c830d03778f879  crypto/evp/evp_enc.c
+8683c25d4bcb598375a04d4682399c9eef095225b49498afe819e5193e9cc117  crypto/evp/evp_fetch.c
+75855fc64e44e5bbfb728d85014c65e8b0668faee26f0901aaa729c16679dee8  crypto/evp/evp_lib.c
+e997e921669076c51e230ccb2e36b1c6755fe408c61b1177d2aa67529cab15f3  crypto/evp/evp_local.h
+8963ef06e4d228f7067917434f60f0502dc4bbdf3b271649498b734f4074bfb0  crypto/evp/evp_rand.c
+0bdae4714221662282dccd5b1f2485370d24e463c11bdbb71a310f34616954fe  crypto/evp/evp_utils.c
+8f4194bcc2e0de69236925aa7515bc31f36ed113dcd3cee5d71167ac770cdfdd  crypto/evp/exchange.c
 294284ad040fe4b74845f91b1903c961c757e1ef3fcc2ffa35f43f37f1655e64  crypto/evp/kdf_lib.c
-90742590db894920ffdb737a450ee591488aa455802e777400b1bf887618fd7a  crypto/evp/kdf_meth.c
-948f7904e81008588288a1ba7969b9de83546c687230ffe2a3fd0be1651bce8f  crypto/evp/kem.c
-55d141a74405415ad21789abcace9557f1d1ef54cf207e99993bf0a801f4b81e  crypto/evp/keymgmt_lib.c
-ac5194aedcd6790903817faf4aec199a2100e27cf2d778caae3d8d79cc28f596  crypto/evp/keymgmt_meth.c
-9e44d1ffb52fee194b12c50962907c8637e7d92f08339345ec9fd3bd4a248e69  crypto/evp/mac_lib.c
-cd611921dc773b47207c036b9108ec820ab39d67780ba4adc9ccb9dc8da58627  crypto/evp/mac_meth.c
-4f0a9a7baa72c6984edb53c46101b6ff774543603bec1e1d3a6123adf27e41db  crypto/evp/p_lib.c
-3b4228b92eebd04616ecc3ee58684095313dd5ffd1b43cf698a7d6c202cb4622  crypto/evp/pmeth_check.c
-759573aea2a4cc7b6f763b440e6868bfcfcb7ca94d812fa61ab24a194be2cb36  crypto/evp/pmeth_gn.c
-c10d13ab54bf4aa3145a68ed9db2a76566cfd5d6362e1a3c94671df8e8abeaf8  crypto/evp/pmeth_lib.c
+532f0ff4ab32068f160016f39cd520fadfbd09b81b3b3b562bf543acafb38889  crypto/evp/kdf_meth.c
+6669cf0969c6fcd4e3b240aad6335d159a8169aab891f1388822fe96c6ce0629  crypto/evp/kem.c
+84cebe10a50c88d0db12a90ad751eae43c7ba2954bc9f42f0c1490d66eac5bb8  crypto/evp/keymgmt_lib.c
+80a5e310a3c3f551ca8e1992793ffbddc525274f90dbf4f36217b57acbc8bd94  crypto/evp/keymgmt_meth.c
+15654f58c113d6eb7100caacd00ceae68113edfd6a921f6af1bea4040fa58f5d  crypto/evp/mac_lib.c
+8f9d191eda167c24fb579818d432dc12321fc559ba59b9be96ab4c9c3953911c  crypto/evp/mac_meth.c
+daf742357baa65ba164c8bc34044d7bf92bc1f94b010a41a315411dd0fbf4471  crypto/evp/p_lib.c
+02d6b04f2237ceb8e81da8287c06a8e60315a812e719b5a0603455feb1ae4628  crypto/evp/pmeth_check.c
+eb34179ed538e971dd4f27040bb5b17bf4e0958eaaca4abb4eb5b841486dec86  crypto/evp/pmeth_gn.c
+09640d3d887c88f4989863330ce1d17516f07543155ce474e8bc4c01c152e80a  crypto/evp/pmeth_lib.c
 ba4ff38738cbcfd3841d53a2fab92227638ceca176d3ffe50e486c9dcbabb5dd  crypto/evp/s_lib.c
-0eaabfe314cb94a942584f74de69f8dec1287a4afe383050e37ee44a41aea447  crypto/evp/signature.c
-a3ba57f8181cfbbf017fe1d4fa8d80f4999eea6d2834b0bcda22b60e6a5e31e3  crypto/evp/skeymgmt_meth.c
+14fb1aa7c48123c39f762c930474318e2df6b130e3e2860ab845b5c0240b81a3  crypto/evp/signature.c
+30af153213f8b008955486000c5a92507dc694c4af9ac6ed6fef3f290efa3e52  crypto/evp/skeymgmt_meth.c
 64f7e366e681930ba10267272b87dba223b9744a01c27ba0504a4941802a580d  crypto/ex_data.c
 d986ec74995b05ff65a68df320ab45894ba35d7be4906f8d78ca5fca294a4e6c  crypto/ffc/ffc_backend.c
-a12af33e605315cdddd6d759e70cd9632f0f33682b9aa7103ed1ecd354fc7e55  crypto/ffc/ffc_dh.c
+f4f84cade98907fa9905334b6c3c046b430b12b1460edac0617d82ca763620ab  crypto/ffc/ffc_dh.c
 854378f57707e31ad02cca6eec94369f91f327288d3665713e249c12f7b13211  crypto/ffc/ffc_key_generate.c
 4e973d956d4ec2087994de8e963be1a512da1441f22e6e7b9cd7ee536e3ff834  crypto/ffc/ffc_key_validate.c
 e032f3d46830d31cd957e1f3917a6a663c5ad3b9d79fc3d661f025822318d0de  crypto/ffc/ffc_params.c
-be43754acce63bfd3caf08118d67af31b6f024c9df23debba7432a220bf293a1  crypto/ffc/ffc_params_generate.c
-73dac805abab36cd9df53a421221c71d06a366a4ce479fa788be777f11b47159  crypto/ffc/ffc_params_validate.c
+bb208ef3a2c7ebdc518bd38f2f07a17cff356040f1c5d68eea13bd9275897a52  crypto/ffc/ffc_params_generate.c
+e9a500ddbe96cb5b302fd2db74fac0924a6ac45732df5ee1c09e82b19d06ccfd  crypto/ffc/ffc_params_validate.c
 f172c8c2112ee82716a7bc3a3e05d5cc26188c66b9d768ac1ff906845063d2cc  crypto/hashtable/hashfunc.c
-066192a43f3464714656bb98702d4b02f135becc3c5e1fd943886bd5dc808b0b  crypto/hashtable/hashtable.c
+16090065da6b94199e997c930d465c613633bf322e89e3e674993ec5a785580e  crypto/hashtable/hashtable.c
 7a9af0b14f1463b36de0689bc434a318adcb7990bb23862bf1d2a0adf510583a  crypto/hmac/hmac.c
-df7ed80c3c2c0df4bf6a3d5379655d0ba9147d4f4e9f7509672bc9273f163bb8  crypto/hmac/hmac_local.h
+907dd44e0bf873eebefcb4d82975b72ecec9e0f3c348c79314450fdaa78d4073  crypto/hmac/hmac_local.h
 0e2d6129504d15ffaf5baa63158ccec0e4b6193a8275333956d8f868ef35127e  crypto/ia64cpuid.S
 c685813be6ad35b0861ba888670ef54aa2b399d003472698e39426de6e52db59  crypto/initthread.c
-8727fbbb867fca990238ba37c17ae67e4b78a02769913425925ee841af5c0b07  crypto/lhash/lhash.c
+75cb26369ee61de428f1ce982460fe193684b8f87d8f29169329262502fa88af  crypto/lhash/lhash.c
 22261096a117533e78012f5f18586b6a81edb3e09ae8b206b5eb9a0a5c054adc  crypto/lhash/lhash_local.h
 899ba6a9049a61d5b175637907f747f58863cd8950409cefac8fbc8f574f970c  crypto/loongarch64cpuid.pl
 460a7af09cde89a820b091522ada1310cfcec99c60aee505f94c48c35e9a29e8  crypto/loongarchcap.c
 f866aafae928db1b439ac950dc90744a2397dfe222672fe68b3798396190c8b0  crypto/mem_clr.c
-18127868d868ca5705444c24f7dc385391ba31154fc04ff54949739e8fa7fdfc  crypto/ml_dsa/ml_dsa_encoders.c
+23ff635daa1a3149e14de6c2a41b82a7587801581bdf39b8a82e9c624da95471  crypto/ml_dsa/ml_dsa_encoders.c
 825105b0a2c4844b2b4229001650ff7e61e1348e52f1072210f70b97cd4adb71  crypto/ml_dsa/ml_dsa_hash.h
-c82201cf1a17ff2d4b169dcd4402d3d56f4685e460a1447e021db4abd67f7f0e  crypto/ml_dsa/ml_dsa_key.c
+6f241cb093fd426607d8402258acc81a4054e5c35d7bb13138f0d23a128b3413  crypto/ml_dsa/ml_dsa_key.c
 579c1a12a5c5f014476a6bf695dc271f63074fb187e23ffc3f9ccb5b7ea044f1  crypto/ml_dsa/ml_dsa_key.h
 3f98eb0467033d0a40867ef1c1036dcfea5d231eeac2321196f7d7c7243edace  crypto/ml_dsa/ml_dsa_key_compress.c
-983d164bfa3dbe8d85ad1fdc24d897e79d9246d96d9c1862855c6c538b387ad9  crypto/ml_dsa/ml_dsa_local.h
+170292bfc8761e39b688ccfb21b3660af6e1a875aa38ff7448cc22f71f5874c5  crypto/ml_dsa/ml_dsa_local.h
 0490a89372b79d98c2fdc294f836fddd7a54a148202ffbd50c2d4371816a94d8  crypto/ml_dsa/ml_dsa_matrix.c
 ff65c82c56e341f47df03d0c74de7fb537de0e68a4fa23fa07a9fdb51c511f1c  crypto/ml_dsa/ml_dsa_matrix.h
-5367cefcf6cdfc4f301e719ce884910f86b31c84b27e2a7337aae43af8623205  crypto/ml_dsa/ml_dsa_ntt.c
-5927088185ecfdbfec666fb252162e11e7dbccb67320683b14349a189b770f8d  crypto/ml_dsa/ml_dsa_params.c
+c2652262227348b8bb053a239e8491b26f08d6fadc47ba3471302f5797ae1c62  crypto/ml_dsa/ml_dsa_ntt.c
+3e0980e67842c4d8637fa449ac41e9d650c614c1074c29f1021605d229a4f73d  crypto/ml_dsa/ml_dsa_params.c
 10e37ab3ee09a45d99007665e073efb2b062c819f30af8694c6b0f411eb33822  crypto/ml_dsa/ml_dsa_poly.h
-672a4ff05096f5253afd0f4d8447c298299c1901a1d052e64e41daa5c8ddcd27  crypto/ml_dsa/ml_dsa_sample.c
-1d7f57a41034988a4e7d4c9a998760d2ef802c5e90275d09a3ca31c5f3403d94  crypto/ml_dsa/ml_dsa_sign.c
+26be5266a9f1a33999a5a68c96cffc7932ba64521d9554dabe7397591611c852  crypto/ml_dsa/ml_dsa_sample.c
+26ce39dd4cdac0a1c00cee24d53e156c16a1577c71a8a96bce3e2b4130afa6f5  crypto/ml_dsa/ml_dsa_sign.c
 5217ef237e21872205703b95577290c34898423466a465c7bd609b2eb4627964  crypto/ml_dsa/ml_dsa_sign.h
-abd934284bcd8061027a69f437fa4410c6b72cd950be1ebe048244d036371208  crypto/ml_dsa/ml_dsa_vector.h
-f4002093a801a3e6bdfca7a2e9915766f5459d625d1312eb6ad0f868151ee65f  crypto/ml_kem/ml_kem.c
+8311e08d9d0e2e073092d0cfaf64851fb8d0f0708dfc2707422f525f87f269d0  crypto/ml_dsa/ml_dsa_vector.h
+0fbbb11e30b7e3f4e5366334e273dcc3f6440ed04a0758f0c99279c25b8c0baf  crypto/ml_kem/ml_kem.c
 36e24eae5d38cc9666ae40e4e8a2dc12328e1159fea68447cb19dab174d25adf  crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl
 33357356cd739d4ae89d52f0804b6900e4b94d8829323819c6f64c8908e978df  crypto/modes/asm/aes-gcm-armv8_64.pl
-bcc09bdb474f045d04c983fa09c31a010c5a25513f53a5d3653ade91304f0f96  crypto/modes/asm/aes-gcm-avx512.pl
-400a202abf66c6a3430965c38f7164ac297c856e8585862f59e3ff188bb35a6b  crypto/modes/asm/aes-gcm-ppc.pl
+a91995f81b384b175ecf252690030bb068d6af64bfcdab2fe753484b2d07a184  crypto/modes/asm/aes-gcm-avx512.pl
+038e4ac89aa7d1962058f2170efce9024804473a62ae90102c3989555a7858cc  crypto/modes/asm/aes-gcm-ppc.pl
 dd0de5ca8913a941cfff781a42fba43227e133976a24d0fddebf63909f7e010a  crypto/modes/asm/aes-gcm-riscv64-zvkb-zvkg-zvkned.pl
-4589a5c1d612631be70c998415dceabd344b6553e55528be4d62f2d923b99230  crypto/modes/asm/aesni-gcm-x86_64.pl
+9dcd3be86cda832ebe0394f5a859a761f4b711f2010fb606457f754722c5fb84  crypto/modes/asm/aesni-gcm-x86_64.pl
 c2e874a8deb418b5d8c935b2e256370566a5150e040c9fa008cdb5b463c26904  crypto/modes/asm/ghash-alpha.pl
 6bc7d63569c73d7020ede481f2de05221ac92403c7cc11e7263ada7644f6aa9b  crypto/modes/asm/ghash-armv4.pl
 097975df63370de7ebea012d17de14fc1f361fb83acf03b432a99ae7d5bceb24  crypto/modes/asm/ghash-c64xplus.pl
@@ -284,61 +284,61 @@ e6d6ce559210aee1e97f098683e290c221cc90f6f4f8047b331e8071a8387559  crypto/modes/a
 487e23973c9c782d375a956da6231e91f450182d8822d3f86fd4924e143fed70  crypto/modes/asm/ghash-x86_64.pl
 a4e9f2e496bd9362b17a1b5989aa4682647cefcff6117f0607122a9e11a9dfd9  crypto/modes/asm/ghashp8-ppc.pl
 92f17ee53bd40123358ce5b37bcd6063bfa7d6860dd734d4ac585249c03a6b32  crypto/modes/asm/ghashv8-armx.pl
-65112dfe63cd59487e7bdb1706b44acfcf48ecede12cc3ae51daa5b661f41f06  crypto/modes/cbc128.c
-1611e73dc1e01b5c2201f51756a7405b7673aa0bb872e2957d1ec80c3530486f  crypto/modes/ccm128.c
-d8c2f256532a4b94db6d03aea5cb609cccc938069f644b2fc77c5015648d148d  crypto/modes/cfb128.c
-af1c034152d82b29cb7c938c8516cfd136b62bac0908c1d40eb50790d23b288c  crypto/modes/ctr128.c
-d4ddb087eb4dd54b8e37a414e32d8a2d4e42a7cf2766fc2051e4e31acdf3419c  crypto/modes/gcm128.c
-bdf25257b15eca206be4d950d2dd807ca5f058f91f54edbd7a0d312ed83eef8e  crypto/modes/ofb128.c
-e55a816c356b2d526bc6e40c8b81afa02576e4d44c7d7b6bbe444fb8b01aad41  crypto/modes/wrap128.c
-608a04f387be2a509b4d4ad414b7015ab833e56b85020e692e193160f36883a2  crypto/modes/xts128.c
-fb874ea18e9754dde11ef1c2993818074ff7cd8a74a981598745f7e11317bb91  crypto/modes/xts128gb.c
-f867b6de6ac34a6aa5e2438f3d74506bfe808d3ed74217a40e61890230b32f5d  crypto/o_str.c
-b0decda3aae1d3e07cf3cbe9153cdde9deafe65fae346cd208951b4d7dec512e  crypto/packet.c
+ca4be187fc1805d498f2adb823509f0519e214644029c18d331b5b01a0891a9d  crypto/modes/cbc128.c
+979ec7af2df2bd6cad5218ba1dac44316e04447c0a1420bf849ad2ee3402a373  crypto/modes/ccm128.c
+00d68c071ecc99c471ec0af7e393f5b5ad38bd89483227291cf4cab08ad74964  crypto/modes/cfb128.c
+2a0ab07286b70ce4aa0caf3b5b4be2c00eed3a6d855e9542ae94d0e1f586b1e3  crypto/modes/ctr128.c
+59be0f955b16434efc2618109a01571884c6876af785f1db5dad69786124b341  crypto/modes/gcm128.c
+b431ff38c3a85943f71be0d76b063dbe2930967629b8721465b8152ab7867296  crypto/modes/ofb128.c
+02e7659d8776f5885ebbc25b930ddec046262f92c9e8fa7e093f2a6a8d973a3b  crypto/modes/wrap128.c
+0a10e0cae6f4ac164afe97a64df09c8412145c8a25f387ff3a53ff7495572cbc  crypto/modes/xts128.c
+9a34ad9ae361f689b0b98c454092e89567d0bfc969c08a14c8001e60976920b2  crypto/modes/xts128gb.c
+3f2c172dccf93227fc4b24f9960e1c0b01e987e1335dd9ab0e3c2d577195fed4  crypto/o_str.c
+44594139dab6ada1f34f9c6887c97e258c1204b833a6c20f58097f17d0f1645e  crypto/packet.c
 05563d44cb345e7859093296f95a3ea5139fcc316e98fcb86c6748ee49363a84  crypto/param_build.c
 cae7bd4973d36edbdc3bdd8d2c8d157f2c4fcfae00fdf821b67aebb789bc8aa6  crypto/param_build_set.c
-7b32b19c1cf7152ef7e55e8ae7a045be4882da84ecd82ddf24df961656ec581b  crypto/params.c
-bb7b79b5a070050f5e7dfc66b5635f0891bc278e3e24eec3583b769b33bef657  crypto/params_dup.c
-17df6718f11307a0d0c4d8de5a8bbb35408f5546c465c1dd3b631c924adb2e58  crypto/params_from_text.c
+d362864eab6707ba2f4efd65c91dd90d669721f2d8fdebc875fd1d2957154396  crypto/params.c
+c0e0ba07ca5d4acfe450e4ae53a10ed254097ed2f537f01a4a43a9f5b5cab501  crypto/params_dup.c
+fc2432f5a76784d4ca47db1803c8b19acbaea26987f8e33dd8cc5571f8101b40  crypto/params_from_text.c
 f50450f7e5f6896fb8e3cde2fdc11cc543124c854ef9d88252a166606ca80081  crypto/params_idx.c
-9620a96eb5e411f5c96c210fb7975afe6b24635e4c5565be34fb8d10589890e7  crypto/ppccap.c
+1a81e7483e250ef96f7024f75be884b8830801b47cbdb2d4159637666681b350  crypto/ppccap.c
 46fa4994a6234a98a2845d9337475913f6bc229f1928abc82224de7edf2784b8  crypto/ppccpuid.pl
-467c416422ecf61e3b713c5eb259fdbcb4aa73ae8dee61804d0b85cfd3fff4f7  crypto/property/defn_cache.c
-ced9474eca99c4920ee9dc3a810ee77af31aa344d54ea2aca702305abfc6aa1f  crypto/property/property.c
-66da4f28d408133fb544b14aeb9ad4913e7c5c67e2826e53f0dc5bf4d8fada26  crypto/property/property_local.h
-d32105cb087d708d0504a787f74bc163cc398c299faf2e98d6bb5ae02f5ce9b7  crypto/property/property_parse.c
-a7cefda6a117550e2c76e0f307565ce1e11640b11ba10c80e469a837fd1212a3  crypto/property/property_query.c
-20e69b9d594dfc443075eddbb0e6bcc0ed36ca51993cd50cc5a4f86eb31127f8  crypto/property/property_string.c
-8dffed281002fcbc3e54dd4be74f5739c3e6a244ce579f6a86ad8d5dfb0d3374  crypto/provider_core.c
-d0af10d4091b2032aac1b7db80f8c2e14fa7176592716b25b9437ab6b53c0a89  crypto/provider_local.h
+42eff8da564cd8004f2d17fb01686d24977d931c37c7e6de693e7d414c2d7914  crypto/property/defn_cache.c
+3b8088da0a7df3aa44bd703e56c9674d9ff8b75af754a89cf8e57152f0ead48c  crypto/property/property.c
+7f936270992015923e5f6e81b1afad0148b9034693d3cf4665465f839a28c81f  crypto/property/property_local.h
+71ccd54b74799afe44ec12e1ec8b6b7ece60bc25a00b9b49044ade025a2c39f8  crypto/property/property_parse.c
+237079e82943c40d4df9cb6214cf9bc9a84905e4f799eee19a5e0ee4c2d4be4c  crypto/property/property_query.c
+5b35510efa119157e9e217996870778d1ab5f69612cc1bcc8a6df372a625e875  crypto/property/property_string.c
+fcafd9ac56254e921f43dda47aa6d19ff42b3461ff3a72e0bff1840793f96701  crypto/provider_core.c
+aa58d7800d3ccf2989b0de3c2e2710dfac36c88dc51659129897b0dfd2162527  crypto/provider_local.h
 5ba2e1c74ddcd0453d02e32612299d1eef18eff8493a7606c15d0dc3738ad1d9  crypto/provider_predefined.c
-eeb769fb3f552c7fbb1de4d3725e03376919bc062e8d4fc5ee47f3571206047e  crypto/rand/rand_lib.c
-fd03b9bb2c23470fa40880ed3bf9847bb17d50592101a78c0ad7a0f121209788  crypto/rand/rand_local.h
-426ba915ca65a770f8264129f8ac47db7aaf06c6ae51517c5d775eacdf91b9f6  crypto/rcu_internal.h
-48f6a98e3d7e9ae79f2d2b8ea9965d0c4ec3b1a4473adbceb47fe1e7930dc3c1  crypto/riscv32cpuid.pl
-f6c5a1440de995a115dbba5f732b294e2e6d94aa520687afd1e776af1ba48cf8  crypto/riscv64cpuid.pl
-0b0f3c7757447c2374338f2008c6545a1d176dcbdb41f06873f4681dc43fd42e  crypto/riscvcap.c
+5f077b3d3c0127c9051907f91b7184d18ad045452e0cd891937932c8fb1f129f  crypto/rand/rand_lib.c
+9e162caba63741e3df4d0f1c49a7555263ebc120cfb643546ea7e34d3f5eb862  crypto/rand/rand_local.h
+dce7413b4c4e588c9a099c6fd7c6c9a397e034f259a2027d4ea8bdfe149164fa  crypto/rcu_internal.h
+0c1d3e0e857e9e4f84752a8ef0b619d8af0d81427b52facbd0174e685dac9a47  crypto/riscv32cpuid.pl
+231263dffc16987f5288592ebf4c0738902d5146bfc16bcd8a157e044cb697da  crypto/riscv64cpuid.pl
+fff6a76f42f3caeff8244fffb379240e43570bc6caf25e4721471bc208b2be81  crypto/riscvcap.c
 f0c8792a99132e0b9c027cfa7370f45594a115934cdc9e8f23bdd64abecaf7fd  crypto/rsa/rsa_acvp_test_params.c
-1b828f428f0e78b591378f7b780164c4574620c68f9097de041cbd576f811bf6  crypto/rsa/rsa_backend.c
+aadf059519d33f41b859216246d215330a0c73d18153df580927fdfa6ef51b8f  crypto/rsa/rsa_backend.c
 38a102cd1da1f6ca5a46e6a22f018237964336274385f5c70cbedcaa6997647e  crypto/rsa/rsa_chk.c
 e762c599b17d5c89f4b1c9eb7d0ca1f04a95d815c86a3e72c30b231ce57fb199  crypto/rsa/rsa_crpt.c
-a3d20f27ae3cb41af5b62febd0bb19025e59d401b136306d570cdba103b15542  crypto/rsa/rsa_gen.c
+e666568eadfd01ff3e435364dee2575fca7ff3e6855b2c258fa1e4d04239d933  crypto/rsa/rsa_gen.c
 f22bc4e2c3acab83e67820c906c1caf048ec1f0d4fcb7472c1bec753c75f8e93  crypto/rsa/rsa_lib.c
-5ae8edaf654645996385fbd420ef73030762fc146bf41deb5294d6d83e257a16  crypto/rsa/rsa_local.h
+969a13b951b8a77337fef84437b1aeec49ab1c73ecbceeb4b0df2174ae16a9a2  crypto/rsa/rsa_local.h
 cf0b75cd54b61b9b9a290ef18d0ddce9fb26a029a54eb3f720d9b25188440f00  crypto/rsa/rsa_mp_names.c
 5c60f6e05db82e13178d805deb1947b8eee4a905e6e77523d3b288da70a46bb5  crypto/rsa/rsa_none.c
 cf7e95467a6e6681069ba0c6a0befeb631b499d9b2ab12db0e93967746686f11  crypto/rsa/rsa_oaep.c
-752f35ccaea51eaee693c5b08e8e9909a978d8e79f71dda0b33b3ef72554f6e0  crypto/rsa/rsa_ossl.c
-54446a41065d85d22ed521285196bf285427a071d32d00d070b2248723c2a914  crypto/rsa/rsa_pk1.c
-b0fbf0b55d2afac9b1a1e871bf8cc6f0a41b34cf695c393d97e716536928931a  crypto/rsa/rsa_pss.c
+c3706c33eea448ef1d4fee50034dd9224207261a40cba2e4cc348331a3e72953  crypto/rsa/rsa_ossl.c
+a7e1d7e68d93c1956d69547e2ccf7052965832a2254b2181cdb80580cb76059a  crypto/rsa/rsa_pk1.c
+1ab7069966decfbd479179f137d6d33be2b48eaf4aca5a44c996e86df7aee7d2  crypto/rsa/rsa_pss.c
 bf6d300b7e7e9e512a47c5bd1f8713806ae3033a140d83dfae4a16ad58d11170  crypto/rsa/rsa_schemes.c
 58db0509f34d970a2f206d468f718c17513970315d5d5ec92822fe6f4b6523fa  crypto/rsa/rsa_sign.c
-83529424639f77832d2c189c0134ce514b35a296567ac1a2936a9c4ed6407239  crypto/rsa/rsa_sp800_56b_check.c
+5ded8ea2bfd59110420f865699a2036e59ea5d2c547d02d751b20aa415fb3050  crypto/rsa/rsa_sp800_56b_check.c
 dc0af42319118811e1fa250f1647634f510f9ffcd720ea5141db4fd090938c46  crypto/rsa/rsa_sp800_56b_gen.c
 1c1c2aeeb18bf1d69e8f134315b7e50d8f43d30eb1aa5bf42983eec9136a2fdc  crypto/rsa/rsa_x931.c
-0cfca169d8071429d969d5beccd2b93f824202b4371f29344feb3e06800e3c77  crypto/s390xcap.c
-f5ef5e2b93dd4e4c2d43b684fcbadf500e8fb0e5738d5f480dcb053a2dc3bd53  crypto/s390xcpuid.pl
-c865dba12debe9ad4a0f0b8c078b5c3e614c83a851cf9666cd3c4c7a9992f319  crypto/self_test_core.c
+7b9eaa3a6e4bf0412be6961b2135407a682904dd5ccc63ba2a5438b41e608765  crypto/s390xcap.c
+26a9a2a744a59f4071277b5f03f48897a5470ea6a76ea4494f68a8d05a096f65  crypto/s390xcpuid.pl
+5208fa95788e28d0ce9a22a6199329bf235a203bc70c3bc4c5aa0ba1052d56ae  crypto/self_test_core.c
 8f31ece930473524b73fe7729a71cf925e8083ae8883c179d710c45ce748952a  crypto/sha/asm/keccak1600-armv4.pl
 94751245b4ef1fabb755e8fe53dd0bb26029900e97c4111e5d9a56458ccced98  crypto/sha/asm/keccak1600-armv8.pl
 12b7acce2fba0bc0e1ca07842ec84be6a022f141c86e077abb42c864af1d8d9c  crypto/sha/asm/keccak1600-avx2.pl
@@ -383,194 +383,194 @@ fb06844e7c3b014a58dccc8ec6020c71843cfdc5be08288bc7d204f0a840c474  crypto/sha/asm
 0611845c52091b0208dd41f22ddef9dd1e68d3d92fa4c4360738b840a6314de6  crypto/sha/asm/sha512-sparcv9.pl
 473874a27b031e3d6c3dd0388c7231aa299e07c5832fa7499a081488e6f5680a  crypto/sha/asm/sha512-x86_64.pl
 8725cabb8d695c576619f19283b034074a3fa0f1c0be952a9dbe9793be15b907  crypto/sha/asm/sha512p8-ppc.pl
-e10cd2ff1fb57f3a3b5a9264878910627de989284ed4f78483e5863285f7f26e  crypto/sha/keccak1600.c
+93858e3b530333a129127b8df8cd3326cf55b770238b4fff2474c4e6e3def1dd  crypto/sha/keccak1600.c
 306cacd3f86e5cacaca74c58ef862516515e5c0cafaff48636d537fd84f1c2fb  crypto/sha/sha1dgst.c
-65ca7d67f3e3fc0314ccb179b734530bf1cdbde3d3cf428adc4c402f52e4b394  crypto/sha/sha256.c
-ac714ce14a0b1fe1c0cb5fea9e0e76a188048649c43f3b3a527945ab8554cba4  crypto/sha/sha3.c
-aef204d50f96b636576d8a52f8858fb5a4b2eb14bb60ebc14eb533df7a210e33  crypto/sha/sha512.c
-6c6f0e6069ac98e407a5810b84deace2d1396d252c584703bcd154d1a015c3ea  crypto/sha/sha_local.h
+c7adfc319bcd667608b7cf94d386b57b8d84dac510107c445213d008a219bac3  crypto/sha/sha256.c
+ee90d100405c4d08284e2f72525d523424a4c62b91aa0f8fea8e88ae71582c81  crypto/sha/sha3.c
+a7e074a2f2cea0c33e7875eacc8adb465b5802e4c1d100cda79ac3dd52cdb453  crypto/sha/sha512.c
+61ab6d7d7da9e65120ec59cfa9f5ede785502ae371696c3e4e04e039743ca111  crypto/sha/sha_local.h
 dfd99e02830973ab349409ac6ba0ee901ba7736216030965bd7e5a54356abd7c  crypto/slh_dsa/slh_adrs.c
-1a2e505ac8ef45ff46f36ab89f5fb1d6a6888b2123a7cb75cf0eae849ee5de70  crypto/slh_dsa/slh_adrs.h
-11d3895ea104d1238999f00b2beee4de71f35eea79065ac7b4536ee79d61d2dd  crypto/slh_dsa/slh_dsa.c
+c9b270de1259d9fa71a4d352786357bcf1dd3d22075edab84501e2f8e550b271  crypto/slh_dsa/slh_adrs.h
+2aa41787214996542778a42eaf1bc754809f7d4d31185ac77424a3c686d6759c  crypto/slh_dsa/slh_dsa.c
 ab7b580b1cba302c5675918b457794a3b3d00aac42297312d9447bc6f6a40b09  crypto/slh_dsa/slh_dsa_hash_ctx.c
-c26498960895d435af4ef5f592d98a0c011c00609bbba8bbd0078d4a4f081609  crypto/slh_dsa/slh_dsa_key.c
+6a68c788eee184862cf90676324750fd4f17ca666b628ebc69b3b510d19ba819  crypto/slh_dsa/slh_dsa_key.c
 4c7981f7db69025f52495c549fb3b3a76be62b9e13072c3f3b7f1dedeaf8cc91  crypto/slh_dsa/slh_dsa_key.h
 5dcb631891eb6afcd27a6b19d2de4d493c71dab159e53620d86d9b96642e97e8  crypto/slh_dsa/slh_dsa_local.h
 adb3f4dea52396935b8442df7b36ed99324d3f3e8ce3fdf714d6dfd683e1f9f0  crypto/slh_dsa/slh_fors.c
-ff320d5fc65580eb85e4e0530f332af515124a5ec8915b5a7ec04acad524c11d  crypto/slh_dsa/slh_hash.c
-a146cdf01b4b6e20127f0e48b30ed5e8820bec0fca2d9423c7b63eddf0f19af3  crypto/slh_dsa/slh_hash.h
+5d3855cb2927efa4b28fec4357694bf863ac8dc6556009bdfa800ba16cb80b4d  crypto/slh_dsa/slh_hash.c
+3af167addbfd97f831f2a1981133bf4e2b62b95dc9477767797f7e4a653556db  crypto/slh_dsa/slh_hash.h
 6402664fbb259808a6f7b5a5d6be2b4a3cc8a905399d97b160cdb3e4a97c02c4  crypto/slh_dsa/slh_hypertree.c
-98ba100862bb45d13bcddff79bc55e44eadd95f528dd49accb4da3ca85fcc52d  crypto/slh_dsa/slh_params.c
+1ce9b4f4f90a6f82005c9cdc0ea1f6b6876556c76f8bfd95f4c003a1c195a266  crypto/slh_dsa/slh_params.c
 86b16a2c36d708cb880ba49648bb3051c2997188c8ea6aec9292534b97232c7f  crypto/slh_dsa/slh_params.h
 1aa9dc1c6fe59d024485df9a6b782ac4d0656a31b12faee749fe098911799eaf  crypto/slh_dsa/slh_wots.c
 59db81a3342c0c89b030756168b9a7f09c938b2cd3498335108e0a32c041b6e7  crypto/slh_dsa/slh_xmss.c
 9ef5a01caccc2eb15f72e367d0424737040ac8018479bbbbce3d216c655765c2  crypto/sparccpuid.S
-5056b14a55665ffa342a9a1bb32c1c36886add5d0819869193427f33cee028f7  crypto/sparcv9cap.c
-c50c584c55e56347bb43aca4b796b5344d70daece3061f586b79c871c21f5d1a  crypto/sparse_array.c
-00f5a33a4c0fbba02685519d0fb3de75680619384f8fac30b43b9109ca0e5fec  crypto/stack/stack.c
+b462d1efe0acd798e1ec5f37fd1c824a587e1773e6a6f984d5a332581573ecbc  crypto/sparcv9cap.c
+9e16e8641ac5ec2cb2fcc8e4796af5b698d6fa4ce85e374bd8f5b4edb51e6428  crypto/sparse_array.c
+7eb112f9e86bf53f4382b77464591100cc67d44da90b793ea461c6e9500ca8c8  crypto/stack/stack.c
 c0c4fd0f112465c6766072e25268c2f9019430e2c08c3c0a4271603d24d79f04  crypto/thread/api.c
 e298c753be277ad9a2ac0132d9897cb4c85607dbb2d11cfefd0c98e0f6a723d9  crypto/thread/arch.c
 5c02ff77d290ca0deb19672c1ed6fc0f47a0d630f61398a204a2684a7d418f0a  crypto/thread/arch/thread_none.c
-1506ddf108b99cd192b70dbb00154fbb5e632527fa0ef56796bda4c68f833464  crypto/thread/arch/thread_posix.c
-a00e16963e1e2a0126c6a8e62da8a14f98de9736027654c925925dadd0ca3cc1  crypto/thread/arch/thread_win.c
-27ec0090f4243c96e4fbe1babfd4320c2a16615ffa368275433217d50a1ef76c  crypto/thread/internal.c
-67ba8d87fbbb7c9a9e438018e7ecfd1cedd4d00224be05755580d044f5f1317a  crypto/threads_lib.c
-30c223a6099b9d8aa7bf1a0a258f2ecad2129da2486eb8718f06c846752e234b  crypto/threads_none.c
-1165343988ef28329444e40e74835fc990802eff4b19d9ebcf9840d08849d914  crypto/threads_pthread.c
-a69ba9cc5af710664938759f600430d8a8b599e4d3e5c7bd6e89a4292c8fca73  crypto/threads_win.c
-7edd638df588b14711a50c98d458c4fc83f223ed03bc6c39c7c8edf7915b7cfa  crypto/time.c
+cb214ad206ea69ab98d24a727a47d3a4c614fce709e6b7fe6997dbaeed92f0fc  crypto/thread/arch/thread_posix.c
+f06b08138d73b834471abc4a3ba43b2be838f7196c937c3e933694d6cd69f74d  crypto/thread/arch/thread_win.c
+55953eb5a84d03e8d915ee867ddf8ec8be8c5eb444ea0b21b12a040a57e2c2c1  crypto/thread/internal.c
+2e5955d706b96c487e4875ffbe208fac15bdca06b33cee916d5343978c14efa1  crypto/threads_lib.c
+0585d64ace8f607cde3ae8aba27eb203e2fd648d3226c7b87fc49350b1f53d36  crypto/threads_none.c
+a8815d82ccf819040446fccc42984ee515341d7df14c896bee48d61aea55d2f4  crypto/threads_pthread.c
+794e50fd64df6c4da259bd951117291aebb0859c8a47d657a2524e67df3a850b  crypto/threads_win.c
+93f8fe09f96492a6be6772ddbf0cc37912fc2a90acb7faea378da1735fe20f6f  crypto/time.c
 88c5f9f4d2611223d283ebd2ae10ae5ecbb9972d00f747d93fcb74b62641e3f9  crypto/x86_64cpuid.pl
 085d9fe93adf232f1ff838be9235046c2c2abe2daeb0e6342921d8f2e955dc18  crypto/x86cpuid.pl
-f061000d8eafc58cebc40adc6484a392653a43dad6e1b963e794a87b4c85a7a4  include/crypto/aes_platform.h
-44222ee3dbcc71acf0fc40fcb5f700d307eb843b3d456e11d04539d9613e920b  include/crypto/asn1.h
-8c6f308c1ca774e6127e325c3b80511dbcdc99631f032694d8db53a5c02364ee  include/crypto/asn1_dsa.h
-7a879191cabf49ed390354e776b40b07f3d238a5b4d1e9207357a69de0416b2a  include/crypto/bn.h
-1c46818354d42bd1b1c4e5fdae9e019814936e775fd8c918ca49959c2a6416df  include/crypto/bn_conf.h.in
+0f089e0c6ab4091eebc1d3d54dbd18603fa4f90238fc6512610c3ec3469536ba  include/crypto/aes_platform.h
+8b68c7b69b8da6e729789dbd99d45c341458786e2bc0e2c6c6a341e6792d6b10  include/crypto/asn1.h
+9acd69adc80fbf9fa88fed4bcc7b3c0ba87e2add98d7ba311d8b092a2d5a0d2c  include/crypto/asn1_dsa.h
+21084935a7f88a5926a087832afe8bc6705b1a7813fe226eb4c0df12c753d3a4  include/crypto/bn.h
+ef5ff8ad445370d0c8ef519bb791265bc09eead2ed0a086e1ec06bb7ed846b38  include/crypto/bn_conf.h.in
 7a43a4898fcc8446065e6c99249bcc14e475716e8c1d40d50408c0ab179520e6  include/crypto/bn_dh.h
-76cec717df68b4cbe33cf6fb557c9724ab027a1ab5e06b27eb0294fef2edd75b  include/crypto/cmac.h
+f63ce4d5b80d0927cddd2e0e2d791b96ffa3cc9ef00a4f3ab921ff50ca6bcf50  include/crypto/cmac.h
 66d6f120bef9ff1bb33867a1071a315528a616c0ae0c64fa88d70710cccb8b5b  include/crypto/context.h
-e69b2b20fb415e24b970941c84a62b752b5d0175bc68126e467f7cc970495504  include/crypto/cryptlib.h
-6c72cfa9e59d276c1debcfd36a0aff277539b43d2272267147fad4165d72747c  include/crypto/ctype.h
-f69643f16687c5a290b2ce6b846c6d1dddabfaf7e4d26fde8b1181955de32833  include/crypto/decoder.h
-89693e0a7528a9574e1d2f80644b29e3b895d3684111dd07c18cc5bed28b45b7  include/crypto/des_platform.h
-daf508bb7ed5783f1c8c622f0c230e179244dd3f584e1223a19ab95930fbcb4f  include/crypto/dh.h
-679f6e52d9becdf51fde1649478083d18fa4f5a6ece21eeb1decf70f739f49d5  include/crypto/dsa.h
-c7aafee54cc3ace0c563f15aa5af2cdce13e2cfc4f9a9a133952825fb7c8faf5  include/crypto/ec.h
-adf369f3c9392e9f2dec5a87f61ac9e48160f4a763dae51d4ad5306c4ca4e226  include/crypto/ecx.h
-ac1f521e6ab314b29389ee229f2a1fbed93ba945f9300ee4231e5fe4e7c40ac9  include/crypto/evp.h
-bbe5e52d84e65449a13e42cd2d6adce59b8ed6e73d6950917aa77dc1f3f5dff6  include/crypto/lhash.h
-906bc2316e4f4651e5db7a8273ec3bb4bcbfb55f0f484bebdae4f6d0ce033bdf  include/crypto/md32_common.h
-6a6d2e4cd3195da0bc8eaba09fb9751ab8374b3870364542cceeaac6fc5e1aa5  include/crypto/ml_dsa.h
-21800b12e6ff053fc7fcaec6352734700238b23c275525df92075d4f569b7d57  include/crypto/ml_kem.h
-6e7762e7fb63f56d25b24f70209f4dc834c59a87f74467531ec81646f565dbe3  include/crypto/modes.h
-920bc48a4dad3712bdcef188c0ce8e8a8304e0ce332b54843bab366fc5eab472  include/crypto/rand.h
-71f23915ea74e93971fb0205901031be3abea7ffef2c52e4cc4848515079f68d  include/crypto/rand_pool.h
-6f16685ffbc97dc2ac1240bfddf4bbac2dd1ad83fff6da91aee6f3f64c6ee8ff  include/crypto/rsa.h
-32f0149ab1d82fddbdfbbc44e3078b4a4cc6936d35187e0f8d02cc0bc19f2401  include/crypto/security_bits.h
-80338f3865b7c74aab343879432a6399507b834e2f55dd0e9ee7a5eeba11242a  include/crypto/sha.h
-0814571bff328719cc1e5a73a4daf6f5810b17f9e50fe63287f91f445f053213  include/crypto/slh_dsa.h
-7676b02824b2d68df6bddeb251e9b8a8fa2e35a95dad9a7ebeca53f9ab8d2dad  include/crypto/sparse_array.h
-d6d1cd1ec7581046f5a84359a32ed41caad9e7c1b4d1eb9665ea4763de10e6b3  include/crypto/types.h
-27d13538d9303b1c2f0b2ce9b6d376097ce7661354fbefbde24b7ef07206ea45  include/internal/bio.h
-a8cb407a10e50b1168412bd6ed6af9552cac1326d28c35f91152c48edc42dc3f  include/internal/common.h
-6aaccec4ca8f14a9d6c6b1e6428c1f72147a9c63c45b01107b2a0f29c1065adf  include/internal/constant_time.h
-c5bb97f654984130c8b44c09a52395bce0b22985d5dbc9c4d9377d86283f11f8  include/internal/core.h
-bbba72ba1d0e2985cb316dd9f3bf63893dd58d5624ad7caa10aad81d8b6df0fc  include/internal/cryptlib.h
-9571cfd3d5666749084b354a6d65adee443deeb5713a58c098c7b03bc69dbc63  include/internal/deprecated.h
-dc5afb955d810feb5af9f8d25cd8a92118abef320fee95c07b04f301c4e0d96c  include/internal/der.h
-8059e715f981fbe02b5731610ed24bb6ae617a55e90b03f4260cbb6ccd71e8de  include/internal/deterministic_nonce.h
-fd1722d6b79520ee4ac477280d5131eb1b744c3b422fd15f5e737ef966a97c3b  include/internal/dso.h
-f144daebef828a5bd4416466257a50f06b894e0ce0adf1601aa381f34f25a9e7  include/internal/dsoerr.h
-9bc1bb8edd4874773358832ea0aeab820e08a3b30bc955147208c44d5fd04090  include/internal/e_os.h
-6e33d1c6f82a4483a0e52ee3c9713e123efc5aba0601e7f13078aa45910cd70a  include/internal/e_winsock.h
-c9cb7a25ba2c1a451ba7cca7e165606f891ee8d3e927c06a2e4f84db7f7622eb  include/internal/encoder.h
-70d3e0d5a1bd8db58dcc57bea4d1c3ed816c735fe0e6b2f4b07073712d2dc5ef  include/internal/endian.h
-4838a68ff626825c261df6a1fd21e156e25d8365af45552f29054d7038a7db3d  include/internal/ffc.h
-4c9c4b7fc19615fb480fe18c86521d57313d24a8de556681741054abc2e3a690  include/internal/fips.h
-987958a28eac3411c4b4bf0a5d351c2274caa2a30b6376c21e5777e7c33d962f  include/internal/hashfunc.h
-d9c95e7fe7ae09b2c4aff57eaefbec962cbbeb202ee3cf15950716760c83460f  include/internal/hashtable.h
+273da25316489e04e5dd0675a5e8baf2f9e51080de06bfcd85b29ebbbd7c063d  include/crypto/cryptlib.h
+8a55e7d62cd241e1f37e48ebc0deee22ed793ccfe094c46138a41d856f26e015  include/crypto/ctype.h
+fb109231b7f7fc2e83dd39ec6ef14d88f6ee60cc91ef1efd0c49fa7eeaa50ace  include/crypto/decoder.h
+96632debc11dad16535e48708a3d89df7c2c0cef9843e4bee271071bcd3d15d9  include/crypto/des_platform.h
+9645e766f7536a94ff83136a5023a7f65cc2e99ba4a77a07a812060fc09136ea  include/crypto/dh.h
+df517a9f3b7633667d40b63a17a51e41f9d98633fc1f7b26530198cf41945f11  include/crypto/dsa.h
+2a146319aa6f2788d0c072fcf197b23fd394910a11366df34c1dc4fa2d896e0f  include/crypto/ec.h
+8ab1f61c74e53ae4a99170a2ee64951f16eaf9da54fecaa6e0580381e5ddb89d  include/crypto/ecx.h
+7efa69a026d7f019e0106bc7c9cd393e0a0e161c4fb99108956db428d25780fa  include/crypto/evp.h
+fc22d8a6d80875c8c45c51a449069b936eadb9621aa9c0bcc8c5d493eed1e52c  include/crypto/lhash.h
+394bf7158529c28dfbd0487fa34de70b9252677b5e3e34c98ddc33a250218642  include/crypto/md32_common.h
+44c2fc3942f4b6737a8b666c22da39fb594762d72d2227b6dd87dba49514c358  include/crypto/ml_dsa.h
+d95678b387fab70450767cabe6415392f09a4c6412181d17e908c73724fc0275  include/crypto/ml_kem.h
+b7a00f7e37fb4054d371438f270e67eb584eacb9b13fe29536dac90e8371436d  include/crypto/modes.h
+3940520e7cb800ab573f60c6c0ecfc431436969ebddcbf0fba1a0fec91d9785a  include/crypto/rand.h
+b4fc407f0ed2c4a1795bcdbef3ccdc68be327ae40bd401fcb1066df0a63bda7b  include/crypto/rand_pool.h
+fd4a274688b694aaf010235e6ffd3fd1afd87bc5cee9cae1e4e8be69bf96a5cf  include/crypto/rsa.h
+3f28391ed526d791a578e76a40961592e15ae2bf62b81d5924525e1f21684659  include/crypto/security_bits.h
+70b36014254ca6cbe4126573ea6a71069cc278a6ceaa36412343f19b204c4c13  include/crypto/sha.h
+127ede705ecfa8ec504e57cdee1210c5d7a9044121ff05d1dcf72955958346ed  include/crypto/slh_dsa.h
+8d50d439dd064b66fe349787228435d7a5ba4bc46917a1287c8d876f7faf37db  include/crypto/sparse_array.h
+eb1f4f50bafdd357aa15b54f60f5ecde10876253038f00bf518fbf60840addc1  include/crypto/types.h
+fd5e610fe38804f5de05931706b8efc717663a892f74aa6aee30301ff5e31a25  include/internal/bio.h
+d32565e2b426131dc2415e60a97c94570ca982d29ddd97d2e23d6b9f73b1d81c  include/internal/common.h
+8aa995b12b9fa877110526d5861a7c3403b95aa9d6338e7c3556c54882bad73b  include/internal/constant_time.h
+5170643b2ca16e894d94c9e9fcf8bd80843de0b6539b31b14bf0e4dcaff3f2a9  include/internal/core.h
+76dd589374b0cab4c0e1f84b576348113754068c1782ddc6cdba0bd483c79884  include/internal/cryptlib.h
+cd215e01800987b008be87ccf85823fc98be0c578262a7720cbb6e9ac3dd81fa  include/internal/deprecated.h
+178940dc972f22a8a481a16fd63a86e7468e88cbaa1db5fd68c2b1ae64cb6865  include/internal/der.h
+0dba4a6565caebfef82a8dc90d6ba208b2c61445123724769d5ee84ebbb0a610  include/internal/deterministic_nonce.h
+984b04ad2f0a2036fa157099c3b1ed5300c079a665c8d26d3451eefd06fc1e25  include/internal/dso.h
+e5fcc33def2500935c7706ab8dc1b5d44a4a4135ec8135b9bde55f4d8a4c191a  include/internal/dsoerr.h
+a8fe7b60008099c0efcc5f2ca214c68e91efe8e60f2c99fd89553101cb469b40  include/internal/e_os.h
+4c6d7d437065e39b8609d10aee66855a7820b25569fa06477ec5db818cd2d406  include/internal/e_winsock.h
+f799af7ba63ccbe14c468625c4bf3669cb9405825ffea57435eee7e7973f2fbe  include/internal/encoder.h
+b41a5d9a7bdf60df169e327b41f16489830b82393dd663d1f89f81da4483eaa7  include/internal/endian.h
+9bafa62442fdeda25b97fdbe8e8bf8ea62a5b5167adb2ac7ebbb13db271673f9  include/internal/ffc.h
+0a82ff0abab6ab815f9cb523b9643854346b47ff276f8868d1cbe48efc1b20ee  include/internal/fips.h
+923d4fb14a08f9b251b9bf9727bc50930d0279e8b63243faf85374bdcbbfc4e0  include/internal/hashfunc.h
+a37a58d887ae4331a19179900b8d077afa1174c5152d53dc1533c37a65f319d6  include/internal/hashtable.h
 f6f30785e3eced1ccdd4b149286ff2b8bbb860eb7e070cbe54c997aa022854da  include/internal/namemap.h
-b02701592960eb4608bb83b297eed90184004828c7fc03ea81568062f347623d  include/internal/nelem.h
-3363405b2d6afab68f7e13921385ccb648fe7f77522bd0aa5fdf2d7af0b87660  include/internal/numbers.h
-66f7c420e531383e8a93c1daccbdc4ab64d11e0ed167af1b7f7be54bd61329aa  include/internal/packet.h
-f42d4a6108a18ade3eb99682c072adf83889b6ba3fc80ee3e20929ed8d0f7137  include/internal/param_build_set.h
+c367e6120d26a2b629f4db7e179973e33fb095e1102d5c7a69c744b88ebe4469  include/internal/nelem.h
+eef3ec603b9877bd24a8fa1dbcd7752618fa74943b045515720bb0ca61394ae5  include/internal/numbers.h
+12428b2682bf2bfedb10e351a5201d32e02d1e89e7287f5e86b7bfbecd89a983  include/internal/packet.h
+52686e2cd1049e7b0cd6c6a4085952bb83a04823215c42b1b8e6da19b2511d83  include/internal/param_build_set.h
 5c6c98b1a642b999c909c7cfb91e7925422fbd0b9eca56210ea745bc20668783  include/internal/param_names.h.in
 46d7980258a8d11353af3e3dab87c368eec054e46ac8a0facec68b23ba94d91b  include/internal/params.h
-d4ac19b28ea61f03383364cfad1e941cac44fc36787d80882c5b76ecc9d34e29  include/internal/property.h
-727326afb3d33fdffdf26471e313f27892708318c0934089369e4b28267e2635  include/internal/propertyerr.h
-3f1eeabbcfd18c23d365a3586abb59091b654a741b4970162c88374711d7c975  include/internal/provider.h
-95d21e761402fcbf1d3bdb261e425316b07d2790dd190e4eeaa1e21e40ff9a59  include/internal/rcu.h
-baf5df9b8b91cb5b821ee27348a47364c9dfc86144c9573403e9d54fa970f81f  include/internal/refcount.h
-a01805714966e6de536ee182d5476cb1708d019631f016f331a034cf3b2b3158  include/internal/safe_math.h
-d11b69bed0965e47c3be0e0f44a812a7eb69ae91d7ca8f148a91d6ef6d255a47  include/internal/sha3.h
-9a2db71c880a62946d7c4ed259c5069d689a364a23fc275d97b638517bca8f01  include/internal/sizes.h
-d44d03310e0af9aaf33f2f8552f7ef84ba7612d55ceec48b53bf86d774bbb149  include/internal/skey.h
+ee75ecd35b3ae90c51ace957ab7ce06de3c7d5064b97a878241ff65cc943a6db  include/internal/property.h
+7aeac9a78efb9ea5147f639cd474e6c2538acc1b9d255ba19dc661fe22bcd94d  include/internal/propertyerr.h
+5b108c19f064ec47fffe1b3fe310d4693b6db3920b8cc2e5dc05595751ab0f3b  include/internal/provider.h
+57b423f051395b14b52a5564dc6e4953765efc5539cee1ba01b35779e1408007  include/internal/rcu.h
+b6e33da6011b2b74d27e39f27cf98e6f123fe47826562b6479d0dbd5c758c4c2  include/internal/refcount.h
+f77c0844cc44bd92965647cd8cb6addb210f0300a8d1090da8c26e4382e87c2c  include/internal/safe_math.h
+7d5f4c3db807f108096590f28dd1ae92c05b2af25f827309157e727abb783e7a  include/internal/sha3.h
+8e672cc0620606b044f63b8446125f5233d64e3eea59df54c1fcca6bc90ba537  include/internal/sizes.h
+188be736ff23a2202fe594e6d49a7ccf4c23a7baa86e2dac5d58360f21d9c986  include/internal/skey.h
 abf03dc8635f2925bdc2299feabe115f8d5d6eaa450b421172ded222872386ba  include/internal/ssl3_cbc.h
-24f41a1985fa305833c3f58030c494d2563d15fc922cdf3eeb6a7ea8c135a880  include/internal/symhacks.h
-6b186bc71a3a41681c94b5bf0a201741f15ee5e6e6a3973d5e878ea3de22e6db  include/internal/thread.h
-8a14b0e830da8ace10e661d7b1bca301a9bf2662f0c55e07aef3ff7344142b53  include/internal/thread_arch.h
-640cc6a2aae208073a7f495c08b4c5006a69e8ac1c2d9aaaafd56b0e74d5f859  include/internal/thread_once.h
-634148b5dffee774f7c3e271885cfc69219d403526936e390d4925f209f09630  include/internal/time.h
-d7930b6d7f59dda7b6c39adb76d0be05db90ae7448dde7eae52ed9230ed93e3b  include/internal/tlsgroups.h
-0b41d6646786c16083fa071b788dd9fec0da1c8f715a7e2ad3a05d77520b162d  include/internal/to_hex.h
-7d97636320f6ce993ff6ff15741b90323a32fbeea4960fa64be2eb147063a149  include/internal/tsan_assist.h
-2b38fb6e65d549aca3b2c76907daf67124f395251c0261dec26faa54da8d6d73  include/openssl/aes.h
-8edd30869dcc93e7452d6443b1757383e06f92ee7ade59c6f5c698783f334266  include/openssl/asn1.h.in
-8bc93f8b980835aff9b8e788c3cd6654a8fc5f1405d3934b968118c4b56c282a  include/openssl/asn1err.h
-1550474ee05423896ec4abfb6346f1bc44c7be22329efac9ea25de10e81d549c  include/openssl/asn1t.h.in
-73ff02a145387accef5b019f77f2611c12a70fdc0c0826e34322ac4b65d05326  include/openssl/bio.h.in
-fe5ab4bc904b7c77e5411c4b7dda6d29595eb60a87f00e30ab32f48391f98b44  include/openssl/bioerr.h
-9caa80699882befcce556446a45e5ffde5aa938aa2aae0e8ecd46c9c6a3fe419  include/openssl/bn.h
-9ad8b04764797f5138f01f549ba18b44cf698ffc7fe795fef42c1822d84a6ff4  include/openssl/bnerr.h
-93954e6c450716e158948d67f64736a451ea9473d02f3a908f3bc8a96cf049a5  include/openssl/buffer.h
-9d48e6cab2ee98ae94d7113e4c65f000d97e125fdb3445642865ace3f34d06ac  include/openssl/buffererr.h
-c1f6110f5f8d5faa3805215d8e5877e81e4108cd6d04f73b06d43ba5661d1a1a  include/openssl/byteorder.h
-8e772c24b051e59d2f65339f54584e3e44165a3eaf997d497faea764990130f5  include/openssl/cmac.h
-1342636127f3d365ac538115e706ea1aea43ab8fa79e86756e818b30a72789c7  include/openssl/conf.h.in
-bb45de4eafdd89c14096e9af9b0aee12b09adcee43b9313a3a373294dec99142  include/openssl/conferr.h
-69d98c5230b1c2a1b70c3e6b244fcfd8460a80ebf548542ea43bb1a57fe6cf57  include/openssl/configuration.h.in
-6b3810dac6c9d6f5ee36a10ad6d895a5e4553afdfb9641ce9b7dc5db7eef30b7  include/openssl/conftypes.h
-28c6f0ede39c821dcf4abeeb4e41972038ebb3e3c9d0a43ffdf28edb559470e1  include/openssl/core.h
-940f6276e5bab8a7c59eedba56150902e619823c10dc5e50cf63575be6be9ba0  include/openssl/core_dispatch.h
-d37532e62315d733862d0bff8d8de9fe40292a75deacae606f4776e544844316  include/openssl/core_names.h.in
-57898905771752f6303e2b1cca1c9a41ea5e9c7bf08ee06531213a65e960e424  include/openssl/crypto.h.in
-628e2a9e67412e2903ecb75efb27b262db1f266b805c07ece6b85bf7ffa19dac  include/openssl/cryptoerr.h
-bbc82260cbcadd406091f39b9e3b5ea63146d9a4822623ead16fa12c43ab9fc6  include/openssl/cryptoerr_legacy.h
-83af275af84cf88c4e420030a9ea07c38d1887009c8f471874ed1458a4b1cda7  include/openssl/decoder.h
-503b45367b035ddf6e54587125c2100ceec324d646e6f3df92c12513185e977c  include/openssl/decodererr.h
-fa3e6b6c2e6222424b9cd7005e3c5499a2334c831cd5d6a29256ce945be8cb1d  include/openssl/des.h
-0837b1ec7074b37d2e1d5ac46d6003c3fc4f1ff10f2e44c64b5709b0bacec4e8  include/openssl/dh.h
-b74a54335bb2f55caacd5c3fd10db3575166fc35077dc5740059243f70e0b179  include/openssl/dherr.h
-3cfb7211419c5dcc98b9a20713e2245befa0182a10615edb89a5ce0a0725a787  include/openssl/dsa.h
-276d1f6e111ba933bc708e6a0670047cbe0d0b67aabe31807abbbc231de4d8cf  include/openssl/dsaerr.h
-25bcf84a034502eaa16354c61bb9a2f2f3d607b2f343bbe7fa1f1e810a353db0  include/openssl/e_os2.h
-bc9ec2be442a4f49980ba2c63c8f0da701de1f6e23d7db35d781658f833dd7b9  include/openssl/ebcdic.h
-49e8a9d226d543ac482cecdc01c83b7ccdfbfca6ad92d690aad75a245148e2ab  include/openssl/ec.h
-7aa8c5bee779af59d4733f6a50f7f6be39f1eb43409e5b3357440f9a7d0ca115  include/openssl/ecerr.h
-61c76ee3f12ed0e42503a56421ca00f1cb9a0f4caa5f9c4421c374bcd45917d7  include/openssl/encoder.h
-69dd983f45b8ccd551f084796519446552963a18c52b70470d978b597c81b2dc  include/openssl/encodererr.h
-aa02455482d744418123266f581b9b4310ba678c7d28c10fffc5eec74ce3c8ef  include/openssl/err.h.in
-29ea398f6a2dfa3d42516030f4b5e6b1de06bbff4326ae42a7e63e2380abe33a  include/openssl/evp.h
-04f901922c5b607b6f1fbcd8e9510e9475e3060d6901517b52ae8a5ed0f0065b  include/openssl/evperr.h
-f37c13a7cc0b05a734efcafb7da321dcc366090c255da8ee532e5f2be2eaa152  include/openssl/fips_names.h
-fef2b79b4de2cd74b02f12f1c0515cb2eaca742b8ded67fce722fb417e818e25  include/openssl/fipskey.h.in
-47a088c98ad536ea99f2c6a9333e372507cb61b9bdffb930c586ed52f8f261eb  include/openssl/hmac.h
-aef20807146a62481c0dbd6c86b818a84fdfd877601738b4e51afc944ec3d59a  include/openssl/http.h
-3644c7094fd5310a103aa9adff947ad9aa87e0a48432471a4ca10b4885d215d3  include/openssl/indicator.h
-faab8accc9520269dd874126ae164a43526d5784e6280521c7ab3772c02b0a0c  include/openssl/kdf.h
-625258d115ddc5117eaa2ff126e548e25fb81336abead079e6f2028f4bce4e92  include/openssl/lhash.h.in
-348e5a4083332bd3076e7195d31894405aa9acd3655fc090074b316f481c5f46  include/openssl/macros.h
-a8a45996fd21411cb7ed610bc202dbd06570cdfa0a2d14f7dfc8bfadc820e636  include/openssl/ml_kem.h
-9184207c562fd1fa7bd3a4f1fadcb984130561279818f0cdfcf3e9c55be8a7d1  include/openssl/modes.h
+780bf5e9a5852e8776a3b9984993a91f27f3f7b1501e1b2185f5a8f448b0d848  include/internal/symhacks.h
+fb5bdada32614d7214569dc111b8bbc43592886799f0536b844a64a2541727cb  include/internal/thread.h
+a8fa7ddc1e54ca296bda9ee05a7a39bb7e803eb0567cc75a9b949b80cada7552  include/internal/thread_arch.h
+1cc86957e734ce34acd949b9e9e9d588a6c82afb68a09c787fb69f5e4cb20b1a  include/internal/thread_once.h
+d9f5e7c10f41913a25f1ef89bedef6070ed3b8bb3c6ae2fe9f7d8993082d86f4  include/internal/time.h
+2a4f456b95ae6c60a1bd7be966400f7aa12f791ece6f2d31a22acae6fd77c623  include/internal/tlsgroups.h
+79db205cd380711f09748b4ab020442050acaa0a8a940e2be38c4916e23dd1ff  include/internal/to_hex.h
+47c827eb0766d6aa82cec54648fc57b33a3dfec8539cab7bce161cf73455abaa  include/internal/tsan_assist.h
+0eea6c204f1b202ee75407a1f5fb2a13715169ec3c0fc675d9e2ea64d13f25dc  include/openssl/aes.h
+17136e1636365f445ffad27a1fa41aa5e148429d38538ee273034b38a72cc8ba  include/openssl/asn1.h.in
+0e28b492fc1f2da095ea42267480c9961a4f8cde3314e409f90395af8c65357e  include/openssl/asn1err.h
+77a9f9595cee6448c6217a8388127593a34a0d0a585197a5f8100fcb792f76ec  include/openssl/asn1t.h.in
+1af8a6c86dedb83887e9baae99ea7dba6576eeb6a991f62865b10d5efdd9d6fa  include/openssl/bio.h.in
+40491414172d977a4667589fa2f269d7deaae675555b8348d96f315d1a6253bb  include/openssl/bioerr.h
+ab010281395418d482e30ddad9510e470c3420aea0c30f9072e3dc8516ac3037  include/openssl/bn.h
+c506c9bfbac7368335fb2a8a627755ce2b8547a251d885242a89c9f8ff3bf079  include/openssl/bnerr.h
+c70499c9109b083beb69d1b17807266b041d0ff28694d5bc1ab7cf2a59331c39  include/openssl/buffer.h
+5bce6559638266f060eaa16b3b90738bbd5292d62230b6b3b1e22b88836a5030  include/openssl/buffererr.h
+2a83e38101abb3c2da0e07f9bf7012d8167a3c1588df65c36652c4f72aeafc27  include/openssl/byteorder.h
+3c38e3f1d500263b971b851b1c92b69a29252b44991e8afaaf3c36ceda1dd700  include/openssl/cmac.h
+1cd9648cc536f25cff10656096ebb1d9353adf3ad855d1c25a22b142ec1705e0  include/openssl/conf.h.in
+3517c480b3211d384d4b36fa48d8dce8923fcccd99fefae68635b3f82eb0acb6  include/openssl/conferr.h
+4e195b6f7a734756e21c4269cc245b292e1a563aaec5644402929d0eac423c41  include/openssl/configuration.h.in
+f76830b31c947d86c2e6a302ab8df6b83076f8d29120bce9a58195551eb48e1a  include/openssl/conftypes.h
+a013fca5cc6b5cc26eb1c76eaeba31e99408e88fe89c343a44cc0b22f8e63eab  include/openssl/core.h
+06eff5fb11c68f0fd4b70b0162517647afeefeff345e2541f7f2d820c97a8d95  include/openssl/core_dispatch.h
+b47e5195bcf209e120858a2c671eaf0589fbd1baf1c5f69237ab94651772808a  include/openssl/core_names.h.in
+e623d4e8d36d7e0f0825fe5cb48e1176be19c0bedc5053fce488aa48602f351c  include/openssl/crypto.h.in
+128ef415305b704d51461ab98c688c69fde868acb5f5f74c92b2d0517823e71a  include/openssl/cryptoerr.h
+9a636172a3453f4e23b48198effdd92dee425c9359996b498e388a3d21d16dc5  include/openssl/cryptoerr_legacy.h
+a147bf48583b902b3db0d30dd2a9565f1c9f3ec94dd57652e31be4c67b7d2593  include/openssl/decoder.h
+8d8a2f1286cf40264a80e090d377edaabfa4b040dc0e5314ac41406e0dcb0fdc  include/openssl/decodererr.h
+402c76d3a33378f6dad64778503581e4f80e2ec46ac24c84646234a06acac5dc  include/openssl/des.h
+f5c9ba84d4395938de063bcf9946ab73b41432f6e60e7c1a47f369b5d07041f8  include/openssl/dh.h
+5658c7f5cd57d74c7644c63c6328e80469fab9d3e29dd734f1433cf3019dd4ab  include/openssl/dherr.h
+5eff0626259806221a6dff0e6b50de3298444e3e82a2464cfe2ffce32f1c2f3d  include/openssl/dsa.h
+d526f8def9e4bb31ff85dbc9494e6b3fe1ab15f424a8e53b3b8fff9dcc40c803  include/openssl/dsaerr.h
+b18230928e536447af72346cf8d98da599c99f8fef74bd5f7bdd7a8dbb012f33  include/openssl/e_os2.h
+fcb8e2174725eef1279ba8ed046e56c99805796a13eb789ff78aadf7a73e6c76  include/openssl/ebcdic.h
+b1b7e6f9a0d0e5fc3d37ef73f0eac099cb6164c2cd4dfc750c3607f6e0736598  include/openssl/ec.h
+9c56b594bfde630c9b8df2fe0c691c74cf79fffb1c1b5e2034ade844e6e3c7d3  include/openssl/ecerr.h
+a2f2fccf0c06e6bb81eed9cb396d61b530fe306e40cb63a94b09067e22077b22  include/openssl/encoder.h
+28c28e8ab2b5ee05f96f2fb0800bbbbcffa63309dbec140dca7866ba1265d225  include/openssl/encodererr.h
+19ac60a505cbd27dcdb1b81993695896777e9743932b320aec60508538943c52  include/openssl/err.h.in
+022f402ced258bc1ee64ffacaa958b6f07a0973af6dc5a2ebb316d5043b57947  include/openssl/evp.h
+19f97e48aa1ecd695d296218e454db62f860ec858d865466c9134e71939b9bee  include/openssl/evperr.h
+587fde964a9a71b8e1086daaf43af4c931f86a156eff47097804ef4762430a0a  include/openssl/fips_names.h
+f29f8b7f23486e11b5307234d0f3efc56afc9a1321ac9792429493fadeb4a08e  include/openssl/fipskey.h.in
+e7b4468f152d139d17354eec68771432729d10757e7b3232f48699c250681e42  include/openssl/hmac.h
+a7c65894dd0f3730769d56a46bc6e4777c9bd7c8826998373d2ccdd9a346f840  include/openssl/http.h
+1dc0dce58de44226fc0afb51073c39933fb65dfd3a0131c4eff17bcb93018665  include/openssl/indicator.h
+36b0013002d44397aa41b021ec13433230221aa9722ce5fc31648f08d27ac448  include/openssl/kdf.h
+f4a6b9adcd0158222878f5c55e3b40c620361d328bc624ce22d4937c0c054fbf  include/openssl/lhash.h.in
+e7753bdc658187d6ac5fb51902c79bff929f3ad416fd907c02cd34568a30864c  include/openssl/macros.h
+0da95b5743f5c12ba1a30c1ef84f9fe57ccd5816febb1b5fd3a4f573ec885cd8  include/openssl/ml_kem.h
+06f0d4621c344401f280a4e69e48ba987a0600b7f52ee16b25c4620277b081f9  include/openssl/modes.h
 6d40e3edc18bac56826b2beb9439e7e43a680867a0a9ae1d3f75e07dc72b024d  include/openssl/obj_mac.h
-cb6bca3913c60a57bac39583eee0f789d49c3d29be3ecde9aecc7f3287117aa5  include/openssl/objects.h
-d25537af264684dff033dd8ae62b0348f868fcfec4aa51fa8f07bcfa4bd807ad  include/openssl/objectserr.h
-fe6acd42c3e90db31aaafc2236a7d30ebfa53c4c07ea4d8265064c7fcb951970  include/openssl/opensslconf.h
-1bf52d136e94f727a96651c1f48ad040482f35dae152519ccd585efd410b92f0  include/openssl/opensslv.h.in
-767d9d7d5051c937a3ce8a268c702902fda93eeaa210a94dfde1f45c23277d20  include/openssl/param_build.h
-1c442aaaa4dda7fbf727a451bc676fb4d855ef617c14dc77ff2a5e958ae33c3e  include/openssl/params.h
-44f178176293c6ce8142890ff9dc2d466364c734e4e811f56bd62010c5403183  include/openssl/pkcs7.h.in
-8394828da6fd7a794777320c955d27069bfef694356c25c62b7a9eb47cd55832  include/openssl/pkcs7err.h
-ed785c451189aa5f7299f9f32a841e7f25b67c4ee937c8de8491a39240f5bd9d  include/openssl/prov_ssl.h
-7c0e616ec99ac03d241da8def32cebf2679d9cacc93f58d2c2c4b05faf0011ea  include/openssl/proverr.h
-01ecfa6add534dfe98c23382e0f2faf86f627c21ce16c5b49bf90333fb4cac9f  include/openssl/provider.h
-765846563fbd69411aff6ce00bcc22f577f6407f5a80d592edb1dc10b580a145  include/openssl/rand.h
-1c135b1e5ef06e052f554d52a744a9a807a8c371c848389ad836f9e4a923dd8e  include/openssl/randerr.h
-2f4f0106e9b2db6636491dbe3ef81b80dbf01aefe6f73d19663423b7fcd54466  include/openssl/rsa.h
-2f339ba2f22b8faa406692289a6e51fdbbb04b03f85cf3ca849835e58211ad23  include/openssl/rsaerr.h
-6586f2187991731835353de0ffad0b6b57609b495e53d0f32644491ece629eb2  include/openssl/safestack.h.in
-b0c9ed3ce37034524623c579e8a2ea0feb6aab39e7489ce66e2b6bf28ec81840  include/openssl/self_test.h
-a435cb5d87a37c05921afb2d68f581018ec9f62fd9b3194ab651139b24f616d2  include/openssl/sha.h
-c169a015d7be52b7b99dd41c418a48d97e52ad21687c39c512a83a7c3f3ddb70  include/openssl/stack.h
-22d7584ad609e30e818b54dca1dfae8dea38913fffedd25cd540c550372fb9a6  include/openssl/symhacks.h
-8acd8147402a816c835b4240e18972072bab41d3fb6ee364fc17e543d6a854f6  include/openssl/thread.h
-f09bc8a337d80f65dafb281a1c129a258e51ec320bd35f82b8baff780f22dadb  include/openssl/trace.h
-164a4df1283504b2a08a0682e722ebced269ad0660382f6cba74063b013a2165  include/openssl/types.h
-19ef0ff7da7c46425f8425745de75a24eed318abc0d715f1ac4095257101d5f3  include/openssl/x509.h.in
-81b3468e98d4a94b8ea95517f38b440feede2dbbba610e47ff2f0a694cb55015  include/openssl/x509_vfy.h.in
-ef9e7c7a2176cf1b3f2d0c52b7cc1f47ad0666fbbd8a9479cbb39b7bf0dfe06b  include/openssl/x509err.h
+a4127bd23a35828e90addb54b6a1cdfa6a1864038690fcc63053604629fb6f3f  include/openssl/objects.h
+884f19dffa0b6e0f03fb565cc61cf800993eafe7fc9df0ca2feef67e3b199963  include/openssl/objectserr.h
+429571177fe9a2ce5fffce21697ecf197bd9b645bdbc578a146418ce8286e9eb  include/openssl/opensslconf.h
+76386f806a801eba4c0172c52dc0e04e2deb192aa867f9d3e9d98a4d5a932d4a  include/openssl/opensslv.h.in
+4c4640740b5de9debbc82bcb5b3e02282c145e440e40dea478a804b8c3498065  include/openssl/param_build.h
+a9d03ecff3e67ba62eeb03663843148607c0b15c1a91ba3e28d4f7c5335c31bc  include/openssl/params.h
+2fa9d02862a00a33fd3841640654fc705ae3d88cb91c1978fa09e87bf2976504  include/openssl/pkcs7.h.in
+2b25ec134dace5f5e1b0d52650d72c61c2243720358c0b3e645ad956b27d897b  include/openssl/pkcs7err.h
+a15b0b69bc1e31d0091ad32f04021d4fba9750cf9e3c9c0d2509358543cac380  include/openssl/prov_ssl.h
+21a6860d346cfed56d6ba85424a9725bcfc30105697d942b51fe11a4cf7f52d2  include/openssl/proverr.h
+d0fffeeaf8a20f6c86e8a6bfaeb1eab7c00188b1844c109ead4232c8dfb3705b  include/openssl/provider.h
+c467dcada2506c820e2dcb002dff9d797aaf9527c8778871d79d79a93bc673e7  include/openssl/rand.h
+23d76dfea708747bdc2ffac41e25b156a22d2d0cb744323a3b9859c54bfbb98a  include/openssl/randerr.h
+c477f6a040cbd444318469a9f5899d368b4e42680ab7337f6859549bc55cf2af  include/openssl/rsa.h
+6f79765285a8244f6c1858b86db8e390e4bc6c7905a7e4576973316612f7b015  include/openssl/rsaerr.h
+546e4277a9897ed5c01b9ab30168e82f4acf9a6a20da430ebf7dd698d5f888fc  include/openssl/safestack.h.in
+695683de2485c3b83d9116877f5d5ca3eb84a3bbb599f6bb02c9e595e7102b41  include/openssl/self_test.h
+4ab7b74e5d3810eac254c05b74a26a33af9ed526a06530feca758276593d3b2f  include/openssl/sha.h
+07f25b18b5acfb8733db85a258c6f3aac0c8f436f0a3095c8d885a741f6287f4  include/openssl/stack.h
+d381d0b4113f0fa18b3e421eae303fc84daf84eacb1236cb6e9976409a2d33a9  include/openssl/symhacks.h
+fc527427bafa6862d9e3847c961dd6cbbcccc39d25762c65ad3b99fae9599e2e  include/openssl/thread.h
+a481e8762c694b3dac0e74aac8626fe60fa94962a14914f1f6969ea1214c40b1  include/openssl/trace.h
+1e0253d1f5487b8e92c39f8c3a15ee3030625c4d9735f9cdbbcc9974c213e925  include/openssl/types.h
+62e0cddeedfc217ac02bf37f3669ccea8d0822a88a74a8ec82b844a85b2700aa  include/openssl/x509.h.in
+869959c3d557d2ace84f38b7a8d0f23b3b0854de7f952f46310e828af04554dd  include/openssl/x509_vfy.h.in
+5dbee881fe4e1f08a773e8bd34eeda7639be7c474a3d4d6e7c8d779e19c7eb2a  include/openssl/x509err.h
 c0a9551efccf43f3dd748d4fd8ec897ddaabbc629c00ec1ad76ce983e1195a13  providers/common/bio_prov.c
-4786999b1fd6933b05f21abd7033451fbd56e1d842c620cf65160ac22d03791f  providers/common/capabilities.c
+6d25e1b61731cc558c2f801350d0cd874d3c19a3b0a03f52394c11fcaf2d51a5  providers/common/capabilities.c
 f94b7435d4ec888ec30df1c611afa8b9eedbb59e905a2c7cb17cfc8c4b9b85b8  providers/common/der/der_digests_gen.c.in
 424d7b2ece984a0904b80c73e541400c6e2d50a285c397dd323b440a4f2a8d8e  providers/common/der/der_dsa_gen.c.in
 27ff361a5fbfc97cd41690ab26639708961d0507b60912f55f5919649842c6ae  providers/common/der/der_dsa_key.c
@@ -583,7 +583,7 @@ f3b089fd3dcccc8e3ebfbbdbf87c47d58330f82bd0e2a1223da74977930cccf1  providers/comm
 4132ea0bbb9dcdc44d90ca072b7a8d715dca0875d426aa12d770e60d5f0d46cc  providers/common/der/der_ml_dsa_gen.c.in
 341a74d94c93a9fbe663e489801fa586d8ff306615e230d2b1c74354003c90e0  providers/common/der/der_ml_dsa_key.c
 5b3b0ae8da0fad1f7ba8b5fba2206210884728bf69a8aa00644036eb51953467  providers/common/der/der_rsa_gen.c.in
-029aec80a45b477f7c8bd8d24d48e36de92f8056b421e9f128c336dc246dbc4e  providers/common/der/der_rsa_key.c
+6faa11a45867a626a8d9b63fc737867625cb1d15010bfe05ae6ae167be491e63  providers/common/der/der_rsa_key.c
 7e8d579986f53eaf1875d677e5cf4adfd4ccf79db0275368f6cac580ab6007ca  providers/common/der/der_rsa_sig.c
 3c0fa8fb3050077f82176790b0a06ac88891ae236fbc918b18d1ae7e75c0da94  providers/common/der/der_slh_dsa_gen.c.in
 5d0e18a680f82632bda6ee9fb9ef61993ce0f2bc9884451e946a25130f27fc99  providers/common/der/der_slh_dsa_key.c
@@ -598,135 +598,135 @@ ceea7616712e6ec4ff475a806998d66354d228f634e733a75e345bf78da32958  providers/comm
 ce605f32413b09d33ce5795de9498a08183895c3347f33344f9ae5d31c29ccac  providers/common/include/prov/der_rsa.h.in
 a36d6762f74d9ac4f437e634e60f2b4de1ff5416bb6dd5d2cffe2e4556556b1b  providers/common/include/prov/der_slh_dsa.h.in
 6c1fa3f229c6f049c3ac152c4c265f3eb056d94221b82df95a15400649690e93  providers/common/include/prov/der_wrap.h.in
-76087f04f4de6414c240f88807659fb2a04af914108f0c5f2515a4cb5482f655  providers/common/include/prov/proverr.h
-59786e2e358912d977ba792fb387d2df0156cac16267e399a1c93b3b0b65f725  providers/common/include/prov/provider_ctx.h
+e5c7da25b919ac4d2d84f21c9d552f29c2b06ba4445401bd4e361be45f4f8d30  providers/common/include/prov/proverr.h
+dff610c91cb41d9d6ea4084119d496a7e1d7973fc7831323d4b353f2b57acdfb  providers/common/include/prov/provider_ctx.h
 c02d1fa866192dee1bf6d06338714efad5e7cae6ac0470ba20820599b4f811e8  providers/common/include/prov/provider_util.h
 f221ca9b117c9cccb776bb230f71b86553ce6c24196bea120124a4be7b8a712f  providers/common/include/prov/providercommon.h
 4a6e35be7600e78633324422f019443747a62777eba4987efc50f900c43fda25  providers/common/include/prov/securitycheck.h
-ba12773ee7d5afbd55e240798a0e36a2b0bdb4472f3aa3984bb8059f68cfba25  providers/common/provider_ctx.c
-c67989723273186af8d0fa7019fe5564957a21dd9867645cfab6ba54f8871df4  providers/common/provider_err.c
-c4032b7cb033b588c6eb0585b8dfbed029d5b112a74ddd134dbcb1d78b0f9684  providers/common/provider_seeding.c
-976aed982b0091a8f5320ee15e9b3d56c638c2a6b8481ddf9478d07927522f82  providers/common/provider_util.c
-bde6107744cf6840a4c350a48265ed000c49b0524fa60b0d68d6d7b33df5fce6  providers/common/securitycheck.c
-8ea192553b423e881d85118c70bcb26a40fbdee4e110f230c966939c76f4aa7e  providers/common/securitycheck_fips.c
+f3e31bd6776b55c924bbba8ad0f0727096b1d407b1d8b22f1f1a0f969a03fc4f  providers/common/provider_ctx.c
+3e6952b454f26cf8e2fa953bb3a75da76b1c3d634f1e42107c75b859265618fc  providers/common/provider_err.c
+9c835f67256a6657b04ad7c2bb7e724aa40cc8b636a06e9409026758bede799f  providers/common/provider_seeding.c
+ca5a852a6aa77140bd3cea619bd48f8e807a6be4ba5cd760b1790189fc16dc19  providers/common/provider_util.c
+b10730f4d302344579c09f43d5f9c5538bb6b4acd60de7430c24269fc522d5a5  providers/common/securitycheck.c
+e2f8f00519d81aa16f1c30e8cbf9a0d8e898a1cb5c8b38bb01dd9ab513e34c9e  providers/common/securitycheck_fips.c
 abd5997bc33b681a4ab275978b92aebca0806a4a3f0c2f41dacf11b3b6f4e101  providers/fips/fips_entry.c
 d8cb05784ae8533a7d9569d4fbaaea4175b63a7c9f4fb0f254215224069dea6b  providers/fips/fipsindicator.c
-6d9c45b756b3e64fb31b3fdf75a4d93f8a71b7dc6c5d2cd842ef9d3a8ec445e4  providers/fips/fipsprov.c
-7be8349d3b557b6d9d5f87d318253a73d21123628a08f50726502abf0e3d8a44  providers/fips/include/fips/fipsindicator.h
+0c473190a4b6809caed57997e44ee9ec949bcf01c542633e2881d07c809d3a51  providers/fips/fipsprov.c
+8f52eead96febbce9e7f2bf5aaea557efe8f94ce078044959e80e5ae78432539  providers/fips/include/fips/fipsindicator.h
 ef204adc49776214dbb299265bc4f2c40b48848cbea4c25b8029f2b46a5c9797  providers/fips/include/fips_indicator_params.inc
 f2581d7b4e105f2bb6d30908f3c2d9959313be08cec6dbeb49030c125a7676d3  providers/fips/include/fips_selftest_params.inc
-669f76f742bcaaf28846b057bfab97da7c162d69da244de71b7c743bf16e430f  providers/fips/include/fipscommon.h
-1af975061d9ea273fd337c74ccaab7b9331ab781d887c4e7164c5ac35e2c2e94  providers/fips/self_test.c
+7b80823bb5613e17e8576789ec77712d89c81e7beb6ce50b58037e925e465abd  providers/fips/include/fipscommon.h
+44a6e7b590de3d8a7711ac373348e4c9bc7a24dd57759897f2cb5db2cd8bba62  providers/fips/self_test.c
 5c2c6c2f69e2eb01b88fa35630f27948e00dd2c2fd351735c74f34ccb2005cbe  providers/fips/self_test.h
-9c5c8131ee9a5b2d1056b5548db3269c00445294134cb30b631707f69f8904f1  providers/fips/self_test_data.inc
-2e568e2b161131240e97bd77a730c2299f961c2f1409ea8466422fc07f9be23f  providers/fips/self_test_kats.c
-7a368f6c6a5636593018bf10faecc3be1005e7cb3f0647f25c62b6f0fb7ac974  providers/implementations/asymciphers/rsa_enc.c
+df83c901ad13675fbbb4708b6087feba6099870ad3dd0e8d09cfdb6798419770  providers/fips/self_test_data.inc
+bc58582893d748a0a61662cf9363ad73c91f35f2956dbcafc8d1ed37039b15d3  providers/fips/self_test_kats.c
+d942921caa433ae9e62959b0ad1caad277b50d005ffc439c6d0e7b0886dba882  providers/implementations/asymciphers/rsa_enc.c
 c2f1b12c64fc369dfc3b9bc9e76a76de7280e6429adaee55d332eb1971ad1879  providers/implementations/ciphers/cipher_aes.c
 6ba7d817081cf0d87ba7bfb38cd9d70e41505480bb8bc796ef896f68d4514ea6  providers/implementations/ciphers/cipher_aes.h
-c20072ecf42c87f9fad2ea241d358f57ed2a04cf0cc51bdb8cb5086172f6fc8a  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
-7668e5c1cac474ad7b0f28aa78ca885edf44815fe4a606a6cd328b3c02fac25a  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.h
-26e0f28523b416ba4067e471061f5a11fd76f5dc8bfe57ce37a137cf5667630b  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c
-6d2ab2e059ef38fad342d4c65eebd533c08a2092bb174ff3566c6604e175c5a4  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c
+693a3a667bf13d3703601dc4d1daca9d890ca4f193ba26b8d77571f79507de16  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
+1b4f19be0c2bbea99e5fce0f93189c687a03cac634f0e37a51466ee7e3510735  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.h
+a579a933e7756b502510a42679e06dca2737bda9e53edda578e28eae56b98577  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c
+4e5e5c6478cf72f6840aa5d9edc50fe27aaa3ea39a428f602056172b0f00d541  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c
 1b6d31811a6729f0c75c7c7ccfb7d3a75ab6001605b229593187918a592da789  providers/implementations/ciphers/cipher_aes_ccm.c
 00f36bf48e522dbb5ec71df0ec13e387955fa3672e6ff90e8a412ae95c4a642f  providers/implementations/ciphers/cipher_aes_ccm.h
-4812d59ab6e1380f38e0c7cc0d7995eb6a2abf1438cedf233b939a17c4111482  providers/implementations/ciphers/cipher_aes_ccm_hw.c
+8049497bb1a3a6d5549d25ab31cf43afdf2e97ca789caed6502c19da3be44ae8  providers/implementations/ciphers/cipher_aes_ccm_hw.c
 302b3819ff9fdfed750185421616b248b0e1233d75b45a065490fe4762b42f55  providers/implementations/ciphers/cipher_aes_ccm_hw_aesni.inc
 a8eaca99a71521ff8ac4ffcf08315e59220f7e0b7f505ecddad04fadd021ec14  providers/implementations/ciphers/cipher_aes_cts.inc
 14de031ae6a95653f7d819bfdb2abaf873f884b8313901bee4c2ec3ffc286712  providers/implementations/ciphers/cipher_aes_gcm.c
 79f5a732820d2512a7f4fc2a99ece7e6e2523a51e62561eb67a4b70d5538b0c4  providers/implementations/ciphers/cipher_aes_gcm.h
-c6f091629dadb1b0b55e45636a28c31268fea4abfd3c068917c6c94b9aab704d  providers/implementations/ciphers/cipher_aes_gcm_hw.c
+68fcbf7b1a8e801fcd2f5bbc2ed1f834feeb5572cac83c1f8aae82ccfb2815ab  providers/implementations/ciphers/cipher_aes_gcm_hw.c
 be18c20e0197f25fe7b9e0268657a2271a69d216b89cb100f082fa5fcaad1e07  providers/implementations/ciphers/cipher_aes_gcm_hw_aesni.inc
 60c4f604cf9b5457be48f31cc24ca21729660381081b2dbf99f362a013a09684  providers/implementations/ciphers/cipher_aes_gcm_hw_vaes_avx512.inc
-d65415e14317e58673808b90a4dcd9aea47ae1ef2250edc1a8f1b872f0e9b1cf  providers/implementations/ciphers/cipher_aes_hw.c
+e2886780637db72b12c9bc488d81647ed55a7f5c850efd4bdbf88ef7127e1913  providers/implementations/ciphers/cipher_aes_hw.c
 89de794c090192459d99d95bc4a422e7782e62192cd0fdb3bdef4128cfedee68  providers/implementations/ciphers/cipher_aes_hw_aesni.inc
-087421bd0dde41d944dbae3ef9b262502d80425b9badb28aaa2a27c887259d98  providers/implementations/ciphers/cipher_aes_ocb.c
+e691fd1ee71c40bc76b01bbe2a6f027496a210a2e49e20908b87033552fc8c52  providers/implementations/ciphers/cipher_aes_ocb.c
 88138a1aff9705e608c0557653be92eb4de65b152555a2b79ec8b2a8fae73e8f  providers/implementations/ciphers/cipher_aes_ocb.h
-634cd29f13e5dd8ced3467504e8313b454a90371735ef42a5fe82c027b473064  providers/implementations/ciphers/cipher_aes_ocb_hw.c
+6c3a89771719b36d6917d23464be5441836378393731af96ba165fd788df1a41  providers/implementations/ciphers/cipher_aes_ocb_hw.c
 c7aac28a9dca1ad46e5bce4de93e07dffec1f89fab82394c3ff7cf1bda8b483f  providers/implementations/ciphers/cipher_aes_wrp.c
-8ee40234d051dfd9557439001d5d9f43d86623e23188a05ae00df99553cb4dca  providers/implementations/ciphers/cipher_aes_xts.c
+64a3b4a93173d10dff623b65821eaf141e2cbb081cc0bc7199797ead714a8742  providers/implementations/ciphers/cipher_aes_xts.c
 ff870fcdc063e2e9f99693e4dad5f2128130591b05928bb5395f60ddcf81b1cf  providers/implementations/ciphers/cipher_aes_xts.h
 281157d1da4d7285d878978e6d42d0d33b3a6bc16e3bc5b6879e39093a7d70da  providers/implementations/ciphers/cipher_aes_xts_fips.c
-4f1f7258fe58651d9714ac7c3cfb30df2b49e7c14619c1acb8e5cf3d1fd5ad26  providers/implementations/ciphers/cipher_aes_xts_hw.c
+ad271c002ce6a8e23ee928b2131f7bbeaf864dbaa381b6c6d18dc1d702d285c4  providers/implementations/ciphers/cipher_aes_xts_hw.c
 dc4626becaabc3990549483d9ef5f05c7dd9a9c2cf9be96ade3ba6a6e203f7f5  providers/implementations/ciphers/cipher_cts.c
-57ee5e4d0af6d6006b04e60c5727b43a71ed37b67aa2410e03ec8932ad4a69e4  providers/implementations/ciphers/cipher_cts.h
-fcc3bb0637864252402aaa9d543209909df9a39611127f777b168bc888498dc0  providers/implementations/ciphers/cipher_tdes.c
-ccd6cc0ba06a8ecd8ce50019a6a62f8a185125d9ee045fd68a3c16e71c7a7794  providers/implementations/ciphers/cipher_tdes.h
-b59e3978b70cecdf8b0d867bd1b9202e19bef0b8e5bc243db42704a49dc5b22d  providers/implementations/ciphers/cipher_tdes_common.c
-50645122f08ef4891cd96cace833bd550be7f5278ab785515fd61fe8993c8c25  providers/implementations/ciphers/cipher_tdes_hw.c
-765c90cabcbdc33097a7197af1a44152d57d38670adfeb295c1e392b13739337  providers/implementations/ciphers/ciphercommon.c
+83c892e95bb3f0e0d0824f92d9792033265de1a224d8a92f119abb94994552d9  providers/implementations/ciphers/cipher_cts.h
+1fce446497c98a84043257700ff02bb8ba04cdbb8ac92b15ca09404490e48016  providers/implementations/ciphers/cipher_tdes.c
+9cfdcc860a03b6e7ced8cc21bcbbc1c070c89aefab04b07f213c7a3db1895553  providers/implementations/ciphers/cipher_tdes.h
+00b931090e26ce9a62ee4ea125586f439a9906db5d7b914ffc67d293a57c7c00  providers/implementations/ciphers/cipher_tdes_common.c
+cca34f1c7baf3a98964f7ce19a59e06d1eaf2ada121a0d4a438f4078a072b325  providers/implementations/ciphers/cipher_tdes_hw.c
+5739bf4391b40a6715e25a03f42701e938b160e1189c33e72b21f57d4991586e  providers/implementations/ciphers/ciphercommon.c
 ab9a2edb23aa61cf31da6addd8674a6028f93399eceeeee35a56ee770338fd6c  providers/implementations/ciphers/ciphercommon_block.c
 6b6090c233ddf29d819f2559361aeeae03505de7626a127628d5f0f6d3bce295  providers/implementations/ciphers/ciphercommon_ccm.c
-8b6828f188c2590c7d9c6cac13fa0eb6d38a522b0f2859e7c8a766580fa9b66e  providers/implementations/ciphers/ciphercommon_ccm_hw.c
-00d480e133ffa2b63b1e704de9d321b4883118fecf126b2b7512f7b9f316e705  providers/implementations/ciphers/ciphercommon_gcm.c
+6632a555d5bcd5af67d0355ce46c2906bb3a0dcdf1651595b29189c40a5ca675  providers/implementations/ciphers/ciphercommon_ccm_hw.c
+ab51261da6aea5a3cca74a7561e4b89e6ce83f2ac497a5c766ecd3c3bff95152  providers/implementations/ciphers/ciphercommon_gcm.c
 bb67eaa7a98494ca938726f9218213870fc97dd87b56bda950626cc794baf20b  providers/implementations/ciphers/ciphercommon_gcm_hw.c
-23fd89e3239e596c325a8c5d23eb1fe157a8d23aa4d90ed2c574bf06dfabd693  providers/implementations/ciphers/ciphercommon_hw.c
+8bf2b4bef8167740ae3fffc9f0cf73327a1b4ee361e63da22c257cca0e1e2971  providers/implementations/ciphers/ciphercommon_hw.c
 c4b1cb143de15acc396ce2e03fdd165defd25ebc831de9cdfacf408ea883c666  providers/implementations/ciphers/ciphercommon_local.h
 39b47b6ef9d71852964c26e07ef0e9b23f04c7493b1b16ba7c3dba7074b6b70d  providers/implementations/digests/digestcommon.c
-6b1b0223a8ed6cd9210bcef2e148266bd5131d0f5fc6cd459f4bc0db808c6008  providers/implementations/digests/sha2_prov.c
-47a1b107e0e37607370e3f91c23eb8b6403892867239d5e1c17f8c94cfa83c56  providers/implementations/digests/sha3_prov.c
-9b37f34d48b3346c6ca3de430e190d7bfbd4e327d728870a64c7bd806ab700b6  providers/implementations/exchange/dh_exch.c
-ad943431c43913443461c709a179c577f7278aa061fab6e1ecbb4d0f211db63d  providers/implementations/exchange/ecdh_exch.c
+ae449102b3434800656536ed7ede4a2786ec97350c01df8c45d0431c12e9e700  providers/implementations/digests/sha2_prov.c
+20ae19c3d85d2e02780948c52ff5c2fd8e2593a001897ca47a47d23280dd579d  providers/implementations/digests/sha3_prov.c
+3209da8f0fe174de1d7a1b1397902725e1c758ca8a0208a69cb32bc884de1874  providers/implementations/exchange/dh_exch.c
+e1b33fcc05c60254849b9a01e416885ce93ea9e315b9877ac7ab420003b2ec3c  providers/implementations/exchange/ecdh_exch.c
 d44c5a6d3156392757415f34afc1ab164fb0e9cd1e97977386d7cd13f3555df5  providers/implementations/exchange/ecx_exch.c
 b1115636f53bf70f417b183cafeb6d38e230d11d8de731e6896ba60cc850d931  providers/implementations/exchange/kdf_exch.c
-0418ae17d54b602bfddefb96c7b4386aa97c43fdce1c8dcd12a7ce3bdecd0b58  providers/implementations/include/prov/ciphercommon.h
-a5ea831a23c0f52a37660437f6c61f129c3f8428daf6f8cd8dd458f358c56937  providers/implementations/include/prov/ciphercommon_aead.h
-a07b9c86346100feef15c9abb57e48a6099bc9fa782724a2283f17910ef192fb  providers/implementations/include/prov/ciphercommon_ccm.h
-0da2601354752c1d7085d1aee30ccc45a4066db9ec042fcd7a9da1644cac2330  providers/implementations/include/prov/ciphercommon_gcm.h
-b2f4aa477c3a2731dfbb5720ce87df653c55df24947c95d50a229be23e108661  providers/implementations/include/prov/digestcommon.h
+1644609260b996c1a46610d02474f991e1ee4bdff5d8175e759c49a92f2b5107  providers/implementations/include/prov/ciphercommon.h
+f1dd49b30604d9b8e948c135329a270a4d3e04857f7f9159a3e84f46a024d59d  providers/implementations/include/prov/ciphercommon_aead.h
+3226fc5162aff5b2e992b24944c49bc28855a47bbf69a789bc73ccabd886e9c0  providers/implementations/include/prov/ciphercommon_ccm.h
+45885a39d0f9e30a8032c6020970389104c69b909d9699fd1c79335184fb17fa  providers/implementations/include/prov/ciphercommon_gcm.h
+35596c97faf324823d19a01e1b5674c7a15f1a6e7ff1ef1c7d46400c2a68f63b  providers/implementations/include/prov/digestcommon.h
 1baf1c06b20a0eb8ec271452544922d67c1cc168dbe9853b259191de4bd99918  providers/implementations/include/prov/ecx.h
-062b49fc5cfa405fbcb184b1b48c9141db22531493bf828ba8543d24b0b72692  providers/implementations/include/prov/hmac_drbg.h
-20346aa1dc04854684fcc5ad53d7d436d63e32bbc66bb8cfd4d3cb2d2f2c8d60  providers/implementations/include/prov/implementations.h
+b0d1f6fc3c9220fe6d4656e487bad8df16b6f840054018b95b2752ea9aef822d  providers/implementations/include/prov/hmac_drbg.h
+042271e95dd1e275027f84c87f56388a4daf44bbe5fcd694643f67fd711dd6af  providers/implementations/include/prov/implementations.h
 05eedab6b16c80025f72281fa619d9480c437b800cb821b761fe4c05bc9d3af0  providers/implementations/include/prov/kdfexchange.h
 4014246d44fa3f34aad5372c75d3f7eea528f1cf1798e30d5627e7620a356631  providers/implementations/include/prov/macsignature.h
 b41c9a4e90d951a2d0e796b1cbbdbe8cb6fc18306d9b70be7a489249c11c294a  providers/implementations/include/prov/ml_dsa.h
 511ad835639f071e99eaff6dcbf516999d108ea8b3f5f3f027e0982a916cf3c3  providers/implementations/include/prov/ml_kem.h
-190f66af533067b80f18d7a12ba5440927e3e93b218f67473b4dea7dd9db88a6  providers/implementations/include/prov/mlx_kem.h
+8b678d26c077e9135171aa27a8038041f320aa17a3441240865c54859c864ebb  providers/implementations/include/prov/mlx_kem.h
 af1adbeaa97de9b550f987e4badfa3809ba8c734bf7b90b830882cd95175d667  providers/implementations/include/prov/names.h
 b9f8781167f274ccd8b643b3bb6c4e1108fb27b2aae588518261af9415228dae  providers/implementations/include/prov/seeding.h
-c67ea899ea2f37e4fc44f25bdbb965f91cc4d29c833c1e3a19603f97efd6288a  providers/implementations/kdfs/hkdf.c
-8a294c68ed3369ba4f3f7ee87b322702ddb59b63bf5ec2c72719ef121618c3ca  providers/implementations/kdfs/kbkdf.c
-c0acc0869b8adbd399fbd024f7f7e664c462f4be51b72b41b7aebf1e3233a897  providers/implementations/kdfs/pbkdf2.c
+2c7a8075740b5aaa0025611c7e6507ea6fb4aa9674518a8b7d1fac4afb90c376  providers/implementations/kdfs/hkdf.c
+fa132932654a12ce80d687322ad1920846c03d5c022d255074ecb116ff2687fe  providers/implementations/kdfs/kbkdf.c
+06fe9cf7db51e48ea3b5106d44a4cfa3fbc2e0afdbf0de7867854525effa7bb3  providers/implementations/kdfs/pbkdf2.c
 c0778565abff112c0c5257329a7750ec4605e62f26cc36851fa1fbee6e03c70c  providers/implementations/kdfs/pbkdf2.h
 abe2b0f3711eaa34846e155cffc9242e4051c45de896f747afd5ac9d87f637dc  providers/implementations/kdfs/pbkdf2_fips.c
-08ccef4cc61dcd3bf4afcda8308a5e979bfa93d37f676841bed0cda7e7b1a9a9  providers/implementations/kdfs/sshkdf.c
-e18ef50cd62647a2cc784c45169d75054dccd58fc106bf623d921de995bb3c34  providers/implementations/kdfs/sskdf.c
-6d9767a99a5b46d44ac9e0898ee18d219c04dfb34fda42e71d54adccbed7d57c  providers/implementations/kdfs/tls1_prf.c
-88d04ff4c93648a4fbfd9ce137cfc64f2c85e1850593c1ab35334b8b3de8ad99  providers/implementations/kdfs/x942kdf.c
-3e199221ff78d80a3678e917dbbd232c5cd15f35b7c41bac92b60f766f656af7  providers/implementations/kem/ml_kem_kem.c
-a2e2b44064ef44b880b89ab6adc83686936acaa906313a37e5ec69d632912034  providers/implementations/kem/mlx_kem.c
+005016cd3d2b9f9d7288d5b7cc71eff3f603199117f6758464dc9778e1ddfc18  providers/implementations/kdfs/sshkdf.c
+a9a5a3ba575b1a372f5a09135667ac1b0e303f8b19b0707804390aba9e266eca  providers/implementations/kdfs/sskdf.c
+f01cbd7c5351d4aa9ae667627503b2cfef6fc0695e7a42296b7bf015c9a418b3  providers/implementations/kdfs/tls1_prf.c
+39207243a84beb670cb0e64b6d0fe7bfc6a3dd84000617b647a3ecf52a1da3c2  providers/implementations/kdfs/x942kdf.c
+748af266d06006da10524f3a621c65b8c3eeddf8b1ccd06ecdc6b689564d220c  providers/implementations/kem/ml_kem_kem.c
+35549cec7031452bb5b46aa8a86028abc7a3a2b39f9f6564fa4bd402451bc647  providers/implementations/kem/mlx_kem.c
 c764555b9dc9b273c280514a5d2d44156f82f3e99155a77c627f2c773209bcd7  providers/implementations/kem/rsa_kem.c
-b9f7fc5c19f637cee55b0a435b838f5de3a5573ca376ba602e90f70855a78852  providers/implementations/keymgmt/dh_kmgmt.c
-24cc3cc8e8681c77b7f96c83293bd66045fd8ad69f756e673ca7f8ca9e82b0af  providers/implementations/keymgmt/dsa_kmgmt.c
-e10086c31aafae0562054e3b07f12409e39b87b5e96ee7668c231c37861aa447  providers/implementations/keymgmt/ec_kmgmt.c
+aa13d72bc69a374db72b6d44e2f2c2ddd5f7bddbe16b950e3c4666d876c63735  providers/implementations/keymgmt/dh_kmgmt.c
+c0446d1b2101ddd977063516b87d23f424cdca33473f293db4c3974b674169b0  providers/implementations/keymgmt/dsa_kmgmt.c
+2b98ba2124a86eae2adc7b88bfa26e47b548e9628b99180cc2cd841eed5ed8da  providers/implementations/keymgmt/ec_kmgmt.c
 258ae17bb2dd87ed1511a8eb3fe99eed9b77f5c2f757215ff6b3d0e8791fc251  providers/implementations/keymgmt/ec_kmgmt_imexport.inc
-7cdc20a3e0b88f833ec1145e72d62b3c57f20ef902ebe7503b358a5b739e9fd5  providers/implementations/keymgmt/ecx_kmgmt.c
+f0a1b4c6599e6555c5784d6c036d2aae04cd01cd8d73a927505041e7df25125c  providers/implementations/keymgmt/ecx_kmgmt.c
 daf35a7ab961ef70aefca981d80407935904c5da39dca6692432d6e6bc98759d  providers/implementations/keymgmt/kdf_legacy_kmgmt.c
-17d6bc9f386f147765d9653639056dcb40e258239a5a9fdc4876a4f0a1d47c21  providers/implementations/keymgmt/mac_legacy_kmgmt.c
-479b54cea8a46925e81541d5feae66226ae4b77951fb8058ee57a8a2a5572bbf  providers/implementations/keymgmt/ml_dsa_kmgmt.c
-b05ed431602f27241993b9f50f11ced172b9278366c35ca9596890f6c763fb6b  providers/implementations/keymgmt/ml_kem_kmgmt.c
-c37205fb1a11cc890f50a13d8bc2eb3950b1a111dde8f1877d6fecc210b8afa1  providers/implementations/keymgmt/mlx_kmgmt.c
-9376a19735fcc79893cb3c6b0cff17a2cae61db9e9165d9a30f8def7f8e8e7c7  providers/implementations/keymgmt/rsa_kmgmt.c
-093f6c2b9f39a97d4061800f59177c88f5ca2c1034e4d795a5a1d7a599916a06  providers/implementations/keymgmt/slh_dsa_kmgmt.c
+69b509e9c7fe9692622d1059917c3adb991c0047e11bc116f0a393a3a0539445  providers/implementations/keymgmt/mac_legacy_kmgmt.c
+3c63e65bd1a6a2e853828205c015a50c38a82f2fee9bf6787dce6dab7331bb91  providers/implementations/keymgmt/ml_dsa_kmgmt.c
+716e75fe56847f0c4c7bf7d86d78040ca575cdf1dcf63c1a93d351f0e836477f  providers/implementations/keymgmt/ml_kem_kmgmt.c
+01d75c1eba93ed23f98130d6c308550d0ab2e44c5651101628861bc0238623d0  providers/implementations/keymgmt/mlx_kmgmt.c
+cd4b8129eaccbd77f9b6c725d3cb57b71109c4649115ec786b6495100afaddf2  providers/implementations/keymgmt/rsa_kmgmt.c
+d640cff1c46911b69866eb83f48beba42a1741bb1d3f1db6e7201077a57761fc  providers/implementations/keymgmt/slh_dsa_kmgmt.c
 9d02d481b9c7c0c9e0932267d1a3e1fef00830aaa03093f000b88aa042972b9f  providers/implementations/macs/cmac_prov.c
-3c558b57fff3588b6832475e0b1c5be590229ad50d95a6ebb089b62bf5fe382d  providers/implementations/macs/gmac_prov.c
-3b5e591e8f6c6ba721a20d978452c9aae9a8259b3595b158303a49b35f286e53  providers/implementations/macs/hmac_prov.c
-6f9100c9cdd39f94601d04a6564772686571711ff198cf8469e86444d1ba25f3  providers/implementations/macs/kmac_prov.c
-4115f822e2477cd2c92a1c956cca1e4dbc5d86366e2a44a37526756153c0e432  providers/implementations/rands/drbg.c
-a417b4596695f6f3b456fa380df9014259a4af6278deb325c885203d5799f569  providers/implementations/rands/drbg_ctr.c
-857043f63023b1b74936600aca189f39910d1b109720903cbe7f0d5752f381e9  providers/implementations/rands/drbg_hash.c
-8bdd3fef08e6395de772b04648bf819268907bcf1f0f1b150880dc2056d9cb10  providers/implementations/rands/drbg_hmac.c
-b6dba662e23d8c762cc31d5ead7f42bbad682fb64a8b064bdc415b7b5d89fc13  providers/implementations/rands/drbg_local.h
-ddae75f1e08416c92802faafba9d524e3bf58c13e9fcb51735733e161006f89e  providers/implementations/rands/fips_crng_test.c
-068bec8b3cab01b0ab6d5d5046eab4d993058234a7687347e0bff637c70e479e  providers/implementations/rands/test_rng.c
-c454df346cee5cd0072d2f2b019654636db3b7a555debcc842c3abd54d2c8275  providers/implementations/signature/dsa_sig.c
-a23bdd86dd4984e82763f498b900d8457b33465969aaa905ad9ac6ce9fa03236  providers/implementations/signature/ecdsa_sig.c
-bd48b0fe43f0d0d91eb34bdfd48fbcfd69bceabf0ddc678702fe9ef968064bb6  providers/implementations/signature/eddsa_sig.c
+a3bb4d7914f45cf82f86cd92135e20a712274ca153d9ed5ad24db7f33710726c  providers/implementations/macs/gmac_prov.c
+2d6b8c42c67e3e43d8d0035463cbff590dabb7da815f9e437a3a72d4b6596319  providers/implementations/macs/hmac_prov.c
+40686337be4261685f176bb10042d903d46ab10c90e10ac42d3842e9b5ddd960  providers/implementations/macs/kmac_prov.c
+0ebc5a48655a697231918644397308e64914c32421e9b8ee7afd7779b6a2fdb8  providers/implementations/rands/drbg.c
+d9e41abc1780bb253bdca6c58cc32af7d0a774e52c91fc5d64577f71defc52c2  providers/implementations/rands/drbg_ctr.c
+cf98646defb0b385d6ce4bedcd51559c9a03424491f4576ea7eb41e3db8a18b3  providers/implementations/rands/drbg_hash.c
+45993825b1224097f6b9ea12643c09a09dc66beecfdfb3dd337d468931ab0f25  providers/implementations/rands/drbg_hmac.c
+841617c81d6d5eae5ea59064e8b45947d436d3e53b49283329d17016866d8f34  providers/implementations/rands/drbg_local.h
+355bd437dde9ecd1da89f42691147f2b5cf9a012ff5f55062bf83b6bead1e181  providers/implementations/rands/fips_crng_test.c
+4913fec58a2648fcec0e5a94dba9decab0505a6d725bed6eb861ce854db81df8  providers/implementations/rands/test_rng.c
+74e60389dc5ab0a69701af0181b6a915fc87ce9a0874cc949f7e9e85ae4642e7  providers/implementations/signature/dsa_sig.c
+ca090b1987debf6a30f17551b0be613f7a2e6ce0d07b0d6924e0f759a970af4d  providers/implementations/signature/ecdsa_sig.c
+a837f69cb1aa5d0327372e26a63a8492b6ffb1156325f66e880c202011d07cbe  providers/implementations/signature/eddsa_sig.c
 e0e67e402ff19b0d2eb5228d7ebd70b9477c12595ac34d6f201373d7c8a516f4  providers/implementations/signature/mac_legacy_sig.c
 51251a1ca4c0b6faea059de5d5268167fe47565163317177d09db39978134f78  providers/implementations/signature/ml_dsa_sig.c
-6c370ec1d3393fa9ac7125e26700fbc0ea05bfd489ddacd1bb6da9b990da26d1  providers/implementations/signature/rsa_sig.c
+108a32d14483773f7e247f8a77dfcce08a682642d40b4e8e1594515a1fb31f98  providers/implementations/signature/rsa_sig.c
 14e7640b4db5e59e29b0266256d3d821adf871afa9703e18285f2fc957ac5971  providers/implementations/signature/slh_dsa_sig.c
 21f537f9083f0341d9d1b0ace090a8d8f0b2b9e9cf76771c359b6ea00667a469  providers/implementations/skeymgmt/aes_skmgmt.c
 2dbf9b8e738fad556c3248fb554ff4cc269ade3c86fa3d2786ba9b6d6016bf22  providers/implementations/skeymgmt/generic.c
-414bbe942af0b94e90ee493612a3ce8ccbb9c6915b69464e4f71175921a0aeb8  providers/implementations/skeymgmt/skeymgmt_lcl.h
-0b73a04f8a03106e2a0fea10978f9888158046c29c3993ca6557f5a6403d5580  ssl/record/methods/ssl3_cbc.c
+9ba8db9b0e18847ef79ecb77fbc383d8762694be29dfb7d269df6f02dc977222  providers/implementations/skeymgmt/skeymgmt_lcl.h
+c816491e0a634fb84ae61ef7362c366b34f200201a134dd9ac75457f487106d8  ssl/record/methods/ssl3_cbc.c
 a8914c1661c53bcb0f435ec280c35c5a135e6c71296554c7322186847e194683  ssl/record/methods/tls_pad.c
diff --git a/providers/fips.checksum b/providers/fips.checksum
index 81daf5990a16f..b10e46c351923 100644
--- a/providers/fips.checksum
+++ b/providers/fips.checksum
@@ -1 +1 @@
-406288e3f9884fc13549a3356512837a78d7fa21f91bebc41d73201d80d760ea  providers/fips-sources.checksums
+7fb222f49c7b3a423c4bb2f62da17eae3e209cb3e9b9a9a3db624bcdfba3151a  providers/fips-sources.checksums
diff --git a/providers/fips/fips_entry.c b/providers/fips/fips_entry.c
index c2c8d5de2cf7a..20ab1f2a65c87 100644
--- a/providers/fips/fips_entry.c
+++ b/providers/fips/fips_entry.c
@@ -11,9 +11,9 @@
 
 OSSL_provider_init_fn OSSL_provider_init_int;
 int OSSL_provider_init(const OSSL_CORE_HANDLE *handle,
-                       const OSSL_DISPATCH *in,
-                       const OSSL_DISPATCH **out,
-                       void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     return OSSL_provider_init_int(handle, in, out, provctx);
 }
diff --git a/providers/fips/fipsindicator.c b/providers/fips/fipsindicator.c
index d514ca6ecd970..05d5f5aed54d3 100644
--- a/providers/fips/fipsindicator.c
+++ b/providers/fips/fipsindicator.c
@@ -37,7 +37,7 @@ void ossl_FIPS_IND_set_settable(OSSL_FIPS_IND *ind, int id, int state)
     if (!ossl_assert(id < OSSL_FIPS_IND_SETTABLE_MAX))
         return;
     if (!ossl_assert(state == OSSL_FIPS_IND_STATE_STRICT
-                     || state == OSSL_FIPS_IND_STATE_TOLERANT))
+            || state == OSSL_FIPS_IND_STATE_TOLERANT))
         return;
     ind->settable[id] = state;
 }
@@ -56,9 +56,9 @@ int ossl_FIPS_IND_get_settable(const OSSL_FIPS_IND *ind, int id)
  * ossl_FIPS_IND_on_unapproved() functions may be required.
  */
 int ossl_FIPS_IND_on_unapproved(OSSL_FIPS_IND *ind, int id,
-                                OSSL_LIB_CTX *libctx,
-                                const char *algname, const char *opname,
-                                OSSL_FIPS_IND_CHECK_CB *config_check_fn)
+    OSSL_LIB_CTX *libctx,
+    const char *algname, const char *opname,
+    OSSL_FIPS_IND_CHECK_CB *config_check_fn)
 {
     /* Set to unapproved. Once unapproved mode is set this will not be reset */
     ind->approved = 0;
@@ -78,7 +78,7 @@ int ossl_FIPS_IND_on_unapproved(OSSL_FIPS_IND *ind, int id,
 }
 
 int ossl_FIPS_IND_set_ctx_param(OSSL_FIPS_IND *ind, int id,
-                                const OSSL_PARAM params[], const char *name)
+    const OSSL_PARAM params[], const char *name)
 {
     int in = 0;
     const OSSL_PARAM *p = OSSL_PARAM_locate_const(params, name);
@@ -104,7 +104,7 @@ int ossl_FIPS_IND_get_ctx_param(const OSSL_FIPS_IND *ind, OSSL_PARAM params[])
  * to occur based on the indicator type and description.
  */
 int ossl_FIPS_IND_callback(OSSL_LIB_CTX *libctx, const char *type,
-                           const char *desc)
+    const char *desc)
 {
     OSSL_INDICATOR_CALLBACK *cb = NULL;
 
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index 373cd1c2e4c5b..419878719e98e 100644
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -17,6 +17,7 @@
 #include <openssl/proverr.h>
 #include <openssl/indicator.h>
 #include "internal/cryptlib.h"
+#include "internal/provider.h"
 #include "prov/implementations.h"
 #include "prov/names.h"
 #include "prov/provider_ctx.h"
@@ -43,7 +44,7 @@ static OSSL_FUNC_provider_query_operation_fn fips_query;
 static OSSL_FUNC_provider_query_operation_fn fips_query_internal;
 static OSSL_FUNC_provider_random_bytes_fn fips_random_bytes;
 
-#define ALGC(NAMES, FUNC, CHECK)                \
+#define ALGC(NAMES, FUNC, CHECK) \
     { { NAMES, FIPS_DEFAULT_PROPERTIES, FUNC }, CHECK }
 #define ALG(NAMES, FUNC) ALGC(NAMES, FUNC, NULL)
 
@@ -64,6 +65,7 @@ static OSSL_FUNC_core_vset_error_fn *c_vset_error;
 static OSSL_FUNC_core_set_error_mark_fn *c_set_error_mark;
 static OSSL_FUNC_core_clear_last_error_mark_fn *c_clear_last_error_mark;
 static OSSL_FUNC_core_pop_error_to_mark_fn *c_pop_error_to_mark;
+static OSSL_FUNC_core_count_to_mark_fn *c_count_to_mark;
 static OSSL_FUNC_CRYPTO_malloc_fn *c_CRYPTO_malloc;
 static OSSL_FUNC_CRYPTO_zalloc_fn *c_CRYPTO_zalloc;
 static OSSL_FUNC_CRYPTO_free_fn *c_CRYPTO_free;
@@ -123,7 +125,7 @@ void ossl_fips_prov_ossl_ctx_free(void *fgbl)
 }
 
 static int fips_random_bytes(ossl_unused void *vprov, int which,
-                             void *buf, size_t n, unsigned int strength)
+    void *buf, size_t n, unsigned int strength)
 {
     OSSL_LIB_CTX *libctx;
     PROV_CTX *prov = (PROV_CTX *)vprov;
@@ -145,21 +147,21 @@ static int fips_get_params_from_core(FIPS_GLOBAL *fgbl)
 {
     OSSL_PARAM core_params[32], *p = core_params;
 
-#define OSSL_FIPS_PARAM(structname, paramname)                                 \
-    *p++ = OSSL_PARAM_construct_utf8_ptr(                                      \
-            paramname, (char **)&fgbl->selftest_params.structname,             \
-            sizeof(fgbl->selftest_params.structname));
+#define OSSL_FIPS_PARAM(structname, paramname)                 \
+    *p++ = OSSL_PARAM_construct_utf8_ptr(                      \
+        paramname, (char **)&fgbl->selftest_params.structname, \
+        sizeof(fgbl->selftest_params.structname));
 
 /* Parameters required for self testing */
 #include "fips_selftest_params.inc"
 #undef OSSL_FIPS_PARAM
 
 /* FIPS indicator options can be enabled or disabled independently */
-#define OSSL_FIPS_PARAM(structname, paramname, initvalue)                      \
-    *p++ = OSSL_PARAM_construct_utf8_ptr(                                      \
-            OSSL_PROV_PARAM_##paramname,                                       \
-            (char **)&fgbl->fips_##structname.option,                          \
-            sizeof(fgbl->fips_##structname.option));
+#define OSSL_FIPS_PARAM(structname, paramname, initvalue) \
+    *p++ = OSSL_PARAM_construct_utf8_ptr(                 \
+        OSSL_PROV_PARAM_##paramname,                      \
+        (char **)&fgbl->fips_##structname.option,         \
+        sizeof(fgbl->fips_##structname.option));
 #include "fips_indicator_params.inc"
 #undef OSSL_FIPS_PARAM
 
@@ -183,7 +185,7 @@ static const OSSL_PARAM *fips_gettable_params(void *provctx)
         OSSL_PARAM_DEFN(OSSL_PROV_PARAM_STATUS, OSSL_PARAM_INTEGER, NULL, 0),
 
 #define OSSL_FIPS_PARAM(structname, paramname, initvalue) \
-        OSSL_PARAM_DEFN(OSSL_PROV_PARAM_##paramname, OSSL_PARAM_INTEGER, NULL, 0),
+    OSSL_PARAM_DEFN(OSSL_PROV_PARAM_##paramname, OSSL_PARAM_INTEGER, NULL, 0),
 #include "fips_indicator_params.inc"
 #undef OSSL_FIPS_PARAM
 
@@ -196,7 +198,7 @@ static int fips_get_params(void *provctx, OSSL_PARAM params[])
 {
     OSSL_PARAM *p;
     FIPS_GLOBAL *fgbl = ossl_lib_ctx_get_data(ossl_prov_ctx_get0_libctx(provctx),
-                                              OSSL_LIB_CTX_FIPS_PROV_INDEX);
+        OSSL_LIB_CTX_FIPS_PROV_INDEX);
 
     p = OSSL_PARAM_locate(params, OSSL_PROV_PARAM_NAME);
     if (p != NULL && !OSSL_PARAM_set_utf8_ptr(p, FIPS_VENDOR))
@@ -211,9 +213,9 @@ static int fips_get_params(void *provctx, OSSL_PARAM params[])
     if (p != NULL && !OSSL_PARAM_set_int(p, ossl_prov_is_running()))
         return 0;
 
-#define OSSL_FIPS_PARAM(structname, paramname, initvalue)                      \
-    p = OSSL_PARAM_locate(params, OSSL_PROV_PARAM_##paramname);                \
-    if (p != NULL && !OSSL_PARAM_set_int(p, fgbl->fips_##structname.enabled))  \
+#define OSSL_FIPS_PARAM(structname, paramname, initvalue)                     \
+    p = OSSL_PARAM_locate(params, OSSL_PROV_PARAM_##paramname);               \
+    if (p != NULL && !OSSL_PARAM_set_int(p, fgbl->fips_##structname.enabled)) \
         return 0;
 #include "fips_indicator_params.inc"
 #undef OSSL_FIPS_PARAM
@@ -223,12 +225,11 @@ static int fips_get_params(void *provctx, OSSL_PARAM params[])
 
 static void set_self_test_cb(FIPS_GLOBAL *fgbl)
 {
-    const OSSL_CORE_HANDLE *handle =
-        FIPS_get_core_handle(fgbl->selftest_params.libctx);
+    const OSSL_CORE_HANDLE *handle = FIPS_get_core_handle(fgbl->selftest_params.libctx);
 
     if (c_stcbfn != NULL && c_get_libctx != NULL) {
         c_stcbfn(c_get_libctx(handle), &fgbl->selftest_params.cb,
-                              &fgbl->selftest_params.cb_arg);
+            &fgbl->selftest_params.cb_arg);
     } else {
         fgbl->selftest_params.cb = NULL;
         fgbl->selftest_params.cb_arg = NULL;
@@ -238,7 +239,7 @@ static void set_self_test_cb(FIPS_GLOBAL *fgbl)
 static int fips_self_test(void *provctx)
 {
     FIPS_GLOBAL *fgbl = ossl_lib_ctx_get_data(ossl_prov_ctx_get0_libctx(provctx),
-                                              OSSL_LIB_CTX_FIPS_PROV_INDEX);
+        OSSL_LIB_CTX_FIPS_PROV_INDEX);
 
     set_self_test_cb(fgbl);
     return SELF_TEST_post(&fgbl->selftest_params, 1) ? 1 : 0;
@@ -276,9 +277,9 @@ static const OSSL_ALGORITHM fips_digests[] = {
     { PROV_NAMES_SHA2_384, FIPS_DEFAULT_PROPERTIES, ossl_sha384_functions },
     { PROV_NAMES_SHA2_512, FIPS_DEFAULT_PROPERTIES, ossl_sha512_functions },
     { PROV_NAMES_SHA2_512_224, FIPS_DEFAULT_PROPERTIES,
-      ossl_sha512_224_functions },
+        ossl_sha512_224_functions },
     { PROV_NAMES_SHA2_512_256, FIPS_DEFAULT_PROPERTIES,
-      ossl_sha512_256_functions },
+        ossl_sha512_256_functions },
 
     /* We agree with NIST here, so one name only */
     { PROV_NAMES_SHA3_224, FIPS_DEFAULT_PROPERTIES, ossl_sha3_224_functions },
@@ -294,9 +295,9 @@ static const OSSL_ALGORITHM fips_digests[] = {
      * KMAC128 and KMAC256.
      */
     { PROV_NAMES_KECCAK_KMAC_128, FIPS_DEFAULT_PROPERTIES,
-      ossl_keccak_kmac_128_functions },
+        ossl_keccak_kmac_128_functions },
     { PROV_NAMES_KECCAK_KMAC_256, FIPS_DEFAULT_PROPERTIES,
-      ossl_keccak_kmac_256_functions },
+        ossl_keccak_kmac_256_functions },
     { NULL, NULL, NULL }
 };
 
@@ -347,17 +348,17 @@ static const OSSL_ALGORITHM_CAPABLE fips_ciphers[] = {
     ALG(PROV_NAMES_AES_192_WRAP_PAD_INV, ossl_aes192wrappadinv_functions),
     ALG(PROV_NAMES_AES_128_WRAP_PAD_INV, ossl_aes128wrappadinv_functions),
     ALGC(PROV_NAMES_AES_128_CBC_HMAC_SHA1, ossl_aes128cbc_hmac_sha1_functions,
-         ossl_cipher_capable_aes_cbc_hmac_sha1),
+        ossl_cipher_capable_aes_cbc_hmac_sha1),
     ALGC(PROV_NAMES_AES_256_CBC_HMAC_SHA1, ossl_aes256cbc_hmac_sha1_functions,
-         ossl_cipher_capable_aes_cbc_hmac_sha1),
+        ossl_cipher_capable_aes_cbc_hmac_sha1),
     ALGC(PROV_NAMES_AES_128_CBC_HMAC_SHA256, ossl_aes128cbc_hmac_sha256_functions,
-         ossl_cipher_capable_aes_cbc_hmac_sha256),
+        ossl_cipher_capable_aes_cbc_hmac_sha256),
     ALGC(PROV_NAMES_AES_256_CBC_HMAC_SHA256, ossl_aes256cbc_hmac_sha256_functions,
-         ossl_cipher_capable_aes_cbc_hmac_sha256),
+        ossl_cipher_capable_aes_cbc_hmac_sha256),
 #ifndef OPENSSL_NO_DES
     ALG(PROV_NAMES_DES_EDE3_ECB, ossl_tdes_ede3_ecb_functions),
     ALG(PROV_NAMES_DES_EDE3_CBC, ossl_tdes_ede3_cbc_functions),
-#endif  /* OPENSSL_NO_DES */
+#endif /* OPENSSL_NO_DES */
     { { NULL, NULL, NULL }, NULL }
 };
 static OSSL_ALGORITHM exported_fips_ciphers[OSSL_NELEM(fips_ciphers)];
@@ -386,16 +387,16 @@ static const OSSL_ALGORITHM fips_macs_internal[] = {
 static const OSSL_ALGORITHM fips_kdfs[] = {
     { PROV_NAMES_HKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_hkdf_functions },
     { PROV_NAMES_TLS1_3_KDF, FIPS_DEFAULT_PROPERTIES,
-      ossl_kdf_tls1_3_kdf_functions },
+        ossl_kdf_tls1_3_kdf_functions },
     { PROV_NAMES_SSKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_sskdf_functions },
     { PROV_NAMES_PBKDF2, FIPS_DEFAULT_PROPERTIES, ossl_kdf_pbkdf2_functions },
     { PROV_NAMES_SSHKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_sshkdf_functions },
     { PROV_NAMES_X963KDF, FIPS_DEFAULT_PROPERTIES,
-      ossl_kdf_x963_kdf_functions },
+        ossl_kdf_x963_kdf_functions },
     { PROV_NAMES_X942KDF_ASN1, FIPS_DEFAULT_PROPERTIES,
-      ossl_kdf_x942_kdf_functions },
+        ossl_kdf_x942_kdf_functions },
     { PROV_NAMES_TLS1_PRF, FIPS_DEFAULT_PROPERTIES,
-      ossl_kdf_tls1_prf_functions },
+        ossl_kdf_tls1_prf_functions },
     { PROV_NAMES_KBKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_kbkdf_functions },
     { NULL, NULL, NULL }
 };
@@ -418,13 +419,13 @@ static const OSSL_ALGORITHM fips_keyexch[] = {
 #endif
 #ifndef OPENSSL_NO_EC
     { PROV_NAMES_ECDH, FIPS_DEFAULT_PROPERTIES, ossl_ecdh_keyexch_functions },
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
     { PROV_NAMES_X25519, FIPS_UNAPPROVED_PROPERTIES, ossl_x25519_keyexch_functions },
     { PROV_NAMES_X448, FIPS_UNAPPROVED_PROPERTIES, ossl_x448_keyexch_functions },
-# endif
+#endif
 #endif
     { PROV_NAMES_TLS1_PRF, FIPS_DEFAULT_PROPERTIES,
-      ossl_kdf_tls1_prf_keyexch_functions },
+        ossl_kdf_tls1_prf_keyexch_functions },
     { PROV_NAMES_HKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_hkdf_keyexch_functions },
     { NULL, NULL, NULL }
 };
@@ -444,40 +445,38 @@ static const OSSL_ALGORITHM fips_signature[] = {
 #endif
     { PROV_NAMES_RSA, FIPS_DEFAULT_PROPERTIES, ossl_rsa_signature_functions },
     { PROV_NAMES_RSA_SHA1, FIPS_DEFAULT_PROPERTIES,
-      ossl_rsa_sha1_signature_functions },
+        ossl_rsa_sha1_signature_functions },
     { PROV_NAMES_RSA_SHA224, FIPS_DEFAULT_PROPERTIES,
-      ossl_rsa_sha224_signature_functions },
+        ossl_rsa_sha224_signature_functions },
     { PROV_NAMES_RSA_SHA256, FIPS_DEFAULT_PROPERTIES,
-      ossl_rsa_sha256_signature_functions },
+        ossl_rsa_sha256_signature_functions },
     { PROV_NAMES_RSA_SHA384, FIPS_DEFAULT_PROPERTIES,
-      ossl_rsa_sha384_signature_functions },
+        ossl_rsa_sha384_signature_functions },
     { PROV_NAMES_RSA_SHA512, FIPS_DEFAULT_PROPERTIES,
-      ossl_rsa_sha512_signature_functions },
+        ossl_rsa_sha512_signature_functions },
     { PROV_NAMES_RSA_SHA512_224, FIPS_DEFAULT_PROPERTIES,
-      ossl_rsa_sha512_224_signature_functions },
+        ossl_rsa_sha512_224_signature_functions },
     { PROV_NAMES_RSA_SHA512_256, FIPS_DEFAULT_PROPERTIES,
-      ossl_rsa_sha512_256_signature_functions },
+        ossl_rsa_sha512_256_signature_functions },
     { PROV_NAMES_RSA_SHA3_224, FIPS_DEFAULT_PROPERTIES,
-      ossl_rsa_sha3_224_signature_functions },
+        ossl_rsa_sha3_224_signature_functions },
     { PROV_NAMES_RSA_SHA3_256, FIPS_DEFAULT_PROPERTIES,
-      ossl_rsa_sha3_256_signature_functions },
+        ossl_rsa_sha3_256_signature_functions },
     { PROV_NAMES_RSA_SHA3_384, FIPS_DEFAULT_PROPERTIES,
-      ossl_rsa_sha3_384_signature_functions },
+        ossl_rsa_sha3_384_signature_functions },
     { PROV_NAMES_RSA_SHA3_512, FIPS_DEFAULT_PROPERTIES,
-      ossl_rsa_sha3_512_signature_functions },
+        ossl_rsa_sha3_512_signature_functions },
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
     { PROV_NAMES_ED25519, FIPS_DEFAULT_PROPERTIES,
-      ossl_ed25519_signature_functions },
+        ossl_ed25519_signature_functions },
     { PROV_NAMES_ED25519ph, FIPS_DEFAULT_PROPERTIES,
-      ossl_ed25519ph_signature_functions },
-    { PROV_NAMES_ED25519ctx, FIPS_DEFAULT_PROPERTIES,
-      ossl_ed25519ctx_signature_functions },
+        ossl_ed25519ph_signature_functions },
     { PROV_NAMES_ED448, FIPS_DEFAULT_PROPERTIES,
-      ossl_ed448_signature_functions },
+        ossl_ed448_signature_functions },
     { PROV_NAMES_ED448ph, FIPS_DEFAULT_PROPERTIES,
-      ossl_ed448ph_signature_functions },
-# endif
+        ossl_ed448ph_signature_functions },
+#endif
     { PROV_NAMES_ECDSA, FIPS_DEFAULT_PROPERTIES, ossl_ecdsa_signature_functions },
     { PROV_NAMES_ECDSA_SHA1, FIPS_DEFAULT_PROPERTIES, ossl_ecdsa_sha1_signature_functions },
     { PROV_NAMES_ECDSA_SHA224, FIPS_DEFAULT_PROPERTIES, ossl_ecdsa_sha224_signature_functions },
@@ -495,36 +494,36 @@ static const OSSL_ALGORITHM fips_signature[] = {
     { PROV_NAMES_ML_DSA_87, FIPS_DEFAULT_PROPERTIES, ossl_ml_dsa_87_signature_functions },
 #endif
     { PROV_NAMES_HMAC, FIPS_DEFAULT_PROPERTIES,
-      ossl_mac_legacy_hmac_signature_functions },
+        ossl_mac_legacy_hmac_signature_functions },
 #ifndef OPENSSL_NO_CMAC
     { PROV_NAMES_CMAC, FIPS_DEFAULT_PROPERTIES,
-      ossl_mac_legacy_cmac_signature_functions },
+        ossl_mac_legacy_cmac_signature_functions },
 #endif
 #ifndef OPENSSL_NO_SLH_DSA
     { PROV_NAMES_SLH_DSA_SHA2_128S, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_sha2_128s_signature_functions, PROV_DESCS_SLH_DSA_SHA2_128S },
+        ossl_slh_dsa_sha2_128s_signature_functions, PROV_DESCS_SLH_DSA_SHA2_128S },
     { PROV_NAMES_SLH_DSA_SHA2_128F, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_sha2_128f_signature_functions, PROV_DESCS_SLH_DSA_SHA2_128F },
+        ossl_slh_dsa_sha2_128f_signature_functions, PROV_DESCS_SLH_DSA_SHA2_128F },
     { PROV_NAMES_SLH_DSA_SHA2_192S, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_sha2_192s_signature_functions, PROV_DESCS_SLH_DSA_SHA2_192S },
+        ossl_slh_dsa_sha2_192s_signature_functions, PROV_DESCS_SLH_DSA_SHA2_192S },
     { PROV_NAMES_SLH_DSA_SHA2_192F, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_sha2_192f_signature_functions, PROV_DESCS_SLH_DSA_SHA2_192F },
+        ossl_slh_dsa_sha2_192f_signature_functions, PROV_DESCS_SLH_DSA_SHA2_192F },
     { PROV_NAMES_SLH_DSA_SHA2_256S, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_sha2_256s_signature_functions, PROV_DESCS_SLH_DSA_SHA2_256S },
+        ossl_slh_dsa_sha2_256s_signature_functions, PROV_DESCS_SLH_DSA_SHA2_256S },
     { PROV_NAMES_SLH_DSA_SHA2_256F, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_sha2_256f_signature_functions, PROV_DESCS_SLH_DSA_SHA2_256F },
+        ossl_slh_dsa_sha2_256f_signature_functions, PROV_DESCS_SLH_DSA_SHA2_256F },
     { PROV_NAMES_SLH_DSA_SHAKE_128S, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_shake_128s_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_128S },
+        ossl_slh_dsa_shake_128s_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_128S },
     { PROV_NAMES_SLH_DSA_SHAKE_128F, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_shake_128f_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_128F },
+        ossl_slh_dsa_shake_128f_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_128F },
     { PROV_NAMES_SLH_DSA_SHAKE_192S, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_shake_192s_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_192S },
+        ossl_slh_dsa_shake_192s_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_192S },
     { PROV_NAMES_SLH_DSA_SHAKE_192F, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_shake_192f_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_192F },
+        ossl_slh_dsa_shake_192f_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_192F },
     { PROV_NAMES_SLH_DSA_SHAKE_256S, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_shake_256s_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_256S },
+        ossl_slh_dsa_shake_256s_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_256S },
     { PROV_NAMES_SLH_DSA_SHAKE_256F, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_shake_256f_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_256F },
+        ossl_slh_dsa_shake_256f_signature_functions, PROV_DESCS_SLH_DSA_SHAKE_256F },
 #endif /* OPENSSL_NO_SLH_DSA */
     { NULL, NULL, NULL }
 };
@@ -540,14 +539,14 @@ static const OSSL_ALGORITHM fips_asym_kem[] = {
     { PROV_NAMES_ML_KEM_512, FIPS_DEFAULT_PROPERTIES, ossl_ml_kem_asym_kem_functions },
     { PROV_NAMES_ML_KEM_768, FIPS_DEFAULT_PROPERTIES, ossl_ml_kem_asym_kem_functions },
     { PROV_NAMES_ML_KEM_1024, FIPS_DEFAULT_PROPERTIES, ossl_ml_kem_asym_kem_functions },
-# if !defined(OPENSSL_NO_ECX)
+#if !defined(OPENSSL_NO_ECX)
     { "X25519MLKEM768", FIPS_DEFAULT_PROPERTIES, ossl_mlx_kem_asym_kem_functions },
     { "X448MLKEM1024", FIPS_DEFAULT_PROPERTIES, ossl_mlx_kem_asym_kem_functions },
-# endif
-# if !defined(OPENSSL_NO_EC)
+#endif
+#if !defined(OPENSSL_NO_EC)
     { "SecP256r1MLKEM768", FIPS_DEFAULT_PROPERTIES, ossl_mlx_kem_asym_kem_functions },
     { "SecP384r1MLKEM1024", FIPS_DEFAULT_PROPERTIES, ossl_mlx_kem_asym_kem_functions },
-# endif
+#endif
 #endif
     { NULL, NULL, NULL }
 };
@@ -555,101 +554,101 @@ static const OSSL_ALGORITHM fips_asym_kem[] = {
 static const OSSL_ALGORITHM fips_keymgmt[] = {
 #ifndef OPENSSL_NO_DH
     { PROV_NAMES_DH, FIPS_DEFAULT_PROPERTIES, ossl_dh_keymgmt_functions,
-      PROV_DESCS_DH },
+        PROV_DESCS_DH },
     { PROV_NAMES_DHX, FIPS_DEFAULT_PROPERTIES, ossl_dhx_keymgmt_functions,
-      PROV_DESCS_DHX },
+        PROV_DESCS_DHX },
 #endif
 #ifndef OPENSSL_NO_DSA
     { PROV_NAMES_DSA, FIPS_DEFAULT_PROPERTIES, ossl_dsa_keymgmt_functions,
-      PROV_DESCS_DSA },
+        PROV_DESCS_DSA },
 #endif
     { PROV_NAMES_RSA, FIPS_DEFAULT_PROPERTIES, ossl_rsa_keymgmt_functions,
-      PROV_DESCS_RSA },
+        PROV_DESCS_RSA },
     { PROV_NAMES_RSA_PSS, FIPS_DEFAULT_PROPERTIES,
-      ossl_rsapss_keymgmt_functions, PROV_DESCS_RSA_PSS },
+        ossl_rsapss_keymgmt_functions, PROV_DESCS_RSA_PSS },
 #ifndef OPENSSL_NO_EC
     { PROV_NAMES_EC, FIPS_DEFAULT_PROPERTIES, ossl_ec_keymgmt_functions,
-      PROV_DESCS_EC },
-# ifndef OPENSSL_NO_ECX
+        PROV_DESCS_EC },
+#ifndef OPENSSL_NO_ECX
     { PROV_NAMES_X25519, FIPS_UNAPPROVED_PROPERTIES, ossl_x25519_keymgmt_functions,
-      PROV_DESCS_X25519 },
+        PROV_DESCS_X25519 },
     { PROV_NAMES_X448, FIPS_UNAPPROVED_PROPERTIES, ossl_x448_keymgmt_functions,
-      PROV_DESCS_X448 },
+        PROV_DESCS_X448 },
     { PROV_NAMES_ED25519, FIPS_DEFAULT_PROPERTIES, ossl_ed25519_keymgmt_functions,
-      PROV_DESCS_ED25519 },
+        PROV_DESCS_ED25519 },
     { PROV_NAMES_ED448, FIPS_DEFAULT_PROPERTIES, ossl_ed448_keymgmt_functions,
-      PROV_DESCS_ED448 },
-# endif
+        PROV_DESCS_ED448 },
+#endif
 #endif
 #ifndef OPENSSL_NO_ML_DSA
     { PROV_NAMES_ML_DSA_44, FIPS_DEFAULT_PROPERTIES, ossl_ml_dsa_44_keymgmt_functions,
-      PROV_DESCS_ML_DSA_44 },
+        PROV_DESCS_ML_DSA_44 },
     { PROV_NAMES_ML_DSA_65, FIPS_DEFAULT_PROPERTIES, ossl_ml_dsa_65_keymgmt_functions,
-      PROV_DESCS_ML_DSA_65 },
+        PROV_DESCS_ML_DSA_65 },
     { PROV_NAMES_ML_DSA_87, FIPS_DEFAULT_PROPERTIES, ossl_ml_dsa_87_keymgmt_functions,
-      PROV_DESCS_ML_DSA_87 },
+        PROV_DESCS_ML_DSA_87 },
 #endif /* OPENSSL_NO_ML_DSA */
     { PROV_NAMES_TLS1_PRF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_keymgmt_functions,
-      PROV_DESCS_TLS1_PRF_SIGN },
+        PROV_DESCS_TLS1_PRF_SIGN },
     { PROV_NAMES_HKDF, FIPS_DEFAULT_PROPERTIES, ossl_kdf_keymgmt_functions,
-      PROV_DESCS_HKDF_SIGN },
+        PROV_DESCS_HKDF_SIGN },
     { PROV_NAMES_HMAC, FIPS_DEFAULT_PROPERTIES, ossl_mac_legacy_keymgmt_functions,
-      PROV_DESCS_HMAC_SIGN },
+        PROV_DESCS_HMAC_SIGN },
 #ifndef OPENSSL_NO_CMAC
     { PROV_NAMES_CMAC, FIPS_DEFAULT_PROPERTIES,
-      ossl_cmac_legacy_keymgmt_functions, PROV_DESCS_CMAC_SIGN },
+        ossl_cmac_legacy_keymgmt_functions, PROV_DESCS_CMAC_SIGN },
 #endif
 #ifndef OPENSSL_NO_ML_KEM
     { PROV_NAMES_ML_KEM_512, FIPS_DEFAULT_PROPERTIES, ossl_ml_kem_512_keymgmt_functions,
-      PROV_DESCS_ML_KEM_512 },
+        PROV_DESCS_ML_KEM_512 },
     { PROV_NAMES_ML_KEM_768, FIPS_DEFAULT_PROPERTIES, ossl_ml_kem_768_keymgmt_functions,
-      PROV_DESCS_ML_KEM_768 },
+        PROV_DESCS_ML_KEM_768 },
     { PROV_NAMES_ML_KEM_1024, FIPS_DEFAULT_PROPERTIES, ossl_ml_kem_1024_keymgmt_functions,
-      PROV_DESCS_ML_KEM_1024 },
-# if !defined(OPENSSL_NO_ECX)
+        PROV_DESCS_ML_KEM_1024 },
+#if !defined(OPENSSL_NO_ECX)
     { PROV_NAMES_X25519MLKEM768, FIPS_DEFAULT_PROPERTIES, ossl_mlx_x25519_kem_kmgmt_functions,
-      PROV_DESCS_X25519MLKEM768 },
+        PROV_DESCS_X25519MLKEM768 },
     { PROV_NAMES_X448MLKEM1024, FIPS_DEFAULT_PROPERTIES, ossl_mlx_x448_kem_kmgmt_functions,
-      PROV_DESCS_X448MLKEM1024 },
-# endif
-# if !defined(OPENSSL_NO_EC)
+        PROV_DESCS_X448MLKEM1024 },
+#endif
+#if !defined(OPENSSL_NO_EC)
     { PROV_NAMES_SecP256r1MLKEM768, FIPS_DEFAULT_PROPERTIES, ossl_mlx_p256_kem_kmgmt_functions,
-      PROV_DESCS_SecP256r1MLKEM768 },
+        PROV_DESCS_SecP256r1MLKEM768 },
     { PROV_NAMES_SecP384r1MLKEM1024, FIPS_DEFAULT_PROPERTIES, ossl_mlx_p384_kem_kmgmt_functions,
-      PROV_DESCS_SecP384r1MLKEM1024 },
-# endif
+        PROV_DESCS_SecP384r1MLKEM1024 },
+#endif
 #endif
 #ifndef OPENSSL_NO_SLH_DSA
     { PROV_NAMES_SLH_DSA_SHA2_128S, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_sha2_128s_keymgmt_functions, PROV_DESCS_SLH_DSA_SHA2_128S },
+        ossl_slh_dsa_sha2_128s_keymgmt_functions, PROV_DESCS_SLH_DSA_SHA2_128S },
     { PROV_NAMES_SLH_DSA_SHA2_128F, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_sha2_128f_keymgmt_functions, PROV_DESCS_SLH_DSA_SHA2_128F },
+        ossl_slh_dsa_sha2_128f_keymgmt_functions, PROV_DESCS_SLH_DSA_SHA2_128F },
     { PROV_NAMES_SLH_DSA_SHA2_192S, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_sha2_192s_keymgmt_functions, PROV_DESCS_SLH_DSA_SHA2_192S },
+        ossl_slh_dsa_sha2_192s_keymgmt_functions, PROV_DESCS_SLH_DSA_SHA2_192S },
     { PROV_NAMES_SLH_DSA_SHA2_192F, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_sha2_192f_keymgmt_functions, PROV_DESCS_SLH_DSA_SHA2_192F },
+        ossl_slh_dsa_sha2_192f_keymgmt_functions, PROV_DESCS_SLH_DSA_SHA2_192F },
     { PROV_NAMES_SLH_DSA_SHA2_256S, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_sha2_256s_keymgmt_functions, PROV_DESCS_SLH_DSA_SHA2_256S },
+        ossl_slh_dsa_sha2_256s_keymgmt_functions, PROV_DESCS_SLH_DSA_SHA2_256S },
     { PROV_NAMES_SLH_DSA_SHA2_256F, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_sha2_256f_keymgmt_functions, PROV_DESCS_SLH_DSA_SHA2_256F },
+        ossl_slh_dsa_sha2_256f_keymgmt_functions, PROV_DESCS_SLH_DSA_SHA2_256F },
     { PROV_NAMES_SLH_DSA_SHAKE_128S, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_shake_128s_keymgmt_functions, PROV_DESCS_SLH_DSA_SHAKE_128S },
+        ossl_slh_dsa_shake_128s_keymgmt_functions, PROV_DESCS_SLH_DSA_SHAKE_128S },
     { PROV_NAMES_SLH_DSA_SHAKE_128F, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_shake_128f_keymgmt_functions, PROV_DESCS_SLH_DSA_SHAKE_128F },
+        ossl_slh_dsa_shake_128f_keymgmt_functions, PROV_DESCS_SLH_DSA_SHAKE_128F },
     { PROV_NAMES_SLH_DSA_SHAKE_192S, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_shake_192s_keymgmt_functions, PROV_DESCS_SLH_DSA_SHAKE_192S },
+        ossl_slh_dsa_shake_192s_keymgmt_functions, PROV_DESCS_SLH_DSA_SHAKE_192S },
     { PROV_NAMES_SLH_DSA_SHAKE_192F, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_shake_192f_keymgmt_functions, PROV_DESCS_SLH_DSA_SHAKE_192F },
+        ossl_slh_dsa_shake_192f_keymgmt_functions, PROV_DESCS_SLH_DSA_SHAKE_192F },
     { PROV_NAMES_SLH_DSA_SHAKE_256S, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_shake_256s_keymgmt_functions, PROV_DESCS_SLH_DSA_SHAKE_256S },
+        ossl_slh_dsa_shake_256s_keymgmt_functions, PROV_DESCS_SLH_DSA_SHAKE_256S },
     { PROV_NAMES_SLH_DSA_SHAKE_256F, FIPS_DEFAULT_PROPERTIES,
-      ossl_slh_dsa_shake_256f_keymgmt_functions, PROV_DESCS_SLH_DSA_SHAKE_256F },
+        ossl_slh_dsa_shake_256f_keymgmt_functions, PROV_DESCS_SLH_DSA_SHAKE_256F },
 #endif /* OPENSSL_NO_SLH_DSA */
     { NULL, NULL, NULL }
 };
 
 static const OSSL_ALGORITHM *fips_query(void *provctx, int operation_id,
-                                        int *no_cache)
+    int *no_cache)
 {
     *no_cache = 0;
 
@@ -682,7 +681,7 @@ static const OSSL_ALGORITHM *fips_query(void *provctx, int operation_id,
 }
 
 static const OSSL_ALGORITHM *fips_query_internal(void *provctx, int operation_id,
-                                                 int *no_cache)
+    int *no_cache)
 {
     if (operation_id == OSSL_OP_MAC) {
         *no_cache = 0;
@@ -715,7 +714,7 @@ static const OSSL_DISPATCH fips_dispatch_table[] = {
     { OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))fips_get_params },
     { OSSL_FUNC_PROVIDER_QUERY_OPERATION, (void (*)(void))fips_query },
     { OSSL_FUNC_PROVIDER_GET_CAPABILITIES,
-      (void (*)(void))ossl_prov_get_capabilities },
+        (void (*)(void))ossl_prov_get_capabilities },
     { OSSL_FUNC_PROVIDER_SELF_TEST, (void (*)(void))fips_self_test },
     { OSSL_FUNC_PROVIDER_RANDOM_BYTES, (void (*)(void))fips_random_bytes },
     OSSL_DISPATCH_END
@@ -737,17 +736,17 @@ static const OSSL_DISPATCH intern_dispatch_table[] = {
  * we must switch back to this default explicitly here.
  */
 #ifdef __VMS
-# pragma names save
-# pragma names uppercase,truncated
+#pragma names save
+#pragma names uppercase, truncated
 #endif
 OSSL_provider_init_fn OSSL_provider_init_int;
 #ifdef __VMS
-# pragma names restore
+#pragma names restore
 #endif
 int OSSL_provider_init_int(const OSSL_CORE_HANDLE *handle,
-                           const OSSL_DISPATCH *in,
-                           const OSSL_DISPATCH **out,
-                           void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     FIPS_GLOBAL *fgbl;
     OSSL_LIB_CTX *libctx = NULL;
@@ -763,7 +762,11 @@ int OSSL_provider_init_int(const OSSL_CORE_HANDLE *handle,
          * multiple versions of libcrypto (e.g. one static and one dynamic), but
          * sharing a single fips.so. We do a simple sanity check here.
          */
-#define set_func(c, f) if (c == NULL) c = f; else if (c != f) return 0;
+#define set_func(c, f) \
+    if (c == NULL)     \
+        c = f;         \
+    else if (c != f)   \
+        return 0;
         switch (in->function_id) {
         case OSSL_FUNC_CORE_GET_LIBCTX:
             set_func(c_get_libctx, OSSL_FUNC_core_get_libctx(in));
@@ -791,11 +794,14 @@ int OSSL_provider_init_int(const OSSL_CORE_HANDLE *handle,
             break;
         case OSSL_FUNC_CORE_CLEAR_LAST_ERROR_MARK:
             set_func(c_clear_last_error_mark,
-                     OSSL_FUNC_core_clear_last_error_mark(in));
+                OSSL_FUNC_core_clear_last_error_mark(in));
             break;
         case OSSL_FUNC_CORE_POP_ERROR_TO_MARK:
             set_func(c_pop_error_to_mark, OSSL_FUNC_core_pop_error_to_mark(in));
             break;
+        case OSSL_FUNC_CORE_COUNT_TO_MARK:
+            set_func(c_count_to_mark, OSSL_FUNC_core_count_to_mark(in));
+            break;
         case OSSL_FUNC_CRYPTO_MALLOC:
             set_func(c_CRYPTO_malloc, OSSL_FUNC_CRYPTO_malloc(in));
             break;
@@ -813,39 +819,39 @@ int OSSL_provider_init_int(const OSSL_CORE_HANDLE *handle,
             break;
         case OSSL_FUNC_CRYPTO_CLEAR_REALLOC:
             set_func(c_CRYPTO_clear_realloc,
-                     OSSL_FUNC_CRYPTO_clear_realloc(in));
+                OSSL_FUNC_CRYPTO_clear_realloc(in));
             break;
         case OSSL_FUNC_CRYPTO_SECURE_MALLOC:
             set_func(c_CRYPTO_secure_malloc,
-                     OSSL_FUNC_CRYPTO_secure_malloc(in));
+                OSSL_FUNC_CRYPTO_secure_malloc(in));
             break;
         case OSSL_FUNC_CRYPTO_SECURE_ZALLOC:
             set_func(c_CRYPTO_secure_zalloc,
-                     OSSL_FUNC_CRYPTO_secure_zalloc(in));
+                OSSL_FUNC_CRYPTO_secure_zalloc(in));
             break;
         case OSSL_FUNC_CRYPTO_SECURE_FREE:
             set_func(c_CRYPTO_secure_free,
-                     OSSL_FUNC_CRYPTO_secure_free(in));
+                OSSL_FUNC_CRYPTO_secure_free(in));
             break;
         case OSSL_FUNC_CRYPTO_SECURE_CLEAR_FREE:
             set_func(c_CRYPTO_secure_clear_free,
-                     OSSL_FUNC_CRYPTO_secure_clear_free(in));
+                OSSL_FUNC_CRYPTO_secure_clear_free(in));
             break;
         case OSSL_FUNC_CRYPTO_SECURE_ALLOCATED:
             set_func(c_CRYPTO_secure_allocated,
-                     OSSL_FUNC_CRYPTO_secure_allocated(in));
+                OSSL_FUNC_CRYPTO_secure_allocated(in));
             break;
         case OSSL_FUNC_BIO_NEW_FILE:
             set_func(selftest_params.bio_new_file_cb,
-                     OSSL_FUNC_BIO_new_file(in));
+                OSSL_FUNC_BIO_new_file(in));
             break;
         case OSSL_FUNC_BIO_NEW_MEMBUF:
             set_func(selftest_params.bio_new_buffer_cb,
-                     OSSL_FUNC_BIO_new_membuf(in));
+                OSSL_FUNC_BIO_new_membuf(in));
             break;
         case OSSL_FUNC_BIO_READ_EX:
             set_func(selftest_params.bio_read_ex_cb,
-                     OSSL_FUNC_BIO_read_ex(in));
+                OSSL_FUNC_BIO_read_ex(in));
             break;
         case OSSL_FUNC_BIO_FREE:
             set_func(selftest_params.bio_free_cb, OSSL_FUNC_BIO_free(in));
@@ -869,7 +875,7 @@ int OSSL_provider_init_int(const OSSL_CORE_HANDLE *handle,
 
     /*  Create a context. */
     if ((*provctx = ossl_prov_ctx_new()) == NULL
-            || (libctx = OSSL_LIB_CTX_new()) == NULL)
+        || (libctx = OSSL_LIB_CTX_new()) == NULL)
         goto err;
 
     if ((fgbl = ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_FIPS_PROV_INDEX)) == NULL)
@@ -886,6 +892,15 @@ int OSSL_provider_init_int(const OSSL_CORE_HANDLE *handle,
     if (!ossl_thread_register_fips(libctx))
         goto err;
 
+    /*
+     * Ensure our internal provider is loaded. We use this whenever the FIPS
+     * provider internally uses the EVP API. We proactively load this now
+     * rather than waiting for lazy loading to ensure it is always present when
+     * we need it.
+     */
+    if (!ossl_provider_activate_fallbacks(libctx))
+        goto err;
+
     /*
      * We did initial set up of selftest_params in a local copy, because we
      * could not create fgbl until c_CRYPTO_zalloc was defined in the loop
@@ -910,14 +925,14 @@ int OSSL_provider_init_int(const OSSL_CORE_HANDLE *handle,
         SELF_TEST_disable_conditional_error_state();
 
     /* Enable or disable FIPS provider options */
-#define OSSL_FIPS_PARAM(structname, paramname, unused)                         \
-    if (fgbl->fips_##structname.option != NULL) {                              \
-        if (strcmp(fgbl->fips_##structname.option, "1") == 0)                  \
-            fgbl->fips_##structname.enabled = 1;                               \
-        else if (strcmp(fgbl->fips_##structname.option, "0") == 0)             \
-            fgbl->fips_##structname.enabled = 0;                               \
-        else                                                                   \
-            goto err;                                                          \
+#define OSSL_FIPS_PARAM(structname, paramname, unused)             \
+    if (fgbl->fips_##structname.option != NULL) {                  \
+        if (strcmp(fgbl->fips_##structname.option, "1") == 0)      \
+            fgbl->fips_##structname.enabled = 1;                   \
+        else if (strcmp(fgbl->fips_##structname.option, "0") == 0) \
+            fgbl->fips_##structname.enabled = 0;                   \
+        else                                                       \
+            goto err;                                              \
     }
 #include "fips_indicator_params.inc"
 #undef OSSL_FIPS_PARAM
@@ -935,7 +950,7 @@ int OSSL_provider_init_int(const OSSL_CORE_HANDLE *handle,
 
     *out = fips_dispatch_table;
     return 1;
- err:
+err:
     fips_teardown(*provctx);
     OSSL_LIB_CTX_free(libctx);
     *provctx = NULL;
@@ -951,9 +966,9 @@ int OSSL_provider_init_int(const OSSL_CORE_HANDLE *handle,
  */
 OSSL_provider_init_fn ossl_fips_intern_provider_init;
 int ossl_fips_intern_provider_init(const OSSL_CORE_HANDLE *handle,
-                                   const OSSL_DISPATCH *in,
-                                   const OSSL_DISPATCH **out,
-                                   void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     OSSL_FUNC_core_get_libctx_fn *c_internal_get_libctx = NULL;
 
@@ -979,7 +994,7 @@ int ossl_fips_intern_provider_init(const OSSL_CORE_HANDLE *handle,
      * able to do.
      */
     ossl_prov_ctx_set0_libctx(*provctx,
-                              (OSSL_LIB_CTX *)c_internal_get_libctx(handle));
+        (OSSL_LIB_CTX *)c_internal_get_libctx(handle));
     ossl_prov_ctx_set0_handle(*provctx, handle);
 
     *out = intern_dispatch_table;
@@ -1025,6 +1040,11 @@ int ERR_pop_to_mark(void)
     return c_pop_error_to_mark(NULL);
 }
 
+int ERR_count_to_mark(void)
+{
+    return c_count_to_mark != NULL ? c_count_to_mark(NULL) : 0;
+}
+
 /*
  * This must take a library context, since it's called from the depths
  * of crypto/initthread.c code, where it's (correctly) assumed that the
@@ -1035,7 +1055,7 @@ int ERR_pop_to_mark(void)
 const OSSL_CORE_HANDLE *FIPS_get_core_handle(OSSL_LIB_CTX *libctx)
 {
     FIPS_GLOBAL *fgbl = ossl_lib_ctx_get_data(libctx,
-                                              OSSL_LIB_CTX_FIPS_PROV_INDEX);
+        OSSL_LIB_CTX_FIPS_PROV_INDEX);
 
     if (fgbl == NULL)
         return NULL;
@@ -1069,7 +1089,7 @@ 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)
 {
     return c_CRYPTO_clear_realloc(addr, old_num, num, file, line);
 }
@@ -1100,7 +1120,7 @@ int CRYPTO_secure_allocated(const void *ptr)
 }
 
 void *CRYPTO_aligned_alloc(size_t num, size_t align, void **freeptr,
-                           const char *file, int line)
+    const char *file, int line)
 {
     return NULL;
 }
@@ -1116,19 +1136,18 @@ int BIO_snprintf(char *buf, size_t n, const char *format, ...)
     return ret;
 }
 
-#define OSSL_FIPS_PARAM(structname, paramname, unused)                         \
-    int ossl_fips_config_##structname(OSSL_LIB_CTX *libctx)                    \
-    {                                                                          \
-        FIPS_GLOBAL *fgbl =                                                    \
-            ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_FIPS_PROV_INDEX);       \
-                                                                               \
-        return fgbl->fips_##structname.enabled;                                \
+#define OSSL_FIPS_PARAM(structname, paramname, unused)                                   \
+    int ossl_fips_config_##structname(OSSL_LIB_CTX *libctx)                              \
+    {                                                                                    \
+        FIPS_GLOBAL *fgbl = ossl_lib_ctx_get_data(libctx, OSSL_LIB_CTX_FIPS_PROV_INDEX); \
+                                                                                         \
+        return fgbl->fips_##structname.enabled;                                          \
     }
 #include "fips_indicator_params.inc"
 #undef OSSL_FIPS_PARAM
 
 void OSSL_SELF_TEST_get_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK **cb,
-                                 void **cbarg)
+    void **cbarg)
 {
     assert(libctx != NULL);
 
@@ -1144,7 +1163,7 @@ void OSSL_SELF_TEST_get_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK **cb,
 }
 
 void OSSL_INDICATOR_get_callback(OSSL_LIB_CTX *libctx,
-                                 OSSL_INDICATOR_CALLBACK **cb)
+    OSSL_INDICATOR_CALLBACK **cb)
 {
     assert(libctx != NULL);
 
diff --git a/providers/fips/include/fips/fipsindicator.h b/providers/fips/include/fips/fipsindicator.h
index 045d2108d549a..6b3cd5646ddd8 100644
--- a/providers/fips/include/fips/fipsindicator.h
+++ b/providers/fips/include/fips/fipsindicator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -9,31 +9,31 @@
 
 #ifdef FIPS_MODULE
 
-# include <openssl/core.h> /* OSSL_CALLBACK, OSSL_LIB_CTX */
-# include <openssl/indicator.h>
-# include "crypto/types.h"
-# include <openssl/ec.h>
-# include "fipscommon.h"
+#include <openssl/core.h> /* OSSL_CALLBACK, OSSL_LIB_CTX */
+#include <openssl/indicator.h>
+#include "crypto/types.h"
+#include <openssl/ec.h>
+#include "fipscommon.h"
 
 /*
  * There may be multiple settables associated with an algorithm that allow
  * overriding the default status.
  * We associate an id with each of these.
  */
-# define OSSL_FIPS_IND_SETTABLE0 0
-# define OSSL_FIPS_IND_SETTABLE1 1
-# define OSSL_FIPS_IND_SETTABLE2 2
-# define OSSL_FIPS_IND_SETTABLE3 3
-# define OSSL_FIPS_IND_SETTABLE4 4
-# define OSSL_FIPS_IND_SETTABLE5 5
-# define OSSL_FIPS_IND_SETTABLE6 6
-# define OSSL_FIPS_IND_SETTABLE7 7
-# define OSSL_FIPS_IND_SETTABLE_MAX (1 + OSSL_FIPS_IND_SETTABLE7)
+#define OSSL_FIPS_IND_SETTABLE0 0
+#define OSSL_FIPS_IND_SETTABLE1 1
+#define OSSL_FIPS_IND_SETTABLE2 2
+#define OSSL_FIPS_IND_SETTABLE3 3
+#define OSSL_FIPS_IND_SETTABLE4 4
+#define OSSL_FIPS_IND_SETTABLE5 5
+#define OSSL_FIPS_IND_SETTABLE6 6
+#define OSSL_FIPS_IND_SETTABLE7 7
+#define OSSL_FIPS_IND_SETTABLE_MAX (1 + OSSL_FIPS_IND_SETTABLE7)
 
 /* Each settable is in one of 3 states */
-#define OSSL_FIPS_IND_STATE_UNKNOWN    -1  /* Initial unknown state */
-#define OSSL_FIPS_IND_STATE_STRICT      1  /* Strict enforcement */
-#define OSSL_FIPS_IND_STATE_TOLERANT    0  /* Relaxation of rules */
+#define OSSL_FIPS_IND_STATE_UNKNOWN -1 /* Initial unknown state */
+#define OSSL_FIPS_IND_STATE_STRICT 1 /* Strict enforcement */
+#define OSSL_FIPS_IND_STATE_TOLERANT 0 /* Relaxation of rules */
 
 /*
  * For each algorithm context there may be multiple checks that determine if
@@ -57,95 +57,96 @@ typedef struct ossl_fips_ind_st {
     signed char settable[OSSL_FIPS_IND_SETTABLE_MAX]; /* See OSSL_FIPS_IND_STATE */
 } OSSL_FIPS_IND;
 
-typedef int (OSSL_FIPS_IND_CHECK_CB)(OSSL_LIB_CTX *libctx);
+typedef int(OSSL_FIPS_IND_CHECK_CB)(OSSL_LIB_CTX *libctx);
 
 int ossl_FIPS_IND_callback(OSSL_LIB_CTX *libctx, const char *type,
-                           const char *desc);
+    const char *desc);
 
 void ossl_FIPS_IND_init(OSSL_FIPS_IND *ind);
 void ossl_FIPS_IND_set_approved(OSSL_FIPS_IND *ind);
 void ossl_FIPS_IND_set_settable(OSSL_FIPS_IND *ind, int id, int enable);
 int ossl_FIPS_IND_get_settable(const OSSL_FIPS_IND *ind, int id);
 int ossl_FIPS_IND_on_unapproved(OSSL_FIPS_IND *ind, int id, OSSL_LIB_CTX *libctx,
-                                const char *algname, const char *opname,
-                                OSSL_FIPS_IND_CHECK_CB *config_check_fn);
+    const char *algname, const char *opname,
+    OSSL_FIPS_IND_CHECK_CB *config_check_fn);
 int ossl_FIPS_IND_set_ctx_param(OSSL_FIPS_IND *ind, int id,
-                                const OSSL_PARAM params[], const char *name);
+    const OSSL_PARAM params[], const char *name);
 int ossl_FIPS_IND_get_ctx_param(const OSSL_FIPS_IND *ind,
-                                      OSSL_PARAM params[]);
+    OSSL_PARAM params[]);
 void ossl_FIPS_IND_copy(OSSL_FIPS_IND *dst, const OSSL_FIPS_IND *src);
 
 /* Place this in the algorithm ctx structure */
-# define OSSL_FIPS_IND_DECLARE OSSL_FIPS_IND indicator;
+#define OSSL_FIPS_IND_DECLARE OSSL_FIPS_IND indicator;
 /* Call this to initialize the indicator */
-# define OSSL_FIPS_IND_INIT(ctx) ossl_FIPS_IND_init(&ctx->indicator);
+#define OSSL_FIPS_IND_INIT(ctx) ossl_FIPS_IND_init(&ctx->indicator);
 /*
  * Use the copy if an algorithm has a dup function that does not copy the src to
  * the dst.
  */
-# define OSSL_FIPS_IND_COPY(dst, src) ossl_FIPS_IND_copy(&dst->indicator, &src->indicator);
+#define OSSL_FIPS_IND_COPY(dst, src) ossl_FIPS_IND_copy(&dst->indicator, &src->indicator);
 
 /*
  * Required for reset - since once something becomes unapproved it will remain
  * unapproved unless this is used. This should be used in the init before
  * params are set into the ctx & before any FIPS checks are done.
  */
-# define OSSL_FIPS_IND_SET_APPROVED(ctx) ossl_FIPS_IND_set_approved(&ctx->indicator);
+#define OSSL_FIPS_IND_SET_APPROVED(ctx) ossl_FIPS_IND_set_approved(&ctx->indicator);
 /*
  * This should be called if a FIPS check fails, to indicate the operation is not approved
  * If there is more than 1 strict check flag per algorithm ctx, the id represents
  * the index.
  */
-# define OSSL_FIPS_IND_ON_UNAPPROVED(ctx, id, libctx, algname, opname, config_check_fn) \
+#define OSSL_FIPS_IND_ON_UNAPPROVED(ctx, id, libctx, algname, opname, config_check_fn) \
     ossl_FIPS_IND_on_unapproved(&ctx->indicator, id, libctx, algname, opname, config_check_fn)
 
-# define OSSL_FIPS_IND_SETTABLE_CTX_PARAM(name) \
+#define OSSL_FIPS_IND_SETTABLE_CTX_PARAM(name) \
     OSSL_PARAM_int(name, NULL),
 
 /*
  * The id here must match the one used by OSSL_FIPS_IND_ON_UNAPPROVED
  * The name must match the param used by OSSL_FIPS_IND_SETTABLE_CTX_PARAM
  */
-# define OSSL_FIPS_IND_SET_CTX_PARAM(ctx, id, params, name) \
+#define OSSL_FIPS_IND_SET_CTX_PARAM(ctx, id, params, name) \
     ossl_FIPS_IND_set_ctx_param(&((ctx)->indicator), id, params, name)
 
-# define OSSL_FIPS_IND_GETTABLE_CTX_PARAM() \
+#define OSSL_FIPS_IND_GETTABLE_CTX_PARAM() \
     OSSL_PARAM_int(OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR, NULL),
 
-# define OSSL_FIPS_IND_GET_CTX_PARAM(ctx, prms) \
+#define OSSL_FIPS_IND_GET_CTX_PARAM(ctx, prms) \
     ossl_FIPS_IND_get_ctx_param(&((ctx)->indicator), prms)
 
-# define OSSL_FIPS_IND_GET(ctx) (&((ctx)->indicator))
+#define OSSL_FIPS_IND_GET(ctx) (&((ctx)->indicator))
 
-# define OSSL_FIPS_IND_GET_PARAM(ctx, p, settable, id, name)                   \
-    *settable = ossl_FIPS_IND_get_settable(&((ctx)->indicator), id);           \
-    if (*settable != OSSL_FIPS_IND_STATE_UNKNOWN)                              \
+#define OSSL_FIPS_IND_GET_PARAM(ctx, p, settable, id, name)          \
+    *settable = ossl_FIPS_IND_get_settable(&((ctx)->indicator), id); \
+    if (*settable != OSSL_FIPS_IND_STATE_UNKNOWN)                    \
         *p = OSSL_PARAM_construct_int(name, settable);
 
 int ossl_fips_ind_rsa_key_check(OSSL_FIPS_IND *ind, int id, OSSL_LIB_CTX *libctx,
-                                const RSA *rsa, const char *desc, int protect);
-# ifndef OPENSSL_NO_EC
+    const RSA *rsa, const char *desc, int protect);
+#ifndef OPENSSL_NO_EC
 int ossl_fips_ind_ec_key_check(OSSL_FIPS_IND *ind, int id, OSSL_LIB_CTX *libctx,
-                               const EC_GROUP *group, const char *desc,
-                               int protect);
-# endif
+    const EC_GROUP *group, const char *desc,
+    int protect);
+#endif
 int ossl_fips_ind_digest_exch_check(OSSL_FIPS_IND *ind, int id, OSSL_LIB_CTX *libctx,
-                                    const EVP_MD *md, const char *desc);
+    const EVP_MD *md, const char *desc);
 int ossl_fips_ind_digest_sign_check(OSSL_FIPS_IND *ind, int id,
-                                    OSSL_LIB_CTX *libctx,
-                                    int nid, int sha1_allowed,
-                                    const char *desc,
-                                    OSSL_FIPS_IND_CHECK_CB *config_check_f);
+    OSSL_LIB_CTX *libctx,
+    int nid, int sha1_allowed,
+    int sha512_trunc_allowed,
+    const char *desc,
+    OSSL_FIPS_IND_CHECK_CB *config_check_f);
 
 #else
-# define OSSL_FIPS_IND_DECLARE
-# define OSSL_FIPS_IND_INIT(ctx)
-# define OSSL_FIPS_IND_SET_APPROVED(ctx)
-# define OSSL_FIPS_IND_ON_UNAPPROVED(ctx, id, libctx, algname, opname, configopt_fn)
-# define OSSL_FIPS_IND_SETTABLE_CTX_PARAM(name)
-# define OSSL_FIPS_IND_SET_CTX_PARAM(ctx, id, params, name) 1
-# define OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-# define OSSL_FIPS_IND_GET_CTX_PARAM(ctx, params) 1
-# define OSSL_FIPS_IND_COPY(dst, src)
+#define OSSL_FIPS_IND_DECLARE
+#define OSSL_FIPS_IND_INIT(ctx)
+#define OSSL_FIPS_IND_SET_APPROVED(ctx)
+#define OSSL_FIPS_IND_ON_UNAPPROVED(ctx, id, libctx, algname, opname, configopt_fn)
+#define OSSL_FIPS_IND_SETTABLE_CTX_PARAM(name)
+#define OSSL_FIPS_IND_SET_CTX_PARAM(ctx, id, params, name) 1
+#define OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
+#define OSSL_FIPS_IND_GET_CTX_PARAM(ctx, params) 1
+#define OSSL_FIPS_IND_COPY(dst, src)
 
 #endif
diff --git a/providers/fips/include/fipscommon.h b/providers/fips/include/fipscommon.h
index 5cbf347d1b063..c8df9a8ac4f90 100644
--- a/providers/fips/include/fipscommon.h
+++ b/providers/fips/include/fipscommon.h
@@ -8,11 +8,11 @@
  */
 
 #ifdef FIPS_MODULE
-# include <openssl/types.h>
+#include <openssl/types.h>
 
-# define OSSL_FIPS_PARAM(structname, paramname, unused) \
+#define OSSL_FIPS_PARAM(structname, paramname, unused) \
     int ossl_fips_config_##structname(OSSL_LIB_CTX *libctx);
-# include "fips_indicator_params.inc"
-# undef OSSL_FIPS_PARAM
+#include "fips_indicator_params.inc"
+#undef OSSL_FIPS_PARAM
 
 #endif
diff --git a/providers/fips/self_test.c b/providers/fips/self_test.c
index ef7be26ca7223..008a4fac847fc 100644
--- a/providers/fips/self_test.c
+++ b/providers/fips/self_test.c
@@ -32,21 +32,21 @@
 #include "internal/thread_once.h"
 #include "self_test.h"
 
-#define FIPS_STATE_INIT     0
+#define FIPS_STATE_INIT 0
 #define FIPS_STATE_SELFTEST 1
-#define FIPS_STATE_RUNNING  2
-#define FIPS_STATE_ERROR    3
+#define FIPS_STATE_RUNNING 2
+#define FIPS_STATE_ERROR 3
 
 /*
  * The number of times the module will report it is in the error state
  * before going quiet.
  */
-#define FIPS_ERROR_REPORTING_RATE_LIMIT     10
+#define FIPS_ERROR_REPORTING_RATE_LIMIT 10
 
 /* The size of a temp buffer used to read in data */
 #define INTEGRITY_BUF_SIZE (4096)
 #define MAX_MD_SIZE 64
-#define MAC_NAME    "HMAC"
+#define MAC_NAME "HMAC"
 #define DIGEST_NAME "SHA256"
 
 static int FIPS_conditional_error_check = 1;
@@ -72,9 +72,9 @@ DEFINE_RUN_ONCE_STATIC(do_fips_self_test_init)
  * Declarations for the DEP entry/exit points.
  * Ones not required or incorrect need to be undefined or redefined respectively.
  */
-#define DEP_INITIAL_STATE   FIPS_STATE_INIT
-#define DEP_INIT_ATTRIBUTE  static
-#define DEP_FINI_ATTRIBUTE  static
+#define DEP_INITIAL_STATE FIPS_STATE_INIT
+#define DEP_INIT_ATTRIBUTE static
+#define DEP_FINI_ATTRIBUTE static
 
 static void init(void);
 static void cleanup(void);
@@ -84,14 +84,14 @@ static void cleanup(void);
  * See FIPS 140-2 IG 9.10
  */
 #if defined(_WIN32) || defined(__CYGWIN__)
-# ifdef __CYGWIN__
+#ifdef __CYGWIN__
 /* pick DLL_[PROCESS|THREAD]_[ATTACH|DETACH] definitions */
-#  include <windows.h>
+#include <windows.h>
 /*
  * this has side-effect of _WIN32 getting defined, which otherwise is
  * mutually exclusive with __CYGWIN__...
  */
-# endif
+#endif
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
@@ -110,20 +110,20 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 }
 
 #elif defined(__GNUC__) && !defined(_AIX)
-# undef DEP_INIT_ATTRIBUTE
-# undef DEP_FINI_ATTRIBUTE
-# define DEP_INIT_ATTRIBUTE static __attribute__((constructor))
-# define DEP_FINI_ATTRIBUTE static __attribute__((destructor))
+#undef DEP_INIT_ATTRIBUTE
+#undef DEP_FINI_ATTRIBUTE
+#define DEP_INIT_ATTRIBUTE static __attribute__((constructor))
+#define DEP_FINI_ATTRIBUTE static __attribute__((destructor))
 
 #elif defined(__sun)
-# pragma init(init)
-# pragma fini(cleanup)
+#pragma init(init)
+#pragma fini(cleanup)
 
 #elif defined(_AIX) && !defined(__GNUC__)
 void _init(void);
 void _cleanup(void);
-# pragma init(_init)
-# pragma fini(_cleanup)
+#pragma init(_init)
+#pragma fini(_cleanup)
 void _init(void)
 {
     init();
@@ -134,17 +134,19 @@ void _cleanup(void)
 }
 
 #elif defined(__hpux)
-# pragma init "init"
-# pragma fini "cleanup"
+#pragma init "init"
+#pragma fini "cleanup"
 
 #elif defined(__TANDEM)
 /* Method automatically called by the NonStop OS when the DLL loads */
-void __INIT__init(void) {
+void __INIT__init(void)
+{
     init();
 }
 
 /* Method automatically called by the NonStop OS prior to unloading the DLL */
-void __TERM__cleanup(void) {
+void __TERM__cleanup(void)
+{
     cleanup();
 }
 
@@ -154,10 +156,10 @@ void __TERM__cleanup(void) {
  * We force the self-tests to run as part of the FIPS provider initialisation
  * rather than being triggered by the DEP.
  */
-# undef DEP_INIT_ATTRIBUTE
-# undef DEP_FINI_ATTRIBUTE
-# undef DEP_INITIAL_STATE
-# define DEP_INITIAL_STATE  FIPS_STATE_SELFTEST
+#undef DEP_INIT_ATTRIBUTE
+#undef DEP_FINI_ATTRIBUTE
+#undef DEP_INITIAL_STATE
+#define DEP_INITIAL_STATE FIPS_STATE_SELFTEST
 #endif
 
 static TSAN_QUALIFIER int FIPS_state = DEP_INITIAL_STATE;
@@ -204,28 +206,28 @@ static int integrity_self_test(OSSL_SELF_TEST *ev, OSSL_LIB_CTX *libctx)
     unsigned char out[EVP_MAX_MD_SIZE];
     size_t out_len = 0;
 
-    OSSL_PARAM   params[2];
-    EVP_MAC     *mac = EVP_MAC_fetch(libctx, MAC_NAME, NULL);
+    OSSL_PARAM params[2];
+    EVP_MAC *mac = EVP_MAC_fetch(libctx, MAC_NAME, NULL);
     EVP_MAC_CTX *ctx = EVP_MAC_CTX_new(mac);
 
     OSSL_SELF_TEST_onbegin(ev, OSSL_SELF_TEST_TYPE_KAT_INTEGRITY,
-                               OSSL_SELF_TEST_DESC_INTEGRITY_HMAC);
+        OSSL_SELF_TEST_DESC_INTEGRITY_HMAC);
 
     params[0] = OSSL_PARAM_construct_utf8_string("digest", DIGEST_NAME, 0);
     params[1] = OSSL_PARAM_construct_end();
 
     if (ctx == NULL
-            || mac == NULL
-            || !EVP_MAC_init(ctx, hmac_kat_key, sizeof(hmac_kat_key), params)
-            || !EVP_MAC_update(ctx, hmac_kat_pt, sizeof(hmac_kat_pt))
-            || !EVP_MAC_final(ctx, out, &out_len, MAX_MD_SIZE))
+        || mac == NULL
+        || !EVP_MAC_init(ctx, hmac_kat_key, sizeof(hmac_kat_key), params)
+        || !EVP_MAC_update(ctx, hmac_kat_pt, sizeof(hmac_kat_pt))
+        || !EVP_MAC_final(ctx, out, &out_len, MAX_MD_SIZE))
         goto err;
 
     /* Optional corruption */
     OSSL_SELF_TEST_oncorrupt_byte(ev, out);
 
     if (out_len != sizeof(hmac_kat_digest)
-            || memcmp(out, hmac_kat_digest, out_len) != 0)
+        || memcmp(out, hmac_kat_digest, out_len) != 0)
         goto err;
     ok = 1;
 err:
@@ -241,9 +243,9 @@ static int integrity_self_test(OSSL_SELF_TEST *ev, OSSL_LIB_CTX *libctx)
  * Return 1 if verified, or 0 if it fails.
  */
 static int verify_integrity(OSSL_CORE_BIO *bio, OSSL_FUNC_BIO_read_ex_fn read_ex_cb,
-                            unsigned char *expected, size_t expected_len,
-                            OSSL_LIB_CTX *libctx, OSSL_SELF_TEST *ev,
-                            const char *event_type)
+    unsigned char *expected, size_t expected_len,
+    OSSL_LIB_CTX *libctx, OSSL_SELF_TEST *ev,
+    const char *event_type)
 {
     int ret = 0, status;
     unsigned char out[MAX_MD_SIZE];
@@ -283,16 +285,16 @@ static int verify_integrity(OSSL_CORE_BIO *bio, OSSL_FUNC_BIO_read_ex_fn read_ex
 
     OSSL_SELF_TEST_oncorrupt_byte(ev, out);
     if (expected_len != out_len
-            || memcmp(expected, out, out_len) != 0)
+        || memcmp(expected, out, out_len) != 0)
         goto err;
     ret = 1;
 err:
     OSSL_SELF_TEST_onend(ev, ret);
     EVP_MAC_CTX_free(ctx);
     EVP_MAC_free(mac);
-# ifdef OPENSSL_PEDANTIC_ZEROIZATION
+#ifdef OPENSSL_PEDANTIC_ZEROIZATION
     OPENSSL_cleanse(out, sizeof(out));
-# endif
+#endif
     return ret;
 }
 #endif /* OPENSSL_NO_FIPS_POST */
@@ -353,7 +355,7 @@ int SELF_TEST_post(SELF_TEST_POST_PARAMS *st, int on_demand_test)
     }
 
     if (st == NULL
-            || st->module_checksum_data == NULL) {
+        || st->module_checksum_data == NULL) {
         ERR_raise(ERR_LIB_PROV, PROV_R_MISSING_CONFIG_DATA);
         goto end;
     }
@@ -363,7 +365,7 @@ int SELF_TEST_post(SELF_TEST_POST_PARAMS *st, int on_demand_test)
         goto end;
 
     module_checksum = OPENSSL_hexstr2buf(st->module_checksum_data,
-                                         &checksum_len);
+        &checksum_len);
     if (module_checksum == NULL) {
         ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_CONFIG_DATA);
         goto end;
@@ -372,9 +374,9 @@ int SELF_TEST_post(SELF_TEST_POST_PARAMS *st, int on_demand_test)
 
     /* Always check the integrity of the fips module */
     if (bio_module == NULL
-            || !verify_integrity(bio_module, st->bio_read_ex_cb,
-                                 module_checksum, checksum_len, st->libctx,
-                                 ev, OSSL_SELF_TEST_TYPE_MODULE_INTEGRITY)) {
+        || !verify_integrity(bio_module, st->bio_read_ex_cb,
+            module_checksum, checksum_len, st->libctx,
+            ev, OSSL_SELF_TEST_TYPE_MODULE_INTEGRITY)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_MODULE_INTEGRITY_FAILURE);
         goto end;
     }
@@ -388,8 +390,9 @@ int SELF_TEST_post(SELF_TEST_POST_PARAMS *st, int on_demand_test)
     rng = ossl_rand_get0_private_noncreating(st->libctx);
     if (rng != NULL)
         if ((testrand = EVP_RAND_fetch(st->libctx, "TEST-RAND", NULL)) == NULL
-                || strcmp(EVP_RAND_get0_name(EVP_RAND_CTX_get0_rand(rng)),
-                          EVP_RAND_get0_name(testrand)) == 0) {
+            || strcmp(EVP_RAND_get0_name(EVP_RAND_CTX_get0_rand(rng)),
+                   EVP_RAND_get0_name(testrand))
+                == 0) {
             ERR_raise(ERR_LIB_PROV, PROV_R_SELF_TEST_KAT_FAILURE);
             goto end;
         }
@@ -424,9 +427,18 @@ void SELF_TEST_disable_conditional_error_state(void)
 
 void ossl_set_error_state(const char *type)
 {
-    int cond_test = (type != NULL && strcmp(type, OSSL_SELF_TEST_TYPE_PCT) == 0);
+    int cond_test = 0;
+    int import_pct = 0;
+
+    if (type != NULL) {
+        cond_test = strcmp(type, OSSL_SELF_TEST_TYPE_PCT) == 0;
+        import_pct = strcmp(type, OSSL_SELF_TEST_TYPE_PCT_IMPORT) == 0;
+    }
 
-    if (!cond_test || (FIPS_conditional_error_check == 1)) {
+    if (import_pct) {
+        /* Failure to import is transient to avoid a DoS attack */
+        ERR_raise(ERR_LIB_PROV, PROV_R_FIPS_MODULE_IMPORT_PCT_ERROR);
+    } else if (!cond_test || (FIPS_conditional_error_check == 1)) {
         set_fips_state(FIPS_STATE_ERROR);
         ERR_raise(ERR_LIB_PROV, PROV_R_FIPS_MODULE_ENTERING_ERROR_STATE);
     } else {
diff --git a/providers/fips/self_test.h b/providers/fips/self_test.h
index cdc90d8d04064..3aaa27218d39c 100644
--- a/providers/fips/self_test.h
+++ b/providers/fips/self_test.h
@@ -13,8 +13,8 @@
 
 typedef struct self_test_post_params_st {
     /* FIPS module integrity check parameters */
-    const char *module_filename;            /* Module file to perform MAC on */
-    const char *module_checksum_data;       /* Expected module MAC integrity */
+    const char *module_filename; /* Module file to perform MAC on */
+    const char *module_checksum_data; /* Expected module MAC integrity */
 
     /* Used for continuous tests */
     const char *conditional_error_check;
diff --git a/providers/fips/self_test_data.inc b/providers/fips/self_test_data.inc
index 5cbb5352a5962..6abab0a7a1735 100644
--- a/providers/fips/self_test_data.inc
+++ b/providers/fips/self_test_data.inc
@@ -169,6 +169,12 @@ typedef struct st_kat_kem_st {
 } ST_KAT_KEM;
 
 /*- DIGEST SELF TEST DATA */
+static const unsigned char sha1_pt[] = "abc";
+static const unsigned char sha1_digest[] = {
+    0xA9, 0x99, 0x3E, 0x36, 0x47, 0x06, 0x81, 0x6A,
+    0xBA, 0x3E, 0x25, 0x71, 0x78, 0x50, 0xC2, 0x6C,
+    0x9C, 0xD0, 0xD8, 0x9D
+};
 static const unsigned char sha512_pt[] = "abc";
 static const unsigned char sha512_digest[] = {
     0xDD, 0xAF, 0x35, 0xA1, 0x93, 0x61, 0x7A, 0xBA, 0xCC, 0x41, 0x73, 0x49,
@@ -187,11 +193,17 @@ static const unsigned char sha3_256_digest[] = {
 
 /*
  * Note:
- *  SHA1 and SHA256 are tested by higher level algorithms so a
+ *  SHA256 is tested by higher level algorithms so a
  *  CAST is not needed.
  */
 static const ST_KAT_DIGEST st_kat_digest_tests[] =
 {
+    {
+         OSSL_SELF_TEST_DESC_MD_SHA1,
+         "SHA1",
+         ITM_STR(sha1_pt),
+         ITM(sha1_digest),
+    },
     {
          OSSL_SELF_TEST_DESC_MD_SHA2,
          "SHA512",
@@ -208,28 +220,6 @@ static const ST_KAT_DIGEST st_kat_digest_tests[] =
 
 /*- CIPHER TEST DATA */
 
-/* DES3 test data */
-static const unsigned char des_ede3_cbc_pt[] = {
-    0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96,
-    0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A,
-    0xAE, 0x2D, 0x8A, 0x57, 0x1E, 0x03, 0xAC, 0x9C,
-    0x9E, 0xB7, 0x6F, 0xAC, 0x45, 0xAF, 0x8E, 0x51
-};
-static const unsigned char des_ede3_cbc_key[] = {
-    0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
-    0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01,
-    0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0x01, 0x23
-};
-static const unsigned char des_ede3_cbc_iv[] = {
-    0xF6, 0x9F, 0x24, 0x45, 0xDF, 0x4F, 0x9B, 0x17
-};
-static const unsigned char des_ede3_cbc_ct[] = {
-    0x20, 0x79, 0xC3, 0xD5, 0x3A, 0xA7, 0x63, 0xE1,
-    0x93, 0xB7, 0x9E, 0x25, 0x69, 0xAB, 0x52, 0x62,
-    0x51, 0x65, 0x70, 0x48, 0x1F, 0x25, 0xB5, 0x0F,
-    0x73, 0xC0, 0xBD, 0xA8, 0x5C, 0x8E, 0x0D, 0xA7
-};
-
 /* AES-256 GCM test data */
 static const unsigned char aes_256_gcm_key[] = {
     0x92, 0xe1, 0x1d, 0xcd, 0xaa, 0x86, 0x6f, 0x5c,
@@ -364,7 +354,7 @@ static const ST_KAT_PARAM hkdf_params[] = {
     ST_KAT_PARAM_END()
 };
 
-static const char sskdf_digest[] = "SHA224";
+static const char sskdf_digest[] = "SHA256";
 static const unsigned char sskdf_secret[] = {
     0x6d, 0xbd, 0xc2, 0x3f, 0x04, 0x54, 0x88, 0xe4,
     0x06, 0x27, 0x57, 0xb0, 0x6b, 0x9e, 0xba, 0xe1,
@@ -383,8 +373,8 @@ static const unsigned char sskdf_otherinfo[] = {
     0x9b, 0x1e, 0xe0, 0xec, 0x3f, 0x8d, 0xbe
 };
 static const unsigned char sskdf_expected[] = {
-    0xa4, 0x62, 0xde, 0x16, 0xa8, 0x9d, 0xe8, 0x46,
-    0x6e, 0xf5, 0x46, 0x0b, 0x47, 0xb8
+    0x27, 0xce, 0x57, 0xed, 0xb1, 0x7e, 0x1f, 0xf2,
+    0xe4, 0x79, 0x2e, 0x84, 0x8b, 0x04, 0xf1, 0xae
 };
 static const ST_KAT_PARAM sskdf_params[] = {
     ST_KAT_PARAM_UTF8STRING(OSSL_KDF_PARAM_DIGEST, sskdf_digest),
@@ -393,7 +383,7 @@ static const ST_KAT_PARAM sskdf_params[] = {
     ST_KAT_PARAM_END()
 };
 
-static const char x942kdf_digest[] = "SHA1";
+static const char x942kdf_digest[] = "SHA256";
 static const char x942kdf_cekalg[] = "AES-128-WRAP";
 static const unsigned char x942kdf_secret[] = {
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
@@ -401,8 +391,8 @@ static const unsigned char x942kdf_secret[] = {
     0x10, 0x11, 0x12, 0x13
 };
 static const unsigned char x942kdf_expected[] = {
-    0xd6, 0xd6, 0xb0, 0x94, 0xc1, 0x02, 0x7a, 0x7d,
-    0xe6, 0xe3, 0x11, 0x72, 0x94, 0xa3, 0x53, 0x64
+    0x79, 0x66, 0xa0, 0x38, 0x22, 0x28, 0x1e, 0xa3,
+    0xeb, 0x08, 0xd9, 0xbc, 0x69, 0x5b, 0xd8, 0xff
 };
 static const ST_KAT_PARAM x942kdf_params[] = {
     ST_KAT_PARAM_UTF8STRING(OSSL_KDF_PARAM_DIGEST, x942kdf_digest),
@@ -809,51 +799,73 @@ static const unsigned char drbg_ctr_aes128_pr_df_expected[] = {
 /*
  * HMAC_DRBG.rsp
  *
- * [SHA-1]
+ * [SHA-256]
  * [PredictionResistance = True]
- * [EntropyInputLen = 128]
- * [NonceLen = 64]
- * [PersonalizationStringLen = 128]
- * [AdditionalInputLen = 128]
- * [ReturnedBitsLen = 640]
+ * [EntropyInputLen = 256]
+ * [NonceLen = 128]
+ * [PersonalizationStringLen = 256]
+ * [AdditionalInputLen = 256]
+ * [ReturnedBitsLen = 1024]
  *
  * COUNT = 0
  */
-static const unsigned char drbg_hmac_sha1_pr_entropyin[] = {
-    0x68, 0x0f, 0xac, 0xe9, 0x0d, 0x7b, 0xca, 0x21, 0xd4, 0xa0, 0xed, 0xb7,
-    0x79, 0x9e, 0xe5, 0xd8
-};
-static const unsigned char drbg_hmac_sha1_pr_nonce[] = {
-    0xb7, 0xbe, 0x9e, 0xed, 0xdd, 0x0e, 0x3b, 0x4b
-};
-static const unsigned char drbg_hmac_sha1_pr_persstr[] = {
-    0xf5, 0x8c, 0x40, 0xae, 0x70, 0xf7, 0xa5, 0x56, 0x48, 0xa9, 0x31, 0xa0,
-    0xa9, 0x31, 0x3d, 0xd7
-};
-static const unsigned char drbg_hmac_sha1_pr_entropyinpr0[] = {
-    0x7c, 0xaf, 0xe2, 0x31, 0x63, 0x0a, 0xa9, 0x5a, 0x74, 0x2c, 0x4e, 0x5f,
-    0x5f, 0x22, 0xc6, 0xa4
-};
-static const unsigned char drbg_hmac_sha1_pr_entropyinpr1[] = {
-    0x1c, 0x0d, 0x77, 0x92, 0x89, 0x88, 0x27, 0x94, 0x8a, 0x58, 0x9f, 0x82,
-    0x2d, 0x1a, 0xf7, 0xa6
-};
-static const unsigned char drbg_hmac_sha1_pr_addin0[] = {
-    0xdc, 0x36, 0x63, 0xf0, 0x62, 0x78, 0x9c, 0xd1, 0x5c, 0xbb, 0x20, 0xc3,
-    0xc1, 0x8c, 0xd9, 0xd7
-};
-static const unsigned char drbg_hmac_sha1_pr_addin1[] = {
-    0xfe, 0x85, 0xb0, 0xab, 0x14, 0xc6, 0x96, 0xe6, 0x9c, 0x24, 0xe7, 0xb5,
-    0xa1, 0x37, 0x12, 0x0c
-};
-static const unsigned char drbg_hmac_sha1_pr_expected[] = {
-    0x68, 0x00, 0x4b, 0x3a, 0x28, 0xf7, 0xf0, 0x1c, 0xf9, 0xe9, 0xb5, 0x71,
-    0x20, 0x79, 0xef, 0x80, 0x87, 0x1b, 0x08, 0xb9, 0xa9, 0x1b, 0xcd, 0x2b,
-    0x9f, 0x09, 0x4d, 0xa4, 0x84, 0x80, 0xb3, 0x4c, 0xaf, 0xd5, 0x59, 0x6b,
-    0x0c, 0x0a, 0x48, 0xe1, 0x48, 0xda, 0xbc, 0x6f, 0x77, 0xb8, 0xff, 0xaf,
-    0x18, 0x70, 0x28, 0xe1, 0x04, 0x13, 0x7a, 0x4f, 0xeb, 0x1c, 0x72, 0xb0,
-    0xc4, 0x4f, 0xe8, 0xb1, 0xaf, 0xab, 0xa5, 0xbc, 0xfd, 0x86, 0x67, 0xf2,
-    0xf5, 0x5b, 0x46, 0x06, 0x63, 0x2e, 0x3c, 0xbc
+static const unsigned char drbg_hmac_sha2_pr_entropyin[] = {
+    0xca, 0x85, 0x19, 0x11, 0x34, 0x93, 0x84, 0xbf,
+    0xfe, 0x89, 0xde, 0x1c, 0xbd, 0xc4, 0x6e, 0x68,
+    0x31, 0xe4, 0x4d, 0x34, 0xa4, 0xfb, 0x93, 0x5e,
+    0xe2, 0x85, 0xdd, 0x14, 0xb7, 0x1a, 0x74, 0x88
+};
+static const unsigned char drbg_hmac_sha2_pr_nonce[] = {
+    0x65, 0x9b, 0xa9, 0x6c, 0x60, 0x1d, 0xc6, 0x9f,
+    0xc9, 0x02, 0x94, 0x08, 0x05, 0xec, 0x0c, 0xa8
+};
+static const unsigned char drbg_hmac_sha2_pr_persstr[] = {
+    0xe7, 0x2d, 0xd8, 0x59, 0x0d, 0x4e, 0xd5, 0x29,
+    0x55, 0x15, 0xc3, 0x5e, 0xd6, 0x19, 0x9e, 0x9d,
+    0x21, 0x1b, 0x8f, 0x06, 0x9b, 0x30, 0x58, 0xca,
+    0xa6, 0x67, 0x0b, 0x96, 0xef, 0x12, 0x08, 0xd0
+};
+static const unsigned char drbg_hmac_sha2_pr_entropyinpr0[] = {
+    0x5c, 0xac, 0xc6, 0x81, 0x65, 0xa2, 0xe2, 0xee,
+    0x20, 0x81, 0x2f, 0x35, 0xec, 0x73, 0xa7, 0x9d,
+    0xbf, 0x30, 0xfd, 0x47, 0x54, 0x76, 0xac, 0x0c,
+    0x44, 0xfc, 0x61, 0x74, 0xcd, 0xac, 0x2b, 0x55
+};
+static const unsigned char drbg_hmac_sha2_pr_entropyinpr1[] = {
+    0x8d, 0xf0, 0x13, 0xb4, 0xd1, 0x03, 0x52, 0x30,
+    0x73, 0x91, 0x7d, 0xdf, 0x6a, 0x86, 0x97, 0x93,
+    0x05, 0x9e, 0x99, 0x43, 0xfc, 0x86, 0x54, 0x54,
+    0x9e, 0x7a, 0xb2, 0x2f, 0x7c, 0x29, 0xf1, 0x22
+};
+static const unsigned char drbg_hmac_sha2_pr_addin0[] = {
+    0x79, 0x3a, 0x7e, 0xf8, 0xf6, 0xf0, 0x48, 0x2b,
+    0xea, 0xc5, 0x42, 0xbb, 0x78, 0x5c, 0x10, 0xf8,
+    0xb7, 0xb4, 0x06, 0xa4, 0xde, 0x92, 0x66, 0x7a,
+    0xb1, 0x68, 0xec, 0xc2, 0xcf, 0x75, 0x73, 0xc6
+};
+static const unsigned char drbg_hmac_sha2_pr_addin1[] = {
+    0x22, 0x38, 0xcd, 0xb4, 0xe2, 0x3d, 0x62, 0x9f,
+    0xe0, 0xc2, 0xa8, 0x3d, 0xd8, 0xd5, 0x14, 0x4c,
+    0xe1, 0xa6, 0x22, 0x9e, 0xf4, 0x1d, 0xab, 0xe2,
+    0xa9, 0x9f, 0xf7, 0x22, 0xe5, 0x10, 0xb5, 0x30
+};
+static const unsigned char drbg_hmac_sha2_pr_expected[] = {
+    0xb1, 0xd1, 0x7c, 0x00, 0x2a, 0x7f, 0xeb, 0xd2,
+    0x84, 0x12, 0xd8, 0xe5, 0x8a, 0x7f, 0x32, 0x31,
+    0x8e, 0x4e, 0xe3, 0x60, 0x5a, 0x99, 0xb0, 0x5b,
+    0x05, 0xd5, 0x93, 0x56, 0xd5, 0xf0, 0xc6, 0xb4,
+    0x96, 0x0a, 0x4b, 0x8f, 0x96, 0x3b, 0x7e, 0xfa,
+    0x55, 0xbb, 0x68, 0x72, 0xfb, 0xea, 0xc7, 0xb9,
+    0x9b, 0x78, 0xde, 0xa8, 0xf3, 0x53, 0x19, 0x73,
+    0x63, 0x7c, 0x94, 0x6a, 0x9c, 0xab, 0x33, 0x49,
+    0x74, 0x4b, 0x24, 0xa0, 0x85, 0x1d, 0xd4, 0x7f,
+    0x2b, 0x3b, 0x46, 0x0c, 0x2c, 0x61, 0x84, 0x6e,
+    0x91, 0x18, 0x1d, 0x62, 0xd4, 0x2c, 0x60, 0xa4,
+    0xef, 0xda, 0x5e, 0xd5, 0x79, 0x02, 0xbf, 0xd7,
+    0x02, 0xb3, 0x49, 0xc5, 0x49, 0x52, 0xc7, 0xf6,
+    0x44, 0x76, 0x9d, 0x8e, 0xf4, 0x01, 0x5e, 0xcc,
+    0x5f, 0x5b, 0xbd, 0x4a, 0xf0, 0x61, 0x34, 0x68,
+    0x8e, 0x30, 0x05, 0x0e, 0x04, 0x97, 0xfb, 0x0a
 };
 
 static const ST_KAT_DRBG st_kat_drbg_tests[] =
@@ -884,15 +896,15 @@ static const ST_KAT_DRBG st_kat_drbg_tests[] =
     },
     {
         OSSL_SELF_TEST_DESC_DRBG_HMAC,
-        "HMAC-DRBG", "digest", "SHA1",
-        ITM(drbg_hmac_sha1_pr_entropyin),
-        ITM(drbg_hmac_sha1_pr_nonce),
-        ITM(drbg_hmac_sha1_pr_persstr),
-        ITM(drbg_hmac_sha1_pr_entropyinpr0),
-        ITM(drbg_hmac_sha1_pr_entropyinpr1),
-        ITM(drbg_hmac_sha1_pr_addin0),
-        ITM(drbg_hmac_sha1_pr_addin1),
-        ITM(drbg_hmac_sha1_pr_expected)
+        "HMAC-DRBG", "digest", "SHA256",
+        ITM(drbg_hmac_sha2_pr_entropyin),
+        ITM(drbg_hmac_sha2_pr_nonce),
+        ITM(drbg_hmac_sha2_pr_persstr),
+        ITM(drbg_hmac_sha2_pr_entropyinpr0),
+        ITM(drbg_hmac_sha2_pr_entropyinpr1),
+        ITM(drbg_hmac_sha2_pr_addin0),
+        ITM(drbg_hmac_sha2_pr_addin1),
+        ITM(drbg_hmac_sha2_pr_expected)
     }
 };
 
@@ -907,38 +919,39 @@ static const unsigned char dh_priv[] = {
     0x40, 0xb8, 0xfc, 0xe6
 };
 static const unsigned char dh_pub[] = {
-    0x95, 0xdd, 0x33, 0x8d, 0x29, 0xe5, 0x71, 0x04,
-    0x92, 0xb9, 0x18, 0x31, 0x7b, 0x72, 0xa3, 0x69,
-    0x36, 0xe1, 0x95, 0x1a, 0x2e, 0xe5, 0xa5, 0x59,
-    0x16, 0x99, 0xc0, 0x48, 0x6d, 0x0d, 0x4f, 0x9b,
-    0xdd, 0x6d, 0x5a, 0x3f, 0x6b, 0x98, 0x89, 0x0c,
-    0x62, 0xb3, 0x76, 0x52, 0xd3, 0x6e, 0x71, 0x21,
-    0x11, 0xe6, 0x8a, 0x73, 0x55, 0x37, 0x25, 0x06,
-    0x99, 0xef, 0xe3, 0x30, 0x53, 0x73, 0x91, 0xfb,
-    0xc2, 0xc5, 0x48, 0xbc, 0x5a, 0xc3, 0xe5, 0xb2,
-    0x33, 0x86, 0xc3, 0xee, 0xf5, 0xeb, 0x43, 0xc0,
-    0x99, 0xd7, 0x0a, 0x52, 0x02, 0x68, 0x7e, 0x83,
-    0x96, 0x42, 0x48, 0xfc, 0xa9, 0x1f, 0x40, 0x90,
-    0x8e, 0x8f, 0xb3, 0x31, 0x93, 0x15, 0xf6, 0xd2,
-    0x60, 0x6d, 0x7f, 0x7c, 0xd5, 0x2c, 0xc6, 0xe7,
-    0xc5, 0x84, 0x3a, 0xfb, 0x22, 0x51, 0x9c, 0xf0,
-    0xf0, 0xf9, 0xd3, 0xa0, 0xa4, 0xe8, 0xc8, 0x88,
-    0x99, 0xef, 0xed, 0xe7, 0x36, 0x43, 0x51, 0xfb,
-    0x6a, 0x36, 0x3e, 0xe7, 0x17, 0xe5, 0x44, 0x5a,
-    0xda, 0xb4, 0xc9, 0x31, 0xa6, 0x48, 0x39, 0x97,
-    0xb8, 0x7d, 0xad, 0x83, 0x67, 0x7e, 0x4d, 0x1d,
-    0x3a, 0x77, 0x75, 0xe0, 0xf6, 0xd0, 0x0f, 0xdf,
-    0x73, 0xc7, 0xad, 0x80, 0x1e, 0x66, 0x5a, 0x0e,
-    0x5a, 0x79, 0x6d, 0x0a, 0x03, 0x80, 0xa1, 0x9f,
-    0xa1, 0x82, 0xef, 0xc8, 0xa0, 0x4f, 0x5e, 0x4d,
-    0xb9, 0x0d, 0x1a, 0x86, 0x37, 0xf9, 0x5d, 0xb1,
-    0x64, 0x36, 0xbd, 0xc8, 0xf3, 0xfc, 0x09, 0x6c,
-    0x4f, 0xf7, 0xf2, 0x34, 0xbe, 0x8f, 0xef, 0x47,
-    0x9a, 0xc4, 0xb0, 0xdc, 0x4b, 0x77, 0x26, 0x3e,
-    0x07, 0xd9, 0x95, 0x9d, 0xe0, 0xf1, 0xbf, 0x3f,
-    0x0a, 0xe3, 0xd9, 0xd5, 0x0e, 0x4b, 0x89, 0xc9,
-    0x9e, 0x3e, 0xa1, 0x21, 0x73, 0x43, 0xdd, 0x8c,
-    0x65, 0x81, 0xac, 0xc4, 0x95, 0x9c, 0x91, 0xd3
+    0x00, 0x8f, 0x81, 0x67, 0x68, 0xce, 0x97, 0x99,
+    0x7e, 0x11, 0x5c, 0xad, 0x5b, 0xe1, 0x0c, 0xd4,
+    0x15, 0x44, 0xdf, 0xc2, 0x47, 0xe7, 0x06, 0x27,
+    0x5e, 0xf3, 0x9d, 0x5c, 0x4b, 0x2e, 0x35, 0x05,
+    0xfd, 0x3c, 0x8f, 0x35, 0x85, 0x1b, 0x82, 0xdd,
+    0x49, 0xc9, 0xa8, 0x7e, 0x3a, 0x5f, 0x33, 0xdc,
+    0x8f, 0x5e, 0x32, 0x76, 0xe1, 0x52, 0x1b, 0x88,
+    0x85, 0xda, 0xa9, 0x1d, 0x5f, 0x1c, 0x05, 0x3a,
+    0xd4, 0x8d, 0xbb, 0xe7, 0x46, 0x46, 0x1e, 0x29,
+    0x4b, 0x5a, 0x02, 0x88, 0x46, 0x94, 0xd0, 0x68,
+    0x7d, 0xb2, 0x9f, 0x3a, 0x3d, 0x82, 0x05, 0xe5,
+    0xa7, 0xbe, 0x6c, 0x7e, 0x24, 0x35, 0x25, 0x14,
+    0xf3, 0x45, 0x08, 0x90, 0xfc, 0x55, 0x2e, 0xa8,
+    0xb8, 0xb1, 0x89, 0x15, 0x94, 0x51, 0x44, 0xa9,
+    0x9f, 0x68, 0xcb, 0x90, 0xbc, 0xd3, 0xae, 0x02,
+    0x37, 0x26, 0xe4, 0xe9, 0x1a, 0x90, 0x95, 0x7e,
+    0x1d, 0xac, 0x0c, 0x91, 0x97, 0x83, 0x24, 0x83,
+    0xb9, 0xa1, 0x40, 0x72, 0xac, 0xf0, 0x55, 0x32,
+    0x18, 0xab, 0xb8, 0x90, 0xda, 0x13, 0x4a, 0xc8,
+    0x4b, 0x7c, 0x18, 0xbc, 0x33, 0xbf, 0x99, 0x85,
+    0x39, 0x3e, 0xc6, 0x95, 0x9b, 0x48, 0x8e, 0xbe,
+    0x46, 0x59, 0x48, 0x41, 0x0d, 0x37, 0x25, 0x94,
+    0xbe, 0x8d, 0xf5, 0x81, 0x52, 0xf6, 0xdc, 0xeb,
+    0x98, 0xd7, 0x3b, 0x44, 0x61, 0x6f, 0xa3, 0xef,
+    0x7b, 0xfe, 0xbb, 0xc2, 0x8e, 0x46, 0x63, 0xbc,
+    0x52, 0x65, 0xf9, 0xf8, 0x85, 0x41, 0xdf, 0x82,
+    0x4a, 0x10, 0x2a, 0xe3, 0x0c, 0xb7, 0xad, 0x84,
+    0xa6, 0x6f, 0x4e, 0x8e, 0x96, 0x1e, 0x04, 0xf7,
+    0x57, 0x39, 0xca, 0x58, 0xd4, 0xef, 0x5a, 0xf1,
+    0xf5, 0x69, 0xc2, 0xb1, 0x5c, 0x0a, 0xce, 0xbe,
+    0x38, 0x01, 0xb5, 0x3f, 0x07, 0x8a, 0x72, 0x90,
+    0x10, 0xac, 0x51, 0x3a, 0x96, 0x43, 0xdf, 0x6f,
+    0xea
 };
 static const unsigned char dh_peer_pub[] = {
     0x1f, 0xc1, 0xda, 0x34, 0x1d, 0x1a, 0x84, 0x6a,
@@ -1295,6 +1308,18 @@ static const ST_KAT_PARAM rsa_priv_key[] = {
     ST_KAT_PARAM_END()
 };
 
+/*-
+ * Using OSSL_PKEY_RSA_PAD_MODE_NONE directly in the expansion of the
+ * ST_KAT_PARAM_UTF8STRING macro below causes a failure on ancient
+ * HP/UX PA-RISC compilers.
+ */
+static const char pad_mode_none[] = OSSL_PKEY_RSA_PAD_MODE_NONE;
+
+static const ST_KAT_PARAM rsa_enc_params[] = {
+    ST_KAT_PARAM_UTF8STRING(OSSL_ASYM_CIPHER_PARAM_PAD_MODE, pad_mode_none),
+    ST_KAT_PARAM_END()
+};
+
 static const unsigned char rsa_sig_msg[] = "Hello World!";
 
 static const unsigned char rsa_expected_sig[256] = {
@@ -3484,3 +3509,33 @@ static const ST_KAT_ASYM_KEYGEN st_kat_asym_keygen_tests[] = {
 # endif
 };
 #endif /* !OPENSSL_NO_ML_DSA || !OPENSSL_NO_SLH_DSA */
+
+static const ST_KAT_ASYM_CIPHER st_kat_asym_cipher_tests[] = {
+    {
+        OSSL_SELF_TEST_DESC_ASYM_RSA_ENC,
+        "RSA",
+        1,
+        rsa_pub_key,
+        rsa_enc_params,
+        ITM(rsa_asym_plaintext_encrypt),
+        ITM(rsa_asym_expected_encrypt),
+    },
+    {
+        OSSL_SELF_TEST_DESC_ASYM_RSA_DEC,
+        "RSA",
+        0,
+        rsa_priv_key,
+        rsa_enc_params,
+        ITM(rsa_asym_expected_encrypt),
+        ITM(rsa_asym_plaintext_encrypt),
+    },
+    {
+        OSSL_SELF_TEST_DESC_ASYM_RSA_DEC,
+        "RSA",
+        0,
+        rsa_crt_key,
+        rsa_enc_params,
+        ITM(rsa_asym_expected_encrypt),
+        ITM(rsa_asym_plaintext_encrypt),
+    },
+};
diff --git a/providers/fips/self_test_kats.c b/providers/fips/self_test_kats.c
index 35ecb43598ee9..f453b2f2fb493 100644
--- a/providers/fips/self_test_kats.c
+++ b/providers/fips/self_test_kats.c
@@ -22,13 +22,13 @@
 #include "self_test_data.inc"
 
 static int set_kat_drbg(OSSL_LIB_CTX *ctx,
-                        const unsigned char *entropy, size_t entropy_len,
-                        const unsigned char *nonce, size_t nonce_len,
-                        const unsigned char *persstr, size_t persstr_len);
+    const unsigned char *entropy, size_t entropy_len,
+    const unsigned char *nonce, size_t nonce_len,
+    const unsigned char *persstr, size_t persstr_len);
 static int reset_main_drbg(OSSL_LIB_CTX *ctx);
 
 static int self_test_digest(const ST_KAT_DIGEST *t, OSSL_SELF_TEST *st,
-                            OSSL_LIB_CTX *libctx)
+    OSSL_LIB_CTX *libctx)
 {
     int ok = 0;
     unsigned char out[EVP_MAX_MD_SIZE];
@@ -39,17 +39,17 @@ static int self_test_digest(const ST_KAT_DIGEST *t, OSSL_SELF_TEST *st,
     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_KAT_DIGEST, t->desc);
 
     if (ctx == NULL
-            || md == NULL
-            || !EVP_DigestInit_ex(ctx, md, NULL)
-            || !EVP_DigestUpdate(ctx, t->pt, t->pt_len)
-            || !EVP_DigestFinal(ctx, out, &out_len))
+        || md == NULL
+        || !EVP_DigestInit_ex(ctx, md, NULL)
+        || !EVP_DigestUpdate(ctx, t->pt, t->pt_len)
+        || !EVP_DigestFinal(ctx, out, &out_len))
         goto err;
 
     /* Optional corruption */
     OSSL_SELF_TEST_oncorrupt_byte(st, out);
 
     if (out_len != t->expected_len
-            || memcmp(out, t->expected, out_len) != 0)
+        || memcmp(out, t->expected, out_len) != 0)
         goto err;
     ok = 1;
 err:
@@ -64,7 +64,7 @@ static int self_test_digest(const ST_KAT_DIGEST *t, OSSL_SELF_TEST *st,
  * Used to hide the complexity of Authenticated ciphers.
  */
 static int cipher_init(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                       const ST_KAT_CIPHER *t, int enc)
+    const ST_KAT_CIPHER *t, int enc)
 {
     unsigned char *in_tag = NULL;
     int pad = 0, tmp;
@@ -74,7 +74,7 @@ static int cipher_init(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
     if (t->tag == NULL) {
         /* Use a normal cipher init */
         return EVP_CipherInit_ex(ctx, cipher, NULL, t->key, t->iv, enc)
-               && EVP_CIPHER_CTX_set_padding(ctx, pad);
+            && EVP_CIPHER_CTX_set_padding(ctx, pad);
     }
 
     /* The authenticated cipher init */
@@ -82,18 +82,19 @@ static int cipher_init(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
         in_tag = (unsigned char *)t->tag;
 
     return EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc)
-           && (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, t->iv_len, NULL) > 0)
-           && (in_tag == NULL
-               || EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, t->tag_len,
-                                      in_tag) > 0)
-           && EVP_CipherInit_ex(ctx, NULL, NULL, t->key, t->iv, enc)
-           && EVP_CIPHER_CTX_set_padding(ctx, pad)
-           && EVP_CipherUpdate(ctx, NULL, &tmp, t->aad, t->aad_len);
+        && (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, t->iv_len, NULL) > 0)
+        && (in_tag == NULL
+            || EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, t->tag_len,
+                   in_tag)
+                > 0)
+        && EVP_CipherInit_ex(ctx, NULL, NULL, t->key, t->iv, enc)
+        && EVP_CIPHER_CTX_set_padding(ctx, pad)
+        && EVP_CipherUpdate(ctx, NULL, &tmp, t->aad, t->aad_len);
 }
 
 /* Test a single KAT for encrypt/decrypt */
 static int self_test_cipher(const ST_KAT_CIPHER *t, OSSL_SELF_TEST *st,
-                            OSSL_LIB_CTX *libctx)
+    OSSL_LIB_CTX *libctx)
 {
     int ret = 0, encrypt = 1, len = 0, ct_len = 0, pt_len = 0;
     EVP_CIPHER_CTX *ctx = NULL;
@@ -113,9 +114,9 @@ static int self_test_cipher(const ST_KAT_CIPHER *t, OSSL_SELF_TEST *st,
     /* Encrypt plain text message */
     if ((t->mode & CIPHER_MODE_ENCRYPT) != 0) {
         if (!cipher_init(ctx, cipher, t, encrypt)
-                || !EVP_CipherUpdate(ctx, ct_buf, &len, t->base.pt,
-                                     t->base.pt_len)
-                || !EVP_CipherFinal_ex(ctx, ct_buf + len, &ct_len))
+            || !EVP_CipherUpdate(ctx, ct_buf, &len, t->base.pt,
+                t->base.pt_len)
+            || !EVP_CipherFinal_ex(ctx, ct_buf + len, &ct_len))
             goto err;
 
         OSSL_SELF_TEST_oncorrupt_byte(st, ct_buf);
@@ -128,7 +129,8 @@ static int self_test_cipher(const ST_KAT_CIPHER *t, OSSL_SELF_TEST *st,
             unsigned char tag[16] = { 0 };
 
             if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, t->tag_len,
-                                     tag) <= 0
+                    tag)
+                    <= 0
                 || memcmp(tag, t->tag, t->tag_len) != 0)
                 goto err;
         }
@@ -137,14 +139,14 @@ static int self_test_cipher(const ST_KAT_CIPHER *t, OSSL_SELF_TEST *st,
     /* Decrypt cipher text */
     if ((t->mode & CIPHER_MODE_DECRYPT) != 0) {
         if (!(cipher_init(ctx, cipher, t, !encrypt)
-              && EVP_CipherUpdate(ctx, pt_buf, &len,
-                                  t->base.expected, t->base.expected_len)
-              && EVP_CipherFinal_ex(ctx, pt_buf + len, &pt_len)))
+                && EVP_CipherUpdate(ctx, pt_buf, &len,
+                    t->base.expected, t->base.expected_len)
+                && EVP_CipherFinal_ex(ctx, pt_buf + len, &pt_len)))
             goto err;
         OSSL_SELF_TEST_oncorrupt_byte(st, pt_buf);
         pt_len += len;
         if (pt_len != (int)t->base.pt_len
-                || memcmp(pt_buf, t->base.pt, pt_len) != 0)
+            || memcmp(pt_buf, t->base.pt, pt_len) != 0)
             goto err;
     }
 
@@ -157,7 +159,7 @@ static int self_test_cipher(const ST_KAT_CIPHER *t, OSSL_SELF_TEST *st,
 }
 
 static int add_params(OSSL_PARAM_BLD *bld, const ST_KAT_PARAM *params,
-                      BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret = 0;
     const ST_KAT_PARAM *p;
@@ -177,13 +179,13 @@ static int add_params(OSSL_PARAM_BLD *bld, const ST_KAT_PARAM *params,
         }
         case OSSL_PARAM_UTF8_STRING: {
             if (!OSSL_PARAM_BLD_push_utf8_string(bld, p->name, p->data,
-                                                 p->data_len))
+                    p->data_len))
                 goto err;
             break;
         }
         case OSSL_PARAM_OCTET_STRING: {
             if (!OSSL_PARAM_BLD_push_octet_string(bld, p->name, p->data,
-                                                  p->data_len))
+                    p->data_len))
                 goto err;
             break;
         }
@@ -202,15 +204,15 @@ static int add_params(OSSL_PARAM_BLD *bld, const ST_KAT_PARAM *params,
 }
 
 #if defined(__GNUC__) && __GNUC__ >= 4
-# define SENTINEL __attribute__((sentinel))
+#define SENTINEL __attribute__((sentinel))
 #endif
 
 #if !defined(SENTINEL) && defined(__clang_major__) && __clang_major__ > 14
-# define SENTINEL __attribute__((sentinel))
+#define SENTINEL __attribute__((sentinel))
 #endif
 
 #ifndef SENTINEL
-# define SENTINEL
+#define SENTINEL
 #endif
 
 static SENTINEL OSSL_PARAM *kat_params_to_ossl_params(OSSL_LIB_CTX *libctx, ...)
@@ -238,14 +240,14 @@ static SENTINEL OSSL_PARAM *kat_params_to_ossl_params(OSSL_LIB_CTX *libctx, ...)
 
     params = OSSL_PARAM_BLD_to_param(bld);
 
- err:
+err:
     OSSL_PARAM_BLD_free(bld);
     BN_CTX_free(bnc);
     return params;
 }
 
 static int self_test_kdf(const ST_KAT_KDF *t, OSSL_SELF_TEST *st,
-                         OSSL_LIB_CTX *libctx)
+    OSSL_LIB_CTX *libctx)
 {
     int ret = 0;
     unsigned char out[128];
@@ -274,7 +276,7 @@ static int self_test_kdf(const ST_KAT_KDF *t, OSSL_SELF_TEST *st,
 
     OSSL_SELF_TEST_oncorrupt_byte(st, out);
 
-    if (memcmp(out, t->expected,  t->expected_len) != 0)
+    if (memcmp(out, t->expected, t->expected_len) != 0)
         goto err;
 
     ret = 1;
@@ -287,7 +289,7 @@ static int self_test_kdf(const ST_KAT_KDF *t, OSSL_SELF_TEST *st,
 }
 
 static int self_test_drbg(const ST_KAT_DRBG *t, OSSL_SELF_TEST *st,
-                          OSSL_LIB_CTX *libctx)
+    OSSL_LIB_CTX *libctx)
 {
     int ret = 0;
     unsigned char out[256];
@@ -311,7 +313,7 @@ static int self_test_drbg(const ST_KAT_DRBG *t, OSSL_SELF_TEST *st,
         goto err;
 
     drbg_params[0] = OSSL_PARAM_construct_uint(OSSL_RAND_PARAM_STRENGTH,
-                                               &strength);
+        &strength);
     if (!EVP_RAND_CTX_set_params(test, drbg_params))
         goto err;
 
@@ -327,42 +329,37 @@ static int self_test_drbg(const ST_KAT_DRBG *t, OSSL_SELF_TEST *st,
     strength = EVP_RAND_get_strength(drbg);
 
     drbg_params[0] = OSSL_PARAM_construct_utf8_string(t->param_name,
-                                                      t->param_value, 0);
+        t->param_value, 0);
     /* This is only used by HMAC-DRBG but it is ignored by the others */
-    drbg_params[1] =
-        OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_MAC, "HMAC", 0);
+    drbg_params[1] = OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_MAC, "HMAC", 0);
     if (!EVP_RAND_CTX_set_params(drbg, drbg_params))
         goto err;
 
-    drbg_params[0] =
-        OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                          (void *)t->entropyin,
-                                          t->entropyinlen);
-    drbg_params[1] =
-        OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_NONCE,
-                                          (void *)t->nonce, t->noncelen);
+    drbg_params[0] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
+        (void *)t->entropyin,
+        t->entropyinlen);
+    drbg_params[1] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_NONCE,
+        (void *)t->nonce, t->noncelen);
     if (!EVP_RAND_instantiate(test, strength, 0, NULL, 0, drbg_params))
         goto err;
     if (!EVP_RAND_instantiate(drbg, strength, 0, t->persstr, t->persstrlen,
-                              NULL))
+            NULL))
         goto err;
 
-    drbg_params[0] =
-        OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                          (void *)t->entropyinpr1,
-                                          t->entropyinpr1len);
+    drbg_params[0] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
+        (void *)t->entropyinpr1,
+        t->entropyinpr1len);
     if (!EVP_RAND_CTX_set_params(test, drbg_params))
         goto err;
 
     if (!EVP_RAND_generate(drbg, out, t->expectedlen, strength,
-                           prediction_resistance,
-                           t->entropyaddin1, t->entropyaddin1len))
+            prediction_resistance,
+            t->entropyaddin1, t->entropyaddin1len))
         goto err;
 
-    drbg_params[0] =
-        OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                         (void *)t->entropyinpr2,
-                                         t->entropyinpr2len);
+    drbg_params[0] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
+        (void *)t->entropyinpr2,
+        t->entropyinpr2len);
     if (!EVP_RAND_CTX_set_params(test, drbg_params))
         goto err;
 
@@ -371,8 +368,8 @@ static int self_test_drbg(const ST_KAT_DRBG *t, OSSL_SELF_TEST *st,
      * prediction_resistance = 1
      */
     if (!EVP_RAND_generate(drbg, out, t->expectedlen, strength,
-                           prediction_resistance,
-                           t->entropyaddin2, t->entropyaddin2len))
+            prediction_resistance,
+            t->entropyaddin2, t->entropyaddin2len))
         goto err;
 
     OSSL_SELF_TEST_oncorrupt_byte(st, out);
@@ -399,7 +396,7 @@ static int self_test_drbg(const ST_KAT_DRBG *t, OSSL_SELF_TEST *st,
 
 #if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_EC)
 static int self_test_ka(const ST_KAT_KAS *t,
-                        OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
+    OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
 {
     int ret = 0;
     EVP_PKEY_CTX *kactx = NULL, *dctx = NULL;
@@ -415,9 +412,9 @@ static int self_test_ka(const ST_KAT_KAS *t,
         goto err;
 
     params = kat_params_to_ossl_params(libctx, t->key_group,
-                                       t->key_host_data, NULL);
+        t->key_host_data, NULL);
     params_peer = kat_params_to_ossl_params(libctx, t->key_group,
-                                            t->key_peer_data, NULL);
+        t->key_peer_data, NULL);
     if (params == NULL || params_peer == NULL)
         goto err;
 
@@ -461,8 +458,8 @@ static int self_test_ka(const ST_KAT_KAS *t,
 #endif /* !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_EC) */
 
 static int digest_signature(const uint8_t *sig, size_t sig_len,
-                            uint8_t *out, size_t *out_len,
-                            OSSL_LIB_CTX *lib_ctx)
+    uint8_t *out, size_t *out_len,
+    OSSL_LIB_CTX *lib_ctx)
 {
     int ret;
     unsigned int len = 0;
@@ -481,7 +478,7 @@ static int digest_signature(const uint8_t *sig, size_t sig_len,
 }
 
 static int self_test_digest_sign(const ST_KAT_SIGN *t,
-                                 OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
+    OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
 {
     int ret = 0;
     OSSL_PARAM *paramskey = NULL, *paramsinit = NULL, *paramsverify = NULL;
@@ -504,7 +501,7 @@ static int self_test_digest_sign(const ST_KAT_SIGN *t,
 
     if (t->entropy != NULL) {
         if (!set_kat_drbg(libctx, t->entropy, t->entropy_len,
-                          t->nonce, t->nonce_len, t->persstr, t->persstr_len))
+                t->nonce, t->nonce_len, t->persstr, t->persstr_len))
             goto err;
     }
 
@@ -514,12 +511,12 @@ static int self_test_digest_sign(const ST_KAT_SIGN *t,
 
     fromctx = EVP_PKEY_CTX_new_from_name(libctx, t->keytype, NULL);
     if (fromctx == NULL
-            || paramskey == NULL
-            || paramsinit == NULL
-            || paramsverify == NULL)
+        || paramskey == NULL
+        || paramsinit == NULL
+        || paramsverify == NULL)
         goto err;
     if (EVP_PKEY_fromdata_init(fromctx) <= 0
-            || EVP_PKEY_fromdata(fromctx, &pkey, EVP_PKEY_KEYPAIR, paramskey) <= 0)
+        || EVP_PKEY_fromdata(fromctx, &pkey, EVP_PKEY_KEYPAIR, paramskey) <= 0)
         goto err;
 
     sigalg = EVP_SIGNATURE_fetch(libctx, t->sigalgorithm, NULL);
@@ -561,13 +558,13 @@ static int self_test_digest_sign(const ST_KAT_SIGN *t,
                 size_t digested_sig_len = 0;
 
                 if (!digest_signature(psig, siglen, digested_sig,
-                                      &digested_sig_len, libctx)
-                        || digested_sig_len != t->sig_expected_len
-                        || memcmp(digested_sig, t->sig_expected, t->sig_expected_len) != 0)
+                        &digested_sig_len, libctx)
+                    || digested_sig_len != t->sig_expected_len
+                    || memcmp(digested_sig, t->sig_expected, t->sig_expected_len) != 0)
                     goto err;
             } else {
                 if (siglen != t->sig_expected_len
-                        || memcmp(psig, t->sig_expected, t->sig_expected_len) != 0)
+                    || memcmp(psig, t->sig_expected, t->sig_expected_len) != 0)
                     goto err;
             }
         }
@@ -609,7 +606,7 @@ static int self_test_digest_sign(const ST_KAT_SIGN *t,
  * Test that a deterministic key generation produces the correct key
  */
 static int self_test_asym_keygen(const ST_KAT_ASYM_KEYGEN *t, OSSL_SELF_TEST *st,
-                                 OSSL_LIB_CTX *libctx)
+    OSSL_LIB_CTX *libctx)
 {
     int ret = 0;
     const ST_KAT_PARAM *expected;
@@ -630,19 +627,19 @@ static int self_test_asym_keygen(const ST_KAT_ASYM_KEYGEN *t, OSSL_SELF_TEST *st
             goto err;
     }
     if (EVP_PKEY_keygen_init(key_ctx) != 1
-            || EVP_PKEY_CTX_set_params(key_ctx, key_params) != 1
-            || EVP_PKEY_generate(key_ctx, &key) != 1)
+        || EVP_PKEY_CTX_set_params(key_ctx, key_params) != 1
+        || EVP_PKEY_generate(key_ctx, &key) != 1)
         goto err;
 
     for (expected = t->expected_params; expected->data != NULL; ++expected) {
         if (expected->type != OSSL_PARAM_OCTET_STRING
-                || !EVP_PKEY_get_octet_string_param(key, expected->name,
-                                                    out, sizeof(out), &out_len))
+            || !EVP_PKEY_get_octet_string_param(key, expected->name,
+                out, sizeof(out), &out_len))
             goto err;
         OSSL_SELF_TEST_oncorrupt_byte(st, out);
         /* Check the KAT */
         if (out_len != expected->data_len
-                || memcmp(out, expected->data, expected->data_len) != 0)
+            || memcmp(out, expected->data, expected->data_len) != 0)
             goto err;
     }
     ret = 1;
@@ -661,7 +658,7 @@ static int self_test_asym_keygen(const ST_KAT_ASYM_KEYGEN *t, OSSL_SELF_TEST *st
  * encapsulation.
  */
 static int self_test_kem_encapsulate(const ST_KAT_KEM *t, OSSL_SELF_TEST *st,
-                                     OSSL_LIB_CTX *libctx, EVP_PKEY *pkey)
+    OSSL_LIB_CTX *libctx, EVP_PKEY *pkey)
 {
     int ret = 0;
     EVP_PKEY_CTX *ctx;
@@ -670,15 +667,15 @@ static int self_test_kem_encapsulate(const ST_KAT_KEM *t, OSSL_SELF_TEST *st,
     OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
 
     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_KAT_KEM,
-                           OSSL_SELF_TEST_DESC_ENCAP_KEM);
+        OSSL_SELF_TEST_DESC_ENCAP_KEM);
 
     ctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, "");
     if (ctx == NULL)
         goto err;
 
     *params = OSSL_PARAM_construct_octet_string(OSSL_KEM_PARAM_IKME,
-                                                (unsigned char *)t->entropy,
-                                                t->entropy_len);
+        (unsigned char *)t->entropy,
+        t->entropy_len);
     if (EVP_PKEY_encapsulate_init(ctx, params) <= 0)
         goto err;
 
@@ -695,16 +692,16 @@ static int self_test_kem_encapsulate(const ST_KAT_KEM *t, OSSL_SELF_TEST *st,
     /* Compare outputs */
     OSSL_SELF_TEST_oncorrupt_byte(st, wrapped);
     if (wrappedlen != t->cipher_text_len
-            || memcmp(wrapped, t->cipher_text, t->cipher_text_len) != 0)
+        || memcmp(wrapped, t->cipher_text, t->cipher_text_len) != 0)
         goto err;
 
     OSSL_SELF_TEST_oncorrupt_byte(st, secret);
     if (secretlen != t->secret_len
-            || memcmp(secret, t->secret, t->secret_len) != 0)
+        || memcmp(secret, t->secret, t->secret_len) != 0)
         goto err;
 
     ret = 1;
- err:
+err:
     OPENSSL_free(wrapped);
     OPENSSL_free(secret);
     EVP_PKEY_CTX_free(ctx);
@@ -717,8 +714,8 @@ static int self_test_kem_encapsulate(const ST_KAT_KEM *t, OSSL_SELF_TEST *st,
  * decapsulation both for the rejection path and the normal path.
  */
 static int self_test_kem_decapsulate(const ST_KAT_KEM *t, OSSL_SELF_TEST *st,
-                                     OSSL_LIB_CTX *libctx, EVP_PKEY *pkey,
-                                     int reject)
+    OSSL_LIB_CTX *libctx, EVP_PKEY *pkey,
+    int reject)
 {
     int ret = 0;
     EVP_PKEY_CTX *ctx = NULL;
@@ -728,8 +725,8 @@ static int self_test_kem_decapsulate(const ST_KAT_KEM *t, OSSL_SELF_TEST *st,
     size_t secretlen = t->secret_len;
 
     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_KAT_KEM,
-                           reject ? OSSL_SELF_TEST_DESC_DECAP_KEM_FAIL
-                                  : OSSL_SELF_TEST_DESC_DECAP_KEM);
+        reject ? OSSL_SELF_TEST_DESC_DECAP_KEM_FAIL
+               : OSSL_SELF_TEST_DESC_DECAP_KEM);
 
     if (reject) {
         cipher_text = alloced = OPENSSL_zalloc(t->cipher_text_len);
@@ -752,17 +749,18 @@ static int self_test_kem_decapsulate(const ST_KAT_KEM *t, OSSL_SELF_TEST *st,
 
     /* Decapsulate */
     if (EVP_PKEY_decapsulate(ctx, secret, &secretlen,
-                             cipher_text, t->cipher_text_len) <= 0)
+            cipher_text, t->cipher_text_len)
+        <= 0)
         goto err;
 
     /* Compare output */
     OSSL_SELF_TEST_oncorrupt_byte(st, secret);
     if (secretlen != t->secret_len
-            || memcmp(secret, test_secret, t->secret_len) != 0)
+        || memcmp(secret, test_secret, t->secret_len) != 0)
         goto err;
 
     ret = 1;
- err:
+err:
     OPENSSL_free(alloced);
     OPENSSL_free(secret);
     EVP_PKEY_CTX_free(ctx);
@@ -780,7 +778,7 @@ static int self_test_kem_decapsulate(const ST_KAT_KEM *t, OSSL_SELF_TEST *st,
  * 3   ML-KEM key generation
  */
 static int self_test_kem(const ST_KAT_KEM *t, OSSL_SELF_TEST *st,
-                         OSSL_LIB_CTX *libctx)
+    OSSL_LIB_CTX *libctx)
 {
     int ret = 0;
     EVP_PKEY *pkey = NULL;
@@ -795,12 +793,12 @@ static int self_test_kem(const ST_KAT_KEM *t, OSSL_SELF_TEST *st,
         goto err;
 
     if (EVP_PKEY_fromdata_init(ctx) <= 0
-            || EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEYPAIR, params) <= 0)
+        || EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEYPAIR, params) <= 0)
         goto err;
 
     if (!self_test_kem_encapsulate(t, st, libctx, pkey)
-            || !self_test_kem_decapsulate(t, st, libctx, pkey, 0)
-            || !self_test_kem_decapsulate(t, st, libctx, pkey, 1))
+        || !self_test_kem_decapsulate(t, st, libctx, pkey, 0)
+        || !self_test_kem_decapsulate(t, st, libctx, pkey, 1))
         goto err;
 
     ret = 1;
@@ -812,6 +810,95 @@ static int self_test_kem(const ST_KAT_KEM *t, OSSL_SELF_TEST *st,
 }
 #endif
 
+/*
+ * Test an encrypt or decrypt KAT..
+ *
+ * FIPS 140-2 IG D.9 states that separate KAT tests are needed for encrypt
+ * and decrypt..
+ */
+static int self_test_asym_cipher(const ST_KAT_ASYM_CIPHER *t, OSSL_SELF_TEST *st,
+    OSSL_LIB_CTX *libctx)
+{
+    int ret = 0;
+    OSSL_PARAM *keyparams = NULL, *initparams = NULL;
+    OSSL_PARAM_BLD *keybld = NULL, *initbld = NULL;
+    EVP_PKEY_CTX *encctx = NULL, *keyctx = NULL;
+    EVP_PKEY *key = NULL;
+    BN_CTX *bnctx = NULL;
+    unsigned char out[256];
+    size_t outlen = sizeof(out);
+
+    OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_KAT_ASYM_CIPHER, t->desc);
+
+    bnctx = BN_CTX_new_ex(libctx);
+    if (bnctx == NULL)
+        goto err;
+
+    /* Load a public or private key from data */
+    keybld = OSSL_PARAM_BLD_new();
+    if (keybld == NULL
+        || !add_params(keybld, t->key, bnctx))
+        goto err;
+    keyparams = OSSL_PARAM_BLD_to_param(keybld);
+    keyctx = EVP_PKEY_CTX_new_from_name(libctx, t->algorithm, NULL);
+    if (keyctx == NULL || keyparams == NULL)
+        goto err;
+    if (EVP_PKEY_fromdata_init(keyctx) <= 0
+        || EVP_PKEY_fromdata(keyctx, &key, EVP_PKEY_KEYPAIR, keyparams) <= 0)
+        goto err;
+
+    /* Create a EVP_PKEY_CTX to use for the encrypt or decrypt operation */
+    encctx = EVP_PKEY_CTX_new_from_pkey(libctx, key, NULL);
+    if (encctx == NULL
+        || (t->encrypt && EVP_PKEY_encrypt_init(encctx) <= 0)
+        || (!t->encrypt && EVP_PKEY_decrypt_init(encctx) <= 0))
+        goto err;
+
+    /* Add any additional parameters such as padding */
+    if (t->postinit != NULL) {
+        initbld = OSSL_PARAM_BLD_new();
+        if (initbld == NULL)
+            goto err;
+        if (!add_params(initbld, t->postinit, bnctx))
+            goto err;
+        initparams = OSSL_PARAM_BLD_to_param(initbld);
+        if (initparams == NULL)
+            goto err;
+        if (EVP_PKEY_CTX_set_params(encctx, initparams) <= 0)
+            goto err;
+    }
+
+    if (t->encrypt) {
+        if (EVP_PKEY_encrypt(encctx, out, &outlen,
+                t->in, t->in_len)
+            <= 0)
+            goto err;
+    } else {
+        if (EVP_PKEY_decrypt(encctx, out, &outlen,
+                t->in, t->in_len)
+            <= 0)
+            goto err;
+    }
+    /* Check the KAT */
+    OSSL_SELF_TEST_oncorrupt_byte(st, out);
+    if (outlen != t->expected_len
+        || memcmp(out, t->expected, t->expected_len) != 0)
+        goto err;
+
+    ret = 1;
+err:
+    BN_CTX_free(bnctx);
+    EVP_PKEY_free(key);
+    EVP_PKEY_CTX_free(encctx);
+    EVP_PKEY_CTX_free(keyctx);
+    OSSL_PARAM_free(keyparams);
+    OSSL_PARAM_BLD_free(keybld);
+    OSSL_PARAM_free(initparams);
+    OSSL_PARAM_BLD_free(initbld);
+    OSSL_SELF_TEST_onend(st, ret);
+    return ret;
+}
+
 /*
  * Test a data driven list of KAT's for digest algorithms.
  * All tests are run regardless of if they fail or not.
@@ -853,6 +940,17 @@ static int self_test_kems(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
     return ret;
 }
 
+static int self_test_asym_ciphers(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
+{
+    int i, ret = 1;
+
+    for (i = 0; i < (int)OSSL_NELEM(st_kat_asym_cipher_tests); ++i) {
+        if (!self_test_asym_cipher(&st_kat_asym_cipher_tests[i], st, libctx))
+            ret = 0;
+    }
+    return ret;
+}
+
 static int self_test_kdfs(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
 {
     int i, ret = 1;
@@ -920,9 +1018,10 @@ static EVP_RAND_CTX *kat_rand = NULL;
 static EVP_RAND_CTX *main_rand = NULL;
 
 static int set_kat_drbg(OSSL_LIB_CTX *ctx,
-                        const unsigned char *entropy, size_t entropy_len,
-                        const unsigned char *nonce, size_t nonce_len,
-                        const unsigned char *persstr, size_t persstr_len) {
+    const unsigned char *entropy, size_t entropy_len,
+    const unsigned char *nonce, size_t nonce_len,
+    const unsigned char *persstr, size_t persstr_len)
+{
     EVP_RAND *rand;
     unsigned int strength = 256;
     EVP_RAND_CTX *parent_rand = NULL;
@@ -944,7 +1043,7 @@ static int set_kat_drbg(OSSL_LIB_CTX *ctx,
         goto err;
 
     drbg_params[0] = OSSL_PARAM_construct_uint(OSSL_RAND_PARAM_STRENGTH,
-                                               &strength);
+        &strength);
     if (!EVP_RAND_CTX_set_params(parent_rand, drbg_params))
         goto err;
 
@@ -962,12 +1061,10 @@ static int set_kat_drbg(OSSL_LIB_CTX *ctx,
         goto err;
 
     /* Instantiate the RNGs */
-    drbg_params[0] =
-        OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                          (void *)entropy, entropy_len);
-    drbg_params[1] =
-        OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_NONCE,
-                                          (void *)nonce, nonce_len);
+    drbg_params[0] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
+        (void *)entropy, entropy_len);
+    drbg_params[1] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_NONCE,
+        (void *)nonce, nonce_len);
     if (!EVP_RAND_instantiate(parent_rand, strength, 0, NULL, 0, drbg_params))
         goto err;
 
@@ -989,21 +1086,22 @@ static int set_kat_drbg(OSSL_LIB_CTX *ctx,
         RAND_set0_private(ctx, main_rand);
     }
 
- err:
+err:
     EVP_RAND_CTX_free(parent_rand);
     EVP_RAND_CTX_free(kat_rand);
     kat_rand = NULL;
     return 0;
 }
 
-static int reset_main_drbg(OSSL_LIB_CTX *ctx) {
+static int reset_main_drbg(OSSL_LIB_CTX *ctx)
+{
     int ret = 1;
 
     if (!RAND_set0_private(ctx, main_rand))
         ret = 0;
     if (kat_rand != NULL) {
         if (!EVP_RAND_uninstantiate(kat_rand)
-                || !EVP_RAND_verify_zeroization(kat_rand))
+            || !EVP_RAND_verify_zeroization(kat_rand))
             ret = 0;
         EVP_RAND_CTX_free(kat_rand);
         kat_rand = NULL;
@@ -1029,14 +1127,14 @@ static int setup_main_random(OSSL_LIB_CTX *libctx)
         goto err;
 
     drbg_params[0] = OSSL_PARAM_construct_uint(OSSL_RAND_PARAM_GENERATE,
-                                               &generate);
+        &generate);
     drbg_params[1] = OSSL_PARAM_construct_uint(OSSL_RAND_PARAM_STRENGTH,
-                                               &strength);
+        &strength);
 
     if (!EVP_RAND_instantiate(main_rand, strength, 0, NULL, 0, drbg_params))
         goto err;
     return 1;
- err:
+err:
     EVP_RAND_CTX_free(main_rand);
     return 0;
 }
@@ -1069,7 +1167,7 @@ int SELF_TEST_kats(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
     if (saved_rand != NULL && !EVP_RAND_CTX_up_ref(saved_rand))
         return 0;
     if (!setup_main_random(libctx)
-            || !RAND_set0_private(libctx, main_rand)) {
+        || !RAND_set0_private(libctx, main_rand)) {
         /* Decrement saved_rand reference counter */
         EVP_RAND_CTX_free(saved_rand);
         EVP_RAND_CTX_free(main_rand);
@@ -1092,8 +1190,9 @@ int SELF_TEST_kats(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
         ret = 0;
     if (!self_test_kems(st, libctx))
         ret = 0;
+    if (!self_test_asym_ciphers(st, libctx))
+        ret = 0;
 
     RAND_set0_private(libctx, saved_rand);
     return ret;
 }
-
diff --git a/providers/implementations/asymciphers/rsa_enc.c b/providers/implementations/asymciphers/rsa_enc.c
index 6ee127caff80d..4995b00102fbe 100644
--- a/providers/implementations/asymciphers/rsa_enc.c
+++ b/providers/implementations/asymciphers/rsa_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -45,11 +45,11 @@ static OSSL_FUNC_asym_cipher_set_ctx_params_fn rsa_set_ctx_params;
 static OSSL_FUNC_asym_cipher_settable_ctx_params_fn rsa_settable_ctx_params;
 
 static OSSL_ITEM padding_item[] = {
-    { RSA_PKCS1_PADDING,        OSSL_PKEY_RSA_PAD_MODE_PKCSV15 },
-    { RSA_NO_PADDING,           OSSL_PKEY_RSA_PAD_MODE_NONE },
-    { RSA_PKCS1_OAEP_PADDING,   OSSL_PKEY_RSA_PAD_MODE_OAEP }, /* Correct spelling first */
-    { RSA_PKCS1_OAEP_PADDING,   "oeap"   },
-    { 0,                        NULL     }
+    { RSA_PKCS1_PADDING, OSSL_PKEY_RSA_PAD_MODE_PKCSV15 },
+    { RSA_NO_PADDING, OSSL_PKEY_RSA_PAD_MODE_NONE },
+    { RSA_PKCS1_OAEP_PADDING, OSSL_PKEY_RSA_PAD_MODE_OAEP }, /* Correct spelling first */
+    { RSA_PKCS1_OAEP_PADDING, "oeap" },
+    { 0, NULL }
 };
 
 /*
@@ -94,7 +94,7 @@ static void *rsa_newctx(void *provctx)
 }
 
 static int rsa_init(void *vprsactx, void *vrsa, const OSSL_PARAM params[],
-                    int operation, const char *desc)
+    int operation, const char *desc)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
     int protect = 0;
@@ -126,31 +126,32 @@ static int rsa_init(void *vprsactx, void *vrsa, const OSSL_PARAM params[],
         return 0;
 #ifdef FIPS_MODULE
     if (!ossl_fips_ind_rsa_key_check(OSSL_FIPS_IND_GET(prsactx),
-                                     OSSL_FIPS_IND_SETTABLE0, prsactx->libctx,
-                                     prsactx->rsa, desc, protect))
+            OSSL_FIPS_IND_SETTABLE0, prsactx->libctx,
+            prsactx->rsa, desc, protect))
         return 0;
 #endif
     return 1;
 }
 
 static int rsa_encrypt_init(void *vprsactx, void *vrsa,
-                            const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return rsa_init(vprsactx, vrsa, params, EVP_PKEY_OP_ENCRYPT,
-                    "RSA Encrypt Init");
+        "RSA Encrypt Init");
 }
 
 static int rsa_decrypt_init(void *vprsactx, void *vrsa,
-                            const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return rsa_init(vprsactx, vrsa, params, EVP_PKEY_OP_DECRYPT,
-                    "RSA Decrypt Init");
+        "RSA Decrypt Init");
 }
 
 static int rsa_encrypt(void *vprsactx, unsigned char *out, size_t *outlen,
-                       size_t outsize, const unsigned char *in, size_t inlen)
+    size_t outsize, const unsigned char *in, size_t inlen)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
+    size_t len = RSA_size(prsactx->rsa);
     int ret;
 
     if (!ossl_prov_is_running())
@@ -158,27 +159,31 @@ static int rsa_encrypt(void *vprsactx, unsigned char *out, size_t *outlen,
 
 #ifdef FIPS_MODULE
     if ((prsactx->pad_mode == RSA_PKCS1_PADDING
-         || prsactx->pad_mode == RSA_PKCS1_WITH_TLS_PADDING)
+            || prsactx->pad_mode == RSA_PKCS1_WITH_TLS_PADDING)
         && !OSSL_FIPS_IND_ON_UNAPPROVED(prsactx, OSSL_FIPS_IND_SETTABLE1,
-                                        prsactx->libctx, "RSA Encrypt",
-                                        "PKCS#1 v1.5 padding",
-                                        ossl_fips_config_rsa_pkcs15_padding_disabled)) {
+            prsactx->libctx, "RSA Encrypt",
+            "PKCS#1 v1.5 padding",
+            ossl_fips_config_rsa_pkcs15_padding_disabled)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_PADDING_MODE);
         return 0;
     }
 #endif
 
-    if (out == NULL) {
-        size_t len = RSA_size(prsactx->rsa);
+    if (len == 0) {
+        ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY);
+        return 0;
+    }
 
-        if (len == 0) {
-            ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY);
-            return 0;
-        }
+    if (out == NULL) {
         *outlen = len;
         return 1;
     }
 
+    if (outsize < len) {
+        ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
+        return 0;
+    }
+
     if (prsactx->pad_mode == RSA_PKCS1_OAEP_PADDING) {
         int rsasize = RSA_size(prsactx->rsa);
         unsigned char *tbuf;
@@ -193,24 +198,23 @@ static int rsa_encrypt(void *vprsactx, unsigned char *out, size_t *outlen,
                 return 0;
             }
         }
-        ret =
-            ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(prsactx->libctx, tbuf,
-                                                    rsasize, in, inlen,
-                                                    prsactx->oaep_label,
-                                                    prsactx->oaep_labellen,
-                                                    prsactx->oaep_md,
-                                                    prsactx->mgf1_md);
+        ret = ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(prsactx->libctx, tbuf,
+            rsasize, in, inlen,
+            prsactx->oaep_label,
+            prsactx->oaep_labellen,
+            prsactx->oaep_md,
+            prsactx->mgf1_md);
 
         if (!ret) {
             OPENSSL_free(tbuf);
             return 0;
         }
         ret = RSA_public_encrypt(rsasize, tbuf, out, prsactx->rsa,
-                                 RSA_NO_PADDING);
+            RSA_NO_PADDING);
         OPENSSL_free(tbuf);
     } else {
         ret = RSA_public_encrypt(inlen, in, out, prsactx->rsa,
-                                 prsactx->pad_mode);
+            prsactx->pad_mode);
     }
     /* A ret value of 0 is not an error */
     if (ret < 0)
@@ -220,7 +224,7 @@ static int rsa_encrypt(void *vprsactx, unsigned char *out, size_t *outlen,
 }
 
 static int rsa_decrypt(void *vprsactx, unsigned char *out, size_t *outlen,
-                       size_t outsize, const unsigned char *in, size_t inlen)
+    size_t outsize, const unsigned char *in, size_t inlen)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
     int ret;
@@ -256,13 +260,13 @@ static int rsa_decrypt(void *vprsactx, unsigned char *out, size_t *outlen,
     }
 
     if (prsactx->pad_mode == RSA_PKCS1_OAEP_PADDING
-            || prsactx->pad_mode == RSA_PKCS1_WITH_TLS_PADDING) {
+        || prsactx->pad_mode == RSA_PKCS1_WITH_TLS_PADDING) {
         unsigned char *tbuf;
 
         if ((tbuf = OPENSSL_malloc(len)) == NULL)
             return 0;
         ret = RSA_private_decrypt(inlen, in, tbuf, prsactx->rsa,
-                                  RSA_NO_PADDING);
+            RSA_NO_PADDING);
         /*
          * With no padding then, on success ret should be len, otherwise an
          * error occurred (non-constant time)
@@ -282,11 +286,11 @@ static int rsa_decrypt(void *vprsactx, unsigned char *out, size_t *outlen,
                 }
             }
             ret = RSA_padding_check_PKCS1_OAEP_mgf1(out, outsize, tbuf,
-                                                    len, len,
-                                                    prsactx->oaep_label,
-                                                    prsactx->oaep_labellen,
-                                                    prsactx->oaep_md,
-                                                    prsactx->mgf1_md);
+                len, len,
+                prsactx->oaep_label,
+                prsactx->oaep_labellen,
+                prsactx->oaep_md,
+                prsactx->mgf1_md);
         } else {
             /* RSA_PKCS1_WITH_TLS_PADDING */
             if (prsactx->client_version <= 0) {
@@ -295,13 +299,12 @@ static int rsa_decrypt(void *vprsactx, unsigned char *out, size_t *outlen,
                 return 0;
             }
             ret = ossl_rsa_padding_check_PKCS1_type_2_TLS(
-                        prsactx->libctx, out, outsize, tbuf, len,
-                        prsactx->client_version, prsactx->alt_version);
+                prsactx->libctx, out, outsize, tbuf, len,
+                prsactx->client_version, prsactx->alt_version);
         }
         OPENSSL_free(tbuf);
     } else {
-        if ((prsactx->implicit_rejection == 0) &&
-                (prsactx->pad_mode == RSA_PKCS1_PADDING))
+        if ((prsactx->implicit_rejection == 0) && (prsactx->pad_mode == RSA_PKCS1_PADDING))
             pad_mode = RSA_PKCS1_NO_IMPLICIT_REJECT_PADDING;
         else
             pad_mode = prsactx->pad_mode;
@@ -356,6 +359,12 @@ static void *rsa_dupctx(void *vprsactx)
         return NULL;
     }
 
+    if (dstctx->oaep_label != NULL
+        && (dstctx->oaep_label = OPENSSL_memdup(dstctx->oaep_label, dstctx->oaep_labellen)) == NULL) {
+        rsa_freectx(dstctx);
+        return NULL;
+    }
+
     return dstctx;
 }
 
@@ -374,34 +383,30 @@ static int rsa_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
             if (!OSSL_PARAM_set_int(p, prsactx->pad_mode))
                 return 0;
             break;
-        case OSSL_PARAM_UTF8_STRING:
-            {
-                int i;
-                const char *word = NULL;
-
-                for (i = 0; padding_item[i].id != 0; i++) {
-                    if (prsactx->pad_mode == (int)padding_item[i].id) {
-                        word = padding_item[i].ptr;
-                        break;
-                    }
+        case OSSL_PARAM_UTF8_STRING: {
+            int i;
+            const char *word = NULL;
+
+            for (i = 0; padding_item[i].id != 0; i++) {
+                if (prsactx->pad_mode == (int)padding_item[i].id) {
+                    word = padding_item[i].ptr;
+                    break;
                 }
+            }
 
-                if (word != NULL) {
-                    if (!OSSL_PARAM_set_utf8_string(p, word))
-                        return 0;
-                } else {
-                    ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR);
-                }
+            if (word != NULL) {
+                if (!OSSL_PARAM_set_utf8_string(p, word))
+                    return 0;
+            } else {
+                ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR);
             }
-            break;
+        } break;
         default:
             return 0;
         }
 
     p = OSSL_PARAM_locate(params, OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST);
-    if (p != NULL && !OSSL_PARAM_set_utf8_string(p, prsactx->oaep_md == NULL
-                                                    ? ""
-                                                    : EVP_MD_get0_name(prsactx->oaep_md)))
+    if (p != NULL && !OSSL_PARAM_set_utf8_string(p, prsactx->oaep_md == NULL ? "" : EVP_MD_get0_name(prsactx->oaep_md)))
         return 0;
 
     p = OSSL_PARAM_locate(params, OSSL_ASYM_CIPHER_PARAM_MGF1_DIGEST);
@@ -409,16 +414,12 @@ static int rsa_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
         EVP_MD *mgf1_md = prsactx->mgf1_md == NULL ? prsactx->oaep_md
                                                    : prsactx->mgf1_md;
 
-        if (!OSSL_PARAM_set_utf8_string(p, mgf1_md == NULL
-                                           ? ""
-                                           : EVP_MD_get0_name(mgf1_md)))
-        return 0;
+        if (!OSSL_PARAM_set_utf8_string(p, mgf1_md == NULL ? "" : EVP_MD_get0_name(mgf1_md)))
+            return 0;
     }
 
     p = OSSL_PARAM_locate(params, OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL);
-    if (p != NULL &&
-        !OSSL_PARAM_set_octet_ptr(p, prsactx->oaep_label,
-                                  prsactx->oaep_labellen))
+    if (p != NULL && !OSSL_PARAM_set_octet_ptr(p, prsactx->oaep_label, prsactx->oaep_labellen))
         return 0;
 
     p = OSSL_PARAM_locate(params, OSSL_ASYM_CIPHER_PARAM_TLS_CLIENT_VERSION);
@@ -442,16 +443,16 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
     OSSL_PARAM_utf8_string(OSSL_ASYM_CIPHER_PARAM_PAD_MODE, NULL, 0),
     OSSL_PARAM_utf8_string(OSSL_ASYM_CIPHER_PARAM_MGF1_DIGEST, NULL, 0),
     OSSL_PARAM_DEFN(OSSL_ASYM_CIPHER_PARAM_OAEP_LABEL, OSSL_PARAM_OCTET_PTR,
-                    NULL, 0),
+        NULL, 0),
     OSSL_PARAM_uint(OSSL_ASYM_CIPHER_PARAM_TLS_CLIENT_VERSION, NULL),
     OSSL_PARAM_uint(OSSL_ASYM_CIPHER_PARAM_TLS_NEGOTIATED_VERSION, NULL),
     OSSL_PARAM_uint(OSSL_ASYM_CIPHER_PARAM_IMPLICIT_REJECTION, NULL),
     OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 
 static const OSSL_PARAM *rsa_gettable_ctx_params(ossl_unused void *vprsactx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -470,10 +471,10 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(prsactx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_ASYM_CIPHER_PARAM_FIPS_KEY_CHECK))
+            OSSL_ASYM_CIPHER_PARAM_FIPS_KEY_CHECK))
         return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(prsactx, OSSL_FIPS_IND_SETTABLE1, params,
-                                     OSSL_ASYM_CIPHER_PARAM_FIPS_RSA_PKCS15_PAD_DISABLED))
+            OSSL_ASYM_CIPHER_PARAM_FIPS_RSA_PKCS15_PAD_DISABLED))
         return 0;
 
     p = OSSL_PARAM_locate_const(params, OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST);
@@ -483,7 +484,7 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
             return 0;
 
         p = OSSL_PARAM_locate_const(params,
-                                    OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST_PROPS);
+            OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST_PROPS);
         if (p != NULL) {
             str = mdprops;
             if (!OSSL_PARAM_get_utf8_string(p, &str, sizeof(mdprops)))
@@ -506,21 +507,19 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
             if (!OSSL_PARAM_get_int(p, &pad_mode))
                 return 0;
             break;
-        case OSSL_PARAM_UTF8_STRING:
-            {
-                int i;
+        case OSSL_PARAM_UTF8_STRING: {
+            int i;
 
-                if (p->data == NULL)
-                    return 0;
+            if (p->data == NULL)
+                return 0;
 
-                for (i = 0; padding_item[i].id != 0; i++) {
-                    if (strcmp(p->data, padding_item[i].ptr) == 0) {
-                        pad_mode = padding_item[i].id;
-                        break;
-                    }
+            for (i = 0; padding_item[i].id != 0; i++) {
+                if (strcmp(p->data, padding_item[i].ptr) == 0) {
+                    pad_mode = padding_item[i].id;
+                    break;
                 }
             }
-            break;
+        } break;
         default:
             return 0;
         }
@@ -546,7 +545,7 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
             return 0;
 
         p = OSSL_PARAM_locate_const(params,
-                                    OSSL_ASYM_CIPHER_PARAM_MGF1_DIGEST_PROPS);
+            OSSL_ASYM_CIPHER_PARAM_MGF1_DIGEST_PROPS);
         if (p != NULL) {
             str = mdprops;
             if (!OSSL_PARAM_get_utf8_string(p, &str, sizeof(mdprops)))
@@ -613,12 +612,12 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
     OSSL_PARAM_uint(OSSL_ASYM_CIPHER_PARAM_TLS_NEGOTIATED_VERSION, NULL),
     OSSL_PARAM_uint(OSSL_ASYM_CIPHER_PARAM_IMPLICIT_REJECTION, NULL),
     OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_ASYM_CIPHER_PARAM_FIPS_KEY_CHECK)
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_ASYM_CIPHER_PARAM_FIPS_RSA_PKCS15_PAD_DISABLED)
-    OSSL_PARAM_END
+        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_ASYM_CIPHER_PARAM_FIPS_RSA_PKCS15_PAD_DISABLED)
+            OSSL_PARAM_END
 };
 
 static const OSSL_PARAM *rsa_settable_ctx_params(ossl_unused void *vprsactx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_ctx_params;
 }
@@ -632,12 +631,12 @@ const OSSL_DISPATCH ossl_rsa_asym_cipher_functions[] = {
     { OSSL_FUNC_ASYM_CIPHER_FREECTX, (void (*)(void))rsa_freectx },
     { OSSL_FUNC_ASYM_CIPHER_DUPCTX, (void (*)(void))rsa_dupctx },
     { OSSL_FUNC_ASYM_CIPHER_GET_CTX_PARAMS,
-      (void (*)(void))rsa_get_ctx_params },
+        (void (*)(void))rsa_get_ctx_params },
     { OSSL_FUNC_ASYM_CIPHER_GETTABLE_CTX_PARAMS,
-      (void (*)(void))rsa_gettable_ctx_params },
+        (void (*)(void))rsa_gettable_ctx_params },
     { OSSL_FUNC_ASYM_CIPHER_SET_CTX_PARAMS,
-      (void (*)(void))rsa_set_ctx_params },
+        (void (*)(void))rsa_set_ctx_params },
     { OSSL_FUNC_ASYM_CIPHER_SETTABLE_CTX_PARAMS,
-      (void (*)(void))rsa_settable_ctx_params },
+        (void (*)(void))rsa_settable_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/asymciphers/sm2_enc.c b/providers/implementations/asymciphers/sm2_enc.c
index 747190f3f9b5c..d872132af54ec 100644
--- a/providers/implementations/asymciphers/sm2_enc.c
+++ b/providers/implementations/asymciphers/sm2_enc.c
@@ -48,7 +48,7 @@ typedef struct {
 
 static void *sm2_newctx(void *provctx)
 {
-    PROV_SM2_CTX *psm2ctx =  OPENSSL_zalloc(sizeof(PROV_SM2_CTX));
+    PROV_SM2_CTX *psm2ctx = OPENSSL_zalloc(sizeof(PROV_SM2_CTX));
 
     if (psm2ctx == NULL)
         return NULL;
@@ -80,8 +80,8 @@ static const EVP_MD *sm2_get_md(PROV_SM2_CTX *psm2ctx)
 }
 
 static int sm2_asym_encrypt(void *vpsm2ctx, unsigned char *out, size_t *outlen,
-                            size_t outsize, const unsigned char *in,
-                            size_t inlen)
+    size_t outsize, const unsigned char *in,
+    size_t inlen)
 {
     PROV_SM2_CTX *psm2ctx = (PROV_SM2_CTX *)vpsm2ctx;
     const EVP_MD *md = sm2_get_md(psm2ctx);
@@ -101,8 +101,8 @@ static int sm2_asym_encrypt(void *vpsm2ctx, unsigned char *out, size_t *outlen,
 }
 
 static int sm2_asym_decrypt(void *vpsm2ctx, unsigned char *out, size_t *outlen,
-                            size_t outsize, const unsigned char *in,
-                            size_t inlen)
+    size_t outsize, const unsigned char *in,
+    size_t inlen)
 {
     PROV_SM2_CTX *psm2ctx = (PROV_SM2_CTX *)vpsm2ctx;
     const EVP_MD *md = sm2_get_md(psm2ctx);
@@ -166,8 +166,7 @@ static int sm2_get_ctx_params(void *vpsm2ctx, OSSL_PARAM *params)
     if (p != NULL) {
         const EVP_MD *md = ossl_prov_digest_md(&psm2ctx->md);
 
-        if (!OSSL_PARAM_set_utf8_string(p, md == NULL ? ""
-                                                      : EVP_MD_get0_name(md)))
+        if (!OSSL_PARAM_set_utf8_string(p, md == NULL ? "" : EVP_MD_get0_name(md)))
             return 0;
     }
 
@@ -180,7 +179,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *sm2_gettable_ctx_params(ossl_unused void *vpsm2ctx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -195,7 +194,7 @@ static int sm2_set_ctx_params(void *vpsm2ctx, const OSSL_PARAM params[])
         return 1;
 
     if (!ossl_prov_digest_load_from_params(&psm2ctx->md, params,
-                                           psm2ctx->libctx))
+            psm2ctx->libctx))
         return 0;
 
     return 1;
@@ -209,7 +208,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *sm2_settable_ctx_params(ossl_unused void *vpsm2ctx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_ctx_params;
 }
@@ -223,12 +222,12 @@ const OSSL_DISPATCH ossl_sm2_asym_cipher_functions[] = {
     { OSSL_FUNC_ASYM_CIPHER_FREECTX, (void (*)(void))sm2_freectx },
     { OSSL_FUNC_ASYM_CIPHER_DUPCTX, (void (*)(void))sm2_dupctx },
     { OSSL_FUNC_ASYM_CIPHER_GET_CTX_PARAMS,
-      (void (*)(void))sm2_get_ctx_params },
+        (void (*)(void))sm2_get_ctx_params },
     { OSSL_FUNC_ASYM_CIPHER_GETTABLE_CTX_PARAMS,
-      (void (*)(void))sm2_gettable_ctx_params },
+        (void (*)(void))sm2_gettable_ctx_params },
     { OSSL_FUNC_ASYM_CIPHER_SET_CTX_PARAMS,
-      (void (*)(void))sm2_set_ctx_params },
+        (void (*)(void))sm2_set_ctx_params },
     { OSSL_FUNC_ASYM_CIPHER_SETTABLE_CTX_PARAMS,
-      (void (*)(void))sm2_settable_ctx_params },
+        (void (*)(void))sm2_settable_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/ciphers/cipher_aes.c b/providers/implementations/ciphers/cipher_aes.c
index 280be2dddcaf4..62fe6f8e8dfa2 100644
--- a/providers/implementations/ciphers/cipher_aes.c
+++ b/providers/implementations/ciphers/cipher_aes.c
@@ -28,7 +28,7 @@ static void aes_freectx(void *vctx)
     PROV_AES_CTX *ctx = (PROV_AES_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *aes_dupctx(void *ctx)
@@ -66,11 +66,11 @@ IMPLEMENT_generic_cipher(aes, AES, ofb, OFB, 0, 192, 8, 128, stream)
 /* ossl_aes128ofb_functions */
 IMPLEMENT_generic_cipher(aes, AES, ofb, OFB, 0, 128, 8, 128, stream)
 /* ossl_aes256cfb_functions */
-IMPLEMENT_generic_cipher(aes, AES, cfb,  CFB, 0, 256, 8, 128, stream)
+IMPLEMENT_generic_cipher(aes, AES, cfb, CFB, 0, 256, 8, 128, stream)
 /* ossl_aes192cfb_functions */
-IMPLEMENT_generic_cipher(aes, AES, cfb,  CFB, 0, 192, 8, 128, stream)
+IMPLEMENT_generic_cipher(aes, AES, cfb, CFB, 0, 192, 8, 128, stream)
 /* ossl_aes128cfb_functions */
-IMPLEMENT_generic_cipher(aes, AES, cfb,  CFB, 0, 128, 8, 128, stream)
+IMPLEMENT_generic_cipher(aes, AES, cfb, CFB, 0, 128, 8, 128, stream)
 /* ossl_aes256cfb1_functions */
 IMPLEMENT_generic_cipher(aes, AES, cfb1, CFB, 0, 256, 8, 128, stream)
 /* ossl_aes192cfb1_functions */
diff --git a/providers/implementations/ciphers/cipher_aes.h b/providers/implementations/ciphers/cipher_aes.h
index c62ac5e7eaeb1..22e09c1a96ba2 100644
--- a/providers/implementations/ciphers/cipher_aes.h
+++ b/providers/implementations/ciphers/cipher_aes.h
@@ -12,7 +12,7 @@
 #include "crypto/aes_platform.h"
 
 typedef struct prov_aes_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         AES_KEY ks;
diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
index 76f53e0c7cce8..0c1efa9b32342 100644
--- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
+++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
@@ -24,14 +24,14 @@
 #include "prov/providercommon.h"
 
 #ifndef AES_CBC_HMAC_SHA_CAPABLE
-# define IMPLEMENT_CIPHER(nm, sub, kbits, blkbits, ivbits, flags)              \
-const OSSL_DISPATCH ossl_##nm##kbits##sub##_functions[] = {                    \
-    OSSL_DISPATCH_END                                                              \
-};
+#define IMPLEMENT_CIPHER(nm, sub, kbits, blkbits, ivbits, flags) \
+    const OSSL_DISPATCH ossl_##nm##kbits##sub##_functions[] = {  \
+        OSSL_DISPATCH_END                                        \
+    };
 #else
 
-# define AES_CBC_HMAC_SHA_FLAGS (PROV_CIPHER_FLAG_AEAD                         \
-                                 | PROV_CIPHER_FLAG_TLS1_MULTIBLOCK)
+#define AES_CBC_HMAC_SHA_FLAGS (PROV_CIPHER_FLAG_AEAD \
+    | PROV_CIPHER_FLAG_TLS1_MULTIBLOCK)
 
 static OSSL_FUNC_cipher_encrypt_init_fn aes_einit;
 static OSSL_FUNC_cipher_decrypt_init_fn aes_dinit;
@@ -41,14 +41,14 @@ static OSSL_FUNC_cipher_get_ctx_params_fn aes_get_ctx_params;
 static OSSL_FUNC_cipher_gettable_ctx_params_fn aes_gettable_ctx_params;
 static OSSL_FUNC_cipher_set_ctx_params_fn aes_set_ctx_params;
 static OSSL_FUNC_cipher_settable_ctx_params_fn aes_settable_ctx_params;
-# define aes_gettable_params ossl_cipher_generic_gettable_params
-# define aes_update ossl_cipher_generic_stream_update
-# define aes_final ossl_cipher_generic_stream_final
-# define aes_cipher ossl_cipher_generic_cipher
+#define aes_gettable_params ossl_cipher_generic_gettable_params
+#define aes_update ossl_cipher_generic_stream_update
+#define aes_final ossl_cipher_generic_stream_final
+#define aes_cipher ossl_cipher_generic_cipher
 
 static int aes_einit(void *ctx, const unsigned char *key, size_t keylen,
-                          const unsigned char *iv, size_t ivlen,
-                          const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     if (!ossl_cipher_generic_einit(ctx, key, keylen, iv, ivlen, NULL))
         return 0;
@@ -56,8 +56,8 @@ static int aes_einit(void *ctx, const unsigned char *key, size_t keylen,
 }
 
 static int aes_dinit(void *ctx, const unsigned char *key, size_t keylen,
-                          const unsigned char *iv, size_t ivlen,
-                          const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     if (!ossl_cipher_generic_dinit(ctx, key, keylen, iv, ivlen, NULL))
         return 0;
@@ -67,18 +67,18 @@ static int aes_dinit(void *ctx, const unsigned char *key, size_t keylen,
 static const OSSL_PARAM cipher_aes_known_settable_ctx_params[] = {
     OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_MAC_KEY, NULL, 0),
     OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD, NULL, 0),
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
     OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_SEND_FRAGMENT, NULL),
     OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_AAD, NULL),
     OSSL_PARAM_uint(OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, NULL),
     OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC, NULL, 0),
     OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC_IN, NULL, 0),
-# endif /* !defined(OPENSSL_NO_MULTIBLOCK) */
+#endif /* !defined(OPENSSL_NO_MULTIBLOCK) */
     OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
     OSSL_PARAM_END
 };
 const OSSL_PARAM *aes_settable_ctx_params(ossl_unused void *cctx,
-                                          ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return cipher_aes_known_settable_ctx_params;
 }
@@ -86,13 +86,12 @@ const OSSL_PARAM *aes_settable_ctx_params(ossl_unused void *cctx,
 static int aes_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 {
     PROV_AES_HMAC_SHA_CTX *ctx = (PROV_AES_HMAC_SHA_CTX *)vctx;
-    PROV_CIPHER_HW_AES_HMAC_SHA *hw =
-       (PROV_CIPHER_HW_AES_HMAC_SHA *)ctx->hw;
+    PROV_CIPHER_HW_AES_HMAC_SHA *hw = (PROV_CIPHER_HW_AES_HMAC_SHA *)ctx->hw;
     const OSSL_PARAM *p;
     int ret = 1;
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
     EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param;
-# endif
+#endif
 
     if (ossl_param_is_empty(params))
         return 1;
@@ -106,11 +105,11 @@ static int aes_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         hw->init_mac_key(ctx, p->data, p->data_size);
     }
 
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
     p = OSSL_PARAM_locate_const(params,
-            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_SEND_FRAGMENT);
+        OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_SEND_FRAGMENT);
     if (p != NULL
-            && !OSSL_PARAM_get_size_t(p, &ctx->multiblock_max_send_fragment)) {
+        && !OSSL_PARAM_get_size_t(p, &ctx->multiblock_max_send_fragment)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GET_PARAMETER);
         return 0;
     }
@@ -126,7 +125,7 @@ static int aes_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_AAD);
     if (p != NULL) {
         const OSSL_PARAM *p1 = OSSL_PARAM_locate_const(params,
-                                   OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE);
         if (p->data_type != OSSL_PARAM_OCTET_STRING
             || p1 == NULL
             || !OSSL_PARAM_get_uint(p1, &mb_param.interleave)) {
@@ -151,9 +150,9 @@ static int aes_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC);
     if (p != NULL) {
         const OSSL_PARAM *p1 = OSSL_PARAM_locate_const(params,
-                                   OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE);
         const OSSL_PARAM *pin = OSSL_PARAM_locate_const(params,
-                                    OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC_IN);
+            OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC_IN);
 
         if (p->data_type != OSSL_PARAM_OCTET_STRING
             || pin == NULL
@@ -169,7 +168,7 @@ static int aes_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         if (hw->tls1_multiblock_encrypt(vctx, &mb_param) <= 0)
             return 0;
     }
-# endif /* !defined(OPENSSL_NO_MULTIBLOCK) */
+#endif /* !defined(OPENSSL_NO_MULTIBLOCK) */
 
     p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_AEAD_TLS1_AAD);
     if (p != NULL) {
@@ -202,7 +201,7 @@ static int aes_set_ctx_params(void *vctx, const OSSL_PARAM params[])
             return 0;
         }
         if (ctx->base.tlsversion == SSL3_VERSION
-                || ctx->base.tlsversion == TLS1_VERSION) {
+            || ctx->base.tlsversion == TLS1_VERSION) {
             if (!ossl_assert(ctx->base.removetlsfixed >= AES_BLOCK_SIZE)) {
                 ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR);
                 return 0;
@@ -222,11 +221,10 @@ static int aes_get_ctx_params(void *vctx, OSSL_PARAM params[])
     PROV_AES_HMAC_SHA_CTX *ctx = (PROV_AES_HMAC_SHA_CTX *)vctx;
     OSSL_PARAM *p;
 
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
     p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_BUFSIZE);
     if (p != NULL) {
-        PROV_CIPHER_HW_AES_HMAC_SHA *hw =
-           (PROV_CIPHER_HW_AES_HMAC_SHA *)ctx->hw;
+        PROV_CIPHER_HW_AES_HMAC_SHA *hw = (PROV_CIPHER_HW_AES_HMAC_SHA *)ctx->hw;
         size_t len = hw->tls1_multiblock_max_bufsize(ctx);
 
         if (!OSSL_PARAM_set_size_t(p, len)) {
@@ -252,7 +250,7 @@ static int aes_get_ctx_params(void *vctx, OSSL_PARAM params[])
         ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);
         return 0;
     }
-# endif /* !defined(OPENSSL_NO_MULTIBLOCK) */
+#endif /* !defined(OPENSSL_NO_MULTIBLOCK) */
 
     p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD);
     if (p != NULL && !OSSL_PARAM_set_size_t(p, ctx->tls_aad_pad)) {
@@ -287,12 +285,12 @@ static int aes_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM cipher_aes_known_gettable_ctx_params[] = {
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
     OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_MAX_BUFSIZE, NULL),
     OSSL_PARAM_uint(OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_INTERLEAVE, NULL),
     OSSL_PARAM_uint(OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_AAD_PACKLEN, NULL),
     OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK_ENC_LEN, NULL),
-# endif /* !defined(OPENSSL_NO_MULTIBLOCK) */
+#endif /* !defined(OPENSSL_NO_MULTIBLOCK) */
     OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, NULL),
     OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
     OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_IVLEN, NULL),
@@ -301,25 +299,25 @@ static const OSSL_PARAM cipher_aes_known_gettable_ctx_params[] = {
     OSSL_PARAM_END
 };
 const OSSL_PARAM *aes_gettable_ctx_params(ossl_unused void *cctx,
-                                          ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return cipher_aes_known_gettable_ctx_params;
 }
 
 static void base_init(void *provctx, PROV_AES_HMAC_SHA_CTX *ctx,
-                      const PROV_CIPHER_HW_AES_HMAC_SHA *meths,
-                      size_t kbits, size_t blkbits, size_t ivbits,
-                      uint64_t flags)
+    const PROV_CIPHER_HW_AES_HMAC_SHA *meths,
+    size_t kbits, size_t blkbits, size_t ivbits,
+    uint64_t flags)
 {
     ossl_cipher_generic_initkey(&ctx->base, kbits, blkbits, ivbits,
-                                EVP_CIPH_CBC_MODE, flags,
-                                &meths->base, provctx);
+        EVP_CIPH_CBC_MODE, flags,
+        &meths->base, provctx);
     ctx->hw = (PROV_CIPHER_HW_AES_HMAC_SHA *)ctx->base.hw;
 }
 
 static void *aes_cbc_hmac_sha1_newctx(void *provctx, size_t kbits,
-                                      size_t blkbits, size_t ivbits,
-                                      uint64_t flags)
+    size_t blkbits, size_t ivbits,
+    uint64_t flags)
 {
     PROV_AES_HMAC_SHA1_CTX *ctx;
 
@@ -329,8 +327,8 @@ static void *aes_cbc_hmac_sha1_newctx(void *provctx, size_t kbits,
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx != NULL)
         base_init(provctx, &ctx->base_ctx,
-                  ossl_prov_cipher_hw_aes_cbc_hmac_sha1(), kbits, blkbits,
-                  ivbits, flags);
+            ossl_prov_cipher_hw_aes_cbc_hmac_sha1(), kbits, blkbits,
+            ivbits, flags);
     return ctx;
 }
 
@@ -358,8 +356,8 @@ static void aes_cbc_hmac_sha1_freectx(void *vctx)
 }
 
 static void *aes_cbc_hmac_sha256_newctx(void *provctx, size_t kbits,
-                                        size_t blkbits, size_t ivbits,
-                                        uint64_t flags)
+    size_t blkbits, size_t ivbits,
+    uint64_t flags)
 {
     PROV_AES_HMAC_SHA256_CTX *ctx;
 
@@ -369,8 +367,8 @@ static void *aes_cbc_hmac_sha256_newctx(void *provctx, size_t kbits,
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx != NULL)
         base_init(provctx, &ctx->base_ctx,
-                  ossl_prov_cipher_hw_aes_cbc_hmac_sha256(), kbits, blkbits,
-                  ivbits, flags);
+            ossl_prov_cipher_hw_aes_cbc_hmac_sha256(), kbits, blkbits,
+            ivbits, flags);
     return ctx;
 }
 
@@ -394,41 +392,41 @@ static void aes_cbc_hmac_sha256_freectx(void *vctx)
     }
 }
 
-# define IMPLEMENT_CIPHER(nm, sub, kbits, blkbits, ivbits, flags)              \
-static OSSL_FUNC_cipher_newctx_fn nm##_##kbits##_##sub##_newctx;               \
-static void *nm##_##kbits##_##sub##_newctx(void *provctx)                      \
-{                                                                              \
-    return nm##_##sub##_newctx(provctx, kbits, blkbits, ivbits, flags);        \
-}                                                                              \
-static OSSL_FUNC_cipher_get_params_fn nm##_##kbits##_##sub##_get_params;       \
-static int nm##_##kbits##_##sub##_get_params(OSSL_PARAM params[])              \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_CBC_MODE,           \
-                                          flags, kbits, blkbits, ivbits);      \
-}                                                                              \
-const OSSL_DISPATCH ossl_##nm##kbits##sub##_functions[] = {                    \
-    { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))nm##_##kbits##_##sub##_newctx },\
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))nm##_##sub##_freectx },        \
-    { OSSL_FUNC_CIPHER_DUPCTX,  (void (*)(void))nm##_##sub##_dupctx},          \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))nm##_einit },             \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))nm##_dinit },             \
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))nm##_update },                  \
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))nm##_final },                    \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))nm##_cipher },                  \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-        (void (*)(void))nm##_##kbits##_##sub##_get_params },                   \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-        (void (*)(void))nm##_gettable_params },                                \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-         (void (*)(void))nm##_get_ctx_params },                                \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-        (void (*)(void))nm##_gettable_ctx_params },                            \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-        (void (*)(void))nm##_set_ctx_params },                                 \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-        (void (*)(void))nm##_settable_ctx_params },                            \
-    OSSL_DISPATCH_END                                                          \
-};
+#define IMPLEMENT_CIPHER(nm, sub, kbits, blkbits, ivbits, flags)                    \
+    static OSSL_FUNC_cipher_newctx_fn nm##_##kbits##_##sub##_newctx;                \
+    static void *nm##_##kbits##_##sub##_newctx(void *provctx)                       \
+    {                                                                               \
+        return nm##_##sub##_newctx(provctx, kbits, blkbits, ivbits, flags);         \
+    }                                                                               \
+    static OSSL_FUNC_cipher_get_params_fn nm##_##kbits##_##sub##_get_params;        \
+    static int nm##_##kbits##_##sub##_get_params(OSSL_PARAM params[])               \
+    {                                                                               \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_CBC_MODE,            \
+            flags, kbits, blkbits, ivbits);                                         \
+    }                                                                               \
+    const OSSL_DISPATCH ossl_##nm##kbits##sub##_functions[] = {                     \
+        { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))nm##_##kbits##_##sub##_newctx }, \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))nm##_##sub##_freectx },         \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))nm##_##sub##_dupctx },           \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))nm##_einit },              \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))nm##_dinit },              \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))nm##_update },                   \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))nm##_final },                     \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))nm##_cipher },                   \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                              \
+            (void (*)(void))nm##_##kbits##_##sub##_get_params },                    \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                         \
+            (void (*)(void))nm##_gettable_params },                                 \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                          \
+            (void (*)(void))nm##_get_ctx_params },                                  \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                     \
+            (void (*)(void))nm##_gettable_ctx_params },                             \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                          \
+            (void (*)(void))nm##_set_ctx_params },                                  \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                     \
+            (void (*)(void))nm##_settable_ctx_params },                             \
+        OSSL_DISPATCH_END                                                           \
+    };
 
 #endif /* AES_CBC_HMAC_SHA_CAPABLE */
 
diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.h b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.h
index 6aaf3f06fb490..97831da9e788f 100644
--- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.h
+++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.h
@@ -17,26 +17,26 @@ typedef struct prov_cipher_hw_aes_hmac_sha_ctx_st {
     PROV_CIPHER_HW base; /* must be first */
     void (*init_mac_key)(void *ctx, const unsigned char *inkey, size_t inlen);
     int (*set_tls1_aad)(void *ctx, unsigned char *aad_rec, int aad_len);
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
     int (*tls1_multiblock_max_bufsize)(void *ctx);
     int (*tls1_multiblock_aad)(
         void *vctx, EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param);
     int (*tls1_multiblock_encrypt)(
         void *ctx, EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param);
-# endif /* OPENSSL_NO_MULTIBLOCK) */
+#endif /* OPENSSL_NO_MULTIBLOCK) */
 } PROV_CIPHER_HW_AES_HMAC_SHA;
 
 const PROV_CIPHER_HW_AES_HMAC_SHA *ossl_prov_cipher_hw_aes_cbc_hmac_sha1(void);
 const PROV_CIPHER_HW_AES_HMAC_SHA *ossl_prov_cipher_hw_aes_cbc_hmac_sha256(void);
 
 #ifdef AES_CBC_HMAC_SHA_CAPABLE
-# include <openssl/aes.h>
-# include <openssl/sha.h>
+#include <openssl/aes.h>
+#include <openssl/sha.h>
 
 typedef struct prov_aes_hmac_sha_ctx_st {
     PROV_CIPHER_CTX base;
     AES_KEY ks;
-    size_t payload_length;      /* AAD length in decrypt case */
+    size_t payload_length; /* AAD length in decrypt case */
     union {
         unsigned int tls_ver;
         unsigned char tls_aad[16]; /* 13 used */
@@ -60,6 +60,6 @@ typedef struct prov_aes_hmac_sha256_ctx_st {
     SHA256_CTX head, tail, md;
 } PROV_AES_HMAC_SHA256_CTX;
 
-# define NO_PAYLOAD_LENGTH ((size_t)-1)
+#define NO_PAYLOAD_LENGTH ((size_t)-1)
 
 #endif /* AES_CBC_HMAC_SHA_CAPABLE */
diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c
index 76674d530434a..e884c6501a7df 100644
--- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c
@@ -28,14 +28,14 @@ const PROV_CIPHER_HW_AES_HMAC_SHA *ossl_prov_cipher_hw_aes_cbc_hmac_sha1(void)
 }
 #else
 
-# include <openssl/rand.h>
-# include "crypto/evp.h"
-# include "internal/constant_time.h"
+#include <openssl/rand.h>
+#include "crypto/evp.h"
+#include "internal/constant_time.h"
 
 void sha1_block_data_order(void *c, const void *p, size_t len);
 void aesni_cbc_sha1_enc(const void *inp, void *out, size_t blocks,
-                        const AES_KEY *key, unsigned char iv[16],
-                        SHA_CTX *ctx, const void *in0);
+    const AES_KEY *key, unsigned char iv[16],
+    SHA_CTX *ctx, const void *in0);
 
 int ossl_cipher_capable_aes_cbc_hmac_sha1(void)
 {
@@ -43,7 +43,7 @@ int ossl_cipher_capable_aes_cbc_hmac_sha1(void)
 }
 
 static int aesni_cbc_hmac_sha1_init_key(PROV_CIPHER_CTX *vctx,
-                                        const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     int ret;
     PROV_AES_HMAC_SHA_CTX *ctx = (PROV_AES_HMAC_SHA_CTX *)vctx;
@@ -54,7 +54,7 @@ static int aesni_cbc_hmac_sha1_init_key(PROV_CIPHER_CTX *vctx,
     else
         ret = aesni_set_decrypt_key(key, keylen * 8, &ctx->ks);
 
-    SHA1_Init(&sctx->head);      /* handy when benchmarking */
+    SHA1_Init(&sctx->head); /* handy when benchmarking */
     sctx->tail = sctx->head;
     sctx->md = sctx->head;
 
@@ -97,7 +97,7 @@ static void sha1_update(SHA_CTX *c, const void *data, size_t len)
         SHA1_Update(c, ptr, res);
 }
 
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
 
 typedef struct {
     unsigned int A[8], B[8], C[8], D[8], E[8];
@@ -119,10 +119,10 @@ void sha1_multi_block(SHA1_MB_CTX *, const HASH_DESC *, int);
 void aesni_multi_cbc_encrypt(CIPH_DESC *, void *, int);
 
 static size_t tls1_multi_block_encrypt(void *vctx,
-                                       unsigned char *out,
-                                       const unsigned char *inp,
-                                       size_t inp_len, int n4x)
-{                               /* n4x is 1 or 2 */
+    unsigned char *out,
+    const unsigned char *inp,
+    size_t inp_len, int n4x)
+{ /* n4x is 1 or 2 */
     PROV_AES_HMAC_SHA_CTX *ctx = (PROV_AES_HMAC_SHA_CTX *)vctx;
     PROV_AES_HMAC_SHA1_CTX *sctx = (PROV_AES_HMAC_SHA1_CTX *)vctx;
     HASH_DESC hash_d[8], edges[8];
@@ -138,15 +138,15 @@ static size_t tls1_multi_block_encrypt(void *vctx,
     unsigned int x4 = 4 * n4x, minblocks, processed = 0;
     size_t ret = 0;
     u8 *IVs;
-#  if defined(BSWAP8)
+#if defined(BSWAP8)
     u64 seqnum;
-#  endif
+#endif
 
     /* ask for IVs in bulk */
     if (RAND_bytes_ex(ctx->base.libctx, (IVs = blocks[0].c), 16 * x4, 0) <= 0)
         return 0;
 
-    mctx = (SHA1_MB_CTX *) (storage + 32 - ((size_t)storage % 32)); /* align */
+    mctx = (SHA1_MB_CTX *)(storage + 32 - ((size_t)storage % 32)); /* align */
 
     frag = (unsigned int)inp_len >> (1 + n4x);
     last = (unsigned int)inp_len + frag - (frag << (1 + n4x));
@@ -174,15 +174,15 @@ static size_t tls1_multi_block_encrypt(void *vctx,
         IVs += 16;
     }
 
-#  if defined(BSWAP8)
+#if defined(BSWAP8)
     memcpy(blocks[0].c, sctx->md.data, 8);
     seqnum = BSWAP8(blocks[0].q[0]);
-#  endif
+#endif
     for (i = 0; i < x4; i++) {
         unsigned int len = (i == (x4 - 1) ? last : frag);
-#  if !defined(BSWAP8)
+#if !defined(BSWAP8)
         unsigned int carry, j;
-#  endif
+#endif
 
         mctx->A[i] = sctx->md.h0;
         mctx->B[i] = sctx->md.h1;
@@ -191,14 +191,14 @@ static size_t tls1_multi_block_encrypt(void *vctx,
         mctx->E[i] = sctx->md.h4;
 
         /* fix seqnum */
-#  if defined(BSWAP8)
+#if defined(BSWAP8)
         blocks[i].q[0] = BSWAP8(seqnum + i);
-#  else
+#else
         for (carry = i, j = 8; j--;) {
             blocks[i].c[j] = ((u8 *)sctx->md.data)[j] + carry;
             carry = (blocks[i].c[j] - carry) >> (sizeof(carry) * 8 - 1);
         }
-#  endif
+#endif
         blocks[i].c[8] = ((u8 *)sctx->md.data)[8];
         blocks[i].c[9] = ((u8 *)sctx->md.data)[9];
         blocks[i].c[10] = ((u8 *)sctx->md.data)[10];
@@ -217,10 +217,10 @@ static size_t tls1_multi_block_encrypt(void *vctx,
     /* hash 13-byte headers and first 64-13 bytes of inputs */
     sha1_multi_block(mctx, edges, n4x);
     /* hash bulk inputs */
-#  define MAXCHUNKSIZE    2048
-#  if     MAXCHUNKSIZE%64
-#   error  "MAXCHUNKSIZE is not divisible by 64"
-#  elif   MAXCHUNKSIZE
+#define MAXCHUNKSIZE 2048
+#if MAXCHUNKSIZE % 64
+#error "MAXCHUNKSIZE is not divisible by 64"
+#elif MAXCHUNKSIZE
     /*
      * goal is to minimize pressure on L1 cache by moving in shorter steps,
      * so that hashed data is still in the cache by the time we encrypt it
@@ -249,34 +249,34 @@ static size_t tls1_multi_block_encrypt(void *vctx,
             minblocks -= MAXCHUNKSIZE / 64;
         } while (minblocks > MAXCHUNKSIZE / 64);
     }
-#  endif
-#  undef  MAXCHUNKSIZE
+#endif
+#undef MAXCHUNKSIZE
     sha1_multi_block(mctx, hash_d, n4x);
 
     memset(blocks, 0, sizeof(blocks));
     for (i = 0; i < x4; i++) {
         unsigned int len = (i == (x4 - 1) ? last : frag),
-            off = hash_d[i].blocks * 64;
+                     off = hash_d[i].blocks * 64;
         const unsigned char *ptr = hash_d[i].ptr + off;
 
         off = (len - processed) - (64 - 13) - off; /* remainder actually */
         memcpy(blocks[i].c, ptr, off);
         blocks[i].c[off] = 0x80;
-        len += 64 + 13;         /* 64 is HMAC header */
-        len *= 8;               /* convert to bits */
+        len += 64 + 13; /* 64 is HMAC header */
+        len *= 8; /* convert to bits */
         if (off < (64 - 8)) {
-#  ifdef BSWAP4
+#ifdef BSWAP4
             blocks[i].d[15] = BSWAP4(len);
-#  else
+#else
             PUTU32(blocks[i].c + 60, len);
-#  endif
+#endif
             edges[i].blocks = 1;
         } else {
-#  ifdef BSWAP4
+#ifdef BSWAP4
             blocks[i].d[31] = BSWAP4(len);
-#  else
+#else
             PUTU32(blocks[i].c + 124, len);
-#  endif
+#endif
             edges[i].blocks = 2;
         }
         edges[i].ptr = blocks[i].c;
@@ -287,7 +287,7 @@ static size_t tls1_multi_block_encrypt(void *vctx,
 
     memset(blocks, 0, sizeof(blocks));
     for (i = 0; i < x4; i++) {
-#  ifdef BSWAP4
+#ifdef BSWAP4
         blocks[i].d[0] = BSWAP4(mctx->A[i]);
         mctx->A[i] = sctx->tail.h0;
         blocks[i].d[1] = BSWAP4(mctx->B[i]);
@@ -300,7 +300,7 @@ static size_t tls1_multi_block_encrypt(void *vctx,
         mctx->E[i] = sctx->tail.h4;
         blocks[i].c[20] = 0x80;
         blocks[i].d[15] = BSWAP4((64 + 20) * 8);
-#  else
+#else
         PUTU32(blocks[i].c + 0, mctx->A[i]);
         mctx->A[i] = sctx->tail.h0;
         PUTU32(blocks[i].c + 4, mctx->B[i]);
@@ -313,7 +313,7 @@ static size_t tls1_multi_block_encrypt(void *vctx,
         mctx->E[i] = sctx->tail.h4;
         blocks[i].c[20] = 0x80;
         PUTU32(blocks[i].c + 60, (64 + 20) * 8);
-#  endif /* BSWAP */
+#endif /* BSWAP */
         edges[i].ptr = blocks[i].c;
         edges[i].blocks = 1;
     }
@@ -346,7 +346,7 @@ static size_t tls1_multi_block_encrypt(void *vctx,
         len += pad + 1;
 
         ciph_d[i].blocks = (len - processed) / 16;
-        len += 16;              /* account for explicit iv */
+        len += 16; /* account for explicit iv */
 
         /* arrange header */
         out0[0] = ((u8 *)sctx->md.data)[8];
@@ -367,11 +367,11 @@ static size_t tls1_multi_block_encrypt(void *vctx,
     ctx->multiblock_encrypt_len = ret;
     return ret;
 }
-# endif /* OPENSSL_NO_MULTIBLOCK */
+#endif /* OPENSSL_NO_MULTIBLOCK */
 
 static int aesni_cbc_hmac_sha1_cipher(PROV_CIPHER_CTX *vctx,
-                                      unsigned char *out,
-                                      const unsigned char *in, size_t len)
+    unsigned char *out,
+    const unsigned char *in, size_t len)
 {
     PROV_AES_HMAC_SHA_CTX *ctx = (PROV_AES_HMAC_SHA_CTX *)vctx;
     PROV_AES_HMAC_SHA1_CTX *sctx = (PROV_AES_HMAC_SHA1_CTX *)vctx;
@@ -389,19 +389,17 @@ static int aesni_cbc_hmac_sha1_cipher(PROV_CIPHER_CTX *vctx,
     if (ctx->base.enc) {
         if (plen == NO_PAYLOAD_LENGTH)
             plen = len;
-        else if (len !=
-                 ((plen + SHA_DIGEST_LENGTH +
-                   AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
+        else if (len != ((plen + SHA_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
             return 0;
         else if (ctx->aux.tls_ver >= TLS1_1_VERSION)
             iv = AES_BLOCK_SIZE;
 
         if (plen > (sha_off + iv)
-                && (blocks = (plen - (sha_off + iv)) / SHA_CBLOCK)) {
+            && (blocks = (plen - (sha_off + iv)) / SHA_CBLOCK)) {
             sha1_update(&sctx->md, in + iv, sha_off);
 
             aesni_cbc_sha1_enc(in, out, blocks, &ctx->ks, ctx->base.iv,
-                               &sctx->md, in + iv + sha_off);
+                &sctx->md, in + iv + sha_off);
             blocks *= SHA_CBLOCK;
             aes_off += blocks;
             sha_off += blocks;
@@ -415,7 +413,7 @@ static int aesni_cbc_hmac_sha1_cipher(PROV_CIPHER_CTX *vctx,
         sha_off += iv;
         sha1_update(&sctx->md, in + sha_off, plen - sha_off);
 
-        if (plen != len) {      /* "TLS" mode of operation */
+        if (plen != len) { /* "TLS" mode of operation */
             if (in != out)
                 memcpy(out + aes_off, in + aes_off, plen - aes_off);
 
@@ -431,10 +429,10 @@ static int aesni_cbc_hmac_sha1_cipher(PROV_CIPHER_CTX *vctx,
                 out[plen] = l;
             /* encrypt HMAC|padding at once */
             aesni_cbc_encrypt(out + aes_off, out + aes_off, len - aes_off,
-                              &ctx->ks, ctx->base.iv, 1);
+                &ctx->ks, ctx->base.iv, 1);
         } else {
             aesni_cbc_encrypt(in + aes_off, out + aes_off, len - aes_off,
-                              &ctx->ks, ctx->base.iv, 1);
+                &ctx->ks, ctx->base.iv, 1);
         }
     } else {
         union {
@@ -509,15 +507,15 @@ static int aesni_cbc_hmac_sha1_cipher(PROV_CIPHER_CTX *vctx,
 
             /* but pretend as if we hashed padded payload */
             bitlen = sctx->md.Nl + (inp_len << 3); /* at most 18 bits */
-# ifdef BSWAP4
+#ifdef BSWAP4
             bitlen = BSWAP4(bitlen);
-# else
+#else
             mac.c[0] = 0;
             mac.c[1] = (unsigned char)(bitlen >> 16);
             mac.c[2] = (unsigned char)(bitlen >> 8);
             mac.c[3] = (unsigned char)bitlen;
             bitlen = mac.u[0];
-# endif /* BSWAP */
+#endif /* BSWAP */
 
             pmac->u[0] = 0;
             pmac->u[1] = 0;
@@ -574,13 +572,13 @@ static int aesni_cbc_hmac_sha1_cipher(PROV_CIPHER_CTX *vctx,
             pmac->u[3] |= sctx->md.h3 & mask;
             pmac->u[4] |= sctx->md.h4 & mask;
 
-# ifdef BSWAP4
+#ifdef BSWAP4
             pmac->u[0] = BSWAP4(pmac->u[0]);
             pmac->u[1] = BSWAP4(pmac->u[1]);
             pmac->u[2] = BSWAP4(pmac->u[2]);
             pmac->u[3] = BSWAP4(pmac->u[3]);
             pmac->u[4] = BSWAP4(pmac->u[4]);
-# else
+#else
             for (i = 0; i < 5; i++) {
                 res = pmac->u[i];
                 pmac->c[4 * i + 0] = (unsigned char)(res >> 24);
@@ -588,7 +586,7 @@ static int aesni_cbc_hmac_sha1_cipher(PROV_CIPHER_CTX *vctx,
                 pmac->c[4 * i + 2] = (unsigned char)(res >> 8);
                 pmac->c[4 * i + 3] = (unsigned char)res;
             }
-# endif /* BSWAP4 */
+#endif /* BSWAP4 */
             len += SHA_DIGEST_LENGTH;
             sctx->md = sctx->tail;
             sha1_update(&sctx->md, pmac->c, SHA_DIGEST_LENGTH);
@@ -605,9 +603,7 @@ static int aesni_cbc_hmac_sha1_cipher(PROV_CIPHER_CTX *vctx,
 
                 for (res = 0, i = 0, j = 0; j < maxpad + SHA_DIGEST_LENGTH; j++) {
                     c = p[j];
-                    cmask =
-                        ((int)(j - off - SHA_DIGEST_LENGTH)) >> (sizeof(int) *
-                                                                 8 - 1);
+                    cmask = ((int)(j - off - SHA_DIGEST_LENGTH)) >> (sizeof(int) * 8 - 1);
                     res |= (c ^ pad) & ~cmask; /* ... and padding */
                     cmask &= ((int)(off - 1 - j)) >> (sizeof(int) * 8 - 1);
                     res |= (c ^ pmac->c[i]) & cmask;
@@ -630,7 +626,7 @@ static int aesni_cbc_hmac_sha1_cipher(PROV_CIPHER_CTX *vctx,
 
 /* EVP_CTRL_AEAD_SET_MAC_KEY */
 static void aesni_cbc_hmac_sha1_set_mac_key(void *vctx,
-                                            const unsigned char *mac, size_t len)
+    const unsigned char *mac, size_t len)
 {
     PROV_AES_HMAC_SHA1_CTX *ctx = (PROV_AES_HMAC_SHA1_CTX *)vctx;
     unsigned int i;
@@ -661,7 +657,7 @@ static void aesni_cbc_hmac_sha1_set_mac_key(void *vctx,
 
 /* EVP_CTRL_AEAD_TLS1_AAD */
 static int aesni_cbc_hmac_sha1_set_tls1_aad(void *vctx,
-                                            unsigned char *aad_rec, int aad_len)
+    unsigned char *aad_rec, int aad_len)
 {
     PROV_AES_HMAC_SHA_CTX *ctx = (PROV_AES_HMAC_SHA_CTX *)vctx;
     PROV_AES_HMAC_SHA1_CTX *sctx = (PROV_AES_HMAC_SHA1_CTX *)vctx;
@@ -675,8 +671,7 @@ static int aesni_cbc_hmac_sha1_set_tls1_aad(void *vctx,
 
     if (ctx->base.enc) {
         ctx->payload_length = len;
-        if ((ctx->aux.tls_ver =
-             p[aad_len - 4] << 8 | p[aad_len - 3]) >= TLS1_1_VERSION) {
+        if ((ctx->aux.tls_ver = p[aad_len - 4] << 8 | p[aad_len - 3]) >= TLS1_1_VERSION) {
             if (len < AES_BLOCK_SIZE)
                 return 0;
             len -= AES_BLOCK_SIZE;
@@ -685,9 +680,8 @@ static int aesni_cbc_hmac_sha1_set_tls1_aad(void *vctx,
         }
         sctx->md = sctx->head;
         sha1_update(&sctx->md, p, aad_len);
-        ctx->tls_aad_pad = (int)(((len + SHA_DIGEST_LENGTH +
-                       AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
-                     - len);
+        ctx->tls_aad_pad = (int)(((len + SHA_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
+            - len);
         return 1;
     } else {
         memcpy(ctx->aux.tls_aad, aad_rec, aad_len);
@@ -697,7 +691,7 @@ static int aesni_cbc_hmac_sha1_set_tls1_aad(void *vctx,
     }
 }
 
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
 
 /* EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE */
 static int aesni_cbc_hmac_sha1_tls1_multiblock_max_bufsize(void *vctx)
@@ -706,7 +700,7 @@ static int aesni_cbc_hmac_sha1_tls1_multiblock_max_bufsize(void *vctx)
 
     OPENSSL_assert(ctx->multiblock_max_send_fragment != 0);
     return (int)(5 + 16
-                 + (((int)ctx->multiblock_max_send_fragment + 20 + 16) & -16));
+        + (((int)ctx->multiblock_max_send_fragment + 20 + 16) & -16));
 }
 
 /* EVP_CTRL_TLS1_1_MULTIBLOCK_AAD */
@@ -759,7 +753,7 @@ static int aesni_cbc_hmac_sha1_tls1_multiblock_aad(
         ctx->multiblock_aad_packlen = packlen;
         return 1;
     }
-    return -1;      /* not yet */
+    return -1; /* not yet */
 }
 
 /* EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT */
@@ -767,24 +761,22 @@ static int aesni_cbc_hmac_sha1_tls1_multiblock_encrypt(
     void *ctx, EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param)
 {
     return (int)tls1_multi_block_encrypt(ctx, param->out,
-                                         param->inp, param->len,
-                                         param->interleave / 4);
+        param->inp, param->len,
+        param->interleave / 4);
 }
 
-# endif /* OPENSSL_NO_MULTIBLOCK */
+#endif /* OPENSSL_NO_MULTIBLOCK */
 
 static const PROV_CIPHER_HW_AES_HMAC_SHA cipher_hw_aes_hmac_sha1 = {
-    {
-      aesni_cbc_hmac_sha1_init_key,
-      aesni_cbc_hmac_sha1_cipher
-    },
+    { aesni_cbc_hmac_sha1_init_key,
+        aesni_cbc_hmac_sha1_cipher },
     aesni_cbc_hmac_sha1_set_mac_key,
     aesni_cbc_hmac_sha1_set_tls1_aad,
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
     aesni_cbc_hmac_sha1_tls1_multiblock_max_bufsize,
     aesni_cbc_hmac_sha1_tls1_multiblock_aad,
     aesni_cbc_hmac_sha1_tls1_multiblock_encrypt
-# endif
+#endif
 };
 
 const PROV_CIPHER_HW_AES_HMAC_SHA *ossl_prov_cipher_hw_aes_cbc_hmac_sha1(void)
diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c
index f5b2f8b6da32e..b1c508d5b5f26 100644
--- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c
@@ -28,24 +28,24 @@ const PROV_CIPHER_HW_AES_HMAC_SHA *ossl_prov_cipher_hw_aes_cbc_hmac_sha256(void)
 }
 #else
 
-# include <openssl/rand.h>
-# include "crypto/evp.h"
-# include "internal/constant_time.h"
+#include <openssl/rand.h>
+#include "crypto/evp.h"
+#include "internal/constant_time.h"
 
 void sha256_block_data_order(void *c, const void *p, size_t len);
 int aesni_cbc_sha256_enc(const void *inp, void *out, size_t blocks,
-                         const AES_KEY *key, unsigned char iv[16],
-                         SHA256_CTX *ctx, const void *in0);
+    const AES_KEY *key, unsigned char iv[16],
+    SHA256_CTX *ctx, const void *in0);
 
 int ossl_cipher_capable_aes_cbc_hmac_sha256(void)
 {
     return AESNI_CBC_HMAC_SHA_CAPABLE
-           && aesni_cbc_sha256_enc(NULL, NULL, 0, NULL, NULL, NULL, NULL);
+        && aesni_cbc_sha256_enc(NULL, NULL, 0, NULL, NULL, NULL, NULL);
 }
 
 static int aesni_cbc_hmac_sha256_init_key(PROV_CIPHER_CTX *vctx,
-                                          const unsigned char *key,
-                                          size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     int ret;
     PROV_AES_HMAC_SHA_CTX *ctx = (PROV_AES_HMAC_SHA_CTX *)vctx;
@@ -56,7 +56,7 @@ static int aesni_cbc_hmac_sha256_init_key(PROV_CIPHER_CTX *vctx,
     else
         ret = aesni_set_decrypt_key(key, ctx->base.keylen * 8, &ctx->ks);
 
-    SHA256_Init(&sctx->head);    /* handy when benchmarking */
+    SHA256_Init(&sctx->head); /* handy when benchmarking */
     sctx->tail = sctx->head;
     sctx->md = sctx->head;
 
@@ -101,7 +101,7 @@ static void sha256_update(SHA256_CTX *c, const void *data, size_t len)
         SHA256_Update(c, ptr, res);
 }
 
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
 
 typedef struct {
     unsigned int A[8], B[8], C[8], D[8], E[8], F[8], G[8], H[8];
@@ -123,10 +123,10 @@ void sha256_multi_block(SHA256_MB_CTX *, const HASH_DESC *, int);
 void aesni_multi_cbc_encrypt(CIPH_DESC *, void *, int);
 
 static size_t tls1_multi_block_encrypt(void *vctx,
-                                       unsigned char *out,
-                                       const unsigned char *inp,
-                                       size_t inp_len, int n4x)
-{                               /* n4x is 1 or 2 */
+    unsigned char *out,
+    const unsigned char *inp,
+    size_t inp_len, int n4x)
+{ /* n4x is 1 or 2 */
     PROV_AES_HMAC_SHA_CTX *ctx = (PROV_AES_HMAC_SHA_CTX *)vctx;
     PROV_AES_HMAC_SHA256_CTX *sctx = (PROV_AES_HMAC_SHA256_CTX *)vctx;
     HASH_DESC hash_d[8], edges[8];
@@ -142,15 +142,15 @@ static size_t tls1_multi_block_encrypt(void *vctx,
     unsigned int x4 = 4 * n4x, minblocks, processed = 0;
     size_t ret = 0;
     u8 *IVs;
-#  if defined(BSWAP8)
+#if defined(BSWAP8)
     u64 seqnum;
-#  endif
+#endif
 
     /* ask for IVs in bulk */
     if (RAND_bytes_ex(ctx->base.libctx, (IVs = blocks[0].c), 16 * x4, 0) <= 0)
         return 0;
 
-    mctx = (SHA256_MB_CTX *) (storage + 32 - ((size_t)storage % 32)); /* align */
+    mctx = (SHA256_MB_CTX *)(storage + 32 - ((size_t)storage % 32)); /* align */
 
     frag = (unsigned int)inp_len >> (1 + n4x);
     last = (unsigned int)inp_len + frag - (frag << (1 + n4x));
@@ -178,16 +178,16 @@ static size_t tls1_multi_block_encrypt(void *vctx,
         IVs += 16;
     }
 
-#  if defined(BSWAP8)
+#if defined(BSWAP8)
     memcpy(blocks[0].c, sctx->md.data, 8);
     seqnum = BSWAP8(blocks[0].q[0]);
-#  endif
+#endif
 
     for (i = 0; i < x4; i++) {
         unsigned int len = (i == (x4 - 1) ? last : frag);
-#  if !defined(BSWAP8)
+#if !defined(BSWAP8)
         unsigned int carry, j;
-#  endif
+#endif
 
         mctx->A[i] = sctx->md.h[0];
         mctx->B[i] = sctx->md.h[1];
@@ -199,14 +199,14 @@ static size_t tls1_multi_block_encrypt(void *vctx,
         mctx->H[i] = sctx->md.h[7];
 
         /* fix seqnum */
-#  if defined(BSWAP8)
+#if defined(BSWAP8)
         blocks[i].q[0] = BSWAP8(seqnum + i);
-#  else
+#else
         for (carry = i, j = 8; j--;) {
             blocks[i].c[j] = ((u8 *)sctx->md.data)[j] + carry;
             carry = (blocks[i].c[j] - carry) >> (sizeof(carry) * 8 - 1);
         }
-#  endif
+#endif
         blocks[i].c[8] = ((u8 *)sctx->md.data)[8];
         blocks[i].c[9] = ((u8 *)sctx->md.data)[9];
         blocks[i].c[10] = ((u8 *)sctx->md.data)[10];
@@ -225,10 +225,10 @@ static size_t tls1_multi_block_encrypt(void *vctx,
     /* hash 13-byte headers and first 64-13 bytes of inputs */
     sha256_multi_block(mctx, edges, n4x);
     /* hash bulk inputs */
-#  define MAXCHUNKSIZE    2048
-#  if     MAXCHUNKSIZE%64
-#   error  "MAXCHUNKSIZE is not divisible by 64"
-#  elif   MAXCHUNKSIZE
+#define MAXCHUNKSIZE 2048
+#if MAXCHUNKSIZE % 64
+#error "MAXCHUNKSIZE is not divisible by 64"
+#elif MAXCHUNKSIZE
     /*
      * goal is to minimize pressure on L1 cache by moving in shorter steps,
      * so that hashed data is still in the cache by the time we encrypt it
@@ -257,34 +257,34 @@ static size_t tls1_multi_block_encrypt(void *vctx,
             minblocks -= MAXCHUNKSIZE / 64;
         } while (minblocks > MAXCHUNKSIZE / 64);
     }
-#  endif
-#  undef  MAXCHUNKSIZE
+#endif
+#undef MAXCHUNKSIZE
     sha256_multi_block(mctx, hash_d, n4x);
 
     memset(blocks, 0, sizeof(blocks));
     for (i = 0; i < x4; i++) {
         unsigned int len = (i == (x4 - 1) ? last : frag),
-            off = hash_d[i].blocks * 64;
+                     off = hash_d[i].blocks * 64;
         const unsigned char *ptr = hash_d[i].ptr + off;
 
         off = (len - processed) - (64 - 13) - off; /* remainder actually */
         memcpy(blocks[i].c, ptr, off);
         blocks[i].c[off] = 0x80;
-        len += 64 + 13;         /* 64 is HMAC header */
-        len *= 8;               /* convert to bits */
+        len += 64 + 13; /* 64 is HMAC header */
+        len *= 8; /* convert to bits */
         if (off < (64 - 8)) {
-#  ifdef BSWAP4
+#ifdef BSWAP4
             blocks[i].d[15] = BSWAP4(len);
-#  else
+#else
             PUTU32(blocks[i].c + 60, len);
-#  endif
+#endif
             edges[i].blocks = 1;
         } else {
-#  ifdef BSWAP4
+#ifdef BSWAP4
             blocks[i].d[31] = BSWAP4(len);
-#  else
+#else
             PUTU32(blocks[i].c + 124, len);
-#  endif
+#endif
             edges[i].blocks = 2;
         }
         edges[i].ptr = blocks[i].c;
@@ -295,7 +295,7 @@ static size_t tls1_multi_block_encrypt(void *vctx,
 
     memset(blocks, 0, sizeof(blocks));
     for (i = 0; i < x4; i++) {
-#  ifdef BSWAP4
+#ifdef BSWAP4
         blocks[i].d[0] = BSWAP4(mctx->A[i]);
         mctx->A[i] = sctx->tail.h[0];
         blocks[i].d[1] = BSWAP4(mctx->B[i]);
@@ -314,7 +314,7 @@ static size_t tls1_multi_block_encrypt(void *vctx,
         mctx->H[i] = sctx->tail.h[7];
         blocks[i].c[32] = 0x80;
         blocks[i].d[15] = BSWAP4((64 + 32) * 8);
-#  else
+#else
         PUTU32(blocks[i].c + 0, mctx->A[i]);
         mctx->A[i] = sctx->tail.h[0];
         PUTU32(blocks[i].c + 4, mctx->B[i]);
@@ -333,7 +333,7 @@ static size_t tls1_multi_block_encrypt(void *vctx,
         mctx->H[i] = sctx->tail.h[7];
         blocks[i].c[32] = 0x80;
         PUTU32(blocks[i].c + 60, (64 + 32) * 8);
-#  endif /* BSWAP */
+#endif /* BSWAP */
         edges[i].ptr = blocks[i].c;
         edges[i].blocks = 1;
     }
@@ -369,7 +369,7 @@ static size_t tls1_multi_block_encrypt(void *vctx,
         len += pad + 1;
 
         ciph_d[i].blocks = (len - processed) / 16;
-        len += 16;              /* account for explicit iv */
+        len += 16; /* account for explicit iv */
 
         /* arrange header */
         out0[0] = ((u8 *)sctx->md.data)[8];
@@ -390,11 +390,11 @@ static size_t tls1_multi_block_encrypt(void *vctx,
     ctx->multiblock_encrypt_len = ret;
     return ret;
 }
-# endif /* !OPENSSL_NO_MULTIBLOCK */
+#endif /* !OPENSSL_NO_MULTIBLOCK */
 
 static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx,
-                                        unsigned char *out,
-                                        const unsigned char *in, size_t len)
+    unsigned char *out,
+    const unsigned char *in, size_t len)
 {
     PROV_AES_HMAC_SHA_CTX *ctx = (PROV_AES_HMAC_SHA_CTX *)vctx;
     PROV_AES_HMAC_SHA256_CTX *sctx = (PROV_AES_HMAC_SHA256_CTX *)vctx;
@@ -412,9 +412,7 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx,
     if (ctx->base.enc) {
         if (plen == NO_PAYLOAD_LENGTH)
             plen = len;
-        else if (len !=
-                 ((plen + SHA256_DIGEST_LENGTH +
-                   AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
+        else if (len != ((plen + SHA256_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE))
             return 0;
         else if (ctx->aux.tls_ver >= TLS1_1_VERSION)
             iv = AES_BLOCK_SIZE;
@@ -429,17 +427,17 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx,
          * either even XOP-capable Bulldozer-based or GenuineIntel one.
          * But SHAEXT-capable go ahead...
          */
-        if (((OPENSSL_ia32cap_P[2] & (1 << 29)) ||         /* SHAEXT? */
-             ((OPENSSL_ia32cap_P[1] & (1 << (60 - 32))) && /* AVX? */
-              ((OPENSSL_ia32cap_P[1] & (1 << (43 - 32)))   /* XOP? */
-               | (OPENSSL_ia32cap_P[0] & (1 << 30))))) &&  /* "Intel CPU"? */
-            plen > (sha_off + iv) &&
-            (blocks = (plen - (sha_off + iv)) / SHA256_CBLOCK)) {
+        if (((OPENSSL_ia32cap_P[2] & (1 << 29)) || /* SHAEXT? */
+                ((OPENSSL_ia32cap_P[1] & (1 << (60 - 32))) && /* AVX? */
+                    ((OPENSSL_ia32cap_P[1] & (1 << (43 - 32))) /* XOP? */
+                        | (OPENSSL_ia32cap_P[0] & (1 << 30)))))
+            && /* "Intel CPU"? */
+            plen > (sha_off + iv) && (blocks = (plen - (sha_off + iv)) / SHA256_CBLOCK)) {
             sha256_update(&sctx->md, in + iv, sha_off);
 
             (void)aesni_cbc_sha256_enc(in, out, blocks, &ctx->ks,
-                                       ctx->base.iv,
-                                       &sctx->md, in + iv + sha_off);
+                ctx->base.iv,
+                &sctx->md, in + iv + sha_off);
             blocks *= SHA256_CBLOCK;
             aes_off += blocks;
             sha_off += blocks;
@@ -453,7 +451,7 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx,
         sha_off += iv;
         sha256_update(&sctx->md, in + sha_off, plen - sha_off);
 
-        if (plen != len) {      /* "TLS" mode of operation */
+        if (plen != len) { /* "TLS" mode of operation */
             if (in != out)
                 memcpy(out + aes_off, in + aes_off, plen - aes_off);
 
@@ -469,10 +467,10 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx,
                 out[plen] = l;
             /* encrypt HMAC|padding at once */
             aesni_cbc_encrypt(out + aes_off, out + aes_off, len - aes_off,
-                              &ctx->ks, ctx->base.iv, 1);
+                &ctx->ks, ctx->base.iv, 1);
         } else {
             aesni_cbc_encrypt(in + aes_off, out + aes_off, len - aes_off,
-                              &ctx->ks, ctx->base.iv, 1);
+                &ctx->ks, ctx->base.iv, 1);
         }
     } else {
         union {
@@ -485,7 +483,7 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx,
 
         /* decrypt HMAC|padding at once */
         aesni_cbc_encrypt(in, out, len, &ctx->ks,
-                          ctx->base.iv, 0);
+            ctx->base.iv, 0);
 
         if (plen != NO_PAYLOAD_LENGTH) { /* "TLS" mode of operation */
             size_t inp_len, mask, j, i;
@@ -545,15 +543,15 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx,
 
             /* but pretend as if we hashed padded payload */
             bitlen = sctx->md.Nl + (inp_len << 3); /* at most 18 bits */
-# ifdef BSWAP4
+#ifdef BSWAP4
             bitlen = BSWAP4(bitlen);
-# else
+#else
             mac.c[0] = 0;
             mac.c[1] = (unsigned char)(bitlen >> 16);
             mac.c[2] = (unsigned char)(bitlen >> 8);
             mac.c[3] = (unsigned char)bitlen;
             bitlen = mac.u[0];
-# endif /* BSWAP */
+#endif /* BSWAP */
 
             pmac->u[0] = 0;
             pmac->u[1] = 0;
@@ -622,7 +620,7 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx,
             pmac->u[6] |= sctx->md.h[6] & mask;
             pmac->u[7] |= sctx->md.h[7] & mask;
 
-# ifdef BSWAP4
+#ifdef BSWAP4
             pmac->u[0] = BSWAP4(pmac->u[0]);
             pmac->u[1] = BSWAP4(pmac->u[1]);
             pmac->u[2] = BSWAP4(pmac->u[2]);
@@ -631,7 +629,7 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx,
             pmac->u[5] = BSWAP4(pmac->u[5]);
             pmac->u[6] = BSWAP4(pmac->u[6]);
             pmac->u[7] = BSWAP4(pmac->u[7]);
-# else
+#else
             for (i = 0; i < 8; i++) {
                 res = pmac->u[i];
                 pmac->c[4 * i + 0] = (unsigned char)(res >> 24);
@@ -639,7 +637,7 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx,
                 pmac->c[4 * i + 2] = (unsigned char)(res >> 8);
                 pmac->c[4 * i + 3] = (unsigned char)res;
             }
-# endif /* BSWAP */
+#endif /* BSWAP */
             len += SHA256_DIGEST_LENGTH;
             sctx->md = sctx->tail;
             sha256_update(&sctx->md, pmac->c, SHA256_DIGEST_LENGTH);
@@ -650,18 +648,15 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx,
             len -= inp_len;
             /* code containing lucky-13 fix */
             {
-                unsigned char *p =
-                    out + len - 1 - maxpad - SHA256_DIGEST_LENGTH;
+                unsigned char *p = out + len - 1 - maxpad - SHA256_DIGEST_LENGTH;
                 size_t off = out - p;
                 unsigned int c, cmask;
 
                 for (res = 0, i = 0, j = 0;
-                     j < maxpad + SHA256_DIGEST_LENGTH;
-                     j++) {
+                    j < maxpad + SHA256_DIGEST_LENGTH;
+                    j++) {
                     c = p[j];
-                    cmask =
-                        ((int)(j - off - SHA256_DIGEST_LENGTH)) >>
-                        (sizeof(int) * 8 - 1);
+                    cmask = ((int)(j - off - SHA256_DIGEST_LENGTH)) >> (sizeof(int) * 8 - 1);
                     res |= (c ^ pad) & ~cmask; /* ... and padding */
                     cmask &= ((int)(off - 1 - j)) >> (sizeof(int) * 8 - 1);
                     res |= (c ^ pmac->c[i]) & cmask;
@@ -682,8 +677,8 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx,
 
 /* EVP_CTRL_AEAD_SET_MAC_KEY */
 static void aesni_cbc_hmac_sha256_set_mac_key(void *vctx,
-                                              const unsigned char *mackey,
-                                              size_t len)
+    const unsigned char *mackey,
+    size_t len)
 {
     PROV_AES_HMAC_SHA256_CTX *ctx = (PROV_AES_HMAC_SHA256_CTX *)vctx;
     unsigned int i;
@@ -714,7 +709,7 @@ static void aesni_cbc_hmac_sha256_set_mac_key(void *vctx,
 
 /* EVP_CTRL_AEAD_TLS1_AAD */
 static int aesni_cbc_hmac_sha256_set_tls1_aad(void *vctx,
-                                              unsigned char *aad_rec, int aad_len)
+    unsigned char *aad_rec, int aad_len)
 {
     PROV_AES_HMAC_SHA_CTX *ctx = (PROV_AES_HMAC_SHA_CTX *)vctx;
     PROV_AES_HMAC_SHA256_CTX *sctx = (PROV_AES_HMAC_SHA256_CTX *)vctx;
@@ -728,8 +723,7 @@ static int aesni_cbc_hmac_sha256_set_tls1_aad(void *vctx,
 
     if (ctx->base.enc) {
         ctx->payload_length = len;
-        if ((ctx->aux.tls_ver =
-             p[aad_len - 4] << 8 | p[aad_len - 3]) >= TLS1_1_VERSION) {
+        if ((ctx->aux.tls_ver = p[aad_len - 4] << 8 | p[aad_len - 3]) >= TLS1_1_VERSION) {
             if (len < AES_BLOCK_SIZE)
                 return 0;
             len -= AES_BLOCK_SIZE;
@@ -738,9 +732,8 @@ static int aesni_cbc_hmac_sha256_set_tls1_aad(void *vctx,
         }
         sctx->md = sctx->head;
         sha256_update(&sctx->md, p, aad_len);
-        ctx->tls_aad_pad = (int)(((len + SHA256_DIGEST_LENGTH +
-                                   AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
-                                   - len);
+        ctx->tls_aad_pad = (int)(((len + SHA256_DIGEST_LENGTH + AES_BLOCK_SIZE) & -AES_BLOCK_SIZE)
+            - len);
         return 1;
     } else {
         memcpy(ctx->aux.tls_aad, p, aad_len);
@@ -750,7 +743,7 @@ static int aesni_cbc_hmac_sha256_set_tls1_aad(void *vctx,
     }
 }
 
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
 /* EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE */
 static int aesni_cbc_hmac_sha256_tls1_multiblock_max_bufsize(
     void *vctx)
@@ -759,7 +752,7 @@ static int aesni_cbc_hmac_sha256_tls1_multiblock_max_bufsize(
 
     OPENSSL_assert(ctx->multiblock_max_send_fragment != 0);
     return (int)(5 + 16
-                 + (((int)ctx->multiblock_max_send_fragment + 32 + 16) & -16));
+        + (((int)ctx->multiblock_max_send_fragment + 32 + 16) & -16));
 }
 
 /* EVP_CTRL_TLS1_1_MULTIBLOCK_AAD */
@@ -811,7 +804,7 @@ static int aesni_cbc_hmac_sha256_tls1_multiblock_aad(
         ctx->multiblock_aad_packlen = packlen;
         return 1;
     }
-    return -1;      /* not yet */
+    return -1; /* not yet */
 }
 
 /* EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT */
@@ -819,23 +812,21 @@ static int aesni_cbc_hmac_sha256_tls1_multiblock_encrypt(
     void *ctx, EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM *param)
 {
     return (int)tls1_multi_block_encrypt(ctx, param->out,
-                                         param->inp, param->len,
-                                         param->interleave / 4);
+        param->inp, param->len,
+        param->interleave / 4);
 }
-# endif
+#endif
 
 static const PROV_CIPHER_HW_AES_HMAC_SHA cipher_hw_aes_hmac_sha256 = {
-    {
-      aesni_cbc_hmac_sha256_init_key,
-      aesni_cbc_hmac_sha256_cipher
-    },
+    { aesni_cbc_hmac_sha256_init_key,
+        aesni_cbc_hmac_sha256_cipher },
     aesni_cbc_hmac_sha256_set_mac_key,
     aesni_cbc_hmac_sha256_set_tls1_aad,
-# if !defined(OPENSSL_NO_MULTIBLOCK)
+#if !defined(OPENSSL_NO_MULTIBLOCK)
     aesni_cbc_hmac_sha256_tls1_multiblock_max_bufsize,
     aesni_cbc_hmac_sha256_tls1_multiblock_aad,
     aesni_cbc_hmac_sha256_tls1_multiblock_encrypt
-# endif
+#endif
 };
 
 const PROV_CIPHER_HW_AES_HMAC_SHA *ossl_prov_cipher_hw_aes_cbc_hmac_sha256(void)
diff --git a/providers/implementations/ciphers/cipher_aes_ccm.c b/providers/implementations/ciphers/cipher_aes_ccm.c
index e36ac03e61360..34d6bf468d860 100644
--- a/providers/implementations/ciphers/cipher_aes_ccm.c
+++ b/providers/implementations/ciphers/cipher_aes_ccm.c
@@ -61,7 +61,7 @@ static void aes_ccm_freectx(void *vctx)
 {
     PROV_AES_CCM_CTX *ctx = (PROV_AES_CCM_CTX *)vctx;
 
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 /* ossl_aes128ccm_functions */
diff --git a/providers/implementations/ciphers/cipher_aes_ccm.h b/providers/implementations/ciphers/cipher_aes_ccm.h
index fd35080db3dd9..089792ee8a836 100644
--- a/providers/implementations/ciphers/cipher_aes_ccm.h
+++ b/providers/implementations/ciphers/cipher_aes_ccm.h
@@ -13,7 +13,7 @@
 #include "crypto/aes_platform.h"
 
 typedef struct prov_aes_ccm_ctx_st {
-    PROV_CCM_CTX base;         /* Must be first */
+    PROV_CCM_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         /*-
@@ -39,7 +39,7 @@ typedef struct prov_aes_ccm_ctx_st {
                 unsigned char b[AES_BLOCK_SIZE];
             } buf;
             unsigned char dummy_pad[168];
-            unsigned int fc;   /* fc has same offset as ks.ks.rounds */
+            unsigned int fc; /* fc has same offset as ks.ks.rounds */
         } s390x;
 #endif /* defined(OPENSSL_CPUID_OBJ) && defined(__s390__) */
     } ccm;
diff --git a/providers/implementations/ciphers/cipher_aes_ccm_hw.c b/providers/implementations/ciphers/cipher_aes_ccm_hw.c
index b050cf3edd886..5556175b083de 100644
--- a/providers/implementations/ciphers/cipher_aes_ccm_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_ccm_hw.c
@@ -17,15 +17,15 @@
 
 #include "cipher_aes_ccm.h"
 
-#define AES_HW_CCM_SET_KEY_FN(fn_set_enc_key, fn_blk, fn_ccm_enc, fn_ccm_dec)  \
-    fn_set_enc_key(key, keylen * 8, &actx->ccm.ks.ks);                         \
-    CRYPTO_ccm128_init(&ctx->ccm_ctx, ctx->m, ctx->l, &actx->ccm.ks.ks,        \
-                       (block128_f)fn_blk);                                    \
-    ctx->str = ctx->enc ? (ccm128_f)fn_ccm_enc : (ccm128_f)fn_ccm_dec;         \
+#define AES_HW_CCM_SET_KEY_FN(fn_set_enc_key, fn_blk, fn_ccm_enc, fn_ccm_dec) \
+    fn_set_enc_key(key, keylen * 8, &actx->ccm.ks.ks);                        \
+    CRYPTO_ccm128_init(&ctx->ccm_ctx, ctx->m, ctx->l, &actx->ccm.ks.ks,       \
+        (block128_f)fn_blk);                                                  \
+    ctx->str = ctx->enc ? (ccm128_f)fn_ccm_enc : (ccm128_f)fn_ccm_dec;        \
     ctx->key_set = 1;
 
 static int ccm_generic_aes_initkey(PROV_CCM_CTX *ctx, const unsigned char *key,
-                                   size_t keylen)
+    size_t keylen)
 {
     PROV_AES_CCM_CTX *actx = (PROV_AES_CCM_CTX *)ctx;
 
@@ -36,7 +36,7 @@ static int ccm_generic_aes_initkey(PROV_CCM_CTX *ctx, const unsigned char *key,
 #endif /* HWAES_CAPABLE */
 
 #ifdef VPAES_CAPABLE
-    if (VPAES_CAPABLE) {
+        if (VPAES_CAPABLE) {
         AES_HW_CCM_SET_KEY_FN(vpaes_set_encrypt_key, vpaes_encrypt, NULL, NULL);
     } else
 #endif
@@ -56,15 +56,15 @@ static const PROV_CCM_HW aes_ccm = {
 };
 
 #if defined(S390X_aes_128_CAPABLE)
-# include "cipher_aes_ccm_hw_s390x.inc"
+#include "cipher_aes_ccm_hw_s390x.inc"
 #elif defined(AESNI_CAPABLE)
-# include "cipher_aes_ccm_hw_aesni.inc"
+#include "cipher_aes_ccm_hw_aesni.inc"
 #elif defined(SPARC_AES_CAPABLE)
-# include "cipher_aes_ccm_hw_t4.inc"
+#include "cipher_aes_ccm_hw_t4.inc"
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-# include "cipher_aes_ccm_hw_rv64i.inc"
+#include "cipher_aes_ccm_hw_rv64i.inc"
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32
-# include "cipher_aes_ccm_hw_rv32i.inc"
+#include "cipher_aes_ccm_hw_rv32i.inc"
 #else
 const PROV_CCM_HW *ossl_prov_aes_hw_ccm(size_t keybits)
 {
diff --git a/providers/implementations/ciphers/cipher_aes_gcm.c b/providers/implementations/ciphers/cipher_aes_gcm.c
index c14c1e32fe353..0a813de47ae72 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm.c
+++ b/providers/implementations/ciphers/cipher_aes_gcm.c
@@ -30,7 +30,7 @@ static void *aes_gcm_newctx(void *provctx, size_t keybits)
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx != NULL)
         ossl_gcm_initctx(provctx, &ctx->base, keybits,
-                         ossl_prov_aes_hw_gcm(keybits));
+            ossl_prov_aes_hw_gcm(keybits));
     return ctx;
 }
 
@@ -57,7 +57,7 @@ static void aes_gcm_freectx(void *vctx)
 {
     PROV_AES_GCM_CTX *ctx = (PROV_AES_GCM_CTX *)vctx;
 
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 /* ossl_aes128gcm_functions */
diff --git a/providers/implementations/ciphers/cipher_aes_gcm.h b/providers/implementations/ciphers/cipher_aes_gcm.h
index 5e88ccca7b4d4..0cd1d5a1ade4b 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm.h
+++ b/providers/implementations/ciphers/cipher_aes_gcm.h
@@ -13,11 +13,11 @@
 #include "crypto/aes_platform.h"
 
 typedef struct prov_aes_gcm_ctx_st {
-    PROV_GCM_CTX base;          /* must be first entry in struct */
+    PROV_GCM_CTX base; /* must be first entry in struct */
     union {
         OSSL_UNION_ALIGN;
         AES_KEY ks;
-    } ks;                       /* AES key schedule to use */
+    } ks; /* AES key schedule to use */
 
     /* Platform specific data */
     union {
@@ -29,7 +29,7 @@ typedef struct prov_aes_gcm_ctx_st {
                 S390X_KMA_PARAMS kma;
             } param;
             unsigned int fc;
-            unsigned int hsflag;    /* hash subkey set flag */
+            unsigned int hsflag; /* hash subkey set flag */
             unsigned char ares[16];
             unsigned char mres[16];
             unsigned char kres[16];
diff --git a/providers/implementations/ciphers/cipher_aes_gcm_hw.c b/providers/implementations/ciphers/cipher_aes_gcm_hw.c
index 207a16bc70e7a..d2b7437cde341 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_gcm_hw.c
@@ -18,48 +18,48 @@
 #include "cipher_aes_gcm.h"
 
 static int aes_gcm_initkey(PROV_GCM_CTX *ctx, const unsigned char *key,
-                                   size_t keylen)
+    size_t keylen)
 {
     PROV_AES_GCM_CTX *actx = (PROV_AES_GCM_CTX *)ctx;
     AES_KEY *ks = &actx->ks.ks;
 
-# ifdef HWAES_CAPABLE
+#ifdef HWAES_CAPABLE
     if (HWAES_CAPABLE) {
-#  ifdef HWAES_ctr32_encrypt_blocks
+#ifdef HWAES_ctr32_encrypt_blocks
         GCM_HW_SET_KEY_CTR_FN(ks, HWAES_set_encrypt_key, HWAES_encrypt,
-                              HWAES_ctr32_encrypt_blocks);
-#  else
+            HWAES_ctr32_encrypt_blocks);
+#else
         GCM_HW_SET_KEY_CTR_FN(ks, HWAES_set_encrypt_key, HWAES_encrypt, NULL);
-#  endif /* HWAES_ctr32_encrypt_blocks */
+#endif /* HWAES_ctr32_encrypt_blocks */
     } else
-# endif /* HWAES_CAPABLE */
+#endif /* HWAES_CAPABLE */
 
-# ifdef BSAES_CAPABLE
-    if (BSAES_CAPABLE) {
+#ifdef BSAES_CAPABLE
+        if (BSAES_CAPABLE) {
         GCM_HW_SET_KEY_CTR_FN(ks, AES_set_encrypt_key, AES_encrypt,
-                              ossl_bsaes_ctr32_encrypt_blocks);
+            ossl_bsaes_ctr32_encrypt_blocks);
     } else
-# endif /* BSAES_CAPABLE */
+#endif /* BSAES_CAPABLE */
 
-# ifdef VPAES_CAPABLE
-    if (VPAES_CAPABLE) {
+#ifdef VPAES_CAPABLE
+        if (VPAES_CAPABLE) {
         GCM_HW_SET_KEY_CTR_FN(ks, vpaes_set_encrypt_key, vpaes_encrypt, NULL);
     } else
-# endif /* VPAES_CAPABLE */
+#endif /* VPAES_CAPABLE */
 
     {
-# ifdef AES_CTR_ASM
+#ifdef AES_CTR_ASM
         GCM_HW_SET_KEY_CTR_FN(ks, AES_set_encrypt_key, AES_encrypt,
-                              AES_ctr32_encrypt);
-# else
+            AES_ctr32_encrypt);
+#else
         GCM_HW_SET_KEY_CTR_FN(ks, AES_set_encrypt_key, AES_encrypt, NULL);
-# endif /* AES_CTR_ASM */
+#endif /* AES_CTR_ASM */
     }
     return 1;
 }
 
 static int generic_aes_gcm_cipher_update(PROV_GCM_CTX *ctx, const unsigned char *in,
-                                         size_t len, unsigned char *out)
+    size_t len, unsigned char *out)
 {
     if (ctx->enc) {
         if (ctx->ctr != NULL) {
@@ -73,14 +73,14 @@ static int generic_aes_gcm_cipher_update(PROV_GCM_CTX *ctx, const unsigned char
                     return 0;
 
                 bulk = AES_gcm_encrypt(in + res, out + res, len - res,
-                                       ctx->gcm.key,
-                                       ctx->gcm.Yi.c, ctx->gcm.Xi.u);
+                    ctx->gcm.key,
+                    ctx->gcm.Yi.c, ctx->gcm.Xi.u);
 
                 ctx->gcm.len.u[1] += bulk;
                 bulk += res;
             }
             if (CRYPTO_gcm128_encrypt_ctr32(&ctx->gcm, in + bulk, out + bulk,
-                                            len - bulk, ctx->ctr))
+                    len - bulk, ctx->ctr))
                 return 0;
 #else
             if (CRYPTO_gcm128_encrypt_ctr32(&ctx->gcm, in, out, len, ctx->ctr))
@@ -102,14 +102,14 @@ static int generic_aes_gcm_cipher_update(PROV_GCM_CTX *ctx, const unsigned char
                     return 0;
 
                 bulk = AES_gcm_decrypt(in + res, out + res, len - res,
-                                       ctx->gcm.key,
-                                       ctx->gcm.Yi.c, ctx->gcm.Xi.u);
+                    ctx->gcm.key,
+                    ctx->gcm.Yi.c, ctx->gcm.Xi.u);
 
                 ctx->gcm.len.u[1] += bulk;
                 bulk += res;
             }
             if (CRYPTO_gcm128_decrypt_ctr32(&ctx->gcm, in + bulk, out + bulk,
-                                            len - bulk, ctx->ctr))
+                    len - bulk, ctx->ctr))
                 return 0;
 #else
             if (CRYPTO_gcm128_decrypt_ctr32(&ctx->gcm, in, out, len, ctx->ctr))
@@ -133,23 +133,22 @@ static const PROV_GCM_HW aes_gcm = {
 };
 
 #if defined(S390X_aes_128_CAPABLE)
-# include "cipher_aes_gcm_hw_s390x.inc"
+#include "cipher_aes_gcm_hw_s390x.inc"
 #elif defined(AESNI_CAPABLE)
-# include "cipher_aes_gcm_hw_aesni.inc"
+#include "cipher_aes_gcm_hw_aesni.inc"
 #elif defined(SPARC_AES_CAPABLE)
-# include "cipher_aes_gcm_hw_t4.inc"
+#include "cipher_aes_gcm_hw_t4.inc"
 #elif defined(AES_PMULL_CAPABLE) && defined(AES_GCM_ASM)
-# include "cipher_aes_gcm_hw_armv8.inc"
+#include "cipher_aes_gcm_hw_armv8.inc"
 #elif defined(PPC_AES_GCM_CAPABLE) && defined(_ARCH_PPC64)
-# include "cipher_aes_gcm_hw_ppc.inc"
+#include "cipher_aes_gcm_hw_ppc.inc"
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-# include "cipher_aes_gcm_hw_rv64i.inc"
+#include "cipher_aes_gcm_hw_rv64i.inc"
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32
-# include "cipher_aes_gcm_hw_rv32i.inc"
+#include "cipher_aes_gcm_hw_rv32i.inc"
 #else
 const PROV_GCM_HW *ossl_prov_aes_hw_gcm(size_t keybits)
 {
     return &aes_gcm;
 }
 #endif
-
diff --git a/providers/implementations/ciphers/cipher_aes_gcm_hw_armv8.inc b/providers/implementations/ciphers/cipher_aes_gcm_hw_armv8.inc
index cc240715003a5..60fff493d8093 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm_hw_armv8.inc
+++ b/providers/implementations/ciphers/cipher_aes_gcm_hw_armv8.inc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-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
@@ -15,10 +15,8 @@
 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)
 {
-    size_t align_bytes = 0;
-    align_bytes = len - len % 16;
-
     AES_KEY *aes_key = (AES_KEY *)key;
+    size_t align_bytes = len - len % 16;
 
     switch(aes_key->rounds) {
         case 10:
@@ -49,10 +47,8 @@ size_t armv8_aes_gcm_encrypt(const unsigned char *in, unsigned char *out, size_t
 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)
 {
-    size_t align_bytes = 0;
-    align_bytes = len - len % 16;
-
     AES_KEY *aes_key = (AES_KEY *)key;
+    size_t align_bytes = len - len % 16;
 
     switch(aes_key->rounds) {
         case 10:
diff --git a/providers/implementations/ciphers/cipher_aes_gcm_siv.c b/providers/implementations/ciphers/cipher_aes_gcm_siv.c
index c9afeddef67a2..484993e5a5e95 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm_siv.c
+++ b/providers/implementations/ciphers/cipher_aes_gcm_siv.c
@@ -80,7 +80,7 @@ static void *ossl_aes_gcm_siv_dupctx(void *vctx)
         goto err;
 
     return ret;
- err:
+err:
     if (ret != NULL) {
         OPENSSL_clear_free(ret->aad, ret->aad_len);
         OPENSSL_free(ret);
@@ -89,8 +89,8 @@ static void *ossl_aes_gcm_siv_dupctx(void *vctx)
 }
 
 static int ossl_aes_gcm_siv_init(void *vctx, const unsigned char *key, size_t keylen,
-                                 const unsigned char *iv, size_t ivlen,
-                                 const OSSL_PARAM params[], int enc)
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[], int enc)
 {
     PROV_AES_GCM_SIV_CTX *ctx = (PROV_AES_GCM_SIV_CTX *)vctx;
 
@@ -121,22 +121,22 @@ static int ossl_aes_gcm_siv_init(void *vctx, const unsigned char *key, size_t ke
 }
 
 static int ossl_aes_gcm_siv_einit(void *vctx, const unsigned char *key, size_t keylen,
-                                  const unsigned char *iv, size_t ivlen,
-                                  const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return ossl_aes_gcm_siv_init(vctx, key, keylen, iv, ivlen, params, 1);
 }
 
 static int ossl_aes_gcm_siv_dinit(void *vctx, const unsigned char *key, size_t keylen,
-                                  const unsigned char *iv, size_t ivlen,
-                                  const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return ossl_aes_gcm_siv_init(vctx, key, keylen, iv, ivlen, params, 0);
 }
 
 #define ossl_aes_gcm_siv_stream_update ossl_aes_gcm_siv_cipher
 static int ossl_aes_gcm_siv_cipher(void *vctx, unsigned char *out, size_t *outl,
-                                   size_t outsize, const unsigned char *in, size_t inl)
+    size_t outsize, const unsigned char *in, size_t inl)
 {
     PROV_AES_GCM_SIV_CTX *ctx = (PROV_AES_GCM_SIV_CTX *)vctx;
     int error = 0;
@@ -157,7 +157,7 @@ static int ossl_aes_gcm_siv_cipher(void *vctx, unsigned char *out, size_t *outl,
 }
 
 static int ossl_aes_gcm_siv_stream_final(void *vctx, unsigned char *out, size_t *outl,
-                                         size_t outsize)
+    size_t outsize)
 {
     PROV_AES_GCM_SIV_CTX *ctx = (PROV_AES_GCM_SIV_CTX *)vctx;
     int error = 0;
@@ -180,8 +180,8 @@ static int ossl_aes_gcm_siv_get_ctx_params(void *vctx, OSSL_PARAM params[])
     p = OSSL_PARAM_locate(params, OSSL_CIPHER_PARAM_AEAD_TAG);
     if (p != NULL && p->data_type == OSSL_PARAM_OCTET_STRING) {
         if (!ctx->enc || !ctx->generated_tag
-                || p->data_size != sizeof(ctx->tag)
-                || !OSSL_PARAM_set_octet_string(p, ctx->tag, sizeof(ctx->tag))) {
+            || p->data_size != sizeof(ctx->tag)
+            || !OSSL_PARAM_set_octet_string(p, ctx->tag, sizeof(ctx->tag))) {
             ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);
             return 0;
         }
@@ -207,7 +207,7 @@ static const OSSL_PARAM aes_gcm_siv_known_gettable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *ossl_aes_gcm_siv_gettable_ctx_params(ossl_unused void *cctx,
-                                                              ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return aes_gcm_siv_known_gettable_ctx_params;
 }
@@ -224,7 +224,7 @@ static int ossl_aes_gcm_siv_set_ctx_params(void *vctx, const OSSL_PARAM params[]
     p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_AEAD_TAG);
     if (p != NULL) {
         if (p->data_type != OSSL_PARAM_OCTET_STRING
-                || p->data_size != sizeof(ctx->user_tag)) {
+            || p->data_size != sizeof(ctx->user_tag)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GET_PARAMETER);
             return 0;
         }
@@ -265,51 +265,51 @@ static const OSSL_PARAM aes_gcm_siv_known_settable_ctx_params[] = {
     OSSL_PARAM_END
 };
 static const OSSL_PARAM *ossl_aes_gcm_siv_settable_ctx_params(ossl_unused void *cctx,
-                                                              ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return aes_gcm_siv_known_settable_ctx_params;
 }
 
-#define IMPLEMENT_cipher(alg, lc, UCMODE, flags, kbits, blkbits, ivbits)                                \
-static OSSL_FUNC_cipher_newctx_fn              ossl_##alg##kbits##_##lc##_newctx;                       \
-static OSSL_FUNC_cipher_freectx_fn             ossl_##alg##_##lc##_freectx;                             \
-static OSSL_FUNC_cipher_dupctx_fn              ossl_##alg##_##lc##_dupctx;                              \
-static OSSL_FUNC_cipher_encrypt_init_fn        ossl_##alg##_##lc##_einit;                               \
-static OSSL_FUNC_cipher_decrypt_init_fn        ossl_##alg##_##lc##_dinit;                               \
-static OSSL_FUNC_cipher_update_fn              ossl_##alg##_##lc##_stream_update;                       \
-static OSSL_FUNC_cipher_final_fn               ossl_##alg##_##lc##_stream_final;                        \
-static OSSL_FUNC_cipher_cipher_fn              ossl_##alg##_##lc##_cipher;                              \
-static OSSL_FUNC_cipher_get_params_fn          ossl_##alg##_##kbits##_##lc##_get_params;                \
-static OSSL_FUNC_cipher_get_ctx_params_fn      ossl_##alg##_##lc##_get_ctx_params;                      \
-static OSSL_FUNC_cipher_gettable_ctx_params_fn ossl_##alg##_##lc##_gettable_ctx_params;                 \
-static OSSL_FUNC_cipher_set_ctx_params_fn      ossl_##alg##_##lc##_set_ctx_params;                      \
-static OSSL_FUNC_cipher_settable_ctx_params_fn ossl_##alg##_##lc##_settable_ctx_params;                 \
-static int ossl_##alg##_##kbits##_##lc##_get_params(OSSL_PARAM params[])                                \
-{                                                                                                       \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,                             \
-                                          flags, kbits, blkbits, ivbits);                               \
-}                                                                                                       \
-static void *ossl_##alg##kbits##_##lc##_newctx(void *provctx)                                          \
-{                                                                                                       \
-    return ossl_##alg##_##lc##_newctx(provctx, kbits);                                                  \
-}                                                                                                       \
-const OSSL_DISPATCH ossl_##alg##kbits##lc##_functions[] = {                                             \
-    { OSSL_FUNC_CIPHER_NEWCTX,              (void (*)(void))ossl_##alg##kbits##_##lc##_newctx },        \
-    { OSSL_FUNC_CIPHER_FREECTX,             (void (*)(void))ossl_##alg##_##lc##_freectx },              \
-    { OSSL_FUNC_CIPHER_DUPCTX,              (void (*)(void))ossl_##alg##_##lc##_dupctx },               \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT,        (void (*)(void))ossl_##alg##_##lc##_einit },                \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT,        (void (*)(void))ossl_##alg##_##lc##_dinit },                \
-    { OSSL_FUNC_CIPHER_UPDATE,              (void (*)(void))ossl_##alg##_##lc##_stream_update },        \
-    { OSSL_FUNC_CIPHER_FINAL,               (void (*)(void))ossl_##alg##_##lc##_stream_final },         \
-    { OSSL_FUNC_CIPHER_CIPHER,              (void (*)(void))ossl_##alg##_##lc##_cipher },               \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,          (void (*)(void))ossl_##alg##_##kbits##_##lc##_get_params }, \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,     (void (*)(void))ossl_cipher_generic_gettable_params },      \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,      (void (*)(void))ossl_##alg##_##lc##_get_ctx_params },       \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS, (void (*)(void))ossl_##alg##_##lc##_gettable_ctx_params },  \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,      (void (*)(void))ossl_##alg##_##lc##_set_ctx_params },       \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS, (void (*)(void))ossl_##alg##_##lc##_settable_ctx_params },  \
-    OSSL_DISPATCH_END                                                                                   \
-}
+#define IMPLEMENT_cipher(alg, lc, UCMODE, flags, kbits, blkbits, ivbits)                                   \
+    static OSSL_FUNC_cipher_newctx_fn ossl_##alg##kbits##_##lc##_newctx;                                   \
+    static OSSL_FUNC_cipher_freectx_fn ossl_##alg##_##lc##_freectx;                                        \
+    static OSSL_FUNC_cipher_dupctx_fn ossl_##alg##_##lc##_dupctx;                                          \
+    static OSSL_FUNC_cipher_encrypt_init_fn ossl_##alg##_##lc##_einit;                                     \
+    static OSSL_FUNC_cipher_decrypt_init_fn ossl_##alg##_##lc##_dinit;                                     \
+    static OSSL_FUNC_cipher_update_fn ossl_##alg##_##lc##_stream_update;                                   \
+    static OSSL_FUNC_cipher_final_fn ossl_##alg##_##lc##_stream_final;                                     \
+    static OSSL_FUNC_cipher_cipher_fn ossl_##alg##_##lc##_cipher;                                          \
+    static OSSL_FUNC_cipher_get_params_fn ossl_##alg##_##kbits##_##lc##_get_params;                        \
+    static OSSL_FUNC_cipher_get_ctx_params_fn ossl_##alg##_##lc##_get_ctx_params;                          \
+    static OSSL_FUNC_cipher_gettable_ctx_params_fn ossl_##alg##_##lc##_gettable_ctx_params;                \
+    static OSSL_FUNC_cipher_set_ctx_params_fn ossl_##alg##_##lc##_set_ctx_params;                          \
+    static OSSL_FUNC_cipher_settable_ctx_params_fn ossl_##alg##_##lc##_settable_ctx_params;                \
+    static int ossl_##alg##_##kbits##_##lc##_get_params(OSSL_PARAM params[])                               \
+    {                                                                                                      \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,                            \
+            flags, kbits, blkbits, ivbits);                                                                \
+    }                                                                                                      \
+    static void *ossl_##alg##kbits##_##lc##_newctx(void *provctx)                                          \
+    {                                                                                                      \
+        return ossl_##alg##_##lc##_newctx(provctx, kbits);                                                 \
+    }                                                                                                      \
+    const OSSL_DISPATCH ossl_##alg##kbits##lc##_functions[] = {                                            \
+        { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))ossl_##alg##kbits##_##lc##_newctx },                    \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))ossl_##alg##_##lc##_freectx },                         \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))ossl_##alg##_##lc##_dupctx },                           \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))ossl_##alg##_##lc##_einit },                      \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_##alg##_##lc##_dinit },                      \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_##alg##_##lc##_stream_update },                    \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_##alg##_##lc##_stream_final },                      \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_##alg##_##lc##_cipher },                           \
+        { OSSL_FUNC_CIPHER_GET_PARAMS, (void (*)(void))ossl_##alg##_##kbits##_##lc##_get_params },         \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS, (void (*)(void))ossl_cipher_generic_gettable_params },         \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS, (void (*)(void))ossl_##alg##_##lc##_get_ctx_params },           \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS, (void (*)(void))ossl_##alg##_##lc##_gettable_ctx_params }, \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS, (void (*)(void))ossl_##alg##_##lc##_set_ctx_params },           \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS, (void (*)(void))ossl_##alg##_##lc##_settable_ctx_params }, \
+        OSSL_DISPATCH_END                                                                                  \
+    }
 
 IMPLEMENT_cipher(aes, gcm_siv, GCM_SIV, AEAD_FLAGS, 128, 8, 96);
 IMPLEMENT_cipher(aes, gcm_siv, GCM_SIV, AEAD_FLAGS, 192, 8, 96);
diff --git a/providers/implementations/ciphers/cipher_aes_gcm_siv.h b/providers/implementations/ciphers/cipher_aes_gcm_siv.h
index 37d1e3326b180..dbee05bedac2c 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm_siv.h
+++ b/providers/implementations/ciphers/cipher_aes_gcm_siv.h
@@ -13,7 +13,7 @@
 
 #define BLOCK_SIZE 16
 #define NONCE_SIZE 12
-#define TAG_SIZE   16
+#define TAG_SIZE 16
 
 /* AAD manipulation macros */
 #define UP16(x) (((x) + 15) & ~0x0F)
@@ -24,7 +24,7 @@
 typedef struct prov_cipher_hw_aes_gcm_siv_st {
     int (*initkey)(void *vctx);
     int (*cipher)(void *vctx, unsigned char *out, const unsigned char *in,
-                  size_t len);
+        size_t len);
     int (*dup_ctx)(void *vdst, void *vsrc);
     void (*clean_ctx)(void *vctx);
 } PROV_CIPHER_HW_AES_GCM_SIV;
@@ -33,19 +33,19 @@ typedef struct prov_cipher_hw_aes_gcm_siv_st {
 typedef struct prov_aes_gcm_siv_ctx_st {
     EVP_CIPHER_CTX *ecb_ctx;
     const PROV_CIPHER_HW_AES_GCM_SIV *hw; /* maybe not used, yet? */
-    uint8_t *aad;            /* Allocated, rounded up to 16 bytes, from user */
+    uint8_t *aad; /* Allocated, rounded up to 16 bytes, from user */
     OSSL_LIB_CTX *libctx;
     OSSL_PROVIDER *provctx;
-    size_t aad_len;          /* actual AAD length */
+    size_t aad_len; /* actual AAD length */
     size_t key_len;
     uint8_t key_gen_key[32]; /* from user */
     uint8_t msg_enc_key[32]; /* depends on key size */
     uint8_t msg_auth_key[BLOCK_SIZE];
-    uint8_t tag[TAG_SIZE];          /* generated tag, given to user or compared to user */
-    uint8_t user_tag[TAG_SIZE];     /* from user */
-    uint8_t nonce[NONCE_SIZE];       /* from user */
-    u128 Htable[16];         /* Polyval calculations via ghash */
-    unsigned int enc : 1;    /* Set to 1 if we are encrypting or 0 otherwise */
+    uint8_t tag[TAG_SIZE]; /* generated tag, given to user or compared to user */
+    uint8_t user_tag[TAG_SIZE]; /* from user */
+    uint8_t nonce[NONCE_SIZE]; /* from user */
+    u128 Htable[16]; /* Polyval calculations via ghash */
+    unsigned int enc : 1; /* Set to 1 if we are encrypting or 0 otherwise */
     unsigned int have_user_tag : 1;
     unsigned int generated_tag : 1;
     unsigned int used_enc : 1;
@@ -56,15 +56,15 @@ typedef struct prov_aes_gcm_siv_ctx_st {
 const PROV_CIPHER_HW_AES_GCM_SIV *ossl_prov_cipher_hw_aes_gcm_siv(size_t keybits);
 
 void ossl_polyval_ghash_init(u128 Htable[16], const uint64_t H[2]);
-void ossl_polyval_ghash_hash(const u128 Htable[16], uint8_t *tag,  const uint8_t *inp, size_t len);
+void ossl_polyval_ghash_hash(const u128 Htable[16], uint8_t *tag, const uint8_t *inp, size_t len);
 
 /* Define GSWAP8/GSWAP4 - used for BOTH little and big endian architectures */
 static ossl_inline uint32_t GSWAP4(uint32_t n)
 {
     return (((n & 0x000000FF) << 24)
-            | ((n & 0x0000FF00) << 8)
-            | ((n & 0x00FF0000) >> 8)
-            | ((n & 0xFF000000) >> 24));
+        | ((n & 0x0000FF00) << 8)
+        | ((n & 0x00FF0000) >> 8)
+        | ((n & 0xFF000000) >> 24));
 }
 static ossl_inline uint64_t GSWAP8(uint64_t n)
 {
diff --git a/providers/implementations/ciphers/cipher_aes_gcm_siv_hw.c b/providers/implementations/ciphers/cipher_aes_gcm_siv_hw.c
index c60d4e048769a..d0b6ae4b070d1 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm_siv_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_gcm_siv_hw.c
@@ -20,7 +20,7 @@
 #include "cipher_aes_gcm_siv.h"
 
 static int aes_gcm_siv_ctr32(PROV_AES_GCM_SIV_CTX *ctx, const unsigned char *init_counter,
-                             unsigned char *out, const unsigned char *in, size_t len);
+    unsigned char *out, const unsigned char *in, size_t len);
 
 static int aes_gcm_siv_initkey(void *vctx)
 {
@@ -97,7 +97,7 @@ static int aes_gcm_siv_initkey(void *vctx)
     ctx->used_dec = 0;
     EVP_CIPHER_free(ecb);
     return 1;
- err:
+err:
     EVP_CIPHER_CTX_free(ctx->ecb_ctx);
     EVP_CIPHER_free(ecb);
     ctx->ecb_ctx = NULL;
@@ -105,7 +105,7 @@ static int aes_gcm_siv_initkey(void *vctx)
 }
 
 static int aes_gcm_siv_aad(PROV_AES_GCM_SIV_CTX *ctx,
-                           const unsigned char *aad, size_t len)
+    const unsigned char *aad, size_t len)
 {
     size_t to_alloc;
     uint8_t *ptr;
@@ -146,7 +146,7 @@ static int aes_gcm_siv_finish(PROV_AES_GCM_SIV_CTX *ctx)
 }
 
 static int aes_gcm_siv_encrypt(PROV_AES_GCM_SIV_CTX *ctx, const unsigned char *in,
-                               unsigned char *out, size_t len)
+    unsigned char *out, size_t len)
 {
     uint64_t len_blk[2];
     uint8_t S_s[TAG_SIZE];
@@ -173,21 +173,21 @@ static int aes_gcm_siv_encrypt(PROV_AES_GCM_SIV_CTX *ctx, const unsigned char *i
         len_blk[1] = GSWAP8((uint64_t)len * 8);
     }
     memset(S_s, 0, TAG_SIZE);
-    ossl_polyval_ghash_init(ctx->Htable, (const uint64_t*)ctx->msg_auth_key);
+    ossl_polyval_ghash_init(ctx->Htable, (const uint64_t *)ctx->msg_auth_key);
 
     if (ctx->aad != NULL) {
         /* AAD is allocated with padding, but need to adjust length */
         ossl_polyval_ghash_hash(ctx->Htable, S_s, ctx->aad, UP16(ctx->aad_len));
     }
     if (DOWN16(len) > 0)
-        ossl_polyval_ghash_hash(ctx->Htable, S_s, (uint8_t *) in, DOWN16(len));
+        ossl_polyval_ghash_hash(ctx->Htable, S_s, (uint8_t *)in, DOWN16(len));
     if (!IS16(len)) {
         /* deal with padding - probably easier to memset the padding first rather than calculate */
         memset(padding, 0, sizeof(padding));
         memcpy(padding, &in[DOWN16(len)], REMAINDER16(len));
         ossl_polyval_ghash_hash(ctx->Htable, S_s, padding, sizeof(padding));
     }
-    ossl_polyval_ghash_hash(ctx->Htable, S_s, (uint8_t *) len_blk, sizeof(len_blk));
+    ossl_polyval_ghash_hash(ctx->Htable, S_s, (uint8_t *)len_blk, sizeof(len_blk));
 
     for (i = 0; i < NONCE_SIZE; i++)
         S_s[i] ^= ctx->nonce[i];
@@ -207,7 +207,7 @@ static int aes_gcm_siv_encrypt(PROV_AES_GCM_SIV_CTX *ctx, const unsigned char *i
 }
 
 static int aes_gcm_siv_decrypt(PROV_AES_GCM_SIV_CTX *ctx, const unsigned char *in,
-                               unsigned char *out, size_t len)
+    unsigned char *out, size_t len)
 {
     uint8_t counter_block[TAG_SIZE];
     uint64_t len_blk[2];
@@ -239,7 +239,7 @@ static int aes_gcm_siv_decrypt(PROV_AES_GCM_SIV_CTX *ctx, const unsigned char *i
         len_blk[1] = GSWAP8((uint64_t)len * 8);
     }
     memset(S_s, 0, TAG_SIZE);
-    ossl_polyval_ghash_init(ctx->Htable, (const uint64_t*)ctx->msg_auth_key);
+    ossl_polyval_ghash_init(ctx->Htable, (const uint64_t *)ctx->msg_auth_key);
     if (ctx->aad != NULL) {
         /* AAD allocated with padding, but need to adjust length */
         ossl_polyval_ghash_hash(ctx->Htable, S_s, ctx->aad, UP16(ctx->aad_len));
@@ -272,7 +272,7 @@ static int aes_gcm_siv_decrypt(PROV_AES_GCM_SIV_CTX *ctx, const unsigned char *i
 }
 
 static int aes_gcm_siv_cipher(void *vctx, unsigned char *out,
-                              const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     PROV_AES_GCM_SIV_CTX *ctx = (PROV_AES_GCM_SIV_CTX *)vctx;
 
@@ -312,7 +312,7 @@ static int aes_gcm_siv_dup_ctx(void *vdst, void *vsrc)
     }
     return 1;
 
- err:
+err:
     EVP_CIPHER_CTX_free(dst->ecb_ctx);
     dst->ecb_ctx = NULL;
     return 0;
@@ -332,7 +332,7 @@ const PROV_CIPHER_HW_AES_GCM_SIV *ossl_prov_cipher_hw_aes_gcm_siv(size_t keybits
 
 /* AES-GCM-SIV needs AES-CTR32, which is different than the AES-CTR implementation */
 static int aes_gcm_siv_ctr32(PROV_AES_GCM_SIV_CTX *ctx, const unsigned char *init_counter,
-                             unsigned char *out, const unsigned char *in, size_t len)
+    unsigned char *out, const unsigned char *in, size_t len)
 {
     uint8_t keystream[BLOCK_SIZE];
     int out_len;
@@ -354,7 +354,7 @@ static int aes_gcm_siv_ctr32(PROV_AES_GCM_SIV_CTX *ctx, const unsigned char *ini
 
     for (i = 0; i < len; i += sizeof(block)) {
         out_len = BLOCK_SIZE;
-        error |= !EVP_EncryptUpdate(ctx->ecb_ctx, keystream, &out_len, (uint8_t*)&block, sizeof(block));
+        error |= !EVP_EncryptUpdate(ctx->ecb_ctx, keystream, &out_len, (uint8_t *)&block, sizeof(block));
         if (IS_LITTLE_ENDIAN) {
             block.x32[0]++;
         } else {
diff --git a/providers/implementations/ciphers/cipher_aes_gcm_siv_polyval.c b/providers/implementations/ciphers/cipher_aes_gcm_siv_polyval.c
index fead51dd36f70..5c9988cabf2d5 100644
--- a/providers/implementations/ciphers/cipher_aes_gcm_siv_polyval.c
+++ b/providers/implementations/ciphers/cipher_aes_gcm_siv_polyval.c
@@ -71,7 +71,7 @@ void ossl_polyval_ghash_init(u128 Htable[16], const uint64_t H[2])
         tmp[1] = GSWAP8(tmp[1]);
     }
 
-    ossl_gcm_init_4bit(Htable, (u64*)tmp);
+    ossl_gcm_init_4bit(Htable, (u64 *)tmp);
 }
 
 /* Implementation of POLYVAL via existing GHASH implementation */
@@ -89,7 +89,7 @@ void ossl_polyval_ghash_hash(const u128 Htable[16], uint8_t *tag, const uint8_t
      */
     for (i = 0; i < len; i += 16) {
         byte_reverse16((uint8_t *)tmp, &inp[i]);
-        ossl_gcm_ghash_4bit((u64*)out, Htable, (uint8_t *)tmp, 16);
+        ossl_gcm_ghash_4bit((u64 *)out, Htable, (uint8_t *)tmp, 16);
     }
     byte_reverse16(tag, (uint8_t *)out);
 }
diff --git a/providers/implementations/ciphers/cipher_aes_hw.c b/providers/implementations/ciphers/cipher_aes_hw.c
index a3b72d9f728a0..635b465a5e553 100644
--- a/providers/implementations/ciphers/cipher_aes_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_hw.c
@@ -17,7 +17,7 @@
 #include "cipher_aes.h"
 
 static int cipher_hw_aes_initkey(PROV_CIPHER_CTX *dat,
-                                 const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     int ret;
     PROV_AES_CTX *adat = (PROV_AES_CTX *)dat;
@@ -32,81 +32,85 @@ static int cipher_hw_aes_initkey(PROV_CIPHER_CTX *dat,
             ret = HWAES_set_decrypt_key(key, keylen * 8, ks);
             dat->block = (block128_f)HWAES_decrypt;
             dat->stream.cbc = NULL;
-# ifdef HWAES_cbc_encrypt
+#ifdef HWAES_cbc_encrypt
             if (dat->mode == EVP_CIPH_CBC_MODE)
                 dat->stream.cbc = (cbc128_f)HWAES_cbc_encrypt;
-# endif
-# ifdef HWAES_ecb_encrypt
+#endif
+#ifdef HWAES_ecb_encrypt
             if (dat->mode == EVP_CIPH_ECB_MODE)
                 dat->stream.ecb = (ecb128_f)HWAES_ecb_encrypt;
-# endif
+#endif
         } else
 #endif
 #ifdef BSAES_CAPABLE
-        if (BSAES_CAPABLE && dat->mode == EVP_CIPH_CBC_MODE) {
+            if (BSAES_CAPABLE && dat->mode == EVP_CIPH_CBC_MODE) {
             ret = AES_set_decrypt_key(key, keylen * 8, ks);
             dat->block = (block128_f)AES_decrypt;
             dat->stream.cbc = (cbc128_f)ossl_bsaes_cbc_encrypt;
         } else
 #endif
 #ifdef VPAES_CAPABLE
-        if (VPAES_CAPABLE) {
+            if (VPAES_CAPABLE) {
             ret = vpaes_set_decrypt_key(key, keylen * 8, ks);
             dat->block = (block128_f)vpaes_decrypt;
             dat->stream.cbc = (dat->mode == EVP_CIPH_CBC_MODE)
-                              ?(cbc128_f)vpaes_cbc_encrypt : NULL;
+                ? (cbc128_f)vpaes_cbc_encrypt
+                : NULL;
         } else
 #endif
         {
             ret = AES_set_decrypt_key(key, keylen * 8, ks);
             dat->block = (block128_f)AES_decrypt;
             dat->stream.cbc = (dat->mode == EVP_CIPH_CBC_MODE)
-                              ? (cbc128_f)AES_cbc_encrypt : NULL;
+                ? (cbc128_f)AES_cbc_encrypt
+                : NULL;
         }
     } else
 #ifdef HWAES_CAPABLE
-    if (HWAES_CAPABLE) {
+        if (HWAES_CAPABLE) {
         ret = HWAES_set_encrypt_key(key, keylen * 8, ks);
         dat->block = (block128_f)HWAES_encrypt;
         dat->stream.cbc = NULL;
-# ifdef HWAES_cbc_encrypt
+#ifdef HWAES_cbc_encrypt
         if (dat->mode == EVP_CIPH_CBC_MODE)
             dat->stream.cbc = (cbc128_f)HWAES_cbc_encrypt;
         else
-# endif
-# ifdef HWAES_ecb_encrypt
-        if (dat->mode == EVP_CIPH_ECB_MODE)
+#endif
+#ifdef HWAES_ecb_encrypt
+            if (dat->mode == EVP_CIPH_ECB_MODE)
             dat->stream.ecb = (ecb128_f)HWAES_ecb_encrypt;
         else
-# endif
-# ifdef HWAES_ctr32_encrypt_blocks
-        if (dat->mode == EVP_CIPH_CTR_MODE)
+#endif
+#ifdef HWAES_ctr32_encrypt_blocks
+            if (dat->mode == EVP_CIPH_CTR_MODE)
             dat->stream.ctr = (ctr128_f)HWAES_ctr32_encrypt_blocks;
         else
-# endif
-            (void)0;            /* terminate potentially open 'else' */
+#endif
+            (void)0; /* terminate potentially open 'else' */
     } else
 #endif
 #ifdef BSAES_CAPABLE
-    if (BSAES_CAPABLE && dat->mode == EVP_CIPH_CTR_MODE) {
+        if (BSAES_CAPABLE && dat->mode == EVP_CIPH_CTR_MODE) {
         ret = AES_set_encrypt_key(key, keylen * 8, ks);
         dat->block = (block128_f)AES_encrypt;
         dat->stream.ctr = (ctr128_f)ossl_bsaes_ctr32_encrypt_blocks;
     } else
 #endif
 #ifdef VPAES_CAPABLE
-    if (VPAES_CAPABLE) {
+        if (VPAES_CAPABLE) {
         ret = vpaes_set_encrypt_key(key, keylen * 8, ks);
         dat->block = (block128_f)vpaes_encrypt;
         dat->stream.cbc = (dat->mode == EVP_CIPH_CBC_MODE)
-                          ? (cbc128_f)vpaes_cbc_encrypt : NULL;
+            ? (cbc128_f)vpaes_cbc_encrypt
+            : NULL;
     } else
 #endif
     {
         ret = AES_set_encrypt_key(key, keylen * 8, ks);
         dat->block = (block128_f)AES_encrypt;
         dat->stream.cbc = (dat->mode == EVP_CIPH_CBC_MODE)
-                          ? (cbc128_f)AES_cbc_encrypt : NULL;
+            ? (cbc128_f)AES_cbc_encrypt
+            : NULL;
 #ifdef AES_CTR_ASM
         if (dat->mode == EVP_CIPH_CTR_MODE)
             dat->stream.ctr = (ctr128_f)AES_ctr32_encrypt;
@@ -123,41 +127,41 @@ static int cipher_hw_aes_initkey(PROV_CIPHER_CTX *dat,
 
 IMPLEMENT_CIPHER_HW_COPYCTX(cipher_hw_aes_copyctx, PROV_AES_CTX)
 
-#define PROV_CIPHER_HW_aes_mode(mode)                                          \
-static const PROV_CIPHER_HW aes_##mode = {                                     \
-    cipher_hw_aes_initkey,                                                     \
-    ossl_cipher_hw_generic_##mode,                                             \
-    cipher_hw_aes_copyctx                                                      \
-};                                                                             \
-PROV_CIPHER_HW_declare(mode)                                                   \
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_##mode(size_t keybits)           \
-{                                                                              \
-    PROV_CIPHER_HW_select(mode)                                                \
-    return &aes_##mode;                                                        \
-}
+#define PROV_CIPHER_HW_aes_mode(mode)                   \
+    static const PROV_CIPHER_HW aes_##mode = {          \
+        cipher_hw_aes_initkey,                          \
+        ossl_cipher_hw_generic_##mode,                  \
+        cipher_hw_aes_copyctx                           \
+    };                                                  \
+    PROV_CIPHER_HW_declare(mode)                        \
+        const PROV_CIPHER_HW *                          \
+        ossl_prov_cipher_hw_aes_##mode(size_t keybits)  \
+    {                                                   \
+        PROV_CIPHER_HW_select(mode) return &aes_##mode; \
+    }
 
 #if defined(AESNI_CAPABLE)
-# include "cipher_aes_hw_aesni.inc"
+#include "cipher_aes_hw_aesni.inc"
 #elif defined(SPARC_AES_CAPABLE)
-# include "cipher_aes_hw_t4.inc"
+#include "cipher_aes_hw_t4.inc"
 #elif defined(S390X_aes_128_CAPABLE)
-# include "cipher_aes_hw_s390x.inc"
+#include "cipher_aes_hw_s390x.inc"
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-# include "cipher_aes_hw_rv64i.inc"
+#include "cipher_aes_hw_rv64i.inc"
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32
-# include "cipher_aes_hw_rv32i.inc"
-#elif defined (ARMv8_HWAES_CAPABLE)
-# include "cipher_aes_hw_armv8.inc"
+#include "cipher_aes_hw_rv32i.inc"
+#elif defined(ARMv8_HWAES_CAPABLE)
+#include "cipher_aes_hw_armv8.inc"
 #else
 /* The generic case */
-# define PROV_CIPHER_HW_declare(mode)
-# define PROV_CIPHER_HW_select(mode)
+#define PROV_CIPHER_HW_declare(mode)
+#define PROV_CIPHER_HW_select(mode)
 #endif
 
 PROV_CIPHER_HW_aes_mode(cbc)
-PROV_CIPHER_HW_aes_mode(ecb)
-PROV_CIPHER_HW_aes_mode(ofb128)
-PROV_CIPHER_HW_aes_mode(cfb128)
-PROV_CIPHER_HW_aes_mode(cfb1)
-PROV_CIPHER_HW_aes_mode(cfb8)
-PROV_CIPHER_HW_aes_mode(ctr)
+    PROV_CIPHER_HW_aes_mode(ecb)
+        PROV_CIPHER_HW_aes_mode(ofb128)
+            PROV_CIPHER_HW_aes_mode(cfb128)
+                PROV_CIPHER_HW_aes_mode(cfb1)
+                    PROV_CIPHER_HW_aes_mode(cfb8)
+                        PROV_CIPHER_HW_aes_mode(ctr)
diff --git a/providers/implementations/ciphers/cipher_aes_ocb.c b/providers/implementations/ciphers/cipher_aes_ocb.c
index 876ff294246c0..a50099719c4a9 100644
--- a/providers/implementations/ciphers/cipher_aes_ocb.c
+++ b/providers/implementations/ciphers/cipher_aes_ocb.c
@@ -23,13 +23,11 @@
 #define AES_OCB_FLAGS AEAD_FLAGS
 
 #define OCB_DEFAULT_TAG_LEN 16
-#define OCB_DEFAULT_IV_LEN  12
-#define OCB_MIN_IV_LEN      1
-#define OCB_MAX_IV_LEN      15
+#define OCB_DEFAULT_IV_LEN 12
+#define OCB_MIN_IV_LEN 1
+#define OCB_MAX_IV_LEN 15
 
-PROV_CIPHER_FUNC(int, ocb_cipher, (PROV_AES_OCB_CTX *ctx,
-                                   const unsigned char *in, unsigned char *out,
-                                   size_t nextblock));
+PROV_CIPHER_FUNC(int, ocb_cipher, (PROV_AES_OCB_CTX * ctx, const unsigned char *in, unsigned char *out, size_t nextblock));
 /* forward declarations */
 static OSSL_FUNC_cipher_encrypt_init_fn aes_ocb_einit;
 static OSSL_FUNC_cipher_decrypt_init_fn aes_ocb_dinit;
@@ -48,21 +46,21 @@ static OSSL_FUNC_cipher_settable_ctx_params_fn cipher_ocb_settable_ctx_params;
  * multiple hardware implementations are ever needed.
  */
 static ossl_inline int aes_generic_ocb_setiv(PROV_AES_OCB_CTX *ctx,
-                                             const unsigned char *iv,
-                                             size_t ivlen, size_t taglen)
+    const unsigned char *iv,
+    size_t ivlen, size_t taglen)
 {
     return (CRYPTO_ocb128_setiv(&ctx->ocb, iv, ivlen, taglen) == 1);
 }
 
 static ossl_inline int aes_generic_ocb_setaad(PROV_AES_OCB_CTX *ctx,
-                                              const unsigned char *aad,
-                                              size_t alen)
+    const unsigned char *aad,
+    size_t alen)
 {
     return CRYPTO_ocb128_aad(&ctx->ocb, aad, alen) == 1;
 }
 
 static ossl_inline int aes_generic_ocb_gettag(PROV_AES_OCB_CTX *ctx,
-                                              unsigned char *tag, size_t tlen)
+    unsigned char *tag, size_t tlen)
 {
     return CRYPTO_ocb128_tag(&ctx->ocb, tag, tlen) > 0;
 }
@@ -78,8 +76,8 @@ static ossl_inline void aes_generic_ocb_cleanup(PROV_AES_OCB_CTX *ctx)
 }
 
 static ossl_inline int aes_generic_ocb_cipher(PROV_AES_OCB_CTX *ctx,
-                                              const unsigned char *in,
-                                              unsigned char *out, size_t len)
+    const unsigned char *in,
+    unsigned char *out, size_t len)
 {
     if (ctx->base.enc) {
         if (!CRYPTO_ocb128_encrypt(&ctx->ocb, in, out, len))
@@ -92,18 +90,18 @@ static ossl_inline int aes_generic_ocb_cipher(PROV_AES_OCB_CTX *ctx,
 }
 
 static ossl_inline int aes_generic_ocb_copy_ctx(PROV_AES_OCB_CTX *dst,
-                                                PROV_AES_OCB_CTX *src)
+    PROV_AES_OCB_CTX *src)
 {
     return CRYPTO_ocb128_copy_ctx(&dst->ocb, &src->ocb,
-                                  &dst->ksenc.ks, &dst->ksdec.ks);
+        &dst->ksenc.ks, &dst->ksdec.ks);
 }
 
 /*-
  * Provider dispatch functions
  */
 static int aes_ocb_init(void *vctx, const unsigned char *key, size_t keylen,
-                        const unsigned char *iv, size_t ivlen,
-                        const OSSL_PARAM params[], int enc)
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[], int enc)
 {
     PROV_AES_OCB_CTX *ctx = (PROV_AES_OCB_CTX *)vctx;
 
@@ -139,15 +137,15 @@ static int aes_ocb_init(void *vctx, const unsigned char *key, size_t keylen,
 }
 
 static int aes_ocb_einit(void *vctx, const unsigned char *key, size_t keylen,
-                         const unsigned char *iv, size_t ivlen,
-                         const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return aes_ocb_init(vctx, key, keylen, iv, ivlen, params, 1);
 }
 
 static int aes_ocb_dinit(void *vctx, const unsigned char *key, size_t keylen,
-                         const unsigned char *iv, size_t ivlen,
-                         const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return aes_ocb_init(vctx, key, keylen, iv, ivlen, params, 0);
 }
@@ -157,10 +155,10 @@ static int aes_ocb_dinit(void *vctx, const unsigned char *key, size_t keylen,
  * same way. Only the last block can be a partial block.
  */
 static int aes_ocb_block_update_internal(PROV_AES_OCB_CTX *ctx,
-                                         unsigned char *buf, size_t *bufsz,
-                                         unsigned char *out, size_t *outl,
-                                         size_t outsize, const unsigned char *in,
-                                         size_t inl, OSSL_ocb_cipher_fn ciph)
+    unsigned char *buf, size_t *bufsz,
+    unsigned char *out, size_t *outl,
+    size_t outsize, const unsigned char *in,
+    size_t inl, OSSL_ocb_cipher_fn ciph)
 {
     size_t nextblocks;
     size_t outlint = 0;
@@ -168,7 +166,7 @@ static int aes_ocb_block_update_internal(PROV_AES_OCB_CTX *ctx,
     if (*bufsz != 0)
         nextblocks = ossl_cipher_fillblock(buf, bufsz, AES_BLOCK_SIZE, &in, &inl);
     else
-        nextblocks = inl & ~(AES_BLOCK_SIZE-1);
+        nextblocks = inl & ~(AES_BLOCK_SIZE - 1);
 
     if (*bufsz == AES_BLOCK_SIZE) {
         if (outsize < AES_BLOCK_SIZE) {
@@ -209,7 +207,7 @@ static int aes_ocb_block_update_internal(PROV_AES_OCB_CTX *ctx,
 
 /* A wrapper function that has the same signature as cipher */
 static int cipher_updateaad(PROV_AES_OCB_CTX *ctx, const unsigned char *in,
-                            unsigned char *out, size_t len)
+    unsigned char *out, size_t len)
 {
     return aes_generic_ocb_setaad(ctx, in, len);
 }
@@ -221,7 +219,7 @@ static int update_iv(PROV_AES_OCB_CTX *ctx)
         return 0;
     if (ctx->iv_state == IV_STATE_BUFFERED) {
         if (!aes_generic_ocb_setiv(ctx, ctx->base.iv, ctx->base.ivlen,
-                                   ctx->taglen))
+                ctx->taglen))
             return 0;
         ctx->iv_state = IV_STATE_COPIED;
     }
@@ -229,8 +227,8 @@ static int update_iv(PROV_AES_OCB_CTX *ctx)
 }
 
 static int aes_ocb_block_update(void *vctx, unsigned char *out, size_t *outl,
-                                size_t outsize, const unsigned char *in,
-                                size_t inl)
+    size_t outsize, const unsigned char *in,
+    size_t inl)
 {
     PROV_AES_OCB_CTX *ctx = (PROV_AES_OCB_CTX *)vctx;
     unsigned char *buf;
@@ -256,11 +254,11 @@ static int aes_ocb_block_update(void *vctx, unsigned char *out, size_t *outl,
         fn = aes_generic_ocb_cipher;
     }
     return aes_ocb_block_update_internal(ctx, buf, buflen, out, outl, outsize,
-                                         in, inl, fn);
+        in, inl, fn);
 }
 
 static int aes_ocb_block_final(void *vctx, unsigned char *out, size_t *outl,
-                               size_t outsize)
+    size_t outsize)
 {
     PROV_AES_OCB_CTX *ctx = (PROV_AES_OCB_CTX *)vctx;
 
@@ -304,7 +302,7 @@ static int aes_ocb_block_final(void *vctx, unsigned char *out, size_t *outl,
 }
 
 static void *aes_ocb_newctx(void *provctx, size_t kbits, size_t blkbits,
-                            size_t ivbits, unsigned int mode, uint64_t flags)
+    size_t ivbits, unsigned int mode, uint64_t flags)
 {
     PROV_AES_OCB_CTX *ctx;
 
@@ -314,7 +312,7 @@ static void *aes_ocb_newctx(void *provctx, size_t kbits, size_t blkbits,
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx != NULL) {
         ossl_cipher_generic_initkey(ctx, kbits, blkbits, ivbits, mode, flags,
-                                    ossl_prov_cipher_hw_aes_ocb(kbits), NULL);
+            ossl_prov_cipher_hw_aes_ocb(kbits), NULL);
         ctx->taglen = OCB_DEFAULT_TAG_LEN;
     }
     return ctx;
@@ -327,7 +325,7 @@ static void aes_ocb_freectx(void *vctx)
     if (ctx != NULL) {
         aes_generic_ocb_cleanup(ctx);
         ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-        OPENSSL_clear_free(ctx,  sizeof(*ctx));
+        OPENSSL_clear_free(ctx, sizeof(*ctx));
     }
 }
 
@@ -383,7 +381,7 @@ static int aes_ocb_set_ctx_params(void *vctx, const OSSL_PARAM params[])
             }
             memcpy(ctx->tag, p->data, p->data_size);
         }
-     }
+    }
     p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_AEAD_IVLEN);
     if (p != NULL) {
         if (!OSSL_PARAM_get_size_t(p, &sz)) {
@@ -486,7 +484,7 @@ static const OSSL_PARAM cipher_ocb_known_gettable_ctx_params[] = {
     OSSL_PARAM_END
 };
 static const OSSL_PARAM *cipher_ocb_gettable_ctx_params(ossl_unused void *cctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     return cipher_ocb_known_gettable_ctx_params;
 }
@@ -498,13 +496,13 @@ static const OSSL_PARAM cipher_ocb_known_settable_ctx_params[] = {
     OSSL_PARAM_END
 };
 static const OSSL_PARAM *cipher_ocb_settable_ctx_params(ossl_unused void *cctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     return cipher_ocb_known_settable_ctx_params;
 }
 
 static int aes_ocb_cipher(void *vctx, unsigned char *out, size_t *outl,
-                          size_t outsize, const unsigned char *in, size_t inl)
+    size_t outsize, const unsigned char *in, size_t inl)
 {
     PROV_AES_OCB_CTX *ctx = (PROV_AES_OCB_CTX *)vctx;
 
@@ -525,43 +523,43 @@ static int aes_ocb_cipher(void *vctx, unsigned char *out, size_t *outl,
     return 1;
 }
 
-#define IMPLEMENT_cipher(mode, UCMODE, flags, kbits, blkbits, ivbits)          \
-static OSSL_FUNC_cipher_get_params_fn aes_##kbits##_##mode##_get_params;       \
-static int aes_##kbits##_##mode##_get_params(OSSL_PARAM params[])              \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
-                                          flags, kbits, blkbits, ivbits);      \
-}                                                                              \
-static OSSL_FUNC_cipher_newctx_fn aes_##kbits##_##mode##_newctx;               \
-static void *aes_##kbits##_##mode##_newctx(void *provctx)                      \
-{                                                                              \
-    return aes_##mode##_newctx(provctx, kbits, blkbits, ivbits,                \
-                               EVP_CIPH_##UCMODE##_MODE, flags);               \
-}                                                                              \
-const OSSL_DISPATCH ossl_##aes##kbits##mode##_functions[] = {                  \
-    { OSSL_FUNC_CIPHER_NEWCTX,                                                 \
-        (void (*)(void))aes_##kbits##_##mode##_newctx },                       \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_##mode##_einit },     \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))aes_##mode##_dinit },     \
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))aes_##mode##_block_update },    \
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))aes_##mode##_block_final },      \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))aes_ocb_cipher },               \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))aes_##mode##_freectx },        \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))aes_##mode##_dupctx },          \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-        (void (*)(void))aes_##kbits##_##mode##_get_params },                   \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-        (void (*)(void))aes_##mode##_get_ctx_params },                         \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-        (void (*)(void))aes_##mode##_set_ctx_params },                         \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-        (void (*)(void))ossl_cipher_generic_gettable_params },                 \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-        (void (*)(void))cipher_ocb_gettable_ctx_params },                      \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-        (void (*)(void))cipher_ocb_settable_ctx_params },                      \
-    OSSL_DISPATCH_END                                                          \
-}
+#define IMPLEMENT_cipher(mode, UCMODE, flags, kbits, blkbits, ivbits)           \
+    static OSSL_FUNC_cipher_get_params_fn aes_##kbits##_##mode##_get_params;    \
+    static int aes_##kbits##_##mode##_get_params(OSSL_PARAM params[])           \
+    {                                                                           \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE, \
+            flags, kbits, blkbits, ivbits);                                     \
+    }                                                                           \
+    static OSSL_FUNC_cipher_newctx_fn aes_##kbits##_##mode##_newctx;            \
+    static void *aes_##kbits##_##mode##_newctx(void *provctx)                   \
+    {                                                                           \
+        return aes_##mode##_newctx(provctx, kbits, blkbits, ivbits,             \
+            EVP_CIPH_##UCMODE##_MODE, flags);                                   \
+    }                                                                           \
+    const OSSL_DISPATCH ossl_##aes##kbits##mode##_functions[] = {               \
+        { OSSL_FUNC_CIPHER_NEWCTX,                                              \
+            (void (*)(void))aes_##kbits##_##mode##_newctx },                    \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_##mode##_einit },  \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))aes_##mode##_dinit },  \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))aes_##mode##_block_update }, \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))aes_##mode##_block_final },   \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))aes_ocb_cipher },            \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))aes_##mode##_freectx },     \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))aes_##mode##_dupctx },       \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                          \
+            (void (*)(void))aes_##kbits##_##mode##_get_params },                \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                      \
+            (void (*)(void))aes_##mode##_get_ctx_params },                      \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                      \
+            (void (*)(void))aes_##mode##_set_ctx_params },                      \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                     \
+            (void (*)(void))ossl_cipher_generic_gettable_params },              \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                 \
+            (void (*)(void))cipher_ocb_gettable_ctx_params },                   \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                 \
+            (void (*)(void))cipher_ocb_settable_ctx_params },                   \
+        OSSL_DISPATCH_END                                                       \
+    }
 
 IMPLEMENT_cipher(ocb, OCB, AES_OCB_FLAGS, 256, 128, OCB_DEFAULT_IV_LEN * 8);
 IMPLEMENT_cipher(ocb, OCB, AES_OCB_FLAGS, 192, 128, OCB_DEFAULT_IV_LEN * 8);
diff --git a/providers/implementations/ciphers/cipher_aes_ocb.h b/providers/implementations/ciphers/cipher_aes_ocb.h
index 370717b436146..b034825603488 100644
--- a/providers/implementations/ciphers/cipher_aes_ocb.h
+++ b/providers/implementations/ciphers/cipher_aes_ocb.h
@@ -11,29 +11,29 @@
 #include "prov/ciphercommon.h"
 #include "crypto/aes_platform.h"
 
-#define OCB_MAX_TAG_LEN     AES_BLOCK_SIZE
-#define OCB_MAX_DATA_LEN    AES_BLOCK_SIZE
-#define OCB_MAX_AAD_LEN     AES_BLOCK_SIZE
+#define OCB_MAX_TAG_LEN AES_BLOCK_SIZE
+#define OCB_MAX_DATA_LEN AES_BLOCK_SIZE
+#define OCB_MAX_AAD_LEN AES_BLOCK_SIZE
 
 typedef struct prov_aes_ocb_ctx_st {
-    PROV_CIPHER_CTX base;       /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         AES_KEY ks;
-    } ksenc;                    /* AES key schedule to use for encryption/aad */
+    } ksenc; /* AES key schedule to use for encryption/aad */
     union {
         OSSL_UNION_ALIGN;
         AES_KEY ks;
-    } ksdec;                    /* AES key schedule to use for decryption */
+    } ksdec; /* AES key schedule to use for decryption */
     OCB128_CONTEXT ocb;
-    unsigned int iv_state;      /* set to one of IV_STATE_XXX */
+    unsigned int iv_state; /* set to one of IV_STATE_XXX */
     unsigned int key_set : 1;
     size_t taglen;
     size_t data_buf_len;
     size_t aad_buf_len;
     unsigned char tag[OCB_MAX_TAG_LEN];
     unsigned char data_buf[OCB_MAX_DATA_LEN]; /* Store partial data blocks */
-    unsigned char aad_buf[OCB_MAX_AAD_LEN];   /* Store partial AAD blocks */
+    unsigned char aad_buf[OCB_MAX_AAD_LEN]; /* Store partial AAD blocks */
 } PROV_AES_OCB_CTX;
 
 const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_ocb(size_t keybits);
diff --git a/providers/implementations/ciphers/cipher_aes_ocb_hw.c b/providers/implementations/ciphers/cipher_aes_ocb_hw.c
index 00920408b9184..e643e1b59682c 100644
--- a/providers/implementations/ciphers/cipher_aes_ocb_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_ocb_hw.c
@@ -15,23 +15,21 @@
 
 #include "cipher_aes_ocb.h"
 
-#define OCB_SET_KEY_FN(fn_set_enc_key, fn_set_dec_key,                         \
-                       fn_block_enc, fn_block_dec,                             \
-                       fn_stream_enc, fn_stream_dec)                           \
-CRYPTO_ocb128_cleanup(&ctx->ocb);                                              \
-fn_set_enc_key(key, keylen * 8, &ctx->ksenc.ks);                               \
-fn_set_dec_key(key, keylen * 8, &ctx->ksdec.ks);                               \
-if (!CRYPTO_ocb128_init(&ctx->ocb, &ctx->ksenc.ks, &ctx->ksdec.ks,             \
-                        (block128_f)fn_block_enc, (block128_f)fn_block_dec,    \
-                        ctx->base.enc ? (ocb128_f)fn_stream_enc :              \
-                                        (ocb128_f)fn_stream_dec))              \
-    return 0;                                                                  \
-ctx->key_set = 1
-
+#define OCB_SET_KEY_FN(fn_set_enc_key, fn_set_dec_key,                          \
+    fn_block_enc, fn_block_dec,                                                 \
+    fn_stream_enc, fn_stream_dec)                                               \
+    CRYPTO_ocb128_cleanup(&ctx->ocb);                                           \
+    fn_set_enc_key(key, keylen * 8, &ctx->ksenc.ks);                            \
+    fn_set_dec_key(key, keylen * 8, &ctx->ksdec.ks);                            \
+    if (!CRYPTO_ocb128_init(&ctx->ocb, &ctx->ksenc.ks, &ctx->ksdec.ks,          \
+            (block128_f)fn_block_enc, (block128_f)fn_block_dec,                 \
+            ctx->base.enc ? (ocb128_f)fn_stream_enc : (ocb128_f)fn_stream_dec)) \
+        return 0;                                                               \
+    ctx->key_set = 1
 
 static int cipher_hw_aes_ocb_generic_initkey(PROV_CIPHER_CTX *vctx,
-                                             const unsigned char *key,
-                                             size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_AES_OCB_CTX *ctx = (PROV_AES_OCB_CTX *)vctx;
 
@@ -39,171 +37,168 @@ static int cipher_hw_aes_ocb_generic_initkey(PROV_CIPHER_CTX *vctx,
  * We set both the encrypt and decrypt key here because decrypt
  * needs both. (i.e- AAD uses encrypt).
  */
-# ifdef HWAES_CAPABLE
+#ifdef HWAES_CAPABLE
     if (HWAES_CAPABLE) {
         OCB_SET_KEY_FN(HWAES_set_encrypt_key, HWAES_set_decrypt_key,
-                       HWAES_encrypt, HWAES_decrypt,
-                       HWAES_ocb_encrypt, HWAES_ocb_decrypt);
+            HWAES_encrypt, HWAES_decrypt,
+            HWAES_ocb_encrypt, HWAES_ocb_decrypt);
     } else
-# endif
-# ifdef VPAES_CAPABLE
-    if (VPAES_CAPABLE) {
+#endif
+#ifdef VPAES_CAPABLE
+        if (VPAES_CAPABLE) {
         OCB_SET_KEY_FN(vpaes_set_encrypt_key, vpaes_set_decrypt_key,
-                       vpaes_encrypt, vpaes_decrypt, NULL, NULL);
+            vpaes_encrypt, vpaes_decrypt, NULL, NULL);
     } else
-# endif
+#endif
     {
         OCB_SET_KEY_FN(AES_set_encrypt_key, AES_set_decrypt_key,
-                       AES_encrypt, AES_decrypt, NULL, NULL);
+            AES_encrypt, AES_decrypt, NULL, NULL);
     }
     return 1;
 }
 
-# if defined(AESNI_CAPABLE)
+#if defined(AESNI_CAPABLE)
 
 static int cipher_hw_aes_ocb_aesni_initkey(PROV_CIPHER_CTX *vctx,
-                                           const unsigned char *key,
-                                           size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_AES_OCB_CTX *ctx = (PROV_AES_OCB_CTX *)vctx;
 
     OCB_SET_KEY_FN(aesni_set_encrypt_key, aesni_set_decrypt_key,
-                   aesni_encrypt, aesni_decrypt,
-                   aesni_ocb_encrypt, aesni_ocb_decrypt);
+        aesni_encrypt, aesni_decrypt,
+        aesni_ocb_encrypt, aesni_ocb_decrypt);
     return 1;
 }
 
-# define PROV_CIPHER_HW_declare()                                              \
-static const PROV_CIPHER_HW aesni_ocb = {                                      \
-    cipher_hw_aes_ocb_aesni_initkey,                                           \
-    NULL                                                                       \
-};
-# define PROV_CIPHER_HW_select()                                               \
-    if (AESNI_CAPABLE)                                                         \
+#define PROV_CIPHER_HW_declare()              \
+    static const PROV_CIPHER_HW aesni_ocb = { \
+        cipher_hw_aes_ocb_aesni_initkey,      \
+        NULL                                  \
+    };
+#define PROV_CIPHER_HW_select() \
+    if (AESNI_CAPABLE)          \
         return &aesni_ocb;
 
 #elif defined(SPARC_AES_CAPABLE)
 
 static int cipher_hw_aes_ocb_t4_initkey(PROV_CIPHER_CTX *vctx,
-                                        const unsigned char *key,
-                                        size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_AES_OCB_CTX *ctx = (PROV_AES_OCB_CTX *)vctx;
 
     OCB_SET_KEY_FN(aes_t4_set_encrypt_key, aes_t4_set_decrypt_key,
-                   aes_t4_encrypt, aes_t4_decrypt, NULL, NULL);
+        aes_t4_encrypt, aes_t4_decrypt, NULL, NULL);
     return 1;
 }
 
-# define PROV_CIPHER_HW_declare()                                              \
-static const PROV_CIPHER_HW aes_t4_ocb = {                                     \
-    cipher_hw_aes_ocb_t4_initkey,                                              \
-    NULL                                                                       \
-};
-# define PROV_CIPHER_HW_select()                                               \
-    if (SPARC_AES_CAPABLE)                                                     \
+#define PROV_CIPHER_HW_declare()               \
+    static const PROV_CIPHER_HW aes_t4_ocb = { \
+        cipher_hw_aes_ocb_t4_initkey,          \
+        NULL                                   \
+    };
+#define PROV_CIPHER_HW_select() \
+    if (SPARC_AES_CAPABLE)      \
         return &aes_t4_ocb;
 
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
 
 static int cipher_hw_aes_ocb_rv64i_zknd_zkne_initkey(PROV_CIPHER_CTX *vctx,
-                                                     const unsigned char *key,
-                                                     size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_AES_OCB_CTX *ctx = (PROV_AES_OCB_CTX *)vctx;
 
     OCB_SET_KEY_FN(rv64i_zkne_set_encrypt_key, rv64i_zknd_set_decrypt_key,
-                   rv64i_zkne_encrypt, rv64i_zknd_decrypt, NULL, NULL);
+        rv64i_zkne_encrypt, rv64i_zknd_decrypt, NULL, NULL);
     return 1;
 }
 
 static int cipher_hw_aes_ocb_rv64i_zvkned_initkey(PROV_CIPHER_CTX *vctx,
-                                                     const unsigned char *key,
-                                                     size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_AES_OCB_CTX *ctx = (PROV_AES_OCB_CTX *)vctx;
 
     /* Zvkned only supports 128 and 256 bit keys. */
     if (keylen * 8 == 128 || keylen * 8 == 256) {
         OCB_SET_KEY_FN(rv64i_zvkned_set_encrypt_key,
-                       rv64i_zvkned_set_decrypt_key,
-                       rv64i_zvkned_encrypt, rv64i_zvkned_decrypt,
-                       NULL, NULL);
+            rv64i_zvkned_set_decrypt_key,
+            rv64i_zvkned_encrypt, rv64i_zvkned_decrypt,
+            NULL, NULL);
     } else {
         OCB_SET_KEY_FN(AES_set_encrypt_key, AES_set_encrypt_key,
-                       rv64i_zvkned_encrypt, rv64i_zvkned_decrypt,
-                       NULL, NULL);
+            rv64i_zvkned_encrypt, rv64i_zvkned_decrypt,
+            NULL, NULL);
     }
     return 1;
 }
 
-# define PROV_CIPHER_HW_declare()                                              \
-static const PROV_CIPHER_HW aes_rv64i_zknd_zkne_ocb = {                        \
-    cipher_hw_aes_ocb_rv64i_zknd_zkne_initkey,                                 \
-    NULL                                                                       \
-};                                                                             \
-static const PROV_CIPHER_HW aes_rv64i_zvkned_ocb = {                           \
-    cipher_hw_aes_ocb_rv64i_zvkned_initkey,                                    \
-    NULL                                                                       \
-};
-# define PROV_CIPHER_HW_select()                                               \
-    if (RISCV_HAS_ZVKNED() && riscv_vlen() >= 128)                             \
-        return &aes_rv64i_zvkned_ocb;                                          \
-    else if (RISCV_HAS_ZKND_AND_ZKNE())                                        \
+#define PROV_CIPHER_HW_declare()                            \
+    static const PROV_CIPHER_HW aes_rv64i_zknd_zkne_ocb = { \
+        cipher_hw_aes_ocb_rv64i_zknd_zkne_initkey,          \
+        NULL                                                \
+    };                                                      \
+    static const PROV_CIPHER_HW aes_rv64i_zvkned_ocb = {    \
+        cipher_hw_aes_ocb_rv64i_zvkned_initkey,             \
+        NULL                                                \
+    };
+#define PROV_CIPHER_HW_select()                    \
+    if (RISCV_HAS_ZVKNED() && riscv_vlen() >= 128) \
+        return &aes_rv64i_zvkned_ocb;              \
+    else if (RISCV_HAS_ZKND_AND_ZKNE())            \
         return &aes_rv64i_zknd_zkne_ocb;
 
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32
 
 static int cipher_hw_aes_ocb_rv32i_zknd_zkne_initkey(PROV_CIPHER_CTX *vctx,
-                                                     const unsigned char *key,
-                                                     size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_AES_OCB_CTX *ctx = (PROV_AES_OCB_CTX *)vctx;
 
     OCB_SET_KEY_FN(rv32i_zkne_set_encrypt_key, rv32i_zknd_zkne_set_decrypt_key,
-                   rv32i_zkne_encrypt, rv32i_zknd_decrypt, NULL, NULL);
+        rv32i_zkne_encrypt, rv32i_zknd_decrypt, NULL, NULL);
     return 1;
 }
 
 static int cipher_hw_aes_ocb_rv32i_zbkb_zknd_zkne_initkey(PROV_CIPHER_CTX *vctx,
-                                                          const unsigned char *key,
-                                                          size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_AES_OCB_CTX *ctx = (PROV_AES_OCB_CTX *)vctx;
 
     OCB_SET_KEY_FN(rv32i_zbkb_zkne_set_encrypt_key, rv32i_zbkb_zknd_zkne_set_decrypt_key,
-                   rv32i_zkne_encrypt, rv32i_zknd_decrypt, NULL, NULL);
+        rv32i_zkne_encrypt, rv32i_zknd_decrypt, NULL, NULL);
     return 1;
 }
 
-# define PROV_CIPHER_HW_declare()                                              \
-static const PROV_CIPHER_HW aes_rv32i_zknd_zkne_ocb = {                        \
-    cipher_hw_aes_ocb_rv32i_zknd_zkne_initkey,                                 \
-    NULL                                                                       \
-};                                                                             \
-static const PROV_CIPHER_HW aes_rv32i_zbkb_zknd_zkne_ocb = {                   \
-    cipher_hw_aes_ocb_rv32i_zbkb_zknd_zkne_initkey,                            \
-    NULL                                                                       \
-};
-# define PROV_CIPHER_HW_select()                                               \
-    if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE())                                    \
-        return &aes_rv32i_zbkb_zknd_zkne_ocb;                                  \
-    if (RISCV_HAS_ZKND_AND_ZKNE())                                             \
+#define PROV_CIPHER_HW_declare()                                 \
+    static const PROV_CIPHER_HW aes_rv32i_zknd_zkne_ocb = {      \
+        cipher_hw_aes_ocb_rv32i_zknd_zkne_initkey,               \
+        NULL                                                     \
+    };                                                           \
+    static const PROV_CIPHER_HW aes_rv32i_zbkb_zknd_zkne_ocb = { \
+        cipher_hw_aes_ocb_rv32i_zbkb_zknd_zkne_initkey,          \
+        NULL                                                     \
+    };
+#define PROV_CIPHER_HW_select()               \
+    if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE())   \
+        return &aes_rv32i_zbkb_zknd_zkne_ocb; \
+    if (RISCV_HAS_ZKND_AND_ZKNE())            \
         return &aes_rv32i_zknd_zkne_ocb;
 #else
-# define PROV_CIPHER_HW_declare()
-# define PROV_CIPHER_HW_select()
-# endif
+#define PROV_CIPHER_HW_declare()
+#define PROV_CIPHER_HW_select()
+#endif
 
 static const PROV_CIPHER_HW aes_generic_ocb = {
     cipher_hw_aes_ocb_generic_initkey,
     NULL
 };
 PROV_CIPHER_HW_declare()
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_ocb(size_t keybits)
+    const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_ocb(size_t keybits)
 {
-    PROV_CIPHER_HW_select()
-    return &aes_generic_ocb;
+    PROV_CIPHER_HW_select() return &aes_generic_ocb;
 }
-
-
diff --git a/providers/implementations/ciphers/cipher_aes_siv.c b/providers/implementations/ciphers/cipher_aes_siv.c
index ccac2bbe9663c..96f26757abe2c 100644
--- a/providers/implementations/ciphers/cipher_aes_siv.c
+++ b/providers/implementations/ciphers/cipher_aes_siv.c
@@ -28,7 +28,7 @@
 static OSSL_FUNC_cipher_set_ctx_params_fn aes_siv_set_ctx_params;
 
 static void *aes_siv_newctx(void *provctx, size_t keybits, unsigned int mode,
-                            uint64_t flags)
+    uint64_t flags)
 {
     PROV_AES_SIV_CTX *ctx;
 
@@ -52,7 +52,7 @@ static void aes_siv_freectx(void *vctx)
 
     if (ctx != NULL) {
         ctx->hw->cleanup(ctx);
-        OPENSSL_clear_free(ctx,  sizeof(*ctx));
+        OPENSSL_clear_free(ctx, sizeof(*ctx));
     }
 }
 
@@ -75,8 +75,8 @@ static void *siv_dupctx(void *vctx)
 }
 
 static int siv_init(void *vctx, const unsigned char *key, size_t keylen,
-                    const unsigned char *iv, size_t ivlen,
-                    const OSSL_PARAM params[], int enc)
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[], int enc)
 {
     PROV_AES_SIV_CTX *ctx = (PROV_AES_SIV_CTX *)vctx;
 
@@ -97,21 +97,21 @@ static int siv_init(void *vctx, const unsigned char *key, size_t keylen,
 }
 
 static int siv_einit(void *vctx, const unsigned char *key, size_t keylen,
-                     const unsigned char *iv, size_t ivlen,
-                     const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return siv_init(vctx, key, keylen, iv, ivlen, params, 1);
 }
 
 static int siv_dinit(void *vctx, const unsigned char *key, size_t keylen,
-                     const unsigned char *iv, size_t ivlen,
-                     const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return siv_init(vctx, key, keylen, iv, ivlen, params, 0);
 }
 
 static int siv_cipher(void *vctx, unsigned char *out, size_t *outl,
-                      size_t outsize, const unsigned char *in, size_t inl)
+    size_t outsize, const unsigned char *in, size_t inl)
 {
     PROV_AES_SIV_CTX *ctx = (PROV_AES_SIV_CTX *)vctx;
 
@@ -132,7 +132,7 @@ static int siv_cipher(void *vctx, unsigned char *out, size_t *outl,
 }
 
 static int siv_stream_final(void *vctx, unsigned char *out, size_t *outl,
-                            size_t outsize)
+    size_t outsize)
 {
     PROV_AES_SIV_CTX *ctx = (PROV_AES_SIV_CTX *)vctx;
 
@@ -182,7 +182,7 @@ static const OSSL_PARAM aes_siv_known_gettable_ctx_params[] = {
     OSSL_PARAM_END
 };
 static const OSSL_PARAM *aes_siv_gettable_ctx_params(ossl_unused void *cctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return aes_siv_known_gettable_ctx_params;
 }
@@ -236,60 +236,60 @@ static const OSSL_PARAM aes_siv_known_settable_ctx_params[] = {
     OSSL_PARAM_END
 };
 static const OSSL_PARAM *aes_siv_settable_ctx_params(ossl_unused void *cctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return aes_siv_known_settable_ctx_params;
 }
 
-#define IMPLEMENT_cipher(alg, lc, UCMODE, flags, kbits, blkbits, ivbits)       \
-static OSSL_FUNC_cipher_newctx_fn alg##kbits##lc##_newctx;                     \
-static OSSL_FUNC_cipher_freectx_fn alg##_##lc##_freectx;                       \
-static OSSL_FUNC_cipher_dupctx_fn lc##_dupctx;                                 \
-static OSSL_FUNC_cipher_encrypt_init_fn lc##_einit;                            \
-static OSSL_FUNC_cipher_decrypt_init_fn lc##_dinit;                            \
-static OSSL_FUNC_cipher_update_fn lc##_stream_update;                          \
-static OSSL_FUNC_cipher_final_fn lc##_stream_final;                            \
-static OSSL_FUNC_cipher_cipher_fn lc##_cipher;                                 \
-static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lc##_get_params;       \
-static OSSL_FUNC_cipher_get_ctx_params_fn alg##_##lc##_get_ctx_params;         \
-static OSSL_FUNC_cipher_gettable_ctx_params_fn                                 \
-            alg##_##lc##_gettable_ctx_params;                                  \
-static OSSL_FUNC_cipher_set_ctx_params_fn alg##_##lc##_set_ctx_params;         \
-static OSSL_FUNC_cipher_settable_ctx_params_fn                                 \
-            alg##_##lc##_settable_ctx_params;                                  \
-static int alg##_##kbits##_##lc##_get_params(OSSL_PARAM params[])              \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
-                                          flags, 2*kbits, blkbits, ivbits);    \
-}                                                                              \
-static void *alg##kbits##lc##_newctx(void *provctx)                            \
-{                                                                              \
-    return alg##_##lc##_newctx(provctx, 2*kbits, EVP_CIPH_##UCMODE##_MODE,     \
-                               flags);                                         \
-}                                                                              \
-const OSSL_DISPATCH ossl_##alg##kbits##lc##_functions[] = {                    \
-    { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))alg##kbits##lc##_newctx },      \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))alg##_##lc##_freectx },        \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void)) lc##_dupctx },                 \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void)) lc##_einit },            \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void)) lc##_dinit },            \
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void)) lc##_stream_update },          \
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void)) lc##_stream_final },            \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void)) lc##_cipher },                 \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-      (void (*)(void)) alg##_##kbits##_##lc##_get_params },                    \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-      (void (*)(void)) alg##_##lc##_get_ctx_params },                          \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void)) alg##_##lc##_gettable_ctx_params },                     \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-      (void (*)(void)) alg##_##lc##_set_ctx_params },                          \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void)) alg##_##lc##_settable_ctx_params },                     \
-    OSSL_DISPATCH_END                                                          \
-};
+#define IMPLEMENT_cipher(alg, lc, UCMODE, flags, kbits, blkbits, ivbits)         \
+    static OSSL_FUNC_cipher_newctx_fn alg##kbits##lc##_newctx;                   \
+    static OSSL_FUNC_cipher_freectx_fn alg##_##lc##_freectx;                     \
+    static OSSL_FUNC_cipher_dupctx_fn lc##_dupctx;                               \
+    static OSSL_FUNC_cipher_encrypt_init_fn lc##_einit;                          \
+    static OSSL_FUNC_cipher_decrypt_init_fn lc##_dinit;                          \
+    static OSSL_FUNC_cipher_update_fn lc##_stream_update;                        \
+    static OSSL_FUNC_cipher_final_fn lc##_stream_final;                          \
+    static OSSL_FUNC_cipher_cipher_fn lc##_cipher;                               \
+    static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lc##_get_params;     \
+    static OSSL_FUNC_cipher_get_ctx_params_fn alg##_##lc##_get_ctx_params;       \
+    static OSSL_FUNC_cipher_gettable_ctx_params_fn                               \
+        alg##_##lc##_gettable_ctx_params;                                        \
+    static OSSL_FUNC_cipher_set_ctx_params_fn alg##_##lc##_set_ctx_params;       \
+    static OSSL_FUNC_cipher_settable_ctx_params_fn                               \
+        alg##_##lc##_settable_ctx_params;                                        \
+    static int alg##_##kbits##_##lc##_get_params(OSSL_PARAM params[])            \
+    {                                                                            \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,  \
+            flags, 2 * kbits, blkbits, ivbits);                                  \
+    }                                                                            \
+    static void *alg##kbits##lc##_newctx(void *provctx)                          \
+    {                                                                            \
+        return alg##_##lc##_newctx(provctx, 2 * kbits, EVP_CIPH_##UCMODE##_MODE, \
+            flags);                                                              \
+    }                                                                            \
+    const OSSL_DISPATCH ossl_##alg##kbits##lc##_functions[] = {                  \
+        { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))alg##kbits##lc##_newctx },    \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))alg##_##lc##_freectx },      \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))lc##_dupctx },                \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))lc##_einit },           \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))lc##_dinit },           \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))lc##_stream_update },         \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))lc##_stream_final },           \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))lc##_cipher },                \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                           \
+            (void (*)(void))alg##_##kbits##_##lc##_get_params },                 \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                      \
+            (void (*)(void))ossl_cipher_generic_gettable_params },               \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                       \
+            (void (*)(void))alg##_##lc##_get_ctx_params },                       \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                  \
+            (void (*)(void))alg##_##lc##_gettable_ctx_params },                  \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                       \
+            (void (*)(void))alg##_##lc##_set_ctx_params },                       \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                  \
+            (void (*)(void))alg##_##lc##_settable_ctx_params },                  \
+        OSSL_DISPATCH_END                                                        \
+    };
 
 IMPLEMENT_cipher(aes, siv, SIV, SIV_FLAGS, 128, 8, 0)
 IMPLEMENT_cipher(aes, siv, SIV, SIV_FLAGS, 192, 8, 0)
diff --git a/providers/implementations/ciphers/cipher_aes_siv.h b/providers/implementations/ciphers/cipher_aes_siv.h
index 4a682b77c4405..28f6668a29a1d 100644
--- a/providers/implementations/ciphers/cipher_aes_siv.h
+++ b/providers/implementations/ciphers/cipher_aes_siv.h
@@ -14,7 +14,7 @@
 typedef struct prov_cipher_hw_aes_siv_st {
     int (*initkey)(void *ctx, const uint8_t *key, size_t keylen);
     int (*cipher)(void *ctx, unsigned char *out, const unsigned char *in,
-                  size_t len);
+        size_t len);
     void (*setspeed)(void *ctx, int speed);
     int (*settag)(void *ctx, const unsigned char *tag, size_t tagl);
     void (*cleanup)(void *ctx);
@@ -22,12 +22,12 @@ typedef struct prov_cipher_hw_aes_siv_st {
 } PROV_CIPHER_HW_AES_SIV;
 
 typedef struct prov_siv_ctx_st {
-    unsigned int mode;       /* The mode that we are using */
-    unsigned int enc : 1;    /* Set to 1 if we are encrypting or 0 otherwise */
-    size_t keylen;           /* The input keylength (twice the alg key length) */
-    size_t taglen;           /* the taglen is the same as the sivlen */
+    unsigned int mode; /* The mode that we are using */
+    unsigned int enc : 1; /* Set to 1 if we are encrypting or 0 otherwise */
+    size_t keylen; /* The input keylength (twice the alg key length) */
+    size_t taglen; /* the taglen is the same as the sivlen */
     SIV128_CONTEXT siv;
-    EVP_CIPHER *ctr;        /* These are fetched - so we need to free them */
+    EVP_CIPHER *ctr; /* These are fetched - so we need to free them */
     EVP_CIPHER *cbc;
     const PROV_CIPHER_HW_AES_SIV *hw;
     OSSL_LIB_CTX *libctx;
diff --git a/providers/implementations/ciphers/cipher_aes_siv_hw.c b/providers/implementations/ciphers/cipher_aes_siv_hw.c
index 75fd54829c4bd..d24124065e192 100644
--- a/providers/implementations/ciphers/cipher_aes_siv_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_siv_hw.c
@@ -21,7 +21,7 @@ static int aes_siv_initkey(void *vctx, const unsigned char *key, size_t keylen)
 {
     PROV_AES_SIV_CTX *ctx = (PROV_AES_SIV_CTX *)vctx;
     SIV128_CONTEXT *sctx = &ctx->siv;
-    size_t klen  = keylen / 2;
+    size_t klen = keylen / 2;
     OSSL_LIB_CTX *libctx = ctx->libctx;
     const char *propq = NULL;
 
@@ -53,7 +53,7 @@ static int aes_siv_initkey(void *vctx, const unsigned char *key, size_t keylen)
      * which should be twice as long
      */
     return ossl_siv128_init(sctx, key, klen, ctx->cbc, ctx->ctr, libctx,
-                              propq);
+        propq);
 }
 
 static int aes_siv_dupctx(void *in_vctx, void *out_vctx)
@@ -105,7 +105,7 @@ static void aes_siv_cleanup(void *vctx)
 }
 
 static int aes_siv_cipher(void *vctx, unsigned char *out,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     PROV_AES_SIV_CTX *ctx = (PROV_AES_SIV_CTX *)vctx;
     SIV128_CONTEXT *sctx = &ctx->siv;
diff --git a/providers/implementations/ciphers/cipher_aes_wrp.c b/providers/implementations/ciphers/cipher_aes_wrp.c
index a3bac9b23d0af..b8e7db39a311d 100644
--- a/providers/implementations/ciphers/cipher_aes_wrp.c
+++ b/providers/implementations/ciphers/cipher_aes_wrp.c
@@ -19,15 +19,15 @@
 #include "prov/implementations.h"
 
 /* AES wrap with padding has IV length of 4, without padding 8 */
-#define AES_WRAP_PAD_IVLEN   4
+#define AES_WRAP_PAD_IVLEN 4
 #define AES_WRAP_NOPAD_IVLEN 8
 
 #define WRAP_FLAGS (PROV_CIPHER_FLAG_CUSTOM_IV)
 #define WRAP_FLAGS_INV (WRAP_FLAGS | PROV_CIPHER_FLAG_INVERSE_CIPHER)
 
 typedef size_t (*aeswrap_fn)(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);
 
 static OSSL_FUNC_cipher_encrypt_init_fn aes_wrap_einit;
 static OSSL_FUNC_cipher_decrypt_init_fn aes_wrap_dinit;
@@ -46,9 +46,8 @@ typedef struct prov_aes_wrap_ctx_st {
 
 } PROV_AES_WRAP_CTX;
 
-
 static void *aes_wrap_newctx(size_t kbits, size_t blkbits,
-                             size_t ivbits, unsigned int mode, uint64_t flags)
+    size_t ivbits, unsigned int mode, uint64_t flags)
 {
     PROV_AES_WRAP_CTX *wctx;
     PROV_CIPHER_CTX *ctx;
@@ -60,7 +59,7 @@ static void *aes_wrap_newctx(size_t kbits, size_t blkbits,
     ctx = (PROV_CIPHER_CTX *)wctx;
     if (ctx != NULL) {
         ossl_cipher_generic_initkey(ctx, kbits, blkbits, ivbits, mode, flags,
-                                    NULL, NULL);
+            NULL, NULL);
         ctx->pad = (ctx->ivlen == AES_WRAP_PAD_IVLEN);
     }
     return wctx;
@@ -80,7 +79,7 @@ static void *aes_wrap_dupctx(void *wctx)
 
     if (dctx != NULL && dctx->base.tlsmac != NULL && dctx->base.alloced) {
         dctx->base.tlsmac = OPENSSL_memdup(dctx->base.tlsmac,
-                                           dctx->base.tlsmacsize);
+            dctx->base.tlsmacsize);
         if (dctx->base.tlsmac == NULL) {
             OPENSSL_free(dctx);
             dctx = NULL;
@@ -94,12 +93,12 @@ static void aes_wrap_freectx(void *vctx)
     PROV_AES_WRAP_CTX *wctx = (PROV_AES_WRAP_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(wctx,  sizeof(*wctx));
+    OPENSSL_clear_free(wctx, sizeof(*wctx));
 }
 
 static int aes_wrap_init(void *vctx, const unsigned char *key,
-                         size_t keylen, const unsigned char *iv,
-                         size_t ivlen, const OSSL_PARAM params[], int enc)
+    size_t keylen, const unsigned char *iv,
+    size_t ivlen, const OSSL_PARAM params[], int enc)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
     PROV_AES_WRAP_CTX *wctx = (PROV_AES_WRAP_CTX *)vctx;
@@ -121,8 +120,8 @@ static int aes_wrap_init(void *vctx, const unsigned char *key,
         int use_forward_transform;
 
         if (keylen != ctx->keylen) {
-           ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
-           return 0;
+            ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
+            return 0;
         }
         /*
          * See SP800-38F : Section 5.1
@@ -149,21 +148,21 @@ static int aes_wrap_init(void *vctx, const unsigned char *key,
 }
 
 static int aes_wrap_einit(void *ctx, const unsigned char *key, size_t keylen,
-                          const unsigned char *iv, size_t ivlen,
-                          const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return aes_wrap_init(ctx, key, keylen, iv, ivlen, params, 1);
 }
 
 static int aes_wrap_dinit(void *ctx, const unsigned char *key, size_t keylen,
-                          const unsigned char *iv, size_t ivlen,
-                          const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return aes_wrap_init(ctx, key, keylen, iv, ivlen, params, 0);
 }
 
 static int aes_wrap_cipher_internal(void *vctx, unsigned char *out,
-                                    const unsigned char *in, size_t inlen)
+    const unsigned char *in, size_t inlen)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
     PROV_AES_WRAP_CTX *wctx = (PROV_AES_WRAP_CTX *)vctx;
@@ -210,7 +209,7 @@ static int aes_wrap_cipher_internal(void *vctx, unsigned char *out,
     }
 
     rv = wctx->wrapfn(&wctx->ks.ks, ctx->iv_set ? ctx->iv : NULL, out, in,
-                      inlen, ctx->block);
+        inlen, ctx->block);
     if (!rv) {
         ERR_raise(ERR_LIB_PROV, PROV_R_CIPHER_OPERATION_FAILED);
         return -1;
@@ -223,7 +222,7 @@ static int aes_wrap_cipher_internal(void *vctx, unsigned char *out,
 }
 
 static int aes_wrap_final(void *vctx, unsigned char *out, size_t *outl,
-                          size_t outsize)
+    size_t outsize)
 {
     if (!ossl_prov_is_running())
         return 0;
@@ -233,8 +232,8 @@ static int aes_wrap_final(void *vctx, unsigned char *out, size_t *outl,
 }
 
 static int aes_wrap_cipher(void *vctx,
-                           unsigned char *out, size_t *outl, size_t outsize,
-                           const unsigned char *in, size_t inl)
+    unsigned char *out, size_t *outl, size_t outsize,
+    const unsigned char *in, size_t inl)
 {
     PROV_AES_WRAP_CTX *ctx = (PROV_AES_WRAP_CTX *)vctx;
     size_t len;
@@ -283,41 +282,41 @@ static int aes_wrap_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     return 1;
 }
 
-#define IMPLEMENT_cipher(mode, fname, UCMODE, flags, kbits, blkbits, ivbits)   \
-    static OSSL_FUNC_cipher_get_params_fn aes_##kbits##_##fname##_get_params;  \
-    static int aes_##kbits##_##fname##_get_params(OSSL_PARAM params[])         \
-    {                                                                          \
-        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,\
-                                              flags, kbits, blkbits, ivbits);  \
-    }                                                                          \
-    static OSSL_FUNC_cipher_newctx_fn aes_##kbits##fname##_newctx;             \
-    static void *aes_##kbits##fname##_newctx(void *provctx)                    \
-    {                                                                          \
-        return aes_##mode##_newctx(kbits, blkbits, ivbits,                     \
-                                   EVP_CIPH_##UCMODE##_MODE, flags);           \
-    }                                                                          \
-    const OSSL_DISPATCH ossl_##aes##kbits##fname##_functions[] = {             \
-        { OSSL_FUNC_CIPHER_NEWCTX,                                             \
-            (void (*)(void))aes_##kbits##fname##_newctx },                     \
-        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_##mode##_einit }, \
-        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))aes_##mode##_dinit }, \
-        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))aes_##mode##_cipher },      \
-        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))aes_##mode##_final },        \
-        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))aes_##mode##_freectx },    \
-        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))aes_##mode##_dupctx },      \
-        { OSSL_FUNC_CIPHER_GET_PARAMS,                                         \
-            (void (*)(void))aes_##kbits##_##fname##_get_params },              \
-        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                    \
-            (void (*)(void))ossl_cipher_generic_gettable_params },             \
-        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                     \
-            (void (*)(void))ossl_cipher_generic_get_ctx_params },              \
-        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                     \
-            (void (*)(void))aes_wrap_set_ctx_params },                         \
-        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                \
-            (void (*)(void))ossl_cipher_generic_gettable_ctx_params },         \
-        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                \
-            (void (*)(void))ossl_cipher_generic_settable_ctx_params },         \
-        OSSL_DISPATCH_END                                                      \
+#define IMPLEMENT_cipher(mode, fname, UCMODE, flags, kbits, blkbits, ivbits)    \
+    static OSSL_FUNC_cipher_get_params_fn aes_##kbits##_##fname##_get_params;   \
+    static int aes_##kbits##_##fname##_get_params(OSSL_PARAM params[])          \
+    {                                                                           \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE, \
+            flags, kbits, blkbits, ivbits);                                     \
+    }                                                                           \
+    static OSSL_FUNC_cipher_newctx_fn aes_##kbits##fname##_newctx;              \
+    static void *aes_##kbits##fname##_newctx(void *provctx)                     \
+    {                                                                           \
+        return aes_##mode##_newctx(kbits, blkbits, ivbits,                      \
+            EVP_CIPH_##UCMODE##_MODE, flags);                                   \
+    }                                                                           \
+    const OSSL_DISPATCH ossl_##aes##kbits##fname##_functions[] = {              \
+        { OSSL_FUNC_CIPHER_NEWCTX,                                              \
+            (void (*)(void))aes_##kbits##fname##_newctx },                      \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_##mode##_einit },  \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))aes_##mode##_dinit },  \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))aes_##mode##_cipher },       \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))aes_##mode##_final },         \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))aes_##mode##_freectx },     \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))aes_##mode##_dupctx },       \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                          \
+            (void (*)(void))aes_##kbits##_##fname##_get_params },               \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                     \
+            (void (*)(void))ossl_cipher_generic_gettable_params },              \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                      \
+            (void (*)(void))ossl_cipher_generic_get_ctx_params },               \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                      \
+            (void (*)(void))aes_wrap_set_ctx_params },                          \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                 \
+            (void (*)(void))ossl_cipher_generic_gettable_ctx_params },          \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                 \
+            (void (*)(void))ossl_cipher_generic_settable_ctx_params },          \
+        OSSL_DISPATCH_END                                                       \
     }
 
 IMPLEMENT_cipher(wrap, wrap, WRAP, WRAP_FLAGS, 256, 64, AES_WRAP_NOPAD_IVLEN * 8);
diff --git a/providers/implementations/ciphers/cipher_aes_xts.c b/providers/implementations/ciphers/cipher_aes_xts.c
index 1e0081da94ec5..e0aeed723ab15 100644
--- a/providers/implementations/ciphers/cipher_aes_xts.c
+++ b/providers/implementations/ciphers/cipher_aes_xts.c
@@ -52,10 +52,10 @@ static OSSL_FUNC_cipher_settable_ctx_params_fn aes_xts_settable_ctx_params;
  *       data with them."
  */
 static int aes_xts_check_keys_differ(const unsigned char *key, size_t bytes,
-                                     int enc)
+    int enc)
 {
     if ((!ossl_aes_xts_allow_insecure_decrypt || enc)
-            && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
+        && CRYPTO_memcmp(key, key + bytes, bytes) == 0) {
         ERR_raise(ERR_LIB_PROV, PROV_R_XTS_DUPLICATED_KEYS);
         return 0;
     }
@@ -63,15 +63,15 @@ static int aes_xts_check_keys_differ(const unsigned char *key, size_t bytes,
 }
 
 #ifdef AES_XTS_S390X
-# include "cipher_aes_xts_s390x.inc"
+#include "cipher_aes_xts_s390x.inc"
 #endif
 
 /*-
  * Provider dispatch functions
  */
 static int aes_xts_init(void *vctx, const unsigned char *key, size_t keylen,
-                        const unsigned char *iv, size_t ivlen,
-                        const OSSL_PARAM params[], int enc)
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[], int enc)
 {
     PROV_AES_XTS_CTX *xctx = (PROV_AES_XTS_CTX *)vctx;
     PROV_CIPHER_CTX *ctx = &xctx->base;
@@ -99,8 +99,8 @@ static int aes_xts_init(void *vctx, const unsigned char *key, size_t keylen,
 }
 
 static int aes_xts_einit(void *vctx, const unsigned char *key, size_t keylen,
-                         const unsigned char *iv, size_t ivlen,
-                         const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
 #ifdef AES_XTS_S390X
     if (s390x_aes_xts_einit(vctx, key, keylen, iv, ivlen, params) == 1)
@@ -110,8 +110,8 @@ static int aes_xts_einit(void *vctx, const unsigned char *key, size_t keylen,
 }
 
 static int aes_xts_dinit(void *vctx, const unsigned char *key, size_t keylen,
-                         const unsigned char *iv, size_t ivlen,
-                         const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
 #ifdef AES_XTS_S390X
     if (s390x_aes_xts_dinit(vctx, key, keylen, iv, ivlen, params) == 1)
@@ -121,7 +121,7 @@ static int aes_xts_dinit(void *vctx, const unsigned char *key, size_t keylen,
 }
 
 static void *aes_xts_newctx(void *provctx, unsigned int mode, uint64_t flags,
-                            size_t kbits, size_t blkbits, size_t ivbits)
+    size_t kbits, size_t blkbits, size_t ivbits)
 {
     PROV_AES_XTS_CTX *ctx;
 
@@ -131,8 +131,8 @@ static void *aes_xts_newctx(void *provctx, unsigned int mode, uint64_t flags,
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx != NULL) {
         ossl_cipher_generic_initkey(&ctx->base, kbits, blkbits, ivbits, mode,
-                                    flags, ossl_prov_cipher_hw_aes_xts(kbits),
-                                    NULL);
+            flags, ossl_prov_cipher_hw_aes_xts(kbits),
+            NULL);
     }
     return ctx;
 }
@@ -142,7 +142,7 @@ static void aes_xts_freectx(void *vctx)
     PROV_AES_XTS_CTX *ctx = (PROV_AES_XTS_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *aes_xts_dupctx(void *vctx)
@@ -174,7 +174,7 @@ static void *aes_xts_dupctx(void *vctx)
 }
 
 static int aes_xts_cipher(void *vctx, unsigned char *out, size_t *outl,
-                          size_t outsize, const unsigned char *in, size_t inl)
+    size_t outsize, const unsigned char *in, size_t inl)
 {
     PROV_AES_XTS_CTX *ctx = (PROV_AES_XTS_CTX *)vctx;
 
@@ -184,12 +184,12 @@ static int aes_xts_cipher(void *vctx, unsigned char *out, size_t *outl,
 #endif
 
     if (!ossl_prov_is_running()
-            || ctx->xts.key1 == NULL
-            || ctx->xts.key2 == NULL
-            || !ctx->base.iv_set
-            || out == NULL
-            || in == NULL
-            || inl < AES_BLOCK_SIZE)
+        || ctx->xts.key1 == NULL
+        || ctx->xts.key2 == NULL
+        || !ctx->base.iv_set
+        || out == NULL
+        || in == NULL
+        || inl < AES_BLOCK_SIZE)
         return 0;
 
     /*
@@ -206,7 +206,7 @@ static int aes_xts_cipher(void *vctx, unsigned char *out, size_t *outl,
     if (ctx->stream != NULL)
         (*ctx->stream)(in, out, inl, ctx->xts.key1, ctx->xts.key2, ctx->base.iv);
     else if (CRYPTO_xts128_encrypt(&ctx->xts, ctx->base.iv, in, out, inl,
-                                   ctx->base.enc))
+                 ctx->base.enc))
         return 0;
 
     *outl = inl;
@@ -214,8 +214,8 @@ static int aes_xts_cipher(void *vctx, unsigned char *out, size_t *outl,
 }
 
 static int aes_xts_stream_update(void *vctx, unsigned char *out, size_t *outl,
-                                 size_t outsize, const unsigned char *in,
-                                 size_t inl)
+    size_t outsize, const unsigned char *in,
+    size_t inl)
 {
     PROV_AES_XTS_CTX *ctx = (PROV_AES_XTS_CTX *)vctx;
 
@@ -233,7 +233,7 @@ static int aes_xts_stream_update(void *vctx, unsigned char *out, size_t *outl,
 }
 
 static int aes_xts_stream_final(void *vctx, unsigned char *out, size_t *outl,
-                                size_t outsize)
+    size_t outsize)
 {
     if (!ossl_prov_is_running())
         return 0;
@@ -247,7 +247,7 @@ static const OSSL_PARAM aes_xts_known_settable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *aes_xts_settable_ctx_params(ossl_unused void *cctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return aes_xts_known_settable_ctx_params;
 }
@@ -276,43 +276,43 @@ static int aes_xts_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     return 1;
 }
 
-#define IMPLEMENT_cipher(lcmode, UCMODE, kbits, flags)                         \
-static OSSL_FUNC_cipher_get_params_fn aes_##kbits##_##lcmode##_get_params;     \
-static int aes_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])            \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
-                                     flags, 2 * kbits, AES_XTS_BLOCK_BITS,     \
-                                     AES_XTS_IV_BITS);                         \
-}                                                                              \
-static OSSL_FUNC_cipher_newctx_fn aes_##kbits##_xts_newctx;                    \
-static void *aes_##kbits##_xts_newctx(void *provctx)                           \
-{                                                                              \
-    return aes_xts_newctx(provctx, EVP_CIPH_##UCMODE##_MODE, flags, 2 * kbits, \
-                          AES_XTS_BLOCK_BITS, AES_XTS_IV_BITS);                \
-}                                                                              \
-const OSSL_DISPATCH ossl_aes##kbits##xts_functions[] = {                       \
-    { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))aes_##kbits##_xts_newctx },     \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_xts_einit },          \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))aes_xts_dinit },          \
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))aes_xts_stream_update },        \
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))aes_xts_stream_final },          \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))aes_xts_cipher },               \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))aes_xts_freectx },             \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))aes_xts_dupctx },               \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-      (void (*)(void))aes_##kbits##_##lcmode##_get_params },                   \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-      (void (*)(void))ossl_cipher_generic_get_ctx_params },                    \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))ossl_cipher_generic_gettable_ctx_params },               \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-      (void (*)(void))aes_xts_set_ctx_params },                                \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-     (void (*)(void))aes_xts_settable_ctx_params },                            \
-    OSSL_DISPATCH_END                                                          \
-}
+#define IMPLEMENT_cipher(lcmode, UCMODE, kbits, flags)                             \
+    static OSSL_FUNC_cipher_get_params_fn aes_##kbits##_##lcmode##_get_params;     \
+    static int aes_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])            \
+    {                                                                              \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
+            flags, 2 * kbits, AES_XTS_BLOCK_BITS,                                  \
+            AES_XTS_IV_BITS);                                                      \
+    }                                                                              \
+    static OSSL_FUNC_cipher_newctx_fn aes_##kbits##_xts_newctx;                    \
+    static void *aes_##kbits##_xts_newctx(void *provctx)                           \
+    {                                                                              \
+        return aes_xts_newctx(provctx, EVP_CIPH_##UCMODE##_MODE, flags, 2 * kbits, \
+            AES_XTS_BLOCK_BITS, AES_XTS_IV_BITS);                                  \
+    }                                                                              \
+    const OSSL_DISPATCH ossl_aes##kbits##xts_functions[] = {                       \
+        { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))aes_##kbits##_xts_newctx },     \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))aes_xts_einit },          \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))aes_xts_dinit },          \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))aes_xts_stream_update },        \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))aes_xts_stream_final },          \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))aes_xts_cipher },               \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))aes_xts_freectx },             \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))aes_xts_dupctx },               \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
+            (void (*)(void))aes_##kbits##_##lcmode##_get_params },                 \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
+            (void (*)(void))ossl_cipher_generic_gettable_params },                 \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
+            (void (*)(void))ossl_cipher_generic_get_ctx_params },                  \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
+            (void (*)(void))ossl_cipher_generic_gettable_ctx_params },             \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
+            (void (*)(void))aes_xts_set_ctx_params },                              \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
+            (void (*)(void))aes_xts_settable_ctx_params },                         \
+        OSSL_DISPATCH_END                                                          \
+    }
 
 IMPLEMENT_cipher(xts, XTS, 256, AES_XTS_FLAGS);
 IMPLEMENT_cipher(xts, XTS, 128, AES_XTS_FLAGS);
diff --git a/providers/implementations/ciphers/cipher_aes_xts.h b/providers/implementations/ciphers/cipher_aes_xts.h
index 56891ca98c426..2ffc143f21f81 100644
--- a/providers/implementations/ciphers/cipher_aes_xts.h
+++ b/providers/implementations/ciphers/cipher_aes_xts.h
@@ -18,9 +18,9 @@
 extern const int ossl_aes_xts_allow_insecure_decrypt;
 
 PROV_CIPHER_FUNC(void, xts_stream,
-                 (const unsigned char *in, unsigned char *out, size_t len,
-                  const AES_KEY *key1, const AES_KEY *key2,
-                  const unsigned char iv[16]));
+    (const unsigned char *in, unsigned char *out, size_t len,
+        const AES_KEY *key1, const AES_KEY *key2,
+        const unsigned char iv[16]));
 
 #if defined(OPENSSL_CPUID_OBJ) && defined(__s390__)
 typedef struct S390X_km_xts_params_st {
@@ -31,11 +31,11 @@ typedef struct S390X_km_xts_params_st {
 #endif
 
 typedef struct prov_aes_xts_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         AES_KEY ks;
-    } ks1, ks2;                /* AES key schedules to use */
+    } ks1, ks2; /* AES key schedules to use */
     XTS128_CONTEXT xts;
     OSSL_xts_stream_fn stream;
 
diff --git a/providers/implementations/ciphers/cipher_aes_xts_hw.c b/providers/implementations/ciphers/cipher_aes_xts_hw.c
index b6353f18456bf..5de5cf5ab790d 100644
--- a/providers/implementations/ciphers/cipher_aes_xts_hw.c
+++ b/providers/implementations/ciphers/cipher_aes_xts_hw.c
@@ -15,29 +15,30 @@
 
 #include "cipher_aes_xts.h"
 
-#define XTS_SET_KEY_FN(fn_set_enc_key, fn_set_dec_key,                         \
-                       fn_block_enc, fn_block_dec,                             \
-                       fn_stream_enc, fn_stream_dec) {                         \
-    size_t bytes = keylen / 2;                                                 \
-    size_t bits = bytes * 8;                                                   \
-                                                                               \
-    if (ctx->enc) {                                                            \
-        fn_set_enc_key(key, bits, &xctx->ks1.ks);                              \
-        xctx->xts.block1 = (block128_f)fn_block_enc;                           \
-    } else {                                                                   \
-        fn_set_dec_key(key, bits, &xctx->ks1.ks);                              \
-        xctx->xts.block1 = (block128_f)fn_block_dec;                           \
-    }                                                                          \
-    fn_set_enc_key(key + bytes, bits, &xctx->ks2.ks);                          \
-    xctx->xts.block2 = (block128_f)fn_block_enc;                               \
-    xctx->xts.key1 = &xctx->ks1;                                               \
-    xctx->xts.key2 = &xctx->ks2;                                               \
-    xctx->stream = ctx->enc ? fn_stream_enc : fn_stream_dec;                   \
-}
+#define XTS_SET_KEY_FN(fn_set_enc_key, fn_set_dec_key,           \
+    fn_block_enc, fn_block_dec,                                  \
+    fn_stream_enc, fn_stream_dec)                                \
+    {                                                            \
+        size_t bytes = keylen / 2;                               \
+        size_t bits = bytes * 8;                                 \
+                                                                 \
+        if (ctx->enc) {                                          \
+            fn_set_enc_key(key, bits, &xctx->ks1.ks);            \
+            xctx->xts.block1 = (block128_f)fn_block_enc;         \
+        } else {                                                 \
+            fn_set_dec_key(key, bits, &xctx->ks1.ks);            \
+            xctx->xts.block1 = (block128_f)fn_block_dec;         \
+        }                                                        \
+        fn_set_enc_key(key + bytes, bits, &xctx->ks2.ks);        \
+        xctx->xts.block2 = (block128_f)fn_block_enc;             \
+        xctx->xts.key1 = &xctx->ks1;                             \
+        xctx->xts.key2 = &xctx->ks2;                             \
+        xctx->stream = ctx->enc ? fn_stream_enc : fn_stream_dec; \
+    }
 
 static int cipher_hw_aes_xts_generic_initkey(PROV_CIPHER_CTX *ctx,
-                                             const unsigned char *key,
-                                             size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_AES_XTS_CTX *xctx = (PROV_AES_XTS_CTX *)ctx;
     OSSL_xts_stream_fn stream_enc = NULL;
@@ -50,29 +51,29 @@ static int cipher_hw_aes_xts_generic_initkey(PROV_CIPHER_CTX *ctx,
 
 #ifdef HWAES_CAPABLE
     if (HWAES_CAPABLE) {
-# ifdef HWAES_xts_encrypt
+#ifdef HWAES_xts_encrypt
         stream_enc = HWAES_xts_encrypt;
-# endif /* HWAES_xts_encrypt */
-# ifdef HWAES_xts_decrypt
+#endif /* HWAES_xts_encrypt */
+#ifdef HWAES_xts_decrypt
         stream_dec = HWAES_xts_decrypt;
-# endif /* HWAES_xts_decrypt */
+#endif /* HWAES_xts_decrypt */
         XTS_SET_KEY_FN(HWAES_set_encrypt_key, HWAES_set_decrypt_key,
-                       HWAES_encrypt, HWAES_decrypt,
-                       stream_enc, stream_dec);
+            HWAES_encrypt, HWAES_decrypt,
+            stream_enc, stream_dec);
         return 1;
     } else
 #endif /* HWAES_CAPABLE */
 
 #ifdef BSAES_CAPABLE
-    if (BSAES_CAPABLE) {
+        if (BSAES_CAPABLE) {
         stream_enc = ossl_bsaes_xts_encrypt;
         stream_dec = ossl_bsaes_xts_decrypt;
     } else
 #endif /* BSAES_CAPABLE */
 #ifdef VPAES_CAPABLE
-    if (VPAES_CAPABLE) {
+        if (VPAES_CAPABLE) {
         XTS_SET_KEY_FN(vpaes_set_encrypt_key, vpaes_set_decrypt_key,
-                       vpaes_encrypt, vpaes_decrypt, stream_enc, stream_dec);
+            vpaes_encrypt, vpaes_decrypt, stream_enc, stream_dec);
         return 1;
     } else
 #endif /* VPAES_CAPABLE */
@@ -81,13 +82,13 @@ static int cipher_hw_aes_xts_generic_initkey(PROV_CIPHER_CTX *ctx,
     }
     {
         XTS_SET_KEY_FN(AES_set_encrypt_key, AES_set_decrypt_key,
-                       AES_encrypt, AES_decrypt, stream_enc, stream_dec);
+            AES_encrypt, AES_decrypt, stream_enc, stream_dec);
     }
     return 1;
 }
 
 static void cipher_hw_aes_xts_copyctx(PROV_CIPHER_CTX *dst,
-                                      const PROV_CIPHER_CTX *src)
+    const PROV_CIPHER_CTX *src)
 {
     PROV_AES_XTS_CTX *sctx = (PROV_AES_XTS_CTX *)src;
     PROV_AES_XTS_CTX *dctx = (PROV_AES_XTS_CTX *)dst;
@@ -100,26 +101,25 @@ static void cipher_hw_aes_xts_copyctx(PROV_CIPHER_CTX *dst,
 #if defined(AESNI_CAPABLE)
 
 static int cipher_hw_aesni_xts_initkey(PROV_CIPHER_CTX *ctx,
-                                       const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     PROV_AES_XTS_CTX *xctx = (PROV_AES_XTS_CTX *)ctx;
 
     void (*aesni_xts_enc)(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_dec)(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]);
 
     aesni_xts_enc = aesni_xts_encrypt;
     aesni_xts_dec = aesni_xts_decrypt;
 
-# 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))
     if (aesni_xts_avx512_eligible()) {
         if (keylen == 64) {
             aesni_xts_enc = aesni_xts_256_encrypt_avx512;
@@ -129,28 +129,28 @@ static int cipher_hw_aesni_xts_initkey(PROV_CIPHER_CTX *ctx,
             aesni_xts_dec = aesni_xts_128_decrypt_avx512;
         }
     }
-# endif
+#endif
 
     XTS_SET_KEY_FN(aesni_set_encrypt_key, aesni_set_decrypt_key,
-                   aesni_encrypt, aesni_decrypt,
-                   aesni_xts_enc, aesni_xts_dec);
+        aesni_encrypt, aesni_decrypt,
+        aesni_xts_enc, aesni_xts_dec);
     return 1;
 }
 
-# define PROV_CIPHER_HW_declare_xts()                                          \
-static const PROV_CIPHER_HW aesni_xts = {                                      \
-    cipher_hw_aesni_xts_initkey,                                               \
-    NULL,                                                                      \
-    cipher_hw_aes_xts_copyctx                                                  \
-};
-# define PROV_CIPHER_HW_select_xts()                                           \
-if (AESNI_CAPABLE)                                                             \
-    return &aesni_xts;
+#define PROV_CIPHER_HW_declare_xts()          \
+    static const PROV_CIPHER_HW aesni_xts = { \
+        cipher_hw_aesni_xts_initkey,          \
+        NULL,                                 \
+        cipher_hw_aes_xts_copyctx             \
+    };
+#define PROV_CIPHER_HW_select_xts() \
+    if (AESNI_CAPABLE)              \
+        return &aesni_xts;
 
-# elif defined(SPARC_AES_CAPABLE)
+#elif defined(SPARC_AES_CAPABLE)
 
 static int cipher_hw_aes_xts_t4_initkey(PROV_CIPHER_CTX *ctx,
-                                        const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     PROV_AES_XTS_CTX *xctx = (PROV_AES_XTS_CTX *)ctx;
     OSSL_xts_stream_fn stream_enc = NULL;
@@ -171,34 +171,34 @@ static int cipher_hw_aes_xts_t4_initkey(PROV_CIPHER_CTX *ctx,
     }
 
     XTS_SET_KEY_FN(aes_t4_set_encrypt_key, aes_t4_set_decrypt_key,
-                   aes_t4_encrypt, aes_t4_decrypt,
-                   stream_enc, stream_dec);
+        aes_t4_encrypt, aes_t4_decrypt,
+        stream_enc, stream_dec);
     return 1;
 }
 
-# define PROV_CIPHER_HW_declare_xts()                                          \
-static const PROV_CIPHER_HW aes_xts_t4 = {                                     \
-    cipher_hw_aes_xts_t4_initkey,                                              \
-    NULL,                                                                      \
-    cipher_hw_aes_xts_copyctx                                                  \
-};
-# define PROV_CIPHER_HW_select_xts()                                           \
-if (SPARC_AES_CAPABLE)                                                         \
-    return &aes_xts_t4;
+#define PROV_CIPHER_HW_declare_xts()           \
+    static const PROV_CIPHER_HW aes_xts_t4 = { \
+        cipher_hw_aes_xts_t4_initkey,          \
+        NULL,                                  \
+        cipher_hw_aes_xts_copyctx              \
+    };
+#define PROV_CIPHER_HW_select_xts() \
+    if (SPARC_AES_CAPABLE)          \
+        return &aes_xts_t4;
 
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
 
 static int cipher_hw_aes_xts_rv64i_zknd_zkne_initkey(PROV_CIPHER_CTX *ctx,
-                                                     const unsigned char *key,
-                                                     size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_AES_XTS_CTX *xctx = (PROV_AES_XTS_CTX *)ctx;
     OSSL_xts_stream_fn stream_enc = NULL;
     OSSL_xts_stream_fn stream_dec = NULL;
 
     XTS_SET_KEY_FN(rv64i_zkne_set_encrypt_key, rv64i_zknd_set_decrypt_key,
-                   rv64i_zkne_encrypt, rv64i_zknd_decrypt,
-                   stream_enc, stream_dec);
+        rv64i_zkne_encrypt, rv64i_zknd_decrypt,
+        stream_enc, stream_dec);
     return 1;
 }
 
@@ -212,21 +212,21 @@ static int cipher_hw_aes_xts_rv64i_zvbb_zvkg_zvkned_initkey(
     /* Zvkned only supports 128 and 256 bit keys. */
     if (keylen * 8 == 128 * 2 || keylen * 8 == 256 * 2) {
         XTS_SET_KEY_FN(rv64i_zvkned_set_encrypt_key,
-                       rv64i_zvkned_set_decrypt_key, rv64i_zvkned_encrypt,
-                       rv64i_zvkned_decrypt,
-                       rv64i_zvbb_zvkg_zvkned_aes_xts_encrypt,
-                       rv64i_zvbb_zvkg_zvkned_aes_xts_decrypt);
+            rv64i_zvkned_set_decrypt_key, rv64i_zvkned_encrypt,
+            rv64i_zvkned_decrypt,
+            rv64i_zvbb_zvkg_zvkned_aes_xts_encrypt,
+            rv64i_zvbb_zvkg_zvkned_aes_xts_decrypt);
     } else {
         XTS_SET_KEY_FN(AES_set_encrypt_key, AES_set_encrypt_key,
-                       rv64i_zvkned_encrypt, rv64i_zvkned_decrypt,
-                       stream_enc, stream_dec);
+            rv64i_zvkned_encrypt, rv64i_zvkned_decrypt,
+            stream_enc, stream_dec);
     }
     return 1;
 }
 
 static int cipher_hw_aes_xts_rv64i_zvkned_initkey(PROV_CIPHER_CTX *ctx,
-                                                  const unsigned char *key,
-                                                  size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_AES_XTS_CTX *xctx = (PROV_AES_XTS_CTX *)ctx;
     OSSL_xts_stream_fn stream_enc = NULL;
@@ -235,89 +235,88 @@ static int cipher_hw_aes_xts_rv64i_zvkned_initkey(PROV_CIPHER_CTX *ctx,
     /* Zvkned only supports 128 and 256 bit keys. */
     if (keylen * 8 == 128 * 2 || keylen * 8 == 256 * 2) {
         XTS_SET_KEY_FN(rv64i_zvkned_set_encrypt_key,
-                       rv64i_zvkned_set_decrypt_key,
-                       rv64i_zvkned_encrypt, rv64i_zvkned_decrypt,
-                       stream_enc, stream_dec);
+            rv64i_zvkned_set_decrypt_key,
+            rv64i_zvkned_encrypt, rv64i_zvkned_decrypt,
+            stream_enc, stream_dec);
     } else {
         XTS_SET_KEY_FN(AES_set_encrypt_key, AES_set_encrypt_key,
-                       rv64i_zvkned_encrypt, rv64i_zvkned_decrypt,
-                       stream_enc, stream_dec);
+            rv64i_zvkned_encrypt, rv64i_zvkned_decrypt,
+            stream_enc, stream_dec);
     }
     return 1;
 }
 
-# define PROV_CIPHER_HW_declare_xts()                                          \
-static const PROV_CIPHER_HW aes_xts_rv64i_zknd_zkne = {                        \
-    cipher_hw_aes_xts_rv64i_zknd_zkne_initkey,                                 \
-    NULL,                                                                      \
-    cipher_hw_aes_xts_copyctx                                                  \
-};                                                                             \
-static const PROV_CIPHER_HW aes_xts_rv64i_zvkned = {                           \
-    cipher_hw_aes_xts_rv64i_zvkned_initkey,                                    \
-    NULL,                                                                      \
-    cipher_hw_aes_xts_copyctx                                                  \
-};                                                                             \
-static const PROV_CIPHER_HW aes_xts_rv64i_zvbb_zvkg_zvkned = {                 \
-    cipher_hw_aes_xts_rv64i_zvbb_zvkg_zvkned_initkey,                          \
-    NULL,                                                                      \
-    cipher_hw_aes_xts_copyctx                                                  \
-};
-
-# define PROV_CIPHER_HW_select_xts()                                           \
-if (RISCV_HAS_ZVBB() && RISCV_HAS_ZVKG() && RISCV_HAS_ZVKNED() &&              \
-    riscv_vlen() >= 128)                                                       \
-    return &aes_xts_rv64i_zvbb_zvkg_zvkned;                                    \
-if (RISCV_HAS_ZVKNED() && riscv_vlen() >= 128)                                 \
-    return &aes_xts_rv64i_zvkned;                                              \
-else if (RISCV_HAS_ZKND_AND_ZKNE())                                            \
-    return &aes_xts_rv64i_zknd_zkne;
+#define PROV_CIPHER_HW_declare_xts()                               \
+    static const PROV_CIPHER_HW aes_xts_rv64i_zknd_zkne = {        \
+        cipher_hw_aes_xts_rv64i_zknd_zkne_initkey,                 \
+        NULL,                                                      \
+        cipher_hw_aes_xts_copyctx                                  \
+    };                                                             \
+    static const PROV_CIPHER_HW aes_xts_rv64i_zvkned = {           \
+        cipher_hw_aes_xts_rv64i_zvkned_initkey,                    \
+        NULL,                                                      \
+        cipher_hw_aes_xts_copyctx                                  \
+    };                                                             \
+    static const PROV_CIPHER_HW aes_xts_rv64i_zvbb_zvkg_zvkned = { \
+        cipher_hw_aes_xts_rv64i_zvbb_zvkg_zvkned_initkey,          \
+        NULL,                                                      \
+        cipher_hw_aes_xts_copyctx                                  \
+    };
+
+#define PROV_CIPHER_HW_select_xts()                                                        \
+    if (RISCV_HAS_ZVBB() && RISCV_HAS_ZVKG() && RISCV_HAS_ZVKNED() && riscv_vlen() >= 128) \
+        return &aes_xts_rv64i_zvbb_zvkg_zvkned;                                            \
+    if (RISCV_HAS_ZVKNED() && riscv_vlen() >= 128)                                         \
+        return &aes_xts_rv64i_zvkned;                                                      \
+    else if (RISCV_HAS_ZKND_AND_ZKNE())                                                    \
+        return &aes_xts_rv64i_zknd_zkne;
 
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32
 
 static int cipher_hw_aes_xts_rv32i_zknd_zkne_initkey(PROV_CIPHER_CTX *ctx,
-                                                     const unsigned char *key,
-                                                     size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_AES_XTS_CTX *xctx = (PROV_AES_XTS_CTX *)ctx;
 
     XTS_SET_KEY_FN(rv32i_zkne_set_encrypt_key, rv32i_zknd_zkne_set_decrypt_key,
-                   rv32i_zkne_encrypt, rv32i_zknd_decrypt,
-                   NULL, NULL);
+        rv32i_zkne_encrypt, rv32i_zknd_decrypt,
+        NULL, NULL);
     return 1;
 }
 
 static int cipher_hw_aes_xts_rv32i_zbkb_zknd_zkne_initkey(PROV_CIPHER_CTX *ctx,
-                                                         const unsigned char *key,
-                                                         size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_AES_XTS_CTX *xctx = (PROV_AES_XTS_CTX *)ctx;
 
     XTS_SET_KEY_FN(rv32i_zbkb_zkne_set_encrypt_key, rv32i_zbkb_zknd_zkne_set_decrypt_key,
-                   rv32i_zkne_encrypt, rv32i_zknd_decrypt,
-                   NULL, NULL);
+        rv32i_zkne_encrypt, rv32i_zknd_decrypt,
+        NULL, NULL);
     return 1;
 }
 
-# define PROV_CIPHER_HW_declare_xts()                                          \
-static const PROV_CIPHER_HW aes_xts_rv32i_zknd_zkne = {                        \
-    cipher_hw_aes_xts_rv32i_zknd_zkne_initkey,                                 \
-    NULL,                                                                      \
-    cipher_hw_aes_xts_copyctx                                                  \
-};                                                                             \
-static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = {                   \
-    cipher_hw_aes_xts_rv32i_zbkb_zknd_zkne_initkey,                            \
-    NULL,                                                                      \
-    cipher_hw_aes_xts_copyctx                                                  \
-};
-# define PROV_CIPHER_HW_select_xts()                                           \
-if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE())                                        \
-    return &aes_xts_rv32i_zbkb_zknd_zkne;                                      \
-if (RISCV_HAS_ZKND_AND_ZKNE())                                                 \
-    return &aes_xts_rv32i_zknd_zkne;
-# else
+#define PROV_CIPHER_HW_declare_xts()                             \
+    static const PROV_CIPHER_HW aes_xts_rv32i_zknd_zkne = {      \
+        cipher_hw_aes_xts_rv32i_zknd_zkne_initkey,               \
+        NULL,                                                    \
+        cipher_hw_aes_xts_copyctx                                \
+    };                                                           \
+    static const PROV_CIPHER_HW aes_xts_rv32i_zbkb_zknd_zkne = { \
+        cipher_hw_aes_xts_rv32i_zbkb_zknd_zkne_initkey,          \
+        NULL,                                                    \
+        cipher_hw_aes_xts_copyctx                                \
+    };
+#define PROV_CIPHER_HW_select_xts()           \
+    if (RISCV_HAS_ZBKB_AND_ZKND_AND_ZKNE())   \
+        return &aes_xts_rv32i_zbkb_zknd_zkne; \
+    if (RISCV_HAS_ZKND_AND_ZKNE())            \
+        return &aes_xts_rv32i_zknd_zkne;
+#else
 /* The generic case */
-# define PROV_CIPHER_HW_declare_xts()
-# define PROV_CIPHER_HW_select_xts()
+#define PROV_CIPHER_HW_declare_xts()
+#define PROV_CIPHER_HW_select_xts()
 #endif
 
 static const PROV_CIPHER_HW aes_generic_xts = {
@@ -326,8 +325,7 @@ static const PROV_CIPHER_HW aes_generic_xts = {
     cipher_hw_aes_xts_copyctx
 };
 PROV_CIPHER_HW_declare_xts()
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_xts(size_t keybits)
+    const PROV_CIPHER_HW *ossl_prov_cipher_hw_aes_xts(size_t keybits)
 {
-    PROV_CIPHER_HW_select_xts()
-    return &aes_generic_xts;
+    PROV_CIPHER_HW_select_xts() return &aes_generic_xts;
 }
diff --git a/providers/implementations/ciphers/cipher_aria.c b/providers/implementations/ciphers/cipher_aria.c
index ce4938d44a9ab..a650fec5c4300 100644
--- a/providers/implementations/ciphers/cipher_aria.c
+++ b/providers/implementations/ciphers/cipher_aria.c
@@ -21,7 +21,7 @@ static void aria_freectx(void *vctx)
     PROV_ARIA_CTX *ctx = (PROV_ARIA_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *aria_dupctx(void *ctx)
@@ -59,11 +59,11 @@ IMPLEMENT_generic_cipher(aria, ARIA, ofb, OFB, 0, 192, 8, 128, stream)
 /* ossl_aria128ofb_functions */
 IMPLEMENT_generic_cipher(aria, ARIA, ofb, OFB, 0, 128, 8, 128, stream)
 /* ossl_aria256cfb_functions */
-IMPLEMENT_generic_cipher(aria, ARIA, cfb,  CFB, 0, 256, 8, 128, stream)
+IMPLEMENT_generic_cipher(aria, ARIA, cfb, CFB, 0, 256, 8, 128, stream)
 /* ossl_aria192cfb_functions */
-IMPLEMENT_generic_cipher(aria, ARIA, cfb,  CFB, 0, 192, 8, 128, stream)
+IMPLEMENT_generic_cipher(aria, ARIA, cfb, CFB, 0, 192, 8, 128, stream)
 /* ossl_aria128cfb_functions */
-IMPLEMENT_generic_cipher(aria, ARIA, cfb,  CFB, 0, 128, 8, 128, stream)
+IMPLEMENT_generic_cipher(aria, ARIA, cfb, CFB, 0, 128, 8, 128, stream)
 /* ossl_aria256cfb1_functions */
 IMPLEMENT_generic_cipher(aria, ARIA, cfb1, CFB, 0, 256, 8, 128, stream)
 /* ossl_aria192cfb1_functions */
diff --git a/providers/implementations/ciphers/cipher_aria.h b/providers/implementations/ciphers/cipher_aria.h
index 39f84d3b43219..563262aee8b44 100644
--- a/providers/implementations/ciphers/cipher_aria.h
+++ b/providers/implementations/ciphers/cipher_aria.h
@@ -11,14 +11,13 @@
 #include "prov/ciphercommon.h"
 
 typedef struct prov_aria_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         ARIA_KEY ks;
     } ks;
 } PROV_ARIA_CTX;
 
-
 #define ossl_prov_cipher_hw_aria_ofb ossl_prov_cipher_hw_aria_ofb128
 #define ossl_prov_cipher_hw_aria_cfb ossl_prov_cipher_hw_aria_cfb128
 const PROV_CIPHER_HW *ossl_prov_cipher_hw_aria_ecb(size_t keybits);
diff --git a/providers/implementations/ciphers/cipher_aria_ccm.c b/providers/implementations/ciphers/cipher_aria_ccm.c
index 0a0f52cdcc1b0..3d6b2b50ed2e6 100644
--- a/providers/implementations/ciphers/cipher_aria_ccm.c
+++ b/providers/implementations/ciphers/cipher_aria_ccm.c
@@ -47,7 +47,7 @@ static void aria_ccm_freectx(void *vctx)
 {
     PROV_ARIA_CCM_CTX *ctx = (PROV_ARIA_CCM_CTX *)vctx;
 
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 /* aria128ccm functions */
@@ -56,4 +56,3 @@ IMPLEMENT_aead_cipher(aria, ccm, CCM, AEAD_FLAGS, 128, 8, 96);
 IMPLEMENT_aead_cipher(aria, ccm, CCM, AEAD_FLAGS, 192, 8, 96);
 /* aria256ccm functions */
 IMPLEMENT_aead_cipher(aria, ccm, CCM, AEAD_FLAGS, 256, 8, 96);
-
diff --git a/providers/implementations/ciphers/cipher_aria_ccm.h b/providers/implementations/ciphers/cipher_aria_ccm.h
index 558da4973fa27..7de71e7c00140 100644
--- a/providers/implementations/ciphers/cipher_aria_ccm.h
+++ b/providers/implementations/ciphers/cipher_aria_ccm.h
@@ -16,7 +16,7 @@ typedef struct prov_aria_ccm_ctx_st {
     union {
         OSSL_UNION_ALIGN;
         ARIA_KEY ks;
-    } ks;                       /* ARIA key schedule to use */
+    } ks; /* ARIA key schedule to use */
 } PROV_ARIA_CCM_CTX;
 
 const PROV_CCM_HW *ossl_prov_aria_hw_ccm(size_t keylen);
diff --git a/providers/implementations/ciphers/cipher_aria_ccm_hw.c b/providers/implementations/ciphers/cipher_aria_ccm_hw.c
index e56ec8fb0865c..6c5a420305751 100644
--- a/providers/implementations/ciphers/cipher_aria_ccm_hw.c
+++ b/providers/implementations/ciphers/cipher_aria_ccm_hw.c
@@ -14,13 +14,13 @@
 #include "cipher_aria_ccm.h"
 
 static int ccm_aria_initkey(PROV_CCM_CTX *ctx,
-                            const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     PROV_ARIA_CCM_CTX *actx = (PROV_ARIA_CCM_CTX *)ctx;
 
     ossl_aria_set_encrypt_key(key, keylen * 8, &actx->ks.ks);
     CRYPTO_ccm128_init(&ctx->ccm_ctx, ctx->m, ctx->l, &actx->ks.ks,
-                       (block128_f)ossl_aria_encrypt);
+        (block128_f)ossl_aria_encrypt);
     ctx->str = NULL;
     ctx->key_set = 1;
     return 1;
diff --git a/providers/implementations/ciphers/cipher_aria_gcm.c b/providers/implementations/ciphers/cipher_aria_gcm.c
index e794a80a00a49..507a3577abdac 100644
--- a/providers/implementations/ciphers/cipher_aria_gcm.c
+++ b/providers/implementations/ciphers/cipher_aria_gcm.c
@@ -23,7 +23,7 @@ static void *aria_gcm_newctx(void *provctx, size_t keybits)
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx != NULL)
         ossl_gcm_initctx(provctx, &ctx->base, keybits,
-                         ossl_prov_aria_hw_gcm(keybits));
+            ossl_prov_aria_hw_gcm(keybits));
     return ctx;
 }
 
@@ -35,7 +35,7 @@ static void *aria_gcm_dupctx(void *provctx)
     if (ctx == NULL)
         return NULL;
 
-    dctx =  OPENSSL_memdup(ctx, sizeof(*ctx));
+    dctx = OPENSSL_memdup(ctx, sizeof(*ctx));
     if (dctx != NULL && dctx->base.gcm.key != NULL)
         dctx->base.gcm.key = &dctx->ks.ks;
 
@@ -47,7 +47,7 @@ static void aria_gcm_freectx(void *vctx)
 {
     PROV_ARIA_GCM_CTX *ctx = (PROV_ARIA_GCM_CTX *)vctx;
 
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 /* ossl_aria128gcm_functions */
@@ -56,4 +56,3 @@ IMPLEMENT_aead_cipher(aria, gcm, GCM, AEAD_FLAGS, 128, 8, 96);
 IMPLEMENT_aead_cipher(aria, gcm, GCM, AEAD_FLAGS, 192, 8, 96);
 /* ossl_aria256gcm_functions */
 IMPLEMENT_aead_cipher(aria, gcm, GCM, AEAD_FLAGS, 256, 8, 96);
-
diff --git a/providers/implementations/ciphers/cipher_aria_gcm.h b/providers/implementations/ciphers/cipher_aria_gcm.h
index 6251e8322f366..622053a5594de 100644
--- a/providers/implementations/ciphers/cipher_aria_gcm.h
+++ b/providers/implementations/ciphers/cipher_aria_gcm.h
@@ -12,7 +12,7 @@
 #include "prov/ciphercommon_gcm.h"
 
 typedef struct prov_aria_gcm_ctx_st {
-    PROV_GCM_CTX base;              /* must be first entry in struct */
+    PROV_GCM_CTX base; /* must be first entry in struct */
     union {
         OSSL_UNION_ALIGN;
         ARIA_KEY ks;
diff --git a/providers/implementations/ciphers/cipher_aria_gcm_hw.c b/providers/implementations/ciphers/cipher_aria_gcm_hw.c
index 927327c29c779..f4c8646103f0a 100644
--- a/providers/implementations/ciphers/cipher_aria_gcm_hw.c
+++ b/providers/implementations/ciphers/cipher_aria_gcm_hw.c
@@ -14,7 +14,7 @@
 #include "cipher_aria_gcm.h"
 
 static int aria_gcm_initkey(PROV_GCM_CTX *ctx, const unsigned char *key,
-                            size_t keylen)
+    size_t keylen)
 {
     PROV_ARIA_GCM_CTX *actx = (PROV_ARIA_GCM_CTX *)ctx;
     ARIA_KEY *ks = &actx->ks.ks;
diff --git a/providers/implementations/ciphers/cipher_aria_hw.c b/providers/implementations/ciphers/cipher_aria_hw.c
index 425d87a65eca8..12ba59a46a27e 100644
--- a/providers/implementations/ciphers/cipher_aria_hw.c
+++ b/providers/implementations/ciphers/cipher_aria_hw.c
@@ -11,7 +11,7 @@
 #include "cipher_aria.h"
 
 static int cipher_hw_aria_initkey(PROV_CIPHER_CTX *dat,
-                                  const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     int ret, mode = dat->mode;
     PROV_ARIA_CTX *adat = (PROV_ARIA_CTX *)dat;
@@ -32,21 +32,21 @@ static int cipher_hw_aria_initkey(PROV_CIPHER_CTX *dat,
 
 IMPLEMENT_CIPHER_HW_COPYCTX(cipher_hw_aria_copyctx, PROV_ARIA_CTX)
 
-# define PROV_CIPHER_HW_aria_mode(mode)                                        \
-static const PROV_CIPHER_HW aria_##mode = {                                    \
-    cipher_hw_aria_initkey,                                                    \
-    ossl_cipher_hw_chunked_##mode,                                             \
-    cipher_hw_aria_copyctx                                                     \
-};                                                                             \
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_aria_##mode(size_t keybits)          \
-{                                                                              \
-    return &aria_##mode;                                                       \
-}
+#define PROV_CIPHER_HW_aria_mode(mode)                                    \
+    static const PROV_CIPHER_HW aria_##mode = {                           \
+        cipher_hw_aria_initkey,                                           \
+        ossl_cipher_hw_chunked_##mode,                                    \
+        cipher_hw_aria_copyctx                                            \
+    };                                                                    \
+    const PROV_CIPHER_HW *ossl_prov_cipher_hw_aria_##mode(size_t keybits) \
+    {                                                                     \
+        return &aria_##mode;                                              \
+    }
 
 PROV_CIPHER_HW_aria_mode(cbc)
-PROV_CIPHER_HW_aria_mode(ecb)
-PROV_CIPHER_HW_aria_mode(ofb128)
-PROV_CIPHER_HW_aria_mode(cfb128)
-PROV_CIPHER_HW_aria_mode(cfb1)
-PROV_CIPHER_HW_aria_mode(cfb8)
-PROV_CIPHER_HW_aria_mode(ctr)
+    PROV_CIPHER_HW_aria_mode(ecb)
+        PROV_CIPHER_HW_aria_mode(ofb128)
+            PROV_CIPHER_HW_aria_mode(cfb128)
+                PROV_CIPHER_HW_aria_mode(cfb1)
+                    PROV_CIPHER_HW_aria_mode(cfb8)
+                        PROV_CIPHER_HW_aria_mode(ctr)
diff --git a/providers/implementations/ciphers/cipher_blowfish.c b/providers/implementations/ciphers/cipher_blowfish.c
index 9f17f1200dfdd..ccda78cea725e 100644
--- a/providers/implementations/ciphers/cipher_blowfish.c
+++ b/providers/implementations/ciphers/cipher_blowfish.c
@@ -29,7 +29,7 @@ static void blowfish_freectx(void *vctx)
     PROV_BLOWFISH_CTX *ctx = (PROV_BLOWFISH_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *blowfish_dupctx(void *ctx)
@@ -55,4 +55,4 @@ IMPLEMENT_var_keylen_cipher(blowfish, BLOWFISH, cbc, CBC, BF_FLAGS, 128, 64, 64,
 /* bf_ofb_functions */
 IMPLEMENT_var_keylen_cipher(blowfish, BLOWFISH, ofb64, OFB, BF_FLAGS, 128, 8, 64, stream)
 /* bf_cfb_functions */
-IMPLEMENT_var_keylen_cipher(blowfish, BLOWFISH, cfb64,  CFB, BF_FLAGS, 128, 8, 64, stream)
+IMPLEMENT_var_keylen_cipher(blowfish, BLOWFISH, cfb64, CFB, BF_FLAGS, 128, 8, 64, stream)
diff --git a/providers/implementations/ciphers/cipher_blowfish.h b/providers/implementations/ciphers/cipher_blowfish.h
index bbdc9da3789d2..18c824fed1e3e 100644
--- a/providers/implementations/ciphers/cipher_blowfish.h
+++ b/providers/implementations/ciphers/cipher_blowfish.h
@@ -11,7 +11,7 @@
 #include "prov/ciphercommon.h"
 
 typedef struct prov_blowfish_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         BF_KEY ks;
diff --git a/providers/implementations/ciphers/cipher_blowfish_hw.c b/providers/implementations/ciphers/cipher_blowfish_hw.c
index 4855a71f68714..5cbc4886fa464 100644
--- a/providers/implementations/ciphers/cipher_blowfish_hw.c
+++ b/providers/implementations/ciphers/cipher_blowfish_hw.c
@@ -16,27 +16,27 @@
 #include "cipher_blowfish.h"
 
 static int cipher_hw_blowfish_initkey(PROV_CIPHER_CTX *ctx,
-                                      const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
-    PROV_BLOWFISH_CTX *bctx =  (PROV_BLOWFISH_CTX *)ctx;
+    PROV_BLOWFISH_CTX *bctx = (PROV_BLOWFISH_CTX *)ctx;
 
     BF_set_key(&bctx->ks.ks, keylen, key);
     return 1;
 }
 
-# define PROV_CIPHER_HW_blowfish_mode(mode, UCMODE)                            \
-IMPLEMENT_CIPHER_HW_##UCMODE(mode, blowfish, PROV_BLOWFISH_CTX, BF_KEY,        \
-                             BF_##mode)                                        \
-static const PROV_CIPHER_HW bf_##mode = {                                      \
-    cipher_hw_blowfish_initkey,                                                \
-    cipher_hw_blowfish_##mode##_cipher                                         \
-};                                                                             \
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_blowfish_##mode(size_t keybits)      \
-{                                                                              \
-    return &bf_##mode;                                                         \
-}
+#define PROV_CIPHER_HW_blowfish_mode(mode, UCMODE)                            \
+    IMPLEMENT_CIPHER_HW_##UCMODE(mode, blowfish, PROV_BLOWFISH_CTX, BF_KEY,   \
+        BF_##mode) static const PROV_CIPHER_HW bf_##mode                      \
+        = {                                                                   \
+              cipher_hw_blowfish_initkey,                                     \
+              cipher_hw_blowfish_##mode##_cipher                              \
+          };                                                                  \
+    const PROV_CIPHER_HW *ossl_prov_cipher_hw_blowfish_##mode(size_t keybits) \
+    {                                                                         \
+        return &bf_##mode;                                                    \
+    }
 
 PROV_CIPHER_HW_blowfish_mode(cbc, CBC)
-PROV_CIPHER_HW_blowfish_mode(ecb, ECB)
-PROV_CIPHER_HW_blowfish_mode(ofb64, OFB)
-PROV_CIPHER_HW_blowfish_mode(cfb64, CFB)
+    PROV_CIPHER_HW_blowfish_mode(ecb, ECB)
+        PROV_CIPHER_HW_blowfish_mode(ofb64, OFB)
+            PROV_CIPHER_HW_blowfish_mode(cfb64, CFB)
diff --git a/providers/implementations/ciphers/cipher_camellia.c b/providers/implementations/ciphers/cipher_camellia.c
index c550af3f83304..0d4bab73c8cee 100644
--- a/providers/implementations/ciphers/cipher_camellia.c
+++ b/providers/implementations/ciphers/cipher_camellia.c
@@ -27,7 +27,7 @@ static void camellia_freectx(void *vctx)
     PROV_CAMELLIA_CTX *ctx = (PROV_CAMELLIA_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *camellia_dupctx(void *ctx)
@@ -65,11 +65,11 @@ IMPLEMENT_generic_cipher(camellia, CAMELLIA, ofb, OFB, 0, 192, 8, 128, stream)
 /* ossl_camellia128ofb_functions */
 IMPLEMENT_generic_cipher(camellia, CAMELLIA, ofb, OFB, 0, 128, 8, 128, stream)
 /* ossl_camellia256cfb_functions */
-IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb,  CFB, 0, 256, 8, 128, stream)
+IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb, CFB, 0, 256, 8, 128, stream)
 /* ossl_camellia192cfb_functions */
-IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb,  CFB, 0, 192, 8, 128, stream)
+IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb, CFB, 0, 192, 8, 128, stream)
 /* ossl_camellia128cfb_functions */
-IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb,  CFB, 0, 128, 8, 128, stream)
+IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb, CFB, 0, 128, 8, 128, stream)
 /* ossl_camellia256cfb1_functions */
 IMPLEMENT_generic_cipher(camellia, CAMELLIA, cfb1, CFB, 0, 256, 8, 128, stream)
 /* ossl_camellia192cfb1_functions */
diff --git a/providers/implementations/ciphers/cipher_camellia.h b/providers/implementations/ciphers/cipher_camellia.h
index 953ea74c0b5d2..2c1156ae92da2 100644
--- a/providers/implementations/ciphers/cipher_camellia.h
+++ b/providers/implementations/ciphers/cipher_camellia.h
@@ -12,7 +12,7 @@
 #include "crypto/cmll_platform.h"
 
 typedef struct prov_camellia_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         CAMELLIA_KEY ks;
diff --git a/providers/implementations/ciphers/cipher_camellia_hw.c b/providers/implementations/ciphers/cipher_camellia_hw.c
index 3ebf5b8d46128..652cdf9d4a97f 100644
--- a/providers/implementations/ciphers/cipher_camellia_hw.c
+++ b/providers/implementations/ciphers/cipher_camellia_hw.c
@@ -18,7 +18,7 @@
 #include "cipher_camellia.h"
 
 static int cipher_hw_camellia_initkey(PROV_CIPHER_CTX *dat,
-                                      const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     int ret, mode = dat->mode;
     PROV_CAMELLIA_CTX *adat = (PROV_CAMELLIA_CTX *)dat;
@@ -31,44 +31,42 @@ static int cipher_hw_camellia_initkey(PROV_CIPHER_CTX *dat,
         return 0;
     }
     if (dat->enc || (mode != EVP_CIPH_ECB_MODE && mode != EVP_CIPH_CBC_MODE)) {
-        dat->block = (block128_f) Camellia_encrypt;
-        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-            (cbc128_f) Camellia_cbc_encrypt : NULL;
+        dat->block = (block128_f)Camellia_encrypt;
+        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)Camellia_cbc_encrypt : NULL;
     } else {
-        dat->block = (block128_f) Camellia_decrypt;
-        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
-            (cbc128_f) Camellia_cbc_encrypt : NULL;
+        dat->block = (block128_f)Camellia_decrypt;
+        dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? (cbc128_f)Camellia_cbc_encrypt : NULL;
     }
     return 1;
 }
 
 IMPLEMENT_CIPHER_HW_COPYCTX(cipher_hw_camellia_copyctx, PROV_CAMELLIA_CTX)
 
-# if defined(SPARC_CMLL_CAPABLE)
-#  include "cipher_camellia_hw_t4.inc"
-# else
+#if defined(SPARC_CMLL_CAPABLE)
+#include "cipher_camellia_hw_t4.inc"
+#else
 /* The generic case */
-#  define PROV_CIPHER_HW_declare(mode)
-#  define PROV_CIPHER_HW_select(mode)
-# endif /* SPARC_CMLL_CAPABLE */
+#define PROV_CIPHER_HW_declare(mode)
+#define PROV_CIPHER_HW_select(mode)
+#endif /* SPARC_CMLL_CAPABLE */
 
-#define PROV_CIPHER_HW_camellia_mode(mode)                                     \
-static const PROV_CIPHER_HW camellia_##mode = {                                \
-    cipher_hw_camellia_initkey,                                                \
-    ossl_cipher_hw_generic_##mode,                                             \
-    cipher_hw_camellia_copyctx                                                 \
-};                                                                             \
-PROV_CIPHER_HW_declare(mode)                                                   \
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_camellia_##mode(size_t keybits)      \
-{                                                                              \
-    PROV_CIPHER_HW_select(mode)                                                \
-    return &camellia_##mode;                                                   \
-}
+#define PROV_CIPHER_HW_camellia_mode(mode)                   \
+    static const PROV_CIPHER_HW camellia_##mode = {          \
+        cipher_hw_camellia_initkey,                          \
+        ossl_cipher_hw_generic_##mode,                       \
+        cipher_hw_camellia_copyctx                           \
+    };                                                       \
+    PROV_CIPHER_HW_declare(mode)                             \
+        const PROV_CIPHER_HW *                               \
+        ossl_prov_cipher_hw_camellia_##mode(size_t keybits)  \
+    {                                                        \
+        PROV_CIPHER_HW_select(mode) return &camellia_##mode; \
+    }
 
 PROV_CIPHER_HW_camellia_mode(cbc)
-PROV_CIPHER_HW_camellia_mode(ecb)
-PROV_CIPHER_HW_camellia_mode(ofb128)
-PROV_CIPHER_HW_camellia_mode(cfb128)
-PROV_CIPHER_HW_camellia_mode(cfb1)
-PROV_CIPHER_HW_camellia_mode(cfb8)
-PROV_CIPHER_HW_camellia_mode(ctr)
+    PROV_CIPHER_HW_camellia_mode(ecb)
+        PROV_CIPHER_HW_camellia_mode(ofb128)
+            PROV_CIPHER_HW_camellia_mode(cfb128)
+                PROV_CIPHER_HW_camellia_mode(cfb1)
+                    PROV_CIPHER_HW_camellia_mode(cfb8)
+                        PROV_CIPHER_HW_camellia_mode(ctr)
diff --git a/providers/implementations/ciphers/cipher_cast.h b/providers/implementations/ciphers/cipher_cast.h
index 84b58621c1bc6..d0451861e32e4 100644
--- a/providers/implementations/ciphers/cipher_cast.h
+++ b/providers/implementations/ciphers/cipher_cast.h
@@ -11,7 +11,7 @@
 #include "prov/ciphercommon.h"
 
 typedef struct prov_cast_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         CAST_KEY ks;
diff --git a/providers/implementations/ciphers/cipher_cast5.c b/providers/implementations/ciphers/cipher_cast5.c
index 84c88793b05ef..be9662c2163ea 100644
--- a/providers/implementations/ciphers/cipher_cast5.c
+++ b/providers/implementations/ciphers/cipher_cast5.c
@@ -30,7 +30,7 @@ static void cast5_freectx(void *vctx)
     PROV_CAST_CTX *ctx = (PROV_CAST_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *cast5_dupctx(void *ctx)
@@ -56,4 +56,4 @@ IMPLEMENT_var_keylen_cipher(cast5, CAST, cbc, CBC, CAST5_FLAGS, 128, 64, 64, blo
 /* ossl_cast5128ofb64_functions */
 IMPLEMENT_var_keylen_cipher(cast5, CAST, ofb64, OFB, CAST5_FLAGS, 128, 8, 64, stream)
 /* ossl_cast5128cfb64_functions */
-IMPLEMENT_var_keylen_cipher(cast5, CAST, cfb64,  CFB, CAST5_FLAGS, 128, 8, 64, stream)
+IMPLEMENT_var_keylen_cipher(cast5, CAST, cfb64, CFB, CAST5_FLAGS, 128, 8, 64, stream)
diff --git a/providers/implementations/ciphers/cipher_cast5_hw.c b/providers/implementations/ciphers/cipher_cast5_hw.c
index 73f0628e578b3..e4ccc8aa0955f 100644
--- a/providers/implementations/ciphers/cipher_cast5_hw.c
+++ b/providers/implementations/ciphers/cipher_cast5_hw.c
@@ -16,27 +16,27 @@
 #include "cipher_cast.h"
 
 static int cipher_hw_cast5_initkey(PROV_CIPHER_CTX *ctx,
-                                   const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
-    PROV_CAST_CTX *bctx =  (PROV_CAST_CTX *)ctx;
+    PROV_CAST_CTX *bctx = (PROV_CAST_CTX *)ctx;
 
     CAST_set_key(&(bctx->ks.ks), keylen, key);
     return 1;
 }
 
-# define PROV_CIPHER_HW_cast_mode(mode, UCMODE)                                \
-IMPLEMENT_CIPHER_HW_##UCMODE(mode, cast5, PROV_CAST_CTX, CAST_KEY,             \
-                             CAST_##mode)                                      \
-static const PROV_CIPHER_HW cast5_##mode = {                                   \
-    cipher_hw_cast5_initkey,                                                   \
-    cipher_hw_cast5_##mode##_cipher                                            \
-};                                                                             \
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_cast5_##mode(size_t keybits)         \
-{                                                                              \
-    return &cast5_##mode;                                                      \
-}
+#define PROV_CIPHER_HW_cast_mode(mode, UCMODE)                             \
+    IMPLEMENT_CIPHER_HW_##UCMODE(mode, cast5, PROV_CAST_CTX, CAST_KEY,     \
+        CAST_##mode) static const PROV_CIPHER_HW cast5_##mode              \
+        = {                                                                \
+              cipher_hw_cast5_initkey,                                     \
+              cipher_hw_cast5_##mode##_cipher                              \
+          };                                                               \
+    const PROV_CIPHER_HW *ossl_prov_cipher_hw_cast5_##mode(size_t keybits) \
+    {                                                                      \
+        return &cast5_##mode;                                              \
+    }
 
 PROV_CIPHER_HW_cast_mode(cbc, CBC)
-PROV_CIPHER_HW_cast_mode(ecb, ECB)
-PROV_CIPHER_HW_cast_mode(ofb64, OFB)
-PROV_CIPHER_HW_cast_mode(cfb64, CFB)
+    PROV_CIPHER_HW_cast_mode(ecb, ECB)
+        PROV_CIPHER_HW_cast_mode(ofb64, OFB)
+            PROV_CIPHER_HW_cast_mode(cfb64, CFB)
diff --git a/providers/implementations/ciphers/cipher_chacha20.c b/providers/implementations/ciphers/cipher_chacha20.c
index 3d03e6b092667..43566462354db 100644
--- a/providers/implementations/ciphers/cipher_chacha20.c
+++ b/providers/implementations/ciphers/cipher_chacha20.c
@@ -35,11 +35,11 @@ static OSSL_FUNC_cipher_settable_ctx_params_fn chacha20_settable_ctx_params;
 void ossl_chacha20_initctx(PROV_CHACHA20_CTX *ctx)
 {
     ossl_cipher_generic_initkey(ctx, CHACHA20_KEYLEN * 8,
-                                CHACHA20_BLKLEN * 8,
-                                CHACHA20_IVLEN * 8,
-                                0, CHACHA20_FLAGS,
-                                ossl_prov_cipher_hw_chacha20(CHACHA20_KEYLEN * 8),
-                                NULL);
+        CHACHA20_BLKLEN * 8,
+        CHACHA20_IVLEN * 8,
+        0, CHACHA20_FLAGS,
+        ossl_prov_cipher_hw_chacha20(CHACHA20_KEYLEN * 8),
+        NULL);
 }
 
 static void *chacha20_newctx(void *provctx)
@@ -74,7 +74,7 @@ static void *chacha20_dupctx(void *vctx)
         dupctx = OPENSSL_memdup(ctx, sizeof(*dupctx));
         if (dupctx != NULL && dupctx->base.tlsmac != NULL && dupctx->base.alloced) {
             dupctx->base.tlsmac = OPENSSL_memdup(dupctx->base.tlsmac,
-                                                 dupctx->base.tlsmacsize);
+                dupctx->base.tlsmacsize);
             if (dupctx->base.tlsmac == NULL) {
                 OPENSSL_free(dupctx);
                 dupctx = NULL;
@@ -87,9 +87,9 @@ static void *chacha20_dupctx(void *vctx)
 static int chacha20_get_params(OSSL_PARAM params[])
 {
     return ossl_cipher_generic_get_params(params, 0, CHACHA20_FLAGS,
-                                          CHACHA20_KEYLEN * 8,
-                                          CHACHA20_BLKLEN * 8,
-                                          CHACHA20_IVLEN * 8);
+        CHACHA20_KEYLEN * 8,
+        CHACHA20_BLKLEN * 8,
+        CHACHA20_IVLEN * 8);
 }
 
 static int chacha20_get_ctx_params(void *vctx, OSSL_PARAM params[])
@@ -116,7 +116,7 @@ static const OSSL_PARAM chacha20_known_gettable_ctx_params[] = {
     OSSL_PARAM_END
 };
 const OSSL_PARAM *chacha20_gettable_ctx_params(ossl_unused void *cctx,
-                                               ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return chacha20_known_gettable_ctx_params;
 }
@@ -160,14 +160,14 @@ static const OSSL_PARAM chacha20_known_settable_ctx_params[] = {
     OSSL_PARAM_END
 };
 const OSSL_PARAM *chacha20_settable_ctx_params(ossl_unused void *cctx,
-                                               ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return chacha20_known_settable_ctx_params;
 }
 
 int ossl_chacha20_einit(void *vctx, const unsigned char *key, size_t keylen,
-                        const unsigned char *iv, size_t ivlen,
-                        const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     int ret;
 
@@ -185,8 +185,8 @@ int ossl_chacha20_einit(void *vctx, const unsigned char *key, size_t keylen,
 }
 
 int ossl_chacha20_dinit(void *vctx, const unsigned char *key, size_t keylen,
-                        const unsigned char *iv, size_t ivlen,
-                        const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     int ret;
 
@@ -212,7 +212,7 @@ const OSSL_DISPATCH ossl_chacha20_functions[] = {
     { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_chacha20_dinit },
     { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))chacha20_update },
     { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))chacha20_final },
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))chacha20_cipher},
+    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))chacha20_cipher },
     { OSSL_FUNC_CIPHER_GET_PARAMS, (void (*)(void))chacha20_get_params },
     { OSSL_FUNC_CIPHER_GETTABLE_PARAMS, (void (*)(void))chacha20_gettable_params },
     { OSSL_FUNC_CIPHER_GET_CTX_PARAMS, (void (*)(void))chacha20_get_ctx_params },
@@ -223,4 +223,3 @@ const OSSL_DISPATCH ossl_chacha20_functions[] = {
         (void (*)(void))chacha20_settable_ctx_params },
     OSSL_DISPATCH_END
 };
-
diff --git a/providers/implementations/ciphers/cipher_chacha20.h b/providers/implementations/ciphers/cipher_chacha20.h
index 9db8ed9cb424b..ed531d7933bb0 100644
--- a/providers/implementations/ciphers/cipher_chacha20.h
+++ b/providers/implementations/ciphers/cipher_chacha20.h
@@ -11,14 +11,14 @@
 #include "prov/ciphercommon.h"
 
 typedef struct {
-    PROV_CIPHER_CTX base;     /* must be first */
+    PROV_CIPHER_CTX base; /* must be first */
     union {
         OSSL_UNION_ALIGN;
         unsigned int d[CHACHA_KEY_SIZE / 4];
     } key;
-    unsigned int  counter[CHACHA_CTR_SIZE / 4];
+    unsigned int counter[CHACHA_CTR_SIZE / 4];
     unsigned char buf[CHACHA_BLK_SIZE];
-    unsigned int  partial_len;
+    unsigned int partial_len;
 } PROV_CHACHA20_CTX;
 
 typedef struct prov_cipher_hw_chacha20_st {
diff --git a/providers/implementations/ciphers/cipher_chacha20_hw.c b/providers/implementations/ciphers/cipher_chacha20_hw.c
index 3b03bc81ed5a5..18a4578b4912e 100644
--- a/providers/implementations/ciphers/cipher_chacha20_hw.c
+++ b/providers/implementations/ciphers/cipher_chacha20_hw.c
@@ -12,7 +12,7 @@
 #include "cipher_chacha20.h"
 
 static int chacha20_initkey(PROV_CIPHER_CTX *bctx, const uint8_t *key,
-                            size_t keylen)
+    size_t keylen)
 {
     PROV_CHACHA20_CTX *ctx = (PROV_CHACHA20_CTX *)bctx;
     unsigned int i;
@@ -39,7 +39,7 @@ static int chacha20_initiv(PROV_CIPHER_CTX *bctx)
 }
 
 static int chacha20_cipher(PROV_CIPHER_CTX *bctx, unsigned char *out,
-                           const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     PROV_CHACHA20_CTX *ctx = (PROV_CHACHA20_CTX *)bctx;
     unsigned int n, rem, ctr32;
@@ -95,13 +95,14 @@ static int chacha20_cipher(PROV_CIPHER_CTX *bctx, unsigned char *out,
         out += blocks;
 
         ctx->counter[0] = ctr32;
-        if (ctr32 == 0) ctx->counter[1]++;
+        if (ctr32 == 0)
+            ctx->counter[1]++;
     }
 
     if (rem > 0) {
         memset(ctx->buf, 0, sizeof(ctx->buf));
         ChaCha20_ctr32(ctx->buf, ctx->buf, CHACHA_BLK_SIZE,
-                       ctx->key.d, ctx->counter);
+            ctx->key.d, ctx->counter);
         for (n = 0; n < rem; n++)
             out[n] = in[n] ^ ctx->buf[n];
         ctx->partial_len = rem;
@@ -119,4 +120,3 @@ const PROV_CIPHER_HW *ossl_prov_cipher_hw_chacha20(size_t keybits)
 {
     return (PROV_CIPHER_HW *)&chacha20_hw;
 }
-
diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305.c b/providers/implementations/ciphers/cipher_chacha20_poly1305.c
index e0f5b7d91587e..977f7000c289e 100644
--- a/providers/implementations/ciphers/cipher_chacha20_poly1305.c
+++ b/providers/implementations/ciphers/cipher_chacha20_poly1305.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-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
@@ -18,8 +18,8 @@
 #define CHACHA20_POLY1305_BLKLEN 1
 #define CHACHA20_POLY1305_MAX_IVLEN 12
 #define CHACHA20_POLY1305_MODE 0
-#define CHACHA20_POLY1305_FLAGS (PROV_CIPHER_FLAG_AEAD                         \
-                                 | PROV_CIPHER_FLAG_CUSTOM_IV)
+#define CHACHA20_POLY1305_FLAGS (PROV_CIPHER_FLAG_AEAD \
+    | PROV_CIPHER_FLAG_CUSTOM_IV)
 
 static OSSL_FUNC_cipher_newctx_fn chacha20_poly1305_newctx;
 static OSSL_FUNC_cipher_freectx_fn chacha20_poly1305_freectx;
@@ -32,7 +32,7 @@ static OSSL_FUNC_cipher_set_ctx_params_fn chacha20_poly1305_set_ctx_params;
 static OSSL_FUNC_cipher_cipher_fn chacha20_poly1305_cipher;
 static OSSL_FUNC_cipher_final_fn chacha20_poly1305_final;
 static OSSL_FUNC_cipher_gettable_ctx_params_fn chacha20_poly1305_gettable_ctx_params;
-#define chacha20_poly1305_settable_ctx_params ossl_cipher_aead_settable_ctx_params
+static OSSL_FUNC_cipher_settable_ctx_params_fn chacha20_poly1305_settable_ctx_params;
 #define chacha20_poly1305_gettable_params ossl_cipher_generic_gettable_params
 #define chacha20_poly1305_update chacha20_poly1305_cipher
 
@@ -46,13 +46,13 @@ static void *chacha20_poly1305_newctx(void *provctx)
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx != NULL) {
         ossl_cipher_generic_initkey(&ctx->base, CHACHA20_POLY1305_KEYLEN * 8,
-                                    CHACHA20_POLY1305_BLKLEN * 8,
-                                    CHACHA20_POLY1305_IVLEN * 8,
-                                    CHACHA20_POLY1305_MODE,
-                                    CHACHA20_POLY1305_FLAGS,
-                                    ossl_prov_cipher_hw_chacha20_poly1305(
-                                        CHACHA20_POLY1305_KEYLEN * 8),
-                                    NULL);
+            CHACHA20_POLY1305_BLKLEN * 8,
+            CHACHA20_POLY1305_IVLEN * 8,
+            CHACHA20_POLY1305_MODE,
+            CHACHA20_POLY1305_FLAGS,
+            ossl_prov_cipher_hw_chacha20_poly1305(
+                CHACHA20_POLY1305_KEYLEN * 8),
+            NULL);
         ctx->tls_payload_length = NO_TLS_PAYLOAD_LENGTH;
         ossl_chacha20_initctx(&ctx->chacha);
     }
@@ -69,7 +69,7 @@ static void *chacha20_poly1305_dupctx(void *provctx)
     dctx = OPENSSL_memdup(ctx, sizeof(*ctx));
     if (dctx != NULL && dctx->base.tlsmac != NULL && dctx->base.alloced) {
         dctx->base.tlsmac = OPENSSL_memdup(dctx->base.tlsmac,
-                                           dctx->base.tlsmacsize);
+            dctx->base.tlsmacsize);
         if (dctx->base.tlsmac == NULL) {
             OPENSSL_free(dctx);
             dctx = NULL;
@@ -91,9 +91,9 @@ static void chacha20_poly1305_freectx(void *vctx)
 static int chacha20_poly1305_get_params(OSSL_PARAM params[])
 {
     return ossl_cipher_generic_get_params(params, 0, CHACHA20_POLY1305_FLAGS,
-                                          CHACHA20_POLY1305_KEYLEN * 8,
-                                          CHACHA20_POLY1305_BLKLEN * 8,
-                                          CHACHA20_POLY1305_IVLEN * 8);
+        CHACHA20_POLY1305_KEYLEN * 8,
+        CHACHA20_POLY1305_BLKLEN * 8,
+        CHACHA20_POLY1305_IVLEN * 8);
 }
 
 static int chacha20_poly1305_get_ctx_params(void *vctx, OSSL_PARAM params[])
@@ -152,20 +152,32 @@ static const OSSL_PARAM chacha20_poly1305_known_gettable_ctx_params[] = {
     OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, NULL),
     OSSL_PARAM_END
 };
-static const OSSL_PARAM *chacha20_poly1305_gettable_ctx_params
-    (ossl_unused void *cctx, ossl_unused void *provctx)
+static const OSSL_PARAM *chacha20_poly1305_gettable_ctx_params(ossl_unused void *cctx, ossl_unused void *provctx)
 {
     return chacha20_poly1305_known_gettable_ctx_params;
 }
 
+static const OSSL_PARAM chacha20_poly1305_known_settable_ctx_params[] = {
+    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
+    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_IVLEN, NULL),
+    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0),
+    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD, NULL, 0),
+    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_IV_FIXED, NULL, 0),
+    OSSL_PARAM_END
+};
+static const OSSL_PARAM *chacha20_poly1305_settable_ctx_params(
+    ossl_unused void *cctx, ossl_unused void *provctx)
+{
+    return chacha20_poly1305_known_settable_ctx_params;
+}
+
 static int chacha20_poly1305_set_ctx_params(void *vctx,
-                                            const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     const OSSL_PARAM *p;
     size_t len;
     PROV_CHACHA20_POLY1305_CTX *ctx = (PROV_CHACHA20_POLY1305_CTX *)vctx;
-    PROV_CIPHER_HW_CHACHA20_POLY1305 *hw =
-        (PROV_CIPHER_HW_CHACHA20_POLY1305 *)ctx->base.hw;
+    PROV_CIPHER_HW_CHACHA20_POLY1305 *hw = (PROV_CIPHER_HW_CHACHA20_POLY1305 *)ctx->base.hw;
 
     if (ossl_param_is_empty(params))
         return 1;
@@ -238,13 +250,12 @@ static int chacha20_poly1305_set_ctx_params(void *vctx,
             return 0;
         }
     }
-    /* ignore OSSL_CIPHER_PARAM_AEAD_MAC_KEY */
     return 1;
 }
 
 static int chacha20_poly1305_einit(void *vctx, const unsigned char *key,
-                                  size_t keylen, const unsigned char *iv,
-                                  size_t ivlen, const OSSL_PARAM params[])
+    size_t keylen, const unsigned char *iv,
+    size_t ivlen, const OSSL_PARAM params[])
 {
     int ret;
 
@@ -252,8 +263,7 @@ static int chacha20_poly1305_einit(void *vctx, const unsigned char *key,
     ret = ossl_cipher_generic_einit(vctx, key, keylen, iv, ivlen, NULL);
     if (ret && iv != NULL) {
         PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
-        PROV_CIPHER_HW_CHACHA20_POLY1305 *hw =
-            (PROV_CIPHER_HW_CHACHA20_POLY1305 *)ctx->hw;
+        PROV_CIPHER_HW_CHACHA20_POLY1305 *hw = (PROV_CIPHER_HW_CHACHA20_POLY1305 *)ctx->hw;
 
         hw->initiv(ctx);
     }
@@ -263,8 +273,8 @@ static int chacha20_poly1305_einit(void *vctx, const unsigned char *key,
 }
 
 static int chacha20_poly1305_dinit(void *vctx, const unsigned char *key,
-                                  size_t keylen, const unsigned char *iv,
-                                  size_t ivlen, const OSSL_PARAM params[])
+    size_t keylen, const unsigned char *iv,
+    size_t ivlen, const OSSL_PARAM params[])
 {
     int ret;
 
@@ -272,8 +282,7 @@ static int chacha20_poly1305_dinit(void *vctx, const unsigned char *key,
     ret = ossl_cipher_generic_dinit(vctx, key, keylen, iv, ivlen, NULL);
     if (ret && iv != NULL) {
         PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
-        PROV_CIPHER_HW_CHACHA20_POLY1305 *hw =
-            (PROV_CIPHER_HW_CHACHA20_POLY1305 *)ctx->hw;
+        PROV_CIPHER_HW_CHACHA20_POLY1305 *hw = (PROV_CIPHER_HW_CHACHA20_POLY1305 *)ctx->hw;
 
         hw->initiv(ctx);
     }
@@ -283,12 +292,11 @@ static int chacha20_poly1305_dinit(void *vctx, const unsigned char *key,
 }
 
 static int chacha20_poly1305_cipher(void *vctx, unsigned char *out,
-                                    size_t *outl, size_t outsize,
-                                    const unsigned char *in, size_t inl)
+    size_t *outl, size_t outsize,
+    const unsigned char *in, size_t inl)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
-    PROV_CIPHER_HW_CHACHA20_POLY1305 *hw =
-        (PROV_CIPHER_HW_CHACHA20_POLY1305 *)ctx->hw;
+    PROV_CIPHER_HW_CHACHA20_POLY1305 *hw = (PROV_CIPHER_HW_CHACHA20_POLY1305 *)ctx->hw;
 
     if (!ossl_prov_is_running())
         return 0;
@@ -310,11 +318,10 @@ static int chacha20_poly1305_cipher(void *vctx, unsigned char *out,
 }
 
 static int chacha20_poly1305_final(void *vctx, unsigned char *out, size_t *outl,
-                                   size_t outsize)
+    size_t outsize)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
-    PROV_CIPHER_HW_CHACHA20_POLY1305 *hw =
-        (PROV_CIPHER_HW_CHACHA20_POLY1305 *)ctx->hw;
+    PROV_CIPHER_HW_CHACHA20_POLY1305 *hw = (PROV_CIPHER_HW_CHACHA20_POLY1305 *)ctx->hw;
 
     if (!ossl_prov_is_running())
         return 0;
@@ -341,7 +348,7 @@ const OSSL_DISPATCH ossl_chacha20_ossl_poly1305_functions[] = {
     { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,
         (void (*)(void))chacha20_poly1305_gettable_params },
     { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,
-         (void (*)(void))chacha20_poly1305_get_ctx_params },
+        (void (*)(void))chacha20_poly1305_get_ctx_params },
     { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,
         (void (*)(void))chacha20_poly1305_gettable_ctx_params },
     { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,
@@ -350,4 +357,3 @@ const OSSL_DISPATCH ossl_chacha20_ossl_poly1305_functions[] = {
         (void (*)(void))chacha20_poly1305_settable_ctx_params },
     OSSL_DISPATCH_END
 };
-
diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305.h b/providers/implementations/ciphers/cipher_chacha20_poly1305.h
index f2ea26a77f3a4..2e82fdb947826 100644
--- a/providers/implementations/ciphers/cipher_chacha20_poly1305.h
+++ b/providers/implementations/ciphers/cipher_chacha20_poly1305.h
@@ -16,13 +16,15 @@
 #define CHACHA20_POLY1305_IVLEN 12
 
 typedef struct {
-    PROV_CIPHER_CTX base;       /* must be first */
+    PROV_CIPHER_CTX base; /* must be first */
     PROV_CHACHA20_CTX chacha;
     POLY1305 poly1305;
     unsigned int nonce[12 / 4];
     unsigned char tag[POLY1305_BLOCK_SIZE];
     unsigned char tls_aad[POLY1305_BLOCK_SIZE];
-    struct { uint64_t aad, text; } len;
+    struct {
+        uint64_t aad, text;
+    } len;
     unsigned int aad : 1;
     unsigned int mac_inited : 1;
     size_t tag_len;
@@ -33,11 +35,11 @@ typedef struct {
 typedef struct prov_cipher_hw_chacha_aead_st {
     PROV_CIPHER_HW base; /* must be first */
     int (*aead_cipher)(PROV_CIPHER_CTX *dat, unsigned char *out, size_t *outl,
-                       const unsigned char *in, size_t len);
+        const unsigned char *in, size_t len);
     int (*initiv)(PROV_CIPHER_CTX *ctx);
     int (*tls_init)(PROV_CIPHER_CTX *ctx, unsigned char *aad, size_t alen);
     int (*tls_iv_set_fixed)(PROV_CIPHER_CTX *ctx, unsigned char *fixed,
-                            size_t flen);
+        size_t flen);
 } PROV_CIPHER_HW_CHACHA20_POLY1305;
 
 const PROV_CIPHER_HW *ossl_prov_cipher_hw_chacha20_poly1305(size_t keybits);
diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c b/providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c
index 29533efe0eb5d..733547a7e7323 100644
--- a/providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c
+++ b/providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c
@@ -13,7 +13,7 @@
 #include "cipher_chacha20_poly1305.h"
 
 static int chacha_poly1305_tls_init(PROV_CIPHER_CTX *bctx,
-                                    unsigned char *aad, size_t alen)
+    unsigned char *aad, size_t alen)
 {
     unsigned int len;
     PROV_CHACHA20_POLY1305_CTX *ctx = (PROV_CHACHA20_POLY1305_CTX *)bctx;
@@ -36,14 +36,14 @@ static int chacha_poly1305_tls_init(PROV_CIPHER_CTX *bctx,
     /* merge record sequence number as per RFC7905 */
     ctx->chacha.counter[1] = ctx->nonce[0];
     ctx->chacha.counter[2] = ctx->nonce[1] ^ CHACHA_U8TOU32(aad);
-    ctx->chacha.counter[3] = ctx->nonce[2] ^ CHACHA_U8TOU32(aad+4);
+    ctx->chacha.counter[3] = ctx->nonce[2] ^ CHACHA_U8TOU32(aad + 4);
     ctx->mac_inited = 0;
 
-    return POLY1305_BLOCK_SIZE;         /* tag length */
+    return POLY1305_BLOCK_SIZE; /* tag length */
 }
 
 static int chacha_poly1305_tls_iv_set_fixed(PROV_CIPHER_CTX *bctx,
-                                            unsigned char *fixed, size_t flen)
+    unsigned char *fixed, size_t flen)
 {
     PROV_CHACHA20_POLY1305_CTX *ctx = (PROV_CHACHA20_POLY1305_CTX *)bctx;
 
@@ -56,7 +56,7 @@ static int chacha_poly1305_tls_iv_set_fixed(PROV_CIPHER_CTX *bctx,
 }
 
 static int chacha20_poly1305_initkey(PROV_CIPHER_CTX *bctx,
-                                     const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     PROV_CHACHA20_POLY1305_CTX *ctx = (PROV_CHACHA20_POLY1305_CTX *)bctx;
 
@@ -87,14 +87,14 @@ static int chacha20_poly1305_initiv(PROV_CIPHER_CTX *bctx)
 
     /* pad on the left */
     memcpy(tempiv + CHACHA_CTR_SIZE - noncelen, bctx->oiv,
-           noncelen);
+        noncelen);
 
     if (bctx->enc)
         ret = ossl_chacha20_einit(&ctx->chacha, NULL, 0,
-                                  tempiv, sizeof(tempiv), NULL);
+            tempiv, sizeof(tempiv), NULL);
     else
         ret = ossl_chacha20_dinit(&ctx->chacha, NULL, 0,
-                                  tempiv, sizeof(tempiv), NULL);
+            tempiv, sizeof(tempiv), NULL);
     ctx->nonce[0] = ctx->chacha.counter[1];
     ctx->nonce[1] = ctx->chacha.counter[2];
     ctx->nonce[2] = ctx->chacha.counter[3];
@@ -104,20 +104,19 @@ static int chacha20_poly1305_initiv(PROV_CIPHER_CTX *bctx)
 
 #if !defined(OPENSSL_SMALL_FOOTPRINT)
 
-# if defined(POLY1305_ASM) && (defined(__x86_64) || defined(__x86_64__) \
-     || defined(_M_AMD64) || defined(_M_X64))
-#  define XOR128_HELPERS
+#if defined(POLY1305_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
+#define XOR128_HELPERS
 void *xor128_encrypt_n_pad(void *out, const void *inp, void *otp, size_t len);
 void *xor128_decrypt_n_pad(void *out, const void *inp, void *otp, size_t len);
 static const unsigned char zero[4 * CHACHA_BLK_SIZE] = { 0 };
-# else
+#else
 static const unsigned char zero[2 * CHACHA_BLK_SIZE] = { 0 };
-# endif
+#endif
 
 static int chacha20_poly1305_tls_cipher(PROV_CIPHER_CTX *bctx,
-                                        unsigned char *out,
-                                        size_t *out_padlen,
-                                        const unsigned char *in, size_t len)
+    unsigned char *out,
+    size_t *out_padlen,
+    const unsigned char *in, size_t len)
 {
     PROV_CHACHA20_POLY1305_CTX *ctx = (PROV_CHACHA20_POLY1305_CTX *)bctx;
     POLY1305 *poly = &ctx->poly1305;
@@ -126,11 +125,11 @@ static int chacha20_poly1305_tls_cipher(PROV_CIPHER_CTX *bctx,
 
     DECLARE_IS_ENDIAN;
 
-    buf = storage + ((0 - (size_t)storage) & 15);   /* align */
+    buf = storage + ((0 - (size_t)storage) & 15); /* align */
     ctr = buf + CHACHA_BLK_SIZE;
     tohash = buf + CHACHA_BLK_SIZE - POLY1305_BLOCK_SIZE;
 
-# ifdef XOR128_HELPERS
+#ifdef XOR128_HELPERS
     if (plen <= 3 * CHACHA_BLK_SIZE) {
         ctx->chacha.counter[0] = 0;
         buf_len = (plen + 2 * CHACHA_BLK_SIZE - 1) & (0 - CHACHA_BLK_SIZE);
@@ -153,13 +152,13 @@ static int chacha20_poly1305_tls_cipher(PROV_CIPHER_CTX *bctx,
             tohash_len = (size_t)(ctr - tohash);
         }
     }
-# else
+#else
     if (plen <= CHACHA_BLK_SIZE) {
         size_t i;
 
         ctx->chacha.counter[0] = 0;
         ChaCha20_ctr32(buf, zero, (buf_len = 2 * CHACHA_BLK_SIZE),
-                       ctx->chacha.key.d, ctx->chacha.counter);
+            ctx->chacha.key.d, ctx->chacha.counter);
         Poly1305_Init(poly, buf);
         ctx->chacha.partial_len = 0;
         memcpy(tohash, ctx->tls_aad, POLY1305_BLOCK_SIZE);
@@ -187,11 +186,11 @@ static int chacha20_poly1305_tls_cipher(PROV_CIPHER_CTX *bctx,
         ctr += i + tail;
         tohash_len += i + tail;
     }
-# endif
+#endif
     else {
         ctx->chacha.counter[0] = 0;
         ChaCha20_ctr32(buf, zero, (buf_len = CHACHA_BLK_SIZE),
-                       ctx->chacha.key.d, ctx->chacha.counter);
+            ctx->chacha.key.d, ctx->chacha.counter);
         Poly1305_Init(poly, buf);
         ctx->chacha.counter[0] = 1;
         ctx->chacha.partial_len = 0;
@@ -218,23 +217,23 @@ static int chacha20_poly1305_tls_cipher(PROV_CIPHER_CTX *bctx,
     if (IS_LITTLE_ENDIAN) {
         memcpy(ctr, (unsigned char *)&ctx->len, POLY1305_BLOCK_SIZE);
     } else {
-        ctr[0]  = (unsigned char)(ctx->len.aad);
-        ctr[1]  = (unsigned char)(ctx->len.aad>>8);
-        ctr[2]  = (unsigned char)(ctx->len.aad>>16);
-        ctr[3]  = (unsigned char)(ctx->len.aad>>24);
-        ctr[4]  = (unsigned char)(ctx->len.aad>>32);
-        ctr[5]  = (unsigned char)(ctx->len.aad>>40);
-        ctr[6]  = (unsigned char)(ctx->len.aad>>48);
-        ctr[7]  = (unsigned char)(ctx->len.aad>>56);
-
-        ctr[8]  = (unsigned char)(ctx->len.text);
-        ctr[9]  = (unsigned char)(ctx->len.text>>8);
-        ctr[10] = (unsigned char)(ctx->len.text>>16);
-        ctr[11] = (unsigned char)(ctx->len.text>>24);
-        ctr[12] = (unsigned char)(ctx->len.text>>32);
-        ctr[13] = (unsigned char)(ctx->len.text>>40);
-        ctr[14] = (unsigned char)(ctx->len.text>>48);
-        ctr[15] = (unsigned char)(ctx->len.text>>56);
+        ctr[0] = (unsigned char)(ctx->len.aad);
+        ctr[1] = (unsigned char)(ctx->len.aad >> 8);
+        ctr[2] = (unsigned char)(ctx->len.aad >> 16);
+        ctr[3] = (unsigned char)(ctx->len.aad >> 24);
+        ctr[4] = (unsigned char)(ctx->len.aad >> 32);
+        ctr[5] = (unsigned char)(ctx->len.aad >> 40);
+        ctr[6] = (unsigned char)(ctx->len.aad >> 48);
+        ctr[7] = (unsigned char)(ctx->len.aad >> 56);
+
+        ctr[8] = (unsigned char)(ctx->len.text);
+        ctr[9] = (unsigned char)(ctx->len.text >> 8);
+        ctr[10] = (unsigned char)(ctx->len.text >> 16);
+        ctr[11] = (unsigned char)(ctx->len.text >> 24);
+        ctr[12] = (unsigned char)(ctx->len.text >> 32);
+        ctr[13] = (unsigned char)(ctx->len.text >> 40);
+        ctr[14] = (unsigned char)(ctx->len.text >> 48);
+        ctr[15] = (unsigned char)(ctx->len.text >> 56);
     }
     tohash_len += POLY1305_BLOCK_SIZE;
 
@@ -250,7 +249,7 @@ static int chacha20_poly1305_tls_cipher(PROV_CIPHER_CTX *bctx,
         if (CRYPTO_memcmp(tohash, in, POLY1305_BLOCK_SIZE)) {
             if (len > POLY1305_BLOCK_SIZE)
                 memset(out - (len - POLY1305_BLOCK_SIZE), 0,
-                       len - POLY1305_BLOCK_SIZE);
+                    len - POLY1305_BLOCK_SIZE);
             return 0;
         }
         /* Strip the tag */
@@ -265,8 +264,8 @@ static const unsigned char zero[CHACHA_BLK_SIZE] = { 0 };
 #endif /* OPENSSL_SMALL_FOOTPRINT */
 
 static int chacha20_poly1305_aead_cipher(PROV_CIPHER_CTX *bctx,
-                                         unsigned char *out, size_t *outl,
-                                         const unsigned char *in, size_t inl)
+    unsigned char *out, size_t *outl,
+    const unsigned char *in, size_t inl)
 {
     PROV_CHACHA20_POLY1305_CTX *ctx = (PROV_CHACHA20_POLY1305_CTX *)bctx;
     POLY1305 *poly = &ctx->poly1305;
@@ -287,7 +286,7 @@ static int chacha20_poly1305_aead_cipher(PROV_CIPHER_CTX *bctx,
 
         ctx->chacha.counter[0] = 0;
         ChaCha20_ctr32(ctx->chacha.buf, zero, CHACHA_BLK_SIZE,
-                       ctx->chacha.key.d, ctx->chacha.counter);
+            ctx->chacha.key.d, ctx->chacha.counter);
         Poly1305_Init(poly, ctx->chacha.buf);
         ctx->chacha.counter[0] = 1;
         ctx->chacha.partial_len = 0;
@@ -339,7 +338,7 @@ static int chacha20_poly1305_aead_cipher(PROV_CIPHER_CTX *bctx,
 
         unsigned char temp[POLY1305_BLOCK_SIZE];
 
-        if (ctx->aad) {                        /* wrap up aad */
+        if (ctx->aad) { /* wrap up aad */
             if ((rem = (size_t)ctx->len.aad % POLY1305_BLOCK_SIZE))
                 Poly1305_Update(poly, zero, POLY1305_BLOCK_SIZE - rem);
             ctx->aad = 0;
@@ -350,24 +349,24 @@ static int chacha20_poly1305_aead_cipher(PROV_CIPHER_CTX *bctx,
 
         if (IS_LITTLE_ENDIAN) {
             Poly1305_Update(poly, (unsigned char *)&ctx->len,
-                            POLY1305_BLOCK_SIZE);
+                POLY1305_BLOCK_SIZE);
         } else {
-            temp[0]  = (unsigned char)(ctx->len.aad);
-            temp[1]  = (unsigned char)(ctx->len.aad>>8);
-            temp[2]  = (unsigned char)(ctx->len.aad>>16);
-            temp[3]  = (unsigned char)(ctx->len.aad>>24);
-            temp[4]  = (unsigned char)(ctx->len.aad>>32);
-            temp[5]  = (unsigned char)(ctx->len.aad>>40);
-            temp[6]  = (unsigned char)(ctx->len.aad>>48);
-            temp[7]  = (unsigned char)(ctx->len.aad>>56);
-            temp[8]  = (unsigned char)(ctx->len.text);
-            temp[9]  = (unsigned char)(ctx->len.text>>8);
-            temp[10] = (unsigned char)(ctx->len.text>>16);
-            temp[11] = (unsigned char)(ctx->len.text>>24);
-            temp[12] = (unsigned char)(ctx->len.text>>32);
-            temp[13] = (unsigned char)(ctx->len.text>>40);
-            temp[14] = (unsigned char)(ctx->len.text>>48);
-            temp[15] = (unsigned char)(ctx->len.text>>56);
+            temp[0] = (unsigned char)(ctx->len.aad);
+            temp[1] = (unsigned char)(ctx->len.aad >> 8);
+            temp[2] = (unsigned char)(ctx->len.aad >> 16);
+            temp[3] = (unsigned char)(ctx->len.aad >> 24);
+            temp[4] = (unsigned char)(ctx->len.aad >> 32);
+            temp[5] = (unsigned char)(ctx->len.aad >> 40);
+            temp[6] = (unsigned char)(ctx->len.aad >> 48);
+            temp[7] = (unsigned char)(ctx->len.aad >> 56);
+            temp[8] = (unsigned char)(ctx->len.text);
+            temp[9] = (unsigned char)(ctx->len.text >> 8);
+            temp[10] = (unsigned char)(ctx->len.text >> 16);
+            temp[11] = (unsigned char)(ctx->len.text >> 24);
+            temp[12] = (unsigned char)(ctx->len.text >> 32);
+            temp[13] = (unsigned char)(ctx->len.text >> 40);
+            temp[14] = (unsigned char)(ctx->len.text >> 48);
+            temp[15] = (unsigned char)(ctx->len.text >> 56);
             Poly1305_Update(poly, temp, POLY1305_BLOCK_SIZE);
         }
         Poly1305_Final(poly, bctx->enc ? ctx->tag : temp);
@@ -384,8 +383,7 @@ static int chacha20_poly1305_aead_cipher(PROV_CIPHER_CTX *bctx,
                 /* Strip the tag */
                 inl -= POLY1305_BLOCK_SIZE;
             }
-        }
-        else if (!bctx->enc) {
+        } else if (!bctx->enc) {
             if (CRYPTO_memcmp(temp, ctx->tag, ctx->tag_len))
                 goto err;
         }
diff --git a/providers/implementations/ciphers/cipher_cts.c b/providers/implementations/ciphers/cipher_cts.c
index 9f58b06c4c96d..54c6d49d9f526 100644
--- a/providers/implementations/ciphers/cipher_cts.c
+++ b/providers/implementations/ciphers/cipher_cts.c
@@ -97,7 +97,7 @@ int ossl_cipher_cbc_cts_mode_name2id(const char *name)
 }
 
 static size_t cts128_cs1_encrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
-                                 unsigned char *out, size_t len)
+    unsigned char *out, size_t len)
 {
     aligned_16bytes tmp_in;
     size_t residue;
@@ -116,13 +116,13 @@ static size_t cts128_cs1_encrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
     memset(tmp_in.c, 0, sizeof(tmp_in));
     memcpy(tmp_in.c, in, residue);
     if (!ctx->hw->cipher(ctx, out - CTS_BLOCK_SIZE + residue, tmp_in.c,
-                         CTS_BLOCK_SIZE))
+            CTS_BLOCK_SIZE))
         return 0;
     return len + residue;
 }
 
 static void do_xor(const unsigned char *in1, const unsigned char *in2,
-                   size_t len, unsigned char *out)
+    size_t len, unsigned char *out)
 {
     size_t i;
 
@@ -131,7 +131,7 @@ static void do_xor(const unsigned char *in1, const unsigned char *in2,
 }
 
 static size_t cts128_cs1_decrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
-                                 unsigned char *out, size_t len)
+    unsigned char *out, size_t len)
 {
     aligned_16bytes mid_iv, ct_mid, cn, pt_last;
     size_t residue;
@@ -193,12 +193,12 @@ static size_t cts128_cs1_decrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
 }
 
 static size_t cts128_cs3_encrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
-                                 unsigned char *out, size_t len)
+    unsigned char *out, size_t len)
 {
     aligned_16bytes tmp_in;
     size_t residue;
 
-    if (len < CTS_BLOCK_SIZE)  /* CS3 requires at least one block */
+    if (len < CTS_BLOCK_SIZE) /* CS3 requires at least one block */
         return 0;
 
     /* If we only have one block then just process the aligned block */
@@ -233,7 +233,7 @@ static size_t cts128_cs3_encrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
  *  the last two decoded ciphertext blocks.
  */
 static size_t cts128_cs3_decrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
-                                 unsigned char *out, size_t len)
+    unsigned char *out, size_t len)
 {
     aligned_16bytes mid_iv, ct_mid, cn, pt_last;
     size_t residue;
@@ -299,7 +299,7 @@ static size_t cts128_cs3_decrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
 }
 
 static size_t cts128_cs2_encrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
-                                 unsigned char *out, size_t len)
+    unsigned char *out, size_t len)
 {
     if (len % CTS_BLOCK_SIZE == 0) {
         /* If there are no partial blocks then it is the same as CBC mode */
@@ -312,7 +312,7 @@ static size_t cts128_cs2_encrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
 }
 
 static size_t cts128_cs2_decrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
-                                 unsigned char *out, size_t len)
+    unsigned char *out, size_t len)
 {
     if (len % CTS_BLOCK_SIZE == 0) {
         /* If there are no partial blocks then it is the same as CBC mode */
@@ -325,8 +325,8 @@ static size_t cts128_cs2_decrypt(PROV_CIPHER_CTX *ctx, const unsigned char *in,
 }
 
 int ossl_cipher_cbc_cts_block_update(void *vctx, unsigned char *out, size_t *outl,
-                                     size_t outsize, const unsigned char *in,
-                                     size_t inl)
+    size_t outsize, const unsigned char *in,
+    size_t inl)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
     size_t sz = 0;
@@ -370,7 +370,7 @@ int ossl_cipher_cbc_cts_block_update(void *vctx, unsigned char *out, size_t *out
 }
 
 int ossl_cipher_cbc_cts_block_final(void *vctx, unsigned char *out, size_t *outl,
-                                    size_t outsize)
+    size_t outsize)
 {
     *outl = 0;
     return 1;
diff --git a/providers/implementations/ciphers/cipher_cts.h b/providers/implementations/ciphers/cipher_cts.h
index a26e5a9e0719e..b3a677b6aa5f9 100644
--- a/providers/implementations/ciphers/cipher_cts.h
+++ b/providers/implementations/ciphers/cipher_cts.h
@@ -10,40 +10,40 @@
 #include "crypto/evp.h"
 
 /* NOTE: The underlying block cipher is CBC so we reuse most of the code */
-#define IMPLEMENT_cts_cipher(alg, UCALG, lcmode, UCMODE, flags, kbits,         \
-                             blkbits, ivbits, typ)                             \
-static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lcmode##_get_params;   \
-static int alg##_cts_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])      \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
-                                          flags, kbits, blkbits, ivbits);      \
-}                                                                              \
-const OSSL_DISPATCH ossl_##alg##kbits##lcmode##_cts_functions[] = {            \
-    { OSSL_FUNC_CIPHER_NEWCTX,                                                 \
-      (void (*)(void)) alg##_##kbits##_##lcmode##_newctx },                    \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void)) alg##_freectx },              \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void)) alg##_dupctx },                \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void)) alg##_cbc_cts_einit },   \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void)) alg##_cbc_cts_dinit },   \
-    { OSSL_FUNC_CIPHER_UPDATE,                                                 \
-      (void (*)(void)) ossl_cipher_cbc_cts_block_update },                     \
-    { OSSL_FUNC_CIPHER_FINAL,                                                  \
-      (void (*)(void)) ossl_cipher_cbc_cts_block_final },                      \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },   \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-      (void (*)(void)) alg##_cts_##kbits##_##lcmode##_get_params },            \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-      (void (*)(void)) alg##_cbc_cts_get_ctx_params },                         \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-      (void (*)(void)) alg##_cbc_cts_set_ctx_params },                         \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void)) alg##_cbc_cts_gettable_ctx_params },                    \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-     (void (*)(void)) alg##_cbc_cts_settable_ctx_params },                     \
-    OSSL_DISPATCH_END                                                          \
-};
+#define IMPLEMENT_cts_cipher(alg, UCALG, lcmode, UCMODE, flags, kbits,           \
+    blkbits, ivbits, typ)                                                        \
+    static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lcmode##_get_params; \
+    static int alg##_cts_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])    \
+    {                                                                            \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,  \
+            flags, kbits, blkbits, ivbits);                                      \
+    }                                                                            \
+    const OSSL_DISPATCH ossl_##alg##kbits##lcmode##_cts_functions[] = {          \
+        { OSSL_FUNC_CIPHER_NEWCTX,                                               \
+            (void (*)(void))alg##_##kbits##_##lcmode##_newctx },                 \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))alg##_freectx },             \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))alg##_dupctx },               \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))alg##_cbc_cts_einit },  \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))alg##_cbc_cts_dinit },  \
+        { OSSL_FUNC_CIPHER_UPDATE,                                               \
+            (void (*)(void))ossl_cipher_cbc_cts_block_update },                  \
+        { OSSL_FUNC_CIPHER_FINAL,                                                \
+            (void (*)(void))ossl_cipher_cbc_cts_block_final },                   \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher }, \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                           \
+            (void (*)(void))alg##_cts_##kbits##_##lcmode##_get_params },         \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                      \
+            (void (*)(void))ossl_cipher_generic_gettable_params },               \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                       \
+            (void (*)(void))alg##_cbc_cts_get_ctx_params },                      \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                       \
+            (void (*)(void))alg##_cbc_cts_set_ctx_params },                      \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                  \
+            (void (*)(void))alg##_cbc_cts_gettable_ctx_params },                 \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                  \
+            (void (*)(void))alg##_cbc_cts_settable_ctx_params },                 \
+        OSSL_DISPATCH_END                                                        \
+    };
 
 OSSL_FUNC_cipher_update_fn ossl_cipher_cbc_cts_block_update;
 OSSL_FUNC_cipher_final_fn ossl_cipher_cbc_cts_block_final;
diff --git a/providers/implementations/ciphers/cipher_des.c b/providers/implementations/ciphers/cipher_des.c
index e2c890979ea4b..c9073939697f7 100644
--- a/providers/implementations/ciphers/cipher_des.c
+++ b/providers/implementations/ciphers/cipher_des.c
@@ -29,8 +29,8 @@ static OSSL_FUNC_cipher_get_ctx_params_fn des_get_ctx_params;
 static OSSL_FUNC_cipher_gettable_ctx_params_fn des_gettable_ctx_params;
 
 static void *des_newctx(void *provctx, size_t kbits, size_t blkbits,
-                        size_t ivbits, unsigned int mode, uint64_t flags,
-                        const PROV_CIPHER_HW *hw)
+    size_t ivbits, unsigned int mode, uint64_t flags,
+    const PROV_CIPHER_HW *hw)
 {
     PROV_DES_CTX *ctx;
 
@@ -40,7 +40,7 @@ static void *des_newctx(void *provctx, size_t kbits, size_t blkbits,
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx != NULL)
         ossl_cipher_generic_initkey(ctx, kbits, blkbits, ivbits, mode, flags,
-                                    hw, provctx);
+            hw, provctx);
     return ctx;
 }
 
@@ -65,12 +65,12 @@ static void des_freectx(void *vctx)
     PROV_DES_CTX *ctx = (PROV_DES_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static int des_init(void *vctx, const unsigned char *key, size_t keylen,
-                    const unsigned char *iv, size_t ivlen,
-                    const OSSL_PARAM params[], int enc)
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[], int enc)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
 
@@ -102,15 +102,15 @@ static int des_init(void *vctx, const unsigned char *key, size_t keylen,
 }
 
 static int des_einit(void *vctx, const unsigned char *key, size_t keylen,
-                     const unsigned char *iv, size_t ivlen,
-                     const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return des_init(vctx, key, keylen, iv, ivlen, params, 1);
 }
 
 static int des_dinit(void *vctx, const unsigned char *key, size_t keylen,
-                     const unsigned char *iv, size_t ivlen,
-                     const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return des_init(vctx, key, keylen, iv, ivlen, params, 0);
 }
@@ -128,12 +128,12 @@ static int des_generatekey(PROV_CIPHER_CTX *ctx, void *ptr)
 }
 
 CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_START(des)
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_RANDOM_KEY, NULL, 0),
-CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(des)
+OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_RANDOM_KEY, NULL, 0),
+    CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(des)
 
-static int des_get_ctx_params(void *vctx, OSSL_PARAM params[])
+        static int des_get_ctx_params(void *vctx, OSSL_PARAM params[])
 {
-    PROV_CIPHER_CTX  *ctx = (PROV_CIPHER_CTX *)vctx;
+    PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
     OSSL_PARAM *p;
 
     if (!ossl_cipher_generic_get_ctx_params(vctx, params))
@@ -147,45 +147,45 @@ static int des_get_ctx_params(void *vctx, OSSL_PARAM params[])
     return 1;
 }
 
-#define IMPLEMENT_des_cipher(type, lcmode, UCMODE, flags,                      \
-                             kbits, blkbits, ivbits, block)                    \
-static OSSL_FUNC_cipher_newctx_fn type##_##lcmode##_newctx;                    \
-static void *des_##lcmode##_newctx(void *provctx)                              \
-{                                                                              \
-    return des_newctx(provctx, kbits, blkbits, ivbits,                         \
-                      EVP_CIPH_##UCMODE##_MODE, flags,                         \
-                      ossl_prov_cipher_hw_des_##lcmode());                          \
-}                                                                              \
-static OSSL_FUNC_cipher_get_params_fn des_##lcmode##_get_params;               \
-static int des_##lcmode##_get_params(OSSL_PARAM params[])                      \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
-                                          flags, kbits, blkbits, ivbits);      \
-}                                                                              \
-const OSSL_DISPATCH ossl_##des_##lcmode##_functions[] = {                      \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))des_einit },              \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))des_dinit },              \
-    { OSSL_FUNC_CIPHER_UPDATE,                                                 \
-      (void (*)(void))ossl_cipher_generic_##block##_update },                  \
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_cipher_generic_##block##_final },\
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },   \
-    { OSSL_FUNC_CIPHER_NEWCTX,                                                 \
-      (void (*)(void))des_##lcmode##_newctx },                                 \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))des_dupctx },                   \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))des_freectx },                 \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-      (void (*)(void))des_##lcmode##_get_params },                             \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS, (void (*)(void))des_get_ctx_params },   \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))des_gettable_ctx_params },                               \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-     (void (*)(void))ossl_cipher_generic_set_ctx_params },                     \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-     (void (*)(void))ossl_cipher_generic_settable_ctx_params },                \
-    OSSL_DISPATCH_END                                                          \
-}
+#define IMPLEMENT_des_cipher(type, lcmode, UCMODE, flags,                                \
+    kbits, blkbits, ivbits, block)                                                       \
+    static OSSL_FUNC_cipher_newctx_fn type##_##lcmode##_newctx;                          \
+    static void *des_##lcmode##_newctx(void *provctx)                                    \
+    {                                                                                    \
+        return des_newctx(provctx, kbits, blkbits, ivbits,                               \
+            EVP_CIPH_##UCMODE##_MODE, flags,                                             \
+            ossl_prov_cipher_hw_des_##lcmode());                                         \
+    }                                                                                    \
+    static OSSL_FUNC_cipher_get_params_fn des_##lcmode##_get_params;                     \
+    static int des_##lcmode##_get_params(OSSL_PARAM params[])                            \
+    {                                                                                    \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,          \
+            flags, kbits, blkbits, ivbits);                                              \
+    }                                                                                    \
+    const OSSL_DISPATCH ossl_##des_##lcmode##_functions[] = {                            \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))des_einit },                    \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))des_dinit },                    \
+        { OSSL_FUNC_CIPHER_UPDATE,                                                       \
+            (void (*)(void))ossl_cipher_generic_##block##_update },                      \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_cipher_generic_##block##_final }, \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },         \
+        { OSSL_FUNC_CIPHER_NEWCTX,                                                       \
+            (void (*)(void))des_##lcmode##_newctx },                                     \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))des_dupctx },                         \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))des_freectx },                       \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                                   \
+            (void (*)(void))des_##lcmode##_get_params },                                 \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                              \
+            (void (*)(void))ossl_cipher_generic_gettable_params },                       \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS, (void (*)(void))des_get_ctx_params },         \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                          \
+            (void (*)(void))des_gettable_ctx_params },                                   \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                               \
+            (void (*)(void))ossl_cipher_generic_set_ctx_params },                        \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                          \
+            (void (*)(void))ossl_cipher_generic_settable_ctx_params },                   \
+        OSSL_DISPATCH_END                                                                \
+    }
 
 /* ossl_des_ecb_functions */
 IMPLEMENT_des_cipher(des, ecb, ECB, DES_FLAGS, 64, 64, 0, block);
diff --git a/providers/implementations/ciphers/cipher_des.h b/providers/implementations/ciphers/cipher_des.h
index ad10f63d8b16e..9fd72f00688ca 100644
--- a/providers/implementations/ciphers/cipher_des.h
+++ b/providers/implementations/ciphers/cipher_des.h
@@ -13,14 +13,14 @@
 #define TDES_FLAGS 0
 
 typedef struct prov_des_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         DES_key_schedule ks;
     } dks;
     union {
-        void (*cbc) (const void *, void *, size_t,
-                     const DES_key_schedule *, unsigned char *);
+        void (*cbc)(const void *, void *, size_t,
+            const DES_key_schedule *, unsigned char *);
     } dstream;
 
 } PROV_DES_CTX;
diff --git a/providers/implementations/ciphers/cipher_des_hw.c b/providers/implementations/ciphers/cipher_des_hw.c
index a2d54b46ba116..724cda6920bf9 100644
--- a/providers/implementations/ciphers/cipher_des_hw.c
+++ b/providers/implementations/ciphers/cipher_des_hw.c
@@ -17,7 +17,7 @@
 #include "cipher_des.h"
 
 static int cipher_hw_des_initkey(PROV_CIPHER_CTX *ctx,
-                                 const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     PROV_DES_CTX *dctx = (PROV_DES_CTX *)ctx;
     DES_cblock *deskey = (DES_cblock *)key;
@@ -28,8 +28,7 @@ static int cipher_hw_des_initkey(PROV_CIPHER_CTX *ctx,
     if (SPARC_DES_CAPABLE) {
         if (ctx->mode == EVP_CIPH_CBC_MODE) {
             des_t4_key_expand(&deskey[0], ks);
-            dctx->dstream.cbc = ctx->enc ? des_t4_cbc_encrypt :
-                                           des_t4_cbc_decrypt;
+            dctx->dstream.cbc = ctx->enc ? des_t4_cbc_encrypt : des_t4_cbc_decrypt;
             return 1;
         }
     }
@@ -39,7 +38,7 @@ static int cipher_hw_des_initkey(PROV_CIPHER_CTX *ctx,
 }
 
 static void cipher_hw_des_copyctx(PROV_CIPHER_CTX *dst,
-                                  const PROV_CIPHER_CTX *src)
+    const PROV_CIPHER_CTX *src)
 {
     PROV_DES_CTX *sctx = (PROV_DES_CTX *)src;
     PROV_DES_CTX *dctx = (PROV_DES_CTX *)dst;
@@ -49,7 +48,7 @@ static void cipher_hw_des_copyctx(PROV_CIPHER_CTX *dst,
 }
 
 static int cipher_hw_des_ecb_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                    const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     size_t i, bl = ctx->blocksize;
     DES_key_schedule *key = &(((PROV_DES_CTX *)ctx)->dks.ks);
@@ -58,36 +57,36 @@ static int cipher_hw_des_ecb_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
         return 1;
     for (i = 0, len -= bl; i <= len; i += bl)
         DES_ecb_encrypt((const_DES_cblock *)(in + i),
-                        (const_DES_cblock *)(out + i), key, ctx->enc);
+            (const_DES_cblock *)(out + i), key, ctx->enc);
     return 1;
 }
 
 static int cipher_hw_des_cbc_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                    const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     PROV_DES_CTX *dctx = (PROV_DES_CTX *)ctx;
     DES_key_schedule *key = &(dctx->dks.ks);
 
     if (dctx->dstream.cbc != NULL) {
-        (*dctx->dstream.cbc) (in, out, len, key, ctx->iv);
+        (*dctx->dstream.cbc)(in, out, len, key, ctx->iv);
         return 1;
     }
 
     while (len >= MAXCHUNK) {
         DES_ncbc_encrypt(in, out, MAXCHUNK, key, (DES_cblock *)ctx->iv,
-                         ctx->enc);
+            ctx->enc);
         len -= MAXCHUNK;
         in += MAXCHUNK;
         out += MAXCHUNK;
     }
     if (len > 0)
         DES_ncbc_encrypt(in, out, (long)len, key, (DES_cblock *)ctx->iv,
-                         ctx->enc);
+            ctx->enc);
     return 1;
 }
 
 static int cipher_hw_des_ofb64_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                      const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     int num = ctx->num;
     DES_key_schedule *key = &(((PROV_DES_CTX *)ctx)->dks.ks);
@@ -106,7 +105,7 @@ static int cipher_hw_des_ofb64_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int cipher_hw_des_cfb64_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                      const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     size_t chunk = MAXCHUNK;
     DES_key_schedule *key = &(((PROV_DES_CTX *)ctx)->dks.ks);
@@ -116,7 +115,7 @@ static int cipher_hw_des_cfb64_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
         chunk = len;
     while (len > 0 && len >= chunk) {
         DES_cfb64_encrypt(in, out, (long)chunk, key, (DES_cblock *)ctx->iv,
-                          &num, ctx->enc);
+            &num, ctx->enc);
         len -= chunk;
         in += chunk;
         out += chunk;
@@ -132,7 +131,7 @@ static int cipher_hw_des_cfb64_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
  * way, so wrap it here
  */
 static int cipher_hw_des_cfb1_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                     const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     size_t n, chunk = MAXCHUNK / 8;
     DES_key_schedule *key = &(((PROV_DES_CTX *)ctx)->dks.ks);
@@ -146,9 +145,7 @@ static int cipher_hw_des_cfb1_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
         for (n = 0; n < chunk * 8; ++n) {
             c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;
             DES_cfb_encrypt(c, d, 1, 1, key, (DES_cblock *)ctx->iv, ctx->enc);
-            out[n / 8] =
-                (out[n / 8] & ~(0x80 >> (unsigned int)(n % 8))) |
-                ((d[0] & 0x80) >> (unsigned int)(n % 8));
+            out[n / 8] = (out[n / 8] & ~(0x80 >> (unsigned int)(n % 8))) | ((d[0] & 0x80) >> (unsigned int)(n % 8));
         }
         inl -= chunk;
         in += chunk;
@@ -161,37 +158,37 @@ static int cipher_hw_des_cfb1_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int cipher_hw_des_cfb8_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                     const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     DES_key_schedule *key = &(((PROV_DES_CTX *)ctx)->dks.ks);
 
     while (inl >= MAXCHUNK) {
         DES_cfb_encrypt(in, out, 8, (long)MAXCHUNK, key,
-                        (DES_cblock *)ctx->iv, ctx->enc);
+            (DES_cblock *)ctx->iv, ctx->enc);
         inl -= MAXCHUNK;
         in += MAXCHUNK;
         out += MAXCHUNK;
     }
     if (inl > 0)
         DES_cfb_encrypt(in, out, 8, (long)inl, key,
-                        (DES_cblock *)ctx->iv, ctx->enc);
+            (DES_cblock *)ctx->iv, ctx->enc);
     return 1;
 }
 
-#define PROV_CIPHER_HW_des_mode(mode)                                          \
-static const PROV_CIPHER_HW des_##mode = {                                     \
-    cipher_hw_des_initkey,                                                     \
-    cipher_hw_des_##mode##_cipher,                                             \
-    cipher_hw_des_copyctx                                                      \
-};                                                                             \
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_des_##mode(void)                     \
-{                                                                              \
-    return &des_##mode;                                                        \
-}
+#define PROV_CIPHER_HW_des_mode(mode)                          \
+    static const PROV_CIPHER_HW des_##mode = {                 \
+        cipher_hw_des_initkey,                                 \
+        cipher_hw_des_##mode##_cipher,                         \
+        cipher_hw_des_copyctx                                  \
+    };                                                         \
+    const PROV_CIPHER_HW *ossl_prov_cipher_hw_des_##mode(void) \
+    {                                                          \
+        return &des_##mode;                                    \
+    }
 
 PROV_CIPHER_HW_des_mode(ecb)
-PROV_CIPHER_HW_des_mode(cbc)
-PROV_CIPHER_HW_des_mode(ofb64)
-PROV_CIPHER_HW_des_mode(cfb64)
-PROV_CIPHER_HW_des_mode(cfb1)
-PROV_CIPHER_HW_des_mode(cfb8)
+    PROV_CIPHER_HW_des_mode(cbc)
+        PROV_CIPHER_HW_des_mode(ofb64)
+            PROV_CIPHER_HW_des_mode(cfb64)
+                PROV_CIPHER_HW_des_mode(cfb1)
+                    PROV_CIPHER_HW_des_mode(cfb8)
diff --git a/providers/implementations/ciphers/cipher_desx.c b/providers/implementations/ciphers/cipher_desx.c
index 41596554435ee..733d6364e90e7 100644
--- a/providers/implementations/ciphers/cipher_desx.c
+++ b/providers/implementations/ciphers/cipher_desx.c
@@ -17,5 +17,4 @@
 #include "prov/implementations.h"
 
 /* desx_cbc_functions */
-IMPLEMENT_tdes_cipher(desx, DESX, cbc, CBC, TDES_FLAGS, 64*3, 64, 64, block);
-
+IMPLEMENT_tdes_cipher(desx, DESX, cbc, CBC, TDES_FLAGS, 64 * 3, 64, 64, block);
diff --git a/providers/implementations/ciphers/cipher_desx_hw.c b/providers/implementations/ciphers/cipher_desx_hw.c
index 31fd18e54ce5c..9fd02e6e08e95 100644
--- a/providers/implementations/ciphers/cipher_desx_hw.c
+++ b/providers/implementations/ciphers/cipher_desx_hw.c
@@ -25,7 +25,7 @@
 #define ks3 tks.ks[2].ks[0].cblock
 
 static int cipher_hw_desx_cbc_initkey(PROV_CIPHER_CTX *ctx,
-                                      const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     PROV_TDES_CTX *tctx = (PROV_TDES_CTX *)ctx;
     DES_cblock *deskey = (DES_cblock *)key;
@@ -38,7 +38,7 @@ static int cipher_hw_desx_cbc_initkey(PROV_CIPHER_CTX *ctx,
 }
 
 static void cipher_hw_desx_copyctx(PROV_CIPHER_CTX *dst,
-                                   const PROV_CIPHER_CTX *src)
+    const PROV_CIPHER_CTX *src)
 {
     PROV_TDES_CTX *sctx = (PROV_TDES_CTX *)src;
     PROV_TDES_CTX *dctx = (PROV_TDES_CTX *)dst;
@@ -48,22 +48,22 @@ static void cipher_hw_desx_copyctx(PROV_CIPHER_CTX *dst,
 }
 
 static int cipher_hw_desx_cbc(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     PROV_TDES_CTX *tctx = (PROV_TDES_CTX *)ctx;
 
     while (inl >= MAXCHUNK) {
         DES_xcbc_encrypt(in, out, (long)MAXCHUNK, &tctx->ks1,
-                         (DES_cblock *)ctx->iv, &tctx->ks2, &tctx->ks3,
-                         ctx->enc);
+            (DES_cblock *)ctx->iv, &tctx->ks2, &tctx->ks3,
+            ctx->enc);
         inl -= MAXCHUNK;
         in += MAXCHUNK;
         out += MAXCHUNK;
     }
     if (inl > 0)
         DES_xcbc_encrypt(in, out, (long)inl, &tctx->ks1,
-                         (DES_cblock *)ctx->iv, &tctx->ks2, &tctx->ks3,
-                         ctx->enc);
+            (DES_cblock *)ctx->iv, &tctx->ks2, &tctx->ks3,
+            ctx->enc);
     return 1;
 }
 
diff --git a/providers/implementations/ciphers/cipher_idea.c b/providers/implementations/ciphers/cipher_idea.c
index c69c6ac092b4d..d32d1eae5e42d 100644
--- a/providers/implementations/ciphers/cipher_idea.c
+++ b/providers/implementations/ciphers/cipher_idea.c
@@ -28,7 +28,7 @@ static void idea_freectx(void *vctx)
     PROV_IDEA_CTX *ctx = (PROV_IDEA_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *idea_dupctx(void *ctx)
@@ -54,4 +54,4 @@ IMPLEMENT_generic_cipher(idea, IDEA, cbc, CBC, 0, 128, 64, 64, block)
 /* ossl_idea128ofb64_functions */
 IMPLEMENT_generic_cipher(idea, IDEA, ofb64, OFB, 0, 128, 8, 64, stream)
 /* ossl_idea128cfb64_functions */
-IMPLEMENT_generic_cipher(idea, IDEA, cfb64,  CFB, 0, 128, 8, 64, stream)
+IMPLEMENT_generic_cipher(idea, IDEA, cfb64, CFB, 0, 128, 8, 64, stream)
diff --git a/providers/implementations/ciphers/cipher_idea.h b/providers/implementations/ciphers/cipher_idea.h
index 212efa8af5750..44f9571ff370d 100644
--- a/providers/implementations/ciphers/cipher_idea.h
+++ b/providers/implementations/ciphers/cipher_idea.h
@@ -11,7 +11,7 @@
 #include "prov/ciphercommon.h"
 
 typedef struct prov_idea_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         IDEA_KEY_SCHEDULE ks;
diff --git a/providers/implementations/ciphers/cipher_idea_hw.c b/providers/implementations/ciphers/cipher_idea_hw.c
index 1c451b77edc4e..0107397c53fc9 100644
--- a/providers/implementations/ciphers/cipher_idea_hw.c
+++ b/providers/implementations/ciphers/cipher_idea_hw.c
@@ -17,14 +17,14 @@
 #include "cipher_idea.h"
 
 static int cipher_hw_idea_initkey(PROV_CIPHER_CTX *ctx,
-                                  const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
-    PROV_IDEA_CTX *ictx =  (PROV_IDEA_CTX *)ctx;
+    PROV_IDEA_CTX *ictx = (PROV_IDEA_CTX *)ctx;
     IDEA_KEY_SCHEDULE *ks = &(ictx->ks.ks);
 
     if (ctx->enc
-            || ctx->mode == EVP_CIPH_OFB_MODE
-            || ctx->mode == EVP_CIPH_CFB_MODE) {
+        || ctx->mode == EVP_CIPH_OFB_MODE
+        || ctx->mode == EVP_CIPH_CFB_MODE) {
         IDEA_set_encrypt_key(key, ks);
     } else {
         IDEA_KEY_SCHEDULE tmp;
@@ -36,28 +36,28 @@ static int cipher_hw_idea_initkey(PROV_CIPHER_CTX *ctx,
     return 1;
 }
 
-# define PROV_CIPHER_HW_idea_mode_ex(mode, UCMODE, fname)                      \
-IMPLEMENT_CIPHER_HW_##UCMODE(mode, idea, PROV_IDEA_CTX, IDEA_KEY_SCHEDULE,     \
-                             fname)                                            \
-static const PROV_CIPHER_HW idea_##mode = {                                    \
-    cipher_hw_idea_initkey,                                                    \
-    cipher_hw_idea_##mode##_cipher                                             \
-};                                                                             \
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_idea_##mode(size_t keybits)          \
-{                                                                              \
-    return &idea_##mode;                                                       \
-}
+#define PROV_CIPHER_HW_idea_mode_ex(mode, UCMODE, fname)                       \
+    IMPLEMENT_CIPHER_HW_##UCMODE(mode, idea, PROV_IDEA_CTX, IDEA_KEY_SCHEDULE, \
+        fname) static const PROV_CIPHER_HW idea_##mode                         \
+        = {                                                                    \
+              cipher_hw_idea_initkey,                                          \
+              cipher_hw_idea_##mode##_cipher                                   \
+          };                                                                   \
+    const PROV_CIPHER_HW *ossl_prov_cipher_hw_idea_##mode(size_t keybits)      \
+    {                                                                          \
+        return &idea_##mode;                                                   \
+    }
 
-# define PROV_CIPHER_HW_idea_mode(mode, UCMODE)                                \
+#define PROV_CIPHER_HW_idea_mode(mode, UCMODE) \
     PROV_CIPHER_HW_idea_mode_ex(mode, UCMODE, IDEA_##mode)
 
 PROV_CIPHER_HW_idea_mode(cbc, CBC)
-PROV_CIPHER_HW_idea_mode(ofb64, OFB)
-PROV_CIPHER_HW_idea_mode(cfb64, CFB)
+    PROV_CIPHER_HW_idea_mode(ofb64, OFB)
+        PROV_CIPHER_HW_idea_mode(cfb64, CFB)
 /*
  * IDEA_ecb_encrypt() does not have a enc parameter  - so we create a macro
  * that ignores this parameter when IMPLEMENT_CIPHER_HW_ecb() is called.
  */
 #define IDEA2_ecb_encrypt(in, out, ks, enc) IDEA_ecb_encrypt(in, out, ks)
 
-PROV_CIPHER_HW_idea_mode_ex(ecb, ECB, IDEA2_ecb)
+            PROV_CIPHER_HW_idea_mode_ex(ecb, ECB, IDEA2_ecb)
diff --git a/providers/implementations/ciphers/cipher_null.c b/providers/implementations/ciphers/cipher_null.c
index 7e934093ce5aa..227d79c02fe5e 100644
--- a/providers/implementations/ciphers/cipher_null.c
+++ b/providers/implementations/ciphers/cipher_null.c
@@ -38,8 +38,8 @@ static void null_freectx(void *vctx)
 
 static OSSL_FUNC_cipher_encrypt_init_fn null_einit;
 static int null_einit(void *vctx, const unsigned char *key, size_t keylen,
-                      const unsigned char *iv, size_t ivlen,
-                      const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     PROV_CIPHER_NULL_CTX *ctx = (PROV_CIPHER_NULL_CTX *)vctx;
 
@@ -52,8 +52,8 @@ static int null_einit(void *vctx, const unsigned char *key, size_t keylen,
 
 static OSSL_FUNC_cipher_decrypt_init_fn null_dinit;
 static int null_dinit(void *vctx, const unsigned char *key, size_t keylen,
-                      const unsigned char *iv, size_t ivlen,
-                      const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     if (!ossl_prov_is_running())
         return 0;
@@ -63,7 +63,7 @@ static int null_dinit(void *vctx, const unsigned char *key, size_t keylen,
 
 static OSSL_FUNC_cipher_cipher_fn null_cipher;
 static int null_cipher(void *vctx, unsigned char *out, size_t *outl,
-                       size_t outsize, const unsigned char *in, size_t inl)
+    size_t outsize, const unsigned char *in, size_t inl)
 {
     PROV_CIPHER_NULL_CTX *ctx = (PROV_CIPHER_NULL_CTX *)vctx;
 
@@ -90,7 +90,7 @@ static int null_cipher(void *vctx, unsigned char *out, size_t *outl,
 
 static OSSL_FUNC_cipher_final_fn null_final;
 static int null_final(void *vctx, unsigned char *out, size_t *outl,
-                      size_t outsize)
+    size_t outsize)
 {
     if (!ossl_prov_is_running())
         return 0;
@@ -114,7 +114,7 @@ static const OSSL_PARAM null_known_gettable_ctx_params[] = {
 
 static OSSL_FUNC_cipher_gettable_ctx_params_fn null_gettable_ctx_params;
 static const OSSL_PARAM *null_gettable_ctx_params(ossl_unused void *cctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return null_known_gettable_ctx_params;
 }
@@ -151,12 +151,11 @@ static const OSSL_PARAM null_known_settable_ctx_params[] = {
 
 static OSSL_FUNC_cipher_settable_ctx_params_fn null_settable_ctx_params;
 static const OSSL_PARAM *null_settable_ctx_params(ossl_unused void *cctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return null_known_settable_ctx_params;
 }
 
-
 static OSSL_FUNC_cipher_set_ctx_params_fn null_set_ctx_params;
 static int null_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 {
@@ -176,22 +175,22 @@ static int null_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 
 const OSSL_DISPATCH ossl_null_functions[] = {
     { OSSL_FUNC_CIPHER_NEWCTX,
-      (void (*)(void)) null_newctx },
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void)) null_freectx },
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void)) null_newctx },
+        (void (*)(void))null_newctx },
+    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))null_freectx },
+    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))null_newctx },
     { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))null_einit },
     { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))null_dinit },
     { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))null_cipher },
     { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))null_final },
     { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))null_cipher },
-    { OSSL_FUNC_CIPHER_GET_PARAMS, (void (*)(void)) null_get_params },
+    { OSSL_FUNC_CIPHER_GET_PARAMS, (void (*)(void))null_get_params },
     { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,
         (void (*)(void))ossl_cipher_generic_gettable_params },
     { OSSL_FUNC_CIPHER_GET_CTX_PARAMS, (void (*)(void))null_get_ctx_params },
     { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,
-      (void (*)(void))null_gettable_ctx_params },
+        (void (*)(void))null_gettable_ctx_params },
     { OSSL_FUNC_CIPHER_SET_CTX_PARAMS, (void (*)(void))null_set_ctx_params },
     { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,
-      (void (*)(void))null_settable_ctx_params },
+        (void (*)(void))null_settable_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/ciphers/cipher_rc2.c b/providers/implementations/ciphers/cipher_rc2.c
index c535bd7e9724c..e79674868c45b 100644
--- a/providers/implementations/ciphers/cipher_rc2.c
+++ b/providers/implementations/ciphers/cipher_rc2.c
@@ -20,10 +20,10 @@
 #include "prov/implementations.h"
 #include "prov/providercommon.h"
 
-#define RC2_40_MAGIC    0xa0
-#define RC2_64_MAGIC    0x78
-#define RC2_128_MAGIC   0x3a
-#define RC2_FLAGS       PROV_CIPHER_FLAG_VARIABLE_LENGTH
+#define RC2_40_MAGIC 0xa0
+#define RC2_64_MAGIC 0x78
+#define RC2_128_MAGIC 0x3a
+#define RC2_FLAGS PROV_CIPHER_FLAG_VARIABLE_LENGTH
 
 static OSSL_FUNC_cipher_encrypt_init_fn rc2_einit;
 static OSSL_FUNC_cipher_decrypt_init_fn rc2_dinit;
@@ -38,7 +38,7 @@ static void rc2_freectx(void *vctx)
     PROV_RC2_CTX *ctx = (PROV_RC2_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *rc2_dupctx(void *ctx)
@@ -86,8 +86,8 @@ static int rc2_magic_to_keybits(int magic)
 }
 
 static int rc2_einit(void *ctx, const unsigned char *key, size_t keylen,
-                          const unsigned char *iv, size_t ivlen,
-                          const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     if (!ossl_cipher_generic_einit(ctx, key, keylen, iv, ivlen, NULL))
         return 0;
@@ -95,8 +95,8 @@ static int rc2_einit(void *ctx, const unsigned char *key, size_t keylen,
 }
 
 static int rc2_dinit(void *ctx, const unsigned char *key, size_t keylen,
-                          const unsigned char *iv, size_t ivlen,
-                          const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     if (!ossl_cipher_generic_dinit(ctx, key, keylen, iv, ivlen, NULL))
         return 0;
@@ -139,7 +139,7 @@ static int rc2_get_ctx_params(void *vctx, OSSL_PARAM params[])
         /* Is this the original IV or the running IV? */
         num = rc2_keybits_to_magic(ctx->key_bits);
         if (!ASN1_TYPE_set_int_octetstring(type, num,
-                                           ctx->base.iv, ctx->base.ivlen)) {
+                ctx->base.iv, ctx->base.ivlen)) {
             ASN1_TYPE_free(type);
             ERR_raise(ERR_LIB_PROV, ERR_R_ASN1_LIB);
             return 0;
@@ -183,7 +183,7 @@ static int rc2_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         return 0;
     p = OSSL_PARAM_locate_const(params, OSSL_CIPHER_PARAM_RC2_KEYBITS);
     if (p != NULL) {
-         if (!OSSL_PARAM_get_size_t(p, &ctx->key_bits)) {
+        if (!OSSL_PARAM_get_size_t(p, &ctx->key_bits)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GET_PARAMETER);
             return 0;
         }
@@ -200,7 +200,7 @@ static int rc2_set_ctx_params(void *vctx, const OSSL_PARAM params[])
             || ctx->base.ivlen > sizeof(iv)
             || (type = d2i_ASN1_TYPE(NULL, &d, p->data_size)) == NULL
             || ((size_t)ASN1_TYPE_get_int_octetstring(type, &num, iv,
-                                                      ctx->base.ivlen)
+                    ctx->base.ivlen)
                 != ctx->base.ivlen)
             || !ossl_cipher_generic_initiv(&ctx->base, iv, ctx->base.ivlen)
             || (ctx->key_bits = rc2_magic_to_keybits(num)) == 0) {
@@ -222,66 +222,66 @@ static int rc2_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 
 CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_START(rc2)
 OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_RC2_KEYBITS, NULL),
-OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_ALGORITHM_ID_PARAMS, NULL, 0),
-CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(rc2)
+    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_ALGORITHM_ID_PARAMS, NULL, 0),
+    CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(rc2)
 
-CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_START(rc2)
-OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
-OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_RC2_KEYBITS, NULL),
-OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_ALGORITHM_ID_PARAMS, NULL, 0),
-CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(rc2)
+        CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_START(rc2)
+            OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
+    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_RC2_KEYBITS, NULL),
+    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_ALGORITHM_ID_PARAMS, NULL, 0),
+    CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(rc2)
 
-#define IMPLEMENT_cipher(alg, UCALG, lcmode, UCMODE, flags, kbits, blkbits,    \
-                         ivbits, typ)                                          \
-static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lcmode##_get_params;   \
-static int alg##_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])          \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
-                                          flags, kbits, blkbits, ivbits);      \
-}                                                                              \
-static OSSL_FUNC_cipher_newctx_fn alg##_##kbits##_##lcmode##_newctx;           \
-static void *alg##_##kbits##_##lcmode##_newctx(void *provctx)                  \
-{                                                                              \
-     PROV_##UCALG##_CTX *ctx;                                                  \
-     if (!ossl_prov_is_running())                                              \
-        return NULL;                                                           \
-     ctx = OPENSSL_zalloc(sizeof(*ctx));                                       \
-     if (ctx != NULL) {                                                        \
-         ossl_cipher_generic_initkey(ctx, kbits, blkbits, ivbits,              \
-                                EVP_CIPH_##UCMODE##_MODE, flags,               \
-                                ossl_prov_cipher_hw_##alg##_##lcmode(kbits),   \
-                                NULL);                                         \
-         ctx->key_bits = kbits;                                                \
-     }                                                                         \
-     return ctx;                                                               \
-}                                                                              \
-const OSSL_DISPATCH ossl_##alg##kbits##lcmode##_functions[] = {                \
-    { OSSL_FUNC_CIPHER_NEWCTX,                                                 \
-      (void (*)(void)) alg##_##kbits##_##lcmode##_newctx },                    \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void)) alg##_freectx },              \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void)) alg##_dupctx },                \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))rc2_einit },              \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))rc2_dinit },              \
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_cipher_generic_##typ##_update },\
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_cipher_generic_##typ##_final },  \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },   \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-      (void (*)(void)) alg##_##kbits##_##lcmode##_get_params },                \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-      (void (*)(void))rc2_get_ctx_params },                                    \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))rc2_gettable_ctx_params },                               \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-      (void (*)(void))rc2_set_ctx_params },                                    \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-     (void (*)(void))rc2_settable_ctx_params },                                \
-    OSSL_DISPATCH_END                                                          \
-};
+#define IMPLEMENT_cipher(alg, UCALG, lcmode, UCMODE, flags, kbits, blkbits,              \
+    ivbits, typ)                                                                         \
+    static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lcmode##_get_params;         \
+    static int alg##_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])                \
+    {                                                                                    \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,          \
+            flags, kbits, blkbits, ivbits);                                              \
+    }                                                                                    \
+    static OSSL_FUNC_cipher_newctx_fn alg##_##kbits##_##lcmode##_newctx;                 \
+    static void *alg##_##kbits##_##lcmode##_newctx(void *provctx)                        \
+    {                                                                                    \
+        PROV_##UCALG##_CTX *ctx;                                                         \
+        if (!ossl_prov_is_running())                                                     \
+            return NULL;                                                                 \
+        ctx = OPENSSL_zalloc(sizeof(*ctx));                                              \
+        if (ctx != NULL) {                                                               \
+            ossl_cipher_generic_initkey(ctx, kbits, blkbits, ivbits,                     \
+                EVP_CIPH_##UCMODE##_MODE, flags,                                         \
+                ossl_prov_cipher_hw_##alg##_##lcmode(kbits),                             \
+                NULL);                                                                   \
+            ctx->key_bits = kbits;                                                       \
+        }                                                                                \
+        return ctx;                                                                      \
+    }                                                                                    \
+    const OSSL_DISPATCH ossl_##alg##kbits##lcmode##_functions[] = {                      \
+        { OSSL_FUNC_CIPHER_NEWCTX,                                                       \
+            (void (*)(void))alg##_##kbits##_##lcmode##_newctx },                         \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))alg##_freectx },                     \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))alg##_dupctx },                       \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))rc2_einit },                    \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))rc2_dinit },                    \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_cipher_generic_##typ##_update }, \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_cipher_generic_##typ##_final },   \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },         \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                                   \
+            (void (*)(void))alg##_##kbits##_##lcmode##_get_params },                     \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                              \
+            (void (*)(void))ossl_cipher_generic_gettable_params },                       \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                               \
+            (void (*)(void))rc2_get_ctx_params },                                        \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                          \
+            (void (*)(void))rc2_gettable_ctx_params },                                   \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                               \
+            (void (*)(void))rc2_set_ctx_params },                                        \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                          \
+            (void (*)(void))rc2_settable_ctx_params },                                   \
+        OSSL_DISPATCH_END                                                                \
+    };
 
-/* ossl_rc2128ecb_functions */
-IMPLEMENT_cipher(rc2, RC2, ecb, ECB, RC2_FLAGS, 128, 64, 0, block)
+    /* ossl_rc2128ecb_functions */
+    IMPLEMENT_cipher(rc2, RC2, ecb, ECB, RC2_FLAGS, 128, 64, 0, block)
 /* ossl_rc2128cbc_functions */
 IMPLEMENT_cipher(rc2, RC2, cbc, CBC, RC2_FLAGS, 128, 64, 64, block)
 /* ossl_rc240cbc_functions */
diff --git a/providers/implementations/ciphers/cipher_rc2.h b/providers/implementations/ciphers/cipher_rc2.h
index 7a4bea5ac4043..bfb1d45495dc5 100644
--- a/providers/implementations/ciphers/cipher_rc2.h
+++ b/providers/implementations/ciphers/cipher_rc2.h
@@ -11,7 +11,7 @@
 #include "prov/ciphercommon.h"
 
 typedef struct prov_rc2_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         RC2_KEY ks;
diff --git a/providers/implementations/ciphers/cipher_rc2_hw.c b/providers/implementations/ciphers/cipher_rc2_hw.c
index da9ff729cda05..c5abe39041425 100644
--- a/providers/implementations/ciphers/cipher_rc2_hw.c
+++ b/providers/implementations/ciphers/cipher_rc2_hw.c
@@ -16,28 +16,28 @@
 #include "cipher_rc2.h"
 
 static int cipher_hw_rc2_initkey(PROV_CIPHER_CTX *ctx,
-                                 const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
-    PROV_RC2_CTX *rctx =  (PROV_RC2_CTX *)ctx;
+    PROV_RC2_CTX *rctx = (PROV_RC2_CTX *)ctx;
     RC2_KEY *ks = &(rctx->ks.ks);
 
     RC2_set_key(ks, (int)ctx->keylen, key, (int)rctx->key_bits);
     return 1;
 }
 
-# define PROV_CIPHER_HW_rc2_mode(mode, UCMODE)                                 \
-IMPLEMENT_CIPHER_HW_##UCMODE(mode, rc2, PROV_RC2_CTX, RC2_KEY,                 \
-                             RC2_##mode)                                       \
-static const PROV_CIPHER_HW rc2_##mode = {                                     \
-    cipher_hw_rc2_initkey,                                                     \
-    cipher_hw_rc2_##mode##_cipher                                              \
-};                                                                             \
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_rc2_##mode(size_t keybits)           \
-{                                                                              \
-    return &rc2_##mode;                                                        \
-}
+#define PROV_CIPHER_HW_rc2_mode(mode, UCMODE)                            \
+    IMPLEMENT_CIPHER_HW_##UCMODE(mode, rc2, PROV_RC2_CTX, RC2_KEY,       \
+        RC2_##mode) static const PROV_CIPHER_HW rc2_##mode               \
+        = {                                                              \
+              cipher_hw_rc2_initkey,                                     \
+              cipher_hw_rc2_##mode##_cipher                              \
+          };                                                             \
+    const PROV_CIPHER_HW *ossl_prov_cipher_hw_rc2_##mode(size_t keybits) \
+    {                                                                    \
+        return &rc2_##mode;                                              \
+    }
 
 PROV_CIPHER_HW_rc2_mode(cbc, CBC)
-PROV_CIPHER_HW_rc2_mode(ecb, ECB)
-PROV_CIPHER_HW_rc2_mode(ofb64, OFB)
-PROV_CIPHER_HW_rc2_mode(cfb64, CFB)
+    PROV_CIPHER_HW_rc2_mode(ecb, ECB)
+        PROV_CIPHER_HW_rc2_mode(ofb64, OFB)
+            PROV_CIPHER_HW_rc2_mode(cfb64, CFB)
diff --git a/providers/implementations/ciphers/cipher_rc4.c b/providers/implementations/ciphers/cipher_rc4.c
index 733524d36f5a2..07a2c813ce64b 100644
--- a/providers/implementations/ciphers/cipher_rc4.c
+++ b/providers/implementations/ciphers/cipher_rc4.c
@@ -31,7 +31,7 @@ static void rc4_freectx(void *vctx)
     PROV_RC4_CTX *ctx = (PROV_RC4_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *rc4_dupctx(void *ctx)
@@ -51,8 +51,8 @@ static void *rc4_dupctx(void *ctx)
 }
 
 static int rc4_einit(void *ctx, const unsigned char *key, size_t keylen,
-                          const unsigned char *iv, size_t ivlen,
-                          const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     if (!ossl_cipher_generic_einit(ctx, key, keylen, iv, ivlen, NULL))
         return 0;
@@ -60,58 +60,58 @@ static int rc4_einit(void *ctx, const unsigned char *key, size_t keylen,
 }
 
 static int rc4_dinit(void *ctx, const unsigned char *key, size_t keylen,
-                          const unsigned char *iv, size_t ivlen,
-                          const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     if (!ossl_cipher_generic_dinit(ctx, key, keylen, iv, ivlen, NULL))
         return 0;
     return ossl_cipher_var_keylen_set_ctx_params(ctx, params);
 }
 
-#define IMPLEMENT_cipher(alg, UCALG, flags, kbits, blkbits, ivbits, typ)       \
-static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_get_params;              \
-static int alg##_##kbits##_get_params(OSSL_PARAM params[])                     \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, 0, flags,                    \
-                                     kbits, blkbits, ivbits);                  \
-}                                                                              \
-static OSSL_FUNC_cipher_newctx_fn alg##_##kbits##_newctx;                      \
-static void *alg##_##kbits##_newctx(void *provctx)                             \
-{                                                                              \
-     PROV_##UCALG##_CTX *ctx;                                                  \
-     if (!ossl_prov_is_running())                                              \
-        return NULL;                                                           \
-     ctx = OPENSSL_zalloc(sizeof(*ctx));                                       \
-     if (ctx != NULL) {                                                        \
-         ossl_cipher_generic_initkey(ctx, kbits, blkbits, ivbits, 0, flags,    \
-                                     ossl_prov_cipher_hw_##alg(kbits), NULL);  \
-     }                                                                         \
-     return ctx;                                                               \
-}                                                                              \
-const OSSL_DISPATCH ossl_##alg##kbits##_functions[] = {                        \
-    { OSSL_FUNC_CIPHER_NEWCTX,                                                 \
-      (void (*)(void)) alg##_##kbits##_newctx },                               \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void)) alg##_freectx },              \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void)) alg##_dupctx },                \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))rc4_einit },              \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))rc4_dinit },              \
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_cipher_generic_##typ##_update },\
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_cipher_generic_##typ##_final },  \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },   \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-      (void (*)(void)) alg##_##kbits##_get_params },                           \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-      (void (*)(void))ossl_cipher_generic_get_ctx_params },                    \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-      (void (*)(void))ossl_cipher_var_keylen_set_ctx_params },                 \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))ossl_cipher_generic_gettable_ctx_params },               \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-     (void (*)(void))ossl_cipher_var_keylen_settable_ctx_params },             \
-    OSSL_DISPATCH_END                                                          \
-};
+#define IMPLEMENT_cipher(alg, UCALG, flags, kbits, blkbits, ivbits, typ)                 \
+    static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_get_params;                    \
+    static int alg##_##kbits##_get_params(OSSL_PARAM params[])                           \
+    {                                                                                    \
+        return ossl_cipher_generic_get_params(params, 0, flags,                          \
+            kbits, blkbits, ivbits);                                                     \
+    }                                                                                    \
+    static OSSL_FUNC_cipher_newctx_fn alg##_##kbits##_newctx;                            \
+    static void *alg##_##kbits##_newctx(void *provctx)                                   \
+    {                                                                                    \
+        PROV_##UCALG##_CTX *ctx;                                                         \
+        if (!ossl_prov_is_running())                                                     \
+            return NULL;                                                                 \
+        ctx = OPENSSL_zalloc(sizeof(*ctx));                                              \
+        if (ctx != NULL) {                                                               \
+            ossl_cipher_generic_initkey(ctx, kbits, blkbits, ivbits, 0, flags,           \
+                ossl_prov_cipher_hw_##alg(kbits), NULL);                                 \
+        }                                                                                \
+        return ctx;                                                                      \
+    }                                                                                    \
+    const OSSL_DISPATCH ossl_##alg##kbits##_functions[] = {                              \
+        { OSSL_FUNC_CIPHER_NEWCTX,                                                       \
+            (void (*)(void))alg##_##kbits##_newctx },                                    \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))alg##_freectx },                     \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))alg##_dupctx },                       \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))rc4_einit },                    \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))rc4_dinit },                    \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_cipher_generic_##typ##_update }, \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_cipher_generic_##typ##_final },   \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },         \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                                   \
+            (void (*)(void))alg##_##kbits##_get_params },                                \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                               \
+            (void (*)(void))ossl_cipher_generic_get_ctx_params },                        \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                               \
+            (void (*)(void))ossl_cipher_var_keylen_set_ctx_params },                     \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                              \
+            (void (*)(void))ossl_cipher_generic_gettable_params },                       \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                          \
+            (void (*)(void))ossl_cipher_generic_gettable_ctx_params },                   \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                          \
+            (void (*)(void))ossl_cipher_var_keylen_settable_ctx_params },                \
+        OSSL_DISPATCH_END                                                                \
+    };
 
 /* ossl_rc440_functions */
 IMPLEMENT_cipher(rc4, RC4, RC4_FLAGS, 40, 8, 0, stream)
diff --git a/providers/implementations/ciphers/cipher_rc4.h b/providers/implementations/ciphers/cipher_rc4.h
index 40d822ceb2ef4..8bb6f226523f5 100644
--- a/providers/implementations/ciphers/cipher_rc4.h
+++ b/providers/implementations/ciphers/cipher_rc4.h
@@ -11,7 +11,7 @@
 #include "prov/ciphercommon.h"
 
 typedef struct prov_rc4_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         RC4_KEY ks;
diff --git a/providers/implementations/ciphers/cipher_rc4_hmac_md5.c b/providers/implementations/ciphers/cipher_rc4_hmac_md5.c
index ec18777143bba..ecb777d305142 100644
--- a/providers/implementations/ciphers/cipher_rc4_hmac_md5.c
+++ b/providers/implementations/ciphers/cipher_rc4_hmac_md5.c
@@ -20,8 +20,8 @@
 #include "prov/implementations.h"
 #include "prov/providercommon.h"
 
-#define RC4_HMAC_MD5_FLAGS (PROV_CIPHER_FLAG_VARIABLE_LENGTH                   \
-                            | PROV_CIPHER_FLAG_AEAD)
+#define RC4_HMAC_MD5_FLAGS (PROV_CIPHER_FLAG_VARIABLE_LENGTH \
+    | PROV_CIPHER_FLAG_AEAD)
 
 #define RC4_HMAC_MD5_KEY_BITS (16 * 8)
 #define RC4_HMAC_MD5_BLOCK_BITS (1 * 8)
@@ -55,13 +55,13 @@ static void *rc4_hmac_md5_newctx(void *provctx)
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx != NULL)
         ossl_cipher_generic_initkey(ctx, RC4_HMAC_MD5_KEY_BITS,
-                                    RC4_HMAC_MD5_BLOCK_BITS,
-                                    RC4_HMAC_MD5_IV_BITS,
-                                    RC4_HMAC_MD5_MODE, RC4_HMAC_MD5_FLAGS,
-                                    ossl_prov_cipher_hw_rc4_hmac_md5(
-                                        RC4_HMAC_MD5_KEY_BITS
-                                    ), NULL);
-     return ctx;
+            RC4_HMAC_MD5_BLOCK_BITS,
+            RC4_HMAC_MD5_IV_BITS,
+            RC4_HMAC_MD5_MODE, RC4_HMAC_MD5_FLAGS,
+            ossl_prov_cipher_hw_rc4_hmac_md5(
+                RC4_HMAC_MD5_KEY_BITS),
+            NULL);
+    return ctx;
 }
 
 static void rc4_hmac_md5_freectx(void *vctx)
@@ -69,7 +69,7 @@ static void rc4_hmac_md5_freectx(void *vctx)
     PROV_RC4_HMAC_MD5_CTX *ctx = (PROV_RC4_HMAC_MD5_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *rc4_hmac_md5_dupctx(void *vctx)
@@ -82,8 +82,8 @@ static void *rc4_hmac_md5_dupctx(void *vctx)
 }
 
 static int rc4_hmac_md5_einit(void *ctx, const unsigned char *key,
-                              size_t keylen, const unsigned char *iv,
-                              size_t ivlen, const OSSL_PARAM params[])
+    size_t keylen, const unsigned char *iv,
+    size_t ivlen, const OSSL_PARAM params[])
 {
     if (!ossl_cipher_generic_einit(ctx, key, keylen, iv, ivlen, NULL))
         return 0;
@@ -91,8 +91,8 @@ static int rc4_hmac_md5_einit(void *ctx, const unsigned char *key,
 }
 
 static int rc4_hmac_md5_dinit(void *ctx, const unsigned char *key,
-                              size_t keylen, const unsigned char *iv,
-                              size_t ivlen, const OSSL_PARAM params[])
+    size_t keylen, const unsigned char *iv,
+    size_t ivlen, const OSSL_PARAM params[])
 {
     if (!ossl_cipher_generic_dinit(ctx, key, keylen, iv, ivlen, NULL))
         return 0;
@@ -106,7 +106,7 @@ static const OSSL_PARAM rc4_hmac_md5_known_gettable_ctx_params[] = {
     OSSL_PARAM_END
 };
 const OSSL_PARAM *rc4_hmac_md5_gettable_ctx_params(ossl_unused void *cctx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return rc4_hmac_md5_known_gettable_ctx_params;
 }
@@ -142,7 +142,7 @@ static const OSSL_PARAM rc4_hmac_md5_known_settable_ctx_params[] = {
     OSSL_PARAM_END
 };
 const OSSL_PARAM *rc4_hmac_md5_settable_ctx_params(ossl_unused void *cctx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return rc4_hmac_md5_known_settable_ctx_params;
 }
@@ -215,10 +215,10 @@ static int rc4_hmac_md5_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 static int rc4_hmac_md5_get_params(OSSL_PARAM params[])
 {
     return ossl_cipher_generic_get_params(params, RC4_HMAC_MD5_MODE,
-                                          RC4_HMAC_MD5_FLAGS,
-                                          RC4_HMAC_MD5_KEY_BITS,
-                                          RC4_HMAC_MD5_BLOCK_BITS,
-                                          RC4_HMAC_MD5_IV_BITS);
+        RC4_HMAC_MD5_FLAGS,
+        RC4_HMAC_MD5_KEY_BITS,
+        RC4_HMAC_MD5_BLOCK_BITS,
+        RC4_HMAC_MD5_IV_BITS);
 }
 
 const OSSL_DISPATCH ossl_rc4_hmac_ossl_md5_functions[] = {
diff --git a/providers/implementations/ciphers/cipher_rc4_hmac_md5.h b/providers/implementations/ciphers/cipher_rc4_hmac_md5.h
index 4a1d154a7ceb1..87fa8e060db8e 100644
--- a/providers/implementations/ciphers/cipher_rc4_hmac_md5.h
+++ b/providers/implementations/ciphers/cipher_rc4_hmac_md5.h
@@ -12,7 +12,7 @@
 #include "prov/ciphercommon.h"
 
 typedef struct prov_rc4_hmac_md5_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         RC4_KEY ks;
@@ -26,11 +26,11 @@ typedef struct prov_cipher_hw_rc4_hmac_md5_st {
     PROV_CIPHER_HW base; /* Must be first */
     int (*tls_init)(PROV_CIPHER_CTX *ctx, unsigned char *aad, size_t aad_len);
     void (*init_mackey)(PROV_CIPHER_CTX *ctx, const unsigned char *key,
-                        size_t len);
+        size_t len);
 
 } PROV_CIPHER_HW_RC4_HMAC_MD5;
 
 const PROV_CIPHER_HW *ossl_prov_cipher_hw_rc4_hmac_md5(size_t keybits);
 
 void rc4_md5_enc(RC4_KEY *key, const void *in0, void *out,
-                 MD5_CTX *ctx, const void *inp, size_t blocks);
+    MD5_CTX *ctx, const void *inp, size_t blocks);
diff --git a/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c b/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c
index 8cce02b1c5afe..9bdb20667922a 100644
--- a/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c
+++ b/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c
@@ -19,26 +19,26 @@
 
 #define NO_PAYLOAD_LENGTH ((size_t)-1)
 
-#if defined(RC4_ASM)                                                           \
-    && defined(MD5_ASM)                                                        \
-    && (defined(__x86_64)                                                      \
-        || defined(__x86_64__)                                                 \
-        || defined(_M_AMD64)                                                   \
+#if defined(RC4_ASM)           \
+    && defined(MD5_ASM)        \
+    && (defined(__x86_64)      \
+        || defined(__x86_64__) \
+        || defined(_M_AMD64)   \
         || defined(_M_X64))
-# define STITCHED_CALL
-# define MOD 32 /* 32 is $MOD from rc4_md5-x86_64.pl */
+#define STITCHED_CALL
+#define MOD 32 /* 32 is $MOD from rc4_md5-x86_64.pl */
 #else
-# define rc4_off 0
-# define md5_off 0
+#define rc4_off 0
+#define md5_off 0
 #endif
 
 static int cipher_hw_rc4_hmac_md5_initkey(PROV_CIPHER_CTX *bctx,
-                                          const uint8_t *key, size_t keylen)
+    const uint8_t *key, size_t keylen)
 {
     PROV_RC4_HMAC_MD5_CTX *ctx = (PROV_RC4_HMAC_MD5_CTX *)bctx;
 
     RC4_set_key(&ctx->ks.ks, keylen, key);
-    MD5_Init(&ctx->head);       /* handy when benchmarking */
+    MD5_Init(&ctx->head); /* handy when benchmarking */
     ctx->tail = ctx->head;
     ctx->md = ctx->head;
     ctx->payload_length = NO_PAYLOAD_LENGTH;
@@ -47,8 +47,8 @@ static int cipher_hw_rc4_hmac_md5_initkey(PROV_CIPHER_CTX *bctx,
 }
 
 static int cipher_hw_rc4_hmac_md5_cipher(PROV_CIPHER_CTX *bctx,
-                                         unsigned char *out,
-                                         const unsigned char *in, size_t len)
+    unsigned char *out,
+    const unsigned char *in, size_t len)
 {
     PROV_RC4_HMAC_MD5_CTX *ctx = (PROV_RC4_HMAC_MD5_CTX *)bctx;
     RC4_KEY *ks = &ctx->ks.ks;
@@ -72,13 +72,13 @@ static int cipher_hw_rc4_hmac_md5_cipher(PROV_CIPHER_CTX *bctx,
             md5_off += MD5_CBLOCK;
 
         if (plen > md5_off
-                && (blocks = (plen - md5_off) / MD5_CBLOCK)
-                && (OPENSSL_ia32cap_P[0] & (1 << 20)) == 0) {
+            && (blocks = (plen - md5_off) / MD5_CBLOCK)
+            && (OPENSSL_ia32cap_P[0] & (1 << 20)) == 0) {
             MD5_Update(&ctx->md, in, md5_off);
             RC4(ks, rc4_off, in, out);
 
             rc4_md5_enc(ks, in + rc4_off, out + rc4_off,
-                        &ctx->md, in + md5_off, blocks);
+                &ctx->md, in + md5_off, blocks);
             blocks *= MD5_CBLOCK;
             rc4_off += blocks;
             md5_off += blocks;
@@ -93,7 +93,7 @@ static int cipher_hw_rc4_hmac_md5_cipher(PROV_CIPHER_CTX *bctx,
 #endif
         MD5_Update(&ctx->md, in + md5_off, plen - md5_off);
 
-        if (plen != len) {      /* "TLS" mode of operation */
+        if (plen != len) { /* "TLS" mode of operation */
             if (in != out)
                 memcpy(out + rc4_off, in + rc4_off, plen - rc4_off);
 
@@ -118,13 +118,13 @@ static int cipher_hw_rc4_hmac_md5_cipher(PROV_CIPHER_CTX *bctx,
             rc4_off += MD5_CBLOCK;
 
         if (len > rc4_off
-                && (blocks = (len - rc4_off) / MD5_CBLOCK)
-                && (OPENSSL_ia32cap_P[0] & (1 << 20)) == 0) {
+            && (blocks = (len - rc4_off) / MD5_CBLOCK)
+            && (OPENSSL_ia32cap_P[0] & (1 << 20)) == 0) {
             RC4(ks, rc4_off, in, out);
             MD5_Update(&ctx->md, out, md5_off);
 
             rc4_md5_enc(ks, in + rc4_off, out + rc4_off,
-                        &ctx->md, out + md5_off, blocks);
+                &ctx->md, out + md5_off, blocks);
             blocks *= MD5_CBLOCK;
             rc4_off += blocks;
             md5_off += blocks;
@@ -163,7 +163,7 @@ static int cipher_hw_rc4_hmac_md5_cipher(PROV_CIPHER_CTX *bctx,
 }
 
 static int cipher_hw_rc4_hmac_md5_tls_init(PROV_CIPHER_CTX *bctx,
-                                           unsigned char *aad, size_t aad_len)
+    unsigned char *aad, size_t aad_len)
 {
     PROV_RC4_HMAC_MD5_CTX *ctx = (PROV_RC4_HMAC_MD5_CTX *)bctx;
     unsigned int len;
@@ -188,8 +188,8 @@ static int cipher_hw_rc4_hmac_md5_tls_init(PROV_CIPHER_CTX *bctx,
 }
 
 static void cipher_hw_rc4_hmac_md5_init_mackey(PROV_CIPHER_CTX *bctx,
-                                               const unsigned char *key,
-                                               size_t len)
+    const unsigned char *key,
+    size_t len)
 {
     PROV_RC4_HMAC_MD5_CTX *ctx = (PROV_RC4_HMAC_MD5_CTX *)bctx;
     unsigned int i;
@@ -219,10 +219,8 @@ static void cipher_hw_rc4_hmac_md5_init_mackey(PROV_CIPHER_CTX *bctx,
 }
 
 static const PROV_CIPHER_HW_RC4_HMAC_MD5 rc4_hmac_md5_hw = {
-    {
-      cipher_hw_rc4_hmac_md5_initkey,
-      cipher_hw_rc4_hmac_md5_cipher
-    },
+    { cipher_hw_rc4_hmac_md5_initkey,
+        cipher_hw_rc4_hmac_md5_cipher },
     cipher_hw_rc4_hmac_md5_tls_init,
     cipher_hw_rc4_hmac_md5_init_mackey
 };
diff --git a/providers/implementations/ciphers/cipher_rc4_hw.c b/providers/implementations/ciphers/cipher_rc4_hw.c
index 09192b5d5e14e..9ab18037a271a 100644
--- a/providers/implementations/ciphers/cipher_rc4_hw.c
+++ b/providers/implementations/ciphers/cipher_rc4_hw.c
@@ -16,18 +16,18 @@
 #include "cipher_rc4.h"
 
 static int cipher_hw_rc4_initkey(PROV_CIPHER_CTX *ctx,
-                                 const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
-    PROV_RC4_CTX *rctx =  (PROV_RC4_CTX *)ctx;
+    PROV_RC4_CTX *rctx = (PROV_RC4_CTX *)ctx;
 
     RC4_set_key(&rctx->ks.ks, keylen, key);
     return 1;
 }
 
 static int cipher_hw_rc4_cipher(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
-    PROV_RC4_CTX *rctx =  (PROV_RC4_CTX *)ctx;
+    PROV_RC4_CTX *rctx = (PROV_RC4_CTX *)ctx;
 
     RC4(&rctx->ks.ks, len, in, out);
     return 1;
@@ -41,4 +41,3 @@ const PROV_CIPHER_HW *ossl_prov_cipher_hw_rc4(size_t keybits)
 {
     return &rc4_hw;
 }
-
diff --git a/providers/implementations/ciphers/cipher_rc5.c b/providers/implementations/ciphers/cipher_rc5.c
index 6fa491d83ef36..4bfb40de4efec 100644
--- a/providers/implementations/ciphers/cipher_rc5.c
+++ b/providers/implementations/ciphers/cipher_rc5.c
@@ -35,7 +35,7 @@ static void rc5_freectx(void *vctx)
     PROV_RC5_CTX *ctx = (PROV_RC5_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *rc5_dupctx(void *ctx)
@@ -55,8 +55,8 @@ static void *rc5_dupctx(void *ctx)
 }
 
 static int rc5_einit(void *ctx, const unsigned char *key, size_t keylen,
-                          const unsigned char *iv, size_t ivlen,
-                          const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     if (!ossl_cipher_generic_einit(ctx, key, keylen, iv, ivlen, NULL))
         return 0;
@@ -64,8 +64,8 @@ static int rc5_einit(void *ctx, const unsigned char *key, size_t keylen,
 }
 
 static int rc5_dinit(void *ctx, const unsigned char *key, size_t keylen,
-                          const unsigned char *iv, size_t ivlen,
-                          const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     if (!ossl_cipher_generic_dinit(ctx, key, keylen, iv, ivlen, NULL))
         return 0;
@@ -103,16 +103,15 @@ static int rc5_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_START(rc5)
-    OSSL_PARAM_uint(OSSL_CIPHER_PARAM_ROUNDS, NULL),
-CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(rc5)
+OSSL_PARAM_uint(OSSL_CIPHER_PARAM_ROUNDS, NULL),
+    CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(rc5)
 
-CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_START(rc5)
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
+        CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_START(rc5)
+            OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
     OSSL_PARAM_uint(OSSL_CIPHER_PARAM_ROUNDS, NULL),
-CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(rc5)
-
+    CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(rc5)
 
-static int rc5_get_ctx_params(void *vctx, OSSL_PARAM params[])
+        static int rc5_get_ctx_params(void *vctx, OSSL_PARAM params[])
 {
     PROV_RC5_CTX *ctx = (PROV_RC5_CTX *)vctx;
     OSSL_PARAM *p;
@@ -127,54 +126,54 @@ static int rc5_get_ctx_params(void *vctx, OSSL_PARAM params[])
     return 1;
 }
 
-#define IMPLEMENT_cipher(alg, UCALG, lcmode, UCMODE, flags, kbits,             \
-                         blkbits, ivbits, typ)                                 \
-static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lcmode##_get_params;   \
-static int alg##_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])          \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
-                                          flags, kbits, blkbits, ivbits);      \
-}                                                                              \
-static OSSL_FUNC_cipher_newctx_fn alg##_##kbits##_##lcmode##_newctx;           \
-static void *alg##_##kbits##_##lcmode##_newctx(void *provctx)                  \
-{                                                                              \
-     PROV_##UCALG##_CTX *ctx;                                                  \
-     if (!ossl_prov_is_running())                                              \
-        return NULL;                                                           \
-     ctx = OPENSSL_zalloc(sizeof(*ctx));                                       \
-     if (ctx != NULL) {                                                        \
-         ossl_cipher_generic_initkey(ctx, kbits, blkbits, ivbits,              \
-                                     EVP_CIPH_##UCMODE##_MODE, flags,          \
-                                     ossl_prov_cipher_hw_##alg##_##lcmode(kbits),\
-                                NULL);                                         \
-         ctx->rounds = RC5_12_ROUNDS;                                          \
-     }                                                                         \
-     return ctx;                                                               \
-}                                                                              \
-const OSSL_DISPATCH ossl_##alg##kbits##lcmode##_functions[] = {                \
-    { OSSL_FUNC_CIPHER_NEWCTX,                                                 \
-      (void (*)(void)) alg##_##kbits##_##lcmode##_newctx },                    \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void)) alg##_freectx },              \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void)) alg##_dupctx },                \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))rc5_einit },              \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))rc5_dinit },              \
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_cipher_generic_##typ##_update },\
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_cipher_generic_##typ##_final },  \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },   \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-      (void (*)(void)) alg##_##kbits##_##lcmode##_get_params },                \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-      (void (*)(void))rc5_get_ctx_params },                                    \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))rc5_gettable_ctx_params },                               \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-      (void (*)(void))rc5_set_ctx_params },                                    \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-     (void (*)(void))rc5_settable_ctx_params },                                \
-    OSSL_DISPATCH_END                                                          \
-};
+#define IMPLEMENT_cipher(alg, UCALG, lcmode, UCMODE, flags, kbits,                       \
+    blkbits, ivbits, typ)                                                                \
+    static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lcmode##_get_params;         \
+    static int alg##_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])                \
+    {                                                                                    \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,          \
+            flags, kbits, blkbits, ivbits);                                              \
+    }                                                                                    \
+    static OSSL_FUNC_cipher_newctx_fn alg##_##kbits##_##lcmode##_newctx;                 \
+    static void *alg##_##kbits##_##lcmode##_newctx(void *provctx)                        \
+    {                                                                                    \
+        PROV_##UCALG##_CTX *ctx;                                                         \
+        if (!ossl_prov_is_running())                                                     \
+            return NULL;                                                                 \
+        ctx = OPENSSL_zalloc(sizeof(*ctx));                                              \
+        if (ctx != NULL) {                                                               \
+            ossl_cipher_generic_initkey(ctx, kbits, blkbits, ivbits,                     \
+                EVP_CIPH_##UCMODE##_MODE, flags,                                         \
+                ossl_prov_cipher_hw_##alg##_##lcmode(kbits),                             \
+                NULL);                                                                   \
+            ctx->rounds = RC5_12_ROUNDS;                                                 \
+        }                                                                                \
+        return ctx;                                                                      \
+    }                                                                                    \
+    const OSSL_DISPATCH ossl_##alg##kbits##lcmode##_functions[] = {                      \
+        { OSSL_FUNC_CIPHER_NEWCTX,                                                       \
+            (void (*)(void))alg##_##kbits##_##lcmode##_newctx },                         \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))alg##_freectx },                     \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))alg##_dupctx },                       \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))rc5_einit },                    \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))rc5_dinit },                    \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_cipher_generic_##typ##_update }, \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_cipher_generic_##typ##_final },   \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },         \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                                   \
+            (void (*)(void))alg##_##kbits##_##lcmode##_get_params },                     \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                              \
+            (void (*)(void))ossl_cipher_generic_gettable_params },                       \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                               \
+            (void (*)(void))rc5_get_ctx_params },                                        \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                          \
+            (void (*)(void))rc5_gettable_ctx_params },                                   \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                               \
+            (void (*)(void))rc5_set_ctx_params },                                        \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                          \
+            (void (*)(void))rc5_settable_ctx_params },                                   \
+        OSSL_DISPATCH_END                                                                \
+    };
 
 /* ossl_rc5128ecb_functions */
 IMPLEMENT_cipher(rc5, RC5, ecb, ECB, RC5_FLAGS, 128, 64, 0, block)
@@ -183,4 +182,4 @@ IMPLEMENT_cipher(rc5, RC5, cbc, CBC, RC5_FLAGS, 128, 64, 64, block)
 /* ossl_rc5128ofb64_functions */
 IMPLEMENT_cipher(rc5, RC5, ofb64, OFB, RC5_FLAGS, 128, 8, 64, stream)
 /* ossl_rc5128cfb64_functions */
-IMPLEMENT_cipher(rc5, RC5, cfb64,  CFB, RC5_FLAGS, 128, 8, 64, stream)
+IMPLEMENT_cipher(rc5, RC5, cfb64, CFB, RC5_FLAGS, 128, 8, 64, stream)
diff --git a/providers/implementations/ciphers/cipher_rc5.h b/providers/implementations/ciphers/cipher_rc5.h
index 421632f2ea1e3..0662937f68e6d 100644
--- a/providers/implementations/ciphers/cipher_rc5.h
+++ b/providers/implementations/ciphers/cipher_rc5.h
@@ -11,12 +11,12 @@
 #include "prov/ciphercommon.h"
 
 typedef struct prov_rc5_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
-        RC5_32_KEY ks;         /* key schedule */
+        RC5_32_KEY ks; /* key schedule */
     } ks;
-    unsigned int rounds;       /* number of rounds */
+    unsigned int rounds; /* number of rounds */
 } PROV_RC5_CTX;
 
 const PROV_CIPHER_HW *ossl_prov_cipher_hw_rc5_cbc(size_t keybits);
diff --git a/providers/implementations/ciphers/cipher_rc5_hw.c b/providers/implementations/ciphers/cipher_rc5_hw.c
index 898bd383f95a8..a7884c5eee37e 100644
--- a/providers/implementations/ciphers/cipher_rc5_hw.c
+++ b/providers/implementations/ciphers/cipher_rc5_hw.c
@@ -16,26 +16,26 @@
 #include "cipher_rc5.h"
 
 static int cipher_hw_rc5_initkey(PROV_CIPHER_CTX *ctx,
-                                 const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     PROV_RC5_CTX *rctx = (PROV_RC5_CTX *)ctx;
 
     return RC5_32_set_key(&rctx->ks.ks, keylen, key, rctx->rounds);
 }
 
-# define PROV_CIPHER_HW_rc5_mode(mode, UCMODE)                                 \
-IMPLEMENT_CIPHER_HW_##UCMODE(mode, rc5, PROV_RC5_CTX, RC5_32_KEY,              \
-                             RC5_32_##mode)                                    \
-static const PROV_CIPHER_HW rc5_##mode = {                                     \
-    cipher_hw_rc5_initkey,                                                     \
-    cipher_hw_rc5_##mode##_cipher                                              \
-};                                                                             \
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_rc5_##mode(size_t keybits)           \
-{                                                                              \
-    return &rc5_##mode;                                                        \
-}
+#define PROV_CIPHER_HW_rc5_mode(mode, UCMODE)                            \
+    IMPLEMENT_CIPHER_HW_##UCMODE(mode, rc5, PROV_RC5_CTX, RC5_32_KEY,    \
+        RC5_32_##mode) static const PROV_CIPHER_HW rc5_##mode            \
+        = {                                                              \
+              cipher_hw_rc5_initkey,                                     \
+              cipher_hw_rc5_##mode##_cipher                              \
+          };                                                             \
+    const PROV_CIPHER_HW *ossl_prov_cipher_hw_rc5_##mode(size_t keybits) \
+    {                                                                    \
+        return &rc5_##mode;                                              \
+    }
 
 PROV_CIPHER_HW_rc5_mode(cbc, CBC)
-PROV_CIPHER_HW_rc5_mode(ecb, ECB)
-PROV_CIPHER_HW_rc5_mode(ofb64, OFB)
-PROV_CIPHER_HW_rc5_mode(cfb64, CFB)
+    PROV_CIPHER_HW_rc5_mode(ecb, ECB)
+        PROV_CIPHER_HW_rc5_mode(ofb64, OFB)
+            PROV_CIPHER_HW_rc5_mode(cfb64, CFB)
diff --git a/providers/implementations/ciphers/cipher_seed.c b/providers/implementations/ciphers/cipher_seed.c
index 3644cb5e22523..419caf8f09988 100644
--- a/providers/implementations/ciphers/cipher_seed.c
+++ b/providers/implementations/ciphers/cipher_seed.c
@@ -27,7 +27,7 @@ static void seed_freectx(void *vctx)
     PROV_SEED_CTX *ctx = (PROV_SEED_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *seed_dupctx(void *ctx)
@@ -53,4 +53,4 @@ IMPLEMENT_generic_cipher(seed, SEED, cbc, CBC, 0, 128, 128, 128, block)
 /* ossl_seed128ofb128_functions */
 IMPLEMENT_generic_cipher(seed, SEED, ofb128, OFB, 0, 128, 8, 128, stream)
 /* ossl_seed128cfb128_functions */
-IMPLEMENT_generic_cipher(seed, SEED, cfb128,  CFB, 0, 128, 8, 128, stream)
+IMPLEMENT_generic_cipher(seed, SEED, cfb128, CFB, 0, 128, 8, 128, stream)
diff --git a/providers/implementations/ciphers/cipher_seed.h b/providers/implementations/ciphers/cipher_seed.h
index 9006a9183b559..750ab8deac848 100644
--- a/providers/implementations/ciphers/cipher_seed.h
+++ b/providers/implementations/ciphers/cipher_seed.h
@@ -11,7 +11,7 @@
 #include "prov/ciphercommon.h"
 
 typedef struct prov_seed_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         SEED_KEY_SCHEDULE ks;
diff --git a/providers/implementations/ciphers/cipher_seed_hw.c b/providers/implementations/ciphers/cipher_seed_hw.c
index 2d1dba92bc73b..d4819acec49fe 100644
--- a/providers/implementations/ciphers/cipher_seed_hw.c
+++ b/providers/implementations/ciphers/cipher_seed_hw.c
@@ -16,27 +16,27 @@
 #include "cipher_seed.h"
 
 static int cipher_hw_seed_initkey(PROV_CIPHER_CTX *ctx,
-                                  const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
-    PROV_SEED_CTX *sctx =  (PROV_SEED_CTX *)ctx;
+    PROV_SEED_CTX *sctx = (PROV_SEED_CTX *)ctx;
 
     SEED_set_key(key, &(sctx->ks.ks));
     return 1;
 }
 
-# define PROV_CIPHER_HW_seed_mode(mode, UCMODE)                                \
-IMPLEMENT_CIPHER_HW_##UCMODE(mode, seed, PROV_SEED_CTX, SEED_KEY_SCHEDULE,     \
-                             SEED_##mode)                                      \
-static const PROV_CIPHER_HW seed_##mode = {                                    \
-    cipher_hw_seed_initkey,                                                    \
-    cipher_hw_seed_##mode##_cipher                                             \
-};                                                                             \
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_seed_##mode(size_t keybits)          \
-{                                                                              \
-    return &seed_##mode;                                                       \
-}
+#define PROV_CIPHER_HW_seed_mode(mode, UCMODE)                                 \
+    IMPLEMENT_CIPHER_HW_##UCMODE(mode, seed, PROV_SEED_CTX, SEED_KEY_SCHEDULE, \
+        SEED_##mode) static const PROV_CIPHER_HW seed_##mode                   \
+        = {                                                                    \
+              cipher_hw_seed_initkey,                                          \
+              cipher_hw_seed_##mode##_cipher                                   \
+          };                                                                   \
+    const PROV_CIPHER_HW *ossl_prov_cipher_hw_seed_##mode(size_t keybits)      \
+    {                                                                          \
+        return &seed_##mode;                                                   \
+    }
 
 PROV_CIPHER_HW_seed_mode(cbc, CBC)
-PROV_CIPHER_HW_seed_mode(ecb, ECB)
-PROV_CIPHER_HW_seed_mode(ofb128, OFB)
-PROV_CIPHER_HW_seed_mode(cfb128, CFB)
+    PROV_CIPHER_HW_seed_mode(ecb, ECB)
+        PROV_CIPHER_HW_seed_mode(ofb128, OFB)
+            PROV_CIPHER_HW_seed_mode(cfb128, CFB)
diff --git a/providers/implementations/ciphers/cipher_sm4.c b/providers/implementations/ciphers/cipher_sm4.c
index 863c9997f5aa6..569f4a8c09ad0 100644
--- a/providers/implementations/ciphers/cipher_sm4.c
+++ b/providers/implementations/ciphers/cipher_sm4.c
@@ -21,7 +21,7 @@ static void sm4_freectx(void *vctx)
     PROV_SM4_CTX *ctx = (PROV_SM4_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void *sm4_dupctx(void *ctx)
@@ -49,4 +49,4 @@ IMPLEMENT_generic_cipher(sm4, SM4, ctr, CTR, 0, 128, 8, 128, stream)
 /* ossl_sm4128ofb128_functions */
 IMPLEMENT_generic_cipher(sm4, SM4, ofb128, OFB, 0, 128, 8, 128, stream)
 /* ossl_sm4128cfb128_functions */
-IMPLEMENT_generic_cipher(sm4, SM4, cfb128,  CFB, 0, 128, 8, 128, stream)
+IMPLEMENT_generic_cipher(sm4, SM4, cfb128, CFB, 0, 128, 8, 128, stream)
diff --git a/providers/implementations/ciphers/cipher_sm4.h b/providers/implementations/ciphers/cipher_sm4.h
index 9ab49e3279f15..b061022411bdc 100644
--- a/providers/implementations/ciphers/cipher_sm4.h
+++ b/providers/implementations/ciphers/cipher_sm4.h
@@ -12,7 +12,7 @@
 #include "crypto/sm4_platform.h"
 
 typedef struct prov_cast_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         SM4_KEY ks;
diff --git a/providers/implementations/ciphers/cipher_sm4_ccm.c b/providers/implementations/ciphers/cipher_sm4_ccm.c
index 3af84d85b7dc1..d584090d001c1 100644
--- a/providers/implementations/ciphers/cipher_sm4_ccm.c
+++ b/providers/implementations/ciphers/cipher_sm4_ccm.c
@@ -47,7 +47,7 @@ static void sm4_ccm_freectx(void *vctx)
 {
     PROV_SM4_CCM_CTX *ctx = (PROV_SM4_CCM_CTX *)vctx;
 
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 /* sm4128ccm functions */
diff --git a/providers/implementations/ciphers/cipher_sm4_ccm.h b/providers/implementations/ciphers/cipher_sm4_ccm.h
index 561437993a4a3..61d4466132570 100644
--- a/providers/implementations/ciphers/cipher_sm4_ccm.h
+++ b/providers/implementations/ciphers/cipher_sm4_ccm.h
@@ -17,7 +17,7 @@ typedef struct prov_sm4_ccm_ctx_st {
     union {
         OSSL_UNION_ALIGN;
         SM4_KEY ks;
-    } ks;                       /* SM4 key schedule to use */
+    } ks; /* SM4 key schedule to use */
 } PROV_SM4_CCM_CTX;
 
 const PROV_CCM_HW *ossl_prov_sm4_hw_ccm(size_t keylen);
diff --git a/providers/implementations/ciphers/cipher_sm4_ccm_hw.c b/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
index 1c1d60494ab69..b9e412602302c 100644
--- a/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
+++ b/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
@@ -14,15 +14,15 @@
 #include "cipher_sm4_ccm.h"
 #include "crypto/sm4_platform.h"
 
-#define SM4_HW_CCM_SET_KEY_FN(fn_set_enc_key, fn_blk, fn_ccm_enc, fn_ccm_dec)  \
-    fn_set_enc_key(key, &actx->ks.ks);                                         \
-    CRYPTO_ccm128_init(&ctx->ccm_ctx, ctx->m, ctx->l, &actx->ks.ks,            \
-                       (block128_f)fn_blk);                                    \
-    ctx->str = ctx->enc ? (ccm128_f)fn_ccm_enc : (ccm128_f)fn_ccm_dec;         \
+#define SM4_HW_CCM_SET_KEY_FN(fn_set_enc_key, fn_blk, fn_ccm_enc, fn_ccm_dec) \
+    fn_set_enc_key(key, &actx->ks.ks);                                        \
+    CRYPTO_ccm128_init(&ctx->ccm_ctx, ctx->m, ctx->l, &actx->ks.ks,           \
+        (block128_f)fn_blk);                                                  \
+    ctx->str = ctx->enc ? (ccm128_f)fn_ccm_enc : (ccm128_f)fn_ccm_dec;        \
     ctx->key_set = 1;
 
 static int ccm_sm4_initkey(PROV_CCM_CTX *ctx,
-                           const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     PROV_SM4_CCM_CTX *actx = (PROV_SM4_CCM_CTX *)ctx;
 
@@ -33,21 +33,21 @@ static int ccm_sm4_initkey(PROV_CCM_CTX *ctx,
 #endif /* HWSM4_CAPABLE */
 
 #ifdef VPSM4_EX_CAPABLE
-    if (VPSM4_EX_CAPABLE) {
+        if (VPSM4_EX_CAPABLE) {
         SM4_HW_CCM_SET_KEY_FN(vpsm4_ex_set_encrypt_key, vpsm4_ex_encrypt, NULL,
-                              NULL);
+            NULL);
     } else
 #endif /* VPSM4_EX_CAPABLE */
 
 #ifdef VPSM4_CAPABLE
-    if (VPSM4_CAPABLE) {
+        if (VPSM4_CAPABLE) {
         SM4_HW_CCM_SET_KEY_FN(vpsm4_set_encrypt_key, vpsm4_encrypt, NULL, NULL);
     } else
 #endif /* VPSM4_CAPABLE */
     {
         SM4_HW_CCM_SET_KEY_FN(ossl_sm4_set_key, ossl_sm4_encrypt, NULL, NULL);
     }
-  return 1;
+    return 1;
 }
 
 static const PROV_CCM_HW ccm_sm4 = {
@@ -60,7 +60,7 @@ static const PROV_CCM_HW ccm_sm4 = {
 };
 
 #if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-# include "cipher_sm4_ccm_hw_rv64i.inc"
+#include "cipher_sm4_ccm_hw_rv64i.inc"
 #else
 const PROV_CCM_HW *ossl_prov_sm4_hw_ccm(size_t keybits)
 {
diff --git a/providers/implementations/ciphers/cipher_sm4_gcm.c b/providers/implementations/ciphers/cipher_sm4_gcm.c
index 1128f659393e0..959258cfc19b3 100644
--- a/providers/implementations/ciphers/cipher_sm4_gcm.c
+++ b/providers/implementations/ciphers/cipher_sm4_gcm.c
@@ -25,7 +25,7 @@ static void *sm4_gcm_newctx(void *provctx, size_t keybits)
     ctx = OPENSSL_zalloc(sizeof(*ctx));
     if (ctx != NULL)
         ossl_gcm_initctx(provctx, &ctx->base, keybits,
-                         ossl_prov_sm4_hw_gcm(keybits));
+            ossl_prov_sm4_hw_gcm(keybits));
     return ctx;
 }
 
@@ -48,7 +48,7 @@ static void sm4_gcm_freectx(void *vctx)
 {
     PROV_SM4_GCM_CTX *ctx = (PROV_SM4_GCM_CTX *)vctx;
 
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 /* ossl_sm4128gcm_functions */
diff --git a/providers/implementations/ciphers/cipher_sm4_gcm.h b/providers/implementations/ciphers/cipher_sm4_gcm.h
index 2b6b5f3ece74e..6bc9a4d34b6f6 100644
--- a/providers/implementations/ciphers/cipher_sm4_gcm.h
+++ b/providers/implementations/ciphers/cipher_sm4_gcm.h
@@ -12,7 +12,7 @@
 #include "prov/ciphercommon_gcm.h"
 
 typedef struct prov_sm4_gcm_ctx_st {
-    PROV_GCM_CTX base;              /* must be first entry in struct */
+    PROV_GCM_CTX base; /* must be first entry in struct */
     union {
         OSSL_UNION_ALIGN;
         SM4_KEY ks;
diff --git a/providers/implementations/ciphers/cipher_sm4_gcm_hw.c b/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
index c1e354be45baa..2d1157d3b11ff 100644
--- a/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
+++ b/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
@@ -14,42 +14,42 @@
 #include "cipher_sm4_gcm.h"
 #include "crypto/sm4_platform.h"
 
-# define SM4_GCM_HW_SET_KEY_CTR_FN(ks, fn_set_enc_key, fn_block, fn_ctr)       \
-    fn_set_enc_key(key, ks);                                                   \
-    CRYPTO_gcm128_init(&ctx->gcm, ks, (block128_f)fn_block);                   \
-    ctx->ctr = (ctr128_f)fn_ctr;                                               \
+#define SM4_GCM_HW_SET_KEY_CTR_FN(ks, fn_set_enc_key, fn_block, fn_ctr) \
+    fn_set_enc_key(key, ks);                                            \
+    CRYPTO_gcm128_init(&ctx->gcm, ks, (block128_f)fn_block);            \
+    ctx->ctr = (ctr128_f)fn_ctr;                                        \
     ctx->key_set = 1;
 
 static int sm4_gcm_initkey(PROV_GCM_CTX *ctx, const unsigned char *key,
-                           size_t keylen)
+    size_t keylen)
 {
     PROV_SM4_GCM_CTX *actx = (PROV_SM4_GCM_CTX *)ctx;
     SM4_KEY *ks = &actx->ks.ks;
 
-# ifdef HWSM4_CAPABLE
+#ifdef HWSM4_CAPABLE
     if (HWSM4_CAPABLE) {
-#  ifdef HWSM4_ctr32_encrypt_blocks
+#ifdef HWSM4_ctr32_encrypt_blocks
         SM4_GCM_HW_SET_KEY_CTR_FN(ks, HWSM4_set_encrypt_key, HWSM4_encrypt,
-                                  HWSM4_ctr32_encrypt_blocks);
-#  else /* HWSM4_ctr32_encrypt_blocks */
+            HWSM4_ctr32_encrypt_blocks);
+#else /* HWSM4_ctr32_encrypt_blocks */
         SM4_GCM_HW_SET_KEY_CTR_FN(ks, HWSM4_set_encrypt_key, HWSM4_encrypt, NULL);
-#  endif
+#endif
     } else
-# endif /* HWSM4_CAPABLE */
+#endif /* HWSM4_CAPABLE */
 
 #ifdef VPSM4_EX_CAPABLE
-    if (VPSM4_EX_CAPABLE) {
+        if (VPSM4_EX_CAPABLE) {
         SM4_GCM_HW_SET_KEY_CTR_FN(ks, vpsm4_ex_set_encrypt_key, vpsm4_ex_encrypt,
-                                  vpsm4_ex_ctr32_encrypt_blocks);
+            vpsm4_ex_ctr32_encrypt_blocks);
     } else
 #endif /* VPSM4_EX_CAPABLE */
 
-# ifdef VPSM4_CAPABLE
-    if (VPSM4_CAPABLE) {
+#ifdef VPSM4_CAPABLE
+        if (VPSM4_CAPABLE) {
         SM4_GCM_HW_SET_KEY_CTR_FN(ks, vpsm4_set_encrypt_key, vpsm4_encrypt,
-                                  vpsm4_ctr32_encrypt_blocks);
+            vpsm4_ctr32_encrypt_blocks);
     } else
-# endif /* VPSM4_CAPABLE */
+#endif /* VPSM4_CAPABLE */
     {
         SM4_GCM_HW_SET_KEY_CTR_FN(ks, ossl_sm4_set_key, ossl_sm4_encrypt, NULL);
     }
@@ -58,7 +58,7 @@ static int sm4_gcm_initkey(PROV_GCM_CTX *ctx, const unsigned char *key,
 }
 
 static int hw_gcm_cipher_update(PROV_GCM_CTX *ctx, const unsigned char *in,
-                                size_t len, unsigned char *out)
+    size_t len, unsigned char *out)
 {
     if (ctx->enc) {
         if (ctx->ctr != NULL) {
@@ -90,7 +90,7 @@ static const PROV_GCM_HW sm4_gcm = {
 };
 
 #if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-# include "cipher_sm4_gcm_hw_rv64i.inc"
+#include "cipher_sm4_gcm_hw_rv64i.inc"
 #else
 const PROV_GCM_HW *ossl_prov_sm4_hw_gcm(size_t keybits)
 {
diff --git a/providers/implementations/ciphers/cipher_sm4_hw.c b/providers/implementations/ciphers/cipher_sm4_hw.c
index 05a83843eb493..df70eded48c33 100644
--- a/providers/implementations/ciphers/cipher_sm4_hw.c
+++ b/providers/implementations/ciphers/cipher_sm4_hw.c
@@ -10,15 +10,15 @@
 #include "cipher_sm4.h"
 
 static int cipher_hw_sm4_initkey(PROV_CIPHER_CTX *ctx,
-                                 const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
-    PROV_SM4_CTX *sctx =  (PROV_SM4_CTX *)ctx;
+    PROV_SM4_CTX *sctx = (PROV_SM4_CTX *)ctx;
     SM4_KEY *ks = &sctx->ks.ks;
 
     ctx->ks = ks;
     if (ctx->enc
-            || (ctx->mode != EVP_CIPH_ECB_MODE
-                && ctx->mode != EVP_CIPH_CBC_MODE)) {
+        || (ctx->mode != EVP_CIPH_ECB_MODE
+            && ctx->mode != EVP_CIPH_CBC_MODE)) {
 #ifdef HWSM4_CAPABLE
         if (HWSM4_CAPABLE) {
             HWSM4_set_encrypt_key(key, ks);
@@ -30,20 +30,20 @@ static int cipher_hw_sm4_initkey(PROV_CIPHER_CTX *ctx,
             else
 #endif
 #ifdef HWSM4_ecb_encrypt
-            if (ctx->mode == EVP_CIPH_ECB_MODE)
+                if (ctx->mode == EVP_CIPH_ECB_MODE)
                 ctx->stream.ecb = (ecb128_f)HWSM4_ecb_encrypt;
             else
 #endif
 #ifdef HWSM4_ctr32_encrypt_blocks
-            if (ctx->mode == EVP_CIPH_CTR_MODE)
+                if (ctx->mode == EVP_CIPH_CTR_MODE)
                 ctx->stream.ctr = (ctr128_f)HWSM4_ctr32_encrypt_blocks;
             else
 #endif
-            (void)0;            /* terminate potentially open 'else' */
+                (void)0; /* terminate potentially open 'else' */
         } else
 #endif
 #ifdef VPSM4_EX_CAPABLE
-        if (VPSM4_EX_CAPABLE) {
+            if (VPSM4_EX_CAPABLE) {
             vpsm4_ex_set_encrypt_key(key, ks);
             ctx->block = (block128_f)vpsm4_ex_encrypt;
             ctx->stream.cbc = NULL;
@@ -56,7 +56,7 @@ static int cipher_hw_sm4_initkey(PROV_CIPHER_CTX *ctx,
         } else
 #endif
 #ifdef VPSM4_CAPABLE
-        if (VPSM4_CAPABLE) {
+            if (VPSM4_CAPABLE) {
             vpsm4_set_encrypt_key(key, ks);
             ctx->block = (block128_f)vpsm4_encrypt;
             ctx->stream.cbc = NULL;
@@ -89,7 +89,7 @@ static int cipher_hw_sm4_initkey(PROV_CIPHER_CTX *ctx,
         } else
 #endif
 #ifdef VPSM4_EX_CAPABLE
-        if (VPSM4_EX_CAPABLE) {
+            if (VPSM4_EX_CAPABLE) {
             vpsm4_ex_set_decrypt_key(key, ks);
             ctx->block = (block128_f)vpsm4_ex_decrypt;
             ctx->stream.cbc = NULL;
@@ -100,7 +100,7 @@ static int cipher_hw_sm4_initkey(PROV_CIPHER_CTX *ctx,
         } else
 #endif
 #ifdef VPSM4_CAPABLE
-        if (VPSM4_CAPABLE) {
+            if (VPSM4_CAPABLE) {
             vpsm4_set_decrypt_key(key, ks);
             ctx->block = (block128_f)vpsm4_decrypt;
             ctx->stream.cbc = NULL;
@@ -121,29 +121,29 @@ static int cipher_hw_sm4_initkey(PROV_CIPHER_CTX *ctx,
 
 IMPLEMENT_CIPHER_HW_COPYCTX(cipher_hw_sm4_copyctx, PROV_SM4_CTX)
 
-# define PROV_CIPHER_HW_sm4_mode(mode)                                         \
-static const PROV_CIPHER_HW sm4_##mode = {                                     \
-    cipher_hw_sm4_initkey,                                                     \
-    ossl_cipher_hw_generic_##mode,                                             \
-    cipher_hw_sm4_copyctx                                                      \
-};                                                                             \
-PROV_CIPHER_HW_declare(mode)                                                   \
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_sm4_##mode(size_t keybits)           \
-{                                                                              \
-    PROV_CIPHER_HW_select(mode)                                                \
-    return &sm4_##mode;                                                        \
-}
+#define PROV_CIPHER_HW_sm4_mode(mode)                   \
+    static const PROV_CIPHER_HW sm4_##mode = {          \
+        cipher_hw_sm4_initkey,                          \
+        ossl_cipher_hw_generic_##mode,                  \
+        cipher_hw_sm4_copyctx                           \
+    };                                                  \
+    PROV_CIPHER_HW_declare(mode)                        \
+        const PROV_CIPHER_HW *                          \
+        ossl_prov_cipher_hw_sm4_##mode(size_t keybits)  \
+    {                                                   \
+        PROV_CIPHER_HW_select(mode) return &sm4_##mode; \
+    }
 
 #if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-# include "cipher_sm4_hw_rv64i.inc"
+#include "cipher_sm4_hw_rv64i.inc"
 #else
 /* The generic case */
-# define PROV_CIPHER_HW_declare(mode)
-# define PROV_CIPHER_HW_select(mode)
+#define PROV_CIPHER_HW_declare(mode)
+#define PROV_CIPHER_HW_select(mode)
 #endif
 
 PROV_CIPHER_HW_sm4_mode(cbc)
-PROV_CIPHER_HW_sm4_mode(ecb)
-PROV_CIPHER_HW_sm4_mode(ofb128)
-PROV_CIPHER_HW_sm4_mode(cfb128)
-PROV_CIPHER_HW_sm4_mode(ctr)
+    PROV_CIPHER_HW_sm4_mode(ecb)
+        PROV_CIPHER_HW_sm4_mode(ofb128)
+            PROV_CIPHER_HW_sm4_mode(cfb128)
+                PROV_CIPHER_HW_sm4_mode(ctr)
diff --git a/providers/implementations/ciphers/cipher_sm4_xts.c b/providers/implementations/ciphers/cipher_sm4_xts.c
index 31e86d6a8a0a8..69878df7e48c8 100644
--- a/providers/implementations/ciphers/cipher_sm4_xts.c
+++ b/providers/implementations/ciphers/cipher_sm4_xts.c
@@ -34,8 +34,8 @@ static OSSL_FUNC_cipher_settable_ctx_params_fn sm4_xts_settable_ctx_params;
  * Provider dispatch functions
  */
 static int sm4_xts_init(void *vctx, const unsigned char *key, size_t keylen,
-                        const unsigned char *iv, size_t ivlen,
-                        const OSSL_PARAM params[], int enc)
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[], int enc)
 {
     PROV_SM4_XTS_CTX *xctx = (PROV_SM4_XTS_CTX *)vctx;
     PROV_CIPHER_CTX *ctx = &xctx->base;
@@ -61,28 +61,28 @@ static int sm4_xts_init(void *vctx, const unsigned char *key, size_t keylen,
 }
 
 static int sm4_xts_einit(void *vctx, const unsigned char *key, size_t keylen,
-                         const unsigned char *iv, size_t ivlen,
-                         const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return sm4_xts_init(vctx, key, keylen, iv, ivlen, params, 1);
 }
 
 static int sm4_xts_dinit(void *vctx, const unsigned char *key, size_t keylen,
-                         const unsigned char *iv, size_t ivlen,
-                         const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return sm4_xts_init(vctx, key, keylen, iv, ivlen, params, 0);
 }
 
 static void *sm4_xts_newctx(void *provctx, unsigned int mode, uint64_t flags,
-                            size_t kbits, size_t blkbits, size_t ivbits)
+    size_t kbits, size_t blkbits, size_t ivbits)
 {
     PROV_SM4_XTS_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx));
 
     if (ctx != NULL) {
         ossl_cipher_generic_initkey(&ctx->base, kbits, blkbits, ivbits, mode,
-                                    flags, ossl_prov_cipher_hw_sm4_xts(kbits),
-                                    NULL);
+            flags, ossl_prov_cipher_hw_sm4_xts(kbits),
+            NULL);
     }
     return ctx;
 }
@@ -119,17 +119,17 @@ static void *sm4_xts_dupctx(void *vctx)
 }
 
 static int sm4_xts_cipher(void *vctx, unsigned char *out, size_t *outl,
-                          size_t outsize, const unsigned char *in, size_t inl)
+    size_t outsize, const unsigned char *in, size_t inl)
 {
     PROV_SM4_XTS_CTX *ctx = (PROV_SM4_XTS_CTX *)vctx;
 
     if (!ossl_prov_is_running()
-            || ctx->xts.key1 == NULL
-            || ctx->xts.key2 == NULL
-            || !ctx->base.iv_set
-            || out == NULL
-            || in == NULL
-            || inl < SM4_BLOCK_SIZE)
+        || ctx->xts.key1 == NULL
+        || ctx->xts.key2 == NULL
+        || !ctx->base.iv_set
+        || out == NULL
+        || in == NULL
+        || inl < SM4_BLOCK_SIZE)
         return 0;
 
     /*
@@ -145,16 +145,16 @@ static int sm4_xts_cipher(void *vctx, unsigned char *out, size_t *outl,
     if (ctx->xts_standard) {
         if (ctx->stream != NULL)
             (*ctx->stream)(in, out, inl, ctx->xts.key1, ctx->xts.key2,
-                           ctx->base.iv, ctx->base.enc);
+                ctx->base.iv, ctx->base.enc);
         else if (CRYPTO_xts128_encrypt(&ctx->xts, ctx->base.iv, in, out, inl,
-                                       ctx->base.enc))
+                     ctx->base.enc))
             return 0;
     } else {
         if (ctx->stream_gb != NULL)
             (*ctx->stream_gb)(in, out, inl, ctx->xts.key1, ctx->xts.key2,
-                              ctx->base.iv, ctx->base.enc);
+                ctx->base.iv, ctx->base.enc);
         else if (ossl_crypto_xts128gb_encrypt(&ctx->xts, ctx->base.iv, in, out,
-                                              inl, ctx->base.enc))
+                     inl, ctx->base.enc))
             return 0;
     }
     *outl = inl;
@@ -162,8 +162,8 @@ static int sm4_xts_cipher(void *vctx, unsigned char *out, size_t *outl,
 }
 
 static int sm4_xts_stream_update(void *vctx, unsigned char *out, size_t *outl,
-                                 size_t outsize, const unsigned char *in,
-                                 size_t inl)
+    size_t outsize, const unsigned char *in,
+    size_t inl)
 {
     PROV_SM4_XTS_CTX *ctx = (PROV_SM4_XTS_CTX *)vctx;
 
@@ -181,7 +181,7 @@ static int sm4_xts_stream_update(void *vctx, unsigned char *out, size_t *outl,
 }
 
 static int sm4_xts_stream_final(void *vctx, unsigned char *out, size_t *outl,
-                                size_t outsize)
+    size_t outsize)
 {
     if (!ossl_prov_is_running())
         return 0;
@@ -195,7 +195,7 @@ static const OSSL_PARAM sm4_xts_known_settable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *sm4_xts_settable_ctx_params(ossl_unused void *cctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return sm4_xts_known_settable_ctx_params;
 }
@@ -240,42 +240,42 @@ static int sm4_xts_set_ctx_params(void *vxctx, const OSSL_PARAM params[])
     return 1;
 }
 
-#define IMPLEMENT_cipher(lcmode, UCMODE, kbits, flags)                         \
-static OSSL_FUNC_cipher_get_params_fn sm4_##kbits##_##lcmode##_get_params;     \
-static int sm4_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])            \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
-                                          flags, 2 * kbits, SM4_XTS_BLOCK_BITS,\
-                                          SM4_XTS_IV_BITS);                    \
-}                                                                              \
-static OSSL_FUNC_cipher_newctx_fn sm4_##kbits##_xts_newctx;                    \
-static void *sm4_##kbits##_xts_newctx(void *provctx)                           \
-{                                                                              \
-    return sm4_xts_newctx(provctx, EVP_CIPH_##UCMODE##_MODE, flags, 2 * kbits, \
-                          SM4_XTS_BLOCK_BITS, SM4_XTS_IV_BITS);                \
-}                                                                              \
-const OSSL_DISPATCH ossl_sm4##kbits##xts_functions[] = {                       \
-    { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))sm4_##kbits##_xts_newctx },     \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))sm4_xts_einit },          \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))sm4_xts_dinit },          \
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))sm4_xts_stream_update },        \
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))sm4_xts_stream_final },          \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))sm4_xts_cipher },               \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))sm4_xts_freectx },             \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))sm4_xts_dupctx },               \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-      (void (*)(void))sm4_##kbits##_##lcmode##_get_params },                   \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-      (void (*)(void))ossl_cipher_generic_get_ctx_params },                    \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))ossl_cipher_generic_gettable_ctx_params },               \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-      (void (*)(void))sm4_xts_set_ctx_params },                                \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-     (void (*)(void))sm4_xts_settable_ctx_params },                            \
-    OSSL_DISPATCH_END                                                          \
-}
+#define IMPLEMENT_cipher(lcmode, UCMODE, kbits, flags)                             \
+    static OSSL_FUNC_cipher_get_params_fn sm4_##kbits##_##lcmode##_get_params;     \
+    static int sm4_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])            \
+    {                                                                              \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
+            flags, 2 * kbits, SM4_XTS_BLOCK_BITS,                                  \
+            SM4_XTS_IV_BITS);                                                      \
+    }                                                                              \
+    static OSSL_FUNC_cipher_newctx_fn sm4_##kbits##_xts_newctx;                    \
+    static void *sm4_##kbits##_xts_newctx(void *provctx)                           \
+    {                                                                              \
+        return sm4_xts_newctx(provctx, EVP_CIPH_##UCMODE##_MODE, flags, 2 * kbits, \
+            SM4_XTS_BLOCK_BITS, SM4_XTS_IV_BITS);                                  \
+    }                                                                              \
+    const OSSL_DISPATCH ossl_sm4##kbits##xts_functions[] = {                       \
+        { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))sm4_##kbits##_xts_newctx },     \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))sm4_xts_einit },          \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))sm4_xts_dinit },          \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))sm4_xts_stream_update },        \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))sm4_xts_stream_final },          \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))sm4_xts_cipher },               \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))sm4_xts_freectx },             \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))sm4_xts_dupctx },               \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
+            (void (*)(void))sm4_##kbits##_##lcmode##_get_params },                 \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
+            (void (*)(void))ossl_cipher_generic_gettable_params },                 \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
+            (void (*)(void))ossl_cipher_generic_get_ctx_params },                  \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
+            (void (*)(void))ossl_cipher_generic_gettable_ctx_params },             \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
+            (void (*)(void))sm4_xts_set_ctx_params },                              \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
+            (void (*)(void))sm4_xts_settable_ctx_params },                         \
+        OSSL_DISPATCH_END                                                          \
+    }
 /* ossl_sm4128xts_functions */
 IMPLEMENT_cipher(xts, XTS, 128, SM4_XTS_FLAGS);
diff --git a/providers/implementations/ciphers/cipher_sm4_xts.h b/providers/implementations/ciphers/cipher_sm4_xts.h
index 43d9a212e55fd..57dcdb6ccf3a2 100644
--- a/providers/implementations/ciphers/cipher_sm4_xts.h
+++ b/providers/implementations/ciphers/cipher_sm4_xts.h
@@ -12,9 +12,9 @@
 #include "crypto/sm4_platform.h"
 
 PROV_CIPHER_FUNC(void, xts_stream,
-                 (const unsigned char *in, unsigned char *out, size_t len,
-                  const SM4_KEY *key1, const SM4_KEY *key2,
-                  const unsigned char iv[16], const int enc));
+    (const unsigned char *in, unsigned char *out, size_t len,
+        const SM4_KEY *key1, const SM4_KEY *key2,
+        const unsigned char iv[16], const int enc));
 
 typedef struct prov_sm4_xts_ctx_st {
     /* Must be first */
diff --git a/providers/implementations/ciphers/cipher_sm4_xts_hw.c b/providers/implementations/ciphers/cipher_sm4_xts_hw.c
index d147cf1a61146..891b3bdc6b0d2 100644
--- a/providers/implementations/ciphers/cipher_sm4_xts_hw.c
+++ b/providers/implementations/ciphers/cipher_sm4_xts_hw.c
@@ -9,29 +9,30 @@
 
 #include "cipher_sm4_xts.h"
 
-#define XTS_SET_KEY_FN(fn_set_enc_key, fn_set_dec_key,                         \
-                       fn_block_enc, fn_block_dec,                             \
-                       fn_stream, fn_stream_gb) {                              \
-    size_t bytes = keylen / 2;                                                 \
-                                                                               \
-    if (ctx->enc) {                                                            \
-        fn_set_enc_key(key, &xctx->ks1.ks);                                    \
-        xctx->xts.block1 = (block128_f)fn_block_enc;                           \
-    } else {                                                                   \
-        fn_set_dec_key(key, &xctx->ks1.ks);                                    \
-        xctx->xts.block1 = (block128_f)fn_block_dec;                           \
-    }                                                                          \
-    fn_set_enc_key(key + bytes, &xctx->ks2.ks);                                \
-    xctx->xts.block2 = (block128_f)fn_block_enc;                               \
-    xctx->xts.key1 = &xctx->ks1;                                               \
-    xctx->xts.key2 = &xctx->ks2;                                               \
-    xctx->stream = fn_stream;                                                  \
-    xctx->stream_gb = fn_stream_gb;                                            \
-}
+#define XTS_SET_KEY_FN(fn_set_enc_key, fn_set_dec_key,   \
+    fn_block_enc, fn_block_dec,                          \
+    fn_stream, fn_stream_gb)                             \
+    {                                                    \
+        size_t bytes = keylen / 2;                       \
+                                                         \
+        if (ctx->enc) {                                  \
+            fn_set_enc_key(key, &xctx->ks1.ks);          \
+            xctx->xts.block1 = (block128_f)fn_block_enc; \
+        } else {                                         \
+            fn_set_dec_key(key, &xctx->ks1.ks);          \
+            xctx->xts.block1 = (block128_f)fn_block_dec; \
+        }                                                \
+        fn_set_enc_key(key + bytes, &xctx->ks2.ks);      \
+        xctx->xts.block2 = (block128_f)fn_block_enc;     \
+        xctx->xts.key1 = &xctx->ks1;                     \
+        xctx->xts.key2 = &xctx->ks2;                     \
+        xctx->stream = fn_stream;                        \
+        xctx->stream_gb = fn_stream_gb;                  \
+    }
 
 static int cipher_hw_sm4_xts_generic_initkey(PROV_CIPHER_CTX *ctx,
-                                             const unsigned char *key,
-                                             size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_SM4_XTS_CTX *xctx = (PROV_SM4_XTS_CTX *)ctx;
     OSSL_xts_stream_fn stream = NULL;
@@ -39,25 +40,25 @@ static int cipher_hw_sm4_xts_generic_initkey(PROV_CIPHER_CTX *ctx,
 #ifdef HWSM4_CAPABLE
     if (HWSM4_CAPABLE) {
         XTS_SET_KEY_FN(HWSM4_set_encrypt_key, HWSM4_set_decrypt_key,
-                       HWSM4_encrypt, HWSM4_decrypt, stream, stream_gb);
+            HWSM4_encrypt, HWSM4_decrypt, stream, stream_gb);
         return 1;
     } else
 #endif /* HWSM4_CAPABLE */
 #ifdef VPSM4_EX_CAPABLE
-    if (VPSM4_EX_CAPABLE) {
+        if (VPSM4_EX_CAPABLE) {
         stream = vpsm4_ex_xts_encrypt;
         stream_gb = vpsm4_ex_xts_encrypt_gb;
         XTS_SET_KEY_FN(vpsm4_ex_set_encrypt_key, vpsm4_ex_set_decrypt_key,
-                       vpsm4_ex_encrypt, vpsm4_ex_decrypt, stream, stream_gb);
+            vpsm4_ex_encrypt, vpsm4_ex_decrypt, stream, stream_gb);
         return 1;
     } else
 #endif /* VPSM4_EX_CAPABLE */
 #ifdef VPSM4_CAPABLE
-    if (VPSM4_CAPABLE) {
+        if (VPSM4_CAPABLE) {
         stream = vpsm4_xts_encrypt;
         stream_gb = vpsm4_xts_encrypt_gb;
         XTS_SET_KEY_FN(vpsm4_set_encrypt_key, vpsm4_set_decrypt_key,
-                       vpsm4_encrypt, vpsm4_decrypt, stream, stream_gb);
+            vpsm4_encrypt, vpsm4_decrypt, stream, stream_gb);
         return 1;
     } else
 #endif /* VPSM4_CAPABLE */
@@ -66,13 +67,13 @@ static int cipher_hw_sm4_xts_generic_initkey(PROV_CIPHER_CTX *ctx,
     }
     {
         XTS_SET_KEY_FN(ossl_sm4_set_key, ossl_sm4_set_key, ossl_sm4_encrypt,
-                       ossl_sm4_decrypt, stream, stream_gb);
+            ossl_sm4_decrypt, stream, stream_gb);
     }
     return 1;
 }
 
 static void cipher_hw_sm4_xts_copyctx(PROV_CIPHER_CTX *dst,
-                                      const PROV_CIPHER_CTX *src)
+    const PROV_CIPHER_CTX *src)
 {
     PROV_SM4_XTS_CTX *sctx = (PROV_SM4_XTS_CTX *)src;
     PROV_SM4_XTS_CTX *dctx = (PROV_SM4_XTS_CTX *)dst;
@@ -82,7 +83,6 @@ static void cipher_hw_sm4_xts_copyctx(PROV_CIPHER_CTX *dst,
     dctx->xts.key2 = &dctx->ks2.ks;
 }
 
-
 static const PROV_CIPHER_HW sm4_generic_xts = {
     cipher_hw_sm4_xts_generic_initkey,
     NULL,
@@ -90,7 +90,7 @@ static const PROV_CIPHER_HW sm4_generic_xts = {
 };
 
 #if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-# include "cipher_sm4_xts_hw_rv64i.inc"
+#include "cipher_sm4_xts_hw_rv64i.inc"
 #else
 const PROV_CIPHER_HW *ossl_prov_cipher_hw_sm4_xts(size_t keybits)
 {
diff --git a/providers/implementations/ciphers/cipher_tdes.c b/providers/implementations/ciphers/cipher_tdes.c
index 2e5f8c3f05bbe..42248ee89b7fc 100644
--- a/providers/implementations/ciphers/cipher_tdes.c
+++ b/providers/implementations/ciphers/cipher_tdes.c
@@ -20,6 +20,6 @@
 #include "prov/implementations.h"
 
 /* ossl_tdes_ede3_ecb_functions */
-IMPLEMENT_tdes_cipher(ede3, EDE3, ecb, ECB, TDES_FLAGS, 64*3, 64, 0, block);
+IMPLEMENT_tdes_cipher(ede3, EDE3, ecb, ECB, TDES_FLAGS, 64 * 3, 64, 0, block);
 /* ossl_tdes_ede3_cbc_functions */
-IMPLEMENT_tdes_cipher(ede3, EDE3, cbc, CBC, TDES_FLAGS, 64*3, 64, 64, block);
+IMPLEMENT_tdes_cipher(ede3, EDE3, cbc, CBC, TDES_FLAGS, 64 * 3, 64, 64, block);
diff --git a/providers/implementations/ciphers/cipher_tdes.h b/providers/implementations/ciphers/cipher_tdes.h
index 55bd760451760..7aa453268894f 100644
--- a/providers/implementations/ciphers/cipher_tdes.h
+++ b/providers/implementations/ciphers/cipher_tdes.h
@@ -17,65 +17,65 @@
 #define TDES_FLAGS PROV_CIPHER_FLAG_RAND_KEY
 
 typedef struct prov_tdes_ctx_st {
-    PROV_CIPHER_CTX base;      /* Must be first */
+    PROV_CIPHER_CTX base; /* Must be first */
     union {
         OSSL_UNION_ALIGN;
         DES_key_schedule ks[3];
     } tks;
     union {
-        void (*cbc) (const void *, void *, size_t,
-                     const DES_key_schedule *, unsigned char *);
+        void (*cbc)(const void *, void *, size_t,
+            const DES_key_schedule *, unsigned char *);
     } tstream;
     OSSL_FIPS_IND_DECLARE
 
 } PROV_TDES_CTX;
 
-#define IMPLEMENT_tdes_cipher(type, UCTYPE, lcmode, UCMODE, flags,             \
-                              kbits, blkbits, ivbits, block)                   \
-static OSSL_FUNC_cipher_newctx_fn tdes_##type##_##lcmode##_newctx;             \
-static void *tdes_##type##_##lcmode##_newctx(void *provctx)                    \
-{                                                                              \
-    return ossl_tdes_newctx(provctx, EVP_CIPH_##UCMODE##_MODE, kbits, blkbits, \
-                       ivbits, flags,                                          \
-                       ossl_prov_cipher_hw_tdes_##type##_##lcmode());          \
-}                                                                              \
-static OSSL_FUNC_cipher_get_params_fn tdes_##type##_##lcmode##_get_params;     \
-static int tdes_##type##_##lcmode##_get_params(OSSL_PARAM params[])            \
-{                                                                              \
-    return ossl_tdes_get_params(params, EVP_CIPH_##UCMODE##_MODE,              \
-                                flags, kbits, blkbits, ivbits);                \
-}                                                                              \
-const OSSL_DISPATCH ossl_tdes_##type##_##lcmode##_functions[] = {              \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))ossl_tdes_einit },        \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_tdes_dinit },        \
-    { OSSL_FUNC_CIPHER_UPDATE,                                                 \
-      (void (*)(void))ossl_cipher_generic_##block##_update },                  \
-    { OSSL_FUNC_CIPHER_FINAL,                                                  \
-      (void (*)(void))ossl_cipher_generic_##block##_final },                   \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },   \
-    { OSSL_FUNC_CIPHER_NEWCTX,                                                 \
-      (void (*)(void))tdes_##type##_##lcmode##_newctx },                       \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))ossl_tdes_dupctx },             \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))ossl_tdes_freectx },           \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-      (void (*)(void))tdes_##type##_##lcmode##_get_params },                   \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-      (void (*)(void))ossl_tdes_get_ctx_params },                              \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))ossl_tdes_gettable_ctx_params },                         \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-      (void (*)(void))ossl_tdes_set_ctx_params },                              \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))ossl_tdes_settable_ctx_params },                         \
-    OSSL_DISPATCH_END                                                          \
-}
+#define IMPLEMENT_tdes_cipher(type, UCTYPE, lcmode, UCMODE, flags,                 \
+    kbits, blkbits, ivbits, block)                                                 \
+    static OSSL_FUNC_cipher_newctx_fn tdes_##type##_##lcmode##_newctx;             \
+    static void *tdes_##type##_##lcmode##_newctx(void *provctx)                    \
+    {                                                                              \
+        return ossl_tdes_newctx(provctx, EVP_CIPH_##UCMODE##_MODE, kbits, blkbits, \
+            ivbits, flags,                                                         \
+            ossl_prov_cipher_hw_tdes_##type##_##lcmode());                         \
+    }                                                                              \
+    static OSSL_FUNC_cipher_get_params_fn tdes_##type##_##lcmode##_get_params;     \
+    static int tdes_##type##_##lcmode##_get_params(OSSL_PARAM params[])            \
+    {                                                                              \
+        return ossl_tdes_get_params(params, EVP_CIPH_##UCMODE##_MODE,              \
+            flags, kbits, blkbits, ivbits);                                        \
+    }                                                                              \
+    const OSSL_DISPATCH ossl_tdes_##type##_##lcmode##_functions[] = {              \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))ossl_tdes_einit },        \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_tdes_dinit },        \
+        { OSSL_FUNC_CIPHER_UPDATE,                                                 \
+            (void (*)(void))ossl_cipher_generic_##block##_update },                \
+        { OSSL_FUNC_CIPHER_FINAL,                                                  \
+            (void (*)(void))ossl_cipher_generic_##block##_final },                 \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },   \
+        { OSSL_FUNC_CIPHER_NEWCTX,                                                 \
+            (void (*)(void))tdes_##type##_##lcmode##_newctx },                     \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))ossl_tdes_dupctx },             \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))ossl_tdes_freectx },           \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
+            (void (*)(void))tdes_##type##_##lcmode##_get_params },                 \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
+            (void (*)(void))ossl_cipher_generic_gettable_params },                 \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
+            (void (*)(void))ossl_tdes_get_ctx_params },                            \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
+            (void (*)(void))ossl_tdes_gettable_ctx_params },                       \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
+            (void (*)(void))ossl_tdes_set_ctx_params },                            \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
+            (void (*)(void))ossl_tdes_settable_ctx_params },                       \
+        OSSL_DISPATCH_END                                                          \
+    }
 
 void *ossl_tdes_newctx(void *provctx, int mode, size_t kbits, size_t blkbits,
-                       size_t ivbits, uint64_t flags, const PROV_CIPHER_HW *hw);
+    size_t ivbits, uint64_t flags, const PROV_CIPHER_HW *hw);
 int ossl_tdes_get_params(OSSL_PARAM params[], unsigned int md, uint64_t flags,
-                         size_t kbits, size_t blkbits, size_t ivbits);
+    size_t kbits, size_t blkbits, size_t ivbits);
 
 OSSL_FUNC_cipher_dupctx_fn ossl_tdes_dupctx;
 OSSL_FUNC_cipher_freectx_fn ossl_tdes_freectx;
@@ -86,25 +86,25 @@ OSSL_FUNC_cipher_gettable_ctx_params_fn ossl_tdes_gettable_ctx_params;
 OSSL_FUNC_cipher_set_ctx_params_fn ossl_tdes_set_ctx_params;
 OSSL_FUNC_cipher_settable_ctx_params_fn ossl_tdes_settable_ctx_params;
 
-#define PROV_CIPHER_HW_tdes_mode(type, mode)                                   \
-static const PROV_CIPHER_HW type##_##mode = {                                  \
-    ossl_cipher_hw_tdes_##type##_initkey,                                      \
-    ossl_cipher_hw_tdes_##mode,                                                \
-    ossl_cipher_hw_tdes_copyctx                                                \
-};                                                                             \
-const PROV_CIPHER_HW *ossl_prov_cipher_hw_tdes_##type##_##mode(void)           \
-{                                                                              \
-    return &type##_##mode;                                                     \
-}
+#define PROV_CIPHER_HW_tdes_mode(type, mode)                             \
+    static const PROV_CIPHER_HW type##_##mode = {                        \
+        ossl_cipher_hw_tdes_##type##_initkey,                            \
+        ossl_cipher_hw_tdes_##mode,                                      \
+        ossl_cipher_hw_tdes_copyctx                                      \
+    };                                                                   \
+    const PROV_CIPHER_HW *ossl_prov_cipher_hw_tdes_##type##_##mode(void) \
+    {                                                                    \
+        return &type##_##mode;                                           \
+    }
 
 int ossl_cipher_hw_tdes_ede3_initkey(PROV_CIPHER_CTX *ctx,
-                                     const unsigned char *key, size_t keylen);
+    const unsigned char *key, size_t keylen);
 void ossl_cipher_hw_tdes_copyctx(PROV_CIPHER_CTX *dst,
-                                 const PROV_CIPHER_CTX *src);
+    const PROV_CIPHER_CTX *src);
 int ossl_cipher_hw_tdes_cbc(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t inl);
+    const unsigned char *in, size_t inl);
 int ossl_cipher_hw_tdes_ecb(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 
 const PROV_CIPHER_HW *ossl_prov_cipher_hw_tdes_ede3_cbc(void);
 const PROV_CIPHER_HW *ossl_prov_cipher_hw_tdes_ede3_ecb(void);
diff --git a/providers/implementations/ciphers/cipher_tdes_common.c b/providers/implementations/ciphers/cipher_tdes_common.c
index e8564c3d0f834..80c38d9d325bb 100644
--- a/providers/implementations/ciphers/cipher_tdes_common.c
+++ b/providers/implementations/ciphers/cipher_tdes_common.c
@@ -21,7 +21,7 @@
 #include "prov/providercommon.h"
 
 void *ossl_tdes_newctx(void *provctx, int mode, size_t kbits, size_t blkbits,
-                       size_t ivbits, uint64_t flags, const PROV_CIPHER_HW *hw)
+    size_t ivbits, uint64_t flags, const PROV_CIPHER_HW *hw)
 {
     PROV_TDES_CTX *tctx;
 
@@ -32,7 +32,7 @@ void *ossl_tdes_newctx(void *provctx, int mode, size_t kbits, size_t blkbits,
     if (tctx != NULL) {
         OSSL_FIPS_IND_INIT(tctx)
         ossl_cipher_generic_initkey(tctx, kbits, blkbits, ivbits, mode, flags,
-                                    hw, provctx);
+            hw, provctx);
     }
     return tctx;
 }
@@ -59,25 +59,22 @@ void ossl_tdes_freectx(void *vctx)
     PROV_TDES_CTX *ctx = (PROV_TDES_CTX *)vctx;
 
     ossl_cipher_generic_reset_ctx((PROV_CIPHER_CTX *)vctx);
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 #ifdef FIPS_MODULE
 static int tdes_encrypt_check_approved(PROV_TDES_CTX *ctx, int enc)
 {
     /* Triple-DES encryption is not approved in FIPS 140-3 */
-    if (enc && !OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
-                                            ctx->base.libctx,
-                                            "Triple-DES", "Encryption",
-                                            ossl_fips_config_tdes_encrypt_disallowed))
+    if (enc && !OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0, ctx->base.libctx, "Triple-DES", "Encryption", ossl_fips_config_tdes_encrypt_disallowed))
         return 0;
     return 1;
 }
 #endif
 
 static int tdes_init(void *vctx, const unsigned char *key, size_t keylen,
-                     const unsigned char *iv, size_t ivlen,
-                     const OSSL_PARAM params[], int enc)
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[], int enc)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
 
@@ -92,9 +89,9 @@ static int tdes_init(void *vctx, const unsigned char *key, size_t keylen,
         if (!ossl_cipher_generic_initiv(ctx, iv, ivlen))
             return 0;
     } else if (ctx->iv_set
-               && (ctx->mode == EVP_CIPH_CBC_MODE
-                   || ctx->mode == EVP_CIPH_CFB_MODE
-                   || ctx->mode == EVP_CIPH_OFB_MODE)) {
+        && (ctx->mode == EVP_CIPH_CBC_MODE
+            || ctx->mode == EVP_CIPH_CFB_MODE
+            || ctx->mode == EVP_CIPH_OFB_MODE)) {
         /* reset IV to keep compatibility with 1.1.1 */
         memcpy(ctx->iv, ctx->oiv, ctx->ivlen);
     }
@@ -118,25 +115,25 @@ static int tdes_init(void *vctx, const unsigned char *key, size_t keylen,
 }
 
 int ossl_tdes_einit(void *vctx, const unsigned char *key, size_t keylen,
-                    const unsigned char *iv, size_t ivlen,
-                    const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return tdes_init(vctx, key, keylen, iv, ivlen, params, 1);
 }
 
 int ossl_tdes_dinit(void *vctx, const unsigned char *key, size_t keylen,
-                    const unsigned char *iv, size_t ivlen,
-                    const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return tdes_init(vctx, key, keylen, iv, ivlen, params, 0);
 }
 
 CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_START(ossl_tdes)
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_RANDOM_KEY, NULL, 0),
+OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_RANDOM_KEY, NULL, 0),
     OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(ossl_tdes)
+        CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(ossl_tdes)
 
-static int tdes_generatekey(PROV_CIPHER_CTX *ctx, void *ptr)
+            static int tdes_generatekey(PROV_CIPHER_CTX *ctx, void *ptr)
 {
     DES_cblock *deskey = ptr;
     size_t kl = ctx->keylen;
@@ -171,22 +168,22 @@ int ossl_tdes_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_START(ossl_tdes)
-    OSSL_PARAM_uint(OSSL_CIPHER_PARAM_PADDING, NULL),
+OSSL_PARAM_uint(OSSL_CIPHER_PARAM_PADDING, NULL),
     OSSL_PARAM_uint(OSSL_CIPHER_PARAM_NUM, NULL),
     OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_CIPHER_PARAM_FIPS_ENCRYPT_CHECK)
-CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(ossl_tdes)
+        CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(ossl_tdes)
 
-int ossl_tdes_set_ctx_params(void *vctx, const OSSL_PARAM params[])
+            int ossl_tdes_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 {
     if (!OSSL_FIPS_IND_SET_CTX_PARAM((PROV_TDES_CTX *)vctx,
-                                     OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_CIPHER_PARAM_FIPS_ENCRYPT_CHECK))
+            OSSL_FIPS_IND_SETTABLE0, params,
+            OSSL_CIPHER_PARAM_FIPS_ENCRYPT_CHECK))
         return 0;
     return ossl_cipher_generic_set_ctx_params(vctx, params);
 }
 
 int ossl_tdes_get_params(OSSL_PARAM params[], unsigned int md, uint64_t flags,
-                         size_t kbits, size_t blkbits, size_t ivbits)
+    size_t kbits, size_t blkbits, size_t ivbits)
 {
 #ifdef FIPS_MODULE
     const int decrypt_only = 1;
@@ -202,5 +199,5 @@ int ossl_tdes_get_params(OSSL_PARAM params[], unsigned int md, uint64_t flags,
     }
 
     return ossl_cipher_generic_get_params(params, md, flags,
-                                          kbits, blkbits, ivbits);
+        kbits, blkbits, ivbits);
 }
diff --git a/providers/implementations/ciphers/cipher_tdes_default.c b/providers/implementations/ciphers/cipher_tdes_default.c
index 3b8908ff39882..35bf23fc5f95a 100644
--- a/providers/implementations/ciphers/cipher_tdes_default.c
+++ b/providers/implementations/ciphers/cipher_tdes_default.c
@@ -17,19 +17,19 @@
 #include "prov/implementations.h"
 
 /* ossl_tdes_ede3_ofb_functions */
-IMPLEMENT_tdes_cipher(ede3, EDE3,  ofb, OFB, TDES_FLAGS, 64*3,  8, 64, stream);
+IMPLEMENT_tdes_cipher(ede3, EDE3, ofb, OFB, TDES_FLAGS, 64 * 3, 8, 64, stream);
 /* ossl_tdes_ede3_cfb_functions */
-IMPLEMENT_tdes_cipher(ede3, EDE3,  cfb, CFB, TDES_FLAGS, 64*3,  8, 64, stream);
+IMPLEMENT_tdes_cipher(ede3, EDE3, cfb, CFB, TDES_FLAGS, 64 * 3, 8, 64, stream);
 /* ossl_tdes_ede3_cfb1_functions */
-IMPLEMENT_tdes_cipher(ede3, EDE3, cfb1, CFB, TDES_FLAGS, 64*3,  8, 64, stream);
+IMPLEMENT_tdes_cipher(ede3, EDE3, cfb1, CFB, TDES_FLAGS, 64 * 3, 8, 64, stream);
 /* ossl_tdes_ede3_cfb8_functions */
-IMPLEMENT_tdes_cipher(ede3, EDE3, cfb8, CFB, TDES_FLAGS, 64*3,  8, 64, stream);
+IMPLEMENT_tdes_cipher(ede3, EDE3, cfb8, CFB, TDES_FLAGS, 64 * 3, 8, 64, stream);
 
 /* ossl_tdes_ede2_ecb_functions */
-IMPLEMENT_tdes_cipher(ede2, EDE2, ecb, ECB, TDES_FLAGS, 64*2, 64, 0, block);
+IMPLEMENT_tdes_cipher(ede2, EDE2, ecb, ECB, TDES_FLAGS, 64 * 2, 64, 0, block);
 /* ossl_tdes_ede2_cbc_functions */
-IMPLEMENT_tdes_cipher(ede2, EDE2, cbc, CBC, TDES_FLAGS, 64*2, 64, 64, block);
+IMPLEMENT_tdes_cipher(ede2, EDE2, cbc, CBC, TDES_FLAGS, 64 * 2, 64, 64, block);
 /* ossl_tdes_ede2_ofb_functions */
-IMPLEMENT_tdes_cipher(ede2, EDE2, ofb, OFB, TDES_FLAGS, 64*2,  8, 64, stream);
+IMPLEMENT_tdes_cipher(ede2, EDE2, ofb, OFB, TDES_FLAGS, 64 * 2, 8, 64, stream);
 /* ossl_tdes_ede2_cfb_functions */
-IMPLEMENT_tdes_cipher(ede2, EDE2, cfb, CFB, TDES_FLAGS, 64*2,  8, 64, stream);
+IMPLEMENT_tdes_cipher(ede2, EDE2, cfb, CFB, TDES_FLAGS, 64 * 2, 8, 64, stream);
diff --git a/providers/implementations/ciphers/cipher_tdes_default_hw.c b/providers/implementations/ciphers/cipher_tdes_default_hw.c
index ccdf3941c86b7..cd6c3993b5898 100644
--- a/providers/implementations/ciphers/cipher_tdes_default_hw.c
+++ b/providers/implementations/ciphers/cipher_tdes_default_hw.c
@@ -20,25 +20,24 @@
 #define ks3 tks.ks[2]
 
 static int ossl_cipher_hw_tdes_ede2_initkey(PROV_CIPHER_CTX *ctx,
-                                            const unsigned char *key,
-                                            size_t keylen)
+    const unsigned char *key,
+    size_t keylen)
 {
     PROV_TDES_CTX *tctx = (PROV_TDES_CTX *)ctx;
     DES_cblock *deskey = (DES_cblock *)key;
 
     tctx->tstream.cbc = NULL;
-# if defined(SPARC_DES_CAPABLE)
+#if defined(SPARC_DES_CAPABLE)
     if (SPARC_DES_CAPABLE) {
         if (ctx->mode == EVP_CIPH_CBC_MODE) {
             des_t4_key_expand(&deskey[0], &tctx->ks1);
             des_t4_key_expand(&deskey[1], &tctx->ks2);
             memcpy(&tctx->ks3, &tctx->ks1, sizeof(tctx->ks1));
-            tctx->tstream.cbc = ctx->enc ? des_t4_ede3_cbc_encrypt :
-                                           des_t4_ede3_cbc_decrypt;
+            tctx->tstream.cbc = ctx->enc ? des_t4_ede3_cbc_encrypt : des_t4_ede3_cbc_decrypt;
             return 1;
         }
     }
-# endif
+#endif
     DES_set_key_unchecked(&deskey[0], &tctx->ks1);
     DES_set_key_unchecked(&deskey[1], &tctx->ks2);
     memcpy(&tctx->ks3, &tctx->ks1, sizeof(tctx->ks1));
@@ -46,28 +45,28 @@ static int ossl_cipher_hw_tdes_ede2_initkey(PROV_CIPHER_CTX *ctx,
 }
 
 static int ossl_cipher_hw_tdes_ofb(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                   const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     PROV_TDES_CTX *tctx = (PROV_TDES_CTX *)ctx;
     int num = ctx->num;
 
     while (inl >= MAXCHUNK) {
         DES_ede3_ofb64_encrypt(in, out, (long)MAXCHUNK, &tctx->ks1, &tctx->ks2,
-                               &tctx->ks3, (DES_cblock *)ctx->iv, &num);
+            &tctx->ks3, (DES_cblock *)ctx->iv, &num);
         inl -= MAXCHUNK;
         in += MAXCHUNK;
         out += MAXCHUNK;
     }
     if (inl > 0) {
         DES_ede3_ofb64_encrypt(in, out, (long)inl, &tctx->ks1, &tctx->ks2,
-                               &tctx->ks3, (DES_cblock *)ctx->iv, &num);
+            &tctx->ks3, (DES_cblock *)ctx->iv, &num);
     }
     ctx->num = num;
     return 1;
 }
 
 static int ossl_cipher_hw_tdes_cfb(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                   const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     PROV_TDES_CTX *tctx = (PROV_TDES_CTX *)ctx;
     int num = ctx->num;
@@ -75,16 +74,16 @@ static int ossl_cipher_hw_tdes_cfb(PROV_CIPHER_CTX *ctx, unsigned char *out,
     while (inl >= MAXCHUNK) {
 
         DES_ede3_cfb64_encrypt(in, out, (long)MAXCHUNK,
-                               &tctx->ks1, &tctx->ks2, &tctx->ks3,
-                               (DES_cblock *)ctx->iv, &num, ctx->enc);
+            &tctx->ks1, &tctx->ks2, &tctx->ks3,
+            (DES_cblock *)ctx->iv, &num, ctx->enc);
         inl -= MAXCHUNK;
         in += MAXCHUNK;
         out += MAXCHUNK;
     }
     if (inl > 0) {
         DES_ede3_cfb64_encrypt(in, out, (long)inl,
-                               &tctx->ks1, &tctx->ks2, &tctx->ks3,
-                               (DES_cblock *)ctx->iv, &num, ctx->enc);
+            &tctx->ks1, &tctx->ks2, &tctx->ks3,
+            (DES_cblock *)ctx->iv, &num, ctx->enc);
     }
     ctx->num = num;
     return 1;
@@ -95,7 +94,7 @@ static int ossl_cipher_hw_tdes_cfb(PROV_CIPHER_CTX *ctx, unsigned char *out,
  * right way, so wrap it here
  */
 static int ossl_cipher_hw_tdes_cfb1(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                    const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     PROV_TDES_CTX *tctx = (PROV_TDES_CTX *)ctx;
     size_t n;
@@ -107,8 +106,8 @@ static int ossl_cipher_hw_tdes_cfb1(PROV_CIPHER_CTX *ctx, unsigned char *out,
     for (n = 0; n < inl; ++n) {
         c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;
         DES_ede3_cfb_encrypt(c, d, 1, 1,
-                             &tctx->ks1, &tctx->ks2, &tctx->ks3,
-                             (DES_cblock *)ctx->iv, ctx->enc);
+            &tctx->ks1, &tctx->ks2, &tctx->ks3,
+            (DES_cblock *)ctx->iv, ctx->enc);
         out[n / 8] = (out[n / 8] & ~(0x80 >> (unsigned int)(n % 8)))
             | ((d[0] & 0x80) >> (unsigned int)(n % 8));
     }
@@ -117,32 +116,31 @@ static int ossl_cipher_hw_tdes_cfb1(PROV_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int ossl_cipher_hw_tdes_cfb8(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                    const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     PROV_TDES_CTX *tctx = (PROV_TDES_CTX *)ctx;
 
     while (inl >= MAXCHUNK) {
         DES_ede3_cfb_encrypt(in, out, 8, (long)MAXCHUNK,
-                             &tctx->ks1, &tctx->ks2, &tctx->ks3,
-                             (DES_cblock *)ctx->iv, ctx->enc);
+            &tctx->ks1, &tctx->ks2, &tctx->ks3,
+            (DES_cblock *)ctx->iv, ctx->enc);
         inl -= MAXCHUNK;
         in += MAXCHUNK;
         out += MAXCHUNK;
     }
     if (inl > 0)
         DES_ede3_cfb_encrypt(in, out, 8, (long)inl,
-                             &tctx->ks1, &tctx->ks2, &tctx->ks3,
-                             (DES_cblock *)ctx->iv, ctx->enc);
+            &tctx->ks1, &tctx->ks2, &tctx->ks3,
+            (DES_cblock *)ctx->iv, ctx->enc);
     return 1;
 }
 
 PROV_CIPHER_HW_tdes_mode(ede3, ofb)
-PROV_CIPHER_HW_tdes_mode(ede3, cfb)
-PROV_CIPHER_HW_tdes_mode(ede3, cfb1)
-PROV_CIPHER_HW_tdes_mode(ede3, cfb8)
-
-PROV_CIPHER_HW_tdes_mode(ede2, ecb)
-PROV_CIPHER_HW_tdes_mode(ede2, cbc)
-PROV_CIPHER_HW_tdes_mode(ede2, ofb)
-PROV_CIPHER_HW_tdes_mode(ede2, cfb)
-
+    PROV_CIPHER_HW_tdes_mode(ede3, cfb)
+        PROV_CIPHER_HW_tdes_mode(ede3, cfb1)
+            PROV_CIPHER_HW_tdes_mode(ede3, cfb8)
+
+                PROV_CIPHER_HW_tdes_mode(ede2, ecb)
+                    PROV_CIPHER_HW_tdes_mode(ede2, cbc)
+                        PROV_CIPHER_HW_tdes_mode(ede2, ofb)
+                            PROV_CIPHER_HW_tdes_mode(ede2, cfb)
diff --git a/providers/implementations/ciphers/cipher_tdes_hw.c b/providers/implementations/ciphers/cipher_tdes_hw.c
index 4382969f44bb1..06d528d0c532d 100644
--- a/providers/implementations/ciphers/cipher_tdes_hw.c
+++ b/providers/implementations/ciphers/cipher_tdes_hw.c
@@ -21,24 +21,23 @@
 #define ks3 tks.ks[2]
 
 int ossl_cipher_hw_tdes_ede3_initkey(PROV_CIPHER_CTX *ctx,
-                                     const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     PROV_TDES_CTX *tctx = (PROV_TDES_CTX *)ctx;
     DES_cblock *deskey = (DES_cblock *)key;
 
     tctx->tstream.cbc = NULL;
-# if defined(SPARC_DES_CAPABLE)
+#if defined(SPARC_DES_CAPABLE)
     if (SPARC_DES_CAPABLE) {
         if (ctx->mode == EVP_CIPH_CBC_MODE) {
             des_t4_key_expand(&deskey[0], &tctx->ks1);
             des_t4_key_expand(&deskey[1], &tctx->ks2);
             des_t4_key_expand(&deskey[2], &tctx->ks3);
-            tctx->tstream.cbc = ctx->enc ? des_t4_ede3_cbc_encrypt :
-                                           des_t4_ede3_cbc_decrypt;
+            tctx->tstream.cbc = ctx->enc ? des_t4_ede3_cbc_encrypt : des_t4_ede3_cbc_decrypt;
             return 1;
         }
     }
-# endif
+#endif
     DES_set_key_unchecked(&deskey[0], &tctx->ks1);
     DES_set_key_unchecked(&deskey[1], &tctx->ks2);
     DES_set_key_unchecked(&deskey[2], &tctx->ks3);
@@ -46,7 +45,7 @@ int ossl_cipher_hw_tdes_ede3_initkey(PROV_CIPHER_CTX *ctx,
 }
 
 void ossl_cipher_hw_tdes_copyctx(PROV_CIPHER_CTX *dst,
-                                 const PROV_CIPHER_CTX *src)
+    const PROV_CIPHER_CTX *src)
 {
     PROV_TDES_CTX *sctx = (PROV_TDES_CTX *)src;
     PROV_TDES_CTX *dctx = (PROV_TDES_CTX *)dst;
@@ -56,30 +55,30 @@ void ossl_cipher_hw_tdes_copyctx(PROV_CIPHER_CTX *dst,
 }
 
 int ossl_cipher_hw_tdes_cbc(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     PROV_TDES_CTX *tctx = (PROV_TDES_CTX *)ctx;
 
     if (tctx->tstream.cbc != NULL) {
-        (*tctx->tstream.cbc) (in, out, inl, tctx->tks.ks, ctx->iv);
+        (*tctx->tstream.cbc)(in, out, inl, tctx->tks.ks, ctx->iv);
         return 1;
     }
 
     while (inl >= MAXCHUNK) {
         DES_ede3_cbc_encrypt(in, out, (long)MAXCHUNK, &tctx->ks1, &tctx->ks2,
-                             &tctx->ks3, (DES_cblock *)ctx->iv, ctx->enc);
+            &tctx->ks3, (DES_cblock *)ctx->iv, ctx->enc);
         inl -= MAXCHUNK;
         in += MAXCHUNK;
         out += MAXCHUNK;
     }
     if (inl > 0)
         DES_ede3_cbc_encrypt(in, out, (long)inl, &tctx->ks1, &tctx->ks2,
-                             &tctx->ks3, (DES_cblock *)ctx->iv, ctx->enc);
+            &tctx->ks3, (DES_cblock *)ctx->iv, ctx->enc);
     return 1;
 }
 
 int ossl_cipher_hw_tdes_ecb(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                            const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     size_t i;
     PROV_TDES_CTX *tctx = (PROV_TDES_CTX *)ctx;
@@ -89,10 +88,10 @@ int ossl_cipher_hw_tdes_ecb(PROV_CIPHER_CTX *ctx, unsigned char *out,
 
     for (i = 0, len -= DES_BLOCK_SIZE; i <= len; i += DES_BLOCK_SIZE) {
         DES_ecb3_encrypt((const_DES_cblock *)(in + i), (DES_cblock *)(out + i),
-                         &tctx->ks1, &tctx->ks2, &tctx->ks3, ctx->enc);
+            &tctx->ks1, &tctx->ks2, &tctx->ks3, ctx->enc);
     }
     return 1;
 }
 
 PROV_CIPHER_HW_tdes_mode(ede3, ecb)
-PROV_CIPHER_HW_tdes_mode(ede3, cbc)
+    PROV_CIPHER_HW_tdes_mode(ede3, cbc)
diff --git a/providers/implementations/ciphers/cipher_tdes_wrap.c b/providers/implementations/ciphers/cipher_tdes_wrap.c
index b48c02ae25817..8fc053d045947 100644
--- a/providers/implementations/ciphers/cipher_tdes_wrap.c
+++ b/providers/implementations/ciphers/cipher_tdes_wrap.c
@@ -32,7 +32,7 @@ static const unsigned char wrap_iv[8] = {
 };
 
 static int des_ede3_unwrap(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     unsigned char icv[8], iv[TDES_IVLEN], sha1tmp[SHA_DIGEST_LENGTH];
     int rv = -1;
@@ -65,7 +65,7 @@ static int des_ede3_unwrap(PROV_CIPHER_CTX *ctx, unsigned char *out,
     ctx->hw->cipher(ctx, out, out, inl - 16);
     ctx->hw->cipher(ctx, icv, icv, 8);
     if (ossl_sha1(out, inl - 16, sha1tmp) /* Work out hash of first portion */
-            && CRYPTO_memcmp(sha1tmp, icv, 8) == 0)
+        && CRYPTO_memcmp(sha1tmp, icv, 8) == 0)
         rv = inl - 16;
     OPENSSL_cleanse(icv, 8);
     OPENSSL_cleanse(sha1tmp, SHA_DIGEST_LENGTH);
@@ -78,7 +78,7 @@ static int des_ede3_unwrap(PROV_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int des_ede3_wrap(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                         const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     unsigned char sha1tmp[SHA_DIGEST_LENGTH];
     size_t ivlen = TDES_IVLEN;
@@ -108,7 +108,7 @@ static int des_ede3_wrap(PROV_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int tdes_wrap_cipher_internal(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                     const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     /*
      * Sanity check input length: we typically only wrap keys so EVP_MAXCHUNK
@@ -124,8 +124,8 @@ static int tdes_wrap_cipher_internal(PROV_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 static int tdes_wrap_cipher(void *vctx,
-                            unsigned char *out, size_t *outl, size_t outsize,
-                            const unsigned char *in, size_t inl)
+    unsigned char *out, size_t *outl, size_t outsize,
+    const unsigned char *in, size_t inl)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
     int ret;
@@ -148,8 +148,8 @@ static int tdes_wrap_cipher(void *vctx,
 }
 
 static int tdes_wrap_update(void *vctx, unsigned char *out, size_t *outl,
-                            size_t outsize, const unsigned char *in,
-                            size_t inl)
+    size_t outsize, const unsigned char *in,
+    size_t inl)
 {
     *outl = 0;
     if (inl == 0)
@@ -166,44 +166,42 @@ static int tdes_wrap_update(void *vctx, unsigned char *out, size_t *outl,
     return 1;
 }
 
-
-# define IMPLEMENT_WRAP_CIPHER(flags, kbits, blkbits, ivbits)                  \
-static OSSL_FUNC_cipher_newctx_fn tdes_wrap_newctx;                            \
-static void *tdes_wrap_newctx(void *provctx)                                   \
-{                                                                              \
-    return ossl_tdes_newctx(provctx, EVP_CIPH_WRAP_MODE, kbits, blkbits,       \
-                            ivbits, flags,                                     \
-                            ossl_prov_cipher_hw_tdes_wrap_cbc());              \
-}                                                                              \
-static OSSL_FUNC_cipher_get_params_fn tdes_wrap_get_params;                    \
-static int tdes_wrap_get_params(OSSL_PARAM params[])                           \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_WRAP_MODE, flags,   \
-                                          kbits, blkbits, ivbits);             \
-}                                                                              \
-const OSSL_DISPATCH ossl_tdes_wrap_cbc_functions[] =                           \
-{                                                                              \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void)) ossl_tdes_einit },       \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void)) ossl_tdes_dinit },       \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))tdes_wrap_cipher },             \
-    { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))tdes_wrap_newctx },             \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))ossl_tdes_freectx },           \
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))tdes_wrap_update },             \
-    { OSSL_FUNC_CIPHER_FINAL,                                                  \
-      (void (*)(void))ossl_cipher_generic_stream_final },                      \
-    { OSSL_FUNC_CIPHER_GET_PARAMS, (void (*)(void))tdes_wrap_get_params },     \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-      (void (*)(void))ossl_tdes_get_ctx_params },                              \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))ossl_tdes_gettable_ctx_params },                         \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-      (void (*)(void))ossl_cipher_generic_set_ctx_params },                    \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))ossl_cipher_generic_settable_ctx_params },               \
-    OSSL_DISPATCH_END                                                          \
-}
+#define IMPLEMENT_WRAP_CIPHER(flags, kbits, blkbits, ivbits)                     \
+    static OSSL_FUNC_cipher_newctx_fn tdes_wrap_newctx;                          \
+    static void *tdes_wrap_newctx(void *provctx)                                 \
+    {                                                                            \
+        return ossl_tdes_newctx(provctx, EVP_CIPH_WRAP_MODE, kbits, blkbits,     \
+            ivbits, flags,                                                       \
+            ossl_prov_cipher_hw_tdes_wrap_cbc());                                \
+    }                                                                            \
+    static OSSL_FUNC_cipher_get_params_fn tdes_wrap_get_params;                  \
+    static int tdes_wrap_get_params(OSSL_PARAM params[])                         \
+    {                                                                            \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_WRAP_MODE, flags, \
+            kbits, blkbits, ivbits);                                             \
+    }                                                                            \
+    const OSSL_DISPATCH ossl_tdes_wrap_cbc_functions[] = {                       \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))ossl_tdes_einit },      \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_tdes_dinit },      \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))tdes_wrap_cipher },           \
+        { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))tdes_wrap_newctx },           \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))ossl_tdes_freectx },         \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))tdes_wrap_update },           \
+        { OSSL_FUNC_CIPHER_FINAL,                                                \
+            (void (*)(void))ossl_cipher_generic_stream_final },                  \
+        { OSSL_FUNC_CIPHER_GET_PARAMS, (void (*)(void))tdes_wrap_get_params },   \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                      \
+            (void (*)(void))ossl_cipher_generic_gettable_params },               \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                       \
+            (void (*)(void))ossl_tdes_get_ctx_params },                          \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                  \
+            (void (*)(void))ossl_tdes_gettable_ctx_params },                     \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                       \
+            (void (*)(void))ossl_cipher_generic_set_ctx_params },                \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                  \
+            (void (*)(void))ossl_cipher_generic_settable_ctx_params },           \
+        OSSL_DISPATCH_END                                                        \
+    }
 
 /* ossl_tdes_wrap_cbc_functions */
-IMPLEMENT_WRAP_CIPHER(TDES_WRAP_FLAGS, 64*3, 64, 0);
+IMPLEMENT_WRAP_CIPHER(TDES_WRAP_FLAGS, 64 * 3, 64, 0);
diff --git a/providers/implementations/ciphers/ciphercommon.c b/providers/implementations/ciphers/ciphercommon.c
index b1331b5b64f1e..ba2a9b68088b1 100644
--- a/providers/implementations/ciphers/ciphercommon.c
+++ b/providers/implementations/ciphers/ciphercommon.c
@@ -41,8 +41,8 @@ const OSSL_PARAM *ossl_cipher_generic_gettable_params(ossl_unused void *provctx)
 }
 
 int ossl_cipher_generic_get_params(OSSL_PARAM params[], unsigned int md,
-                                   uint64_t flags,
-                                   size_t kbits, size_t blkbits, size_t ivbits)
+    uint64_t flags,
+    size_t kbits, size_t blkbits, size_t ivbits)
 {
     OSSL_PARAM *p;
 
@@ -99,20 +99,19 @@ int ossl_cipher_generic_get_params(OSSL_PARAM params[], unsigned int md,
     return 1;
 }
 
-CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_START(ossl_cipher_generic)
-{ OSSL_CIPHER_PARAM_TLS_MAC, OSSL_PARAM_OCTET_PTR, NULL, 0, OSSL_PARAM_UNMODIFIED },
-CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(ossl_cipher_generic)
+CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_START(ossl_cipher_generic) { OSSL_CIPHER_PARAM_TLS_MAC, OSSL_PARAM_OCTET_PTR, NULL, 0, OSSL_PARAM_UNMODIFIED },
+    CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(ossl_cipher_generic)
 
-CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_START(ossl_cipher_generic)
-OSSL_PARAM_uint(OSSL_CIPHER_PARAM_USE_BITS, NULL),
-OSSL_PARAM_uint(OSSL_CIPHER_PARAM_TLS_VERSION, NULL),
-OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_TLS_MAC_SIZE, NULL),
-CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(ossl_cipher_generic)
+        CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_START(ossl_cipher_generic)
+            OSSL_PARAM_uint(OSSL_CIPHER_PARAM_USE_BITS, NULL),
+    OSSL_PARAM_uint(OSSL_CIPHER_PARAM_TLS_VERSION, NULL),
+    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_TLS_MAC_SIZE, NULL),
+    CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(ossl_cipher_generic)
 
-/*
- * Variable key length cipher functions for OSSL_PARAM settables
- */
-int ossl_cipher_var_keylen_set_ctx_params(void *vctx, const OSSL_PARAM params[])
+    /*
+     * Variable key length cipher functions for OSSL_PARAM settables
+     */
+    int ossl_cipher_var_keylen_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
     const OSSL_PARAM *p;
@@ -140,26 +139,26 @@ int ossl_cipher_var_keylen_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 
 CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_START(ossl_cipher_var_keylen)
 OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
-CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(ossl_cipher_var_keylen)
+    CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(ossl_cipher_var_keylen)
 
-/*-
- * AEAD cipher functions for OSSL_PARAM gettables and settables
- */
-static const OSSL_PARAM cipher_aead_known_gettable_ctx_params[] = {
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_IVLEN, NULL),
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TAGLEN, NULL),
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_IV, NULL, 0),
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_UPDATED_IV, NULL, 0),
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0),
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, NULL),
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_GET_IV_GEN, NULL, 0),
-    OSSL_PARAM_uint(OSSL_CIPHER_PARAM_AEAD_IV_GENERATED, NULL),
-    OSSL_PARAM_END
-};
+    /*-
+     * AEAD cipher functions for OSSL_PARAM gettables and settables
+     */
+    static const OSSL_PARAM cipher_aead_known_gettable_ctx_params[]
+    = {
+          OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
+          OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_IVLEN, NULL),
+          OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TAGLEN, NULL),
+          OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_IV, NULL, 0),
+          OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_UPDATED_IV, NULL, 0),
+          OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0),
+          OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, NULL),
+          OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_GET_IV_GEN, NULL, 0),
+          OSSL_PARAM_uint(OSSL_CIPHER_PARAM_AEAD_IV_GENERATED, NULL),
+          OSSL_PARAM_END
+      };
 const OSSL_PARAM *ossl_cipher_aead_gettable_ctx_params(
-        ossl_unused void *cctx, ossl_unused void *provctx
-    )
+    ossl_unused void *cctx, ossl_unused void *provctx)
 {
     return cipher_aead_known_gettable_ctx_params;
 }
@@ -173,8 +172,7 @@ static const OSSL_PARAM cipher_aead_known_settable_ctx_params[] = {
     OSSL_PARAM_END
 };
 const OSSL_PARAM *ossl_cipher_aead_settable_ctx_params(
-        ossl_unused void *cctx, ossl_unused void *provctx
-    )
+    ossl_unused void *cctx, ossl_unused void *provctx)
 {
     return cipher_aead_known_settable_ctx_params;
 }
@@ -189,9 +187,9 @@ void ossl_cipher_generic_reset_ctx(PROV_CIPHER_CTX *ctx)
 }
 
 static int cipher_generic_init_internal(PROV_CIPHER_CTX *ctx,
-                                        const unsigned char *key, size_t keylen,
-                                        const unsigned char *iv, size_t ivlen,
-                                        const OSSL_PARAM params[], int enc)
+    const unsigned char *key, size_t keylen,
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[], int enc)
 {
     ctx->num = 0;
     ctx->bufsz = 0;
@@ -229,49 +227,49 @@ static int cipher_generic_init_internal(PROV_CIPHER_CTX *ctx,
 }
 
 int ossl_cipher_generic_einit(void *vctx, const unsigned char *key,
-                              size_t keylen, const unsigned char *iv,
-                              size_t ivlen, const OSSL_PARAM params[])
+    size_t keylen, const unsigned char *iv,
+    size_t ivlen, const OSSL_PARAM params[])
 {
     return cipher_generic_init_internal((PROV_CIPHER_CTX *)vctx, key, keylen,
-                                        iv, ivlen, params, 1);
+        iv, ivlen, params, 1);
 }
 
 int ossl_cipher_generic_dinit(void *vctx, const unsigned char *key,
-                              size_t keylen, const unsigned char *iv,
-                              size_t ivlen, const OSSL_PARAM params[])
+    size_t keylen, const unsigned char *iv,
+    size_t ivlen, const OSSL_PARAM params[])
 {
     return cipher_generic_init_internal((PROV_CIPHER_CTX *)vctx, key, keylen,
-                                        iv, ivlen, params, 0);
+        iv, ivlen, params, 0);
 }
 
 int ossl_cipher_generic_skey_einit(void *vctx, void *skeydata,
-                                   const unsigned char *iv, size_t ivlen,
-                                   const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     PROV_SKEY *key = skeydata;
 
     return cipher_generic_init_internal((PROV_CIPHER_CTX *)vctx,
-                                        key->data, key->length,
-                                        iv, ivlen, params, 1);
+        key->data, key->length,
+        iv, ivlen, params, 1);
 }
 
 int ossl_cipher_generic_skey_dinit(void *vctx, void *skeydata,
-                                   const unsigned char *iv, size_t ivlen,
-                                   const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     PROV_SKEY *key = skeydata;
 
     return cipher_generic_init_internal((PROV_CIPHER_CTX *)vctx,
-                                        key->data, key->length,
-                                        iv, ivlen, params, 0);
+        key->data, key->length,
+        iv, ivlen, params, 0);
 }
 
 /* Max padding including padding length byte */
 #define MAX_PADDING 256
 
 int ossl_cipher_generic_block_update(void *vctx, unsigned char *out,
-                                     size_t *outl, size_t outsize,
-                                     const unsigned char *in, size_t inl)
+    size_t *outl, size_t outsize,
+    const unsigned char *in, size_t inl)
 {
     size_t outlint = 0;
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
@@ -291,9 +289,9 @@ int ossl_cipher_generic_block_update(void *vctx, unsigned char *out,
 
         /* Sanity check inputs */
         if (in == NULL
-                || in != out
-                || outsize < inl
-                || !ctx->pad) {
+            || in != out
+            || outsize < inl
+            || !ctx->pad) {
             ERR_raise(ERR_LIB_PROV, PROV_R_CIPHER_OPERATION_FAILED);
             return 0;
         }
@@ -333,7 +331,6 @@ int ossl_cipher_generic_block_update(void *vctx, unsigned char *out,
             return 0;
         }
 
-
         /* Shouldn't normally fail */
         if (!ctx->hw->cipher(ctx, out, in, inl)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_CIPHER_OPERATION_FAILED);
@@ -350,9 +347,9 @@ int ossl_cipher_generic_block_update(void *vctx, unsigned char *out,
         *outl = inl;
         if (!ctx->enc
             && !ossl_cipher_tlsunpadblock(ctx->libctx, ctx->tlsversion,
-                                          out, outl,
-                                          blksz, &ctx->tlsmac, &ctx->alloced,
-                                          ctx->tlsmacsize, 0)) {
+                out, outl,
+                blksz, &ctx->tlsmac, &ctx->alloced,
+                ctx->tlsmacsize, 0)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_CIPHER_OPERATION_FAILED);
             return 0;
         }
@@ -361,9 +358,9 @@ int ossl_cipher_generic_block_update(void *vctx, unsigned char *out,
 
     if (ctx->bufsz != 0)
         nextblocks = ossl_cipher_fillblock(ctx->buf, &ctx->bufsz, blksz,
-                                           &in, &inl);
+            &in, &inl);
     else
-        nextblocks = inl & ~(blksz-1);
+        nextblocks = inl & ~(blksz - 1);
 
     /*
      * If we're decrypting and we end an update on a block boundary we hold
@@ -416,7 +413,7 @@ int ossl_cipher_generic_block_update(void *vctx, unsigned char *out,
 }
 
 int ossl_cipher_generic_block_final(void *vctx, unsigned char *out,
-                                    size_t *outl, size_t outsize)
+    size_t *outl, size_t outsize)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
     size_t blksz = ctx->blocksize;
@@ -490,8 +487,8 @@ int ossl_cipher_generic_block_final(void *vctx, unsigned char *out,
 }
 
 int ossl_cipher_generic_stream_update(void *vctx, unsigned char *out,
-                                      size_t *outl, size_t outsize,
-                                      const unsigned char *in, size_t inl)
+    size_t *outl, size_t outsize,
+    const unsigned char *in, size_t inl)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
 
@@ -518,9 +515,9 @@ int ossl_cipher_generic_stream_update(void *vctx, unsigned char *out,
     *outl = inl;
     if (!ctx->enc && ctx->tlsversion > 0) {
         /*
-        * Remove any TLS padding. Only used by cipher_aes_cbc_hmac_sha1_hw.c and
-        * cipher_aes_cbc_hmac_sha256_hw.c
-        */
+         * Remove any TLS padding. Only used by cipher_aes_cbc_hmac_sha1_hw.c and
+         * cipher_aes_cbc_hmac_sha256_hw.c
+         */
         if (ctx->removetlspad) {
             /*
              * We should have already failed in the cipher() call above if this
@@ -552,7 +549,7 @@ int ossl_cipher_generic_stream_update(void *vctx, unsigned char *out,
     return 1;
 }
 int ossl_cipher_generic_stream_final(void *vctx, unsigned char *out,
-                                     size_t *outl, size_t outsize)
+    size_t *outl, size_t outsize)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
 
@@ -569,8 +566,8 @@ int ossl_cipher_generic_stream_final(void *vctx, unsigned char *out,
 }
 
 int ossl_cipher_generic_cipher(void *vctx, unsigned char *out, size_t *outl,
-                               size_t outsize, const unsigned char *in,
-                               size_t inl)
+    size_t outsize, const unsigned char *in,
+    size_t inl)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
 
@@ -700,7 +697,7 @@ int ossl_cipher_generic_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 int ossl_cipher_generic_initiv(PROV_CIPHER_CTX *ctx, const unsigned char *iv,
-                               size_t ivlen)
+    size_t ivlen)
 {
     if (ivlen != ctx->ivlen
         || ivlen > sizeof(ctx->iv)) {
@@ -714,9 +711,9 @@ int ossl_cipher_generic_initiv(PROV_CIPHER_CTX *ctx, const unsigned char *iv,
 }
 
 void ossl_cipher_generic_initkey(void *vctx, size_t kbits, size_t blkbits,
-                                 size_t ivbits, unsigned int mode,
-                                 uint64_t flags, const PROV_CIPHER_HW *hw,
-                                 void *provctx)
+    size_t ivbits, unsigned int mode,
+    uint64_t flags, const PROV_CIPHER_HW *hw,
+    void *provctx)
 {
     PROV_CIPHER_CTX *ctx = (PROV_CIPHER_CTX *)vctx;
 
diff --git a/providers/implementations/ciphers/ciphercommon_block.c b/providers/implementations/ciphers/ciphercommon_block.c
index cfc78e07709fb..634bae4c1c1d5 100644
--- a/providers/implementations/ciphers/ciphercommon_block.c
+++ b/providers/implementations/ciphers/ciphercommon_block.c
@@ -37,8 +37,8 @@
  * which is a multiple of the blocksize.
  */
 size_t ossl_cipher_fillblock(unsigned char *buf, size_t *buflen,
-                             size_t blocksize,
-                             const unsigned char **in, size_t *inlen)
+    size_t blocksize,
+    const unsigned char **in, size_t *inlen)
 {
     size_t blockmask = ~(blocksize - 1);
     size_t bufremain = blocksize - *buflen;
@@ -61,7 +61,7 @@ size_t ossl_cipher_fillblock(unsigned char *buf, size_t *buflen,
  * fit into a full block.
  */
 int ossl_cipher_trailingdata(unsigned char *buf, size_t *buflen, size_t blocksize,
-                             const unsigned char **in, size_t *inlen)
+    const unsigned char **in, size_t *inlen)
 {
     if (*inlen == 0)
         return 1;
@@ -139,18 +139,18 @@ int ossl_cipher_unpadblock(unsigned char *buf, size_t *buflen, size_t blocksize)
  *      the mac is random
  */
 int ossl_cipher_tlsunpadblock(OSSL_LIB_CTX *libctx, unsigned int tlsversion,
-                              unsigned char *buf, size_t *buflen,
-                              size_t blocksize,
-                              unsigned char **mac, int *alloced, size_t macsize,
-                              int aead)
+    unsigned char *buf, size_t *buflen,
+    size_t blocksize,
+    unsigned char **mac, int *alloced, size_t macsize,
+    int aead)
 {
     int ret;
 
     switch (tlsversion) {
     case SSL3_VERSION:
         return ssl3_cbc_remove_padding_and_mac(buflen, *buflen, buf, mac,
-                                               alloced, blocksize, macsize,
-                                               libctx);
+            alloced, blocksize, macsize,
+            libctx);
 
     case TLS1_2_VERSION:
     case DTLS1_2_VERSION:
@@ -163,8 +163,8 @@ int ossl_cipher_tlsunpadblock(OSSL_LIB_CTX *libctx, unsigned int tlsversion,
         /* Fall through */
     case TLS1_VERSION:
         ret = tls1_cbc_remove_padding_and_mac(buflen, *buflen, buf, mac,
-                                              alloced, blocksize, macsize,
-                                              aead, libctx);
+            alloced, blocksize, macsize,
+            aead, libctx);
         return ret;
 
     default:
diff --git a/providers/implementations/ciphers/ciphercommon_ccm.c b/providers/implementations/ciphers/ciphercommon_ccm.c
index 80008a8151826..2b5bddddeb78f 100644
--- a/providers/implementations/ciphers/ciphercommon_ccm.c
+++ b/providers/implementations/ciphers/ciphercommon_ccm.c
@@ -15,8 +15,8 @@
 #include "prov/providercommon.h"
 
 static int ccm_cipher_internal(PROV_CCM_CTX *ctx, unsigned char *out,
-                               size_t *padlen, const unsigned char *in,
-                               size_t len);
+    size_t *padlen, const unsigned char *in,
+    size_t len);
 
 static int ccm_tls_init(PROV_CCM_CTX *ctx, unsigned char *aad, size_t alen)
 {
@@ -50,7 +50,7 @@ static int ccm_tls_init(PROV_CCM_CTX *ctx, unsigned char *aad, size_t alen)
 }
 
 static int ccm_tls_iv_set_fixed(PROV_CCM_CTX *ctx, unsigned char *fixed,
-                                size_t flen)
+    size_t flen)
 {
     if (flen != EVP_CCM_TLS_FIXED_IV_LEN)
         return 0;
@@ -223,8 +223,8 @@ int ossl_ccm_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static int ccm_init(void *vctx, const unsigned char *key, size_t keylen,
-                    const unsigned char *iv, size_t ivlen,
-                    const OSSL_PARAM params[], int enc)
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[], int enc)
 {
     PROV_CCM_CTX *ctx = (PROV_CCM_CTX *)vctx;
 
@@ -253,22 +253,22 @@ static int ccm_init(void *vctx, const unsigned char *key, size_t keylen,
 }
 
 int ossl_ccm_einit(void *vctx, const unsigned char *key, size_t keylen,
-                   const unsigned char *iv, size_t ivlen,
-                   const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return ccm_init(vctx, key, keylen, iv, ivlen, params, 1);
 }
 
 int ossl_ccm_dinit(void *vctx, const unsigned char *key, size_t keylen,
-                   const unsigned char *iv, size_t ivlen,
-                   const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return ccm_init(vctx, key, keylen, iv, ivlen, params, 0);
 }
 
 int ossl_ccm_stream_update(void *vctx, unsigned char *out, size_t *outl,
-                           size_t outsize, const unsigned char *in,
-                           size_t inl)
+    size_t outsize, const unsigned char *in,
+    size_t inl)
 {
     PROV_CCM_CTX *ctx = (PROV_CCM_CTX *)vctx;
 
@@ -285,7 +285,7 @@ int ossl_ccm_stream_update(void *vctx, unsigned char *out, size_t *outl,
 }
 
 int ossl_ccm_stream_final(void *vctx, unsigned char *out, size_t *outl,
-                          size_t outsize)
+    size_t outsize)
 {
     PROV_CCM_CTX *ctx = (PROV_CCM_CTX *)vctx;
     int i;
@@ -302,7 +302,7 @@ int ossl_ccm_stream_final(void *vctx, unsigned char *out, size_t *outl,
 }
 
 int ossl_ccm_cipher(void *vctx, unsigned char *out, size_t *outl, size_t outsize,
-                    const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     PROV_CCM_CTX *ctx = (PROV_CCM_CTX *)vctx;
 
@@ -333,8 +333,8 @@ static int ccm_set_iv(PROV_CCM_CTX *ctx, size_t mlen)
 }
 
 static int ccm_tls_cipher(PROV_CCM_CTX *ctx,
-                          unsigned char *out, size_t *padlen,
-                          const unsigned char *in, size_t len)
+    unsigned char *out, size_t *padlen,
+    const unsigned char *in, size_t len)
 {
     int rv = 0;
     size_t olen = 0;
@@ -364,12 +364,12 @@ static int ccm_tls_cipher(PROV_CCM_CTX *ctx,
     in += EVP_CCM_TLS_EXPLICIT_IV_LEN;
     out += EVP_CCM_TLS_EXPLICIT_IV_LEN;
     if (ctx->enc) {
-        if (!ctx->hw->auth_encrypt(ctx, in, out, len,  out + len, ctx->m))
+        if (!ctx->hw->auth_encrypt(ctx, in, out, len, out + len, ctx->m))
             goto err;
         olen = len + EVP_CCM_TLS_EXPLICIT_IV_LEN + ctx->m;
     } else {
         if (!ctx->hw->auth_decrypt(ctx, in, out, len,
-                                   (unsigned char *)in + len, ctx->m))
+                (unsigned char *)in + len, ctx->m))
             goto err;
         olen = len;
     }
@@ -380,8 +380,8 @@ static int ccm_tls_cipher(PROV_CCM_CTX *ctx,
 }
 
 static int ccm_cipher_internal(PROV_CCM_CTX *ctx, unsigned char *out,
-                               size_t *padlen, const unsigned char *in,
-                               size_t len)
+    size_t *padlen, const unsigned char *in,
+    size_t len)
 {
     int rv = 0;
     size_t olen = 0;
diff --git a/providers/implementations/ciphers/ciphercommon_ccm_hw.c b/providers/implementations/ciphers/ciphercommon_ccm_hw.c
index ad3fbc59e4fcf..21160fbe6120f 100644
--- a/providers/implementations/ciphers/ciphercommon_ccm_hw.c
+++ b/providers/implementations/ciphers/ciphercommon_ccm_hw.c
@@ -11,13 +11,13 @@
 #include "prov/ciphercommon_ccm.h"
 
 int ossl_ccm_generic_setiv(PROV_CCM_CTX *ctx, const unsigned char *nonce,
-                           size_t nlen, size_t mlen)
+    size_t nlen, size_t mlen)
 {
     return CRYPTO_ccm128_setiv(&ctx->ccm_ctx, nonce, nlen, mlen) == 0;
 }
 
 int ossl_ccm_generic_setaad(PROV_CCM_CTX *ctx, const unsigned char *aad,
-                            size_t alen)
+    size_t alen)
 {
     CRYPTO_ccm128_aad(&ctx->ccm_ctx, aad, alen);
     return 1;
@@ -29,14 +29,15 @@ int ossl_ccm_generic_gettag(PROV_CCM_CTX *ctx, unsigned char *tag, size_t tlen)
 }
 
 int ossl_ccm_generic_auth_encrypt(PROV_CCM_CTX *ctx, const unsigned char *in,
-                                  unsigned char *out, size_t len,
-                                  unsigned char *tag, size_t taglen)
+    unsigned char *out, size_t len,
+    unsigned char *tag, size_t taglen)
 {
     int rv;
 
     if (ctx->str != NULL)
         rv = CRYPTO_ccm128_encrypt_ccm64(&ctx->ccm_ctx, in,
-                                         out, len, ctx->str) == 0;
+                 out, len, ctx->str)
+            == 0;
     else
         rv = CRYPTO_ccm128_encrypt(&ctx->ccm_ctx, in, out, len) == 0;
 
@@ -46,14 +47,15 @@ int ossl_ccm_generic_auth_encrypt(PROV_CCM_CTX *ctx, const unsigned char *in,
 }
 
 int ossl_ccm_generic_auth_decrypt(PROV_CCM_CTX *ctx, const unsigned char *in,
-                                  unsigned char *out, size_t len,
-                                  unsigned char *expected_tag, size_t taglen)
+    unsigned char *out, size_t len,
+    unsigned char *expected_tag, size_t taglen)
 {
     int rv = 0;
 
     if (ctx->str != NULL)
         rv = CRYPTO_ccm128_decrypt_ccm64(&ctx->ccm_ctx, in, out, len,
-                                         ctx->str) == 0;
+                 ctx->str)
+            == 0;
     else
         rv = CRYPTO_ccm128_decrypt(&ctx->ccm_ctx, in, out, len) == 0;
     if (rv) {
diff --git a/providers/implementations/ciphers/ciphercommon_gcm.c b/providers/implementations/ciphers/ciphercommon_gcm.c
index 475693f336a45..a1fdf1040125b 100644
--- a/providers/implementations/ciphers/ciphercommon_gcm.c
+++ b/providers/implementations/ciphers/ciphercommon_gcm.c
@@ -19,19 +19,19 @@
 
 static int gcm_tls_init(PROV_GCM_CTX *dat, unsigned char *aad, size_t aad_len);
 static int gcm_tls_iv_set_fixed(PROV_GCM_CTX *ctx, unsigned char *iv,
-                                size_t len);
+    size_t len);
 static int gcm_tls_cipher(PROV_GCM_CTX *ctx, unsigned char *out, size_t *padlen,
-                          const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 static int gcm_cipher_internal(PROV_GCM_CTX *ctx, unsigned char *out,
-                               size_t *padlen, const unsigned char *in,
-                               size_t len);
+    size_t *padlen, const unsigned char *in,
+    size_t len);
 
 /*
  * Called from EVP_CipherInit when there is currently no context via
  * the new_ctx() function
  */
 void ossl_gcm_initctx(void *provctx, PROV_GCM_CTX *ctx, size_t keybits,
-                      const PROV_GCM_HW *hw)
+    const PROV_GCM_HW *hw)
 {
     ctx->pad = 1;
     ctx->mode = EVP_CIPH_GCM_MODE;
@@ -47,8 +47,8 @@ void ossl_gcm_initctx(void *provctx, PROV_GCM_CTX *ctx, size_t keybits,
  * Called by EVP_CipherInit via the _einit and _dinit functions
  */
 static int gcm_init(void *vctx, const unsigned char *key, size_t keylen,
-                    const unsigned char *iv, size_t ivlen,
-                    const OSSL_PARAM params[], int enc)
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[], int enc)
 {
     PROV_GCM_CTX *ctx = (PROV_GCM_CTX *)vctx;
 
@@ -80,15 +80,15 @@ static int gcm_init(void *vctx, const unsigned char *key, size_t keylen,
 }
 
 int ossl_gcm_einit(void *vctx, const unsigned char *key, size_t keylen,
-                   const unsigned char *iv, size_t ivlen,
-                   const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return gcm_init(vctx, key, keylen, iv, ivlen, params, 1);
 }
 
 int ossl_gcm_dinit(void *vctx, const unsigned char *key, size_t keylen,
-                   const unsigned char *iv, size_t ivlen,
-                   const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     return gcm_init(vctx, key, keylen, iv, ivlen, params, 0);
 }
@@ -168,17 +168,14 @@ int ossl_gcm_get_ctx_params(void *vctx, OSSL_PARAM params[])
             }
             break;
 
-        case PIDX_CIPHER_PARAM_AEAD_TAGLEN:
-            {
-                size_t taglen = (ctx->taglen != UNINITIALISED_SIZET) ? ctx->taglen :
-                                 GCM_TAG_MAX_SIZE;
+        case PIDX_CIPHER_PARAM_AEAD_TAGLEN: {
+            size_t taglen = (ctx->taglen != UNINITIALISED_SIZET) ? ctx->taglen : GCM_TAG_MAX_SIZE;
 
-                if (!OSSL_PARAM_set_size_t(p, taglen)) {
-                    ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);
-                    return 0;
-                }
+            if (!OSSL_PARAM_set_size_t(p, taglen)) {
+                ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);
+                return 0;
             }
-            break;
+        } break;
 
         case PIDX_CIPHER_PARAM_IV:
             if (ctx->iv_state == IV_STATE_UNINITIALISED)
@@ -328,7 +325,7 @@ int ossl_gcm_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 int ossl_gcm_stream_update(void *vctx, unsigned char *out, size_t *outl,
-                           size_t outsize, const unsigned char *in, size_t inl)
+    size_t outsize, const unsigned char *in, size_t inl)
 {
     PROV_GCM_CTX *ctx = (PROV_GCM_CTX *)vctx;
 
@@ -350,7 +347,7 @@ int ossl_gcm_stream_update(void *vctx, unsigned char *out, size_t *outl,
 }
 
 int ossl_gcm_stream_final(void *vctx, unsigned char *out, size_t *outl,
-                          size_t outsize)
+    size_t outsize)
 {
     PROV_GCM_CTX *ctx = (PROV_GCM_CTX *)vctx;
     int i;
@@ -367,8 +364,8 @@ int ossl_gcm_stream_final(void *vctx, unsigned char *out, size_t *outl,
 }
 
 int ossl_gcm_cipher(void *vctx,
-                    unsigned char *out, size_t *outl, size_t outsize,
-                    const unsigned char *in, size_t inl)
+    unsigned char *out, size_t *outl, size_t outsize,
+    const unsigned char *in, size_t inl)
 {
     PROV_GCM_CTX *ctx = (PROV_GCM_CTX *)vctx;
 
@@ -412,8 +409,8 @@ static int gcm_iv_generate(PROV_GCM_CTX *ctx, int offset)
 }
 
 static int gcm_cipher_internal(PROV_GCM_CTX *ctx, unsigned char *out,
-                               size_t *padlen, const unsigned char *in,
-                               size_t len)
+    size_t *padlen, const unsigned char *in,
+    size_t len)
 {
     size_t olen = 0;
     int rv = 0;
@@ -475,7 +472,7 @@ static int gcm_tls_init(PROV_GCM_CTX *dat, unsigned char *aad, size_t aad_len)
     size_t len;
 
     if (!ossl_prov_is_running() || aad_len != EVP_AEAD_TLS1_AAD_LEN)
-       return 0;
+        return 0;
 
     /* Save the aad for later use. */
     buf = dat->buf;
@@ -501,7 +498,7 @@ static int gcm_tls_init(PROV_GCM_CTX *dat, unsigned char *aad, size_t aad_len)
 }
 
 static int gcm_tls_iv_set_fixed(PROV_GCM_CTX *ctx, unsigned char *iv,
-                                size_t len)
+    size_t len)
 {
     /* Special case: -1 length restores whole IV */
     if (len == (size_t)-1) {
@@ -513,7 +510,7 @@ static int gcm_tls_iv_set_fixed(PROV_GCM_CTX *ctx, unsigned char *iv,
     /* Fixed field must be at least 4 bytes and invocation field at least 8 */
     if ((len < EVP_GCM_TLS_FIXED_IV_LEN)
         || (ctx->ivlen - (int)len) < EVP_GCM_TLS_EXPLICIT_IV_LEN)
-            return 0;
+        return 0;
     if (len > 0)
         memcpy(ctx->iv, iv, len);
     if (ctx->enc) {
@@ -533,7 +530,7 @@ static int gcm_tls_iv_set_fixed(PROV_GCM_CTX *ctx, unsigned char *iv,
  * and verify tag.
  */
 static int gcm_tls_cipher(PROV_GCM_CTX *ctx, unsigned char *out, size_t *padlen,
-                          const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     int rv = 0;
     size_t arg = EVP_GCM_TLS_EXPLICIT_IV_LEN;
@@ -577,13 +574,13 @@ static int gcm_tls_cipher(PROV_GCM_CTX *ctx, unsigned char *out, size_t *padlen,
 
     tag = ctx->enc ? out + len : (unsigned char *)in + len;
     if (!ctx->hw->oneshot(ctx, ctx->buf, ctx->tls_aad_len, in, len, out, tag,
-                          EVP_GCM_TLS_TAG_LEN)) {
+            EVP_GCM_TLS_TAG_LEN)) {
         if (!ctx->enc)
             OPENSSL_cleanse(out, len);
         goto err;
     }
     if (ctx->enc)
-        plen =  len + EVP_GCM_TLS_EXPLICIT_IV_LEN + EVP_GCM_TLS_TAG_LEN;
+        plen = len + EVP_GCM_TLS_EXPLICIT_IV_LEN + EVP_GCM_TLS_TAG_LEN;
     else
         plen = len;
 
diff --git a/providers/implementations/ciphers/ciphercommon_gcm_hw.c b/providers/implementations/ciphers/ciphercommon_gcm_hw.c
index c0a7399640fdf..807834da8719d 100644
--- a/providers/implementations/ciphers/ciphercommon_gcm_hw.c
+++ b/providers/implementations/ciphers/ciphercommon_gcm_hw.c
@@ -10,7 +10,6 @@
 #include "prov/ciphercommon.h"
 #include "prov/ciphercommon_gcm.h"
 
-
 int ossl_gcm_setiv(PROV_GCM_CTX *ctx, const unsigned char *iv, size_t ivlen)
 {
     CRYPTO_gcm128_setiv(&ctx->gcm, iv, ivlen);
@@ -18,13 +17,13 @@ int ossl_gcm_setiv(PROV_GCM_CTX *ctx, const unsigned char *iv, size_t ivlen)
 }
 
 int ossl_gcm_aad_update(PROV_GCM_CTX *ctx, const unsigned char *aad,
-                        size_t aad_len)
+    size_t aad_len)
 {
     return CRYPTO_gcm128_aad(&ctx->gcm, aad, aad_len) == 0;
 }
 
 int ossl_gcm_cipher_update(PROV_GCM_CTX *ctx, const unsigned char *in,
-                           size_t len, unsigned char *out)
+    size_t len, unsigned char *out)
 {
     if (ctx->enc) {
         if (CRYPTO_gcm128_encrypt(&ctx->gcm, in, out, len))
@@ -49,8 +48,8 @@ int ossl_gcm_cipher_final(PROV_GCM_CTX *ctx, unsigned char *tag)
 }
 
 int ossl_gcm_one_shot(PROV_GCM_CTX *ctx, unsigned char *aad, size_t aad_len,
-                      const unsigned char *in, size_t in_len,
-                      unsigned char *out, unsigned char *tag, size_t tag_len)
+    const unsigned char *in, size_t in_len,
+    unsigned char *out, unsigned char *tag, size_t tag_len)
 {
     int ret = 0;
 
diff --git a/providers/implementations/ciphers/ciphercommon_hw.c b/providers/implementations/ciphers/ciphercommon_hw.c
index e73416a1c5c87..a1e5d4a64ae09 100644
--- a/providers/implementations/ciphers/ciphercommon_hw.c
+++ b/providers/implementations/ciphers/ciphercommon_hw.c
@@ -14,10 +14,10 @@
  * Used if there is no special hardware implementations.
  */
 int ossl_cipher_hw_generic_cbc(PROV_CIPHER_CTX *dat, unsigned char *out,
-                               const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     if (dat->stream.cbc)
-        (*dat->stream.cbc) (in, out, len, dat->ks, dat->iv, dat->enc);
+        (*dat->stream.cbc)(in, out, len, dat->ks, dat->iv, dat->enc);
     else if (dat->enc)
         CRYPTO_cbc128_encrypt(in, out, len, dat->ks, dat->iv, dat->block);
     else
@@ -27,7 +27,7 @@ int ossl_cipher_hw_generic_cbc(PROV_CIPHER_CTX *dat, unsigned char *out,
 }
 
 int ossl_cipher_hw_generic_ecb(PROV_CIPHER_CTX *dat, unsigned char *out,
-                               const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     size_t i, bl = dat->blocksize;
 
@@ -35,18 +35,17 @@ int ossl_cipher_hw_generic_ecb(PROV_CIPHER_CTX *dat, unsigned char *out,
         return 1;
 
     if (dat->stream.ecb) {
-        (*dat->stream.ecb) (in, out, len, dat->ks, dat->enc);
-    }
-    else {
+        (*dat->stream.ecb)(in, out, len, dat->ks, dat->enc);
+    } else {
         for (i = 0, len -= bl; i <= len; i += bl)
-            (*dat->block) (in + i, out + i, dat->ks);
+            (*dat->block)(in + i, out + i, dat->ks);
     }
 
     return 1;
 }
 
 int ossl_cipher_hw_generic_ofb128(PROV_CIPHER_CTX *dat, unsigned char *out,
-                                  const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     int num = dat->num;
 
@@ -57,51 +56,51 @@ int ossl_cipher_hw_generic_ofb128(PROV_CIPHER_CTX *dat, unsigned char *out,
 }
 
 int ossl_cipher_hw_generic_cfb128(PROV_CIPHER_CTX *dat, unsigned char *out,
-                                  const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     int num = dat->num;
 
     CRYPTO_cfb128_encrypt(in, out, len, dat->ks, dat->iv, &num, dat->enc,
-                          dat->block);
+        dat->block);
     dat->num = num;
 
     return 1;
 }
 
 int ossl_cipher_hw_generic_cfb8(PROV_CIPHER_CTX *dat, unsigned char *out,
-                                const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     int num = dat->num;
 
     CRYPTO_cfb128_8_encrypt(in, out, len, dat->ks, dat->iv, &num, dat->enc,
-                            dat->block);
+        dat->block);
     dat->num = num;
 
     return 1;
 }
 
 int ossl_cipher_hw_generic_cfb1(PROV_CIPHER_CTX *dat, unsigned char *out,
-                                const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     int num = dat->num;
 
     if (dat->use_bits) {
         CRYPTO_cfb128_1_encrypt(in, out, len, dat->ks, dat->iv, &num,
-                                dat->enc, dat->block);
+            dat->enc, dat->block);
         dat->num = num;
         return 1;
     }
 
     while (len >= MAXBITCHUNK) {
         CRYPTO_cfb128_1_encrypt(in, out, MAXBITCHUNK * 8, dat->ks,
-                                dat->iv, &num, dat->enc, dat->block);
+            dat->iv, &num, dat->enc, dat->block);
         len -= MAXBITCHUNK;
         out += MAXBITCHUNK;
-        in  += MAXBITCHUNK;
+        in += MAXBITCHUNK;
     }
     if (len)
         CRYPTO_cfb128_1_encrypt(in, out, len * 8, dat->ks, dat->iv, &num,
-                                dat->enc, dat->block);
+            dat->enc, dat->block);
 
     dat->num = num;
 
@@ -109,16 +108,16 @@ int ossl_cipher_hw_generic_cfb1(PROV_CIPHER_CTX *dat, unsigned char *out,
 }
 
 int ossl_cipher_hw_generic_ctr(PROV_CIPHER_CTX *dat, unsigned char *out,
-                               const unsigned char *in, size_t len)
+    const unsigned char *in, size_t len)
 {
     unsigned int num = dat->num;
 
     if (dat->stream.ctr)
         CRYPTO_ctr128_encrypt_ctr32(in, out, len, dat->ks, dat->iv, dat->buf,
-                                    &num, dat->stream.ctr);
+            &num, dat->stream.ctr);
     else
         CRYPTO_ctr128_encrypt(in, out, len, dat->ks, dat->iv, dat->buf,
-                              &num, dat->block);
+            &num, dat->block);
     dat->num = num;
 
     return 1;
@@ -130,12 +129,12 @@ int ossl_cipher_hw_generic_ctr(PROV_CIPHER_CTX *dat, unsigned char *out,
  */
 
 int ossl_cipher_hw_chunked_cbc(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     while (inl >= MAXCHUNK) {
         ossl_cipher_hw_generic_cbc(ctx, out, in, MAXCHUNK);
         inl -= MAXCHUNK;
-        in  += MAXCHUNK;
+        in += MAXCHUNK;
         out += MAXCHUNK;
     }
     if (inl > 0)
@@ -144,7 +143,7 @@ int ossl_cipher_hw_chunked_cbc(PROV_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 int ossl_cipher_hw_chunked_cfb8(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     size_t chunk = MAXCHUNK;
 
@@ -162,7 +161,7 @@ int ossl_cipher_hw_chunked_cfb8(PROV_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 int ossl_cipher_hw_chunked_cfb128(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                  const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     size_t chunk = MAXCHUNK;
 
@@ -180,12 +179,12 @@ int ossl_cipher_hw_chunked_cfb128(PROV_CIPHER_CTX *ctx, unsigned char *out,
 }
 
 int ossl_cipher_hw_chunked_ofb128(PROV_CIPHER_CTX *ctx, unsigned char *out,
-                                  const unsigned char *in, size_t inl)
+    const unsigned char *in, size_t inl)
 {
     while (inl >= MAXCHUNK) {
         ossl_cipher_hw_generic_ofb128(ctx, out, in, MAXCHUNK);
         inl -= MAXCHUNK;
-        in  += MAXCHUNK;
+        in += MAXCHUNK;
         out += MAXCHUNK;
     }
     if (inl > 0)
diff --git a/providers/implementations/ciphers/ciphercommon_local.h b/providers/implementations/ciphers/ciphercommon_local.h
index 11cb6116a8151..f142722f28b0f 100644
--- a/providers/implementations/ciphers/ciphercommon_local.h
+++ b/providers/implementations/ciphers/ciphercommon_local.h
@@ -12,5 +12,5 @@
 void ossl_cipher_padblock(unsigned char *buf, size_t *buflen, size_t blocksize);
 int ossl_cipher_unpadblock(unsigned char *buf, size_t *buflen, size_t blocksize);
 int ossl_cipher_tlsunpadblock(OSSL_LIB_CTX *libctx, unsigned int tlsversion,
-                              unsigned char *buf, size_t *buflen, size_t blocksize,
-                              unsigned char **mac, int *alloced, size_t macsize, int aead);
+    unsigned char *buf, size_t *buflen, size_t blocksize,
+    unsigned char **mac, int *alloced, size_t macsize, int aead);
diff --git a/providers/implementations/digests/blake2_impl.h b/providers/implementations/digests/blake2_impl.h
index e7c31474a3646..dd10beae40586 100644
--- a/providers/implementations/digests/blake2_impl.h
+++ b/providers/implementations/digests/blake2_impl.h
@@ -27,9 +27,9 @@ static ossl_inline uint32_t load32(const uint8_t *src)
         return w;
     } else {
         uint32_t w = ((uint32_t)src[0])
-                   | ((uint32_t)src[1] <<  8)
-                   | ((uint32_t)src[2] << 16)
-                   | ((uint32_t)src[3] << 24);
+            | ((uint32_t)src[1] << 8)
+            | ((uint32_t)src[2] << 16)
+            | ((uint32_t)src[3] << 24);
         return w;
     }
 }
@@ -44,13 +44,13 @@ static ossl_inline uint64_t load64(const uint8_t *src)
         return w;
     } else {
         uint64_t w = ((uint64_t)src[0])
-                   | ((uint64_t)src[1] <<  8)
-                   | ((uint64_t)src[2] << 16)
-                   | ((uint64_t)src[3] << 24)
-                   | ((uint64_t)src[4] << 32)
-                   | ((uint64_t)src[5] << 40)
-                   | ((uint64_t)src[6] << 48)
-                   | ((uint64_t)src[7] << 56);
+            | ((uint64_t)src[1] << 8)
+            | ((uint64_t)src[2] << 16)
+            | ((uint64_t)src[3] << 24)
+            | ((uint64_t)src[4] << 32)
+            | ((uint64_t)src[5] << 40)
+            | ((uint64_t)src[6] << 48)
+            | ((uint64_t)src[7] << 56);
         return w;
     }
 }
@@ -88,11 +88,11 @@ static ossl_inline void store64(uint8_t *dst, uint64_t w)
 static ossl_inline uint64_t load48(const uint8_t *src)
 {
     uint64_t w = ((uint64_t)src[0])
-               | ((uint64_t)src[1] <<  8)
-               | ((uint64_t)src[2] << 16)
-               | ((uint64_t)src[3] << 24)
-               | ((uint64_t)src[4] << 32)
-               | ((uint64_t)src[5] << 40);
+        | ((uint64_t)src[1] << 8)
+        | ((uint64_t)src[2] << 16)
+        | ((uint64_t)src[3] << 24)
+        | ((uint64_t)src[4] << 32)
+        | ((uint64_t)src[5] << 40);
     return w;
 }
 
@@ -100,11 +100,11 @@ static ossl_inline void store48(uint8_t *dst, uint64_t w)
 {
     uint8_t *p = (uint8_t *)dst;
     p[0] = (uint8_t)w;
-    p[1] = (uint8_t)(w>>8);
-    p[2] = (uint8_t)(w>>16);
-    p[3] = (uint8_t)(w>>24);
-    p[4] = (uint8_t)(w>>32);
-    p[5] = (uint8_t)(w>>40);
+    p[1] = (uint8_t)(w >> 8);
+    p[2] = (uint8_t)(w >> 16);
+    p[3] = (uint8_t)(w >> 24);
+    p[4] = (uint8_t)(w >> 32);
+    p[5] = (uint8_t)(w >> 40);
 }
 
 static ossl_inline uint32_t rotr32(const uint32_t w, const unsigned int c)
diff --git a/providers/implementations/digests/blake2_prov.c b/providers/implementations/digests/blake2_prov.c
index 5495aab61a872..5176807199f8c 100644
--- a/providers/implementations/digests/blake2_prov.c
+++ b/providers/implementations/digests/blake2_prov.c
@@ -15,184 +15,184 @@
 #include "prov/digestcommon.h"
 #include "prov/implementations.h"
 
-#define IMPLEMENT_BLAKE_functions(variant, VARIANT, variantsize) \
-static const OSSL_PARAM known_blake##variant##_ctx_params[] = { \
-    {OSSL_DIGEST_PARAM_SIZE, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0}, \
-    OSSL_PARAM_END \
-}; \
- \
-const OSSL_PARAM *ossl_blake##variant##_gettable_ctx_params(ossl_unused void *ctx, \
-                                                   ossl_unused void *pctx) \
-{ \
-    return known_blake##variant##_ctx_params; \
-} \
- \
-const OSSL_PARAM *ossl_blake##variant##_settable_ctx_params(ossl_unused void *ctx, \
-                                                   ossl_unused void *pctx) \
-{ \
-    return known_blake##variant##_ctx_params; \
-} \
- \
-int ossl_blake##variant##_get_ctx_params(void *vctx, OSSL_PARAM params[]) \
-{ \
-    struct blake##variant##_md_data_st *mdctx = vctx; \
-    OSSL_PARAM *p; \
- \
-    BLAKE##VARIANT##_CTX *ctx = &mdctx->ctx; \
- \
-    if (ctx == NULL) \
-        return 0; \
-    if (ossl_param_is_empty(params)) \
-        return 1; \
- \
-    p = OSSL_PARAM_locate(params, OSSL_DIGEST_PARAM_SIZE); \
-    if (p != NULL \
-        && !OSSL_PARAM_set_uint(p, (unsigned int)mdctx->params.digest_length)) { \
-        ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER); \
-        return 0; \
-    } \
- \
-    return 1; \
-} \
- \
-int ossl_blake##variant##_set_ctx_params(void *vctx, const OSSL_PARAM params[]) \
-{ \
-    size_t size; \
-    struct blake##variant##_md_data_st *mdctx = vctx; \
-    const OSSL_PARAM *p; \
- \
-    BLAKE##VARIANT##_CTX *ctx = &mdctx->ctx; \
- \
-    if (ctx == NULL) \
-        return 0; \
-    if (ossl_param_is_empty(params)) \
-        return 1; \
- \
-    p = OSSL_PARAM_locate_const(params, OSSL_DIGEST_PARAM_SIZE); \
-    if (p != NULL) { \
-        if (!OSSL_PARAM_get_size_t(p, &size)) { \
-            ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GET_PARAMETER); \
-            return 0; \
-        } \
-        if (size < 1 || size > BLAKE##VARIANT##_OUTBYTES) { \
-            ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_DIGEST_SIZE); \
-            return 0; \
-        } \
-        ossl_blake##variant##_param_set_digest_length(&mdctx->params, (uint8_t)size); \
-    } \
- \
-    return 1; \
-} \
- \
-static int ossl_blake##variantsize##_init(void *ctx) \
-{ \
-    struct blake##variant##_md_data_st *mdctx = ctx; \
-    uint8_t digest_length = mdctx->params.digest_length; \
- \
-    ossl_blake##variant##_param_init(&mdctx->params); \
-    if (digest_length != 0) \
-        mdctx->params.digest_length = digest_length; \
-    return ossl_blake##variant##_init(&mdctx->ctx, &mdctx->params); \
-} \
- \
-static OSSL_FUNC_digest_init_fn blake##variantsize##_internal_init; \
-static OSSL_FUNC_digest_newctx_fn blake##variantsize##_newctx; \
-static OSSL_FUNC_digest_freectx_fn blake##variantsize##_freectx; \
-static OSSL_FUNC_digest_dupctx_fn blake##variantsize##_dupctx; \
-static OSSL_FUNC_digest_final_fn blake##variantsize##_internal_final; \
-static OSSL_FUNC_digest_get_params_fn blake##variantsize##_get_params; \
- \
-static int blake##variantsize##_internal_init(void *ctx, const OSSL_PARAM params[]) \
-{ \
-    return ossl_prov_is_running() && ossl_blake##variant##_set_ctx_params(ctx, params) \
-        && ossl_blake##variantsize##_init(ctx); \
-} \
- \
-static void *blake##variantsize##_newctx(void *prov_ctx) \
-{ \
-    struct blake##variant##_md_data_st *ctx; \
- \
-    ctx = ossl_prov_is_running() ? OPENSSL_zalloc(sizeof(*ctx)) : NULL; \
-    return ctx; \
-} \
- \
-static void blake##variantsize##_freectx(void *vctx) \
-{ \
-    struct blake##variant##_md_data_st *ctx; \
- \
-    ctx = (struct blake##variant##_md_data_st *)vctx; \
-    OPENSSL_clear_free(ctx, sizeof(*ctx)); \
-} \
- \
-static void *blake##variantsize##_dupctx(void *ctx) \
-{ \
-    struct blake##variant##_md_data_st *in, *ret; \
- \
-    in = (struct blake##variant##_md_data_st *)ctx; \
-    ret = ossl_prov_is_running()? OPENSSL_malloc(sizeof(*ret)) : NULL; \
-    if (ret != NULL) \
-        *ret = *in; \
-    return ret; \
-} \
-\
-static void blake##variantsize##_copyctx(void *voutctx, void *vinctx) \
-{ \
-    struct blake##variant##_md_data_st *inctx, *outctx; \
- \
-    outctx = (struct blake##variant##_md_data_st *)voutctx; \
-    inctx = (struct blake##variant##_md_data_st *)vinctx; \
-    *outctx = *inctx; \
-} \
- \
-static int blake##variantsize##_internal_final(void *ctx, unsigned char *out, \
-                                     size_t *outl, size_t outsz) \
-{ \
-    struct blake##variant##_md_data_st *b_ctx; \
- \
-    b_ctx = (struct blake##variant##_md_data_st *)ctx; \
- \
-    if (!ossl_prov_is_running()) \
-        return 0; \
- \
-    *outl = b_ctx->ctx.outlen; \
- \
-    if (outsz == 0) \
-       return 1; \
- \
-    if (outsz < *outl) { \
-        ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_DIGEST_SIZE); \
-        return 0; \
-    } \
- \
-    return ossl_blake##variant##_final(out, ctx); \
-} \
- \
-static int blake##variantsize##_get_params(OSSL_PARAM params[]) \
-{ \
-    return ossl_digest_default_get_params(params, BLAKE##VARIANT##_BLOCKBYTES, BLAKE##VARIANT##_OUTBYTES, 0); \
-} \
- \
-const OSSL_DISPATCH ossl_blake##variantsize##_functions[] = { \
-    {OSSL_FUNC_DIGEST_NEWCTX, (void (*)(void))blake##variantsize##_newctx}, \
-    {OSSL_FUNC_DIGEST_UPDATE, (void (*)(void))ossl_blake##variant##_update}, \
-    {OSSL_FUNC_DIGEST_FINAL, (void (*)(void))blake##variantsize##_internal_final}, \
-    {OSSL_FUNC_DIGEST_FREECTX, (void (*)(void))blake##variantsize##_freectx}, \
-    {OSSL_FUNC_DIGEST_DUPCTX, (void (*)(void))blake##variantsize##_dupctx}, \
-    {OSSL_FUNC_DIGEST_COPYCTX, (void (*)(void))blake##variantsize##_copyctx}, \
-    {OSSL_FUNC_DIGEST_GET_PARAMS, (void (*)(void))blake##variantsize##_get_params}, \
-    {OSSL_FUNC_DIGEST_GETTABLE_PARAMS, \
-     (void (*)(void))ossl_digest_default_gettable_params}, \
-    {OSSL_FUNC_DIGEST_INIT, (void (*)(void))blake##variantsize##_internal_init}, \
-    {OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS, \
-     (void (*)(void))ossl_blake##variant##_gettable_ctx_params}, \
-    {OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS, \
-     (void (*)(void))ossl_blake##variant##_settable_ctx_params}, \
-    {OSSL_FUNC_DIGEST_GET_CTX_PARAMS, \
-     (void (*)(void))ossl_blake##variant##_get_ctx_params}, \
-    {OSSL_FUNC_DIGEST_SET_CTX_PARAMS, \
-     (void (*)(void))ossl_blake##variant##_set_ctx_params}, \
-    {0, NULL} \
-};
+#define IMPLEMENT_BLAKE_functions(variant, VARIANT, variantsize)                                                  \
+    static const OSSL_PARAM known_blake##variant##_ctx_params[] = {                                               \
+        { OSSL_DIGEST_PARAM_SIZE, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0 },                                      \
+        OSSL_PARAM_END                                                                                            \
+    };                                                                                                            \
+                                                                                                                  \
+    const OSSL_PARAM *ossl_blake##variant##_gettable_ctx_params(ossl_unused void *ctx,                            \
+        ossl_unused void *pctx)                                                                                   \
+    {                                                                                                             \
+        return known_blake##variant##_ctx_params;                                                                 \
+    }                                                                                                             \
+                                                                                                                  \
+    const OSSL_PARAM *ossl_blake##variant##_settable_ctx_params(ossl_unused void *ctx,                            \
+        ossl_unused void *pctx)                                                                                   \
+    {                                                                                                             \
+        return known_blake##variant##_ctx_params;                                                                 \
+    }                                                                                                             \
+                                                                                                                  \
+    int ossl_blake##variant##_get_ctx_params(void *vctx, OSSL_PARAM params[])                                     \
+    {                                                                                                             \
+        struct blake##variant##_md_data_st *mdctx = vctx;                                                         \
+        OSSL_PARAM *p;                                                                                            \
+                                                                                                                  \
+        BLAKE##VARIANT##_CTX *ctx = &mdctx->ctx;                                                                  \
+                                                                                                                  \
+        if (ctx == NULL)                                                                                          \
+            return 0;                                                                                             \
+        if (ossl_param_is_empty(params))                                                                          \
+            return 1;                                                                                             \
+                                                                                                                  \
+        p = OSSL_PARAM_locate(params, OSSL_DIGEST_PARAM_SIZE);                                                    \
+        if (p != NULL                                                                                             \
+            && !OSSL_PARAM_set_uint(p, (unsigned int)mdctx->params.digest_length)) {                              \
+            ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);                                              \
+            return 0;                                                                                             \
+        }                                                                                                         \
+                                                                                                                  \
+        return 1;                                                                                                 \
+    }                                                                                                             \
+                                                                                                                  \
+    int ossl_blake##variant##_set_ctx_params(void *vctx, const OSSL_PARAM params[])                               \
+    {                                                                                                             \
+        size_t size;                                                                                              \
+        struct blake##variant##_md_data_st *mdctx = vctx;                                                         \
+        const OSSL_PARAM *p;                                                                                      \
+                                                                                                                  \
+        BLAKE##VARIANT##_CTX *ctx = &mdctx->ctx;                                                                  \
+                                                                                                                  \
+        if (ctx == NULL)                                                                                          \
+            return 0;                                                                                             \
+        if (ossl_param_is_empty(params))                                                                          \
+            return 1;                                                                                             \
+                                                                                                                  \
+        p = OSSL_PARAM_locate_const(params, OSSL_DIGEST_PARAM_SIZE);                                              \
+        if (p != NULL) {                                                                                          \
+            if (!OSSL_PARAM_get_size_t(p, &size)) {                                                               \
+                ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GET_PARAMETER);                                          \
+                return 0;                                                                                         \
+            }                                                                                                     \
+            if (size < 1 || size > BLAKE##VARIANT##_OUTBYTES) {                                                   \
+                ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_DIGEST_SIZE);                                              \
+                return 0;                                                                                         \
+            }                                                                                                     \
+            ossl_blake##variant##_param_set_digest_length(&mdctx->params, (uint8_t)size);                         \
+        }                                                                                                         \
+                                                                                                                  \
+        return 1;                                                                                                 \
+    }                                                                                                             \
+                                                                                                                  \
+    static int ossl_blake##variantsize##_init(void *ctx)                                                          \
+    {                                                                                                             \
+        struct blake##variant##_md_data_st *mdctx = ctx;                                                          \
+        uint8_t digest_length = mdctx->params.digest_length;                                                      \
+                                                                                                                  \
+        ossl_blake##variant##_param_init(&mdctx->params);                                                         \
+        if (digest_length != 0)                                                                                   \
+            mdctx->params.digest_length = digest_length;                                                          \
+        return ossl_blake##variant##_init(&mdctx->ctx, &mdctx->params);                                           \
+    }                                                                                                             \
+                                                                                                                  \
+    static OSSL_FUNC_digest_init_fn blake##variantsize##_internal_init;                                           \
+    static OSSL_FUNC_digest_newctx_fn blake##variantsize##_newctx;                                                \
+    static OSSL_FUNC_digest_freectx_fn blake##variantsize##_freectx;                                              \
+    static OSSL_FUNC_digest_dupctx_fn blake##variantsize##_dupctx;                                                \
+    static OSSL_FUNC_digest_final_fn blake##variantsize##_internal_final;                                         \
+    static OSSL_FUNC_digest_get_params_fn blake##variantsize##_get_params;                                        \
+                                                                                                                  \
+    static int blake##variantsize##_internal_init(void *ctx, const OSSL_PARAM params[])                           \
+    {                                                                                                             \
+        return ossl_prov_is_running() && ossl_blake##variant##_set_ctx_params(ctx, params)                        \
+            && ossl_blake##variantsize##_init(ctx);                                                               \
+    }                                                                                                             \
+                                                                                                                  \
+    static void *blake##variantsize##_newctx(void *prov_ctx)                                                      \
+    {                                                                                                             \
+        struct blake##variant##_md_data_st *ctx;                                                                  \
+                                                                                                                  \
+        ctx = ossl_prov_is_running() ? OPENSSL_zalloc(sizeof(*ctx)) : NULL;                                       \
+        return ctx;                                                                                               \
+    }                                                                                                             \
+                                                                                                                  \
+    static void blake##variantsize##_freectx(void *vctx)                                                          \
+    {                                                                                                             \
+        struct blake##variant##_md_data_st *ctx;                                                                  \
+                                                                                                                  \
+        ctx = (struct blake##variant##_md_data_st *)vctx;                                                         \
+        OPENSSL_clear_free(ctx, sizeof(*ctx));                                                                    \
+    }                                                                                                             \
+                                                                                                                  \
+    static void *blake##variantsize##_dupctx(void *ctx)                                                           \
+    {                                                                                                             \
+        struct blake##variant##_md_data_st *in, *ret;                                                             \
+                                                                                                                  \
+        in = (struct blake##variant##_md_data_st *)ctx;                                                           \
+        ret = ossl_prov_is_running() ? OPENSSL_malloc(sizeof(*ret)) : NULL;                                       \
+        if (ret != NULL)                                                                                          \
+            *ret = *in;                                                                                           \
+        return ret;                                                                                               \
+    }                                                                                                             \
+                                                                                                                  \
+    static void blake##variantsize##_copyctx(void *voutctx, void *vinctx)                                         \
+    {                                                                                                             \
+        struct blake##variant##_md_data_st *inctx, *outctx;                                                       \
+                                                                                                                  \
+        outctx = (struct blake##variant##_md_data_st *)voutctx;                                                   \
+        inctx = (struct blake##variant##_md_data_st *)vinctx;                                                     \
+        *outctx = *inctx;                                                                                         \
+    }                                                                                                             \
+                                                                                                                  \
+    static int blake##variantsize##_internal_final(void *ctx, unsigned char *out,                                 \
+        size_t *outl, size_t outsz)                                                                               \
+    {                                                                                                             \
+        struct blake##variant##_md_data_st *b_ctx;                                                                \
+                                                                                                                  \
+        b_ctx = (struct blake##variant##_md_data_st *)ctx;                                                        \
+                                                                                                                  \
+        if (!ossl_prov_is_running())                                                                              \
+            return 0;                                                                                             \
+                                                                                                                  \
+        *outl = b_ctx->ctx.outlen;                                                                                \
+                                                                                                                  \
+        if (outsz == 0)                                                                                           \
+            return 1;                                                                                             \
+                                                                                                                  \
+        if (outsz < *outl) {                                                                                      \
+            ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_DIGEST_SIZE);                                                  \
+            return 0;                                                                                             \
+        }                                                                                                         \
+                                                                                                                  \
+        return ossl_blake##variant##_final(out, ctx);                                                             \
+    }                                                                                                             \
+                                                                                                                  \
+    static int blake##variantsize##_get_params(OSSL_PARAM params[])                                               \
+    {                                                                                                             \
+        return ossl_digest_default_get_params(params, BLAKE##VARIANT##_BLOCKBYTES, BLAKE##VARIANT##_OUTBYTES, 0); \
+    }                                                                                                             \
+                                                                                                                  \
+    const OSSL_DISPATCH ossl_blake##variantsize##_functions[] = {                                                 \
+        { OSSL_FUNC_DIGEST_NEWCTX, (void (*)(void))blake##variantsize##_newctx },                                 \
+        { OSSL_FUNC_DIGEST_UPDATE, (void (*)(void))ossl_blake##variant##_update },                                \
+        { OSSL_FUNC_DIGEST_FINAL, (void (*)(void))blake##variantsize##_internal_final },                          \
+        { OSSL_FUNC_DIGEST_FREECTX, (void (*)(void))blake##variantsize##_freectx },                               \
+        { OSSL_FUNC_DIGEST_DUPCTX, (void (*)(void))blake##variantsize##_dupctx },                                 \
+        { OSSL_FUNC_DIGEST_COPYCTX, (void (*)(void))blake##variantsize##_copyctx },                               \
+        { OSSL_FUNC_DIGEST_GET_PARAMS, (void (*)(void))blake##variantsize##_get_params },                         \
+        { OSSL_FUNC_DIGEST_GETTABLE_PARAMS,                                                                       \
+            (void (*)(void))ossl_digest_default_gettable_params },                                                \
+        { OSSL_FUNC_DIGEST_INIT, (void (*)(void))blake##variantsize##_internal_init },                            \
+        { OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS,                                                                   \
+            (void (*)(void))ossl_blake##variant##_gettable_ctx_params },                                          \
+        { OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS,                                                                   \
+            (void (*)(void))ossl_blake##variant##_settable_ctx_params },                                          \
+        { OSSL_FUNC_DIGEST_GET_CTX_PARAMS,                                                                        \
+            (void (*)(void))ossl_blake##variant##_get_ctx_params },                                               \
+        { OSSL_FUNC_DIGEST_SET_CTX_PARAMS,                                                                        \
+            (void (*)(void))ossl_blake##variant##_set_ctx_params },                                               \
+        { 0, NULL }                                                                                               \
+    };
 
 IMPLEMENT_BLAKE_functions(2s, 2S, 2s256)
 IMPLEMENT_BLAKE_functions(2b, 2B, 2b512)
diff --git a/providers/implementations/digests/blake2b_prov.c b/providers/implementations/digests/blake2b_prov.c
index 6ef7fac008cc5..8b14372e13476 100644
--- a/providers/implementations/digests/blake2b_prov.c
+++ b/providers/implementations/digests/blake2b_prov.c
@@ -21,28 +21,26 @@
 #include "blake2_impl.h"
 #include "prov/blake2.h"
 
-static const uint64_t blake2b_IV[8] =
-{
+static const uint64_t blake2b_IV[8] = {
     0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,
     0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,
     0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,
     0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL
 };
 
-static const uint8_t blake2b_sigma[12][16] =
-{
-    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
-    { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 } ,
-    { 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 } ,
-    {  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 } ,
-    {  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 } ,
-    {  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 } ,
-    { 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 } ,
-    { 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 } ,
-    {  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 } ,
-    { 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 } ,
-    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
-    { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 }
+static const uint8_t blake2b_sigma[12][16] = {
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+    { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
+    { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 },
+    { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 },
+    { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 },
+    { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 },
+    { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 },
+    { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 },
+    { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 },
+    { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 },
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+    { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 }
 };
 
 /* Set that it's the last block we'll compress */
@@ -84,15 +82,15 @@ static void blake2b_init_param(BLAKE2B_CTX *S, const BLAKE2B_PARAM *P)
 void ossl_blake2b_param_init(BLAKE2B_PARAM *P)
 {
     P->digest_length = BLAKE2B_DIGEST_LENGTH;
-    P->key_length    = 0;
-    P->fanout        = 1;
-    P->depth         = 1;
+    P->key_length = 0;
+    P->fanout = 1;
+    P->depth = 1;
     store32(P->leaf_length, 0);
     store64(P->node_offset, 0);
-    P->node_depth    = 0;
-    P->inner_length  = 0;
+    P->node_depth = 0;
+    P->inner_length = 0;
     memset(P->reserved, 0, sizeof(P->reserved));
-    memset(P->salt,     0, sizeof(P->salt));
+    memset(P->salt, 0, sizeof(P->salt));
     memset(P->personal, 0, sizeof(P->personal));
 }
 
@@ -107,14 +105,14 @@ void ossl_blake2b_param_set_key_length(BLAKE2B_PARAM *P, uint8_t keylen)
 }
 
 void ossl_blake2b_param_set_personal(BLAKE2B_PARAM *P, const uint8_t *personal,
-                                     size_t len)
+    size_t len)
 {
     memcpy(P->personal, personal, len);
     memset(P->personal + len, 0, BLAKE2B_PERSONALBYTES - len);
 }
 
 void ossl_blake2b_param_set_salt(BLAKE2B_PARAM *P, const uint8_t *salt,
-                                 size_t len)
+    size_t len)
 {
     memcpy(P->salt, salt, len);
     memset(P->salt + len, 0, BLAKE2B_SALTBYTES - len);
@@ -135,13 +133,13 @@ int ossl_blake2b_init(BLAKE2B_CTX *c, const BLAKE2B_PARAM *P)
  * Always returns 1.
  */
 int ossl_blake2b_init_key(BLAKE2B_CTX *c, const BLAKE2B_PARAM *P,
-                          const void *key)
+    const void *key)
 {
     blake2b_init_param(c, P);
 
     /* Pad the key to form first data block */
     {
-        uint8_t block[BLAKE2B_BLOCKBYTES] = {0};
+        uint8_t block[BLAKE2B_BLOCKBYTES] = { 0 };
 
         memcpy(block, key, P->key_length);
         ossl_blake2b_update(c, block, BLAKE2B_BLOCKBYTES);
@@ -153,8 +151,8 @@ int ossl_blake2b_init_key(BLAKE2B_CTX *c, const BLAKE2B_PARAM *P,
 
 /* Permute the state while xoring in the block of data. */
 static void blake2b_compress(BLAKE2B_CTX *S,
-                            const uint8_t *blocks,
-                            size_t len)
+    const uint8_t *blocks,
+    size_t len)
 {
     uint64_t m[16];
     uint64_t v[16];
@@ -195,36 +193,36 @@ static void blake2b_compress(BLAKE2B_CTX *S,
         S->t[0] += increment;
         S->t[1] += (S->t[0] < increment);
 
-        v[8]  = blake2b_IV[0];
-        v[9]  = blake2b_IV[1];
+        v[8] = blake2b_IV[0];
+        v[9] = blake2b_IV[1];
         v[10] = blake2b_IV[2];
         v[11] = blake2b_IV[3];
         v[12] = S->t[0] ^ blake2b_IV[4];
         v[13] = S->t[1] ^ blake2b_IV[5];
         v[14] = S->f[0] ^ blake2b_IV[6];
         v[15] = S->f[1] ^ blake2b_IV[7];
-#define G(r,i,a,b,c,d) \
-        do { \
-            a = a + b + m[blake2b_sigma[r][2*i+0]]; \
-            d = rotr64(d ^ a, 32); \
-            c = c + d; \
-            b = rotr64(b ^ c, 24); \
-            a = a + b + m[blake2b_sigma[r][2*i+1]]; \
-            d = rotr64(d ^ a, 16); \
-            c = c + d; \
-            b = rotr64(b ^ c, 63); \
-        } while (0)
-#define ROUND(r)  \
-        do { \
-            G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
-            G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
-            G(r,2,v[ 2],v[ 6],v[10],v[14]); \
-            G(r,3,v[ 3],v[ 7],v[11],v[15]); \
-            G(r,4,v[ 0],v[ 5],v[10],v[15]); \
-            G(r,5,v[ 1],v[ 6],v[11],v[12]); \
-            G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
-            G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
-        } while (0)
+#define G(r, i, a, b, c, d)                         \
+    do {                                            \
+        a = a + b + m[blake2b_sigma[r][2 * i + 0]]; \
+        d = rotr64(d ^ a, 32);                      \
+        c = c + d;                                  \
+        b = rotr64(b ^ c, 24);                      \
+        a = a + b + m[blake2b_sigma[r][2 * i + 1]]; \
+        d = rotr64(d ^ a, 16);                      \
+        c = c + d;                                  \
+        b = rotr64(b ^ c, 63);                      \
+    } while (0)
+#define ROUND(r)                           \
+    do {                                   \
+        G(r, 0, v[0], v[4], v[8], v[12]);  \
+        G(r, 1, v[1], v[5], v[9], v[13]);  \
+        G(r, 2, v[2], v[6], v[10], v[14]); \
+        G(r, 3, v[3], v[7], v[11], v[15]); \
+        G(r, 4, v[0], v[5], v[10], v[15]); \
+        G(r, 5, v[1], v[6], v[11], v[12]); \
+        G(r, 6, v[2], v[7], v[8], v[13]);  \
+        G(r, 7, v[3], v[4], v[9], v[14]);  \
+    } while (0)
 #if defined(OPENSSL_SMALL_FOOTPRINT)
         /* 3x size reduction on x86_64, almost 7x on ARMv8, 9x on ARMv4 */
         for (i = 0; i < 12; i++) {
@@ -306,7 +304,7 @@ int ossl_blake2b_update(BLAKE2B_CTX *c, const void *data, size_t datalen)
  */
 int ossl_blake2b_final(unsigned char *md, BLAKE2B_CTX *c)
 {
-    uint8_t outbuffer[BLAKE2B_OUTBYTES] = {0};
+    uint8_t outbuffer[BLAKE2B_OUTBYTES] = { 0 };
     uint8_t *target = outbuffer;
     int iter = (c->outlen + 7) / 8;
     int i;
diff --git a/providers/implementations/digests/blake2s_prov.c b/providers/implementations/digests/blake2s_prov.c
index a9251d8996d96..9190c3eb2ab52 100644
--- a/providers/implementations/digests/blake2s_prov.c
+++ b/providers/implementations/digests/blake2s_prov.c
@@ -26,16 +26,16 @@ static const uint32_t blake2s_IV[8] = {
 };
 
 static const uint8_t blake2s_sigma[10][16] = {
-    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
-    { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 } ,
-    { 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 } ,
-    {  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 } ,
-    {  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 } ,
-    {  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 } ,
-    { 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 } ,
-    { 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 } ,
-    {  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 } ,
-    { 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 } ,
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
+    { 14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3 },
+    { 11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4 },
+    { 7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8 },
+    { 9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13 },
+    { 2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9 },
+    { 12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11 },
+    { 13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10 },
+    { 6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5 },
+    { 10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0 },
 };
 
 /* Set that it's the last block we'll compress */
@@ -69,21 +69,21 @@ static void blake2s_init_param(BLAKE2S_CTX *S, const BLAKE2S_PARAM *P)
     assert(sizeof(BLAKE2S_PARAM) == 32);
     /* IV XOR ParamBlock */
     for (i = 0; i < 8; ++i) {
-        S->h[i] ^= load32(&p[i*4]);
+        S->h[i] ^= load32(&p[i * 4]);
     }
 }
 
 void ossl_blake2s_param_init(BLAKE2S_PARAM *P)
 {
     P->digest_length = BLAKE2S_DIGEST_LENGTH;
-    P->key_length    = 0;
-    P->fanout        = 1;
-    P->depth         = 1;
+    P->key_length = 0;
+    P->fanout = 1;
+    P->depth = 1;
     store32(P->leaf_length, 0);
     store48(P->node_offset, 0);
-    P->node_depth    = 0;
-    P->inner_length  = 0;
-    memset(P->salt,     0, sizeof(P->salt));
+    P->node_depth = 0;
+    P->inner_length = 0;
+    memset(P->salt, 0, sizeof(P->salt));
     memset(P->personal, 0, sizeof(P->personal));
 }
 
@@ -98,17 +98,18 @@ void ossl_blake2s_param_set_key_length(BLAKE2S_PARAM *P, uint8_t keylen)
 }
 
 void ossl_blake2s_param_set_personal(BLAKE2S_PARAM *P, const uint8_t *personal,
-                                     size_t len)
+    size_t len)
 {
     memcpy(P->personal, personal, len);
     memset(P->personal + len, 0, BLAKE2S_PERSONALBYTES - len);
 }
 
 void ossl_blake2s_param_set_salt(BLAKE2S_PARAM *P, const uint8_t *salt,
-                                 size_t len)
+    size_t len)
 {
     memcpy(P->salt, salt, len);
-    memset(P->salt + len, 0, BLAKE2S_SALTBYTES - len);}
+    memset(P->salt + len, 0, BLAKE2S_SALTBYTES - len);
+}
 
 /*
  * Initialize the hashing context with the given parameter block.
@@ -125,13 +126,13 @@ int ossl_blake2s_init(BLAKE2S_CTX *c, const BLAKE2S_PARAM *P)
  * Always returns 1.
  */
 int ossl_blake2s_init_key(BLAKE2S_CTX *c, const BLAKE2S_PARAM *P,
-                          const void *key)
+    const void *key)
 {
     blake2s_init_param(c, P);
 
     /* Pad the key to form first data block */
     {
-        uint8_t block[BLAKE2S_BLOCKBYTES] = {0};
+        uint8_t block[BLAKE2S_BLOCKBYTES] = { 0 };
 
         memcpy(block, key, P->key_length);
         ossl_blake2s_update(c, block, BLAKE2S_BLOCKBYTES);
@@ -143,8 +144,8 @@ int ossl_blake2s_init_key(BLAKE2S_CTX *c, const BLAKE2S_PARAM *P,
 
 /* Permute the state while xoring in the block of data. */
 static void blake2s_compress(BLAKE2S_CTX *S,
-                            const uint8_t *blocks,
-                            size_t len)
+    const uint8_t *blocks,
+    size_t len)
 {
     uint32_t m[16];
     uint32_t v[16];
@@ -185,36 +186,36 @@ static void blake2s_compress(BLAKE2S_CTX *S,
         S->t[0] += increment;
         S->t[1] += (S->t[0] < increment);
 
-        v[ 8] = blake2s_IV[0];
-        v[ 9] = blake2s_IV[1];
+        v[8] = blake2s_IV[0];
+        v[9] = blake2s_IV[1];
         v[10] = blake2s_IV[2];
         v[11] = blake2s_IV[3];
         v[12] = S->t[0] ^ blake2s_IV[4];
         v[13] = S->t[1] ^ blake2s_IV[5];
         v[14] = S->f[0] ^ blake2s_IV[6];
         v[15] = S->f[1] ^ blake2s_IV[7];
-#define G(r,i,a,b,c,d) \
-        do { \
-            a = a + b + m[blake2s_sigma[r][2*i+0]]; \
-            d = rotr32(d ^ a, 16); \
-            c = c + d; \
-            b = rotr32(b ^ c, 12); \
-            a = a + b + m[blake2s_sigma[r][2*i+1]]; \
-            d = rotr32(d ^ a, 8); \
-            c = c + d; \
-            b = rotr32(b ^ c, 7); \
-        } while (0)
-#define ROUND(r)  \
-        do { \
-            G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
-            G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
-            G(r,2,v[ 2],v[ 6],v[10],v[14]); \
-            G(r,3,v[ 3],v[ 7],v[11],v[15]); \
-            G(r,4,v[ 0],v[ 5],v[10],v[15]); \
-            G(r,5,v[ 1],v[ 6],v[11],v[12]); \
-            G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
-            G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
-        } while (0)
+#define G(r, i, a, b, c, d)                         \
+    do {                                            \
+        a = a + b + m[blake2s_sigma[r][2 * i + 0]]; \
+        d = rotr32(d ^ a, 16);                      \
+        c = c + d;                                  \
+        b = rotr32(b ^ c, 12);                      \
+        a = a + b + m[blake2s_sigma[r][2 * i + 1]]; \
+        d = rotr32(d ^ a, 8);                       \
+        c = c + d;                                  \
+        b = rotr32(b ^ c, 7);                       \
+    } while (0)
+#define ROUND(r)                           \
+    do {                                   \
+        G(r, 0, v[0], v[4], v[8], v[12]);  \
+        G(r, 1, v[1], v[5], v[9], v[13]);  \
+        G(r, 2, v[2], v[6], v[10], v[14]); \
+        G(r, 3, v[3], v[7], v[11], v[15]); \
+        G(r, 4, v[0], v[5], v[10], v[15]); \
+        G(r, 5, v[1], v[6], v[11], v[12]); \
+        G(r, 6, v[2], v[7], v[8], v[13]);  \
+        G(r, 7, v[3], v[4], v[9], v[14]);  \
+    } while (0)
 #if defined(OPENSSL_SMALL_FOOTPRINT)
         /* almost 3x reduction on x86_64, 4.5x on ARMv8, 4x on ARMv4 */
         for (i = 0; i < 10; i++) {
@@ -294,7 +295,7 @@ int ossl_blake2s_update(BLAKE2S_CTX *c, const void *data, size_t datalen)
  */
 int ossl_blake2s_final(unsigned char *md, BLAKE2S_CTX *c)
 {
-    uint8_t outbuffer[BLAKE2S_OUTBYTES] = {0};
+    uint8_t outbuffer[BLAKE2S_OUTBYTES] = { 0 };
     uint8_t *target = outbuffer;
     int iter = (c->outlen + 3) / 4;
     int i;
diff --git a/providers/implementations/digests/digestcommon.c b/providers/implementations/digests/digestcommon.c
index 5cd1d1620062e..f385dc4931fff 100644
--- a/providers/implementations/digests/digestcommon.c
+++ b/providers/implementations/digests/digestcommon.c
@@ -12,7 +12,7 @@
 #include "prov/digestcommon.h"
 
 int ossl_digest_default_get_params(OSSL_PARAM params[], size_t blksz,
-                                   size_t paramsz, unsigned long flags)
+    size_t paramsz, unsigned long flags)
 {
     OSSL_PARAM *p = NULL;
 
diff --git a/providers/implementations/digests/md2_prov.c b/providers/implementations/digests/md2_prov.c
index a41a02c19890a..a2ac9db2a641a 100644
--- a/providers/implementations/digests/md2_prov.c
+++ b/providers/implementations/digests/md2_prov.c
@@ -20,5 +20,5 @@
 
 /* ossl_md2_functions */
 IMPLEMENT_digest_functions(md2, MD2_CTX,
-                           MD2_BLOCK, MD2_DIGEST_LENGTH, 0,
-                           MD2_Init, MD2_Update, MD2_Final)
+    MD2_BLOCK, MD2_DIGEST_LENGTH, 0,
+    MD2_Init, MD2_Update, MD2_Final)
diff --git a/providers/implementations/digests/md4_prov.c b/providers/implementations/digests/md4_prov.c
index 97f73018c2750..eb9201a1165e3 100644
--- a/providers/implementations/digests/md4_prov.c
+++ b/providers/implementations/digests/md4_prov.c
@@ -20,5 +20,5 @@
 
 /* ossl_md4_functions */
 IMPLEMENT_digest_functions(md4, MD4_CTX,
-                           MD4_CBLOCK, MD4_DIGEST_LENGTH, 0,
-                           MD4_Init, MD4_Update, MD4_Final)
+    MD4_CBLOCK, MD4_DIGEST_LENGTH, 0,
+    MD4_Init, MD4_Update, MD4_Final)
diff --git a/providers/implementations/digests/md5_prov.c b/providers/implementations/digests/md5_prov.c
index a330e057f5478..82eb842d47241 100644
--- a/providers/implementations/digests/md5_prov.c
+++ b/providers/implementations/digests/md5_prov.c
@@ -20,5 +20,5 @@
 
 /* ossl_md5_functions */
 IMPLEMENT_digest_functions(md5, MD5_CTX,
-                           MD5_CBLOCK, MD5_DIGEST_LENGTH, 0,
-                           MD5_Init, MD5_Update, MD5_Final)
+    MD5_CBLOCK, MD5_DIGEST_LENGTH, 0,
+    MD5_Init, MD5_Update, MD5_Final)
diff --git a/providers/implementations/digests/md5_sha1_prov.c b/providers/implementations/digests/md5_sha1_prov.c
index 9735c3f7e40f8..ebf64f39b35f8 100644
--- a/providers/implementations/digests/md5_sha1_prov.c
+++ b/providers/implementations/digests/md5_sha1_prov.c
@@ -26,12 +26,12 @@ static OSSL_FUNC_digest_set_ctx_params_fn md5_sha1_set_ctx_params;
 static OSSL_FUNC_digest_settable_ctx_params_fn md5_sha1_settable_ctx_params;
 
 static const OSSL_PARAM known_md5_sha1_settable_ctx_params[] = {
-    {OSSL_DIGEST_PARAM_SSL3_MS, OSSL_PARAM_OCTET_STRING, NULL, 0, 0},
+    { OSSL_DIGEST_PARAM_SSL3_MS, OSSL_PARAM_OCTET_STRING, NULL, 0, 0 },
     OSSL_PARAM_END
 };
 
 static const OSSL_PARAM *md5_sha1_settable_ctx_params(ossl_unused void *ctx,
-                                                      ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_md5_sha1_settable_ctx_params;
 }
@@ -50,7 +50,7 @@ static int md5_sha1_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     p = OSSL_PARAM_locate_const(params, OSSL_DIGEST_PARAM_SSL3_MS);
     if (p != NULL && p->data_type == OSSL_PARAM_OCTET_STRING)
         return ossl_md5_sha1_ctrl(ctx, EVP_CTRL_SSL3_MASTER_SECRET,
-                                  p->data_size, p->data);
+            p->data_size, p->data);
     return 1;
 }
 
diff --git a/providers/implementations/digests/mdc2_prov.c b/providers/implementations/digests/mdc2_prov.c
index e1fc477d21e56..0a004c4f8b518 100644
--- a/providers/implementations/digests/mdc2_prov.c
+++ b/providers/implementations/digests/mdc2_prov.c
@@ -31,7 +31,7 @@ static const OSSL_PARAM known_mdc2_settable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *mdc2_settable_ctx_params(ossl_unused void *ctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_mdc2_settable_ctx_params;
 }
diff --git a/providers/implementations/digests/null_prov.c b/providers/implementations/digests/null_prov.c
index b220a1966ff79..801ec76c0d714 100644
--- a/providers/implementations/digests/null_prov.c
+++ b/providers/implementations/digests/null_prov.c
@@ -35,18 +35,18 @@ static int null_final(unsigned char *md, NULLMD_CTX *ctx)
  * and that would cause compilation warnings with the default implementation.
  */
 #undef PROV_FUNC_DIGEST_FINAL
-#define PROV_FUNC_DIGEST_FINAL(name, dgstsize, fin)                            \
-static OSSL_FUNC_digest_final_fn name##_internal_final;                        \
-static int name##_internal_final(void *ctx, unsigned char *out, size_t *outl,  \
-                                 size_t outsz)                                 \
-{                                                                              \
-    if (ossl_prov_is_running() && fin(out, ctx)) {                             \
-        *outl = dgstsize;                                                      \
-        return 1;                                                              \
-    }                                                                          \
-    return 0;                                                                  \
-}
+#define PROV_FUNC_DIGEST_FINAL(name, dgstsize, fin)                               \
+    static OSSL_FUNC_digest_final_fn name##_internal_final;                       \
+    static int name##_internal_final(void *ctx, unsigned char *out, size_t *outl, \
+        size_t outsz)                                                             \
+    {                                                                             \
+        if (ossl_prov_is_running() && fin(out, ctx)) {                            \
+            *outl = dgstsize;                                                     \
+            return 1;                                                             \
+        }                                                                         \
+        return 0;                                                                 \
+    }
 
 IMPLEMENT_digest_functions(nullmd, NULLMD_CTX,
-                           0, 0, 0,
-                           null_init, null_update, null_final)
+    0, 0, 0,
+    null_init, null_update, null_final)
diff --git a/providers/implementations/digests/ripemd_prov.c b/providers/implementations/digests/ripemd_prov.c
index 526706c06dccf..3787010bddae6 100644
--- a/providers/implementations/digests/ripemd_prov.c
+++ b/providers/implementations/digests/ripemd_prov.c
@@ -20,5 +20,5 @@
 
 /* ossl_ripemd160_functions */
 IMPLEMENT_digest_functions(ripemd160, RIPEMD160_CTX,
-                           RIPEMD160_CBLOCK, RIPEMD160_DIGEST_LENGTH, 0,
-                           RIPEMD160_Init, RIPEMD160_Update, RIPEMD160_Final)
+    RIPEMD160_CBLOCK, RIPEMD160_DIGEST_LENGTH, 0,
+    RIPEMD160_Init, RIPEMD160_Update, RIPEMD160_Final)
diff --git a/providers/implementations/digests/sha2_prov.c b/providers/implementations/digests/sha2_prov.c
index 4c35586b00edb..31b1bbd4af386 100644
--- a/providers/implementations/digests/sha2_prov.c
+++ b/providers/implementations/digests/sha2_prov.c
@@ -29,11 +29,11 @@ static OSSL_FUNC_digest_set_ctx_params_fn sha1_set_ctx_params;
 static OSSL_FUNC_digest_settable_ctx_params_fn sha1_settable_ctx_params;
 
 static const OSSL_PARAM known_sha1_settable_ctx_params[] = {
-    {OSSL_DIGEST_PARAM_SSL3_MS, OSSL_PARAM_OCTET_STRING, NULL, 0, 0},
+    { OSSL_DIGEST_PARAM_SSL3_MS, OSSL_PARAM_OCTET_STRING, NULL, 0, 0 },
     OSSL_PARAM_END
 };
 static const OSSL_PARAM *sha1_settable_ctx_params(ossl_unused void *ctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_sha1_settable_ctx_params;
 }
@@ -52,7 +52,7 @@ static int sha1_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     p = OSSL_PARAM_locate_const(params, OSSL_DIGEST_PARAM_SSL3_MS);
     if (p != NULL && p->data_type == OSSL_PARAM_OCTET_STRING)
         return ossl_sha1_ctrl(ctx, EVP_CTRL_SSL3_MASTER_SECRET,
-                              p->data_size, p->data);
+            p->data_size, p->data);
     return 1;
 }
 
@@ -64,35 +64,35 @@ IMPLEMENT_digest_functions_with_settable_ctx(
 
 /* ossl_sha224_functions */
 IMPLEMENT_digest_functions(sha224, SHA256_CTX,
-                           SHA256_CBLOCK, SHA224_DIGEST_LENGTH, SHA2_FLAGS,
-                           SHA224_Init, SHA224_Update, SHA224_Final)
+    SHA256_CBLOCK, SHA224_DIGEST_LENGTH, SHA2_FLAGS,
+    SHA224_Init, SHA224_Update, SHA224_Final)
 
 /* ossl_sha256_functions */
 IMPLEMENT_digest_functions(sha256, SHA256_CTX,
-                           SHA256_CBLOCK, SHA256_DIGEST_LENGTH, SHA2_FLAGS,
-                           SHA256_Init, SHA256_Update, SHA256_Final)
+    SHA256_CBLOCK, SHA256_DIGEST_LENGTH, SHA2_FLAGS,
+    SHA256_Init, SHA256_Update, SHA256_Final)
 #ifndef FIPS_MODULE
 /* ossl_sha256_192_functions */
 IMPLEMENT_digest_functions(sha256_192, SHA256_CTX,
-                           SHA256_CBLOCK, SHA256_192_DIGEST_LENGTH, SHA2_FLAGS,
-                           ossl_sha256_192_init, SHA256_Update, SHA256_Final)
+    SHA256_CBLOCK, SHA256_192_DIGEST_LENGTH, SHA2_FLAGS,
+    ossl_sha256_192_init, SHA256_Update, SHA256_Final)
 #endif
 /* ossl_sha384_functions */
 IMPLEMENT_digest_functions(sha384, SHA512_CTX,
-                           SHA512_CBLOCK, SHA384_DIGEST_LENGTH, SHA2_FLAGS,
-                           SHA384_Init, SHA384_Update, SHA384_Final)
+    SHA512_CBLOCK, SHA384_DIGEST_LENGTH, SHA2_FLAGS,
+    SHA384_Init, SHA384_Update, SHA384_Final)
 
 /* ossl_sha512_functions */
 IMPLEMENT_digest_functions(sha512, SHA512_CTX,
-                           SHA512_CBLOCK, SHA512_DIGEST_LENGTH, SHA2_FLAGS,
-                           SHA512_Init, SHA512_Update, SHA512_Final)
+    SHA512_CBLOCK, SHA512_DIGEST_LENGTH, SHA2_FLAGS,
+    SHA512_Init, SHA512_Update, SHA512_Final)
 
 /* ossl_sha512_224_functions */
 IMPLEMENT_digest_functions(sha512_224, SHA512_CTX,
-                           SHA512_CBLOCK, SHA224_DIGEST_LENGTH, SHA2_FLAGS,
-                           sha512_224_init, SHA512_Update, SHA512_Final)
+    SHA512_CBLOCK, SHA224_DIGEST_LENGTH, SHA2_FLAGS,
+    sha512_224_init, SHA512_Update, SHA512_Final)
 
 /* ossl_sha512_256_functions */
 IMPLEMENT_digest_functions(sha512_256, SHA512_CTX,
-                           SHA512_CBLOCK, SHA256_DIGEST_LENGTH, SHA2_FLAGS,
-                           sha512_256_init, SHA512_Update, SHA512_Final)
+    SHA512_CBLOCK, SHA256_DIGEST_LENGTH, SHA2_FLAGS,
+    sha512_256_init, SHA512_Update, SHA512_Final)
diff --git a/providers/implementations/digests/sha3_prov.c b/providers/implementations/digests/sha3_prov.c
index d4f6d9797cd3b..80692ee7a0aab 100644
--- a/providers/implementations/digests/sha3_prov.c
+++ b/providers/implementations/digests/sha3_prov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-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
@@ -20,7 +20,7 @@
 #include "prov/implementations.h"
 
 #define SHA3_FLAGS PROV_DIGEST_FLAG_ALGID_ABSENT
-#define SHAKE_FLAGS PROV_DIGEST_FLAG_XOF
+#define SHAKE_FLAGS (PROV_DIGEST_FLAG_XOF | PROV_DIGEST_FLAG_ALGID_ABSENT)
 #define KMAC_FLAGS PROV_DIGEST_FLAG_XOF
 
 /*
@@ -48,11 +48,10 @@ static sha3_squeeze_fn generic_sha3_squeeze;
 /*
  * IBM S390X support
  */
-# include "s390x_arch.h"
-# define S390_SHA3 1
-# define S390_SHA3_CAPABLE(name) \
-    ((OPENSSL_s390xcap_P.kimd[0] & S390X_CAPBIT(S390X_##name)) && \
-     (OPENSSL_s390xcap_P.klmd[0] & S390X_CAPBIT(S390X_##name)))
+#include "s390x_arch.h"
+#define S390_SHA3 1
+#define S390_SHA3_CAPABLE(name) \
+    ((OPENSSL_s390xcap_P.kimd[0] & S390X_CAPBIT(S390X_##name)) && (OPENSSL_s390xcap_P.klmd[0] & S390X_CAPBIT(S390X_##name)))
 
 #endif
 
@@ -68,7 +67,7 @@ static int keccak_init(void *vctx, ossl_unused const OSSL_PARAM params[])
 static int keccak_init_params(void *vctx, const OSSL_PARAM params[])
 {
     return keccak_init(vctx, NULL)
-            && shake_set_ctx_params(vctx, params);
+        && shake_set_ctx_params(vctx, params);
 }
 
 static int keccak_update(void *vctx, const unsigned char *inp, size_t len)
@@ -109,7 +108,7 @@ static int keccak_update(void *vctx, const unsigned char *inp, size_t len)
 }
 
 static int keccak_final(void *vctx, unsigned char *out, size_t *outl,
-                        size_t outlen)
+    size_t outlen)
 {
     int ret = 1;
     KECCAK1600_CTX *ctx = vctx;
@@ -128,7 +127,7 @@ static int keccak_final(void *vctx, unsigned char *out, size_t *outl,
 }
 
 static int shake_squeeze(void *vctx, unsigned char *out, size_t *outl,
-                         size_t outlen)
+    size_t outlen)
 {
     int ret = 1;
     KECCAK1600_CTX *ctx = vctx;
@@ -151,8 +150,7 @@ static size_t generic_sha3_absorb(void *vctx, const void *inp, size_t len)
 {
     KECCAK1600_CTX *ctx = vctx;
 
-    if (!(ctx->xof_state == XOF_STATE_INIT ||
-          ctx->xof_state == XOF_STATE_ABSORB))
+    if (!(ctx->xof_state == XOF_STATE_INIT || ctx->xof_state == XOF_STATE_ABSORB))
         return 0;
     ctx->xof_state = XOF_STATE_ABSORB;
     return SHA3_absorb(ctx->A, inp, len, ctx->block_size);
@@ -174,8 +172,7 @@ static PROV_SHA3_METHOD sha3_generic_md = {
     NULL
 };
 
-static PROV_SHA3_METHOD shake_generic_md =
-{
+static PROV_SHA3_METHOD shake_generic_md = {
     generic_sha3_absorb,
     generic_sha3_final,
     generic_sha3_squeeze
@@ -196,8 +193,7 @@ static size_t s390x_sha3_absorb(void *vctx, const void *inp, size_t len)
     size_t rem = len % ctx->block_size;
     unsigned int fc;
 
-    if (!(ctx->xof_state == XOF_STATE_INIT ||
-          ctx->xof_state == XOF_STATE_ABSORB))
+    if (!(ctx->xof_state == XOF_STATE_INIT || ctx->xof_state == XOF_STATE_ABSORB))
         return 0;
     if (len - rem > 0) {
         fc = ctx->pad;
@@ -215,8 +211,7 @@ static int s390x_sha3_final(void *vctx, unsigned char *out, size_t outlen)
 
     if (!ossl_prov_is_running())
         return 0;
-    if (!(ctx->xof_state == XOF_STATE_INIT ||
-          ctx->xof_state == XOF_STATE_ABSORB))
+    if (!(ctx->xof_state == XOF_STATE_INIT || ctx->xof_state == XOF_STATE_ABSORB))
         return 0;
     fc = ctx->pad | S390X_KLMD_DUFOP;
     fc |= ctx->xof_state == XOF_STATE_INIT ? S390X_KLMD_NIP : 0;
@@ -233,8 +228,7 @@ static int s390x_shake_final(void *vctx, unsigned char *out, size_t outlen)
 
     if (!ossl_prov_is_running())
         return 0;
-    if (!(ctx->xof_state == XOF_STATE_INIT ||
-          ctx->xof_state == XOF_STATE_ABSORB))
+    if (!(ctx->xof_state == XOF_STATE_INIT || ctx->xof_state == XOF_STATE_ABSORB))
         return 0;
     fc = ctx->pad | S390X_KLMD_DUFOP;
     fc |= ctx->xof_state == XOF_STATE_INIT ? S390X_KLMD_NIP : 0;
@@ -286,7 +280,7 @@ static int s390x_shake_squeeze(void *vctx, unsigned char *out, size_t outlen)
 }
 
 static int s390x_keccakc_final(void *vctx, unsigned char *out, size_t outlen,
-                               int padding)
+    int padding)
 {
     KECCAK1600_CTX *ctx = vctx;
     size_t bsz = ctx->block_size;
@@ -296,8 +290,7 @@ static int s390x_keccakc_final(void *vctx, unsigned char *out, size_t outlen,
 
     if (!ossl_prov_is_running())
         return 0;
-    if (!(ctx->xof_state == XOF_STATE_INIT ||
-          ctx->xof_state == XOF_STATE_ABSORB))
+    if (!(ctx->xof_state == XOF_STATE_INIT || ctx->xof_state == XOF_STATE_ABSORB))
         return 0;
     fc = ctx->pad;
     fc |= ctx->xof_state == XOF_STATE_INIT ? S390X_KIMD_NIP : 0;
@@ -313,7 +306,7 @@ static int s390x_keccakc_final(void *vctx, unsigned char *out, size_t outlen,
     needed -= num;
     if (needed > 0)
         s390x_klmd(NULL, 0, out + bsz, needed,
-                   ctx->pad | S390X_KLMD_PS | S390X_KLMD_DUFOP, ctx->A);
+            ctx->pad | S390X_KLMD_PS | S390X_KLMD_DUFOP, ctx->A);
 
     return 1;
 }
@@ -329,7 +322,7 @@ static int s390x_kmac_final(void *vctx, unsigned char *out, size_t outlen)
 }
 
 static int s390x_keccakc_squeeze(void *vctx, unsigned char *out, size_t outlen,
-                                 int padding)
+    int padding)
 {
     KECCAK1600_CTX *ctx = vctx;
     size_t len;
@@ -377,12 +370,12 @@ static int s390x_keccakc_squeeze(void *vctx, unsigned char *out, size_t outlen,
 
 static int s390x_keccak_squeeze(void *vctx, unsigned char *out, size_t outlen)
 {
-     return s390x_keccakc_squeeze(vctx, out, outlen, 0x01);
+    return s390x_keccakc_squeeze(vctx, out, outlen, 0x01);
 }
 
 static int s390x_kmac_squeeze(void *vctx, unsigned char *out, size_t outlen)
 {
-     return s390x_keccakc_squeeze(vctx, out, outlen, 0x04);
+    return s390x_keccakc_squeeze(vctx, out, outlen, 0x04);
 }
 
 static PROV_SHA3_METHOD sha3_s390x_md = {
@@ -409,35 +402,35 @@ static PROV_SHA3_METHOD kmac_s390x_md = {
     s390x_kmac_squeeze,
 };
 
-# define SHAKE_SET_MD(uname, typ)                                              \
-    if (S390_SHA3_CAPABLE(uname)) {                                            \
-        ctx->pad = S390X_##uname;                                              \
-        ctx->meth = typ##_s390x_md;                                            \
-    } else {                                                                   \
-        ctx->meth = shake_generic_md;                                          \
+#define SHAKE_SET_MD(uname, typ)      \
+    if (S390_SHA3_CAPABLE(uname)) {   \
+        ctx->pad = S390X_##uname;     \
+        ctx->meth = typ##_s390x_md;   \
+    } else {                          \
+        ctx->meth = shake_generic_md; \
     }
 
-# define SHA3_SET_MD(uname, typ)                                               \
-    if (S390_SHA3_CAPABLE(uname)) {                                            \
-        ctx->pad = S390X_##uname;                                              \
-        ctx->meth = typ##_s390x_md;                                            \
-    } else {                                                                   \
-        ctx->meth = sha3_generic_md;                                           \
+#define SHA3_SET_MD(uname, typ)      \
+    if (S390_SHA3_CAPABLE(uname)) {  \
+        ctx->pad = S390X_##uname;    \
+        ctx->meth = typ##_s390x_md;  \
+    } else {                         \
+        ctx->meth = sha3_generic_md; \
     }
-# define KMAC_SET_MD(bitlen)                                                   \
-    if (S390_SHA3_CAPABLE(SHAKE_##bitlen)) {                                   \
-        ctx->pad = S390X_SHAKE_##bitlen;                                       \
-        ctx->meth = kmac_s390x_md;                                             \
-    } else {                                                                   \
-        ctx->meth = sha3_generic_md;                                           \
+#define KMAC_SET_MD(bitlen)                  \
+    if (S390_SHA3_CAPABLE(SHAKE_##bitlen)) { \
+        ctx->pad = S390X_SHAKE_##bitlen;     \
+        ctx->meth = kmac_s390x_md;           \
+    } else {                                 \
+        ctx->meth = sha3_generic_md;         \
     }
 #elif defined(__aarch64__) && defined(KECCAK1600_ASM)
-# include "arm_arch.h"
+#include "arm_arch.h"
 
 static sha3_absorb_fn armsha3_sha3_absorb;
 
 size_t SHA3_absorb_cext(uint64_t A[5][5], const unsigned char *inp, size_t len,
-                        size_t r);
+    size_t r);
 /*-
  * Hardware-assisted ARMv8.2 SHA3 extension version of the absorb()
  */
@@ -452,114 +445,113 @@ static PROV_SHA3_METHOD sha3_ARMSHA3_md = {
     armsha3_sha3_absorb,
     generic_sha3_final
 };
-static PROV_SHA3_METHOD shake_ARMSHA3_md =
-{
+static PROV_SHA3_METHOD shake_ARMSHA3_md = {
     armsha3_sha3_absorb,
     generic_sha3_final,
     generic_sha3_squeeze
 };
-# define SHAKE_SET_MD(uname, typ)                                              \
-    if (OPENSSL_armcap_P & ARMV8_HAVE_SHA3_AND_WORTH_USING) {                  \
-        ctx->meth = shake_ARMSHA3_md;                                          \
-    } else {                                                                   \
-        ctx->meth = shake_generic_md;                                          \
+#define SHAKE_SET_MD(uname, typ)                              \
+    if (OPENSSL_armcap_P & ARMV8_HAVE_SHA3_AND_WORTH_USING) { \
+        ctx->meth = shake_ARMSHA3_md;                         \
+    } else {                                                  \
+        ctx->meth = shake_generic_md;                         \
     }
 
-# define SHA3_SET_MD(uname, typ)                                               \
-    if (OPENSSL_armcap_P & ARMV8_HAVE_SHA3_AND_WORTH_USING) {                  \
-        ctx->meth = sha3_ARMSHA3_md;                                           \
-    } else {                                                                   \
-        ctx->meth = sha3_generic_md;                                           \
+#define SHA3_SET_MD(uname, typ)                               \
+    if (OPENSSL_armcap_P & ARMV8_HAVE_SHA3_AND_WORTH_USING) { \
+        ctx->meth = sha3_ARMSHA3_md;                          \
+    } else {                                                  \
+        ctx->meth = sha3_generic_md;                          \
     }
-# define KMAC_SET_MD(bitlen)                                                   \
-    if (OPENSSL_armcap_P & ARMV8_HAVE_SHA3_AND_WORTH_USING) {                  \
-        ctx->meth = sha3_ARMSHA3_md;                                           \
-    } else {                                                                   \
-        ctx->meth = sha3_generic_md;                                           \
+#define KMAC_SET_MD(bitlen)                                   \
+    if (OPENSSL_armcap_P & ARMV8_HAVE_SHA3_AND_WORTH_USING) { \
+        ctx->meth = sha3_ARMSHA3_md;                          \
+    } else {                                                  \
+        ctx->meth = sha3_generic_md;                          \
     }
 #else
-# define SHA3_SET_MD(uname, typ) ctx->meth = sha3_generic_md;
-# define KMAC_SET_MD(bitlen) ctx->meth = sha3_generic_md;
-# define SHAKE_SET_MD(uname, typ) ctx->meth = shake_generic_md;
+#define SHA3_SET_MD(uname, typ) ctx->meth = sha3_generic_md;
+#define KMAC_SET_MD(bitlen) ctx->meth = sha3_generic_md;
+#define SHAKE_SET_MD(uname, typ) ctx->meth = shake_generic_md;
 #endif /* S390_SHA3 */
 
-#define SHA3_newctx(typ, uname, name, bitlen, pad)                             \
-static OSSL_FUNC_digest_newctx_fn name##_newctx;                               \
-static void *name##_newctx(void *provctx)                                      \
-{                                                                              \
-    KECCAK1600_CTX *ctx = ossl_prov_is_running() ? OPENSSL_zalloc(sizeof(*ctx)) \
-                                                : NULL;                        \
-                                                                               \
-    if (ctx == NULL)                                                           \
-        return NULL;                                                           \
-    ossl_sha3_init(ctx, pad, bitlen);                                          \
-    SHA3_SET_MD(uname, typ)                                                    \
-    return ctx;                                                                \
-}
+#define SHA3_newctx(typ, uname, name, bitlen, pad)                                  \
+    static OSSL_FUNC_digest_newctx_fn name##_newctx;                                \
+    static void *name##_newctx(void *provctx)                                       \
+    {                                                                               \
+        KECCAK1600_CTX *ctx = ossl_prov_is_running() ? OPENSSL_zalloc(sizeof(*ctx)) \
+                                                     : NULL;                        \
+                                                                                    \
+        if (ctx == NULL)                                                            \
+            return NULL;                                                            \
+        ossl_sha3_init(ctx, pad, bitlen);                                           \
+        SHA3_SET_MD(uname, typ)                                                     \
+        return ctx;                                                                 \
+    }
 
-#define SHAKE_newctx(typ, uname, name, bitlen, mdlen, pad)                     \
-static OSSL_FUNC_digest_newctx_fn name##_newctx;                               \
-static void *name##_newctx(void *provctx)                                      \
-{                                                                              \
-    KECCAK1600_CTX *ctx = ossl_prov_is_running() ? OPENSSL_zalloc(sizeof(*ctx))\
-                                                : NULL;                        \
-                                                                               \
-    if (ctx == NULL)                                                           \
-        return NULL;                                                           \
-    ossl_keccak_init(ctx, pad, bitlen, mdlen);                                 \
-    if (mdlen == 0)                                                            \
-        ctx->md_size = SIZE_MAX;                                               \
-    SHAKE_SET_MD(uname, typ)                                                   \
-    return ctx;                                                                \
-}
+#define SHAKE_newctx(typ, uname, name, bitlen, mdlen, pad)                          \
+    static OSSL_FUNC_digest_newctx_fn name##_newctx;                                \
+    static void *name##_newctx(void *provctx)                                       \
+    {                                                                               \
+        KECCAK1600_CTX *ctx = ossl_prov_is_running() ? OPENSSL_zalloc(sizeof(*ctx)) \
+                                                     : NULL;                        \
+                                                                                    \
+        if (ctx == NULL)                                                            \
+            return NULL;                                                            \
+        ossl_keccak_init(ctx, pad, bitlen, mdlen);                                  \
+        if (mdlen == 0)                                                             \
+            ctx->md_size = SIZE_MAX;                                                \
+        SHAKE_SET_MD(uname, typ)                                                    \
+        return ctx;                                                                 \
+    }
 
-#define KMAC_newctx(uname, bitlen, pad)                                        \
-static OSSL_FUNC_digest_newctx_fn uname##_newctx;                              \
-static void *uname##_newctx(void *provctx)                                     \
-{                                                                              \
-    KECCAK1600_CTX *ctx = ossl_prov_is_running() ? OPENSSL_zalloc(sizeof(*ctx)) \
-                                                : NULL;                        \
-                                                                               \
-    if (ctx == NULL)                                                           \
-        return NULL;                                                           \
-    ossl_keccak_init(ctx, pad, bitlen, 2 * bitlen);                            \
-    KMAC_SET_MD(bitlen)                                                        \
-    return ctx;                                                                \
-}
+#define KMAC_newctx(uname, bitlen, pad)                                             \
+    static OSSL_FUNC_digest_newctx_fn uname##_newctx;                               \
+    static void *uname##_newctx(void *provctx)                                      \
+    {                                                                               \
+        KECCAK1600_CTX *ctx = ossl_prov_is_running() ? OPENSSL_zalloc(sizeof(*ctx)) \
+                                                     : NULL;                        \
+                                                                                    \
+        if (ctx == NULL)                                                            \
+            return NULL;                                                            \
+        ossl_keccak_init(ctx, pad, bitlen, 2 * bitlen);                             \
+        KMAC_SET_MD(bitlen)                                                         \
+        return ctx;                                                                 \
+    }
 
-#define PROV_FUNC_SHA3_DIGEST_COMMON(name, bitlen, blksize, dgstsize, flags)   \
-PROV_FUNC_DIGEST_GET_PARAM(name, blksize, dgstsize, flags)                     \
-const OSSL_DISPATCH ossl_##name##_functions[] = {                              \
-    { OSSL_FUNC_DIGEST_NEWCTX, (void (*)(void))name##_newctx },                \
-    { OSSL_FUNC_DIGEST_UPDATE, (void (*)(void))keccak_update },                \
-    { OSSL_FUNC_DIGEST_FINAL, (void (*)(void))keccak_final },                  \
-    { OSSL_FUNC_DIGEST_FREECTX, (void (*)(void))keccak_freectx },              \
-    { OSSL_FUNC_DIGEST_DUPCTX, (void (*)(void))keccak_dupctx },                \
-    { OSSL_FUNC_DIGEST_COPYCTX, (void (*)(void))keccak_copyctx },              \
-    PROV_DISPATCH_FUNC_DIGEST_GET_PARAMS(name)
-
-#define PROV_FUNC_SHA3_DIGEST(name, bitlen, blksize, dgstsize, flags)          \
-    PROV_FUNC_SHA3_DIGEST_COMMON(name, bitlen, blksize, dgstsize, flags),      \
-    { OSSL_FUNC_DIGEST_INIT, (void (*)(void))keccak_init },                    \
-    PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_END
-
-#define PROV_FUNC_SHAKE_DIGEST(name, bitlen, blksize, dgstsize, flags)         \
-    PROV_FUNC_SHA3_DIGEST_COMMON(name, bitlen, blksize, dgstsize, flags),      \
-    { OSSL_FUNC_DIGEST_SQUEEZE, (void (*)(void))shake_squeeze },               \
-    { OSSL_FUNC_DIGEST_INIT, (void (*)(void))keccak_init_params },             \
-    { OSSL_FUNC_DIGEST_SET_CTX_PARAMS, (void (*)(void))shake_set_ctx_params }, \
-    { OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS,                                    \
-     (void (*)(void))shake_settable_ctx_params },                              \
-    { OSSL_FUNC_DIGEST_GET_CTX_PARAMS, (void (*)(void))shake_get_ctx_params }, \
-    { OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS,                                    \
-     (void (*)(void))shake_gettable_ctx_params },                              \
-    PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_END
+#define PROV_FUNC_SHA3_DIGEST_COMMON(name, bitlen, blksize, dgstsize, flags) \
+    PROV_FUNC_DIGEST_GET_PARAM(name, blksize, dgstsize, flags)               \
+    const OSSL_DISPATCH ossl_##name##_functions[] = {                        \
+        { OSSL_FUNC_DIGEST_NEWCTX, (void (*)(void))name##_newctx },          \
+        { OSSL_FUNC_DIGEST_UPDATE, (void (*)(void))keccak_update },          \
+        { OSSL_FUNC_DIGEST_FINAL, (void (*)(void))keccak_final },            \
+        { OSSL_FUNC_DIGEST_FREECTX, (void (*)(void))keccak_freectx },        \
+        { OSSL_FUNC_DIGEST_DUPCTX, (void (*)(void))keccak_dupctx },          \
+        { OSSL_FUNC_DIGEST_COPYCTX, (void (*)(void))keccak_copyctx },        \
+        PROV_DISPATCH_FUNC_DIGEST_GET_PARAMS(name)
+
+#define PROV_FUNC_SHA3_DIGEST(name, bitlen, blksize, dgstsize, flags)     \
+    PROV_FUNC_SHA3_DIGEST_COMMON(name, bitlen, blksize, dgstsize, flags), \
+        { OSSL_FUNC_DIGEST_INIT, (void (*)(void))keccak_init },           \
+        PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_END
+
+#define PROV_FUNC_SHAKE_DIGEST(name, bitlen, blksize, dgstsize, flags)             \
+    PROV_FUNC_SHA3_DIGEST_COMMON(name, bitlen, blksize, dgstsize, flags),          \
+        { OSSL_FUNC_DIGEST_SQUEEZE, (void (*)(void))shake_squeeze },               \
+        { OSSL_FUNC_DIGEST_INIT, (void (*)(void))keccak_init_params },             \
+        { OSSL_FUNC_DIGEST_SET_CTX_PARAMS, (void (*)(void))shake_set_ctx_params }, \
+        { OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS,                                    \
+            (void (*)(void))shake_settable_ctx_params },                           \
+        { OSSL_FUNC_DIGEST_GET_CTX_PARAMS, (void (*)(void))shake_get_ctx_params }, \
+        { OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS,                                    \
+            (void (*)(void))shake_gettable_ctx_params },                           \
+        PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_END
 
 static void keccak_freectx(void *vctx)
 {
     KECCAK1600_CTX *ctx = (KECCAK1600_CTX *)vctx;
 
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));
+    OPENSSL_clear_free(ctx, sizeof(*ctx));
 }
 
 static void keccak_copyctx(void *voutctx, void *vinctx)
@@ -582,11 +574,11 @@ static void *keccak_dupctx(void *ctx)
 }
 
 static const OSSL_PARAM *shake_gettable_ctx_params(ossl_unused void *ctx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_shake_gettable_ctx_params[] = {
-        {OSSL_DIGEST_PARAM_XOFLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0},
-        {OSSL_DIGEST_PARAM_SIZE, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0},
+        { OSSL_DIGEST_PARAM_XOFLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0 },
+        { OSSL_DIGEST_PARAM_SIZE, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0 },
         OSSL_PARAM_END
     };
     return known_shake_gettable_ctx_params;
@@ -617,11 +609,11 @@ static int shake_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *shake_settable_ctx_params(ossl_unused void *ctx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_shake_settable_ctx_params[] = {
-        {OSSL_DIGEST_PARAM_XOFLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0},
-        {OSSL_DIGEST_PARAM_SIZE, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0},
+        { OSSL_DIGEST_PARAM_XOFLEN, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0 },
+        { OSSL_DIGEST_PARAM_SIZE, OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0 },
         OSSL_PARAM_END
     };
 
@@ -649,30 +641,30 @@ static int shake_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     return 1;
 }
 
-#define IMPLEMENT_SHA3_functions(bitlen)                                       \
-    SHA3_newctx(sha3, SHA3_##bitlen, sha3_##bitlen, bitlen, '\x06')            \
-    PROV_FUNC_SHA3_DIGEST(sha3_##bitlen, bitlen,                               \
-                          SHA3_BLOCKSIZE(bitlen), SHA3_MDSIZE(bitlen),         \
-                          SHA3_FLAGS)
-
-#define IMPLEMENT_KECCAK_functions(bitlen)                                     \
-    SHA3_newctx(keccak, KECCAK_##bitlen, keccak_##bitlen, bitlen, '\x01')      \
-    PROV_FUNC_SHA3_DIGEST(keccak_##bitlen, bitlen,                             \
-                          SHA3_BLOCKSIZE(bitlen), SHA3_MDSIZE(bitlen),         \
-                          SHA3_FLAGS)
-
-#define IMPLEMENT_SHAKE_functions(bitlen)                                      \
-    SHAKE_newctx(shake, SHAKE_##bitlen, shake_##bitlen, bitlen,                \
-                 0 /* no default md length */, '\x1f')                         \
-    PROV_FUNC_SHAKE_DIGEST(shake_##bitlen, bitlen,                             \
-                           SHA3_BLOCKSIZE(bitlen), 0,                          \
-                           SHAKE_FLAGS)
-
-#define IMPLEMENT_KMAC_functions(bitlen)                                       \
-    KMAC_newctx(keccak_kmac_##bitlen, bitlen, '\x04')                          \
-    PROV_FUNC_SHAKE_DIGEST(keccak_kmac_##bitlen, bitlen,                       \
-                           SHA3_BLOCKSIZE(bitlen), KMAC_MDSIZE(bitlen),        \
-                           KMAC_FLAGS)
+#define IMPLEMENT_SHA3_functions(bitlen)                            \
+    SHA3_newctx(sha3, SHA3_##bitlen, sha3_##bitlen, bitlen, '\x06') \
+        PROV_FUNC_SHA3_DIGEST(sha3_##bitlen, bitlen,                \
+            SHA3_BLOCKSIZE(bitlen), SHA3_MDSIZE(bitlen),            \
+            SHA3_FLAGS)
+
+#define IMPLEMENT_KECCAK_functions(bitlen)                                \
+    SHA3_newctx(keccak, KECCAK_##bitlen, keccak_##bitlen, bitlen, '\x01') \
+        PROV_FUNC_SHA3_DIGEST(keccak_##bitlen, bitlen,                    \
+            SHA3_BLOCKSIZE(bitlen), SHA3_MDSIZE(bitlen),                  \
+            SHA3_FLAGS)
+
+#define IMPLEMENT_SHAKE_functions(bitlen)                       \
+    SHAKE_newctx(shake, SHAKE_##bitlen, shake_##bitlen, bitlen, \
+        0 /* no default md length */, '\x1f')                   \
+        PROV_FUNC_SHAKE_DIGEST(shake_##bitlen, bitlen,          \
+            SHA3_BLOCKSIZE(bitlen), 0,                          \
+            SHAKE_FLAGS)
+
+#define IMPLEMENT_KMAC_functions(bitlen)                     \
+    KMAC_newctx(keccak_kmac_##bitlen, bitlen, '\x04')        \
+        PROV_FUNC_SHAKE_DIGEST(keccak_kmac_##bitlen, bitlen, \
+            SHA3_BLOCKSIZE(bitlen), KMAC_MDSIZE(bitlen),     \
+            KMAC_FLAGS)
 
 /* ossl_sha3_224_functions */
 IMPLEMENT_SHA3_functions(224)
diff --git a/providers/implementations/digests/sm3_prov.c b/providers/implementations/digests/sm3_prov.c
index 9d6de5b6ac199..dfc6960dd3024 100644
--- a/providers/implementations/digests/sm3_prov.c
+++ b/providers/implementations/digests/sm3_prov.c
@@ -14,5 +14,5 @@
 
 /* ossl_sm3_functions */
 IMPLEMENT_digest_functions(sm3, SM3_CTX,
-                           SM3_CBLOCK, SM3_DIGEST_LENGTH, 0,
-                           ossl_sm3_init, ossl_sm3_update, ossl_sm3_final)
+    SM3_CBLOCK, SM3_DIGEST_LENGTH, 0,
+    ossl_sm3_init, ossl_sm3_update, ossl_sm3_final)
diff --git a/providers/implementations/digests/wp_prov.c b/providers/implementations/digests/wp_prov.c
index 2af70b337281f..93167f171aa8b 100644
--- a/providers/implementations/digests/wp_prov.c
+++ b/providers/implementations/digests/wp_prov.c
@@ -20,5 +20,5 @@
 
 /* ossl_wp_functions */
 IMPLEMENT_digest_functions(wp, WHIRLPOOL_CTX,
-                           WHIRLPOOL_BBLOCK / 8, WHIRLPOOL_DIGEST_LENGTH, 0,
-                           WHIRLPOOL_Init, WHIRLPOOL_Update, WHIRLPOOL_Final)
+    WHIRLPOOL_BBLOCK / 8, WHIRLPOOL_DIGEST_LENGTH, 0,
+    WHIRLPOOL_Init, WHIRLPOOL_Update, WHIRLPOOL_Final)
diff --git a/providers/implementations/encode_decode/decode_der2key.c b/providers/implementations/encode_decode/decode_der2key.c
index a3f0d0897dae5..91313df64c730 100644
--- a/providers/implementations/encode_decode/decode_der2key.c
+++ b/providers/implementations/encode_decode/decode_der2key.c
@@ -20,13 +20,13 @@
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/params.h>
-#include <openssl/pem.h>         /* PEM_BUFSIZE and public PEM functions */
+#include <openssl/pem.h> /* PEM_BUFSIZE and public PEM functions */
 #include <openssl/pkcs12.h>
 #include <openssl/provider.h>
 #include <openssl/x509.h>
 #include <openssl/proverr.h>
 #include <openssl/asn1t.h>
-#include "internal/cryptlib.h"   /* ossl_assert() */
+#include "internal/cryptlib.h" /* ossl_assert() */
 #include "crypto/dh.h"
 #include "crypto/dsa.h"
 #include "crypto/ec.h"
@@ -65,14 +65,14 @@ ASN1_SEQUENCE(BARE_PUBKEY) = {
 } static_ASN1_SEQUENCE_END(BARE_PUBKEY)
 #endif /* OPENSSL_NO_SLH_DSA */
 
-struct der2key_ctx_st;           /* Forward declaration */
+struct der2key_ctx_st; /* Forward declaration */
 typedef int check_key_fn(void *, struct der2key_ctx_st *ctx);
 typedef void adjust_key_fn(void *, struct der2key_ctx_st *ctx);
 typedef void free_key_fn(void *);
 typedef void *d2i_PKCS8_fn(const unsigned char **, long,
-                           struct der2key_ctx_st *);
+    struct der2key_ctx_st *);
 typedef void *d2i_PUBKEY_fn(const unsigned char **, long,
-                            struct der2key_ctx_st *);
+    struct der2key_ctx_st *);
 struct keytype_desc_st {
     const char *keytype_name;
     const OSSL_DISPATCH *fns; /* Keymgmt (to pilfer functions from) */
@@ -93,10 +93,10 @@ struct keytype_desc_st {
 
     /* For type specific decoders, we use the corresponding d2i */
     d2i_of_void *d2i_private_key; /* From type-specific DER */
-    d2i_of_void *d2i_public_key;  /* From type-specific DER */
-    d2i_of_void *d2i_key_params;  /* From type-specific DER */
-    d2i_PKCS8_fn *d2i_PKCS8;      /* Wrapped in a PrivateKeyInfo */
-    d2i_PUBKEY_fn *d2i_PUBKEY;    /* Wrapped in a SubjectPublicKeyInfo */
+    d2i_of_void *d2i_public_key; /* From type-specific DER */
+    d2i_of_void *d2i_key_params; /* From type-specific DER */
+    d2i_PKCS8_fn *d2i_PKCS8; /* Wrapped in a PrivateKeyInfo */
+    d2i_PUBKEY_fn *d2i_PUBKEY; /* Wrapped in a SubjectPublicKeyInfo */
 
     /*
      * For any key, we may need to check that the key meets expectations.
@@ -128,10 +128,10 @@ struct der2key_ctx_st {
 };
 
 typedef void *key_from_pkcs8_t(const PKCS8_PRIV_KEY_INFO *p8inf,
-                               OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 static void *der2key_decode_p8(const unsigned char **input_der,
-                               long input_der_len, struct der2key_ctx_st *ctx,
-                               key_from_pkcs8_t *key_from_pkcs8)
+    long input_der_len, struct der2key_ctx_st *ctx,
+    key_from_pkcs8_t *key_from_pkcs8)
 {
     PKCS8_PRIV_KEY_INFO *p8inf = NULL;
     const X509_ALGOR *alg = NULL;
@@ -199,7 +199,7 @@ static void der2key_freectx(void *vctx)
 }
 
 static int der2key_check_selection(int selection,
-                                   const struct keytype_desc_st *desc)
+    const struct keytype_desc_st *desc)
 {
     /*
      * The selections are kinda sorta "levels", i.e. each selection given
@@ -233,8 +233,8 @@ static int der2key_check_selection(int selection,
 }
 
 static int der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
-                          OSSL_CALLBACK *data_cb, void *data_cbarg,
-                          OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct der2key_ctx_st *ctx = vctx;
     unsigned char *der = NULL;
@@ -324,7 +324,7 @@ static int der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     if (key != NULL && ctx->desc->adjust_key != NULL)
         ctx->desc->adjust_key(key, ctx);
 
- next:
+next:
     /*
      * Indicated that we successfully decoded something, or not at all.
      * Ending up "empty handed" is not an error.
@@ -343,31 +343,27 @@ static int der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
         OSSL_PARAM params[4];
         int object_type = OSSL_OBJECT_PKEY;
 
-        params[0] =
-            OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &object_type);
+        params[0] = OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &object_type);
 
 #ifndef OPENSSL_NO_SM2
         if (strcmp(ctx->desc->keytype_name, "EC") == 0
             && (EC_KEY_get_flags(key) & EC_FLAG_SM2_RANGE) != 0)
-            params[1] =
-                OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
-                                                 "SM2", 0);
+            params[1] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
+                "SM2", 0);
         else
 #endif
-            params[1] =
-                OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
-                                                 (char *)ctx->desc->keytype_name,
-                                                 0);
+            params[1] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
+                (char *)ctx->desc->keytype_name,
+                0);
         /* The address of the key becomes the octet string */
-        params[2] =
-            OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_REFERENCE,
-                                              &key, sizeof(key));
+        params[2] = OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_REFERENCE,
+            &key, sizeof(key));
         params[3] = OSSL_PARAM_construct_end();
 
         ok = data_cb(params, data_cbarg);
     }
 
- end:
+end:
     ctx->desc->free_key(key);
     OPENSSL_free(der);
 
@@ -375,12 +371,11 @@ static int der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
 }
 
 static int der2key_export_object(void *vctx,
-                                 const void *reference, size_t reference_sz,
-                                 OSSL_CALLBACK *export_cb, void *export_cbarg)
+    const void *reference, size_t reference_sz,
+    OSSL_CALLBACK *export_cb, void *export_cbarg)
 {
     struct der2key_ctx_st *ctx = vctx;
-    OSSL_FUNC_keymgmt_export_fn *export =
-        ossl_prov_get_keymgmt_export(ctx->desc->fns);
+    OSSL_FUNC_keymgmt_export_fn *export = ossl_prov_get_keymgmt_export(ctx->desc->fns);
     void *keydata;
 
     if (reference_sz == sizeof(keydata) && export != NULL) {
@@ -399,7 +394,7 @@ static int der2key_export_object(void *vctx,
 #define D2I_PUBKEY_NOCTX(n, f)                              \
     static void *                                           \
     n##_d2i_PUBKEY(const unsigned char **der, long der_len, \
-                   ossl_unused struct der2key_ctx_st *ctx)  \
+        ossl_unused struct der2key_ctx_st *ctx)             \
     {                                                       \
         return f(NULL, der, der_len);                       \
     }
@@ -407,18 +402,18 @@ static int der2key_export_object(void *vctx,
 /* ---------------------------------------------------------------------- */
 
 #ifndef OPENSSL_NO_DH
-# define dh_evp_type                    EVP_PKEY_DH
-# define dh_d2i_private_key             NULL
-# define dh_d2i_public_key              NULL
-# define dh_d2i_key_params              (d2i_of_void *)d2i_DHparams
-# define dh_free                        (free_key_fn *)DH_free
-# define dh_check                       NULL
+#define dh_evp_type EVP_PKEY_DH
+#define dh_d2i_private_key NULL
+#define dh_d2i_public_key NULL
+#define dh_d2i_key_params (d2i_of_void *)d2i_DHparams
+#define dh_free (free_key_fn *)DH_free
+#define dh_check NULL
 
 static void *dh_d2i_PKCS8(const unsigned char **der, long der_len,
-                          struct der2key_ctx_st *ctx)
+    struct der2key_ctx_st *ctx)
 {
     return der2key_decode_p8(der, der_len, ctx,
-                             (key_from_pkcs8_t *)ossl_dh_key_from_pkcs8);
+        (key_from_pkcs8_t *)ossl_dh_key_from_pkcs8);
 }
 
 D2I_PUBKEY_NOCTX(dh, ossl_d2i_DH_PUBKEY)
@@ -429,31 +424,31 @@ static void dh_adjust(void *key, struct der2key_ctx_st *ctx)
     ossl_dh_set0_libctx(key, PROV_LIBCTX_OF(ctx->provctx));
 }
 
-# define dhx_evp_type                   EVP_PKEY_DHX
-# define dhx_d2i_private_key            NULL
-# define dhx_d2i_public_key             NULL
-# define dhx_d2i_key_params             (d2i_of_void *)d2i_DHxparams
-# define dhx_d2i_PKCS8                  dh_d2i_PKCS8
-# define dhx_free                       (free_key_fn *)DH_free
-# define dhx_check                      NULL
-# define dhx_adjust                     dh_adjust
+#define dhx_evp_type EVP_PKEY_DHX
+#define dhx_d2i_private_key NULL
+#define dhx_d2i_public_key NULL
+#define dhx_d2i_key_params (d2i_of_void *)d2i_DHxparams
+#define dhx_d2i_PKCS8 dh_d2i_PKCS8
+#define dhx_free (free_key_fn *)DH_free
+#define dhx_check NULL
+#define dhx_adjust dh_adjust
 #endif
 
 /* ---------------------------------------------------------------------- */
 
 #ifndef OPENSSL_NO_DSA
-# define dsa_evp_type                   EVP_PKEY_DSA
-# define dsa_d2i_private_key            (d2i_of_void *)d2i_DSAPrivateKey
-# define dsa_d2i_public_key             (d2i_of_void *)d2i_DSAPublicKey
-# define dsa_d2i_key_params             (d2i_of_void *)d2i_DSAparams
-# define dsa_free                       (free_key_fn *)DSA_free
-# define dsa_check                      NULL
+#define dsa_evp_type EVP_PKEY_DSA
+#define dsa_d2i_private_key (d2i_of_void *)d2i_DSAPrivateKey
+#define dsa_d2i_public_key (d2i_of_void *)d2i_DSAPublicKey
+#define dsa_d2i_key_params (d2i_of_void *)d2i_DSAparams
+#define dsa_free (free_key_fn *)DSA_free
+#define dsa_check NULL
 
 static void *dsa_d2i_PKCS8(const unsigned char **der, long der_len,
-                           struct der2key_ctx_st *ctx)
+    struct der2key_ctx_st *ctx)
 {
     return der2key_decode_p8(der, der_len, ctx,
-                             (key_from_pkcs8_t *)ossl_dsa_key_from_pkcs8);
+        (key_from_pkcs8_t *)ossl_dsa_key_from_pkcs8);
 }
 
 D2I_PUBKEY_NOCTX(dsa, ossl_d2i_DSA_PUBKEY)
@@ -467,17 +462,17 @@ static void dsa_adjust(void *key, struct der2key_ctx_st *ctx)
 /* ---------------------------------------------------------------------- */
 
 #ifndef OPENSSL_NO_EC
-# define ec_evp_type                    EVP_PKEY_EC
-# define ec_d2i_private_key             (d2i_of_void *)d2i_ECPrivateKey
-# define ec_d2i_public_key              NULL
-# define ec_d2i_key_params              (d2i_of_void *)d2i_ECParameters
-# define ec_free                        (free_key_fn *)EC_KEY_free
+#define ec_evp_type EVP_PKEY_EC
+#define ec_d2i_private_key (d2i_of_void *)d2i_ECPrivateKey
+#define ec_d2i_public_key NULL
+#define ec_d2i_key_params (d2i_of_void *)d2i_ECParameters
+#define ec_free (free_key_fn *)EC_KEY_free
 
 static void *ec_d2i_PKCS8(const unsigned char **der, long der_len,
-                          struct der2key_ctx_st *ctx)
+    struct der2key_ctx_st *ctx)
 {
     return der2key_decode_p8(der, der_len, ctx,
-                             (key_from_pkcs8_t *)ossl_ec_key_from_pkcs8);
+        (key_from_pkcs8_t *)ossl_ec_key_from_pkcs8);
 }
 
 D2I_PUBKEY_NOCTX(ec, d2i_EC_PUBKEY)
@@ -502,17 +497,17 @@ static void ec_adjust(void *key, struct der2key_ctx_st *ctx)
     ossl_ec_key_set0_libctx(key, PROV_LIBCTX_OF(ctx->provctx));
 }
 
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 /*
  * ED25519, ED448, X25519, X448 only implement PKCS#8 and SubjectPublicKeyInfo,
  * so no d2i functions to be had.
  */
 
 static void *ecx_d2i_PKCS8(const unsigned char **der, long der_len,
-                           struct der2key_ctx_st *ctx)
+    struct der2key_ctx_st *ctx)
 {
     return der2key_decode_p8(der, der_len, ctx,
-                             (key_from_pkcs8_t *)ossl_ecx_key_from_pkcs8);
+        (key_from_pkcs8_t *)ossl_ecx_key_from_pkcs8);
 }
 
 D2I_PUBKEY_NOCTX(ed25519, ossl_d2i_ED25519_PUBKEY)
@@ -525,60 +520,60 @@ static void ecx_key_adjust(void *key, struct der2key_ctx_st *ctx)
     ossl_ecx_key_set0_libctx(key, PROV_LIBCTX_OF(ctx->provctx));
 }
 
-#  define ed25519_evp_type               EVP_PKEY_ED25519
-#  define ed25519_d2i_private_key        NULL
-#  define ed25519_d2i_public_key         NULL
-#  define ed25519_d2i_key_params         NULL
-#  define ed25519_d2i_PKCS8              ecx_d2i_PKCS8
-#  define ed25519_free                   (free_key_fn *)ossl_ecx_key_free
-#  define ed25519_check                  NULL
-#  define ed25519_adjust                 ecx_key_adjust
-
-#  define ed448_evp_type                 EVP_PKEY_ED448
-#  define ed448_d2i_private_key          NULL
-#  define ed448_d2i_public_key           NULL
-#  define ed448_d2i_key_params           NULL
-#  define ed448_d2i_PKCS8                ecx_d2i_PKCS8
-#  define ed448_free                     (free_key_fn *)ossl_ecx_key_free
-#  define ed448_check                    NULL
-#  define ed448_adjust                   ecx_key_adjust
-
-#  define x25519_evp_type                EVP_PKEY_X25519
-#  define x25519_d2i_private_key         NULL
-#  define x25519_d2i_public_key          NULL
-#  define x25519_d2i_key_params          NULL
-#  define x25519_d2i_PKCS8               ecx_d2i_PKCS8
-#  define x25519_free                    (free_key_fn *)ossl_ecx_key_free
-#  define x25519_check                   NULL
-#  define x25519_adjust                  ecx_key_adjust
-
-#  define x448_evp_type                  EVP_PKEY_X448
-#  define x448_d2i_private_key           NULL
-#  define x448_d2i_public_key            NULL
-#  define x448_d2i_key_params            NULL
-#  define x448_d2i_PKCS8                 ecx_d2i_PKCS8
-#  define x448_free                      (free_key_fn *)ossl_ecx_key_free
-#  define x448_check                     NULL
-#  define x448_adjust                    ecx_key_adjust
-# endif /* OPENSSL_NO_ECX */
-
-# ifndef OPENSSL_NO_SM2
-#  define sm2_evp_type                  EVP_PKEY_SM2
-#  define sm2_d2i_private_key           (d2i_of_void *)d2i_ECPrivateKey
-#  define sm2_d2i_public_key            NULL
-#  define sm2_d2i_key_params            (d2i_of_void *)d2i_ECParameters
-#  define sm2_d2i_PUBKEY                ec_d2i_PUBKEY
-#  define sm2_free                      (free_key_fn *)EC_KEY_free
-#  define sm2_check                     ec_check
-#  define sm2_adjust                    ec_adjust
+#define ed25519_evp_type EVP_PKEY_ED25519
+#define ed25519_d2i_private_key NULL
+#define ed25519_d2i_public_key NULL
+#define ed25519_d2i_key_params NULL
+#define ed25519_d2i_PKCS8 ecx_d2i_PKCS8
+#define ed25519_free (free_key_fn *)ossl_ecx_key_free
+#define ed25519_check NULL
+#define ed25519_adjust ecx_key_adjust
+
+#define ed448_evp_type EVP_PKEY_ED448
+#define ed448_d2i_private_key NULL
+#define ed448_d2i_public_key NULL
+#define ed448_d2i_key_params NULL
+#define ed448_d2i_PKCS8 ecx_d2i_PKCS8
+#define ed448_free (free_key_fn *)ossl_ecx_key_free
+#define ed448_check NULL
+#define ed448_adjust ecx_key_adjust
+
+#define x25519_evp_type EVP_PKEY_X25519
+#define x25519_d2i_private_key NULL
+#define x25519_d2i_public_key NULL
+#define x25519_d2i_key_params NULL
+#define x25519_d2i_PKCS8 ecx_d2i_PKCS8
+#define x25519_free (free_key_fn *)ossl_ecx_key_free
+#define x25519_check NULL
+#define x25519_adjust ecx_key_adjust
+
+#define x448_evp_type EVP_PKEY_X448
+#define x448_d2i_private_key NULL
+#define x448_d2i_public_key NULL
+#define x448_d2i_key_params NULL
+#define x448_d2i_PKCS8 ecx_d2i_PKCS8
+#define x448_free (free_key_fn *)ossl_ecx_key_free
+#define x448_check NULL
+#define x448_adjust ecx_key_adjust
+#endif /* OPENSSL_NO_ECX */
+
+#ifndef OPENSSL_NO_SM2
+#define sm2_evp_type EVP_PKEY_SM2
+#define sm2_d2i_private_key (d2i_of_void *)d2i_ECPrivateKey
+#define sm2_d2i_public_key NULL
+#define sm2_d2i_key_params (d2i_of_void *)d2i_ECParameters
+#define sm2_d2i_PUBKEY ec_d2i_PUBKEY
+#define sm2_free (free_key_fn *)EC_KEY_free
+#define sm2_check ec_check
+#define sm2_adjust ec_adjust
 
 static void *sm2_d2i_PKCS8(const unsigned char **der, long der_len,
-                           struct der2key_ctx_st *ctx)
+    struct der2key_ctx_st *ctx)
 {
     return der2key_decode_p8(der, der_len, ctx,
-                             (key_from_pkcs8_t *)ossl_ec_key_from_pkcs8);
+        (key_from_pkcs8_t *)ossl_ec_key_from_pkcs8);
 }
-# endif
+#endif
 
 #endif
 
@@ -591,7 +586,7 @@ ml_kem_d2i_PKCS8(const uint8_t **der, long der_len, struct der2key_ctx_st *ctx)
     ML_KEM_KEY *key;
 
     key = ossl_ml_kem_d2i_PKCS8(*der, der_len, ctx->desc->evp_type,
-                                ctx->provctx, ctx->propq);
+        ctx->provctx, ctx->propq);
     if (key != NULL)
         *der += der_len;
     return key;
@@ -599,46 +594,46 @@ ml_kem_d2i_PKCS8(const uint8_t **der, long der_len, struct der2key_ctx_st *ctx)
 
 static ossl_inline void *
 ml_kem_d2i_PUBKEY(const uint8_t **der, long der_len,
-                  struct der2key_ctx_st *ctx)
+    struct der2key_ctx_st *ctx)
 {
     ML_KEM_KEY *key;
 
     key = ossl_ml_kem_d2i_PUBKEY(*der, der_len, ctx->desc->evp_type,
-                                 ctx->provctx, ctx->propq);
+        ctx->provctx, ctx->propq);
     if (key != NULL)
         *der += der_len;
     return key;
 }
 
-# define ml_kem_512_evp_type                EVP_PKEY_ML_KEM_512
-# define ml_kem_512_d2i_private_key         NULL
-# define ml_kem_512_d2i_public_key          NULL
-# define ml_kem_512_d2i_key_params          NULL
-# define ml_kem_512_d2i_PUBKEY              ml_kem_d2i_PUBKEY
-# define ml_kem_512_d2i_PKCS8               ml_kem_d2i_PKCS8
-# define ml_kem_512_free                    (free_key_fn *)ossl_ml_kem_key_free
-# define ml_kem_512_check                   NULL
-# define ml_kem_512_adjust                  NULL
-
-# define ml_kem_768_evp_type                EVP_PKEY_ML_KEM_768
-# define ml_kem_768_d2i_private_key         NULL
-# define ml_kem_768_d2i_public_key          NULL
-# define ml_kem_768_d2i_key_params          NULL
-# define ml_kem_768_d2i_PUBKEY              ml_kem_d2i_PUBKEY
-# define ml_kem_768_d2i_PKCS8               ml_kem_d2i_PKCS8
-# define ml_kem_768_free                    (free_key_fn *)ossl_ml_kem_key_free
-# define ml_kem_768_check                   NULL
-# define ml_kem_768_adjust                  NULL
-
-# define ml_kem_1024_evp_type               EVP_PKEY_ML_KEM_1024
-# define ml_kem_1024_d2i_private_key        NULL
-# define ml_kem_1024_d2i_public_key         NULL
-# define ml_kem_1024_d2i_PUBKEY             ml_kem_d2i_PUBKEY
-# define ml_kem_1024_d2i_PKCS8              ml_kem_d2i_PKCS8
-# define ml_kem_1024_d2i_key_params         NULL
-# define ml_kem_1024_free                   (free_key_fn *)ossl_ml_kem_key_free
-# define ml_kem_1024_check                  NULL
-# define ml_kem_1024_adjust                 NULL
+#define ml_kem_512_evp_type EVP_PKEY_ML_KEM_512
+#define ml_kem_512_d2i_private_key NULL
+#define ml_kem_512_d2i_public_key NULL
+#define ml_kem_512_d2i_key_params NULL
+#define ml_kem_512_d2i_PUBKEY ml_kem_d2i_PUBKEY
+#define ml_kem_512_d2i_PKCS8 ml_kem_d2i_PKCS8
+#define ml_kem_512_free (free_key_fn *)ossl_ml_kem_key_free
+#define ml_kem_512_check NULL
+#define ml_kem_512_adjust NULL
+
+#define ml_kem_768_evp_type EVP_PKEY_ML_KEM_768
+#define ml_kem_768_d2i_private_key NULL
+#define ml_kem_768_d2i_public_key NULL
+#define ml_kem_768_d2i_key_params NULL
+#define ml_kem_768_d2i_PUBKEY ml_kem_d2i_PUBKEY
+#define ml_kem_768_d2i_PKCS8 ml_kem_d2i_PKCS8
+#define ml_kem_768_free (free_key_fn *)ossl_ml_kem_key_free
+#define ml_kem_768_check NULL
+#define ml_kem_768_adjust NULL
+
+#define ml_kem_1024_evp_type EVP_PKEY_ML_KEM_1024
+#define ml_kem_1024_d2i_private_key NULL
+#define ml_kem_1024_d2i_public_key NULL
+#define ml_kem_1024_d2i_PUBKEY ml_kem_d2i_PUBKEY
+#define ml_kem_1024_d2i_PKCS8 ml_kem_d2i_PKCS8
+#define ml_kem_1024_d2i_key_params NULL
+#define ml_kem_1024_free (free_key_fn *)ossl_ml_kem_key_free
+#define ml_kem_1024_check NULL
+#define ml_kem_1024_adjust NULL
 
 #endif
 
@@ -660,20 +655,21 @@ slh_dsa_d2i_PKCS8(const uint8_t **der, long der_len, struct der2key_ctx_st *ctx)
     /* Algorithm parameters must be absent. */
     if ((X509_ALGOR_get0(NULL, &ptype, NULL, alg), ptype != V_ASN1_UNDEF)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_UNEXPECTED_KEY_PARAMETERS,
-                       "unexpected parameters with a PKCS#8 %s private key",
-                       ctx->desc->keytype_name);
+            "unexpected parameters with a PKCS#8 %s private key",
+            ctx->desc->keytype_name);
         goto end;
     }
     if (OBJ_obj2nid(alg->algorithm) != ctx->desc->evp_type)
         goto end;
     if ((key = ossl_slh_dsa_key_new(libctx, ctx->propq,
-                                    ctx->desc->keytype_name)) == NULL)
+             ctx->desc->keytype_name))
+        == NULL)
         goto end;
 
     if (!ossl_slh_dsa_set_priv(key, p, plen))
         goto end;
     ret = key;
- end:
+end:
     PKCS8_PRIV_KEY_INFO_free(p8inf);
     if (ret == NULL)
         ossl_slh_dsa_key_free(key);
@@ -681,7 +677,7 @@ slh_dsa_d2i_PKCS8(const uint8_t **der, long der_len, struct der2key_ctx_st *ctx)
 }
 
 static ossl_inline void *slh_dsa_d2i_PUBKEY(const uint8_t **der, long der_len,
-                                            struct der2key_ctx_st *ctx)
+    struct der2key_ctx_st *ctx)
 {
     int ok = 0;
     OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(ctx->provctx);
@@ -711,9 +707,9 @@ static ossl_inline void *slh_dsa_d2i_PUBKEY(const uint8_t **der, long der_len,
      */
     if (der_len != 18 + (long)len) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_BAD_ENCODING,
-                       "unexpected %s public key length: %ld != %ld",
-                       ctx->desc->keytype_name, der_len,
-                       18 + (long)len);
+            "unexpected %s public key length: %ld != %ld",
+            ctx->desc->keytype_name, der_len,
+            18 + (long)len);
         goto err;
     }
 
@@ -722,35 +718,36 @@ static ossl_inline void *slh_dsa_d2i_PUBKEY(const uint8_t **der, long der_len,
 
     /* The spki storage is freed on error */
     if (ASN1_item_d2i_ex((ASN1_VALUE **)&spki, &end, der_len,
-                         ASN1_ITEM_rptr(BARE_PUBKEY), NULL, NULL) == NULL) {
+            ASN1_ITEM_rptr(BARE_PUBKEY), NULL, NULL)
+        == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_BAD_ENCODING,
-                       "malformed %s public key ASN.1 encoding",
-                       ossl_slh_dsa_key_get_name(ret));
+            "malformed %s public key ASN.1 encoding",
+            ossl_slh_dsa_key_get_name(ret));
         goto err;
     }
 
     /* The spki structure now owns some memory */
     if ((spki->pubkey->flags & 0x7) != 0 || end != *der + der_len) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_BAD_ENCODING,
-                       "malformed %s public key ASN.1 encoding",
-                       ossl_slh_dsa_key_get_name(ret));
+            "malformed %s public key ASN.1 encoding",
+            ossl_slh_dsa_key_get_name(ret));
         goto err;
     }
     if (OBJ_cmp(OBJ_nid2obj(ctx->desc->evp_type), spki->algor.oid) != 0) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_BAD_ENCODING,
-                       "unexpected algorithm OID for an %s public key",
-                       ossl_slh_dsa_key_get_name(ret));
+            "unexpected algorithm OID for an %s public key",
+            ossl_slh_dsa_key_get_name(ret));
         goto err;
     }
 
     if (!ossl_slh_dsa_set_pub(ret, spki->pubkey->data, spki->pubkey->length)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_BAD_ENCODING,
-                       "failed to parse %s public key from the input data",
-                       ossl_slh_dsa_key_get_name(ret));
+            "failed to parse %s public key from the input data",
+            ossl_slh_dsa_key_get_name(ret));
         goto err;
     }
     ok = 1;
- err:
+err:
     if (spki != NULL) {
         ASN1_OBJECT_free(spki->algor.oid);
         ASN1_BIT_STRING_free(spki->pubkey);
@@ -763,145 +760,145 @@ static ossl_inline void *slh_dsa_d2i_PUBKEY(const uint8_t **der, long der_len,
     return ret;
 }
 
-# define slh_dsa_sha2_128s_evp_type        EVP_PKEY_SLH_DSA_SHA2_128S
-# define slh_dsa_sha2_128s_d2i_private_key NULL
-# define slh_dsa_sha2_128s_d2i_public_key  NULL
-# define slh_dsa_sha2_128s_d2i_key_params  NULL
-# define slh_dsa_sha2_128s_d2i_PKCS8       slh_dsa_d2i_PKCS8
-# define slh_dsa_sha2_128s_d2i_PUBKEY      slh_dsa_d2i_PUBKEY
-# define slh_dsa_sha2_128s_free            (free_key_fn *)ossl_slh_dsa_key_free
-# define slh_dsa_sha2_128s_check           NULL
-# define slh_dsa_sha2_128s_adjust          NULL
-
-# define slh_dsa_sha2_128f_evp_type        EVP_PKEY_SLH_DSA_SHA2_128F
-# define slh_dsa_sha2_128f_d2i_private_key NULL
-# define slh_dsa_sha2_128f_d2i_public_key  NULL
-# define slh_dsa_sha2_128f_d2i_key_params  NULL
-# define slh_dsa_sha2_128f_d2i_PKCS8       slh_dsa_d2i_PKCS8
-# define slh_dsa_sha2_128f_d2i_PUBKEY      slh_dsa_d2i_PUBKEY
-# define slh_dsa_sha2_128f_free            (free_key_fn *)ossl_slh_dsa_key_free
-# define slh_dsa_sha2_128f_check           NULL
-# define slh_dsa_sha2_128f_adjust          NULL
-
-# define slh_dsa_sha2_192s_evp_type        EVP_PKEY_SLH_DSA_SHA2_192S
-# define slh_dsa_sha2_192s_d2i_private_key NULL
-# define slh_dsa_sha2_192s_d2i_public_key  NULL
-# define slh_dsa_sha2_192s_d2i_key_params  NULL
-# define slh_dsa_sha2_192s_d2i_PKCS8       slh_dsa_d2i_PKCS8
-# define slh_dsa_sha2_192s_d2i_PUBKEY      slh_dsa_d2i_PUBKEY
-# define slh_dsa_sha2_192s_free            (free_key_fn *)ossl_slh_dsa_key_free
-# define slh_dsa_sha2_192s_check           NULL
-# define slh_dsa_sha2_192s_adjust          NULL
-
-# define slh_dsa_sha2_192f_evp_type        EVP_PKEY_SLH_DSA_SHA2_192F
-# define slh_dsa_sha2_192f_d2i_private_key NULL
-# define slh_dsa_sha2_192f_d2i_public_key  NULL
-# define slh_dsa_sha2_192f_d2i_key_params  NULL
-# define slh_dsa_sha2_192f_d2i_PKCS8       slh_dsa_d2i_PKCS8
-# define slh_dsa_sha2_192f_d2i_PUBKEY      slh_dsa_d2i_PUBKEY
-# define slh_dsa_sha2_192f_free            (free_key_fn *)ossl_slh_dsa_key_free
-# define slh_dsa_sha2_192f_check           NULL
-# define slh_dsa_sha2_192f_adjust          NULL
-
-# define slh_dsa_sha2_256s_evp_type        EVP_PKEY_SLH_DSA_SHA2_256S
-# define slh_dsa_sha2_256s_d2i_private_key NULL
-# define slh_dsa_sha2_256s_d2i_public_key  NULL
-# define slh_dsa_sha2_256s_d2i_key_params  NULL
-# define slh_dsa_sha2_256s_d2i_PKCS8       slh_dsa_d2i_PKCS8
-# define slh_dsa_sha2_256s_d2i_PUBKEY      slh_dsa_d2i_PUBKEY
-# define slh_dsa_sha2_256s_free            (free_key_fn *)ossl_slh_dsa_key_free
-# define slh_dsa_sha2_256s_check           NULL
-# define slh_dsa_sha2_256s_adjust          NULL
-
-# define slh_dsa_sha2_256f_evp_type        EVP_PKEY_SLH_DSA_SHA2_256F
-# define slh_dsa_sha2_256f_d2i_private_key NULL
-# define slh_dsa_sha2_256f_d2i_public_key  NULL
-# define slh_dsa_sha2_256f_d2i_key_params  NULL
-# define slh_dsa_sha2_256f_d2i_PKCS8       slh_dsa_d2i_PKCS8
-# define slh_dsa_sha2_256f_d2i_PUBKEY      slh_dsa_d2i_PUBKEY
-# define slh_dsa_sha2_256f_free            (free_key_fn *)ossl_slh_dsa_key_free
-# define slh_dsa_sha2_256f_check           NULL
-# define slh_dsa_sha2_256f_adjust          NULL
-
-# define slh_dsa_shake_128s_evp_type        EVP_PKEY_SLH_DSA_SHAKE_128S
-# define slh_dsa_shake_128s_d2i_private_key NULL
-# define slh_dsa_shake_128s_d2i_public_key  NULL
-# define slh_dsa_shake_128s_d2i_key_params  NULL
-# define slh_dsa_shake_128s_d2i_PKCS8       slh_dsa_d2i_PKCS8
-# define slh_dsa_shake_128s_d2i_PUBKEY      slh_dsa_d2i_PUBKEY
-# define slh_dsa_shake_128s_free            (free_key_fn *)ossl_slh_dsa_key_free
-# define slh_dsa_shake_128s_check           NULL
-# define slh_dsa_shake_128s_adjust          NULL
-
-# define slh_dsa_shake_128f_evp_type        EVP_PKEY_SLH_DSA_SHAKE_128F
-# define slh_dsa_shake_128f_d2i_private_key NULL
-# define slh_dsa_shake_128f_d2i_public_key  NULL
-# define slh_dsa_shake_128f_d2i_key_params  NULL
-# define slh_dsa_shake_128f_d2i_PKCS8       slh_dsa_d2i_PKCS8
-# define slh_dsa_shake_128f_d2i_PUBKEY      slh_dsa_d2i_PUBKEY
-# define slh_dsa_shake_128f_free            (free_key_fn *)ossl_slh_dsa_key_free
-# define slh_dsa_shake_128f_check           NULL
-# define slh_dsa_shake_128f_adjust          NULL
-
-# define slh_dsa_shake_192s_evp_type        EVP_PKEY_SLH_DSA_SHAKE_192S
-# define slh_dsa_shake_192s_d2i_private_key NULL
-# define slh_dsa_shake_192s_d2i_public_key  NULL
-# define slh_dsa_shake_192s_d2i_key_params  NULL
-# define slh_dsa_shake_192s_d2i_PKCS8       slh_dsa_d2i_PKCS8
-# define slh_dsa_shake_192s_d2i_PUBKEY      slh_dsa_d2i_PUBKEY
-# define slh_dsa_shake_192s_free            (free_key_fn *)ossl_slh_dsa_key_free
-# define slh_dsa_shake_192s_check           NULL
-# define slh_dsa_shake_192s_adjust          NULL
-
-# define slh_dsa_shake_192f_evp_type        EVP_PKEY_SLH_DSA_SHAKE_192F
-# define slh_dsa_shake_192f_d2i_private_key NULL
-# define slh_dsa_shake_192f_d2i_public_key  NULL
-# define slh_dsa_shake_192f_d2i_key_params  NULL
-# define slh_dsa_shake_192f_d2i_PKCS8       slh_dsa_d2i_PKCS8
-# define slh_dsa_shake_192f_d2i_PUBKEY      slh_dsa_d2i_PUBKEY
-# define slh_dsa_shake_192f_free            (free_key_fn *)ossl_slh_dsa_key_free
-# define slh_dsa_shake_192f_check           NULL
-# define slh_dsa_shake_192f_adjust          NULL
-
-# define slh_dsa_shake_256s_evp_type        EVP_PKEY_SLH_DSA_SHAKE_256S
-# define slh_dsa_shake_256s_d2i_private_key NULL
-# define slh_dsa_shake_256s_d2i_public_key  NULL
-# define slh_dsa_shake_256s_d2i_key_params  NULL
-# define slh_dsa_shake_256s_d2i_PKCS8       slh_dsa_d2i_PKCS8
-# define slh_dsa_shake_256s_d2i_PUBKEY      slh_dsa_d2i_PUBKEY
-# define slh_dsa_shake_256s_free            (free_key_fn *)ossl_slh_dsa_key_free
-# define slh_dsa_shake_256s_check           NULL
-# define slh_dsa_shake_256s_adjust          NULL
-
-# define slh_dsa_shake_256f_evp_type        EVP_PKEY_SLH_DSA_SHAKE_256F
-# define slh_dsa_shake_256f_d2i_private_key NULL
-# define slh_dsa_shake_256f_d2i_public_key  NULL
-# define slh_dsa_shake_256f_d2i_key_params  NULL
-# define slh_dsa_shake_256f_d2i_PKCS8       slh_dsa_d2i_PKCS8
-# define slh_dsa_shake_256f_d2i_PUBKEY      slh_dsa_d2i_PUBKEY
-# define slh_dsa_shake_256f_free            (free_key_fn *)ossl_slh_dsa_key_free
-# define slh_dsa_shake_256f_check           NULL
-# define slh_dsa_shake_256f_adjust          NULL
+#define slh_dsa_sha2_128s_evp_type EVP_PKEY_SLH_DSA_SHA2_128S
+#define slh_dsa_sha2_128s_d2i_private_key NULL
+#define slh_dsa_sha2_128s_d2i_public_key NULL
+#define slh_dsa_sha2_128s_d2i_key_params NULL
+#define slh_dsa_sha2_128s_d2i_PKCS8 slh_dsa_d2i_PKCS8
+#define slh_dsa_sha2_128s_d2i_PUBKEY slh_dsa_d2i_PUBKEY
+#define slh_dsa_sha2_128s_free (free_key_fn *)ossl_slh_dsa_key_free
+#define slh_dsa_sha2_128s_check NULL
+#define slh_dsa_sha2_128s_adjust NULL
+
+#define slh_dsa_sha2_128f_evp_type EVP_PKEY_SLH_DSA_SHA2_128F
+#define slh_dsa_sha2_128f_d2i_private_key NULL
+#define slh_dsa_sha2_128f_d2i_public_key NULL
+#define slh_dsa_sha2_128f_d2i_key_params NULL
+#define slh_dsa_sha2_128f_d2i_PKCS8 slh_dsa_d2i_PKCS8
+#define slh_dsa_sha2_128f_d2i_PUBKEY slh_dsa_d2i_PUBKEY
+#define slh_dsa_sha2_128f_free (free_key_fn *)ossl_slh_dsa_key_free
+#define slh_dsa_sha2_128f_check NULL
+#define slh_dsa_sha2_128f_adjust NULL
+
+#define slh_dsa_sha2_192s_evp_type EVP_PKEY_SLH_DSA_SHA2_192S
+#define slh_dsa_sha2_192s_d2i_private_key NULL
+#define slh_dsa_sha2_192s_d2i_public_key NULL
+#define slh_dsa_sha2_192s_d2i_key_params NULL
+#define slh_dsa_sha2_192s_d2i_PKCS8 slh_dsa_d2i_PKCS8
+#define slh_dsa_sha2_192s_d2i_PUBKEY slh_dsa_d2i_PUBKEY
+#define slh_dsa_sha2_192s_free (free_key_fn *)ossl_slh_dsa_key_free
+#define slh_dsa_sha2_192s_check NULL
+#define slh_dsa_sha2_192s_adjust NULL
+
+#define slh_dsa_sha2_192f_evp_type EVP_PKEY_SLH_DSA_SHA2_192F
+#define slh_dsa_sha2_192f_d2i_private_key NULL
+#define slh_dsa_sha2_192f_d2i_public_key NULL
+#define slh_dsa_sha2_192f_d2i_key_params NULL
+#define slh_dsa_sha2_192f_d2i_PKCS8 slh_dsa_d2i_PKCS8
+#define slh_dsa_sha2_192f_d2i_PUBKEY slh_dsa_d2i_PUBKEY
+#define slh_dsa_sha2_192f_free (free_key_fn *)ossl_slh_dsa_key_free
+#define slh_dsa_sha2_192f_check NULL
+#define slh_dsa_sha2_192f_adjust NULL
+
+#define slh_dsa_sha2_256s_evp_type EVP_PKEY_SLH_DSA_SHA2_256S
+#define slh_dsa_sha2_256s_d2i_private_key NULL
+#define slh_dsa_sha2_256s_d2i_public_key NULL
+#define slh_dsa_sha2_256s_d2i_key_params NULL
+#define slh_dsa_sha2_256s_d2i_PKCS8 slh_dsa_d2i_PKCS8
+#define slh_dsa_sha2_256s_d2i_PUBKEY slh_dsa_d2i_PUBKEY
+#define slh_dsa_sha2_256s_free (free_key_fn *)ossl_slh_dsa_key_free
+#define slh_dsa_sha2_256s_check NULL
+#define slh_dsa_sha2_256s_adjust NULL
+
+#define slh_dsa_sha2_256f_evp_type EVP_PKEY_SLH_DSA_SHA2_256F
+#define slh_dsa_sha2_256f_d2i_private_key NULL
+#define slh_dsa_sha2_256f_d2i_public_key NULL
+#define slh_dsa_sha2_256f_d2i_key_params NULL
+#define slh_dsa_sha2_256f_d2i_PKCS8 slh_dsa_d2i_PKCS8
+#define slh_dsa_sha2_256f_d2i_PUBKEY slh_dsa_d2i_PUBKEY
+#define slh_dsa_sha2_256f_free (free_key_fn *)ossl_slh_dsa_key_free
+#define slh_dsa_sha2_256f_check NULL
+#define slh_dsa_sha2_256f_adjust NULL
+
+#define slh_dsa_shake_128s_evp_type EVP_PKEY_SLH_DSA_SHAKE_128S
+#define slh_dsa_shake_128s_d2i_private_key NULL
+#define slh_dsa_shake_128s_d2i_public_key NULL
+#define slh_dsa_shake_128s_d2i_key_params NULL
+#define slh_dsa_shake_128s_d2i_PKCS8 slh_dsa_d2i_PKCS8
+#define slh_dsa_shake_128s_d2i_PUBKEY slh_dsa_d2i_PUBKEY
+#define slh_dsa_shake_128s_free (free_key_fn *)ossl_slh_dsa_key_free
+#define slh_dsa_shake_128s_check NULL
+#define slh_dsa_shake_128s_adjust NULL
+
+#define slh_dsa_shake_128f_evp_type EVP_PKEY_SLH_DSA_SHAKE_128F
+#define slh_dsa_shake_128f_d2i_private_key NULL
+#define slh_dsa_shake_128f_d2i_public_key NULL
+#define slh_dsa_shake_128f_d2i_key_params NULL
+#define slh_dsa_shake_128f_d2i_PKCS8 slh_dsa_d2i_PKCS8
+#define slh_dsa_shake_128f_d2i_PUBKEY slh_dsa_d2i_PUBKEY
+#define slh_dsa_shake_128f_free (free_key_fn *)ossl_slh_dsa_key_free
+#define slh_dsa_shake_128f_check NULL
+#define slh_dsa_shake_128f_adjust NULL
+
+#define slh_dsa_shake_192s_evp_type EVP_PKEY_SLH_DSA_SHAKE_192S
+#define slh_dsa_shake_192s_d2i_private_key NULL
+#define slh_dsa_shake_192s_d2i_public_key NULL
+#define slh_dsa_shake_192s_d2i_key_params NULL
+#define slh_dsa_shake_192s_d2i_PKCS8 slh_dsa_d2i_PKCS8
+#define slh_dsa_shake_192s_d2i_PUBKEY slh_dsa_d2i_PUBKEY
+#define slh_dsa_shake_192s_free (free_key_fn *)ossl_slh_dsa_key_free
+#define slh_dsa_shake_192s_check NULL
+#define slh_dsa_shake_192s_adjust NULL
+
+#define slh_dsa_shake_192f_evp_type EVP_PKEY_SLH_DSA_SHAKE_192F
+#define slh_dsa_shake_192f_d2i_private_key NULL
+#define slh_dsa_shake_192f_d2i_public_key NULL
+#define slh_dsa_shake_192f_d2i_key_params NULL
+#define slh_dsa_shake_192f_d2i_PKCS8 slh_dsa_d2i_PKCS8
+#define slh_dsa_shake_192f_d2i_PUBKEY slh_dsa_d2i_PUBKEY
+#define slh_dsa_shake_192f_free (free_key_fn *)ossl_slh_dsa_key_free
+#define slh_dsa_shake_192f_check NULL
+#define slh_dsa_shake_192f_adjust NULL
+
+#define slh_dsa_shake_256s_evp_type EVP_PKEY_SLH_DSA_SHAKE_256S
+#define slh_dsa_shake_256s_d2i_private_key NULL
+#define slh_dsa_shake_256s_d2i_public_key NULL
+#define slh_dsa_shake_256s_d2i_key_params NULL
+#define slh_dsa_shake_256s_d2i_PKCS8 slh_dsa_d2i_PKCS8
+#define slh_dsa_shake_256s_d2i_PUBKEY slh_dsa_d2i_PUBKEY
+#define slh_dsa_shake_256s_free (free_key_fn *)ossl_slh_dsa_key_free
+#define slh_dsa_shake_256s_check NULL
+#define slh_dsa_shake_256s_adjust NULL
+
+#define slh_dsa_shake_256f_evp_type EVP_PKEY_SLH_DSA_SHAKE_256F
+#define slh_dsa_shake_256f_d2i_private_key NULL
+#define slh_dsa_shake_256f_d2i_public_key NULL
+#define slh_dsa_shake_256f_d2i_key_params NULL
+#define slh_dsa_shake_256f_d2i_PKCS8 slh_dsa_d2i_PKCS8
+#define slh_dsa_shake_256f_d2i_PUBKEY slh_dsa_d2i_PUBKEY
+#define slh_dsa_shake_256f_free (free_key_fn *)ossl_slh_dsa_key_free
+#define slh_dsa_shake_256f_check NULL
+#define slh_dsa_shake_256f_adjust NULL
 #endif /* OPENSSL_NO_SLH_DSA */
 
 /* ---------------------------------------------------------------------- */
 
-#define rsa_evp_type                    EVP_PKEY_RSA
-#define rsa_d2i_private_key             (d2i_of_void *)d2i_RSAPrivateKey
-#define rsa_d2i_public_key              (d2i_of_void *)d2i_RSAPublicKey
-#define rsa_d2i_key_params              NULL
-#define rsa_free                        (free_key_fn *)RSA_free
+#define rsa_evp_type EVP_PKEY_RSA
+#define rsa_d2i_private_key (d2i_of_void *)d2i_RSAPrivateKey
+#define rsa_d2i_public_key (d2i_of_void *)d2i_RSAPublicKey
+#define rsa_d2i_key_params NULL
+#define rsa_free (free_key_fn *)RSA_free
 
 static void *rsa_d2i_PKCS8(const unsigned char **der, long der_len,
-                           struct der2key_ctx_st *ctx)
+    struct der2key_ctx_st *ctx)
 {
     return der2key_decode_p8(der, der_len, ctx,
-                             (key_from_pkcs8_t *)ossl_rsa_key_from_pkcs8);
+        (key_from_pkcs8_t *)ossl_rsa_key_from_pkcs8);
 }
 
 static void *
 rsa_d2i_PUBKEY(const unsigned char **der, long der_len,
-               ossl_unused struct der2key_ctx_st *ctx)
+    ossl_unused struct der2key_ctx_st *ctx)
 {
     return d2i_RSA_PUBKEY(NULL, der, der_len);
 }
@@ -932,15 +929,15 @@ static void rsa_adjust(void *key, struct der2key_ctx_st *ctx)
     ossl_rsa_set0_libctx(key, PROV_LIBCTX_OF(ctx->provctx));
 }
 
-#define rsapss_evp_type                 EVP_PKEY_RSA_PSS
-#define rsapss_d2i_private_key          (d2i_of_void *)d2i_RSAPrivateKey
-#define rsapss_d2i_public_key           (d2i_of_void *)d2i_RSAPublicKey
-#define rsapss_d2i_key_params           NULL
-#define rsapss_d2i_PKCS8                rsa_d2i_PKCS8
-#define rsapss_d2i_PUBKEY               rsa_d2i_PUBKEY
-#define rsapss_free                     (free_key_fn *)RSA_free
-#define rsapss_check                    rsa_check
-#define rsapss_adjust                   rsa_adjust
+#define rsapss_evp_type EVP_PKEY_RSA_PSS
+#define rsapss_d2i_private_key (d2i_of_void *)d2i_RSAPrivateKey
+#define rsapss_d2i_public_key (d2i_of_void *)d2i_RSAPublicKey
+#define rsapss_d2i_key_params NULL
+#define rsapss_d2i_PKCS8 rsa_d2i_PKCS8
+#define rsapss_d2i_PUBKEY rsa_d2i_PUBKEY
+#define rsapss_free (free_key_fn *)RSA_free
+#define rsapss_check rsa_check
+#define rsapss_adjust rsa_adjust
 
 /* ---------------------------------------------------------------------- */
 
@@ -951,53 +948,53 @@ ml_dsa_d2i_PKCS8(const uint8_t **der, long der_len, struct der2key_ctx_st *ctx)
     ML_DSA_KEY *key;
 
     key = ossl_ml_dsa_d2i_PKCS8(*der, der_len, ctx->desc->evp_type,
-                                ctx->provctx, ctx->propq);
+        ctx->provctx, ctx->propq);
     if (key != NULL)
         *der += der_len;
     return key;
 }
 
-static ossl_inline void * ml_dsa_d2i_PUBKEY(const uint8_t **der, long der_len,
-                                            struct der2key_ctx_st *ctx)
+static ossl_inline void *ml_dsa_d2i_PUBKEY(const uint8_t **der, long der_len,
+    struct der2key_ctx_st *ctx)
 {
     ML_DSA_KEY *key;
 
     key = ossl_ml_dsa_d2i_PUBKEY(*der, der_len, ctx->desc->evp_type,
-                                 ctx->provctx, ctx->propq);
+        ctx->provctx, ctx->propq);
     if (key != NULL)
         *der += der_len;
     return key;
 }
 
-# define ml_dsa_44_evp_type                EVP_PKEY_ML_DSA_44
-# define ml_dsa_44_d2i_private_key         NULL
-# define ml_dsa_44_d2i_public_key          NULL
-# define ml_dsa_44_d2i_key_params          NULL
-# define ml_dsa_44_d2i_PUBKEY              ml_dsa_d2i_PUBKEY
-# define ml_dsa_44_d2i_PKCS8               ml_dsa_d2i_PKCS8
-# define ml_dsa_44_free                    (free_key_fn *)ossl_ml_dsa_key_free
-# define ml_dsa_44_check                   NULL
-# define ml_dsa_44_adjust                  NULL
-
-# define ml_dsa_65_evp_type                EVP_PKEY_ML_DSA_65
-# define ml_dsa_65_d2i_private_key         NULL
-# define ml_dsa_65_d2i_public_key          NULL
-# define ml_dsa_65_d2i_key_params          NULL
-# define ml_dsa_65_d2i_PUBKEY              ml_dsa_d2i_PUBKEY
-# define ml_dsa_65_d2i_PKCS8               ml_dsa_d2i_PKCS8
-# define ml_dsa_65_free                    (free_key_fn *)ossl_ml_dsa_key_free
-# define ml_dsa_65_check                   NULL
-# define ml_dsa_65_adjust                  NULL
-
-# define ml_dsa_87_evp_type               EVP_PKEY_ML_DSA_87
-# define ml_dsa_87_d2i_private_key        NULL
-# define ml_dsa_87_d2i_public_key         NULL
-# define ml_dsa_87_d2i_PUBKEY             ml_dsa_d2i_PUBKEY
-# define ml_dsa_87_d2i_PKCS8              ml_dsa_d2i_PKCS8
-# define ml_dsa_87_d2i_key_params         NULL
-# define ml_dsa_87_free                   (free_key_fn *)ossl_ml_dsa_key_free
-# define ml_dsa_87_check                  NULL
-# define ml_dsa_87_adjust                 NULL
+#define ml_dsa_44_evp_type EVP_PKEY_ML_DSA_44
+#define ml_dsa_44_d2i_private_key NULL
+#define ml_dsa_44_d2i_public_key NULL
+#define ml_dsa_44_d2i_key_params NULL
+#define ml_dsa_44_d2i_PUBKEY ml_dsa_d2i_PUBKEY
+#define ml_dsa_44_d2i_PKCS8 ml_dsa_d2i_PKCS8
+#define ml_dsa_44_free (free_key_fn *)ossl_ml_dsa_key_free
+#define ml_dsa_44_check NULL
+#define ml_dsa_44_adjust NULL
+
+#define ml_dsa_65_evp_type EVP_PKEY_ML_DSA_65
+#define ml_dsa_65_d2i_private_key NULL
+#define ml_dsa_65_d2i_public_key NULL
+#define ml_dsa_65_d2i_key_params NULL
+#define ml_dsa_65_d2i_PUBKEY ml_dsa_d2i_PUBKEY
+#define ml_dsa_65_d2i_PKCS8 ml_dsa_d2i_PKCS8
+#define ml_dsa_65_free (free_key_fn *)ossl_ml_dsa_key_free
+#define ml_dsa_65_check NULL
+#define ml_dsa_65_adjust NULL
+
+#define ml_dsa_87_evp_type EVP_PKEY_ML_DSA_87
+#define ml_dsa_87_d2i_private_key NULL
+#define ml_dsa_87_d2i_public_key NULL
+#define ml_dsa_87_d2i_PUBKEY ml_dsa_d2i_PUBKEY
+#define ml_dsa_87_d2i_PKCS8 ml_dsa_d2i_PKCS8
+#define ml_dsa_87_d2i_key_params NULL
+#define ml_dsa_87_free (free_key_fn *)ossl_ml_dsa_key_free
+#define ml_dsa_87_check NULL
+#define ml_dsa_87_adjust NULL
 
 #endif
 
@@ -1007,162 +1004,162 @@ static ossl_inline void * ml_dsa_d2i_PUBKEY(const uint8_t **der, long der_len,
  * The DO_ macros help define the selection mask and the method functions
  * for each kind of object we want to decode.
  */
-#define DO_type_specific_keypair(keytype)               \
-    "type-specific", keytype##_evp_type,                \
-        ( OSSL_KEYMGMT_SELECT_KEYPAIR ),                \
-        keytype##_d2i_private_key,                      \
-        keytype##_d2i_public_key,                       \
-        NULL,                                           \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_type_specific_keypair(keytype) \
+    "type-specific", keytype##_evp_type,  \
+        (OSSL_KEYMGMT_SELECT_KEYPAIR),    \
+        keytype##_d2i_private_key,        \
+        keytype##_d2i_public_key,         \
+        NULL,                             \
+        NULL,                             \
+        NULL,                             \
+        keytype##_check,                  \
+        keytype##_adjust,                 \
         keytype##_free
 
-#define DO_type_specific_pub(keytype)                   \
-    "type-specific", keytype##_evp_type,                \
-        ( OSSL_KEYMGMT_SELECT_PUBLIC_KEY ),             \
-        NULL,                                           \
-        keytype##_d2i_public_key,                       \
-        NULL,                                           \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_type_specific_pub(keytype)     \
+    "type-specific", keytype##_evp_type,  \
+        (OSSL_KEYMGMT_SELECT_PUBLIC_KEY), \
+        NULL,                             \
+        keytype##_d2i_public_key,         \
+        NULL,                             \
+        NULL,                             \
+        NULL,                             \
+        keytype##_check,                  \
+        keytype##_adjust,                 \
         keytype##_free
 
-#define DO_type_specific_priv(keytype)                  \
-    "type-specific", keytype##_evp_type,                \
-        ( OSSL_KEYMGMT_SELECT_PRIVATE_KEY ),            \
-        keytype##_d2i_private_key,                      \
-        NULL,                                           \
-        NULL,                                           \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_type_specific_priv(keytype)     \
+    "type-specific", keytype##_evp_type,   \
+        (OSSL_KEYMGMT_SELECT_PRIVATE_KEY), \
+        keytype##_d2i_private_key,         \
+        NULL,                              \
+        NULL,                              \
+        NULL,                              \
+        NULL,                              \
+        keytype##_check,                   \
+        keytype##_adjust,                  \
         keytype##_free
 
-#define DO_type_specific_params(keytype)                \
-    "type-specific", keytype##_evp_type,                \
-        ( OSSL_KEYMGMT_SELECT_ALL_PARAMETERS ),         \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_d2i_key_params,                       \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_type_specific_params(keytype)      \
+    "type-specific", keytype##_evp_type,      \
+        (OSSL_KEYMGMT_SELECT_ALL_PARAMETERS), \
+        NULL,                                 \
+        NULL,                                 \
+        keytype##_d2i_key_params,             \
+        NULL,                                 \
+        NULL,                                 \
+        keytype##_check,                      \
+        keytype##_adjust,                     \
         keytype##_free
 
-#define DO_type_specific(keytype)                       \
-    "type-specific", keytype##_evp_type,                \
-        ( OSSL_KEYMGMT_SELECT_ALL ),                    \
-        keytype##_d2i_private_key,                      \
-        keytype##_d2i_public_key,                       \
-        keytype##_d2i_key_params,                       \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_type_specific(keytype)        \
+    "type-specific", keytype##_evp_type, \
+        (OSSL_KEYMGMT_SELECT_ALL),       \
+        keytype##_d2i_private_key,       \
+        keytype##_d2i_public_key,        \
+        keytype##_d2i_key_params,        \
+        NULL,                            \
+        NULL,                            \
+        keytype##_check,                 \
+        keytype##_adjust,                \
         keytype##_free
 
-#define DO_type_specific_no_pub(keytype)                \
-    "type-specific", keytype##_evp_type,                \
-        ( OSSL_KEYMGMT_SELECT_PRIVATE_KEY               \
-          | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS ),       \
-        keytype##_d2i_private_key,                      \
-        NULL,                                           \
-        keytype##_d2i_key_params,                       \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_type_specific_no_pub(keytype)           \
+    "type-specific", keytype##_evp_type,           \
+        (OSSL_KEYMGMT_SELECT_PRIVATE_KEY           \
+            | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS), \
+        keytype##_d2i_private_key,                 \
+        NULL,                                      \
+        keytype##_d2i_key_params,                  \
+        NULL,                                      \
+        NULL,                                      \
+        keytype##_check,                           \
+        keytype##_adjust,                          \
         keytype##_free
 
-#define DO_PrivateKeyInfo(keytype)                      \
-    "PrivateKeyInfo", keytype##_evp_type,               \
-        ( OSSL_KEYMGMT_SELECT_PRIVATE_KEY ),            \
-        NULL,                                           \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_d2i_PKCS8,                            \
-        NULL,                                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_PrivateKeyInfo(keytype)         \
+    "PrivateKeyInfo", keytype##_evp_type,  \
+        (OSSL_KEYMGMT_SELECT_PRIVATE_KEY), \
+        NULL,                              \
+        NULL,                              \
+        NULL,                              \
+        keytype##_d2i_PKCS8,               \
+        NULL,                              \
+        keytype##_check,                   \
+        keytype##_adjust,                  \
         keytype##_free
 
-#define DO_SubjectPublicKeyInfo(keytype)                \
-    "SubjectPublicKeyInfo", keytype##_evp_type,         \
-        ( OSSL_KEYMGMT_SELECT_PUBLIC_KEY ),             \
-        NULL,                                           \
-        NULL,                                           \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_d2i_PUBKEY,                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_SubjectPublicKeyInfo(keytype)        \
+    "SubjectPublicKeyInfo", keytype##_evp_type, \
+        (OSSL_KEYMGMT_SELECT_PUBLIC_KEY),       \
+        NULL,                                   \
+        NULL,                                   \
+        NULL,                                   \
+        NULL,                                   \
+        keytype##_d2i_PUBKEY,                   \
+        keytype##_check,                        \
+        keytype##_adjust,                       \
         keytype##_free
 
-#define DO_DH(keytype)                                  \
-    "DH", keytype##_evp_type,                           \
-        ( OSSL_KEYMGMT_SELECT_ALL_PARAMETERS ),         \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_d2i_key_params,                       \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_DH(keytype)                        \
+    "DH", keytype##_evp_type,                 \
+        (OSSL_KEYMGMT_SELECT_ALL_PARAMETERS), \
+        NULL,                                 \
+        NULL,                                 \
+        keytype##_d2i_key_params,             \
+        NULL,                                 \
+        NULL,                                 \
+        keytype##_check,                      \
+        keytype##_adjust,                     \
         keytype##_free
 
-#define DO_DHX(keytype)                                 \
-    "DHX", keytype##_evp_type,                          \
-        ( OSSL_KEYMGMT_SELECT_ALL_PARAMETERS ),         \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_d2i_key_params,                       \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_DHX(keytype)                       \
+    "DHX", keytype##_evp_type,                \
+        (OSSL_KEYMGMT_SELECT_ALL_PARAMETERS), \
+        NULL,                                 \
+        NULL,                                 \
+        keytype##_d2i_key_params,             \
+        NULL,                                 \
+        NULL,                                 \
+        keytype##_check,                      \
+        keytype##_adjust,                     \
         keytype##_free
 
-#define DO_DSA(keytype)                                 \
-    "DSA", keytype##_evp_type,                          \
-        ( OSSL_KEYMGMT_SELECT_ALL ),                    \
-        keytype##_d2i_private_key,                      \
-        keytype##_d2i_public_key,                       \
-        keytype##_d2i_key_params,                       \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_DSA(keytype)            \
+    "DSA", keytype##_evp_type,     \
+        (OSSL_KEYMGMT_SELECT_ALL), \
+        keytype##_d2i_private_key, \
+        keytype##_d2i_public_key,  \
+        keytype##_d2i_key_params,  \
+        NULL,                      \
+        NULL,                      \
+        keytype##_check,           \
+        keytype##_adjust,          \
         keytype##_free
 
-#define DO_EC(keytype)                                  \
-    "EC", keytype##_evp_type,                           \
-        ( OSSL_KEYMGMT_SELECT_PRIVATE_KEY               \
-          | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS ),       \
-        keytype##_d2i_private_key,                      \
-        NULL,                                           \
-        keytype##_d2i_key_params,                       \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_EC(keytype)                             \
+    "EC", keytype##_evp_type,                      \
+        (OSSL_KEYMGMT_SELECT_PRIVATE_KEY           \
+            | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS), \
+        keytype##_d2i_private_key,                 \
+        NULL,                                      \
+        keytype##_d2i_key_params,                  \
+        NULL,                                      \
+        NULL,                                      \
+        keytype##_check,                           \
+        keytype##_adjust,                          \
         keytype##_free
 
-#define DO_RSA(keytype)                                 \
-    "RSA", keytype##_evp_type,                          \
-        ( OSSL_KEYMGMT_SELECT_KEYPAIR ),                \
-        keytype##_d2i_private_key,                      \
-        keytype##_d2i_public_key,                       \
-        NULL,                                           \
-        NULL,                                           \
-        NULL,                                           \
-        keytype##_check,                                \
-        keytype##_adjust,                               \
+#define DO_RSA(keytype)                \
+    "RSA", keytype##_evp_type,         \
+        (OSSL_KEYMGMT_SELECT_KEYPAIR), \
+        keytype##_d2i_private_key,     \
+        keytype##_d2i_public_key,      \
+        NULL,                          \
+        NULL,                          \
+        NULL,                          \
+        keytype##_check,               \
+        keytype##_adjust,              \
         keytype##_free
 
 /*
@@ -1182,41 +1179,41 @@ static ossl_inline void * ml_dsa_d2i_PUBKEY(const uint8_t **der, long der_len,
  *              the DO_##kind macros above, to populate the keytype_desc_st
  *              structure.
  */
-#define MAKE_DECODER(keytype_name, keytype, type, kind)                 \
-    static const struct keytype_desc_st kind##_##keytype##_desc =       \
-        { keytype_name, ossl_##keytype##_keymgmt_functions,             \
-          DO_##kind(keytype) };                                         \
-                                                                        \
-    static OSSL_FUNC_decoder_newctx_fn kind##_der2##keytype##_newctx;   \
-                                                                        \
-    static void *kind##_der2##keytype##_newctx(void *provctx)           \
-    {                                                                   \
-        return der2key_newctx(provctx, &kind##_##keytype##_desc);       \
-    }                                                                   \
-    static int kind##_der2##keytype##_does_selection(void *provctx,     \
-                                                     int selection)     \
-    {                                                                   \
-        return der2key_check_selection(selection,                       \
-                                       &kind##_##keytype##_desc);       \
-    }                                                                   \
-    const OSSL_DISPATCH                                                 \
-    ossl_##kind##_der_to_##keytype##_decoder_functions[] = {            \
-        { OSSL_FUNC_DECODER_NEWCTX,                                     \
-          (void (*)(void))kind##_der2##keytype##_newctx },              \
-        { OSSL_FUNC_DECODER_FREECTX,                                    \
-          (void (*)(void))der2key_freectx },                            \
-        { OSSL_FUNC_DECODER_DOES_SELECTION,                             \
-          (void (*)(void))kind##_der2##keytype##_does_selection },      \
-        { OSSL_FUNC_DECODER_DECODE,                                     \
-          (void (*)(void))der2key_decode },                             \
-        { OSSL_FUNC_DECODER_EXPORT_OBJECT,                              \
-          (void (*)(void))der2key_export_object },                      \
-        { OSSL_FUNC_DECODER_SETTABLE_CTX_PARAMS,                        \
-          (void (*)(void))der2key_settable_ctx_params },                \
-        { OSSL_FUNC_DECODER_SET_CTX_PARAMS,                             \
-          (void (*)(void))der2key_set_ctx_params },                     \
-        OSSL_DISPATCH_END                                               \
-    }
+#define MAKE_DECODER(keytype_name, keytype, type, kind)                                                               \
+    static const struct keytype_desc_st kind##_##keytype##_desc = { keytype_name, ossl_##keytype##_keymgmt_functions, \
+        DO_##kind(keytype) };                                                                                         \
+                                                                                                                      \
+    static OSSL_FUNC_decoder_newctx_fn kind##_der2##keytype##_newctx;                                                 \
+                                                                                                                      \
+    static void *kind##_der2##keytype##_newctx(void *provctx)                                                         \
+    {                                                                                                                 \
+        return der2key_newctx(provctx, &kind##_##keytype##_desc);                                                     \
+    }                                                                                                                 \
+    static int kind##_der2##keytype##_does_selection(void *provctx,                                                   \
+        int selection)                                                                                                \
+    {                                                                                                                 \
+        return der2key_check_selection(selection,                                                                     \
+            &kind##_##keytype##_desc);                                                                                \
+    }                                                                                                                 \
+    const OSSL_DISPATCH                                                                                               \
+        ossl_##kind##_der_to_##keytype##_decoder_functions[]                                                          \
+        = {                                                                                                           \
+              { OSSL_FUNC_DECODER_NEWCTX,                                                                             \
+                  (void (*)(void))kind##_der2##keytype##_newctx },                                                    \
+              { OSSL_FUNC_DECODER_FREECTX,                                                                            \
+                  (void (*)(void))der2key_freectx },                                                                  \
+              { OSSL_FUNC_DECODER_DOES_SELECTION,                                                                     \
+                  (void (*)(void))kind##_der2##keytype##_does_selection },                                            \
+              { OSSL_FUNC_DECODER_DECODE,                                                                             \
+                  (void (*)(void))der2key_decode },                                                                   \
+              { OSSL_FUNC_DECODER_EXPORT_OBJECT,                                                                      \
+                  (void (*)(void))der2key_export_object },                                                            \
+              { OSSL_FUNC_DECODER_SETTABLE_CTX_PARAMS,                                                                \
+                  (void (*)(void))der2key_settable_ctx_params },                                                      \
+              { OSSL_FUNC_DECODER_SET_CTX_PARAMS,                                                                     \
+                  (void (*)(void))der2key_set_ctx_params },                                                           \
+              OSSL_DISPATCH_END                                                                                       \
+          }
 
 #ifndef OPENSSL_NO_DH
 MAKE_DECODER("DH", dh, dh, PrivateKeyInfo);
@@ -1239,7 +1236,7 @@ MAKE_DECODER("EC", ec, ec, PrivateKeyInfo);
 MAKE_DECODER("EC", ec, ec, SubjectPublicKeyInfo);
 MAKE_DECODER("EC", ec, ec, type_specific_no_pub);
 MAKE_DECODER("EC", ec, ec, EC);
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 MAKE_DECODER("X25519", x25519, ecx, PrivateKeyInfo);
 MAKE_DECODER("X25519", x25519, ecx, SubjectPublicKeyInfo);
 MAKE_DECODER("X448", x448, ecx, PrivateKeyInfo);
@@ -1248,12 +1245,12 @@ MAKE_DECODER("ED25519", ed25519, ecx, PrivateKeyInfo);
 MAKE_DECODER("ED25519", ed25519, ecx, SubjectPublicKeyInfo);
 MAKE_DECODER("ED448", ed448, ecx, PrivateKeyInfo);
 MAKE_DECODER("ED448", ed448, ecx, SubjectPublicKeyInfo);
-# endif
-# ifndef OPENSSL_NO_SM2
+#endif
+#ifndef OPENSSL_NO_SM2
 MAKE_DECODER("SM2", sm2, ec, PrivateKeyInfo);
 MAKE_DECODER("SM2", sm2, ec, SubjectPublicKeyInfo);
 MAKE_DECODER("SM2", sm2, sm2, type_specific_no_pub);
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_ML_KEM
 MAKE_DECODER("ML-KEM-512", ml_kem_512, ml_kem_512, PrivateKeyInfo);
diff --git a/providers/implementations/encode_decode/decode_epki2pki.c b/providers/implementations/encode_decode/decode_epki2pki.c
index aecf2eb4f2b44..2f472597978ca 100644
--- a/providers/implementations/encode_decode/decode_epki2pki.c
+++ b/providers/implementations/encode_decode/decode_epki2pki.c
@@ -82,8 +82,8 @@ static int epki2pki_set_ctx_params(void *vctx, const OSSL_PARAM params[])
  * PrivateKeyInfo.
  */
 static int epki2pki_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
-                           OSSL_CALLBACK *data_cb, void *data_cbarg,
-                           OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct epki2pki_ctx_st *ctx = vctx;
     BUF_MEM *mem = NULL;
@@ -107,23 +107,23 @@ static int epki2pki_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     OPENSSL_free(mem);
 
     ok = ossl_epki2pki_der_decode(der, der_len, selection, data_cb, data_cbarg,
-                                  pw_cb, pw_cbarg, PROV_LIBCTX_OF(ctx->provctx),
-                                  ctx->propq);
+        pw_cb, pw_cbarg, PROV_LIBCTX_OF(ctx->provctx),
+        ctx->propq);
     OPENSSL_free(der);
     return ok;
 }
 
 int ossl_epki2pki_der_decode(unsigned char *der, long der_len, int selection,
-                             OSSL_CALLBACK *data_cb, void *data_cbarg,
-                             OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg,
-                             OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     const unsigned char *pder = der;
     unsigned char *new_der = NULL;
     X509_SIG *p8 = NULL;
     PKCS8_PRIV_KEY_INFO *p8inf = NULL;
     const X509_ALGOR *alg = NULL;
-    int ok = 1;     /* Assume good */
+    int ok = 1; /* Assume good */
 
     ERR_set_mark();
     if ((p8 = d2i_X509_SIG(NULL, &pder, der_len)) != NULL) {
@@ -141,9 +141,9 @@ int ossl_epki2pki_der_decode(unsigned char *der, long der_len, int selection,
 
             X509_SIG_get0(p8, &alg, &oct);
             if (!PKCS12_pbe_crypt_ex(alg, pbuf, plen,
-                                     oct->data, oct->length,
-                                     &new_der, &new_der_len, 0,
-                                     libctx, propq)) {
+                    oct->data, oct->length,
+                    &new_der, &new_der_len, 0,
+                    libctx, propq)) {
                 ok = 0;
             } else {
                 der = new_der;
@@ -173,13 +173,13 @@ int ossl_epki2pki_der_decode(unsigned char *der, long der_len, int selection,
         OBJ_obj2txt(keytype, sizeof(keytype), alg->algorithm, 0);
 
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
-                                                keytype, 0);
+            keytype, 0);
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_INPUT_TYPE,
-                                                "DER", 0);
+            "DER", 0);
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
-                                                "PrivateKeyInfo", 0);
+            "PrivateKeyInfo", 0);
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_DATA,
-                                                 der, der_len);
+            der, der_len);
         *p++ = OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &objtype);
         *p = OSSL_PARAM_construct_end();
 
@@ -195,8 +195,8 @@ const OSSL_DISPATCH ossl_EncryptedPrivateKeyInfo_der_to_der_decoder_functions[]
     { OSSL_FUNC_DECODER_FREECTX, (void (*)(void))epki2pki_freectx },
     { OSSL_FUNC_DECODER_DECODE, (void (*)(void))epki2pki_decode },
     { OSSL_FUNC_DECODER_SETTABLE_CTX_PARAMS,
-      (void (*)(void))epki2pki_settable_ctx_params },
+        (void (*)(void))epki2pki_settable_ctx_params },
     { OSSL_FUNC_DECODER_SET_CTX_PARAMS,
-      (void (*)(void))epki2pki_set_ctx_params },
+        (void (*)(void))epki2pki_set_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/encode_decode/decode_msblob2key.c b/providers/implementations/encode_decode/decode_msblob2key.c
index df327210f1140..87e532acc4073 100644
--- a/providers/implementations/encode_decode/decode_msblob2key.c
+++ b/providers/implementations/encode_decode/decode_msblob2key.c
@@ -20,24 +20,24 @@
 #include <openssl/core_object.h>
 #include <openssl/crypto.h>
 #include <openssl/params.h>
-#include <openssl/pem.h>         /* For public PVK functions */
+#include <openssl/pem.h> /* For public PVK functions */
 #include <openssl/x509.h>
 #include <openssl/err.h>
 #include "internal/passphrase.h"
-#include "crypto/pem.h"          /* For internal PVK and "blob" headers */
+#include "crypto/pem.h" /* For internal PVK and "blob" headers */
 #include "crypto/rsa.h"
 #include "prov/bio.h"
 #include "prov/implementations.h"
 #include "endecoder_local.h"
 
-struct msblob2key_ctx_st;            /* Forward declaration */
+struct msblob2key_ctx_st; /* Forward declaration */
 typedef void *b2i_of_void_fn(const unsigned char **in, unsigned int bitlen,
-                             int ispub);
+    int ispub);
 typedef void adjust_key_fn(void *, struct msblob2key_ctx_st *ctx);
 typedef void free_key_fn(void *);
 struct keytype_desc_st {
-    int type;                 /* EVP key type */
-    const char *name;         /* Keytype */
+    int type; /* EVP key type */
+    const char *name; /* Keytype */
     const OSSL_DISPATCH *fns; /* Keymgmt (to pilfer functions from) */
 
     b2i_of_void_fn *read_private_key;
@@ -84,16 +84,15 @@ static int msblob2key_does_selection(void *provctx, int selection)
     if (selection == 0)
         return 1;
 
-    if ((selection & (OSSL_KEYMGMT_SELECT_PRIVATE_KEY
-                      | OSSL_KEYMGMT_SELECT_PUBLIC_KEY))  != 0)
+    if ((selection & (OSSL_KEYMGMT_SELECT_PRIVATE_KEY | OSSL_KEYMGMT_SELECT_PUBLIC_KEY)) != 0)
         return 1;
 
     return 0;
 }
 
 static int msblob2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
-                             OSSL_CALLBACK *data_cb, void *data_cbarg,
-                             OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct msblob2key_ctx_st *ctx = vctx;
     BIO *in = ossl_bio_new_from_core_bio(ctx->provctx, cin);
@@ -120,7 +119,7 @@ static int msblob2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
         goto next;
 
     ctx->selection = selection;
-    ok = 0;                      /* Assume that we fail */
+    ok = 0; /* Assume that we fail */
 
     if ((isdss && ctx->desc->type != EVP_PKEY_DSA)
         || (!isdss && ctx->desc->type != EVP_PKEY_RSA))
@@ -141,7 +140,7 @@ static int msblob2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     }
 
     if ((selection == 0
-         || (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0)
+            || (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0)
         && !ispub
         && ctx->desc->read_private_key != NULL) {
         struct ossl_passphrase_data_st pwdata;
@@ -154,8 +153,7 @@ static int msblob2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
         if (selection != 0 && key == NULL)
             goto next;
     }
-    if (key == NULL && (selection == 0
-         || (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0)
+    if (key == NULL && (selection == 0 || (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0)
         && ispub
         && ctx->desc->read_public_key != NULL) {
         p = buf;
@@ -167,7 +165,7 @@ static int msblob2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     if (key != NULL && ctx->desc->adjust_key != NULL)
         ctx->desc->adjust_key(key, ctx);
 
- next:
+next:
     /*
      * Indicated that we successfully decoded something, or not at all.
      * Ending up "empty handed" is not an error.
@@ -188,21 +186,18 @@ static int msblob2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
         OSSL_PARAM params[4];
         int object_type = OSSL_OBJECT_PKEY;
 
-        params[0] =
-            OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &object_type);
-        params[1] =
-            OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
-                                             (char *)ctx->desc->name, 0);
+        params[0] = OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &object_type);
+        params[1] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
+            (char *)ctx->desc->name, 0);
         /* The address of the key becomes the octet string */
-        params[2] =
-            OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_REFERENCE,
-                                              &key, sizeof(key));
+        params[2] = OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_REFERENCE,
+            &key, sizeof(key));
         params[3] = OSSL_PARAM_construct_end();
 
         ok = data_cb(params, data_cbarg);
     }
 
- end:
+end:
     BIO_free(in);
     OPENSSL_free(buf);
     ctx->desc->free_key(key);
@@ -212,12 +207,11 @@ static int msblob2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
 
 static int
 msblob2key_export_object(void *vctx,
-                         const void *reference, size_t reference_sz,
-                         OSSL_CALLBACK *export_cb, void *export_cbarg)
+    const void *reference, size_t reference_sz,
+    OSSL_CALLBACK *export_cb, void *export_cbarg)
 {
     struct msblob2key_ctx_st *ctx = vctx;
-    OSSL_FUNC_keymgmt_export_fn *export =
-        ossl_prov_get_keymgmt_export(ctx->desc->fns);
+    OSSL_FUNC_keymgmt_export_fn *export = ossl_prov_get_keymgmt_export(ctx->desc->fns);
     void *keydata;
 
     if (reference_sz == sizeof(keydata) && export != NULL) {
@@ -235,53 +229,54 @@ msblob2key_export_object(void *vctx,
 
 /* ---------------------------------------------------------------------- */
 
-#define dsa_decode_private_key  (b2i_of_void_fn *)ossl_b2i_DSA_after_header
-#define dsa_decode_public_key   (b2i_of_void_fn *)ossl_b2i_DSA_after_header
-#define dsa_adjust              NULL
-#define dsa_free                (void (*)(void *))DSA_free
+#define dsa_decode_private_key (b2i_of_void_fn *)ossl_b2i_DSA_after_header
+#define dsa_decode_public_key (b2i_of_void_fn *)ossl_b2i_DSA_after_header
+#define dsa_adjust NULL
+#define dsa_free (void (*)(void *)) DSA_free
 
 /* ---------------------------------------------------------------------- */
 
-#define rsa_decode_private_key  (b2i_of_void_fn *)ossl_b2i_RSA_after_header
-#define rsa_decode_public_key   (b2i_of_void_fn *)ossl_b2i_RSA_after_header
+#define rsa_decode_private_key (b2i_of_void_fn *)ossl_b2i_RSA_after_header
+#define rsa_decode_public_key (b2i_of_void_fn *)ossl_b2i_RSA_after_header
 
 static void rsa_adjust(void *key, struct msblob2key_ctx_st *ctx)
 {
     ossl_rsa_set0_libctx(key, PROV_LIBCTX_OF(ctx->provctx));
 }
 
-#define rsa_free                        (void (*)(void *))RSA_free
+#define rsa_free (void (*)(void *)) RSA_free
 
 /* ---------------------------------------------------------------------- */
 
-#define IMPLEMENT_MSBLOB(KEYTYPE, keytype)                              \
-    static const struct keytype_desc_st mstype##2##keytype##_desc = {   \
-        EVP_PKEY_##KEYTYPE, #KEYTYPE,                                   \
-        ossl_##keytype##_keymgmt_functions,                             \
-        keytype##_decode_private_key,                                   \
-        keytype##_decode_public_key,                                    \
-        keytype##_adjust,                                               \
-        keytype##_free                                                  \
-    };                                                                  \
-    static OSSL_FUNC_decoder_newctx_fn msblob2##keytype##_newctx;       \
-    static void *msblob2##keytype##_newctx(void *provctx)               \
-    {                                                                   \
-        return msblob2key_newctx(provctx, &mstype##2##keytype##_desc);  \
-    }                                                                   \
-    const OSSL_DISPATCH                                                 \
-    ossl_msblob_to_##keytype##_decoder_functions[] = {                  \
-        { OSSL_FUNC_DECODER_NEWCTX,                                     \
-          (void (*)(void))msblob2##keytype##_newctx },                  \
-        { OSSL_FUNC_DECODER_FREECTX,                                    \
-          (void (*)(void))msblob2key_freectx },                         \
-        { OSSL_FUNC_DECODER_DOES_SELECTION,                             \
-          (void (*)(void))msblob2key_does_selection },                  \
-        { OSSL_FUNC_DECODER_DECODE,                                     \
-          (void (*)(void))msblob2key_decode },                          \
-        { OSSL_FUNC_DECODER_EXPORT_OBJECT,                              \
-          (void (*)(void))msblob2key_export_object },                   \
-        OSSL_DISPATCH_END                                               \
-    }
+#define IMPLEMENT_MSBLOB(KEYTYPE, keytype)                             \
+    static const struct keytype_desc_st mstype##2##keytype##_desc = {  \
+        EVP_PKEY_##KEYTYPE, #KEYTYPE,                                  \
+        ossl_##keytype##_keymgmt_functions,                            \
+        keytype##_decode_private_key,                                  \
+        keytype##_decode_public_key,                                   \
+        keytype##_adjust,                                              \
+        keytype##_free                                                 \
+    };                                                                 \
+    static OSSL_FUNC_decoder_newctx_fn msblob2##keytype##_newctx;      \
+    static void *msblob2##keytype##_newctx(void *provctx)              \
+    {                                                                  \
+        return msblob2key_newctx(provctx, &mstype##2##keytype##_desc); \
+    }                                                                  \
+    const OSSL_DISPATCH                                                \
+        ossl_msblob_to_##keytype##_decoder_functions[]                 \
+        = {                                                            \
+              { OSSL_FUNC_DECODER_NEWCTX,                              \
+                  (void (*)(void))msblob2##keytype##_newctx },         \
+              { OSSL_FUNC_DECODER_FREECTX,                             \
+                  (void (*)(void))msblob2key_freectx },                \
+              { OSSL_FUNC_DECODER_DOES_SELECTION,                      \
+                  (void (*)(void))msblob2key_does_selection },         \
+              { OSSL_FUNC_DECODER_DECODE,                              \
+                  (void (*)(void))msblob2key_decode },                 \
+              { OSSL_FUNC_DECODER_EXPORT_OBJECT,                       \
+                  (void (*)(void))msblob2key_export_object },          \
+              OSSL_DISPATCH_END                                        \
+          }
 
 #ifndef OPENSSL_NO_DSA
 IMPLEMENT_MSBLOB(DSA, dsa);
diff --git a/providers/implementations/encode_decode/decode_pem2der.c b/providers/implementations/encode_decode/decode_pem2der.c
index abea679fe19af..7a8e35004d46d 100644
--- a/providers/implementations/encode_decode/decode_pem2der.c
+++ b/providers/implementations/encode_decode/decode_pem2der.c
@@ -31,8 +31,8 @@
 #include "endecoder_local.h"
 
 static int read_pem(PROV_CTX *provctx, OSSL_CORE_BIO *cin,
-                    char **pem_name, char **pem_header,
-                    unsigned char **data, long *len)
+    char **pem_name, char **pem_header,
+    unsigned char **data, long *len)
 {
     BIO *in = ossl_bio_new_from_core_bio(provctx, cin);
     int ok;
@@ -124,8 +124,8 @@ static int pem2der_pass_helper(char *buf, int num, int w, void *data)
 }
 
 static int pem2der_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
-                          OSSL_CALLBACK *data_cb, void *data_cbarg,
-                          OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     /*
      * PEM names we recognise.  Other PEM names should be recognised by
@@ -151,6 +151,7 @@ static int pem2der_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
         { PEM_STRING_DSAPARAMS, OSSL_OBJECT_PKEY, "DSA", "type-specific" },
         { PEM_STRING_ECPRIVATEKEY, OSSL_OBJECT_PKEY, "EC", "type-specific" },
         { PEM_STRING_ECPARAMETERS, OSSL_OBJECT_PKEY, "EC", "type-specific" },
+        { PEM_STRING_SM2PRIVATEKEY, OSSL_OBJECT_PKEY, "SM2", "type-specific" },
         { PEM_STRING_SM2PARAMETERS, OSSL_OBJECT_PKEY, "SM2", "type-specific" },
         { PEM_STRING_RSA, OSSL_OBJECT_PKEY, "RSA", "type-specific" },
         { PEM_STRING_RSA_PUBLIC, OSSL_OBJECT_PKEY, "RSA", "type-specific" },
@@ -174,7 +175,8 @@ static int pem2der_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     int objtype = OSSL_OBJECT_UNKNOWN;
 
     ok = read_pem(ctx->provctx, cin, &pem_name, &pem_header,
-                  &der, &der_len) > 0;
+             &der, &der_len)
+        > 0;
     /* We return "empty handed".  This is not an error. */
     if (!ok)
         return 1;
@@ -189,12 +191,12 @@ static int pem2der_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
         EVP_CIPHER_INFO cipher;
         struct pem2der_pass_data_st pass_data;
 
-        ok = 0;                  /* Assume that we fail */
+        ok = 0; /* Assume that we fail */
         pass_data.cb = pw_cb;
         pass_data.cbarg = pw_cbarg;
         if (!PEM_get_EVP_CIPHER_INFO(pem_header, &cipher)
             || !PEM_do_header(&cipher, der, &der_len,
-                              pem2der_pass_helper, &pass_data))
+                pem2der_pass_helper, &pass_data))
             goto end;
     }
 
@@ -224,9 +226,9 @@ static int pem2der_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
                 || OPENSSL_strcasecmp(ctx->data_structure, "EncryptedPrivateKeyInfo") == 0
                 || OPENSSL_strcasecmp(ctx->data_structure, "PrivateKeyInfo") == 0)) {
             ok = ossl_epki2pki_der_decode(der, der_len, selection, data_cb,
-                                          data_cbarg, pw_cb, pw_cbarg,
-                                          PROV_LIBCTX_OF(ctx->provctx),
-                                          ctx->propq);
+                data_cbarg, pw_cb, pw_cbarg,
+                PROV_LIBCTX_OF(ctx->provctx),
+                ctx->propq);
             goto end;
         }
 
@@ -234,35 +236,31 @@ static int pem2der_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
             && ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY)
                 || OPENSSL_strcasecmp(ctx->data_structure, "SubjectPublicKeyInfo") == 0)) {
             ok = ossl_spki2typespki_der_decode(der, der_len, selection, data_cb,
-                                               data_cbarg, pw_cb, pw_cbarg,
-                                               PROV_LIBCTX_OF(ctx->provctx),
-                                               ctx->propq);
+                data_cbarg, pw_cb, pw_cbarg,
+                PROV_LIBCTX_OF(ctx->provctx),
+                ctx->propq);
             goto end;
         }
 
         objtype = pem_name_map[i].object_type;
         if (data_type != NULL)
-            *p++ =
-                OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
-                                                 data_type, 0);
+            *p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
+                data_type, 0);
 
         /* We expect this to be read only so casting away the const is ok */
         if (data_structure != NULL)
-            *p++ =
-                OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
-                                                 data_structure, 0);
-        *p++ =
-            OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_DATA,
-                                              der, der_len);
-        *p++ =
-            OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &objtype);
+            *p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
+                data_structure, 0);
+        *p++ = OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_DATA,
+            der, der_len);
+        *p++ = OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &objtype);
 
         *p = OSSL_PARAM_construct_end();
 
         ok = data_cb(params, data_cbarg);
     }
 
- end:
+end:
     OPENSSL_free(pem_name);
     OPENSSL_free(pem_header);
     OPENSSL_free(der);
@@ -274,8 +272,8 @@ const OSSL_DISPATCH ossl_pem_to_der_decoder_functions[] = {
     { OSSL_FUNC_DECODER_FREECTX, (void (*)(void))pem2der_freectx },
     { OSSL_FUNC_DECODER_DECODE, (void (*)(void))pem2der_decode },
     { OSSL_FUNC_DECODER_SETTABLE_CTX_PARAMS,
-      (void (*)(void))pem2der_settable_ctx_params },
+        (void (*)(void))pem2der_settable_ctx_params },
     { OSSL_FUNC_DECODER_SET_CTX_PARAMS,
-      (void (*)(void))pem2der_set_ctx_params },
+        (void (*)(void))pem2der_set_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/encode_decode/decode_pvk2key.c b/providers/implementations/encode_decode/decode_pvk2key.c
index ea4585d93c5c7..9e8c4f1f4c9d9 100644
--- a/providers/implementations/encode_decode/decode_pvk2key.c
+++ b/providers/implementations/encode_decode/decode_pvk2key.c
@@ -21,25 +21,25 @@
 #include <openssl/crypto.h>
 #include <openssl/params.h>
 #include <openssl/err.h>
-#include <openssl/pem.h>         /* For public PVK functions */
+#include <openssl/pem.h> /* For public PVK functions */
 #include <openssl/x509.h>
 #include "internal/passphrase.h"
 #include "internal/sizes.h"
-#include "crypto/pem.h"          /* For internal PVK and "blob" headers */
+#include "crypto/pem.h" /* For internal PVK and "blob" headers */
 #include "crypto/rsa.h"
 #include "prov/bio.h"
 #include "prov/implementations.h"
 #include "endecoder_local.h"
 
-struct pvk2key_ctx_st;            /* Forward declaration */
+struct pvk2key_ctx_st; /* Forward declaration */
 typedef int check_key_fn(void *, struct pvk2key_ctx_st *ctx);
 typedef void adjust_key_fn(void *, struct pvk2key_ctx_st *ctx);
 typedef void *b2i_PVK_of_bio_pw_fn(BIO *in, pem_password_cb *cb, void *u,
-                                   OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 typedef void free_key_fn(void *);
 struct keytype_desc_st {
-    int type;                 /* EVP key type */
-    const char *name;         /* Keytype */
+    int type; /* EVP key type */
+    const char *name; /* Keytype */
     const OSSL_DISPATCH *fns; /* Keymgmt (to pilfer functions from) */
 
     b2i_PVK_of_bio_pw_fn *read_private_key;
@@ -110,15 +110,15 @@ static int pvk2key_does_selection(void *provctx, int selection)
     if (selection == 0)
         return 1;
 
-    if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY)  != 0)
+    if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0)
         return 1;
 
     return 0;
 }
 
 static int pvk2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
-                         OSSL_CALLBACK *data_cb, void *data_cbarg,
-                         OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct pvk2key_ctx_st *ctx = vctx;
     BIO *in = ossl_bio_new_from_core_bio(ctx->provctx, cin);
@@ -131,7 +131,7 @@ static int pvk2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     ctx->selection = selection;
 
     if ((selection == 0
-         || (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0)
+            || (selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0)
         && ctx->desc->read_private_key != NULL) {
         struct ossl_passphrase_data_st pwdata;
         int err, lib, reason;
@@ -141,8 +141,8 @@ static int pvk2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
             goto end;
 
         key = ctx->desc->read_private_key(in, ossl_pw_pvk_password, &pwdata,
-                                          PROV_LIBCTX_OF(ctx->provctx),
-                                          ctx->propq);
+            PROV_LIBCTX_OF(ctx->provctx),
+            ctx->propq);
 
         /*
          * Because the PVK API doesn't have a separate decrypt call, we need
@@ -167,7 +167,7 @@ static int pvk2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     if (key != NULL && ctx->desc->adjust_key != NULL)
         ctx->desc->adjust_key(key, ctx);
 
- next:
+next:
     /*
      * Indicated that we successfully decoded something, or not at all.
      * Ending up "empty handed" is not an error.
@@ -186,21 +186,18 @@ static int pvk2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
         OSSL_PARAM params[4];
         int object_type = OSSL_OBJECT_PKEY;
 
-        params[0] =
-            OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &object_type);
-        params[1] =
-            OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
-                                             (char *)ctx->desc->name, 0);
+        params[0] = OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &object_type);
+        params[1] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
+            (char *)ctx->desc->name, 0);
         /* The address of the key becomes the octet string */
-        params[2] =
-            OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_REFERENCE,
-                                              &key, sizeof(key));
+        params[2] = OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_REFERENCE,
+            &key, sizeof(key));
         params[3] = OSSL_PARAM_construct_end();
 
         ok = data_cb(params, data_cbarg);
     }
 
- end:
+end:
     BIO_free(in);
     ctx->desc->free_key(key);
 
@@ -208,12 +205,11 @@ static int pvk2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
 }
 
 static int pvk2key_export_object(void *vctx,
-                                const void *reference, size_t reference_sz,
-                                OSSL_CALLBACK *export_cb, void *export_cbarg)
+    const void *reference, size_t reference_sz,
+    OSSL_CALLBACK *export_cb, void *export_cbarg)
 {
     struct pvk2key_ctx_st *ctx = vctx;
-    OSSL_FUNC_keymgmt_export_fn *export =
-        ossl_prov_get_keymgmt_export(ctx->desc->fns);
+    OSSL_FUNC_keymgmt_export_fn *export = ossl_prov_get_keymgmt_export(ctx->desc->fns);
     void *keydata;
 
     if (reference_sz == sizeof(keydata) && export != NULL) {
@@ -231,55 +227,57 @@ static int pvk2key_export_object(void *vctx,
 
 /* ---------------------------------------------------------------------- */
 
-#define dsa_private_key_bio     (b2i_PVK_of_bio_pw_fn *)b2i_DSA_PVK_bio_ex
-#define dsa_adjust              NULL
-#define dsa_free                (void (*)(void *))DSA_free
+#define dsa_private_key_bio (b2i_PVK_of_bio_pw_fn *)b2i_DSA_PVK_bio_ex
+#define dsa_adjust NULL
+#define dsa_free (void (*)(void *)) DSA_free
 
 /* ---------------------------------------------------------------------- */
 
-#define rsa_private_key_bio     (b2i_PVK_of_bio_pw_fn *)b2i_RSA_PVK_bio_ex
+#define rsa_private_key_bio (b2i_PVK_of_bio_pw_fn *)b2i_RSA_PVK_bio_ex
 
 static void rsa_adjust(void *key, struct pvk2key_ctx_st *ctx)
 {
     ossl_rsa_set0_libctx(key, PROV_LIBCTX_OF(ctx->provctx));
 }
 
-#define rsa_free                (void (*)(void *))RSA_free
+#define rsa_free (void (*)(void *)) RSA_free
 
 /* ---------------------------------------------------------------------- */
 
-#define IMPLEMENT_MS(KEYTYPE, keytype)                                  \
-    static const struct keytype_desc_st                                 \
-    pvk2##keytype##_desc = {                                            \
-        EVP_PKEY_##KEYTYPE, #KEYTYPE,                                   \
-        ossl_##keytype##_keymgmt_functions,                             \
-        keytype##_private_key_bio,                                      \
-        keytype##_adjust,                                               \
-        keytype##_free                                                  \
-    };                                                                  \
-    static OSSL_FUNC_decoder_newctx_fn pvk2##keytype##_newctx;          \
-    static void *pvk2##keytype##_newctx(void *provctx)                  \
-    {                                                                   \
-        return pvk2key_newctx(provctx, &pvk2##keytype##_desc);          \
-    }                                                                   \
-    const OSSL_DISPATCH                                                 \
-    ossl_##pvk_to_##keytype##_decoder_functions[] = {                   \
-        { OSSL_FUNC_DECODER_NEWCTX,                                     \
-          (void (*)(void))pvk2##keytype##_newctx },                     \
-        { OSSL_FUNC_DECODER_FREECTX,                                    \
-          (void (*)(void))pvk2key_freectx },                            \
-        { OSSL_FUNC_DECODER_DOES_SELECTION,                             \
-          (void (*)(void))pvk2key_does_selection },                     \
-        { OSSL_FUNC_DECODER_DECODE,                                     \
-          (void (*)(void))pvk2key_decode },                             \
-        { OSSL_FUNC_DECODER_EXPORT_OBJECT,                              \
-          (void (*)(void))pvk2key_export_object },                      \
-        { OSSL_FUNC_DECODER_SETTABLE_CTX_PARAMS,                        \
-          (void (*)(void))pvk2key_settable_ctx_params },                \
-        { OSSL_FUNC_DECODER_SET_CTX_PARAMS,                             \
-          (void (*)(void))pvk2key_set_ctx_params },                     \
-        OSSL_DISPATCH_END                                               \
-    }
+#define IMPLEMENT_MS(KEYTYPE, keytype)                           \
+    static const struct keytype_desc_st                          \
+        pvk2##keytype##_desc                                     \
+        = {                                                      \
+              EVP_PKEY_##KEYTYPE, #KEYTYPE,                      \
+              ossl_##keytype##_keymgmt_functions,                \
+              keytype##_private_key_bio,                         \
+              keytype##_adjust,                                  \
+              keytype##_free                                     \
+          };                                                     \
+    static OSSL_FUNC_decoder_newctx_fn pvk2##keytype##_newctx;   \
+    static void *pvk2##keytype##_newctx(void *provctx)           \
+    {                                                            \
+        return pvk2key_newctx(provctx, &pvk2##keytype##_desc);   \
+    }                                                            \
+    const OSSL_DISPATCH                                          \
+        ossl_##pvk_to_##keytype##_decoder_functions[]            \
+        = {                                                      \
+              { OSSL_FUNC_DECODER_NEWCTX,                        \
+                  (void (*)(void))pvk2##keytype##_newctx },      \
+              { OSSL_FUNC_DECODER_FREECTX,                       \
+                  (void (*)(void))pvk2key_freectx },             \
+              { OSSL_FUNC_DECODER_DOES_SELECTION,                \
+                  (void (*)(void))pvk2key_does_selection },      \
+              { OSSL_FUNC_DECODER_DECODE,                        \
+                  (void (*)(void))pvk2key_decode },              \
+              { OSSL_FUNC_DECODER_EXPORT_OBJECT,                 \
+                  (void (*)(void))pvk2key_export_object },       \
+              { OSSL_FUNC_DECODER_SETTABLE_CTX_PARAMS,           \
+                  (void (*)(void))pvk2key_settable_ctx_params }, \
+              { OSSL_FUNC_DECODER_SET_CTX_PARAMS,                \
+                  (void (*)(void))pvk2key_set_ctx_params },      \
+              OSSL_DISPATCH_END                                  \
+          }
 
 #ifndef OPENSSL_NO_DSA
 IMPLEMENT_MS(DSA, dsa);
diff --git a/providers/implementations/encode_decode/decode_spki2typespki.c b/providers/implementations/encode_decode/decode_spki2typespki.c
index 8cf6d7d41ce3e..5bb39fc2f7544 100644
--- a/providers/implementations/encode_decode/decode_spki2typespki.c
+++ b/providers/implementations/encode_decode/decode_spki2typespki.c
@@ -75,8 +75,8 @@ static int spki2typespki_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static int spki2typespki_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
-                                OSSL_CALLBACK *data_cb, void *data_cbarg,
-                                OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct spki2typespki_ctx_st *ctx = vctx;
     unsigned char *der;
@@ -87,16 +87,16 @@ static int spki2typespki_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
         return 1;
 
     ok = ossl_spki2typespki_der_decode(der, len, selection, data_cb, data_cbarg,
-                                       pw_cb, pw_cbarg,
-                                       PROV_LIBCTX_OF(ctx->provctx), ctx->propq);
+        pw_cb, pw_cbarg,
+        PROV_LIBCTX_OF(ctx->provctx), ctx->propq);
     OPENSSL_free(der);
     return ok;
 }
 
 int ossl_spki2typespki_der_decode(unsigned char *der, long len, int selection,
-                                  OSSL_CALLBACK *data_cb, void *data_cbarg,
-                                  OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg,
-                                  OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     const unsigned char *derp = der;
     X509_PUBKEY *xpub = NULL;
@@ -122,37 +122,33 @@ int ossl_spki2typespki_der_decode(unsigned char *der, long len, int selection,
 #ifndef OPENSSL_NO_EC
     /* SM2 abuses the EC oid, so this could actually be SM2 */
     if (OBJ_obj2nid(oid) == NID_X9_62_id_ecPublicKey
-            && ossl_x509_algor_is_sm2(algor))
+        && ossl_x509_algor_is_sm2(algor))
         strcpy(dataname, "SM2");
     else
 #endif
-    if (OBJ_obj2txt(dataname, sizeof(dataname), oid, 0) <= 0)
+        if (OBJ_obj2txt(dataname, sizeof(dataname), oid, 0) <= 0)
         goto end;
 
     ossl_X509_PUBKEY_INTERNAL_free(xpub);
     xpub = NULL;
 
-    *p++ =
-        OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
-                                            dataname, 0);
+    *p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
+        dataname, 0);
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_INPUT_TYPE,
-                                            "DER", 0);
+        "DER", 0);
 
-    *p++ =
-        OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
-                                            "SubjectPublicKeyInfo",
-                                            0);
-    *p++ =
-        OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_DATA, der, len);
-    *p++ =
-        OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &objtype);
+    *p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
+        "SubjectPublicKeyInfo",
+        0);
+    *p++ = OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_DATA, der, len);
+    *p++ = OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &objtype);
 
     *p = OSSL_PARAM_construct_end();
 
     ok = data_cb(params, data_cbarg);
 
- end:
+end:
     ossl_X509_PUBKEY_INTERNAL_free(xpub);
     return ok;
 }
@@ -162,8 +158,8 @@ const OSSL_DISPATCH ossl_SubjectPublicKeyInfo_der_to_der_decoder_functions[] = {
     { OSSL_FUNC_DECODER_FREECTX, (void (*)(void))spki2typespki_freectx },
     { OSSL_FUNC_DECODER_DECODE, (void (*)(void))spki2typespki_decode },
     { OSSL_FUNC_DECODER_SETTABLE_CTX_PARAMS,
-      (void (*)(void))spki2typespki_settable_ctx_params },
+        (void (*)(void))spki2typespki_settable_ctx_params },
     { OSSL_FUNC_DECODER_SET_CTX_PARAMS,
-      (void (*)(void))spki2typespki_set_ctx_params },
+        (void (*)(void))spki2typespki_set_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/encode_decode/encode_key2any.c b/providers/implementations/encode_decode/encode_key2any.c
index 67a11590034aa..307b8a9673112 100644
--- a/providers/implementations/encode_decode/encode_key2any.c
+++ b/providers/implementations/encode_decode/encode_key2any.c
@@ -22,7 +22,7 @@
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/x509.h>
-#include <openssl/pkcs12.h>      /* PKCS8_encrypt() */
+#include <openssl/pkcs12.h> /* PKCS8_encrypt() */
 #include <openssl/dh.h>
 #include <openssl/dsa.h>
 #include <openssl/ec.h>
@@ -43,7 +43,7 @@
 #include "ml_kem_codecs.h"
 
 #if defined(OPENSSL_NO_DH) && defined(OPENSSL_NO_DSA) && defined(OPENSSL_NO_EC)
-# define OPENSSL_NO_KEYPARAMS
+#define OPENSSL_NO_KEYPARAMS
 #endif
 
 typedef struct key2any_ctx_st {
@@ -62,14 +62,13 @@ typedef struct key2any_ctx_st {
 
 typedef int check_key_type_fn(const void *key, int nid);
 typedef int key_to_paramstring_fn(const void *key, int nid, int save,
-                                  void **str, int *strtype);
+    void **str, int *strtype);
 typedef int key_to_der_fn(BIO *out, const void *key,
-                          int key_nid, const char *pemname,
-                          key_to_paramstring_fn *p2s,
-                          OSSL_i2d_of_void_ctx *k2d, KEY2ANY_CTX *ctx);
+    int key_nid, const char *pemname,
+    key_to_paramstring_fn *p2s,
+    OSSL_i2d_of_void_ctx *k2d, KEY2ANY_CTX *ctx);
 typedef int write_bio_of_void_fn(BIO *bp, const void *x);
 
-
 /* Free the blob allocated during key_to_paramstring_fn */
 static void free_asn1_data(int type, void *data)
 {
@@ -84,9 +83,9 @@ static void free_asn1_data(int type, void *data)
 }
 
 static PKCS8_PRIV_KEY_INFO *key_to_p8info(const void *key, int key_nid,
-                                          void *params, int params_type,
-                                          OSSL_i2d_of_void_ctx *k2d,
-                                          KEY2ANY_CTX *ctx)
+    void *params, int params_type,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
     /* der, derlen store the key DER output and its length */
     unsigned char *der = NULL;
@@ -97,7 +96,7 @@ static PKCS8_PRIV_KEY_INFO *key_to_p8info(const void *key, int key_nid,
     if ((p8info = PKCS8_PRIV_KEY_INFO_new()) == NULL
         || (derlen = k2d(key, &der, (void *)ctx)) <= 0
         || !PKCS8_pkey_set0(p8info, OBJ_nid2obj(key_nid), 0,
-                            params_type, params, der, derlen)) {
+            params_type, params, der, derlen)) {
         ERR_raise(ERR_LIB_PROV, ERR_R_ASN1_LIB);
         PKCS8_PRIV_KEY_INFO_free(p8info);
         OPENSSL_free(der);
@@ -108,7 +107,7 @@ static PKCS8_PRIV_KEY_INFO *key_to_p8info(const void *key, int key_nid,
 }
 
 static X509_SIG *p8info_to_encp8(PKCS8_PRIV_KEY_INFO *p8info,
-                                 KEY2ANY_CTX *ctx)
+    KEY2ANY_CTX *ctx)
 {
     X509_SIG *p8 = NULL;
     char kstr[PEM_BUFSIZE];
@@ -119,7 +118,7 @@ static X509_SIG *p8info_to_encp8(PKCS8_PRIV_KEY_INFO *p8info,
         return NULL;
 
     if (!ossl_pw_get_passphrase(kstr, sizeof(kstr), &klen, NULL, 1,
-                                &ctx->pwdata)) {
+            &ctx->pwdata)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_UNABLE_TO_GET_PASSPHRASE);
         return NULL;
     }
@@ -130,12 +129,11 @@ static X509_SIG *p8info_to_encp8(PKCS8_PRIV_KEY_INFO *p8info,
 }
 
 static X509_SIG *key_to_encp8(const void *key, int key_nid,
-                              void *params, int params_type,
-                              OSSL_i2d_of_void_ctx *k2d,
-                              KEY2ANY_CTX *ctx)
+    void *params, int params_type,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
-    PKCS8_PRIV_KEY_INFO *p8info =
-        key_to_p8info(key, key_nid, params, params_type, k2d, ctx);
+    PKCS8_PRIV_KEY_INFO *p8info = key_to_p8info(key, key_nid, params, params_type, k2d, ctx);
     X509_SIG *p8 = NULL;
 
     if (p8info == NULL) {
@@ -148,9 +146,9 @@ static X509_SIG *key_to_encp8(const void *key, int key_nid,
 }
 
 static X509_PUBKEY *key_to_pubkey(const void *key, int key_nid,
-                                  void *params, int params_type,
-                                  OSSL_i2d_of_void_ctx *k2d,
-                                  KEY2ANY_CTX *ctx)
+    void *params, int params_type,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
     /* der, derlen store the key DER output and its length */
     unsigned char *der = NULL;
@@ -158,11 +156,10 @@ static X509_PUBKEY *key_to_pubkey(const void *key, int key_nid,
     /* The final X509_PUBKEY */
     X509_PUBKEY *xpk = NULL;
 
-
     if ((xpk = X509_PUBKEY_new()) == NULL
         || (derlen = k2d(key, &der, (void *)ctx)) <= 0
         || !X509_PUBKEY_set0_param(xpk, OBJ_nid2obj(key_nid),
-                                   params_type, params, der, derlen)) {
+            params_type, params, der, derlen)) {
         ERR_raise(ERR_LIB_PROV, ERR_R_X509_LIB);
         X509_PUBKEY_free(xpk);
         OPENSSL_free(der);
@@ -192,11 +189,11 @@ static X509_PUBKEY *key_to_pubkey(const void *key, int key_nid,
  */
 
 static int key_to_epki_der_priv_bio(BIO *out, const void *key,
-                                    int key_nid,
-                                    ossl_unused const char *pemname,
-                                    key_to_paramstring_fn *p2s,
-                                    OSSL_i2d_of_void_ctx *k2d,
-                                    KEY2ANY_CTX *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
     int ret = 0;
     void *str = NULL;
@@ -206,8 +203,7 @@ static int key_to_epki_der_priv_bio(BIO *out, const void *key,
     if (!ctx->cipher_intent)
         return 0;
 
-    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters,
-                            &str, &strtype))
+    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters, &str, &strtype))
         return 0;
 
     p8 = key_to_encp8(key, key_nid, str, strtype, k2d, ctx);
@@ -220,11 +216,11 @@ static int key_to_epki_der_priv_bio(BIO *out, const void *key,
 }
 
 static int key_to_epki_pem_priv_bio(BIO *out, const void *key,
-                                    int key_nid,
-                                    ossl_unused const char *pemname,
-                                    key_to_paramstring_fn *p2s,
-                                    OSSL_i2d_of_void_ctx *k2d,
-                                    KEY2ANY_CTX *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
     int ret = 0;
     void *str = NULL;
@@ -234,8 +230,7 @@ static int key_to_epki_pem_priv_bio(BIO *out, const void *key,
     if (!ctx->cipher_intent)
         return 0;
 
-    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters,
-                            &str, &strtype))
+    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters, &str, &strtype))
         return 0;
 
     p8 = key_to_encp8(key, key_nid, str, strtype, k2d, ctx);
@@ -248,11 +243,11 @@ static int key_to_epki_pem_priv_bio(BIO *out, const void *key,
 }
 
 static int key_to_pki_der_priv_bio(BIO *out, const void *key,
-                                   int key_nid,
-                                   ossl_unused const char *pemname,
-                                   key_to_paramstring_fn *p2s,
-                                   OSSL_i2d_of_void_ctx *k2d,
-                                   KEY2ANY_CTX *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
     int ret = 0;
     void *str = NULL;
@@ -261,10 +256,9 @@ static int key_to_pki_der_priv_bio(BIO *out, const void *key,
 
     if (ctx->cipher_intent)
         return key_to_epki_der_priv_bio(out, key, key_nid, pemname,
-                                        p2s, k2d, ctx);
+            p2s, k2d, ctx);
 
-    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters,
-                            &str, &strtype))
+    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters, &str, &strtype))
         return 0;
 
     p8info = key_to_p8info(key, key_nid, str, strtype, k2d, ctx);
@@ -280,11 +274,11 @@ static int key_to_pki_der_priv_bio(BIO *out, const void *key,
 }
 
 static int key_to_pki_pem_priv_bio(BIO *out, const void *key,
-                                   int key_nid,
-                                   ossl_unused const char *pemname,
-                                   key_to_paramstring_fn *p2s,
-                                   OSSL_i2d_of_void_ctx *k2d,
-                                   KEY2ANY_CTX *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
     int ret = 0;
     void *str = NULL;
@@ -293,10 +287,9 @@ static int key_to_pki_pem_priv_bio(BIO *out, const void *key,
 
     if (ctx->cipher_intent)
         return key_to_epki_pem_priv_bio(out, key, key_nid, pemname,
-                                        p2s, k2d, ctx);
+            p2s, k2d, ctx);
 
-    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters,
-                            &str, &strtype))
+    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters, &str, &strtype))
         return 0;
 
     p8info = key_to_p8info(key, key_nid, str, strtype, k2d, ctx);
@@ -312,19 +305,18 @@ static int key_to_pki_pem_priv_bio(BIO *out, const void *key,
 }
 
 static int key_to_spki_der_pub_bio(BIO *out, const void *key,
-                                   int key_nid,
-                                   ossl_unused const char *pemname,
-                                   key_to_paramstring_fn *p2s,
-                                   OSSL_i2d_of_void_ctx *k2d,
-                                   KEY2ANY_CTX *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
     int ret = 0;
     void *str = NULL;
     int strtype = V_ASN1_UNDEF;
     X509_PUBKEY *xpk = NULL;
 
-    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters,
-                            &str, &strtype))
+    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters, &str, &strtype))
         return 0;
 
     xpk = key_to_pubkey(key, key_nid, str, strtype, k2d, ctx);
@@ -338,19 +330,18 @@ static int key_to_spki_der_pub_bio(BIO *out, const void *key,
 }
 
 static int key_to_spki_pem_pub_bio(BIO *out, const void *key,
-                                   int key_nid,
-                                   ossl_unused const char *pemname,
-                                   key_to_paramstring_fn *p2s,
-                                   OSSL_i2d_of_void_ctx *k2d,
-                                   KEY2ANY_CTX *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
     int ret = 0;
     void *str = NULL;
     int strtype = V_ASN1_UNDEF;
     X509_PUBKEY *xpk = NULL;
 
-    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters,
-                            &str, &strtype))
+    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters, &str, &strtype))
         return 0;
 
     xpk = key_to_pubkey(key, key_nid, str, strtype, k2d, ctx);
@@ -378,11 +369,11 @@ static int key_to_spki_pem_pub_bio(BIO *out, const void *key,
  * on k2d to do the complete work.
  */
 static int key_to_type_specific_der_bio(BIO *out, const void *key,
-                                        int key_nid,
-                                        ossl_unused const char *pemname,
-                                        key_to_paramstring_fn *p2s,
-                                        OSSL_i2d_of_void_ctx *k2d,
-                                        KEY2ANY_CTX *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
     unsigned char *der = NULL;
     int derlen;
@@ -402,64 +393,65 @@ static int key_to_type_specific_der_bio(BIO *out, const void *key,
 #define key_to_type_specific_der_param_bio key_to_type_specific_der_bio
 
 static int key_to_type_specific_pem_bio_cb(BIO *out, const void *key,
-                                           int key_nid, const char *pemname,
-                                           key_to_paramstring_fn *p2s,
-                                           OSSL_i2d_of_void_ctx *k2d,
-                                           KEY2ANY_CTX *ctx,
-                                           pem_password_cb *cb, void *cbarg)
+    int key_nid, const char *pemname,
+    key_to_paramstring_fn *p2s,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx,
+    pem_password_cb *cb, void *cbarg)
 {
     return PEM_ASN1_write_bio_ctx(k2d, (void *)ctx, pemname, out, key,
-                                  ctx->cipher, NULL, 0, cb, cbarg) > 0;
+               ctx->cipher, NULL, 0, cb, cbarg)
+        > 0;
 }
 
 static int key_to_type_specific_pem_priv_bio(BIO *out, const void *key,
-                                             int key_nid, const char *pemname,
-                                             key_to_paramstring_fn *p2s,
-                                             OSSL_i2d_of_void_ctx *k2d,
-                                             KEY2ANY_CTX *ctx)
+    int key_nid, const char *pemname,
+    key_to_paramstring_fn *p2s,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
     return key_to_type_specific_pem_bio_cb(out, key, key_nid, pemname,
-                                           p2s, k2d, ctx,
-                                           ossl_pw_pem_password, &ctx->pwdata);
+        p2s, k2d, ctx,
+        ossl_pw_pem_password, &ctx->pwdata);
 }
 
 static int key_to_type_specific_pem_pub_bio(BIO *out, const void *key,
-                                            int key_nid, const char *pemname,
-                                            key_to_paramstring_fn *p2s,
-                                            OSSL_i2d_of_void_ctx *k2d,
-                                            KEY2ANY_CTX *ctx)
+    int key_nid, const char *pemname,
+    key_to_paramstring_fn *p2s,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
     return key_to_type_specific_pem_bio_cb(out, key, key_nid, pemname,
-                                           p2s, k2d, ctx, NULL, NULL);
+        p2s, k2d, ctx, NULL, NULL);
 }
 
 #ifndef OPENSSL_NO_KEYPARAMS
 static int key_to_type_specific_pem_param_bio(BIO *out, const void *key,
-                                              int key_nid, const char *pemname,
-                                              key_to_paramstring_fn *p2s,
-                                              OSSL_i2d_of_void_ctx *k2d,
-                                              KEY2ANY_CTX *ctx)
+    int key_nid, const char *pemname,
+    key_to_paramstring_fn *p2s,
+    OSSL_i2d_of_void_ctx *k2d,
+    KEY2ANY_CTX *ctx)
 {
     return key_to_type_specific_pem_bio_cb(out, key, key_nid, pemname,
-                                           p2s, k2d, ctx, NULL, NULL);
+        p2s, k2d, ctx, NULL, NULL);
 }
 #endif
 
 /* ---------------------------------------------------------------------- */
 
-#define k2d_NOCTX(n, f)                             \
-    static int                                      \
-    n##_k2d(const void *key, unsigned char **pder,  \
-            ossl_unused void *ctx)                  \
-    {                                               \
-        return f(key, pder);                        \
+#define k2d_NOCTX(n, f)                            \
+    static int                                     \
+    n##_k2d(const void *key, unsigned char **pder, \
+        ossl_unused void *ctx)                     \
+    {                                              \
+        return f(key, pder);                       \
     }
 
 /* ---------------------------------------------------------------------- */
 
 #ifndef OPENSSL_NO_DH
 static int prepare_dh_params(const void *dh, int nid, int save,
-                             void **pstr, int *pstrtype)
+    void **pstr, int *pstrtype)
 {
     ASN1_STRING *params = ASN1_STRING_new();
 
@@ -486,7 +478,7 @@ static int prepare_dh_params(const void *dh, int nid, int save,
 }
 
 static int dh_spki_pub_to_der(const void *dh, unsigned char **pder,
-                              ossl_unused void *ctx)
+    ossl_unused void *ctx)
 {
     const BIGNUM *bn = NULL;
     ASN1_INTEGER *pub_key = NULL;
@@ -508,7 +500,7 @@ static int dh_spki_pub_to_der(const void *dh, unsigned char **pder,
 }
 
 static int dh_pki_priv_to_der(const void *dh, unsigned char **pder,
-                              ossl_unused void *ctx)
+    ossl_unused void *ctx)
 {
     const BIGNUM *bn = NULL;
     ASN1_INTEGER *priv_key = NULL;
@@ -529,11 +521,11 @@ static int dh_pki_priv_to_der(const void *dh, unsigned char **pder,
     return ret;
 }
 
-# define dh_epki_priv_to_der dh_pki_priv_to_der
+#define dh_epki_priv_to_der dh_pki_priv_to_der
 
 static int
 dh_type_specific_params_to_der(const void *dh, unsigned char **pder,
-                               ossl_unused void *ctx)
+    ossl_unused void *ctx)
 {
     if (DH_test_flags(dh, DH_FLAG_TYPE_DHX))
         return i2d_DHxparams(dh, pder);
@@ -544,28 +536,27 @@ dh_type_specific_params_to_der(const void *dh, unsigned char **pder,
  * DH doesn't have i2d_DHPrivateKey or i2d_DHPublicKey, so we can't make
  * corresponding functions here.
  */
-# define dh_type_specific_priv_to_der   NULL
-# define dh_type_specific_pub_to_der    NULL
+#define dh_type_specific_priv_to_der NULL
+#define dh_type_specific_pub_to_der NULL
 
 static int dh_check_key_type(const void *dh, int expected_type)
 {
-    int type =
-        DH_test_flags(dh, DH_FLAG_TYPE_DHX) ? EVP_PKEY_DHX : EVP_PKEY_DH;
+    int type = DH_test_flags(dh, DH_FLAG_TYPE_DHX) ? EVP_PKEY_DHX : EVP_PKEY_DH;
 
     return type == expected_type;
 }
 
-# define dh_evp_type            EVP_PKEY_DH
-# define dhx_evp_type           EVP_PKEY_DHX
-# define dh_pem_type            "DH"
-# define dhx_pem_type           "X9.42 DH"
+#define dh_evp_type EVP_PKEY_DH
+#define dhx_evp_type EVP_PKEY_DHX
+#define dh_pem_type "DH"
+#define dhx_pem_type "X9.42 DH"
 #endif
 
 /* ---------------------------------------------------------------------- */
 
 #ifndef OPENSSL_NO_DSA
 static int encode_dsa_params(const void *dsa, int nid,
-                             void **pstr, int *pstrtype)
+    void **pstr, int *pstrtype)
 {
     ASN1_STRING *params = ASN1_STRING_new();
 
@@ -588,7 +579,7 @@ static int encode_dsa_params(const void *dsa, int nid,
 }
 
 static int prepare_dsa_params(const void *dsa, int nid, int save,
-                              void **pstr, int *pstrtype)
+    void **pstr, int *pstrtype)
 {
     const BIGNUM *p = DSA_get0_p(dsa);
     const BIGNUM *q = DSA_get0_q(dsa);
@@ -603,7 +594,7 @@ static int prepare_dsa_params(const void *dsa, int nid, int save,
 }
 
 static int dsa_spki_pub_to_der(const void *dsa, unsigned char **pder,
-                               ossl_unused void *ctx)
+    ossl_unused void *ctx)
 {
     const BIGNUM *bn = NULL;
     ASN1_INTEGER *pub_key = NULL;
@@ -625,7 +616,7 @@ static int dsa_spki_pub_to_der(const void *dsa, unsigned char **pder,
 }
 
 static int dsa_pki_priv_to_der(const void *dsa, unsigned char **pder,
-                               ossl_unused void *ctx)
+    ossl_unused void *ctx)
 {
     const BIGNUM *bn = NULL;
     ASN1_INTEGER *priv_key = NULL;
@@ -647,25 +638,25 @@ static int dsa_pki_priv_to_der(const void *dsa, unsigned char **pder,
 }
 
 k2d_NOCTX(dsa_prv, i2d_DSAPrivateKey)
-k2d_NOCTX(dsa_pub, i2d_DSAPublicKey)
-k2d_NOCTX(dsa_param, i2d_DSAparams)
+    k2d_NOCTX(dsa_pub, i2d_DSAPublicKey)
+        k2d_NOCTX(dsa_param, i2d_DSAparams)
 
-# define dsa_epki_priv_to_der dsa_pki_priv_to_der
+#define dsa_epki_priv_to_der dsa_pki_priv_to_der
 
-# define dsa_type_specific_priv_to_der   dsa_prv_k2d
-# define dsa_type_specific_pub_to_der    dsa_pub_k2d
-# define dsa_type_specific_params_to_der dsa_param_k2d
+#define dsa_type_specific_priv_to_der dsa_prv_k2d
+#define dsa_type_specific_pub_to_der dsa_pub_k2d
+#define dsa_type_specific_params_to_der dsa_param_k2d
 
-# define dsa_check_key_type     NULL
-# define dsa_evp_type           EVP_PKEY_DSA
-# define dsa_pem_type           "DSA"
+#define dsa_check_key_type NULL
+#define dsa_evp_type EVP_PKEY_DSA
+#define dsa_pem_type "DSA"
 #endif
 
 /* ---------------------------------------------------------------------- */
 
 #ifndef OPENSSL_NO_EC
-static int prepare_ec_explicit_params(const void *eckey,
-                                      void **pstr, int *pstrtype)
+            static int prepare_ec_explicit_params(const void *eckey,
+                void **pstr, int *pstrtype)
 {
     ASN1_STRING *params = ASN1_STRING_new();
 
@@ -691,7 +682,7 @@ static int prepare_ec_explicit_params(const void *eckey,
  * is a curve name (curve nid) to be found or not.  See RFC 3279 for details.
  */
 static int prepare_ec_params(const void *eckey, int nid, int save,
-                             void **pstr, int *pstrtype)
+    void **pstr, int *pstrtype)
 {
     int curve_nid;
     const EC_GROUP *group = EC_KEY_get0_group(eckey);
@@ -725,7 +716,7 @@ static int prepare_ec_params(const void *eckey, int nid, int save,
 }
 
 static int ec_spki_pub_to_der(const void *eckey, unsigned char **pder,
-                              ossl_unused void *ctx)
+    ossl_unused void *ctx)
 {
     if (EC_KEY_get0_public_key(eckey) == NULL) {
         ERR_raise(ERR_LIB_PROV, PROV_R_NOT_A_PUBLIC_KEY);
@@ -735,7 +726,7 @@ static int ec_spki_pub_to_der(const void *eckey, unsigned char **pder,
 }
 
 static int ec_pki_priv_to_der(const void *veckey, unsigned char **pder,
-                              ossl_unused void *ctx)
+    ossl_unused void *ctx)
 {
     EC_KEY *eckey = (EC_KEY *)veckey;
     unsigned int old_flags;
@@ -756,19 +747,19 @@ static int ec_pki_priv_to_der(const void *veckey, unsigned char **pder,
 }
 
 k2d_NOCTX(ec_param, i2d_ECParameters)
-k2d_NOCTX(ec_prv, i2d_ECPrivateKey)
+    k2d_NOCTX(ec_prv, i2d_ECPrivateKey)
 
-# define ec_epki_priv_to_der ec_pki_priv_to_der
+#define ec_epki_priv_to_der ec_pki_priv_to_der
 
-# define ec_type_specific_params_to_der ec_param_k2d
+#define ec_type_specific_params_to_der ec_param_k2d
 /* No ec_type_specific_pub_to_der, there simply is no such thing */
-# define ec_type_specific_priv_to_der   ec_prv_k2d
+#define ec_type_specific_priv_to_der ec_prv_k2d
 
-# define ec_check_key_type      NULL
-# define ec_evp_type            EVP_PKEY_EC
-# define ec_pem_type            "EC"
+#define ec_check_key_type NULL
+#define ec_evp_type EVP_PKEY_EC
+#define ec_pem_type "EC"
 
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 /*
  * Albeit SM2 is a slightly different algorithm than ECDSA, the key type
  * encoding (in all places where an AlgorithmIdentifier is produced, such
@@ -777,18 +768,18 @@ k2d_NOCTX(ec_prv, i2d_ECPrivateKey)
  * This leaves the distinction of SM2 keys to the EC group (which is found
  * in AlgorithmIdentified.params).
  */
-#  define sm2_evp_type          ec_evp_type
-#  define sm2_pem_type          "SM2"
-# endif
+#define sm2_evp_type ec_evp_type
+#define sm2_pem_type "SM2"
+#endif
 #endif
 
 /* ---------------------------------------------------------------------- */
 
 #ifndef OPENSSL_NO_ECX
-# define prepare_ecx_params NULL
+#define prepare_ecx_params NULL
 
-static int ecx_spki_pub_to_der(const void *vecxkey, unsigned char **pder,
-                               ossl_unused void *ctx)
+        static int ecx_spki_pub_to_der(const void *vecxkey, unsigned char **pder,
+            ossl_unused void *ctx)
 {
     const ECX_KEY *ecxkey = vecxkey;
     unsigned char *keyblob;
@@ -807,7 +798,7 @@ static int ecx_spki_pub_to_der(const void *vecxkey, unsigned char **pder,
 }
 
 static int ecx_pki_priv_to_der(const void *vecxkey, unsigned char **pder,
-                               ossl_unused void *ctx)
+    ossl_unused void *ctx)
 {
     const ECX_KEY *ecxkey = vecxkey;
     ASN1_OCTET_STRING oct;
@@ -831,52 +822,52 @@ static int ecx_pki_priv_to_der(const void *vecxkey, unsigned char **pder,
     return keybloblen;
 }
 
-# define ecx_epki_priv_to_der ecx_pki_priv_to_der
+#define ecx_epki_priv_to_der ecx_pki_priv_to_der
 
 /*
  * ED25519, ED448, X25519 and X448 only has PKCS#8 / SubjectPublicKeyInfo
  * representation, so we don't define ecx_type_specific_[priv,pub,params]_to_der.
  */
 
-# define ecx_check_key_type     NULL
+#define ecx_check_key_type NULL
 
-# define ed25519_evp_type       EVP_PKEY_ED25519
-# define ed448_evp_type         EVP_PKEY_ED448
-# define x25519_evp_type        EVP_PKEY_X25519
-# define x448_evp_type          EVP_PKEY_X448
-# define ed25519_pem_type       "ED25519"
-# define ed448_pem_type         "ED448"
-# define x25519_pem_type        "X25519"
-# define x448_pem_type          "X448"
+#define ed25519_evp_type EVP_PKEY_ED25519
+#define ed448_evp_type EVP_PKEY_ED448
+#define x25519_evp_type EVP_PKEY_X25519
+#define x448_evp_type EVP_PKEY_X448
+#define ed25519_pem_type "ED25519"
+#define ed448_pem_type "ED448"
+#define x25519_pem_type "X25519"
+#define x448_pem_type "X448"
 #endif
 
 /* ---------------------------------------------------------------------- */
 
 #ifndef OPENSSL_NO_ML_DSA
 static int ml_dsa_spki_pub_to_der(const void *vkey, unsigned char **pder,
-                                  ossl_unused void *ctx)
+    ossl_unused void *ctx)
 {
     return ossl_ml_dsa_i2d_pubkey(vkey, pder);
 }
 
 static int ml_dsa_pki_priv_to_der(const void *vkey, unsigned char **pder,
-                                  void *vctx)
+    void *vctx)
 {
     KEY2ANY_CTX *ctx = vctx;
 
     return ossl_ml_dsa_i2d_prvkey(vkey, pder, ctx->provctx);
 }
 
-# define ml_dsa_epki_priv_to_der ml_dsa_pki_priv_to_der
-# define prepare_ml_dsa_params   NULL
-# define ml_dsa_check_key_type   NULL
+#define ml_dsa_epki_priv_to_der ml_dsa_pki_priv_to_der
+#define prepare_ml_dsa_params NULL
+#define ml_dsa_check_key_type NULL
 
-# define ml_dsa_44_evp_type        EVP_PKEY_ML_DSA_44
-# define ml_dsa_44_pem_type        "ML-DSA-44"
-# define ml_dsa_65_evp_type        EVP_PKEY_ML_DSA_65
-# define ml_dsa_65_pem_type        "ML-DSA-65"
-# define ml_dsa_87_evp_type        EVP_PKEY_ML_DSA_87
-# define ml_dsa_87_pem_type        "ML-DSA-87"
+#define ml_dsa_44_evp_type EVP_PKEY_ML_DSA_44
+#define ml_dsa_44_pem_type "ML-DSA-44"
+#define ml_dsa_65_evp_type EVP_PKEY_ML_DSA_65
+#define ml_dsa_65_pem_type "ML-DSA-65"
+#define ml_dsa_87_evp_type EVP_PKEY_ML_DSA_87
+#define ml_dsa_87_pem_type "ML-DSA-87"
 #endif /* OPENSSL_NO_ML_DSA */
 
 /* ---------------------------------------------------------------------- */
@@ -884,29 +875,29 @@ static int ml_dsa_pki_priv_to_der(const void *vkey, unsigned char **pder,
 #ifndef OPENSSL_NO_ML_KEM
 
 static int ml_kem_spki_pub_to_der(const void *vkey, unsigned char **pder,
-                                  ossl_unused void *ctx)
+    ossl_unused void *ctx)
 {
     return ossl_ml_kem_i2d_pubkey(vkey, pder);
 }
 
 static int ml_kem_pki_priv_to_der(const void *vkey, unsigned char **pder,
-                                  void *vctx)
+    void *vctx)
 {
     KEY2ANY_CTX *ctx = vctx;
 
     return ossl_ml_kem_i2d_prvkey(vkey, pder, ctx->provctx);
 }
 
-# define ml_kem_epki_priv_to_der ml_kem_pki_priv_to_der
-# define prepare_ml_kem_params   NULL
-# define ml_kem_check_key_type   NULL
+#define ml_kem_epki_priv_to_der ml_kem_pki_priv_to_der
+#define prepare_ml_kem_params NULL
+#define ml_kem_check_key_type NULL
 
-# define ml_kem_512_evp_type        EVP_PKEY_ML_KEM_512
-# define ml_kem_512_pem_type        "ML-KEM-512"
-# define ml_kem_768_evp_type        EVP_PKEY_ML_KEM_768
-# define ml_kem_768_pem_type        "ML-KEM-768"
-# define ml_kem_1024_evp_type       EVP_PKEY_ML_KEM_1024
-# define ml_kem_1024_pem_type       "ML-KEM-1024"
+#define ml_kem_512_evp_type EVP_PKEY_ML_KEM_512
+#define ml_kem_512_pem_type "ML-KEM-512"
+#define ml_kem_768_evp_type EVP_PKEY_ML_KEM_768
+#define ml_kem_768_pem_type "ML-KEM-768"
+#define ml_kem_1024_evp_type EVP_PKEY_ML_KEM_1024
+#define ml_kem_1024_pem_type "ML-KEM-1024"
 #endif
 
 /* ---------------------------------------------------------------------- */
@@ -918,7 +909,7 @@ static int ml_kem_pki_priv_to_der(const void *vkey, unsigned char **pder,
  */
 
 static int prepare_rsa_params(const void *rsa, int nid, int save,
-                              void **pstr, int *pstrtype)
+    void **pstr, int *pstrtype)
 {
     const RSA_PSS_PARAMS_30 *pss = ossl_rsa_get0_pss_params_30((RSA *)rsa);
 
@@ -979,7 +970,7 @@ static int prepare_rsa_params(const void *rsa, int nid, int save,
             *pstr = astr;
 
             return 1;
-         err:
+        err:
             OPENSSL_free(str);
             return 0;
         }
@@ -990,20 +981,20 @@ static int prepare_rsa_params(const void *rsa, int nid, int save,
 }
 
 k2d_NOCTX(rsa_prv, i2d_RSAPrivateKey)
-k2d_NOCTX(rsa_pub, i2d_RSAPublicKey)
+    k2d_NOCTX(rsa_pub, i2d_RSAPublicKey)
 
 /*
  * RSA is extremely simple, as PKCS#1 is used for the PKCS#8 |privateKey|
  * field as well as the SubjectPublicKeyInfo |subjectPublicKey| field.
  */
-#define rsa_pki_priv_to_der             rsa_type_specific_priv_to_der
-#define rsa_epki_priv_to_der            rsa_type_specific_priv_to_der
-#define rsa_spki_pub_to_der             rsa_type_specific_pub_to_der
-#define rsa_type_specific_priv_to_der   rsa_prv_k2d
-#define rsa_type_specific_pub_to_der    rsa_pub_k2d
+#define rsa_pki_priv_to_der rsa_type_specific_priv_to_der
+#define rsa_epki_priv_to_der rsa_type_specific_priv_to_der
+#define rsa_spki_pub_to_der rsa_type_specific_pub_to_der
+#define rsa_type_specific_priv_to_der rsa_prv_k2d
+#define rsa_type_specific_pub_to_der rsa_pub_k2d
 #define rsa_type_specific_params_to_der NULL
 
-static int rsa_check_key_type(const void *rsa, int expected_type)
+        static int rsa_check_key_type(const void *rsa, int expected_type)
 {
     switch (RSA_test_flags(rsa, RSA_FLAG_TYPE_MASK)) {
     case RSA_FLAG_TYPE_RSA:
@@ -1016,18 +1007,18 @@ static int rsa_check_key_type(const void *rsa, int expected_type)
     return EVP_PKEY_NONE;
 }
 
-#define rsa_evp_type            EVP_PKEY_RSA
-#define rsapss_evp_type         EVP_PKEY_RSA_PSS
-#define rsa_pem_type            "RSA"
-#define rsapss_pem_type         "RSA-PSS"
+#define rsa_evp_type EVP_PKEY_RSA
+#define rsapss_evp_type EVP_PKEY_RSA_PSS
+#define rsa_pem_type "RSA"
+#define rsapss_pem_type "RSA-PSS"
 
 /* ---------------------------------------------------------------------- */
 
 #ifndef OPENSSL_NO_SLH_DSA
-# define prepare_slh_dsa_params NULL
+#define prepare_slh_dsa_params NULL
 
 static int slh_dsa_spki_pub_to_der(const void *vkey, unsigned char **pder,
-                                   ossl_unused void *ctx)
+    ossl_unused void *ctx)
 {
     const SLH_DSA_KEY *key = vkey;
     uint8_t *key_blob;
@@ -1047,7 +1038,7 @@ static int slh_dsa_spki_pub_to_der(const void *vkey, unsigned char **pder,
 }
 
 static int slh_dsa_pki_priv_to_der(const void *vkey, unsigned char **pder,
-                                   ossl_unused void *ctx)
+    ossl_unused void *ctx)
 {
     const SLH_DSA_KEY *key = vkey;
     size_t len;
@@ -1059,52 +1050,52 @@ static int slh_dsa_pki_priv_to_der(const void *vkey, unsigned char **pder,
     len = ossl_slh_dsa_key_get_priv_len(key);
 
     if (pder != NULL
-            && ((*pder = OPENSSL_memdup(ossl_slh_dsa_key_get_priv(key), len)) == NULL))
+        && ((*pder = OPENSSL_memdup(ossl_slh_dsa_key_get_priv(key), len)) == NULL))
         return 0;
 
     return len;
 }
-# define slh_dsa_epki_priv_to_der slh_dsa_pki_priv_to_der
+#define slh_dsa_epki_priv_to_der slh_dsa_pki_priv_to_der
 
 /* SLH_DSA only has PKCS#8 / SubjectPublicKeyInfo representations. */
 
-# define slh_dsa_check_key_type NULL
-# define slh_dsa_sha2_128s_evp_type EVP_PKEY_SLH_DSA_SHA2_128S
-# define slh_dsa_sha2_128f_evp_type EVP_PKEY_SLH_DSA_SHA2_128F
-# define slh_dsa_sha2_192s_evp_type EVP_PKEY_SLH_DSA_SHA2_192S
-# define slh_dsa_sha2_192f_evp_type EVP_PKEY_SLH_DSA_SHA2_192F
-# define slh_dsa_sha2_256s_evp_type EVP_PKEY_SLH_DSA_SHA2_256S
-# define slh_dsa_sha2_256f_evp_type EVP_PKEY_SLH_DSA_SHA2_256F
-# define slh_dsa_shake_128s_evp_type EVP_PKEY_SLH_DSA_SHAKE_128S
-# define slh_dsa_shake_128f_evp_type EVP_PKEY_SLH_DSA_SHAKE_128F
-# define slh_dsa_shake_192s_evp_type EVP_PKEY_SLH_DSA_SHAKE_192S
-# define slh_dsa_shake_192f_evp_type EVP_PKEY_SLH_DSA_SHAKE_192F
-# define slh_dsa_shake_256s_evp_type EVP_PKEY_SLH_DSA_SHAKE_256S
-# define slh_dsa_shake_256f_evp_type EVP_PKEY_SLH_DSA_SHAKE_256F
-# define slh_dsa_sha2_128s_input_type "SLH-DSA-SHA2-128s"
-# define slh_dsa_sha2_128f_input_type "SLH-DSA-SHA2-128f"
-# define slh_dsa_sha2_192s_input_type "SLH-DSA-SHA2-192s"
-# define slh_dsa_sha2_192f_input_type "SLH-DSA-SHA2-192f"
-# define slh_dsa_sha2_256s_input_type "SLH-DSA-SHA2-256s"
-# define slh_dsa_sha2_256f_input_type "SLH-DSA-SHA2-256f"
-# define slh_dsa_shake_128s_input_type "SLH-DSA-SHAKE-128s"
-# define slh_dsa_shake_128f_input_type "SLH-DSA-SHAKE-128f"
-# define slh_dsa_shake_192s_input_type "SLH-DSA-SHAKE-192s"
-# define slh_dsa_shake_192f_input_type "SLH-DSA-SHAKE-192f"
-# define slh_dsa_shake_256s_input_type "SLH-DSA-SHAKE-256s"
-# define slh_dsa_shake_256f_input_type "SLH-DSA-SHAKE-256f"
-# define slh_dsa_sha2_128s_pem_type "SLH-DSA-SHA2-128s"
-# define slh_dsa_sha2_128f_pem_type "SLH-DSA-SHA2-128f"
-# define slh_dsa_sha2_192s_pem_type "SLH-DSA-SHA2-192s"
-# define slh_dsa_sha2_192f_pem_type "SLH-DSA-SHA2-192f"
-# define slh_dsa_sha2_256s_pem_type "SLH-DSA-SHA2-256s"
-# define slh_dsa_sha2_256f_pem_type "SLH-DSA-SHA2-256f"
-# define slh_dsa_shake_128s_pem_type "SLH-DSA-SHAKE-128s"
-# define slh_dsa_shake_128f_pem_type "SLH-DSA-SHAKE-128f"
-# define slh_dsa_shake_192s_pem_type "SLH-DSA-SHAKE-192s"
-# define slh_dsa_shake_192f_pem_type "SLH-DSA-SHAKE-192f"
-# define slh_dsa_shake_256s_pem_type "SLH-DSA-SHAKE-256s"
-# define slh_dsa_shake_256f_pem_type "SLH-DSA-SHAKE-256f"
+#define slh_dsa_check_key_type NULL
+#define slh_dsa_sha2_128s_evp_type EVP_PKEY_SLH_DSA_SHA2_128S
+#define slh_dsa_sha2_128f_evp_type EVP_PKEY_SLH_DSA_SHA2_128F
+#define slh_dsa_sha2_192s_evp_type EVP_PKEY_SLH_DSA_SHA2_192S
+#define slh_dsa_sha2_192f_evp_type EVP_PKEY_SLH_DSA_SHA2_192F
+#define slh_dsa_sha2_256s_evp_type EVP_PKEY_SLH_DSA_SHA2_256S
+#define slh_dsa_sha2_256f_evp_type EVP_PKEY_SLH_DSA_SHA2_256F
+#define slh_dsa_shake_128s_evp_type EVP_PKEY_SLH_DSA_SHAKE_128S
+#define slh_dsa_shake_128f_evp_type EVP_PKEY_SLH_DSA_SHAKE_128F
+#define slh_dsa_shake_192s_evp_type EVP_PKEY_SLH_DSA_SHAKE_192S
+#define slh_dsa_shake_192f_evp_type EVP_PKEY_SLH_DSA_SHAKE_192F
+#define slh_dsa_shake_256s_evp_type EVP_PKEY_SLH_DSA_SHAKE_256S
+#define slh_dsa_shake_256f_evp_type EVP_PKEY_SLH_DSA_SHAKE_256F
+#define slh_dsa_sha2_128s_input_type "SLH-DSA-SHA2-128s"
+#define slh_dsa_sha2_128f_input_type "SLH-DSA-SHA2-128f"
+#define slh_dsa_sha2_192s_input_type "SLH-DSA-SHA2-192s"
+#define slh_dsa_sha2_192f_input_type "SLH-DSA-SHA2-192f"
+#define slh_dsa_sha2_256s_input_type "SLH-DSA-SHA2-256s"
+#define slh_dsa_sha2_256f_input_type "SLH-DSA-SHA2-256f"
+#define slh_dsa_shake_128s_input_type "SLH-DSA-SHAKE-128s"
+#define slh_dsa_shake_128f_input_type "SLH-DSA-SHAKE-128f"
+#define slh_dsa_shake_192s_input_type "SLH-DSA-SHAKE-192s"
+#define slh_dsa_shake_192f_input_type "SLH-DSA-SHAKE-192f"
+#define slh_dsa_shake_256s_input_type "SLH-DSA-SHAKE-256s"
+#define slh_dsa_shake_256f_input_type "SLH-DSA-SHAKE-256f"
+#define slh_dsa_sha2_128s_pem_type "SLH-DSA-SHA2-128s"
+#define slh_dsa_sha2_128f_pem_type "SLH-DSA-SHA2-128f"
+#define slh_dsa_sha2_192s_pem_type "SLH-DSA-SHA2-192s"
+#define slh_dsa_sha2_192f_pem_type "SLH-DSA-SHA2-192f"
+#define slh_dsa_sha2_256s_pem_type "SLH-DSA-SHA2-256s"
+#define slh_dsa_sha2_256f_pem_type "SLH-DSA-SHA2-256f"
+#define slh_dsa_shake_128s_pem_type "SLH-DSA-SHAKE-128s"
+#define slh_dsa_shake_128f_pem_type "SLH-DSA-SHAKE-128f"
+#define slh_dsa_shake_192s_pem_type "SLH-DSA-SHAKE-192s"
+#define slh_dsa_shake_192f_pem_type "SLH-DSA-SHAKE-192f"
+#define slh_dsa_shake_256s_pem_type "SLH-DSA-SHAKE-256s"
+#define slh_dsa_shake_256f_pem_type "SLH-DSA-SHAKE-256f"
 #endif /* OPENSSL_NO_SLH_DSA */
 
 /* ---------------------------------------------------------------------- */
@@ -1148,12 +1139,9 @@ static int key2any_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 {
     KEY2ANY_CTX *ctx = vctx;
     OSSL_LIB_CTX *libctx = ossl_prov_ctx_get0_libctx(ctx->provctx);
-    const OSSL_PARAM *cipherp =
-        OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_CIPHER);
-    const OSSL_PARAM *propsp =
-        OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_PROPERTIES);
-    const OSSL_PARAM *save_paramsp =
-        OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_SAVE_PARAMETERS);
+    const OSSL_PARAM *cipherp = OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_CIPHER);
+    const OSSL_PARAM *propsp = OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_PROPERTIES);
+    const OSSL_PARAM *save_paramsp = OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_SAVE_PARAMETERS);
 
     if (cipherp != NULL) {
         const char *ciphername = NULL;
@@ -1168,8 +1156,7 @@ static int key2any_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         ctx->cipher = NULL;
         ctx->cipher_intent = ciphername != NULL;
         if (ciphername != NULL
-            && ((ctx->cipher =
-                 EVP_CIPHER_fetch(libctx, ciphername, props)) == NULL))
+            && ((ctx->cipher = EVP_CIPHER_fetch(libctx, ciphername, props)) == NULL))
             return 0;
     }
 
@@ -1214,26 +1201,25 @@ static int key2any_check_selection(int selection, int selection_mask)
 }
 
 static int key2any_encode(KEY2ANY_CTX *ctx, OSSL_CORE_BIO *cout,
-                          const void *key, int type, const char *pemname,
-                          check_key_type_fn *checker,
-                          key_to_der_fn *writer,
-                          OSSL_PASSPHRASE_CALLBACK *pwcb, void *pwcbarg,
-                          key_to_paramstring_fn *key2paramstring,
-                          OSSL_i2d_of_void_ctx *key2der)
+    const void *key, int type, const char *pemname,
+    check_key_type_fn *checker,
+    key_to_der_fn *writer,
+    OSSL_PASSPHRASE_CALLBACK *pwcb, void *pwcbarg,
+    key_to_paramstring_fn *key2paramstring,
+    OSSL_i2d_of_void_ctx *key2der)
 {
     int ret = 0;
 
     if (key == NULL) {
         ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_NULL_PARAMETER);
     } else if (writer != NULL
-               && (checker == NULL || checker(key, type))) {
+        && (checker == NULL || checker(key, type))) {
         BIO *out = ossl_bio_new_from_core_bio(ctx->provctx, cout);
 
         if (out != NULL
             && (pwcb == NULL
                 || ossl_pw_set_ossl_passphrase_cb(&ctx->pwdata, pwcb, pwcbarg)))
-            ret =
-                writer(out, key, type, pemname, key2paramstring, key2der, ctx);
+            ret = writer(out, key, type, pemname, key2paramstring, key2der, ctx);
 
         BIO_free(out);
     } else {
@@ -1243,34 +1229,34 @@ static int key2any_encode(KEY2ANY_CTX *ctx, OSSL_CORE_BIO *cout,
 }
 
 #define DO_PRIVATE_KEY_selection_mask OSSL_KEYMGMT_SELECT_PRIVATE_KEY
-#define DO_PRIVATE_KEY(impl, type, kind, output)                            \
-    if ((selection & DO_PRIVATE_KEY_selection_mask) != 0)                   \
-        return key2any_encode(ctx, cout, key, impl##_evp_type,              \
-                              impl##_pem_type " PRIVATE KEY",               \
-                              type##_check_key_type,                        \
-                              key_to_##kind##_##output##_priv_bio,          \
-                              cb, cbarg, prepare_##type##_params,           \
-                              type##_##kind##_priv_to_der);
+#define DO_PRIVATE_KEY(impl, type, kind, output)               \
+    if ((selection & DO_PRIVATE_KEY_selection_mask) != 0)      \
+        return key2any_encode(ctx, cout, key, impl##_evp_type, \
+            impl##_pem_type " PRIVATE KEY",                    \
+            type##_check_key_type,                             \
+            key_to_##kind##_##output##_priv_bio,               \
+            cb, cbarg, prepare_##type##_params,                \
+            type##_##kind##_priv_to_der);
 
 #define DO_PUBLIC_KEY_selection_mask OSSL_KEYMGMT_SELECT_PUBLIC_KEY
-#define DO_PUBLIC_KEY(impl, type, kind, output)                             \
-    if ((selection & DO_PUBLIC_KEY_selection_mask) != 0)                    \
-        return key2any_encode(ctx, cout, key, impl##_evp_type,              \
-                              impl##_pem_type " PUBLIC KEY",                \
-                              type##_check_key_type,                        \
-                              key_to_##kind##_##output##_pub_bio,           \
-                              cb, cbarg, prepare_##type##_params,           \
-                              type##_##kind##_pub_to_der);
+#define DO_PUBLIC_KEY(impl, type, kind, output)                \
+    if ((selection & DO_PUBLIC_KEY_selection_mask) != 0)       \
+        return key2any_encode(ctx, cout, key, impl##_evp_type, \
+            impl##_pem_type " PUBLIC KEY",                     \
+            type##_check_key_type,                             \
+            key_to_##kind##_##output##_pub_bio,                \
+            cb, cbarg, prepare_##type##_params,                \
+            type##_##kind##_pub_to_der);
 
 #define DO_PARAMETERS_selection_mask OSSL_KEYMGMT_SELECT_ALL_PARAMETERS
-#define DO_PARAMETERS(impl, type, kind, output)                             \
-    if ((selection & DO_PARAMETERS_selection_mask) != 0)                    \
-        return key2any_encode(ctx, cout, key, impl##_evp_type,              \
-                              impl##_pem_type " PARAMETERS",                \
-                              type##_check_key_type,                        \
-                              key_to_##kind##_##output##_param_bio,         \
-                              NULL, NULL, NULL,                             \
-                              type##_##kind##_params_to_der);
+#define DO_PARAMETERS(impl, type, kind, output)                \
+    if ((selection & DO_PARAMETERS_selection_mask) != 0)       \
+        return key2any_encode(ctx, cout, key, impl##_evp_type, \
+            impl##_pem_type " PARAMETERS",                     \
+            type##_check_key_type,                             \
+            key_to_##kind##_##output##_param_bio,              \
+            NULL, NULL, NULL,                                  \
+            type##_##kind##_params_to_der);
 
 /*-
  * Implement the kinds of output structure that can be produced.  They are
@@ -1306,16 +1292,16 @@ static int key2any_encode(KEY2ANY_CTX *ctx, OSSL_CORE_BIO *cout,
  * passphrase callback has been passed to them.
  */
 #define DO_PrivateKeyInfo_selection_mask DO_PRIVATE_KEY_selection_mask
-#define DO_PrivateKeyInfo(impl, type, output)                               \
+#define DO_PrivateKeyInfo(impl, type, output) \
     DO_PRIVATE_KEY(impl, type, pki, output)
 
 #define DO_EncryptedPrivateKeyInfo_selection_mask DO_PRIVATE_KEY_selection_mask
-#define DO_EncryptedPrivateKeyInfo(impl, type, output)                      \
+#define DO_EncryptedPrivateKeyInfo(impl, type, output) \
     DO_PRIVATE_KEY(impl, type, epki, output)
 
 /* SubjectPublicKeyInfo is a structure for public keys only */
 #define DO_SubjectPublicKeyInfo_selection_mask DO_PUBLIC_KEY_selection_mask
-#define DO_SubjectPublicKeyInfo(impl, type, output)                         \
+#define DO_SubjectPublicKeyInfo(impl, type, output) \
     DO_PUBLIC_KEY(impl, type, spki, output)
 
 /*
@@ -1334,23 +1320,23 @@ static int key2any_encode(KEY2ANY_CTX *ctx, OSSL_CORE_BIO *cout,
  *                                      except public key
  */
 #define DO_type_specific_params_selection_mask DO_PARAMETERS_selection_mask
-#define DO_type_specific_params(impl, type, output)                         \
+#define DO_type_specific_params(impl, type, output) \
     DO_PARAMETERS(impl, type, type_specific, output)
-#define DO_type_specific_keypair_selection_mask                             \
-    ( DO_PRIVATE_KEY_selection_mask | DO_PUBLIC_KEY_selection_mask )
-#define DO_type_specific_keypair(impl, type, output)                        \
-    DO_PRIVATE_KEY(impl, type, type_specific, output)                       \
+#define DO_type_specific_keypair_selection_mask \
+    (DO_PRIVATE_KEY_selection_mask | DO_PUBLIC_KEY_selection_mask)
+#define DO_type_specific_keypair(impl, type, output)  \
+    DO_PRIVATE_KEY(impl, type, type_specific, output) \
     DO_PUBLIC_KEY(impl, type, type_specific, output)
-#define DO_type_specific_selection_mask                                     \
-    ( DO_type_specific_keypair_selection_mask                               \
-      | DO_type_specific_params_selection_mask )
-#define DO_type_specific(impl, type, output)                                \
-    DO_type_specific_keypair(impl, type, output)                            \
-    DO_type_specific_params(impl, type, output)
+#define DO_type_specific_selection_mask      \
+    (DO_type_specific_keypair_selection_mask \
+        | DO_type_specific_params_selection_mask)
+#define DO_type_specific(impl, type, output)     \
+    DO_type_specific_keypair(impl, type, output) \
+        DO_type_specific_params(impl, type, output)
 #define DO_type_specific_no_pub_selection_mask \
-    ( DO_PRIVATE_KEY_selection_mask |  DO_PARAMETERS_selection_mask)
-#define DO_type_specific_no_pub(impl, type, output)                         \
-    DO_PRIVATE_KEY(impl, type, type_specific, output)                       \
+    (DO_PRIVATE_KEY_selection_mask | DO_PARAMETERS_selection_mask)
+#define DO_type_specific_no_pub(impl, type, output)   \
+    DO_PRIVATE_KEY(impl, type, type_specific, output) \
     DO_type_specific_params(impl, type, output)
 
 /*
@@ -1409,71 +1395,72 @@ static int key2any_encode(KEY2ANY_CTX *ctx, OSSL_CORE_BIO *cout,
  *
  * ossl_##impl##_to_##kind##_##output##_encoder_functions
  */
-#define MAKE_ENCODER(impl, type, kind, output)                              \
-    static OSSL_FUNC_encoder_import_object_fn                               \
-    impl##_to_##kind##_##output##_import_object;                            \
-    static OSSL_FUNC_encoder_free_object_fn                                 \
-    impl##_to_##kind##_##output##_free_object;                              \
-    static OSSL_FUNC_encoder_encode_fn                                      \
-    impl##_to_##kind##_##output##_encode;                                   \
-                                                                            \
-    static void *                                                           \
-    impl##_to_##kind##_##output##_import_object(void *vctx, int selection,  \
-                                                const OSSL_PARAM params[])  \
-    {                                                                       \
-        KEY2ANY_CTX *ctx = vctx;                                            \
-                                                                            \
-        return ossl_prov_import_key(ossl_##impl##_keymgmt_functions,        \
-                                    ctx->provctx, selection, params);       \
-    }                                                                       \
-    static void impl##_to_##kind##_##output##_free_object(void *key)        \
-    {                                                                       \
-        ossl_prov_free_key(ossl_##impl##_keymgmt_functions, key);           \
-    }                                                                       \
-    static int impl##_to_##kind##_##output##_does_selection(void *ctx,      \
-                                                            int selection)  \
-    {                                                                       \
-        return key2any_check_selection(selection,                           \
-                                       DO_##kind##_selection_mask);         \
-    }                                                                       \
-    static int                                                              \
-    impl##_to_##kind##_##output##_encode(void *ctx, OSSL_CORE_BIO *cout,    \
-                                         const void *key,                   \
-                                         const OSSL_PARAM key_abstract[],   \
-                                         int selection,                     \
-                                         OSSL_PASSPHRASE_CALLBACK *cb,      \
-                                         void *cbarg)                       \
-    {                                                                       \
-        /* We don't deal with abstract objects */                           \
-        if (key_abstract != NULL) {                                         \
-            ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);         \
-            return 0;                                                       \
-        }                                                                   \
-        DO_##kind(impl, type, output)                                       \
-                                                                            \
-        ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);             \
-        return 0;                                                           \
-    }                                                                       \
-    const OSSL_DISPATCH                                                     \
-    ossl_##impl##_to_##kind##_##output##_encoder_functions[] = {            \
-        { OSSL_FUNC_ENCODER_NEWCTX,                                         \
-          (void (*)(void))key2any_newctx },                                 \
-        { OSSL_FUNC_ENCODER_FREECTX,                                        \
-          (void (*)(void))key2any_freectx },                                \
-        { OSSL_FUNC_ENCODER_SETTABLE_CTX_PARAMS,                            \
-          (void (*)(void))key2any_settable_ctx_params },                    \
-        { OSSL_FUNC_ENCODER_SET_CTX_PARAMS,                                 \
-          (void (*)(void))key2any_set_ctx_params },                         \
-        { OSSL_FUNC_ENCODER_DOES_SELECTION,                                 \
-          (void (*)(void))impl##_to_##kind##_##output##_does_selection },   \
-        { OSSL_FUNC_ENCODER_IMPORT_OBJECT,                                  \
-          (void (*)(void))impl##_to_##kind##_##output##_import_object },    \
-        { OSSL_FUNC_ENCODER_FREE_OBJECT,                                    \
-          (void (*)(void))impl##_to_##kind##_##output##_free_object },      \
-        { OSSL_FUNC_ENCODER_ENCODE,                                         \
-          (void (*)(void))impl##_to_##kind##_##output##_encode },           \
-        OSSL_DISPATCH_END                                                   \
-    }
+#define MAKE_ENCODER(impl, type, kind, output)                                    \
+    static OSSL_FUNC_encoder_import_object_fn                                     \
+        impl##_to_##kind##_##output##_import_object;                              \
+    static OSSL_FUNC_encoder_free_object_fn                                       \
+        impl##_to_##kind##_##output##_free_object;                                \
+    static OSSL_FUNC_encoder_encode_fn                                            \
+        impl##_to_##kind##_##output##_encode;                                     \
+                                                                                  \
+    static void *                                                                 \
+    impl##_to_##kind##_##output##_import_object(void *vctx, int selection,        \
+        const OSSL_PARAM params[])                                                \
+    {                                                                             \
+        KEY2ANY_CTX *ctx = vctx;                                                  \
+                                                                                  \
+        return ossl_prov_import_key(ossl_##impl##_keymgmt_functions,              \
+            ctx->provctx, selection, params);                                     \
+    }                                                                             \
+    static void impl##_to_##kind##_##output##_free_object(void *key)              \
+    {                                                                             \
+        ossl_prov_free_key(ossl_##impl##_keymgmt_functions, key);                 \
+    }                                                                             \
+    static int impl##_to_##kind##_##output##_does_selection(void *ctx,            \
+        int selection)                                                            \
+    {                                                                             \
+        return key2any_check_selection(selection,                                 \
+            DO_##kind##_selection_mask);                                          \
+    }                                                                             \
+    static int                                                                    \
+    impl##_to_##kind##_##output##_encode(void *ctx, OSSL_CORE_BIO *cout,          \
+        const void *key,                                                          \
+        const OSSL_PARAM key_abstract[],                                          \
+        int selection,                                                            \
+        OSSL_PASSPHRASE_CALLBACK *cb,                                             \
+        void *cbarg)                                                              \
+    {                                                                             \
+        /* We don't deal with abstract objects */                                 \
+        if (key_abstract != NULL) {                                               \
+            ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);               \
+            return 0;                                                             \
+        }                                                                         \
+        DO_##kind(impl, type, output)                                             \
+                                                                                  \
+            ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);               \
+        return 0;                                                                 \
+    }                                                                             \
+    const OSSL_DISPATCH                                                           \
+        ossl_##impl##_to_##kind##_##output##_encoder_functions[]                  \
+        = {                                                                       \
+              { OSSL_FUNC_ENCODER_NEWCTX,                                         \
+                  (void (*)(void))key2any_newctx },                               \
+              { OSSL_FUNC_ENCODER_FREECTX,                                        \
+                  (void (*)(void))key2any_freectx },                              \
+              { OSSL_FUNC_ENCODER_SETTABLE_CTX_PARAMS,                            \
+                  (void (*)(void))key2any_settable_ctx_params },                  \
+              { OSSL_FUNC_ENCODER_SET_CTX_PARAMS,                                 \
+                  (void (*)(void))key2any_set_ctx_params },                       \
+              { OSSL_FUNC_ENCODER_DOES_SELECTION,                                 \
+                  (void (*)(void))impl##_to_##kind##_##output##_does_selection }, \
+              { OSSL_FUNC_ENCODER_IMPORT_OBJECT,                                  \
+                  (void (*)(void))impl##_to_##kind##_##output##_import_object },  \
+              { OSSL_FUNC_ENCODER_FREE_OBJECT,                                    \
+                  (void (*)(void))impl##_to_##kind##_##output##_free_object },    \
+              { OSSL_FUNC_ENCODER_ENCODE,                                         \
+                  (void (*)(void))impl##_to_##kind##_##output##_encode },         \
+              OSSL_DISPATCH_END                                                   \
+          }
 
 /*
  * Replacements for i2d_{TYPE}PrivateKey, i2d_{TYPE}PublicKey,
@@ -1489,9 +1476,9 @@ MAKE_ENCODER(dsa, dsa, type_specific, der);
 #endif
 #ifndef OPENSSL_NO_EC
 MAKE_ENCODER(ec, ec, type_specific_no_pub, der);
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 MAKE_ENCODER(sm2, ec, type_specific_no_pub, der);
-# endif
+#endif
 #endif
 
 /*
@@ -1508,9 +1495,9 @@ MAKE_ENCODER(dsa, dsa, type_specific, pem);
 #endif
 #ifndef OPENSSL_NO_EC
 MAKE_ENCODER(ec, ec, type_specific_no_pub, pem);
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 MAKE_ENCODER(sm2, ec, type_specific_no_pub, pem);
-# endif
+#endif
 #endif
 
 /*
@@ -1562,15 +1549,15 @@ MAKE_ENCODER(ec, ec, PrivateKeyInfo, der);
 MAKE_ENCODER(ec, ec, PrivateKeyInfo, pem);
 MAKE_ENCODER(ec, ec, SubjectPublicKeyInfo, der);
 MAKE_ENCODER(ec, ec, SubjectPublicKeyInfo, pem);
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 MAKE_ENCODER(sm2, ec, EncryptedPrivateKeyInfo, der);
 MAKE_ENCODER(sm2, ec, EncryptedPrivateKeyInfo, pem);
 MAKE_ENCODER(sm2, ec, PrivateKeyInfo, der);
 MAKE_ENCODER(sm2, ec, PrivateKeyInfo, pem);
 MAKE_ENCODER(sm2, ec, SubjectPublicKeyInfo, der);
 MAKE_ENCODER(sm2, ec, SubjectPublicKeyInfo, pem);
-# endif
-# ifndef OPENSSL_NO_ECX
+#endif
+#ifndef OPENSSL_NO_ECX
 MAKE_ENCODER(ed25519, ecx, EncryptedPrivateKeyInfo, der);
 MAKE_ENCODER(ed25519, ecx, EncryptedPrivateKeyInfo, pem);
 MAKE_ENCODER(ed25519, ecx, PrivateKeyInfo, der);
@@ -1595,7 +1582,7 @@ MAKE_ENCODER(x448, ecx, PrivateKeyInfo, der);
 MAKE_ENCODER(x448, ecx, PrivateKeyInfo, pem);
 MAKE_ENCODER(x448, ecx, SubjectPublicKeyInfo, der);
 MAKE_ENCODER(x448, ecx, SubjectPublicKeyInfo, pem);
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_SLH_DSA
 MAKE_ENCODER(slh_dsa_sha2_128s, slh_dsa, EncryptedPrivateKeyInfo, der);
@@ -1718,10 +1705,10 @@ MAKE_ENCODER(dsa, dsa, DSA, pem);
 #ifndef OPENSSL_NO_EC
 MAKE_ENCODER(ec, ec, EC, der);
 MAKE_ENCODER(ec, ec, EC, pem);
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 MAKE_ENCODER(sm2, ec, SM2, der);
 MAKE_ENCODER(sm2, ec, SM2, pem);
-# endif
+#endif
 #endif
 
 /* Convenience structure names */
diff --git a/providers/implementations/encode_decode/encode_key2blob.c b/providers/implementations/encode_decode/encode_key2blob.c
index 29e72faa63def..437bf022d62b4 100644
--- a/providers/implementations/encode_decode/encode_key2blob.c
+++ b/providers/implementations/encode_decode/encode_key2blob.c
@@ -27,7 +27,7 @@
 #include "endecoder_local.h"
 
 static int write_blob(void *provctx, OSSL_CORE_BIO *cout,
-                      void *data, int len)
+    void *data, int len)
 {
     BIO *out = ossl_bio_new_from_core_bio(provctx, cout);
     int ret;
@@ -86,7 +86,7 @@ static int key2blob_check_selection(int selection, int selection_mask)
 }
 
 static int key2blob_encode(void *vctx, const void *key, int selection,
-                           OSSL_CORE_BIO *cout)
+    OSSL_CORE_BIO *cout)
 {
     int pubkey_len = 0, ok = 0;
     unsigned char *pubkey = NULL;
@@ -118,62 +118,62 @@ static int key2blob_encode(void *vctx, const void *key, int selection,
  * EVP_PKEY_##selection_name are convenience macros that combine "typical"
  * OSSL_KEYMGMT_SELECT_ macros for a certain type of EVP_PKEY content.
  */
-#define MAKE_BLOB_ENCODER(impl, type, selection_name)                   \
-    static OSSL_FUNC_encoder_import_object_fn                           \
-    impl##2blob_import_object;                                          \
-    static OSSL_FUNC_encoder_free_object_fn impl##2blob_free_object;    \
-    static OSSL_FUNC_encoder_does_selection_fn                          \
-    impl##2blob_does_selection;                                         \
-    static OSSL_FUNC_encoder_encode_fn impl##2blob_encode;              \
-                                                                        \
-    static void *impl##2blob_import_object(void *ctx, int selection,    \
-                                           const OSSL_PARAM params[])   \
-    {                                                                   \
-        return ossl_prov_import_key(ossl_##impl##_keymgmt_functions,    \
-                                    ctx, selection, params);            \
-    }                                                                   \
-    static void impl##2blob_free_object(void *key)                      \
-    {                                                                   \
-        ossl_prov_free_key(ossl_##impl##_keymgmt_functions, key);       \
-    }                                                                   \
-    static int impl##2blob_does_selection(void *ctx, int selection)     \
-    {                                                                   \
-        return key2blob_check_selection(selection,                      \
-                                        EVP_PKEY_##selection_name);     \
-    }                                                                   \
-    static int impl##2blob_encode(void *vctx, OSSL_CORE_BIO *cout,      \
-                                  const void *key,                      \
-                                  const OSSL_PARAM key_abstract[],      \
-                                  int selection,                        \
-                                  OSSL_PASSPHRASE_CALLBACK *cb,         \
-                                  void *cbarg)                          \
-    {                                                                   \
-        /* We don't deal with abstract objects */                       \
-        if (key_abstract != NULL) {                                     \
-            ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);     \
-            return 0;                                                   \
-        }                                                               \
-        return key2blob_encode(vctx, key, selection, cout);             \
-    }                                                                   \
-    const OSSL_DISPATCH ossl_##impl##_to_blob_encoder_functions[] = {   \
-        { OSSL_FUNC_ENCODER_NEWCTX,                                     \
-          (void (*)(void))key2blob_newctx },                            \
-        { OSSL_FUNC_ENCODER_FREECTX,                                    \
-          (void (*)(void))key2blob_freectx },                           \
-        { OSSL_FUNC_ENCODER_DOES_SELECTION,                             \
-          (void (*)(void))impl##2blob_does_selection },                 \
-        { OSSL_FUNC_ENCODER_IMPORT_OBJECT,                              \
-          (void (*)(void))impl##2blob_import_object },                  \
-        { OSSL_FUNC_ENCODER_FREE_OBJECT,                                \
-          (void (*)(void))impl##2blob_free_object },                    \
-        { OSSL_FUNC_ENCODER_ENCODE,                                     \
-          (void (*)(void))impl##2blob_encode },                         \
-        OSSL_DISPATCH_END                                               \
+#define MAKE_BLOB_ENCODER(impl, type, selection_name)                 \
+    static OSSL_FUNC_encoder_import_object_fn                         \
+        impl##2blob_import_object;                                    \
+    static OSSL_FUNC_encoder_free_object_fn impl##2blob_free_object;  \
+    static OSSL_FUNC_encoder_does_selection_fn                        \
+        impl##2blob_does_selection;                                   \
+    static OSSL_FUNC_encoder_encode_fn impl##2blob_encode;            \
+                                                                      \
+    static void *impl##2blob_import_object(void *ctx, int selection,  \
+        const OSSL_PARAM params[])                                    \
+    {                                                                 \
+        return ossl_prov_import_key(ossl_##impl##_keymgmt_functions,  \
+            ctx, selection, params);                                  \
+    }                                                                 \
+    static void impl##2blob_free_object(void *key)                    \
+    {                                                                 \
+        ossl_prov_free_key(ossl_##impl##_keymgmt_functions, key);     \
+    }                                                                 \
+    static int impl##2blob_does_selection(void *ctx, int selection)   \
+    {                                                                 \
+        return key2blob_check_selection(selection,                    \
+            EVP_PKEY_##selection_name);                               \
+    }                                                                 \
+    static int impl##2blob_encode(void *vctx, OSSL_CORE_BIO *cout,    \
+        const void *key,                                              \
+        const OSSL_PARAM key_abstract[],                              \
+        int selection,                                                \
+        OSSL_PASSPHRASE_CALLBACK *cb,                                 \
+        void *cbarg)                                                  \
+    {                                                                 \
+        /* We don't deal with abstract objects */                     \
+        if (key_abstract != NULL) {                                   \
+            ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);   \
+            return 0;                                                 \
+        }                                                             \
+        return key2blob_encode(vctx, key, selection, cout);           \
+    }                                                                 \
+    const OSSL_DISPATCH ossl_##impl##_to_blob_encoder_functions[] = { \
+        { OSSL_FUNC_ENCODER_NEWCTX,                                   \
+            (void (*)(void))key2blob_newctx },                        \
+        { OSSL_FUNC_ENCODER_FREECTX,                                  \
+            (void (*)(void))key2blob_freectx },                       \
+        { OSSL_FUNC_ENCODER_DOES_SELECTION,                           \
+            (void (*)(void))impl##2blob_does_selection },             \
+        { OSSL_FUNC_ENCODER_IMPORT_OBJECT,                            \
+            (void (*)(void))impl##2blob_import_object },              \
+        { OSSL_FUNC_ENCODER_FREE_OBJECT,                              \
+            (void (*)(void))impl##2blob_free_object },                \
+        { OSSL_FUNC_ENCODER_ENCODE,                                   \
+            (void (*)(void))impl##2blob_encode },                     \
+        OSSL_DISPATCH_END                                             \
     }
 
 #ifndef OPENSSL_NO_EC
 MAKE_BLOB_ENCODER(ec, ec, PUBLIC_KEY);
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 MAKE_BLOB_ENCODER(sm2, ec, PUBLIC_KEY);
-# endif
+#endif
 #endif
diff --git a/providers/implementations/encode_decode/encode_key2ms.c b/providers/implementations/encode_decode/encode_key2ms.c
index 1f21a5129615a..362a806589e6a 100644
--- a/providers/implementations/encode_decode/encode_key2ms.c
+++ b/providers/implementations/encode_decode/encode_key2ms.c
@@ -18,7 +18,7 @@
 #include <openssl/core_names.h>
 #include <openssl/params.h>
 #include <openssl/err.h>
-#include <openssl/pem.h>         /* Functions for writing MSBLOB and PVK */
+#include <openssl/pem.h> /* Functions for writing MSBLOB and PVK */
 #include <openssl/dsa.h>
 #include "internal/passphrase.h"
 #include "crypto/rsa.h"
@@ -36,7 +36,7 @@ struct key2ms_ctx_st {
 };
 
 static int write_msblob(struct key2ms_ctx_st *ctx, OSSL_CORE_BIO *cout,
-                        EVP_PKEY *pkey, int ispub)
+    EVP_PKEY *pkey, int ispub)
 {
     BIO *out = ossl_bio_new_from_core_bio(ctx->provctx, cout);
     int ret;
@@ -50,7 +50,7 @@ static int write_msblob(struct key2ms_ctx_st *ctx, OSSL_CORE_BIO *cout,
 }
 
 static int write_pvk(struct key2ms_ctx_st *ctx, OSSL_CORE_BIO *cout,
-                     EVP_PKEY *pkey)
+    EVP_PKEY *pkey)
 {
     BIO *out = NULL;
     int ret;
@@ -60,7 +60,7 @@ static int write_pvk(struct key2ms_ctx_st *ctx, OSSL_CORE_BIO *cout,
     if (out == NULL)
         return 0;
     ret = i2b_PVK_bio_ex(out, pkey, ctx->pvk_encr_level,
-                         ossl_pw_pvk_password, &ctx->pwdata, libctx, NULL);
+        ossl_pw_pvk_password, &ctx->pwdata, libctx, NULL);
     BIO_free(out);
     return ret;
 }
@@ -126,8 +126,8 @@ static int key2ms_does_selection(void *vctx, int selection)
 typedef int evp_pkey_set1_fn(EVP_PKEY *, const void *key);
 
 static int key2msblob_encode(void *vctx, const void *key, int selection,
-                             OSSL_CORE_BIO *cout, evp_pkey_set1_fn *set1_key,
-                             OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CORE_BIO *cout, evp_pkey_set1_fn *set1_key,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct key2ms_ctx_st *ctx = vctx;
     int ispub = -1;
@@ -139,7 +139,7 @@ static int key2msblob_encode(void *vctx, const void *key, int selection,
     else if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0)
         ispub = 1;
     else
-        return 0;                /* Error */
+        return 0; /* Error */
 
     if ((pkey = EVP_PKEY_new()) != NULL && set1_key(pkey, key))
         ok = write_msblob(ctx, cout, pkey, ispub);
@@ -148,15 +148,15 @@ static int key2msblob_encode(void *vctx, const void *key, int selection,
 }
 
 static int key2pvk_encode(void *vctx, const void *key, int selection,
-                          OSSL_CORE_BIO *cout, evp_pkey_set1_fn *set1_key,
-                          OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CORE_BIO *cout, evp_pkey_set1_fn *set1_key,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct key2ms_ctx_st *ctx = vctx;
     EVP_PKEY *pkey = NULL;
     int ok = 0;
 
     if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) == 0)
-        return 0;                /* Error */
+        return 0; /* Error */
 
     if ((pkey = EVP_PKEY_new()) != NULL && set1_key(pkey, key)
         && (pw_cb == NULL
@@ -166,39 +166,39 @@ static int key2pvk_encode(void *vctx, const void *key, int selection,
     return ok;
 }
 
-#define dsa_set1        (evp_pkey_set1_fn *)EVP_PKEY_set1_DSA
-#define rsa_set1        (evp_pkey_set1_fn *)EVP_PKEY_set1_RSA
+#define dsa_set1 (evp_pkey_set1_fn *)EVP_PKEY_set1_DSA
+#define rsa_set1 (evp_pkey_set1_fn *)EVP_PKEY_set1_RSA
 
 #define msblob_set_params
-#define pvk_set_params                                                        \
-        { OSSL_FUNC_ENCODER_SETTABLE_CTX_PARAMS,                              \
-          (void (*)(void))key2pvk_settable_ctx_params },                      \
-        { OSSL_FUNC_ENCODER_SET_CTX_PARAMS,                                   \
-          (void (*)(void))key2pvk_set_ctx_params },
+#define pvk_set_params                                 \
+    { OSSL_FUNC_ENCODER_SETTABLE_CTX_PARAMS,           \
+        (void (*)(void))key2pvk_settable_ctx_params }, \
+        { OSSL_FUNC_ENCODER_SET_CTX_PARAMS,            \
+            (void (*)(void))key2pvk_set_ctx_params },
 
 #define MAKE_MS_ENCODER(impl, output, type)                                   \
     static OSSL_FUNC_encoder_import_object_fn                                 \
-    impl##2##output##_import_object;                                          \
+        impl##2##output##_import_object;                                      \
     static OSSL_FUNC_encoder_free_object_fn impl##2##output##_free_object;    \
     static OSSL_FUNC_encoder_encode_fn impl##2##output##_encode;              \
                                                                               \
     static void *                                                             \
-    impl##2##output##_import_object(void *ctx, int selection,                 \
-                                    const OSSL_PARAM params[])                \
+        impl##2##output##_import_object(void *ctx, int selection,             \
+            const OSSL_PARAM params[])                                        \
     {                                                                         \
         return ossl_prov_import_key(ossl_##impl##_keymgmt_functions,          \
-                                    ctx, selection, params);                  \
+            ctx, selection, params);                                          \
     }                                                                         \
     static void impl##2##output##_free_object(void *key)                      \
     {                                                                         \
         ossl_prov_free_key(ossl_##impl##_keymgmt_functions, key);             \
     }                                                                         \
     static int impl##2##output##_encode(void *vctx, OSSL_CORE_BIO *cout,      \
-                                        const void *key,                      \
-                                        const OSSL_PARAM key_abstract[],      \
-                                        int selection,                        \
-                                        OSSL_PASSPHRASE_CALLBACK *cb,         \
-                                        void *cbarg)                          \
+        const void *key,                                                      \
+        const OSSL_PARAM key_abstract[],                                      \
+        int selection,                                                        \
+        OSSL_PASSPHRASE_CALLBACK *cb,                                         \
+        void *cbarg)                                                          \
     {                                                                         \
         /* We don't deal with abstract objects */                             \
         if (key_abstract != NULL) {                                           \
@@ -206,22 +206,21 @@ static int key2pvk_encode(void *vctx, const void *key, int selection,
             return 0;                                                         \
         }                                                                     \
         return key2##output##_encode(vctx, key, selection, cout, type##_set1, \
-                                     cb, cbarg);                              \
+            cb, cbarg);                                                       \
     }                                                                         \
     const OSSL_DISPATCH ossl_##impl##_to_##output##_encoder_functions[] = {   \
         { OSSL_FUNC_ENCODER_NEWCTX,                                           \
-          (void (*)(void))key2ms_newctx },                                    \
+            (void (*)(void))key2ms_newctx },                                  \
         { OSSL_FUNC_ENCODER_FREECTX,                                          \
-          (void (*)(void))key2ms_freectx },                                   \
-        output##_set_params                                                   \
-        { OSSL_FUNC_ENCODER_DOES_SELECTION,                                   \
-          (void (*)(void))key2ms_does_selection },                            \
+            (void (*)(void))key2ms_freectx },                                 \
+        output##_set_params { OSSL_FUNC_ENCODER_DOES_SELECTION,               \
+            (void (*)(void))key2ms_does_selection },                          \
         { OSSL_FUNC_ENCODER_IMPORT_OBJECT,                                    \
-          (void (*)(void))impl##2##output##_import_object },                  \
+            (void (*)(void))impl##2##output##_import_object },                \
         { OSSL_FUNC_ENCODER_FREE_OBJECT,                                      \
-          (void (*)(void))impl##2##output##_free_object },                    \
+            (void (*)(void))impl##2##output##_free_object },                  \
         { OSSL_FUNC_ENCODER_ENCODE,                                           \
-          (void (*)(void))impl##2##output##_encode },                         \
+            (void (*)(void))impl##2##output##_encode },                       \
         OSSL_DISPATCH_END                                                     \
     }
 
diff --git a/providers/implementations/encode_decode/encode_key2text.c b/providers/implementations/encode_decode/encode_key2text.c
index 7a564807326f0..5c120d469d224 100644
--- a/providers/implementations/encode_decode/encode_key2text.c
+++ b/providers/implementations/encode_decode/encode_key2text.c
@@ -19,12 +19,12 @@
 #include <openssl/err.h>
 #include <openssl/safestack.h>
 #include <openssl/proverr.h>
-#include "crypto/dh.h"           /* ossl_dh_get0_params() */
-#include "crypto/dsa.h"          /* ossl_dsa_get0_params() */
-#include "crypto/ec.h"           /* ossl_ec_key_get_libctx */
-#include "crypto/ecx.h"          /* ECX_KEY, etc... */
-#include "crypto/ml_kem.h"       /* ML_KEM_KEY, etc... */
-#include "crypto/rsa.h"          /* RSA_PSS_PARAMS_30, etc... */
+#include "crypto/dh.h" /* ossl_dh_get0_params() */
+#include "crypto/dsa.h" /* ossl_dsa_get0_params() */
+#include "crypto/ec.h" /* ossl_ec_key_get_libctx */
+#include "crypto/ecx.h" /* ECX_KEY, etc... */
+#include "crypto/ml_kem.h" /* ML_KEM_KEY, etc... */
+#include "crypto/rsa.h" /* RSA_PSS_PARAMS_30, etc... */
 #include "crypto/ml_dsa.h"
 #include "crypto/slh_dsa.h"
 #include "prov/bio.h"
@@ -102,7 +102,8 @@ static int dh_to_text(BIO *out, const void *key, int selection)
     length = DH_get_length(dh);
     if (length > 0
         && BIO_printf(out, "recommended-private-length: %ld bits\n",
-                      length) <= 0)
+               length)
+            <= 0)
         return 0;
 
     return 1;
@@ -180,7 +181,7 @@ static int dsa_to_text(BIO *out, const void *key, int selection)
 
 #ifndef OPENSSL_NO_EC
 static int ec_param_explicit_curve_to_text(BIO *out, const EC_GROUP *group,
-                                           BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     const char *plabel = "Prime:";
     BIGNUM *p = NULL, *a = NULL, *b = NULL;
@@ -207,7 +208,7 @@ static int ec_param_explicit_curve_to_text(BIO *out, const EC_GROUP *group,
 }
 
 static int ec_param_explicit_gen_to_text(BIO *out, const EC_GROUP *group,
-                                         BN_CTX *ctx)
+    BN_CTX *ctx)
 {
     int ret;
     size_t buflen;
@@ -224,8 +225,8 @@ static int ec_param_explicit_gen_to_text(BIO *out, const EC_GROUP *group,
 
     switch (form) {
     case POINT_CONVERSION_COMPRESSED:
-       glabel = "Generator (compressed):";
-       break;
+        glabel = "Generator (compressed):";
+        break;
     case POINT_CONVERSION_UNCOMPRESSED:
         glabel = "Generator (uncompressed):";
         break;
@@ -247,7 +248,7 @@ static int ec_param_explicit_gen_to_text(BIO *out, const EC_GROUP *group,
 
 /* Print explicit parameters */
 static int ec_param_explicit_to_text(BIO *out, const EC_GROUP *group,
-                                     OSSL_LIB_CTX *libctx)
+    OSSL_LIB_CTX *libctx)
 {
     int ret = 0, tmp_nid;
     BN_CTX *ctx = NULL;
@@ -288,7 +289,7 @@ static int ec_param_explicit_to_text(BIO *out, const EC_GROUP *group,
 }
 
 static int ec_param_to_text(BIO *out, const EC_GROUP *group,
-                            OSSL_LIB_CTX *libctx)
+    OSSL_LIB_CTX *libctx)
 {
     if (EC_GROUP_get_asn1_flag(group) & OPENSSL_EC_NAMED_CURVE) {
         const char *curve_name;
@@ -303,7 +304,7 @@ static int ec_param_to_text(BIO *out, const EC_GROUP *group,
 
         curve_name = EC_curve_nid2nist(curve_nid);
         return (curve_name == NULL
-                || BIO_printf(out, "%s: %s\n", "NIST CURVE", curve_name) > 0);
+            || BIO_printf(out, "%s: %s\n", "NIST CURVE", curve_name) > 0);
     } else {
         return ec_param_explicit_to_text(out, group, libctx);
     }
@@ -362,7 +363,8 @@ static int ec_to_text(BIO *out, const void *key, int selection)
 
     if (type_label != NULL
         && BIO_printf(out, "%s: (%d bit)\n", type_label,
-                      EC_GROUP_order_bits(group)) <= 0)
+               EC_GROUP_order_bits(group))
+            <= 0)
         goto err;
     if (priv != NULL
         && !ossl_bio_print_labeled_buf(out, "priv:", priv, priv_len))
@@ -497,11 +499,13 @@ static int rsa_to_text(BIO *out, const void *key, int selection)
 
     if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
         if (BIO_printf(out, "%s: (%d bit, %d primes)\n",
-                       type_label, BN_num_bits(rsa_n), primes) <= 0)
+                type_label, BN_num_bits(rsa_n), primes)
+            <= 0)
             goto err;
     } else {
         if (BIO_printf(out, "%s: (%d bit)\n",
-                       type_label, BN_num_bits(rsa_n)) <= 0)
+                type_label, BN_num_bits(rsa_n))
+            <= 0)
             goto err;
     }
 
@@ -515,35 +519,35 @@ static int rsa_to_text(BIO *out, const void *key, int selection)
         if (!ossl_bio_print_labeled_bignum(out, "privateExponent:", rsa_d))
             goto err;
         if (!ossl_bio_print_labeled_bignum(out, "prime1:",
-                                           sk_BIGNUM_const_value(factors, 0)))
+                sk_BIGNUM_const_value(factors, 0)))
             goto err;
         if (!ossl_bio_print_labeled_bignum(out, "prime2:",
-                                           sk_BIGNUM_const_value(factors, 1)))
+                sk_BIGNUM_const_value(factors, 1)))
             goto err;
         if (!ossl_bio_print_labeled_bignum(out, "exponent1:",
-                                           sk_BIGNUM_const_value(exps, 0)))
+                sk_BIGNUM_const_value(exps, 0)))
             goto err;
         if (!ossl_bio_print_labeled_bignum(out, "exponent2:",
-                                           sk_BIGNUM_const_value(exps, 1)))
+                sk_BIGNUM_const_value(exps, 1)))
             goto err;
         if (!ossl_bio_print_labeled_bignum(out, "coefficient:",
-                                           sk_BIGNUM_const_value(coeffs, 0)))
+                sk_BIGNUM_const_value(coeffs, 0)))
             goto err;
         for (i = 2; i < sk_BIGNUM_const_num(factors); i++) {
             if (BIO_printf(out, "prime%d:", i + 1) <= 0)
                 goto err;
             if (!ossl_bio_print_labeled_bignum(out, NULL,
-                                               sk_BIGNUM_const_value(factors, i)))
+                    sk_BIGNUM_const_value(factors, i)))
                 goto err;
             if (BIO_printf(out, "exponent%d:", i + 1) <= 0)
                 goto err;
             if (!ossl_bio_print_labeled_bignum(out, NULL,
-                                               sk_BIGNUM_const_value(exps, i)))
+                    sk_BIGNUM_const_value(exps, i)))
                 goto err;
             if (BIO_printf(out, "coefficient%d:", i + 1) <= 0)
                 goto err;
             if (!ossl_bio_print_labeled_bignum(out, NULL,
-                                               sk_BIGNUM_const_value(coeffs, i - 1)))
+                    sk_BIGNUM_const_value(coeffs, i - 1)))
                 goto err;
         }
     }
@@ -562,35 +566,38 @@ static int rsa_to_text(BIO *out, const void *key, int selection)
                     goto err;
             } else {
                 int hashalg_nid = ossl_rsa_pss_params_30_hashalg(pss_params);
-                int maskgenalg_nid =
-                    ossl_rsa_pss_params_30_maskgenalg(pss_params);
-                int maskgenhashalg_nid =
-                    ossl_rsa_pss_params_30_maskgenhashalg(pss_params);
+                int maskgenalg_nid = ossl_rsa_pss_params_30_maskgenalg(pss_params);
+                int maskgenhashalg_nid = ossl_rsa_pss_params_30_maskgenhashalg(pss_params);
                 int saltlen = ossl_rsa_pss_params_30_saltlen(pss_params);
-                int trailerfield =
-                    ossl_rsa_pss_params_30_trailerfield(pss_params);
+                int trailerfield = ossl_rsa_pss_params_30_trailerfield(pss_params);
 
                 if (BIO_printf(out, "PSS parameter restrictions:\n") <= 0)
                     goto err;
                 if (BIO_printf(out, "  Hash Algorithm: %s%s\n",
-                               ossl_rsa_oaeppss_nid2name(hashalg_nid),
-                               (hashalg_nid == NID_sha1
-                                ? " (default)" : "")) <= 0)
+                        ossl_rsa_oaeppss_nid2name(hashalg_nid),
+                        (hashalg_nid == NID_sha1
+                                ? " (default)"
+                                : ""))
+                    <= 0)
                     goto err;
                 if (BIO_printf(out, "  Mask Algorithm: %s with %s%s\n",
-                               ossl_rsa_mgf_nid2name(maskgenalg_nid),
-                               ossl_rsa_oaeppss_nid2name(maskgenhashalg_nid),
-                               (maskgenalg_nid == NID_mgf1
-                                && maskgenhashalg_nid == NID_sha1
-                                ? " (default)" : "")) <= 0)
+                        ossl_rsa_mgf_nid2name(maskgenalg_nid),
+                        ossl_rsa_oaeppss_nid2name(maskgenhashalg_nid),
+                        (maskgenalg_nid == NID_mgf1
+                                    && maskgenhashalg_nid == NID_sha1
+                                ? " (default)"
+                                : ""))
+                    <= 0)
                     goto err;
                 if (BIO_printf(out, "  Minimum Salt Length: %d%s\n",
-                               saltlen,
-                               (saltlen == 20 ? " (default)" : "")) <= 0)
+                        saltlen,
+                        (saltlen == 20 ? " (default)" : ""))
+                    <= 0)
                     goto err;
                 if (BIO_printf(out, "  Trailer Field: 0x%x%s\n",
-                               trailerfield,
-                               (trailerfield == 1 ? " (default)" : "")) <= 0)
+                        trailerfield,
+                        (trailerfield == 1 ? " (default)" : ""))
+                    <= 0)
                     goto err;
             }
             break;
@@ -598,7 +605,7 @@ static int rsa_to_text(BIO *out, const void *key, int selection)
     }
 
     ret = 1;
- err:
+err:
     sk_BIGNUM_const_free(factors);
     sk_BIGNUM_const_free(exps);
     sk_BIGNUM_const_free(coeffs);
@@ -625,10 +632,10 @@ static void key2text_freectx(ossl_unused void *vctx)
 }
 
 static int key2text_encode(void *vctx, const void *key, int selection,
-                           OSSL_CORE_BIO *cout,
-                           int (*key2text)(BIO *out, const void *key,
-                                           int selection),
-                           OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
+    OSSL_CORE_BIO *cout,
+    int (*key2text)(BIO *out, const void *key,
+        int selection),
+    OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
     BIO *out = ossl_bio_new_from_core_bio(vctx, cout);
     int ret;
@@ -642,50 +649,50 @@ static int key2text_encode(void *vctx, const void *key, int selection,
     return ret;
 }
 
-#define MAKE_TEXT_ENCODER(impl, type)                                   \
-    static OSSL_FUNC_encoder_import_object_fn                           \
-    impl##2text_import_object;                                          \
-    static OSSL_FUNC_encoder_free_object_fn                             \
-    impl##2text_free_object;                                            \
-    static OSSL_FUNC_encoder_encode_fn impl##2text_encode;              \
-                                                                        \
-    static void *impl##2text_import_object(void *ctx, int selection,    \
-                                           const OSSL_PARAM params[])   \
-    {                                                                   \
-        return ossl_prov_import_key(ossl_##impl##_keymgmt_functions,    \
-                                    ctx, selection, params);            \
-    }                                                                   \
-    static void impl##2text_free_object(void *key)                      \
-    {                                                                   \
-        ossl_prov_free_key(ossl_##impl##_keymgmt_functions, key);       \
-    }                                                                   \
-    static int impl##2text_encode(void *vctx, OSSL_CORE_BIO *cout,      \
-                                  const void *key,                      \
-                                  const OSSL_PARAM key_abstract[],      \
-                                  int selection,                        \
-                                  OSSL_PASSPHRASE_CALLBACK *cb,         \
-                                  void *cbarg)                          \
-    {                                                                   \
-        /* We don't deal with abstract objects */                       \
-        if (key_abstract != NULL) {                                     \
-            ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);     \
-            return 0;                                                   \
-        }                                                               \
-        return key2text_encode(vctx, key, selection, cout,              \
-                               type##_to_text, cb, cbarg);              \
-    }                                                                   \
-    const OSSL_DISPATCH ossl_##impl##_to_text_encoder_functions[] = {   \
-        { OSSL_FUNC_ENCODER_NEWCTX,                                     \
-          (void (*)(void))key2text_newctx },                            \
-        { OSSL_FUNC_ENCODER_FREECTX,                                    \
-          (void (*)(void))key2text_freectx },                           \
-        { OSSL_FUNC_ENCODER_IMPORT_OBJECT,                              \
-          (void (*)(void))impl##2text_import_object },                  \
-        { OSSL_FUNC_ENCODER_FREE_OBJECT,                                \
-          (void (*)(void))impl##2text_free_object },                    \
-        { OSSL_FUNC_ENCODER_ENCODE,                                     \
-          (void (*)(void))impl##2text_encode },                         \
-        OSSL_DISPATCH_END                                               \
+#define MAKE_TEXT_ENCODER(impl, type)                                 \
+    static OSSL_FUNC_encoder_import_object_fn                         \
+        impl##2text_import_object;                                    \
+    static OSSL_FUNC_encoder_free_object_fn                           \
+        impl##2text_free_object;                                      \
+    static OSSL_FUNC_encoder_encode_fn impl##2text_encode;            \
+                                                                      \
+    static void *impl##2text_import_object(void *ctx, int selection,  \
+        const OSSL_PARAM params[])                                    \
+    {                                                                 \
+        return ossl_prov_import_key(ossl_##impl##_keymgmt_functions,  \
+            ctx, selection, params);                                  \
+    }                                                                 \
+    static void impl##2text_free_object(void *key)                    \
+    {                                                                 \
+        ossl_prov_free_key(ossl_##impl##_keymgmt_functions, key);     \
+    }                                                                 \
+    static int impl##2text_encode(void *vctx, OSSL_CORE_BIO *cout,    \
+        const void *key,                                              \
+        const OSSL_PARAM key_abstract[],                              \
+        int selection,                                                \
+        OSSL_PASSPHRASE_CALLBACK *cb,                                 \
+        void *cbarg)                                                  \
+    {                                                                 \
+        /* We don't deal with abstract objects */                     \
+        if (key_abstract != NULL) {                                   \
+            ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);   \
+            return 0;                                                 \
+        }                                                             \
+        return key2text_encode(vctx, key, selection, cout,            \
+            type##_to_text, cb, cbarg);                               \
+    }                                                                 \
+    const OSSL_DISPATCH ossl_##impl##_to_text_encoder_functions[] = { \
+        { OSSL_FUNC_ENCODER_NEWCTX,                                   \
+            (void (*)(void))key2text_newctx },                        \
+        { OSSL_FUNC_ENCODER_FREECTX,                                  \
+            (void (*)(void))key2text_freectx },                       \
+        { OSSL_FUNC_ENCODER_IMPORT_OBJECT,                            \
+            (void (*)(void))impl##2text_import_object },              \
+        { OSSL_FUNC_ENCODER_FREE_OBJECT,                              \
+            (void (*)(void))impl##2text_free_object },                \
+        { OSSL_FUNC_ENCODER_ENCODE,                                   \
+            (void (*)(void))impl##2text_encode },                     \
+        OSSL_DISPATCH_END                                             \
     }
 
 #ifndef OPENSSL_NO_DH
@@ -697,15 +704,15 @@ MAKE_TEXT_ENCODER(dsa, dsa);
 #endif
 #ifndef OPENSSL_NO_EC
 MAKE_TEXT_ENCODER(ec, ec);
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 MAKE_TEXT_ENCODER(sm2, ec);
-# endif
-# ifndef OPENSSL_NO_ECX
+#endif
+#ifndef OPENSSL_NO_ECX
 MAKE_TEXT_ENCODER(ed25519, ecx);
 MAKE_TEXT_ENCODER(ed448, ecx);
 MAKE_TEXT_ENCODER(x25519, ecx);
 MAKE_TEXT_ENCODER(x448, ecx);
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_ML_KEM
 MAKE_TEXT_ENCODER(ml_kem_512, ml_kem);
diff --git a/providers/implementations/encode_decode/endecoder_common.c b/providers/implementations/encode_decode/endecoder_common.c
index c4ea2f853cfc0..2e5b39242a719 100644
--- a/providers/implementations/encode_decode/endecoder_common.c
+++ b/providers/implementations/encode_decode/endecoder_common.c
@@ -58,12 +58,11 @@ ossl_prov_get_keymgmt_export(const OSSL_DISPATCH *fns)
 }
 
 void *ossl_prov_import_key(const OSSL_DISPATCH *fns, void *provctx,
-                           int selection, const OSSL_PARAM params[])
+    int selection, const OSSL_PARAM params[])
 {
     OSSL_FUNC_keymgmt_new_fn *kmgmt_new = ossl_prov_get_keymgmt_new(fns);
     OSSL_FUNC_keymgmt_free_fn *kmgmt_free = ossl_prov_get_keymgmt_free(fns);
-    OSSL_FUNC_keymgmt_import_fn *kmgmt_import =
-        ossl_prov_get_keymgmt_import(fns);
+    OSSL_FUNC_keymgmt_import_fn *kmgmt_import = ossl_prov_get_keymgmt_import(fns);
     void *key = NULL;
 
     if (kmgmt_new != NULL && kmgmt_import != NULL && kmgmt_free != NULL) {
@@ -84,8 +83,8 @@ void ossl_prov_free_key(const OSSL_DISPATCH *fns, void *key)
         kmgmt_free(key);
 }
 
-int ossl_read_der(PROV_CTX *provctx, OSSL_CORE_BIO *cin,  unsigned char **data,
-                  long *len)
+int ossl_read_der(PROV_CTX *provctx, OSSL_CORE_BIO *cin, unsigned char **data,
+    long *len)
 {
     BUF_MEM *mem = NULL;
     BIO *in = ossl_bio_new_from_core_bio(provctx, cin);
diff --git a/providers/implementations/encode_decode/endecoder_local.h b/providers/implementations/encode_decode/endecoder_local.h
index a65d05ffaeacb..2576812be2df1 100644
--- a/providers/implementations/encode_decode/endecoder_local.h
+++ b/providers/implementations/encode_decode/endecoder_local.h
@@ -18,11 +18,11 @@ OSSL_FUNC_keymgmt_import_fn *ossl_prov_get_keymgmt_import(const OSSL_DISPATCH *f
 OSSL_FUNC_keymgmt_export_fn *ossl_prov_get_keymgmt_export(const OSSL_DISPATCH *fns);
 
 int ossl_prov_der_from_p8(unsigned char **new_der, long *new_der_len,
-                          unsigned char *input_der, long input_der_len,
-                          OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg);
+    unsigned char *input_der, long input_der_len,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg);
 
 void *ossl_prov_import_key(const OSSL_DISPATCH *fns, void *provctx,
-                           int selection, const OSSL_PARAM params[]);
+    int selection, const OSSL_PARAM params[]);
 void ossl_prov_free_key(const OSSL_DISPATCH *fns, void *key);
-int ossl_read_der(PROV_CTX *provctx, OSSL_CORE_BIO *cin,  unsigned char **data,
-                  long *len);
+int ossl_read_der(PROV_CTX *provctx, OSSL_CORE_BIO *cin, unsigned char **data,
+    long *len);
diff --git a/providers/implementations/encode_decode/ml_common_codecs.c b/providers/implementations/encode_decode/ml_common_codecs.c
index 773550c9fb931..0ce80b67ecd9a 100644
--- a/providers/implementations/encode_decode/ml_common_codecs.c
+++ b/providers/implementations/encode_decode/ml_common_codecs.c
@@ -33,8 +33,8 @@ static int pref_cmp(const void *va, const void *vb)
 
 ML_COMMON_PKCS8_FMT_PREF *
 ossl_ml_common_pkcs8_fmt_order(const char *algorithm_name,
-                               const ML_COMMON_PKCS8_FMT *p8fmt,
-                               const char *direction, const char *formats)
+    const ML_COMMON_PKCS8_FMT *p8fmt,
+    const char *direction, const char *formats)
 {
     ML_COMMON_PKCS8_FMT_PREF *ret;
     int i, count = 0;
@@ -57,7 +57,7 @@ ossl_ml_common_pkcs8_fmt_order(const char *algorithm_name,
 
     /*
      * Formats are case-insensitive, separated by spaces, tabs or commas.
-     * Duplicate formats are allowed, the first occurence determines the order.
+     * Duplicate formats are allowed, the first occurrence determines the order.
      */
     do {
         if (*(fmt += strspn(fmt, sep)) == '\0')
@@ -67,7 +67,8 @@ ossl_ml_common_pkcs8_fmt_order(const char *algorithm_name,
             /* Skip slots already selected or with a different name. */
             if (ret[i].pref > 0
                 || OPENSSL_strncasecmp(ret[i].fmt->p8_name,
-                                       fmt, (end - fmt)) != 0)
+                       fmt, (end - fmt))
+                    != 0)
                 continue;
             /* First time match */
             ret[i].pref = ++count;
@@ -80,8 +81,8 @@ ossl_ml_common_pkcs8_fmt_order(const char *algorithm_name,
     if (count == 0) {
         OPENSSL_free(ret);
         ERR_raise_data(ERR_LIB_PROV, PROV_R_ML_DSA_NO_FORMAT,
-                       "no %s private key %s formats are enabled",
-                       algorithm_name, direction);
+            "no %s private key %s formats are enabled",
+            algorithm_name, direction);
         return NULL;
     }
     /* Sort by preference, with 0's last */
diff --git a/providers/implementations/encode_decode/ml_common_codecs.h b/providers/implementations/encode_decode/ml_common_codecs.h
index 4bf618ea0b792..110b9e0a51dd6 100644
--- a/providers/implementations/encode_decode/ml_common_codecs.h
+++ b/providers/implementations/encode_decode/ml_common_codecs.h
@@ -8,31 +8,31 @@
  */
 
 #ifndef PROV_ML_COMMON_CODECS_H
-# define PROV_ML_COMMON_CODECS_H
-# pragma once
+#define PROV_ML_COMMON_CODECS_H
+#pragma once
 
-#  include <openssl/e_os2.h>
-#  include "crypto/ml_dsa.h"
-#  include "prov/provider_ctx.h"
+#include <openssl/e_os2.h>
+#include "crypto/ml_dsa.h"
+#include "prov/provider_ctx.h"
 
- /*-
-  * The DER ASN.1 encoding of ML-DSA and ML-KEM public keys prepends 22 bytes
-  * to the encoded public key:
-  *
-  * - 4 byte outer sequence tag and length
-  * -  2 byte algorithm sequence tag and length
-  * -    2 byte algorithm OID tag and length
-  * -      9 byte algorithm OID (from NIST CSOR OID arc)
-  * -  4 byte bit string tag and length
-  * -    1 bitstring lead byte
-  */
-#  define ML_COMMON_SPKI_OVERHEAD   22
+/*-
+ * The DER ASN.1 encoding of ML-DSA and ML-KEM public keys prepends 22 bytes
+ * to the encoded public key:
+ *
+ * - 4 byte outer sequence tag and length
+ * -  2 byte algorithm sequence tag and length
+ * -    2 byte algorithm OID tag and length
+ * -      9 byte algorithm OID (from NIST CSOR OID arc)
+ * -  4 byte bit string tag and length
+ * -    1 bitstring lead byte
+ */
+#define ML_COMMON_SPKI_OVERHEAD 22
 typedef struct {
     const uint8_t asn1_prefix[ML_COMMON_SPKI_OVERHEAD];
 } ML_COMMON_SPKI_FMT;
 
 /*-
-* For each parameter set we support a few PKCS#8 input formats, three
+ * For each parameter set we support a few PKCS#8 input formats, three
  * corresponding to the "either or both" variants of:
  *
  *  ML-DSA-PrivateKey ::= CHOICE {
@@ -64,21 +64,21 @@ typedef struct {
  * The p8_shift is 0 when the top-level tag+length occupy four bytes, 2 when
  * they occupy two by†es, and 4 when no tag is used at all.
  */
-#define NUM_PKCS8_FORMATS   6
+#define NUM_PKCS8_FORMATS 6
 
 typedef struct {
-    const char *p8_name;    /* Format name */
-    size_t p8_bytes;        /* Total P8 encoding length */
-    int    p8_shift;        /* 4 - (top-level tag + len) */
-    uint32_t p8_magic;      /* The tag + len value */
-    uint16_t seed_magic;    /* Interior tag + len for the seed */
-    size_t seed_offset;     /* Seed offset from start */
-    size_t seed_length;     /* Seed bytes */
-    uint32_t priv_magic;    /* Interior tag + len for the key */
-    size_t priv_offset;     /* Key offset from start */
-    size_t priv_length;     /* Key bytes */
-    size_t pub_offset;      /* Pubkey offset */
-    size_t pub_length;      /* Pubkey bytes */
+    const char *p8_name; /* Format name */
+    size_t p8_bytes; /* Total P8 encoding length */
+    int p8_shift; /* 4 - (top-level tag + len) */
+    uint32_t p8_magic; /* The tag + len value */
+    uint16_t seed_magic; /* Interior tag + len for the seed */
+    size_t seed_offset; /* Seed offset from start */
+    size_t seed_length; /* Seed bytes */
+    uint32_t priv_magic; /* Interior tag + len for the key */
+    size_t priv_offset; /* Key offset from start */
+    size_t priv_length; /* Key bytes */
+    size_t pub_offset; /* Pubkey offset */
+    size_t pub_length; /* Pubkey bytes */
 } ML_COMMON_PKCS8_FMT;
 
 typedef struct {
@@ -93,6 +93,6 @@ typedef struct {
 
 ML_COMMON_PKCS8_FMT_PREF *
 ossl_ml_common_pkcs8_fmt_order(const char *algorithm_name,
-                               const ML_COMMON_PKCS8_FMT *p8fmt,
-                               const char *direction, const char *formats);
+    const ML_COMMON_PKCS8_FMT *p8fmt,
+    const char *direction, const char *formats);
 #endif
diff --git a/providers/implementations/encode_decode/ml_dsa_codecs.c b/providers/implementations/encode_decode/ml_dsa_codecs.c
index baa5a656fc2a6..faf142466686c 100644
--- a/providers/implementations/encode_decode/ml_dsa_codecs.c
+++ b/providers/implementations/encode_decode/ml_dsa_codecs.c
@@ -27,16 +27,103 @@
  * Private key bytes: 2560 (0x0a00)
  */
 static const ML_COMMON_SPKI_FMT ml_dsa_44_spkifmt = {
-    { 0x30, 0x82, 0x05, 0x32, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48,
-      0x01, 0x65, 0x03, 0x04, 0x03, 0x11, 0x03, 0x82, 0x05, 0x21, 0x00, }
+    {
+        0x30,
+        0x82,
+        0x05,
+        0x32,
+        0x30,
+        0x0b,
+        0x06,
+        0x09,
+        0x60,
+        0x86,
+        0x48,
+        0x01,
+        0x65,
+        0x03,
+        0x04,
+        0x03,
+        0x11,
+        0x03,
+        0x82,
+        0x05,
+        0x21,
+        0x00,
+    }
 };
 static const ML_COMMON_PKCS8_FMT ml_dsa_44_p8fmt[NUM_PKCS8_FORMATS] = {
-    { "seed-priv",  0x0a2a, 0, 0x30820a26, 0x0420, 6, 0x20, 0x04820a00, 0x2a, 0x0a00, 0,      0,     },
-    { "priv-only",  0x0a04, 0, 0x04820a00, 0,      0, 0,    0,          0x04, 0x0a00, 0,      0,     },
-    { "oqskeypair", 0x0f24, 0, 0x04820f20, 0,      0, 0,    0,          0x04, 0x0a00, 0x0a04, 0x0520 },
-    { "seed-only",  0x0022, 2, 0x8020,     0,      2, 0x20, 0,          0,    0,      0,      0,     },
-    { "bare-priv",  0x0a00, 4, 0,          0,      0, 0,    0,          0,    0x0a00, 0,      0,     },
-    { "bare-seed",  0x0020, 4, 0,          0,      0, 0x20, 0,          0,    0,      0,      0,     },
+    {
+        "seed-priv",
+        0x0a2a,
+        0,
+        0x30820a26,
+        0x0420,
+        6,
+        0x20,
+        0x04820a00,
+        0x2a,
+        0x0a00,
+        0,
+        0,
+    },
+    {
+        "priv-only",
+        0x0a04,
+        0,
+        0x04820a00,
+        0,
+        0,
+        0,
+        0,
+        0x04,
+        0x0a00,
+        0,
+        0,
+    },
+    { "oqskeypair", 0x0f24, 0, 0x04820f20, 0, 0, 0, 0, 0x04, 0x0a00, 0x0a04, 0x0520 },
+    {
+        "seed-only",
+        0x0022,
+        2,
+        0x8020,
+        0,
+        2,
+        0x20,
+        0,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "bare-priv",
+        0x0a00,
+        4,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0x0a00,
+        0,
+        0,
+    },
+    {
+        "bare-seed",
+        0x0020,
+        4,
+        0,
+        0,
+        0,
+        0x20,
+        0,
+        0,
+        0,
+        0,
+        0,
+    },
 };
 
 /*
@@ -45,16 +132,103 @@ static const ML_COMMON_PKCS8_FMT ml_dsa_44_p8fmt[NUM_PKCS8_FORMATS] = {
  * Private key bytes: 4032 (0x0fc0)
  */
 static const ML_COMMON_SPKI_FMT ml_dsa_65_spkifmt = {
-    { 0x30, 0x82, 0x07, 0xb2, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48,
-      0x01, 0x65, 0x03, 0x04, 0x03, 0x12, 0x03, 0x82, 0x07, 0xa1, 0x00, }
+    {
+        0x30,
+        0x82,
+        0x07,
+        0xb2,
+        0x30,
+        0x0b,
+        0x06,
+        0x09,
+        0x60,
+        0x86,
+        0x48,
+        0x01,
+        0x65,
+        0x03,
+        0x04,
+        0x03,
+        0x12,
+        0x03,
+        0x82,
+        0x07,
+        0xa1,
+        0x00,
+    }
 };
 static const ML_COMMON_PKCS8_FMT ml_dsa_65_p8fmt[NUM_PKCS8_FORMATS] = {
-    { "seed-priv",  0x0fea, 0, 0x30820fe6, 0x0420, 6, 0x20, 0x04820fc0, 0x2a, 0x0fc0, 0,      0,     },
-    { "priv-only",  0x0fc4, 0, 0x04820fc0, 0,      0, 0,    0,          0x04, 0x0fc0, 0,      0,     },
-    { "oqskeypair", 0x1764, 0, 0x04821760, 0,      0, 0,    0,          0x04, 0x0fc0, 0x0fc4, 0x07a0 },
-    { "seed-only",  0x0022, 2, 0x8020,     0,      2, 0x20, 0,          0,    0,      0,      0,     },
-    { "bare-priv",  0x0fc0, 4, 0,          0,      0, 0,    0,          0,    0x0fc0, 0,      0,     },
-    { "bare-seed",  0x0020, 4, 0,          0,      0, 0x20, 0,          0,    0,      0,      0,     },
+    {
+        "seed-priv",
+        0x0fea,
+        0,
+        0x30820fe6,
+        0x0420,
+        6,
+        0x20,
+        0x04820fc0,
+        0x2a,
+        0x0fc0,
+        0,
+        0,
+    },
+    {
+        "priv-only",
+        0x0fc4,
+        0,
+        0x04820fc0,
+        0,
+        0,
+        0,
+        0,
+        0x04,
+        0x0fc0,
+        0,
+        0,
+    },
+    { "oqskeypair", 0x1764, 0, 0x04821760, 0, 0, 0, 0, 0x04, 0x0fc0, 0x0fc4, 0x07a0 },
+    {
+        "seed-only",
+        0x0022,
+        2,
+        0x8020,
+        0,
+        2,
+        0x20,
+        0,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "bare-priv",
+        0x0fc0,
+        4,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0x0fc0,
+        0,
+        0,
+    },
+    {
+        "bare-seed",
+        0x0020,
+        4,
+        0,
+        0,
+        0,
+        0x20,
+        0,
+        0,
+        0,
+        0,
+        0,
+    },
 };
 
 /*-
@@ -63,22 +237,109 @@ static const ML_COMMON_PKCS8_FMT ml_dsa_65_p8fmt[NUM_PKCS8_FORMATS] = {
  * Private key bytes: 4896 (0x1320)
  */
 static const ML_COMMON_SPKI_FMT ml_dsa_87_spkifmt = {
-    { 0x30, 0x82, 0x0a, 0x32, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48,
-      0x01, 0x65, 0x03, 0x04, 0x03, 0x13, 0x03, 0x82, 0x0a, 0x21, 0x00, }
+    {
+        0x30,
+        0x82,
+        0x0a,
+        0x32,
+        0x30,
+        0x0b,
+        0x06,
+        0x09,
+        0x60,
+        0x86,
+        0x48,
+        0x01,
+        0x65,
+        0x03,
+        0x04,
+        0x03,
+        0x13,
+        0x03,
+        0x82,
+        0x0a,
+        0x21,
+        0x00,
+    }
 };
 static const ML_COMMON_PKCS8_FMT ml_dsa_87_p8fmt[NUM_PKCS8_FORMATS] = {
-    { "seed-priv",  0x134a, 0, 0x30821346, 0x0420, 6, 0x20, 0x04821320, 0x2a, 0x1320, 0,      0,     },
-    { "priv-only",  0x1324, 0, 0x04821320, 0,      0, 0,    0,          0x04, 0x1320, 0,      0,     },
-    { "oqskeypair", 0x1d44, 0, 0x04821d40, 0,      0, 0,    0,          0x04, 0x1320, 0x1324, 0x0a20 },
-    { "seed-only",  0x0022, 2, 0x8020,     0,      2, 0x20, 0,          0,    0,      0,      0,     },
-    { "bare-priv",  0x1320, 4, 0,          0,      0, 0,    0,          0,    0x1320, 0,      0,     },
-    { "bare-seed",  0x0020, 4, 0,          0,      0, 0x20, 0,          0,    0,      0,      0,     },
+    {
+        "seed-priv",
+        0x134a,
+        0,
+        0x30821346,
+        0x0420,
+        6,
+        0x20,
+        0x04821320,
+        0x2a,
+        0x1320,
+        0,
+        0,
+    },
+    {
+        "priv-only",
+        0x1324,
+        0,
+        0x04821320,
+        0,
+        0,
+        0,
+        0,
+        0x04,
+        0x1320,
+        0,
+        0,
+    },
+    { "oqskeypair", 0x1d44, 0, 0x04821d40, 0, 0, 0, 0, 0x04, 0x1320, 0x1324, 0x0a20 },
+    {
+        "seed-only",
+        0x0022,
+        2,
+        0x8020,
+        0,
+        2,
+        0x20,
+        0,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "bare-priv",
+        0x1320,
+        4,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0x1320,
+        0,
+        0,
+    },
+    {
+        "bare-seed",
+        0x0020,
+        4,
+        0,
+        0,
+        0,
+        0x20,
+        0,
+        0,
+        0,
+        0,
+        0,
+    },
 };
 
 /* Indices of slots in the codec table below */
-#define ML_DSA_44_CODEC    0
-#define ML_DSA_65_CODEC    1
-#define ML_DSA_87_CODEC    2
+#define ML_DSA_44_CODEC 0
+#define ML_DSA_65_CODEC 1
+#define ML_DSA_87_CODEC 2
 
 /*
  * Per-variant fixed parameters
@@ -105,7 +366,7 @@ static const ML_COMMON_CODEC *ml_dsa_get_codec(int evp_type)
 
 ML_DSA_KEY *
 ossl_ml_dsa_d2i_PUBKEY(const uint8_t *pk, int pk_len, int evp_type,
-                       PROV_CTX *provctx, const char *propq)
+    PROV_CTX *provctx, const char *propq)
 {
     OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(provctx);
     const ML_COMMON_CODEC *codec;
@@ -115,7 +376,7 @@ ossl_ml_dsa_d2i_PUBKEY(const uint8_t *pk, int pk_len, int evp_type,
     if ((params = ossl_ml_dsa_params_get(evp_type)) == NULL
         || (codec = ml_dsa_get_codec(evp_type)) == NULL)
         return NULL;
-    if (pk_len != ML_COMMON_SPKI_OVERHEAD + (ossl_ssize_t) params->pk_len
+    if (pk_len != ML_COMMON_SPKI_OVERHEAD + (ossl_ssize_t)params->pk_len
         || memcmp(pk, codec->spkifmt->asn1_prefix, ML_COMMON_SPKI_OVERHEAD) != 0)
         return NULL;
     pk_len -= ML_COMMON_SPKI_OVERHEAD;
@@ -124,10 +385,10 @@ ossl_ml_dsa_d2i_PUBKEY(const uint8_t *pk, int pk_len, int evp_type,
     if ((ret = ossl_ml_dsa_key_new(libctx, propq, evp_type)) == NULL)
         return NULL;
 
-    if (!ossl_ml_dsa_pk_decode(ret, pk, (size_t) pk_len)) {
+    if (!ossl_ml_dsa_pk_decode(ret, pk, (size_t)pk_len)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_BAD_ENCODING,
-                       "errror parsing %s public key from input SPKI",
-                       params->alg);
+            "error parsing %s public key from input SPKI",
+            params->alg);
         ossl_ml_dsa_key_free(ret);
         return NULL;
     }
@@ -137,8 +398,8 @@ ossl_ml_dsa_d2i_PUBKEY(const uint8_t *pk, int pk_len, int evp_type,
 
 ML_DSA_KEY *
 ossl_ml_dsa_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
-                      int evp_type, PROV_CTX *provctx,
-                      const char *propq)
+    int evp_type, PROV_CTX *provctx,
+    const char *propq)
 {
     const ML_DSA_PARAMS *v;
     const ML_COMMON_CODEC *codec;
@@ -174,7 +435,7 @@ ossl_ml_dsa_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
     formats = ossl_prov_ctx_get_param(
         provctx, OSSL_PKEY_PARAM_ML_DSA_INPUT_FORMATS, NULL);
     fmt_slots = ossl_ml_common_pkcs8_fmt_order(v->alg, codec->p8fmt,
-                                               "input", formats);
+        "input", formats);
     if (fmt_slots == NULL)
         goto end;
 
@@ -182,8 +443,8 @@ ossl_ml_dsa_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
     X509_ALGOR_get0(NULL, &ptype, NULL, alg);
     if (ptype != V_ASN1_UNDEF) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_UNEXPECTED_KEY_PARAMETERS,
-                       "unexpected parameters with a PKCS#8 %s private key",
-                       v->alg);
+            "unexpected parameters with a PKCS#8 %s private key",
+            v->alg);
         goto end;
     }
     if ((ossl_ssize_t)len < (ossl_ssize_t)sizeof(magic))
@@ -205,8 +466,8 @@ ossl_ml_dsa_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
         || (p8fmt->priv_length > 0 && p8fmt->priv_length != v->sk_len)
         || (p8fmt->pub_length > 0 && p8fmt->pub_length != v->pk_len)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_ML_DSA_NO_FORMAT,
-                       "no matching enabled %s private key input formats",
-                       v->alg);
+            "no matching enabled %s private key input formats",
+            v->alg);
         goto end;
     }
 
@@ -253,10 +514,10 @@ ossl_ml_dsa_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
     /* Any OQS public key content is ignored */
 
     if (ossl_ml_dsa_set_prekey(key, 0, 0,
-                               seed, ML_DSA_SEED_BYTES, priv, v->sk_len))
+            seed, ML_DSA_SEED_BYTES, priv, v->sk_len))
         ret = key;
 
-  end:
+end:
     OPENSSL_free(fmt_slots);
     PKCS8_PRIV_KEY_INFO_free(p8inf);
     if (ret == NULL)
@@ -272,7 +533,7 @@ int ossl_ml_dsa_i2d_pubkey(const ML_DSA_KEY *key, unsigned char **out)
 
     if (pk == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_NOT_A_PUBLIC_KEY,
-                       "no %s public key data available", params->alg);
+            "no %s public key data available", params->alg);
         return 0;
     }
     if (out != NULL
@@ -283,7 +544,7 @@ int ossl_ml_dsa_i2d_pubkey(const ML_DSA_KEY *key, unsigned char **out)
 
 /* Allocate and encode PKCS#8 private key payload. */
 int ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, uint8_t **out,
-                           PROV_CTX *provctx)
+    PROV_CTX *provctx)
 {
     const ML_DSA_PARAMS *params = ossl_ml_dsa_key_params(key);
     const ML_COMMON_CODEC *codec;
@@ -302,15 +563,15 @@ int ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, uint8_t **out,
 
     if (sk == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_NOT_A_PRIVATE_KEY,
-                       "no %s private key data available",
-                       params->alg);
+            "no %s private key data available",
+            params->alg);
         return 0;
     }
 
     formats = ossl_prov_ctx_get_param(
         provctx, OSSL_PKEY_PARAM_ML_DSA_OUTPUT_FORMATS, NULL);
     fmt_slots = ossl_ml_common_pkcs8_fmt_order(params->alg, codec->p8fmt,
-                                               "output", formats);
+        "output", formats);
     if (fmt_slots == NULL)
         return 0;
 
@@ -324,8 +585,8 @@ int ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, uint8_t **out,
         || (p8fmt->priv_length > 0 && p8fmt->priv_length != params->sk_len)
         || (p8fmt->pub_length > 0 && p8fmt->pub_length != params->pk_len)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_ML_DSA_NO_FORMAT,
-                       "no matching enabled %s private key output formats",
-                       params->alg);
+            "no matching enabled %s private key output formats",
+            params->alg);
         goto end;
     }
     len = p8fmt->p8_bytes;
@@ -335,7 +596,7 @@ int ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, uint8_t **out,
         goto end;
     }
 
-    if ((pos = buf = OPENSSL_malloc((size_t) len)) == NULL)
+    if ((pos = buf = OPENSSL_malloc((size_t)len)) == NULL)
         goto end;
 
     switch (p8fmt->p8_shift) {
@@ -349,7 +610,7 @@ int ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, uint8_t **out,
         break;
     default:
         ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                       "error encoding %s private key", params->alg);
+            "error encoding %s private key", params->alg);
         goto end;
     }
 
@@ -362,7 +623,7 @@ int ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, uint8_t **out,
             pos = OPENSSL_store_u16_be(pos, p8fmt->seed_magic);
         if (pos != buf + p8fmt->seed_offset) {
             ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                           "error encoding %s private key", params->alg);
+                "error encoding %s private key", params->alg);
             goto end;
         }
         memcpy(pos, seed, ML_DSA_SEED_BYTES);
@@ -373,7 +634,7 @@ int ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, uint8_t **out,
             pos = OPENSSL_store_u32_be(pos, p8fmt->priv_magic);
         if (pos != buf + p8fmt->priv_offset) {
             ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                           "error encoding %s private key", params->alg);
+                "error encoding %s private key", params->alg);
             goto end;
         }
         memcpy(pos, sk, params->sk_len);
@@ -384,7 +645,7 @@ int ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, uint8_t **out,
         /* The OQS pubkey is never separately DER-wrapped */
         if (pos != buf + p8fmt->pub_offset) {
             ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                           "error encoding %s private key", params->alg);
+                "error encoding %s private key", params->alg);
             goto end;
         }
         memcpy(pos, ossl_ml_dsa_key_get_pub(key), params->pk_len);
@@ -396,7 +657,7 @@ int ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, uint8_t **out,
         ret = len;
     }
 
-  end:
+end:
     OPENSSL_free(fmt_slots);
     if (ret == 0)
         OPENSSL_free(buf);
@@ -420,20 +681,19 @@ int ossl_ml_dsa_key_to_text(BIO *out, const ML_DSA_KEY *key, int selection)
     if (pk == NULL) {
         /* Regardless of the |selection|, there must be a public key */
         ERR_raise_data(ERR_LIB_PROV, PROV_R_MISSING_KEY,
-                       "no %s key material available", params->alg);
+            "no %s key material available", params->alg);
         return 0;
     }
 
     if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
         if (sk == NULL) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_MISSING_KEY,
-                           "no %s key material available", params->alg);
+                "no %s key material available", params->alg);
             return 0;
         }
         if (BIO_printf(out, "%s Private-Key:\n", params->alg) <= 0)
             return 0;
-        if (seed != NULL && !ossl_bio_print_labeled_buf(out, "seed:", seed,
-                                                        ML_DSA_SEED_BYTES))
+        if (seed != NULL && !ossl_bio_print_labeled_buf(out, "seed:", seed, ML_DSA_SEED_BYTES))
             return 0;
         if (!ossl_bio_print_labeled_buf(out, "priv:", sk, params->sk_len))
             return 0;
diff --git a/providers/implementations/encode_decode/ml_dsa_codecs.h b/providers/implementations/encode_decode/ml_dsa_codecs.h
index c0c2e842a2421..e05b54b1d0a32 100644
--- a/providers/implementations/encode_decode/ml_dsa_codecs.h
+++ b/providers/implementations/encode_decode/ml_dsa_codecs.h
@@ -8,32 +8,29 @@
  */
 
 #ifndef PROV_ML_DSA_CODECS_H
-# define PROV_ML_DSA_CODECS_H
-# pragma once
+#define PROV_ML_DSA_CODECS_H
+#pragma once
 
-# ifndef OPENSSL_NO_ML_DSA
-#  include <openssl/e_os2.h>
-#  include "crypto/ml_dsa.h"
-#  include "prov/provider_ctx.h"
-#  include "ml_common_codecs.h"
+#ifndef OPENSSL_NO_ML_DSA
+#include <openssl/e_os2.h>
+#include "crypto/ml_dsa.h"
+#include "prov/provider_ctx.h"
+#include "ml_common_codecs.h"
 
+__owur ML_DSA_KEY *ossl_ml_dsa_d2i_PUBKEY(const uint8_t *pubenc, int publen,
+    int evp_type, PROV_CTX *provctx,
+    const char *propq);
+__owur ML_DSA_KEY *ossl_ml_dsa_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
+    int evp_type, PROV_CTX *provctx,
+    const char *propq);
+__owur int ossl_ml_dsa_key_to_text(BIO *out, const ML_DSA_KEY *key, int selection);
 __owur
-ML_DSA_KEY *ossl_ml_dsa_d2i_PUBKEY(const uint8_t *pubenc, int publen,
-                                   int evp_type, PROV_CTX *provctx,
-                                   const char *propq);
+    __owur int
+    ossl_ml_dsa_i2d_pubkey(const ML_DSA_KEY *key, unsigned char **out);
 __owur
-ML_DSA_KEY *ossl_ml_dsa_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
-                                  int evp_type, PROV_CTX *provctx,
-                                  const char *propq);
-__owur
-int ossl_ml_dsa_key_to_text(BIO *out, const ML_DSA_KEY *key, int selection);
-__owur
-__owur
-int ossl_ml_dsa_i2d_pubkey(const ML_DSA_KEY *key, unsigned char **out);
-__owur
-__owur
-int ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, unsigned char **out,
-                           PROV_CTX *provctx);
+    __owur int
+    ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, unsigned char **out,
+        PROV_CTX *provctx);
 
-# endif /* OPENSSL_NO_ML_DSA */
-#endif  /* PROV_ML_DSA_CODECS_H */
+#endif /* OPENSSL_NO_ML_DSA */
+#endif /* PROV_ML_DSA_CODECS_H */
diff --git a/providers/implementations/encode_decode/ml_kem_codecs.c b/providers/implementations/encode_decode/ml_kem_codecs.c
index d5b0fb5f95174..482775433b623 100644
--- a/providers/implementations/encode_decode/ml_kem_codecs.c
+++ b/providers/implementations/encode_decode/ml_kem_codecs.c
@@ -24,16 +24,38 @@
  * Private key bytes: 1632 (0x0660)
  */
 static const ML_COMMON_SPKI_FMT ml_kem_512_spkifmt = {
-    { 0x30, 0x82, 0x03, 0x32, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48,
-      0x01, 0x65, 0x03, 0x04, 0x04, 0x01, 0x03, 0x82, 0x03, 0x21, 0x00, }
+    {
+        0x30,
+        0x82,
+        0x03,
+        0x32,
+        0x30,
+        0x0b,
+        0x06,
+        0x09,
+        0x60,
+        0x86,
+        0x48,
+        0x01,
+        0x65,
+        0x03,
+        0x04,
+        0x04,
+        0x01,
+        0x03,
+        0x82,
+        0x03,
+        0x21,
+        0x00,
+    }
 };
 static const ML_COMMON_PKCS8_FMT ml_kem_512_p8fmt[NUM_PKCS8_FORMATS] = {
-    { "seed-priv",  0x06aa, 0, 0x308206a6, 0x0440, 6, 0x40, 0x04820660, 0x4a, 0x0660, 0,      0      },
-    { "priv-only",  0x0664, 0, 0x04820660, 0,      0, 0,    0,          0x04, 0x0660, 0,      0      },
-    { "oqskeypair", 0x0984, 0, 0x04820980, 0,      0, 0,    0,          0x04, 0x0660, 0x0664, 0x0320 },
-    { "seed-only",  0x0042, 2, 0x8040,     0,      2, 0x40, 0,          0,    0,      0,      0      },
-    { "bare-priv",  0x0660, 4, 0,          0,      0, 0,    0,          0,    0x0660, 0,      0      },
-    { "bare-seed",  0x0040, 4, 0,          0,      0, 0x40, 0,          0,    0,      0,      0      },
+    { "seed-priv", 0x06aa, 0, 0x308206a6, 0x0440, 6, 0x40, 0x04820660, 0x4a, 0x0660, 0, 0 },
+    { "priv-only", 0x0664, 0, 0x04820660, 0, 0, 0, 0, 0x04, 0x0660, 0, 0 },
+    { "oqskeypair", 0x0984, 0, 0x04820980, 0, 0, 0, 0, 0x04, 0x0660, 0x0664, 0x0320 },
+    { "seed-only", 0x0042, 2, 0x8040, 0, 2, 0x40, 0, 0, 0, 0, 0 },
+    { "bare-priv", 0x0660, 4, 0, 0, 0, 0, 0, 0, 0x0660, 0, 0 },
+    { "bare-seed", 0x0040, 4, 0, 0, 0, 0x40, 0, 0, 0, 0, 0 },
 };
 
 /*-
@@ -42,16 +64,103 @@ static const ML_COMMON_PKCS8_FMT ml_kem_512_p8fmt[NUM_PKCS8_FORMATS] = {
  * Private key bytes: 2400 (0x0960)
  */
 static const ML_COMMON_SPKI_FMT ml_kem_768_spkifmt = {
-    { 0x30, 0x82, 0x04, 0xb2, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48,
-      0x01, 0x65, 0x03, 0x04, 0x04, 0x02, 0x03, 0x82, 0x04, 0xa1, 0x00, }
+    {
+        0x30,
+        0x82,
+        0x04,
+        0xb2,
+        0x30,
+        0x0b,
+        0x06,
+        0x09,
+        0x60,
+        0x86,
+        0x48,
+        0x01,
+        0x65,
+        0x03,
+        0x04,
+        0x04,
+        0x02,
+        0x03,
+        0x82,
+        0x04,
+        0xa1,
+        0x00,
+    }
 };
 static const ML_COMMON_PKCS8_FMT ml_kem_768_p8fmt[NUM_PKCS8_FORMATS] = {
-    { "seed-priv",  0x09aa, 0, 0x308209a6, 0x0440, 6, 0x40, 0x04820960, 0x4a, 0x0960, 0,      0,     },
-    { "priv-only",  0x0964, 0, 0x04820960, 0,      0, 0,    0,          0x04, 0x0960, 0,      0,     },
-    { "oqskeypair", 0x0e04, 0, 0x04820e00, 0,      0, 0,    0,          0x04, 0x0960, 0x0964, 0x04a0 },
-    { "seed-only",  0x0042, 2, 0x8040,     0,      2, 0x40, 0,          0,    0,      0,      0,     },
-    { "bare-priv",  0x0960, 4, 0,          0,      0, 0,    0,          0,    0x0960, 0,      0,     },
-    { "bare-seed",  0x0040, 4, 0,          0,      0, 0x40, 0,          0,    0,      0,      0,     },
+    {
+        "seed-priv",
+        0x09aa,
+        0,
+        0x308209a6,
+        0x0440,
+        6,
+        0x40,
+        0x04820960,
+        0x4a,
+        0x0960,
+        0,
+        0,
+    },
+    {
+        "priv-only",
+        0x0964,
+        0,
+        0x04820960,
+        0,
+        0,
+        0,
+        0,
+        0x04,
+        0x0960,
+        0,
+        0,
+    },
+    { "oqskeypair", 0x0e04, 0, 0x04820e00, 0, 0, 0, 0, 0x04, 0x0960, 0x0964, 0x04a0 },
+    {
+        "seed-only",
+        0x0042,
+        2,
+        0x8040,
+        0,
+        2,
+        0x40,
+        0,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "bare-priv",
+        0x0960,
+        4,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0x0960,
+        0,
+        0,
+    },
+    {
+        "bare-seed",
+        0x0040,
+        4,
+        0,
+        0,
+        0,
+        0x40,
+        0,
+        0,
+        0,
+        0,
+        0,
+    },
 };
 
 /*-
@@ -60,29 +169,51 @@ static const ML_COMMON_PKCS8_FMT ml_kem_768_p8fmt[NUM_PKCS8_FORMATS] = {
  * Public key bytes:  1568 (0x0620)
  */
 static const ML_COMMON_SPKI_FMT ml_kem_1024_spkifmt = {
-    { 0x30, 0x82, 0x06, 0x32, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48,
-      0x01, 0x65, 0x03, 0x04, 0x04, 0x03, 0x03, 0x82, 0x06, 0x21, 0x00, }
+    {
+        0x30,
+        0x82,
+        0x06,
+        0x32,
+        0x30,
+        0x0b,
+        0x06,
+        0x09,
+        0x60,
+        0x86,
+        0x48,
+        0x01,
+        0x65,
+        0x03,
+        0x04,
+        0x04,
+        0x03,
+        0x03,
+        0x82,
+        0x06,
+        0x21,
+        0x00,
+    }
 };
 static const ML_COMMON_PKCS8_FMT ml_kem_1024_p8fmt[NUM_PKCS8_FORMATS] = {
-    { "seed-priv",  0x0caa, 0, 0x30820ca6, 0x0440, 6, 0x40, 0x04820c60, 0x4a, 0x0c60, 0,      0      },
-    { "priv-only",  0x0c64, 0, 0x04820c60, 0,      0, 0,    0,          0x04, 0x0c60, 0,      0      },
-    { "oqskeypair", 0x1284, 0, 0x04821280, 0,      0, 0,    0,          0x04, 0x0c60, 0x0c64, 0x0620 },
-    { "seed-only",  0x0042, 2, 0x8040,     0,      2, 0x40, 0,          0,    0,      0,      0      },
-    { "bare-priv",  0x0c60, 4, 0,          0,      0, 0,    0,          0,    0x0c60, 0,      0      },
-    { "bare-seed",  0x0040, 4, 0,          0,      0, 0x40, 0,          0,    0,      0,      0      },
+    { "seed-priv", 0x0caa, 0, 0x30820ca6, 0x0440, 6, 0x40, 0x04820c60, 0x4a, 0x0c60, 0, 0 },
+    { "priv-only", 0x0c64, 0, 0x04820c60, 0, 0, 0, 0, 0x04, 0x0c60, 0, 0 },
+    { "oqskeypair", 0x1284, 0, 0x04821280, 0, 0, 0, 0, 0x04, 0x0c60, 0x0c64, 0x0620 },
+    { "seed-only", 0x0042, 2, 0x8040, 0, 2, 0x40, 0, 0, 0, 0, 0 },
+    { "bare-priv", 0x0c60, 4, 0, 0, 0, 0, 0, 0, 0x0c60, 0, 0 },
+    { "bare-seed", 0x0040, 4, 0, 0, 0, 0x40, 0, 0, 0, 0, 0 },
 };
 
 /* Indices of slots in the `codecs` table below */
-#define ML_KEM_512_CODEC    0
-#define ML_KEM_768_CODEC    1
-#define ML_KEM_1024_CODEC   2
+#define ML_KEM_512_CODEC 0
+#define ML_KEM_768_CODEC 1
+#define ML_KEM_1024_CODEC 2
 
 /*
  * Per-variant fixed parameters
  */
 static const ML_COMMON_CODEC codecs[3] = {
-    { &ml_kem_512_spkifmt,  ml_kem_512_p8fmt },
-    { &ml_kem_768_spkifmt,  ml_kem_768_p8fmt },
+    { &ml_kem_512_spkifmt, ml_kem_512_p8fmt },
+    { &ml_kem_768_spkifmt, ml_kem_768_p8fmt },
     { &ml_kem_1024_spkifmt, ml_kem_1024_p8fmt }
 };
 
@@ -102,7 +233,7 @@ static const ML_COMMON_CODEC *ml_kem_get_codec(int evp_type)
 
 ML_KEM_KEY *
 ossl_ml_kem_d2i_PUBKEY(const uint8_t *pubenc, int publen, int evp_type,
-                       PROV_CTX *provctx, const char *propq)
+    PROV_CTX *provctx, const char *propq)
 {
     OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(provctx);
     const ML_KEM_VINFO *v;
@@ -114,7 +245,7 @@ ossl_ml_kem_d2i_PUBKEY(const uint8_t *pubenc, int publen, int evp_type,
         || (codec = ml_kem_get_codec(evp_type)) == NULL)
         return NULL;
     vspki = codec->spkifmt;
-    if (publen != ML_COMMON_SPKI_OVERHEAD + (ossl_ssize_t) v->pubkey_bytes
+    if (publen != ML_COMMON_SPKI_OVERHEAD + (ossl_ssize_t)v->pubkey_bytes
         || memcmp(pubenc, vspki->asn1_prefix, ML_COMMON_SPKI_OVERHEAD) != 0)
         return NULL;
     publen -= ML_COMMON_SPKI_OVERHEAD;
@@ -123,10 +254,10 @@ ossl_ml_kem_d2i_PUBKEY(const uint8_t *pubenc, int publen, int evp_type,
     if ((ret = ossl_ml_kem_key_new(libctx, propq, evp_type)) == NULL)
         return NULL;
 
-    if (!ossl_ml_kem_parse_public_key(pubenc, (size_t) publen, ret)) {
+    if (!ossl_ml_kem_parse_public_key(pubenc, (size_t)publen, ret)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_BAD_ENCODING,
-                       "errror parsing %s public key from input SPKI",
-                       v->algorithm_name);
+            "error parsing %s public key from input SPKI",
+            v->algorithm_name);
         ossl_ml_kem_key_free(ret);
         return NULL;
     }
@@ -136,8 +267,8 @@ ossl_ml_kem_d2i_PUBKEY(const uint8_t *pubenc, int publen, int evp_type,
 
 ML_KEM_KEY *
 ossl_ml_kem_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
-                      int evp_type, PROV_CTX *provctx,
-                      const char *propq)
+    int evp_type, PROV_CTX *provctx,
+    const char *propq)
 {
     const ML_KEM_VINFO *v;
     const ML_COMMON_CODEC *codec;
@@ -171,7 +302,7 @@ ossl_ml_kem_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
     formats = ossl_prov_ctx_get_param(
         provctx, OSSL_PKEY_PARAM_ML_KEM_INPUT_FORMATS, NULL);
     fmt_slots = ossl_ml_common_pkcs8_fmt_order(v->algorithm_name, codec->p8fmt,
-                                               "input", formats);
+        "input", formats);
     if (fmt_slots == NULL)
         goto end;
 
@@ -179,8 +310,8 @@ ossl_ml_kem_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
     X509_ALGOR_get0(NULL, &ptype, NULL, alg);
     if (ptype != V_ASN1_UNDEF) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_UNEXPECTED_KEY_PARAMETERS,
-                       "unexpected parameters with a PKCS#8 %s private key",
-                       v->algorithm_name);
+            "unexpected parameters with a PKCS#8 %s private key",
+            v->algorithm_name);
         goto end;
     }
     if ((ossl_ssize_t)len < (ossl_ssize_t)sizeof(magic))
@@ -202,8 +333,8 @@ ossl_ml_kem_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
         || (p8fmt->priv_length > 0 && p8fmt->priv_length != v->prvkey_bytes)
         || (p8fmt->pub_length > 0 && p8fmt->pub_length != v->pubkey_bytes)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_ML_KEM_NO_FORMAT,
-                       "no matching enabled %s private key input formats",
-                       v->algorithm_name);
+            "no matching enabled %s private key input formats",
+            v->algorithm_name);
         goto end;
     }
 
@@ -246,18 +377,18 @@ ossl_ml_kem_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
 
     if (p8fmt->seed_length > 0) {
         if (!ossl_ml_kem_set_seed(buf + p8fmt->seed_offset,
-                                  ML_KEM_SEED_BYTES, key)) {
+                ML_KEM_SEED_BYTES, key)) {
             ERR_raise_data(ERR_LIB_OSSL_DECODER, ERR_R_INTERNAL_ERROR,
-                           "error storing %s private key seed",
-                           v->algorithm_name);
+                "error storing %s private key seed",
+                v->algorithm_name);
             goto end;
         }
     }
     if (p8fmt->priv_length > 0) {
         if ((key->encoded_dk = OPENSSL_malloc(p8fmt->priv_length)) == NULL) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
-                           "error parsing %s private key",
-                           v->algorithm_name);
+                "error parsing %s private key",
+                v->algorithm_name);
             goto end;
         }
         memcpy(key->encoded_dk, buf + p8fmt->priv_offset, p8fmt->priv_length);
@@ -265,7 +396,7 @@ ossl_ml_kem_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
     /* Any OQS public key content is ignored */
     ret = key;
 
-  end:
+end:
     OPENSSL_free(fmt_slots);
     PKCS8_PRIV_KEY_INFO_free(p8inf);
     if (ret == NULL)
@@ -280,8 +411,8 @@ int ossl_ml_kem_i2d_pubkey(const ML_KEM_KEY *key, unsigned char **out)
 
     if (!ossl_ml_kem_have_pubkey(key)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_NOT_A_PUBLIC_KEY,
-                       "no %s public key data available",
-                       key->vinfo->algorithm_name);
+            "no %s public key data available",
+            key->vinfo->algorithm_name);
         return 0;
     }
     publen = key->vinfo->pubkey_bytes;
@@ -291,8 +422,8 @@ int ossl_ml_kem_i2d_pubkey(const ML_KEM_KEY *key, unsigned char **out)
         return 0;
     if (!ossl_ml_kem_encode_public_key(*out, publen, key)) {
         ERR_raise_data(ERR_LIB_OSSL_ENCODER, ERR_R_INTERNAL_ERROR,
-                       "error encoding %s public key",
-                       key->vinfo->algorithm_name);
+            "error encoding %s public key",
+            key->vinfo->algorithm_name);
         OPENSSL_free(*out);
         return 0;
     }
@@ -302,7 +433,7 @@ int ossl_ml_kem_i2d_pubkey(const ML_KEM_KEY *key, unsigned char **out)
 
 /* Allocate and encode PKCS#8 private key payload. */
 int ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, uint8_t **out,
-                           PROV_CTX *provctx)
+    PROV_CTX *provctx)
 {
     const ML_KEM_VINFO *v = key->vinfo;
     const ML_COMMON_CODEC *codec;
@@ -319,15 +450,15 @@ int ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, uint8_t **out,
 
     if (!ossl_ml_kem_have_prvkey(key)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_NOT_A_PRIVATE_KEY,
-                       "no %s private key data available",
-                       key->vinfo->algorithm_name);
+            "no %s private key data available",
+            key->vinfo->algorithm_name);
         return 0;
     }
 
     formats = ossl_prov_ctx_get_param(
         provctx, OSSL_PKEY_PARAM_ML_KEM_OUTPUT_FORMATS, NULL);
     fmt_slots = ossl_ml_common_pkcs8_fmt_order(v->algorithm_name, codec->p8fmt,
-                                               "output", formats);
+        "output", formats);
     if (fmt_slots == NULL)
         return 0;
 
@@ -341,8 +472,8 @@ int ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, uint8_t **out,
         || (p8fmt->priv_length > 0 && p8fmt->priv_length != v->prvkey_bytes)
         || (p8fmt->pub_length > 0 && p8fmt->pub_length != v->pubkey_bytes)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_ML_KEM_NO_FORMAT,
-                       "no matching enabled %s private key output formats",
-                       v->algorithm_name);
+            "no matching enabled %s private key output formats",
+            v->algorithm_name);
         goto end;
     }
     len = p8fmt->p8_bytes;
@@ -352,7 +483,7 @@ int ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, uint8_t **out,
         goto end;
     }
 
-    if ((pos = buf = OPENSSL_malloc((size_t) len)) == NULL)
+    if ((pos = buf = OPENSSL_malloc((size_t)len)) == NULL)
         goto end;
 
     switch (p8fmt->p8_shift) {
@@ -366,8 +497,8 @@ int ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, uint8_t **out,
         break;
     default:
         ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                       "error encoding %s private key",
-                       v->algorithm_name);
+            "error encoding %s private key",
+            v->algorithm_name);
         goto end;
     }
 
@@ -381,8 +512,8 @@ int ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, uint8_t **out,
         if (pos != buf + p8fmt->seed_offset
             || !ossl_ml_kem_encode_seed(pos, ML_KEM_SEED_BYTES, key)) {
             ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                           "error encoding %s private key",
-                           v->algorithm_name);
+                "error encoding %s private key",
+                v->algorithm_name);
             goto end;
         }
         pos += ML_KEM_SEED_BYTES;
@@ -393,8 +524,8 @@ int ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, uint8_t **out,
         if (pos != buf + p8fmt->priv_offset
             || !ossl_ml_kem_encode_private_key(pos, v->prvkey_bytes, key)) {
             ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                           "error encoding %s private key",
-                           v->algorithm_name);
+                "error encoding %s private key",
+                v->algorithm_name);
             goto end;
         }
         pos += v->prvkey_bytes;
@@ -405,8 +536,8 @@ int ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, uint8_t **out,
         if (pos != buf + p8fmt->pub_offset
             || !ossl_ml_kem_encode_public_key(pos, v->pubkey_bytes, key)) {
             ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                           "error encoding %s private key",
-                           v->algorithm_name);
+                "error encoding %s private key",
+                v->algorithm_name);
             goto end;
         }
         pos += v->pubkey_bytes;
@@ -417,7 +548,7 @@ int ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, uint8_t **out,
         ret = len;
     }
 
-  end:
+end:
     OPENSSL_free(fmt_slots);
     if (ret == 0)
         OPENSSL_free(buf);
@@ -478,10 +609,10 @@ int ossl_ml_kem_key_to_text(BIO *out, const ML_KEM_KEY *key, int selection)
     /* If we got here, and ret == 0, there was no key material */
     if (ret == 0)
         ERR_raise_data(ERR_LIB_PROV, PROV_R_MISSING_KEY,
-                       "no %s key material available",
-                       type_label);
+            "no %s key material available",
+            type_label);
 
-  end:
+end:
     OPENSSL_free(pubenc);
     OPENSSL_free(prvenc);
     return ret;
diff --git a/providers/implementations/encode_decode/ml_kem_codecs.h b/providers/implementations/encode_decode/ml_kem_codecs.h
index b8a22201ab171..01ef8bbba505f 100644
--- a/providers/implementations/encode_decode/ml_kem_codecs.h
+++ b/providers/implementations/encode_decode/ml_kem_codecs.h
@@ -8,32 +8,29 @@
  */
 
 #ifndef PROV_ML_KEM_CODECS_H
-# define PROV_ML_KEM_CODECS_H
-# pragma once
+#define PROV_ML_KEM_CODECS_H
+#pragma once
 
-# ifndef OPENSSL_NO_ML_KEM
-#  include <openssl/e_os2.h>
-#  include "crypto/ml_kem.h"
-#  include "prov/provider_ctx.h"
-#  include "ml_common_codecs.h"
+#ifndef OPENSSL_NO_ML_KEM
+#include <openssl/e_os2.h>
+#include "crypto/ml_kem.h"
+#include "prov/provider_ctx.h"
+#include "ml_common_codecs.h"
 
+__owur ML_KEM_KEY *ossl_ml_kem_d2i_PUBKEY(const uint8_t *pubenc, int publen,
+    int evp_type, PROV_CTX *provctx,
+    const char *propq);
+__owur ML_KEM_KEY *ossl_ml_kem_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
+    int evp_type, PROV_CTX *provctx,
+    const char *propq);
+__owur int ossl_ml_kem_key_to_text(BIO *out, const ML_KEM_KEY *key, int selection);
 __owur
-ML_KEM_KEY *ossl_ml_kem_d2i_PUBKEY(const uint8_t *pubenc, int publen,
-                                   int evp_type, PROV_CTX *provctx,
-                                   const char *propq);
+    __owur int
+    ossl_ml_kem_i2d_pubkey(const ML_KEM_KEY *key, unsigned char **out);
 __owur
-ML_KEM_KEY *ossl_ml_kem_d2i_PKCS8(const uint8_t *prvenc, int prvlen,
-                                  int evp_type, PROV_CTX *provctx,
-                                  const char *propq);
-__owur
-int ossl_ml_kem_key_to_text(BIO *out, const ML_KEM_KEY *key, int selection);
-__owur
-__owur
-int ossl_ml_kem_i2d_pubkey(const ML_KEM_KEY *key, unsigned char **out);
-__owur
-__owur
-int ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, unsigned char **out,
-                           PROV_CTX *provctx);
+    __owur int
+    ossl_ml_kem_i2d_prvkey(const ML_KEM_KEY *key, unsigned char **out,
+        PROV_CTX *provctx);
 
-# endif  /* OPENSSL_NO_ML_KEM */
-#endif  /* PROV_ML_KEM_CODECS_H */
+#endif /* OPENSSL_NO_ML_KEM */
+#endif /* PROV_ML_KEM_CODECS_H */
diff --git a/providers/implementations/exchange/dh_exch.c b/providers/implementations/exchange/dh_exch.c
index cfb3938810b82..94d4254ed5d28 100644
--- a/providers/implementations/exchange/dh_exch.c
+++ b/providers/implementations/exchange/dh_exch.c
@@ -102,8 +102,8 @@ static int dh_check_key(PROV_DH_CTX *ctx)
 
     if (!key_approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
-                                         ctx->libctx, "DH Init", "DH Key",
-                                         ossl_fips_config_securitycheck_enabled)) {
+                ctx->libctx, "DH Init", "DH Key",
+                ossl_fips_config_securitycheck_enabled)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
             return 0;
         }
@@ -114,8 +114,8 @@ static int dh_check_key(PROV_DH_CTX *ctx)
 static int digest_check(PROV_DH_CTX *ctx, const EVP_MD *md)
 {
     return ossl_fips_ind_digest_exch_check(OSSL_FIPS_IND_GET(ctx),
-                                           OSSL_FIPS_IND_SETTABLE1, ctx->libctx,
-                                           md, "DH Set Ctx");
+        OSSL_FIPS_IND_SETTABLE1, ctx->libctx,
+        md, "DH Set Ctx");
 }
 #endif
 
@@ -124,9 +124,9 @@ static int dh_init(void *vpdhctx, void *vdh, const OSSL_PARAM params[])
     PROV_DH_CTX *pdhctx = (PROV_DH_CTX *)vpdhctx;
 
     if (!ossl_prov_is_running()
-            || pdhctx == NULL
-            || vdh == NULL
-            || !DH_up_ref(vdh))
+        || pdhctx == NULL
+        || vdh == NULL
+        || !DH_up_ref(vdh))
         return 0;
     DH_free(pdhctx->dh);
     pdhctx->dh = vdh;
@@ -150,8 +150,8 @@ static int dh_match_params(DH *priv, DH *peer)
     FFC_PARAMS *dhparams_peer = ossl_dh_get0_params(peer);
 
     ret = dhparams_priv != NULL
-          && dhparams_peer != NULL
-          && ossl_ffc_params_cmp(dhparams_priv, dhparams_peer, 1);
+        && dhparams_peer != NULL
+        && ossl_ffc_params_cmp(dhparams_priv, dhparams_peer, 1);
     if (!ret)
         ERR_raise(ERR_LIB_PROV, PROV_R_MISMATCHING_DOMAIN_PARAMETERS);
     return ret;
@@ -162,10 +162,10 @@ static int dh_set_peer(void *vpdhctx, void *vdh)
     PROV_DH_CTX *pdhctx = (PROV_DH_CTX *)vpdhctx;
 
     if (!ossl_prov_is_running()
-            || pdhctx == NULL
-            || vdh == NULL
-            || !dh_match_params(vdh, pdhctx->dh)
-            || !DH_up_ref(vdh))
+        || pdhctx == NULL
+        || vdh == NULL
+        || !dh_match_params(vdh, pdhctx->dh)
+        || !DH_up_ref(vdh))
         return 0;
     DH_free(pdhctx->dhpeer);
     pdhctx->dhpeer = vdh;
@@ -173,8 +173,8 @@ static int dh_set_peer(void *vpdhctx, void *vdh)
 }
 
 static int dh_plain_derive(void *vpdhctx,
-                           unsigned char *secret, size_t *secretlen,
-                           size_t outlen, unsigned int pad)
+    unsigned char *secret, size_t *secretlen,
+    size_t outlen, unsigned int pad)
 {
     PROV_DH_CTX *pdhctx = (PROV_DH_CTX *)vpdhctx;
     int ret;
@@ -209,7 +209,7 @@ static int dh_plain_derive(void *vpdhctx,
 }
 
 static int dh_X9_42_kdf_derive(void *vpdhctx, unsigned char *secret,
-                               size_t *secretlen, size_t outlen)
+    size_t *secretlen, size_t outlen)
 {
     PROV_DH_CTX *pdhctx = (PROV_DH_CTX *)vpdhctx;
     unsigned char *stmp = NULL;
@@ -235,12 +235,12 @@ static int dh_X9_42_kdf_derive(void *vpdhctx, unsigned char *secret,
     /* Do KDF stuff */
     if (pdhctx->kdf_type == PROV_DH_KDF_X9_42_ASN1) {
         if (!ossl_dh_kdf_X9_42_asn1(secret, pdhctx->kdf_outlen,
-                                    stmp, stmplen,
-                                    pdhctx->kdf_cekalg,
-                                    pdhctx->kdf_ukm,
-                                    pdhctx->kdf_ukmlen,
-                                    pdhctx->kdf_md,
-                                    pdhctx->libctx, NULL))
+                stmp, stmplen,
+                pdhctx->kdf_cekalg,
+                pdhctx->kdf_ukm,
+                pdhctx->kdf_ukmlen,
+                pdhctx->kdf_md,
+                pdhctx->libctx, NULL))
             goto err;
     }
     *secretlen = pdhctx->kdf_outlen;
@@ -251,7 +251,7 @@ static int dh_X9_42_kdf_derive(void *vpdhctx, unsigned char *secret,
 }
 
 static int dh_derive(void *vpdhctx, unsigned char *secret,
-                     size_t *psecretlen, size_t outlen)
+    size_t *psecretlen, size_t outlen)
 {
     PROV_DH_CTX *pdhctx = (PROV_DH_CTX *)vpdhctx;
 
@@ -259,13 +259,13 @@ static int dh_derive(void *vpdhctx, unsigned char *secret,
         return 0;
 
     switch (pdhctx->kdf_type) {
-        case PROV_DH_KDF_NONE:
-            return dh_plain_derive(pdhctx, secret, psecretlen, outlen,
-                                   pdhctx->pad);
-        case PROV_DH_KDF_X9_42_ASN1:
-            return dh_X9_42_kdf_derive(pdhctx, secret, psecretlen, outlen);
-        default:
-            break;
+    case PROV_DH_KDF_NONE:
+        return dh_plain_derive(pdhctx, secret, psecretlen, outlen,
+            pdhctx->pad);
+    case PROV_DH_KDF_X9_42_ASN1:
+        return dh_X9_42_kdf_derive(pdhctx, secret, psecretlen, outlen);
+    default:
+        break;
     }
     return 0;
 }
@@ -320,7 +320,7 @@ static void *dh_dupctx(void *vpdhctx)
     /* Duplicate UKM data if present */
     if (srcctx->kdf_ukm != NULL && srcctx->kdf_ukmlen > 0) {
         dstctx->kdf_ukm = OPENSSL_memdup(srcctx->kdf_ukm,
-                                         srcctx->kdf_ukmlen);
+            srcctx->kdf_ukmlen);
         if (dstctx->kdf_ukm == NULL)
             goto err;
     }
@@ -351,11 +351,11 @@ static int dh_set_ctx_params(void *vpdhctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(pdhctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_EXCHANGE_PARAM_FIPS_KEY_CHECK))
-        return  0;
+            OSSL_EXCHANGE_PARAM_FIPS_KEY_CHECK))
+        return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(pdhctx, OSSL_FIPS_IND_SETTABLE1, params,
-                                     OSSL_EXCHANGE_PARAM_FIPS_DIGEST_CHECK))
-        return  0;
+            OSSL_EXCHANGE_PARAM_FIPS_DIGEST_CHECK))
+        return 0;
 
     p = OSSL_PARAM_locate_const(params, OSSL_EXCHANGE_PARAM_KDF_TYPE);
     if (p != NULL) {
@@ -380,7 +380,7 @@ static int dh_set_ctx_params(void *vpdhctx, const OSSL_PARAM params[])
 
         str = mdprops;
         p = OSSL_PARAM_locate_const(params,
-                                    OSSL_EXCHANGE_PARAM_KDF_DIGEST_PROPS);
+            OSSL_EXCHANGE_PARAM_KDF_DIGEST_PROPS);
 
         if (p != NULL) {
             if (!OSSL_PARAM_get_utf8_string(p, &str, sizeof(mdprops)))
@@ -464,12 +464,12 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
     OSSL_PARAM_octet_string(OSSL_EXCHANGE_PARAM_KDF_UKM, NULL, 0),
     OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_CEK_ALG, NULL, 0),
     OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_EXCHANGE_PARAM_FIPS_KEY_CHECK)
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_EXCHANGE_PARAM_FIPS_DIGEST_CHECK)
-    OSSL_PARAM_END
+        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_EXCHANGE_PARAM_FIPS_DIGEST_CHECK)
+            OSSL_PARAM_END
 };
 
 static const OSSL_PARAM *dh_settable_ctx_params(ossl_unused void *vpdhctx,
-                                                ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_ctx_params;
 }
@@ -479,14 +479,14 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
     OSSL_PARAM_utf8_string(OSSL_EXCHANGE_PARAM_KDF_DIGEST, NULL, 0),
     OSSL_PARAM_size_t(OSSL_EXCHANGE_PARAM_KDF_OUTLEN, NULL),
     OSSL_PARAM_DEFN(OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR,
-                    NULL, 0),
+        NULL, 0),
     OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_CEK_ALG, NULL, 0),
     OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 
 static const OSSL_PARAM *dh_gettable_ctx_params(ossl_unused void *vpdhctx,
-                                                ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -504,14 +504,14 @@ static int dh_get_ctx_params(void *vpdhctx, OSSL_PARAM params[])
         const char *kdf_type = NULL;
 
         switch (pdhctx->kdf_type) {
-            case PROV_DH_KDF_NONE:
-                kdf_type = "";
-                break;
-            case PROV_DH_KDF_X9_42_ASN1:
-                kdf_type = OSSL_KDF_NAME_X942KDF_ASN1;
-                break;
-            default:
-                return 0;
+        case PROV_DH_KDF_NONE:
+            kdf_type = "";
+            break;
+        case PROV_DH_KDF_X9_42_ASN1:
+            kdf_type = OSSL_KDF_NAME_X942KDF_ASN1;
+            break;
+        default:
+            return 0;
         }
 
         if (!OSSL_PARAM_set_utf8_string(p, kdf_type))
@@ -520,9 +520,7 @@ static int dh_get_ctx_params(void *vpdhctx, OSSL_PARAM params[])
 
     p = OSSL_PARAM_locate(params, OSSL_EXCHANGE_PARAM_KDF_DIGEST);
     if (p != NULL
-            && !OSSL_PARAM_set_utf8_string(p, pdhctx->kdf_md == NULL
-                                           ? ""
-                                           : EVP_MD_get0_name(pdhctx->kdf_md))) {
+        && !OSSL_PARAM_set_utf8_string(p, pdhctx->kdf_md == NULL ? "" : EVP_MD_get0_name(pdhctx->kdf_md))) {
         return 0;
     }
 
@@ -537,8 +535,7 @@ static int dh_get_ctx_params(void *vpdhctx, OSSL_PARAM params[])
 
     p = OSSL_PARAM_locate(params, OSSL_KDF_PARAM_CEK_ALG);
     if (p != NULL
-            && !OSSL_PARAM_set_utf8_string(p, pdhctx->kdf_cekalg == NULL
-                                           ? "" :  pdhctx->kdf_cekalg))
+        && !OSSL_PARAM_set_utf8_string(p, pdhctx->kdf_cekalg == NULL ? "" : pdhctx->kdf_cekalg))
         return 0;
     if (!OSSL_FIPS_IND_GET_CTX_PARAM(pdhctx, params))
         return 0;
@@ -554,9 +551,9 @@ const OSSL_DISPATCH ossl_dh_keyexch_functions[] = {
     { OSSL_FUNC_KEYEXCH_DUPCTX, (void (*)(void))dh_dupctx },
     { OSSL_FUNC_KEYEXCH_SET_CTX_PARAMS, (void (*)(void))dh_set_ctx_params },
     { OSSL_FUNC_KEYEXCH_SETTABLE_CTX_PARAMS,
-      (void (*)(void))dh_settable_ctx_params },
+        (void (*)(void))dh_settable_ctx_params },
     { OSSL_FUNC_KEYEXCH_GET_CTX_PARAMS, (void (*)(void))dh_get_ctx_params },
     { OSSL_FUNC_KEYEXCH_GETTABLE_CTX_PARAMS,
-      (void (*)(void))dh_gettable_ctx_params },
+        (void (*)(void))dh_gettable_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/exchange/ecdh_exch.c b/providers/implementations/exchange/ecdh_exch.c
index 58fbc7bc09f00..43f3515878c6c 100644
--- a/providers/implementations/exchange/ecdh_exch.c
+++ b/providers/implementations/exchange/ecdh_exch.c
@@ -80,8 +80,7 @@ typedef struct {
     OSSL_FIPS_IND_DECLARE
 } PROV_ECDH_CTX;
 
-static
-void *ecdh_newctx(void *provctx)
+static void *ecdh_newctx(void *provctx)
 {
     PROV_ECDH_CTX *pectx;
 
@@ -100,16 +99,15 @@ void *ecdh_newctx(void *provctx)
     return (void *)pectx;
 }
 
-static
-int ecdh_init(void *vpecdhctx, void *vecdh, const OSSL_PARAM params[])
+static int ecdh_init(void *vpecdhctx, void *vecdh, const OSSL_PARAM params[])
 {
     PROV_ECDH_CTX *pecdhctx = (PROV_ECDH_CTX *)vpecdhctx;
 
     if (!ossl_prov_is_running()
-            || pecdhctx == NULL
-            || vecdh == NULL
-            || (EC_KEY_get0_group(vecdh) == NULL)
-            || !EC_KEY_up_ref(vecdh))
+        || pecdhctx == NULL
+        || vecdh == NULL
+        || (EC_KEY_get0_group(vecdh) == NULL)
+        || !EC_KEY_up_ref(vecdh))
         return 0;
     EC_KEY_free(pecdhctx->k);
     pecdhctx->k = vecdh;
@@ -121,15 +119,14 @@ int ecdh_init(void *vpecdhctx, void *vecdh, const OSSL_PARAM params[])
         return 0;
 #ifdef FIPS_MODULE
     if (!ossl_fips_ind_ec_key_check(OSSL_FIPS_IND_GET(pecdhctx),
-                                    OSSL_FIPS_IND_SETTABLE0, pecdhctx->libctx,
-                                    EC_KEY_get0_group(vecdh), "ECDH Init", 1))
+            OSSL_FIPS_IND_SETTABLE0, pecdhctx->libctx,
+            EC_KEY_get0_group(vecdh), "ECDH Init", 1))
         return 0;
 #endif
     return 1;
 }
 
-static
-int ecdh_match_params(const EC_KEY *priv, const EC_KEY *peer)
+static int ecdh_match_params(const EC_KEY *priv, const EC_KEY *peer)
 {
     int ret;
     BN_CTX *ctx = NULL;
@@ -142,29 +139,28 @@ int ecdh_match_params(const EC_KEY *priv, const EC_KEY *peer)
         return 0;
     }
     ret = group_priv != NULL
-          && group_peer != NULL
-          && EC_GROUP_cmp(group_priv, group_peer, ctx) == 0;
+        && group_peer != NULL
+        && EC_GROUP_cmp(group_priv, group_peer, ctx) == 0;
     if (!ret)
         ERR_raise(ERR_LIB_PROV, PROV_R_MISMATCHING_DOMAIN_PARAMETERS);
     BN_CTX_free(ctx);
     return ret;
 }
 
-static
-int ecdh_set_peer(void *vpecdhctx, void *vecdh)
+static int ecdh_set_peer(void *vpecdhctx, void *vecdh)
 {
     PROV_ECDH_CTX *pecdhctx = (PROV_ECDH_CTX *)vpecdhctx;
 
     if (!ossl_prov_is_running()
-            || pecdhctx == NULL
-            || vecdh == NULL
-            || !ecdh_match_params(pecdhctx->k, vecdh))
+        || pecdhctx == NULL
+        || vecdh == NULL
+        || !ecdh_match_params(pecdhctx->k, vecdh))
         return 0;
 #ifdef FIPS_MODULE
     if (!ossl_fips_ind_ec_key_check(OSSL_FIPS_IND_GET(pecdhctx),
-                                    OSSL_FIPS_IND_SETTABLE0, pecdhctx->libctx,
-                                    EC_KEY_get0_group(vecdh), "ECDH Set Peer",
-                                    1))
+            OSSL_FIPS_IND_SETTABLE0, pecdhctx->libctx,
+            EC_KEY_get0_group(vecdh), "ECDH Set Peer",
+            1))
         return 0;
 #endif
     if (!EC_KEY_up_ref(vecdh))
@@ -175,8 +171,7 @@ int ecdh_set_peer(void *vpecdhctx, void *vecdh)
     return 1;
 }
 
-static
-void ecdh_freectx(void *vpecdhctx)
+static void ecdh_freectx(void *vpecdhctx)
 {
     PROV_ECDH_CTX *pecdhctx = (PROV_ECDH_CTX *)vpecdhctx;
 
@@ -189,8 +184,7 @@ void ecdh_freectx(void *vpecdhctx)
     OPENSSL_free(pecdhctx);
 }
 
-static
-void *ecdh_dupctx(void *vpecdhctx)
+static void *ecdh_dupctx(void *vpecdhctx)
 {
     PROV_ECDH_CTX *srcctx = (PROV_ECDH_CTX *)vpecdhctx;
     PROV_ECDH_CTX *dstctx;
@@ -206,7 +200,7 @@ void *ecdh_dupctx(void *vpecdhctx)
 
     /* clear all pointers */
 
-    dstctx->k= NULL;
+    dstctx->k = NULL;
     dstctx->peerk = NULL;
     dstctx->kdf_md = NULL;
     dstctx->kdf_ukm = NULL;
@@ -231,20 +225,19 @@ void *ecdh_dupctx(void *vpecdhctx)
     /* Duplicate UKM data if present */
     if (srcctx->kdf_ukm != NULL && srcctx->kdf_ukmlen > 0) {
         dstctx->kdf_ukm = OPENSSL_memdup(srcctx->kdf_ukm,
-                                         srcctx->kdf_ukmlen);
+            srcctx->kdf_ukmlen);
         if (dstctx->kdf_ukm == NULL)
             goto err;
     }
 
     return dstctx;
 
- err:
+err:
     ecdh_freectx(dstctx);
     return NULL;
 }
 
-static
-int ecdh_set_ctx_params(void *vpecdhctx, const OSSL_PARAM params[])
+static int ecdh_set_ctx_params(void *vpecdhctx, const OSSL_PARAM params[])
 {
     char name[80] = { '\0' }; /* should be big enough */
     char *str = NULL;
@@ -257,13 +250,13 @@ int ecdh_set_ctx_params(void *vpecdhctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(pectx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_EXCHANGE_PARAM_FIPS_KEY_CHECK))
+            OSSL_EXCHANGE_PARAM_FIPS_KEY_CHECK))
         return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(pectx, OSSL_FIPS_IND_SETTABLE1, params,
-                                     OSSL_EXCHANGE_PARAM_FIPS_DIGEST_CHECK))
+            OSSL_EXCHANGE_PARAM_FIPS_DIGEST_CHECK))
         return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(pectx, OSSL_FIPS_IND_SETTABLE2, params,
-                                     OSSL_EXCHANGE_PARAM_FIPS_ECDH_COFACTOR_CHECK))
+            OSSL_EXCHANGE_PARAM_FIPS_ECDH_COFACTOR_CHECK))
         return 0;
 
     p = OSSL_PARAM_locate_const(params, OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE);
@@ -303,7 +296,7 @@ int ecdh_set_ctx_params(void *vpecdhctx, const OSSL_PARAM params[])
 
         str = mdprops;
         p = OSSL_PARAM_locate_const(params,
-                                    OSSL_EXCHANGE_PARAM_KDF_DIGEST_PROPS);
+            OSSL_EXCHANGE_PARAM_KDF_DIGEST_PROPS);
 
         if (p != NULL) {
             if (!OSSL_PARAM_get_utf8_string(p, &str, sizeof(mdprops)))
@@ -321,8 +314,8 @@ int ecdh_set_ctx_params(void *vpecdhctx, const OSSL_PARAM params[])
         }
 #ifdef FIPS_MODULE
         if (!ossl_fips_ind_digest_exch_check(OSSL_FIPS_IND_GET(pectx),
-                                             OSSL_FIPS_IND_SETTABLE1, pectx->libctx,
-                                             pectx->kdf_md, "ECDH Set Ctx")) {
+                OSSL_FIPS_IND_SETTABLE1, pectx->libctx,
+                pectx->kdf_md, "ECDH Set Ctx")) {
             EVP_MD_free(pectx->kdf_md);
             pectx->kdf_md = NULL;
             return 0;
@@ -362,20 +355,18 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
     OSSL_PARAM_size_t(OSSL_EXCHANGE_PARAM_KDF_OUTLEN, NULL),
     OSSL_PARAM_octet_string(OSSL_EXCHANGE_PARAM_KDF_UKM, NULL, 0),
     OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_EXCHANGE_PARAM_FIPS_KEY_CHECK)
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_EXCHANGE_PARAM_FIPS_DIGEST_CHECK)
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_EXCHANGE_PARAM_FIPS_ECDH_COFACTOR_CHECK)
-    OSSL_PARAM_END
+        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_EXCHANGE_PARAM_FIPS_DIGEST_CHECK)
+            OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_EXCHANGE_PARAM_FIPS_ECDH_COFACTOR_CHECK)
+                OSSL_PARAM_END
 };
 
-static
-const OSSL_PARAM *ecdh_settable_ctx_params(ossl_unused void *vpecdhctx,
-                                           ossl_unused void *provctx)
+static const OSSL_PARAM *ecdh_settable_ctx_params(ossl_unused void *vpecdhctx,
+    ossl_unused void *provctx)
 {
     return known_settable_ctx_params;
 }
 
-static
-int ecdh_get_ctx_params(void *vpecdhctx, OSSL_PARAM params[])
+static int ecdh_get_ctx_params(void *vpecdhctx, OSSL_PARAM params[])
 {
     PROV_ECDH_CTX *pectx = (PROV_ECDH_CTX *)vpecdhctx;
     OSSL_PARAM *p;
@@ -401,14 +392,14 @@ int ecdh_get_ctx_params(void *vpecdhctx, OSSL_PARAM params[])
         const char *kdf_type = NULL;
 
         switch (pectx->kdf_type) {
-            case PROV_ECDH_KDF_NONE:
-                kdf_type = "";
-                break;
-            case PROV_ECDH_KDF_X9_63:
-                kdf_type = OSSL_KDF_NAME_X963KDF;
-                break;
-            default:
-                return 0;
+        case PROV_ECDH_KDF_NONE:
+            kdf_type = "";
+            break;
+        case PROV_ECDH_KDF_X9_63:
+            kdf_type = OSSL_KDF_NAME_X963KDF;
+            break;
+        default:
+            return 0;
         }
 
         if (!OSSL_PARAM_set_utf8_string(p, kdf_type))
@@ -417,9 +408,7 @@ int ecdh_get_ctx_params(void *vpecdhctx, OSSL_PARAM params[])
 
     p = OSSL_PARAM_locate(params, OSSL_EXCHANGE_PARAM_KDF_DIGEST);
     if (p != NULL
-            && !OSSL_PARAM_set_utf8_string(p, pectx->kdf_md == NULL
-                                           ? ""
-                                           : EVP_MD_get0_name(pectx->kdf_md))) {
+        && !OSSL_PARAM_set_utf8_string(p, pectx->kdf_md == NULL ? "" : EVP_MD_get0_name(pectx->kdf_md))) {
         return 0;
     }
 
@@ -428,8 +417,7 @@ int ecdh_get_ctx_params(void *vpecdhctx, OSSL_PARAM params[])
         return 0;
 
     p = OSSL_PARAM_locate(params, OSSL_EXCHANGE_PARAM_KDF_UKM);
-    if (p != NULL &&
-        !OSSL_PARAM_set_octet_ptr(p, pectx->kdf_ukm, pectx->kdf_ukmlen))
+    if (p != NULL && !OSSL_PARAM_set_octet_ptr(p, pectx->kdf_ukm, pectx->kdf_ukmlen))
         return 0;
     if (!OSSL_FIPS_IND_GET_CTX_PARAM(pectx, params))
         return 0;
@@ -442,26 +430,26 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
     OSSL_PARAM_utf8_string(OSSL_EXCHANGE_PARAM_KDF_DIGEST, NULL, 0),
     OSSL_PARAM_size_t(OSSL_EXCHANGE_PARAM_KDF_OUTLEN, NULL),
     OSSL_PARAM_DEFN(OSSL_EXCHANGE_PARAM_KDF_UKM, OSSL_PARAM_OCTET_PTR,
-                    NULL, 0),
+        NULL, 0),
     OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 
-static
-const OSSL_PARAM *ecdh_gettable_ctx_params(ossl_unused void *vpecdhctx,
-                                           ossl_unused void *provctx)
+static const OSSL_PARAM *ecdh_gettable_ctx_params(ossl_unused void *vpecdhctx,
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
 
 static ossl_inline
-size_t ecdh_size(const EC_KEY *k)
+    size_t
+    ecdh_size(const EC_KEY *k)
 {
     size_t degree = 0;
     const EC_GROUP *group;
 
     if (k == NULL
-            || (group = EC_KEY_get0_group(k)) == NULL)
+        || (group = EC_KEY_get0_group(k)) == NULL)
         return 0;
 
     degree = EC_GROUP_get_degree(group);
@@ -469,9 +457,8 @@ size_t ecdh_size(const EC_KEY *k)
     return (degree + 7) / 8;
 }
 
-static ossl_inline
-int ecdh_plain_derive(void *vpecdhctx, unsigned char *secret,
-                      size_t *psecretlen, size_t outlen)
+static ossl_inline int ecdh_plain_derive(void *vpecdhctx, unsigned char *secret,
+    size_t *psecretlen, size_t outlen)
 {
     PROV_ECDH_CTX *pecdhctx = (PROV_ECDH_CTX *)vpecdhctx;
     int retlen, ret = 0;
@@ -498,7 +485,7 @@ int ecdh_plain_derive(void *vpecdhctx, unsigned char *secret,
     }
 
     if ((group = EC_KEY_get0_group(pecdhctx->k)) == NULL
-            || (cofactor = EC_GROUP_get0_cofactor(group)) == NULL)
+        || (cofactor = EC_GROUP_get0_cofactor(group)) == NULL)
         return 0;
 
     has_cofactor = !BN_is_one(cofactor);
@@ -521,11 +508,10 @@ int ecdh_plain_derive(void *vpecdhctx, unsigned char *secret,
      *     - if ctx->k->cofactor != 1, use a duplicate of ctx->k with the flag
      *          set to ctx->cofactor_mode
      */
-    key_cofactor_mode =
-        (EC_KEY_get_flags(pecdhctx->k) & EC_FLAG_COFACTOR_ECDH) ? 1 : 0;
+    key_cofactor_mode = (EC_KEY_get_flags(pecdhctx->k) & EC_FLAG_COFACTOR_ECDH) ? 1 : 0;
     if (pecdhctx->cofactor_mode != -1
-            && pecdhctx->cofactor_mode != key_cofactor_mode
-            && has_cofactor) {
+        && pecdhctx->cofactor_mode != key_cofactor_mode
+        && has_cofactor) {
         if ((privk = EC_KEY_dup(pecdhctx->k)) == NULL)
             return 0;
 
@@ -551,8 +537,8 @@ int ecdh_plain_derive(void *vpecdhctx, unsigned char *secret,
      */
     if (has_cofactor && !cofactor_approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(pecdhctx, OSSL_FIPS_IND_SETTABLE2,
-                                         pecdhctx->libctx, "ECDH", "Cofactor",
-                                         ossl_fips_config_ecdh_cofactor_check)) {
+                pecdhctx->libctx, "ECDH", "Cofactor",
+                ossl_fips_config_ecdh_cofactor_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_COFACTOR_REQUIRED);
             goto end;
         }
@@ -569,15 +555,14 @@ int ecdh_plain_derive(void *vpecdhctx, unsigned char *secret,
     *psecretlen = retlen;
     ret = 1;
 
- end:
+end:
     if (privk != pecdhctx->k)
         EC_KEY_free(privk);
     return ret;
 }
 
-static ossl_inline
-int ecdh_X9_63_kdf_derive(void *vpecdhctx, unsigned char *secret,
-                          size_t *psecretlen, size_t outlen)
+static ossl_inline int ecdh_X9_63_kdf_derive(void *vpecdhctx, unsigned char *secret,
+    size_t *psecretlen, size_t outlen)
 {
     PROV_ECDH_CTX *pecdhctx = (PROV_ECDH_CTX *)vpecdhctx;
     unsigned char *stmp = NULL;
@@ -602,33 +587,32 @@ int ecdh_X9_63_kdf_derive(void *vpecdhctx, unsigned char *secret,
 
     /* Do KDF stuff */
     if (!ossl_ecdh_kdf_X9_63(secret, pecdhctx->kdf_outlen,
-                             stmp, stmplen,
-                             pecdhctx->kdf_ukm,
-                             pecdhctx->kdf_ukmlen,
-                             pecdhctx->kdf_md,
-                             pecdhctx->libctx, NULL))
+            stmp, stmplen,
+            pecdhctx->kdf_ukm,
+            pecdhctx->kdf_ukmlen,
+            pecdhctx->kdf_md,
+            pecdhctx->libctx, NULL))
         goto err;
     *psecretlen = pecdhctx->kdf_outlen;
     ret = 1;
 
- err:
+err:
     OPENSSL_secure_clear_free(stmp, stmplen);
     return ret;
 }
 
-static
-int ecdh_derive(void *vpecdhctx, unsigned char *secret,
-                size_t *psecretlen, size_t outlen)
+static int ecdh_derive(void *vpecdhctx, unsigned char *secret,
+    size_t *psecretlen, size_t outlen)
 {
     PROV_ECDH_CTX *pecdhctx = (PROV_ECDH_CTX *)vpecdhctx;
 
     switch (pecdhctx->kdf_type) {
-        case PROV_ECDH_KDF_NONE:
-            return ecdh_plain_derive(vpecdhctx, secret, psecretlen, outlen);
-        case PROV_ECDH_KDF_X9_63:
-            return ecdh_X9_63_kdf_derive(vpecdhctx, secret, psecretlen, outlen);
-        default:
-            break;
+    case PROV_ECDH_KDF_NONE:
+        return ecdh_plain_derive(vpecdhctx, secret, psecretlen, outlen);
+    case PROV_ECDH_KDF_X9_63:
+        return ecdh_X9_63_kdf_derive(vpecdhctx, secret, psecretlen, outlen);
+    default:
+        break;
     }
     return 0;
 }
@@ -642,9 +626,9 @@ const OSSL_DISPATCH ossl_ecdh_keyexch_functions[] = {
     { OSSL_FUNC_KEYEXCH_DUPCTX, (void (*)(void))ecdh_dupctx },
     { OSSL_FUNC_KEYEXCH_SET_CTX_PARAMS, (void (*)(void))ecdh_set_ctx_params },
     { OSSL_FUNC_KEYEXCH_SETTABLE_CTX_PARAMS,
-      (void (*)(void))ecdh_settable_ctx_params },
+        (void (*)(void))ecdh_settable_ctx_params },
     { OSSL_FUNC_KEYEXCH_GET_CTX_PARAMS, (void (*)(void))ecdh_get_ctx_params },
     { OSSL_FUNC_KEYEXCH_GETTABLE_CTX_PARAMS,
-      (void (*)(void))ecdh_gettable_ctx_params },
+        (void (*)(void))ecdh_gettable_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/exchange/ecx_exch.c b/providers/implementations/exchange/ecx_exch.c
index 28e2ff61c7cc3..c4f07619a079a 100644
--- a/providers/implementations/exchange/ecx_exch.c
+++ b/providers/implementations/exchange/ecx_exch.c
@@ -77,9 +77,9 @@ static int ecx_init(void *vecxctx, void *vkey, const char *algname)
         return 0;
 
     if (ecxctx == NULL
-            || key == NULL
-            || key->keylen != ecxctx->keylen
-            || !ossl_ecx_key_up_ref(key)) {
+        || key == NULL
+        || key->keylen != ecxctx->keylen
+        || !ossl_ecx_key_up_ref(key)) {
         ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -95,13 +95,13 @@ static int ecx_init(void *vecxctx, void *vkey, const char *algname)
 }
 
 static int x25519_init(void *vecxctx, void *vkey,
-                       ossl_unused const OSSL_PARAM params[])
+    ossl_unused const OSSL_PARAM params[])
 {
     return ecx_init(vecxctx, vkey, "X25519");
 }
 
 static int x448_init(void *vecxctx, void *vkey,
-                     ossl_unused const OSSL_PARAM params[])
+    ossl_unused const OSSL_PARAM params[])
 {
     return ecx_init(vecxctx, vkey, "X448");
 }
@@ -115,9 +115,9 @@ static int ecx_set_peer(void *vecxctx, void *vkey)
         return 0;
 
     if (ecxctx == NULL
-            || key == NULL
-            || key->keylen != ecxctx->keylen
-            || !ossl_ecx_key_up_ref(key)) {
+        || key == NULL
+        || key->keylen != ecxctx->keylen
+        || !ossl_ecx_key_up_ref(key)) {
         ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -128,14 +128,14 @@ static int ecx_set_peer(void *vecxctx, void *vkey)
 }
 
 static int ecx_derive(void *vecxctx, unsigned char *secret, size_t *secretlen,
-                      size_t outlen)
+    size_t outlen)
 {
     PROV_ECX_CTX *ecxctx = (PROV_ECX_CTX *)vecxctx;
 
     if (!ossl_prov_is_running())
         return 0;
     return ossl_ecx_compute_key(ecxctx->peerkey, ecxctx->key, ecxctx->keylen,
-                                secret, secretlen, outlen);
+        secret, secretlen, outlen);
 }
 
 static void ecx_freectx(void *vecxctx)
@@ -178,11 +178,11 @@ static void *ecx_dupctx(void *vecxctx)
 }
 
 static const OSSL_PARAM *ecx_gettable_ctx_params(ossl_unused void *vctx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
@@ -192,7 +192,7 @@ static int ecx_get_ctx_params(ossl_unused void *vctx, OSSL_PARAM params[])
 #ifdef FIPS_MODULE
     int approved = 0;
     OSSL_PARAM *p = OSSL_PARAM_locate(params,
-                                      OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR);
+        OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR);
 
     if (p != NULL && !OSSL_PARAM_set_int(p, approved))
         return 0;
@@ -209,7 +209,7 @@ const OSSL_DISPATCH ossl_x25519_keyexch_functions[] = {
     { OSSL_FUNC_KEYEXCH_DUPCTX, (void (*)(void))ecx_dupctx },
     { OSSL_FUNC_KEYEXCH_GET_CTX_PARAMS, (void (*)(void))ecx_get_ctx_params },
     { OSSL_FUNC_KEYEXCH_GETTABLE_CTX_PARAMS,
-      (void (*)(void))ecx_gettable_ctx_params },
+        (void (*)(void))ecx_gettable_ctx_params },
     OSSL_DISPATCH_END
 };
 
@@ -222,6 +222,6 @@ const OSSL_DISPATCH ossl_x448_keyexch_functions[] = {
     { OSSL_FUNC_KEYEXCH_DUPCTX, (void (*)(void))ecx_dupctx },
     { OSSL_FUNC_KEYEXCH_GET_CTX_PARAMS, (void (*)(void))ecx_get_ctx_params },
     { OSSL_FUNC_KEYEXCH_GETTABLE_CTX_PARAMS,
-      (void (*)(void))ecx_gettable_ctx_params },
+        (void (*)(void))ecx_gettable_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/exchange/kdf_exch.c b/providers/implementations/exchange/kdf_exch.c
index 340a2663c588e..e372200335171 100644
--- a/providers/implementations/exchange/kdf_exch.c
+++ b/providers/implementations/exchange/kdf_exch.c
@@ -71,10 +71,10 @@ static void *kdf_newctx(const char *kdfname, void *provctx)
     return NULL;
 }
 
-#define KDF_NEWCTX(funcname, kdfname) \
+#define KDF_NEWCTX(funcname, kdfname)                   \
     static void *kdf_##funcname##_newctx(void *provctx) \
-    { \
-        return kdf_newctx(kdfname, provctx); \
+    {                                                   \
+        return kdf_newctx(kdfname, provctx);            \
     }
 
 KDF_NEWCTX(tls1_prf, "TLS1-PRF")
@@ -86,9 +86,9 @@ static int kdf_init(void *vpkdfctx, void *vkdf, const OSSL_PARAM params[])
     PROV_KDF_CTX *pkdfctx = (PROV_KDF_CTX *)vpkdfctx;
 
     if (!ossl_prov_is_running()
-            || pkdfctx == NULL
-            || vkdf == NULL
-            || !ossl_kdf_data_up_ref(vkdf))
+        || pkdfctx == NULL
+        || vkdf == NULL
+        || !ossl_kdf_data_up_ref(vkdf))
         return 0;
     pkdfctx->kdfdata = vkdf;
 
@@ -96,7 +96,7 @@ static int kdf_init(void *vpkdfctx, void *vkdf, const OSSL_PARAM params[])
 }
 
 static int kdf_derive(void *vpkdfctx, unsigned char *secret, size_t *secretlen,
-                      size_t outlen)
+    size_t outlen)
 {
     PROV_KDF_CTX *pkdfctx = (PROV_KDF_CTX *)vpkdfctx;
     size_t kdfsize;
@@ -181,11 +181,11 @@ static int kdf_get_ctx_params(void *vpkdfctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_settable_ctx_params(ossl_unused void *vpkdfctx,
-                                                 void *provctx,
-                                                 const char *kdfname)
+    void *provctx,
+    const char *kdfname)
 {
     EVP_KDF *kdf = EVP_KDF_fetch(PROV_LIBCTX_OF(provctx), kdfname,
-                                 NULL);
+        NULL);
     const OSSL_PARAM *params;
 
     if (kdf == NULL)
@@ -197,11 +197,11 @@ static const OSSL_PARAM *kdf_settable_ctx_params(ossl_unused void *vpkdfctx,
     return params;
 }
 
-#define KDF_SETTABLE_CTX_PARAMS(funcname, kdfname) \
+#define KDF_SETTABLE_CTX_PARAMS(funcname, kdfname)                                \
     static const OSSL_PARAM *kdf_##funcname##_settable_ctx_params(void *vpkdfctx, \
-                                                                  void *provctx) \
-    { \
-        return kdf_settable_ctx_params(vpkdfctx, provctx, kdfname); \
+        void *provctx)                                                            \
+    {                                                                             \
+        return kdf_settable_ctx_params(vpkdfctx, provctx, kdfname);               \
     }
 
 KDF_SETTABLE_CTX_PARAMS(tls1_prf, "TLS1-PRF")
@@ -209,11 +209,11 @@ KDF_SETTABLE_CTX_PARAMS(hkdf, "HKDF")
 KDF_SETTABLE_CTX_PARAMS(scrypt, "SCRYPT")
 
 static const OSSL_PARAM *kdf_gettable_ctx_params(ossl_unused void *vpkdfctx,
-                                                 void *provctx,
-                                                 const char *kdfname)
+    void *provctx,
+    const char *kdfname)
 {
     EVP_KDF *kdf = EVP_KDF_fetch(PROV_LIBCTX_OF(provctx), kdfname,
-                                 NULL);
+        NULL);
     const OSSL_PARAM *params;
 
     if (kdf == NULL)
@@ -225,31 +225,31 @@ static const OSSL_PARAM *kdf_gettable_ctx_params(ossl_unused void *vpkdfctx,
     return params;
 }
 
-#define KDF_GETTABLE_CTX_PARAMS(funcname, kdfname) \
+#define KDF_GETTABLE_CTX_PARAMS(funcname, kdfname)                                \
     static const OSSL_PARAM *kdf_##funcname##_gettable_ctx_params(void *vpkdfctx, \
-                                                                  void *provctx) \
-    { \
-        return kdf_gettable_ctx_params(vpkdfctx, provctx, kdfname); \
+        void *provctx)                                                            \
+    {                                                                             \
+        return kdf_gettable_ctx_params(vpkdfctx, provctx, kdfname);               \
     }
 
 KDF_GETTABLE_CTX_PARAMS(tls1_prf, "TLS1-PRF")
 KDF_GETTABLE_CTX_PARAMS(hkdf, "HKDF")
 KDF_GETTABLE_CTX_PARAMS(scrypt, "SCRYPT")
 
-#define KDF_KEYEXCH_FUNCTIONS(funcname) \
-    const OSSL_DISPATCH ossl_kdf_##funcname##_keyexch_functions[] = { \
-        { OSSL_FUNC_KEYEXCH_NEWCTX, (void (*)(void))kdf_##funcname##_newctx }, \
-        { OSSL_FUNC_KEYEXCH_INIT, (void (*)(void))kdf_init }, \
-        { OSSL_FUNC_KEYEXCH_DERIVE, (void (*)(void))kdf_derive }, \
-        { OSSL_FUNC_KEYEXCH_FREECTX, (void (*)(void))kdf_freectx }, \
-        { OSSL_FUNC_KEYEXCH_DUPCTX, (void (*)(void))kdf_dupctx }, \
+#define KDF_KEYEXCH_FUNCTIONS(funcname)                                           \
+    const OSSL_DISPATCH ossl_kdf_##funcname##_keyexch_functions[] = {             \
+        { OSSL_FUNC_KEYEXCH_NEWCTX, (void (*)(void))kdf_##funcname##_newctx },    \
+        { OSSL_FUNC_KEYEXCH_INIT, (void (*)(void))kdf_init },                     \
+        { OSSL_FUNC_KEYEXCH_DERIVE, (void (*)(void))kdf_derive },                 \
+        { OSSL_FUNC_KEYEXCH_FREECTX, (void (*)(void))kdf_freectx },               \
+        { OSSL_FUNC_KEYEXCH_DUPCTX, (void (*)(void))kdf_dupctx },                 \
         { OSSL_FUNC_KEYEXCH_SET_CTX_PARAMS, (void (*)(void))kdf_set_ctx_params }, \
         { OSSL_FUNC_KEYEXCH_GET_CTX_PARAMS, (void (*)(void))kdf_get_ctx_params }, \
-        { OSSL_FUNC_KEYEXCH_SETTABLE_CTX_PARAMS, \
-        (void (*)(void))kdf_##funcname##_settable_ctx_params }, \
-        { OSSL_FUNC_KEYEXCH_GETTABLE_CTX_PARAMS, \
-        (void (*)(void))kdf_##funcname##_gettable_ctx_params }, \
-        OSSL_DISPATCH_END \
+        { OSSL_FUNC_KEYEXCH_SETTABLE_CTX_PARAMS,                                  \
+            (void (*)(void))kdf_##funcname##_settable_ctx_params },               \
+        { OSSL_FUNC_KEYEXCH_GETTABLE_CTX_PARAMS,                                  \
+            (void (*)(void))kdf_##funcname##_gettable_ctx_params },               \
+        OSSL_DISPATCH_END                                                         \
     };
 
 KDF_KEYEXCH_FUNCTIONS(tls1_prf)
diff --git a/providers/implementations/include/prov/blake2.h b/providers/implementations/include/prov/blake2.h
index 42229e2d74028..0a9cdba1383cb 100644
--- a/providers/implementations/include/prov/blake2.h
+++ b/providers/implementations/include/prov/blake2.h
@@ -8,37 +8,37 @@
  */
 
 #ifndef OSSL_PROV_BLAKE2_H
-# define OSSL_PROV_BLAKE2_H
+#define OSSL_PROV_BLAKE2_H
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# include <openssl/e_os2.h>
-# include <stddef.h>
-# include <crypto/evp.h>
+#include <openssl/e_os2.h>
+#include <stddef.h>
+#include <crypto/evp.h>
 
-# define BLAKE2S_BLOCKBYTES    64
-# define BLAKE2S_OUTBYTES      32
-# define BLAKE2S_KEYBYTES      32
-# define BLAKE2S_SALTBYTES     8
-# define BLAKE2S_PERSONALBYTES 8
+#define BLAKE2S_BLOCKBYTES 64
+#define BLAKE2S_OUTBYTES 32
+#define BLAKE2S_KEYBYTES 32
+#define BLAKE2S_SALTBYTES 8
+#define BLAKE2S_PERSONALBYTES 8
 
-# define BLAKE2B_BLOCKBYTES    128
-# define BLAKE2B_OUTBYTES      64
-# define BLAKE2B_KEYBYTES      64
-# define BLAKE2B_SALTBYTES     16
-# define BLAKE2B_PERSONALBYTES 16
+#define BLAKE2B_BLOCKBYTES 128
+#define BLAKE2B_OUTBYTES 64
+#define BLAKE2B_KEYBYTES 64
+#define BLAKE2B_SALTBYTES 16
+#define BLAKE2B_PERSONALBYTES 16
 
 struct blake2s_param_st {
-    uint8_t  digest_length; /* 1 */
-    uint8_t  key_length;    /* 2 */
-    uint8_t  fanout;        /* 3 */
-    uint8_t  depth;         /* 4 */
-    uint8_t  leaf_length[4];/* 8 */
-    uint8_t  node_offset[6];/* 14 */
-    uint8_t  node_depth;    /* 15 */
-    uint8_t  inner_length;  /* 16 */
-    uint8_t  salt[BLAKE2S_SALTBYTES]; /* 24 */
-    uint8_t  personal[BLAKE2S_PERSONALBYTES];  /* 32 */
+    uint8_t digest_length; /* 1 */
+    uint8_t key_length; /* 2 */
+    uint8_t fanout; /* 3 */
+    uint8_t depth; /* 4 */
+    uint8_t leaf_length[4]; /* 8 */
+    uint8_t node_offset[6]; /* 14 */
+    uint8_t node_depth; /* 15 */
+    uint8_t inner_length; /* 16 */
+    uint8_t salt[BLAKE2S_SALTBYTES]; /* 24 */
+    uint8_t personal[BLAKE2S_PERSONALBYTES]; /* 32 */
 };
 
 typedef struct blake2s_param_st BLAKE2S_PARAM;
@@ -47,23 +47,23 @@ struct blake2s_ctx_st {
     uint32_t h[8];
     uint32_t t[2];
     uint32_t f[2];
-    uint8_t  buf[BLAKE2S_BLOCKBYTES];
-    size_t   buflen;
-    size_t   outlen;
+    uint8_t buf[BLAKE2S_BLOCKBYTES];
+    size_t buflen;
+    size_t outlen;
 };
 
 struct blake2b_param_st {
-    uint8_t  digest_length; /* 1 */
-    uint8_t  key_length;    /* 2 */
-    uint8_t  fanout;        /* 3 */
-    uint8_t  depth;         /* 4 */
-    uint8_t  leaf_length[4];/* 8 */
-    uint8_t  node_offset[8];/* 16 */
-    uint8_t  node_depth;    /* 17 */
-    uint8_t  inner_length;  /* 18 */
-    uint8_t  reserved[14];  /* 32 */
-    uint8_t  salt[BLAKE2B_SALTBYTES]; /* 48 */
-    uint8_t  personal[BLAKE2B_PERSONALBYTES];  /* 64 */
+    uint8_t digest_length; /* 1 */
+    uint8_t key_length; /* 2 */
+    uint8_t fanout; /* 3 */
+    uint8_t depth; /* 4 */
+    uint8_t leaf_length[4]; /* 8 */
+    uint8_t node_offset[8]; /* 16 */
+    uint8_t node_depth; /* 17 */
+    uint8_t inner_length; /* 18 */
+    uint8_t reserved[14]; /* 32 */
+    uint8_t salt[BLAKE2B_SALTBYTES]; /* 48 */
+    uint8_t personal[BLAKE2B_PERSONALBYTES]; /* 64 */
 };
 
 typedef struct blake2b_param_st BLAKE2B_PARAM;
@@ -72,9 +72,9 @@ struct blake2b_ctx_st {
     uint64_t h[8];
     uint64_t t[2];
     uint64_t f[2];
-    uint8_t  buf[BLAKE2B_BLOCKBYTES];
-    size_t   buflen;
-    size_t   outlen;
+    uint8_t buf[BLAKE2B_BLOCKBYTES];
+    size_t buflen;
+    size_t outlen;
 };
 
 #define BLAKE2B_DIGEST_LENGTH 64
@@ -95,7 +95,7 @@ struct blake2s_md_data_st {
 
 int ossl_blake2b_init(BLAKE2B_CTX *c, const BLAKE2B_PARAM *P);
 int ossl_blake2b_init_key(BLAKE2B_CTX *c, const BLAKE2B_PARAM *P,
-                          const void *key);
+    const void *key);
 int ossl_blake2b_update(BLAKE2B_CTX *c, const void *data, size_t datalen);
 int ossl_blake2b_final(unsigned char *md, BLAKE2B_CTX *c);
 
@@ -113,12 +113,12 @@ void ossl_blake2b_param_init(BLAKE2B_PARAM *P);
 void ossl_blake2b_param_set_digest_length(BLAKE2B_PARAM *P, uint8_t outlen);
 void ossl_blake2b_param_set_key_length(BLAKE2B_PARAM *P, uint8_t keylen);
 void ossl_blake2b_param_set_personal(BLAKE2B_PARAM *P, const uint8_t *personal,
-                                     size_t length);
+    size_t length);
 void ossl_blake2b_param_set_salt(BLAKE2B_PARAM *P, const uint8_t *salt,
-                                 size_t length);
+    size_t length);
 int ossl_blake2s_init(BLAKE2S_CTX *c, const BLAKE2S_PARAM *P);
 int ossl_blake2s_init_key(BLAKE2S_CTX *c, const BLAKE2S_PARAM *P,
-                          const void *key);
+    const void *key);
 int ossl_blake2s_update(BLAKE2S_CTX *c, const void *data, size_t datalen);
 int ossl_blake2s_final(unsigned char *md, BLAKE2S_CTX *c);
 
@@ -126,9 +126,9 @@ void ossl_blake2s_param_init(BLAKE2S_PARAM *P);
 void ossl_blake2s_param_set_digest_length(BLAKE2S_PARAM *P, uint8_t outlen);
 void ossl_blake2s_param_set_key_length(BLAKE2S_PARAM *P, uint8_t keylen);
 void ossl_blake2s_param_set_personal(BLAKE2S_PARAM *P, const uint8_t *personal,
-                                     size_t length);
+    size_t length);
 void ossl_blake2s_param_set_salt(BLAKE2S_PARAM *P, const uint8_t *salt,
-                                 size_t length);
+    size_t length);
 
 OSSL_FUNC_digest_get_ctx_params_fn ossl_blake2s_get_ctx_params;
 OSSL_FUNC_digest_set_ctx_params_fn ossl_blake2s_set_ctx_params;
diff --git a/providers/implementations/include/prov/ciphercommon.h b/providers/implementations/include/prov/ciphercommon.h
index 46efdc80033f5..429d27cc86260 100644
--- a/providers/implementations/include/prov/ciphercommon.h
+++ b/providers/implementations/include/prov/ciphercommon.h
@@ -8,42 +8,42 @@
  */
 
 #ifndef OSSL_PROV_CIPHERCOMMON_H
-# define OSSL_PROV_CIPHERCOMMON_H
-# pragma once
+#define OSSL_PROV_CIPHERCOMMON_H
+#pragma once
 
-# include <openssl/params.h>
-# include <openssl/core_dispatch.h>
-# include <openssl/core_names.h>
-# include <openssl/evp.h>
-# include "internal/cryptlib.h"
-# include "crypto/modes.h"
+#include <openssl/params.h>
+#include <openssl/core_dispatch.h>
+#include <openssl/core_names.h>
+#include <openssl/evp.h>
+#include "internal/cryptlib.h"
+#include "crypto/modes.h"
 
-# define MAXCHUNK    ((size_t)1 << 30)
-# define MAXBITCHUNK ((size_t)1 << (sizeof(size_t) * 8 - 4))
+#define MAXCHUNK ((size_t)1 << 30)
+#define MAXBITCHUNK ((size_t)1 << (sizeof(size_t) * 8 - 4))
 
-# define GENERIC_BLOCK_SIZE 16
-# define IV_STATE_UNINITIALISED 0  /* initial state is not initialized */
-# define IV_STATE_BUFFERED      1  /* iv has been copied to the iv buffer */
-# define IV_STATE_COPIED        2  /* iv has been copied from the iv buffer */
-# define IV_STATE_FINISHED      3  /* the iv has been used - so don't reuse it */
+#define GENERIC_BLOCK_SIZE 16
+#define IV_STATE_UNINITIALISED 0 /* initial state is not initialized */
+#define IV_STATE_BUFFERED 1 /* iv has been copied to the iv buffer */
+#define IV_STATE_COPIED 2 /* iv has been copied from the iv buffer */
+#define IV_STATE_FINISHED 3 /* the iv has been used - so don't reuse it */
 
-# define PROV_CIPHER_FUNC(type, name, args) typedef type (* OSSL_##name##_fn)args
+#define PROV_CIPHER_FUNC(type, name, args) typedef type(*OSSL_##name##_fn) args
 
 typedef struct prov_cipher_hw_st PROV_CIPHER_HW;
 typedef struct prov_cipher_ctx_st PROV_CIPHER_CTX;
 
-typedef int (PROV_CIPHER_HW_FN)(PROV_CIPHER_CTX *dat, unsigned char *out,
-                                const unsigned char *in, size_t len);
+typedef int(PROV_CIPHER_HW_FN)(PROV_CIPHER_CTX *dat, unsigned char *out,
+    const unsigned char *in, size_t len);
 
 /* Internal flags that can be queried */
-# define PROV_CIPHER_FLAG_AEAD             0x0001
-# define PROV_CIPHER_FLAG_CUSTOM_IV        0x0002
-# define PROV_CIPHER_FLAG_CTS              0x0004
-# define PROV_CIPHER_FLAG_TLS1_MULTIBLOCK  0x0008
-# define PROV_CIPHER_FLAG_RAND_KEY         0x0010
+#define PROV_CIPHER_FLAG_AEAD 0x0001
+#define PROV_CIPHER_FLAG_CUSTOM_IV 0x0002
+#define PROV_CIPHER_FLAG_CTS 0x0004
+#define PROV_CIPHER_FLAG_TLS1_MULTIBLOCK 0x0008
+#define PROV_CIPHER_FLAG_RAND_KEY 0x0010
 /* Internal flags that are only used within the provider */
-# define PROV_CIPHER_FLAG_VARIABLE_LENGTH  0x0100
-# define PROV_CIPHER_FLAG_INVERSE_CIPHER   0x0200
+#define PROV_CIPHER_FLAG_VARIABLE_LENGTH 0x0100
+#define PROV_CIPHER_FLAG_INVERSE_CIPHER 0x0200
 
 struct prov_cipher_ctx_st {
     /* place buffer at the beginning for memory alignment */
@@ -61,13 +61,13 @@ struct prov_cipher_ctx_st {
     } stream;
 
     unsigned int mode;
-    size_t keylen;           /* key size (in bytes) */
+    size_t keylen; /* key size (in bytes) */
     size_t ivlen;
     size_t blocksize;
-    size_t bufsz;            /* Number of bytes in buf */
-    unsigned int cts_mode;   /* Use to set the type for CTS modes */
-    unsigned int pad : 1;    /* Whether padding should be used or not */
-    unsigned int enc : 1;    /* Set to 1 for encrypt, or 0 otherwise */
+    size_t bufsz; /* Number of bytes in buf */
+    unsigned int cts_mode; /* Use to set the type for CTS modes */
+    unsigned int pad : 1; /* Whether padding should be used or not */
+    unsigned int enc : 1; /* Set to 1 for encrypt, or 0 otherwise */
     unsigned int iv_set : 1; /* Set when the iv is copied to the iv/oiv buffers */
     unsigned int key_set : 1; /* Set when key is set on the context */
     unsigned int updated : 1; /* Set to 1 during update for one shot ciphers */
@@ -76,18 +76,18 @@ struct prov_cipher_ctx_st {
     unsigned int use_bits : 1; /* Set to 0 for cfb1 to use bits instead of bytes */
 
     unsigned int tlsversion; /* If TLS padding is in use the TLS version number */
-    unsigned char *tlsmac;   /* tls MAC extracted from the last record */
-    int alloced;             /*
-                              * Whether the tlsmac data has been allocated or
-                              * points into the user buffer.
-                              */
-    size_t tlsmacsize;       /* Size of the TLS MAC */
-    int removetlspad;        /* Whether TLS padding should be removed or not */
-    size_t removetlsfixed;   /*
-                              * Length of the fixed size data to remove when
-                              * processing TLS data (equals mac size plus
-                              * IV size if applicable)
-                              */
+    unsigned char *tlsmac; /* tls MAC extracted from the last record */
+    int alloced; /*
+                  * Whether the tlsmac data has been allocated or
+                  * points into the user buffer.
+                  */
+    size_t tlsmacsize; /* Size of the TLS MAC */
+    int removetlspad; /* Whether TLS padding should be removed or not */
+    size_t removetlsfixed; /*
+                            * Length of the fixed size data to remove when
+                            * processing TLS data (equals mac size plus
+                            * IV size if applicable)
+                            */
 
     /*
      * num contains the number of bytes of |iv| which are valid for modes that
@@ -115,7 +115,7 @@ OSSL_FUNC_cipher_final_fn ossl_cipher_generic_stream_final;
 OSSL_FUNC_cipher_cipher_fn ossl_cipher_generic_cipher;
 OSSL_FUNC_cipher_get_ctx_params_fn ossl_cipher_generic_get_ctx_params;
 OSSL_FUNC_cipher_set_ctx_params_fn ossl_cipher_generic_set_ctx_params;
-OSSL_FUNC_cipher_gettable_params_fn     ossl_cipher_generic_gettable_params;
+OSSL_FUNC_cipher_gettable_params_fn ossl_cipher_generic_gettable_params;
 OSSL_FUNC_cipher_gettable_ctx_params_fn ossl_cipher_generic_gettable_ctx_params;
 OSSL_FUNC_cipher_settable_ctx_params_fn ossl_cipher_generic_settable_ctx_params;
 OSSL_FUNC_cipher_set_ctx_params_fn ossl_cipher_var_keylen_set_ctx_params;
@@ -126,107 +126,106 @@ OSSL_FUNC_cipher_encrypt_skey_init_fn ossl_cipher_generic_skey_einit;
 OSSL_FUNC_cipher_decrypt_skey_init_fn ossl_cipher_generic_skey_dinit;
 
 int ossl_cipher_generic_get_params(OSSL_PARAM params[], unsigned int md,
-                                   uint64_t flags,
-                                   size_t kbits, size_t blkbits, size_t ivbits);
+    uint64_t flags,
+    size_t kbits, size_t blkbits, size_t ivbits);
 void ossl_cipher_generic_initkey(void *vctx, size_t kbits, size_t blkbits,
-                                 size_t ivbits, unsigned int mode,
-                                 uint64_t flags,
-                                 const PROV_CIPHER_HW *hw, void *provctx);
-
-# define IMPLEMENT_generic_cipher_func(alg, UCALG, lcmode, UCMODE, flags, kbits,\
-                                      blkbits, ivbits, typ)                    \
-const OSSL_DISPATCH ossl_##alg##kbits##lcmode##_functions[] = {                \
-    { OSSL_FUNC_CIPHER_NEWCTX,                                                 \
-      (void (*)(void)) alg##_##kbits##_##lcmode##_newctx },                    \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void)) alg##_freectx },              \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void)) alg##_dupctx },                \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))ossl_cipher_generic_einit },   \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_cipher_generic_dinit },   \
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_cipher_generic_##typ##_update },\
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_cipher_generic_##typ##_final },  \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },        \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-      (void (*)(void)) alg##_##kbits##_##lcmode##_get_params },                \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-      (void (*)(void))ossl_cipher_generic_get_ctx_params },                    \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-      (void (*)(void))ossl_cipher_generic_set_ctx_params },                    \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))ossl_cipher_generic_gettable_ctx_params },               \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-     (void (*)(void))ossl_cipher_generic_settable_ctx_params },                \
-    { OSSL_FUNC_CIPHER_ENCRYPT_SKEY_INIT, (void (*)(void))ossl_cipher_generic_skey_einit },\
-    { OSSL_FUNC_CIPHER_DECRYPT_SKEY_INIT, (void (*)(void))ossl_cipher_generic_skey_dinit },\
-    OSSL_DISPATCH_END                                                          \
-};
-
-# define IMPLEMENT_var_keylen_cipher_func(alg, UCALG, lcmode, UCMODE, flags,    \
-                                         kbits, blkbits, ivbits, typ)          \
-const OSSL_DISPATCH ossl_##alg##kbits##lcmode##_functions[] = {                \
-    { OSSL_FUNC_CIPHER_NEWCTX,                                                 \
-      (void (*)(void)) alg##_##kbits##_##lcmode##_newctx },                    \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void)) alg##_freectx },              \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void)) alg##_dupctx },                \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))ossl_cipher_generic_einit },\
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_cipher_generic_dinit },\
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_cipher_generic_##typ##_update },\
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_cipher_generic_##typ##_final },  \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },   \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-      (void (*)(void)) alg##_##kbits##_##lcmode##_get_params },                \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-      (void (*)(void))ossl_cipher_generic_get_ctx_params },                    \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-      (void (*)(void))ossl_cipher_var_keylen_set_ctx_params },                 \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))ossl_cipher_generic_gettable_ctx_params },               \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-     (void (*)(void))ossl_cipher_var_keylen_settable_ctx_params },             \
-    { OSSL_FUNC_CIPHER_ENCRYPT_SKEY_INIT, (void (*)(void))ossl_cipher_generic_skey_einit },\
-    { OSSL_FUNC_CIPHER_DECRYPT_SKEY_INIT, (void (*)(void))ossl_cipher_generic_skey_dinit },\
-    OSSL_DISPATCH_END                                                          \
-};
-
-
-# define IMPLEMENT_generic_cipher_genfn(alg, UCALG, lcmode, UCMODE, flags,      \
-                                       kbits, blkbits, ivbits, typ)            \
-static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lcmode##_get_params;   \
-static int alg##_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])          \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
-                                          flags, kbits, blkbits, ivbits);      \
-}                                                                              \
-static OSSL_FUNC_cipher_newctx_fn alg##_##kbits##_##lcmode##_newctx;           \
-static void * alg##_##kbits##_##lcmode##_newctx(void *provctx)                 \
-{                                                                              \
-     PROV_##UCALG##_CTX *ctx = ossl_prov_is_running() ? OPENSSL_zalloc(sizeof(*ctx))\
-                                                     : NULL;                   \
-     if (ctx != NULL) {                                                        \
-         ossl_cipher_generic_initkey(ctx, kbits, blkbits, ivbits,              \
-                                     EVP_CIPH_##UCMODE##_MODE, flags,          \
-                                     ossl_prov_cipher_hw_##alg##_##lcmode(kbits),\
-                                     provctx);                                 \
-     }                                                                         \
-     return ctx;                                                               \
-}                                                                              \
-
-# define IMPLEMENT_generic_cipher(alg, UCALG, lcmode, UCMODE, flags, kbits,     \
-                                 blkbits, ivbits, typ)                         \
-IMPLEMENT_generic_cipher_genfn(alg, UCALG, lcmode, UCMODE, flags, kbits,       \
-                               blkbits, ivbits, typ)                           \
-IMPLEMENT_generic_cipher_func(alg, UCALG, lcmode, UCMODE, flags, kbits,        \
-                              blkbits, ivbits, typ)
-
-# define IMPLEMENT_var_keylen_cipher(alg, UCALG, lcmode, UCMODE, flags, kbits,  \
-                                    blkbits, ivbits, typ)                      \
-IMPLEMENT_generic_cipher_genfn(alg, UCALG, lcmode, UCMODE, flags, kbits,       \
-                               blkbits, ivbits, typ)                           \
-IMPLEMENT_var_keylen_cipher_func(alg, UCALG, lcmode, UCMODE, flags, kbits,     \
-                                 blkbits, ivbits, typ)
+    size_t ivbits, unsigned int mode,
+    uint64_t flags,
+    const PROV_CIPHER_HW *hw, void *provctx);
+
+#define IMPLEMENT_generic_cipher_func(alg, UCALG, lcmode, UCMODE, flags, kbits,                 \
+    blkbits, ivbits, typ)                                                                       \
+    const OSSL_DISPATCH ossl_##alg##kbits##lcmode##_functions[] = {                             \
+        { OSSL_FUNC_CIPHER_NEWCTX,                                                              \
+            (void (*)(void))alg##_##kbits##_##lcmode##_newctx },                                \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))alg##_freectx },                            \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))alg##_dupctx },                              \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))ossl_cipher_generic_einit },           \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_cipher_generic_dinit },           \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_cipher_generic_##typ##_update },        \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_cipher_generic_##typ##_final },          \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },                \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                                          \
+            (void (*)(void))alg##_##kbits##_##lcmode##_get_params },                            \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                                      \
+            (void (*)(void))ossl_cipher_generic_get_ctx_params },                               \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                                      \
+            (void (*)(void))ossl_cipher_generic_set_ctx_params },                               \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                                     \
+            (void (*)(void))ossl_cipher_generic_gettable_params },                              \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                                 \
+            (void (*)(void))ossl_cipher_generic_gettable_ctx_params },                          \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                                 \
+            (void (*)(void))ossl_cipher_generic_settable_ctx_params },                          \
+        { OSSL_FUNC_CIPHER_ENCRYPT_SKEY_INIT, (void (*)(void))ossl_cipher_generic_skey_einit }, \
+        { OSSL_FUNC_CIPHER_DECRYPT_SKEY_INIT, (void (*)(void))ossl_cipher_generic_skey_dinit }, \
+        OSSL_DISPATCH_END                                                                       \
+    };
+
+#define IMPLEMENT_var_keylen_cipher_func(alg, UCALG, lcmode, UCMODE, flags,                     \
+    kbits, blkbits, ivbits, typ)                                                                \
+    const OSSL_DISPATCH ossl_##alg##kbits##lcmode##_functions[] = {                             \
+        { OSSL_FUNC_CIPHER_NEWCTX,                                                              \
+            (void (*)(void))alg##_##kbits##_##lcmode##_newctx },                                \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))alg##_freectx },                            \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))alg##_dupctx },                              \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))ossl_cipher_generic_einit },           \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_cipher_generic_dinit },           \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_cipher_generic_##typ##_update },        \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_cipher_generic_##typ##_final },          \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_cipher_generic_cipher },                \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                                          \
+            (void (*)(void))alg##_##kbits##_##lcmode##_get_params },                            \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                                      \
+            (void (*)(void))ossl_cipher_generic_get_ctx_params },                               \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                                      \
+            (void (*)(void))ossl_cipher_var_keylen_set_ctx_params },                            \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                                     \
+            (void (*)(void))ossl_cipher_generic_gettable_params },                              \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                                 \
+            (void (*)(void))ossl_cipher_generic_gettable_ctx_params },                          \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                                 \
+            (void (*)(void))ossl_cipher_var_keylen_settable_ctx_params },                       \
+        { OSSL_FUNC_CIPHER_ENCRYPT_SKEY_INIT, (void (*)(void))ossl_cipher_generic_skey_einit }, \
+        { OSSL_FUNC_CIPHER_DECRYPT_SKEY_INIT, (void (*)(void))ossl_cipher_generic_skey_dinit }, \
+        OSSL_DISPATCH_END                                                                       \
+    };
+
+#define IMPLEMENT_generic_cipher_genfn(alg, UCALG, lcmode, UCMODE, flags,               \
+    kbits, blkbits, ivbits, typ)                                                        \
+    static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lcmode##_get_params;        \
+    static int alg##_##kbits##_##lcmode##_get_params(OSSL_PARAM params[])               \
+    {                                                                                   \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,         \
+            flags, kbits, blkbits, ivbits);                                             \
+    }                                                                                   \
+    static OSSL_FUNC_cipher_newctx_fn alg##_##kbits##_##lcmode##_newctx;                \
+    static void *alg##_##kbits##_##lcmode##_newctx(void *provctx)                       \
+    {                                                                                   \
+        PROV_##UCALG##_CTX *ctx = ossl_prov_is_running() ? OPENSSL_zalloc(sizeof(*ctx)) \
+                                                         : NULL;                        \
+        if (ctx != NULL) {                                                              \
+            ossl_cipher_generic_initkey(ctx, kbits, blkbits, ivbits,                    \
+                EVP_CIPH_##UCMODE##_MODE, flags,                                        \
+                ossl_prov_cipher_hw_##alg##_##lcmode(kbits),                            \
+                provctx);                                                               \
+        }                                                                               \
+        return ctx;                                                                     \
+    }
+
+#define IMPLEMENT_generic_cipher(alg, UCALG, lcmode, UCMODE, flags, kbits,   \
+    blkbits, ivbits, typ)                                                    \
+    IMPLEMENT_generic_cipher_genfn(alg, UCALG, lcmode, UCMODE, flags, kbits, \
+        blkbits, ivbits, typ)                                                \
+    IMPLEMENT_generic_cipher_func(alg, UCALG, lcmode, UCMODE, flags, kbits,  \
+        blkbits, ivbits, typ)
+
+#define IMPLEMENT_var_keylen_cipher(alg, UCALG, lcmode, UCMODE, flags, kbits,  \
+    blkbits, ivbits, typ)                                                      \
+    IMPLEMENT_generic_cipher_genfn(alg, UCALG, lcmode, UCMODE, flags, kbits,   \
+        blkbits, ivbits, typ)                                                  \
+    IMPLEMENT_var_keylen_cipher_func(alg, UCALG, lcmode, UCMODE, flags, kbits, \
+        blkbits, ivbits, typ)
 
 PROV_CIPHER_HW_FN ossl_cipher_hw_generic_cbc;
 PROV_CIPHER_HW_FN ossl_cipher_hw_generic_ecb;
@@ -239,137 +238,139 @@ PROV_CIPHER_HW_FN ossl_cipher_hw_chunked_cbc;
 PROV_CIPHER_HW_FN ossl_cipher_hw_chunked_cfb8;
 PROV_CIPHER_HW_FN ossl_cipher_hw_chunked_cfb128;
 PROV_CIPHER_HW_FN ossl_cipher_hw_chunked_ofb128;
-# define ossl_cipher_hw_chunked_ecb  ossl_cipher_hw_generic_ecb
-# define ossl_cipher_hw_chunked_ctr  ossl_cipher_hw_generic_ctr
-# define ossl_cipher_hw_chunked_cfb1 ossl_cipher_hw_generic_cfb1
-
-# define IMPLEMENT_CIPHER_HW_OFB(MODE, NAME, CTX_NAME, KEY_NAME, FUNC_PREFIX)   \
-static int cipher_hw_##NAME##_##MODE##_cipher(PROV_CIPHER_CTX *ctx,            \
-                                         unsigned char *out,                   \
-                                         const unsigned char *in, size_t len)  \
-{                                                                              \
-    int num = ctx->num;                                                        \
-    KEY_NAME *key = &(((CTX_NAME *)ctx)->ks.ks);                               \
+#define ossl_cipher_hw_chunked_ecb ossl_cipher_hw_generic_ecb
+#define ossl_cipher_hw_chunked_ctr ossl_cipher_hw_generic_ctr
+#define ossl_cipher_hw_chunked_cfb1 ossl_cipher_hw_generic_cfb1
+
+#define IMPLEMENT_CIPHER_HW_OFB(MODE, NAME, CTX_NAME, KEY_NAME, FUNC_PREFIX) \
+    static int cipher_hw_##NAME##_##MODE##_cipher(PROV_CIPHER_CTX *ctx,      \
+        unsigned char *out,                                                  \
+        const unsigned char *in, size_t len)                                 \
+    {                                                                        \
+        int num = ctx->num;                                                  \
+        KEY_NAME *key = &(((CTX_NAME *)ctx)->ks.ks);                         \
+                                                                             \
+        while (len >= MAXCHUNK) {                                            \
+            FUNC_PREFIX##_encrypt(in, out, MAXCHUNK, key, ctx->iv, &num);    \
+            len -= MAXCHUNK;                                                 \
+            in += MAXCHUNK;                                                  \
+            out += MAXCHUNK;                                                 \
+        }                                                                    \
+        if (len > 0) {                                                       \
+            FUNC_PREFIX##_encrypt(in, out, (long)len, key, ctx->iv, &num);   \
+        }                                                                    \
+        ctx->num = num;                                                      \
+        return 1;                                                            \
+    }
+
+#define IMPLEMENT_CIPHER_HW_ECB(MODE, NAME, CTX_NAME, KEY_NAME, FUNC_PREFIX) \
+    static int cipher_hw_##NAME##_##MODE##_cipher(PROV_CIPHER_CTX *ctx,      \
+        unsigned char *out,                                                  \
+        const unsigned char *in, size_t len)                                 \
+    {                                                                        \
+        size_t i, bl = ctx->blocksize;                                       \
+        KEY_NAME *key = &(((CTX_NAME *)ctx)->ks.ks);                         \
+                                                                             \
+        if (len < bl)                                                        \
+            return 1;                                                        \
+        for (i = 0, len -= bl; i <= len; i += bl)                            \
+            FUNC_PREFIX##_encrypt(in + i, out + i, key, ctx->enc);           \
+        return 1;                                                            \
+    }
+
+#define IMPLEMENT_CIPHER_HW_CBC(MODE, NAME, CTX_NAME, KEY_NAME, FUNC_PREFIX)   \
+    static int cipher_hw_##NAME##_##MODE##_cipher(PROV_CIPHER_CTX *ctx,        \
+        unsigned char *out,                                                    \
+        const unsigned char *in, size_t len)                                   \
+    {                                                                          \
+        KEY_NAME *key = &(((CTX_NAME *)ctx)->ks.ks);                           \
                                                                                \
-    while (len >= MAXCHUNK) {                                                  \
-        FUNC_PREFIX##_encrypt(in, out, MAXCHUNK, key, ctx->iv, &num);          \
-        len -= MAXCHUNK;                                                       \
-        in += MAXCHUNK;                                                        \
-        out += MAXCHUNK;                                                       \
-    }                                                                          \
-    if (len > 0) {                                                             \
-        FUNC_PREFIX##_encrypt(in, out, (long)len, key, ctx->iv, &num);         \
-    }                                                                          \
-    ctx->num = num;                                                            \
-    return 1;                                                                  \
-}
-
-# define IMPLEMENT_CIPHER_HW_ECB(MODE, NAME, CTX_NAME, KEY_NAME, FUNC_PREFIX)   \
-static int cipher_hw_##NAME##_##MODE##_cipher(PROV_CIPHER_CTX *ctx,            \
-                                         unsigned char *out,                   \
-                                         const unsigned char *in, size_t len)  \
-{                                                                              \
-    size_t i, bl = ctx->blocksize;                                             \
-    KEY_NAME *key = &(((CTX_NAME *)ctx)->ks.ks);                               \
-                                                                               \
-    if (len < bl)                                                              \
+        while (len >= MAXCHUNK) {                                              \
+            FUNC_PREFIX##_encrypt(in, out, MAXCHUNK, key, ctx->iv, ctx->enc);  \
+            len -= MAXCHUNK;                                                   \
+            in += MAXCHUNK;                                                    \
+            out += MAXCHUNK;                                                   \
+        }                                                                      \
+        if (len > 0)                                                           \
+            FUNC_PREFIX##_encrypt(in, out, (long)len, key, ctx->iv, ctx->enc); \
         return 1;                                                              \
-    for (i = 0, len -= bl; i <= len; i += bl)                                  \
-        FUNC_PREFIX##_encrypt(in + i, out + i, key, ctx->enc);                 \
-    return 1;                                                                  \
-}
-
-# define IMPLEMENT_CIPHER_HW_CBC(MODE, NAME, CTX_NAME, KEY_NAME, FUNC_PREFIX)   \
-static int cipher_hw_##NAME##_##MODE##_cipher(PROV_CIPHER_CTX *ctx,            \
-                                         unsigned char *out,                   \
-                                         const unsigned char *in, size_t len)  \
-{                                                                              \
-    KEY_NAME *key = &(((CTX_NAME *)ctx)->ks.ks);                               \
-                                                                               \
-    while (len >= MAXCHUNK) {                                                  \
-        FUNC_PREFIX##_encrypt(in, out, MAXCHUNK, key, ctx->iv, ctx->enc);      \
-        len -= MAXCHUNK;                                                       \
-        in += MAXCHUNK;                                                        \
-        out += MAXCHUNK;                                                       \
-    }                                                                          \
-    if (len > 0)                                                               \
-        FUNC_PREFIX##_encrypt(in, out, (long)len, key, ctx->iv, ctx->enc);     \
-    return 1;                                                                  \
-}
-
-# define IMPLEMENT_CIPHER_HW_CFB(MODE, NAME, CTX_NAME, KEY_NAME, FUNC_PREFIX)   \
-static int cipher_hw_##NAME##_##MODE##_cipher(PROV_CIPHER_CTX *ctx,            \
-                                         unsigned char *out,                   \
-                                         const unsigned char *in, size_t len)  \
-{                                                                              \
-    size_t chunk = MAXCHUNK;                                                   \
-    KEY_NAME *key = &(((CTX_NAME *)ctx)->ks.ks);                               \
-    int num = ctx->num;                                                        \
-                                                                               \
-    if (len < chunk)                                                           \
-        chunk = len;                                                           \
-    while (len > 0 && len >= chunk) {                                          \
-        FUNC_PREFIX##_encrypt(in, out, (long)chunk, key, ctx->iv, &num,        \
-                              ctx->enc);                                       \
-        len -= chunk;                                                          \
-        in += chunk;                                                           \
-        out += chunk;                                                          \
-        if (len < chunk)                                                       \
-            chunk = len;                                                       \
-    }                                                                          \
-    ctx->num = num;                                                            \
-    return 1;                                                                  \
-}
-
-# define IMPLEMENT_CIPHER_HW_COPYCTX(name, CTX_TYPE)                            \
-static void name(PROV_CIPHER_CTX *dst, const PROV_CIPHER_CTX *src)             \
-{                                                                              \
-    CTX_TYPE *sctx = (CTX_TYPE *)src;                                          \
-    CTX_TYPE *dctx = (CTX_TYPE *)dst;                                          \
-                                                                               \
-    *dctx = *sctx;                                                             \
-    dst->ks = &dctx->ks.ks;                                                    \
-}
-
-# define CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_START(name)                         \
-static const OSSL_PARAM name##_known_gettable_ctx_params[] = {                 \
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),                         \
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_IVLEN, NULL),                          \
-    OSSL_PARAM_uint(OSSL_CIPHER_PARAM_PADDING, NULL),                          \
-    OSSL_PARAM_uint(OSSL_CIPHER_PARAM_NUM, NULL),                              \
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_IV, NULL, 0),                    \
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_UPDATED_IV, NULL, 0),
-
-# define CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(name)                           \
-    OSSL_PARAM_END                                                             \
-};                                                                             \
-const OSSL_PARAM * name##_gettable_ctx_params(ossl_unused void *cctx,          \
-                                              ossl_unused void *provctx)       \
-{                                                                              \
-    return name##_known_gettable_ctx_params;                                   \
-}
-
-# define CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_START(name)                         \
-static const OSSL_PARAM name##_known_settable_ctx_params[] = {                 \
-    OSSL_PARAM_uint(OSSL_CIPHER_PARAM_PADDING, NULL),                          \
-    OSSL_PARAM_uint(OSSL_CIPHER_PARAM_NUM, NULL),
-# define CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(name)                           \
-    OSSL_PARAM_END                                                             \
-};                                                                             \
-const OSSL_PARAM * name##_settable_ctx_params(ossl_unused void *cctx,          \
-                                              ossl_unused void *provctx)       \
-{                                                                              \
-    return name##_known_settable_ctx_params;                                   \
-}
+    }
+
+#define IMPLEMENT_CIPHER_HW_CFB(MODE, NAME, CTX_NAME, KEY_NAME, FUNC_PREFIX) \
+    static int cipher_hw_##NAME##_##MODE##_cipher(PROV_CIPHER_CTX *ctx,      \
+        unsigned char *out,                                                  \
+        const unsigned char *in, size_t len)                                 \
+    {                                                                        \
+        size_t chunk = MAXCHUNK;                                             \
+        KEY_NAME *key = &(((CTX_NAME *)ctx)->ks.ks);                         \
+        int num = ctx->num;                                                  \
+                                                                             \
+        if (len < chunk)                                                     \
+            chunk = len;                                                     \
+        while (len > 0 && len >= chunk) {                                    \
+            FUNC_PREFIX##_encrypt(in, out, (long)chunk, key, ctx->iv, &num,  \
+                ctx->enc);                                                   \
+            len -= chunk;                                                    \
+            in += chunk;                                                     \
+            out += chunk;                                                    \
+            if (len < chunk)                                                 \
+                chunk = len;                                                 \
+        }                                                                    \
+        ctx->num = num;                                                      \
+        return 1;                                                            \
+    }
+
+#define IMPLEMENT_CIPHER_HW_COPYCTX(name, CTX_TYPE)                    \
+    static void name(PROV_CIPHER_CTX *dst, const PROV_CIPHER_CTX *src) \
+    {                                                                  \
+        CTX_TYPE *sctx = (CTX_TYPE *)src;                              \
+        CTX_TYPE *dctx = (CTX_TYPE *)dst;                              \
+                                                                       \
+        *dctx = *sctx;                                                 \
+        dst->ks = &dctx->ks.ks;                                        \
+    }
+
+#define CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_START(name)             \
+    static const OSSL_PARAM name##_known_gettable_ctx_params[] = { \
+        OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),         \
+        OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_IVLEN, NULL),          \
+        OSSL_PARAM_uint(OSSL_CIPHER_PARAM_PADDING, NULL),          \
+        OSSL_PARAM_uint(OSSL_CIPHER_PARAM_NUM, NULL),              \
+        OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_IV, NULL, 0),    \
+        OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_UPDATED_IV, NULL, 0),
+
+#define CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(name)                     \
+    OSSL_PARAM_END                                                       \
+    }                                                                    \
+    ;                                                                    \
+    const OSSL_PARAM *name##_gettable_ctx_params(ossl_unused void *cctx, \
+        ossl_unused void *provctx)                                       \
+    {                                                                    \
+        return name##_known_gettable_ctx_params;                         \
+    }
+
+#define CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_START(name)             \
+    static const OSSL_PARAM name##_known_settable_ctx_params[] = { \
+        OSSL_PARAM_uint(OSSL_CIPHER_PARAM_PADDING, NULL),          \
+        OSSL_PARAM_uint(OSSL_CIPHER_PARAM_NUM, NULL),
+#define CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(name)                     \
+    OSSL_PARAM_END                                                       \
+    }                                                                    \
+    ;                                                                    \
+    const OSSL_PARAM *name##_settable_ctx_params(ossl_unused void *cctx, \
+        ossl_unused void *provctx)                                       \
+    {                                                                    \
+        return name##_known_settable_ctx_params;                         \
+    }
 
 int ossl_cipher_generic_initiv(PROV_CIPHER_CTX *ctx, const unsigned char *iv,
-                               size_t ivlen);
+    size_t ivlen);
 
 size_t ossl_cipher_fillblock(unsigned char *buf, size_t *buflen,
-                             size_t blocksize,
-                             const unsigned char **in, size_t *inlen);
+    size_t blocksize,
+    const unsigned char **in, size_t *inlen);
 int ossl_cipher_trailingdata(unsigned char *buf, size_t *buflen,
-                             size_t blocksize,
-                             const unsigned char **in, size_t *inlen);
+    size_t blocksize,
+    const unsigned char **in, size_t *inlen);
 
 #endif
diff --git a/providers/implementations/include/prov/ciphercommon_aead.h b/providers/implementations/include/prov/ciphercommon_aead.h
index 8d709f10ea64e..f9ff3affdf8f1 100644
--- a/providers/implementations/include/prov/ciphercommon_aead.h
+++ b/providers/implementations/include/prov/ciphercommon_aead.h
@@ -8,51 +8,51 @@
  */
 
 #ifndef OSSL_PROV_CIPHERCOMMON_AEAD_H
-# define OSSL_PROV_CIPHERCOMMON_AEAD_H
-# pragma once
+#define OSSL_PROV_CIPHERCOMMON_AEAD_H
+#pragma once
 
-# define UNINITIALISED_SIZET ((size_t)-1)
+#define UNINITIALISED_SIZET ((size_t)-1)
 
-# define AEAD_FLAGS (PROV_CIPHER_FLAG_AEAD | PROV_CIPHER_FLAG_CUSTOM_IV)
+#define AEAD_FLAGS (PROV_CIPHER_FLAG_AEAD | PROV_CIPHER_FLAG_CUSTOM_IV)
 
-# define IMPLEMENT_aead_cipher(alg, lc, UCMODE, flags, kbits, blkbits, ivbits)  \
-static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lc##_get_params;       \
-static int alg##_##kbits##_##lc##_get_params(OSSL_PARAM params[])              \
-{                                                                              \
-    return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,    \
-                                          flags, kbits, blkbits, ivbits);      \
-}                                                                              \
-static OSSL_FUNC_cipher_newctx_fn alg##kbits##lc##_newctx;                     \
-static void * alg##kbits##lc##_newctx(void *provctx)                           \
-{                                                                              \
-    return alg##_##lc##_newctx(provctx, kbits);                                \
-}                                                                              \
-static void * alg##kbits##lc##_dupctx(void *src)                               \
-{                                                                              \
-    return alg##_##lc##_dupctx(src);                                           \
-}                                                                              \
-const OSSL_DISPATCH ossl_##alg##kbits##lc##_functions[] = {                    \
-    { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))alg##kbits##lc##_newctx },      \
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))alg##_##lc##_freectx },        \
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))alg##kbits##lc##_dupctx },      \
-    { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))ossl_##lc##_einit },      \
-    { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_##lc##_dinit },      \
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_##lc##_stream_update },    \
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_##lc##_stream_final },      \
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_##lc##_cipher },           \
-    { OSSL_FUNC_CIPHER_GET_PARAMS,                                             \
-      (void (*)(void)) alg##_##kbits##_##lc##_get_params },                    \
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                         \
-      (void (*)(void)) ossl_##lc##_get_ctx_params },                           \
-    { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                         \
-      (void (*)(void)) ossl_##lc##_set_ctx_params },                           \
-    { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                        \
-      (void (*)(void))ossl_cipher_generic_gettable_params },                   \
-    { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))ossl_cipher_aead_gettable_ctx_params },                  \
-    { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                    \
-      (void (*)(void))ossl_cipher_aead_settable_ctx_params },                  \
-    OSSL_DISPATCH_END                                                          \
-}
+#define IMPLEMENT_aead_cipher(alg, lc, UCMODE, flags, kbits, blkbits, ivbits)   \
+    static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lc##_get_params;    \
+    static int alg##_##kbits##_##lc##_get_params(OSSL_PARAM params[])           \
+    {                                                                           \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE, \
+            flags, kbits, blkbits, ivbits);                                     \
+    }                                                                           \
+    static OSSL_FUNC_cipher_newctx_fn alg##kbits##lc##_newctx;                  \
+    static void *alg##kbits##lc##_newctx(void *provctx)                         \
+    {                                                                           \
+        return alg##_##lc##_newctx(provctx, kbits);                             \
+    }                                                                           \
+    static void *alg##kbits##lc##_dupctx(void *src)                             \
+    {                                                                           \
+        return alg##_##lc##_dupctx(src);                                        \
+    }                                                                           \
+    const OSSL_DISPATCH ossl_##alg##kbits##lc##_functions[] = {                 \
+        { OSSL_FUNC_CIPHER_NEWCTX, (void (*)(void))alg##kbits##lc##_newctx },   \
+        { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))alg##_##lc##_freectx },     \
+        { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))alg##kbits##lc##_dupctx },   \
+        { OSSL_FUNC_CIPHER_ENCRYPT_INIT, (void (*)(void))ossl_##lc##_einit },   \
+        { OSSL_FUNC_CIPHER_DECRYPT_INIT, (void (*)(void))ossl_##lc##_dinit },   \
+        { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))ossl_##lc##_stream_update }, \
+        { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))ossl_##lc##_stream_final },   \
+        { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))ossl_##lc##_cipher },        \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                          \
+            (void (*)(void))alg##_##kbits##_##lc##_get_params },                \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                      \
+            (void (*)(void))ossl_##lc##_get_ctx_params },                       \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                      \
+            (void (*)(void))ossl_##lc##_set_ctx_params },                       \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                     \
+            (void (*)(void))ossl_cipher_generic_gettable_params },              \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                 \
+            (void (*)(void))ossl_cipher_aead_gettable_ctx_params },             \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                 \
+            (void (*)(void))ossl_cipher_aead_settable_ctx_params },             \
+        OSSL_DISPATCH_END                                                       \
+    }
 
 #endif
diff --git a/providers/implementations/include/prov/ciphercommon_ccm.h b/providers/implementations/include/prov/ciphercommon_ccm.h
index ce1a2aa0e7365..59d77f0bb10dd 100644
--- a/providers/implementations/include/prov/ciphercommon_ccm.h
+++ b/providers/implementations/include/prov/ciphercommon_ccm.h
@@ -8,14 +8,14 @@
  */
 
 #ifndef OSSL_PROV_CIPHERCOMMON_CCM_H
-# define OSSL_PROV_CIPHERCOMMON_CCM_H
-# pragma once
+#define OSSL_PROV_CIPHERCOMMON_CCM_H
+#pragma once
 
-# include "ciphercommon_aead.h"
+#include "ciphercommon_aead.h"
 
 typedef struct prov_ccm_hw_st PROV_CCM_HW;
 
-# if defined(OPENSSL_CPUID_OBJ) && defined(__s390__)
+#if defined(OPENSSL_CPUID_OBJ) && defined(__s390__)
 /*-
  * KMAC-AES parameter block - begin
  * (see z/Architecture Principles of Operation >= SA22-7832-08)
@@ -28,46 +28,33 @@ typedef struct S390X_kmac_params_st {
     unsigned char k[32];
 } S390X_KMAC_PARAMS;
 /* KMAC-AES parameter block - end */
-# endif
+#endif
 
 /* Base structure that is shared by AES & ARIA for CCM MODE */
 typedef struct prov_ccm_st {
     unsigned int enc : 1;
-    unsigned int key_set : 1;  /* Set if key initialised */
-    unsigned int iv_set : 1;   /* Set if an iv is set */
-    unsigned int tag_set : 1;  /* Set if tag is valid */
-    unsigned int len_set : 1;  /* Set if message length set */
-    size_t l, m;               /* L and M parameters from RFC3610 */
+    unsigned int key_set : 1; /* Set if key initialised */
+    unsigned int iv_set : 1; /* Set if an iv is set */
+    unsigned int tag_set : 1; /* Set if tag is valid */
+    unsigned int len_set : 1; /* Set if message length set */
+    size_t l, m; /* L and M parameters from RFC3610 */
     size_t keylen;
-    size_t tls_aad_len;        /* TLS AAD length */
+    size_t tls_aad_len; /* TLS AAD length */
     size_t tls_aad_pad_sz;
     unsigned char iv[GENERIC_BLOCK_SIZE];
     unsigned char buf[GENERIC_BLOCK_SIZE];
     CCM128_CONTEXT ccm_ctx;
     ccm128_f str;
-    const PROV_CCM_HW *hw;     /* hardware specific methods  */
+    const PROV_CCM_HW *hw; /* hardware specific methods  */
 } PROV_CCM_CTX;
 
-PROV_CIPHER_FUNC(int, CCM_cipher, (PROV_CCM_CTX *ctx, unsigned char *out,      \
-                                   size_t *padlen, const unsigned char *in,    \
-                                   size_t len));
-PROV_CIPHER_FUNC(int, CCM_setkey, (PROV_CCM_CTX *ctx,                          \
-                                   const unsigned char *key, size_t keylen));
-PROV_CIPHER_FUNC(int, CCM_setiv, (PROV_CCM_CTX *dat,                           \
-                                  const unsigned char *iv, size_t ivlen,       \
-                                  size_t mlen));
-PROV_CIPHER_FUNC(int, CCM_setaad, (PROV_CCM_CTX *ctx,                          \
-                                   const unsigned char *aad, size_t aadlen));
-PROV_CIPHER_FUNC(int, CCM_auth_encrypt, (PROV_CCM_CTX *ctx,                    \
-                                         const unsigned char *in,              \
-                                         unsigned char *out, size_t len,       \
-                                         unsigned char *tag, size_t taglen));
-PROV_CIPHER_FUNC(int, CCM_auth_decrypt, (PROV_CCM_CTX *ctx,                    \
-                                         const unsigned char *in,              \
-                                         unsigned char *out, size_t len,       \
-                                         unsigned char *tag, size_t taglen));
-PROV_CIPHER_FUNC(int, CCM_gettag, (PROV_CCM_CTX *ctx,                          \
-                                   unsigned char *tag,  size_t taglen));
+PROV_CIPHER_FUNC(int, CCM_cipher, (PROV_CCM_CTX * ctx, unsigned char *out, size_t *padlen, const unsigned char *in, size_t len));
+PROV_CIPHER_FUNC(int, CCM_setkey, (PROV_CCM_CTX * ctx, const unsigned char *key, size_t keylen));
+PROV_CIPHER_FUNC(int, CCM_setiv, (PROV_CCM_CTX * dat, const unsigned char *iv, size_t ivlen, size_t mlen));
+PROV_CIPHER_FUNC(int, CCM_setaad, (PROV_CCM_CTX * ctx, const unsigned char *aad, size_t aadlen));
+PROV_CIPHER_FUNC(int, CCM_auth_encrypt, (PROV_CCM_CTX * ctx, const unsigned char *in, unsigned char *out, size_t len, unsigned char *tag, size_t taglen));
+PROV_CIPHER_FUNC(int, CCM_auth_decrypt, (PROV_CCM_CTX * ctx, const unsigned char *in, unsigned char *out, size_t len, unsigned char *tag, size_t taglen));
+PROV_CIPHER_FUNC(int, CCM_gettag, (PROV_CCM_CTX * ctx, unsigned char *tag, size_t taglen));
 
 /*
  * CCM Mode internal method table used to handle hardware specific differences,
@@ -92,15 +79,15 @@ OSSL_FUNC_cipher_cipher_fn ossl_ccm_cipher;
 void ossl_ccm_initctx(PROV_CCM_CTX *ctx, size_t keybits, const PROV_CCM_HW *hw);
 
 int ossl_ccm_generic_setiv(PROV_CCM_CTX *ctx, const unsigned char *nonce,
-                           size_t nlen, size_t mlen);
+    size_t nlen, size_t mlen);
 int ossl_ccm_generic_setaad(PROV_CCM_CTX *ctx, const unsigned char *aad,
-                            size_t alen);
+    size_t alen);
 int ossl_ccm_generic_gettag(PROV_CCM_CTX *ctx, unsigned char *tag, size_t tlen);
 int ossl_ccm_generic_auth_encrypt(PROV_CCM_CTX *ctx, const unsigned char *in,
-                                  unsigned char *out, size_t len,
-                                  unsigned char *tag, size_t taglen);
+    unsigned char *out, size_t len,
+    unsigned char *tag, size_t taglen);
 int ossl_ccm_generic_auth_decrypt(PROV_CCM_CTX *ctx, const unsigned char *in,
-                                  unsigned char *out, size_t len,
-                                  unsigned char *expected_tag, size_t taglen);
+    unsigned char *out, size_t len,
+    unsigned char *expected_tag, size_t taglen);
 
 #endif
diff --git a/providers/implementations/include/prov/ciphercommon_gcm.h b/providers/implementations/include/prov/ciphercommon_gcm.h
index ee0b23b92785d..7b411618f027c 100644
--- a/providers/implementations/include/prov/ciphercommon_gcm.h
+++ b/providers/implementations/include/prov/ciphercommon_gcm.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_PROV_CIPHERCOMMON_GCM_H
-# define OSSL_PROV_CIPHERCOMMON_GCM_H
-# pragma once
+#define OSSL_PROV_CIPHERCOMMON_GCM_H
+#pragma once
 
-# include <openssl/aes.h>
-# include "ciphercommon_aead.h"
+#include <openssl/aes.h>
+#include "ciphercommon_aead.h"
 
 typedef struct prov_gcm_hw_st PROV_GCM_HW;
 
-# define GCM_IV_DEFAULT_SIZE 12 /* IV's for AES_GCM should normally be 12 bytes */
-# define GCM_IV_MAX_SIZE     (1024 / 8)
-# define GCM_TAG_MAX_SIZE    16
+#define GCM_IV_DEFAULT_SIZE 12 /* IV's for AES_GCM should normally be 12 bytes */
+#define GCM_IV_MAX_SIZE (1024 / 8)
+#define GCM_TAG_MAX_SIZE 16
 
-# if defined(OPENSSL_CPUID_OBJ) && defined(__s390__)
+#if defined(OPENSSL_CPUID_OBJ) && defined(__s390__)
 /*-
  * KMA-GCM-AES parameter block - begin
  * (see z/Architecture Principles of Operation >= SA22-7832-11)
@@ -42,66 +42,58 @@ typedef struct S390X_kma_params_st {
     union {
         unsigned long long g[2];
         unsigned int w[4];
-    } j0;                   /* initial counter value */
-    unsigned char k[32];    /* key */
+    } j0; /* initial counter value */
+    unsigned char k[32]; /* key */
 } S390X_KMA_PARAMS;
 
-# endif
+#endif
 
 typedef struct prov_gcm_ctx_st {
-    unsigned int mode;          /* The mode that we are using */
+    unsigned int mode; /* The mode that we are using */
     size_t keylen;
     size_t ivlen;
     size_t taglen;
     size_t tls_aad_pad_sz;
-    size_t tls_aad_len;         /* TLS AAD length */
-    uint64_t tls_enc_records;   /* Number of TLS records encrypted */
+    size_t tls_aad_len; /* TLS AAD length */
+    uint64_t tls_enc_records; /* Number of TLS records encrypted */
 
     /*
      * num contains the number of bytes of |iv| which are valid for modes that
      * manage partial blocks themselves.
      */
     size_t num;
-    size_t bufsz;               /* Number of bytes in buf */
+    size_t bufsz; /* Number of bytes in buf */
     uint64_t flags;
 
-    unsigned int iv_state;      /* set to one of IV_STATE_XXX */
-    unsigned int enc:1;         /* Set to 1 if we are encrypting or 0 otherwise */
-    unsigned int pad:1;         /* Whether padding should be used or not */
-    unsigned int key_set:1;     /* Set if key initialised */
-    unsigned int iv_gen_rand:1; /* No IV was specified, so generate a rand IV */
-    unsigned int iv_gen:1;      /* It is OK to generate IVs */
+    unsigned int iv_state; /* set to one of IV_STATE_XXX */
+    unsigned int enc : 1; /* Set to 1 if we are encrypting or 0 otherwise */
+    unsigned int pad : 1; /* Whether padding should be used or not */
+    unsigned int key_set : 1; /* Set if key initialised */
+    unsigned int iv_gen_rand : 1; /* No IV was specified, so generate a rand IV */
+    unsigned int iv_gen : 1; /* It is OK to generate IVs */
 
     unsigned char iv[GCM_IV_MAX_SIZE]; /* Buffer to use for IV's */
     unsigned char buf[AES_BLOCK_SIZE]; /* Buffer of partial blocks processed via update calls */
 
-    OSSL_LIB_CTX *libctx;    /* needed for rand calls */
-    const PROV_GCM_HW *hw;  /* hardware specific methods */
+    OSSL_LIB_CTX *libctx; /* needed for rand calls */
+    const PROV_GCM_HW *hw; /* hardware specific methods */
     GCM128_CONTEXT gcm;
     ctr128_f ctr;
 } PROV_GCM_CTX;
 
-PROV_CIPHER_FUNC(int, GCM_setkey, (PROV_GCM_CTX *ctx, const unsigned char *key,
-                                   size_t keylen));
-PROV_CIPHER_FUNC(int, GCM_setiv, (PROV_GCM_CTX *dat, const unsigned char *iv,
-                                  size_t ivlen));
-PROV_CIPHER_FUNC(int, GCM_aadupdate, (PROV_GCM_CTX *ctx,
-                                      const unsigned char *aad, size_t aadlen));
-PROV_CIPHER_FUNC(int, GCM_cipherupdate, (PROV_GCM_CTX *ctx,
-                                         const unsigned char *in, size_t len,
-                                         unsigned char *out));
-PROV_CIPHER_FUNC(int, GCM_cipherfinal, (PROV_GCM_CTX *ctx, unsigned char *tag));
-PROV_CIPHER_FUNC(int, GCM_oneshot, (PROV_GCM_CTX *ctx, unsigned char *aad,
-                                    size_t aad_len, const unsigned char *in,
-                                    size_t in_len, unsigned char *out,
-                                    unsigned char *tag, size_t taglen));
+PROV_CIPHER_FUNC(int, GCM_setkey, (PROV_GCM_CTX * ctx, const unsigned char *key, size_t keylen));
+PROV_CIPHER_FUNC(int, GCM_setiv, (PROV_GCM_CTX * dat, const unsigned char *iv, size_t ivlen));
+PROV_CIPHER_FUNC(int, GCM_aadupdate, (PROV_GCM_CTX * ctx, const unsigned char *aad, size_t aadlen));
+PROV_CIPHER_FUNC(int, GCM_cipherupdate, (PROV_GCM_CTX * ctx, const unsigned char *in, size_t len, unsigned char *out));
+PROV_CIPHER_FUNC(int, GCM_cipherfinal, (PROV_GCM_CTX * ctx, unsigned char *tag));
+PROV_CIPHER_FUNC(int, GCM_oneshot, (PROV_GCM_CTX * ctx, unsigned char *aad, size_t aad_len, const unsigned char *in, size_t in_len, unsigned char *out, unsigned char *tag, size_t taglen));
 struct prov_gcm_hw_st {
-  OSSL_GCM_setkey_fn setkey;
-  OSSL_GCM_setiv_fn setiv;
-  OSSL_GCM_aadupdate_fn aadupdate;
-  OSSL_GCM_cipherupdate_fn cipherupdate;
-  OSSL_GCM_cipherfinal_fn cipherfinal;
-  OSSL_GCM_oneshot_fn oneshot;
+    OSSL_GCM_setkey_fn setkey;
+    OSSL_GCM_setiv_fn setiv;
+    OSSL_GCM_aadupdate_fn aadupdate;
+    OSSL_GCM_cipherupdate_fn cipherupdate;
+    OSSL_GCM_cipherfinal_fn cipherfinal;
+    OSSL_GCM_oneshot_fn oneshot;
 };
 
 OSSL_FUNC_cipher_encrypt_init_fn ossl_gcm_einit;
@@ -112,22 +104,22 @@ OSSL_FUNC_cipher_cipher_fn ossl_gcm_cipher;
 OSSL_FUNC_cipher_update_fn ossl_gcm_stream_update;
 OSSL_FUNC_cipher_final_fn ossl_gcm_stream_final;
 void ossl_gcm_initctx(void *provctx, PROV_GCM_CTX *ctx, size_t keybits,
-                      const PROV_GCM_HW *hw);
+    const PROV_GCM_HW *hw);
 
 int ossl_gcm_setiv(PROV_GCM_CTX *ctx, const unsigned char *iv, size_t ivlen);
 int ossl_gcm_aad_update(PROV_GCM_CTX *ctx, const unsigned char *aad,
-                        size_t aad_len);
+    size_t aad_len);
 int ossl_gcm_cipher_final(PROV_GCM_CTX *ctx, unsigned char *tag);
 int ossl_gcm_one_shot(PROV_GCM_CTX *ctx, unsigned char *aad, size_t aad_len,
-                      const unsigned char *in, size_t in_len,
-                      unsigned char *out, unsigned char *tag, size_t tag_len);
+    const unsigned char *in, size_t in_len,
+    unsigned char *out, unsigned char *tag, size_t tag_len);
 int ossl_gcm_cipher_update(PROV_GCM_CTX *ctx, const unsigned char *in,
-                           size_t len, unsigned char *out);
+    size_t len, unsigned char *out);
 
-# define GCM_HW_SET_KEY_CTR_FN(ks, fn_set_enc_key, fn_block, fn_ctr)            \
-    fn_set_enc_key(key, keylen * 8, ks);                                       \
-    CRYPTO_gcm128_init(&ctx->gcm, ks, (block128_f)fn_block);                   \
-    ctx->ctr = (ctr128_f)fn_ctr;                                               \
+#define GCM_HW_SET_KEY_CTR_FN(ks, fn_set_enc_key, fn_block, fn_ctr) \
+    fn_set_enc_key(key, keylen * 8, ks);                            \
+    CRYPTO_gcm128_init(&ctx->gcm, ks, (block128_f)fn_block);        \
+    ctx->ctr = (ctr128_f)fn_ctr;                                    \
     ctx->key_set = 1;
 
 #endif
diff --git a/providers/implementations/include/prov/decoders.h b/providers/implementations/include/prov/decoders.h
index 654efee607d1c..e38f15b3c2beb 100644
--- a/providers/implementations/include/prov/decoders.h
+++ b/providers/implementations/include/prov/decoders.h
@@ -10,11 +10,11 @@
 #include <openssl/core.h>
 
 int ossl_epki2pki_der_decode(unsigned char *der, long der_len, int selection,
-                             OSSL_CALLBACK *data_cb, void *data_cbarg,
-                             OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg,
-                             OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 int ossl_spki2typespki_der_decode(unsigned char *der, long len, int selection,
-                                  OSSL_CALLBACK *data_cb, void *data_cbarg,
-                                  OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg,
-                                  OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg,
+    OSSL_LIB_CTX *libctx, const char *propq);
diff --git a/providers/implementations/include/prov/digestcommon.h b/providers/implementations/include/prov/digestcommon.h
index 332d473490274..14adc5507f78d 100644
--- a/providers/implementations/include/prov/digestcommon.h
+++ b/providers/implementations/include/prov/digestcommon.h
@@ -8,126 +8,130 @@
  */
 
 #ifndef OSSL_PROVIDERS_DIGESTCOMMON_H
-# define OSSL_PROVIDERS_DIGESTCOMMON_H
+#define OSSL_PROVIDERS_DIGESTCOMMON_H
 
-# include <openssl/core_dispatch.h>
-# include <openssl/core_names.h>
-# include <openssl/params.h>
-# include "prov/providercommon.h"
+#include <openssl/core_dispatch.h>
+#include <openssl/core_names.h>
+#include <openssl/params.h>
+#include "prov/providercommon.h"
 
 /* Internal flags that can be queried */
-#define PROV_DIGEST_FLAG_XOF             0x0001
-#define PROV_DIGEST_FLAG_ALGID_ABSENT    0x0002
+#define PROV_DIGEST_FLAG_XOF 0x0001
+#define PROV_DIGEST_FLAG_ALGID_ABSENT 0x0002
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-#define PROV_FUNC_DIGEST_GET_PARAM(name, blksize, dgstsize, flags)             \
-static OSSL_FUNC_digest_get_params_fn name##_get_params;                       \
-static int name##_get_params(OSSL_PARAM params[])                              \
-{                                                                              \
-    return ossl_digest_default_get_params(params, blksize, dgstsize, flags);   \
-}
-
-#define PROV_DISPATCH_FUNC_DIGEST_GET_PARAMS(name)                             \
-{ OSSL_FUNC_DIGEST_GET_PARAMS, (void (*)(void))name##_get_params },            \
-{ OSSL_FUNC_DIGEST_GETTABLE_PARAMS,                                            \
-  (void (*)(void))ossl_digest_default_gettable_params }
+#define PROV_FUNC_DIGEST_GET_PARAM(name, blksize, dgstsize, flags)               \
+    static OSSL_FUNC_digest_get_params_fn name##_get_params;                     \
+    static int name##_get_params(OSSL_PARAM params[])                            \
+    {                                                                            \
+        return ossl_digest_default_get_params(params, blksize, dgstsize, flags); \
+    }
 
-# define PROV_FUNC_DIGEST_FINAL(name, dgstsize, fin)                           \
-static OSSL_FUNC_digest_final_fn name##_internal_final;                        \
-static int name##_internal_final(void *ctx, unsigned char *out, size_t *outl,  \
-                                 size_t outsz)                                 \
-{                                                                              \
-    if (ossl_prov_is_running() && outsz >= dgstsize && fin(out, ctx)) {        \
-        *outl = dgstsize;                                                      \
-        return 1;                                                              \
-    }                                                                          \
-    return 0;                                                                  \
-}
+#define PROV_DISPATCH_FUNC_DIGEST_GET_PARAMS(name)                      \
+    { OSSL_FUNC_DIGEST_GET_PARAMS, (void (*)(void))name##_get_params }, \
+    {                                                                   \
+        OSSL_FUNC_DIGEST_GETTABLE_PARAMS,                               \
+            (void (*)(void))ossl_digest_default_gettable_params         \
+    }
 
-# define PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_START(                            \
-    name, CTX, blksize, dgstsize, flags, upd, fin)                             \
-static OSSL_FUNC_digest_newctx_fn name##_newctx;                               \
-static OSSL_FUNC_digest_freectx_fn name##_freectx;                             \
-static OSSL_FUNC_digest_dupctx_fn name##_dupctx;                               \
-static void *name##_newctx(void *prov_ctx)                                     \
-{                                                                              \
-    CTX *ctx = ossl_prov_is_running() ? OPENSSL_zalloc(sizeof(*ctx)) : NULL;   \
-    return ctx;                                                                \
-}                                                                              \
-static void name##_freectx(void *vctx)                                         \
-{                                                                              \
-    CTX *ctx = (CTX *)vctx;                                                    \
-    OPENSSL_clear_free(ctx,  sizeof(*ctx));                                    \
-}                                                                              \
-static void *name##_dupctx(void *ctx)                                          \
-{                                                                              \
-    CTX *in = (CTX *)ctx;                                                      \
-    CTX *ret = ossl_prov_is_running() ? OPENSSL_malloc(sizeof(*ret)) : NULL;   \
-    if (ret != NULL)                                                           \
-        *ret = *in;                                                            \
-    return ret;                                                                \
-}                                                                              \
-static void name##_copyctx(void *voutctx, void *vinctx)                        \
-{                                                                              \
-    CTX *outctx = (CTX *)voutctx;                                              \
-    CTX *inctx = (CTX *)vinctx;                                                \
-    *outctx = *inctx;                                                          \
-}                                                                              \
-PROV_FUNC_DIGEST_FINAL(name, dgstsize, fin)                                    \
-PROV_FUNC_DIGEST_GET_PARAM(name, blksize, dgstsize, flags)                     \
-const OSSL_DISPATCH ossl_##name##_functions[] = {                              \
-    { OSSL_FUNC_DIGEST_NEWCTX, (void (*)(void))name##_newctx },                \
-    { OSSL_FUNC_DIGEST_UPDATE, (void (*)(void))upd },                          \
-    { OSSL_FUNC_DIGEST_FINAL, (void (*)(void))name##_internal_final },         \
-    { OSSL_FUNC_DIGEST_FREECTX, (void (*)(void))name##_freectx },              \
-    { OSSL_FUNC_DIGEST_DUPCTX, (void (*)(void))name##_dupctx },                \
-    { OSSL_FUNC_DIGEST_COPYCTX, (void (*)(void))name##_copyctx },              \
-    PROV_DISPATCH_FUNC_DIGEST_GET_PARAMS(name)
+#define PROV_FUNC_DIGEST_FINAL(name, dgstsize, fin)                               \
+    static OSSL_FUNC_digest_final_fn name##_internal_final;                       \
+    static int name##_internal_final(void *ctx, unsigned char *out, size_t *outl, \
+        size_t outsz)                                                             \
+    {                                                                             \
+        if (ossl_prov_is_running() && outsz >= dgstsize && fin(out, ctx)) {       \
+            *outl = dgstsize;                                                     \
+            return 1;                                                             \
+        }                                                                         \
+        return 0;                                                                 \
+    }
 
-# define PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_END                               \
-    { 0, NULL }                                                                \
-};
+#define PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_START(                               \
+    name, CTX, blksize, dgstsize, flags, upd, fin)                               \
+    static OSSL_FUNC_digest_newctx_fn name##_newctx;                             \
+    static OSSL_FUNC_digest_freectx_fn name##_freectx;                           \
+    static OSSL_FUNC_digest_dupctx_fn name##_dupctx;                             \
+    static void *name##_newctx(void *prov_ctx)                                   \
+    {                                                                            \
+        CTX *ctx = ossl_prov_is_running() ? OPENSSL_zalloc(sizeof(*ctx)) : NULL; \
+        return ctx;                                                              \
+    }                                                                            \
+    static void name##_freectx(void *vctx)                                       \
+    {                                                                            \
+        CTX *ctx = (CTX *)vctx;                                                  \
+        OPENSSL_clear_free(ctx, sizeof(*ctx));                                   \
+    }                                                                            \
+    static void *name##_dupctx(void *ctx)                                        \
+    {                                                                            \
+        CTX *in = (CTX *)ctx;                                                    \
+        CTX *ret = ossl_prov_is_running() ? OPENSSL_malloc(sizeof(*ret)) : NULL; \
+        if (ret != NULL)                                                         \
+            *ret = *in;                                                          \
+        return ret;                                                              \
+    }                                                                            \
+    static void name##_copyctx(void *voutctx, void *vinctx)                      \
+    {                                                                            \
+        CTX *outctx = (CTX *)voutctx;                                            \
+        CTX *inctx = (CTX *)vinctx;                                              \
+        *outctx = *inctx;                                                        \
+    }                                                                            \
+    PROV_FUNC_DIGEST_FINAL(name, dgstsize, fin)                                  \
+    PROV_FUNC_DIGEST_GET_PARAM(name, blksize, dgstsize, flags)                   \
+    const OSSL_DISPATCH ossl_##name##_functions[] = {                            \
+        { OSSL_FUNC_DIGEST_NEWCTX, (void (*)(void))name##_newctx },              \
+        { OSSL_FUNC_DIGEST_UPDATE, (void (*)(void))upd },                        \
+        { OSSL_FUNC_DIGEST_FINAL, (void (*)(void))name##_internal_final },       \
+        { OSSL_FUNC_DIGEST_FREECTX, (void (*)(void))name##_freectx },            \
+        { OSSL_FUNC_DIGEST_DUPCTX, (void (*)(void))name##_dupctx },              \
+        { OSSL_FUNC_DIGEST_COPYCTX, (void (*)(void))name##_copyctx },            \
+        PROV_DISPATCH_FUNC_DIGEST_GET_PARAMS(name)
 
-# define IMPLEMENT_digest_functions(                                           \
-    name, CTX, blksize, dgstsize, flags, init, upd, fin)                       \
-static OSSL_FUNC_digest_init_fn name##_internal_init;                          \
-static int name##_internal_init(void *ctx,                                     \
-                                ossl_unused const OSSL_PARAM params[])         \
-{                                                                              \
-    return ossl_prov_is_running() && init(ctx);                                \
-}                                                                              \
-PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_START(name, CTX, blksize, dgstsize, flags, \
-                                          upd, fin),                           \
-    { OSSL_FUNC_DIGEST_INIT, (void (*)(void))name##_internal_init },           \
-PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_END
+#define PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_END \
+    {                                           \
+        0, NULL                                 \
+    }                                           \
+    }                                           \
+    ;
 
-# define IMPLEMENT_digest_functions_with_settable_ctx(                         \
-    name, CTX, blksize, dgstsize, flags, init, upd, fin,                       \
-    settable_ctx_params, set_ctx_params)                                       \
-static OSSL_FUNC_digest_init_fn name##_internal_init;                          \
-static int name##_internal_init(void *ctx, const OSSL_PARAM params[])          \
-{                                                                              \
-    return ossl_prov_is_running()                                              \
-           && init(ctx)                                                        \
-           && set_ctx_params(ctx, params);                                     \
-}                                                                              \
-PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_START(name, CTX, blksize, dgstsize, flags, \
-                                          upd, fin),                           \
-    { OSSL_FUNC_DIGEST_INIT, (void (*)(void))name##_internal_init },           \
-    { OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS, (void (*)(void))settable_ctx_params }, \
-    { OSSL_FUNC_DIGEST_SET_CTX_PARAMS, (void (*)(void))set_ctx_params },       \
-PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_END
+#define IMPLEMENT_digest_functions(                                                \
+    name, CTX, blksize, dgstsize, flags, init, upd, fin)                           \
+    static OSSL_FUNC_digest_init_fn name##_internal_init;                          \
+    static int name##_internal_init(void *ctx,                                     \
+        ossl_unused const OSSL_PARAM params[])                                     \
+    {                                                                              \
+        return ossl_prov_is_running() && init(ctx);                                \
+    }                                                                              \
+    PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_START(name, CTX, blksize, dgstsize, flags, \
+        upd, fin),                                                                 \
+        { OSSL_FUNC_DIGEST_INIT, (void (*)(void))name##_internal_init },           \
+        PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_END
 
+#define IMPLEMENT_digest_functions_with_settable_ctx(                                  \
+    name, CTX, blksize, dgstsize, flags, init, upd, fin,                               \
+    settable_ctx_params, set_ctx_params)                                               \
+    static OSSL_FUNC_digest_init_fn name##_internal_init;                              \
+    static int name##_internal_init(void *ctx, const OSSL_PARAM params[])              \
+    {                                                                                  \
+        return ossl_prov_is_running()                                                  \
+            && init(ctx)                                                               \
+            && set_ctx_params(ctx, params);                                            \
+    }                                                                                  \
+    PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_START(name, CTX, blksize, dgstsize, flags,     \
+        upd, fin),                                                                     \
+        { OSSL_FUNC_DIGEST_INIT, (void (*)(void))name##_internal_init },               \
+        { OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS, (void (*)(void))settable_ctx_params }, \
+        { OSSL_FUNC_DIGEST_SET_CTX_PARAMS, (void (*)(void))set_ctx_params },           \
+        PROV_DISPATCH_FUNC_DIGEST_CONSTRUCT_END
 
 const OSSL_PARAM *ossl_digest_default_gettable_params(void *provctx);
 int ossl_digest_default_get_params(OSSL_PARAM params[], size_t blksz,
-                                   size_t paramsz, unsigned long flags);
+    size_t paramsz, unsigned long flags);
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif /* OSSL_PROVIDERS_DIGESTCOMMON_H */
diff --git a/providers/implementations/include/prov/ecx.h b/providers/implementations/include/prov/ecx.h
index 3427d154aa8a0..145f322c05056 100644
--- a/providers/implementations/include/prov/ecx.h
+++ b/providers/implementations/include/prov/ecx.h
@@ -25,7 +25,7 @@
 #define OSSL_DHKEM_LABEL_SK "\x73\x6B"
 
 int ossl_ecx_dhkem_derive_private(ECX_KEY *ecx, unsigned char *privout,
-                                  const unsigned char *ikm, size_t ikmlen);
+    const unsigned char *ikm, size_t ikmlen);
 int ossl_ec_dhkem_derive_private(EC_KEY *ec, BIGNUM *privout,
-                                 const unsigned char *ikm, size_t ikmlen);
+    const unsigned char *ikm, size_t ikmlen);
 #endif
diff --git a/providers/implementations/include/prov/hmac_drbg.h b/providers/implementations/include/prov/hmac_drbg.h
index 28aa5bc1adfca..41ff69be2eba0 100644
--- a/providers/implementations/include/prov/hmac_drbg.h
+++ b/providers/implementations/include/prov/hmac_drbg.h
@@ -8,26 +8,26 @@
  */
 
 #ifndef OSSL_PROV_HMAC_DRBG_H
-# define OSSL_PROV_HMAC_DRBG_H
-# pragma once
+#define OSSL_PROV_HMAC_DRBG_H
+#pragma once
 
 #include <openssl/evp.h>
 #include "prov/provider_util.h"
 
 typedef struct drbg_hmac_st {
-    EVP_MAC_CTX *ctx;            /* H(x) = HMAC_hash OR H(x) = KMAC */
-    PROV_DIGEST digest;          /* H(x) = hash(x) */
+    EVP_MAC_CTX *ctx; /* H(x) = HMAC_hash OR H(x) = KMAC */
+    PROV_DIGEST digest; /* H(x) = hash(x) */
     size_t blocklen;
     unsigned char K[EVP_MAX_MD_SIZE];
     unsigned char V[EVP_MAX_MD_SIZE];
 } PROV_DRBG_HMAC;
 
 int ossl_drbg_hmac_init(PROV_DRBG_HMAC *drbg,
-                        const unsigned char *ent, size_t ent_len,
-                        const unsigned char *nonce, size_t nonce_len,
-                        const unsigned char *pstr, size_t pstr_len);
+    const unsigned char *ent, size_t ent_len,
+    const unsigned char *nonce, size_t nonce_len,
+    const unsigned char *pstr, size_t pstr_len);
 int ossl_drbg_hmac_generate(PROV_DRBG_HMAC *hmac,
-                            unsigned char *out, size_t outlen,
-                            const unsigned char *adin, size_t adin_len);
+    unsigned char *out, size_t outlen,
+    const unsigned char *adin, size_t adin_len);
 
 #endif /* OSSL_PROV_HMAC_DRBG_H */
diff --git a/providers/implementations/include/prov/implementations.h b/providers/implementations/include/prov/implementations.h
index 35b0b0b974064..8acfbb4624d3d 100644
--- a/providers/implementations/include/prov/implementations.h
+++ b/providers/implementations/include/prov/implementations.h
@@ -205,7 +205,7 @@ extern const OSSL_DISPATCH ossl_rc2128ofb128_functions[];
 #ifndef OPENSSL_NO_DES
 extern const OSSL_DISPATCH ossl_tdes_ede3_ecb_functions[];
 extern const OSSL_DISPATCH ossl_tdes_ede3_cbc_functions[];
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
 extern const OSSL_DISPATCH ossl_tdes_ede3_ofb_functions[];
 extern const OSSL_DISPATCH ossl_tdes_ede3_cfb_functions[];
 extern const OSSL_DISPATCH ossl_tdes_ede3_cfb8_functions[];
@@ -225,24 +225,23 @@ extern const OSSL_DISPATCH ossl_des_ofb64_functions[];
 extern const OSSL_DISPATCH ossl_des_cfb64_functions[];
 extern const OSSL_DISPATCH ossl_des_cfb1_functions[];
 extern const OSSL_DISPATCH ossl_des_cfb8_functions[];
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 #endif /* OPENSSL_NO_DES */
 
 #ifndef OPENSSL_NO_RC4
 extern const OSSL_DISPATCH ossl_rc440_functions[];
 extern const OSSL_DISPATCH ossl_rc4128_functions[];
-# ifndef OPENSSL_NO_MD5
+#ifndef OPENSSL_NO_MD5
 extern const OSSL_DISPATCH ossl_rc4_hmac_ossl_md5_functions[];
-# endif /* OPENSSL_NO_MD5 */
+#endif /* OPENSSL_NO_MD5 */
 #endif /* OPENSSL_NO_RC4 */
 #ifndef OPENSSL_NO_CHACHA
 extern const OSSL_DISPATCH ossl_chacha20_functions[];
-# ifndef OPENSSL_NO_POLY1305
+#ifndef OPENSSL_NO_POLY1305
 extern const OSSL_DISPATCH ossl_chacha20_ossl_poly1305_functions[];
-# endif /* OPENSSL_NO_POLY1305 */
+#endif /* OPENSSL_NO_POLY1305 */
 #endif /* OPENSSL_NO_CHACHA */
 
-
 #ifndef OPENSSL_NO_SIV
 extern const OSSL_DISPATCH ossl_aes128siv_functions[];
 extern const OSSL_DISPATCH ossl_aes192siv_functions[];
@@ -313,15 +312,15 @@ extern const OSSL_DISPATCH ossl_mac_legacy_keymgmt_functions[];
 extern const OSSL_DISPATCH ossl_cmac_legacy_keymgmt_functions[];
 #ifndef OPENSSL_NO_EC
 extern const OSSL_DISPATCH ossl_ec_keymgmt_functions[];
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 extern const OSSL_DISPATCH ossl_x25519_keymgmt_functions[];
 extern const OSSL_DISPATCH ossl_x448_keymgmt_functions[];
 extern const OSSL_DISPATCH ossl_ed25519_keymgmt_functions[];
 extern const OSSL_DISPATCH ossl_ed448_keymgmt_functions[];
-# endif
-# ifndef OPENSSL_NO_SM2
+#endif
+#ifndef OPENSSL_NO_SM2
 extern const OSSL_DISPATCH ossl_sm2_keymgmt_functions[];
-# endif
+#endif
 #endif
 extern const OSSL_DISPATCH ossl_ml_dsa_44_keymgmt_functions[];
 extern const OSSL_DISPATCH ossl_ml_dsa_65_keymgmt_functions[];
@@ -330,14 +329,14 @@ extern const OSSL_DISPATCH ossl_ml_dsa_87_keymgmt_functions[];
 extern const OSSL_DISPATCH ossl_ml_kem_512_keymgmt_functions[];
 extern const OSSL_DISPATCH ossl_ml_kem_768_keymgmt_functions[];
 extern const OSSL_DISPATCH ossl_ml_kem_1024_keymgmt_functions[];
-# ifndef OPENSSL_NO_EC
-#  ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_ECX
 extern const OSSL_DISPATCH ossl_mlx_x25519_kem_kmgmt_functions[];
 extern const OSSL_DISPATCH ossl_mlx_x448_kem_kmgmt_functions[];
-#  endif
+#endif
 extern const OSSL_DISPATCH ossl_mlx_p256_kem_kmgmt_functions[];
 extern const OSSL_DISPATCH ossl_mlx_p384_kem_kmgmt_functions[];
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_SLH_DSA
 extern const OSSL_DISPATCH ossl_slh_dsa_sha2_128s_keymgmt_functions[];
@@ -358,10 +357,10 @@ extern const OSSL_DISPATCH ossl_slh_dsa_shake_256f_keymgmt_functions[];
 extern const OSSL_DISPATCH ossl_dh_keyexch_functions[];
 #ifndef OPENSSL_NO_EC
 extern const OSSL_DISPATCH ossl_ecdh_keyexch_functions[];
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 extern const OSSL_DISPATCH ossl_x25519_keyexch_functions[];
 extern const OSSL_DISPATCH ossl_x448_keyexch_functions[];
-# endif
+#endif
 #endif
 extern const OSSL_DISPATCH ossl_kdf_tls1_prf_keyexch_functions[];
 extern const OSSL_DISPATCH ossl_kdf_hkdf_keyexch_functions[];
@@ -447,15 +446,15 @@ extern const OSSL_DISPATCH ossl_sm2_asym_cipher_functions[];
 extern const OSSL_DISPATCH ossl_rsa_asym_kem_functions[];
 #ifndef OPENSSL_NO_EC
 extern const OSSL_DISPATCH ossl_ec_asym_kem_functions[];
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 extern const OSSL_DISPATCH ossl_ecx_asym_kem_functions[];
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_ML_KEM
 extern const OSSL_DISPATCH ossl_ml_kem_asym_kem_functions[];
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
 extern const OSSL_DISPATCH ossl_mlx_kem_asym_kem_functions[];
-# endif
+#endif
 #endif
 
 /* Encoders */
diff --git a/providers/implementations/include/prov/md5_sha1.h b/providers/implementations/include/prov/md5_sha1.h
index 181267d6b19f6..da97f89be042a 100644
--- a/providers/implementations/include/prov/md5_sha1.h
+++ b/providers/implementations/include/prov/md5_sha1.h
@@ -8,18 +8,18 @@
  */
 
 #ifndef OSSL_PROV_MD5_SHA1_H
-# define OSSL_PROV_MD5_SHA1_H
+#define OSSL_PROV_MD5_SHA1_H
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_MD5
-#  include <openssl/e_os2.h>
-#  include <stddef.h>
-#  include <openssl/md5.h>
-#  include <openssl/sha.h>
+#ifndef OPENSSL_NO_MD5
+#include <openssl/e_os2.h>
+#include <stddef.h>
+#include <openssl/md5.h>
+#include <openssl/sha.h>
 
-#  define MD5_SHA1_DIGEST_LENGTH (MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH)
-#  define MD5_SHA1_CBLOCK MD5_CBLOCK
+#define MD5_SHA1_DIGEST_LENGTH (MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH)
+#define MD5_SHA1_CBLOCK MD5_CBLOCK
 
 typedef struct md5_sha1_st {
     MD5_CTX md5;
@@ -31,6 +31,6 @@ int ossl_md5_sha1_update(MD5_SHA1_CTX *mctx, const void *data, size_t count);
 int ossl_md5_sha1_final(unsigned char *md, MD5_SHA1_CTX *mctx);
 int ossl_md5_sha1_ctrl(MD5_SHA1_CTX *mctx, int cmd, int mslen, void *ms);
 
-# endif /* OPENSSL_NO_MD5 */
+#endif /* OPENSSL_NO_MD5 */
 
 #endif /* OSSL_PROV_MD5_SHA1_H */
diff --git a/providers/implementations/include/prov/mlx_kem.h b/providers/implementations/include/prov/mlx_kem.h
index df8317cda08d3..eb0896a197dc1 100644
--- a/providers/implementations/include/prov/mlx_kem.h
+++ b/providers/implementations/include/prov/mlx_kem.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_MLX_KEM_H
-# define OSSL_MLX_KEM_H
-# pragma once
+#define OSSL_MLX_KEM_H
+#pragma once
 
 #include <openssl/evp.h>
 #include <openssl/ml_kem.h>
@@ -19,11 +19,11 @@
 typedef struct ecdh_vinfo_st {
     const char *algorithm_name;
     const char *group_name;
-    size_t      pubkey_bytes;
-    size_t      prvkey_bytes;
-    size_t      shsec_bytes;
-    int         ml_kem_slot;
-    int         ml_kem_variant;
+    size_t pubkey_bytes;
+    size_t prvkey_bytes;
+    size_t shsec_bytes;
+    int ml_kem_slot;
+    int ml_kem_variant;
 } ECDH_VINFO;
 
 typedef struct mlx_key_st {
diff --git a/providers/implementations/include/prov/seeding.h b/providers/implementations/include/prov/seeding.h
index af6cb79fb28f4..a6d720dfe4226 100644
--- a/providers/implementations/include/prov/seeding.h
+++ b/providers/implementations/include/prov/seeding.h
@@ -20,11 +20,11 @@ size_t ossl_prov_acquire_entropy_from_cpu(RAND_POOL *pool);
 int ossl_prov_seeding_from_dispatch(const OSSL_DISPATCH *fns);
 
 size_t ossl_prov_get_entropy(PROV_CTX *prov_ctx, unsigned char **pout,
-                             int entropy, size_t min_len, size_t max_len);
+    int entropy, size_t min_len, size_t max_len);
 void ossl_prov_cleanup_entropy(PROV_CTX *prov_ctx, unsigned char *buf,
-                               size_t len);
+    size_t len);
 size_t ossl_prov_get_nonce(PROV_CTX *prov_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_prov_cleanup_nonce(PROV_CTX *prov_ctx, unsigned char *buf,
-                             size_t len);
+    size_t len);
diff --git a/providers/implementations/kdfs/argon2.c b/providers/implementations/kdfs/argon2.c
index e3f9aa4f0f5c5..c36bbc62006ad 100644
--- a/providers/implementations/kdfs/argon2.c
+++ b/providers/implementations/kdfs/argon2.c
@@ -34,101 +34,99 @@
 #include "prov/blake2.h"
 
 #if defined(OPENSSL_NO_DEFAULT_THREAD_POOL) && defined(OPENSSL_NO_THREAD_POOL)
-# define ARGON2_NO_THREADS
+#define ARGON2_NO_THREADS
 #endif
 
 #if !defined(OPENSSL_THREADS)
-# define ARGON2_NO_THREADS
+#define ARGON2_NO_THREADS
 #endif
 
 #ifndef OPENSSL_NO_ARGON2
 
-# define ARGON2_MIN_LANES 1u
-# define ARGON2_MAX_LANES 0xFFFFFFu
-# define ARGON2_MIN_THREADS 1u
-# define ARGON2_MAX_THREADS 0xFFFFFFu
-# define ARGON2_SYNC_POINTS 4u
-# define ARGON2_MIN_OUT_LENGTH 4u
-# define ARGON2_MAX_OUT_LENGTH 0xFFFFFFFFu
-# define ARGON2_MIN_MEMORY (2 * ARGON2_SYNC_POINTS)
-# define ARGON2_MIN(a, b) ((a) < (b) ? (a) : (b))
-# define ARGON2_MAX_MEMORY 0xFFFFFFFFu
-# define ARGON2_MIN_TIME 1u
-# define ARGON2_MAX_TIME 0xFFFFFFFFu
-# define ARGON2_MIN_PWD_LENGTH 0u
-# define ARGON2_MAX_PWD_LENGTH 0xFFFFFFFFu
-# define ARGON2_MIN_AD_LENGTH 0u
-# define ARGON2_MAX_AD_LENGTH 0xFFFFFFFFu
-# define ARGON2_MIN_SALT_LENGTH 8u
-# define ARGON2_MAX_SALT_LENGTH 0xFFFFFFFFu
-# define ARGON2_MIN_SECRET 0u
-# define ARGON2_MAX_SECRET 0xFFFFFFFFu
-# define ARGON2_BLOCK_SIZE 1024
-# define ARGON2_QWORDS_IN_BLOCK ((ARGON2_BLOCK_SIZE) / 8)
-# define ARGON2_OWORDS_IN_BLOCK ((ARGON2_BLOCK_SIZE) / 16)
-# define ARGON2_HWORDS_IN_BLOCK ((ARGON2_BLOCK_SIZE) / 32)
-# define ARGON2_512BIT_WORDS_IN_BLOCK ((ARGON2_BLOCK_SIZE) / 64)
-# define ARGON2_ADDRESSES_IN_BLOCK 128
-# define ARGON2_PREHASH_DIGEST_LENGTH 64
-# define ARGON2_PREHASH_SEED_LENGTH \
+#define ARGON2_MIN_LANES 1u
+#define ARGON2_MAX_LANES 0xFFFFFFu
+#define ARGON2_MIN_THREADS 1u
+#define ARGON2_MAX_THREADS 0xFFFFFFu
+#define ARGON2_SYNC_POINTS 4u
+#define ARGON2_MIN_OUT_LENGTH 4u
+#define ARGON2_MAX_OUT_LENGTH 0xFFFFFFFFu
+#define ARGON2_MIN_MEMORY (2 * ARGON2_SYNC_POINTS)
+#define ARGON2_MIN(a, b) ((a) < (b) ? (a) : (b))
+#define ARGON2_MAX_MEMORY 0xFFFFFFFFu
+#define ARGON2_MIN_TIME 1u
+#define ARGON2_MAX_TIME 0xFFFFFFFFu
+#define ARGON2_MIN_PWD_LENGTH 0u
+#define ARGON2_MAX_PWD_LENGTH 0xFFFFFFFFu
+#define ARGON2_MIN_AD_LENGTH 0u
+#define ARGON2_MAX_AD_LENGTH 0xFFFFFFFFu
+#define ARGON2_MIN_SALT_LENGTH 8u
+#define ARGON2_MAX_SALT_LENGTH 0xFFFFFFFFu
+#define ARGON2_MIN_SECRET 0u
+#define ARGON2_MAX_SECRET 0xFFFFFFFFu
+#define ARGON2_BLOCK_SIZE 1024
+#define ARGON2_QWORDS_IN_BLOCK ((ARGON2_BLOCK_SIZE) / 8)
+#define ARGON2_OWORDS_IN_BLOCK ((ARGON2_BLOCK_SIZE) / 16)
+#define ARGON2_HWORDS_IN_BLOCK ((ARGON2_BLOCK_SIZE) / 32)
+#define ARGON2_512BIT_WORDS_IN_BLOCK ((ARGON2_BLOCK_SIZE) / 64)
+#define ARGON2_ADDRESSES_IN_BLOCK 128
+#define ARGON2_PREHASH_DIGEST_LENGTH 64
+#define ARGON2_PREHASH_SEED_LENGTH \
     (ARGON2_PREHASH_DIGEST_LENGTH + (2 * sizeof(uint32_t)))
 
-# define ARGON2_DEFAULT_OUTLEN 64u
-# define ARGON2_DEFAULT_T_COST 3u
-# define ARGON2_DEFAULT_M_COST ARGON2_MIN_MEMORY
-# define ARGON2_DEFAULT_LANES  1u
-# define ARGON2_DEFAULT_THREADS 1u
-# define ARGON2_DEFAULT_VERSION ARGON2_VERSION_NUMBER
-
-# undef G
-# define G(a, b, c, d)                                                        \
-    do {                                                                      \
-        a = a + b + 2 * mul_lower(a, b);                                      \
-        d = rotr64(d ^ a, 32);                                                \
-        c = c + d + 2 * mul_lower(c, d);                                      \
-        b = rotr64(b ^ c, 24);                                                \
-        a = a + b + 2 * mul_lower(a, b);                                      \
-        d = rotr64(d ^ a, 16);                                                \
-        c = c + d + 2 * mul_lower(c, d);                                      \
-        b = rotr64(b ^ c, 63);                                                \
+#define ARGON2_DEFAULT_OUTLEN 64u
+#define ARGON2_DEFAULT_T_COST 3u
+#define ARGON2_DEFAULT_M_COST ARGON2_MIN_MEMORY
+#define ARGON2_DEFAULT_LANES 1u
+#define ARGON2_DEFAULT_THREADS 1u
+#define ARGON2_DEFAULT_VERSION ARGON2_VERSION_NUMBER
+
+#undef G
+#define G(a, b, c, d)                    \
+    do {                                 \
+        a = a + b + 2 * mul_lower(a, b); \
+        d = rotr64(d ^ a, 32);           \
+        c = c + d + 2 * mul_lower(c, d); \
+        b = rotr64(b ^ c, 24);           \
+        a = a + b + 2 * mul_lower(a, b); \
+        d = rotr64(d ^ a, 16);           \
+        c = c + d + 2 * mul_lower(c, d); \
+        b = rotr64(b ^ c, 63);           \
     } while ((void)0, 0)
 
-# undef PERMUTATION_P
-# define PERMUTATION_P(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11,      \
-                       v12, v13, v14, v15)                                    \
-    do {                                                                      \
-        G(v0, v4, v8, v12);                                                   \
-        G(v1, v5, v9, v13);                                                   \
-        G(v2, v6, v10, v14);                                                  \
-        G(v3, v7, v11, v15);                                                  \
-        G(v0, v5, v10, v15);                                                  \
-        G(v1, v6, v11, v12);                                                  \
-        G(v2, v7, v8, v13);                                                   \
-        G(v3, v4, v9, v14);                                                   \
+#undef PERMUTATION_P
+#define PERMUTATION_P(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, \
+    v12, v13, v14, v15)                                                 \
+    do {                                                                \
+        G(v0, v4, v8, v12);                                             \
+        G(v1, v5, v9, v13);                                             \
+        G(v2, v6, v10, v14);                                            \
+        G(v3, v7, v11, v15);                                            \
+        G(v0, v5, v10, v15);                                            \
+        G(v1, v6, v11, v12);                                            \
+        G(v2, v7, v8, v13);                                             \
+        G(v3, v4, v9, v14);                                             \
     } while ((void)0, 0)
 
-# undef PERMUTATION_P_COLUMN
-# define PERMUTATION_P_COLUMN(x, i)                                           \
-    do {                                                                      \
-        uint64_t *base = &x[16 * i];                                          \
-        PERMUTATION_P(                                                        \
-            *base,        *(base + 1),  *(base + 2),  *(base + 3),            \
-            *(base + 4),  *(base + 5),  *(base + 6),  *(base + 7),            \
-            *(base + 8),  *(base + 9),  *(base + 10), *(base + 11),           \
-            *(base + 12), *(base + 13), *(base + 14), *(base + 15)            \
-        );                                                                    \
+#undef PERMUTATION_P_COLUMN
+#define PERMUTATION_P_COLUMN(x, i)                                   \
+    do {                                                             \
+        uint64_t *base = &x[16 * i];                                 \
+        PERMUTATION_P(                                               \
+            *base, *(base + 1), *(base + 2), *(base + 3),            \
+            *(base + 4), *(base + 5), *(base + 6), *(base + 7),      \
+            *(base + 8), *(base + 9), *(base + 10), *(base + 11),    \
+            *(base + 12), *(base + 13), *(base + 14), *(base + 15)); \
     } while ((void)0, 0)
 
-# undef PERMUTATION_P_ROW
-# define PERMUTATION_P_ROW(x, i)                                              \
-    do {                                                                      \
-        uint64_t *base = &x[2 * i];                                           \
-        PERMUTATION_P(                                                        \
-            *base,        *(base + 1),  *(base + 16),  *(base + 17),          \
-            *(base + 32), *(base + 33), *(base + 48),  *(base + 49),          \
-            *(base + 64), *(base + 65), *(base + 80),  *(base + 81),          \
-            *(base + 96), *(base + 97), *(base + 112), *(base + 113)          \
-        );                                                                    \
+#undef PERMUTATION_P_ROW
+#define PERMUTATION_P_ROW(x, i)                                        \
+    do {                                                               \
+        uint64_t *base = &x[2 * i];                                    \
+        PERMUTATION_P(                                                 \
+            *base, *(base + 1), *(base + 16), *(base + 17),            \
+            *(base + 32), *(base + 33), *(base + 48), *(base + 49),    \
+            *(base + 64), *(base + 65), *(base + 80), *(base + 81),    \
+            *(base + 96), *(base + 97), *(base + 112), *(base + 113)); \
     } while ((void)0, 0)
 
 typedef struct {
@@ -142,8 +140,8 @@ typedef enum {
 } ARGON2_VERSION;
 
 typedef enum {
-    ARGON2_D  = 0,
-    ARGON2_I  = 1,
+    ARGON2_D = 0,
+    ARGON2_I = 1,
     ARGON2_ID = 2
 } ARGON2_TYPE;
 
@@ -203,7 +201,7 @@ static void *kdf_argon2i_new(void *provctx);
 static void *kdf_argon2id_new(void *provctx);
 static void kdf_argon2_free(void *vctx);
 static int kdf_argon2_derive(void *vctx, unsigned char *out, size_t outlen,
-                             const OSSL_PARAM params[]);
+    const OSSL_PARAM params[]);
 static void kdf_argon2_reset(void *vctx);
 static int kdf_argon2_ctx_set_threads(KDF_ARGON2 *ctx, uint32_t threads);
 static int kdf_argon2_ctx_set_lanes(KDF_ARGON2 *ctx, uint32_t lanes);
@@ -218,9 +216,9 @@ static int kdf_argon2_set_ctx_params(void *vctx, const OSSL_PARAM params[]);
 static int kdf_argon2_get_ctx_params(void *vctx, OSSL_PARAM params[]);
 static int kdf_argon2_ctx_set_version(KDF_ARGON2 *ctx, uint32_t version);
 static const OSSL_PARAM *kdf_argon2_settable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx);
+    ossl_unused void *p_ctx);
 static const OSSL_PARAM *kdf_argon2_gettable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx);
+    ossl_unused void *p_ctx);
 
 static ossl_inline uint64_t load64(const uint8_t *src);
 static ossl_inline void store32(uint8_t *dst, uint32_t w);
@@ -235,23 +233,23 @@ static void load_block(BLOCK *dst, const void *input);
 static void store_block(void *output, const BLOCK *src);
 static void fill_first_blocks(uint8_t *blockhash, const KDF_ARGON2 *ctx);
 static void fill_block(const BLOCK *prev, const BLOCK *ref, BLOCK *next,
-                       int with_xor);
+    int with_xor);
 
 static void next_addresses(BLOCK *address_block, BLOCK *input_block,
-                           const BLOCK *zero_block);
+    const BLOCK *zero_block);
 static int data_indep_addressing(const KDF_ARGON2 *ctx, uint32_t pass,
-                                 uint8_t slice);
+    uint8_t slice);
 static uint32_t index_alpha(const KDF_ARGON2 *ctx, uint32_t pass,
-                            uint8_t slice, uint32_t index,
-                            uint32_t pseudo_rand, int same_lane);
+    uint8_t slice, uint32_t index,
+    uint32_t pseudo_rand, int same_lane);
 
 static void fill_segment(const KDF_ARGON2 *ctx, uint32_t pass, uint32_t lane,
-                         uint8_t slice);
+    uint8_t slice);
 
-# if !defined(ARGON2_NO_THREADS)
+#if !defined(ARGON2_NO_THREADS)
 static uint32_t fill_segment_thr(void *thread_data);
 static int fill_mem_blocks_mt(KDF_ARGON2 *ctx);
-# endif
+#endif
 
 static int fill_mem_blocks_st(KDF_ARGON2 *ctx);
 static ossl_inline int fill_memory_blocks(KDF_ARGON2 *ctx);
@@ -261,22 +259,21 @@ static int initialize(KDF_ARGON2 *ctx);
 static void finalize(const KDF_ARGON2 *ctx, void *out);
 
 static int blake2b(EVP_MD *md, EVP_MAC *mac, void *out, size_t outlen,
-                   const void *in, size_t inlen, const void *key,
-                   size_t keylen);
+    const void *in, size_t inlen, const void *key,
+    size_t keylen);
 static int blake2b_long(EVP_MD *md, EVP_MAC *mac, unsigned char *out,
-                        size_t outlen, const void *in, size_t inlen);
+    size_t outlen, const void *in, size_t inlen);
 
 static ossl_inline uint64_t load64(const uint8_t *src)
 {
-    return
-      (((uint64_t)src[0]) << 0)
-    | (((uint64_t)src[1]) << 8)
-    | (((uint64_t)src[2]) << 16)
-    | (((uint64_t)src[3]) << 24)
-    | (((uint64_t)src[4]) << 32)
-    | (((uint64_t)src[5]) << 40)
-    | (((uint64_t)src[6]) << 48)
-    | (((uint64_t)src[7]) << 56);
+    return (((uint64_t)src[0]) << 0)
+        | (((uint64_t)src[1]) << 8)
+        | (((uint64_t)src[2]) << 16)
+        | (((uint64_t)src[3]) << 24)
+        | (((uint64_t)src[4]) << 32)
+        | (((uint64_t)src[5]) << 40)
+        | (((uint64_t)src[6]) << 48)
+        | (((uint64_t)src[7]) << 56);
 }
 
 static ossl_inline void store32(uint8_t *dst, uint32_t w)
@@ -357,20 +354,20 @@ static void fill_first_blocks(uint8_t *blockhash, const KDF_ARGON2 *ctx)
         store32(blockhash + ARGON2_PREHASH_DIGEST_LENGTH, 0);
         store32(blockhash + ARGON2_PREHASH_DIGEST_LENGTH + 4, l);
         blake2b_long(ctx->md, ctx->mac, blockhash_bytes, ARGON2_BLOCK_SIZE,
-                     blockhash, ARGON2_PREHASH_SEED_LENGTH);
+            blockhash, ARGON2_PREHASH_SEED_LENGTH);
         load_block(&ctx->memory[l * ctx->lane_length + 0],
-                   blockhash_bytes);
+            blockhash_bytes);
         store32(blockhash + ARGON2_PREHASH_DIGEST_LENGTH, 1);
         blake2b_long(ctx->md, ctx->mac, blockhash_bytes, ARGON2_BLOCK_SIZE,
-                     blockhash, ARGON2_PREHASH_SEED_LENGTH);
+            blockhash, ARGON2_PREHASH_SEED_LENGTH);
         load_block(&ctx->memory[l * ctx->lane_length + 1],
-                   blockhash_bytes);
+            blockhash_bytes);
     }
     OPENSSL_cleanse(blockhash_bytes, ARGON2_BLOCK_SIZE);
 }
 
 static void fill_block(const BLOCK *prev, const BLOCK *ref,
-                       BLOCK *next, int with_xor)
+    BLOCK *next, int with_xor)
 {
     BLOCK blockR, tmp;
     unsigned i;
@@ -393,7 +390,7 @@ static void fill_block(const BLOCK *prev, const BLOCK *ref,
 }
 
 static void next_addresses(BLOCK *address_block, BLOCK *input_block,
-                           const BLOCK *zero_block)
+    const BLOCK *zero_block)
 {
     input_block->v[6]++;
     fill_block(zero_block, input_block, address_block, 0);
@@ -401,7 +398,7 @@ static void next_addresses(BLOCK *address_block, BLOCK *input_block,
 }
 
 static int data_indep_addressing(const KDF_ARGON2 *ctx, uint32_t pass,
-                                 uint8_t slice)
+    uint8_t slice)
 {
     switch (ctx->type) {
     case ARGON2_I:
@@ -426,8 +423,8 @@ static int data_indep_addressing(const KDF_ARGON2 *ctx, uint32_t pass,
  * Other lanes: (SYNC_POINTS - 1) last segments
  */
 static uint32_t index_alpha(const KDF_ARGON2 *ctx, uint32_t pass,
-                            uint8_t slice, uint32_t index,
-                            uint32_t pseudo_rand, int same_lane)
+    uint8_t slice, uint32_t index,
+    uint32_t pseudo_rand, int same_lane)
 {
     uint32_t ref_area_sz;
     uint64_t rel_pos;
@@ -441,15 +438,13 @@ static uint32_t index_alpha(const KDF_ARGON2 *ctx, uint32_t pass,
         else if (same_lane)
             ref_area_sz = slice * ctx->segment_length + index - 1;
         else
-            ref_area_sz = slice * ctx->segment_length +
-                ((index == 0) ? (-1) : 0);
+            ref_area_sz = slice * ctx->segment_length + ((index == 0) ? (-1) : 0);
         break;
     default:
         if (same_lane)
             ref_area_sz = ctx->lane_length - ctx->segment_length + index - 1;
         else
-            ref_area_sz = ctx->lane_length - ctx->segment_length +
-                ((index == 0) ? (-1) : 0);
+            ref_area_sz = ctx->lane_length - ctx->segment_length + ((index == 0) ? (-1) : 0);
         if (slice != ARGON2_SYNC_POINTS - 1)
             start_pos = (slice + 1) * ctx->segment_length;
         break;
@@ -464,7 +459,7 @@ static uint32_t index_alpha(const KDF_ARGON2 *ctx, uint32_t pass,
 }
 
 static void fill_segment(const KDF_ARGON2 *ctx, uint32_t pass, uint32_t lane,
-                         uint8_t slice)
+    uint8_t slice)
 {
     BLOCK *ref_block = NULL, *curr_block = NULL;
     BLOCK address_block, input_block, zero_block;
@@ -529,7 +524,7 @@ static void fill_segment(const KDF_ARGON2 *ctx, uint32_t pass, uint32_t lane,
 
         /* Computing the number of possible reference block within the lane. */
         ref_index = index_alpha(ctx, pass, slice, j, rnd & 0xFFFFFFFF,
-                                ref_lane == lane);
+            ref_lane == lane);
 
         /* Creating a new block */
         ref_block = ctx->memory + ctx->lane_length * ref_lane + ref_index;
@@ -541,19 +536,19 @@ static void fill_segment(const KDF_ARGON2 *ctx, uint32_t pass, uint32_t lane,
         }
 
         fill_block(ctx->memory + prev_offset, ref_block, curr_block,
-                   pass == 0 ? 0 : 1);
+            pass == 0 ? 0 : 1);
     }
 }
 
-# if !defined(ARGON2_NO_THREADS)
+#if !defined(ARGON2_NO_THREADS)
 
 static uint32_t fill_segment_thr(void *thread_data)
 {
     ARGON2_THREAD_DATA *my_data;
 
-    my_data = (ARGON2_THREAD_DATA *) thread_data;
+    my_data = (ARGON2_THREAD_DATA *)thread_data;
     fill_segment(my_data->ctx, my_data->pos.pass, my_data->pos.lane,
-                 my_data->pos.slice);
+        my_data->pos.slice);
 
     return 0;
 }
@@ -564,7 +559,7 @@ static int fill_mem_blocks_mt(KDF_ARGON2 *ctx)
     void **t;
     ARGON2_THREAD_DATA *t_data;
 
-    t = OPENSSL_zalloc(sizeof(void *)*ctx->lanes);
+    t = OPENSSL_zalloc(sizeof(void *) * ctx->lanes);
     t_data = OPENSSL_zalloc(ctx->lanes * sizeof(ARGON2_THREAD_DATA));
 
     if (t == NULL || t_data == NULL)
@@ -590,7 +585,7 @@ static int fill_mem_blocks_mt(KDF_ARGON2 *ctx)
                 t_data[l].ctx = ctx;
                 memcpy(&(t_data[l].pos), &p, sizeof(ARGON2_POS));
                 t[l] = ossl_crypto_thread_start(ctx->libctx, &fill_segment_thr,
-                                                (void *) &t_data[l]);
+                    (void *)&t_data[l]);
                 if (t[l] == NULL) {
                     for (ll = 0; ll < l; ++ll) {
                         if (ossl_crypto_thread_join(t[ll], NULL) == 0)
@@ -625,7 +620,7 @@ static int fill_mem_blocks_mt(KDF_ARGON2 *ctx)
     return 0;
 }
 
-# endif /* !defined(ARGON2_NO_THREADS) */
+#endif /* !defined(ARGON2_NO_THREADS) */
 
 static int fill_mem_blocks_st(KDF_ARGON2 *ctx)
 {
@@ -640,11 +635,11 @@ static int fill_mem_blocks_st(KDF_ARGON2 *ctx)
 
 static ossl_inline int fill_memory_blocks(KDF_ARGON2 *ctx)
 {
-# if !defined(ARGON2_NO_THREADS)
+#if !defined(ARGON2_NO_THREADS)
     return ctx->threads == 1 ? fill_mem_blocks_st(ctx) : fill_mem_blocks_mt(ctx);
-# else
+#else
     return ctx->threads == 1 ? fill_mem_blocks_st(ctx) : 0;
-# endif
+#endif
 }
 
 static void initial_hash(uint8_t *blockhash, KDF_ARGON2 *ctx)
@@ -662,7 +657,7 @@ static void initial_hash(uint8_t *blockhash, KDF_ARGON2 *ctx)
     args[2] = ctx->m_cost;
     args[3] = ctx->t_cost;
     args[4] = ctx->version;
-    args[5] = (uint32_t) ctx->type;
+    args[5] = (uint32_t)ctx->type;
     args[6] = ctx->pwdlen;
 
     mdctx = EVP_MD_CTX_create();
@@ -670,7 +665,7 @@ static void initial_hash(uint8_t *blockhash, KDF_ARGON2 *ctx)
         goto fail;
 
     for (tmp = 0; tmp < sizeof(args) / sizeof(uint32_t); ++tmp) {
-        store32((uint8_t *) &value, args[tmp]);
+        store32((uint8_t *)&value, args[tmp]);
         if (EVP_DigestUpdate(mdctx, &value, sizeof(value)) != 1)
             goto fail;
     }
@@ -684,7 +679,7 @@ static void initial_hash(uint8_t *blockhash, KDF_ARGON2 *ctx)
         }
     }
 
-    store32((uint8_t *) &value, ctx->saltlen);
+    store32((uint8_t *)&value, ctx->saltlen);
 
     if (EVP_DigestUpdate(mdctx, &value, sizeof(value)) != 1)
         goto fail;
@@ -693,7 +688,7 @@ static void initial_hash(uint8_t *blockhash, KDF_ARGON2 *ctx)
         if (EVP_DigestUpdate(mdctx, ctx->salt, ctx->saltlen) != 1)
             goto fail;
 
-    store32((uint8_t *) &value, ctx->secretlen);
+    store32((uint8_t *)&value, ctx->secretlen);
     if (EVP_DigestUpdate(mdctx, &value, sizeof(value)) != 1)
         goto fail;
 
@@ -706,7 +701,7 @@ static void initial_hash(uint8_t *blockhash, KDF_ARGON2 *ctx)
         }
     }
 
-    store32((uint8_t *) &value, ctx->adlen);
+    store32((uint8_t *)&value, ctx->adlen);
     if (EVP_DigestUpdate(mdctx, &value, sizeof(value)) != 1)
         goto fail;
 
@@ -733,21 +728,19 @@ static int initialize(KDF_ARGON2 *ctx)
         return 0;
 
     if (ctx->type != ARGON2_D)
-        ctx->memory = OPENSSL_secure_zalloc(ctx->memory_blocks *
-                                            sizeof(BLOCK));
+        ctx->memory = OPENSSL_secure_zalloc(ctx->memory_blocks * sizeof(BLOCK));
     else
-        ctx->memory = OPENSSL_zalloc(ctx->memory_blocks *
-                                     sizeof(BLOCK));
+        ctx->memory = OPENSSL_zalloc(ctx->memory_blocks * sizeof(BLOCK));
 
     if (ctx->memory == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_MEMORY_SIZE,
-                       "cannot allocate required memory");
+            "cannot allocate required memory");
         return 0;
     }
 
     initial_hash(blockhash, ctx);
     OPENSSL_cleanse(blockhash + ARGON2_PREHASH_DIGEST_LENGTH,
-                    ARGON2_PREHASH_SEED_LENGTH - ARGON2_PREHASH_DIGEST_LENGTH);
+        ARGON2_PREHASH_SEED_LENGTH - ARGON2_PREHASH_DIGEST_LENGTH);
     fill_first_blocks(blockhash, ctx);
     OPENSSL_cleanse(blockhash, ARGON2_PREHASH_SEED_LENGTH);
 
@@ -775,20 +768,20 @@ static void finalize(const KDF_ARGON2 *ctx, void *out)
     /* Hash the result */
     store_block(blockhash_bytes, &blockhash);
     blake2b_long(ctx->md, ctx->mac, out, ctx->outlen, blockhash_bytes,
-                 ARGON2_BLOCK_SIZE);
+        ARGON2_BLOCK_SIZE);
     OPENSSL_cleanse(blockhash.v, ARGON2_BLOCK_SIZE);
     OPENSSL_cleanse(blockhash_bytes, ARGON2_BLOCK_SIZE);
 
     if (ctx->type != ARGON2_D)
         OPENSSL_secure_clear_free(ctx->memory,
-                                  ctx->memory_blocks * sizeof(BLOCK));
+            ctx->memory_blocks * sizeof(BLOCK));
     else
         OPENSSL_clear_free(ctx->memory,
-                           ctx->memory_blocks * sizeof(BLOCK));
+            ctx->memory_blocks * sizeof(BLOCK));
 }
 
 static int blake2b_mac(EVP_MAC *mac, void *out, size_t outlen, const void *in,
-                       size_t inlen, const void *key, size_t keylen)
+    size_t inlen, const void *key, size_t keylen)
 {
     int ret = 0;
     size_t par_n = 0, out_written;
@@ -799,14 +792,14 @@ static int blake2b_mac(EVP_MAC *mac, void *out, size_t outlen, const void *in,
         goto fail;
 
     par[par_n++] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
-                                                     (void *) key, keylen);
+        (void *)key, keylen);
     par[par_n++] = OSSL_PARAM_construct_size_t(OSSL_MAC_PARAM_SIZE, &outlen);
     par[par_n++] = OSSL_PARAM_construct_end();
 
     ret = EVP_MAC_CTX_set_params(ctx, par) == 1
         && EVP_MAC_init(ctx, NULL, 0, NULL) == 1
         && EVP_MAC_update(ctx, in, inlen) == 1
-        && EVP_MAC_final(ctx, out, (size_t *) &out_written, outlen) == 1;
+        && EVP_MAC_final(ctx, out, (size_t *)&out_written, outlen) == 1;
 
 fail:
     EVP_MAC_CTX_free(ctx);
@@ -814,7 +807,7 @@ static int blake2b_mac(EVP_MAC *mac, void *out, size_t outlen, const void *in,
 }
 
 static int blake2b_md(EVP_MD *md, void *out, size_t outlen, const void *in,
-                      size_t inlen)
+    size_t inlen)
 {
     int ret = 0;
     EVP_MD_CTX *ctx = NULL;
@@ -835,7 +828,7 @@ static int blake2b_md(EVP_MD *md, void *out, size_t outlen, const void *in,
 }
 
 static int blake2b(EVP_MD *md, EVP_MAC *mac, void *out, size_t outlen,
-                   const void *in, size_t inlen, const void *key, size_t keylen)
+    const void *in, size_t inlen, const void *key, size_t keylen)
 {
     if (out == NULL || outlen == 0)
         return 0;
@@ -847,14 +840,14 @@ static int blake2b(EVP_MD *md, EVP_MAC *mac, void *out, size_t outlen,
 }
 
 static int blake2b_long(EVP_MD *md, EVP_MAC *mac, unsigned char *out,
-                        size_t outlen, const void *in, size_t inlen)
+    size_t outlen, const void *in, size_t inlen)
 {
     int ret = 0;
     EVP_MD_CTX *ctx = NULL;
     uint32_t outlen_curr;
     uint8_t outbuf[BLAKE2B_OUTBYTES];
     uint8_t inbuf[BLAKE2B_OUTBYTES];
-    uint8_t outlen_bytes[sizeof(uint32_t)] = {0};
+    uint8_t outlen_bytes[sizeof(uint32_t)] = { 0 };
     OSSL_PARAM par[2];
     size_t outlen_md;
 
@@ -875,7 +868,8 @@ static int blake2b_long(EVP_MD *md, EVP_MAC *mac, unsigned char *out,
         && EVP_DigestUpdate(ctx, outlen_bytes, sizeof(outlen_bytes)) == 1
         && EVP_DigestUpdate(ctx, in, inlen) == 1
         && EVP_DigestFinal_ex(ctx, (outlen > BLAKE2B_OUTBYTES) ? outbuf : out,
-                              NULL) == 1;
+               NULL)
+            == 1;
 
     if (ret == 0)
         goto fail;
@@ -883,12 +877,13 @@ static int blake2b_long(EVP_MD *md, EVP_MAC *mac, unsigned char *out,
     if (outlen > BLAKE2B_OUTBYTES) {
         memcpy(out, outbuf, BLAKE2B_OUTBYTES / 2);
         out += BLAKE2B_OUTBYTES / 2;
-        outlen_curr = (uint32_t) outlen - BLAKE2B_OUTBYTES / 2;
+        outlen_curr = (uint32_t)outlen - BLAKE2B_OUTBYTES / 2;
 
         while (outlen_curr > BLAKE2B_OUTBYTES) {
             memcpy(inbuf, outbuf, BLAKE2B_OUTBYTES);
             if (blake2b(md, mac, outbuf, BLAKE2B_OUTBYTES, inbuf,
-                        BLAKE2B_OUTBYTES, NULL, 0) != 1)
+                    BLAKE2B_OUTBYTES, NULL, 0)
+                != 1)
                 goto fail;
             memcpy(out, outbuf, BLAKE2B_OUTBYTES / 2);
             out += BLAKE2B_OUTBYTES / 2;
@@ -897,7 +892,8 @@ static int blake2b_long(EVP_MD *md, EVP_MAC *mac, unsigned char *out,
 
         memcpy(inbuf, outbuf, BLAKE2B_OUTBYTES);
         if (blake2b(md, mac, outbuf, outlen_curr, inbuf, BLAKE2B_OUTBYTES,
-                    NULL, 0) != 1)
+                NULL, 0)
+            != 1)
             goto fail;
         memcpy(out, outbuf, outlen_curr);
     }
@@ -1012,7 +1008,7 @@ static void kdf_argon2_free(void *vctx)
 }
 
 static int kdf_argon2_derive(void *vctx, unsigned char *out, size_t outlen,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_ARGON2 *ctx;
     uint32_t memory_blocks, segment_length;
@@ -1026,7 +1022,7 @@ static int kdf_argon2_derive(void *vctx, unsigned char *out, size_t outlen,
         ctx->mac = EVP_MAC_fetch(ctx->libctx, "blake2bmac", ctx->propq);
     if (ctx->mac == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_MISSING_MAC,
-                       "cannot fetch blake2bmac");
+            "cannot fetch blake2bmac");
         return 0;
     }
 
@@ -1034,7 +1030,7 @@ static int kdf_argon2_derive(void *vctx, unsigned char *out, size_t outlen,
         ctx->md = EVP_MD_fetch(ctx->libctx, "blake2b512", ctx->propq);
     if (ctx->md == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_MISSING_MESSAGE_DIGEST,
-                       "cannot fetch blake2b512");
+            "cannot fetch blake2b512");
         return 0;
     }
 
@@ -1048,7 +1044,7 @@ static int kdf_argon2_derive(void *vctx, unsigned char *out, size_t outlen,
             ERR_raise(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL);
             return 0;
         }
-        if (!kdf_argon2_ctx_set_out_length(ctx, (uint32_t) outlen))
+        if (!kdf_argon2_ctx_set_out_length(ctx, (uint32_t)outlen))
             return 0;
     }
 
@@ -1063,30 +1059,30 @@ static int kdf_argon2_derive(void *vctx, unsigned char *out, size_t outlen,
     }
 
     if (ctx->threads > 1) {
-# ifdef ARGON2_NO_THREADS
+#ifdef ARGON2_NO_THREADS
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_THREAD_POOL_SIZE,
-                       "requested %u threads, single-threaded mode supported only",
-                       ctx->threads);
+            "requested %u threads, single-threaded mode supported only",
+            ctx->threads);
         return 0;
-# else
+#else
         if (ctx->threads > ossl_get_avail_threads(ctx->libctx)) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_THREAD_POOL_SIZE,
-                           "requested %u threads, available: %u",
-                           ctx->threads, ossl_get_avail_threads(ctx->libctx));
+                "requested %u threads, available: %u",
+                ctx->threads, ossl_get_avail_threads(ctx->libctx));
             return 0;
         }
-# endif
+#endif
         if (ctx->threads > ctx->lanes) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_THREAD_POOL_SIZE,
-                           "requested more threads (%u) than lanes (%u)",
-                           ctx->threads, ctx->lanes);
+                "requested more threads (%u) than lanes (%u)",
+                ctx->threads, ctx->lanes);
             return 0;
         }
     }
 
     if (ctx->m_cost < 8 * ctx->lanes) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_MEMORY_SIZE,
-                       "m_cost must be greater or equal than 8 times the number of lanes");
+            "m_cost must be greater or equal than 8 times the number of lanes");
         return 0;
     }
 
@@ -1121,7 +1117,7 @@ static void kdf_argon2_reset(void *vctx)
     KDF_ARGON2 *ctx;
     ARGON2_TYPE type;
 
-    ctx = (KDF_ARGON2 *) vctx;
+    ctx = (KDF_ARGON2 *)vctx;
     type = ctx->type;
     libctx = ctx->libctx;
 
@@ -1151,13 +1147,13 @@ static int kdf_argon2_ctx_set_threads(KDF_ARGON2 *ctx, uint32_t threads)
 {
     if (threads < ARGON2_MIN_THREADS) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_THREAD_POOL_SIZE,
-                       "min threads: %u", ARGON2_MIN_THREADS);
+            "min threads: %u", ARGON2_MIN_THREADS);
         return 0;
     }
 
     if (threads > ARGON2_MAX_THREADS) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_THREAD_POOL_SIZE,
-                       "max threads: %u", ARGON2_MAX_THREADS);
+            "max threads: %u", ARGON2_MAX_THREADS);
         return 0;
     }
 
@@ -1169,13 +1165,13 @@ static int kdf_argon2_ctx_set_lanes(KDF_ARGON2 *ctx, uint32_t lanes)
 {
     if (lanes > ARGON2_MAX_LANES) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER,
-                       "max lanes: %u", ARGON2_MAX_LANES);
+            "max lanes: %u", ARGON2_MAX_LANES);
         return 0;
     }
 
     if (lanes < ARGON2_MIN_LANES) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER,
-                       "min lanes: %u", ARGON2_MIN_LANES);
+            "min lanes: %u", ARGON2_MIN_LANES);
         return 0;
     }
 
@@ -1189,7 +1185,7 @@ static int kdf_argon2_ctx_set_t_cost(KDF_ARGON2 *ctx, uint32_t t_cost)
 
     if (t_cost < ARGON2_MIN_TIME) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_ITERATION_COUNT,
-                       "min: %u", ARGON2_MIN_TIME);
+            "min: %u", ARGON2_MIN_TIME);
         return 0;
     }
 
@@ -1203,7 +1199,7 @@ static int kdf_argon2_ctx_set_m_cost(KDF_ARGON2 *ctx, uint32_t m_cost)
 
     if (m_cost < ARGON2_MIN_MEMORY) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_MEMORY_SIZE, "min: %u",
-                       ARGON2_MIN_MEMORY);
+            ARGON2_MIN_MEMORY);
         return 0;
     }
 
@@ -1221,7 +1217,7 @@ static int kdf_argon2_ctx_set_out_length(KDF_ARGON2 *ctx, uint32_t outlen)
 
     if (outlen < ARGON2_MIN_OUT_LENGTH) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_OUTPUT_LENGTH, "min: %u",
-                       ARGON2_MIN_OUT_LENGTH);
+            ARGON2_MIN_OUT_LENGTH);
         return 0;
     }
 
@@ -1252,7 +1248,7 @@ static int kdf_argon2_ctx_set_secret(KDF_ARGON2 *ctx, const OSSL_PARAM *p)
         return 0;
     }
 
-    ctx->secretlen = (uint32_t) buflen;
+    ctx->secretlen = (uint32_t)buflen;
     return 1;
 }
 
@@ -1274,11 +1270,11 @@ static int kdf_argon2_ctx_set_pwd(KDF_ARGON2 *ctx, const OSSL_PARAM *p)
 
     if (buflen > ARGON2_MAX_PWD_LENGTH) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_SALT_LENGTH, "max: %u",
-                       ARGON2_MAX_PWD_LENGTH);
+            ARGON2_MAX_PWD_LENGTH);
         goto fail;
     }
 
-    ctx->pwdlen = (uint32_t) buflen;
+    ctx->pwdlen = (uint32_t)buflen;
     return 1;
 
 fail:
@@ -1306,17 +1302,17 @@ static int kdf_argon2_ctx_set_salt(KDF_ARGON2 *ctx, const OSSL_PARAM *p)
 
     if (buflen < ARGON2_MIN_SALT_LENGTH) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_SALT_LENGTH, "min: %u",
-                       ARGON2_MIN_SALT_LENGTH);
+            ARGON2_MIN_SALT_LENGTH);
         goto fail;
     }
 
     if (buflen > ARGON2_MAX_SALT_LENGTH) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_SALT_LENGTH, "max: %u",
-                       ARGON2_MAX_SALT_LENGTH);
+            ARGON2_MAX_SALT_LENGTH);
         goto fail;
     }
 
-    ctx->saltlen = (uint32_t) buflen;
+    ctx->saltlen = (uint32_t)buflen;
     return 1;
 
 fail:
@@ -1349,7 +1345,7 @@ static int kdf_argon2_ctx_set_ad(KDF_ARGON2 *ctx, const OSSL_PARAM *p)
         return 0;
     }
 
-    ctx->adlen = (uint32_t) buflen;
+    ctx->adlen = (uint32_t)buflen;
     return 1;
 }
 
@@ -1367,7 +1363,7 @@ static int kdf_argon2_ctx_set_version(KDF_ARGON2 *ctx, uint32_t version)
         return 1;
     default:
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_MODE,
-                       "invalid Argon2 version");
+            "invalid Argon2 version");
         return 0;
     }
 }
@@ -1397,7 +1393,7 @@ static int kdf_argon2_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     if (ossl_param_is_empty(params))
         return 1;
 
-    ctx = (KDF_ARGON2 *) vctx;
+    ctx = (KDF_ARGON2 *)vctx;
     if ((p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_PASSWORD)) != NULL)
         if (!kdf_argon2_ctx_set_pwd(ctx, p))
             return 0;
@@ -1472,7 +1468,7 @@ static int kdf_argon2_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_argon2_settable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_octet_string(OSSL_KDF_PARAM_PASSWORD, NULL, 0),
@@ -1497,7 +1493,7 @@ static int kdf_argon2_get_ctx_params(void *vctx, OSSL_PARAM params[])
 {
     OSSL_PARAM *p;
 
-    (void) vctx;
+    (void)vctx;
     if ((p = OSSL_PARAM_locate(params, OSSL_KDF_PARAM_SIZE)) != NULL)
         return OSSL_PARAM_set_size_t(p, SIZE_MAX);
 
@@ -1505,7 +1501,7 @@ static int kdf_argon2_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_argon2_gettable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
@@ -1516,44 +1512,44 @@ static const OSSL_PARAM *kdf_argon2_gettable_ctx_params(ossl_unused void *ctx,
 }
 
 const OSSL_DISPATCH ossl_kdf_argon2i_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_argon2i_new },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_argon2_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_argon2_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_argon2_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_argon2i_new },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_argon2_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_argon2_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_argon2_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_argon2_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kdf_argon2_set_ctx_params },
+        (void (*)(void))kdf_argon2_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kdf_argon2_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_argon2_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kdf_argon2_get_ctx_params },
+        (void (*)(void))kdf_argon2_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kdf_argon2_get_ctx_params },
     OSSL_DISPATCH_END
 };
 
 const OSSL_DISPATCH ossl_kdf_argon2d_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_argon2d_new },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_argon2_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_argon2_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_argon2_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_argon2d_new },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_argon2_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_argon2_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_argon2_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_argon2_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kdf_argon2_set_ctx_params },
+        (void (*)(void))kdf_argon2_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kdf_argon2_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_argon2_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kdf_argon2_get_ctx_params },
+        (void (*)(void))kdf_argon2_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kdf_argon2_get_ctx_params },
     OSSL_DISPATCH_END
 };
 
 const OSSL_DISPATCH ossl_kdf_argon2id_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_argon2id_new },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_argon2_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_argon2_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_argon2_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_argon2id_new },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_argon2_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_argon2_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_argon2_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_argon2_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kdf_argon2_set_ctx_params },
+        (void (*)(void))kdf_argon2_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kdf_argon2_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_argon2_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kdf_argon2_get_ctx_params },
+        (void (*)(void))kdf_argon2_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kdf_argon2_get_ctx_params },
     OSSL_DISPATCH_END
 };
 
diff --git a/providers/implementations/kdfs/build.info b/providers/implementations/kdfs/build.info
index 3b7687b8f3a5b..417d173e1279c 100644
--- a/providers/implementations/kdfs/build.info
+++ b/providers/implementations/kdfs/build.info
@@ -31,7 +31,7 @@ SOURCE[$PBKDF2_GOAL]=pbkdf2.c
 # When the PBKDF2 moves to legacy, this can be removed.
 SOURCE[$PBKDF2_GOAL]=pbkdf2_fips.c
 
-SOURCE[$PBKDF1_GOAL]=pvkkdf.c
+SOURCE[$PVKKDF_GOAL]=pvkkdf.c
 
 SOURCE[$PKCS12KDF_GOAL]=pkcs12kdf.c
 
diff --git a/providers/implementations/kdfs/hkdf.c b/providers/implementations/kdfs/hkdf.c
index 264bc5d4c1621..b3c4cbf5279c1 100644
--- a/providers/implementations/kdfs/hkdf.c
+++ b/providers/implementations/kdfs/hkdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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
@@ -34,7 +34,7 @@
 #include "internal/params.h"
 
 #define HKDF_MAXBUF 2048
-#define HKDF_MAXINFO (32*1024)
+#define HKDF_MAXINFO (32 * 1024)
 
 static OSSL_FUNC_kdf_newctx_fn kdf_hkdf_new;
 static OSSL_FUNC_kdf_dupctx_fn kdf_hkdf_dup;
@@ -52,32 +52,32 @@ static OSSL_FUNC_kdf_gettable_ctx_params_fn kdf_tls1_3_gettable_ctx_params;
 static OSSL_FUNC_kdf_get_ctx_params_fn kdf_tls1_3_get_ctx_params;
 
 static int HKDF(OSSL_LIB_CTX *libctx, const EVP_MD *evp_md,
-                const unsigned char *salt, size_t salt_len,
-                const unsigned char *key, size_t key_len,
-                const unsigned char *info, size_t info_len,
-                unsigned char *okm, size_t okm_len);
+    const unsigned char *salt, size_t salt_len,
+    const unsigned char *key, size_t key_len,
+    const unsigned char *info, size_t info_len,
+    unsigned char *okm, size_t okm_len);
 static int HKDF_Extract(OSSL_LIB_CTX *libctx, const EVP_MD *evp_md,
-                        const unsigned char *salt, size_t salt_len,
-                        const unsigned char *ikm, size_t ikm_len,
-                        unsigned char *prk, size_t prk_len);
+    const unsigned char *salt, size_t salt_len,
+    const unsigned char *ikm, size_t ikm_len,
+    unsigned char *prk, size_t prk_len);
 static int HKDF_Expand(const EVP_MD *evp_md,
-                       const unsigned char *prk, size_t prk_len,
-                       const unsigned char *info, size_t info_len,
-                       unsigned char *okm, size_t okm_len);
+    const unsigned char *prk, size_t prk_len,
+    const unsigned char *info, size_t info_len,
+    unsigned char *okm, size_t okm_len);
 
 /* Settable context parameters that are common across HKDF and the TLS KDF */
 #define HKDF_COMMON_SETTABLES                                       \
     OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_MODE, NULL, 0),           \
-    OSSL_PARAM_int(OSSL_KDF_PARAM_MODE, NULL),                      \
-    OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),     \
-    OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_DIGEST, NULL, 0),         \
-    OSSL_PARAM_octet_string(OSSL_KDF_PARAM_KEY, NULL, 0),           \
-    OSSL_PARAM_octet_string(OSSL_KDF_PARAM_SALT, NULL, 0)
+        OSSL_PARAM_int(OSSL_KDF_PARAM_MODE, NULL),                  \
+        OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0), \
+        OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_DIGEST, NULL, 0),     \
+        OSSL_PARAM_octet_string(OSSL_KDF_PARAM_KEY, NULL, 0),       \
+        OSSL_PARAM_octet_string(OSSL_KDF_PARAM_SALT, NULL, 0)
 
 /* Gettable context parameters that are common across HKDF and the TLS KDF */
-#define HKDF_COMMON_GETTABLES                                       \
-    OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),                   \
-    OSSL_PARAM_octet_string(OSSL_KDF_PARAM_INFO, NULL, 0)
+#define HKDF_COMMON_GETTABLES                     \
+    OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), \
+        OSSL_PARAM_octet_string(OSSL_KDF_PARAM_INFO, NULL, 0)
 
 typedef struct {
     void *provctx;
@@ -150,25 +150,25 @@ static void *kdf_hkdf_dup(void *vctx)
     dest = kdf_hkdf_new(src->provctx);
     if (dest != NULL) {
         if (!ossl_prov_memdup(src->salt, src->salt_len, &dest->salt,
-                              &dest->salt_len)
-                || !ossl_prov_memdup(src->key, src->key_len,
-                                     &dest->key , &dest->key_len)
-                || !ossl_prov_memdup(src->prefix, src->prefix_len,
-                                     &dest->prefix, &dest->prefix_len)
-                || !ossl_prov_memdup(src->label, src->label_len,
-                                     &dest->label, &dest->label_len)
-                || !ossl_prov_memdup(src->data, src->data_len,
-                                     &dest->data, &dest->data_len)
-                || !ossl_prov_memdup(src->info, src->info_len,
-                                     &dest->info, &dest->info_len)
-                || !ossl_prov_digest_copy(&dest->digest, &src->digest))
+                &dest->salt_len)
+            || !ossl_prov_memdup(src->key, src->key_len,
+                &dest->key, &dest->key_len)
+            || !ossl_prov_memdup(src->prefix, src->prefix_len,
+                &dest->prefix, &dest->prefix_len)
+            || !ossl_prov_memdup(src->label, src->label_len,
+                &dest->label, &dest->label_len)
+            || !ossl_prov_memdup(src->data, src->data_len,
+                &dest->data, &dest->data_len)
+            || !ossl_prov_memdup(src->info, src->info_len,
+                &dest->info, &dest->info_len)
+            || !ossl_prov_digest_copy(&dest->digest, &src->digest))
             goto err;
         dest->mode = src->mode;
         OSSL_FIPS_IND_COPY(dest, src)
     }
     return dest;
 
- err:
+err:
     kdf_hkdf_free(dest);
     return NULL;
 }
@@ -200,8 +200,8 @@ static int fips_hkdf_key_check_passed(KDF_HKDF *ctx)
 
     if (!key_approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
-                                         libctx, "HKDF", "Key size",
-                                         ossl_fips_config_hkdf_key_check)) {
+                libctx, "HKDF", "Key size",
+                ossl_fips_config_hkdf_key_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
             return 0;
         }
@@ -211,7 +211,7 @@ static int fips_hkdf_key_check_passed(KDF_HKDF *ctx)
 #endif
 
 static int kdf_hkdf_derive(void *vctx, unsigned char *key, size_t keylen,
-                           const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_HKDF *ctx = (KDF_HKDF *)vctx;
     OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(ctx->provctx);
@@ -238,15 +238,15 @@ static int kdf_hkdf_derive(void *vctx, unsigned char *key, size_t keylen,
     case EVP_KDF_HKDF_MODE_EXTRACT_AND_EXPAND:
     default:
         return HKDF(libctx, md, ctx->salt, ctx->salt_len,
-                    ctx->key, ctx->key_len, ctx->info, ctx->info_len, key, keylen);
+            ctx->key, ctx->key_len, ctx->info, ctx->info_len, key, keylen);
 
     case EVP_KDF_HKDF_MODE_EXTRACT_ONLY:
         return HKDF_Extract(libctx, md, ctx->salt, ctx->salt_len,
-                            ctx->key, ctx->key_len, key, keylen);
+            ctx->key, ctx->key_len, key, keylen);
 
     case EVP_KDF_HKDF_MODE_EXPAND_ONLY:
         return HKDF_Expand(md, ctx->key, ctx->key_len, ctx->info,
-                           ctx->info_len, key, keylen);
+            ctx->info_len, key, keylen);
     }
 }
 
@@ -302,18 +302,16 @@ static int hkdf_common_set_ctx_params(KDF_HKDF *ctx, const OSSL_PARAM params[])
         OPENSSL_clear_free(ctx->key, ctx->key_len);
         ctx->key = NULL;
         if (!OSSL_PARAM_get_octet_string(p, (void **)&ctx->key, 0,
-                                         &ctx->key_len))
+                &ctx->key_len))
             return 0;
     }
 
     if ((p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_SALT)) != NULL) {
-        if (p->data_size != 0 && p->data != NULL) {
-            OPENSSL_free(ctx->salt);
-            ctx->salt = NULL;
-            if (!OSSL_PARAM_get_octet_string(p, (void **)&ctx->salt, 0,
-                                             &ctx->salt_len))
-                return 0;
-        }
+        OPENSSL_free(ctx->salt);
+        ctx->salt = NULL;
+        if (!OSSL_PARAM_get_octet_string(p, (void **)&ctx->salt, 0,
+                &ctx->salt_len))
+            return 0;
     }
 
     return 1;
@@ -327,15 +325,16 @@ static int kdf_hkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_KDF_PARAM_FIPS_KEY_CHECK))
+            OSSL_KDF_PARAM_FIPS_KEY_CHECK))
         return 0;
 
     if (!hkdf_common_set_ctx_params(ctx, params))
         return 0;
 
     if (ossl_param_get1_concat_octet_string(params, OSSL_KDF_PARAM_INFO,
-                                            &ctx->info, &ctx->info_len,
-                                            HKDF_MAXINFO) == 0)
+            &ctx->info, &ctx->info_len,
+            HKDF_MAXINFO)
+        == 0)
         return 0;
 
 #ifdef FIPS_MODULE
@@ -348,13 +347,13 @@ static int kdf_hkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_hkdf_settable_ctx_params(ossl_unused void *ctx,
-                                                      ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         HKDF_COMMON_SETTABLES,
         OSSL_PARAM_octet_string(OSSL_KDF_PARAM_INFO, NULL, 0),
         OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_KEY_CHECK)
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_settable_ctx_params;
 }
@@ -402,28 +401,28 @@ static int kdf_hkdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_hkdf_gettable_ctx_params(ossl_unused void *ctx,
-                                                      ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         HKDF_COMMON_GETTABLES,
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
 
 const OSSL_DISPATCH ossl_kdf_hkdf_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_hkdf_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))kdf_hkdf_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_hkdf_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_hkdf_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_hkdf_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_hkdf_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))kdf_hkdf_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_hkdf_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_hkdf_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_hkdf_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_hkdf_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kdf_hkdf_set_ctx_params },
+        (void (*)(void))kdf_hkdf_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kdf_hkdf_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_hkdf_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kdf_hkdf_get_ctx_params },
+        (void (*)(void))kdf_hkdf_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kdf_hkdf_get_ctx_params },
     OSSL_DISPATCH_END
 };
 
@@ -453,10 +452,10 @@ const OSSL_DISPATCH ossl_kdf_hkdf_functions[] = {
  *     HKDF-Expand(PRK, info, L) -> OKM
  */
 static int HKDF(OSSL_LIB_CTX *libctx, const EVP_MD *evp_md,
-                const unsigned char *salt, size_t salt_len,
-                const unsigned char *ikm, size_t ikm_len,
-                const unsigned char *info, size_t info_len,
-                unsigned char *okm, size_t okm_len)
+    const unsigned char *salt, size_t salt_len,
+    const unsigned char *ikm, size_t ikm_len,
+    const unsigned char *info, size_t info_len,
+    unsigned char *okm, size_t okm_len)
 {
     unsigned char prk[EVP_MAX_MD_SIZE];
     int ret, sz;
@@ -469,7 +468,7 @@ static int HKDF(OSSL_LIB_CTX *libctx, const EVP_MD *evp_md,
 
     /* Step 1: HKDF-Extract(salt, IKM) -> PRK */
     if (!HKDF_Extract(libctx, evp_md,
-                      salt, salt_len, ikm, ikm_len, prk, prk_len))
+            salt, salt_len, ikm, ikm_len, prk, prk_len))
         return 0;
 
     /* Step 2: HKDF-Expand(PRK, info, L) -> OKM */
@@ -504,9 +503,9 @@ static int HKDF(OSSL_LIB_CTX *libctx, const EVP_MD *evp_md,
  *   PRK = HMAC-Hash(salt, IKM)
  */
 static int HKDF_Extract(OSSL_LIB_CTX *libctx, const EVP_MD *evp_md,
-                        const unsigned char *salt, size_t salt_len,
-                        const unsigned char *ikm, size_t ikm_len,
-                        unsigned char *prk, size_t prk_len)
+    const unsigned char *salt, size_t salt_len,
+    const unsigned char *ikm, size_t ikm_len,
+    unsigned char *prk, size_t prk_len)
 {
     int sz = EVP_MD_get_size(evp_md);
 
@@ -517,9 +516,8 @@ static int HKDF_Extract(OSSL_LIB_CTX *libctx, const EVP_MD *evp_md,
         return 0;
     }
     /* calc: PRK = HMAC-Hash(salt, IKM) */
-    return
-        EVP_Q_mac(libctx, "HMAC", NULL, EVP_MD_get0_name(evp_md), NULL, salt,
-                  salt_len, ikm, ikm_len, prk, EVP_MD_get_size(evp_md), NULL)
+    return EVP_Q_mac(libctx, "HMAC", NULL, EVP_MD_get0_name(evp_md), NULL, salt,
+               salt_len, ikm, ikm_len, prk, EVP_MD_get_size(evp_md), NULL)
         != NULL;
 }
 
@@ -563,9 +561,9 @@ static int HKDF_Extract(OSSL_LIB_CTX *libctx, const EVP_MD *evp_md,
  *   single octet.)
  */
 static int HKDF_Expand(const EVP_MD *evp_md,
-                       const unsigned char *prk, size_t prk_len,
-                       const unsigned char *info, size_t info_len,
-                       unsigned char *okm, size_t okm_len)
+    const unsigned char *prk, size_t prk_len,
+    const unsigned char *info, size_t info_len,
+    unsigned char *okm, size_t okm_len)
 {
     HMAC_CTX *hmac;
     int ret = 0, sz;
@@ -614,9 +612,7 @@ static int HKDF_Expand(const EVP_MD *evp_md,
         if (!HMAC_Final(hmac, prev, NULL))
             goto err;
 
-        copy_len = (dig_len > okm_len - done_len) ?
-                       okm_len - done_len :
-                       dig_len;
+        copy_len = (dig_len > okm_len - done_len) ? okm_len - done_len : dig_len;
 
         memcpy(okm + done_len, prev, copy_len);
 
@@ -624,7 +620,7 @@ static int HKDF_Expand(const EVP_MD *evp_md,
     }
     ret = 1;
 
- err:
+err:
     OPENSSL_cleanse(prev, sizeof(prev));
     HMAC_CTX_free(hmac);
     return ret;
@@ -643,11 +639,11 @@ static int HKDF_Expand(const EVP_MD *evp_md,
  * The |data| value may be zero length. Returns 1 on success and 0 on failure.
  */
 static int prov_tls13_hkdf_expand(const EVP_MD *md,
-                                  const unsigned char *key, size_t keylen,
-                                  const unsigned char *prefix, size_t prefixlen,
-                                  const unsigned char *label, size_t labellen,
-                                  const unsigned char *data, size_t datalen,
-                                  unsigned char *out, size_t outlen)
+    const unsigned char *key, size_t keylen,
+    const unsigned char *prefix, size_t prefixlen,
+    const unsigned char *label, size_t labellen,
+    const unsigned char *data, size_t datalen,
+    unsigned char *out, size_t outlen)
 {
     size_t hkdflabellen;
     unsigned char hkdflabel[HKDF_MAXBUF];
@@ -660,33 +656,33 @@ static int prov_tls13_hkdf_expand(const EVP_MD *md,
      * which should always be sufficient.
      */
     if (!WPACKET_init_static_len(&pkt, hkdflabel, sizeof(hkdflabel), 0)
-            || !WPACKET_put_bytes_u16(&pkt, outlen)
-            || !WPACKET_start_sub_packet_u8(&pkt)
-            || !WPACKET_memcpy(&pkt, prefix, prefixlen)
-            || !WPACKET_memcpy(&pkt, label, labellen)
-            || !WPACKET_close(&pkt)
-            || !WPACKET_sub_memcpy_u8(&pkt, data, (data == NULL) ? 0 : datalen)
-            || !WPACKET_get_total_written(&pkt, &hkdflabellen)
-            || !WPACKET_finish(&pkt)) {
+        || !WPACKET_put_bytes_u16(&pkt, outlen)
+        || !WPACKET_start_sub_packet_u8(&pkt)
+        || !WPACKET_memcpy(&pkt, prefix, prefixlen)
+        || !WPACKET_memcpy(&pkt, label, labellen)
+        || !WPACKET_close(&pkt)
+        || !WPACKET_sub_memcpy_u8(&pkt, data, (data == NULL) ? 0 : datalen)
+        || !WPACKET_get_total_written(&pkt, &hkdflabellen)
+        || !WPACKET_finish(&pkt)) {
         WPACKET_cleanup(&pkt);
         return 0;
     }
 
     return HKDF_Expand(md, key, keylen, hkdflabel, hkdflabellen,
-                       out, outlen);
+        out, outlen);
 }
 
 static int prov_tls13_hkdf_generate_secret(OSSL_LIB_CTX *libctx,
-                                           const EVP_MD *md,
-                                           const unsigned char *prevsecret,
-                                           size_t prevsecretlen,
-                                           const unsigned char *insecret,
-                                           size_t insecretlen,
-                                           const unsigned char *prefix,
-                                           size_t prefixlen,
-                                           const unsigned char *label,
-                                           size_t labellen,
-                                           unsigned char *out, size_t outlen)
+    const EVP_MD *md,
+    const unsigned char *prevsecret,
+    size_t prevsecretlen,
+    const unsigned char *insecret,
+    size_t insecretlen,
+    const unsigned char *prefix,
+    size_t prefixlen,
+    const unsigned char *label,
+    size_t labellen,
+    unsigned char *out, size_t outlen)
 {
     size_t mdlen;
     int ret;
@@ -713,8 +709,8 @@ static int prov_tls13_hkdf_generate_secret(OSSL_LIB_CTX *libctx,
 
         /* The pre-extract derive step uses a hash of no messages */
         if (mctx == NULL
-                || EVP_DigestInit_ex(mctx, md, NULL) <= 0
-                || EVP_DigestFinal_ex(mctx, hash, NULL) <= 0) {
+            || EVP_DigestInit_ex(mctx, md, NULL) <= 0
+            || EVP_DigestFinal_ex(mctx, hash, NULL) <= 0) {
             EVP_MD_CTX_free(mctx);
             return 0;
         }
@@ -722,15 +718,15 @@ static int prov_tls13_hkdf_generate_secret(OSSL_LIB_CTX *libctx,
 
         /* Generate the pre-extract secret */
         if (!prov_tls13_hkdf_expand(md, prevsecret, prevsecretlen,
-                                    prefix, prefixlen, label, labellen,
-                                    hash, mdlen, preextractsec, mdlen))
+                prefix, prefixlen, label, labellen,
+                hash, mdlen, preextractsec, mdlen))
             return 0;
         prevsecret = preextractsec;
         prevsecretlen = mdlen;
     }
 
     ret = HKDF_Extract(libctx, md, prevsecret, prevsecretlen,
-                       insecret, insecretlen, out, outlen);
+        insecret, insecretlen, out, outlen);
 
     if (prevsecret == preextractsec)
         OPENSSL_cleanse(preextractsec, mdlen);
@@ -753,8 +749,8 @@ static int fips_tls1_3_digest_check_passed(KDF_HKDF *ctx, const EVP_MD *md)
 
     if (digest_unapproved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
-                                         libctx, "TLS13 KDF", "Digest",
-                                         ossl_fips_config_tls13_kdf_digest_check)) {
+                libctx, "TLS13 KDF", "Digest",
+                ossl_fips_config_tls13_kdf_digest_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED);
             return 0;
         }
@@ -789,8 +785,8 @@ static int fips_tls1_3_key_check_passed(KDF_HKDF *ctx)
 
     if (!key_approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE1,
-                                         libctx, "TLS13 KDF", "Key size",
-                                         ossl_fips_config_tls13_kdf_key_check)) {
+                libctx, "TLS13 KDF", "Key size",
+                ossl_fips_config_tls13_kdf_key_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
             return 0;
         }
@@ -800,7 +796,7 @@ static int fips_tls1_3_key_check_passed(KDF_HKDF *ctx)
 #endif
 
 static int kdf_tls1_3_derive(void *vctx, unsigned char *key, size_t keylen,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_HKDF *ctx = (KDF_HKDF *)vctx;
     const EVP_MD *md;
@@ -820,19 +816,19 @@ static int kdf_tls1_3_derive(void *vctx, unsigned char *key, size_t keylen,
 
     case EVP_KDF_HKDF_MODE_EXTRACT_ONLY:
         return prov_tls13_hkdf_generate_secret(PROV_LIBCTX_OF(ctx->provctx),
-                                               md,
-                                               ctx->salt, ctx->salt_len,
-                                               ctx->key, ctx->key_len,
-                                               ctx->prefix, ctx->prefix_len,
-                                               ctx->label, ctx->label_len,
-                                               key, keylen);
+            md,
+            ctx->salt, ctx->salt_len,
+            ctx->key, ctx->key_len,
+            ctx->prefix, ctx->prefix_len,
+            ctx->label, ctx->label_len,
+            key, keylen);
 
     case EVP_KDF_HKDF_MODE_EXPAND_ONLY:
         return prov_tls13_hkdf_expand(md, ctx->key, ctx->key_len,
-                                      ctx->prefix, ctx->prefix_len,
-                                      ctx->label, ctx->label_len,
-                                      ctx->data, ctx->data_len,
-                                      key, keylen);
+            ctx->prefix, ctx->prefix_len,
+            ctx->label, ctx->label_len,
+            ctx->data, ctx->data_len,
+            key, keylen);
     }
 }
 
@@ -845,10 +841,10 @@ static int kdf_tls1_3_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_KDF_PARAM_FIPS_DIGEST_CHECK))
+            OSSL_KDF_PARAM_FIPS_DIGEST_CHECK))
         return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE1, params,
-                                     OSSL_KDF_PARAM_FIPS_KEY_CHECK))
+            OSSL_KDF_PARAM_FIPS_KEY_CHECK))
         return 0;
 
     if (!hkdf_common_set_ctx_params(ctx, params))
@@ -863,7 +859,7 @@ static int kdf_tls1_3_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         OPENSSL_free(ctx->prefix);
         ctx->prefix = NULL;
         if (!OSSL_PARAM_get_octet_string(p, (void **)&ctx->prefix, 0,
-                                         &ctx->prefix_len))
+                &ctx->prefix_len))
             return 0;
     }
 
@@ -871,15 +867,15 @@ static int kdf_tls1_3_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         OPENSSL_free(ctx->label);
         ctx->label = NULL;
         if (!OSSL_PARAM_get_octet_string(p, (void **)&ctx->label, 0,
-                                         &ctx->label_len))
+                &ctx->label_len))
             return 0;
     }
 
     OPENSSL_clear_free(ctx->data, ctx->data_len);
     ctx->data = NULL;
     if ((p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_DATA)) != NULL
-            && !OSSL_PARAM_get_octet_string(p, (void **)&ctx->data, 0,
-                                            &ctx->data_len))
+        && !OSSL_PARAM_get_octet_string(p, (void **)&ctx->data, 0,
+            &ctx->data_len))
         return 0;
 
 #ifdef FIPS_MODULE
@@ -899,7 +895,7 @@ static int kdf_tls1_3_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_tls1_3_settable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         HKDF_COMMON_SETTABLES,
@@ -907,8 +903,8 @@ static const OSSL_PARAM *kdf_tls1_3_settable_ctx_params(ossl_unused void *ctx,
         OSSL_PARAM_octet_string(OSSL_KDF_PARAM_LABEL, NULL, 0),
         OSSL_PARAM_octet_string(OSSL_KDF_PARAM_DATA, NULL, 0),
         OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_DIGEST_CHECK)
-        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_KEY_CHECK)
-        OSSL_PARAM_END
+            OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_KEY_CHECK)
+                OSSL_PARAM_END
     };
     return known_settable_ctx_params;
 }
@@ -930,27 +926,27 @@ static int kdf_tls1_3_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_tls1_3_gettable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         HKDF_COMMON_GETTABLES,
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
 
 const OSSL_DISPATCH ossl_kdf_tls1_3_kdf_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_hkdf_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))kdf_hkdf_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_hkdf_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_hkdf_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_tls1_3_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_hkdf_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))kdf_hkdf_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_hkdf_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_hkdf_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_tls1_3_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_tls1_3_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kdf_tls1_3_set_ctx_params },
+        (void (*)(void))kdf_tls1_3_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kdf_tls1_3_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_tls1_3_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kdf_tls1_3_get_ctx_params },
+        (void (*)(void))kdf_tls1_3_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kdf_tls1_3_get_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/kdfs/hmacdrbg_kdf.c b/providers/implementations/kdfs/hmacdrbg_kdf.c
index 9ed214c3da468..77c2de3270d29 100644
--- a/providers/implementations/kdfs/hmacdrbg_kdf.c
+++ b/providers/implementations/kdfs/hmacdrbg_kdf.c
@@ -77,7 +77,8 @@ static void hmac_drbg_kdf_free(void *vctx)
     }
 }
 
-static int ossl_drbg_hmac_dup(PROV_DRBG_HMAC *dst, const PROV_DRBG_HMAC *src) {
+static int ossl_drbg_hmac_dup(PROV_DRBG_HMAC *dst, const PROV_DRBG_HMAC *src)
+{
     if (src->ctx != NULL) {
         dst->ctx = EVP_MAC_CTX_dup(src->ctx);
         if (dst->ctx == NULL)
@@ -99,36 +100,36 @@ static void *hmac_drbg_kdf_dup(void *vctx)
     dst = hmac_drbg_kdf_new(src->provctx);
     if (dst != NULL) {
         if (!ossl_drbg_hmac_dup(&dst->base, &src->base)
-                || !ossl_prov_memdup(src->entropy, src->entropylen,
-                                     &dst->entropy , &dst->entropylen)
-                || !ossl_prov_memdup(src->nonce, src->noncelen,
-                                     &dst->nonce, &dst->noncelen))
+            || !ossl_prov_memdup(src->entropy, src->entropylen,
+                &dst->entropy, &dst->entropylen)
+            || !ossl_prov_memdup(src->nonce, src->noncelen,
+                &dst->nonce, &dst->noncelen))
             goto err;
         dst->init = src->init;
     }
     return dst;
 
- err:
+err:
     hmac_drbg_kdf_free(dst);
     return NULL;
 }
 
 static int hmac_drbg_kdf_derive(void *vctx, unsigned char *out, size_t outlen,
-                                const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_HMAC_DRBG *ctx = (KDF_HMAC_DRBG *)vctx;
     PROV_DRBG_HMAC *drbg = &ctx->base;
 
     if (!ossl_prov_is_running()
-            || !hmac_drbg_kdf_set_ctx_params(vctx, params))
+        || !hmac_drbg_kdf_set_ctx_params(vctx, params))
         return 0;
     if (!ctx->init) {
         if (ctx->entropy == NULL
-                || ctx->entropylen == 0
-                || ctx->nonce == NULL
-                || ctx->noncelen == 0
-                || !ossl_drbg_hmac_init(drbg, ctx->entropy, ctx->entropylen,
-                                        ctx->nonce, ctx->noncelen, NULL, 0))
+            || ctx->entropylen == 0
+            || ctx->nonce == NULL
+            || ctx->noncelen == 0
+            || !ossl_drbg_hmac_init(drbg, ctx->entropy, ctx->entropylen,
+                ctx->nonce, ctx->noncelen, NULL, 0))
             return 0;
         ctx->init = 1;
     }
@@ -174,7 +175,7 @@ static const OSSL_PARAM *hmac_drbg_kdf_gettable_ctx_params(
 }
 
 static int hmac_drbg_kdf_set_ctx_params(void *vctx,
-                                        const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_HMAC_DRBG *hmac = (KDF_HMAC_DRBG *)vctx;
     PROV_DRBG_HMAC *drbg = &hmac->base;
@@ -227,7 +228,7 @@ static int hmac_drbg_kdf_set_ctx_params(void *vctx,
             drbg->blocklen = (size_t)md_size;
         }
         return ossl_prov_macctx_load_from_params(&drbg->ctx, params,
-                                                 "HMAC", NULL, NULL, libctx);
+            "HMAC", NULL, NULL, libctx);
     }
     return 1;
 }
@@ -246,18 +247,18 @@ static const OSSL_PARAM *hmac_drbg_kdf_settable_ctx_params(
 }
 
 const OSSL_DISPATCH ossl_kdf_hmac_drbg_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))hmac_drbg_kdf_new },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))hmac_drbg_kdf_free },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))hmac_drbg_kdf_dup },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))hmac_drbg_kdf_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))hmac_drbg_kdf_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))hmac_drbg_kdf_new },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))hmac_drbg_kdf_free },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))hmac_drbg_kdf_dup },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))hmac_drbg_kdf_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))hmac_drbg_kdf_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))hmac_drbg_kdf_settable_ctx_params },
+        (void (*)(void))hmac_drbg_kdf_settable_ctx_params },
     { OSSL_FUNC_KDF_SET_CTX_PARAMS,
-      (void(*)(void))hmac_drbg_kdf_set_ctx_params },
+        (void (*)(void))hmac_drbg_kdf_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))hmac_drbg_kdf_gettable_ctx_params },
+        (void (*)(void))hmac_drbg_kdf_gettable_ctx_params },
     { OSSL_FUNC_KDF_GET_CTX_PARAMS,
-      (void(*)(void))hmac_drbg_kdf_get_ctx_params },
+        (void (*)(void))hmac_drbg_kdf_get_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/kdfs/kbkdf.c b/providers/implementations/kdfs/kbkdf.c
index 9ba834ac36d66..65b2344a96af9 100644
--- a/providers/implementations/kdfs/kbkdf.c
+++ b/providers/implementations/kdfs/kbkdf.c
@@ -162,14 +162,14 @@ static void *kbkdf_dup(void *vctx)
     if (dest != NULL) {
         dest->ctx_init = EVP_MAC_CTX_dup(src->ctx_init);
         if (dest->ctx_init == NULL
-                || !ossl_prov_memdup(src->ki, src->ki_len,
-                                     &dest->ki, &dest->ki_len)
-                || !ossl_prov_memdup(src->label, src->label_len,
-                                     &dest->label, &dest->label_len)
-                || !ossl_prov_memdup(src->context, src->context_len,
-                                     &dest->context, &dest->context_len)
-                || !ossl_prov_memdup(src->iv, src->iv_len,
-                                     &dest->iv, &dest->iv_len))
+            || !ossl_prov_memdup(src->ki, src->ki_len,
+                &dest->ki, &dest->ki_len)
+            || !ossl_prov_memdup(src->label, src->label_len,
+                &dest->label, &dest->label_len)
+            || !ossl_prov_memdup(src->context, src->context_len,
+                &dest->context, &dest->context_len)
+            || !ossl_prov_memdup(src->iv, src->iv_len,
+                &dest->iv, &dest->iv_len))
             goto err;
         dest->mode = src->mode;
         dest->r = src->r;
@@ -180,7 +180,7 @@ static void *kbkdf_dup(void *vctx)
     }
     return dest;
 
- err:
+err:
     kbkdf_free(dest);
     return NULL;
 }
@@ -193,8 +193,8 @@ static int fips_kbkdf_key_check_passed(KBKDF *ctx)
 
     if (!key_approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
-                                         libctx, "KBKDF", "Key size",
-                                         ossl_fips_config_kbkdf_key_check)) {
+                libctx, "KBKDF", "Key size",
+                ossl_fips_config_kbkdf_key_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
             return 0;
         }
@@ -205,10 +205,10 @@ static int fips_kbkdf_key_check_passed(KBKDF *ctx)
 
 /* SP800-108 section 5.1 or section 5.2 depending on mode. */
 static int derive(EVP_MAC_CTX *ctx_init, kbkdf_mode mode, unsigned char *iv,
-                  size_t iv_len, unsigned char *label, size_t label_len,
-                  unsigned char *context, size_t context_len,
-                  unsigned char *k_i, size_t h, uint32_t l, int has_separator,
-                  unsigned char *ko, size_t ko_len, int r)
+    size_t iv_len, unsigned char *label, size_t label_len,
+    unsigned char *context, size_t context_len,
+    unsigned char *k_i, size_t h, uint32_t l, int has_separator,
+    unsigned char *ko, size_t ko_len, int r)
 {
     int ret = 0;
     EVP_MAC_CTX *ctx = NULL;
@@ -273,25 +273,25 @@ static int kmac_init(EVP_MAC_CTX *ctx, const unsigned char *custom, size_t custo
     if (custom == NULL || customlen == 0)
         return 1;
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_CUSTOM,
-                                                  (void *)custom, customlen);
+        (void *)custom, customlen);
     params[1] = OSSL_PARAM_construct_end();
     return EVP_MAC_CTX_set_params(ctx, params) > 0;
 }
 
 static int kmac_derive(EVP_MAC_CTX *ctx, unsigned char *out, size_t outlen,
-                       const unsigned char *context, size_t contextlen)
+    const unsigned char *context, size_t contextlen)
 {
     OSSL_PARAM params[2];
 
     params[0] = OSSL_PARAM_construct_size_t(OSSL_MAC_PARAM_SIZE, &outlen);
     params[1] = OSSL_PARAM_construct_end();
     return EVP_MAC_CTX_set_params(ctx, params) > 0
-           && EVP_MAC_update(ctx, context, contextlen)
-           && EVP_MAC_final(ctx, out, NULL, outlen);
+        && EVP_MAC_update(ctx, context, contextlen)
+        && EVP_MAC_final(ctx, out, NULL, outlen);
 }
 
 static int kbkdf_derive(void *vctx, unsigned char *key, size_t keylen,
-                        const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KBKDF *ctx = (KBKDF *)vctx;
     int ret = 0;
@@ -324,7 +324,7 @@ static int kbkdf_derive(void *vctx, unsigned char *key, size_t keylen,
 
     if (ctx->is_kmac) {
         ret = kmac_derive(ctx->ctx_init, key, keylen,
-                          ctx->context, ctx->context_len);
+            ctx->context, ctx->context_len);
         goto done;
     }
 
@@ -354,8 +354,8 @@ static int kbkdf_derive(void *vctx, unsigned char *key, size_t keylen,
         goto done;
 
     ret = derive(ctx->ctx_init, ctx->mode, ctx->iv, ctx->iv_len, ctx->label,
-                 ctx->label_len, ctx->context, ctx->context_len, k_i, h, l,
-                 ctx->use_separator, key, keylen, ctx->r);
+        ctx->label_len, ctx->context, ctx->context_len, k_i, h, l,
+        ctx->use_separator, key, keylen, ctx->r);
 done:
     if (ret != 1)
         OPENSSL_cleanse(key, keylen);
@@ -373,23 +373,23 @@ static int kbkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_KDF_PARAM_FIPS_KEY_CHECK))
+            OSSL_KDF_PARAM_FIPS_KEY_CHECK))
         return 0;
 
     if (!ossl_prov_macctx_load_from_params(&ctx->ctx_init, params, NULL,
-                                           NULL, NULL, libctx))
+            NULL, NULL, libctx))
         return 0;
     if (ctx->ctx_init != NULL) {
         ctx->is_kmac = 0;
         if (EVP_MAC_is_a(EVP_MAC_CTX_get0_mac(ctx->ctx_init),
-                         OSSL_MAC_NAME_KMAC128)
+                OSSL_MAC_NAME_KMAC128)
             || EVP_MAC_is_a(EVP_MAC_CTX_get0_mac(ctx->ctx_init),
-                            OSSL_MAC_NAME_KMAC256)) {
+                OSSL_MAC_NAME_KMAC256)) {
             ctx->is_kmac = 1;
         } else if (!EVP_MAC_is_a(EVP_MAC_CTX_get0_mac(ctx->ctx_init),
-                                 OSSL_MAC_NAME_HMAC)
-                   && !EVP_MAC_is_a(EVP_MAC_CTX_get0_mac(ctx->ctx_init),
-                                    OSSL_MAC_NAME_CMAC)) {
+                       OSSL_MAC_NAME_HMAC)
+            && !EVP_MAC_is_a(EVP_MAC_CTX_get0_mac(ctx->ctx_init),
+                OSSL_MAC_NAME_CMAC)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MAC);
             return 0;
         }
@@ -400,7 +400,7 @@ static int kbkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         && OPENSSL_strncasecmp("counter", p->data, p->data_size) == 0) {
         ctx->mode = COUNTER;
     } else if (p != NULL
-               && OPENSSL_strncasecmp("feedback", p->data, p->data_size) == 0) {
+        && OPENSSL_strncasecmp("feedback", p->data, p->data_size) == 0) {
         ctx->mode = FEEDBACK;
     } else if (p != NULL) {
         ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MODE);
@@ -410,7 +410,8 @@ static int kbkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_KEY);
     if (p != NULL) {
         if (ossl_param_get1_octet_string(p, OSSL_KDF_PARAM_KEY,
-                                         &ctx->ki, &ctx->ki_len) == 0)
+                &ctx->ki, &ctx->ki_len)
+            == 0)
             return 0;
 #ifdef FIPS_MODULE
         if (!fips_kbkdf_key_check_passed(ctx))
@@ -419,17 +420,20 @@ static int kbkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     }
 
     if (ossl_param_get1_octet_string(params, OSSL_KDF_PARAM_SALT,
-                                     &ctx->label, &ctx->label_len) == 0)
-            return 0;
+            &ctx->label, &ctx->label_len)
+        == 0)
+        return 0;
 
     if (ossl_param_get1_concat_octet_string(params, OSSL_KDF_PARAM_INFO,
-                                            &ctx->context, &ctx->context_len,
-                                            0) == 0)
+            &ctx->context, &ctx->context_len,
+            0)
+        == 0)
         return 0;
 
     if (ossl_param_get1_octet_string(params, OSSL_KDF_PARAM_SEED,
-                                     &ctx->iv, &ctx->iv_len) == 0)
-            return 0;
+            &ctx->iv, &ctx->iv_len)
+        == 0)
+        return 0;
 
     p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_KBKDF_USE_L);
     if (p != NULL && !OSSL_PARAM_get_int(p, &ctx->use_l))
@@ -460,7 +464,7 @@ static int kbkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kbkdf_settable_ctx_params(ossl_unused void *ctx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_octet_string(OSSL_KDF_PARAM_INFO, NULL, 0),
@@ -476,7 +480,7 @@ static const OSSL_PARAM *kbkdf_settable_ctx_params(ossl_unused void *ctx,
         OSSL_PARAM_int(OSSL_KDF_PARAM_KBKDF_USE_SEPARATOR, NULL),
         OSSL_PARAM_int(OSSL_KDF_PARAM_KBKDF_R, NULL),
         OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_KEY_CHECK)
-        OSSL_PARAM_END,
+            OSSL_PARAM_END,
     };
     return known_settable_ctx_params;
 }
@@ -499,27 +503,27 @@ static int kbkdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kbkdf_gettable_ctx_params(ossl_unused void *ctx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
 
 const OSSL_DISPATCH ossl_kdf_kbkdf_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kbkdf_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))kbkdf_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kbkdf_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kbkdf_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kbkdf_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kbkdf_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))kbkdf_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kbkdf_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kbkdf_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kbkdf_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kbkdf_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kbkdf_set_ctx_params },
+        (void (*)(void))kbkdf_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kbkdf_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kbkdf_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kbkdf_get_ctx_params },
+        (void (*)(void))kbkdf_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kbkdf_get_ctx_params },
     OSSL_DISPATCH_END,
 };
diff --git a/providers/implementations/kdfs/krb5kdf.c b/providers/implementations/kdfs/krb5kdf.c
index 566afa74fece2..deeb643078679 100644
--- a/providers/implementations/kdfs/krb5kdf.c
+++ b/providers/implementations/kdfs/krb5kdf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-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
@@ -44,9 +44,9 @@ static OSSL_FUNC_kdf_gettable_ctx_params_fn krb5kdf_gettable_ctx_params;
 static OSSL_FUNC_kdf_get_ctx_params_fn krb5kdf_get_ctx_params;
 
 static int KRB5KDF(const EVP_CIPHER *cipher, ENGINE *engine,
-                   const unsigned char *key, size_t key_len,
-                   const unsigned char *constant, size_t constant_len,
-                   unsigned char *okey, size_t okey_len);
+    const unsigned char *key, size_t key_len,
+    const unsigned char *constant, size_t constant_len,
+    unsigned char *okey, size_t okey_len);
 
 typedef struct {
     void *provctx;
@@ -93,7 +93,7 @@ static void krb5kdf_reset(void *vctx)
 }
 
 static int krb5kdf_set_membuf(unsigned char **dst, size_t *dst_len,
-                              const OSSL_PARAM *p)
+    const OSSL_PARAM *p)
 {
     OPENSSL_clear_free(*dst, *dst_len);
     *dst = NULL;
@@ -109,21 +109,21 @@ static void *krb5kdf_dup(void *vctx)
     dest = krb5kdf_new(src->provctx);
     if (dest != NULL) {
         if (!ossl_prov_memdup(src->key, src->key_len,
-                              &dest->key, &dest->key_len)
-                || !ossl_prov_memdup(src->constant, src->constant_len,
-                                     &dest->constant , &dest->constant_len)
-                || !ossl_prov_cipher_copy(&dest->cipher, &src->cipher))
+                &dest->key, &dest->key_len)
+            || !ossl_prov_memdup(src->constant, src->constant_len,
+                &dest->constant, &dest->constant_len)
+            || !ossl_prov_cipher_copy(&dest->cipher, &src->cipher))
             goto err;
     }
     return dest;
 
- err:
+err:
     krb5kdf_free(dest);
     return NULL;
 }
 
 static int krb5kdf_derive(void *vctx, unsigned char *key, size_t keylen,
-                          const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KRB5KDF_CTX *ctx = (KRB5KDF_CTX *)vctx;
     const EVP_CIPHER *cipher;
@@ -147,8 +147,8 @@ static int krb5kdf_derive(void *vctx, unsigned char *key, size_t keylen,
     }
     engine = ossl_prov_cipher_engine(&ctx->cipher);
     return KRB5KDF(cipher, engine, ctx->key, ctx->key_len,
-                   ctx->constant, ctx->constant_len,
-                   key, keylen);
+        ctx->constant, ctx->constant_len,
+        key, keylen);
 }
 
 static int krb5kdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
@@ -176,7 +176,7 @@ static int krb5kdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *krb5kdf_settable_ctx_params(ossl_unused void *ctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@@ -207,7 +207,7 @@ static int krb5kdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *krb5kdf_gettable_ctx_params(ossl_unused void *ctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
@@ -217,19 +217,19 @@ static const OSSL_PARAM *krb5kdf_gettable_ctx_params(ossl_unused void *ctx,
 }
 
 const OSSL_DISPATCH ossl_kdf_krb5kdf_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))krb5kdf_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))krb5kdf_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))krb5kdf_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))krb5kdf_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))krb5kdf_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))krb5kdf_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))krb5kdf_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))krb5kdf_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))krb5kdf_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))krb5kdf_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))krb5kdf_settable_ctx_params },
+        (void (*)(void))krb5kdf_settable_ctx_params },
     { OSSL_FUNC_KDF_SET_CTX_PARAMS,
-      (void(*)(void))krb5kdf_set_ctx_params },
+        (void (*)(void))krb5kdf_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))krb5kdf_gettable_ctx_params },
+        (void (*)(void))krb5kdf_gettable_ctx_params },
     { OSSL_FUNC_KDF_GET_CTX_PARAMS,
-      (void(*)(void))krb5kdf_get_ctx_params },
+        (void (*)(void))krb5kdf_get_ctx_params },
     OSSL_DISPATCH_END
 };
 
@@ -254,8 +254,7 @@ static int fixup_des3_key(unsigned char *key)
     }
 
     /* fail if keys are such that triple des degrades to single des */
-    if (CRYPTO_memcmp(&key[0], &key[8], 8) == 0 ||
-        CRYPTO_memcmp(&key[8], &key[16], 8) == 0) {
+    if (CRYPTO_memcmp(&key[0], &key[8], 8) == 0 || CRYPTO_memcmp(&key[8], &key[16], 8) == 0) {
         return 0;
     }
 
@@ -284,7 +283,7 @@ static int fixup_des3_key(unsigned char *key)
  * finally add carry if any
  */
 static void n_fold(unsigned char *block, unsigned int blocksize,
-                   const unsigned char *constant, size_t constant_len)
+    const unsigned char *constant, size_t constant_len)
 {
     unsigned int tmp, gcd, remainder, lcm, carry;
     int b, l;
@@ -326,9 +325,9 @@ static void n_fold(unsigned char *block, unsigned int blocksize,
         /* rbyte % constant_len gives us the unrotated byte in the
          * constant buffer, get also the previous byte then
          * appropriately shift them to get the rotated byte we need */
-        tmp = (constant[(rbyte-1) % constant_len] << (8 - rshift)
-               | constant[rbyte % constant_len] >> rshift)
-              & 0xff;
+        tmp = (constant[(rbyte - 1) % constant_len] << (8 - rshift)
+                  | constant[rbyte % constant_len] >> rshift)
+            & 0xff;
         /* add with carry to any value placed by previous passes */
         tmp += carry + block[b];
         block[b] = tmp & 0xff;
@@ -345,12 +344,12 @@ static void n_fold(unsigned char *block, unsigned int blocksize,
 }
 
 static int cipher_init(EVP_CIPHER_CTX *ctx,
-                       const EVP_CIPHER *cipher, ENGINE *engine,
-                       const unsigned char *key, size_t key_len)
+    const EVP_CIPHER *cipher, ENGINE *engine,
+    const unsigned char *key, size_t key_len)
 {
     int klen, ret;
 
-    ret = EVP_EncryptInit_ex(ctx, cipher, engine, key, NULL);
+    ret = EVP_EncryptInit_ex(ctx, cipher, engine, NULL, NULL);
     if (!ret)
         goto out;
     /* set the key len for the odd variable key len cipher */
@@ -362,6 +361,9 @@ static int cipher_init(EVP_CIPHER_CTX *ctx,
             goto out;
         }
     }
+    ret = EVP_EncryptInit_ex(ctx, NULL, NULL, key, NULL);
+    if (!ret)
+        goto out;
     /* we never want padding, either the length requested is a multiple of
      * the cipher block size or we are passed a cipher that can cope with
      * partial blocks via techniques like cipher text stealing */
@@ -374,9 +376,9 @@ static int cipher_init(EVP_CIPHER_CTX *ctx,
 }
 
 static int KRB5KDF(const EVP_CIPHER *cipher, ENGINE *engine,
-                   const unsigned char *key, size_t key_len,
-                   const unsigned char *constant, size_t constant_len,
-                   unsigned char *okey, size_t okey_len)
+    const unsigned char *key, size_t key_len,
+    const unsigned char *constant, size_t constant_len,
+    unsigned char *okey, size_t okey_len)
 {
     EVP_CIPHER_CTX *ctx = NULL;
     unsigned char block[EVP_MAX_BLOCK_LENGTH * 2];
@@ -393,9 +395,8 @@ static int KRB5KDF(const EVP_CIPHER *cipher, ENGINE *engine,
 #ifndef OPENSSL_NO_DES
         /* special case for 3des, where the caller may be requesting
          * the random raw key, instead of the fixed up key  */
-        if (EVP_CIPHER_get_nid(cipher) == NID_des_ede3_cbc &&
-            key_len == 24 && okey_len == 21) {
-                des3_no_fixup = 1;
+        if (EVP_CIPHER_get_nid(cipher) == NID_des_ede3_cbc && key_len == 24 && okey_len == 21) {
+            des3_no_fixup = 1;
         } else {
 #endif
             ERR_raise(ERR_LIB_PROV, PROV_R_WRONG_OUTPUT_BUFFER_SIZE);
@@ -436,7 +437,7 @@ static int KRB5KDF(const EVP_CIPHER *cipher, ENGINE *engine,
         int olen;
 
         ret = EVP_EncryptUpdate(ctx, cipherblock, &olen,
-                                plainblock, blocksize);
+            plainblock, blocksize);
         if (!ret)
             goto out;
         cipherlen = olen;
@@ -491,4 +492,3 @@ static int KRB5KDF(const EVP_CIPHER *cipher, ENGINE *engine,
     OPENSSL_cleanse(block, EVP_MAX_BLOCK_LENGTH * 2);
     return ret;
 }
-
diff --git a/providers/implementations/kdfs/pbkdf1.c b/providers/implementations/kdfs/pbkdf1.c
index 1b7e4d8a2eab2..8328b1c6fa252 100644
--- a/providers/implementations/kdfs/pbkdf1.c
+++ b/providers/implementations/kdfs/pbkdf1.c
@@ -49,9 +49,9 @@ typedef struct {
  */
 
 static int kdf_pbkdf1_do_derive(const unsigned char *pass, size_t passlen,
-                                const unsigned char *salt, size_t saltlen,
-                                uint64_t iter, const EVP_MD *md_type,
-                                unsigned char *out, size_t n)
+    const unsigned char *salt, size_t saltlen,
+    uint64_t iter, const EVP_MD *md_type,
+    unsigned char *out, size_t n)
 {
     uint64_t i;
     int mdsize, ret = 0;
@@ -143,22 +143,22 @@ static void *kdf_pbkdf1_dup(void *vctx)
     dest = kdf_pbkdf1_new(src->provctx);
     if (dest != NULL) {
         if (!ossl_prov_memdup(src->salt, src->salt_len,
-                              &dest->salt, &dest->salt_len)
-                || !ossl_prov_memdup(src->pass, src->pass_len,
-                                     &dest->pass , &dest->pass_len)
-                || !ossl_prov_digest_copy(&dest->digest, &src->digest))
+                &dest->salt, &dest->salt_len)
+            || !ossl_prov_memdup(src->pass, src->pass_len,
+                &dest->pass, &dest->pass_len)
+            || !ossl_prov_digest_copy(&dest->digest, &src->digest))
             goto err;
         dest->iter = src->iter;
     }
     return dest;
 
- err:
+err:
     kdf_pbkdf1_free(dest);
     return NULL;
 }
 
 static int kdf_pbkdf1_set_membuf(unsigned char **buffer, size_t *buflen,
-                             const OSSL_PARAM *p)
+    const OSSL_PARAM *p)
 {
     OPENSSL_clear_free(*buffer, *buflen);
     *buffer = NULL;
@@ -175,7 +175,7 @@ static int kdf_pbkdf1_set_membuf(unsigned char **buffer, size_t *buflen,
 }
 
 static int kdf_pbkdf1_derive(void *vctx, unsigned char *key, size_t keylen,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_PBKDF1 *ctx = (KDF_PBKDF1 *)vctx;
     const EVP_MD *md;
@@ -195,7 +195,7 @@ static int kdf_pbkdf1_derive(void *vctx, unsigned char *key, size_t keylen,
 
     md = ossl_prov_digest_md(&ctx->digest);
     return kdf_pbkdf1_do_derive(ctx->pass, ctx->pass_len, ctx->salt, ctx->salt_len,
-                                ctx->iter, md, key, keylen);
+        ctx->iter, md, key, keylen);
 }
 
 static int kdf_pbkdf1_set_ctx_params(void *vctx, const OSSL_PARAM params[])
@@ -222,7 +222,7 @@ static int kdf_pbkdf1_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_pbkdf1_settable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@@ -245,7 +245,7 @@ static int kdf_pbkdf1_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_pbkdf1_gettable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
@@ -255,16 +255,16 @@ static const OSSL_PARAM *kdf_pbkdf1_gettable_ctx_params(ossl_unused void *ctx,
 }
 
 const OSSL_DISPATCH ossl_kdf_pbkdf1_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_pbkdf1_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))kdf_pbkdf1_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_pbkdf1_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_pbkdf1_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_pbkdf1_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_pbkdf1_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))kdf_pbkdf1_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_pbkdf1_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_pbkdf1_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_pbkdf1_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_pbkdf1_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kdf_pbkdf1_set_ctx_params },
+        (void (*)(void))kdf_pbkdf1_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kdf_pbkdf1_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_pbkdf1_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kdf_pbkdf1_get_ctx_params },
+        (void (*)(void))kdf_pbkdf1_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kdf_pbkdf1_get_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/kdfs/pbkdf2.c b/providers/implementations/kdfs/pbkdf2.c
index b38331406412d..581c8f87994b3 100644
--- a/providers/implementations/kdfs/pbkdf2.c
+++ b/providers/implementations/kdfs/pbkdf2.c
@@ -35,7 +35,7 @@
 #define KDF_PBKDF2_MIN_KEY_LEN_BITS 112
 #define KDF_PBKDF2_MAX_KEY_LEN_DIGEST_RATIO 0xFFFFFFFF
 #define KDF_PBKDF2_MIN_ITERATIONS 1000
-#define KDF_PBKDF2_MIN_SALT_LEN   (128 / 8)
+#define KDF_PBKDF2_MIN_SALT_LEN (128 / 8)
 
 static OSSL_FUNC_kdf_newctx_fn kdf_pbkdf2_new;
 static OSSL_FUNC_kdf_dupctx_fn kdf_pbkdf2_dup;
@@ -60,9 +60,9 @@ typedef struct {
 } KDF_PBKDF2;
 
 static int pbkdf2_derive(KDF_PBKDF2 *ctx, const char *pass, size_t passlen,
-                         const unsigned char *salt, int saltlen, uint64_t iter,
-                         const EVP_MD *digest, unsigned char *key,
-                         size_t keylen, int lower_bound_checks);
+    const unsigned char *salt, int saltlen, uint64_t iter,
+    const EVP_MD *digest, unsigned char *key,
+    size_t keylen, int lower_bound_checks);
 
 static void kdf_pbkdf2_init(KDF_PBKDF2 *ctx);
 
@@ -131,10 +131,10 @@ static void *kdf_pbkdf2_dup(void *vctx)
     dest = kdf_pbkdf2_new_no_init(src->provctx);
     if (dest != NULL) {
         if (!ossl_prov_memdup(src->salt, src->salt_len,
-                              &dest->salt, &dest->salt_len)
-                || !ossl_prov_memdup(src->pass, src->pass_len,
-                                     &dest->pass, &dest->pass_len)
-                || !ossl_prov_digest_copy(&dest->digest, &src->digest))
+                &dest->salt, &dest->salt_len)
+            || !ossl_prov_memdup(src->pass, src->pass_len,
+                &dest->pass, &dest->pass_len)
+            || !ossl_prov_digest_copy(&dest->digest, &src->digest))
             goto err;
         dest->iter = src->iter;
         dest->lower_bound_checks = src->lower_bound_checks;
@@ -142,7 +142,7 @@ static void *kdf_pbkdf2_dup(void *vctx)
     }
     return dest;
 
- err:
+err:
     kdf_pbkdf2_free(dest);
     return NULL;
 }
@@ -153,7 +153,7 @@ static void kdf_pbkdf2_init(KDF_PBKDF2 *ctx)
     OSSL_LIB_CTX *provctx = PROV_LIBCTX_OF(ctx->provctx);
 
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                                 SN_sha1, 0);
+        SN_sha1, 0);
     if (!ossl_prov_digest_load_from_params(&ctx->digest, params, provctx))
         /* This is an error, but there is no way to indicate such directly */
         ossl_prov_digest_reset(&ctx->digest);
@@ -162,7 +162,7 @@ static void kdf_pbkdf2_init(KDF_PBKDF2 *ctx)
 }
 
 static int pbkdf2_set_membuf(unsigned char **buffer, size_t *buflen,
-                             const OSSL_PARAM *p)
+    const OSSL_PARAM *p)
 {
     OPENSSL_clear_free(*buffer, *buflen);
     *buffer = NULL;
@@ -179,8 +179,8 @@ static int pbkdf2_set_membuf(unsigned char **buffer, size_t *buflen,
 }
 
 static int pbkdf2_lower_bound_check_passed(int saltlen, uint64_t iter,
-                                           size_t keylen, int *error,
-                                           const char **desc)
+    size_t keylen, int *error,
+    const char **desc)
 {
     if ((keylen * 8) < KDF_PBKDF2_MIN_KEY_LEN_BITS) {
         *error = PROV_R_KEY_SIZE_TOO_SMALL;
@@ -211,12 +211,12 @@ static int fips_lower_bound_check_passed(KDF_PBKDF2 *ctx, size_t keylen)
     int error = 0;
     const char *desc = NULL;
     int approved = pbkdf2_lower_bound_check_passed(ctx->salt_len, ctx->iter,
-                                                   keylen, &error, &desc);
+        keylen, &error, &desc);
 
     if (!approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0, libctx,
-                                         "PBKDF2", desc,
-                                         ossl_fips_config_pbkdf2_lower_bound_check)) {
+                "PBKDF2", desc,
+                ossl_fips_config_pbkdf2_lower_bound_check)) {
             ERR_raise(ERR_LIB_PROV, error);
             return 0;
         }
@@ -226,7 +226,7 @@ static int fips_lower_bound_check_passed(KDF_PBKDF2 *ctx, size_t keylen)
 #endif
 
 static int kdf_pbkdf2_derive(void *vctx, unsigned char *key, size_t keylen,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_PBKDF2 *ctx = (KDF_PBKDF2 *)vctx;
     const EVP_MD *md;
@@ -246,8 +246,8 @@ static int kdf_pbkdf2_derive(void *vctx, unsigned char *key, size_t keylen,
 
     md = ossl_prov_digest_md(&ctx->digest);
     return pbkdf2_derive(ctx, (char *)ctx->pass, ctx->pass_len,
-                         ctx->salt, ctx->salt_len, ctx->iter,
-                         md, key, keylen, ctx->lower_bound_checks);
+        ctx->salt, ctx->salt_len, ctx->iter,
+        md, key, keylen, ctx->lower_bound_checks);
 }
 
 static int kdf_pbkdf2_set_ctx_params(void *vctx, const OSSL_PARAM params[])
@@ -278,8 +278,8 @@ static int kdf_pbkdf2_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         ctx->lower_bound_checks = pkcs5 == 0;
 #ifdef FIPS_MODULE
         ossl_FIPS_IND_set_settable(OSSL_FIPS_IND_GET(ctx),
-                                   OSSL_FIPS_IND_SETTABLE0,
-                                   ctx->lower_bound_checks);
+            OSSL_FIPS_IND_SETTABLE0,
+            ctx->lower_bound_checks);
 #endif
     }
 
@@ -311,7 +311,7 @@ static int kdf_pbkdf2_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_pbkdf2_settable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@@ -333,34 +333,34 @@ static int kdf_pbkdf2_get_ctx_params(void *vctx, OSSL_PARAM params[])
         if (!OSSL_PARAM_set_size_t(p, SIZE_MAX))
             return 0;
 
-    if (!OSSL_FIPS_IND_GET_CTX_PARAM((KDF_PBKDF2 *) vctx, params))
+    if (!OSSL_FIPS_IND_GET_CTX_PARAM((KDF_PBKDF2 *)vctx, params))
         return 0;
     return 1;
 }
 
 static const OSSL_PARAM *kdf_pbkdf2_gettable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
 
 const OSSL_DISPATCH ossl_kdf_pbkdf2_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_pbkdf2_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))kdf_pbkdf2_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_pbkdf2_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_pbkdf2_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_pbkdf2_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_pbkdf2_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))kdf_pbkdf2_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_pbkdf2_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_pbkdf2_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_pbkdf2_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_pbkdf2_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kdf_pbkdf2_set_ctx_params },
+        (void (*)(void))kdf_pbkdf2_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kdf_pbkdf2_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_pbkdf2_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kdf_pbkdf2_get_ctx_params },
+        (void (*)(void))kdf_pbkdf2_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kdf_pbkdf2_get_ctx_params },
     OSSL_DISPATCH_END
 };
 
@@ -375,9 +375,9 @@ const OSSL_DISPATCH ossl_kdf_pbkdf2_functions[] = {
  *  - Randomly-generated portion of the salt shall be at least 128 bits.
  */
 static int pbkdf2_derive(KDF_PBKDF2 *ctx, const char *pass, size_t passlen,
-                         const unsigned char *salt, int saltlen, uint64_t iter,
-                         const EVP_MD *digest, unsigned char *key,
-                         size_t keylen, int lower_bound_checks)
+    const unsigned char *salt, int saltlen, uint64_t iter,
+    const EVP_MD *digest, unsigned char *key,
+    size_t keylen, int lower_bound_checks)
 {
     int ret = 0;
     unsigned char digtmp[EVP_MAX_MD_SIZE], *p, itmp[4];
@@ -406,7 +406,7 @@ static int pbkdf2_derive(KDF_PBKDF2 *ctx, const char *pass, size_t passlen,
     if (lower_bound_checks) {
         int error = 0;
         int passed = pbkdf2_lower_bound_check_passed(saltlen, iter, keylen,
-                                                     &error, NULL);
+            &error, NULL);
 
         if (!passed) {
             ERR_raise(ERR_LIB_PROV, error);
@@ -441,15 +441,15 @@ static int pbkdf2_derive(KDF_PBKDF2 *ctx, const char *pass, size_t passlen,
         if (!HMAC_CTX_copy(hctx, hctx_tpl))
             goto err;
         if (!HMAC_Update(hctx, salt, saltlen)
-                || !HMAC_Update(hctx, itmp, 4)
-                || !HMAC_Final(hctx, digtmp, NULL))
+            || !HMAC_Update(hctx, itmp, 4)
+            || !HMAC_Final(hctx, digtmp, NULL))
             goto err;
         memcpy(p, digtmp, cplen);
         for (j = 1; j < iter; j++) {
             if (!HMAC_CTX_copy(hctx, hctx_tpl))
                 goto err;
             if (!HMAC_Update(hctx, digtmp, mdlen)
-                    || !HMAC_Final(hctx, digtmp, NULL))
+                || !HMAC_Final(hctx, digtmp, NULL))
                 goto err;
             for (k = 0; k < cplen; k++)
                 p[k] ^= digtmp[k];
diff --git a/providers/implementations/kdfs/pkcs12kdf.c b/providers/implementations/kdfs/pkcs12kdf.c
index b4ca4fff475dc..fa4b808f4e116 100644
--- a/providers/implementations/kdfs/pkcs12kdf.c
+++ b/providers/implementations/kdfs/pkcs12kdf.c
@@ -47,9 +47,9 @@ typedef struct {
 /* PKCS12 compatible key/IV generation */
 
 static int pkcs12kdf_derive(const unsigned char *pass, size_t passlen,
-                            const unsigned char *salt, size_t saltlen,
-                            int id, uint64_t iter, const EVP_MD *md_type,
-                            unsigned char *out, size_t n)
+    const unsigned char *salt, size_t saltlen,
+    int id, uint64_t iter, const EVP_MD *md_type,
+    unsigned char *out, size_t n)
 {
     unsigned char *B = NULL, *D = NULL, *I = NULL, *p = NULL, *Ai = NULL;
     size_t Slen, Plen, Ilen;
@@ -125,7 +125,7 @@ static int pkcs12kdf_derive(const unsigned char *pass, size_t passlen,
         }
     }
 
- end:
+end:
     OPENSSL_free(Ai);
     OPENSSL_free(B);
     OPENSSL_free(D);
@@ -183,23 +183,23 @@ static void *kdf_pkcs12_dup(void *vctx)
     dest = kdf_pkcs12_new(src->provctx);
     if (dest != NULL) {
         if (!ossl_prov_memdup(src->salt, src->salt_len,
-                              &dest->salt, &dest->salt_len)
-                || !ossl_prov_memdup(src->pass, src->pass_len,
-                                     &dest->pass , &dest->pass_len)
-                || !ossl_prov_digest_copy(&dest->digest, &src->digest))
+                &dest->salt, &dest->salt_len)
+            || !ossl_prov_memdup(src->pass, src->pass_len,
+                &dest->pass, &dest->pass_len)
+            || !ossl_prov_digest_copy(&dest->digest, &src->digest))
             goto err;
         dest->iter = src->iter;
         dest->id = src->id;
     }
     return dest;
 
- err:
+err:
     kdf_pkcs12_free(dest);
     return NULL;
 }
 
 static int pkcs12kdf_set_membuf(unsigned char **buffer, size_t *buflen,
-                             const OSSL_PARAM *p)
+    const OSSL_PARAM *p)
 {
     OPENSSL_clear_free(*buffer, *buflen);
     *buffer = NULL;
@@ -216,7 +216,7 @@ static int pkcs12kdf_set_membuf(unsigned char **buffer, size_t *buflen,
 }
 
 static int kdf_pkcs12_derive(void *vctx, unsigned char *key, size_t keylen,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_PKCS12 *ctx = (KDF_PKCS12 *)vctx;
     const EVP_MD *md;
@@ -236,7 +236,7 @@ static int kdf_pkcs12_derive(void *vctx, unsigned char *key, size_t keylen,
 
     md = ossl_prov_digest_md(&ctx->digest);
     return pkcs12kdf_derive(ctx->pass, ctx->pass_len, ctx->salt, ctx->salt_len,
-                            ctx->id, ctx->iter, md, key, keylen);
+        ctx->id, ctx->iter, md, key, keylen);
 }
 
 static int kdf_pkcs12_set_ctx_params(void *vctx, const OSSL_PARAM params[])
@@ -270,7 +270,7 @@ static int kdf_pkcs12_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_pkcs12_settable_ctx_params(
-        ossl_unused void *ctx, ossl_unused void *provctx)
+    ossl_unused void *ctx, ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@@ -294,7 +294,7 @@ static int kdf_pkcs12_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_pkcs12_gettable_ctx_params(
-        ossl_unused void *ctx, ossl_unused void *provctx)
+    ossl_unused void *ctx, ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
@@ -304,16 +304,16 @@ static const OSSL_PARAM *kdf_pkcs12_gettable_ctx_params(
 }
 
 const OSSL_DISPATCH ossl_kdf_pkcs12_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_pkcs12_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))kdf_pkcs12_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_pkcs12_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_pkcs12_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_pkcs12_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_pkcs12_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))kdf_pkcs12_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_pkcs12_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_pkcs12_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_pkcs12_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_pkcs12_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kdf_pkcs12_set_ctx_params },
+        (void (*)(void))kdf_pkcs12_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kdf_pkcs12_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_pkcs12_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kdf_pkcs12_get_ctx_params },
+        (void (*)(void))kdf_pkcs12_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kdf_pkcs12_get_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/kdfs/pvkkdf.c b/providers/implementations/kdfs/pvkkdf.c
index f60092d771736..bc7f489fa2d3a 100644
--- a/providers/implementations/kdfs/pvkkdf.c
+++ b/providers/implementations/kdfs/pvkkdf.c
@@ -11,7 +11,7 @@
 #include <openssl/core_names.h>
 #include <openssl/proverr.h>
 #include <openssl/err.h>
-#include "internal/numbers.h"    /* SIZE_MAX */
+#include "internal/numbers.h" /* SIZE_MAX */
 #include "prov/provider_ctx.h"
 #include "prov/providercommon.h"
 #include "prov/implementations.h"
@@ -79,14 +79,14 @@ static void *kdf_pvk_dup(void *vctx)
     dest = kdf_pvk_new(src->provctx);
     if (dest != NULL)
         if (!ossl_prov_memdup(src->salt, src->salt_len,
-                              &dest->salt, &dest->salt_len)
-                || !ossl_prov_memdup(src->pass, src->pass_len,
-                                     &dest->pass , &dest->pass_len)
-                || !ossl_prov_digest_copy(&dest->digest, &src->digest))
+                &dest->salt, &dest->salt_len)
+            || !ossl_prov_memdup(src->pass, src->pass_len,
+                &dest->pass, &dest->pass_len)
+            || !ossl_prov_digest_copy(&dest->digest, &src->digest))
             goto err;
     return dest;
 
- err:
+err:
     kdf_pvk_free(dest);
     return NULL;
 }
@@ -107,14 +107,14 @@ static void kdf_pvk_init(KDF_PVK *ctx)
     OSSL_LIB_CTX *provctx = PROV_LIBCTX_OF(ctx->provctx);
 
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                                 SN_sha1, 0);
+        SN_sha1, 0);
     if (!ossl_prov_digest_load_from_params(&ctx->digest, params, provctx))
         /* This is an error, but there is no way to indicate such directly */
         ossl_prov_digest_reset(&ctx->digest);
 }
 
 static int pvk_set_membuf(unsigned char **buffer, size_t *buflen,
-                             const OSSL_PARAM *p)
+    const OSSL_PARAM *p)
 {
     OPENSSL_clear_free(*buffer, *buflen);
     *buffer = NULL;
@@ -131,7 +131,7 @@ static int pvk_set_membuf(unsigned char **buffer, size_t *buflen,
 }
 
 static int kdf_pvk_derive(void *vctx, unsigned char *key, size_t keylen,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_PVK *ctx = (KDF_PVK *)vctx;
     const EVP_MD *md;
@@ -168,10 +168,10 @@ static int kdf_pvk_derive(void *vctx, unsigned char *key, size_t keylen,
 
     mctx = EVP_MD_CTX_new();
     res = mctx != NULL
-          && EVP_DigestInit_ex(mctx, md, NULL)
-          && EVP_DigestUpdate(mctx, ctx->salt, ctx->salt_len)
-          && EVP_DigestUpdate(mctx, ctx->pass, ctx->pass_len)
-          && EVP_DigestFinal_ex(mctx, key, NULL);
+        && EVP_DigestInit_ex(mctx, md, NULL)
+        && EVP_DigestUpdate(mctx, ctx->salt, ctx->salt_len)
+        && EVP_DigestUpdate(mctx, ctx->pass, ctx->pass_len)
+        && EVP_DigestFinal_ex(mctx, key, NULL);
     EVP_MD_CTX_free(mctx);
     return res;
 }
@@ -201,7 +201,7 @@ static int kdf_pvk_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_pvk_settable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@@ -223,7 +223,7 @@ static int kdf_pvk_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_pvk_gettable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
@@ -233,16 +233,16 @@ static const OSSL_PARAM *kdf_pvk_gettable_ctx_params(ossl_unused void *ctx,
 }
 
 const OSSL_DISPATCH ossl_kdf_pvk_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_pvk_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))kdf_pvk_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_pvk_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_pvk_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_pvk_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_pvk_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))kdf_pvk_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_pvk_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_pvk_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_pvk_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_pvk_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kdf_pvk_set_ctx_params },
+        (void (*)(void))kdf_pvk_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kdf_pvk_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_pvk_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kdf_pvk_get_ctx_params },
+        (void (*)(void))kdf_pvk_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kdf_pvk_get_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/kdfs/scrypt.c b/providers/implementations/kdfs/scrypt.c
index e27b09eb99a48..37a2c6f1d38d3 100644
--- a/providers/implementations/kdfs/scrypt.c
+++ b/providers/implementations/kdfs/scrypt.c
@@ -35,10 +35,10 @@ static OSSL_FUNC_kdf_gettable_ctx_params_fn kdf_scrypt_gettable_ctx_params;
 static OSSL_FUNC_kdf_get_ctx_params_fn kdf_scrypt_get_ctx_params;
 
 static int scrypt_alg(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, EVP_MD *sha256,
-                      OSSL_LIB_CTX *libctx, 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, EVP_MD *sha256,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 typedef struct {
     OSSL_LIB_CTX *libctx;
@@ -113,9 +113,9 @@ static void *kdf_scrypt_dup(void *vctx)
                 goto err;
         }
         if (!ossl_prov_memdup(src->salt, src->salt_len,
-                              &dest->salt, &dest->salt_len)
-                || !ossl_prov_memdup(src->pass, src->pass_len,
-                                     &dest->pass , &dest->pass_len))
+                &dest->salt, &dest->salt_len)
+            || !ossl_prov_memdup(src->pass, src->pass_len,
+                &dest->pass, &dest->pass_len))
             goto err;
         dest->N = src->N;
         dest->r = src->r;
@@ -125,7 +125,7 @@ static void *kdf_scrypt_dup(void *vctx)
     }
     return dest;
 
- err:
+err:
     kdf_scrypt_free(dest);
     return NULL;
 }
@@ -143,7 +143,7 @@ static void kdf_scrypt_init(KDF_SCRYPT *ctx)
 }
 
 static int scrypt_set_membuf(unsigned char **buffer, size_t *buflen,
-                             const OSSL_PARAM *p)
+    const OSSL_PARAM *p)
 {
     OPENSSL_clear_free(*buffer, *buflen);
     *buffer = NULL;
@@ -183,7 +183,7 @@ static int set_property_query(KDF_SCRYPT *ctx, const char *propq)
 }
 
 static int kdf_scrypt_derive(void *vctx, unsigned char *key, size_t keylen,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_SCRYPT *ctx = (KDF_SCRYPT *)vctx;
 
@@ -204,9 +204,9 @@ static int kdf_scrypt_derive(void *vctx, unsigned char *key, size_t keylen,
         return 0;
 
     return scrypt_alg((char *)ctx->pass, ctx->pass_len, ctx->salt,
-                      ctx->salt_len, ctx->N, ctx->r, ctx->p,
-                      ctx->maxmem_bytes, key, keylen, ctx->sha256,
-                      ctx->libctx, ctx->propq);
+        ctx->salt_len, ctx->N, ctx->r, ctx->p,
+        ctx->maxmem_bytes, key, keylen, ctx->sha256,
+        ctx->libctx, ctx->propq);
 }
 
 static int is_power_of_two(uint64_t value)
@@ -272,7 +272,7 @@ static int kdf_scrypt_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_scrypt_settable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_octet_string(OSSL_KDF_PARAM_PASSWORD, NULL, 0),
@@ -297,7 +297,7 @@ static int kdf_scrypt_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_scrypt_gettable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
@@ -307,21 +307,21 @@ static const OSSL_PARAM *kdf_scrypt_gettable_ctx_params(ossl_unused void *ctx,
 }
 
 const OSSL_DISPATCH ossl_kdf_scrypt_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_scrypt_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))kdf_scrypt_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_scrypt_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_scrypt_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_scrypt_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_scrypt_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))kdf_scrypt_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_scrypt_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_scrypt_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_scrypt_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_scrypt_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kdf_scrypt_set_ctx_params },
+        (void (*)(void))kdf_scrypt_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kdf_scrypt_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_scrypt_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kdf_scrypt_get_ctx_params },
+        (void (*)(void))kdf_scrypt_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kdf_scrypt_get_ctx_params },
     OSSL_DISPATCH_END
 };
 
-#define R(a,b) (((a) << (b)) | ((a) >> (32 - (b))))
+#define R(a, b) (((a) << (b)) | ((a) >> (32 - (b))))
 static void salsa208_word_specification(uint32_t inout[16])
 {
     int i;
@@ -384,7 +384,7 @@ static void scryptBlockMix(uint32_t *B_, uint32_t *B, uint64_t r)
 }
 
 static void scryptROMix(unsigned char *B, uint64_t r, uint64_t N,
-                        uint32_t *X, uint32_t *T, uint32_t *V)
+    uint32_t *X, uint32_t *T, uint32_t *V)
 {
     unsigned char *pB;
     uint32_t *pV;
@@ -422,7 +422,7 @@ static void scryptROMix(unsigned char *B, uint64_t r, uint64_t N,
 }
 
 #ifndef SIZE_MAX
-# define SIZE_MAX    ((size_t)-1)
+#define SIZE_MAX ((size_t)-1)
 #endif
 
 /*
@@ -430,7 +430,7 @@ static void scryptROMix(unsigned char *B, uint64_t r, uint64_t N,
  * most (all?) platforms.
  */
 
-#define LOG2_UINT64_MAX         (sizeof(uint64_t) * 8 - 1)
+#define LOG2_UINT64_MAX (sizeof(uint64_t) * 8 - 1)
 
 /*
  * Maximum value of p * r:
@@ -439,13 +439,13 @@ static void scryptROMix(unsigned char *B, uint64_t r, uint64_t N,
  * p * r <= (2^30-1)
  */
 
-#define SCRYPT_PR_MAX   ((1 << 30) - 1)
+#define SCRYPT_PR_MAX ((1 << 30) - 1)
 
 static int scrypt_alg(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, EVP_MD *sha256,
-                      OSSL_LIB_CTX *libctx, 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, EVP_MD *sha256,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     int rv = 0;
     unsigned char *B;
@@ -528,17 +528,19 @@ static int scrypt_alg(const char *pass, size_t passlen,
     T = X + 32 * r;
     V = T + 32 * r;
     if (ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, salt, saltlen, 1, sha256,
-                                  (int)Blen, B, libctx, propq) == 0)
+            (int)Blen, B, libctx, propq)
+        == 0)
         goto err;
 
     for (i = 0; i < p; i++)
         scryptROMix(B + 128 * r * i, r, N, X, T, V);
 
     if (ossl_pkcs5_pbkdf2_hmac_ex(pass, passlen, B, (int)Blen, 1, sha256,
-                                  keylen, key, libctx, propq) == 0)
+            keylen, key, libctx, propq)
+        == 0)
         goto err;
     rv = 1;
- err:
+err:
     if (rv == 0)
         ERR_raise(ERR_LIB_EVP, EVP_R_PBKDF2_ERROR);
 
diff --git a/providers/implementations/kdfs/sshkdf.c b/providers/implementations/kdfs/sshkdf.c
index 4a9b141320bf1..af39ba9a4f5f7 100644
--- a/providers/implementations/kdfs/sshkdf.c
+++ b/providers/implementations/kdfs/sshkdf.c
@@ -35,10 +35,10 @@ static OSSL_FUNC_kdf_gettable_ctx_params_fn kdf_sshkdf_gettable_ctx_params;
 static OSSL_FUNC_kdf_get_ctx_params_fn kdf_sshkdf_get_ctx_params;
 
 static int SSHKDF(const EVP_MD *evp_md,
-                  const unsigned char *key, size_t key_len,
-                  const unsigned char *xcghash, size_t xcghash_len,
-                  const unsigned char *session_id, size_t session_id_len,
-                  char type, unsigned char *okey, size_t okey_len);
+    const unsigned char *key, size_t key_len,
+    const unsigned char *xcghash, size_t xcghash_len,
+    const unsigned char *session_id, size_t session_id_len,
+    char type, unsigned char *okey, size_t okey_len);
 
 typedef struct {
     void *provctx;
@@ -98,25 +98,25 @@ static void *kdf_sshkdf_dup(void *vctx)
     dest = kdf_sshkdf_new(src->provctx);
     if (dest != NULL) {
         if (!ossl_prov_memdup(src->key, src->key_len,
-                              &dest->key, &dest->key_len)
-                || !ossl_prov_memdup(src->xcghash, src->xcghash_len,
-                                     &dest->xcghash , &dest->xcghash_len)
-                || !ossl_prov_memdup(src->session_id, src->session_id_len,
-                                     &dest->session_id , &dest->session_id_len)
-                || !ossl_prov_digest_copy(&dest->digest, &src->digest))
+                &dest->key, &dest->key_len)
+            || !ossl_prov_memdup(src->xcghash, src->xcghash_len,
+                &dest->xcghash, &dest->xcghash_len)
+            || !ossl_prov_memdup(src->session_id, src->session_id_len,
+                &dest->session_id, &dest->session_id_len)
+            || !ossl_prov_digest_copy(&dest->digest, &src->digest))
             goto err;
         dest->type = src->type;
         OSSL_FIPS_IND_COPY(dest, src)
     }
     return dest;
 
- err:
+err:
     kdf_sshkdf_free(dest);
     return NULL;
 }
 
 static int sshkdf_set_membuf(unsigned char **dst, size_t *dst_len,
-                             const OSSL_PARAM *p)
+    const OSSL_PARAM *p)
 {
     OPENSSL_clear_free(*dst, *dst_len);
     *dst = NULL;
@@ -143,8 +143,8 @@ static int fips_digest_check_passed(KDF_SSHKDF *ctx, const EVP_MD *md)
 
     if (digest_unapproved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
-                                         libctx, "SSHKDF", "Digest",
-                                         ossl_fips_config_sshkdf_digest_check)) {
+                libctx, "SSHKDF", "Digest",
+                ossl_fips_config_sshkdf_digest_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED);
             return 0;
         }
@@ -159,8 +159,8 @@ static int fips_key_check_passed(KDF_SSHKDF *ctx)
 
     if (!key_approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE1,
-                                         libctx, "SSHKDF", "Key size",
-                                         ossl_fips_config_sshkdf_key_check)) {
+                libctx, "SSHKDF", "Key size",
+                ossl_fips_config_sshkdf_key_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
             return 0;
         }
@@ -170,7 +170,7 @@ static int fips_key_check_passed(KDF_SSHKDF *ctx)
 #endif
 
 static int kdf_sshkdf_derive(void *vctx, unsigned char *key, size_t keylen,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_SSHKDF *ctx = (KDF_SSHKDF *)vctx;
     const EVP_MD *md;
@@ -201,9 +201,9 @@ static int kdf_sshkdf_derive(void *vctx, unsigned char *key, size_t keylen,
     }
 
     return SSHKDF(md, ctx->key, ctx->key_len,
-                  ctx->xcghash, ctx->xcghash_len,
-                  ctx->session_id, ctx->session_id_len,
-                  ctx->type, key, keylen);
+        ctx->xcghash, ctx->xcghash_len,
+        ctx->session_id, ctx->session_id_len,
+        ctx->type, key, keylen);
 }
 
 static int kdf_sshkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
@@ -216,10 +216,10 @@ static int kdf_sshkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_KDF_PARAM_FIPS_DIGEST_CHECK))
+            OSSL_KDF_PARAM_FIPS_DIGEST_CHECK))
         return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE1, params,
-                                     OSSL_KDF_PARAM_FIPS_KEY_CHECK))
+            OSSL_KDF_PARAM_FIPS_KEY_CHECK))
         return 0;
 
     if (OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_DIGEST) != NULL) {
@@ -279,7 +279,7 @@ static int kdf_sshkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_sshkdf_settable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@@ -289,8 +289,8 @@ static const OSSL_PARAM *kdf_sshkdf_settable_ctx_params(ossl_unused void *ctx,
         OSSL_PARAM_octet_string(OSSL_KDF_PARAM_SSHKDF_SESSION_ID, NULL, 0),
         OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_SSHKDF_TYPE, NULL, 0),
         OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_DIGEST_CHECK)
-        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_KEY_CHECK)
-        OSSL_PARAM_END
+            OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_KEY_CHECK)
+                OSSL_PARAM_END
     };
     return known_settable_ctx_params;
 }
@@ -309,36 +309,36 @@ static int kdf_sshkdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_sshkdf_gettable_ctx_params(ossl_unused void *ctx,
-                                                        ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
 
 const OSSL_DISPATCH ossl_kdf_sshkdf_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_sshkdf_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))kdf_sshkdf_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_sshkdf_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_sshkdf_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_sshkdf_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_sshkdf_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))kdf_sshkdf_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_sshkdf_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_sshkdf_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_sshkdf_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_sshkdf_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kdf_sshkdf_set_ctx_params },
+        (void (*)(void))kdf_sshkdf_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kdf_sshkdf_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_sshkdf_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kdf_sshkdf_get_ctx_params },
+        (void (*)(void))kdf_sshkdf_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kdf_sshkdf_get_ctx_params },
     OSSL_DISPATCH_END
 };
 
 static int SSHKDF(const EVP_MD *evp_md,
-                  const unsigned char *key, size_t key_len,
-                  const unsigned char *xcghash, size_t xcghash_len,
-                  const unsigned char *session_id, size_t session_id_len,
-                  char type, unsigned char *okey, size_t okey_len)
+    const unsigned char *key, size_t key_len,
+    const unsigned char *xcghash, size_t xcghash_len,
+    const unsigned char *session_id, size_t session_id_len,
+    char type, unsigned char *okey, size_t okey_len)
 {
     EVP_MD_CTX *md = NULL;
     unsigned char digest[EVP_MAX_MD_SIZE];
diff --git a/providers/implementations/kdfs/sskdf.c b/providers/implementations/kdfs/sskdf.c
index 3c377db0058e4..f5a046d66591d 100644
--- a/providers/implementations/kdfs/sskdf.c
+++ b/providers/implementations/kdfs/sskdf.c
@@ -55,8 +55,8 @@
 
 typedef struct {
     void *provctx;
-    EVP_MAC_CTX *macctx;         /* H(x) = HMAC_hash OR H(x) = KMAC */
-    PROV_DIGEST digest;          /* H(x) = hash(x) */
+    EVP_MAC_CTX *macctx; /* H(x) = HMAC_hash OR H(x) = KMAC */
+    PROV_DIGEST digest; /* H(x) = hash(x) */
     unsigned char *secret;
     size_t secret_len;
     unsigned char *info;
@@ -68,7 +68,7 @@ typedef struct {
     OSSL_FIPS_IND_DECLARE
 } KDF_SSKDF;
 
-#define SSKDF_MAX_INLEN (1<<30)
+#define SSKDF_MAX_INLEN (1 << 30)
 #define SSKDF_KMAC128_DEFAULT_SALT_SIZE (168 - 4)
 #define SSKDF_KMAC256_DEFAULT_SALT_SIZE (136 - 4)
 
@@ -93,16 +93,16 @@ static OSSL_FUNC_kdf_get_ctx_params_fn x963kdf_get_ctx_params;
 /* Settable context parameters that are common across SSKDF and X963 KDF */
 #define SSKDF_COMMON_SETTABLES                                      \
     OSSL_PARAM_octet_string(OSSL_KDF_PARAM_SECRET, NULL, 0),        \
-    OSSL_PARAM_octet_string(OSSL_KDF_PARAM_KEY, NULL, 0),           \
-    OSSL_PARAM_octet_string(OSSL_KDF_PARAM_INFO, NULL, 0),          \
-    OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),     \
-    OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_DIGEST, NULL, 0),         \
-    OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_MAC, NULL, 0),            \
-    OSSL_PARAM_octet_string(OSSL_KDF_PARAM_SALT, NULL, 0),          \
-    OSSL_PARAM_size_t(OSSL_KDF_PARAM_MAC_SIZE, NULL)
+        OSSL_PARAM_octet_string(OSSL_KDF_PARAM_KEY, NULL, 0),       \
+        OSSL_PARAM_octet_string(OSSL_KDF_PARAM_INFO, NULL, 0),      \
+        OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0), \
+        OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_DIGEST, NULL, 0),     \
+        OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_MAC, NULL, 0),        \
+        OSSL_PARAM_octet_string(OSSL_KDF_PARAM_SALT, NULL, 0),      \
+        OSSL_PARAM_size_t(OSSL_KDF_PARAM_MAC_SIZE, NULL)
 
 /* Gettable context parameters that are common across SSKDF and X963 KDF */
-#define SSKDF_COMMON_GETTABLES                                          \
+#define SSKDF_COMMON_GETTABLES \
     OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL)
 
 /*
@@ -115,10 +115,10 @@ static OSSL_FUNC_kdf_get_ctx_params_fn x963kdf_get_ctx_params;
  *   result[i] = Hash(z || counter || info) for X9.63.
  */
 static int SSKDF_hash_kdm(const EVP_MD *kdf_md,
-                          const unsigned char *z, size_t z_len,
-                          const unsigned char *info, size_t info_len,
-                          unsigned int append_ctr,
-                          unsigned char *derived_key, size_t derived_key_len)
+    const unsigned char *z, size_t z_len,
+    const unsigned char *info, size_t info_len,
+    unsigned int append_ctr,
+    unsigned char *derived_key, size_t derived_key_len)
 {
     int ret = 0, hlen;
     size_t counter, out_len, len = derived_key_len;
@@ -128,8 +128,8 @@ static int SSKDF_hash_kdm(const EVP_MD *kdf_md,
     EVP_MD_CTX *ctx = NULL, *ctx_init = NULL;
 
     if (z_len > SSKDF_MAX_INLEN || info_len > SSKDF_MAX_INLEN
-            || derived_key_len > SSKDF_MAX_INLEN
-            || derived_key_len == 0)
+        || derived_key_len > SSKDF_MAX_INLEN
+        || derived_key_len == 0)
         return 0;
 
     hlen = EVP_MD_get_size(kdf_md);
@@ -180,8 +180,8 @@ static int SSKDF_hash_kdm(const EVP_MD *kdf_md,
 }
 
 static int kmac_init(EVP_MAC_CTX *ctx, const unsigned char *custom,
-                     size_t custom_len, size_t kmac_out_len,
-                     size_t derived_key_len, unsigned char **out)
+    size_t custom_len, size_t kmac_out_len,
+    size_t derived_key_len, unsigned char **out)
 {
     OSSL_PARAM params[2];
 
@@ -190,7 +190,7 @@ static int kmac_init(EVP_MAC_CTX *ctx, const unsigned char *custom,
         return 1;
 
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_CUSTOM,
-                                                  (void *)custom, custom_len);
+        (void *)custom, custom_len);
     params[1] = OSSL_PARAM_construct_end();
 
     if (!EVP_MAC_CTX_set_params(ctx, params))
@@ -201,15 +201,15 @@ static int kmac_init(EVP_MAC_CTX *ctx, const unsigned char *custom,
         kmac_out_len = derived_key_len;
     /* otherwise check the size is valid */
     else if (!(kmac_out_len == derived_key_len
-            || kmac_out_len == 20
-            || kmac_out_len == 28
-            || kmac_out_len == 32
-            || kmac_out_len == 48
-            || kmac_out_len == 64))
+                 || kmac_out_len == 20
+                 || kmac_out_len == 28
+                 || kmac_out_len == 32
+                 || kmac_out_len == 48
+                 || kmac_out_len == 64))
         return 0;
 
     params[0] = OSSL_PARAM_construct_size_t(OSSL_MAC_PARAM_SIZE,
-                                            &kmac_out_len);
+        &kmac_out_len);
 
     if (EVP_MAC_CTX_set_params(ctx, params) <= 0)
         return 0;
@@ -233,12 +233,12 @@ static int kmac_init(EVP_MAC_CTX *ctx, const unsigned char *custom,
  *     H(x) = KMAC#(salt, x, outbits, CustomString='KDF')
  */
 static int SSKDF_mac_kdm(EVP_MAC_CTX *ctx_init,
-                         const unsigned char *kmac_custom,
-                         size_t kmac_custom_len, size_t kmac_out_len,
-                         const unsigned char *salt, size_t salt_len,
-                         const unsigned char *z, size_t z_len,
-                         const unsigned char *info, size_t info_len,
-                         unsigned char *derived_key, size_t derived_key_len)
+    const unsigned char *kmac_custom,
+    size_t kmac_custom_len, size_t kmac_out_len,
+    const unsigned char *salt, size_t salt_len,
+    const unsigned char *z, size_t z_len,
+    const unsigned char *info, size_t info_len,
+    unsigned char *derived_key, size_t derived_key_len)
 {
     int ret = 0;
     size_t counter, out_len, len;
@@ -249,12 +249,12 @@ static int SSKDF_mac_kdm(EVP_MAC_CTX *ctx_init,
     unsigned char *mac = mac_buf, *kmac_buffer = NULL;
 
     if (z_len > SSKDF_MAX_INLEN || info_len > SSKDF_MAX_INLEN
-            || derived_key_len > SSKDF_MAX_INLEN
-            || derived_key_len == 0)
+        || derived_key_len > SSKDF_MAX_INLEN
+        || derived_key_len == 0)
         return 0;
 
     if (!kmac_init(ctx_init, kmac_custom, kmac_custom_len, kmac_out_len,
-                   derived_key_len, &kmac_buffer))
+            derived_key_len, &kmac_buffer))
         goto end;
     if (kmac_buffer != NULL)
         mac = kmac_buffer;
@@ -357,12 +357,12 @@ static void *sskdf_dup(void *vctx)
                 goto err;
         }
         if (!ossl_prov_memdup(src->info, src->info_len,
-                              &dest->info, &dest->info_len)
-                || !ossl_prov_memdup(src->salt, src->salt_len,
-                                     &dest->salt , &dest->salt_len)
-                || !ossl_prov_memdup(src->secret, src->secret_len,
-                                     &dest->secret, &dest->secret_len)
-                || !ossl_prov_digest_copy(&dest->digest, &src->digest))
+                &dest->info, &dest->info_len)
+            || !ossl_prov_memdup(src->salt, src->salt_len,
+                &dest->salt, &dest->salt_len)
+            || !ossl_prov_memdup(src->secret, src->secret_len,
+                &dest->secret, &dest->secret_len)
+            || !ossl_prov_digest_copy(&dest->digest, &src->digest))
             goto err;
         dest->out_len = src->out_len;
         dest->is_kmac = src->is_kmac;
@@ -370,7 +370,7 @@ static void *sskdf_dup(void *vctx)
     }
     return dest;
 
- err:
+err:
     sskdf_free(dest);
     return NULL;
 }
@@ -400,8 +400,8 @@ static int fips_sskdf_key_check_passed(KDF_SSKDF *ctx)
 
     if (!key_approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
-                                         libctx, "SSKDF", "Key size",
-                                         ossl_fips_config_sskdf_key_check)) {
+                libctx, "SSKDF", "Key size",
+                ossl_fips_config_sskdf_key_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
             return 0;
         }
@@ -411,7 +411,7 @@ static int fips_sskdf_key_check_passed(KDF_SSKDF *ctx)
 #endif
 
 static int sskdf_derive(void *vctx, unsigned char *key, size_t keylen,
-                        const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_SSKDF *ctx = (KDF_SSKDF *)vctx;
     const EVP_MD *md;
@@ -462,10 +462,10 @@ static int sskdf_derive(void *vctx, unsigned char *key, size_t keylen,
             ctx->salt_len = default_salt_len;
         }
         ret = SSKDF_mac_kdm(ctx->macctx,
-                            custom, custom_len, ctx->out_len,
-                            ctx->salt, ctx->salt_len,
-                            ctx->secret, ctx->secret_len,
-                            ctx->info, ctx->info_len, key, keylen);
+            custom, custom_len, ctx->out_len,
+            ctx->salt, ctx->salt_len,
+            ctx->secret, ctx->secret_len,
+            ctx->info, ctx->info_len, key, keylen);
         return ret;
     } else {
         /* H(x) = hash */
@@ -474,7 +474,7 @@ static int sskdf_derive(void *vctx, unsigned char *key, size_t keylen,
             return 0;
         }
         return SSKDF_hash_kdm(md, ctx->secret, ctx->secret_len,
-                              ctx->info, ctx->info_len, 0, key, keylen);
+            ctx->info, ctx->info_len, 0, key, keylen);
     }
 }
 
@@ -493,8 +493,8 @@ static int fips_x963kdf_digest_check_passed(KDF_SSKDF *ctx, const EVP_MD *md)
 
     if (digest_unapproved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
-                                         libctx, "X963KDF", "Digest",
-                                         ossl_fips_config_x963kdf_digest_check)) {
+                libctx, "X963KDF", "Digest",
+                ossl_fips_config_x963kdf_digest_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED);
             return 0;
         }
@@ -509,8 +509,8 @@ static int fips_x963kdf_key_check_passed(KDF_SSKDF *ctx)
 
     if (!key_approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE1,
-                                         libctx, "X963KDF", "Key size",
-                                         ossl_fips_config_x963kdf_key_check)) {
+                libctx, "X963KDF", "Key size",
+                ossl_fips_config_x963kdf_key_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
             return 0;
         }
@@ -520,7 +520,7 @@ static int fips_x963kdf_key_check_passed(KDF_SSKDF *ctx)
 #endif
 
 static int x963kdf_derive(void *vctx, unsigned char *key, size_t keylen,
-                          const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_SSKDF *ctx = (KDF_SSKDF *)vctx;
     const EVP_MD *md;
@@ -546,7 +546,7 @@ static int x963kdf_derive(void *vctx, unsigned char *key, size_t keylen,
     }
 
     return SSKDF_hash_kdm(md, ctx->secret, ctx->secret_len,
-                          ctx->info, ctx->info_len, 1, key, keylen);
+        ctx->info, ctx->info_len, 1, key, keylen);
 }
 
 static int sskdf_common_set_ctx_params(KDF_SSKDF *ctx, const OSSL_PARAM params[])
@@ -561,15 +561,15 @@ static int sskdf_common_set_ctx_params(KDF_SSKDF *ctx, const OSSL_PARAM params[]
         return 1;
 
     if (!ossl_prov_macctx_load_from_params(&ctx->macctx, params,
-                                           NULL, NULL, NULL, libctx))
+            NULL, NULL, NULL, libctx))
         return 0;
     if (ctx->macctx != NULL) {
-         if (EVP_MAC_is_a(EVP_MAC_CTX_get0_mac(ctx->macctx),
-                          OSSL_MAC_NAME_KMAC128)
-             || EVP_MAC_is_a(EVP_MAC_CTX_get0_mac(ctx->macctx),
-                             OSSL_MAC_NAME_KMAC256)) {
-             ctx->is_kmac = 1;
-         }
+        if (EVP_MAC_is_a(EVP_MAC_CTX_get0_mac(ctx->macctx),
+                OSSL_MAC_NAME_KMAC128)
+            || EVP_MAC_is_a(EVP_MAC_CTX_get0_mac(ctx->macctx),
+                OSSL_MAC_NAME_KMAC256)) {
+            ctx->is_kmac = 1;
+        }
     }
 
     if (OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_DIGEST) != NULL) {
@@ -584,20 +584,22 @@ static int sskdf_common_set_ctx_params(KDF_SSKDF *ctx, const OSSL_PARAM params[]
     }
 
     r = ossl_param_get1_octet_string(params, OSSL_KDF_PARAM_SECRET,
-                                     &ctx->secret, &ctx->secret_len);
+        &ctx->secret, &ctx->secret_len);
     if (r == -1)
         r = ossl_param_get1_octet_string(params, OSSL_KDF_PARAM_KEY,
-                                         &ctx->secret, &ctx->secret_len);
+            &ctx->secret, &ctx->secret_len);
     if (r == 0)
         return 0;
 
     if (ossl_param_get1_concat_octet_string(params, OSSL_KDF_PARAM_INFO,
-                                            &ctx->info, &ctx->info_len, 0) == 0)
+            &ctx->info, &ctx->info_len, 0)
+        == 0)
         return 0;
 
     if (ossl_param_get1_octet_string(params, OSSL_KDF_PARAM_SALT,
-                                     &ctx->salt, &ctx->salt_len) == 0)
-            return 0;
+            &ctx->salt, &ctx->salt_len)
+        == 0)
+        return 0;
 
     if ((p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_MAC_SIZE))
         != NULL) {
@@ -616,15 +618,14 @@ static int sskdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_KDF_PARAM_FIPS_KEY_CHECK))
+            OSSL_KDF_PARAM_FIPS_KEY_CHECK))
         return 0;
 
     if (!sskdf_common_set_ctx_params(ctx, params))
         return 0;
 
 #ifdef FIPS_MODULE
-    if ((OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_KEY) != NULL) ||
-        (OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_SECRET) != NULL))
+    if ((OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_KEY) != NULL) || (OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_SECRET) != NULL))
         if (!fips_sskdf_key_check_passed(ctx))
             return 0;
 #endif
@@ -633,12 +634,12 @@ static int sskdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *sskdf_settable_ctx_params(ossl_unused void *ctx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         SSKDF_COMMON_SETTABLES,
         OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_KEY_CHECK)
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_settable_ctx_params;
 }
@@ -675,12 +676,12 @@ static int sskdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *sskdf_gettable_ctx_params(ossl_unused void *ctx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         SSKDF_COMMON_GETTABLES,
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
@@ -693,10 +694,10 @@ static int x963kdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_KDF_PARAM_FIPS_DIGEST_CHECK))
+            OSSL_KDF_PARAM_FIPS_DIGEST_CHECK))
         return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE1, params,
-                                     OSSL_KDF_PARAM_FIPS_KEY_CHECK))
+            OSSL_KDF_PARAM_FIPS_KEY_CHECK))
         return 0;
 
     if (!sskdf_common_set_ctx_params(ctx, params))
@@ -710,8 +711,7 @@ static int x963kdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
             return 0;
     }
 
-    if ((OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_KEY) != NULL) ||
-        (OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_SECRET) != NULL))
+    if ((OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_KEY) != NULL) || (OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_SECRET) != NULL))
         if (!fips_x963kdf_key_check_passed(ctx))
             return 0;
 #endif
@@ -720,13 +720,13 @@ static int x963kdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *x963kdf_settable_ctx_params(ossl_unused void *ctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         SSKDF_COMMON_SETTABLES,
         OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_DIGEST_CHECK)
-        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_KEY_CHECK)
-        OSSL_PARAM_END
+            OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_KEY_CHECK)
+                OSSL_PARAM_END
     };
     return known_settable_ctx_params;
 }
@@ -745,42 +745,42 @@ static int x963kdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *x963kdf_gettable_ctx_params(ossl_unused void *ctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         SSKDF_COMMON_GETTABLES,
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
 
 const OSSL_DISPATCH ossl_kdf_sskdf_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))sskdf_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))sskdf_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))sskdf_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))sskdf_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))sskdf_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))sskdf_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))sskdf_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))sskdf_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))sskdf_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))sskdf_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))sskdf_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))sskdf_set_ctx_params },
+        (void (*)(void))sskdf_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))sskdf_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))sskdf_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))sskdf_get_ctx_params },
+        (void (*)(void))sskdf_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))sskdf_get_ctx_params },
     OSSL_DISPATCH_END
 };
 
 const OSSL_DISPATCH ossl_kdf_x963_kdf_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))sskdf_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))sskdf_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))sskdf_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))sskdf_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))x963kdf_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))sskdf_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))sskdf_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))sskdf_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))sskdf_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))x963kdf_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))x963kdf_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))x963kdf_set_ctx_params },
+        (void (*)(void))x963kdf_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))x963kdf_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))x963kdf_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))x963kdf_get_ctx_params },
+        (void (*)(void))x963kdf_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))x963kdf_get_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/kdfs/tls1_prf.c b/providers/implementations/kdfs/tls1_prf.c
index 4b6469c00d233..2716f716c98e6 100644
--- a/providers/implementations/kdfs/tls1_prf.c
+++ b/providers/implementations/kdfs/tls1_prf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -84,12 +84,12 @@ static OSSL_FUNC_kdf_gettable_ctx_params_fn kdf_tls1_prf_gettable_ctx_params;
 static OSSL_FUNC_kdf_get_ctx_params_fn kdf_tls1_prf_get_ctx_params;
 
 static int tls1_prf_alg(EVP_MAC_CTX *mdctx, EVP_MAC_CTX *sha1ctx,
-                        const unsigned char *sec, size_t slen,
-                        const unsigned char *seed, size_t seed_len,
-                        unsigned char *out, size_t olen);
+    const unsigned char *sec, size_t slen,
+    const unsigned char *seed, size_t seed_len,
+    unsigned char *out, size_t olen);
 
-#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
 
 /* TLS KDF kdf context structure */
 typedef struct {
@@ -155,21 +155,21 @@ static void *kdf_tls1_prf_dup(void *vctx)
     dest = kdf_tls1_prf_new(src->provctx);
     if (dest != NULL) {
         if (src->P_hash != NULL
-                    && (dest->P_hash = EVP_MAC_CTX_dup(src->P_hash)) == NULL)
+            && (dest->P_hash = EVP_MAC_CTX_dup(src->P_hash)) == NULL)
             goto err;
         if (src->P_sha1 != NULL
-                    && (dest->P_sha1 = EVP_MAC_CTX_dup(src->P_sha1)) == NULL)
+            && (dest->P_sha1 = EVP_MAC_CTX_dup(src->P_sha1)) == NULL)
             goto err;
         if (!ossl_prov_memdup(src->sec, src->seclen, &dest->sec, &dest->seclen))
             goto err;
         if (!ossl_prov_memdup(src->seed, src->seedlen, &dest->seed,
-                              &dest->seedlen))
+                &dest->seedlen))
             goto err;
         OSSL_FIPS_IND_COPY(dest, src)
     }
     return dest;
 
- err:
+err:
     kdf_tls1_prf_free(dest);
     return NULL;
 }
@@ -188,13 +188,14 @@ static int fips_ems_check_passed(TLS1_PRF *ctx)
      * as "extended master secret".
      */
     int ems_approved = (ctx->seedlen < TLS_MD_MASTER_SECRET_CONST_SIZE
-                       || memcmp(ctx->seed, TLS_MD_MASTER_SECRET_CONST,
-                                 TLS_MD_MASTER_SECRET_CONST_SIZE) != 0);
+        || memcmp(ctx->seed, TLS_MD_MASTER_SECRET_CONST,
+               TLS_MD_MASTER_SECRET_CONST_SIZE)
+            != 0);
 
     if (!ems_approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
-                                         libctx, "TLS_PRF", "EMS",
-                                         ossl_fips_config_tls1_prf_ems_check)) {
+                libctx, "TLS_PRF", "EMS",
+                ossl_fips_config_tls1_prf_ems_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_EMS_NOT_ENABLED);
             return 0;
         }
@@ -218,8 +219,8 @@ static int fips_digest_check_passed(TLS1_PRF *ctx, const EVP_MD *md)
 
     if (digest_unapproved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE1,
-                                         libctx, "TLS_PRF", "Digest",
-                                         ossl_fips_config_tls1_prf_digest_check)) {
+                libctx, "TLS_PRF", "Digest",
+                ossl_fips_config_tls1_prf_digest_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED);
             return 0;
         }
@@ -234,8 +235,8 @@ static int fips_key_check_passed(TLS1_PRF *ctx)
 
     if (!key_approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE2,
-                                         libctx, "TLS_PRF", "Key size",
-                                         ossl_fips_config_tls1_prf_key_check)) {
+                libctx, "TLS_PRF", "Key size",
+                ossl_fips_config_tls1_prf_key_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
             return 0;
         }
@@ -245,7 +246,7 @@ static int fips_key_check_passed(TLS1_PRF *ctx)
 #endif
 
 static int kdf_tls1_prf_derive(void *vctx, unsigned char *key, size_t keylen,
-                               const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     TLS1_PRF *ctx = (TLS1_PRF *)vctx;
 
@@ -275,9 +276,9 @@ static int kdf_tls1_prf_derive(void *vctx, unsigned char *key, size_t keylen,
 #endif
 
     return tls1_prf_alg(ctx->P_hash, ctx->P_sha1,
-                        ctx->sec, ctx->seclen,
-                        ctx->seed, ctx->seedlen,
-                        key, keylen);
+        ctx->sec, ctx->seclen,
+        ctx->seed, ctx->seedlen,
+        key, keylen);
 }
 
 static int kdf_tls1_prf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
@@ -290,13 +291,13 @@ static int kdf_tls1_prf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_KDF_PARAM_FIPS_EMS_CHECK))
+            OSSL_KDF_PARAM_FIPS_EMS_CHECK))
         return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE1, params,
-                                     OSSL_KDF_PARAM_FIPS_DIGEST_CHECK))
+            OSSL_KDF_PARAM_FIPS_DIGEST_CHECK))
         return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE2, params,
-                                     OSSL_KDF_PARAM_FIPS_KEY_CHECK))
+            OSSL_KDF_PARAM_FIPS_KEY_CHECK))
         return 0;
 
     if ((p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_DIGEST)) != NULL) {
@@ -305,17 +306,18 @@ static int kdf_tls1_prf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 
         if (OPENSSL_strcasecmp(p->data, SN_md5_sha1) == 0) {
             if (!ossl_prov_macctx_load_from_params(&ctx->P_hash, params,
-                                                   OSSL_MAC_NAME_HMAC,
-                                                   NULL, SN_md5, libctx)
+                    OSSL_MAC_NAME_HMAC,
+                    NULL, SN_md5, libctx)
                 || !ossl_prov_macctx_load_from_params(&ctx->P_sha1, params,
-                                                      OSSL_MAC_NAME_HMAC,
-                                                      NULL, SN_sha1, libctx))
+                    OSSL_MAC_NAME_HMAC,
+                    NULL, SN_sha1, libctx))
                 return 0;
         } else {
             EVP_MAC_CTX_free(ctx->P_sha1);
+            ctx->P_sha1 = NULL;
             if (!ossl_prov_macctx_load_from_params(&ctx->P_hash, params,
-                                                   OSSL_MAC_NAME_HMAC,
-                                                   NULL, NULL, libctx))
+                    OSSL_MAC_NAME_HMAC,
+                    NULL, NULL, libctx))
                 return 0;
         }
 
@@ -354,7 +356,7 @@ static int kdf_tls1_prf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     /* The seed fields concatenate, so process them all */
     if ((p = OSSL_PARAM_locate_const(params, OSSL_KDF_PARAM_SEED)) != NULL) {
         for (; p != NULL; p = OSSL_PARAM_locate_const(p + 1,
-                                                      OSSL_KDF_PARAM_SEED)) {
+                              OSSL_KDF_PARAM_SEED)) {
             if (p->data_size != 0 && p->data != NULL) {
                 const void *val = NULL;
                 size_t sz = 0;
@@ -384,7 +386,7 @@ static int kdf_tls1_prf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_tls1_prf_settable_ctx_params(
-        ossl_unused void *ctx, ossl_unused void *provctx)
+    ossl_unused void *ctx, ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@@ -392,9 +394,9 @@ static const OSSL_PARAM *kdf_tls1_prf_settable_ctx_params(
         OSSL_PARAM_octet_string(OSSL_KDF_PARAM_SECRET, NULL, 0),
         OSSL_PARAM_octet_string(OSSL_KDF_PARAM_SEED, NULL, 0),
         OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_EMS_CHECK)
-        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_DIGEST_CHECK)
-        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_KEY_CHECK)
-        OSSL_PARAM_END
+            OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_DIGEST_CHECK)
+                OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_KEY_CHECK)
+                    OSSL_PARAM_END
     };
     return known_settable_ctx_params;
 }
@@ -413,30 +415,30 @@ static int kdf_tls1_prf_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *kdf_tls1_prf_gettable_ctx_params(
-        ossl_unused void *ctx, ossl_unused void *provctx)
+    ossl_unused void *ctx, ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
 
 const OSSL_DISPATCH ossl_kdf_tls1_prf_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_tls1_prf_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))kdf_tls1_prf_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_tls1_prf_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_tls1_prf_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_tls1_prf_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_tls1_prf_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))kdf_tls1_prf_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_tls1_prf_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_tls1_prf_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_tls1_prf_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_tls1_prf_settable_ctx_params },
+        (void (*)(void))kdf_tls1_prf_settable_ctx_params },
     { OSSL_FUNC_KDF_SET_CTX_PARAMS,
-      (void(*)(void))kdf_tls1_prf_set_ctx_params },
+        (void (*)(void))kdf_tls1_prf_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))kdf_tls1_prf_gettable_ctx_params },
+        (void (*)(void))kdf_tls1_prf_gettable_ctx_params },
     { OSSL_FUNC_KDF_GET_CTX_PARAMS,
-      (void(*)(void))kdf_tls1_prf_get_ctx_params },
+        (void (*)(void))kdf_tls1_prf_get_ctx_params },
     OSSL_DISPATCH_END
 };
 
@@ -461,9 +463,9 @@ const OSSL_DISPATCH ossl_kdf_tls1_prf_functions[] = {
  *     A(i) = HMAC_<hash>(secret, A(i-1))
  */
 static int tls1_prf_P_hash(EVP_MAC_CTX *ctx_init,
-                           const unsigned char *sec, size_t sec_len,
-                           const unsigned char *seed, size_t seed_len,
-                           unsigned char *out, size_t olen)
+    const unsigned char *sec, size_t sec_len,
+    const unsigned char *seed, size_t seed_len,
+    unsigned char *out, size_t olen)
 {
     size_t chunk;
     EVP_MAC_CTX *ctx = NULL, *ctx_Ai = NULL;
@@ -519,7 +521,7 @@ static int tls1_prf_P_hash(EVP_MAC_CTX *ctx_init,
         olen -= chunk;
     }
     ret = 1;
- err:
+err:
     EVP_MAC_CTX_free(ctx);
     EVP_MAC_CTX_free(ctx_Ai);
     OPENSSL_cleanse(Ai, sizeof(Ai));
@@ -547,9 +549,9 @@ static int tls1_prf_P_hash(EVP_MAC_CTX *ctx_init,
  *   PRF(secret, label, seed) = P_<hash>(secret, label + seed)
  */
 static int tls1_prf_alg(EVP_MAC_CTX *mdctx, EVP_MAC_CTX *sha1ctx,
-                        const unsigned char *sec, size_t slen,
-                        const unsigned char *seed, size_t seed_len,
-                        unsigned char *out, size_t olen)
+    const unsigned char *sec, size_t slen,
+    const unsigned char *seed, size_t seed_len,
+    unsigned char *out, size_t olen)
 {
     if (sha1ctx != NULL) {
         /* TLS v1.0 and TLS v1.1 */
@@ -560,14 +562,14 @@ static int tls1_prf_alg(EVP_MAC_CTX *mdctx, EVP_MAC_CTX *sha1ctx,
         size_t L_S2 = L_S1;
 
         if (!tls1_prf_P_hash(mdctx, sec, L_S1,
-                             seed, seed_len, out, olen))
+                seed, seed_len, out, olen))
             return 0;
 
         if ((tmp = OPENSSL_malloc(olen)) == NULL)
             return 0;
 
         if (!tls1_prf_P_hash(sha1ctx, sec + slen - L_S2, L_S2,
-                             seed, seed_len, tmp, olen)) {
+                seed, seed_len, tmp, olen)) {
             OPENSSL_clear_free(tmp, olen);
             return 0;
         }
diff --git a/providers/implementations/kdfs/x942kdf.c b/providers/implementations/kdfs/x942kdf.c
index 63164d8b8fbe8..d173887ae3579 100644
--- a/providers/implementations/kdfs/x942kdf.c
+++ b/providers/implementations/kdfs/x942kdf.c
@@ -66,19 +66,19 @@ static const struct {
     size_t keklen; /* size in bytes */
 } kek_algs[] = {
     { "AES-128-WRAP", ossl_der_oid_id_aes128_wrap, DER_OID_SZ_id_aes128_wrap,
-      16 },
+        16 },
     { "AES-192-WRAP", ossl_der_oid_id_aes192_wrap, DER_OID_SZ_id_aes192_wrap,
-      24 },
+        24 },
     { "AES-256-WRAP", ossl_der_oid_id_aes256_wrap, DER_OID_SZ_id_aes256_wrap,
-      32 },
+        32 },
 #ifndef FIPS_MODULE
     { "DES3-WRAP", ossl_der_oid_id_alg_CMS3DESwrap,
-      DER_OID_SZ_id_alg_CMS3DESwrap, 24 },
+        DER_OID_SZ_id_alg_CMS3DESwrap, 24 },
 #endif
 };
 
 static int find_alg_id(OSSL_LIB_CTX *libctx, const char *algname,
-                       const char *propq, size_t *id)
+    const char *propq, size_t *id)
 {
     int ret = 1;
     size_t i;
@@ -101,43 +101,42 @@ static int find_alg_id(OSSL_LIB_CTX *libctx, const char *algname,
 }
 
 static int DER_w_keyinfo(WPACKET *pkt,
-                         const unsigned char *der_oid, size_t der_oidlen,
-                         unsigned char **pcounter)
+    const unsigned char *der_oid, size_t der_oidlen,
+    unsigned char **pcounter)
 {
     return ossl_DER_w_begin_sequence(pkt, -1)
-           /* Store the initial value of 1 into the counter */
-           && ossl_DER_w_octet_string_uint32(pkt, -1, 1)
-           /* Remember where we stored the counter in the buffer */
-           && (pcounter == NULL
-               || (*pcounter = WPACKET_get_curr(pkt)) != NULL)
-           && ossl_DER_w_precompiled(pkt, -1, der_oid, der_oidlen)
-           && ossl_DER_w_end_sequence(pkt, -1);
+        /* Store the initial value of 1 into the counter */
+        && ossl_DER_w_octet_string_uint32(pkt, -1, 1)
+        /* Remember where we stored the counter in the buffer */
+        && (pcounter == NULL
+            || (*pcounter = WPACKET_get_curr(pkt)) != NULL)
+        && ossl_DER_w_precompiled(pkt, -1, der_oid, der_oidlen)
+        && ossl_DER_w_end_sequence(pkt, -1);
 }
 
 static int der_encode_sharedinfo(WPACKET *pkt, unsigned char *buf, size_t buflen,
-                                 const unsigned char *der_oid, size_t der_oidlen,
-                                 const unsigned char *acvp, size_t acvplen,
-                                 const unsigned char *partyu, size_t partyulen,
-                                 const unsigned char *partyv, size_t partyvlen,
-                                 const unsigned char *supp_pub, size_t supp_publen,
-                                 const unsigned char *supp_priv, size_t supp_privlen,
-                                 uint32_t keylen_bits, unsigned char **pcounter)
+    const unsigned char *der_oid, size_t der_oidlen,
+    const unsigned char *acvp, size_t acvplen,
+    const unsigned char *partyu, size_t partyulen,
+    const unsigned char *partyv, size_t partyvlen,
+    const unsigned char *supp_pub, size_t supp_publen,
+    const unsigned char *supp_priv, size_t supp_privlen,
+    uint32_t keylen_bits, unsigned char **pcounter)
 {
-    return (buf != NULL ? WPACKET_init_der(pkt, buf, buflen) :
-                          WPACKET_init_null_der(pkt))
-           && ossl_DER_w_begin_sequence(pkt, -1)
-           && (supp_priv == NULL
-               || ossl_DER_w_octet_string(pkt, 3, supp_priv, supp_privlen))
-           && (supp_pub == NULL
-               || ossl_DER_w_octet_string(pkt, 2, supp_pub, supp_publen))
-           && (keylen_bits == 0
-               || ossl_DER_w_octet_string_uint32(pkt, 2, keylen_bits))
-           && (partyv == NULL || ossl_DER_w_octet_string(pkt, 1, partyv, partyvlen))
-           && (partyu == NULL || ossl_DER_w_octet_string(pkt, 0, partyu, partyulen))
-           && (acvp == NULL || ossl_DER_w_precompiled(pkt, -1, acvp, acvplen))
-           && DER_w_keyinfo(pkt, der_oid, der_oidlen, pcounter)
-           && ossl_DER_w_end_sequence(pkt, -1)
-           && WPACKET_finish(pkt);
+    return (buf != NULL ? WPACKET_init_der(pkt, buf, buflen) : WPACKET_init_null_der(pkt))
+        && ossl_DER_w_begin_sequence(pkt, -1)
+        && (supp_priv == NULL
+            || ossl_DER_w_octet_string(pkt, 3, supp_priv, supp_privlen))
+        && (supp_pub == NULL
+            || ossl_DER_w_octet_string(pkt, 2, supp_pub, supp_publen))
+        && (keylen_bits == 0
+            || ossl_DER_w_octet_string_uint32(pkt, 2, keylen_bits))
+        && (partyv == NULL || ossl_DER_w_octet_string(pkt, 1, partyv, partyvlen))
+        && (partyu == NULL || ossl_DER_w_octet_string(pkt, 0, partyu, partyulen))
+        && (acvp == NULL || ossl_DER_w_precompiled(pkt, -1, acvp, acvplen))
+        && DER_w_keyinfo(pkt, der_oid, der_oidlen, pcounter)
+        && ossl_DER_w_end_sequence(pkt, -1)
+        && WPACKET_finish(pkt);
 }
 
 /*
@@ -199,14 +198,14 @@ static int der_encode_sharedinfo(WPACKET *pkt, unsigned char *buf, size_t buflen
  */
 static int
 x942_encode_otherinfo(size_t keylen,
-                      const unsigned char *cek_oid, size_t cek_oid_len,
-                      const unsigned char *acvp, size_t acvp_len,
-                      const unsigned char *partyu, size_t partyu_len,
-                      const unsigned char *partyv, size_t partyv_len,
-                      const unsigned char *supp_pub, size_t supp_pub_len,
-                      const unsigned char *supp_priv, size_t supp_priv_len,
-                      unsigned char **der, size_t *der_len,
-                      unsigned char **out_ctr)
+    const unsigned char *cek_oid, size_t cek_oid_len,
+    const unsigned char *acvp, size_t acvp_len,
+    const unsigned char *partyu, size_t partyu_len,
+    const unsigned char *partyv, size_t partyv_len,
+    const unsigned char *supp_pub, size_t supp_pub_len,
+    const unsigned char *supp_priv, size_t supp_priv_len,
+    unsigned char **der, size_t *der_len,
+    unsigned char **out_ctr)
 {
     int ret = 0;
     unsigned char *pcounter = NULL, *der_buf = NULL;
@@ -221,10 +220,10 @@ x942_encode_otherinfo(size_t keylen,
 
     /* Calculate the size of the buffer */
     if (!der_encode_sharedinfo(&pkt, NULL, 0, cek_oid, cek_oid_len,
-                               acvp, acvp_len,
-                               partyu, partyu_len, partyv, partyv_len,
-                               supp_pub, supp_pub_len, supp_priv, supp_priv_len,
-                               keylen_bits, NULL)
+            acvp, acvp_len,
+            partyu, partyu_len, partyv, partyv_len,
+            supp_pub, supp_pub_len, supp_priv, supp_priv_len,
+            keylen_bits, NULL)
         || !WPACKET_get_total_written(&pkt, &der_buflen))
         goto err;
     WPACKET_cleanup(&pkt);
@@ -234,10 +233,10 @@ x942_encode_otherinfo(size_t keylen,
         goto err;
     /* Encode into the buffer */
     if (!der_encode_sharedinfo(&pkt, der_buf, der_buflen, cek_oid, cek_oid_len,
-                               acvp, acvp_len,
-                               partyu, partyu_len, partyv, partyv_len,
-                               supp_pub, supp_pub_len, supp_priv, supp_priv_len,
-                               keylen_bits, &pcounter))
+            acvp, acvp_len,
+            partyu, partyu_len, partyv, partyv_len,
+            supp_pub, supp_pub_len, supp_priv, supp_priv_len,
+            keylen_bits, &pcounter))
         goto err;
     /*
      * Since we allocated the exact size required, the buffer should point to the
@@ -266,10 +265,10 @@ x942_encode_otherinfo(size_t keylen,
 }
 
 static int x942kdf_hash_kdm(const EVP_MD *kdf_md,
-                            const unsigned char *z, size_t z_len,
-                            const unsigned char *other, size_t other_len,
-                            unsigned char *ctr,
-                            unsigned char *derived_key, size_t derived_key_len)
+    const unsigned char *z, size_t z_len,
+    const unsigned char *other, size_t other_len,
+    unsigned char *ctr,
+    unsigned char *derived_key, size_t derived_key_len)
 {
     int ret = 0, hlen;
     size_t counter, out_len, len = derived_key_len;
@@ -383,20 +382,20 @@ static void *x942kdf_dup(void *vctx)
     dest = x942kdf_new(src->provctx);
     if (dest != NULL) {
         if (!ossl_prov_memdup(src->secret, src->secret_len,
-                              &dest->secret , &dest->secret_len)
-                || !ossl_prov_memdup(src->acvpinfo, src->acvpinfo_len,
-                                     &dest->acvpinfo , &dest->acvpinfo_len)
-                || !ossl_prov_memdup(src->partyuinfo, src->partyuinfo_len,
-                                     &dest->partyuinfo , &dest->partyuinfo_len)
-                || !ossl_prov_memdup(src->partyvinfo, src->partyvinfo_len,
-                                     &dest->partyvinfo , &dest->partyvinfo_len)
-                || !ossl_prov_memdup(src->supp_pubinfo, src->supp_pubinfo_len,
-                                     &dest->supp_pubinfo,
-                                     &dest->supp_pubinfo_len)
-                || !ossl_prov_memdup(src->supp_privinfo, src->supp_privinfo_len,
-                                     &dest->supp_privinfo,
-                                     &dest->supp_privinfo_len)
-                || !ossl_prov_digest_copy(&dest->digest, &src->digest))
+                &dest->secret, &dest->secret_len)
+            || !ossl_prov_memdup(src->acvpinfo, src->acvpinfo_len,
+                &dest->acvpinfo, &dest->acvpinfo_len)
+            || !ossl_prov_memdup(src->partyuinfo, src->partyuinfo_len,
+                &dest->partyuinfo, &dest->partyuinfo_len)
+            || !ossl_prov_memdup(src->partyvinfo, src->partyvinfo_len,
+                &dest->partyvinfo, &dest->partyvinfo_len)
+            || !ossl_prov_memdup(src->supp_pubinfo, src->supp_pubinfo_len,
+                &dest->supp_pubinfo,
+                &dest->supp_pubinfo_len)
+            || !ossl_prov_memdup(src->supp_privinfo, src->supp_privinfo_len,
+                &dest->supp_privinfo,
+                &dest->supp_privinfo_len)
+            || !ossl_prov_digest_copy(&dest->digest, &src->digest))
             goto err;
         dest->cek_oid = src->cek_oid;
         dest->cek_oid_len = src->cek_oid_len;
@@ -406,13 +405,13 @@ static void *x942kdf_dup(void *vctx)
     }
     return dest;
 
- err:
+err:
     x942kdf_free(dest);
     return NULL;
 }
 
 static int x942kdf_set_buffer(unsigned char **out, size_t *out_len,
-                              const OSSL_PARAM *p)
+    const OSSL_PARAM *p)
 {
     if (p->data_size == 0 || p->data == NULL)
         return 1;
@@ -443,8 +442,8 @@ static int fips_x942kdf_key_check_passed(KDF_X942 *ctx)
 
     if (!key_approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
-                                         libctx, "X942KDF", "Key size",
-                                         ossl_fips_config_x942kdf_key_check)) {
+                libctx, "X942KDF", "Key size",
+                ossl_fips_config_x942kdf_key_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
             return 0;
         }
@@ -454,7 +453,7 @@ static int fips_x942kdf_key_check_passed(KDF_X942 *ctx)
 #endif
 
 static int x942kdf_derive(void *vctx, unsigned char *key, size_t keylen,
-                          const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     KDF_X942 *ctx = (KDF_X942 *)vctx;
     const EVP_MD *md;
@@ -509,18 +508,18 @@ static int x942kdf_derive(void *vctx, unsigned char *key, size_t keylen,
     }
     /* generate the otherinfo der */
     if (!x942_encode_otherinfo(ctx->use_keybits ? ctx->dkm_len : 0,
-                               ctx->cek_oid, ctx->cek_oid_len,
-                               ctx->acvpinfo, ctx->acvpinfo_len,
-                               ctx->partyuinfo, ctx->partyuinfo_len,
-                               ctx->partyvinfo, ctx->partyvinfo_len,
-                               ctx->supp_pubinfo, ctx->supp_pubinfo_len,
-                               ctx->supp_privinfo, ctx->supp_privinfo_len,
-                               &der, &der_len, &ctr)) {
+            ctx->cek_oid, ctx->cek_oid_len,
+            ctx->acvpinfo, ctx->acvpinfo_len,
+            ctx->partyuinfo, ctx->partyuinfo_len,
+            ctx->partyvinfo, ctx->partyvinfo_len,
+            ctx->supp_pubinfo, ctx->supp_pubinfo_len,
+            ctx->supp_privinfo, ctx->supp_privinfo_len,
+            &der, &der_len, &ctr)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_BAD_ENCODING);
         return 0;
     }
     ret = x942kdf_hash_kdm(md, ctx->secret, ctx->secret_len,
-                           der, der_len, ctr, key, keylen);
+        der, der_len, ctr, key, keylen);
     OPENSSL_free(der);
     return ret;
 }
@@ -538,7 +537,7 @@ static int x942kdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_KDF_PARAM_FIPS_KEY_CHECK))
+            OSSL_KDF_PARAM_FIPS_KEY_CHECK))
         return 0;
 
     if (OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_DIGEST) != NULL) {
@@ -617,7 +616,7 @@ static int x942kdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *x942kdf_settable_ctx_params(ossl_unused void *ctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_PROPERTIES, NULL, 0),
@@ -633,7 +632,7 @@ static const OSSL_PARAM *x942kdf_settable_ctx_params(ossl_unused void *ctx,
         OSSL_PARAM_int(OSSL_KDF_PARAM_X942_USE_KEYBITS, NULL),
         OSSL_PARAM_utf8_string(OSSL_KDF_PARAM_CEK_ALG, NULL, 0),
         OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KDF_PARAM_FIPS_KEY_CHECK)
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_settable_ctx_params;
 }
@@ -653,27 +652,27 @@ static int x942kdf_get_ctx_params(void *vctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *x942kdf_gettable_ctx_params(ossl_unused void *ctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL),
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
 
 const OSSL_DISPATCH ossl_kdf_x942_kdf_functions[] = {
-    { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))x942kdf_new },
-    { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))x942kdf_dup },
-    { OSSL_FUNC_KDF_FREECTX, (void(*)(void))x942kdf_free },
-    { OSSL_FUNC_KDF_RESET, (void(*)(void))x942kdf_reset },
-    { OSSL_FUNC_KDF_DERIVE, (void(*)(void))x942kdf_derive },
+    { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))x942kdf_new },
+    { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))x942kdf_dup },
+    { OSSL_FUNC_KDF_FREECTX, (void (*)(void))x942kdf_free },
+    { OSSL_FUNC_KDF_RESET, (void (*)(void))x942kdf_reset },
+    { OSSL_FUNC_KDF_DERIVE, (void (*)(void))x942kdf_derive },
     { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS,
-      (void(*)(void))x942kdf_settable_ctx_params },
-    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))x942kdf_set_ctx_params },
+        (void (*)(void))x942kdf_settable_ctx_params },
+    { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))x942kdf_set_ctx_params },
     { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS,
-      (void(*)(void))x942kdf_gettable_ctx_params },
-    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))x942kdf_get_ctx_params },
+        (void (*)(void))x942kdf_gettable_ctx_params },
+    { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))x942kdf_get_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/kem/ec_kem.c b/providers/implementations/kem/ec_kem.c
index 975f41144ad00..3573474cc9ae5 100644
--- a/providers/implementations/kem/ec_kem.c
+++ b/providers/implementations/kem/ec_kem.c
@@ -87,8 +87,8 @@ static int eckey_check(const EC_KEY *ec, int requires_privatekey)
         rem = BN_new();
 
         if (order != NULL && rem != NULL && bnctx != NULL) {
-             rv = BN_mod(rem, priv, order, bnctx)
-                  && !BN_is_zero(rem);
+            rv = BN_mod(rem, priv, order, bnctx)
+                && !BN_is_zero(rem);
         }
     }
     BN_free(rem);
@@ -156,7 +156,7 @@ static int sender_authkey_set(PROV_EC_CTX *ctx, EC_KEY *ec)
  * Returns: The created public EC key, or NULL if there is an error.
  */
 static EC_KEY *eckey_frompub(EC_KEY *in,
-                             const unsigned char *pubbuf, size_t pubbuflen)
+    const unsigned char *pubbuf, size_t pubbuflen)
 {
     EC_KEY *key;
 
@@ -178,7 +178,7 @@ static EC_KEY *eckey_frompub(EC_KEY *in,
  * Returns: 1 if successful or 0 otherwise.
  */
 static int ecpubkey_todata(const EC_KEY *ec, unsigned char *out, size_t *outlen,
-                           size_t maxoutlen)
+    size_t maxoutlen)
 {
     const EC_POINT *pub;
     const EC_GROUP *group;
@@ -186,13 +186,13 @@ static int ecpubkey_todata(const EC_KEY *ec, unsigned char *out, size_t *outlen,
     group = EC_KEY_get0_group(ec);
     pub = EC_KEY_get0_public_key(ec);
     *outlen = EC_POINT_point2oct(group, pub, POINT_CONVERSION_UNCOMPRESSED,
-                                 out, maxoutlen, NULL);
+        out, maxoutlen, NULL);
     return *outlen != 0;
 }
 
 static void *eckem_newctx(void *provctx)
 {
-    PROV_EC_CTX *ctx =  OPENSSL_zalloc(sizeof(PROV_EC_CTX));
+    PROV_EC_CTX *ctx = OPENSSL_zalloc(sizeof(PROV_EC_CTX));
 
     if (ctx == NULL)
         return NULL;
@@ -224,8 +224,8 @@ static int ossl_ec_match_params(const EC_KEY *key1, const EC_KEY *key2)
         return 0;
 
     ret = group1 != NULL
-          && group2 != NULL
-          && EC_GROUP_cmp(group1, group2, ctx) == 0;
+        && group2 != NULL
+        && EC_GROUP_cmp(group1, group2, ctx) == 0;
     if (!ret)
         ERR_raise(ERR_LIB_PROV, PROV_R_MISMATCHING_DOMAIN_PARAMETERS);
     BN_CTX_free(ctx);
@@ -233,7 +233,7 @@ static int ossl_ec_match_params(const EC_KEY *key1, const EC_KEY *key2)
 }
 
 static int eckem_init(void *vctx, int operation, void *vec, void *vauth,
-                      const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     int rv;
     PROV_EC_CTX *ctx = (PROV_EC_CTX *)vctx;
@@ -253,7 +253,7 @@ static int eckem_init(void *vctx, int operation, void *vec, void *vauth,
         if (!ossl_ec_match_params(ec, auth)
             || !eckey_check(auth, operation == EVP_PKEY_OP_ENCAPSULATE)
             || !sender_authkey_set(ctx, auth))
-        return 0;
+            return 0;
     }
 
     ctx->op = operation;
@@ -261,25 +261,25 @@ static int eckem_init(void *vctx, int operation, void *vec, void *vauth,
 }
 
 static int eckem_encapsulate_init(void *vctx, void *vec,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eckem_init(vctx, EVP_PKEY_OP_ENCAPSULATE, vec, NULL, params);
 }
 
 static int eckem_decapsulate_init(void *vctx, void *vec,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eckem_init(vctx, EVP_PKEY_OP_DECAPSULATE, vec, NULL, params);
 }
 
 static int eckem_auth_encapsulate_init(void *vctx, void *vecx, void *vauthpriv,
-                                       const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eckem_init(vctx, EVP_PKEY_OP_ENCAPSULATE, vecx, vauthpriv, params);
 }
 
 static int eckem_auth_decapsulate_init(void *vctx, void *vecx, void *vauthpub,
-                                       const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eckem_init(vctx, EVP_PKEY_OP_DECAPSULATE, vecx, vauthpub, params);
 }
@@ -327,7 +327,7 @@ static const OSSL_PARAM known_settable_eckem_ctx_params[] = {
 };
 
 static const OSSL_PARAM *eckem_settable_ctx_params(ossl_unused void *vctx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_eckem_ctx_params;
 }
@@ -336,11 +336,11 @@ static const OSSL_PARAM *eckem_settable_ctx_params(ossl_unused void *vctx,
  * See Section 4.1 DH-Based KEM (DHKEM) ExtractAndExpand
  */
 static int dhkem_extract_and_expand(EVP_KDF_CTX *kctx,
-                                    unsigned char *okm, size_t okmlen,
-                                    uint16_t kemid,
-                                    const unsigned char *dhkm, size_t dhkmlen,
-                                    const unsigned char *kemctx,
-                                    size_t kemctxlen)
+    unsigned char *okm, size_t okmlen,
+    uint16_t kemid,
+    const unsigned char *dhkm, size_t dhkmlen,
+    const unsigned char *kemctx,
+    size_t kemctxlen)
 {
     uint8_t suiteid[2];
     uint8_t prk[EVP_MAX_MD_SIZE];
@@ -354,12 +354,12 @@ static int dhkem_extract_and_expand(EVP_KDF_CTX *kctx,
     suiteid[1] = kemid & 0xff;
 
     ret = ossl_hpke_labeled_extract(kctx, prk, prklen,
-                                    NULL, 0, LABEL_KEM, suiteid, sizeof(suiteid),
-                                    OSSL_DHKEM_LABEL_EAE_PRK, dhkm, dhkmlen)
-          && ossl_hpke_labeled_expand(kctx, okm, okmlen, prk, prklen,
-                                      LABEL_KEM, suiteid, sizeof(suiteid),
-                                      OSSL_DHKEM_LABEL_SHARED_SECRET,
-                                      kemctx, kemctxlen);
+              NULL, 0, LABEL_KEM, suiteid, sizeof(suiteid),
+              OSSL_DHKEM_LABEL_EAE_PRK, dhkm, dhkmlen)
+        && ossl_hpke_labeled_expand(kctx, okm, okmlen, prk, prklen,
+            LABEL_KEM, suiteid, sizeof(suiteid),
+            OSSL_DHKEM_LABEL_SHARED_SECRET,
+            kemctx, kemctxlen);
     OPENSSL_cleanse(prk, prklen);
     return ret;
 }
@@ -380,7 +380,7 @@ static int dhkem_extract_and_expand(EVP_KDF_CTX *kctx,
  *     1 if successful or 0 otherwise.
  */
 int ossl_ec_dhkem_derive_private(EC_KEY *ec, BIGNUM *priv,
-                                 const unsigned char *ikm, size_t ikmlen)
+    const unsigned char *ikm, size_t ikmlen)
 {
     int ret = 0;
     EVP_KDF_CTX *kdfctx = NULL;
@@ -400,16 +400,16 @@ int ossl_ec_dhkem_derive_private(EC_KEY *ec, BIGNUM *priv,
         return -2;
 
     kdfctx = ossl_kdf_ctx_create("HKDF", info->mdname,
-                                 ossl_ec_key_get_libctx(ec),
-                                 ossl_ec_key_get0_propq(ec));
+        ossl_ec_key_get_libctx(ec),
+        ossl_ec_key_get0_propq(ec));
     if (kdfctx == NULL)
         return 0;
 
     /* ikmlen should have a length of at least Nsk */
     if (ikmlen < info->Nsk) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_INPUT_LENGTH,
-                       "ikm length is :%zu, should be at least %zu",
-                       ikmlen, info->Nsk);
+            "ikm length is :%zu, should be at least %zu",
+            ikmlen, info->Nsk);
         goto err;
     }
 
@@ -417,17 +417,17 @@ int ossl_ec_dhkem_derive_private(EC_KEY *ec, BIGNUM *priv,
     suiteid[1] = info->kem_id % 256;
 
     if (!ossl_hpke_labeled_extract(kdfctx, prk, info->Nsecret,
-                                   NULL, 0, LABEL_KEM, suiteid, sizeof(suiteid),
-                                   OSSL_DHKEM_LABEL_DKP_PRK, ikm, ikmlen))
+            NULL, 0, LABEL_KEM, suiteid, sizeof(suiteid),
+            OSSL_DHKEM_LABEL_DKP_PRK, ikm, ikmlen))
         goto err;
 
     order = EC_GROUP_get0_order(EC_KEY_get0_group(ec));
     do {
         if (!ossl_hpke_labeled_expand(kdfctx, privbuf, info->Nsk,
-                                      prk, info->Nsecret,
-                                      LABEL_KEM, suiteid, sizeof(suiteid),
-                                      OSSL_DHKEM_LABEL_CANDIDATE,
-                                      &counter, 1))
+                prk, info->Nsecret,
+                LABEL_KEM, suiteid, sizeof(suiteid),
+                OSSL_DHKEM_LABEL_CANDIDATE,
+                &counter, 1))
             goto err;
         privbuf[0] &= info->bitmask;
         if (BN_bin2bn(privbuf, info->Nsk, priv) == NULL)
@@ -455,7 +455,7 @@ int ossl_ec_dhkem_derive_private(EC_KEY *ec, BIGNUM *priv,
  *     The generated EC key, or NULL on failure.
  */
 static EC_KEY *derivekey(PROV_EC_CTX *ctx,
-                         const unsigned char *ikm, size_t ikmlen)
+    const unsigned char *ikm, size_t ikmlen)
 {
     int ret = 0;
     EC_KEY *key;
@@ -519,21 +519,22 @@ static int check_publickey(const EC_KEY *pub)
  * Returns the size of the secret if successful, or 0 otherwise,
  */
 static int generate_ecdhkm(const EC_KEY *sender, const EC_KEY *peer,
-                           unsigned char *out, size_t maxout,
-                           unsigned int secretsz)
+    unsigned char *out, size_t maxout,
+    unsigned int secretsz)
 {
     const EC_GROUP *group = EC_KEY_get0_group(sender);
     size_t secretlen = (EC_GROUP_get_degree(group) + 7) / 8;
 
     if (secretlen != secretsz || secretlen > maxout) {
-        ERR_raise_data(ERR_LIB_PROV,  PROV_R_BAD_LENGTH, "secretsz invalid");
+        ERR_raise_data(ERR_LIB_PROV, PROV_R_BAD_LENGTH, "secretsz invalid");
         return 0;
     }
 
     if (!check_publickey(peer))
         return 0;
     return ECDH_compute_key(out, secretlen, EC_KEY_get0_public_key(peer),
-                            sender, NULL) > 0;
+               sender, NULL)
+        > 0;
 }
 
 /*
@@ -559,10 +560,10 @@ static int generate_ecdhkm(const EC_KEY *sender, const EC_KEY *peer,
  *     and peerkey2 are non NULL (i.e. ctx->sender_authkey is not NULL).
  */
 static int derive_secret(PROV_EC_CTX *ctx, unsigned char *secret,
-                         const EC_KEY *privkey1, const EC_KEY *peerkey1,
-                         const EC_KEY *privkey2, const EC_KEY *peerkey2,
-                         const unsigned char *sender_pub,
-                         const unsigned char *recipient_pub)
+    const EC_KEY *privkey1, const EC_KEY *peerkey1,
+    const EC_KEY *privkey2, const EC_KEY *peerkey2,
+    const unsigned char *sender_pub,
+    const unsigned char *recipient_pub)
 {
     int ret = 0;
     EVP_KDF_CTX *kdfctx = NULL;
@@ -585,16 +586,16 @@ static int derive_secret(PROV_EC_CTX *ctx, unsigned char *secret,
     if (auth) {
         /* Get the public key of the auth sender in encoded form */
         if (!ecpubkey_todata(ctx->sender_authkey, sender_authpub,
-                             &sender_authpublen, sizeof(sender_authpub)))
+                &sender_authpublen, sizeof(sender_authpub)))
             goto err;
         if (sender_authpublen != encodedpublen) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
-                           "Invalid sender auth public key");
+                "Invalid sender auth public key");
             goto err;
         }
         if (!generate_ecdhkm(privkey2, peerkey2,
-                             dhkm + dhkmlen, sizeof(dhkm) - dhkmlen,
-                             encodedprivlen))
+                dhkm + dhkmlen, sizeof(dhkm) - dhkmlen,
+                encodedprivlen))
             goto err;
         dhkmlen += encodedprivlen;
         kemctxlen += encodedpublen;
@@ -608,12 +609,12 @@ static int derive_secret(PROV_EC_CTX *ctx, unsigned char *secret,
     if (auth)
         memcpy(kemctx + 2 * encodedpublen, sender_authpub, encodedpublen);
     kdfctx = ossl_kdf_ctx_create(ctx->kdfname, info->mdname,
-                                 ctx->libctx, ctx->propq);
+        ctx->libctx, ctx->propq);
     if (kdfctx == NULL)
         goto err;
     if (!dhkem_extract_and_expand(kdfctx, secret, info->Nsecret,
-                                  info->kem_id, dhkm, dhkmlen,
-                                  kemctx, kemctxlen))
+            info->kem_id, dhkm, dhkmlen,
+            kemctx, kemctxlen))
         goto err;
     ret = 1;
 err:
@@ -641,8 +642,8 @@ static int derive_secret(PROV_EC_CTX *ctx, unsigned char *secret,
  * Returns: 1 on success or 0 otherwise.
  */
 static int dhkem_encap(PROV_EC_CTX *ctx,
-                       unsigned char *enc, size_t *enclen,
-                       unsigned char *secret, size_t *secretlen)
+    unsigned char *enc, size_t *enclen,
+    unsigned char *secret, size_t *secretlen)
 {
     int ret = 0;
     EC_KEY *sender_ephemkey = NULL;
@@ -658,7 +659,7 @@ static int dhkem_encap(PROV_EC_CTX *ctx,
             *enclen = info->Nenc;
         if (secretlen != NULL)
             *secretlen = info->Nsecret;
-       return 1;
+        return 1;
     }
 
     if (*secretlen < info->Nsecret) {
@@ -675,21 +676,21 @@ static int dhkem_encap(PROV_EC_CTX *ctx,
     if (sender_ephemkey == NULL)
         goto err;
     if (!ecpubkey_todata(sender_ephemkey, sender_pub, &sender_publen,
-                         sizeof(sender_pub))
-            || !ecpubkey_todata(ctx->recipient_key, recipient_pub,
-                                &recipient_publen, sizeof(recipient_pub)))
+            sizeof(sender_pub))
+        || !ecpubkey_todata(ctx->recipient_key, recipient_pub,
+            &recipient_publen, sizeof(recipient_pub)))
         goto err;
 
     if (sender_publen != info->Npk
-            || recipient_publen != sender_publen) {
+        || recipient_publen != sender_publen) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY, "Invalid public key");
         goto err;
     }
 
     if (!derive_secret(ctx, secret,
-                       sender_ephemkey, ctx->recipient_key,
-                       ctx->sender_authkey, ctx->recipient_key,
-                       sender_pub, recipient_pub))
+            sender_ephemkey, ctx->recipient_key,
+            ctx->sender_authkey, ctx->recipient_key,
+            sender_pub, recipient_pub))
         goto err;
 
     /* Return the senders ephemeral public key in encoded form */
@@ -719,8 +720,8 @@ static int dhkem_encap(PROV_EC_CTX *ctx,
  * Returns: 1 If the shared secret is returned or 0 on error.
  */
 static int dhkem_decap(PROV_EC_CTX *ctx,
-                       unsigned char *secret, size_t *secretlen,
-                       const unsigned char *enc, size_t enclen)
+    unsigned char *secret, size_t *secretlen,
+    const unsigned char *enc, size_t enclen)
 {
     int ret = 0;
     EC_KEY *sender_ephempubkey = NULL;
@@ -747,7 +748,7 @@ static int dhkem_decap(PROV_EC_CTX *ctx,
     if (sender_ephempubkey == NULL)
         goto err;
     if (!ecpubkey_todata(ctx->recipient_key, recipient_pub, &recipient_publen,
-                         sizeof(recipient_pub)))
+            sizeof(recipient_pub)))
         goto err;
     if (recipient_publen != encodedpublen) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY, "Invalid recipient public key");
@@ -755,9 +756,9 @@ static int dhkem_decap(PROV_EC_CTX *ctx,
     }
 
     if (!derive_secret(ctx, secret,
-                       ctx->recipient_key, sender_ephempubkey,
-                       ctx->recipient_key, ctx->sender_authkey,
-                       enc, recipient_pub))
+            ctx->recipient_key, sender_ephempubkey,
+            ctx->recipient_key, ctx->sender_authkey,
+            enc, recipient_pub))
         goto err;
     *secretlen = info->Nsecret;
     ret = 1;
@@ -767,49 +768,49 @@ static int dhkem_decap(PROV_EC_CTX *ctx,
 }
 
 static int eckem_encapsulate(void *vctx, unsigned char *out, size_t *outlen,
-                             unsigned char *secret, size_t *secretlen)
+    unsigned char *secret, size_t *secretlen)
 {
     PROV_EC_CTX *ctx = (PROV_EC_CTX *)vctx;
 
     switch (ctx->mode) {
-        case KEM_MODE_DHKEM:
-            return dhkem_encap(ctx, out, outlen, secret, secretlen);
-        default:
-            ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MODE);
-            return -2;
+    case KEM_MODE_DHKEM:
+        return dhkem_encap(ctx, out, outlen, secret, secretlen);
+    default:
+        ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MODE);
+        return -2;
     }
 }
 
 static int eckem_decapsulate(void *vctx, unsigned char *out, size_t *outlen,
-                             const unsigned char *in, size_t inlen)
+    const unsigned char *in, size_t inlen)
 {
     PROV_EC_CTX *ctx = (PROV_EC_CTX *)vctx;
 
     switch (ctx->mode) {
-        case KEM_MODE_DHKEM:
-            return dhkem_decap(ctx, out, outlen, in, inlen);
-        default:
-            ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MODE);
-            return -2;
+    case KEM_MODE_DHKEM:
+        return dhkem_decap(ctx, out, outlen, in, inlen);
+    default:
+        ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MODE);
+        return -2;
     }
 }
 
 const OSSL_DISPATCH ossl_ec_asym_kem_functions[] = {
     { OSSL_FUNC_KEM_NEWCTX, (void (*)(void))eckem_newctx },
     { OSSL_FUNC_KEM_ENCAPSULATE_INIT,
-      (void (*)(void))eckem_encapsulate_init },
+        (void (*)(void))eckem_encapsulate_init },
     { OSSL_FUNC_KEM_ENCAPSULATE, (void (*)(void))eckem_encapsulate },
     { OSSL_FUNC_KEM_DECAPSULATE_INIT,
-      (void (*)(void))eckem_decapsulate_init },
+        (void (*)(void))eckem_decapsulate_init },
     { OSSL_FUNC_KEM_DECAPSULATE, (void (*)(void))eckem_decapsulate },
     { OSSL_FUNC_KEM_FREECTX, (void (*)(void))eckem_freectx },
     { OSSL_FUNC_KEM_SET_CTX_PARAMS,
-      (void (*)(void))eckem_set_ctx_params },
+        (void (*)(void))eckem_set_ctx_params },
     { OSSL_FUNC_KEM_SETTABLE_CTX_PARAMS,
-      (void (*)(void))eckem_settable_ctx_params },
+        (void (*)(void))eckem_settable_ctx_params },
     { OSSL_FUNC_KEM_AUTH_ENCAPSULATE_INIT,
-      (void (*)(void))eckem_auth_encapsulate_init },
+        (void (*)(void))eckem_auth_encapsulate_init },
     { OSSL_FUNC_KEM_AUTH_DECAPSULATE_INIT,
-      (void (*)(void))eckem_auth_decapsulate_init },
+        (void (*)(void))eckem_auth_decapsulate_init },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/kem/eckem.h b/providers/implementations/kem/eckem.h
index 2e46a0f2ffab1..1575adca8a476 100644
--- a/providers/implementations/kem/eckem.h
+++ b/providers/implementations/kem/eckem.h
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#define KEM_MODE_UNDEFINED   0
-#define KEM_MODE_DHKEM       1
+#define KEM_MODE_UNDEFINED 0
+#define KEM_MODE_DHKEM 1
 
 int ossl_eckem_modename2id(const char *name);
diff --git a/providers/implementations/kem/ecx_kem.c b/providers/implementations/kem/ecx_kem.c
index 823662dd37c32..cb134a2ab9922 100644
--- a/providers/implementations/kem/ecx_kem.c
+++ b/providers/implementations/kem/ecx_kem.c
@@ -40,7 +40,7 @@
 
 /* KEM identifiers from Section 7.1 "Table 2 KEM IDs" */
 #define KEMID_X25519_HKDF_SHA256 0x20
-#define KEMID_X448_HKDF_SHA512   0x21
+#define KEMID_X448_HKDF_SHA512 0x21
 
 /* ASCII: "KEM", in hex for EBCDIC compatibility */
 static const char LABEL_KEM[] = "\x4b\x45\x4d";
@@ -127,13 +127,13 @@ static int sender_authkey_set(PROV_ECX_CTX *ctx, ECX_KEY *ecx)
  * Returns: The created ECX_KEY or NULL on error.
  */
 static ECX_KEY *ecxkey_pubfromdata(PROV_ECX_CTX *ctx,
-                                   const unsigned char *pubbuf, size_t pubbuflen)
+    const unsigned char *pubbuf, size_t pubbuflen)
 {
     ECX_KEY *ecx = NULL;
     OSSL_PARAM params[2], *p = params;
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_PUB_KEY,
-                                             (char *)pubbuf, pubbuflen);
+        (char *)pubbuf, pubbuflen);
     *p = OSSL_PARAM_construct_end();
 
     ecx = ossl_ecx_key_new(ctx->libctx, ctx->recipient_key->type, 1, ctx->propq);
@@ -157,7 +157,7 @@ static unsigned char *ecx_pubkey(ECX_KEY *ecx)
 
 static void *ecxkem_newctx(void *provctx)
 {
-    PROV_ECX_CTX *ctx =  OPENSSL_zalloc(sizeof(PROV_ECX_CTX));
+    PROV_ECX_CTX *ctx = OPENSSL_zalloc(sizeof(PROV_ECX_CTX));
 
     if (ctx == NULL)
         return NULL;
@@ -190,7 +190,7 @@ static int ecx_key_check(const ECX_KEY *ecx, int requires_privatekey)
 }
 
 static int ecxkem_init(void *vecxctx, int operation, void *vecx, void *vauth,
-                       ossl_unused const OSSL_PARAM params[])
+    ossl_unused const OSSL_PARAM params[])
 {
     int rv;
     PROV_ECX_CTX *ctx = (PROV_ECX_CTX *)vecxctx;
@@ -208,8 +208,8 @@ static int ecxkem_init(void *vecxctx, int operation, void *vecx, void *vauth,
 
     if (auth != NULL) {
         if (!ecx_match_params(auth, ctx->recipient_key)
-                || !ecx_key_check(auth, operation == EVP_PKEY_OP_ENCAPSULATE)
-                || !sender_authkey_set(ctx, auth))
+            || !ecx_key_check(auth, operation == EVP_PKEY_OP_ENCAPSULATE)
+            || !sender_authkey_set(ctx, auth))
             return 0;
     }
 
@@ -218,25 +218,25 @@ static int ecxkem_init(void *vecxctx, int operation, void *vecx, void *vauth,
 }
 
 static int ecxkem_encapsulate_init(void *vecxctx, void *vecx,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return ecxkem_init(vecxctx, EVP_PKEY_OP_ENCAPSULATE, vecx, NULL, params);
 }
 
 static int ecxkem_decapsulate_init(void *vecxctx, void *vecx,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return ecxkem_init(vecxctx, EVP_PKEY_OP_DECAPSULATE, vecx, NULL, params);
 }
 
 static int ecxkem_auth_encapsulate_init(void *vctx, void *vecx, void *vauthpriv,
-                                        const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return ecxkem_init(vctx, EVP_PKEY_OP_ENCAPSULATE, vecx, vauthpriv, params);
 }
 
 static int ecxkem_auth_decapsulate_init(void *vctx, void *vecx, void *vauthpub,
-                                        const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return ecxkem_init(vctx, EVP_PKEY_OP_DECAPSULATE, vecx, vauthpub, params);
 }
@@ -284,7 +284,7 @@ static const OSSL_PARAM known_settable_ecxkem_ctx_params[] = {
 };
 
 static const OSSL_PARAM *ecxkem_settable_ctx_params(ossl_unused void *vctx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_ecxkem_ctx_params;
 }
@@ -293,11 +293,11 @@ static const OSSL_PARAM *ecxkem_settable_ctx_params(ossl_unused void *vctx,
  * See Section 4.1 DH-Based KEM (DHKEM) ExtractAndExpand
  */
 static int dhkem_extract_and_expand(EVP_KDF_CTX *kctx,
-                                    unsigned char *okm, size_t okmlen,
-                                    uint16_t kemid,
-                                    const unsigned char *dhkm, size_t dhkmlen,
-                                    const unsigned char *kemctx,
-                                    size_t kemctxlen)
+    unsigned char *okm, size_t okmlen,
+    uint16_t kemid,
+    const unsigned char *dhkm, size_t dhkmlen,
+    const unsigned char *kemctx,
+    size_t kemctxlen)
 {
     uint8_t suiteid[2];
     uint8_t prk[EVP_MAX_MD_SIZE];
@@ -307,16 +307,16 @@ static int dhkem_extract_and_expand(EVP_KDF_CTX *kctx,
     if (prklen > sizeof(prk))
         return 0;
 
-    suiteid[0] = (kemid >> 8) &0xff;
+    suiteid[0] = (kemid >> 8) & 0xff;
     suiteid[1] = kemid & 0xff;
 
     ret = ossl_hpke_labeled_extract(kctx, prk, prklen,
-                                    NULL, 0, LABEL_KEM, suiteid, sizeof(suiteid),
-                                    OSSL_DHKEM_LABEL_EAE_PRK, dhkm, dhkmlen)
-          && ossl_hpke_labeled_expand(kctx, okm, okmlen, prk, prklen,
-                                      LABEL_KEM, suiteid, sizeof(suiteid),
-                                      OSSL_DHKEM_LABEL_SHARED_SECRET,
-                                      kemctx, kemctxlen);
+              NULL, 0, LABEL_KEM, suiteid, sizeof(suiteid),
+              OSSL_DHKEM_LABEL_EAE_PRK, dhkm, dhkmlen)
+        && ossl_hpke_labeled_expand(kctx, okm, okmlen, prk, prklen,
+            LABEL_KEM, suiteid, sizeof(suiteid),
+            OSSL_DHKEM_LABEL_SHARED_SECRET,
+            kemctx, kemctxlen);
     OPENSSL_cleanse(prk, prklen);
     return ret;
 }
@@ -337,7 +337,7 @@ static int dhkem_extract_and_expand(EVP_KDF_CTX *kctx,
  *     1 if successful or 0 otherwise.
  */
 int ossl_ecx_dhkem_derive_private(ECX_KEY *ecx, unsigned char *privout,
-                                  const unsigned char *ikm, size_t ikmlen)
+    const unsigned char *ikm, size_t ikmlen)
 {
     int ret = 0;
     EVP_KDF_CTX *kdfctx = NULL;
@@ -348,8 +348,8 @@ int ossl_ecx_dhkem_derive_private(ECX_KEY *ecx, unsigned char *privout,
     /* ikmlen should have a length of at least Nsk */
     if (ikmlen < info->Nsk) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_INPUT_LENGTH,
-                       "ikm length is :%zu, should be at least %zu",
-                       ikmlen, info->Nsk);
+            "ikm length is :%zu, should be at least %zu",
+            ikmlen, info->Nsk);
         goto err;
     }
 
@@ -361,13 +361,13 @@ int ossl_ecx_dhkem_derive_private(ECX_KEY *ecx, unsigned char *privout,
     suiteid[1] = info->kem_id % 256;
 
     if (!ossl_hpke_labeled_extract(kdfctx, prk, info->Nsecret,
-                                   NULL, 0, LABEL_KEM, suiteid, sizeof(suiteid),
-                                   OSSL_DHKEM_LABEL_DKP_PRK, ikm, ikmlen))
+            NULL, 0, LABEL_KEM, suiteid, sizeof(suiteid),
+            OSSL_DHKEM_LABEL_DKP_PRK, ikm, ikmlen))
         goto err;
 
     if (!ossl_hpke_labeled_expand(kdfctx, privout, info->Nsk, prk, info->Nsecret,
-                                  LABEL_KEM, suiteid, sizeof(suiteid),
-                                  OSSL_DHKEM_LABEL_SK, NULL, 0))
+            LABEL_KEM, suiteid, sizeof(suiteid),
+            OSSL_DHKEM_LABEL_SK, NULL, 0))
         goto err;
     ret = 1;
 err:
@@ -385,7 +385,7 @@ int ossl_ecx_dhkem_derive_private(ECX_KEY *ecx, unsigned char *privout,
  *     The generated ECX key, or NULL on failure.
  */
 static ECX_KEY *derivekey(PROV_ECX_CTX *ctx,
-                          const unsigned char *ikm, size_t ikmlen)
+    const unsigned char *ikm, size_t ikmlen)
 {
     int ok = 0;
     ECX_KEY *key;
@@ -437,14 +437,14 @@ static ECX_KEY *derivekey(PROV_ECX_CTX *ctx,
  * Returns the size of the secret if successful, or 0 otherwise,
  */
 static int generate_ecxdhkm(const ECX_KEY *sender, const ECX_KEY *peer,
-                           unsigned char *out,  size_t maxout,
-                           unsigned int secretsz)
+    unsigned char *out, size_t maxout,
+    unsigned int secretsz)
 {
     size_t len = 0;
 
     /* NOTE: ossl_ecx_compute_key checks for shared secret being all zeros */
     return ossl_ecx_compute_key((ECX_KEY *)peer, (ECX_KEY *)sender,
-                                 sender->keylen, out, &len, maxout);
+        sender->keylen, out, &len, maxout);
 }
 
 /*
@@ -470,10 +470,10 @@ static int generate_ecxdhkm(const ECX_KEY *sender, const ECX_KEY *peer,
  *     and peerkey2 are non NULL (i.e. ctx->sender_authkey is not NULL).
  */
 static int derive_secret(PROV_ECX_CTX *ctx, unsigned char *secret,
-                         const ECX_KEY *privkey1, const ECX_KEY *peerkey1,
-                         const ECX_KEY *privkey2, const ECX_KEY *peerkey2,
-                         const unsigned char *sender_pub,
-                         const unsigned char *recipient_pub)
+    const ECX_KEY *privkey1, const ECX_KEY *peerkey1,
+    const ECX_KEY *privkey2, const ECX_KEY *peerkey2,
+    const unsigned char *sender_pub,
+    const unsigned char *recipient_pub)
 {
     int ret = 0;
     EVP_KDF_CTX *kdfctx = NULL;
@@ -492,8 +492,8 @@ static int derive_secret(PROV_ECX_CTX *ctx, unsigned char *secret,
     /* Concat the optional second ECXDH (used for Auth) */
     if (auth) {
         if (!generate_ecxdhkm(privkey2, peerkey2,
-                              dhkm + dhkmlen, sizeof(dhkm) - dhkmlen,
-                              encodedkeylen))
+                dhkm + dhkmlen, sizeof(dhkm) - dhkmlen,
+                encodedkeylen))
             goto err;
         /* Get the public key of the auth sender in encoded form */
         sender_authpub = ecx_pubkey(ctx->sender_authkey);
@@ -511,12 +511,12 @@ static int derive_secret(PROV_ECX_CTX *ctx, unsigned char *secret,
     if (auth)
         memcpy(kemctx + 2 * encodedkeylen, sender_authpub, encodedkeylen);
     kdfctx = ossl_kdf_ctx_create(ctx->kdfname, info->mdname,
-                                 ctx->libctx, ctx->propq);
+        ctx->libctx, ctx->propq);
     if (kdfctx == NULL)
         goto err;
     if (!dhkem_extract_and_expand(kdfctx, secret, info->Nsecret,
-                                  info->kem_id, dhkm, dhkmlen,
-                                  kemctx, kemctxlen))
+            info->kem_id, dhkm, dhkmlen,
+            kemctx, kemctxlen))
         goto err;
     ret = 1;
 err:
@@ -544,8 +544,8 @@ static int derive_secret(PROV_ECX_CTX *ctx, unsigned char *secret,
  * Returns: 1 on success or 0 otherwise.
  */
 static int dhkem_encap(PROV_ECX_CTX *ctx,
-                       unsigned char *enc, size_t *enclen,
-                       unsigned char *secret, size_t *secretlen)
+    unsigned char *enc, size_t *enclen,
+    unsigned char *secret, size_t *secretlen)
 {
     int ret = 0;
     ECX_KEY *sender_ephemkey = NULL;
@@ -559,7 +559,7 @@ static int dhkem_encap(PROV_ECX_CTX *ctx,
             *enclen = info->Nenc;
         if (secretlen != NULL)
             *secretlen = info->Nsecret;
-       return 1;
+        return 1;
     }
 
     if (*secretlen < info->Nsecret) {
@@ -580,9 +580,9 @@ static int dhkem_encap(PROV_ECX_CTX *ctx,
         goto err;
 
     if (!derive_secret(ctx, secret,
-                       sender_ephemkey, ctx->recipient_key,
-                       ctx->sender_authkey, ctx->recipient_key,
-                       sender_ephempub, recipient_pub))
+            sender_ephemkey, ctx->recipient_key,
+            ctx->sender_authkey, ctx->recipient_key,
+            sender_ephempub, recipient_pub))
         goto err;
 
     /* Return the public part of the ephemeral key */
@@ -612,8 +612,8 @@ static int dhkem_encap(PROV_ECX_CTX *ctx,
  * Returns: 1 If the shared secret is returned or 0 on error.
  */
 static int dhkem_decap(PROV_ECX_CTX *ctx,
-                       unsigned char *secret, size_t *secretlen,
-                       const unsigned char *enc, size_t enclen)
+    unsigned char *secret, size_t *secretlen,
+    const unsigned char *enc, size_t enclen)
 {
     int ret = 0;
     ECX_KEY *recipient_privkey = ctx->recipient_key;
@@ -644,9 +644,9 @@ static int dhkem_decap(PROV_ECX_CTX *ctx,
         goto err;
 
     if (!derive_secret(ctx, secret,
-                       ctx->recipient_key, sender_ephempubkey,
-                       ctx->recipient_key, ctx->sender_authkey,
-                       enc, recipient_pub))
+            ctx->recipient_key, sender_ephempubkey,
+            ctx->recipient_key, ctx->sender_authkey,
+            enc, recipient_pub))
         goto err;
 
     *secretlen = info->Nsecret;
@@ -657,49 +657,49 @@ static int dhkem_decap(PROV_ECX_CTX *ctx,
 }
 
 static int ecxkem_encapsulate(void *vctx, unsigned char *out, size_t *outlen,
-                              unsigned char *secret, size_t *secretlen)
+    unsigned char *secret, size_t *secretlen)
 {
     PROV_ECX_CTX *ctx = (PROV_ECX_CTX *)vctx;
 
     switch (ctx->mode) {
-        case KEM_MODE_DHKEM:
-            return dhkem_encap(ctx, out, outlen, secret, secretlen);
-        default:
-            ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MODE);
-            return -2;
+    case KEM_MODE_DHKEM:
+        return dhkem_encap(ctx, out, outlen, secret, secretlen);
+    default:
+        ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MODE);
+        return -2;
     }
 }
 
 static int ecxkem_decapsulate(void *vctx, unsigned char *out, size_t *outlen,
-                              const unsigned char *in, size_t inlen)
+    const unsigned char *in, size_t inlen)
 {
     PROV_ECX_CTX *ctx = (PROV_ECX_CTX *)vctx;
 
     switch (ctx->mode) {
-        case KEM_MODE_DHKEM:
-            return dhkem_decap(vctx, out, outlen, in, inlen);
-        default:
-            ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MODE);
-            return -2;
+    case KEM_MODE_DHKEM:
+        return dhkem_decap(vctx, out, outlen, in, inlen);
+    default:
+        ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MODE);
+        return -2;
     }
 }
 
 const OSSL_DISPATCH ossl_ecx_asym_kem_functions[] = {
     { OSSL_FUNC_KEM_NEWCTX, (void (*)(void))ecxkem_newctx },
     { OSSL_FUNC_KEM_ENCAPSULATE_INIT,
-      (void (*)(void))ecxkem_encapsulate_init },
+        (void (*)(void))ecxkem_encapsulate_init },
     { OSSL_FUNC_KEM_ENCAPSULATE, (void (*)(void))ecxkem_encapsulate },
     { OSSL_FUNC_KEM_DECAPSULATE_INIT,
-      (void (*)(void))ecxkem_decapsulate_init },
+        (void (*)(void))ecxkem_decapsulate_init },
     { OSSL_FUNC_KEM_DECAPSULATE, (void (*)(void))ecxkem_decapsulate },
     { OSSL_FUNC_KEM_FREECTX, (void (*)(void))ecxkem_freectx },
     { OSSL_FUNC_KEM_SET_CTX_PARAMS,
-      (void (*)(void))ecxkem_set_ctx_params },
+        (void (*)(void))ecxkem_set_ctx_params },
     { OSSL_FUNC_KEM_SETTABLE_CTX_PARAMS,
-      (void (*)(void))ecxkem_settable_ctx_params },
+        (void (*)(void))ecxkem_settable_ctx_params },
     { OSSL_FUNC_KEM_AUTH_ENCAPSULATE_INIT,
-      (void (*)(void))ecxkem_auth_encapsulate_init },
+        (void (*)(void))ecxkem_auth_encapsulate_init },
     { OSSL_FUNC_KEM_AUTH_DECAPSULATE_INIT,
-      (void (*)(void))ecxkem_auth_decapsulate_init },
+        (void (*)(void))ecxkem_auth_decapsulate_init },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/kem/ml_kem_kem.c b/providers/implementations/kem/ml_kem_kem.c
index c4658fd7c29fd..722eadf228975 100644
--- a/providers/implementations/kem/ml_kem_kem.c
+++ b/providers/implementations/kem/ml_kem_kem.c
@@ -60,7 +60,7 @@ static void ml_kem_freectx(void *vctx)
 }
 
 static int ml_kem_init(void *vctx, int op, void *key,
-                       const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     PROV_ML_KEM_CTX *ctx = vctx;
 
@@ -72,7 +72,7 @@ static int ml_kem_init(void *vctx, int op, void *key,
 }
 
 static int ml_kem_encapsulate_init(void *vctx, void *vkey,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     ML_KEM_KEY *key = vkey;
 
@@ -84,7 +84,7 @@ static int ml_kem_encapsulate_init(void *vctx, void *vkey,
 }
 
 static int ml_kem_decapsulate_init(void *vctx, void *vkey,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     ML_KEM_KEY *key = vkey;
 
@@ -119,7 +119,7 @@ static int ml_kem_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 
         ctx->entropy = ctx->entropy_buf;
         if (OSSL_PARAM_get_octet_string(p, (void **)&ctx->entropy,
-                                        len, &len)
+                len, &len)
             && len == ML_KEM_RANDOM_BYTES)
             return 1;
 
@@ -133,7 +133,7 @@ static int ml_kem_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *ml_kem_settable_ctx_params(ossl_unused void *vctx,
-                                                    ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM params[] = {
         OSSL_PARAM_octet_string(OSSL_KEM_PARAM_IKME, NULL, 0),
@@ -144,7 +144,7 @@ static const OSSL_PARAM *ml_kem_settable_ctx_params(ossl_unused void *vctx,
 }
 
 static int ml_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
-                              unsigned char *shsec, size_t *slen)
+    unsigned char *shsec, size_t *slen)
 {
     PROV_ML_KEM_CTX *ctx = vctx;
     ML_KEM_KEY *key = ctx->key;
@@ -171,18 +171,18 @@ static int ml_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
         return 1;
     }
     if (shsec == NULL) {
-        ERR_raise_data(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL,
-                       "NULL shared-secret buffer");
+        ERR_raise_data(ERR_LIB_PROV, PROV_R_NULL_OUTPUT_BUFFER,
+            "NULL shared-secret buffer");
         goto end;
     }
 
     if (clen == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_NULL_LENGTH_POINTER,
-                       "null ciphertext input/output length pointer");
+            "null ciphertext input/output length pointer");
         goto end;
     } else if (*clen < encap_clen) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL,
-                       "ciphertext buffer too small");
+            "ciphertext buffer too small");
         goto end;
     } else {
         *clen = encap_clen;
@@ -190,11 +190,11 @@ static int ml_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
 
     if (slen == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_NULL_LENGTH_POINTER,
-                       "null shared secret input/output length pointer");
+            "null shared secret input/output length pointer");
         goto end;
     } else if (*slen < encap_slen) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL,
-                       "shared-secret buffer too small");
+            "shared-secret buffer too small");
         goto end;
     } else {
         *slen = encap_slen;
@@ -202,11 +202,11 @@ static int ml_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
 
     if (ctx->entropy != NULL)
         ret = ossl_ml_kem_encap_seed(ctext, encap_clen, shsec, encap_slen,
-                                     ctx->entropy, ML_KEM_RANDOM_BYTES, key);
+            ctx->entropy, ML_KEM_RANDOM_BYTES, key);
     else
         ret = ossl_ml_kem_encap_rand(ctext, encap_clen, shsec, encap_slen, key);
 
-  end:
+end:
     /*
      * One shot entropy, each encapsulate call must either provide a new
      * "ikmE", or else will use a random value.  If a caller sets an explicit
@@ -222,7 +222,7 @@ static int ml_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
 }
 
 static int ml_kem_decapsulate(void *vctx, uint8_t *shsec, size_t *slen,
-                              const uint8_t *ctext, size_t clen)
+    const uint8_t *ctext, size_t clen)
 {
     PROV_ML_KEM_CTX *ctx = vctx;
     ML_KEM_KEY *key = ctx->key;
@@ -245,7 +245,7 @@ static int ml_kem_decapsulate(void *vctx, uint8_t *shsec, size_t *slen,
         slen = &decap_slen;
     } else if (*slen < decap_slen) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL,
-                       "shared-secret buffer too small");
+            "shared-secret buffer too small");
         return 0;
     } else {
         *slen = decap_slen;
@@ -256,13 +256,13 @@ static int ml_kem_decapsulate(void *vctx, uint8_t *shsec, size_t *slen,
 }
 
 const OSSL_DISPATCH ossl_ml_kem_asym_kem_functions[] = {
-    { OSSL_FUNC_KEM_NEWCTX, (OSSL_FUNC) ml_kem_newctx },
-    { OSSL_FUNC_KEM_ENCAPSULATE_INIT, (OSSL_FUNC) ml_kem_encapsulate_init },
-    { OSSL_FUNC_KEM_ENCAPSULATE, (OSSL_FUNC) ml_kem_encapsulate },
-    { OSSL_FUNC_KEM_DECAPSULATE_INIT, (OSSL_FUNC) ml_kem_decapsulate_init },
-    { OSSL_FUNC_KEM_DECAPSULATE, (OSSL_FUNC) ml_kem_decapsulate },
-    { OSSL_FUNC_KEM_FREECTX, (OSSL_FUNC) ml_kem_freectx },
-    { OSSL_FUNC_KEM_SET_CTX_PARAMS, (OSSL_FUNC) ml_kem_set_ctx_params },
-    { OSSL_FUNC_KEM_SETTABLE_CTX_PARAMS, (OSSL_FUNC) ml_kem_settable_ctx_params },
+    { OSSL_FUNC_KEM_NEWCTX, (OSSL_FUNC)ml_kem_newctx },
+    { OSSL_FUNC_KEM_ENCAPSULATE_INIT, (OSSL_FUNC)ml_kem_encapsulate_init },
+    { OSSL_FUNC_KEM_ENCAPSULATE, (OSSL_FUNC)ml_kem_encapsulate },
+    { OSSL_FUNC_KEM_DECAPSULATE_INIT, (OSSL_FUNC)ml_kem_decapsulate_init },
+    { OSSL_FUNC_KEM_DECAPSULATE, (OSSL_FUNC)ml_kem_decapsulate },
+    { OSSL_FUNC_KEM_FREECTX, (OSSL_FUNC)ml_kem_freectx },
+    { OSSL_FUNC_KEM_SET_CTX_PARAMS, (OSSL_FUNC)ml_kem_set_ctx_params },
+    { OSSL_FUNC_KEM_SETTABLE_CTX_PARAMS, (OSSL_FUNC)ml_kem_settable_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/kem/mlx_kem.c b/providers/implementations/kem/mlx_kem.c
index 6ac0cfbf4da36..376b3342ddfa8 100644
--- a/providers/implementations/kem/mlx_kem.c
+++ b/providers/implementations/kem/mlx_kem.c
@@ -54,7 +54,7 @@ static void mlx_kem_freectx(void *vctx)
 }
 
 static int mlx_kem_init(void *vctx, int op, void *key,
-                        ossl_unused const OSSL_PARAM params[])
+    ossl_unused const OSSL_PARAM params[])
 {
     PROV_MLX_KEM_CTX *ctx = vctx;
 
@@ -90,7 +90,7 @@ mlx_kem_decapsulate_init(void *vctx, void *vkey, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *mlx_kem_settable_ctx_params(ossl_unused void *vctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM params[] = { OSSL_PARAM_END };
 
@@ -104,9 +104,9 @@ mlx_kem_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static int mlx_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
-                               unsigned char *shsec, size_t *slen)
+    unsigned char *shsec, size_t *slen)
 {
-    MLX_KEY *key = ((PROV_MLX_KEM_CTX *) vctx)->key;
+    MLX_KEY *key = ((PROV_MLX_KEM_CTX *)vctx)->key;
     EVP_PKEY_CTX *ctx = NULL;
     EVP_PKEY *xkey = NULL;
     size_t encap_clen;
@@ -134,17 +134,17 @@ static int mlx_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
     }
     if (shsec == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_NULL_OUTPUT_BUFFER,
-                       "null shared-secret output buffer");
+            "null shared-secret output buffer");
         return 0;
     }
 
     if (clen == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_NULL_LENGTH_POINTER,
-                       "null ciphertext input/output length pointer");
+            "null ciphertext input/output length pointer");
         return 0;
     } else if (*clen < encap_clen) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL,
-                       "ciphertext buffer too small");
+            "ciphertext buffer too small");
         return 0;
     } else {
         *clen = encap_clen;
@@ -152,11 +152,11 @@ static int mlx_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
 
     if (slen == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_NULL_LENGTH_POINTER,
-                       "null shared secret input/output length pointer");
+            "null shared secret input/output length pointer");
         return 0;
     } else if (*slen < encap_slen) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL,
-                       "shared-secret buffer too small");
+            "shared-secret buffer too small");
         return 0;
     } else {
         *slen = encap_slen;
@@ -174,14 +174,14 @@ static int mlx_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
         goto end;
     if (encap_clen != key->minfo->ctext_bytes) {
         ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                       "unexpected %s ciphertext output size: %lu",
-                       key->minfo->algorithm_name, (unsigned long) encap_clen);
+            "unexpected %s ciphertext output size: %lu",
+            key->minfo->algorithm_name, (unsigned long)encap_clen);
         goto end;
     }
     if (encap_slen != ML_KEM_SHARED_SECRET_BYTES) {
         ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                       "unexpected %s shared secret output size: %lu",
-                       key->minfo->algorithm_name, (unsigned long) encap_slen);
+            "unexpected %s shared secret output size: %lu",
+            key->minfo->algorithm_name, (unsigned long)encap_slen);
         goto end;
     }
     EVP_PKEY_CTX_free(ctx);
@@ -207,12 +207,13 @@ static int mlx_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
         || EVP_PKEY_keygen_init(ctx) <= 0
         || EVP_PKEY_keygen(ctx, &xkey) <= 0
         || EVP_PKEY_get_octet_string_param(xkey, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
-                                           cbuf, encap_clen, &encap_clen) <= 0)
+               cbuf, encap_clen, &encap_clen)
+            <= 0)
         goto end;
     if (encap_clen != key->xinfo->pubkey_bytes) {
         ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                       "unexpected %s public key output size: %lu",
-                       key->xinfo->algorithm_name, (unsigned long) encap_clen);
+            "unexpected %s public key output size: %lu",
+            key->xinfo->algorithm_name, (unsigned long)encap_clen);
         goto end;
     }
     EVP_PKEY_CTX_free(ctx);
@@ -228,22 +229,22 @@ static int mlx_kem_encapsulate(void *vctx, unsigned char *ctext, size_t *clen,
         goto end;
     if (encap_slen != key->xinfo->shsec_bytes) {
         ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                       "unexpected %s shared secret output size: %lu",
-                       key->xinfo->algorithm_name, (unsigned long) encap_slen);
+            "unexpected %s shared secret output size: %lu",
+            key->xinfo->algorithm_name, (unsigned long)encap_slen);
         goto end;
     }
 
     ret = 1;
-  end:
+end:
     EVP_PKEY_free(xkey);
     EVP_PKEY_CTX_free(ctx);
     return ret;
 }
 
 static int mlx_kem_decapsulate(void *vctx, uint8_t *shsec, size_t *slen,
-                               const uint8_t *ctext, size_t clen)
+    const uint8_t *ctext, size_t clen)
 {
-    MLX_KEY *key = ((PROV_MLX_KEM_CTX *) vctx)->key;
+    MLX_KEY *key = ((PROV_MLX_KEM_CTX *)vctx)->key;
     EVP_PKEY_CTX *ctx = NULL;
     EVP_PKEY *xkey = NULL;
     const uint8_t *cbuf;
@@ -270,15 +271,15 @@ static int mlx_kem_decapsulate(void *vctx, uint8_t *shsec, size_t *slen,
         slen = &decap_slen;
     } else if (*slen < decap_slen) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL,
-                       "shared-secret buffer too small");
+            "shared-secret buffer too small");
         return 0;
     } else {
         *slen = decap_slen;
     }
     if (clen != decap_clen) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_WRONG_CIPHERTEXT_SIZE,
-                       "wrong decapsulation input ciphertext size: %lu",
-                       (unsigned long) clen);
+            "wrong decapsulation input ciphertext size: %lu",
+            (unsigned long)clen);
         return 0;
     }
 
@@ -294,8 +295,8 @@ static int mlx_kem_decapsulate(void *vctx, uint8_t *shsec, size_t *slen,
         goto end;
     if (decap_slen != ML_KEM_SHARED_SECRET_BYTES) {
         ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                       "unexpected %s shared secret output size: %lu",
-                       key->minfo->algorithm_name, (unsigned long) decap_slen);
+            "unexpected %s shared secret output size: %lu",
+            key->minfo->algorithm_name, (unsigned long)decap_slen);
         goto end;
     }
     EVP_PKEY_CTX_free(ctx);
@@ -316,26 +317,26 @@ static int mlx_kem_decapsulate(void *vctx, uint8_t *shsec, size_t *slen,
         goto end;
     if (decap_slen != key->xinfo->shsec_bytes) {
         ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                       "unexpected %s shared secret output size: %lu",
-                       key->xinfo->algorithm_name, (unsigned long) decap_slen);
+            "unexpected %s shared secret output size: %lu",
+            key->xinfo->algorithm_name, (unsigned long)decap_slen);
         goto end;
     }
 
     ret = 1;
-  end:
+end:
     EVP_PKEY_CTX_free(ctx);
     EVP_PKEY_free(xkey);
     return ret;
 }
 
 const OSSL_DISPATCH ossl_mlx_kem_asym_kem_functions[] = {
-    { OSSL_FUNC_KEM_NEWCTX, (OSSL_FUNC) mlx_kem_newctx },
-    { OSSL_FUNC_KEM_ENCAPSULATE_INIT, (OSSL_FUNC) mlx_kem_encapsulate_init },
-    { OSSL_FUNC_KEM_ENCAPSULATE, (OSSL_FUNC) mlx_kem_encapsulate },
-    { OSSL_FUNC_KEM_DECAPSULATE_INIT, (OSSL_FUNC) mlx_kem_decapsulate_init },
-    { OSSL_FUNC_KEM_DECAPSULATE, (OSSL_FUNC) mlx_kem_decapsulate },
-    { OSSL_FUNC_KEM_FREECTX, (OSSL_FUNC) mlx_kem_freectx },
-    { OSSL_FUNC_KEM_SET_CTX_PARAMS, (OSSL_FUNC) mlx_kem_set_ctx_params },
-    { OSSL_FUNC_KEM_SETTABLE_CTX_PARAMS, (OSSL_FUNC) mlx_kem_settable_ctx_params },
+    { OSSL_FUNC_KEM_NEWCTX, (OSSL_FUNC)mlx_kem_newctx },
+    { OSSL_FUNC_KEM_ENCAPSULATE_INIT, (OSSL_FUNC)mlx_kem_encapsulate_init },
+    { OSSL_FUNC_KEM_ENCAPSULATE, (OSSL_FUNC)mlx_kem_encapsulate },
+    { OSSL_FUNC_KEM_DECAPSULATE_INIT, (OSSL_FUNC)mlx_kem_decapsulate_init },
+    { OSSL_FUNC_KEM_DECAPSULATE, (OSSL_FUNC)mlx_kem_decapsulate },
+    { OSSL_FUNC_KEM_FREECTX, (OSSL_FUNC)mlx_kem_freectx },
+    { OSSL_FUNC_KEM_SET_CTX_PARAMS, (OSSL_FUNC)mlx_kem_set_ctx_params },
+    { OSSL_FUNC_KEM_SETTABLE_CTX_PARAMS, (OSSL_FUNC)mlx_kem_settable_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/kem/rsa_kem.c b/providers/implementations/kem/rsa_kem.c
index 7494dcc0107fa..f7bf368a0dfc7 100644
--- a/providers/implementations/kem/rsa_kem.c
+++ b/providers/implementations/kem/rsa_kem.c
@@ -43,8 +43,8 @@ static OSSL_FUNC_kem_settable_ctx_params_fn rsakem_settable_ctx_params;
  * Only the KEM for RSASVE as defined in SP800-56b r2 is implemented
  * currently.
  */
-#define KEM_OP_UNDEFINED   -1
-#define KEM_OP_RSASVE       0
+#define KEM_OP_UNDEFINED -1
+#define KEM_OP_RSASVE 0
 
 /*
  * What's passed as an actual key is defined by the KEYMGMT interface.
@@ -88,7 +88,7 @@ static void *rsakem_newctx(void *provctx)
     if (!ossl_prov_is_running())
         return NULL;
 
-    prsactx =  OPENSSL_zalloc(sizeof(PROV_RSA_CTX));
+    prsactx = OPENSSL_zalloc(sizeof(PROV_RSA_CTX));
     if (prsactx == NULL)
         return NULL;
     prsactx->libctx = PROV_LIBCTX_OF(provctx);
@@ -127,8 +127,8 @@ static void *rsakem_dupctx(void *vprsactx)
 }
 
 static int rsakem_init(void *vprsactx, void *vrsa,
-                       const OSSL_PARAM params[], int operation,
-                       const char *desc)
+    const OSSL_PARAM params[], int operation,
+    const char *desc)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
     int protect = 0;
@@ -151,25 +151,25 @@ static int rsakem_init(void *vprsactx, void *vrsa,
         return 0;
 #ifdef FIPS_MODULE
     if (!ossl_fips_ind_rsa_key_check(OSSL_FIPS_IND_GET(prsactx),
-                                     OSSL_FIPS_IND_SETTABLE0, prsactx->libctx,
-                                     prsactx->rsa, desc, protect))
+            OSSL_FIPS_IND_SETTABLE0, prsactx->libctx,
+            prsactx->rsa, desc, protect))
         return 0;
 #endif
     return 1;
 }
 
 static int rsakem_encapsulate_init(void *vprsactx, void *vrsa,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return rsakem_init(vprsactx, vrsa, params, EVP_PKEY_OP_ENCAPSULATE,
-                       "RSA Encapsulate Init");
+        "RSA Encapsulate Init");
 }
 
 static int rsakem_decapsulate_init(void *vprsactx, void *vrsa,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return rsakem_init(vprsactx, vrsa, params, EVP_PKEY_OP_DECAPSULATE,
-                       "RSA Decapsulate Init");
+        "RSA Decapsulate Init");
 }
 
 static int rsakem_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
@@ -186,11 +186,11 @@ static int rsakem_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
 
 static const OSSL_PARAM known_gettable_rsakem_ctx_params[] = {
     OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 
 static const OSSL_PARAM *rsakem_gettable_ctx_params(ossl_unused void *vprsactx,
-                                                    ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_rsakem_ctx_params;
 }
@@ -207,8 +207,8 @@ static int rsakem_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(prsactx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_KEM_PARAM_FIPS_KEY_CHECK))
-        return  0;
+            OSSL_KEM_PARAM_FIPS_KEY_CHECK))
+        return 0;
     p = OSSL_PARAM_locate_const(params, OSSL_KEM_PARAM_OPERATION);
     if (p != NULL) {
         if (p->data_type != OSSL_PARAM_UTF8_STRING)
@@ -224,11 +224,11 @@ static int rsakem_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
 static const OSSL_PARAM known_settable_rsakem_ctx_params[] = {
     OSSL_PARAM_utf8_string(OSSL_KEM_PARAM_OPERATION, NULL, 0),
     OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_KEM_PARAM_FIPS_KEY_CHECK)
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 
 static const OSSL_PARAM *rsakem_settable_ctx_params(ossl_unused void *vprsactx,
-                                                    ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_rsakem_ctx_params;
 }
@@ -240,7 +240,7 @@ static const OSSL_PARAM *rsakem_settable_ctx_params(ossl_unused void *vprsactx,
  * Generate a random in the range 1 < z < (n – 1)
  */
 static int rsasve_gen_rand_bytes(RSA *rsa_pub,
-                                 unsigned char *out, int outlen)
+    unsigned char *out, int outlen)
 {
     int ret = 0;
     BN_CTX *bnctx;
@@ -260,11 +260,11 @@ static int rsasve_gen_rand_bytes(RSA *rsa_pub,
     nminus3 = BN_CTX_get(bnctx);
     z = BN_CTX_get(bnctx);
     ret = (z != NULL
-           && (BN_copy(nminus3, RSA_get0_n(rsa_pub)) != NULL)
-           && BN_sub_word(nminus3, 3)
-           && BN_priv_rand_range_ex(z, nminus3, 0, bnctx)
-           && BN_add_word(z, 2)
-           && (BN_bn2binpad(z, out, outlen) == outlen));
+        && (BN_copy(nminus3, RSA_get0_n(rsa_pub)) != NULL)
+        && BN_sub_word(nminus3, 3)
+        && BN_priv_rand_range_ex(z, nminus3, 0, bnctx)
+        && BN_add_word(z, 2)
+        && (BN_bn2binpad(z, out, outlen) == outlen));
     BN_CTX_end(bnctx);
     BN_CTX_free(bnctx);
     return ret;
@@ -275,8 +275,8 @@ static int rsasve_gen_rand_bytes(RSA *rsa_pub,
  * 7.2.1.2 RSASVE Generate Operation (RSASVE.GENERATE).
  */
 static int rsasve_generate(PROV_RSA_CTX *prsactx,
-                           unsigned char *out, size_t *outlen,
-                           unsigned char *secret, size_t *secretlen)
+    unsigned char *out, size_t *outlen,
+    unsigned char *secret, size_t *secretlen)
 {
     int ret;
     size_t nlen;
@@ -301,7 +301,7 @@ static int rsasve_generate(PROV_RSA_CTX *prsactx,
     /*
      * If outlen is specified, then it must report the length
      * of the out buffer on input so that we can confirm
-     * its size is sufficent for encapsulation
+     * its size is sufficient for encapsulation
      */
     if (outlen != NULL && *outlen < nlen) {
         ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_OUTPUT_LENGTH);
@@ -332,8 +332,7 @@ static int rsasve_generate(PROV_RSA_CTX *prsactx,
 /**
  * rsasve_recover - Recovers a secret value from ciphertext using an RSA
  * private key.  Once, recovered, the secret value is considered to be a
- * shared secret.  Algorithm is preformed as per
- * NIST SP 800-56B Rev 2
+ * shared secret.  Algorithm is performed as per NIST SP 800-56B Rev 2
  * 7.2.1.3 RSASVE Recovery Operation (RSASVE.RECOVER).
  *
  * This function performs RSA decryption using the private key from the
@@ -351,8 +350,8 @@ static int rsasve_generate(PROV_RSA_CTX *prsactx,
  * error messages are raised using the ERR_raise function.
  */
 static int rsasve_recover(PROV_RSA_CTX *prsactx,
-                          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)
 {
     size_t nlen;
     int ret;
@@ -396,7 +395,7 @@ static int rsasve_recover(PROV_RSA_CTX *prsactx,
 }
 
 static int rsakem_generate(void *vprsactx, unsigned char *out, size_t *outlen,
-                           unsigned char *secret, size_t *secretlen)
+    unsigned char *secret, size_t *secretlen)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -404,15 +403,15 @@ static int rsakem_generate(void *vprsactx, unsigned char *out, size_t *outlen,
         return 0;
 
     switch (prsactx->op) {
-        case KEM_OP_RSASVE:
-            return rsasve_generate(prsactx, out, outlen, secret, secretlen);
-        default:
-            return -2;
+    case KEM_OP_RSASVE:
+        return rsasve_generate(prsactx, out, outlen, secret, secretlen);
+    default:
+        return -2;
     }
 }
 
 static int rsakem_recover(void *vprsactx, unsigned char *out, size_t *outlen,
-                          const unsigned char *in, size_t inlen)
+    const unsigned char *in, size_t inlen)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -420,30 +419,30 @@ static int rsakem_recover(void *vprsactx, unsigned char *out, size_t *outlen,
         return 0;
 
     switch (prsactx->op) {
-        case KEM_OP_RSASVE:
-            return rsasve_recover(prsactx, out, outlen, in, inlen);
-        default:
-            return -2;
+    case KEM_OP_RSASVE:
+        return rsasve_recover(prsactx, out, outlen, in, inlen);
+    default:
+        return -2;
     }
 }
 
 const OSSL_DISPATCH ossl_rsa_asym_kem_functions[] = {
     { OSSL_FUNC_KEM_NEWCTX, (void (*)(void))rsakem_newctx },
     { OSSL_FUNC_KEM_ENCAPSULATE_INIT,
-      (void (*)(void))rsakem_encapsulate_init },
+        (void (*)(void))rsakem_encapsulate_init },
     { OSSL_FUNC_KEM_ENCAPSULATE, (void (*)(void))rsakem_generate },
     { OSSL_FUNC_KEM_DECAPSULATE_INIT,
-      (void (*)(void))rsakem_decapsulate_init },
+        (void (*)(void))rsakem_decapsulate_init },
     { OSSL_FUNC_KEM_DECAPSULATE, (void (*)(void))rsakem_recover },
     { OSSL_FUNC_KEM_FREECTX, (void (*)(void))rsakem_freectx },
     { OSSL_FUNC_KEM_DUPCTX, (void (*)(void))rsakem_dupctx },
     { OSSL_FUNC_KEM_GET_CTX_PARAMS,
-      (void (*)(void))rsakem_get_ctx_params },
+        (void (*)(void))rsakem_get_ctx_params },
     { OSSL_FUNC_KEM_GETTABLE_CTX_PARAMS,
-      (void (*)(void))rsakem_gettable_ctx_params },
+        (void (*)(void))rsakem_gettable_ctx_params },
     { OSSL_FUNC_KEM_SET_CTX_PARAMS,
-      (void (*)(void))rsakem_set_ctx_params },
+        (void (*)(void))rsakem_set_ctx_params },
     { OSSL_FUNC_KEM_SETTABLE_CTX_PARAMS,
-      (void (*)(void))rsakem_settable_ctx_params },
+        (void (*)(void))rsakem_settable_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/kem/template_kem.c b/providers/implementations/kem/template_kem.c
index c621a31a9c350..509a31e129460 100644
--- a/providers/implementations/kem/template_kem.c
+++ b/providers/implementations/kem/template_kem.c
@@ -79,7 +79,7 @@ static void template_freectx(void *vctx)
 }
 
 static int template_init(void *vctx, int operation, void *vkey, void *vauth,
-                         ossl_unused const OSSL_PARAM params[])
+    ossl_unused const OSSL_PARAM params[])
 {
     PROV_TEMPLATE_CTX *ctx = (PROV_TEMPLATE_CTX *)vctx;
 
@@ -94,13 +94,13 @@ static int template_init(void *vctx, int operation, void *vkey, void *vauth,
 }
 
 static int template_encapsulate_init(void *vctx, void *vkey,
-                                     const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return template_init(vctx, EVP_PKEY_OP_ENCAPSULATE, vkey, NULL, params);
 }
 
 static int template_decapsulate_init(void *vctx, void *vkey,
-                                     const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return template_init(vctx, EVP_PKEY_OP_DECAPSULATE, vkey, NULL, params);
 }
@@ -125,13 +125,13 @@ static const OSSL_PARAM known_settable_template_ctx_params[] = {
 };
 
 static const OSSL_PARAM *template_settable_ctx_params(ossl_unused void *vctx,
-                                                      ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_template_ctx_params;
 }
 
 static int template_encapsulate(void *vctx, unsigned char *out, size_t *outlen,
-                                unsigned char *secret, size_t *secretlen)
+    unsigned char *secret, size_t *secretlen)
 {
     debug_print("encaps %p to %p\n", vctx, out);
 
@@ -155,7 +155,7 @@ static int template_encapsulate(void *vctx, unsigned char *out, size_t *outlen,
 }
 
 static int template_decapsulate(void *vctx, unsigned char *out, size_t *outlen,
-                                const unsigned char *in, size_t inlen)
+    const unsigned char *in, size_t inlen)
 {
     debug_print("decaps %p to %p inlen at %zu\n", vctx, out, inlen);
 
@@ -179,15 +179,15 @@ static int template_decapsulate(void *vctx, unsigned char *out, size_t *outlen,
 const OSSL_DISPATCH ossl_template_asym_kem_functions[] = {
     { OSSL_FUNC_KEM_NEWCTX, (void (*)(void))template_newctx },
     { OSSL_FUNC_KEM_ENCAPSULATE_INIT,
-      (void (*)(void))template_encapsulate_init },
+        (void (*)(void))template_encapsulate_init },
     { OSSL_FUNC_KEM_ENCAPSULATE, (void (*)(void))template_encapsulate },
     { OSSL_FUNC_KEM_DECAPSULATE_INIT,
-      (void (*)(void))template_decapsulate_init },
+        (void (*)(void))template_decapsulate_init },
     { OSSL_FUNC_KEM_DECAPSULATE, (void (*)(void))template_decapsulate },
     { OSSL_FUNC_KEM_FREECTX, (void (*)(void))template_freectx },
     { OSSL_FUNC_KEM_SET_CTX_PARAMS,
-      (void (*)(void))template_set_ctx_params },
+        (void (*)(void))template_set_ctx_params },
     { OSSL_FUNC_KEM_SETTABLE_CTX_PARAMS,
-      (void (*)(void))template_settable_ctx_params },
+        (void (*)(void))template_settable_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/keymgmt/dh_kmgmt.c b/providers/implementations/keymgmt/dh_kmgmt.c
index c2ee8593557a1..8a1afe7907b1a 100644
--- a/providers/implementations/keymgmt/dh_kmgmt.c
+++ b/providers/implementations/keymgmt/dh_kmgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-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
@@ -19,10 +19,12 @@
 #include <openssl/core_names.h>
 #include <openssl/bn.h>
 #include <openssl/err.h>
+#include <openssl/self_test.h>
 #include "prov/implementations.h"
 #include "prov/providercommon.h"
 #include "prov/provider_ctx.h"
 #include "crypto/dh.h"
+#include "internal/fips.h"
 #include "internal/sizes.h"
 
 static OSSL_FUNC_keymgmt_new_fn dh_newdata;
@@ -48,7 +50,7 @@ static OSSL_FUNC_keymgmt_export_fn dh_export;
 static OSSL_FUNC_keymgmt_export_types_fn dh_export_types;
 static OSSL_FUNC_keymgmt_dup_fn dh_dup;
 
-#define DH_POSSIBLE_SELECTIONS                                                 \
+#define DH_POSSIBLE_SELECTIONS \
     (OSSL_KEYMGMT_SELECT_KEYPAIR | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS)
 
 struct dh_gen_ctx {
@@ -203,8 +205,7 @@ static int dh_import(void *keydata, int selection, const OSSL_PARAM params[])
     ok = ok && ossl_dh_params_fromdata(dh, params);
 
     if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0) {
-        int include_private =
-            selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
+        int include_private = selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
 
         ok = ok && ossl_dh_key_fromdata(dh, params, include_private);
     }
@@ -213,7 +214,7 @@ static int dh_import(void *keydata, int selection, const OSSL_PARAM params[])
 }
 
 static int dh_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
-                     void *cbarg)
+    void *cbarg)
 {
     DH *dh = keydata;
     OSSL_PARAM_BLD *tmpl = NULL;
@@ -234,8 +235,7 @@ static int dh_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
         ok = ok && ossl_dh_params_todata(dh, tmpl, NULL);
 
     if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0) {
-        int include_private =
-            selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
+        int include_private = selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
 
         ok = ok && ossl_dh_key_todata(dh, tmpl, NULL, include_private);
     }
@@ -254,20 +254,20 @@ static int dh_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
 
 /* IMEXPORT = IMPORT + EXPORT */
 
-# define DH_IMEXPORTABLE_PARAMETERS                                            \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_P, NULL, 0),                             \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_Q, NULL, 0),                             \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_G, NULL, 0),                             \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_COFACTOR, NULL, 0),                      \
-    OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_GINDEX, NULL),                          \
-    OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_PCOUNTER, NULL),                        \
-    OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_H, NULL),                               \
-    OSSL_PARAM_int(OSSL_PKEY_PARAM_DH_PRIV_LEN, NULL),                         \
-    OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_FFC_SEED, NULL, 0),                \
-    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME, NULL, 0)
-# define DH_IMEXPORTABLE_PUBLIC_KEY                                            \
+#define DH_IMEXPORTABLE_PARAMETERS                                  \
+    OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_P, NULL, 0),                  \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_Q, NULL, 0),              \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_G, NULL, 0),              \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_COFACTOR, NULL, 0),       \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_GINDEX, NULL),           \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_PCOUNTER, NULL),         \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_H, NULL),                \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_DH_PRIV_LEN, NULL),          \
+        OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_FFC_SEED, NULL, 0), \
+        OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME, NULL, 0)
+#define DH_IMEXPORTABLE_PUBLIC_KEY \
     OSSL_PARAM_BN(OSSL_PKEY_PARAM_PUB_KEY, NULL, 0)
-# define DH_IMEXPORTABLE_PRIVATE_KEY                                           \
+#define DH_IMEXPORTABLE_PRIVATE_KEY \
     OSSL_PARAM_BN(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0)
 static const OSSL_PARAM dh_all_types[] = {
     DH_IMEXPORTABLE_PARAMETERS,
@@ -285,10 +285,10 @@ static const OSSL_PARAM dh_key_types[] = {
     OSSL_PARAM_END
 };
 static const OSSL_PARAM *dh_types[] = {
-    NULL,                        /* Index 0 = none of them */
-    dh_parameter_types,          /* Index 1 = parameter types */
-    dh_key_types,                /* Index 2 = key types */
-    dh_all_types                 /* Index 3 = 1 + 2 */
+    NULL, /* Index 0 = none of them */
+    dh_parameter_types, /* Index 1 = parameter types */
+    dh_key_types, /* Index 2 = key types */
+    dh_all_types /* Index 3 = 1 + 2 */
 };
 
 static const OSSL_PARAM *dh_imexport_types(int selection)
@@ -330,7 +330,7 @@ static ossl_inline int dh_get_params(void *key, OSSL_PARAM params[])
         if (p->data_type != OSSL_PARAM_OCTET_STRING)
             return 0;
         p->return_size = ossl_dh_key2buf(dh, (unsigned char **)&p->data,
-                                         p->data_size, 0);
+            p->data_size, 0);
         if (p->return_size == 0)
             return 0;
     }
@@ -372,8 +372,8 @@ static int dh_set_params(void *key, const OSSL_PARAM params[])
 
     p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY);
     if (p != NULL
-            && (p->data_type != OSSL_PARAM_OCTET_STRING
-                || !ossl_dh_buf2key(dh, p->data, p->data_size)))
+        && (p->data_type != OSSL_PARAM_OCTET_STRING
+            || !ossl_dh_buf2key(dh, p->data, p->data_size)))
         return 0;
 
     return 1;
@@ -439,13 +439,13 @@ static int dh_validate(const void *keydata, int selection, int checktype)
         ok = ok && dh_validate_private(dh);
 
     if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR)
-            == OSSL_KEYMGMT_SELECT_KEYPAIR)
-        ok = ok && ossl_dh_check_pairwise(dh);
+        == OSSL_KEYMGMT_SELECT_KEYPAIR)
+        ok = ok && ossl_dh_check_pairwise(dh, 0);
     return ok;
 }
 
 static void *dh_gen_init_base(void *provctx, int selection,
-                              const OSSL_PARAM params[], int type)
+    const OSSL_PARAM params[], int type)
 {
     OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(provctx);
     struct dh_gen_ctx *gctx = NULL;
@@ -453,8 +453,7 @@ static void *dh_gen_init_base(void *provctx, int selection,
     if (!ossl_prov_is_running())
         return NULL;
 
-    if ((selection & (OSSL_KEYMGMT_SELECT_KEYPAIR
-                      | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS)) == 0)
+    if ((selection & (OSSL_KEYMGMT_SELECT_KEYPAIR | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS)) == 0)
         return NULL;
 
     if ((gctx = OPENSSL_zalloc(sizeof(*gctx))) != NULL) {
@@ -465,12 +464,12 @@ static void *dh_gen_init_base(void *provctx, int selection,
         gctx->mdname = NULL;
 #ifdef FIPS_MODULE
         gctx->gen_type = (type == DH_FLAG_TYPE_DHX)
-                         ? DH_PARAMGEN_TYPE_FIPS_186_4
-                         : DH_PARAMGEN_TYPE_GROUP;
+            ? DH_PARAMGEN_TYPE_FIPS_186_4
+            : DH_PARAMGEN_TYPE_GROUP;
 #else
         gctx->gen_type = (type == DH_FLAG_TYPE_DHX)
-                         ? DH_PARAMGEN_TYPE_FIPS_186_2
-                         : DH_PARAMGEN_TYPE_GENERATOR;
+            ? DH_PARAMGEN_TYPE_FIPS_186_2
+            : DH_PARAMGEN_TYPE_GENERATOR;
 #endif
         gctx->gindex = -1;
         gctx->hindex = 0;
@@ -486,15 +485,15 @@ static void *dh_gen_init_base(void *provctx, int selection,
 }
 
 static void *dh_gen_init(void *provctx, int selection,
-                         const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return dh_gen_init_base(provctx, selection, params, DH_FLAG_TYPE_DH);
 }
 
 static void *dhx_gen_init(void *provctx, int selection,
-                          const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
-   return dh_gen_init_base(provctx, selection, params, DH_FLAG_TYPE_DHX);
+    return dh_gen_init_base(provctx, selection, params, DH_FLAG_TYPE_DHX);
 }
 
 static int dh_gen_set_template(void *genctx, void *templ)
@@ -509,7 +508,7 @@ static int dh_gen_set_template(void *genctx, void *templ)
 }
 
 static int dh_set_gen_seed(struct dh_gen_ctx *gctx, unsigned char *seed,
-                           size_t seedlen)
+    size_t seedlen)
 {
     OPENSSL_clear_free(gctx->seed, gctx->seedlen);
     gctx->seed = NULL;
@@ -537,8 +536,7 @@ static int dh_gen_common_set_params(void *genctx, const OSSL_PARAM params[])
     p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_TYPE);
     if (p != NULL) {
         if (p->data_type != OSSL_PARAM_UTF8_STRING
-            || ((gen_type =
-                 dh_gen_type_name2id_w_default(p->data, gctx->dh_type)) == -1)) {
+            || ((gen_type = dh_gen_type_name2id_w_default(p->data, gctx->dh_type)) == -1)) {
             ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);
             return 0;
         }
@@ -552,8 +550,7 @@ static int dh_gen_common_set_params(void *genctx, const OSSL_PARAM params[])
         if (p->data_type != OSSL_PARAM_UTF8_STRING
             || p->data == NULL
             || (group = ossl_ffc_name_to_dh_named_group(p->data)) == NULL
-            || ((gctx->group_nid =
-                 ossl_ffc_named_group_get_uid(group)) == NID_undef)) {
+            || ((gctx->group_nid = ossl_ffc_named_group_get_uid(group)) == NID_undef)) {
             ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);
             return 0;
         }
@@ -568,7 +565,7 @@ static int dh_gen_common_set_params(void *genctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *dh_gen_settable_params(ossl_unused void *genctx,
-                                                ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM dh_gen_settable[] = {
         OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_FFC_TYPE, NULL, 0),
@@ -582,7 +579,7 @@ static const OSSL_PARAM *dh_gen_settable_params(ossl_unused void *genctx,
 }
 
 static const OSSL_PARAM *dhx_gen_settable_params(ossl_unused void *genctx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM dhx_gen_settable[] = {
         OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_FFC_TYPE, NULL, 0),
@@ -623,7 +620,7 @@ static int dhx_gen_set_params(void *genctx, const OSSL_PARAM params[])
     if (p != NULL
         && (p->data_type != OSSL_PARAM_OCTET_STRING
             || !dh_set_gen_seed(gctx, p->data, p->data_size)))
-            return 0;
+        return 0;
     if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_QBITS)) != NULL
         && !OSSL_PARAM_get_size_t(p, &gctx->qbits))
         return 0;
@@ -675,7 +672,8 @@ static int dh_gen_set_params(void *genctx, const OSSL_PARAM params[])
         || OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_QBITS) != NULL
         || OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_DIGEST) != NULL
         || OSSL_PARAM_locate_const(params,
-                                   OSSL_PKEY_PARAM_FFC_DIGEST_PROPS) != NULL) {
+               OSSL_PKEY_PARAM_FFC_DIGEST_PROPS)
+            != NULL) {
         ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);
         return 0;
     }
@@ -719,15 +717,15 @@ static void *dh_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
      * added.
      */
     if (!ossl_assert((gctx->gen_type >= DH_PARAMGEN_TYPE_GENERATOR)
-                    && (gctx->gen_type <= DH_PARAMGEN_TYPE_GROUP))) {
+            && (gctx->gen_type <= DH_PARAMGEN_TYPE_GROUP))) {
         ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                       "gen_type set to unsupported value %d", gctx->gen_type);
+            "gen_type set to unsupported value %d", gctx->gen_type);
         return NULL;
     }
 
     /* For parameter generation - If there is a group name just create it */
     if (gctx->gen_type == DH_PARAMGEN_TYPE_GROUP
-            && gctx->ffc_params == NULL) {
+        && gctx->ffc_params == NULL) {
         /* Select a named group if there is not one already */
         if (gctx->group_nid == NID_undef)
             gctx->group_nid = ossl_dh_get_named_group_uid_from_size(gctx->pbits);
@@ -773,11 +771,11 @@ static void *dh_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
              */
             if (gctx->gen_type == DH_PARAMGEN_TYPE_GENERATOR)
                 ret = DH_generate_parameters_ex(dh, gctx->pbits,
-                                                gctx->generator, gencb);
+                    gctx->generator, gencb);
             else
                 ret = ossl_dh_generate_ffc_parameters(dh, gctx->gen_type,
-                                                      gctx->pbits, gctx->qbits,
-                                                      gencb);
+                    gctx->pbits, gctx->qbits,
+                    gencb);
             if (ret <= 0)
                 goto end;
         }
@@ -789,9 +787,18 @@ static void *dh_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
         if (gctx->priv_len > 0)
             DH_set_length(dh, (long)gctx->priv_len);
         ossl_ffc_params_enable_flags(ffc, FFC_PARAM_FLAG_VALIDATE_LEGACY,
-                                     gctx->gen_type == DH_PARAMGEN_TYPE_FIPS_186_2);
+            gctx->gen_type == DH_PARAMGEN_TYPE_FIPS_186_2);
         if (DH_generate_key(dh) <= 0)
             goto end;
+#ifdef FIPS_MODULE
+        if (!ossl_fips_self_testing()) {
+            ret = ossl_dh_check_pairwise(dh, 0);
+            if (ret <= 0) {
+                ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT);
+                goto end;
+            }
+        }
+#endif /* FIPS_MODULE */
     }
     DH_clear_flags(dh, DH_FLAG_TYPE_MASK);
     DH_set_flags(dh, gctx->dh_type);
@@ -846,15 +853,15 @@ const OSSL_DISPATCH ossl_dh_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE, (void (*)(void))dh_gen_set_template },
     { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (void (*)(void))dh_gen_set_params },
     { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,
-      (void (*)(void))dh_gen_settable_params },
+        (void (*)(void))dh_gen_settable_params },
     { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))dh_gen },
     { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))dh_gen_cleanup },
     { OSSL_FUNC_KEYMGMT_LOAD, (void (*)(void))dh_load },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))dh_freedata },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))dh_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))dh_gettable_params },
-    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*) (void))dh_set_params },
-    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*) (void))dh_settable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))dh_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))dh_gettable_params },
+    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))dh_set_params },
+    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))dh_settable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))dh_has },
     { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))dh_match },
     { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))dh_validate },
@@ -878,15 +885,15 @@ const OSSL_DISPATCH ossl_dhx_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE, (void (*)(void))dh_gen_set_template },
     { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (void (*)(void))dhx_gen_set_params },
     { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,
-      (void (*)(void))dhx_gen_settable_params },
+        (void (*)(void))dhx_gen_settable_params },
     { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))dh_gen },
     { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))dh_gen_cleanup },
     { OSSL_FUNC_KEYMGMT_LOAD, (void (*)(void))dh_load },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))dh_freedata },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))dh_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))dh_gettable_params },
-    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*) (void))dh_set_params },
-    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*) (void))dh_settable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))dh_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))dh_gettable_params },
+    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))dh_set_params },
+    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))dh_settable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))dh_has },
     { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))dh_match },
     { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))dh_validate },
@@ -895,7 +902,7 @@ const OSSL_DISPATCH ossl_dhx_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))dh_export },
     { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (void (*)(void))dh_export_types },
     { OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME,
-      (void (*)(void))dhx_query_operation_name },
+        (void (*)(void))dhx_query_operation_name },
     { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))dh_dup },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/keymgmt/dsa_kmgmt.c b/providers/implementations/keymgmt/dsa_kmgmt.c
index 92f661b1f3ab0..c54e4143f9393 100644
--- a/providers/implementations/keymgmt/dsa_kmgmt.c
+++ b/providers/implementations/keymgmt/dsa_kmgmt.c
@@ -49,7 +49,7 @@ static OSSL_FUNC_keymgmt_export_types_fn dsa_export_types;
 static OSSL_FUNC_keymgmt_dup_fn dsa_dup;
 
 #define DSA_DEFAULT_MD "SHA256"
-#define DSA_POSSIBLE_SELECTIONS                                                \
+#define DSA_POSSIBLE_SELECTIONS \
     (OSSL_KEYMGMT_SELECT_KEYPAIR | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS)
 
 struct dsa_gen_ctx {
@@ -72,7 +72,7 @@ struct dsa_gen_ctx {
     void *cbarg;
     OSSL_FIPS_IND_DECLARE
 };
-typedef struct dh_name2id_st{
+typedef struct dh_name2id_st {
     const char *name;
     int id;
 } DSA_GENTYPE_NAME2ID;
@@ -99,7 +99,7 @@ static int dsa_gen_type_name2id(const char *name)
 }
 
 static int dsa_key_todata(DSA *dsa, OSSL_PARAM_BLD *bld, OSSL_PARAM params[],
-                          int include_private)
+    int include_private)
 {
     const BIGNUM *priv = NULL, *pub = NULL;
 
@@ -206,8 +206,7 @@ static int dsa_import(void *keydata, int selection, const OSSL_PARAM params[])
     ok = ok && ossl_dsa_ffc_params_fromdata(dsa, params);
 
     if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0) {
-        int include_private =
-            selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
+        int include_private = selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
 
         ok = ok && ossl_dsa_key_fromdata(dsa, params, include_private);
     }
@@ -216,7 +215,7 @@ static int dsa_import(void *keydata, int selection, const OSSL_PARAM params[])
 }
 
 static int dsa_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
-                      void *cbarg)
+    void *cbarg)
 {
     DSA *dsa = keydata;
     OSSL_PARAM_BLD *tmpl;
@@ -236,8 +235,7 @@ static int dsa_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
     if ((selection & OSSL_KEYMGMT_SELECT_ALL_PARAMETERS) != 0)
         ok = ok && ossl_ffc_params_todata(ossl_dsa_get0_params(dsa), tmpl, NULL);
     if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0) {
-        int include_private =
-            selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
+        int include_private = selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
 
         ok = ok && dsa_key_todata(dsa, tmpl, NULL, include_private);
     }
@@ -256,18 +254,18 @@ static int dsa_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
 
 /* IMEXPORT = IMPORT + EXPORT */
 
-# define DSA_IMEXPORTABLE_PARAMETERS                                           \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_P, NULL, 0),                             \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_Q, NULL, 0),                             \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_G, NULL, 0),                             \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_COFACTOR, NULL, 0),                      \
-    OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_GINDEX, NULL),                          \
-    OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_PCOUNTER, NULL),                        \
-    OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_H, NULL),                               \
-    OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_FFC_SEED, NULL, 0)
-# define DSA_IMEXPORTABLE_PUBLIC_KEY                    \
+#define DSA_IMEXPORTABLE_PARAMETERS                           \
+    OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_P, NULL, 0),            \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_Q, NULL, 0),        \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_G, NULL, 0),        \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_FFC_COFACTOR, NULL, 0), \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_GINDEX, NULL),     \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_PCOUNTER, NULL),   \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_H, NULL),          \
+        OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_FFC_SEED, NULL, 0)
+#define DSA_IMEXPORTABLE_PUBLIC_KEY \
     OSSL_PARAM_BN(OSSL_PKEY_PARAM_PUB_KEY, NULL, 0)
-# define DSA_IMEXPORTABLE_PRIVATE_KEY                   \
+#define DSA_IMEXPORTABLE_PRIVATE_KEY \
     OSSL_PARAM_BN(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0)
 static const OSSL_PARAM dsa_all_types[] = {
     DSA_IMEXPORTABLE_PARAMETERS,
@@ -285,10 +283,10 @@ static const OSSL_PARAM dsa_key_types[] = {
     OSSL_PARAM_END
 };
 static const OSSL_PARAM *dsa_types[] = {
-    NULL,                        /* Index 0 = none of them */
-    dsa_parameter_types,          /* Index 1 = parameter types */
-    dsa_key_types,                /* Index 2 = key types */
-    dsa_all_types                 /* Index 3 = 1 + 2 */
+    NULL, /* Index 0 = none of them */
+    dsa_parameter_types, /* Index 1 = parameter types */
+    dsa_key_types, /* Index 2 = key types */
+    dsa_all_types /* Index 3 = 1 + 2 */
 };
 
 static const OSSL_PARAM *dsa_imexport_types(int selection)
@@ -330,7 +328,7 @@ static ossl_inline int dsa_get_params(void *key, OSSL_PARAM params[])
         && !OSSL_PARAM_set_utf8_string(p, DSA_DEFAULT_MD))
         return 0;
     return ossl_ffc_params_todata(ossl_dsa_get0_params(dsa), NULL, params)
-           && dsa_key_todata(dsa, NULL, params, 1);
+        && dsa_key_todata(dsa, NULL, params, 1);
 }
 
 static const OSSL_PARAM dsa_params[] = {
@@ -406,7 +404,7 @@ static int dsa_validate(const void *keydata, int selection, int checktype)
 }
 
 static void *dsa_gen_init(void *provctx, int selection,
-                          const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(provctx);
     struct dsa_gen_ctx *gctx = NULL;
@@ -448,7 +446,7 @@ static int dsa_gen_set_template(void *genctx, void *templ)
 }
 
 static int dsa_set_gen_seed(struct dsa_gen_ctx *gctx, unsigned char *seed,
-                            size_t seedlen)
+    size_t seedlen)
 {
     OPENSSL_clear_free(gctx->seed, gctx->seedlen);
     gctx->seed = NULL;
@@ -474,7 +472,7 @@ static int dsa_gen_set_params(void *genctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(gctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_PKEY_PARAM_FIPS_SIGN_CHECK))
+            OSSL_PKEY_PARAM_FIPS_SIGN_CHECK))
         return 0;
 
     p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_TYPE);
@@ -509,7 +507,7 @@ static int dsa_gen_set_params(void *genctx, const OSSL_PARAM params[])
     if (p != NULL
         && (p->data_type != OSSL_PARAM_OCTET_STRING
             || !dsa_set_gen_seed(gctx, p->data, p->data_size)))
-            return 0;
+        return 0;
     if ((p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_FFC_PBITS)) != NULL
         && !OSSL_PARAM_get_size_t(p, &gctx->pbits))
         return 0;
@@ -538,7 +536,7 @@ static int dsa_gen_set_params(void *genctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *dsa_gen_settable_params(ossl_unused void *genctx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_FFC_TYPE, NULL, 0),
@@ -551,7 +549,7 @@ static const OSSL_PARAM *dsa_gen_settable_params(ossl_unused void *genctx,
         OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_PCOUNTER, NULL),
         OSSL_PARAM_int(OSSL_PKEY_PARAM_FFC_H, NULL),
         OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_PKEY_PARAM_FIPS_SIGN_CHECK)
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return settable;
 }
@@ -570,11 +568,11 @@ static int dsa_gen_get_params(void *genctx, OSSL_PARAM *params)
 }
 
 static const OSSL_PARAM *dsa_gen_gettable_params(ossl_unused void *ctx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM dsa_gen_gettable_params_table[] = {
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
 
     return dsa_gen_gettable_params_table;
@@ -608,8 +606,8 @@ static void *dsa_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
      * need for DSA keygen either.
      */
     if (!OSSL_FIPS_IND_ON_UNAPPROVED(gctx, OSSL_FIPS_IND_SETTABLE0,
-                                     gctx->libctx, "DSA", "Keygen",
-                                     ossl_fips_config_dsa_sign_disallowed))
+            gctx->libctx, "DSA", "Keygen",
+            ossl_fips_config_dsa_sign_disallowed))
         return 0;
 #endif
 
@@ -618,8 +616,7 @@ static void *dsa_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
         return NULL;
 
     if (gctx->gen_type == DSA_PARAMGEN_TYPE_FIPS_DEFAULT)
-        gctx->gen_type = (gctx->pbits >= 2048 ? DSA_PARAMGEN_TYPE_FIPS_186_4 :
-                                                DSA_PARAMGEN_TYPE_FIPS_186_2);
+        gctx->gen_type = (gctx->pbits >= 2048 ? DSA_PARAMGEN_TYPE_FIPS_186_4 : DSA_PARAMGEN_TYPE_FIPS_186_2);
 
     /*
      * Do a bounds check on context gen_type. Must be in range:
@@ -628,9 +625,9 @@ static void *dsa_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
      * added.
      */
     if (!ossl_assert((gctx->gen_type >= DSA_PARAMGEN_TYPE_FIPS_186_4)
-                    && (gctx->gen_type <= DSA_PARAMGEN_TYPE_FIPS_DEFAULT))) {
+            && (gctx->gen_type <= DSA_PARAMGEN_TYPE_FIPS_DEFAULT))) {
         ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                       "gen_type set to unsupported value %d", gctx->gen_type);
+            "gen_type set to unsupported value %d", gctx->gen_type);
         goto end;
     }
 
@@ -661,13 +658,14 @@ static void *dsa_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
 
     if ((gctx->selection & OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) != 0) {
 
-         if (ossl_dsa_generate_ffc_parameters(dsa, gctx->gen_type,
-                                              gctx->pbits, gctx->qbits,
-                                              gencb) <= 0)
-             goto end;
+        if (ossl_dsa_generate_ffc_parameters(dsa, gctx->gen_type,
+                gctx->pbits, gctx->qbits,
+                gencb)
+            <= 0)
+            goto end;
     }
     ossl_ffc_params_enable_flags(ffc, FFC_PARAM_FLAG_VALIDATE_LEGACY,
-                                 gctx->gen_type == DSA_PARAMGEN_TYPE_FIPS_186_2);
+        gctx->gen_type == DSA_PARAMGEN_TYPE_FIPS_186_2);
     if ((gctx->selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0) {
         if (ffc->p == NULL
             || ffc->q == NULL
@@ -726,16 +724,16 @@ const OSSL_DISPATCH ossl_dsa_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE, (void (*)(void))dsa_gen_set_template },
     { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (void (*)(void))dsa_gen_set_params },
     { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,
-      (void (*)(void))dsa_gen_settable_params },
+        (void (*)(void))dsa_gen_settable_params },
     { OSSL_FUNC_KEYMGMT_GEN_GET_PARAMS, (void (*)(void))dsa_gen_get_params },
     { OSSL_FUNC_KEYMGMT_GEN_GETTABLE_PARAMS,
-      (void (*)(void))dsa_gen_gettable_params },
+        (void (*)(void))dsa_gen_gettable_params },
     { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))dsa_gen },
     { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))dsa_gen_cleanup },
     { OSSL_FUNC_KEYMGMT_LOAD, (void (*)(void))dsa_load },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))dsa_freedata },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))dsa_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))dsa_gettable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))dsa_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))dsa_gettable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))dsa_has },
     { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))dsa_match },
     { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))dsa_validate },
diff --git a/providers/implementations/keymgmt/ec_kmgmt.c b/providers/implementations/keymgmt/ec_kmgmt.c
index 9421aabb14559..305dc3a6b831d 100644
--- a/providers/implementations/keymgmt/ec_kmgmt.c
+++ b/providers/implementations/keymgmt/ec_kmgmt.c
@@ -20,18 +20,20 @@
 #include <openssl/err.h>
 #include <openssl/objects.h>
 #include <openssl/proverr.h>
+#include <openssl/self_test.h>
 #include "crypto/bn.h"
 #include "crypto/ec.h"
 #include "prov/implementations.h"
 #include "prov/providercommon.h"
 #include "prov/provider_ctx.h"
 #include "prov/securitycheck.h"
+#include "internal/fips.h"
 #include "internal/param_build_set.h"
 
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_SM2
-#  include "crypto/sm2.h"
-# endif
+#ifndef OPENSSL_NO_SM2
+#include "crypto/sm2.h"
+#endif
 #endif
 
 static OSSL_FUNC_keymgmt_new_fn ec_newdata;
@@ -59,7 +61,7 @@ static OSSL_FUNC_keymgmt_export_types_fn ec_export_types;
 static OSSL_FUNC_keymgmt_query_operation_name_fn ec_query_operation_name;
 static OSSL_FUNC_keymgmt_dup_fn ec_dup;
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 static OSSL_FUNC_keymgmt_new_fn sm2_newdata;
 static OSSL_FUNC_keymgmt_gen_init_fn sm2_gen_init;
 static OSSL_FUNC_keymgmt_gen_fn sm2_gen;
@@ -69,16 +71,15 @@ static OSSL_FUNC_keymgmt_settable_params_fn sm2_settable_params;
 static OSSL_FUNC_keymgmt_import_fn sm2_import;
 static OSSL_FUNC_keymgmt_query_operation_name_fn sm2_query_operation_name;
 static OSSL_FUNC_keymgmt_validate_fn sm2_validate;
-# endif
+#endif
 #endif
 
 #define EC_DEFAULT_MD "SHA256"
-#define EC_POSSIBLE_SELECTIONS                                                 \
+#define EC_POSSIBLE_SELECTIONS \
     (OSSL_KEYMGMT_SELECT_KEYPAIR | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS)
 #define SM2_DEFAULT_MD "SM3"
 
-static
-const char *ec_query_operation_name(int operation_id)
+static const char *ec_query_operation_name(int operation_id)
 {
     switch (operation_id) {
     case OSSL_OP_KEYEXCH:
@@ -90,9 +91,8 @@ const char *ec_query_operation_name(int operation_id)
 }
 
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_SM2
-static
-const char *sm2_query_operation_name(int operation_id)
+#ifndef OPENSSL_NO_SM2
+static const char *sm2_query_operation_name(int operation_id)
 {
     switch (operation_id) {
     case OSSL_OP_SIGNATURE:
@@ -100,7 +100,7 @@ const char *sm2_query_operation_name(int operation_id)
     }
     return NULL;
 }
-# endif
+#endif
 #endif
 
 /*
@@ -110,10 +110,9 @@ const char *sm2_query_operation_name(int operation_id)
  * This function only exports the bare keypair, domain parameters and other
  * parameters are exported separately.
  */
-static ossl_inline
-int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl,
-                  OSSL_PARAM params[], int include_private,
-                  unsigned char **pub_key)
+static ossl_inline int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl,
+    OSSL_PARAM params[], int include_private,
+    unsigned char **pub_key)
 {
     BIGNUM *x = NULL, *y = NULL;
     const BIGNUM *priv_key = NULL;
@@ -140,7 +139,6 @@ int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl,
         if (bnctx == NULL)
             goto err;
 
-
         /* If we are doing a get then check first before decoding the point */
         if (tmpl == NULL) {
             p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_PUB_KEY);
@@ -153,11 +151,12 @@ int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl,
             point_conversion_form_t format = EC_KEY_get_conv_form(eckey);
 
             if ((pub_key_len = EC_POINT_point2buf(ecg, pub_point,
-                                                  format,
-                                                  pub_key, bnctx)) == 0
+                     format,
+                     pub_key, bnctx))
+                    == 0
                 || !ossl_param_build_set_octet_string(tmpl, p,
-                                                      OSSL_PKEY_PARAM_PUB_KEY,
-                                                      *pub_key, pub_key_len))
+                    OSSL_PKEY_PARAM_PUB_KEY,
+                    *pub_key, pub_key_len))
                 goto err;
         }
         if (px != NULL || py != NULL) {
@@ -176,11 +175,11 @@ int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl,
                 goto err;
             if (px != NULL
                 && !ossl_param_build_set_bn(tmpl, px,
-                                            OSSL_PKEY_PARAM_EC_PUB_X, x))
+                    OSSL_PKEY_PARAM_EC_PUB_X, x))
                 goto err;
             if (py != NULL
                 && !ossl_param_build_set_bn(tmpl, py,
-                                            OSSL_PKEY_PARAM_EC_PUB_Y, y))
+                    OSSL_PKEY_PARAM_EC_PUB_Y, y))
                 goto err;
         }
     }
@@ -228,19 +227,18 @@ int key_to_params(const EC_KEY *eckey, OSSL_PARAM_BLD *tmpl,
         sz = (ecbits + 7) / 8;
 
         if (!ossl_param_build_set_bn_pad(tmpl, params,
-                                         OSSL_PKEY_PARAM_PRIV_KEY,
-                                         priv_key, sz))
+                OSSL_PKEY_PARAM_PRIV_KEY,
+                priv_key, sz))
             goto err;
     }
     ret = 1;
- err:
+err:
     BN_CTX_free(bnctx);
     return ret;
 }
 
-static ossl_inline
-int otherparams_to_params(const EC_KEY *ec, OSSL_PARAM_BLD *tmpl,
-                          OSSL_PARAM params[])
+static ossl_inline int otherparams_to_params(const EC_KEY *ec, OSSL_PARAM_BLD *tmpl,
+    OSSL_PARAM params[])
 {
     int ecdh_cofactor_mode = 0, group_check = 0;
     const char *name = NULL;
@@ -253,32 +251,30 @@ int otherparams_to_params(const EC_KEY *ec, OSSL_PARAM_BLD *tmpl,
     name = ossl_ec_pt_format_id2name((int)format);
     if (name != NULL
         && !ossl_param_build_set_utf8_string(tmpl, params,
-                                             OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
-                                             name))
+            OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+            name))
         return 0;
 
     group_check = EC_KEY_get_flags(ec) & EC_FLAG_CHECK_NAMED_GROUP_MASK;
     name = ossl_ec_check_group_type_id2name(group_check);
     if (name != NULL
         && !ossl_param_build_set_utf8_string(tmpl, params,
-                                             OSSL_PKEY_PARAM_EC_GROUP_CHECK_TYPE,
-                                             name))
+            OSSL_PKEY_PARAM_EC_GROUP_CHECK_TYPE,
+            name))
         return 0;
 
     if ((EC_KEY_get_enc_flags(ec) & EC_PKEY_NO_PUBKEY) != 0
-            && !ossl_param_build_set_int(tmpl, params,
-                                         OSSL_PKEY_PARAM_EC_INCLUDE_PUBLIC, 0))
+        && !ossl_param_build_set_int(tmpl, params,
+            OSSL_PKEY_PARAM_EC_INCLUDE_PUBLIC, 0))
         return 0;
 
-    ecdh_cofactor_mode =
-        (EC_KEY_get_flags(ec) & EC_FLAG_COFACTOR_ECDH) ? 1 : 0;
+    ecdh_cofactor_mode = (EC_KEY_get_flags(ec) & EC_FLAG_COFACTOR_ECDH) ? 1 : 0;
     return ossl_param_build_set_int(tmpl, params,
-                                    OSSL_PKEY_PARAM_USE_COFACTOR_ECDH,
-                                    ecdh_cofactor_mode);
+        OSSL_PKEY_PARAM_USE_COFACTOR_ECDH,
+        ecdh_cofactor_mode);
 }
 
-static
-void *ec_newdata(void *provctx)
+static void *ec_newdata(void *provctx)
 {
     if (!ossl_prov_is_running())
         return NULL;
@@ -286,25 +282,22 @@ void *ec_newdata(void *provctx)
 }
 
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_SM2
-static
-void *sm2_newdata(void *provctx)
+#ifndef OPENSSL_NO_SM2
+static void *sm2_newdata(void *provctx)
 {
     if (!ossl_prov_is_running())
         return NULL;
     return EC_KEY_new_by_curve_name_ex(PROV_LIBCTX_OF(provctx), NULL, NID_sm2);
 }
-# endif
+#endif
 #endif
 
-static
-void ec_freedata(void *keydata)
+static void ec_freedata(void *keydata)
 {
     EC_KEY_free(keydata);
 }
 
-static
-int ec_has(const void *keydata, int selection)
+static int ec_has(const void *keydata, int selection)
 {
     const EC_KEY *ec = keydata;
     int ok = 1;
@@ -389,9 +382,8 @@ static int common_check_sm2(const EC_KEY *ec, int sm2_wanted)
     return 1;
 }
 
-static
-int common_import(void *keydata, int selection, const OSSL_PARAM params[],
-                  int sm2_wanted)
+static int common_import(void *keydata, int selection, const OSSL_PARAM params[],
+    int sm2_wanted)
 {
     EC_KEY *ec = keydata;
     int ok = 1;
@@ -421,8 +413,7 @@ int common_import(void *keydata, int selection, const OSSL_PARAM params[],
         return 0;
 
     if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0) {
-        int include_private =
-            selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
+        int include_private = selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
 
         ok = ok && ossl_ec_key_fromdata(ec, params, include_private);
     }
@@ -432,25 +423,22 @@ int common_import(void *keydata, int selection, const OSSL_PARAM params[],
     return ok;
 }
 
-static
-int ec_import(void *keydata, int selection, const OSSL_PARAM params[])
+static int ec_import(void *keydata, int selection, const OSSL_PARAM params[])
 {
     return common_import(keydata, selection, params, 0);
 }
 
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_SM2
-static
-int sm2_import(void *keydata, int selection, const OSSL_PARAM params[])
+#ifndef OPENSSL_NO_SM2
+static int sm2_import(void *keydata, int selection, const OSSL_PARAM params[])
 {
     return common_import(keydata, selection, params, 1);
 }
-# endif
+#endif
 #endif
 
-static
-int ec_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
-              void *cbarg)
+static int ec_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
+    void *cbarg)
 {
     EC_KEY *ec = keydata;
     OSSL_PARAM_BLD *tmpl = NULL;
@@ -478,7 +466,7 @@ int ec_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
     if ((selection & OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) == 0)
         return 0;
     if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0
-            && (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) == 0)
+        && (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) == 0)
         return 0;
 
     tmpl = OSSL_PARAM_BLD_new();
@@ -492,15 +480,11 @@ int ec_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
             goto end;
         }
         BN_CTX_start(bnctx);
-        ok = ok && ossl_ec_group_todata(EC_KEY_get0_group(ec), tmpl, NULL,
-                                        ossl_ec_key_get_libctx(ec),
-                                        ossl_ec_key_get0_propq(ec),
-                                        bnctx, &genbuf);
+        ok = ok && ossl_ec_group_todata(EC_KEY_get0_group(ec), tmpl, NULL, ossl_ec_key_get_libctx(ec), ossl_ec_key_get0_propq(ec), bnctx, &genbuf);
     }
 
     if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0) {
-        int include_private =
-            selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
+        int include_private = selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
 
         ok = ok && key_to_params(ec, tmpl, NULL, include_private, &pub_key);
     }
@@ -525,27 +509,27 @@ int ec_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
 
 /* IMEXPORT = IMPORT + EXPORT */
 
-# define EC_IMEXPORTABLE_DOM_PARAMETERS                                        \
-    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME, NULL, 0),               \
-    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_EC_ENCODING, NULL, 0),              \
-    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT, NULL, 0),\
-    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_EC_FIELD_TYPE, NULL, 0),            \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_EC_P, NULL, 0),                              \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_EC_A, NULL, 0),                              \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_EC_B, NULL, 0),                              \
-    OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_EC_GENERATOR, NULL, 0),            \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_EC_ORDER, NULL, 0),                          \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_EC_COFACTOR, NULL, 0),                       \
-    OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_EC_SEED, NULL, 0),                 \
-    OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS, NULL)
-
-# define EC_IMEXPORTABLE_PUBLIC_KEY                                            \
+#define EC_IMEXPORTABLE_DOM_PARAMETERS                                               \
+    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME, NULL, 0),                     \
+        OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_EC_ENCODING, NULL, 0),                \
+        OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT, NULL, 0), \
+        OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_EC_FIELD_TYPE, NULL, 0),              \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_EC_P, NULL, 0),                                \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_EC_A, NULL, 0),                                \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_EC_B, NULL, 0),                                \
+        OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_EC_GENERATOR, NULL, 0),              \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_EC_ORDER, NULL, 0),                            \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_EC_COFACTOR, NULL, 0),                         \
+        OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_EC_SEED, NULL, 0),                   \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS, NULL)
+
+#define EC_IMEXPORTABLE_PUBLIC_KEY \
     OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY, NULL, 0)
-# define EC_IMEXPORTABLE_PRIVATE_KEY                                           \
+#define EC_IMEXPORTABLE_PRIVATE_KEY \
     OSSL_PARAM_BN(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0)
-# define EC_IMEXPORTABLE_OTHER_PARAMETERS                                      \
-    OSSL_PARAM_int(OSSL_PKEY_PARAM_USE_COFACTOR_ECDH, NULL),                   \
-    OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_INCLUDE_PUBLIC, NULL)
+#define EC_IMEXPORTABLE_OTHER_PARAMETERS                     \
+    OSSL_PARAM_int(OSSL_PKEY_PARAM_USE_COFACTOR_ECDH, NULL), \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_INCLUDE_PUBLIC, NULL)
 
 /*
  * Include all the possible combinations of OSSL_PARAM arrays for
@@ -556,8 +540,7 @@ int ec_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
  */
 #include "ec_kmgmt_imexport.inc"
 
-static ossl_inline
-const OSSL_PARAM *ec_imexport_types(int selection)
+static ossl_inline const OSSL_PARAM *ec_imexport_types(int selection)
 {
     int type_select = 0;
 
@@ -572,14 +555,12 @@ const OSSL_PARAM *ec_imexport_types(int selection)
     return ec_types[type_select];
 }
 
-static
-const OSSL_PARAM *ec_import_types(int selection)
+static const OSSL_PARAM *ec_import_types(int selection)
 {
     return ec_imexport_types(selection);
 }
 
-static
-const OSSL_PARAM *ec_export_types(int selection)
+static const OSSL_PARAM *ec_export_types(int selection)
 {
     return ec_imexport_types(selection);
 }
@@ -609,24 +590,24 @@ static int ec_get_ecm_params(const EC_GROUP *group, OSSL_PARAM params[])
     m = EC_GROUP_get_degree(group);
     if (!ossl_param_build_set_int(NULL, params, OSSL_PKEY_PARAM_EC_CHAR2_M, m)
         || !ossl_param_build_set_utf8_string(NULL, params,
-                                             OSSL_PKEY_PARAM_EC_CHAR2_TYPE,
-                                             basis_name))
+            OSSL_PKEY_PARAM_EC_CHAR2_TYPE,
+            basis_name))
         goto err;
 
     if (basis_nid == NID_X9_62_tpBasis) {
         if (!EC_GROUP_get_trinomial_basis(group, &k1)
             || !ossl_param_build_set_int(NULL, params,
-                                         OSSL_PKEY_PARAM_EC_CHAR2_TP_BASIS,
-                                         (int)k1))
+                OSSL_PKEY_PARAM_EC_CHAR2_TP_BASIS,
+                (int)k1))
             goto err;
     } else {
         if (!EC_GROUP_get_pentanomial_basis(group, &k1, &k2, &k3)
             || !ossl_param_build_set_int(NULL, params,
-                                         OSSL_PKEY_PARAM_EC_CHAR2_PP_K1, (int)k1)
+                OSSL_PKEY_PARAM_EC_CHAR2_PP_K1, (int)k1)
             || !ossl_param_build_set_int(NULL, params,
-                                         OSSL_PKEY_PARAM_EC_CHAR2_PP_K2, (int)k2)
+                OSSL_PKEY_PARAM_EC_CHAR2_PP_K2, (int)k2)
             || !ossl_param_build_set_int(NULL, params,
-                                         OSSL_PKEY_PARAM_EC_CHAR2_PP_K3, (int)k3))
+                OSSL_PKEY_PARAM_EC_CHAR2_PP_K3, (int)k3))
             goto err;
     }
     ret = 1;
@@ -635,8 +616,7 @@ static int ec_get_ecm_params(const EC_GROUP *group, OSSL_PARAM params[])
 #endif /* OPENSSL_NO_EC2M */
 }
 
-static
-int common_get_params(void *key, OSSL_PARAM params[], int sm2)
+static int common_get_params(void *key, OSSL_PARAM params[], int sm2)
 {
     int ret = 0;
     EC_KEY *eck = key;
@@ -706,22 +686,22 @@ int common_get_params(void *key, OSSL_PARAM params[], int sm2)
     }
 
     if ((p = OSSL_PARAM_locate(params,
-                               OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS))
-            != NULL) {
+             OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS))
+        != NULL) {
         int explicitparams = EC_KEY_decoded_from_explicit_params(eck);
 
         if (explicitparams < 0
-             || !OSSL_PARAM_set_int(p, explicitparams))
+            || !OSSL_PARAM_set_int(p, explicitparams))
             goto err;
     }
 
     if (!sm2) {
         if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_DEFAULT_DIGEST)) != NULL
-                && !OSSL_PARAM_set_utf8_string(p, EC_DEFAULT_MD))
+            && !OSSL_PARAM_set_utf8_string(p, EC_DEFAULT_MD))
             goto err;
     } else {
         if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_DEFAULT_DIGEST)) != NULL
-                && !OSSL_PARAM_set_utf8_string(p, SM2_DEFAULT_MD))
+            && !OSSL_PARAM_set_utf8_string(p, SM2_DEFAULT_MD))
             goto err;
     }
 
@@ -731,15 +711,15 @@ int common_get_params(void *key, OSSL_PARAM params[], int sm2)
         if (p != NULL) {
             int ecdh_cofactor_mode = 0;
 
-            ecdh_cofactor_mode =
-                (EC_KEY_get_flags(eck) & EC_FLAG_COFACTOR_ECDH) ? 1 : 0;
+            ecdh_cofactor_mode = (EC_KEY_get_flags(eck) & EC_FLAG_COFACTOR_ECDH) ? 1 : 0;
 
             if (!OSSL_PARAM_set_int(p, ecdh_cofactor_mode))
                 goto err;
         }
     }
     if ((p = OSSL_PARAM_locate(params,
-                               OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY)) != NULL) {
+             OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY))
+        != NULL) {
         const EC_POINT *ecp = EC_KEY_get0_public_key(key);
 
         if (ecp == NULL) {
@@ -747,17 +727,17 @@ int common_get_params(void *key, OSSL_PARAM params[], int sm2)
             goto err;
         }
         p->return_size = EC_POINT_point2oct(ecg, ecp,
-                                            POINT_CONVERSION_UNCOMPRESSED,
-                                            p->data, p->data_size, bnctx);
+            POINT_CONVERSION_UNCOMPRESSED,
+            p->data, p->data_size, bnctx);
         if (p->return_size == 0)
             goto err;
     }
 
     ret = ec_get_ecm_params(ecg, params)
-          && ossl_ec_group_todata(ecg, NULL, params, libctx, propq, bnctx,
-                                  &genbuf)
-          && key_to_params(eck, NULL, params, 1, &pub_key)
-          && otherparams_to_params(eck, NULL, params);
+        && ossl_ec_group_todata(ecg, NULL, params, libctx, propq, bnctx,
+            &genbuf)
+        && key_to_params(eck, NULL, params, 1, &pub_key)
+        && otherparams_to_params(eck, NULL, params);
 err:
     OPENSSL_free(genbuf);
     OPENSSL_free(pub_key);
@@ -766,22 +746,21 @@ int common_get_params(void *key, OSSL_PARAM params[], int sm2)
     return ret;
 }
 
-static
-int ec_get_params(void *key, OSSL_PARAM params[])
+static int ec_get_params(void *key, OSSL_PARAM params[])
 {
     return common_get_params(key, params, 0);
 }
 
 #ifndef OPENSSL_NO_EC2M
-# define EC2M_GETTABLE_DOM_PARAMS                                              \
-        OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_CHAR2_M, NULL),                      \
-        OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_EC_CHAR2_TYPE, NULL, 0),        \
-        OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_CHAR2_TP_BASIS, NULL),               \
-        OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_CHAR2_PP_K1, NULL),                  \
-        OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_CHAR2_PP_K2, NULL),                  \
+#define EC2M_GETTABLE_DOM_PARAMS                                        \
+    OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_CHAR2_M, NULL),                   \
+        OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_EC_CHAR2_TYPE, NULL, 0), \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_CHAR2_TP_BASIS, NULL),        \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_CHAR2_PP_K1, NULL),           \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_CHAR2_PP_K2, NULL),           \
         OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_CHAR2_PP_K3, NULL),
 #else
-# define EC2M_GETTABLE_DOM_PARAMS
+#define EC2M_GETTABLE_DOM_PARAMS
 #endif
 
 static const OSSL_PARAM ec_known_gettable_params[] = {
@@ -793,7 +772,7 @@ static const OSSL_PARAM ec_known_gettable_params[] = {
     OSSL_PARAM_int(OSSL_PKEY_PARAM_EC_DECODED_FROM_EXPLICIT_PARAMS, NULL),
     EC_IMEXPORTABLE_DOM_PARAMETERS,
     EC2M_GETTABLE_DOM_PARAMS
-    EC_IMEXPORTABLE_PUBLIC_KEY,
+        EC_IMEXPORTABLE_PUBLIC_KEY,
     OSSL_PARAM_BN(OSSL_PKEY_PARAM_EC_PUB_X, NULL, 0),
     OSSL_PARAM_BN(OSSL_PKEY_PARAM_EC_PUB_Y, NULL, 0),
     EC_IMEXPORTABLE_PRIVATE_KEY,
@@ -801,8 +780,7 @@ static const OSSL_PARAM ec_known_gettable_params[] = {
     OSSL_PARAM_END
 };
 
-static
-const OSSL_PARAM *ec_gettable_params(void *provctx)
+static const OSSL_PARAM *ec_gettable_params(void *provctx)
 {
     return ec_known_gettable_params;
 }
@@ -818,14 +796,12 @@ static const OSSL_PARAM ec_known_settable_params[] = {
     OSSL_PARAM_END
 };
 
-static
-const OSSL_PARAM *ec_settable_params(void *provctx)
+static const OSSL_PARAM *ec_settable_params(void *provctx)
 {
     return ec_known_settable_params;
 }
 
-static
-int ec_set_params(void *key, const OSSL_PARAM params[])
+static int ec_set_params(void *key, const OSSL_PARAM params[])
 {
     EC_KEY *eck = key;
     const OSSL_PARAM *p;
@@ -844,8 +820,8 @@ int ec_set_params(void *key, const OSSL_PARAM params[])
         int ret = 1;
 
         if (ctx == NULL
-                || p->data_type != OSSL_PARAM_OCTET_STRING
-                || !EC_KEY_oct2key(key, p->data, p->data_size, ctx))
+            || p->data_type != OSSL_PARAM_OCTET_STRING
+            || !EC_KEY_oct2key(key, p->data, p->data_size, ctx))
             ret = 0;
         BN_CTX_free(ctx);
         if (!ret)
@@ -856,9 +832,8 @@ int ec_set_params(void *key, const OSSL_PARAM params[])
 }
 
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_SM2
-static
-int sm2_get_params(void *key, OSSL_PARAM params[])
+#ifndef OPENSSL_NO_SM2
+static int sm2_get_params(void *key, OSSL_PARAM params[])
 {
     return common_get_params(key, params, 1);
 }
@@ -878,8 +853,7 @@ static const OSSL_PARAM sm2_known_gettable_params[] = {
     OSSL_PARAM_END
 };
 
-static
-const OSSL_PARAM *sm2_gettable_params(ossl_unused void *provctx)
+static const OSSL_PARAM *sm2_gettable_params(ossl_unused void *provctx)
 {
     return sm2_known_gettable_params;
 }
@@ -889,14 +863,12 @@ static const OSSL_PARAM sm2_known_settable_params[] = {
     OSSL_PARAM_END
 };
 
-static
-const OSSL_PARAM *sm2_settable_params(ossl_unused void *provctx)
+static const OSSL_PARAM *sm2_settable_params(ossl_unused void *provctx)
 {
     return sm2_known_settable_params;
 }
 
-static
-int sm2_validate(const void *keydata, int selection, int checktype)
+static int sm2_validate(const void *keydata, int selection, int checktype)
 {
     const EC_KEY *eck = keydata;
     int ok = 1;
@@ -909,7 +881,7 @@ int sm2_validate(const void *keydata, int selection, int checktype)
         return 1; /* nothing to validate */
 
     ctx = BN_CTX_new_ex(ossl_ec_key_get_libctx(eck));
-    if  (ctx == NULL)
+    if (ctx == NULL)
         return 0;
 
     if ((selection & OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) != 0)
@@ -931,11 +903,10 @@ int sm2_validate(const void *keydata, int selection, int checktype)
     BN_CTX_free(ctx);
     return ok;
 }
-# endif
+#endif
 #endif
 
-static
-int ec_validate(const void *keydata, int selection, int checktype)
+static int ec_validate(const void *keydata, int selection, int checktype)
 {
     const EC_KEY *eck = keydata;
     int ok = 1;
@@ -948,15 +919,14 @@ int ec_validate(const void *keydata, int selection, int checktype)
         return 1; /* nothing to validate */
 
     ctx = BN_CTX_new_ex(ossl_ec_key_get_libctx(eck));
-    if  (ctx == NULL)
+    if (ctx == NULL)
         return 0;
 
     if ((selection & OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) != 0) {
         int flags = EC_KEY_get_flags(eck);
 
         if ((flags & EC_FLAG_CHECK_NAMED_GROUP) != 0)
-            ok = ok && EC_GROUP_check_named_curve(EC_KEY_get0_group(eck),
-                           (flags & EC_FLAG_CHECK_NAMED_GROUP_NIST) != 0, ctx) > 0;
+            ok = ok && EC_GROUP_check_named_curve(EC_KEY_get0_group(eck), (flags & EC_FLAG_CHECK_NAMED_GROUP_NIST) != 0, ctx) > 0;
         else
             ok = ok && EC_GROUP_check(EC_KEY_get0_group(eck), ctx);
     }
@@ -997,7 +967,7 @@ struct ec_gen_ctx {
 };
 
 static void *ec_gen_init(void *provctx, int selection,
-                         const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(provctx);
     struct ec_gen_ctx *gctx = NULL;
@@ -1011,7 +981,7 @@ static void *ec_gen_init(void *provctx, int selection,
         gctx->ecdh_mode = 0;
         OSSL_FIPS_IND_INIT(gctx)
         if (!ec_gen_set_params(gctx, params)) {
-            OPENSSL_free(gctx);
+            ec_gen_cleanup(gctx);
             gctx = NULL;
         }
     }
@@ -1019,9 +989,9 @@ static void *ec_gen_init(void *provctx, int selection,
 }
 
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 static void *sm2_gen_init(void *provctx, int selection,
-                         const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     struct ec_gen_ctx *gctx = ec_gen_init(provctx, selection, params);
 
@@ -1034,7 +1004,7 @@ static void *sm2_gen_init(void *provctx, int selection,
     }
     return NULL;
 }
-# endif
+#endif
 #endif
 
 static int ec_gen_set_group(void *genctx, const EC_GROUP *src)
@@ -1065,42 +1035,42 @@ static int ec_gen_set_template(void *genctx, void *templ)
     return ec_gen_set_group(gctx, ec_group);
 }
 
-#define COPY_INT_PARAM(params, key, val)                                       \
-p = OSSL_PARAM_locate_const(params, key);                                      \
-if (p != NULL && !OSSL_PARAM_get_int(p, &val))                                 \
-    goto err;
-
-#define COPY_UTF8_PARAM(params, key, val)                                      \
-p = OSSL_PARAM_locate_const(params, key);                                      \
-if (p != NULL) {                                                               \
-    if (p->data_type != OSSL_PARAM_UTF8_STRING)                                \
-        goto err;                                                              \
-    OPENSSL_free(val);                                                         \
-    val = OPENSSL_strdup(p->data);                                             \
-    if (val == NULL)                                                           \
-        goto err;                                                              \
-}
+#define COPY_INT_PARAM(params, key, val)           \
+    p = OSSL_PARAM_locate_const(params, key);      \
+    if (p != NULL && !OSSL_PARAM_get_int(p, &val)) \
+        goto err;
 
-#define COPY_OCTET_PARAM(params, key, val, len)                                \
-p = OSSL_PARAM_locate_const(params, key);                                      \
-if (p != NULL) {                                                               \
-    if (p->data_type != OSSL_PARAM_OCTET_STRING)                               \
-        goto err;                                                              \
-    OPENSSL_free(val);                                                         \
-    len = p->data_size;                                                        \
-    val = OPENSSL_memdup(p->data, p->data_size);                               \
-    if (val == NULL)                                                           \
-        goto err;                                                              \
-}
+#define COPY_UTF8_PARAM(params, key, val)           \
+    p = OSSL_PARAM_locate_const(params, key);       \
+    if (p != NULL) {                                \
+        if (p->data_type != OSSL_PARAM_UTF8_STRING) \
+            goto err;                               \
+        OPENSSL_free(val);                          \
+        val = OPENSSL_strdup(p->data);              \
+        if (val == NULL)                            \
+            goto err;                               \
+    }
 
-#define COPY_BN_PARAM(params, key, bn)                                         \
-p = OSSL_PARAM_locate_const(params, key);                                      \
-if (p != NULL) {                                                               \
-    if (bn == NULL)                                                            \
-        bn = BN_new();                                                         \
-    if (bn == NULL || !OSSL_PARAM_get_BN(p, &bn))                              \
-        goto err;                                                              \
-}
+#define COPY_OCTET_PARAM(params, key, val, len)      \
+    p = OSSL_PARAM_locate_const(params, key);        \
+    if (p != NULL) {                                 \
+        if (p->data_type != OSSL_PARAM_OCTET_STRING) \
+            goto err;                                \
+        OPENSSL_free(val);                           \
+        len = p->data_size;                          \
+        val = OPENSSL_memdup(p->data, p->data_size); \
+        if (val == NULL)                             \
+            goto err;                                \
+    }
+
+#define COPY_BN_PARAM(params, key, bn)                \
+    p = OSSL_PARAM_locate_const(params, key);         \
+    if (p != NULL) {                                  \
+        if (bn == NULL)                               \
+            bn = BN_new();                            \
+        if (bn == NULL || !OSSL_PARAM_get_BN(p, &bn)) \
+            goto err;                                 \
+    }
 
 static int ec_gen_set_params(void *genctx, const OSSL_PARAM params[])
 {
@@ -1109,7 +1079,7 @@ static int ec_gen_set_params(void *genctx, const OSSL_PARAM params[])
     const OSSL_PARAM *p;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(gctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_PKEY_PARAM_FIPS_KEY_CHECK))
+            OSSL_PKEY_PARAM_FIPS_KEY_CHECK))
         goto err;
 
     COPY_INT_PARAM(params, OSSL_PKEY_PARAM_USE_COFACTOR_ECDH, gctx->ecdh_mode);
@@ -1128,10 +1098,10 @@ static int ec_gen_set_params(void *genctx, const OSSL_PARAM params[])
 
     COPY_OCTET_PARAM(params, OSSL_PKEY_PARAM_EC_SEED, gctx->seed, gctx->seed_len);
     COPY_OCTET_PARAM(params, OSSL_PKEY_PARAM_EC_GENERATOR, gctx->gen,
-                     gctx->gen_len);
+        gctx->gen_len);
 
     COPY_OCTET_PARAM(params, OSSL_PKEY_PARAM_DHKEM_IKM, gctx->dhkem_ikm,
-                     gctx->dhkem_ikmlen);
+        gctx->dhkem_ikmlen);
 
     ret = 1;
 err:
@@ -1151,24 +1121,24 @@ static int ec_gen_set_group_from_params(struct ec_gen_ctx *gctx)
 
     if (gctx->encoding != NULL
         && !OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_PKEY_PARAM_EC_ENCODING,
-                                            gctx->encoding, 0))
+            gctx->encoding, 0))
         goto err;
 
     if (gctx->pt_format != NULL
         && !OSSL_PARAM_BLD_push_utf8_string(bld,
-                                            OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
-                                            gctx->pt_format, 0))
+            OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+            gctx->pt_format, 0))
         goto err;
 
     if (gctx->group_name != NULL) {
         if (!OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_PKEY_PARAM_GROUP_NAME,
-                                             gctx->group_name, 0))
+                gctx->group_name, 0))
             goto err;
         /* Ignore any other parameters if there is a group name */
         goto build;
     } else if (gctx->field_type != NULL) {
         if (!OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_PKEY_PARAM_EC_FIELD_TYPE,
-                                             gctx->field_type, 0))
+                gctx->field_type, 0))
             goto err;
     } else {
         goto err;
@@ -1185,17 +1155,17 @@ static int ec_gen_set_group_from_params(struct ec_gen_ctx *gctx)
 
     if (gctx->cofactor != NULL
         && !OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_COFACTOR,
-                                   gctx->cofactor))
+            gctx->cofactor))
         goto err;
 
     if (gctx->seed != NULL
         && !OSSL_PARAM_BLD_push_octet_string(bld, OSSL_PKEY_PARAM_EC_SEED,
-                                             gctx->seed, gctx->seed_len))
+            gctx->seed, gctx->seed_len))
         goto err;
 
     if (gctx->gen == NULL
         || !OSSL_PARAM_BLD_push_octet_string(bld, OSSL_PKEY_PARAM_EC_GENERATOR,
-                                             gctx->gen, gctx->gen_len))
+            gctx->gen, gctx->gen_len))
         goto err;
 build:
     params = OSSL_PARAM_BLD_to_param(bld);
@@ -1216,7 +1186,7 @@ static int ec_gen_set_group_from_params(struct ec_gen_ctx *gctx)
 }
 
 static const OSSL_PARAM *ec_gen_settable_params(ossl_unused void *genctx,
-                                                ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME, NULL, 0),
@@ -1233,17 +1203,17 @@ static const OSSL_PARAM *ec_gen_settable_params(ossl_unused void *genctx,
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_EC_SEED, NULL, 0),
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_DHKEM_IKM, NULL, 0),
         OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_PKEY_PARAM_FIPS_KEY_CHECK)
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return settable;
 }
 
 static const OSSL_PARAM *ec_gen_gettable_params(ossl_unused void *genctx,
-                                                ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_ec_gen_gettable_ctx_params[] = {
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_ec_gen_gettable_ctx_params;
 }
@@ -1305,8 +1275,8 @@ static void *ec_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
     }
 #ifdef FIPS_MODULE
     if (!ossl_fips_ind_ec_key_check(OSSL_FIPS_IND_GET(gctx),
-                                    OSSL_FIPS_IND_SETTABLE0, gctx->libctx,
-                                    gctx->gen_group, "EC KeyGen", 1))
+            OSSL_FIPS_IND_SETTABLE0, gctx->libctx,
+            gctx->gen_group, "EC KeyGen", 1))
         goto err;
 #endif
 
@@ -1317,8 +1287,7 @@ static void *ec_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
     if ((gctx->selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0) {
 #ifndef FIPS_MODULE
         if (gctx->dhkem_ikm != NULL && gctx->dhkem_ikmlen != 0)
-            ret = ret && ossl_ec_generate_key_dhkem(ec, gctx->dhkem_ikm,
-                                                    gctx->dhkem_ikmlen);
+            ret = ret && ossl_ec_generate_key_dhkem(ec, gctx->dhkem_ikm, gctx->dhkem_ikmlen);
         else
 #endif
             ret = ret && EC_KEY_generate_key(ec);
@@ -1328,8 +1297,22 @@ static void *ec_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
         ret = ret && ossl_ec_set_ecdh_cofactor_mode(ec, gctx->ecdh_mode);
 
     if (gctx->group_check != NULL)
-        ret = ret && ossl_ec_set_check_group_type_from_name(ec,
-                                                            gctx->group_check);
+        ret = ret && ossl_ec_set_check_group_type_from_name(ec, gctx->group_check);
+#ifdef FIPS_MODULE
+    if (ret > 0
+        && !ossl_fips_self_testing()
+        && EC_KEY_get0_public_key(ec) != NULL
+        && EC_KEY_get0_private_key(ec) != NULL
+        && EC_KEY_get0_group(ec) != NULL) {
+        BN_CTX *bnctx = BN_CTX_new_ex(ossl_ec_key_get_libctx(ec));
+
+        ret = bnctx != NULL && ossl_ec_key_pairwise_check(ec, bnctx);
+        BN_CTX_free(bnctx);
+        if (ret <= 0)
+            ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT);
+    }
+#endif /* FIPS_MODULE */
+
     if (ret)
         return ec;
 err:
@@ -1339,7 +1322,7 @@ static void *ec_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
 }
 
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 /*
  * The callback arguments (osslcb & cbarg) are not used by EC_KEY generation
  */
@@ -1387,7 +1370,7 @@ static void *sm2_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
     EC_KEY_free(ec);
     return NULL;
 }
-# endif
+#endif
 #endif
 
 static void ec_gen_cleanup(void *genctx)
@@ -1414,7 +1397,7 @@ static void ec_gen_cleanup(void *genctx)
 }
 
 static void *common_load(const void *reference, size_t reference_sz,
-                         int sm2_wanted)
+    int sm2_wanted)
 {
     EC_KEY *ec = NULL;
 
@@ -1438,12 +1421,12 @@ static void *ec_load(const void *reference, size_t reference_sz)
 }
 
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 static void *sm2_load(const void *reference, size_t reference_sz)
 {
     return common_load(reference, reference_sz, 1);
 }
-# endif
+#endif
 #endif
 
 static void *ec_dup(const void *keydata_from, int selection)
@@ -1457,21 +1440,21 @@ const OSSL_DISPATCH ossl_ec_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))ec_newdata },
     { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))ec_gen_init },
     { OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE,
-      (void (*)(void))ec_gen_set_template },
+        (void (*)(void))ec_gen_set_template },
     { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (void (*)(void))ec_gen_set_params },
     { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,
-      (void (*)(void))ec_gen_settable_params },
+        (void (*)(void))ec_gen_settable_params },
     { OSSL_FUNC_KEYMGMT_GEN_GET_PARAMS, (void (*)(void))ec_gen_get_params },
     { OSSL_FUNC_KEYMGMT_GEN_GETTABLE_PARAMS,
-      (void (*)(void))ec_gen_gettable_params },
+        (void (*)(void))ec_gen_gettable_params },
     { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))ec_gen },
     { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))ec_gen_cleanup },
     { OSSL_FUNC_KEYMGMT_LOAD, (void (*)(void))ec_load },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))ec_freedata },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))ec_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))ec_gettable_params },
-    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*) (void))ec_set_params },
-    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*) (void))ec_settable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))ec_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))ec_gettable_params },
+    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))ec_set_params },
+    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))ec_settable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))ec_has },
     { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))ec_match },
     { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))ec_validate },
@@ -1480,29 +1463,29 @@ const OSSL_DISPATCH ossl_ec_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))ec_export },
     { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (void (*)(void))ec_export_types },
     { OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME,
-      (void (*)(void))ec_query_operation_name },
+        (void (*)(void))ec_query_operation_name },
     { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))ec_dup },
     OSSL_DISPATCH_END
 };
 
 #ifndef FIPS_MODULE
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 const OSSL_DISPATCH ossl_sm2_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))sm2_newdata },
     { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))sm2_gen_init },
     { OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE,
-      (void (*)(void))ec_gen_set_template },
+        (void (*)(void))ec_gen_set_template },
     { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (void (*)(void))ec_gen_set_params },
     { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,
-      (void (*)(void))ec_gen_settable_params },
+        (void (*)(void))ec_gen_settable_params },
     { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))sm2_gen },
     { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))ec_gen_cleanup },
     { OSSL_FUNC_KEYMGMT_LOAD, (void (*)(void))sm2_load },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))ec_freedata },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))sm2_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))sm2_gettable_params },
-    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*) (void))ec_set_params },
-    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*) (void))sm2_settable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))sm2_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))sm2_gettable_params },
+    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))ec_set_params },
+    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))sm2_settable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))ec_has },
     { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))ec_match },
     { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))sm2_validate },
@@ -1511,9 +1494,9 @@ const OSSL_DISPATCH ossl_sm2_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))ec_export },
     { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (void (*)(void))ec_export_types },
     { OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME,
-      (void (*)(void))sm2_query_operation_name },
+        (void (*)(void))sm2_query_operation_name },
     { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))ec_dup },
     OSSL_DISPATCH_END
 };
-# endif
+#endif
 #endif
diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c
index b8d316ba8e9c8..36bea3a48fd1f 100644
--- a/providers/implementations/keymgmt/ecx_kmgmt.c
+++ b/providers/implementations/keymgmt/ecx_kmgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-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
@@ -17,6 +17,7 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #include <openssl/self_test.h>
+#include "internal/fips.h"
 #include "internal/param_build_set.h"
 #include <openssl/param_build.h>
 #include "crypto/ecx.h"
@@ -26,8 +27,8 @@
 #include "prov/ecx.h"
 #include "prov/securitycheck.h"
 #ifdef S390X_EC_ASM
-# include "s390x_arch.h"
-# include <openssl/sha.h>   /* For SHA512_DIGEST_LENGTH */
+#include "s390x_arch.h"
+#include <openssl/sha.h> /* For SHA512_DIGEST_LENGTH */
 #endif
 
 static OSSL_FUNC_keymgmt_new_fn x25519_new_key;
@@ -92,12 +93,21 @@ static void *s390x_ecd_keygen25519(struct ecx_gen_ctx *gctx);
 static void *s390x_ecd_keygen448(struct ecx_gen_ctx *gctx);
 #endif
 
+#ifdef FIPS_MODULE
+static int ecd_fips140_pairwise_test(const ECX_KEY *ecx, int type, int self_test);
+#endif /* FIPS_MODULE */
+
+static ossl_inline int ecx_key_type_is_ed(ECX_KEY_TYPE type)
+{
+    return type == ECX_KEY_TYPE_ED25519 || type == ECX_KEY_TYPE_ED448;
+}
+
 static void *x25519_new_key(void *provctx)
 {
     if (!ossl_prov_is_running())
         return 0;
     return ossl_ecx_key_new(PROV_LIBCTX_OF(provctx), ECX_KEY_TYPE_X25519, 0,
-                            NULL);
+        NULL);
 }
 
 static void *x448_new_key(void *provctx)
@@ -105,7 +115,7 @@ static void *x448_new_key(void *provctx)
     if (!ossl_prov_is_running())
         return 0;
     return ossl_ecx_key_new(PROV_LIBCTX_OF(provctx), ECX_KEY_TYPE_X448, 0,
-                            NULL);
+        NULL);
 }
 
 static void *ed25519_new_key(void *provctx)
@@ -113,7 +123,7 @@ static void *ed25519_new_key(void *provctx)
     if (!ossl_prov_is_running())
         return 0;
     return ossl_ecx_key_new(PROV_LIBCTX_OF(provctx), ECX_KEY_TYPE_ED25519, 0,
-                            NULL);
+        NULL);
 }
 
 static void *ed448_new_key(void *provctx)
@@ -121,7 +131,7 @@ static void *ed448_new_key(void *provctx)
     if (!ossl_prov_is_running())
         return 0;
     return ossl_ecx_key_new(PROV_LIBCTX_OF(provctx), ECX_KEY_TYPE_ED448, 0,
-                            NULL);
+        NULL);
 }
 
 static int ecx_has(const void *keydata, int selection)
@@ -212,28 +222,28 @@ static int ecx_import(void *keydata, int selection, const OSSL_PARAM params[])
 }
 
 static int key_to_params(ECX_KEY *key, OSSL_PARAM_BLD *tmpl,
-                         OSSL_PARAM params[], int include_private)
+    OSSL_PARAM params[], int include_private)
 {
     if (key == NULL)
         return 0;
 
     if (!ossl_param_build_set_octet_string(tmpl, params,
-                                           OSSL_PKEY_PARAM_PUB_KEY,
-                                           key->pubkey, key->keylen))
+            OSSL_PKEY_PARAM_PUB_KEY,
+            key->pubkey, key->keylen))
         return 0;
 
     if (include_private
         && key->privkey != NULL
         && !ossl_param_build_set_octet_string(tmpl, params,
-                                              OSSL_PKEY_PARAM_PRIV_KEY,
-                                              key->privkey, key->keylen))
+            OSSL_PKEY_PARAM_PRIV_KEY,
+            key->privkey, key->keylen))
         return 0;
 
     return 1;
 }
 
 static int ecx_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
-                      void *cbarg)
+    void *cbarg)
 {
     ECX_KEY *key = keydata;
     OSSL_PARAM_BLD *tmpl;
@@ -268,9 +278,9 @@ static int ecx_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
     return ret;
 }
 
-#define ECX_KEY_TYPES()                                                        \
-OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY, NULL, 0),                     \
-OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0)
+#define ECX_KEY_TYPES()                                        \
+    OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY, NULL, 0), \
+        OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0)
 
 static const OSSL_PARAM ecx_key_types[] = {
     ECX_KEY_TYPES(),
@@ -284,7 +294,7 @@ static const OSSL_PARAM *ecx_imexport_types(int selection)
 }
 
 static int ecx_get_params(void *key, OSSL_PARAM params[], int bits, int secbits,
-                          int size)
+    int size)
 {
     ECX_KEY *ecx = key;
     OSSL_PARAM *p;
@@ -299,8 +309,8 @@ static int ecx_get_params(void *key, OSSL_PARAM params[], int bits, int secbits,
         && !OSSL_PARAM_set_int(p, size))
         return 0;
     if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY)) != NULL
-            && (ecx->type == ECX_KEY_TYPE_X25519
-                || ecx->type == ECX_KEY_TYPE_X448)) {
+        && (ecx->type == ECX_KEY_TYPE_X25519
+            || ecx->type == ECX_KEY_TYPE_X448)) {
         if (!OSSL_PARAM_set_octet_string(p, ecx->pubkey, ecx->keylen))
             return 0;
     }
@@ -323,7 +333,8 @@ static int ed_get_params(void *key, OSSL_PARAM params[])
     OSSL_PARAM *p;
 
     if ((p = OSSL_PARAM_locate(params,
-                               OSSL_PKEY_PARAM_MANDATORY_DIGEST)) != NULL
+             OSSL_PKEY_PARAM_MANDATORY_DIGEST))
+            != NULL
         && !OSSL_PARAM_set_utf8_string(p, ""))
         return 0;
     return 1;
@@ -332,26 +343,26 @@ static int ed_get_params(void *key, OSSL_PARAM params[])
 static int x25519_get_params(void *key, OSSL_PARAM params[])
 {
     return ecx_get_params(key, params, X25519_BITS, X25519_SECURITY_BITS,
-                          X25519_KEYLEN);
+        X25519_KEYLEN);
 }
 
 static int x448_get_params(void *key, OSSL_PARAM params[])
 {
     return ecx_get_params(key, params, X448_BITS, X448_SECURITY_BITS,
-                          X448_KEYLEN);
+        X448_KEYLEN);
 }
 
 static int ed25519_get_params(void *key, OSSL_PARAM params[])
 {
     return ecx_get_params(key, params, ED25519_BITS, ED25519_SECURITY_BITS,
-                          ED25519_SIGSIZE)
+               ED25519_SIGSIZE)
         && ed_get_params(key, params);
 }
 
 static int ed448_get_params(void *key, OSSL_PARAM params[])
 {
     return ecx_get_params(key, params, ED448_BITS, ED448_SECURITY_BITS,
-                          ED448_SIGSIZE)
+               ED448_SIGSIZE)
         && ed_get_params(key, params);
 }
 
@@ -359,17 +370,17 @@ static const OSSL_PARAM ecx_gettable_params[] = {
     OSSL_PARAM_int(OSSL_PKEY_PARAM_BITS, NULL),
     OSSL_PARAM_int(OSSL_PKEY_PARAM_SECURITY_BITS, NULL),
     OSSL_PARAM_int(OSSL_PKEY_PARAM_MAX_SIZE, NULL),
-    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_MANDATORY_DIGEST, NULL, 0),
     OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY, NULL, 0),
     ECX_KEY_TYPES(),
     OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 
 static const OSSL_PARAM ed_gettable_params[] = {
     OSSL_PARAM_int(OSSL_PKEY_PARAM_BITS, NULL),
     OSSL_PARAM_int(OSSL_PKEY_PARAM_SECURITY_BITS, NULL),
     OSSL_PARAM_int(OSSL_PKEY_PARAM_MAX_SIZE, NULL),
+    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_MANDATORY_DIGEST, NULL, 0),
     ECX_KEY_TYPES(),
     OSSL_PARAM_END
 };
@@ -419,8 +430,8 @@ static int ecx_set_params(void *key, const OSSL_PARAM params[])
         void *buf = ecxkey->pubkey;
 
         if (p->data_size != ecxkey->keylen
-                || !OSSL_PARAM_get_octet_string(p, &buf, sizeof(ecxkey->pubkey),
-                                                NULL))
+            || !OSSL_PARAM_get_octet_string(p, &buf, sizeof(ecxkey->pubkey),
+                NULL))
             return 0;
         OPENSSL_clear_free(ecxkey->privkey, ecxkey->keylen);
         ecxkey->privkey = NULL;
@@ -487,8 +498,8 @@ static const OSSL_PARAM *ed448_settable_params(void *provctx)
 }
 
 static void *ecx_gen_init(void *provctx, int selection,
-                          const OSSL_PARAM params[], ECX_KEY_TYPE type,
-                          const char *algdesc)
+    const OSSL_PARAM params[], ECX_KEY_TYPE type,
+    const char *algdesc)
 {
     OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(provctx);
     struct ecx_gen_ctx *gctx = NULL;
@@ -503,11 +514,13 @@ static void *ecx_gen_init(void *provctx, int selection,
 #ifdef FIPS_MODULE
         /* X25519/X448 are not FIPS approved, (ED25519/ED448 are approved) */
         if (algdesc != NULL
-                && !ossl_FIPS_IND_callback(libctx, algdesc, "KeyGen Init")) {
+            && !ossl_FIPS_IND_callback(libctx, algdesc, "KeyGen Init")) {
             OPENSSL_free(gctx);
-            return 0;
+            return NULL;
         }
 #endif
+    } else {
+        return NULL;
     }
     if (!ecx_gen_set_params(gctx, params)) {
         ecx_gen_cleanup(gctx);
@@ -517,25 +530,25 @@ static void *ecx_gen_init(void *provctx, int selection,
 }
 
 static void *x25519_gen_init(void *provctx, int selection,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return ecx_gen_init(provctx, selection, params, ECX_KEY_TYPE_X25519, "X25519");
 }
 
 static void *x448_gen_init(void *provctx, int selection,
-                           const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return ecx_gen_init(provctx, selection, params, ECX_KEY_TYPE_X448, "X448");
 }
 
 static void *ed25519_gen_init(void *provctx, int selection,
-                              const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return ecx_gen_init(provctx, selection, params, ECX_KEY_TYPE_ED25519, NULL);
 }
 
 static void *ed448_gen_init(void *provctx, int selection,
-                            const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return ecx_gen_init(provctx, selection, params, ECX_KEY_TYPE_ED448, NULL);
 }
@@ -558,19 +571,19 @@ static int ecx_gen_set_params(void *genctx, const OSSL_PARAM params[])
          * expected.
          */
         switch (gctx->type) {
-            case ECX_KEY_TYPE_X25519:
-                groupname = "x25519";
-                break;
-            case ECX_KEY_TYPE_X448:
-                groupname = "x448";
-                break;
-            default:
-                /* We only support this for key exchange at the moment */
-                break;
+        case ECX_KEY_TYPE_X25519:
+            groupname = "x25519";
+            break;
+        case ECX_KEY_TYPE_X448:
+            groupname = "x448";
+            break;
+        default:
+            /* We only support this for key exchange at the moment */
+            break;
         }
         if (p->data_type != OSSL_PARAM_UTF8_STRING
-                || groupname == NULL
-                || OPENSSL_strcasecmp(p->data, groupname) != 0) {
+            || groupname == NULL
+            || OPENSSL_strcasecmp(p->data, groupname) != 0) {
             ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);
             return 0;
         }
@@ -590,7 +603,7 @@ static int ecx_gen_set_params(void *genctx, const OSSL_PARAM params[])
             OPENSSL_free(gctx->dhkem_ikm);
             gctx->dhkem_ikm = NULL;
             if (!OSSL_PARAM_get_octet_string(p, (void **)&gctx->dhkem_ikm, 0,
-                                             &gctx->dhkem_ikmlen))
+                    &gctx->dhkem_ikmlen))
                 return 0;
         }
     }
@@ -599,7 +612,7 @@ static int ecx_gen_set_params(void *genctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *ecx_gen_settable_params(ossl_unused void *genctx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME, NULL, 0),
@@ -625,9 +638,9 @@ static int ecd_fips140_pairwise_test(const ECX_KEY *ecx, int type, int self_test
     OSSL_CALLBACK *cb = NULL;
     void *cbarg = NULL;
 
-    unsigned char msg[16] = {0};
+    unsigned char msg[16] = { 0 };
     size_t msg_len = sizeof(msg);
-    unsigned char sig[ED448_SIGSIZE] = {0};
+    unsigned char sig[ED448_SIGSIZE] = { 0 };
 
     int is_ed25519 = (type == ECX_KEY_TYPE_ED25519) ? 1 : 0;
     int operation_result = 0;
@@ -636,7 +649,7 @@ static int ecd_fips140_pairwise_test(const ECX_KEY *ecx, int type, int self_test
      * The functions `OSSL_SELF_TEST_*` will return directly if parameter `st`
      * is NULL.
      */
-    if (self_test)  {
+    if (self_test) {
         OSSL_SELF_TEST_get_callback(ecx->libctx, &cb, &cbarg);
 
         st = OSSL_SELF_TEST_new(cb, cbarg);
@@ -645,16 +658,16 @@ static int ecd_fips140_pairwise_test(const ECX_KEY *ecx, int type, int self_test
     }
 
     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
-                           OSSL_SELF_TEST_DESC_PCT_EDDSA);
+        OSSL_SELF_TEST_DESC_PCT_EDDSA);
 
     if (is_ed25519)
         operation_result = ossl_ed25519_sign(sig, msg, msg_len, ecx->pubkey,
-                                             ecx->privkey, 0, 0, 0, NULL, 0,
-                                             ecx->libctx, ecx->propq);
+            ecx->privkey, 0, 0, 0, NULL, 0,
+            ecx->libctx, ecx->propq);
     else
         operation_result = ossl_ed448_sign(ecx->libctx, sig, msg, msg_len,
-                                           ecx->pubkey, ecx->privkey, NULL, 0,
-                                           0, ecx->propq);
+            ecx->pubkey, ecx->privkey, NULL, 0,
+            0, ecx->propq);
     if (operation_result != 1)
         goto err;
 
@@ -662,11 +675,11 @@ static int ecd_fips140_pairwise_test(const ECX_KEY *ecx, int type, int self_test
 
     if (is_ed25519)
         operation_result = ossl_ed25519_verify(msg, msg_len, sig, ecx->pubkey,
-                                               0, 0, 0, NULL, 0, ecx->libctx,
-                                               ecx->propq);
+            0, 0, 0, NULL, 0, ecx->libctx,
+            ecx->propq);
     else
         operation_result = ossl_ed448_verify(ecx->libctx, msg, msg_len, sig,
-                                             ecx->pubkey, NULL, 0, 0, ecx->propq);
+            ecx->pubkey, NULL, 0, 0, ecx->propq);
     if (operation_result != 1)
         goto err;
 
@@ -686,7 +699,8 @@ static void *ecx_gen(struct ecx_gen_ctx *gctx)
     if (gctx == NULL)
         return NULL;
     if ((key = ossl_ecx_key_new(gctx->libctx, gctx->type, 0,
-                                gctx->propq)) == NULL) {
+             gctx->propq))
+        == NULL) {
         ERR_raise(ERR_LIB_PROV, ERR_R_EC_LIB);
         return NULL;
     }
@@ -701,11 +715,10 @@ static void *ecx_gen(struct ecx_gen_ctx *gctx)
     }
 #ifndef FIPS_MODULE
     if (gctx->dhkem_ikm != NULL && gctx->dhkem_ikmlen != 0) {
-        if (gctx->type == ECX_KEY_TYPE_ED25519
-                || gctx->type == ECX_KEY_TYPE_ED448)
+        if (ecx_key_type_is_ed(gctx->type))
             goto err;
         if (!ossl_ecx_dhkem_derive_private(key, privkey,
-                                           gctx->dhkem_ikm, gctx->dhkem_ikmlen))
+                gctx->dhkem_ikm, gctx->dhkem_ikmlen))
             goto err;
     } else
 #endif
@@ -728,12 +741,12 @@ static void *ecx_gen(struct ecx_gen_ctx *gctx)
         break;
     case ECX_KEY_TYPE_ED25519:
         if (!ossl_ed25519_public_from_private(gctx->libctx, key->pubkey, privkey,
-                                              gctx->propq))
+                gctx->propq))
             goto err;
         break;
     case ECX_KEY_TYPE_ED448:
         if (!ossl_ed448_public_from_private(gctx->libctx, key->pubkey, privkey,
-                                            gctx->propq))
+                gctx->propq))
             goto err;
         break;
     }
@@ -843,6 +856,9 @@ static void ecx_gen_cleanup(void *genctx)
 {
     struct ecx_gen_ctx *gctx = genctx;
 
+    if (gctx == NULL)
+        return;
+
     OPENSSL_clear_free(gctx->dhkem_ikm, gctx->dhkem_ikmlen);
     OPENSSL_free(gctx->propq);
     OPENSSL_free(gctx);
@@ -918,12 +934,12 @@ static int ecd_key_pairwise_check(const ECX_KEY *ecx, int type)
     switch (type) {
     case ECX_KEY_TYPE_ED25519:
         if (!ossl_ed25519_public_from_private(ecx->libctx, pub, ecx->privkey,
-                                              ecx->propq))
+                ecx->propq))
             return 0;
         break;
     case ECX_KEY_TYPE_ED448:
         if (!ossl_ed448_public_from_private(ecx->libctx, pub, ecx->privkey,
-                                            ecx->propq))
+                ecx->propq))
             return 0;
         break;
     default:
@@ -934,7 +950,7 @@ static int ecd_key_pairwise_check(const ECX_KEY *ecx, int type)
 #endif
 
 static int ecx_validate(const void *keydata, int selection, int type,
-                        size_t keylen)
+    size_t keylen)
 {
     const ECX_KEY *ecx = keydata;
     int ok = keylen == ecx->keylen;
@@ -963,7 +979,7 @@ static int ecx_validate(const void *keydata, int selection, int type,
     if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != OSSL_KEYMGMT_SELECT_KEYPAIR)
         return ok;
 
-    if (type == ECX_KEY_TYPE_ED25519 || type == ECX_KEY_TYPE_ED448)
+    if (ecx_key_type_is_ed(type))
         ok = ok && ecd_key_pairwise_check(ecx, type);
     else
         ok = ok && ecx_key_pairwise_check(ecx, type);
@@ -991,30 +1007,30 @@ static int ed448_validate(const void *keydata, int selection, int checktype)
     return ecx_validate(keydata, selection, ECX_KEY_TYPE_ED448, ED448_KEYLEN);
 }
 
-#define MAKE_KEYMGMT_FUNCTIONS(alg) \
-    const OSSL_DISPATCH ossl_##alg##_keymgmt_functions[] = { \
-        { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))alg##_new_key }, \
-        { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))ossl_ecx_key_free }, \
-        { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))alg##_get_params }, \
-        { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))alg##_gettable_params }, \
-        { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*) (void))alg##_set_params }, \
-        { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*) (void))alg##_settable_params }, \
-        { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))ecx_has }, \
-        { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))ecx_match }, \
-        { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))alg##_validate }, \
-        { OSSL_FUNC_KEYMGMT_IMPORT, (void (*)(void))ecx_import }, \
-        { OSSL_FUNC_KEYMGMT_IMPORT_TYPES, (void (*)(void))ecx_imexport_types }, \
-        { OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))ecx_export }, \
-        { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (void (*)(void))ecx_imexport_types }, \
-        { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))alg##_gen_init }, \
-        { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (void (*)(void))ecx_gen_set_params }, \
-        { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS, \
-          (void (*)(void))ecx_gen_settable_params }, \
-        { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))alg##_gen }, \
-        { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))ecx_gen_cleanup }, \
-        { OSSL_FUNC_KEYMGMT_LOAD, (void (*)(void))ecx_load }, \
-        { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))ecx_dup }, \
-        OSSL_DISPATCH_END \
+#define MAKE_KEYMGMT_FUNCTIONS(alg)                                                   \
+    const OSSL_DISPATCH ossl_##alg##_keymgmt_functions[] = {                          \
+        { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))alg##_new_key },                     \
+        { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))ossl_ecx_key_free },                \
+        { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))alg##_get_params },           \
+        { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))alg##_gettable_params }, \
+        { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))alg##_set_params },           \
+        { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))alg##_settable_params }, \
+        { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))ecx_has },                           \
+        { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))ecx_match },                       \
+        { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))alg##_validate },               \
+        { OSSL_FUNC_KEYMGMT_IMPORT, (void (*)(void))ecx_import },                     \
+        { OSSL_FUNC_KEYMGMT_IMPORT_TYPES, (void (*)(void))ecx_imexport_types },       \
+        { OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))ecx_export },                     \
+        { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (void (*)(void))ecx_imexport_types },       \
+        { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))alg##_gen_init },               \
+        { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (void (*)(void))ecx_gen_set_params },     \
+        { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,                                      \
+            (void (*)(void))ecx_gen_settable_params },                                \
+        { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))alg##_gen },                         \
+        { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))ecx_gen_cleanup },           \
+        { OSSL_FUNC_KEYMGMT_LOAD, (void (*)(void))ecx_load },                         \
+        { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))ecx_dup },                           \
+        OSSL_DISPATCH_END                                                             \
     };
 
 MAKE_KEYMGMT_FUNCTIONS(x25519)
@@ -1023,7 +1039,7 @@ MAKE_KEYMGMT_FUNCTIONS(ed25519)
 MAKE_KEYMGMT_FUNCTIONS(ed448)
 
 #ifdef S390X_EC_ASM
-# include "s390x_arch.h"
+#include "s390x_arch.h"
 
 static void *s390x_ecx_keygen25519(struct ecx_gen_ctx *gctx)
 {
@@ -1033,7 +1049,7 @@ static void *s390x_ecx_keygen25519(struct ecx_gen_ctx *gctx)
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     };
     ECX_KEY *key = ossl_ecx_key_new(gctx->libctx, ECX_KEY_TYPE_X25519, 1,
-                                    gctx->propq);
+        gctx->propq);
     unsigned char *privkey = NULL, *pubkey;
 
     if (key == NULL) {
@@ -1058,7 +1074,7 @@ static void *s390x_ecx_keygen25519(struct ecx_gen_ctx *gctx)
         if (gctx->type != ECX_KEY_TYPE_X25519)
             goto err;
         if (!ossl_ecx_dhkem_derive_private(key, privkey,
-                                           gctx->dhkem_ikm, gctx->dhkem_ikmlen))
+                gctx->dhkem_ikm, gctx->dhkem_ikmlen))
             goto err;
     } else
 #endif
@@ -1075,7 +1091,7 @@ static void *s390x_ecx_keygen25519(struct ecx_gen_ctx *gctx)
         goto err;
     key->haspubkey = 1;
     return key;
- err:
+err:
     ossl_ecx_key_free(key);
     return NULL;
 }
@@ -1090,7 +1106,7 @@ static void *s390x_ecx_keygen448(struct ecx_gen_ctx *gctx)
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
     };
     ECX_KEY *key = ossl_ecx_key_new(gctx->libctx, ECX_KEY_TYPE_X448, 1,
-                                    gctx->propq);
+        gctx->propq);
     unsigned char *privkey = NULL, *pubkey;
 
     if (key == NULL) {
@@ -1115,7 +1131,7 @@ static void *s390x_ecx_keygen448(struct ecx_gen_ctx *gctx)
         if (gctx->type != ECX_KEY_TYPE_X448)
             goto err;
         if (!ossl_ecx_dhkem_derive_private(key, privkey,
-                                           gctx->dhkem_ikm, gctx->dhkem_ikmlen))
+                gctx->dhkem_ikm, gctx->dhkem_ikmlen))
             goto err;
     } else
 #endif
@@ -1131,7 +1147,7 @@ static void *s390x_ecx_keygen448(struct ecx_gen_ctx *gctx)
         goto err;
     key->haspubkey = 1;
     return key;
- err:
+err:
     ossl_ecx_key_free(key);
     return NULL;
 }
@@ -1144,13 +1160,42 @@ static void *s390x_ecd_keygen25519(struct ecx_gen_ctx *gctx)
         0xfe, 0x53, 0x6e, 0xcd, 0xd3, 0x36, 0x69, 0x21
     };
     static const unsigned char generator_y[] = {
-        0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-        0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-        0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+        0x58,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
+        0x66,
     };
     unsigned char x_dst[32], buff[SHA512_DIGEST_LENGTH];
     ECX_KEY *key = ossl_ecx_key_new(gctx->libctx, ECX_KEY_TYPE_ED25519, 1,
-                                    gctx->propq);
+        gctx->propq);
     unsigned char *privkey = NULL, *pubkey;
     unsigned int sz;
     EVP_MD *sha = NULL;
@@ -1189,13 +1234,14 @@ static void *s390x_ecd_keygen25519(struct ecx_gen_ctx *gctx)
     buff[31] |= 64;
 
     if (s390x_ed25519_mul(x_dst, pubkey,
-                          generator_x, generator_y, buff) != 1)
+            generator_x, generator_y, buff)
+        != 1)
         goto err;
 
     pubkey[31] |= ((x_dst[0] & 0x01) << 7);
     key->haspubkey = 1;
     return key;
- err:
+err:
     ossl_ecx_key_free(key);
     return NULL;
 }
@@ -1218,7 +1264,7 @@ static void *s390x_ecd_keygen448(struct ecx_gen_ctx *gctx)
     };
     unsigned char x_dst[57], buff[114];
     ECX_KEY *key = ossl_ecx_key_new(gctx->libctx, ECX_KEY_TYPE_ED448, 1,
-                                    gctx->propq);
+        gctx->propq);
     unsigned char *privkey = NULL, *pubkey;
     EVP_MD_CTX *hashctx = NULL;
     EVP_MD *shake = NULL;
@@ -1261,7 +1307,8 @@ static void *s390x_ecd_keygen448(struct ecx_gen_ctx *gctx)
     buff[56] = 0;
 
     if (s390x_ed448_mul(x_dst, pubkey,
-                        generator_x, generator_y, buff) != 1)
+            generator_x, generator_y, buff)
+        != 1)
         goto err;
 
     pubkey[56] |= ((x_dst[0] & 0x01) << 7);
@@ -1269,7 +1316,7 @@ static void *s390x_ecd_keygen448(struct ecx_gen_ctx *gctx)
     EVP_MD_free(shake);
     key->haspubkey = 1;
     return key;
- err:
+err:
     ossl_ecx_key_free(key);
     EVP_MD_CTX_free(hashctx);
     EVP_MD_free(shake);
diff --git a/providers/implementations/keymgmt/mac_legacy_kmgmt.c b/providers/implementations/keymgmt/mac_legacy_kmgmt.c
index 161a433caf5a1..e53e9dcd9b24b 100644
--- a/providers/implementations/keymgmt/mac_legacy_kmgmt.c
+++ b/providers/implementations/keymgmt/mac_legacy_kmgmt.c
@@ -19,7 +19,7 @@
 #include <openssl/proverr.h>
 #include <openssl/param_build.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include "internal/param_build_set.h"
 #include "prov/implementations.h"
@@ -163,18 +163,16 @@ static int mac_match(const void *keydata1, const void *keydata2, int selection)
 
     if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
         if ((key1->priv_key == NULL && key2->priv_key != NULL)
-                || (key1->priv_key != NULL && key2->priv_key == NULL)
-                || key1->priv_key_len != key2->priv_key_len
-                || (key1->cipher.cipher == NULL && key2->cipher.cipher != NULL)
-                || (key1->cipher.cipher != NULL && key2->cipher.cipher == NULL))
+            || (key1->priv_key != NULL && key2->priv_key == NULL)
+            || key1->priv_key_len != key2->priv_key_len
+            || (key1->cipher.cipher == NULL && key2->cipher.cipher != NULL)
+            || (key1->cipher.cipher != NULL && key2->cipher.cipher == NULL))
             ok = 0;
         else
             ok = ok && (key1->priv_key == NULL /* implies key2->privkey == NULL */
-                        || CRYPTO_memcmp(key1->priv_key, key2->priv_key,
-                                         key1->priv_key_len) == 0);
+                     || CRYPTO_memcmp(key1->priv_key, key2->priv_key, key1->priv_key_len) == 0);
         if (key1->cipher.cipher != NULL)
-            ok = ok && EVP_CIPHER_is_a(key1->cipher.cipher,
-                                       EVP_CIPHER_get0_name(key2->cipher.cipher));
+            ok = ok && EVP_CIPHER_is_a(key1->cipher.cipher, EVP_CIPHER_get0_name(key2->cipher.cipher));
     }
     return ok;
 }
@@ -210,8 +208,7 @@ static int mac_key_fromdata(MAC_KEY *key, const OSSL_PARAM params[])
             return 0;
     }
 
-    if (key->cmac && !ossl_prov_cipher_load_from_params(&key->cipher, params,
-                                                        key->libctx)) {
+    if (key->cmac && !ossl_prov_cipher_load_from_params(&key->cipher, params, key->libctx)) {
         ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);
         return 0;
     }
@@ -236,28 +233,28 @@ static int mac_import(void *keydata, int selection, const OSSL_PARAM params[])
 }
 
 static int key_to_params(MAC_KEY *key, OSSL_PARAM_BLD *tmpl,
-                         OSSL_PARAM params[])
+    OSSL_PARAM params[])
 {
     if (key == NULL)
         return 0;
 
     if (key->priv_key != NULL
         && !ossl_param_build_set_octet_string(tmpl, params,
-                                              OSSL_PKEY_PARAM_PRIV_KEY,
-                                              key->priv_key, key->priv_key_len))
+            OSSL_PKEY_PARAM_PRIV_KEY,
+            key->priv_key, key->priv_key_len))
         return 0;
 
     if (key->cipher.cipher != NULL
         && !ossl_param_build_set_utf8_string(tmpl, params,
-                                             OSSL_PKEY_PARAM_CIPHER,
-                                             EVP_CIPHER_get0_name(key->cipher.cipher)))
+            OSSL_PKEY_PARAM_CIPHER,
+            EVP_CIPHER_get0_name(key->cipher.cipher)))
         return 0;
 
 #if !defined(OPENSSL_NO_ENGINE) && !defined(FIPS_MODULE)
     if (key->cipher.engine != NULL
         && !ossl_param_build_set_utf8_string(tmpl, params,
-                                             OSSL_PKEY_PARAM_ENGINE,
-                                             ENGINE_get_id(key->cipher.engine)))
+            OSSL_PKEY_PARAM_ENGINE,
+            ENGINE_get_id(key->cipher.engine)))
         return 0;
 #endif
 
@@ -265,7 +262,7 @@ static int key_to_params(MAC_KEY *key, OSSL_PARAM_BLD *tmpl,
 }
 
 static int mac_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
-                      void *cbarg)
+    void *cbarg)
 {
     MAC_KEY *key = keydata;
     OSSL_PARAM_BLD *tmpl;
@@ -283,7 +280,7 @@ static int mac_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
         return 0;
 
     if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0
-         && !key_to_params(key, tmpl, NULL))
+        && !key_to_params(key, tmpl, NULL))
         goto err;
 
     params = OSSL_PARAM_BLD_to_param(tmpl);
@@ -388,7 +385,7 @@ static void *mac_gen_init_common(void *provctx, int selection)
 }
 
 static void *mac_gen_init(void *provctx, int selection,
-                          const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     struct mac_gen_ctx *gctx = mac_gen_init_common(provctx, selection);
 
@@ -400,7 +397,7 @@ static void *mac_gen_init(void *provctx, int selection,
 }
 
 static void *cmac_gen_init(void *provctx, int selection,
-                           const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     struct mac_gen_ctx *gctx = mac_gen_init_common(provctx, selection);
 
@@ -443,7 +440,7 @@ static int cmac_gen_set_params(void *genctx, const OSSL_PARAM params[])
         return 0;
 
     if (!ossl_prov_cipher_load_from_params(&gctx->cipher, params,
-                                           gctx->libctx)) {
+            gctx->libctx)) {
         ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);
         return 0;
     }
@@ -452,7 +449,7 @@ static int cmac_gen_set_params(void *genctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *mac_gen_settable_params(ossl_unused void *genctx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0),
@@ -462,7 +459,7 @@ static const OSSL_PARAM *mac_gen_settable_params(ossl_unused void *genctx,
 }
 
 static const OSSL_PARAM *cmac_gen_settable_params(ossl_unused void *genctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0),
@@ -519,6 +516,9 @@ static void mac_gen_cleanup(void *genctx)
 {
     struct mac_gen_ctx *gctx = genctx;
 
+    if (gctx == NULL)
+        return;
+
     OPENSSL_secure_clear_free(gctx->priv_key, gctx->priv_key_len);
     ossl_prov_cipher_reset(&gctx->cipher);
     OPENSSL_free(gctx);
@@ -527,10 +527,10 @@ static void mac_gen_cleanup(void *genctx)
 const OSSL_DISPATCH ossl_mac_legacy_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))mac_new },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))mac_free },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))mac_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))mac_gettable_params },
-    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*) (void))mac_set_params },
-    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*) (void))mac_settable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))mac_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))mac_gettable_params },
+    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))mac_set_params },
+    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))mac_settable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))mac_has },
     { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))mac_match },
     { OSSL_FUNC_KEYMGMT_IMPORT, (void (*)(void))mac_import },
@@ -549,10 +549,10 @@ const OSSL_DISPATCH ossl_mac_legacy_keymgmt_functions[] = {
 const OSSL_DISPATCH ossl_cmac_legacy_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))mac_new_cmac },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))mac_free },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))mac_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))cmac_gettable_params },
-    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*) (void))mac_set_params },
-    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*) (void))mac_settable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))mac_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))cmac_gettable_params },
+    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))mac_set_params },
+    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))mac_settable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))mac_has },
     { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))mac_match },
     { OSSL_FUNC_KEYMGMT_IMPORT, (void (*)(void))mac_import },
@@ -567,4 +567,3 @@ const OSSL_DISPATCH ossl_cmac_legacy_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))mac_gen_cleanup },
     OSSL_DISPATCH_END
 };
-
diff --git a/providers/implementations/keymgmt/ml_dsa_kmgmt.c b/providers/implementations/keymgmt/ml_dsa_kmgmt.c
index ba39ae9479dda..5ebeaae662bf2 100644
--- a/providers/implementations/keymgmt/ml_dsa_kmgmt.c
+++ b/providers/implementations/keymgmt/ml_dsa_kmgmt.c
@@ -61,7 +61,7 @@ static int ml_dsa_pairwise_test(const ML_DSA_KEY *key)
     int ret = 0;
 
     if (!ml_dsa_has(key, OSSL_KEYMGMT_SELECT_KEYPAIR)
-            || ossl_fips_self_testing())
+        || ossl_fips_self_testing())
         return 1;
 
     /*
@@ -75,21 +75,25 @@ static int ml_dsa_pairwise_test(const ML_DSA_KEY *key)
         return 0;
 
     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
-                           OSSL_SELF_TEST_DESC_PCT_ML_DSA);
+        OSSL_SELF_TEST_DESC_PCT_ML_DSA);
 
     memset(rnd, 0, sizeof(rnd));
     memset(sig, 0, sizeof(sig));
 
     if (ossl_ml_dsa_sign(key, 0, msg, sizeof(msg), NULL, 0, rnd, sizeof(rnd), 0,
-                         sig, &sig_len, sizeof(sig)) <= 0)
+            sig, &sig_len, sizeof(sig))
+        <= 0)
         goto err;
 
+    OSSL_SELF_TEST_oncorrupt_byte(st, sig);
+
     if (ossl_ml_dsa_verify(key, 0, msg, sizeof(msg), NULL, 0, 0,
-                           sig, sig_len) <= 0)
+            sig, sig_len)
+        <= 0)
         goto err;
 
     ret = 1;
- err:
+err:
     OSSL_SELF_TEST_onend(st, ret);
     OSSL_SELF_TEST_free(st);
     return ret;
@@ -188,7 +192,7 @@ static int ml_dsa_validate(const void *key_data, int selection, int check_type)
  * @returns 1 on success, or 0 on failure.
  */
 static int ml_dsa_key_fromdata(ML_DSA_KEY *key, const OSSL_PARAM params[],
-                               int include_private)
+    int include_private)
 {
     const OSSL_PARAM *p = NULL;
     const ML_DSA_PARAMS *key_params = ossl_ml_dsa_key_params(key);
@@ -201,7 +205,7 @@ static int ml_dsa_key_fromdata(ML_DSA_KEY *key, const OSSL_PARAM params[],
         return 0;
     if (pk != NULL && pk_len != key_params->pk_len) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH,
-                       "Invalid %s public key length", key_params->alg);
+            "Invalid %s public key length", key_params->alg);
         return 0;
     }
 
@@ -210,7 +214,7 @@ static int ml_dsa_key_fromdata(ML_DSA_KEY *key, const OSSL_PARAM params[],
         p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_ML_DSA_SEED);
         if (p != NULL
             && !OSSL_PARAM_get_octet_string_ptr(p, (const void **)&seed,
-                                                &seed_len))
+                &seed_len))
             return 0;
         if (seed != NULL && seed_len != ML_DSA_SEED_BYTES) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_SEED_LENGTH);
@@ -222,7 +226,7 @@ static int ml_dsa_key_fromdata(ML_DSA_KEY *key, const OSSL_PARAM params[],
             return 0;
         if (sk != NULL && sk_len != key_params->sk_len) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH,
-                           "Invalid %s private key length", key_params->alg);
+                "Invalid %s private key length", key_params->alg);
             return 0;
         }
     }
@@ -256,8 +260,8 @@ static int ml_dsa_key_fromdata(ML_DSA_KEY *key, const OSSL_PARAM params[],
         || memcmp(ossl_ml_dsa_key_get_pub(key), pk, pk_len) == 0)
         return 1;
     ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
-                   "explicit %s public key does not match private",
-                   key_params->alg);
+        "explicit %s public key does not match private",
+        key_params->alg);
     ossl_ml_dsa_key_reset(key);
     return 0;
 }
@@ -266,6 +270,7 @@ static int ml_dsa_import(void *keydata, int selection, const OSSL_PARAM params[]
 {
     ML_DSA_KEY *key = keydata;
     int include_priv;
+    int res;
 
     if (!ossl_prov_is_running() || key == NULL)
         return 0;
@@ -274,13 +279,23 @@ static int ml_dsa_import(void *keydata, int selection, const OSSL_PARAM params[]
         return 0;
 
     include_priv = ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0);
-    return ml_dsa_key_fromdata(key, params, include_priv);
+    res = ml_dsa_key_fromdata(key, params, include_priv);
+#ifdef FIPS_MODULE
+    if (res > 0) {
+        res = ml_dsa_pairwise_test(key);
+        if (!res) {
+            ossl_ml_dsa_key_reset(key);
+            ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT_IMPORT);
+        }
+    }
+#endif /* FIPS_MODULE */
+    return res;
 }
 
-#define ML_DSA_IMEXPORTABLE_PARAMETERS \
+#define ML_DSA_IMEXPORTABLE_PARAMETERS                             \
     OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_ML_DSA_SEED, NULL, 0), \
-    OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY, NULL, 0), \
-    OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0)
+        OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY, NULL, 0), \
+        OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0)
 
 static const OSSL_PARAM ml_dsa_key_types[] = {
     ML_DSA_IMEXPORTABLE_PARAMETERS,
@@ -313,13 +328,13 @@ static int ml_dsa_get_params(void *keydata, OSSL_PARAM params[])
     const uint8_t *pub, *priv, *seed;
 
     if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_BITS)) != NULL
-            && !OSSL_PARAM_set_int(p, 8 * ossl_ml_dsa_key_get_pub_len(key)))
+        && !OSSL_PARAM_set_int(p, 8 * ossl_ml_dsa_key_get_pub_len(key)))
         return 0;
     if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_SECURITY_BITS)) != NULL
-            && !OSSL_PARAM_set_int(p, 8 * ossl_ml_dsa_key_get_collision_strength_bits(key)))
+        && !OSSL_PARAM_set_int(p, ossl_ml_dsa_key_get_collision_strength_bits(key)))
         return 0;
     if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_MAX_SIZE)) != NULL
-            && !OSSL_PARAM_set_int(p, ossl_ml_dsa_key_get_sig_len(key)))
+        && !OSSL_PARAM_set_int(p, ossl_ml_dsa_key_get_sig_len(key)))
         return 0;
 
     pub = ossl_ml_dsa_key_get_pub(key);
@@ -333,12 +348,12 @@ static int ml_dsa_get_params(void *keydata, OSSL_PARAM params[])
     if (priv != NULL
         && (p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_PRIV_KEY)) != NULL
         && !OSSL_PARAM_set_octet_string(p, priv,
-                                        ossl_ml_dsa_key_get_priv_len(key)))
+            ossl_ml_dsa_key_get_priv_len(key)))
         return 0;
     if (pub != NULL
         && (p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_PUB_KEY)) != NULL
         && !OSSL_PARAM_set_octet_string(p, pub,
-                                        ossl_ml_dsa_key_get_pub_len(key)))
+            ossl_ml_dsa_key_get_pub_len(key)))
         return 0;
     /*
      * This allows apps to use an empty digest, so that the old API
@@ -352,10 +367,10 @@ static int ml_dsa_get_params(void *keydata, OSSL_PARAM params[])
 }
 
 static int ml_dsa_export(void *keydata, int selection,
-                         OSSL_CALLBACK *param_cb, void *cbarg)
+    OSSL_CALLBACK *param_cb, void *cbarg)
 {
     ML_DSA_KEY *key = keydata;
-    OSSL_PARAM params[3];
+    OSSL_PARAM params[4];
     const uint8_t *buf;
     int include_private, pnum = 0;
 
@@ -368,25 +383,22 @@ static int ml_dsa_export(void *keydata, int selection,
     include_private = ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0);
 
     /*
-     * Note that the public key can be recovered from the private key, so we
-     * just export one or the other.  If the seed is present, both the seed and
-     * the private key are exported.  The recipient will have a choice.
+     * Note that if the seed is present, both the seed and the private key are
+     * exported.  The recipient will have a choice.
      */
     if (include_private) {
         if ((buf = ossl_ml_dsa_key_get_seed(key)) != NULL) {
-            params[pnum++] = OSSL_PARAM_construct_octet_string
-                (OSSL_PKEY_PARAM_ML_DSA_SEED, (void *)buf, ML_DSA_SEED_BYTES);
+            params[pnum++] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_ML_DSA_SEED, (void *)buf, ML_DSA_SEED_BYTES);
         }
         if ((buf = ossl_ml_dsa_key_get_priv(key)) != NULL) {
-            params[pnum++] = OSSL_PARAM_construct_octet_string
-                (OSSL_PKEY_PARAM_PRIV_KEY, (void *)buf,
-                 ossl_ml_dsa_key_get_priv_len(key));
+            params[pnum++] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_PRIV_KEY, (void *)buf,
+                ossl_ml_dsa_key_get_priv_len(key));
         }
     }
-    if (pnum == 0 && (buf = ossl_ml_dsa_key_get_pub(key)) != NULL) {
-        params[pnum++] = OSSL_PARAM_construct_octet_string
-            (OSSL_PKEY_PARAM_PUB_KEY, (void *)buf,
-             ossl_ml_dsa_key_get_pub_len(key));
+    if (((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0)
+        && ((buf = ossl_ml_dsa_key_get_pub(key)) != NULL)) {
+        params[pnum++] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_PUB_KEY, (void *)buf,
+            ossl_ml_dsa_key_get_pub_len(key));
     }
     if (pnum == 0)
         return 0;
@@ -413,18 +425,17 @@ static void *ml_dsa_load(const void *reference, size_t reference_sz)
         sk = ossl_ml_dsa_key_get_priv(key);
         seed = ossl_ml_dsa_key_get_seed(key);
         if (seed != NULL
-            && (sk == NULL || (ossl_ml_dsa_key_get_prov_flags(key)
-                               & ML_DSA_KEY_PREFER_SEED))) {
+            && (sk == NULL || (ossl_ml_dsa_key_get_prov_flags(key) & ML_DSA_KEY_PREFER_SEED))) {
             if (ossl_ml_dsa_generate_key(key))
                 return key;
         } else if (sk != NULL) {
             if (ossl_ml_dsa_sk_decode(key, sk,
-                                      ossl_ml_dsa_key_get_priv_len(key)))
+                    ossl_ml_dsa_key_get_priv_len(key)))
                 return key;
             key_params = ossl_ml_dsa_key_params(key);
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
-                           "error parsing %s private key",
-                           key_params->alg);
+                "error parsing %s private key",
+                key_params->alg);
         } else {
             return key;
         }
@@ -436,7 +447,7 @@ static void *ml_dsa_load(const void *reference, size_t reference_sz)
 #endif
 
 static void *ml_dsa_gen_init(void *provctx, int selection,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     struct ml_dsa_gen_ctx *gctx = NULL;
 
@@ -465,18 +476,20 @@ static void *ml_dsa_gen(void *genctx, int evp_type)
         return NULL;
     if (gctx->entropy_len != 0
         && !ossl_ml_dsa_set_prekey(key, 0, 0,
-                                   gctx->entropy, gctx->entropy_len, NULL, 0))
+            gctx->entropy, gctx->entropy_len, NULL, 0))
         goto err;
     if (!ossl_ml_dsa_generate_key(key)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GENERATE_KEY);
         goto err;
     }
 #ifdef FIPS_MODULE
-    if (!ml_dsa_pairwise_test(key))
+    if (!ml_dsa_pairwise_test(key)) {
+        ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT);
         goto err;
+    }
 #endif
     return key;
- err:
+err:
     ossl_ml_dsa_key_free(key);
     return NULL;
 }
@@ -511,7 +524,7 @@ static int ml_dsa_gen_set_params(void *genctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *ml_dsa_gen_settable_params(ossl_unused void *genctx,
-                                                    ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_PROPERTIES, NULL, 0),
@@ -525,51 +538,53 @@ static void ml_dsa_gen_cleanup(void *genctx)
 {
     struct ml_dsa_gen_ctx *gctx = genctx;
 
+    if (gctx == NULL)
+        return;
+
     OPENSSL_cleanse(gctx->entropy, gctx->entropy_len);
     OPENSSL_free(gctx->propq);
     OPENSSL_free(gctx);
 }
 
 #ifndef FIPS_MODULE
-# define DISPATCH_LOAD_FN \
-        { OSSL_FUNC_KEYMGMT_LOAD, (OSSL_FUNC) ml_dsa_load },
+#define DISPATCH_LOAD_FN \
+    { OSSL_FUNC_KEYMGMT_LOAD, (OSSL_FUNC)ml_dsa_load },
 #else
-# define DISPATCH_LOAD_FN   /* Non-FIPS only */
+#define DISPATCH_LOAD_FN /* Non-FIPS only */
 #endif
 
-#define MAKE_KEYMGMT_FUNCTIONS(alg)                                            \
-    static OSSL_FUNC_keymgmt_new_fn ml_dsa_##alg##_new_key;                    \
-    static OSSL_FUNC_keymgmt_gen_fn ml_dsa_##alg##_gen;                        \
-    static void *ml_dsa_##alg##_new_key(void *provctx)                         \
-    {                                                                          \
-        return ossl_prov_ml_dsa_new(provctx, NULL, EVP_PKEY_ML_DSA_##alg);     \
-    }                                                                          \
-    static void *ml_dsa_##alg##_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)\
-    {                                                                          \
-        return ml_dsa_gen(genctx, EVP_PKEY_ML_DSA_##alg);                      \
-    }                                                                          \
-    const OSSL_DISPATCH ossl_ml_dsa_##alg##_keymgmt_functions[] = {            \
-        { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))ml_dsa_##alg##_new_key },     \
-        { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))ml_dsa_free_key },           \
-        { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))ml_dsa_has },                 \
-        { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))ml_dsa_match },             \
-        { OSSL_FUNC_KEYMGMT_IMPORT, (void (*)(void))ml_dsa_import },           \
-        { OSSL_FUNC_KEYMGMT_IMPORT_TYPES, (void (*)(void))ml_dsa_imexport_types },\
-        { OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))ml_dsa_export },           \
-        { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (void (*)(void))ml_dsa_imexport_types },\
-        DISPATCH_LOAD_FN                                                       \
-        { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))ml_dsa_get_params },  \
-        { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))ml_dsa_gettable_params },\
-        { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))ml_dsa_validate },       \
-        { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))ml_dsa_gen_init },       \
-        { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))ml_dsa_##alg##_gen },         \
-        { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))ml_dsa_gen_cleanup }, \
-        { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS,                                    \
-          (void (*)(void))ml_dsa_gen_set_params },                             \
-        { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,                               \
-          (void (*)(void))ml_dsa_gen_settable_params },                        \
-        { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))ml_dsa_dup_key },             \
-        OSSL_DISPATCH_END                                                      \
+#define MAKE_KEYMGMT_FUNCTIONS(alg)                                                           \
+    static OSSL_FUNC_keymgmt_new_fn ml_dsa_##alg##_new_key;                                   \
+    static OSSL_FUNC_keymgmt_gen_fn ml_dsa_##alg##_gen;                                       \
+    static void *ml_dsa_##alg##_new_key(void *provctx)                                        \
+    {                                                                                         \
+        return ossl_prov_ml_dsa_new(provctx, NULL, EVP_PKEY_ML_DSA_##alg);                    \
+    }                                                                                         \
+    static void *ml_dsa_##alg##_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)         \
+    {                                                                                         \
+        return ml_dsa_gen(genctx, EVP_PKEY_ML_DSA_##alg);                                     \
+    }                                                                                         \
+    const OSSL_DISPATCH ossl_ml_dsa_##alg##_keymgmt_functions[] = {                           \
+        { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))ml_dsa_##alg##_new_key },                    \
+        { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))ml_dsa_free_key },                          \
+        { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))ml_dsa_has },                                \
+        { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))ml_dsa_match },                            \
+        { OSSL_FUNC_KEYMGMT_IMPORT, (void (*)(void))ml_dsa_import },                          \
+        { OSSL_FUNC_KEYMGMT_IMPORT_TYPES, (void (*)(void))ml_dsa_imexport_types },            \
+        { OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))ml_dsa_export },                          \
+        { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (void (*)(void))ml_dsa_imexport_types },            \
+        DISPATCH_LOAD_FN { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))ml_dsa_get_params }, \
+        { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))ml_dsa_gettable_params },        \
+        { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))ml_dsa_validate },                      \
+        { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))ml_dsa_gen_init },                      \
+        { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))ml_dsa_##alg##_gen },                        \
+        { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))ml_dsa_gen_cleanup },                \
+        { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS,                                                   \
+            (void (*)(void))ml_dsa_gen_set_params },                                          \
+        { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,                                              \
+            (void (*)(void))ml_dsa_gen_settable_params },                                     \
+        { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))ml_dsa_dup_key },                            \
+        OSSL_DISPATCH_END                                                                     \
     }
 
 MAKE_KEYMGMT_FUNCTIONS(44);
diff --git a/providers/implementations/keymgmt/ml_kem_kmgmt.c b/providers/implementations/keymgmt/ml_kem_kmgmt.c
index b48ff28bb3311..0be2a1e29839b 100644
--- a/providers/implementations/keymgmt/ml_kem_kmgmt.c
+++ b/providers/implementations/keymgmt/ml_kem_kmgmt.c
@@ -99,8 +99,8 @@ static int ml_kem_pairwise_test(const ML_KEM_KEY *key, int key_flags)
         return 0;
 
     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
-                           OSSL_SELF_TEST_DESC_PCT_ML_KEM);
-#endif  /* FIPS_MODULE */
+        OSSL_SELF_TEST_DESC_PCT_ML_KEM);
+#endif /* FIPS_MODULE */
 
     ctext = OPENSSL_malloc(v->ctext_bytes);
     if (ctext == NULL)
@@ -114,13 +114,13 @@ static int ml_kem_pairwise_test(const ML_KEM_KEY *key, int key_flags)
      */
     if (key_flags & ML_KEM_KEY_RANDOM_PCT) {
         operation_result = ossl_ml_kem_encap_rand(ctext, v->ctext_bytes,
-                                                  secret, sizeof(secret), key);
+            secret, sizeof(secret), key);
     } else {
         memset(entropy, 0125, sizeof(entropy));
         operation_result = ossl_ml_kem_encap_seed(ctext, v->ctext_bytes,
-                                                  secret, sizeof(secret),
-                                                  entropy, sizeof(entropy),
-                                                  key);
+            secret, sizeof(secret),
+            entropy, sizeof(entropy),
+            key);
     }
     if (operation_result != 1)
         goto err;
@@ -130,7 +130,7 @@ static int ml_kem_pairwise_test(const ML_KEM_KEY *key, int key_flags)
 #endif
 
     operation_result = ossl_ml_kem_decap(out, sizeof(out), ctext, v->ctext_bytes,
-                                         key);
+        key);
     if (operation_result != 1 || memcmp(out, secret, sizeof(out)) != 0)
         goto err;
 
@@ -142,8 +142,8 @@ static int ml_kem_pairwise_test(const ML_KEM_KEY *key, int key_flags)
 #else
     if (ret == 0) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
-                       "public part of %s private key fails to match private",
-                       v->algorithm_name);
+            "public part of %s private key fails to match private",
+            v->algorithm_name);
     }
 #endif
     OPENSSL_free(ctext);
@@ -167,12 +167,12 @@ ML_KEM_KEY *ossl_prov_ml_kem_new(PROV_CTX *ctx, const char *propq, int evp_type)
             ctx, OSSL_PKEY_PARAM_ML_KEM_IMPORT_PCT_TYPE, "random");
 
         if (ossl_prov_ctx_get_bool_param(
-            ctx, OSSL_PKEY_PARAM_ML_KEM_RETAIN_SEED, 1))
+                ctx, OSSL_PKEY_PARAM_ML_KEM_RETAIN_SEED, 1))
             key->prov_flags |= ML_KEM_KEY_RETAIN_SEED;
         else
             key->prov_flags &= ~ML_KEM_KEY_RETAIN_SEED;
         if (ossl_prov_ctx_get_bool_param(
-            ctx, OSSL_PKEY_PARAM_ML_KEM_PREFER_SEED, 1))
+                ctx, OSSL_PKEY_PARAM_ML_KEM_PREFER_SEED, 1))
             key->prov_flags |= ML_KEM_KEY_PREFER_SEED;
         else
             key->prov_flags &= ~ML_KEM_KEY_PREFER_SEED;
@@ -232,7 +232,7 @@ static int ml_kem_validate(const void *vkey, int selection, int check_type)
 }
 
 static int ml_kem_export(void *vkey, int selection, OSSL_CALLBACK *param_cb,
-                         void *cbarg)
+    void *cbarg)
 {
     ML_KEM_KEY *key = vkey;
     OSSL_PARAM_BLD *tmpl = NULL;
@@ -295,20 +295,20 @@ static int ml_kem_export(void *vkey, int selection, OSSL_CALLBACK *param_cb,
     /* The (d, z) seed, when available and private keys are requested. */
     if (seedenc != NULL
         && !ossl_param_build_set_octet_string(
-                tmpl, params, OSSL_PKEY_PARAM_ML_KEM_SEED, seedenc, seedlen))
+            tmpl, params, OSSL_PKEY_PARAM_ML_KEM_SEED, seedenc, seedlen))
         goto err;
 
     /* The private key in the FIPS 203 |dk| format, when requested. */
     if (prvenc != NULL
         && !ossl_param_build_set_octet_string(
-                tmpl, params, OSSL_PKEY_PARAM_PRIV_KEY, prvenc, prvlen))
-            goto err;
+            tmpl, params, OSSL_PKEY_PARAM_PRIV_KEY, prvenc, prvlen))
+        goto err;
 
     /* The public key on request; it is always available when either is */
     if (pubenc != NULL
         && !ossl_param_build_set_octet_string(
-               tmpl, params, OSSL_PKEY_PARAM_PUB_KEY, pubenc, v->pubkey_bytes))
-            goto err;
+            tmpl, params, OSSL_PKEY_PARAM_PUB_KEY, pubenc, v->pubkey_bytes))
+        goto err;
 
     params = OSSL_PARAM_BLD_to_param(tmpl);
     if (params == NULL)
@@ -340,16 +340,18 @@ static const OSSL_PARAM *ml_kem_imexport_types(int selection)
 }
 
 static int check_seed(const uint8_t *seed, const uint8_t *prvenc,
-                      ML_KEM_KEY *key)
+    ML_KEM_KEY *key)
 {
     size_t zlen = ML_KEM_RANDOM_BYTES;
 
     if (memcmp(seed + ML_KEM_SEED_BYTES - zlen,
-               prvenc + key->vinfo->prvkey_bytes - zlen, zlen) == 0)
+            prvenc + key->vinfo->prvkey_bytes - zlen, zlen)
+        == 0)
         return 1;
     ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
-                   "private %s key implicit rejection secret does"
-                   " not match seed", key->vinfo->algorithm_name);
+        "private %s key implicit rejection secret does"
+        " not match seed",
+        key->vinfo->algorithm_name);
     return 0;
 }
 
@@ -368,15 +370,15 @@ static int check_prvenc(const uint8_t *prvenc, ML_KEM_KEY *key)
 
     if (buf != NULL)
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
-                       "explicit %s private key does not match seed",
-                       key->vinfo->algorithm_name);
+            "explicit %s private key does not match seed",
+            key->vinfo->algorithm_name);
     ossl_ml_kem_key_reset(key);
     return 0;
 }
 
 static int ml_kem_key_fromdata(ML_KEM_KEY *key,
-                               const OSSL_PARAM params[],
-                               int include_private)
+    const OSSL_PARAM params[],
+    int include_private)
 {
     const OSSL_PARAM *p = NULL;
     const void *pubenc = NULL, *prvenc = NULL, *seedenc = NULL;
@@ -438,8 +440,8 @@ static int ml_kem_key_fromdata(ML_KEM_KEY *key,
         puboff = prvlen - ML_KEM_RANDOM_BYTES - ML_KEM_PKHASH_BYTES - publen;
         if (memcmp(pubenc, (unsigned char *)prvenc + puboff, publen) != 0) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
-                           "explicit %s public key does not match private",
-                           v->algorithm_name);
+                "explicit %s public key does not match private",
+                v->algorithm_name);
             return 0;
         }
     }
@@ -475,7 +477,7 @@ static int ml_kem_import(void *vkey, int selection, const OSSL_PARAM params[])
     if (res > 0 && include_private
         && !ml_kem_pairwise_test(key, key->prov_flags)) {
 #ifdef FIPS_MODULE
-        ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT);
+        ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT_IMPORT);
 #endif
         ossl_ml_kem_key_reset(key);
         res = 0;
@@ -504,7 +506,7 @@ static const OSSL_PARAM *ml_kem_gettable_params(void *provctx)
 }
 
 #ifndef FIPS_MODULE
-void *ml_kem_load(const void *reference, size_t reference_sz)
+static void *ml_kem_load(const void *reference, size_t reference_sz)
 {
     ML_KEM_KEY *key = NULL;
     uint8_t *encoded_dk = NULL;
@@ -530,10 +532,10 @@ void *ml_kem_load(const void *reference, size_t reference_sz)
                 goto err;
         } else if (encoded_dk != NULL) {
             if (!ossl_ml_kem_parse_private_key(encoded_dk,
-                                               key->vinfo->prvkey_bytes, key)) {
+                    key->vinfo->prvkey_bytes, key)) {
                 ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_KEY,
-                               "error parsing %s private key",
-                               key->vinfo->algorithm_name);
+                    "error parsing %s private key",
+                    key->vinfo->algorithm_name);
                 goto err;
             }
             if (!ml_kem_pairwise_test(key, key->prov_flags))
@@ -543,7 +545,7 @@ void *ml_kem_load(const void *reference, size_t reference_sz)
         return key;
     }
 
-  err:
+err:
     OPENSSL_free(encoded_dk);
     ossl_ml_kem_key_free(key);
     return NULL;
@@ -667,8 +669,8 @@ static int ml_kem_set_params(void *vkey, const OSSL_PARAM params[])
     /* Key mutation is reportedly generally not allowed */
     if (ossl_ml_kem_have_pubkey(key)) {
         ERR_raise_data(ERR_LIB_PROV,
-                       PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE,
-                       "ML-KEM keys cannot be mutated");
+            PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE,
+            "ML-KEM keys cannot be mutated");
         return 0;
     }
 
@@ -713,7 +715,7 @@ static int ml_kem_gen_set_params(void *vgctx, const OSSL_PARAM params[])
 }
 
 static void *ml_kem_gen_init(void *provctx, int selection,
-                             const OSSL_PARAM params[], int evp_type)
+    const OSSL_PARAM params[], int evp_type)
 {
     PROV_ML_KEM_GEN_CTX *gctx = NULL;
 
@@ -737,7 +739,7 @@ static void *ml_kem_gen_init(void *provctx, int selection,
 }
 
 static const OSSL_PARAM *ml_kem_gen_settable_params(ossl_unused void *vgctx,
-                                                    ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_ML_KEM_SEED, NULL, 0),
@@ -755,8 +757,7 @@ static void *ml_kem_gen(void *vgctx, OSSL_CALLBACK *osslcb, void *cbarg)
     int genok = 0;
 
     if (gctx == NULL
-        || (gctx->selection & OSSL_KEYMGMT_SELECT_KEYPAIR) ==
-            OSSL_KEYMGMT_SELECT_PUBLIC_KEY)
+        || (gctx->selection & OSSL_KEYMGMT_SELECT_KEYPAIR) == OSSL_KEYMGMT_SELECT_PUBLIC_KEY)
         return NULL;
     seed = gctx->seed;
     key = ossl_prov_ml_kem_new(gctx->provctx, gctx->propq, gctx->evp_type);
@@ -782,7 +783,7 @@ static void *ml_kem_gen(void *vgctx, OSSL_CALLBACK *osslcb, void *cbarg)
             ossl_ml_kem_key_free(key);
             return NULL;
         }
-#endif  /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
         return key;
     }
 
@@ -794,6 +795,9 @@ static void ml_kem_gen_cleanup(void *vgctx)
 {
     PROV_ML_KEM_GEN_CTX *gctx = vgctx;
 
+    if (gctx == NULL)
+        return;
+
     if (gctx->seed != NULL)
         OPENSSL_cleanse(gctx->seed, ML_KEM_RANDOM_BYTES);
     OPENSSL_free(gctx->propq);
@@ -811,45 +815,44 @@ static void *ml_kem_dup(const void *vkey, int selection)
 }
 
 #ifndef FIPS_MODULE
-# define DISPATCH_LOAD_FN \
-        { OSSL_FUNC_KEYMGMT_LOAD, (OSSL_FUNC) ml_kem_load },
+#define DISPATCH_LOAD_FN \
+    { OSSL_FUNC_KEYMGMT_LOAD, (OSSL_FUNC)ml_kem_load },
 #else
-# define DISPATCH_LOAD_FN   /* Non-FIPS only */
+#define DISPATCH_LOAD_FN /* Non-FIPS only */
 #endif
 
-#define DECLARE_VARIANT(bits) \
-    static void *ml_kem_##bits##_new(void *provctx) \
-    { \
-        return ossl_prov_ml_kem_new(provctx, NULL, EVP_PKEY_ML_KEM_##bits); \
-    } \
-    static void *ml_kem_##bits##_gen_init(void *provctx, int selection, \
-                                          const OSSL_PARAM params[]) \
-    { \
-        return ml_kem_gen_init(provctx, selection, params, \
-                               EVP_PKEY_ML_KEM_##bits); \
-    } \
-    const OSSL_DISPATCH ossl_ml_kem_##bits##_keymgmt_functions[] = { \
-        { OSSL_FUNC_KEYMGMT_NEW, (OSSL_FUNC) ml_kem_##bits##_new }, \
-        { OSSL_FUNC_KEYMGMT_FREE, (OSSL_FUNC) ossl_ml_kem_key_free }, \
-        { OSSL_FUNC_KEYMGMT_GET_PARAMS, (OSSL_FUNC) ml_kem_get_params }, \
-        { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (OSSL_FUNC) ml_kem_gettable_params }, \
-        { OSSL_FUNC_KEYMGMT_SET_PARAMS, (OSSL_FUNC) ml_kem_set_params }, \
-        { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (OSSL_FUNC) ml_kem_settable_params }, \
-        { OSSL_FUNC_KEYMGMT_HAS, (OSSL_FUNC) ml_kem_has }, \
-        { OSSL_FUNC_KEYMGMT_MATCH, (OSSL_FUNC) ml_kem_match }, \
-        { OSSL_FUNC_KEYMGMT_VALIDATE, (OSSL_FUNC) ml_kem_validate }, \
-        { OSSL_FUNC_KEYMGMT_GEN_INIT, (OSSL_FUNC) ml_kem_##bits##_gen_init }, \
-        { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (OSSL_FUNC) ml_kem_gen_set_params }, \
-        { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS, (OSSL_FUNC) ml_kem_gen_settable_params }, \
-        { OSSL_FUNC_KEYMGMT_GEN, (OSSL_FUNC) ml_kem_gen }, \
-        { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (OSSL_FUNC) ml_kem_gen_cleanup }, \
-        DISPATCH_LOAD_FN \
-        { OSSL_FUNC_KEYMGMT_DUP, (OSSL_FUNC) ml_kem_dup }, \
-        { OSSL_FUNC_KEYMGMT_IMPORT, (OSSL_FUNC) ml_kem_import }, \
-        { OSSL_FUNC_KEYMGMT_IMPORT_TYPES, (OSSL_FUNC) ml_kem_imexport_types }, \
-        { OSSL_FUNC_KEYMGMT_EXPORT, (OSSL_FUNC) ml_kem_export }, \
-        { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (OSSL_FUNC) ml_kem_imexport_types }, \
-        OSSL_DISPATCH_END \
+#define DECLARE_VARIANT(bits)                                                             \
+    static void *ml_kem_##bits##_new(void *provctx)                                       \
+    {                                                                                     \
+        return ossl_prov_ml_kem_new(provctx, NULL, EVP_PKEY_ML_KEM_##bits);               \
+    }                                                                                     \
+    static void *ml_kem_##bits##_gen_init(void *provctx, int selection,                   \
+        const OSSL_PARAM params[])                                                        \
+    {                                                                                     \
+        return ml_kem_gen_init(provctx, selection, params,                                \
+            EVP_PKEY_ML_KEM_##bits);                                                      \
+    }                                                                                     \
+    const OSSL_DISPATCH ossl_ml_kem_##bits##_keymgmt_functions[] = {                      \
+        { OSSL_FUNC_KEYMGMT_NEW, (OSSL_FUNC)ml_kem_##bits##_new },                        \
+        { OSSL_FUNC_KEYMGMT_FREE, (OSSL_FUNC)ossl_ml_kem_key_free },                      \
+        { OSSL_FUNC_KEYMGMT_GET_PARAMS, (OSSL_FUNC)ml_kem_get_params },                   \
+        { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (OSSL_FUNC)ml_kem_gettable_params },         \
+        { OSSL_FUNC_KEYMGMT_SET_PARAMS, (OSSL_FUNC)ml_kem_set_params },                   \
+        { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (OSSL_FUNC)ml_kem_settable_params },         \
+        { OSSL_FUNC_KEYMGMT_HAS, (OSSL_FUNC)ml_kem_has },                                 \
+        { OSSL_FUNC_KEYMGMT_MATCH, (OSSL_FUNC)ml_kem_match },                             \
+        { OSSL_FUNC_KEYMGMT_VALIDATE, (OSSL_FUNC)ml_kem_validate },                       \
+        { OSSL_FUNC_KEYMGMT_GEN_INIT, (OSSL_FUNC)ml_kem_##bits##_gen_init },              \
+        { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (OSSL_FUNC)ml_kem_gen_set_params },           \
+        { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS, (OSSL_FUNC)ml_kem_gen_settable_params }, \
+        { OSSL_FUNC_KEYMGMT_GEN, (OSSL_FUNC)ml_kem_gen },                                 \
+        { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (OSSL_FUNC)ml_kem_gen_cleanup },                 \
+        DISPATCH_LOAD_FN { OSSL_FUNC_KEYMGMT_DUP, (OSSL_FUNC)ml_kem_dup },                \
+        { OSSL_FUNC_KEYMGMT_IMPORT, (OSSL_FUNC)ml_kem_import },                           \
+        { OSSL_FUNC_KEYMGMT_IMPORT_TYPES, (OSSL_FUNC)ml_kem_imexport_types },             \
+        { OSSL_FUNC_KEYMGMT_EXPORT, (OSSL_FUNC)ml_kem_export },                           \
+        { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (OSSL_FUNC)ml_kem_imexport_types },             \
+        OSSL_DISPATCH_END                                                                 \
     }
 DECLARE_VARIANT(512);
 DECLARE_VARIANT(768);
diff --git a/providers/implementations/keymgmt/mlx_kmgmt.c b/providers/implementations/keymgmt/mlx_kmgmt.c
index 72160415ab555..46ed63039ec7c 100644
--- a/providers/implementations/keymgmt/mlx_kmgmt.c
+++ b/providers/implementations/keymgmt/mlx_kmgmt.c
@@ -44,11 +44,11 @@ static const int minimal_selection = OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS
 
 /* Must match DECLARE_DISPATCH invocations at the end of the file */
 static const ECDH_VINFO hybrid_vtable[] = {
-    { "EC",  "P-256", 65, 32, 32, 1, EVP_PKEY_ML_KEM_768 },
-    { "EC",  "P-384", 97, 48, 48, 1, EVP_PKEY_ML_KEM_1024 },
+    { "EC", "P-256", 65, 32, 32, 1, EVP_PKEY_ML_KEM_768 },
+    { "EC", "P-384", 97, 48, 48, 1, EVP_PKEY_ML_KEM_1024 },
 #if !defined(OPENSSL_NO_ECX)
     { "X25519", NULL, 32, 32, 32, 0, EVP_PKEY_ML_KEM_768 },
-    { "X448",   NULL, 56, 56, 56, 0, EVP_PKEY_ML_KEM_1024 },
+    { "X448", NULL, 56, 56, 56, 0, EVP_PKEY_ML_KEM_1024 },
 #endif
 };
 
@@ -92,12 +92,11 @@ mlx_kem_key_new(unsigned int v, OSSL_LIB_CTX *libctx, char *propq)
     key->propq = propq;
     return key;
 
-  err:
+err:
     OPENSSL_free(propq);
     return NULL;
 }
 
-
 static int mlx_kem_has(const void *vkey, int selection)
 {
     const MLX_KEY *key = vkey;
@@ -148,12 +147,12 @@ typedef struct export_cb_arg_st {
     const char *algorithm_name;
     uint8_t *pubenc;
     uint8_t *prvenc;
-    int      pubcount;
-    int      prvcount;
-    size_t   puboff;
-    size_t   prvoff;
-    size_t   publen;
-    size_t   prvlen;
+    int pubcount;
+    int prvcount;
+    size_t puboff;
+    size_t prvoff;
+    size_t publen;
+    size_t prvlen;
 } EXPORT_CB_ARG;
 
 /* Copy any exported key material into its storage slot */
@@ -178,9 +177,9 @@ static int export_sub_cb(const OSSL_PARAM *params, void *varg)
             return 0;
         if (len != sub_arg->publen) {
             ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                           "Unexpected %s public key length %lu != %lu",
-                           sub_arg->algorithm_name, (unsigned long) len,
-                           sub_arg->publen);
+                "Unexpected %s public key length %lu != %lu",
+                sub_arg->algorithm_name, (unsigned long)len,
+                sub_arg->publen);
             return 0;
         }
         ++sub_arg->pubcount;
@@ -193,9 +192,9 @@ static int export_sub_cb(const OSSL_PARAM *params, void *varg)
             return 0;
         if (len != sub_arg->prvlen) {
             ERR_raise_data(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR,
-                           "Unexpected %s private key length %lu != %lu",
-                           sub_arg->algorithm_name, (unsigned long) len,
-                           (unsigned long) sub_arg->publen);
+                "Unexpected %s private key length %lu != %lu",
+                sub_arg->algorithm_name, (unsigned long)len,
+                (unsigned long)sub_arg->publen);
             return 0;
         }
         ++sub_arg->prvcount;
@@ -242,7 +241,7 @@ export_sub(EXPORT_CB_ARG *sub_arg, int selection, MLX_KEY *key)
 }
 
 static int mlx_kem_export(void *vkey, int selection, OSSL_CALLBACK *param_cb,
-                          void *cbarg)
+    void *cbarg)
 {
     MLX_KEY *key = vkey;
     OSSL_PARAM_BLD *tmpl = NULL;
@@ -295,12 +294,12 @@ static int mlx_kem_export(void *vkey, int selection, OSSL_CALLBACK *param_cb,
 
     if (sub_arg.pubenc != NULL && sub_arg.pubcount == 2
         && !ossl_param_build_set_octet_string(
-                tmpl, NULL, OSSL_PKEY_PARAM_PUB_KEY, sub_arg.pubenc, publen))
+            tmpl, NULL, OSSL_PKEY_PARAM_PUB_KEY, sub_arg.pubenc, publen))
         goto err;
 
     if (sub_arg.prvenc != NULL && sub_arg.prvcount == 2
         && !ossl_param_build_set_octet_string(
-                tmpl, NULL, OSSL_PKEY_PARAM_PRIV_KEY, sub_arg.prvenc, prvlen))
+            tmpl, NULL, OSSL_PKEY_PARAM_PRIV_KEY, sub_arg.prvenc, prvlen))
         goto err;
 
     params = OSSL_PARAM_BLD_to_param(tmpl);
@@ -332,8 +331,8 @@ static const OSSL_PARAM *mlx_kem_imexport_types(int selection)
 
 static int
 load_slot(OSSL_LIB_CTX *libctx, const char *propq, const char *pname,
-          int selection, MLX_KEY *key, int slot, const uint8_t *in,
-          int mbytes, int xbytes)
+    int selection, MLX_KEY *key, int slot, const uint8_t *in,
+    int mbytes, int xbytes)
 {
     EVP_PKEY_CTX *ctx;
     EVP_PKEY **ppkey;
@@ -352,7 +351,7 @@ load_slot(OSSL_LIB_CTX *libctx, const char *propq, const char *pname,
         len = mbytes;
     } else {
         alg = key->xinfo->algorithm_name;
-        group = (char *) key->xinfo->group_name;
+        group = (char *)key->xinfo->group_name;
         ppkey = &key->xkey;
         off = (1 - ml_kem_slot) * mbytes;
         len = xbytes;
@@ -365,19 +364,19 @@ load_slot(OSSL_LIB_CTX *libctx, const char *propq, const char *pname,
     parr[0] = OSSL_PARAM_construct_octet_string(pname, val, len);
     if (group != NULL)
         parr[1] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                   group, 0);
+            group, 0);
     if (EVP_PKEY_fromdata(ctx, ppkey, selection, parr) > 0)
         ret = 1;
 
-  err:
+err:
     EVP_PKEY_CTX_free(ctx);
     return ret;
 }
 
 static int
 load_keys(MLX_KEY *key,
-          const uint8_t *pubenc, size_t publen,
-          const uint8_t *prvenc, size_t prvlen)
+    const uint8_t *pubenc, size_t publen,
+    const uint8_t *prvenc, size_t prvlen)
 {
     int slot;
 
@@ -385,21 +384,21 @@ load_keys(MLX_KEY *key,
         if (prvlen) {
             /* Ignore public keys when private provided */
             if (!load_slot(key->libctx, key->propq, OSSL_PKEY_PARAM_PRIV_KEY,
-                           minimal_selection, key, slot, prvenc,
-                           key->minfo->prvkey_bytes, key->xinfo->prvkey_bytes))
+                    minimal_selection, key, slot, prvenc,
+                    key->minfo->prvkey_bytes, key->xinfo->prvkey_bytes))
                 goto err;
         } else if (publen) {
             /* Absent private key data, import public keys */
             if (!load_slot(key->libctx, key->propq, OSSL_PKEY_PARAM_PUB_KEY,
-                           minimal_selection, key, slot, pubenc,
-                           key->minfo->pubkey_bytes, key->xinfo->pubkey_bytes))
+                    minimal_selection, key, slot, pubenc,
+                    key->minfo->pubkey_bytes, key->xinfo->pubkey_bytes))
                 goto err;
         }
     }
     key->state = prvlen ? MLX_HAVE_PRVKEY : MLX_HAVE_PUBKEY;
     return 1;
 
-  err:
+err:
     EVP_PKEY_free(key->mkey);
     EVP_PKEY_free(key->xkey);
     key->xkey = key->mkey = NULL;
@@ -408,8 +407,8 @@ load_keys(MLX_KEY *key,
 }
 
 static int mlx_kem_key_fromdata(MLX_KEY *key,
-                               const OSSL_PARAM params[],
-                               int include_private)
+    const OSSL_PARAM params[],
+    int include_private)
 {
     const OSSL_PARAM *param_prv_key = NULL, *param_pub_key;
     const void *pubenc = NULL, *prvenc = NULL;
@@ -424,14 +423,12 @@ static int mlx_kem_key_fromdata(MLX_KEY *key,
 
     /* What does the caller want to set? */
     param_pub_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
-    if (param_pub_key != NULL &&
-        OSSL_PARAM_get_octet_string_ptr(param_pub_key, &pubenc, &publen) != 1)
+    if (param_pub_key != NULL && OSSL_PARAM_get_octet_string_ptr(param_pub_key, &pubenc, &publen) != 1)
         return 0;
     if (include_private)
         param_prv_key = OSSL_PARAM_locate_const(params,
-                                                OSSL_PKEY_PARAM_PRIV_KEY);
-    if (param_prv_key != NULL &&
-        OSSL_PARAM_get_octet_string_ptr(param_prv_key, &prvenc, &prvlen) != 1)
+            OSSL_PKEY_PARAM_PRIV_KEY);
+    if (param_prv_key != NULL && OSSL_PARAM_get_octet_string_ptr(param_prv_key, &prvenc, &prvlen) != 1)
         return 0;
 
     /* The caller MUST specify at least one of the public or private keys. */
@@ -529,9 +526,9 @@ static int mlx_kem_get_params(void *vkey, OSSL_PARAM params[])
             pub = NULL;
         } else if (pub->data_size < publen) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL,
-                           "public key output buffer too short: %lu < %lu",
-                           (unsigned long) pub->data_size,
-                           (unsigned long) publen);
+                "public key output buffer too short: %lu < %lu",
+                (unsigned long)pub->data_size,
+                (unsigned long)publen);
             return 0;
         } else {
             sub_arg.pubenc = pub->data;
@@ -547,9 +544,9 @@ static int mlx_kem_get_params(void *vkey, OSSL_PARAM params[])
                 prv = NULL;
             } else if (prv->data_size < prvlen) {
                 ERR_raise_data(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL,
-                               "private key output buffer too short: %lu < %lu",
-                               (unsigned long) prv->data_size,
-                               (unsigned long) prvlen);
+                    "private key output buffer too short: %lu < %lu",
+                    (unsigned long)prv->data_size,
+                    (unsigned long)prvlen);
                 return 0;
             } else {
                 sub_arg.prvenc = prv->data;
@@ -603,8 +600,8 @@ static int mlx_kem_set_params(void *vkey, const OSSL_PARAM params[])
     /* Key mutation is reportedly generally not allowed */
     if (mlx_kem_have_pubkey(key)) {
         ERR_raise_data(ERR_LIB_PROV,
-                       PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE,
-                       "keys cannot be mutated");
+            PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE,
+            "keys cannot be mutated");
         return 0;
     }
     /* An unlikely failure mode is the parameter having some unexpected type */
@@ -649,7 +646,7 @@ static int mlx_kem_gen_set_params(void *vgctx, const OSSL_PARAM params[])
 }
 
 static void *mlx_kem_gen_init(int evp_type, OSSL_LIB_CTX *libctx,
-                              int selection, const OSSL_PARAM params[])
+    int selection, const OSSL_PARAM params[])
 {
     PROV_ML_KEM_GEN_CTX *gctx = NULL;
 
@@ -673,7 +670,7 @@ static void *mlx_kem_gen_init(int evp_type, OSSL_LIB_CTX *libctx,
 }
 
 static const OSSL_PARAM *mlx_kem_gen_settable_params(ossl_unused void *vgctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PROPERTIES, NULL, 0),
@@ -690,8 +687,7 @@ static void *mlx_kem_gen(void *vgctx, OSSL_CALLBACK *osslcb, void *cbarg)
     char *propq;
 
     if (gctx == NULL
-        || (gctx->selection & OSSL_KEYMGMT_SELECT_KEYPAIR) ==
-            OSSL_KEYMGMT_SELECT_PUBLIC_KEY)
+        || (gctx->selection & OSSL_KEYMGMT_SELECT_KEYPAIR) == OSSL_KEYMGMT_SELECT_PUBLIC_KEY)
         return NULL;
 
     /* Lose ownership of propq */
@@ -705,10 +701,10 @@ static void *mlx_kem_gen(void *vgctx, OSSL_CALLBACK *osslcb, void *cbarg)
 
     /* For now, using the same "propq" for all components */
     key->mkey = EVP_PKEY_Q_keygen(key->libctx, key->propq,
-                                  key->minfo->algorithm_name);
+        key->minfo->algorithm_name);
     key->xkey = EVP_PKEY_Q_keygen(key->libctx, key->propq,
-                                  key->xinfo->algorithm_name,
-                                  key->xinfo->group_name);
+        key->xinfo->algorithm_name,
+        key->xinfo->group_name);
     if (key->mkey != NULL && key->xkey != NULL) {
         key->state = MLX_HAVE_PRVKEY;
         return key;
@@ -737,9 +733,26 @@ static void *mlx_kem_dup(const void *vkey, int selection)
         || (ret = OPENSSL_memdup(key, sizeof(*ret))) == NULL)
         return NULL;
 
+    if (ret->propq != NULL
+        && (ret->propq = OPENSSL_strdup(ret->propq)) == NULL) {
+        OPENSSL_free(ret);
+        return NULL;
+    }
+
+    /* Absent key material, nothing left to do */
+    if (ret->mkey == NULL) {
+        if (ret->xkey == NULL)
+            return ret;
+        /* Fail if the source key is an inconsistent state */
+        OPENSSL_free(ret->propq);
+        OPENSSL_free(ret);
+        return NULL;
+    }
+
     switch (selection & OSSL_KEYMGMT_SELECT_KEYPAIR) {
     case 0:
         ret->xkey = ret->mkey = NULL;
+        ret->state = MLX_HAVE_NOKEYS;
         return ret;
     case OSSL_KEYMGMT_SELECT_KEYPAIR:
         ret->mkey = EVP_PKEY_dup(key->mkey);
@@ -749,7 +762,7 @@ static void *mlx_kem_dup(const void *vkey, int selection)
         break;
     default:
         ERR_raise_data(ERR_LIB_PROV, PROV_R_UNSUPPORTED_SELECTION,
-                       "duplication of partial key material not supported");
+            "duplication of partial key material not supported");
         break;
     }
 
@@ -757,44 +770,44 @@ static void *mlx_kem_dup(const void *vkey, int selection)
     return NULL;
 }
 
-#define DECLARE_DISPATCH(name, variant) \
-    static OSSL_FUNC_keymgmt_new_fn mlx_##name##_kem_new; \
-    static void *mlx_##name##_kem_new(void *provctx) \
-    { \
-        OSSL_LIB_CTX *libctx; \
-                              \
-        libctx = provctx == NULL ? NULL : PROV_LIBCTX_OF(provctx); \
-        return mlx_kem_key_new(variant, libctx, NULL); \
-    } \
-    static OSSL_FUNC_keymgmt_gen_init_fn mlx_##name##_kem_gen_init; \
-    static void *mlx_##name##_kem_gen_init(void *provctx, int selection, \
-                                           const OSSL_PARAM params[]) \
-    { \
-        OSSL_LIB_CTX *libctx; \
-                              \
-        libctx = provctx == NULL ? NULL : PROV_LIBCTX_OF(provctx); \
-        return mlx_kem_gen_init(variant, libctx, selection, params); \
-    } \
-    const OSSL_DISPATCH ossl_mlx_##name##_kem_kmgmt_functions[] = { \
-        { OSSL_FUNC_KEYMGMT_NEW, (OSSL_FUNC) mlx_##name##_kem_new }, \
-        { OSSL_FUNC_KEYMGMT_FREE, (OSSL_FUNC) mlx_kem_key_free }, \
-        { OSSL_FUNC_KEYMGMT_GET_PARAMS, (OSSL_FUNC) mlx_kem_get_params }, \
-        { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (OSSL_FUNC) mlx_kem_gettable_params }, \
-        { OSSL_FUNC_KEYMGMT_SET_PARAMS, (OSSL_FUNC) mlx_kem_set_params }, \
-        { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (OSSL_FUNC) mlx_kem_settable_params }, \
-        { OSSL_FUNC_KEYMGMT_HAS, (OSSL_FUNC) mlx_kem_has }, \
-        { OSSL_FUNC_KEYMGMT_MATCH, (OSSL_FUNC) mlx_kem_match }, \
-        { OSSL_FUNC_KEYMGMT_GEN_INIT, (OSSL_FUNC) mlx_##name##_kem_gen_init }, \
-        { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (OSSL_FUNC) mlx_kem_gen_set_params }, \
-        { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS, (OSSL_FUNC) mlx_kem_gen_settable_params }, \
-        { OSSL_FUNC_KEYMGMT_GEN, (OSSL_FUNC) mlx_kem_gen }, \
-        { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (OSSL_FUNC) mlx_kem_gen_cleanup }, \
-        { OSSL_FUNC_KEYMGMT_DUP, (OSSL_FUNC) mlx_kem_dup }, \
-        { OSSL_FUNC_KEYMGMT_IMPORT, (OSSL_FUNC) mlx_kem_import }, \
-        { OSSL_FUNC_KEYMGMT_IMPORT_TYPES, (OSSL_FUNC) mlx_kem_imexport_types }, \
-        { OSSL_FUNC_KEYMGMT_EXPORT, (OSSL_FUNC) mlx_kem_export }, \
-        { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (OSSL_FUNC) mlx_kem_imexport_types }, \
-        OSSL_DISPATCH_END \
+#define DECLARE_DISPATCH(name, variant)                                                    \
+    static OSSL_FUNC_keymgmt_new_fn mlx_##name##_kem_new;                                  \
+    static void *mlx_##name##_kem_new(void *provctx)                                       \
+    {                                                                                      \
+        OSSL_LIB_CTX *libctx;                                                              \
+                                                                                           \
+        libctx = provctx == NULL ? NULL : PROV_LIBCTX_OF(provctx);                         \
+        return mlx_kem_key_new(variant, libctx, NULL);                                     \
+    }                                                                                      \
+    static OSSL_FUNC_keymgmt_gen_init_fn mlx_##name##_kem_gen_init;                        \
+    static void *mlx_##name##_kem_gen_init(void *provctx, int selection,                   \
+        const OSSL_PARAM params[])                                                         \
+    {                                                                                      \
+        OSSL_LIB_CTX *libctx;                                                              \
+                                                                                           \
+        libctx = provctx == NULL ? NULL : PROV_LIBCTX_OF(provctx);                         \
+        return mlx_kem_gen_init(variant, libctx, selection, params);                       \
+    }                                                                                      \
+    const OSSL_DISPATCH ossl_mlx_##name##_kem_kmgmt_functions[] = {                        \
+        { OSSL_FUNC_KEYMGMT_NEW, (OSSL_FUNC)mlx_##name##_kem_new },                        \
+        { OSSL_FUNC_KEYMGMT_FREE, (OSSL_FUNC)mlx_kem_key_free },                           \
+        { OSSL_FUNC_KEYMGMT_GET_PARAMS, (OSSL_FUNC)mlx_kem_get_params },                   \
+        { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (OSSL_FUNC)mlx_kem_gettable_params },         \
+        { OSSL_FUNC_KEYMGMT_SET_PARAMS, (OSSL_FUNC)mlx_kem_set_params },                   \
+        { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (OSSL_FUNC)mlx_kem_settable_params },         \
+        { OSSL_FUNC_KEYMGMT_HAS, (OSSL_FUNC)mlx_kem_has },                                 \
+        { OSSL_FUNC_KEYMGMT_MATCH, (OSSL_FUNC)mlx_kem_match },                             \
+        { OSSL_FUNC_KEYMGMT_GEN_INIT, (OSSL_FUNC)mlx_##name##_kem_gen_init },              \
+        { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (OSSL_FUNC)mlx_kem_gen_set_params },           \
+        { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS, (OSSL_FUNC)mlx_kem_gen_settable_params }, \
+        { OSSL_FUNC_KEYMGMT_GEN, (OSSL_FUNC)mlx_kem_gen },                                 \
+        { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (OSSL_FUNC)mlx_kem_gen_cleanup },                 \
+        { OSSL_FUNC_KEYMGMT_DUP, (OSSL_FUNC)mlx_kem_dup },                                 \
+        { OSSL_FUNC_KEYMGMT_IMPORT, (OSSL_FUNC)mlx_kem_import },                           \
+        { OSSL_FUNC_KEYMGMT_IMPORT_TYPES, (OSSL_FUNC)mlx_kem_imexport_types },             \
+        { OSSL_FUNC_KEYMGMT_EXPORT, (OSSL_FUNC)mlx_kem_export },                           \
+        { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (OSSL_FUNC)mlx_kem_imexport_types },             \
+        OSSL_DISPATCH_END                                                                  \
     }
 /* See |hybrid_vtable| above */
 DECLARE_DISPATCH(p256, 0);
diff --git a/providers/implementations/keymgmt/rsa_kmgmt.c b/providers/implementations/keymgmt/rsa_kmgmt.c
index 77d0950094216..3582936d67f55 100644
--- a/providers/implementations/keymgmt/rsa_kmgmt.c
+++ b/providers/implementations/keymgmt/rsa_kmgmt.c
@@ -25,6 +25,7 @@
 #include "prov/provider_ctx.h"
 #include "crypto/rsa.h"
 #include "crypto/cryptlib.h"
+#include "internal/fips.h"
 #include "internal/param_build_set.h"
 
 static OSSL_FUNC_keymgmt_new_fn rsa_newdata;
@@ -52,18 +53,18 @@ static OSSL_FUNC_keymgmt_query_operation_name_fn rsa_query_operation_name;
 static OSSL_FUNC_keymgmt_dup_fn rsa_dup;
 
 #define RSA_DEFAULT_MD "SHA256"
-#define RSA_POSSIBLE_SELECTIONS                                        \
+#define RSA_POSSIBLE_SELECTIONS \
     (OSSL_KEYMGMT_SELECT_KEYPAIR | OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS)
 
 DEFINE_STACK_OF(BIGNUM)
 DEFINE_SPECIAL_STACK_OF_CONST(BIGNUM_const, BIGNUM)
 
 static int pss_params_fromdata(RSA_PSS_PARAMS_30 *pss_params, int *defaults_set,
-                               const OSSL_PARAM params[], int rsa_type,
-                               OSSL_LIB_CTX *libctx)
+    const OSSL_PARAM params[], int rsa_type,
+    OSSL_LIB_CTX *libctx)
 {
     if (!ossl_rsa_pss_params_30_fromdata(pss_params, defaults_set,
-                                         params, libctx))
+            params, libctx))
         return 0;
 
     /* If not a PSS type RSA, sending us PSS parameters is wrong */
@@ -185,13 +186,9 @@ static int rsa_import(void *keydata, int selection, const OSSL_PARAM params[])
     rsa_type = RSA_test_flags(rsa, RSA_FLAG_TYPE_MASK);
 
     if ((selection & OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS) != 0)
-        ok = ok && pss_params_fromdata(ossl_rsa_get0_pss_params_30(rsa),
-                                       &pss_defaults_set,
-                                       params, rsa_type,
-                                       ossl_rsa_get0_libctx(rsa));
+        ok = ok && pss_params_fromdata(ossl_rsa_get0_pss_params_30(rsa), &pss_defaults_set, params, rsa_type, ossl_rsa_get0_libctx(rsa));
     if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0) {
-        int include_private =
-            selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
+        int include_private = selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
 
         ok = ok && ossl_rsa_fromdata(rsa, params, include_private);
     }
@@ -200,7 +197,7 @@ static int rsa_import(void *keydata, int selection, const OSSL_PARAM params[])
 }
 
 static int rsa_export(void *keydata, int selection,
-                      OSSL_CALLBACK *param_callback, void *cbarg)
+    OSSL_CALLBACK *param_callback, void *cbarg)
 {
     RSA *rsa = keydata;
     const RSA_PSS_PARAMS_30 *pss_params = ossl_rsa_get0_pss_params_30(rsa);
@@ -219,11 +216,9 @@ static int rsa_export(void *keydata, int selection,
         return 0;
 
     if ((selection & OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS) != 0)
-        ok = ok && (ossl_rsa_pss_params_30_is_unrestricted(pss_params)
-                    || ossl_rsa_pss_params_30_todata(pss_params, tmpl, NULL));
+        ok = ok && (ossl_rsa_pss_params_30_is_unrestricted(pss_params) || ossl_rsa_pss_params_30_todata(pss_params, tmpl, NULL));
     if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0) {
-        int include_private =
-            selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
+        int include_private = selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY ? 1 : 0;
 
         ok = ok && ossl_rsa_todata(rsa, tmpl, NULL, include_private);
     }
@@ -242,54 +237,54 @@ static int rsa_export(void *keydata, int selection,
 
 #ifdef FIPS_MODULE
 /* In fips mode there are no multi-primes. */
-# define RSA_KEY_MP_TYPES()                                                    \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR1, NULL, 0),                           \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR2, NULL, 0),                           \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT1, NULL, 0),                         \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT2, NULL, 0),                         \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT1, NULL, 0),
+#define RSA_KEY_MP_TYPES()                                     \
+    OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR1, NULL, 0),       \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR2, NULL, 0),   \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT1, NULL, 0), \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT2, NULL, 0), \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT1, NULL, 0),
 #else
 /*
  * We allow up to 10 prime factors (starting with p, q).
  * NOTE: there is only 9 OSSL_PKEY_PARAM_RSA_COEFFICIENT
  */
-# define RSA_KEY_MP_TYPES()                                                    \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR1, NULL, 0),                           \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR2, NULL, 0),                           \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR3, NULL, 0),                           \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR4, NULL, 0),                           \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR5, NULL, 0),                           \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR6, NULL, 0),                           \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR7, NULL, 0),                           \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR8, NULL, 0),                           \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR9, NULL, 0),                           \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR10, NULL, 0),                          \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT1, NULL, 0),                         \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT2, NULL, 0),                         \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT3, NULL, 0),                         \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT4, NULL, 0),                         \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT5, NULL, 0),                         \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT6, NULL, 0),                         \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT7, NULL, 0),                         \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT8, NULL, 0),                         \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT9, NULL, 0),                         \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT10, NULL, 0),                        \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT1, NULL, 0),                      \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT2, NULL, 0),                      \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT3, NULL, 0),                      \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT4, NULL, 0),                      \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT5, NULL, 0),                      \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT6, NULL, 0),                      \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT7, NULL, 0),                      \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT8, NULL, 0),                      \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT9, NULL, 0),
+#define RSA_KEY_MP_TYPES()                                        \
+    OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR1, NULL, 0),          \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR2, NULL, 0),      \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR3, NULL, 0),      \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR4, NULL, 0),      \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR5, NULL, 0),      \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR6, NULL, 0),      \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR7, NULL, 0),      \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR8, NULL, 0),      \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR9, NULL, 0),      \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR10, NULL, 0),     \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT1, NULL, 0),    \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT2, NULL, 0),    \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT3, NULL, 0),    \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT4, NULL, 0),    \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT5, NULL, 0),    \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT6, NULL, 0),    \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT7, NULL, 0),    \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT8, NULL, 0),    \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT9, NULL, 0),    \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT10, NULL, 0),   \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT1, NULL, 0), \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT2, NULL, 0), \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT3, NULL, 0), \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT4, NULL, 0), \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT5, NULL, 0), \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT6, NULL, 0), \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT7, NULL, 0), \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT8, NULL, 0), \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT9, NULL, 0),
 #endif
 
-#define RSA_KEY_TYPES()                                                        \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_N, NULL, 0),                                 \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_E, NULL, 0),                                 \
-OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_D, NULL, 0),                                 \
-RSA_KEY_MP_TYPES()
+#define RSA_KEY_TYPES()                                \
+    OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_N, NULL, 0),     \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_E, NULL, 0), \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_D, NULL, 0), \
+        RSA_KEY_MP_TYPES()
 
 /*
  * This provider can export everything in an RSA key, so we use the exact
@@ -300,7 +295,7 @@ RSA_KEY_MP_TYPES()
  */
 static const OSSL_PARAM rsa_key_types[] = {
     RSA_KEY_TYPES()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 /*
  * We lied about the amount of factors, exponents and coefficients, the
@@ -360,17 +355,17 @@ static int rsa_get_params(void *key, OSSL_PARAM params[])
      * With RSA-OAEP keys, this may need to be amended.
      */
     if ((p = OSSL_PARAM_locate(params,
-                               OSSL_PKEY_PARAM_MANDATORY_DIGEST)) != NULL
+             OSSL_PKEY_PARAM_MANDATORY_DIGEST))
+            != NULL
         && rsa_type == RSA_FLAG_TYPE_RSASSAPSS
         && !ossl_rsa_pss_params_30_is_unrestricted(pss_params)) {
-        const char *mdname =
-            ossl_rsa_oaeppss_nid2name(ossl_rsa_pss_params_30_hashalg(pss_params));
+        const char *mdname = ossl_rsa_oaeppss_nid2name(ossl_rsa_pss_params_30_hashalg(pss_params));
 
         if (mdname == NULL || !OSSL_PARAM_set_utf8_string(p, mdname))
             return 0;
     }
     return (rsa_type != RSA_FLAG_TYPE_RSASSAPSS
-            || ossl_rsa_pss_params_30_todata(pss_params, NULL, params))
+               || ossl_rsa_pss_params_30_todata(pss_params, NULL, params))
         && ossl_rsa_todata(rsa, NULL, params, 1);
 }
 
@@ -380,7 +375,7 @@ static const OSSL_PARAM rsa_params[] = {
     OSSL_PARAM_int(OSSL_PKEY_PARAM_MAX_SIZE, NULL),
     OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_DEFAULT_DIGEST, NULL, 0),
     RSA_KEY_TYPES()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 
 static const OSSL_PARAM *rsa_gettable_params(void *provctx)
@@ -447,7 +442,7 @@ static int rsa_gencb(int p, int n, BN_GENCB *cb)
 }
 
 static void *gen_init(void *provctx, int selection, int rsa_type,
-                      const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(provctx);
     struct rsa_gen_ctx *gctx = NULL;
@@ -483,13 +478,13 @@ static void *gen_init(void *provctx, int selection, int rsa_type,
 }
 
 static void *rsa_gen_init(void *provctx, int selection,
-                          const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return gen_init(provctx, selection, RSA_FLAG_TYPE_RSA, params);
 }
 
 static void *rsapss_gen_init(void *provctx, int selection,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return gen_init(provctx, selection, RSA_FLAG_TYPE_RSASSAPSS, params);
 }
@@ -524,7 +519,7 @@ static int rsa_gen_set_params(void *genctx, const OSSL_PARAM params[])
     /* Only attempt to get PSS parameters when generating an RSA-PSS key */
     if (gctx->rsa_type == RSA_FLAG_TYPE_RSASSAPSS
         && !pss_params_fromdata(&gctx->pss_params, &gctx->pss_defaults_set, params,
-                                gctx->rsa_type, gctx->libctx))
+            gctx->rsa_type, gctx->libctx))
         return 0;
 #if defined(FIPS_MODULE) && !defined(OPENSSL_NO_ACVP_TESTS)
     /* Any ACVP test related parameters are copied into a params[] */
@@ -534,24 +529,24 @@ static int rsa_gen_set_params(void *genctx, const OSSL_PARAM params[])
     return 1;
 }
 
-#define rsa_gen_basic                                           \
-    OSSL_PARAM_size_t(OSSL_PKEY_PARAM_RSA_BITS, NULL),          \
-    OSSL_PARAM_size_t(OSSL_PKEY_PARAM_RSA_PRIMES, NULL),        \
-    OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_E, NULL, 0)
+#define rsa_gen_basic                                        \
+    OSSL_PARAM_size_t(OSSL_PKEY_PARAM_RSA_BITS, NULL),       \
+        OSSL_PARAM_size_t(OSSL_PKEY_PARAM_RSA_PRIMES, NULL), \
+        OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_E, NULL, 0)
 
 /*
  * The following must be kept in sync with ossl_rsa_pss_params_30_fromdata()
  * in crypto/rsa/rsa_backend.c
  */
-#define rsa_gen_pss                                                     \
-    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_RSA_DIGEST, NULL, 0),        \
-    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_RSA_DIGEST_PROPS, NULL, 0),  \
-    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_RSA_MASKGENFUNC, NULL, 0),   \
-    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_RSA_MGF1_DIGEST, NULL, 0),   \
-    OSSL_PARAM_int(OSSL_PKEY_PARAM_RSA_PSS_SALTLEN, NULL)
+#define rsa_gen_pss                                                        \
+    OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_RSA_DIGEST, NULL, 0),           \
+        OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_RSA_DIGEST_PROPS, NULL, 0), \
+        OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_RSA_MASKGENFUNC, NULL, 0),  \
+        OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_RSA_MGF1_DIGEST, NULL, 0),  \
+        OSSL_PARAM_int(OSSL_PKEY_PARAM_RSA_PSS_SALTLEN, NULL)
 
 static const OSSL_PARAM *rsa_gen_settable_params(ossl_unused void *genctx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         rsa_gen_basic,
@@ -562,7 +557,7 @@ static const OSSL_PARAM *rsa_gen_settable_params(ossl_unused void *genctx,
 }
 
 static const OSSL_PARAM *rsapss_gen_settable_params(ossl_unused void *genctx,
-                                                    ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         rsa_gen_basic,
@@ -616,12 +611,12 @@ static void *rsa_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
 #endif
 
     if (!RSA_generate_multi_prime_key(rsa_tmp,
-                                      (int)gctx->nbits, (int)gctx->primes,
-                                      gctx->pub_exp, gencb))
+            (int)gctx->nbits, (int)gctx->primes,
+            gctx->pub_exp, gencb))
         goto err;
 
     if (!ossl_rsa_pss_params_30_copy(ossl_rsa_get0_pss_params_30(rsa_tmp),
-                                     &gctx->pss_params))
+            &gctx->pss_params))
         goto err;
 
     RSA_clear_flags(rsa_tmp, RSA_FLAG_TYPE_MASK);
@@ -629,7 +624,7 @@ static void *rsa_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
 
     rsa = rsa_tmp;
     rsa_tmp = NULL;
- err:
+err:
     BN_GENCB_free(gencb);
     RSA_free(rsa_tmp);
     return rsa;
@@ -650,7 +645,7 @@ static void rsa_gen_cleanup(void *genctx)
 }
 
 static void *common_load(const void *reference, size_t reference_sz,
-                         int expected_rsa_type)
+    int expected_rsa_type)
 {
     RSA *rsa = NULL;
 
@@ -697,15 +692,15 @@ const OSSL_DISPATCH ossl_rsa_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))rsa_newdata },
     { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))rsa_gen_init },
     { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS,
-      (void (*)(void))rsa_gen_set_params },
+        (void (*)(void))rsa_gen_set_params },
     { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,
-      (void (*)(void))rsa_gen_settable_params },
+        (void (*)(void))rsa_gen_settable_params },
     { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))rsa_gen },
     { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))rsa_gen_cleanup },
     { OSSL_FUNC_KEYMGMT_LOAD, (void (*)(void))rsa_load },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))rsa_freedata },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))rsa_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))rsa_gettable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))rsa_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))rsa_gettable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))rsa_has },
     { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))rsa_match },
     { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))rsa_validate },
@@ -722,13 +717,13 @@ const OSSL_DISPATCH ossl_rsapss_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))rsapss_gen_init },
     { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (void (*)(void))rsa_gen_set_params },
     { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,
-      (void (*)(void))rsapss_gen_settable_params },
+        (void (*)(void))rsapss_gen_settable_params },
     { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))rsa_gen },
     { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))rsa_gen_cleanup },
     { OSSL_FUNC_KEYMGMT_LOAD, (void (*)(void))rsapss_load },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))rsa_freedata },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))rsa_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))rsa_gettable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))rsa_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))rsa_gettable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))rsa_has },
     { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))rsa_match },
     { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))rsa_validate },
@@ -737,7 +732,7 @@ const OSSL_DISPATCH ossl_rsapss_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))rsa_export },
     { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (void (*)(void))rsa_export_types },
     { OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME,
-      (void (*)(void))rsa_query_operation_name },
+        (void (*)(void))rsa_query_operation_name },
     { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))rsa_dup },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/keymgmt/slh_dsa_kmgmt.c b/providers/implementations/keymgmt/slh_dsa_kmgmt.c
index b67367b449cde..8a676213903f5 100644
--- a/providers/implementations/keymgmt/slh_dsa_kmgmt.c
+++ b/providers/implementations/keymgmt/slh_dsa_kmgmt.c
@@ -11,6 +11,7 @@
 #include <openssl/core_names.h>
 #include <openssl/param_build.h>
 #include <openssl/self_test.h>
+#include <openssl/proverr.h>
 #include "crypto/slh_dsa.h"
 #include "internal/fips.h"
 #include "internal/param_build_set.h"
@@ -18,6 +19,11 @@
 #include "prov/providercommon.h"
 #include "prov/provider_ctx.h"
 
+#ifdef FIPS_MODULE
+static int slh_dsa_fips140_pairwise_test(const SLH_DSA_KEY *key,
+    SLH_DSA_HASH_CTX *ctx);
+#endif /* FIPS_MODULE */
+
 static OSSL_FUNC_keymgmt_free_fn slh_dsa_free_key;
 static OSSL_FUNC_keymgmt_has_fn slh_dsa_has;
 static OSSL_FUNC_keymgmt_match_fn slh_dsa_match;
@@ -116,9 +122,9 @@ static int slh_dsa_import(void *keydata, int selection, const OSSL_PARAM params[
     return ossl_slh_dsa_key_fromdata(key, params, include_priv);
 }
 
-#define SLH_DSA_IMEXPORTABLE_PARAMETERS \
+#define SLH_DSA_IMEXPORTABLE_PARAMETERS                        \
     OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY, NULL, 0), \
-    OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0)
+        OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0)
 
 static const OSSL_PARAM slh_dsa_key_types[] = {
     SLH_DSA_IMEXPORTABLE_PARAMETERS,
@@ -145,25 +151,28 @@ static const OSSL_PARAM *slh_dsa_gettable_params(void *provctx)
 }
 
 static int key_to_params(SLH_DSA_KEY *key, OSSL_PARAM_BLD *tmpl,
-                         int include_private)
+    int selection)
 {
     /* Error if there is no key or public key */
     if (key == NULL || ossl_slh_dsa_key_get_pub(key) == NULL)
         return 0;
-    /*
-     * Note that the private key always contains the public key elements so we
-     * just save the one blob and return.
-     */
-    if (include_private && ossl_slh_dsa_key_get_priv(key) != NULL)
-        return ossl_param_build_set_octet_string(tmpl, NULL,
-                                                 OSSL_PKEY_PARAM_PRIV_KEY,
-                                                 ossl_slh_dsa_key_get_priv(key),
-                                                 ossl_slh_dsa_key_get_priv_len(key));
-    /* Otherwise write out the public key element */
+
+    if (((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0)
+        && ossl_slh_dsa_key_get_priv(key) != NULL)
+        if (ossl_param_build_set_octet_string(tmpl, NULL,
+                OSSL_PKEY_PARAM_PRIV_KEY,
+                ossl_slh_dsa_key_get_priv(key),
+                ossl_slh_dsa_key_get_priv_len(key))
+            != 1)
+            return 0;
+
+    if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) == 0)
+        return 1;
+
     return ossl_param_build_set_octet_string(tmpl, NULL,
-                                             OSSL_PKEY_PARAM_PUB_KEY,
-                                             ossl_slh_dsa_key_get_pub(key),
-                                             ossl_slh_dsa_key_get_pub_len(key));
+        OSSL_PKEY_PARAM_PUB_KEY,
+        ossl_slh_dsa_key_get_pub(key),
+        ossl_slh_dsa_key_get_pub_len(key));
 }
 
 static int slh_dsa_get_params(void *keydata, OSSL_PARAM params[])
@@ -173,13 +182,13 @@ static int slh_dsa_get_params(void *keydata, OSSL_PARAM params[])
     const uint8_t *pub, *priv;
 
     if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_BITS)) != NULL
-            && !OSSL_PARAM_set_int(p, 8 * ossl_slh_dsa_key_get_pub_len(key)))
+        && !OSSL_PARAM_set_int(p, 8 * ossl_slh_dsa_key_get_pub_len(key)))
         return 0;
     if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_SECURITY_BITS)) != NULL
-            && !OSSL_PARAM_set_int(p, 8 * ossl_slh_dsa_key_get_n(key)))
+        && !OSSL_PARAM_set_int(p, 8 * ossl_slh_dsa_key_get_n(key)))
         return 0;
     if ((p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_MAX_SIZE)) != NULL
-            && !OSSL_PARAM_set_int(p, ossl_slh_dsa_key_get_sig_len(key)))
+        && !OSSL_PARAM_set_int(p, ossl_slh_dsa_key_get_sig_len(key)))
         return 0;
 
     priv = ossl_slh_dsa_key_get_priv(key);
@@ -188,7 +197,7 @@ static int slh_dsa_get_params(void *keydata, OSSL_PARAM params[])
         /* Note: ossl_slh_dsa_key_get_priv_len() includes the public key */
         if (p != NULL
             && !OSSL_PARAM_set_octet_string(p, priv,
-                                            ossl_slh_dsa_key_get_priv_len(key)))
+                ossl_slh_dsa_key_get_priv_len(key)))
             return 0;
     }
     pub = ossl_slh_dsa_key_get_pub(key);
@@ -196,7 +205,7 @@ static int slh_dsa_get_params(void *keydata, OSSL_PARAM params[])
         p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_PUB_KEY);
         if (p != NULL
             && !OSSL_PARAM_set_octet_string(p, pub,
-                                            ossl_slh_dsa_key_get_pub_len(key)))
+                ossl_slh_dsa_key_get_pub_len(key)))
             return 0;
     }
     /*
@@ -210,12 +219,12 @@ static int slh_dsa_get_params(void *keydata, OSSL_PARAM params[])
 }
 
 static int slh_dsa_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
-                          void *cbarg)
+    void *cbarg)
 {
     SLH_DSA_KEY *key = keydata;
     OSSL_PARAM_BLD *tmpl;
     OSSL_PARAM *params = NULL;
-    int ret = 0, include_private;
+    int ret = 0;
 
     if (!ossl_prov_is_running() || key == NULL)
         return 0;
@@ -227,8 +236,7 @@ static int slh_dsa_export(void *keydata, int selection, OSSL_CALLBACK *param_cb,
     if (tmpl == NULL)
         return 0;
 
-    include_private = ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0);
-    if (!key_to_params(key, tmpl, include_private))
+    if (!key_to_params(key, tmpl, selection))
         goto err;
 
     params = OSSL_PARAM_BLD_to_param(tmpl);
@@ -257,7 +265,7 @@ static void *slh_dsa_load(const void *reference, size_t reference_sz)
 }
 
 static void *slh_dsa_gen_init(void *provctx, int selection,
-                              const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(provctx);
     struct slh_dsa_gen_ctx *gctx = NULL;
@@ -280,30 +288,39 @@ static void *slh_dsa_gen_init(void *provctx, int selection,
  * Refer to FIPS 140-3 IG 10.3.A Additional Comment 1
  * Perform a pairwise test for SLH_DSA by signing and verifying a signature.
  */
-static int slh_dsa_fips140_pairwise_test(SLH_DSA_HASH_CTX *ctx,
-                                         const SLH_DSA_KEY *key,
-                                         OSSL_LIB_CTX *lib_ctx)
+static int slh_dsa_fips140_pairwise_test(const SLH_DSA_KEY *key,
+    SLH_DSA_HASH_CTX *ctx)
 {
     int ret = 0;
     OSSL_SELF_TEST *st = NULL;
     OSSL_CALLBACK *cb = NULL;
     void *cb_arg = NULL;
-    uint8_t msg[16] = {0};
+    uint8_t msg[16] = { 0 };
     size_t msg_len = sizeof(msg);
     uint8_t *sig = NULL;
     size_t sig_len;
+    OSSL_LIB_CTX *lib_ctx;
+    int alloc_ctx = 0;
 
     /* During self test, it is a waste to do this test */
     if (ossl_fips_self_testing())
         return 1;
 
+    if (ctx == NULL) {
+        ctx = ossl_slh_dsa_hash_ctx_new(key);
+        if (ctx == NULL)
+            return 0;
+        alloc_ctx = 1;
+    }
+    lib_ctx = ossl_slh_dsa_key_get0_libctx(key);
+
     OSSL_SELF_TEST_get_callback(lib_ctx, &cb, &cb_arg);
     st = OSSL_SELF_TEST_new(cb, cb_arg);
     if (st == NULL)
-        return 0;
+        goto err;
 
     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
-                           OSSL_SELF_TEST_DESC_PCT_SLH_DSA);
+        OSSL_SELF_TEST_DESC_PCT_SLH_DSA);
 
     sig_len = ossl_slh_dsa_key_get_sig_len(key);
     sig = OPENSSL_malloc(sig_len);
@@ -311,7 +328,8 @@ static int slh_dsa_fips140_pairwise_test(SLH_DSA_HASH_CTX *ctx,
         goto err;
 
     if (ossl_slh_dsa_sign(ctx, msg, msg_len, NULL, 0, NULL, 0,
-                          sig, &sig_len, sig_len) != 1)
+            sig, &sig_len, sig_len)
+        != 1)
         goto err;
 
     OSSL_SELF_TEST_oncorrupt_byte(st, sig);
@@ -321,6 +339,8 @@ static int slh_dsa_fips140_pairwise_test(SLH_DSA_HASH_CTX *ctx,
 
     ret = 1;
 err:
+    if (alloc_ctx)
+        ossl_slh_dsa_hash_ctx_free(ctx);
     OPENSSL_free(sig);
     OSSL_SELF_TEST_onend(st, ret);
     OSSL_SELF_TEST_free(st);
@@ -341,17 +361,19 @@ static void *slh_dsa_gen(void *genctx, const char *alg)
         return NULL;
     ctx = ossl_slh_dsa_hash_ctx_new(key);
     if (ctx == NULL)
-        return NULL;
+        goto err;
     if (!ossl_slh_dsa_generate_key(ctx, key, gctx->libctx,
-                                   gctx->entropy, gctx->entropy_len))
+            gctx->entropy, gctx->entropy_len))
         goto err;
 #ifdef FIPS_MODULE
-    if (!slh_dsa_fips140_pairwise_test(ctx, key, gctx->libctx))
+    if (!slh_dsa_fips140_pairwise_test(key, ctx)) {
+        ossl_set_error_state(OSSL_SELF_TEST_TYPE_PCT);
         goto err;
+    }
 #endif /* FIPS_MODULE */
     ossl_slh_dsa_hash_ctx_free(ctx);
     return key;
- err:
+err:
     ossl_slh_dsa_hash_ctx_free(ctx);
     ossl_slh_dsa_key_free(key);
     return NULL;
@@ -389,7 +411,7 @@ static int slh_dsa_gen_set_params(void *genctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *slh_dsa_gen_settable_params(ossl_unused void *genctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_PROPERTIES, NULL, 0),
@@ -403,44 +425,47 @@ static void slh_dsa_gen_cleanup(void *genctx)
 {
     struct slh_dsa_gen_ctx *gctx = genctx;
 
+    if (gctx == NULL)
+        return;
+
     OPENSSL_cleanse(gctx->entropy, gctx->entropy_len);
     OPENSSL_free(gctx->propq);
     OPENSSL_free(gctx);
 }
 
-#define MAKE_KEYMGMT_FUNCTIONS(alg, fn)                                        \
-    static OSSL_FUNC_keymgmt_new_fn slh_dsa_##fn##_new_key;                    \
-    static OSSL_FUNC_keymgmt_gen_fn slh_dsa_##fn##_gen;                        \
-    static void *slh_dsa_##fn##_new_key(void *provctx)                         \
-    {                                                                          \
-        return slh_dsa_new_key(provctx, alg);                                  \
-    }                                                                          \
-    static void *slh_dsa_##fn##_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)\
-    {                                                                          \
-        return slh_dsa_gen(genctx, alg);                                       \
-    }                                                                          \
-    const OSSL_DISPATCH ossl_slh_dsa_##fn##_keymgmt_functions[] = {            \
-        { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))slh_dsa_##fn##_new_key },     \
-        { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))slh_dsa_free_key },          \
-        { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))slh_dsa_dup_key },            \
-        { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))slh_dsa_has },                \
-        { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))slh_dsa_match },            \
-        { OSSL_FUNC_KEYMGMT_IMPORT, (void (*)(void))slh_dsa_import },          \
-        { OSSL_FUNC_KEYMGMT_IMPORT_TYPES, (void (*)(void))slh_dsa_imexport_types },\
-        { OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))slh_dsa_export },          \
-        { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (void (*)(void))slh_dsa_imexport_types },\
-        { OSSL_FUNC_KEYMGMT_LOAD, (void (*)(void))slh_dsa_load },              \
-        { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))slh_dsa_get_params }, \
-        { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))slh_dsa_gettable_params },\
-        { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))slh_dsa_validate },      \
-        { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))slh_dsa_gen_init },      \
-        { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))slh_dsa_##fn##_gen },         \
-        { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))slh_dsa_gen_cleanup },\
-        { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS,                                    \
-          (void (*)(void))slh_dsa_gen_set_params },                            \
-        { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,                               \
-          (void (*)(void))slh_dsa_gen_settable_params },                       \
-        OSSL_DISPATCH_END                                                      \
+#define MAKE_KEYMGMT_FUNCTIONS(alg, fn)                                                 \
+    static OSSL_FUNC_keymgmt_new_fn slh_dsa_##fn##_new_key;                             \
+    static OSSL_FUNC_keymgmt_gen_fn slh_dsa_##fn##_gen;                                 \
+    static void *slh_dsa_##fn##_new_key(void *provctx)                                  \
+    {                                                                                   \
+        return slh_dsa_new_key(provctx, alg);                                           \
+    }                                                                                   \
+    static void *slh_dsa_##fn##_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)   \
+    {                                                                                   \
+        return slh_dsa_gen(genctx, alg);                                                \
+    }                                                                                   \
+    const OSSL_DISPATCH ossl_slh_dsa_##fn##_keymgmt_functions[] = {                     \
+        { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))slh_dsa_##fn##_new_key },              \
+        { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))slh_dsa_free_key },                   \
+        { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))slh_dsa_dup_key },                     \
+        { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))slh_dsa_has },                         \
+        { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))slh_dsa_match },                     \
+        { OSSL_FUNC_KEYMGMT_IMPORT, (void (*)(void))slh_dsa_import },                   \
+        { OSSL_FUNC_KEYMGMT_IMPORT_TYPES, (void (*)(void))slh_dsa_imexport_types },     \
+        { OSSL_FUNC_KEYMGMT_EXPORT, (void (*)(void))slh_dsa_export },                   \
+        { OSSL_FUNC_KEYMGMT_EXPORT_TYPES, (void (*)(void))slh_dsa_imexport_types },     \
+        { OSSL_FUNC_KEYMGMT_LOAD, (void (*)(void))slh_dsa_load },                       \
+        { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))slh_dsa_get_params },           \
+        { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))slh_dsa_gettable_params }, \
+        { OSSL_FUNC_KEYMGMT_VALIDATE, (void (*)(void))slh_dsa_validate },               \
+        { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))slh_dsa_gen_init },               \
+        { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))slh_dsa_##fn##_gen },                  \
+        { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))slh_dsa_gen_cleanup },         \
+        { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS,                                             \
+            (void (*)(void))slh_dsa_gen_set_params },                                   \
+        { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,                                        \
+            (void (*)(void))slh_dsa_gen_settable_params },                              \
+        OSSL_DISPATCH_END                                                               \
     }
 
 MAKE_KEYMGMT_FUNCTIONS("SLH-DSA-SHA2-128s", sha2_128s);
diff --git a/providers/implementations/keymgmt/template_kmgmt.c b/providers/implementations/keymgmt/template_kmgmt.c
index b8e377a7f9124..b8e6c56114a98 100644
--- a/providers/implementations/keymgmt/template_kmgmt.c
+++ b/providers/implementations/keymgmt/template_kmgmt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2024-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
@@ -133,7 +133,7 @@ static int template_match(const void *keydata1, const void *keydata2, int select
 }
 
 static int key_to_params(void *key, OSSL_PARAM_BLD *tmpl,
-                         OSSL_PARAM params[], int include_private)
+    OSSL_PARAM params[], int include_private)
 {
     if (key == NULL)
         return 0;
@@ -144,7 +144,7 @@ static int key_to_params(void *key, OSSL_PARAM_BLD *tmpl,
 }
 
 static int template_export(void *key, int selection, OSSL_CALLBACK *param_cb,
-                           void *cbarg)
+    void *cbarg)
 {
     OSSL_PARAM_BLD *tmpl;
     OSSL_PARAM *params = NULL;
@@ -181,8 +181,8 @@ static int template_export(void *key, int selection, OSSL_CALLBACK *param_cb,
 }
 
 static int ossl_template_key_fromdata(void *key,
-                                      const OSSL_PARAM params[],
-                                      int include_private)
+    const OSSL_PARAM params[],
+    int include_private)
 {
     const OSSL_PARAM *param_priv_key = NULL, *param_pub_key;
 
@@ -195,8 +195,7 @@ static int ossl_template_key_fromdata(void *key,
 
     param_pub_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
     if (include_private)
-        param_priv_key =
-            OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
+        param_priv_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PRIV_KEY);
 
     if (param_pub_key == NULL && param_priv_key == NULL)
         return 0;
@@ -231,9 +230,9 @@ static int template_import(void *key, int selection, const OSSL_PARAM params[])
     return ok;
 }
 
-#define TEMPLATE_KEY_TYPES()                                     \
-    OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY, NULL, 0),   \
-    OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0)
+#define TEMPLATE_KEY_TYPES()                                   \
+    OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY, NULL, 0), \
+        OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY, NULL, 0)
 
 static const OSSL_PARAM template_key_types[] = {
     TEMPLATE_KEY_TYPES(),
@@ -331,7 +330,7 @@ static int template_gen_set_params(void *genctx, const OSSL_PARAM params[])
 }
 
 static void *template_gen_init(void *provctx, int selection,
-                               const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     struct template_gen_ctx *gctx = NULL;
 
@@ -355,7 +354,7 @@ static void *template_gen_init(void *provctx, int selection,
 }
 
 static const OSSL_PARAM *template_gen_settable_params(ossl_unused void *genctx,
-                                                      ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         OSSL_PARAM_END
@@ -387,6 +386,9 @@ static void template_gen_cleanup(void *genctx)
 {
     struct template_gen_ctx *gctx = genctx;
 
+    if (gctx == NULL)
+        return;
+
     debug_print("gen cleanup for %p\n", gctx);
     OPENSSL_free(gctx);
 }
@@ -407,7 +409,7 @@ static void *template_dup(const void *vsrckey, int selection)
 
     debug_print("dup returns %p\n", dstkey);
     return dstkey;
- err:
+err:
     template_free(dstkey);
     debug_print("dup returns NULL\n");
     return NULL;
@@ -416,10 +418,10 @@ static void *template_dup(const void *vsrckey, int selection)
 const OSSL_DISPATCH ossl_template_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))template_new },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))template_free },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))template_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))template_gettable_params },
-    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*) (void))template_set_params },
-    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*) (void))template_settable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))template_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))template_gettable_params },
+    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))template_set_params },
+    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))template_settable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))template_has },
     { OSSL_FUNC_KEYMGMT_MATCH, (void (*)(void))template_match },
     { OSSL_FUNC_KEYMGMT_IMPORT_TYPES, (void (*)(void))template_imexport_types },
@@ -429,7 +431,7 @@ const OSSL_DISPATCH ossl_template_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))template_gen_init },
     { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (void (*)(void))template_gen_set_params },
     { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,
-      (void (*)(void))template_gen_settable_params },
+        (void (*)(void))template_gen_settable_params },
     { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))template_gen },
     { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))template_gen_cleanup },
     { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))template_dup },
diff --git a/providers/implementations/macs/blake2_mac_impl.c b/providers/implementations/macs/blake2_mac_impl.c
index 2ca800fad9bcd..a1ba00aa6475a 100644
--- a/providers/implementations/macs/blake2_mac_impl.c
+++ b/providers/implementations/macs/blake2_mac_impl.c
@@ -88,7 +88,7 @@ static size_t blake2_mac_size(void *vmacctx)
 }
 
 static int blake2_setkey(struct blake2_mac_data_st *macctx,
-                         const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     if (keylen > BLAKE2_KEYBYTES || keylen == 0) {
         ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
@@ -103,7 +103,7 @@ static int blake2_setkey(struct blake2_mac_data_st *macctx,
 }
 
 static int blake2_mac_init(void *vmacctx, const unsigned char *key,
-                           size_t keylen, const OSSL_PARAM params[])
+    size_t keylen, const OSSL_PARAM params[])
 {
     struct blake2_mac_data_st *macctx = vmacctx;
 
@@ -121,7 +121,7 @@ static int blake2_mac_init(void *vmacctx, const unsigned char *key,
 }
 
 static int blake2_mac_update(void *vmacctx,
-                             const unsigned char *data, size_t datalen)
+    const unsigned char *data, size_t datalen)
 {
     struct blake2_mac_data_st *macctx = vmacctx;
 
@@ -132,8 +132,8 @@ static int blake2_mac_update(void *vmacctx,
 }
 
 static int blake2_mac_final(void *vmacctx,
-                            unsigned char *out, size_t *outl,
-                            size_t outsize)
+    unsigned char *out, size_t *outl,
+    size_t outsize)
 {
     struct blake2_mac_data_st *macctx = vmacctx;
 
@@ -150,7 +150,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
     OSSL_PARAM_END
 };
 static const OSSL_PARAM *blake2_gettable_ctx_params(ossl_unused void *ctx,
-                                                    ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -160,11 +160,11 @@ static int blake2_get_ctx_params(void *vmacctx, OSSL_PARAM params[])
     OSSL_PARAM *p;
 
     if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL
-            && !OSSL_PARAM_set_size_t(p, blake2_mac_size(vmacctx)))
+        && !OSSL_PARAM_set_size_t(p, blake2_mac_size(vmacctx)))
         return 0;
 
     if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_BLOCK_SIZE)) != NULL
-            && !OSSL_PARAM_set_size_t(p, BLAKE2_BLOCKBYTES))
+        && !OSSL_PARAM_set_size_t(p, BLAKE2_BLOCKBYTES))
         return 0;
 
     return 1;
@@ -178,7 +178,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
     OSSL_PARAM_END
 };
 static const OSSL_PARAM *blake2_mac_settable_ctx_params(
-            ossl_unused void *ctx, ossl_unused void *p_ctx)
+    ossl_unused void *ctx, ossl_unused void *p_ctx)
 {
     return known_settable_ctx_params;
 }
@@ -207,7 +207,7 @@ static int blake2_mac_set_ctx_params(void *vmacctx, const OSSL_PARAM params[])
     }
 
     if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_KEY)) != NULL
-            && !blake2_setkey(macctx, p->data, p->data_size))
+        && !blake2_setkey(macctx, p->data, p->data_size))
         return 0;
 
     if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_CUSTOM))
@@ -245,10 +245,10 @@ const OSSL_DISPATCH BLAKE2_FUNCTIONS[] = {
     { OSSL_FUNC_MAC_UPDATE, (void (*)(void))blake2_mac_update },
     { OSSL_FUNC_MAC_FINAL, (void (*)(void))blake2_mac_final },
     { OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS,
-      (void (*)(void))blake2_gettable_ctx_params },
+        (void (*)(void))blake2_gettable_ctx_params },
     { OSSL_FUNC_MAC_GET_CTX_PARAMS, (void (*)(void))blake2_get_ctx_params },
     { OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS,
-      (void (*)(void))blake2_mac_settable_ctx_params },
+        (void (*)(void))blake2_mac_settable_ctx_params },
     { OSSL_FUNC_MAC_SET_CTX_PARAMS, (void (*)(void))blake2_mac_set_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/macs/blake2b_mac.c b/providers/implementations/macs/blake2b_mac.c
index b445cbd57875e..5db1f1a2a6f31 100644
--- a/providers/implementations/macs/blake2b_mac.c
+++ b/providers/implementations/macs/blake2b_mac.c
@@ -29,5 +29,6 @@
 /* OSSL_DISPATCH symbol */
 #define BLAKE2_FUNCTIONS ossl_blake2bmac_functions
 
+/* clang-format off */
 #include "blake2_mac_impl.c"
-
+/* clang-format on */
diff --git a/providers/implementations/macs/blake2s_mac.c b/providers/implementations/macs/blake2s_mac.c
index 6b3fa28bd36be..0d89267aa6c65 100644
--- a/providers/implementations/macs/blake2s_mac.c
+++ b/providers/implementations/macs/blake2s_mac.c
@@ -29,4 +29,6 @@
 /* OSSL_DISPATCH symbol */
 #define BLAKE2_FUNCTIONS ossl_blake2smac_functions
 
+/* clang-format off */
 #include "blake2_mac_impl.c"
+/* clang-format on */
diff --git a/providers/implementations/macs/cmac_prov.c b/providers/implementations/macs/cmac_prov.c
index 36acf4d81b8a3..58a842776233c 100644
--- a/providers/implementations/macs/cmac_prov.c
+++ b/providers/implementations/macs/cmac_prov.c
@@ -128,7 +128,7 @@ static size_t cmac_size(void *vmacctx)
  * key name used by the Triple-DES.
  */
 static int tdes_check_param(struct cmac_data_st *macctx, OSSL_PARAM *p,
-                            int *state)
+    int *state)
 {
     OSSL_LIB_CTX *libctx = PROV_LIBCTX_OF(macctx->provctx);
     const EVP_CIPHER *cipher = ossl_prov_cipher_cipher(&macctx->cipher);
@@ -136,18 +136,18 @@ static int tdes_check_param(struct cmac_data_st *macctx, OSSL_PARAM *p,
     *state = OSSL_FIPS_IND_STATE_UNKNOWN;
     if (EVP_CIPHER_is_a(cipher, "DES-EDE3-CBC")) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(macctx, OSSL_FIPS_IND_SETTABLE0,
-                                         libctx, "CMAC", "Triple-DES",
-                                         ossl_fips_config_tdes_encrypt_disallowed))
+                libctx, "CMAC", "Triple-DES",
+                ossl_fips_config_tdes_encrypt_disallowed))
             return 0;
         OSSL_FIPS_IND_GET_PARAM(macctx, p, state, OSSL_FIPS_IND_SETTABLE0,
-                                OSSL_CIPHER_PARAM_FIPS_ENCRYPT_CHECK)
+            OSSL_CIPHER_PARAM_FIPS_ENCRYPT_CHECK)
     }
     return 1;
 }
 #endif
 
 static int cmac_setkey(struct cmac_data_st *macctx,
-                       const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     int rv;
     OSSL_PARAM *p = NULL;
@@ -161,14 +161,14 @@ static int cmac_setkey(struct cmac_data_st *macctx,
         p = prms;
 #endif
     rv = ossl_cmac_init(macctx->ctx, key, keylen,
-                        ossl_prov_cipher_cipher(&macctx->cipher),
-                        ossl_prov_cipher_engine(&macctx->cipher), p);
+        ossl_prov_cipher_cipher(&macctx->cipher),
+        ossl_prov_cipher_engine(&macctx->cipher), p);
     ossl_prov_cipher_reset(&macctx->cipher);
     return rv;
 }
 
 static int cmac_init(void *vmacctx, const unsigned char *key,
-                     size_t keylen, const OSSL_PARAM params[])
+    size_t keylen, const OSSL_PARAM params[])
 {
     struct cmac_data_st *macctx = vmacctx;
 
@@ -181,7 +181,7 @@ static int cmac_init(void *vmacctx, const unsigned char *key,
 }
 
 static int cmac_update(void *vmacctx, const unsigned char *data,
-                       size_t datalen)
+    size_t datalen)
 {
     struct cmac_data_st *macctx = vmacctx;
 
@@ -189,7 +189,7 @@ static int cmac_update(void *vmacctx, const unsigned char *data,
 }
 
 static int cmac_final(void *vmacctx, unsigned char *out, size_t *outl,
-                      size_t outsize)
+    size_t outsize)
 {
     struct cmac_data_st *macctx = vmacctx;
 
@@ -203,10 +203,10 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
     OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL),
     OSSL_PARAM_size_t(OSSL_MAC_PARAM_BLOCK_SIZE, NULL),
     OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 static const OSSL_PARAM *cmac_gettable_ctx_params(ossl_unused void *ctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -216,11 +216,11 @@ static int cmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[])
     OSSL_PARAM *p;
 
     if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL
-            && !OSSL_PARAM_set_size_t(p, cmac_size(vmacctx)))
+        && !OSSL_PARAM_set_size_t(p, cmac_size(vmacctx)))
         return 0;
 
     if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_BLOCK_SIZE)) != NULL
-            && !OSSL_PARAM_set_size_t(p, cmac_size(vmacctx)))
+        && !OSSL_PARAM_set_size_t(p, cmac_size(vmacctx)))
         return 0;
 
     if (!OSSL_FIPS_IND_GET_CTX_PARAM((struct cmac_data_st *)vmacctx, params))
@@ -233,10 +233,10 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
     OSSL_PARAM_utf8_string(OSSL_MAC_PARAM_PROPERTIES, NULL, 0),
     OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, NULL, 0),
     OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_CIPHER_PARAM_FIPS_ENCRYPT_CHECK)
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 static const OSSL_PARAM *cmac_settable_ctx_params(ossl_unused void *ctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_ctx_params;
 }
@@ -254,8 +254,8 @@ static int cmac_set_ctx_params(void *vmacctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(macctx,
-                                     OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_CIPHER_PARAM_FIPS_ENCRYPT_CHECK))
+            OSSL_FIPS_IND_SETTABLE0, params,
+            OSSL_CIPHER_PARAM_FIPS_ENCRYPT_CHECK))
         return 0;
 
     if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_CIPHER)) != NULL) {
@@ -272,9 +272,9 @@ static int cmac_set_ctx_params(void *vmacctx, const OSSL_PARAM params[])
             const EVP_CIPHER *cipher = ossl_prov_cipher_cipher(&macctx->cipher);
 
             if (!EVP_CIPHER_is_a(cipher, "AES-256-CBC")
-                    && !EVP_CIPHER_is_a(cipher, "AES-192-CBC")
-                    && !EVP_CIPHER_is_a(cipher, "AES-128-CBC")
-                    && !EVP_CIPHER_is_a(cipher, "DES-EDE3-CBC")) {
+                && !EVP_CIPHER_is_a(cipher, "AES-192-CBC")
+                && !EVP_CIPHER_is_a(cipher, "AES-128-CBC")
+                && !EVP_CIPHER_is_a(cipher, "DES-EDE3-CBC")) {
                 ERR_raise(ERR_LIB_PROV, EVP_R_UNSUPPORTED_CIPHER);
                 return 0;
             }
@@ -298,10 +298,10 @@ const OSSL_DISPATCH ossl_cmac_functions[] = {
     { OSSL_FUNC_MAC_UPDATE, (void (*)(void))cmac_update },
     { OSSL_FUNC_MAC_FINAL, (void (*)(void))cmac_final },
     { OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS,
-      (void (*)(void))cmac_gettable_ctx_params },
+        (void (*)(void))cmac_gettable_ctx_params },
     { OSSL_FUNC_MAC_GET_CTX_PARAMS, (void (*)(void))cmac_get_ctx_params },
     { OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS,
-      (void (*)(void))cmac_settable_ctx_params },
+        (void (*)(void))cmac_settable_ctx_params },
     { OSSL_FUNC_MAC_SET_CTX_PARAMS, (void (*)(void))cmac_set_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/macs/gmac_prov.c b/providers/implementations/macs/gmac_prov.c
index ca9382b0a82f8..36d089abfb9de 100644
--- a/providers/implementations/macs/gmac_prov.c
+++ b/providers/implementations/macs/gmac_prov.c
@@ -40,7 +40,7 @@ static OSSL_FUNC_mac_final_fn gmac_final;
 
 struct gmac_data_st {
     void *provctx;
-    EVP_CIPHER_CTX *ctx;         /* Cipher context */
+    EVP_CIPHER_CTX *ctx; /* Cipher context */
     PROV_CIPHER cipher;
 };
 
@@ -98,7 +98,7 @@ static size_t gmac_size(void)
 }
 
 static int gmac_setkey(struct gmac_data_st *macctx,
-                       const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     EVP_CIPHER_CTX *ctx = macctx->ctx;
 
@@ -112,7 +112,7 @@ static int gmac_setkey(struct gmac_data_st *macctx,
 }
 
 static int gmac_init(void *vmacctx, const unsigned char *key,
-                     size_t keylen, const OSSL_PARAM params[])
+    size_t keylen, const OSSL_PARAM params[])
 {
     struct gmac_data_st *macctx = vmacctx;
 
@@ -124,7 +124,7 @@ static int gmac_init(void *vmacctx, const unsigned char *key,
 }
 
 static int gmac_update(void *vmacctx, const unsigned char *data,
-                       size_t datalen)
+    size_t datalen)
 {
     struct gmac_data_st *macctx = vmacctx;
     EVP_CIPHER_CTX *ctx = macctx->ctx;
@@ -143,7 +143,7 @@ static int gmac_update(void *vmacctx, const unsigned char *data,
 }
 
 static int gmac_final(void *vmacctx, unsigned char *out, size_t *outl,
-                      size_t outsize)
+    size_t outsize)
 {
     OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
     struct gmac_data_st *macctx = vmacctx;
@@ -157,7 +157,7 @@ static int gmac_final(void *vmacctx, unsigned char *out, size_t *outl,
 
     hlen = gmac_size();
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
-                                                  out, (size_t)hlen);
+        out, (size_t)hlen);
     if (!EVP_CIPHER_CTX_get_params(macctx->ctx, params))
         return 0;
 
@@ -192,7 +192,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
     OSSL_PARAM_END
 };
 static const OSSL_PARAM *gmac_settable_ctx_params(ossl_unused void *ctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_ctx_params;
 }
@@ -221,14 +221,14 @@ static int gmac_set_ctx_params(void *vmacctx, const OSSL_PARAM params[])
             return 0;
         }
         if (!EVP_EncryptInit_ex(ctx, ossl_prov_cipher_cipher(&macctx->cipher),
-                                ossl_prov_cipher_engine(&macctx->cipher), NULL,
-                                NULL))
+                ossl_prov_cipher_engine(&macctx->cipher), NULL,
+                NULL))
             return 0;
     }
 
     if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_KEY)) != NULL)
         if (p->data_type != OSSL_PARAM_OCTET_STRING
-                || !gmac_setkey(macctx, p->data, p->data_size))
+            || !gmac_setkey(macctx, p->data, p->data_size))
             return 0;
 
     if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_IV)) != NULL) {
@@ -236,7 +236,8 @@ static int gmac_set_ctx_params(void *vmacctx, const OSSL_PARAM params[])
             return 0;
 
         if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN,
-                                 p->data_size, NULL) <= 0
+                p->data_size, NULL)
+                <= 0
             || !EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, p->data))
             return 0;
     }
@@ -253,7 +254,7 @@ const OSSL_DISPATCH ossl_gmac_functions[] = {
     { OSSL_FUNC_MAC_GETTABLE_PARAMS, (void (*)(void))gmac_gettable_params },
     { OSSL_FUNC_MAC_GET_PARAMS, (void (*)(void))gmac_get_params },
     { OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS,
-      (void (*)(void))gmac_settable_ctx_params },
+        (void (*)(void))gmac_settable_ctx_params },
     { OSSL_FUNC_MAC_SET_CTX_PARAMS, (void (*)(void))gmac_set_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/macs/hmac_prov.c b/providers/implementations/macs/hmac_prov.c
index e9c3087027c6b..9872519f3d658 100644
--- a/providers/implementations/macs/hmac_prov.c
+++ b/providers/implementations/macs/hmac_prov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-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
@@ -52,7 +52,7 @@ static OSSL_FUNC_mac_final_fn hmac_final;
 /* typedef EVP_MAC_IMPL */
 struct hmac_data_st {
     void *provctx;
-    HMAC_CTX *ctx;               /* HMAC context */
+    HMAC_CTX *ctx; /* HMAC context */
     PROV_DIGEST digest;
     unsigned char *key;
     size_t keylen;
@@ -98,7 +98,7 @@ static void hmac_free(void *vmacctx)
     if (macctx != NULL) {
         HMAC_CTX_free(macctx->ctx);
         ossl_prov_digest_reset(&macctx->digest);
-        OPENSSL_secure_clear_free(macctx->key, macctx->keylen);
+        OPENSSL_clear_free(macctx->key, macctx->keylen);
         OPENSSL_free(macctx);
     }
 }
@@ -127,13 +127,13 @@ static void *hmac_dup(void *vsrc)
         return NULL;
     }
     if (src->key != NULL) {
-        /* There is no "secure" OPENSSL_memdup */
-        dst->key = OPENSSL_secure_malloc(src->keylen > 0 ? src->keylen : 1);
+        dst->key = OPENSSL_malloc(src->keylen > 0 ? src->keylen : 1);
         if (dst->key == NULL) {
             hmac_free(dst);
             return 0;
         }
-        memcpy(dst->key, src->key, src->keylen);
+        if (src->keylen > 0)
+            memcpy(dst->key, src->key, src->keylen);
     }
     return dst;
 }
@@ -153,7 +153,7 @@ static int hmac_block_size(struct hmac_data_st *macctx)
 }
 
 static int hmac_setkey(struct hmac_data_st *macctx,
-                       const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     const EVP_MD *digest;
 
@@ -168,8 +168,8 @@ static int hmac_setkey(struct hmac_data_st *macctx,
 
         if (!approved) {
             if (!OSSL_FIPS_IND_ON_UNAPPROVED(macctx, OSSL_FIPS_IND_SETTABLE0,
-                                             libctx, "HMAC", "keysize",
-                                             ossl_fips_config_hmac_key_check)) {
+                    libctx, "HMAC", "keysize",
+                    ossl_fips_config_hmac_key_check)) {
                 ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
                 return 0;
             }
@@ -178,25 +178,26 @@ static int hmac_setkey(struct hmac_data_st *macctx,
 #endif
 
     if (macctx->key != NULL)
-        OPENSSL_secure_clear_free(macctx->key, macctx->keylen);
+        OPENSSL_clear_free(macctx->key, macctx->keylen);
     /* Keep a copy of the key in case we need it for TLS HMAC */
-    macctx->key = OPENSSL_secure_malloc(keylen > 0 ? keylen : 1);
+    macctx->key = OPENSSL_malloc(keylen > 0 ? keylen : 1);
     if (macctx->key == NULL)
         return 0;
 
-    memcpy(macctx->key, key, keylen);
+    if (keylen > 0)
+        memcpy(macctx->key, key, keylen);
     macctx->keylen = keylen;
 
     digest = ossl_prov_digest_md(&macctx->digest);
     /* HMAC_Init_ex doesn't tolerate all zero params, so we must be careful */
     if (key != NULL || (macctx->tls_data_size == 0 && digest != NULL))
         return HMAC_Init_ex(macctx->ctx, key, keylen, digest,
-                            ossl_prov_digest_engine(&macctx->digest));
+            ossl_prov_digest_engine(&macctx->digest));
     return 1;
 }
 
 static int hmac_init(void *vmacctx, const unsigned char *key,
-                     size_t keylen, const OSSL_PARAM params[])
+    size_t keylen, const OSSL_PARAM params[])
 {
     struct hmac_data_st *macctx = vmacctx;
 
@@ -211,7 +212,7 @@ static int hmac_init(void *vmacctx, const unsigned char *key,
 }
 
 static int hmac_update(void *vmacctx, const unsigned char *data,
-                       size_t datalen)
+    size_t datalen)
 {
     struct hmac_data_st *macctx = vmacctx;
 
@@ -230,22 +231,22 @@ static int hmac_update(void *vmacctx, const unsigned char *data,
             return 0;
 
         return ssl3_cbc_digest_record(ossl_prov_digest_md(&macctx->digest),
-                                      macctx->tls_mac_out,
-                                      &macctx->tls_mac_out_size,
-                                      macctx->tls_header,
-                                      data,
-                                      datalen,
-                                      macctx->tls_data_size,
-                                      macctx->key,
-                                      macctx->keylen,
-                                      0);
+            macctx->tls_mac_out,
+            &macctx->tls_mac_out_size,
+            macctx->tls_header,
+            data,
+            datalen,
+            macctx->tls_data_size,
+            macctx->key,
+            macctx->keylen,
+            0);
     }
 
     return HMAC_Update(macctx->ctx, data, datalen);
 }
 
 static int hmac_final(void *vmacctx, unsigned char *out, size_t *outl,
-                      size_t outsize)
+    size_t outsize)
 {
     unsigned int hlen;
     struct hmac_data_st *macctx = vmacctx;
@@ -270,10 +271,10 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
     OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL),
     OSSL_PARAM_size_t(OSSL_MAC_PARAM_BLOCK_SIZE, NULL),
     OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 static const OSSL_PARAM *hmac_gettable_ctx_params(ossl_unused void *ctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -284,11 +285,11 @@ static int hmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[])
     OSSL_PARAM *p;
 
     if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL
-            && !OSSL_PARAM_set_size_t(p, hmac_size(macctx)))
+        && !OSSL_PARAM_set_size_t(p, hmac_size(macctx)))
         return 0;
 
     if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_BLOCK_SIZE)) != NULL
-            && !OSSL_PARAM_set_int(p, hmac_block_size(macctx)))
+        && !OSSL_PARAM_set_int(p, hmac_block_size(macctx)))
         return 0;
 
 #ifdef FIPS_MODULE
@@ -313,10 +314,10 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
     OSSL_PARAM_int(OSSL_MAC_PARAM_DIGEST_ONESHOT, NULL),
     OSSL_PARAM_size_t(OSSL_MAC_PARAM_TLS_DATA_SIZE, NULL),
     OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_MAC_PARAM_FIPS_KEY_CHECK)
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 static const OSSL_PARAM *hmac_settable_ctx_params(ossl_unused void *ctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_ctx_params;
 }
@@ -334,7 +335,7 @@ static int hmac_set_ctx_params(void *vmacctx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(macctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_MAC_PARAM_FIPS_KEY_CHECK))
+            OSSL_MAC_PARAM_FIPS_KEY_CHECK))
         return 0;
 
     if (!ossl_prov_digest_load_from_params(&macctx->digest, params, ctx))
@@ -349,7 +350,8 @@ static int hmac_set_ctx_params(void *vmacctx, const OSSL_PARAM params[])
     }
 
     if ((p = OSSL_PARAM_locate_const(params,
-                                     OSSL_MAC_PARAM_TLS_DATA_SIZE)) != NULL) {
+             OSSL_MAC_PARAM_TLS_DATA_SIZE))
+        != NULL) {
         if (!OSSL_PARAM_get_size_t(p, &macctx->tls_data_size))
             return 0;
     }
@@ -364,10 +366,10 @@ const OSSL_DISPATCH ossl_hmac_functions[] = {
     { OSSL_FUNC_MAC_UPDATE, (void (*)(void))hmac_update },
     { OSSL_FUNC_MAC_FINAL, (void (*)(void))hmac_final },
     { OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS,
-      (void (*)(void))hmac_gettable_ctx_params },
+        (void (*)(void))hmac_gettable_ctx_params },
     { OSSL_FUNC_MAC_GET_CTX_PARAMS, (void (*)(void))hmac_get_ctx_params },
     { OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS,
-      (void (*)(void))hmac_settable_ctx_params },
+        (void (*)(void))hmac_settable_ctx_params },
     { OSSL_FUNC_MAC_SET_CTX_PARAMS, (void (*)(void))hmac_set_ctx_params },
     OSSL_DISPATCH_END
 };
@@ -392,10 +394,10 @@ const OSSL_DISPATCH ossl_hmac_internal_functions[] = {
     { OSSL_FUNC_MAC_UPDATE, (void (*)(void))hmac_update },
     { OSSL_FUNC_MAC_FINAL, (void (*)(void))hmac_final },
     { OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS,
-      (void (*)(void))hmac_gettable_ctx_params },
+        (void (*)(void))hmac_gettable_ctx_params },
     { OSSL_FUNC_MAC_GET_CTX_PARAMS, (void (*)(void))hmac_get_ctx_params },
     { OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS,
-      (void (*)(void))hmac_settable_ctx_params },
+        (void (*)(void))hmac_settable_ctx_params },
     { OSSL_FUNC_MAC_SET_CTX_PARAMS, (void (*)(void))hmac_set_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/macs/kmac_prov.c b/providers/implementations/macs/kmac_prov.c
index 8e583ed8f323c..f91af2c1e404a 100644
--- a/providers/implementations/macs/kmac_prov.c
+++ b/providers/implementations/macs/kmac_prov.c
@@ -113,10 +113,10 @@ static const unsigned char kmac_string[] = {
     0x01, 0x20, 0x4B, 0x4D, 0x41, 0x43
 };
 
-#define KMAC_FLAG_XOF_MODE          1
+#define KMAC_FLAG_XOF_MODE 1
 
 struct kmac_data_st {
-    void  *provctx;
+    void *provctx;
     EVP_MD_CTX *ctx;
     PROV_DIGEST digest;
     size_t out_len;
@@ -139,17 +139,17 @@ struct kmac_data_st {
 };
 
 static int encode_string(unsigned char *out, size_t out_max_len, size_t *out_len,
-                         const unsigned char *in, size_t in_len);
+    const unsigned char *in, size_t in_len);
 static int right_encode(unsigned char *out, size_t out_max_len, size_t *out_len,
-                        size_t bits);
+    size_t bits);
 static int bytepad(unsigned char *out, size_t *out_len,
-                   const unsigned char *in1, size_t in1_len,
-                   const unsigned char *in2, size_t in2_len,
-                   size_t w);
+    const unsigned char *in1, size_t in1_len,
+    const unsigned char *in2, size_t in2_len,
+    size_t w);
 static int kmac_bytepad_encode_key(unsigned char *out, size_t out_max_len,
-                                   size_t *out_len,
-                                   const unsigned char *in, size_t in_len,
-                                   size_t w);
+    size_t *out_len,
+    const unsigned char *in, size_t in_len,
+    size_t w);
 
 static void kmac_free(void *vmacctx)
 {
@@ -177,7 +177,7 @@ static struct kmac_data_st *kmac_new(void *provctx)
         return NULL;
 
     if ((kctx = OPENSSL_zalloc(sizeof(*kctx))) == NULL
-            || (kctx->ctx = EVP_MD_CTX_new()) == NULL) {
+        || (kctx->ctx = EVP_MD_CTX_new()) == NULL) {
         kmac_free(kctx);
         return NULL;
     }
@@ -194,7 +194,7 @@ static void *kmac_fetch_new(void *provctx, const OSSL_PARAM *params)
     if (kctx == NULL)
         return 0;
     if (!ossl_prov_digest_load_from_params(&kctx->digest, params,
-                                      PROV_LIBCTX_OF(provctx))) {
+            PROV_LIBCTX_OF(provctx))) {
         kmac_free(kctx);
         return 0;
     }
@@ -212,7 +212,7 @@ static void *kmac128_new(void *provctx)
 {
     static const OSSL_PARAM kmac128_params[] = {
         OSSL_PARAM_utf8_string("digest", OSSL_DIGEST_NAME_KECCAK_KMAC128,
-                               sizeof(OSSL_DIGEST_NAME_KECCAK_KMAC128)),
+            sizeof(OSSL_DIGEST_NAME_KECCAK_KMAC128)),
         OSSL_PARAM_END
     };
     return kmac_fetch_new(provctx, kmac128_params);
@@ -222,7 +222,7 @@ static void *kmac256_new(void *provctx)
 {
     static const OSSL_PARAM kmac256_params[] = {
         OSSL_PARAM_utf8_string("digest", OSSL_DIGEST_NAME_KECCAK_KMAC256,
-                               sizeof(OSSL_DIGEST_NAME_KECCAK_KMAC256)),
+            sizeof(OSSL_DIGEST_NAME_KECCAK_KMAC256)),
         OSSL_PARAM_END
     };
     return kmac_fetch_new(provctx, kmac256_params);
@@ -260,7 +260,7 @@ static void *kmac_dup(void *vsrc)
 }
 
 static int kmac_setkey(struct kmac_data_st *kctx, const unsigned char *key,
-                       size_t keylen)
+    size_t keylen)
 {
     const EVP_MD *digest = ossl_prov_digest_md(&kctx->digest);
     int w = EVP_MD_get_block_size(digest);
@@ -279,9 +279,9 @@ static int kmac_setkey(struct kmac_data_st *kctx, const unsigned char *key,
 
         if (!approved) {
             if (!OSSL_FIPS_IND_ON_UNAPPROVED(kctx, OSSL_FIPS_IND_SETTABLE1,
-                                             PROV_LIBCTX_OF(kctx->provctx),
-                                             "KMAC", "Key size",
-                                             ossl_fips_config_kmac_key_check)) {
+                    PROV_LIBCTX_OF(kctx->provctx),
+                    "KMAC", "Key size",
+                    ossl_fips_config_kmac_key_check)) {
                 ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
                 return 0;
             }
@@ -293,7 +293,7 @@ static int kmac_setkey(struct kmac_data_st *kctx, const unsigned char *key,
         return 0;
     }
     if (!kmac_bytepad_encode_key(kctx->key, sizeof(kctx->key), &kctx->key_len,
-                                 key, keylen, (size_t)w))
+            key, keylen, (size_t)w))
         return 0;
     return 1;
 }
@@ -304,7 +304,7 @@ static int kmac_setkey(struct kmac_data_st *kctx, const unsigned char *key,
  * effect on the output mac.
  */
 static int kmac_init(void *vmacctx, const unsigned char *key,
-                     size_t keylen, const OSSL_PARAM params[])
+    size_t keylen, const OSSL_PARAM params[])
 {
     struct kmac_data_st *kctx = vmacctx;
     EVP_MD_CTX *ctx = kctx->ctx;
@@ -324,7 +324,7 @@ static int kmac_init(void *vmacctx, const unsigned char *key,
         return 0;
     }
     if (!EVP_DigestInit_ex(kctx->ctx, ossl_prov_digest_md(&kctx->digest),
-                           NULL))
+            NULL))
         return 0;
 
     t = EVP_MD_get_block_size(ossl_prov_digest_md(&kctx->digest));
@@ -344,7 +344,7 @@ static int kmac_init(void *vmacctx, const unsigned char *key,
     }
 
     if (!bytepad(NULL, &out_len, kmac_string, sizeof(kmac_string),
-                 kctx->custom, kctx->custom_len, block_len)) {
+            kctx->custom, kctx->custom_len, block_len)) {
         ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -352,15 +352,15 @@ static int kmac_init(void *vmacctx, const unsigned char *key,
     if (out == NULL)
         return 0;
     res = bytepad(out, NULL, kmac_string, sizeof(kmac_string),
-                  kctx->custom, kctx->custom_len, block_len)
-          && EVP_DigestUpdate(ctx, out, out_len)
-          && EVP_DigestUpdate(ctx, kctx->key, kctx->key_len);
+              kctx->custom, kctx->custom_len, block_len)
+        && EVP_DigestUpdate(ctx, out, out_len)
+        && EVP_DigestUpdate(ctx, kctx->key, kctx->key_len);
     OPENSSL_free(out);
     return res;
 }
 
 static int kmac_update(void *vmacctx, const unsigned char *data,
-                       size_t datalen)
+    size_t datalen)
 {
     struct kmac_data_st *kctx = vmacctx;
 
@@ -368,7 +368,7 @@ static int kmac_update(void *vmacctx, const unsigned char *data,
 }
 
 static int kmac_final(void *vmacctx, unsigned char *out, size_t *outl,
-                      size_t outsize)
+    size_t outsize)
 {
     struct kmac_data_st *kctx = vmacctx;
     EVP_MD_CTX *ctx = kctx->ctx;
@@ -393,10 +393,10 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
     OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL),
     OSSL_PARAM_size_t(OSSL_MAC_PARAM_BLOCK_SIZE, NULL),
     OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 static const OSSL_PARAM *kmac_gettable_ctx_params(ossl_unused void *ctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -408,7 +408,7 @@ static int kmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[])
     int sz;
 
     if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_SIZE)) != NULL
-            && !OSSL_PARAM_set_size_t(p, kctx->out_len))
+        && !OSSL_PARAM_set_size_t(p, kctx->out_len))
         return 0;
 
     if ((p = OSSL_PARAM_locate(params, OSSL_MAC_PARAM_BLOCK_SIZE)) != NULL) {
@@ -429,11 +429,11 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
     OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, NULL, 0),
     OSSL_PARAM_octet_string(OSSL_MAC_PARAM_CUSTOM, NULL, 0),
     OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_MAC_PARAM_FIPS_NO_SHORT_MAC)
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_MAC_PARAM_FIPS_KEY_CHECK)
-    OSSL_PARAM_END
+        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_MAC_PARAM_FIPS_KEY_CHECK)
+            OSSL_PARAM_END
 };
 static const OSSL_PARAM *kmac_settable_ctx_params(ossl_unused void *ctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_ctx_params;
 }
@@ -456,10 +456,10 @@ static int kmac_set_ctx_params(void *vmacctx, const OSSL_PARAM *params)
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(kctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_MAC_PARAM_FIPS_NO_SHORT_MAC))
+            OSSL_MAC_PARAM_FIPS_NO_SHORT_MAC))
         return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(kctx, OSSL_FIPS_IND_SETTABLE1, params,
-                                     OSSL_MAC_PARAM_FIPS_KEY_CHECK))
+            OSSL_MAC_PARAM_FIPS_KEY_CHECK))
         return 0;
 
     if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_XOF)) != NULL
@@ -478,9 +478,9 @@ static int kmac_set_ctx_params(void *vmacctx, const OSSL_PARAM *params)
         /* SP 800-185 8.4.2 mandates a minimum of 32 bits of output */
         if (sz < 32 / 8) {
             if (!OSSL_FIPS_IND_ON_UNAPPROVED(kctx, OSSL_FIPS_IND_SETTABLE0,
-                                             PROV_LIBCTX_OF(kctx->provctx),
-                                             "KMAC", "length",
-                                             ossl_fips_config_no_short_mac)) {
+                    PROV_LIBCTX_OF(kctx->provctx),
+                    "KMAC", "length",
+                    ossl_fips_config_no_short_mac)) {
                 ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_OUTPUT_LENGTH);
                 return 0;
             }
@@ -489,7 +489,7 @@ static int kmac_set_ctx_params(void *vmacctx, const OSSL_PARAM *params)
         kctx->out_len = sz;
     }
     if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_KEY)) != NULL
-            && !kmac_setkey(kctx, p->data, p->data_size))
+        && !kmac_setkey(kctx, p->data, p->data_size))
         return 0;
     if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_CUSTOM))
         != NULL) {
@@ -498,7 +498,7 @@ static int kmac_set_ctx_params(void *vmacctx, const OSSL_PARAM *params)
             return 0;
         }
         if (!encode_string(kctx->custom, sizeof(kctx->custom), &kctx->custom_len,
-                           p->data, p->data_size))
+                p->data, p->data_size))
             return 0;
     }
     return 1;
@@ -529,7 +529,7 @@ static unsigned int get_encode_size(size_t bits)
  * e.g if bits = 32, out[2] = { 0x20, 0x01 }
  */
 static int right_encode(unsigned char *out, size_t out_max_len, size_t *out_len,
-                        size_t bits)
+    size_t bits)
 {
     unsigned int len = get_encode_size(bits);
     int i;
@@ -560,7 +560,7 @@ static int right_encode(unsigned char *out, size_t out_max_len, size_t *out_len,
  *                                 len   bits    K     M     A     C
  */
 static int encode_string(unsigned char *out, size_t out_max_len, size_t *out_len,
-                         const unsigned char *in, size_t in_len)
+    const unsigned char *in, size_t in_len)
 {
     if (in == NULL) {
         *out_len = 0;
@@ -596,8 +596,8 @@ static int encode_string(unsigned char *out, size_t out_max_len, size_t *out_len
  *    zero_padded(multiple of w, (left_encode(w) || in1 [|| in2])
  */
 static int bytepad(unsigned char *out, size_t *out_len,
-                   const unsigned char *in1, size_t in1_len,
-                   const unsigned char *in2, size_t in2_len, size_t w)
+    const unsigned char *in1, size_t in1_len,
+    const unsigned char *in2, size_t in2_len, size_t w)
 {
     int len;
     unsigned char *p = out;
@@ -640,9 +640,9 @@ static int bytepad(unsigned char *out, size_t *out_len,
 
 /* Returns out = bytepad(encode_string(in), w) */
 static int kmac_bytepad_encode_key(unsigned char *out, size_t out_max_len,
-                                   size_t *out_len,
-                                   const unsigned char *in, size_t in_len,
-                                   size_t w)
+    size_t *out_len,
+    const unsigned char *in, size_t in_len,
+    size_t w)
 {
     unsigned char tmp[KMAC_MAX_KEY + KMAC_MAX_ENCODED_HEADER_LEN];
     size_t tmp_len;
@@ -657,22 +657,21 @@ static int kmac_bytepad_encode_key(unsigned char *out, size_t out_max_len,
 }
 
 #define IMPLEMENT_KMAC_TABLE(size, funcname, newname)                          \
-const OSSL_DISPATCH ossl_kmac##size##_##funcname[] =                           \
-{                                                                              \
-    { OSSL_FUNC_MAC_NEWCTX, (void (*)(void))kmac##size##_##newname },          \
-    { OSSL_FUNC_MAC_DUPCTX, (void (*)(void))kmac_dup },                        \
-    { OSSL_FUNC_MAC_FREECTX, (void (*)(void))kmac_free },                      \
-    { OSSL_FUNC_MAC_INIT, (void (*)(void))kmac_init },                         \
-    { OSSL_FUNC_MAC_UPDATE, (void (*)(void))kmac_update },                     \
-    { OSSL_FUNC_MAC_FINAL, (void (*)(void))kmac_final },                       \
-    { OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS,                                       \
-      (void (*)(void))kmac_gettable_ctx_params },                              \
-    { OSSL_FUNC_MAC_GET_CTX_PARAMS, (void (*)(void))kmac_get_ctx_params },     \
-    { OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS,                                       \
-      (void (*)(void))kmac_settable_ctx_params },                              \
-    { OSSL_FUNC_MAC_SET_CTX_PARAMS, (void (*)(void))kmac_set_ctx_params },     \
-    OSSL_DISPATCH_END                                                          \
-}
+    const OSSL_DISPATCH ossl_kmac##size##_##funcname[] = {                     \
+        { OSSL_FUNC_MAC_NEWCTX, (void (*)(void))kmac##size##_##newname },      \
+        { OSSL_FUNC_MAC_DUPCTX, (void (*)(void))kmac_dup },                    \
+        { OSSL_FUNC_MAC_FREECTX, (void (*)(void))kmac_free },                  \
+        { OSSL_FUNC_MAC_INIT, (void (*)(void))kmac_init },                     \
+        { OSSL_FUNC_MAC_UPDATE, (void (*)(void))kmac_update },                 \
+        { OSSL_FUNC_MAC_FINAL, (void (*)(void))kmac_final },                   \
+        { OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS,                                   \
+            (void (*)(void))kmac_gettable_ctx_params },                        \
+        { OSSL_FUNC_MAC_GET_CTX_PARAMS, (void (*)(void))kmac_get_ctx_params }, \
+        { OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS,                                   \
+            (void (*)(void))kmac_settable_ctx_params },                        \
+        { OSSL_FUNC_MAC_SET_CTX_PARAMS, (void (*)(void))kmac_set_ctx_params }, \
+        OSSL_DISPATCH_END                                                      \
+    }
 
 #define KMAC_TABLE(size) IMPLEMENT_KMAC_TABLE(size, functions, new)
 
@@ -680,17 +679,17 @@ KMAC_TABLE(128);
 KMAC_TABLE(256);
 
 #ifdef FIPS_MODULE
-# define KMAC_INTERNAL_TABLE(size)                                             \
-static OSSL_FUNC_mac_newctx_fn kmac##size##_internal_new;                      \
-static void *kmac##size##_internal_new(void *provctx)                          \
-{                                                                              \
-    struct kmac_data_st *macctx = kmac##size##_new(provctx);                   \
-                                                                               \
-    if (macctx != NULL)                                                        \
-        macctx->internal = 1;                                                  \
-    return macctx;                                                             \
-}                                                                              \
-IMPLEMENT_KMAC_TABLE(size, internal_functions, internal_new)
+#define KMAC_INTERNAL_TABLE(size)                                \
+    static OSSL_FUNC_mac_newctx_fn kmac##size##_internal_new;    \
+    static void *kmac##size##_internal_new(void *provctx)        \
+    {                                                            \
+        struct kmac_data_st *macctx = kmac##size##_new(provctx); \
+                                                                 \
+        if (macctx != NULL)                                      \
+            macctx->internal = 1;                                \
+        return macctx;                                           \
+    }                                                            \
+    IMPLEMENT_KMAC_TABLE(size, internal_functions, internal_new)
 
 KMAC_INTERNAL_TABLE(128);
 KMAC_INTERNAL_TABLE(256);
diff --git a/providers/implementations/macs/poly1305_prov.c b/providers/implementations/macs/poly1305_prov.c
index 19974f9289b16..2ee237531e69d 100644
--- a/providers/implementations/macs/poly1305_prov.c
+++ b/providers/implementations/macs/poly1305_prov.c
@@ -38,7 +38,7 @@ static OSSL_FUNC_mac_final_fn poly1305_final;
 struct poly1305_data_st {
     void *provctx;
     int updated;
-    POLY1305 poly1305;           /* Poly1305 data */
+    POLY1305 poly1305; /* Poly1305 data */
 };
 
 static void *poly1305_new(void *provctx)
@@ -79,7 +79,7 @@ static size_t poly1305_size(void)
 }
 
 static int poly1305_setkey(struct poly1305_data_st *ctx,
-                           const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     if (keylen != POLY1305_KEY_SIZE) {
         ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
@@ -91,7 +91,7 @@ static int poly1305_setkey(struct poly1305_data_st *ctx,
 }
 
 static int poly1305_init(void *vmacctx, const unsigned char *key,
-                         size_t keylen, const OSSL_PARAM params[])
+    size_t keylen, const OSSL_PARAM params[])
 {
     struct poly1305_data_st *ctx = vmacctx;
 
@@ -105,7 +105,7 @@ static int poly1305_init(void *vmacctx, const unsigned char *key,
 }
 
 static int poly1305_update(void *vmacctx, const unsigned char *data,
-                       size_t datalen)
+    size_t datalen)
 {
     struct poly1305_data_st *ctx = vmacctx;
 
@@ -119,7 +119,7 @@ static int poly1305_update(void *vmacctx, const unsigned char *data,
 }
 
 static int poly1305_final(void *vmacctx, unsigned char *out, size_t *outl,
-                          size_t outsize)
+    size_t outsize)
 {
     struct poly1305_data_st *ctx = vmacctx;
 
@@ -155,7 +155,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
     OSSL_PARAM_END
 };
 static const OSSL_PARAM *poly1305_settable_ctx_params(ossl_unused void *ctx,
-                                                      ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_ctx_params;
 }
@@ -166,7 +166,7 @@ static int poly1305_set_ctx_params(void *vmacctx, const OSSL_PARAM *params)
     const OSSL_PARAM *p;
 
     if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_KEY)) != NULL
-            && !poly1305_setkey(ctx, p->data, p->data_size))
+        && !poly1305_setkey(ctx, p->data, p->data_size))
         return 0;
     return 1;
 }
@@ -181,7 +181,7 @@ const OSSL_DISPATCH ossl_poly1305_functions[] = {
     { OSSL_FUNC_MAC_GETTABLE_PARAMS, (void (*)(void))poly1305_gettable_params },
     { OSSL_FUNC_MAC_GET_PARAMS, (void (*)(void))poly1305_get_params },
     { OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS,
-      (void (*)(void))poly1305_settable_ctx_params },
+        (void (*)(void))poly1305_settable_ctx_params },
     { OSSL_FUNC_MAC_SET_CTX_PARAMS, (void (*)(void))poly1305_set_ctx_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/macs/siphash_prov.c b/providers/implementations/macs/siphash_prov.c
index 08a393c39c69f..f20b633995a0a 100644
--- a/providers/implementations/macs/siphash_prov.c
+++ b/providers/implementations/macs/siphash_prov.c
@@ -38,8 +38,8 @@ static OSSL_FUNC_mac_final_fn siphash_final;
 
 struct siphash_data_st {
     void *provctx;
-    SIPHASH siphash;             /* Siphash data */
-    SIPHASH sipcopy;             /* Siphash data copy for reinitialization */
+    SIPHASH siphash; /* Siphash data */
+    SIPHASH sipcopy; /* Siphash data copy for reinitialization */
     unsigned int crounds, drounds;
 };
 
@@ -93,7 +93,7 @@ static size_t siphash_size(void *vmacctx)
 }
 
 static int siphash_setkey(struct siphash_data_st *ctx,
-                          const unsigned char *key, size_t keylen)
+    const unsigned char *key, size_t keylen)
 {
     int ret;
 
@@ -106,7 +106,7 @@ static int siphash_setkey(struct siphash_data_st *ctx,
 }
 
 static int siphash_init(void *vmacctx, const unsigned char *key, size_t keylen,
-                        const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     struct siphash_data_st *ctx = vmacctx;
 
@@ -124,7 +124,7 @@ static int siphash_init(void *vmacctx, const unsigned char *key, size_t keylen,
 }
 
 static int siphash_update(void *vmacctx, const unsigned char *data,
-                          size_t datalen)
+    size_t datalen)
 {
     struct siphash_data_st *ctx = vmacctx;
 
@@ -136,7 +136,7 @@ static int siphash_update(void *vmacctx, const unsigned char *data,
 }
 
 static int siphash_final(void *vmacctx, unsigned char *out, size_t *outl,
-                         size_t outsize)
+    size_t outsize)
 {
     struct siphash_data_st *ctx = vmacctx;
     size_t hlen = siphash_size(ctx);
@@ -149,7 +149,7 @@ static int siphash_final(void *vmacctx, unsigned char *out, size_t *outl,
 }
 
 static const OSSL_PARAM *siphash_gettable_ctx_params(ossl_unused void *ctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL),
@@ -179,7 +179,7 @@ static int siphash_get_ctx_params(void *vmacctx, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *siphash_settable_ctx_params(ossl_unused void *ctx,
-                                                     void *provctx)
+    void *provctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL),
@@ -208,10 +208,10 @@ static int siphash_set_params(void *vmacctx, const OSSL_PARAM *params)
             return 0;
     }
     if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_C_ROUNDS)) != NULL
-            && !OSSL_PARAM_get_uint(p, &ctx->crounds))
+        && !OSSL_PARAM_get_uint(p, &ctx->crounds))
         return 0;
     if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_D_ROUNDS)) != NULL
-            && !OSSL_PARAM_get_uint(p, &ctx->drounds))
+        && !OSSL_PARAM_get_uint(p, &ctx->drounds))
         return 0;
     if ((p = OSSL_PARAM_locate_const(params, OSSL_MAC_PARAM_KEY)) != NULL)
         if (p->data_type != OSSL_PARAM_OCTET_STRING
@@ -228,10 +228,10 @@ const OSSL_DISPATCH ossl_siphash_functions[] = {
     { OSSL_FUNC_MAC_UPDATE, (void (*)(void))siphash_update },
     { OSSL_FUNC_MAC_FINAL, (void (*)(void))siphash_final },
     { OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS,
-      (void (*)(void))siphash_gettable_ctx_params },
+        (void (*)(void))siphash_gettable_ctx_params },
     { OSSL_FUNC_MAC_GET_CTX_PARAMS, (void (*)(void))siphash_get_ctx_params },
     { OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS,
-      (void (*)(void))siphash_settable_ctx_params },
+        (void (*)(void))siphash_settable_ctx_params },
     { OSSL_FUNC_MAC_SET_CTX_PARAMS, (void (*)(void))siphash_set_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/rands/drbg.c b/providers/implementations/rands/drbg.c
index 4925a3b400ed3..f9d90d5d43816 100644
--- a/providers/implementations/rands/drbg.c
+++ b/providers/implementations/rands/drbg.c
@@ -40,7 +40,7 @@
 static const char ossl_pers_string[] = DRBG_DEFAULT_PERS_STRING;
 
 static const OSSL_DISPATCH *find_call(const OSSL_DISPATCH *dispatch,
-                                      int function);
+    int function);
 
 static int rand_drbg_restart(PROV_DRBG *drbg);
 
@@ -65,8 +65,8 @@ static int ossl_drbg_lock_parent(PROV_DRBG *drbg)
     void *parent = drbg->parent;
 
     if (parent != NULL
-            && drbg->parent_lock != NULL
-            && !drbg->parent_lock(parent)) {
+        && drbg->parent_lock != NULL
+        && !drbg->parent_lock(parent)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_PARENT_LOCKING_NOT_ENABLED);
         return 0;
     }
@@ -122,7 +122,7 @@ static unsigned int get_parent_reseed_count(PROV_DRBG *drbg)
     ossl_drbg_unlock_parent(drbg);
     return r;
 
- err:
+err:
     r = tsan_load(&drbg->reseed_counter) - 2;
     if (r == 0)
         r = UINT_MAX;
@@ -142,9 +142,9 @@ static unsigned int get_parent_reseed_count(PROV_DRBG *drbg)
  * its entropy will be used up first.
  */
 size_t ossl_drbg_get_seed(void *vdrbg, unsigned char **pout,
-                          int entropy, size_t min_len,
-                          size_t max_len, int prediction_resistance,
-                          const unsigned char *adin, size_t adin_len)
+    int entropy, size_t min_len,
+    size_t max_len, int prediction_resistance,
+    const unsigned char *adin, size_t adin_len)
 {
     PROV_DRBG *drbg = (PROV_DRBG *)vdrbg;
     size_t bytes_needed;
@@ -172,8 +172,8 @@ size_t ossl_drbg_get_seed(void *vdrbg, unsigned char **pout,
      *       intentional and correct here.
      */
     if (!ossl_prov_drbg_generate(drbg, buffer, bytes_needed,
-                                 drbg->strength, prediction_resistance,
-                                 (unsigned char *)&drbg, sizeof(drbg))) {
+            drbg->strength, prediction_resistance,
+            (unsigned char *)&drbg, sizeof(drbg))) {
         OPENSSL_secure_clear_free(buffer, bytes_needed);
         ERR_raise(ERR_LIB_PROV, PROV_R_GENERATE_ERROR);
         return 0;
@@ -184,14 +184,14 @@ size_t ossl_drbg_get_seed(void *vdrbg, unsigned char **pout,
 
 /* Implements the cleanup_entropy() callback */
 void ossl_drbg_clear_seed(ossl_unused void *vdrbg,
-                          unsigned char *out, size_t outlen)
+    unsigned char *out, size_t outlen)
 {
     OPENSSL_secure_clear_free(out, outlen);
 }
 
 static size_t get_entropy(PROV_DRBG *drbg, unsigned char **pout, int entropy,
-                          size_t min_len, size_t max_len,
-                          int prediction_resistance)
+    size_t min_len, size_t max_len,
+    int prediction_resistance)
 {
     size_t bytes;
     unsigned int p_str;
@@ -202,7 +202,7 @@ static size_t get_entropy(PROV_DRBG *drbg, unsigned char **pout, int entropy,
          * This remains purely for legacy reasons.
          */
         return ossl_prov_get_entropy(drbg->provctx, pout, entropy, min_len,
-                                     max_len);
+            max_len);
 
     if (drbg->parent_get_seed == NULL) {
         ERR_raise(ERR_LIB_PROV, PROV_R_PARENT_CANNOT_SUPPLY_ENTROPY_SEED);
@@ -236,9 +236,9 @@ static size_t get_entropy(PROV_DRBG *drbg, unsigned char **pout, int entropy,
      *       intentional and correct here.
      */
     bytes = drbg->parent_get_seed(drbg->parent, pout,
-                                  entropy > 0 ? entropy : (int) drbg->strength,
-                                  min_len, max_len, prediction_resistance,
-                                  (unsigned char *)&drbg, sizeof(drbg));
+        entropy > 0 ? entropy : (int)drbg->strength,
+        min_len, max_len, prediction_resistance,
+        (unsigned char *)&drbg, sizeof(drbg));
     ossl_drbg_unlock_parent(drbg);
     return bytes;
 }
@@ -298,7 +298,7 @@ void ossl_prov_drbg_nonce_ctx_free(void *vdngbl)
 
 /* Get a nonce from the operating system */
 static size_t prov_drbg_get_nonce(PROV_DRBG *drbg, unsigned char **pout,
-                                  size_t min_len, size_t max_len)
+    size_t min_len, size_t max_len)
 {
     size_t ret = 0, n;
     unsigned char *buf = NULL;
@@ -315,10 +315,10 @@ static size_t prov_drbg_get_nonce(PROV_DRBG *drbg, unsigned char **pout,
 
     if (drbg->parent != NULL && drbg->parent_nonce != NULL) {
         n = drbg->parent_nonce(drbg->parent, NULL, 0, drbg->min_noncelen,
-                               drbg->max_noncelen);
+            drbg->max_noncelen);
         if (n > 0 && (buf = OPENSSL_malloc(n)) != NULL) {
             ret = drbg->parent_nonce(drbg->parent, buf, 0,
-                                     drbg->min_noncelen, drbg->max_noncelen);
+                drbg->min_noncelen, drbg->max_noncelen);
             if (ret == n) {
                 *pout = buf;
                 return ret;
@@ -331,10 +331,10 @@ static size_t prov_drbg_get_nonce(PROV_DRBG *drbg, unsigned char **pout,
     memset(&data, 0, sizeof(data));
     data.drbg = drbg;
     if (!CRYPTO_atomic_add(&dngbl->rand_nonce_count, 1, &data.count,
-                           dngbl->rand_nonce_lock))
+            dngbl->rand_nonce_lock))
         return 0;
     return ossl_prov_get_nonce(drbg->provctx, pout, min_len, max_len,
-                               &data, sizeof(data));
+        &data, sizeof(data));
 }
 #endif /* PROV_RAND_GET_RANDOM_NONCE */
 
@@ -347,8 +347,8 @@ static size_t prov_drbg_get_nonce(PROV_DRBG *drbg, unsigned char **pout,
  * Returns 1 on success, 0 on failure.
  */
 int ossl_prov_drbg_instantiate(PROV_DRBG *drbg, unsigned int strength,
-                               int prediction_resistance,
-                               const unsigned char *pers, size_t perslen)
+    int prediction_resistance,
+    const unsigned char *pers, size_t perslen)
 {
     unsigned char *nonce = NULL, *entropy = NULL;
     size_t noncelen = 0, entropylen = 0;
@@ -384,8 +384,8 @@ int ossl_prov_drbg_instantiate(PROV_DRBG *drbg, unsigned int strength,
     if (drbg->min_noncelen > 0) {
         if (drbg->parent_nonce != NULL) {
             noncelen = drbg->parent_nonce(drbg->parent, NULL, drbg->strength,
-                                          drbg->min_noncelen,
-                                          drbg->max_noncelen);
+                drbg->min_noncelen,
+                drbg->max_noncelen);
             if (noncelen == 0) {
                 ERR_raise(ERR_LIB_PROV, PROV_R_ERROR_RETRIEVING_NONCE);
                 goto end;
@@ -395,10 +395,7 @@ int ossl_prov_drbg_instantiate(PROV_DRBG *drbg, unsigned int strength,
                 ERR_raise(ERR_LIB_PROV, PROV_R_ERROR_RETRIEVING_NONCE);
                 goto end;
             }
-            if (noncelen != drbg->parent_nonce(drbg->parent, nonce,
-                                               drbg->strength,
-                                               drbg->min_noncelen,
-                                               drbg->max_noncelen)) {
+            if (noncelen != drbg->parent_nonce(drbg->parent, nonce, drbg->strength, drbg->min_noncelen, drbg->max_noncelen)) {
                 ERR_raise(ERR_LIB_PROV, PROV_R_ERROR_RETRIEVING_NONCE);
                 goto end;
             }
@@ -419,9 +416,9 @@ int ossl_prov_drbg_instantiate(PROV_DRBG *drbg, unsigned int strength,
 #ifndef PROV_RAND_GET_RANDOM_NONCE
         else { /* parent == NULL */
             noncelen = prov_drbg_get_nonce(drbg, &nonce, drbg->min_noncelen,
-                                           drbg->max_noncelen);
+                drbg->max_noncelen);
             if (noncelen < drbg->min_noncelen
-                    || noncelen > drbg->max_noncelen) {
+                || noncelen > drbg->max_noncelen) {
                 ERR_raise(ERR_LIB_PROV, PROV_R_ERROR_RETRIEVING_NONCE);
                 goto end;
             }
@@ -437,16 +434,16 @@ int ossl_prov_drbg_instantiate(PROV_DRBG *drbg, unsigned int strength,
     }
 
     entropylen = get_entropy(drbg, &entropy, min_entropy,
-                             min_entropylen, max_entropylen,
-                             prediction_resistance);
+        min_entropylen, max_entropylen,
+        prediction_resistance);
     if (entropylen < min_entropylen
-            || entropylen > max_entropylen) {
+        || entropylen > max_entropylen) {
         ERR_raise(ERR_LIB_PROV, PROV_R_ERROR_RETRIEVING_ENTROPY);
         goto end;
     }
 
     if (!drbg->instantiate(drbg, entropy, entropylen, nonce, noncelen,
-                           pers, perslen)) {
+            pers, perslen)) {
         cleanup_entropy(drbg, entropy, entropylen);
         ERR_raise(ERR_LIB_PROV, PROV_R_ERROR_INSTANTIATING_DRBG);
         goto end;
@@ -458,7 +455,7 @@ int ossl_prov_drbg_instantiate(PROV_DRBG *drbg, unsigned int strength,
     drbg->reseed_time = time(NULL);
     tsan_store(&drbg->reseed_counter, drbg->reseed_next_counter);
 
- end:
+end:
     if (nonce != NULL)
         ossl_prov_cleanup_nonce(drbg->provctx, nonce, noncelen);
     if (drbg->state == EVP_RAND_STATE_READY)
@@ -480,11 +477,11 @@ int ossl_prov_drbg_uninstantiate(PROV_DRBG *drbg)
 }
 
 static int ossl_prov_drbg_reseed_unlocked(PROV_DRBG *drbg,
-                                          int prediction_resistance,
-                                          const unsigned char *ent,
-                                          size_t ent_len,
-                                          const unsigned char *adin,
-                                          size_t adinlen)
+    int prediction_resistance,
+    const unsigned char *ent,
+    size_t ent_len,
+    const unsigned char *adin,
+    size_t adinlen)
 {
     unsigned char *entropy = NULL;
     size_t entropylen = 0;
@@ -561,10 +558,10 @@ static int ossl_prov_drbg_reseed_unlocked(PROV_DRBG *drbg,
 
     /* Reseed using our sources in addition */
     entropylen = get_entropy(drbg, &entropy, drbg->strength,
-                             drbg->min_entropylen, drbg->max_entropylen,
-                             prediction_resistance);
+        drbg->min_entropylen, drbg->max_entropylen,
+        prediction_resistance);
     if (entropylen < drbg->min_entropylen
-            || entropylen > drbg->max_entropylen) {
+        || entropylen > drbg->max_entropylen) {
         ERR_raise(ERR_LIB_PROV, PROV_R_ERROR_RETRIEVING_ENTROPY);
         goto end;
     }
@@ -579,7 +576,7 @@ static int ossl_prov_drbg_reseed_unlocked(PROV_DRBG *drbg,
     if (drbg->parent != NULL)
         drbg->parent_reseed_counter = get_parent_reseed_count(drbg);
 
- end:
+end:
     cleanup_entropy(drbg, entropy, entropylen);
     if (drbg->state == EVP_RAND_STATE_READY)
         return 1;
@@ -594,8 +591,8 @@ static int ossl_prov_drbg_reseed_unlocked(PROV_DRBG *drbg,
  * Returns 1 on success, 0 on failure.
  */
 int ossl_prov_drbg_reseed(PROV_DRBG *drbg, int prediction_resistance,
-                          const unsigned char *ent, size_t ent_len,
-                          const unsigned char *adin, size_t adinlen)
+    const unsigned char *ent, size_t ent_len,
+    const unsigned char *adin, size_t adinlen)
 {
     int ret;
 
@@ -603,7 +600,7 @@ int ossl_prov_drbg_reseed(PROV_DRBG *drbg, int prediction_resistance,
         return 0;
 
     ret = ossl_prov_drbg_reseed_unlocked(drbg, prediction_resistance, ent,
-                                         ent_len, adin, adinlen);
+        ent_len, adin, adinlen);
 
     if (drbg->lock != NULL)
         CRYPTO_THREAD_unlock(drbg->lock);
@@ -622,8 +619,8 @@ int ossl_prov_drbg_reseed(PROV_DRBG *drbg, int prediction_resistance,
  *
  */
 int ossl_prov_drbg_generate(PROV_DRBG *drbg, unsigned char *out, size_t outlen,
-                            unsigned int strength, int prediction_resistance,
-                            const unsigned char *adin, size_t adinlen)
+    unsigned int strength, int prediction_resistance,
+    const unsigned char *adin, size_t adinlen)
 {
     int fork_id;
     int reseed_required = 0;
@@ -680,12 +677,12 @@ int ossl_prov_drbg_generate(PROV_DRBG *drbg, unsigned char *out, size_t outlen,
             reseed_required = 1;
     }
     if (drbg->parent != NULL
-            && get_parent_reseed_count(drbg) != drbg->parent_reseed_counter)
+        && get_parent_reseed_count(drbg) != drbg->parent_reseed_counter)
         reseed_required = 1;
 
     if (reseed_required || prediction_resistance) {
         if (!ossl_prov_drbg_reseed_unlocked(drbg, prediction_resistance, NULL,
-                                            0, adin, adinlen)) {
+                0, adin, adinlen)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_RESEED_ERROR);
             goto err;
         }
@@ -702,7 +699,7 @@ int ossl_prov_drbg_generate(PROV_DRBG *drbg, unsigned char *out, size_t outlen,
     drbg->generate_counter++;
 
     ret = 1;
- err:
+err:
     if (drbg->lock != NULL)
         CRYPTO_THREAD_unlock(drbg->lock);
 
@@ -742,7 +739,7 @@ static int rand_drbg_restart(PROV_DRBG *drbg)
 
 /* Provider support from here down */
 static const OSSL_DISPATCH *find_call(const OSSL_DISPATCH *dispatch,
-                                      int function)
+    int function)
 {
     if (dispatch != NULL)
         while (dispatch->function_id != 0) {
@@ -780,19 +777,18 @@ int ossl_drbg_enable_locking(void *vctx)
  *
  * Returns a pointer to the new DRBG instance on success, NULL on failure.
  */
-PROV_DRBG *ossl_rand_drbg_new
-    (void *provctx, void *parent, const OSSL_DISPATCH *p_dispatch,
-     int (*dnew)(PROV_DRBG *ctx),
-     void (*dfree)(void *vctx),
-     int (*instantiate)(PROV_DRBG *drbg,
-                        const unsigned char *entropy, size_t entropylen,
-                        const unsigned char *nonce, size_t noncelen,
-                        const unsigned char *pers, size_t perslen),
-     int (*uninstantiate)(PROV_DRBG *ctx),
-     int (*reseed)(PROV_DRBG *drbg, const unsigned char *ent, size_t ent_len,
-                   const unsigned char *adin, size_t adin_len),
-     int (*generate)(PROV_DRBG *, unsigned char *out, size_t outlen,
-                     const unsigned char *adin, size_t adin_len))
+PROV_DRBG *ossl_rand_drbg_new(void *provctx, void *parent, const OSSL_DISPATCH *p_dispatch,
+    int (*dnew)(PROV_DRBG *ctx),
+    void (*dfree)(void *vctx),
+    int (*instantiate)(PROV_DRBG *drbg,
+        const unsigned char *entropy, size_t entropylen,
+        const unsigned char *nonce, size_t noncelen,
+        const unsigned char *pers, size_t perslen),
+    int (*uninstantiate)(PROV_DRBG *ctx),
+    int (*reseed)(PROV_DRBG *drbg, const unsigned char *ent, size_t ent_len,
+        const unsigned char *adin, size_t adin_len),
+    int (*generate)(PROV_DRBG *, unsigned char *out, size_t outlen,
+        const unsigned char *adin, size_t adin_len))
 {
     PROV_DRBG *drbg;
     unsigned int p_str;
@@ -860,7 +856,7 @@ PROV_DRBG *ossl_rand_drbg_new
 #endif
     return drbg;
 
- err:
+err:
     dfree(drbg);
     return NULL;
 }
@@ -935,7 +931,7 @@ int ossl_drbg_get_ctx_params(PROV_DRBG *drbg, OSSL_PARAM params[])
  * *complete to 1 if all the params were processed, or 0 otherwise
  */
 int ossl_drbg_get_ctx_params_no_lock(PROV_DRBG *drbg, OSSL_PARAM params[],
-                                     int *complete)
+    int *complete)
 {
     size_t cnt = 0;
     OSSL_PARAM *p;
@@ -990,9 +986,11 @@ static int digest_allowed(const EVP_MD *md)
 {
     /* FIPS 140-3 IG D.R limited DRBG digests to a specific set */
     static const char *const allowed_digests[] = {
-        "SHA1",                     /* SHA 1 allowed */
-        "SHA2-256", "SHA2-512",     /* non-truncated SHA2 allowed */
-        "SHA3-256", "SHA3-512",     /* non-truncated SHA3 allowed */
+        "SHA1", /* SHA 1 allowed */
+        "SHA2-256",
+        "SHA2-512", /* non-truncated SHA2 allowed */
+        "SHA3-256",
+        "SHA3-512", /* non-truncated SHA3 allowed */
     };
     size_t i;
 
@@ -1006,25 +1004,25 @@ static int digest_allowed(const EVP_MD *md)
 
 /* Confirm digest is allowed to be used with a DRBG */
 int ossl_drbg_verify_digest(PROV_DRBG *drbg, OSSL_LIB_CTX *libctx,
-                            const EVP_MD *md)
+    const EVP_MD *md)
 {
 #ifdef FIPS_MODULE
     int approved = digest_allowed(md);
 
     if (!approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(drbg, OSSL_FIPS_IND_SETTABLE0,
-                                         libctx, "DRBG", "Digest",
-                                         ossl_fips_config_restricted_drbg_digests)) {
+                libctx, "DRBG", "Digest",
+                ossl_fips_config_restricted_drbg_digests)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED);
             return 0;
         }
     }
-#else   /* FIPS_MODULE */
+#else /* FIPS_MODULE */
     /* Outside of FIPS, any digests that are not XOF are allowed */
     if (EVP_MD_xof(md)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_XOF_DIGESTS_NOT_ALLOWED);
         return 0;
     }
-#endif  /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
     return 1;
 }
diff --git a/providers/implementations/rands/drbg_ctr.c b/providers/implementations/rands/drbg_ctr.c
index b906da0991846..d42f085857136 100644
--- a/providers/implementations/rands/drbg_ctr.c
+++ b/providers/implementations/rands/drbg_ctr.c
@@ -23,6 +23,7 @@
 #include "crypto/evp.h"
 #include "crypto/evp/evp_local.h"
 #include "internal/provider.h"
+#include "internal/common.h"
 
 static OSSL_FUNC_rand_newctx_fn drbg_ctr_new_wrapper;
 static OSSL_FUNC_rand_freectx_fn drbg_ctr_free;
@@ -85,6 +86,8 @@ static void ctr_XOR(PROV_DRBG_CTR *ctr, const unsigned char *in, size_t inlen)
      * are XORing. So just process however much input we have.
      */
     n = inlen < ctr->keylen ? inlen : ctr->keylen;
+    if (!ossl_assert(n <= sizeof(ctr->K)))
+        return;
     for (i = 0; i < n; i++)
         ctr->K[i] ^= in[i];
     if (inlen <= ctr->keylen)
@@ -103,7 +106,7 @@ static void ctr_XOR(PROV_DRBG_CTR *ctr, const unsigned char *in, size_t inlen)
  * Process a complete block using BCC algorithm of SP 800-90A 10.3.3
  */
 __owur static int ctr_BCC_block(PROV_DRBG_CTR *ctr, unsigned char *out,
-                                const unsigned char *in, int len)
+    const unsigned char *in, int len)
 {
     int i, outlen = AES_BLOCK_SIZE;
 
@@ -116,7 +119,6 @@ __owur static int ctr_BCC_block(PROV_DRBG_CTR *ctr, unsigned char *out,
     return 1;
 }
 
-
 /*
  * Handle several BCC operations for as much data as we need for K and X
  */
@@ -140,7 +142,7 @@ __owur static int ctr_BCC_blocks(PROV_DRBG_CTR *ctr, const unsigned char *in)
  */
 __owur static int ctr_BCC_init(PROV_DRBG_CTR *ctr)
 {
-    unsigned char bltmp[48] = {0};
+    unsigned char bltmp[48] = { 0 };
     unsigned char num_of_blk;
 
     memset(ctr->KX, 0, 48);
@@ -154,7 +156,7 @@ __owur static int ctr_BCC_init(PROV_DRBG_CTR *ctr)
  * Process several blocks into BCC algorithm, some possibly partial
  */
 __owur static int ctr_BCC_update(PROV_DRBG_CTR *ctr,
-                                 const unsigned char *in, size_t inlen)
+    const unsigned char *in, size_t inlen)
 {
     if (in == NULL || inlen == 0)
         return 1;
@@ -199,9 +201,9 @@ __owur static int ctr_BCC_final(PROV_DRBG_CTR *ctr)
 }
 
 __owur static int ctr_df(PROV_DRBG_CTR *ctr,
-                         const unsigned char *in1, size_t in1len,
-                         const unsigned char *in2, size_t in2len,
-                         const unsigned char *in3, size_t in3len)
+    const unsigned char *in1, size_t in1len,
+    const unsigned char *in2, size_t in2len,
+    const unsigned char *in3, size_t in3len)
 {
     static unsigned char c80 = 0x80;
     size_t inlen;
@@ -240,16 +242,16 @@ __owur static int ctr_df(PROV_DRBG_CTR *ctr,
         return 0;
     /* X follows key K */
     if (!EVP_CipherUpdate(ctr->ctx_ecb, ctr->KX, &outlen, ctr->KX + ctr->keylen,
-                          AES_BLOCK_SIZE)
+            AES_BLOCK_SIZE)
         || outlen != AES_BLOCK_SIZE)
         return 0;
     if (!EVP_CipherUpdate(ctr->ctx_ecb, ctr->KX + 16, &outlen, ctr->KX,
-                          AES_BLOCK_SIZE)
+            AES_BLOCK_SIZE)
         || outlen != AES_BLOCK_SIZE)
         return 0;
     if (ctr->keylen != 16)
         if (!EVP_CipherUpdate(ctr->ctx_ecb, ctr->KX + 32, &outlen,
-                              ctr->KX + 16, AES_BLOCK_SIZE)
+                ctr->KX + 16, AES_BLOCK_SIZE)
             || outlen != AES_BLOCK_SIZE)
             return 0;
     return 1;
@@ -262,9 +264,9 @@ __owur static int ctr_df(PROV_DRBG_CTR *ctr,
  * so we handle both cases in this function instead.
  */
 __owur static int ctr_update(PROV_DRBG *drbg,
-                             const unsigned char *in1, size_t in1len,
-                             const unsigned char *in2, size_t in2len,
-                             const unsigned char *nonce, size_t noncelen)
+    const unsigned char *in1, size_t in1len,
+    const unsigned char *in2, size_t in2len,
+    const unsigned char *nonce, size_t noncelen)
 {
     PROV_DRBG_CTR *ctr = (PROV_DRBG_CTR *)drbg->data;
     int outlen = AES_BLOCK_SIZE;
@@ -283,7 +285,7 @@ __owur static int ctr_update(PROV_DRBG *drbg,
         len = 48;
     }
     if (!EVP_CipherUpdate(ctr->ctx_ecb, out, &outlen, V_tmp, len)
-            || outlen != len)
+        || outlen != len)
         return 0;
     memcpy(ctr->K, out, ctr->keylen);
     memcpy(ctr->V, out + ctr->keylen, 16);
@@ -308,9 +310,9 @@ __owur static int ctr_update(PROV_DRBG *drbg,
 }
 
 static int drbg_ctr_instantiate(PROV_DRBG *drbg,
-                                const unsigned char *entropy, size_t entropylen,
-                                const unsigned char *nonce, size_t noncelen,
-                                const unsigned char *pers, size_t perslen)
+    const unsigned char *entropy, size_t entropylen,
+    const unsigned char *nonce, size_t noncelen,
+    const unsigned char *pers, size_t perslen)
 {
     PROV_DRBG_CTR *ctr = (PROV_DRBG_CTR *)drbg->data;
 
@@ -329,10 +331,10 @@ static int drbg_ctr_instantiate(PROV_DRBG *drbg,
 }
 
 static int drbg_ctr_instantiate_wrapper(void *vdrbg, 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[])
 {
     PROV_DRBG *drbg = (PROV_DRBG *)vdrbg;
     int ret = 0;
@@ -341,19 +343,19 @@ static int drbg_ctr_instantiate_wrapper(void *vdrbg, unsigned int strength,
         return 0;
 
     if (!ossl_prov_is_running()
-            || !drbg_ctr_set_ctx_params_locked(drbg, params))
+        || !drbg_ctr_set_ctx_params_locked(drbg, params))
         goto err;
     ret = ossl_prov_drbg_instantiate(drbg, strength, prediction_resistance,
-                                     pstr, pstr_len);
- err:
+        pstr, pstr_len);
+err:
     if (drbg->lock != NULL)
         CRYPTO_THREAD_unlock(drbg->lock);
     return ret;
 }
 
 static int drbg_ctr_reseed(PROV_DRBG *drbg,
-                           const unsigned char *entropy, size_t entropylen,
-                           const unsigned char *adin, size_t adinlen)
+    const unsigned char *entropy, size_t entropylen,
+    const unsigned char *adin, size_t adinlen)
 {
     PROV_DRBG_CTR *ctr = (PROV_DRBG_CTR *)drbg->data;
 
@@ -367,13 +369,13 @@ static int drbg_ctr_reseed(PROV_DRBG *drbg,
 }
 
 static int drbg_ctr_reseed_wrapper(void *vdrbg, int prediction_resistance,
-                                   const unsigned char *ent, size_t ent_len,
-                                   const unsigned char *adin, size_t adin_len)
+    const unsigned char *ent, size_t ent_len,
+    const unsigned char *adin, size_t adin_len)
 {
     PROV_DRBG *drbg = (PROV_DRBG *)vdrbg;
 
     return ossl_prov_drbg_reseed(drbg, prediction_resistance, ent, ent_len,
-                                 adin, adin_len);
+        adin, adin_len);
 }
 
 static void ctr96_inc(unsigned char *counter)
@@ -389,8 +391,8 @@ static void ctr96_inc(unsigned char *counter)
 }
 
 static int drbg_ctr_generate(PROV_DRBG *drbg,
-                             unsigned char *out, size_t outlen,
-                             const unsigned char *adin, size_t adinlen)
+    unsigned char *out, size_t outlen,
+    const unsigned char *adin, size_t adinlen)
 {
     PROV_DRBG_CTR *ctr = (PROV_DRBG_CTR *)drbg->data;
     unsigned int ctr32, blocks;
@@ -424,7 +426,7 @@ static int drbg_ctr_generate(PROV_DRBG *drbg,
 
     do {
         if (!EVP_CipherInit_ex(ctr->ctx_ctr,
-                               NULL, NULL, NULL, ctr->V, -1))
+                NULL, NULL, NULL, ctr->V, -1))
             return 0;
 
         /*-
@@ -462,15 +464,14 @@ static int drbg_ctr_generate(PROV_DRBG *drbg,
     return 1;
 }
 
-static int drbg_ctr_generate_wrapper
-    (void *vdrbg, unsigned char *out, size_t outlen,
-     unsigned int strength, int prediction_resistance,
-     const unsigned char *adin, size_t adin_len)
+static int drbg_ctr_generate_wrapper(void *vdrbg, unsigned char *out, size_t outlen,
+    unsigned int strength, int prediction_resistance,
+    const unsigned char *adin, size_t adin_len)
 {
     PROV_DRBG *drbg = (PROV_DRBG *)vdrbg;
 
     return ossl_prov_drbg_generate(drbg, out, outlen, strength,
-                                   prediction_resistance, adin, adin_len);
+        prediction_resistance, adin, adin_len);
 }
 
 static int drbg_ctr_uninstantiate(PROV_DRBG *drbg)
@@ -518,7 +519,7 @@ static int drbg_ctr_verify_zeroization(void *vdrbg)
         goto err;
 
     ret = 1;
- err:
+err:
     if (drbg->lock != NULL)
         CRYPTO_THREAD_unlock(drbg->lock);
     return ret;
@@ -577,9 +578,9 @@ static int drbg_ctr_init(PROV_DRBG *drbg)
     }
 
     if (!EVP_CipherInit_ex(ctr->ctx_ecb,
-                           ctr->cipher_ecb, NULL, NULL, NULL, 1)
+            ctr->cipher_ecb, NULL, NULL, NULL, 1)
         || !EVP_CipherInit_ex(ctr->ctx_ctr,
-                              ctr->cipher_ctr, NULL, NULL, NULL, 1)) {
+            ctr->cipher_ctr, NULL, NULL, NULL, 1)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_UNABLE_TO_INITIALISE_CIPHERS);
         goto err;
     }
@@ -604,7 +605,7 @@ static int drbg_ctr_init(PROV_DRBG *drbg)
         }
         /* Set key schedule for df_key */
         if (!EVP_CipherInit_ex(ctr->ctx_df,
-                               ctr->cipher_ecb, NULL, df_key, NULL, 1)) {
+                ctr->cipher_ecb, NULL, df_key, NULL, 1)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_DERIVATION_FUNCTION_INIT_FAILED);
             goto err;
         }
@@ -633,12 +634,12 @@ static int drbg_ctr_new(PROV_DRBG *drbg)
 }
 
 static void *drbg_ctr_new_wrapper(void *provctx, void *parent,
-                                   const OSSL_DISPATCH *parent_dispatch)
+    const OSSL_DISPATCH *parent_dispatch)
 {
     return ossl_rand_drbg_new(provctx, parent, parent_dispatch,
-                              &drbg_ctr_new, &drbg_ctr_free,
-                              &drbg_ctr_instantiate, &drbg_ctr_uninstantiate,
-                              &drbg_ctr_reseed, &drbg_ctr_generate);
+        &drbg_ctr_new, &drbg_ctr_free,
+        &drbg_ctr_instantiate, &drbg_ctr_uninstantiate,
+        &drbg_ctr_reseed, &drbg_ctr_generate);
 }
 
 static void drbg_ctr_free(void *vdrbg)
@@ -682,12 +683,12 @@ static int drbg_ctr_get_ctx_params(void *vdrbg, OSSL_PARAM params[])
     if (p != NULL) {
         if (ctr->cipher_ctr == NULL
             || !OSSL_PARAM_set_utf8_string(p,
-                                           EVP_CIPHER_get0_name(ctr->cipher_ctr)))
+                EVP_CIPHER_get0_name(ctr->cipher_ctr)))
             goto err;
     }
 
     ret = ossl_drbg_get_ctx_params(drbg, params);
- err:
+err:
     if (drbg->lock != NULL)
         CRYPTO_THREAD_unlock(drbg->lock);
 
@@ -695,14 +696,14 @@ static int drbg_ctr_get_ctx_params(void *vdrbg, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *drbg_ctr_gettable_ctx_params(ossl_unused void *vctx,
-                                                      ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_CIPHER, NULL, 0),
         OSSL_PARAM_int(OSSL_DRBG_PARAM_USE_DF, NULL),
         OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON,
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
@@ -719,25 +720,28 @@ static int drbg_ctr_set_ctx_params_locked(void *vctx, const OSSL_PARAM params[])
     int i, cipher_init = 0;
 
     if ((p = OSSL_PARAM_locate_const(params, OSSL_DRBG_PARAM_USE_DF)) != NULL
-            && OSSL_PARAM_get_int(p, &i)) {
+        && OSSL_PARAM_get_int(p, &i)) {
         /* FIPS errors out in the drbg_ctr_init() call later */
         ctr->use_df = i != 0;
         cipher_init = 1;
     }
 
     if ((p = OSSL_PARAM_locate_const(params,
-                                     OSSL_DRBG_PARAM_PROPERTIES)) != NULL) {
+             OSSL_DRBG_PARAM_PROPERTIES))
+        != NULL) {
         if (p->data_type != OSSL_PARAM_UTF8_STRING)
             return 0;
         propquery = (const char *)p->data;
     }
 
     if ((p = OSSL_PARAM_locate_const(params,
-                                     OSSL_PROV_PARAM_CORE_PROV_NAME)) != NULL) {
+             OSSL_PROV_PARAM_CORE_PROV_NAME))
+        != NULL) {
         if (p->data_type != OSSL_PARAM_UTF8_STRING)
             return 0;
         if ((prov = ossl_provider_find(libctx,
-                                       (const char *)p->data, 1)) == NULL)
+                 (const char *)p->data, 1))
+            == NULL)
             return 0;
     }
 
@@ -747,7 +751,7 @@ static int drbg_ctr_set_ctx_params_locked(void *vctx, const OSSL_PARAM params[])
         size_t ecb_str_len = sizeof("ECB") - 1;
 
         if (p->data_type != OSSL_PARAM_UTF8_STRING
-                || p->data_size < ctr_str_len) {
+            || p->data_size < ctr_str_len) {
             ossl_provider_free(prov);
             return 0;
         }
@@ -816,7 +820,7 @@ static int drbg_ctr_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *drbg_ctr_settable_ctx_params(ossl_unused void *vctx,
-                                                      ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_PROPERTIES, NULL, 0),
@@ -829,26 +833,26 @@ static const OSSL_PARAM *drbg_ctr_settable_ctx_params(ossl_unused void *vctx,
 }
 
 const OSSL_DISPATCH ossl_drbg_ctr_functions[] = {
-    { OSSL_FUNC_RAND_NEWCTX, (void(*)(void))drbg_ctr_new_wrapper },
-    { OSSL_FUNC_RAND_FREECTX, (void(*)(void))drbg_ctr_free },
+    { OSSL_FUNC_RAND_NEWCTX, (void (*)(void))drbg_ctr_new_wrapper },
+    { OSSL_FUNC_RAND_FREECTX, (void (*)(void))drbg_ctr_free },
     { OSSL_FUNC_RAND_INSTANTIATE,
-      (void(*)(void))drbg_ctr_instantiate_wrapper },
+        (void (*)(void))drbg_ctr_instantiate_wrapper },
     { OSSL_FUNC_RAND_UNINSTANTIATE,
-      (void(*)(void))drbg_ctr_uninstantiate_wrapper },
-    { OSSL_FUNC_RAND_GENERATE, (void(*)(void))drbg_ctr_generate_wrapper },
-    { OSSL_FUNC_RAND_RESEED, (void(*)(void))drbg_ctr_reseed_wrapper },
-    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void(*)(void))ossl_drbg_enable_locking },
-    { OSSL_FUNC_RAND_LOCK, (void(*)(void))ossl_drbg_lock },
-    { OSSL_FUNC_RAND_UNLOCK, (void(*)(void))ossl_drbg_unlock },
+        (void (*)(void))drbg_ctr_uninstantiate_wrapper },
+    { OSSL_FUNC_RAND_GENERATE, (void (*)(void))drbg_ctr_generate_wrapper },
+    { OSSL_FUNC_RAND_RESEED, (void (*)(void))drbg_ctr_reseed_wrapper },
+    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void (*)(void))ossl_drbg_enable_locking },
+    { OSSL_FUNC_RAND_LOCK, (void (*)(void))ossl_drbg_lock },
+    { OSSL_FUNC_RAND_UNLOCK, (void (*)(void))ossl_drbg_unlock },
     { OSSL_FUNC_RAND_SETTABLE_CTX_PARAMS,
-      (void(*)(void))drbg_ctr_settable_ctx_params },
-    { OSSL_FUNC_RAND_SET_CTX_PARAMS, (void(*)(void))drbg_ctr_set_ctx_params },
+        (void (*)(void))drbg_ctr_settable_ctx_params },
+    { OSSL_FUNC_RAND_SET_CTX_PARAMS, (void (*)(void))drbg_ctr_set_ctx_params },
     { OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS,
-      (void(*)(void))drbg_ctr_gettable_ctx_params },
-    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void(*)(void))drbg_ctr_get_ctx_params },
+        (void (*)(void))drbg_ctr_gettable_ctx_params },
+    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void (*)(void))drbg_ctr_get_ctx_params },
     { OSSL_FUNC_RAND_VERIFY_ZEROIZATION,
-      (void(*)(void))drbg_ctr_verify_zeroization },
-    { OSSL_FUNC_RAND_GET_SEED, (void(*)(void))ossl_drbg_get_seed },
-    { OSSL_FUNC_RAND_CLEAR_SEED, (void(*)(void))ossl_drbg_clear_seed },
+        (void (*)(void))drbg_ctr_verify_zeroization },
+    { OSSL_FUNC_RAND_GET_SEED, (void (*)(void))ossl_drbg_get_seed },
+    { OSSL_FUNC_RAND_CLEAR_SEED, (void (*)(void))ossl_drbg_clear_seed },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/rands/drbg_hash.c b/providers/implementations/rands/drbg_hash.c
index 8bb831ae35721..92eb443c6e829 100644
--- a/providers/implementations/rands/drbg_hash.c
+++ b/providers/implementations/rands/drbg_hash.c
@@ -41,13 +41,13 @@ static OSSL_FUNC_rand_verify_zeroization_fn drbg_hash_verify_zeroization;
 static int drbg_hash_set_ctx_params_locked(void *vctx, const OSSL_PARAM params[]);
 
 /* 888 bits from SP800-90Ar1 10.1 table 2 */
-#define HASH_PRNG_MAX_SEEDLEN    (888/8)
+#define HASH_PRNG_MAX_SEEDLEN (888 / 8)
 
 /* 440 bits from SP800-90Ar1 10.1 table 2 */
-#define HASH_PRNG_SMALL_SEEDLEN   (440/8)
+#define HASH_PRNG_SMALL_SEEDLEN (440 / 8)
 
 /* Determine what seedlen to use based on the block length */
-#define MAX_BLOCKLEN_USING_SMALL_SEEDLEN (256/8)
+#define MAX_BLOCKLEN_USING_SMALL_SEEDLEN (256 / 8)
 #define INBYTE_IGNORE ((unsigned char)0xFF)
 
 typedef struct rand_drbg_hash_st {
@@ -70,10 +70,10 @@ typedef struct rand_drbg_hash_st {
  *    These are concatenated as part of the DigestUpdate process.
  */
 static int hash_df(PROV_DRBG *drbg, unsigned char *out,
-                   const unsigned char inbyte,
-                   const unsigned char *in, size_t inlen,
-                   const unsigned char *in2, size_t in2len,
-                   const unsigned char *in3, size_t in3len)
+    const unsigned char inbyte,
+    const unsigned char *in, size_t inlen,
+    const unsigned char *in2, size_t in2len,
+    const unsigned char *in3, size_t in3len)
 {
     PROV_DRBG_HASH *hash = (PROV_DRBG_HASH *)drbg->data;
     EVP_MD_CTX *ctx = hash->ctx;
@@ -134,8 +134,8 @@ static int hash_df(PROV_DRBG *drbg, unsigned char *out,
 
 /* Helper function that just passes 2 input parameters to hash_df() */
 static int hash_df1(PROV_DRBG *drbg, unsigned char *out,
-                    const unsigned char in_byte,
-                    const unsigned char *in1, size_t in1len)
+    const unsigned char in_byte,
+    const unsigned char *in1, size_t in1len)
 {
     return hash_df(drbg, out, in_byte, in1, in1len, NULL, 0, NULL, 0);
 }
@@ -147,7 +147,7 @@ static int hash_df1(PROV_DRBG *drbg, unsigned char *out,
  * where dst size is drbg->seedlen, and inlen <= drbg->seedlen.
  */
 static int add_bytes(PROV_DRBG *drbg, unsigned char *dst,
-                     unsigned char *in, size_t inlen)
+    unsigned char *in, size_t inlen)
 {
     size_t i;
     int result;
@@ -168,7 +168,7 @@ static int add_bytes(PROV_DRBG *drbg, unsigned char *dst,
     if (carry != 0) {
         /* Add the carry to the top of the dst if inlen is not the same size */
         for (i = drbg->seedlen - inlen; i > 0; --i, d--) {
-            *d += 1;     /* Carry can only be 1 */
+            *d += 1; /* Carry can only be 1 */
             if (*d != 0) /* exit if carry doesn't propagate to the next byte */
                 break;
         }
@@ -178,17 +178,17 @@ static int add_bytes(PROV_DRBG *drbg, unsigned char *dst,
 
 /* V = (V + Hash(inbyte || V  || [additional_input]) mod (2^seedlen) */
 static int add_hash_to_v(PROV_DRBG *drbg, unsigned char inbyte,
-                         const unsigned char *adin, size_t adinlen)
+    const unsigned char *adin, size_t adinlen)
 {
     PROV_DRBG_HASH *hash = (PROV_DRBG_HASH *)drbg->data;
     EVP_MD_CTX *ctx = hash->ctx;
 
     return EVP_DigestInit_ex(ctx, ossl_prov_digest_md(&hash->digest), NULL)
-           && EVP_DigestUpdate(ctx, &inbyte, 1)
-           && EVP_DigestUpdate(ctx, hash->V, drbg->seedlen)
-           && (adin == NULL || EVP_DigestUpdate(ctx, adin, adinlen))
-           && EVP_DigestFinal(ctx, hash->vtmp, NULL)
-           && add_bytes(drbg, hash->V, hash->vtmp, hash->blocklen);
+        && EVP_DigestUpdate(ctx, &inbyte, 1)
+        && EVP_DigestUpdate(ctx, hash->V, drbg->seedlen)
+        && (adin == NULL || EVP_DigestUpdate(ctx, adin, adinlen))
+        && EVP_DigestFinal(ctx, hash->vtmp, NULL)
+        && add_bytes(drbg, hash->V, hash->vtmp, hash->blocklen);
 }
 
 /*
@@ -219,8 +219,8 @@ static int hash_gen(PROV_DRBG *drbg, unsigned char *out, size_t outlen)
     memcpy(hash->vtmp, hash->V, drbg->seedlen);
     for (;;) {
         if (!EVP_DigestInit_ex(hash->ctx, ossl_prov_digest_md(&hash->digest),
-                               NULL)
-                || !EVP_DigestUpdate(hash->ctx, hash->vtmp, drbg->seedlen))
+                NULL)
+            || !EVP_DigestUpdate(hash->ctx, hash->vtmp, drbg->seedlen))
             return 0;
 
         if (outlen < hash->blocklen) {
@@ -251,9 +251,9 @@ static int hash_gen(PROV_DRBG *drbg, unsigned char *out, size_t outlen)
  * Returns zero if an error occurs otherwise it returns 1.
  */
 static int drbg_hash_instantiate(PROV_DRBG *drbg,
-                                 const unsigned char *ent, size_t ent_len,
-                                 const unsigned char *nonce, size_t nonce_len,
-                                 const unsigned char *pstr, size_t pstr_len)
+    const unsigned char *ent, size_t ent_len,
+    const unsigned char *nonce, size_t nonce_len,
+    const unsigned char *pstr, size_t pstr_len)
 {
     PROV_DRBG_HASH *hash = (PROV_DRBG_HASH *)drbg->data;
 
@@ -262,17 +262,17 @@ static int drbg_hash_instantiate(PROV_DRBG *drbg,
 
     /* (Step 1-3) V = Hash_df(entropy||nonce||pers, seedlen) */
     return hash->ctx != NULL
-           && hash_df(drbg, hash->V, INBYTE_IGNORE,
-                      ent, ent_len, nonce, nonce_len, pstr, pstr_len)
-           /* (Step 4) C = Hash_df(0x00||V, seedlen) */
-           && hash_df1(drbg, hash->C, 0x00, hash->V, drbg->seedlen);
+        && hash_df(drbg, hash->V, INBYTE_IGNORE,
+            ent, ent_len, nonce, nonce_len, pstr, pstr_len)
+        /* (Step 4) C = Hash_df(0x00||V, seedlen) */
+        && hash_df1(drbg, hash->C, 0x00, hash->V, drbg->seedlen);
 }
 
 static int drbg_hash_instantiate_wrapper(void *vdrbg, 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[])
 {
     PROV_DRBG *drbg = (PROV_DRBG *)vdrbg;
     int ret = 0;
@@ -281,11 +281,11 @@ static int drbg_hash_instantiate_wrapper(void *vdrbg, unsigned int strength,
         return 0;
 
     if (!ossl_prov_is_running()
-            || !drbg_hash_set_ctx_params_locked(drbg, params))
+        || !drbg_hash_set_ctx_params_locked(drbg, params))
         goto err;
     ret = ossl_prov_drbg_instantiate(drbg, strength, prediction_resistance,
-                                     pstr, pstr_len);
- err:
+        pstr, pstr_len);
+err:
     if (drbg->lock != NULL)
         CRYPTO_THREAD_unlock(drbg->lock);
     return ret;
@@ -300,15 +300,15 @@ static int drbg_hash_instantiate_wrapper(void *vdrbg, unsigned int strength,
  * Returns zero if an error occurs otherwise it returns 1.
  */
 static int drbg_hash_reseed(PROV_DRBG *drbg,
-                            const unsigned char *ent, size_t ent_len,
-                            const unsigned char *adin, size_t adin_len)
+    const unsigned char *ent, size_t ent_len,
+    const unsigned char *adin, size_t adin_len)
 {
     PROV_DRBG_HASH *hash = (PROV_DRBG_HASH *)drbg->data;
 
     /* (Step 1-2) V = Hash_df(0x01 || V || entropy_input || additional_input) */
     /* V about to be updated so use C as output instead */
     if (!hash_df(drbg, hash->C, 0x01, hash->V, drbg->seedlen, ent, ent_len,
-                 adin, adin_len))
+            adin, adin_len))
         return 0;
     memcpy(hash->V, hash->C, drbg->seedlen);
     /* (Step 4) C = Hash_df(0x00||V, seedlen) */
@@ -316,13 +316,13 @@ static int drbg_hash_reseed(PROV_DRBG *drbg,
 }
 
 static int drbg_hash_reseed_wrapper(void *vdrbg, int prediction_resistance,
-                                    const unsigned char *ent, size_t ent_len,
-                                    const unsigned char *adin, size_t adin_len)
+    const unsigned char *ent, size_t ent_len,
+    const unsigned char *adin, size_t adin_len)
 {
     PROV_DRBG *drbg = (PROV_DRBG *)vdrbg;
 
     return ossl_prov_drbg_reseed(drbg, prediction_resistance, ent, ent_len,
-                                 adin, adin_len);
+        adin, adin_len);
 }
 
 /*
@@ -335,8 +335,8 @@ static int drbg_hash_reseed_wrapper(void *vdrbg, int prediction_resistance,
  * Returns zero if an error occurs otherwise it returns 1.
  */
 static int drbg_hash_generate(PROV_DRBG *drbg,
-                              unsigned char *out, size_t outlen,
-                              const unsigned char *adin, size_t adin_len)
+    unsigned char *out, size_t outlen,
+    const unsigned char *adin, size_t adin_len)
 {
     PROV_DRBG_HASH *hash = (PROV_DRBG_HASH *)drbg->data;
     unsigned char counter[4];
@@ -348,29 +348,28 @@ static int drbg_hash_generate(PROV_DRBG *drbg,
     counter[3] = (unsigned char)(reseed_counter & 0xff);
 
     return hash->ctx != NULL
-           && (adin == NULL
-           /* (Step 2) if adin != NULL then V = V + Hash(0x02||V||adin) */
-               || adin_len == 0
-               || add_hash_to_v(drbg, 0x02, adin, adin_len))
-           /* (Step 3) Hashgen(outlen, V) */
-           && hash_gen(drbg, out, outlen)
-           /* (Step 4/5) H = V = (V + Hash(0x03||V) mod (2^seedlen_bits) */
-           && add_hash_to_v(drbg, 0x03, NULL, 0)
-           /* (Step 5) V = (V + H + C + reseed_counter) mod (2^seedlen_bits) */
-           /* V = (V + C) mod (2^seedlen_bits) */
-           && add_bytes(drbg, hash->V, hash->C, drbg->seedlen)
-           /* V = (V + reseed_counter) mod (2^seedlen_bits) */
-           && add_bytes(drbg, hash->V, counter, 4);
+        && (adin == NULL
+            /* (Step 2) if adin != NULL then V = V + Hash(0x02||V||adin) */
+            || adin_len == 0
+            || add_hash_to_v(drbg, 0x02, adin, adin_len))
+        /* (Step 3) Hashgen(outlen, V) */
+        && hash_gen(drbg, out, outlen)
+        /* (Step 4/5) H = V = (V + Hash(0x03||V) mod (2^seedlen_bits) */
+        && add_hash_to_v(drbg, 0x03, NULL, 0)
+        /* (Step 5) V = (V + H + C + reseed_counter) mod (2^seedlen_bits) */
+        /* V = (V + C) mod (2^seedlen_bits) */
+        && add_bytes(drbg, hash->V, hash->C, drbg->seedlen)
+        /* V = (V + reseed_counter) mod (2^seedlen_bits) */
+        && add_bytes(drbg, hash->V, counter, 4);
 }
 
-static int drbg_hash_generate_wrapper
-    (void *vdrbg, unsigned char *out, size_t outlen, unsigned int strength,
-     int prediction_resistance, const unsigned char *adin, size_t adin_len)
+static int drbg_hash_generate_wrapper(void *vdrbg, unsigned char *out, size_t outlen, unsigned int strength,
+    int prediction_resistance, const unsigned char *adin, size_t adin_len)
 {
     PROV_DRBG *drbg = (PROV_DRBG *)vdrbg;
 
     return ossl_prov_drbg_generate(drbg, out, outlen, strength,
-                                   prediction_resistance, adin, adin_len);
+        prediction_resistance, adin, adin_len);
 }
 
 static int drbg_hash_uninstantiate(PROV_DRBG *drbg)
@@ -413,7 +412,7 @@ static int drbg_hash_verify_zeroization(void *vdrbg)
     PROV_DRBG_VERIFY_ZEROIZATION(hash->vtmp);
 
     ret = 1;
- err:
+err:
     if (drbg->lock != NULL)
         CRYPTO_THREAD_unlock(drbg->lock);
     return ret;
@@ -442,12 +441,12 @@ static int drbg_hash_new(PROV_DRBG *ctx)
 }
 
 static void *drbg_hash_new_wrapper(void *provctx, void *parent,
-                                   const OSSL_DISPATCH *parent_dispatch)
+    const OSSL_DISPATCH *parent_dispatch)
 {
     return ossl_rand_drbg_new(provctx, parent, parent_dispatch,
-                              &drbg_hash_new, &drbg_hash_free,
-                              &drbg_hash_instantiate, &drbg_hash_uninstantiate,
-                              &drbg_hash_reseed, &drbg_hash_generate);
+        &drbg_hash_new, &drbg_hash_free,
+        &drbg_hash_instantiate, &drbg_hash_uninstantiate,
+        &drbg_hash_reseed, &drbg_hash_generate);
 }
 
 static void drbg_hash_free(void *vdrbg)
@@ -488,7 +487,7 @@ static int drbg_hash_get_ctx_params(void *vdrbg, OSSL_PARAM params[])
     }
 
     ret = ossl_drbg_get_ctx_params(drbg, params);
- err:
+err:
     if (drbg->lock != NULL)
         CRYPTO_THREAD_unlock(drbg->lock);
 
@@ -496,20 +495,20 @@ static int drbg_hash_get_ctx_params(void *vdrbg, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *drbg_hash_gettable_ctx_params(ossl_unused void *vctx,
-                                                       ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_DIGEST, NULL, 0),
         OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON,
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
 
 static int drbg_fetch_digest_from_prov(const OSSL_PARAM params[],
-                                       OSSL_LIB_CTX *libctx,
-                                       EVP_MD **digest)
+    OSSL_LIB_CTX *libctx,
+    EVP_MD **digest)
 {
     OSSL_PROVIDER *prov = NULL;
     const OSSL_PARAM *p;
@@ -520,7 +519,8 @@ static int drbg_fetch_digest_from_prov(const OSSL_PARAM params[],
         return 0;
 
     if ((p = OSSL_PARAM_locate_const(params,
-                                     OSSL_PROV_PARAM_CORE_PROV_NAME)) == NULL)
+             OSSL_PROV_PARAM_CORE_PROV_NAME))
+        == NULL)
         return 0;
     if (p->data_type != OSSL_PARAM_UTF8_STRING)
         return 0;
@@ -558,7 +558,7 @@ static int drbg_hash_set_ctx_params_locked(void *vctx, const OSSL_PARAM params[]
     int md_size;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_DRBG_PARAM_FIPS_DIGEST_CHECK))
+            OSSL_DRBG_PARAM_FIPS_DIGEST_CHECK))
         return 0;
 
     /* try to fetch digest from provider */
@@ -577,7 +577,7 @@ static int drbg_hash_set_ctx_params_locked(void *vctx, const OSSL_PARAM params[]
     md = ossl_prov_digest_md(&hash->digest);
     if (md != NULL) {
         if (!ossl_drbg_verify_digest(ctx, libctx, md))
-            return 0;   /* Error already raised for us */
+            return 0; /* Error already raised for us */
 
         /* These are taken from SP 800-90 10.1 Table 2 */
         md_size = EVP_MD_get_size(md);
@@ -617,39 +617,39 @@ static int drbg_hash_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *drbg_hash_settable_ctx_params(ossl_unused void *vctx,
-                                                       ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_PROPERTIES, NULL, 0),
         OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_DIGEST, NULL, 0),
         OSSL_PARAM_DRBG_SETTABLE_CTX_COMMON,
         OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_DRBG_PARAM_FIPS_DIGEST_CHECK)
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_settable_ctx_params;
 }
 
 const OSSL_DISPATCH ossl_drbg_hash_functions[] = {
-    { OSSL_FUNC_RAND_NEWCTX, (void(*)(void))drbg_hash_new_wrapper },
-    { OSSL_FUNC_RAND_FREECTX, (void(*)(void))drbg_hash_free },
+    { OSSL_FUNC_RAND_NEWCTX, (void (*)(void))drbg_hash_new_wrapper },
+    { OSSL_FUNC_RAND_FREECTX, (void (*)(void))drbg_hash_free },
     { OSSL_FUNC_RAND_INSTANTIATE,
-      (void(*)(void))drbg_hash_instantiate_wrapper },
+        (void (*)(void))drbg_hash_instantiate_wrapper },
     { OSSL_FUNC_RAND_UNINSTANTIATE,
-      (void(*)(void))drbg_hash_uninstantiate_wrapper },
-    { OSSL_FUNC_RAND_GENERATE, (void(*)(void))drbg_hash_generate_wrapper },
-    { OSSL_FUNC_RAND_RESEED, (void(*)(void))drbg_hash_reseed_wrapper },
-    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void(*)(void))ossl_drbg_enable_locking },
-    { OSSL_FUNC_RAND_LOCK, (void(*)(void))ossl_drbg_lock },
-    { OSSL_FUNC_RAND_UNLOCK, (void(*)(void))ossl_drbg_unlock },
+        (void (*)(void))drbg_hash_uninstantiate_wrapper },
+    { OSSL_FUNC_RAND_GENERATE, (void (*)(void))drbg_hash_generate_wrapper },
+    { OSSL_FUNC_RAND_RESEED, (void (*)(void))drbg_hash_reseed_wrapper },
+    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void (*)(void))ossl_drbg_enable_locking },
+    { OSSL_FUNC_RAND_LOCK, (void (*)(void))ossl_drbg_lock },
+    { OSSL_FUNC_RAND_UNLOCK, (void (*)(void))ossl_drbg_unlock },
     { OSSL_FUNC_RAND_SETTABLE_CTX_PARAMS,
-      (void(*)(void))drbg_hash_settable_ctx_params },
-    { OSSL_FUNC_RAND_SET_CTX_PARAMS, (void(*)(void))drbg_hash_set_ctx_params },
+        (void (*)(void))drbg_hash_settable_ctx_params },
+    { OSSL_FUNC_RAND_SET_CTX_PARAMS, (void (*)(void))drbg_hash_set_ctx_params },
     { OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS,
-      (void(*)(void))drbg_hash_gettable_ctx_params },
-    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void(*)(void))drbg_hash_get_ctx_params },
+        (void (*)(void))drbg_hash_gettable_ctx_params },
+    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void (*)(void))drbg_hash_get_ctx_params },
     { OSSL_FUNC_RAND_VERIFY_ZEROIZATION,
-      (void(*)(void))drbg_hash_verify_zeroization },
-    { OSSL_FUNC_RAND_GET_SEED, (void(*)(void))ossl_drbg_get_seed },
-    { OSSL_FUNC_RAND_CLEAR_SEED, (void(*)(void))ossl_drbg_clear_seed },
+        (void (*)(void))drbg_hash_verify_zeroization },
+    { OSSL_FUNC_RAND_GET_SEED, (void (*)(void))ossl_drbg_get_seed },
+    { OSSL_FUNC_RAND_CLEAR_SEED, (void (*)(void))ossl_drbg_clear_seed },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/rands/drbg_hmac.c b/providers/implementations/rands/drbg_hmac.c
index 43b3f8766e3d8..ff8a6cd6f0a61 100644
--- a/providers/implementations/rands/drbg_hmac.c
+++ b/providers/implementations/rands/drbg_hmac.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2011-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -52,26 +52,26 @@ static int drbg_hmac_set_ctx_params_locked(void *vctx, const OSSL_PARAM params[]
  * Returns zero if an error occurs otherwise it returns 1.
  */
 static int do_hmac(PROV_DRBG_HMAC *hmac, unsigned char inbyte,
-                   const unsigned char *in1, size_t in1len,
-                   const unsigned char *in2, size_t in2len,
-                   const unsigned char *in3, size_t in3len)
+    const unsigned char *in1, size_t in1len,
+    const unsigned char *in2, size_t in2len,
+    const unsigned char *in3, size_t in3len)
 {
     EVP_MAC_CTX *ctx = hmac->ctx;
 
     if (!EVP_MAC_init(ctx, hmac->K, hmac->blocklen, NULL)
-            /* K = HMAC(K, V || inbyte || [in1] || [in2] || [in3]) */
-            || !EVP_MAC_update(ctx, hmac->V, hmac->blocklen)
-            || !EVP_MAC_update(ctx, &inbyte, 1)
-            || !(in1 == NULL || in1len == 0 || EVP_MAC_update(ctx, in1, in1len))
-            || !(in2 == NULL || in2len == 0 || EVP_MAC_update(ctx, in2, in2len))
-            || !(in3 == NULL || in3len == 0 || EVP_MAC_update(ctx, in3, in3len))
-            || !EVP_MAC_final(ctx, hmac->K, NULL, sizeof(hmac->K)))
+        /* K = HMAC(K, V || inbyte || [in1] || [in2] || [in3]) */
+        || !EVP_MAC_update(ctx, hmac->V, hmac->blocklen)
+        || !EVP_MAC_update(ctx, &inbyte, 1)
+        || !(in1 == NULL || in1len == 0 || EVP_MAC_update(ctx, in1, in1len))
+        || !(in2 == NULL || in2len == 0 || EVP_MAC_update(ctx, in2, in2len))
+        || !(in3 == NULL || in3len == 0 || EVP_MAC_update(ctx, in3, in3len))
+        || !EVP_MAC_final(ctx, hmac->K, NULL, sizeof(hmac->K)))
         return 0;
 
-   /* V = HMAC(K, V) */
+    /* V = HMAC(K, V) */
     return EVP_MAC_init(ctx, hmac->K, hmac->blocklen, NULL)
-           && EVP_MAC_update(ctx, hmac->V, hmac->blocklen)
-           && EVP_MAC_final(ctx, hmac->V, NULL, sizeof(hmac->V));
+        && EVP_MAC_update(ctx, hmac->V, hmac->blocklen)
+        && EVP_MAC_final(ctx, hmac->V, NULL, sizeof(hmac->V));
 }
 
 /*
@@ -89,9 +89,9 @@ static int do_hmac(PROV_DRBG_HMAC *hmac, unsigned char inbyte,
  * Returns zero if an error occurs otherwise it returns 1.
  */
 static int drbg_hmac_update(PROV_DRBG_HMAC *hmac,
-                            const unsigned char *in1, size_t in1len,
-                            const unsigned char *in2, size_t in2len,
-                            const unsigned char *in3, size_t in3len)
+    const unsigned char *in1, size_t in1len,
+    const unsigned char *in2, size_t in2len,
+    const unsigned char *in3, size_t in3len)
 {
     /* (Steps 1-2) K = HMAC(K, V||0x00||provided_data). V = HMAC(K,V) */
     if (!do_hmac(hmac, 0x00, in1, in1len, in2, in2len, in3, in3len))
@@ -115,9 +115,9 @@ static int drbg_hmac_update(PROV_DRBG_HMAC *hmac,
  * Returns zero if an error occurs otherwise it returns 1.
  */
 int ossl_drbg_hmac_init(PROV_DRBG_HMAC *hmac,
-                        const unsigned char *ent, size_t ent_len,
-                        const unsigned char *nonce, size_t nonce_len,
-                        const unsigned char *pstr, size_t pstr_len)
+    const unsigned char *ent, size_t ent_len,
+    const unsigned char *nonce, size_t nonce_len,
+    const unsigned char *pstr, size_t pstr_len)
 {
     if (hmac->ctx == NULL) {
         ERR_raise(ERR_LIB_PROV, PROV_R_MISSING_MAC);
@@ -130,22 +130,22 @@ int ossl_drbg_hmac_init(PROV_DRBG_HMAC *hmac,
     memset(hmac->V, 0x01, hmac->blocklen);
     /* (Step 4) (K,V) = HMAC_DRBG_Update(entropy||nonce||pers string, K, V) */
     return drbg_hmac_update(hmac, ent, ent_len, nonce, nonce_len, pstr,
-                            pstr_len);
+        pstr_len);
 }
 static int drbg_hmac_instantiate(PROV_DRBG *drbg,
-                                 const unsigned char *ent, size_t ent_len,
-                                 const unsigned char *nonce, size_t nonce_len,
-                                 const unsigned char *pstr, size_t pstr_len)
+    const unsigned char *ent, size_t ent_len,
+    const unsigned char *nonce, size_t nonce_len,
+    const unsigned char *pstr, size_t pstr_len)
 {
     return ossl_drbg_hmac_init((PROV_DRBG_HMAC *)drbg->data, ent, ent_len,
-                               nonce, nonce_len, pstr, pstr_len);
+        nonce, nonce_len, pstr, pstr_len);
 }
 
 static int drbg_hmac_instantiate_wrapper(void *vdrbg, 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[])
 {
     PROV_DRBG *drbg = (PROV_DRBG *)vdrbg;
     int ret = 0;
@@ -154,17 +154,16 @@ static int drbg_hmac_instantiate_wrapper(void *vdrbg, unsigned int strength,
         return 0;
 
     if (!ossl_prov_is_running()
-            || !drbg_hmac_set_ctx_params_locked(drbg, params))
+        || !drbg_hmac_set_ctx_params_locked(drbg, params))
         goto err;
     ret = ossl_prov_drbg_instantiate(drbg, strength, prediction_resistance,
-                                     pstr, pstr_len);
- err:
+        pstr, pstr_len);
+err:
     if (drbg->lock != NULL)
         CRYPTO_THREAD_unlock(drbg->lock);
     return ret;
 }
 
-
 /*
  * SP800-90Ar1 10.1.2.4 HMAC_DRBG_Reseed_Process:
  *
@@ -176,8 +175,8 @@ static int drbg_hmac_instantiate_wrapper(void *vdrbg, unsigned int strength,
  * Returns zero if an error occurs otherwise it returns 1.
  */
 static int drbg_hmac_reseed(PROV_DRBG *drbg,
-                            const unsigned char *ent, size_t ent_len,
-                            const unsigned char *adin, size_t adin_len)
+    const unsigned char *ent, size_t ent_len,
+    const unsigned char *adin, size_t adin_len)
 {
     PROV_DRBG_HMAC *hmac = (PROV_DRBG_HMAC *)drbg->data;
 
@@ -186,13 +185,13 @@ static int drbg_hmac_reseed(PROV_DRBG *drbg,
 }
 
 static int drbg_hmac_reseed_wrapper(void *vdrbg, int prediction_resistance,
-                                    const unsigned char *ent, size_t ent_len,
-                                    const unsigned char *adin, size_t adin_len)
+    const unsigned char *ent, size_t ent_len,
+    const unsigned char *adin, size_t adin_len)
 {
     PROV_DRBG *drbg = (PROV_DRBG *)vdrbg;
 
     return ossl_prov_drbg_reseed(drbg, prediction_resistance, ent, ent_len,
-                                 adin, adin_len);
+        adin, adin_len);
 }
 
 /*
@@ -205,16 +204,16 @@ static int drbg_hmac_reseed_wrapper(void *vdrbg, int prediction_resistance,
  * Returns zero if an error occurs otherwise it returns 1.
  */
 int ossl_drbg_hmac_generate(PROV_DRBG_HMAC *hmac,
-                            unsigned char *out, size_t outlen,
-                            const unsigned char *adin, size_t adin_len)
+    unsigned char *out, size_t outlen,
+    const unsigned char *adin, size_t adin_len)
 {
     EVP_MAC_CTX *ctx = hmac->ctx;
     const unsigned char *temp = hmac->V;
 
     /* (Step 2) if adin != NULL then (K,V) = HMAC_DRBG_Update(adin, K, V) */
     if (adin != NULL
-            && adin_len > 0
-            && !drbg_hmac_update(hmac, adin, adin_len, NULL, 0, NULL, 0))
+        && adin_len > 0
+        && !drbg_hmac_update(hmac, adin, adin_len, NULL, 0, NULL, 0))
         return 0;
 
     /*
@@ -250,21 +249,21 @@ int ossl_drbg_hmac_generate(PROV_DRBG_HMAC *hmac,
 }
 
 static int drbg_hmac_generate(PROV_DRBG *drbg,
-                              unsigned char *out, size_t outlen,
-                              const unsigned char *adin, size_t adin_len)
+    unsigned char *out, size_t outlen,
+    const unsigned char *adin, size_t adin_len)
 {
     return ossl_drbg_hmac_generate((PROV_DRBG_HMAC *)drbg->data, out, outlen,
-                                    adin, adin_len);
+        adin, adin_len);
 }
 
 static int drbg_hmac_generate_wrapper(void *vdrbg,
-     unsigned char *out, size_t outlen, unsigned int strength,
-     int prediction_resistance, const unsigned char *adin, size_t adin_len)
+    unsigned char *out, size_t outlen, unsigned int strength,
+    int prediction_resistance, const unsigned char *adin, size_t adin_len)
 {
     PROV_DRBG *drbg = (PROV_DRBG *)vdrbg;
 
     return ossl_prov_drbg_generate(drbg, out, outlen, strength,
-                                   prediction_resistance, adin, adin_len);
+        prediction_resistance, adin, adin_len);
 }
 
 static int drbg_hmac_uninstantiate(PROV_DRBG *drbg)
@@ -305,7 +304,7 @@ static int drbg_hmac_verify_zeroization(void *vdrbg)
     PROV_DRBG_VERIFY_ZEROIZATION(hmac->V);
 
     ret = 1;
- err:
+err:
     if (drbg->lock != NULL)
         CRYPTO_THREAD_unlock(drbg->lock);
     return ret;
@@ -334,12 +333,12 @@ static int drbg_hmac_new(PROV_DRBG *drbg)
 }
 
 static void *drbg_hmac_new_wrapper(void *provctx, void *parent,
-                                   const OSSL_DISPATCH *parent_dispatch)
+    const OSSL_DISPATCH *parent_dispatch)
 {
     return ossl_rand_drbg_new(provctx, parent, parent_dispatch,
-                              &drbg_hmac_new, &drbg_hmac_free,
-                              &drbg_hmac_instantiate, &drbg_hmac_uninstantiate,
-                              &drbg_hmac_reseed, &drbg_hmac_generate);
+        &drbg_hmac_new, &drbg_hmac_free,
+        &drbg_hmac_instantiate, &drbg_hmac_uninstantiate,
+        &drbg_hmac_reseed, &drbg_hmac_generate);
 }
 
 static void drbg_hmac_free(void *vdrbg)
@@ -390,7 +389,7 @@ static int drbg_hmac_get_ctx_params(void *vdrbg, OSSL_PARAM params[])
     }
 
     ret = ossl_drbg_get_ctx_params(drbg, params);
- err:
+err:
     if (drbg->lock != NULL)
         CRYPTO_THREAD_unlock(drbg->lock);
 
@@ -398,34 +397,38 @@ static int drbg_hmac_get_ctx_params(void *vdrbg, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *drbg_hmac_gettable_ctx_params(ossl_unused void *vctx,
-                                                       ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_MAC, NULL, 0),
         OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_DIGEST, NULL, 0),
         OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON,
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
 
 static int drbg_fetch_algs_from_prov(const OSSL_PARAM params[],
-                                     OSSL_LIB_CTX *libctx,
-                                     EVP_MAC_CTX **macctx,
-                                     EVP_MD **digest)
+    OSSL_LIB_CTX *libctx,
+    EVP_MAC_CTX **macctx,
+    EVP_MD **digest)
 {
     OSSL_PROVIDER *prov = NULL;
     const OSSL_PARAM *p;
+    const char *digest_name = NULL;
+    const char *hmac_name = NULL;
     EVP_MD *md = NULL;
     EVP_MAC *mac = NULL;
+    OSSL_PARAM mac_params[2], *mp = mac_params;
     int ret = 0;
 
     if (macctx == NULL || digest == NULL)
         return 0;
 
     if ((p = OSSL_PARAM_locate_const(params,
-                                     OSSL_PROV_PARAM_CORE_PROV_NAME)) == NULL)
+             OSSL_PROV_PARAM_CORE_PROV_NAME))
+        == NULL)
         return 0;
     if (p->data_type != OSSL_PARAM_UTF8_STRING)
         return 0;
@@ -434,35 +437,49 @@ static int drbg_fetch_algs_from_prov(const OSSL_PARAM params[],
 
     p = OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_DIGEST);
     if (p) {
-        if (p->data_type != OSSL_PARAM_UTF8_STRING)
+        if (OSSL_PARAM_get_utf8_string_ptr(p, &digest_name)) {
+            ERR_raise(ERR_LIB_PROV, PROV_R_VALUE_ERROR);
             goto done;
-
-        md = evp_digest_fetch_from_prov(prov, (const char *)p->data, NULL);
+        }
+        md = evp_digest_fetch_from_prov(prov, digest_name, NULL);
         if (md) {
             EVP_MD_free(*digest);
             *digest = md;
         } else {
+            ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_DIGEST);
             goto done;
         }
+    } else {
+        /* we need a digest */
+        ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_DIGEST);
+        goto done;
     }
-
     p = OSSL_PARAM_locate_const(params, OSSL_ALG_PARAM_MAC);
     if (p == NULL) {
-        ret = 1;
-        goto done;
+        hmac_name = "HMAC";
+    } else {
+        if (OSSL_PARAM_get_utf8_string_ptr(p, &hmac_name)) {
+            ERR_raise(ERR_LIB_PROV, PROV_R_VALUE_ERROR);
+            goto done;
+        }
     }
 
-    if (p->data_type != OSSL_PARAM_UTF8_STRING)
-        goto done;
-
     EVP_MAC_CTX_free(*macctx);
     *macctx = NULL;
 
-    mac = evp_mac_fetch_from_prov(prov, (const char *)p->data, NULL);
+    mac = evp_mac_fetch_from_prov(prov, hmac_name, NULL);
     if (mac) {
         *macctx = EVP_MAC_CTX_new(mac);
         /* The context holds on to the MAC */
         EVP_MAC_free(mac);
+        *mp++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, (char *)digest_name, 0);
+        *mp = OSSL_PARAM_construct_end();
+        if (!EVP_MAC_CTX_set_params(*macctx, mac_params)) {
+            ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MAC);
+            EVP_MAC_CTX_free(*macctx);
+            *macctx = NULL;
+            goto done;
+        }
         ret = 1;
     }
 
@@ -481,7 +498,7 @@ static int drbg_hmac_set_ctx_params_locked(void *vctx, const OSSL_PARAM params[]
     int md_size;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_DRBG_PARAM_FIPS_DIGEST_CHECK))
+            OSSL_DRBG_PARAM_FIPS_DIGEST_CHECK))
         return 0;
 
     /* try to fetch mac and digest from provider */
@@ -493,7 +510,7 @@ static int drbg_hmac_set_ctx_params_locked(void *vctx, const OSSL_PARAM params[]
             return 0;
 
         if (!ossl_prov_macctx_load_from_params(&hmac->ctx, params,
-                                               NULL, NULL, NULL, libctx))
+                NULL, NULL, NULL, libctx))
             return 0;
     } else {
         (void)ERR_clear_last_mark();
@@ -503,7 +520,7 @@ static int drbg_hmac_set_ctx_params_locked(void *vctx, const OSSL_PARAM params[]
 
     md = ossl_prov_digest_md(&hmac->digest);
     if (md != NULL && !ossl_drbg_verify_digest(ctx, libctx, md))
-        return 0;   /* Error already raised for us */
+        return 0; /* Error already raised for us */
 
     if (md != NULL && hmac->ctx != NULL) {
         /* These are taken from SP 800-90 10.1 Table 2 */
@@ -540,7 +557,7 @@ static int drbg_hmac_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *drbg_hmac_settable_ctx_params(ossl_unused void *vctx,
-                                                       ossl_unused void *p_ctx)
+    ossl_unused void *p_ctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_PROPERTIES, NULL, 0),
@@ -548,32 +565,32 @@ static const OSSL_PARAM *drbg_hmac_settable_ctx_params(ossl_unused void *vctx,
         OSSL_PARAM_utf8_string(OSSL_DRBG_PARAM_MAC, NULL, 0),
         OSSL_PARAM_DRBG_SETTABLE_CTX_COMMON,
         OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_DRBG_PARAM_FIPS_DIGEST_CHECK)
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_settable_ctx_params;
 }
 
 const OSSL_DISPATCH ossl_drbg_ossl_hmac_functions[] = {
-    { OSSL_FUNC_RAND_NEWCTX, (void(*)(void))drbg_hmac_new_wrapper },
-    { OSSL_FUNC_RAND_FREECTX, (void(*)(void))drbg_hmac_free },
+    { OSSL_FUNC_RAND_NEWCTX, (void (*)(void))drbg_hmac_new_wrapper },
+    { OSSL_FUNC_RAND_FREECTX, (void (*)(void))drbg_hmac_free },
     { OSSL_FUNC_RAND_INSTANTIATE,
-      (void(*)(void))drbg_hmac_instantiate_wrapper },
+        (void (*)(void))drbg_hmac_instantiate_wrapper },
     { OSSL_FUNC_RAND_UNINSTANTIATE,
-      (void(*)(void))drbg_hmac_uninstantiate_wrapper },
-    { OSSL_FUNC_RAND_GENERATE, (void(*)(void))drbg_hmac_generate_wrapper },
-    { OSSL_FUNC_RAND_RESEED, (void(*)(void))drbg_hmac_reseed_wrapper },
-    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void(*)(void))ossl_drbg_enable_locking },
-    { OSSL_FUNC_RAND_LOCK, (void(*)(void))ossl_drbg_lock },
-    { OSSL_FUNC_RAND_UNLOCK, (void(*)(void))ossl_drbg_unlock },
+        (void (*)(void))drbg_hmac_uninstantiate_wrapper },
+    { OSSL_FUNC_RAND_GENERATE, (void (*)(void))drbg_hmac_generate_wrapper },
+    { OSSL_FUNC_RAND_RESEED, (void (*)(void))drbg_hmac_reseed_wrapper },
+    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void (*)(void))ossl_drbg_enable_locking },
+    { OSSL_FUNC_RAND_LOCK, (void (*)(void))ossl_drbg_lock },
+    { OSSL_FUNC_RAND_UNLOCK, (void (*)(void))ossl_drbg_unlock },
     { OSSL_FUNC_RAND_SETTABLE_CTX_PARAMS,
-      (void(*)(void))drbg_hmac_settable_ctx_params },
-    { OSSL_FUNC_RAND_SET_CTX_PARAMS, (void(*)(void))drbg_hmac_set_ctx_params },
+        (void (*)(void))drbg_hmac_settable_ctx_params },
+    { OSSL_FUNC_RAND_SET_CTX_PARAMS, (void (*)(void))drbg_hmac_set_ctx_params },
     { OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS,
-      (void(*)(void))drbg_hmac_gettable_ctx_params },
-    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void(*)(void))drbg_hmac_get_ctx_params },
+        (void (*)(void))drbg_hmac_gettable_ctx_params },
+    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void (*)(void))drbg_hmac_get_ctx_params },
     { OSSL_FUNC_RAND_VERIFY_ZEROIZATION,
-      (void(*)(void))drbg_hmac_verify_zeroization },
-    { OSSL_FUNC_RAND_GET_SEED, (void(*)(void))ossl_drbg_get_seed },
-    { OSSL_FUNC_RAND_CLEAR_SEED, (void(*)(void))ossl_drbg_clear_seed },
+        (void (*)(void))drbg_hmac_verify_zeroization },
+    { OSSL_FUNC_RAND_GET_SEED, (void (*)(void))ossl_drbg_get_seed },
+    { OSSL_FUNC_RAND_CLEAR_SEED, (void (*)(void))ossl_drbg_clear_seed },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/rands/drbg_local.h b/providers/implementations/rands/drbg_local.h
index e591e0b3d18e2..ee31c584c5ff9 100644
--- a/providers/implementations/rands/drbg_local.h
+++ b/providers/implementations/rands/drbg_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -8,38 +8,28 @@
  */
 
 #ifndef OSSL_CRYPTO_PROV_LOCAL_H
-# define OSSL_CRYPTO_PROV_LOCAL_H
-
-# include <openssl/evp.h>
-# include <openssl/core_dispatch.h>
-# include <openssl/core_names.h>
-# include <openssl/params.h>
-# include "internal/tsan_assist.h"
-# include "internal/nelem.h"
-# include "internal/numbers.h"
-# include "prov/provider_ctx.h"
-# include "prov/securitycheck.h"
+#define OSSL_CRYPTO_PROV_LOCAL_H
+
+#include <openssl/evp.h>
+#include <openssl/core_dispatch.h>
+#include <openssl/core_names.h>
+#include <openssl/params.h>
+#include "internal/tsan_assist.h"
+#include "internal/nelem.h"
+#include "internal/numbers.h"
+#include "prov/provider_ctx.h"
+#include "prov/securitycheck.h"
 
 /* How many times to read the TSC as a randomness source. */
-# define TSC_READ_COUNT                 4
+#define TSC_READ_COUNT 4
 
 /* Maximum reseed intervals */
-# define MAX_RESEED_INTERVAL                     (1 << 24)
-# define MAX_RESEED_TIME_INTERVAL                (1 << 20) /* approx. 12 days */
+#define MAX_RESEED_INTERVAL (1 << 24)
+#define MAX_RESEED_TIME_INTERVAL (1 << 20) /* approx. 12 days */
 
 /* Default reseed intervals */
-# define RESEED_INTERVAL                         (1 << 8)
-# define TIME_INTERVAL                           (60*60)   /* 1 hour */
-
-/*
- * The number of bytes that constitutes an atomic lump of entropy with respect
- * to the FIPS 140-2 section 4.9.2 Conditional Tests.  The size is somewhat
- * arbitrary, the smaller the value, the less entropy is consumed on first
- * read but the higher the probability of the test failing by accident.
- *
- * The value is in bytes.
- */
-#define CRNGT_BUFSIZ    16
+#define RESEED_INTERVAL (1 << 8)
+#define TIME_INTERVAL (60 * 60) /* 1 hour */
 
 /*
  * Maximum input size for the DRBG (entropy, nonce, personalization string)
@@ -48,7 +38,7 @@
  *
  * We lower it to 'only' INT32_MAX bytes, which is equivalent to 2 gigabytes.
  */
-# define DRBG_MAX_LENGTH                         INT32_MAX
+#define DRBG_MAX_LENGTH INT32_MAX
 
 /* The default nonce */
 /* ASCII: "OpenSSL NIST SP 800-90A DRBG", in hex for EBCDIC compatibility */
@@ -72,14 +62,14 @@ struct prov_drbg_st {
 
     /* Virtual functions are cached here */
     int (*instantiate)(PROV_DRBG *drbg,
-                       const unsigned char *entropy, size_t entropylen,
-                       const unsigned char *nonce, size_t noncelen,
-                       const unsigned char *pers, size_t perslen);
+        const unsigned char *entropy, size_t entropylen,
+        const unsigned char *nonce, size_t noncelen,
+        const unsigned char *pers, size_t perslen);
     int (*uninstantiate)(PROV_DRBG *ctx);
     int (*reseed)(PROV_DRBG *drbg, const unsigned char *ent, size_t ent_len,
-                  const unsigned char *adin, size_t adin_len);
+        const unsigned char *adin, size_t adin_len);
     int (*generate)(PROV_DRBG *, unsigned char *out, size_t outlen,
-                    const unsigned char *adin, size_t adin_len);
+        const unsigned char *adin, size_t adin_len);
 
     /* Parent PROV_RAND and its dispatch table functions */
     void *parent;
@@ -174,34 +164,33 @@ struct prov_drbg_st {
     OSSL_FIPS_IND_DECLARE
 };
 
-PROV_DRBG *ossl_rand_drbg_new
-    (void *provctx, void *parent, const OSSL_DISPATCH *parent_dispatch,
-     int (*dnew)(PROV_DRBG *ctx),
-     void (*dfree)(void *vctx),
-     int (*instantiate)(PROV_DRBG *drbg,
-                        const unsigned char *entropy, size_t entropylen,
-                        const unsigned char *nonce, size_t noncelen,
-                        const unsigned char *pers, size_t perslen),
-     int (*uninstantiate)(PROV_DRBG *ctx),
-     int (*reseed)(PROV_DRBG *drbg, const unsigned char *ent, size_t ent_len,
-                   const unsigned char *adin, size_t adin_len),
-     int (*generate)(PROV_DRBG *, unsigned char *out, size_t outlen,
-                     const unsigned char *adin, size_t adin_len));
+PROV_DRBG *ossl_rand_drbg_new(void *provctx, void *parent, const OSSL_DISPATCH *parent_dispatch,
+    int (*dnew)(PROV_DRBG *ctx),
+    void (*dfree)(void *vctx),
+    int (*instantiate)(PROV_DRBG *drbg,
+        const unsigned char *entropy, size_t entropylen,
+        const unsigned char *nonce, size_t noncelen,
+        const unsigned char *pers, size_t perslen),
+    int (*uninstantiate)(PROV_DRBG *ctx),
+    int (*reseed)(PROV_DRBG *drbg, const unsigned char *ent, size_t ent_len,
+        const unsigned char *adin, size_t adin_len),
+    int (*generate)(PROV_DRBG *, unsigned char *out, size_t outlen,
+        const unsigned char *adin, size_t adin_len));
 void ossl_rand_drbg_free(PROV_DRBG *drbg);
 
 int ossl_prov_drbg_instantiate(PROV_DRBG *drbg, unsigned int strength,
-                               int prediction_resistance,
-                               const unsigned char *pers, size_t perslen);
+    int prediction_resistance,
+    const unsigned char *pers, size_t perslen);
 
 int ossl_prov_drbg_uninstantiate(PROV_DRBG *drbg);
 
 int ossl_prov_drbg_reseed(PROV_DRBG *drbg, int prediction_resistance,
-                          const unsigned char *ent, size_t ent_len,
-                          const unsigned char *adin, size_t adinlen);
+    const unsigned char *ent, size_t ent_len,
+    const unsigned char *adin, size_t adinlen);
 
 int ossl_prov_drbg_generate(PROV_DRBG *drbg, unsigned char *out, size_t outlen,
-                            unsigned int strength, int prediction_resistance,
-                            const unsigned char *adin, size_t adinlen);
+    unsigned int strength, int prediction_resistance,
+    const unsigned char *adin, size_t adinlen);
 
 /* Seeding api */
 OSSL_FUNC_rand_get_seed_fn ossl_drbg_get_seed;
@@ -225,35 +214,27 @@ OSSL_FUNC_rand_unlock_fn ossl_drbg_unlock;
 /* Common parameters for all of our DRBGs */
 int ossl_drbg_get_ctx_params(PROV_DRBG *drbg, OSSL_PARAM params[]);
 int ossl_drbg_get_ctx_params_no_lock(PROV_DRBG *drbg, OSSL_PARAM params[],
-                                     int *complete);
+    int *complete);
 int ossl_drbg_set_ctx_params(PROV_DRBG *drbg, const OSSL_PARAM params[]);
 
-#define OSSL_PARAM_DRBG_SETTABLE_CTX_COMMON                             \
-    OSSL_PARAM_uint(OSSL_DRBG_PARAM_RESEED_REQUESTS, NULL),             \
-    OSSL_PARAM_uint64(OSSL_DRBG_PARAM_RESEED_TIME_INTERVAL, NULL)
-
-#define OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON                             \
-    OSSL_PARAM_int(OSSL_RAND_PARAM_STATE, NULL),                        \
-    OSSL_PARAM_uint(OSSL_RAND_PARAM_STRENGTH, NULL),                    \
-    OSSL_PARAM_size_t(OSSL_RAND_PARAM_MAX_REQUEST, NULL),               \
-    OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MIN_ENTROPYLEN, NULL),            \
-    OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MAX_ENTROPYLEN, NULL),            \
-    OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MIN_NONCELEN, NULL),              \
-    OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MAX_NONCELEN, NULL),              \
-    OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MAX_PERSLEN, NULL),               \
-    OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MAX_ADINLEN, NULL),               \
-    OSSL_PARAM_uint(OSSL_DRBG_PARAM_RESEED_COUNTER, NULL),              \
-    OSSL_PARAM_time_t(OSSL_DRBG_PARAM_RESEED_TIME, NULL),               \
-    OSSL_PARAM_uint(OSSL_DRBG_PARAM_RESEED_REQUESTS, NULL),             \
-    OSSL_PARAM_uint64(OSSL_DRBG_PARAM_RESEED_TIME_INTERVAL, NULL)
-
-/* Continuous test "entropy" calls */
-size_t ossl_crngt_get_entropy(PROV_DRBG *drbg,
-                              unsigned char **pout,
-                              int entropy, size_t min_len, size_t max_len,
-                              int prediction_resistance);
-void ossl_crngt_cleanup_entropy(PROV_DRBG *drbg,
-                                unsigned char *out, size_t outlen);
+#define OSSL_PARAM_DRBG_SETTABLE_CTX_COMMON                 \
+    OSSL_PARAM_uint(OSSL_DRBG_PARAM_RESEED_REQUESTS, NULL), \
+        OSSL_PARAM_uint64(OSSL_DRBG_PARAM_RESEED_TIME_INTERVAL, NULL)
+
+#define OSSL_PARAM_DRBG_GETTABLE_CTX_COMMON                      \
+    OSSL_PARAM_int(OSSL_RAND_PARAM_STATE, NULL),                 \
+        OSSL_PARAM_uint(OSSL_RAND_PARAM_STRENGTH, NULL),         \
+        OSSL_PARAM_size_t(OSSL_RAND_PARAM_MAX_REQUEST, NULL),    \
+        OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MIN_ENTROPYLEN, NULL), \
+        OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MAX_ENTROPYLEN, NULL), \
+        OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MIN_NONCELEN, NULL),   \
+        OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MAX_NONCELEN, NULL),   \
+        OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MAX_PERSLEN, NULL),    \
+        OSSL_PARAM_size_t(OSSL_DRBG_PARAM_MAX_ADINLEN, NULL),    \
+        OSSL_PARAM_uint(OSSL_DRBG_PARAM_RESEED_COUNTER, NULL),   \
+        OSSL_PARAM_time_t(OSSL_DRBG_PARAM_RESEED_TIME, NULL),    \
+        OSSL_PARAM_uint(OSSL_DRBG_PARAM_RESEED_REQUESTS, NULL),  \
+        OSSL_PARAM_uint64(OSSL_DRBG_PARAM_RESEED_TIME_INTERVAL, NULL)
 
 /* Confirm digest is allowed to be used with a DRBG */
 int ossl_drbg_verify_digest(PROV_DRBG *drbg, OSSL_LIB_CTX *libctx, const EVP_MD *md);
diff --git a/providers/implementations/rands/fips_crng_test.c b/providers/implementations/rands/fips_crng_test.c
index 209a1adb27850..f61a93a14b188 100644
--- a/providers/implementations/rands/fips_crng_test.c
+++ b/providers/implementations/rands/fips_crng_test.c
@@ -42,10 +42,10 @@ static OSSL_FUNC_rand_get_seed_fn crng_test_get_seed;
 static OSSL_FUNC_rand_clear_seed_fn crng_test_clear_seed;
 
 #ifndef ENTROPY_H
-# define ENTROPY_H 6    /* default to six bits per byte of entropy */
+#define ENTROPY_H 6 /* default to six bits per byte of entropy */
 #endif
 #ifndef ENTROPY_APT_W
-# define ENTROPY_APT_W 512
+#define ENTROPY_APT_W 512
 #endif
 
 typedef struct crng_testal_st {
@@ -85,8 +85,8 @@ static int lock_parent(CRNG_TEST *crngt)
     void *parent = crngt->parent;
 
     if (parent != NULL
-            && crngt->parent_lock != NULL
-            && !crngt->parent_lock(parent)) {
+        && crngt->parent_lock != NULL
+        && !crngt->parent_lock(parent)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_PARENT_LOCKING_NOT_ENABLED);
         return 0;
     }
@@ -114,12 +114,12 @@ static int RCT_test(CRNG_TEST *crngt, uint8_t next)
      * where alpha = 2^-20 and H is the expected entropy per sample.
      */
     static const unsigned int rct_c[9] = {
-        41,                                 /* H = 0.5 */
-        21, 11, 8, 6, 5, 5, 4, 4            /* H = 1, ..., 8 */
+        41, /* H = 0.5 */
+        21, 11, 8, 6, 5, 5, 4, 4 /* H = 1, ..., 8 */
     };
 
     if (ossl_likely(crngt->rct.b != 0)
-            && ossl_unlikely(next == crngt->rct.a))
+        && ossl_unlikely(next == crngt->rct.a))
         return ossl_likely(++crngt->rct.b < rct_c[ENTROPY_H]);
     crngt->rct.a = next;
     crngt->rct.b = 1;
@@ -138,13 +138,13 @@ static int APT_test(CRNG_TEST *crngt, uint8_t next)
      * section 4.4.2, table 2.
      */
     static const unsigned int apt_c[9] = {
-        410,                                /* H = 0.5 */
-        311, 177, 103, 62, 39, 25, 18, 13   /* H = 1, ..., 8 */
+        410, /* H = 0.5 */
+        311, 177, 103, 62, 39, 25, 18, 13 /* H = 1, ..., 8 */
     };
 
     if (ossl_likely(crngt->apt.b != 0)) {
         if (ossl_unlikely(crngt->apt.a == next)
-                && ossl_unlikely(++crngt->apt.b >= apt_c[ENTROPY_H])) {
+            && ossl_unlikely(++crngt->apt.b >= apt_c[ENTROPY_H])) {
             crngt->apt.b = 0;
             return 0;
         }
@@ -166,14 +166,14 @@ static int crng_test(CRNG_TEST *crngt, const unsigned char *buf, size_t n)
         if (!RCT_test(crngt, buf[i]) || !APT_test(crngt, buf[i])) {
             crngt->state = EVP_RAND_STATE_ERROR;
             ERR_raise(ERR_LIB_PROV,
-                      PROV_R_ENTROPY_SOURCE_FAILED_CONTINUOUS_TESTS);
+                PROV_R_ENTROPY_SOURCE_FAILED_CONTINUOUS_TESTS);
             return 0;
         }
     return 1;
 }
 
 static const OSSL_DISPATCH *find_call(const OSSL_DISPATCH *dispatch,
-                                      int function)
+    int function)
 {
     if (dispatch != NULL)
         while (dispatch->function_id != 0) {
@@ -185,7 +185,7 @@ static const OSSL_DISPATCH *find_call(const OSSL_DISPATCH *dispatch,
 }
 
 static void *crng_test_new(void *provctx, void *parent,
-                           const OSSL_DISPATCH *p_dispatch)
+    const OSSL_DISPATCH *p_dispatch)
 {
     CRNG_TEST *crngt = OPENSSL_zalloc(sizeof(*crngt));
     const OSSL_DISPATCH *pfunc;
@@ -229,10 +229,10 @@ static void crng_test_free(void *vcrngt)
 }
 
 static int crng_test_instantiate(void *vcrngt, unsigned int strength,
-                                 int prediction_resistance,
-                                 const unsigned char *pstr,
-                                 size_t pstr_len,
-                                 ossl_unused const OSSL_PARAM params[])
+    int prediction_resistance,
+    const unsigned char *pstr,
+    size_t pstr_len,
+    ossl_unused const OSSL_PARAM params[])
 {
     CRNG_TEST *crngt = (CRNG_TEST *)vcrngt;
 
@@ -250,14 +250,14 @@ static int crng_test_uninstantiate(void *vcrngt)
 }
 
 static int crng_test_generate(void *vcrngt, unsigned char *out, size_t outlen,
-                              unsigned int strength, int prediction_resistance,
-                              const unsigned char *adin, size_t adin_len)
+    unsigned int strength, int prediction_resistance,
+    const unsigned char *adin, size_t adin_len)
 {
     unsigned char *p;
     CRNG_TEST *crngt = (CRNG_TEST *)vcrngt;
 
     if (!crng_test_get_seed(crngt, &p, 0, outlen, outlen, prediction_resistance,
-                            adin, adin_len))
+            adin, adin_len))
         return 0;
     memcpy(out, p, outlen);
     crng_test_clear_seed(crngt, p, outlen);
@@ -265,11 +265,11 @@ static int crng_test_generate(void *vcrngt, unsigned char *out, size_t outlen,
 }
 
 static int crng_test_reseed(ossl_unused void *vcrngt,
-                            ossl_unused int prediction_resistance,
-                            ossl_unused const unsigned char *ent,
-                            ossl_unused size_t ent_len,
-                            ossl_unused const unsigned char *adin,
-                            ossl_unused size_t adin_len)
+    ossl_unused int prediction_resistance,
+    ossl_unused const unsigned char *ent,
+    ossl_unused size_t ent_len,
+    ossl_unused const unsigned char *adin,
+    ossl_unused size_t adin_len)
 {
     return 1;
 }
@@ -280,11 +280,11 @@ static int crng_test_verify_zeroization(ossl_unused void *vcrngt)
 }
 
 static size_t crng_test_get_seed(void *vcrngt, unsigned char **pout,
-                                 int entropy, size_t min_len,
-                                 size_t max_len,
-                                 int prediction_resistance,
-                                 const unsigned char *adin,
-                                 size_t adin_len)
+    int entropy, size_t min_len,
+    size_t max_len,
+    int prediction_resistance,
+    const unsigned char *adin,
+    size_t adin_len)
 {
     CRNG_TEST *crngt = (CRNG_TEST *)vcrngt;
     size_t n;
@@ -292,9 +292,9 @@ static size_t crng_test_get_seed(void *vcrngt, unsigned char **pout,
 
     /* Without a parent, we rely on the up calls */
     if (crngt->parent == NULL
-            || crngt->parent_get_seed == NULL) {
+        || crngt->parent_get_seed == NULL) {
         n = ossl_prov_get_entropy(crngt->provctx, pout, entropy,
-                                  min_len, max_len);
+            min_len, max_len);
         if (n == 0)
             return 0;
         r = crng_test(crngt, *pout, n);
@@ -306,8 +306,8 @@ static size_t crng_test_get_seed(void *vcrngt, unsigned char **pout,
         return 0;
 
     n = crngt->parent_get_seed(crngt->parent, pout, entropy,
-                               min_len, max_len, prediction_resistance,
-                               adin, adin_len);
+        min_len, max_len, prediction_resistance,
+        adin, adin_len);
     if (n > 0 && crng_test(crngt, *pout, n) > 0)
         r = n;
     else if (crngt->parent_clear_seed != NULL)
@@ -317,7 +317,7 @@ static size_t crng_test_get_seed(void *vcrngt, unsigned char **pout,
 }
 
 static void crng_test_clear_seed(void *vcrngt,
-                                 unsigned char *out, size_t outlen)
+    unsigned char *out, size_t outlen)
 {
     CRNG_TEST *crngt = (CRNG_TEST *)vcrngt;
 
@@ -389,7 +389,7 @@ static int crng_test_get_ctx_params(void *vcrngt, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *crng_test_gettable_ctx_params(void *vcrngt,
-                                                       void *provctx)
+    void *provctx)
 {
     CRNG_TEST *crngt = (CRNG_TEST *)vcrngt;
     static const OSSL_PARAM known_gettable_ctx_params[] = {
@@ -406,23 +406,23 @@ static const OSSL_PARAM *crng_test_gettable_ctx_params(void *vcrngt,
 }
 
 const OSSL_DISPATCH ossl_crng_test_functions[] = {
-    { OSSL_FUNC_RAND_NEWCTX, (void(*)(void))crng_test_new },
-    { OSSL_FUNC_RAND_FREECTX, (void(*)(void))crng_test_free },
+    { OSSL_FUNC_RAND_NEWCTX, (void (*)(void))crng_test_new },
+    { OSSL_FUNC_RAND_FREECTX, (void (*)(void))crng_test_free },
     { OSSL_FUNC_RAND_INSTANTIATE,
-      (void(*)(void))crng_test_instantiate },
+        (void (*)(void))crng_test_instantiate },
     { OSSL_FUNC_RAND_UNINSTANTIATE,
-      (void(*)(void))crng_test_uninstantiate },
-    { OSSL_FUNC_RAND_GENERATE, (void(*)(void))crng_test_generate },
-    { OSSL_FUNC_RAND_RESEED, (void(*)(void))crng_test_reseed },
-    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void(*)(void))crng_test_enable_locking },
-    { OSSL_FUNC_RAND_LOCK, (void(*)(void))crng_test_lock },
-    { OSSL_FUNC_RAND_UNLOCK, (void(*)(void))crng_test_unlock },
+        (void (*)(void))crng_test_uninstantiate },
+    { OSSL_FUNC_RAND_GENERATE, (void (*)(void))crng_test_generate },
+    { OSSL_FUNC_RAND_RESEED, (void (*)(void))crng_test_reseed },
+    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void (*)(void))crng_test_enable_locking },
+    { OSSL_FUNC_RAND_LOCK, (void (*)(void))crng_test_lock },
+    { OSSL_FUNC_RAND_UNLOCK, (void (*)(void))crng_test_unlock },
     { OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS,
-      (void(*)(void))crng_test_gettable_ctx_params },
-    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void(*)(void))crng_test_get_ctx_params },
+        (void (*)(void))crng_test_gettable_ctx_params },
+    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void (*)(void))crng_test_get_ctx_params },
     { OSSL_FUNC_RAND_VERIFY_ZEROIZATION,
-      (void(*)(void))crng_test_verify_zeroization },
-    { OSSL_FUNC_RAND_GET_SEED, (void(*)(void))crng_test_get_seed },
-    { OSSL_FUNC_RAND_CLEAR_SEED, (void(*)(void))crng_test_clear_seed },
+        (void (*)(void))crng_test_verify_zeroization },
+    { OSSL_FUNC_RAND_GET_SEED, (void (*)(void))crng_test_get_seed },
+    { OSSL_FUNC_RAND_CLEAR_SEED, (void (*)(void))crng_test_clear_seed },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/rands/seed_src.c b/providers/implementations/rands/seed_src.c
index 1faab39138d2c..cf903960e1595 100644
--- a/providers/implementations/rands/seed_src.c
+++ b/providers/implementations/rands/seed_src.c
@@ -43,7 +43,7 @@ typedef struct {
 } PROV_SEED_SRC;
 
 static void *seed_src_new(void *provctx, void *parent,
-                          const OSSL_DISPATCH *parent_dispatch)
+    const OSSL_DISPATCH *parent_dispatch)
 {
     PROV_SEED_SRC *s;
 
@@ -67,9 +67,9 @@ static void seed_src_free(void *vseed)
 }
 
 static int seed_src_instantiate(void *vseed, unsigned int strength,
-                                int prediction_resistance,
-                                const unsigned char *pstr, size_t pstr_len,
-                                ossl_unused const OSSL_PARAM params[])
+    int prediction_resistance,
+    const unsigned char *pstr, size_t pstr_len,
+    ossl_unused const OSSL_PARAM params[])
 {
     PROV_SEED_SRC *s = (PROV_SEED_SRC *)vseed;
 
@@ -86,10 +86,10 @@ static int seed_src_uninstantiate(void *vseed)
 }
 
 static int seed_src_generate(void *vseed, unsigned char *out, size_t outlen,
-                             unsigned int strength,
-                             ossl_unused int prediction_resistance,
-                             const unsigned char *adin,
-                             size_t adin_len)
+    unsigned int strength,
+    ossl_unused int prediction_resistance,
+    const unsigned char *adin,
+    size_t adin_len)
 {
     PROV_SEED_SRC *s = (PROV_SEED_SRC *)vseed;
     size_t entropy_available;
@@ -97,8 +97,8 @@ static int seed_src_generate(void *vseed, unsigned char *out, size_t outlen,
 
     if (s->state != EVP_RAND_STATE_READY) {
         ERR_raise(ERR_LIB_PROV,
-                  s->state == EVP_RAND_STATE_ERROR ? PROV_R_IN_ERROR_STATE
-                                                   : PROV_R_NOT_INSTANTIATED);
+            s->state == EVP_RAND_STATE_ERROR ? PROV_R_IN_ERROR_STATE
+                                             : PROV_R_NOT_INSTANTIATED);
         return 0;
     }
 
@@ -124,18 +124,18 @@ static int seed_src_generate(void *vseed, unsigned char *out, size_t outlen,
 }
 
 static int seed_src_reseed(void *vseed,
-                           ossl_unused int prediction_resistance,
-                           ossl_unused const unsigned char *ent,
-                           ossl_unused size_t ent_len,
-                           ossl_unused const unsigned char *adin,
-                           ossl_unused size_t adin_len)
+    ossl_unused int prediction_resistance,
+    ossl_unused const unsigned char *ent,
+    ossl_unused size_t ent_len,
+    ossl_unused const unsigned char *adin,
+    ossl_unused size_t adin_len)
 {
     PROV_SEED_SRC *s = (PROV_SEED_SRC *)vseed;
 
     if (s->state != EVP_RAND_STATE_READY) {
         ERR_raise(ERR_LIB_PROV,
-                  s->state == EVP_RAND_STATE_ERROR ? PROV_R_IN_ERROR_STATE
-                                                   : PROV_R_NOT_INSTANTIATED);
+            s->state == EVP_RAND_STATE_ERROR ? PROV_R_IN_ERROR_STATE
+                                             : PROV_R_NOT_INSTANTIATED);
         return 0;
     }
     return 1;
@@ -161,7 +161,7 @@ static int seed_src_get_ctx_params(void *vseed, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *seed_src_gettable_ctx_params(ossl_unused void *vseed,
-                                                      ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_int(OSSL_RAND_PARAM_STATE, NULL),
@@ -178,9 +178,9 @@ static int seed_src_verify_zeroization(ossl_unused void *vseed)
 }
 
 static size_t seed_get_seed(void *vseed, unsigned char **pout,
-                            int entropy, size_t min_len, size_t max_len,
-                            int prediction_resistance,
-                            const unsigned char *adin, size_t adin_len)
+    int entropy, size_t min_len, size_t max_len,
+    int prediction_resistance,
+    const unsigned char *adin, size_t adin_len)
 {
     size_t ret = 0;
     size_t entropy_available = 0;
@@ -207,7 +207,7 @@ static size_t seed_get_seed(void *vseed, unsigned char **pout,
 }
 
 static void seed_clear_seed(ossl_unused void *vdrbg,
-                            unsigned char *out, size_t outlen)
+    unsigned char *out, size_t outlen)
 {
     OPENSSL_secure_clear_free(out, outlen);
 }
@@ -227,23 +227,23 @@ void seed_src_unlock(ossl_unused void *vctx)
 }
 
 const OSSL_DISPATCH ossl_seed_src_functions[] = {
-    { OSSL_FUNC_RAND_NEWCTX, (void(*)(void))seed_src_new },
-    { OSSL_FUNC_RAND_FREECTX, (void(*)(void))seed_src_free },
+    { OSSL_FUNC_RAND_NEWCTX, (void (*)(void))seed_src_new },
+    { OSSL_FUNC_RAND_FREECTX, (void (*)(void))seed_src_free },
     { OSSL_FUNC_RAND_INSTANTIATE,
-      (void(*)(void))seed_src_instantiate },
+        (void (*)(void))seed_src_instantiate },
     { OSSL_FUNC_RAND_UNINSTANTIATE,
-      (void(*)(void))seed_src_uninstantiate },
-    { OSSL_FUNC_RAND_GENERATE, (void(*)(void))seed_src_generate },
-    { OSSL_FUNC_RAND_RESEED, (void(*)(void))seed_src_reseed },
-    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void(*)(void))seed_src_enable_locking },
-    { OSSL_FUNC_RAND_LOCK, (void(*)(void))seed_src_lock },
-    { OSSL_FUNC_RAND_UNLOCK, (void(*)(void))seed_src_unlock },
+        (void (*)(void))seed_src_uninstantiate },
+    { OSSL_FUNC_RAND_GENERATE, (void (*)(void))seed_src_generate },
+    { OSSL_FUNC_RAND_RESEED, (void (*)(void))seed_src_reseed },
+    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void (*)(void))seed_src_enable_locking },
+    { OSSL_FUNC_RAND_LOCK, (void (*)(void))seed_src_lock },
+    { OSSL_FUNC_RAND_UNLOCK, (void (*)(void))seed_src_unlock },
     { OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS,
-      (void(*)(void))seed_src_gettable_ctx_params },
-    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void(*)(void))seed_src_get_ctx_params },
+        (void (*)(void))seed_src_gettable_ctx_params },
+    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void (*)(void))seed_src_get_ctx_params },
     { OSSL_FUNC_RAND_VERIFY_ZEROIZATION,
-      (void(*)(void))seed_src_verify_zeroization },
-    { OSSL_FUNC_RAND_GET_SEED, (void(*)(void))seed_get_seed },
-    { OSSL_FUNC_RAND_CLEAR_SEED, (void(*)(void))seed_clear_seed },
+        (void (*)(void))seed_src_verify_zeroization },
+    { OSSL_FUNC_RAND_GET_SEED, (void (*)(void))seed_get_seed },
+    { OSSL_FUNC_RAND_CLEAR_SEED, (void (*)(void))seed_clear_seed },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/rands/seed_src_jitter.c b/providers/implementations/rands/seed_src_jitter.c
index ac57f1c14bff4..fa6d931acebdf 100644
--- a/providers/implementations/rands/seed_src_jitter.c
+++ b/providers/implementations/rands/seed_src_jitter.c
@@ -25,9 +25,9 @@
 #include "crypto/rand_pool.h"
 
 #ifndef OPENSSL_NO_JITTER
-# include <jitterentropy.h>
+#include <jitterentropy.h>
 
-# define JITTER_MAX_NUM_TRIES 3
+#define JITTER_MAX_NUM_TRIES 3
 
 static OSSL_FUNC_rand_newctx_fn jitter_new;
 static OSSL_FUNC_rand_freectx_fn jitter_free;
@@ -58,7 +58,7 @@ static size_t get_jitter_random_value(PROV_JITTER *s, unsigned char *buf, size_t
  * entropy count. Otherwise, returns an entropy count of 0.
  */
 static size_t ossl_prov_acquire_entropy_from_jitter(PROV_JITTER *s,
-                                                    RAND_POOL *pool)
+    RAND_POOL *pool)
 {
     size_t bytes_needed;
     unsigned char *buffer;
@@ -81,7 +81,7 @@ static size_t ossl_prov_acquire_entropy_from_jitter(PROV_JITTER *s,
 
 /* Obtain random bytes from the jitter library */
 static size_t get_jitter_random_value(PROV_JITTER *s,
-                                      unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     struct rand_data *jitter_ec = NULL;
     ssize_t result = 0;
@@ -95,17 +95,15 @@ static size_t get_jitter_random_value(PROV_JITTER *s,
             continue;
 
         /* Do not use _safe API as per typical security policies */
-        result = jent_read_entropy(jitter_ec, (char *) buf, len);
+        result = jent_read_entropy(jitter_ec, (char *)buf, len);
         jent_entropy_collector_free(jitter_ec);
 
         /*
          * Permanent Failure
          * https://github.com/smuellerDD/jitterentropy-library/blob/master/doc/jitterentropy.3#L234
          */
-        if (result < -5) {
-            ossl_set_error_state(OSSL_SELF_TEST_TYPE_CRNG);
+        if (result < -5)
             break;
-        }
 
         /* Success */
         if (result >= 0 && (size_t)result == len)
@@ -114,13 +112,14 @@ static size_t get_jitter_random_value(PROV_JITTER *s,
 
     /* Permanent failure or too many intermittent failures */
     s->state = EVP_RAND_STATE_ERROR;
+    ossl_set_error_state(OSSL_SELF_TEST_TYPE_CRNG);
     ERR_raise_data(ERR_LIB_RAND, RAND_R_ERROR_RETRIEVING_ENTROPY,
-                   "jent_read_entropy (%d)", result);
+        "jent_read_entropy (%d)", result);
     return 0;
 }
 
 static void *jitter_new(void *provctx, void *parent,
-                        const OSSL_DISPATCH *parent_dispatch)
+    const OSSL_DISPATCH *parent_dispatch)
 {
     PROV_JITTER *s;
 
@@ -144,18 +143,19 @@ static void jitter_free(void *vseed)
 }
 
 static int jitter_instantiate(void *vseed, unsigned int strength,
-                              int prediction_resistance,
-                              const unsigned char *pstr,
-                              size_t pstr_len,
-                              ossl_unused const OSSL_PARAM params[])
+    int prediction_resistance,
+    const unsigned char *pstr,
+    size_t pstr_len,
+    ossl_unused const OSSL_PARAM params[])
 {
     PROV_JITTER *s = (PROV_JITTER *)vseed;
     int ret;
 
     if ((ret = jent_entropy_init_ex(0, JENT_FORCE_FIPS)) != 0) {
         ERR_raise_data(ERR_LIB_RAND, RAND_R_ERROR_RETRIEVING_ENTROPY,
-                       "jent_entropy_init_ex (%d)", ret);
+            "jent_entropy_init_ex (%d)", ret);
         s->state = EVP_RAND_STATE_ERROR;
+        ossl_set_error_state(OSSL_SELF_TEST_TYPE_CRNG);
         return 0;
     }
 
@@ -172,10 +172,10 @@ static int jitter_uninstantiate(void *vseed)
 }
 
 static int jitter_generate(void *vseed, unsigned char *out, size_t outlen,
-                           unsigned int strength,
-                           ossl_unused int prediction_resistance,
-                           ossl_unused const unsigned char *adin,
-                           ossl_unused size_t adin_len)
+    unsigned int strength,
+    ossl_unused int prediction_resistance,
+    ossl_unused const unsigned char *adin,
+    ossl_unused size_t adin_len)
 {
     PROV_JITTER *s = (PROV_JITTER *)vseed;
     size_t entropy_available;
@@ -183,8 +183,8 @@ static int jitter_generate(void *vseed, unsigned char *out, size_t outlen,
 
     if (s->state != EVP_RAND_STATE_READY) {
         ERR_raise(ERR_LIB_PROV,
-                  s->state == EVP_RAND_STATE_ERROR ? PROV_R_IN_ERROR_STATE
-                                                   : PROV_R_NOT_INSTANTIATED);
+            s->state == EVP_RAND_STATE_ERROR ? PROV_R_IN_ERROR_STATE
+                                             : PROV_R_NOT_INSTANTIATED);
         return 0;
     }
 
@@ -210,18 +210,18 @@ static int jitter_generate(void *vseed, unsigned char *out, size_t outlen,
 }
 
 static int jitter_reseed(void *vseed,
-                         ossl_unused int prediction_resistance,
-                         ossl_unused const unsigned char *ent,
-                         ossl_unused size_t ent_len,
-                         ossl_unused const unsigned char *adin,
-                         ossl_unused size_t adin_len)
+    ossl_unused int prediction_resistance,
+    ossl_unused const unsigned char *ent,
+    ossl_unused size_t ent_len,
+    ossl_unused const unsigned char *adin,
+    ossl_unused size_t adin_len)
 {
     PROV_JITTER *s = (PROV_JITTER *)vseed;
 
     if (s->state != EVP_RAND_STATE_READY) {
         ERR_raise(ERR_LIB_PROV,
-                  s->state == EVP_RAND_STATE_ERROR ? PROV_R_IN_ERROR_STATE
-                                                   : PROV_R_NOT_INSTANTIATED);
+            s->state == EVP_RAND_STATE_ERROR ? PROV_R_IN_ERROR_STATE
+                                             : PROV_R_NOT_INSTANTIATED);
         return 0;
     }
     return 1;
@@ -247,7 +247,7 @@ static int jitter_get_ctx_params(void *vseed, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *jitter_gettable_ctx_params(ossl_unused void *vseed,
-                                                    ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_int(OSSL_RAND_PARAM_STATE, NULL),
@@ -264,11 +264,11 @@ static int jitter_verify_zeroization(ossl_unused void *vseed)
 }
 
 static size_t jitter_get_seed(void *vseed, unsigned char **pout,
-                              int entropy, size_t min_len,
-                              size_t max_len,
-                              int prediction_resistance,
-                              const unsigned char *adin,
-                              size_t adin_len)
+    int entropy, size_t min_len,
+    size_t max_len,
+    int prediction_resistance,
+    const unsigned char *adin,
+    size_t adin_len)
 {
     size_t ret = 0;
     size_t entropy_available = 0;
@@ -295,7 +295,7 @@ static size_t jitter_get_seed(void *vseed, unsigned char **pout,
     return ret;
 }
 
-# ifndef OPENSSL_NO_FIPS_JITTER
+#ifndef OPENSSL_NO_FIPS_JITTER
 size_t ossl_rand_jitter_get_seed(unsigned char **pout, int entropy, size_t min_len, size_t max_len)
 {
     size_t ret = 0;
@@ -307,14 +307,14 @@ size_t ossl_rand_jitter_get_seed(unsigned char **pout, int entropy, size_t min_l
     if (!jitter_instantiate(s, 0, 0, NULL, 0, params))
         goto end;
     ret = jitter_get_seed(s, pout, entropy, min_len, max_len, 0, NULL, 0);
- end:
+end:
     jitter_free(s);
     return ret;
 }
-# endif
+#endif
 
 static void jitter_clear_seed(ossl_unused void *vdrbg,
-                              unsigned char *out, size_t outlen)
+    unsigned char *out, size_t outlen)
 {
     OPENSSL_secure_clear_free(out, outlen);
 }
@@ -334,24 +334,24 @@ void jitter_unlock(ossl_unused void *vctx)
 }
 
 const OSSL_DISPATCH ossl_jitter_functions[] = {
-    { OSSL_FUNC_RAND_NEWCTX, (void(*)(void))jitter_new },
-    { OSSL_FUNC_RAND_FREECTX, (void(*)(void))jitter_free },
+    { OSSL_FUNC_RAND_NEWCTX, (void (*)(void))jitter_new },
+    { OSSL_FUNC_RAND_FREECTX, (void (*)(void))jitter_free },
     { OSSL_FUNC_RAND_INSTANTIATE,
-      (void(*)(void))jitter_instantiate },
+        (void (*)(void))jitter_instantiate },
     { OSSL_FUNC_RAND_UNINSTANTIATE,
-      (void(*)(void))jitter_uninstantiate },
-    { OSSL_FUNC_RAND_GENERATE, (void(*)(void))jitter_generate },
-    { OSSL_FUNC_RAND_RESEED, (void(*)(void))jitter_reseed },
-    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void(*)(void))jitter_enable_locking },
-    { OSSL_FUNC_RAND_LOCK, (void(*)(void))jitter_lock },
-    { OSSL_FUNC_RAND_UNLOCK, (void(*)(void))jitter_unlock },
+        (void (*)(void))jitter_uninstantiate },
+    { OSSL_FUNC_RAND_GENERATE, (void (*)(void))jitter_generate },
+    { OSSL_FUNC_RAND_RESEED, (void (*)(void))jitter_reseed },
+    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void (*)(void))jitter_enable_locking },
+    { OSSL_FUNC_RAND_LOCK, (void (*)(void))jitter_lock },
+    { OSSL_FUNC_RAND_UNLOCK, (void (*)(void))jitter_unlock },
     { OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS,
-      (void(*)(void))jitter_gettable_ctx_params },
-    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void(*)(void))jitter_get_ctx_params },
+        (void (*)(void))jitter_gettable_ctx_params },
+    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void (*)(void))jitter_get_ctx_params },
     { OSSL_FUNC_RAND_VERIFY_ZEROIZATION,
-      (void(*)(void))jitter_verify_zeroization },
-    { OSSL_FUNC_RAND_GET_SEED, (void(*)(void))jitter_get_seed },
-    { OSSL_FUNC_RAND_CLEAR_SEED, (void(*)(void))jitter_clear_seed },
+        (void (*)(void))jitter_verify_zeroization },
+    { OSSL_FUNC_RAND_GET_SEED, (void (*)(void))jitter_get_seed },
+    { OSSL_FUNC_RAND_CLEAR_SEED, (void (*)(void))jitter_clear_seed },
     OSSL_DISPATCH_END
 };
 #else
diff --git a/providers/implementations/rands/seeding/rand_cpu_arm64.c b/providers/implementations/rands/seeding/rand_cpu_arm64.c
index a8530e02b5760..76bbedf119091 100644
--- a/providers/implementations/rands/seeding/rand_cpu_arm64.c
+++ b/providers/implementations/rands/seeding/rand_cpu_arm64.c
@@ -12,7 +12,6 @@
 #include "crypto/rand_pool.h"
 #include "prov/seeding.h"
 
-
 #ifdef OPENSSL_RAND_SEED_RDCPU
 #include "crypto/arm_arch.h"
 
@@ -53,7 +52,7 @@ size_t ossl_prov_acquire_entropy_from_cpu(RAND_POOL *pool)
 static size_t get_hardware_random_value(unsigned char *buf, size_t len)
 {
     /* Always use RNDRRS or nothing */
-    if (OPENSSL_armcap_P & ARMV8_RNG)  {
+    if (OPENSSL_armcap_P & ARMV8_RNG) {
         if (OPENSSL_rndrrs_bytes(buf, len) != len)
             return 0;
     } else {
diff --git a/providers/implementations/rands/seeding/rand_cpu_x86.c b/providers/implementations/rands/seeding/rand_cpu_x86.c
index 0e062fa45aa2c..f2021ed109055 100644
--- a/providers/implementations/rands/seeding/rand_cpu_x86.c
+++ b/providers/implementations/rands/seeding/rand_cpu_x86.c
@@ -13,13 +13,13 @@
 #include "prov/seeding.h"
 
 #ifdef OPENSSL_RAND_SEED_RDCPU
-# if defined(OPENSSL_SYS_TANDEM) && defined(_TNS_X_TARGET)
-#  include <builtin.h> /* _rdrand64 */
-#  include <string.h> /* memcpy */
-# else
+#if defined(OPENSSL_SYS_TANDEM) && defined(_TNS_X_TARGET)
+#include <builtin.h> /* _rdrand64 */
+#include <string.h> /* memcpy */
+#else
 size_t OPENSSL_ia32_rdseed_bytes(unsigned char *buf, size_t len);
 size_t OPENSSL_ia32_rdrand_bytes(unsigned char *buf, size_t len);
-# endif
+#endif
 
 static size_t get_hardware_random_value(unsigned char *buf, size_t len);
 
@@ -88,16 +88,17 @@ static size_t get_hardware_random_value(unsigned char *buf, size_t len)
     return 0;
 }
 #else
-static size_t get_hardware_random_value(unsigned char *buf, size_t len) {
+static size_t get_hardware_random_value(unsigned char *buf, size_t len)
+{
     /* Whichever comes first, use RDSEED, RDRAND or nothing */
     if ((OPENSSL_ia32cap_P[2] & (1 << 18)) != 0) {
-	if (OPENSSL_ia32_rdseed_bytes(buf, len) != len)
-	    return 0;
+        if (OPENSSL_ia32_rdseed_bytes(buf, len) != len)
+            return 0;
     } else if ((OPENSSL_ia32cap_P[1] & (1 << (62 - 32))) != 0) {
-	if (OPENSSL_ia32_rdrand_bytes(buf, len) != len)
-	    return 0;
+        if (OPENSSL_ia32_rdrand_bytes(buf, len) != len)
+            return 0;
     } else
-	return 0;
+        return 0;
     return len;
 }
 #endif
diff --git a/providers/implementations/rands/seeding/rand_tsc.c b/providers/implementations/rands/seeding/rand_tsc.c
index 98dd836b24d9a..568e35b5359b3 100644
--- a/providers/implementations/rands/seeding/rand_tsc.c
+++ b/providers/implementations/rands/seeding/rand_tsc.c
@@ -19,7 +19,7 @@
  * Some SP800-90B tests have been run, but there is internal skepticism.
  * So for now this code is not used.
  */
-# error "RDTSC enabled?  Should not be possible!"
+#error "RDTSC enabled?  Should not be possible!"
 
 /*
  * Acquire entropy from high-speed clock
diff --git a/providers/implementations/rands/seeding/rand_unix.c b/providers/implementations/rands/seeding/rand_unix.c
index c3a5d8b3bf245..80ae8173131db 100644
--- a/providers/implementations/rands/seeding/rand_unix.c
+++ b/providers/implementations/rands/seeding/rand_unix.c
@@ -8,7 +8,7 @@
  */
 
 #ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#define _GNU_SOURCE
 #endif
 #include "internal/e_os.h"
 #include <stdio.h>
@@ -22,42 +22,42 @@
 #include "prov/seeding.h"
 
 #ifndef OPENSSL_SYS_UEFI
-# ifdef __linux
-#  include <sys/syscall.h>
-#  ifdef DEVRANDOM_WAIT
-#   include <sys/shm.h>
-#   include <sys/utsname.h>
-#  endif
-# endif
-# if defined(__FreeBSD__) || defined(__NetBSD__)
-#  include <sys/types.h>
-#  include <sys/sysctl.h>
-#  include <sys/param.h>
-# endif
-# if defined(__FreeBSD__) && __FreeBSD_version >= 1200061
-#  include <sys/random.h>
-# endif
-# if defined(__OpenBSD__)
-#  include <sys/param.h>
-# endif
-# if defined(__DragonFly__)
-#  include <sys/param.h>
-#  include <sys/random.h>
-# endif
+#ifdef __linux
+#include <sys/syscall.h>
+#ifdef DEVRANDOM_WAIT
+#include <sys/shm.h>
+#include <sys/utsname.h>
+#endif
+#endif
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/param.h>
+#endif
+#if defined(__FreeBSD__) && __FreeBSD_version >= 1200061
+#include <sys/random.h>
+#endif
+#if defined(__OpenBSD__)
+#include <sys/param.h>
+#endif
+#if defined(__DragonFly__)
+#include <sys/param.h>
+#include <sys/random.h>
+#endif
 #endif
 
 #if (defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_SYS_VXWORKS)) \
-     || defined(__DJGPP__)
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <fcntl.h>
-# include <unistd.h>
-# include <sys/time.h>
+    || defined(__DJGPP__)
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/time.h>
 
 static uint64_t get_time_stamp(void);
 
 /* Macro to convert two thirty two bit values into a sixty four bit one */
-# define TWO32TO64(a, b) ((((uint64_t)(a)) << 32) + (b))
+#define TWO32TO64(a, b) ((((uint64_t)(a)) << 32) + (b))
 
 /*
  * Check for the existence and support of POSIX timers.  The standard
@@ -79,53 +79,53 @@ static uint64_t get_time_stamp(void);
  * The nested #if sequences are required to avoid using a parameterised
  * macro that might be undefined.
  */
-# undef OSSL_POSIX_TIMER_OKAY
+#undef OSSL_POSIX_TIMER_OKAY
 /* On some systems, _POSIX_TIMERS is defined but empty.
  * Subtracting by 0 when comparing avoids an error in this case. */
-# if defined(_POSIX_TIMERS) && _POSIX_TIMERS -0 > 0
-#  if defined(__GLIBC__)
-#   if defined(__GLIBC_PREREQ)
-#    if __GLIBC_PREREQ(2, 17)
-#     define OSSL_POSIX_TIMER_OKAY
-#    endif
-#   endif
-#  else
-#   define OSSL_POSIX_TIMER_OKAY
-#  endif
-# endif
-#endif /* (defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_SYS_VXWORKS))
+#if defined(_POSIX_TIMERS) && _POSIX_TIMERS - 0 > 0
+#if defined(__GLIBC__)
+#if defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2, 17)
+#define OSSL_POSIX_TIMER_OKAY
+#endif
+#endif
+#else
+#define OSSL_POSIX_TIMER_OKAY
+#endif
+#endif
+#endif /* (defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_SYS_VXWORKS)) \
           || defined(__DJGPP__) */
 
 #if defined(OPENSSL_RAND_SEED_NONE)
 /* none means none. this simplifies the following logic */
-# undef OPENSSL_RAND_SEED_OS
-# undef OPENSSL_RAND_SEED_GETRANDOM
-# undef OPENSSL_RAND_SEED_DEVRANDOM
-# undef OPENSSL_RAND_SEED_RDTSC
-# undef OPENSSL_RAND_SEED_RDCPU
-# undef OPENSSL_RAND_SEED_EGD
+#undef OPENSSL_RAND_SEED_OS
+#undef OPENSSL_RAND_SEED_GETRANDOM
+#undef OPENSSL_RAND_SEED_DEVRANDOM
+#undef OPENSSL_RAND_SEED_RDTSC
+#undef OPENSSL_RAND_SEED_RDCPU
+#undef OPENSSL_RAND_SEED_EGD
 #endif
 
 #if defined(OPENSSL_SYS_UEFI) && !defined(OPENSSL_RAND_SEED_NONE)
-# error "UEFI only supports seeding NONE"
+#error "UEFI only supports seeding NONE"
 #endif
 
 #if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) \
-    || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) \
+    || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS)  \
     || defined(OPENSSL_SYS_UEFI))
 
-# if defined(OPENSSL_SYS_VOS)
+#if defined(OPENSSL_SYS_VOS)
 
-#  ifndef OPENSSL_RAND_SEED_OS
-#   error "Unsupported seeding method configured; must be os"
-#  endif
+#ifndef OPENSSL_RAND_SEED_OS
+#error "Unsupported seeding method configured; must be os"
+#endif
 
-#  if defined(OPENSSL_SYS_VOS_HPPA) && defined(OPENSSL_SYS_VOS_IA32)
-#   error "Unsupported HP-PA and IA32 at the same time."
-#  endif
-#  if !defined(OPENSSL_SYS_VOS_HPPA) && !defined(OPENSSL_SYS_VOS_IA32)
-#   error "Must have one of HP-PA or IA32"
-#  endif
+#if defined(OPENSSL_SYS_VOS_HPPA) && defined(OPENSSL_SYS_VOS_IA32)
+#error "Unsupported HP-PA and IA32 at the same time."
+#endif
+#if !defined(OPENSSL_SYS_VOS_HPPA) && !defined(OPENSSL_SYS_VOS_IA32)
+#error "Must have one of HP-PA or IA32"
+#endif
 
 /*
  * The following algorithm repeatedly samples the real-time clock (RTC) to
@@ -148,13 +148,13 @@ size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
     size_t bytes_needed;
     struct timespec ts;
     unsigned char v;
-#  ifdef OPENSSL_SYS_VOS_HPPA
+#ifdef OPENSSL_SYS_VOS_HPPA
     long duration;
     extern void s$sleep(long *_duration, short int *_code);
-#  else
+#else
     long long duration;
     extern void s$sleep2(long long *_duration, short int *_code);
-#  endif
+#endif
 
     bytes_needed = ossl_rand_pool_bytes_needed(pool, 4 /*entropy_factor*/);
 
@@ -166,15 +166,15 @@ size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
         for (k = 0; k < 99; k++)
             ts.tv_nsec = random();
 
-#  ifdef OPENSSL_SYS_VOS_HPPA
+#ifdef OPENSSL_SYS_VOS_HPPA
         /* sleep for 1/1024 of a second (976 us).  */
         duration = 1;
         s$sleep(&duration, &code);
-#  else
+#else
         /* sleep for 1/65536 of a second (15 us).  */
         duration = 1;
         s$sleep2(&duration, &code);
-#  endif
+#endif
 
         /* Get wall clock time, take 8 bits. */
         clock_gettime(CLOCK_REALTIME, &ts);
@@ -192,26 +192,25 @@ void ossl_rand_pool_keep_random_devices_open(int keep)
 {
 }
 
-# else
+#else
 
-#  if defined(OPENSSL_RAND_SEED_EGD) && \
-        (defined(OPENSSL_NO_EGD) || !defined(DEVRANDOM_EGD))
-#   error "Seeding uses EGD but EGD is turned off or no device given"
-#  endif
+#if defined(OPENSSL_RAND_SEED_EGD) && (defined(OPENSSL_NO_EGD) || !defined(DEVRANDOM_EGD))
+#error "Seeding uses EGD but EGD is turned off or no device given"
+#endif
 
-#  if defined(OPENSSL_RAND_SEED_DEVRANDOM) && !defined(DEVRANDOM)
-#   error "Seeding uses urandom but DEVRANDOM is not configured"
-#  endif
+#if defined(OPENSSL_RAND_SEED_DEVRANDOM) && !defined(DEVRANDOM)
+#error "Seeding uses urandom but DEVRANDOM is not configured"
+#endif
 
-#  if defined(OPENSSL_RAND_SEED_OS)
-#   if !defined(DEVRANDOM)
-#    error "OS seeding requires DEVRANDOM to be configured"
-#   endif
-#   define OPENSSL_RAND_SEED_GETRANDOM
-#   define OPENSSL_RAND_SEED_DEVRANDOM
-#  endif
+#if defined(OPENSSL_RAND_SEED_OS)
+#if !defined(DEVRANDOM)
+#error "OS seeding requires DEVRANDOM to be configured"
+#endif
+#define OPENSSL_RAND_SEED_GETRANDOM
+#define OPENSSL_RAND_SEED_DEVRANDOM
+#endif
 
-#  if (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(KERN_ARND)
+#if (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(KERN_ARND)
 /*
  * sysctl_random(): Use sysctl() to read a random number from the kernel
  * Returns the number of bytes returned in buf on success, -1 on failure.
@@ -233,7 +232,7 @@ static ssize_t sysctl_random(char *buf, size_t buflen)
      * when the sysctl returns long and we want to request something not a
      * multiple of longs, which should never be the case.
      */
-#if   defined(__FreeBSD__)
+#if defined(__FreeBSD__)
     if (!ossl_assert(buflen % sizeof(long) == 0)) {
         errno = EINVAL;
         return -1;
@@ -247,7 +246,7 @@ static ssize_t sysctl_random(char *buf, size_t buflen)
      * up to 256 bytes.
      * Just return an error on older NetBSD versions.
      */
-#if   defined(__NetBSD__) && __NetBSD_Version__ < 400000000
+#if defined(__NetBSD__) && __NetBSD_Version__ < 400000000
     errno = ENOSYS;
     return -1;
 #endif
@@ -266,63 +265,63 @@ static ssize_t sysctl_random(char *buf, size_t buflen)
 
     return done;
 }
-#  endif
-
-#  if defined(OPENSSL_RAND_SEED_GETRANDOM)
-
-#   if defined(__linux) && !defined(__NR_getrandom)
-#    if defined(__arm__)
-#     define __NR_getrandom    (__NR_SYSCALL_BASE+384)
-#    elif defined(__i386__)
-#     define __NR_getrandom    355
-#    elif defined(__x86_64__)
-#     if defined(__ILP32__)
-#      define __NR_getrandom   (__X32_SYSCALL_BIT + 318)
-#     else
-#      define __NR_getrandom   318
-#     endif
-#    elif defined(__xtensa__)
-#     define __NR_getrandom    338
-#    elif defined(__s390__) || defined(__s390x__)
-#     define __NR_getrandom    349
-#    elif defined(__bfin__)
-#     define __NR_getrandom    389
-#    elif defined(__powerpc__)
-#     define __NR_getrandom    359
-#    elif defined(__mips__) || defined(__mips64)
-#     if _MIPS_SIM == _MIPS_SIM_ABI32
-#      define __NR_getrandom   (__NR_Linux + 353)
-#     elif _MIPS_SIM == _MIPS_SIM_ABI64
-#      define __NR_getrandom   (__NR_Linux + 313)
-#     elif _MIPS_SIM == _MIPS_SIM_NABI32
-#      define __NR_getrandom   (__NR_Linux + 317)
-#     endif
-#    elif defined(__hppa__)
-#     define __NR_getrandom    (__NR_Linux + 339)
-#    elif defined(__sparc__)
-#     define __NR_getrandom    347
-#    elif defined(__ia64__)
-#     define __NR_getrandom    1339
-#    elif defined(__alpha__)
-#     define __NR_getrandom    511
-#    elif defined(__sh__)
-#     if defined(__SH5__)
-#      define __NR_getrandom   373
-#     else
-#      define __NR_getrandom   384
-#     endif
-#    elif defined(__avr32__)
-#     define __NR_getrandom    317
-#    elif defined(__microblaze__)
-#     define __NR_getrandom    385
-#    elif defined(__m68k__)
-#     define __NR_getrandom    352
-#    elif defined(__cris__)
-#     define __NR_getrandom    356
-#    else /* generic (f.e. aarch64, loongarch, loongarch64) */
-#     define __NR_getrandom    278
-#    endif
-#   endif
+#endif
+
+#if defined(OPENSSL_RAND_SEED_GETRANDOM)
+
+#if defined(__linux) && !defined(__NR_getrandom)
+#if defined(__arm__)
+#define __NR_getrandom (__NR_SYSCALL_BASE + 384)
+#elif defined(__i386__)
+#define __NR_getrandom 355
+#elif defined(__x86_64__)
+#if defined(__ILP32__)
+#define __NR_getrandom (__X32_SYSCALL_BIT + 318)
+#else
+#define __NR_getrandom 318
+#endif
+#elif defined(__xtensa__)
+#define __NR_getrandom 338
+#elif defined(__s390__) || defined(__s390x__)
+#define __NR_getrandom 349
+#elif defined(__bfin__)
+#define __NR_getrandom 389
+#elif defined(__powerpc__)
+#define __NR_getrandom 359
+#elif defined(__mips__) || defined(__mips64)
+#if _MIPS_SIM == _MIPS_SIM_ABI32
+#define __NR_getrandom (__NR_Linux + 353)
+#elif _MIPS_SIM == _MIPS_SIM_ABI64
+#define __NR_getrandom (__NR_Linux + 313)
+#elif _MIPS_SIM == _MIPS_SIM_NABI32
+#define __NR_getrandom (__NR_Linux + 317)
+#endif
+#elif defined(__hppa__)
+#define __NR_getrandom (__NR_Linux + 339)
+#elif defined(__sparc__)
+#define __NR_getrandom 347
+#elif defined(__ia64__)
+#define __NR_getrandom 1339
+#elif defined(__alpha__)
+#define __NR_getrandom 511
+#elif defined(__sh__)
+#if defined(__SH5__)
+#define __NR_getrandom 373
+#else
+#define __NR_getrandom 384
+#endif
+#elif defined(__avr32__)
+#define __NR_getrandom 317
+#elif defined(__microblaze__)
+#define __NR_getrandom 385
+#elif defined(__m68k__)
+#define __NR_getrandom 352
+#elif defined(__cris__)
+#define __NR_getrandom 356
+#else /* generic (f.e. aarch64, loongarch, loongarch64) */
+#define __NR_getrandom 278
+#endif
+#endif
 
 /*
  * syscall_random(): Try to get random data using a system call
@@ -352,8 +351,8 @@ static ssize_t syscall_random(void *buf, size_t buflen)
      * Note: Sometimes getentropy() can be provided but not implemented
      * internally. So we need to check errno for ENOSYS
      */
-#  if !defined(__DragonFly__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
-#    if defined(__GNUC__) && __GNUC__>=2 && defined(__ELF__) && !defined(__hpux)
+#if !defined(__DragonFly__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+#if defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__) && !defined(__hpux)
     extern int getentropy(void *buffer, size_t length) __attribute__((weak));
 
     if (getentropy != NULL) {
@@ -362,13 +361,13 @@ static ssize_t syscall_random(void *buf, size_t buflen)
         if (errno != ENOSYS)
             return -1;
     }
-#    elif defined(OPENSSL_APPLE_CRYPTO_RANDOM)
+#elif defined(OPENSSL_APPLE_CRYPTO_RANDOM)
 
     if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess)
-	    return (ssize_t)buflen;
+        return (ssize_t)buflen;
 
     return -1;
-#    else
+#else
     union {
         void *p;
         int (*f)(void *buffer, size_t length);
@@ -383,30 +382,30 @@ static ssize_t syscall_random(void *buf, size_t buflen)
     ERR_pop_to_mark();
     if (p_getentropy.p != NULL)
         return p_getentropy.f(buf, buflen) == 0 ? (ssize_t)buflen : -1;
-#    endif
-#  endif /* !__DragonFly__ && !__NetBSD__ && !__FreeBSD__ */
+#endif
+#endif /* !__DragonFly__ && !__NetBSD__ && !__FreeBSD__ */
 
     /* Linux supports this since version 3.17 */
-#  if defined(__linux) && defined(__NR_getrandom)
+#if defined(__linux) && defined(__NR_getrandom)
     return syscall(__NR_getrandom, buf, buflen, 0);
-#  elif (defined(__DragonFly__)  && __DragonFly_version >= 500700) \
-     || (defined(__NetBSD__) && __NetBSD_Version >= 1000000000) \
-     || (defined(__FreeBSD__) && __FreeBSD_version >= 1200061)
+#elif (defined(__DragonFly__) && __DragonFly_version >= 500700) \
+    || (defined(__NetBSD__) && __NetBSD_Version >= 1000000000)  \
+    || (defined(__FreeBSD__) && __FreeBSD_version >= 1200061)
     return getrandom(buf, buflen, 0);
-#  elif (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(KERN_ARND)
+#elif (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(KERN_ARND)
     return sysctl_random(buf, buflen);
-#  elif defined(__wasi__)
+#elif defined(__wasi__)
     if (getentropy(buf, buflen) == 0)
-      return (ssize_t)buflen;
+        return (ssize_t)buflen;
     return -1;
-#  else
+#else
     errno = ENOSYS;
     return -1;
-#  endif
+#endif
 }
-#  endif    /* defined(OPENSSL_RAND_SEED_GETRANDOM) */
+#endif /* defined(OPENSSL_RAND_SEED_GETRANDOM) */
 
-#  if defined(OPENSSL_RAND_SEED_DEVRANDOM)
+#if defined(OPENSSL_RAND_SEED_DEVRANDOM)
 static const char *random_device_paths[] = { DEVRANDOM };
 static struct random_device {
     int fd;
@@ -417,8 +416,8 @@ static struct random_device {
 } random_devices[OSSL_NELEM(random_device_paths)];
 static int keep_random_devices_open = 1;
 
-#   if defined(__linux) && defined(DEVRANDOM_WAIT) \
-       && defined(OPENSSL_RAND_SEED_GETRANDOM)
+#if defined(__linux) && defined(DEVRANDOM_WAIT) \
+    && defined(OPENSSL_RAND_SEED_GETRANDOM)
 static void *shm_addr;
 
 static void cleanup_shm(void)
@@ -470,16 +469,18 @@ static int wait_random_seeded(void)
                     FD_ZERO(&fds);
                     FD_SET(fd, &fds);
                     while ((r = select(fd + 1, &fds, NULL, NULL, NULL)) < 0
-                           && errno == EINTR);
+                        && errno == EINTR)
+                        ;
                 } else {
-                    while ((r = read(fd, &c, 1)) < 0 && errno == EINTR);
+                    while ((r = read(fd, &c, 1)) < 0 && errno == EINTR)
+                        ;
                 }
                 close(fd);
                 if (r == 1) {
                     seeded = 1;
                     /* Create the shared memory indicator */
                     shm_id = shmget(OPENSSL_RAND_SEED_DEVRANDOM_SHM_ID, 1,
-                                    IPC_CREAT | S_IRUSR | S_IRGRP | S_IROTH);
+                        IPC_CREAT | S_IRUSR | S_IRGRP | S_IROTH);
                 }
             }
         }
@@ -496,12 +497,12 @@ static int wait_random_seeded(void)
     }
     return seeded;
 }
-#   else /* defined __linux && DEVRANDOM_WAIT && OPENSSL_RAND_SEED_GETRANDOM */
+#else /* defined __linux && DEVRANDOM_WAIT && OPENSSL_RAND_SEED_GETRANDOM */
 static int wait_random_seeded(void)
 {
     return 1;
 }
-#   endif
+#endif
 
 /*
  * Verify that the file descriptor associated with the random source is
@@ -515,11 +516,11 @@ static int check_random_device(struct random_device *rd)
     struct stat st;
 
     return rd->fd != -1
-           && fstat(rd->fd, &st) != -1
-           && rd->dev == st.st_dev
-           && rd->ino == st.st_ino
-           && ((rd->mode ^ st.st_mode) & ~(S_IRWXU | S_IRWXG | S_IRWXO)) == 0
-           && rd->rdev == st.st_rdev;
+        && fstat(rd->fd, &st) != -1
+        && rd->dev == st.st_dev
+        && rd->ino == st.st_ino
+        && ((rd->mode ^ st.st_mode) & ~(S_IRWXU | S_IRWXG | S_IRWXO)) == 0
+        && rd->rdev == st.st_rdev;
 }
 
 /*
@@ -590,7 +591,7 @@ void ossl_rand_pool_keep_random_devices_open(int keep)
     keep_random_devices_open = keep;
 }
 
-#  else     /* !defined(OPENSSL_RAND_SEED_DEVRANDOM) */
+#else /* !defined(OPENSSL_RAND_SEED_DEVRANDOM) */
 
 int ossl_rand_pool_init(void)
 {
@@ -605,7 +606,7 @@ void ossl_rand_pool_keep_random_devices_open(int keep)
 {
 }
 
-#  endif    /* defined(OPENSSL_RAND_SEED_DEVRANDOM) */
+#endif /* defined(OPENSSL_RAND_SEED_DEVRANDOM) */
 
 /*
  * Try the various seeding methods in turn, exit when successful.
@@ -626,14 +627,14 @@ void ossl_rand_pool_keep_random_devices_open(int keep)
  */
 size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
 {
-#  if defined(OPENSSL_RAND_SEED_NONE)
+#if defined(OPENSSL_RAND_SEED_NONE)
     return ossl_rand_pool_entropy_available(pool);
-#  else
+#else
     size_t entropy_available = 0;
 
-    (void)entropy_available;    /* avoid compiler warning */
+    (void)entropy_available; /* avoid compiler warning */
 
-#   if defined(OPENSSL_RAND_SEED_GETRANDOM)
+#if defined(OPENSSL_RAND_SEED_GETRANDOM)
     {
         size_t bytes_needed;
         unsigned char *buffer;
@@ -657,9 +658,9 @@ size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
     entropy_available = ossl_rand_pool_entropy_available(pool);
     if (entropy_available > 0)
         return entropy_available;
-#   endif
+#endif
 
-#   if defined(OPENSSL_RAND_SEED_DEVRANDOM)
+#if defined(OPENSSL_RAND_SEED_DEVRANDOM)
     if (wait_random_seeded()) {
         size_t bytes_needed;
         unsigned char *buffer;
@@ -667,7 +668,7 @@ size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
 
         bytes_needed = ossl_rand_pool_bytes_needed(pool, 1 /*entropy_factor*/);
         for (i = 0; bytes_needed > 0 && i < OSSL_NELEM(random_device_paths);
-             i++) {
+            i++) {
             ssize_t bytes = 0;
             /* Maximum number of consecutive unsuccessful attempts */
             int attempts = 3;
@@ -697,21 +698,21 @@ size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
         if (entropy_available > 0)
             return entropy_available;
     }
-#   endif
+#endif
 
-#   if defined(OPENSSL_RAND_SEED_RDTSC)
+#if defined(OPENSSL_RAND_SEED_RDTSC)
     entropy_available = ossl_prov_acquire_entropy_from_tsc(pool);
     if (entropy_available > 0)
         return entropy_available;
-#   endif
+#endif
 
-#   if defined(OPENSSL_RAND_SEED_RDCPU)
+#if defined(OPENSSL_RAND_SEED_RDCPU)
     entropy_available = ossl_prov_acquire_entropy_from_cpu(pool);
     if (entropy_available > 0)
         return entropy_available;
-#   endif
+#endif
 
-#   if defined(OPENSSL_RAND_SEED_EGD)
+#if defined(OPENSSL_RAND_SEED_EGD)
     {
         static const char *paths[] = { DEVRANDOM_EGD, NULL };
         size_t bytes_needed;
@@ -725,7 +726,7 @@ size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
 
             buffer = ossl_rand_pool_add_begin(pool, bytes_needed);
             num = RAND_query_egd_bytes(paths[i],
-                                       buffer, (int)bytes_needed);
+                buffer, (int)bytes_needed);
             if (num == (int)bytes_needed)
                 bytes = bytes_needed;
 
@@ -736,16 +737,16 @@ size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
         if (entropy_available > 0)
             return entropy_available;
     }
-#   endif
+#endif
 
     return ossl_rand_pool_entropy_available(pool);
-#  endif
+#endif
 }
-# endif
+#endif
 #endif
 
 #if (defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_SYS_VXWORKS)) \
-     || defined(__DJGPP__)
+    || defined(__DJGPP__)
 int ossl_pool_add_nonce_data(RAND_POOL *pool)
 {
     struct {
@@ -778,25 +779,25 @@ int ossl_pool_add_nonce_data(RAND_POOL *pool)
  */
 static uint64_t get_time_stamp(void)
 {
-# if defined(OSSL_POSIX_TIMER_OKAY)
+#if defined(OSSL_POSIX_TIMER_OKAY)
     {
         struct timespec ts;
 
         if (clock_gettime(CLOCK_REALTIME, &ts) == 0)
             return TWO32TO64(ts.tv_sec, ts.tv_nsec);
     }
-# endif
-# if defined(__unix__) \
-     || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L)
+#endif
+#if defined(__unix__) \
+    || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L)
     {
         struct timeval tv;
 
         if (gettimeofday(&tv, NULL) == 0)
             return TWO32TO64(tv.tv_sec, tv.tv_usec);
     }
-# endif
+#endif
     return time(NULL);
 }
 
-#endif /* (defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_SYS_VXWORKS))
+#endif /* (defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_SYS_VXWORKS)) \
           || defined(__DJGPP__) */
diff --git a/providers/implementations/rands/seeding/rand_vms.c b/providers/implementations/rands/seeding/rand_vms.c
index 4ff879491a6b9..d57c5cb57f2f5 100644
--- a/providers/implementations/rands/seeding/rand_vms.c
+++ b/providers/implementations/rands/seeding/rand_vms.c
@@ -9,7 +9,7 @@
 
 #include "internal/e_os.h"
 
-#define __NEW_STARLET 1         /* New starlet definitions since VMS 7.0 */
+#define __NEW_STARLET 1 /* New starlet definitions since VMS 7.0 */
 #include <unistd.h>
 #include "internal/cryptlib.h"
 #include "internal/nelem.h"
@@ -30,13 +30,13 @@
 #include <iledef.h>
 #include <lib$routines.h>
 #ifdef __DECC
-# pragma message disable DOLLARID
+#pragma message disable DOLLARID
 #endif
 
-#include <dlfcn.h>              /* SYS$GET_ENTROPY presence */
+#include <dlfcn.h> /* SYS$GET_ENTROPY presence */
 
 #ifndef OPENSSL_RAND_SEED_OS
-# error "Unsupported seeding method configured; must be os"
+#error "Unsupported seeding method configured; must be os"
 #endif
 
 /*
@@ -50,221 +50,221 @@
 
 /* We need to make sure we have the right size pointer in some cases */
 #if __INITIAL_POINTER_SIZE == 64
-# pragma pointer_size save
-# pragma pointer_size 32
+#pragma pointer_size save
+#pragma pointer_size 32
 #endif
 typedef uint32_t *uint32_t__ptr32;
 #if __INITIAL_POINTER_SIZE == 64
-# pragma pointer_size restore
+#pragma pointer_size restore
 #endif
 
 struct item_st {
-    short length, code;         /* length is number of bytes */
+    short length, code; /* length is number of bytes */
 };
 
 static const struct item_st DVI_item_data[] = {
-    {4,   DVI$_ERRCNT},
-    {4,   DVI$_REFCNT},
+    { 4, DVI$_ERRCNT },
+    { 4, DVI$_REFCNT },
 };
 
 static const struct item_st JPI_item_data[] = {
-    {4,   JPI$_BUFIO},
-    {4,   JPI$_CPUTIM},
-    {4,   JPI$_DIRIO},
-    {4,   JPI$_IMAGECOUNT},
-    {4,   JPI$_PAGEFLTS},
-    {4,   JPI$_PID},
-    {4,   JPI$_PPGCNT},
-    {4,   JPI$_WSPEAK},
+    { 4, JPI$_BUFIO },
+    { 4, JPI$_CPUTIM },
+    { 4, JPI$_DIRIO },
+    { 4, JPI$_IMAGECOUNT },
+    { 4, JPI$_PAGEFLTS },
+    { 4, JPI$_PID },
+    { 4, JPI$_PPGCNT },
+    { 4, JPI$_WSPEAK },
     /*
      * Note: the direct result is just a 32-bit address.  However, it points
      * to a list of 4 32-bit words, so we make extra space for them so we can
      * do in-place replacement of values
      */
-    {16,  JPI$_FINALEXC},
+    { 16, JPI$_FINALEXC },
 };
 
 static const struct item_st JPI_item_data_64bit[] = {
-    {8,   JPI$_LAST_LOGIN_I},
-    {8,   JPI$_LOGINTIM},
+    { 8, JPI$_LAST_LOGIN_I },
+    { 8, JPI$_LOGINTIM },
 };
 
 static const struct item_st RMI_item_data[] = {
-    {4,   RMI$_COLPG},
-    {4,   RMI$_MWAIT},
-    {4,   RMI$_CEF},
-    {4,   RMI$_PFW},
-    {4,   RMI$_LEF},
-    {4,   RMI$_LEFO},
-    {4,   RMI$_HIB},
-    {4,   RMI$_HIBO},
-    {4,   RMI$_SUSP},
-    {4,   RMI$_SUSPO},
-    {4,   RMI$_FPG},
-    {4,   RMI$_COM},
-    {4,   RMI$_COMO},
-    {4,   RMI$_CUR},
+    { 4, RMI$_COLPG },
+    { 4, RMI$_MWAIT },
+    { 4, RMI$_CEF },
+    { 4, RMI$_PFW },
+    { 4, RMI$_LEF },
+    { 4, RMI$_LEFO },
+    { 4, RMI$_HIB },
+    { 4, RMI$_HIBO },
+    { 4, RMI$_SUSP },
+    { 4, RMI$_SUSPO },
+    { 4, RMI$_FPG },
+    { 4, RMI$_COM },
+    { 4, RMI$_COMO },
+    { 4, RMI$_CUR },
 #if defined __alpha
-    {4,   RMI$_FRLIST},
-    {4,   RMI$_MODLIST},
+    { 4, RMI$_FRLIST },
+    { 4, RMI$_MODLIST },
 #endif
-    {4,   RMI$_FAULTS},
-    {4,   RMI$_PREADS},
-    {4,   RMI$_PWRITES},
-    {4,   RMI$_PWRITIO},
-    {4,   RMI$_PREADIO},
-    {4,   RMI$_GVALFLTS},
-    {4,   RMI$_WRTINPROG},
-    {4,   RMI$_FREFLTS},
-    {4,   RMI$_DZROFLTS},
-    {4,   RMI$_SYSFAULTS},
-    {4,   RMI$_ISWPCNT},
-    {4,   RMI$_DIRIO},
-    {4,   RMI$_BUFIO},
-    {4,   RMI$_MBREADS},
-    {4,   RMI$_MBWRITES},
-    {4,   RMI$_LOGNAM},
-    {4,   RMI$_FCPCALLS},
-    {4,   RMI$_FCPREAD},
-    {4,   RMI$_FCPWRITE},
-    {4,   RMI$_FCPCACHE},
-    {4,   RMI$_FCPCPU},
-    {4,   RMI$_FCPHIT},
-    {4,   RMI$_FCPSPLIT},
-    {4,   RMI$_FCPFAULT},
-    {4,   RMI$_ENQNEW},
-    {4,   RMI$_ENQCVT},
-    {4,   RMI$_DEQ},
-    {4,   RMI$_BLKAST},
-    {4,   RMI$_ENQWAIT},
-    {4,   RMI$_ENQNOTQD},
-    {4,   RMI$_DLCKSRCH},
-    {4,   RMI$_DLCKFND},
-    {4,   RMI$_NUMLOCKS},
-    {4,   RMI$_NUMRES},
-    {4,   RMI$_ARRLOCPK},
-    {4,   RMI$_DEPLOCPK},
-    {4,   RMI$_ARRTRAPK},
-    {4,   RMI$_TRCNGLOS},
-    {4,   RMI$_RCVBUFFL},
-    {4,   RMI$_ENQNEWLOC},
-    {4,   RMI$_ENQNEWIN},
-    {4,   RMI$_ENQNEWOUT},
-    {4,   RMI$_ENQCVTLOC},
-    {4,   RMI$_ENQCVTIN},
-    {4,   RMI$_ENQCVTOUT},
-    {4,   RMI$_DEQLOC},
-    {4,   RMI$_DEQIN},
-    {4,   RMI$_DEQOUT},
-    {4,   RMI$_BLKLOC},
-    {4,   RMI$_BLKIN},
-    {4,   RMI$_BLKOUT},
-    {4,   RMI$_DIRIN},
-    {4,   RMI$_DIROUT},
-    /* We currently get a fault when trying these */
+    { 4, RMI$_FAULTS },
+    { 4, RMI$_PREADS },
+    { 4, RMI$_PWRITES },
+    { 4, RMI$_PWRITIO },
+    { 4, RMI$_PREADIO },
+    { 4, RMI$_GVALFLTS },
+    { 4, RMI$_WRTINPROG },
+    { 4, RMI$_FREFLTS },
+    { 4, RMI$_DZROFLTS },
+    { 4, RMI$_SYSFAULTS },
+    { 4, RMI$_ISWPCNT },
+    { 4, RMI$_DIRIO },
+    { 4, RMI$_BUFIO },
+    { 4, RMI$_MBREADS },
+    { 4, RMI$_MBWRITES },
+    { 4, RMI$_LOGNAM },
+    { 4, RMI$_FCPCALLS },
+    { 4, RMI$_FCPREAD },
+    { 4, RMI$_FCPWRITE },
+    { 4, RMI$_FCPCACHE },
+    { 4, RMI$_FCPCPU },
+    { 4, RMI$_FCPHIT },
+    { 4, RMI$_FCPSPLIT },
+    { 4, RMI$_FCPFAULT },
+    { 4, RMI$_ENQNEW },
+    { 4, RMI$_ENQCVT },
+    { 4, RMI$_DEQ },
+    { 4, RMI$_BLKAST },
+    { 4, RMI$_ENQWAIT },
+    { 4, RMI$_ENQNOTQD },
+    { 4, RMI$_DLCKSRCH },
+    { 4, RMI$_DLCKFND },
+    { 4, RMI$_NUMLOCKS },
+    { 4, RMI$_NUMRES },
+    { 4, RMI$_ARRLOCPK },
+    { 4, RMI$_DEPLOCPK },
+    { 4, RMI$_ARRTRAPK },
+    { 4, RMI$_TRCNGLOS },
+    { 4, RMI$_RCVBUFFL },
+    { 4, RMI$_ENQNEWLOC },
+    { 4, RMI$_ENQNEWIN },
+    { 4, RMI$_ENQNEWOUT },
+    { 4, RMI$_ENQCVTLOC },
+    { 4, RMI$_ENQCVTIN },
+    { 4, RMI$_ENQCVTOUT },
+    { 4, RMI$_DEQLOC },
+    { 4, RMI$_DEQIN },
+    { 4, RMI$_DEQOUT },
+    { 4, RMI$_BLKLOC },
+    { 4, RMI$_BLKIN },
+    { 4, RMI$_BLKOUT },
+    { 4, RMI$_DIRIN },
+    { 4, RMI$_DIROUT },
+/* We currently get a fault when trying these */
 #if 0
     {140, RMI$_MSCP_EVERYTHING},   /* 35 32-bit words */
     {152, RMI$_DDTM_ALL},          /* 38 32-bit words */
     {80,  RMI$_TMSCP_EVERYTHING}   /* 20 32-bit words */
 #endif
-    {4,   RMI$_LPZ_PAGCNT},
-    {4,   RMI$_LPZ_HITS},
-    {4,   RMI$_LPZ_MISSES},
-    {4,   RMI$_LPZ_EXPCNT},
-    {4,   RMI$_LPZ_ALLOCF},
-    {4,   RMI$_LPZ_ALLOC2},
-    {4,   RMI$_ACCESS},
-    {4,   RMI$_ALLOC},
-    {4,   RMI$_FCPCREATE},
-    {4,   RMI$_VOLWAIT},
-    {4,   RMI$_FCPTURN},
-    {4,   RMI$_FCPERASE},
-    {4,   RMI$_OPENS},
-    {4,   RMI$_FIDHIT},
-    {4,   RMI$_FIDMISS},
-    {4,   RMI$_FILHDR_HIT},
-    {4,   RMI$_DIRFCB_HIT},
-    {4,   RMI$_DIRFCB_MISS},
-    {4,   RMI$_DIRDATA_HIT},
-    {4,   RMI$_EXTHIT},
-    {4,   RMI$_EXTMISS},
-    {4,   RMI$_QUOHIT},
-    {4,   RMI$_QUOMISS},
-    {4,   RMI$_STORAGMAP_HIT},
-    {4,   RMI$_VOLLCK},
-    {4,   RMI$_SYNCHLCK},
-    {4,   RMI$_SYNCHWAIT},
-    {4,   RMI$_ACCLCK},
-    {4,   RMI$_XQPCACHEWAIT},
-    {4,   RMI$_DIRDATA_MISS},
-    {4,   RMI$_FILHDR_MISS},
-    {4,   RMI$_STORAGMAP_MISS},
-    {4,   RMI$_PROCCNTMAX},
-    {4,   RMI$_PROCBATCNT},
-    {4,   RMI$_PROCINTCNT},
-    {4,   RMI$_PROCNETCNT},
-    {4,   RMI$_PROCSWITCHCNT},
-    {4,   RMI$_PROCBALSETCNT},
-    {4,   RMI$_PROCLOADCNT},
-    {4,   RMI$_BADFLTS},
-    {4,   RMI$_EXEFAULTS},
-    {4,   RMI$_HDRINSWAPS},
-    {4,   RMI$_HDROUTSWAPS},
-    {4,   RMI$_IOPAGCNT},
-    {4,   RMI$_ISWPCNTPG},
-    {4,   RMI$_OSWPCNT},
-    {4,   RMI$_OSWPCNTPG},
-    {4,   RMI$_RDFAULTS},
-    {4,   RMI$_TRANSFLTS},
-    {4,   RMI$_WRTFAULTS},
+    { 4, RMI$_LPZ_PAGCNT },
+    { 4, RMI$_LPZ_HITS },
+    { 4, RMI$_LPZ_MISSES },
+    { 4, RMI$_LPZ_EXPCNT },
+    { 4, RMI$_LPZ_ALLOCF },
+    { 4, RMI$_LPZ_ALLOC2 },
+    { 4, RMI$_ACCESS },
+    { 4, RMI$_ALLOC },
+    { 4, RMI$_FCPCREATE },
+    { 4, RMI$_VOLWAIT },
+    { 4, RMI$_FCPTURN },
+    { 4, RMI$_FCPERASE },
+    { 4, RMI$_OPENS },
+    { 4, RMI$_FIDHIT },
+    { 4, RMI$_FIDMISS },
+    { 4, RMI$_FILHDR_HIT },
+    { 4, RMI$_DIRFCB_HIT },
+    { 4, RMI$_DIRFCB_MISS },
+    { 4, RMI$_DIRDATA_HIT },
+    { 4, RMI$_EXTHIT },
+    { 4, RMI$_EXTMISS },
+    { 4, RMI$_QUOHIT },
+    { 4, RMI$_QUOMISS },
+    { 4, RMI$_STORAGMAP_HIT },
+    { 4, RMI$_VOLLCK },
+    { 4, RMI$_SYNCHLCK },
+    { 4, RMI$_SYNCHWAIT },
+    { 4, RMI$_ACCLCK },
+    { 4, RMI$_XQPCACHEWAIT },
+    { 4, RMI$_DIRDATA_MISS },
+    { 4, RMI$_FILHDR_MISS },
+    { 4, RMI$_STORAGMAP_MISS },
+    { 4, RMI$_PROCCNTMAX },
+    { 4, RMI$_PROCBATCNT },
+    { 4, RMI$_PROCINTCNT },
+    { 4, RMI$_PROCNETCNT },
+    { 4, RMI$_PROCSWITCHCNT },
+    { 4, RMI$_PROCBALSETCNT },
+    { 4, RMI$_PROCLOADCNT },
+    { 4, RMI$_BADFLTS },
+    { 4, RMI$_EXEFAULTS },
+    { 4, RMI$_HDRINSWAPS },
+    { 4, RMI$_HDROUTSWAPS },
+    { 4, RMI$_IOPAGCNT },
+    { 4, RMI$_ISWPCNTPG },
+    { 4, RMI$_OSWPCNT },
+    { 4, RMI$_OSWPCNTPG },
+    { 4, RMI$_RDFAULTS },
+    { 4, RMI$_TRANSFLTS },
+    { 4, RMI$_WRTFAULTS },
 #if defined __alpha
-    {4,   RMI$_USERPAGES},
+    { 4, RMI$_USERPAGES },
 #endif
-    {4,   RMI$_VMSPAGES},
-    {4,   RMI$_TTWRITES},
-    {4,   RMI$_BUFOBJPAG},
-    {4,   RMI$_BUFOBJPAGPEAK},
-    {4,   RMI$_BUFOBJPAGS01},
-    {4,   RMI$_BUFOBJPAGS2},
-    {4,   RMI$_BUFOBJPAGMAXS01},
-    {4,   RMI$_BUFOBJPAGMAXS2},
-    {4,   RMI$_BUFOBJPAGPEAKS01},
-    {4,   RMI$_BUFOBJPAGPEAKS2},
-    {4,   RMI$_BUFOBJPGLTMAXS01},
-    {4,   RMI$_BUFOBJPGLTMAXS2},
-    {4,   RMI$_DLCK_INCMPLT},
-    {4,   RMI$_DLCKMSGS_IN},
-    {4,   RMI$_DLCKMSGS_OUT},
-    {4,   RMI$_MCHKERRS},
-    {4,   RMI$_MEMERRS},
+    { 4, RMI$_VMSPAGES },
+    { 4, RMI$_TTWRITES },
+    { 4, RMI$_BUFOBJPAG },
+    { 4, RMI$_BUFOBJPAGPEAK },
+    { 4, RMI$_BUFOBJPAGS01 },
+    { 4, RMI$_BUFOBJPAGS2 },
+    { 4, RMI$_BUFOBJPAGMAXS01 },
+    { 4, RMI$_BUFOBJPAGMAXS2 },
+    { 4, RMI$_BUFOBJPAGPEAKS01 },
+    { 4, RMI$_BUFOBJPAGPEAKS2 },
+    { 4, RMI$_BUFOBJPGLTMAXS01 },
+    { 4, RMI$_BUFOBJPGLTMAXS2 },
+    { 4, RMI$_DLCK_INCMPLT },
+    { 4, RMI$_DLCKMSGS_IN },
+    { 4, RMI$_DLCKMSGS_OUT },
+    { 4, RMI$_MCHKERRS },
+    { 4, RMI$_MEMERRS },
 };
 
 static const struct item_st RMI_item_data_64bit[] = {
 #if defined __ia64
-    {8,   RMI$_FRLIST},
-    {8,   RMI$_MODLIST},
+    { 8, RMI$_FRLIST },
+    { 8, RMI$_MODLIST },
 #endif
-    {8,   RMI$_LCKMGR_REQCNT},
-    {8,   RMI$_LCKMGR_REQTIME},
-    {8,   RMI$_LCKMGR_SPINCNT},
-    {8,   RMI$_LCKMGR_SPINTIME},
-    {8,   RMI$_CPUINTSTK},
-    {8,   RMI$_CPUMPSYNCH},
-    {8,   RMI$_CPUKERNEL},
-    {8,   RMI$_CPUEXEC},
-    {8,   RMI$_CPUSUPER},
-    {8,   RMI$_CPUUSER},
+    { 8, RMI$_LCKMGR_REQCNT },
+    { 8, RMI$_LCKMGR_REQTIME },
+    { 8, RMI$_LCKMGR_SPINCNT },
+    { 8, RMI$_LCKMGR_SPINTIME },
+    { 8, RMI$_CPUINTSTK },
+    { 8, RMI$_CPUMPSYNCH },
+    { 8, RMI$_CPUKERNEL },
+    { 8, RMI$_CPUEXEC },
+    { 8, RMI$_CPUSUPER },
+    { 8, RMI$_CPUUSER },
 #if defined __ia64
-    {8,   RMI$_USERPAGES},
+    { 8, RMI$_USERPAGES },
 #endif
-    {8,   RMI$_TQETOTAL},
-    {8,   RMI$_TQESYSUB},
-    {8,   RMI$_TQEUSRTIMR},
-    {8,   RMI$_TQEUSRWAKE},
+    { 8, RMI$_TQETOTAL },
+    { 8, RMI$_TQESYSUB },
+    { 8, RMI$_TQEUSRTIMR },
+    { 8, RMI$_TQEUSRWAKE },
 };
 
 static const struct item_st SYI_item_data[] = {
-    {4,   SYI$_PAGEFILE_FREE},
+    { 4, SYI$_PAGEFILE_FREE },
 };
 
 /*
@@ -281,9 +281,9 @@ static const struct item_st SYI_item_data[] = {
  * Returns the number of elements used in databuffer
  */
 static size_t prepare_item_list(const struct item_st *items_input,
-                                size_t items_input_num,
-                                ILE3 *items,
-                                uint32_t__ptr32 databuffer)
+    size_t items_input_num,
+    ILE3 *items,
+    uint32_t__ptr32 databuffer)
 {
     size_t data_sz = 0;
 
@@ -340,7 +340,7 @@ static void massage_JPI(ILE3 *items)
  * For the moment, we assume about 0.05 entropy bits per data bit, or 1
  * bit of entropy per 20 data bits.
  */
-#define ENTROPY_FACTOR  20
+#define ENTROPY_FACTOR 20
 
 size_t data_collect_method(RAND_POOL *pool)
 {
@@ -354,12 +354,12 @@ size_t data_collect_method(RAND_POOL *pool)
         /* This ensures buffer starts at 64 bit boundary */
         uint64_t dummy;
         uint32_t buffer[OSSL_NELEM(JPI_item_data_64bit) * 2
-                        + OSSL_NELEM(RMI_item_data_64bit) * 2
-                        + OSSL_NELEM(DVI_item_data)
-                        + OSSL_NELEM(JPI_item_data)
-                        + OSSL_NELEM(RMI_item_data)
-                        + OSSL_NELEM(SYI_item_data)
-                        + 4 /* For JPI$_FINALEXC */];
+            + OSSL_NELEM(RMI_item_data_64bit) * 2
+            + OSSL_NELEM(DVI_item_data)
+            + OSSL_NELEM(JPI_item_data)
+            + OSSL_NELEM(RMI_item_data)
+            + OSSL_NELEM(SYI_item_data)
+            + 4 /* For JPI$_FINALEXC */];
     } data;
     size_t total_elems = 0;
     size_t total_length = 0;
@@ -367,21 +367,19 @@ size_t data_collect_method(RAND_POOL *pool)
     size_t bytes_remaining = ossl_rand_pool_bytes_remaining(pool);
 
     /* Take all the 64-bit items first, to ensure proper alignment of data */
-    total_elems +=
-        prepare_item_list(JPI_item_data_64bit, OSSL_NELEM(JPI_item_data_64bit),
-                          JPI_items_64bit, &data.buffer[total_elems]);
-    total_elems +=
-        prepare_item_list(RMI_item_data_64bit, OSSL_NELEM(RMI_item_data_64bit),
-                          RMI_items_64bit, &data.buffer[total_elems]);
+    total_elems += prepare_item_list(JPI_item_data_64bit, OSSL_NELEM(JPI_item_data_64bit),
+        JPI_items_64bit, &data.buffer[total_elems]);
+    total_elems += prepare_item_list(RMI_item_data_64bit, OSSL_NELEM(RMI_item_data_64bit),
+        RMI_items_64bit, &data.buffer[total_elems]);
     /* Now the 32-bit items */
     total_elems += prepare_item_list(DVI_item_data, OSSL_NELEM(DVI_item_data),
-                                     DVI_items, &data.buffer[total_elems]);
+        DVI_items, &data.buffer[total_elems]);
     total_elems += prepare_item_list(JPI_item_data, OSSL_NELEM(JPI_item_data),
-                                     JPI_items, &data.buffer[total_elems]);
+        JPI_items, &data.buffer[total_elems]);
     total_elems += prepare_item_list(RMI_item_data, OSSL_NELEM(RMI_item_data),
-                                     RMI_items, &data.buffer[total_elems]);
+        RMI_items, &data.buffer[total_elems]);
     total_elems += prepare_item_list(SYI_item_data, OSSL_NELEM(SYI_item_data),
-                                     SYI_items, &data.buffer[total_elems]);
+        SYI_items, &data.buffer[total_elems]);
     total_length = total_elems * sizeof(data.buffer[0]);
 
     /* Fill data.buffer with various info bits from this process */
@@ -392,7 +390,8 @@ size_t data_collect_method(RAND_POOL *pool)
         $DESCRIPTOR(SYSDEVICE, "SYS$SYSDEVICE:");
 
         if ((status = sys$getdviw(EFN$C_ENF, 0, &SYSDEVICE, DVI_items,
-                                  0, 0, 0, 0, 0)) != SS$_NORMAL) {
+                 0, 0, 0, 0, 0))
+            != SS$_NORMAL) {
             lib$signal(status);
             return 0;
         }
@@ -458,8 +457,8 @@ size_t data_collect_method(RAND_POOL *pool)
      */
     if (!ossl_assert(total_length >= bytes_needed)) {
         ERR_raise_data(ERR_LIB_RAND, RAND_R_RANDOM_POOL_UNDERFLOW,
-                       "Needed: %zu, Available: %zu",
-                       bytes_needed, total_length);
+            "Needed: %zu, Available: %zu",
+            bytes_needed, total_length);
         return 0;
     }
 
@@ -471,7 +470,7 @@ size_t data_collect_method(RAND_POOL *pool)
 
     /* We give the pessimistic value for the amount of entropy */
     ossl_rand_pool_add(pool, (unsigned char *)data.buffer, total_length,
-                       8 * total_length / ENTROPY_FACTOR);
+        8 * total_length / ENTROPY_FACTOR);
     return ossl_rand_pool_entropy_available(pool);
 }
 
@@ -510,10 +509,9 @@ size_t get_entropy_method(RAND_POOL *pool)
     uint32_t status;
 
     for (bytes_needed = ossl_rand_pool_bytes_needed(pool, 1);
-         bytes_needed > 0;
-         bytes_needed -= bytes_to_get) {
-        bytes_to_get =
-            bytes_needed > sizeof(buffer) ? sizeof(buffer) : bytes_needed;
+        bytes_needed > 0;
+        bytes_needed -= bytes_to_get) {
+        bytes_to_get = bytes_needed > sizeof(buffer) ? sizeof(buffer) : bytes_needed;
 
         status = get_entropy_address(buffer, bytes_to_get);
         if (status == SS$_RETRY) {
@@ -590,7 +588,7 @@ int ossl_pool_add_nonce_data(RAND_POOL *pool)
     data.pid = getpid();
     data.tid = CRYPTO_THREAD_get_current_id();
     data.seq = 0;
-    sys$gettim((void*)&data.time);
+    sys$gettim((void *)&data.time);
 
     if (data.time == last_time) {
         data.seq = ++last_seq;
diff --git a/providers/implementations/rands/seeding/rand_vxworks.c b/providers/implementations/rands/seeding/rand_vxworks.c
index 64acf6903f9c0..c9b4e9a50590d 100644
--- a/providers/implementations/rands/seeding/rand_vxworks.c
+++ b/providers/implementations/rands/seeding/rand_vxworks.c
@@ -19,19 +19,19 @@
 
 #if defined(OPENSSL_RAND_SEED_NONE)
 /* none means none */
-# undef OPENSSL_RAND_SEED_OS
+#undef OPENSSL_RAND_SEED_OS
 #endif
 
 #if defined(OPENSSL_RAND_SEED_OS)
-# if _WRS_VXWORKS_MAJOR >= 7
-#   define RAND_SEED_VXRANDLIB
-# else
-#   error "VxWorks <7 only support RAND_SEED_NONE"
-# endif
+#if _WRS_VXWORKS_MAJOR >= 7
+#define RAND_SEED_VXRANDLIB
+#else
+#error "VxWorks <7 only support RAND_SEED_NONE"
+#endif
 #endif
 
 #if defined(RAND_SEED_VXRANDLIB)
-# include <randomNumGen.h>
+#include <randomNumGen.h>
 #endif
 
 /* Macro to convert two thirty two bit values into a sixty four bit one */
@@ -115,7 +115,7 @@ size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
             RANDOM_NUM_GEN_STATUS status = randStatus();
 
             if ((status == RANDOM_NUM_GEN_ENOUGH_ENTROPY)
-                    || (status == RANDOM_NUM_GEN_MAX_ENTROPY)) {
+                || (status == RANDOM_NUM_GEN_MAX_ENTROPY)) {
                 result = randBytes(buffer, bytes_needed);
                 if (result == OK)
                     ossl_rand_pool_add_end(pool, bytes_needed, 8 * bytes_needed);
diff --git a/providers/implementations/rands/seeding/rand_win.c b/providers/implementations/rands/seeding/rand_win.c
index ee2d3e4d7f610..323a579ac45da 100644
--- a/providers/implementations/rands/seeding/rand_win.c
+++ b/providers/implementations/rands/seeding/rand_win.c
@@ -15,64 +15,64 @@
 
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
 
-# ifndef OPENSSL_RAND_SEED_OS
-#  error "Unsupported seeding method configured; must be os"
-# endif
+#ifndef OPENSSL_RAND_SEED_OS
+#error "Unsupported seeding method configured; must be os"
+#endif
 
-# include <windows.h>
+#include <windows.h>
 /* On Windows Vista or higher use BCrypt instead of the legacy CryptoAPI */
-# if defined(_MSC_VER) && _MSC_VER > 1500 /* 1500 = Visual Studio 2008 */ \
-     && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600
-#  define USE_BCRYPTGENRANDOM
-# endif
-
-# ifdef USE_BCRYPTGENRANDOM
-#  include <bcrypt.h>
-#  ifdef _MSC_VER
-#   pragma comment(lib, "bcrypt.lib")
-#  endif
-#  ifndef STATUS_SUCCESS
-#   define STATUS_SUCCESS ((NTSTATUS)0x00000000L)
-#  endif
-# else
-#  include <wincrypt.h>
+#if defined(_MSC_VER) && _MSC_VER > 1500 /* 1500 = Visual Studio 2008 */ \
+    && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600
+#define USE_BCRYPTGENRANDOM
+#endif
+
+#ifdef USE_BCRYPTGENRANDOM
+#include <bcrypt.h>
+#ifdef _MSC_VER
+#pragma comment(lib, "bcrypt.lib")
+#endif
+#ifndef STATUS_SUCCESS
+#define STATUS_SUCCESS ((NTSTATUS)0x00000000L)
+#endif
+#else
+#include <wincrypt.h>
 /*
  * Intel hardware RNG CSP -- available from
  * http://developer.intel.com/design/security/rng/redist_license.htm
  */
-#  define PROV_INTEL_SEC 22
-#  define INTEL_DEF_PROV L"Intel Hardware Cryptographic Service Provider"
-# endif
+#define PROV_INTEL_SEC 22
+#define INTEL_DEF_PROV L"Intel Hardware Cryptographic Service Provider"
+#endif
 
 size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
 {
-# ifndef USE_BCRYPTGENRANDOM
+#ifndef USE_BCRYPTGENRANDOM
     HCRYPTPROV hProvider;
-# endif
+#endif
     unsigned char *buffer;
     size_t bytes_needed;
     size_t entropy_available = 0;
 
-
-# ifdef OPENSSL_RAND_SEED_RDTSC
+#ifdef OPENSSL_RAND_SEED_RDTSC
     entropy_available = ossl_prov_acquire_entropy_from_tsc(pool);
     if (entropy_available > 0)
         return entropy_available;
-# endif
+#endif
 
-# ifdef OPENSSL_RAND_SEED_RDCPU
+#ifdef OPENSSL_RAND_SEED_RDCPU
     entropy_available = ossl_prov_acquire_entropy_from_cpu(pool);
     if (entropy_available > 0)
         return entropy_available;
-# endif
+#endif
 
-# ifdef USE_BCRYPTGENRANDOM
+#ifdef USE_BCRYPTGENRANDOM
     bytes_needed = ossl_rand_pool_bytes_needed(pool, 1 /*entropy_factor*/);
     buffer = ossl_rand_pool_add_begin(pool, bytes_needed);
     if (buffer != NULL) {
         size_t bytes = 0;
         if (BCryptGenRandom(NULL, buffer, bytes_needed,
-                            BCRYPT_USE_SYSTEM_PREFERRED_RNG) == STATUS_SUCCESS)
+                BCRYPT_USE_SYSTEM_PREFERRED_RNG)
+            == STATUS_SUCCESS)
             bytes = bytes_needed;
 
         ossl_rand_pool_add_end(pool, bytes, 8 * bytes);
@@ -80,14 +80,15 @@ size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
     }
     if (entropy_available > 0)
         return entropy_available;
-# else
+#else
     bytes_needed = ossl_rand_pool_bytes_needed(pool, 1 /*entropy_factor*/);
     buffer = ossl_rand_pool_add_begin(pool, bytes_needed);
     if (buffer != NULL) {
         size_t bytes = 0;
         /* poll the CryptoAPI PRNG */
         if (CryptAcquireContextW(&hProvider, NULL, NULL, PROV_RSA_FULL,
-                                 CRYPT_VERIFYCONTEXT | CRYPT_SILENT) != 0) {
+                CRYPT_VERIFYCONTEXT | CRYPT_SILENT)
+            != 0) {
             if (CryptGenRandom(hProvider, bytes_needed, buffer) != 0)
                 bytes = bytes_needed;
 
@@ -106,8 +107,9 @@ size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
         size_t bytes = 0;
         /* poll the Pentium PRG with CryptoAPI */
         if (CryptAcquireContextW(&hProvider, NULL,
-                                 INTEL_DEF_PROV, PROV_INTEL_SEC,
-                                 CRYPT_VERIFYCONTEXT | CRYPT_SILENT) != 0) {
+                INTEL_DEF_PROV, PROV_INTEL_SEC,
+                CRYPT_VERIFYCONTEXT | CRYPT_SILENT)
+            != 0) {
             if (CryptGenRandom(hProvider, bytes_needed, buffer) != 0)
                 bytes = bytes_needed;
 
@@ -118,12 +120,11 @@ size_t ossl_pool_acquire_entropy(RAND_POOL *pool)
     }
     if (entropy_available > 0)
         return entropy_available;
-# endif
+#endif
 
     return ossl_rand_pool_entropy_available(pool);
 }
 
-
 int ossl_pool_add_nonce_data(RAND_POOL *pool)
 {
     struct {
diff --git a/providers/implementations/rands/test_rng.c b/providers/implementations/rands/test_rng.c
index dc53391665670..7942537879f1e 100644
--- a/providers/implementations/rands/test_rng.c
+++ b/providers/implementations/rands/test_rng.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-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
@@ -52,7 +52,7 @@ typedef struct {
 } PROV_TEST_RNG;
 
 static void *test_rng_new(void *provctx, void *parent,
-                          const OSSL_DISPATCH *parent_dispatch)
+    const OSSL_DISPATCH *parent_dispatch)
 {
     PROV_TEST_RNG *t;
 
@@ -79,9 +79,9 @@ static void test_rng_free(void *vtest)
 }
 
 static int test_rng_instantiate(void *vtest, 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[])
 {
     PROV_TEST_RNG *t = (PROV_TEST_RNG *)vtest;
 
@@ -90,7 +90,7 @@ static int test_rng_instantiate(void *vtest, unsigned int strength,
 
     t->state = EVP_RAND_STATE_READY;
     t->entropy_pos = 0;
-    t->seed = 221953166;    /* Value doesn't matter, so long as it isn't zero */
+    t->seed = 221953166; /* Value doesn't matter, so long as it isn't zero */
 
     return 1;
 }
@@ -125,8 +125,8 @@ static unsigned char gen_byte(PROV_TEST_RNG *t)
 }
 
 static int test_rng_generate(void *vtest, unsigned char *out, size_t outlen,
-                             unsigned int strength, int prediction_resistance,
-                             const unsigned char *adin, size_t adin_len)
+    unsigned int strength, int prediction_resistance,
+    const unsigned char *adin, size_t adin_len)
 {
     PROV_TEST_RNG *t = (PROV_TEST_RNG *)vtest;
     size_t i;
@@ -147,18 +147,18 @@ static int test_rng_generate(void *vtest, unsigned char *out, size_t outlen,
 }
 
 static int test_rng_reseed(ossl_unused void *vtest,
-                           ossl_unused int prediction_resistance,
-                           ossl_unused const unsigned char *ent,
-                           ossl_unused size_t ent_len,
-                           ossl_unused const unsigned char *adin,
-                           ossl_unused size_t adin_len)
+    ossl_unused int prediction_resistance,
+    ossl_unused const unsigned char *ent,
+    ossl_unused size_t ent_len,
+    ossl_unused const unsigned char *adin,
+    ossl_unused size_t adin_len)
 {
     return 1;
 }
 
 static size_t test_rng_nonce(void *vtest, unsigned char *out,
-                             unsigned int strength, size_t min_noncelen,
-                             ossl_unused size_t max_noncelen)
+    unsigned int strength, size_t min_noncelen,
+    size_t max_noncelen)
 {
     PROV_TEST_RNG *t = (PROV_TEST_RNG *)vtest;
     size_t i;
@@ -174,9 +174,10 @@ static size_t test_rng_nonce(void *vtest, unsigned char *out,
 
     if (t->nonce == NULL)
         return 0;
+    i = t->nonce_len > max_noncelen ? max_noncelen : t->nonce_len;
     if (out != NULL)
-        memcpy(out, t->nonce, t->nonce_len);
-    return t->nonce_len;
+        memcpy(out, t->nonce, i);
+    return i;
 }
 
 static int test_rng_get_ctx_params(void *vtest, OSSL_PARAM params[])
@@ -204,12 +205,12 @@ static int test_rng_get_ctx_params(void *vtest, OSSL_PARAM params[])
     p = OSSL_PARAM_locate(params, OSSL_RAND_PARAM_FIPS_APPROVED_INDICATOR);
     if (p != NULL && !OSSL_PARAM_set_int(p, 0))
         return 0;
-#endif  /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
     return 1;
 }
 
 static const OSSL_PARAM *test_rng_gettable_ctx_params(ossl_unused void *vtest,
-                                                      ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_int(OSSL_RAND_PARAM_STATE, NULL),
@@ -217,7 +218,7 @@ static const OSSL_PARAM *test_rng_gettable_ctx_params(ossl_unused void *vtest,
         OSSL_PARAM_size_t(OSSL_RAND_PARAM_MAX_REQUEST, NULL),
         OSSL_PARAM_uint(OSSL_RAND_PARAM_GENERATE, NULL),
         OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-        OSSL_PARAM_END
+            OSSL_PARAM_END
     };
     return known_gettable_ctx_params;
 }
@@ -267,7 +268,7 @@ static int test_rng_set_ctx_params(void *vtest, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *test_rng_settable_ctx_params(ossl_unused void *vtest,
-                                                      ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_settable_ctx_params[] = {
         OSSL_PARAM_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY, NULL, 0),
@@ -286,15 +287,15 @@ static int test_rng_verify_zeroization(ossl_unused void *vtest)
 }
 
 static size_t test_rng_get_seed(void *vtest, unsigned char **pout,
-                                int entropy, size_t min_len, size_t max_len,
-                                ossl_unused int prediction_resistance,
-                                ossl_unused const unsigned char *adin,
-                                ossl_unused size_t adin_len)
+    int entropy, size_t min_len, size_t max_len,
+    ossl_unused int prediction_resistance,
+    ossl_unused const unsigned char *adin,
+    ossl_unused size_t adin_len)
 {
     PROV_TEST_RNG *t = (PROV_TEST_RNG *)vtest;
 
     *pout = t->entropy;
-    return  t->entropy_len > max_len ? max_len : t->entropy_len;
+    return t->entropy_len > max_len ? max_len : t->entropy_len;
 }
 
 static int test_rng_enable_locking(void *vtest)
@@ -329,26 +330,26 @@ static void test_rng_unlock(void *vtest)
 }
 
 const OSSL_DISPATCH ossl_test_rng_functions[] = {
-    { OSSL_FUNC_RAND_NEWCTX, (void(*)(void))test_rng_new },
-    { OSSL_FUNC_RAND_FREECTX, (void(*)(void))test_rng_free },
+    { OSSL_FUNC_RAND_NEWCTX, (void (*)(void))test_rng_new },
+    { OSSL_FUNC_RAND_FREECTX, (void (*)(void))test_rng_free },
     { OSSL_FUNC_RAND_INSTANTIATE,
-      (void(*)(void))test_rng_instantiate },
+        (void (*)(void))test_rng_instantiate },
     { OSSL_FUNC_RAND_UNINSTANTIATE,
-      (void(*)(void))test_rng_uninstantiate },
-    { OSSL_FUNC_RAND_GENERATE, (void(*)(void))test_rng_generate },
-    { OSSL_FUNC_RAND_RESEED, (void(*)(void))test_rng_reseed },
-    { OSSL_FUNC_RAND_NONCE, (void(*)(void))test_rng_nonce },
-    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void(*)(void))test_rng_enable_locking },
-    { OSSL_FUNC_RAND_LOCK, (void(*)(void))test_rng_lock },
-    { OSSL_FUNC_RAND_UNLOCK, (void(*)(void))test_rng_unlock },
+        (void (*)(void))test_rng_uninstantiate },
+    { OSSL_FUNC_RAND_GENERATE, (void (*)(void))test_rng_generate },
+    { OSSL_FUNC_RAND_RESEED, (void (*)(void))test_rng_reseed },
+    { OSSL_FUNC_RAND_NONCE, (void (*)(void))test_rng_nonce },
+    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void (*)(void))test_rng_enable_locking },
+    { OSSL_FUNC_RAND_LOCK, (void (*)(void))test_rng_lock },
+    { OSSL_FUNC_RAND_UNLOCK, (void (*)(void))test_rng_unlock },
     { OSSL_FUNC_RAND_SETTABLE_CTX_PARAMS,
-      (void(*)(void))test_rng_settable_ctx_params },
-    { OSSL_FUNC_RAND_SET_CTX_PARAMS, (void(*)(void))test_rng_set_ctx_params },
+        (void (*)(void))test_rng_settable_ctx_params },
+    { OSSL_FUNC_RAND_SET_CTX_PARAMS, (void (*)(void))test_rng_set_ctx_params },
     { OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS,
-      (void(*)(void))test_rng_gettable_ctx_params },
-    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void(*)(void))test_rng_get_ctx_params },
+        (void (*)(void))test_rng_gettable_ctx_params },
+    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void (*)(void))test_rng_get_ctx_params },
     { OSSL_FUNC_RAND_VERIFY_ZEROIZATION,
-      (void(*)(void))test_rng_verify_zeroization },
-    { OSSL_FUNC_RAND_GET_SEED, (void(*)(void))test_rng_get_seed },
+        (void (*)(void))test_rng_verify_zeroization },
+    { OSSL_FUNC_RAND_GET_SEED, (void (*)(void))test_rng_get_seed },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/signature/dsa_sig.c b/providers/implementations/signature/dsa_sig.c
index 4b585bb704c29..51dcc3f2300d5 100644
--- a/providers/implementations/signature/dsa_sig.c
+++ b/providers/implementations/signature/dsa_sig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-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
@@ -98,7 +98,7 @@ typedef struct {
 
     /* The Algorithm Identifier of the combined signature algorithm */
     unsigned char aid_buf[OSSL_MAX_ALGORITHM_ID_SIZE];
-    size_t  aid_len;
+    size_t aid_len;
 
     /* main digest */
     char mdname[OSSL_MAX_NAME_SIZE];
@@ -147,8 +147,8 @@ static void *dsa_newctx(void *provctx, const char *propq)
 }
 
 static int dsa_setup_md(PROV_DSA_CTX *ctx,
-                        const char *mdname, const char *mdprops,
-                        const char *desc)
+    const char *mdname, const char *mdprops,
+    const char *desc)
 {
     EVP_MD *md = NULL;
 
@@ -164,16 +164,19 @@ static int dsa_setup_md(PROV_DSA_CTX *ctx,
         md = EVP_MD_fetch(ctx->libctx, mdname, mdprops);
         md_nid = ossl_digest_get_approved_nid(md);
 
-        if (md == NULL || md_nid < 0) {
-            if (md == NULL)
-                ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                               "%s could not be fetched", mdname);
-            if (md_nid == NID_undef)
-                ERR_raise_data(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED,
-                               "digest=%s", mdname);
-            if (mdname_len >= sizeof(ctx->mdname))
-                ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                               "%s exceeds name buffer length", mdname);
+        if (md == NULL) {
+            ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
+                "%s could not be fetched", mdname);
+            goto err;
+        }
+        if (md_nid == NID_undef) {
+            ERR_raise_data(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED,
+                "digest=%s", mdname);
+            goto err;
+        }
+        if (mdname_len >= sizeof(ctx->mdname)) {
+            ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
+                "%s exceeds name buffer length", mdname);
             goto err;
         }
         /* XOF digests don't work */
@@ -185,13 +188,14 @@ static int dsa_setup_md(PROV_DSA_CTX *ctx,
         {
             int sha1_allowed
                 = ((ctx->operation
-                    & (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_SIGNMSG)) == 0);
+                       & (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_SIGNMSG))
+                    == 0);
 
             if (!ossl_fips_ind_digest_sign_check(OSSL_FIPS_IND_GET(ctx),
-                                                 OSSL_FIPS_IND_SETTABLE1,
-                                                 ctx->libctx,
-                                                 md_nid, sha1_allowed, desc,
-                                                 ossl_fips_config_signature_digest_check))
+                    OSSL_FIPS_IND_SETTABLE1,
+                    ctx->libctx,
+                    md_nid, sha1_allowed, 0, desc,
+                    ossl_fips_config_signature_digest_check))
                 goto err;
         }
 #endif
@@ -200,7 +204,7 @@ static int dsa_setup_md(PROV_DSA_CTX *ctx,
             if (ctx->mdname[0] != '\0'
                 && !EVP_MD_is_a(md, ctx->mdname)) {
                 ERR_raise_data(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED,
-                               "digest %s != %s", mdname, ctx->mdname);
+                    "digest %s != %s", mdname, ctx->mdname);
                 goto err;
             }
             EVP_MD_free(md);
@@ -220,7 +224,7 @@ static int dsa_setup_md(PROV_DSA_CTX *ctx,
         ctx->aid_len = 0;
         if (WPACKET_init_der(&pkt, ctx->aid_buf, sizeof(ctx->aid_buf))
             && ossl_DER_w_algorithmIdentifier_DSA_with_MD(&pkt, -1, ctx->dsa,
-                                                          md_nid)
+                md_nid)
             && WPACKET_finish(&pkt)) {
             WPACKET_get_total_written(&pkt, &ctx->aid_len);
             aid = WPACKET_get_curr(&pkt);
@@ -235,7 +239,7 @@ static int dsa_setup_md(PROV_DSA_CTX *ctx,
     }
 
     return 1;
- err:
+err:
     EVP_MD_free(md);
     return 0;
 }
@@ -243,13 +247,13 @@ static int dsa_setup_md(PROV_DSA_CTX *ctx,
 #ifdef FIPS_MODULE
 
 static int dsa_sign_check_approved(PROV_DSA_CTX *ctx, int signing,
-                                   const char *desc)
+    const char *desc)
 {
     /* DSA Signing is not approved in FIPS 140-3 */
     if (signing
         && !OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE2,
-                                        ctx->libctx, desc, "DSA",
-                                        ossl_fips_config_dsa_sign_disallowed))
+            ctx->libctx, desc, "DSA",
+            ossl_fips_config_dsa_sign_disallowed))
         return 0;
     return 1;
 }
@@ -260,8 +264,8 @@ static int dsa_check_key(PROV_DSA_CTX *ctx, int sign, const char *desc)
 
     if (!approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE0,
-                                         ctx->libctx, desc, "DSA Key",
-                                         ossl_fips_config_signature_digest_check)) {
+                ctx->libctx, desc, "DSA Key",
+                ossl_fips_config_signature_digest_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_KEY_LENGTH);
             return 0;
         }
@@ -272,14 +276,14 @@ static int dsa_check_key(PROV_DSA_CTX *ctx, int sign, const char *desc)
 
 static int
 dsa_signverify_init(void *vpdsactx, void *vdsa,
-                    OSSL_FUNC_signature_set_ctx_params_fn *set_ctx_params,
-                    const OSSL_PARAM params[], int operation,
-                    const char *desc)
+    OSSL_FUNC_signature_set_ctx_params_fn *set_ctx_params,
+    const OSSL_PARAM params[], int operation,
+    const char *desc)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
 
     if (!ossl_prov_is_running()
-            || pdsactx == NULL)
+        || pdsactx == NULL)
         return 0;
 
     if (vdsa == NULL && pdsactx->dsa == NULL) {
@@ -316,7 +320,7 @@ dsa_signverify_init(void *vpdsactx, void *vdsa,
 static int dsa_sign_init(void *vpdsactx, void *vdsa, const OSSL_PARAM params[])
 {
     return dsa_signverify_init(vpdsactx, vdsa, dsa_set_ctx_params, params,
-                               EVP_PKEY_OP_SIGN, "DSA Sign Init");
+        EVP_PKEY_OP_SIGN, "DSA Sign Init");
 }
 
 /*
@@ -325,8 +329,8 @@ static int dsa_sign_init(void *vpdsactx, void *vdsa, const OSSL_PARAM params[])
  * implementations of the keytype related algorithms.
  */
 static int dsa_sign_directly(void *vpdsactx,
-                             unsigned char *sig, size_t *siglen, size_t sigsize,
-                             const unsigned char *tbs, size_t tbslen)
+    unsigned char *sig, size_t *siglen, size_t sigsize,
+    const unsigned char *tbs, size_t tbslen)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
     int ret;
@@ -354,8 +358,8 @@ static int dsa_sign_directly(void *vpdsactx,
         return 0;
 
     ret = ossl_dsa_sign_int(0, tbs, tbslen, sig, &sltmp, pdsactx->dsa,
-                            pdsactx->nonce_type, pdsactx->mdname,
-                            pdsactx->libctx, pdsactx->propq);
+        pdsactx->nonce_type, pdsactx->mdname,
+        pdsactx->libctx, pdsactx->propq);
     if (ret <= 0)
         return 0;
 
@@ -364,8 +368,8 @@ static int dsa_sign_directly(void *vpdsactx,
 }
 
 static int dsa_signverify_message_update(void *vpdsactx,
-                                         const unsigned char *data,
-                                         size_t datalen)
+    const unsigned char *data,
+    size_t datalen)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
 
@@ -376,7 +380,7 @@ static int dsa_signverify_message_update(void *vpdsactx,
 }
 
 static int dsa_sign_message_final(void *vpdsactx, unsigned char *sig,
-                                  size_t *siglen, size_t sigsize)
+    size_t *siglen, size_t sigsize)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
     unsigned char digest[EVP_MAX_MD_SIZE];
@@ -407,7 +411,7 @@ static int dsa_sign_message_final(void *vpdsactx, unsigned char *sig,
  * Otherwise, sign tbs directly.
  */
 static int dsa_sign(void *vpdsactx, unsigned char *sig, size_t *siglen,
-                    size_t sigsize, const unsigned char *tbs, size_t tbslen)
+    size_t sigsize, const unsigned char *tbs, size_t tbslen)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
 
@@ -427,15 +431,15 @@ static int dsa_sign(void *vpdsactx, unsigned char *sig, size_t *siglen,
 }
 
 static int dsa_verify_init(void *vpdsactx, void *vdsa,
-                           const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return dsa_signverify_init(vpdsactx, vdsa, dsa_set_ctx_params, params,
-                               EVP_PKEY_OP_VERIFY, "DSA Verify Init");
+        EVP_PKEY_OP_VERIFY, "DSA Verify Init");
 }
 
 static int dsa_verify_directly(void *vpdsactx,
-                               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)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
     size_t mdsize = dsa_get_md_size(pdsactx);
@@ -447,14 +451,13 @@ static int dsa_verify_directly(void *vpdsactx,
 }
 
 static int dsa_verify_set_sig(void *vpdsactx,
-                              const unsigned char *sig, size_t siglen)
+    const unsigned char *sig, size_t siglen)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
     OSSL_PARAM params[2];
 
-    params[0] =
-        OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_SIGNATURE,
-                                          (unsigned char *)sig, siglen);
+    params[0] = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_SIGNATURE,
+        (unsigned char *)sig, siglen);
     params[1] = OSSL_PARAM_construct_end();
     return dsa_sigalg_set_ctx_params(pdsactx, params);
 }
@@ -479,7 +482,7 @@ static int dsa_verify_message_final(void *vpdsactx)
         return 0;
 
     return dsa_verify_directly(vpdsactx, pdsactx->sig, pdsactx->siglen,
-                               digest, dlen);
+        digest, dlen);
 }
 
 /*
@@ -487,8 +490,8 @@ static int dsa_verify_message_final(void *vpdsactx)
  * Otherwise, verify tbs directly.
  */
 static int dsa_verify(void *vpdsactx,
-                      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)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
 
@@ -505,8 +508,8 @@ static int dsa_verify(void *vpdsactx,
 /* DigestSign/DigestVerify wrappers */
 
 static int dsa_digest_signverify_init(void *vpdsactx, const char *mdname,
-                                      void *vdsa, const OSSL_PARAM params[],
-                                      int operation, const char *desc)
+    void *vdsa, const OSSL_PARAM params[],
+    int operation, const char *desc)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
 
@@ -514,7 +517,7 @@ static int dsa_digest_signverify_init(void *vpdsactx, const char *mdname,
         return 0;
 
     if (!dsa_signverify_init(vpdsactx, vdsa, dsa_set_ctx_params, params,
-                             operation, desc))
+            operation, desc))
         return 0;
 
     if (mdname != NULL
@@ -536,22 +539,22 @@ static int dsa_digest_signverify_init(void *vpdsactx, const char *mdname,
 
     return 1;
 
- error:
+error:
     EVP_MD_CTX_free(pdsactx->mdctx);
     pdsactx->mdctx = NULL;
     return 0;
 }
 
 static int dsa_digest_sign_init(void *vpdsactx, const char *mdname,
-                                void *vdsa, const OSSL_PARAM params[])
+    void *vdsa, const OSSL_PARAM params[])
 {
     return dsa_digest_signverify_init(vpdsactx, mdname, vdsa, params,
-                                      EVP_PKEY_OP_SIGNMSG,
-                                      "DSA Digest Sign Init");
+        EVP_PKEY_OP_SIGNMSG,
+        "DSA Digest Sign Init");
 }
 
 static int dsa_digest_signverify_update(void *vpdsactx, const unsigned char *data,
-                                        size_t datalen)
+    size_t datalen)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
 
@@ -565,7 +568,7 @@ static int dsa_digest_signverify_update(void *vpdsactx, const unsigned char *dat
 }
 
 static int dsa_digest_sign_final(void *vpdsactx, unsigned char *sig,
-                                 size_t *siglen, size_t sigsize)
+    size_t *siglen, size_t sigsize)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
     int ok = 0;
@@ -584,15 +587,15 @@ static int dsa_digest_sign_final(void *vpdsactx, unsigned char *sig,
 }
 
 static int dsa_digest_verify_init(void *vpdsactx, const char *mdname,
-                                  void *vdsa, const OSSL_PARAM params[])
+    void *vdsa, const OSSL_PARAM params[])
 {
     return dsa_digest_signverify_init(vpdsactx, mdname, vdsa, params,
-                                      EVP_PKEY_OP_VERIFYMSG,
-                                      "DSA Digest Verify Init");
+        EVP_PKEY_OP_VERIFYMSG,
+        "DSA Digest Verify Init");
 }
 
 int dsa_digest_verify_final(void *vpdsactx, const unsigned char *sig,
-                            size_t siglen)
+    size_t siglen)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
     int ok = 0;
@@ -650,7 +653,7 @@ static void *dsa_dupctx(void *vpdsactx)
     if (srcctx->mdctx != NULL) {
         dstctx->mdctx = EVP_MD_CTX_new();
         if (dstctx->mdctx == NULL
-                || !EVP_MD_CTX_copy_ex(dstctx->mdctx, srcctx->mdctx))
+            || !EVP_MD_CTX_copy_ex(dstctx->mdctx, srcctx->mdctx))
             goto err;
     }
 
@@ -661,7 +664,7 @@ static void *dsa_dupctx(void *vpdsactx)
     }
 
     return dstctx;
- err:
+err:
     dsa_freectx(dstctx);
     return NULL;
 }
@@ -677,8 +680,8 @@ static int dsa_get_ctx_params(void *vpdsactx, OSSL_PARAM *params)
     p = OSSL_PARAM_locate(params, OSSL_SIGNATURE_PARAM_ALGORITHM_ID);
     if (p != NULL
         && !OSSL_PARAM_set_octet_string(p,
-                                        pdsactx->aid_len == 0 ? NULL : pdsactx->aid_buf,
-                                        pdsactx->aid_len))
+            pdsactx->aid_len == 0 ? NULL : pdsactx->aid_buf,
+            pdsactx->aid_len))
         return 0;
 
     p = OSSL_PARAM_locate(params, OSSL_SIGNATURE_PARAM_DIGEST);
@@ -699,11 +702,11 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
     OSSL_PARAM_utf8_string(OSSL_SIGNATURE_PARAM_DIGEST, NULL, 0),
     OSSL_PARAM_uint(OSSL_SIGNATURE_PARAM_NONCE_TYPE, NULL),
     OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 
 static const OSSL_PARAM *dsa_gettable_ctx_params(ossl_unused void *ctx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -719,13 +722,13 @@ static int dsa_common_set_ctx_params(void *vpdsactx, const OSSL_PARAM params[])
     const OSSL_PARAM *p;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(pdsactx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_SIGNATURE_PARAM_FIPS_KEY_CHECK))
+            OSSL_SIGNATURE_PARAM_FIPS_KEY_CHECK))
         return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(pdsactx, OSSL_FIPS_IND_SETTABLE1, params,
-                                     OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK))
+            OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK))
         return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(pdsactx, OSSL_FIPS_IND_SETTABLE2, params,
-                                     OSSL_SIGNATURE_PARAM_FIPS_SIGN_CHECK))
+            OSSL_SIGNATURE_PARAM_FIPS_SIGN_CHECK))
         return 0;
 
     p = OSSL_PARAM_locate_const(params, OSSL_SIGNATURE_PARAM_NONCE_TYPE);
@@ -735,12 +738,12 @@ static int dsa_common_set_ctx_params(void *vpdsactx, const OSSL_PARAM params[])
     return 1;
 }
 
-#define DSA_COMMON_SETTABLE_CTX_PARAMS                                        \
-    OSSL_PARAM_uint(OSSL_SIGNATURE_PARAM_NONCE_TYPE, NULL),                   \
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_KEY_CHECK)     \
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK)  \
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_SIGN_CHECK)    \
-    OSSL_PARAM_END
+#define DSA_COMMON_SETTABLE_CTX_PARAMS                                                 \
+    OSSL_PARAM_uint(OSSL_SIGNATURE_PARAM_NONCE_TYPE, NULL),                            \
+        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_KEY_CHECK)          \
+            OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK)   \
+                OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_SIGN_CHECK) \
+                    OSSL_PARAM_END
 
 static int dsa_set_ctx_params(void *vpdsactx, const OSSL_PARAM params[])
 {
@@ -760,9 +763,8 @@ static int dsa_set_ctx_params(void *vpdsactx, const OSSL_PARAM params[])
     if (p != NULL) {
         char mdname[OSSL_MAX_NAME_SIZE] = "", *pmdname = mdname;
         char mdprops[OSSL_MAX_PROPQUERY_SIZE] = "", *pmdprops = mdprops;
-        const OSSL_PARAM *propsp =
-            OSSL_PARAM_locate_const(params,
-                                    OSSL_SIGNATURE_PARAM_PROPERTIES);
+        const OSSL_PARAM *propsp = OSSL_PARAM_locate_const(params,
+            OSSL_SIGNATURE_PARAM_PROPERTIES);
 
         if (!OSSL_PARAM_get_utf8_string(p, &pmdname, sizeof(mdname)))
             return 0;
@@ -786,7 +788,7 @@ static const OSSL_PARAM settable_ctx_params_no_digest[] = {
 };
 
 static const OSSL_PARAM *dsa_settable_ctx_params(void *vpdsactx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
 
@@ -842,33 +844,33 @@ const OSSL_DISPATCH ossl_dsa_signature_functions[] = {
     { OSSL_FUNC_SIGNATURE_VERIFY_INIT, (void (*)(void))dsa_verify_init },
     { OSSL_FUNC_SIGNATURE_VERIFY, (void (*)(void))dsa_verify },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,
-      (void (*)(void))dsa_digest_sign_init },
+        (void (*)(void))dsa_digest_sign_init },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_UPDATE,
-      (void (*)(void))dsa_digest_signverify_update },
+        (void (*)(void))dsa_digest_signverify_update },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_FINAL,
-      (void (*)(void))dsa_digest_sign_final },
+        (void (*)(void))dsa_digest_sign_final },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT,
-      (void (*)(void))dsa_digest_verify_init },
+        (void (*)(void))dsa_digest_verify_init },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_UPDATE,
-      (void (*)(void))dsa_digest_signverify_update },
+        (void (*)(void))dsa_digest_signverify_update },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_FINAL,
-      (void (*)(void))dsa_digest_verify_final },
+        (void (*)(void))dsa_digest_verify_final },
     { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))dsa_freectx },
     { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))dsa_dupctx },
     { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS, (void (*)(void))dsa_get_ctx_params },
     { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,
-      (void (*)(void))dsa_gettable_ctx_params },
+        (void (*)(void))dsa_gettable_ctx_params },
     { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS, (void (*)(void))dsa_set_ctx_params },
     { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,
-      (void (*)(void))dsa_settable_ctx_params },
+        (void (*)(void))dsa_settable_ctx_params },
     { OSSL_FUNC_SIGNATURE_GET_CTX_MD_PARAMS,
-      (void (*)(void))dsa_get_ctx_md_params },
+        (void (*)(void))dsa_get_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_MD_PARAMS,
-      (void (*)(void))dsa_gettable_ctx_md_params },
+        (void (*)(void))dsa_gettable_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_SET_CTX_MD_PARAMS,
-      (void (*)(void))dsa_set_ctx_md_params },
+        (void (*)(void))dsa_set_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_MD_PARAMS,
-      (void (*)(void))dsa_settable_ctx_md_params },
+        (void (*)(void))dsa_settable_ctx_md_params },
     OSSL_DISPATCH_END
 };
 
@@ -888,10 +890,10 @@ static OSSL_FUNC_signature_set_ctx_params_fn dsa_sigalg_set_ctx_params;
  * just doesn't allow fetching an MD from whatever the user chooses.
  */
 static int dsa_sigalg_signverify_init(void *vpdsactx, void *vdsa,
-                                      OSSL_FUNC_signature_set_ctx_params_fn *set_ctx_params,
-                                      const OSSL_PARAM params[],
-                                      const char *mdname,
-                                      int operation, const char *desc)
+    OSSL_FUNC_signature_set_ctx_params_fn *set_ctx_params,
+    const OSSL_PARAM params[],
+    const char *mdname,
+    int operation, const char *desc)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
 
@@ -899,7 +901,7 @@ static int dsa_sigalg_signverify_init(void *vpdsactx, void *vdsa,
         return 0;
 
     if (!dsa_signverify_init(vpdsactx, vdsa, set_ctx_params, params, operation,
-                             desc))
+            desc))
         return 0;
 
     if (!dsa_setup_md(pdsactx, mdname, NULL, desc))
@@ -919,7 +921,7 @@ static int dsa_sigalg_signverify_init(void *vpdsactx, void *vdsa,
 
     return 1;
 
- error:
+error:
     EVP_MD_CTX_free(pdsactx->mdctx);
     pdsactx->mdctx = NULL;
     return 0;
@@ -938,7 +940,7 @@ static const OSSL_PARAM settable_sigalg_ctx_params[] = {
 };
 
 static const OSSL_PARAM *dsa_sigalg_settable_ctx_params(void *vpdsactx,
-                                                        ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     PROV_DSA_CTX *pdsactx = (PROV_DSA_CTX *)vpdsactx;
 
@@ -968,109 +970,110 @@ static int dsa_sigalg_set_ctx_params(void *vpdsactx, const OSSL_PARAM params[])
             pdsactx->sig = NULL;
             pdsactx->siglen = 0;
             if (!OSSL_PARAM_get_octet_string(p, (void **)&pdsactx->sig,
-                                             0, &pdsactx->siglen))
+                    0, &pdsactx->siglen))
                 return 0;
         }
     }
     return 1;
 }
 
-#define IMPL_DSA_SIGALG(md, MD)                                         \
-    static OSSL_FUNC_signature_sign_init_fn dsa_##md##_sign_init;       \
-    static OSSL_FUNC_signature_sign_message_init_fn                     \
-        dsa_##md##_sign_message_init;                                   \
-    static OSSL_FUNC_signature_verify_init_fn dsa_##md##_verify_init;   \
-    static OSSL_FUNC_signature_verify_message_init_fn                   \
-        dsa_##md##_verify_message_init;                                 \
-                                                                        \
-    static int                                                          \
-    dsa_##md##_sign_init(void *vpdsactx, void *vdsa,                    \
-                         const OSSL_PARAM params[])                     \
-    {                                                                   \
-        static const char desc[] = "DSA-" #MD " Sign Init";             \
-                                                                        \
-        return dsa_sigalg_signverify_init(vpdsactx, vdsa,               \
-                                          dsa_sigalg_set_ctx_params,    \
-                                          params, #MD,                  \
-                                          EVP_PKEY_OP_SIGN,             \
-                                          desc);                        \
-    }                                                                   \
-                                                                        \
-    static int                                                          \
-    dsa_##md##_sign_message_init(void *vpdsactx, void *vdsa,            \
-                                 const OSSL_PARAM params[])             \
-    {                                                                   \
-        static const char desc[] = "DSA-" #MD " Sign Message Init";     \
-                                                                        \
-        return dsa_sigalg_signverify_init(vpdsactx, vdsa,               \
-                                          dsa_sigalg_set_ctx_params,    \
-                                          params, #MD,                  \
-                                          EVP_PKEY_OP_SIGNMSG,          \
-                                          desc);                        \
-    }                                                                   \
-                                                                        \
-    static int                                                          \
-    dsa_##md##_verify_init(void *vpdsactx, void *vdsa,                  \
-                           const OSSL_PARAM params[])                   \
-    {                                                                   \
-        static const char desc[] = "DSA-" #MD " Verify Init";           \
-                                                                        \
-        return dsa_sigalg_signverify_init(vpdsactx, vdsa,               \
-                                          dsa_sigalg_set_ctx_params,    \
-                                          params, #MD,                  \
-                                          EVP_PKEY_OP_VERIFY,           \
-                                          desc);                        \
-    }                                                                   \
-                                                                        \
-    static int                                                          \
-    dsa_##md##_verify_message_init(void *vpdsactx, void *vdsa,          \
-                                   const OSSL_PARAM params[])           \
-    {                                                                   \
-        static const char desc[] = "DSA-" #MD " Verify Message Init";   \
-                                                                        \
-        return dsa_sigalg_signverify_init(vpdsactx, vdsa,               \
-                                          dsa_sigalg_set_ctx_params,    \
-                                          params, #MD,                  \
-                                          EVP_PKEY_OP_VERIFYMSG,        \
-                                          desc);                        \
-    }                                                                   \
-                                                                        \
-    const OSSL_DISPATCH ossl_dsa_##md##_signature_functions[] = {       \
-        { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))dsa_newctx },     \
-        { OSSL_FUNC_SIGNATURE_SIGN_INIT,                                \
-          (void (*)(void))dsa_##md##_sign_init },                       \
-        { OSSL_FUNC_SIGNATURE_SIGN, (void (*)(void))dsa_sign },         \
-        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_INIT,                        \
-          (void (*)(void))dsa_##md##_sign_message_init },               \
-        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_UPDATE,                      \
-          (void (*)(void))dsa_signverify_message_update },              \
-        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_FINAL,                       \
-          (void (*)(void))dsa_sign_message_final },                     \
-        { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                              \
-          (void (*)(void))dsa_##md##_verify_init },                     \
-        { OSSL_FUNC_SIGNATURE_VERIFY,                                   \
-          (void (*)(void))dsa_verify },                                 \
-        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_INIT,                      \
-          (void (*)(void))dsa_##md##_verify_message_init },             \
-        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_UPDATE,                    \
-          (void (*)(void))dsa_signverify_message_update },              \
-        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_FINAL,                     \
-          (void (*)(void))dsa_verify_message_final },                   \
-        { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))dsa_freectx },   \
-        { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))dsa_dupctx },     \
-        { OSSL_FUNC_SIGNATURE_QUERY_KEY_TYPES,                          \
-          (void (*)(void))dsa_sigalg_query_key_types },                 \
-        { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                           \
-          (void (*)(void))dsa_get_ctx_params },                         \
-        { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,                      \
-          (void (*)(void))dsa_gettable_ctx_params },                    \
-        { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,                           \
-          (void (*)(void))dsa_sigalg_set_ctx_params },                  \
-        { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,                      \
-          (void (*)(void))dsa_sigalg_settable_ctx_params },             \
-        OSSL_DISPATCH_END                                               \
+#define IMPL_DSA_SIGALG(md, MD)                                       \
+    static OSSL_FUNC_signature_sign_init_fn dsa_##md##_sign_init;     \
+    static OSSL_FUNC_signature_sign_message_init_fn                   \
+        dsa_##md##_sign_message_init;                                 \
+    static OSSL_FUNC_signature_verify_init_fn dsa_##md##_verify_init; \
+    static OSSL_FUNC_signature_verify_message_init_fn                 \
+        dsa_##md##_verify_message_init;                               \
+                                                                      \
+    static int                                                        \
+    dsa_##md##_sign_init(void *vpdsactx, void *vdsa,                  \
+        const OSSL_PARAM params[])                                    \
+    {                                                                 \
+        static const char desc[] = "DSA-" #MD " Sign Init";           \
+                                                                      \
+        return dsa_sigalg_signverify_init(vpdsactx, vdsa,             \
+            dsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                              \
+            EVP_PKEY_OP_SIGN,                                         \
+            desc);                                                    \
+    }                                                                 \
+                                                                      \
+    static int                                                        \
+    dsa_##md##_sign_message_init(void *vpdsactx, void *vdsa,          \
+        const OSSL_PARAM params[])                                    \
+    {                                                                 \
+        static const char desc[] = "DSA-" #MD " Sign Message Init";   \
+                                                                      \
+        return dsa_sigalg_signverify_init(vpdsactx, vdsa,             \
+            dsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                              \
+            EVP_PKEY_OP_SIGNMSG,                                      \
+            desc);                                                    \
+    }                                                                 \
+                                                                      \
+    static int                                                        \
+    dsa_##md##_verify_init(void *vpdsactx, void *vdsa,                \
+        const OSSL_PARAM params[])                                    \
+    {                                                                 \
+        static const char desc[] = "DSA-" #MD " Verify Init";         \
+                                                                      \
+        return dsa_sigalg_signverify_init(vpdsactx, vdsa,             \
+            dsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                              \
+            EVP_PKEY_OP_VERIFY,                                       \
+            desc);                                                    \
+    }                                                                 \
+                                                                      \
+    static int                                                        \
+    dsa_##md##_verify_message_init(void *vpdsactx, void *vdsa,        \
+        const OSSL_PARAM params[])                                    \
+    {                                                                 \
+        static const char desc[] = "DSA-" #MD " Verify Message Init"; \
+                                                                      \
+        return dsa_sigalg_signverify_init(vpdsactx, vdsa,             \
+            dsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                              \
+            EVP_PKEY_OP_VERIFYMSG,                                    \
+            desc);                                                    \
+    }                                                                 \
+                                                                      \
+    const OSSL_DISPATCH ossl_dsa_##md##_signature_functions[] = {     \
+        { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))dsa_newctx },   \
+        { OSSL_FUNC_SIGNATURE_SIGN_INIT,                              \
+            (void (*)(void))dsa_##md##_sign_init },                   \
+        { OSSL_FUNC_SIGNATURE_SIGN, (void (*)(void))dsa_sign },       \
+        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_INIT,                      \
+            (void (*)(void))dsa_##md##_sign_message_init },           \
+        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_UPDATE,                    \
+            (void (*)(void))dsa_signverify_message_update },          \
+        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_FINAL,                     \
+            (void (*)(void))dsa_sign_message_final },                 \
+        { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                            \
+            (void (*)(void))dsa_##md##_verify_init },                 \
+        { OSSL_FUNC_SIGNATURE_VERIFY,                                 \
+            (void (*)(void))dsa_verify },                             \
+        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_INIT,                    \
+            (void (*)(void))dsa_##md##_verify_message_init },         \
+        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_UPDATE,                  \
+            (void (*)(void))dsa_signverify_message_update },          \
+        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_FINAL,                   \
+            (void (*)(void))dsa_verify_message_final },               \
+        { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))dsa_freectx }, \
+        { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))dsa_dupctx },   \
+        { OSSL_FUNC_SIGNATURE_QUERY_KEY_TYPES,                        \
+            (void (*)(void))dsa_sigalg_query_key_types },             \
+        { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                         \
+            (void (*)(void))dsa_get_ctx_params },                     \
+        { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,                    \
+            (void (*)(void))dsa_gettable_ctx_params },                \
+        { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,                         \
+            (void (*)(void))dsa_sigalg_set_ctx_params },              \
+        { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,                    \
+            (void (*)(void))dsa_sigalg_settable_ctx_params },         \
+        OSSL_DISPATCH_END                                             \
     }
 
+/* clang-format off */
 IMPL_DSA_SIGALG(sha1, SHA1);
 IMPL_DSA_SIGALG(sha224, SHA2-224);
 IMPL_DSA_SIGALG(sha256, SHA2-256);
@@ -1080,3 +1083,4 @@ IMPL_DSA_SIGALG(sha3_224, SHA3-224);
 IMPL_DSA_SIGALG(sha3_256, SHA3-256);
 IMPL_DSA_SIGALG(sha3_384, SHA3-384);
 IMPL_DSA_SIGALG(sha3_512, SHA3-512);
+/* clang-format on */
diff --git a/providers/implementations/signature/ecdsa_sig.c b/providers/implementations/signature/ecdsa_sig.c
index 6fef96c86a6b6..0c04fc4ec683e 100644
--- a/providers/implementations/signature/ecdsa_sig.c
+++ b/providers/implementations/signature/ecdsa_sig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-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
@@ -95,7 +95,7 @@ typedef struct {
 
     /* The Algorithm Identifier of the combined signature algorithm */
     unsigned char aid_buf[OSSL_MAX_ALGORITHM_ID_SIZE];
-    size_t  aid_len;
+    size_t aid_len;
 
     /* main digest */
     char mdname[OSSL_MAX_NAME_SIZE];
@@ -164,8 +164,8 @@ static void *ecdsa_newctx(void *provctx, const char *propq)
 }
 
 static int ecdsa_setup_md(PROV_ECDSA_CTX *ctx,
-                          const char *mdname, const char *mdprops,
-                          const char *desc)
+    const char *mdname, const char *mdprops,
+    const char *desc)
 {
     EVP_MD *md = NULL;
     size_t mdname_len;
@@ -179,7 +179,7 @@ static int ecdsa_setup_md(PROV_ECDSA_CTX *ctx,
     mdname_len = strlen(mdname);
     if (mdname_len >= sizeof(ctx->mdname)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                       "%s exceeds name buffer length", mdname);
+            "%s exceeds name buffer length", mdname);
         return 0;
     }
     if (mdprops == NULL)
@@ -187,21 +187,23 @@ static int ecdsa_setup_md(PROV_ECDSA_CTX *ctx,
     md = EVP_MD_fetch(ctx->libctx, mdname, mdprops);
     if (md == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                       "%s could not be fetched", mdname);
+            "%s could not be fetched", mdname);
         return 0;
     }
     md_size = EVP_MD_get_size(md);
     if (md_size <= 0) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                       "%s has invalid md size %d", mdname, md_size);
+            "%s has invalid md size %d", mdname, md_size);
         goto err;
     }
     md_nid = ossl_digest_get_approved_nid(md);
+#ifdef FIPS_MODULE
     if (md_nid == NID_undef) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED,
-                       "digest=%s", mdname);
+            "digest=%s", mdname);
         goto err;
     }
+#endif
     /* XOF digests don't work */
     if (EVP_MD_xof(md)) {
         ERR_raise(ERR_LIB_PROV, PROV_R_XOF_DIGESTS_NOT_ALLOWED);
@@ -212,13 +214,14 @@ static int ecdsa_setup_md(PROV_ECDSA_CTX *ctx,
     {
         int sha1_allowed
             = ((ctx->operation
-                & (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_SIGNMSG)) == 0);
+                   & (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_SIGNMSG))
+                == 0);
 
         if (!ossl_fips_ind_digest_sign_check(OSSL_FIPS_IND_GET(ctx),
-                                             OSSL_FIPS_IND_SETTABLE1,
-                                             ctx->libctx,
-                                             md_nid, sha1_allowed, desc,
-                                             ossl_fips_config_signature_digest_check))
+                OSSL_FIPS_IND_SETTABLE1,
+                ctx->libctx,
+                md_nid, sha1_allowed, 0, desc,
+                ossl_fips_config_signature_digest_check))
             goto err;
     }
 #endif
@@ -226,7 +229,7 @@ static int ecdsa_setup_md(PROV_ECDSA_CTX *ctx,
     if (!ctx->flag_allow_md) {
         if (ctx->mdname[0] != '\0' && !EVP_MD_is_a(md, ctx->mdname)) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED,
-                           "digest %s != %s", mdname, ctx->mdname);
+                "digest %s != %s", mdname, ctx->mdname);
             goto err;
         }
         EVP_MD_free(md);
@@ -237,16 +240,22 @@ static int ecdsa_setup_md(PROV_ECDSA_CTX *ctx,
     EVP_MD_free(ctx->md);
 
     ctx->aid_len = 0;
-    if (WPACKET_init_der(&pkt, ctx->aid_buf, sizeof(ctx->aid_buf))
-        && ossl_DER_w_algorithmIdentifier_ECDSA_with_MD(&pkt, -1, ctx->ec,
-                                                        md_nid)
-        && WPACKET_finish(&pkt)) {
-        WPACKET_get_total_written(&pkt, &ctx->aid_len);
-        aid = WPACKET_get_curr(&pkt);
+#ifndef FIPS_MODULE
+    if (md_nid != NID_undef) {
+#else
+    {
+#endif
+        if (WPACKET_init_der(&pkt, ctx->aid_buf, sizeof(ctx->aid_buf))
+            && ossl_DER_w_algorithmIdentifier_ECDSA_with_MD(&pkt, -1, ctx->ec,
+                md_nid)
+            && WPACKET_finish(&pkt)) {
+            WPACKET_get_total_written(&pkt, &ctx->aid_len);
+            aid = WPACKET_get_curr(&pkt);
+        }
+        WPACKET_cleanup(&pkt);
+        if (aid != NULL && ctx->aid_len != 0)
+            memmove(ctx->aid_buf, aid, ctx->aid_len);
     }
-    WPACKET_cleanup(&pkt);
-    if (aid != NULL && ctx->aid_len != 0)
-        memmove(ctx->aid_buf, aid, ctx->aid_len);
 
     ctx->mdctx = NULL;
     ctx->md = md;
@@ -254,19 +263,19 @@ static int ecdsa_setup_md(PROV_ECDSA_CTX *ctx,
     OPENSSL_strlcpy(ctx->mdname, mdname, sizeof(ctx->mdname));
 
     return 1;
- err:
+err:
     EVP_MD_free(md);
     return 0;
 }
 
 static int
 ecdsa_signverify_init(PROV_ECDSA_CTX *ctx, void *ec,
-                      OSSL_FUNC_signature_set_ctx_params_fn *set_ctx_params,
-                      const OSSL_PARAM params[], int operation,
-                      const char *desc)
+    OSSL_FUNC_signature_set_ctx_params_fn *set_ctx_params,
+    const OSSL_PARAM params[], int operation,
+    const char *desc)
 {
     if (!ossl_prov_is_running()
-            || ctx == NULL)
+        || ctx == NULL)
         return 0;
 
     if (ec == NULL && ctx->ec == NULL) {
@@ -288,10 +297,9 @@ ecdsa_signverify_init(PROV_ECDSA_CTX *ctx, void *ec,
         return 0;
 #ifdef FIPS_MODULE
     if (!ossl_fips_ind_ec_key_check(OSSL_FIPS_IND_GET(ctx),
-                                    OSSL_FIPS_IND_SETTABLE0, ctx->libctx,
-                                    EC_KEY_get0_group(ctx->ec), desc,
-                                    (operation & (EVP_PKEY_OP_SIGN
-                                                  | EVP_PKEY_OP_SIGNMSG)) != 0))
+            OSSL_FIPS_IND_SETTABLE0, ctx->libctx,
+            EC_KEY_get0_group(ctx->ec), desc,
+            (operation & (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_SIGNMSG)) != 0))
         return 0;
 #endif
     return 1;
@@ -305,7 +313,7 @@ static int ecdsa_sign_init(void *vctx, void *ec, const OSSL_PARAM params[])
     ctx->verify_message = 1;
 #endif
     return ecdsa_signverify_init(ctx, ec, ecdsa_set_ctx_params, params,
-                                 EVP_PKEY_OP_SIGN, "ECDSA Sign Init");
+        EVP_PKEY_OP_SIGN, "ECDSA Sign Init");
 }
 
 /*
@@ -313,8 +321,8 @@ static int ecdsa_sign_init(void *vctx, void *ec, const OSSL_PARAM params[])
  * signing and signing the digest of a message.
  */
 static int ecdsa_sign_directly(void *vctx,
-                               unsigned char *sig, size_t *siglen, size_t sigsize,
-                               const unsigned char *tbs, size_t tbslen)
+    unsigned char *sig, size_t *siglen, size_t sigsize,
+    const unsigned char *tbs, size_t tbslen)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
     int ret;
@@ -346,12 +354,12 @@ static int ecdsa_sign_directly(void *vctx,
         if (ctx->mdname[0] != '\0')
             mdname = ctx->mdname;
         ret = ossl_ecdsa_deterministic_sign(tbs, tbslen, sig, &sltmp,
-                                            ctx->ec, ctx->nonce_type,
-                                            mdname,
-                                            ctx->libctx, ctx->propq);
+            ctx->ec, ctx->nonce_type,
+            mdname,
+            ctx->libctx, ctx->propq);
     } else {
         ret = ECDSA_sign_ex(0, tbs, tbslen, sig, &sltmp, ctx->kinv, ctx->r,
-                            ctx->ec);
+            ctx->ec);
     }
     if (ret <= 0)
         return 0;
@@ -361,8 +369,8 @@ static int ecdsa_sign_directly(void *vctx,
 }
 
 static int ecdsa_signverify_message_update(void *vctx,
-                                         const unsigned char *data,
-                                         size_t datalen)
+    const unsigned char *data,
+    size_t datalen)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
 
@@ -373,7 +381,7 @@ static int ecdsa_signverify_message_update(void *vctx,
 }
 
 static int ecdsa_sign_message_final(void *vctx, unsigned char *sig,
-                                  size_t *siglen, size_t sigsize)
+    size_t *siglen, size_t sigsize)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
     unsigned char digest[EVP_MAX_MD_SIZE];
@@ -398,7 +406,7 @@ static int ecdsa_sign_message_final(void *vctx, unsigned char *sig,
  * Otherwise, sign tbs directly.
  */
 static int ecdsa_sign(void *vctx, unsigned char *sig, size_t *siglen,
-                    size_t sigsize, const unsigned char *tbs, size_t tbslen)
+    size_t sigsize, const unsigned char *tbs, size_t tbslen)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
 
@@ -425,12 +433,12 @@ static int ecdsa_verify_init(void *vctx, void *ec, const OSSL_PARAM params[])
     ctx->verify_message = 0;
 #endif
     return ecdsa_signverify_init(ctx, ec, ecdsa_set_ctx_params, params,
-                                 EVP_PKEY_OP_VERIFY, "ECDSA Verify Init");
+        EVP_PKEY_OP_VERIFY, "ECDSA Verify Init");
 }
 
 static int ecdsa_verify_directly(void *vctx,
-                                 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)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
 
@@ -441,14 +449,13 @@ static int ecdsa_verify_directly(void *vctx,
 }
 
 static int ecdsa_verify_set_sig(void *vctx,
-                                const unsigned char *sig, size_t siglen)
+    const unsigned char *sig, size_t siglen)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
     OSSL_PARAM params[2];
 
-    params[0] =
-        OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_SIGNATURE,
-                                          (unsigned char *)sig, siglen);
+    params[0] = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_SIGNATURE,
+        (unsigned char *)sig, siglen);
     params[1] = OSSL_PARAM_construct_end();
     return ecdsa_sigalg_set_ctx_params(ctx, params);
 }
@@ -470,7 +477,7 @@ static int ecdsa_verify_message_final(void *vctx)
         return 0;
 
     return ecdsa_verify_directly(vctx, ctx->sig, ctx->siglen,
-                               digest, dlen);
+        digest, dlen);
 }
 
 /*
@@ -478,8 +485,8 @@ static int ecdsa_verify_message_final(void *vctx)
  * Otherwise, verify tbs directly.
  */
 static int ecdsa_verify(void *vctx,
-                      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)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
 
@@ -496,8 +503,8 @@ static int ecdsa_verify(void *vctx,
 /* DigestSign/DigestVerify wrappers */
 
 static int ecdsa_digest_signverify_init(void *vctx, const char *mdname,
-                                        void *ec, const OSSL_PARAM params[],
-                                        int operation, const char *desc)
+    void *ec, const OSSL_PARAM params[],
+    int operation, const char *desc)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
 
@@ -508,7 +515,7 @@ static int ecdsa_digest_signverify_init(void *vctx, const char *mdname,
     ctx->verify_message = 1;
 #endif
     if (!ecdsa_signverify_init(vctx, ec, ecdsa_set_ctx_params, params,
-                               operation, desc))
+            operation, desc))
         return 0;
 
     if (mdname != NULL
@@ -535,15 +542,15 @@ static int ecdsa_digest_signverify_init(void *vctx, const char *mdname,
 }
 
 static int ecdsa_digest_sign_init(void *vctx, const char *mdname, void *ec,
-                                  const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return ecdsa_digest_signverify_init(vctx, mdname, ec, params,
-                                        EVP_PKEY_OP_SIGNMSG,
-                                        "ECDSA Digest Sign Init");
+        EVP_PKEY_OP_SIGNMSG,
+        "ECDSA Digest Sign Init");
 }
 
 static int ecdsa_digest_signverify_update(void *vctx, const unsigned char *data,
-                                          size_t datalen)
+    size_t datalen)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
 
@@ -557,7 +564,7 @@ static int ecdsa_digest_signverify_update(void *vctx, const unsigned char *data,
 }
 
 int ecdsa_digest_sign_final(void *vctx, unsigned char *sig, size_t *siglen,
-                            size_t sigsize)
+    size_t sigsize)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
     int ok = 0;
@@ -576,15 +583,15 @@ int ecdsa_digest_sign_final(void *vctx, unsigned char *sig, size_t *siglen,
 }
 
 static int ecdsa_digest_verify_init(void *vctx, const char *mdname, void *ec,
-                                    const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return ecdsa_digest_signverify_init(vctx, mdname, ec, params,
-                                        EVP_PKEY_OP_VERIFYMSG,
-                                        "ECDSA Digest Verify Init");
+        EVP_PKEY_OP_VERIFYMSG,
+        "ECDSA Digest Verify Init");
 }
 
 int ecdsa_digest_verify_final(void *vctx, const unsigned char *sig,
-                              size_t siglen)
+    size_t siglen)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
     int ok = 0;
@@ -648,7 +655,7 @@ static void *ecdsa_dupctx(void *vctx)
     if (srcctx->mdctx != NULL) {
         dstctx->mdctx = EVP_MD_CTX_new();
         if (dstctx->mdctx == NULL
-                || !EVP_MD_CTX_copy_ex(dstctx->mdctx, srcctx->mdctx))
+            || !EVP_MD_CTX_copy_ex(dstctx->mdctx, srcctx->mdctx))
             goto err;
     }
 
@@ -659,7 +666,7 @@ static void *ecdsa_dupctx(void *vctx)
     }
 
     return dstctx;
- err:
+err:
     ecdsa_freectx(dstctx);
     return NULL;
 }
@@ -673,9 +680,7 @@ static int ecdsa_get_ctx_params(void *vctx, OSSL_PARAM *params)
         return 0;
 
     p = OSSL_PARAM_locate(params, OSSL_SIGNATURE_PARAM_ALGORITHM_ID);
-    if (p != NULL && !OSSL_PARAM_set_octet_string(p,
-                                                  ctx->aid_len == 0 ? NULL : ctx->aid_buf,
-                                                  ctx->aid_len))
+    if (p != NULL && !OSSL_PARAM_set_octet_string(p, ctx->aid_len == 0 ? NULL : ctx->aid_buf, ctx->aid_len))
         return 0;
 
     p = OSSL_PARAM_locate(params, OSSL_SIGNATURE_PARAM_DIGEST_SIZE);
@@ -683,9 +688,7 @@ static int ecdsa_get_ctx_params(void *vctx, OSSL_PARAM *params)
         return 0;
 
     p = OSSL_PARAM_locate(params, OSSL_SIGNATURE_PARAM_DIGEST);
-    if (p != NULL && !OSSL_PARAM_set_utf8_string(p, ctx->md == NULL
-                                                    ? ctx->mdname
-                                                    : EVP_MD_get0_name(ctx->md)))
+    if (p != NULL && !OSSL_PARAM_set_utf8_string(p, ctx->md == NULL ? ctx->mdname : EVP_MD_get0_name(ctx->md)))
         return 0;
 
     p = OSSL_PARAM_locate(params, OSSL_SIGNATURE_PARAM_NONCE_TYPE);
@@ -712,11 +715,11 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
     OSSL_PARAM_uint(OSSL_SIGNATURE_PARAM_FIPS_VERIFY_MESSAGE, NULL),
 #endif
     OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 
 static const OSSL_PARAM *ecdsa_gettable_ctx_params(ossl_unused void *vctx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -732,10 +735,10 @@ static int ecdsa_common_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     const OSSL_PARAM *p;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_SIGNATURE_PARAM_FIPS_KEY_CHECK))
+            OSSL_SIGNATURE_PARAM_FIPS_KEY_CHECK))
         return 0;
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(ctx, OSSL_FIPS_IND_SETTABLE1, params,
-                                     OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK))
+            OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK))
         return 0;
 
 #if !defined(OPENSSL_NO_ACVP_TESTS)
@@ -751,12 +754,12 @@ static int ecdsa_common_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     return 1;
 }
 
-#define ECDSA_COMMON_SETTABLE_CTX_PARAMS                                      \
-    OSSL_PARAM_uint(OSSL_SIGNATURE_PARAM_KAT, NULL),                          \
-    OSSL_PARAM_uint(OSSL_SIGNATURE_PARAM_NONCE_TYPE, NULL),                   \
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_KEY_CHECK)     \
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK)  \
-    OSSL_PARAM_END
+#define ECDSA_COMMON_SETTABLE_CTX_PARAMS                                             \
+    OSSL_PARAM_uint(OSSL_SIGNATURE_PARAM_KAT, NULL),                                 \
+        OSSL_PARAM_uint(OSSL_SIGNATURE_PARAM_NONCE_TYPE, NULL),                      \
+        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_KEY_CHECK)        \
+            OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK) \
+                OSSL_PARAM_END
 
 static int ecdsa_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 {
@@ -777,9 +780,8 @@ static int ecdsa_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     if (p != NULL) {
         char mdname[OSSL_MAX_NAME_SIZE] = "", *pmdname = mdname;
         char mdprops[OSSL_MAX_PROPQUERY_SIZE] = "", *pmdprops = mdprops;
-        const OSSL_PARAM *propsp =
-            OSSL_PARAM_locate_const(params,
-                                    OSSL_SIGNATURE_PARAM_PROPERTIES);
+        const OSSL_PARAM *propsp = OSSL_PARAM_locate_const(params,
+            OSSL_SIGNATURE_PARAM_PROPERTIES);
 
         if (!OSSL_PARAM_get_utf8_string(p, &pmdname, sizeof(mdname)))
             return 0;
@@ -808,7 +810,7 @@ static const OSSL_PARAM settable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *ecdsa_settable_ctx_params(void *vctx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return settable_ctx_params;
 }
@@ -860,33 +862,33 @@ const OSSL_DISPATCH ossl_ecdsa_signature_functions[] = {
     { OSSL_FUNC_SIGNATURE_VERIFY_INIT, (void (*)(void))ecdsa_verify_init },
     { OSSL_FUNC_SIGNATURE_VERIFY, (void (*)(void))ecdsa_verify },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,
-      (void (*)(void))ecdsa_digest_sign_init },
+        (void (*)(void))ecdsa_digest_sign_init },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_UPDATE,
-      (void (*)(void))ecdsa_digest_signverify_update },
+        (void (*)(void))ecdsa_digest_signverify_update },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_FINAL,
-      (void (*)(void))ecdsa_digest_sign_final },
+        (void (*)(void))ecdsa_digest_sign_final },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT,
-      (void (*)(void))ecdsa_digest_verify_init },
+        (void (*)(void))ecdsa_digest_verify_init },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_UPDATE,
-      (void (*)(void))ecdsa_digest_signverify_update },
+        (void (*)(void))ecdsa_digest_signverify_update },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_FINAL,
-      (void (*)(void))ecdsa_digest_verify_final },
+        (void (*)(void))ecdsa_digest_verify_final },
     { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))ecdsa_freectx },
     { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))ecdsa_dupctx },
     { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS, (void (*)(void))ecdsa_get_ctx_params },
     { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,
-      (void (*)(void))ecdsa_gettable_ctx_params },
+        (void (*)(void))ecdsa_gettable_ctx_params },
     { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS, (void (*)(void))ecdsa_set_ctx_params },
     { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,
-      (void (*)(void))ecdsa_settable_ctx_params },
+        (void (*)(void))ecdsa_settable_ctx_params },
     { OSSL_FUNC_SIGNATURE_GET_CTX_MD_PARAMS,
-      (void (*)(void))ecdsa_get_ctx_md_params },
+        (void (*)(void))ecdsa_get_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_MD_PARAMS,
-      (void (*)(void))ecdsa_gettable_ctx_md_params },
+        (void (*)(void))ecdsa_gettable_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_SET_CTX_MD_PARAMS,
-      (void (*)(void))ecdsa_set_ctx_md_params },
+        (void (*)(void))ecdsa_set_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_MD_PARAMS,
-      (void (*)(void))ecdsa_settable_ctx_md_params },
+        (void (*)(void))ecdsa_settable_ctx_md_params },
     OSSL_DISPATCH_END
 };
 
@@ -906,10 +908,10 @@ static OSSL_FUNC_signature_set_ctx_params_fn ecdsa_sigalg_set_ctx_params;
  * just doesn't allow fetching an MD from whatever the user chooses.
  */
 static int ecdsa_sigalg_signverify_init(void *vctx, void *vec,
-                                      OSSL_FUNC_signature_set_ctx_params_fn *set_ctx_params,
-                                      const OSSL_PARAM params[],
-                                      const char *mdname,
-                                      int operation, const char *desc)
+    OSSL_FUNC_signature_set_ctx_params_fn *set_ctx_params,
+    const OSSL_PARAM params[],
+    const char *mdname,
+    int operation, const char *desc)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
 
@@ -917,7 +919,7 @@ static int ecdsa_sigalg_signverify_init(void *vctx, void *vec,
         return 0;
 
     if (!ecdsa_signverify_init(vctx, vec, set_ctx_params, params, operation,
-                               desc))
+            desc))
         return 0;
 
     if (!ecdsa_setup_md(ctx, mdname, NULL, desc))
@@ -937,7 +939,7 @@ static int ecdsa_sigalg_signverify_init(void *vctx, void *vec,
 
     return 1;
 
- error:
+error:
     EVP_MD_CTX_free(ctx->mdctx);
     ctx->mdctx = NULL;
     return 0;
@@ -956,7 +958,7 @@ static const OSSL_PARAM settable_sigalg_ctx_params[] = {
 };
 
 static const OSSL_PARAM *ecdsa_sigalg_settable_ctx_params(void *vctx,
-                                                        ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     PROV_ECDSA_CTX *ctx = (PROV_ECDSA_CTX *)vctx;
 
@@ -986,7 +988,7 @@ static int ecdsa_sigalg_set_ctx_params(void *vctx, const OSSL_PARAM params[])
             ctx->sig = NULL;
             ctx->siglen = 0;
             if (!OSSL_PARAM_get_octet_string(p, (void **)&ctx->sig,
-                                             0, &ctx->siglen))
+                    0, &ctx->siglen))
                 return 0;
         }
     }
@@ -1003,92 +1005,93 @@ static int ecdsa_sigalg_set_ctx_params(void *vctx, const OSSL_PARAM params[])
                                                                         \
     static int                                                          \
     ecdsa_##md##_sign_init(void *vctx, void *vec,                       \
-                         const OSSL_PARAM params[])                     \
+        const OSSL_PARAM params[])                                      \
     {                                                                   \
         static const char desc[] = "ECDSA-" #MD " Sign Init";           \
                                                                         \
         return ecdsa_sigalg_signverify_init(vctx, vec,                  \
-                                            ecdsa_sigalg_set_ctx_params, \
-                                            params, #MD,                \
-                                            EVP_PKEY_OP_SIGN,           \
-                                            desc);                      \
+            ecdsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                                \
+            EVP_PKEY_OP_SIGN,                                           \
+            desc);                                                      \
     }                                                                   \
                                                                         \
     static int                                                          \
     ecdsa_##md##_sign_message_init(void *vctx, void *vec,               \
-                                   const OSSL_PARAM params[])           \
+        const OSSL_PARAM params[])                                      \
     {                                                                   \
         static const char desc[] = "ECDSA-" #MD " Sign Message Init";   \
                                                                         \
         return ecdsa_sigalg_signverify_init(vctx, vec,                  \
-                                            ecdsa_sigalg_set_ctx_params, \
-                                            params, #MD,                \
-                                            EVP_PKEY_OP_SIGNMSG,        \
-                                            desc);                      \
+            ecdsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                                \
+            EVP_PKEY_OP_SIGNMSG,                                        \
+            desc);                                                      \
     }                                                                   \
                                                                         \
     static int                                                          \
     ecdsa_##md##_verify_init(void *vctx, void *vec,                     \
-                           const OSSL_PARAM params[])                   \
+        const OSSL_PARAM params[])                                      \
     {                                                                   \
         static const char desc[] = "ECDSA-" #MD " Verify Init";         \
                                                                         \
         return ecdsa_sigalg_signverify_init(vctx, vec,                  \
-                                            ecdsa_sigalg_set_ctx_params, \
-                                            params, #MD,                \
-                                            EVP_PKEY_OP_VERIFY,         \
-                                            desc);                      \
+            ecdsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                                \
+            EVP_PKEY_OP_VERIFY,                                         \
+            desc);                                                      \
     }                                                                   \
                                                                         \
     static int                                                          \
     ecdsa_##md##_verify_message_init(void *vctx, void *vec,             \
-                                     const OSSL_PARAM params[])         \
+        const OSSL_PARAM params[])                                      \
     {                                                                   \
         static const char desc[] = "ECDSA-" #MD " Verify Message Init"; \
                                                                         \
         return ecdsa_sigalg_signverify_init(vctx, vec,                  \
-                                            ecdsa_sigalg_set_ctx_params, \
-                                            params, #MD,                \
-                                            EVP_PKEY_OP_VERIFYMSG,      \
-                                            desc);                      \
+            ecdsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                                \
+            EVP_PKEY_OP_VERIFYMSG,                                      \
+            desc);                                                      \
     }                                                                   \
                                                                         \
     const OSSL_DISPATCH ossl_ecdsa_##md##_signature_functions[] = {     \
         { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))ecdsa_newctx },   \
         { OSSL_FUNC_SIGNATURE_SIGN_INIT,                                \
-          (void (*)(void))ecdsa_##md##_sign_init },                     \
+            (void (*)(void))ecdsa_##md##_sign_init },                   \
         { OSSL_FUNC_SIGNATURE_SIGN, (void (*)(void))ecdsa_sign },       \
         { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_INIT,                        \
-          (void (*)(void))ecdsa_##md##_sign_message_init },             \
+            (void (*)(void))ecdsa_##md##_sign_message_init },           \
         { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_UPDATE,                      \
-          (void (*)(void))ecdsa_signverify_message_update },            \
+            (void (*)(void))ecdsa_signverify_message_update },          \
         { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_FINAL,                       \
-          (void (*)(void))ecdsa_sign_message_final },                   \
+            (void (*)(void))ecdsa_sign_message_final },                 \
         { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                              \
-          (void (*)(void))ecdsa_##md##_verify_init },                   \
+            (void (*)(void))ecdsa_##md##_verify_init },                 \
         { OSSL_FUNC_SIGNATURE_VERIFY,                                   \
-          (void (*)(void))ecdsa_verify },                               \
+            (void (*)(void))ecdsa_verify },                             \
         { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_INIT,                      \
-          (void (*)(void))ecdsa_##md##_verify_message_init },           \
+            (void (*)(void))ecdsa_##md##_verify_message_init },         \
         { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_UPDATE,                    \
-          (void (*)(void))ecdsa_signverify_message_update },            \
+            (void (*)(void))ecdsa_signverify_message_update },          \
         { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_FINAL,                     \
-          (void (*)(void))ecdsa_verify_message_final },                 \
+            (void (*)(void))ecdsa_verify_message_final },               \
         { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))ecdsa_freectx }, \
         { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))ecdsa_dupctx },   \
         { OSSL_FUNC_SIGNATURE_QUERY_KEY_TYPES,                          \
-          (void (*)(void))ecdsa_sigalg_query_key_types },               \
+            (void (*)(void))ecdsa_sigalg_query_key_types },             \
         { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                           \
-          (void (*)(void))ecdsa_get_ctx_params },                       \
+            (void (*)(void))ecdsa_get_ctx_params },                     \
         { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,                      \
-          (void (*)(void))ecdsa_gettable_ctx_params },                  \
+            (void (*)(void))ecdsa_gettable_ctx_params },                \
         { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,                           \
-          (void (*)(void))ecdsa_sigalg_set_ctx_params },                \
+            (void (*)(void))ecdsa_sigalg_set_ctx_params },              \
         { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,                      \
-          (void (*)(void))ecdsa_sigalg_settable_ctx_params },           \
+            (void (*)(void))ecdsa_sigalg_settable_ctx_params },         \
         OSSL_DISPATCH_END                                               \
     }
 
+/* clang-format off */
 IMPL_ECDSA_SIGALG(sha1, SHA1);
 IMPL_ECDSA_SIGALG(sha224, SHA2-224);
 IMPL_ECDSA_SIGALG(sha256, SHA2-256);
@@ -1098,3 +1101,4 @@ IMPL_ECDSA_SIGALG(sha3_224, SHA3-224);
 IMPL_ECDSA_SIGALG(sha3_256, SHA3-256);
 IMPL_ECDSA_SIGALG(sha3_384, SHA3-384);
 IMPL_ECDSA_SIGALG(sha3_512, SHA3-512);
+/* clang-format on */
diff --git a/providers/implementations/signature/eddsa_sig.c b/providers/implementations/signature/eddsa_sig.c
index 28b17eab93f30..d67f98e558b93 100644
--- a/providers/implementations/signature/eddsa_sig.c
+++ b/providers/implementations/signature/eddsa_sig.c
@@ -24,23 +24,23 @@
 #include "crypto/ecx.h"
 
 #ifdef S390X_EC_ASM
-# include "s390x_arch.h"
+#include "s390x_arch.h"
 
-# define S390X_CAN_SIGN(edtype)                                                \
-((OPENSSL_s390xcap_P.pcc[1] & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_##edtype))    \
-&& (OPENSSL_s390xcap_P.kdsa[0] & S390X_CAPBIT(S390X_EDDSA_SIGN_##edtype))      \
-&& (OPENSSL_s390xcap_P.kdsa[0] & S390X_CAPBIT(S390X_EDDSA_VERIFY_##edtype)))
+#define S390X_CAN_SIGN(edtype)                                                    \
+    ((OPENSSL_s390xcap_P.pcc[1] & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_##edtype))   \
+        && (OPENSSL_s390xcap_P.kdsa[0] & S390X_CAPBIT(S390X_EDDSA_SIGN_##edtype)) \
+        && (OPENSSL_s390xcap_P.kdsa[0] & S390X_CAPBIT(S390X_EDDSA_VERIFY_##edtype)))
 
 static int s390x_ed25519_digestsign(const ECX_KEY *edkey, unsigned char *sig,
-                                    const unsigned char *tbs, size_t tbslen);
+    const unsigned char *tbs, size_t tbslen);
 static int s390x_ed448_digestsign(const ECX_KEY *edkey, unsigned char *sig,
-                                  const unsigned char *tbs, size_t tbslen);
+    const unsigned char *tbs, size_t tbslen);
 static int s390x_ed25519_digestverify(const ECX_KEY *edkey,
-                                      const unsigned char *sig,
-                                      const unsigned char *tbs, size_t tbslen);
+    const unsigned char *sig,
+    const unsigned char *tbs, size_t tbslen);
 static int s390x_ed448_digestverify(const ECX_KEY *edkey,
-                                    const unsigned char *sig,
-                                    const unsigned char *tbs, size_t tbslen);
+    const unsigned char *sig,
+    const unsigned char *tbs, size_t tbslen);
 
 #endif /* S390X_EC_ASM */
 
@@ -53,11 +53,11 @@ enum ID_EdDSA_INSTANCE {
     ID_Ed448ph
 };
 
-#define SN_Ed25519    "Ed25519"
-#define SN_Ed25519ph  "Ed25519ph"
+#define SN_Ed25519 "Ed25519"
+#define SN_Ed25519ph "Ed25519ph"
 #define SN_Ed25519ctx "Ed25519ctx"
-#define SN_Ed448      "Ed448"
-#define SN_Ed448ph    "Ed448ph"
+#define SN_Ed448 "Ed448"
+#define SN_Ed448ph "Ed448ph"
 
 #define EDDSA_MAX_CONTEXT_STRING_LEN 255
 #define EDDSA_PREHASH_OUTPUT_LEN 64
@@ -141,7 +141,7 @@ typedef struct {
 
     /* The Algorithm Identifier of the signature algorithm */
     unsigned char aid_buf[OSSL_MAX_ALGORITHM_ID_SIZE];
-    size_t  aid_len;
+    size_t aid_len;
 
     /* id indicating the EdDSA instance */
     int instance_id;
@@ -178,8 +178,8 @@ static void *eddsa_newctx(void *provctx, const char *propq_unused)
 }
 
 static int eddsa_setup_instance(void *vpeddsactx, int instance_id,
-                                unsigned int instance_id_preset,
-                                unsigned int prehash_by_caller)
+    unsigned int instance_id_preset,
+    unsigned int prehash_by_caller)
 {
     PROV_EDDSA_CTX *peddsactx = (PROV_EDDSA_CTX *)vpeddsactx;
 
@@ -191,6 +191,7 @@ static int eddsa_setup_instance(void *vpeddsactx, int instance_id,
         peddsactx->prehash_flag = 0;
         peddsactx->context_string_flag = 0;
         break;
+#ifndef FIPS_MODULE
     case ID_Ed25519ctx:
         if (peddsactx->key->type != ECX_KEY_TYPE_ED25519)
             return 0;
@@ -198,6 +199,7 @@ static int eddsa_setup_instance(void *vpeddsactx, int instance_id,
         peddsactx->prehash_flag = 0;
         peddsactx->context_string_flag = 1;
         break;
+#endif
     case ID_Ed25519ph:
         if (peddsactx->key->type != ECX_KEY_TYPE_ED25519)
             return 0;
@@ -292,7 +294,7 @@ static int eddsa_signverify_init(void *vpeddsactx, void *vedkey)
 }
 
 static int ed25519_signverify_message_init(void *vpeddsactx, void *vedkey,
-                                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eddsa_signverify_init(vpeddsactx, vedkey)
         && eddsa_setup_instance(vpeddsactx, ID_Ed25519, 1, 0)
@@ -300,7 +302,7 @@ static int ed25519_signverify_message_init(void *vpeddsactx, void *vedkey,
 }
 
 static int ed25519ph_signverify_message_init(void *vpeddsactx, void *vedkey,
-                                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eddsa_signverify_init(vpeddsactx, vedkey)
         && eddsa_setup_instance(vpeddsactx, ID_Ed25519ph, 1, 0)
@@ -308,7 +310,7 @@ static int ed25519ph_signverify_message_init(void *vpeddsactx, void *vedkey,
 }
 
 static int ed25519ph_signverify_init(void *vpeddsactx, void *vedkey,
-                                     const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eddsa_signverify_init(vpeddsactx, vedkey)
         && eddsa_setup_instance(vpeddsactx, ID_Ed25519ph, 1, 1)
@@ -322,7 +324,7 @@ static int ed25519ph_signverify_init(void *vpeddsactx, void *vedkey,
  * and ed25519_verify())
  */
 static int ed25519_signverify_init(void *vpeddsactx, void *vedkey,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eddsa_signverify_init(vpeddsactx, vedkey)
         && eddsa_setup_instance(vpeddsactx, ID_Ed25519, 0, 1)
@@ -330,7 +332,7 @@ static int ed25519_signverify_init(void *vpeddsactx, void *vedkey,
 }
 
 static int ed25519ctx_signverify_message_init(void *vpeddsactx, void *vedkey,
-                                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eddsa_signverify_init(vpeddsactx, vedkey)
         && eddsa_setup_instance(vpeddsactx, ID_Ed25519ctx, 1, 0)
@@ -338,7 +340,7 @@ static int ed25519ctx_signverify_message_init(void *vpeddsactx, void *vedkey,
 }
 
 static int ed448_signverify_message_init(void *vpeddsactx, void *vedkey,
-                                         const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eddsa_signverify_init(vpeddsactx, vedkey)
         && eddsa_setup_instance(vpeddsactx, ID_Ed448, 1, 0)
@@ -346,7 +348,7 @@ static int ed448_signverify_message_init(void *vpeddsactx, void *vedkey,
 }
 
 static int ed448ph_signverify_message_init(void *vpeddsactx, void *vedkey,
-                                           const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eddsa_signverify_init(vpeddsactx, vedkey)
         && eddsa_setup_instance(vpeddsactx, ID_Ed448ph, 1, 0)
@@ -354,7 +356,7 @@ static int ed448ph_signverify_message_init(void *vpeddsactx, void *vedkey,
 }
 
 static int ed448ph_signverify_init(void *vpeddsactx, void *vedkey,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eddsa_signverify_init(vpeddsactx, vedkey)
         && eddsa_setup_instance(vpeddsactx, ID_Ed448ph, 1, 1)
@@ -368,7 +370,7 @@ static int ed448ph_signverify_init(void *vpeddsactx, void *vedkey,
  * and ed448_verify())
  */
 static int ed448_signverify_init(void *vpeddsactx, void *vedkey,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return eddsa_signverify_init(vpeddsactx, vedkey)
         && eddsa_setup_instance(vpeddsactx, ID_Ed448, 0, 1)
@@ -380,8 +382,8 @@ static int ed448_signverify_init(void *vpeddsactx, void *vedkey,
  * for OSSL_FUNC_SIGNATURE_DIGEST_SIGN
  */
 static int ed25519_sign(void *vpeddsactx,
-                        unsigned char *sigret, size_t *siglen, size_t sigsize,
-                        const unsigned char *tbs, size_t tbslen)
+    unsigned char *sigret, size_t *siglen, size_t sigsize,
+    const unsigned char *tbs, size_t tbslen)
 {
     PROV_EDDSA_CTX *peddsactx = (PROV_EDDSA_CTX *)vpeddsactx;
     const ECX_KEY *edkey = peddsactx->key;
@@ -410,11 +412,11 @@ static int ed25519_sign(void *vpeddsactx,
      * is provided.
      */
     if (S390X_CAN_SIGN(ED25519)
-            && !peddsactx->dom2_flag
-            && !peddsactx->context_string_flag
-            && peddsactx->context_string_len == 0
-            && !peddsactx->prehash_flag
-            && !peddsactx->prehash_by_caller_flag) {
+        && !peddsactx->dom2_flag
+        && !peddsactx->context_string_flag
+        && peddsactx->context_string_len == 0
+        && !peddsactx->prehash_flag
+        && !peddsactx->prehash_by_caller_flag) {
         if (s390x_ed25519_digestsign(edkey, sigret, tbs, tbslen) == 0) {
             ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SIGN);
             return 0;
@@ -427,7 +429,7 @@ static int ed25519_sign(void *vpeddsactx,
     if (peddsactx->prehash_flag) {
         if (!peddsactx->prehash_by_caller_flag) {
             if (!EVP_Q_digest(peddsactx->libctx, SN_sha512, NULL,
-                              tbs, tbslen, md, &mdlen)
+                    tbs, tbslen, md, &mdlen)
                 || mdlen != EDDSA_PREHASH_OUTPUT_LEN) {
                 ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_PREHASHED_DIGEST_LENGTH);
                 return 0;
@@ -441,14 +443,15 @@ static int ed25519_sign(void *vpeddsactx,
     } else if (peddsactx->prehash_by_caller_flag) {
         /* The caller is supposed to set up a ph instance! */
         ERR_raise(ERR_LIB_PROV,
-                  PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION);
+            PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION);
         return 0;
     }
 
     if (ossl_ed25519_sign(sigret, tbs, tbslen, edkey->pubkey, edkey->privkey,
             peddsactx->dom2_flag, peddsactx->prehash_flag, peddsactx->context_string_flag,
             peddsactx->context_string, peddsactx->context_string_len,
-            peddsactx->libctx, NULL) == 0) {
+            peddsactx->libctx, NULL)
+        == 0) {
         ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SIGN);
         return 0;
     }
@@ -459,9 +462,9 @@ static int ed25519_sign(void *vpeddsactx,
 /* EVP_Q_digest() does not allow variable output length for XOFs,
    so we use this function */
 static int ed448_shake256(OSSL_LIB_CTX *libctx,
-                          const char *propq,
-                          const uint8_t *in, size_t inlen,
-                          uint8_t *out, size_t outlen)
+    const char *propq,
+    const uint8_t *in, size_t inlen,
+    uint8_t *out, size_t outlen)
 {
     int ret = 0;
     EVP_MD_CTX *hash_ctx = EVP_MD_CTX_new();
@@ -471,13 +474,13 @@ static int ed448_shake256(OSSL_LIB_CTX *libctx,
         goto err;
 
     if (!EVP_DigestInit_ex(hash_ctx, shake256, NULL)
-            || !EVP_DigestUpdate(hash_ctx, in, inlen)
-            || !EVP_DigestFinalXOF(hash_ctx, out, outlen))
+        || !EVP_DigestUpdate(hash_ctx, in, inlen)
+        || !EVP_DigestFinalXOF(hash_ctx, out, outlen))
         goto err;
 
     ret = 1;
 
- err:
+err:
     EVP_MD_CTX_free(hash_ctx);
     EVP_MD_free(shake256);
     return ret;
@@ -488,8 +491,8 @@ static int ed448_shake256(OSSL_LIB_CTX *libctx,
  * for OSSL_FUNC_SIGNATURE_DIGEST_SIGN
  */
 static int ed448_sign(void *vpeddsactx,
-                      unsigned char *sigret, size_t *siglen, size_t sigsize,
-                      const unsigned char *tbs, size_t tbslen)
+    unsigned char *sigret, size_t *siglen, size_t sigsize,
+    const unsigned char *tbs, size_t tbslen)
 {
     PROV_EDDSA_CTX *peddsactx = (PROV_EDDSA_CTX *)vpeddsactx;
     const ECX_KEY *edkey = peddsactx->key;
@@ -518,9 +521,9 @@ static int ed448_sign(void *vpeddsactx,
      * pre-hasing is provided.
      */
     if (S390X_CAN_SIGN(ED448)
-            && peddsactx->context_string_len == 0
-            && !peddsactx->prehash_flag
-            && !peddsactx->prehash_by_caller_flag) {
+        && peddsactx->context_string_len == 0
+        && !peddsactx->prehash_flag
+        && !peddsactx->prehash_by_caller_flag) {
         if (s390x_ed448_digestsign(edkey, sigret, tbs, tbslen) == 0) {
             ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SIGN);
             return 0;
@@ -543,14 +546,15 @@ static int ed448_sign(void *vpeddsactx,
     } else if (peddsactx->prehash_by_caller_flag) {
         /* The caller is supposed to set up a ph instance! */
         ERR_raise(ERR_LIB_PROV,
-                  PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION);
+            PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION);
         return 0;
     }
 
     if (ossl_ed448_sign(peddsactx->libctx, sigret, tbs, tbslen,
-                        edkey->pubkey, edkey->privkey,
-                        peddsactx->context_string, peddsactx->context_string_len,
-                        peddsactx->prehash_flag, edkey->propq) == 0) {
+            edkey->pubkey, edkey->privkey,
+            peddsactx->context_string, peddsactx->context_string_len,
+            peddsactx->prehash_flag, edkey->propq)
+        == 0) {
         ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SIGN);
         return 0;
     }
@@ -563,8 +567,8 @@ static int ed448_sign(void *vpeddsactx,
  * for OSSL_FUNC_SIGNATURE_DIGEST_VERIFY
  */
 static int ed25519_verify(void *vpeddsactx,
-                          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)
 {
     PROV_EDDSA_CTX *peddsactx = (PROV_EDDSA_CTX *)vpeddsactx;
     const ECX_KEY *edkey = peddsactx->key;
@@ -581,18 +585,18 @@ static int ed25519_verify(void *vpeddsactx,
      * pre-hasing is provided.
      */
     if (S390X_CAN_SIGN(ED25519)
-            && !peddsactx->dom2_flag
-            && !peddsactx->context_string_flag
-            && peddsactx->context_string_len == 0
-            && !peddsactx->prehash_flag
-            && !peddsactx->prehash_by_caller_flag)
+        && !peddsactx->dom2_flag
+        && !peddsactx->context_string_flag
+        && peddsactx->context_string_len == 0
+        && !peddsactx->prehash_flag
+        && !peddsactx->prehash_by_caller_flag)
         return s390x_ed25519_digestverify(edkey, sig, tbs, tbslen);
 #endif /* S390X_EC_ASM */
 
     if (peddsactx->prehash_flag) {
         if (!peddsactx->prehash_by_caller_flag) {
             if (!EVP_Q_digest(peddsactx->libctx, SN_sha512, NULL,
-                              tbs, tbslen, md, &mdlen)
+                    tbs, tbslen, md, &mdlen)
                 || mdlen != EDDSA_PREHASH_OUTPUT_LEN) {
                 ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_PREHASHED_DIGEST_LENGTH);
                 return 0;
@@ -606,14 +610,14 @@ static int ed25519_verify(void *vpeddsactx,
     } else if (peddsactx->prehash_by_caller_flag) {
         /* The caller is supposed to set up a ph instance! */
         ERR_raise(ERR_LIB_PROV,
-                  PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION);
+            PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION);
         return 0;
     }
 
     return ossl_ed25519_verify(tbs, tbslen, sig, edkey->pubkey,
-                               peddsactx->dom2_flag, peddsactx->prehash_flag, peddsactx->context_string_flag,
-                               peddsactx->context_string, peddsactx->context_string_len,
-                               peddsactx->libctx, edkey->propq);
+        peddsactx->dom2_flag, peddsactx->prehash_flag, peddsactx->context_string_flag,
+        peddsactx->context_string, peddsactx->context_string_len,
+        peddsactx->libctx, edkey->propq);
 }
 
 /*
@@ -621,8 +625,8 @@ static int ed25519_verify(void *vpeddsactx,
  * for OSSL_FUNC_SIGNATURE_DIGEST_VERIFY
  */
 static int ed448_verify(void *vpeddsactx,
-                        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)
 {
     PROV_EDDSA_CTX *peddsactx = (PROV_EDDSA_CTX *)vpeddsactx;
     const ECX_KEY *edkey = peddsactx->key;
@@ -639,9 +643,9 @@ static int ed448_verify(void *vpeddsactx,
      * pre-hasing is provided.
      */
     if (S390X_CAN_SIGN(ED448)
-            && peddsactx->context_string_len == 0
-            && !peddsactx->prehash_flag
-            && !peddsactx->prehash_by_caller_flag)
+        && peddsactx->context_string_len == 0
+        && !peddsactx->prehash_flag
+        && !peddsactx->prehash_by_caller_flag)
         return s390x_ed448_digestverify(edkey, sig, tbs, tbslen);
 #endif /* S390X_EC_ASM */
 
@@ -658,26 +662,26 @@ static int ed448_verify(void *vpeddsactx,
     } else if (peddsactx->prehash_by_caller_flag) {
         /* The caller is supposed to set up a ph instance! */
         ERR_raise(ERR_LIB_PROV,
-                  PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION);
+            PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION);
         return 0;
     }
 
     return ossl_ed448_verify(peddsactx->libctx, tbs, tbslen, sig, edkey->pubkey,
-                             peddsactx->context_string, peddsactx->context_string_len,
-                             peddsactx->prehash_flag, edkey->propq);
+        peddsactx->context_string, peddsactx->context_string_len,
+        peddsactx->prehash_flag, edkey->propq);
 }
 
 /* All digest_{sign,verify} are simple wrappers around the functions above */
 
 static int ed25519_digest_signverify_init(void *vpeddsactx, const char *mdname,
-                                          void *vedkey,
-                                          const OSSL_PARAM params[])
+    void *vedkey,
+    const OSSL_PARAM params[])
 {
     PROV_EDDSA_CTX *peddsactx = (PROV_EDDSA_CTX *)vpeddsactx;
 
     if (mdname != NULL && mdname[0] != '\0') {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                        "Explicit digest not allowed with EdDSA operations");
+            "Explicit digest not allowed with EdDSA operations");
         return 0;
     }
 
@@ -690,28 +694,28 @@ static int ed25519_digest_signverify_init(void *vpeddsactx, const char *mdname,
 }
 
 static int ed25519_digest_sign(void *vpeddsactx,
-                               unsigned char *sigret, size_t *siglen, size_t sigsize,
-                               const unsigned char *tbs, size_t tbslen)
+    unsigned char *sigret, size_t *siglen, size_t sigsize,
+    const unsigned char *tbs, size_t tbslen)
 {
     return ed25519_sign(vpeddsactx, sigret, siglen, sigsize, tbs, tbslen);
 }
 
 static int ed25519_digest_verify(void *vpeddsactx,
-                                 const unsigned char *sigret, size_t siglen,
-                                 const unsigned char *tbs, size_t tbslen)
+    const unsigned char *sigret, size_t siglen,
+    const unsigned char *tbs, size_t tbslen)
 {
     return ed25519_verify(vpeddsactx, sigret, siglen, tbs, tbslen);
 }
 
 static int ed448_digest_signverify_init(void *vpeddsactx, const char *mdname,
-                                        void *vedkey,
-                                        const OSSL_PARAM params[])
+    void *vedkey,
+    const OSSL_PARAM params[])
 {
     PROV_EDDSA_CTX *peddsactx = (PROV_EDDSA_CTX *)vpeddsactx;
 
     if (mdname != NULL && mdname[0] != '\0') {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                        "Explicit digest not allowed with EdDSA operations");
+            "Explicit digest not allowed with EdDSA operations");
         return 0;
     }
 
@@ -724,15 +728,15 @@ static int ed448_digest_signverify_init(void *vpeddsactx, const char *mdname,
 }
 
 static int ed448_digest_sign(void *vpeddsactx,
-                             unsigned char *sigret, size_t *siglen, size_t sigsize,
-                             const unsigned char *tbs, size_t tbslen)
+    unsigned char *sigret, size_t *siglen, size_t sigsize,
+    const unsigned char *tbs, size_t tbslen)
 {
     return ed448_sign(vpeddsactx, sigret, siglen, sigsize, tbs, tbslen);
 }
 
 static int ed448_digest_verify(void *vpeddsactx,
-                               const unsigned char *sigret, size_t siglen,
-                               const unsigned char *tbs, size_t tbslen)
+    const unsigned char *sigret, size_t siglen,
+    const unsigned char *tbs, size_t tbslen)
 {
     return ed448_verify(vpeddsactx, sigret, siglen, tbs, tbslen);
 }
@@ -768,7 +772,7 @@ static void *eddsa_dupctx(void *vpeddsactx)
     dstctx->key = srcctx->key;
 
     return dstctx;
- err:
+err:
     eddsa_freectx(dstctx);
     return NULL;
 }
@@ -787,8 +791,6 @@ static const char **ed448_sigalg_query_key_types(void)
     return keytypes;
 }
 
-
-
 static int eddsa_get_ctx_params(void *vpeddsactx, OSSL_PARAM *params)
 {
     PROV_EDDSA_CTX *peddsactx = (PROV_EDDSA_CTX *)vpeddsactx;
@@ -800,8 +802,8 @@ static int eddsa_get_ctx_params(void *vpeddsactx, OSSL_PARAM *params)
     p = OSSL_PARAM_locate(params, OSSL_SIGNATURE_PARAM_ALGORITHM_ID);
     if (p != NULL
         && !OSSL_PARAM_set_octet_string(p,
-                                        peddsactx->aid_len == 0 ? NULL : peddsactx->aid_buf,
-                                        peddsactx->aid_len))
+            peddsactx->aid_len == 0 ? NULL : peddsactx->aid_buf,
+            peddsactx->aid_len))
         return 0;
 
     return 1;
@@ -815,7 +817,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *eddsa_gettable_ctx_params(ossl_unused void *vpeddsactx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -838,8 +840,8 @@ static int eddsa_set_ctx_params(void *vpeddsactx, const OSSL_PARAM params[])
         if (peddsactx->instance_id_preset_flag) {
             /* When the instance is preset, the caller must no try to set it */
             ERR_raise_data(ERR_LIB_PROV, PROV_R_NO_INSTANCE_ALLOWED,
-                           "the EdDSA instance is preset, you may not try to specify it",
-                           NULL);
+                "the EdDSA instance is preset, you may not try to specify it",
+                NULL);
             return 0;
         }
 
@@ -854,24 +856,29 @@ static int eddsa_set_ctx_params(void *vpeddsactx, const OSSL_PARAM params[])
          */
         if (OPENSSL_strcasecmp(pinstance_name, SN_Ed25519) == 0) {
             eddsa_setup_instance(peddsactx, ID_Ed25519, 0,
-                                 peddsactx->prehash_by_caller_flag);
+                peddsactx->prehash_by_caller_flag);
+#ifndef FIPS_MODULE
         } else if (OPENSSL_strcasecmp(pinstance_name, SN_Ed25519ctx) == 0) {
             eddsa_setup_instance(peddsactx, ID_Ed25519ctx, 0,
-                                 peddsactx->prehash_by_caller_flag);
+                peddsactx->prehash_by_caller_flag);
+#endif
         } else if (OPENSSL_strcasecmp(pinstance_name, SN_Ed25519ph) == 0) {
             eddsa_setup_instance(peddsactx, ID_Ed25519ph, 0,
-                                 peddsactx->prehash_by_caller_flag);
+                peddsactx->prehash_by_caller_flag);
         } else if (OPENSSL_strcasecmp(pinstance_name, SN_Ed448) == 0) {
             eddsa_setup_instance(peddsactx, ID_Ed448, 0,
-                                 peddsactx->prehash_by_caller_flag);
+                peddsactx->prehash_by_caller_flag);
         } else if (OPENSSL_strcasecmp(pinstance_name, SN_Ed448ph) == 0) {
             eddsa_setup_instance(peddsactx, ID_Ed448ph, 0,
-                                 peddsactx->prehash_by_caller_flag);
+                peddsactx->prehash_by_caller_flag);
         } else {
             /* we did not recognize the instance */
+            ERR_raise_data(ERR_LIB_PROV,
+                PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION,
+                "unknown INSTANCE name: %s",
+                pinstance_name != NULL ? pinstance_name : "<null>");
             return 0;
         }
-
     }
 
     p = OSSL_PARAM_locate_const(params, OSSL_SIGNATURE_PARAM_CONTEXT_STRING);
@@ -894,7 +901,7 @@ static const OSSL_PARAM settable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *eddsa_settable_ctx_params(ossl_unused void *vpeddsactx,
-                                                   ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return settable_ctx_params;
 }
@@ -906,7 +913,7 @@ static const OSSL_PARAM settable_variant_ctx_params[] = {
 
 static const OSSL_PARAM *
 eddsa_settable_variant_ctx_params(ossl_unused void *vpeddsactx,
-                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return settable_variant_ctx_params;
 }
@@ -941,112 +948,112 @@ eddsa_settable_variant_ctx_params(ossl_unused void *vpeddsactx,
  * - EVP_PKEY_verify_message_init()
  */
 
-#define ed25519_DISPATCH_END                                            \
-    { OSSL_FUNC_SIGNATURE_SIGN_INIT,                                    \
-        (void (*)(void))ed25519_signverify_init },                      \
-    { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                                  \
-        (void (*)(void))ed25519_signverify_init },                      \
-    { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,                             \
-        (void (*)(void))ed25519_digest_signverify_init },               \
-    { OSSL_FUNC_SIGNATURE_DIGEST_SIGN,                                  \
-        (void (*)(void))ed25519_digest_sign },                          \
-    { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT,                           \
-        (void (*)(void))ed25519_digest_signverify_init },               \
-    { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY,                                \
-        (void (*)(void))ed25519_digest_verify },                        \
-    { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                               \
-        (void (*)(void))eddsa_get_ctx_params },                         \
-    { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,                          \
-        (void (*)(void))eddsa_gettable_ctx_params },                    \
-    { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,                               \
-        (void (*)(void))eddsa_set_ctx_params },                         \
-    { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,                          \
-        (void (*)(void))eddsa_settable_ctx_params },                    \
-    OSSL_DISPATCH_END
-
-#define eddsa_variant_DISPATCH_END(v)                                   \
-    { OSSL_FUNC_SIGNATURE_SIGN_INIT,                                    \
-        (void (*)(void))v##_signverify_message_init },                  \
-    { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                                  \
-        (void (*)(void))v##_signverify_message_init },                  \
-    { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                               \
-        (void (*)(void))eddsa_get_ctx_params },                         \
-    { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,                          \
-        (void (*)(void))eddsa_gettable_ctx_params },                    \
-    { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,                               \
-        (void (*)(void))eddsa_set_ctx_params },                         \
-    { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,                          \
-        (void (*)(void))eddsa_settable_variant_ctx_params },            \
-    OSSL_DISPATCH_END
-
-#define ed25519ph_DISPATCH_END                                          \
-    { OSSL_FUNC_SIGNATURE_SIGN_INIT,                                    \
-        (void (*)(void))ed25519ph_signverify_init },                    \
-    { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                                  \
-        (void (*)(void))ed25519ph_signverify_init },                    \
-    eddsa_variant_DISPATCH_END(ed25519ph)
+#define ed25519_DISPATCH_END                                  \
+    { OSSL_FUNC_SIGNATURE_SIGN_INIT,                          \
+        (void (*)(void))ed25519_signverify_init },            \
+        { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                    \
+            (void (*)(void))ed25519_signverify_init },        \
+        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,               \
+            (void (*)(void))ed25519_digest_signverify_init }, \
+        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN,                    \
+            (void (*)(void))ed25519_digest_sign },            \
+        { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT,             \
+            (void (*)(void))ed25519_digest_signverify_init }, \
+        { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY,                  \
+            (void (*)(void))ed25519_digest_verify },          \
+        { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                 \
+            (void (*)(void))eddsa_get_ctx_params },           \
+        { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,            \
+            (void (*)(void))eddsa_gettable_ctx_params },      \
+        { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,                 \
+            (void (*)(void))eddsa_set_ctx_params },           \
+        { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,            \
+            (void (*)(void))eddsa_settable_ctx_params },      \
+        OSSL_DISPATCH_END
+
+#define eddsa_variant_DISPATCH_END(v)                            \
+    { OSSL_FUNC_SIGNATURE_SIGN_INIT,                             \
+        (void (*)(void))v##_signverify_message_init },           \
+        { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                       \
+            (void (*)(void))v##_signverify_message_init },       \
+        { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                    \
+            (void (*)(void))eddsa_get_ctx_params },              \
+        { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,               \
+            (void (*)(void))eddsa_gettable_ctx_params },         \
+        { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,                    \
+            (void (*)(void))eddsa_set_ctx_params },              \
+        { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,               \
+            (void (*)(void))eddsa_settable_variant_ctx_params }, \
+        OSSL_DISPATCH_END
+
+#define ed25519ph_DISPATCH_END                           \
+    { OSSL_FUNC_SIGNATURE_SIGN_INIT,                     \
+        (void (*)(void))ed25519ph_signverify_init },     \
+        { OSSL_FUNC_SIGNATURE_VERIFY_INIT,               \
+            (void (*)(void))ed25519ph_signverify_init }, \
+        eddsa_variant_DISPATCH_END(ed25519ph)
 
 #define ed25519ctx_DISPATCH_END eddsa_variant_DISPATCH_END(ed25519ctx)
 
-#define ed448_DISPATCH_END                                              \
-    { OSSL_FUNC_SIGNATURE_SIGN_INIT,                                    \
-        (void (*)(void))ed448_signverify_init },                        \
-    { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                                  \
-        (void (*)(void))ed448_signverify_init },                        \
-    { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,                             \
-        (void (*)(void))ed448_digest_signverify_init },                 \
-    { OSSL_FUNC_SIGNATURE_DIGEST_SIGN,                                  \
-        (void (*)(void))ed448_digest_sign },                            \
-    { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT,                           \
-        (void (*)(void))ed448_digest_signverify_init },                 \
-    { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY,                                \
-        (void (*)(void))ed448_digest_verify },                          \
-    { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                               \
-        (void (*)(void))eddsa_get_ctx_params },                         \
-    { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,                          \
-        (void (*)(void))eddsa_gettable_ctx_params },                    \
-    { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,                               \
-        (void (*)(void))eddsa_set_ctx_params },                         \
-    { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,                          \
-        (void (*)(void))eddsa_settable_ctx_params },                    \
-    OSSL_DISPATCH_END
-
-#define ed448ph_DISPATCH_END                                            \
-    { OSSL_FUNC_SIGNATURE_SIGN_INIT,                                    \
-        (void (*)(void))ed448ph_signverify_init },                      \
-    { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                                  \
-        (void (*)(void))ed448ph_signverify_init },                      \
-    eddsa_variant_DISPATCH_END(ed448ph)
+#define ed448_DISPATCH_END                                  \
+    { OSSL_FUNC_SIGNATURE_SIGN_INIT,                        \
+        (void (*)(void))ed448_signverify_init },            \
+        { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                  \
+            (void (*)(void))ed448_signverify_init },        \
+        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,             \
+            (void (*)(void))ed448_digest_signverify_init }, \
+        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN,                  \
+            (void (*)(void))ed448_digest_sign },            \
+        { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT,           \
+            (void (*)(void))ed448_digest_signverify_init }, \
+        { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY,                \
+            (void (*)(void))ed448_digest_verify },          \
+        { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,               \
+            (void (*)(void))eddsa_get_ctx_params },         \
+        { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,          \
+            (void (*)(void))eddsa_gettable_ctx_params },    \
+        { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,               \
+            (void (*)(void))eddsa_set_ctx_params },         \
+        { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,          \
+            (void (*)(void))eddsa_settable_ctx_params },    \
+        OSSL_DISPATCH_END
+
+#define ed448ph_DISPATCH_END                           \
+    { OSSL_FUNC_SIGNATURE_SIGN_INIT,                   \
+        (void (*)(void))ed448ph_signverify_init },     \
+        { OSSL_FUNC_SIGNATURE_VERIFY_INIT,             \
+            (void (*)(void))ed448ph_signverify_init }, \
+        eddsa_variant_DISPATCH_END(ed448ph)
 
 /* vn = variant name, bn = base name */
-#define IMPL_EDDSA_DISPATCH(vn,bn)                                      \
+#define IMPL_EDDSA_DISPATCH(vn, bn)                                     \
     const OSSL_DISPATCH ossl_##vn##_signature_functions[] = {           \
         { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))eddsa_newctx },   \
         { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_INIT,                        \
-          (void (*)(void))vn##_signverify_message_init },               \
+            (void (*)(void))vn##_signverify_message_init },             \
         { OSSL_FUNC_SIGNATURE_SIGN,                                     \
-          (void (*)(void))bn##_sign },                                  \
+            (void (*)(void))bn##_sign },                                \
         { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_INIT,                      \
-          (void (*)(void))vn##_signverify_message_init },               \
+            (void (*)(void))vn##_signverify_message_init },             \
         { OSSL_FUNC_SIGNATURE_VERIFY,                                   \
-          (void (*)(void))bn##_verify },                                \
+            (void (*)(void))bn##_verify },                              \
         { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))eddsa_freectx }, \
         { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))eddsa_dupctx },   \
         { OSSL_FUNC_SIGNATURE_QUERY_KEY_TYPES,                          \
-          (void (*)(void))bn##_sigalg_query_key_types },                \
+            (void (*)(void))bn##_sigalg_query_key_types },              \
         vn##_DISPATCH_END                                               \
     }
 
-IMPL_EDDSA_DISPATCH(ed25519,ed25519);
-IMPL_EDDSA_DISPATCH(ed25519ph,ed25519);
-IMPL_EDDSA_DISPATCH(ed25519ctx,ed25519);
-IMPL_EDDSA_DISPATCH(ed448,ed448);
-IMPL_EDDSA_DISPATCH(ed448ph,ed448);
+IMPL_EDDSA_DISPATCH(ed25519, ed25519);
+IMPL_EDDSA_DISPATCH(ed25519ph, ed25519);
+IMPL_EDDSA_DISPATCH(ed25519ctx, ed25519);
+IMPL_EDDSA_DISPATCH(ed448, ed448);
+IMPL_EDDSA_DISPATCH(ed448ph, ed448);
 
 #ifdef S390X_EC_ASM
 
 static int s390x_ed25519_digestsign(const ECX_KEY *edkey, unsigned char *sig,
-                                    const unsigned char *tbs, size_t tbslen)
+    const unsigned char *tbs, size_t tbslen)
 {
     int rc;
     union {
@@ -1071,7 +1078,7 @@ static int s390x_ed25519_digestsign(const ECX_KEY *edkey, unsigned char *sig,
 }
 
 static int s390x_ed448_digestsign(const ECX_KEY *edkey, unsigned char *sig,
-                                  const unsigned char *tbs, size_t tbslen)
+    const unsigned char *tbs, size_t tbslen)
 {
     int rc;
     union {
@@ -1098,8 +1105,8 @@ static int s390x_ed448_digestsign(const ECX_KEY *edkey, unsigned char *sig,
 }
 
 static int s390x_ed25519_digestverify(const ECX_KEY *edkey,
-                                      const unsigned char *sig,
-                                      const unsigned char *tbs, size_t tbslen)
+    const unsigned char *sig,
+    const unsigned char *tbs, size_t tbslen)
 {
     union {
         struct {
@@ -1115,13 +1122,16 @@ static int s390x_ed25519_digestverify(const ECX_KEY *edkey,
     s390x_flip_endian32(param.ed25519.pub, edkey->pubkey);
 
     return s390x_kdsa(S390X_EDDSA_VERIFY_ED25519,
-                      &param.ed25519, tbs, tbslen) == 0 ? 1 : 0;
+               &param.ed25519, tbs, tbslen)
+            == 0
+        ? 1
+        : 0;
 }
 
 static int s390x_ed448_digestverify(const ECX_KEY *edkey,
-                                    const unsigned char *sig,
-                                    const unsigned char *tbs,
-                                    size_t tbslen)
+    const unsigned char *sig,
+    const unsigned char *tbs,
+    size_t tbslen)
 {
     union {
         struct {
@@ -1140,7 +1150,10 @@ static int s390x_ed448_digestverify(const ECX_KEY *edkey,
     s390x_flip_endian64(param.ed448.pub, param.ed448.pub);
 
     return s390x_kdsa(S390X_EDDSA_VERIFY_ED448,
-                      &param.ed448, tbs, tbslen) == 0 ? 1 : 0;
+               &param.ed448, tbs, tbslen)
+            == 0
+        ? 1
+        : 0;
 }
 
 #endif /* S390X_EC_ASM */
diff --git a/providers/implementations/signature/mac_legacy_sig.c b/providers/implementations/signature/mac_legacy_sig.c
index b25a74506ab02..1aa13a5692766 100644
--- a/providers/implementations/signature/mac_legacy_sig.c
+++ b/providers/implementations/signature/mac_legacy_sig.c
@@ -18,7 +18,7 @@
 #include <openssl/err.h>
 #include <openssl/proverr.h>
 #ifndef FIPS_MODULE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include "prov/implementations.h"
 #include "prov/provider_ctx.h"
@@ -75,17 +75,17 @@ static void *mac_newctx(void *provctx, const char *propq, const char *macname)
 
     return pmacctx;
 
- err:
+err:
     OPENSSL_free(pmacctx->propq);
     OPENSSL_free(pmacctx);
     EVP_MAC_free(mac);
     return NULL;
 }
 
-#define MAC_NEWCTX(funcname, macname) \
+#define MAC_NEWCTX(funcname, macname)                                      \
     static void *mac_##funcname##_newctx(void *provctx, const char *propq) \
-    { \
-        return mac_newctx(provctx, propq, macname); \
+    {                                                                      \
+        return mac_newctx(provctx, propq, macname);                        \
     }
 
 MAC_NEWCTX(hmac, "HMAC")
@@ -94,7 +94,7 @@ MAC_NEWCTX(poly1305, "POLY1305")
 MAC_NEWCTX(cmac, "CMAC")
 
 static int mac_digest_sign_init(void *vpmacctx, const char *mdname, void *vkey,
-                                const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     PROV_MAC_CTX *pmacctx = (PROV_MAC_CTX *)vpmacctx;
     const char *ciphername = NULL, *engine = NULL;
@@ -123,22 +123,22 @@ static int mac_digest_sign_init(void *vpmacctx, const char *mdname, void *vkey,
 #endif
 
     if (!ossl_prov_set_macctx(pmacctx->macctx, NULL,
-                              (char *)ciphername,
-                              (char *)mdname,
-                              (char *)engine,
-                              pmacctx->key->properties,
-                              NULL, 0))
+            (char *)ciphername,
+            (char *)mdname,
+            (char *)engine,
+            pmacctx->key->properties,
+            NULL, 0))
         return 0;
 
     if (!EVP_MAC_init(pmacctx->macctx, pmacctx->key->priv_key,
-                      pmacctx->key->priv_key_len, params))
+            pmacctx->key->priv_key_len, params))
         return 0;
 
     return 1;
 }
 
 int mac_digest_sign_update(void *vpmacctx, const unsigned char *data,
-                           size_t datalen)
+    size_t datalen)
 {
     PROV_MAC_CTX *pmacctx = (PROV_MAC_CTX *)vpmacctx;
 
@@ -149,7 +149,7 @@ int mac_digest_sign_update(void *vpmacctx, const unsigned char *data,
 }
 
 int mac_digest_sign_final(void *vpmacctx, unsigned char *mac, size_t *maclen,
-                          size_t macsize)
+    size_t macsize)
 {
     PROV_MAC_CTX *pmacctx = (PROV_MAC_CTX *)vpmacctx;
 
@@ -200,7 +200,7 @@ static void *mac_dupctx(void *vpmacctx)
     }
 
     return dstctx;
- err:
+err:
     mac_freectx(dstctx);
     return NULL;
 }
@@ -213,11 +213,11 @@ static int mac_set_ctx_params(void *vpmacctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *mac_settable_ctx_params(ossl_unused void *ctx,
-                                                 void *provctx,
-                                                 const char *macname)
+    void *provctx,
+    const char *macname)
 {
     EVP_MAC *mac = EVP_MAC_fetch(PROV_LIBCTX_OF(provctx), macname,
-                                 NULL);
+        NULL);
     const OSSL_PARAM *params;
 
     if (mac == NULL)
@@ -229,11 +229,11 @@ static const OSSL_PARAM *mac_settable_ctx_params(ossl_unused void *ctx,
     return params;
 }
 
-#define MAC_SETTABLE_CTX_PARAMS(funcname, macname) \
+#define MAC_SETTABLE_CTX_PARAMS(funcname, macname)                           \
     static const OSSL_PARAM *mac_##funcname##_settable_ctx_params(void *ctx, \
-                                                                  void *provctx) \
-    { \
-        return mac_settable_ctx_params(ctx, provctx, macname); \
+        void *provctx)                                                       \
+    {                                                                        \
+        return mac_settable_ctx_params(ctx, provctx, macname);               \
     }
 
 MAC_SETTABLE_CTX_PARAMS(hmac, "HMAC")
@@ -241,22 +241,22 @@ MAC_SETTABLE_CTX_PARAMS(siphash, "SIPHASH")
 MAC_SETTABLE_CTX_PARAMS(poly1305, "POLY1305")
 MAC_SETTABLE_CTX_PARAMS(cmac, "CMAC")
 
-#define MAC_SIGNATURE_FUNCTIONS(funcname) \
-    const OSSL_DISPATCH ossl_mac_legacy_##funcname##_signature_functions[] = { \
+#define MAC_SIGNATURE_FUNCTIONS(funcname)                                        \
+    const OSSL_DISPATCH ossl_mac_legacy_##funcname##_signature_functions[] = {   \
         { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))mac_##funcname##_newctx }, \
-        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT, \
-        (void (*)(void))mac_digest_sign_init }, \
-        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_UPDATE, \
-        (void (*)(void))mac_digest_sign_update }, \
-        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_FINAL, \
-        (void (*)(void))mac_digest_sign_final }, \
-        { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))mac_freectx }, \
-        { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))mac_dupctx }, \
-        { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS, \
-          (void (*)(void))mac_set_ctx_params }, \
-        { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS, \
-          (void (*)(void))mac_##funcname##_settable_ctx_params }, \
-        OSSL_DISPATCH_END \
+        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,                                  \
+            (void (*)(void))mac_digest_sign_init },                              \
+        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_UPDATE,                                \
+            (void (*)(void))mac_digest_sign_update },                            \
+        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_FINAL,                                 \
+            (void (*)(void))mac_digest_sign_final },                             \
+        { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))mac_freectx },            \
+        { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))mac_dupctx },              \
+        { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,                                    \
+            (void (*)(void))mac_set_ctx_params },                                \
+        { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,                               \
+            (void (*)(void))mac_##funcname##_settable_ctx_params },              \
+        OSSL_DISPATCH_END                                                        \
     };
 
 MAC_SIGNATURE_FUNCTIONS(hmac)
diff --git a/providers/implementations/signature/ml_dsa_sig.c b/providers/implementations/signature/ml_dsa_sig.c
index e235e31752ebb..c7c21675bebdd 100644
--- a/providers/implementations/signature/ml_dsa_sig.c
+++ b/providers/implementations/signature/ml_dsa_sig.c
@@ -23,7 +23,7 @@
 #include "internal/packet.h"
 #include "internal/sizes.h"
 
-#define ML_DSA_MESSAGE_ENCODE_RAW  0
+#define ML_DSA_MESSAGE_ENCODE_RAW 0
 #define ML_DSA_MESSAGE_ENCODE_PURE 1
 
 static OSSL_FUNC_signature_sign_message_init_fn ml_dsa_sign_msg_init;
@@ -52,8 +52,8 @@ typedef struct {
     int evp_type;
     /* The Algorithm Identifier of the signature algorithm */
     uint8_t aid_buf[OSSL_MAX_ALGORITHM_ID_SIZE];
-    size_t  aid_len;
-    int mu;     /* Flag indicating we should begin from \mu, not the message */
+    size_t aid_len;
+    int mu; /* Flag indicating we should begin from \mu, not the message */
 } PROV_ML_DSA_CTX;
 
 static void ml_dsa_freectx(void *vctx)
@@ -122,14 +122,14 @@ static int set_alg_id_buffer(PROV_ML_DSA_CTX *ctx)
 }
 
 static int ml_dsa_signverify_msg_init(void *vctx, void *vkey,
-                                      const OSSL_PARAM params[], int operation,
-                                      const char *desc)
+    const OSSL_PARAM params[], int operation,
+    const char *desc)
 {
     PROV_ML_DSA_CTX *ctx = (PROV_ML_DSA_CTX *)vctx;
     ML_DSA_KEY *key = vkey;
 
     if (!ossl_prov_is_running()
-            || ctx == NULL)
+        || ctx == NULL)
         return 0;
 
     if (vkey == NULL && ctx->key == NULL) {
@@ -151,17 +151,17 @@ static int ml_dsa_signverify_msg_init(void *vctx, void *vkey,
 static int ml_dsa_sign_msg_init(void *vctx, void *vkey, const OSSL_PARAM params[])
 {
     return ml_dsa_signverify_msg_init(vctx, vkey, params,
-                                      EVP_PKEY_OP_SIGN, "ML_DSA Sign Init");
+        EVP_PKEY_OP_SIGN, "ML_DSA Sign Init");
 }
 
 static int ml_dsa_digest_signverify_init(void *vctx, const char *mdname,
-                                         void *vkey, const OSSL_PARAM params[])
+    void *vkey, const OSSL_PARAM params[])
 {
     PROV_ML_DSA_CTX *ctx = (PROV_ML_DSA_CTX *)vctx;
 
     if (mdname != NULL && mdname[0] != '\0') {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                       "Explicit digest not supported for ML-DSA operations");
+            "Explicit digest not supported for ML-DSA operations");
         return 0;
     }
 
@@ -171,11 +171,11 @@ static int ml_dsa_digest_signverify_init(void *vctx, const char *mdname,
         return ml_dsa_set_ctx_params(ctx, params);
 
     return ml_dsa_signverify_msg_init(vctx, vkey, params,
-                                      EVP_PKEY_OP_SIGN, "ML_DSA Sign Init");
+        EVP_PKEY_OP_SIGN, "ML_DSA Sign Init");
 }
 
 static int ml_dsa_sign(void *vctx, uint8_t *sig, size_t *siglen, size_t sigsize,
-                       const uint8_t *msg, size_t msg_len)
+    const uint8_t *msg, size_t msg_len)
 {
     int ret = 0;
     PROV_ML_DSA_CTX *ctx = (PROV_ML_DSA_CTX *)vctx;
@@ -197,16 +197,16 @@ static int ml_dsa_sign(void *vctx, uint8_t *sig, size_t *siglen, size_t sigsize,
         }
     }
     ret = ossl_ml_dsa_sign(ctx->key, ctx->mu, msg, msg_len,
-                           ctx->context_string, ctx->context_string_len,
-                           rnd, sizeof(rand_tmp), ctx->msg_encode,
-                           sig, siglen, sigsize);
+        ctx->context_string, ctx->context_string_len,
+        rnd, sizeof(rand_tmp), ctx->msg_encode,
+        sig, siglen, sigsize);
     if (rnd != ctx->test_entropy)
         OPENSSL_cleanse(rand_tmp, sizeof(rand_tmp));
     return ret;
 }
 
 static int ml_dsa_digest_sign(void *vctx, uint8_t *sig, size_t *siglen, size_t sigsize,
-                              const uint8_t *tbs, size_t tbslen)
+    const uint8_t *tbs, size_t tbslen)
 {
     return ml_dsa_sign(vctx, sig, siglen, sigsize, tbs, tbslen);
 }
@@ -214,23 +214,23 @@ static int ml_dsa_digest_sign(void *vctx, uint8_t *sig, size_t *siglen, size_t s
 static int ml_dsa_verify_msg_init(void *vctx, void *vkey, const OSSL_PARAM params[])
 {
     return ml_dsa_signverify_msg_init(vctx, vkey, params, EVP_PKEY_OP_VERIFY,
-                                      "ML_DSA Verify Init");
+        "ML_DSA Verify Init");
 }
 
 static int ml_dsa_verify(void *vctx, const uint8_t *sig, size_t siglen,
-                         const uint8_t *msg, size_t msg_len)
+    const uint8_t *msg, size_t msg_len)
 {
     PROV_ML_DSA_CTX *ctx = (PROV_ML_DSA_CTX *)vctx;
 
     if (!ossl_prov_is_running())
         return 0;
     return ossl_ml_dsa_verify(ctx->key, ctx->mu, msg, msg_len,
-                              ctx->context_string, ctx->context_string_len,
-                              ctx->msg_encode, sig, siglen);
+        ctx->context_string, ctx->context_string_len,
+        ctx->msg_encode, sig, siglen);
 }
 static int ml_dsa_digest_verify(void *vctx,
-                                const uint8_t *sig, size_t siglen,
-                                const uint8_t *tbs, size_t tbslen)
+    const uint8_t *sig, size_t siglen,
+    const uint8_t *tbs, size_t tbslen)
 {
     return ml_dsa_verify(vctx, sig, siglen, tbs, tbslen);
 }
@@ -250,7 +250,7 @@ static int ml_dsa_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         void *vp = pctx->context_string;
 
         if (!OSSL_PARAM_get_octet_string(p, &vp, sizeof(pctx->context_string),
-                                         &(pctx->context_string_len))) {
+                &(pctx->context_string_len))) {
             pctx->context_string_len = 0;
             return 0;
         }
@@ -261,8 +261,8 @@ static int ml_dsa_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 
         pctx->test_entropy_len = 0;
         if (!OSSL_PARAM_get_octet_string(p, &vp, sizeof(pctx->test_entropy),
-                                         &(pctx->test_entropy_len)))
-                return 0;
+                &(pctx->test_entropy_len)))
+            return 0;
         if (pctx->test_entropy_len != sizeof(pctx->test_entropy)) {
             pctx->test_entropy_len = 0;
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_SEED_LENGTH);
@@ -285,7 +285,7 @@ static int ml_dsa_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *ml_dsa_settable_ctx_params(void *vctx,
-                                                    ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM settable_ctx_params[] = {
         OSSL_PARAM_octet_string(OSSL_SIGNATURE_PARAM_CONTEXT_STRING, NULL, 0),
@@ -305,7 +305,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *ml_dsa_gettable_ctx_params(ossl_unused void *vctx,
-                                                    ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -321,8 +321,8 @@ static int ml_dsa_get_ctx_params(void *vctx, OSSL_PARAM *params)
     p = OSSL_PARAM_locate(params, OSSL_SIGNATURE_PARAM_ALGORITHM_ID);
     if (p != NULL
         && !OSSL_PARAM_set_octet_string(p,
-                                        ctx->aid_len == 0 ? NULL : ctx->aid_buf,
-                                        ctx->aid_len))
+            ctx->aid_len == 0 ? NULL : ctx->aid_buf,
+            ctx->aid_len))
         return 0;
 
     return 1;
@@ -337,28 +337,28 @@ static int ml_dsa_get_ctx_params(void *vctx, OSSL_PARAM *params)
     const OSSL_DISPATCH ossl_ml_dsa_##alg##_signature_functions[] = {          \
         { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))ml_dsa_##alg##_newctx }, \
         { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_INIT,                               \
-          (void (*)(void))ml_dsa_sign_msg_init },                              \
+            (void (*)(void))ml_dsa_sign_msg_init },                            \
         { OSSL_FUNC_SIGNATURE_SIGN, (void (*)(void))ml_dsa_sign },             \
         { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_INIT,                             \
-          (void (*)(void))ml_dsa_verify_msg_init },                            \
+            (void (*)(void))ml_dsa_verify_msg_init },                          \
         { OSSL_FUNC_SIGNATURE_VERIFY, (void (*)(void))ml_dsa_verify },         \
         { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,                                \
-          (void (*)(void))ml_dsa_digest_signverify_init },                     \
+            (void (*)(void))ml_dsa_digest_signverify_init },                   \
         { OSSL_FUNC_SIGNATURE_DIGEST_SIGN,                                     \
-          (void (*)(void))ml_dsa_digest_sign },                                \
+            (void (*)(void))ml_dsa_digest_sign },                              \
         { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT,                              \
-          (void (*)(void))ml_dsa_digest_signverify_init },                     \
+            (void (*)(void))ml_dsa_digest_signverify_init },                   \
         { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY,                                   \
-          (void (*)(void))ml_dsa_digest_verify },                              \
+            (void (*)(void))ml_dsa_digest_verify },                            \
         { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))ml_dsa_freectx },       \
         { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,                                  \
-          (void (*)(void))ml_dsa_set_ctx_params },                             \
+            (void (*)(void))ml_dsa_set_ctx_params },                           \
         { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,                             \
-          (void (*)(void))ml_dsa_settable_ctx_params },                        \
+            (void (*)(void))ml_dsa_settable_ctx_params },                      \
         { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                                  \
-          (void (*)(void))ml_dsa_get_ctx_params },                             \
+            (void (*)(void))ml_dsa_get_ctx_params },                           \
         { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,                             \
-          (void (*)(void))ml_dsa_gettable_ctx_params },                        \
+            (void (*)(void))ml_dsa_gettable_ctx_params },                      \
         { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))ml_dsa_dupctx },         \
         OSSL_DISPATCH_END                                                      \
     }
diff --git a/providers/implementations/signature/rsa_sig.c b/providers/implementations/signature/rsa_sig.c
index e75b90840b9ab..fcdfebbbffdc5 100644
--- a/providers/implementations/signature/rsa_sig.c
+++ b/providers/implementations/signature/rsa_sig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -67,11 +67,11 @@ static OSSL_FUNC_signature_set_ctx_params_fn rsa_sigalg_set_ctx_params;
 static OSSL_FUNC_signature_settable_ctx_params_fn rsa_sigalg_settable_ctx_params;
 
 static OSSL_ITEM padding_item[] = {
-    { RSA_PKCS1_PADDING,        OSSL_PKEY_RSA_PAD_MODE_PKCSV15 },
-    { RSA_NO_PADDING,           OSSL_PKEY_RSA_PAD_MODE_NONE },
-    { RSA_X931_PADDING,         OSSL_PKEY_RSA_PAD_MODE_X931 },
-    { RSA_PKCS1_PSS_PADDING,    OSSL_PKEY_RSA_PAD_MODE_PSS },
-    { 0,                        NULL     }
+    { RSA_PKCS1_PADDING, OSSL_PKEY_RSA_PAD_MODE_PKCSV15 },
+    { RSA_NO_PADDING, OSSL_PKEY_RSA_PAD_MODE_NONE },
+    { RSA_X931_PADDING, OSSL_PKEY_RSA_PAD_MODE_X931 },
+    { RSA_PKCS1_PSS_PADDING, OSSL_PKEY_RSA_PAD_MODE_PSS },
+    { 0, NULL }
 };
 
 /*
@@ -108,7 +108,7 @@ typedef struct {
     unsigned int mgf1_md_set : 1;
     /*
      * Flags to say what are the possible next external calls in what
-     * consitutes the life cycle of an algorithm.  The relevant calls are:
+     * constitutes the life cycle of an algorithm.  The relevant calls are:
      * - init
      * - update
      * - final
@@ -174,8 +174,8 @@ static size_t rsa_get_md_size(const PROV_RSA_CTX *prsactx)
 }
 
 static int rsa_check_padding(const PROV_RSA_CTX *prsactx,
-                             const char *mdname, const char *mgf1_mdname,
-                             int mdnid)
+    const char *mdname, const char *mgf1_mdname,
+    int mdnid)
 {
     switch (prsactx->pad_mode) {
     case RSA_NO_PADDING:
@@ -298,17 +298,17 @@ static int rsa_pss_compute_saltlen(PROV_RSA_CTX *ctx)
         return -1;
     } else if (saltlen < ctx->min_saltlen) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_PSS_SALTLEN_TOO_SMALL,
-                       "minimum salt length: %d, actual salt length: %d",
-                       ctx->min_saltlen, saltlen);
+            "minimum salt length: %d, actual salt length: %d",
+            ctx->min_saltlen, saltlen);
         return -1;
     }
     return saltlen;
 }
 
 static unsigned char *rsa_generate_signature_aid(PROV_RSA_CTX *ctx,
-                                                 unsigned char *aid_buf,
-                                                 size_t buf_len,
-                                                 size_t *aid_len)
+    unsigned char *aid_buf,
+    size_t buf_len,
+    size_t *aid_len)
 {
     WPACKET pkt;
     unsigned char *aid = NULL;
@@ -324,7 +324,7 @@ static unsigned char *rsa_generate_signature_aid(PROV_RSA_CTX *ctx,
     switch (ctx->pad_mode) {
     case RSA_PKCS1_PADDING:
         ret = ossl_DER_w_algorithmIdentifier_MDWithRSAEncryption(&pkt, -1,
-                                                                 ctx->mdnid);
+            ctx->mdnid);
 
         if (ret > 0) {
             break;
@@ -333,8 +333,8 @@ static unsigned char *rsa_generate_signature_aid(PROV_RSA_CTX *ctx,
             goto cleanup;
         }
         ERR_raise_data(ERR_LIB_PROV, ERR_R_UNSUPPORTED,
-                       "Algorithm ID generation - md NID: %d",
-                       ctx->mdnid);
+            "Algorithm ID generation - md NID: %d",
+            ctx->mdnid);
         goto cleanup;
     case RSA_PKCS1_PSS_PADDING:
         saltlen = rsa_pss_compute_saltlen(ctx);
@@ -343,32 +343,32 @@ static unsigned char *rsa_generate_signature_aid(PROV_RSA_CTX *ctx,
         if (!ossl_rsa_pss_params_30_set_defaults(&pss_params)
             || !ossl_rsa_pss_params_30_set_hashalg(&pss_params, ctx->mdnid)
             || !ossl_rsa_pss_params_30_set_maskgenhashalg(&pss_params,
-                                                          ctx->mgf1_mdnid)
+                ctx->mgf1_mdnid)
             || !ossl_rsa_pss_params_30_set_saltlen(&pss_params, saltlen)
             || !ossl_DER_w_algorithmIdentifier_RSA_PSS(&pkt, -1,
-                                                       RSA_FLAG_TYPE_RSASSAPSS,
-                                                       &pss_params)) {
+                RSA_FLAG_TYPE_RSASSAPSS,
+                &pss_params)) {
             ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR);
             goto cleanup;
         }
         break;
     default:
         ERR_raise_data(ERR_LIB_PROV, ERR_R_UNSUPPORTED,
-                       "Algorithm ID generation - pad mode: %d",
-                       ctx->pad_mode);
+            "Algorithm ID generation - pad mode: %d",
+            ctx->pad_mode);
         goto cleanup;
     }
     if (WPACKET_finish(&pkt)) {
         WPACKET_get_total_written(&pkt, aid_len);
         aid = WPACKET_get_curr(&pkt);
     }
- cleanup:
+cleanup:
     WPACKET_cleanup(&pkt);
     return aid;
 }
 
 static int rsa_setup_md(PROV_RSA_CTX *ctx, const char *mdname,
-                        const char *mdprops, const char *desc)
+    const char *mdprops, const char *desc)
 {
     EVP_MD *md = NULL;
 
@@ -383,13 +383,13 @@ static int rsa_setup_md(PROV_RSA_CTX *ctx, const char *mdname,
 
         if (md == NULL) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                           "%s could not be fetched", mdname);
+                "%s could not be fetched", mdname);
             goto err;
         }
         md_nid = ossl_digest_rsa_sign_get_md_nid(md);
         if (md_nid == NID_undef) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED,
-                           "digest=%s", mdname);
+                "digest=%s", mdname);
             goto err;
         }
         /*
@@ -398,7 +398,7 @@ static int rsa_setup_md(PROV_RSA_CTX *ctx, const char *mdname,
          * When we do support them, uncomment the second clause.
          */
         if (EVP_MD_xof(md)
-                /* && ctx->pad_mode != RSA_PKCS1_PSS_PADDING */) {
+            /* && ctx->pad_mode != RSA_PKCS1_PSS_PADDING */) {
             ERR_raise(ERR_LIB_PROV, PROV_R_XOF_DIGESTS_NOT_ALLOWED);
             goto err;
         }
@@ -406,13 +406,14 @@ static int rsa_setup_md(PROV_RSA_CTX *ctx, const char *mdname,
         {
             int sha1_allowed
                 = ((ctx->operation
-                    & (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_SIGNMSG)) == 0);
+                       & (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_SIGNMSG))
+                    == 0);
 
             if (!ossl_fips_ind_digest_sign_check(OSSL_FIPS_IND_GET(ctx),
-                                                 OSSL_FIPS_IND_SETTABLE1,
-                                                 ctx->libctx,
-                                                 md_nid, sha1_allowed, desc,
-                                                 ossl_fips_config_signature_digest_check))
+                    OSSL_FIPS_IND_SETTABLE1,
+                    ctx->libctx,
+                    md_nid, sha1_allowed, 1, desc,
+                    ossl_fips_config_signature_digest_check))
                 goto err;
         }
 #endif
@@ -421,14 +422,14 @@ static int rsa_setup_md(PROV_RSA_CTX *ctx, const char *mdname,
             goto err;
         if (mdname_len >= sizeof(ctx->mdname)) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                           "%s exceeds name buffer length", mdname);
+                "%s exceeds name buffer length", mdname);
             goto err;
         }
 
         if (!ctx->flag_allow_md) {
             if (ctx->mdname[0] != '\0' && !EVP_MD_is_a(md, ctx->mdname)) {
                 ERR_raise_data(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED,
-                               "digest %s != %s", mdname, ctx->mdname);
+                    "digest %s != %s", mdname, ctx->mdname);
                 goto err;
             }
             EVP_MD_free(md);
@@ -461,7 +462,7 @@ static int rsa_setup_md(PROV_RSA_CTX *ctx, const char *mdname,
 }
 
 static int rsa_setup_mgf1_md(PROV_RSA_CTX *ctx, const char *mdname,
-                             const char *mdprops)
+    const char *mdprops)
 {
     size_t len;
     EVP_MD *md = NULL;
@@ -472,7 +473,7 @@ static int rsa_setup_mgf1_md(PROV_RSA_CTX *ctx, const char *mdname,
 
     if ((md = EVP_MD_fetch(ctx->libctx, mdname, mdprops)) == NULL) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                       "%s could not be fetched", mdname);
+            "%s could not be fetched", mdname);
         return 0;
     }
     /* The default for mgf1 is SHA1 - so allow SHA1 */
@@ -480,14 +481,14 @@ static int rsa_setup_mgf1_md(PROV_RSA_CTX *ctx, const char *mdname,
         || !rsa_check_padding(ctx, NULL, mdname, mdnid)) {
         if (mdnid <= 0)
             ERR_raise_data(ERR_LIB_PROV, PROV_R_DIGEST_NOT_ALLOWED,
-                           "digest=%s", mdname);
+                "digest=%s", mdname);
         EVP_MD_free(md);
         return 0;
     }
     len = OPENSSL_strlcpy(ctx->mgf1_mdname, mdname, sizeof(ctx->mgf1_mdname));
     if (len >= sizeof(ctx->mgf1_mdname)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                       "%s exceeds name buffer length", mdname);
+            "%s exceeds name buffer length", mdname);
         EVP_MD_free(md);
         return 0;
     }
@@ -501,9 +502,9 @@ static int rsa_setup_mgf1_md(PROV_RSA_CTX *ctx, const char *mdname,
 
 static int
 rsa_signverify_init(PROV_RSA_CTX *prsactx, void *vrsa,
-                    OSSL_FUNC_signature_set_ctx_params_fn *set_ctx_params,
-                    const OSSL_PARAM params[], int operation,
-                    const char *desc)
+    OSSL_FUNC_signature_set_ctx_params_fn *set_ctx_params,
+    const OSSL_PARAM params[], int operation,
+    const char *desc)
 {
     int protect;
 
@@ -541,8 +542,7 @@ rsa_signverify_init(PROV_RSA_CTX *prsactx, void *vrsa,
         prsactx->pad_mode = RSA_PKCS1_PSS_PADDING;
 
         {
-            const RSA_PSS_PARAMS_30 *pss =
-                ossl_rsa_get0_pss_params_30(prsactx->rsa);
+            const RSA_PSS_PARAMS_30 *pss = ossl_rsa_get0_pss_params_30(prsactx->rsa);
 
             if (!ossl_rsa_pss_params_30_is_unrestricted(pss)) {
                 int md_nid = ossl_rsa_pss_params_30_hashalg(pss);
@@ -556,27 +556,27 @@ rsa_signverify_init(PROV_RSA_CTX *prsactx, void *vrsa,
 
                 if (mdname == NULL) {
                     ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                                   "PSS restrictions lack hash algorithm");
+                        "PSS restrictions lack hash algorithm");
                     return 0;
                 }
                 if (mgf1mdname == NULL) {
                     ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                                   "PSS restrictions lack MGF1 hash algorithm");
+                        "PSS restrictions lack MGF1 hash algorithm");
                     return 0;
                 }
 
                 len = OPENSSL_strlcpy(prsactx->mdname, mdname,
-                                      sizeof(prsactx->mdname));
+                    sizeof(prsactx->mdname));
                 if (len >= sizeof(prsactx->mdname)) {
                     ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                                   "hash algorithm name too long");
+                        "hash algorithm name too long");
                     return 0;
                 }
                 len = OPENSSL_strlcpy(prsactx->mgf1_mdname, mgf1mdname,
-                                      sizeof(prsactx->mgf1_mdname));
+                    sizeof(prsactx->mgf1_mdname));
                 if (len >= sizeof(prsactx->mgf1_mdname)) {
                     ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                                   "MGF1 hash algorithm name too long");
+                        "MGF1 hash algorithm name too long");
                     return 0;
                 }
                 prsactx->saltlen = min_saltlen;
@@ -600,8 +600,8 @@ rsa_signverify_init(PROV_RSA_CTX *prsactx, void *vrsa,
         return 0;
 #ifdef FIPS_MODULE
     if (!ossl_fips_ind_rsa_key_check(OSSL_FIPS_IND_GET(prsactx),
-                                     OSSL_FIPS_IND_SETTABLE0, prsactx->libctx,
-                                     prsactx->rsa, desc, protect))
+            OSSL_FIPS_IND_SETTABLE0, prsactx->libctx,
+            prsactx->rsa, desc, protect))
         return 0;
 #endif
     return 1;
@@ -643,9 +643,9 @@ static int rsa_pss_saltlen_check_passed(PROV_RSA_CTX *ctx, const char *algoname,
 
     if (!approved) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE3,
-                                         ctx->libctx,
-                                         algoname, "PSS Salt Length",
-                                         ossl_fips_config_rsa_pss_saltlen_check)) {
+                ctx->libctx,
+                algoname, "PSS Salt Length",
+                ossl_fips_config_rsa_pss_saltlen_check)) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_SALT_LENGTH);
             return 0;
         }
@@ -665,7 +665,7 @@ static int rsa_sign_init(void *vprsactx, void *vrsa, const OSSL_PARAM params[])
 #endif
 
     return rsa_signverify_init(prsactx, vrsa, rsa_set_ctx_params, params,
-                               EVP_PKEY_OP_SIGN, "RSA Sign Init");
+        EVP_PKEY_OP_SIGN, "RSA Sign Init");
 }
 
 /*
@@ -674,8 +674,8 @@ static int rsa_sign_init(void *vprsactx, void *vrsa, const OSSL_PARAM params[])
  * implementations of the keytype related algorithms.
  */
 static int rsa_sign_directly(PROV_RSA_CTX *prsactx,
-                             unsigned char *sig, size_t *siglen, size_t sigsize,
-                             const unsigned char *tbs, size_t tbslen)
+    unsigned char *sig, size_t *siglen, size_t sigsize,
+    const unsigned char *tbs, size_t tbslen)
 {
     int ret;
     size_t rsasize = RSA_size(prsactx->rsa);
@@ -691,7 +691,7 @@ static int rsa_sign_directly(PROV_RSA_CTX *prsactx,
 
     if (sigsize < rsasize) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_SIGNATURE_SIZE,
-                       "is %zu, should be at least %zu", sigsize, rsasize);
+            "is %zu, should be at least %zu", sigsize, rsasize);
         return 0;
     }
 
@@ -707,11 +707,11 @@ static int rsa_sign_directly(PROV_RSA_CTX *prsactx,
 
             if (prsactx->pad_mode != RSA_PKCS1_PADDING) {
                 ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_PADDING_MODE,
-                               "only PKCS#1 padding supported with MDC2");
+                    "only PKCS#1 padding supported with MDC2");
                 return 0;
             }
             ret = RSA_sign_ASN1_OCTET_STRING(0, tbs, tbslen, sig, &sltmp,
-                                             prsactx->rsa);
+                prsactx->rsa);
 
             if (ret <= 0) {
                 ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
@@ -725,8 +725,8 @@ static int rsa_sign_directly(PROV_RSA_CTX *prsactx,
         case RSA_X931_PADDING:
             if ((size_t)RSA_size(prsactx->rsa) < tbslen + 1) {
                 ERR_raise_data(ERR_LIB_PROV, PROV_R_KEY_SIZE_TOO_SMALL,
-                               "RSA key size = %d, expected minimum = %d",
-                               RSA_size(prsactx->rsa), tbslen + 1);
+                    "RSA key size = %d, expected minimum = %d",
+                    RSA_size(prsactx->rsa), tbslen + 1);
                 return 0;
             }
             if (!setup_tbuf(prsactx)) {
@@ -736,87 +736,83 @@ static int rsa_sign_directly(PROV_RSA_CTX *prsactx,
             memcpy(prsactx->tbuf, tbs, tbslen);
             prsactx->tbuf[tbslen] = RSA_X931_hash_id(prsactx->mdnid);
             ret = RSA_private_encrypt(tbslen + 1, prsactx->tbuf,
-                                      sig, prsactx->rsa, RSA_X931_PADDING);
+                sig, prsactx->rsa, RSA_X931_PADDING);
             clean_tbuf(prsactx);
             break;
-        case RSA_PKCS1_PADDING:
-            {
-                unsigned int sltmp;
+        case RSA_PKCS1_PADDING: {
+            unsigned int sltmp;
 
-                ret = RSA_sign(prsactx->mdnid, tbs, tbslen, sig, &sltmp,
-                               prsactx->rsa);
-                if (ret <= 0) {
-                    ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
-                    return 0;
-                }
-                ret = sltmp;
+            ret = RSA_sign(prsactx->mdnid, tbs, tbslen, sig, &sltmp,
+                prsactx->rsa);
+            if (ret <= 0) {
+                ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
+                return 0;
             }
-            break;
-
-        case RSA_PKCS1_PSS_PADDING:
-            {
-                int saltlen;
-
-                /* Check PSS restrictions */
-                if (rsa_pss_restricted(prsactx)) {
-                    switch (prsactx->saltlen) {
-                    case RSA_PSS_SALTLEN_DIGEST:
-                        if (prsactx->min_saltlen > EVP_MD_get_size(prsactx->md)) {
-                            ERR_raise_data(ERR_LIB_PROV,
-                                           PROV_R_PSS_SALTLEN_TOO_SMALL,
-                                           "minimum salt length set to %d, "
-                                           "but the digest only gives %d",
-                                           prsactx->min_saltlen,
-                                           EVP_MD_get_size(prsactx->md));
-                            return 0;
-                        }
-                        /* FALLTHRU */
-                    default:
-                        if (prsactx->saltlen >= 0
-                            && prsactx->saltlen < prsactx->min_saltlen) {
-                            ERR_raise_data(ERR_LIB_PROV,
-                                           PROV_R_PSS_SALTLEN_TOO_SMALL,
-                                           "minimum salt length set to %d, but the"
-                                           "actual salt length is only set to %d",
-                                           prsactx->min_saltlen,
-                                           prsactx->saltlen);
-                            return 0;
-                        }
-                        break;
+            ret = sltmp;
+        } break;
+
+        case RSA_PKCS1_PSS_PADDING: {
+            int saltlen;
+
+            /* Check PSS restrictions */
+            if (rsa_pss_restricted(prsactx)) {
+                switch (prsactx->saltlen) {
+                case RSA_PSS_SALTLEN_DIGEST:
+                    if (prsactx->min_saltlen > EVP_MD_get_size(prsactx->md)) {
+                        ERR_raise_data(ERR_LIB_PROV,
+                            PROV_R_PSS_SALTLEN_TOO_SMALL,
+                            "minimum salt length set to %d, "
+                            "but the digest only gives %d",
+                            prsactx->min_saltlen,
+                            EVP_MD_get_size(prsactx->md));
+                        return 0;
                     }
+                    /* FALLTHRU */
+                default:
+                    if (prsactx->saltlen >= 0
+                        && prsactx->saltlen < prsactx->min_saltlen) {
+                        ERR_raise_data(ERR_LIB_PROV,
+                            PROV_R_PSS_SALTLEN_TOO_SMALL,
+                            "minimum salt length set to %d, but the"
+                            "actual salt length is only set to %d",
+                            prsactx->min_saltlen,
+                            prsactx->saltlen);
+                        return 0;
+                    }
+                    break;
                 }
-                if (!setup_tbuf(prsactx))
-                    return 0;
-                saltlen = prsactx->saltlen;
-                if (!ossl_rsa_padding_add_PKCS1_PSS_mgf1(prsactx->rsa,
-                                                         prsactx->tbuf, tbs,
-                                                         prsactx->md, prsactx->mgf1_md,
-                                                         &saltlen)) {
-                    ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
-                    return 0;
-                }
+            }
+            if (!setup_tbuf(prsactx))
+                return 0;
+            saltlen = prsactx->saltlen;
+            if (!ossl_rsa_padding_add_PKCS1_PSS_mgf1(prsactx->rsa,
+                    prsactx->tbuf, tbs,
+                    prsactx->md, prsactx->mgf1_md,
+                    &saltlen)) {
+                ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
+                return 0;
+            }
 #ifdef FIPS_MODULE
-                if (!rsa_pss_saltlen_check_passed(prsactx, "RSA Sign", saltlen))
-                    return 0;
+            if (!rsa_pss_saltlen_check_passed(prsactx, "RSA Sign", saltlen))
+                return 0;
 #endif
-                ret = RSA_private_encrypt(RSA_size(prsactx->rsa), prsactx->tbuf,
-                                          sig, prsactx->rsa, RSA_NO_PADDING);
-                clean_tbuf(prsactx);
-            }
-            break;
+            ret = RSA_private_encrypt(RSA_size(prsactx->rsa), prsactx->tbuf,
+                sig, prsactx->rsa, RSA_NO_PADDING);
+            clean_tbuf(prsactx);
+        } break;
 
         default:
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_PADDING_MODE,
-                           "Only X.931, PKCS#1 v1.5 or PSS padding allowed");
+                "Only X.931, PKCS#1 v1.5 or PSS padding allowed");
             return 0;
         }
     } else {
         ret = RSA_private_encrypt(tbslen, tbs, sig, prsactx->rsa,
-                                  prsactx->pad_mode);
+            prsactx->pad_mode);
     }
 
 #ifndef FIPS_MODULE
- end:
+end:
 #endif
     if (ret <= 0) {
         ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
@@ -828,8 +824,8 @@ static int rsa_sign_directly(PROV_RSA_CTX *prsactx,
 }
 
 static int rsa_signverify_message_update(void *vprsactx,
-                                         const unsigned char *data,
-                                         size_t datalen)
+    const unsigned char *data,
+    size_t datalen)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -846,7 +842,7 @@ static int rsa_signverify_message_update(void *vprsactx,
 }
 
 static int rsa_sign_message_final(void *vprsactx, unsigned char *sig,
-                                  size_t *siglen, size_t sigsize)
+    size_t *siglen, size_t sigsize)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
     unsigned char digest[EVP_MAX_MD_SIZE];
@@ -886,7 +882,7 @@ static int rsa_sign_message_final(void *vprsactx, unsigned char *sig,
  * Otherwise, sign tbs directly.
  */
 static int rsa_sign(void *vprsactx, unsigned char *sig, size_t *siglen,
-                    size_t sigsize, const unsigned char *tbs, size_t tbslen)
+    size_t sigsize, const unsigned char *tbs, size_t tbslen)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -912,7 +908,7 @@ static int rsa_sign(void *vprsactx, unsigned char *sig, size_t *siglen,
 }
 
 static int rsa_verify_recover_init(void *vprsactx, void *vrsa,
-                                   const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -922,7 +918,7 @@ static int rsa_verify_recover_init(void *vprsactx, void *vrsa,
 #endif
 
     return rsa_signverify_init(prsactx, vrsa, rsa_set_ctx_params, params,
-                               EVP_PKEY_OP_VERIFYRECOVER, "RSA VerifyRecover Init");
+        EVP_PKEY_OP_VERIFYRECOVER, "RSA VerifyRecover Init");
 }
 
 /*
@@ -930,9 +926,9 @@ static int rsa_verify_recover_init(void *vprsactx, void *vrsa,
  * 'rsa_verify_recover_directly', just use this function, er, directly.
  */
 static int rsa_verify_recover(void *vprsactx,
-                              unsigned char *rout, size_t *routlen,
-                              size_t routsize,
-                              const unsigned char *sig, size_t siglen)
+    unsigned char *rout, size_t *routlen,
+    size_t routsize,
+    const unsigned char *sig, size_t siglen)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
     int ret;
@@ -951,8 +947,8 @@ static int rsa_verify_recover(void *vprsactx,
             if (!setup_tbuf(prsactx))
                 return 0;
             ret = RSA_public_decrypt(siglen, sig, prsactx->tbuf, prsactx->rsa,
-                                     RSA_X931_PADDING);
-            if (ret < 1) {
+                RSA_X931_PADDING);
+            if (ret <= 0) {
                 ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
                 return 0;
             }
@@ -963,8 +959,8 @@ static int rsa_verify_recover(void *vprsactx,
             }
             if (ret != EVP_MD_get_size(prsactx->md)) {
                 ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST_LENGTH,
-                               "Should be %d, but got %d",
-                               EVP_MD_get_size(prsactx->md), ret);
+                    "Should be %d, but got %d",
+                    EVP_MD_get_size(prsactx->md), ret);
                 return 0;
             }
 
@@ -972,37 +968,35 @@ static int rsa_verify_recover(void *vprsactx,
             if (rout != prsactx->tbuf) {
                 if (routsize < (size_t)ret) {
                     ERR_raise_data(ERR_LIB_PROV, PROV_R_OUTPUT_BUFFER_TOO_SMALL,
-                                   "buffer size is %d, should be %d",
-                                   routsize, ret);
+                        "buffer size is %d, should be %d",
+                        routsize, ret);
                     return 0;
                 }
                 memcpy(rout, prsactx->tbuf, ret);
             }
             break;
 
-        case RSA_PKCS1_PADDING:
-            {
-                size_t sltmp;
+        case RSA_PKCS1_PADDING: {
+            size_t sltmp;
 
-                ret = ossl_rsa_verify(prsactx->mdnid, NULL, 0, rout, &sltmp,
-                                      sig, siglen, prsactx->rsa);
-                if (ret <= 0) {
-                    ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
-                    return 0;
-                }
-                ret = sltmp;
+            ret = ossl_rsa_verify(prsactx->mdnid, NULL, 0, rout, &sltmp,
+                sig, siglen, prsactx->rsa);
+            if (ret <= 0) {
+                ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
+                return 0;
             }
-            break;
+            ret = sltmp;
+        } break;
 
         default:
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_PADDING_MODE,
-                           "Only X.931 or PKCS#1 v1.5 padding allowed");
+                "Only X.931 or PKCS#1 v1.5 padding allowed");
             return 0;
         }
     } else {
         ret = RSA_public_decrypt(siglen, sig, rout, prsactx->rsa,
-                                 prsactx->pad_mode);
-        if (ret < 0) {
+            prsactx->pad_mode);
+        if (ret <= 0) {
             ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
             return 0;
         }
@@ -1012,7 +1006,7 @@ static int rsa_verify_recover(void *vprsactx,
 }
 
 static int rsa_verify_init(void *vprsactx, void *vrsa,
-                           const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -1022,12 +1016,12 @@ static int rsa_verify_init(void *vprsactx, void *vrsa,
 #endif
 
     return rsa_signverify_init(prsactx, vrsa, rsa_set_ctx_params, params,
-                               EVP_PKEY_OP_VERIFY, "RSA Verify Init");
+        EVP_PKEY_OP_VERIFY, "RSA Verify Init");
 }
 
 static int rsa_verify_directly(PROV_RSA_CTX *prsactx,
-                               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)
 {
     size_t rslen;
 
@@ -1037,7 +1031,7 @@ static int rsa_verify_directly(PROV_RSA_CTX *prsactx,
         switch (prsactx->pad_mode) {
         case RSA_PKCS1_PADDING:
             if (!RSA_verify(prsactx->mdnid, tbs, tbslen, sig, siglen,
-                            prsactx->rsa)) {
+                    prsactx->rsa)) {
                 ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
                 return 0;
             }
@@ -1046,53 +1040,53 @@ static int rsa_verify_directly(PROV_RSA_CTX *prsactx,
             if (!setup_tbuf(prsactx))
                 return 0;
             if (rsa_verify_recover(prsactx, prsactx->tbuf, &rslen, 0,
-                                   sig, siglen) <= 0)
+                    sig, siglen)
+                <= 0)
                 return 0;
             break;
-        case RSA_PKCS1_PSS_PADDING:
-            {
-                int ret;
-                int saltlen;
-                size_t mdsize;
-
-                /*
-                 * We need to check this for the RSA_verify_PKCS1_PSS_mgf1()
-                 * call
-                 */
-                mdsize = rsa_get_md_size(prsactx);
-                if (tbslen != mdsize) {
-                    ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST_LENGTH,
-                                   "Should be %d, but got %d",
-                                   mdsize, tbslen);
-                    return 0;
-                }
+        case RSA_PKCS1_PSS_PADDING: {
+            int ret;
+            int saltlen;
+            size_t mdsize;
 
-                if (!setup_tbuf(prsactx))
-                    return 0;
-                ret = RSA_public_decrypt(siglen, sig, prsactx->tbuf,
-                                         prsactx->rsa, RSA_NO_PADDING);
-                if (ret <= 0) {
-                    ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
-                    return 0;
-                }
-                saltlen = prsactx->saltlen;
-                ret = ossl_rsa_verify_PKCS1_PSS_mgf1(prsactx->rsa, tbs,
-                                                     prsactx->md, prsactx->mgf1_md,
-                                                     prsactx->tbuf,
-                                                     &saltlen);
-                if (ret <= 0) {
-                    ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
-                    return 0;
-                }
+            /*
+             * We need to check this for the RSA_verify_PKCS1_PSS_mgf1()
+             * call
+             */
+            mdsize = rsa_get_md_size(prsactx);
+            if (tbslen != mdsize) {
+                ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST_LENGTH,
+                    "Should be %d, but got %d",
+                    mdsize, tbslen);
+                return 0;
+            }
+
+            if (!setup_tbuf(prsactx))
+                return 0;
+            ret = RSA_public_decrypt(siglen, sig, prsactx->tbuf,
+                prsactx->rsa, RSA_NO_PADDING);
+            if (ret <= 0) {
+                ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
+                return 0;
+            }
+            saltlen = prsactx->saltlen;
+            ret = ossl_rsa_verify_PKCS1_PSS_mgf1(prsactx->rsa, tbs,
+                prsactx->md, prsactx->mgf1_md,
+                prsactx->tbuf,
+                &saltlen);
+            if (ret <= 0) {
+                ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
+                return 0;
+            }
 #ifdef FIPS_MODULE
-                if (!rsa_pss_saltlen_check_passed(prsactx, "RSA Verify", saltlen))
-                    return 0;
+            if (!rsa_pss_saltlen_check_passed(prsactx, "RSA Verify", saltlen))
+                return 0;
 #endif
-                return 1;
-            }
+            return 1;
+        }
         default:
             ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_PADDING_MODE,
-                           "Only X.931, PKCS#1 v1.5 or PSS padding allowed");
+                "Only X.931, PKCS#1 v1.5 or PSS padding allowed");
             return 0;
         }
     } else {
@@ -1101,7 +1095,7 @@ static int rsa_verify_directly(PROV_RSA_CTX *prsactx,
         if (!setup_tbuf(prsactx))
             return 0;
         ret = RSA_public_decrypt(siglen, sig, prsactx->tbuf, prsactx->rsa,
-                                 prsactx->pad_mode);
+            prsactx->pad_mode);
         if (ret <= 0) {
             ERR_raise(ERR_LIB_PROV, ERR_R_RSA_LIB);
             return 0;
@@ -1116,14 +1110,13 @@ static int rsa_verify_directly(PROV_RSA_CTX *prsactx,
 }
 
 static int rsa_verify_set_sig(void *vprsactx,
-                              const unsigned char *sig, size_t siglen)
+    const unsigned char *sig, size_t siglen)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
     OSSL_PARAM params[2];
 
-    params[0] =
-        OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_SIGNATURE,
-                                          (unsigned char *)sig, siglen);
+    params[0] = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_SIGNATURE,
+        (unsigned char *)sig, siglen);
     params[1] = OSSL_PARAM_construct_end();
     return rsa_sigalg_set_ctx_params(prsactx, params);
 }
@@ -1155,7 +1148,7 @@ static int rsa_verify_message_final(void *vprsactx)
     prsactx->flag_allow_oneshot = 0;
 
     return rsa_verify_directly(prsactx, prsactx->sig, prsactx->siglen,
-                               digest, dlen);
+        digest, dlen);
 }
 
 /*
@@ -1163,8 +1156,8 @@ static int rsa_verify_message_final(void *vprsactx)
  * Otherwise, verify tbs directly.
  */
 static int rsa_verify(void *vprsactx,
-                      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)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -1185,8 +1178,8 @@ static int rsa_verify(void *vprsactx,
 /* DigestSign/DigestVerify wrappers */
 
 static int rsa_digest_signverify_init(void *vprsactx, const char *mdname,
-                                      void *vrsa, const OSSL_PARAM params[],
-                                      int operation, const char *desc)
+    void *vrsa, const OSSL_PARAM params[],
+    int operation, const char *desc)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -1196,7 +1189,7 @@ static int rsa_digest_signverify_init(void *vprsactx, const char *mdname,
 #endif
 
     if (!rsa_signverify_init(prsactx, vrsa, rsa_set_ctx_params, params,
-                             operation, desc))
+            operation, desc))
         return 0;
 
     if (mdname != NULL
@@ -1218,24 +1211,24 @@ static int rsa_digest_signverify_init(void *vprsactx, const char *mdname,
 
     return 1;
 
- error:
+error:
     EVP_MD_CTX_free(prsactx->mdctx);
     prsactx->mdctx = NULL;
     return 0;
 }
 
 static int rsa_digest_sign_init(void *vprsactx, const char *mdname,
-                                void *vrsa, const OSSL_PARAM params[])
+    void *vrsa, const OSSL_PARAM params[])
 {
     if (!ossl_prov_is_running())
         return 0;
     return rsa_digest_signverify_init(vprsactx, mdname, vrsa,
-                                      params, EVP_PKEY_OP_SIGNMSG,
-                                      "RSA Digest Sign Init");
+        params, EVP_PKEY_OP_SIGNMSG,
+        "RSA Digest Sign Init");
 }
 
 static int rsa_digest_sign_update(void *vprsactx, const unsigned char *data,
-                                  size_t datalen)
+    size_t datalen)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -1249,7 +1242,7 @@ static int rsa_digest_sign_update(void *vprsactx, const unsigned char *data,
 }
 
 static int rsa_digest_sign_final(void *vprsactx, unsigned char *sig,
-                                 size_t *siglen, size_t sigsize)
+    size_t *siglen, size_t sigsize)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
     int ok = 0;
@@ -1269,17 +1262,17 @@ static int rsa_digest_sign_final(void *vprsactx, unsigned char *sig,
 }
 
 static int rsa_digest_verify_init(void *vprsactx, const char *mdname,
-                                  void *vrsa, const OSSL_PARAM params[])
+    void *vrsa, const OSSL_PARAM params[])
 {
     if (!ossl_prov_is_running())
         return 0;
     return rsa_digest_signverify_init(vprsactx, mdname, vrsa,
-                                      params, EVP_PKEY_OP_VERIFYMSG,
-                                      "RSA Digest Verify Init");
+        params, EVP_PKEY_OP_VERIFYMSG,
+        "RSA Digest Verify Init");
 }
 
 static int rsa_digest_verify_update(void *vprsactx, const unsigned char *data,
-                                    size_t datalen)
+    size_t datalen)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -1293,7 +1286,7 @@ static int rsa_digest_verify_update(void *vprsactx, const unsigned char *data,
 }
 
 int rsa_digest_verify_final(void *vprsactx, const unsigned char *sig,
-                            size_t siglen)
+    size_t siglen)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
     int ok = 0;
@@ -1350,6 +1343,7 @@ static void *rsa_dupctx(void *vprsactx)
     dstctx->mdctx = NULL;
     dstctx->tbuf = NULL;
     dstctx->propq = NULL;
+    dstctx->sig = NULL;
 
     if (srcctx->rsa != NULL && !RSA_up_ref(srcctx->rsa))
         goto err;
@@ -1366,7 +1360,7 @@ static void *rsa_dupctx(void *vprsactx)
     if (srcctx->mdctx != NULL) {
         dstctx->mdctx = EVP_MD_CTX_new();
         if (dstctx->mdctx == NULL
-                || !EVP_MD_CTX_copy_ex(dstctx->mdctx, srcctx->mdctx))
+            || !EVP_MD_CTX_copy_ex(dstctx->mdctx, srcctx->mdctx))
             goto err;
     }
 
@@ -1376,8 +1370,14 @@ static void *rsa_dupctx(void *vprsactx)
             goto err;
     }
 
+    if (srcctx->sig != NULL) {
+        dstctx->sig = OPENSSL_memdup(srcctx->sig, srcctx->siglen);
+        if (dstctx->sig == NULL)
+            goto err;
+    }
+
     return dstctx;
- err:
+err:
     rsa_freectx(dstctx);
     return NULL;
 }
@@ -1395,10 +1395,10 @@ static int rsa_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
         /* The Algorithm Identifier of the combined signature algorithm */
         unsigned char aid_buf[128];
         unsigned char *aid;
-        size_t  aid_len;
+        size_t aid_len;
 
         aid = rsa_generate_signature_aid(prsactx, aid_buf,
-                                         sizeof(aid_buf), &aid_len);
+            sizeof(aid_buf), &aid_len);
         if (aid == NULL || !OSSL_PARAM_set_octet_string(p, aid, aid_len))
             return 0;
     }
@@ -1410,26 +1410,24 @@ static int rsa_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
             if (!OSSL_PARAM_set_int(p, prsactx->pad_mode))
                 return 0;
             break;
-        case OSSL_PARAM_UTF8_STRING:
-            {
-                int i;
-                const char *word = NULL;
-
-                for (i = 0; padding_item[i].id != 0; i++) {
-                    if (prsactx->pad_mode == (int)padding_item[i].id) {
-                        word = padding_item[i].ptr;
-                        break;
-                    }
-                }
+        case OSSL_PARAM_UTF8_STRING: {
+            int i;
+            const char *word = NULL;
 
-                if (word != NULL) {
-                    if (!OSSL_PARAM_set_utf8_string(p, word))
-                        return 0;
-                } else {
-                    ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR);
+            for (i = 0; padding_item[i].id != 0; i++) {
+                if (prsactx->pad_mode == (int)padding_item[i].id) {
+                    word = padding_item[i].ptr;
+                    break;
                 }
             }
-            break;
+
+            if (word != NULL) {
+                if (!OSSL_PARAM_set_utf8_string(p, word))
+                    return 0;
+            } else {
+                ERR_raise(ERR_LIB_PROV, ERR_R_INTERNAL_ERROR);
+            }
+        } break;
         default:
             return 0;
         }
@@ -1463,16 +1461,15 @@ static int rsa_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
             case RSA_PSS_SALTLEN_AUTO_DIGEST_MAX:
                 value = OSSL_PKEY_RSA_PSS_SALT_LEN_AUTO_DIGEST_MAX;
                 break;
-            default:
-                {
-                    int len = BIO_snprintf(p->data, p->data_size, "%d",
-                                           prsactx->saltlen);
+            default: {
+                int len = BIO_snprintf(p->data, p->data_size, "%d",
+                    prsactx->saltlen);
 
-                    if (len <= 0)
-                        return 0;
-                    p->return_size = len;
-                    break;
-                }
+                if (len <= 0)
+                    return 0;
+                p->return_size = len;
+                break;
+            }
             }
             if (value != NULL
                 && !OSSL_PARAM_set_utf8_string(p, value))
@@ -1501,11 +1498,11 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
     OSSL_PARAM_uint(OSSL_SIGNATURE_PARAM_FIPS_VERIFY_MESSAGE, NULL),
 #endif
     OSSL_FIPS_IND_GETTABLE_CTX_PARAM()
-    OSSL_PARAM_END
+        OSSL_PARAM_END
 };
 
 static const OSSL_PARAM *rsa_gettable_ctx_params(ossl_unused void *vprsactx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -1513,15 +1510,15 @@ static const OSSL_PARAM *rsa_gettable_ctx_params(ossl_unused void *vprsactx,
 #ifdef FIPS_MODULE
 static int rsa_x931_padding_allowed(PROV_RSA_CTX *ctx)
 {
-    int approved = ((ctx->operation & EVP_PKEY_OP_SIGN) == 0);
-
-    if (!approved) {
+    if ((ctx->operation
+            & (EVP_PKEY_OP_SIGNMSG | EVP_PKEY_OP_SIGN))
+        != 0) {
         if (!OSSL_FIPS_IND_ON_UNAPPROVED(ctx, OSSL_FIPS_IND_SETTABLE2,
-                                         ctx->libctx,
-                                         "RSA Sign set ctx", "X931 Padding",
-                                         ossl_fips_config_rsa_sign_x931_disallowed)) {
+                ctx->libctx,
+                "RSA Sign set ctx", "X931 Padding",
+                ossl_fips_config_rsa_sign_x931_disallowed)) {
             ERR_raise(ERR_LIB_PROV,
-                      PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE);
+                PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE);
             return 0;
         }
     }
@@ -1546,19 +1543,19 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
         return 1;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(prsactx, OSSL_FIPS_IND_SETTABLE0, params,
-                                     OSSL_SIGNATURE_PARAM_FIPS_KEY_CHECK))
+            OSSL_SIGNATURE_PARAM_FIPS_KEY_CHECK))
         return 0;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(prsactx, OSSL_FIPS_IND_SETTABLE1, params,
-                                     OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK))
+            OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK))
         return 0;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(prsactx, OSSL_FIPS_IND_SETTABLE2, params,
-                                     OSSL_SIGNATURE_PARAM_FIPS_SIGN_X931_PAD_CHECK))
+            OSSL_SIGNATURE_PARAM_FIPS_SIGN_X931_PAD_CHECK))
         return 0;
 
     if (!OSSL_FIPS_IND_SET_CTX_PARAM(prsactx, OSSL_FIPS_IND_SETTABLE3, params,
-                                     OSSL_SIGNATURE_PARAM_FIPS_RSA_PSS_SALTLEN_CHECK))
+            OSSL_SIGNATURE_PARAM_FIPS_RSA_PSS_SALTLEN_CHECK))
         return 0;
 
     pad_mode = prsactx->pad_mode;
@@ -1566,9 +1563,8 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
 
     p = OSSL_PARAM_locate_const(params, OSSL_SIGNATURE_PARAM_DIGEST);
     if (p != NULL) {
-        const OSSL_PARAM *propsp =
-            OSSL_PARAM_locate_const(params,
-                                    OSSL_SIGNATURE_PARAM_PROPERTIES);
+        const OSSL_PARAM *propsp = OSSL_PARAM_locate_const(params,
+            OSSL_SIGNATURE_PARAM_PROPERTIES);
 
         pmdname = mdname;
         if (!OSSL_PARAM_get_utf8_string(p, &pmdname, sizeof(mdname)))
@@ -1577,7 +1573,7 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
         if (propsp != NULL) {
             pmdprops = mdprops;
             if (!OSSL_PARAM_get_utf8_string(propsp,
-                                            &pmdprops, sizeof(mdprops)))
+                    &pmdprops, sizeof(mdprops)))
                 return 0;
         }
     }
@@ -1591,21 +1587,19 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
             if (!OSSL_PARAM_get_int(p, &pad_mode))
                 return 0;
             break;
-        case OSSL_PARAM_UTF8_STRING:
-            {
-                int i;
+        case OSSL_PARAM_UTF8_STRING: {
+            int i;
 
-                if (p->data == NULL)
-                    return 0;
+            if (p->data == NULL)
+                return 0;
 
-                for (i = 0; padding_item[i].id != 0; i++) {
-                    if (strcmp(p->data, padding_item[i].ptr) == 0) {
-                        pad_mode = padding_item[i].id;
-                        break;
-                    }
+            for (i = 0; padding_item[i].id != 0; i++) {
+                if (strcmp(p->data, padding_item[i].ptr) == 0) {
+                    pad_mode = padding_item[i].id;
+                    break;
                 }
             }
-            break;
+        } break;
         default:
             return 0;
         }
@@ -1620,10 +1614,10 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
             goto bad_pad;
         case RSA_PKCS1_PSS_PADDING:
             if ((prsactx->operation
-                 & (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_SIGNMSG
-                    | EVP_PKEY_OP_VERIFY | EVP_PKEY_OP_VERIFYMSG)) == 0) {
-                err_extra_text =
-                    "PSS padding only allowed for sign and verify operations";
+                    & (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_SIGNMSG
+                        | EVP_PKEY_OP_VERIFY | EVP_PKEY_OP_VERIFYMSG))
+                == 0) {
+                err_extra_text = "PSS padding only allowed for sign and verify operations";
                 goto bad_pad;
             }
             break;
@@ -1647,18 +1641,19 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
             err_extra_text = "X.931 padding not allowed with RSA-PSS";
         cont:
             if (RSA_test_flags(prsactx->rsa,
-                               RSA_FLAG_TYPE_MASK) == RSA_FLAG_TYPE_RSA)
+                    RSA_FLAG_TYPE_MASK)
+                == RSA_FLAG_TYPE_RSA)
                 break;
             /* FALLTHRU */
         default:
         bad_pad:
             if (err_extra_text == NULL)
                 ERR_raise(ERR_LIB_PROV,
-                          PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE);
+                    PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE);
             else
                 ERR_raise_data(ERR_LIB_PROV,
-                               PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE,
-                               err_extra_text);
+                    PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE,
+                    err_extra_text);
             return 0;
         }
     }
@@ -1667,8 +1662,8 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
     if (p != NULL) {
         if (pad_mode != RSA_PKCS1_PSS_PADDING) {
             ERR_raise_data(ERR_LIB_PROV, PROV_R_NOT_SUPPORTED,
-                           "PSS saltlen can only be specified if "
-                           "PSS padding has been specified first");
+                "PSS saltlen can only be specified if "
+                "PSS padding has been specified first");
             return 0;
         }
 
@@ -1708,30 +1703,31 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
             case RSA_PSS_SALTLEN_AUTO:
             case RSA_PSS_SALTLEN_AUTO_DIGEST_MAX:
                 if ((prsactx->operation
-                     & (EVP_PKEY_OP_VERIFY | EVP_PKEY_OP_VERIFYMSG)) == 0) {
+                        & (EVP_PKEY_OP_VERIFY | EVP_PKEY_OP_VERIFYMSG))
+                    == 0) {
                     ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_SALT_LENGTH,
-                                   "Cannot use autodetected salt length");
+                        "Cannot use autodetected salt length");
                     return 0;
                 }
                 break;
             case RSA_PSS_SALTLEN_DIGEST:
                 if (prsactx->min_saltlen > EVP_MD_get_size(prsactx->md)) {
                     ERR_raise_data(ERR_LIB_PROV,
-                                   PROV_R_PSS_SALTLEN_TOO_SMALL,
-                                   "Should be more than %d, but would be "
-                                   "set to match digest size (%d)",
-                                   prsactx->min_saltlen,
-                                   EVP_MD_get_size(prsactx->md));
+                        PROV_R_PSS_SALTLEN_TOO_SMALL,
+                        "Should be more than %d, but would be "
+                        "set to match digest size (%d)",
+                        prsactx->min_saltlen,
+                        EVP_MD_get_size(prsactx->md));
                     return 0;
                 }
                 break;
             default:
                 if (saltlen >= 0 && saltlen < prsactx->min_saltlen) {
                     ERR_raise_data(ERR_LIB_PROV,
-                                   PROV_R_PSS_SALTLEN_TOO_SMALL,
-                                   "Should be more than %d, "
-                                   "but would be set to %d",
-                                   prsactx->min_saltlen, saltlen);
+                        PROV_R_PSS_SALTLEN_TOO_SMALL,
+                        "Should be more than %d, "
+                        "but would be set to %d",
+                        prsactx->min_saltlen, saltlen);
                     return 0;
                 }
             }
@@ -1740,9 +1736,8 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
 
     p = OSSL_PARAM_locate_const(params, OSSL_SIGNATURE_PARAM_MGF1_DIGEST);
     if (p != NULL) {
-        const OSSL_PARAM *propsp =
-            OSSL_PARAM_locate_const(params,
-                                    OSSL_SIGNATURE_PARAM_MGF1_PROPERTIES);
+        const OSSL_PARAM *propsp = OSSL_PARAM_locate_const(params,
+            OSSL_SIGNATURE_PARAM_MGF1_PROPERTIES);
 
         pmgf1mdname = mgf1mdname;
         if (!OSSL_PARAM_get_utf8_string(p, &pmgf1mdname, sizeof(mgf1mdname)))
@@ -1751,13 +1746,13 @@ static int rsa_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
         if (propsp != NULL) {
             pmgf1mdprops = mgf1mdprops;
             if (!OSSL_PARAM_get_utf8_string(propsp,
-                                            &pmgf1mdprops, sizeof(mgf1mdprops)))
+                    &pmgf1mdprops, sizeof(mgf1mdprops)))
                 return 0;
         }
 
         if (pad_mode != RSA_PKCS1_PSS_PADDING) {
             ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MGF1_MD);
-            return  0;
+            return 0;
         }
     }
 
@@ -1790,10 +1785,10 @@ static const OSSL_PARAM settable_ctx_params[] = {
     OSSL_PARAM_utf8_string(OSSL_SIGNATURE_PARAM_MGF1_PROPERTIES, NULL, 0),
     OSSL_PARAM_utf8_string(OSSL_SIGNATURE_PARAM_PSS_SALTLEN, NULL, 0),
     OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_KEY_CHECK)
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK)
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_RSA_PSS_SALTLEN_CHECK)
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_SIGN_X931_PAD_CHECK)
-    OSSL_PARAM_END
+        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK)
+            OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_RSA_PSS_SALTLEN_CHECK)
+                OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_SIGN_X931_PAD_CHECK)
+                    OSSL_PARAM_END
 };
 
 static const OSSL_PARAM settable_ctx_params_no_digest[] = {
@@ -1802,14 +1797,14 @@ static const OSSL_PARAM settable_ctx_params_no_digest[] = {
     OSSL_PARAM_utf8_string(OSSL_SIGNATURE_PARAM_MGF1_PROPERTIES, NULL, 0),
     OSSL_PARAM_utf8_string(OSSL_SIGNATURE_PARAM_PSS_SALTLEN, NULL, 0),
     OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_KEY_CHECK)
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK)
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_RSA_PSS_SALTLEN_CHECK)
-    OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_SIGN_X931_PAD_CHECK)
-    OSSL_PARAM_END
+        OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_DIGEST_CHECK)
+            OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_RSA_PSS_SALTLEN_CHECK)
+                OSSL_FIPS_IND_SETTABLE_CTX_PARAM(OSSL_SIGNATURE_PARAM_FIPS_SIGN_X931_PAD_CHECK)
+                    OSSL_PARAM_END
 };
 
 static const OSSL_PARAM *rsa_settable_ctx_params(void *vprsactx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -1865,37 +1860,37 @@ const OSSL_DISPATCH ossl_rsa_signature_functions[] = {
     { OSSL_FUNC_SIGNATURE_VERIFY_INIT, (void (*)(void))rsa_verify_init },
     { OSSL_FUNC_SIGNATURE_VERIFY, (void (*)(void))rsa_verify },
     { OSSL_FUNC_SIGNATURE_VERIFY_RECOVER_INIT,
-      (void (*)(void))rsa_verify_recover_init },
+        (void (*)(void))rsa_verify_recover_init },
     { OSSL_FUNC_SIGNATURE_VERIFY_RECOVER,
-      (void (*)(void))rsa_verify_recover },
+        (void (*)(void))rsa_verify_recover },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,
-      (void (*)(void))rsa_digest_sign_init },
+        (void (*)(void))rsa_digest_sign_init },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_UPDATE,
-      (void (*)(void))rsa_digest_sign_update },
+        (void (*)(void))rsa_digest_sign_update },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_FINAL,
-      (void (*)(void))rsa_digest_sign_final },
+        (void (*)(void))rsa_digest_sign_final },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT,
-      (void (*)(void))rsa_digest_verify_init },
+        (void (*)(void))rsa_digest_verify_init },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_UPDATE,
-      (void (*)(void))rsa_digest_verify_update },
+        (void (*)(void))rsa_digest_verify_update },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_FINAL,
-      (void (*)(void))rsa_digest_verify_final },
+        (void (*)(void))rsa_digest_verify_final },
     { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))rsa_freectx },
     { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))rsa_dupctx },
     { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS, (void (*)(void))rsa_get_ctx_params },
     { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,
-      (void (*)(void))rsa_gettable_ctx_params },
+        (void (*)(void))rsa_gettable_ctx_params },
     { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS, (void (*)(void))rsa_set_ctx_params },
     { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,
-      (void (*)(void))rsa_settable_ctx_params },
+        (void (*)(void))rsa_settable_ctx_params },
     { OSSL_FUNC_SIGNATURE_GET_CTX_MD_PARAMS,
-      (void (*)(void))rsa_get_ctx_md_params },
+        (void (*)(void))rsa_get_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_MD_PARAMS,
-      (void (*)(void))rsa_gettable_ctx_md_params },
+        (void (*)(void))rsa_gettable_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_SET_CTX_MD_PARAMS,
-      (void (*)(void))rsa_set_ctx_md_params },
+        (void (*)(void))rsa_set_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_MD_PARAMS,
-      (void (*)(void))rsa_settable_ctx_md_params },
+        (void (*)(void))rsa_settable_ctx_md_params },
     OSSL_DISPATCH_END
 };
 
@@ -1916,11 +1911,11 @@ static OSSL_FUNC_signature_set_ctx_params_fn rsa_sigalg_set_ctx_params;
  * just doesn't allow fetching an MD from whatever the user chooses.
  */
 static int rsa_sigalg_signverify_init(void *vprsactx, void *vrsa,
-                                      OSSL_FUNC_signature_set_ctx_params_fn *set_ctx_params,
-                                      const OSSL_PARAM params[],
-                                      const char *mdname,
-                                      int operation, int pad_mode,
-                                      const char *desc)
+    OSSL_FUNC_signature_set_ctx_params_fn *set_ctx_params,
+    const OSSL_PARAM params[],
+    const char *mdname,
+    int operation, int pad_mode,
+    const char *desc)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -1928,7 +1923,7 @@ static int rsa_sigalg_signverify_init(void *vprsactx, void *vrsa,
         return 0;
 
     if (!rsa_signverify_init(prsactx, vrsa, set_ctx_params, params, operation,
-                             desc))
+            desc))
         return 0;
 
     /* PSS is currently not supported as a sigalg */
@@ -1955,7 +1950,7 @@ static int rsa_sigalg_signverify_init(void *vprsactx, void *vrsa,
 
     return 1;
 
- error:
+error:
     EVP_MD_CTX_free(prsactx->mdctx);
     prsactx->mdctx = NULL;
     return 0;
@@ -1974,7 +1969,7 @@ static const OSSL_PARAM settable_sigalg_ctx_params[] = {
 };
 
 static const OSSL_PARAM *rsa_sigalg_settable_ctx_params(void *vprsactx,
-                                                        ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     PROV_RSA_CTX *prsactx = (PROV_RSA_CTX *)vprsactx;
 
@@ -2000,131 +1995,132 @@ static int rsa_sigalg_set_ctx_params(void *vprsactx, const OSSL_PARAM params[])
             prsactx->sig = NULL;
             prsactx->siglen = 0;
             if (!OSSL_PARAM_get_octet_string(p, (void **)&prsactx->sig,
-                                             0, &prsactx->siglen))
+                    0, &prsactx->siglen))
                 return 0;
         }
     }
     return 1;
 }
 
-#define IMPL_RSA_SIGALG(md, MD)                                         \
-    static OSSL_FUNC_signature_sign_init_fn rsa_##md##_sign_init;       \
-    static OSSL_FUNC_signature_sign_message_init_fn                     \
-        rsa_##md##_sign_message_init;                                   \
-    static OSSL_FUNC_signature_verify_init_fn rsa_##md##_verify_init;   \
-    static OSSL_FUNC_signature_verify_message_init_fn                   \
-        rsa_##md##_verify_message_init;                                 \
-                                                                        \
-    static int                                                          \
-    rsa_##md##_sign_init(void *vprsactx, void *vrsa,                    \
-                         const OSSL_PARAM params[])                     \
-    {                                                                   \
-        static const char desc[] = "RSA Sigalg Sign Init";              \
-                                                                        \
-        return rsa_sigalg_signverify_init(vprsactx, vrsa,               \
-                                          rsa_sigalg_set_ctx_params,    \
-                                          params, #MD,                  \
-                                          EVP_PKEY_OP_SIGN,             \
-                                          RSA_PKCS1_PADDING,            \
-                                          desc);                        \
-    }                                                                   \
-                                                                        \
-    static int                                                          \
-    rsa_##md##_sign_message_init(void *vprsactx, void *vrsa,            \
-                                 const OSSL_PARAM params[])             \
-    {                                                                   \
-        static const char desc[] = "RSA Sigalg Sign Message Init";      \
-                                                                        \
-        return rsa_sigalg_signverify_init(vprsactx, vrsa,               \
-                                          rsa_sigalg_set_ctx_params,    \
-                                          params, #MD,                  \
-                                          EVP_PKEY_OP_SIGNMSG,          \
-                                          RSA_PKCS1_PADDING,            \
-                                          desc);                        \
-    }                                                                   \
-                                                                        \
-    static int                                                          \
-    rsa_##md##_verify_init(void *vprsactx, void *vrsa,                  \
-                           const OSSL_PARAM params[])                   \
-    {                                                                   \
-        static const char desc[] = "RSA Sigalg Verify Init";            \
-                                                                        \
-        return rsa_sigalg_signverify_init(vprsactx, vrsa,               \
-                                          rsa_sigalg_set_ctx_params,    \
-                                          params, #MD,                  \
-                                          EVP_PKEY_OP_VERIFY,           \
-                                          RSA_PKCS1_PADDING,            \
-                                          desc);                        \
-    }                                                                   \
-                                                                        \
-    static int                                                          \
-    rsa_##md##_verify_recover_init(void *vprsactx, void *vrsa,          \
-                                   const OSSL_PARAM params[])           \
-    {                                                                   \
-        static const char desc[] = "RSA Sigalg Verify Recover Init";    \
-                                                                        \
-        return rsa_sigalg_signverify_init(vprsactx, vrsa,               \
-                                          rsa_sigalg_set_ctx_params,    \
-                                          params, #MD,                  \
-                                          EVP_PKEY_OP_VERIFYRECOVER,    \
-                                          RSA_PKCS1_PADDING,            \
-                                          desc);                        \
-    }                                                                   \
-                                                                        \
-    static int                                                          \
-    rsa_##md##_verify_message_init(void *vprsactx, void *vrsa,          \
-                                   const OSSL_PARAM params[])           \
-    {                                                                   \
-        static const char desc[] = "RSA Sigalg Verify Message Init";    \
-                                                                        \
-        return rsa_sigalg_signverify_init(vprsactx, vrsa,               \
-                                          rsa_sigalg_set_ctx_params,    \
-                                          params, #MD,                  \
-                                          EVP_PKEY_OP_VERIFYMSG,        \
-                                          RSA_PKCS1_PADDING,            \
-                                          desc);                        \
-    }                                                                   \
-                                                                        \
-    const OSSL_DISPATCH ossl_rsa_##md##_signature_functions[] = {       \
-        { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))rsa_newctx },     \
-        { OSSL_FUNC_SIGNATURE_SIGN_INIT,                                \
-          (void (*)(void))rsa_##md##_sign_init },                       \
-        { OSSL_FUNC_SIGNATURE_SIGN, (void (*)(void))rsa_sign },         \
-        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_INIT,                        \
-          (void (*)(void))rsa_##md##_sign_message_init },               \
-        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_UPDATE,                      \
-          (void (*)(void))rsa_signverify_message_update },              \
-        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_FINAL,                       \
-          (void (*)(void))rsa_sign_message_final },                     \
-        { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                              \
-          (void (*)(void))rsa_##md##_verify_init },                     \
-        { OSSL_FUNC_SIGNATURE_VERIFY,                                   \
-          (void (*)(void))rsa_verify },                                 \
-        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_INIT,                      \
-          (void (*)(void))rsa_##md##_verify_message_init },             \
-        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_UPDATE,                    \
-          (void (*)(void))rsa_signverify_message_update },              \
-        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_FINAL,                     \
-          (void (*)(void))rsa_verify_message_final },                   \
-        { OSSL_FUNC_SIGNATURE_VERIFY_RECOVER_INIT,                      \
-          (void (*)(void))rsa_##md##_verify_recover_init },             \
-        { OSSL_FUNC_SIGNATURE_VERIFY_RECOVER,                           \
-          (void (*)(void))rsa_verify_recover },                         \
-        { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))rsa_freectx },   \
-        { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))rsa_dupctx },     \
-        { OSSL_FUNC_SIGNATURE_QUERY_KEY_TYPES,                          \
-          (void (*)(void))rsa_sigalg_query_key_types },                 \
-        { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                           \
-          (void (*)(void))rsa_get_ctx_params },                         \
-        { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,                      \
-          (void (*)(void))rsa_gettable_ctx_params },                    \
-        { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,                           \
-          (void (*)(void))rsa_sigalg_set_ctx_params },                  \
-        { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,                      \
-          (void (*)(void))rsa_sigalg_settable_ctx_params },             \
-        OSSL_DISPATCH_END                                               \
+#define IMPL_RSA_SIGALG(md, MD)                                       \
+    static OSSL_FUNC_signature_sign_init_fn rsa_##md##_sign_init;     \
+    static OSSL_FUNC_signature_sign_message_init_fn                   \
+        rsa_##md##_sign_message_init;                                 \
+    static OSSL_FUNC_signature_verify_init_fn rsa_##md##_verify_init; \
+    static OSSL_FUNC_signature_verify_message_init_fn                 \
+        rsa_##md##_verify_message_init;                               \
+                                                                      \
+    static int                                                        \
+    rsa_##md##_sign_init(void *vprsactx, void *vrsa,                  \
+        const OSSL_PARAM params[])                                    \
+    {                                                                 \
+        static const char desc[] = "RSA Sigalg Sign Init";            \
+                                                                      \
+        return rsa_sigalg_signverify_init(vprsactx, vrsa,             \
+            rsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                              \
+            EVP_PKEY_OP_SIGN,                                         \
+            RSA_PKCS1_PADDING,                                        \
+            desc);                                                    \
+    }                                                                 \
+                                                                      \
+    static int                                                        \
+    rsa_##md##_sign_message_init(void *vprsactx, void *vrsa,          \
+        const OSSL_PARAM params[])                                    \
+    {                                                                 \
+        static const char desc[] = "RSA Sigalg Sign Message Init";    \
+                                                                      \
+        return rsa_sigalg_signverify_init(vprsactx, vrsa,             \
+            rsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                              \
+            EVP_PKEY_OP_SIGNMSG,                                      \
+            RSA_PKCS1_PADDING,                                        \
+            desc);                                                    \
+    }                                                                 \
+                                                                      \
+    static int                                                        \
+    rsa_##md##_verify_init(void *vprsactx, void *vrsa,                \
+        const OSSL_PARAM params[])                                    \
+    {                                                                 \
+        static const char desc[] = "RSA Sigalg Verify Init";          \
+                                                                      \
+        return rsa_sigalg_signverify_init(vprsactx, vrsa,             \
+            rsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                              \
+            EVP_PKEY_OP_VERIFY,                                       \
+            RSA_PKCS1_PADDING,                                        \
+            desc);                                                    \
+    }                                                                 \
+                                                                      \
+    static int                                                        \
+    rsa_##md##_verify_recover_init(void *vprsactx, void *vrsa,        \
+        const OSSL_PARAM params[])                                    \
+    {                                                                 \
+        static const char desc[] = "RSA Sigalg Verify Recover Init";  \
+                                                                      \
+        return rsa_sigalg_signverify_init(vprsactx, vrsa,             \
+            rsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                              \
+            EVP_PKEY_OP_VERIFYRECOVER,                                \
+            RSA_PKCS1_PADDING,                                        \
+            desc);                                                    \
+    }                                                                 \
+                                                                      \
+    static int                                                        \
+    rsa_##md##_verify_message_init(void *vprsactx, void *vrsa,        \
+        const OSSL_PARAM params[])                                    \
+    {                                                                 \
+        static const char desc[] = "RSA Sigalg Verify Message Init";  \
+                                                                      \
+        return rsa_sigalg_signverify_init(vprsactx, vrsa,             \
+            rsa_sigalg_set_ctx_params,                                \
+            params, #MD,                                              \
+            EVP_PKEY_OP_VERIFYMSG,                                    \
+            RSA_PKCS1_PADDING,                                        \
+            desc);                                                    \
+    }                                                                 \
+                                                                      \
+    const OSSL_DISPATCH ossl_rsa_##md##_signature_functions[] = {     \
+        { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))rsa_newctx },   \
+        { OSSL_FUNC_SIGNATURE_SIGN_INIT,                              \
+            (void (*)(void))rsa_##md##_sign_init },                   \
+        { OSSL_FUNC_SIGNATURE_SIGN, (void (*)(void))rsa_sign },       \
+        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_INIT,                      \
+            (void (*)(void))rsa_##md##_sign_message_init },           \
+        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_UPDATE,                    \
+            (void (*)(void))rsa_signverify_message_update },          \
+        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_FINAL,                     \
+            (void (*)(void))rsa_sign_message_final },                 \
+        { OSSL_FUNC_SIGNATURE_VERIFY_INIT,                            \
+            (void (*)(void))rsa_##md##_verify_init },                 \
+        { OSSL_FUNC_SIGNATURE_VERIFY,                                 \
+            (void (*)(void))rsa_verify },                             \
+        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_INIT,                    \
+            (void (*)(void))rsa_##md##_verify_message_init },         \
+        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_UPDATE,                  \
+            (void (*)(void))rsa_signverify_message_update },          \
+        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_FINAL,                   \
+            (void (*)(void))rsa_verify_message_final },               \
+        { OSSL_FUNC_SIGNATURE_VERIFY_RECOVER_INIT,                    \
+            (void (*)(void))rsa_##md##_verify_recover_init },         \
+        { OSSL_FUNC_SIGNATURE_VERIFY_RECOVER,                         \
+            (void (*)(void))rsa_verify_recover },                     \
+        { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))rsa_freectx }, \
+        { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))rsa_dupctx },   \
+        { OSSL_FUNC_SIGNATURE_QUERY_KEY_TYPES,                        \
+            (void (*)(void))rsa_sigalg_query_key_types },             \
+        { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                         \
+            (void (*)(void))rsa_get_ctx_params },                     \
+        { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,                    \
+            (void (*)(void))rsa_gettable_ctx_params },                \
+        { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS,                         \
+            (void (*)(void))rsa_sigalg_set_ctx_params },              \
+        { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,                    \
+            (void (*)(void))rsa_sigalg_settable_ctx_params },         \
+        OSSL_DISPATCH_END                                             \
     }
 
+/* clang-format off */
 #if !defined(OPENSSL_NO_RMD160) && !defined(FIPS_MODULE)
 IMPL_RSA_SIGALG(ripemd160, RIPEMD160);
 #endif
@@ -2142,3 +2138,4 @@ IMPL_RSA_SIGALG(sha3_512, SHA3-512);
 #if !defined(OPENSSL_NO_SM3) && !defined(FIPS_MODULE)
 IMPL_RSA_SIGALG(sm3, SM3);
 #endif
+/* clang-format on */
diff --git a/providers/implementations/signature/slh_dsa_sig.c b/providers/implementations/signature/slh_dsa_sig.c
index 40fc6846e2adc..c2ee2e6bed8d7 100644
--- a/providers/implementations/signature/slh_dsa_sig.c
+++ b/providers/implementations/signature/slh_dsa_sig.c
@@ -20,7 +20,7 @@
 
 #define SLH_DSA_MAX_ADD_RANDOM_LEN 32
 
-#define SLH_DSA_MESSAGE_ENCODE_RAW  0
+#define SLH_DSA_MESSAGE_ENCODE_RAW 0
 #define SLH_DSA_MESSAGE_ENCODE_PURE 1
 
 static OSSL_FUNC_signature_sign_message_init_fn slh_dsa_sign_msg_init;
@@ -52,7 +52,7 @@ typedef struct {
     const char *alg;
     /* The Algorithm Identifier of the signature algorithm */
     uint8_t aid_buf[OSSL_MAX_ALGORITHM_ID_SIZE];
-    size_t  aid_len;
+    size_t aid_len;
 } PROV_SLH_DSA_CTX;
 
 static void slh_dsa_freectx(void *vctx)
@@ -82,7 +82,7 @@ static void *slh_dsa_newctx(void *provctx, const char *alg, const char *propq)
     ctx->alg = alg;
     ctx->msg_encode = SLH_DSA_MESSAGE_ENCODE_PURE;
     return ctx;
- err:
+err:
     slh_dsa_freectx(ctx);
     return NULL;
 }
@@ -111,7 +111,7 @@ static void *slh_dsa_dupctx(void *vctx)
         goto err;
 
     return ret;
- err:
+err:
     slh_dsa_freectx(ret);
     return NULL;
 }
@@ -143,14 +143,14 @@ static int slh_dsa_set_alg_id_buffer(PROV_SLH_DSA_CTX *ctx)
 }
 
 static int slh_dsa_signverify_msg_init(void *vctx, void *vkey,
-                                       const OSSL_PARAM params[], int operation,
-                                       const char *desc)
+    const OSSL_PARAM params[], int operation,
+    const char *desc)
 {
     PROV_SLH_DSA_CTX *ctx = (PROV_SLH_DSA_CTX *)vctx;
     SLH_DSA_KEY *key = vkey;
 
     if (!ossl_prov_is_running()
-            || ctx == NULL)
+        || ctx == NULL)
         return 0;
 
     if (vkey == NULL && ctx->key == NULL) {
@@ -176,17 +176,17 @@ static int slh_dsa_signverify_msg_init(void *vctx, void *vkey,
 static int slh_dsa_sign_msg_init(void *vctx, void *vkey, const OSSL_PARAM params[])
 {
     return slh_dsa_signverify_msg_init(vctx, vkey, params,
-                                       EVP_PKEY_OP_SIGN, "SLH_DSA Sign Init");
+        EVP_PKEY_OP_SIGN, "SLH_DSA Sign Init");
 }
 
 static int slh_dsa_digest_signverify_init(void *vctx, const char *mdname,
-                                          void *vkey, const OSSL_PARAM params[])
+    void *vkey, const OSSL_PARAM params[])
 {
     PROV_SLH_DSA_CTX *ctx = (PROV_SLH_DSA_CTX *)vctx;
 
     if (mdname != NULL && mdname[0] != '\0') {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST,
-                       "Explicit digest not supported for SLH-DSA operations");
+            "Explicit digest not supported for SLH-DSA operations");
         return 0;
     }
 
@@ -194,11 +194,11 @@ static int slh_dsa_digest_signverify_init(void *vctx, const char *mdname,
         return slh_dsa_set_ctx_params(ctx, params);
 
     return slh_dsa_signverify_msg_init(vctx, vkey, params,
-                                       EVP_PKEY_OP_SIGN, "SLH_DSA Sign Init");
+        EVP_PKEY_OP_SIGN, "SLH_DSA Sign Init");
 }
 
 static int slh_dsa_sign(void *vctx, unsigned char *sig, size_t *siglen,
-                        size_t sigsize, const unsigned char *msg, size_t msg_len)
+    size_t sigsize, const unsigned char *msg, size_t msg_len)
 {
     int ret = 0;
     PROV_SLH_DSA_CTX *ctx = (PROV_SLH_DSA_CTX *)vctx;
@@ -219,16 +219,16 @@ static int slh_dsa_sign(void *vctx, unsigned char *sig, size_t *siglen,
         }
     }
     ret = ossl_slh_dsa_sign(ctx->hash_ctx, msg, msg_len,
-                            ctx->context_string, ctx->context_string_len,
-                            opt_rand, ctx->msg_encode,
-                            sig, siglen, sigsize);
+        ctx->context_string, ctx->context_string_len,
+        opt_rand, ctx->msg_encode,
+        sig, siglen, sigsize);
     if (opt_rand != add_rand)
         OPENSSL_cleanse(opt_rand, n);
     return ret;
 }
 
 static int slh_dsa_digest_sign(void *vctx, uint8_t *sig, size_t *siglen, size_t sigsize,
-                               const uint8_t *tbs, size_t tbslen)
+    const uint8_t *tbs, size_t tbslen)
 {
     return slh_dsa_sign(vctx, sig, siglen, sigsize, tbs, tbslen);
 }
@@ -236,22 +236,22 @@ static int slh_dsa_digest_sign(void *vctx, uint8_t *sig, size_t *siglen, size_t
 static int slh_dsa_verify_msg_init(void *vctx, void *vkey, const OSSL_PARAM params[])
 {
     return slh_dsa_signverify_msg_init(vctx, vkey, params, EVP_PKEY_OP_VERIFY,
-                                       "SLH_DSA Verify Init");
+        "SLH_DSA Verify Init");
 }
 
 static int slh_dsa_verify(void *vctx, const uint8_t *sig, size_t siglen,
-                          const uint8_t *msg, size_t msg_len)
+    const uint8_t *msg, size_t msg_len)
 {
     PROV_SLH_DSA_CTX *ctx = (PROV_SLH_DSA_CTX *)vctx;
 
     if (!ossl_prov_is_running())
         return 0;
     return ossl_slh_dsa_verify(ctx->hash_ctx, msg, msg_len,
-                               ctx->context_string, ctx->context_string_len,
-                               ctx->msg_encode, sig, siglen);
+        ctx->context_string, ctx->context_string_len,
+        ctx->msg_encode, sig, siglen);
 }
 static int slh_dsa_digest_verify(void *vctx, const uint8_t *sig, size_t siglen,
-                                 const uint8_t *tbs, size_t tbslen)
+    const uint8_t *tbs, size_t tbslen)
 {
     return slh_dsa_verify(vctx, sig, siglen, tbs, tbslen);
 }
@@ -271,7 +271,7 @@ static int slh_dsa_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         void *vp = pctx->context_string;
 
         if (!OSSL_PARAM_get_octet_string(p, &vp, sizeof(pctx->context_string),
-                                         &(pctx->context_string_len))) {
+                &(pctx->context_string_len))) {
             pctx->context_string_len = 0;
             return 0;
         }
@@ -282,7 +282,7 @@ static int slh_dsa_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         size_t n = ossl_slh_dsa_key_get_n(pctx->key);
 
         if (!OSSL_PARAM_get_octet_string(p, &vp, n, &(pctx->add_random_len))
-                || pctx->add_random_len != n) {
+            || pctx->add_random_len != n) {
             pctx->add_random_len = 0;
             return 0;
         }
@@ -298,7 +298,7 @@ static int slh_dsa_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *slh_dsa_settable_ctx_params(void *vctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM settable_ctx_params[] = {
         OSSL_PARAM_octet_string(OSSL_SIGNATURE_PARAM_CONTEXT_STRING, NULL, 0),
@@ -317,7 +317,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *slh_dsa_gettable_ctx_params(ossl_unused void *vctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -333,45 +333,45 @@ static int slh_dsa_get_ctx_params(void *vctx, OSSL_PARAM *params)
     p = OSSL_PARAM_locate(params, OSSL_SIGNATURE_PARAM_ALGORITHM_ID);
     if (p != NULL
         && !OSSL_PARAM_set_octet_string(p,
-                                        ctx->aid_len == 0 ? NULL : ctx->aid_buf,
-                                        ctx->aid_len))
+            ctx->aid_len == 0 ? NULL : ctx->aid_buf,
+            ctx->aid_len))
         return 0;
 
     return 1;
 }
 
-#define MAKE_SIGNATURE_FUNCTIONS(alg, fn)                                      \
-    static OSSL_FUNC_signature_newctx_fn slh_dsa_##fn##_newctx;                \
-    static void *slh_dsa_##fn##_newctx(void *provctx, const char *propq)       \
-    {                                                                          \
-        return slh_dsa_newctx(provctx, alg, propq);                            \
-    }                                                                          \
-    const OSSL_DISPATCH ossl_slh_dsa_##fn##_signature_functions[] = {          \
-        { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))slh_dsa_##fn##_newctx }, \
-        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_INIT,                               \
-          (void (*)(void))slh_dsa_sign_msg_init },                             \
-        { OSSL_FUNC_SIGNATURE_SIGN, (void (*)(void))slh_dsa_sign },            \
-        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_INIT,                             \
-          (void (*)(void))slh_dsa_verify_msg_init },                           \
-        { OSSL_FUNC_SIGNATURE_VERIFY, (void (*)(void))slh_dsa_verify },        \
-        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,                                \
-          (void (*)(void))slh_dsa_digest_signverify_init },                    \
-        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN,                                     \
-          (void (*)(void))slh_dsa_digest_sign },                               \
-        { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT,                              \
-          (void (*)(void))slh_dsa_digest_signverify_init },                    \
-        { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY,                                   \
-          (void (*)(void))slh_dsa_digest_verify },                             \
-        { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))slh_dsa_freectx },      \
-        { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))slh_dsa_dupctx },        \
-        { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS, (void (*)(void))slh_dsa_set_ctx_params },\
-        { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,                             \
-          (void (*)(void))slh_dsa_settable_ctx_params },                       \
-        { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                                  \
-          (void (*)(void))slh_dsa_get_ctx_params },                            \
-        { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,                             \
-          (void (*)(void))slh_dsa_gettable_ctx_params },                       \
-        OSSL_DISPATCH_END                                                      \
+#define MAKE_SIGNATURE_FUNCTIONS(alg, fn)                                               \
+    static OSSL_FUNC_signature_newctx_fn slh_dsa_##fn##_newctx;                         \
+    static void *slh_dsa_##fn##_newctx(void *provctx, const char *propq)                \
+    {                                                                                   \
+        return slh_dsa_newctx(provctx, alg, propq);                                     \
+    }                                                                                   \
+    const OSSL_DISPATCH ossl_slh_dsa_##fn##_signature_functions[] = {                   \
+        { OSSL_FUNC_SIGNATURE_NEWCTX, (void (*)(void))slh_dsa_##fn##_newctx },          \
+        { OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_INIT,                                        \
+            (void (*)(void))slh_dsa_sign_msg_init },                                    \
+        { OSSL_FUNC_SIGNATURE_SIGN, (void (*)(void))slh_dsa_sign },                     \
+        { OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_INIT,                                      \
+            (void (*)(void))slh_dsa_verify_msg_init },                                  \
+        { OSSL_FUNC_SIGNATURE_VERIFY, (void (*)(void))slh_dsa_verify },                 \
+        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,                                         \
+            (void (*)(void))slh_dsa_digest_signverify_init },                           \
+        { OSSL_FUNC_SIGNATURE_DIGEST_SIGN,                                              \
+            (void (*)(void))slh_dsa_digest_sign },                                      \
+        { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT,                                       \
+            (void (*)(void))slh_dsa_digest_signverify_init },                           \
+        { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY,                                            \
+            (void (*)(void))slh_dsa_digest_verify },                                    \
+        { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))slh_dsa_freectx },               \
+        { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))slh_dsa_dupctx },                 \
+        { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS, (void (*)(void))slh_dsa_set_ctx_params }, \
+        { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,                                      \
+            (void (*)(void))slh_dsa_settable_ctx_params },                              \
+        { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS,                                           \
+            (void (*)(void))slh_dsa_get_ctx_params },                                   \
+        { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,                                      \
+            (void (*)(void))slh_dsa_gettable_ctx_params },                              \
+        OSSL_DISPATCH_END                                                               \
     }
 
 MAKE_SIGNATURE_FUNCTIONS("SLH-DSA-SHA2-128s", sha2_128s);
diff --git a/providers/implementations/signature/sm2_sig.c b/providers/implementations/signature/sm2_sig.c
index bcbbd1e245034..d367c49381144 100644
--- a/providers/implementations/signature/sm2_sig.c
+++ b/providers/implementations/signature/sm2_sig.c
@@ -77,7 +77,7 @@ typedef struct {
 
     /* The Algorithm Identifier of the combined signature algorithm */
     unsigned char aid_buf[OSSL_MAX_ALGORITHM_ID_SIZE];
-    size_t  aid_len;
+    size_t aid_len;
 
     /* main digest */
     EVP_MD *md;
@@ -93,7 +93,7 @@ static int sm2sig_set_mdname(PROV_SM2_CTX *psm2ctx, const char *mdname)
 {
     if (psm2ctx->md == NULL) /* We need an SM3 md to compare with */
         psm2ctx->md = EVP_MD_fetch(psm2ctx->libctx, psm2ctx->mdname,
-                                   psm2ctx->propq);
+            psm2ctx->propq);
     if (psm2ctx->md == NULL)
         return 0;
 
@@ -109,7 +109,7 @@ static int sm2sig_set_mdname(PROV_SM2_CTX *psm2ctx, const char *mdname)
     if (strlen(mdname) >= sizeof(psm2ctx->mdname)
         || !EVP_MD_is_a(psm2ctx->md, mdname)) {
         ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_DIGEST, "digest=%s",
-                       mdname);
+            mdname);
         return 0;
     }
 
@@ -135,12 +135,12 @@ static void *sm2sig_newctx(void *provctx, const char *propq)
 }
 
 static int sm2sig_signature_init(void *vpsm2ctx, void *ec,
-                                 const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     PROV_SM2_CTX *psm2ctx = (PROV_SM2_CTX *)vpsm2ctx;
 
     if (!ossl_prov_is_running()
-            || psm2ctx == NULL)
+        || psm2ctx == NULL)
         return 0;
 
     if (ec == NULL && psm2ctx->ec == NULL) {
@@ -159,7 +159,7 @@ static int sm2sig_signature_init(void *vpsm2ctx, void *ec,
 }
 
 static int sm2sig_sign(void *vpsm2ctx, unsigned char *sig, size_t *siglen,
-                       size_t sigsize, const unsigned char *tbs, size_t tbslen)
+    size_t sigsize, const unsigned char *tbs, size_t tbslen)
 {
     PROV_SM2_CTX *ctx = (PROV_SM2_CTX *)vpsm2ctx;
     int ret;
@@ -187,7 +187,7 @@ static int sm2sig_sign(void *vpsm2ctx, unsigned char *sig, size_t *siglen,
 }
 
 static int sm2sig_verify(void *vpsm2ctx, const unsigned char *sig, size_t siglen,
-                         const unsigned char *tbs, size_t tbslen)
+    const unsigned char *tbs, size_t tbslen)
 {
     PROV_SM2_CTX *ctx = (PROV_SM2_CTX *)vpsm2ctx;
 
@@ -206,7 +206,7 @@ static void free_md(PROV_SM2_CTX *ctx)
 }
 
 static int sm2sig_digest_signverify_init(void *vpsm2ctx, const char *mdname,
-                                         void *ec, const OSSL_PARAM params[])
+    void *ec, const OSSL_PARAM params[])
 {
     PROV_SM2_CTX *ctx = (PROV_SM2_CTX *)vpsm2ctx;
     int md_nid;
@@ -251,7 +251,7 @@ static int sm2sig_digest_signverify_init(void *vpsm2ctx, const char *mdname,
 
     ret = 1;
 
- error:
+error:
     return ret;
 }
 
@@ -267,7 +267,7 @@ static int sm2sig_compute_z_digest(PROV_SM2_CTX *ctx)
         if ((z = OPENSSL_zalloc(ctx->mdsize)) == NULL
             /* get hashed prefix 'z' of tbs message */
             || !ossl_sm2_compute_z_digest(z, ctx->md, ctx->id, ctx->id_len,
-                                          ctx->ec)
+                ctx->ec)
             || !EVP_DigestUpdate(ctx->mdctx, z, ctx->mdsize))
             ret = 0;
         OPENSSL_free(z);
@@ -277,7 +277,7 @@ static int sm2sig_compute_z_digest(PROV_SM2_CTX *ctx)
 }
 
 int sm2sig_digest_signverify_update(void *vpsm2ctx, const unsigned char *data,
-                                    size_t datalen)
+    size_t datalen)
 {
     PROV_SM2_CTX *psm2ctx = (PROV_SM2_CTX *)vpsm2ctx;
 
@@ -289,7 +289,7 @@ int sm2sig_digest_signverify_update(void *vpsm2ctx, const unsigned char *data,
 }
 
 int sm2sig_digest_sign_final(void *vpsm2ctx, unsigned char *sig, size_t *siglen,
-                             size_t sigsize)
+    size_t sigsize)
 {
     PROV_SM2_CTX *psm2ctx = (PROV_SM2_CTX *)vpsm2ctx;
     unsigned char digest[EVP_MAX_MD_SIZE];
@@ -304,16 +304,15 @@ int sm2sig_digest_sign_final(void *vpsm2ctx, unsigned char *sig, size_t *siglen,
      */
     if (sig != NULL) {
         if (!(sm2sig_compute_z_digest(psm2ctx)
-              && EVP_DigestFinal_ex(psm2ctx->mdctx, digest, &dlen)))
+                && EVP_DigestFinal_ex(psm2ctx->mdctx, digest, &dlen)))
             return 0;
     }
 
     return sm2sig_sign(vpsm2ctx, sig, siglen, sigsize, digest, (size_t)dlen);
 }
 
-
 int sm2sig_digest_verify_final(void *vpsm2ctx, const unsigned char *sig,
-                               size_t siglen)
+    size_t siglen)
 {
     PROV_SM2_CTX *psm2ctx = (PROV_SM2_CTX *)vpsm2ctx;
     unsigned char digest[EVP_MAX_MD_SIZE];
@@ -328,7 +327,7 @@ int sm2sig_digest_verify_final(void *vpsm2ctx, const unsigned char *sig,
         return 0;
 
     if (!(sm2sig_compute_z_digest(psm2ctx)
-          && EVP_DigestFinal_ex(psm2ctx->mdctx, digest, &dlen)))
+            && EVP_DigestFinal_ex(psm2ctx->mdctx, digest, &dlen)))
         return 0;
 
     return sm2sig_verify(vpsm2ctx, sig, siglen, digest, (size_t)dlen);
@@ -378,7 +377,7 @@ static void *sm2sig_dupctx(void *vpsm2ctx)
     if (srcctx->mdctx != NULL) {
         dstctx->mdctx = EVP_MD_CTX_new();
         if (dstctx->mdctx == NULL
-                || !EVP_MD_CTX_copy_ex(dstctx->mdctx, srcctx->mdctx))
+            || !EVP_MD_CTX_copy_ex(dstctx->mdctx, srcctx->mdctx))
             goto err;
     }
 
@@ -391,7 +390,7 @@ static void *sm2sig_dupctx(void *vpsm2ctx)
     }
 
     return dstctx;
- err:
+err:
     sm2sig_freectx(dstctx);
     return NULL;
 }
@@ -407,8 +406,8 @@ static int sm2sig_get_ctx_params(void *vpsm2ctx, OSSL_PARAM *params)
     p = OSSL_PARAM_locate(params, OSSL_SIGNATURE_PARAM_ALGORITHM_ID);
     if (p != NULL
         && !OSSL_PARAM_set_octet_string(p,
-                                        psm2ctx->aid_len == 0 ? NULL : psm2ctx->aid_buf,
-                                        psm2ctx->aid_len))
+            psm2ctx->aid_len == 0 ? NULL : psm2ctx->aid_buf,
+            psm2ctx->aid_len))
         return 0;
 
     p = OSSL_PARAM_locate(params, OSSL_SIGNATURE_PARAM_DIGEST_SIZE);
@@ -416,9 +415,7 @@ static int sm2sig_get_ctx_params(void *vpsm2ctx, OSSL_PARAM *params)
         return 0;
 
     p = OSSL_PARAM_locate(params, OSSL_SIGNATURE_PARAM_DIGEST);
-    if (p != NULL && !OSSL_PARAM_set_utf8_string(p, psm2ctx->md == NULL
-                                                    ? psm2ctx->mdname
-                                                    : EVP_MD_get0_name(psm2ctx->md)))
+    if (p != NULL && !OSSL_PARAM_set_utf8_string(p, psm2ctx->md == NULL ? psm2ctx->mdname : EVP_MD_get0_name(psm2ctx->md)))
         return 0;
 
     return 1;
@@ -432,7 +429,7 @@ static const OSSL_PARAM known_gettable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *sm2sig_gettable_ctx_params(ossl_unused void *vpsm2ctx,
-                                                    ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_gettable_ctx_params;
 }
@@ -474,8 +471,7 @@ static int sm2sig_set_ctx_params(void *vpsm2ctx, const OSSL_PARAM params[])
      * this needs to be adjusted accordingly.
      */
     p = OSSL_PARAM_locate_const(params, OSSL_SIGNATURE_PARAM_DIGEST_SIZE);
-    if (p != NULL && (!OSSL_PARAM_get_size_t(p, &mdsize)
-                      || mdsize != psm2ctx->mdsize))
+    if (p != NULL && (!OSSL_PARAM_get_size_t(p, &mdsize) || mdsize != psm2ctx->mdsize))
         return 0;
 
     p = OSSL_PARAM_locate_const(params, OSSL_SIGNATURE_PARAM_DIGEST);
@@ -502,7 +498,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *sm2sig_settable_ctx_params(ossl_unused void *vpsm2ctx,
-                                                    ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_ctx_params;
 }
@@ -554,32 +550,32 @@ const OSSL_DISPATCH ossl_sm2_signature_functions[] = {
     { OSSL_FUNC_SIGNATURE_VERIFY_INIT, (void (*)(void))sm2sig_signature_init },
     { OSSL_FUNC_SIGNATURE_VERIFY, (void (*)(void))sm2sig_verify },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,
-      (void (*)(void))sm2sig_digest_signverify_init },
+        (void (*)(void))sm2sig_digest_signverify_init },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_UPDATE,
-      (void (*)(void))sm2sig_digest_signverify_update },
+        (void (*)(void))sm2sig_digest_signverify_update },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_FINAL,
-      (void (*)(void))sm2sig_digest_sign_final },
+        (void (*)(void))sm2sig_digest_sign_final },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT,
-      (void (*)(void))sm2sig_digest_signverify_init },
+        (void (*)(void))sm2sig_digest_signverify_init },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_UPDATE,
-      (void (*)(void))sm2sig_digest_signverify_update },
+        (void (*)(void))sm2sig_digest_signverify_update },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_FINAL,
-      (void (*)(void))sm2sig_digest_verify_final },
+        (void (*)(void))sm2sig_digest_verify_final },
     { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))sm2sig_freectx },
     { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))sm2sig_dupctx },
     { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS, (void (*)(void))sm2sig_get_ctx_params },
     { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,
-      (void (*)(void))sm2sig_gettable_ctx_params },
+        (void (*)(void))sm2sig_gettable_ctx_params },
     { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS, (void (*)(void))sm2sig_set_ctx_params },
     { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,
-      (void (*)(void))sm2sig_settable_ctx_params },
+        (void (*)(void))sm2sig_settable_ctx_params },
     { OSSL_FUNC_SIGNATURE_GET_CTX_MD_PARAMS,
-      (void (*)(void))sm2sig_get_ctx_md_params },
+        (void (*)(void))sm2sig_get_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_MD_PARAMS,
-      (void (*)(void))sm2sig_gettable_ctx_md_params },
+        (void (*)(void))sm2sig_gettable_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_SET_CTX_MD_PARAMS,
-      (void (*)(void))sm2sig_set_ctx_md_params },
+        (void (*)(void))sm2sig_set_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_MD_PARAMS,
-      (void (*)(void))sm2sig_settable_ctx_md_params },
+        (void (*)(void))sm2sig_settable_ctx_md_params },
     OSSL_DISPATCH_END
 };
diff --git a/providers/implementations/skeymgmt/aes_skmgmt.c b/providers/implementations/skeymgmt/aes_skmgmt.c
index 6d3b5f377fb8a..02370b7fb71c6 100644
--- a/providers/implementations/skeymgmt/aes_skmgmt.c
+++ b/providers/implementations/skeymgmt/aes_skmgmt.c
@@ -17,7 +17,7 @@ static OSSL_FUNC_skeymgmt_import_fn aes_import;
 static OSSL_FUNC_skeymgmt_export_fn aes_export;
 
 static void *aes_import(void *provctx, int selection,
-                        const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     PROV_SKEY *aes = generic_import(provctx, selection, params);
 
@@ -34,7 +34,7 @@ static void *aes_import(void *provctx, int selection,
 }
 
 static int aes_export(void *keydata, int selection,
-                      OSSL_CALLBACK *param_callback, void *cbarg)
+    OSSL_CALLBACK *param_callback, void *cbarg)
 {
     PROV_SKEY *aes = keydata;
 
diff --git a/providers/implementations/skeymgmt/generic.c b/providers/implementations/skeymgmt/generic.c
index b41bf8e12dcb4..5b8c557f83346 100644
--- a/providers/implementations/skeymgmt/generic.c
+++ b/providers/implementations/skeymgmt/generic.c
@@ -66,7 +66,7 @@ void *generic_import(void *provctx, int selection, const OSSL_PARAM params[])
 }
 
 int generic_export(void *keydata, int selection,
-                   OSSL_CALLBACK *param_callback, void *cbarg)
+    OSSL_CALLBACK *param_callback, void *cbarg)
 {
     PROV_SKEY *gen = keydata;
     OSSL_PARAM params[2];
@@ -79,7 +79,7 @@ int generic_export(void *keydata, int selection,
         return 0;
 
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_SKEY_PARAM_RAW_BYTES,
-                                                  gen->data, gen->length);
+        gen->data, gen->length);
     params[1] = OSSL_PARAM_construct_end();
 
     return param_callback(params, cbarg);
diff --git a/providers/implementations/skeymgmt/skeymgmt_lcl.h b/providers/implementations/skeymgmt/skeymgmt_lcl.h
index c180c1d303590..c75776cce4221 100644
--- a/providers/implementations/skeymgmt/skeymgmt_lcl.h
+++ b/providers/implementations/skeymgmt/skeymgmt_lcl.h
@@ -8,9 +8,9 @@
  */
 
 #ifndef OSSL_PROVIDERS_SKEYMGMT_LCL_H
-# define OSSL_PROVIDERS_SKEYMGMT_LCL_H
-# pragma once
-# include <openssl/core_dispatch.h>
+#define OSSL_PROVIDERS_SKEYMGMT_LCL_H
+#pragma once
+#include <openssl/core_dispatch.h>
 
 OSSL_FUNC_skeymgmt_import_fn generic_import;
 OSSL_FUNC_skeymgmt_export_fn generic_export;
diff --git a/providers/implementations/storemgmt/file_store.c b/providers/implementations/storemgmt/file_store.c
index 134b8efefbb2a..6568906ea1c46 100644
--- a/providers/implementations/storemgmt/file_store.c
+++ b/providers/implementations/storemgmt/file_store.c
@@ -11,7 +11,7 @@
 
 #include <string.h>
 #include <sys/stat.h>
-#include <ctype.h>  /* isdigit */
+#include <ctype.h> /* isdigit */
 #include <assert.h>
 
 #include <openssl/core_dispatch.h>
@@ -22,11 +22,11 @@
 #include <openssl/params.h>
 #include <openssl/decoder.h>
 #include <openssl/proverr.h>
-#include <openssl/store.h>       /* The OSSL_STORE_INFO type numbers */
+#include <openssl/store.h> /* The OSSL_STORE_INFO type numbers */
 #include "internal/cryptlib.h"
 #include "internal/o_dir.h"
 #include "crypto/decoder.h"
-#include "crypto/ctype.h"        /* ossl_isdigit() */
+#include "crypto/ctype.h" /* ossl_isdigit() */
 #include "prov/implementations.h"
 #include "prov/bio.h"
 #include "prov/providercommon.h"
@@ -35,11 +35,11 @@
 DEFINE_STACK_OF(OSSL_STORE_INFO)
 
 #ifdef _WIN32
-# define stat _stat
+#define stat _stat
 #endif
 
 #ifndef S_ISDIR
-# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
+#define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
 #endif
 
 static OSSL_FUNC_store_open_fn file_open;
@@ -64,10 +64,10 @@ static OSSL_FUNC_store_close_fn file_close;
 
 struct file_ctx_st {
     void *provctx;
-    char *uri;                   /* The URI we currently try to load */
+    char *uri; /* The URI we currently try to load */
     enum {
-        IS_FILE = 0,             /* Read file and pass results */
-        IS_DIR                   /* Pass directory entry names */
+        IS_FILE = 0, /* Read file and pass results */
+        IS_DIR /* Pass directory entry names */
     } type;
 
     union {
@@ -77,7 +77,7 @@ struct file_ctx_st {
 
             OSSL_DECODER_CTX *decoderctx;
             char *input_type;
-            char *propq;    /* The properties we got as a parameter */
+            char *propq; /* The properties we got as a parameter */
         } file;
 
         /* Used with |IS_DIR| */
@@ -121,7 +121,7 @@ static void free_file_ctx(struct file_ctx_st *ctx)
 }
 
 static struct file_ctx_st *new_file_ctx(int type, const char *uri,
-                                        void *provctx)
+    void *provctx)
 {
     struct file_ctx_st *ctx = NULL;
 
@@ -149,7 +149,7 @@ static OSSL_DECODER_CLEANUP file_load_cleanup;
  *
  */
 static struct file_ctx_st *file_open_stream(BIO *source, const char *uri,
-                                            void *provctx)
+    void *provctx)
 {
     struct file_ctx_st *ctx;
 
@@ -161,7 +161,7 @@ static struct file_ctx_st *file_open_stream(BIO *source, const char *uri,
     ctx->_.file.file = source;
 
     return ctx;
- err:
+err:
     free_file_ctx(ctx);
     return NULL;
 }
@@ -180,13 +180,13 @@ static void *file_open_dir(const char *path, const char *uri, void *provctx)
     if (ctx->_.dir.last_entry == NULL) {
         if (ctx->_.dir.last_errno != 0) {
             ERR_raise_data(ERR_LIB_SYS, ctx->_.dir.last_errno,
-                           "Calling OPENSSL_DIR_read(\"%s\")", path);
+                "Calling OPENSSL_DIR_read(\"%s\")", path);
             goto err;
         }
         ctx->_.dir.end_reached = 1;
     }
     return ctx;
- err:
+err:
     file_close(ctx);
     return NULL;
 }
@@ -197,7 +197,7 @@ static void *file_open(void *provctx, const char *uri)
     struct stat st;
     struct {
         const char *path;
-        unsigned int check_absolute:1;
+        unsigned int check_absolute : 1;
     } path_data[2];
     size_t path_data_n = 0, i;
     const char *path, *p = uri, *q;
@@ -220,9 +220,9 @@ static void *file_open(void *provctx, const char *uri)
     if (CHECK_AND_SKIP_CASE_PREFIX(p, "file:")) {
         q = p;
         if (CHECK_AND_SKIP_CASE_PREFIX(q, "//")) {
-            path_data_n--;           /* Invalidate using the full URI */
+            path_data_n--; /* Invalidate using the full URI */
             if (CHECK_AND_SKIP_CASE_PREFIX(q, "localhost/")
-                    || CHECK_AND_SKIP_CASE_PREFIX(q, "/")) {
+                || CHECK_AND_SKIP_CASE_PREFIX(q, "/")) {
                 p = q - 1;
             } else {
                 ERR_clear_last_mark();
@@ -247,7 +247,6 @@ static void *file_open(void *provctx, const char *uri)
         path_data[path_data_n++].path = p;
     }
 
-
     for (i = 0, path = NULL; path == NULL && i < path_data_n; i++) {
         /*
          * If the scheme "file" was an explicit part of the URI, the path must
@@ -256,14 +255,14 @@ static void *file_open(void *provctx, const char *uri)
         if (path_data[i].check_absolute && path_data[i].path[0] != '/') {
             ERR_clear_last_mark();
             ERR_raise_data(ERR_LIB_PROV, PROV_R_PATH_MUST_BE_ABSOLUTE,
-                           "Given path=%s", path_data[i].path);
+                "Given path=%s", path_data[i].path);
             return NULL;
         }
 
         if (stat(path_data[i].path, &st) < 0) {
             ERR_raise_data(ERR_LIB_SYS, errno,
-                           "calling stat(%s)",
-                           path_data[i].path);
+                "calling stat(%s)",
+                path_data[i].path);
         } else {
             path = path_data[i].path;
         }
@@ -279,7 +278,7 @@ static void *file_open(void *provctx, const char *uri)
     if (S_ISDIR(st.st_mode))
         ctx = file_open_dir(path, uri, provctx);
     else if ((bio = BIO_new_file(path, "rb")) == NULL
-             || (ctx = file_open_stream(bio, uri, provctx)) == NULL)
+        || (ctx = file_open_stream(bio, uri, provctx)) == NULL)
         BIO_free_all(bio);
 
     return ctx;
@@ -354,7 +353,7 @@ static int file_set_ctx_params(void *loaderctx, const OSSL_PARAM params[])
 
         if (ctx->type != IS_DIR) {
             ERR_raise(ERR_LIB_PROV,
-                      PROV_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES);
+                PROV_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES);
             return 0;
         }
 
@@ -362,10 +361,10 @@ static int file_set_ctx_params(void *loaderctx, const OSSL_PARAM params[])
             || (x509_name = d2i_X509_NAME(NULL, &der, der_len)) == NULL)
             return 0;
         hash = X509_NAME_hash_ex(x509_name,
-                                 ossl_prov_ctx_get0_libctx(ctx->provctx), NULL,
-                                 &ok);
+            ossl_prov_ctx_get0_libctx(ctx->provctx), NULL,
+            &ok);
         BIO_snprintf(ctx->_.dir.search_name, sizeof(ctx->_.dir.search_name),
-                     "%08lx", hash);
+            "%08lx", hash);
         X509_NAME_free(x509_name);
         if (ok == 0)
             return 0;
@@ -384,7 +383,7 @@ struct file_load_data_st {
 };
 
 static int file_load_construct(OSSL_DECODER_INSTANCE *decoder_inst,
-                               const OSSL_PARAM *params, void *construct_data)
+    const OSSL_PARAM *params, void *construct_data)
 {
     struct file_load_data_st *data = construct_data;
 
@@ -428,7 +427,7 @@ static int file_setup_decoders(struct file_ctx_st *ctx)
 
         /* Make sure the input type is set */
         if (!OSSL_DECODER_CTX_set_input_type(ctx->_.file.decoderctx,
-                                             ctx->_.file.input_type)) {
+                ctx->_.file.input_type)) {
             ERR_raise(ERR_LIB_PROV, ERR_R_OSSL_DECODER_LIB);
             goto err;
         }
@@ -443,7 +442,7 @@ static int file_setup_decoders(struct file_ctx_st *ctx)
         case OSSL_STORE_INFO_PUBKEY:
             input_structure = "SubjectPublicKeyInfo";
             if (!OSSL_DECODER_CTX_set_input_structure(ctx->_.file.decoderctx,
-                                                      input_structure)) {
+                    input_structure)) {
                 ERR_raise(ERR_LIB_PROV, ERR_R_OSSL_DECODER_LIB);
                 goto err;
             }
@@ -460,7 +459,7 @@ static int file_setup_decoders(struct file_ctx_st *ctx)
              */
             input_structure = "EncryptedPrivateKeyInfo";
             if (!OSSL_DECODER_CTX_set_input_structure(ctx->_.file.decoderctx,
-                                                      input_structure)) {
+                    input_structure)) {
                 ERR_raise(ERR_LIB_PROV, ERR_R_OSSL_DECODER_LIB);
                 goto err;
             }
@@ -468,7 +467,7 @@ static int file_setup_decoders(struct file_ctx_st *ctx)
         case OSSL_STORE_INFO_CERT:
             input_structure = "Certificate";
             if (!OSSL_DECODER_CTX_set_input_structure(ctx->_.file.decoderctx,
-                                                      input_structure)) {
+                    input_structure)) {
                 ERR_raise(ERR_LIB_PROV, ERR_R_OSSL_DECODER_LIB);
                 goto err;
             }
@@ -476,7 +475,7 @@ static int file_setup_decoders(struct file_ctx_st *ctx)
         case OSSL_STORE_INFO_CRL:
             input_structure = "CertificateList";
             if (!OSSL_DECODER_CTX_set_input_structure(ctx->_.file.decoderctx,
-                                                      input_structure)) {
+                    input_structure)) {
                 ERR_raise(ERR_LIB_PROV, ERR_R_OSSL_DECODER_LIB);
                 goto err;
             }
@@ -486,8 +485,8 @@ static int file_setup_decoders(struct file_ctx_st *ctx)
         }
 
         for (to_algo = ossl_any_to_obj_algorithm;
-             to_algo->algorithm_names != NULL;
-             to_algo++) {
+            to_algo->algorithm_names != NULL;
+            to_algo++) {
             OSSL_DECODER *to_obj = NULL;
             OSSL_DECODER_INSTANCE *to_obj_inst = NULL;
             const char *input_type;
@@ -500,9 +499,8 @@ static int file_setup_decoders(struct file_ctx_st *ctx)
              */
             to_obj = ossl_decoder_from_algorithm(0, to_algo, NULL);
             if (to_obj != NULL)
-                to_obj_inst =
-                    ossl_decoder_instance_new_forprov(to_obj, ctx->provctx,
-                                                      input_structure);
+                to_obj_inst = ossl_decoder_instance_new_forprov(to_obj, ctx->provctx,
+                    input_structure);
             OSSL_DECODER_free(to_obj);
             if (to_obj_inst == NULL)
                 goto err;
@@ -521,7 +519,7 @@ static int file_setup_decoders(struct file_ctx_st *ctx)
             }
 
             if (!ossl_decoder_ctx_add_decoder_inst(ctx->_.file.decoderctx,
-                                                   to_obj_inst)) {
+                    to_obj_inst)) {
                 ossl_decoder_instance_free(to_obj_inst);
                 ERR_raise(ERR_LIB_PROV, ERR_R_OSSL_DECODER_LIB);
                 goto err;
@@ -529,7 +527,7 @@ static int file_setup_decoders(struct file_ctx_st *ctx)
         }
         /* Add on the usual extra decoders */
         if (!OSSL_DECODER_CTX_add_extra(ctx->_.file.decoderctx,
-                                        libctx, ctx->_.file.propq)) {
+                libctx, ctx->_.file.propq)) {
             ERR_raise(ERR_LIB_PROV, ERR_R_OSSL_DECODER_LIB);
             goto err;
         }
@@ -539,22 +537,22 @@ static int file_setup_decoders(struct file_ctx_st *ctx)
          * data to the load callback
          */
         if (!OSSL_DECODER_CTX_set_construct(ctx->_.file.decoderctx,
-                                            file_load_construct)
+                file_load_construct)
             || !OSSL_DECODER_CTX_set_cleanup(ctx->_.file.decoderctx,
-                                             file_load_cleanup)) {
+                file_load_cleanup)) {
             ERR_raise(ERR_LIB_PROV, ERR_R_OSSL_DECODER_LIB);
             goto err;
         }
     }
 
     ok = 1;
- err:
+err:
     return ok;
 }
 
 static int file_load_file(struct file_ctx_st *ctx,
-                          OSSL_CALLBACK *object_cb, void *object_cbarg,
-                          OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *object_cb, void *object_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct file_load_data_st data;
     int ret, err;
@@ -674,8 +672,8 @@ static int file_name_check(struct file_ctx_st *ctx, const char *name)
 }
 
 static int file_load_dir_entry(struct file_ctx_st *ctx,
-                               OSSL_CALLBACK *object_cb, void *object_cbarg,
-                               OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *object_cb, void *object_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     /* Prepare as much as possible in advance */
     static const int object_type = OSSL_OBJECT_NAME;
@@ -703,8 +701,7 @@ static int file_load_dir_entry(struct file_ctx_st *ctx,
             && file_name_check(ctx, ctx->_.dir.last_entry)) {
 
             /* If we can't allocate the new name, we fail */
-            if ((newname =
-                 file_name_to_uri(ctx, ctx->_.dir.last_entry)) == NULL)
+            if ((newname = file_name_to_uri(ctx, ctx->_.dir.last_entry)) == NULL)
                 return 0;
         }
 
@@ -733,8 +730,8 @@ static int file_load_dir_entry(struct file_ctx_st *ctx,
  */
 
 static int file_load(void *loaderctx,
-                     OSSL_CALLBACK *object_cb, void *object_cbarg,
-                     OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *object_cb, void *object_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct file_ctx_st *ctx = loaderctx;
 
@@ -742,8 +739,7 @@ static int file_load(void *loaderctx,
     case IS_FILE:
         return file_load_file(ctx, object_cb, object_cbarg, pw_cb, pw_cbarg);
     case IS_DIR:
-        return
-            file_load_dir_entry(ctx, object_cb, object_cbarg, pw_cb, pw_cbarg);
+        return file_load_dir_entry(ctx, object_cb, object_cbarg, pw_cb, pw_cbarg);
     default:
         break;
     }
@@ -820,7 +816,7 @@ const OSSL_DISPATCH ossl_file_store_functions[] = {
     { OSSL_FUNC_STORE_OPEN, (void (*)(void))file_open },
     { OSSL_FUNC_STORE_ATTACH, (void (*)(void))file_attach },
     { OSSL_FUNC_STORE_SETTABLE_CTX_PARAMS,
-      (void (*)(void))file_settable_ctx_params },
+        (void (*)(void))file_settable_ctx_params },
     { OSSL_FUNC_STORE_SET_CTX_PARAMS, (void (*)(void))file_set_ctx_params },
     { OSSL_FUNC_STORE_LOAD, (void (*)(void))file_load },
     { OSSL_FUNC_STORE_EOF, (void (*)(void))file_eof },
diff --git a/providers/implementations/storemgmt/file_store_any2obj.c b/providers/implementations/storemgmt/file_store_any2obj.c
index bec6091608a99..f5553b97da37d 100644
--- a/providers/implementations/storemgmt/file_store_any2obj.c
+++ b/providers/implementations/storemgmt/file_store_any2obj.c
@@ -33,7 +33,7 @@
 #include <openssl/params.h>
 #include "internal/asn1.h"
 #include "internal/sizes.h"
-#include "crypto/pem.h"          /* For internal PVK and "blob" headers */
+#include "crypto/pem.h" /* For internal PVK and "blob" headers */
 #include "prov/bio.h"
 #include "file_store_local.h"
 
@@ -90,8 +90,8 @@ static const OSSL_PARAM *any2obj_settable_ctx_params(ossl_unused void *provctx)
 }
 
 static int any2obj_decode_final(void *vctx, int objtype, const char *input_type,
-                                const char *data_type, BUF_MEM *mem,
-                                OSSL_CALLBACK *data_cb, void *data_cbarg)
+    const char *data_type, BUF_MEM *mem,
+    OSSL_CALLBACK *data_cb, void *data_cbarg)
 {
     struct any2obj_ctx_st *ctx = vctx;
     /*
@@ -105,16 +105,16 @@ static int any2obj_decode_final(void *vctx, int objtype, const char *input_type,
 
         if (data_type != NULL)
             *p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
-                                                    (char *)data_type, 0);
+                (char *)data_type, 0);
         if (input_type != NULL)
             *p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_INPUT_TYPE,
-                                                    (char *)input_type, 0);
+                (char *)input_type, 0);
         if (*ctx->data_structure != '\0')
             *p++ = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_STRUCTURE,
-                                                    (char *)ctx->data_structure, 0);
+                (char *)ctx->data_structure, 0);
         *p++ = OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &objtype);
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_DATA,
-                                                 mem->data, mem->length);
+            mem->data, mem->length);
         *p = OSSL_PARAM_construct_end();
 
         ok = data_cb(params, data_cbarg);
@@ -125,8 +125,8 @@ static int any2obj_decode_final(void *vctx, int objtype, const char *input_type,
 
 static OSSL_FUNC_decoder_decode_fn der2obj_decode;
 static int der2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
-                          OSSL_CALLBACK *data_cb, void *data_cbarg,
-                          OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct any2obj_ctx_st *ctx = vctx;
     BIO *in = ossl_bio_new_from_core_bio(ctx->provctx, cin);
@@ -147,13 +147,13 @@ static int der2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
 
     /* any2obj_decode_final() frees |mem| for us */
     return any2obj_decode_final(ctx, OSSL_OBJECT_UNKNOWN, NULL, NULL, mem,
-                                data_cb, data_cbarg);
+        data_cb, data_cbarg);
 }
 
 static OSSL_FUNC_decoder_decode_fn msblob2obj_decode;
 static int msblob2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
-                             OSSL_CALLBACK *data_cb, void *data_cbarg,
-                             OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct any2obj_ctx_st *ctx = vctx;
     BIO *in = ossl_bio_new_from_core_bio(ctx->provctx, cin);
@@ -168,7 +168,7 @@ static int msblob2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     if (in == NULL)
         goto err;
 
-    mem_want = 16;               /* The size of the MSBLOB header */
+    mem_want = 16; /* The size of the MSBLOB header */
     if ((mem = BUF_MEM_new()) == NULL
         || !BUF_MEM_grow(mem, mem_want)) {
         ERR_raise(ERR_LIB_PEM, ERR_R_BUF_LIB);
@@ -182,7 +182,6 @@ static int msblob2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     if (!ok)
         goto next;
 
-
     ERR_set_mark();
     p = (unsigned char *)&mem->data[0];
     ok = ossl_do_blob_header(&p, 16, &magic, &bitlen, &isdss, &ispub) > 0;
@@ -202,7 +201,7 @@ static int msblob2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     mem_len += mem_want;
     ERR_pop_to_mark();
 
- next:
+next:
     /* Free resources we no longer need. */
     BIO_free(in);
     if (!ok && mem != NULL) {
@@ -212,10 +211,10 @@ static int msblob2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
 
     /* any2obj_decode_final() frees |mem| for us */
     return any2obj_decode_final(ctx, OSSL_OBJECT_PKEY, "msblob",
-                                isdss ? "DSA" : "RSA", mem,
-                                data_cb, data_cbarg);
+        isdss ? "DSA" : "RSA", mem,
+        data_cb, data_cbarg);
 
- err:
+err:
     BIO_free(in);
     BUF_MEM_free(mem);
     return 0;
@@ -223,8 +222,8 @@ static int msblob2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
 
 static OSSL_FUNC_decoder_decode_fn pvk2obj_decode;
 static int pvk2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
-                             OSSL_CALLBACK *data_cb, void *data_cbarg,
-                             OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct any2obj_ctx_st *ctx = vctx;
     BIO *in = ossl_bio_new_from_core_bio(ctx->provctx, cin);
@@ -237,7 +236,7 @@ static int pvk2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     if (in == NULL)
         goto err;
 
-    mem_want = 24;               /* The size of the PVK header */
+    mem_want = 24; /* The size of the PVK header */
     if ((mem = BUF_MEM_new()) == NULL
         || !BUF_MEM_grow(mem, mem_want)) {
         ERR_raise(ERR_LIB_PEM, ERR_R_BUF_LIB);
@@ -251,7 +250,6 @@ static int pvk2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     if (!ok)
         goto next;
 
-
     ERR_set_mark();
     p = (unsigned char *)&mem->data[0];
     ok = ossl_do_PVK_header(&p, 24, 0, &isdss, &saltlen, &keylen) > 0;
@@ -271,7 +269,7 @@ static int pvk2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     mem_len += mem_want;
     ERR_pop_to_mark();
 
- next:
+next:
     /* Free resources we no longer need. */
     BIO_free(in);
     if (!ok && mem != NULL) {
@@ -281,10 +279,10 @@ static int pvk2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
 
     /* any2obj_decode_final() frees |mem| for us */
     return any2obj_decode_final(ctx, OSSL_OBJECT_PKEY, "pvk",
-                                ok ? (isdss ? "DSA" : "RSA") : NULL, mem,
-                                data_cb, data_cbarg);
+        ok ? (isdss ? "DSA" : "RSA") : NULL, mem,
+        data_cb, data_cbarg);
 
- err:
+err:
     BIO_free(in);
     BUF_MEM_free(mem);
     return 0;
@@ -296,9 +294,9 @@ static int pvk2obj_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
         { OSSL_FUNC_DECODER_FREECTX, (void (*)(void))any2obj_freectx },      \
         { OSSL_FUNC_DECODER_DECODE, (void (*)(void))fromtype##2obj_decode }, \
         { OSSL_FUNC_DECODER_SETTABLE_CTX_PARAMS,                             \
-          (void (*)(void))any2obj_settable_ctx_params },                     \
+            (void (*)(void))any2obj_settable_ctx_params },                   \
         { OSSL_FUNC_DECODER_SET_CTX_PARAMS,                                  \
-          (void (*)(void))any2obj_set_ctx_params },                          \
+            (void (*)(void))any2obj_set_ctx_params },                        \
         OSSL_DISPATCH_END                                                    \
     }
 
@@ -310,5 +308,7 @@ const OSSL_ALGORITHM ossl_any_to_obj_algorithm[] = {
     { "obj", "input=DER", der_to_obj_decoder_functions },
     { "obj", "input=MSBLOB", msblob_to_obj_decoder_functions },
     { "obj", "input=PVK", pvk_to_obj_decoder_functions },
-    { NULL, }
+    {
+        NULL,
+    }
 };
diff --git a/providers/implementations/storemgmt/file_store_local.h b/providers/implementations/storemgmt/file_store_local.h
index b7d9e585163ef..b7b8486499488 100644
--- a/providers/implementations/storemgmt/file_store_local.h
+++ b/providers/implementations/storemgmt/file_store_local.h
@@ -8,4 +8,3 @@
  */
 
 extern const OSSL_ALGORITHM ossl_any_to_obj_algorithm[];
-
diff --git a/providers/implementations/storemgmt/winstore_store.c b/providers/implementations/storemgmt/winstore_store.c
index 55dcc2aff2029..cd3e4b94fb3bb 100644
--- a/providers/implementations/storemgmt/winstore_store.c
+++ b/providers/implementations/storemgmt/winstore_store.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -15,17 +15,17 @@
 #include <openssl/params.h>
 #include <openssl/decoder.h>
 #include <openssl/proverr.h>
-#include <openssl/store.h>       /* The OSSL_STORE_INFO type numbers */
+#include <openssl/store.h> /* The OSSL_STORE_INFO type numbers */
 #include "internal/cryptlib.h"
 #include "internal/o_dir.h"
 #include "crypto/decoder.h"
-#include "crypto/ctype.h"        /* ossl_isdigit() */
+#include "crypto/ctype.h" /* ossl_isdigit() */
 #include "prov/implementations.h"
 #include "prov/providercommon.h"
 #include "prov/bio.h"
 #include "file_store_local.h"
 #ifdef __CYGWIN__
-# include <windows.h>
+#include <windows.h>
 #endif
 #include <wincrypt.h>
 
@@ -36,16 +36,16 @@ enum {
 };
 
 struct winstore_ctx_st {
-    void                   *provctx;
-    char                   *propq;
-    unsigned char          *subject;
-    size_t                  subject_len;
+    void *provctx;
+    char *propq;
+    unsigned char *subject;
+    size_t subject_len;
 
-    HCERTSTORE              win_store;
-    const CERT_CONTEXT     *win_ctx;
-    int                     state;
+    HCERTSTORE win_store;
+    const CERT_CONTEXT *win_ctx;
+    int state;
 
-    OSSL_DECODER_CTX       *dctx;
+    OSSL_DECODER_CTX *dctx;
 };
 
 static void winstore_win_reset(struct winstore_ctx_st *ctx)
@@ -60,7 +60,7 @@ static void winstore_win_reset(struct winstore_ctx_st *ctx)
 
 static void winstore_win_advance(struct winstore_ctx_st *ctx)
 {
-    CERT_NAME_BLOB name = {0};
+    CERT_NAME_BLOB name = { 0 };
 
     if (ctx->state == STATE_EOF)
         return;
@@ -68,11 +68,7 @@ static void winstore_win_advance(struct winstore_ctx_st *ctx)
     name.cbData = ctx->subject_len;
     name.pbData = ctx->subject;
 
-    ctx->win_ctx = (name.cbData == 0 ? NULL :
-        CertFindCertificateInStore(ctx->win_store,
-                                   X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
-                                   0, CERT_FIND_SUBJECT_NAME,
-                                   &name, ctx->win_ctx));
+    ctx->win_ctx = (name.cbData == 0 ? NULL : CertFindCertificateInStore(ctx->win_store, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, CERT_FIND_SUBJECT_NAME, &name, ctx->win_ctx));
 
     ctx->state = (ctx->win_ctx == NULL) ? STATE_EOF : STATE_READ;
 }
@@ -88,8 +84,8 @@ static void *winstore_open(void *provctx, const char *uri)
     if (ctx == NULL)
         return NULL;
 
-    ctx->provctx    = provctx;
-    ctx->win_store  = CertOpenSystemStoreW(0, L"ROOT");
+    ctx->provctx = provctx;
+    ctx->win_store = CertOpenSystemStoreW(0, L"ROOT");
     if (ctx->win_store == NULL) {
         OPENSSL_free(ctx);
         return NULL;
@@ -163,12 +159,12 @@ static int winstore_set_ctx_params(void *loaderctx, const OSSL_PARAM params[])
 }
 
 struct load_data_st {
-    OSSL_CALLBACK  *object_cb;
-    void           *object_cbarg;
+    OSSL_CALLBACK *object_cb;
+    void *object_cbarg;
 };
 
 static int load_construct(OSSL_DECODER_INSTANCE *decoder_inst,
-                           const OSSL_PARAM *params, void *construct_data)
+    const OSSL_PARAM *params, void *construct_data)
 {
     struct load_data_st *data = construct_data;
     return data->object_cb(params, data->object_cbarg);
@@ -183,6 +179,7 @@ static int setup_decoder(struct winstore_ctx_st *ctx)
 {
     OSSL_LIB_CTX *libctx = ossl_prov_ctx_get0_libctx(ctx->provctx);
     const OSSL_ALGORITHM *to_algo = NULL;
+    const char *input_structure = NULL;
 
     if (ctx->dctx != NULL)
         return 1;
@@ -198,16 +195,18 @@ static int setup_decoder(struct winstore_ctx_st *ctx)
         goto err;
     }
 
-    if (!OSSL_DECODER_CTX_set_input_structure(ctx->dctx, "Certificate")) {
+    input_structure = "Certificate";
+    if (!OSSL_DECODER_CTX_set_input_structure(ctx->dctx, input_structure)) {
         ERR_raise(ERR_LIB_PROV, ERR_R_OSSL_DECODER_LIB);
         goto err;
     }
 
     for (to_algo = ossl_any_to_obj_algorithm;
-         to_algo->algorithm_names != NULL;
-         to_algo++) {
+        to_algo->algorithm_names != NULL;
+        to_algo++) {
         OSSL_DECODER *to_obj = NULL;
         OSSL_DECODER_INSTANCE *to_obj_inst = NULL;
+        const char *input_type;
 
         /*
          * Create the internal last resort decoder implementation
@@ -217,14 +216,24 @@ static int setup_decoder(struct winstore_ctx_st *ctx)
          */
         to_obj = ossl_decoder_from_algorithm(0, to_algo, NULL);
         if (to_obj != NULL)
-            to_obj_inst = ossl_decoder_instance_new(to_obj, ctx->provctx);
+            to_obj_inst = ossl_decoder_instance_new_forprov(to_obj, ctx->provctx,
+                input_structure);
 
         OSSL_DECODER_free(to_obj);
         if (to_obj_inst == NULL)
             goto err;
 
+        /*
+         * The input type has to be DER
+         */
+        input_type = OSSL_DECODER_INSTANCE_get_input_type(to_obj_inst);
+        if (OPENSSL_strcasecmp(input_type, "DER") != 0) {
+            ossl_decoder_instance_free(to_obj_inst);
+            continue;
+        }
+
         if (!ossl_decoder_ctx_add_decoder_inst(ctx->dctx,
-                                               to_obj_inst)) {
+                to_obj_inst)) {
             ossl_decoder_instance_free(to_obj_inst);
             ERR_raise(ERR_LIB_PROV, ERR_R_OSSL_DECODER_LIB);
             goto err;
@@ -255,9 +264,9 @@ static int setup_decoder(struct winstore_ctx_st *ctx)
 }
 
 static int winstore_load_using(struct winstore_ctx_st *ctx,
-                               OSSL_CALLBACK *object_cb, void *object_cbarg,
-                               OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg,
-                               const void *der, size_t der_len)
+    OSSL_CALLBACK *object_cb, void *object_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg,
+    const void *der, size_t der_len)
 {
     struct load_data_st data;
     const unsigned char *der_ = der;
@@ -266,8 +275,8 @@ static int winstore_load_using(struct winstore_ctx_st *ctx,
     if (setup_decoder(ctx) == 0)
         return 0;
 
-    data.object_cb      = object_cb;
-    data.object_cbarg   = object_cbarg;
+    data.object_cb = object_cb;
+    data.object_cbarg = object_cbarg;
 
     OSSL_DECODER_CTX_set_construct_data(ctx->dctx, &data);
     OSSL_DECODER_CTX_set_passphrase_cb(ctx->dctx, pw_cb, pw_cbarg);
@@ -279,8 +288,8 @@ static int winstore_load_using(struct winstore_ctx_st *ctx,
 }
 
 static int winstore_load(void *loaderctx,
-                         OSSL_CALLBACK *object_cb, void *object_cbarg,
-                         OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *object_cb, void *object_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     int ret = 0;
     struct winstore_ctx_st *ctx = loaderctx;
@@ -289,8 +298,8 @@ static int winstore_load(void *loaderctx,
         return 0;
 
     ret = winstore_load_using(ctx, object_cb, object_cbarg, pw_cb, pw_cbarg,
-                              ctx->win_ctx->pbCertEncoded,
-                              ctx->win_ctx->cbCertEncoded);
+        ctx->win_ctx->pbCertEncoded,
+        ctx->win_ctx->cbCertEncoded);
 
     if (ret == 1)
         winstore_win_advance(ctx);
diff --git a/providers/legacyprov.c b/providers/legacyprov.c
index 16e3639e76f18..63fb8e53ea49f 100644
--- a/providers/legacyprov.c
+++ b/providers/legacyprov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-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
@@ -31,7 +31,7 @@ static OSSL_FUNC_provider_query_operation_fn legacy_query;
 
 #ifdef STATIC_LEGACY
 OSSL_provider_init_fn ossl_legacy_provider_init;
-# define OSSL_provider_init ossl_legacy_provider_init
+#define OSSL_provider_init ossl_legacy_provider_init
 #endif
 
 #ifndef STATIC_LEGACY
@@ -48,6 +48,7 @@ static OSSL_FUNC_core_vset_error_fn *c_vset_error;
 static OSSL_FUNC_core_set_error_mark_fn *c_set_error_mark;
 static OSSL_FUNC_core_clear_last_error_mark_fn *c_clear_last_error_mark;
 static OSSL_FUNC_core_pop_error_to_mark_fn *c_pop_error_to_mark;
+static OSSL_FUNC_core_count_to_mark_fn *c_count_to_mark;
 #endif
 
 /* Parameters we provide to the core */
@@ -138,9 +139,9 @@ static const OSSL_ALGORITHM legacy_ciphers[] = {
 #ifndef OPENSSL_NO_RC4
     ALG(PROV_NAMES_RC4, ossl_rc4128_functions),
     ALG(PROV_NAMES_RC4_40, ossl_rc440_functions),
-# ifndef OPENSSL_NO_MD5
+#ifndef OPENSSL_NO_MD5
     ALG(PROV_NAMES_RC4_HMAC_MD5, ossl_rc4_hmac_ossl_md5_functions),
-# endif /* OPENSSL_NO_MD5 */
+#endif /* OPENSSL_NO_MD5 */
 #endif /* OPENSSL_NO_RC4 */
 #ifndef OPENSSL_NO_RC5
     ALG(PROV_NAMES_RC5_ECB, ossl_rc5128ecb_functions),
@@ -167,7 +168,7 @@ static const OSSL_ALGORITHM legacy_kdfs[] = {
 };
 
 static const OSSL_ALGORITHM *legacy_query(void *provctx, int operation_id,
-                                          int *no_cache)
+    int *no_cache)
 {
     *no_cache = 0;
     switch (operation_id) {
@@ -197,9 +198,9 @@ static const OSSL_DISPATCH legacy_dispatch_table[] = {
 };
 
 int OSSL_provider_init(const OSSL_CORE_HANDLE *handle,
-                       const OSSL_DISPATCH *in,
-                       const OSSL_DISPATCH **out,
-                       void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     OSSL_LIB_CTX *libctx = NULL;
 #ifndef STATIC_LEGACY
@@ -213,7 +214,11 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle,
          * multiple versions of libcrypto (e.g. one static and one dynamic),
          * but sharing a single legacy.so. We do a simple sanity check here.
          */
-#define set_func(c, f) if (c == NULL) c = f; else if (c != f) return 0;
+#define set_func(c, f) \
+    if (c == NULL)     \
+        c = f;         \
+    else if (c != f)   \
+        return 0;
         switch (tmp->function_id) {
         case OSSL_FUNC_CORE_NEW_ERROR:
             set_func(c_new_error, OSSL_FUNC_core_new_error(tmp));
@@ -229,11 +234,14 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle,
             break;
         case OSSL_FUNC_CORE_CLEAR_LAST_ERROR_MARK:
             set_func(c_clear_last_error_mark,
-                     OSSL_FUNC_core_clear_last_error_mark(tmp));
+                OSSL_FUNC_core_clear_last_error_mark(tmp));
             break;
         case OSSL_FUNC_CORE_POP_ERROR_TO_MARK:
             set_func(c_pop_error_to_mark, OSSL_FUNC_core_pop_error_to_mark(tmp));
             break;
+        case OSSL_FUNC_CORE_COUNT_TO_MARK:
+            set_func(c_count_to_mark, OSSL_FUNC_core_count_to_mark(in));
+            break;
         }
     }
 #endif
@@ -301,4 +309,9 @@ int ERR_pop_to_mark(void)
 {
     return c_pop_error_to_mark(NULL);
 }
+
+int ERR_count_to_mark(void)
+{
+    return c_count_to_mark != NULL ? c_count_to_mark(NULL) : 0;
+}
 #endif
diff --git a/providers/nullprov.c b/providers/nullprov.c
index bace75af15763..f069e56e8d9f3 100644
--- a/providers/nullprov.c
+++ b/providers/nullprov.c
@@ -52,8 +52,8 @@ static int null_get_params(const OSSL_PROVIDER *provctx, OSSL_PARAM params[])
 }
 
 static const OSSL_ALGORITHM *null_query(OSSL_PROVIDER *prov,
-                                          int operation_id,
-                                          int *no_cache)
+    int operation_id,
+    int *no_cache)
 {
     *no_cache = 0;
     return NULL;
@@ -68,9 +68,9 @@ static const OSSL_DISPATCH null_dispatch_table[] = {
 };
 
 int ossl_null_provider_init(const OSSL_CORE_HANDLE *handle,
-                            const OSSL_DISPATCH *in,
-                            const OSSL_DISPATCH **out,
-                            void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     *out = null_dispatch_table;
 
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index d1034814bff2c..1123899c92247 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -26,7 +26,7 @@ static int ssl_new(BIO *h);
 static int ssl_free(BIO *data);
 static long ssl_callback_ctrl(BIO *h, int cmd, BIO_info_cb *fp);
 typedef struct bio_ssl_st {
-    SSL *ssl;                   /* The ssl handle :-) */
+    SSL *ssl; /* The ssl handle :-) */
     /*
      * Re-negotiate every time the total number of bytes is this size
      * or when timeout expires.
@@ -43,11 +43,11 @@ static const BIO_METHOD methods_sslp = {
     BIO_TYPE_SSL,
     "ssl",
     ssl_write,
-    NULL,                       /* ssl_write_old, */
+    NULL, /* ssl_write_old, */
     ssl_read,
-    NULL,                       /* ssl_read_old,  */
+    NULL, /* ssl_read_old,  */
     ssl_puts,
-    NULL,                       /* ssl_gets,      */
+    NULL, /* ssl_gets,      */
     ssl_ctrl,
     ssl_new,
     ssl_free,
@@ -267,7 +267,7 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
         ret = 0;
         break;
     case BIO_C_SSL_MODE:
-        if (num)                /* client mode */
+        if (num) /* client mode */
             SSL_set_connect_state(ssl);
         else
             SSL_set_accept_state(ssl);
@@ -445,11 +445,11 @@ BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
 #ifndef OPENSSL_NO_SOCK
     BIO *ret = NULL, *buf = NULL, *ssl = NULL;
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
     if (ctx != NULL && IS_QUIC_CTX(ctx))
         /* Never use buffering for QUIC. */
         return BIO_new_ssl_connect(ctx);
-# endif
+#endif
 
     if ((buf = BIO_new(BIO_f_buffer())) == NULL)
         return NULL;
@@ -458,7 +458,7 @@ BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
     if ((ret = BIO_push(buf, ssl)) == NULL)
         goto err;
     return ret;
- err:
+err:
     BIO_free(buf);
     BIO_free(ssl);
 #endif
@@ -473,7 +473,7 @@ BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
     if ((con = BIO_new(BIO_s_connect())) == NULL)
         return NULL;
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
     if (ctx != NULL && IS_QUIC_CTX(ctx))
         if (!BIO_set_sock_type(con, SOCK_DGRAM))
             goto err;
@@ -484,7 +484,7 @@ BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
     if ((ret = BIO_push(ssl, con)) == NULL)
         goto err;
     return ret;
- err:
+err:
     BIO_free(ssl);
     BIO_free(con);
 #endif
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 9e1fbb0b29452..ad1bc7d8c8308 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -8,7 +8,7 @@
  */
 
 #include "internal/e_os.h"
-#include "internal/e_winsock.h"          /* struct timeval for DTLS_CTRL_GET_TIMEOUT */
+#include "internal/e_winsock.h" /* struct timeval for DTLS_CTRL_GET_TIMEOUT */
 #include <stdio.h>
 #include <openssl/objects.h>
 #include <openssl/rand.h>
@@ -134,8 +134,8 @@ void dtls1_clear_sent_buffer(SSL_CONNECTION *s)
         frag = (hm_fragment *)item->data;
 
         if (frag->msg_header.is_ccs
-                && frag->msg_header.saved_retransmit_state.wrlmethod != NULL
-                && s->rlayer.wrl != frag->msg_header.saved_retransmit_state.wrl) {
+            && frag->msg_header.saved_retransmit_state.wrlmethod != NULL
+            && s->rlayer.wrl != frag->msg_header.saved_retransmit_state.wrl) {
             /*
              * If we're freeing the CCS then we're done with the old wrl and it
              * can bee freed
@@ -148,7 +148,6 @@ void dtls1_clear_sent_buffer(SSL_CONNECTION *s)
     }
 }
 
-
 void dtls1_free(SSL *ssl)
 {
     SSL_CONNECTION *s = SSL_CONNECTION_FROM_SSL_ONLY(ssl);
@@ -374,8 +373,7 @@ int dtls1_check_timeout_num(SSL_CONNECTION *s)
     /* Reduce MTU after 2 unsuccessful retransmissions */
     if (s->d1->timeout_num_alerts > 2
         && !(SSL_get_options(ssl) & SSL_OP_NO_QUERY_MTU)) {
-        mtu =
-            BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_GET_FALLBACK_MTU, 0, NULL);
+        mtu = BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_GET_FALLBACK_MTU, 0, NULL);
         if (mtu < s->d1->mtu)
             s->d1->mtu = mtu;
     }
@@ -398,7 +396,7 @@ int dtls1_handle_timeout(SSL_CONNECTION *s)
 
     if (s->d1->timer_cb != NULL)
         s->d1->timeout_duration_us = s->d1->timer_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                                     s->d1->timeout_duration_us);
+            s->d1->timeout_duration_us);
     else
         dtls1_double_timeout(s);
 
@@ -412,8 +410,8 @@ int dtls1_handle_timeout(SSL_CONNECTION *s)
     return dtls1_retransmit_buffered_messages(s);
 }
 
-#define LISTEN_SUCCESS              2
-#define LISTEN_SEND_VERIFY_REQUEST  1
+#define LISTEN_SUCCESS 2
+#define LISTEN_SEND_VERIFY_REQUEST 1
 
 #ifndef OPENSSL_NO_SOCK
 int DTLSv1_listen(SSL *ssl, BIO_ADDR *client)
@@ -477,8 +475,7 @@ int DTLSv1_listen(SSL *ssl, BIO_ADDR *client)
         /* Get a packet */
 
         clear_sys_error();
-        n = BIO_read(rbio, buf, SSL3_RT_MAX_PLAIN_LENGTH
-                                + DTLS1_RT_HEADER_LENGTH);
+        n = BIO_read(rbio, buf, SSL3_RT_MAX_PLAIN_LENGTH + DTLS1_RT_HEADER_LENGTH);
         if (n <= 0) {
             if (BIO_should_retry(rbio)) {
                 /* Non-blocking IO */
@@ -519,7 +516,7 @@ int DTLSv1_listen(SSL *ssl, BIO_ADDR *client)
 
         if (s->msg_callback)
             s->msg_callback(0, (versmajor << 8) | versminor, SSL3_RT_HEADER, buf,
-                            DTLS1_RT_HEADER_LENGTH, ssl, s->msg_callback_arg);
+                DTLS1_RT_HEADER_LENGTH, ssl, s->msg_callback_arg);
 
         if (rectype != SSL3_RT_HANDSHAKE) {
             ERR_raise(ERR_LIB_SSL, SSL_R_UNEXPECTED_MESSAGE);
@@ -573,7 +570,7 @@ int DTLSv1_listen(SSL *ssl, BIO_ADDR *client)
         }
 
         /* Message sequence number can only be 0 or 1 */
-        if (msgseq > 2) {
+        if (msgseq > 1) {
             ERR_raise(ERR_LIB_SSL, SSL_R_INVALID_SEQUENCE_NUMBER);
             goto end;
         }
@@ -593,8 +590,8 @@ int DTLSv1_listen(SSL *ssl, BIO_ADDR *client)
 
         if (s->msg_callback)
             s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, data,
-                            fraglen + DTLS1_HM_HEADER_LENGTH, ssl,
-                            s->msg_callback_arg);
+                fraglen + DTLS1_HM_HEADER_LENGTH, ssl,
+                s->msg_callback_arg);
 
         if (!PACKET_get_net_2(&msgpayload, &clientvers)) {
             ERR_raise(ERR_LIB_SSL, SSL_R_LENGTH_MISMATCH);
@@ -604,8 +601,7 @@ int DTLSv1_listen(SSL *ssl, BIO_ADDR *client)
         /*
          * Verify client version is supported
          */
-        if (DTLS_VERSION_LT(clientvers, (unsigned int)ssl->method->version) &&
-            ssl->method->version != DTLS_ANY_VERSION) {
+        if (DTLS_VERSION_LT(clientvers, (unsigned int)ssl->method->version) && ssl->method->version != DTLS_ANY_VERSION) {
             ERR_raise(ERR_LIB_SSL, SSL_R_WRONG_VERSION_NUMBER);
             goto end;
         }
@@ -638,7 +634,8 @@ int DTLSv1_listen(SSL *ssl, BIO_ADDR *client)
                 goto end;
             }
             if (ssl->ctx->app_verify_cookie_cb(ssl, PACKET_data(&cookiepkt),
-                    (unsigned int)PACKET_remaining(&cookiepkt)) == 0) {
+                    (unsigned int)PACKET_remaining(&cookiepkt))
+                == 0) {
                 /*
                  * We treat invalid cookies in the same was as no cookie as
                  * per RFC6347
@@ -662,9 +659,7 @@ int DTLSv1_listen(SSL *ssl, BIO_ADDR *client)
              */
 
             /* Generate the cookie */
-            if (ssl->ctx->app_gen_cookie_cb == NULL ||
-                ssl->ctx->app_gen_cookie_cb(ssl, cookie, &cookielen) == 0 ||
-                cookielen > 255) {
+            if (ssl->ctx->app_gen_cookie_cb == NULL || ssl->ctx->app_gen_cookie_cb(ssl, cookie, &cookielen) == 0 || cookielen > 255) {
                 ERR_raise(ERR_LIB_SSL, SSL_R_COOKIE_GEN_CALLBACK_FAILURE);
                 /* This is fatal */
                 ret = -1;
@@ -681,54 +676,54 @@ int DTLSv1_listen(SSL *ssl, BIO_ADDR *client)
 
             /* Construct the record and message headers */
             if (!WPACKET_init_static_len(&wpkt,
-                                         wbuf,
-                                         ssl_get_max_send_fragment(s)
-                                         + DTLS1_RT_HEADER_LENGTH,
-                                         0)
-                    || !WPACKET_put_bytes_u8(&wpkt, SSL3_RT_HANDSHAKE)
-                    || !WPACKET_put_bytes_u16(&wpkt, version)
-                       /*
-                        * Record sequence number is always the same as in the
-                        * received ClientHello
-                        */
-                    || !WPACKET_memcpy(&wpkt, seq, SEQ_NUM_SIZE)
-                       /* End of record, start sub packet for message */
-                    || !WPACKET_start_sub_packet_u16(&wpkt)
-                       /* Message type */
-                    || !WPACKET_put_bytes_u8(&wpkt,
-                                             DTLS1_MT_HELLO_VERIFY_REQUEST)
-                       /*
-                        * Message length - doesn't follow normal TLS convention:
-                        * the length isn't the last thing in the message header.
-                        * We'll need to fill this in later when we know the
-                        * length. Set it to zero for now
-                        */
-                    || !WPACKET_put_bytes_u24(&wpkt, 0)
-                       /*
-                        * Message sequence number is always 0 for a
-                        * HelloVerifyRequest
-                        */
-                    || !WPACKET_put_bytes_u16(&wpkt, 0)
-                       /*
-                        * We never fragment a HelloVerifyRequest, so fragment
-                        * offset is 0
-                        */
-                    || !WPACKET_put_bytes_u24(&wpkt, 0)
-                       /*
-                        * Fragment length is the same as message length, but
-                        * this *is* the last thing in the message header so we
-                        * can just start a sub-packet. No need to come back
-                        * later for this one.
-                        */
-                    || !WPACKET_start_sub_packet_u24(&wpkt)
-                       /* Create the actual HelloVerifyRequest body */
-                    || !dtls_raw_hello_verify_request(&wpkt, cookie, cookielen)
-                       /* Close message body */
-                    || !WPACKET_close(&wpkt)
-                       /* Close record body */
-                    || !WPACKET_close(&wpkt)
-                    || !WPACKET_get_total_written(&wpkt, &wreclen)
-                    || !WPACKET_finish(&wpkt)) {
+                    wbuf,
+                    ssl_get_max_send_fragment(s)
+                        + DTLS1_RT_HEADER_LENGTH,
+                    0)
+                || !WPACKET_put_bytes_u8(&wpkt, SSL3_RT_HANDSHAKE)
+                || !WPACKET_put_bytes_u16(&wpkt, version)
+                /*
+                 * Record sequence number is always the same as in the
+                 * received ClientHello
+                 */
+                || !WPACKET_memcpy(&wpkt, seq, SEQ_NUM_SIZE)
+                /* End of record, start sub packet for message */
+                || !WPACKET_start_sub_packet_u16(&wpkt)
+                /* Message type */
+                || !WPACKET_put_bytes_u8(&wpkt,
+                    DTLS1_MT_HELLO_VERIFY_REQUEST)
+                /*
+                 * Message length - doesn't follow normal TLS convention:
+                 * the length isn't the last thing in the message header.
+                 * We'll need to fill this in later when we know the
+                 * length. Set it to zero for now
+                 */
+                || !WPACKET_put_bytes_u24(&wpkt, 0)
+                /*
+                 * Message sequence number is always 0 for a
+                 * HelloVerifyRequest
+                 */
+                || !WPACKET_put_bytes_u16(&wpkt, 0)
+                /*
+                 * We never fragment a HelloVerifyRequest, so fragment
+                 * offset is 0
+                 */
+                || !WPACKET_put_bytes_u24(&wpkt, 0)
+                /*
+                 * Fragment length is the same as message length, but
+                 * this *is* the last thing in the message header so we
+                 * can just start a sub-packet. No need to come back
+                 * later for this one.
+                 */
+                || !WPACKET_start_sub_packet_u24(&wpkt)
+                /* Create the actual HelloVerifyRequest body */
+                || !dtls_raw_hello_verify_request(&wpkt, cookie, cookielen)
+                /* Close message body */
+                || !WPACKET_close(&wpkt)
+                /* Close record body */
+                || !WPACKET_close(&wpkt)
+                || !WPACKET_get_total_written(&wpkt, &wreclen)
+                || !WPACKET_finish(&wpkt)) {
                 ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
                 WPACKET_cleanup(&wpkt);
                 /* This is fatal */
@@ -744,13 +739,13 @@ int DTLSv1_listen(SSL *ssl, BIO_ADDR *client)
              * last 3 bytes of the message header
              */
             memcpy(&wbuf[DTLS1_RT_HEADER_LENGTH + 1],
-                   &wbuf[DTLS1_RT_HEADER_LENGTH + DTLS1_HM_HEADER_LENGTH - 3],
-                   3);
+                &wbuf[DTLS1_RT_HEADER_LENGTH + DTLS1_HM_HEADER_LENGTH - 3],
+                3);
 
             if (s->msg_callback)
-                s->msg_callback(1, 0, SSL3_RT_HEADER, buf,
-                                DTLS1_RT_HEADER_LENGTH, ssl,
-                                s->msg_callback_arg);
+                s->msg_callback(1, version, SSL3_RT_HEADER, wbuf,
+                    DTLS1_RT_HEADER_LENGTH, ssl,
+                    s->msg_callback_arg);
 
             if ((tmpclient = BIO_ADDR_new()) == NULL) {
                 ERR_raise(ERR_LIB_SSL, ERR_R_BIO_LIB);
@@ -832,18 +827,18 @@ int DTLSv1_listen(SSL *ssl, BIO_ADDR *client)
      * buffered in s->rlayer.rrlnext
      */
     if (!ssl_set_new_record_layer(s,
-                                  DTLS_ANY_VERSION,
-                                  OSSL_RECORD_DIRECTION_READ,
-                                  OSSL_RECORD_PROTECTION_LEVEL_NONE, NULL, 0,
-                                  NULL, 0, NULL, 0, NULL,  0, NULL, 0,
-                                  NID_undef, NULL, NULL, NULL)) {
+            DTLS_ANY_VERSION,
+            OSSL_RECORD_DIRECTION_READ,
+            OSSL_RECORD_PROTECTION_LEVEL_NONE, NULL, 0,
+            NULL, 0, NULL, 0, NULL, 0, NULL, 0,
+            NID_undef, NULL, NULL, NULL)) {
         /* SSLfatal already called */
         ret = -1;
         goto end;
     }
 
     ret = 1;
- end:
+end:
     BIO_ADDR_free(tmpclient);
     OPENSSL_free(buf);
     OPENSSL_free(wbuf);
@@ -863,19 +858,18 @@ int dtls1_shutdown(SSL *s)
     BIO *wbio;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s);
 
-    if (s == NULL)
+    if (sc == NULL)
         return -1;
 
     wbio = SSL_get_wbio(s);
-    if (wbio != NULL && BIO_dgram_is_sctp(wbio) &&
-        !(sc->shutdown & SSL_SENT_SHUTDOWN)) {
+    if (wbio != NULL && BIO_dgram_is_sctp(wbio) && !(sc->shutdown & SSL_SENT_SHUTDOWN)) {
         ret = BIO_dgram_sctp_wait_for_dry(wbio);
         if (ret < 0)
             return -1;
 
         if (ret == 0)
             BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN, 1,
-                     NULL);
+                NULL);
     }
 #endif
     ret = ssl3_shutdown(s);
@@ -890,16 +884,14 @@ int dtls1_query_mtu(SSL_CONNECTION *s)
     SSL *ssl = SSL_CONNECTION_GET_SSL(s);
 
     if (s->d1->link_mtu) {
-        s->d1->mtu =
-            s->d1->link_mtu - BIO_dgram_get_mtu_overhead(SSL_get_wbio(ssl));
+        s->d1->mtu = s->d1->link_mtu - BIO_dgram_get_mtu_overhead(SSL_get_wbio(ssl));
         s->d1->link_mtu = 0;
     }
 
     /* AHA!  Figure out the MTU, and stick to the right size */
     if (s->d1->mtu < dtls1_min_mtu(s)) {
         if (!(SSL_get_options(ssl) & SSL_OP_NO_QUERY_MTU)) {
-            s->d1->mtu =
-                BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL);
+            s->d1->mtu = BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL);
 
             /*
              * I've seen the kernel return bogus numbers when it doesn't know
@@ -909,7 +901,7 @@ int dtls1_query_mtu(SSL_CONNECTION *s)
                 /* Set to min mtu */
                 s->d1->mtu = dtls1_min_mtu(s);
                 BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_SET_MTU,
-                         (long)s->d1->mtu, NULL);
+                    (long)s->d1->mtu, NULL);
             }
         } else
             return 0;
@@ -919,8 +911,7 @@ int dtls1_query_mtu(SSL_CONNECTION *s)
 
 static size_t dtls1_link_min_mtu(void)
 {
-    return (g_probable_mtu[(sizeof(g_probable_mtu) /
-                            sizeof(g_probable_mtu[0])) - 1]);
+    return (g_probable_mtu[(sizeof(g_probable_mtu) / sizeof(g_probable_mtu[0])) - 1]);
 }
 
 size_t dtls1_min_mtu(SSL_CONNECTION *s)
@@ -946,7 +937,7 @@ size_t DTLS_get_data_mtu(const SSL *ssl)
         return 0;
 
     if (!ssl_cipher_get_overhead(ciph, &mac_overhead, &int_overhead,
-                                 &blocksize, &ext_overhead))
+            &blocksize, &ext_overhead))
         return 0;
 
     if (SSL_READ_ETM(s))
diff --git a/ssl/d1_msg.c b/ssl/d1_msg.c
index 6613f0f4c87a1..50676a1cda381 100644
--- a/ssl/d1_msg.c
+++ b/ssl/d1_msg.c
@@ -11,7 +11,7 @@
 #include "internal/ssl_unwrap.h"
 
 int dtls1_write_app_data_bytes(SSL *s, uint8_t type, const void *buf_,
-                               size_t len, size_t *written)
+    size_t len, size_t *written)
 {
     int i;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s);
@@ -40,7 +40,7 @@ int dtls1_write_app_data_bytes(SSL *s, uint8_t type, const void *buf_,
 int dtls1_dispatch_alert(SSL *ssl)
 {
     int i, j;
-    void (*cb) (const SSL *ssl, int type, int val) = NULL;
+    void (*cb)(const SSL *ssl, int type, int val) = NULL;
     unsigned char buf[DTLS1_AL_HEADER_LENGTH];
     unsigned char *ptr = &buf[0];
     size_t written;
@@ -64,7 +64,7 @@ int dtls1_dispatch_alert(SSL *ssl)
 
         if (s->msg_callback)
             s->msg_callback(1, s->version, SSL3_RT_ALERT, s->s3.send_alert,
-                            2, ssl, s->msg_callback_arg);
+                2, ssl, s->msg_callback_arg);
 
         if (s->info_callback != NULL)
             cb = s->info_callback;
diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c
index ad926a613dee4..d096a056ceda6 100644
--- a/ssl/d1_srtp.c
+++ b/ssl/d1_srtp.c
@@ -22,58 +22,58 @@
 
 static const SRTP_PROTECTION_PROFILE srtp_known_profiles[] = {
     {
-     "SRTP_AES128_CM_SHA1_80",
-     SRTP_AES128_CM_SHA1_80,
-     },
+        "SRTP_AES128_CM_SHA1_80",
+        SRTP_AES128_CM_SHA1_80,
+    },
     {
-     "SRTP_AES128_CM_SHA1_32",
-     SRTP_AES128_CM_SHA1_32,
-     },
+        "SRTP_AES128_CM_SHA1_32",
+        SRTP_AES128_CM_SHA1_32,
+    },
     {
-     "SRTP_AEAD_AES_128_GCM",
-     SRTP_AEAD_AES_128_GCM,
-     },
+        "SRTP_AEAD_AES_128_GCM",
+        SRTP_AEAD_AES_128_GCM,
+    },
     {
-     "SRTP_AEAD_AES_256_GCM",
-     SRTP_AEAD_AES_256_GCM,
-     },
+        "SRTP_AEAD_AES_256_GCM",
+        SRTP_AEAD_AES_256_GCM,
+    },
     {
-     "SRTP_DOUBLE_AEAD_AES_128_GCM_AEAD_AES_128_GCM",
-     SRTP_DOUBLE_AEAD_AES_128_GCM_AEAD_AES_128_GCM,
-     },
+        "SRTP_DOUBLE_AEAD_AES_128_GCM_AEAD_AES_128_GCM",
+        SRTP_DOUBLE_AEAD_AES_128_GCM_AEAD_AES_128_GCM,
+    },
     {
-     "SRTP_DOUBLE_AEAD_AES_256_GCM_AEAD_AES_256_GCM",
-     SRTP_DOUBLE_AEAD_AES_256_GCM_AEAD_AES_256_GCM,
-     },
+        "SRTP_DOUBLE_AEAD_AES_256_GCM_AEAD_AES_256_GCM",
+        SRTP_DOUBLE_AEAD_AES_256_GCM_AEAD_AES_256_GCM,
+    },
     {
-     "SRTP_ARIA_128_CTR_HMAC_SHA1_80",
-     SRTP_ARIA_128_CTR_HMAC_SHA1_80,
-     },
+        "SRTP_ARIA_128_CTR_HMAC_SHA1_80",
+        SRTP_ARIA_128_CTR_HMAC_SHA1_80,
+    },
     {
-     "SRTP_ARIA_128_CTR_HMAC_SHA1_32",
-     SRTP_ARIA_128_CTR_HMAC_SHA1_32,
-     },
+        "SRTP_ARIA_128_CTR_HMAC_SHA1_32",
+        SRTP_ARIA_128_CTR_HMAC_SHA1_32,
+    },
     {
-     "SRTP_ARIA_256_CTR_HMAC_SHA1_80",
-     SRTP_ARIA_256_CTR_HMAC_SHA1_80,
-     },
+        "SRTP_ARIA_256_CTR_HMAC_SHA1_80",
+        SRTP_ARIA_256_CTR_HMAC_SHA1_80,
+    },
     {
-     "SRTP_ARIA_256_CTR_HMAC_SHA1_32",
-     SRTP_ARIA_256_CTR_HMAC_SHA1_32,
-     },
+        "SRTP_ARIA_256_CTR_HMAC_SHA1_32",
+        SRTP_ARIA_256_CTR_HMAC_SHA1_32,
+    },
     {
-     "SRTP_AEAD_ARIA_128_GCM",
-     SRTP_AEAD_ARIA_128_GCM,
-     },
+        "SRTP_AEAD_ARIA_128_GCM",
+        SRTP_AEAD_ARIA_128_GCM,
+    },
     {
-     "SRTP_AEAD_ARIA_256_GCM",
-     SRTP_AEAD_ARIA_256_GCM,
-     },
-    {0}
+        "SRTP_AEAD_ARIA_256_GCM",
+        SRTP_AEAD_ARIA_256_GCM,
+    },
+    { 0 }
 };
 
 static int find_profile_by_name(char *profile_name,
-                                const SRTP_PROTECTION_PROFILE **pptr, size_t len)
+    const SRTP_PROTECTION_PROFILE **pptr, size_t len)
 {
     const SRTP_PROTECTION_PROFILE *p;
 
@@ -92,7 +92,7 @@ static int find_profile_by_name(char *profile_name,
 }
 
 static int ssl_ctx_make_profiles(const char *profiles_string,
-                                 STACK_OF(SRTP_PROTECTION_PROFILE) **out)
+    STACK_OF(SRTP_PROTECTION_PROFILE) **out)
 {
     STACK_OF(SRTP_PROTECTION_PROFILE) *profiles;
 
@@ -108,16 +108,16 @@ static int ssl_ctx_make_profiles(const char *profiles_string,
     do {
         col = strchr(ptr, ':');
 
-        if (!find_profile_by_name(ptr, &p, col ? (size_t)(col - ptr)
-                                               : strlen(ptr))) {
+        if (!find_profile_by_name(ptr, &p, col ? (size_t)(col - ptr) : strlen(ptr))) {
             if (sk_SRTP_PROTECTION_PROFILE_find(profiles,
-                                                (SRTP_PROTECTION_PROFILE *)p) >= 0) {
+                    (SRTP_PROTECTION_PROFILE *)p)
+                >= 0) {
                 ERR_raise(ERR_LIB_SSL, SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
                 goto err;
             }
 
             if (!sk_SRTP_PROTECTION_PROFILE_push(profiles,
-                                                 (SRTP_PROTECTION_PROFILE *)p)) {
+                    (SRTP_PROTECTION_PROFILE *)p)) {
                 ERR_raise(ERR_LIB_SSL, SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES);
                 goto err;
             }
@@ -135,7 +135,7 @@ static int ssl_ctx_make_profiles(const char *profiles_string,
     *out = profiles;
 
     return 0;
- err:
+err:
     sk_SRTP_PROTECTION_PROFILE_free(profiles);
     return 1;
 }
diff --git a/ssl/methods.c b/ssl/methods.c
index 525f59e91231c..07098839058db 100644
--- a/ssl/methods.c
+++ b/ssl/methods.c
@@ -17,29 +17,29 @@
  */
 
 IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, 0, 0,
-                        TLS_method,
-                        ossl_statem_accept,
-                        ossl_statem_connect, TLSv1_2_enc_data)
+    TLS_method,
+    ossl_statem_accept,
+    ossl_statem_connect, TLSv1_2_enc_data)
 IMPLEMENT_tls_meth_func(TLS1_3_VERSION, 0, SSL_OP_NO_TLSv1_3,
-                        tlsv1_3_method,
-                        ossl_statem_accept,
-                        ossl_statem_connect, TLSv1_3_enc_data)
+    tlsv1_3_method,
+    ossl_statem_accept,
+    ossl_statem_connect, TLSv1_3_enc_data)
 #ifndef OPENSSL_NO_TLS1_2_METHOD
 IMPLEMENT_tls_meth_func(TLS1_2_VERSION, 0, SSL_OP_NO_TLSv1_2,
-                        tlsv1_2_method,
-                        ossl_statem_accept,
-                        ossl_statem_connect, TLSv1_2_enc_data)
+    tlsv1_2_method,
+    ossl_statem_accept,
+    ossl_statem_connect, TLSv1_2_enc_data)
 #endif
 #ifndef OPENSSL_NO_TLS1_1_METHOD
 IMPLEMENT_tls_meth_func(TLS1_1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1_1,
-                        tlsv1_1_method,
-                        ossl_statem_accept,
-                        ossl_statem_connect, TLSv1_1_enc_data)
+    tlsv1_1_method,
+    ossl_statem_accept,
+    ossl_statem_connect, TLSv1_1_enc_data)
 #endif
 #ifndef OPENSSL_NO_TLS1_METHOD
 IMPLEMENT_tls_meth_func(TLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1,
-                        tlsv1_method,
-                        ossl_statem_accept, ossl_statem_connect, TLSv1_enc_data)
+    tlsv1_method,
+    ossl_statem_accept, ossl_statem_connect, TLSv1_enc_data)
 #endif
 #ifndef OPENSSL_NO_SSL3_METHOD
 IMPLEMENT_ssl3_meth_func(sslv3_method, ossl_statem_accept, ossl_statem_connect)
@@ -48,133 +48,133 @@ IMPLEMENT_ssl3_meth_func(sslv3_method, ossl_statem_accept, ossl_statem_connect)
  * TLS/SSLv3 server methods
  */
 IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, 0, 0,
-                        TLS_server_method,
-                        ossl_statem_accept,
-                        ssl_undefined_function, TLSv1_2_enc_data)
+    TLS_server_method,
+    ossl_statem_accept,
+    ssl_undefined_function, TLSv1_2_enc_data)
 IMPLEMENT_tls_meth_func(TLS1_3_VERSION, 0, SSL_OP_NO_TLSv1_3,
-                        tlsv1_3_server_method,
-                        ossl_statem_accept,
-                        ssl_undefined_function, TLSv1_3_enc_data)
+    tlsv1_3_server_method,
+    ossl_statem_accept,
+    ssl_undefined_function, TLSv1_3_enc_data)
 #ifndef OPENSSL_NO_TLS1_2_METHOD
 IMPLEMENT_tls_meth_func(TLS1_2_VERSION, 0, SSL_OP_NO_TLSv1_2,
-                        tlsv1_2_server_method,
-                        ossl_statem_accept,
-                        ssl_undefined_function, TLSv1_2_enc_data)
+    tlsv1_2_server_method,
+    ossl_statem_accept,
+    ssl_undefined_function, TLSv1_2_enc_data)
 #endif
 #ifndef OPENSSL_NO_TLS1_1_METHOD
 IMPLEMENT_tls_meth_func(TLS1_1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1_1,
-                        tlsv1_1_server_method,
-                        ossl_statem_accept,
-                        ssl_undefined_function, TLSv1_1_enc_data)
+    tlsv1_1_server_method,
+    ossl_statem_accept,
+    ssl_undefined_function, TLSv1_1_enc_data)
 #endif
 #ifndef OPENSSL_NO_TLS1_METHOD
 IMPLEMENT_tls_meth_func(TLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1,
-                        tlsv1_server_method,
-                        ossl_statem_accept,
-                        ssl_undefined_function, TLSv1_enc_data)
+    tlsv1_server_method,
+    ossl_statem_accept,
+    ssl_undefined_function, TLSv1_enc_data)
 #endif
 #ifndef OPENSSL_NO_SSL3_METHOD
 IMPLEMENT_ssl3_meth_func(sslv3_server_method,
-                         ossl_statem_accept, ssl_undefined_function)
+    ossl_statem_accept, ssl_undefined_function)
 #endif
 /*-
  * TLS/SSLv3 client methods
  */
 IMPLEMENT_tls_meth_func(TLS_ANY_VERSION, 0, 0,
-                        TLS_client_method,
-                        ssl_undefined_function,
-                        ossl_statem_connect, TLSv1_2_enc_data)
+    TLS_client_method,
+    ssl_undefined_function,
+    ossl_statem_connect, TLSv1_2_enc_data)
 IMPLEMENT_tls_meth_func(TLS1_3_VERSION, 0, SSL_OP_NO_TLSv1_3,
-                        tlsv1_3_client_method,
-                        ssl_undefined_function,
-                        ossl_statem_connect, TLSv1_3_enc_data)
+    tlsv1_3_client_method,
+    ssl_undefined_function,
+    ossl_statem_connect, TLSv1_3_enc_data)
 #ifndef OPENSSL_NO_TLS1_2_METHOD
 IMPLEMENT_tls_meth_func(TLS1_2_VERSION, 0, SSL_OP_NO_TLSv1_2,
-                        tlsv1_2_client_method,
-                        ssl_undefined_function,
-                        ossl_statem_connect, TLSv1_2_enc_data)
+    tlsv1_2_client_method,
+    ssl_undefined_function,
+    ossl_statem_connect, TLSv1_2_enc_data)
 #endif
 #ifndef OPENSSL_NO_TLS1_1_METHOD
 IMPLEMENT_tls_meth_func(TLS1_1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1_1,
-                        tlsv1_1_client_method,
-                        ssl_undefined_function,
-                        ossl_statem_connect, TLSv1_1_enc_data)
+    tlsv1_1_client_method,
+    ssl_undefined_function,
+    ossl_statem_connect, TLSv1_1_enc_data)
 #endif
 #ifndef OPENSSL_NO_TLS1_METHOD
 IMPLEMENT_tls_meth_func(TLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_TLSv1,
-                        tlsv1_client_method,
-                        ssl_undefined_function,
-                        ossl_statem_connect, TLSv1_enc_data)
+    tlsv1_client_method,
+    ssl_undefined_function,
+    ossl_statem_connect, TLSv1_enc_data)
 #endif
 #ifndef OPENSSL_NO_SSL3_METHOD
 IMPLEMENT_ssl3_meth_func(sslv3_client_method,
-                         ssl_undefined_function, ossl_statem_connect)
+    ssl_undefined_function, ossl_statem_connect)
 #endif
 /*-
  * DTLS methods
  */
 #ifndef OPENSSL_NO_DTLS1_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_DTLSv1,
-                          dtlsv1_method,
-                          ossl_statem_accept,
-                          ossl_statem_connect, DTLSv1_enc_data)
+    dtlsv1_method,
+    ossl_statem_accept,
+    ossl_statem_connect, DTLSv1_enc_data)
 #endif
 #ifndef OPENSSL_NO_DTLS1_2_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, 0, SSL_OP_NO_DTLSv1_2,
-                          dtlsv1_2_method,
-                          ossl_statem_accept,
-                          ossl_statem_connect, DTLSv1_2_enc_data)
+    dtlsv1_2_method,
+    ossl_statem_accept,
+    ossl_statem_connect, DTLSv1_2_enc_data)
 #endif
 IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0,
-                          DTLS_method,
-                          ossl_statem_accept,
-                          ossl_statem_connect, DTLSv1_2_enc_data)
+    DTLS_method,
+    ossl_statem_accept,
+    ossl_statem_connect, DTLSv1_2_enc_data)
 
 /*-
  * DTLS server methods
  */
 #ifndef OPENSSL_NO_DTLS1_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_DTLSv1,
-                          dtlsv1_server_method,
-                          ossl_statem_accept,
-                          ssl_undefined_function, DTLSv1_enc_data)
+    dtlsv1_server_method,
+    ossl_statem_accept,
+    ssl_undefined_function, DTLSv1_enc_data)
 #endif
 #ifndef OPENSSL_NO_DTLS1_2_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, 0, SSL_OP_NO_DTLSv1_2,
-                          dtlsv1_2_server_method,
-                          ossl_statem_accept,
-                          ssl_undefined_function, DTLSv1_2_enc_data)
+    dtlsv1_2_server_method,
+    ossl_statem_accept,
+    ssl_undefined_function, DTLSv1_2_enc_data)
 #endif
 IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0,
-                          DTLS_server_method,
-                          ossl_statem_accept,
-                          ssl_undefined_function, DTLSv1_2_enc_data)
+    DTLS_server_method,
+    ossl_statem_accept,
+    ssl_undefined_function, DTLSv1_2_enc_data)
 
 /*-
  * DTLS client methods
  */
 #ifndef OPENSSL_NO_DTLS1_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, SSL_METHOD_NO_SUITEB, SSL_OP_NO_DTLSv1,
-                          dtlsv1_client_method,
-                          ssl_undefined_function,
-                          ossl_statem_connect, DTLSv1_enc_data)
+    dtlsv1_client_method,
+    ssl_undefined_function,
+    ossl_statem_connect, DTLSv1_enc_data)
 IMPLEMENT_dtls1_meth_func(DTLS1_BAD_VER, SSL_METHOD_NO_SUITEB, SSL_OP_NO_DTLSv1,
-                          dtls_bad_ver_client_method,
-                          ssl_undefined_function,
-                          ossl_statem_connect, DTLSv1_enc_data)
+    dtls_bad_ver_client_method,
+    ssl_undefined_function,
+    ossl_statem_connect, DTLSv1_enc_data)
 #endif
 #ifndef OPENSSL_NO_DTLS1_2_METHOD
 IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, 0, SSL_OP_NO_DTLSv1_2,
-                          dtlsv1_2_client_method,
-                          ssl_undefined_function,
-                          ossl_statem_connect, DTLSv1_2_enc_data)
+    dtlsv1_2_client_method,
+    ssl_undefined_function,
+    ossl_statem_connect, DTLSv1_2_enc_data)
 #endif
 IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, 0, 0,
-                          DTLS_client_method,
-                          ssl_undefined_function,
-                          ossl_statem_connect, DTLSv1_2_enc_data)
+    DTLS_client_method,
+    ssl_undefined_function,
+    ossl_statem_connect, DTLSv1_2_enc_data)
 #ifndef OPENSSL_NO_DEPRECATED_1_1_0
-# ifndef OPENSSL_NO_TLS1_2_METHOD
+#ifndef OPENSSL_NO_TLS1_2_METHOD
 const SSL_METHOD *TLSv1_2_method(void)
 {
     return tlsv1_2_method();
@@ -189,9 +189,9 @@ const SSL_METHOD *TLSv1_2_client_method(void)
 {
     return tlsv1_2_client_method();
 }
-# endif
+#endif
 
-# ifndef OPENSSL_NO_TLS1_1_METHOD
+#ifndef OPENSSL_NO_TLS1_1_METHOD
 const SSL_METHOD *TLSv1_1_method(void)
 {
     return tlsv1_1_method();
@@ -206,9 +206,9 @@ const SSL_METHOD *TLSv1_1_client_method(void)
 {
     return tlsv1_1_client_method();
 }
-# endif
+#endif
 
-# ifndef OPENSSL_NO_TLS1_METHOD
+#ifndef OPENSSL_NO_TLS1_METHOD
 const SSL_METHOD *TLSv1_method(void)
 {
     return tlsv1_method();
@@ -223,9 +223,9 @@ const SSL_METHOD *TLSv1_client_method(void)
 {
     return tlsv1_client_method();
 }
-# endif
+#endif
 
-# ifndef OPENSSL_NO_SSL3_METHOD
+#ifndef OPENSSL_NO_SSL3_METHOD
 const SSL_METHOD *SSLv3_method(void)
 {
     return sslv3_method();
@@ -240,9 +240,9 @@ const SSL_METHOD *SSLv3_client_method(void)
 {
     return sslv3_client_method();
 }
-# endif
+#endif
 
-# ifndef OPENSSL_NO_DTLS1_2_METHOD
+#ifndef OPENSSL_NO_DTLS1_2_METHOD
 const SSL_METHOD *DTLSv1_2_method(void)
 {
     return dtlsv1_2_method();
@@ -257,9 +257,9 @@ const SSL_METHOD *DTLSv1_2_client_method(void)
 {
     return dtlsv1_2_client_method();
 }
-# endif
+#endif
 
-# ifndef OPENSSL_NO_DTLS1_METHOD
+#ifndef OPENSSL_NO_DTLS1_METHOD
 const SSL_METHOD *DTLSv1_method(void)
 {
     return dtlsv1_method();
@@ -274,6 +274,6 @@ const SSL_METHOD *DTLSv1_client_method(void)
 {
     return dtlsv1_client_method();
 }
-# endif
+#endif
 
 #endif
diff --git a/ssl/pqueue.c b/ssl/pqueue.c
index db161e25da1fb..87918e5e2bc9e 100644
--- a/ssl/pqueue.c
+++ b/ssl/pqueue.c
@@ -55,12 +55,12 @@ pitem *pqueue_insert(pqueue *pq, pitem *item)
     }
 
     for (curr = NULL, next = pq->items;
-         next != NULL; curr = next, next = next->next) {
+        next != NULL; curr = next, next = next->next) {
         /*
          * we can compare 64-bit value in big-endian encoding with memcmp:-)
          */
         int cmp = memcmp(next->priority, item->priority, 8);
-        if (cmp > 0) {          /* next > item */
+        if (cmp > 0) { /* next > item */
             item->next = next;
 
             if (curr == NULL)
@@ -71,7 +71,7 @@ pitem *pqueue_insert(pqueue *pq, pitem *item)
             return item;
         }
 
-        else if (cmp == 0)      /* duplicates not allowed */
+        else if (cmp == 0) /* duplicates not allowed */
             return NULL;
     }
 
diff --git a/ssl/priority_queue.c b/ssl/priority_queue.c
index ed1d191f2e857..6f1de51b89d41 100644
--- a/ssl/priority_queue.c
+++ b/ssl/priority_queue.c
@@ -35,14 +35,14 @@ OSSL_SAFE_MATH_UNSIGNED(size_t, size_t)
  */
 
 struct pq_heap_st {
-    void *data;     /* User supplied data pointer */
-    size_t index;   /* Constant index in elements[] */
+    void *data; /* User supplied data pointer */
+    size_t index; /* Constant index in elements[] */
 };
 
 struct pq_elem_st {
-    size_t posn;    /* Current index in heap[] or link in free list */
+    size_t posn; /* Current index in heap[] or link in free list */
 #ifndef NDEBUG
-    int used;       /* Debug flag indicating that this is in use */
+    int used; /* Debug flag indicating that this is in use */
 #endif
 };
 
@@ -50,29 +50,27 @@ struct ossl_pqueue_st {
     struct pq_heap_st *heap;
     struct pq_elem_st *elements;
     int (*compare)(const void *, const void *);
-    size_t htop;        /* Highest used heap element */
-    size_t hmax;        /* Allocated heap & element space */
-    size_t freelist;    /* Index into elements[], start of free element list */
+    size_t htop; /* Highest used heap element */
+    size_t hmax; /* Allocated heap & element space */
+    size_t freelist; /* Index into elements[], start of free element list */
 };
 
 /*
  * The initial and maximum number of elements in the heap.
  */
 static const size_t min_nodes = 8;
-static const size_t max_nodes =
-        SIZE_MAX / (sizeof(struct pq_heap_st) > sizeof(struct pq_elem_st)
-                    ? sizeof(struct pq_heap_st) : sizeof(struct pq_elem_st));
+static const size_t max_nodes = SIZE_MAX / (sizeof(struct pq_heap_st) > sizeof(struct pq_elem_st) ? sizeof(struct pq_heap_st) : sizeof(struct pq_elem_st));
 
 #ifndef NDEBUG
 /* Some basic sanity checking of the data structure */
-# define ASSERT_USED(pq, idx)                                               \
-    assert(pq->elements[pq->heap[idx].index].used);                         \
+#define ASSERT_USED(pq, idx)                        \
+    assert(pq->elements[pq->heap[idx].index].used); \
     assert(pq->elements[pq->heap[idx].index].posn == idx)
-# define ASSERT_ELEM_USED(pq, elem)                                         \
+#define ASSERT_ELEM_USED(pq, elem) \
     assert(pq->elements[elem].used)
 #else
-# define ASSERT_USED(pq, idx)
-# define ASSERT_ELEM_USED(pq, elem)
+#define ASSERT_USED(pq, idx)
+#define ASSERT_ELEM_USED(pq, elem)
 #endif
 
 /*
diff --git a/ssl/quic/cc_newreno.c b/ssl/quic/cc_newreno.c
index 1fe37c276e586..27708a37577c1 100644
--- a/ssl/quic/cc_newreno.c
+++ b/ssl/quic/cc_newreno.c
@@ -6,54 +6,54 @@ OSSL_SAFE_MATH_UNSIGNED(u64, uint64_t)
 
 typedef struct ossl_cc_newreno_st {
     /* Dependencies. */
-    OSSL_TIME   (*now_cb)(void *arg);
-    void        *now_cb_arg;
+    OSSL_TIME (*now_cb)(void *arg);
+    void *now_cb_arg;
 
     /* 'Constants' (which we allow to be configurable). */
-    uint64_t    k_init_wnd, k_min_wnd;
-    uint32_t    k_loss_reduction_factor_num, k_loss_reduction_factor_den;
-    uint32_t    persistent_cong_thresh;
+    uint64_t k_init_wnd, k_min_wnd;
+    uint32_t k_loss_reduction_factor_num, k_loss_reduction_factor_den;
+    uint32_t persistent_cong_thresh;
 
     /* State. */
-    size_t      max_dgram_size;
-    uint64_t    bytes_in_flight, cong_wnd, slow_start_thresh, bytes_acked;
-    OSSL_TIME   cong_recovery_start_time;
+    size_t max_dgram_size;
+    uint64_t bytes_in_flight, cong_wnd, slow_start_thresh, bytes_acked;
+    OSSL_TIME cong_recovery_start_time;
 
     /* Unflushed state during multiple on-loss calls. */
-    int         processing_loss; /* 1 if not flushed */
-    OSSL_TIME   tx_time_of_last_loss;
+    int processing_loss; /* 1 if not flushed */
+    OSSL_TIME tx_time_of_last_loss;
 
     /* Diagnostic state. */
-    int         in_congestion_recovery;
+    int in_congestion_recovery;
 
     /* Diagnostic output locations. */
-    size_t      *p_diag_max_dgram_payload_len;
-    uint64_t    *p_diag_cur_cwnd_size;
-    uint64_t    *p_diag_min_cwnd_size;
-    uint64_t    *p_diag_cur_bytes_in_flight;
-    uint32_t    *p_diag_cur_state;
+    size_t *p_diag_max_dgram_payload_len;
+    uint64_t *p_diag_cur_cwnd_size;
+    uint64_t *p_diag_min_cwnd_size;
+    uint64_t *p_diag_cur_bytes_in_flight;
+    uint32_t *p_diag_cur_state;
 } OSSL_CC_NEWRENO;
 
-#define MIN_MAX_INIT_WND_SIZE    14720  /* RFC 9002 s. 7.2 */
+#define MIN_MAX_INIT_WND_SIZE 14720 /* RFC 9002 s. 7.2 */
 
 /* TODO(QUIC FUTURE): Pacing support. */
 
 static void newreno_set_max_dgram_size(OSSL_CC_NEWRENO *nr,
-                                       size_t max_dgram_size);
+    size_t max_dgram_size);
 static void newreno_update_diag(OSSL_CC_NEWRENO *nr);
 
 static void newreno_reset(OSSL_CC_DATA *cc);
 
 static OSSL_CC_DATA *newreno_new(OSSL_TIME (*now_cb)(void *arg),
-                                 void *now_cb_arg)
+    void *now_cb_arg)
 {
     OSSL_CC_NEWRENO *nr;
 
     if ((nr = OPENSSL_zalloc(sizeof(*nr))) == NULL)
         return NULL;
 
-    nr->now_cb          = now_cb;
-    nr->now_cb_arg      = now_cb_arg;
+    nr->now_cb = now_cb;
+    nr->now_cb_arg = now_cb_arg;
 
     newreno_set_max_dgram_size(nr, QUIC_MIN_INITIAL_DGRAM_LEN);
     newreno_reset((OSSL_CC_DATA *)nr);
@@ -67,7 +67,7 @@ static void newreno_free(OSSL_CC_DATA *cc)
 }
 
 static void newreno_set_max_dgram_size(OSSL_CC_NEWRENO *nr,
-                                       size_t max_dgram_size)
+    size_t max_dgram_size)
 {
     size_t max_init_wnd;
     int is_reduced = (max_dgram_size < nr->max_dgram_size);
@@ -94,19 +94,19 @@ static void newreno_reset(OSSL_CC_DATA *cc)
 {
     OSSL_CC_NEWRENO *nr = (OSSL_CC_NEWRENO *)cc;
 
-    nr->k_loss_reduction_factor_num     = 1;
-    nr->k_loss_reduction_factor_den     = 2;
-    nr->persistent_cong_thresh          = 3;
+    nr->k_loss_reduction_factor_num = 1;
+    nr->k_loss_reduction_factor_den = 2;
+    nr->persistent_cong_thresh = 3;
 
-    nr->cong_wnd                    = nr->k_init_wnd;
-    nr->bytes_in_flight             = 0;
-    nr->bytes_acked                 = 0;
-    nr->slow_start_thresh           = UINT64_MAX;
-    nr->cong_recovery_start_time    = ossl_time_zero();
+    nr->cong_wnd = nr->k_init_wnd;
+    nr->bytes_in_flight = 0;
+    nr->bytes_acked = 0;
+    nr->slow_start_thresh = UINT64_MAX;
+    nr->cong_recovery_start_time = ossl_time_zero();
 
-    nr->processing_loss         = 0;
-    nr->tx_time_of_last_loss    = ossl_time_zero();
-    nr->in_congestion_recovery  = 0;
+    nr->processing_loss = 0;
+    nr->tx_time_of_last_loss = ossl_time_zero();
+    nr->in_congestion_recovery = 0;
 }
 
 static int newreno_set_input_params(OSSL_CC_DATA *cc, const OSSL_PARAM *params)
@@ -129,7 +129,7 @@ static int newreno_set_input_params(OSSL_CC_DATA *cc, const OSSL_PARAM *params)
 }
 
 static int bind_diag(OSSL_PARAM *params, const char *param_name, size_t len,
-                     void **pp)
+    void **pp)
 {
     const OSSL_PARAM *p = OSSL_PARAM_locate_const(params, param_name);
 
@@ -156,15 +156,15 @@ static int newreno_bind_diagnostic(OSSL_CC_DATA *cc, OSSL_PARAM *params)
     uint32_t *new_p_cur_state;
 
     if (!bind_diag(params, OSSL_CC_OPTION_MAX_DGRAM_PAYLOAD_LEN,
-                   sizeof(size_t), (void **)&new_p_max_dgram_payload_len)
+            sizeof(size_t), (void **)&new_p_max_dgram_payload_len)
         || !bind_diag(params, OSSL_CC_OPTION_CUR_CWND_SIZE,
-                      sizeof(uint64_t), (void **)&new_p_cur_cwnd_size)
+            sizeof(uint64_t), (void **)&new_p_cur_cwnd_size)
         || !bind_diag(params, OSSL_CC_OPTION_MIN_CWND_SIZE,
-                      sizeof(uint64_t), (void **)&new_p_min_cwnd_size)
+            sizeof(uint64_t), (void **)&new_p_min_cwnd_size)
         || !bind_diag(params, OSSL_CC_OPTION_CUR_BYTES_IN_FLIGHT,
-                      sizeof(uint64_t), (void **)&new_p_cur_bytes_in_flight)
+            sizeof(uint64_t), (void **)&new_p_cur_bytes_in_flight)
         || !bind_diag(params, OSSL_CC_OPTION_CUR_STATE,
-                      sizeof(uint32_t), (void **)&new_p_cur_state))
+            sizeof(uint32_t), (void **)&new_p_cur_state))
         return 0;
 
     if (new_p_max_dgram_payload_len != NULL)
@@ -187,7 +187,7 @@ static int newreno_bind_diagnostic(OSSL_CC_DATA *cc, OSSL_PARAM *params)
 }
 
 static void unbind_diag(OSSL_PARAM *params, const char *param_name,
-                        void **pp)
+    void **pp)
 {
     const OSSL_PARAM *p = OSSL_PARAM_locate_const(params, param_name);
 
@@ -200,15 +200,15 @@ static int newreno_unbind_diagnostic(OSSL_CC_DATA *cc, OSSL_PARAM *params)
     OSSL_CC_NEWRENO *nr = (OSSL_CC_NEWRENO *)cc;
 
     unbind_diag(params, OSSL_CC_OPTION_MAX_DGRAM_PAYLOAD_LEN,
-                (void **)&nr->p_diag_max_dgram_payload_len);
+        (void **)&nr->p_diag_max_dgram_payload_len);
     unbind_diag(params, OSSL_CC_OPTION_CUR_CWND_SIZE,
-                (void **)&nr->p_diag_cur_cwnd_size);
+        (void **)&nr->p_diag_cur_cwnd_size);
     unbind_diag(params, OSSL_CC_OPTION_MIN_CWND_SIZE,
-                (void **)&nr->p_diag_min_cwnd_size);
+        (void **)&nr->p_diag_min_cwnd_size);
     unbind_diag(params, OSSL_CC_OPTION_CUR_BYTES_IN_FLIGHT,
-                (void **)&nr->p_diag_cur_bytes_in_flight);
+        (void **)&nr->p_diag_cur_bytes_in_flight);
     unbind_diag(params, OSSL_CC_OPTION_CUR_STATE,
-                (void **)&nr->p_diag_cur_state);
+        (void **)&nr->p_diag_cur_state);
     return 1;
 }
 
@@ -256,9 +256,9 @@ static void newreno_cong(OSSL_CC_NEWRENO *nr, OSSL_TIME tx_time)
     /* slow_start_thresh = cong_wnd * loss_reduction_factor */
     nr->slow_start_thresh
         = safe_muldiv_u64(nr->cong_wnd,
-                          nr->k_loss_reduction_factor_num,
-                          nr->k_loss_reduction_factor_den,
-                          &err);
+            nr->k_loss_reduction_factor_num,
+            nr->k_loss_reduction_factor_den,
+            &err);
 
     if (err)
         nr->slow_start_thresh = UINT64_MAX;
@@ -276,8 +276,8 @@ static void newreno_flush(OSSL_CC_NEWRENO *nr, uint32_t flags)
     newreno_cong(nr, nr->tx_time_of_last_loss);
 
     if ((flags & OSSL_CC_LOST_FLAG_PERSISTENT_CONGESTION) != 0) {
-        nr->cong_wnd                    = nr->k_min_wnd;
-        nr->cong_recovery_start_time    = ossl_time_zero();
+        nr->cong_wnd = nr->k_min_wnd;
+        nr->cong_recovery_start_time = ossl_time_zero();
     }
 
     nr->processing_loss = 0;
@@ -333,11 +333,11 @@ static int newreno_is_cong_limited(OSSL_CC_NEWRENO *nr)
      * have consumed half of our window.
      */
     return (nr->cong_wnd < nr->slow_start_thresh && wnd_rem <= nr->cong_wnd / 2)
-           || wnd_rem <= 3 * nr->max_dgram_size;
+        || wnd_rem <= 3 * nr->max_dgram_size;
 }
 
 static int newreno_on_data_acked(OSSL_CC_DATA *cc,
-                                 const OSSL_CC_ACK_INFO *info)
+    const OSSL_CC_ACK_INFO *info)
 {
     OSSL_CC_NEWRENO *nr = (OSSL_CC_NEWRENO *)cc;
 
@@ -389,7 +389,7 @@ static int newreno_on_data_acked(OSSL_CC_DATA *cc,
          */
         if (nr->bytes_acked >= nr->cong_wnd) {
             nr->bytes_acked -= nr->cong_wnd;
-            nr->cong_wnd    += nr->max_dgram_size;
+            nr->cong_wnd += nr->max_dgram_size;
         }
 
         nr->in_congestion_recovery = 0;
@@ -401,7 +401,7 @@ static int newreno_on_data_acked(OSSL_CC_DATA *cc,
 }
 
 static int newreno_on_data_lost(OSSL_CC_DATA *cc,
-                                const OSSL_CC_LOSS_INFO *info)
+    const OSSL_CC_LOSS_INFO *info)
 {
     OSSL_CC_NEWRENO *nr = (OSSL_CC_NEWRENO *)cc;
 
@@ -446,7 +446,7 @@ static int newreno_on_data_lost_finished(OSSL_CC_DATA *cc, uint32_t flags)
 }
 
 static int newreno_on_data_invalidated(OSSL_CC_DATA *cc,
-                                       uint64_t num_bytes)
+    uint64_t num_bytes)
 {
     OSSL_CC_NEWRENO *nr = (OSSL_CC_NEWRENO *)cc;
 
@@ -456,13 +456,13 @@ static int newreno_on_data_invalidated(OSSL_CC_DATA *cc,
 }
 
 static int newreno_on_ecn(OSSL_CC_DATA *cc,
-                          const OSSL_CC_ECN_INFO *info)
+    const OSSL_CC_ECN_INFO *info)
 {
     OSSL_CC_NEWRENO *nr = (OSSL_CC_NEWRENO *)cc;
 
-    nr->processing_loss         = 1;
-    nr->bytes_acked             = 0;
-    nr->tx_time_of_last_loss    = info->largest_acked_time;
+    nr->processing_loss = 1;
+    nr->bytes_acked = 0;
+    nr->tx_time_of_last_loss = info->largest_acked_time;
     newreno_flush(nr, 0);
     return 1;
 }
diff --git a/ssl/quic/json_enc.c b/ssl/quic/json_enc.c
index 3e9f715dfaca7..9e14e821f1ccc 100644
--- a/ssl/quic/json_enc.c
+++ b/ssl/quic/json_enc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -11,7 +11,6 @@
 #include "internal/nelem.h"
 #include "internal/numbers.h"
 #include <string.h>
-#include <math.h>
 
 /*
  * wbuf
@@ -25,16 +24,16 @@ static int wbuf_init(struct json_write_buf *wbuf, BIO *bio, size_t alloc)
     if (wbuf->buf == NULL)
         return 0;
 
-    wbuf->cur   = 0;
+    wbuf->cur = 0;
     wbuf->alloc = alloc;
-    wbuf->bio   = bio;
+    wbuf->bio = bio;
     return 1;
 }
 
 static void wbuf_cleanup(struct json_write_buf *wbuf)
 {
     OPENSSL_free(wbuf->buf);
-    wbuf->buf   = NULL;
+    wbuf->buf = NULL;
     wbuf->alloc = 0;
 }
 
@@ -88,12 +87,12 @@ static int wbuf_flush(struct json_write_buf *wbuf, int full)
 
     while (total_written < wbuf->cur) {
         if (!BIO_write_ex(wbuf->bio,
-                          wbuf->buf + total_written,
-                          wbuf->cur - total_written,
-                          &written)) {
+                wbuf->buf + total_written,
+                wbuf->cur - total_written,
+                &written)) {
             memmove(wbuf->buf,
-                    wbuf->buf + total_written,
-                    wbuf->cur - total_written);
+                wbuf->buf + total_written,
+                wbuf->cur - total_written);
             wbuf->cur = 0;
             return 0;
         }
@@ -132,8 +131,8 @@ static int json_ensure_stack_size(OSSL_JSON_ENC *json, size_t num_bytes)
             return 0;
     }
 
-    json->stack         = stack;
-    json->stack_bytes   = num_bytes;
+    json->stack = stack;
+    json->stack_bytes = num_bytes;
     return 1;
 }
 
@@ -194,10 +193,10 @@ static int json_peek(OSSL_JSON_ENC *json)
     size_t obyte, obit;
 
     obyte = json->stack_end_byte;
-    obit  = json->stack_end_bit;
+    obit = json->stack_end_bit;
     if (obit == 0) {
-       if (obyte == 0)
-           return -1;
+        if (obyte == 0)
+            return -1;
 
         --obyte;
         obit = CHAR_BIT - 1;
@@ -237,8 +236,8 @@ static ossl_inline int in_pretty(const OSSL_JSON_ENC *json)
 int ossl_json_init(OSSL_JSON_ENC *json, BIO *bio, uint32_t flags)
 {
     memset(json, 0, sizeof(*json));
-    json->flags     = flags;
-    json->error     = 0;
+    json->flags = flags;
+    json->error = 0;
     if (!wbuf_init(&json->wbuf, bio, 4096))
         return 0;
 
@@ -267,9 +266,9 @@ int ossl_json_flush_cleanup(OSSL_JSON_ENC *json)
 int ossl_json_reset(OSSL_JSON_ENC *json)
 {
     wbuf_clean(&json->wbuf);
-    json->stack_end_byte    = 0;
-    json->stack_end_bit     = 0;
-    json->error             = 0;
+    json->stack_end_byte = 0;
+    json->stack_end_bit = 0;
+    json->error = 0;
     return 1;
 }
 
@@ -595,33 +594,6 @@ void ossl_json_i64(OSSL_JSON_ENC *json, int64_t value)
         json_write_char(json, '"');
 }
 
-/* Encode a JSON number from a 64-bit floating point value. */
-void ossl_json_f64(OSSL_JSON_ENC *json, double value)
-{
-    char buf[32];
-
-    if (!json_pre_item(json))
-        return;
-
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-    {
-        int checks = isnan(value);
-# if !defined(OPENSSL_SYS_VMS)
-        checks |= isinf(value);
-# endif
-
-        if (checks) {
-            json_raise_error(json);
-            return;
-        }
-    }
-#endif
-
-    BIO_snprintf(buf, sizeof(buf), "%1.17g", value);
-    json_write_str(json, buf);
-    json_post_item(json);
-}
-
 /*
  * Encode a JSON UTF-8 string from a zero-terminated string. The string passed
  * can be freed immediately following the call to this function.
@@ -633,7 +605,7 @@ static ossl_inline int hex_digit(int v)
 
 static ossl_inline void
 json_write_qstring_inner(OSSL_JSON_ENC *json, const char *str, size_t str_len,
-                         int nul_term)
+    int nul_term)
 {
     char c, *o, obuf[7];
     unsigned char *u_str;
@@ -647,19 +619,33 @@ json_write_qstring_inner(OSSL_JSON_ENC *json, const char *str, size_t str_len,
 
     for (j = nul_term ? strlen(str) : str_len; j > 0; str++, j--) {
         c = *str;
-        u_str = (unsigned char*)str;
+        u_str = (unsigned char *)str;
         switch (c) {
-        case '\n': o = "\\n"; break;
-        case '\r': o = "\\r"; break;
-        case '\t': o = "\\t"; break;
-        case '\b': o = "\\b"; break;
-        case '\f': o = "\\f"; break;
-        case '"': o = "\\\""; break;
-        case '\\': o = "\\\\"; break;
+        case '\n':
+            o = "\\n";
+            break;
+        case '\r':
+            o = "\\r";
+            break;
+        case '\t':
+            o = "\\t";
+            break;
+        case '\b':
+            o = "\\b";
+            break;
+        case '\f':
+            o = "\\f";
+            break;
+        case '"':
+            o = "\\\"";
+            break;
+        case '\\':
+            o = "\\\\";
+            break;
         default:
             /* valid UTF-8 sequences according to RFC-3629 */
             if (u_str[0] >= 0xc2 && u_str[0] <= 0xdf && j >= 2
-                    && u_str[1] >= 0x80 && u_str[1] <= 0xbf) {
+                && u_str[1] >= 0x80 && u_str[1] <= 0xbf) {
                 memcpy(obuf, str, 2);
                 obuf[2] = '\0';
                 str++, j--;
@@ -667,10 +653,10 @@ json_write_qstring_inner(OSSL_JSON_ENC *json, const char *str, size_t str_len,
                 break;
             }
             if (u_str[0] >= 0xe0 && u_str[0] <= 0xef && j >= 3
-                    && u_str[1] >= 0x80 && u_str[1] <= 0xbf
-                    && u_str[2] >= 0x80 && u_str[2] <= 0xbf
-                    && !(u_str[0] == 0xe0 && u_str[1] <= 0x9f)
-                    && !(u_str[0] == 0xed && u_str[1] >= 0xa0)) {
+                && u_str[1] >= 0x80 && u_str[1] <= 0xbf
+                && u_str[2] >= 0x80 && u_str[2] <= 0xbf
+                && !(u_str[0] == 0xe0 && u_str[1] <= 0x9f)
+                && !(u_str[0] == 0xed && u_str[1] >= 0xa0)) {
                 memcpy(obuf, str, 3);
                 obuf[3] = '\0';
                 str += 2;
@@ -679,11 +665,11 @@ json_write_qstring_inner(OSSL_JSON_ENC *json, const char *str, size_t str_len,
                 break;
             }
             if (u_str[0] >= 0xf0 && u_str[0] <= 0xf4 && j >= 4
-                    && u_str[1] >= 0x80 && u_str[1] <= 0xbf
-                    && u_str[2] >= 0x80 && u_str[2] <= 0xbf
-                    && u_str[3] >= 0x80 && u_str[3] <= 0xbf
-                    && !(u_str[0] == 0xf0 && u_str[1] <= 0x8f)
-                    && !(u_str[0] == 0xf4 && u_str[1] >= 0x90)) {
+                && u_str[1] >= 0x80 && u_str[1] <= 0xbf
+                && u_str[2] >= 0x80 && u_str[2] <= 0xbf
+                && u_str[3] >= 0x80 && u_str[3] <= 0xbf
+                && !(u_str[0] == 0xf0 && u_str[1] <= 0x8f)
+                && !(u_str[0] == 0xf4 && u_str[1] >= 0x90)) {
                 memcpy(obuf, str, 4);
                 obuf[4] = '\0';
                 str += 3;
diff --git a/ssl/quic/qlog.c b/ssl/quic/qlog.c
index 3aadda046f749..41025159ced81 100644
--- a/ssl/quic/qlog.c
+++ b/ssl/quic/qlog.c
@@ -34,13 +34,13 @@ static ossl_unused ossl_inline void bit_set(size_t *p, uint32_t bit_no, int enab
 struct qlog_st {
     QLOG_TRACE_INFO info;
 
-    BIO             *bio;
-    size_t          enabled[NUM_ENABLED_W];
-    uint32_t        event_type;
-    const char      *event_cat, *event_name, *event_combined_name;
-    OSSL_TIME       event_time, prev_event_time;
-    OSSL_JSON_ENC   json;
-    int             header_done, first_event_done;
+    BIO *bio;
+    size_t enabled[NUM_ENABLED_W];
+    uint32_t event_type;
+    const char *event_cat, *event_name, *event_combined_name;
+    OSSL_TIME event_time, prev_event_time;
+    OSSL_JSON_ENC json;
+    int header_done, first_event_done;
 };
 
 static OSSL_TIME default_now(void *arg)
@@ -59,11 +59,11 @@ QLOG *ossl_qlog_new(const QLOG_TRACE_INFO *info)
     if (qlog == NULL)
         return NULL;
 
-    qlog->info.odcid                = info->odcid;
-    qlog->info.is_server            = info->is_server;
-    qlog->info.now_cb               = info->now_cb;
-    qlog->info.now_cb_arg           = info->now_cb_arg;
-    qlog->info.override_process_id  = info->override_process_id;
+    qlog->info.odcid = info->odcid;
+    qlog->info.is_server = info->is_server;
+    qlog->info.now_cb = info->now_cb;
+    qlog->info.now_cb_arg = info->now_cb_arg;
+    qlog->info.override_process_id = info->override_process_id;
 
     if (info->title != NULL
         && (qlog->info.title = OPENSSL_strdup(info->title)) == NULL)
@@ -79,11 +79,12 @@ QLOG *ossl_qlog_new(const QLOG_TRACE_INFO *info)
 
     if (info->override_impl_name != NULL
         && (qlog->info.override_impl_name
-                = OPENSSL_strdup(info->override_impl_name)) == NULL)
+               = OPENSSL_strdup(info->override_impl_name))
+            == NULL)
         goto err;
 
     if (!ossl_json_init(&qlog->json, NULL,
-                        OSSL_JSON_FLAG_IJSON | OSSL_JSON_FLAG_SEQ))
+            OSSL_JSON_FLAG_IJSON | OSSL_JSON_FLAG_SEQ))
         goto err;
 
     if (qlog->info.now_cb == NULL)
@@ -133,7 +134,7 @@ QLOG *ossl_qlog_new_from_env(const QLOG_TRACE_INFO *info)
         l += BIO_snprintf(filename + l, strl - l, "%02x", info->odcid.id[i]);
 
     l += BIO_snprintf(filename + l, strl - l, "_%s.sqlog",
-                      info->is_server ? "server" : "client");
+        info->is_server ? "server" : "client");
 
     qlog = ossl_qlog_new(info);
     if (qlog == NULL)
@@ -242,7 +243,7 @@ int ossl_qlog_flush(QLOG *qlog)
 }
 
 int ossl_qlog_set_event_type_enabled(QLOG *qlog, uint32_t event_type,
-                                     int enabled)
+    int enabled)
 {
     if (qlog == NULL || event_type >= QLOG_EVENT_TYPE_NUM)
         return 0;
@@ -339,13 +340,13 @@ static void qlog_event_seq_header(QLOG *qlog)
                     p = qlog->info.override_impl_name;
                 } else {
                     BIO_snprintf(buf, sizeof(buf), "OpenSSL/%s (%s)",
-                                 OpenSSL_version(OPENSSL_FULL_VERSION_STRING),
-                                 OpenSSL_version(OPENSSL_PLATFORM) + 10);
+                        OpenSSL_version(OPENSSL_FULL_VERSION_STRING),
+                        OpenSSL_version(OPENSSL_PLATFORM) + 10);
                 }
 
                 ossl_json_key(&qlog->json, "type");
                 ossl_json_str(&qlog->json,
-                              qlog->info.is_server ? "server" : "client");
+                    qlog->info.is_server ? "server" : "client");
 
                 ossl_json_key(&qlog->json, "name");
                 ossl_json_str(&qlog->json, p);
@@ -383,7 +384,7 @@ static void qlog_event_epilogue(QLOG *qlog)
         qlog->first_event_done = 1;
     } else {
         OSSL_TIME delta = ossl_time_subtract(qlog->event_time,
-                                             qlog->prev_event_time);
+            qlog->prev_event_time);
 
         ossl_json_u64(&qlog->json, ossl_time2ms(delta));
         qlog->prev_event_time = qlog->event_time;
@@ -393,10 +394,10 @@ static void qlog_event_epilogue(QLOG *qlog)
 }
 
 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)
+    uint32_t event_type,
+    const char *event_cat,
+    const char *event_name,
+    const char *event_combined_name)
 {
     if (qlog == NULL)
         return 0;
@@ -405,11 +406,11 @@ int ossl_qlog_event_try_begin(QLOG *qlog,
         || !ossl_qlog_enabled(qlog, event_type))
         return 0;
 
-    qlog->event_type            = event_type;
-    qlog->event_cat             = event_cat;
-    qlog->event_name            = event_name;
-    qlog->event_combined_name   = event_combined_name;
-    qlog->event_time            = qlog->info.now_cb(qlog->info.now_cb_arg);
+    qlog->event_type = event_type;
+    qlog->event_cat = event_cat;
+    qlog->event_name = event_name;
+    qlog->event_combined_name = event_combined_name;
+    qlog->event_time = qlog->info.now_cb(qlog->info.now_cb_arg);
 
     qlog_event_prologue(qlog);
     return 1;
@@ -468,7 +469,7 @@ 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)
 {
     if (name != NULL)
         ossl_json_key(&qlog->json, name);
@@ -501,7 +502,7 @@ 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)
 {
     if (name != NULL)
         ossl_json_key(&qlog->json, name);
@@ -532,9 +533,9 @@ static int lex_init(struct lexer *lex, const char *in, size_t in_len)
     if (in == NULL)
         return 0;
 
-    lex->p          = in;
-    lex->term_end   = in;
-    lex->end        = in + in_len;
+    lex->p = in;
+    lex->term_end = in;
+    lex->end = in + in_len;
     return 1;
 }
 
@@ -542,18 +543,20 @@ static int lex_do(struct lexer *lex)
 {
     const char *p = lex->term_end, *end = lex->end, *term_end;
 
-    for (; is_term_sep_ws(*p) && p < end; ++p);
+    for (; is_term_sep_ws(*p) && p < end; ++p)
+        ;
 
     if (p == end) {
-        lex->p          = end;
-        lex->term_end   = end;
+        lex->p = end;
+        lex->term_end = end;
         return 0;
     }
 
-    for (term_end = p; !is_term_sep_ws(*term_end) && term_end < end; ++term_end);
+    for (term_end = p; !is_term_sep_ws(*term_end) && term_end < end; ++term_end)
+        ;
 
-    lex->p          = p;
-    lex->term_end   = term_end;
+    lex->p = p;
+    lex->term_end = term_end;
     return 1;
 }
 
@@ -589,29 +592,30 @@ static int lex_match(struct lexer *lex, const char *s, size_t s_len)
 
 static void lex_get_rest(struct lexer *lex, const char **str, size_t *str_l)
 {
-    *str    = lex->p;
-    *str_l  = lex->term_end - lex->p;
+    *str = lex->p;
+    *str_l = lex->term_end - lex->p;
 }
 
 static int lex_extract_to(struct lexer *lex, char c,
-                          const char **str, size_t *str_l)
+    const char **str, size_t *str_l)
 {
     const char *p = lex->p, *term_end = lex->term_end, *s;
 
-    for (s = p; s < term_end && *s != c; ++s);
+    for (s = p; s < term_end && *s != c; ++s)
+        ;
     if (s == term_end)
         return 0;
 
-    *str    = p;
-    *str_l  = s - p;
-    lex->p  = ++s;
+    *str = p;
+    *str_l = s - p;
+    lex->p = ++s;
     return 1;
 }
 
 static int ossl_unused filter_match_event(const char *cat, size_t cat_l,
-                                          const char *event, size_t event_l,
-                                          const char *expect_cat,
-                                          const char *expect_event)
+    const char *event, size_t event_l,
+    const char *expect_cat,
+    const char *expect_event)
 {
     size_t expect_cat_l = strlen(expect_cat);
     size_t expect_event_l = strlen(expect_event);
@@ -634,16 +638,16 @@ static int ossl_unused filter_match_event(const char *cat, size_t cat_l,
  *        NULL to match any.
  */
 static void filter_apply(size_t *enabled, int add,
-                         const char *cat, size_t cat_l,
-                         const char *event, size_t event_l)
+    const char *cat, size_t cat_l,
+    const char *event, size_t event_l)
 {
     /* Find events which match the given filters. */
-# define QLOG_EVENT(e_cat, e_name)                          \
+#define QLOG_EVENT(e_cat, e_name)                      \
     if (filter_match_event(cat, cat_l, event, event_l, \
-                                #e_cat, #e_name))           \
+            #e_cat, #e_name))                          \
         bit_set(enabled, QLOG_EVENT_TYPE_##e_cat##_##e_name, add);
-# include "internal/qlog_events.h"
-# undef QLOG_EVENT
+#include "internal/qlog_events.h"
+#undef QLOG_EVENT
 }
 
 static int lex_fail(struct lexer *lex, const char *msg)
@@ -679,7 +683,7 @@ static int validate_name(const char **p, size_t *l)
 
 int ossl_qlog_set_filter(QLOG *qlog, const char *filter)
 {
-    struct lexer lex = {0};
+    struct lexer lex = { 0 };
     char c;
     const char *cat, *event;
     size_t cat_l, event_l, enabled[NUM_ENABLED_W];
@@ -699,7 +703,7 @@ int ossl_qlog_set_filter(QLOG *qlog, const char *filter)
             c = lex_peek_char(&lex);
             if (!is_name_char(c) && c != '*')
                 return lex_fail(&lex, "expected alphanumeric name or '*'"
-                                " after +/-");
+                                      " after +/-");
         } else if (!is_name_char(c) && c != '*') {
             return lex_fail(&lex, "expected +/- or alphanumeric name or '*'");
         } else {
diff --git a/ssl/quic/qlog_event_helpers.c b/ssl/quic/qlog_event_helpers.c
index 55cc28d9f9b70..83eebe82ad4f8 100644
--- a/ssl/quic/qlog_event_helpers.c
+++ b/ssl/quic/qlog_event_helpers.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -14,20 +14,20 @@
 #include "internal/quic_error.h"
 
 void ossl_qlog_event_connectivity_connection_started(QLOG *qlog,
-                                                     const QUIC_CONN_ID *init_dcid)
+    const QUIC_CONN_ID *init_dcid)
 {
 #ifndef OPENSSL_NO_QLOG
     QLOG_EVENT_BEGIN(qlog, connectivity, connection_started)
-        QLOG_STR("protocol", "quic");
-        QLOG_CID("dst_cid", init_dcid);
+    QLOG_STR("protocol", "quic");
+    QLOG_CID("dst_cid", init_dcid);
     QLOG_EVENT_END()
 #endif
 }
 
 #ifndef OPENSSL_NO_QLOG
 static const char *map_state_to_qlog(uint32_t state,
-                                     int handshake_complete,
-                                     int handshake_confirmed)
+    int handshake_complete,
+    int handshake_confirmed)
 {
     switch (state) {
     default:
@@ -55,21 +55,21 @@ static const char *map_state_to_qlog(uint32_t state,
 #endif
 
 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)
 {
 #ifndef OPENSSL_NO_QLOG
     const char *state_s;
 
     QLOG_EVENT_BEGIN(qlog, connectivity, connection_state_updated)
-        state_s = map_state_to_qlog(new_state,
-                                    handshake_complete,
-                                    handshake_confirmed);
+    state_s = map_state_to_qlog(new_state,
+        handshake_complete,
+        handshake_confirmed);
 
-        if (state_s != NULL)
-            QLOG_STR("state", state_s);
+    if (state_s != NULL)
+        QLOG_STR("state", state_s);
     QLOG_EVENT_END()
 #endif
 }
@@ -117,32 +117,32 @@ static const char *quic_err_to_qlog(uint64_t error_code)
 #endif
 
 void ossl_qlog_event_connectivity_connection_closed(QLOG *qlog,
-                                                    const QUIC_TERMINATE_CAUSE *tcause)
+    const QUIC_TERMINATE_CAUSE *tcause)
 {
 #ifndef OPENSSL_NO_QLOG
     QLOG_EVENT_BEGIN(qlog, connectivity, connection_closed)
-        QLOG_STR("owner", tcause->remote ? "remote" : "local");
-        if (tcause->app) {
-            QLOG_U64("application_code", tcause->error_code);
-        } else {
-            const char *m = quic_err_to_qlog(tcause->error_code);
-            char ce[32];
-
-            if (tcause->error_code >= OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN
-                && tcause->error_code <= OSSL_QUIC_ERR_CRYPTO_ERR_END) {
-                BIO_snprintf(ce, sizeof(ce), "crypto_error_0x%03llx",
-                             (unsigned long long)tcause->error_code);
-                m = ce;
-            }
-            /* TODO(QLOG FUTURE): Consider adding ERR information in the output. */
-
-            if (m != NULL)
-                QLOG_STR("connection_code", m);
-            else
-                QLOG_U64("connection_code", tcause->error_code);
+    QLOG_STR("owner", tcause->remote ? "remote" : "local");
+    if (tcause->app) {
+        QLOG_U64("application_code", tcause->error_code);
+    } else {
+        const char *m = quic_err_to_qlog(tcause->error_code);
+        char ce[32];
+
+        if (tcause->error_code >= OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN
+            && tcause->error_code <= OSSL_QUIC_ERR_CRYPTO_ERR_END) {
+            BIO_snprintf(ce, sizeof(ce), "crypto_error_0x%03llx",
+                (unsigned long long)tcause->error_code);
+            m = ce;
         }
+        /* TODO(QLOG FUTURE): Consider adding ERR information in the output. */
+
+        if (m != NULL)
+            QLOG_STR("connection_code", m);
+        else
+            QLOG_U64("connection_code", tcause->error_code);
+    }
 
-        QLOG_STR_LEN("reason", tcause->reason, tcause->reason_len);
+    QLOG_STR_LEN("reason", tcause->reason, tcause->reason_len);
     QLOG_EVENT_END()
 #endif
 }
@@ -170,23 +170,23 @@ static const char *quic_pkt_type_to_qlog(uint32_t pkt_type)
 #endif
 
 void ossl_qlog_event_recovery_packet_lost(QLOG *qlog,
-                                          const QUIC_TXPIM_PKT *tpkt)
+    const QUIC_TXPIM_PKT *tpkt)
 {
 #ifndef OPENSSL_NO_QLOG
     QLOG_EVENT_BEGIN(qlog, recovery, packet_lost)
-        QLOG_BEGIN("header")
-            QLOG_STR("packet_type", quic_pkt_type_to_qlog(tpkt->pkt_type));
-            if (ossl_quic_pkt_type_has_pn(tpkt->pkt_type))
-                QLOG_U64("packet_number", tpkt->ackm_pkt.pkt_num);
-        QLOG_END()
+    QLOG_BEGIN("header")
+    QLOG_STR("packet_type", quic_pkt_type_to_qlog(tpkt->pkt_type));
+    if (ossl_quic_pkt_type_has_pn(tpkt->pkt_type))
+        QLOG_U64("packet_number", tpkt->ackm_pkt.pkt_num);
+    QLOG_END()
     QLOG_EVENT_END()
 #endif
 }
 
 #ifndef OPENSSL_NO_QLOG
-# define MAX_ACK_RANGES 32
+#define MAX_ACK_RANGES 32
 
-static void ignore_res(int x) {}
+static void ignore_res(int x) { }
 
 /*
  * For logging received packets, we need to parse all the frames in the packet
@@ -204,7 +204,7 @@ static void ignore_res(int x) {}
  * data on what frames it contained.
  */
 static int log_frame_actual(QLOG *qlog_instance, PACKET *pkt,
-                            size_t *need_skip)
+    size_t *need_skip)
 {
     uint64_t frame_type;
     OSSL_QUIC_FRAME_ACK ack;
@@ -213,8 +213,10 @@ static int log_frame_actual(QLOG *qlog_instance, PACKET *pkt,
     size_t i;
     PACKET orig_pkt = *pkt;
 
-    if (!ossl_quic_wire_peek_frame_header(pkt, &frame_type, NULL))
+    if (!ossl_quic_wire_peek_frame_header(pkt, &frame_type, NULL)) {
+        *need_skip = SIZE_MAX;
         return 0;
+    }
 
     /*
      * If something goes wrong decoding a frame we cannot log it as that frame
@@ -225,7 +227,7 @@ static int log_frame_actual(QLOG *qlog_instance, PACKET *pkt,
     case OSSL_QUIC_FRAME_TYPE_PADDING:
         QLOG_STR("frame_type", "padding");
         QLOG_U64("payload_length",
-                 ossl_quic_wire_decode_padding(pkt));
+            ossl_quic_wire_decode_padding(pkt));
         break;
     case OSSL_QUIC_FRAME_TYPE_PING:
         if (!ossl_quic_wire_decode_frame_ping(pkt))
@@ -238,8 +240,8 @@ static int log_frame_actual(QLOG *qlog_instance, PACKET *pkt,
         if (!ossl_quic_wire_peek_frame_ack_num_ranges(pkt, &num_ranges))
             goto unknown;
 
-        ack.ack_ranges      = ack_ranges;
-        ack.num_ack_ranges  = OSSL_NELEM(ack_ranges);
+        ack.ack_ranges = ack_ranges;
+        ack.num_ack_ranges = OSSL_NELEM(ack_ranges);
         if (!ossl_quic_wire_decode_frame_ack(pkt, 3, &ack, &total_ranges))
             goto unknown;
 
@@ -253,51 +255,45 @@ static int log_frame_actual(QLOG *qlog_instance, PACKET *pkt,
         QLOG_BEGIN_ARRAY("acked_ranges");
         for (i = 0; i < ack.num_ack_ranges; ++i) {
             QLOG_BEGIN_ARRAY(NULL)
-                QLOG_U64(NULL, ack.ack_ranges[i].start);
-                if (ack.ack_ranges[i].end != ack.ack_ranges[i].start)
-                    QLOG_U64(NULL, ack.ack_ranges[i].end);
+            QLOG_U64(NULL, ack.ack_ranges[i].start);
+            if (ack.ack_ranges[i].end != ack.ack_ranges[i].start)
+                QLOG_U64(NULL, ack.ack_ranges[i].end);
             QLOG_END_ARRAY()
         }
         QLOG_END_ARRAY()
         break;
-    case OSSL_QUIC_FRAME_TYPE_RESET_STREAM:
-        {
-            OSSL_QUIC_FRAME_RESET_STREAM f;
+    case OSSL_QUIC_FRAME_TYPE_RESET_STREAM: {
+        OSSL_QUIC_FRAME_RESET_STREAM f;
 
-            if (!ossl_quic_wire_decode_frame_reset_stream(pkt, &f))
-                goto unknown;
+        if (!ossl_quic_wire_decode_frame_reset_stream(pkt, &f))
+            goto unknown;
 
-            QLOG_STR("frame_type", "reset_stream");
-            QLOG_U64("stream_id", f.stream_id);
-            QLOG_U64("error_code", f.app_error_code);
-            QLOG_U64("final_size", f.final_size);
-        }
-        break;
-    case OSSL_QUIC_FRAME_TYPE_STOP_SENDING:
-        {
-            OSSL_QUIC_FRAME_STOP_SENDING f;
+        QLOG_STR("frame_type", "reset_stream");
+        QLOG_U64("stream_id", f.stream_id);
+        QLOG_U64("error_code", f.app_error_code);
+        QLOG_U64("final_size", f.final_size);
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_STOP_SENDING: {
+        OSSL_QUIC_FRAME_STOP_SENDING f;
 
-            if (!ossl_quic_wire_decode_frame_stop_sending(pkt, &f))
-                goto unknown;
+        if (!ossl_quic_wire_decode_frame_stop_sending(pkt, &f))
+            goto unknown;
 
-            QLOG_STR("frame_type", "stop_sending");
-            QLOG_U64("stream_id", f.stream_id);
-            QLOG_U64("error_code", f.app_error_code);
-        }
-        break;
-    case OSSL_QUIC_FRAME_TYPE_CRYPTO:
-        {
-            OSSL_QUIC_FRAME_CRYPTO f;
+        QLOG_STR("frame_type", "stop_sending");
+        QLOG_U64("stream_id", f.stream_id);
+        QLOG_U64("error_code", f.app_error_code);
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_CRYPTO: {
+        OSSL_QUIC_FRAME_CRYPTO f;
 
-            if (!ossl_quic_wire_decode_frame_crypto(pkt, 1, &f))
-                goto unknown;
+        if (!ossl_quic_wire_decode_frame_crypto(pkt, 1, &f))
+            goto unknown;
 
-            QLOG_STR("frame_type", "crypto");
-            QLOG_U64("offset", f.offset);
-            QLOG_U64("payload_length", f.len);
-            *need_skip += (size_t)f.len;
-        }
-        break;
+        QLOG_STR("frame_type", "crypto");
+        QLOG_U64("offset", f.offset);
+        QLOG_U64("payload_length", f.len);
+        *need_skip += (size_t)f.len;
+    } break;
     case OSSL_QUIC_FRAME_TYPE_STREAM:
     case OSSL_QUIC_FRAME_TYPE_STREAM_FIN:
     case OSSL_QUIC_FRAME_TYPE_STREAM_LEN:
@@ -305,194 +301,169 @@ static int log_frame_actual(QLOG *qlog_instance, PACKET *pkt,
     case OSSL_QUIC_FRAME_TYPE_STREAM_OFF:
     case OSSL_QUIC_FRAME_TYPE_STREAM_OFF_FIN:
     case OSSL_QUIC_FRAME_TYPE_STREAM_OFF_LEN:
-    case OSSL_QUIC_FRAME_TYPE_STREAM_OFF_LEN_FIN:
-        {
-            OSSL_QUIC_FRAME_STREAM f;
-
-            if (!ossl_quic_wire_decode_frame_stream(pkt, 1, &f))
-                goto unknown;
-
-            QLOG_STR("frame_type", "stream");
-            QLOG_U64("stream_id", f.stream_id);
-            QLOG_U64("offset", f.offset);
-            QLOG_U64("payload_length", f.len);
-            QLOG_BOOL("explicit_length", f.has_explicit_len);
-            if (f.is_fin)
-                QLOG_BOOL("fin", 1);
-            *need_skip = f.has_explicit_len
-                ? *need_skip + (size_t)f.len : SIZE_MAX;
-        }
-        break;
-    case OSSL_QUIC_FRAME_TYPE_MAX_DATA:
-        {
-            uint64_t x;
+    case OSSL_QUIC_FRAME_TYPE_STREAM_OFF_LEN_FIN: {
+        OSSL_QUIC_FRAME_STREAM f;
 
-            if (!ossl_quic_wire_decode_frame_max_data(pkt, &x))
-                goto unknown;
+        if (!ossl_quic_wire_decode_frame_stream(pkt, 1, &f))
+            goto unknown;
 
-            QLOG_STR("frame_type", "max_data");
-            QLOG_U64("maximum", x);
-        }
-        break;
+        QLOG_STR("frame_type", "stream");
+        QLOG_U64("stream_id", f.stream_id);
+        QLOG_U64("offset", f.offset);
+        QLOG_U64("payload_length", f.len);
+        QLOG_BOOL("explicit_length", f.has_explicit_len);
+        if (f.is_fin)
+            QLOG_BOOL("fin", 1);
+        *need_skip = f.has_explicit_len
+            ? *need_skip + (size_t)f.len
+            : SIZE_MAX;
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_MAX_DATA: {
+        uint64_t x;
+
+        if (!ossl_quic_wire_decode_frame_max_data(pkt, &x))
+            goto unknown;
+
+        QLOG_STR("frame_type", "max_data");
+        QLOG_U64("maximum", x);
+    } break;
     case OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI:
-    case OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI:
-        {
-            uint64_t x;
-
-            if (!ossl_quic_wire_decode_frame_max_streams(pkt, &x))
-                goto unknown;
-
-            QLOG_STR("frame_type", "max_streams");
-            QLOG_STR("stream_type",
-                     frame_type == OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI
-                        ? "bidirectional" : "unidirectional");
-            QLOG_U64("maximum", x);
-        }
-        break;
-    case OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA:
-        {
-            uint64_t stream_id, max_data;
+    case OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI: {
+        uint64_t x;
 
-            if (!ossl_quic_wire_decode_frame_max_stream_data(pkt, &stream_id,
-                                                             &max_data))
-                goto unknown;
+        if (!ossl_quic_wire_decode_frame_max_streams(pkt, &x))
+            goto unknown;
 
-            QLOG_STR("frame_type", "max_stream_data");
-            QLOG_U64("stream_id", stream_id);
-            QLOG_U64("maximum", max_data);
-        }
-        break;
-    case OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE:
-        {
-            uint64_t challenge;
+        QLOG_STR("frame_type", "max_streams");
+        QLOG_STR("stream_type",
+            frame_type == OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI
+                ? "bidirectional"
+                : "unidirectional");
+        QLOG_U64("maximum", x);
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA: {
+        uint64_t stream_id, max_data;
+
+        if (!ossl_quic_wire_decode_frame_max_stream_data(pkt, &stream_id,
+                &max_data))
+            goto unknown;
 
-            if (!ossl_quic_wire_decode_frame_path_challenge(pkt, &challenge))
-                goto unknown;
+        QLOG_STR("frame_type", "max_stream_data");
+        QLOG_U64("stream_id", stream_id);
+        QLOG_U64("maximum", max_data);
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE: {
+        uint64_t challenge;
 
-            QLOG_STR("frame_type", "path_challenge");
-        }
-        break;
-    case OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE:
-        {
-            uint64_t challenge;
+        if (!ossl_quic_wire_decode_frame_path_challenge(pkt, &challenge))
+            goto unknown;
 
-            if (!ossl_quic_wire_decode_frame_path_response(pkt, &challenge))
-                goto unknown;
+        QLOG_STR("frame_type", "path_challenge");
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE: {
+        uint64_t challenge;
 
-            QLOG_STR("frame_type", "path_response");
-        }
-        break;
+        if (!ossl_quic_wire_decode_frame_path_response(pkt, &challenge))
+            goto unknown;
+
+        QLOG_STR("frame_type", "path_response");
+    } break;
     case OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_APP:
-    case OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_TRANSPORT:
-        {
-            OSSL_QUIC_FRAME_CONN_CLOSE f;
-
-            if (!ossl_quic_wire_decode_frame_conn_close(pkt, &f))
-                goto unknown;
-
-            QLOG_STR("frame_type", "connection_close");
-            QLOG_STR("error_space", f.is_app ? "application" : "transport");
-            QLOG_U64("error_code_value", f.error_code);
-            if (f.is_app)
-                QLOG_U64("error_code", f.error_code);
-            if (!f.is_app && f.frame_type != 0)
-                QLOG_U64("trigger_frame_type", f.frame_type);
-            QLOG_STR_LEN("reason", f.reason, f.reason_len);
-        }
-        break;
-    case OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE:
-        {
-            if (!ossl_quic_wire_decode_frame_handshake_done(pkt))
-                goto unknown;
+    case OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_TRANSPORT: {
+        OSSL_QUIC_FRAME_CONN_CLOSE f;
 
-            QLOG_STR("frame_type", "handshake_done");
-        }
-        break;
-    case OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID:
-        {
-            OSSL_QUIC_FRAME_NEW_CONN_ID f;
-
-            if (!ossl_quic_wire_decode_frame_new_conn_id(pkt, &f))
-                goto unknown;
-
-            QLOG_STR("frame_type", "new_connection_id");
-            QLOG_U64("sequence_number", f.seq_num);
-            QLOG_U64("retire_prior_to", f.retire_prior_to);
-            QLOG_CID("connection_id", &f.conn_id);
-            QLOG_BIN("stateless_reset_token",
-                     f.stateless_reset.token,
-                     sizeof(f.stateless_reset.token));
-        }
-        break;
-    case OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID:
-        {
-            uint64_t seq_num;
+        if (!ossl_quic_wire_decode_frame_conn_close(pkt, &f))
+            goto unknown;
 
-            if (!ossl_quic_wire_decode_frame_retire_conn_id(pkt, &seq_num))
-                goto unknown;
+        QLOG_STR("frame_type", "connection_close");
+        QLOG_STR("error_space", f.is_app ? "application" : "transport");
+        QLOG_U64("error_code_value", f.error_code);
+        if (f.is_app)
+            QLOG_U64("error_code", f.error_code);
+        if (!f.is_app && f.frame_type != 0)
+            QLOG_U64("trigger_frame_type", f.frame_type);
+        QLOG_STR_LEN("reason", f.reason, f.reason_len);
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE: {
+        if (!ossl_quic_wire_decode_frame_handshake_done(pkt))
+            goto unknown;
 
-            QLOG_STR("frame_type", "retire_connection_id");
-            QLOG_U64("sequence_number", seq_num);
-        }
-        break;
-    case OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED:
-        {
-            uint64_t x;
+        QLOG_STR("frame_type", "handshake_done");
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID: {
+        OSSL_QUIC_FRAME_NEW_CONN_ID f;
+
+        if (!ossl_quic_wire_decode_frame_new_conn_id(pkt, &f))
+            goto unknown;
 
-            if (!ossl_quic_wire_decode_frame_data_blocked(pkt, &x))
-                goto unknown;
+        QLOG_STR("frame_type", "new_connection_id");
+        QLOG_U64("sequence_number", f.seq_num);
+        QLOG_U64("retire_prior_to", f.retire_prior_to);
+        QLOG_CID("connection_id", &f.conn_id);
+        QLOG_BIN("stateless_reset_token",
+            f.stateless_reset.token,
+            sizeof(f.stateless_reset.token));
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID: {
+        uint64_t seq_num;
+
+        if (!ossl_quic_wire_decode_frame_retire_conn_id(pkt, &seq_num))
+            goto unknown;
 
-            QLOG_STR("frame_type", "data_blocked");
-            QLOG_U64("limit", x);
-        }
-        break;
-    case OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED:
-        {
-            uint64_t stream_id, x;
-
-            if (!ossl_quic_wire_decode_frame_stream_data_blocked(pkt,
-                                                                 &stream_id,
-                                                                 &x))
-                goto unknown;
-
-            QLOG_STR("frame_type", "stream_data_blocked");
-            QLOG_U64("stream_id", stream_id);
-            QLOG_U64("limit", x);
-        }
-        break;
+        QLOG_STR("frame_type", "retire_connection_id");
+        QLOG_U64("sequence_number", seq_num);
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED: {
+        uint64_t x;
+
+        if (!ossl_quic_wire_decode_frame_data_blocked(pkt, &x))
+            goto unknown;
+
+        QLOG_STR("frame_type", "data_blocked");
+        QLOG_U64("limit", x);
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED: {
+        uint64_t stream_id, x;
+
+        if (!ossl_quic_wire_decode_frame_stream_data_blocked(pkt,
+                &stream_id,
+                &x))
+            goto unknown;
+
+        QLOG_STR("frame_type", "stream_data_blocked");
+        QLOG_U64("stream_id", stream_id);
+        QLOG_U64("limit", x);
+    } break;
     case OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI:
-    case OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI:
-        {
-            uint64_t x;
-
-            if (!ossl_quic_wire_decode_frame_streams_blocked(pkt, &x))
-                goto unknown;
-
-            QLOG_STR("frame_type", "streams_blocked");
-            QLOG_STR("stream_type",
-                     frame_type == OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI
-                        ? "bidirectional" : "unidirectional");
-            QLOG_U64("limit", x);
-        }
-        break;
-    case OSSL_QUIC_FRAME_TYPE_NEW_TOKEN:
-        {
-            const unsigned char *token;
-            size_t token_len;
-
-            if (!ossl_quic_wire_decode_frame_new_token(pkt, &token, &token_len))
-                goto unknown;
-
-            QLOG_STR("frame_type", "new_token");
-            QLOG_BEGIN("token");
-                QLOG_BEGIN("raw");
-                    QLOG_BIN("data", token, token_len);
-                QLOG_END();
-            QLOG_END();
-        }
-        break;
+    case OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI: {
+        uint64_t x;
+
+        if (!ossl_quic_wire_decode_frame_streams_blocked(pkt, &x))
+            goto unknown;
+
+        QLOG_STR("frame_type", "streams_blocked");
+        QLOG_STR("stream_type",
+            frame_type == OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI
+                ? "bidirectional"
+                : "unidirectional");
+        QLOG_U64("limit", x);
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_NEW_TOKEN: {
+        const unsigned char *token;
+        size_t token_len;
+
+        if (!ossl_quic_wire_decode_frame_new_token(pkt, &token, &token_len))
+            goto unknown;
+
+        QLOG_STR("frame_type", "new_token");
+        QLOG_BEGIN("token");
+        QLOG_BEGIN("raw");
+        QLOG_BIN("data", token, token_len);
+        QLOG_END();
+        QLOG_END();
+    } break;
     default:
-unknown:
+    unknown:
         QLOG_STR("frame_type", "unknown");
         QLOG_U64("frame_type_value", frame_type);
 
@@ -502,8 +473,8 @@ static int log_frame_actual(QLOG *qlog_instance, PACKET *pkt,
          * as the raw data of the frame.
          */
         QLOG_BEGIN("raw");
-            QLOG_BIN("data", PACKET_data(&orig_pkt),
-                     PACKET_remaining(&orig_pkt));
+        QLOG_BIN("data", PACKET_data(&orig_pkt),
+            PACKET_remaining(&orig_pkt));
         QLOG_END();
         ignore_res(PACKET_forward(pkt, PACKET_remaining(pkt)));
         break;
@@ -513,7 +484,7 @@ static int log_frame_actual(QLOG *qlog_instance, PACKET *pkt,
 }
 
 static void log_frame(QLOG *qlog_instance, PACKET *pkt,
-                      size_t *need_skip)
+    size_t *need_skip)
 {
     size_t rem_before, rem_after;
 
@@ -527,8 +498,8 @@ static void log_frame(QLOG *qlog_instance, PACKET *pkt,
 }
 
 static int log_frames(QLOG *qlog_instance,
-                      const OSSL_QTX_IOVEC *iovec,
-                      size_t num_iovec)
+    const OSSL_QTX_IOVEC *iovec,
+    size_t num_iovec)
 {
     size_t i;
     PACKET pkt;
@@ -542,7 +513,7 @@ static int log_frames(QLOG *qlog_instance,
             if (need_skip > 0) {
                 size_t adv = need_skip;
 
-                if (adv < PACKET_remaining(&pkt))
+                if (adv > PACKET_remaining(&pkt))
                     adv = PACKET_remaining(&pkt);
 
                 if (!PACKET_forward(&pkt, adv))
@@ -564,41 +535,41 @@ static int log_frames(QLOG *qlog_instance,
 }
 
 static void log_packet(QLOG *qlog_instance,
-                       const QUIC_PKT_HDR *hdr,
-                       QUIC_PN pn,
-                       const OSSL_QTX_IOVEC *iovec,
-                       size_t num_iovec,
-                       uint64_t datagram_id)
+    const QUIC_PKT_HDR *hdr,
+    QUIC_PN pn,
+    const OSSL_QTX_IOVEC *iovec,
+    size_t num_iovec,
+    uint64_t datagram_id)
 {
     const char *type_s;
 
     QLOG_BEGIN("header")
-        type_s = quic_pkt_type_to_qlog(hdr->type);
-        if (type_s == NULL)
-            type_s = "unknown";
-
-        QLOG_STR("packet_type", type_s);
-        if (ossl_quic_pkt_type_has_pn(hdr->type))
-            QLOG_U64("packet_number", pn);
-
-        QLOG_CID("dcid", &hdr->dst_conn_id);
-        if (ossl_quic_pkt_type_has_scid(hdr->type))
-            QLOG_CID("scid", &hdr->src_conn_id);
-
-        if (hdr->token_len > 0) {
-            QLOG_BEGIN("token")
-                QLOG_BEGIN("raw")
-                    QLOG_BIN("data", hdr->token, hdr->token_len);
-                QLOG_END()
-            QLOG_END()
-        }
-        /* TODO(QLOG FUTURE): flags, length */
+    type_s = quic_pkt_type_to_qlog(hdr->type);
+    if (type_s == NULL)
+        type_s = "unknown";
+
+    QLOG_STR("packet_type", type_s);
+    if (ossl_quic_pkt_type_has_pn(hdr->type))
+        QLOG_U64("packet_number", pn);
+
+    QLOG_CID("dcid", &hdr->dst_conn_id);
+    if (ossl_quic_pkt_type_has_scid(hdr->type))
+        QLOG_CID("scid", &hdr->src_conn_id);
+
+    if (hdr->token_len > 0) {
+        QLOG_BEGIN("token")
+        QLOG_BEGIN("raw")
+        QLOG_BIN("data", hdr->token, hdr->token_len);
+        QLOG_END()
+        QLOG_END()
+    }
+    /* TODO(QLOG FUTURE): flags, length */
     QLOG_END()
     QLOG_U64("datagram_id", datagram_id);
 
     if (ossl_quic_pkt_type_is_encrypted(hdr->type)) {
         QLOG_BEGIN_ARRAY("frames")
-            log_frames(qlog_instance, iovec, num_iovec);
+        log_frames(qlog_instance, iovec, num_iovec);
         QLOG_END_ARRAY()
     }
 }
@@ -606,29 +577,29 @@ static void log_packet(QLOG *qlog_instance,
 #endif
 
 void ossl_qlog_event_transport_packet_sent(QLOG *qlog,
-                                           const QUIC_PKT_HDR *hdr,
-                                           QUIC_PN pn,
-                                           const OSSL_QTX_IOVEC *iovec,
-                                           size_t num_iovec,
-                                           uint64_t datagram_id)
+    const QUIC_PKT_HDR *hdr,
+    QUIC_PN pn,
+    const OSSL_QTX_IOVEC *iovec,
+    size_t num_iovec,
+    uint64_t datagram_id)
 {
 #ifndef OPENSSL_NO_QLOG
     QLOG_EVENT_BEGIN(qlog, transport, packet_sent)
-        log_packet(qlog, hdr, pn, iovec, num_iovec, datagram_id);
+    log_packet(qlog, hdr, pn, iovec, num_iovec, datagram_id);
     QLOG_EVENT_END()
 #endif
 }
 
 void ossl_qlog_event_transport_packet_received(QLOG *qlog,
-                                               const QUIC_PKT_HDR *hdr,
-                                               QUIC_PN pn,
-                                               const OSSL_QTX_IOVEC *iovec,
-                                               size_t num_iovec,
-                                               uint64_t datagram_id)
+    const QUIC_PKT_HDR *hdr,
+    QUIC_PN pn,
+    const OSSL_QTX_IOVEC *iovec,
+    size_t num_iovec,
+    uint64_t datagram_id)
 {
 #ifndef OPENSSL_NO_QLOG
     QLOG_EVENT_BEGIN(qlog, transport, packet_received)
-        log_packet(qlog, hdr, pn, iovec, num_iovec, datagram_id);
+    log_packet(qlog, hdr, pn, iovec, num_iovec, datagram_id);
     QLOG_EVENT_END()
 #endif
 }
diff --git a/ssl/quic/quic_ackm.c b/ssl/quic/quic_ackm.c
index 75a1e5741a030..503a6eae19ec9 100644
--- a/ssl/quic/quic_ackm.c
+++ b/ssl/quic/quic_ackm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -30,7 +30,8 @@ DEFINE_LIST_OF(tx_history, OSSL_ACKM_TX_PKT);
  */
 struct tx_pkt_history_st {
     /* A linked list of all our packets. */
-    OSSL_LIST(tx_history) packets;
+    OSSL_LIST(tx_history)
+    packets;
 
     /*
      * Mapping from packet numbers (uint64_t) to (OSSL_ACKM_TX_PKT *)
@@ -65,7 +66,7 @@ static unsigned long tx_pkt_info_hash(const OSSL_ACKM_TX_PKT *pkt)
 }
 
 static int tx_pkt_info_compare(const OSSL_ACKM_TX_PKT *a,
-                               const OSSL_ACKM_TX_PKT *b)
+    const OSSL_ACKM_TX_PKT *b)
 {
     if (a->pkt_num < b->pkt_num)
         return -1;
@@ -78,7 +79,7 @@ static int
 tx_pkt_history_init(struct tx_pkt_history_st *h)
 {
     ossl_list_tx_history_init(&h->packets);
-    h->watermark    = 0;
+    h->watermark = 0;
     h->highest_sent = 0;
 
     h->map = lh_OSSL_ACKM_TX_PKT_new(tx_pkt_info_hash, tx_pkt_info_compare);
@@ -98,7 +99,7 @@ tx_pkt_history_destroy(struct tx_pkt_history_st *h)
 
 static int
 tx_pkt_history_add_actual(struct tx_pkt_history_st *h,
-                          OSSL_ACKM_TX_PKT *pkt)
+    OSSL_ACKM_TX_PKT *pkt)
 {
     OSSL_ACKM_TX_PKT *existing;
 
@@ -124,7 +125,7 @@ tx_pkt_history_add_actual(struct tx_pkt_history_st *h,
 /* Adds a packet information structure to the history list. */
 static int
 tx_pkt_history_add(struct tx_pkt_history_st *h,
-                   OSSL_ACKM_TX_PKT *pkt)
+    OSSL_ACKM_TX_PKT *pkt)
 {
     if (!ossl_assert(pkt->pkt_num >= h->watermark))
         return 0;
@@ -132,7 +133,7 @@ tx_pkt_history_add(struct tx_pkt_history_st *h,
     if (tx_pkt_history_add_actual(h, pkt) < 1)
         return 0;
 
-    h->watermark    = pkt->pkt_num + 1;
+    h->watermark = pkt->pkt_num + 1;
     h->highest_sent = pkt->pkt_num;
     return 1;
 }
@@ -397,7 +398,7 @@ struct rx_pkt_history_st {
 };
 
 static int rx_pkt_history_bump_watermark(struct rx_pkt_history_st *h,
-                                         QUIC_PN watermark);
+    QUIC_PN watermark);
 
 static void rx_pkt_history_init(struct rx_pkt_history_st *h)
 {
@@ -414,7 +415,7 @@ static void rx_pkt_history_destroy(struct rx_pkt_history_st *h)
  * Limit the number of ACK ranges we store to prevent resource consumption DoS
  * attacks.
  */
-#define MAX_RX_ACK_RANGES   32
+#define MAX_RX_ACK_RANGES 32
 
 static void rx_pkt_history_trim_range_count(struct rx_pkt_history_st *h)
 {
@@ -424,7 +425,8 @@ static void rx_pkt_history_trim_range_count(struct rx_pkt_history_st *h)
         UINT_RANGE r = ossl_list_uint_set_head(&h->set)->range;
 
         highest = (highest == QUIC_PN_INVALID)
-            ? r.end : ossl_quic_pn_max(highest, r.end);
+            ? r.end
+            : ossl_quic_pn_max(highest, r.end);
 
         ossl_uint_set_remove(&h->set, &r);
     }
@@ -438,12 +440,12 @@ static void rx_pkt_history_trim_range_count(struct rx_pkt_history_st *h)
 }
 
 static int rx_pkt_history_add_pn(struct rx_pkt_history_st *h,
-                                 QUIC_PN pn)
+    QUIC_PN pn)
 {
     UINT_RANGE r;
 
     r.start = pn;
-    r.end   = pn;
+    r.end = pn;
 
     if (pn < h->watermark)
         return 1; /* consider this a success case */
@@ -456,7 +458,7 @@ static int rx_pkt_history_add_pn(struct rx_pkt_history_st *h,
 }
 
 static int rx_pkt_history_bump_watermark(struct rx_pkt_history_st *h,
-                                         QUIC_PN watermark)
+    QUIC_PN watermark)
 {
     UINT_RANGE r;
 
@@ -465,7 +467,7 @@ static int rx_pkt_history_bump_watermark(struct rx_pkt_history_st *h,
 
     /* Remove existing PNs below the watermark. */
     r.start = 0;
-    r.end   = watermark - 1;
+    r.end = watermark - 1;
     if (ossl_uint_set_remove(&h->set, &r) != 1)
         return 0;
 
@@ -480,16 +482,16 @@ static int rx_pkt_history_bump_watermark(struct rx_pkt_history_st *h,
  */
 
 /* Constants used by the ACK manager; see RFC 9002. */
-#define K_GRANULARITY           (1 * OSSL_TIME_MS)
-#define K_PKT_THRESHOLD         3
-#define K_TIME_THRESHOLD_NUM    9
-#define K_TIME_THRESHOLD_DEN    8
+#define K_GRANULARITY (1 * OSSL_TIME_MS)
+#define K_PKT_THRESHOLD 3
+#define K_TIME_THRESHOLD_NUM 9
+#define K_TIME_THRESHOLD_DEN 8
 
 /* The maximum number of times we allow PTO to be doubled. */
-#define MAX_PTO_COUNT          16
+#define MAX_PTO_COUNT 16
 
 /* Default maximum amount of time to leave an ACK-eliciting packet un-ACK'd. */
-#define DEFAULT_TX_MAX_ACK_DELAY       ossl_ms2time(QUIC_DEFAULT_MAX_ACK_DELAY)
+#define DEFAULT_TX_MAX_ACK_DELAY ossl_ms2time(QUIC_DEFAULT_MAX_ACK_DELAY)
 
 struct ossl_ackm_st {
     /* Our list of transmitted packets. Corresponds to RFC 9002 sent_packets. */
@@ -499,102 +501,105 @@ struct ossl_ackm_st {
     struct rx_pkt_history_st rx_history[QUIC_PN_SPACE_NUM];
 
     /* Polymorphic dependencies that we consume. */
-    OSSL_TIME             (*now)(void *arg);
-    void                   *now_arg;
-    OSSL_STATM             *statm;
-    const OSSL_CC_METHOD   *cc_method;
-    OSSL_CC_DATA           *cc_data;
+    OSSL_TIME (*now)(void *arg);
+    void *now_arg;
+    OSSL_STATM *statm;
+    const OSSL_CC_METHOD *cc_method;
+    OSSL_CC_DATA *cc_data;
 
     /* RFC 9002 variables. */
-    uint32_t        pto_count;
-    QUIC_PN         largest_acked_pkt[QUIC_PN_SPACE_NUM];
-    OSSL_TIME       time_of_last_ack_eliciting_pkt[QUIC_PN_SPACE_NUM];
-    OSSL_TIME       loss_time[QUIC_PN_SPACE_NUM];
-    OSSL_TIME       loss_detection_deadline;
+    uint32_t pto_count;
+    QUIC_PN largest_acked_pkt[QUIC_PN_SPACE_NUM];
+    OSSL_TIME time_of_last_ack_eliciting_pkt[QUIC_PN_SPACE_NUM];
+    OSSL_TIME loss_time[QUIC_PN_SPACE_NUM];
+    OSSL_TIME loss_detection_deadline;
 
     /* Lowest PN which is still not known to be ACKed. */
-    QUIC_PN         lowest_unacked_pkt[QUIC_PN_SPACE_NUM];
+    QUIC_PN lowest_unacked_pkt[QUIC_PN_SPACE_NUM];
 
     /* Time at which we got our first RTT sample, or 0. */
-    OSSL_TIME       first_rtt_sample;
+    OSSL_TIME first_rtt_sample;
 
     /*
      * A packet's num_bytes are added to this if it is inflight,
      * and removed again once ack'd/lost/discarded.
      */
-    uint64_t        bytes_in_flight;
+    uint64_t bytes_in_flight;
 
     /*
      * A packet's num_bytes are added to this if it is both inflight and
      * ack-eliciting, and removed again once ack'd/lost/discarded.
      */
-    uint64_t        ack_eliciting_bytes_in_flight[QUIC_PN_SPACE_NUM];
+    uint64_t ack_eliciting_bytes_in_flight[QUIC_PN_SPACE_NUM];
 
     /* Count of ECN-CE events. */
-    uint64_t        peer_ecnce[QUIC_PN_SPACE_NUM];
+    uint64_t peer_ecnce[QUIC_PN_SPACE_NUM];
 
     /* Set to 1 when the handshake is confirmed. */
-    char            handshake_confirmed;
+    char handshake_confirmed;
+
+    /* Set to 1 when attached to server channel */
+    char is_server;
 
     /* Set to 1 when the peer has completed address validation. */
-    char            peer_completed_addr_validation;
+    char peer_completed_addr_validation;
 
     /* Set to 1 when a PN space has been discarded. */
-    char            discarded[QUIC_PN_SPACE_NUM];
+    char discarded[QUIC_PN_SPACE_NUM];
 
     /* Set to 1 when we think an ACK frame should be generated. */
-    char            rx_ack_desired[QUIC_PN_SPACE_NUM];
+    char rx_ack_desired[QUIC_PN_SPACE_NUM];
 
     /* Set to 1 if an ACK frame has ever been generated. */
-    char            rx_ack_generated[QUIC_PN_SPACE_NUM];
+    char rx_ack_generated[QUIC_PN_SPACE_NUM];
 
     /* Probe request counts for reporting to the user. */
-    OSSL_ACKM_PROBE_INFO    pending_probe;
+    OSSL_ACKM_PROBE_INFO pending_probe;
 
     /* Generated ACK frames for each PN space. */
-    OSSL_QUIC_FRAME_ACK     ack[QUIC_PN_SPACE_NUM];
-    OSSL_QUIC_ACK_RANGE     ack_ranges[QUIC_PN_SPACE_NUM][MAX_RX_ACK_RANGES];
+    OSSL_QUIC_FRAME_ACK ack[QUIC_PN_SPACE_NUM];
+    OSSL_QUIC_ACK_RANGE ack_ranges[QUIC_PN_SPACE_NUM][MAX_RX_ACK_RANGES];
 
     /* Other RX state. */
     /* Largest PN we have RX'd. */
-    QUIC_PN         rx_largest_pn[QUIC_PN_SPACE_NUM];
+    QUIC_PN rx_largest_pn[QUIC_PN_SPACE_NUM];
 
     /* Time at which the PN in rx_largest_pn was RX'd. */
-    OSSL_TIME       rx_largest_time[QUIC_PN_SPACE_NUM];
+    OSSL_TIME rx_largest_time[QUIC_PN_SPACE_NUM];
 
     /*
      * ECN event counters. Each time we receive a packet with a given ECN label,
      * the corresponding ECN counter here is incremented.
      */
-    uint64_t        rx_ect0[QUIC_PN_SPACE_NUM];
-    uint64_t        rx_ect1[QUIC_PN_SPACE_NUM];
-    uint64_t        rx_ecnce[QUIC_PN_SPACE_NUM];
+    uint64_t rx_ect0[QUIC_PN_SPACE_NUM];
+    uint64_t rx_ect1[QUIC_PN_SPACE_NUM];
+    uint64_t rx_ecnce[QUIC_PN_SPACE_NUM];
 
     /*
      * Number of ACK-eliciting packets since last ACK. We use this to defer
      * emitting ACK frames until a threshold number of ACK-eliciting packets
      * have been received.
      */
-    uint32_t        rx_ack_eliciting_pkts_since_last_ack[QUIC_PN_SPACE_NUM];
+    uint32_t rx_ack_eliciting_pkts_since_last_ack[QUIC_PN_SPACE_NUM];
 
     /*
      * The ACK frame coalescing deadline at which we should flush any unsent ACK
      * frames.
      */
-    OSSL_TIME       rx_ack_flush_deadline[QUIC_PN_SPACE_NUM];
+    OSSL_TIME rx_ack_flush_deadline[QUIC_PN_SPACE_NUM];
 
     /*
      * The RX maximum ACK delay (the maximum amount of time our peer might
      * wait to send us an ACK after receiving an ACK-eliciting packet).
      */
-    OSSL_TIME       rx_max_ack_delay;
+    OSSL_TIME rx_max_ack_delay;
 
     /*
      * The TX maximum ACK delay (the maximum amount of time we allow ourselves
      * to wait before generating an ACK after receiving an ACK-eliciting
      * packet).
      */
-    OSSL_TIME       tx_max_ack_delay;
+    OSSL_TIME tx_max_ack_delay;
 
     /* Callbacks for deadline updates. */
     void (*loss_detection_deadline_cb)(OSSL_TIME deadline, void *arg);
@@ -667,8 +672,8 @@ static int range_contains(const OSSL_QUIC_ACK_RANGE *range, QUIC_PN pn)
  * list head (or NULL) if empty.
  */
 static OSSL_ACKM_TX_PKT *ackm_detect_and_remove_newly_acked_pkts(OSSL_ACKM *ackm,
-                                                                 const OSSL_QUIC_FRAME_ACK *ack,
-                                                                 int pkt_space)
+    const OSSL_QUIC_FRAME_ACK *ack,
+    int pkt_space)
 {
     OSSL_ACKM_TX_PKT *acked_pkts = NULL, **fixup = &acked_pkts, *pkt, *pprev;
     struct tx_pkt_history_st *h;
@@ -744,7 +749,7 @@ static OSSL_ACKM_TX_PKT *ackm_detect_and_remove_newly_acked_pkts(OSSL_ACKM *ackm
  * detected lost. The packets in the list are removed from the TX history list.
  */
 static OSSL_ACKM_TX_PKT *ackm_detect_and_remove_lost_pkts(OSSL_ACKM *ackm,
-                                                          int pkt_space)
+    int pkt_space)
 {
     OSSL_ACKM_TX_PKT *lost_pkts = NULL, **fixup = &lost_pkts, *pkt, *pnext;
     OSSL_TIME loss_delay, lost_send_time, now;
@@ -758,8 +763,8 @@ static OSSL_ACKM_TX_PKT *ackm_detect_and_remove_lost_pkts(OSSL_ACKM *ackm,
     ackm->loss_time[pkt_space] = ossl_time_zero();
 
     loss_delay = ossl_time_multiply(ossl_time_max(rtt.latest_rtt,
-                                                  rtt.smoothed_rtt),
-                                    K_TIME_THRESHOLD_NUM);
+                                        rtt.smoothed_rtt),
+        K_TIME_THRESHOLD_NUM);
     loss_delay = ossl_time_divide(loss_delay, K_TIME_THRESHOLD_DEN);
 
     /* Minimum time of K_GRANULARITY before packets are deemed lost. */
@@ -769,7 +774,7 @@ static OSSL_ACKM_TX_PKT *ackm_detect_and_remove_lost_pkts(OSSL_ACKM *ackm,
     now = ackm->now(ackm->now_arg);
     lost_send_time = ossl_time_subtract(now, loss_delay);
 
-    h   = get_tx_history(ackm, pkt_space);
+    h = get_tx_history(ackm, pkt_space);
     pkt = ossl_list_tx_history_head(&h->packets);
 
     for (; pkt != NULL; pkt = pnext) {
@@ -788,7 +793,7 @@ static OSSL_ACKM_TX_PKT *ackm_detect_and_remove_lost_pkts(OSSL_ACKM *ackm,
          * Mark packet as lost, or set time when it should be marked.
          */
         if (ossl_time_compare(pkt->time, lost_send_time) <= 0
-                || ackm->largest_acked_pkt[pkt_space]
+            || ackm->largest_acked_pkt[pkt_space]
                 >= pkt->pkt_num + K_PKT_THRESHOLD) {
             tx_pkt_history_remove(h, pkt->pkt_num);
 
@@ -797,12 +802,10 @@ static OSSL_ACKM_TX_PKT *ackm_detect_and_remove_lost_pkts(OSSL_ACKM *ackm,
             *fixup = NULL;
         } else {
             if (ossl_time_is_zero(ackm->loss_time[pkt_space]))
-                ackm->loss_time[pkt_space] =
-                    ossl_time_add(pkt->time, loss_delay);
+                ackm->loss_time[pkt_space] = ossl_time_add(pkt->time, loss_delay);
             else
-                ackm->loss_time[pkt_space] =
-                    ossl_time_min(ackm->loss_time[pkt_space],
-                                  ossl_time_add(pkt->time, loss_delay));
+                ackm->loss_time[pkt_space] = ossl_time_min(ackm->loss_time[pkt_space],
+                    ossl_time_add(pkt->time, loss_delay));
         }
     }
 
@@ -817,8 +820,8 @@ static OSSL_TIME ackm_get_loss_time_and_space(OSSL_ACKM *ackm, int *pspace)
     for (i = space + 1; i < QUIC_PN_SPACE_NUM; ++i)
         if (ossl_time_is_zero(time)
             || ossl_time_compare(ackm->loss_time[i], time) == -1) {
-            time    = ackm->loss_time[i];
-            space   = i;
+            time = ackm->loss_time[i];
+            space = i;
         }
 
     *pspace = space;
@@ -836,26 +839,31 @@ static OSSL_TIME ackm_get_pto_time_and_space(OSSL_ACKM *ackm, int *space)
 
     duration
         = ossl_time_add(rtt.smoothed_rtt,
-                        ossl_time_max(ossl_time_multiply(rtt.rtt_variance, 4),
-                                      ossl_ticks2time(K_GRANULARITY)));
+            ossl_time_max(ossl_time_multiply(rtt.rtt_variance, 4),
+                ossl_ticks2time(K_GRANULARITY)));
 
     duration
         = ossl_time_multiply(duration,
-                             (uint64_t)1 << min_u32(ackm->pto_count,
-                                                    MAX_PTO_COUNT));
+            (uint64_t)1 << min_u32(ackm->pto_count,
+                MAX_PTO_COUNT));
 
     /* Anti-deadlock PTO starts from the current time. */
     if (ackm_ack_eliciting_bytes_in_flight(ackm) == 0) {
         assert(!ackm->peer_completed_addr_validation);
 
         *space = ackm->discarded[QUIC_PN_SPACE_INITIAL]
-                    ? QUIC_PN_SPACE_HANDSHAKE
-                    : QUIC_PN_SPACE_INITIAL;
+            ? QUIC_PN_SPACE_HANDSHAKE
+            : QUIC_PN_SPACE_INITIAL;
         return ossl_time_add(ackm->now(ackm->now_arg), duration);
     }
 
     for (i = QUIC_PN_SPACE_INITIAL; i < QUIC_PN_SPACE_NUM; ++i) {
-        if (ackm->ack_eliciting_bytes_in_flight[i] == 0)
+        /*
+         * RFC 9002 section 6.2.2.1 keep probe timeout armed until
+         * handshake is confirmed (client sees HANDSHAKE_DONE message
+         * from server).
+         */
+        if (ackm->ack_eliciting_bytes_in_flight[i] == 0 && (ackm->handshake_confirmed == 1 || ackm->is_server == 1))
             continue;
 
         if (i == QUIC_PN_SPACE_APP) {
@@ -870,15 +878,23 @@ static OSSL_TIME ackm_get_pto_time_and_space(OSSL_ACKM *ackm, int *space)
 
                 duration
                     = ossl_time_add(duration,
-                                    ossl_time_multiply(ackm->rx_max_ack_delay,
-                                                       factor));
+                        ossl_time_multiply(ackm->rx_max_ack_delay,
+                            factor));
             }
         }
 
-        t = ossl_time_add(ackm->time_of_last_ack_eliciting_pkt[i], duration);
-        if (ossl_time_compare(t, pto_timeout) < 0) {
-            pto_timeout = t;
-            pto_space   = i;
+        /*
+         * Only re-arm timer if stack has sent at least one ACK eliciting frame.
+         * If stack has sent no ACK eliciting frame at given encryption level then
+         * particular timer is zero and we must not attempt to set it. Timer keeps
+         * time since epoch (Jan 1 1970) and we must not set timer to past.
+         */
+        if (!ossl_time_is_zero(ackm->time_of_last_ack_eliciting_pkt[i])) {
+            t = ossl_time_add(ackm->time_of_last_ack_eliciting_pkt[i], duration);
+            if (ossl_time_compare(t, pto_timeout) < 0) {
+                pto_timeout = t;
+                pto_space = i;
+            }
         }
     }
 
@@ -887,13 +903,13 @@ static OSSL_TIME ackm_get_pto_time_and_space(OSSL_ACKM *ackm, int *space)
 }
 
 static void ackm_set_loss_detection_timer_actual(OSSL_ACKM *ackm,
-                                                 OSSL_TIME deadline)
+    OSSL_TIME deadline)
 {
     ackm->loss_detection_deadline = deadline;
 
     if (ackm->loss_detection_deadline_cb != NULL)
         ackm->loss_detection_deadline_cb(deadline,
-                                         ackm->loss_detection_deadline_cb_arg);
+            ackm->loss_detection_deadline_cb_arg);
 }
 
 static int ackm_set_loss_detection_timer(OSSL_ACKM *ackm)
@@ -909,7 +925,7 @@ static int ackm_set_loss_detection_timer(OSSL_ACKM *ackm)
     }
 
     if (ackm_ack_eliciting_bytes_in_flight(ackm) == 0
-            && ackm->peer_completed_addr_validation) {
+        && ackm->peer_completed_addr_validation) {
         /*
          * Nothing to detect lost, so no timer is set. However, the client
          * needs to arm the timer if the server might be blocked by the
@@ -925,19 +941,19 @@ static int ackm_set_loss_detection_timer(OSSL_ACKM *ackm)
 }
 
 static int ackm_in_persistent_congestion(OSSL_ACKM *ackm,
-                                         const OSSL_ACKM_TX_PKT *lpkt)
+    const OSSL_ACKM_TX_PKT *lpkt)
 {
     /* TODO(QUIC FUTURE): Persistent congestion not currently implemented. */
     return 0;
 }
 
 static void ackm_on_pkts_lost(OSSL_ACKM *ackm, int pkt_space,
-                              const OSSL_ACKM_TX_PKT *lpkt, int pseudo)
+    const OSSL_ACKM_TX_PKT *lpkt, int pseudo)
 {
     const OSSL_ACKM_TX_PKT *p, *pnext;
     OSSL_RTT_INFO rtt;
     QUIC_PN largest_pn_lost = 0;
-    OSSL_CC_LOSS_INFO loss_info = {0};
+    OSSL_CC_LOSS_INFO loss_info = { 0 };
     uint32_t flags = 0;
 
     for (p = lpkt; p != NULL; p = pnext) {
@@ -984,7 +1000,7 @@ static void ackm_on_pkts_acked(OSSL_ACKM *ackm, const OSSL_ACKM_TX_PKT *apkt)
 {
     const OSSL_ACKM_TX_PKT *anext;
     QUIC_PN last_pn_acked = 0;
-    OSSL_CC_ACK_INFO ainfo = {0};
+    OSSL_CC_ACK_INFO ainfo = { 0 };
 
     for (; apkt != NULL; apkt = anext) {
         if (apkt->is_inflight) {
@@ -1002,8 +1018,8 @@ static void ackm_on_pkts_acked(OSSL_ACKM *ackm, const OSSL_ACKM_TX_PKT *apkt)
                  * next time.
                  */
                 rx_pkt_history_bump_watermark(get_rx_history(ackm,
-                                                             apkt->pkt_space),
-                                              apkt->largest_acked + 1);
+                                                  apkt->pkt_space),
+                    apkt->largest_acked + 1);
         }
 
         ainfo.tx_time = apkt->time;
@@ -1018,10 +1034,11 @@ static void ackm_on_pkts_acked(OSSL_ACKM *ackm, const OSSL_ACKM_TX_PKT *apkt)
 }
 
 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)
+    void *now_arg,
+    OSSL_STATM *statm,
+    const OSSL_CC_METHOD *cc_method,
+    OSSL_CC_DATA *cc_data,
+    int is_server)
 {
     OSSL_ACKM *ackm;
     int i;
@@ -1040,11 +1057,12 @@ OSSL_ACKM *ossl_ackm_new(OSSL_TIME (*now)(void *arg),
     for (i = 0; i < (int)OSSL_NELEM(ackm->rx_history); ++i)
         rx_pkt_history_init(&ackm->rx_history[i]);
 
-    ackm->now       = now;
-    ackm->now_arg   = now_arg;
-    ackm->statm     = statm;
+    ackm->now = now;
+    ackm->now_arg = now_arg;
+    ackm->statm = statm;
     ackm->cc_method = cc_method;
-    ackm->cc_data   = cc_data;
+    ackm->cc_data = cc_data;
+    ackm->is_server = (char)is_server;
 
     ackm->rx_max_ack_delay = ossl_ms2time(QUIC_DEFAULT_MAX_ACK_DELAY);
     ackm->tx_max_ack_delay = DEFAULT_TX_MAX_ACK_DELAY;
@@ -1082,7 +1100,8 @@ int ossl_ackm_on_tx_packet(OSSL_ACKM *ackm, OSSL_ACKM_TX_PKT *pkt)
     /* Time must be set and not move backwards. */
     if (ossl_time_is_zero(pkt->time)
         || ossl_time_compare(ackm->time_of_last_ack_eliciting_pkt[pkt->pkt_space],
-                             pkt->time) > 0)
+               pkt->time)
+            > 0)
         return 0;
 
     /* Must have non-zero number of bytes. */
@@ -1119,11 +1138,11 @@ int ossl_ackm_on_rx_datagram(OSSL_ACKM *ackm, size_t num_bytes)
 }
 
 static void ackm_process_ecn(OSSL_ACKM *ackm, const OSSL_QUIC_FRAME_ACK *ack,
-                             int pkt_space)
+    int pkt_space)
 {
     struct tx_pkt_history_st *h;
     OSSL_ACKM_TX_PKT *pkt;
-    OSSL_CC_ECN_INFO ecn_info = {0};
+    OSSL_CC_ECN_INFO ecn_info = { 0 };
 
     /*
      * If the ECN-CE counter reported by the peer has increased, this could
@@ -1143,7 +1162,7 @@ static void ackm_process_ecn(OSSL_ACKM *ackm, const OSSL_QUIC_FRAME_ACK *ack,
 }
 
 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)
 {
     OSSL_ACKM_TX_PKT *na_pkts, *lost_pkts;
     int must_set_timer = 0;
@@ -1153,14 +1172,14 @@ int ossl_ackm_on_rx_ack_frame(OSSL_ACKM *ackm, const OSSL_QUIC_FRAME_ACK *ack,
     else
         ackm->largest_acked_pkt[pkt_space]
             = ossl_quic_pn_max(ackm->largest_acked_pkt[pkt_space],
-                               ack->ack_ranges[0].end);
+                ack->ack_ranges[0].end);
 
     /*
      * If we get an ACK in the handshake space, address validation is completed.
      * Make sure we update the timer, even if no packets were ACK'd.
      */
     if (!ackm->peer_completed_addr_validation
-            && pkt_space == QUIC_PN_SPACE_HANDSHAKE) {
+        && pkt_space == QUIC_PN_SPACE_HANDSHAKE) {
         ackm->peer_completed_addr_validation = 1;
         must_set_timer = 1;
     }
@@ -1182,8 +1201,7 @@ int ossl_ackm_on_rx_ack_frame(OSSL_ACKM *ackm, const OSSL_QUIC_FRAME_ACK *ack,
      *
      * First packet in the list is always the one with the largest PN.
      */
-    if (na_pkts->pkt_num == ack->ack_ranges[0].end &&
-        ack_includes_ack_eliciting(na_pkts)) {
+    if (na_pkts->pkt_num == ack->ack_ranges[0].end && ack_includes_ack_eliciting(na_pkts)) {
         OSSL_TIME now = ackm->now(ackm->now_arg), ack_delay;
         if (ossl_time_is_zero(ackm->first_rtt_sample))
             ackm->first_rtt_sample = now;
@@ -1194,7 +1212,7 @@ int ossl_ackm_on_rx_ack_frame(OSSL_ACKM *ackm, const OSSL_QUIC_FRAME_ACK *ack,
             ack_delay = ossl_time_min(ack_delay, ackm->rx_max_ack_delay);
 
         ossl_statm_update_rtt(ackm->statm, ack_delay,
-                              ossl_time_subtract(now, na_pkts->time));
+            ossl_time_subtract(now, na_pkts->time));
     }
 
     /*
@@ -1237,7 +1255,7 @@ int ossl_ackm_on_pkt_space_discarded(OSSL_ACKM *ackm, int pkt_space)
         ackm->peer_completed_addr_validation = 1;
 
     for (pkt = ossl_list_tx_history_head(&get_tx_history(ackm, pkt_space)->packets);
-            pkt != NULL; pkt = pnext) {
+        pkt != NULL; pkt = pnext) {
         pnext = ossl_list_tx_history_next(pkt);
         if (pkt->is_inflight) {
             ackm->bytes_in_flight -= pkt->num_bytes;
@@ -1252,7 +1270,7 @@ int ossl_ackm_on_pkt_space_discarded(OSSL_ACKM *ackm, int pkt_space)
 
     if (num_bytes_invalidated > 0)
         ackm->cc_method->on_data_invalidated(ackm->cc_data,
-                                             num_bytes_invalidated);
+            num_bytes_invalidated);
 
     ackm->time_of_last_ack_eliciting_pkt[pkt_space] = ossl_time_zero();
     ackm->loss_time[pkt_space] = ossl_time_zero();
@@ -1265,8 +1283,8 @@ int ossl_ackm_on_pkt_space_discarded(OSSL_ACKM *ackm, int pkt_space)
 
 int ossl_ackm_on_handshake_confirmed(OSSL_ACKM *ackm)
 {
-    ackm->handshake_confirmed               = 1;
-    ackm->peer_completed_addr_validation    = 1;
+    ackm->handshake_confirmed = 1;
+    ackm->peer_completed_addr_validation = 1;
     ackm_set_loss_detection_timer(ackm);
     return 1;
 }
@@ -1359,7 +1377,7 @@ int ossl_ackm_get_largest_unacked(OSSL_ACKM *ackm, int pkt_space, QUIC_PN *pn)
 }
 
 /* Number of ACK-eliciting packets RX'd before we always emit an ACK. */
-#define PKTS_BEFORE_ACK     2
+#define PKTS_BEFORE_ACK 2
 
 /*
  * Return 1 if emission of an ACK frame is currently desired.
@@ -1381,7 +1399,8 @@ int ossl_ackm_is_ack_desired(OSSL_ACKM *ackm, int pkt_space)
     return ackm->rx_ack_desired[pkt_space]
         || (!ossl_time_is_infinite(ackm->rx_ack_flush_deadline[pkt_space])
             && ossl_time_compare(ackm->now(ackm->now_arg),
-                                 ackm->rx_ack_flush_deadline[pkt_space]) >= 0);
+                   ackm->rx_ack_flush_deadline[pkt_space])
+                >= 0);
 }
 
 /*
@@ -1440,19 +1459,19 @@ static int ackm_has_newly_missing(OSSL_ACKM *ackm, int pkt_space)
      */
     return ackm->ack[pkt_space].num_ack_ranges > 0
         && ossl_list_uint_set_tail(&h->set)->range.start
-           == ossl_list_uint_set_tail(&h->set)->range.end
+        == ossl_list_uint_set_tail(&h->set)->range.end
         && ossl_list_uint_set_tail(&h->set)->range.start
-            > ackm->ack[pkt_space].ack_ranges[0].end + 1;
+        > ackm->ack[pkt_space].ack_ranges[0].end + 1;
 }
 
 static void ackm_set_flush_deadline(OSSL_ACKM *ackm, int pkt_space,
-                                    OSSL_TIME deadline)
+    OSSL_TIME deadline)
 {
     ackm->rx_ack_flush_deadline[pkt_space] = deadline;
 
     if (ackm->ack_deadline_cb != NULL)
         ackm->ack_deadline_cb(ossl_ackm_get_ack_deadline(ackm, pkt_space),
-                              pkt_space, ackm->ack_deadline_cb_arg);
+            pkt_space, ackm->ack_deadline_cb_arg);
 }
 
 /* Explicitly flags that we want to generate an ACK frame. */
@@ -1465,8 +1484,8 @@ static void ackm_queue_ack(OSSL_ACKM *ackm, int pkt_space)
 }
 
 static void ackm_on_rx_ack_eliciting(OSSL_ACKM *ackm,
-                                     OSSL_TIME rx_time, int pkt_space,
-                                     int was_missing)
+    OSSL_TIME rx_time, int pkt_space,
+    int was_missing)
 {
     OSSL_TIME tx_max_ack_delay;
 
@@ -1477,10 +1496,10 @@ static void ackm_on_rx_ack_eliciting(OSSL_ACKM *ackm,
     ++ackm->rx_ack_eliciting_pkts_since_last_ack[pkt_space];
 
     if (!ackm->rx_ack_generated[pkt_space]
-            || was_missing
-            || ackm->rx_ack_eliciting_pkts_since_last_ack[pkt_space]
-                >= PKTS_BEFORE_ACK
-            || ackm_has_newly_missing(ackm, pkt_space)) {
+        || was_missing
+        || ackm->rx_ack_eliciting_pkts_since_last_ack[pkt_space]
+            >= PKTS_BEFORE_ACK
+        || ackm_has_newly_missing(ackm, pkt_space)) {
         /*
          * Either:
          *
@@ -1523,12 +1542,12 @@ static void ackm_on_rx_ack_eliciting(OSSL_ACKM *ackm,
 
     if (ossl_time_is_infinite(ackm->rx_ack_flush_deadline[pkt_space]))
         ackm_set_flush_deadline(ackm, pkt_space,
-                                ossl_time_add(rx_time, tx_max_ack_delay));
+            ossl_time_add(rx_time, tx_max_ack_delay));
     else
         ackm_set_flush_deadline(ackm, pkt_space,
-                                ossl_time_min(ackm->rx_ack_flush_deadline[pkt_space],
-                                              ossl_time_add(rx_time,
-                                                            tx_max_ack_delay)));
+            ossl_time_min(ackm->rx_ack_flush_deadline[pkt_space],
+                ossl_time_add(rx_time,
+                    tx_max_ack_delay)));
 }
 
 int ossl_ackm_on_rx_packet(OSSL_ACKM *ackm, const OSSL_ACKM_RX_PKT *pkt)
@@ -1545,7 +1564,7 @@ int ossl_ackm_on_rx_packet(OSSL_ACKM *ackm, const OSSL_ACKM_RX_PKT *pkt)
      * We use this to calculate the ACK delay field of ACK frames.
      */
     if (pkt->pkt_num > ackm->rx_largest_pn[pkt->pkt_space]) {
-        ackm->rx_largest_pn[pkt->pkt_space]   = pkt->pkt_num;
+        ackm->rx_largest_pn[pkt->pkt_space] = pkt->pkt_num;
         ackm->rx_largest_time[pkt->pkt_space] = pkt->time;
     }
 
@@ -1591,7 +1610,7 @@ int ossl_ackm_on_rx_packet(OSSL_ACKM *ackm, const OSSL_ACKM_RX_PKT *pkt)
 }
 
 static void ackm_fill_rx_ack_ranges(OSSL_ACKM *ackm, int pkt_space,
-                                    OSSL_QUIC_FRAME_ACK *ack)
+    OSSL_QUIC_FRAME_ACK *ack)
 {
     struct rx_pkt_history_st *h = get_rx_history(ackm, pkt_space);
     UINT_SET_ITEM *x;
@@ -1602,18 +1621,18 @@ static void ackm_fill_rx_ack_ranges(OSSL_ACKM *ackm, int pkt_space,
      * maximum number of ranges.
      */
     for (x = ossl_list_uint_set_tail(&h->set);
-         x != NULL && i < OSSL_NELEM(ackm->ack_ranges);
-         x = ossl_list_uint_set_prev(x), ++i) {
+        x != NULL && i < OSSL_NELEM(ackm->ack_ranges);
+        x = ossl_list_uint_set_prev(x), ++i) {
         ackm->ack_ranges[pkt_space][i].start = x->range.start;
-        ackm->ack_ranges[pkt_space][i].end   = x->range.end;
+        ackm->ack_ranges[pkt_space][i].end = x->range.end;
     }
 
-    ack->ack_ranges     = ackm->ack_ranges[pkt_space];
+    ack->ack_ranges = ackm->ack_ranges[pkt_space];
     ack->num_ack_ranges = i;
 }
 
 const OSSL_QUIC_FRAME_ACK *ossl_ackm_get_ack_frame(OSSL_ACKM *ackm,
-                                                   int pkt_space)
+    int pkt_space)
 {
     OSSL_QUIC_FRAME_ACK *ack = &ackm->ack[pkt_space];
     OSSL_TIME now = ackm->now(ackm->now_arg);
@@ -1621,27 +1640,25 @@ const OSSL_QUIC_FRAME_ACK *ossl_ackm_get_ack_frame(OSSL_ACKM *ackm,
     ackm_fill_rx_ack_ranges(ackm, pkt_space, ack);
 
     if (!ossl_time_is_zero(ackm->rx_largest_time[pkt_space])
-            && ossl_time_compare(now, ackm->rx_largest_time[pkt_space]) > 0
-            && pkt_space == QUIC_PN_SPACE_APP)
-        ack->delay_time =
-            ossl_time_subtract(now, ackm->rx_largest_time[pkt_space]);
+        && ossl_time_compare(now, ackm->rx_largest_time[pkt_space]) > 0
+        && pkt_space == QUIC_PN_SPACE_APP)
+        ack->delay_time = ossl_time_subtract(now, ackm->rx_largest_time[pkt_space]);
     else
         ack->delay_time = ossl_time_zero();
 
-    ack->ect0              = ackm->rx_ect0[pkt_space];
-    ack->ect1              = ackm->rx_ect1[pkt_space];
-    ack->ecnce             = ackm->rx_ecnce[pkt_space];
-    ack->ecn_present       = 1;
+    ack->ect0 = ackm->rx_ect0[pkt_space];
+    ack->ect1 = ackm->rx_ect1[pkt_space];
+    ack->ecnce = ackm->rx_ecnce[pkt_space];
+    ack->ecn_present = 1;
 
     ackm->rx_ack_eliciting_pkts_since_last_ack[pkt_space] = 0;
 
-    ackm->rx_ack_generated[pkt_space]       = 1;
-    ackm->rx_ack_desired[pkt_space]         = 0;
+    ackm->rx_ack_generated[pkt_space] = 1;
+    ackm->rx_ack_desired[pkt_space] = 0;
     ackm_set_flush_deadline(ackm, pkt_space, ossl_time_infinite());
     return ack;
 }
 
-
 OSSL_TIME ossl_ackm_get_ack_deadline(OSSL_ACKM *ackm, int pkt_space)
 {
     if (ackm->rx_ack_desired[pkt_space])
@@ -1659,26 +1676,26 @@ int ossl_ackm_is_rx_pn_processable(OSSL_ACKM *ackm, QUIC_PN pn, int pkt_space)
 }
 
 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)
 {
-    ackm->loss_detection_deadline_cb      = fn;
-    ackm->loss_detection_deadline_cb_arg  = arg;
+    ackm->loss_detection_deadline_cb = fn;
+    ackm->loss_detection_deadline_cb_arg = 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)
 {
-    ackm->ack_deadline_cb     = fn;
+    ackm->ack_deadline_cb = fn;
     ackm->ack_deadline_cb_arg = arg;
 }
 
 int ossl_ackm_mark_packet_pseudo_lost(OSSL_ACKM *ackm,
-                                      int pkt_space, QUIC_PN pn)
+    int pkt_space, QUIC_PN pn)
 {
     struct tx_pkt_history_st *h = get_tx_history(ackm, pkt_space);
     OSSL_ACKM_TX_PKT *pkt;
@@ -1701,8 +1718,8 @@ OSSL_TIME ossl_ackm_get_pto_duration(OSSL_ACKM *ackm)
     ossl_statm_get_rtt_info(ackm->statm, &rtt);
 
     duration = ossl_time_add(rtt.smoothed_rtt,
-                             ossl_time_max(ossl_time_multiply(rtt.rtt_variance, 4),
-                                           ossl_ticks2time(K_GRANULARITY)));
+        ossl_time_max(ossl_time_multiply(rtt.rtt_variance, 4),
+            ossl_ticks2time(K_GRANULARITY)));
     if (!ossl_time_is_infinite(ackm->rx_max_ack_delay))
         duration = ossl_time_add(duration, ackm->rx_max_ack_delay);
 
diff --git a/ssl/quic/quic_cfq.c b/ssl/quic/quic_cfq.c
index fb96e0c68cc16..3c59234ff0ff7 100644
--- a/ssl/quic/quic_cfq.c
+++ b/ssl/quic/quic_cfq.c
@@ -13,15 +13,15 @@
 typedef struct quic_cfq_item_ex_st QUIC_CFQ_ITEM_EX;
 
 struct quic_cfq_item_ex_st {
-    QUIC_CFQ_ITEM           public;
-    QUIC_CFQ_ITEM_EX       *prev, *next;
-    unsigned char          *encoded;
-    cfq_free_cb            *free_cb;
-    void                   *free_cb_arg;
-    uint64_t                frame_type;
-    size_t                  encoded_len;
-    uint32_t                priority, pn_space, flags;
-    int                     state;
+    QUIC_CFQ_ITEM public;
+    QUIC_CFQ_ITEM_EX *prev, *next;
+    unsigned char *encoded;
+    cfq_free_cb *free_cb;
+    void *free_cb_arg;
+    uint64_t frame_type;
+    size_t encoded_len;
+    uint32_t priority, pn_space, flags;
+    int state;
 };
 
 uint64_t ossl_quic_cfq_item_get_frame_type(const QUIC_CFQ_ITEM *item)
@@ -78,7 +78,7 @@ struct quic_cfq_st {
      * Invariant: The list the CFQ item is determined exactly by the state field
      * of the item.
      */
-    QUIC_CFQ_ITEM_LIST                      new_list, tx_list, free_list;
+    QUIC_CFQ_ITEM_LIST new_list, tx_list, free_list;
 };
 
 static int compare(const QUIC_CFQ_ITEM_EX *a, const QUIC_CFQ_ITEM_EX *b)
@@ -132,8 +132,8 @@ static void list_insert_tail(QUIC_CFQ_ITEM_LIST *l, QUIC_CFQ_ITEM_EX *n)
 }
 
 static void list_insert_after(QUIC_CFQ_ITEM_LIST *l,
-                              QUIC_CFQ_ITEM_EX *ref,
-                              QUIC_CFQ_ITEM_EX *n)
+    QUIC_CFQ_ITEM_EX *ref,
+    QUIC_CFQ_ITEM_EX *n)
 {
     n->prev = ref;
     n->next = ref->next;
@@ -145,8 +145,8 @@ static void list_insert_after(QUIC_CFQ_ITEM_LIST *l,
 }
 
 static void list_insert_sorted(QUIC_CFQ_ITEM_LIST *l, QUIC_CFQ_ITEM_EX *n,
-                               int (*cmp)(const QUIC_CFQ_ITEM_EX *a,
-                                          const QUIC_CFQ_ITEM_EX *b))
+    int (*cmp)(const QUIC_CFQ_ITEM_EX *a,
+        const QUIC_CFQ_ITEM_EX *b))
 {
     QUIC_CFQ_ITEM_EX *p = l->head, *pprev = NULL;
 
@@ -156,7 +156,8 @@ static void list_insert_sorted(QUIC_CFQ_ITEM_LIST *l, QUIC_CFQ_ITEM_EX *n,
         return;
     }
 
-    for (; p != NULL && cmp(p, n) < 0; pprev = p, p = p->next);
+    for (; p != NULL && cmp(p, n) < 0; pprev = p, p = p->next)
+        ;
 
     if (p == NULL)
         list_insert_tail(l, n);
@@ -181,9 +182,9 @@ static void clear_item(QUIC_CFQ_ITEM_EX *item)
     if (item->free_cb != NULL) {
         item->free_cb(item->encoded, item->encoded_len, item->free_cb_arg);
 
-        item->free_cb       = NULL;
-        item->encoded       = NULL;
-        item->encoded_len   = 0;
+        item->free_cb = NULL;
+        item->encoded = NULL;
+        item->encoded_len = 0;
     }
 
     item->state = -1;
@@ -227,28 +228,28 @@ static QUIC_CFQ_ITEM_EX *cfq_get_free(QUIC_CFQ *cfq)
     return item;
 }
 
-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)
 {
     QUIC_CFQ_ITEM_EX *item = cfq_get_free(cfq);
 
     if (item == NULL)
         return NULL;
 
-    item->priority      = priority;
-    item->frame_type    = frame_type;
-    item->pn_space      = pn_space;
-    item->encoded       = (unsigned char *)encoded;
-    item->encoded_len   = encoded_len;
-    item->free_cb       = free_cb;
-    item->free_cb_arg   = free_cb_arg;
+    item->priority = priority;
+    item->frame_type = frame_type;
+    item->pn_space = pn_space;
+    item->encoded = (unsigned char *)encoded;
+    item->encoded_len = encoded_len;
+    item->free_cb = free_cb;
+    item->free_cb_arg = free_cb_arg;
 
     item->state = QUIC_CFQ_STATE_NEW;
     item->flags = flags;
@@ -276,7 +277,7 @@ void ossl_quic_cfq_mark_tx(QUIC_CFQ *cfq, QUIC_CFQ_ITEM *item)
 }
 
 void ossl_quic_cfq_mark_lost(QUIC_CFQ *cfq, QUIC_CFQ_ITEM *item,
-                             uint32_t priority)
+    uint32_t priority)
 {
     QUIC_CFQ_ITEM_EX *ex = (QUIC_CFQ_ITEM_EX *)item;
 
@@ -332,11 +333,12 @@ void ossl_quic_cfq_release(QUIC_CFQ *cfq, QUIC_CFQ_ITEM *item)
 }
 
 QUIC_CFQ_ITEM *ossl_quic_cfq_get_priority_head(const QUIC_CFQ *cfq,
-                                               uint32_t pn_space)
+    uint32_t pn_space)
 {
     QUIC_CFQ_ITEM_EX *item = cfq->new_list.head;
 
-    for (; item != NULL && item->pn_space != pn_space; item = item->next);
+    for (; item != NULL && item->pn_space != pn_space; item = item->next)
+        ;
 
     if (item == NULL)
         return NULL;
@@ -345,19 +347,20 @@ QUIC_CFQ_ITEM *ossl_quic_cfq_get_priority_head(const QUIC_CFQ *cfq,
 }
 
 QUIC_CFQ_ITEM *ossl_quic_cfq_item_get_priority_next(const QUIC_CFQ_ITEM *item,
-                                                    uint32_t pn_space)
+    uint32_t pn_space)
 {
     QUIC_CFQ_ITEM_EX *ex = (QUIC_CFQ_ITEM_EX *)item;
 
     if (ex == NULL)
         return NULL;
 
-     ex = ex->next;
+    ex = ex->next;
 
-     for (; ex != NULL && ex->pn_space != pn_space; ex = ex->next);
+    for (; ex != NULL && ex->pn_space != pn_space; ex = ex->next)
+        ;
 
-     if (ex == NULL)
-         return NULL; /* ubsan */
+    if (ex == NULL)
+        return NULL; /* ubsan */
 
-     return &ex->public;
+    return &ex->public;
 }
diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c
index 8fb651d9ceb67..13692e5bd09eb 100644
--- a/ssl/quic/quic_channel.c
+++ b/ssl/quic/quic_channel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -24,9 +24,9 @@
 #include "quic_port_local.h"
 #include "quic_engine_local.h"
 
-#define INIT_CRYPTO_RECV_BUF_LEN    16384
-#define INIT_CRYPTO_SEND_BUF_LEN    16384
-#define INIT_APP_BUF_LEN             8192
+#define INIT_CRYPTO_RECV_BUF_LEN 16384
+#define INIT_CRYPTO_SEND_BUF_LEN 16384
+#define INIT_APP_BUF_LEN 8192
 
 /*
  * Interval before we force a PING to ensure NATs don't timeout. This is based
@@ -41,7 +41,7 @@
  * value which determines the value of the maximum ACK delay if the
  * max_ack_delay transport parameter is not set.
  */
-#define DEFAULT_MAX_ACK_DELAY   QUIC_DEFAULT_MAX_ACK_DELAY
+#define DEFAULT_MAX_ACK_DELAY QUIC_DEFAULT_MAX_ACK_DELAY
 
 DEFINE_LIST_OF_IMPL(ch, QUIC_CHANNEL);
 
@@ -52,53 +52,51 @@ static int ch_tick_tls(QUIC_CHANNEL *ch, int channel_only, int *notify_other_thr
 static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only);
 static OSSL_TIME ch_determine_next_tick_deadline(QUIC_CHANNEL *ch);
 static int ch_retry(QUIC_CHANNEL *ch,
-                    const unsigned char *retry_token,
-                    size_t retry_token_len,
-                    const QUIC_CONN_ID *retry_scid,
-                    int drop_later_pn);
+    const unsigned char *retry_token,
+    size_t retry_token_len,
+    const QUIC_CONN_ID *retry_scid,
+    int drop_later_pn);
 static int ch_restart(QUIC_CHANNEL *ch);
 
 static void ch_cleanup(QUIC_CHANNEL *ch);
 static int ch_generate_transport_params(QUIC_CHANNEL *ch);
 static int ch_on_transport_params(const unsigned char *params,
-                                  size_t params_len,
-                                  void *arg);
+    size_t params_len,
+    void *arg);
 static int ch_on_handshake_alert(void *arg, unsigned char alert_code);
 static int ch_on_handshake_complete(void *arg);
 static int ch_on_handshake_yield_secret(uint32_t prot_level, int direction,
-                                        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);
 static int ch_on_crypto_recv_record(const unsigned char **buf,
-                                    size_t *bytes_read, void *arg);
+    size_t *bytes_read, void *arg);
 static int ch_on_crypto_release_record(size_t bytes_read, void *arg);
 static int crypto_ensure_empty(QUIC_RSTREAM *rstream);
 static int ch_on_crypto_send(const unsigned char *buf, size_t buf_len,
-                             size_t *consumed, void *arg);
+    size_t *consumed, void *arg);
 static OSSL_TIME get_time(void *arg);
 static uint64_t get_stream_limit(int uni, void *arg);
 static int rx_late_validate(QUIC_PN pn, int pn_space, void *arg);
 static void rxku_detected(QUIC_PN pn, void *arg);
 static int ch_retry(QUIC_CHANNEL *ch,
-                    const unsigned char *retry_token,
-                    size_t retry_token_len,
-                    const QUIC_CONN_ID *retry_scid,
-                    int drop_later_pn);
+    const unsigned char *retry_token,
+    size_t retry_token_len,
+    const QUIC_CONN_ID *retry_scid,
+    int drop_later_pn);
 static void ch_update_idle(QUIC_CHANNEL *ch);
 static int ch_discard_el(QUIC_CHANNEL *ch,
-                         uint32_t enc_level);
+    uint32_t enc_level);
 static void ch_on_idle_timeout(QUIC_CHANNEL *ch);
 static void ch_update_idle(QUIC_CHANNEL *ch);
 static void ch_update_ping_deadline(QUIC_CHANNEL *ch);
 static void ch_on_terminating_timeout(QUIC_CHANNEL *ch);
 static void ch_start_terminating(QUIC_CHANNEL *ch,
-                                 const QUIC_TERMINATE_CAUSE *tcause,
-                                 int force_immediate);
+    const QUIC_TERMINATE_CAUSE *tcause,
+    int force_immediate);
 static void ch_on_txp_ack_tx(const OSSL_QUIC_FRAME_ACK *ack, uint32_t pn_space,
-                             void *arg);
-static void ch_rx_handle_version_neg(QUIC_CHANNEL *ch, OSSL_QRX_PKT *pkt);
-static void ch_raise_version_neg_failure(QUIC_CHANNEL *ch);
+    void *arg);
 static void ch_record_state_transition(QUIC_CHANNEL *ch, uint32_t new_state);
 
 DEFINE_LHASH_OF_EX(QUIC_SRT_ELEM);
@@ -107,7 +105,7 @@ QUIC_NEEDS_LOCK
 static QLOG *ch_get_qlog(QUIC_CHANNEL *ch)
 {
 #ifndef OPENSSL_NO_QLOG
-    QLOG_TRACE_INFO qti = {0};
+    QLOG_TRACE_INFO qti = { 0 };
 
     if (ch->qlog != NULL)
         return ch->qlog;
@@ -118,13 +116,13 @@ static QLOG *ch_get_qlog(QUIC_CHANNEL *ch)
     if (ch->is_server && ch->init_dcid.id_len == 0)
         return NULL;
 
-    qti.odcid       = ch->init_dcid;
-    qti.title       = ch->qlog_title;
+    qti.odcid = ch->init_dcid;
+    qti.title = ch->qlog_title;
     qti.description = NULL;
-    qti.group_id    = NULL;
-    qti.is_server   = ch->is_server;
-    qti.now_cb      = get_time;
-    qti.now_cb_arg  = ch;
+    qti.group_id = NULL;
+    qti.is_server = ch->is_server;
+    qti.now_cb = get_time;
+    qti.now_cb_arg = ch;
     if ((ch->qlog = ossl_qlog_new_from_env(&qti)) == NULL) {
         ch->use_qlog = 0; /* don't try again */
         return NULL;
@@ -148,20 +146,20 @@ static QLOG *ch_get_qlog_cb(void *arg)
  * QUIC Channel Initialization and Teardown
  * ========================================
  */
-#define DEFAULT_INIT_CONN_RXFC_WND      (768 * 1024)
-#define DEFAULT_CONN_RXFC_MAX_WND_MUL   20
+#define DEFAULT_INIT_CONN_RXFC_WND (768 * 1024)
+#define DEFAULT_CONN_RXFC_MAX_WND_MUL 20
 
-#define DEFAULT_INIT_STREAM_RXFC_WND    (512 * 1024)
+#define DEFAULT_INIT_STREAM_RXFC_WND (512 * 1024)
 #define DEFAULT_STREAM_RXFC_MAX_WND_MUL 12
 
-#define DEFAULT_INIT_CONN_MAX_STREAMS           100
+#define DEFAULT_INIT_CONN_MAX_STREAMS 100
 
 static int ch_init(QUIC_CHANNEL *ch)
 {
-    OSSL_QUIC_TX_PACKETISER_ARGS txp_args = {0};
-    OSSL_QTX_ARGS qtx_args = {0};
-    OSSL_QRX_ARGS qrx_args = {0};
-    QUIC_TLS_ARGS tls_args = {0};
+    OSSL_QUIC_TX_PACKETISER_ARGS txp_args = { 0 };
+    OSSL_QTX_ARGS qtx_args = { 0 };
+    OSSL_QRX_ARGS qrx_args = { 0 };
+    QUIC_TLS_ARGS tls_args = { 0 };
     uint32_t pn_space;
     size_t rx_short_dcid_len;
     size_t tx_init_dcid_len;
@@ -175,14 +173,14 @@ static int ch_init(QUIC_CHANNEL *ch)
     /* For clients, generate our initial DCID. */
     if (!ch->is_server
         && !ossl_quic_gen_rand_conn_id(ch->port->engine->libctx, tx_init_dcid_len,
-                                       &ch->init_dcid))
+            &ch->init_dcid))
         goto err;
 
     /* We plug in a network write BIO to the QTX later when we get one. */
-    qtx_args.libctx             = ch->port->engine->libctx;
-    qtx_args.get_qlog_cb        = ch_get_qlog_cb;
-    qtx_args.get_qlog_cb_arg    = ch;
-    qtx_args.mdpl               = QUIC_MIN_INITIAL_DGRAM_LEN;
+    qtx_args.libctx = ch->port->engine->libctx;
+    qtx_args.get_qlog_cb = ch_get_qlog_cb;
+    qtx_args.get_qlog_cb_arg = ch;
+    qtx_args.mdpl = QUIC_MIN_INITIAL_DGRAM_LEN;
     ch->rx_max_udp_payload_size = qtx_args.mdpl;
 
     ch->ping_deadline = ossl_time_infinite();
@@ -206,31 +204,30 @@ static int ch_init(QUIC_CHANNEL *ch)
      * Note: The TP we transmit governs what the peer can transmit and thus
      * applies to the RXFC.
      */
-    ch->tx_init_max_stream_data_bidi_local  = DEFAULT_INIT_STREAM_RXFC_WND;
+    ch->tx_init_max_stream_data_bidi_local = DEFAULT_INIT_STREAM_RXFC_WND;
     ch->tx_init_max_stream_data_bidi_remote = DEFAULT_INIT_STREAM_RXFC_WND;
-    ch->tx_init_max_stream_data_uni         = DEFAULT_INIT_STREAM_RXFC_WND;
+    ch->tx_init_max_stream_data_uni = DEFAULT_INIT_STREAM_RXFC_WND;
 
     if (!ossl_quic_rxfc_init(&ch->conn_rxfc, NULL,
-                             DEFAULT_INIT_CONN_RXFC_WND,
-                             DEFAULT_CONN_RXFC_MAX_WND_MUL *
-                             DEFAULT_INIT_CONN_RXFC_WND,
-                             get_time, ch))
+            DEFAULT_INIT_CONN_RXFC_WND,
+            DEFAULT_CONN_RXFC_MAX_WND_MUL * DEFAULT_INIT_CONN_RXFC_WND,
+            get_time, ch))
         goto err;
 
     for (pn_space = QUIC_PN_SPACE_INITIAL; pn_space < QUIC_PN_SPACE_NUM; ++pn_space)
         if (!ossl_quic_rxfc_init_standalone(&ch->crypto_rxfc[pn_space],
-                                            INIT_CRYPTO_RECV_BUF_LEN,
-                                            get_time, ch))
+                INIT_CRYPTO_RECV_BUF_LEN,
+                get_time, ch))
             goto err;
 
     if (!ossl_quic_rxfc_init_standalone(&ch->max_streams_bidi_rxfc,
-                                        DEFAULT_INIT_CONN_MAX_STREAMS,
-                                        get_time, ch))
+            DEFAULT_INIT_CONN_MAX_STREAMS,
+            get_time, ch))
         goto err;
 
     if (!ossl_quic_rxfc_init_standalone(&ch->max_streams_uni_rxfc,
-                                        DEFAULT_INIT_CONN_MAX_STREAMS,
-                                        get_time, ch))
+            DEFAULT_INIT_CONN_MAX_STREAMS,
+            get_time, ch))
         goto err;
 
     if (!ossl_statm_init(&ch->statm))
@@ -242,13 +239,15 @@ static int ch_init(QUIC_CHANNEL *ch)
         goto err;
 
     if ((ch->ackm = ossl_ackm_new(get_time, ch, &ch->statm,
-                                  ch->cc_method, ch->cc_data)) == NULL)
+             ch->cc_method, ch->cc_data,
+             ch->is_server))
+        == NULL)
         goto err;
 
     if (!ossl_quic_stream_map_init(&ch->qsm, get_stream_limit, ch,
-                                   &ch->max_streams_bidi_rxfc,
-                                   &ch->max_streams_uni_rxfc,
-                                   ch->is_server))
+            &ch->max_streams_bidi_rxfc,
+            &ch->max_streams_uni_rxfc,
+            ch->is_server))
         goto err;
 
     ch->have_qsm = 1;
@@ -257,25 +256,25 @@ static int ch_init(QUIC_CHANNEL *ch)
         && !ossl_quic_lcidm_generate_initial(ch->lcidm, ch, &ch->init_scid))
         goto err;
 
-    txp_args.cur_scid               = ch->init_scid;
-    txp_args.cur_dcid               = ch->init_dcid;
-    txp_args.ack_delay_exponent     = 3;
-    txp_args.qtx                    = ch->qtx;
-    txp_args.txpim                  = ch->txpim;
-    txp_args.cfq                    = ch->cfq;
-    txp_args.ackm                   = ch->ackm;
-    txp_args.qsm                    = &ch->qsm;
-    txp_args.conn_txfc              = &ch->conn_txfc;
-    txp_args.conn_rxfc              = &ch->conn_rxfc;
-    txp_args.max_streams_bidi_rxfc  = &ch->max_streams_bidi_rxfc;
-    txp_args.max_streams_uni_rxfc   = &ch->max_streams_uni_rxfc;
-    txp_args.cc_method              = ch->cc_method;
-    txp_args.cc_data                = ch->cc_data;
-    txp_args.now                    = get_time;
-    txp_args.now_arg                = ch;
-    txp_args.get_qlog_cb            = ch_get_qlog_cb;
-    txp_args.get_qlog_cb_arg        = ch;
-    txp_args.protocol_version       = QUIC_VERSION_1;
+    txp_args.cur_scid = ch->init_scid;
+    txp_args.cur_dcid = ch->init_dcid;
+    txp_args.ack_delay_exponent = 3;
+    txp_args.qtx = ch->qtx;
+    txp_args.txpim = ch->txpim;
+    txp_args.cfq = ch->cfq;
+    txp_args.ackm = ch->ackm;
+    txp_args.qsm = &ch->qsm;
+    txp_args.conn_txfc = &ch->conn_txfc;
+    txp_args.conn_rxfc = &ch->conn_rxfc;
+    txp_args.max_streams_bidi_rxfc = &ch->max_streams_bidi_rxfc;
+    txp_args.max_streams_uni_rxfc = &ch->max_streams_uni_rxfc;
+    txp_args.cc_method = ch->cc_method;
+    txp_args.cc_data = ch->cc_data;
+    txp_args.now = get_time;
+    txp_args.now_arg = ch;
+    txp_args.get_qlog_cb = ch_get_qlog_cb;
+    txp_args.get_qlog_cb_arg = ch;
+    txp_args.protocol_version = QUIC_VERSION_1;
 
     for (pn_space = QUIC_PN_SPACE_INITIAL; pn_space < QUIC_PN_SPACE_NUM; ++pn_space) {
         ch->crypto_send[pn_space] = ossl_quic_sstream_new(INIT_CRYPTO_SEND_BUF_LEN);
@@ -307,10 +306,10 @@ static int ch_init(QUIC_CHANNEL *ch)
      */
     if (ch->qrx == NULL && ch->is_tserver_ch == 0) {
         /* we are regular client, create channel */
-        qrx_args.libctx             = ch->port->engine->libctx;
-        qrx_args.demux              = ch->port->demux;
-        qrx_args.short_conn_id_len  = rx_short_dcid_len;
-        qrx_args.max_deferred       = 32;
+        qrx_args.libctx = ch->port->engine->libctx;
+        qrx_args.demux = ch->port->demux;
+        qrx_args.short_conn_id_len = rx_short_dcid_len;
+        qrx_args.max_deferred = 32;
 
         if ((ch->qrx = ossl_qrx_new(&qrx_args)) == NULL)
             goto err;
@@ -323,17 +322,16 @@ static int ch_init(QUIC_CHANNEL *ch)
          * in port_default_packet_handler()
          */
         if (!ossl_qrx_set_late_validation_cb(ch->qrx,
-                                             rx_late_validate,
-                                             ch))
+                rx_late_validate,
+                ch))
             goto err;
 
         if (!ossl_qrx_set_key_update_cb(ch->qrx,
-                                        rxku_detected,
-                                        ch))
+                rxku_detected,
+                ch))
             goto err;
     }
 
-
     for (pn_space = QUIC_PN_SPACE_INITIAL; pn_space < QUIC_PN_SPACE_NUM; ++pn_space) {
         ch->crypto_recv[pn_space] = ossl_quic_rstream_new(NULL, NULL, 0);
         if (ch->crypto_recv[pn_space] == NULL)
@@ -341,38 +339,38 @@ static int ch_init(QUIC_CHANNEL *ch)
     }
 
     /* Plug in the TLS handshake layer. */
-    tls_args.s                          = ch->tls;
-    tls_args.crypto_send_cb             = ch_on_crypto_send;
-    tls_args.crypto_send_cb_arg         = ch;
-    tls_args.crypto_recv_rcd_cb         = ch_on_crypto_recv_record;
-    tls_args.crypto_recv_rcd_cb_arg     = ch;
-    tls_args.crypto_release_rcd_cb      = ch_on_crypto_release_record;
-    tls_args.crypto_release_rcd_cb_arg  = ch;
-    tls_args.yield_secret_cb            = ch_on_handshake_yield_secret;
-    tls_args.yield_secret_cb_arg        = ch;
-    tls_args.got_transport_params_cb    = ch_on_transport_params;
-    tls_args.got_transport_params_cb_arg= ch;
-    tls_args.handshake_complete_cb      = ch_on_handshake_complete;
-    tls_args.handshake_complete_cb_arg  = ch;
-    tls_args.alert_cb                   = ch_on_handshake_alert;
-    tls_args.alert_cb_arg               = ch;
-    tls_args.is_server                  = ch->is_server;
-    tls_args.ossl_quic                  = 1;
+    tls_args.s = ch->tls;
+    tls_args.crypto_send_cb = ch_on_crypto_send;
+    tls_args.crypto_send_cb_arg = ch;
+    tls_args.crypto_recv_rcd_cb = ch_on_crypto_recv_record;
+    tls_args.crypto_recv_rcd_cb_arg = ch;
+    tls_args.crypto_release_rcd_cb = ch_on_crypto_release_record;
+    tls_args.crypto_release_rcd_cb_arg = ch;
+    tls_args.yield_secret_cb = ch_on_handshake_yield_secret;
+    tls_args.yield_secret_cb_arg = ch;
+    tls_args.got_transport_params_cb = ch_on_transport_params;
+    tls_args.got_transport_params_cb_arg = ch;
+    tls_args.handshake_complete_cb = ch_on_handshake_complete;
+    tls_args.handshake_complete_cb_arg = ch;
+    tls_args.alert_cb = ch_on_handshake_alert;
+    tls_args.alert_cb_arg = ch;
+    tls_args.is_server = ch->is_server;
+    tls_args.ossl_quic = 1;
 
     if ((ch->qtls = ossl_quic_tls_new(&tls_args)) == NULL)
         goto err;
 
-    ch->tx_max_ack_delay        = DEFAULT_MAX_ACK_DELAY;
-    ch->rx_max_ack_delay        = QUIC_DEFAULT_MAX_ACK_DELAY;
-    ch->rx_ack_delay_exp        = QUIC_DEFAULT_ACK_DELAY_EXP;
+    ch->tx_max_ack_delay = DEFAULT_MAX_ACK_DELAY;
+    ch->rx_max_ack_delay = QUIC_DEFAULT_MAX_ACK_DELAY;
+    ch->rx_ack_delay_exp = QUIC_DEFAULT_ACK_DELAY_EXP;
     ch->rx_active_conn_id_limit = QUIC_MIN_ACTIVE_CONN_ID_LIMIT;
-    ch->tx_enc_level            = QUIC_ENC_LEVEL_INITIAL;
-    ch->rx_enc_level            = QUIC_ENC_LEVEL_INITIAL;
+    ch->tx_enc_level = QUIC_ENC_LEVEL_INITIAL;
+    ch->rx_enc_level = QUIC_ENC_LEVEL_INITIAL;
     ch->txku_threshold_override = UINT64_MAX;
 
-    ch->max_idle_timeout_local_req  = QUIC_DEFAULT_IDLE_TIMEOUT;
+    ch->max_idle_timeout_local_req = QUIC_DEFAULT_IDLE_TIMEOUT;
     ch->max_idle_timeout_remote_req = 0;
-    ch->max_idle_timeout            = ch->max_idle_timeout_local_req;
+    ch->max_idle_timeout = ch->max_idle_timeout_local_req;
 
     ossl_ackm_set_tx_max_ack_delay(ch->ackm, ossl_ms2time(ch->tx_max_ack_delay));
     ossl_ackm_set_rx_max_ack_delay(ch->ackm, ossl_ms2time(ch->rx_max_ack_delay));
@@ -393,8 +391,8 @@ static void ch_cleanup(QUIC_CHANNEL *ch)
 
     if (ch->ackm != NULL)
         for (pn_space = QUIC_PN_SPACE_INITIAL;
-             pn_space < QUIC_PN_SPACE_NUM;
-             ++pn_space)
+            pn_space < QUIC_PN_SPACE_NUM;
+            ++pn_space)
             ossl_ackm_on_pkt_space_discarded(ch->ackm, pn_space);
 
     ossl_quic_lcidm_cull(ch->lcidm, ch);
@@ -452,9 +450,9 @@ void ossl_quic_channel_bind_qrx(QUIC_CHANNEL *tserver_ch, OSSL_QRX *qrx)
     if (tserver_ch->qrx == NULL && tserver_ch->is_tserver_ch == 1) {
         tserver_ch->qrx = qrx;
         ossl_qrx_set_late_validation_cb(tserver_ch->qrx, rx_late_validate,
-                                        tserver_ch);
+            tserver_ch);
         ossl_qrx_set_key_update_cb(tserver_ch->qrx, rxku_detected,
-                                   tserver_ch);
+            tserver_ch);
     }
 }
 
@@ -465,15 +463,15 @@ QUIC_CHANNEL *ossl_quic_channel_alloc(const QUIC_CHANNEL_ARGS *args)
     if ((ch = OPENSSL_zalloc(sizeof(*ch))) == NULL)
         return NULL;
 
-    ch->port           = args->port;
-    ch->is_server      = args->is_server;
-    ch->tls            = args->tls;
-    ch->lcidm          = args->lcidm;
-    ch->srtm           = args->srtm;
-    ch->qrx            = args->qrx;
-    ch->is_tserver_ch  = args->is_tserver_ch;
+    ch->port = args->port;
+    ch->is_server = args->is_server;
+    ch->tls = args->tls;
+    ch->lcidm = args->lcidm;
+    ch->srtm = args->srtm;
+    ch->qrx = args->qrx;
+    ch->is_tserver_ch = args->is_tserver_ch;
 #ifndef OPENSSL_NO_QLOG
-    ch->use_qlog    = args->use_qlog;
+    ch->use_qlog = args->use_qlog;
 
     if (ch->use_qlog && args->qlog_title != NULL) {
         if ((ch->qlog_title = OPENSSL_strdup(args->qlog_title)) == NULL) {
@@ -497,9 +495,9 @@ 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)
 {
     if (ch->qtx == NULL)
         return 0;
@@ -562,8 +560,8 @@ static void free_buf_mem(unsigned char *buf, size_t buf_len, void *arg)
 }
 
 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)
 {
     int rc = 0;
     QUIC_CFQ_ITEM *cfq_item;
@@ -579,7 +577,7 @@ int ossl_quic_channel_schedule_new_token(QUIC_CHANNEL *ch,
         goto err;
 
     if (!ossl_quic_wire_encode_frame_new_token(&wpkt, token,
-                                               token_len)) {
+            token_len)) {
         WPACKET_cleanup(&wpkt);
         goto err;
     }
@@ -590,11 +588,11 @@ int ossl_quic_channel_schedule_new_token(QUIC_CHANNEL *ch,
         goto err;
 
     cfq_item = ossl_quic_cfq_add_frame(ch->cfq, 1,
-                                       QUIC_PN_SPACE_APP,
-                                       OSSL_QUIC_FRAME_TYPE_NEW_TOKEN, 0,
-                                       (unsigned char *)buf_mem->data, l,
-                                       free_buf_mem,
-                                       buf_mem);
+        QUIC_PN_SPACE_APP,
+        OSSL_QUIC_FRAME_TYPE_NEW_TOKEN, 0,
+        (unsigned char *)buf_mem->data, l,
+        free_buf_mem,
+        buf_mem);
     if (cfq_item == NULL)
         goto err;
 
@@ -611,7 +609,7 @@ size_t ossl_quic_channel_get_short_header_conn_id_len(QUIC_CHANNEL *ch)
 }
 
 QUIC_STREAM *ossl_quic_channel_get_stream_by_id(QUIC_CHANNEL *ch,
-                                                uint64_t stream_id)
+    uint64_t stream_id)
 {
     return ossl_quic_stream_map_get_by_id(&ch->qsm, stream_id);
 }
@@ -739,13 +737,13 @@ static void ch_trigger_txku(QUIC_CHANNEL *ch)
     if (!ossl_quic_pn_valid(next_pn)
         || !ossl_qtx_trigger_key_update(ch->qtx)) {
         ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR, 0,
-                                               "key update");
+            "key update");
         return;
     }
 
-    ch->txku_in_progress    = 1;
-    ch->txku_pn             = next_pn;
-    ch->rxku_expected       = ch->ku_locally_initiated;
+    ch->txku_in_progress = 1;
+    ch->txku_pn = next_pn;
+    ch->rxku_expected = ch->ku_locally_initiated;
 }
 
 QUIC_NEEDS_LOCK
@@ -764,9 +762,9 @@ static int txku_in_progress(QUIC_CHANNEL *ch)
          * the ack for a TXKU-triggering packet, not when the TXKU is initiated.
          * So we defer TXKU cooldown deadline calculation to this point.
          */
-        ch->txku_in_progress        = 0;
-        ch->txku_cooldown_deadline  = ossl_time_add(get_time(ch),
-                                                    ossl_time_multiply(pto, 3));
+        ch->txku_in_progress = 0;
+        ch->txku_cooldown_deadline = ossl_time_add(get_time(ch),
+            ossl_time_multiply(pto, 3));
     }
 
     return ch->txku_in_progress;
@@ -887,18 +885,18 @@ static void rxku_detected(QUIC_PN pn, void *arg)
 
     if (decision == DECISION_PROTOCOL_VIOLATION) {
         ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_KEY_UPDATE_ERROR,
-                                               0, "RX key update again too soon");
+            0, "RX key update again too soon");
         return;
     }
 
     pto = ossl_ackm_get_pto_duration(ch->ackm);
 
-    ch->ku_locally_initiated        = 0;
-    ch->rxku_in_progress            = 1;
-    ch->rxku_pending_confirm        = 1;
-    ch->rxku_trigger_pn             = pn;
-    ch->rxku_update_end_deadline    = ossl_time_add(get_time(ch), pto);
-    ch->rxku_expected               = 0;
+    ch->ku_locally_initiated = 0;
+    ch->rxku_in_progress = 1;
+    ch->rxku_pending_confirm = 1;
+    ch->rxku_trigger_pn = pn;
+    ch->rxku_update_end_deadline = ossl_time_add(get_time(ch), pto);
+    ch->rxku_expected = 0;
 
     if (decision == DECISION_SOLICITED_TXKU)
         /* NOT gated by usual txku_allowed() */
@@ -930,17 +928,17 @@ static void ch_rxku_tick(QUIC_CHANNEL *ch)
         || ossl_time_compare(get_time(ch), ch->rxku_update_end_deadline) < 0)
         return;
 
-    ch->rxku_update_end_deadline    = ossl_time_infinite();
-    ch->rxku_in_progress            = 0;
+    ch->rxku_update_end_deadline = ossl_time_infinite();
+    ch->rxku_in_progress = 0;
 
     if (!ossl_qrx_key_update_timeout(ch->qrx, /*normal=*/1))
         ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR, 0,
-                                               "RXKU cooldown internal error");
+            "RXKU cooldown internal error");
 }
 
 QUIC_NEEDS_LOCK
 static void ch_on_txp_ack_tx(const OSSL_QUIC_FRAME_ACK *ack, uint32_t pn_space,
-                             void *arg)
+    void *arg)
 {
     QUIC_CHANNEL *ch = arg;
 
@@ -960,7 +958,7 @@ static void ch_on_txp_ack_tx(const OSSL_QUIC_FRAME_ACK *ack, uint32_t pn_space,
  * ============================================
  */
 static int ch_on_crypto_send(const unsigned char *buf, size_t buf_len,
-                             size_t *consumed, void *arg)
+    size_t *consumed, void *arg)
 {
     int ret;
     QUIC_CHANNEL *ch = arg;
@@ -990,7 +988,7 @@ static int crypto_ensure_empty(QUIC_RSTREAM *rstream)
 }
 
 static int ch_on_crypto_recv_record(const unsigned char **buf,
-                                    size_t *bytes_read, void *arg)
+    size_t *bytes_read, void *arg)
 {
     QUIC_CHANNEL *ch = arg;
     QUIC_RSTREAM *rstream;
@@ -1011,12 +1009,11 @@ static int ch_on_crypto_recv_record(const unsigned char **buf,
      * bytes at a lower EL.
      */
     for (i = QUIC_ENC_LEVEL_INITIAL; i < ch->rx_enc_level; ++i)
-        if (i != QUIC_ENC_LEVEL_0RTT &&
-            !crypto_ensure_empty(ch->crypto_recv[ossl_quic_enc_level_to_pn_space(i)])) {
+        if (i != QUIC_ENC_LEVEL_0RTT && !crypto_ensure_empty(ch->crypto_recv[ossl_quic_enc_level_to_pn_space(i)])) {
             /* Protocol violation (RFC 9001 s. 4.1.3) */
             ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                   OSSL_QUIC_FRAME_TYPE_CRYPTO,
-                                                   "crypto stream data in wrong EL");
+                OSSL_QUIC_FRAME_TYPE_CRYPTO,
+                "crypto stream data in wrong EL");
             return 0;
         }
 
@@ -1025,7 +1022,7 @@ static int ch_on_crypto_recv_record(const unsigned char **buf,
         return 0;
 
     return ossl_quic_rstream_get_record(rstream, buf, bytes_read,
-                                        &is_fin);
+        &is_fin);
 }
 
 static int ch_on_crypto_release_record(size_t bytes_read, void *arg)
@@ -1041,17 +1038,17 @@ static int ch_on_crypto_release_record(size_t bytes_read, void *arg)
 
     ossl_statm_get_rtt_info(ossl_quic_channel_get_statm(ch), &rtt_info);
     if (!ossl_quic_rxfc_on_retire(&ch->crypto_rxfc[rx_pn_space], bytes_read,
-                                  rtt_info.smoothed_rtt))
+            rtt_info.smoothed_rtt))
         return 0;
 
     return ossl_quic_rstream_release_record(rstream, bytes_read);
 }
 
 static int ch_on_handshake_yield_secret(uint32_t prot_level, int direction,
-                                        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)
 {
     QUIC_CHANNEL *ch = arg;
     uint32_t i;
@@ -1079,7 +1076,6 @@ static int ch_on_handshake_yield_secret(uint32_t prot_level, int direction,
         /* Invalid EL. */
         return 0;
 
-
     if (direction) {
         /* TX */
         if (enc_level <= ch->tx_enc_level)
@@ -1090,8 +1086,8 @@ static int ch_on_handshake_yield_secret(uint32_t prot_level, int direction,
             return 0;
 
         if (!ossl_qtx_provide_secret(ch->qtx, enc_level,
-                                     suite_id, md,
-                                     secret, secret_len))
+                suite_id, md,
+                secret, secret_len))
             return 0;
 
         ch->tx_enc_level = enc_level;
@@ -1112,14 +1108,14 @@ static int ch_on_handshake_yield_secret(uint32_t prot_level, int direction,
             if (!crypto_ensure_empty(ch->crypto_recv[ossl_quic_enc_level_to_pn_space(i)])) {
                 /* Protocol violation (RFC 9001 s. 4.1.3) */
                 ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                    OSSL_QUIC_FRAME_TYPE_CRYPTO,
-                                                    "crypto stream data in wrong EL");
+                    OSSL_QUIC_FRAME_TYPE_CRYPTO,
+                    "crypto stream data in wrong EL");
                 return 0;
             }
 
         if (!ossl_qrx_provide_secret(ch->qrx, enc_level,
-                                     suite_id, md,
-                                     secret, secret_len))
+                suite_id, md,
+                secret, secret_len))
             return 0;
 
         ch->have_new_rx_secret = 1;
@@ -1152,8 +1148,8 @@ static int ch_on_handshake_complete(void *arg)
          * params.
          */
         ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_CRYPTO_MISSING_EXT,
-                                               OSSL_QUIC_FRAME_TYPE_CRYPTO,
-                                               "no transport parameters received");
+            OSSL_QUIC_FRAME_TYPE_CRYPTO,
+            "no transport parameters received");
         return 0;
     }
 
@@ -1179,8 +1175,8 @@ static int ch_on_handshake_complete(void *arg)
          * new token.  As a result, we don't need to handle any errors here
          */
         ossl_quic_channel_schedule_new_token(ch,
-                                             ch->pending_new_token,
-                                             ch->pending_new_token_len);
+            ch->pending_new_token,
+            ch->pending_new_token_len);
         OPENSSL_free(ch->pending_new_token);
         ch->pending_new_token = NULL;
         ch->pending_new_token_len = 0;
@@ -1209,13 +1205,13 @@ static int ch_on_handshake_alert(void *arg, unsigned char alert_code)
      * messages as a connection error of type PROTOCOL_VIOLATION.
      */
     if (alert_code == SSL_AD_UNEXPECTED_MESSAGE
-            && ch->handshake_complete
-            && ossl_quic_tls_is_cert_request(ch->qtls))
+        && ch->handshake_complete
+        && ossl_quic_tls_is_cert_request(ch->qtls))
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                               0,
-                                               "Post-handshake TLS "
-                                               "CertificateRequest received");
+            OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+            0,
+            "Post-handshake TLS "
+            "CertificateRequest received");
     /*
      * RFC 9001 s. 4.6.1: Servers MUST NOT send the early_data extension with a
      * max_early_data_size field set to any value other than 0xffffffff. A
@@ -1224,17 +1220,17 @@ static int ch_on_handshake_alert(void *arg, unsigned char alert_code)
      * PROTOCOL_VIOLATION.
      */
     else if (alert_code == SSL_AD_ILLEGAL_PARAMETER
-             && ch->handshake_complete
-             && ossl_quic_tls_has_bad_max_early_data(ch->qtls))
+        && ch->handshake_complete
+        && ossl_quic_tls_has_bad_max_early_data(ch->qtls))
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                               0,
-                                               "Bad max_early_data received");
+            OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+            0,
+            "Bad max_early_data received");
     else
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN
-                                               + alert_code,
-                                               0, "handshake alert");
+            OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN
+                + alert_code,
+            0, "handshake alert");
 
     return 1;
 }
@@ -1300,8 +1296,8 @@ static uint64_t min_u64_ignore_0(uint64_t a, uint64_t b)
 }
 
 static int ch_on_transport_params(const unsigned char *params,
-                                  size_t params_len,
-                                  void *arg)
+    size_t params_len,
+    void *arg)
 {
     QUIC_CHANNEL *ch = arg;
     PACKET pkt;
@@ -1330,15 +1326,27 @@ static int ch_on_transport_params(const unsigned char *params,
     ossl_unused uint64_t rx_max_idle_timeout = 0;
     ossl_unused const void *stateless_reset_token_p = NULL;
     QUIC_PREFERRED_ADDR pfa;
+    SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ch->tls);
 
-    if (ch->got_remote_transport_params) {
+    /*
+     * When HRR happens the client sends the transport params in the new client
+     * hello again. Reset the transport params here and load them again.
+     */
+    if (ch->is_server && sc->hello_retry_request != SSL_HRR_NONE
+        && ch->got_remote_transport_params) {
+        ch->max_local_streams_bidi = 0;
+        ch->max_local_streams_uni = 0;
+        ch->got_local_transport_params = 0;
+        OPENSSL_free(ch->local_transport_params);
+        ch->local_transport_params = NULL;
+    } else if (ch->got_remote_transport_params) {
         reason = "multiple transport parameter extensions";
         goto malformed;
     }
 
     if (!PACKET_buf_init(&pkt, params, params_len)) {
         ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR, 0,
-                                               "internal error (packet buf init)");
+            "internal error (packet buf init)");
         return 0;
     }
 
@@ -1534,7 +1542,7 @@ static int ch_on_transport_params(const unsigned char *params,
 
             ch->rx_max_ack_delay = v;
             ossl_ackm_set_rx_max_ack_delay(ch->ackm,
-                                           ossl_ms2time(ch->rx_max_ack_delay));
+                ossl_ms2time(ch->rx_max_ack_delay));
 
             got_max_ack_delay = 1;
             break;
@@ -1590,8 +1598,7 @@ static int ch_on_transport_params(const unsigned char *params,
             ch->max_idle_timeout_remote_req = v;
 
             ch->max_idle_timeout = min_u64_ignore_0(ch->max_idle_timeout_local_req,
-                                                    ch->max_idle_timeout_remote_req);
-
+                ch->max_idle_timeout_remote_req);
 
             ch_update_idle(ch);
             got_max_idle_timeout = 1;
@@ -1612,7 +1619,7 @@ static int ch_on_transport_params(const unsigned char *params,
             }
 
             ch->rx_max_udp_payload_size = v;
-            got_max_udp_payload_size    = 1;
+            got_max_udp_payload_size = 1;
             break;
 
         case QUIC_TPARAM_ACTIVE_CONN_ID_LIMIT:
@@ -1653,13 +1660,13 @@ static int ch_on_transport_params(const unsigned char *params,
                 goto malformed;
             }
             if (!ossl_quic_srtm_add(ch->srtm, ch, ch->cur_remote_seq_num,
-                                    (const QUIC_STATELESS_RESET_TOKEN *)body)) {
+                    (const QUIC_STATELESS_RESET_TOKEN *)body)) {
                 reason = TP_REASON_INTERNAL_ERROR("STATELESS_RESET_TOKEN");
                 goto malformed;
             }
 
-            stateless_reset_token_p     = body;
-            got_stateless_reset_token   = 1;
+            stateless_reset_token_p = body;
+            got_stateless_reset_token = 1;
             break;
 
         case QUIC_TPARAM_PREFERRED_ADDR:
@@ -1728,7 +1735,7 @@ static int ch_on_transport_params(const unsigned char *params,
              * maintaining a list of duplicates for anything we don't recognise.
              */
             body = ossl_quic_wire_decode_transport_param_bytes(&pkt, &id,
-                                                               &len);
+                &len);
             if (body == NULL)
                 goto malformed;
 
@@ -1757,60 +1764,60 @@ static int ch_on_transport_params(const unsigned char *params,
 
 #ifndef OPENSSL_NO_QLOG
     QLOG_EVENT_BEGIN(ch_get_qlog(ch), transport, parameters_set)
-        QLOG_STR("owner", "remote");
-
-        if (got_orig_dcid)
-            QLOG_CID("original_destination_connection_id",
-                     &ch->init_dcid);
-        if (got_initial_scid)
-            QLOG_CID("original_source_connection_id",
-                     &ch->init_dcid);
-        if (got_retry_scid)
-            QLOG_CID("retry_source_connection_id",
-                     &ch->retry_scid);
-        if (got_initial_max_data)
-            QLOG_U64("initial_max_data",
-                     ossl_quic_txfc_get_cwm(&ch->conn_txfc));
-        if (got_initial_max_stream_data_bidi_local)
-            QLOG_U64("initial_max_stream_data_bidi_local",
-                     ch->rx_init_max_stream_data_bidi_local);
-        if (got_initial_max_stream_data_bidi_remote)
-            QLOG_U64("initial_max_stream_data_bidi_remote",
-                     ch->rx_init_max_stream_data_bidi_remote);
-        if (got_initial_max_stream_data_uni)
-            QLOG_U64("initial_max_stream_data_uni",
-                     ch->rx_init_max_stream_data_uni);
-        if (got_initial_max_streams_bidi)
-            QLOG_U64("initial_max_streams_bidi",
-                     ch->max_local_streams_bidi);
-        if (got_initial_max_streams_uni)
-            QLOG_U64("initial_max_streams_uni",
-                     ch->max_local_streams_uni);
-        if (got_ack_delay_exp)
-            QLOG_U64("ack_delay_exponent", ch->rx_ack_delay_exp);
-        if (got_max_ack_delay)
-            QLOG_U64("max_ack_delay", ch->rx_max_ack_delay);
-        if (got_max_udp_payload_size)
-            QLOG_U64("max_udp_payload_size", ch->rx_max_udp_payload_size);
-        if (got_max_idle_timeout)
-            QLOG_U64("max_idle_timeout", rx_max_idle_timeout);
-        if (got_active_conn_id_limit)
-            QLOG_U64("active_connection_id_limit", ch->rx_active_conn_id_limit);
-        if (got_stateless_reset_token)
-            QLOG_BIN("stateless_reset_token", stateless_reset_token_p,
-                     QUIC_STATELESS_RESET_TOKEN_LEN);
-        if (got_preferred_addr) {
-            QLOG_BEGIN("preferred_addr")
-                QLOG_U64("port_v4", pfa.ipv4_port);
-                QLOG_U64("port_v6", pfa.ipv6_port);
-                QLOG_BIN("ip_v4", pfa.ipv4, sizeof(pfa.ipv4));
-                QLOG_BIN("ip_v6", pfa.ipv6, sizeof(pfa.ipv6));
-                QLOG_BIN("stateless_reset_token", pfa.stateless_reset.token,
-                         sizeof(pfa.stateless_reset.token));
-                QLOG_CID("connection_id", &pfa.cid);
-            QLOG_END()
-        }
-        QLOG_BOOL("disable_active_migration", got_disable_active_migration);
+    QLOG_STR("owner", "remote");
+
+    if (got_orig_dcid)
+        QLOG_CID("original_destination_connection_id",
+            &ch->init_dcid);
+    if (got_initial_scid)
+        QLOG_CID("original_source_connection_id",
+            &ch->init_dcid);
+    if (got_retry_scid)
+        QLOG_CID("retry_source_connection_id",
+            &ch->retry_scid);
+    if (got_initial_max_data)
+        QLOG_U64("initial_max_data",
+            ossl_quic_txfc_get_cwm(&ch->conn_txfc));
+    if (got_initial_max_stream_data_bidi_local)
+        QLOG_U64("initial_max_stream_data_bidi_local",
+            ch->rx_init_max_stream_data_bidi_local);
+    if (got_initial_max_stream_data_bidi_remote)
+        QLOG_U64("initial_max_stream_data_bidi_remote",
+            ch->rx_init_max_stream_data_bidi_remote);
+    if (got_initial_max_stream_data_uni)
+        QLOG_U64("initial_max_stream_data_uni",
+            ch->rx_init_max_stream_data_uni);
+    if (got_initial_max_streams_bidi)
+        QLOG_U64("initial_max_streams_bidi",
+            ch->max_local_streams_bidi);
+    if (got_initial_max_streams_uni)
+        QLOG_U64("initial_max_streams_uni",
+            ch->max_local_streams_uni);
+    if (got_ack_delay_exp)
+        QLOG_U64("ack_delay_exponent", ch->rx_ack_delay_exp);
+    if (got_max_ack_delay)
+        QLOG_U64("max_ack_delay", ch->rx_max_ack_delay);
+    if (got_max_udp_payload_size)
+        QLOG_U64("max_udp_payload_size", ch->rx_max_udp_payload_size);
+    if (got_max_idle_timeout)
+        QLOG_U64("max_idle_timeout", rx_max_idle_timeout);
+    if (got_active_conn_id_limit)
+        QLOG_U64("active_connection_id_limit", ch->rx_active_conn_id_limit);
+    if (got_stateless_reset_token)
+        QLOG_BIN("stateless_reset_token", stateless_reset_token_p,
+            QUIC_STATELESS_RESET_TOKEN_LEN);
+    if (got_preferred_addr) {
+        QLOG_BEGIN("preferred_addr")
+        QLOG_U64("port_v4", pfa.ipv4_port);
+        QLOG_U64("port_v6", pfa.ipv6_port);
+        QLOG_BIN("ip_v4", pfa.ipv4, sizeof(pfa.ipv4));
+        QLOG_BIN("ip_v6", pfa.ipv6, sizeof(pfa.ipv6));
+        QLOG_BIN("stateless_reset_token", pfa.stateless_reset.token,
+            sizeof(pfa.stateless_reset.token));
+        QLOG_CID("connection_id", &pfa.cid);
+        QLOG_END()
+    }
+    QLOG_BOOL("disable_active_migration", got_disable_active_migration);
     QLOG_EVENT_END()
 #endif
 
@@ -1825,7 +1832,7 @@ static int ch_on_transport_params(const unsigned char *params,
     /* If we are a server, we now generate our own transport parameters. */
     if (ch->is_server && !ch_generate_transport_params(ch)) {
         ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR, 0,
-                                               "internal error");
+            "internal error");
         return 0;
     }
 
@@ -1833,7 +1840,7 @@ static int ch_on_transport_params(const unsigned char *params,
 
 malformed:
     ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR,
-                                           0, reason);
+        0, reason);
     return 0;
 }
 
@@ -1877,68 +1884,69 @@ static int ch_generate_transport_params(QUIC_CHANNEL *ch)
     wpkt_valid = 1;
 
     if (ossl_quic_wire_encode_transport_param_bytes(&wpkt, QUIC_TPARAM_DISABLE_ACTIVE_MIGRATION,
-                                                    NULL, 0) == NULL)
+            NULL, 0)
+        == NULL)
         goto err;
 
     if (ch->is_server) {
         if (!ossl_quic_wire_encode_transport_param_cid(&wpkt, QUIC_TPARAM_ORIG_DCID,
-                                                       id_to_use))
+                id_to_use))
             goto err;
 
         if (!ossl_quic_wire_encode_transport_param_cid(&wpkt, QUIC_TPARAM_INITIAL_SCID,
-                                                       &ch->cur_local_cid))
+                &ch->cur_local_cid))
             goto err;
         if (ch->odcid.id_len != 0)
             if (!ossl_quic_wire_encode_transport_param_cid(&wpkt,
-                                                           QUIC_TPARAM_RETRY_SCID,
-                                                           &ch->init_dcid))
+                    QUIC_TPARAM_RETRY_SCID,
+                    &ch->init_dcid))
                 goto err;
     } else {
         if (!ossl_quic_wire_encode_transport_param_cid(&wpkt, QUIC_TPARAM_INITIAL_SCID,
-                                                       &ch->init_scid))
+                &ch->init_scid))
             goto err;
     }
 
     if (!ossl_quic_wire_encode_transport_param_int(&wpkt, QUIC_TPARAM_MAX_IDLE_TIMEOUT,
-                                                   ch->max_idle_timeout_local_req))
+            ch->max_idle_timeout_local_req))
         goto err;
 
     if (!ossl_quic_wire_encode_transport_param_int(&wpkt, QUIC_TPARAM_MAX_UDP_PAYLOAD_SIZE,
-                                                   QUIC_MIN_INITIAL_DGRAM_LEN))
+            QUIC_MIN_INITIAL_DGRAM_LEN))
         goto err;
 
     if (!ossl_quic_wire_encode_transport_param_int(&wpkt, QUIC_TPARAM_ACTIVE_CONN_ID_LIMIT,
-                                                   QUIC_MIN_ACTIVE_CONN_ID_LIMIT))
+            QUIC_MIN_ACTIVE_CONN_ID_LIMIT))
         goto err;
 
     if (ch->tx_max_ack_delay != QUIC_DEFAULT_MAX_ACK_DELAY
         && !ossl_quic_wire_encode_transport_param_int(&wpkt, QUIC_TPARAM_MAX_ACK_DELAY,
-                                                      ch->tx_max_ack_delay))
+            ch->tx_max_ack_delay))
         goto err;
 
     if (!ossl_quic_wire_encode_transport_param_int(&wpkt, QUIC_TPARAM_INITIAL_MAX_DATA,
-                                                   ossl_quic_rxfc_get_cwm(&ch->conn_rxfc)))
+            ossl_quic_rxfc_get_cwm(&ch->conn_rxfc)))
         goto err;
 
     /* Send the default CWM for a new RXFC. */
     if (!ossl_quic_wire_encode_transport_param_int(&wpkt, QUIC_TPARAM_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL,
-                                                   ch->tx_init_max_stream_data_bidi_local))
+            ch->tx_init_max_stream_data_bidi_local))
         goto err;
 
     if (!ossl_quic_wire_encode_transport_param_int(&wpkt, QUIC_TPARAM_INITIAL_MAX_STREAM_DATA_BIDI_REMOTE,
-                                                   ch->tx_init_max_stream_data_bidi_remote))
+            ch->tx_init_max_stream_data_bidi_remote))
         goto err;
 
     if (!ossl_quic_wire_encode_transport_param_int(&wpkt, QUIC_TPARAM_INITIAL_MAX_STREAM_DATA_UNI,
-                                                   ch->tx_init_max_stream_data_uni))
+            ch->tx_init_max_stream_data_uni))
         goto err;
 
     if (!ossl_quic_wire_encode_transport_param_int(&wpkt, QUIC_TPARAM_INITIAL_MAX_STREAMS_BIDI,
-                                                   ossl_quic_rxfc_get_cwm(&ch->max_streams_bidi_rxfc)))
+            ossl_quic_rxfc_get_cwm(&ch->max_streams_bidi_rxfc)))
         goto err;
 
     if (!ossl_quic_wire_encode_transport_param_int(&wpkt, QUIC_TPARAM_INITIAL_MAX_STREAMS_UNI,
-                                                   ossl_quic_rxfc_get_cwm(&ch->max_streams_uni_rxfc)))
+            ossl_quic_rxfc_get_cwm(&ch->max_streams_uni_rxfc)))
         goto err;
 
     if (!WPACKET_finish(&wpkt))
@@ -1953,34 +1961,34 @@ static int ch_generate_transport_params(QUIC_CHANNEL *ch)
     buf_mem->data = NULL;
 
     if (!ossl_quic_tls_set_transport_params(ch->qtls, ch->local_transport_params,
-                                            buf_len))
+            buf_len))
         goto err;
 
 #ifndef OPENSSL_NO_QLOG
     QLOG_EVENT_BEGIN(ch_get_qlog(ch), transport, parameters_set)
-        QLOG_STR("owner", "local");
-        QLOG_BOOL("disable_active_migration", 1);
-        if (ch->is_server) {
-            QLOG_CID("original_destination_connection_id", &ch->init_dcid);
-            QLOG_CID("initial_source_connection_id", &ch->cur_local_cid);
-        } else {
-            QLOG_STR("initial_source_connection_id", "");
-        }
-        QLOG_U64("max_idle_timeout", ch->max_idle_timeout);
-        QLOG_U64("max_udp_payload_size", QUIC_MIN_INITIAL_DGRAM_LEN);
-        QLOG_U64("active_connection_id_limit", QUIC_MIN_ACTIVE_CONN_ID_LIMIT);
-        QLOG_U64("max_ack_delay", ch->tx_max_ack_delay);
-        QLOG_U64("initial_max_data", ossl_quic_rxfc_get_cwm(&ch->conn_rxfc));
-        QLOG_U64("initial_max_stream_data_bidi_local",
-                 ch->tx_init_max_stream_data_bidi_local);
-        QLOG_U64("initial_max_stream_data_bidi_remote",
-                 ch->tx_init_max_stream_data_bidi_remote);
-        QLOG_U64("initial_max_stream_data_uni",
-                 ch->tx_init_max_stream_data_uni);
-        QLOG_U64("initial_max_streams_bidi",
-                 ossl_quic_rxfc_get_cwm(&ch->max_streams_bidi_rxfc));
-        QLOG_U64("initial_max_streams_uni",
-                 ossl_quic_rxfc_get_cwm(&ch->max_streams_uni_rxfc));
+    QLOG_STR("owner", "local");
+    QLOG_BOOL("disable_active_migration", 1);
+    if (ch->is_server) {
+        QLOG_CID("original_destination_connection_id", &ch->init_dcid);
+        QLOG_CID("initial_source_connection_id", &ch->cur_local_cid);
+    } else {
+        QLOG_STR("initial_source_connection_id", "");
+    }
+    QLOG_U64("max_idle_timeout", ch->max_idle_timeout);
+    QLOG_U64("max_udp_payload_size", QUIC_MIN_INITIAL_DGRAM_LEN);
+    QLOG_U64("active_connection_id_limit", QUIC_MIN_ACTIVE_CONN_ID_LIMIT);
+    QLOG_U64("max_ack_delay", ch->tx_max_ack_delay);
+    QLOG_U64("initial_max_data", ossl_quic_rxfc_get_cwm(&ch->conn_rxfc));
+    QLOG_U64("initial_max_stream_data_bidi_local",
+        ch->tx_init_max_stream_data_bidi_local);
+    QLOG_U64("initial_max_stream_data_bidi_remote",
+        ch->tx_init_max_stream_data_bidi_remote);
+    QLOG_U64("initial_max_stream_data_uni",
+        ch->tx_init_max_stream_data_uni);
+    QLOG_U64("initial_max_streams_bidi",
+        ossl_quic_rxfc_get_cwm(&ch->max_streams_bidi_rxfc));
+    QLOG_U64("initial_max_streams_uni",
+        ossl_quic_rxfc_get_cwm(&ch->max_streams_uni_rxfc));
     QLOG_EVENT_END()
 #endif
 
@@ -2005,7 +2013,7 @@ static int ch_generate_transport_params(QUIC_CHANNEL *ch)
  * "loudly".
  */
 void ossl_quic_channel_subtick(QUIC_CHANNEL *ch, QUIC_TICK_RESULT *res,
-                               uint32_t flags)
+    uint32_t flags)
 {
     OSSL_TIME now, deadline;
     int channel_only = (flags & QUIC_REACTOR_TICK_FLAG_CHANNEL_ONLY) != 0;
@@ -2027,11 +2035,11 @@ void ossl_quic_channel_subtick(QUIC_CHANNEL *ch, QUIC_TICK_RESULT *res,
      * there is nothing to do.
      */
     if (ch->state == QUIC_CHANNEL_STATE_IDLE
-            || ossl_quic_channel_is_terminated(ch)) {
-        res->net_read_desired       = 0;
-        res->net_write_desired      = 0;
-        res->notify_other_threads   = 0;
-        res->tick_deadline          = ossl_time_infinite();
+        || ossl_quic_channel_is_terminated(ch)) {
+        res->net_read_desired = 0;
+        res->net_write_desired = 0;
+        res->notify_other_threads = 0;
+        res->tick_deadline = ossl_time_infinite();
         return;
     }
 
@@ -2044,10 +2052,10 @@ void ossl_quic_channel_subtick(QUIC_CHANNEL *ch, QUIC_TICK_RESULT *res,
 
         if (ossl_time_compare(now, ch->terminate_deadline) >= 0) {
             ch_on_terminating_timeout(ch);
-            res->net_read_desired       = 0;
-            res->net_write_desired      = 0;
-            res->notify_other_threads   = 1;
-            res->tick_deadline          = ossl_time_infinite();
+            res->net_read_desired = 0;
+            res->net_write_desired = 0;
+            res->notify_other_threads = 1;
+            res->tick_deadline = ossl_time_infinite();
             return; /* abort normal processing, nothing to do */
         }
     }
@@ -2058,8 +2066,8 @@ void ossl_quic_channel_subtick(QUIC_CHANNEL *ch, QUIC_TICK_RESULT *res,
 
         do {
             /* Process queued incoming packets. */
-            ch->did_tls_tick        = 0;
-            ch->have_new_rx_secret  = 0;
+            ch->did_tls_tick = 0;
+            ch->have_new_rx_secret = 0;
             ch_rx(ch, channel_only, &notify_other_threads);
 
             /*
@@ -2095,10 +2103,10 @@ void ossl_quic_channel_subtick(QUIC_CHANNEL *ch, QUIC_TICK_RESULT *res,
         if (!ch->port->engine->inhibit_tick)
             ch_on_idle_timeout(ch);
 
-        res->net_read_desired       = 0;
-        res->net_write_desired      = 0;
-        res->notify_other_threads   = 1;
-        res->tick_deadline          = ossl_time_infinite();
+        res->net_read_desired = 0;
+        res->net_write_desired = 0;
+        res->notify_other_threads = 1;
+        res->tick_deadline = ossl_time_infinite();
         return;
     }
 
@@ -2144,7 +2152,7 @@ void ossl_quic_channel_subtick(QUIC_CHANNEL *ch, QUIC_TICK_RESULT *res,
     /* We want to write to the network if we have any data in our TX queue. */
     res->net_write_desired
         = (!ossl_quic_channel_is_terminated(ch)
-           && ossl_qtx_get_queue_len_datagrams(ch->qtx) > 0);
+            && ossl_qtx_get_queue_len_datagrams(ch->qtx) > 0);
 
     res->notify_other_threads = notify_other_threads;
 }
@@ -2162,9 +2170,9 @@ static int ch_tick_tls(QUIC_CHANNEL *ch, int channel_only, int *notify_other_thr
     ossl_quic_tls_tick(ch->qtls);
 
     if (ossl_quic_tls_get_error(ch->qtls, &error_code, &error_msg,
-                                &error_state)) {
+            &error_state)) {
         ossl_quic_channel_raise_protocol_error_state(ch, error_code, 0,
-                                                     error_msg, error_state);
+            error_msg, error_state);
         if (notify_other_threads != NULL)
             *notify_other_threads = 1;
 
@@ -2181,9 +2189,8 @@ static void ch_rx_check_forged_pkt_limit(QUIC_CHANNEL *ch)
     uint64_t limit = UINT64_MAX, l;
 
     for (enc_level = QUIC_ENC_LEVEL_INITIAL;
-         enc_level < QUIC_ENC_LEVEL_NUM;
-         ++enc_level)
-    {
+        enc_level < QUIC_ENC_LEVEL_NUM;
+        ++enc_level) {
         /*
          * Different ELs can have different AEADs which can in turn impose
          * different limits, so use the lowest value of any currently valid EL.
@@ -2203,7 +2210,7 @@ static void ch_rx_check_forged_pkt_limit(QUIC_CHANNEL *ch)
         return;
 
     ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_AEAD_LIMIT_REACHED, 0,
-                                           "forgery limit");
+        "forgery limit");
 }
 
 /* Process queued incoming packets and handle frames, if any. */
@@ -2228,7 +2235,7 @@ static int ch_rx(QUIC_CHANNEL *ch, int channel_only, int *notify_other_threads)
         /* Track the amount of data received while in the closing state */
         if (closing)
             ossl_quic_tx_packetiser_record_received_closing_bytes(
-                    ch->txp, ch->qrx_pkt->hdr->len);
+                ch->txp, ch->qrx_pkt->hdr->len);
 
         if (!handled_any) {
             ch_update_idle(ch);
@@ -2270,20 +2277,20 @@ static int bio_addr_eq(const BIO_ADDR *a, const BIO_ADDR *b)
         return 0;
 
     switch (BIO_ADDR_family(a)) {
-        case AF_INET:
-            return !memcmp(&a->s_in.sin_addr,
-                           &b->s_in.sin_addr,
-                           sizeof(a->s_in.sin_addr))
-                && a->s_in.sin_port == b->s_in.sin_port;
+    case AF_INET:
+        return !memcmp(&a->s_in.sin_addr,
+                   &b->s_in.sin_addr,
+                   sizeof(a->s_in.sin_addr))
+            && a->s_in.sin_port == b->s_in.sin_port;
 #if OPENSSL_USE_IPV6
-        case AF_INET6:
-            return !memcmp(&a->s_in6.sin6_addr,
-                           &b->s_in6.sin6_addr,
-                           sizeof(a->s_in6.sin6_addr))
-                && a->s_in6.sin6_port == b->s_in6.sin6_port;
+    case AF_INET6:
+        return !memcmp(&a->s_in6.sin6_addr,
+                   &b->s_in6.sin6_addr,
+                   sizeof(a->s_in6.sin6_addr))
+            && a->s_in6.sin6_port == b->s_in6.sin6_port;
 #endif
-        default:
-            return 0; /* not supported */
+    default:
+        return 0; /* not supported */
     }
 
     return 1;
@@ -2338,12 +2345,11 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only)
      */
     if (!ch->is_server
         && ch->qrx_pkt->peer != NULL
-        && (
-               BIO_ADDR_family(&ch->cur_peer_addr) == AF_INET
+        && (BIO_ADDR_family(&ch->cur_peer_addr) == AF_INET
 #if OPENSSL_USE_IPV6
             || BIO_ADDR_family(&ch->cur_peer_addr) == AF_INET6
 #endif
-        )
+            )
         && !bio_addr_eq(ch->qrx_pkt->peer, &ch->cur_peer_addr))
         return;
 
@@ -2356,7 +2362,7 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only)
          * that connection with a different SCID."
          */
         if (!ossl_quic_conn_id_eq(&ch->qrx_pkt->hdr->src_conn_id,
-                                  &ch->init_scid))
+                &ch->init_scid))
             return;
     }
 
@@ -2411,18 +2417,17 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only)
          * version
          */
         if (!PACKET_buf_init(&vpkt, ch->qrx_pkt->hdr->data,
-                             ch->qrx_pkt->hdr->len))
+                ch->qrx_pkt->hdr->len))
             return;
 
         while (PACKET_remaining(&vpkt) > 0) {
             /*
              * We only support quic version 1 at the moment, so
-             * look to see if thats offered
+             * look to see if that's offered
              */
             if (!PACKET_get_net_4(&vpkt, &supported_ver))
                 return;
 
-            supported_ver = ntohl(supported_ver);
             if (supported_ver == QUIC_VERSION_1) {
                 /*
                  * If the server supports version 1, set it as
@@ -2431,12 +2436,12 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only)
                 ossl_quic_tx_packetiser_set_protocol_version(ch->txp, QUIC_VERSION_1);
 
                 /*
-                 * And then request a restart of the QUIC connection 
+                 * And then request a restart of the QUIC connection
                  */
                 if (!ch_restart(ch))
                     ossl_quic_channel_raise_protocol_error(ch,
-                                                           OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                                           0, "handling ver negotiation packet");
+                        OSSL_QUIC_ERR_INTERNAL_ERROR,
+                        0, "handling ver negotiation packet");
                 return;
             }
         }
@@ -2446,7 +2451,7 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only)
          * protocol that we can handle, abandon the connection
          */
         ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_CONNECTION_REFUSED,
-                                               0, "unsupported protocol version");
+            0, "unsupported protocol version");
         return;
     }
 
@@ -2460,15 +2465,15 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only)
     if (ossl_quic_pkt_type_is_encrypted(ch->qrx_pkt->hdr->type)
         && ch->qrx_pkt->hdr->reserved != 0) {
         ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                               0, "packet header reserved bits");
+            0, "packet header reserved bits");
         return;
     }
 
-    iovec.buf       = ch->qrx_pkt->hdr->data;
-    iovec.buf_len   = ch->qrx_pkt->hdr->len;
+    iovec.buf = ch->qrx_pkt->hdr->data;
+    iovec.buf_len = ch->qrx_pkt->hdr->len;
     ossl_qlog_event_transport_packet_received(ch_get_qlog(ch), ch->qrx_pkt->hdr,
-                                              ch->qrx_pkt->pn, &iovec, 1,
-                                              ch->qrx_pkt->datagram_id);
+        ch->qrx_pkt->pn, &iovec, 1,
+        ch->qrx_pkt->datagram_id);
 
     /* Handle incoming packet. */
     switch (ch->qrx_pkt->hdr->type) {
@@ -2502,17 +2507,17 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only)
          * upper layers. However, special casing this will do for now.
          */
         if (!ossl_quic_validate_retry_integrity_tag(ch->port->engine->libctx,
-                                                    ch->port->engine->propq,
-                                                    ch->qrx_pkt->hdr,
-                                                    &ch->init_dcid))
+                ch->port->engine->propq,
+                ch->qrx_pkt->hdr,
+                &ch->init_dcid))
             /* Malformed retry packet, ignore. */
             return;
 
         if (!ch_retry(ch, ch->qrx_pkt->hdr->data,
-                      ch->qrx_pkt->hdr->len - QUIC_RETRY_INTEGRITY_TAG_LEN,
-                      &ch->qrx_pkt->hdr->src_conn_id, old_have_processed_any_pkt))
+                ch->qrx_pkt->hdr->len - QUIC_RETRY_INTEGRITY_TAG_LEN,
+                &ch->qrx_pkt->hdr->src_conn_id, old_have_processed_any_pkt))
             ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                                   0, "handling retry packet");
+                0, "handling retry packet");
         break;
 
     case QUIC_PKT_TYPE_0RTT:
@@ -2550,7 +2555,7 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only)
              * as a connection error of type KEY_UPDATE_ERROR.
              */
             ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_KEY_UPDATE_ERROR,
-                                                   0, "new packet with old keys");
+                0, "new packet with old keys");
             break;
         }
 
@@ -2575,7 +2580,7 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only)
              * I.e. should we drop this packet instead of closing the connection?
              */
             ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                   0, "client received initial token");
+                0, "client received initial token");
             break;
         }
 
@@ -2587,62 +2592,10 @@ static void ch_rx_handle_packet(QUIC_CHANNEL *ch, int channel_only)
 
         break;
 
-    case QUIC_PKT_TYPE_VERSION_NEG:
-        /*
-         * "A client MUST discard any Version Negotiation packet if it has
-         * received and successfully processed any other packet."
-         */
-        if (!old_have_processed_any_pkt)
-            ch_rx_handle_version_neg(ch, ch->qrx_pkt);
-
-        break;
-
     default:
         assert(0);
         break;
     }
-
-}
-
-static void ch_rx_handle_version_neg(QUIC_CHANNEL *ch, OSSL_QRX_PKT *pkt)
-{
-    /*
-     * We do not support version negotiation at this time. As per RFC 9000 s.
-     * 6.2., we MUST abandon the connection attempt if we receive a Version
-     * Negotiation packet, unless we have already successfully processed another
-     * incoming packet, or the packet lists the QUIC version we want to use.
-     */
-    PACKET vpkt;
-    unsigned long v;
-
-    if (!PACKET_buf_init(&vpkt, pkt->hdr->data, pkt->hdr->len))
-        return;
-
-    while (PACKET_remaining(&vpkt) > 0) {
-        if (!PACKET_get_net_4(&vpkt, &v))
-            break;
-
-        if ((uint32_t)v == QUIC_VERSION_1)
-            return;
-    }
-
-    /* No match, this is a failure case. */
-    ch_raise_version_neg_failure(ch);
-}
-
-static void ch_raise_version_neg_failure(QUIC_CHANNEL *ch)
-{
-    QUIC_TERMINATE_CAUSE tcause = {0};
-
-    tcause.error_code = OSSL_QUIC_ERR_CONNECTION_REFUSED;
-    tcause.reason     = "version negotiation failure";
-    tcause.reason_len = strlen(tcause.reason);
-
-    /*
-     * Skip TERMINATING state; this is not considered a protocol error and we do
-     * not send CONNECTION_CLOSE.
-     */
-    ch_start_terminating(ch, &tcause, 1);
 }
 
 /* Try to generate packets and if possible, flush them to the network. */
@@ -2686,33 +2639,33 @@ static int ch_tx(QUIC_CHANNEL *ch, int *notify_other_threads)
     /* Loop until we stop generating packets to send */
     do {
         /*
-        * Send packet, if we need to. Best effort. The TXP consults the CC and
-        * applies any limitations imposed by it, so we don't need to do it here.
-        *
-        * Best effort. In particular if TXP fails for some reason we should
-        * still flush any queued packets which we already generated.
-        */
+         * Send packet, if we need to. Best effort. The TXP consults the CC and
+         * applies any limitations imposed by it, so we don't need to do it here.
+         *
+         * Best effort. In particular if TXP fails for some reason we should
+         * still flush any queued packets which we already generated.
+         */
         res = ossl_quic_tx_packetiser_generate(ch->txp, &status);
         if (status.sent_pkt > 0) {
             ch->have_sent_any_pkt = 1; /* Packet(s) were sent */
             ch->port->have_sent_any_pkt = 1;
 
             /*
-            * RFC 9000 s. 10.1. 'An endpoint also restarts its idle timer when
-            * sending an ack-eliciting packet if no other ack-eliciting packets
-            * have been sent since last receiving and processing a packet.'
-            */
+             * RFC 9000 s. 10.1. 'An endpoint also restarts its idle timer when
+             * sending an ack-eliciting packet if no other ack-eliciting packets
+             * have been sent since last receiving and processing a packet.'
+             */
             if (status.sent_ack_eliciting
-                    && !ch->have_sent_ack_eliciting_since_rx) {
+                && !ch->have_sent_ack_eliciting_since_rx) {
                 ch_update_idle(ch);
                 ch->have_sent_ack_eliciting_since_rx = 1;
             }
 
             if (!ch->is_server && status.sent_handshake)
                 /*
-                * RFC 9001 s. 4.9.1: A client MUST discard Initial keys when it
-                * first sends a Handshake packet.
-                */
+                 * RFC 9001 s. 4.9.1: A client MUST discard Initial keys when it
+                 * first sends a Handshake packet.
+                 */
                 ch_discard_el(ch, QUIC_ENC_LEVEL_INITIAL);
 
             if (ch->rxku_pending_confirm_done)
@@ -2723,20 +2676,20 @@ static int ch_tx(QUIC_CHANNEL *ch, int *notify_other_threads)
 
         if (!res) {
             /*
-            * One case where TXP can fail is if we reach a TX PN of 2**62 - 1.
-            * As per RFC 9000 s. 12.3, if this happens we MUST close the
-            * connection without sending a CONNECTION_CLOSE frame. This is
-            * actually handled as an emergent consequence of our design, as the
-            * TX packetiser will never transmit another packet when the TX PN
-            * reaches the limit.
-            *
-            * Calling the below function terminates the connection; its attempt
-            * to schedule a CONNECTION_CLOSE frame will not actually cause a
-            * packet to be transmitted for this reason.
-            */
+             * One case where TXP can fail is if we reach a TX PN of 2**62 - 1.
+             * As per RFC 9000 s. 12.3, if this happens we MUST close the
+             * connection without sending a CONNECTION_CLOSE frame. This is
+             * actually handled as an emergent consequence of our design, as the
+             * TX packetiser will never transmit another packet when the TX PN
+             * reaches the limit.
+             *
+             * Calling the below function terminates the connection; its attempt
+             * to schedule a CONNECTION_CLOSE frame will not actually cause a
+             * packet to be transmitted for this reason.
+             */
             ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                                   0,
-                                                   "internal error (txp generate)");
+                0,
+                "internal error (txp generate)");
             break;
         }
     } while (status.sent_pkt > 0);
@@ -2786,8 +2739,8 @@ static OSSL_TIME ch_determine_next_tick_deadline(QUIC_CHANNEL *ch)
     for (i = 0; i < QUIC_ENC_LEVEL_NUM; i++) {
         if (ossl_qtx_is_enc_level_provisioned(ch->qtx, i)) {
             deadline = ossl_time_min(deadline,
-                                     ossl_ackm_get_ack_deadline(ch->ackm,
-                                                                ossl_quic_enc_level_to_pn_space(i)));
+                ossl_ackm_get_ack_deadline(ch->ackm,
+                    ossl_quic_enc_level_to_pn_space(i)));
         }
     }
 
@@ -2800,15 +2753,15 @@ static OSSL_TIME ch_determine_next_tick_deadline(QUIC_CHANNEL *ch)
 
     /* Apply TXP wakeup deadline. */
     deadline = ossl_time_min(deadline,
-                             ossl_quic_tx_packetiser_get_deadline(ch->txp));
+        ossl_quic_tx_packetiser_get_deadline(ch->txp));
 
     /* Is the terminating timer armed? */
     if (ossl_quic_channel_is_terminating(ch))
         deadline = ossl_time_min(deadline,
-                                 ch->terminate_deadline);
+            ch->terminate_deadline);
     else if (!ossl_time_is_infinite(ch->idle_deadline))
         deadline = ossl_time_min(deadline,
-                                 ch->idle_deadline);
+            ch->idle_deadline);
 
     /* When does the RXKU process complete? */
     if (ch->rxku_in_progress)
@@ -2833,14 +2786,14 @@ static void ch_record_state_transition(QUIC_CHANNEL *ch, uint32_t new_state)
     ch->state = new_state;
 
     ossl_qlog_event_connectivity_connection_state_updated(ch_get_qlog(ch),
-                                                          old_state,
-                                                          new_state,
-                                                          ch->handshake_complete,
-                                                          ch->handshake_confirmed);
+        old_state,
+        new_state,
+        ch->handshake_complete,
+        ch->handshake_confirmed);
 }
 
 static void free_peer_token(const unsigned char *token,
-                            size_t token_len, void *arg)
+    size_t token_len, void *arg)
 {
     ossl_quic_free_peer_token((QUIC_TOKEN *)arg);
 }
@@ -2869,20 +2822,20 @@ int ossl_quic_channel_start(QUIC_CHANNEL *ch)
      */
     if (!ch->is_server
         && ossl_quic_get_peer_token(ch->port->channel_ctx,
-                                    &ch->cur_peer_addr,
-                                    &token)
+            &ch->cur_peer_addr,
+            &token)
         && !ossl_quic_tx_packetiser_set_initial_token(ch->txp, token->token,
-                                                      token->token_len,
-                                                      free_peer_token,
-                                                      token))
+            token->token_len,
+            free_peer_token,
+            token))
         free_peer_token(NULL, 0, token);
 
     /* Plug in secrets for the Initial EL. */
     if (!ossl_quic_provide_initial_secret(ch->port->engine->libctx,
-                                          ch->port->engine->propq,
-                                          &ch->init_dcid,
-                                          ch->is_server,
-                                          ch->qrx, ch->qtx))
+            ch->port->engine->propq,
+            &ch->init_dcid,
+            ch->is_server,
+            ch->qrx, ch->qtx))
         return 0;
 
     /*
@@ -2899,7 +2852,7 @@ int ossl_quic_channel_start(QUIC_CHANNEL *ch)
     ch->doing_proactive_ver_neg = 0; /* not currently supported */
 
     ossl_qlog_event_connectivity_connection_started(ch_get_qlog(ch),
-                                                    &ch->init_dcid);
+        &ch->init_dcid);
 
     /* Handshake layer: start (e.g. send CH). */
     if (!ch_tick_tls(ch, /*channel_only=*/0, NULL))
@@ -2916,17 +2869,17 @@ static void free_token(const unsigned char *token, size_t token_len, void *arg)
 
 /* 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)
 {
-    QUIC_TERMINATE_CAUSE tcause = {0};
+    QUIC_TERMINATE_CAUSE tcause = { 0 };
 
     if (ossl_quic_channel_is_term_any(ch))
         return;
 
-    tcause.app          = 1;
-    tcause.error_code   = app_error_code;
-    tcause.reason       = app_reason;
-    tcause.reason_len   = app_reason != NULL ? strlen(app_reason) : 0;
+    tcause.app = 1;
+    tcause.error_code = app_error_code;
+    tcause.reason = app_reason;
+    tcause.reason_len = app_reason != NULL ? strlen(app_reason) : 0;
     ch_start_terminating(ch, &tcause, 0);
 }
 
@@ -2945,16 +2898,16 @@ static int ch_restart(QUIC_CHANNEL *ch)
      * Just pretend we lost our initial packet, so it gets
      * regenerated, with our updated protocol version number
      */
-   return ossl_ackm_mark_packet_pseudo_lost(ch->ackm, QUIC_PN_SPACE_INITIAL,
-                                            /* PN= */ 0);
+    return ossl_ackm_mark_packet_pseudo_lost(ch->ackm, QUIC_PN_SPACE_INITIAL,
+        /* PN= */ 0);
 }
 
 /* Called when a server asks us to do a retry. */
 static int ch_retry(QUIC_CHANNEL *ch,
-                    const unsigned char *retry_token,
-                    size_t retry_token_len,
-                    const QUIC_CONN_ID *retry_scid,
-                    int drop_later_pn)
+    const unsigned char *retry_token,
+    size_t retry_token_len,
+    const QUIC_CONN_ID *retry_scid,
+    int drop_later_pn)
 {
     void *buf;
     QUIC_PN pn = 0;
@@ -2978,19 +2931,19 @@ static int ch_retry(QUIC_CHANNEL *ch,
         return 0;
 
     if (!ossl_quic_tx_packetiser_set_initial_token(ch->txp, buf,
-                                                   retry_token_len,
-                                                   free_token, NULL)) {
+            retry_token_len,
+            free_token, NULL)) {
         /*
          * This may fail if the token we receive is too big for us to ever be
          * able to transmit in an outgoing Initial packet.
          */
         ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INVALID_TOKEN, 0,
-                                               "received oversize token");
+            "received oversize token");
         OPENSSL_free(buf);
         return 0;
     }
 
-    ch->retry_scid  = *retry_scid;
+    ch->retry_scid = *retry_scid;
     ch->doing_retry = 1;
 
     /*
@@ -3011,7 +2964,7 @@ static int ch_retry(QUIC_CHANNEL *ch,
      * repeated retries.
      */
     if (!ossl_ackm_mark_packet_pseudo_lost(ch->ackm, QUIC_PN_SPACE_INITIAL,
-                                           pn))
+            pn))
         return 0;
 
     /*
@@ -3019,10 +2972,10 @@ static int ch_retry(QUIC_CHANNEL *ch,
      * the secrets for an EL after we already provisioned it.
      */
     if (!ossl_quic_provide_initial_secret(ch->port->engine->libctx,
-                                          ch->port->engine->propq,
-                                          &ch->retry_scid,
-                                          /*is_server=*/0,
-                                          ch->qrx, ch->qtx))
+            ch->port->engine->propq,
+            &ch->retry_scid,
+            /*is_server=*/0,
+            ch->qrx, ch->qtx))
         return 0;
 
     return 1;
@@ -3030,7 +2983,7 @@ static int ch_retry(QUIC_CHANNEL *ch,
 
 /* Called when an EL is to be discarded. */
 static int ch_discard_el(QUIC_CHANNEL *ch,
-                         uint32_t enc_level)
+    uint32_t enc_level)
 {
     if (!ossl_assert(enc_level < QUIC_ENC_LEVEL_1RTT))
         return 0;
@@ -3078,9 +3031,9 @@ int ossl_quic_channel_on_handshake_confirmed(QUIC_CHANNEL *ch)
          * completed.
          */
         ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                               OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE,
-                                               "handshake cannot be confirmed "
-                                               "before it is completed");
+            OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE,
+            "handshake cannot be confirmed "
+            "before it is completed");
         return 0;
     }
 
@@ -3137,14 +3090,14 @@ int ossl_quic_channel_on_handshake_confirmed(QUIC_CHANNEL *ch)
  *      frame in response to any UDP datagram that is received.
  */
 static void copy_tcause(QUIC_TERMINATE_CAUSE *dst,
-                        const QUIC_TERMINATE_CAUSE *src)
+    const QUIC_TERMINATE_CAUSE *src)
 {
     dst->error_code = src->error_code;
     dst->frame_type = src->frame_type;
-    dst->app        = src->app;
-    dst->remote     = src->remote;
+    dst->app = src->app;
+    dst->remote = src->remote;
 
-    dst->reason     = NULL;
+    dst->reason = NULL;
     dst->reason_len = 0;
 
     if (src->reason != NULL && src->reason_len > 0) {
@@ -3162,14 +3115,14 @@ static void copy_tcause(QUIC_TERMINATE_CAUSE *dst,
         if (r == NULL)
             return;
 
-        r[l]  = '\0';
+        r[l] = '\0';
         dst->reason_len = l;
     }
 }
 
 static void ch_start_terminating(QUIC_CHANNEL *ch,
-                                 const QUIC_TERMINATE_CAUSE *tcause,
-                                 int force_immediate)
+    const QUIC_TERMINATE_CAUSE *tcause,
+    int force_immediate)
 {
     /* No point sending anything if we haven't sent anything yet. */
     if (!ch->have_sent_any_pkt)
@@ -3188,9 +3141,7 @@ static void ch_start_terminating(QUIC_CHANNEL *ch,
         ossl_qlog_event_connectivity_connection_closed(ch_get_qlog(ch), tcause);
 
         if (!force_immediate) {
-            ch_record_state_transition(ch, tcause->remote
-                                           ? QUIC_CHANNEL_STATE_TERMINATING_DRAINING
-                                           : QUIC_CHANNEL_STATE_TERMINATING_CLOSING);
+            ch_record_state_transition(ch, tcause->remote ? QUIC_CHANNEL_STATE_TERMINATING_DRAINING : QUIC_CHANNEL_STATE_TERMINATING_CLOSING);
             /*
              * RFC 9000 s. 10.2 Immediate Close
              *  These states SHOULD persist for at least three times
@@ -3198,17 +3149,17 @@ static void ch_start_terminating(QUIC_CHANNEL *ch,
              */
             ch->terminate_deadline
                 = ossl_time_add(get_time(ch),
-                                ossl_time_multiply(ossl_ackm_get_pto_duration(ch->ackm),
-                                                   3));
+                    ossl_time_multiply(ossl_ackm_get_pto_duration(ch->ackm),
+                        3));
 
             if (!tcause->remote) {
-                OSSL_QUIC_FRAME_CONN_CLOSE f = {0};
+                OSSL_QUIC_FRAME_CONN_CLOSE f = { 0 };
 
                 /* best effort */
                 f.error_code = ch->terminate_cause.error_code;
                 f.frame_type = ch->terminate_cause.frame_type;
-                f.is_app     = ch->terminate_cause.app;
-                f.reason     = (char *)ch->terminate_cause.reason;
+                f.is_app = ch->terminate_cause.app;
+                f.reason = (char *)ch->terminate_cause.reason;
                 f.reason_len = ch->terminate_cause.reason_len;
                 ossl_quic_tx_packetiser_schedule_conn_close(ch->txp, &f);
                 /*
@@ -3257,18 +3208,18 @@ static void ch_start_terminating(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)
 {
-    QUIC_TERMINATE_CAUSE tcause = {0};
+    QUIC_TERMINATE_CAUSE tcause = { 0 };
 
     if (!ossl_quic_channel_is_active(ch))
         return;
 
-    tcause.remote     = 1;
-    tcause.app        = f->is_app;
+    tcause.remote = 1;
+    tcause.app = f->is_app;
     tcause.error_code = f->error_code;
     tcause.frame_type = f->frame_type;
-    tcause.reason     = f->reason;
+    tcause.reason = f->reason;
     tcause.reason_len = f->reason_len;
     ch_start_terminating(ch, &tcause, 0);
 }
@@ -3302,9 +3253,10 @@ static int ch_enqueue_retire_conn_id(QUIC_CHANNEL *ch, uint64_t seq_num)
         goto err;
 
     if (ossl_quic_cfq_add_frame(ch->cfq, 1, QUIC_PN_SPACE_APP,
-                                OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID, 0,
-                                (unsigned char *)buf_mem->data, l,
-                                free_frame_data, NULL) == NULL)
+            OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID, 0,
+            (unsigned char *)buf_mem->data, l,
+            free_frame_data, NULL)
+        == NULL)
         goto err;
 
     buf_mem->data = NULL;
@@ -3313,15 +3265,15 @@ static int ch_enqueue_retire_conn_id(QUIC_CHANNEL *ch, uint64_t seq_num)
 
 err:
     ossl_quic_channel_raise_protocol_error(ch,
-                                           OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                           OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
-                                           "internal error enqueueing retire conn id");
+        OSSL_QUIC_ERR_INTERNAL_ERROR,
+        OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
+        "internal error enqueueing retire conn id");
     BUF_MEM_free(buf_mem);
     return 0;
 }
 
 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)
 {
     uint64_t new_remote_seq_num = ch->cur_remote_seq_num;
     uint64_t new_retire_prior_to = ch->cur_retire_prior_to;
@@ -3333,9 +3285,9 @@ void ossl_quic_channel_on_new_conn_id(QUIC_CHANNEL *ch,
     if (ch->cur_remote_dcid.id_len == 0) {
         /* Changing from 0 length connection id is disallowed */
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                               OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
-                                               "zero length connection id in use");
+            OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+            OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
+            "zero length connection id in use");
 
         return;
     }
@@ -3357,9 +3309,9 @@ void ossl_quic_channel_on_new_conn_id(QUIC_CHANNEL *ch,
      */
     if (new_remote_seq_num - new_retire_prior_to > 1) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
-                                               "active_connection_id limit violated");
+            OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR,
+            OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
+            "active_connection_id limit violated");
         return;
     }
 
@@ -3380,9 +3332,9 @@ void ossl_quic_channel_on_new_conn_id(QUIC_CHANNEL *ch,
      */
     if (new_retire_prior_to - ch->cur_retire_prior_to > 10) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
-                                               "retiring connection id limit violated");
+            OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR,
+            OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
+            "retiring connection id limit violated");
 
         return;
     }
@@ -3390,11 +3342,11 @@ void ossl_quic_channel_on_new_conn_id(QUIC_CHANNEL *ch,
     if (new_remote_seq_num > ch->cur_remote_seq_num) {
         /* Add new stateless reset token */
         if (!ossl_quic_srtm_add(ch->srtm, ch, new_remote_seq_num,
-                                &f->stateless_reset)) {
+                &f->stateless_reset)) {
             ossl_quic_channel_raise_protocol_error(
-                    ch, OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR,
-                    OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
-                    "unable to store stateless reset token");
+                ch, OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR,
+                OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
+                "unable to store stateless reset token");
 
             return;
         }
@@ -3453,16 +3405,16 @@ void ossl_quic_channel_inject_pkt(QUIC_CHANNEL *ch, OSSL_QRX_PKT *qpkt)
 
 void ossl_quic_channel_on_stateless_reset(QUIC_CHANNEL *ch)
 {
-    QUIC_TERMINATE_CAUSE tcause = {0};
+    QUIC_TERMINATE_CAUSE tcause = { 0 };
 
-    tcause.error_code   = OSSL_QUIC_ERR_NO_ERROR;
-    tcause.remote       = 1;
+    tcause.error_code = OSSL_QUIC_ERR_NO_ERROR;
+    tcause.remote = 1;
     ch_start_terminating(ch, &tcause, 0);
 }
 
 void ossl_quic_channel_raise_net_error(QUIC_CHANNEL *ch)
 {
-    QUIC_TERMINATE_CAUSE tcause = {0};
+    QUIC_TERMINATE_CAUSE tcause = { 0 };
 
     if (ch->net_error)
         return;
@@ -3470,7 +3422,7 @@ void ossl_quic_channel_raise_net_error(QUIC_CHANNEL *ch)
     ch->net_error = 1;
 
     tcause.error_code = OSSL_QUIC_ERR_INTERNAL_ERROR;
-    tcause.reason     = "network BIO I/O error";
+    tcause.reason = "network BIO I/O error";
     tcause.reason_len = strlen(tcause.reason);
 
     /*
@@ -3497,17 +3449,18 @@ void ossl_quic_channel_restore_err_state(QUIC_CHANNEL *ch)
 }
 
 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)
-{
-    QUIC_TERMINATE_CAUSE tcause = {0};
+    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)
+{
+    QUIC_TERMINATE_CAUSE tcause = { 0 };
     int err_reason = error_code == OSSL_QUIC_ERR_INTERNAL_ERROR
-                     ? ERR_R_INTERNAL_ERROR : SSL_R_QUIC_PROTOCOL_ERROR;
+        ? ERR_R_INTERNAL_ERROR
+        : SSL_R_QUIC_PROTOCOL_ERROR;
     const char *err_str = ossl_quic_err_to_string(error_code);
     const char *err_str_pfx = " (", *err_str_sfx = ")";
     const char *ft_str = NULL;
@@ -3518,7 +3471,7 @@ void ossl_quic_channel_raise_protocol_error_loc(QUIC_CHANNEL *ch,
         return;
 
     if (err_str == NULL) {
-        err_str     = "";
+        err_str = "";
         err_str_pfx = "";
         err_str_sfx = "";
     }
@@ -3533,25 +3486,25 @@ void ossl_quic_channel_raise_protocol_error_loc(QUIC_CHANNEL *ch,
     if (frame_type != 0) {
         ft_str = ossl_quic_frame_type_to_string(frame_type);
         if (ft_str == NULL) {
-            ft_str      = "";
-            ft_str_pfx  = "";
-            ft_str_sfx  = "";
+            ft_str = "";
+            ft_str_pfx = "";
+            ft_str_sfx = "";
         }
 
         ERR_raise_data(ERR_LIB_SSL, err_reason,
-                       "QUIC error code: 0x%llx%s%s%s "
-                       "(triggered by frame type: 0x%llx%s%s%s), reason: \"%s\"",
-                       (unsigned long long) error_code,
-                       err_str_pfx, err_str, err_str_sfx,
-                       (unsigned long long) frame_type,
-                       ft_str_pfx, ft_str, ft_str_sfx,
-                       reason);
+            "QUIC error code: 0x%llx%s%s%s "
+            "(triggered by frame type: 0x%llx%s%s%s), reason: \"%s\"",
+            (unsigned long long)error_code,
+            err_str_pfx, err_str, err_str_sfx,
+            (unsigned long long)frame_type,
+            ft_str_pfx, ft_str, ft_str_sfx,
+            reason);
     } else {
         ERR_raise_data(ERR_LIB_SSL, err_reason,
-                       "QUIC error code: 0x%llx%s%s%s, reason: \"%s\"",
-                       (unsigned long long) error_code,
-                       err_str_pfx, err_str, err_str_sfx,
-                       reason);
+            "QUIC error code: 0x%llx%s%s%s, reason: \"%s\"",
+            (unsigned long long)error_code,
+            err_str_pfx, err_str, err_str_sfx,
+            reason);
     }
 
     if (src_file != NULL)
@@ -3561,7 +3514,7 @@ void ossl_quic_channel_raise_protocol_error_loc(QUIC_CHANNEL *ch,
 
     tcause.error_code = error_code;
     tcause.frame_type = frame_type;
-    tcause.reason     = reason;
+    tcause.reason = reason;
     tcause.reason_len = strlen(reason);
 
     ch->protocol_error = 1;
@@ -3599,7 +3552,7 @@ static OSSL_TIME ch_get_effective_idle_timeout_duration(QUIC_CHANNEL *ch)
      */
     pto = ossl_ackm_get_pto_duration(ch->ackm);
     return ossl_time_max(ossl_ms2time(ch->max_idle_timeout),
-                                      ossl_time_multiply(pto, 3));
+        ossl_time_multiply(pto, 3));
 }
 
 /*
@@ -3609,7 +3562,7 @@ static OSSL_TIME ch_get_effective_idle_timeout_duration(QUIC_CHANNEL *ch)
 static void ch_update_idle(QUIC_CHANNEL *ch)
 {
     ch->idle_deadline = ossl_time_add(get_time(ch),
-                                      ch_get_effective_idle_timeout_duration(ch));
+        ch_get_effective_idle_timeout_duration(ch));
 }
 
 /*
@@ -3645,9 +3598,9 @@ static void ch_on_idle_timeout(QUIC_CHANNEL *ch)
      * CONN_CLOSE is never sent for it. We shouldn't use this data once we reach
      * TERMINATED anyway.
      */
-    ch->terminate_cause.app         = 0;
-    ch->terminate_cause.error_code  = OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT;
-    ch->terminate_cause.frame_type  = 0;
+    ch->terminate_cause.app = 0;
+    ch->terminate_cause.error_code = OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT;
+    ch->terminate_cause.frame_type = 0;
 
     ch_record_state_transition(ch, QUIC_CHANNEL_STATE_TERMINATED);
 }
@@ -3669,15 +3622,15 @@ static void ch_on_idle_timeout(QUIC_CHANNEL *ch)
  * @return         1 on success, 0 on failure to set required elements.
  */
 static int ch_on_new_conn_common(QUIC_CHANNEL *ch, const BIO_ADDR *peer,
-                                 const QUIC_CONN_ID *peer_scid,
-                                 const QUIC_CONN_ID *peer_dcid,
-                                 const QUIC_CONN_ID *peer_odcid)
+    const QUIC_CONN_ID *peer_scid,
+    const QUIC_CONN_ID *peer_dcid,
+    const QUIC_CONN_ID *peer_odcid)
 {
     /* Note our newly learnt peer address and CIDs. */
     if (!BIO_ADDR_copy(&ch->cur_peer_addr, peer))
         return 0;
 
-    ch->init_dcid       = *peer_dcid;
+    ch->init_dcid = *peer_dcid;
     ch->cur_remote_dcid = *peer_scid;
     ch->odcid.id_len = 0;
 
@@ -3704,16 +3657,14 @@ static int ch_on_new_conn_common(QUIC_CHANNEL *ch, const BIO_ADDR *peer,
      * port_default_packet_handler() already.
      */
     if (!ossl_quic_provide_initial_secret(ch->port->engine->libctx,
-                                          ch->port->engine->propq,
-                                          &ch->init_dcid,
-                                          /*is_server=*/1,
-                                          NULL, ch->qtx))
+            ch->port->engine->propq,
+            &ch->init_dcid,
+            /*is_server=*/1,
+            NULL, ch->qtx))
         return 0;
 
     /* Register the peer ODCID in the LCIDM. */
-    if (!ossl_quic_lcidm_enrol_odcid(ch->lcidm, ch, peer_odcid == NULL ?
-                                     &ch->init_dcid :
-                                     peer_odcid))
+    if (!ossl_quic_lcidm_enrol_odcid(ch->lcidm, ch, peer_odcid == NULL ? &ch->init_dcid : peer_odcid))
         return 0;
 
     /* Change state. */
@@ -3724,8 +3675,8 @@ static int ch_on_new_conn_common(QUIC_CHANNEL *ch, const BIO_ADDR *peer,
 
 /* Called when we, as a server, get a new incoming connection. */
 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)
 {
     if (!ossl_assert(ch->state == QUIC_CHANNEL_STATE_IDLE && ch->is_server))
         return 0;
@@ -3761,9 +3712,9 @@ int ossl_quic_channel_on_new_conn(QUIC_CHANNEL *ch, const BIO_ADDR *peer,
  *         met (e.g., channel is not idle or not a server, or binding fails).
  */
 int ossl_quic_bind_channel(QUIC_CHANNEL *ch, const BIO_ADDR *peer,
-                           const QUIC_CONN_ID *peer_scid,
-                           const QUIC_CONN_ID *peer_dcid,
-                           const QUIC_CONN_ID *peer_odcid)
+    const QUIC_CONN_ID *peer_scid,
+    const QUIC_CONN_ID *peer_dcid,
+    const QUIC_CONN_ID *peer_odcid)
 {
     if (peer_dcid == NULL)
         return 0;
@@ -3788,7 +3739,7 @@ SSL *ossl_quic_channel_get0_ssl(QUIC_CHANNEL *ch)
 }
 
 static int ch_init_new_stream(QUIC_CHANNEL *ch, QUIC_STREAM *qs,
-                              int can_send, int can_recv)
+    int can_send, int can_recv)
 {
     uint64_t rxfc_wnd;
     int server_init = ossl_quic_stream_is_server_init(qs);
@@ -3838,9 +3789,9 @@ static int ch_init_new_stream(QUIC_CHANNEL *ch, QUIC_STREAM *qs,
         rxfc_wnd = ch->tx_init_max_stream_data_bidi_remote;
 
     if (!ossl_quic_rxfc_init(&qs->rxfc, &ch->conn_rxfc,
-                             rxfc_wnd,
-                             DEFAULT_STREAM_RXFC_MAX_WND_MUL * rxfc_wnd,
-                             get_time, ch))
+            rxfc_wnd,
+            DEFAULT_STREAM_RXFC_MAX_WND_MUL * rxfc_wnd,
+            get_time, ch))
         goto err;
 
     return 1;
@@ -3854,50 +3805,50 @@ static int ch_init_new_stream(QUIC_CHANNEL *ch, QUIC_STREAM *qs,
 }
 
 static uint64_t *ch_get_local_stream_next_ordinal_ptr(QUIC_CHANNEL *ch,
-                                                      int is_uni)
+    int is_uni)
 {
     return is_uni ? &ch->next_local_stream_ordinal_uni
                   : &ch->next_local_stream_ordinal_bidi;
 }
 
 static const uint64_t *ch_get_local_stream_max_ptr(const QUIC_CHANNEL *ch,
-                                                   int is_uni)
+    int is_uni)
 {
     return is_uni ? &ch->max_local_streams_uni
                   : &ch->max_local_streams_bidi;
 }
 
 static const QUIC_RXFC *ch_get_remote_stream_count_rxfc(const QUIC_CHANNEL *ch,
-                                                        int is_uni)
+    int is_uni)
 {
     return is_uni ? &ch->max_streams_uni_rxfc
                   : &ch->max_streams_bidi_rxfc;
 }
 
 int ossl_quic_channel_is_new_local_stream_admissible(QUIC_CHANNEL *ch,
-                                                     int is_uni)
+    int is_uni)
 {
     const uint64_t *p_next_ordinal = ch_get_local_stream_next_ordinal_ptr(ch, is_uni);
 
     return ossl_quic_stream_map_is_local_allowed_by_stream_limit(&ch->qsm,
-                                                                 *p_next_ordinal,
-                                                                 is_uni);
+        *p_next_ordinal,
+        is_uni);
 }
 
 uint64_t ossl_quic_channel_get_local_stream_count_avail(const QUIC_CHANNEL *ch,
-                                                        int is_uni)
+    int is_uni)
 {
     const uint64_t *p_next_ordinal, *p_max;
 
-    p_next_ordinal  = ch_get_local_stream_next_ordinal_ptr((QUIC_CHANNEL *)ch,
-                                                           is_uni);
-    p_max           = ch_get_local_stream_max_ptr(ch, is_uni);
+    p_next_ordinal = ch_get_local_stream_next_ordinal_ptr((QUIC_CHANNEL *)ch,
+        is_uni);
+    p_max = ch_get_local_stream_max_ptr(ch, is_uni);
 
     return *p_max - *p_next_ordinal;
 }
 
 uint64_t ossl_quic_channel_get_remote_stream_count_avail(const QUIC_CHANNEL *ch,
-                                                         int is_uni)
+    int is_uni)
 {
     return ossl_quic_rxfc_get_credit(ch_get_remote_stream_count_rxfc(ch, is_uni));
 }
@@ -3940,7 +3891,7 @@ QUIC_STREAM *ossl_quic_channel_new_stream_local(QUIC_CHANNEL *ch, int is_uni)
 }
 
 QUIC_STREAM *ossl_quic_channel_new_stream_remote(QUIC_CHANNEL *ch,
-                                                 uint64_t stream_id)
+    uint64_t stream_id)
 {
     uint64_t peer_role;
     int is_uni;
@@ -3956,8 +3907,7 @@ QUIC_STREAM *ossl_quic_channel_new_stream_remote(QUIC_CHANNEL *ch,
     is_uni = ((stream_id & QUIC_STREAM_DIR_MASK) == QUIC_STREAM_DIR_UNI);
 
     qs = ossl_quic_stream_map_alloc(&ch->qsm, stream_id,
-                                    stream_id & (QUIC_STREAM_INITIATOR_MASK
-                                                 | QUIC_STREAM_DIR_MASK));
+        stream_id & (QUIC_STREAM_INITIATOR_MASK | QUIC_STREAM_DIR_MASK));
     if (qs == NULL)
         return NULL;
 
@@ -3977,20 +3927,20 @@ QUIC_STREAM *ossl_quic_channel_new_stream_remote(QUIC_CHANNEL *ch,
 }
 
 void ossl_quic_channel_set_incoming_stream_auto_reject(QUIC_CHANNEL *ch,
-                                                       int enable,
-                                                       uint64_t aec)
+    int enable,
+    uint64_t aec)
 {
-    ch->incoming_stream_auto_reject     = (enable != 0);
+    ch->incoming_stream_auto_reject = (enable != 0);
     ch->incoming_stream_auto_reject_aec = aec;
 }
 
 void ossl_quic_channel_reject_stream(QUIC_CHANNEL *ch, QUIC_STREAM *qs)
 {
     ossl_quic_stream_map_stop_sending_recv_part(&ch->qsm, qs,
-                                                ch->incoming_stream_auto_reject_aec);
+        ch->incoming_stream_auto_reject_aec);
 
     ossl_quic_stream_map_reset_stream_send_part(&ch->qsm, qs,
-                                                ch->incoming_stream_auto_reject_aec);
+        ch->incoming_stream_auto_reject_aec);
     qs->deleted = 1;
 
     ossl_quic_stream_map_update_state(&ch->qsm, qs);
@@ -3998,7 +3948,7 @@ 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)
 {
     /* Remove the current LCID from the LCIDM. */
     if (!ossl_quic_lcidm_debug_remove(ch->lcidm, &ch->cur_local_cid))
@@ -4009,20 +3959,20 @@ int ossl_quic_channel_replace_local_cid(QUIC_CHANNEL *ch,
         return 0;
     /* Add the new LCID to the LCIDM. */
     if (!ossl_quic_lcidm_debug_add(ch->lcidm, ch, &ch->cur_local_cid,
-                                   100))
+            100))
         return 0;
     return 1;
 }
 
 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)
 {
     ch->msg_callback = msg_callback;
     ch->msg_callback_ssl = msg_callback_ssl;
     ossl_qtx_set_msg_callback(ch->qtx, msg_callback, msg_callback_ssl);
     ossl_quic_tx_packetiser_set_msg_callback(ch->txp, msg_callback,
-                                             msg_callback_ssl);
+        msg_callback_ssl);
     /*
      * postpone msg callback setting for tserver until port calls
      * port_bind_channel().
@@ -4032,7 +3982,7 @@ void ossl_quic_channel_set_msg_callback(QUIC_CHANNEL *ch,
 }
 
 void ossl_quic_channel_set_msg_callback_arg(QUIC_CHANNEL *ch,
-                                            void *msg_callback_arg)
+    void *msg_callback_arg)
 {
     ch->msg_callback_arg = msg_callback_arg;
     ossl_qtx_set_msg_callback_arg(ch->qtx, msg_callback_arg);
@@ -4047,7 +3997,7 @@ void ossl_quic_channel_set_msg_callback_arg(QUIC_CHANNEL *ch,
 }
 
 void ossl_quic_channel_set_txku_threshold_override(QUIC_CHANNEL *ch,
-                                                   uint64_t tx_pkt_threshold)
+    uint64_t tx_pkt_threshold)
 {
     ch->txku_threshold_override = tx_pkt_threshold;
 }
diff --git a/ssl/quic/quic_channel_local.h b/ssl/quic/quic_channel_local.h
index cdd0969586dff..ae443fccca1e7 100644
--- a/ssl/quic/quic_channel_local.h
+++ b/ssl/quic/quic_channel_local.h
@@ -1,16 +1,16 @@
 #ifndef OSSL_QUIC_CHANNEL_LOCAL_H
-# define OSSL_QUIC_CHANNEL_LOCAL_H
+#define OSSL_QUIC_CHANNEL_LOCAL_H
 
-# include "internal/quic_channel.h"
+#include "internal/quic_channel.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
-#  include <openssl/lhash.h>
-#  include "internal/list.h"
-#  include "internal/quic_predef.h"
-#  include "internal/quic_fc.h"
-#  include "internal/quic_stream_map.h"
-#  include "internal/quic_tls.h"
+#include <openssl/lhash.h>
+#include "internal/list.h"
+#include "internal/quic_predef.h"
+#include "internal/quic_fc.h"
+#include "internal/quic_stream_map.h"
+#include "internal/quic_tls.h"
 
 /*
  * QUIC Channel Structure
@@ -29,82 +29,85 @@
  * Other components should not include this header.
  */
 struct quic_channel_st {
-    QUIC_PORT                       *port;
+    QUIC_PORT *port;
 
     /*
      * QUIC_PORT keeps the channels which belong to it on a list for bookkeeping
      * purposes.
      */
-    OSSL_LIST_MEMBER(ch,            QUIC_CHANNEL);
-    OSSL_LIST_MEMBER(incoming_ch,   QUIC_CHANNEL);
+    OSSL_LIST_MEMBER(ch, QUIC_CHANNEL);
+    OSSL_LIST_MEMBER(incoming_ch, QUIC_CHANNEL);
 
     /*
      * The associated TLS 1.3 connection data. Used to provide the handshake
      * layer; its 'network' side is plugged into the crypto stream for each EL
-     * (other than the 0-RTT EL).
+     * (other than the 0-RTT EL). Note that the `tls` SSL object is not "owned"
+     * by this channel. It is created and managed elsewhere and is guaranteed
+     * to be valid for the lifetime of the channel. Therefore we do not free it
+     * when we free the channel.
      */
-    QUIC_TLS                        *qtls;
-    SSL                             *tls;
+    QUIC_TLS *qtls;
+    SSL *tls;
 
     /* Port LCIDM we use to register LCIDs. */
-    QUIC_LCIDM                      *lcidm;
+    QUIC_LCIDM *lcidm;
     /* SRTM we register SRTs with. */
-    QUIC_SRTM                       *srtm;
+    QUIC_SRTM *srtm;
 
     /* Optional QLOG instance (or NULL). */
-    QLOG                            *qlog;
+    QLOG *qlog;
 
     /*
      * The transport parameter block we will send or have sent.
      * Freed after sending or when connection is freed.
      */
-    unsigned char                   *local_transport_params;
+    unsigned char *local_transport_params;
 
     /*
      * Pending new token to send once handshake is complete
      */
-    uint8_t                         *pending_new_token;
-    size_t                          pending_new_token_len;
+    uint8_t *pending_new_token;
+    size_t pending_new_token_len;
 
     /* Our current L4 peer address, if any. */
-    BIO_ADDR                        cur_peer_addr;
+    BIO_ADDR cur_peer_addr;
 
     /*
      * Subcomponents of the connection. All of these components are instantiated
      * and owned by us.
      */
-    OSSL_QUIC_TX_PACKETISER         *txp;
-    QUIC_TXPIM                      *txpim;
-    QUIC_CFQ                        *cfq;
+    OSSL_QUIC_TX_PACKETISER *txp;
+    QUIC_TXPIM *txpim;
+    QUIC_CFQ *cfq;
     /*
      * Connection level FC. The stream_count RXFCs is used to manage
      * MAX_STREAMS signalling.
      */
-    QUIC_TXFC                       conn_txfc;
-    QUIC_RXFC                       conn_rxfc, crypto_rxfc[QUIC_PN_SPACE_NUM];
-    QUIC_RXFC                       max_streams_bidi_rxfc, max_streams_uni_rxfc;
-    QUIC_STREAM_MAP                 qsm;
-    OSSL_STATM                      statm;
-    OSSL_CC_DATA                    *cc_data;
-    const OSSL_CC_METHOD            *cc_method;
-    OSSL_ACKM                       *ackm;
+    QUIC_TXFC conn_txfc;
+    QUIC_RXFC conn_rxfc, crypto_rxfc[QUIC_PN_SPACE_NUM];
+    QUIC_RXFC max_streams_bidi_rxfc, max_streams_uni_rxfc;
+    QUIC_STREAM_MAP qsm;
+    OSSL_STATM statm;
+    OSSL_CC_DATA *cc_data;
+    const OSSL_CC_METHOD *cc_method;
+    OSSL_ACKM *ackm;
 
     /* Record layers in the TX and RX directions. */
-    OSSL_QTX                        *qtx;
-    OSSL_QRX                        *qrx;
+    OSSL_QTX *qtx;
+    OSSL_QRX *qrx;
 
     /* Message callback related arguments */
-    ossl_msg_cb                     msg_callback;
-    void                            *msg_callback_arg;
-    SSL                             *msg_callback_ssl;
+    ossl_msg_cb msg_callback;
+    void *msg_callback_arg;
+    SSL *msg_callback_ssl;
 
     /*
      * Send and receive parts of the crypto streams.
      * crypto_send[QUIC_PN_SPACE_APP] is the 1-RTT crypto stream. There is no
      * 0-RTT crypto stream.
      */
-    QUIC_SSTREAM                    *crypto_send[QUIC_PN_SPACE_NUM];
-    QUIC_RSTREAM                    *crypto_recv[QUIC_PN_SPACE_NUM];
+    QUIC_SSTREAM *crypto_send[QUIC_PN_SPACE_NUM];
+    QUIC_RSTREAM *crypto_recv[QUIC_PN_SPACE_NUM];
 
     /* Internal state. */
     /*
@@ -112,89 +115,89 @@ struct quic_channel_st {
      * Server: The DCID used in the first Initial packet the client transmitted.
      * Randomly generated and required by RFC to be at least 8 bytes.
      */
-    QUIC_CONN_ID                    init_dcid;
+    QUIC_CONN_ID init_dcid;
 
     /*
      * Server: If this channel is created in response to an init packet sent
      * after the server has sent a retry packet to do address validation, this
      * field stores the original connection id from the first init packet sent
      */
-    QUIC_CONN_ID                    odcid;
+    QUIC_CONN_ID odcid;
 
     /*
      * Client: The SCID found in the first Initial packet from the server.
      * Not valid for servers.
      * Valid if have_received_enc_pkt is set.
      */
-    QUIC_CONN_ID                    init_scid;
+    QUIC_CONN_ID init_scid;
 
     /*
      * Client only: The SCID found in an incoming Retry packet we handled.
      * Not valid for servers.
      */
-    QUIC_CONN_ID                    retry_scid;
+    QUIC_CONN_ID retry_scid;
 
     /* Server only: The DCID we currently expect the peer to use to talk to us. */
-    QUIC_CONN_ID                    cur_local_cid;
+    QUIC_CONN_ID cur_local_cid;
 
     /*
      * The DCID we currently use to talk to the peer and its sequence num.
      */
-    QUIC_CONN_ID                    cur_remote_dcid;
-    uint64_t                        cur_remote_seq_num;
-    uint64_t                        cur_retire_prior_to;
+    QUIC_CONN_ID cur_remote_dcid;
+    uint64_t cur_remote_seq_num;
+    uint64_t cur_retire_prior_to;
 
     /* Transport parameter values we send to our peer. */
-    uint64_t                        tx_init_max_stream_data_bidi_local;
-    uint64_t                        tx_init_max_stream_data_bidi_remote;
-    uint64_t                        tx_init_max_stream_data_uni;
-    uint64_t                        tx_max_ack_delay; /* ms */
+    uint64_t tx_init_max_stream_data_bidi_local;
+    uint64_t tx_init_max_stream_data_bidi_remote;
+    uint64_t tx_init_max_stream_data_uni;
+    uint64_t tx_max_ack_delay; /* ms */
 
     /* Transport parameter values received from server. */
-    uint64_t                        rx_init_max_stream_data_bidi_local;
-    uint64_t                        rx_init_max_stream_data_bidi_remote;
-    uint64_t                        rx_init_max_stream_data_uni;
-    uint64_t                        rx_max_ack_delay; /* ms */
-    unsigned char                   rx_ack_delay_exp;
+    uint64_t rx_init_max_stream_data_bidi_local;
+    uint64_t rx_init_max_stream_data_bidi_remote;
+    uint64_t rx_init_max_stream_data_uni;
+    uint64_t rx_max_ack_delay; /* ms */
+    unsigned char rx_ack_delay_exp;
 
     /* Diagnostic counters for testing purposes only. May roll over. */
-    uint16_t                        diag_num_rx_ack; /* Number of ACK frames received */
+    uint16_t diag_num_rx_ack; /* Number of ACK frames received */
 
     /*
      * Temporary staging area to store information about the incoming packet we
      * are currently processing.
      */
-    OSSL_QRX_PKT                    *qrx_pkt;
+    OSSL_QRX_PKT *qrx_pkt;
 
     /*
      * Current limit on number of streams we may create. Set by transport
      * parameters initially and then by MAX_STREAMS frames.
      */
-    uint64_t                        max_local_streams_bidi;
-    uint64_t                        max_local_streams_uni;
+    uint64_t max_local_streams_bidi;
+    uint64_t max_local_streams_uni;
 
     /* The idle timeout values we and our peer requested. */
-    uint64_t                        max_idle_timeout_local_req;
-    uint64_t                        max_idle_timeout_remote_req;
+    uint64_t max_idle_timeout_local_req;
+    uint64_t max_idle_timeout_remote_req;
 
     /* The negotiated maximum idle timeout in milliseconds. */
-    uint64_t                        max_idle_timeout;
+    uint64_t max_idle_timeout;
 
     /*
      * Maximum payload size in bytes for datagrams sent to our peer, as
      * negotiated by transport parameters.
      */
-    uint64_t                        rx_max_udp_payload_size;
+    uint64_t rx_max_udp_payload_size;
     /* Maximum active CID limit, as negotiated by transport parameters. */
-    uint64_t                        rx_active_conn_id_limit;
+    uint64_t rx_active_conn_id_limit;
 
     /*
      * Used to allocate stream IDs. This is a stream ordinal, i.e., a stream ID
      * without the low two bits designating type and initiator. Shift and or in
      * the type bits to convert to a stream ID.
      */
-    uint64_t                        next_local_stream_ordinal_bidi;
-    uint64_t                        next_local_stream_ordinal_uni;
+    uint64_t next_local_stream_ordinal_bidi;
+    uint64_t next_local_stream_ordinal_uni;
 
     /*
      * Used to track which stream ordinals within a given stream type have been
@@ -202,14 +205,14 @@ struct quic_channel_st {
      * which streams should be implicitly created due to usage of a higher
      * stream ordinal.
      */
-    uint64_t                        next_remote_stream_ordinal_bidi;
-    uint64_t                        next_remote_stream_ordinal_uni;
+    uint64_t next_remote_stream_ordinal_bidi;
+    uint64_t next_remote_stream_ordinal_uni;
 
     /*
      * Application error code to be used for STOP_SENDING/RESET_STREAM frames
      * used to autoreject incoming streams.
      */
-    uint64_t                        incoming_stream_auto_reject_aec;
+    uint64_t incoming_stream_auto_reject_aec;
 
     /*
      * Override packet count threshold at which we do a spontaneous TXKU.
@@ -217,41 +220,41 @@ struct quic_channel_st {
      * limit advice from the QRL utility functions. This is intended for testing
      * use only. Usually set to UINT64_MAX.
      */
-    uint64_t                        txku_threshold_override;
+    uint64_t txku_threshold_override;
 
     /* Valid if we are in the TERMINATING or TERMINATED states. */
-    QUIC_TERMINATE_CAUSE            terminate_cause;
+    QUIC_TERMINATE_CAUSE terminate_cause;
 
     /*
      * Deadline at which we move to TERMINATING state. Valid if in the
      * TERMINATING state.
      */
-    OSSL_TIME                       terminate_deadline;
+    OSSL_TIME terminate_deadline;
 
     /*
      * Deadline at which connection dies due to idle timeout if no further
      * events occur.
      */
-    OSSL_TIME                       idle_deadline;
+    OSSL_TIME idle_deadline;
 
     /*
      * Deadline at which we should send an ACK-eliciting packet to ensure
      * idle timeout does not occur.
      */
-    OSSL_TIME                       ping_deadline;
+    OSSL_TIME ping_deadline;
 
     /*
      * The deadline at which the period in which it is RECOMMENDED that we not
      * initiate any spontaneous TXKU ends. This is zero if no such deadline
      * applies.
      */
-    OSSL_TIME                       txku_cooldown_deadline;
+    OSSL_TIME txku_cooldown_deadline;
 
     /*
      * The deadline at which we take the QRX out of UPDATING and back to NORMAL.
      * Valid if rxku_in_progress in 1.
      */
-    OSSL_TIME                       rxku_update_end_deadline;
+    OSSL_TIME rxku_update_end_deadline;
 
     /*
      * The first (application space) PN sent with a new key phase. Valid if the
@@ -260,13 +263,13 @@ struct quic_channel_st {
      * becomes 0. For sanity's sake, such a PN p should also be <= the highest
      * PN we have ever sent, of course.
      */
-    QUIC_PN                         txku_pn;
+    QUIC_PN txku_pn;
 
     /*
      * The (application space) PN which triggered RXKU detection. Valid if
      * rxku_pending_confirm.
      */
-    QUIC_PN                         rxku_trigger_pn;
+    QUIC_PN rxku_trigger_pn;
 
     /*
      * State tracking. QUIC connection-level state is best represented based on
@@ -278,37 +281,37 @@ struct quic_channel_st {
      * state if the state is QUIC_CHANNEL_STATE_ACTIVE and handshake_confirmed is
      * set.
      */
-    unsigned int                    state                   : 3;
+    unsigned int state : 3;
 
     /*
      * Have we received at least one encrypted packet from the peer?
      * (If so, Retry and Version Negotiation messages should no longer
      *  be received and should be ignored if they do occur.)
      */
-    unsigned int                    have_received_enc_pkt   : 1;
+    unsigned int have_received_enc_pkt : 1;
 
     /*
      * Have we successfully processed any packet, including a Version
      * Negotiation packet? If so, further Version Negotiation packets should be
      * ignored.
      */
-    unsigned int                    have_processed_any_pkt  : 1;
+    unsigned int have_processed_any_pkt : 1;
 
     /*
      * Have we sent literally any packet yet? If not, there is no point polling
      * RX.
      */
-    unsigned int                    have_sent_any_pkt       : 1;
+    unsigned int have_sent_any_pkt : 1;
 
     /*
      * Are we currently doing proactive version negotiation?
      */
-    unsigned int                    doing_proactive_ver_neg : 1;
+    unsigned int doing_proactive_ver_neg : 1;
 
     /* We have received transport parameters from the peer. */
-    unsigned int                    got_remote_transport_params    : 1;
+    unsigned int got_remote_transport_params : 1;
     /* We have generated our local transport parameters. */
-    unsigned int                    got_local_transport_params     : 1;
+    unsigned int got_local_transport_params : 1;
 
     /*
      * This monotonically transitions to 1 once the TLS state machine is
@@ -319,7 +322,7 @@ struct quic_channel_st {
      * Handshake completion is not the same as handshake confirmation (see
      * below).
      */
-    unsigned int                    handshake_complete      : 1;
+    unsigned int handshake_complete : 1;
 
     /*
      * This monotonically transitions to 1 once the handshake is confirmed.
@@ -327,13 +330,13 @@ struct quic_channel_st {
      * At our option, we may also take acknowledgement of any 1-RTT packet
      * we sent as a handshake confirmation.
      */
-    unsigned int                    handshake_confirmed     : 1;
+    unsigned int handshake_confirmed : 1;
 
     /*
      * We are sending Initial packets based on a Retry. This means we definitely
      * should not receive another Retry, and if we do it is an error.
      */
-    unsigned int                    doing_retry             : 1;
+    unsigned int doing_retry : 1;
 
     /*
      * We don't store the current EL here; the TXP asks the QTX which ELs
@@ -341,8 +344,8 @@ struct quic_channel_st {
      */
 
     /* Have statm, qsm been initialised? Used to track cleanup. */
-    unsigned int                    have_statm              : 1;
-    unsigned int                    have_qsm                : 1;
+    unsigned int have_statm : 1;
+    unsigned int have_qsm : 1;
 
     /*
      * Preferred ELs for transmission and reception. This is not strictly needed
@@ -352,41 +355,41 @@ struct quic_channel_st {
      * easier for interoperation with the handshake layer, which likes to invoke
      * the yield secret callback at different times for TX and RX.
      */
-    unsigned int                    tx_enc_level            : 3;
-    unsigned int                    rx_enc_level            : 3;
+    unsigned int tx_enc_level : 3;
+    unsigned int rx_enc_level : 3;
 
     /* If bit n is set, EL n has been discarded. */
-    unsigned int                    el_discarded            : 4;
+    unsigned int el_discarded : 4;
 
     /*
      * While in TERMINATING - CLOSING, set when we should generate a connection
      * close frame.
      */
-    unsigned int                    conn_close_queued       : 1;
+    unsigned int conn_close_queued : 1;
 
     /* Are we in server mode? Never changes after instantiation. */
-    unsigned int                    is_server               : 1;
+    unsigned int is_server : 1;
 
     /*
      * Set temporarily when the handshake layer has given us a new RX secret.
      * Used to determine if we need to check our RX queues again.
      */
-    unsigned int                    have_new_rx_secret      : 1;
+    unsigned int have_new_rx_secret : 1;
 
     /* Have we ever called QUIC_TLS yet during RX processing? */
-    unsigned int                    did_tls_tick            : 1;
+    unsigned int did_tls_tick : 1;
     /* Has any CRYPTO frame been processed during this tick? */
-    unsigned int                    did_crypto_frame        : 1;
+    unsigned int did_crypto_frame : 1;
 
     /*
      * Have we sent an ack-eliciting packet since the last successful packet
      * reception? Used to determine when to bump idle timer (see RFC 9000 s.
      * 10.1).
      */
-    unsigned int                    have_sent_ack_eliciting_since_rx    : 1;
+    unsigned int have_sent_ack_eliciting_since_rx : 1;
 
     /* Should incoming streams automatically be rejected? */
-    unsigned int                    incoming_stream_auto_reject         : 1;
+    unsigned int incoming_stream_auto_reject : 1;
 
     /*
      * 1 if a key update sequence was locally initiated, meaning we sent the
@@ -394,7 +397,7 @@ struct quic_channel_st {
      * another TXKU. 0 if a key update sequence was initiated by the peer,
      * meaning we detect a RXKU first and have to generate a TXKU in response.
      */
-    unsigned int                    ku_locally_initiated                : 1;
+    unsigned int ku_locally_initiated : 1;
 
     /*
      * 1 if we have triggered TXKU (whether spontaneous or solicited) but are
@@ -402,7 +405,7 @@ struct quic_channel_st {
      * are not allowed to trigger spontaneous TXKU (but solicited TXKU is
      * potentially still possible).
      */
-    unsigned int                    txku_in_progress                    : 1;
+    unsigned int txku_in_progress : 1;
 
     /*
      * We have received an RXKU event and currently are going through
@@ -413,7 +416,7 @@ struct quic_channel_st {
      * active so we know when to take the QRX out of UPDATING and back to
      * NORMAL.
      */
-    unsigned int                    rxku_in_progress                    : 1;
+    unsigned int rxku_in_progress : 1;
 
     /*
      * We have received an RXKU but have yet to send an ACK for it, which means
@@ -422,18 +425,18 @@ struct quic_channel_st {
      * this restriction comes into play if we take more than PTO time to send
      * an ACK for it (not likely).
      */
-    unsigned int                    rxku_pending_confirm                : 1;
+    unsigned int rxku_pending_confirm : 1;
 
     /* Temporary variable indicating rxku_pending_confirm is to become 0. */
-    unsigned int                    rxku_pending_confirm_done           : 1;
+    unsigned int rxku_pending_confirm_done : 1;
 
     /*
      * If set, RXKU is expected (because we initiated a spontaneous TXKU).
      */
-    unsigned int                    rxku_expected                       : 1;
+    unsigned int rxku_expected : 1;
 
     /* Permanent net error encountered */
-    unsigned int                    net_error                           : 1;
+    unsigned int net_error : 1;
 
     /*
      * Protocol error encountered. Note that you should refer to the state field
@@ -441,31 +444,31 @@ struct quic_channel_st {
      * after the first protocol error, but still record the first protocol error
      * if it happens during the TERMINATING state.
      */
-    unsigned int                    protocol_error                      : 1;
+    unsigned int protocol_error : 1;
 
     /* Are we using addressed mode? */
-    unsigned int                    addressed_mode                      : 1;
+    unsigned int addressed_mode : 1;
 
     /* Are we on the QUIC_PORT linked list of channels? */
-    unsigned int                    on_port_list                        : 1;
+    unsigned int on_port_list : 1;
 
     /* Has qlog been requested? */
-    unsigned int                    use_qlog                            : 1;
+    unsigned int use_qlog : 1;
 
     /* Has qlog been requested? */
-    unsigned int                    is_tserver_ch                       : 1;
+    unsigned int is_tserver_ch : 1;
 
     /* Saved error stack in case permanent error was encountered */
-    ERR_STATE                       *err_state;
+    ERR_STATE *err_state;
 
     /* Scratch area for use by RXDP to store decoded ACK ranges. */
-    OSSL_QUIC_ACK_RANGE             *ack_range_scratch;
-    size_t                          num_ack_range_scratch;
+    OSSL_QUIC_ACK_RANGE *ack_range_scratch;
+    size_t num_ack_range_scratch;
 
     /* Title for qlog purposes. We own this copy. */
-    char                            *qlog_title;
+    char *qlog_title;
 };
 
-# endif
+#endif
 
 #endif
diff --git a/ssl/quic/quic_demux.c b/ssl/quic/quic_demux.c
index a84a44c6e9fb1..8fb4adb8c1db9 100644
--- a/ssl/quic/quic_demux.c
+++ b/ssl/quic/quic_demux.c
@@ -13,47 +13,47 @@
 #include <openssl/lhash.h>
 #include <openssl/err.h>
 
-#define URXE_DEMUX_STATE_FREE       0 /* on urx_free list */
-#define URXE_DEMUX_STATE_PENDING    1 /* on urx_pending list */
-#define URXE_DEMUX_STATE_ISSUED     2 /* on neither list */
+#define URXE_DEMUX_STATE_FREE 0 /* on urx_free list */
+#define URXE_DEMUX_STATE_PENDING 1 /* on urx_pending list */
+#define URXE_DEMUX_STATE_ISSUED 2 /* on neither list */
 
-#define DEMUX_MAX_MSGS_PER_CALL    32
+#define DEMUX_MAX_MSGS_PER_CALL 32
 
-#define DEMUX_DEFAULT_MTU        1500
+#define DEMUX_DEFAULT_MTU 1500
 
 struct quic_demux_st {
     /* The underlying transport BIO with datagram semantics. */
-    BIO                        *net_bio;
+    BIO *net_bio;
 
     /*
      * QUIC short packets do not contain the length of the connection ID field,
      * therefore it must be known contextually. The demuxer requires connection
      * IDs of the same length to be used for all incoming packets.
      */
-    size_t                      short_conn_id_len;
+    size_t short_conn_id_len;
 
     /*
      * Our current understanding of the upper bound on an incoming datagram size
      * in bytes.
      */
-    size_t                      mtu;
+    size_t mtu;
 
     /* The datagram_id to use for the next datagram we receive. */
-    uint64_t                    next_datagram_id;
+    uint64_t next_datagram_id;
 
     /* Time retrieval callback. */
-    OSSL_TIME                 (*now)(void *arg);
-    void                       *now_arg;
+    OSSL_TIME (*now)(void *arg);
+    void *now_arg;
 
     /* The default packet handler, if any. */
-    ossl_quic_demux_cb_fn      *default_cb;
-    void                       *default_cb_arg;
+    ossl_quic_demux_cb_fn *default_cb;
+    void *default_cb_arg;
 
     /*
      * List of URXEs which are not currently in use (i.e., not filled with
      * unconsumed data). These are moved to the pending list as they are filled.
      */
-    QUIC_URXE_LIST              urx_free;
+    QUIC_URXE_LIST urx_free;
 
     /*
      * List of URXEs which are filled with received encrypted data. These are
@@ -62,16 +62,16 @@ struct quic_demux_st {
      * user calls ossl_quic_demux_release_urxe to return the URXE to us, at
      * which point we add it to the free list.
      */
-    QUIC_URXE_LIST              urx_pending;
+    QUIC_URXE_LIST urx_pending;
 
     /* Whether to use local address support. */
-    char                        use_local_addr;
+    char use_local_addr;
 };
 
 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)
 {
     QUIC_DEMUX *demux;
 
@@ -79,12 +79,12 @@ QUIC_DEMUX *ossl_quic_demux_new(BIO *net_bio,
     if (demux == NULL)
         return NULL;
 
-    demux->net_bio                  = net_bio;
-    demux->short_conn_id_len        = short_conn_id_len;
+    demux->net_bio = net_bio;
+    demux->short_conn_id_len = short_conn_id_len;
     /* We update this if possible when we get a BIO. */
-    demux->mtu                      = DEMUX_DEFAULT_MTU;
-    demux->now                      = now;
-    demux->now_arg                  = now_arg;
+    demux->mtu = DEMUX_DEFAULT_MTU;
+    demux->now = now;
+    demux->now_arg = now_arg;
 
     if (net_bio != NULL
         && BIO_dgram_get_local_addr_cap(net_bio)
@@ -145,11 +145,11 @@ int ossl_quic_demux_set_mtu(QUIC_DEMUX *demux, unsigned int mtu)
 }
 
 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)
 {
-    demux->default_cb       = cb;
-    demux->default_cb_arg   = cb_arg;
+    demux->default_cb = cb;
+    demux->default_cb_arg = cb_arg;
 }
 
 static QUIC_URXE *demux_alloc_urxe(size_t alloc_len)
@@ -164,13 +164,13 @@ static QUIC_URXE *demux_alloc_urxe(size_t alloc_len)
         return NULL;
 
     ossl_list_urxe_init_elem(e);
-    e->alloc_len   = alloc_len;
-    e->data_len    = 0;
+    e->alloc_len = alloc_len;
+    e->data_len = 0;
     return e;
 }
 
 static QUIC_URXE *demux_resize_urxe(QUIC_DEMUX *demux, QUIC_URXE *e,
-                                    size_t new_alloc_len)
+    size_t new_alloc_len)
 {
     QUIC_URXE *e2, *prev;
 
@@ -181,6 +181,9 @@ static QUIC_URXE *demux_resize_urxe(QUIC_DEMUX *demux, QUIC_URXE *e,
     prev = ossl_list_urxe_prev(e);
     ossl_list_urxe_remove(&demux->urx_free, e);
 
+    if (new_alloc_len >= SIZE_MAX - sizeof(QUIC_URXE))
+        return NULL;
+
     e2 = OPENSSL_realloc(e, sizeof(QUIC_URXE) + new_alloc_len);
     if (e2 == NULL) {
         /* Failed to resize, abort. */
@@ -202,7 +205,7 @@ static QUIC_URXE *demux_resize_urxe(QUIC_DEMUX *demux, QUIC_URXE *e,
 }
 
 static QUIC_URXE *demux_reserve_urxe(QUIC_DEMUX *demux, QUIC_URXE *e,
-                                     size_t alloc_len)
+    size_t alloc_len)
 {
     return e->alloc_len < alloc_len ? demux_resize_urxe(demux, e, alloc_len) : e;
 }
@@ -253,7 +256,7 @@ static int demux_recv(QUIC_DEMUX *demux)
      * syscall, determined by how many free URXEs are available.
      */
     for (i = 0; i < (ossl_ssize_t)OSSL_NELEM(msg);
-            ++i, urxe = ossl_list_urxe_next(urxe)) {
+        ++i, urxe = ossl_list_urxe_next(urxe)) {
         if (urxe == NULL) {
             /* We need at least one URXE to receive into. */
             if (!ossl_assert(i > 0))
@@ -270,9 +273,9 @@ static int demux_recv(QUIC_DEMUX *demux)
 
         /* Ensure we zero any fields added to BIO_MSG at a later date. */
         memset(&msg[i], 0, sizeof(BIO_MSG));
-        msg[i].data     = ossl_quic_urxe_data(urxe);
+        msg[i].data = ossl_quic_urxe_data(urxe);
         msg[i].data_len = urxe->alloc_len;
-        msg[i].peer     = &urxe->peer;
+        msg[i].peer = &urxe->peer;
         BIO_ADDR_clear(&urxe->peer);
         if (demux->use_local_addr)
             msg[i].local = &urxe->local;
@@ -300,10 +303,10 @@ static int demux_recv(QUIC_DEMUX *demux)
     for (i = 0; i < rd; ++i, urxe = unext) {
         unext = ossl_list_urxe_next(urxe);
         /* Set URXE with actual length of received datagram. */
-        urxe->data_len      = msg[i].data_len;
+        urxe->data_len = msg[i].data_len;
         /* Time we received datagram. */
-        urxe->time          = now;
-        urxe->datagram_id   = demux->next_datagram_id++;
+        urxe->time = now;
+        urxe->datagram_id = demux->next_datagram_id++;
         /* Move from free list to pending list. */
         ossl_list_urxe_remove(&demux->urx_free, urxe);
         ossl_list_urxe_insert_tail(&demux->urx_pending, urxe);
@@ -315,13 +318,13 @@ static int demux_recv(QUIC_DEMUX *demux)
 
 /* Extract destination connection ID from the first packet in a datagram. */
 static int demux_identify_conn_id(QUIC_DEMUX *demux,
-                                  QUIC_URXE *e,
-                                  QUIC_CONN_ID *dst_conn_id)
+    QUIC_URXE *e,
+    QUIC_CONN_ID *dst_conn_id)
 {
     return ossl_quic_wire_get_pkt_hdr_dst_conn_id(ossl_quic_urxe_data(e),
-                                                  e->data_len,
-                                                  demux->short_conn_id_len,
-                                                  dst_conn_id);
+        e->data_len,
+        demux->short_conn_id_len,
+        dst_conn_id);
 }
 
 /*
@@ -350,7 +353,7 @@ static int demux_process_pending_urxe(QUIC_DEMUX *demux, QUIC_URXE *e)
          */
         e->demux_state = URXE_DEMUX_STATE_ISSUED;
         demux->default_cb(e, demux->default_cb_arg,
-                          dst_conn_id_ok ? &dst_conn_id : NULL);
+            dst_conn_id_ok ? &dst_conn_id : NULL);
     } else {
         /* Discard. */
         ossl_list_urxe_insert_tail(&demux->urx_free, e);
@@ -404,10 +407,10 @@ int ossl_quic_demux_pump(QUIC_DEMUX *demux)
 
 /* Artificially inject a packet into the demuxer for testing purposes. */
 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)
 {
     int ret;
     QUIC_URXE *urxe;
@@ -451,7 +454,7 @@ int ossl_quic_demux_inject(QUIC_DEMUX *demux,
 
 /* Called by our user to return a URXE to the free list. */
 void ossl_quic_demux_release_urxe(QUIC_DEMUX *demux,
-                                  QUIC_URXE *e)
+    QUIC_URXE *e)
 {
     assert(ossl_list_urxe_prev(e) == NULL && ossl_list_urxe_next(e) == NULL);
     assert(e->demux_state == URXE_DEMUX_STATE_ISSUED);
@@ -460,7 +463,7 @@ void ossl_quic_demux_release_urxe(QUIC_DEMUX *demux,
 }
 
 void ossl_quic_demux_reinject_urxe(QUIC_DEMUX *demux,
-                                   QUIC_URXE *e)
+    QUIC_URXE *e)
 {
     assert(ossl_list_urxe_prev(e) == NULL && ossl_list_urxe_next(e) == NULL);
     assert(e->demux_state == URXE_DEMUX_STATE_ISSUED);
diff --git a/ssl/quic/quic_engine.c b/ssl/quic/quic_engine.c
index e933d8548f478..370b9c3987f17 100644
--- a/ssl/quic/quic_engine.c
+++ b/ssl/quic/quic_engine.c
@@ -30,9 +30,9 @@ QUIC_ENGINE *ossl_quic_engine_new(const QUIC_ENGINE_ARGS *args)
     if ((qeng = OPENSSL_zalloc(sizeof(QUIC_ENGINE))) == NULL)
         return NULL;
 
-    qeng->libctx            = args->libctx;
-    qeng->propq             = args->propq;
-    qeng->mutex             = args->mutex;
+    qeng->libctx = args->libctx;
+    qeng->propq = args->propq;
+    qeng->mutex = args->mutex;
 
     if (!qeng_init(qeng, args->reactor_flags)) {
         OPENSSL_free(qeng);
@@ -54,8 +54,8 @@ void ossl_quic_engine_free(QUIC_ENGINE *qeng)
 static int qeng_init(QUIC_ENGINE *qeng, uint64_t reactor_flags)
 {
     return ossl_quic_reactor_init(&qeng->rtor, qeng_tick, qeng,
-                                  qeng->mutex,
-                                  ossl_time_zero(), reactor_flags);
+        qeng->mutex,
+        ossl_time_zero(), reactor_flags);
 }
 
 static void qeng_cleanup(QUIC_ENGINE *qeng)
@@ -87,8 +87,8 @@ OSSL_TIME ossl_quic_engine_make_real_time(QUIC_ENGINE *qeng, OSSL_TIME tm)
     OSSL_TIME offset;
 
     if (qeng->now_cb != NULL
-            && !ossl_time_is_zero(tm)
-            && !ossl_time_is_infinite(tm)) {
+        && !ossl_time_is_zero(tm)
+        && !ossl_time_is_infinite(tm)) {
 
         offset = qeng->now_cb(qeng->now_cb_arg);
 
@@ -100,8 +100,8 @@ OSSL_TIME ossl_quic_engine_make_real_time(QUIC_ENGINE *qeng, OSSL_TIME tm)
 }
 
 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)
 {
     qeng->now_cb = now_cb;
     qeng->now_cb_arg = now_cb_arg;
@@ -137,7 +137,7 @@ void ossl_quic_engine_update_poll_descriptors(QUIC_ENGINE *qeng, int force)
      * important currently as the port list has a single entry.
      */
     OSSL_LIST_FOREACH(port, port, &qeng->port_list)
-        ossl_quic_port_update_poll_descriptors(port, force);
+    ossl_quic_port_update_poll_descriptors(port, force);
 }
 
 /*
@@ -146,7 +146,7 @@ void ossl_quic_engine_update_poll_descriptors(QUIC_ENGINE *qeng, int force)
  */
 
 QUIC_PORT *ossl_quic_engine_create_port(QUIC_ENGINE *qeng,
-                                        const QUIC_PORT_ARGS *args)
+    const QUIC_PORT_ARGS *args)
 {
     QUIC_PORT_ARGS largs = *args;
 
@@ -176,17 +176,18 @@ static void qeng_tick(QUIC_TICK_RESULT *res, void *arg, uint32_t flags)
     QUIC_ENGINE *qeng = arg;
     QUIC_PORT *port;
 
-    res->net_read_desired     = 0;
-    res->net_write_desired    = 0;
+    res->net_read_desired = 0;
+    res->net_write_desired = 0;
     res->notify_other_threads = 0;
-    res->tick_deadline        = ossl_time_infinite();
+    res->tick_deadline = ossl_time_infinite();
 
     if (qeng->inhibit_tick)
         return;
 
     /* Iterate through all ports and service them. */
-    OSSL_LIST_FOREACH(port, port, &qeng->port_list) {
-        QUIC_TICK_RESULT subr = {0};
+    OSSL_LIST_FOREACH(port, port, &qeng->port_list)
+    {
+        QUIC_TICK_RESULT subr = { 0 };
 
         ossl_quic_port_subtick(port, &subr, flags);
         ossl_quic_tick_result_merge_into(res, &subr);
diff --git a/ssl/quic/quic_engine_local.h b/ssl/quic/quic_engine_local.h
index 280fd31dd7c14..476a884f648ce 100644
--- a/ssl/quic/quic_engine_local.h
+++ b/ssl/quic/quic_engine_local.h
@@ -8,12 +8,12 @@
  */
 
 #ifndef OSSL_QUIC_ENGINE_LOCAL_H
-# define OSSL_QUIC_ENGINE_LOCAL_H
+#define OSSL_QUIC_ENGINE_LOCAL_H
 
-# include "internal/quic_engine.h"
-# include "internal/quic_reactor.h"
+#include "internal/quic_engine.h"
+#include "internal/quic_reactor.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Engine Structure
@@ -29,8 +29,8 @@ DECLARE_LIST_OF(port, QUIC_PORT);
 
 struct quic_engine_st {
     /* All objects in a QUIC event domain share the same (libctx, propq). */
-    OSSL_LIB_CTX                    *libctx;
-    const char                      *propq;
+    OSSL_LIB_CTX *libctx;
+    const char *propq;
 
     /*
      * Master synchronisation mutex for the entire QUIC event domain. Used for
@@ -38,22 +38,23 @@ struct quic_engine_st {
      * of the engine passes it to us and is responsible for freeing it after
      * engine destruction.
      */
-    CRYPTO_MUTEX                    *mutex;
+    CRYPTO_MUTEX *mutex;
 
     /* Callback used to get the current time. */
-    OSSL_TIME                       (*now_cb)(void *arg);
-    void                            *now_cb_arg;
+    OSSL_TIME (*now_cb)(void *arg);
+    void *now_cb_arg;
 
     /* Asynchronous I/O reactor. */
-    QUIC_REACTOR                    rtor;
+    QUIC_REACTOR rtor;
 
     /* List of all child ports. */
-    OSSL_LIST(port)                 port_list;
+    OSSL_LIST(port)
+    port_list;
 
     /* Inhibit tick for testing purposes? */
-    unsigned int                    inhibit_tick                    : 1;
+    unsigned int inhibit_tick : 1;
 };
 
-# endif
+#endif
 
 #endif
diff --git a/ssl/quic/quic_fc.c b/ssl/quic/quic_fc.c
index 64ef31780c222..1691d4d69efad 100644
--- a/ssl/quic/quic_fc.c
+++ b/ssl/quic/quic_fc.c
@@ -25,10 +25,10 @@ int ossl_quic_txfc_init(QUIC_TXFC *txfc, QUIC_TXFC *conn_txfc)
     if (conn_txfc != NULL && conn_txfc->parent != NULL)
         return 0;
 
-    txfc->swm                   = 0;
-    txfc->cwm                   = 0;
-    txfc->parent                = conn_txfc;
-    txfc->has_become_blocked    = 0;
+    txfc->swm = 0;
+    txfc->cwm = 0;
+    txfc->parent = conn_txfc;
+    txfc->has_become_blocked = 0;
     return 1;
 }
 
@@ -124,40 +124,40 @@ uint64_t ossl_quic_txfc_get_swm(QUIC_TXFC *txfc)
  */
 
 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 *now_arg),
-                        void *now_arg)
+    uint64_t initial_window_size,
+    uint64_t max_window_size,
+    OSSL_TIME (*now)(void *now_arg),
+    void *now_arg)
 {
     if (conn_rxfc != NULL && conn_rxfc->parent != NULL)
         return 0;
 
-    rxfc->swm               = 0;
-    rxfc->cwm               = initial_window_size;
-    rxfc->rwm               = 0;
-    rxfc->esrwm             = 0;
-    rxfc->hwm               = 0;
-    rxfc->cur_window_size   = initial_window_size;
-    rxfc->max_window_size   = max_window_size;
-    rxfc->parent            = conn_rxfc;
-    rxfc->error_code        = 0;
-    rxfc->has_cwm_changed   = 0;
-    rxfc->epoch_start       = ossl_time_zero();
-    rxfc->now               = now;
-    rxfc->now_arg           = now_arg;
-    rxfc->is_fin            = 0;
-    rxfc->standalone        = 0;
+    rxfc->swm = 0;
+    rxfc->cwm = initial_window_size;
+    rxfc->rwm = 0;
+    rxfc->esrwm = 0;
+    rxfc->hwm = 0;
+    rxfc->cur_window_size = initial_window_size;
+    rxfc->max_window_size = max_window_size;
+    rxfc->parent = conn_rxfc;
+    rxfc->error_code = 0;
+    rxfc->has_cwm_changed = 0;
+    rxfc->epoch_start = ossl_time_zero();
+    rxfc->now = now;
+    rxfc->now_arg = now_arg;
+    rxfc->is_fin = 0;
+    rxfc->standalone = 0;
     return 1;
 }
 
 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)
 {
     if (!ossl_quic_rxfc_init(rxfc, NULL,
-                             initial_window_size, initial_window_size,
-                             now, now_arg))
+            initial_window_size, initial_window_size,
+            now, now_arg))
         return 0;
 
     rxfc->standalone = 1;
@@ -170,15 +170,15 @@ QUIC_RXFC *ossl_quic_rxfc_get_parent(QUIC_RXFC *rxfc)
 }
 
 void ossl_quic_rxfc_set_max_window_size(QUIC_RXFC *rxfc,
-                                        size_t max_window_size)
+    size_t max_window_size)
 {
     rxfc->max_window_size = max_window_size;
 }
 
 static void rxfc_start_epoch(QUIC_RXFC *rxfc)
 {
-    rxfc->epoch_start   = rxfc->now(rxfc->now_arg);
-    rxfc->esrwm         = rxfc->rwm;
+    rxfc->epoch_start = rxfc->now(rxfc->now_arg);
+    rxfc->esrwm = rxfc->rwm;
 }
 
 static int on_rx_controlled_bytes(QUIC_RXFC *rxfc, uint64_t num_bytes)
@@ -216,7 +216,7 @@ int ossl_quic_rxfc_on_rx_stream_frame(QUIC_RXFC *rxfc, uint64_t end, int is_fin)
         delta = end - rxfc->hwm;
         rxfc->hwm = end;
 
-        on_rx_controlled_bytes(rxfc, delta);             /* result ignored */
+        on_rx_controlled_bytes(rxfc, delta); /* result ignored */
         if (rxfc->parent != NULL)
             on_rx_controlled_bytes(rxfc->parent, delta); /* result ignored */
     } else if (end < rxfc->hwm && is_fin) {
@@ -237,7 +237,7 @@ static int rxfc_cwm_bump_desired(QUIC_RXFC *rxfc)
     uint64_t window_rem = rxfc->cwm - rxfc->rwm;
     uint64_t threshold
         = safe_muldiv_uint64_t(rxfc->cur_window_size,
-                               WINDOW_THRESHOLD_NUM, WINDOW_THRESHOLD_DEN, &err);
+            WINDOW_THRESHOLD_NUM, WINDOW_THRESHOLD_DEN, &err);
 
     if (err)
         /*
@@ -274,21 +274,21 @@ static int rxfc_should_bump_window_size(QUIC_RXFC *rxfc, OSSL_TIME rtt)
      * our 64-bit nanosecond representation, which will afford plenty of
      * precision left over after the division anyway.
      */
-    uint64_t  b = rxfc->rwm - rxfc->esrwm;
+    uint64_t b = rxfc->rwm - rxfc->esrwm;
     OSSL_TIME now, dt, t_window;
 
     if (b == 0)
         return 0;
 
-    now      = rxfc->now(rxfc->now_arg);
-    dt       = ossl_time_subtract(now, rxfc->epoch_start);
+    now = rxfc->now(rxfc->now_arg);
+    dt = ossl_time_subtract(now, rxfc->epoch_start);
     t_window = ossl_time_muldiv(dt, rxfc->cur_window_size, b);
 
     return ossl_time_compare(t_window, ossl_time_multiply(rtt, 4)) < 0;
 }
 
 static void rxfc_adjust_window_size(QUIC_RXFC *rxfc, uint64_t min_window_size,
-                                    OSSL_TIME rtt)
+    OSSL_TIME rtt)
 {
     /* Are we sending updates too often? */
     uint64_t new_window_size;
@@ -308,7 +308,7 @@ static void rxfc_adjust_window_size(QUIC_RXFC *rxfc, uint64_t min_window_size,
 }
 
 static void rxfc_update_cwm(QUIC_RXFC *rxfc, uint64_t min_window_size,
-                            OSSL_TIME rtt)
+    OSSL_TIME rtt)
 {
     uint64_t new_cwm;
 
@@ -325,8 +325,8 @@ static void rxfc_update_cwm(QUIC_RXFC *rxfc, uint64_t min_window_size,
 }
 
 static int rxfc_on_retire(QUIC_RXFC *rxfc, uint64_t num_bytes,
-                          uint64_t min_window_size,
-                          OSSL_TIME rtt)
+    uint64_t min_window_size,
+    OSSL_TIME rtt)
 {
     if (ossl_time_is_zero(rxfc->epoch_start))
         /* This happens when we retire our first ever bytes. */
@@ -338,8 +338,8 @@ static int rxfc_on_retire(QUIC_RXFC *rxfc, uint64_t num_bytes,
 }
 
 int ossl_quic_rxfc_on_retire(QUIC_RXFC *rxfc,
-                             uint64_t num_bytes,
-                             OSSL_TIME rtt)
+    uint64_t num_bytes,
+    OSSL_TIME rtt)
 {
     if (rxfc->parent == NULL && !rxfc->standalone)
         return 0;
diff --git a/ssl/quic/quic_fifd.c b/ssl/quic/quic_fifd.c
index 1d1bcc11ce633..03b8cebd3057c 100644
--- a/ssl/quic/quic_fifd.c
+++ b/ssl/quic/quic_fifd.c
@@ -14,48 +14,48 @@
 DEFINE_LIST_OF(tx_history, OSSL_ACKM_TX_PKT);
 
 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)
 {
     if (cfq == NULL || ackm == NULL || txpim == NULL
         || get_sstream_by_id == NULL || regen_frame == NULL)
         return 0;
 
-    fifd->cfq                   = cfq;
-    fifd->ackm                  = ackm;
-    fifd->txpim                 = txpim;
-    fifd->get_sstream_by_id     = get_sstream_by_id;
+    fifd->cfq = cfq;
+    fifd->ackm = ackm;
+    fifd->txpim = txpim;
+    fifd->get_sstream_by_id = get_sstream_by_id;
     fifd->get_sstream_by_id_arg = get_sstream_by_id_arg;
-    fifd->regen_frame           = regen_frame;
-    fifd->regen_frame_arg       = regen_frame_arg;
-    fifd->confirm_frame         = confirm_frame;
-    fifd->confirm_frame_arg     = confirm_frame_arg;
-    fifd->sstream_updated       = sstream_updated;
-    fifd->sstream_updated_arg   = sstream_updated_arg;
-    fifd->get_qlog_cb           = get_qlog_cb;
-    fifd->get_qlog_cb_arg       = get_qlog_cb_arg;
+    fifd->regen_frame = regen_frame;
+    fifd->regen_frame_arg = regen_frame_arg;
+    fifd->confirm_frame = confirm_frame;
+    fifd->confirm_frame_arg = confirm_frame_arg;
+    fifd->sstream_updated = sstream_updated;
+    fifd->sstream_updated_arg = sstream_updated_arg;
+    fifd->get_qlog_cb = get_qlog_cb;
+    fifd->get_qlog_cb_arg = get_qlog_cb_arg;
     return 1;
 }
 
@@ -76,28 +76,28 @@ static void on_acked(void *arg)
     /* STREAM and CRYPTO stream chunks, FINs and stream FC frames */
     for (i = 0; i < num_chunks; ++i) {
         sstream = fifd->get_sstream_by_id(chunks[i].stream_id,
-                                          pkt->ackm_pkt.pkt_space,
-                                          fifd->get_sstream_by_id_arg);
+            pkt->ackm_pkt.pkt_space,
+            fifd->get_sstream_by_id_arg);
         if (sstream == NULL)
             continue;
 
         if (chunks[i].end >= chunks[i].start)
             /* coverity[check_return]: Best effort - we cannot fail here. */
             ossl_quic_sstream_mark_acked(sstream,
-                                         chunks[i].start, chunks[i].end);
+                chunks[i].start, chunks[i].end);
 
         if (chunks[i].has_fin && chunks[i].stream_id != UINT64_MAX)
             ossl_quic_sstream_mark_acked_fin(sstream);
 
         if (chunks[i].has_stop_sending && chunks[i].stream_id != UINT64_MAX)
             fifd->confirm_frame(OSSL_QUIC_FRAME_TYPE_STOP_SENDING,
-                                chunks[i].stream_id, pkt,
-                                fifd->confirm_frame_arg);
+                chunks[i].stream_id, pkt,
+                fifd->confirm_frame_arg);
 
         if (chunks[i].has_reset_stream && chunks[i].stream_id != UINT64_MAX)
             fifd->confirm_frame(OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
-                                chunks[i].stream_id, pkt,
-                                fifd->confirm_frame_arg);
+                chunks[i].stream_id, pkt,
+                fifd->confirm_frame_arg);
 
         if (ossl_quic_sstream_is_totally_acked(sstream))
             fifd->sstream_updated(chunks[i].stream_id, fifd->sstream_updated_arg);
@@ -135,8 +135,8 @@ static void on_lost(void *arg)
     /* STREAM and CRYPTO stream chunks, FIN and stream FC frames */
     for (i = 0; i < num_chunks; ++i) {
         sstream = fifd->get_sstream_by_id(chunks[i].stream_id,
-                                          pkt->ackm_pkt.pkt_space,
-                                          fifd->get_sstream_by_id_arg);
+            pkt->ackm_pkt.pkt_space,
+            fifd->get_sstream_by_id_arg);
         if (sstream == NULL)
             continue;
 
@@ -150,7 +150,7 @@ static void on_lost(void *arg)
              * and our call to get_sstream_by_id above will return NULL.
              */
             ossl_quic_sstream_mark_lost(sstream,
-                                        chunks[i].start, chunks[i].end);
+                chunks[i].start, chunks[i].end);
             sstream_updated = 1;
         }
 
@@ -161,13 +161,13 @@ static void on_lost(void *arg)
 
         if (chunks[i].has_stop_sending && chunks[i].stream_id != UINT64_MAX)
             fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_STOP_SENDING,
-                              chunks[i].stream_id, pkt,
-                              fifd->regen_frame_arg);
+                chunks[i].stream_id, pkt,
+                fifd->regen_frame_arg);
 
         if (chunks[i].has_reset_stream && chunks[i].stream_id != UINT64_MAX)
             fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
-                              chunks[i].stream_id, pkt,
-                              fifd->regen_frame_arg);
+                chunks[i].stream_id, pkt,
+                fifd->regen_frame_arg);
 
         /*
          * Inform caller that stream needs an FC frame.
@@ -180,13 +180,13 @@ static void on_lost(void *arg)
          * handling loss.
          */
         fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA,
-                          chunks[i].stream_id,
-                          pkt,
-                          fifd->regen_frame_arg);
+            chunks[i].stream_id,
+            pkt,
+            fifd->regen_frame_arg);
 
         if (sstream_updated && chunks[i].stream_id != UINT64_MAX)
             fifd->sstream_updated(chunks[i].stream_id,
-                                  fifd->sstream_updated_arg);
+                fifd->sstream_updated_arg);
     }
 
     /* GCR */
@@ -198,23 +198,23 @@ static void on_lost(void *arg)
     /* Regenerate flag frames */
     if (pkt->had_handshake_done_frame)
         fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE,
-                          UINT64_MAX, pkt,
-                          fifd->regen_frame_arg);
+            UINT64_MAX, pkt,
+            fifd->regen_frame_arg);
 
     if (pkt->had_max_data_frame)
         fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_MAX_DATA,
-                          UINT64_MAX, pkt,
-                          fifd->regen_frame_arg);
+            UINT64_MAX, pkt,
+            fifd->regen_frame_arg);
 
     if (pkt->had_max_streams_bidi_frame)
         fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI,
-                          UINT64_MAX, pkt,
-                          fifd->regen_frame_arg);
+            UINT64_MAX, pkt,
+            fifd->regen_frame_arg);
 
     if (pkt->had_max_streams_uni_frame)
         fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI,
-                          UINT64_MAX, pkt,
-                          fifd->regen_frame_arg);
+            UINT64_MAX, pkt,
+            fifd->regen_frame_arg);
 
     if (pkt->had_ack_frame)
         /*
@@ -223,8 +223,8 @@ static void on_lost(void *arg)
          * whether it wants to send ECN data or not.
          */
         fifd->regen_frame(OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN,
-                          UINT64_MAX, pkt,
-                          fifd->regen_frame_arg);
+            UINT64_MAX, pkt,
+            fifd->regen_frame_arg);
 
     ossl_quic_txpim_pkt_release(fifd->txpim, pkt);
 }
@@ -256,12 +256,12 @@ int ossl_quic_fifd_pkt_commit(QUIC_FIFD *fifd, QUIC_TXPIM_PKT *pkt)
     size_t i, num_chunks;
     QUIC_SSTREAM *sstream;
 
-    pkt->fifd                   = fifd;
+    pkt->fifd = fifd;
 
-    pkt->ackm_pkt.on_lost       = on_lost;
-    pkt->ackm_pkt.on_acked      = on_acked;
-    pkt->ackm_pkt.on_discarded  = on_discarded;
-    pkt->ackm_pkt.cb_arg        = pkt;
+    pkt->ackm_pkt.on_lost = on_lost;
+    pkt->ackm_pkt.on_acked = on_acked;
+    pkt->ackm_pkt.on_discarded = on_discarded;
+    pkt->ackm_pkt.cb_arg = pkt;
 
     ossl_list_tx_history_init_elem(&pkt->ackm_pkt);
     pkt->ackm_pkt.anext = pkt->ackm_pkt.lnext = NULL;
@@ -271,8 +271,8 @@ int ossl_quic_fifd_pkt_commit(QUIC_FIFD *fifd, QUIC_TXPIM_PKT *pkt)
      * transmitted.
      */
     for (cfq_item = pkt->retx_head;
-         cfq_item != NULL;
-         cfq_item = cfq_item->pkt_next)
+        cfq_item != NULL;
+        cfq_item = cfq_item->pkt_next)
         ossl_quic_cfq_mark_tx(fifd->cfq, cfq_item);
 
     /*
@@ -283,21 +283,21 @@ int ossl_quic_fifd_pkt_commit(QUIC_FIFD *fifd, QUIC_TXPIM_PKT *pkt)
     num_chunks = ossl_quic_txpim_pkt_get_num_chunks(pkt);
     for (i = 0; i < num_chunks; ++i) {
         sstream = fifd->get_sstream_by_id(chunks[i].stream_id,
-                                          pkt->ackm_pkt.pkt_space,
-                                          fifd->get_sstream_by_id_arg);
+            pkt->ackm_pkt.pkt_space,
+            fifd->get_sstream_by_id_arg);
         if (sstream == NULL)
             continue;
 
         if (chunks[i].end >= chunks[i].start
             && !ossl_quic_sstream_mark_transmitted(sstream,
-                                                   chunks[i].start,
-                                                   chunks[i].end))
+                chunks[i].start,
+                chunks[i].end))
             return 0;
 
         if (chunks[i].has_fin
             && !ossl_quic_sstream_mark_transmitted_fin(sstream,
-                                                       chunks[i].end + 1))
-                return 0;
+                chunks[i].end + 1))
+            return 0;
     }
 
     /* Inform the ACKM. */
@@ -305,8 +305,8 @@ 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 *get_qlog_cb_arg)
+    void *get_qlog_cb_arg)
 {
-    fifd->get_qlog_cb       = get_qlog_cb;
-    fifd->get_qlog_cb_arg   = get_qlog_cb_arg;
+    fifd->get_qlog_cb = get_qlog_cb;
+    fifd->get_qlog_cb_arg = get_qlog_cb_arg;
 }
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index 5fa422473d4ae..1b4bbd4a92159 100644
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -39,7 +39,7 @@ static void qc_update_reject_policy(QUIC_CONNECTION *qc);
 static void qc_touch_default_xso(QUIC_CONNECTION *qc);
 static void qc_set_default_xso(QUIC_CONNECTION *qc, QUIC_XSO *xso, int touch);
 static void qc_set_default_xso_keep_ref(QUIC_CONNECTION *qc, QUIC_XSO *xso,
-                                        int touch, QUIC_XSO **old_xso);
+    int touch, QUIC_XSO **old_xso);
 static SSL *quic_conn_stream_new(QCTX *ctx, uint64_t flags, int need_lock);
 static int quic_validate_for_write(QUIC_XSO *xso, int *err);
 static int quic_mutation_allowed(QUIC_CONNECTION *qc, int req_active);
@@ -67,12 +67,12 @@ static int qctx_should_autotick(QCTX *ctx);
  *     of SSL_get_error.
  */
 struct qctx_st {
-    QUIC_OBJ        *obj;
-    QUIC_DOMAIN     *qd;
-    QUIC_LISTENER   *ql;
+    QUIC_OBJ *obj;
+    QUIC_DOMAIN *qd;
+    QUIC_LISTENER *ql;
     QUIC_CONNECTION *qc;
-    QUIC_XSO        *xso;
-    int             is_stream, is_listener, is_domain, in_io;
+    QUIC_XSO *xso;
+    int is_stream, is_listener, is_domain, in_io;
 };
 
 QUIC_NEEDS_LOCK
@@ -94,7 +94,7 @@ static void quic_set_last_error(QCTX *ctx, int last_error)
  */
 QUIC_NEEDS_LOCK
 static int quic_raise_normal_error(QCTX *ctx,
-                                   int err)
+    int err)
 {
     assert(ctx->in_io);
     quic_set_last_error(ctx, err);
@@ -114,12 +114,12 @@ static int quic_raise_normal_error(QCTX *ctx,
  * ctx should be NULL if the connection lock is not held.
  */
 static int quic_raise_non_normal_error(QCTX *ctx,
-                                       const char *file,
-                                       int line,
-                                       const char *func,
-                                       int reason,
-                                       const char *fmt,
-                                       ...)
+    const char *file,
+    int line,
+    const char *func,
+    int reason,
+    const char *fmt,
+    ...)
 {
     va_list args;
 
@@ -140,15 +140,15 @@ static int quic_raise_non_normal_error(QCTX *ctx,
     return 0;
 }
 
-#define QUIC_RAISE_NORMAL_ERROR(ctx, err)                       \
+#define QUIC_RAISE_NORMAL_ERROR(ctx, err) \
     quic_raise_normal_error((ctx), (err))
 
-#define QUIC_RAISE_NON_NORMAL_ERROR(ctx, reason, msg)           \
-    quic_raise_non_normal_error((ctx),                          \
-                                OPENSSL_FILE, OPENSSL_LINE,     \
-                                OPENSSL_FUNC,                   \
-                                (reason),                       \
-                                (msg))
+#define QUIC_RAISE_NON_NORMAL_ERROR(ctx, reason, msg) \
+    quic_raise_non_normal_error((ctx),                \
+        OPENSSL_FILE, OPENSSL_LINE,                   \
+        OPENSSL_FUNC,                                 \
+        (reason),                                     \
+        (msg))
 /*
  * Flags for expect_quic_as:
  *
@@ -186,15 +186,20 @@ static int quic_raise_non_normal_error(QCTX *ctx,
  *      This determines whether SSL_get_error() is updated; the value it returns
  *      is modified only by an I/O call.
  *
+ *   QCTX_NO_ERROR
+ *      Don't raise an error if the object type is wrong. Should not be used in
+ *      conjunction with any flags that may raise errors not related to a wrong
+ *      object type.
  */
-#define QCTX_C              (1U << 0)
-#define QCTX_S              (1U << 1)
-#define QCTX_L              (1U << 2)
-#define QCTX_AUTO_S         (1U << 3)
-#define QCTX_REMOTE_INIT    (1U << 4)
-#define QCTX_LOCK           (1U << 5)
-#define QCTX_IO             (1U << 6)
-#define QCTX_D              (1U << 7)
+#define QCTX_C (1U << 0)
+#define QCTX_S (1U << 1)
+#define QCTX_L (1U << 2)
+#define QCTX_AUTO_S (1U << 3)
+#define QCTX_REMOTE_INIT (1U << 4)
+#define QCTX_LOCK (1U << 5)
+#define QCTX_IO (1U << 6)
+#define QCTX_D (1U << 7)
+#define QCTX_NO_ERROR (1U << 8)
 
 /*
  * Called when expect_quic failed. Used to diagnose why such a call failed and
@@ -205,14 +210,16 @@ static int wrong_type(const SSL *s, uint32_t flags)
     const uint32_t mask = QCTX_C | QCTX_S | QCTX_L | QCTX_D;
     int code = ERR_R_UNSUPPORTED;
 
-    if ((flags & mask) == QCTX_D)
+    if ((flags & QCTX_NO_ERROR) != 0)
+        return 1;
+    else if ((flags & mask) == QCTX_D)
         code = SSL_R_DOMAIN_USE_ONLY;
     else if ((flags & mask) == QCTX_L)
         code = SSL_R_LISTENER_USE_ONLY;
     else if ((flags & mask) == QCTX_C)
         code = SSL_R_CONN_USE_ONLY;
     else if ((flags & mask) == QCTX_S
-             || (flags & mask) == (QCTX_C | QCTX_S))
+        || (flags & mask) == (QCTX_C | QCTX_S))
         code = SSL_R_NO_STREAM;
 
     return QUIC_RAISE_NON_NORMAL_ERROR(NULL, code, NULL);
@@ -225,7 +232,8 @@ static int wrong_type(const SSL *s, uint32_t flags)
  *
  * After this returns 1, all fields of the passed QCTX are initialised.
  * Returns 0 on failure. This function is intended to be used to provide API
- * semantics and as such, it invokes QUIC_RAISE_NON_NORMAL_ERROR() on failure.
+ * semantics and as such, it invokes QUIC_RAISE_NON_NORMAL_ERROR() on failure
+ * unless the QCTX_NO_ERROR flag is set.
  *
  * The flags argument controls the preconditions and postconditions of this
  * function. See above for the different flags.
@@ -255,15 +263,15 @@ static int expect_quic_as(const SSL *s, QCTX *ctx, uint32_t flags)
     if ((flags & QCTX_AUTO_S) != 0)
         flags |= QCTX_S;
 
-    ctx->obj            = NULL;
-    ctx->qd             = NULL;
-    ctx->ql             = NULL;
-    ctx->qc             = NULL;
-    ctx->xso            = NULL;
-    ctx->is_stream      = 0;
-    ctx->is_listener    = 0;
-    ctx->is_domain      = 0;
-    ctx->in_io          = ((flags & QCTX_IO) != 0);
+    ctx->obj = NULL;
+    ctx->qd = NULL;
+    ctx->ql = NULL;
+    ctx->qc = NULL;
+    ctx->xso = NULL;
+    ctx->is_stream = 0;
+    ctx->is_listener = 0;
+    ctx->is_domain = 0;
+    ctx->in_io = ((flags & QCTX_IO) != 0);
 
     if (s == NULL) {
         QUIC_RAISE_NON_NORMAL_ERROR(NULL, ERR_R_PASSED_NULL_PARAMETER, NULL);
@@ -277,10 +285,10 @@ static int expect_quic_as(const SSL *s, QCTX *ctx, uint32_t flags)
             goto err;
         }
 
-        qd                  = (QUIC_DOMAIN *)s;
-        ctx->obj            = &qd->obj;
-        ctx->qd             = qd;
-        ctx->is_domain      = 1;
+        qd = (QUIC_DOMAIN *)s;
+        ctx->obj = &qd->obj;
+        ctx->qd = qd;
+        ctx->is_domain = 1;
         break;
 
     case SSL_TYPE_QUIC_LISTENER:
@@ -289,19 +297,19 @@ static int expect_quic_as(const SSL *s, QCTX *ctx, uint32_t flags)
             goto err;
         }
 
-        ql                  = (QUIC_LISTENER *)s;
-        ctx->obj            = &ql->obj;
-        ctx->qd             = ql->domain;
-        ctx->ql             = ql;
-        ctx->is_listener    = 1;
+        ql = (QUIC_LISTENER *)s;
+        ctx->obj = &ql->obj;
+        ctx->qd = ql->domain;
+        ctx->ql = ql;
+        ctx->is_listener = 1;
         break;
 
     case SSL_TYPE_QUIC_CONNECTION:
-        qc                  = (QUIC_CONNECTION *)s;
-        ctx->obj            = &qc->obj;
-        ctx->qd             = qc->domain;
-        ctx->ql             = qc->listener; /* never changes, so can be read without lock */
-        ctx->qc             = qc;
+        qc = (QUIC_CONNECTION *)s;
+        ctx->obj = &qc->obj;
+        ctx->qd = qc->domain;
+        ctx->ql = qc->listener; /* never changes, so can be read without lock */
+        ctx->qc = qc;
 
         if ((flags & QCTX_AUTO_S) != 0) {
             if ((flags & QCTX_IO) != 0)
@@ -338,7 +346,7 @@ static int expect_quic_as(const SSL *s, QCTX *ctx, uint32_t flags)
             goto err;
         }
 
-        ctx->xso            = qc->default_xso;
+        ctx->xso = qc->default_xso;
         break;
 
     case SSL_TYPE_QUIC_XSO:
@@ -347,13 +355,13 @@ static int expect_quic_as(const SSL *s, QCTX *ctx, uint32_t flags)
             goto err;
         }
 
-        xso                 = (QUIC_XSO *)s;
-        ctx->obj            = &xso->obj;
-        ctx->qd             = xso->conn->domain;
-        ctx->ql             = xso->conn->listener;
-        ctx->qc             = xso->conn;
-        ctx->xso            = xso;
-        ctx->is_stream      = 1;
+        xso = (QUIC_XSO *)s;
+        ctx->obj = &xso->obj;
+        ctx->qd = xso->conn->domain;
+        ctx->ql = xso->conn->listener;
+        ctx->qc = xso->conn;
+        ctx->xso = xso;
+        ctx->is_stream = 1;
         break;
 
     default:
@@ -378,6 +386,25 @@ static int expect_quic_as(const SSL *s, QCTX *ctx, uint32_t flags)
     return ok;
 }
 
+static int is_quic_c(const SSL *s, QCTX *ctx, int raiseerrs)
+{
+    uint32_t flags = QCTX_C;
+
+    if (!raiseerrs)
+        flags |= QCTX_NO_ERROR;
+    return expect_quic_as(s, ctx, flags);
+}
+
+/* Same as expect_quic_cs except that errors are not raised if raiseerrs == 0 */
+static int is_quic_cs(const SSL *s, QCTX *ctx, int raiseerrs)
+{
+    uint32_t flags = QCTX_C | QCTX_S;
+
+    if (!raiseerrs)
+        flags |= QCTX_NO_ERROR;
+    return expect_quic_as(s, ctx, flags);
+}
+
 static int expect_quic_cs(const SSL *s, QCTX *ctx)
 {
     return expect_quic_as(s, ctx, QCTX_C | QCTX_S);
@@ -417,7 +444,7 @@ static int expect_quic_domain(const SSL *s, QCTX *ctx)
  */
 QUIC_ACQUIRES_LOCK
 static int ossl_unused expect_quic_with_stream_lock(const SSL *s, int remote_init,
-                                                    int in_io, QCTX *ctx)
+    int in_io, QCTX *ctx)
 {
     uint32_t flags = QCTX_S | QCTX_LOCK;
 
@@ -519,8 +546,8 @@ static int qctx_blocking(QCTX *ctx)
  */
 QUIC_NEEDS_LOCK
 static int block_until_pred(QCTX *ctx,
-                            int (*pred)(void *arg), void *pred_arg,
-                            uint32_t flags)
+    int (*pred)(void *arg), void *pred_arg,
+    uint32_t flags)
 {
     QUIC_ENGINE *qeng;
     QUIC_REACTOR *rtor;
@@ -561,6 +588,15 @@ SSL *ossl_quic_new(SSL_CTX *ctx)
     QUIC_CONNECTION *qc = NULL;
     SSL_CONNECTION *sc = NULL;
 
+    /*
+     * QUIC_server_method should not be used with SSL_new.
+     * It should only be used with SSL_new_listener.
+     */
+    if (ctx->method == OSSL_QUIC_server_method()) {
+        QUIC_RAISE_NON_NORMAL_ERROR(NULL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED, NULL);
+        return NULL;
+    }
+
     qc = OPENSSL_zalloc(sizeof(*qc));
     if (qc == NULL) {
         QUIC_RAISE_NON_NORMAL_ERROR(NULL, ERR_R_CRYPTO_LIB, NULL);
@@ -583,7 +619,7 @@ SSL *ossl_quic_new(SSL_CTX *ctx)
     }
 
     /* override the user_ssl of the inner connection */
-    sc->s3.flags |= TLS1_FLAGS_QUIC;
+    sc->s3.flags |= TLS1_FLAGS_QUIC | TLS1_FLAGS_QUIC_INTERNAL;
 
     /* Restrict options derived from the SSL_CTX. */
     sc->options &= OSSL_QUIC_PERMITTED_OPTIONS_CONN;
@@ -595,7 +631,7 @@ SSL *ossl_quic_new(SSL_CTX *ctx)
         = ((ctx->domain_flags & SSL_DOMAIN_FLAG_THREAD_ASSISTED) != 0);
 #endif
 
-    qc->as_server       = 0;
+    qc->as_server = 0;
     qc->as_server_state = qc->as_server;
 
     if (!create_channel(qc, ctx))
@@ -606,17 +642,17 @@ SSL *ossl_quic_new(SSL_CTX *ctx)
 
     /* Initialise the QUIC_CONNECTION's QUIC_OBJ base. */
     if (!ossl_quic_obj_init(&qc->obj, ctx, SSL_TYPE_QUIC_CONNECTION, NULL,
-                            qc->engine, qc->port)) {
+            qc->engine, qc->port)) {
         QUIC_RAISE_NON_NORMAL_ERROR(NULL, ERR_R_INTERNAL_ERROR, NULL);
         goto err;
     }
 
     /* Initialise libssl APL-related state. */
-    qc->default_stream_mode     = SSL_DEFAULT_STREAM_MODE_AUTO_BIDI;
-    qc->default_ssl_mode        = qc->obj.ssl.ctx->mode;
-    qc->default_ssl_options     = qc->obj.ssl.ctx->options & OSSL_QUIC_PERMITTED_OPTIONS;
-    qc->incoming_stream_policy  = SSL_INCOMING_STREAM_POLICY_AUTO;
-    qc->last_error              = SSL_ERROR_NONE;
+    qc->default_stream_mode = SSL_DEFAULT_STREAM_MODE_AUTO_BIDI;
+    qc->default_ssl_mode = qc->obj.ssl.ctx->mode;
+    qc->default_ssl_options = qc->obj.ssl.ctx->options & OSSL_QUIC_PERMITTED_OPTIONS;
+    qc->incoming_stream_policy = SSL_INCOMING_STREAM_POLICY_AUTO;
+    qc->last_error = SSL_ERROR_NONE;
 
     qc_update_reject_policy(qc);
 
@@ -742,22 +778,22 @@ void ossl_quic_free(SSL *s)
         --ctx.qc->num_xso;
 
         /* If a stream's send part has not been finished, auto-reset it. */
-        if ((   ctx.xso->stream->send_state == QUIC_SSTREAM_STATE_READY
-             || ctx.xso->stream->send_state == QUIC_SSTREAM_STATE_SEND)
+        if ((ctx.xso->stream->send_state == QUIC_SSTREAM_STATE_READY
+                || ctx.xso->stream->send_state == QUIC_SSTREAM_STATE_SEND)
             && !ossl_quic_sstream_get_final_size(ctx.xso->stream->sstream, NULL))
             ossl_quic_stream_map_reset_stream_send_part(ossl_quic_channel_get_qsm(ctx.qc->ch),
-                                                        ctx.xso->stream, 0);
+                ctx.xso->stream, 0);
 
         /* Do STOP_SENDING for the receive part, if applicable. */
-        if (   ctx.xso->stream->recv_state == QUIC_RSTREAM_STATE_RECV
+        if (ctx.xso->stream->recv_state == QUIC_RSTREAM_STATE_RECV
             || ctx.xso->stream->recv_state == QUIC_RSTREAM_STATE_SIZE_KNOWN)
             ossl_quic_stream_map_stop_sending_recv_part(ossl_quic_channel_get_qsm(ctx.qc->ch),
-                                                        ctx.xso->stream, 0);
+                ctx.xso->stream, 0);
 
         /* Update stream state. */
         ctx.xso->stream->deleted = 1;
         ossl_quic_stream_map_update_state(ossl_quic_channel_get_qsm(ctx.qc->ch),
-                                          ctx.xso->stream);
+            ctx.xso->stream);
 
         is_default = (ctx.xso == ctx.qc->default_xso);
         qctx_unlock(&ctx);
@@ -850,8 +886,8 @@ int ossl_quic_clear(SSL *s)
 }
 
 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)
 {
     QCTX ctx;
 
@@ -892,8 +928,8 @@ static void qc_touch_default_xso(QUIC_CONNECTION *qc)
  */
 QUIC_NEEDS_LOCK
 static void qc_set_default_xso_keep_ref(QUIC_CONNECTION *qc, QUIC_XSO *xso,
-                                        int touch,
-                                        QUIC_XSO **old_xso)
+    int touch,
+    QUIC_XSO **old_xso)
 {
     int refs;
 
@@ -988,7 +1024,7 @@ static uint64_t quic_mask_or_options(SSL *ssl, uint64_t mask_value, uint64_t or_
          * changes.
          */
         hs_mask_value = (mask_value & OSSL_QUIC_PERMITTED_OPTIONS_CONN);
-        hs_or_value   = (or_value   & OSSL_QUIC_PERMITTED_OPTIONS_CONN);
+        hs_or_value = (or_value & OSSL_QUIC_PERMITTED_OPTIONS_CONN);
 
         SSL_clear_options(ctx.qc->tls, hs_mask_value);
         SSL_set_options(ctx.qc->tls, hs_or_value);
@@ -996,7 +1032,7 @@ static uint64_t quic_mask_or_options(SSL *ssl, uint64_t mask_value, uint64_t or_
         /* Update defaults for new streams. */
         ctx.qc->default_ssl_options
             = ((ctx.qc->default_ssl_options & ~mask_value) | or_value)
-              & OSSL_QUIC_PERMITTED_OPTIONS;
+            & OSSL_QUIC_PERMITTED_OPTIONS;
     }
 
     ret = ctx.qc->default_ssl_options;
@@ -1244,7 +1280,7 @@ int ossl_quic_conn_set_blocking_mode(SSL *s, int blocking)
 }
 
 int ossl_quic_conn_set_initial_peer_addr(SSL *s,
-                                         const BIO_ADDR *peer_addr)
+    const BIO_ADDR *peer_addr)
 {
     QCTX ctx;
 
@@ -1253,7 +1289,7 @@ int ossl_quic_conn_set_initial_peer_addr(SSL *s,
 
     if (ctx.qc->started)
         return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED,
-                                       NULL);
+            NULL);
 
     if (peer_addr == NULL) {
         BIO_ADDR_clear(&ctx.qc->init_peer_addr);
@@ -1319,7 +1355,7 @@ int ossl_quic_get_event_timeout(SSL *s, struct timeval *tv, int *is_infinite)
          * Robustness against faulty applications that don't check *is_infinite;
          * harmless long timeout.
          */
-        tv->tv_sec  = 1000000;
+        tv->tv_sec = 1000000;
         tv->tv_usec = 0;
         return 1;
     }
@@ -1348,7 +1384,7 @@ int ossl_quic_get_rpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *desc)
     net_rbio = ossl_quic_port_get_net_rbio(port);
     if (desc == NULL || net_rbio == NULL)
         return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, ERR_R_PASSED_INVALID_ARGUMENT,
-                                       NULL);
+            NULL);
 
     return BIO_get_rpoll_descriptor(net_rbio, desc);
 }
@@ -1367,7 +1403,7 @@ int ossl_quic_get_wpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *desc)
     net_wbio = ossl_quic_port_get_net_wbio(port);
     if (desc == NULL || net_wbio == NULL)
         return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, ERR_R_PASSED_INVALID_ARGUMENT,
-                                       NULL);
+            NULL);
 
     return BIO_get_wpoll_descriptor(net_wbio, desc);
 }
@@ -1467,8 +1503,8 @@ static int quic_shutdown_peer_wait(void *arg)
 
 QUIC_TAKES_LOCK
 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)
 {
     int ret;
     QCTX ctx;
@@ -1544,8 +1580,8 @@ int ossl_quic_conn_shutdown(SSL *s, uint64_t flags,
      * affect the wait_peer case.
      */
     ossl_quic_channel_local_close(ctx.qc->ch,
-                                  args != NULL ? args->quic_error_code : 0,
-                                  args != NULL ? args->quic_reason : NULL);
+        args != NULL ? args->quic_error_code : 0,
+        args != NULL ? args->quic_reason : NULL);
 
     SSL_set_shutdown(ctx.qc->tls, SSL_SENT_SHUTDOWN);
 
@@ -1626,14 +1662,14 @@ long ossl_quic_ctrl(SSL *s, int cmd, long larg, void *parg)
         return SSL_ctrl(ctx.qc->tls, cmd, larg, parg);
 
     case DTLS_CTRL_GET_TIMEOUT: /* DTLSv1_get_timeout */
-        {
-            int is_infinite;
+    {
+        int is_infinite;
 
-            if (!ossl_quic_get_event_timeout(s, parg, &is_infinite))
-                return 0;
+        if (!ossl_quic_get_event_timeout(s, parg, &is_infinite))
+            return 0;
 
-            return !is_infinite;
-        }
+        return !is_infinite;
+    }
     case DTLS_CTRL_HANDLE_TIMEOUT: /* DTLSv1_handle_timeout */
         /* For legacy compatibility with DTLS calls. */
         return ossl_quic_handle_events(s) == 1 ? 1 : -1;
@@ -1663,38 +1699,52 @@ long ossl_quic_ctrl(SSL *s, int cmd, long larg, void *parg)
 }
 
 /* SSL_set_connect_state */
-void ossl_quic_set_connect_state(SSL *s)
+int ossl_quic_set_connect_state(SSL *s, int raiseerrs)
 {
     QCTX ctx;
 
-    if (!expect_quic_cs(s, &ctx))
-        return;
+    if (!is_quic_c(s, &ctx, raiseerrs))
+        return 0;
+
+    if (ctx.qc->as_server_state == 0)
+        return 1;
 
     /* Cannot be changed after handshake started */
-    if (ctx.qc->started || ctx.is_stream)
-        return;
+    if (ctx.qc->started) {
+        if (raiseerrs)
+            QUIC_RAISE_NON_NORMAL_ERROR(NULL, SSL_R_INVALID_COMMAND, NULL);
+        return 0;
+    }
 
     ctx.qc->as_server_state = 0;
+    return 1;
 }
 
 /* SSL_set_accept_state */
-void ossl_quic_set_accept_state(SSL *s)
+int ossl_quic_set_accept_state(SSL *s, int raiseerrs)
 {
     QCTX ctx;
 
-    if (!expect_quic_cs(s, &ctx))
-        return;
+    if (!is_quic_c(s, &ctx, raiseerrs))
+        return 0;
+
+    if (ctx.qc->as_server_state == 1)
+        return 1;
 
     /* Cannot be changed after handshake started */
-    if (ctx.qc->started || ctx.is_stream)
-        return;
+    if (ctx.qc->started) {
+        if (raiseerrs)
+            QUIC_RAISE_NON_NORMAL_ERROR(NULL, SSL_R_INVALID_COMMAND, NULL);
+        return 0;
+    }
 
     ctx.qc->as_server_state = 1;
+    return 1;
 }
 
 /* SSL_do_handshake */
 struct quic_handshake_wait_args {
-    QUIC_CONNECTION     *qc;
+    QUIC_CONNECTION *qc;
 };
 
 static int tls_wants_non_io_retry(QUIC_CONNECTION *qc)
@@ -1702,8 +1752,8 @@ static int tls_wants_non_io_retry(QUIC_CONNECTION *qc)
     int want = SSL_want(qc->tls);
 
     if (want == SSL_X509_LOOKUP
-            || want == SSL_CLIENT_HELLO_CB
-            || want == SSL_RETRY_VERIFY)
+        || want == SSL_CLIENT_HELLO_CB
+        || want == SSL_RETRY_VERIFY)
         return 1;
 
     return 0;
@@ -1745,13 +1795,13 @@ static int need_notifier_for_domain_flags(uint64_t domain_flags)
 QUIC_NEEDS_LOCK
 static int create_channel(QUIC_CONNECTION *qc, SSL_CTX *ctx)
 {
-    QUIC_ENGINE_ARGS engine_args = {0};
-    QUIC_PORT_ARGS port_args = {0};
+    QUIC_ENGINE_ARGS engine_args = { 0 };
+    QUIC_PORT_ARGS port_args = { 0 };
 
-    engine_args.libctx        = ctx->libctx;
-    engine_args.propq         = ctx->propq;
+    engine_args.libctx = ctx->libctx;
+    engine_args.propq = ctx->propq;
 #if defined(OPENSSL_THREADS)
-    engine_args.mutex         = qc->mutex;
+    engine_args.mutex = qc->mutex;
 #endif
 
     if (need_notifier_for_domain_flags(ctx->domain_flags))
@@ -1794,14 +1844,14 @@ static int ensure_channel_started(QCTX *ctx)
     if (!qc->started) {
         if (!configure_channel(qc)) {
             QUIC_RAISE_NON_NORMAL_ERROR(ctx, ERR_R_INTERNAL_ERROR,
-                                        "failed to configure channel");
+                "failed to configure channel");
             return 0;
         }
 
         if (!ossl_quic_channel_start(qc->ch)) {
             ossl_quic_channel_restore_err_state(qc->ch);
             QUIC_RAISE_NON_NORMAL_ERROR(ctx, ERR_R_INTERNAL_ERROR,
-                                        "failed to start channel");
+                "failed to start channel");
             return 0;
         }
 
@@ -1809,7 +1859,7 @@ static int ensure_channel_started(QCTX *ctx)
         if (qc->is_thread_assisted)
             if (!ossl_quic_thread_assist_init_start(&qc->thread_assist, qc->ch)) {
                 QUIC_RAISE_NON_NORMAL_ERROR(ctx, ERR_R_INTERNAL_ERROR,
-                                            "failed to start assist thread");
+                    "failed to start assist thread");
                 return 0;
             }
 #endif
@@ -1921,7 +1971,7 @@ static int quic_do_handshake(QCTX *ctx)
         /* In blocking mode, wait for the handshake to complete. */
         struct quic_handshake_wait_args args;
 
-        args.qc     = qc;
+        args.qc = qc;
 
         ret = block_until_pred(ctx, quic_handshake_wait, &args, 0);
         if (!quic_mutation_allowed(qc, /*req_active=*/1)) {
@@ -1974,7 +2024,8 @@ int ossl_quic_do_handshake(SSL *s)
 int ossl_quic_connect(SSL *s)
 {
     /* Ensure we are in connect state (no-op if non-idle). */
-    ossl_quic_set_connect_state(s);
+    if (!ossl_quic_set_connect_state(s, 1))
+        return -1;
 
     /* Begin or continue the handshake */
     return ossl_quic_do_handshake(s);
@@ -1984,7 +2035,8 @@ int ossl_quic_connect(SSL *s)
 int ossl_quic_accept(SSL *s)
 {
     /* Ensure we are in accept state (no-op if non-idle). */
-    ossl_quic_set_accept_state(s);
+    if (!ossl_quic_set_accept_state(s, 1))
+        return -1;
 
     /* Begin or continue the handshake */
     return ossl_quic_do_handshake(s);
@@ -2022,8 +2074,8 @@ static int qc_try_create_default_xso_for_write(QCTX *ctx)
         flags |= SSL_STREAM_FLAG_UNI;
 
     qc_set_default_xso(qc, (QUIC_XSO *)quic_conn_stream_new(ctx, flags,
-                                                            /*needs_lock=*/0),
-                       /*touch=*/0);
+                               /*needs_lock=*/0),
+        /*touch=*/0);
     if (qc->default_xso == NULL)
         return QUIC_RAISE_NON_NORMAL_ERROR(ctx, ERR_R_INTERNAL_ERROR, NULL);
 
@@ -2033,9 +2085,9 @@ static int qc_try_create_default_xso_for_write(QCTX *ctx)
 
 struct quic_wait_for_stream_args {
     QUIC_CONNECTION *qc;
-    QUIC_STREAM     *qs;
-    QCTX            *ctx;
-    uint64_t        expect_id;
+    QUIC_STREAM *qs;
+    QCTX *ctx;
+    uint64_t expect_id;
 };
 
 QUIC_NEEDS_LOCK
@@ -2050,10 +2102,10 @@ static int quic_wait_for_stream(void *arg)
     }
 
     args->qs = ossl_quic_stream_map_get_by_id(ossl_quic_channel_get_qsm(args->qc->ch),
-                                              args->expect_id | QUIC_STREAM_DIR_BIDI);
+        args->expect_id | QUIC_STREAM_DIR_BIDI);
     if (args->qs == NULL)
         args->qs = ossl_quic_stream_map_get_by_id(ossl_quic_channel_get_qsm(args->qc->ch),
-                                                  args->expect_id | QUIC_STREAM_DIR_UNI);
+            args->expect_id | QUIC_STREAM_DIR_UNI);
 
     if (args->qs != NULL)
         return 1; /* stream now exists */
@@ -2091,16 +2143,16 @@ static int qc_wait_for_default_xso_for_read(QCTX *ctx, int peek)
         : QUIC_STREAM_INITIATOR_SERVER;
 
     qs = ossl_quic_stream_map_get_by_id(ossl_quic_channel_get_qsm(qc->ch),
-                                        expect_id | QUIC_STREAM_DIR_BIDI);
+        expect_id | QUIC_STREAM_DIR_BIDI);
     if (qs == NULL)
         qs = ossl_quic_stream_map_get_by_id(ossl_quic_channel_get_qsm(qc->ch),
-                                            expect_id | QUIC_STREAM_DIR_UNI);
+            expect_id | QUIC_STREAM_DIR_UNI);
 
     if (qs == NULL) {
         qctx_maybe_autotick(ctx);
 
         qs = ossl_quic_stream_map_get_by_id(ossl_quic_channel_get_qsm(qc->ch),
-                                            expect_id);
+            expect_id);
     }
 
     if (qs == NULL) {
@@ -2115,9 +2167,9 @@ static int qc_wait_for_default_xso_for_read(QCTX *ctx, int peek)
         }
 
         /* Block until we have a stream. */
-        wargs.qc        = qc;
-        wargs.qs        = NULL;
-        wargs.ctx       = ctx;
+        wargs.qc = qc;
+        wargs.qs = NULL;
+        wargs.ctx = ctx;
         wargs.expect_id = expect_id;
 
         res = block_until_pred(ctx, quic_wait_for_stream, &wargs, 0);
@@ -2136,7 +2188,7 @@ static int qc_wait_for_default_xso_for_read(QCTX *ctx, int peek)
      */
     ossl_statm_get_rtt_info(ossl_quic_channel_get_statm(qc->ch), &rtt_info);
     ossl_quic_stream_map_remove_from_accept_queue(ossl_quic_channel_get_qsm(qc->ch),
-                                                  qs, rtt_info.smoothed_rtt);
+        qs, rtt_info.smoothed_rtt);
 
     /*
      * Now make qs the default stream, creating the necessary XSO.
@@ -2160,7 +2212,7 @@ static QUIC_XSO *create_xso_from_stream(QUIC_CONNECTION *qc, QUIC_STREAM *qs)
     }
 
     if (!ossl_quic_obj_init(&xso->obj, qc->obj.ssl.ctx, SSL_TYPE_QUIC_XSO,
-                            &qc->obj.ssl, NULL, NULL)) {
+            &qc->obj.ssl, NULL, NULL)) {
         QUIC_RAISE_NON_NORMAL_ERROR(NULL, ERR_R_INTERNAL_ERROR, NULL);
         goto err;
     }
@@ -2171,13 +2223,13 @@ static QUIC_XSO *create_xso_from_stream(QUIC_CONNECTION *qc, QUIC_STREAM *qs)
         goto err;
     }
 
-    xso->conn       = qc;
-    xso->ssl_mode   = qc->default_ssl_mode;
+    xso->conn = qc;
+    xso->ssl_mode = qc->default_ssl_mode;
     xso->ssl_options
         = qc->default_ssl_options & OSSL_QUIC_PERMITTED_OPTIONS_STREAM;
     xso->last_error = SSL_ERROR_NONE;
 
-    xso->stream     = qs;
+    xso->stream = qs;
 
     ++qc->num_xso;
     xso_update_options(xso);
@@ -2239,7 +2291,7 @@ static SSL *quic_conn_stream_new(QCTX *ctx, uint64_t flags, int need_lock)
             goto err;
         }
 
-        args.qc     = qc;
+        args.qc = qc;
         args.is_uni = is_uni;
 
         /* Blocking mode - wait until we can get a stream. */
@@ -2276,7 +2328,6 @@ static SSL *quic_conn_stream_new(QCTX *ctx, uint64_t flags, int need_lock)
         qctx_unlock(ctx);
 
     return NULL;
-
 }
 
 QUIC_TAKES_LOCK
@@ -2316,8 +2367,9 @@ int ossl_quic_get_error(const SSL *s, int i)
     QCTX ctx;
     int net_error, last_error;
 
-    if (!expect_quic_cs(s, &ctx))
-        return 0;
+    /* SSL_get_errors() should not raise new errors */
+    if (!is_quic_cs(s, &ctx, 0 /* suppress errors */))
+        return SSL_ERROR_SSL;
 
     qctx_lock(&ctx);
     net_error = ossl_quic_channel_net_error(ctx.qc->ch);
@@ -2335,7 +2387,7 @@ static int error_to_want(int error)
 {
     switch (error) {
     case SSL_ERROR_WANT_CONNECT: /* never used - UDP is connectionless */
-    case SSL_ERROR_WANT_ACCEPT:  /* never used - UDP is connectionless */
+    case SSL_ERROR_WANT_ACCEPT: /* never used - UDP is connectionless */
     case SSL_ERROR_ZERO_RETURN:
     default:
         return SSL_NOTHING;
@@ -2391,8 +2443,8 @@ int ossl_quic_want(const SSL *s)
  */
 QUIC_NEEDS_LOCK
 static void quic_post_write(QUIC_XSO *xso, int did_append,
-                            int did_append_all, uint64_t flags,
-                            int do_tick)
+    int did_append_all, uint64_t flags,
+    int do_tick)
 {
     /*
      * We have appended at least one byte to the stream.
@@ -2400,7 +2452,7 @@ static void quic_post_write(QUIC_XSO *xso, int did_append,
      */
     if (did_append)
         ossl_quic_stream_map_update_state(ossl_quic_channel_get_qsm(xso->conn->ch),
-                                          xso->stream);
+            xso->stream);
 
     if (did_append_all && (flags & SSL_WRITE_FLAG_CONCLUDE) != 0)
         ossl_quic_sstream_fin(xso->stream->sstream);
@@ -2416,12 +2468,12 @@ static void quic_post_write(QUIC_XSO *xso, int did_append,
 }
 
 struct quic_write_again_args {
-    QUIC_XSO            *xso;
+    QUIC_XSO *xso;
     const unsigned char *buf;
-    size_t              len;
-    size_t              total_written;
-    int                 err;
-    uint64_t            flags;
+    size_t len;
+    size_t total_written;
+    int err;
+    uint64_t flags;
 };
 
 /*
@@ -2429,7 +2481,7 @@ struct quic_write_again_args {
  * deliberately inducing DoS. This has been chosen based on the optimal buffer
  * size for an RTT of 500ms and a bandwidth of 100 Mb/s.
  */
-#define MAX_WRITE_BUF_SIZE      (6 * 1024 * 1024)
+#define MAX_WRITE_BUF_SIZE (6 * 1024 * 1024)
 
 /*
  * Ensure spare buffer space available (up until a limit, at least).
@@ -2460,7 +2512,7 @@ static int sstream_ensure_spare(QUIC_SSTREAM *sstream, uint64_t spare)
  */
 QUIC_NEEDS_LOCK
 static int xso_sstream_append(QUIC_XSO *xso, const unsigned char *buf,
-                              size_t len, size_t *actual_written)
+    size_t len, size_t *actual_written)
 {
     QUIC_SSTREAM *sstream = xso->stream->sstream;
     uint64_t cur = ossl_quic_sstream_get_cur_size(sstream);
@@ -2498,10 +2550,10 @@ static int quic_write_again(void *arg)
         return -2;
 
     quic_post_write(args->xso, actual_written > 0,
-                    args->len == actual_written, args->flags, 0);
+        args->len == actual_written, args->flags, 0);
 
-    args->buf           += actual_written;
-    args->len           -= actual_written;
+    args->buf += actual_written;
+    args->len -= actual_written;
     args->total_written += actual_written;
 
     if (args->len == 0)
@@ -2514,7 +2566,7 @@ static int quic_write_again(void *arg)
 
 QUIC_NEEDS_LOCK
 static int quic_write_blocking(QCTX *ctx, const void *buf, size_t len,
-                               uint64_t flags, size_t *written)
+    uint64_t flags, size_t *written)
 {
     int res;
     QUIC_XSO *xso = ctx->xso;
@@ -2545,12 +2597,12 @@ static int quic_write_blocking(QCTX *ctx, const void *buf, size_t len,
      * buffer has probably filled up. This means we need to block until some of
      * it is freed up.
      */
-    args.xso            = xso;
-    args.buf            = (const unsigned char *)buf + actual_written;
-    args.len            = len - actual_written;
-    args.total_written  = 0;
-    args.err            = ERR_R_INTERNAL_ERROR;
-    args.flags          = flags;
+    args.xso = xso;
+    args.buf = (const unsigned char *)buf + actual_written;
+    args.len = len - actual_written;
+    args.total_written = 0;
+    args.err = ERR_R_INTERNAL_ERROR;
+    args.flags = flags;
 
     res = block_until_pred(ctx, quic_write_again, &args, 0);
     if (res <= 0) {
@@ -2576,28 +2628,28 @@ static int quic_write_blocking(QCTX *ctx, const void *buf, size_t len,
  * write semantics.
  */
 static void aon_write_begin(QUIC_XSO *xso, const unsigned char *buf,
-                            size_t buf_len, size_t already_sent)
+    size_t buf_len, size_t already_sent)
 {
     assert(!xso->aon_write_in_progress);
 
     xso->aon_write_in_progress = 1;
-    xso->aon_buf_base          = buf;
-    xso->aon_buf_pos           = already_sent;
-    xso->aon_buf_len           = buf_len;
+    xso->aon_buf_base = buf;
+    xso->aon_buf_pos = already_sent;
+    xso->aon_buf_len = buf_len;
 }
 
 static void aon_write_finish(QUIC_XSO *xso)
 {
-    xso->aon_write_in_progress   = 0;
-    xso->aon_buf_base            = NULL;
-    xso->aon_buf_pos             = 0;
-    xso->aon_buf_len             = 0;
+    xso->aon_write_in_progress = 0;
+    xso->aon_buf_base = NULL;
+    xso->aon_buf_pos = 0;
+    xso->aon_buf_len = 0;
 }
 
 QUIC_NEEDS_LOCK
 static int quic_write_nonblocking_aon(QCTX *ctx, const void *buf,
-                                      size_t len, uint64_t flags,
-                                      size_t *written)
+    size_t len, uint64_t flags,
+    size_t *written)
 {
     QUIC_XSO *xso = ctx->xso;
     const void *actual_buf;
@@ -2635,7 +2687,7 @@ static int quic_write_nonblocking_aon(QCTX *ctx, const void *buf,
     }
 
     quic_post_write(xso, actual_written > 0, actual_written == actual_len,
-                    flags, qctx_should_autotick(ctx));
+        flags, qctx_should_autotick(ctx));
 
     if (actual_written == actual_len) {
         /* We have sent everything. */
@@ -2685,7 +2737,7 @@ static int quic_write_nonblocking_aon(QCTX *ctx, const void *buf,
 
 QUIC_NEEDS_LOCK
 static int quic_write_nonblocking_epw(QCTX *ctx, const void *buf, size_t len,
-                                      uint64_t flags, size_t *written)
+    uint64_t flags, size_t *written)
 {
     QUIC_XSO *xso = ctx->xso;
 
@@ -2697,7 +2749,7 @@ static int quic_write_nonblocking_epw(QCTX *ctx, const void *buf, size_t len,
     }
 
     quic_post_write(xso, *written > 0, *written == len, flags,
-                    qctx_should_autotick(ctx));
+        qctx_should_autotick(ctx));
 
     if (*written == 0)
         /* SSL_write_ex returns 0 if it didn't write anything. */
@@ -2752,7 +2804,7 @@ static int quic_validate_for_write(QUIC_XSO *xso, int *err)
 
 QUIC_TAKES_LOCK
 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)
 {
     int ret;
     QCTX ctx;
@@ -2772,7 +2824,8 @@ int ossl_quic_write_flags(SSL *s, const void *buf, size_t len,
     }
 
     partial_write = ((ctx.xso != NULL)
-        ? ((ctx.xso->ssl_mode & SSL_MODE_ENABLE_PARTIAL_WRITE) != 0) : 0);
+            ? ((ctx.xso->ssl_mode & SSL_MODE_ENABLE_PARTIAL_WRITE) != 0)
+            : 0);
 
     if ((flags & ~SSL_WRITE_FLAG_CONCLUDE) != 0) {
         ret = QUIC_RAISE_NON_NORMAL_ERROR(&ctx, SSL_R_UNSUPPORTED_WRITE_FLAG, NULL);
@@ -2802,7 +2855,7 @@ int ossl_quic_write_flags(SSL *s, const void *buf, size_t len,
     if (len == 0) {
         if ((flags & SSL_WRITE_FLAG_CONCLUDE) != 0)
             quic_post_write(ctx.xso, 0, 1, flags,
-                            qctx_should_autotick(&ctx));
+                qctx_should_autotick(&ctx));
 
         ret = 1;
         goto out;
@@ -2831,12 +2884,12 @@ int ossl_quic_write(SSL *s, const void *buf, size_t len, size_t *written)
  * --------
  */
 struct quic_read_again_args {
-    QCTX            *ctx;
-    QUIC_STREAM     *stream;
-    void            *buf;
-    size_t          len;
-    size_t          *bytes_read;
-    int             peek;
+    QCTX *ctx;
+    QUIC_STREAM *stream;
+    void *buf;
+    size_t len;
+    size_t *bytes_read;
+    int peek;
 };
 
 QUIC_NEEDS_LOCK
@@ -2879,10 +2932,10 @@ static int quic_validate_for_read(QUIC_XSO *xso, int *err, int *eos)
 
 QUIC_NEEDS_LOCK
 static int quic_read_actual(QCTX *ctx,
-                            QUIC_STREAM *stream,
-                            void *buf, size_t buf_len,
-                            size_t *bytes_read,
-                            int peek)
+    QUIC_STREAM *stream,
+    void *buf, size_t buf_len,
+    size_t *bytes_read,
+    int peek)
 {
     int is_fin = 0, err, eos;
     QUIC_CONNECTION *qc = ctx->qc;
@@ -2898,12 +2951,12 @@ static int quic_read_actual(QCTX *ctx,
 
     if (peek) {
         if (!ossl_quic_rstream_peek(stream->rstream, buf, buf_len,
-                                    bytes_read, &is_fin))
+                bytes_read, &is_fin))
             return QUIC_RAISE_NON_NORMAL_ERROR(ctx, ERR_R_INTERNAL_ERROR, NULL);
 
     } else {
         if (!ossl_quic_rstream_read(stream->rstream, buf, buf_len,
-                                    bytes_read, &is_fin))
+                bytes_read, &is_fin))
             return QUIC_RAISE_NON_NORMAL_ERROR(ctx, ERR_R_INTERNAL_ERROR, NULL);
     }
 
@@ -2920,7 +2973,7 @@ static int quic_read_actual(QCTX *ctx,
             ossl_statm_get_rtt_info(ossl_quic_channel_get_statm(qc->ch), &rtt_info);
 
             if (!ossl_quic_rxfc_on_retire(&stream->rxfc, *bytes_read,
-                                          rtt_info.smoothed_rtt))
+                    rtt_info.smoothed_rtt))
                 return QUIC_RAISE_NON_NORMAL_ERROR(ctx, ERR_R_INTERNAL_ERROR, NULL);
         }
 
@@ -2932,7 +2985,7 @@ static int quic_read_actual(QCTX *ctx,
 
         if (*bytes_read > 0)
             ossl_quic_stream_map_update_state(ossl_quic_channel_get_qsm(qc->ch),
-                                              stream);
+                stream);
     }
 
     if (*bytes_read == 0 && is_fin) {
@@ -2955,8 +3008,8 @@ static int quic_read_again(void *arg)
     }
 
     if (!quic_read_actual(args->ctx, args->stream,
-                          args->buf, args->len, args->bytes_read,
-                          args->peek))
+            args->buf, args->len, args->bytes_read,
+            args->peek))
         return -1;
 
     if (*args->bytes_read > 0)
@@ -3024,12 +3077,12 @@ static int quic_read(SSL *s, void *buf, size_t len, size_t *bytes_read, int peek
          * buffer is empty. This means we need to block until we get
          * at least one byte.
          */
-        args.ctx        = &ctx;
-        args.stream     = ctx.xso->stream;
-        args.buf        = buf;
-        args.len        = len;
+        args.ctx = &ctx;
+        args.stream = ctx.xso->stream;
+        args.buf = buf;
+        args.len = len;
         args.bytes_read = bytes_read;
-        args.peek       = peek;
+        args.peek = peek;
 
         res = block_until_pred(&ctx, quic_read_again, &args, 0);
         if (res == 0) {
@@ -3111,12 +3164,12 @@ static size_t ossl_quic_pending_int(const SSL *s, int check_channel)
 
     if (check_channel)
         avail = ossl_quic_stream_recv_pending(ctx.xso->stream,
-                                              /*include_fin=*/1)
-             || ossl_quic_channel_has_pending(ctx.qc->ch)
-             || ossl_quic_channel_is_term_any(ctx.qc->ch);
+                    /*include_fin=*/1)
+            || ossl_quic_channel_has_pending(ctx.qc->ch)
+            || ossl_quic_channel_is_term_any(ctx.qc->ch);
     else
         avail = ossl_quic_stream_recv_pending(ctx.xso->stream,
-                                              /*include_fin=*/0);
+            /*include_fin=*/0);
 
 out:
     qctx_unlock(&ctx);
@@ -3144,6 +3197,7 @@ int ossl_quic_conn_stream_conclude(SSL *s)
     QCTX ctx;
     QUIC_STREAM *qs;
     int err;
+    int ret;
 
     if (!expect_quic_with_stream_lock(s, /*remote_init=*/0, /*io=*/0, &ctx))
         return 0;
@@ -3151,13 +3205,15 @@ int ossl_quic_conn_stream_conclude(SSL *s)
     qs = ctx.xso->stream;
 
     if (!quic_mutation_allowed(ctx.qc, /*req_active=*/1)) {
+        ret = QUIC_RAISE_NON_NORMAL_ERROR(&ctx, SSL_R_PROTOCOL_IS_SHUTDOWN, NULL);
         qctx_unlock(&ctx);
-        return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, SSL_R_PROTOCOL_IS_SHUTDOWN, NULL);
+        return ret;
     }
 
     if (!quic_validate_for_write(ctx.xso, &err)) {
+        ret = QUIC_RAISE_NON_NORMAL_ERROR(&ctx, err, NULL);
         qctx_unlock(&ctx);
-        return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, err, NULL);
+        return ret;
     }
 
     if (ossl_quic_sstream_get_final_size(qs->sstream, NULL)) {
@@ -3177,9 +3233,9 @@ int ossl_quic_conn_stream_conclude(SSL *s)
  */
 QUIC_TAKES_LOCK
 int SSL_inject_net_dgram(SSL *s, const unsigned char *buf,
-                         size_t buf_len,
-                         const BIO_ADDR *peer,
-                         const BIO_ADDR *local)
+    size_t buf_len,
+    const BIO_ADDR *peer,
+    const BIO_ADDR *local)
 {
     int ret = 0;
     QCTX ctx;
@@ -3354,7 +3410,7 @@ int ossl_quic_set_default_stream_mode(SSL *s, uint32_t mode)
     if (ctx.qc->default_xso_created) {
         qctx_unlock(&ctx);
         return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED,
-                                       "too late to change default stream mode");
+            "too late to change default stream mode");
     }
 
     switch (mode) {
@@ -3366,7 +3422,7 @@ int ossl_quic_set_default_stream_mode(SSL *s, uint32_t mode)
     default:
         qctx_unlock(&ctx);
         return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, ERR_R_PASSED_INVALID_ARGUMENT,
-                                       "bad default stream type");
+            "bad default stream type");
     }
 
     qctx_unlock(&ctx);
@@ -3413,7 +3469,7 @@ int ossl_quic_attach_stream(SSL *conn, SSL *stream)
 
     if (stream == NULL || stream->type != SSL_TYPE_QUIC_XSO)
         return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, ERR_R_PASSED_NULL_PARAMETER,
-                                       "stream to attach must be a valid QUIC stream");
+            "stream to attach must be a valid QUIC stream");
 
     xso = (QUIC_XSO *)stream;
 
@@ -3422,7 +3478,7 @@ int ossl_quic_attach_stream(SSL *conn, SSL *stream)
     if (ctx.qc->default_xso != NULL) {
         qctx_unlock(&ctx);
         return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED,
-                                       "connection already has a default stream");
+            "connection already has a default stream");
     }
 
     /*
@@ -3432,14 +3488,14 @@ int ossl_quic_attach_stream(SSL *conn, SSL *stream)
     if (!CRYPTO_GET_REF(&xso->obj.ssl.references, &nref)) {
         qctx_unlock(&ctx);
         return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, ERR_R_INTERNAL_ERROR,
-                                       "ref");
+            "ref");
     }
 
     if (nref != 1) {
         qctx_unlock(&ctx);
         return QUIC_RAISE_NON_NORMAL_ERROR(&ctx, ERR_R_PASSED_INVALID_ARGUMENT,
-                                       "stream being attached must have "
-                                       "only 1 reference");
+            "stream being attached must have "
+            "only 1 reference");
     }
 
     /* Caller's reference to the XSO is transferred to us. */
@@ -3458,15 +3514,15 @@ QUIC_NEEDS_LOCK
 static int qc_get_effective_incoming_stream_policy(QUIC_CONNECTION *qc)
 {
     switch (qc->incoming_stream_policy) {
-        case SSL_INCOMING_STREAM_POLICY_AUTO:
-            if ((qc->default_xso == NULL && !qc->default_xso_created)
-                || qc->default_stream_mode == SSL_DEFAULT_STREAM_MODE_NONE)
-                return SSL_INCOMING_STREAM_POLICY_ACCEPT;
-            else
-                return SSL_INCOMING_STREAM_POLICY_REJECT;
+    case SSL_INCOMING_STREAM_POLICY_AUTO:
+        if ((qc->default_xso == NULL && !qc->default_xso_created)
+            || qc->default_stream_mode == SSL_DEFAULT_STREAM_MODE_NONE)
+            return SSL_INCOMING_STREAM_POLICY_ACCEPT;
+        else
+            return SSL_INCOMING_STREAM_POLICY_REJECT;
 
-        default:
-            return qc->incoming_stream_policy;
+    default:
+        return qc->incoming_stream_policy;
     }
 }
 
@@ -3477,13 +3533,13 @@ static void qc_update_reject_policy(QUIC_CONNECTION *qc)
     int enable_reject = (policy == SSL_INCOMING_STREAM_POLICY_REJECT);
 
     ossl_quic_channel_set_incoming_stream_auto_reject(qc->ch,
-                                                      enable_reject,
-                                                      qc->incoming_stream_aec);
+        enable_reject,
+        qc->incoming_stream_aec);
 }
 
 QUIC_TAKES_LOCK
 int ossl_quic_set_incoming_stream_policy(SSL *s, int policy,
-                                         uint64_t aec)
+    uint64_t aec)
 {
     int ret = 1;
     QCTX ctx;
@@ -3498,7 +3554,7 @@ int ossl_quic_set_incoming_stream_policy(SSL *s, int policy,
     case SSL_INCOMING_STREAM_POLICY_ACCEPT:
     case SSL_INCOMING_STREAM_POLICY_REJECT:
         ctx.qc->incoming_stream_policy = policy;
-        ctx.qc->incoming_stream_aec    = aec;
+        ctx.qc->incoming_stream_aec = aec;
         break;
 
     default:
@@ -3518,7 +3574,7 @@ int ossl_quic_set_incoming_stream_policy(SSL *s, int policy,
  */
 QUIC_TAKES_LOCK
 static int qc_getset_idle_timeout(QCTX *ctx, uint32_t class_,
-                                  uint64_t *p_value_out, uint64_t *p_value_in)
+    uint64_t *p_value_out, uint64_t *p_value_in)
 {
     int ret = 0;
     uint64_t value_out = 0, value_in;
@@ -3533,13 +3589,13 @@ static int qc_getset_idle_timeout(QCTX *ctx, uint32_t class_,
             value_in = *p_value_in;
             if (value_in > OSSL_QUIC_VLINT_MAX) {
                 QUIC_RAISE_NON_NORMAL_ERROR(ctx, ERR_R_PASSED_INVALID_ARGUMENT,
-                                            NULL);
+                    NULL);
                 goto err;
             }
 
             if (ossl_quic_channel_have_generated_transport_params(ctx->qc->ch)) {
                 QUIC_RAISE_NON_NORMAL_ERROR(ctx, SSL_R_FEATURE_NOT_RENEGOTIABLE,
-                                            NULL);
+                    NULL);
                 goto err;
             }
 
@@ -3551,13 +3607,13 @@ static int qc_getset_idle_timeout(QCTX *ctx, uint32_t class_,
     case SSL_VALUE_CLASS_FEATURE_NEGOTIATED:
         if (p_value_in != NULL) {
             QUIC_RAISE_NON_NORMAL_ERROR(ctx, SSL_R_UNSUPPORTED_CONFIG_VALUE_OP,
-                                        NULL);
+                NULL);
             goto err;
         }
 
         if (!ossl_quic_channel_is_handshake_complete(ctx->qc->ch)) {
             QUIC_RAISE_NON_NORMAL_ERROR(ctx, SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE,
-                                        NULL);
+                NULL);
             goto err;
         }
 
@@ -3568,7 +3624,7 @@ static int qc_getset_idle_timeout(QCTX *ctx, uint32_t class_,
 
     default:
         QUIC_RAISE_NON_NORMAL_ERROR(ctx, SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS,
-                                    NULL);
+            NULL);
         goto err;
     }
 
@@ -3583,14 +3639,14 @@ static int qc_getset_idle_timeout(QCTX *ctx, uint32_t class_,
 
 QUIC_TAKES_LOCK
 static int qc_get_stream_avail(QCTX *ctx, uint32_t class_,
-                               int is_uni, int is_remote,
-                               uint64_t *value)
+    int is_uni, int is_remote,
+    uint64_t *value)
 {
     int ret = 0;
 
     if (class_ != SSL_VALUE_CLASS_GENERIC) {
         QUIC_RAISE_NON_NORMAL_ERROR(ctx, SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS,
-                                    NULL);
+            NULL);
         return 0;
     }
 
@@ -3612,7 +3668,9 @@ static int qctx_should_autotick(QCTX *ctx)
     QUIC_OBJ *obj = ctx->obj;
 
     for (; (event_handling_mode = obj->event_handling_mode) == SSL_VALUE_EVENT_HANDLING_MODE_INHERIT
-           && obj->parent_obj != NULL; obj = obj->parent_obj);
+        && obj->parent_obj != NULL;
+        obj = obj->parent_obj)
+        ;
 
     return event_handling_mode != SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT;
 }
@@ -3628,8 +3686,8 @@ static void qctx_maybe_autotick(QCTX *ctx)
 
 QUIC_TAKES_LOCK
 static int qc_getset_event_handling(QCTX *ctx, uint32_t class_,
-                                    uint64_t *p_value_out,
-                                    uint64_t *p_value_in)
+    uint64_t *p_value_out,
+    uint64_t *p_value_in)
 {
     int ret = 0;
     uint64_t value_out = 0;
@@ -3638,7 +3696,7 @@ static int qc_getset_event_handling(QCTX *ctx, uint32_t class_,
 
     if (class_ != SSL_VALUE_CLASS_GENERIC) {
         QUIC_RAISE_NON_NORMAL_ERROR(ctx, SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS,
-                                    NULL);
+            NULL);
         goto err;
     }
 
@@ -3650,7 +3708,7 @@ static int qc_getset_event_handling(QCTX *ctx, uint32_t class_,
             break;
         default:
             QUIC_RAISE_NON_NORMAL_ERROR(ctx, ERR_R_PASSED_INVALID_ARGUMENT,
-                                        NULL);
+                NULL);
             goto err;
         }
 
@@ -3671,8 +3729,8 @@ static int qc_getset_event_handling(QCTX *ctx, uint32_t class_,
 
 QUIC_TAKES_LOCK
 static int qc_get_stream_write_buf_stat(QCTX *ctx, uint32_t class_,
-                                        uint64_t *p_value_out,
-                                        size_t (*getter)(QUIC_SSTREAM *sstream))
+    uint64_t *p_value_out,
+    size_t (*getter)(QUIC_SSTREAM *sstream))
 {
     int ret = 0;
     size_t value = 0;
@@ -3681,7 +3739,7 @@ static int qc_get_stream_write_buf_stat(QCTX *ctx, uint32_t class_,
 
     if (class_ != SSL_VALUE_CLASS_GENERIC) {
         QUIC_RAISE_NON_NORMAL_ERROR(ctx, SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS,
-                                    NULL);
+            NULL);
         goto err;
     }
 
@@ -3721,7 +3779,7 @@ static int expect_quic_for_value(SSL *s, QCTX *ctx, uint32_t id)
 
 QUIC_TAKES_LOCK
 int ossl_quic_get_value_uint(SSL *s, uint32_t class_, uint32_t id,
-                             uint64_t *value)
+    uint64_t *value)
 {
     QCTX ctx;
 
@@ -3730,7 +3788,7 @@ int ossl_quic_get_value_uint(SSL *s, uint32_t class_, uint32_t id,
 
     if (value == NULL)
         return QUIC_RAISE_NON_NORMAL_ERROR(&ctx,
-                                           ERR_R_PASSED_INVALID_ARGUMENT, NULL);
+            ERR_R_PASSED_INVALID_ARGUMENT, NULL);
 
     switch (id) {
     case SSL_VALUE_QUIC_IDLE_TIMEOUT:
@@ -3750,17 +3808,17 @@ int ossl_quic_get_value_uint(SSL *s, uint32_t class_, uint32_t id,
 
     case SSL_VALUE_STREAM_WRITE_BUF_SIZE:
         return qc_get_stream_write_buf_stat(&ctx, class_, value,
-                                            ossl_quic_sstream_get_buffer_size);
+            ossl_quic_sstream_get_buffer_size);
     case SSL_VALUE_STREAM_WRITE_BUF_USED:
         return qc_get_stream_write_buf_stat(&ctx, class_, value,
-                                            ossl_quic_sstream_get_buffer_used);
+            ossl_quic_sstream_get_buffer_used);
     case SSL_VALUE_STREAM_WRITE_BUF_AVAIL:
         return qc_get_stream_write_buf_stat(&ctx, class_, value,
-                                            ossl_quic_sstream_get_buffer_avail);
+            ossl_quic_sstream_get_buffer_avail);
 
     default:
         return QUIC_RAISE_NON_NORMAL_ERROR(&ctx,
-                                           SSL_R_UNSUPPORTED_CONFIG_VALUE, NULL);
+            SSL_R_UNSUPPORTED_CONFIG_VALUE, NULL);
     }
 
     return 1;
@@ -3768,7 +3826,7 @@ int ossl_quic_get_value_uint(SSL *s, uint32_t class_, uint32_t id,
 
 QUIC_TAKES_LOCK
 int ossl_quic_set_value_uint(SSL *s, uint32_t class_, uint32_t id,
-                             uint64_t value)
+    uint64_t value)
 {
     QCTX ctx;
 
@@ -3784,7 +3842,7 @@ int ossl_quic_set_value_uint(SSL *s, uint32_t class_, uint32_t id,
 
     default:
         return QUIC_RAISE_NON_NORMAL_ERROR(&ctx,
-                                           SSL_R_UNSUPPORTED_CONFIG_VALUE, NULL);
+            SSL_R_UNSUPPORTED_CONFIG_VALUE, NULL);
     }
 
     return 1;
@@ -3795,8 +3853,8 @@ int ossl_quic_set_value_uint(SSL *s, uint32_t class_, uint32_t id,
  * -----------------
  */
 struct wait_for_incoming_stream_args {
-    QCTX            *ctx;
-    QUIC_STREAM     *qs;
+    QCTX *ctx;
+    QUIC_STREAM *qs;
 };
 
 QUIC_NEEDS_LOCK
@@ -3872,7 +3930,7 @@ SSL *ossl_quic_accept_stream(SSL *s, uint64_t flags)
 
     ossl_statm_get_rtt_info(ossl_quic_channel_get_statm(ctx.qc->ch), &rtt_info);
     ossl_quic_stream_map_remove_from_accept_queue(qsm, qs,
-                                                  rtt_info.smoothed_rtt);
+        rtt_info.smoothed_rtt);
     new_s = &xso->obj.ssl;
 
     /* Calling this function inhibits default XSO autocreation. */
@@ -3909,8 +3967,8 @@ size_t ossl_quic_get_accept_stream_queue_len(SSL *s)
  * ----------------
  */
 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)
 {
     QCTX ctx;
     QUIC_STREAM_MAP *qsm;
@@ -3921,9 +3979,9 @@ int ossl_quic_stream_reset(SSL *ssl,
     if (!expect_quic_with_stream_lock(ssl, /*remote_init=*/0, /*io=*/0, &ctx))
         return 0;
 
-    qsm         = ossl_quic_channel_get_qsm(ctx.qc->ch);
-    qs          = ctx.xso->stream;
-    error_code  = (args != NULL ? args->quic_error_code : 0);
+    qsm = ossl_quic_channel_get_qsm(ctx.qc->ch);
+    qs = ctx.xso->stream;
+    error_code = (args != NULL ? args->quic_error_code : 0);
 
     if (!quic_validate_for_write(ctx.xso, &err)) {
         ok = QUIC_RAISE_NON_NORMAL_ERROR(&ctx, err, NULL);
@@ -3944,10 +4002,10 @@ int ossl_quic_stream_reset(SSL *ssl,
  * -------------------------
  */
 static void quic_classify_stream(QUIC_CONNECTION *qc,
-                                 QUIC_STREAM *qs,
-                                 int is_write,
-                                 int *state,
-                                 uint64_t *app_error_code)
+    QUIC_STREAM *qs,
+    int is_write,
+    int *state,
+    uint64_t *app_error_code)
 {
     int local_init;
     uint64_t final_size;
@@ -3972,26 +4030,25 @@ static void quic_classify_stream(QUIC_CONNECTION *qc,
         /* Application has read a FIN. */
         *state = SSL_STREAM_STATE_FINISHED;
     } else if ((!is_write && qs->stop_sending)
-               || (is_write && ossl_quic_stream_send_is_reset(qs))) {
+        || (is_write && ossl_quic_stream_send_is_reset(qs))) {
         /*
          * Stream has been reset locally. FIN takes precedence over this for the
          * read case as the application need not care if the stream is reset
          * after a FIN has been successfully processed.
          */
-        *state          = SSL_STREAM_STATE_RESET_LOCAL;
+        *state = SSL_STREAM_STATE_RESET_LOCAL;
         *app_error_code = !is_write
             ? qs->stop_sending_aec
             : qs->reset_stream_aec;
     } else if ((!is_write && ossl_quic_stream_recv_is_reset(qs))
-               || (is_write && qs->peer_stop_sending)) {
+        || (is_write && qs->peer_stop_sending)) {
         /*
          * Stream has been reset remotely. */
-        *state          = SSL_STREAM_STATE_RESET_REMOTE;
+        *state = SSL_STREAM_STATE_RESET_REMOTE;
         *app_error_code = !is_write
             ? qs->peer_reset_stream_aec
             : qs->peer_stop_sending_aec;
-    } else if (is_write && ossl_quic_sstream_get_final_size(qs->sstream,
-                                                            &final_size)) {
+    } else if (is_write && ossl_quic_sstream_get_final_size(qs->sstream, &final_size)) {
         /*
          * Stream has been finished. Stream reset takes precedence over this for
          * the write case as peer may not have received all data.
@@ -4035,7 +4092,7 @@ int ossl_quic_get_stream_write_state(SSL *ssl)
  * ------------------------------
  */
 static int quic_get_stream_error_code(SSL *ssl, int is_write,
-                                      uint64_t *app_error_code)
+    uint64_t *app_error_code)
 {
     QCTX ctx;
     int state;
@@ -4043,18 +4100,18 @@ static int quic_get_stream_error_code(SSL *ssl, int is_write,
     if (!expect_quic_with_stream_lock(ssl, /*remote_init=*/-1, /*io=*/0, &ctx))
         return -1;
 
-    quic_classify_stream(ctx.qc, ctx.xso->stream, /*is_write=*/0,
-                         &state, app_error_code);
+    quic_classify_stream(ctx.qc, ctx.xso->stream, is_write,
+        &state, app_error_code);
 
     qctx_unlock(&ctx);
     switch (state) {
-        case SSL_STREAM_STATE_FINISHED:
-             return 0;
-        case SSL_STREAM_STATE_RESET_LOCAL:
-        case SSL_STREAM_STATE_RESET_REMOTE:
-             return 1;
-        default:
-             return -1;
+    case SSL_STREAM_STATE_FINISHED:
+        return 0;
+    case SSL_STREAM_STATE_RESET_LOCAL:
+    case SSL_STREAM_STATE_RESET_REMOTE:
+        return 1;
+    default:
+        return -1;
     }
 }
 
@@ -4116,8 +4173,8 @@ int ossl_quic_set_write_buffer_size(SSL *ssl, size_t size)
  * -----------------------
  */
 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)
 {
     QCTX ctx;
     const QUIC_TERMINATE_CAUSE *tc;
@@ -4129,11 +4186,11 @@ int ossl_quic_get_conn_close_info(SSL *ssl,
     if (tc == NULL)
         return 0;
 
-    info->error_code    = tc->error_code;
-    info->frame_type    = tc->frame_type;
-    info->reason        = tc->reason;
-    info->reason_len    = tc->reason_len;
-    info->flags         = 0;
+    info->error_code = tc->error_code;
+    info->frame_type = tc->frame_type;
+    info->reason = tc->reason;
+    info->reason_len = tc->reason_len;
+    info->flags = 0;
     if (!tc->remote)
         info->flags |= SSL_CONN_CLOSE_FLAG_LOCAL;
     if (!tc->app)
@@ -4230,8 +4287,8 @@ static SSL *alloc_port_user_ssl(QUIC_CHANNEL *ch, void *arg)
 SSL *ossl_quic_new_listener(SSL_CTX *ctx, uint64_t flags)
 {
     QUIC_LISTENER *ql = NULL;
-    QUIC_ENGINE_ARGS engine_args = {0};
-    QUIC_PORT_ARGS port_args = {0};
+    QUIC_ENGINE_ARGS engine_args = { 0 };
+    QUIC_PORT_ARGS port_args = { 0 };
 
     if ((ql = OPENSSL_zalloc(sizeof(*ql))) == NULL) {
         QUIC_RAISE_NON_NORMAL_ERROR(NULL, ERR_R_CRYPTO_LIB, NULL);
@@ -4245,10 +4302,10 @@ SSL *ossl_quic_new_listener(SSL_CTX *ctx, uint64_t flags)
     }
 #endif
 
-    engine_args.libctx  = ctx->libctx;
-    engine_args.propq   = ctx->propq;
+    engine_args.libctx = ctx->libctx;
+    engine_args.propq = ctx->propq;
 #if defined(OPENSSL_THREADS)
-    engine_args.mutex   = ql->mutex;
+    engine_args.mutex = ql->mutex;
 #endif
 
     if (need_notifier_for_domain_flags(ctx->domain_flags))
@@ -4259,8 +4316,8 @@ SSL *ossl_quic_new_listener(SSL_CTX *ctx, uint64_t flags)
         goto err;
     }
 
-    port_args.channel_ctx       = ctx;
-    port_args.is_multi_conn     = 1;
+    port_args.channel_ctx = ctx;
+    port_args.is_multi_conn = 1;
     port_args.get_conn_user_ssl = alloc_port_user_ssl;
     port_args.user_ssl_arg = ql;
     if ((flags & SSL_LISTENER_FLAG_NO_VALIDATE) == 0)
@@ -4277,7 +4334,7 @@ SSL *ossl_quic_new_listener(SSL_CTX *ctx, uint64_t flags)
 
     /* Initialise the QUIC_LISTENER's object header. */
     if (!ossl_quic_obj_init(&ql->obj, ctx, SSL_TYPE_QUIC_LISTENER, NULL,
-                            ql->engine, ql->port))
+            ql->engine, ql->port))
         goto err;
 
     return &ql->obj.ssl;
@@ -4301,7 +4358,7 @@ SSL *ossl_quic_new_listener_from(SSL *ssl, uint64_t flags)
 {
     QCTX ctx;
     QUIC_LISTENER *ql = NULL;
-    QUIC_PORT_ARGS port_args = {0};
+    QUIC_PORT_ARGS port_args = { 0 };
 
     if (!expect_quic_domain(ssl, &ctx))
         return NULL;
@@ -4316,8 +4373,8 @@ SSL *ossl_quic_new_listener_from(SSL *ssl, uint64_t flags)
         goto err;
     }
 
-    port_args.channel_ctx       = ssl->ctx;
-    port_args.is_multi_conn     = 1;
+    port_args.channel_ctx = ssl->ctx;
+    port_args.is_multi_conn = 1;
     port_args.get_conn_user_ssl = alloc_port_user_ssl;
     port_args.user_ssl_arg = ql;
     if ((flags & SSL_LISTENER_FLAG_NO_VALIDATE) == 0)
@@ -4328,10 +4385,10 @@ SSL *ossl_quic_new_listener_from(SSL *ssl, uint64_t flags)
         goto err;
     }
 
-    ql->domain  = ctx.qd;
-    ql->engine  = ctx.qd->engine;
+    ql->domain = ctx.qd;
+    ql->engine = ctx.qd->engine;
 #if defined(OPENSSL_THREADS)
-    ql->mutex   = ctx.qd->mutex;
+    ql->mutex = ctx.qd->mutex;
 #endif
 
     /*
@@ -4347,7 +4404,7 @@ SSL *ossl_quic_new_listener_from(SSL *ssl, uint64_t flags)
 
     /* Initialise the QUIC_LISTENER's object header. */
     if (!ossl_quic_obj_init(&ql->obj, ssl->ctx, SSL_TYPE_QUIC_LISTENER,
-                            &ctx.qd->obj.ssl, NULL, ql->port))
+            &ctx.qd->obj.ssl, NULL, ql->port))
         goto err;
 
     qctx_unlock(&ctx);
@@ -4427,7 +4484,7 @@ SSL *ossl_quic_new_from_listener(SSL *ssl, uint64_t flags)
 #endif
 #if !defined(OPENSSL_NO_QUIC_THREAD_ASSIST)
     qc->is_thread_assisted
-    = ((ql->obj.domain_flags & SSL_DOMAIN_FLAG_THREAD_ASSISTED) != 0);
+        = ((ql->obj.domain_flags & SSL_DOMAIN_FLAG_THREAD_ASSISTED) != 0);
 #endif
 
     /* Create the handshake layer. */
@@ -4436,7 +4493,7 @@ SSL *ossl_quic_new_from_listener(SSL *ssl, uint64_t flags)
         QUIC_RAISE_NON_NORMAL_ERROR(NULL, ERR_R_INTERNAL_ERROR, NULL);
         goto err;
     }
-    sc->s3.flags |= TLS1_FLAGS_QUIC;
+    sc->s3.flags |= TLS1_FLAGS_QUIC | TLS1_FLAGS_QUIC_INTERNAL;
 
     qc->default_ssl_options = OSSL_QUIC_PERMITTED_OPTIONS;
     qc->last_error = SSL_ERROR_NONE;
@@ -4458,8 +4515,8 @@ SSL *ossl_quic_new_from_listener(SSL *ssl, uint64_t flags)
      * to create a new QCSO here.
      */
     if (!ossl_quic_obj_init(&qc->obj, ql->obj.ssl.ctx,
-                            SSL_TYPE_QUIC_CONNECTION,
-                            &ql->obj.ssl, NULL, NULL)) {
+            SSL_TYPE_QUIC_CONNECTION,
+            &ql->obj.ssl, NULL, NULL)) {
         QUIC_RAISE_NON_NORMAL_ERROR(NULL, ERR_R_INTERNAL_ERROR, NULL);
         goto err;
     }
@@ -4561,7 +4618,7 @@ SSL *ossl_quic_accept_connection(SSL *ssl, uint64_t flags)
     if (new_ch == NULL && ossl_quic_port_is_running(ctx.ql->port)) {
         if (!no_block && qctx_blocking(&ctx)) {
             ret = block_until_pred(&ctx, quic_accept_connection_wait,
-                                   ctx.ql->port, 0);
+                ctx.ql->port, 0);
             if (ret < 1)
                 goto out;
         } else {
@@ -4586,21 +4643,35 @@ SSL *ossl_quic_accept_connection(SSL *ssl, uint64_t flags)
      * created channel, so once we pop the new channel from the port above
      * we just need to extract it
      */
-    if (new_ch == NULL
-        || (conn_ssl = ossl_quic_channel_get0_tls(new_ch)) == NULL
-        || (conn = SSL_CONNECTION_FROM_SSL(conn_ssl)) == NULL
-        || (conn_ssl = SSL_CONNECTION_GET_USER_SSL(conn)) == NULL)
+    if (new_ch == NULL)
+        goto out;
+
+    /*
+     * All objects below must exist, because new_ch != NULL. The objects are
+     * bound to new_ch. If channel constructor fails to create any item here
+     * it just fails to create channel.
+     */
+    if (!ossl_assert((conn_ssl = ossl_quic_channel_get0_tls(new_ch)) != NULL)
+        || !ossl_assert((conn = SSL_CONNECTION_FROM_SSL(conn_ssl)) != NULL)
+        || !ossl_assert((conn_ssl = SSL_CONNECTION_GET_USER_SSL(conn)) != NULL))
         goto out;
+
     qc = (QUIC_CONNECTION *)conn_ssl;
-    qc->listener = ctx.ql;
     qc->pending = 0;
     if (!SSL_up_ref(&ctx.ql->obj.ssl)) {
+        /*
+         * You might expect ossl_quic_channel_free() to be called here. Be
+         * assured it happens, The process goes as follows:
+         *    - The SSL_free() here is being handled by ossl_quic_free().
+         *    - The very last step of ossl_quic_free() is call to qc_cleanup()
+         *      where channel gets freed.
+         */
         SSL_free(conn_ssl);
-        SSL_free(ossl_quic_channel_get0_tls(new_ch));
-        conn_ssl = NULL;
     }
+    qc->listener = ctx.ql;
 
 out:
+
     qctx_unlock(&ctx);
     return conn_ssl;
 }
@@ -4615,28 +4686,28 @@ static QUIC_CONNECTION *create_qc_from_incoming_conn(QUIC_LISTENER *ql, QUIC_CHA
     }
 
     if (!ossl_quic_obj_init(&qc->obj, ql->obj.ssl.ctx,
-                            SSL_TYPE_QUIC_CONNECTION,
-                            &ql->obj.ssl, NULL, NULL)) {
+            SSL_TYPE_QUIC_CONNECTION,
+            &ql->obj.ssl, NULL, NULL)) {
         QUIC_RAISE_NON_NORMAL_ERROR(NULL, ERR_R_INTERNAL_ERROR, NULL);
         goto err;
     }
 
     ossl_quic_channel_get_peer_addr(ch, &qc->init_peer_addr); /* best effort */
-    qc->pending                 = 1;
-    qc->engine                  = ql->engine;
-    qc->port                    = ql->port;
-    qc->ch                      = ch;
+    qc->pending = 1;
+    qc->engine = ql->engine;
+    qc->port = ql->port;
+    qc->ch = ch;
 #if defined(OPENSSL_THREADS)
-    qc->mutex                   = ql->mutex;
+    qc->mutex = ql->mutex;
 #endif
-    qc->tls                     = ossl_quic_channel_get0_tls(ch);
-    qc->started                 = 1;
-    qc->as_server               = 1;
-    qc->as_server_state         = 1;
-    qc->default_stream_mode     = SSL_DEFAULT_STREAM_MODE_AUTO_BIDI;
-    qc->default_ssl_options     = ql->obj.ssl.ctx->options & OSSL_QUIC_PERMITTED_OPTIONS;
-    qc->incoming_stream_policy  = SSL_INCOMING_STREAM_POLICY_AUTO;
-    qc->last_error              = SSL_ERROR_NONE;
+    qc->tls = ossl_quic_channel_get0_tls(ch);
+    qc->started = 1;
+    qc->as_server = 1;
+    qc->as_server_state = 1;
+    qc->default_stream_mode = SSL_DEFAULT_STREAM_MODE_AUTO_BIDI;
+    qc->default_ssl_options = ql->obj.ssl.ctx->options & OSSL_QUIC_PERMITTED_OPTIONS;
+    qc->incoming_stream_policy = SSL_INCOMING_STREAM_POLICY_AUTO;
+    qc->last_error = SSL_ERROR_NONE;
     qc_update_reject_policy(qc);
     return qc;
 
@@ -4716,6 +4787,7 @@ void ossl_quic_free_token_store(SSL_TOKEN_STORE *hdl)
     ossl_crypto_mutex_free(&hdl->mutex);
     lh_QUIC_TOKEN_doall(hdl->cache, free_this_token);
     lh_QUIC_TOKEN_free(hdl->cache);
+    CRYPTO_FREE_REF(&hdl->references);
     OPENSSL_free(hdl);
     return;
 }
@@ -4748,7 +4820,7 @@ void ossl_quic_free_token_store(SSL_TOKEN_STORE *hdl)
  * @returns a QUIC_TOKEN pointer or NULL on error
  */
 static QUIC_TOKEN *ossl_quic_build_new_token(BIO_ADDR *peer, uint8_t *token,
-                                             size_t token_len)
+    size_t token_len)
 {
     QUIC_TOKEN *new_token;
     size_t hashkey_len = 0;
@@ -4801,7 +4873,7 @@ static QUIC_TOKEN *ossl_quic_build_new_token(BIO_ADDR *peer, uint8_t *token,
 }
 
 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)
 {
     SSL_TOKEN_STORE *c = ctx->tokencache;
     QUIC_TOKEN *tok, *old = NULL;
@@ -4828,7 +4900,7 @@ int ossl_quic_set_peer_token(SSL_CTX *ctx, BIO_ADDR *peer,
 }
 
 int ossl_quic_get_peer_token(SSL_CTX *ctx, BIO_ADDR *peer,
-                             QUIC_TOKEN **token)
+    QUIC_TOKEN **token)
 {
     SSL_TOKEN_STORE *c = ctx->tokencache;
     QUIC_TOKEN *key = NULL;
@@ -4840,6 +4912,9 @@ int ossl_quic_get_peer_token(SSL_CTX *ctx, BIO_ADDR *peer,
         return 0;
 
     key = ossl_quic_build_new_token(peer, NULL, 0);
+    if (key == NULL)
+        return 0;
+
     ossl_crypto_mutex_lock(c->mutex);
     tok = lh_QUIC_TOKEN_retrieve(c->cache, key);
     if (tok != NULL) {
@@ -4900,13 +4975,11 @@ size_t ossl_quic_get_accept_connection_queue_len(SSL *ssl)
 SSL *ossl_quic_new_domain(SSL_CTX *ctx, uint64_t flags)
 {
     QUIC_DOMAIN *qd = NULL;
-    QUIC_ENGINE_ARGS engine_args = {0};
+    QUIC_ENGINE_ARGS engine_args = { 0 };
     uint64_t domain_flags;
 
     domain_flags = ctx->domain_flags;
-    if ((flags & (SSL_DOMAIN_FLAG_SINGLE_THREAD
-                  | SSL_DOMAIN_FLAG_MULTI_THREAD
-                  | SSL_DOMAIN_FLAG_THREAD_ASSISTED)) != 0)
+    if ((flags & (SSL_DOMAIN_FLAG_SINGLE_THREAD | SSL_DOMAIN_FLAG_MULTI_THREAD | SSL_DOMAIN_FLAG_THREAD_ASSISTED)) != 0)
         domain_flags = flags;
     else
         domain_flags = ctx->domain_flags | flags;
@@ -4926,10 +4999,10 @@ SSL *ossl_quic_new_domain(SSL_CTX *ctx, uint64_t flags)
     }
 #endif
 
-    engine_args.libctx  = ctx->libctx;
-    engine_args.propq   = ctx->propq;
+    engine_args.libctx = ctx->libctx;
+    engine_args.propq = ctx->propq;
 #if defined(OPENSSL_THREADS)
-    engine_args.mutex   = qd->mutex;
+    engine_args.mutex = qd->mutex;
 #endif
 
     if (need_notifier_for_domain_flags(domain_flags))
@@ -4942,7 +5015,7 @@ SSL *ossl_quic_new_domain(SSL_CTX *ctx, uint64_t flags)
 
     /* Initialise the QUIC_DOMAIN's object header. */
     if (!ossl_quic_obj_init(&qd->obj, ctx, SSL_TYPE_QUIC_DOMAIN, NULL,
-                            qd->engine, NULL))
+            qd->engine, NULL))
         goto err;
 
     ossl_quic_obj_set_domain_flags(&qd->obj, domain_flags);
@@ -4970,7 +5043,7 @@ long ossl_quic_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
     }
 }
 
-long ossl_quic_callback_ctrl(SSL *s, int cmd, void (*fp) (void))
+long ossl_quic_callback_ctrl(SSL *s, int cmd, void (*fp)(void))
 {
     QCTX ctx;
 
@@ -4980,9 +5053,10 @@ long ossl_quic_callback_ctrl(SSL *s, int cmd, void (*fp) (void))
     switch (cmd) {
     case SSL_CTRL_SET_MSG_CALLBACK:
         ossl_quic_channel_set_msg_callback(ctx.qc->ch, (ossl_msg_cb)fp,
-                                           &ctx.qc->obj.ssl);
+            &ctx.qc->obj.ssl);
         /* This callback also needs to be set on the internal SSL object */
-        return ssl3_callback_ctrl(ctx.qc->tls, cmd, fp);;
+        return ssl3_callback_ctrl(ctx.qc->tls, cmd, fp);
+        ;
 
     default:
         /* Probably a TLS related ctrl. Defer to our internal SSL object */
@@ -4990,7 +5064,7 @@ long ossl_quic_callback_ctrl(SSL *s, int cmd, void (*fp) (void))
     }
 }
 
-long ossl_quic_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void))
+long ossl_quic_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
 {
     return ssl3_ctx_callback_ctrl(ctx, cmd, fp);
 }
@@ -5005,6 +5079,8 @@ const SSL_CIPHER *ossl_quic_get_cipher_by_char(const unsigned char *p)
 {
     const SSL_CIPHER *ciph = ssl3_get_cipher_by_char(p);
 
+    if (ciph == NULL)
+        return NULL;
     if ((ciph->algorithm2 & SSL_QUIC) == 0)
         return NULL;
 
@@ -5097,6 +5173,8 @@ static int test_poll_event_w(QUIC_XSO *xso)
         && ossl_quic_stream_has_send_buffer(xso->stream)
         && ossl_quic_sstream_get_buffer_avail(xso->stream->sstream)
         && !ossl_quic_sstream_get_final_size(xso->stream->sstream, NULL)
+        && ossl_quic_txfc_get_cwm(&xso->stream->txfc)
+        > ossl_quic_sstream_get_cur_size(xso->stream->sstream)
         && quic_mutation_allowed(xso->conn, /*req_active=*/1);
 }
 
@@ -5129,7 +5207,7 @@ QUIC_NEEDS_LOCK
 static int test_poll_event_is(QUIC_CONNECTION *qc, int is_uni)
 {
     return ossl_quic_stream_map_get_accept_queue_len(ossl_quic_channel_get_qsm(qc->ch),
-                                                     is_uni);
+        is_uni);
 }
 
 /* Do we have the OS (outgoing: stream) condition? */
@@ -5157,7 +5235,7 @@ static int test_poll_event_ic(QUIC_LISTENER *ql)
 
 QUIC_TAKES_LOCK
 int ossl_quic_conn_poll_events(SSL *ssl, uint64_t events, int do_tick,
-                               uint64_t *p_revents)
+    uint64_t *p_revents)
 {
     QCTX ctx;
     uint64_t revents = 0;
@@ -5233,7 +5311,7 @@ int ossl_quic_conn_poll_events(SSL *ssl, uint64_t events, int do_tick,
             revents |= SSL_POLL_EVENT_IC;
     }
 
- end:
+end:
     qctx_unlock(&ctx);
     *p_revents = revents;
     return 1;
@@ -5257,7 +5335,7 @@ int ossl_quic_get_notifier_fd(SSL *ssl)
         goto end;
     nfd = ossl_rio_notifier_as_fd(nfy);
 
- end:
+end:
     qctx_unlock(&ctx);
     return nfd;
 }
diff --git a/ssl/quic/quic_lcidm.c b/ssl/quic/quic_lcidm.c
index f31fd101a1f34..660eb802ba32f 100644
--- a/ssl/quic/quic_lcidm.c
+++ b/ssl/quic/quic_lcidm.c
@@ -24,53 +24,55 @@
 typedef struct quic_lcidm_conn_st QUIC_LCIDM_CONN;
 
 enum {
-    LCID_TYPE_ODCID,        /* This LCID is the ODCID from the peer */
-    LCID_TYPE_INITIAL,      /* This is our Initial SCID */
-    LCID_TYPE_NCID          /* This LCID was issued via a NCID frame */
+    LCID_TYPE_ODCID, /* This LCID is the ODCID from the peer */
+    LCID_TYPE_INITIAL, /* This is our Initial SCID */
+    LCID_TYPE_NCID /* This LCID was issued via a NCID frame */
 };
 
 typedef struct quic_lcid_st {
-    QUIC_CONN_ID                cid;
-    uint64_t                    seq_num;
+    QUIC_CONN_ID cid;
+    uint64_t seq_num;
 
     /* copy of the hash key from lcidm */
-    uint64_t                    *hash_key;
+    uint64_t *hash_key;
 
     /* Back-pointer to the owning QUIC_LCIDM_CONN structure. */
-    QUIC_LCIDM_CONN             *conn;
+    QUIC_LCIDM_CONN *conn;
 
     /* LCID_TYPE_* */
-    unsigned int                type                : 2;
+    unsigned int type : 2;
 } QUIC_LCID;
 
 DEFINE_LHASH_OF_EX(QUIC_LCID);
 DEFINE_LHASH_OF_EX(QUIC_LCIDM_CONN);
 
 struct quic_lcidm_conn_st {
-    size_t              num_active_lcid;
+    size_t num_active_lcid;
     LHASH_OF(QUIC_LCID) *lcids;
-    void                *opaque;
-    QUIC_LCID           *odcid_lcid_obj;
-    uint64_t            next_seq_num;
+    void *opaque;
+    QUIC_LCID *odcid_lcid_obj;
+    uint64_t next_seq_num;
 
     /* Have we enrolled an ODCID? */
-    unsigned int        done_odcid          : 1;
+    unsigned int done_odcid : 1;
 };
 
 struct quic_lcidm_st {
-    OSSL_LIB_CTX                *libctx;
-    uint64_t                    hash_key[2]; /* random key for siphash */
-    LHASH_OF(QUIC_LCID)         *lcids; /* (QUIC_CONN_ID) -> (QUIC_LCID *)  */
-    LHASH_OF(QUIC_LCIDM_CONN)   *conns; /* (void *opaque) -> (QUIC_LCIDM_CONN *) */
-    size_t                      lcid_len; /* Length in bytes for all LCIDs */
+    OSSL_LIB_CTX *libctx;
+    uint64_t hash_key[2]; /* random key for siphash */
+    LHASH_OF(QUIC_LCID) *lcids; /* (QUIC_CONN_ID) -> (QUIC_LCID *)  */
+    LHASH_OF(QUIC_LCIDM_CONN) *conns; /* (void *opaque) -> (QUIC_LCIDM_CONN *) */
+    size_t lcid_len; /* Length in bytes for all LCIDs */
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-    QUIC_CONN_ID                next_lcid;
+    QUIC_CONN_ID next_lcid;
 #endif
 };
 
 static unsigned long lcid_hash(const QUIC_LCID *lcid_obj)
 {
-    SIPHASH siphash = {0, };
+    SIPHASH siphash = {
+        0,
+    };
     unsigned long hashval = 0;
 
     if (!SipHash_set_hash_size(&siphash, sizeof(unsigned long)))
@@ -79,7 +81,7 @@ static unsigned long lcid_hash(const QUIC_LCID *lcid_obj)
         goto out;
     SipHash_Update(&siphash, lcid_obj->cid.id, lcid_obj->cid.id_len);
     if (!SipHash_Final(&siphash, (unsigned char *)&hashval,
-                       sizeof(unsigned long)))
+            sizeof(unsigned long)))
         goto out;
 out:
     return hashval;
@@ -112,17 +114,18 @@ QUIC_LCIDM *ossl_quic_lcidm_new(OSSL_LIB_CTX *libctx, size_t lcid_len)
 
     /* generate a random key for the hash tables hash function */
     if (!RAND_bytes_ex(libctx, (unsigned char *)&lcidm->hash_key,
-                       sizeof(uint64_t) * 2, 0))
+            sizeof(uint64_t) * 2, 0))
         goto err;
 
     if ((lcidm->lcids = lh_QUIC_LCID_new(lcid_hash, lcid_comp)) == NULL)
         goto err;
 
     if ((lcidm->conns = lh_QUIC_LCIDM_CONN_new(lcidm_conn_hash,
-                                               lcidm_conn_comp)) == NULL)
+             lcidm_conn_comp))
+        == NULL)
         goto err;
 
-    lcidm->libctx   = libctx;
+    lcidm->libctx = libctx;
     lcidm->lcid_len = lcid_len;
     return lcidm;
 
@@ -251,7 +254,7 @@ static void lcidm_delete_conn(QUIC_LCIDM *lcidm, QUIC_LCIDM_CONN *conn)
 }
 
 static QUIC_LCID *lcidm_conn_new_lcid(QUIC_LCIDM *lcidm, QUIC_LCIDM_CONN *conn,
-                                      const QUIC_CONN_ID *lcid)
+    const QUIC_CONN_ID *lcid)
 {
     QUIC_LCID *lcid_obj = NULL;
 
@@ -289,7 +292,7 @@ size_t ossl_quic_lcidm_get_lcid_len(const QUIC_LCIDM *lcidm)
 }
 
 size_t ossl_quic_lcidm_get_num_active_lcid(const QUIC_LCIDM *lcidm,
-                                           void *opaque)
+    void *opaque)
 {
     QUIC_LCIDM_CONN *conn;
 
@@ -301,7 +304,7 @@ size_t ossl_quic_lcidm_get_num_active_lcid(const QUIC_LCIDM *lcidm,
 }
 
 static int lcidm_generate_cid(QUIC_LCIDM *lcidm,
-                              QUIC_CONN_ID *cid)
+    QUIC_CONN_ID *cid)
 {
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
     int i;
@@ -320,10 +323,10 @@ static int lcidm_generate_cid(QUIC_LCIDM *lcidm,
 }
 
 static int lcidm_generate(QUIC_LCIDM *lcidm,
-                          void *opaque,
-                          unsigned int type,
-                          QUIC_CONN_ID *lcid_out,
-                          uint64_t *seq_num)
+    void *opaque,
+    unsigned int type,
+    QUIC_CONN_ID *lcid_out,
+    uint64_t *seq_num)
 {
     QUIC_LCIDM_CONN *conn;
     QUIC_LCID key, *lcid_obj;
@@ -358,8 +361,8 @@ static int lcidm_generate(QUIC_LCIDM *lcidm,
     if ((lcid_obj = lcidm_conn_new_lcid(lcidm, conn, lcid_out)) == NULL)
         return 0;
 
-    lcid_obj->seq_num   = conn->next_seq_num;
-    lcid_obj->type      = type;
+    lcid_obj->seq_num = conn->next_seq_num;
+    lcid_obj->type = type;
 
     if (seq_num != NULL)
         *seq_num = lcid_obj->seq_num;
@@ -369,8 +372,8 @@ static int lcidm_generate(QUIC_LCIDM *lcidm,
 }
 
 int ossl_quic_lcidm_enrol_odcid(QUIC_LCIDM *lcidm,
-                                void *opaque,
-                                const QUIC_CONN_ID *initial_odcid)
+    void *opaque,
+    const QUIC_CONN_ID *initial_odcid)
 {
     QUIC_LCIDM_CONN *conn;
     QUIC_LCID key, *lcid_obj;
@@ -393,24 +396,24 @@ int ossl_quic_lcidm_enrol_odcid(QUIC_LCIDM *lcidm,
     if ((lcid_obj = lcidm_conn_new_lcid(lcidm, conn, initial_odcid)) == NULL)
         return 0;
 
-    lcid_obj->seq_num       = LCIDM_ODCID_SEQ_NUM;
-    lcid_obj->type          = LCID_TYPE_ODCID;
+    lcid_obj->seq_num = LCIDM_ODCID_SEQ_NUM;
+    lcid_obj->type = LCID_TYPE_ODCID;
 
-    conn->odcid_lcid_obj    = lcid_obj;
-    conn->done_odcid        = 1;
+    conn->odcid_lcid_obj = lcid_obj;
+    conn->done_odcid = 1;
     return 1;
 }
 
 int ossl_quic_lcidm_generate_initial(QUIC_LCIDM *lcidm,
-                                     void *opaque,
-                                     QUIC_CONN_ID *initial_lcid)
+    void *opaque,
+    QUIC_CONN_ID *initial_lcid)
 {
     return lcidm_generate(lcidm, opaque, LCID_TYPE_INITIAL,
-                          initial_lcid, NULL);
+        initial_lcid, NULL);
 }
 
 int ossl_quic_lcidm_bind_channel(QUIC_LCIDM *lcidm, void *opaque,
-                                 const QUIC_CONN_ID *lcid)
+    const QUIC_CONN_ID *lcid)
 {
     QUIC_LCIDM_CONN *conn;
     QUIC_LCID *lcid_obj;
@@ -440,15 +443,15 @@ int ossl_quic_lcidm_bind_channel(QUIC_LCIDM *lcidm, void *opaque,
 }
 
 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)
 {
-    ncid_frame->seq_num         = 0;
+    ncid_frame->seq_num = 0;
     ncid_frame->retire_prior_to = 0;
 
     return lcidm_generate(lcidm, opaque, LCID_TYPE_NCID,
-                          &ncid_frame->conn_id,
-                          &ncid_frame->seq_num);
+        &ncid_frame->conn_id,
+        &ncid_frame->seq_num);
 }
 
 int ossl_quic_lcidm_retire_odcid(QUIC_LCIDM *lcidm, void *opaque)
@@ -467,8 +470,8 @@ int ossl_quic_lcidm_retire_odcid(QUIC_LCIDM *lcidm, void *opaque)
 }
 
 struct retire_args {
-    QUIC_LCID           *earliest_seq_num_lcid_obj;
-    uint64_t            earliest_seq_num, retire_prior_to;
+    QUIC_LCID *earliest_seq_num_lcid_obj;
+    uint64_t earliest_seq_num, retire_prior_to;
 };
 
 static void retire_for_conn(QUIC_LCID *lcid_obj, void *arg)
@@ -481,21 +484,21 @@ static void retire_for_conn(QUIC_LCID *lcid_obj, void *arg)
         return;
 
     if (lcid_obj->seq_num < args->earliest_seq_num) {
-        args->earliest_seq_num          = lcid_obj->seq_num;
+        args->earliest_seq_num = lcid_obj->seq_num;
         args->earliest_seq_num_lcid_obj = lcid_obj;
     }
 }
 
 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)
 {
     QUIC_LCIDM_CONN key, *conn;
-    struct retire_args args = {0};
+    struct retire_args args = { 0 };
 
     key.opaque = opaque;
 
@@ -506,8 +509,8 @@ int ossl_quic_lcidm_retire(QUIC_LCIDM *lcidm,
     if ((conn = lh_QUIC_LCIDM_CONN_retrieve(lcidm->conns, &key)) == NULL)
         return 1;
 
-    args.retire_prior_to    = retire_prior_to;
-    args.earliest_seq_num   = UINT64_MAX;
+    args.retire_prior_to = retire_prior_to;
+    args.earliest_seq_num = UINT64_MAX;
 
     lh_QUIC_LCID_doall_arg(conn->lcids, retire_for_conn, &args);
     if (args.earliest_seq_num_lcid_obj == NULL)
@@ -515,7 +518,7 @@ int ossl_quic_lcidm_retire(QUIC_LCIDM *lcidm,
 
     if (containing_pkt_dcid != NULL
         && ossl_quic_conn_id_eq(&args.earliest_seq_num_lcid_obj->cid,
-                                containing_pkt_dcid))
+            containing_pkt_dcid))
         return 0;
 
     *did_retire = 1;
@@ -542,9 +545,9 @@ int ossl_quic_lcidm_cull(QUIC_LCIDM *lcidm, void *opaque)
 }
 
 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)
 {
     QUIC_LCID *lcid_obj;
 
@@ -555,16 +558,16 @@ int ossl_quic_lcidm_lookup(QUIC_LCIDM *lcidm,
         return 0;
 
     if (seq_num != NULL)
-        *seq_num        = lcid_obj->seq_num;
+        *seq_num = lcid_obj->seq_num;
 
     if (opaque != NULL)
-        *opaque         = lcid_obj->conn->opaque;
+        *opaque = lcid_obj->conn->opaque;
 
     return 1;
 }
 
 int ossl_quic_lcidm_debug_remove(QUIC_LCIDM *lcidm,
-                                 const QUIC_CONN_ID *lcid)
+    const QUIC_CONN_ID *lcid)
 {
     QUIC_LCID key, *lcid_obj;
 
@@ -578,8 +581,8 @@ int ossl_quic_lcidm_debug_remove(QUIC_LCIDM *lcidm,
 }
 
 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)
 {
     QUIC_LCIDM_CONN *conn;
     QUIC_LCID key, *lcid_obj;
@@ -598,8 +601,8 @@ int ossl_quic_lcidm_debug_add(QUIC_LCIDM *lcidm, void *opaque,
     if ((lcid_obj = lcidm_conn_new_lcid(lcidm, conn, lcid)) == NULL)
         return 0;
 
-    lcid_obj->seq_num   = seq_num;
-    lcid_obj->type      = LCID_TYPE_NCID;
+    lcid_obj->seq_num = seq_num;
+    lcid_obj->type = LCID_TYPE_NCID;
     return 1;
 }
 
diff --git a/ssl/quic/quic_local.h b/ssl/quic/quic_local.h
index 97029ae9c482e..0c8594b3150ee 100644
--- a/ssl/quic/quic_local.h
+++ b/ssl/quic/quic_local.h
@@ -8,24 +8,24 @@
  */
 
 #ifndef OSSL_QUIC_LOCAL_H
-# define OSSL_QUIC_LOCAL_H
-
-# include <openssl/ssl.h>
-# include "internal/quic_ssl.h"       /* QUIC_CONNECTION */
-# include "internal/quic_txp.h"
-# include "internal/quic_statm.h"
-# include "internal/quic_demux.h"
-# include "internal/quic_record_rx.h"
-# include "internal/quic_tls.h"
-# include "internal/quic_fc.h"
-# include "internal/quic_stream.h"
-# include "internal/quic_channel.h"
-# include "internal/quic_reactor.h"
-# include "internal/quic_thread_assist.h"
-# include "../ssl_local.h"
-# include "quic_obj_local.h"
-
-# ifndef OPENSSL_NO_QUIC
+#define OSSL_QUIC_LOCAL_H
+
+#include <openssl/ssl.h>
+#include "internal/quic_ssl.h" /* QUIC_CONNECTION */
+#include "internal/quic_txp.h"
+#include "internal/quic_statm.h"
+#include "internal/quic_demux.h"
+#include "internal/quic_record_rx.h"
+#include "internal/quic_tls.h"
+#include "internal/quic_fc.h"
+#include "internal/quic_stream.h"
+#include "internal/quic_channel.h"
+#include "internal/quic_reactor.h"
+#include "internal/quic_thread_assist.h"
+#include "../ssl_local.h"
+#include "quic_obj_local.h"
+
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC stream SSL object (QSSO) type. This implements the API personality layer
@@ -34,22 +34,22 @@
  */
 struct quic_xso_st {
     /* QUIC_OBJ common header, including SSL object common header. */
-    QUIC_OBJ                        obj;
+    QUIC_OBJ obj;
 
     /* The connection this stream is associated with. Always non-NULL. */
-    QUIC_CONNECTION                 *conn;
+    QUIC_CONNECTION *conn;
 
     /* The stream object. Always non-NULL for as long as the XSO exists. */
-    QUIC_STREAM                     *stream;
+    QUIC_STREAM *stream;
 
     /* The application has retired a FIN (i.e. SSL_ERROR_ZERO_RETURN). */
-    unsigned int                    retired_fin             : 1;
+    unsigned int retired_fin : 1;
 
     /*
      * The application has requested a reset. Not set for reflexive
      * STREAM_RESETs caused by peer STOP_SENDING.
      */
-    unsigned int                    requested_reset         : 1;
+    unsigned int requested_reset : 1;
 
     /*
      * This state tracks SSL_write all-or-nothing (AON) write semantics
@@ -70,7 +70,7 @@ struct quic_xso_st {
      *
      */
     /* Is an AON write in progress? */
-    unsigned int                    aon_write_in_progress   : 1;
+    unsigned int aon_write_in_progress : 1;
 
     /*
      * The base buffer pointer the caller passed us for the initial AON write
@@ -81,27 +81,27 @@ struct quic_xso_st {
      * (but identical) buffer if using ACCEPT_MOVING_WRITE_BUFFER. It is for
      * validation by pointer comparison only.
      */
-    const unsigned char             *aon_buf_base;
+    const unsigned char *aon_buf_base;
     /* The total length of the AON buffer being sent, in bytes. */
-    size_t                          aon_buf_len;
+    size_t aon_buf_len;
     /*
      * The position in the AON buffer up to which we have successfully sent data
      * so far.
      */
-    size_t                          aon_buf_pos;
+    size_t aon_buf_pos;
 
     /* SSL_set_mode */
-    uint32_t                        ssl_mode;
+    uint32_t ssl_mode;
 
     /* SSL_set_options */
-    uint64_t                        ssl_options;
+    uint64_t ssl_options;
 
     /*
      * Last 'normal' error during an app-level I/O operation, used by
      * SSL_get_error(); used to track data-path errors like SSL_ERROR_WANT_READ
      * and SSL_ERROR_WANT_WRITE.
      */
-    int                             last_error;
+    int last_error;
 };
 
 /*
@@ -116,21 +116,21 @@ struct quic_conn_st {
      *
      * Note: This must come first in the QUIC_CONNECTION structure.
      */
-    QUIC_OBJ                        obj;
+    QUIC_OBJ obj;
 
-    SSL                             *tls;
+    SSL *tls;
 
     /* The QLSO this connection belongs to, if any. */
-    QUIC_LISTENER                   *listener;
+    QUIC_LISTENER *listener;
 
     /* The QDSO this connection belongs to, if any. */
-    QUIC_DOMAIN                     *domain;
+    QUIC_DOMAIN *domain;
 
     /* The QUIC engine representing the QUIC event domain. */
-    QUIC_ENGINE                     *engine;
+    QUIC_ENGINE *engine;
 
     /* The QUIC port representing the QUIC listener and socket. */
-    QUIC_PORT                       *port;
+    QUIC_PORT *port;
 
     /*
      * The QUIC channel providing the core QUIC connection implementation. Note
@@ -143,90 +143,90 @@ struct quic_conn_st {
      * The channel remains available after connection termination until the SSL
      * object is freed, thus (ch != NULL) iff (started == 1).
      */
-    QUIC_CHANNEL                    *ch;
+    QUIC_CHANNEL *ch;
 
     /*
      * The mutex used to synchronise access to the QUIC_CHANNEL. We own this but
      * provide it to the channel.
      */
 #if defined(OPENSSL_THREADS)
-    CRYPTO_MUTEX                    *mutex;
+    CRYPTO_MUTEX *mutex;
 #endif
 
     /*
      * If we have a default stream attached, this is the internal XSO
      * object. If there is no default stream, this is NULL.
      */
-    QUIC_XSO                        *default_xso;
+    QUIC_XSO *default_xso;
 
     /* Initial peer L4 address. */
-    BIO_ADDR                        init_peer_addr;
+    BIO_ADDR init_peer_addr;
 
-#  ifndef OPENSSL_NO_QUIC_THREAD_ASSIST
+#ifndef OPENSSL_NO_QUIC_THREAD_ASSIST
     /* Manages thread for QUIC thread assisted mode. */
-    QUIC_THREAD_ASSIST              thread_assist;
-#  endif
+    QUIC_THREAD_ASSIST thread_assist;
+#endif
 
     /* Number of XSOs allocated. Includes the default XSO, if any. */
-    size_t                          num_xso;
+    size_t num_xso;
 
     /* Have we started? */
-    unsigned int                    started                 : 1;
+    unsigned int started : 1;
 
     /*
      * This is 1 if we were instantiated using a QUIC server method
      * (for future use).
      */
-    unsigned int                    as_server               : 1;
+    unsigned int as_server : 1;
 
     /*
      * Has the application called SSL_set_accept_state? We require this to be
      * congruent with the value of as_server.
      */
-    unsigned int                    as_server_state         : 1;
+    unsigned int as_server_state : 1;
 
     /* Are we using thread assisted mode? Never changes after init. */
-    unsigned int                    is_thread_assisted      : 1;
+    unsigned int is_thread_assisted : 1;
 
     /* Have we created a default XSO yet? */
-    unsigned int                    default_xso_created     : 1;
+    unsigned int default_xso_created : 1;
 
     /*
      * Pre-TERMINATING shutdown phase in which we are flushing streams.
      * Monotonically transitions to 1.
      * New streams cannot be created in this state.
      */
-    unsigned int                    shutting_down           : 1;
+    unsigned int shutting_down : 1;
 
     /* Have we probed the BIOs for addressing support? */
-    unsigned int                    addressing_probe_done   : 1;
+    unsigned int addressing_probe_done : 1;
 
     /* Are we using addressed mode (BIO_sendmmsg with non-NULL peer)? */
-    unsigned int                    addressed_mode_w        : 1;
-    unsigned int                    addressed_mode_r        : 1;
+    unsigned int addressed_mode_w : 1;
+    unsigned int addressed_mode_r : 1;
 
     /* Flag to indicate waiting on accept queue */
-    unsigned int                    pending                 : 1;
+    unsigned int pending : 1;
 
     /* Default stream type. Defaults to SSL_DEFAULT_STREAM_MODE_AUTO_BIDI. */
-    uint32_t                        default_stream_mode;
+    uint32_t default_stream_mode;
 
     /* SSL_set_mode. This is not used directly but inherited by new XSOs. */
-    uint32_t                        default_ssl_mode;
+    uint32_t default_ssl_mode;
 
     /* SSL_set_options. This is not used directly but inherited by new XSOs. */
-    uint64_t                        default_ssl_options;
+    uint64_t default_ssl_options;
 
     /* SSL_set_incoming_stream_policy. */
-    int                             incoming_stream_policy;
-    uint64_t                        incoming_stream_aec;
+    int incoming_stream_policy;
+    uint64_t incoming_stream_aec;
 
     /*
      * Last 'normal' error during an app-level I/O operation, used by
      * SSL_get_error(); used to track data-path errors like SSL_ERROR_WANT_READ
      * and SSL_ERROR_WANT_WRITE.
      */
-    int                             last_error;
+    int last_error;
 };
 
 /*
@@ -235,27 +235,27 @@ struct quic_conn_st {
  */
 struct quic_listener_st {
     /* QUIC_OBJ common header, including SSL object common header. */
-    QUIC_OBJ                        obj;
+    QUIC_OBJ obj;
 
     /* The QDSO this connection belongs to, if any. */
-    QUIC_DOMAIN                     *domain;
+    QUIC_DOMAIN *domain;
 
     /* The QUIC engine representing the QUIC event domain. */
-    QUIC_ENGINE                     *engine;
+    QUIC_ENGINE *engine;
 
     /* The QUIC port representing the QUIC listener and socket. */
-    QUIC_PORT                       *port;
+    QUIC_PORT *port;
 
 #if defined(OPENSSL_THREADS)
     /*
      * The mutex used to synchronise access to the QUIC_ENGINE. We own this but
      * provide it to the engine.
      */
-    CRYPTO_MUTEX                    *mutex;
+    CRYPTO_MUTEX *mutex;
 #endif
 
     /* Have we started listening yet? */
-    unsigned int                    listening               : 1;
+    unsigned int listening : 1;
 };
 
 /*
@@ -263,18 +263,18 @@ struct quic_listener_st {
  * for QDSO objects, wrapping the QUIC-native QUIC_ENGINE object.
  */
 struct quic_domain_st {
-     /* QUIC_OBJ common header, including SSL object common header. */
-    QUIC_OBJ                        obj;
+    /* QUIC_OBJ common header, including SSL object common header. */
+    QUIC_OBJ obj;
 
     /* The QUIC engine representing the QUIC event domain. */
-    QUIC_ENGINE                     *engine;
+    QUIC_ENGINE *engine;
 
 #if defined(OPENSSL_THREADS)
     /*
      * The mutex used to synchronise access to the QUIC_ENGINE. We own this but
      * provide it to the engine.
      */
-    CRYPTO_MUTEX                    *mutex;
+    CRYPTO_MUTEX *mutex;
 #endif
 };
 
@@ -288,55 +288,55 @@ int ossl_quic_conn_on_handshake_confirmed(QUIC_CONNECTION *qc);
  * applicable.
  */
 void ossl_quic_conn_raise_protocol_error(QUIC_CONNECTION *qc,
-                                         uint64_t error_code,
-                                         uint64_t frame_type,
-                                         const char *reason);
+    uint64_t error_code,
+    uint64_t frame_type,
+    const char *reason);
 
 void ossl_quic_conn_on_remote_conn_close(QUIC_CONNECTION *qc,
-                                         OSSL_QUIC_FRAME_CONN_CLOSE *f);
-
-#  define OSSL_QUIC_ANY_VERSION 0xFFFFF
-# endif
-
-# define IMPLEMENT_quic_meth_func(version, func_name, q_accept, \
-                                 q_connect, enc_data) \
-const SSL_METHOD *func_name(void)  \
-        { \
-        static const SSL_METHOD func_name##_data= { \
-                version, \
-                0, \
-                0, \
-                ossl_quic_new, \
-                ossl_quic_free, \
-                ossl_quic_reset, \
-                ossl_quic_init, \
-                NULL /* clear */, \
-                ossl_quic_deinit, \
-                q_accept, \
-                q_connect, \
-                ossl_quic_read, \
-                ossl_quic_peek, \
-                ossl_quic_write, \
-                NULL /* shutdown */, \
-                NULL /* renegotiate */, \
-                ossl_quic_renegotiate_check, \
-                NULL /* read_bytes */, \
-                NULL /* write_bytes */, \
-                NULL /* dispatch_alert */, \
-                ossl_quic_ctrl, \
-                ossl_quic_ctx_ctrl, \
-                ossl_quic_get_cipher_by_char, \
-                NULL /* put_cipher_by_char */, \
-                ossl_quic_pending, \
-                ossl_quic_num_ciphers, \
-                ossl_quic_get_cipher, \
-                tls1_default_timeout, \
-                &enc_data, \
-                ssl_undefined_void_function, \
-                ossl_quic_callback_ctrl, \
-                ossl_quic_ctx_callback_ctrl, \
-        }; \
-        return &func_name##_data; \
-        }
+    OSSL_QUIC_FRAME_CONN_CLOSE *f);
+
+#define OSSL_QUIC_ANY_VERSION 0xFFFFF
+#endif
+
+#define IMPLEMENT_quic_meth_func(version, func_name, q_accept, \
+    q_connect, enc_data)                                       \
+    const SSL_METHOD *func_name(void)                          \
+    {                                                          \
+        static const SSL_METHOD func_name##_data = {           \
+            version,                                           \
+            0,                                                 \
+            0,                                                 \
+            ossl_quic_new,                                     \
+            ossl_quic_free,                                    \
+            ossl_quic_reset,                                   \
+            ossl_quic_init,                                    \
+            NULL /* clear */,                                  \
+            ossl_quic_deinit,                                  \
+            q_accept,                                          \
+            q_connect,                                         \
+            ossl_quic_read,                                    \
+            ossl_quic_peek,                                    \
+            ossl_quic_write,                                   \
+            NULL /* shutdown */,                               \
+            NULL /* renegotiate */,                            \
+            ossl_quic_renegotiate_check,                       \
+            NULL /* read_bytes */,                             \
+            NULL /* write_bytes */,                            \
+            NULL /* dispatch_alert */,                         \
+            ossl_quic_ctrl,                                    \
+            ossl_quic_ctx_ctrl,                                \
+            ossl_quic_get_cipher_by_char,                      \
+            NULL /* put_cipher_by_char */,                     \
+            ossl_quic_pending,                                 \
+            ossl_quic_num_ciphers,                             \
+            ossl_quic_get_cipher,                              \
+            tls1_default_timeout,                              \
+            &enc_data,                                         \
+            ssl_undefined_void_function,                       \
+            ossl_quic_callback_ctrl,                           \
+            ossl_quic_ctx_callback_ctrl,                       \
+        };                                                     \
+        return &func_name##_data;                              \
+    }
 
 #endif
diff --git a/ssl/quic/quic_method.c b/ssl/quic/quic_method.c
index 0de2bca47e6bb..55d7824e336ab 100644
--- a/ssl/quic/quic_method.c
+++ b/ssl/quic/quic_method.c
@@ -12,16 +12,16 @@
 #include "quic_local.h"
 
 IMPLEMENT_quic_meth_func(OSSL_QUIC_ANY_VERSION,
-                         OSSL_QUIC_client_method,
-                         ssl_undefined_function,
-                         ossl_quic_connect, ssl3_undef_enc_method)
+    OSSL_QUIC_client_method,
+    ssl_undefined_function,
+    ossl_quic_connect, ssl3_undef_enc_method)
 
 IMPLEMENT_quic_meth_func(OSSL_QUIC_ANY_VERSION,
-                         OSSL_QUIC_client_thread_method,
-                         ssl_undefined_function,
-                         ossl_quic_connect, ssl3_undef_enc_method)
+    OSSL_QUIC_client_thread_method,
+    ssl_undefined_function,
+    ossl_quic_connect, ssl3_undef_enc_method)
 
 IMPLEMENT_quic_meth_func(OSSL_QUIC_ANY_VERSION,
-                         OSSL_QUIC_server_method,
-                         ssl_undefined_function,
-                         ossl_quic_connect, ssl3_undef_enc_method)
+    OSSL_QUIC_server_method,
+    ossl_quic_accept,
+    ssl_undefined_function, ssl3_undef_enc_method)
diff --git a/ssl/quic/quic_obj.c b/ssl/quic/quic_obj.c
index 6c31c8c933149..0c0a3faa2ee54 100644
--- a/ssl/quic/quic_obj.c
+++ b/ssl/quic/quic_obj.c
@@ -14,17 +14,17 @@
 static int obj_update_cache(QUIC_OBJ *obj);
 
 int ossl_quic_obj_init(QUIC_OBJ *obj,
-                       SSL_CTX *ctx,
-                       int type,
-                       SSL *parent_obj,
-                       QUIC_ENGINE *engine,
-                       QUIC_PORT *port)
+    SSL_CTX *ctx,
+    int type,
+    SSL *parent_obj,
+    QUIC_ENGINE *engine,
+    QUIC_PORT *port)
 {
     int is_event_leader = (engine != NULL);
-    int is_port_leader  = (port != NULL);
+    int is_port_leader = (port != NULL);
 
     if (!ossl_assert(obj != NULL && !obj->init_done && SSL_TYPE_IS_QUIC(type)
-                     && (parent_obj == NULL || IS_QUIC(parent_obj))))
+            && (parent_obj == NULL || IS_QUIC(parent_obj))))
         return 0;
 
     /* Event leader is always the root object. */
@@ -34,22 +34,22 @@ int ossl_quic_obj_init(QUIC_OBJ *obj,
     if (!ossl_ssl_init(&obj->ssl, ctx, ctx->method, type))
         goto err;
 
-    obj->domain_flags       = ctx->domain_flags;
-    obj->parent_obj         = (QUIC_OBJ *)parent_obj;
-    obj->is_event_leader    = is_event_leader;
-    obj->is_port_leader     = is_port_leader;
-    obj->engine             = engine;
-    obj->port               = port;
-    obj->req_blocking_mode  = QUIC_BLOCKING_MODE_INHERIT;
+    obj->domain_flags = ctx->domain_flags;
+    obj->parent_obj = (QUIC_OBJ *)parent_obj;
+    obj->is_event_leader = is_event_leader;
+    obj->is_port_leader = is_port_leader;
+    obj->engine = engine;
+    obj->port = port;
+    obj->req_blocking_mode = QUIC_BLOCKING_MODE_INHERIT;
     if (!obj_update_cache(obj))
         goto err;
 
-    obj->init_done          = 1;
+    obj->init_done = 1;
     return 1;
 
 err:
     obj->is_event_leader = 0;
-    obj->is_port_leader  = 0;
+    obj->is_port_leader = 0;
     return 0;
 }
 
@@ -58,7 +58,7 @@ static int obj_update_cache(QUIC_OBJ *obj)
     QUIC_OBJ *p;
 
     for (p = obj; p != NULL && !p->is_event_leader;
-         p = p->parent_obj)
+        p = p->parent_obj)
         if (!ossl_assert(p == obj || p->init_done))
             return 0;
 
@@ -69,14 +69,15 @@ static int obj_update_cache(QUIC_OBJ *obj)
      * Offset of ->ssl is guaranteed to be 0 but the NULL check makes ubsan
      * happy.
      */
-    obj->cached_event_leader    = p;
-    obj->engine                 = p->engine;
+    obj->cached_event_leader = p;
+    obj->engine = p->engine;
 
     for (p = obj; p != NULL && !p->is_port_leader;
-         p = p->parent_obj);
+        p = p->parent_obj)
+        ;
 
-    obj->cached_port_leader     = p;
-    obj->port                   = (p != NULL) ? p->port : NULL;
+    obj->cached_port_leader = p;
+    obj->port = (p != NULL) ? p->port : NULL;
     return 1;
 }
 
@@ -99,7 +100,8 @@ int ossl_quic_obj_can_support_blocking(const QUIC_OBJ *obj)
     rtor = ossl_quic_obj_get0_reactor(obj);
 
     if ((obj->domain_flags
-            & (SSL_DOMAIN_FLAG_LEGACY_BLOCKING | SSL_DOMAIN_FLAG_BLOCKING)) == 0)
+            & (SSL_DOMAIN_FLAG_LEGACY_BLOCKING | SSL_DOMAIN_FLAG_BLOCKING))
+        == 0)
         return 0;
 
     return ossl_quic_reactor_can_poll_r(rtor)
@@ -112,7 +114,9 @@ int ossl_quic_obj_desires_blocking(const QUIC_OBJ *obj)
 
     assert(obj != NULL);
     for (; (req_blocking_mode = obj->req_blocking_mode) == QUIC_BLOCKING_MODE_INHERIT
-           && obj->parent_obj != NULL; obj = obj->parent_obj);
+        && obj->parent_obj != NULL;
+        obj = obj->parent_obj)
+        ;
 
     return req_blocking_mode != QUIC_BLOCKING_MODE_NONBLOCKING;
 }
@@ -125,7 +129,7 @@ int ossl_quic_obj_blocking(const QUIC_OBJ *obj)
         return 0;
 
     ossl_quic_engine_update_poll_descriptors(ossl_quic_obj_get0_engine(obj),
-                                             /*force=*/0);
+        /*force=*/0);
     return ossl_quic_obj_can_support_blocking(obj);
 }
 
diff --git a/ssl/quic/quic_obj_local.h b/ssl/quic/quic_obj_local.h
index 9f8729d325900..d454ade330bbc 100644
--- a/ssl/quic/quic_obj_local.h
+++ b/ssl/quic/quic_obj_local.h
@@ -8,14 +8,14 @@
  */
 
 #ifndef OSSL_QUIC_OBJ_LOCAL_H
-# define OSSL_QUIC_OBJ_LOCAL_H
+#define OSSL_QUIC_OBJ_LOCAL_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_predef.h"
-# include "internal/quic_engine.h"
-# include "../ssl_local.h"
+#include <openssl/ssl.h>
+#include "internal/quic_predef.h"
+#include "internal/quic_engine.h"
+#include "../ssl_local.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Object Structure.
@@ -69,18 +69,18 @@
  */
 struct quic_obj_st {
     /* SSL object common header. */
-    struct ssl_st           ssl;
+    struct ssl_st ssl;
 
     /*
      * Pointer to a parent APL object in a QUIC APL object hierarchy, or NULL if
      * this is the root object.
      */
-    QUIC_OBJ                *parent_obj;
+    QUIC_OBJ *parent_obj;
 
     /* invariant: != NULL */
-    QUIC_OBJ                *cached_event_leader;
+    QUIC_OBJ *cached_event_leader;
     /* invariant: != NULL iff this is a port leader or subsidiary object */
-    QUIC_OBJ                *cached_port_leader;
+    QUIC_OBJ *cached_port_leader;
 
     /*
      * Points to the QUIC_ENGINE instance. Always equals
@@ -89,7 +89,7 @@ struct quic_obj_st {
      * reference cached for convenience. Unlike port this is never NULL because
      * a QUIC domain is always rooted in an event leader.
      */
-    QUIC_ENGINE             *engine;
+    QUIC_ENGINE *engine;
 
     /*
      * Points to the QUIC_PORT instance applicable to the containing_obj APL
@@ -98,23 +98,23 @@ struct quic_obj_st {
      * instance iff is_port_leader is set, otherwise it is an additional
      * reference cached for convenience.
      */
-    QUIC_PORT               *port;
+    QUIC_PORT *port;
 
     /* SSL_DOMAIN_FLAG values taken from SSL_CTX at construction time. */
-    uint64_t                domain_flags;
+    uint64_t domain_flags;
 
-    unsigned int            init_done       : 1;
-    unsigned int            is_event_leader : 1;
-    unsigned int            is_port_leader  : 1;
+    unsigned int init_done : 1;
+    unsigned int is_event_leader : 1;
+    unsigned int is_port_leader : 1;
 
     /*
      * Blocking mode configuration is handled generically through QUIC_OBJ as it
      * by default inherits from the parent SSL object.
      */
-    unsigned int            req_blocking_mode       : 2; /* QUIC_BLOCKING_MODE */
+    unsigned int req_blocking_mode : 2; /* QUIC_BLOCKING_MODE */
 
     /* Event handling mode. One of SSL_QUIC_VALUE_EVENT_HANDLING. */
-    unsigned int            event_handling_mode     : 2;
+    unsigned int event_handling_mode : 2;
 };
 
 enum {
@@ -149,11 +149,11 @@ enum {
  * ancestors to find the Port Leader.
  */
 int ossl_quic_obj_init(QUIC_OBJ *obj,
-                       SSL_CTX *ctx,
-                       int type,
-                       SSL *parent_obj,
-                       QUIC_ENGINE *engine,
-                       QUIC_PORT *port);
+    SSL_CTX *ctx,
+    int type,
+    SSL *parent_obj,
+    QUIC_ENGINE *engine,
+    QUIC_PORT *port);
 
 /*
  * Returns a pointer to the handshake layer object which should be accessible on
@@ -216,7 +216,8 @@ static ossl_inline ossl_unused QUIC_ENGINE *
 ossl_quic_obj_get0_engine_local(const QUIC_OBJ *obj)
 {
     return ossl_quic_obj_is_event_leader(obj)
-        ? ossl_quic_obj_get0_engine(obj) : NULL;
+        ? ossl_quic_obj_get0_engine(obj)
+        : NULL;
 }
 
 /* Returns 1 iff this leader structure represents a port leader. */
@@ -234,7 +235,8 @@ static ossl_inline ossl_unused QUIC_PORT *
 ossl_quic_obj_get0_port_local(const QUIC_OBJ *obj)
 {
     return ossl_quic_obj_is_port_leader(obj)
-        ? ossl_quic_obj_get0_port(obj) : NULL;
+        ? ossl_quic_obj_get0_port(obj)
+        : NULL;
 }
 
 /*
@@ -337,5 +339,5 @@ ossl_quic_obj_set_domain_flags(QUIC_OBJ *obj, uint64_t domain_flags)
     obj->domain_flags = domain_flags;
 }
 
-# endif
+#endif
 #endif
diff --git a/ssl/quic/quic_port.c b/ssl/quic/quic_port.c
index 9ab350fb762d7..1e247e1ec6243 100644
--- a/ssl/quic/quic_port.c
+++ b/ssl/quic/quic_port.c
@@ -24,13 +24,13 @@
  * QUIC Port Structure
  * ===================
  */
-#define INIT_DCID_LEN                   8
+#define INIT_DCID_LEN 8
 
 static int port_init(QUIC_PORT *port);
 static void port_cleanup(QUIC_PORT *port);
 static OSSL_TIME get_time(void *arg);
 static void port_default_packet_handler(QUIC_URXE *e, void *arg,
-                                        const QUIC_CONN_ID *dcid);
+    const QUIC_CONN_ID *dcid);
 static void port_rx_pre(QUIC_PORT *port);
 
 /**
@@ -104,8 +104,8 @@ QUIC_PORT *ossl_quic_port_new(const QUIC_PORT_ARGS *args)
     if ((port = OPENSSL_zalloc(sizeof(QUIC_PORT))) == NULL)
         return NULL;
 
-    port->engine        = args->engine;
-    port->channel_ctx   = args->channel_ctx;
+    port->engine = args->engine;
+    port->channel_ctx = args->channel_ctx;
     port->is_multi_conn = args->is_multi_conn;
     port->validate_addr = args->do_addr_validation;
     port->get_conn_user_ssl = args->get_conn_user_ssl;
@@ -143,34 +143,38 @@ static int port_init(QUIC_PORT *port)
         goto err;
 
     if ((port->demux = ossl_quic_demux_new(/*BIO=*/NULL,
-                                           /*Short CID Len=*/rx_short_dcid_len,
-                                           get_time, port)) == NULL)
+             /*Short CID Len=*/rx_short_dcid_len,
+             get_time, port))
+        == NULL)
         goto err;
 
     ossl_quic_demux_set_default_handler(port->demux,
-                                        port_default_packet_handler,
-                                        port);
+        port_default_packet_handler,
+        port);
 
     if ((port->srtm = ossl_quic_srtm_new(port->engine->libctx,
-                                         port->engine->propq)) == NULL)
+             port->engine->propq))
+        == NULL)
         goto err;
 
     if ((port->lcidm = ossl_quic_lcidm_new(port->engine->libctx,
-                                           rx_short_dcid_len)) == NULL)
+             rx_short_dcid_len))
+        == NULL)
         goto err;
 
     port->rx_short_dcid_len = (unsigned char)rx_short_dcid_len;
-    port->tx_init_dcid_len  = INIT_DCID_LEN;
-    port->state             = QUIC_PORT_STATE_RUNNING;
+    port->tx_init_dcid_len = INIT_DCID_LEN;
+    port->state = QUIC_PORT_STATE_RUNNING;
 
     ossl_list_port_insert_tail(&port->engine->port_list, port);
-    port->on_engine_list    = 1;
-    port->bio_changed       = 1;
+    port->on_engine_list = 1;
+    port->bio_changed = 1;
 
     /* Generate random key for token encryption */
     if ((port->token_ctx = EVP_CIPHER_CTX_new()) == NULL
         || (cipher = EVP_CIPHER_fetch(port->engine->libctx,
-                                      "AES-256-GCM", NULL)) == NULL
+                "AES-256-GCM", NULL))
+            == NULL
         || !EVP_EncryptInit_ex(port->token_ctx, cipher, NULL, NULL, NULL)
         || (key_len = EVP_CIPHER_CTX_get_key_length(port->token_ctx)) <= 0
         || (token_key = OPENSSL_malloc(key_len)) == NULL
@@ -298,7 +302,7 @@ BIO *ossl_quic_port_get_net_wbio(QUIC_PORT *port)
 
 static int port_update_poll_desc(QUIC_PORT *port, BIO *net_bio, int for_write)
 {
-    BIO_POLL_DESCRIPTOR d = {0};
+    BIO_POLL_DESCRIPTOR d = { 0 };
 
     if (net_bio == NULL
         || (!for_write && !BIO_get_rpoll_descriptor(net_bio, &d))
@@ -433,7 +437,7 @@ int ossl_quic_port_set_net_wbio(QUIC_PORT *port, BIO *net_wbio)
         return 0;
 
     OSSL_LIST_FOREACH(ch, ch, &port->channel_list)
-        ossl_qtx_set_bio(ch->qtx, net_wbio);
+    ossl_qtx_set_bio(ch->qtx, net_wbio);
 
     port->net_wbio = net_wbio;
     port_update_addressing_mode(port);
@@ -458,64 +462,68 @@ static SSL *port_new_handshake_layer(QUIC_PORT *port, QUIC_CHANNEL *ch)
     QUIC_CONNECTION *qc = NULL;
     QUIC_LISTENER *ql = NULL;
 
-    if (port->get_conn_user_ssl != NULL) {
-        user_ssl = port->get_conn_user_ssl(ch, port->user_ssl_arg);
-        if (user_ssl == NULL)
-            return NULL;
-        qc = (QUIC_CONNECTION *)user_ssl;
-        ql = (QUIC_LISTENER *)port->user_ssl_arg;
+    /*
+     * It only makes sense to call this function if we know how to associate
+     * the handshake layer we are about to create with some user_ssl object.
+     */
+    if (!ossl_assert(port->get_conn_user_ssl != NULL))
+        return NULL;
+    user_ssl = port->get_conn_user_ssl(ch, port->user_ssl_arg);
+    if (user_ssl == NULL)
+        return NULL;
+    qc = (QUIC_CONNECTION *)user_ssl;
+    ql = (QUIC_LISTENER *)port->user_ssl_arg;
+
+    /*
+     * We expect the user_ssl to be newly created so it must not have an
+     * existing qc->tls
+     */
+    if (!ossl_assert(qc->tls == NULL)) {
+        SSL_free(user_ssl);
+        return NULL;
     }
 
     tls = ossl_ssl_connection_new_int(port->channel_ctx, user_ssl, TLS_method());
+    qc->tls = tls;
     if (tls == NULL || (tls_conn = SSL_CONNECTION_FROM_SSL(tls)) == NULL) {
         SSL_free(user_ssl);
         return NULL;
     }
 
-    /*
-     * If we got a user ssl, which will be embedded in a quic connection
-     * we need to fix up the connections tls pointer here
-     */
-    if (qc != NULL)
-        qc->tls = tls;
-
     if (ql != NULL && ql->obj.ssl.ctx->new_pending_conn_cb != NULL)
         if (!ql->obj.ssl.ctx->new_pending_conn_cb(ql->obj.ssl.ctx, user_ssl,
-                                                  ql->obj.ssl.ctx->new_pending_conn_arg)) {
-            SSL_free(tls);
+                ql->obj.ssl.ctx->new_pending_conn_arg)) {
             SSL_free(user_ssl);
-            if (qc != NULL)
-                qc->tls = NULL;
             return NULL;
         }
 
     /* Override the user_ssl of the inner connection. */
-    tls_conn->s3.flags      |= TLS1_FLAGS_QUIC;
+    tls_conn->s3.flags |= TLS1_FLAGS_QUIC | TLS1_FLAGS_QUIC_INTERNAL;
 
     /* Restrict options derived from the SSL_CTX. */
-    tls_conn->options       &= OSSL_QUIC_PERMITTED_OPTIONS_CONN;
-    tls_conn->pha_enabled   = 0;
+    tls_conn->options &= OSSL_QUIC_PERMITTED_OPTIONS_CONN;
+    tls_conn->pha_enabled = 0;
     return tls;
 }
 
 static QUIC_CHANNEL *port_make_channel(QUIC_PORT *port, SSL *tls, OSSL_QRX *qrx,
-                                       int is_server, int is_tserver)
+    int is_server, int is_tserver)
 {
-    QUIC_CHANNEL_ARGS args = {0};
+    QUIC_CHANNEL_ARGS args = { 0 };
     QUIC_CHANNEL *ch;
 
-    args.port          = port;
-    args.is_server     = is_server;
-    args.lcidm         = port->lcidm;
-    args.srtm          = port->srtm;
-    args.qrx           = qrx;
+    args.port = port;
+    args.is_server = is_server;
+    args.lcidm = port->lcidm;
+    args.srtm = port->srtm;
+    args.qrx = qrx;
     args.is_tserver_ch = is_tserver;
 
     /*
      * Creating a a new channel is made a bit tricky here as there is a
-     * bit of a circular dependency.  Initalizing a channel requires that
+     * bit of a circular dependency.  Initializing a channel requires that
      * the ch->tls and optionally the qlog_title be configured prior to
-     * initalization, but we need the channel at least partially configured
+     * initialization, but we need the channel at least partially configured
      * to create the new handshake layer, so we have to do this in a few steps.
      */
 
@@ -531,6 +539,11 @@ static QUIC_CHANNEL *port_make_channel(QUIC_PORT *port, SSL *tls, OSSL_QRX *qrx,
      */
     ch->tls = (tls != NULL) ? tls : port_new_handshake_layer(port, ch);
 
+    if (ch->tls == NULL) {
+        OPENSSL_free(ch);
+        return NULL;
+    }
+
 #ifndef OPENSSL_NO_QLOG
     /*
      * If we're using qlog, make sure the tls get further configured properly
@@ -548,7 +561,6 @@ static QUIC_CHANNEL *port_make_channel(QUIC_PORT *port, SSL *tls, OSSL_QRX *qrx,
      * And finally init the channel struct
      */
     if (!ossl_quic_channel_init(ch)) {
-        SSL_free(ch->tls);
         OPENSSL_free(ch);
         return NULL;
     }
@@ -560,7 +572,7 @@ static QUIC_CHANNEL *port_make_channel(QUIC_PORT *port, SSL *tls, OSSL_QRX *qrx,
 QUIC_CHANNEL *ossl_quic_port_create_outgoing(QUIC_PORT *port, SSL *tls)
 {
     return port_make_channel(port, tls, NULL, /* is_server= */ 0,
-                             /* is_tserver= */ 0);
+        /* is_tserver= */ 0);
 }
 
 QUIC_CHANNEL *ossl_quic_port_create_incoming(QUIC_PORT *port, SSL *tls)
@@ -574,7 +586,7 @@ QUIC_CHANNEL *ossl_quic_port_create_incoming(QUIC_PORT *port, SSL *tls)
      * later in port_default_packet_handler() when calling port_bind_channel().
      */
     ch = port_make_channel(port, tls, NULL, /* is_server= */ 1,
-                           /* is_tserver_ch */ 1);
+        /* is_tserver_ch */ 1);
     port->tserver_ch = ch;
     port->allow_incoming = 1;
     return ch;
@@ -647,14 +659,14 @@ void ossl_quic_port_set_allow_incoming(QUIC_PORT *port, int allow_incoming)
  * this port's network BIOs, and services child channels.
  */
 void ossl_quic_port_subtick(QUIC_PORT *port, QUIC_TICK_RESULT *res,
-                            uint32_t flags)
+    uint32_t flags)
 {
     QUIC_CHANNEL *ch;
 
-    res->net_read_desired       = ossl_quic_port_is_running(port);
-    res->net_write_desired      = 0;
-    res->notify_other_threads   = 0;
-    res->tick_deadline          = ossl_time_infinite();
+    res->net_read_desired = ossl_quic_port_is_running(port);
+    res->net_write_desired = 0;
+    res->notify_other_threads = 0;
+    res->tick_deadline = ossl_time_infinite();
 
     if (!port->engine->inhibit_tick) {
         /* Handle any incoming data from network. */
@@ -662,8 +674,9 @@ void ossl_quic_port_subtick(QUIC_PORT *port, QUIC_TICK_RESULT *res,
             port_rx_pre(port);
 
         /* Iterate through all channels and service them. */
-        OSSL_LIST_FOREACH(ch, ch, &port->channel_list) {
-            QUIC_TICK_RESULT subr = {0};
+        OSSL_LIST_FOREACH(ch, ch, &port->channel_list)
+        {
+            QUIC_TICK_RESULT subr = { 0 };
 
             ossl_quic_channel_subtick(ch, &subr, flags);
             ossl_quic_tick_result_merge_into(res, &subr);
@@ -716,9 +729,9 @@ static void port_rx_pre(QUIC_PORT *port)
  * to *new_ch.
  */
 static void port_bind_channel(QUIC_PORT *port, const BIO_ADDR *peer,
-                              const QUIC_CONN_ID *scid, const QUIC_CONN_ID *dcid,
-                              const QUIC_CONN_ID *odcid, OSSL_QRX *qrx,
-                              QUIC_CHANNEL **new_ch)
+    const QUIC_CONN_ID *scid, const QUIC_CONN_ID *dcid,
+    const QUIC_CONN_ID *odcid, OSSL_QRX *qrx,
+    QUIC_CHANNEL **new_ch)
 {
     QUIC_CHANNEL *ch;
 
@@ -731,11 +744,11 @@ static void port_bind_channel(QUIC_PORT *port, const BIO_ADDR *peer,
         port->tserver_ch = NULL;
         ossl_quic_channel_bind_qrx(ch, qrx);
         ossl_qrx_set_msg_callback(ch->qrx, ch->msg_callback,
-                                  ch->msg_callback_ssl);
+            ch->msg_callback_ssl);
         ossl_qrx_set_msg_callback_arg(ch->qrx, ch->msg_callback_arg);
     } else {
         ch = port_make_channel(port, NULL, qrx, /* is_server= */ 1,
-                               /* is_tserver */ 0);
+            /* is_tserver */ 0);
     }
 
     if (ch == NULL)
@@ -751,9 +764,9 @@ static void port_bind_channel(QUIC_PORT *port, const BIO_ADDR *peer,
      */
     if (qrx == NULL)
         if (!ossl_quic_provide_initial_secret(ch->port->engine->libctx,
-                                              ch->port->engine->propq,
-                                              dcid, /* is_server */ 1,
-                                              ch->qrx, NULL))
+                ch->port->engine->propq,
+                dcid, /* is_server */ 1,
+                ch->qrx, NULL))
             return;
 
     if (odcid->id_len != 0) {
@@ -816,9 +829,9 @@ static int port_try_handle_stateless_reset(QUIC_PORT *port, const QUIC_URXE *e)
 
     for (i = 0;; ++i) {
         if (!ossl_quic_srtm_lookup(port->srtm,
-                                   (QUIC_STATELESS_RESET_TOKEN *)(data + e->data_len
-                                   - sizeof(QUIC_STATELESS_RESET_TOKEN)),
-                                   i, &opaque, NULL))
+                (QUIC_STATELESS_RESET_TOKEN *)(data + e->data_len
+                    - sizeof(QUIC_STATELESS_RESET_TOKEN)),
+                i, &opaque, NULL))
             break;
 
         assert(opaque != NULL);
@@ -845,8 +858,8 @@ static void cleanup_validation_token(QUIC_VALIDATION_TOKEN *token)
  * @return 1 if validation token is filled successfully, 0 otherwise.
  */
 static int generate_token(BIO_ADDR *peer, QUIC_CONN_ID odcid,
-                          QUIC_CONN_ID rscid, QUIC_VALIDATION_TOKEN *token,
-                          int is_retry)
+    QUIC_CONN_ID rscid, QUIC_VALIDATION_TOKEN *token,
+    int is_retry)
 {
     token->is_retry = is_retry;
     token->timestamp = ossl_time_now();
@@ -858,7 +871,7 @@ static int generate_token(BIO_ADDR *peer, QUIC_CONN_ID odcid,
         || token->remote_addr_len == 0
         || (token->remote_addr = OPENSSL_malloc(token->remote_addr_len)) == NULL
         || !BIO_ADDR_rawaddress(peer, token->remote_addr,
-                                &token->remote_addr_len)) {
+            &token->remote_addr_len)) {
         cleanup_validation_token(token);
         return 0;
     }
@@ -877,9 +890,9 @@ static int generate_token(BIO_ADDR *peer, QUIC_CONN_ID odcid,
  * @param buffer_len Size of data stored in |buffer|.
  */
 static int marshal_validation_token(QUIC_VALIDATION_TOKEN *token,
-                                    unsigned char *buffer, size_t *buffer_len)
+    unsigned char *buffer, size_t *buffer_len)
 {
-    WPACKET wpkt = {0};
+    WPACKET wpkt = { 0 };
     BUF_MEM *buf_mem = BUF_MEM_new();
 
     if (buffer == NULL || buf_mem == NULL
@@ -891,12 +904,12 @@ static int marshal_validation_token(QUIC_VALIDATION_TOKEN *token,
     if (!WPACKET_init(&wpkt, buf_mem)
         || !WPACKET_memset(&wpkt, token->is_retry, 1)
         || !WPACKET_memcpy(&wpkt, &token->timestamp,
-                           sizeof(token->timestamp))
+            sizeof(token->timestamp))
         || (token->is_retry
             && (!WPACKET_sub_memcpy_u8(&wpkt, &token->odcid.id,
-                                       token->odcid.id_len)
+                    token->odcid.id_len)
                 || !WPACKET_sub_memcpy_u8(&wpkt, &token->rscid.id,
-                                          token->rscid.id_len)))
+                    token->rscid.id_len)))
         || !WPACKET_sub_memcpy_u8(&wpkt, token->remote_addr, token->remote_addr_len)
         || !WPACKET_get_total_written(&wpkt, buffer_len)
         || *buffer_len > MARSHALLED_TOKEN_MAX_LEN
@@ -929,10 +942,10 @@ static int marshal_validation_token(QUIC_VALIDATION_TOKEN *token,
  * [EVP_GCM_IV_LEN bytes IV][encrypted data][EVP_GCM_TAG_LEN bytes tag]
  */
 static int encrypt_validation_token(const QUIC_PORT *port,
-                                    const unsigned char *plaintext,
-                                    size_t pt_len,
-                                    unsigned char *ciphertext,
-                                    size_t *ct_len)
+    const unsigned char *plaintext,
+    size_t pt_len,
+    unsigned char *ciphertext,
+    size_t *ct_len)
 {
     int iv_len, len, ret = 0;
     size_t tag_len;
@@ -979,10 +992,10 @@ static int encrypt_validation_token(const QUIC_PORT *port,
  * [EVP_GCM_IV_LEN bytes IV][encrypted data][EVP_GCM_TAG_LEN bytes tag]
  */
 static int decrypt_validation_token(const QUIC_PORT *port,
-                                    const unsigned char *ciphertext,
-                                    size_t ct_len,
-                                    unsigned char *plaintext,
-                                    size_t *pt_len)
+    const unsigned char *ciphertext,
+    size_t ct_len,
+    unsigned char *plaintext,
+    size_t *pt_len)
 {
     int iv_len, len = 0, ret = 0;
     size_t tag_len;
@@ -1007,9 +1020,9 @@ static int decrypt_validation_token(const QUIC_PORT *port,
 
     if (!EVP_DecryptInit_ex(port->token_ctx, NULL, NULL, NULL, iv)
         || !EVP_DecryptUpdate(port->token_ctx, plaintext, &len, data,
-                              ct_len - iv_len - tag_len)
+            ct_len - iv_len - tag_len)
         || !EVP_CIPHER_CTX_ctrl(port->token_ctx, EVP_CTRL_GCM_SET_TAG, tag_len,
-                                (void *)tag)
+            (void *)tag)
         || !EVP_DecryptFinal_ex(port->token_ctx, plaintext + len, &len))
         goto err;
 
@@ -1022,14 +1035,14 @@ static int decrypt_validation_token(const QUIC_PORT *port,
 /**
  * @brief Parses contents of a buffer into a validation token.
  *
- * VALIDATION_TOKEN should already be initalized. Does some basic sanity checks.
+ * VALIDATION_TOKEN should already be initialized. Does some basic sanity checks.
  *
  * @param token   Validation token to fill data in.
  * @param buf     Buffer of previously marshaled validation token.
  * @param buf_len Length of |buf|.
  */
 static int parse_validation_token(QUIC_VALIDATION_TOKEN *token,
-                                  const unsigned char *buf, size_t buf_len)
+    const unsigned char *buf, size_t buf_len)
 {
     PACKET pkt, subpkt;
 
@@ -1042,19 +1055,19 @@ static int parse_validation_token(QUIC_VALIDATION_TOKEN *token,
         || !PACKET_copy_bytes(&pkt, &token->is_retry, sizeof(token->is_retry))
         || !(token->is_retry == 0 || token->is_retry == 1)
         || !PACKET_copy_bytes(&pkt, (unsigned char *)&token->timestamp,
-                              sizeof(token->timestamp))
+            sizeof(token->timestamp))
         || (token->is_retry
             && (!PACKET_get_length_prefixed_1(&pkt, &subpkt)
                 || (token->odcid.id_len = (unsigned char)PACKET_remaining(&subpkt))
                     > QUIC_MAX_CONN_ID_LEN
                 || !PACKET_copy_bytes(&subpkt,
-                                      (unsigned char *)&token->odcid.id,
-                                      token->odcid.id_len)
+                    (unsigned char *)&token->odcid.id,
+                    token->odcid.id_len)
                 || !PACKET_get_length_prefixed_1(&pkt, &subpkt)
                 || (token->rscid.id_len = (unsigned char)PACKET_remaining(&subpkt))
                     > QUIC_MAX_CONN_ID_LEN
                 || !PACKET_copy_bytes(&subpkt, (unsigned char *)&token->rscid.id,
-                                      token->rscid.id_len)))
+                    token->rscid.id_len)))
         || !PACKET_get_length_prefixed_1(&pkt, &subpkt)
         || (token->remote_addr_len = PACKET_remaining(&subpkt)) == 0
         || (token->remote_addr = OPENSSL_malloc(token->remote_addr_len)) == NULL
@@ -1090,8 +1103,8 @@ static int parse_validation_token(QUIC_VALIDATION_TOKEN *token,
  * network transmiss
  */
 static void port_send_retry(QUIC_PORT *port,
-                            BIO_ADDR *peer,
-                            QUIC_PKT_HDR *client_hdr)
+    BIO_ADDR *peer,
+    QUIC_PKT_HDR *client_hdr)
 {
     BIO_MSG msg[1];
     /*
@@ -1103,8 +1116,8 @@ static void port_send_retry(QUIC_PORT *port,
     unsigned char ct_buf[ENCRYPTED_TOKEN_MAX_LEN];
     WPACKET wpkt;
     size_t written, token_buf_len, ct_len;
-    QUIC_PKT_HDR hdr = {0};
-    QUIC_VALIDATION_TOKEN token = {0};
+    QUIC_PKT_HDR hdr = { 0 };
+    QUIC_VALIDATION_TOKEN token = { 0 };
     int ok;
 
     if (!ossl_assert(sizeof(buffer) >= MARSHALLED_TOKEN_MAX_LEN))
@@ -1129,13 +1142,13 @@ static void port_send_retry(QUIC_PORT *port,
 
     /* Generate retry validation token */
     if (!generate_token(peer, client_hdr->dst_conn_id,
-                        hdr.src_conn_id, &token, 1)
+            hdr.src_conn_id, &token, 1)
         || !marshal_validation_token(&token, buffer, &token_buf_len)
         || !encrypt_validation_token(port, buffer, token_buf_len, NULL,
-                                     &ct_len)
+            &ct_len)
         || ct_len > ENCRYPTED_TOKEN_MAX_LEN
         || !encrypt_validation_token(port, buffer, token_buf_len, ct_buf,
-                                     &ct_len)
+            &ct_len)
         || !ossl_assert(ct_len >= QUIC_RETRY_INTEGRITY_TAG_LEN))
         goto err;
 
@@ -1146,10 +1159,10 @@ static void port_send_retry(QUIC_PORT *port,
     hdr.len = ct_len;
     hdr.data = ct_buf;
     ok = ossl_quic_calculate_retry_integrity_tag(port->engine->libctx,
-                                                 port->engine->propq, &hdr,
-                                                 &client_hdr->dst_conn_id,
-                                                 ct_buf + ct_len
-                                                 - QUIC_RETRY_INTEGRITY_TAG_LEN);
+        port->engine->propq, &hdr,
+        &client_hdr->dst_conn_id,
+        ct_buf + ct_len
+            - QUIC_RETRY_INTEGRITY_TAG_LEN);
     if (ok == 0)
         goto err;
 
@@ -1166,7 +1179,7 @@ static void port_send_retry(QUIC_PORT *port,
         goto err;
 
     ok = ossl_quic_wire_encode_pkt_hdr(&wpkt, client_hdr->dst_conn_id.id_len,
-                                       &hdr, NULL);
+        &hdr, NULL);
     if (ok == 0)
         goto err;
 
@@ -1184,7 +1197,7 @@ static void port_send_retry(QUIC_PORT *port,
      */
     if (!BIO_sendmmsg(port->net_wbio, msg, sizeof(BIO_MSG), 1, 0, &written))
         ERR_raise_data(ERR_LIB_SSL, SSL_R_QUIC_NETWORK_ERROR,
-                       "port retry send failed due to network BIO I/O error");
+            "port retry send failed due to network BIO I/O error");
 
 err:
     cleanup_validation_token(&token);
@@ -1208,7 +1221,7 @@ static void port_send_retry(QUIC_PORT *port,
  * @note The function will raise an error if sending the message fails.
  */
 static void port_send_version_negotiation(QUIC_PORT *port, BIO_ADDR *peer,
-                                          QUIC_PKT_HDR *client_hdr)
+    QUIC_PKT_HDR *client_hdr)
 {
     BIO_MSG msg[1];
     unsigned char buffer[1024];
@@ -1252,14 +1265,14 @@ static void port_send_version_negotiation(QUIC_PORT *port, BIO_ADDR *peer,
         return;
 
     if (!ossl_quic_wire_encode_pkt_hdr(&wpkt, client_hdr->dst_conn_id.id_len,
-                                       &hdr, NULL))
+            &hdr, NULL))
         return;
 
     /*
      * Add the array of supported versions to the end of the packet
      */
     for (i = 0; i < OSSL_NELEM(supported_versions); i++) {
-        if (!WPACKET_put_bytes_u32(&wpkt, htonl(supported_versions[i])))
+        if (!WPACKET_put_bytes_u32(&wpkt, supported_versions[i]))
             return;
     }
 
@@ -1276,11 +1289,11 @@ static void port_send_version_negotiation(QUIC_PORT *port, BIO_ADDR *peer,
      */
     if (!BIO_sendmmsg(port->net_wbio, msg, sizeof(BIO_MSG), 1, 0, &written))
         ERR_raise_data(ERR_LIB_SSL, SSL_R_QUIC_NETWORK_ERROR,
-                       "port version negotiation send failed");
+            "port version negotiation send failed");
 }
 
 /**
- * @brief defintions of token lifetimes
+ * @brief definitions of token lifetimes
  *
  * RETRY tokens are only valid for 10 seconds
  * NEW_TOKEN tokens have a lifetime of 3600 sec (1 hour)
@@ -1319,8 +1332,8 @@ static void port_send_version_negotiation(QUIC_PORT *port, BIO_ADDR *peer,
  *   configurable in the future.
  */
 static int port_validate_token(QUIC_PKT_HDR *hdr, QUIC_PORT *port,
-                               BIO_ADDR *peer, QUIC_CONN_ID *odcid,
-                               QUIC_CONN_ID *scid, uint8_t *gen_new_token)
+    BIO_ADDR *peer, QUIC_CONN_ID *odcid,
+    QUIC_CONN_ID *scid, uint8_t *gen_new_token)
 {
     int ret = 0;
     QUIC_VALIDATION_TOKEN token = { 0 };
@@ -1332,10 +1345,10 @@ static int port_validate_token(QUIC_PKT_HDR *hdr, QUIC_PORT *port,
     *gen_new_token = 0;
 
     if (!decrypt_validation_token(port, hdr->token, hdr->token_len, NULL,
-                                  &dec_token_len)
+            &dec_token_len)
         || dec_token_len > MARSHALLED_TOKEN_MAX_LEN
         || !decrypt_validation_token(port, hdr->token, hdr->token_len,
-                                     dec_token, &dec_token_len)
+            dec_token, &dec_token_len)
         || !parse_validation_token(&token, dec_token, dec_token_len))
         goto err;
 
@@ -1346,7 +1359,7 @@ static int port_validate_token(QUIC_PKT_HDR *hdr, QUIC_PORT *port,
     if (ossl_time_compare(now, token.timestamp) < 0)
         goto err;
     time_diff = ossl_time2seconds(ossl_time_abs_difference(token.timestamp,
-                                                           now));
+        now));
     if ((token.is_retry && time_diff > RETRY_LIFETIME)
         || (!token.is_retry && time_diff > NEW_TOKEN_LIFETIME))
         goto err;
@@ -1376,7 +1389,8 @@ static int port_validate_token(QUIC_PKT_HDR *hdr, QUIC_PORT *port,
          */
         if (token.rscid.id_len != hdr->dst_conn_id.id_len
             || memcmp(&token.rscid.id, &hdr->dst_conn_id.id,
-                      token.rscid.id_len) != 0)
+                   token.rscid.id_len)
+                != 0)
             goto err;
         *odcid = token.odcid;
         *scid = token.rscid;
@@ -1445,10 +1459,10 @@ static void generate_new_token(QUIC_CHANNEL *ch, BIO_ADDR *peer)
     if (!generate_token(peer, ch->init_dcid, rscid, &token, 0)
         || !marshal_validation_token(&token, buffer, &token_buf_len)
         || !encrypt_validation_token(ch->port, buffer, token_buf_len, NULL,
-                                     &ct_len)
+            &ct_len)
         || ct_len > ENCRYPTED_TOKEN_MAX_LEN
         || !encrypt_validation_token(ch->port, buffer, token_buf_len, ct_buf,
-                                     &ct_len)
+            &ct_len)
         || !ossl_assert(ct_len >= QUIC_RETRY_INTEGRITY_TAG_LEN)) {
         OPENSSL_free(ct_buf);
         cleanup_validation_token(&token);
@@ -1466,7 +1480,7 @@ static void generate_new_token(QUIC_CHANNEL *ch, BIO_ADDR *peer)
  * DCID.
  */
 static void port_default_packet_handler(QUIC_URXE *e, void *arg,
-                                        const QUIC_CONN_ID *dcid)
+    const QUIC_CONN_ID *dcid)
 {
     QUIC_PORT *port = arg;
     PACKET pkt;
@@ -1476,7 +1490,7 @@ static void port_default_packet_handler(QUIC_URXE *e, void *arg,
     uint8_t gen_new_token = 0;
     OSSL_QRX *qrx = NULL;
     OSSL_QRX *qrx_src = NULL;
-    OSSL_QRX_ARGS qrx_args = {0};
+    OSSL_QRX_ARGS qrx_args = { 0 };
     uint64_t cause_flags = 0;
     OSSL_QRX_PKT *qrx_pkt = NULL;
 
@@ -1489,7 +1503,7 @@ static void port_default_packet_handler(QUIC_URXE *e, void *arg,
 
     if (dcid != NULL
         && ossl_quic_lcidm_lookup(port->lcidm, dcid, NULL,
-                                  (void **)&ch)) {
+            (void **)&ch)) {
         assert(ch != NULL);
         ossl_quic_channel_inject(ch, e);
         return;
@@ -1518,7 +1532,7 @@ static void port_default_packet_handler(QUIC_URXE *e, void *arg,
      * care about Initial packets.
      */
     if (!ossl_quic_wire_decode_pkt_hdr(&pkt, SIZE_MAX, 1, 0, &hdr, NULL,
-                                       &cause_flags)) {
+            &cause_flags)) {
         /*
          * If we fail due to a bad version, we know the packet up to the version
          * number was decoded, and we use it below to send a version
@@ -1566,10 +1580,10 @@ static void port_default_packet_handler(QUIC_URXE *e, void *arg,
      * Create qrx now so we can check integrity of packet
      * which does not belong to any channel.
      */
-    qrx_args.libctx             = port->engine->libctx;
-    qrx_args.demux              = port->demux;
-    qrx_args.short_conn_id_len  = dcid->id_len;
-    qrx_args.max_deferred       = 32;
+    qrx_args.libctx = port->engine->libctx;
+    qrx_args.demux = port->demux;
+    qrx_args.short_conn_id_len = dcid->id_len;
+    qrx_args.max_deferred = 32;
     qrx = ossl_qrx_new(&qrx_args);
     if (qrx == NULL)
         goto undesirable;
@@ -1578,10 +1592,10 @@ static void port_default_packet_handler(QUIC_URXE *e, void *arg,
      * Derive secrets for qrx only.
      */
     if (!ossl_quic_provide_initial_secret(port->engine->libctx,
-                                          port->engine->propq,
-                                          &hdr.dst_conn_id,
-                                          /* is_server */ 1,
-                                          qrx, NULL))
+            port->engine->propq,
+            &hdr.dst_conn_id,
+            /* is_server */ 1,
+            qrx, NULL))
         goto undesirable;
 
     if (ossl_qrx_validate_initial_packet(qrx, e, (const QUIC_CONN_ID *)dcid) == 0)
@@ -1601,8 +1615,8 @@ static void port_default_packet_handler(QUIC_URXE *e, void *arg,
          * going to create. We use qrx_src alias so we can read packets from
          * qrx and inject them to channel.
          */
-         qrx_src = qrx;
-         qrx = NULL;
+        qrx_src = qrx;
+        qrx = NULL;
     }
     /*
      * TODO(QUIC FUTURE): there should be some logic similar to accounting half-open
@@ -1622,8 +1636,9 @@ static void port_default_packet_handler(QUIC_URXE *e, void *arg,
      */
     if (hdr.token != NULL
         && port_validate_token(&hdr, port, &e->peer,
-                               &odcid, &scid,
-                               &gen_new_token) == 0) {
+               &odcid, &scid,
+               &gen_new_token)
+            == 0) {
         /*
          * RFC 9000 s 8.1.3
          * When a server receives an Initial packet with an address
@@ -1656,7 +1671,7 @@ static void port_default_packet_handler(QUIC_URXE *e, void *arg,
     }
 
     port_bind_channel(port, &e->peer, &scid, &hdr.dst_conn_id,
-                      &odcid, qrx, &new_ch);
+        &odcid, qrx, &new_ch);
 
     /*
      * if packet validates it gets moved to channel, we've just bound
@@ -1683,6 +1698,7 @@ static void port_default_packet_handler(QUIC_URXE *e, void *arg,
          */
         while (ossl_qrx_read_pkt(qrx_src, &qrx_pkt) == 1)
             ossl_quic_channel_inject_pkt(new_ch, qrx_pkt);
+        ossl_qrx_update_pn_space(qrx_src, new_ch->qrx);
     }
 
     /*
@@ -1705,7 +1721,7 @@ static void port_default_packet_handler(QUIC_URXE *e, void *arg,
 }
 
 void ossl_quic_port_raise_net_error(QUIC_PORT *port,
-                                    QUIC_CHANNEL *triggering_ch)
+    QUIC_CHANNEL *triggering_ch)
 {
     QUIC_CHANNEL *ch;
 
@@ -1717,7 +1733,7 @@ void ossl_quic_port_raise_net_error(QUIC_PORT *port,
      * cover error.
      */
     ERR_raise_data(ERR_LIB_SSL, SSL_R_QUIC_NETWORK_ERROR,
-                   "port failed due to network BIO I/O error");
+        "port failed due to network BIO I/O error");
     OSSL_ERR_STATE_save(port->err_state);
 
     port_transition_failed(port);
@@ -1727,8 +1743,8 @@ void ossl_quic_port_raise_net_error(QUIC_PORT *port,
         ossl_quic_channel_raise_net_error(triggering_ch);
 
     OSSL_LIST_FOREACH(ch, ch, &port->channel_list)
-        if (ch != triggering_ch)
-            ossl_quic_channel_raise_net_error(ch);
+    if (ch != triggering_ch)
+        ossl_quic_channel_raise_net_error(ch);
 }
 
 void ossl_quic_port_restore_err_state(const QUIC_PORT *port)
diff --git a/ssl/quic/quic_port_local.h b/ssl/quic/quic_port_local.h
index e36272a94d611..3bad3fc3a3aa5 100644
--- a/ssl/quic/quic_port_local.h
+++ b/ssl/quic/quic_port_local.h
@@ -8,13 +8,13 @@
  */
 
 #ifndef OSSL_QUIC_PORT_LOCAL_H
-# define OSSL_QUIC_PORT_LOCAL_H
+#define OSSL_QUIC_PORT_LOCAL_H
 
-# include "internal/quic_port.h"
-# include "internal/quic_reactor.h"
-# include "internal/list.h"
+#include "internal/quic_port.h"
+#include "internal/quic_reactor.h"
+#include "internal/list.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Port Structure
@@ -43,7 +43,7 @@ enum {
 
 struct quic_port_st {
     /* The engine which this port is a child of. */
-    QUIC_ENGINE                     *engine;
+    QUIC_ENGINE *engine;
 
     /*
      * QUIC_ENGINE keeps the ports which belong to it on a list for bookkeeping
@@ -51,73 +51,75 @@ struct quic_port_st {
      */
     OSSL_LIST_MEMBER(port, QUIC_PORT);
 
-    SSL * (*get_conn_user_ssl)(QUIC_CHANNEL *ch, void *arg);
+    SSL *(*get_conn_user_ssl)(QUIC_CHANNEL *ch, void *arg);
     void *user_ssl_arg;
 
     /* Used to create handshake layer objects inside newly created channels. */
-    SSL_CTX                         *channel_ctx;
+    SSL_CTX *channel_ctx;
 
     /* Network-side read and write BIOs. */
-    BIO                             *net_rbio, *net_wbio;
+    BIO *net_rbio, *net_wbio;
 
     /* RX demuxer. We register incoming DCIDs with this. */
-    QUIC_DEMUX                      *demux;
+    QUIC_DEMUX *demux;
 
     /* List of all child channels. */
-    OSSL_LIST(ch)                   channel_list;
+    OSSL_LIST(ch)
+    channel_list;
 
     /*
      * Queue of unaccepted incoming channels. Each such channel is also on
      * channel_list.
      */
-    OSSL_LIST(incoming_ch)          incoming_channel_list;
+    OSSL_LIST(incoming_ch)
+    incoming_channel_list;
 
     /* Special TSERVER channel. To be removed in the future. */
-    QUIC_CHANNEL                    *tserver_ch;
+    QUIC_CHANNEL *tserver_ch;
 
     /* LCIDM used for incoming packet routing by DCID. */
-    QUIC_LCIDM                      *lcidm;
+    QUIC_LCIDM *lcidm;
 
     /* SRTM used for incoming packet routing by SRT. */
-    QUIC_SRTM                       *srtm;
+    QUIC_SRTM *srtm;
 
     /* Port-level permanent errors (causing failure state) are stored here. */
-    ERR_STATE                       *err_state;
+    ERR_STATE *err_state;
 
     /* DCID length used for incoming short header packets. */
-    unsigned char                   rx_short_dcid_len;
+    unsigned char rx_short_dcid_len;
     /* For clients, CID length used for outgoing Initial packets. */
-    unsigned char                   tx_init_dcid_len;
+    unsigned char tx_init_dcid_len;
 
     /* Port state (QUIC_PORT_STATE_*). */
-    unsigned int                    state                           : 1;
+    unsigned int state : 1;
 
     /* Is this port created to support multiple connections? */
-    unsigned int                    is_multi_conn                   : 1;
+    unsigned int is_multi_conn : 1;
 
     /* Is this port doing server address validation */
-    unsigned int                    validate_addr                   : 1;
+    unsigned int validate_addr : 1;
 
     /* Has this port sent any packet of any kind yet? */
-    unsigned int                    have_sent_any_pkt               : 1;
+    unsigned int have_sent_any_pkt : 1;
 
     /* Does this port allow incoming connections? */
-    unsigned int                    allow_incoming                  : 1;
+    unsigned int allow_incoming : 1;
 
     /* Are we on the QUIC_ENGINE linked list of ports? */
-    unsigned int                    on_engine_list                  : 1;
+    unsigned int on_engine_list : 1;
 
     /* Are we using addressed mode (BIO_sendmmsg with non-NULL peer)? */
-    unsigned int                    addressed_mode_w                : 1;
-    unsigned int                    addressed_mode_r                : 1;
+    unsigned int addressed_mode_w : 1;
+    unsigned int addressed_mode_r : 1;
 
     /* Has the BIO been changed since we last updated reactor pollability? */
-    unsigned int                    bio_changed                     : 1;
+    unsigned int bio_changed : 1;
 
     /* AES-256 GCM context for token encryption */
     EVP_CIPHER_CTX *token_ctx;
 };
 
-# endif
+#endif
 
 #endif
diff --git a/ssl/quic/quic_rcidm.c b/ssl/quic/quic_rcidm.c
index 18f7e8096b202..0d5cb0337b29b 100644
--- a/ssl/quic/quic_rcidm.c
+++ b/ssl/quic/quic_rcidm.c
@@ -35,12 +35,12 @@
  */
 static void rcidm_update(QUIC_RCIDM *rcidm);
 static void rcidm_set_preferred_rcid(QUIC_RCIDM *rcidm,
-                                     const QUIC_CONN_ID *rcid);
+    const QUIC_CONN_ID *rcid);
 
-#define PACKETS_PER_RCID        10000
+#define PACKETS_PER_RCID 10000
 
-#define INITIAL_SEQ_NUM         0
-#define PREF_ADDR_SEQ_NUM       1
+#define INITIAL_SEQ_NUM 0
+#define PREF_ADDR_SEQ_NUM 1
 
 /*
  * RCID
@@ -114,9 +114,9 @@ enum {
 };
 
 enum {
-    RCID_TYPE_INITIAL,      /* CID is from an peer INITIAL packet     (seq 0) */
-    RCID_TYPE_PREF_ADDR,    /* CID is from a preferred_address TPARAM (seq 1) */
-    RCID_TYPE_NCID          /* CID is from a NCID frame */
+    RCID_TYPE_INITIAL, /* CID is from an peer INITIAL packet     (seq 0) */
+    RCID_TYPE_PREF_ADDR, /* CID is from a preferred_address TPARAM (seq 1) */
+    RCID_TYPE_NCID /* CID is from a NCID frame */
     /*
      * INITIAL_ODCID and RETRY_ODCID also conceptually exist but are tracked
      * separately.
@@ -126,11 +126,11 @@ enum {
 typedef struct rcid_st {
     OSSL_LIST_MEMBER(retiring, struct rcid_st); /* valid iff RETIRING */
 
-    QUIC_CONN_ID    cid;        /* The actual CID string for this RCID */
-    uint64_t        seq_num;
-    size_t          pq_idx;     /* Index of entry into priority queue */
-    unsigned int    state  : 2; /* RCID_STATE_* */
-    unsigned int    type   : 2; /* RCID_TYPE_* */
+    QUIC_CONN_ID cid; /* The actual CID string for this RCID */
+    uint64_t seq_num;
+    size_t pq_idx; /* Index of entry into priority queue */
+    unsigned int state : 2; /* RCID_STATE_* */
+    unsigned int type : 2; /* RCID_TYPE_* */
 } RCID;
 
 DEFINE_PRIORITY_QUEUE_OF(RCID);
@@ -168,30 +168,30 @@ struct quic_rcidm_st {
      * otherwise it is set to one of the unnumbered RCIDs (the Initial ODCID or
      * Retry ODCID) if available (and cur_rcid == NULL).
      */
-    QUIC_CONN_ID                preferred_rcid;
+    QUIC_CONN_ID preferred_rcid;
 
     /*
      * These are initialized if the corresponding added_ flags are set.
      */
-    QUIC_CONN_ID                initial_odcid, retry_odcid;
+    QUIC_CONN_ID initial_odcid, retry_odcid;
 
     /*
      * Total number of packets sent since we last made a packet count-based RCID
      * update decision.
      */
-    uint64_t                    packets_sent;
+    uint64_t packets_sent;
 
     /* Number of post-handshake RCID changes we have performed. */
-    uint64_t                    num_changes;
+    uint64_t num_changes;
 
     /*
      * The Retire Prior To watermark value; max(retire_prior_to) of all received
      * NCID frames.
      */
-    uint64_t                    retire_prior_to;
+    uint64_t retire_prior_to;
 
     /* (SORT BY seq_num ASC) -> (RCID *) */
-    PRIORITY_QUEUE_OF(RCID)     *rcids;
+    PRIORITY_QUEUE_OF(RCID) * rcids;
 
     /*
      * Current RCID object we are using. This may differ from the first item in
@@ -200,7 +200,7 @@ struct quic_rcidm_st {
      * keep using seq 5 until we decide to roll again rather than immediately
      * switch to seq 4. Never points to an object on the retiring_list.
      */
-    RCID                        *cur_rcid;
+    RCID *cur_rcid;
 
     /*
      * When a RCID becomes pending-retirement, it is moved to the retiring_list,
@@ -210,28 +210,29 @@ struct quic_rcidm_st {
      * maintain the guarantee that the head (if present) only changes when a
      * caller calls pop().
      */
-    OSSL_LIST(retiring)         retiring_list;
+    OSSL_LIST(retiring)
+    retiring_list;
 
     /* Number of entries on the retiring_list. */
-    size_t                      num_retiring;
+    size_t num_retiring;
 
     /* preferred_rcid has been changed? */
-    unsigned int    preferred_rcid_changed          : 1;
+    unsigned int preferred_rcid_changed : 1;
 
     /* Do we have any RCID we can use currently? */
-    unsigned int    have_preferred_rcid             : 1;
+    unsigned int have_preferred_rcid : 1;
 
     /* QUIC handshake has been completed? */
-    unsigned int    handshake_complete              : 1;
+    unsigned int handshake_complete : 1;
 
     /* odcid was set (not necessarily still valid as a RCID)? */
-    unsigned int    added_initial_odcid             : 1;
+    unsigned int added_initial_odcid : 1;
     /* retry_odcid was set (not necessarily still valid as a RCID?) */
-    unsigned int    added_retry_odcid               : 1;
+    unsigned int added_retry_odcid : 1;
     /* An initial RCID was added as an RCID structure? */
-    unsigned int    added_initial_rcid              : 1;
+    unsigned int added_initial_rcid : 1;
     /* Has a RCID roll been manually requested? */
-    unsigned int    roll_requested                  : 1;
+    unsigned int roll_requested : 1;
 };
 
 /*
@@ -240,31 +241,31 @@ struct quic_rcidm_st {
  * Limit the total number of numbered RCIDs to an implausibly large but safe
  * value.
  */
-#define MAX_NUMBERED_RCIDS      (SIZE_MAX / 2)
+#define MAX_NUMBERED_RCIDS (SIZE_MAX / 2)
 
 static void rcidm_transition_rcid(QUIC_RCIDM *rcidm, RCID *rcid,
-                                  unsigned int state);
+    unsigned int state);
 
 /* Check invariants of an RCID */
 static void rcidm_check_rcid(QUIC_RCIDM *rcidm, RCID *rcid)
 {
     assert(rcid->state == RCID_STATE_PENDING
-           || rcid->state == RCID_STATE_CUR
-           || rcid->state == RCID_STATE_RETIRING);
+        || rcid->state == RCID_STATE_CUR
+        || rcid->state == RCID_STATE_RETIRING);
     assert((rcid->state == RCID_STATE_PENDING)
-           == (rcid->pq_idx != SIZE_MAX));
+        == (rcid->pq_idx != SIZE_MAX));
     assert((rcid->state == RCID_STATE_CUR)
-           == (rcidm->cur_rcid == rcid));
+        == (rcidm->cur_rcid == rcid));
     assert((ossl_list_retiring_next(rcid) != NULL
-            || ossl_list_retiring_prev(rcid) != NULL
-            || ossl_list_retiring_head(&rcidm->retiring_list) == rcid)
-           == (rcid->state == RCID_STATE_RETIRING));
+               || ossl_list_retiring_prev(rcid) != NULL
+               || ossl_list_retiring_head(&rcidm->retiring_list) == rcid)
+        == (rcid->state == RCID_STATE_RETIRING));
     assert(rcid->type != RCID_TYPE_INITIAL || rcid->seq_num == 0);
     assert(rcid->type != RCID_TYPE_PREF_ADDR || rcid->seq_num == 1);
     assert(rcid->seq_num <= OSSL_QUIC_VLINT_MAX);
     assert(rcid->cid.id_len > 0 && rcid->cid.id_len <= QUIC_MAX_CONN_ID_LEN);
     assert(rcid->seq_num >= rcidm->retire_prior_to
-            || rcid->state == RCID_STATE_RETIRING);
+        || rcid->state == RCID_STATE_RETIRING);
     assert(rcidm->num_changes == 0 || rcidm->handshake_complete);
     assert(rcid->state != RCID_STATE_RETIRING || rcidm->num_retiring > 0);
 }
@@ -291,8 +292,8 @@ QUIC_RCIDM *ossl_quic_rcidm_new(const QUIC_CONN_ID *initial_odcid)
     }
 
     if (initial_odcid != NULL) {
-        rcidm->initial_odcid        = *initial_odcid;
-        rcidm->added_initial_odcid  = 1;
+        rcidm->initial_odcid = *initial_odcid;
+        rcidm->added_initial_odcid = 1;
     }
 
     rcidm_update(rcidm);
@@ -311,27 +312,27 @@ void ossl_quic_rcidm_free(QUIC_RCIDM *rcidm)
         OPENSSL_free(rcid);
 
     OSSL_LIST_FOREACH_DELSAFE(rcid, rnext, retiring, &rcidm->retiring_list)
-        OPENSSL_free(rcid);
+    OPENSSL_free(rcid);
 
     ossl_pqueue_RCID_free(rcidm->rcids);
     OPENSSL_free(rcidm);
 }
 
 static void rcidm_set_preferred_rcid(QUIC_RCIDM *rcidm,
-                                     const QUIC_CONN_ID *rcid)
+    const QUIC_CONN_ID *rcid)
 {
     if (rcid == NULL) {
-        rcidm->preferred_rcid_changed   = 1;
-        rcidm->have_preferred_rcid      = 0;
+        rcidm->preferred_rcid_changed = 1;
+        rcidm->have_preferred_rcid = 0;
         return;
     }
 
     if (ossl_quic_conn_id_eq(&rcidm->preferred_rcid, rcid))
         return;
 
-    rcidm->preferred_rcid           = *rcid;
-    rcidm->preferred_rcid_changed   = 1;
-    rcidm->have_preferred_rcid      = 1;
+    rcidm->preferred_rcid = *rcid;
+    rcidm->preferred_rcid_changed = 1;
+    rcidm->have_preferred_rcid = 1;
 }
 
 /*
@@ -339,8 +340,8 @@ static void rcidm_set_preferred_rcid(QUIC_RCIDM *rcidm,
  * =========================
  */
 static RCID *rcidm_create_rcid(QUIC_RCIDM *rcidm, uint64_t seq_num,
-                               const QUIC_CONN_ID *cid,
-                               unsigned int type)
+    const QUIC_CONN_ID *cid,
+    unsigned int type)
 {
     RCID *rcid;
 
@@ -353,9 +354,9 @@ static RCID *rcidm_create_rcid(QUIC_RCIDM *rcidm, uint64_t seq_num,
     if ((rcid = OPENSSL_zalloc(sizeof(*rcid))) == NULL)
         return NULL;
 
-    rcid->seq_num           = seq_num;
-    rcid->cid               = *cid;
-    rcid->type              = type;
+    rcid->seq_num = seq_num;
+    rcid->cid = *cid;
+    rcid->type = type;
 
     if (rcid->seq_num >= rcidm->retire_prior_to) {
         rcid->state = RCID_STATE_PENDING;
@@ -366,8 +367,8 @@ static RCID *rcidm_create_rcid(QUIC_RCIDM *rcidm, uint64_t seq_num,
         }
     } else {
         /* RCID is immediately retired upon creation. */
-        rcid->state     = RCID_STATE_RETIRING;
-        rcid->pq_idx    = SIZE_MAX;
+        rcid->state = RCID_STATE_RETIRING;
+        rcid->pq_idx = SIZE_MAX;
         ossl_list_retiring_insert_tail(&rcidm->retiring_list, rcid);
         ++rcidm->num_retiring;
     }
@@ -377,7 +378,7 @@ static RCID *rcidm_create_rcid(QUIC_RCIDM *rcidm, uint64_t seq_num,
 }
 
 static void rcidm_transition_rcid(QUIC_RCIDM *rcidm, RCID *rcid,
-                                  unsigned int state)
+    unsigned int state)
 {
     unsigned int old_state = rcid->state;
 
@@ -438,7 +439,7 @@ static void rcidm_free_rcid(QUIC_RCIDM *rcidm, RCID *rcid)
 }
 
 static void rcidm_handle_retire_prior_to(QUIC_RCIDM *rcidm,
-                                         uint64_t retire_prior_to)
+    uint64_t retire_prior_to)
 {
     RCID *rcid;
 
@@ -457,7 +458,7 @@ static void rcidm_handle_retire_prior_to(QUIC_RCIDM *rcidm,
      * threshold.
      */
     while ((rcid = ossl_pqueue_RCID_peek(rcidm->rcids)) != NULL
-           && rcid->seq_num < retire_prior_to)
+        && rcid->seq_num < retire_prior_to)
         rcidm_transition_rcid(rcidm, rcid, RCID_STATE_RETIRING);
 
     rcidm->retire_prior_to = retire_prior_to;
@@ -578,7 +579,7 @@ void ossl_quic_rcidm_request_roll(QUIC_RCIDM *rcidm)
  * ===================
  */
 int ossl_quic_rcidm_add_from_initial(QUIC_RCIDM *rcidm,
-                                     const QUIC_CONN_ID *rcid)
+    const QUIC_CONN_ID *rcid)
 {
     RCID *rcid_obj;
 
@@ -586,7 +587,7 @@ int ossl_quic_rcidm_add_from_initial(QUIC_RCIDM *rcidm,
         return 0;
 
     rcid_obj = rcidm_create_rcid(rcidm, INITIAL_SEQ_NUM,
-                                 rcid, RCID_TYPE_INITIAL);
+        rcid, RCID_TYPE_INITIAL);
     if (rcid_obj == NULL)
         return 0;
 
@@ -596,19 +597,19 @@ int ossl_quic_rcidm_add_from_initial(QUIC_RCIDM *rcidm,
 }
 
 int ossl_quic_rcidm_add_from_server_retry(QUIC_RCIDM *rcidm,
-                                          const QUIC_CONN_ID *retry_odcid)
+    const QUIC_CONN_ID *retry_odcid)
 {
     if (rcidm->added_retry_odcid || rcidm->handshake_complete)
         return 0;
 
-    rcidm->retry_odcid          = *retry_odcid;
-    rcidm->added_retry_odcid    = 1;
+    rcidm->retry_odcid = *retry_odcid;
+    rcidm->added_retry_odcid = 1;
     rcidm_tick(rcidm);
     return 1;
 }
 
 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)
 {
     RCID *rcid;
 
@@ -643,19 +644,19 @@ static int rcidm_get_retire(QUIC_RCIDM *rcidm, uint64_t *seq_num, int peek)
 }
 
 int ossl_quic_rcidm_pop_retire_seq_num(QUIC_RCIDM *rcidm,
-                                       uint64_t *seq_num)
+    uint64_t *seq_num)
 {
     return rcidm_get_retire(rcidm, seq_num, /*peek=*/0);
 }
 
 int ossl_quic_rcidm_peek_retire_seq_num(QUIC_RCIDM *rcidm,
-                                        uint64_t *seq_num)
+    uint64_t *seq_num)
 {
     return rcidm_get_retire(rcidm, seq_num, /*peek=*/1);
 }
 
 int ossl_quic_rcidm_get_preferred_tx_dcid(QUIC_RCIDM *rcidm,
-                                          QUIC_CONN_ID *tx_dcid)
+    QUIC_CONN_ID *tx_dcid)
 {
     if (!rcidm->have_preferred_rcid)
         return 0;
@@ -665,7 +666,7 @@ int ossl_quic_rcidm_get_preferred_tx_dcid(QUIC_RCIDM *rcidm,
 }
 
 int ossl_quic_rcidm_get_preferred_tx_dcid_changed(QUIC_RCIDM *rcidm,
-                                                  int clear)
+    int clear)
 {
     int r = rcidm->preferred_rcid_changed;
 
diff --git a/ssl/quic/quic_reactor.c b/ssl/quic/quic_reactor.c
index bca46011f2e9d..c30bc3c595ab1 100644
--- a/ssl/quic/quic_reactor.c
+++ b/ssl/quic/quic_reactor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -11,6 +11,12 @@
 #include "internal/thread_arch.h"
 #include <assert.h>
 
+#if defined(OPENSSL_SYS_WINDOWS)
+#include <winsock2.h>
+#include <mstcpip.h>
+#include <mswsock.h>
+#endif
+
 /*
  * Core I/O Reactor Framework
  * ==========================
@@ -18,24 +24,24 @@
 static void rtor_notify_other_threads(QUIC_REACTOR *rtor);
 
 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)
 {
-    rtor->poll_r.type       = BIO_POLL_DESCRIPTOR_TYPE_NONE;
-    rtor->poll_w.type       = BIO_POLL_DESCRIPTOR_TYPE_NONE;
-    rtor->net_read_desired  = 0;
+    rtor->poll_r.type = BIO_POLL_DESCRIPTOR_TYPE_NONE;
+    rtor->poll_w.type = BIO_POLL_DESCRIPTOR_TYPE_NONE;
+    rtor->net_read_desired = 0;
     rtor->net_write_desired = 0;
-    rtor->can_poll_r        = 0;
-    rtor->can_poll_w        = 0;
-    rtor->tick_deadline     = initial_tick_deadline;
+    rtor->can_poll_r = 0;
+    rtor->can_poll_w = 0;
+    rtor->tick_deadline = initial_tick_deadline;
 
-    rtor->tick_cb           = tick_cb;
-    rtor->tick_cb_arg       = tick_cb_arg;
-    rtor->mutex             = mutex;
+    rtor->tick_cb = tick_cb;
+    rtor->tick_cb_arg = tick_cb_arg;
+    rtor->mutex = mutex;
 
     rtor->cur_blocking_waiters = 0;
 
@@ -69,6 +75,34 @@ void ossl_quic_reactor_cleanup(QUIC_REACTOR *rtor)
     }
 }
 
+#if defined(OPENSSL_SYS_WINDOWS)
+
+/* Work around for MinGW builds. */
+#if defined(__MINGW32__) && !defined(SIO_UDP_NETRESET)
+#define SIO_UDP_NETRESET _WSAIOW(IOC_VENDOR, 15)
+#endif
+
+/*
+ * On Windows recvfrom() may return WSAECONNRESET when destination port
+ * used in preceding call to sendto() is no longer reachable. The reset
+ * error received from UDP socket takes the whole port down. This behavior
+ * must be suppressed for QUIC protocol so QUIC applications may rely on
+ * QUIC protocol itself to detect network failures.
+ */
+static void rtor_configure_winsock(BIO_POLL_DESCRIPTOR *bpd)
+{
+    BOOL bNewBehavior = FALSE;
+    DWORD dwBytesReturned = 0;
+
+    if (bpd->type == BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD) {
+        WSAIoctl(bpd->value.fd, SIO_UDP_CONNRESET, &bNewBehavior,
+            sizeof(bNewBehavior), NULL, 0, &dwBytesReturned, NULL, NULL);
+        WSAIoctl(bpd->value.fd, SIO_UDP_NETRESET, &bNewBehavior,
+            sizeof(bNewBehavior), NULL, 0, &dwBytesReturned, NULL, NULL);
+    }
+}
+#endif
+
 void ossl_quic_reactor_set_poll_r(QUIC_REACTOR *rtor, const BIO_POLL_DESCRIPTOR *r)
 {
     if (r == NULL)
@@ -76,6 +110,10 @@ void ossl_quic_reactor_set_poll_r(QUIC_REACTOR *rtor, const BIO_POLL_DESCRIPTOR
     else
         rtor->poll_r = *r;
 
+#if defined(OPENSSL_SYS_WINDOWS)
+    rtor_configure_winsock(&rtor->poll_r);
+#endif
+
     rtor->can_poll_r
         = ossl_quic_reactor_can_support_poll_descriptor(rtor, &rtor->poll_r);
 }
@@ -87,6 +125,10 @@ void ossl_quic_reactor_set_poll_w(QUIC_REACTOR *rtor, const BIO_POLL_DESCRIPTOR
     else
         rtor->poll_w = *w;
 
+#if defined(OPENSSL_SYS_WINDOWS)
+    rtor_configure_winsock(&rtor->poll_w);
+#endif
+
     rtor->can_poll_w
         = ossl_quic_reactor_can_support_poll_descriptor(rtor, &rtor->poll_w);
 }
@@ -102,7 +144,7 @@ const BIO_POLL_DESCRIPTOR *ossl_quic_reactor_get_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)
 {
     return d->type == BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD;
 }
@@ -134,7 +176,7 @@ OSSL_TIME ossl_quic_reactor_get_tick_deadline(QUIC_REACTOR *rtor)
 
 int ossl_quic_reactor_tick(QUIC_REACTOR *rtor, uint32_t flags)
 {
-    QUIC_TICK_RESULT res = {0};
+    QUIC_TICK_RESULT res = { 0 };
 
     /*
      * Note that the tick callback cannot fail; this is intentional. Arguably it
@@ -145,9 +187,9 @@ int ossl_quic_reactor_tick(QUIC_REACTOR *rtor, uint32_t flags)
      */
     rtor->tick_cb(&res, rtor->tick_cb_arg, flags);
 
-    rtor->net_read_desired  = res.net_read_desired;
+    rtor->net_read_desired = res.net_read_desired;
     rtor->net_write_desired = res.net_write_desired;
-    rtor->tick_deadline     = res.tick_deadline;
+    rtor->tick_deadline = res.tick_deadline;
     if (res.notify_other_threads)
         rtor_notify_other_threads(rtor);
 
@@ -207,10 +249,10 @@ RIO_NOTIFIER *ossl_quic_reactor_get0_notifier(QUIC_REACTOR *rtor)
  *                   CRYPTO_THREAD_write_lock fails)
  */
 static int poll_two_fds(int rfd, int rfd_want_read,
-                        int wfd, int wfd_want_write,
-                        int notify_rfd,
-                        OSSL_TIME deadline,
-                        CRYPTO_MUTEX *mutex)
+    int wfd, int wfd_want_write,
+    int notify_rfd,
+    OSSL_TIME deadline,
+    CRYPTO_MUTEX *mutex)
 {
 #if defined(OPENSSL_SYS_WINDOWS) || !defined(POLLIN)
     fd_set rfd_set, wfd_set, efd_set;
@@ -218,14 +260,14 @@ static int poll_two_fds(int rfd, int rfd_want_read,
     struct timeval tv, *ptv;
     int maxfd, pres;
 
-# ifndef OPENSSL_SYS_WINDOWS
+#ifndef OPENSSL_SYS_WINDOWS
     /*
      * On Windows there is no relevant limit to the magnitude of a fd value (see
      * above). On *NIX the fd_set uses a bitmap and we must check the limit.
      */
     if (rfd >= FD_SETSIZE || wfd >= FD_SETSIZE)
         return 0;
-# endif
+#endif
 
     FD_ZERO(&rfd_set);
     FD_ZERO(&wfd_set);
@@ -255,7 +297,7 @@ static int poll_two_fds(int rfd, int rfd_want_read,
         maxfd = notify_rfd;
 
     if (!ossl_assert(rfd != INVALID_SOCKET || wfd != INVALID_SOCKET
-                     || !ossl_time_is_infinite(deadline)))
+            || !ossl_time_is_infinite(deadline)))
         /* Do not block forever; should not happen. */
         return 0;
 
@@ -265,10 +307,10 @@ static int poll_two_fds(int rfd, int rfd_want_read,
      * two threads arrive to select/poll with the same file
      * descriptors. We just need to be aware of this.
      */
-# if defined(OPENSSL_THREADS)
+#if defined(OPENSSL_THREADS)
     if (mutex != NULL)
         ossl_crypto_mutex_unlock(mutex);
-# endif
+#endif
 
     do {
         /*
@@ -285,46 +327,46 @@ static int poll_two_fds(int rfd, int rfd_want_read,
              * now > deadline.
              */
             timeout = ossl_time_subtract(deadline, now);
-            tv      = ossl_time_to_timeval(timeout);
-            ptv     = &tv;
+            tv = ossl_time_to_timeval(timeout);
+            ptv = &tv;
         }
 
         pres = select(maxfd + 1, &rfd_set, &wfd_set, &efd_set, ptv);
     } while (pres == -1 && get_last_socket_error_is_eintr());
 
-# if defined(OPENSSL_THREADS)
+#if defined(OPENSSL_THREADS)
     if (mutex != NULL)
         ossl_crypto_mutex_lock(mutex);
-# endif
+#endif
 
     return pres < 0 ? 0 : 1;
 #else
     int pres, timeout_ms;
     OSSL_TIME now, timeout;
-    struct pollfd pfds[3] = {0};
+    struct pollfd pfds[3] = { 0 };
     size_t npfd = 0;
 
     if (rfd == wfd) {
         pfds[npfd].fd = rfd;
-        pfds[npfd].events = (rfd_want_read  ? POLLIN  : 0)
-                          | (wfd_want_write ? POLLOUT : 0);
+        pfds[npfd].events = (rfd_want_read ? POLLIN : 0)
+            | (wfd_want_write ? POLLOUT : 0);
         if (rfd >= 0 && pfds[npfd].events != 0)
             ++npfd;
     } else {
-        pfds[npfd].fd     = rfd;
+        pfds[npfd].fd = rfd;
         pfds[npfd].events = (rfd_want_read ? POLLIN : 0);
         if (rfd >= 0 && pfds[npfd].events != 0)
             ++npfd;
 
-        pfds[npfd].fd     = wfd;
+        pfds[npfd].fd = wfd;
         pfds[npfd].events = (wfd_want_write ? POLLOUT : 0);
         if (wfd >= 0 && pfds[npfd].events != 0)
             ++npfd;
     }
 
     if (notify_rfd >= 0) {
-        pfds[npfd].fd       = notify_rfd;
-        pfds[npfd].events   = POLLIN;
+        pfds[npfd].fd = notify_rfd;
+        pfds[npfd].events = POLLIN;
         ++npfd;
     }
 
@@ -332,27 +374,27 @@ static int poll_two_fds(int rfd, int rfd_want_read,
         /* Do not block forever; should not happen. */
         return 0;
 
-# if defined(OPENSSL_THREADS)
+#if defined(OPENSSL_THREADS)
     if (mutex != NULL)
         ossl_crypto_mutex_unlock(mutex);
-# endif
+#endif
 
     do {
         if (ossl_time_is_infinite(deadline)) {
             timeout_ms = -1;
         } else {
-            now         = ossl_time_now();
-            timeout     = ossl_time_subtract(deadline, now);
-            timeout_ms  = ossl_time2ms(timeout);
+            now = ossl_time_now();
+            timeout = ossl_time_subtract(deadline, now);
+            timeout_ms = ossl_time2ms(timeout);
         }
 
         pres = poll(pfds, npfd, timeout_ms);
     } while (pres == -1 && get_last_socket_error_is_eintr());
 
-# if defined(OPENSSL_THREADS)
+#if defined(OPENSSL_THREADS)
     if (mutex != NULL)
         ossl_crypto_mutex_lock(mutex);
-# endif
+#endif
 
     return pres < 0 ? 0 : 1;
 #endif
@@ -366,7 +408,7 @@ static int poll_descriptor_to_fd(const BIO_POLL_DESCRIPTOR *d, int *fd)
     }
 
     if (d->type != BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD
-            || d->value.fd == INVALID_SOCKET)
+        || d->value.fd == INVALID_SOCKET)
         return 0;
 
     *fd = d->value.fd;
@@ -385,10 +427,10 @@ static int poll_descriptor_to_fd(const BIO_POLL_DESCRIPTOR *d, int *fd)
  *                   CRYPTO_THREAD_write_lock fails)
  */
 static int poll_two_descriptors(const BIO_POLL_DESCRIPTOR *r, int r_want_read,
-                                const BIO_POLL_DESCRIPTOR *w, int w_want_write,
-                                int notify_rfd,
-                                OSSL_TIME deadline,
-                                CRYPTO_MUTEX *mutex)
+    const BIO_POLL_DESCRIPTOR *w, int w_want_write,
+    int notify_rfd,
+    OSSL_TIME deadline,
+    CRYPTO_MUTEX *mutex)
 {
     int rfd, wfd;
 
@@ -397,7 +439,7 @@ static int poll_two_descriptors(const BIO_POLL_DESCRIPTOR *r, int r_want_read,
         return 0;
 
     return poll_two_fds(rfd, r_want_read, wfd, w_want_write,
-                        notify_rfd, deadline, mutex);
+        notify_rfd, deadline, mutex);
 }
 
 /*
@@ -428,21 +470,21 @@ static void rtor_notify_other_threads(QUIC_REACTOR *rtor)
      * threads have woken.
      */
 
-   if (rtor->cur_blocking_waiters == 0)
-       /* Nothing to do in this case. */
-       return;
-
-   /* Signal the notifier to wake up all threads. */
-   if (!rtor->signalled_notifier) {
-       ossl_rio_notifier_signal(&rtor->notifier);
-       rtor->signalled_notifier = 1;
-   }
-
-   /*
-    * Wait on the CV until all threads have finished the first phase of the
-    * wakeup process and the last thread out has taken responsibility for
-    * unsignalling the notifier.
-    */
+    if (rtor->cur_blocking_waiters == 0)
+        /* Nothing to do in this case. */
+        return;
+
+    /* Signal the notifier to wake up all threads. */
+    if (!rtor->signalled_notifier) {
+        ossl_rio_notifier_signal(&rtor->notifier);
+        rtor->signalled_notifier = 1;
+    }
+
+    /*
+     * Wait on the CV until all threads have finished the first phase of the
+     * wakeup process and the last thread out has taken responsibility for
+     * unsignalling the notifier.
+     */
     while (rtor->signalled_notifier)
         ossl_crypto_condvar_wait(rtor->notifier_cv, rtor->mutex);
 }
@@ -459,8 +501,8 @@ static void rtor_notify_other_threads(QUIC_REACTOR *rtor)
  *                   CRYPTO_THREAD_write_lock fails)
  */
 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)
 {
     int res, net_read_desired, net_write_desired, notifier_fd;
     OSSL_TIME tick_deadline;
@@ -479,9 +521,9 @@ int ossl_quic_reactor_block_until_pred(QUIC_REACTOR *rtor,
         if ((res = pred(pred_arg)) != 0)
             return res;
 
-        net_read_desired  = ossl_quic_reactor_net_read_desired(rtor);
+        net_read_desired = ossl_quic_reactor_net_read_desired(rtor);
         net_write_desired = ossl_quic_reactor_net_write_desired(rtor);
-        tick_deadline     = ossl_quic_reactor_get_tick_deadline(rtor);
+        tick_deadline = ossl_quic_reactor_get_tick_deadline(rtor);
         if (!net_read_desired && !net_write_desired
             && ossl_time_is_infinite(tick_deadline))
             /* Can't wait if there is nothing to wait for. */
@@ -490,12 +532,12 @@ int ossl_quic_reactor_block_until_pred(QUIC_REACTOR *rtor,
         ossl_quic_reactor_enter_blocking_section(rtor);
 
         res = poll_two_descriptors(ossl_quic_reactor_get_poll_r(rtor),
-                                   net_read_desired,
-                                   ossl_quic_reactor_get_poll_w(rtor),
-                                   net_write_desired,
-                                   notifier_fd,
-                                   tick_deadline,
-                                   rtor->mutex);
+            net_read_desired,
+            ossl_quic_reactor_get_poll_w(rtor),
+            net_write_desired,
+            notifier_fd,
+            tick_deadline,
+            rtor->mutex);
 
         /*
          * We have now exited the OS poller call. We may have
diff --git a/ssl/quic/quic_reactor_wait_ctx.c b/ssl/quic/quic_reactor_wait_ctx.c
index 00efac715603b..ae3b7cb3efe3b 100644
--- a/ssl/quic/quic_reactor_wait_ctx.c
+++ b/ssl/quic/quic_reactor_wait_ctx.c
@@ -13,8 +13,8 @@
 
 struct quic_reactor_wait_slot_st {
     OSSL_LIST_MEMBER(quic_reactor_wait_slot, QUIC_REACTOR_WAIT_SLOT);
-    QUIC_REACTOR            *rtor;              /* primary key */
-    size_t                  blocking_count;     /* datum */
+    QUIC_REACTOR *rtor; /* primary key */
+    size_t blocking_count; /* datum */
 };
 
 DEFINE_LIST_OF_IMPL(quic_reactor_wait_slot, QUIC_REACTOR_WAIT_SLOT);
@@ -41,13 +41,13 @@ static void slot_deactivate(QUIC_REACTOR_WAIT_SLOT *slot)
 }
 
 int ossl_quic_reactor_wait_ctx_enter(QUIC_REACTOR_WAIT_CTX *ctx,
-                                     QUIC_REACTOR *rtor)
+    QUIC_REACTOR *rtor)
 {
     QUIC_REACTOR_WAIT_SLOT *slot;
 
     OSSL_LIST_FOREACH(slot, quic_reactor_wait_slot, &ctx->slots)
-        if (slot->rtor == rtor)
-            break;
+    if (slot->rtor == rtor)
+        break;
 
     if (slot == NULL) {
         if ((slot = OPENSSL_zalloc(sizeof(QUIC_REACTOR_WAIT_SLOT))) == NULL)
@@ -62,13 +62,13 @@ int ossl_quic_reactor_wait_ctx_enter(QUIC_REACTOR_WAIT_CTX *ctx,
 }
 
 void ossl_quic_reactor_wait_ctx_leave(QUIC_REACTOR_WAIT_CTX *ctx,
-                                      QUIC_REACTOR *rtor)
+    QUIC_REACTOR *rtor)
 {
     QUIC_REACTOR_WAIT_SLOT *slot;
 
     OSSL_LIST_FOREACH(slot, quic_reactor_wait_slot, &ctx->slots)
-        if (slot->rtor == rtor)
-            break;
+    if (slot->rtor == rtor)
+        break;
 
     assert(slot != NULL);
     slot_deactivate(slot);
@@ -78,7 +78,8 @@ void ossl_quic_reactor_wait_ctx_cleanup(QUIC_REACTOR_WAIT_CTX *ctx)
 {
     QUIC_REACTOR_WAIT_SLOT *slot, *nslot;
 
-    OSSL_LIST_FOREACH_DELSAFE(slot, nslot, quic_reactor_wait_slot, &ctx->slots) {
+    OSSL_LIST_FOREACH_DELSAFE(slot, nslot, quic_reactor_wait_slot, &ctx->slots)
+    {
         assert(slot->blocking_count == 0);
         OPENSSL_free(slot);
     }
diff --git a/ssl/quic/quic_record_rx.c b/ssl/quic/quic_record_rx.c
index e01cc5253457d..d9e2b4323bdfb 100644
--- a/ssl/quic/quic_record_rx.c
+++ b/ssl/quic/quic_record_rx.c
@@ -42,36 +42,36 @@ static ossl_inline int pkt_is_marked(const uint64_t *bitf, size_t pkt_idx)
 typedef struct rxe_st RXE;
 
 struct rxe_st {
-    OSSL_QRX_PKT        pkt;
+    OSSL_QRX_PKT pkt;
     OSSL_LIST_MEMBER(rxe, RXE);
-    size_t              data_len, alloc_len, refcount;
+    size_t data_len, alloc_len, refcount;
 
     /* Extra fields for per-packet information. */
-    QUIC_PKT_HDR        hdr; /* data/len are decrypted payload */
+    QUIC_PKT_HDR hdr; /* data/len are decrypted payload */
 
     /* Decoded packet number. */
-    QUIC_PN             pn;
+    QUIC_PN pn;
 
     /* Addresses copied from URXE. */
-    BIO_ADDR            peer, local;
+    BIO_ADDR peer, local;
 
     /* Time we received the packet (not when we processed it). */
-    OSSL_TIME           time;
+    OSSL_TIME time;
 
     /* Total length of the datagram which contained this packet. */
-    size_t              datagram_len;
+    size_t datagram_len;
 
     /*
      * The key epoch the packet was received with. Always 0 for non-1-RTT
      * packets.
      */
-    uint64_t            key_epoch;
+    uint64_t key_epoch;
 
     /*
      * Monotonically increases with each datagram received.
      * For diagnostic use only.
      */
-    uint64_t            datagram_id;
+    uint64_t datagram_id;
 
     /*
      * alloc_len allocated bytes (of which data_len bytes are valid) follow this
@@ -92,80 +92,80 @@ static ossl_inline unsigned char *rxe_data(const RXE *e)
  * ===
  */
 struct ossl_qrx_st {
-    OSSL_LIB_CTX               *libctx;
-    const char                 *propq;
+    OSSL_LIB_CTX *libctx;
+    const char *propq;
 
     /* Demux to receive datagrams from. */
-    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. */
-    size_t                      max_deferred;
+    size_t max_deferred;
 
     /* Current count of deferred datagrams. */
-    size_t                      num_deferred;
+    size_t num_deferred;
 
     /*
      * List of URXEs which are filled with received encrypted data.
      * These are returned to the DEMUX's free list as they are processed.
      */
-    QUIC_URXE_LIST              urx_pending;
+    QUIC_URXE_LIST urx_pending;
 
     /*
      * List of URXEs which we could not decrypt immediately and which are being
      * kept in case they can be decrypted later.
      */
-    QUIC_URXE_LIST              urx_deferred;
+    QUIC_URXE_LIST urx_deferred;
 
     /*
      * List of RXEs which are not currently in use. These are moved
      * to the pending list as they are filled.
      */
-    RXE_LIST                    rx_free;
+    RXE_LIST rx_free;
 
     /*
      * List of RXEs which are filled with decrypted packets ready to be passed
      * to the user. A RXE is removed from all lists inside the QRL when passed
      * to the user, then returned to the free list when the user returns it.
      */
-    RXE_LIST                    rx_pending;
+    RXE_LIST rx_pending;
 
     /* Largest PN we have received and processed in a given PN space. */
-    QUIC_PN                     largest_pn[QUIC_PN_SPACE_NUM];
+    QUIC_PN largest_pn[QUIC_PN_SPACE_NUM];
 
     /* Per encryption-level state. */
-    OSSL_QRL_ENC_LEVEL_SET      el_set;
+    OSSL_QRL_ENC_LEVEL_SET el_set;
 
     /* Bytes we have received since this counter was last cleared. */
-    uint64_t                    bytes_received;
+    uint64_t bytes_received;
 
     /*
      * Number of forged packets we have received since the QRX was instantiated.
      * Note that as per RFC 9001, this is connection-level state; it is not per
      * EL and is not reset by a key update.
      */
-    uint64_t                    forged_pkt_count;
+    uint64_t forged_pkt_count;
 
     /*
      * The PN the current key epoch started at, inclusive.
      */
-    uint64_t                    cur_epoch_start_pn;
+    uint64_t cur_epoch_start_pn;
 
     /* Validation callback. */
-    ossl_qrx_late_validation_cb    *validation_cb;
-    void                           *validation_cb_arg;
+    ossl_qrx_late_validation_cb *validation_cb;
+    void *validation_cb_arg;
 
     /* Key update callback. */
-    ossl_qrx_key_update_cb         *key_update_cb;
-    void                           *key_update_cb_arg;
+    ossl_qrx_key_update_cb *key_update_cb;
+    void *key_update_cb_arg;
 
     /* Initial key phase. For debugging use only; always 0 in real use. */
-    unsigned char                   init_key_phase_bit;
+    unsigned char init_key_phase_bit;
 
     /* Are we allowed to process 1-RTT packets yet? */
-    unsigned char                   allow_1rtt;
+    unsigned char allow_1rtt;
 
     /* Message callback related arguments */
     ossl_msg_cb msg_callback;
@@ -175,18 +175,18 @@ struct ossl_qrx_st {
 
 static RXE *qrx_ensure_free_rxe(OSSL_QRX *qrx, size_t alloc_len);
 static int qrx_validate_hdr_early(OSSL_QRX *qrx, RXE *rxe,
-                                  const QUIC_CONN_ID *first_dcid);
+    const QUIC_CONN_ID *first_dcid);
 static int qrx_relocate_buffer(OSSL_QRX *qrx, RXE **prxe, size_t *pi,
-                               const unsigned char **pptr, size_t buf_len);
+    const unsigned char **pptr, size_t buf_len);
 static int qrx_validate_hdr(OSSL_QRX *qrx, RXE *rxe);
 static RXE *qrx_reserve_rxe(RXE_LIST *rxl, RXE *rxe, size_t n);
 static int qrx_decrypt_pkt_body(OSSL_QRX *qrx, unsigned char *dst,
-                                const unsigned char *src,
-                                size_t src_len, size_t *dec_len,
-                                const unsigned char *aad, size_t aad_len,
-                                QUIC_PN pn, uint32_t enc_level,
-                                unsigned char key_phase_bit,
-                                uint64_t *rx_key_epoch);
+    const unsigned char *src,
+    size_t src_len, size_t *dec_len,
+    const unsigned char *aad, size_t aad_len,
+    QUIC_PN pn, uint32_t enc_level,
+    unsigned char key_phase_bit,
+    uint64_t *rx_key_epoch);
 static int qrx_validate_hdr_late(OSSL_QRX *qrx, RXE *rxe);
 static uint32_t rxe_determine_pn_space(RXE *rxe);
 static void ignore_res(int x);
@@ -206,12 +206,12 @@ OSSL_QRX *ossl_qrx_new(const OSSL_QRX_ARGS *args)
     for (i = 0; i < OSSL_NELEM(qrx->largest_pn); ++i)
         qrx->largest_pn[i] = args->init_largest_pn[i];
 
-    qrx->libctx                 = args->libctx;
-    qrx->propq                  = args->propq;
-    qrx->demux                  = args->demux;
-    qrx->short_conn_id_len      = args->short_conn_id_len;
-    qrx->init_key_phase_bit     = args->init_key_phase_bit;
-    qrx->max_deferred           = args->max_deferred;
+    qrx->libctx = args->libctx;
+    qrx->propq = args->propq;
+    qrx->demux = args->demux;
+    qrx->short_conn_id_len = args->short_conn_id_len;
+    qrx->init_key_phase_bit = args->init_key_phase_bit;
+    qrx->max_deferred = args->max_deferred;
     return qrx;
 }
 
@@ -237,6 +237,16 @@ static void qrx_cleanup_urxl(OSSL_QRX *qrx, QUIC_URXE_LIST *l)
     }
 }
 
+void ossl_qrx_update_pn_space(OSSL_QRX *src, OSSL_QRX *dst)
+{
+    size_t i;
+
+    for (i = 0; i < QUIC_PN_SPACE_NUM; i++)
+        dst->largest_pn[i] = src->largest_pn[i];
+
+    return;
+}
+
 void ossl_qrx_free(OSSL_QRX *qrx)
 {
     uint32_t i;
@@ -260,15 +270,15 @@ void ossl_qrx_free(OSSL_QRX *qrx)
 void ossl_qrx_inject_urxe(OSSL_QRX *qrx, QUIC_URXE *urxe)
 {
     /* Initialize our own fields inside the URXE and add to the pending list. */
-    urxe->processed     = 0;
-    urxe->hpr_removed   = 0;
-    urxe->deferred      = 0;
+    urxe->processed = 0;
+    urxe->hpr_removed = 0;
+    urxe->deferred = 0;
     ossl_list_urxe_insert_tail(&qrx->urx_pending, urxe);
 
     if (qrx->msg_callback != NULL)
         qrx->msg_callback(0, OSSL_QUIC1_VERSION, SSL3_RT_QUIC_DATAGRAM, urxe + 1,
-                          urxe->data_len, qrx->msg_callback_ssl,
-                          qrx->msg_callback_arg);
+            urxe->data_len, qrx->msg_callback_ssl,
+            qrx->msg_callback_arg);
 }
 
 void ossl_qrx_inject_pkt(OSSL_QRX *qrx, OSSL_QRX_PKT *pkt)
@@ -293,8 +303,8 @@ void ossl_qrx_inject_pkt(OSSL_QRX *qrx, OSSL_QRX_PKT *pkt)
  * packet instead of creating a new channel for it.
  */
 static int qrx_validate_initial_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
-                                    const QUIC_CONN_ID *first_dcid,
-                                    size_t datagram_len)
+    const QUIC_CONN_ID *first_dcid,
+    size_t datagram_len)
 {
     PACKET pkt, orig_pkt;
     RXE *rxe;
@@ -325,11 +335,11 @@ static int qrx_validate_initial_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
      * short_conn_id_len as 0.
      */
     if (!ossl_quic_wire_decode_pkt_hdr(&pkt,
-                                       0, /* short_conn_id_len */
-                                       1, /* need second decode */
-                                       0, /* nodata -> want to read data */
-                                       &rxe->hdr, &ptrs,
-                                       NULL))
+            0, /* short_conn_id_len */
+            1, /* need second decode */
+            0, /* nodata -> want to read data */
+            &rxe->hdr, &ptrs,
+            NULL))
         goto malformed;
 
     if (rxe->hdr.type != QUIC_PKT_TYPE_INITIAL)
@@ -371,7 +381,8 @@ static int qrx_validate_initial_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
 
     /* Decode the now unprotected header. */
     if (ossl_quic_wire_decode_pkt_hdr(&pkt, 0,
-                                      0, 0, &rxe->hdr, NULL, NULL) != 1)
+            0, 0, &rxe->hdr, NULL, NULL)
+        != 1)
         goto malformed;
 
     /* Validate header and decode PN. */
@@ -404,8 +415,8 @@ static int qrx_validate_initial_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
      */
     dst = (unsigned char *)rxe_data(rxe) + i;
     if (!qrx_decrypt_pkt_body(qrx, dst, rxe->hdr.data, rxe->hdr.len,
-                              &dec_len, sop, aad_len, rxe->pn, QUIC_ENC_LEVEL_INITIAL,
-                              rxe->hdr.key_phase, &rx_key_epoch))
+            &dec_len, sop, aad_len, rxe->pn, QUIC_ENC_LEVEL_INITIAL,
+            rxe->hdr.key_phase, &rx_key_epoch))
         goto malformed;
 
     /*
@@ -428,11 +439,11 @@ static int qrx_validate_initial_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
      * Update header to point to the decrypted buffer, which may be shorter
      * due to AEAD tags, block padding, etc.
      */
-    rxe->hdr.data       = dst;
-    rxe->hdr.len        = dec_len;
-    rxe->data_len       = dec_len;
-    rxe->datagram_len   = datagram_len;
-    rxe->key_epoch      = rx_key_epoch;
+    rxe->hdr.data = dst;
+    rxe->hdr.len = dec_len;
+    rxe->data_len = dec_len;
+    rxe->datagram_len = datagram_len;
+    rxe->key_epoch = rx_key_epoch;
 
     /* We processed the PN successfully, so update largest processed PN. */
     pn_space = rxe_determine_pn_space(rxe);
@@ -440,10 +451,10 @@ static int qrx_validate_initial_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
         qrx->largest_pn[pn_space] = rxe->pn;
 
     /* Copy across network addresses and RX time from URXE to RXE. */
-    rxe->peer           = urxe->peer;
-    rxe->local          = urxe->local;
-    rxe->time           = urxe->time;
-    rxe->datagram_id    = urxe->datagram_id;
+    rxe->peer = urxe->peer;
+    rxe->local = urxe->local;
+    rxe->time = urxe->time;
+    rxe->datagram_id = urxe->datagram_id;
 
     /*
      * The packet is decrypted, we are going to move it from
@@ -461,11 +472,11 @@ static int qrx_validate_initial_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
 }
 
 int ossl_qrx_validate_initial_packet(OSSL_QRX *qrx, QUIC_URXE *urxe,
-                                     const QUIC_CONN_ID *dcid)
+    const QUIC_CONN_ID *dcid)
 {
-    urxe->processed     = 0;
-    urxe->hpr_removed   = 0;
-    urxe->deferred      = 0;
+    urxe->processed = 0;
+    urxe->hpr_removed = 0;
+    urxe->deferred = 0;
 
     return qrx_validate_initial_pkt(qrx, urxe, dcid, urxe->data_len);
 }
@@ -481,22 +492,22 @@ static void qrx_requeue_deferred(OSSL_QRX *qrx)
 }
 
 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)
+    uint32_t suite_id, EVP_MD *md,
+    const unsigned char *secret, size_t secret_len)
 {
     if (enc_level >= QUIC_ENC_LEVEL_NUM)
         return 0;
 
     if (!ossl_qrl_enc_level_set_provide_secret(&qrx->el_set,
-                                               qrx->libctx,
-                                               qrx->propq,
-                                               enc_level,
-                                               suite_id,
-                                               md,
-                                               secret,
-                                               secret_len,
-                                               qrx->init_key_phase_bit,
-                                               /*is_tx=*/0))
+            qrx->libctx,
+            qrx->propq,
+            enc_level,
+            suite_id,
+            md,
+            secret,
+            secret_len,
+            qrx->init_key_phase_bit,
+            /*is_tx=*/0))
         return 0;
 
     /*
@@ -527,7 +538,7 @@ int ossl_qrx_processed_read_pending(OSSL_QRX *qrx)
 int ossl_qrx_unprocessed_read_pending(OSSL_QRX *qrx)
 {
     return !ossl_list_urxe_is_empty(&qrx->urx_pending)
-           || !ossl_list_urxe_is_empty(&qrx->urx_deferred);
+        || !ossl_list_urxe_is_empty(&qrx->urx_deferred);
 }
 
 /* Pop the next pending RXE. Returns NULL if no RXE is pending. */
@@ -556,8 +567,8 @@ static RXE *qrx_alloc_rxe(size_t alloc_len)
 
     ossl_list_rxe_init_elem(rxe);
     rxe->alloc_len = alloc_len;
-    rxe->data_len  = 0;
-    rxe->refcount  = 0;
+    rxe->data_len = 0;
+    rxe->refcount = 0;
     return rxe;
 }
 
@@ -635,7 +646,7 @@ static RXE *qrx_resize_rxe(RXE_LIST *rxl, RXE *rxe, size_t n)
  * Returns NULL on failure.
  */
 static RXE *qrx_reserve_rxe(RXE_LIST *rxl,
-                            RXE *rxe, size_t n)
+    RXE *rxe, size_t n)
 {
     if (rxe->alloc_len >= n)
         return rxe;
@@ -648,9 +659,9 @@ static void qrx_recycle_rxe(OSSL_QRX *qrx, RXE *rxe)
 {
     /* RXE should not be in any list */
     assert(ossl_list_rxe_prev(rxe) == NULL && ossl_list_rxe_next(rxe) == NULL);
-    rxe->pkt.hdr    = NULL;
-    rxe->pkt.peer   = NULL;
-    rxe->pkt.local  = NULL;
+    rxe->pkt.hdr = NULL;
+    rxe->pkt.peer = NULL;
+    rxe->pkt.local = NULL;
     ossl_list_rxe_insert_tail(&qrx->rx_free, rxe);
 }
 
@@ -662,7 +673,7 @@ static void qrx_recycle_rxe(OSSL_QRX *qrx, RXE *rxe)
  * copied buffer. *pptr is updated to point to the new location of the buffer.
  */
 static int qrx_relocate_buffer(OSSL_QRX *qrx, RXE **prxe, size_t *pi,
-                               const unsigned char **pptr, size_t buf_len)
+    const unsigned char **pptr, size_t buf_len)
 {
     RXE *rxe;
     unsigned char *dst;
@@ -685,20 +696,20 @@ static int qrx_relocate_buffer(OSSL_QRX *qrx, RXE **prxe, size_t *pi,
 static uint32_t qrx_determine_enc_level(const QUIC_PKT_HDR *hdr)
 {
     switch (hdr->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:
-            assert(0);
-        case QUIC_PKT_TYPE_RETRY:
-        case QUIC_PKT_TYPE_VERSION_NEG:
-            return QUIC_ENC_LEVEL_INITIAL; /* not used */
+    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:
+        assert(0);
+    case QUIC_PKT_TYPE_RETRY:
+    case QUIC_PKT_TYPE_VERSION_NEG:
+        return QUIC_ENC_LEVEL_INITIAL; /* not used */
     }
 }
 
@@ -711,7 +722,7 @@ static uint32_t rxe_determine_pn_space(RXE *rxe)
 }
 
 static int qrx_validate_hdr_early(OSSL_QRX *qrx, RXE *rxe,
-                                  const QUIC_CONN_ID *first_dcid)
+    const QUIC_CONN_ID *first_dcid)
 {
     /* Ensure version is what we want. */
     if (rxe->hdr.version != QUIC_VERSION_1
@@ -733,8 +744,8 @@ static int qrx_validate_hdr_early(OSSL_QRX *qrx, RXE *rxe,
     if (first_dcid != NULL) {
         if (!ossl_assert(first_dcid->id_len < QUIC_MAX_CONN_ID_LEN)
             || !ossl_quic_conn_id_eq(first_dcid,
-                                     &rxe->hdr.dst_conn_id))
-        return 0;
+                &rxe->hdr.dst_conn_id))
+            return 0;
     }
 
     return 1;
@@ -746,8 +757,8 @@ static int qrx_validate_hdr(OSSL_QRX *qrx, RXE *rxe)
     int pn_space = rxe_determine_pn_space(rxe);
 
     if (!ossl_quic_wire_decode_pkt_hdr_pn(rxe->hdr.pn, rxe->hdr.pn_len,
-                                          qrx->largest_pn[pn_space],
-                                          &rxe->pn))
+            qrx->largest_pn[pn_space],
+            &rxe->pn))
         return 0;
 
     return 1;
@@ -774,10 +785,10 @@ static int qrx_validate_hdr_late(OSSL_QRX *qrx, RXE *rxe)
  * epoch number actually used for packet decryption to *rx_key_epoch.
  */
 static size_t qrx_get_cipher_ctx_idx(OSSL_QRX *qrx, OSSL_QRL_ENC_LEVEL *el,
-                                     uint32_t enc_level,
-                                     unsigned char key_phase_bit,
-                                     uint64_t *rx_key_epoch,
-                                     int *is_old_key)
+    uint32_t enc_level,
+    unsigned char key_phase_bit,
+    uint64_t *rx_key_epoch,
+    int *is_old_key)
 {
     size_t idx;
 
@@ -874,18 +885,18 @@ static size_t qrx_get_cipher_ctx_idx(OSSL_QRX *qrx, OSSL_QRL_ENC_LEVEL *el,
  * less than) src_len.
  */
 static int qrx_decrypt_pkt_body(OSSL_QRX *qrx, unsigned char *dst,
-                                const unsigned char *src,
-                                size_t src_len, size_t *dec_len,
-                                const unsigned char *aad, size_t aad_len,
-                                QUIC_PN pn, uint32_t enc_level,
-                                unsigned char key_phase_bit,
-                                uint64_t *rx_key_epoch)
+    const unsigned char *src,
+    size_t src_len, size_t *dec_len,
+    const unsigned char *aad, size_t aad_len,
+    QUIC_PN pn, uint32_t enc_level,
+    unsigned char key_phase_bit,
+    uint64_t *rx_key_epoch)
 {
     int l = 0, l2 = 0, is_old_key, nonce_len;
     unsigned char nonce[EVP_MAX_IV_LENGTH];
     size_t i, cctx_idx;
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(&qrx->el_set,
-                                                        enc_level, 1);
+        enc_level, 1);
     EVP_CIPHER_CTX *cctx;
 
     if (src_len > INT_MAX || aad_len > INT_MAX)
@@ -906,7 +917,7 @@ static int qrx_decrypt_pkt_body(OSSL_QRX *qrx, unsigned char *dst,
         return 0;
 
     cctx_idx = qrx_get_cipher_ctx_idx(qrx, el, enc_level, key_phase_bit,
-                                      rx_key_epoch, &is_old_key);
+        rx_key_epoch, &is_old_key);
     if (!ossl_assert(cctx_idx < OSSL_NELEM(el->cctx)))
         return 0;
 
@@ -936,13 +947,15 @@ static int qrx_decrypt_pkt_body(OSSL_QRX *qrx, unsigned char *dst,
 
     /* type and key will already have been setup; feed the IV. */
     if (EVP_CipherInit_ex(cctx, NULL,
-                          NULL, NULL, nonce, /*enc=*/0) != 1)
+            NULL, NULL, nonce, /*enc=*/0)
+        != 1)
         return 0;
 
     /* Feed the AEAD tag we got so the cipher can validate it. */
     if (EVP_CIPHER_CTX_ctrl(cctx, EVP_CTRL_AEAD_SET_TAG,
-                            el->tag_len,
-                            (unsigned char *)src + src_len - el->tag_len) != 1)
+            el->tag_len,
+            (unsigned char *)src + src_len - el->tag_len)
+        != 1)
         return 0;
 
     /* Feed AAD data. */
@@ -996,9 +1009,9 @@ static void qrx_key_update_initiated(OSSL_QRX *qrx, QUIC_PN pn)
 
 /* Process a single packet in a datagram. */
 static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
-                           PACKET *pkt, size_t pkt_idx,
-                           QUIC_CONN_ID *first_dcid,
-                           size_t datagram_len)
+    PACKET *pkt, size_t pkt_idx,
+    QUIC_CONN_ID *first_dcid,
+    size_t datagram_len)
 {
     RXE *rxe;
     const unsigned char *eop = NULL;
@@ -1031,9 +1044,9 @@ static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
      */
     need_second_decode = !pkt_is_marked(&urxe->hpr_removed, pkt_idx);
     if (!ossl_quic_wire_decode_pkt_hdr(pkt,
-                                       qrx->short_conn_id_len,
-                                       need_second_decode, 0, &rxe->hdr, &ptrs,
-                                       NULL))
+            qrx->short_conn_id_len,
+            need_second_decode, 0, &rxe->hdr, &ptrs,
+            NULL))
         goto malformed;
 
     /*
@@ -1080,16 +1093,16 @@ static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
         memcpy(rxe_data(rxe), rxe->hdr.data, rxe->hdr.len);
         pkt_mark(&urxe->processed, pkt_idx);
 
-        rxe->hdr.data   = rxe_data(rxe);
-        rxe->pn         = QUIC_PN_INVALID;
+        rxe->hdr.data = rxe_data(rxe);
+        rxe->pn = QUIC_PN_INVALID;
 
-        rxe->data_len       = rxe->hdr.len;
-        rxe->datagram_len   = datagram_len;
-        rxe->key_epoch      = 0;
-        rxe->peer           = urxe->peer;
-        rxe->local          = urxe->local;
-        rxe->time           = urxe->time;
-        rxe->datagram_id    = urxe->datagram_id;
+        rxe->data_len = rxe->hdr.len;
+        rxe->datagram_len = datagram_len;
+        rxe->key_epoch = 0;
+        rxe->peer = urxe->peer;
+        rxe->local = urxe->local;
+        rxe->time = urxe->time;
+        rxe->datagram_id = urxe->datagram_id;
 
         /* Move RXE to pending. */
         ossl_list_rxe_remove(&qrx->rx_free, rxe);
@@ -1102,22 +1115,22 @@ static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
 
     /* If we do not have keying material for this encryption level yet, defer. */
     switch (ossl_qrl_enc_level_set_have_el(&qrx->el_set, enc_level)) {
-        case 1:
-            /* We have keys. */
-            if (enc_level == QUIC_ENC_LEVEL_1RTT && !qrx->allow_1rtt)
-                /*
-                 * But we cannot process 1-RTT packets until the handshake is
-                 * completed (RFC 9000 s. 5.7).
-                 */
-                goto cannot_decrypt;
-
-            break;
-        case 0:
-            /* No keys yet. */
+    case 1:
+        /* We have keys. */
+        if (enc_level == QUIC_ENC_LEVEL_1RTT && !qrx->allow_1rtt)
+            /*
+             * But we cannot process 1-RTT packets until the handshake is
+             * completed (RFC 9000 s. 5.7).
+             */
             goto cannot_decrypt;
-        default:
-            /* We already discarded keys for this EL, we will never process this.*/
-            goto malformed;
+
+        break;
+    case 0:
+        /* No keys yet. */
+        goto cannot_decrypt;
+    default:
+        /* We already discarded keys for this EL, we will never process this.*/
+        goto malformed;
     }
 
     /*
@@ -1169,7 +1182,8 @@ static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
 
         /* Decode the now unprotected header. */
         if (ossl_quic_wire_decode_pkt_hdr(pkt, qrx->short_conn_id_len,
-                                          0, 0, &rxe->hdr, NULL, NULL) != 1)
+                0, 0, &rxe->hdr, NULL, NULL)
+            != 1)
             goto malformed;
     }
 
@@ -1179,8 +1193,8 @@ static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
 
     if (qrx->msg_callback != NULL)
         qrx->msg_callback(0, OSSL_QUIC1_VERSION, SSL3_RT_QUIC_PACKET, sop,
-                          eop - sop - rxe->hdr.len, qrx->msg_callback_ssl,
-                          qrx->msg_callback_arg);
+            eop - sop - rxe->hdr.len, qrx->msg_callback_ssl,
+            qrx->msg_callback_arg);
 
     /*
      * The AAD data is the entire (unprotected) packet header including the PN.
@@ -1215,8 +1229,8 @@ static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
      */
     dst = (unsigned char *)rxe_data(rxe) + i;
     if (!qrx_decrypt_pkt_body(qrx, dst, rxe->hdr.data, rxe->hdr.len,
-                              &dec_len, sop, aad_len, rxe->pn, enc_level,
-                              rxe->hdr.key_phase, &rx_key_epoch))
+            &dec_len, sop, aad_len, rxe->pn, enc_level,
+            rxe->hdr.key_phase, &rx_key_epoch))
         goto malformed;
 
     /*
@@ -1259,11 +1273,11 @@ static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
      * Update header to point to the decrypted buffer, which may be shorter
      * due to AEAD tags, block padding, etc.
      */
-    rxe->hdr.data       = dst;
-    rxe->hdr.len        = dec_len;
-    rxe->data_len       = dec_len;
-    rxe->datagram_len   = datagram_len;
-    rxe->key_epoch      = rx_key_epoch;
+    rxe->hdr.data = dst;
+    rxe->hdr.len = dec_len;
+    rxe->data_len = dec_len;
+    rxe->datagram_len = datagram_len;
+    rxe->key_epoch = rx_key_epoch;
 
     /* We processed the PN successfully, so update largest processed PN. */
     pn_space = rxe_determine_pn_space(rxe);
@@ -1271,10 +1285,10 @@ static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
         qrx->largest_pn[pn_space] = rxe->pn;
 
     /* Copy across network addresses and RX time from URXE to RXE. */
-    rxe->peer           = urxe->peer;
-    rxe->local          = urxe->local;
-    rxe->time           = urxe->time;
-    rxe->datagram_id    = urxe->datagram_id;
+    rxe->peer = urxe->peer;
+    rxe->local = urxe->local;
+    rxe->time = urxe->time;
+    rxe->datagram_id = urxe->datagram_id;
 
     /* Move RXE to pending. */
     ossl_list_rxe_remove(&qrx->rx_free, rxe);
@@ -1328,8 +1342,8 @@ static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
 
 /* Process a datagram which was received. */
 static int qrx_process_datagram(OSSL_QRX *qrx, QUIC_URXE *e,
-                                const unsigned char *data,
-                                size_t data_len)
+    const unsigned char *data,
+    size_t data_len)
 {
     int have_deferred = 0;
     PACKET pkt;
@@ -1388,15 +1402,14 @@ static int qrx_process_one_urxe(OSSL_QRX *qrx, QUIC_URXE *e)
      * error.
      */
     was_deferred = qrx_process_datagram(qrx, e, ossl_quic_urxe_data(e),
-                                        e->data_len);
+        e->data_len);
 
     /*
      * Remove the URXE from the pending list and return it to
      * either the free or deferred list.
      */
     ossl_list_urxe_remove(&qrx->urx_pending, e);
-    if (was_deferred > 0 &&
-            (e->deferred || qrx->num_deferred < qrx->max_deferred)) {
+    if (was_deferred > 0 && (e->deferred || qrx->num_deferred < qrx->max_deferred)) {
         ossl_list_urxe_insert_tail(&qrx->urx_deferred, e);
         if (!e->deferred) {
             e->deferred = 1;
@@ -1444,17 +1457,17 @@ int ossl_qrx_read_pkt(OSSL_QRX *qrx, OSSL_QRX_PKT **ppkt)
     assert(rxe->refcount == 0);
     rxe->refcount = 1;
 
-    rxe->pkt.hdr            = &rxe->hdr;
-    rxe->pkt.pn             = rxe->pn;
-    rxe->pkt.time           = rxe->time;
-    rxe->pkt.datagram_len   = rxe->datagram_len;
+    rxe->pkt.hdr = &rxe->hdr;
+    rxe->pkt.pn = rxe->pn;
+    rxe->pkt.time = rxe->time;
+    rxe->pkt.datagram_len = rxe->datagram_len;
     rxe->pkt.peer
         = BIO_ADDR_family(&rxe->peer) != AF_UNSPEC ? &rxe->peer : NULL;
     rxe->pkt.local
         = BIO_ADDR_family(&rxe->local) != AF_UNSPEC ? &rxe->local : NULL;
-    rxe->pkt.key_epoch      = rxe->key_epoch;
-    rxe->pkt.datagram_id    = rxe->datagram_id;
-    rxe->pkt.qrx            = qrx;
+    rxe->pkt.key_epoch = rxe->key_epoch;
+    rxe->pkt.datagram_id = rxe->datagram_id;
+    rxe->pkt.qrx = qrx;
     *ppkt = &rxe->pkt;
 
     return 1;
@@ -1505,27 +1518,27 @@ uint64_t ossl_qrx_get_bytes_received(OSSL_QRX *qrx, int clear)
 }
 
 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)
 {
-    qrx->validation_cb       = cb;
-    qrx->validation_cb_arg   = cb_arg;
+    qrx->validation_cb = cb;
+    qrx->validation_cb_arg = cb_arg;
     return 1;
 }
 
 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)
 {
-    qrx->key_update_cb      = cb;
-    qrx->key_update_cb_arg  = cb_arg;
+    qrx->key_update_cb = cb;
+    qrx->key_update_cb_arg = cb_arg;
     return 1;
 }
 
 uint64_t ossl_qrx_get_key_epoch(OSSL_QRX *qrx)
 {
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(&qrx->el_set,
-                                                        QUIC_ENC_LEVEL_1RTT, 1);
+        QUIC_ENC_LEVEL_1RTT, 1);
 
     return el == NULL ? UINT64_MAX : el->key_epoch;
 }
@@ -1533,19 +1546,19 @@ uint64_t ossl_qrx_get_key_epoch(OSSL_QRX *qrx)
 int ossl_qrx_key_update_timeout(OSSL_QRX *qrx, int normal)
 {
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(&qrx->el_set,
-                                                        QUIC_ENC_LEVEL_1RTT, 1);
+        QUIC_ENC_LEVEL_1RTT, 1);
 
     if (el == NULL)
         return 0;
 
     if (el->state == QRL_EL_STATE_PROV_UPDATING
         && !ossl_qrl_enc_level_set_key_update_done(&qrx->el_set,
-                                                   QUIC_ENC_LEVEL_1RTT))
+            QUIC_ENC_LEVEL_1RTT))
         return 0;
 
     if (normal && el->state == QRL_EL_STATE_PROV_COOLDOWN
         && !ossl_qrl_enc_level_set_key_cooldown_done(&qrx->el_set,
-                                                     QUIC_ENC_LEVEL_1RTT))
+            QUIC_ENC_LEVEL_1RTT))
         return 0;
 
     return 1;
@@ -1557,13 +1570,13 @@ uint64_t ossl_qrx_get_cur_forged_pkt_count(OSSL_QRX *qrx)
 }
 
 uint64_t ossl_qrx_get_max_forged_pkt_count(OSSL_QRX *qrx,
-                                           uint32_t enc_level)
+    uint32_t enc_level)
 {
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(&qrx->el_set,
-                                                        enc_level, 1);
+        enc_level, 1);
 
     return el == NULL ? UINT64_MAX
-        : ossl_qrl_get_suite_max_forged_pkt(el->suite_id);
+                      : ossl_qrl_get_suite_max_forged_pkt(el->suite_id);
 }
 
 void ossl_qrx_allow_1rtt_processing(OSSL_QRX *qrx)
@@ -1576,7 +1589,7 @@ void ossl_qrx_allow_1rtt_processing(OSSL_QRX *qrx)
 }
 
 void ossl_qrx_set_msg_callback(OSSL_QRX *qrx, ossl_msg_cb msg_callback,
-                               SSL *msg_callback_ssl)
+    SSL *msg_callback_ssl)
 {
     qrx->msg_callback = msg_callback;
     qrx->msg_callback_ssl = msg_callback_ssl;
diff --git a/ssl/quic/quic_record_shared.c b/ssl/quic/quic_record_shared.c
index a3fd51db6dcfd..29accf602e595 100644
--- a/ssl/quic/quic_record_shared.c
+++ b/ssl/quic/quic_record_shared.c
@@ -18,8 +18,8 @@ static const unsigned char quic_v1_ku_label[] = {
 };
 
 OSSL_QRL_ENC_LEVEL *ossl_qrl_enc_level_set_get(OSSL_QRL_ENC_LEVEL_SET *els,
-                                               uint32_t enc_level,
-                                               int require_prov)
+    uint32_t enc_level,
+    int require_prov)
 {
     OSSL_QRL_ENC_LEVEL *el;
 
@@ -30,39 +30,39 @@ OSSL_QRL_ENC_LEVEL *ossl_qrl_enc_level_set_get(OSSL_QRL_ENC_LEVEL_SET *els,
 
     if (require_prov)
         switch (el->state) {
-            case QRL_EL_STATE_PROV_NORMAL:
-            case QRL_EL_STATE_PROV_UPDATING:
-            case QRL_EL_STATE_PROV_COOLDOWN:
-                break;
-            default:
-                return NULL;
+        case QRL_EL_STATE_PROV_NORMAL:
+        case QRL_EL_STATE_PROV_UPDATING:
+        case QRL_EL_STATE_PROV_COOLDOWN:
+            break;
+        default:
+            return NULL;
         }
 
     return el;
 }
 
 int ossl_qrl_enc_level_set_have_el(OSSL_QRL_ENC_LEVEL_SET *els,
-                                  uint32_t enc_level)
+    uint32_t enc_level)
 {
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(els, enc_level, 0);
 
     switch (el->state) {
-        case QRL_EL_STATE_UNPROV:
-            return 0;
-        case QRL_EL_STATE_PROV_NORMAL:
-        case QRL_EL_STATE_PROV_UPDATING:
-        case QRL_EL_STATE_PROV_COOLDOWN:
-            return 1;
-        default:
-        case QRL_EL_STATE_DISCARDED:
-            return -1;
+    case QRL_EL_STATE_UNPROV:
+        return 0;
+    case QRL_EL_STATE_PROV_NORMAL:
+    case QRL_EL_STATE_PROV_UPDATING:
+    case QRL_EL_STATE_PROV_COOLDOWN:
+        return 1;
+    default:
+    case QRL_EL_STATE_DISCARDED:
+        return -1;
     }
 }
 
 int ossl_qrl_enc_level_set_has_keyslot(OSSL_QRL_ENC_LEVEL_SET *els,
-                                       uint32_t enc_level,
-                                       unsigned char tgt_state,
-                                       size_t keyslot)
+    uint32_t enc_level,
+    unsigned char tgt_state,
+    size_t keyslot)
 {
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(els, enc_level, 0);
 
@@ -70,20 +70,20 @@ int ossl_qrl_enc_level_set_has_keyslot(OSSL_QRL_ENC_LEVEL_SET *els,
         return 0;
 
     switch (tgt_state) {
-        case QRL_EL_STATE_PROV_NORMAL:
-        case QRL_EL_STATE_PROV_UPDATING:
-            return enc_level == QUIC_ENC_LEVEL_1RTT || keyslot == 0;
-        case QRL_EL_STATE_PROV_COOLDOWN:
-            assert(enc_level == QUIC_ENC_LEVEL_1RTT);
-            return keyslot == (el->key_epoch & 1);
-        default:
-            return 0;
+    case QRL_EL_STATE_PROV_NORMAL:
+    case QRL_EL_STATE_PROV_UPDATING:
+        return enc_level == QUIC_ENC_LEVEL_1RTT || keyslot == 0;
+    case QRL_EL_STATE_PROV_COOLDOWN:
+        assert(enc_level == QUIC_ENC_LEVEL_1RTT);
+        return keyslot == (el->key_epoch & 1);
+    default:
+        return 0;
     }
 }
 
 static void el_teardown_keyslot(OSSL_QRL_ENC_LEVEL_SET *els,
-                                uint32_t enc_level,
-                                size_t keyslot)
+    uint32_t enc_level,
+    size_t keyslot)
 {
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(els, enc_level, 0);
 
@@ -99,11 +99,11 @@ static void el_teardown_keyslot(OSSL_QRL_ENC_LEVEL_SET *els,
 }
 
 static int el_setup_keyslot(OSSL_QRL_ENC_LEVEL_SET *els,
-                            uint32_t enc_level,
-                            unsigned char tgt_state,
-                            size_t keyslot,
-                            const unsigned char *secret,
-                            size_t secret_len)
+    uint32_t enc_level,
+    unsigned char tgt_state,
+    size_t keyslot,
+    const unsigned char *secret,
+    size_t secret_len)
 {
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(els, enc_level, 0);
     unsigned char key[EVP_MAX_KEY_LENGTH];
@@ -113,15 +113,15 @@ static int el_setup_keyslot(OSSL_QRL_ENC_LEVEL_SET *els,
     EVP_CIPHER_CTX *cctx = NULL;
 
     if (!ossl_assert(el != NULL
-                     && ossl_qrl_enc_level_set_has_keyslot(els, enc_level,
-                                                           tgt_state, keyslot))) {
+            && ossl_qrl_enc_level_set_has_keyslot(els, enc_level,
+                tgt_state, keyslot))) {
         ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT);
         return 0;
     }
 
     cipher_name = ossl_qrl_get_suite_cipher_name(el->suite_id);
-    iv_len      = ossl_qrl_get_suite_cipher_iv_len(el->suite_id);
-    key_len     = ossl_qrl_get_suite_cipher_key_len(el->suite_id);
+    iv_len = ossl_qrl_get_suite_cipher_iv_len(el->suite_id);
+    key_len = ossl_qrl_get_suite_cipher_key_len(el->suite_id);
     if (cipher_name == NULL) {
         ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
         return 0;
@@ -137,22 +137,22 @@ static int el_setup_keyslot(OSSL_QRL_ENC_LEVEL_SET *els,
 
     /* Derive "quic iv" key. */
     if (!tls13_hkdf_expand_ex(el->libctx, el->propq,
-                              el->md,
-                              secret,
-                              quic_v1_iv_label,
-                              sizeof(quic_v1_iv_label),
-                              NULL, 0,
-                              el->iv[keyslot], iv_len, 1))
+            el->md,
+            secret,
+            quic_v1_iv_label,
+            sizeof(quic_v1_iv_label),
+            NULL, 0,
+            el->iv[keyslot], iv_len, 1))
         goto err;
 
     /* Derive "quic key" key. */
     if (!tls13_hkdf_expand_ex(el->libctx, el->propq,
-                              el->md,
-                              secret,
-                              quic_v1_key_label,
-                              sizeof(quic_v1_key_label),
-                              NULL, 0,
-                              key, key_len, 1))
+            el->md,
+            secret,
+            quic_v1_key_label,
+            sizeof(quic_v1_key_label),
+            NULL, 0,
+            key, key_len, 1))
         goto err;
 
     /* Create and initialise cipher context. */
@@ -185,7 +185,7 @@ static int el_setup_keyslot(OSSL_QRL_ENC_LEVEL_SET *els,
     EVP_CIPHER_free(cipher);
     return 1;
 
- err:
+err:
     EVP_CIPHER_CTX_free(cctx);
     EVP_CIPHER_free(cipher);
     OPENSSL_cleanse(el->iv[keyslot], sizeof(el->iv[keyslot]));
@@ -194,15 +194,15 @@ static int el_setup_keyslot(OSSL_QRL_ENC_LEVEL_SET *els,
 }
 
 int ossl_qrl_enc_level_set_provide_secret(OSSL_QRL_ENC_LEVEL_SET *els,
-                                          OSSL_LIB_CTX *libctx,
-                                          const char *propq,
-                                          uint32_t enc_level,
-                                          uint32_t suite_id,
-                                          EVP_MD *md,
-                                          const unsigned char *secret,
-                                          size_t secret_len,
-                                          unsigned char init_key_phase_bit,
-                                          int is_tx)
+    OSSL_LIB_CTX *libctx,
+    const char *propq,
+    uint32_t enc_level,
+    uint32_t suite_id,
+    EVP_MD *md,
+    const unsigned char *secret,
+    size_t secret_len,
+    unsigned char init_key_phase_bit,
+    int is_tx)
 {
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(els, enc_level, 0);
     unsigned char ku_key[EVP_MAX_KEY_LENGTH], hpr_key[EVP_MAX_KEY_LENGTH];
@@ -252,28 +252,28 @@ int ossl_qrl_enc_level_set_provide_secret(OSSL_QRL_ENC_LEVEL_SET *els,
         own_md = 1;
     }
 
-    el->libctx      = libctx;
-    el->propq       = propq;
-    el->md          = md;
-    el->suite_id    = suite_id;
-    el->tag_len     = ossl_qrl_get_suite_cipher_tag_len(suite_id);
-    el->op_count    = 0;
-    el->key_epoch   = (uint64_t)init_key_phase_bit;
-    el->is_tx       = (unsigned char)is_tx;
+    el->libctx = libctx;
+    el->propq = propq;
+    el->md = md;
+    el->suite_id = suite_id;
+    el->tag_len = ossl_qrl_get_suite_cipher_tag_len(suite_id);
+    el->op_count = 0;
+    el->key_epoch = (uint64_t)init_key_phase_bit;
+    el->is_tx = (unsigned char)is_tx;
 
     /* Derive "quic hp" key. */
     if (!tls13_hkdf_expand_ex(libctx, propq,
-                              md,
-                              secret,
-                              quic_v1_hp_label,
-                              sizeof(quic_v1_hp_label),
-                              NULL, 0,
-                              hpr_key, hpr_key_len, 1))
+            md,
+            secret,
+            quic_v1_hp_label,
+            sizeof(quic_v1_hp_label),
+            NULL, 0,
+            hpr_key, hpr_key_len, 1))
         goto err;
 
     /* Setup KS0 (or KS1 if init_key_phase_bit), our initial keyslot. */
     if (!el_setup_keyslot(els, enc_level, QRL_EL_STATE_PROV_NORMAL,
-                          init_keyslot, secret, secret_len))
+            init_keyslot, secret, secret_len))
         goto err;
 
     have_ks0 = 1;
@@ -281,39 +281,39 @@ int ossl_qrl_enc_level_set_provide_secret(OSSL_QRL_ENC_LEVEL_SET *els,
     if (enc_level == QUIC_ENC_LEVEL_1RTT) {
         /* Derive "quic ku" key (the epoch 1 secret). */
         if (!tls13_hkdf_expand_ex(libctx, propq,
-                                  md,
-                                  secret,
-                                  quic_v1_ku_label,
-                                  sizeof(quic_v1_ku_label),
-                                  NULL, 0,
-                                  is_tx ? el->ku : ku_key, secret_len, 1))
+                md,
+                secret,
+                quic_v1_ku_label,
+                sizeof(quic_v1_ku_label),
+                NULL, 0,
+                is_tx ? el->ku : ku_key, secret_len, 1))
             goto err;
 
         if (!is_tx) {
             /* Setup KS1 (or KS0 if init_key_phase_bit), our next keyslot. */
             if (!el_setup_keyslot(els, enc_level, QRL_EL_STATE_PROV_NORMAL,
-                                  !init_keyslot, ku_key, secret_len))
+                    !init_keyslot, ku_key, secret_len))
                 goto err;
 
             have_ks1 = 1;
 
             /* Derive NEXT "quic ku" key (the epoch 2 secret). */
             if (!tls13_hkdf_expand_ex(libctx, propq,
-                                      md,
-                                      ku_key,
-                                      quic_v1_ku_label,
-                                      sizeof(quic_v1_ku_label),
-                                      NULL, 0,
-                                      el->ku, secret_len, 1))
+                    md,
+                    ku_key,
+                    quic_v1_ku_label,
+                    sizeof(quic_v1_ku_label),
+                    NULL, 0,
+                    el->ku, secret_len, 1))
                 goto err;
         }
     }
 
     /* Setup header protection context. */
     if (!ossl_quic_hdr_protector_init(&el->hpr,
-                                      libctx, propq,
-                                      ossl_qrl_get_suite_hdr_prot_cipher_id(suite_id),
-                                      hpr_key, hpr_key_len))
+            libctx, propq,
+            ossl_qrl_get_suite_hdr_prot_cipher_id(suite_id),
+            hpr_key, hpr_key_len))
         goto err;
 
     /*
@@ -327,7 +327,7 @@ int ossl_qrl_enc_level_set_provide_secret(OSSL_QRL_ENC_LEVEL_SET *els,
     el->state = QRL_EL_STATE_PROV_NORMAL;
     return 1;
 
- err:
+err:
     el->suite_id = 0;
     el->md = NULL;
     OPENSSL_cleanse(hpr_key, sizeof(hpr_key));
@@ -343,7 +343,7 @@ int ossl_qrl_enc_level_set_provide_secret(OSSL_QRL_ENC_LEVEL_SET *els,
 }
 
 int ossl_qrl_enc_level_set_key_update(OSSL_QRL_ENC_LEVEL_SET *els,
-                                      uint32_t enc_level)
+    uint32_t enc_level)
 {
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(els, enc_level, 0);
     size_t secret_len;
@@ -376,18 +376,18 @@ int ossl_qrl_enc_level_set_key_update(OSSL_QRL_ENC_LEVEL_SET *els,
 
     /* Derive NEXT "quic ku" key (the epoch n+1 secret). */
     if (!tls13_hkdf_expand_ex(el->libctx, el->propq,
-                              el->md, el->ku,
-                              quic_v1_ku_label,
-                              sizeof(quic_v1_ku_label),
-                              NULL, 0,
-                              new_ku, secret_len, 1))
+            el->md, el->ku,
+            quic_v1_ku_label,
+            sizeof(quic_v1_ku_label),
+            NULL, 0,
+            new_ku, secret_len, 1))
         return 0;
 
     el_teardown_keyslot(els, enc_level, 0);
 
     /* Setup keyslot for CURRENT "quic ku" key. */
     if (!el_setup_keyslot(els, enc_level, QRL_EL_STATE_PROV_NORMAL,
-                          0, el->ku, secret_len))
+            0, el->ku, secret_len))
         return 0;
 
     ++el->key_epoch;
@@ -399,7 +399,7 @@ int ossl_qrl_enc_level_set_key_update(OSSL_QRL_ENC_LEVEL_SET *els,
 
 /* Transitions from PROV_UPDATING to PROV_COOLDOWN. */
 int ossl_qrl_enc_level_set_key_update_done(OSSL_QRL_ENC_LEVEL_SET *els,
-                                           uint32_t enc_level)
+    uint32_t enc_level)
 {
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(els, enc_level, 0);
 
@@ -419,7 +419,7 @@ int ossl_qrl_enc_level_set_key_update_done(OSSL_QRL_ENC_LEVEL_SET *els,
  * auto-transitions to PROV_COOLDOWN first.)
  */
 int ossl_qrl_enc_level_set_key_cooldown_done(OSSL_QRL_ENC_LEVEL_SET *els,
-                                             uint32_t enc_level)
+    uint32_t enc_level)
 {
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(els, enc_level, 0);
     size_t secret_len;
@@ -444,17 +444,17 @@ int ossl_qrl_enc_level_set_key_cooldown_done(OSSL_QRL_ENC_LEVEL_SET *els,
     secret_len = ossl_qrl_get_suite_secret_len(el->suite_id);
 
     if (!el_setup_keyslot(els, enc_level, QRL_EL_STATE_PROV_NORMAL,
-                          ~el->key_epoch & 1, el->ku, secret_len))
+            ~el->key_epoch & 1, el->ku, secret_len))
         return 0;
 
     /* Derive NEXT "quic ku" key (the epoch n+1 secret). */
     if (!tls13_hkdf_expand_ex(el->libctx, el->propq,
-                              el->md,
-                              el->ku,
-                              quic_v1_ku_label,
-                              sizeof(quic_v1_ku_label),
-                              NULL, 0,
-                              new_ku, secret_len, 1)) {
+            el->md,
+            el->ku,
+            quic_v1_ku_label,
+            sizeof(quic_v1_ku_label),
+            NULL, 0,
+            new_ku, secret_len, 1)) {
         el_teardown_keyslot(els, enc_level, ~el->key_epoch & 1);
         return 0;
     }
@@ -469,7 +469,7 @@ int ossl_qrl_enc_level_set_key_cooldown_done(OSSL_QRL_ENC_LEVEL_SET *els,
  * state to DISCARDED.
  */
 void ossl_qrl_enc_level_set_discard(OSSL_QRL_ENC_LEVEL_SET *els,
-                                    uint32_t enc_level)
+    uint32_t enc_level)
 {
     OSSL_QRL_ENC_LEVEL *el = ossl_qrl_enc_level_set_get(els, enc_level, 0);
 
@@ -484,6 +484,6 @@ void ossl_qrl_enc_level_set_discard(OSSL_QRL_ENC_LEVEL_SET *els,
     }
 
     EVP_MD_free(el->md);
-    el->md      = NULL;
-    el->state   = QRL_EL_STATE_DISCARDED;
+    el->md = NULL;
+    el->state = QRL_EL_STATE_DISCARDED;
 }
diff --git a/ssl/quic/quic_record_shared.h b/ssl/quic/quic_record_shared.h
index e8c9e28e92a44..ba9571f450fec 100644
--- a/ssl/quic/quic_record_shared.h
+++ b/ssl/quic/quic_record_shared.h
@@ -8,11 +8,11 @@
  */
 
 #ifndef OSSL_QUIC_RECORD_SHARED_H
-# define OSSL_QUIC_RECORD_SHARED_H
+#define OSSL_QUIC_RECORD_SHARED_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_types.h"
-# include "internal/quic_wire_pkt.h"
+#include <openssl/ssl.h>
+#include "internal/quic_types.h"
+#include "internal/quic_wire_pkt.h"
 
 /*
  * QUIC Record Layer EL Management Utilities
@@ -29,27 +29,27 @@
  *
  * Key material is available if in the Provisioned state.
  */
-#define QRL_EL_STATE_UNPROV         0   /* Unprovisioned (initial state) */
-#define QRL_EL_STATE_PROV_NORMAL    1   /* Provisioned - Normal */
-#define QRL_EL_STATE_PROV_UPDATING  2   /* Provisioned - Updating */
-#define QRL_EL_STATE_PROV_COOLDOWN  3   /* Provisioned - Cooldown */
-#define QRL_EL_STATE_DISCARDED      4   /* Discarded (terminal state) */
+#define QRL_EL_STATE_UNPROV 0 /* Unprovisioned (initial state) */
+#define QRL_EL_STATE_PROV_NORMAL 1 /* Provisioned - Normal */
+#define QRL_EL_STATE_PROV_UPDATING 2 /* Provisioned - Updating */
+#define QRL_EL_STATE_PROV_COOLDOWN 3 /* Provisioned - Cooldown */
+#define QRL_EL_STATE_DISCARDED 4 /* Discarded (terminal state) */
 
 typedef struct ossl_qrl_enc_level_st {
     /*
      * Cryptographic context used to apply and remove header protection from
      * packet headers.
      */
-    QUIC_HDR_PROTECTOR          hpr;
+    QUIC_HDR_PROTECTOR hpr;
 
     /* Hash function used for key derivation. */
-    EVP_MD                     *md;
+    EVP_MD *md;
 
     /* Context used for packet body ciphering. One for each keyslot. */
-    EVP_CIPHER_CTX             *cctx[2];
+    EVP_CIPHER_CTX *cctx[2];
 
-    OSSL_LIB_CTX               *libctx;
-    const char                 *propq;
+    OSSL_LIB_CTX *libctx;
+    const char *propq;
 
     /*
      * Key epoch, essentially the number of times we have done a key update.
@@ -57,30 +57,30 @@ typedef struct ossl_qrl_enc_level_st {
      * The least significant bit of this is therefore by definition the current
      * Key Phase bit value.
      */
-    uint64_t                    key_epoch;
+    uint64_t key_epoch;
 
     /* Usage counter. The caller maintains this. Used by TX side only. */
-    uint64_t                    op_count;
+    uint64_t op_count;
 
     /* QRL_SUITE_* value. */
-    uint32_t                    suite_id;
+    uint32_t suite_id;
 
     /* Length of authentication tag. */
-    uint32_t                    tag_len;
+    uint32_t tag_len;
 
     /* Current EL state. */
-    unsigned char               state; /* QRL_EL_STATE_* */
+    unsigned char state; /* QRL_EL_STATE_* */
 
     /* 1 if for TX, else RX. Initialised when secret provided. */
-    unsigned char               is_tx;
+    unsigned char is_tx;
 
     /* IV used to construct nonces used for AEAD packet body ciphering. */
-    unsigned char               iv[2][EVP_MAX_IV_LENGTH];
+    unsigned char iv[2][EVP_MAX_IV_LENGTH];
 
     /*
      * Secret for next key epoch.
      */
-    unsigned char               ku[EVP_MAX_KEY_LENGTH];
+    unsigned char ku[EVP_MAX_KEY_LENGTH];
 } OSSL_QRL_ENC_LEVEL;
 
 typedef struct ossl_qrl_enc_level_set_st {
@@ -94,7 +94,7 @@ typedef struct ossl_qrl_enc_level_set_st {
  * DISCARDED state).
  */
 int ossl_qrl_enc_level_set_have_el(OSSL_QRL_ENC_LEVEL_SET *els,
-                                   uint32_t enc_level);
+    uint32_t enc_level);
 
 /*
  * Returns EL in a set. If enc_level is not a valid QUIC_ENC_LEVEL_* value,
@@ -102,49 +102,49 @@ int ossl_qrl_enc_level_set_have_el(OSSL_QRL_ENC_LEVEL_SET *els,
  * the PROVISIONED state; otherwise, the returned EL may be in any state.
  */
 OSSL_QRL_ENC_LEVEL *ossl_qrl_enc_level_set_get(OSSL_QRL_ENC_LEVEL_SET *els,
-                                               uint32_t enc_level,
-                                               int require_prov);
+    uint32_t enc_level,
+    int require_prov);
 
 /* Provide secret to an EL. md may be NULL. */
 int ossl_qrl_enc_level_set_provide_secret(OSSL_QRL_ENC_LEVEL_SET *els,
-                                          OSSL_LIB_CTX *libctx,
-                                          const char *propq,
-                                          uint32_t enc_level,
-                                          uint32_t suite_id,
-                                          EVP_MD *md,
-                                          const unsigned char *secret,
-                                          size_t secret_len,
-                                          unsigned char init_key_phase_bit,
-                                          int is_tx);
+    OSSL_LIB_CTX *libctx,
+    const char *propq,
+    uint32_t enc_level,
+    uint32_t suite_id,
+    EVP_MD *md,
+    const unsigned char *secret,
+    size_t secret_len,
+    unsigned char init_key_phase_bit,
+    int is_tx);
 
 /*
  * Returns 1 if the given keyslot index is currently valid for a given EL and EL
  * state.
  */
 int ossl_qrl_enc_level_set_has_keyslot(OSSL_QRL_ENC_LEVEL_SET *els,
-                                       uint32_t enc_level,
-                                       unsigned char tgt_state,
-                                       size_t keyslot);
+    uint32_t enc_level,
+    unsigned char tgt_state,
+    size_t keyslot);
 
 /* Perform a key update. Transitions from PROV_NORMAL to PROV_UPDATING. */
 int ossl_qrl_enc_level_set_key_update(OSSL_QRL_ENC_LEVEL_SET *els,
-                                      uint32_t enc_level);
+    uint32_t enc_level);
 
 /* Transitions from PROV_UPDATING to PROV_COOLDOWN. */
 int ossl_qrl_enc_level_set_key_update_done(OSSL_QRL_ENC_LEVEL_SET *els,
-                                           uint32_t enc_level);
+    uint32_t enc_level);
 
 /*
  * Transitions from PROV_COOLDOWN to PROV_NORMAL. (If in PROV_UPDATING,
  * auto-transitions to PROV_COOLDOWN first.)
  */
 int ossl_qrl_enc_level_set_key_cooldown_done(OSSL_QRL_ENC_LEVEL_SET *els,
-                                             uint32_t enc_level);
+    uint32_t enc_level);
 
 /*
  * Discard an EL. No secret can be provided for the EL ever again.
  */
 void ossl_qrl_enc_level_set_discard(OSSL_QRL_ENC_LEVEL_SET *els,
-                                    uint32_t enc_level);
+    uint32_t enc_level);
 
 #endif
diff --git a/ssl/quic/quic_record_tx.c b/ssl/quic/quic_record_tx.c
index ef93a14f94a83..28158ae038954 100644
--- a/ssl/quic/quic_record_tx.c
+++ b/ssl/quic/quic_record_tx.c
@@ -25,13 +25,13 @@ typedef struct txe_st TXE;
 
 struct txe_st {
     OSSL_LIST_MEMBER(txe, TXE);
-    size_t              data_len, alloc_len;
+    size_t data_len, alloc_len;
 
     /*
      * Destination and local addresses, as applicable. Both of these are only
      * used if the family is not AF_UNSPEC.
      */
-    BIO_ADDR            peer, local;
+    BIO_ADDR peer, local;
 
     /*
      * alloc_len allocated bytes (of which data_len bytes are valid) follow this
@@ -52,52 +52,52 @@ static ossl_inline unsigned char *txe_data(const TXE *e)
  * ===
  */
 struct ossl_qtx_st {
-    OSSL_LIB_CTX               *libctx;
-    const char                 *propq;
+    OSSL_LIB_CTX *libctx;
+    const char *propq;
 
     /* Per encryption-level state. */
-    OSSL_QRL_ENC_LEVEL_SET      el_set;
+    OSSL_QRL_ENC_LEVEL_SET el_set;
 
     /* TX BIO. */
-    BIO                        *bio;
+    BIO *bio;
 
     /* QLOG instance retrieval callback if in 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;
 
     /* TX maximum datagram payload length. */
-    size_t                      mdpl;
+    size_t mdpl;
 
     /*
      * List of TXEs which are not currently in use. These are moved to the
      * pending list (possibly via tx_cons first) as they are filled.
      */
-    TXE_LIST                    free;
+    TXE_LIST free;
 
     /*
      * List of TXEs which are filled with completed datagrams ready to be
      * transmitted.
      */
-    TXE_LIST                    pending;
-    size_t                      pending_count; /* items in list */
-    size_t                      pending_bytes; /* sum(txe->data_len) in pending */
+    TXE_LIST pending;
+    size_t pending_count; /* items in list */
+    size_t pending_bytes; /* sum(txe->data_len) in pending */
 
     /*
      * TXE which is under construction for coalescing purposes, if any.
      * This TXE is neither on the free nor pending list. Once the datagram
      * is completed, it is moved to the pending list.
      */
-    TXE                        *cons;
-    size_t                      cons_count; /* num packets */
+    TXE *cons;
+    size_t cons_count; /* num packets */
 
     /*
      * Number of packets transmitted in this key epoch. Used to enforce AEAD
      * confidentiality limit.
      */
-    uint64_t                    epoch_pkt_count;
+    uint64_t epoch_pkt_count;
 
     /* Datagram counter. Increases monotonically per datagram (not per packet). */
-    uint64_t                    datagram_count;
+    uint64_t datagram_count;
 
     ossl_mutate_packet_cb mutatecb;
     ossl_finish_mutate_cb finishmutatecb;
@@ -121,12 +121,12 @@ OSSL_QTX *ossl_qtx_new(const OSSL_QTX_ARGS *args)
     if (qtx == NULL)
         return 0;
 
-    qtx->libctx             = args->libctx;
-    qtx->propq              = args->propq;
-    qtx->bio                = args->bio;
-    qtx->mdpl               = args->mdpl;
-    qtx->get_qlog_cb        = args->get_qlog_cb;
-    qtx->get_qlog_cb_arg    = args->get_qlog_cb_arg;
+    qtx->libctx = args->libctx;
+    qtx->propq = args->propq;
+    qtx->bio = args->bio;
+    qtx->mdpl = args->mdpl;
+    qtx->get_qlog_cb = args->get_qlog_cb;
+    qtx->get_qlog_cb_arg = args->get_qlog_cb_arg;
 
     return qtx;
 }
@@ -163,40 +163,40 @@ 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)
 {
-    qtx->mutatecb       = mutatecb;
+    qtx->mutatecb = mutatecb;
     qtx->finishmutatecb = finishmutatecb;
-    qtx->mutatearg      = mutatearg;
+    qtx->mutatearg = mutatearg;
 }
 
 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)
 {
-    qtx->get_qlog_cb        = get_qlog_cb;
-    qtx->get_qlog_cb_arg    = get_qlog_cb_arg;
+    qtx->get_qlog_cb = get_qlog_cb;
+    qtx->get_qlog_cb_arg = get_qlog_cb_arg;
 }
 
-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)
 {
     if (enc_level >= QUIC_ENC_LEVEL_NUM)
         return 0;
 
     return ossl_qrl_enc_level_set_provide_secret(&qtx->el_set,
-                                                 qtx->libctx,
-                                                 qtx->propq,
-                                                 enc_level,
-                                                 suite_id,
-                                                 md,
-                                                 secret,
-                                                 secret_len,
-                                                 0,
-                                                 /*is_tx=*/1);
+        qtx->libctx,
+        qtx->propq,
+        enc_level,
+        suite_id,
+        md,
+        secret,
+        secret_len,
+        0,
+        /*is_tx=*/1);
 }
 
 int ossl_qtx_discard_enc_level(OSSL_QTX *qtx, uint32_t enc_level)
@@ -279,12 +279,12 @@ static TXE *qtx_resize_txe(OSSL_QTX *qtx, TXE_LIST *txl, TXE *txe, size_t n)
      * data.
      */
     txe2 = OPENSSL_realloc(txe, sizeof(TXE) + n);
-    if (txe2 == NULL || txe == txe2) {
+    if (txe2 == NULL) {
         if (p == NULL)
             ossl_list_txe_insert_head(txl, txe);
         else
             ossl_list_txe_insert_after(txl, p, txe);
-        return txe2;
+        return NULL;
     }
 
     if (p == NULL)
@@ -304,7 +304,7 @@ static TXE *qtx_resize_txe(OSSL_QTX *qtx, TXE_LIST *txl, TXE *txe, size_t n)
  * Returns NULL on failure.
  */
 static TXE *qtx_reserve_txe(OSSL_QTX *qtx, TXE_LIST *txl,
-                            TXE *txe, size_t n)
+    TXE *txe, size_t n)
 {
     if (txe->alloc_len >= n)
         return txe;
@@ -334,11 +334,11 @@ static void qtx_add_to_pending(OSSL_QTX *qtx, TXE *txe)
 
 struct iovec_cur {
     const OSSL_QTX_IOVEC *iovec;
-    size_t                num_iovec, idx, byte_off, bytes_remaining;
+    size_t num_iovec, idx, byte_off, bytes_remaining;
 };
 
 static size_t iovec_total_bytes(const OSSL_QTX_IOVEC *iovec,
-                                size_t num_iovec)
+    size_t num_iovec)
 {
     size_t i, l = 0;
 
@@ -349,14 +349,14 @@ static size_t iovec_total_bytes(const OSSL_QTX_IOVEC *iovec,
 }
 
 static void iovec_cur_init(struct iovec_cur *cur,
-                           const OSSL_QTX_IOVEC *iovec,
-                           size_t num_iovec)
+    const OSSL_QTX_IOVEC *iovec,
+    size_t num_iovec)
 {
-    cur->iovec              = iovec;
-    cur->num_iovec          = num_iovec;
-    cur->idx                = 0;
-    cur->byte_off           = 0;
-    cur->bytes_remaining    = iovec_total_bytes(iovec, num_iovec);
+    cur->iovec = iovec;
+    cur->num_iovec = num_iovec;
+    cur->idx = 0;
+    cur->byte_off = 0;
+    cur->bytes_remaining = iovec_total_bytes(iovec, num_iovec);
 }
 
 /*
@@ -366,8 +366,8 @@ static void iovec_cur_init(struct iovec_cur *cur,
  * available, returns 0.
  */
 static size_t iovec_cur_get_buffer(struct iovec_cur *cur,
-                                   const unsigned char **buf,
-                                   size_t max_buf_len)
+    const unsigned char **buf,
+    size_t max_buf_len)
 {
     size_t l;
 
@@ -402,8 +402,8 @@ static size_t iovec_cur_get_buffer(struct iovec_cur *cur,
 
 /* Determines the size of the AEAD output given the input size. */
 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)
 {
     OSSL_QRL_ENC_LEVEL *el
         = ossl_qrl_enc_level_set_get(&qtx->el_set, enc_level, 1);
@@ -426,8 +426,8 @@ int ossl_qtx_calculate_ciphertext_payload_len(OSSL_QTX *qtx, uint32_t enc_level,
 
 /* Determines the size of the AEAD input given the output size. */
 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)
 {
     OSSL_QRL_ENC_LEVEL *el
         = ossl_qrl_enc_level_set_get(&qtx->el_set, enc_level, 1);
@@ -450,16 +450,16 @@ int ossl_qtx_calculate_plaintext_payload_len(OSSL_QTX *qtx, uint32_t enc_level,
 }
 
 /* Any other error (including packet being too big for MDPL). */
-#define QTX_FAIL_GENERIC            (-1)
+#define QTX_FAIL_GENERIC (-1)
 
 /*
  * Returned where there is insufficient room in the datagram to write the
  * packet.
  */
-#define QTX_FAIL_INSUFFICIENT_LEN   (-2)
+#define QTX_FAIL_INSUFFICIENT_LEN (-2)
 
 static int qtx_write_hdr(OSSL_QTX *qtx, const QUIC_PKT_HDR *hdr, TXE *txe,
-                         QUIC_PKT_HDR_PTRS *ptrs)
+    QUIC_PKT_HDR_PTRS *ptrs)
 {
     WPACKET wpkt;
     size_t l = 0;
@@ -469,7 +469,7 @@ static int qtx_write_hdr(OSSL_QTX *qtx, const QUIC_PKT_HDR *hdr, TXE *txe,
         return 0;
 
     if (!ossl_quic_wire_encode_pkt_hdr(&wpkt, hdr->dst_conn_id.id_len,
-                                       hdr, ptrs)
+            hdr, ptrs)
         || !WPACKET_get_total_written(&wpkt, &l)) {
         WPACKET_finish(&wpkt);
         return 0;
@@ -478,7 +478,7 @@ static int qtx_write_hdr(OSSL_QTX *qtx, const QUIC_PKT_HDR *hdr, TXE *txe,
 
     if (qtx->msg_callback != NULL)
         qtx->msg_callback(1, OSSL_QUIC1_VERSION, SSL3_RT_QUIC_PACKET, data, l,
-                          qtx->msg_callback_ssl, qtx->msg_callback_arg);
+            qtx->msg_callback_ssl, qtx->msg_callback_arg);
 
     txe->data_len += l;
 
@@ -486,9 +486,9 @@ static int qtx_write_hdr(OSSL_QTX *qtx, const QUIC_PKT_HDR *hdr, TXE *txe,
 }
 
 static int qtx_encrypt_into_txe(OSSL_QTX *qtx, struct iovec_cur *cur, TXE *txe,
-                                uint32_t enc_level, QUIC_PN pn,
-                                const unsigned char *hdr, size_t hdr_len,
-                                QUIC_PKT_HDR_PTRS *ptrs)
+    uint32_t enc_level, QUIC_PN pn,
+    const unsigned char *hdr, size_t hdr_len,
+    QUIC_PKT_HDR_PTRS *ptrs)
 {
     int l = 0, l2 = 0, nonce_len;
     OSSL_QRL_ENC_LEVEL *el
@@ -556,7 +556,8 @@ static int qtx_encrypt_into_txe(OSSL_QTX *qtx, struct iovec_cur *cur, TXE *txe,
             break;
 
         if (EVP_CipherUpdate(cctx, txe_data(txe) + txe->data_len,
-                             &l, src, src_len) != 1) {
+                &l, src, src_len)
+            != 1) {
             ERR_raise(ERR_LIB_SSL, ERR_R_EVP_LIB);
             return 0;
         }
@@ -577,7 +578,8 @@ static int qtx_encrypt_into_txe(OSSL_QTX *qtx, struct iovec_cur *cur, TXE *txe,
     }
 
     if (EVP_CIPHER_CTX_ctrl(cctx, EVP_CTRL_AEAD_GET_TAG,
-                            el->tag_len, txe_data(txe) + txe->data_len) != 1) {
+            el->tag_len, txe_data(txe) + txe->data_len)
+        != 1) {
         ERR_raise(ERR_LIB_SSL, ERR_R_EVP_LIB);
         return 0;
     }
@@ -597,8 +599,8 @@ static int qtx_encrypt_into_txe(OSSL_QTX *qtx, struct iovec_cur *cur, TXE *txe,
  * process.
  */
 static int qtx_write(OSSL_QTX *qtx, const OSSL_QTX_PKT *pkt, TXE *txe,
-                     uint32_t enc_level, QUIC_PKT_HDR *hdr,
-                     const OSSL_QTX_IOVEC *iovec, size_t num_iovec)
+    uint32_t enc_level, QUIC_PKT_HDR *hdr,
+    const OSSL_QTX_IOVEC *iovec, size_t num_iovec)
 {
     int ret, needs_encrypt;
     size_t hdr_len, pred_hdr_len, payload_len, pkt_len, space_left;
@@ -647,16 +649,16 @@ static int qtx_write(OSSL_QTX *qtx, const OSSL_QTX_PKT *pkt, TXE *txe,
     /* Determine encrypted payload length. */
     if (needs_encrypt)
         ossl_qtx_calculate_ciphertext_payload_len(qtx, enc_level,
-                                                  cur.bytes_remaining,
-                                                  &payload_len);
+            cur.bytes_remaining,
+            &payload_len);
     else
         payload_len = cur.bytes_remaining;
 
     /* Determine header length. */
-    hdr->data  = NULL;
-    hdr->len   = payload_len;
+    hdr->data = NULL;
+    hdr->len = payload_len;
     pred_hdr_len = ossl_quic_wire_get_encoded_pkt_hdr_len(hdr->dst_conn_id.id_len,
-                                                          hdr);
+        hdr);
     if (pred_hdr_len == 0) {
         ret = QTX_FAIL_GENERIC;
         goto err;
@@ -672,8 +674,8 @@ static int qtx_write(OSSL_QTX *qtx, const OSSL_QTX_PKT *pkt, TXE *txe,
 
     if (ossl_quic_pkt_type_has_pn(hdr->type)) {
         if (!ossl_quic_wire_encode_pkt_hdr_pn(pkt->pn,
-                                              hdr->pn,
-                                              hdr->pn_len)) {
+                hdr->pn,
+                hdr->pn_len)) {
             ret = QTX_FAIL_GENERIC;
             goto err;
         }
@@ -706,7 +708,7 @@ static int qtx_write(OSSL_QTX *qtx, const OSSL_QTX_PKT *pkt, TXE *txe,
     } else {
         /* Encrypt into TXE. */
         if (!qtx_encrypt_into_txe(qtx, &cur, txe, enc_level, pkt->pn,
-                                  hdr_start, hdr_len, &ptrs)) {
+                hdr_start, hdr_len, &ptrs)) {
             ret = QTX_FAIL_GENERIC;
             goto err;
         }
@@ -752,7 +754,7 @@ static QLOG *qtx_get_qlog(OSSL_QTX *qtx)
 }
 
 static int qtx_mutate_write(OSSL_QTX *qtx, const OSSL_QTX_PKT *pkt, TXE *txe,
-                            uint32_t enc_level)
+    uint32_t enc_level)
 {
     int ret;
     QUIC_PKT_HDR *hdr;
@@ -762,20 +764,20 @@ static int qtx_mutate_write(OSSL_QTX *qtx, const OSSL_QTX_PKT *pkt, TXE *txe,
     /* If we are running tests then mutate_packet may be non NULL */
     if (qtx->mutatecb != NULL) {
         if (!qtx->mutatecb(pkt->hdr, pkt->iovec, pkt->num_iovec, &hdr,
-                           &iovec, &num_iovec, qtx->mutatearg))
+                &iovec, &num_iovec, qtx->mutatearg))
             return QTX_FAIL_GENERIC;
     } else {
-        hdr         = pkt->hdr;
-        iovec       = pkt->iovec;
-        num_iovec   = pkt->num_iovec;
+        hdr = pkt->hdr;
+        iovec = pkt->iovec;
+        num_iovec = pkt->num_iovec;
     }
 
     ret = qtx_write(qtx, pkt, txe, enc_level,
-                    hdr, iovec, num_iovec);
+        hdr, iovec, num_iovec);
     if (ret == 1)
         ossl_qlog_event_transport_packet_sent(qtx_get_qlog(qtx), hdr, pkt->pn,
-                                              iovec, num_iovec,
-                                              qtx->datagram_count);
+            iovec, num_iovec,
+            qtx->datagram_count);
 
     if (qtx->finishmutatecb != NULL)
         qtx->finishmutatecb(qtx->mutatearg);
@@ -786,7 +788,7 @@ static int qtx_mutate_write(OSSL_QTX *qtx, const OSSL_QTX_PKT *pkt, TXE *txe,
 static int addr_eq(const BIO_ADDR *a, const BIO_ADDR *b)
 {
     return ((a == NULL || BIO_ADDR_family(a) == AF_UNSPEC)
-            && (b == NULL || BIO_ADDR_family(b) == AF_UNSPEC))
+               && (b == NULL || BIO_ADDR_family(b) == AF_UNSPEC))
         || (a != NULL && b != NULL && memcmp(a, b, sizeof(*a)) == 0);
 }
 
@@ -808,7 +810,7 @@ int ossl_qtx_write_pkt(OSSL_QTX *qtx, const OSSL_QTX_PKT *pkt)
     if (!ossl_quic_pkt_type_can_share_dgram(pkt->hdr->type))
         ossl_qtx_finish_dgram(qtx);
     else if (enc_level >= QUIC_ENC_LEVEL_NUM
-               || ossl_qrl_enc_level_set_have_el(&qtx->el_set, enc_level) != 1) {
+        || ossl_qrl_enc_level_set_have_el(&qtx->el_set, enc_level) != 1) {
         /* All other packet types are encrypted. */
         return 0;
     }
@@ -915,23 +917,23 @@ void ossl_qtx_finish_dgram(OSSL_QTX *qtx)
     else
         qtx_add_to_pending(qtx, txe);
 
-    qtx->cons       = NULL;
+    qtx->cons = NULL;
     qtx->cons_count = 0;
     ++qtx->datagram_count;
 }
 
 static void txe_to_msg(TXE *txe, BIO_MSG *msg)
 {
-    msg->data       = txe_data(txe);
-    msg->data_len   = txe->data_len;
-    msg->flags      = 0;
+    msg->data = txe_data(txe);
+    msg->data_len = txe->data_len;
+    msg->flags = 0;
     msg->peer
         = BIO_ADDR_family(&txe->peer) != AF_UNSPEC ? &txe->peer : NULL;
     msg->local
         = BIO_ADDR_family(&txe->local) != AF_UNSPEC ? &txe->local : NULL;
 }
 
-#define MAX_MSGS_PER_SEND   32
+#define MAX_MSGS_PER_SEND 32
 
 int ossl_qtx_flush_net(OSSL_QTX *qtx)
 {
@@ -948,8 +950,8 @@ int ossl_qtx_flush_net(OSSL_QTX *qtx)
 
     for (;;) {
         for (txe = ossl_list_txe_head(&qtx->pending), i = 0;
-             txe != NULL && i < OSSL_NELEM(msg);
-             txe = ossl_list_txe_next(txe), ++i)
+            txe != NULL && i < OSSL_NELEM(msg);
+            txe = ossl_list_txe_next(txe), ++i)
             txe_to_msg(txe, &msg[i]);
 
         if (!i)
@@ -988,9 +990,9 @@ int ossl_qtx_flush_net(OSSL_QTX *qtx)
         for (i = 0; i < wr; ++i) {
             if (qtx->msg_callback != NULL)
                 qtx->msg_callback(1, OSSL_QUIC1_VERSION, SSL3_RT_QUIC_DATAGRAM,
-                                msg[i].data, msg[i].data_len,
-                                qtx->msg_callback_ssl,
-                                qtx->msg_callback_arg);
+                    msg[i].data, msg[i].data_len,
+                    qtx->msg_callback_ssl,
+                    qtx->msg_callback_arg);
             qtx_pending_to_free(qtx);
         }
 
@@ -1056,7 +1058,7 @@ size_t ossl_qtx_get_unflushed_pkt_count(OSSL_QTX *qtx)
 int ossl_qtx_trigger_key_update(OSSL_QTX *qtx)
 {
     return ossl_qrl_enc_level_set_key_update(&qtx->el_set,
-                                             QUIC_ENC_LEVEL_1RTT);
+        QUIC_ENC_LEVEL_1RTT);
 }
 
 uint64_t ossl_qtx_get_cur_epoch_pkt_count(OSSL_QTX *qtx, uint32_t enc_level)
@@ -1082,7 +1084,7 @@ uint64_t ossl_qtx_get_max_epoch_pkt_count(OSSL_QTX *qtx, uint32_t enc_level)
 }
 
 void ossl_qtx_set_msg_callback(OSSL_QTX *qtx, ossl_msg_cb msg_callback,
-                               SSL *msg_callback_ssl)
+    SSL *msg_callback_ssl)
 {
     qtx->msg_callback = msg_callback;
     qtx->msg_callback_ssl = msg_callback_ssl;
diff --git a/ssl/quic/quic_record_util.c b/ssl/quic/quic_record_util.c
index d7c3cece888d3..61b67a21503f3 100644
--- a/ssl/quic/quic_record_util.c
+++ b/ssl/quic/quic_record_util.c
@@ -20,11 +20,11 @@
  * =============================
  */
 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)
 {
     int ret = 0;
     EVP_KDF *kdf = NULL;
@@ -44,17 +44,17 @@ int ossl_quic_hkdf_extract(OSSL_LIB_CTX *libctx,
      * at least 8 bytes. It means that the length of destination connection ID
      * may be less than the minimum length for HKDF required by FIPS provider.
      *
-     * Therefore, we need to set `key-check` to zero to allow using destionation
+     * Therefore, we need to set `key-check` to zero to allow using destination
      * connection ID as IKM.
      */
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_FIPS_KEY_CHECK, &key_check);
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_MODE, &mode);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)md_name, 0);
+        (char *)md_name, 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                             (unsigned char *)salt, salt_len);
+        (unsigned char *)salt, salt_len);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
-                                             (unsigned char *)ikm, ikm_len);
+        (unsigned char *)ikm, ikm_len);
     *p++ = OSSL_PARAM_construct_end();
 
     ret = EVP_KDF_derive(kctx, out, out_len, params);
@@ -80,11 +80,11 @@ static const unsigned char quic_v1_initial_salt[] = {
 };
 
 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)
 {
     unsigned char initial_secret[32];
     unsigned char client_initial_secret[32], server_initial_secret[32];
@@ -108,48 +108,48 @@ int ossl_quic_provide_initial_secret(OSSL_LIB_CTX *libctx,
 
     /* Derive initial secret from destination connection ID. */
     if (!ossl_quic_hkdf_extract(libctx, propq,
-                                sha256,
-                                quic_v1_initial_salt,
-                                sizeof(quic_v1_initial_salt),
-                                dst_conn_id->id,
-                                dst_conn_id->id_len,
-                                initial_secret,
-                                sizeof(initial_secret)))
+            sha256,
+            quic_v1_initial_salt,
+            sizeof(quic_v1_initial_salt),
+            dst_conn_id->id,
+            dst_conn_id->id_len,
+            initial_secret,
+            sizeof(initial_secret)))
         goto err;
 
     /* Derive "client in" secret. */
     if (((qtx != NULL && tx_secret == client_initial_secret)
-         || (qrx != NULL && rx_secret == client_initial_secret))
+            || (qrx != NULL && rx_secret == client_initial_secret))
         && !tls13_hkdf_expand_ex(libctx, propq,
-                                 sha256,
-                                 initial_secret,
-                                 quic_client_in_label,
-                                 sizeof(quic_client_in_label),
-                                 NULL, 0,
-                                 client_initial_secret,
-                                 sizeof(client_initial_secret), 1))
+            sha256,
+            initial_secret,
+            quic_client_in_label,
+            sizeof(quic_client_in_label),
+            NULL, 0,
+            client_initial_secret,
+            sizeof(client_initial_secret), 1))
         goto err;
 
     /* Derive "server in" secret. */
     if (((qtx != NULL && tx_secret == server_initial_secret)
-         || (qrx != NULL && rx_secret == server_initial_secret))
+            || (qrx != NULL && rx_secret == server_initial_secret))
         && !tls13_hkdf_expand_ex(libctx, propq,
-                                 sha256,
-                                 initial_secret,
-                                 quic_server_in_label,
-                                 sizeof(quic_server_in_label),
-                                 NULL, 0,
-                                 server_initial_secret,
-                                 sizeof(server_initial_secret), 1))
+            sha256,
+            initial_secret,
+            quic_server_in_label,
+            sizeof(quic_server_in_label),
+            NULL, 0,
+            server_initial_secret,
+            sizeof(server_initial_secret), 1))
         goto err;
 
     /* Setup RX EL. Initial encryption always uses AES-128-GCM. */
     if (qrx != NULL
         && !ossl_qrx_provide_secret(qrx, QUIC_ENC_LEVEL_INITIAL,
-                                    QRL_SUITE_AES128GCM,
-                                    sha256,
-                                    rx_secret,
-                                    sizeof(server_initial_secret)))
+            QRL_SUITE_AES128GCM,
+            sha256,
+            rx_secret,
+            sizeof(server_initial_secret)))
         goto err;
 
     /*
@@ -165,10 +165,10 @@ int ossl_quic_provide_initial_secret(OSSL_LIB_CTX *libctx,
     /* Setup TX cipher. */
     if (qtx != NULL
         && !ossl_qtx_provide_secret(qtx, QUIC_ENC_LEVEL_INITIAL,
-                                    QRL_SUITE_AES128GCM,
-                                    sha256,
-                                    tx_secret,
-                                    sizeof(server_initial_secret)))
+            QRL_SUITE_AES128GCM,
+            sha256,
+            tx_secret,
+            sizeof(server_initial_secret)))
         goto err;
 
     return 1;
@@ -191,38 +191,56 @@ struct suite_info {
 };
 
 static const struct suite_info suite_aes128gcm = {
-    "AES-128-GCM", "SHA256", 32, 16, 12, 16, 16,
+    "AES-128-GCM",
+    "SHA256",
+    32,
+    16,
+    12,
+    16,
+    16,
     QUIC_HDR_PROT_CIPHER_AES_128,
     ((uint64_t)1) << 23, /* Limits as prescribed by RFC 9001 */
     ((uint64_t)1) << 52,
 };
 
 static const struct suite_info suite_aes256gcm = {
-    "AES-256-GCM", "SHA384", 48, 32, 12, 16, 32,
+    "AES-256-GCM",
+    "SHA384",
+    48,
+    32,
+    12,
+    16,
+    32,
     QUIC_HDR_PROT_CIPHER_AES_256,
     ((uint64_t)1) << 23, /* Limits as prescribed by RFC 9001 */
     ((uint64_t)1) << 52,
 };
 
 static const struct suite_info suite_chacha20poly1305 = {
-    "ChaCha20-Poly1305", "SHA256", 32, 32, 12, 16, 32,
+    "ChaCha20-Poly1305",
+    "SHA256",
+    32,
+    32,
+    12,
+    16,
+    32,
     QUIC_HDR_PROT_CIPHER_CHACHA,
     /* Do not use UINT64_MAX here as this represents an invalid value */
-    UINT64_MAX - 1,         /* No applicable limit for this suite (RFC 9001) */
-    ((uint64_t)1) << 36,    /* Limit as prescribed by RFC 9001 */
+    UINT64_MAX - 1, /* No applicable limit for this suite (RFC 9001) */
+    ((uint64_t)1) << 36, /* Limit as prescribed by RFC 9001 */
 };
 
 static const struct suite_info *get_suite(uint32_t suite_id)
 {
     switch (suite_id) {
-        case QRL_SUITE_AES128GCM:
-            return &suite_aes128gcm;
-        case QRL_SUITE_AES256GCM:
-            return &suite_aes256gcm;
-        case QRL_SUITE_CHACHA20POLY1305:
-            return &suite_chacha20poly1305;
-        default:
-            return NULL;
+    case QRL_SUITE_AES128GCM:
+        return &suite_aes128gcm;
+    case QRL_SUITE_AES256GCM:
+        return &suite_aes256gcm;
+    case QRL_SUITE_CHACHA20POLY1305:
+        return &suite_chacha20poly1305;
+    default:
+        return NULL;
     }
 }
 
diff --git a/ssl/quic/quic_rstream.c b/ssl/quic/quic_rstream.c
index dd3dbf756b447..2fe1cb2cdbe48 100644
--- a/ssl/quic/quic_rstream.c
+++ b/ssl/quic/quic_rstream.c
@@ -1,11 +1,11 @@
 /*
-* 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
+ */
 #include <openssl/err.h>
 #include "internal/common.h"
 #include "internal/time.h"
@@ -22,7 +22,7 @@ struct quic_rstream_st {
 };
 
 QUIC_RSTREAM *ossl_quic_rstream_new(QUIC_RXFC *rxfc,
-                                    OSSL_STATM *statm, size_t rbuf_size)
+    OSSL_STATM *statm, size_t rbuf_size)
 {
     QUIC_RSTREAM *ret = OPENSSL_zalloc(sizeof(*ret));
 
@@ -55,9 +55,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)
 {
     UINT_RANGE range;
 
@@ -74,7 +74,7 @@ int ossl_quic_rstream_queue_data(QUIC_RSTREAM *qrs, OSSL_QRX_PKT *pkt,
 }
 
 static int read_internal(QUIC_RSTREAM *qrs, unsigned char *buf, size_t size,
-                         size_t *readbytes, int *fin, int drop)
+    size_t *readbytes, int *fin, int drop)
 {
     void *iter = NULL;
     UINT_RANGE range;
@@ -107,7 +107,7 @@ static int read_internal(QUIC_RSTREAM *qrs, unsigned char *buf, size_t size,
                 readbytes_ += max_len;
                 l -= max_len;
                 data = ring_buf_get_ptr(&qrs->rbuf, range.start + max_len,
-                                        &max_len);
+                    &max_len);
                 if (!ossl_assert(data != NULL) || !ossl_assert(max_len > l))
                     return 0;
             }
@@ -150,7 +150,7 @@ static OSSL_TIME get_rtt(QUIC_RSTREAM *qrs)
 }
 
 int ossl_quic_rstream_read(QUIC_RSTREAM *qrs, unsigned char *buf, size_t size,
-                           size_t *readbytes, int *fin)
+    size_t *readbytes, int *fin)
 {
     OSSL_TIME rtt = get_rtt(qrs);
 
@@ -165,7 +165,7 @@ int ossl_quic_rstream_read(QUIC_RSTREAM *qrs, unsigned char *buf, size_t size,
 }
 
 int ossl_quic_rstream_peek(QUIC_RSTREAM *qrs, unsigned char *buf, size_t size,
-                           size_t *readbytes, int *fin)
+    size_t *readbytes, int *fin)
 {
     return read_internal(qrs, buf, size, readbytes, fin, 0);
 }
@@ -189,8 +189,8 @@ int ossl_quic_rstream_available(QUIC_RSTREAM *qrs, size_t *avail, int *fin)
 }
 
 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)
 {
     const unsigned char *record_ = NULL;
     size_t rec_len_, max_len;
@@ -214,7 +214,7 @@ int ossl_quic_rstream_get_record(QUIC_RSTREAM *qrs,
 
     if (record_ == NULL && rec_len_ != 0) {
         record_ = ring_buf_get_ptr(&qrs->rbuf, qrs->head_range.start,
-                                   &max_len);
+            &max_len);
         if (!ossl_assert(record_ != NULL))
             return 0;
         if (max_len < rec_len_) {
@@ -228,7 +228,6 @@ int ossl_quic_rstream_get_record(QUIC_RSTREAM *qrs,
     return 1;
 }
 
-
 int ossl_quic_rstream_release_record(QUIC_RSTREAM *qrs, size_t read_len)
 {
     uint64_t offset;
@@ -261,9 +260,9 @@ int ossl_quic_rstream_release_record(QUIC_RSTREAM *qrs, size_t read_len)
 }
 
 static int write_at_ring_buf_cb(uint64_t logical_offset,
-                                const unsigned char *buf,
-                                size_t buf_len,
-                                void *cb_arg)
+    const unsigned char *buf,
+    size_t buf_len,
+    void *cb_arg)
 {
     struct ring_buf *rbuf = cb_arg;
 
@@ -275,7 +274,7 @@ int ossl_quic_rstream_move_to_rbuf(QUIC_RSTREAM *qrs)
     if (ring_buf_avail(&qrs->rbuf) == 0)
         return 0;
     return ossl_sframe_list_move_data(&qrs->fl,
-                                      write_at_ring_buf_cb, &qrs->rbuf);
+        write_at_ring_buf_cb, &qrs->rbuf);
 }
 
 int ossl_quic_rstream_resize_rbuf(QUIC_RSTREAM *qrs, size_t rbuf_size)
diff --git a/ssl/quic/quic_rx_depack.c b/ssl/quic/quic_rx_depack.c
index a36b02d5dcb4f..83f66ef59e5a0 100644
--- a/ssl/quic/quic_rx_depack.c
+++ b/ssl/quic/quic_rx_depack.c
@@ -30,9 +30,9 @@
  * them a verifiable pattern against tables where this is specified.
  */
 static int depack_do_implicit_stream_create(QUIC_CHANNEL *ch,
-                                            uint64_t stream_id,
-                                            uint64_t frame_type,
-                                            QUIC_STREAM **result);
+    uint64_t stream_id,
+    uint64_t frame_type,
+    QUIC_STREAM **result);
 
 static int depack_do_frame_padding(PACKET *pkt)
 {
@@ -42,15 +42,15 @@ static int depack_do_frame_padding(PACKET *pkt)
 }
 
 static int depack_do_frame_ping(PACKET *pkt, QUIC_CHANNEL *ch,
-                                uint32_t enc_level,
-                                OSSL_ACKM_RX_PKT *ackm_data)
+    uint32_t enc_level,
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     /* We ignore this frame, apart from eliciting an ACK */
     if (!ossl_quic_wire_decode_frame_ping(pkt)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_PING,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_PING,
+            "decode error");
         return 0;
     }
 
@@ -59,9 +59,9 @@ static int depack_do_frame_ping(PACKET *pkt, QUIC_CHANNEL *ch,
 }
 
 static int depack_do_frame_ack(PACKET *pkt, QUIC_CHANNEL *ch,
-                               int packet_space, OSSL_TIME received,
-                               uint64_t frame_type,
-                               OSSL_QRX_PKT *qpacket)
+    int packet_space, OSSL_TIME received,
+    uint64_t frame_type,
+    OSSL_QRX_PKT *qpacket)
 {
     OSSL_QUIC_FRAME_ACK ack;
     OSSL_QUIC_ACK_RANGE *p;
@@ -75,12 +75,13 @@ static int depack_do_frame_ack(PACKET *pkt, QUIC_CHANNEL *ch,
 
     if (ch->num_ack_range_scratch < (size_t)total_ranges) {
         if ((p = OPENSSL_realloc(ch->ack_range_scratch,
-                                 sizeof(OSSL_QUIC_ACK_RANGE)
-                                 * (size_t)total_ranges)) == NULL)
+                 sizeof(OSSL_QUIC_ACK_RANGE)
+                     * (size_t)total_ranges))
+            == NULL)
             goto malformed;
 
-        ch->ack_range_scratch       = p;
-        ch->num_ack_range_scratch   = (size_t)total_ranges;
+        ch->ack_range_scratch = p;
+        ch->num_ack_range_scratch = (size_t)total_ranges;
     }
 
     ack.ack_ranges = ch->ack_range_scratch;
@@ -115,16 +116,16 @@ static int depack_do_frame_ack(PACKET *pkt, QUIC_CHANNEL *ch,
          *     epoch has not incremented and ch->rxku_expected is still 1.
          */
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_KEY_UPDATE_ERROR,
-                                               frame_type,
-                                               "acked packet which initiated a "
-                                               "key update without a "
-                                               "corresponding key update");
+            OSSL_QUIC_ERR_KEY_UPDATE_ERROR,
+            frame_type,
+            "acked packet which initiated a "
+            "key update without a "
+            "corresponding key update");
         return 0;
     }
 
     if (!ossl_ackm_on_rx_ack_frame(ch->ackm, &ack,
-                                   packet_space, received))
+            packet_space, received))
         goto malformed;
 
     ++ch->diag_num_rx_ack;
@@ -132,15 +133,15 @@ static int depack_do_frame_ack(PACKET *pkt, QUIC_CHANNEL *ch,
 
 malformed:
     ossl_quic_channel_raise_protocol_error(ch,
-                                           OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                           frame_type,
-                                           "decode error");
+        OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+        frame_type,
+        "decode error");
     return 0;
 }
 
 static int depack_do_frame_reset_stream(PACKET *pkt,
-                                        QUIC_CHANNEL *ch,
-                                        OSSL_ACKM_RX_PKT *ackm_data)
+    QUIC_CHANNEL *ch,
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     OSSL_QUIC_FRAME_RESET_STREAM frame_data;
     QUIC_STREAM *stream = NULL;
@@ -148,15 +149,15 @@ static int depack_do_frame_reset_stream(PACKET *pkt,
 
     if (!ossl_quic_wire_decode_frame_reset_stream(pkt, &frame_data)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
+            "decode error");
         return 0;
     }
 
     if (!depack_do_implicit_stream_create(ch, frame_data.stream_id,
-                                          OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
-                                          &stream))
+            OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
+            &stream))
         return 0; /* error already raised for us */
 
     if (stream == NULL)
@@ -164,10 +165,10 @@ static int depack_do_frame_reset_stream(PACKET *pkt,
 
     if (!ossl_quic_stream_has_recv(stream)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_STREAM_STATE_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
-                                               "RESET_STREAM frame for "
-                                               "TX only stream");
+            OSSL_QUIC_ERR_STREAM_STATE_ERROR,
+            OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
+            "RESET_STREAM frame for "
+            "TX only stream");
         return 0;
     }
 
@@ -182,11 +183,11 @@ static int depack_do_frame_reset_stream(PACKET *pkt,
      * of this for us.
      */
     if (!ossl_quic_rxfc_on_rx_stream_frame(&stream->rxfc,
-                                           frame_data.final_size, /*is_fin=*/1)) {
+            frame_data.final_size, /*is_fin=*/1)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
-                                               "internal error (flow control)");
+            OSSL_QUIC_ERR_INTERNAL_ERROR,
+            OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
+            "internal error (flow control)");
         return 0;
     }
 
@@ -194,9 +195,9 @@ static int depack_do_frame_reset_stream(PACKET *pkt,
     fce = ossl_quic_rxfc_get_error(&stream->rxfc, 0);
     if (fce != OSSL_QUIC_ERR_NO_ERROR) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               fce,
-                                               OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
-                                               "flow control violation");
+            fce,
+            OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
+            "flow control violation");
         return 0;
     }
 
@@ -207,31 +208,31 @@ static int depack_do_frame_reset_stream(PACKET *pkt,
      * protocol error conditions we need to check for here.
      */
     ossl_quic_stream_map_notify_reset_recv_part(&ch->qsm, stream,
-                                                frame_data.app_error_code,
-                                                frame_data.final_size);
+        frame_data.app_error_code,
+        frame_data.final_size);
 
     ossl_quic_stream_map_update_state(&ch->qsm, stream);
     return 1;
 }
 
 static int depack_do_frame_stop_sending(PACKET *pkt,
-                                        QUIC_CHANNEL *ch,
-                                        OSSL_ACKM_RX_PKT *ackm_data)
+    QUIC_CHANNEL *ch,
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     OSSL_QUIC_FRAME_STOP_SENDING frame_data;
     QUIC_STREAM *stream = NULL;
 
     if (!ossl_quic_wire_decode_frame_stop_sending(pkt, &frame_data)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_STOP_SENDING,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_STOP_SENDING,
+            "decode error");
         return 0;
     }
 
     if (!depack_do_implicit_stream_create(ch, frame_data.stream_id,
-                                          OSSL_QUIC_FRAME_TYPE_STOP_SENDING,
-                                          &stream))
+            OSSL_QUIC_FRAME_TYPE_STOP_SENDING,
+            &stream))
         return 0; /* error already raised for us */
 
     if (stream == NULL)
@@ -239,15 +240,15 @@ static int depack_do_frame_stop_sending(PACKET *pkt,
 
     if (!ossl_quic_stream_has_send(stream)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_STREAM_STATE_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_STOP_SENDING,
-                                               "STOP_SENDING frame for "
-                                               "RX only stream");
+            OSSL_QUIC_ERR_STREAM_STATE_ERROR,
+            OSSL_QUIC_FRAME_TYPE_STOP_SENDING,
+            "STOP_SENDING frame for "
+            "RX only stream");
         return 0;
     }
 
-    stream->peer_stop_sending       = 1;
-    stream->peer_stop_sending_aec   = frame_data.app_error_code;
+    stream->peer_stop_sending = 1;
+    stream->peer_stop_sending_aec = frame_data.app_error_code;
 
     /*
      * RFC 9000 s. 3.5: Receiving a STOP_SENDING frame means we must respond in
@@ -255,14 +256,14 @@ static int depack_do_frame_stop_sending(PACKET *pkt,
      * part is unaffected.
      */
     ossl_quic_stream_map_reset_stream_send_part(&ch->qsm, stream,
-                                                frame_data.app_error_code);
+        frame_data.app_error_code);
     return 1;
 }
 
 static int depack_do_frame_crypto(PACKET *pkt, QUIC_CHANNEL *ch,
-                                  OSSL_QRX_PKT *parent_pkt,
-                                  OSSL_ACKM_RX_PKT *ackm_data,
-                                  uint64_t *datalen)
+    OSSL_QRX_PKT *parent_pkt,
+    OSSL_ACKM_RX_PKT *ackm_data,
+    uint64_t *datalen)
 {
     OSSL_QUIC_FRAME_CRYPTO f;
     QUIC_RSTREAM *rstream;
@@ -272,9 +273,9 @@ static int depack_do_frame_crypto(PACKET *pkt, QUIC_CHANNEL *ch,
 
     if (!ossl_quic_wire_decode_frame_crypto(pkt, 0, &f)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_CRYPTO,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_CRYPTO,
+            "decode error");
         return 0;
     }
 
@@ -293,27 +294,27 @@ static int depack_do_frame_crypto(PACKET *pkt, QUIC_CHANNEL *ch,
     rxfc = &ch->crypto_rxfc[ackm_data->pkt_space];
 
     if (!ossl_quic_rxfc_on_rx_stream_frame(rxfc, f.offset + f.len,
-                                           /*is_fin=*/0)) {
+            /*is_fin=*/0)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_CRYPTO,
-                                               "internal error (crypto RXFC)");
+            OSSL_QUIC_ERR_INTERNAL_ERROR,
+            OSSL_QUIC_FRAME_TYPE_CRYPTO,
+            "internal error (crypto RXFC)");
         return 0;
     }
 
     if (ossl_quic_rxfc_get_error(rxfc, 0) != OSSL_QUIC_ERR_NO_ERROR) {
         ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED,
-                                               OSSL_QUIC_FRAME_TYPE_CRYPTO,
-                                               "exceeded maximum crypto buffer");
+            OSSL_QUIC_FRAME_TYPE_CRYPTO,
+            "exceeded maximum crypto buffer");
         return 0;
     }
 
     if (!ossl_quic_rstream_queue_data(rstream, parent_pkt,
-                                      f.offset, f.data, f.len, 0)) {
+            f.offset, f.data, f.len, 0)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_CRYPTO,
-                                               "internal error (rstream queue)");
+            OSSL_QUIC_ERR_INTERNAL_ERROR,
+            OSSL_QUIC_FRAME_TYPE_CRYPTO,
+            "internal error (rstream queue)");
         return 0;
     }
 
@@ -324,16 +325,16 @@ static int depack_do_frame_crypto(PACKET *pkt, QUIC_CHANNEL *ch,
 }
 
 static int depack_do_frame_new_token(PACKET *pkt, QUIC_CHANNEL *ch,
-                                     OSSL_ACKM_RX_PKT *ackm_data)
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     const uint8_t *token;
     size_t token_len;
 
     if (!ossl_quic_wire_decode_frame_new_token(pkt, &token, &token_len)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_NEW_TOKEN,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_NEW_TOKEN,
+            "decode error");
         return 0;
     }
 
@@ -344,15 +345,15 @@ static int depack_do_frame_new_token(PACKET *pkt, QUIC_CHANNEL *ch,
          * FRAME_ENCODING_ERROR."
          */
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_NEW_TOKEN,
-                                               "zero-length NEW_TOKEN");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_NEW_TOKEN,
+            "zero-length NEW_TOKEN");
         return 0;
     }
 
     /* store the new token in our token cache */
     if (!ossl_quic_set_peer_token(ossl_quic_port_get_channel_ctx(ch->port),
-                                  &ch->cur_peer_addr, token, token_len))
+            &ch->cur_peer_addr, token, token_len))
         return 0;
 
     return 1;
@@ -364,9 +365,9 @@ static int depack_do_frame_new_token(PACKET *pkt, QUIC_CHANNEL *ch,
  * causing this function to be called. Returns 0 on protocol violation.
  */
 static int depack_do_implicit_stream_create(QUIC_CHANNEL *ch,
-                                            uint64_t stream_id,
-                                            uint64_t frame_type,
-                                            QUIC_STREAM **result)
+    uint64_t stream_id,
+    uint64_t frame_type,
+    QUIC_STREAM **result)
 {
     QUIC_STREAM *stream;
     uint64_t peer_role, stream_ordinal;
@@ -425,19 +426,19 @@ static int depack_do_implicit_stream_create(QUIC_CHANNEL *ch,
             : &ch->max_streams_bidi_rxfc;
 
         if (!ossl_quic_rxfc_on_rx_stream_frame(max_streams_fc,
-                                               stream_ordinal + 1,
-                                               /*is_fin=*/0)) {
+                stream_ordinal + 1,
+                /*is_fin=*/0)) {
             ossl_quic_channel_raise_protocol_error(ch,
-                                                   OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                                   frame_type,
-                                                   "internal error (stream count RXFC)");
+                OSSL_QUIC_ERR_INTERNAL_ERROR,
+                frame_type,
+                "internal error (stream count RXFC)");
             return 0;
         }
 
         if (ossl_quic_rxfc_get_error(max_streams_fc, 0) != OSSL_QUIC_ERR_NO_ERROR) {
             ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_STREAM_LIMIT_ERROR,
-                                                   frame_type,
-                                                   "exceeded maximum allowed streams");
+                frame_type,
+                "exceeded maximum allowed streams");
             return 0;
         }
 
@@ -446,16 +447,14 @@ static int depack_do_implicit_stream_create(QUIC_CHANNEL *ch,
          * created.
          */
         while (*p_next_ordinal_remote <= stream_ordinal) {
-            uint64_t cur_stream_id = (*p_next_ordinal_remote << 2) |
-                (stream_id
-                 & (QUIC_STREAM_DIR_MASK | QUIC_STREAM_INITIATOR_MASK));
+            uint64_t cur_stream_id = (*p_next_ordinal_remote << 2) | (stream_id & (QUIC_STREAM_DIR_MASK | QUIC_STREAM_INITIATOR_MASK));
 
             stream = ossl_quic_channel_new_stream_remote(ch, cur_stream_id);
             if (stream == NULL) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                                       frame_type,
-                                                       "internal error (stream allocation)");
+                    OSSL_QUIC_ERR_INTERNAL_ERROR,
+                    frame_type,
+                    "internal error (stream allocation)");
                 return 0;
             }
 
@@ -475,10 +474,10 @@ static int depack_do_implicit_stream_create(QUIC_CHANNEL *ch,
              * violation.
              */
             ossl_quic_channel_raise_protocol_error(ch,
-                                                   OSSL_QUIC_ERR_STREAM_STATE_ERROR,
-                                                   frame_type,
-                                                   "STREAM frame for nonexistent "
-                                                   "stream");
+                OSSL_QUIC_ERR_STREAM_STATE_ERROR,
+                frame_type,
+                "STREAM frame for nonexistent "
+                "stream");
             return 0;
         }
 
@@ -495,10 +494,10 @@ static int depack_do_implicit_stream_create(QUIC_CHANNEL *ch,
 }
 
 static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch,
-                                  OSSL_QRX_PKT *parent_pkt,
-                                  OSSL_ACKM_RX_PKT *ackm_data,
-                                  uint64_t frame_type,
-                                  uint64_t *datalen)
+    OSSL_QRX_PKT *parent_pkt,
+    OSSL_ACKM_RX_PKT *ackm_data,
+    uint64_t frame_type,
+    uint64_t *datalen)
 {
     OSSL_QUIC_FRAME_STREAM frame_data;
     QUIC_STREAM *stream;
@@ -510,14 +509,14 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch,
 
     if (!ossl_quic_wire_decode_frame_stream(pkt, 0, &frame_data)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               frame_type,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            frame_type,
+            "decode error");
         return 0;
     }
 
     if (!depack_do_implicit_stream_create(ch, frame_data.stream_id,
-                                          frame_type, &stream))
+            frame_type, &stream))
         return 0; /* protocol error raised by above call */
 
     if (stream == NULL)
@@ -529,21 +528,21 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch,
 
     if (!ossl_quic_stream_has_recv(stream)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_STREAM_STATE_ERROR,
-                                               frame_type,
-                                               "STREAM frame for TX only "
-                                               "stream");
+            OSSL_QUIC_ERR_STREAM_STATE_ERROR,
+            frame_type,
+            "STREAM frame for TX only "
+            "stream");
         return 0;
     }
 
     /* Notify stream flow controller. */
     if (!ossl_quic_rxfc_on_rx_stream_frame(&stream->rxfc,
-                                           frame_data.offset + frame_data.len,
-                                           frame_data.is_fin)) {
+            frame_data.offset + frame_data.len,
+            frame_data.is_fin)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                               frame_type,
-                                               "internal error (flow control)");
+            OSSL_QUIC_ERR_INTERNAL_ERROR,
+            frame_type,
+            "internal error (flow control)");
         return 0;
     }
 
@@ -551,9 +550,9 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch,
     fce = ossl_quic_rxfc_get_error(&stream->rxfc, 0);
     if (fce != OSSL_QUIC_ERR_NO_ERROR) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               fce,
-                                               frame_type,
-                                               "flow control violation");
+            fce,
+            frame_type,
+            "flow control violation");
         return 0;
     }
 
@@ -584,8 +583,8 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch,
 
         /* State was already checked above, so can't fail. */
         ossl_quic_stream_map_notify_size_known_recv_part(&ch->qsm, stream,
-                                                         frame_data.offset
-                                                         + frame_data.len);
+            frame_data.offset
+                + frame_data.len);
     }
 
     /*
@@ -608,14 +607,14 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch,
      */
     if ((frame_data.len > 0 || frame_data.is_fin)
         && !ossl_quic_rstream_queue_data(stream->rstream, parent_pkt,
-                                      frame_data.offset,
-                                      frame_data.data,
-                                      frame_data.len,
-                                      frame_data.is_fin)) {
+            frame_data.offset,
+            frame_data.data,
+            frame_data.len,
+            frame_data.is_fin)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                               frame_type,
-                                               "internal error (rstream queue)");
+            OSSL_QUIC_ERR_INTERNAL_ERROR,
+            frame_type,
+            "internal error (rstream queue)");
         return 0;
     }
 
@@ -628,9 +627,9 @@ static int depack_do_frame_stream(PACKET *pkt, QUIC_CHANNEL *ch,
     if (stream->recv_state == QUIC_RSTREAM_STATE_SIZE_KNOWN
         && !ossl_quic_rstream_available(stream->rstream, &rs_avail, &rs_fin)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                               frame_type,
-                                               "internal error (rstream available)");
+            OSSL_QUIC_ERR_INTERNAL_ERROR,
+            frame_type,
+            "internal error (rstream available)");
         return 0;
     }
 
@@ -670,15 +669,15 @@ static void update_streams_uni(QUIC_STREAM *s, void *arg)
 }
 
 static int depack_do_frame_max_data(PACKET *pkt, QUIC_CHANNEL *ch,
-                                    OSSL_ACKM_RX_PKT *ackm_data)
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     uint64_t max_data = 0;
 
     if (!ossl_quic_wire_decode_frame_max_data(pkt, &max_data)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_MAX_DATA,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_MAX_DATA,
+            "decode error");
         return 0;
     }
 
@@ -688,25 +687,25 @@ static int depack_do_frame_max_data(PACKET *pkt, QUIC_CHANNEL *ch,
 }
 
 static int depack_do_frame_max_stream_data(PACKET *pkt,
-                                           QUIC_CHANNEL *ch,
-                                           OSSL_ACKM_RX_PKT *ackm_data)
+    QUIC_CHANNEL *ch,
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     uint64_t stream_id = 0;
     uint64_t max_stream_data = 0;
     QUIC_STREAM *stream;
 
     if (!ossl_quic_wire_decode_frame_max_stream_data(pkt, &stream_id,
-                                                     &max_stream_data)) {
+            &max_stream_data)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA,
+            "decode error");
         return 0;
     }
 
     if (!depack_do_implicit_stream_create(ch, stream_id,
-                                          OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA,
-                                          &stream))
+            OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA,
+            &stream))
         return 0; /* error already raised for us */
 
     if (stream == NULL)
@@ -714,10 +713,10 @@ static int depack_do_frame_max_stream_data(PACKET *pkt,
 
     if (!ossl_quic_stream_has_send(stream)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_STREAM_STATE_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA,
-                                               "MAX_STREAM_DATA for TX only "
-                                               "stream");
+            OSSL_QUIC_ERR_STREAM_STATE_ERROR,
+            OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA,
+            "MAX_STREAM_DATA for TX only "
+            "stream");
         return 0;
     }
 
@@ -727,25 +726,25 @@ static int depack_do_frame_max_stream_data(PACKET *pkt,
 }
 
 static int depack_do_frame_max_streams(PACKET *pkt,
-                                       QUIC_CHANNEL *ch,
-                                       OSSL_ACKM_RX_PKT *ackm_data,
-                                       uint64_t frame_type)
+    QUIC_CHANNEL *ch,
+    OSSL_ACKM_RX_PKT *ackm_data,
+    uint64_t frame_type)
 {
     uint64_t max_streams = 0;
 
     if (!ossl_quic_wire_decode_frame_max_streams(pkt, &max_streams)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               frame_type,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            frame_type,
+            "decode error");
         return 0;
     }
 
     if (max_streams > (((uint64_t)1) << 60)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               frame_type,
-                                               "invalid max streams value");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            frame_type,
+            "invalid max streams value");
         return 0;
     }
 
@@ -766,9 +765,9 @@ static int depack_do_frame_max_streams(PACKET *pkt,
         break;
     default:
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               frame_type,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            frame_type,
+            "decode error");
         return 0;
     }
 
@@ -776,16 +775,16 @@ static int depack_do_frame_max_streams(PACKET *pkt,
 }
 
 static int depack_do_frame_data_blocked(PACKET *pkt,
-                                        QUIC_CHANNEL *ch,
-                                        OSSL_ACKM_RX_PKT *ackm_data)
+    QUIC_CHANNEL *ch,
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     uint64_t max_data = 0;
 
     if (!ossl_quic_wire_decode_frame_data_blocked(pkt, &max_data)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED,
+            "decode error");
         return 0;
     }
 
@@ -794,19 +793,19 @@ static int depack_do_frame_data_blocked(PACKET *pkt,
 }
 
 static int depack_do_frame_stream_data_blocked(PACKET *pkt,
-                                               QUIC_CHANNEL *ch,
-                                               OSSL_ACKM_RX_PKT *ackm_data)
+    QUIC_CHANNEL *ch,
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     uint64_t stream_id = 0;
     uint64_t max_data = 0;
     QUIC_STREAM *stream;
 
     if (!ossl_quic_wire_decode_frame_stream_data_blocked(pkt, &stream_id,
-                                                         &max_data)) {
+            &max_data)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED,
+            "decode error");
         return 0;
     }
 
@@ -815,8 +814,8 @@ static int depack_do_frame_stream_data_blocked(PACKET *pkt,
      * but it does trigger stream creation.
      */
     if (!depack_do_implicit_stream_create(ch, stream_id,
-                                          OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED,
-                                          &stream))
+            OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED,
+            &stream))
         return 0; /* error already raised for us */
 
     if (stream == NULL)
@@ -829,10 +828,10 @@ static int depack_do_frame_stream_data_blocked(PACKET *pkt,
          * STREAM_STATE_ERROR."
          */
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_STREAM_STATE_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED,
-                                               "STREAM_DATA_BLOCKED frame for "
-                                               "TX only stream");
+            OSSL_QUIC_ERR_STREAM_STATE_ERROR,
+            OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED,
+            "STREAM_DATA_BLOCKED frame for "
+            "TX only stream");
         return 0;
     }
 
@@ -841,17 +840,17 @@ static int depack_do_frame_stream_data_blocked(PACKET *pkt,
 }
 
 static int depack_do_frame_streams_blocked(PACKET *pkt,
-                                           QUIC_CHANNEL *ch,
-                                           OSSL_ACKM_RX_PKT *ackm_data,
-                                           uint64_t frame_type)
+    QUIC_CHANNEL *ch,
+    OSSL_ACKM_RX_PKT *ackm_data,
+    uint64_t frame_type)
 {
     uint64_t max_data = 0;
 
     if (!ossl_quic_wire_decode_frame_streams_blocked(pkt, &max_data)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               frame_type,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            frame_type,
+            "decode error");
         return 0;
     }
 
@@ -863,9 +862,9 @@ static int depack_do_frame_streams_blocked(PACKET *pkt,
          * error of type STREAM_LIMIT_ERROR or FRAME_ENCODING_ERROR."
          */
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_STREAM_LIMIT_ERROR,
-                                               frame_type,
-                                               "invalid stream count limit");
+            OSSL_QUIC_ERR_STREAM_LIMIT_ERROR,
+            frame_type,
+            "invalid stream count limit");
         return 0;
     }
 
@@ -874,16 +873,16 @@ static int depack_do_frame_streams_blocked(PACKET *pkt,
 }
 
 static int depack_do_frame_new_conn_id(PACKET *pkt,
-                                       QUIC_CHANNEL *ch,
-                                       OSSL_ACKM_RX_PKT *ackm_data)
+    QUIC_CHANNEL *ch,
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     OSSL_QUIC_FRAME_NEW_CONN_ID frame_data;
 
     if (!ossl_quic_wire_decode_frame_new_conn_id(pkt, &frame_data)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID,
+            "decode error");
         return 0;
     }
 
@@ -893,16 +892,16 @@ static int depack_do_frame_new_conn_id(PACKET *pkt,
 }
 
 static int depack_do_frame_retire_conn_id(PACKET *pkt,
-                                          QUIC_CHANNEL *ch,
-                                          OSSL_ACKM_RX_PKT *ackm_data)
+    QUIC_CHANNEL *ch,
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     uint64_t seq_num;
 
     if (!ossl_quic_wire_decode_frame_retire_conn_id(pkt, &seq_num)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID,
+            "decode error");
         return 0;
     }
 
@@ -921,9 +920,9 @@ static int depack_do_frame_retire_conn_id(PACKET *pkt,
      */
     if (!ch->is_server) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                               OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID,
-                                               "conn has zero-length CID");
+            OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+            OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID,
+            "conn has zero-length CID");
         return 0;
     }
 
@@ -936,8 +935,8 @@ static void free_path_response(unsigned char *buf, size_t buf_len, void *arg)
 }
 
 static int depack_do_frame_path_challenge(PACKET *pkt,
-                                          QUIC_CHANNEL *ch,
-                                          OSSL_ACKM_RX_PKT *ackm_data)
+    QUIC_CHANNEL *ch,
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     uint64_t frame_data = 0;
     unsigned char *encoded = NULL;
@@ -946,9 +945,9 @@ static int depack_do_frame_path_challenge(PACKET *pkt,
 
     if (!ossl_quic_wire_decode_frame_path_challenge(pkt, &frame_data)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE,
+            "decode error");
         return 0;
     }
 
@@ -974,10 +973,10 @@ static int depack_do_frame_path_challenge(PACKET *pkt,
     WPACKET_finish(&wpkt);
 
     if (!ossl_quic_cfq_add_frame(ch->cfq, 0, QUIC_PN_SPACE_APP,
-                                 OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE,
-                                 QUIC_CFQ_ITEM_FLAG_UNRELIABLE,
-                                 encoded, encoded_len,
-                                 free_path_response, NULL))
+            OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE,
+            QUIC_CFQ_ITEM_FLAG_UNRELIABLE,
+            encoded, encoded_len,
+            free_path_response, NULL))
         goto err;
 
     return 1;
@@ -985,22 +984,22 @@ static int depack_do_frame_path_challenge(PACKET *pkt,
 err:
     OPENSSL_free(encoded);
     ossl_quic_channel_raise_protocol_error(ch, OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                           OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE,
-                                           "internal error");
+        OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE,
+        "internal error");
     return 0;
 }
 
 static int depack_do_frame_path_response(PACKET *pkt,
-                                         QUIC_CHANNEL *ch,
-                                         OSSL_ACKM_RX_PKT *ackm_data)
+    QUIC_CHANNEL *ch,
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     uint64_t frame_data = 0;
 
     if (!ossl_quic_wire_decode_frame_path_response(pkt, &frame_data)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE,
+            "decode error");
         return 0;
     }
 
@@ -1010,15 +1009,15 @@ static int depack_do_frame_path_response(PACKET *pkt,
 }
 
 static int depack_do_frame_conn_close(PACKET *pkt, QUIC_CHANNEL *ch,
-                                      uint64_t frame_type)
+    uint64_t frame_type)
 {
     OSSL_QUIC_FRAME_CONN_CLOSE frame_data;
 
     if (!ossl_quic_wire_decode_frame_conn_close(pkt, &frame_data)) {
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                               frame_type,
-                                               "decode error");
+            OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+            frame_type,
+            "decode error");
         return 0;
     }
 
@@ -1027,15 +1026,15 @@ static int depack_do_frame_conn_close(PACKET *pkt, QUIC_CHANNEL *ch,
 }
 
 static int depack_do_frame_handshake_done(PACKET *pkt,
-                                          QUIC_CHANNEL *ch,
-                                          OSSL_ACKM_RX_PKT *ackm_data)
+    QUIC_CHANNEL *ch,
+    OSSL_ACKM_RX_PKT *ackm_data)
 {
     if (!ossl_quic_wire_decode_frame_handshake_done(pkt)) {
         /* This can fail only with an internal error. */
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_INTERNAL_ERROR,
-                                               OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE,
-                                               "internal error (decode frame handshake done)");
+            OSSL_QUIC_ERR_INTERNAL_ERROR,
+            OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE,
+            "internal error (decode frame handshake done)");
         return 0;
     }
 
@@ -1046,8 +1045,8 @@ static int depack_do_frame_handshake_done(PACKET *pkt,
 /* Main frame processor */
 
 static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
-                                 OSSL_QRX_PKT *parent_pkt, uint32_t enc_level,
-                                 OSSL_TIME received, OSSL_ACKM_RX_PKT *ackm_data)
+    OSSL_QRX_PKT *parent_pkt, uint32_t enc_level,
+    OSSL_TIME received, OSSL_ACKM_RX_PKT *ackm_data)
 {
     uint32_t pkt_type = parent_pkt->hdr->type;
     uint32_t packet_space = ossl_quic_enc_level_to_pn_space(enc_level);
@@ -1059,9 +1058,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
          * PROTOCOL_VIOLATION.
          */
         ossl_quic_channel_raise_protocol_error(ch,
-                                               OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                               0,
-                                               "empty packet payload");
+            OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+            0,
+            "empty packet payload");
         return 0;
     }
 
@@ -1076,17 +1075,17 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
 
         if (!ossl_quic_wire_peek_frame_header(pkt, &frame_type, &was_minimal)) {
             ossl_quic_channel_raise_protocol_error(ch,
-                                                   OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                   0,
-                                                   "malformed frame header");
+                OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                0,
+                "malformed frame header");
             return 0;
         }
 
         if (!was_minimal) {
             ossl_quic_channel_raise_protocol_error(ch,
-                                                   OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                   frame_type,
-                                                   "non-minimal frame type encoding");
+                OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                frame_type,
+                "non-minimal frame type encoding");
             return 0;
         }
 
@@ -1125,13 +1124,13 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             /* ACK frames are valid everywhere except in 0RTT packets */
             if (pkt_type == QUIC_PKT_TYPE_0RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "ACK not valid in 0-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "ACK not valid in 0-RTT");
                 return 0;
             }
             if (!depack_do_frame_ack(pkt, ch, packet_space, received,
-                                     frame_type, parent_pkt))
+                    frame_type, parent_pkt))
                 return 0;
             break;
 
@@ -1140,10 +1139,10 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "RESET_STREAM not valid in "
-                                                       "INITIAL/HANDSHAKE");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "RESET_STREAM not valid in "
+                    "INITIAL/HANDSHAKE");
                 return 0;
             }
             if (!depack_do_frame_reset_stream(pkt, ch, ackm_data))
@@ -1154,10 +1153,10 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "STOP_SENDING not valid in "
-                                                       "INITIAL/HANDSHAKE");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "STOP_SENDING not valid in "
+                    "INITIAL/HANDSHAKE");
                 return 0;
             }
             if (!depack_do_frame_stop_sending(pkt, ch, ackm_data))
@@ -1167,9 +1166,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             /* CRYPTO frames are valid everywhere except in 0RTT packets */
             if (pkt_type == QUIC_PKT_TYPE_0RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "CRYPTO frame not valid in 0-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "CRYPTO frame not valid in 0-RTT");
                 return 0;
             }
             if (!depack_do_frame_crypto(pkt, ch, parent_pkt, ackm_data, &datalen))
@@ -1179,9 +1178,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             /* NEW_TOKEN frames are valid in 1RTT packets */
             if (pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "NEW_TOKEN valid only in 1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "NEW_TOKEN valid only in 1-RTT");
                 return 0;
             }
 
@@ -1191,9 +1190,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
              */
             if (ch->is_server) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "NEW_TOKEN can only be sent by a server");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "NEW_TOKEN can only be sent by a server");
                 return 0;
             }
 
@@ -1213,13 +1212,13 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "STREAM valid only in 0/1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "STREAM valid only in 0/1-RTT");
                 return 0;
             }
             if (!depack_do_frame_stream(pkt, ch, parent_pkt, ackm_data,
-                                        frame_type, &datalen))
+                    frame_type, &datalen))
                 return 0;
             break;
 
@@ -1228,9 +1227,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "MAX_DATA valid only in 0/1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "MAX_DATA valid only in 0/1-RTT");
                 return 0;
             }
             if (!depack_do_frame_max_data(pkt, ch, ackm_data))
@@ -1241,9 +1240,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "MAX_STREAM_DATA valid only in 0/1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "MAX_STREAM_DATA valid only in 0/1-RTT");
                 return 0;
             }
             if (!depack_do_frame_max_stream_data(pkt, ch, ackm_data))
@@ -1256,13 +1255,13 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "MAX_STREAMS valid only in 0/1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "MAX_STREAMS valid only in 0/1-RTT");
                 return 0;
             }
             if (!depack_do_frame_max_streams(pkt, ch, ackm_data,
-                                             frame_type))
+                    frame_type))
                 return 0;
             break;
 
@@ -1271,9 +1270,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "DATA_BLOCKED valid only in 0/1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "DATA_BLOCKED valid only in 0/1-RTT");
                 return 0;
             }
             if (!depack_do_frame_data_blocked(pkt, ch, ackm_data))
@@ -1284,9 +1283,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "STREAM_DATA_BLOCKED valid only in 0/1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "STREAM_DATA_BLOCKED valid only in 0/1-RTT");
                 return 0;
             }
             if (!depack_do_frame_stream_data_blocked(pkt, ch, ackm_data))
@@ -1299,13 +1298,13 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "STREAMS valid only in 0/1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "STREAMS valid only in 0/1-RTT");
                 return 0;
             }
             if (!depack_do_frame_streams_blocked(pkt, ch, ackm_data,
-                                                 frame_type))
+                    frame_type))
                 return 0;
             break;
 
@@ -1314,9 +1313,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "NEW_CONN_ID valid only in 0/1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "NEW_CONN_ID valid only in 0/1-RTT");
             }
             if (!depack_do_frame_new_conn_id(pkt, ch, ackm_data))
                 return 0;
@@ -1326,9 +1325,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "RETIRE_CONN_ID valid only in 0/1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "RETIRE_CONN_ID valid only in 0/1-RTT");
                 return 0;
             }
             if (!depack_do_frame_retire_conn_id(pkt, ch, ackm_data))
@@ -1339,9 +1338,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "PATH_CHALLENGE valid only in 0/1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "PATH_CHALLENGE valid only in 0/1-RTT");
                 return 0;
             }
             if (!depack_do_frame_path_challenge(pkt, ch, ackm_data))
@@ -1352,9 +1351,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             /* PATH_RESPONSE frames are valid in 1RTT packets */
             if (pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "PATH_CHALLENGE valid only in 1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "PATH_CHALLENGE valid only in 1-RTT");
                 return 0;
             }
             if (!depack_do_frame_path_response(pkt, ch, ackm_data))
@@ -1366,9 +1365,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (pkt_type != QUIC_PKT_TYPE_0RTT
                 && pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "CONN_CLOSE (APP) valid only in 0/1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "CONN_CLOSE (APP) valid only in 0/1-RTT");
                 return 0;
             }
             /* FALLTHRU */
@@ -1382,9 +1381,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             /* HANDSHAKE_DONE frames are valid in 1RTT packets */
             if (pkt_type != QUIC_PKT_TYPE_1RTT) {
                 ossl_quic_channel_raise_protocol_error(ch,
-                                                       OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
-                                                       frame_type,
-                                                       "HANDSHAKE_DONE valid only in 1-RTT");
+                    OSSL_QUIC_ERR_PROTOCOL_VIOLATION,
+                    frame_type,
+                    "HANDSHAKE_DONE valid only in 1-RTT");
                 return 0;
             }
             if (!depack_do_frame_handshake_done(pkt, ch, ackm_data))
@@ -1394,9 +1393,9 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
         default:
             /* Unknown frame type */
             ossl_quic_channel_raise_protocol_error(ch,
-                                                   OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
-                                                   frame_type,
-                                                   "Unknown frame type received");
+                OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,
+                frame_type,
+                "Unknown frame type received");
             return 0;
         }
 
@@ -1408,13 +1407,13 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             if (frame_type == OSSL_QUIC_FRAME_TYPE_PADDING) {
                 ctype = SSL3_RT_QUIC_FRAME_PADDING;
             } else if (OSSL_QUIC_FRAME_TYPE_IS_STREAM(frame_type)
-                    || frame_type == OSSL_QUIC_FRAME_TYPE_CRYPTO) {
+                || frame_type == OSSL_QUIC_FRAME_TYPE_CRYPTO) {
                 ctype = SSL3_RT_QUIC_FRAME_HEADER;
                 framelen -= (size_t)datalen;
             }
 
             ch->msg_callback(0, OSSL_QUIC1_VERSION, ctype, sof, framelen,
-                             ch->msg_callback_ssl, ch->msg_callback_arg);
+                ch->msg_callback_ssl, ch->msg_callback_arg);
         }
     }
 
@@ -1429,16 +1428,8 @@ int ossl_quic_handle_frames(QUIC_CHANNEL *ch, OSSL_QRX_PKT *qpacket)
     uint32_t enc_level;
     size_t dgram_len = qpacket->datagram_len;
 
-    /*
-     * ok has three states:
-     * -1 error with ackm_data uninitialized
-     *  0 error with ackm_data initialized
-     *  1 success (ackm_data initialized)
-     */
-    int ok = -1;                  /* Assume the worst */
-
     if (ch == NULL)
-        goto end;
+        return 0;
 
     ch->did_crypto_frame = 0;
 
@@ -1456,9 +1447,8 @@ int ossl_quic_handle_frames(QUIC_CHANNEL *ch, OSSL_QRX_PKT *qpacket)
          * Retry and Version Negotiation packets should not be passed to this
          * function.
          */
-        goto end;
+        return 0;
 
-    ok = 0; /* Still assume the worst */
     ackm_data.pkt_space = ossl_quic_enc_level_to_pn_space(enc_level);
 
     /*
@@ -1477,21 +1467,12 @@ int ossl_quic_handle_frames(QUIC_CHANNEL *ch, OSSL_QRX_PKT *qpacket)
     /* Now that special cases are out of the way, parse frames */
     if (!PACKET_buf_init(&pkt, qpacket->hdr->data, qpacket->hdr->len)
         || !depack_process_frames(ch, &pkt, qpacket,
-                                  enc_level,
-                                  qpacket->time,
-                                  &ackm_data))
-        goto end;
+            enc_level,
+            qpacket->time,
+            &ackm_data))
+        return 0;
 
-    ok = 1;
- end:
-    /*
-     * ASSUMPTION: If this function is called at all, |qpacket| is
-     * a legitimate packet, even if its contents aren't.
-     * Therefore, we call ossl_ackm_on_rx_packet() unconditionally, as long as
-     * |ackm_data| has at least been initialized.
-     */
-    if (ok >= 0)
-        ossl_ackm_on_rx_packet(ch->ackm, &ackm_data);
+    ossl_ackm_on_rx_packet(ch->ackm, &ackm_data);
 
-    return ok > 0;
+    return 1;
 }
diff --git a/ssl/quic/quic_sf_list.c b/ssl/quic/quic_sf_list.c
index 0541a2ab6371f..03bbbe6d3561c 100644
--- a/ssl/quic/quic_sf_list.c
+++ b/ssl/quic/quic_sf_list.c
@@ -22,13 +22,13 @@ static void stream_frame_free(SFRAME_LIST *fl, STREAM_FRAME *sf)
 {
     if (fl->cleanse && sf->data != NULL)
         OPENSSL_cleanse((unsigned char *)sf->data,
-                        (size_t)(sf->range.end - sf->range.start));
+            (size_t)(sf->range.end - sf->range.start));
     ossl_qrx_pkt_release(sf->pkt);
     OPENSSL_free(sf);
 }
 
 static STREAM_FRAME *stream_frame_new(UINT_RANGE *range, OSSL_QRX_PKT *pkt,
-                                      const unsigned char *data)
+    const unsigned char *data)
 {
     STREAM_FRAME *sf = OPENSSL_zalloc(sizeof(*sf));
 
@@ -61,8 +61,8 @@ void ossl_sframe_list_destroy(SFRAME_LIST *fl)
 }
 
 static int append_frame(SFRAME_LIST *fl, UINT_RANGE *range,
-                        OSSL_QRX_PKT *pkt,
-                        const unsigned char *data)
+    OSSL_QRX_PKT *pkt,
+    const unsigned char *data)
 {
     STREAM_FRAME *new_frame;
 
@@ -77,8 +77,8 @@ static int append_frame(SFRAME_LIST *fl, UINT_RANGE *range,
 }
 
 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)
 {
     STREAM_FRAME *sf, *new_frame, *prev_frame, *next_frame;
 #ifndef NDEBUG
@@ -87,7 +87,7 @@ int ossl_sframe_list_insert(SFRAME_LIST *fl, UINT_RANGE *range,
 
     /* This check for FINAL_SIZE_ERROR is handled by QUIC FC already */
     assert((!fin || curr_end <= range->end)
-           && (!fl->fin || curr_end >= range->end));
+        && (!fl->fin || curr_end >= range->end));
 #endif
 
     if (fl->offset >= range->end)
@@ -115,7 +115,7 @@ int ossl_sframe_list_insert(SFRAME_LIST *fl, UINT_RANGE *range,
 
     prev_frame = NULL;
     for (sf = fl->head; sf != NULL && sf->range.start < range->start;
-         sf = sf->next)
+        sf = sf->next)
         prev_frame = sf;
 
     if (!ossl_assert(sf != NULL))
@@ -134,7 +134,7 @@ int ossl_sframe_list_insert(SFRAME_LIST *fl, UINT_RANGE *range,
         return 0;
 
     for (next_frame = sf;
-         next_frame != NULL && next_frame->range.end <= range->end;) {
+        next_frame != NULL && next_frame->range.end <= range->end;) {
         STREAM_FRAME *drop_frame = next_frame;
 
         next_frame = next_frame->next;
@@ -172,15 +172,15 @@ int ossl_sframe_list_insert(SFRAME_LIST *fl, UINT_RANGE *range,
 
     ++fl->num_frames;
 
- end:
+end:
     fl->fin = fin || fl->fin;
 
     return 1;
 }
 
 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)
 {
     STREAM_FRAME *sf = *iter;
     uint64_t start;
@@ -222,9 +222,9 @@ int ossl_sframe_list_drop_frames(SFRAME_LIST *fl, uint64_t limit)
     /* offset cannot move back or past the data received */
     if (!ossl_assert(limit >= fl->offset)
         || !ossl_assert(fl->tail == NULL
-                        || limit <= fl->tail->range.end)
+            || limit <= fl->tail->range.end)
         || !ossl_assert(fl->tail != NULL
-                        || limit == fl->offset))
+            || limit == fl->offset))
         return 0;
 
     fl->offset = limit;
@@ -249,8 +249,8 @@ int ossl_sframe_list_drop_frames(SFRAME_LIST *fl, uint64_t limit)
 }
 
 int ossl_sframe_list_lock_head(SFRAME_LIST *fl, UINT_RANGE *range,
-                               const unsigned char **data,
-                               int *fin)
+    const unsigned char **data,
+    int *fin)
 {
     int ret;
     void *iter = NULL;
@@ -270,8 +270,8 @@ int ossl_sframe_list_is_head_locked(SFRAME_LIST *fl)
 }
 
 int ossl_sframe_list_move_data(SFRAME_LIST *fl,
-                               sframe_list_write_at_cb *write_at_cb,
-                               void *cb_arg)
+    sframe_list_write_at_cb *write_at_cb,
+    void *cb_arg)
 {
     STREAM_FRAME *sf = fl->head, *prev_frame = NULL;
     uint64_t limit = fl->offset;
@@ -300,7 +300,7 @@ int ossl_sframe_list_move_data(SFRAME_LIST *fl,
 
             if (fl->cleanse)
                 OPENSSL_cleanse((unsigned char *)sf->data,
-                                (size_t)(sf->range.end - sf->range.start));
+                    (size_t)(sf->range.end - sf->range.start));
 
             /* release the packet */
             sf->data = NULL;
diff --git a/ssl/quic/quic_srt_gen.c b/ssl/quic/quic_srt_gen.c
index 233e4aa628cb6..1390a0d9faf96 100644
--- a/ssl/quic/quic_srt_gen.c
+++ b/ssl/quic/quic_srt_gen.c
@@ -11,8 +11,8 @@
 #include <openssl/evp.h>
 
 struct quic_srt_gen_st {
-    EVP_MAC         *mac;
-    EVP_MAC_CTX     *mac_ctx;
+    EVP_MAC *mac;
+    EVP_MAC_CTX *mac_ctx;
 };
 
 /*
@@ -20,7 +20,7 @@ struct quic_srt_gen_st {
  */
 
 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)
 {
     QUIC_SRT_GEN *srt_gen;
     OSSL_PARAM params[3], *p = params;
@@ -37,7 +37,7 @@ QUIC_SRT_GEN *ossl_quic_srt_gen_new(OSSL_LIB_CTX *libctx, const char *propq,
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST, "SHA256", 7);
     if (propq != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_PROPERTIES,
-                                                (char *)propq, 0);
+            (char *)propq, 0);
     *p++ = OSSL_PARAM_construct_end();
 
     if (!EVP_MAC_init(srt_gen->mac_ctx, key, key_len, params))
@@ -61,8 +61,8 @@ void ossl_quic_srt_gen_free(QUIC_SRT_GEN *srt_gen)
 }
 
 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)
 {
     size_t outl = 0;
     unsigned char mac[SHA256_DIGEST_LENGTH];
@@ -71,7 +71,7 @@ int ossl_quic_srt_gen_calculate_token(QUIC_SRT_GEN *srt_gen,
         return 0;
 
     if (!EVP_MAC_update(srt_gen->mac_ctx, (const unsigned char *)dcid->id,
-                        dcid->id_len))
+            dcid->id_len))
         return 0;
 
     if (!EVP_MAC_final(srt_gen->mac_ctx, mac, &outl, sizeof(mac))
diff --git a/ssl/quic/quic_srtm.c b/ssl/quic/quic_srtm.c
index 3d0bfd97c7e0b..405376fc465d6 100644
--- a/ssl/quic/quic_srtm.c
+++ b/ssl/quic/quic_srtm.c
@@ -19,7 +19,7 @@
  */
 typedef struct srtm_item_st SRTM_ITEM;
 
-#define BLINDED_SRT_LEN     16
+#define BLINDED_SRT_LEN 16
 
 DEFINE_LHASH_OF_EX(SRTM_ITEM);
 
@@ -40,30 +40,30 @@ DEFINE_LHASH_OF_EX(SRTM_ITEM);
  * all connections for that QUIC_PORT.
  */
 struct srtm_item_st {
-    SRTM_ITEM                   *next_by_srt_blinded; /* SORT BY opaque  DESC */
-    SRTM_ITEM                   *next_by_seq_num;     /* SORT BY seq_num DESC */
-    void                        *opaque; /* \__ unique identity for item */
-    uint64_t                    seq_num; /* /                            */
-    QUIC_STATELESS_RESET_TOKEN  srt;
-    unsigned char               srt_blinded[BLINDED_SRT_LEN]; /* H(srt) */
+    SRTM_ITEM *next_by_srt_blinded; /* SORT BY opaque  DESC */
+    SRTM_ITEM *next_by_seq_num; /* SORT BY seq_num DESC */
+    void *opaque; /* \__ unique identity for item */
+    uint64_t seq_num; /* /                            */
+    QUIC_STATELESS_RESET_TOKEN srt;
+    unsigned char srt_blinded[BLINDED_SRT_LEN]; /* H(srt) */
 
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-    uint32_t                    debug_token;
+    uint32_t debug_token;
 #endif
 };
 
 struct quic_srtm_st {
     /* Crypto context used to calculate blinded SRTs H(srt). */
-    EVP_CIPHER_CTX              *blind_ctx; /* kept with key */
+    EVP_CIPHER_CTX *blind_ctx; /* kept with key */
 
-    LHASH_OF(SRTM_ITEM)         *items_fwd; /* (opaque)  -> SRTM_ITEM */
-    LHASH_OF(SRTM_ITEM)         *items_rev; /* (H(srt))  -> SRTM_ITEM */
+    LHASH_OF(SRTM_ITEM) *items_fwd; /* (opaque)  -> SRTM_ITEM */
+    LHASH_OF(SRTM_ITEM) *items_rev; /* (H(srt))  -> SRTM_ITEM */
 
     /*
      * Monotonically transitions to 1 in event of allocation failure. The only
      * valid operation on such an object is to free it.
      */
-    unsigned int                alloc_failed : 1;
+    unsigned int alloc_failed : 1;
 };
 
 static unsigned long items_fwd_hash(const SRTM_ITEM *item)
@@ -184,11 +184,11 @@ void ossl_quic_srtm_free(QUIC_SRTM *srtm)
  * the first item.
  */
 static SRTM_ITEM *srtm_find(QUIC_SRTM *srtm, void *opaque, uint64_t seq_num,
-                            SRTM_ITEM **head_p, SRTM_ITEM **prev_p)
+    SRTM_ITEM **head_p, SRTM_ITEM **prev_p)
 {
     SRTM_ITEM key, *item = NULL, *prev = NULL;
 
-    key.opaque  = opaque;
+    key.opaque = opaque;
 
     item = lh_SRTM_ITEM_retrieve(srtm->items_fwd, &key);
     if (head_p != NULL)
@@ -260,7 +260,7 @@ static void sorted_insert_srt(SRTM_ITEM *head, SRTM_ITEM *item, SRTM_ITEM **new_
  * is formed.
  */
 static int srtm_compute_blinded(QUIC_SRTM *srtm, SRTM_ITEM *item,
-                                const QUIC_STATELESS_RESET_TOKEN *token)
+    const QUIC_STATELESS_RESET_TOKEN *token)
 {
     int outl = 0;
 
@@ -270,7 +270,7 @@ static int srtm_compute_blinded(QUIC_SRTM *srtm, SRTM_ITEM *item,
      * block.
      */
     if (!EVP_EncryptUpdate(srtm->blind_ctx, item->srt_blinded, &outl,
-                           (const unsigned char *)token, sizeof(*token)))
+            (const unsigned char *)token, sizeof(*token)))
         return 0;
 
     if (!ossl_assert(outl == sizeof(*token)))
@@ -280,7 +280,7 @@ static int srtm_compute_blinded(QUIC_SRTM *srtm, SRTM_ITEM *item,
 }
 
 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)
 {
     SRTM_ITEM *item = NULL, *head = NULL, *new_head, *r_item;
 
@@ -294,9 +294,9 @@ int ossl_quic_srtm_add(QUIC_SRTM *srtm, void *opaque, uint64_t seq_num,
     if ((item = OPENSSL_zalloc(sizeof(*item))) == NULL)
         return 0;
 
-    item->opaque    = opaque;
-    item->seq_num   = seq_num;
-    item->srt       = *token;
+    item->opaque = opaque;
+    item->seq_num = seq_num;
+    item->srt = *token;
     if (!srtm_compute_blinded(srtm, item, &item->srt)) {
         OPENSSL_free(item);
         return 0;
@@ -369,7 +369,8 @@ static int srtm_remove_from_rev(QUIC_SRTM *srtm, SRTM_ITEM *item)
     } else {
         /* Find our entry in the SRT list */
         for (; rh_item->next_by_srt_blinded != item;
-               rh_item = rh_item->next_by_srt_blinded);
+            rh_item = rh_item->next_by_srt_blinded)
+            ;
         rh_item->next_by_srt_blinded = item->next_by_srt_blinded;
     }
 
@@ -439,9 +440,9 @@ int ossl_quic_srtm_cull(QUIC_SRTM *srtm, void *opaque)
 }
 
 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)
 {
     SRTM_ITEM key, *item;
 
@@ -452,14 +453,15 @@ int ossl_quic_srtm_lookup(QUIC_SRTM *srtm,
         return 0;
 
     item = lh_SRTM_ITEM_retrieve(srtm->items_rev, &key);
-    for (; idx > 0 && item != NULL; --idx, item = item->next_by_srt_blinded);
+    for (; idx > 0 && item != NULL; --idx, item = item->next_by_srt_blinded)
+        ;
     if (item == NULL)
         return 0;
 
     if (opaque != NULL)
-        *opaque     = item->opaque;
+        *opaque = item->opaque;
     if (seq_num != NULL)
-        *seq_num    = item->seq_num;
+        *seq_num = item->seq_num;
 
     return 1;
 }
@@ -471,7 +473,7 @@ static size_t tokens_seen;
 
 struct check_args {
     uint32_t token;
-    int      mode;
+    int mode;
 };
 
 static void check_mark(SRTM_ITEM *item, void *arg)
@@ -493,7 +495,7 @@ static void check_mark(SRTM_ITEM *item, void *arg)
 
         ++tokens_seen;
         item->debug_token = token;
-        prev_opaque  = item->opaque;
+        prev_opaque = item->opaque;
         prev_seq_num = item->seq_num;
         have_prev = 1;
 
@@ -527,7 +529,7 @@ static void check_count(SRTM_ITEM *item, void *arg)
 void ossl_quic_srtm_check(const QUIC_SRTM *srtm)
 {
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-    struct check_args args = {0};
+    struct check_args args = { 0 };
     size_t tokens_expected, tokens_expected_old;
 
     args.token = token_next;
diff --git a/ssl/quic/quic_sstream.c b/ssl/quic/quic_sstream.c
index 1f0b5497fce55..dd5ab13fb95a2 100644
--- a/ssl/quic/quic_sstream.c
+++ b/ssl/quic/quic_sstream.c
@@ -43,16 +43,16 @@ struct quic_sstream_st {
      *
      * Invariant: No logical byte is ever in both new_set and acked_set.
      */
-    UINT_SET        new_set, acked_set;
+    UINT_SET new_set, acked_set;
 
     /*
      * The current size of the stream is ring_buf.head_offset. If
      * have_final_size is true, this is also the final size of the stream.
      */
-    unsigned int    have_final_size     : 1;
-    unsigned int    sent_final_size     : 1;
-    unsigned int    acked_final_size    : 1;
-    unsigned int    cleanse             : 1;
+    unsigned int have_final_size : 1;
+    unsigned int sent_final_size : 1;
+    unsigned int acked_final_size : 1;
+    unsigned int cleanse : 1;
 };
 
 static void qss_cull(QUIC_SSTREAM *qss);
@@ -89,10 +89,10 @@ void ossl_quic_sstream_free(QUIC_SSTREAM *qss)
 }
 
 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)
 {
     size_t num_iov_ = 0, src_len = 0, total_len = 0, i;
     uint64_t max_len;
@@ -115,9 +115,9 @@ int ossl_quic_sstream_get_stream_frame(QUIC_SSTREAM *qss,
             return 0;
 
         hdr->offset = qss->ring_buf.head_offset;
-        hdr->len    = 0;
+        hdr->len = 0;
         hdr->is_fin = 1;
-        *num_iov    = 0;
+        *num_iov = 0;
         return 1;
     }
 
@@ -135,8 +135,8 @@ int ossl_quic_sstream_get_stream_frame(QUIC_SSTREAM *qss,
             break;
 
         if (!ring_buf_get_buf_at(&qss->ring_buf,
-                                 range->range.start + total_len,
-                                 &src, &src_len))
+                range->range.start + total_len,
+                &src, &src_len))
             return 0;
 
         if (src_len == 0)
@@ -147,19 +147,19 @@ int ossl_quic_sstream_get_stream_frame(QUIC_SSTREAM *qss,
         if (total_len + src_len > max_len)
             src_len = (size_t)(max_len - total_len);
 
-        iov[num_iov_].buf       = src;
-        iov[num_iov_].buf_len   = src_len;
+        iov[num_iov_].buf = src;
+        iov[num_iov_].buf_len = src_len;
 
         total_len += src_len;
         ++num_iov_;
     }
 
     hdr->offset = range->range.start;
-    hdr->len    = total_len;
+    hdr->len = total_len;
     hdr->is_fin = qss->have_final_size
         && hdr->offset + hdr->len == qss->ring_buf.head_offset;
 
-    *num_iov    = num_iov_;
+    *num_iov = num_iov_;
     return 1;
 }
 
@@ -178,13 +178,13 @@ uint64_t ossl_quic_sstream_get_cur_size(QUIC_SSTREAM *qss)
 }
 
 int ossl_quic_sstream_mark_transmitted(QUIC_SSTREAM *qss,
-                                       uint64_t start,
-                                       uint64_t end)
+    uint64_t start,
+    uint64_t end)
 {
     UINT_RANGE r;
 
     r.start = start;
-    r.end   = end;
+    r.end = end;
 
     if (!ossl_uint_set_remove(&qss->new_set, &r))
         return 0;
@@ -193,7 +193,7 @@ int ossl_quic_sstream_mark_transmitted(QUIC_SSTREAM *qss,
 }
 
 int ossl_quic_sstream_mark_transmitted_fin(QUIC_SSTREAM *qss,
-                                           uint64_t final_size)
+    uint64_t final_size)
 {
     /*
      * We do not really need final_size since we already know the size of the
@@ -207,12 +207,12 @@ int ossl_quic_sstream_mark_transmitted_fin(QUIC_SSTREAM *qss,
 }
 
 int ossl_quic_sstream_mark_lost(QUIC_SSTREAM *qss,
-                                uint64_t start,
-                                uint64_t end)
+    uint64_t start,
+    uint64_t end)
 {
     UINT_RANGE r;
     r.start = start;
-    r.end   = end;
+    r.end = end;
 
     /*
      * We lost a range of stream data bytes, so reinsert them into the new set,
@@ -236,12 +236,12 @@ int ossl_quic_sstream_mark_lost_fin(QUIC_SSTREAM *qss)
 }
 
 int ossl_quic_sstream_mark_acked(QUIC_SSTREAM *qss,
-                                 uint64_t start,
-                                 uint64_t end)
+    uint64_t start,
+    uint64_t end)
 {
     UINT_RANGE r;
     r.start = start;
-    r.end   = end;
+    r.end = end;
 
     if (!ossl_uint_set_insert(&qss->acked_set, &r))
         return 0;
@@ -280,9 +280,9 @@ int ossl_quic_sstream_get_final_size(QUIC_SSTREAM *qss, uint64_t *final_size)
 }
 
 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)
 {
     size_t l, consumed_ = 0;
     UINT_RANGE r;
@@ -309,14 +309,14 @@ int ossl_quic_sstream_append(QUIC_SSTREAM *qss,
         if (l == 0)
             break;
 
-        buf         += l;
-        buf_len     -= l;
-        consumed_   += l;
+        buf += l;
+        buf_len -= l;
+        consumed_ += l;
     }
 
     if (consumed_ > 0) {
         r.start = old_ring_buf.head_offset;
-        r.end   = r.start + consumed_ - 1;
+        r.end = r.start + consumed_ - 1;
         assert(r.end + 1 == qss->ring_buf.head_offset);
         if (!ossl_uint_set_insert(&qss->new_set, &r)) {
             qss->ring_buf = old_ring_buf;
@@ -351,7 +351,7 @@ static void qss_cull(QUIC_SSTREAM *qss)
      */
     if (h != NULL)
         ring_buf_cpop_range(&qss->ring_buf, h->range.start, h->range.end,
-                            qss->cleanse);
+            qss->cleanse);
 }
 
 int ossl_quic_sstream_set_buffer_size(QUIC_SSTREAM *qss, size_t num_bytes)
@@ -401,8 +401,8 @@ int ossl_quic_sstream_is_totally_acked(QUIC_SSTREAM *qss)
 }
 
 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)
 {
     size_t running = 0, i, iovlen;
 
diff --git a/ssl/quic/quic_statm.c b/ssl/quic/quic_statm.c
index f1e0f65914117..1e8ba0e2d1970 100644
--- a/ssl/quic/quic_statm.c
+++ b/ssl/quic/quic_statm.c
@@ -10,8 +10,8 @@
 #include "internal/quic_statm.h"
 
 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)
 {
     OSSL_TIME adjusted_rtt, latest_rtt = override_latest_rtt;
 
@@ -22,10 +22,10 @@ void ossl_statm_update_rtt(OSSL_STATM *statm,
         statm->latest_rtt = latest_rtt;
 
     if (!statm->have_first_sample) {
-        statm->min_rtt              = latest_rtt;
-        statm->smoothed_rtt         = latest_rtt;
-        statm->rtt_variance         = ossl_time_divide(latest_rtt, 2);
-        statm->have_first_sample    = 1;
+        statm->min_rtt = latest_rtt;
+        statm->smoothed_rtt = latest_rtt;
+        statm->rtt_variance = ossl_time_divide(latest_rtt, 2);
+        statm->have_first_sample = 1;
         return;
     }
 
@@ -43,22 +43,24 @@ void ossl_statm_update_rtt(OSSL_STATM *statm,
         adjusted_rtt = ossl_time_subtract(latest_rtt, ack_delay);
 
     statm->rtt_variance = ossl_time_divide(ossl_time_add(ossl_time_multiply(statm->rtt_variance, 3),
-                                                         ossl_time_abs_difference(statm->smoothed_rtt,
-                                                                              adjusted_rtt)), 4);
+                                               ossl_time_abs_difference(statm->smoothed_rtt,
+                                                   adjusted_rtt)),
+        4);
     statm->smoothed_rtt = ossl_time_divide(ossl_time_add(ossl_time_multiply(statm->smoothed_rtt, 7),
-                                                         adjusted_rtt), 8);
+                                               adjusted_rtt),
+        8);
 }
 
 /* RFC 9002 kInitialRtt value. RFC recommended value. */
-#define K_INITIAL_RTT               ossl_ms2time(333)
+#define K_INITIAL_RTT ossl_ms2time(333)
 
 int ossl_statm_init(OSSL_STATM *statm)
 {
-    statm->smoothed_rtt             = K_INITIAL_RTT;
-    statm->latest_rtt               = ossl_time_zero();
-    statm->min_rtt                  = ossl_time_infinite();
-    statm->rtt_variance             = ossl_time_divide(K_INITIAL_RTT, 2);
-    statm->have_first_sample        = 0;
+    statm->smoothed_rtt = K_INITIAL_RTT;
+    statm->latest_rtt = ossl_time_zero();
+    statm->min_rtt = ossl_time_infinite();
+    statm->rtt_variance = ossl_time_divide(K_INITIAL_RTT, 2);
+    statm->have_first_sample = 0;
     return 1;
 }
 
@@ -69,8 +71,8 @@ void ossl_statm_destroy(OSSL_STATM *statm)
 
 void ossl_statm_get_rtt_info(OSSL_STATM *statm, OSSL_RTT_INFO *rtt_info)
 {
-    rtt_info->min_rtt           = statm->min_rtt;
-    rtt_info->latest_rtt        = statm->latest_rtt;
-    rtt_info->smoothed_rtt      = statm->smoothed_rtt;
-    rtt_info->rtt_variance      = statm->rtt_variance;
+    rtt_info->min_rtt = statm->min_rtt;
+    rtt_info->latest_rtt = statm->latest_rtt;
+    rtt_info->smoothed_rtt = statm->smoothed_rtt;
+    rtt_info->rtt_variance = statm->rtt_variance;
 }
diff --git a/ssl/quic/quic_stream_map.c b/ssl/quic/quic_stream_map.c
index 64700b09d95e0..ae6a0a01e983a 100644
--- a/ssl/quic/quic_stream_map.c
+++ b/ssl/quic/quic_stream_map.c
@@ -1,11 +1,11 @@
 /*
-* Copyright 2022-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 2022-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
+ */
 
 #include "internal/quic_stream_map.h"
 #include "internal/nelem.h"
@@ -20,11 +20,11 @@ static void shutdown_flush_done(QUIC_STREAM_MAP *qsm, QUIC_STREAM *qs);
 
 /* Circular list management. */
 static void list_insert_tail(QUIC_STREAM_LIST_NODE *l,
-                             QUIC_STREAM_LIST_NODE *n)
+    QUIC_STREAM_LIST_NODE *n)
 {
     /* Must not be in list. */
     assert(n->prev == NULL && n->next == NULL
-           && l->prev != NULL && l->next != NULL);
+        && l->prev != NULL && l->next != NULL);
 
     n->prev = l->prev;
     n->prev->next = n;
@@ -33,10 +33,10 @@ static void list_insert_tail(QUIC_STREAM_LIST_NODE *l,
 }
 
 static void list_remove(QUIC_STREAM_LIST_NODE *l,
-                        QUIC_STREAM_LIST_NODE *n)
+    QUIC_STREAM_LIST_NODE *n)
 {
     assert(n->prev != NULL && n->next != NULL
-           && n->prev != n && n->next != n);
+        && n->prev != n && n->next != n);
 
     n->prev->next = n->next;
     n->next->prev = n->prev;
@@ -44,11 +44,11 @@ static void list_remove(QUIC_STREAM_LIST_NODE *l,
 }
 
 static QUIC_STREAM *list_next(QUIC_STREAM_LIST_NODE *l, QUIC_STREAM_LIST_NODE *n,
-                              size_t off)
+    size_t off)
 {
     assert(n->prev != NULL && n->next != NULL
-           && (n == l || (n->prev != n && n->next != n))
-           && l->prev != NULL && l->next != NULL);
+        && (n == l || (n->prev != n && n->next != n))
+        && l->prev != NULL && l->next != NULL);
 
     n = n->next;
 
@@ -62,16 +62,14 @@ static QUIC_STREAM *list_next(QUIC_STREAM_LIST_NODE *l, QUIC_STREAM_LIST_NODE *n
     return (QUIC_STREAM *)(((char *)n) - off);
 }
 
-#define active_next(l, s)       list_next((l), &(s)->active_node, \
-                                          offsetof(QUIC_STREAM, active_node))
-#define accept_next(l, s)       list_next((l), &(s)->accept_node, \
-                                          offsetof(QUIC_STREAM, accept_node))
-#define ready_for_gc_next(l, s) list_next((l), &(s)->ready_for_gc_node, \
-                                          offsetof(QUIC_STREAM, ready_for_gc_node))
-#define accept_head(l)          list_next((l), (l), \
-                                          offsetof(QUIC_STREAM, accept_node))
-#define ready_for_gc_head(l)    list_next((l), (l), \
-                                          offsetof(QUIC_STREAM, ready_for_gc_node))
+#define active_next(l, s) list_next((l), &(s)->active_node, \
+    offsetof(QUIC_STREAM, active_node))
+#define accept_next(l, s) list_next((l), &(s)->accept_node, \
+    offsetof(QUIC_STREAM, accept_node))
+#define accept_head(l) list_next((l), (l), \
+    offsetof(QUIC_STREAM, accept_node))
+#define ready_for_gc_head(l) list_next((l), (l), \
+    offsetof(QUIC_STREAM, ready_for_gc_node))
 
 static unsigned long hash_stream(const QUIC_STREAM *s)
 {
@@ -88,11 +86,11 @@ static int cmp_stream(const QUIC_STREAM *a, const QUIC_STREAM *b)
 }
 
 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)
 {
     qsm->map = lh_QUIC_STREAM_new(hash_stream, cmp_stream);
     qsm->active_list.prev = qsm->active_list.next = &qsm->active_list;
@@ -100,18 +98,18 @@ int ossl_quic_stream_map_init(QUIC_STREAM_MAP *qsm,
     qsm->ready_for_gc_list.prev = qsm->ready_for_gc_list.next
         = &qsm->ready_for_gc_list;
     qsm->rr_stepping = 1;
-    qsm->rr_counter  = 0;
-    qsm->rr_cur      = NULL;
+    qsm->rr_counter = 0;
+    qsm->rr_cur = NULL;
 
-    qsm->num_accept_bidi    = 0;
-    qsm->num_accept_uni     = 0;
+    qsm->num_accept_bidi = 0;
+    qsm->num_accept_uni = 0;
     qsm->num_shutdown_flush = 0;
 
-    qsm->get_stream_limit_cb        = get_stream_limit_cb;
-    qsm->get_stream_limit_cb_arg    = get_stream_limit_cb_arg;
-    qsm->max_streams_bidi_rxfc      = max_streams_bidi_rxfc;
-    qsm->max_streams_uni_rxfc       = max_streams_uni_rxfc;
-    qsm->is_server                  = is_server;
+    qsm->get_stream_limit_cb = get_stream_limit_cb;
+    qsm->get_stream_limit_cb_arg = get_stream_limit_cb_arg;
+    qsm->max_streams_bidi_rxfc = max_streams_bidi_rxfc;
+    qsm->max_streams_uni_rxfc = max_streams_uni_rxfc;
+    qsm->is_server = is_server;
     return 1;
 }
 
@@ -131,15 +129,15 @@ void ossl_quic_stream_map_cleanup(QUIC_STREAM_MAP *qsm)
 }
 
 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)
 {
     lh_QUIC_STREAM_doall_arg(qsm->map, visit_cb, visit_cb_arg);
 }
 
 QUIC_STREAM *ossl_quic_stream_map_alloc(QUIC_STREAM_MAP *qsm,
-                                        uint64_t stream_id,
-                                        int type)
+    uint64_t stream_id,
+    int type)
 {
     QUIC_STREAM *s;
     QUIC_STREAM key;
@@ -154,19 +152,19 @@ QUIC_STREAM *ossl_quic_stream_map_alloc(QUIC_STREAM_MAP *qsm,
     if (s == NULL)
         return NULL;
 
-    s->id           = stream_id;
-    s->type         = type;
-    s->as_server    = qsm->is_server;
-    s->send_state   = (ossl_quic_stream_is_local_init(s)
-                       || ossl_quic_stream_is_bidi(s))
+    s->id = stream_id;
+    s->type = type;
+    s->as_server = qsm->is_server;
+    s->send_state = (ossl_quic_stream_is_local_init(s)
+                        || ossl_quic_stream_is_bidi(s))
         ? QUIC_SSTREAM_STATE_READY
         : QUIC_SSTREAM_STATE_NONE;
-    s->recv_state   = (!ossl_quic_stream_is_local_init(s)
-                       || ossl_quic_stream_is_bidi(s))
+    s->recv_state = (!ossl_quic_stream_is_local_init(s)
+                        || ossl_quic_stream_is_bidi(s))
         ? QUIC_RSTREAM_STATE_RECV
         : QUIC_RSTREAM_STATE_NONE;
 
-    s->send_final_size  = UINT64_MAX;
+    s->send_final_size = UINT64_MAX;
 
     lh_QUIC_STREAM_insert(qsm->map, s);
     return s;
@@ -195,7 +193,7 @@ void ossl_quic_stream_map_release(QUIC_STREAM_MAP *qsm, QUIC_STREAM *stream)
 }
 
 QUIC_STREAM *ossl_quic_stream_map_get_by_id(QUIC_STREAM_MAP *qsm,
-                                            uint64_t stream_id)
+    uint64_t stream_id)
 {
     QUIC_STREAM key;
 
@@ -235,7 +233,7 @@ static void stream_map_mark_inactive(QUIC_STREAM_MAP *qsm, QUIC_STREAM *s)
 void ossl_quic_stream_map_set_rr_stepping(QUIC_STREAM_MAP *qsm, size_t stepping)
 {
     qsm->rr_stepping = stepping;
-    qsm->rr_counter  = 0;
+    qsm->rr_counter = 0;
 }
 
 static int stream_has_data_to_send(QUIC_STREAM *s)
@@ -267,12 +265,12 @@ static int stream_has_data_to_send(QUIC_STREAM *s)
      */
     num_iov = OSSL_NELEM(iov);
     if (!ossl_quic_sstream_get_stream_frame(s->sstream, 0, &shdr, iov,
-                                            &num_iov))
+            &num_iov))
         return 0;
 
     fc_credit = ossl_quic_txfc_get_credit(&s->txfc, 0);
-    fc_swm    = ossl_quic_txfc_get_swm(&s->txfc);
-    fc_limit  = fc_swm + fc_credit;
+    fc_swm = ossl_quic_txfc_get_swm(&s->txfc);
+    fc_limit = fc_swm + fc_credit;
 
     return (shdr.is_fin && shdr.len == 0) || shdr.offset < fc_limit;
 }
@@ -298,12 +296,11 @@ static int qsm_ready_for_gc(QUIC_STREAM_MAP *qsm, QUIC_STREAM *qs)
      * we don't need to worry about that here.
      */
     assert(!qs->deleted
-           || !ossl_quic_stream_has_send(qs)
-           || ossl_quic_stream_send_is_reset(qs)
-           || ossl_quic_stream_send_get_final_size(qs, NULL));
+        || !ossl_quic_stream_has_send(qs)
+        || ossl_quic_stream_send_is_reset(qs)
+        || ossl_quic_stream_send_get_final_size(qs, NULL));
 
-    return
-        qs->deleted
+    return qs->deleted
         && (!ossl_quic_stream_has_recv(qs)
             || recv_stream_fully_drained
             || qs->acked_stop_sending)
@@ -313,8 +310,8 @@ static int qsm_ready_for_gc(QUIC_STREAM_MAP *qsm, QUIC_STREAM *qs)
 }
 
 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)
 {
     uint64_t stream_limit;
 
@@ -335,16 +332,16 @@ void ossl_quic_stream_map_update_state(QUIC_STREAM_MAP *qsm, QUIC_STREAM *s)
 
         allowed_by_stream_limit
             = ossl_quic_stream_map_is_local_allowed_by_stream_limit(qsm,
-                                                                    stream_ordinal,
-                                                                    is_uni);
+                stream_ordinal,
+                is_uni);
     }
 
     if (s->send_state == QUIC_SSTREAM_STATE_DATA_SENT
         && ossl_quic_sstream_is_totally_acked(s->sstream))
         ossl_quic_stream_map_notify_totally_acked(qsm, s);
     else if (s->shutdown_flush
-             && s->send_state == QUIC_SSTREAM_STATE_SEND
-             && ossl_quic_sstream_is_totally_acked(s->sstream))
+        && s->send_state == QUIC_SSTREAM_STATE_SEND
+        && ossl_quic_sstream_is_totally_acked(s->sstream))
         shutdown_flush_done(qsm, s);
 
     if (!s->ready_for_gc) {
@@ -357,10 +354,10 @@ void ossl_quic_stream_map_update_state(QUIC_STREAM_MAP *qsm, QUIC_STREAM *s)
         = allowed_by_stream_limit
         && !s->ready_for_gc
         && ((ossl_quic_stream_has_recv(s)
-             && !ossl_quic_stream_recv_is_reset(s)
-             && (s->recv_state == QUIC_RSTREAM_STATE_RECV
-                 && (s->want_max_stream_data
-                     || ossl_quic_rxfc_has_cwm_changed(&s->rxfc, 0))))
+                && !ossl_quic_stream_recv_is_reset(s)
+                && (s->recv_state == QUIC_RSTREAM_STATE_RECV
+                    && (s->want_max_stream_data
+                        || ossl_quic_rxfc_has_cwm_changed(&s->rxfc, 0))))
             || s->want_stop_sending
             || s->want_reset_stream
             || (!s->peer_stop_sending && stream_has_data_to_send(s)));
@@ -377,7 +374,7 @@ void ossl_quic_stream_map_update_state(QUIC_STREAM_MAP *qsm, QUIC_STREAM *s)
  */
 
 int ossl_quic_stream_map_ensure_send_part_id(QUIC_STREAM_MAP *qsm,
-                                             QUIC_STREAM *qs)
+    QUIC_STREAM *qs)
 {
     switch (qs->send_state) {
     case QUIC_SSTREAM_STATE_NONE:
@@ -399,7 +396,7 @@ int ossl_quic_stream_map_ensure_send_part_id(QUIC_STREAM_MAP *qsm,
 }
 
 int ossl_quic_stream_map_notify_all_data_sent(QUIC_STREAM_MAP *qsm,
-                                              QUIC_STREAM *qs)
+    QUIC_STREAM *qs)
 {
     switch (qs->send_state) {
     default:
@@ -428,7 +425,7 @@ static void shutdown_flush_done(QUIC_STREAM_MAP *qsm, QUIC_STREAM *qs)
 }
 
 int ossl_quic_stream_map_notify_totally_acked(QUIC_STREAM_MAP *qsm,
-                                              QUIC_STREAM *qs)
+    QUIC_STREAM *qs)
 {
     switch (qs->send_state) {
     default:
@@ -449,8 +446,8 @@ int ossl_quic_stream_map_notify_totally_acked(QUIC_STREAM_MAP *qsm,
 }
 
 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)
 {
     switch (qs->send_state) {
     default:
@@ -488,9 +485,9 @@ int ossl_quic_stream_map_reset_stream_send_part(QUIC_STREAM_MAP *qsm,
 
         /* FALLTHROUGH */
     case QUIC_SSTREAM_STATE_DATA_SENT:
-        qs->reset_stream_aec    = aec;
-        qs->want_reset_stream   = 1;
-        qs->send_state          = QUIC_SSTREAM_STATE_RESET_SENT;
+        qs->reset_stream_aec = aec;
+        qs->want_reset_stream = 1;
+        qs->send_state = QUIC_SSTREAM_STATE_RESET_SENT;
 
         ossl_quic_sstream_free(qs->sstream);
         qs->sstream = NULL;
@@ -510,14 +507,14 @@ int ossl_quic_stream_map_reset_stream_send_part(QUIC_STREAM_MAP *qsm,
 }
 
 int ossl_quic_stream_map_notify_reset_stream_acked(QUIC_STREAM_MAP *qsm,
-                                                   QUIC_STREAM *qs)
+    QUIC_STREAM *qs)
 {
     switch (qs->send_state) {
     default:
         /* Wrong state - caller error. */
     case QUIC_SSTREAM_STATE_NONE:
         /* Stream without send part - caller error. */
-         return 0;
+        return 0;
 
     case QUIC_SSTREAM_STATE_RESET_SENT:
         qs->send_state = QUIC_SSTREAM_STATE_RESET_RECVD;
@@ -535,8 +532,8 @@ int ossl_quic_stream_map_notify_reset_stream_acked(QUIC_STREAM_MAP *qsm,
  */
 
 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)
 {
     switch (qs->recv_state) {
     default:
@@ -552,7 +549,7 @@ int ossl_quic_stream_map_notify_size_known_recv_part(QUIC_STREAM_MAP *qsm,
 }
 
 int ossl_quic_stream_map_notify_totally_received(QUIC_STREAM_MAP *qsm,
-                                                 QUIC_STREAM *qs)
+    QUIC_STREAM *qs)
 {
     switch (qs->recv_state) {
     default:
@@ -562,14 +559,14 @@ int ossl_quic_stream_map_notify_totally_received(QUIC_STREAM_MAP *qsm,
         return 0;
 
     case QUIC_RSTREAM_STATE_SIZE_KNOWN:
-        qs->recv_state          = QUIC_RSTREAM_STATE_DATA_RECVD;
-        qs->want_stop_sending   = 0;
+        qs->recv_state = QUIC_RSTREAM_STATE_DATA_RECVD;
+        qs->want_stop_sending = 0;
         return 1;
     }
 }
 
 int ossl_quic_stream_map_notify_totally_read(QUIC_STREAM_MAP *qsm,
-                                             QUIC_STREAM *qs)
+    QUIC_STREAM *qs)
 {
     switch (qs->recv_state) {
     default:
@@ -589,9 +586,9 @@ int ossl_quic_stream_map_notify_totally_read(QUIC_STREAM_MAP *qsm,
 }
 
 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)
 {
     uint64_t prev_final_size;
 
@@ -609,11 +606,11 @@ int ossl_quic_stream_map_notify_reset_recv_part(QUIC_STREAM_MAP *qsm,
             /* Cannot change previous final size. */
             return 0;
 
-        qs->recv_state              = QUIC_RSTREAM_STATE_RESET_RECVD;
-        qs->peer_reset_stream_aec   = app_error_code;
+        qs->recv_state = QUIC_RSTREAM_STATE_RESET_RECVD;
+        qs->peer_reset_stream_aec = app_error_code;
 
         /* RFC 9000 s. 3.3: No point sending STOP_SENDING if already reset. */
-        qs->want_stop_sending       = 0;
+        qs->want_stop_sending = 0;
 
         /* QUIC_RSTREAM is no longer needed */
         ossl_quic_rstream_free(qs->rstream);
@@ -635,7 +632,7 @@ int ossl_quic_stream_map_notify_reset_recv_part(QUIC_STREAM_MAP *qsm,
 }
 
 int ossl_quic_stream_map_notify_app_read_reset_recv_part(QUIC_STREAM_MAP *qsm,
-                                                         QUIC_STREAM *qs)
+    QUIC_STREAM *qs)
 {
     switch (qs->recv_state) {
     default:
@@ -651,8 +648,8 @@ int ossl_quic_stream_map_notify_app_read_reset_recv_part(QUIC_STREAM_MAP *qsm,
 }
 
 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)
 {
     if (qs->stop_sending)
         return 0;
@@ -690,8 +687,8 @@ int ossl_quic_stream_map_stop_sending_recv_part(QUIC_STREAM_MAP *qsm,
         break;
     }
 
-    qs->stop_sending        = 1;
-    qs->stop_sending_aec    = aec;
+    qs->stop_sending = 1;
+    qs->stop_sending_aec = aec;
     return ossl_quic_stream_map_schedule_stop_sending(qsm, qs);
 }
 
@@ -735,7 +732,7 @@ QUIC_STREAM *ossl_quic_stream_map_peek_accept_queue(QUIC_STREAM_MAP *qsm)
 }
 
 void ossl_quic_stream_map_push_accept_queue(QUIC_STREAM_MAP *qsm,
-                                            QUIC_STREAM *s)
+    QUIC_STREAM *s)
 {
     list_insert_tail(&qsm->accept_list, &s->accept_node);
     if (ossl_quic_stream_is_bidi(s))
@@ -752,8 +749,8 @@ static QUIC_RXFC *qsm_get_max_streams_rxfc(QUIC_STREAM_MAP *qsm, QUIC_STREAM *s)
 }
 
 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)
 {
     QUIC_RXFC *max_streams_rxfc;
 
@@ -780,15 +777,10 @@ size_t ossl_quic_stream_map_get_total_accept_queue_len(QUIC_STREAM_MAP *qsm)
 
 void ossl_quic_stream_map_gc(QUIC_STREAM_MAP *qsm)
 {
-    QUIC_STREAM *qs, *qs_head, *qsn = NULL;
-
-    for (qs = qs_head = ready_for_gc_head(&qsm->ready_for_gc_list);
-         qs != NULL && qs != qs_head;
-         qs = qsn)
-    {
-         qsn = ready_for_gc_next(&qsm->ready_for_gc_list, qs);
+    QUIC_STREAM *qs;
 
-         ossl_quic_stream_map_release(qsm, qs);
+    while ((qs = ready_for_gc_head(&qsm->ready_for_gc_list)) != NULL) {
+        ossl_quic_stream_map_release(qsm, qs);
     }
 }
 
@@ -839,14 +831,14 @@ int ossl_quic_stream_map_is_shutdown_flush_finished(QUIC_STREAM_MAP *qsm)
  * ====================
  */
 void ossl_quic_stream_iter_init(QUIC_STREAM_ITER *it, QUIC_STREAM_MAP *qsm,
-                                int advance_rr)
+    int advance_rr)
 {
-    it->qsm    = qsm;
+    it->qsm = qsm;
     it->stream = it->first_stream = qsm->rr_cur;
     if (advance_rr && it->stream != NULL
         && ++qsm->rr_counter >= qsm->rr_stepping) {
         qsm->rr_counter = 0;
-        qsm->rr_cur     = active_next(&qsm->active_list, qsm->rr_cur);
+        qsm->rr_cur = active_next(&qsm->active_list, qsm->rr_cur);
     }
 }
 
diff --git a/ssl/quic/quic_thread_assist.c b/ssl/quic/quic_thread_assist.c
index 5315bf1662c61..d875e3ad0f239 100644
--- a/ssl/quic/quic_thread_assist.c
+++ b/ssl/quic/quic_thread_assist.c
@@ -64,23 +64,23 @@ static unsigned int assist_thread_main(void *arg)
 }
 
 int ossl_quic_thread_assist_init_start(QUIC_THREAD_ASSIST *qta,
-                                       QUIC_CHANNEL *ch)
+    QUIC_CHANNEL *ch)
 {
     CRYPTO_MUTEX *mutex = ossl_quic_channel_get_mutex(ch);
 
     if (mutex == NULL)
         return 0;
 
-    qta->ch         = ch;
-    qta->teardown   = 0;
-    qta->joined     = 0;
+    qta->ch = ch;
+    qta->teardown = 0;
+    qta->joined = 0;
 
     qta->cv = ossl_crypto_condvar_new();
     if (qta->cv == NULL)
         return 0;
 
     qta->t = ossl_crypto_thread_native_start(assist_thread_main,
-                                             qta, /*joinable=*/1);
+        qta, /*joinable=*/1);
     if (qta->t == NULL) {
         ossl_crypto_condvar_free(&qta->cv);
         return 0;
@@ -131,8 +131,8 @@ int ossl_quic_thread_assist_cleanup(QUIC_THREAD_ASSIST *qta)
     ossl_crypto_condvar_free(&qta->cv);
     ossl_crypto_thread_native_clean(qta->t);
 
-    qta->ch     = NULL;
-    qta->t      = NULL;
+    qta->ch = NULL;
+    qta->t = NULL;
     return 1;
 }
 
diff --git a/ssl/quic/quic_tls.c b/ssl/quic/quic_tls.c
index a48ee923dacba..587685d0b233c 100644
--- a/ssl/quic/quic_tls.c
+++ b/ssl/quic/quic_tls.c
@@ -15,12 +15,14 @@
 #include "internal/quic_types.h"
 #include "internal/ssl_unwrap.h"
 
-#define QUIC_TLS_FATAL(rl, ad, err) \
-    do { \
-        if ((rl) != NULL) (rl)->alert = (ad); \
+#define QUIC_TLS_FATAL(rl, ad, err)    \
+    do {                               \
+        if ((rl) != NULL)              \
+            (rl)->alert = (ad);        \
         ERR_raise(ERR_LIB_SSL, (err)); \
-        if ((rl) != NULL) (rl)->qtls->inerror = 1; \
-    } while(0)
+        if ((rl) != NULL)              \
+            (rl)->qtls->inerror = 1;   \
+    } while (0)
 
 struct quic_tls_st {
     QUIC_TLS_ARGS args;
@@ -95,18 +97,18 @@ static int quic_free(OSSL_RECORD_LAYER *r);
 
 static int
 quic_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 **retrl)
+    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 **retrl)
 {
     OSSL_RECORD_LAYER *rl = OPENSSL_zalloc(sizeof(*rl));
     int qdir;
@@ -177,18 +179,20 @@ quic_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
         if (!ossl_assert("Should not happen" == NULL))
             goto err;
 #endif
+    } else {
+        kdfdigest = NULL;
     }
 
     if (!rl->qtls->args.yield_secret_cb(level, qdir, suite_id,
-                                        (EVP_MD *)kdfdigest, secret, secretlen,
-                                        rl->qtls->args.yield_secret_cb_arg)) {
+            (EVP_MD *)kdfdigest, secret, secretlen,
+            rl->qtls->args.yield_secret_cb_arg)) {
         QUIC_TLS_FATAL(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         EVP_MD_free((EVP_MD *)kdfdigest);
         goto err;
     }
 
     return 1;
- err:
+err:
     *retrl = NULL;
     quic_free(rl);
     return 0;
@@ -232,15 +236,15 @@ static int quic_processed_read_pending(OSSL_RECORD_LAYER *rl)
 }
 
 static size_t quic_get_max_records(OSSL_RECORD_LAYER *rl, uint8_t type,
-                                   size_t len,
-                                   size_t maxfrag, size_t *preffrag)
+    size_t len,
+    size_t maxfrag, size_t *preffrag)
 {
     return 1;
 }
 
 static int quic_write_records(OSSL_RECORD_LAYER *rl,
-                              OSSL_RECORD_TEMPLATE *template,
-                              size_t numtempl)
+    OSSL_RECORD_TEMPLATE *template,
+    size_t numtempl)
 {
     size_t consumed;
     unsigned char alert;
@@ -261,8 +265,8 @@ static int quic_write_records(OSSL_RECORD_LAYER *rl,
          * and manufacture a dummy record header
          */
         dummyrec[0] = (rl->level == OSSL_RECORD_PROTECTION_LEVEL_NONE)
-                        ? template->type
-                        : SSL3_RT_APPLICATION_DATA;
+            ? template->type
+            : SSL3_RT_APPLICATION_DATA;
         dummyrec[1] = (unsigned char)((template->version >> 8) & 0xff);
         dummyrec[2] = (unsigned char)(template->version & 0xff);
         /*
@@ -275,11 +279,11 @@ static int quic_write_records(OSSL_RECORD_LAYER *rl,
         dummyrec[4] = (unsigned char)(template->buflen & 0xff);
 
         rl->msg_callback(1, TLS1_3_VERSION, SSL3_RT_HEADER, dummyrec,
-                            SSL3_RT_HEADER_LENGTH, rl->cbarg);
+            SSL3_RT_HEADER_LENGTH, rl->cbarg);
 
         if (rl->level != OSSL_RECORD_PROTECTION_LEVEL_NONE) {
             rl->msg_callback(1, TLS1_3_VERSION, SSL3_RT_INNER_CONTENT_TYPE,
-                             &template->type, 1, rl->cbarg);
+                &template->type, 1, rl->cbarg);
         }
     }
 
@@ -312,9 +316,9 @@ static int quic_write_records(OSSL_RECORD_LAYER *rl,
          * failure)
          */
         if (!rl->qtls->args.crypto_send_cb(template->buf + rl->written,
-                                           template->buflen - rl->written,
-                                           &consumed,
-                                           rl->qtls->args.crypto_send_cb_arg)) {
+                template->buflen - rl->written,
+                &consumed,
+                rl->qtls->args.crypto_send_cb_arg)) {
             QUIC_TLS_FATAL(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return OSSL_RECORD_RETURN_FATAL;
         }
@@ -358,9 +362,9 @@ static int quic_retry_write_records(OSSL_RECORD_LAYER *rl)
 }
 
 static int quic_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)
+    int *rversion, uint8_t *type, const unsigned char **data,
+    size_t *datalen, uint16_t *epoch,
+    unsigned char *seq_num)
 {
     if (rl->recread != 0 || rl->recunreleased != 0)
         return OSSL_RECORD_RETURN_FATAL;
@@ -368,7 +372,7 @@ static int quic_read_record(OSSL_RECORD_LAYER *rl, void **rechandle,
     BIO_clear_retry_flags(rl->dummybio);
 
     if (!rl->qtls->args.crypto_recv_rcd_cb(data, datalen,
-                                           rl->qtls->args.crypto_recv_rcd_cb_arg)) {
+            rl->qtls->args.crypto_recv_rcd_cb_arg)) {
         QUIC_TLS_FATAL(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return OSSL_RECORD_RETURN_FATAL;
     }
@@ -392,8 +396,8 @@ static int quic_read_record(OSSL_RECORD_LAYER *rl, void **rechandle,
          * and manufacture a dummy record header
          */
         dummyrec[0] = (rl->level == OSSL_RECORD_PROTECTION_LEVEL_NONE)
-                      ? SSL3_RT_HANDSHAKE
-                      : SSL3_RT_APPLICATION_DATA;
+            ? SSL3_RT_HANDSHAKE
+            : SSL3_RT_APPLICATION_DATA;
         dummyrec[1] = (unsigned char)((TLS1_2_VERSION >> 8) & 0xff);
         dummyrec[2] = (unsigned char)(TLS1_2_VERSION & 0xff);
         /*
@@ -404,37 +408,34 @@ static int quic_read_record(OSSL_RECORD_LAYER *rl, void **rechandle,
         dummyrec[4] = (unsigned char)(*datalen & 0xff);
 
         rl->msg_callback(0, TLS1_3_VERSION, SSL3_RT_HEADER, dummyrec,
-                         SSL3_RT_HEADER_LENGTH, rl->cbarg);
+            SSL3_RT_HEADER_LENGTH, rl->cbarg);
         rl->msg_callback(0, TLS1_3_VERSION, SSL3_RT_INNER_CONTENT_TYPE, type, 1,
-                         rl->cbarg);
+            rl->cbarg);
     }
 
     return OSSL_RECORD_RETURN_SUCCESS;
 }
 
 static int quic_release_record(OSSL_RECORD_LAYER *rl, void *rechandle,
-                               size_t length)
+    size_t length)
 {
     if (!ossl_assert(rl->recread > 0)
-            || !ossl_assert(rl->recunreleased <= rl->recread)
-            || !ossl_assert(rl == rechandle)
-            || !ossl_assert(length <= rl->recunreleased)) {
+        || !ossl_assert(rl->recunreleased <= rl->recread)
+        || !ossl_assert(rl == rechandle)
+        || !ossl_assert(length <= rl->recunreleased)) {
         QUIC_TLS_FATAL(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return OSSL_RECORD_RETURN_FATAL;
     }
 
-    rl->recunreleased -= length;
-
-    if (rl->recunreleased > 0)
-        return OSSL_RECORD_RETURN_SUCCESS;
-
-    if (!rl->qtls->args.crypto_release_rcd_cb(rl->recread,
-                                              rl->qtls->args.crypto_release_rcd_cb_arg)) {
-        QUIC_TLS_FATAL(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
-        return OSSL_RECORD_RETURN_FATAL;
+    if (rl->recunreleased == length) {
+        if (!rl->qtls->args.crypto_release_rcd_cb(rl->recread,
+                rl->qtls->args.crypto_release_rcd_cb_arg)) {
+            QUIC_TLS_FATAL(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+            return OSSL_RECORD_RETURN_FATAL;
+        }
+        rl->recread = 0;
     }
-
-    rl->recread = 0;
+    rl->recunreleased -= length;
     return OSSL_RECORD_RETURN_SUCCESS;
 }
 
@@ -470,7 +471,7 @@ static void quic_set_max_pipelines(OSSL_RECORD_LAYER *rl, size_t max_pipelines)
 }
 
 static void quic_get_state(OSSL_RECORD_LAYER *rl, const char **shortstr,
-                    const char **longstr)
+    const char **longstr)
 {
     /*
      * According to the docs, valid read state strings are: "RH"/"read header",
@@ -596,10 +597,10 @@ static const OSSL_RECORD_METHOD quic_tls_record_method = {
 };
 
 static int add_transport_params_cb(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)
 {
     QUIC_TLS *qtls = add_arg;
 
@@ -610,23 +611,23 @@ static int add_transport_params_cb(SSL *s, unsigned int ext_type,
 }
 
 static void free_transport_params_cb(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)
 {
 }
 
 static int parse_transport_params_cb(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)
 {
     QUIC_TLS *qtls = parse_arg;
 
     return qtls->args.got_transport_params_cb(in, inlen,
-                                              qtls->args.got_transport_params_cb_arg);
+        qtls->args.got_transport_params_cb_arg);
 }
 
 QUIC_TLS *ossl_quic_tls_new(const QUIC_TLS_ARGS *args)
@@ -662,10 +663,10 @@ void ossl_quic_tls_free(QUIC_TLS *qtls)
 }
 
 static int raise_error(QUIC_TLS *qtls, uint64_t error_code,
-                       const char *error_msg,
-                       const char *src_file,
-                       int src_line,
-                       const char *src_func)
+    const char *error_msg,
+    const char *src_file,
+    int src_line,
+    const char *src_func)
 {
     /*
      * When QTLS fails, add a "cover letter" error with information, potentially
@@ -677,8 +678,8 @@ static int raise_error(QUIC_TLS *qtls, uint64_t error_code,
     ERR_new();
     ERR_set_debug(src_file, src_line, src_func);
     ERR_set_error(ERR_LIB_SSL, SSL_R_QUIC_HANDSHAKE_LAYER_ERROR,
-                  "handshake layer error, error code %llu (0x%llx) (\"%s\")",
-                  error_code, error_code, error_msg);
+        "handshake layer error, error code %llu (0x%llx) (\"%s\")",
+        error_code, error_code, error_msg);
 
     if (qtls->args.ossl_quic) {
         OSSL_ERR_STATE_save_to_mark(qtls->error_state);
@@ -687,47 +688,58 @@ static int raise_error(QUIC_TLS *qtls, uint64_t error_code,
          * We record the error information reported via the QUIC protocol
          * separately.
          */
-        qtls->error_code        = error_code;
-        qtls->error_msg         = error_msg;
-        qtls->inerror           = 1;
+        qtls->error_code = error_code;
+        qtls->error_msg = error_msg;
+        qtls->inerror = 1;
 
         ERR_pop_to_mark();
     }
     return 0;
 }
 
-#define RAISE_ERROR(qtls, error_code, error_msg) \
+#define RAISE_ERROR(qtls, error_code, error_msg)   \
     raise_error((qtls), (error_code), (error_msg), \
-                OPENSSL_FILE, OPENSSL_LINE, OPENSSL_FUNC)
+        OPENSSL_FILE, OPENSSL_LINE, OPENSSL_FUNC)
 
 #ifndef OPENSSL_NO_QUIC
-# define RAISE_INTERNAL_ERROR(qtls) \
+#define RAISE_INTERNAL_ERROR(qtls) \
     RAISE_ERROR((qtls), OSSL_QUIC_ERR_INTERNAL_ERROR, "internal error")
 #else
-# define RAISE_INTERNAL_ERROR(qtls) \
+#define RAISE_INTERNAL_ERROR(qtls) \
     RAISE_ERROR((qtls), 0x01, "internal error")
 #endif
 
 int ossl_quic_tls_configure(QUIC_TLS *qtls)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(qtls->args.s);
+    BIO *nullbio;
 
     if (sc == NULL || !SSL_set_min_proto_version(qtls->args.s, TLS1_3_VERSION))
         return RAISE_INTERNAL_ERROR(qtls);
 
+    nullbio = BIO_new(BIO_s_null());
+    if (nullbio == NULL)
+        return RAISE_INTERNAL_ERROR(qtls);
+
+    /*
+     * Our custom record layer doesn't use the BIO - but libssl generally
+     * expects one to be present.
+     */
+    SSL_set_bio(qtls->args.s, nullbio, nullbio);
+
     SSL_clear_options(qtls->args.s, SSL_OP_ENABLE_MIDDLEBOX_COMPAT);
     ossl_ssl_set_custom_record_layer(sc, &quic_tls_record_method, qtls);
 
     if (!ossl_tls_add_custom_ext_intern(NULL, &sc->cert->custext,
-                                        qtls->args.is_server ? ENDPOINT_SERVER
-                                                             : ENDPOINT_CLIENT,
-                                        TLSEXT_TYPE_quic_transport_parameters,
-                                        SSL_EXT_TLS1_3_ONLY
-                                        | SSL_EXT_CLIENT_HELLO
-                                        | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
-                                        add_transport_params_cb,
-                                        free_transport_params_cb, qtls,
-                                        parse_transport_params_cb, qtls))
+            qtls->args.is_server ? ENDPOINT_SERVER
+                                 : ENDPOINT_CLIENT,
+            TLSEXT_TYPE_quic_transport_parameters,
+            SSL_EXT_TLS1_3_ONLY
+                | SSL_EXT_CLIENT_HELLO
+                | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
+            add_transport_params_cb,
+            free_transport_params_cb, qtls,
+            parse_transport_params_cb, qtls))
         return 0;
 
     sc->s3.flags |= TLS1_FLAGS_QUIC;
@@ -771,7 +783,6 @@ int ossl_quic_tls_tick(QUIC_TLS *qtls)
     if (!qtls->configured) {
         SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(qtls->args.s);
         SSL_CTX *sctx;
-        BIO *nullbio;
 
         if (sc == NULL)
             return RAISE_INTERNAL_ERROR(qtls);
@@ -789,21 +800,13 @@ int ossl_quic_tls_tick(QUIC_TLS *qtls)
         } else {
             if (sc->ext.alpn == NULL || sc->ext.alpn_len == 0)
                 return RAISE_ERROR(qtls, OSSL_QUIC_ERR_CRYPTO_NO_APP_PROTO,
-                                   "ALPN must be configured when using QUIC");
+                    "ALPN must be configured when using QUIC");
         }
 
         if (!ossl_quic_tls_configure(qtls))
             return RAISE_INTERNAL_ERROR(qtls);
 
-        nullbio = BIO_new(BIO_s_null());
-        if (nullbio == NULL)
-            return RAISE_INTERNAL_ERROR(qtls);
-
-        /*
-         * Our custom record layer doesn't use the BIO - but libssl generally
-         * expects one to be present.
-         */
-        SSL_set_bio(qtls->args.s, nullbio, nullbio);
+        sc->s3.flags |= TLS1_FLAGS_QUIC_INTERNAL;
 
         if (qtls->args.is_server)
             SSL_set_accept_state(qtls->args.s);
@@ -824,7 +827,7 @@ int ossl_quic_tls_tick(QUIC_TLS *qtls)
 
     if (ret <= 0) {
         err = ossl_ssl_get_error(qtls->args.s, ret,
-                                 /*check_err=*/ERR_count_to_mark() > 0);
+            /*check_err=*/ERR_count_to_mark() > 0);
 
         switch (err) {
         case SSL_ERROR_WANT_READ:
@@ -845,7 +848,7 @@ int ossl_quic_tls_tick(QUIC_TLS *qtls)
         SSL_get0_alpn_selected(qtls->args.s, &alpn, &alpnlen);
         if (alpn == NULL || alpnlen == 0)
             return RAISE_ERROR(qtls, OSSL_QUIC_ERR_CRYPTO_NO_APP_PROTO,
-                               "no application protocol negotiated");
+                "no application protocol negotiated");
 
         qtls->complete = 1;
         ERR_pop_to_mark();
@@ -857,27 +860,34 @@ int ossl_quic_tls_tick(QUIC_TLS *qtls)
 }
 #endif
 
+void ossl_quic_tls_clear(QUIC_TLS *qtls)
+{
+    if (qtls == NULL)
+        return;
+    qtls->local_transport_params_consumed = 0;
+}
+
 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)
 {
     if (qtls->local_transport_params_consumed)
         return 0;
 
-    qtls->local_transport_params       = transport_params;
-    qtls->local_transport_params_len   = transport_params_len;
+    qtls->local_transport_params = transport_params;
+    qtls->local_transport_params_len = transport_params_len;
     return 1;
 }
 
 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)
 {
     if (qtls->inerror) {
-        *error_code     = qtls->error_code;
-        *error_msg      = qtls->error_msg;
-        *error_state    = qtls->error_state;
+        *error_code = qtls->error_code;
+        *error_msg = qtls->error_msg;
+        *error_state = qtls->error_state;
     }
 
     return qtls->inerror;
diff --git a/ssl/quic/quic_tls_api.c b/ssl/quic/quic_tls_api.c
index ea8924f2c4164..fba852f590088 100644
--- a/ssl/quic/quic_tls_api.c
+++ b/ssl/quic/quic_tls_api.c
@@ -13,7 +13,7 @@
 #include "../ssl_local.h"
 
 static int crypto_send_cb(const unsigned char *buf, size_t buf_len,
-                          size_t *consumed, void *arg)
+    size_t *consumed, void *arg)
 {
     SSL *s = (SSL *)arg;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
@@ -24,7 +24,7 @@ static int crypto_send_cb(const unsigned char *buf, size_t buf_len,
 }
 
 static int crypto_recv_rcd_cb(const unsigned char **buf, size_t *bytes_read,
-                              void *arg)
+    void *arg)
 {
     SSL *s = (SSL *)arg;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
@@ -44,9 +44,9 @@ static int crypto_release_rcd_cb(size_t bytes_read, void *arg)
     return sc->qtcb.crypto_release_rcd_cb(s, bytes_read, sc->qtarg);
 }
 static int yield_secret_cb(uint32_t prot_level, int direction,
-                           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)
 {
     SSL *s = (SSL *)arg;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
@@ -54,12 +54,12 @@ static int yield_secret_cb(uint32_t prot_level, int direction,
     if (sc == NULL)
         return 0;
     return sc->qtcb.yield_secret_cb(s, prot_level, direction,
-                                    secret, secret_len, sc->qtarg);
+        secret, secret_len, sc->qtarg);
 }
 
 static int got_transport_params_cb(const unsigned char *params,
-                                   size_t params_len,
-                                   void *arg)
+    size_t params_len,
+    void *arg)
 {
     SSL *s = (SSL *)arg;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
@@ -80,7 +80,7 @@ static int alert_cb(void *arg, unsigned char alert_code)
 }
 
 static int tls_callbacks_from_dispatch(OSSL_QUIC_TLS_CALLBACKS *qtcb,
-                                       const OSSL_DISPATCH *qtdis)
+    const OSSL_DISPATCH *qtdis)
 {
     for (; qtdis->function_id != 0; qtdis++) {
         switch (qtdis->function_id) {
@@ -90,38 +90,33 @@ static int tls_callbacks_from_dispatch(OSSL_QUIC_TLS_CALLBACKS *qtcb,
             break;
         case OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RECV_RCD:
             if (qtcb->crypto_recv_rcd_cb == NULL)
-                qtcb->crypto_recv_rcd_cb =
-                    OSSL_FUNC_SSL_QUIC_TLS_crypto_recv_rcd(qtdis);
+                qtcb->crypto_recv_rcd_cb = OSSL_FUNC_SSL_QUIC_TLS_crypto_recv_rcd(qtdis);
             break;
         case OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RELEASE_RCD:
             if (qtcb->crypto_release_rcd_cb == NULL)
-                qtcb->crypto_release_rcd_cb =
-                    OSSL_FUNC_SSL_QUIC_TLS_crypto_release_rcd(qtdis);
+                qtcb->crypto_release_rcd_cb = OSSL_FUNC_SSL_QUIC_TLS_crypto_release_rcd(qtdis);
             break;
         case OSSL_FUNC_SSL_QUIC_TLS_YIELD_SECRET:
             if (qtcb->yield_secret_cb == NULL)
-                qtcb->yield_secret_cb =
-                    OSSL_FUNC_SSL_QUIC_TLS_yield_secret(qtdis);
+                qtcb->yield_secret_cb = OSSL_FUNC_SSL_QUIC_TLS_yield_secret(qtdis);
             break;
         case OSSL_FUNC_SSL_QUIC_TLS_GOT_TRANSPORT_PARAMS:
             if (qtcb->got_transport_params_cb == NULL)
-                qtcb->got_transport_params_cb =
-                    OSSL_FUNC_SSL_QUIC_TLS_got_transport_params(qtdis);
+                qtcb->got_transport_params_cb = OSSL_FUNC_SSL_QUIC_TLS_got_transport_params(qtdis);
             break;
         case OSSL_FUNC_SSL_QUIC_TLS_ALERT:
             if (qtcb->alert_cb == NULL)
-                qtcb->alert_cb =
-                    OSSL_FUNC_SSL_QUIC_TLS_alert(qtdis);
+                qtcb->alert_cb = OSSL_FUNC_SSL_QUIC_TLS_alert(qtdis);
             break;
         }
     }
 
     if (qtcb->crypto_send_cb == NULL
-            || qtcb->crypto_recv_rcd_cb == NULL
-            || qtcb->crypto_release_rcd_cb == NULL
-            || qtcb->yield_secret_cb == NULL
-            || qtcb->got_transport_params_cb == NULL
-            || qtcb->alert_cb == NULL) {
+        || qtcb->crypto_recv_rcd_cb == NULL
+        || qtcb->crypto_release_rcd_cb == NULL
+        || qtcb->yield_secret_cb == NULL
+        || qtcb->got_transport_params_cb == NULL
+        || qtcb->alert_cb == NULL) {
         ERR_raise(ERR_LIB_SSL, SSL_R_MISSING_QUIC_TLS_FUNCTIONS);
         return 0;
     }
@@ -174,8 +169,8 @@ 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)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
diff --git a/ssl/quic/quic_trace.c b/ssl/quic/quic_trace.c
index 936707a573f1b..05debed99ff39 100644
--- a/ssl/quic/quic_trace.c
+++ b/ssl/quic/quic_trace.c
@@ -90,7 +90,8 @@ static int frame_ack(BIO *bio, PACKET *pkt)
         /* In case sizeof(uint64_t) > sizeof(size_t) */
         || total_ranges > SIZE_MAX / sizeof(ack_ranges[0])
         || (ack_ranges = OPENSSL_zalloc(sizeof(ack_ranges[0])
-                                        * (size_t)total_ranges)) == NULL)
+                * (size_t)total_ranges))
+            == NULL)
         return ret;
 
     ack.ack_ranges = ack_ranges;
@@ -101,21 +102,21 @@ static int frame_ack(BIO *bio, PACKET *pkt)
         goto end;
 
     BIO_printf(bio, "    Largest acked: %llu\n",
-               (unsigned long long)ack.ack_ranges[0].end);
+        (unsigned long long)ack.ack_ranges[0].end);
     BIO_printf(bio, "    Ack delay (raw) %llu\n",
-               (unsigned long long)ossl_time2ticks(ack.delay_time));
+        (unsigned long long)ossl_time2ticks(ack.delay_time));
     BIO_printf(bio, "    Ack range count: %llu\n",
-               (unsigned long long)total_ranges - 1);
+        (unsigned long long)total_ranges - 1);
     BIO_printf(bio, "    First ack range: %llu\n",
-               (unsigned long long)(ack.ack_ranges[0].end
-                                    - ack.ack_ranges[0].start));
+        (unsigned long long)(ack.ack_ranges[0].end
+            - ack.ack_ranges[0].start));
     for (i = 1; i < total_ranges; i++) {
         BIO_printf(bio, "    Gap: %llu\n",
-                   (unsigned long long)(ack.ack_ranges[i - 1].start
-                                        - ack.ack_ranges[i].end - 2));
+            (unsigned long long)(ack.ack_ranges[i - 1].start
+                - ack.ack_ranges[i].end - 2));
         BIO_printf(bio, "    Ack range len: %llu\n",
-                   (unsigned long long)(ack.ack_ranges[i].end
-                                        - ack.ack_ranges[i].start));
+            (unsigned long long)(ack.ack_ranges[i].end
+                - ack.ack_ranges[i].start));
     }
 
     ret = 1;
@@ -132,11 +133,11 @@ static int frame_reset_stream(BIO *bio, PACKET *pkt)
         return 0;
 
     BIO_printf(bio, "    Stream id: %llu\n",
-               (unsigned long long)frame_data.stream_id);
+        (unsigned long long)frame_data.stream_id);
     BIO_printf(bio, "    App Protocol Error Code: %llu\n",
-               (unsigned long long)frame_data.app_error_code);
+        (unsigned long long)frame_data.app_error_code);
     BIO_printf(bio, "    Final size: %llu\n",
-               (unsigned long long)frame_data.final_size);
+        (unsigned long long)frame_data.final_size);
 
     return 1;
 }
@@ -149,9 +150,9 @@ static int frame_stop_sending(BIO *bio, PACKET *pkt)
         return 0;
 
     BIO_printf(bio, "    Stream id: %llu\n",
-               (unsigned long long)frame_data.stream_id);
+        (unsigned long long)frame_data.stream_id);
     BIO_printf(bio, "    App Protocol Error Code: %llu\n",
-               (unsigned long long)frame_data.app_error_code);
+        (unsigned long long)frame_data.app_error_code);
 
     return 1;
 }
@@ -190,7 +191,7 @@ static int frame_stream(BIO *bio, PACKET *pkt, uint64_t frame_type)
     OSSL_QUIC_FRAME_STREAM frame_data;
 
     BIO_puts(bio, "Stream");
-    switch(frame_type) {
+    switch (frame_type) {
     case OSSL_QUIC_FRAME_TYPE_STREAM:
         BIO_puts(bio, "\n");
         break;
@@ -231,9 +232,9 @@ static int frame_stream(BIO *bio, PACKET *pkt, uint64_t frame_type)
         return 0;
 
     BIO_printf(bio, "    Stream id: %llu\n",
-               (unsigned long long)frame_data.stream_id);
+        (unsigned long long)frame_data.stream_id);
     BIO_printf(bio, "    Offset: %llu\n",
-               (unsigned long long)frame_data.offset);
+        (unsigned long long)frame_data.offset);
     /*
      * It would be nice to find a way of passing the implicit length through
      * to the msg_callback. But this is not currently possible.
@@ -264,11 +265,11 @@ static int frame_max_stream_data(BIO *bio, PACKET *pkt)
     uint64_t max_stream_data = 0;
 
     if (!ossl_quic_wire_decode_frame_max_stream_data(pkt, &stream_id,
-                                                     &max_stream_data))
+            &max_stream_data))
         return 0;
 
     BIO_printf(bio, "    Max Stream Data: %llu\n",
-               (unsigned long long)max_stream_data);
+        (unsigned long long)max_stream_data);
 
     return 1;
 }
@@ -303,7 +304,7 @@ static int frame_stream_data_blocked(BIO *bio, PACKET *pkt)
     uint64_t max_data = 0;
 
     if (!ossl_quic_wire_decode_frame_stream_data_blocked(pkt, &stream_id,
-                                                         &max_data))
+            &max_data))
         return 0;
 
     BIO_printf(bio, "    Stream id: %llu\n", (unsigned long long)stream_id);
@@ -332,14 +333,14 @@ static int frame_new_conn_id(BIO *bio, PACKET *pkt)
         return 0;
 
     BIO_printf(bio, "    Sequence Number: %llu\n",
-               (unsigned long long)frame_data.seq_num);
+        (unsigned long long)frame_data.seq_num);
     BIO_printf(bio, "    Retire prior to: %llu\n",
-               (unsigned long long)frame_data.retire_prior_to);
+        (unsigned long long)frame_data.retire_prior_to);
     BIO_puts(bio, "    Connection id: ");
     put_conn_id(bio, &frame_data.conn_id);
     BIO_puts(bio, "\n    Stateless Reset Token: ");
     put_data(bio, frame_data.stateless_reset.token,
-             sizeof(frame_data.stateless_reset.token));
+        sizeof(frame_data.stateless_reset.token));
     BIO_puts(bio, "\n");
 
     return 1;
@@ -389,7 +390,7 @@ static int frame_conn_closed(BIO *bio, PACKET *pkt)
         return 0;
 
     BIO_printf(bio, "    Error Code: %llu\n",
-               (unsigned long long)frame_data.error_code);
+        (unsigned long long)frame_data.error_code);
     BIO_puts(bio, "    Reason: ");
     put_str(bio, frame_data.reason, frame_data.reason_len);
     BIO_puts(bio, "\n");
@@ -562,7 +563,7 @@ static int trace_frame_data(BIO *bio, PACKET *pkt)
 }
 
 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)
 {
     BIO *bio = arg;
     PACKET pkt;
@@ -580,66 +581,64 @@ int ossl_quic_trace(int write_p, int version, int content_type,
         BIO_printf(bio, " Datagram\n  Length: %zu\n", msglen);
         break;
 
-    case SSL3_RT_QUIC_PACKET:
-        {
-            QUIC_PKT_HDR hdr;
-            size_t i;
-
-            if (!PACKET_buf_init(&pkt, buf, msglen))
-                return 0;
-            /* Decode the packet header */
-            ch = ossl_quic_conn_get_channel(ssl);
-            id_len = ossl_quic_channel_get_short_header_conn_id_len(ch);
-            if (ossl_quic_wire_decode_pkt_hdr(&pkt, id_len, 0, 1, &hdr, NULL,
-                                              NULL) != 1)
-                return 0;
-
-            BIO_puts(bio, write_p ? "Sent" : "Received");
-            BIO_puts(bio, " Packet\n");
-            BIO_printf(bio, "  Packet Type: %s\n", packet_type(hdr.type));
-            if (hdr.type != QUIC_PKT_TYPE_1RTT)
-                BIO_printf(bio, "  Version: 0x%08lx\n",
-                           (unsigned long)hdr.version);
-            BIO_puts(bio, "  Destination Conn Id: ");
-            put_conn_id(bio, &hdr.dst_conn_id);
+    case SSL3_RT_QUIC_PACKET: {
+        QUIC_PKT_HDR hdr;
+        size_t i;
+
+        if (!PACKET_buf_init(&pkt, buf, msglen))
+            return 0;
+        /* Decode the packet header */
+        ch = ossl_quic_conn_get_channel(ssl);
+        id_len = ossl_quic_channel_get_short_header_conn_id_len(ch);
+        if (ossl_quic_wire_decode_pkt_hdr(&pkt, id_len, 0, 1, &hdr, NULL,
+                NULL)
+            != 1)
+            return 0;
+
+        BIO_puts(bio, write_p ? "Sent" : "Received");
+        BIO_puts(bio, " Packet\n");
+        BIO_printf(bio, "  Packet Type: %s\n", packet_type(hdr.type));
+        if (hdr.type != QUIC_PKT_TYPE_1RTT)
+            BIO_printf(bio, "  Version: 0x%08lx\n",
+                (unsigned long)hdr.version);
+        BIO_puts(bio, "  Destination Conn Id: ");
+        put_conn_id(bio, &hdr.dst_conn_id);
+        BIO_puts(bio, "\n");
+        if (hdr.type != QUIC_PKT_TYPE_1RTT) {
+            BIO_puts(bio, "  Source Conn Id: ");
+            put_conn_id(bio, &hdr.src_conn_id);
+            BIO_puts(bio, "\n");
+        }
+        BIO_printf(bio, "  Payload length: %zu\n", hdr.len);
+        if (hdr.type == QUIC_PKT_TYPE_INITIAL) {
+            BIO_puts(bio, "  Token: ");
+            put_token(bio, hdr.token, hdr.token_len);
             BIO_puts(bio, "\n");
-            if (hdr.type != QUIC_PKT_TYPE_1RTT) {
-                BIO_puts(bio, "  Source Conn Id: ");
-                put_conn_id(bio, &hdr.src_conn_id);
-                BIO_puts(bio, "\n");
-            }
-            BIO_printf(bio, "  Payload length: %zu\n", hdr.len);
-            if (hdr.type == QUIC_PKT_TYPE_INITIAL) {
-                BIO_puts(bio, "  Token: ");
-                put_token(bio, hdr.token, hdr.token_len);
-                BIO_puts(bio, "\n");
-            }
-            if (hdr.type != QUIC_PKT_TYPE_VERSION_NEG
-                    && hdr.type != QUIC_PKT_TYPE_RETRY) {
-                BIO_puts(bio, "  Packet Number: 0x");
-                /* Will always be at least 1 byte */
-                for (i = 0; i < hdr.pn_len; i++)
-                    BIO_printf(bio, "%02x", hdr.pn[i]);
-                BIO_puts(bio, "\n");
-            }
-            break;
         }
+        if (hdr.type != QUIC_PKT_TYPE_VERSION_NEG
+            && hdr.type != QUIC_PKT_TYPE_RETRY) {
+            BIO_puts(bio, "  Packet Number: 0x");
+            /* Will always be at least 1 byte */
+            for (i = 0; i < hdr.pn_len; i++)
+                BIO_printf(bio, "%02x", hdr.pn[i]);
+            BIO_puts(bio, "\n");
+        }
+        break;
+    }
 
     case SSL3_RT_QUIC_FRAME_PADDING:
     case SSL3_RT_QUIC_FRAME_FULL:
-    case SSL3_RT_QUIC_FRAME_HEADER:
-        {
-            BIO_puts(bio, write_p ? "Sent" : "Received");
-            BIO_puts(bio, " Frame: ");
-
-            if (!PACKET_buf_init(&pkt, buf, msglen))
-                return 0;
-            if (!trace_frame_data(bio, &pkt)) {
-                BIO_puts(bio, "  <error processing frame data>\n");
-                return 0;
-            }
+    case SSL3_RT_QUIC_FRAME_HEADER: {
+        BIO_puts(bio, write_p ? "Sent" : "Received");
+        BIO_puts(bio, " Frame: ");
+
+        if (!PACKET_buf_init(&pkt, buf, msglen))
+            return 0;
+        if (!trace_frame_data(bio, &pkt)) {
+            BIO_puts(bio, "  <error processing frame data>\n");
+            return 0;
         }
-        break;
+    } break;
 
     default:
         /* Unrecognised content_type. We defer to SSL_trace */
diff --git a/ssl/quic/quic_tserver.c b/ssl/quic/quic_tserver.c
index f7106b2fef37b..f3cf1cbd6acbf 100644
--- a/ssl/quic/quic_tserver.c
+++ b/ssl/quic/quic_tserver.c
@@ -21,7 +21,7 @@
  * =======================
  */
 struct quic_tserver_st {
-    QUIC_TSERVER_ARGS   args;
+    QUIC_TSERVER_ARGS args;
 
     /* Dummy SSL object for this QUIC connection for use by msg_callback */
     SSL *ssl;
@@ -30,12 +30,12 @@ struct quic_tserver_st {
      * The QUIC engine, port and channel providing the core QUIC connection
      * implementation.
      */
-    QUIC_ENGINE     *engine;
-    QUIC_PORT       *port;
-    QUIC_CHANNEL    *ch;
+    QUIC_ENGINE *engine;
+    QUIC_PORT *port;
+    QUIC_CHANNEL *ch;
 
     /* The mutex we give to the QUIC channel. */
-    CRYPTO_MUTEX    *mutex;
+    CRYPTO_MUTEX *mutex;
 
     /* SSL_CTX for creating the underlying TLS connection */
     SSL_CTX *ctx;
@@ -44,12 +44,12 @@ struct quic_tserver_st {
     SSL *tls;
 
     /* Are we connected to a peer? */
-    unsigned int    connected       : 1;
+    unsigned int connected : 1;
 };
 
 static int alpn_select_cb(SSL *ssl, const unsigned char **out,
-                          unsigned char *outlen, const unsigned char *in,
-                          unsigned int inlen, void *arg)
+    unsigned char *outlen, const unsigned char *in,
+    unsigned int inlen, void *arg)
 {
     QUIC_TSERVER *srv = arg;
     static const unsigned char alpndeflt[] = {
@@ -67,18 +67,19 @@ static int alpn_select_cb(SSL *ssl, const unsigned char **out,
     }
 
     if (SSL_select_next_proto((unsigned char **)out, outlen, alpn, alpnlen,
-                              in, inlen) != OPENSSL_NPN_NEGOTIATED)
+            in, inlen)
+        != OPENSSL_NPN_NEGOTIATED)
         return SSL_TLSEXT_ERR_ALERT_FATAL;
 
     return SSL_TLSEXT_ERR_OK;
 }
 
 QUIC_TSERVER *ossl_quic_tserver_new(const QUIC_TSERVER_ARGS *args,
-                                    const char *certfile, const char *keyfile)
+    const char *certfile, const char *keyfile)
 {
     QUIC_TSERVER *srv = NULL;
-    QUIC_ENGINE_ARGS engine_args = {0};
-    QUIC_PORT_ARGS port_args = {0};
+    QUIC_ENGINE_ARGS engine_args = { 0 };
+    QUIC_PORT_ARGS port_args = { 0 };
     QUIC_CONNECTION *qc = NULL;
 
     if (args->net_rbio == NULL || args->net_wbio == NULL)
@@ -98,16 +99,16 @@ QUIC_TSERVER *ossl_quic_tserver_new(const QUIC_TSERVER_ARGS *args,
         srv->ctx = args->ctx;
     else
         srv->ctx = SSL_CTX_new_ex(srv->args.libctx, srv->args.propq,
-                                  TLS_method());
+            TLS_method());
     if (srv->ctx == NULL)
         goto err;
 
     if (certfile != NULL
-            && SSL_CTX_use_certificate_file(srv->ctx, certfile, SSL_FILETYPE_PEM) <= 0)
+        && SSL_CTX_use_certificate_file(srv->ctx, certfile, SSL_FILETYPE_PEM) <= 0)
         goto err;
 
     if (keyfile != NULL
-            && SSL_CTX_use_PrivateKey_file(srv->ctx, keyfile, SSL_FILETYPE_PEM) <= 0)
+        && SSL_CTX_use_PrivateKey_file(srv->ctx, keyfile, SSL_FILETYPE_PEM) <= 0)
         goto err;
 
     SSL_CTX_set_alpn_select_cb(srv->ctx, alpn_select_cb, srv);
@@ -116,18 +117,18 @@ QUIC_TSERVER *ossl_quic_tserver_new(const QUIC_TSERVER_ARGS *args,
     if (srv->tls == NULL)
         goto err;
 
-    engine_args.libctx          = srv->args.libctx;
-    engine_args.propq           = srv->args.propq;
-    engine_args.mutex           = srv->mutex;
+    engine_args.libctx = srv->args.libctx;
+    engine_args.propq = srv->args.propq;
+    engine_args.mutex = srv->mutex;
 
     if ((srv->engine = ossl_quic_engine_new(&engine_args)) == NULL)
         goto err;
 
     ossl_quic_engine_set_time_cb(srv->engine, srv->args.now_cb,
-                                 srv->args.now_cb_arg);
+        srv->args.now_cb_arg);
 
-    port_args.channel_ctx       = srv->ctx;
-    port_args.is_multi_conn     = 1;
+    port_args.channel_ctx = srv->ctx;
+    port_args.is_multi_conn = 1;
     port_args.do_addr_validation = 1;
     if ((srv->port = ossl_quic_engine_create_port(srv->engine, &port_args)) == NULL)
         goto err;
@@ -187,23 +188,23 @@ 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)
 {
     return ossl_quic_channel_set_mutator(srv->ch, mutatecb, finishmutatecb,
-                                         mutatearg);
+        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)
 {
     return ossl_statem_set_mutator(ossl_quic_channel_get0_ssl(srv->ch),
-                                   mutate_handshake_cb,
-                                   finish_mutate_handshake_cb,
-                                   mutatearg);
+        mutate_handshake_cb,
+        finish_mutate_handshake_cb,
+        mutatearg);
 }
 
 int ossl_quic_tserver_tick(QUIC_TSERVER *srv)
@@ -250,20 +251,20 @@ int ossl_quic_tserver_is_handshake_confirmed(const QUIC_TSERVER *srv)
 }
 
 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)
 {
     int is_fin = 0;
     QUIC_STREAM *qs;
 
     qs = ossl_quic_stream_map_get_by_id(ossl_quic_channel_get_qsm(srv->ch),
-                                        stream_id);
+        stream_id);
     if (qs == NULL) {
         int is_client_init
             = ((stream_id & QUIC_STREAM_INITIATOR_MASK)
-               == QUIC_STREAM_INITIATOR_CLIENT);
+                == QUIC_STREAM_INITIATOR_CLIENT);
 
         /*
          * A client-initiated stream might spontaneously come into existence, so
@@ -283,7 +284,7 @@ int ossl_quic_tserver_read(QUIC_TSERVER *srv,
         return 0;
 
     if (!ossl_quic_rstream_read(qs->rstream, buf, buf_len,
-                                bytes_read, &is_fin))
+            bytes_read, &is_fin))
         return 0;
 
     if (*bytes_read > 0) {
@@ -298,13 +299,13 @@ int ossl_quic_tserver_read(QUIC_TSERVER *srv,
         ossl_statm_get_rtt_info(ossl_quic_channel_get_statm(srv->ch), &rtt_info);
 
         if (!ossl_quic_rxfc_on_retire(&qs->rxfc, *bytes_read,
-                                      rtt_info.smoothed_rtt))
+                rtt_info.smoothed_rtt))
             return 0;
     }
 
     if (is_fin)
         ossl_quic_stream_map_notify_totally_read(ossl_quic_channel_get_qsm(srv->ch),
-                                                 qs);
+            qs);
 
     if (*bytes_read > 0)
         ossl_quic_stream_map_update_state(ossl_quic_channel_get_qsm(srv->ch), qs);
@@ -320,7 +321,7 @@ int ossl_quic_tserver_has_read_ended(QUIC_TSERVER *srv, uint64_t stream_id)
     int is_fin = 0;
 
     qs = ossl_quic_stream_map_get_by_id(ossl_quic_channel_get_qsm(srv->ch),
-                                        stream_id);
+        stream_id);
 
     if (qs == NULL)
         return 0;
@@ -338,21 +339,21 @@ int ossl_quic_tserver_has_read_ended(QUIC_TSERVER *srv, uint64_t stream_id)
      * called since the FIN was received.
      */
     if (!ossl_quic_rstream_peek(qs->rstream, buf, sizeof(buf),
-                                &bytes_read, &is_fin))
+            &bytes_read, &is_fin))
         return 0;
 
     if (is_fin && bytes_read == 0) {
         /* If we have a FIN awaiting retirement and no data before it... */
         /* Let RSTREAM know we've consumed this FIN. */
         if (!ossl_quic_rstream_read(qs->rstream, buf, sizeof(buf),
-                                    &bytes_read, &is_fin))
+                &bytes_read, &is_fin))
             return 0;
 
         assert(is_fin && bytes_read == 0);
         assert(qs->recv_state == QUIC_RSTREAM_STATE_DATA_RECVD);
 
         ossl_quic_stream_map_notify_totally_read(ossl_quic_channel_get_qsm(srv->ch),
-                                                 qs);
+            qs);
         ossl_quic_stream_map_update_state(ossl_quic_channel_get_qsm(srv->ch), qs);
         return 1;
     }
@@ -361,10 +362,10 @@ int ossl_quic_tserver_has_read_ended(QUIC_TSERVER *srv, uint64_t stream_id)
 }
 
 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)
 {
     QUIC_STREAM *qs;
 
@@ -372,12 +373,12 @@ int ossl_quic_tserver_write(QUIC_TSERVER *srv,
         return 0;
 
     qs = ossl_quic_stream_map_get_by_id(ossl_quic_channel_get_qsm(srv->ch),
-                                        stream_id);
+        stream_id);
     if (qs == NULL || !ossl_quic_stream_has_send_buffer(qs))
         return 0;
 
     if (!ossl_quic_sstream_append(qs->sstream,
-                                  buf, buf_len, bytes_written))
+            buf, buf_len, bytes_written))
         return 0;
 
     if (*bytes_written > 0)
@@ -400,7 +401,7 @@ int ossl_quic_tserver_conclude(QUIC_TSERVER *srv, uint64_t stream_id)
         return 0;
 
     qs = ossl_quic_stream_map_get_by_id(ossl_quic_channel_get_qsm(srv->ch),
-                                        stream_id);
+        stream_id);
     if (qs == NULL || !ossl_quic_stream_has_send_buffer(qs))
         return 0;
 
@@ -414,8 +415,8 @@ int ossl_quic_tserver_conclude(QUIC_TSERVER *srv, uint64_t 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)
 {
     QUIC_STREAM *qs;
 
@@ -440,13 +441,13 @@ SSL_CTX *ossl_quic_tserver_get0_ssl_ctx(QUIC_TSERVER *srv)
 }
 
 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)
 {
     QUIC_STREAM *qs;
 
     qs = ossl_quic_stream_map_get_by_id(ossl_quic_channel_get_qsm(srv->ch),
-                                        stream_id);
+        stream_id);
     if (qs == NULL)
         return 0;
 
@@ -457,13 +458,13 @@ int ossl_quic_tserver_stream_has_peer_stop_sending(QUIC_TSERVER *srv,
 }
 
 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)
 {
     QUIC_STREAM *qs;
 
     qs = ossl_quic_stream_map_get_by_id(ossl_quic_channel_get_qsm(srv->ch),
-                                        stream_id);
+        stream_id);
     if (qs == NULL)
         return 0;
 
@@ -474,7 +475,7 @@ int ossl_quic_tserver_stream_has_peer_reset_stream(QUIC_TSERVER *srv,
 }
 
 int ossl_quic_tserver_set_new_local_cid(QUIC_TSERVER *srv,
-                                        const QUIC_CONN_ID *conn_id)
+    const QUIC_CONN_ID *conn_id)
 {
     /* Replace existing local connection ID in the QUIC_CHANNEL */
     return ossl_quic_channel_replace_local_cid(srv->ch, conn_id);
@@ -494,12 +495,12 @@ uint64_t ossl_quic_tserver_pop_incoming_stream(QUIC_TSERVER *srv)
 }
 
 int ossl_quic_tserver_is_stream_totally_acked(QUIC_TSERVER *srv,
-                                              uint64_t stream_id)
+    uint64_t stream_id)
 {
     QUIC_STREAM *qs;
 
     qs = ossl_quic_stream_map_get_by_id(ossl_quic_channel_get_qsm(srv->ch),
-                                        stream_id);
+        stream_id);
     if (qs == NULL)
         return 1;
 
@@ -509,19 +510,19 @@ int ossl_quic_tserver_is_stream_totally_acked(QUIC_TSERVER *srv,
 int ossl_quic_tserver_get_net_read_desired(QUIC_TSERVER *srv)
 {
     return ossl_quic_reactor_net_read_desired(
-                ossl_quic_channel_get_reactor(srv->ch));
+        ossl_quic_channel_get_reactor(srv->ch));
 }
 
 int ossl_quic_tserver_get_net_write_desired(QUIC_TSERVER *srv)
 {
     return ossl_quic_reactor_net_write_desired(
-                ossl_quic_channel_get_reactor(srv->ch));
+        ossl_quic_channel_get_reactor(srv->ch));
 }
 
 OSSL_TIME ossl_quic_tserver_get_deadline(QUIC_TSERVER *srv)
 {
     return ossl_quic_reactor_get_tick_deadline(
-                ossl_quic_channel_get_reactor(srv->ch));
+        ossl_quic_channel_get_reactor(srv->ch));
 }
 
 int ossl_quic_tserver_shutdown(QUIC_TSERVER *srv, uint64_t app_error_code)
@@ -554,11 +555,11 @@ QUIC_CHANNEL *ossl_quic_tserver_get_channel(QUIC_TSERVER *srv)
 }
 
 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)
 {
     ossl_quic_channel_set_msg_callback(srv->ch, f, srv->ssl);
     ossl_quic_channel_set_msg_callback_arg(srv->ch, arg);
@@ -572,13 +573,13 @@ int ossl_quic_tserver_new_ticket(QUIC_TSERVER *srv)
 }
 
 int ossl_quic_tserver_set_max_early_data(QUIC_TSERVER *srv,
-                                         uint32_t max_early_data)
+    uint32_t max_early_data)
 {
     return SSL_set_max_early_data(srv->tls, max_early_data);
 }
 
 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)
 {
     SSL_set_psk_find_session_callback(srv->tls, cb);
 }
diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c
index 10d842bce0bfb..44aaad868d2fd 100644
--- a/ssl/quic/quic_txp.c
+++ b/ssl/quic/quic_txp.c
@@ -14,15 +14,15 @@
 #include "internal/common.h"
 #include <openssl/err.h>
 
-#define MIN_CRYPTO_HDR_SIZE             3
+#define MIN_CRYPTO_HDR_SIZE 3
 
-#define MIN_FRAME_SIZE_HANDSHAKE_DONE   1
-#define MIN_FRAME_SIZE_MAX_DATA         2
-#define MIN_FRAME_SIZE_ACK              5
-#define MIN_FRAME_SIZE_CRYPTO           (MIN_CRYPTO_HDR_SIZE + 1)
-#define MIN_FRAME_SIZE_STREAM           3 /* minimum useful size (for non-FIN) */
+#define MIN_FRAME_SIZE_HANDSHAKE_DONE 1
+#define MIN_FRAME_SIZE_MAX_DATA 2
+#define MIN_FRAME_SIZE_ACK 5
+#define MIN_FRAME_SIZE_CRYPTO (MIN_CRYPTO_HDR_SIZE + 1)
+#define MIN_FRAME_SIZE_STREAM 3 /* minimum useful size (for non-FIN) */
 #define MIN_FRAME_SIZE_MAX_STREAMS_BIDI 2
-#define MIN_FRAME_SIZE_MAX_STREAMS_UNI  2
+#define MIN_FRAME_SIZE_MAX_STREAMS_UNI 2
 
 /*
  * Packet Archetypes
@@ -30,23 +30,23 @@
  */
 
 /* Generate normal packets containing most frame types, subject to EL. */
-#define TX_PACKETISER_ARCHETYPE_NORMAL              0
+#define TX_PACKETISER_ARCHETYPE_NORMAL 0
 
 /*
  * A probe packet is different in that:
  *   - It bypasses CC, but *is* counted as in flight for purposes of CC;
  *   - It must be ACK-eliciting.
  */
-#define TX_PACKETISER_ARCHETYPE_PROBE               1
+#define TX_PACKETISER_ARCHETYPE_PROBE 1
 
 /*
  * An ACK-only packet is different in that:
  *   - It bypasses CC, and is considered a 'non-inflight' packet;
  *   - It may not contain anything other than an ACK frame, not even padding.
  */
-#define TX_PACKETISER_ARCHETYPE_ACK_ONLY            2
+#define TX_PACKETISER_ARCHETYPE_ACK_ONLY 2
 
-#define TX_PACKETISER_ARCHETYPE_NUM                 3
+#define TX_PACKETISER_ARCHETYPE_NUM 3
 
 struct ossl_quic_tx_packetiser_st {
     OSSL_QUIC_TX_PACKETISER_ARGS args;
@@ -55,55 +55,55 @@ struct ossl_quic_tx_packetiser_st {
      * Opaque initial token blob provided by caller. TXP frees using the
      * callback when it is no longer needed.
      */
-    const unsigned char             *initial_token;
-    size_t                          initial_token_len;
+    const unsigned char *initial_token;
+    size_t initial_token_len;
     ossl_quic_initial_token_free_fn *initial_token_free_cb;
-    void                            *initial_token_free_cb_arg;
+    void *initial_token_free_cb_arg;
 
     /* Subcomponents of the TXP that we own. */
-    QUIC_FIFD       fifd;       /* QUIC Frame-in-Flight Dispatcher */
+    QUIC_FIFD fifd; /* QUIC Frame-in-Flight Dispatcher */
 
     /* Internal state. */
-    uint64_t        next_pn[QUIC_PN_SPACE_NUM]; /* Next PN to use in given PN space. */
-    OSSL_TIME       last_tx_time;               /* Last time a packet was generated, or 0. */
+    uint64_t next_pn[QUIC_PN_SPACE_NUM]; /* Next PN to use in given PN space. */
+    OSSL_TIME last_tx_time; /* Last time a packet was generated, or 0. */
 
-    size_t          unvalidated_credit;         /* Limit of data we can send until validated */
+    size_t unvalidated_credit; /* Limit of data we can send until validated */
 
     /* Internal state - frame (re)generation flags. */
-    unsigned int    want_handshake_done     : 1;
-    unsigned int    want_max_data           : 1;
-    unsigned int    want_max_streams_bidi   : 1;
-    unsigned int    want_max_streams_uni    : 1;
+    unsigned int want_handshake_done : 1;
+    unsigned int want_max_data : 1;
+    unsigned int want_max_streams_bidi : 1;
+    unsigned int want_max_streams_uni : 1;
 
     /* Internal state - frame (re)generation flags - per PN space. */
-    unsigned int    want_ack                : QUIC_PN_SPACE_NUM;
-    unsigned int    force_ack_eliciting     : QUIC_PN_SPACE_NUM;
+    unsigned int want_ack : QUIC_PN_SPACE_NUM;
+    unsigned int force_ack_eliciting : QUIC_PN_SPACE_NUM;
 
     /*
      * Internal state - connection close terminal state.
      * Once this is set, it is not unset unlike other want_ flags - we keep
      * sending it in every packet.
      */
-    unsigned int    want_conn_close         : 1;
+    unsigned int want_conn_close : 1;
 
     /* Has the handshake been completed? */
-    unsigned int    handshake_complete      : 1;
+    unsigned int handshake_complete : 1;
 
-    OSSL_QUIC_FRAME_CONN_CLOSE  conn_close_frame;
+    OSSL_QUIC_FRAME_CONN_CLOSE conn_close_frame;
 
     /*
      * Counts of the number of bytes received and sent while in the closing
      * state.
      */
-    uint64_t                        closing_bytes_recv;
-    uint64_t                        closing_bytes_xmit;
+    uint64_t closing_bytes_recv;
+    uint64_t closing_bytes_xmit;
 
     /* Internal state - packet assembly. */
     struct txp_el {
-        unsigned char   *scratch;       /* scratch buffer for packet assembly */
-        size_t          scratch_len;    /* number of bytes allocated for scratch */
-        OSSL_QTX_IOVEC  *iovec;         /* scratch iovec array for use with QTX */
-        size_t          alloc_iovec;    /* size of iovec array */
+        unsigned char *scratch; /* scratch buffer for packet assembly */
+        size_t scratch_len; /* number of bytes allocated for scratch */
+        OSSL_QTX_IOVEC *iovec; /* scratch iovec array for use with QTX */
+        size_t alloc_iovec; /* size of iovec array */
     } el[QUIC_ENC_LEVEL_NUM];
 
     /* Message callback related arguments */
@@ -112,10 +112,10 @@ struct ossl_quic_tx_packetiser_st {
     SSL *msg_callback_ssl;
 
     /* Callbacks. */
-    void            (*ack_tx_cb)(const OSSL_QUIC_FRAME_ACK *ack,
-                                 uint32_t pn_space,
-                                 void *arg);
-    void            *ack_tx_cb_arg;
+    void (*ack_tx_cb)(const OSSL_QUIC_FRAME_ACK *ack,
+        uint32_t pn_space,
+        void *arg);
+    void *ack_tx_cb_arg;
 };
 
 /*
@@ -176,9 +176,9 @@ struct tx_helper {
          * The fields in this structure are valid if active is set, which means
          * that a serialization transaction is currently in progress.
          */
-        unsigned char   *data;
-        WPACKET         wpkt;
-        unsigned int    active : 1;
+        unsigned char *data;
+        WPACKET wpkt;
+        unsigned int active : 1;
     } txn;
 };
 
@@ -187,22 +187,22 @@ static int txp_el_ensure_iovec(struct txp_el *el, size_t num);
 
 /* Initialises the TX helper. */
 static int tx_helper_init(struct tx_helper *h, OSSL_QUIC_TX_PACKETISER *txp,
-                          uint32_t enc_level, size_t max_ppl, size_t reserve)
+    uint32_t enc_level, size_t max_ppl, size_t reserve)
 {
     if (reserve > max_ppl)
         return 0;
 
-    h->txp                  = txp;
-    h->enc_level            = enc_level;
-    h->max_ppl              = max_ppl;
-    h->reserve              = reserve;
-    h->num_iovec            = 0;
-    h->bytes_appended       = 0;
-    h->scratch_bytes        = 0;
-    h->reserve_allowed      = 0;
-    h->done_implicit        = 0;
-    h->txn.data             = NULL;
-    h->txn.active           = 0;
+    h->txp = txp;
+    h->enc_level = enc_level;
+    h->max_ppl = max_ppl;
+    h->reserve = reserve;
+    h->num_iovec = 0;
+    h->bytes_appended = 0;
+    h->scratch_bytes = 0;
+    h->reserve_allowed = 0;
+    h->done_implicit = 0;
+    h->txn.data = NULL;
+    h->txn.active = 0;
 
     if (max_ppl > h->txp->el[enc_level].scratch_len) {
         unsigned char *scratch;
@@ -211,7 +211,7 @@ static int tx_helper_init(struct tx_helper *h, OSSL_QUIC_TX_PACKETISER *txp,
         if (scratch == NULL)
             return 0;
 
-        h->txp->el[enc_level].scratch     = scratch;
+        h->txp->el[enc_level].scratch = scratch;
         h->txp->el[enc_level].scratch_len = max_ppl;
     }
 
@@ -246,8 +246,8 @@ static void tx_helper_unrestrict(struct tx_helper *h)
  *
  */
 static int tx_helper_append_iovec(struct tx_helper *h,
-                                  const unsigned char *buf,
-                                  size_t buf_len)
+    const unsigned char *buf,
+    size_t buf_len)
 {
     struct txp_el *el = &h->txp->el[h->enc_level];
 
@@ -260,7 +260,7 @@ static int tx_helper_append_iovec(struct tx_helper *h,
     if (!txp_el_ensure_iovec(el, h->num_iovec + 1))
         return 0;
 
-    el->iovec[h->num_iovec].buf     = buf;
+    el->iovec[h->num_iovec].buf = buf;
     el->iovec[h->num_iovec].buf_len = buf_len;
 
     ++h->num_iovec;
@@ -297,7 +297,7 @@ static WPACKET *tx_helper_begin(struct tx_helper *h)
         return NULL;
 
     data = (unsigned char *)el->scratch + h->scratch_bytes;
-    len  = el->scratch_len - h->scratch_bytes;
+    len = el->scratch_len - h->scratch_bytes;
 
     space_left = tx_helper_get_space_left(h);
     if (!ossl_assert(space_left <= len))
@@ -311,8 +311,8 @@ static WPACKET *tx_helper_begin(struct tx_helper *h)
         return NULL;
     }
 
-    h->txn.data     = data;
-    h->txn.active   = 1;
+    h->txn.data = data;
+    h->txn.active = 1;
     return &h->txn.wpkt;
 }
 
@@ -323,8 +323,8 @@ static void tx_helper_end(struct tx_helper *h, int success)
     else
         WPACKET_cleanup(&h->txn.wpkt);
 
-    h->txn.active       = 0;
-    h->txn.data         = NULL;
+    h->txn.active = 0;
+    h->txn.data = NULL;
 }
 
 /* Abort a control frame serialization transaction. */
@@ -360,7 +360,7 @@ static int tx_helper_commit(struct tx_helper *h)
         PACKET pkt;
 
         if (!PACKET_buf_init(&pkt, h->txn.data, l)
-                || !ossl_quic_wire_peek_frame_header(&pkt, &ftype, NULL)) {
+            || !ossl_quic_wire_peek_frame_header(&pkt, &ftype, NULL)) {
             tx_helper_end(h, 0);
             return 0;
         }
@@ -368,12 +368,12 @@ static int tx_helper_commit(struct tx_helper *h)
         if (ftype == OSSL_QUIC_FRAME_TYPE_PADDING)
             ctype = SSL3_RT_QUIC_FRAME_PADDING;
         else if (OSSL_QUIC_FRAME_TYPE_IS_STREAM(ftype)
-                || ftype == OSSL_QUIC_FRAME_TYPE_CRYPTO)
+            || ftype == OSSL_QUIC_FRAME_TYPE_CRYPTO)
             ctype = SSL3_RT_QUIC_FRAME_HEADER;
 
         h->txp->msg_callback(1, OSSL_QUIC1_VERSION, ctype, h->txn.data, l,
-                             h->txp->msg_callback_ssl,
-                             h->txp->msg_callback_arg);
+            h->txp->msg_callback_ssl,
+            h->txp->msg_callback_arg);
     }
 
     h->scratch_bytes += l;
@@ -382,76 +382,76 @@ static int tx_helper_commit(struct tx_helper *h)
 }
 
 struct archetype_data {
-    unsigned int allow_ack                  : 1;
-    unsigned int allow_ping                 : 1;
-    unsigned int allow_crypto               : 1;
-    unsigned int allow_handshake_done       : 1;
-    unsigned int allow_path_challenge       : 1;
-    unsigned int allow_path_response        : 1;
-    unsigned int allow_new_conn_id          : 1;
-    unsigned int allow_retire_conn_id       : 1;
-    unsigned int allow_stream_rel           : 1;
-    unsigned int allow_conn_fc              : 1;
-    unsigned int allow_conn_close           : 1;
-    unsigned int allow_cfq_other            : 1;
-    unsigned int allow_new_token            : 1;
-    unsigned int allow_force_ack_eliciting  : 1;
-    unsigned int allow_padding              : 1;
-    unsigned int require_ack_eliciting      : 1;
-    unsigned int bypass_cc                  : 1;
+    unsigned int allow_ack : 1;
+    unsigned int allow_ping : 1;
+    unsigned int allow_crypto : 1;
+    unsigned int allow_handshake_done : 1;
+    unsigned int allow_path_challenge : 1;
+    unsigned int allow_path_response : 1;
+    unsigned int allow_new_conn_id : 1;
+    unsigned int allow_retire_conn_id : 1;
+    unsigned int allow_stream_rel : 1;
+    unsigned int allow_conn_fc : 1;
+    unsigned int allow_conn_close : 1;
+    unsigned int allow_cfq_other : 1;
+    unsigned int allow_new_token : 1;
+    unsigned int allow_force_ack_eliciting : 1;
+    unsigned int allow_padding : 1;
+    unsigned int require_ack_eliciting : 1;
+    unsigned int bypass_cc : 1;
 };
 
 struct txp_pkt_geom {
-    size_t                  cmpl, cmppl, hwm, pkt_overhead;
-    uint32_t                archetype;
-    struct archetype_data   adata;
+    size_t cmpl, cmppl, hwm, pkt_overhead;
+    uint32_t archetype;
+    struct archetype_data adata;
 };
 
 struct txp_pkt {
-    struct tx_helper    h;
-    int                 h_valid;
-    QUIC_TXPIM_PKT      *tpkt;
-    QUIC_STREAM         *stream_head;
-    QUIC_PKT_HDR        phdr;
+    struct tx_helper h;
+    int h_valid;
+    QUIC_TXPIM_PKT *tpkt;
+    QUIC_STREAM *stream_head;
+    QUIC_PKT_HDR phdr;
     struct txp_pkt_geom geom;
-    int                 force_pad;
+    int force_pad;
 };
 
 static QUIC_SSTREAM *get_sstream_by_id(uint64_t stream_id, uint32_t pn_space,
-                                       void *arg);
+    void *arg);
 static void on_regen_notify(uint64_t frame_type, uint64_t stream_id,
-                            QUIC_TXPIM_PKT *pkt, void *arg);
+    QUIC_TXPIM_PKT *pkt, void *arg);
 static void on_confirm_notify(uint64_t frame_type, uint64_t stream_id,
-                              QUIC_TXPIM_PKT *pkt, void *arg);
+    QUIC_TXPIM_PKT *pkt, void *arg);
 static void on_sstream_updated(uint64_t stream_id, void *arg);
 static int sstream_is_pending(QUIC_SSTREAM *sstream);
 static int txp_should_try_staging(OSSL_QUIC_TX_PACKETISER *txp,
-                                  uint32_t enc_level,
-                                  uint32_t archetype,
-                                  uint64_t cc_limit,
-                                  uint32_t *conn_close_enc_level);
+    uint32_t enc_level,
+    uint32_t archetype,
+    uint64_t cc_limit,
+    uint32_t *conn_close_enc_level);
 static size_t txp_determine_pn_len(OSSL_QUIC_TX_PACKETISER *txp);
 static int txp_determine_ppl_from_pl(OSSL_QUIC_TX_PACKETISER *txp,
-                                     size_t pl,
-                                     uint32_t enc_level,
-                                     size_t hdr_len,
-                                     size_t *r);
+    size_t pl,
+    uint32_t enc_level,
+    size_t hdr_len,
+    size_t *r);
 static size_t txp_get_mdpl(OSSL_QUIC_TX_PACKETISER *txp);
 static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
-                               struct txp_pkt *pkt,
-                               int chosen_for_conn_close);
+    struct txp_pkt *pkt,
+    int chosen_for_conn_close);
 static int txp_pkt_init(struct txp_pkt *pkt, OSSL_QUIC_TX_PACKETISER *txp,
-                        uint32_t enc_level, uint32_t archetype,
-                        size_t running_total);
+    uint32_t enc_level, uint32_t archetype,
+    size_t running_total);
 static void txp_pkt_cleanup(struct txp_pkt *pkt, OSSL_QUIC_TX_PACKETISER *txp);
 static int txp_pkt_postgen_update_pkt_overhead(struct txp_pkt *pkt,
-                                               OSSL_QUIC_TX_PACKETISER *txp);
+    OSSL_QUIC_TX_PACKETISER *txp);
 static int txp_pkt_append_padding(struct txp_pkt *pkt,
-                                  OSSL_QUIC_TX_PACKETISER *txp, size_t num_bytes);
+    OSSL_QUIC_TX_PACKETISER *txp, size_t num_bytes);
 static int txp_pkt_commit(OSSL_QUIC_TX_PACKETISER *txp, struct txp_pkt *pkt,
-                          uint32_t archetype, int *txpim_pkt_reffed);
+    uint32_t archetype, int *txpim_pkt_reffed);
 static uint32_t txp_determine_archetype(OSSL_QUIC_TX_PACKETISER *txp,
-                                        uint64_t cc_limit);
+    uint64_t cc_limit);
 
 /**
  * Sets the validated state of a QUIC TX packetiser.
@@ -482,7 +482,7 @@ void ossl_quic_tx_packetiser_set_validated(OSSL_QUIC_TX_PACKETISER *txp)
  * @param credit The amount of credit to add, multiplied by 3.
  */
 void ossl_quic_tx_packetiser_add_unvalidated_credit(OSSL_QUIC_TX_PACKETISER *txp,
-                                                    size_t credit)
+    size_t credit)
 {
     if (txp->unvalidated_credit != SIZE_MAX) {
         if ((SIZE_MAX - txp->unvalidated_credit) > (credit * 3))
@@ -506,7 +506,7 @@ void ossl_quic_tx_packetiser_add_unvalidated_credit(OSSL_QUIC_TX_PACKETISER *txp
  * @param credit The amount of credit to consume.
  */
 void ossl_quic_tx_packetiser_consume_unvalidated_credit(OSSL_QUIC_TX_PACKETISER *txp,
-                                                        size_t credit)
+    size_t credit)
 {
     if (txp->unvalidated_credit != SIZE_MAX) {
         if (txp->unvalidated_credit < credit)
@@ -530,7 +530,7 @@ void ossl_quic_tx_packetiser_consume_unvalidated_credit(OSSL_QUIC_TX_PACKETISER
  * @return 1 if the unvalidated credit exceeds `req_credit`, 0 otherwise.
  */
 int ossl_quic_tx_packetiser_check_unvalidated_credit(OSSL_QUIC_TX_PACKETISER *txp,
-                                                     size_t req_credit)
+    size_t req_credit)
 {
     return (txp->unvalidated_credit > req_credit);
 }
@@ -558,17 +558,17 @@ OSSL_QUIC_TX_PACKETISER *ossl_quic_tx_packetiser_new(const OSSL_QUIC_TX_PACKETIS
     if (txp == NULL)
         return NULL;
 
-    txp->args           = *args;
-    txp->last_tx_time   = ossl_time_zero();
+    txp->args = *args;
+    txp->last_tx_time = ossl_time_zero();
 
     if (!ossl_quic_fifd_init(&txp->fifd,
-                             txp->args.cfq, txp->args.ackm, txp->args.txpim,
-                             get_sstream_by_id, txp,
-                             on_regen_notify, txp,
-                             on_confirm_notify, txp,
-                             on_sstream_updated, txp,
-                             args->get_qlog_cb,
-                             args->get_qlog_cb_arg)) {
+            txp->args.cfq, txp->args.ackm, txp->args.txpim,
+            get_sstream_by_id, txp,
+            on_regen_notify, txp,
+            on_confirm_notify, txp,
+            on_sstream_updated, txp,
+            args->get_qlog_cb,
+            args->get_qlog_cb_arg)) {
         OPENSSL_free(txp);
         return NULL;
     }
@@ -588,8 +588,8 @@ void ossl_quic_tx_packetiser_free(OSSL_QUIC_TX_PACKETISER *txp)
     OPENSSL_free(txp->conn_close_frame.reason);
 
     for (enc_level = QUIC_ENC_LEVEL_INITIAL;
-         enc_level < QUIC_ENC_LEVEL_NUM;
-         ++enc_level) {
+        enc_level < QUIC_ENC_LEVEL_NUM;
+        ++enc_level) {
         OPENSSL_free(txp->el[enc_level].iovec);
         OPENSSL_free(txp->el[enc_level].scratch);
     }
@@ -625,7 +625,7 @@ void ossl_quic_tx_packetiser_free(OSSL_QUIC_TX_PACKETISER *txp)
  * estimation of the minimum we would require to guarantee forward progress
  * under worst case packet overheads.
  */
-#define TXP_REQUIRED_TOKEN_MARGIN       160
+#define TXP_REQUIRED_TOKEN_MARGIN 160
 
 static int txp_check_token_len(size_t token_len, size_t mdpl)
 {
@@ -646,34 +646,34 @@ static int txp_check_token_len(size_t token_len, size_t mdpl)
 }
 
 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)
 {
     if (!txp_check_token_len(token_len, txp_get_mdpl(txp)))
         return 0;
 
     if (txp->initial_token != NULL && txp->initial_token_free_cb != NULL)
         txp->initial_token_free_cb(txp->initial_token, txp->initial_token_len,
-                                   txp->initial_token_free_cb_arg);
+            txp->initial_token_free_cb_arg);
 
-    txp->initial_token              = token;
-    txp->initial_token_len          = token_len;
-    txp->initial_token_free_cb      = free_cb;
-    txp->initial_token_free_cb_arg  = free_cb_arg;
+    txp->initial_token = token;
+    txp->initial_token_len = token_len;
+    txp->initial_token_free_cb = free_cb;
+    txp->initial_token_free_cb_arg = free_cb_arg;
     return 1;
 }
 
 int ossl_quic_tx_packetiser_set_protocol_version(OSSL_QUIC_TX_PACKETISER *txp,
-                                                 uint32_t protocol_version)
+    uint32_t protocol_version)
 {
     txp->args.protocol_version = protocol_version;
     return 1;
 }
 
 int ossl_quic_tx_packetiser_set_cur_dcid(OSSL_QUIC_TX_PACKETISER *txp,
-                                         const QUIC_CONN_ID *dcid)
+    const QUIC_CONN_ID *dcid)
 {
     if (dcid == NULL) {
         ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
@@ -685,7 +685,7 @@ int ossl_quic_tx_packetiser_set_cur_dcid(OSSL_QUIC_TX_PACKETISER *txp,
 }
 
 int ossl_quic_tx_packetiser_set_cur_scid(OSSL_QUIC_TX_PACKETISER *txp,
-                                         const QUIC_CONN_ID *scid)
+    const QUIC_CONN_ID *scid)
 {
     if (scid == NULL) {
         ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
@@ -698,7 +698,7 @@ int ossl_quic_tx_packetiser_set_cur_scid(OSSL_QUIC_TX_PACKETISER *txp,
 
 /* Change the destination L4 address the TXP uses to send datagrams. */
 int ossl_quic_tx_packetiser_set_peer(OSSL_QUIC_TX_PACKETISER *txp,
-                                     const BIO_ADDR *peer)
+    const BIO_ADDR *peer)
 {
     if (peer == NULL) {
         BIO_ADDR_clear(&txp->args.peer);
@@ -709,25 +709,24 @@ int ossl_quic_tx_packetiser_set_peer(OSSL_QUIC_TX_PACKETISER *txp,
 }
 
 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)
 {
-    txp->ack_tx_cb      = cb;
-    txp->ack_tx_cb_arg  = cb_arg;
+    txp->ack_tx_cb = cb;
+    txp->ack_tx_cb_arg = cb_arg;
 }
 
 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)
 {
     ossl_quic_fifd_set_qlog_cb(&txp->fifd, get_qlog_cb, get_qlog_cb_arg);
-
 }
 
 int ossl_quic_tx_packetiser_discard_enc_level(OSSL_QUIC_TX_PACKETISER *txp,
-                                              uint32_t enc_level)
+    uint32_t enc_level)
 {
     if (enc_level >= QUIC_ENC_LEVEL_NUM) {
         ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT);
@@ -751,21 +750,21 @@ void ossl_quic_tx_packetiser_schedule_handshake_done(OSSL_QUIC_TX_PACKETISER *tx
 }
 
 void ossl_quic_tx_packetiser_schedule_ack_eliciting(OSSL_QUIC_TX_PACKETISER *txp,
-                                                    uint32_t pn_space)
+    uint32_t pn_space)
 {
     txp->force_ack_eliciting |= (1UL << pn_space);
 }
 
 void ossl_quic_tx_packetiser_schedule_ack(OSSL_QUIC_TX_PACKETISER *txp,
-                                          uint32_t pn_space)
+    uint32_t pn_space)
 {
     txp->want_ack |= (1UL << pn_space);
 }
 
-#define TXP_ERR_INTERNAL     0  /* Internal (e.g. alloc) error */
-#define TXP_ERR_SUCCESS      1  /* Success */
-#define TXP_ERR_SPACE        2  /* Not enough room for another packet */
-#define TXP_ERR_INPUT        3  /* Invalid/malformed input */
+#define TXP_ERR_INTERNAL 0 /* Internal (e.g. alloc) error */
+#define TXP_ERR_SUCCESS 1 /* Success */
+#define TXP_ERR_SPACE 2 /* Not enough room for another packet */
+#define TXP_ERR_INPUT 3 /* Invalid/malformed input */
 
 /*
  * Generates a datagram by polling the various ELs to determine if they want to
@@ -773,7 +772,7 @@ void ossl_quic_tx_packetiser_schedule_ack(OSSL_QUIC_TX_PACKETISER *txp,
  * any ELs which do.
  */
 int ossl_quic_tx_packetiser_generate(OSSL_QUIC_TX_PACKETISER *txp,
-                                     QUIC_TXP_STATUS *status)
+    QUIC_TXP_STATUS *status)
 {
     /*
      * Called to generate one or more datagrams, each containing one or more
@@ -866,11 +865,10 @@ int ossl_quic_tx_packetiser_generate(OSSL_QUIC_TX_PACKETISER *txp,
     memset(status, 0, sizeof(*status));
 
     for (enc_level = QUIC_ENC_LEVEL_INITIAL;
-         enc_level < QUIC_ENC_LEVEL_NUM;
-         ++enc_level)
+        enc_level < QUIC_ENC_LEVEL_NUM;
+        ++enc_level)
         pkt[enc_level].h_valid = 0;
 
-
     /*
      * Should not be needed, but a sanity check in case anyone else has been
      * using the QTX.
@@ -882,19 +880,20 @@ int ossl_quic_tx_packetiser_generate(OSSL_QUIC_TX_PACKETISER *txp,
 
     /* 2. Packet Staging */
     for (enc_level = QUIC_ENC_LEVEL_INITIAL;
-         enc_level < QUIC_ENC_LEVEL_NUM;
-         ++enc_level) {
+        enc_level < QUIC_ENC_LEVEL_NUM;
+        ++enc_level) {
         size_t running_total = (enc_level > QUIC_ENC_LEVEL_INITIAL)
-            ? pkt[enc_level - 1].geom.hwm : 0;
+            ? pkt[enc_level - 1].geom.hwm
+            : 0;
 
         pkt[enc_level].geom.hwm = running_total;
 
         if (!txp_should_try_staging(txp, enc_level, archetype, cc_limit,
-                                    &conn_close_enc_level))
+                &conn_close_enc_level))
             continue;
 
         if (!txp_pkt_init(&pkt[enc_level], txp, enc_level, archetype,
-                          running_total))
+                running_total))
             /*
              * If this fails this is not a fatal error - it means the geometry
              * planning determined there was not enough space for another
@@ -903,7 +902,7 @@ int ossl_quic_tx_packetiser_generate(OSSL_QUIC_TX_PACKETISER *txp,
             break;
 
         rc = txp_generate_for_el(txp, &pkt[enc_level],
-                                 conn_close_enc_level == enc_level);
+            conn_close_enc_level == enc_level);
         if (rc != TXP_ERR_SUCCESS)
             goto out;
 
@@ -933,8 +932,8 @@ int ossl_quic_tx_packetiser_generate(OSSL_QUIC_TX_PACKETISER *txp,
         uint32_t pad_el = QUIC_ENC_LEVEL_NUM;
 
         for (enc_level = QUIC_ENC_LEVEL_INITIAL;
-             enc_level < QUIC_ENC_LEVEL_NUM;
-             ++enc_level)
+            enc_level < QUIC_ENC_LEVEL_NUM;
+            ++enc_level)
             if (pkt[enc_level].h_valid && pkt[enc_level].h.bytes_appended > 0) {
                 if (pad_el == QUIC_ENC_LEVEL_NUM
                     /*
@@ -980,8 +979,8 @@ int ossl_quic_tx_packetiser_generate(OSSL_QUIC_TX_PACKETISER *txp,
 
     /* 4. Commit */
     for (enc_level = QUIC_ENC_LEVEL_INITIAL;
-         enc_level < QUIC_ENC_LEVEL_NUM;
-         ++enc_level) {
+        enc_level < QUIC_ENC_LEVEL_NUM;
+        ++enc_level) {
 
         if (!pkt[enc_level].h_valid)
             /* Did not attempt to generate a packet for this EL. */
@@ -992,14 +991,14 @@ int ossl_quic_tx_packetiser_generate(OSSL_QUIC_TX_PACKETISER *txp,
             continue;
 
         if (!ossl_quic_tx_packetiser_check_unvalidated_credit(txp,
-                                                              pkt[enc_level].h.bytes_appended)) {
+                pkt[enc_level].h.bytes_appended)) {
             res = TXP_ERR_SPACE;
             goto out;
         }
         ossl_quic_tx_packetiser_consume_unvalidated_credit(txp, pkt[enc_level].h.bytes_appended);
 
         rc = txp_pkt_commit(txp, &pkt[enc_level], archetype,
-                            &txpim_pkt_reffed);
+            &txpim_pkt_reffed);
         if (rc) {
             status->sent_ack_eliciting
                 = status->sent_ack_eliciting
@@ -1008,7 +1007,7 @@ int ossl_quic_tx_packetiser_generate(OSSL_QUIC_TX_PACKETISER *txp,
             if (enc_level == QUIC_ENC_LEVEL_HANDSHAKE)
                 status->sent_handshake
                     = (pkt[enc_level].h_valid
-                       && pkt[enc_level].h.bytes_appended > 0);
+                        && pkt[enc_level].h.bytes_appended > 0);
         }
 
         if (txpim_pkt_reffed)
@@ -1018,7 +1017,6 @@ int ossl_quic_tx_packetiser_generate(OSSL_QUIC_TX_PACKETISER *txp,
             goto out;
 
         ++pkts_done;
-
     }
 
     /* Flush & Cleanup */
@@ -1027,8 +1025,8 @@ int ossl_quic_tx_packetiser_generate(OSSL_QUIC_TX_PACKETISER *txp,
     ossl_qtx_finish_dgram(txp->args.qtx);
 
     for (enc_level = QUIC_ENC_LEVEL_INITIAL;
-         enc_level < QUIC_ENC_LEVEL_NUM;
-         ++enc_level)
+        enc_level < QUIC_ENC_LEVEL_NUM;
+        ++enc_level)
         txp_pkt_cleanup(&pkt[enc_level], txp);
 
     status->sent_pkt = pkts_done;
@@ -1041,259 +1039,258 @@ static const struct archetype_data archetypes[QUIC_ENC_LEVEL_NUM][TX_PACKETISER_
     {
         /* EL 0(INITIAL) - Archetype 0(NORMAL) */
         {
-            /*allow_ack                       =*/ 1,
-            /*allow_ping                      =*/ 1,
-            /*allow_crypto                    =*/ 1,
-            /*allow_handshake_done            =*/ 0,
-            /*allow_path_challenge            =*/ 0,
-            /*allow_path_response             =*/ 0,
-            /*allow_new_conn_id               =*/ 0,
-            /*allow_retire_conn_id            =*/ 0,
-            /*allow_stream_rel                =*/ 0,
-            /*allow_conn_fc                   =*/ 0,
-            /*allow_conn_close                =*/ 1,
-            /*allow_cfq_other                 =*/ 0,
-            /*allow_new_token                 =*/ 0,
-            /*allow_force_ack_eliciting       =*/ 1,
-            /*allow_padding                   =*/ 1,
-            /*require_ack_eliciting           =*/ 0,
-            /*bypass_cc                       =*/ 0,
+            /*allow_ack                       =*/1,
+            /*allow_ping                      =*/1,
+            /*allow_crypto                    =*/1,
+            /*allow_handshake_done            =*/0,
+            /*allow_path_challenge            =*/0,
+            /*allow_path_response             =*/0,
+            /*allow_new_conn_id               =*/0,
+            /*allow_retire_conn_id            =*/0,
+            /*allow_stream_rel                =*/0,
+            /*allow_conn_fc                   =*/0,
+            /*allow_conn_close                =*/1,
+            /*allow_cfq_other                 =*/0,
+            /*allow_new_token                 =*/0,
+            /*allow_force_ack_eliciting       =*/1,
+            /*allow_padding                   =*/1,
+            /*require_ack_eliciting           =*/0,
+            /*bypass_cc                       =*/0,
         },
         /* EL 0(INITIAL) - Archetype 1(PROBE) */
         {
-            /*allow_ack                       =*/ 1,
-            /*allow_ping                      =*/ 1,
-            /*allow_crypto                    =*/ 1,
-            /*allow_handshake_done            =*/ 0,
-            /*allow_path_challenge            =*/ 0,
-            /*allow_path_response             =*/ 0,
-            /*allow_new_conn_id               =*/ 0,
-            /*allow_retire_conn_id            =*/ 0,
-            /*allow_stream_rel                =*/ 0,
-            /*allow_conn_fc                   =*/ 0,
-            /*allow_conn_close                =*/ 1,
-            /*allow_cfq_other                 =*/ 0,
-            /*allow_new_token                 =*/ 0,
-            /*allow_force_ack_eliciting       =*/ 1,
-            /*allow_padding                   =*/ 1,
-            /*require_ack_eliciting           =*/ 1,
-            /*bypass_cc                       =*/ 1,
+            /*allow_ack                       =*/1,
+            /*allow_ping                      =*/1,
+            /*allow_crypto                    =*/1,
+            /*allow_handshake_done            =*/0,
+            /*allow_path_challenge            =*/0,
+            /*allow_path_response             =*/0,
+            /*allow_new_conn_id               =*/0,
+            /*allow_retire_conn_id            =*/0,
+            /*allow_stream_rel                =*/0,
+            /*allow_conn_fc                   =*/0,
+            /*allow_conn_close                =*/1,
+            /*allow_cfq_other                 =*/0,
+            /*allow_new_token                 =*/0,
+            /*allow_force_ack_eliciting       =*/1,
+            /*allow_padding                   =*/1,
+            /*require_ack_eliciting           =*/1,
+            /*bypass_cc                       =*/1,
         },
         /* EL 0(INITIAL) - Archetype 2(ACK_ONLY) */
         {
-            /*allow_ack                       =*/ 1,
-            /*allow_ping                      =*/ 0,
-            /*allow_crypto                    =*/ 0,
-            /*allow_handshake_done            =*/ 0,
-            /*allow_path_challenge            =*/ 0,
-            /*allow_path_response             =*/ 0,
-            /*allow_new_conn_id               =*/ 0,
-            /*allow_retire_conn_id            =*/ 0,
-            /*allow_stream_rel                =*/ 0,
-            /*allow_conn_fc                   =*/ 0,
-            /*allow_conn_close                =*/ 0,
-            /*allow_cfq_other                 =*/ 0,
-            /*allow_new_token                 =*/ 0,
-            /*allow_force_ack_eliciting       =*/ 1,
-            /*allow_padding                   =*/ 0,
-            /*require_ack_eliciting           =*/ 0,
-            /*bypass_cc                       =*/ 1,
+            /*allow_ack                       =*/1,
+            /*allow_ping                      =*/0,
+            /*allow_crypto                    =*/0,
+            /*allow_handshake_done            =*/0,
+            /*allow_path_challenge            =*/0,
+            /*allow_path_response             =*/0,
+            /*allow_new_conn_id               =*/0,
+            /*allow_retire_conn_id            =*/0,
+            /*allow_stream_rel                =*/0,
+            /*allow_conn_fc                   =*/0,
+            /*allow_conn_close                =*/0,
+            /*allow_cfq_other                 =*/0,
+            /*allow_new_token                 =*/0,
+            /*allow_force_ack_eliciting       =*/1,
+            /*allow_padding                   =*/0,
+            /*require_ack_eliciting           =*/0,
+            /*bypass_cc                       =*/1,
         },
     },
     /* EL 1(0RTT) */
     {
         /* EL 1(0RTT) - Archetype 0(NORMAL) */
         {
-            /*allow_ack                       =*/ 0,
-            /*allow_ping                      =*/ 1,
-            /*allow_crypto                    =*/ 0,
-            /*allow_handshake_done            =*/ 0,
-            /*allow_path_challenge            =*/ 0,
-            /*allow_path_response             =*/ 0,
-            /*allow_new_conn_id               =*/ 1,
-            /*allow_retire_conn_id            =*/ 1,
-            /*allow_stream_rel                =*/ 1,
-            /*allow_conn_fc                   =*/ 1,
-            /*allow_conn_close                =*/ 1,
-            /*allow_cfq_other                 =*/ 0,
-            /*allow_new_token                 =*/ 0,
-            /*allow_force_ack_eliciting       =*/ 0,
-            /*allow_padding                   =*/ 1,
-            /*require_ack_eliciting           =*/ 0,
-            /*bypass_cc                       =*/ 0,
+            /*allow_ack                       =*/0,
+            /*allow_ping                      =*/1,
+            /*allow_crypto                    =*/0,
+            /*allow_handshake_done            =*/0,
+            /*allow_path_challenge            =*/0,
+            /*allow_path_response             =*/0,
+            /*allow_new_conn_id               =*/1,
+            /*allow_retire_conn_id            =*/1,
+            /*allow_stream_rel                =*/1,
+            /*allow_conn_fc                   =*/1,
+            /*allow_conn_close                =*/1,
+            /*allow_cfq_other                 =*/0,
+            /*allow_new_token                 =*/0,
+            /*allow_force_ack_eliciting       =*/0,
+            /*allow_padding                   =*/1,
+            /*require_ack_eliciting           =*/0,
+            /*bypass_cc                       =*/0,
         },
         /* EL 1(0RTT) - Archetype 1(PROBE) */
         {
-            /*allow_ack                       =*/ 0,
-            /*allow_ping                      =*/ 1,
-            /*allow_crypto                    =*/ 0,
-            /*allow_handshake_done            =*/ 0,
-            /*allow_path_challenge            =*/ 0,
-            /*allow_path_response             =*/ 0,
-            /*allow_new_conn_id               =*/ 1,
-            /*allow_retire_conn_id            =*/ 1,
-            /*allow_stream_rel                =*/ 1,
-            /*allow_conn_fc                   =*/ 1,
-            /*allow_conn_close                =*/ 1,
-            /*allow_cfq_other                 =*/ 0,
-            /*allow_new_token                 =*/ 0,
-            /*allow_force_ack_eliciting       =*/ 0,
-            /*allow_padding                   =*/ 1,
-            /*require_ack_eliciting           =*/ 1,
-            /*bypass_cc                       =*/ 1,
+            /*allow_ack                       =*/0,
+            /*allow_ping                      =*/1,
+            /*allow_crypto                    =*/0,
+            /*allow_handshake_done            =*/0,
+            /*allow_path_challenge            =*/0,
+            /*allow_path_response             =*/0,
+            /*allow_new_conn_id               =*/1,
+            /*allow_retire_conn_id            =*/1,
+            /*allow_stream_rel                =*/1,
+            /*allow_conn_fc                   =*/1,
+            /*allow_conn_close                =*/1,
+            /*allow_cfq_other                 =*/0,
+            /*allow_new_token                 =*/0,
+            /*allow_force_ack_eliciting       =*/0,
+            /*allow_padding                   =*/1,
+            /*require_ack_eliciting           =*/1,
+            /*bypass_cc                       =*/1,
         },
         /* EL 1(0RTT) - Archetype 2(ACK_ONLY) */
         {
-            /*allow_ack                       =*/ 0,
-            /*allow_ping                      =*/ 0,
-            /*allow_crypto                    =*/ 0,
-            /*allow_handshake_done            =*/ 0,
-            /*allow_path_challenge            =*/ 0,
-            /*allow_path_response             =*/ 0,
-            /*allow_new_conn_id               =*/ 0,
-            /*allow_retire_conn_id            =*/ 0,
-            /*allow_stream_rel                =*/ 0,
-            /*allow_conn_fc                   =*/ 0,
-            /*allow_conn_close                =*/ 0,
-            /*allow_cfq_other                 =*/ 0,
-            /*allow_new_token                 =*/ 0,
-            /*allow_force_ack_eliciting       =*/ 0,
-            /*allow_padding                   =*/ 0,
-            /*require_ack_eliciting           =*/ 0,
-            /*bypass_cc                       =*/ 1,
+            /*allow_ack                       =*/0,
+            /*allow_ping                      =*/0,
+            /*allow_crypto                    =*/0,
+            /*allow_handshake_done            =*/0,
+            /*allow_path_challenge            =*/0,
+            /*allow_path_response             =*/0,
+            /*allow_new_conn_id               =*/0,
+            /*allow_retire_conn_id            =*/0,
+            /*allow_stream_rel                =*/0,
+            /*allow_conn_fc                   =*/0,
+            /*allow_conn_close                =*/0,
+            /*allow_cfq_other                 =*/0,
+            /*allow_new_token                 =*/0,
+            /*allow_force_ack_eliciting       =*/0,
+            /*allow_padding                   =*/0,
+            /*require_ack_eliciting           =*/0,
+            /*bypass_cc                       =*/1,
         },
     },
     /* EL (HANDSHAKE) */
     {
         /* EL 2(HANDSHAKE) - Archetype 0(NORMAL) */
         {
-            /*allow_ack                       =*/ 1,
-            /*allow_ping                      =*/ 1,
-            /*allow_crypto                    =*/ 1,
-            /*allow_handshake_done            =*/ 0,
-            /*allow_path_challenge            =*/ 0,
-            /*allow_path_response             =*/ 0,
-            /*allow_new_conn_id               =*/ 0,
-            /*allow_retire_conn_id            =*/ 0,
-            /*allow_stream_rel                =*/ 0,
-            /*allow_conn_fc                   =*/ 0,
-            /*allow_conn_close                =*/ 1,
-            /*allow_cfq_other                 =*/ 0,
-            /*allow_new_token                 =*/ 0,
-            /*allow_force_ack_eliciting       =*/ 1,
-            /*allow_padding                   =*/ 1,
-            /*require_ack_eliciting           =*/ 0,
-            /*bypass_cc                       =*/ 0,
+            /*allow_ack                       =*/1,
+            /*allow_ping                      =*/1,
+            /*allow_crypto                    =*/1,
+            /*allow_handshake_done            =*/0,
+            /*allow_path_challenge            =*/0,
+            /*allow_path_response             =*/0,
+            /*allow_new_conn_id               =*/0,
+            /*allow_retire_conn_id            =*/0,
+            /*allow_stream_rel                =*/0,
+            /*allow_conn_fc                   =*/0,
+            /*allow_conn_close                =*/1,
+            /*allow_cfq_other                 =*/0,
+            /*allow_new_token                 =*/0,
+            /*allow_force_ack_eliciting       =*/1,
+            /*allow_padding                   =*/1,
+            /*require_ack_eliciting           =*/0,
+            /*bypass_cc                       =*/0,
         },
         /* EL 2(HANDSHAKE) - Archetype 1(PROBE) */
         {
-            /*allow_ack                       =*/ 1,
-            /*allow_ping                      =*/ 1,
-            /*allow_crypto                    =*/ 1,
-            /*allow_handshake_done            =*/ 0,
-            /*allow_path_challenge            =*/ 0,
-            /*allow_path_response             =*/ 0,
-            /*allow_new_conn_id               =*/ 0,
-            /*allow_retire_conn_id            =*/ 0,
-            /*allow_stream_rel                =*/ 0,
-            /*allow_conn_fc                   =*/ 0,
-            /*allow_conn_close                =*/ 1,
-            /*allow_cfq_other                 =*/ 0,
-            /*allow_new_token                 =*/ 0,
-            /*allow_force_ack_eliciting       =*/ 1,
-            /*allow_padding                   =*/ 1,
-            /*require_ack_eliciting           =*/ 1,
-            /*bypass_cc                       =*/ 1,
+            /*allow_ack                       =*/1,
+            /*allow_ping                      =*/1,
+            /*allow_crypto                    =*/1,
+            /*allow_handshake_done            =*/0,
+            /*allow_path_challenge            =*/0,
+            /*allow_path_response             =*/0,
+            /*allow_new_conn_id               =*/0,
+            /*allow_retire_conn_id            =*/0,
+            /*allow_stream_rel                =*/0,
+            /*allow_conn_fc                   =*/0,
+            /*allow_conn_close                =*/1,
+            /*allow_cfq_other                 =*/0,
+            /*allow_new_token                 =*/0,
+            /*allow_force_ack_eliciting       =*/1,
+            /*allow_padding                   =*/1,
+            /*require_ack_eliciting           =*/1,
+            /*bypass_cc                       =*/1,
         },
         /* EL 2(HANDSHAKE) - Archetype 2(ACK_ONLY) */
         {
-            /*allow_ack                       =*/ 1,
-            /*allow_ping                      =*/ 0,
-            /*allow_crypto                    =*/ 0,
-            /*allow_handshake_done            =*/ 0,
-            /*allow_path_challenge            =*/ 0,
-            /*allow_path_response             =*/ 0,
-            /*allow_new_conn_id               =*/ 0,
-            /*allow_retire_conn_id            =*/ 0,
-            /*allow_stream_rel                =*/ 0,
-            /*allow_conn_fc                   =*/ 0,
-            /*allow_conn_close                =*/ 0,
-            /*allow_cfq_other                 =*/ 0,
-            /*allow_new_token                 =*/ 0,
-            /*allow_force_ack_eliciting       =*/ 1,
-            /*allow_padding                   =*/ 0,
-            /*require_ack_eliciting           =*/ 0,
-            /*bypass_cc                       =*/ 1,
+            /*allow_ack                       =*/1,
+            /*allow_ping                      =*/0,
+            /*allow_crypto                    =*/0,
+            /*allow_handshake_done            =*/0,
+            /*allow_path_challenge            =*/0,
+            /*allow_path_response             =*/0,
+            /*allow_new_conn_id               =*/0,
+            /*allow_retire_conn_id            =*/0,
+            /*allow_stream_rel                =*/0,
+            /*allow_conn_fc                   =*/0,
+            /*allow_conn_close                =*/0,
+            /*allow_cfq_other                 =*/0,
+            /*allow_new_token                 =*/0,
+            /*allow_force_ack_eliciting       =*/1,
+            /*allow_padding                   =*/0,
+            /*require_ack_eliciting           =*/0,
+            /*bypass_cc                       =*/1,
         },
     },
     /* EL 3(1RTT) */
     {
         /* EL 3(1RTT) - Archetype 0(NORMAL) */
         {
-            /*allow_ack                       =*/ 1,
-            /*allow_ping                      =*/ 1,
-            /*allow_crypto                    =*/ 1,
-            /*allow_handshake_done            =*/ 1,
-            /*allow_path_challenge            =*/ 0,
-            /*allow_path_response             =*/ 1,
-            /*allow_new_conn_id               =*/ 1,
-            /*allow_retire_conn_id            =*/ 1,
-            /*allow_stream_rel                =*/ 1,
-            /*allow_conn_fc                   =*/ 1,
-            /*allow_conn_close                =*/ 1,
-            /*allow_cfq_other                 =*/ 1,
-            /*allow_new_token                 =*/ 1,
-            /*allow_force_ack_eliciting       =*/ 1,
-            /*allow_padding                   =*/ 1,
-            /*require_ack_eliciting           =*/ 0,
-            /*bypass_cc                       =*/ 0,
+            /*allow_ack                       =*/1,
+            /*allow_ping                      =*/1,
+            /*allow_crypto                    =*/1,
+            /*allow_handshake_done            =*/1,
+            /*allow_path_challenge            =*/0,
+            /*allow_path_response             =*/1,
+            /*allow_new_conn_id               =*/1,
+            /*allow_retire_conn_id            =*/1,
+            /*allow_stream_rel                =*/1,
+            /*allow_conn_fc                   =*/1,
+            /*allow_conn_close                =*/1,
+            /*allow_cfq_other                 =*/1,
+            /*allow_new_token                 =*/1,
+            /*allow_force_ack_eliciting       =*/1,
+            /*allow_padding                   =*/1,
+            /*require_ack_eliciting           =*/0,
+            /*bypass_cc                       =*/0,
         },
         /* EL 3(1RTT) - Archetype 1(PROBE) */
         {
-            /*allow_ack                       =*/ 1,
-            /*allow_ping                      =*/ 1,
-            /*allow_crypto                    =*/ 1,
-            /*allow_handshake_done            =*/ 1,
-            /*allow_path_challenge            =*/ 0,
-            /*allow_path_response             =*/ 1,
-            /*allow_new_conn_id               =*/ 1,
-            /*allow_retire_conn_id            =*/ 1,
-            /*allow_stream_rel                =*/ 1,
-            /*allow_conn_fc                   =*/ 1,
-            /*allow_conn_close                =*/ 1,
-            /*allow_cfq_other                 =*/ 1,
-            /*allow_new_token                 =*/ 1,
-            /*allow_force_ack_eliciting       =*/ 1,
-            /*allow_padding                   =*/ 1,
-            /*require_ack_eliciting           =*/ 1,
-            /*bypass_cc                       =*/ 1,
+            /*allow_ack                       =*/1,
+            /*allow_ping                      =*/1,
+            /*allow_crypto                    =*/1,
+            /*allow_handshake_done            =*/1,
+            /*allow_path_challenge            =*/0,
+            /*allow_path_response             =*/1,
+            /*allow_new_conn_id               =*/1,
+            /*allow_retire_conn_id            =*/1,
+            /*allow_stream_rel                =*/1,
+            /*allow_conn_fc                   =*/1,
+            /*allow_conn_close                =*/1,
+            /*allow_cfq_other                 =*/1,
+            /*allow_new_token                 =*/1,
+            /*allow_force_ack_eliciting       =*/1,
+            /*allow_padding                   =*/1,
+            /*require_ack_eliciting           =*/1,
+            /*bypass_cc                       =*/1,
         },
         /* EL 3(1RTT) - Archetype 2(ACK_ONLY) */
         {
-            /*allow_ack                       =*/ 1,
-            /*allow_ping                      =*/ 0,
-            /*allow_crypto                    =*/ 0,
-            /*allow_handshake_done            =*/ 0,
-            /*allow_path_challenge            =*/ 0,
-            /*allow_path_response             =*/ 0,
-            /*allow_new_conn_id               =*/ 0,
-            /*allow_retire_conn_id            =*/ 0,
-            /*allow_stream_rel                =*/ 0,
-            /*allow_conn_fc                   =*/ 0,
-            /*allow_conn_close                =*/ 0,
-            /*allow_cfq_other                 =*/ 0,
-            /*allow_new_token                 =*/ 0,
-            /*allow_force_ack_eliciting       =*/ 1,
-            /*allow_padding                   =*/ 0,
-            /*require_ack_eliciting           =*/ 0,
-            /*bypass_cc                       =*/ 1,
-        }
-    }
+            /*allow_ack                       =*/1,
+            /*allow_ping                      =*/0,
+            /*allow_crypto                    =*/0,
+            /*allow_handshake_done            =*/0,
+            /*allow_path_challenge            =*/0,
+            /*allow_path_response             =*/0,
+            /*allow_new_conn_id               =*/0,
+            /*allow_retire_conn_id            =*/0,
+            /*allow_stream_rel                =*/0,
+            /*allow_conn_fc                   =*/0,
+            /*allow_conn_close                =*/0,
+            /*allow_cfq_other                 =*/0,
+            /*allow_new_token                 =*/0,
+            /*allow_force_ack_eliciting       =*/1,
+            /*allow_padding                   =*/0,
+            /*require_ack_eliciting           =*/0,
+            /*bypass_cc                       =*/1,
+        } }
 };
 
 static int txp_get_archetype_data(uint32_t enc_level,
-                                  uint32_t archetype,
-                                  struct archetype_data *a)
+    uint32_t archetype,
+    struct archetype_data *a)
 {
     if (enc_level >= QUIC_ENC_LEVEL_NUM
         || archetype >= TX_PACKETISER_ARCHETYPE_NUM)
@@ -1305,28 +1302,28 @@ static int txp_get_archetype_data(uint32_t enc_level,
 }
 
 static int txp_determine_geometry(OSSL_QUIC_TX_PACKETISER *txp,
-                                  uint32_t archetype,
-                                  uint32_t enc_level,
-                                  size_t running_total,
-                                  QUIC_PKT_HDR *phdr,
-                                  struct txp_pkt_geom *geom)
+    uint32_t archetype,
+    uint32_t enc_level,
+    size_t running_total,
+    QUIC_PKT_HDR *phdr,
+    struct txp_pkt_geom *geom)
 {
     size_t mdpl, cmpl, hdr_len;
 
     /* Get information about packet archetype. */
     if (!txp_get_archetype_data(enc_level, archetype, &geom->adata))
-       return 0;
+        return 0;
 
     /* Assemble packet header. */
-    phdr->type          = ossl_quic_enc_level_to_pkt_type(enc_level);
-    phdr->spin_bit      = 0;
-    phdr->pn_len        = txp_determine_pn_len(txp);
-    phdr->partial       = 0;
-    phdr->fixed         = 1;
-    phdr->reserved      = 0;
-    phdr->version       = txp->args.protocol_version;
-    phdr->dst_conn_id   = txp->args.cur_dcid;
-    phdr->src_conn_id   = txp->args.cur_scid;
+    phdr->type = ossl_quic_enc_level_to_pkt_type(enc_level);
+    phdr->spin_bit = 0;
+    phdr->pn_len = txp_determine_pn_len(txp);
+    phdr->partial = 0;
+    phdr->fixed = 1;
+    phdr->reserved = 0;
+    phdr->version = txp->args.protocol_version;
+    phdr->dst_conn_id = txp->args.cur_dcid;
+    phdr->src_conn_id = txp->args.cur_scid;
 
     /*
      * We need to know the length of the payload to get an accurate header
@@ -1348,18 +1345,18 @@ static int txp_determine_geometry(OSSL_QUIC_TX_PACKETISER *txp,
      * worry about this. Thus we estimate the header length assuming a 2-byte
      * length field here, which should in practice work well in all cases.
      */
-    phdr->len           = OSSL_QUIC_VLINT_2B_MAX - phdr->pn_len;
+    phdr->len = OSSL_QUIC_VLINT_2B_MAX - phdr->pn_len;
 
     if (enc_level == QUIC_ENC_LEVEL_INITIAL) {
-        phdr->token     = txp->initial_token;
+        phdr->token = txp->initial_token;
         phdr->token_len = txp->initial_token_len;
     } else {
-        phdr->token     = NULL;
+        phdr->token = NULL;
         phdr->token_len = 0;
     }
 
     hdr_len = ossl_quic_wire_get_encoded_pkt_hdr_len(phdr->dst_conn_id.id_len,
-                                                     phdr);
+        phdr);
     if (hdr_len == 0)
         return 0;
 
@@ -1380,14 +1377,14 @@ static int txp_determine_geometry(OSSL_QUIC_TX_PACKETISER *txp,
     if (!txp_determine_ppl_from_pl(txp, cmpl, enc_level, hdr_len, &geom->cmppl))
         return 0;
 
-    geom->cmpl                  = cmpl;
-    geom->pkt_overhead          = cmpl - geom->cmppl;
-    geom->archetype             = archetype;
+    geom->cmpl = cmpl;
+    geom->pkt_overhead = cmpl - geom->cmppl;
+    geom->archetype = archetype;
     return 1;
 }
 
 static uint32_t txp_determine_archetype(OSSL_QUIC_TX_PACKETISER *txp,
-                                        uint64_t cc_limit)
+    uint64_t cc_limit)
 {
     OSSL_ACKM_PROBE_INFO *probe_info
         = ossl_ackm_get0_probe_request(txp->args.ackm);
@@ -1404,8 +1401,8 @@ static uint32_t txp_determine_archetype(OSSL_QUIC_TX_PACKETISER *txp,
         return TX_PACKETISER_ARCHETYPE_PROBE;
 
     for (pn_space = QUIC_PN_SPACE_INITIAL;
-         pn_space < QUIC_PN_SPACE_NUM;
-         ++pn_space)
+        pn_space < QUIC_PN_SPACE_NUM;
+        ++pn_space)
         if (probe_info->pto[pn_space] > 0)
             return TX_PACKETISER_ARCHETYPE_PROBE;
 
@@ -1422,10 +1419,10 @@ static uint32_t txp_determine_archetype(OSSL_QUIC_TX_PACKETISER *txp,
 }
 
 static int txp_should_try_staging(OSSL_QUIC_TX_PACKETISER *txp,
-                                  uint32_t enc_level,
-                                  uint32_t archetype,
-                                  uint64_t cc_limit,
-                                  uint32_t *conn_close_enc_level)
+    uint32_t enc_level,
+    uint32_t archetype,
+    uint64_t cc_limit,
+    uint32_t *conn_close_enc_level)
 {
     struct archetype_data a;
     uint32_t pn_space = ossl_quic_enc_level_to_pn_space(enc_level);
@@ -1481,7 +1478,7 @@ static int txp_should_try_staging(OSSL_QUIC_TX_PACKETISER *txp,
             = ossl_ackm_get0_probe_request(txp->args.ackm);
 
         if ((enc_level == QUIC_ENC_LEVEL_INITIAL
-             && probe_info->anti_deadlock_initial > 0)
+                && probe_info->anti_deadlock_initial > 0)
             || (enc_level == QUIC_ENC_LEVEL_HANDSHAKE
                 && probe_info->anti_deadlock_handshake > 0)
             || probe_info->pto[pn_space] > 0)
@@ -1493,8 +1490,7 @@ static int txp_should_try_staging(OSSL_QUIC_TX_PACKETISER *txp,
         return 1;
 
     /* Does the ACKM for this PN space want to produce anything? */
-    if (a.allow_ack && (ossl_ackm_is_ack_desired(txp->args.ackm, pn_space)
-                        || (txp->want_ack & (1UL << pn_space)) != 0))
+    if (a.allow_ack && (ossl_ackm_is_ack_desired(txp->args.ackm, pn_space) || (txp->want_ack & (1UL << pn_space)) != 0))
         return 1;
 
     /* Do we need to force emission of an ACK-eliciting packet? */
@@ -1503,18 +1499,17 @@ static int txp_should_try_staging(OSSL_QUIC_TX_PACKETISER *txp,
         return 1;
 
     /* Does the connection-level RXFC want to produce a frame? */
-    if (a.allow_conn_fc && (txp->want_max_data
-        || ossl_quic_rxfc_has_cwm_changed(txp->args.conn_rxfc, 0)))
+    if (a.allow_conn_fc && (txp->want_max_data || ossl_quic_rxfc_has_cwm_changed(txp->args.conn_rxfc, 0)))
         return 1;
 
     /* Do we want to produce a MAX_STREAMS frame? */
     if (a.allow_conn_fc
         && (txp->want_max_streams_bidi
             || ossl_quic_rxfc_has_cwm_changed(txp->args.max_streams_bidi_rxfc,
-                                              0)
+                0)
             || txp->want_max_streams_uni
             || ossl_quic_rxfc_has_cwm_changed(txp->args.max_streams_uni_rxfc,
-                                              0)))
+                0)))
         return 1;
 
     /* Do we want to produce a HANDSHAKE_DONE frame? */
@@ -1522,8 +1517,7 @@ static int txp_should_try_staging(OSSL_QUIC_TX_PACKETISER *txp,
         return 1;
 
     /* Do we want to produce a CONNECTION_CLOSE frame? */
-    if (a.allow_conn_close && txp->want_conn_close &&
-        *conn_close_enc_level == enc_level)
+    if (a.allow_conn_close && txp->want_conn_close && *conn_close_enc_level == enc_level)
         /*
          * This is a bit of a special case since CONNECTION_CLOSE can appear in
          * most packet types, and when we decide we want to send it this status
@@ -1535,8 +1529,8 @@ static int txp_should_try_staging(OSSL_QUIC_TX_PACKETISER *txp,
     /* Does the CFQ have any frames queued for this PN space? */
     if (enc_level != QUIC_ENC_LEVEL_0RTT)
         for (cfq_item = ossl_quic_cfq_get_priority_head(txp->args.cfq, pn_space);
-             cfq_item != NULL;
-             cfq_item = ossl_quic_cfq_item_get_priority_next(cfq_item, pn_space)) {
+            cfq_item != NULL;
+            cfq_item = ossl_quic_cfq_item_get_priority_next(cfq_item, pn_space)) {
             uint64_t frame_type = ossl_quic_cfq_item_get_frame_type(cfq_item);
 
             switch (frame_type) {
@@ -1561,7 +1555,7 @@ static int txp_should_try_staging(OSSL_QUIC_TX_PACKETISER *txp,
                     return 1;
                 break;
             }
-       }
+        }
 
     if (a.allow_stream_rel && txp->handshake_complete) {
         QUIC_STREAM_ITER it;
@@ -1600,10 +1594,10 @@ static size_t txp_determine_pn_len(OSSL_QUIC_TX_PACKETISER *txp)
 
 /* Determine plaintext packet payload length from payload length. */
 static int txp_determine_ppl_from_pl(OSSL_QUIC_TX_PACKETISER *txp,
-                                     size_t pl,
-                                     uint32_t enc_level,
-                                     size_t hdr_len,
-                                     size_t *r)
+    size_t pl,
+    uint32_t enc_level,
+    size_t hdr_len,
+    size_t *r)
 {
     if (pl < hdr_len)
         return 0;
@@ -1611,7 +1605,7 @@ static int txp_determine_ppl_from_pl(OSSL_QUIC_TX_PACKETISER *txp,
     pl -= hdr_len;
 
     if (!ossl_qtx_calculate_plaintext_payload_len(txp->args.qtx, enc_level,
-                                                  pl, &pl))
+            pl, &pl))
         return 0;
 
     *r = pl;
@@ -1624,7 +1618,7 @@ static size_t txp_get_mdpl(OSSL_QUIC_TX_PACKETISER *txp)
 }
 
 static QUIC_SSTREAM *get_sstream_by_id(uint64_t stream_id, uint32_t pn_space,
-                                       void *arg)
+    void *arg)
 {
     OSSL_QUIC_TX_PACKETISER *txp = arg;
     QUIC_STREAM *s;
@@ -1640,70 +1634,64 @@ static QUIC_SSTREAM *get_sstream_by_id(uint64_t stream_id, uint32_t pn_space,
 }
 
 static void on_regen_notify(uint64_t frame_type, uint64_t stream_id,
-                            QUIC_TXPIM_PKT *pkt, void *arg)
+    QUIC_TXPIM_PKT *pkt, void *arg)
 {
     OSSL_QUIC_TX_PACKETISER *txp = arg;
 
     switch (frame_type) {
-        case OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE:
-            txp->want_handshake_done = 1;
-            break;
-        case OSSL_QUIC_FRAME_TYPE_MAX_DATA:
-            txp->want_max_data = 1;
-            break;
-        case OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI:
-            txp->want_max_streams_bidi = 1;
-            break;
-        case OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI:
-            txp->want_max_streams_uni = 1;
-            break;
-        case OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN:
-            txp->want_ack |= (1UL << pkt->ackm_pkt.pkt_space);
-            break;
-        case OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA:
-            {
-                QUIC_STREAM *s
-                    = ossl_quic_stream_map_get_by_id(txp->args.qsm, stream_id);
-
-                if (s == NULL)
-                    return;
-
-                s->want_max_stream_data = 1;
-                ossl_quic_stream_map_update_state(txp->args.qsm, s);
-            }
-            break;
-        case OSSL_QUIC_FRAME_TYPE_STOP_SENDING:
-            {
-                QUIC_STREAM *s
-                    = ossl_quic_stream_map_get_by_id(txp->args.qsm, stream_id);
-
-                if (s == NULL)
-                    return;
-
-                ossl_quic_stream_map_schedule_stop_sending(txp->args.qsm, s);
-            }
-            break;
-        case OSSL_QUIC_FRAME_TYPE_RESET_STREAM:
-            {
-                QUIC_STREAM *s
-                    = ossl_quic_stream_map_get_by_id(txp->args.qsm, stream_id);
-
-                if (s == NULL)
-                    return;
-
-                s->want_reset_stream = 1;
-                ossl_quic_stream_map_update_state(txp->args.qsm, s);
-            }
-            break;
-        default:
-            assert(0);
-            break;
+    case OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE:
+        txp->want_handshake_done = 1;
+        break;
+    case OSSL_QUIC_FRAME_TYPE_MAX_DATA:
+        txp->want_max_data = 1;
+        break;
+    case OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI:
+        txp->want_max_streams_bidi = 1;
+        break;
+    case OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI:
+        txp->want_max_streams_uni = 1;
+        break;
+    case OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN:
+        txp->want_ack |= (1UL << pkt->ackm_pkt.pkt_space);
+        break;
+    case OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA: {
+        QUIC_STREAM *s
+            = ossl_quic_stream_map_get_by_id(txp->args.qsm, stream_id);
+
+        if (s == NULL)
+            return;
+
+        s->want_max_stream_data = 1;
+        ossl_quic_stream_map_update_state(txp->args.qsm, s);
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_STOP_SENDING: {
+        QUIC_STREAM *s
+            = ossl_quic_stream_map_get_by_id(txp->args.qsm, stream_id);
+
+        if (s == NULL)
+            return;
+
+        ossl_quic_stream_map_schedule_stop_sending(txp->args.qsm, s);
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_RESET_STREAM: {
+        QUIC_STREAM *s
+            = ossl_quic_stream_map_get_by_id(txp->args.qsm, stream_id);
+
+        if (s == NULL)
+            return;
+
+        s->want_reset_stream = 1;
+        ossl_quic_stream_map_update_state(txp->args.qsm, s);
+    } break;
+    default:
+        assert(0);
+        break;
     }
 }
 
 static int txp_need_ping(OSSL_QUIC_TX_PACKETISER *txp,
-                         uint32_t pn_space,
-                         const struct archetype_data *adata)
+    uint32_t pn_space,
+    const struct archetype_data *adata)
 {
     return adata->allow_ping
         && (adata->require_ack_eliciting
@@ -1711,13 +1699,13 @@ static int txp_need_ping(OSSL_QUIC_TX_PACKETISER *txp,
 }
 
 static int txp_pkt_init(struct txp_pkt *pkt, OSSL_QUIC_TX_PACKETISER *txp,
-                        uint32_t enc_level, uint32_t archetype,
-                        size_t running_total)
+    uint32_t enc_level, uint32_t archetype,
+    size_t running_total)
 {
     uint32_t pn_space = ossl_quic_enc_level_to_pn_space(enc_level);
 
     if (!txp_determine_geometry(txp, archetype, enc_level,
-                                running_total, &pkt->phdr, &pkt->geom))
+            running_total, &pkt->phdr, &pkt->geom))
         return 0;
 
     /*
@@ -1725,14 +1713,14 @@ static int txp_pkt_init(struct txp_pkt *pkt, OSSL_QUIC_TX_PACKETISER *txp,
      * PING.
      */
     if (!tx_helper_init(&pkt->h, txp, enc_level,
-                        pkt->geom.cmppl,
-                        txp_need_ping(txp, pn_space, &pkt->geom.adata) ? 1 : 0))
+            pkt->geom.cmppl,
+            txp_need_ping(txp, pn_space, &pkt->geom.adata) ? 1 : 0))
         return 0;
 
-    pkt->h_valid            = 1;
-    pkt->tpkt               = NULL;
-    pkt->stream_head        = NULL;
-    pkt->force_pad          = 0;
+    pkt->h_valid = 1;
+    pkt->tpkt = NULL;
+    pkt->stream_head = NULL;
+    pkt->force_pad = 0;
     return 1;
 }
 
@@ -1751,7 +1739,7 @@ static void txp_pkt_cleanup(struct txp_pkt *pkt, OSSL_QUIC_TX_PACKETISER *txp)
 }
 
 static int txp_pkt_postgen_update_pkt_overhead(struct txp_pkt *pkt,
-                                               OSSL_QUIC_TX_PACKETISER *txp)
+    OSSL_QUIC_TX_PACKETISER *txp)
 {
     /*
      * After we have staged and generated our packets, but before we commit
@@ -1779,61 +1767,57 @@ static int txp_pkt_postgen_update_pkt_overhead(struct txp_pkt *pkt,
         return 1;
 
     if (!ossl_qtx_calculate_ciphertext_payload_len(txp->args.qtx, pkt->h.enc_level,
-                                                   pkt->h.bytes_appended,
-                                                   &ciphertext_len))
+            pkt->h.bytes_appended,
+            &ciphertext_len))
         return 0;
 
     pkt->phdr.len = ciphertext_len;
 
     hdr_len = ossl_quic_wire_get_encoded_pkt_hdr_len(pkt->phdr.dst_conn_id.id_len,
-                                                     &pkt->phdr);
+        &pkt->phdr);
 
     pkt->geom.pkt_overhead = hdr_len + ciphertext_len - pkt->h.bytes_appended;
     return 1;
 }
 
 static void on_confirm_notify(uint64_t frame_type, uint64_t stream_id,
-                              QUIC_TXPIM_PKT *pkt, void *arg)
+    QUIC_TXPIM_PKT *pkt, void *arg)
 {
     OSSL_QUIC_TX_PACKETISER *txp = arg;
 
     switch (frame_type) {
-        case OSSL_QUIC_FRAME_TYPE_STOP_SENDING:
-            {
-                QUIC_STREAM *s
-                    = ossl_quic_stream_map_get_by_id(txp->args.qsm, stream_id);
+    case OSSL_QUIC_FRAME_TYPE_STOP_SENDING: {
+        QUIC_STREAM *s
+            = ossl_quic_stream_map_get_by_id(txp->args.qsm, stream_id);
 
-                if (s == NULL)
-                    return;
+        if (s == NULL)
+            return;
 
-                s->acked_stop_sending = 1;
-                ossl_quic_stream_map_update_state(txp->args.qsm, s);
-            }
-            break;
-        case OSSL_QUIC_FRAME_TYPE_RESET_STREAM:
-            {
-                QUIC_STREAM *s
-                    = ossl_quic_stream_map_get_by_id(txp->args.qsm, stream_id);
+        s->acked_stop_sending = 1;
+        ossl_quic_stream_map_update_state(txp->args.qsm, s);
+    } break;
+    case OSSL_QUIC_FRAME_TYPE_RESET_STREAM: {
+        QUIC_STREAM *s
+            = ossl_quic_stream_map_get_by_id(txp->args.qsm, stream_id);
 
-                if (s == NULL)
-                    return;
+        if (s == NULL)
+            return;
 
-                /*
-                 * We must already be in RESET_SENT or RESET_RECVD if we are
-                 * here, so we don't need to check state here.
-                 */
-                ossl_quic_stream_map_notify_reset_stream_acked(txp->args.qsm, s);
-                ossl_quic_stream_map_update_state(txp->args.qsm, s);
-            }
-            break;
-        default:
-            assert(0);
-            break;
+        /*
+         * We must already be in RESET_SENT or RESET_RECVD if we are
+         * here, so we don't need to check state here.
+         */
+        ossl_quic_stream_map_notify_reset_stream_acked(txp->args.qsm, s);
+        ossl_quic_stream_map_update_state(txp->args.qsm, s);
+    } break;
+    default:
+        assert(0);
+        break;
     }
 }
 
 static int txp_pkt_append_padding(struct txp_pkt *pkt,
-                                  OSSL_QUIC_TX_PACKETISER *txp, size_t num_bytes)
+    OSSL_QUIC_TX_PACKETISER *txp, size_t num_bytes)
 {
     WPACKET *wpkt;
 
@@ -1858,9 +1842,9 @@ static int txp_pkt_append_padding(struct txp_pkt *pkt,
     if (!tx_helper_commit(&pkt->h))
         return 0;
 
-    pkt->tpkt->ackm_pkt.num_bytes      += num_bytes;
+    pkt->tpkt->ackm_pkt.num_bytes += num_bytes;
     /* Cannot be non-inflight if we have a PADDING frame */
-    pkt->tpkt->ackm_pkt.is_inflight     = 1;
+    pkt->tpkt->ackm_pkt.is_inflight = 1;
     return 1;
 }
 
@@ -1912,15 +1896,15 @@ static int try_commit_conn_close(OSSL_QUIC_TX_PACKETISER *txp, size_t n)
 }
 
 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)
 {
     txp->closing_bytes_recv += n;
 }
 
 static int txp_generate_pre_token(OSSL_QUIC_TX_PACKETISER *txp,
-                                  struct txp_pkt *pkt,
-                                  int chosen_for_conn_close,
-                                  int *can_be_non_inflight)
+    struct txp_pkt *pkt,
+    int chosen_for_conn_close,
+    int *can_be_non_inflight)
 {
     const uint32_t enc_level = pkt->h.enc_level;
     const uint32_t pn_space = ossl_quic_enc_level_to_pn_space(enc_level);
@@ -1948,8 +1932,8 @@ static int txp_generate_pre_token(OSSL_QUIC_TX_PACKETISER *txp,
         ack2.ecn_present = 0;
 
         if (ossl_quic_wire_encode_frame_ack(wpkt,
-                                            txp->args.ack_delay_exponent,
-                                            &ack2)) {
+                txp->args.ack_delay_exponent,
+                &ack2)) {
             if (!tx_helper_commit(h))
                 return 0;
 
@@ -1992,16 +1976,16 @@ static int txp_generate_pre_token(OSSL_QUIC_TX_PACKETISER *txp,
          */
         if (pn_space != QUIC_PN_SPACE_APP && pf->is_app) {
             pf = &f;
-            pf->is_app      = 0;
-            pf->frame_type  = 0;
-            pf->error_code  = OSSL_QUIC_ERR_APPLICATION_ERROR;
-            pf->reason      = NULL;
-            pf->reason_len  = 0;
+            pf->is_app = 0;
+            pf->frame_type = 0;
+            pf->error_code = OSSL_QUIC_ERR_APPLICATION_ERROR;
+            pf->reason = NULL;
+            pf->reason_len = 0;
         }
 
         if (ossl_quic_wire_encode_frame_conn_close(wpkt, pf)
-                && WPACKET_get_total_written(wpkt, &l)
-                && try_commit_conn_close(txp, l)) {
+            && WPACKET_get_total_written(wpkt, &l)
+            && try_commit_conn_close(txp, l)) {
             if (!tx_helper_commit(h))
                 return 0;
 
@@ -2016,8 +2000,8 @@ static int txp_generate_pre_token(OSSL_QUIC_TX_PACKETISER *txp,
 }
 
 static int try_len(size_t space_left, size_t orig_len,
-                   size_t base_hdr_len, size_t lenbytes,
-                   uint64_t maxn, size_t *hdr_len, size_t *payload_len)
+    size_t base_hdr_len, size_t lenbytes,
+    uint64_t maxn, size_t *hdr_len, size_t *payload_len)
 {
     size_t n;
     size_t maxn_ = maxn > SIZE_MAX ? SIZE_MAX : (size_t)maxn;
@@ -2040,37 +2024,37 @@ static int try_len(size_t space_left, size_t orig_len,
 }
 
 static int determine_len(size_t space_left, size_t orig_len,
-                         size_t base_hdr_len,
-                         uint64_t *hlen, uint64_t *len)
+    size_t base_hdr_len,
+    uint64_t *hlen, uint64_t *len)
 {
     int ok = 0;
     size_t chosen_payload_len = 0;
-    size_t chosen_hdr_len     = 0;
+    size_t chosen_hdr_len = 0;
     size_t payload_len[4], hdr_len[4];
-    int i, valid[4] = {0};
+    int i, valid[4] = { 0 };
 
     valid[0] = try_len(space_left, orig_len, base_hdr_len,
-                       1, OSSL_QUIC_VLINT_1B_MAX,
-                       &hdr_len[0], &payload_len[0]);
+        1, OSSL_QUIC_VLINT_1B_MAX,
+        &hdr_len[0], &payload_len[0]);
     valid[1] = try_len(space_left, orig_len, base_hdr_len,
-                       2, OSSL_QUIC_VLINT_2B_MAX,
-                       &hdr_len[1], &payload_len[1]);
+        2, OSSL_QUIC_VLINT_2B_MAX,
+        &hdr_len[1], &payload_len[1]);
     valid[2] = try_len(space_left, orig_len, base_hdr_len,
-                       4, OSSL_QUIC_VLINT_4B_MAX,
-                       &hdr_len[2], &payload_len[2]);
+        4, OSSL_QUIC_VLINT_4B_MAX,
+        &hdr_len[2], &payload_len[2]);
     valid[3] = try_len(space_left, orig_len, base_hdr_len,
-                       8, OSSL_QUIC_VLINT_8B_MAX,
-                       &hdr_len[3], &payload_len[3]);
+        8, OSSL_QUIC_VLINT_8B_MAX,
+        &hdr_len[3], &payload_len[3]);
 
-   for (i = OSSL_NELEM(valid) - 1; i >= 0; --i)
+    for (i = OSSL_NELEM(valid) - 1; i >= 0; --i)
         if (valid[i] && payload_len[i] >= chosen_payload_len) {
             chosen_payload_len = payload_len[i];
-            chosen_hdr_len     = hdr_len[i];
-            ok                 = 1;
+            chosen_hdr_len = hdr_len[i];
+            ok = 1;
         }
 
     *hlen = chosen_hdr_len;
-    *len  = chosen_payload_len;
+    *len = chosen_payload_len;
     return ok;
 }
 
@@ -2083,10 +2067,10 @@ static int determine_len(size_t space_left, size_t orig_len,
  * encodings and choose the optimal encoding.
  */
 static int determine_crypto_len(struct tx_helper *h,
-                                OSSL_QUIC_FRAME_CRYPTO *chdr,
-                                size_t space_left,
-                                uint64_t *hlen,
-                                uint64_t *len)
+    OSSL_QUIC_FRAME_CRYPTO *chdr,
+    size_t space_left,
+    uint64_t *hlen,
+    uint64_t *len)
 {
     size_t orig_len;
     size_t base_hdr_len; /* CRYPTO header length without length field */
@@ -2108,10 +2092,10 @@ static int determine_crypto_len(struct tx_helper *h,
 }
 
 static int determine_stream_len(struct tx_helper *h,
-                                OSSL_QUIC_FRAME_STREAM *shdr,
-                                size_t space_left,
-                                uint64_t *hlen,
-                                uint64_t *len)
+    OSSL_QUIC_FRAME_STREAM *shdr,
+    size_t space_left,
+    uint64_t *hlen,
+    uint64_t *len)
 {
     size_t orig_len;
     size_t base_hdr_len; /* STREAM header length without length field */
@@ -2134,20 +2118,20 @@ static int determine_stream_len(struct tx_helper *h,
 }
 
 static int txp_generate_crypto_frames(OSSL_QUIC_TX_PACKETISER *txp,
-                                      struct txp_pkt *pkt,
-                                      int *have_ack_eliciting)
+    struct txp_pkt *pkt,
+    int *have_ack_eliciting)
 {
     const uint32_t enc_level = pkt->h.enc_level;
     const uint32_t pn_space = ossl_quic_enc_level_to_pn_space(enc_level);
     QUIC_TXPIM_PKT *tpkt = pkt->tpkt;
     struct tx_helper *h = &pkt->h;
     size_t num_stream_iovec;
-    OSSL_QUIC_FRAME_STREAM shdr = {0};
-    OSSL_QUIC_FRAME_CRYPTO chdr = {0};
+    OSSL_QUIC_FRAME_STREAM shdr = { 0 };
+    OSSL_QUIC_FRAME_CRYPTO chdr = { 0 };
     OSSL_QTX_IOVEC iov[2];
     uint64_t hdr_bytes;
     WPACKET *wpkt;
-    QUIC_TXPIM_CHUNK chunk = {0};
+    QUIC_TXPIM_CHUNK chunk = { 0 };
     size_t i, space_left;
 
     for (i = 0;; ++i) {
@@ -2159,20 +2143,20 @@ static int txp_generate_crypto_frames(OSSL_QUIC_TX_PACKETISER *txp,
         /* Do we have any CRYPTO data waiting? */
         num_stream_iovec = OSSL_NELEM(iov);
         if (!ossl_quic_sstream_get_stream_frame(txp->args.crypto[pn_space],
-                                                i, &shdr, iov,
-                                                &num_stream_iovec))
+                i, &shdr, iov,
+                &num_stream_iovec))
             return 1; /* nothing to do */
 
         /* Convert STREAM frame header to CRYPTO frame header */
         chdr.offset = shdr.offset;
-        chdr.len    = shdr.len;
+        chdr.len = shdr.len;
 
         if (chdr.len == 0)
             return 1; /* nothing to do */
 
         /* Find best fit (header length, payload length) combination. */
         if (!determine_crypto_len(h, &chdr, space_left, &hdr_bytes,
-                                  &chdr.len))
+                &chdr.len))
             return 1; /* can't fit anything */
 
         /*
@@ -2212,9 +2196,9 @@ static int txp_generate_crypto_frames(OSSL_QUIC_TX_PACKETISER *txp,
 
         /* Log chunk to TXPIM. */
         chunk.stream_id = UINT64_MAX; /* crypto stream */
-        chunk.start     = chdr.offset;
-        chunk.end       = chdr.offset + chdr.len - 1;
-        chunk.has_fin   = 0; /* Crypto stream never ends */
+        chunk.start = chdr.offset;
+        chunk.end = chdr.offset + chdr.len - 1;
+        chunk.has_fin = 0; /* Crypto stream never ends */
         if (!ossl_quic_txpim_pkt_append_chunk(tpkt, &chunk))
             return 0; /* alloc error */
     }
@@ -2229,20 +2213,20 @@ struct chunk_info {
 };
 
 static int txp_plan_stream_chunk(OSSL_QUIC_TX_PACKETISER *txp,
-                                 struct tx_helper *h,
-                                 QUIC_SSTREAM *sstream,
-                                 QUIC_TXFC *stream_txfc,
-                                 size_t skip,
-                                 struct chunk_info *chunk,
-                                 uint64_t consumed)
+    struct tx_helper *h,
+    QUIC_SSTREAM *sstream,
+    QUIC_TXFC *stream_txfc,
+    size_t skip,
+    struct chunk_info *chunk,
+    uint64_t consumed)
 {
     uint64_t fc_credit, fc_swm, fc_limit;
 
     chunk->num_stream_iovec = OSSL_NELEM(chunk->iov);
     chunk->valid = ossl_quic_sstream_get_stream_frame(sstream, skip,
-                                                      &chunk->shdr,
-                                                      chunk->iov,
-                                                      &chunk->num_stream_iovec);
+        &chunk->shdr,
+        chunk->iov,
+        &chunk->num_stream_iovec);
     if (!chunk->valid)
         return 1;
 
@@ -2253,13 +2237,14 @@ static int txp_plan_stream_chunk(OSSL_QUIC_TX_PACKETISER *txp,
     chunk->orig_len = chunk->shdr.len;
 
     /* Clamp according to connection and stream-level TXFC. */
-    fc_credit   = ossl_quic_txfc_get_credit(stream_txfc, consumed);
-    fc_swm      = ossl_quic_txfc_get_swm(stream_txfc);
-    fc_limit    = fc_swm + fc_credit;
+    fc_credit = ossl_quic_txfc_get_credit(stream_txfc, consumed);
+    fc_swm = ossl_quic_txfc_get_swm(stream_txfc);
+    fc_limit = fc_swm + fc_credit;
 
     if (chunk->shdr.len > 0 && chunk->shdr.offset + chunk->shdr.len > fc_limit) {
         chunk->shdr.len = (fc_limit <= chunk->shdr.offset)
-            ? 0 : fc_limit - chunk->shdr.offset;
+            ? 0
+            : fc_limit - chunk->shdr.offset;
         chunk->shdr.is_fin = 0;
     }
 
@@ -2282,18 +2267,18 @@ static int txp_plan_stream_chunk(OSSL_QUIC_TX_PACKETISER *txp,
  * frame.
  */
 static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
-                                      struct txp_pkt *pkt,
-                                      uint64_t id,
-                                      QUIC_SSTREAM *sstream,
-                                      QUIC_TXFC *stream_txfc,
-                                      QUIC_STREAM *next_stream,
-                                      int *have_ack_eliciting,
-                                      int *packet_full,
-                                      uint64_t *new_credit_consumed,
-                                      uint64_t conn_consumed)
+    struct txp_pkt *pkt,
+    uint64_t id,
+    QUIC_SSTREAM *sstream,
+    QUIC_TXFC *stream_txfc,
+    QUIC_STREAM *next_stream,
+    int *have_ack_eliciting,
+    int *packet_full,
+    uint64_t *new_credit_consumed,
+    uint64_t conn_consumed)
 {
     int rc = 0;
-    struct chunk_info chunks[2] = {0};
+    struct chunk_info chunks[2] = { 0 };
     const uint32_t enc_level = pkt->h.enc_level;
     QUIC_TXPIM_PKT *tpkt = pkt->tpkt;
     struct tx_helper *h = &pkt->h;
@@ -2308,8 +2293,8 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
     uint64_t hdr_len_explicit, payload_len_explicit;
     uint64_t fc_swm, fc_new_hwm;
 
-    fc_swm      = ossl_quic_txfc_get_swm(stream_txfc);
-    fc_new_hwm  = fc_swm;
+    fc_swm = ossl_quic_txfc_get_swm(stream_txfc);
+    fc_new_hwm = fc_swm;
 
     /*
      * Load the first two chunks if any offered by the send stream. We retrieve
@@ -2319,7 +2304,7 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
      */
     for (i = 0; i < 2; ++i) {
         if (!txp_plan_stream_chunk(txp, h, sstream, stream_txfc, i, &chunks[i],
-                                   conn_consumed))
+                conn_consumed))
             goto err;
 
         if (i == 0 && !chunks[i].valid) {
@@ -2358,7 +2343,7 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
         if (i > 0)
             /* Load next chunk for lookahead. */
             if (!txp_plan_stream_chunk(txp, h, sstream, stream_txfc, i + 1,
-                                       &chunks[(i + 1) % 2], conn_consumed))
+                    &chunks[(i + 1) % 2], conn_consumed))
                 goto err;
 
         /*
@@ -2368,7 +2353,7 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
         shdr->has_explicit_len = 0;
         hdr_len_implicit = payload_len_implicit = 0;
         if (!determine_stream_len(h, shdr, space_left,
-                                  &hdr_len_implicit, &payload_len_implicit)) {
+                &hdr_len_implicit, &payload_len_implicit)) {
             *packet_full = 1;
             rc = 1;
             goto err; /* can't fit anything */
@@ -2380,7 +2365,7 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
          * for this STREAM frame to fill the packet.
          */
         can_fill_payload = (hdr_len_implicit + payload_len_implicit
-                            >= space_left);
+            >= space_left);
 
         /*
          * Is there is a stream after this one, or another chunk pending
@@ -2391,7 +2376,7 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
 
         /* Choose between explicit or implicit length representations. */
         use_explicit_len = !((can_fill_payload || !could_have_following_chunk)
-                             && !pkt->force_pad);
+            && !pkt->force_pad);
 
         if (use_explicit_len) {
             /*
@@ -2401,7 +2386,7 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
             shdr->has_explicit_len = 1;
             hdr_len_explicit = payload_len_explicit = 0;
             if (!determine_stream_len(h, shdr, space_left,
-                                      &hdr_len_explicit, &payload_len_explicit)) {
+                    &hdr_len_explicit, &payload_len_explicit)) {
                 *packet_full = 1;
                 rc = 1;
                 goto err; /* can't fit anything */
@@ -2427,7 +2412,7 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
 
         /* Truncate IOVs to match our chosen length. */
         ossl_quic_sstream_adjust_iov((size_t)shdr->len, chunks[i % 2].iov,
-                                     chunks[i % 2].num_stream_iovec);
+            chunks[i % 2].num_stream_iovec);
 
         /*
          * Ensure we have enough iovecs allocated (1 for the header, up to 2 for
@@ -2455,7 +2440,7 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
         /* Add payload iovecs to the helper (infallible). */
         for (j = 0; j < chunks[i % 2].num_stream_iovec; ++j)
             tx_helper_append_iovec(h, chunks[i % 2].iov[j].buf,
-                                   chunks[i % 2].iov[j].buf_len);
+                chunks[i % 2].iov[j].buf_len);
 
         *have_ack_eliciting = 1;
         tx_helper_unrestrict(h); /* no longer need PING */
@@ -2467,12 +2452,12 @@ static int txp_generate_stream_frames(OSSL_QUIC_TX_PACKETISER *txp,
             fc_new_hwm = shdr->offset + shdr->len;
 
         /* Log chunk to TXPIM. */
-        chunk.stream_id         = shdr->stream_id;
-        chunk.start             = shdr->offset;
-        chunk.end               = shdr->offset + shdr->len - 1;
-        chunk.has_fin           = shdr->is_fin;
-        chunk.has_stop_sending  = 0;
-        chunk.has_reset_stream  = 0;
+        chunk.stream_id = shdr->stream_id;
+        chunk.start = shdr->offset;
+        chunk.end = shdr->offset + shdr->len - 1;
+        chunk.has_fin = shdr->is_fin;
+        chunk.has_stop_sending = 0;
+        chunk.has_reset_stream = 0;
         if (!ossl_quic_txpim_pkt_append_chunk(tpkt, &chunk))
             goto err; /* alloc error */
 
@@ -2498,9 +2483,9 @@ static void txp_enlink_tmp(QUIC_STREAM **tmp_head, QUIC_STREAM *stream)
 }
 
 static int txp_generate_stream_related(OSSL_QUIC_TX_PACKETISER *txp,
-                                       struct txp_pkt *pkt,
-                                       int *have_ack_eliciting,
-                                       QUIC_STREAM **tmp_head)
+    struct txp_pkt *pkt,
+    int *have_ack_eliciting,
+    QUIC_STREAM **tmp_head)
 {
     QUIC_STREAM_ITER it;
     WPACKET *wpkt;
@@ -2510,16 +2495,16 @@ static int txp_generate_stream_related(OSSL_QUIC_TX_PACKETISER *txp,
     uint64_t conn_consumed = 0;
 
     for (ossl_quic_stream_iter_init(&it, txp->args.qsm, 1);
-         it.stream != NULL;) {
+        it.stream != NULL;) {
 
         stream = it.stream;
         ossl_quic_stream_iter_next(&it);
         snext = it.stream;
 
-        stream->txp_sent_fc                  = 0;
-        stream->txp_sent_stop_sending        = 0;
-        stream->txp_sent_reset_stream        = 0;
-        stream->txp_blocked                  = 0;
+        stream->txp_sent_fc = 0;
+        stream->txp_sent_stop_sending = 0;
+        stream->txp_sent_reset_stream = 0;
+        stream->txp_blocked = 0;
         stream->txp_txfc_new_credit_consumed = 0;
 
         /* Stream Abort Frames (STOP_SENDING, RESET_STREAM) */
@@ -2530,8 +2515,8 @@ static int txp_generate_stream_related(OSSL_QUIC_TX_PACKETISER *txp,
             if (wpkt == NULL)
                 return 0; /* alloc error */
 
-            f.stream_id         = stream->id;
-            f.app_error_code    = stream->stop_sending_aec;
+            f.stream_id = stream->id;
+            f.app_error_code = stream->stop_sending_aec;
             if (!ossl_quic_wire_encode_frame_stop_sending(wpkt, &f)) {
                 tx_helper_rollback(h); /* can't fit */
                 txp_enlink_tmp(tmp_head, stream);
@@ -2556,8 +2541,8 @@ static int txp_generate_stream_related(OSSL_QUIC_TX_PACKETISER *txp,
             if (wpkt == NULL)
                 return 0; /* alloc error */
 
-            f.stream_id         = stream->id;
-            f.app_error_code    = stream->reset_stream_aec;
+            f.stream_id = stream->id;
+            f.app_error_code = stream->reset_stream_aec;
             if (!ossl_quic_stream_send_get_final_size(stream, &f.final_size))
                 return 0; /* should not be possible */
 
@@ -2606,7 +2591,7 @@ static int txp_generate_stream_related(OSSL_QUIC_TX_PACKETISER *txp,
             cwm = ossl_quic_rxfc_get_cwm(&stream->rxfc);
 
             if (!ossl_quic_wire_encode_frame_max_stream_data(wpkt, stream->id,
-                                                             cwm)) {
+                    cwm)) {
                 tx_helper_rollback(h); /* can't fit */
                 txp_enlink_tmp(tmp_head, stream);
                 break;
@@ -2638,13 +2623,13 @@ static int txp_generate_stream_related(OSSL_QUIC_TX_PACKETISER *txp,
                 return 0;
 
             if (!txp_generate_stream_frames(txp, pkt,
-                                            stream->id, stream->sstream,
-                                            &stream->txfc,
-                                            snext,
-                                            have_ack_eliciting,
-                                            &packet_full,
-                                            &stream->txp_txfc_new_credit_consumed,
-                                            conn_consumed)) {
+                    stream->id, stream->sstream,
+                    &stream->txfc,
+                    snext,
+                    have_ack_eliciting,
+                    &packet_full,
+                    &stream->txp_txfc_new_credit_consumed,
+                    conn_consumed)) {
                 /* Fatal error (allocation, etc.) */
                 txp_enlink_tmp(tmp_head, stream);
                 return 0;
@@ -2664,8 +2649,8 @@ static int txp_generate_stream_related(OSSL_QUIC_TX_PACKETISER *txp,
 }
 
 static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
-                               struct txp_pkt *pkt,
-                               int chosen_for_conn_close)
+    struct txp_pkt *pkt,
+    int chosen_for_conn_close)
 {
     int rc = TXP_ERR_SUCCESS;
     const uint32_t enc_level = pkt->h.enc_level;
@@ -2712,7 +2697,7 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
 
         if (ossl_quic_wire_encode_frame_handshake_done(wpkt)) {
             tpkt->had_handshake_done_frame = 1;
-            have_ack_eliciting             = 1;
+            have_ack_eliciting = 1;
 
             if (!tx_helper_commit(h))
                 goto fatal_err;
@@ -2736,7 +2721,7 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
 
         if (ossl_quic_wire_encode_frame_max_data(wpkt, cwm)) {
             tpkt->had_max_data_frame = 1;
-            have_ack_eliciting       = 1;
+            have_ack_eliciting = 1;
 
             if (!tx_helper_commit(h))
                 goto fatal_err;
@@ -2760,9 +2745,9 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
             goto fatal_err;
 
         if (ossl_quic_wire_encode_frame_max_streams(wpkt, /*is_uni=*/0,
-                                                    max_streams)) {
+                max_streams)) {
             tpkt->had_max_streams_bidi_frame = 1;
-            have_ack_eliciting               = 1;
+            have_ack_eliciting = 1;
 
             if (!tx_helper_commit(h))
                 goto fatal_err;
@@ -2786,9 +2771,9 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
             goto fatal_err;
 
         if (ossl_quic_wire_encode_frame_max_streams(wpkt, /*is_uni=*/1,
-                                                    max_streams)) {
+                max_streams)) {
             tpkt->had_max_streams_uni_frame = 1;
-            have_ack_eliciting              = 1;
+            have_ack_eliciting = 1;
 
             if (!tx_helper_commit(h))
                 goto fatal_err;
@@ -2801,54 +2786,54 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
 
     /* GCR Frames */
     for (cfq_item = ossl_quic_cfq_get_priority_head(txp->args.cfq, pn_space);
-         cfq_item != NULL;
-         cfq_item = ossl_quic_cfq_item_get_priority_next(cfq_item, pn_space)) {
+        cfq_item != NULL;
+        cfq_item = ossl_quic_cfq_item_get_priority_next(cfq_item, pn_space)) {
         uint64_t frame_type = ossl_quic_cfq_item_get_frame_type(cfq_item);
         const unsigned char *encoded = ossl_quic_cfq_item_get_encoded(cfq_item);
         size_t encoded_len = ossl_quic_cfq_item_get_encoded_len(cfq_item);
 
         switch (frame_type) {
-            case OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID:
-                if (!a.allow_new_conn_id)
-                    continue;
-                break;
-            case OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID:
-                if (!a.allow_retire_conn_id)
-                    continue;
-                break;
-            case OSSL_QUIC_FRAME_TYPE_NEW_TOKEN:
-                if (!a.allow_new_token)
-                    continue;
+        case OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID:
+            if (!a.allow_new_conn_id)
+                continue;
+            break;
+        case OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID:
+            if (!a.allow_retire_conn_id)
+                continue;
+            break;
+        case OSSL_QUIC_FRAME_TYPE_NEW_TOKEN:
+            if (!a.allow_new_token)
+                continue;
 
-                /*
-                 * NEW_TOKEN frames are handled via GCR, but some
-                 * Regenerate-strategy frames should come before them (namely
-                 * ACK, CONNECTION_CLOSE, PATH_CHALLENGE and PATH_RESPONSE). If
-                 * we find a NEW_TOKEN frame, do these now. If there are no
-                 * NEW_TOKEN frames in the GCR queue we will handle these below.
-                 */
-                if (!done_pre_token)
-                    if (txp_generate_pre_token(txp, pkt,
-                                               chosen_for_conn_close,
-                                               &can_be_non_inflight))
-                        done_pre_token = 1;
+            /*
+             * NEW_TOKEN frames are handled via GCR, but some
+             * Regenerate-strategy frames should come before them (namely
+             * ACK, CONNECTION_CLOSE, PATH_CHALLENGE and PATH_RESPONSE). If
+             * we find a NEW_TOKEN frame, do these now. If there are no
+             * NEW_TOKEN frames in the GCR queue we will handle these below.
+             */
+            if (!done_pre_token)
+                if (txp_generate_pre_token(txp, pkt,
+                        chosen_for_conn_close,
+                        &can_be_non_inflight))
+                    done_pre_token = 1;
 
-                break;
-            case OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE:
-                if (!a.allow_path_response)
-                    continue;
+            break;
+        case OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE:
+            if (!a.allow_path_response)
+                continue;
 
-                /*
-                 * RFC 9000 s. 8.2.2: An endpoint MUST expand datagrams that
-                 * contain a PATH_RESPONSE frame to at least the smallest
-                 * allowed maximum datagram size of 1200 bytes.
-                 */
-                pkt->force_pad = 1;
-                break;
-            default:
-                if (!a.allow_cfq_other)
-                    continue;
-                break;
+            /*
+             * RFC 9000 s. 8.2.2: An endpoint MUST expand datagrams that
+             * contain a PATH_RESPONSE frame to at least the smallest
+             * allowed maximum datagram size of 1200 bytes.
+             */
+            pkt->force_pad = 1;
+            break;
+        default:
+            if (!a.allow_cfq_other)
+                continue;
+            break;
         }
 
         /*
@@ -2875,8 +2860,8 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
      */
     if (!done_pre_token)
         if (txp_generate_pre_token(txp, pkt,
-                                   chosen_for_conn_close,
-                                   &can_be_non_inflight))
+                chosen_for_conn_close,
+                &can_be_non_inflight))
             done_pre_token = 1;
 
     /* CRYPTO Frames */
@@ -2887,8 +2872,8 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
     /* Stream-specific frames */
     if (a.allow_stream_rel && txp->handshake_complete)
         if (!txp_generate_stream_related(txp, pkt,
-                                         &have_ack_eliciting,
-                                         &pkt->stream_head))
+                &have_ack_eliciting,
+                &pkt->stream_head))
             goto fatal_err;
 
     /* PING */
@@ -2923,16 +2908,16 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
         can_be_non_inflight = 0;
 
     /* ACKM Data */
-    tpkt->ackm_pkt.num_bytes        = h->bytes_appended + pkt->geom.pkt_overhead;
-    tpkt->ackm_pkt.pkt_num          = txp->next_pn[pn_space];
+    tpkt->ackm_pkt.num_bytes = h->bytes_appended + pkt->geom.pkt_overhead;
+    tpkt->ackm_pkt.pkt_num = txp->next_pn[pn_space];
     /* largest_acked is set in txp_generate_pre_token */
-    tpkt->ackm_pkt.pkt_space        = pn_space;
-    tpkt->ackm_pkt.is_inflight      = !can_be_non_inflight;
+    tpkt->ackm_pkt.pkt_space = pn_space;
+    tpkt->ackm_pkt.is_inflight = !can_be_non_inflight;
     tpkt->ackm_pkt.is_ack_eliciting = have_ack_eliciting;
-    tpkt->ackm_pkt.is_pto_probe     = 0;
-    tpkt->ackm_pkt.is_mtu_probe     = 0;
-    tpkt->ackm_pkt.time             = txp->args.now(txp->args.now_arg);
-    tpkt->pkt_type                  = pkt->phdr.type;
+    tpkt->ackm_pkt.is_pto_probe = 0;
+    tpkt->ackm_pkt.is_mtu_probe = 0;
+    tpkt->ackm_pkt.time = txp->args.now(txp->args.now_arg);
+    tpkt->pkt_type = pkt->phdr.type;
 
     /* Done. */
     return rc;
@@ -2982,9 +2967,9 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
  *
  */
 static int txp_pkt_commit(OSSL_QUIC_TX_PACKETISER *txp,
-                          struct txp_pkt *pkt,
-                          uint32_t archetype,
-                          int *txpim_pkt_reffed)
+    struct txp_pkt *pkt,
+    uint32_t archetype,
+    int *txpim_pkt_reffed)
 {
     int rc = 1;
     uint32_t enc_level = pkt->h.enc_level;
@@ -3004,14 +2989,15 @@ static int txp_pkt_commit(OSSL_QUIC_TX_PACKETISER *txp,
         return 0;
 
     /* Packet Information for QTX */
-    txpkt.hdr       = &pkt->phdr;
-    txpkt.iovec     = txp->el[enc_level].iovec;
+    txpkt.hdr = &pkt->phdr;
+    txpkt.iovec = txp->el[enc_level].iovec;
     txpkt.num_iovec = pkt->h.num_iovec;
-    txpkt.local     = NULL;
-    txpkt.peer      = BIO_ADDR_family(&txp->args.peer) == AF_UNSPEC
-        ? NULL : &txp->args.peer;
-    txpkt.pn        = txp->next_pn[pn_space];
-    txpkt.flags     = OSSL_QTX_PKT_FLAG_COALESCE; /* always try to coalesce */
+    txpkt.local = NULL;
+    txpkt.peer = BIO_ADDR_family(&txp->args.peer) == AF_UNSPEC
+        ? NULL
+        : &txp->args.peer;
+    txpkt.pn = txp->next_pn[pn_space];
+    txpkt.flags = OSSL_QTX_PKT_FLAG_COALESCE; /* always try to coalesce */
 
     /* Generate TXPIM chunks representing STOP_SENDING and RESET_STREAM frames. */
     for (stream = pkt->stream_head; stream != NULL; stream = stream->txp_next)
@@ -3019,12 +3005,12 @@ static int txp_pkt_commit(OSSL_QUIC_TX_PACKETISER *txp,
             /* Log STOP_SENDING/RESET_STREAM chunk to TXPIM. */
             QUIC_TXPIM_CHUNK chunk;
 
-            chunk.stream_id         = stream->id;
-            chunk.start             = UINT64_MAX;
-            chunk.end               = 0;
-            chunk.has_fin           = 0;
-            chunk.has_stop_sending  = stream->txp_sent_stop_sending;
-            chunk.has_reset_stream  = stream->txp_sent_reset_stream;
+            chunk.stream_id = stream->id;
+            chunk.start = UINT64_MAX;
+            chunk.end = 0;
+            chunk.has_fin = 0;
+            chunk.has_stop_sending = stream->txp_sent_stop_sending;
+            chunk.has_reset_stream = stream->txp_sent_reset_stream;
             if (!ossl_quic_txpim_pkt_append_chunk(tpkt, &chunk))
                 return 0; /* alloc error */
         }
@@ -3069,7 +3055,7 @@ static int txp_pkt_commit(OSSL_QUIC_TX_PACKETISER *txp,
 
         if (stream->txp_txfc_new_credit_consumed > 0) {
             if (!ossl_assert(ossl_quic_txfc_consume_credit(&stream->txfc,
-                                                           stream->txp_txfc_new_credit_consumed)))
+                    stream->txp_txfc_new_credit_consumed)))
                 /*
                  * Should not be possible, but we should continue with our
                  * bookkeeping as we have already committed the packet to the
@@ -3164,13 +3150,13 @@ static int txp_el_ensure_iovec(struct txp_el *el, size_t num)
     if (iovec == NULL)
         return 0;
 
-    el->iovec          = iovec;
-    el->alloc_iovec    = num;
+    el->iovec = iovec;
+    el->alloc_iovec = num;
     return 1;
 }
 
 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)
 {
     char *reason = NULL;
     size_t reason_len = f->reason_len;
@@ -3192,29 +3178,29 @@ int ossl_quic_tx_packetiser_schedule_conn_close(OSSL_QUIC_TX_PACKETISER *txp,
             return 0;
     }
 
-    txp->conn_close_frame               = *f;
-    txp->conn_close_frame.reason        = reason;
-    txp->conn_close_frame.reason_len    = reason_len;
-    txp->want_conn_close                = 1;
+    txp->conn_close_frame = *f;
+    txp->conn_close_frame.reason = reason;
+    txp->conn_close_frame.reason_len = reason_len;
+    txp->want_conn_close = 1;
     return 1;
 }
 
 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)
 {
     txp->msg_callback = msg_callback;
     txp->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)
 {
     txp->msg_callback_arg = msg_callback_arg;
 }
 
 QUIC_PN ossl_quic_tx_packetiser_get_next_pn(OSSL_QUIC_TX_PACKETISER *txp,
-                                            uint32_t pn_space)
+    uint32_t pn_space)
 {
     if (pn_space >= QUIC_PN_SPACE_NUM)
         return UINT64_MAX;
@@ -3239,18 +3225,18 @@ OSSL_TIME ossl_quic_tx_packetiser_get_deadline(OSSL_QUIC_TX_PACKETISER *txp)
      * call will take care of selecting the correct packet archetype.
      */
     for (enc_level = QUIC_ENC_LEVEL_INITIAL;
-         enc_level < QUIC_ENC_LEVEL_NUM;
-         ++enc_level)
+        enc_level < QUIC_ENC_LEVEL_NUM;
+        ++enc_level)
         if (ossl_qtx_is_enc_level_provisioned(txp->args.qtx, enc_level)) {
             pn_space = ossl_quic_enc_level_to_pn_space(enc_level);
             deadline = ossl_time_min(deadline,
-                                     ossl_ackm_get_ack_deadline(txp->args.ackm, pn_space));
+                ossl_ackm_get_ack_deadline(txp->args.ackm, pn_space));
         }
 
     /* When will CC let us send more? */
     if (txp->args.cc_method->get_tx_allowance(txp->args.cc_data) == 0)
         deadline = ossl_time_min(deadline,
-                                 txp->args.cc_method->get_wakeup_deadline(txp->args.cc_data));
+            txp->args.cc_method->get_wakeup_deadline(txp->args.cc_data));
 
     return deadline;
 }
diff --git a/ssl/quic/quic_txpim.c b/ssl/quic/quic_txpim.c
index 04b25ee47a046..b1f47099e5c81 100644
--- a/ssl/quic/quic_txpim.c
+++ b/ssl/quic/quic_txpim.c
@@ -13,20 +13,20 @@
 typedef struct quic_txpim_pkt_ex_st QUIC_TXPIM_PKT_EX;
 
 struct quic_txpim_pkt_ex_st {
-    QUIC_TXPIM_PKT              public;
-    QUIC_TXPIM_PKT_EX          *prev, *next;
-    QUIC_TXPIM_CHUNK           *chunks;
-    size_t                      num_chunks, alloc_chunks;
-    unsigned int                chunks_need_sort : 1;
+    QUIC_TXPIM_PKT public;
+    QUIC_TXPIM_PKT_EX *prev, *next;
+    QUIC_TXPIM_CHUNK *chunks;
+    size_t num_chunks, alloc_chunks;
+    unsigned int chunks_need_sort : 1;
 };
 
 typedef struct quic_txpim_pkt_ex_list {
-    QUIC_TXPIM_PKT_EX          *head, *tail;
+    QUIC_TXPIM_PKT_EX *head, *tail;
 } QUIC_TXPIM_PKT_EX_LIST;
 
 struct quic_txpim_st {
-    QUIC_TXPIM_PKT_EX_LIST  free_list;
-    size_t                  in_use;
+    QUIC_TXPIM_PKT_EX_LIST free_list;
+    size_t in_use;
 };
 
 #define MAX_ALLOC_CHUNKS 512
@@ -108,14 +108,14 @@ static void txpim_clear(QUIC_TXPIM_PKT_EX *ex)
 {
     memset(&ex->public.ackm_pkt, 0, sizeof(ex->public.ackm_pkt));
     ossl_quic_txpim_pkt_clear_chunks(&ex->public);
-    ex->public.retx_head                   = NULL;
-    ex->public.fifd                        = NULL;
-    ex->public.had_handshake_done_frame    = 0;
-    ex->public.had_max_data_frame          = 0;
-    ex->public.had_max_streams_bidi_frame  = 0;
-    ex->public.had_max_streams_uni_frame   = 0;
-    ex->public.had_ack_frame               = 0;
-    ex->public.had_conn_close              = 0;
+    ex->public.retx_head = NULL;
+    ex->public.fifd = NULL;
+    ex->public.had_handshake_done_frame = 0;
+    ex->public.had_max_data_frame = 0;
+    ex->public.had_max_streams_bidi_frame = 0;
+    ex->public.had_max_streams_uni_frame = 0;
+    ex->public.had_ack_frame = 0;
+    ex->public.had_conn_close = 0;
 }
 
 QUIC_TXPIM_PKT *ossl_quic_txpim_pkt_alloc(QUIC_TXPIM *txpim)
@@ -141,7 +141,7 @@ void ossl_quic_txpim_pkt_release(QUIC_TXPIM *txpim, QUIC_TXPIM_PKT *fpkt)
 }
 
 void ossl_quic_txpim_pkt_add_cfq_item(QUIC_TXPIM_PKT *fpkt,
-                                      QUIC_CFQ_ITEM *item)
+    QUIC_CFQ_ITEM *item)
 {
     item->pkt_next = fpkt->retx_head;
     item->pkt_prev = NULL;
@@ -156,7 +156,7 @@ void ossl_quic_txpim_pkt_clear_chunks(QUIC_TXPIM_PKT *fpkt)
 }
 
 int ossl_quic_txpim_pkt_append_chunk(QUIC_TXPIM_PKT *fpkt,
-                                     const QUIC_TXPIM_CHUNK *chunk)
+    const QUIC_TXPIM_CHUNK *chunk)
 {
     QUIC_TXPIM_PKT_EX *ex = (QUIC_TXPIM_PKT_EX *)fpkt;
     QUIC_TXPIM_CHUNK *new_chunk;
@@ -170,16 +170,16 @@ int ossl_quic_txpim_pkt_append_chunk(QUIC_TXPIM_PKT *fpkt,
             return 0;
 
         new_chunk = OPENSSL_realloc(ex->chunks,
-                                    new_alloc_chunks * sizeof(QUIC_TXPIM_CHUNK));
+            new_alloc_chunks * sizeof(QUIC_TXPIM_CHUNK));
         if (new_chunk == NULL)
             return 0;
 
-        ex->chunks          = new_chunk;
-        ex->alloc_chunks    = new_alloc_chunks;
+        ex->chunks = new_chunk;
+        ex->alloc_chunks = new_alloc_chunks;
     }
 
-    ex->chunks[ex->num_chunks++]    = *chunk;
-    ex->chunks_need_sort            = 1;
+    ex->chunks[ex->num_chunks++] = *chunk;
+    ex->chunks_need_sort = 1;
     return 1;
 }
 
diff --git a/ssl/quic/quic_types.c b/ssl/quic/quic_types.c
index 4ff3ae6580b51..2c06e191e9222 100644
--- a/ssl/quic/quic_types.c
+++ b/ssl/quic/quic_types.c
@@ -12,7 +12,7 @@
 #include <openssl/err.h>
 
 int ossl_quic_gen_rand_conn_id(OSSL_LIB_CTX *libctx, size_t len,
-                               QUIC_CONN_ID *cid)
+    QUIC_CONN_ID *cid)
 {
     if (len > QUIC_MAX_CONN_ID_LEN)
         return 0;
diff --git a/ssl/quic/quic_wire.c b/ssl/quic/quic_wire.c
index a7c7667797d9d..66be80e78127e 100644
--- a/ssl/quic/quic_wire.c
+++ b/ssl/quic/quic_wire.c
@@ -53,8 +53,8 @@ int ossl_quic_wire_encode_frame_ping(WPACKET *pkt)
 }
 
 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)
 {
     uint64_t frame_type = ack->ecn_present ? OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN
                                            : OSSL_QUIC_FRAME_TYPE_ACK_WITHOUT_ECN;
@@ -67,68 +67,68 @@ int ossl_quic_wire_encode_frame_ack(WPACKET *pkt,
         return 0;
 
     delay = ossl_time_divide(ossl_time_divide(ack->delay_time, OSSL_TIME_US),
-                             (uint64_t)1 << ack_delay_exponent);
-    ack_delay_enc   = ossl_time2ticks(delay);
+        (uint64_t)1 << ack_delay_exponent);
+    ack_delay_enc = ossl_time2ticks(delay);
 
-    largest_ackd    = ack->ack_ranges[0].end;
+    largest_ackd = ack->ack_ranges[0].end;
     first_ack_range = ack->ack_ranges[0].end - ack->ack_ranges[0].start;
 
     if (!encode_frame_hdr(pkt, frame_type)
-            || !WPACKET_quic_write_vlint(pkt, largest_ackd)
-            || !WPACKET_quic_write_vlint(pkt, ack_delay_enc)
-            || !WPACKET_quic_write_vlint(pkt, num_ack_ranges - 1)
-            || !WPACKET_quic_write_vlint(pkt, first_ack_range))
+        || !WPACKET_quic_write_vlint(pkt, largest_ackd)
+        || !WPACKET_quic_write_vlint(pkt, ack_delay_enc)
+        || !WPACKET_quic_write_vlint(pkt, num_ack_ranges - 1)
+        || !WPACKET_quic_write_vlint(pkt, first_ack_range))
         return 0;
 
     for (i = 1; i < num_ack_ranges; ++i) {
         uint64_t gap, range_len;
 
-        gap         = ack->ack_ranges[i - 1].start - ack->ack_ranges[i].end - 2;
-        range_len   = ack->ack_ranges[i].end - ack->ack_ranges[i].start;
+        gap = ack->ack_ranges[i - 1].start - ack->ack_ranges[i].end - 2;
+        range_len = ack->ack_ranges[i].end - ack->ack_ranges[i].start;
 
         if (!WPACKET_quic_write_vlint(pkt, gap)
-                || !WPACKET_quic_write_vlint(pkt, range_len))
+            || !WPACKET_quic_write_vlint(pkt, range_len))
             return 0;
     }
 
     if (ack->ecn_present)
         if (!WPACKET_quic_write_vlint(pkt, ack->ect0)
-                || !WPACKET_quic_write_vlint(pkt, ack->ect1)
-                || !WPACKET_quic_write_vlint(pkt, ack->ecnce))
+            || !WPACKET_quic_write_vlint(pkt, ack->ect1)
+            || !WPACKET_quic_write_vlint(pkt, ack->ecnce))
             return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_encode_frame_reset_stream(WPACKET *pkt,
-                                             const OSSL_QUIC_FRAME_RESET_STREAM *f)
+    const OSSL_QUIC_FRAME_RESET_STREAM *f)
 {
     if (!encode_frame_hdr(pkt, OSSL_QUIC_FRAME_TYPE_RESET_STREAM)
-            || !WPACKET_quic_write_vlint(pkt, f->stream_id)
-            || !WPACKET_quic_write_vlint(pkt, f->app_error_code)
-            || !WPACKET_quic_write_vlint(pkt, f->final_size))
+        || !WPACKET_quic_write_vlint(pkt, f->stream_id)
+        || !WPACKET_quic_write_vlint(pkt, f->app_error_code)
+        || !WPACKET_quic_write_vlint(pkt, f->final_size))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_encode_frame_stop_sending(WPACKET *pkt,
-                                             const OSSL_QUIC_FRAME_STOP_SENDING *f)
+    const OSSL_QUIC_FRAME_STOP_SENDING *f)
 {
     if (!encode_frame_hdr(pkt, OSSL_QUIC_FRAME_TYPE_STOP_SENDING)
-            || !WPACKET_quic_write_vlint(pkt, f->stream_id)
-            || !WPACKET_quic_write_vlint(pkt, f->app_error_code))
+        || !WPACKET_quic_write_vlint(pkt, f->stream_id)
+        || !WPACKET_quic_write_vlint(pkt, f->app_error_code))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_encode_frame_crypto_hdr(WPACKET *pkt,
-                                           const OSSL_QUIC_FRAME_CRYPTO *f)
+    const OSSL_QUIC_FRAME_CRYPTO *f)
 {
     if (!encode_frame_hdr(pkt, OSSL_QUIC_FRAME_TYPE_CRYPTO)
-            || !WPACKET_quic_write_vlint(pkt, f->offset)
-            || !WPACKET_quic_write_vlint(pkt, f->len))
+        || !WPACKET_quic_write_vlint(pkt, f->offset)
+        || !WPACKET_quic_write_vlint(pkt, f->len))
         return 0;
 
     return 1;
@@ -148,13 +148,13 @@ size_t ossl_quic_wire_get_encoded_frame_len_crypto_hdr(const OSSL_QUIC_FRAME_CRY
 }
 
 void *ossl_quic_wire_encode_frame_crypto(WPACKET *pkt,
-                                         const OSSL_QUIC_FRAME_CRYPTO *f)
+    const OSSL_QUIC_FRAME_CRYPTO *f)
 {
     unsigned char *p = NULL;
 
     if (!ossl_quic_wire_encode_frame_crypto_hdr(pkt, f)
-            || f->len > SIZE_MAX /* sizeof(uint64_t) > sizeof(size_t)? */
-            || !WPACKET_allocate_bytes(pkt, (size_t)f->len, &p))
+        || f->len > SIZE_MAX /* sizeof(uint64_t) > sizeof(size_t)? */
+        || !WPACKET_allocate_bytes(pkt, (size_t)f->len, &p))
         return NULL;
 
     if (f->data != NULL)
@@ -164,19 +164,19 @@ void *ossl_quic_wire_encode_frame_crypto(WPACKET *pkt,
 }
 
 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)
 {
     if (!encode_frame_hdr(pkt, OSSL_QUIC_FRAME_TYPE_NEW_TOKEN)
-            || !WPACKET_quic_write_vlint(pkt, token_len)
-            || !WPACKET_memcpy(pkt, token, token_len))
+        || !WPACKET_quic_write_vlint(pkt, token_len)
+        || !WPACKET_memcpy(pkt, token, token_len))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_encode_frame_stream_hdr(WPACKET *pkt,
-                                           const OSSL_QUIC_FRAME_STREAM *f)
+    const OSSL_QUIC_FRAME_STREAM *f)
 {
     uint64_t frame_type = OSSL_QUIC_FRAME_TYPE_STREAM;
 
@@ -188,7 +188,7 @@ int ossl_quic_wire_encode_frame_stream_hdr(WPACKET *pkt,
         frame_type |= OSSL_QUIC_FRAME_FLAG_STREAM_FIN;
 
     if (!encode_frame_hdr(pkt, frame_type)
-            || !WPACKET_quic_write_vlint(pkt, f->stream_id))
+        || !WPACKET_quic_write_vlint(pkt, f->stream_id))
         return 0;
 
     if (f->offset != 0 && !WPACKET_quic_write_vlint(pkt, f->offset))
@@ -229,13 +229,13 @@ size_t ossl_quic_wire_get_encoded_frame_len_stream_hdr(const OSSL_QUIC_FRAME_STR
 }
 
 void *ossl_quic_wire_encode_frame_stream(WPACKET *pkt,
-                                         const OSSL_QUIC_FRAME_STREAM *f)
+    const OSSL_QUIC_FRAME_STREAM *f)
 {
 
     unsigned char *p = NULL;
 
     if (!ossl_quic_wire_encode_frame_stream_hdr(pkt, f)
-            || f->len > SIZE_MAX /* sizeof(uint64_t) > sizeof(size_t)? */)
+        || f->len > SIZE_MAX /* sizeof(uint64_t) > sizeof(size_t)? */)
         return NULL;
 
     if (!WPACKET_allocate_bytes(pkt, (size_t)f->len, &p))
@@ -248,129 +248,125 @@ void *ossl_quic_wire_encode_frame_stream(WPACKET *pkt,
 }
 
 int ossl_quic_wire_encode_frame_max_data(WPACKET *pkt,
-                                         uint64_t max_data)
+    uint64_t max_data)
 {
     if (!encode_frame_hdr(pkt, OSSL_QUIC_FRAME_TYPE_MAX_DATA)
-            || !WPACKET_quic_write_vlint(pkt, max_data))
+        || !WPACKET_quic_write_vlint(pkt, max_data))
         return 0;
 
     return 1;
 }
 
 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)
 {
     if (!encode_frame_hdr(pkt, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA)
-            || !WPACKET_quic_write_vlint(pkt, stream_id)
-            || !WPACKET_quic_write_vlint(pkt, max_data))
+        || !WPACKET_quic_write_vlint(pkt, stream_id)
+        || !WPACKET_quic_write_vlint(pkt, max_data))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_encode_frame_max_streams(WPACKET *pkt,
-                                            char     is_uni,
-                                            uint64_t max_streams)
+    char is_uni,
+    uint64_t max_streams)
 {
-    if (!encode_frame_hdr(pkt, is_uni ? OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI
-                                      : OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI)
-            || !WPACKET_quic_write_vlint(pkt, max_streams))
+    if (!encode_frame_hdr(pkt, is_uni ? OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI : OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI)
+        || !WPACKET_quic_write_vlint(pkt, max_streams))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_encode_frame_data_blocked(WPACKET *pkt,
-                                             uint64_t max_data)
+    uint64_t max_data)
 {
     if (!encode_frame_hdr(pkt, OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED)
-            || !WPACKET_quic_write_vlint(pkt, max_data))
+        || !WPACKET_quic_write_vlint(pkt, max_data))
         return 0;
 
     return 1;
 }
 
-
 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)
 {
     if (!encode_frame_hdr(pkt, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED)
-            || !WPACKET_quic_write_vlint(pkt, stream_id)
-            || !WPACKET_quic_write_vlint(pkt, max_stream_data))
+        || !WPACKET_quic_write_vlint(pkt, stream_id)
+        || !WPACKET_quic_write_vlint(pkt, max_stream_data))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_encode_frame_streams_blocked(WPACKET *pkt,
-                                                char is_uni,
-                                                uint64_t max_streams)
+    char is_uni,
+    uint64_t max_streams)
 {
-    if (!encode_frame_hdr(pkt, is_uni ? OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI
-                                      : OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI)
-            || !WPACKET_quic_write_vlint(pkt, max_streams))
+    if (!encode_frame_hdr(pkt, is_uni ? OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI : OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI)
+        || !WPACKET_quic_write_vlint(pkt, max_streams))
         return 0;
 
     return 1;
 }
 
 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)
 {
     if (f->conn_id.id_len < 1
         || f->conn_id.id_len > QUIC_MAX_CONN_ID_LEN)
         return 0;
 
     if (!encode_frame_hdr(pkt, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID)
-            || !WPACKET_quic_write_vlint(pkt, f->seq_num)
-            || !WPACKET_quic_write_vlint(pkt, f->retire_prior_to)
-            || !WPACKET_put_bytes_u8(pkt, f->conn_id.id_len)
-            || !WPACKET_memcpy(pkt, f->conn_id.id, f->conn_id.id_len)
-            || !WPACKET_memcpy(pkt, f->stateless_reset.token,
-                               sizeof(f->stateless_reset.token)))
+        || !WPACKET_quic_write_vlint(pkt, f->seq_num)
+        || !WPACKET_quic_write_vlint(pkt, f->retire_prior_to)
+        || !WPACKET_put_bytes_u8(pkt, f->conn_id.id_len)
+        || !WPACKET_memcpy(pkt, f->conn_id.id, f->conn_id.id_len)
+        || !WPACKET_memcpy(pkt, f->stateless_reset.token,
+            sizeof(f->stateless_reset.token)))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_encode_frame_retire_conn_id(WPACKET *pkt,
-                                               uint64_t seq_num)
+    uint64_t seq_num)
 {
     if (!encode_frame_hdr(pkt, OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID)
-            || !WPACKET_quic_write_vlint(pkt, seq_num))
+        || !WPACKET_quic_write_vlint(pkt, seq_num))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_encode_frame_path_challenge(WPACKET *pkt,
-                                               uint64_t data)
+    uint64_t data)
 {
     if (!encode_frame_hdr(pkt, OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE)
-            || !WPACKET_put_bytes_u64(pkt, data))
+        || !WPACKET_put_bytes_u64(pkt, data))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_encode_frame_path_response(WPACKET *pkt,
-                                              uint64_t data)
+    uint64_t data)
 {
     if (!encode_frame_hdr(pkt, OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE)
-            || !WPACKET_put_bytes_u64(pkt, data))
+        || !WPACKET_put_bytes_u64(pkt, data))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_encode_frame_conn_close(WPACKET *pkt,
-                                           const OSSL_QUIC_FRAME_CONN_CLOSE *f)
+    const OSSL_QUIC_FRAME_CONN_CLOSE *f)
 {
-    if (!encode_frame_hdr(pkt, f->is_app ? OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_APP
-                                         : OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_TRANSPORT)
-            || !WPACKET_quic_write_vlint(pkt, f->error_code))
+    if (!encode_frame_hdr(pkt, f->is_app ? OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_APP : OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_TRANSPORT)
+        || !WPACKET_quic_write_vlint(pkt, f->error_code))
         return 0;
 
     /*
@@ -381,7 +377,7 @@ int ossl_quic_wire_encode_frame_conn_close(WPACKET *pkt,
         return 0;
 
     if (!WPACKET_quic_write_vlint(pkt, f->reason_len)
-            || !WPACKET_memcpy(pkt, f->reason, f->reason_len))
+        || !WPACKET_memcpy(pkt, f->reason, f->reason_len))
         return 0;
 
     return 1;
@@ -393,9 +389,9 @@ int ossl_quic_wire_encode_frame_handshake_done(WPACKET *pkt)
 }
 
 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)
 {
     unsigned char *b = NULL;
 
@@ -415,27 +411,28 @@ unsigned char *ossl_quic_wire_encode_transport_param_bytes(WPACKET *pkt,
 }
 
 int ossl_quic_wire_encode_transport_param_int(WPACKET *pkt,
-                                              uint64_t id,
-                                              uint64_t value)
+    uint64_t id,
+    uint64_t value)
 {
     if (!WPACKET_quic_write_vlint(pkt, id)
-            || !WPACKET_quic_write_vlint(pkt, ossl_quic_vlint_encode_len(value))
-            || !WPACKET_quic_write_vlint(pkt, value))
+        || !WPACKET_quic_write_vlint(pkt, ossl_quic_vlint_encode_len(value))
+        || !WPACKET_quic_write_vlint(pkt, value))
         return 0;
 
     return 1;
 }
 
 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)
 {
     if (cid->id_len > QUIC_MAX_CONN_ID_LEN)
         return 0;
 
     if (ossl_quic_wire_encode_transport_param_bytes(wpkt, id,
-                                                    cid->id,
-                                                    cid->id_len) == NULL)
+            cid->id,
+            cid->id_len)
+        == NULL)
         return 0;
 
     return 1;
@@ -446,7 +443,7 @@ int ossl_quic_wire_encode_transport_param_cid(WPACKET *wpkt,
  * =========================
  */
 int ossl_quic_wire_peek_frame_header(PACKET *pkt, uint64_t *type,
-                                     int *was_minimal)
+    int *was_minimal)
 {
     return PACKET_peek_quic_vlint_ex(pkt, type, was_minimal);
 }
@@ -457,14 +454,14 @@ int ossl_quic_wire_skip_frame_header(PACKET *pkt, uint64_t *type)
 }
 
 static int expect_frame_header_mask(PACKET *pkt,
-                                    uint64_t expected_frame_type,
-                                    uint64_t mask_bits,
-                                    uint64_t *actual_frame_type)
+    uint64_t expected_frame_type,
+    uint64_t mask_bits,
+    uint64_t *actual_frame_type)
 {
     uint64_t actual_frame_type_;
 
     if (!ossl_quic_wire_skip_frame_header(pkt, &actual_frame_type_)
-            || (actual_frame_type_ & ~mask_bits) != expected_frame_type)
+        || (actual_frame_type_ & ~mask_bits) != expected_frame_type)
         return 0;
 
     if (actual_frame_type != NULL)
@@ -478,23 +475,23 @@ static int expect_frame_header(PACKET *pkt, uint64_t expected_frame_type)
     uint64_t actual_frame_type;
 
     if (!ossl_quic_wire_skip_frame_header(pkt, &actual_frame_type)
-            || actual_frame_type != expected_frame_type)
+        || actual_frame_type != expected_frame_type)
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_peek_frame_ack_num_ranges(const PACKET *orig_pkt,
-                                             uint64_t *total_ranges)
+    uint64_t *total_ranges)
 {
     PACKET pkt = *orig_pkt;
     uint64_t ack_range_count, i;
 
     if (!expect_frame_header_mask(&pkt, OSSL_QUIC_FRAME_TYPE_ACK_WITHOUT_ECN,
-                                  1, NULL)
-            || !PACKET_skip_quic_vlint(&pkt)
-            || !PACKET_skip_quic_vlint(&pkt)
-            || !PACKET_get_quic_vlint(&pkt, &ack_range_count))
+            1, NULL)
+        || !PACKET_skip_quic_vlint(&pkt)
+        || !PACKET_skip_quic_vlint(&pkt)
+        || !PACKET_get_quic_vlint(&pkt, &ack_range_count))
         return 0;
 
     /*
@@ -515,19 +512,20 @@ int ossl_quic_wire_peek_frame_ack_num_ranges(const PACKET *orig_pkt,
 }
 
 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)
+{
     uint64_t frame_type, largest_ackd, ack_delay_raw;
     uint64_t ack_range_count, first_ack_range, start, end, i;
 
     /* This call matches both ACK_WITHOUT_ECN and ACK_WITH_ECN. */
     if (!expect_frame_header_mask(pkt, OSSL_QUIC_FRAME_TYPE_ACK_WITHOUT_ECN,
-                                  1, &frame_type)
-            || !PACKET_get_quic_vlint(pkt, &largest_ackd)
-            || !PACKET_get_quic_vlint(pkt, &ack_delay_raw)
-            || !PACKET_get_quic_vlint(pkt, &ack_range_count)
-            || !PACKET_get_quic_vlint(pkt, &first_ack_range))
+            1, &frame_type)
+        || !PACKET_get_quic_vlint(pkt, &largest_ackd)
+        || !PACKET_get_quic_vlint(pkt, &ack_delay_raw)
+        || !PACKET_get_quic_vlint(pkt, &ack_range_count)
+        || !PACKET_get_quic_vlint(pkt, &first_ack_range))
         return 0;
 
     if (first_ack_range > largest_ackd)
@@ -542,14 +540,14 @@ int ossl_quic_wire_decode_frame_ack(PACKET *pkt,
         int err = 0;
         ack->delay_time
             = ossl_time_multiply(ossl_ticks2time(OSSL_TIME_US),
-                                 safe_mul_uint64_t(ack_delay_raw,
-                                                   (uint64_t)1 << ack_delay_exponent,
-                                                   &err));
+                safe_mul_uint64_t(ack_delay_raw,
+                    (uint64_t)1 << ack_delay_exponent,
+                    &err));
         if (err)
             ack->delay_time = ossl_time_infinite();
 
         if (ack->num_ack_ranges > 0) {
-            ack->ack_ranges[0].end   = largest_ackd;
+            ack->ack_ranges[0].end = largest_ackd;
             ack->ack_ranges[0].start = start;
         }
     }
@@ -558,7 +556,7 @@ int ossl_quic_wire_decode_frame_ack(PACKET *pkt,
         uint64_t gap, len;
 
         if (!PACKET_get_quic_vlint(pkt, &gap)
-                || !PACKET_get_quic_vlint(pkt, &len))
+            || !PACKET_get_quic_vlint(pkt, &len))
             return 0;
 
         end = start - gap - 2;
@@ -567,7 +565,7 @@ int ossl_quic_wire_decode_frame_ack(PACKET *pkt,
 
         if (ack != NULL && i + 1 < ack->num_ack_ranges) {
             ack->ack_ranges[i + 1].start = start = end - len;
-            ack->ack_ranges[i + 1].end   = end;
+            ack->ack_ranges[i + 1].end = end;
         }
     }
 
@@ -581,15 +579,15 @@ int ossl_quic_wire_decode_frame_ack(PACKET *pkt,
         uint64_t ect0, ect1, ecnce;
 
         if (!PACKET_get_quic_vlint(pkt, &ect0)
-                || !PACKET_get_quic_vlint(pkt, &ect1)
-                || !PACKET_get_quic_vlint(pkt, &ecnce))
+            || !PACKET_get_quic_vlint(pkt, &ect1)
+            || !PACKET_get_quic_vlint(pkt, &ecnce))
             return 0;
 
         if (ack != NULL) {
-            ack->ect0           = ect0;
-            ack->ect1           = ect1;
-            ack->ecnce          = ecnce;
-            ack->ecn_present    = 1;
+            ack->ect0 = ect0;
+            ack->ect1 = ect1;
+            ack->ecnce = ecnce;
+            ack->ecn_present = 1;
         }
     } else if (ack != NULL) {
         ack->ecn_present = 0;
@@ -599,36 +597,36 @@ int ossl_quic_wire_decode_frame_ack(PACKET *pkt,
 }
 
 int ossl_quic_wire_decode_frame_reset_stream(PACKET *pkt,
-                                             OSSL_QUIC_FRAME_RESET_STREAM *f)
+    OSSL_QUIC_FRAME_RESET_STREAM *f)
 {
     if (!expect_frame_header(pkt, OSSL_QUIC_FRAME_TYPE_RESET_STREAM)
-            || !PACKET_get_quic_vlint(pkt, &f->stream_id)
-            || !PACKET_get_quic_vlint(pkt, &f->app_error_code)
-            || !PACKET_get_quic_vlint(pkt, &f->final_size))
+        || !PACKET_get_quic_vlint(pkt, &f->stream_id)
+        || !PACKET_get_quic_vlint(pkt, &f->app_error_code)
+        || !PACKET_get_quic_vlint(pkt, &f->final_size))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_decode_frame_stop_sending(PACKET *pkt,
-                                             OSSL_QUIC_FRAME_STOP_SENDING *f)
+    OSSL_QUIC_FRAME_STOP_SENDING *f)
 {
     if (!expect_frame_header(pkt, OSSL_QUIC_FRAME_TYPE_STOP_SENDING)
-            || !PACKET_get_quic_vlint(pkt, &f->stream_id)
-            || !PACKET_get_quic_vlint(pkt, &f->app_error_code))
+        || !PACKET_get_quic_vlint(pkt, &f->stream_id)
+        || !PACKET_get_quic_vlint(pkt, &f->app_error_code))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_decode_frame_crypto(PACKET *pkt,
-                                       int nodata,
-                                       OSSL_QUIC_FRAME_CRYPTO *f)
+    int nodata,
+    OSSL_QUIC_FRAME_CRYPTO *f)
 {
     if (!expect_frame_header(pkt, OSSL_QUIC_FRAME_TYPE_CRYPTO)
-            || !PACKET_get_quic_vlint(pkt, &f->offset)
-            || !PACKET_get_quic_vlint(pkt, &f->len)
-            || f->len > SIZE_MAX /* sizeof(uint64_t) > sizeof(size_t)? */)
+        || !PACKET_get_quic_vlint(pkt, &f->offset)
+        || !PACKET_get_quic_vlint(pkt, &f->len)
+        || f->len > SIZE_MAX /* sizeof(uint64_t) > sizeof(size_t)? */)
         return 0;
 
     if (f->offset + f->len > (((uint64_t)1) << 62) - 1)
@@ -650,21 +648,21 @@ int ossl_quic_wire_decode_frame_crypto(PACKET *pkt,
     return 1;
 }
 
-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)
 {
     uint64_t token_len_;
 
     if (!expect_frame_header(pkt, OSSL_QUIC_FRAME_TYPE_NEW_TOKEN)
-            || !PACKET_get_quic_vlint(pkt, &token_len_))
+        || !PACKET_get_quic_vlint(pkt, &token_len_))
         return 0;
 
     if (token_len_ > SIZE_MAX)
         return 0;
 
-    *token      = PACKET_data(pkt);
-    *token_len  = (size_t)token_len_;
+    *token = PACKET_data(pkt);
+    *token_len = (size_t)token_len_;
 
     if (!PACKET_forward(pkt, (size_t)token_len_))
         return 0;
@@ -673,16 +671,16 @@ int ossl_quic_wire_decode_frame_new_token(PACKET               *pkt,
 }
 
 int ossl_quic_wire_decode_frame_stream(PACKET *pkt,
-                                       int nodata,
-                                       OSSL_QUIC_FRAME_STREAM *f)
+    int nodata,
+    OSSL_QUIC_FRAME_STREAM *f)
 {
     uint64_t frame_type;
 
     /* This call matches all STREAM values (low 3 bits are masked). */
     if (!expect_frame_header_mask(pkt, OSSL_QUIC_FRAME_TYPE_STREAM,
-                                  OSSL_QUIC_FRAME_FLAG_STREAM_MASK,
-                                  &frame_type)
-            || !PACKET_get_quic_vlint(pkt, &f->stream_id))
+            OSSL_QUIC_FRAME_FLAG_STREAM_MASK,
+            &frame_type)
+        || !PACKET_get_quic_vlint(pkt, &f->stream_id))
         return 0;
 
     if ((frame_type & OSSL_QUIC_FRAME_FLAG_STREAM_OFF) != 0) {
@@ -693,7 +691,7 @@ int ossl_quic_wire_decode_frame_stream(PACKET *pkt,
     }
 
     f->has_explicit_len = ((frame_type & OSSL_QUIC_FRAME_FLAG_STREAM_LEN) != 0);
-    f->is_fin           = ((frame_type & OSSL_QUIC_FRAME_FLAG_STREAM_FIN) != 0);
+    f->is_fin = ((frame_type & OSSL_QUIC_FRAME_FLAG_STREAM_FIN) != 0);
 
     if (f->has_explicit_len) {
         if (!PACKET_get_quic_vlint(pkt, &f->len))
@@ -727,85 +725,85 @@ int ossl_quic_wire_decode_frame_stream(PACKET *pkt,
 }
 
 int ossl_quic_wire_decode_frame_max_data(PACKET *pkt,
-                                         uint64_t *max_data)
+    uint64_t *max_data)
 {
     if (!expect_frame_header(pkt, OSSL_QUIC_FRAME_TYPE_MAX_DATA)
-            || !PACKET_get_quic_vlint(pkt, max_data))
+        || !PACKET_get_quic_vlint(pkt, max_data))
         return 0;
 
     return 1;
 }
 
 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)
 {
     if (!expect_frame_header(pkt, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA)
-            || !PACKET_get_quic_vlint(pkt, stream_id)
-            || !PACKET_get_quic_vlint(pkt, max_stream_data))
+        || !PACKET_get_quic_vlint(pkt, stream_id)
+        || !PACKET_get_quic_vlint(pkt, max_stream_data))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_decode_frame_max_streams(PACKET *pkt,
-                                            uint64_t *max_streams)
+    uint64_t *max_streams)
 {
     /* This call matches both MAX_STREAMS_BIDI and MAX_STREAMS_UNI. */
     if (!expect_frame_header_mask(pkt, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI,
-                                  1, NULL)
-            || !PACKET_get_quic_vlint(pkt, max_streams))
+            1, NULL)
+        || !PACKET_get_quic_vlint(pkt, max_streams))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_decode_frame_data_blocked(PACKET *pkt,
-                                             uint64_t *max_data)
+    uint64_t *max_data)
 {
     if (!expect_frame_header(pkt, OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED)
-            || !PACKET_get_quic_vlint(pkt, max_data))
+        || !PACKET_get_quic_vlint(pkt, max_data))
         return 0;
 
     return 1;
 }
 
 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)
 {
     if (!expect_frame_header(pkt, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED)
-            || !PACKET_get_quic_vlint(pkt, stream_id)
-            || !PACKET_get_quic_vlint(pkt, max_stream_data))
+        || !PACKET_get_quic_vlint(pkt, stream_id)
+        || !PACKET_get_quic_vlint(pkt, max_stream_data))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_decode_frame_streams_blocked(PACKET *pkt,
-                                                uint64_t *max_streams)
+    uint64_t *max_streams)
 {
     /* This call matches both STREAMS_BLOCKED_BIDI and STREAMS_BLOCKED_UNI. */
     if (!expect_frame_header_mask(pkt, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI,
-                                  1, NULL)
-            || !PACKET_get_quic_vlint(pkt, max_streams))
+            1, NULL)
+        || !PACKET_get_quic_vlint(pkt, max_streams))
         return 0;
 
     return 1;
 }
 
 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)
 {
     unsigned int len;
 
     if (!expect_frame_header(pkt, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID)
-            || !PACKET_get_quic_vlint(pkt, &f->seq_num)
-            || !PACKET_get_quic_vlint(pkt, &f->retire_prior_to)
-            || f->seq_num < f->retire_prior_to
-            || !PACKET_get_1(pkt, &len)
-            || len < 1
-            || len > QUIC_MAX_CONN_ID_LEN)
+        || !PACKET_get_quic_vlint(pkt, &f->seq_num)
+        || !PACKET_get_quic_vlint(pkt, &f->retire_prior_to)
+        || f->seq_num < f->retire_prior_to
+        || !PACKET_get_1(pkt, &len)
+        || len < 1
+        || len > QUIC_MAX_CONN_ID_LEN)
         return 0;
 
     f->conn_id.id_len = (unsigned char)len;
@@ -817,51 +815,51 @@ int ossl_quic_wire_decode_frame_new_conn_id(PACKET *pkt,
         memset(f->conn_id.id + len, 0, QUIC_MAX_CONN_ID_LEN - len);
 
     if (!PACKET_copy_bytes(pkt, f->stateless_reset.token,
-                           sizeof(f->stateless_reset.token)))
+            sizeof(f->stateless_reset.token)))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_decode_frame_retire_conn_id(PACKET *pkt,
-                                               uint64_t *seq_num)
+    uint64_t *seq_num)
 {
     if (!expect_frame_header(pkt, OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID)
-            || !PACKET_get_quic_vlint(pkt, seq_num))
+        || !PACKET_get_quic_vlint(pkt, seq_num))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_decode_frame_path_challenge(PACKET *pkt,
-                                               uint64_t *data)
+    uint64_t *data)
 {
     if (!expect_frame_header(pkt, OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE)
-            || !PACKET_get_net_8(pkt, data))
+        || !PACKET_get_net_8(pkt, data))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_decode_frame_path_response(PACKET *pkt,
-                                              uint64_t *data)
+    uint64_t *data)
 {
     if (!expect_frame_header(pkt, OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE)
-            || !PACKET_get_net_8(pkt, data))
+        || !PACKET_get_net_8(pkt, data))
         return 0;
 
     return 1;
 }
 
 int ossl_quic_wire_decode_frame_conn_close(PACKET *pkt,
-                                           OSSL_QUIC_FRAME_CONN_CLOSE *f)
+    OSSL_QUIC_FRAME_CONN_CLOSE *f)
 {
     uint64_t frame_type, reason_len;
 
     /* This call matches both CONN_CLOSE_TRANSPORT and CONN_CLOSE_APP. */
     if (!expect_frame_header_mask(pkt, OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_TRANSPORT,
-                                  1, &frame_type)
-            || !PACKET_get_quic_vlint(pkt, &f->error_code))
+            1, &frame_type)
+        || !PACKET_get_quic_vlint(pkt, &f->error_code))
         return 0;
 
     f->is_app = ((frame_type & 1) != 0);
@@ -874,11 +872,11 @@ int ossl_quic_wire_decode_frame_conn_close(PACKET *pkt,
     }
 
     if (!PACKET_get_quic_vlint(pkt, &reason_len)
-            || reason_len > SIZE_MAX)
+        || reason_len > SIZE_MAX)
         return 0;
 
     if (!PACKET_get_bytes(pkt, (const unsigned char **)&f->reason,
-                          (size_t)reason_len))
+            (size_t)reason_len))
         return 0;
 
     f->reason_len = (size_t)reason_len;
@@ -915,19 +913,19 @@ int ossl_quic_wire_peek_transport_param(PACKET *pkt, uint64_t *id)
 }
 
 const unsigned char *ossl_quic_wire_decode_transport_param_bytes(PACKET *pkt,
-                                                                 uint64_t *id,
-                                                                 size_t *len)
+    uint64_t *id,
+    size_t *len)
 {
     uint64_t len_;
     const unsigned char *b = NULL;
     uint64_t id_;
 
     if (!PACKET_get_quic_vlint(pkt, &id_)
-            || !PACKET_get_quic_vlint(pkt, &len_))
+        || !PACKET_get_quic_vlint(pkt, &len_))
         return NULL;
 
     if (len_ > SIZE_MAX
-            || !PACKET_get_bytes(pkt, (const unsigned char **)&b, (size_t)len_))
+        || !PACKET_get_bytes(pkt, (const unsigned char **)&b, (size_t)len_))
         return NULL;
 
     *len = (size_t)len_;
@@ -937,13 +935,13 @@ const unsigned char *ossl_quic_wire_decode_transport_param_bytes(PACKET *pkt,
 }
 
 int ossl_quic_wire_decode_transport_param_int(PACKET *pkt,
-                                              uint64_t *id,
-                                              uint64_t *value)
+    uint64_t *id,
+    uint64_t *value)
 {
     PACKET sub;
 
     sub.curr = ossl_quic_wire_decode_transport_param_bytes(pkt,
-                                                           id, &sub.remaining);
+        id, &sub.remaining);
     if (sub.curr == NULL)
         return 0;
 
@@ -953,12 +951,12 @@ int ossl_quic_wire_decode_transport_param_int(PACKET *pkt,
     if (PACKET_remaining(&sub) > 0)
         return 0;
 
-   return 1;
+    return 1;
 }
 
 int ossl_quic_wire_decode_transport_param_cid(PACKET *pkt,
-                                              uint64_t *id,
-                                              QUIC_CONN_ID *cid)
+    uint64_t *id,
+    QUIC_CONN_ID *cid)
 {
     const unsigned char *body;
     size_t len = 0;
@@ -973,7 +971,7 @@ int ossl_quic_wire_decode_transport_param_cid(PACKET *pkt,
 }
 
 int ossl_quic_wire_decode_transport_param_preferred_addr(PACKET *pkt,
-                                                         QUIC_PREFERRED_ADDR *p)
+    QUIC_PREFERRED_ADDR *p)
 {
     const unsigned char *body;
     uint64_t id;
@@ -999,12 +997,12 @@ int ossl_quic_wire_decode_transport_param_preferred_addr(PACKET *pkt,
         || cidl > QUIC_MAX_CONN_ID_LEN
         || !PACKET_copy_bytes(&pkt2, p->cid.id, cidl)
         || !PACKET_copy_bytes(&pkt2, p->stateless_reset.token,
-                              sizeof(p->stateless_reset.token)))
+            sizeof(p->stateless_reset.token)))
         return 0;
 
-    p->ipv4_port    = (uint16_t)ipv4_port;
-    p->ipv6_port    = (uint16_t)ipv6_port;
-    p->cid.id_len   = (unsigned char)cidl;
+    p->ipv4_port = (uint16_t)ipv4_port;
+    p->ipv6_port = (uint16_t)ipv6_port;
+    p->cid.id_len = (unsigned char)cidl;
     return 1;
 }
 
@@ -1012,38 +1010,40 @@ const char *
 ossl_quic_frame_type_to_string(uint64_t frame_type)
 {
     switch (frame_type) {
-#define X(name) case OSSL_QUIC_FRAME_TYPE_##name: return #name;
-    X(PADDING)
-    X(PING)
-    X(ACK_WITHOUT_ECN)
-    X(ACK_WITH_ECN)
-    X(RESET_STREAM)
-    X(STOP_SENDING)
-    X(CRYPTO)
-    X(NEW_TOKEN)
-    X(MAX_DATA)
-    X(MAX_STREAM_DATA)
-    X(MAX_STREAMS_BIDI)
-    X(MAX_STREAMS_UNI)
-    X(DATA_BLOCKED)
-    X(STREAM_DATA_BLOCKED)
-    X(STREAMS_BLOCKED_BIDI)
-    X(STREAMS_BLOCKED_UNI)
-    X(NEW_CONN_ID)
-    X(RETIRE_CONN_ID)
-    X(PATH_CHALLENGE)
-    X(PATH_RESPONSE)
-    X(CONN_CLOSE_TRANSPORT)
-    X(CONN_CLOSE_APP)
-    X(HANDSHAKE_DONE)
-    X(STREAM)
-    X(STREAM_FIN)
-    X(STREAM_LEN)
-    X(STREAM_LEN_FIN)
-    X(STREAM_OFF)
-    X(STREAM_OFF_FIN)
-    X(STREAM_OFF_LEN)
-    X(STREAM_OFF_LEN_FIN)
+#define X(name)                       \
+    case OSSL_QUIC_FRAME_TYPE_##name: \
+        return #name;
+        X(PADDING)
+        X(PING)
+        X(ACK_WITHOUT_ECN)
+        X(ACK_WITH_ECN)
+        X(RESET_STREAM)
+        X(STOP_SENDING)
+        X(CRYPTO)
+        X(NEW_TOKEN)
+        X(MAX_DATA)
+        X(MAX_STREAM_DATA)
+        X(MAX_STREAMS_BIDI)
+        X(MAX_STREAMS_UNI)
+        X(DATA_BLOCKED)
+        X(STREAM_DATA_BLOCKED)
+        X(STREAMS_BLOCKED_BIDI)
+        X(STREAMS_BLOCKED_UNI)
+        X(NEW_CONN_ID)
+        X(RETIRE_CONN_ID)
+        X(PATH_CHALLENGE)
+        X(PATH_RESPONSE)
+        X(CONN_CLOSE_TRANSPORT)
+        X(CONN_CLOSE_APP)
+        X(HANDSHAKE_DONE)
+        X(STREAM)
+        X(STREAM_FIN)
+        X(STREAM_LEN)
+        X(STREAM_LEN_FIN)
+        X(STREAM_OFF)
+        X(STREAM_OFF_FIN)
+        X(STREAM_OFF_LEN)
+        X(STREAM_OFF_LEN_FIN)
 #undef X
     default:
         return NULL;
@@ -1053,24 +1053,26 @@ ossl_quic_frame_type_to_string(uint64_t frame_type)
 const char *ossl_quic_err_to_string(uint64_t error_code)
 {
     switch (error_code) {
-#define X(name) case OSSL_QUIC_ERR_##name: return #name;
-    X(NO_ERROR)
-    X(INTERNAL_ERROR)
-    X(CONNECTION_REFUSED)
-    X(FLOW_CONTROL_ERROR)
-    X(STREAM_LIMIT_ERROR)
-    X(STREAM_STATE_ERROR)
-    X(FINAL_SIZE_ERROR)
-    X(FRAME_ENCODING_ERROR)
-    X(TRANSPORT_PARAMETER_ERROR)
-    X(CONNECTION_ID_LIMIT_ERROR)
-    X(PROTOCOL_VIOLATION)
-    X(INVALID_TOKEN)
-    X(APPLICATION_ERROR)
-    X(CRYPTO_BUFFER_EXCEEDED)
-    X(KEY_UPDATE_ERROR)
-    X(AEAD_LIMIT_REACHED)
-    X(NO_VIABLE_PATH)
+#define X(name)                \
+    case OSSL_QUIC_ERR_##name: \
+        return #name;
+        X(NO_ERROR)
+        X(INTERNAL_ERROR)
+        X(CONNECTION_REFUSED)
+        X(FLOW_CONTROL_ERROR)
+        X(STREAM_LIMIT_ERROR)
+        X(STREAM_STATE_ERROR)
+        X(FINAL_SIZE_ERROR)
+        X(FRAME_ENCODING_ERROR)
+        X(TRANSPORT_PARAMETER_ERROR)
+        X(CONNECTION_ID_LIMIT_ERROR)
+        X(PROTOCOL_VIOLATION)
+        X(INVALID_TOKEN)
+        X(APPLICATION_ERROR)
+        X(CRYPTO_BUFFER_EXCEEDED)
+        X(KEY_UPDATE_ERROR)
+        X(AEAD_LIMIT_REACHED)
+        X(NO_VIABLE_PATH)
 #undef X
     default:
         return NULL;
diff --git a/ssl/quic/quic_wire_pkt.c b/ssl/quic/quic_wire_pkt.c
index b6ee898eddf7c..d0efc2d068082 100644
--- a/ssl/quic/quic_wire_pkt.c
+++ b/ssl/quic/quic_wire_pkt.c
@@ -12,27 +12,27 @@
 #include "internal/quic_wire_pkt.h"
 
 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)
 {
     const char *cipher_name = NULL;
 
     switch (cipher_id) {
-        case QUIC_HDR_PROT_CIPHER_AES_128:
-            cipher_name = "AES-128-ECB";
-            break;
-        case QUIC_HDR_PROT_CIPHER_AES_256:
-            cipher_name = "AES-256-ECB";
-            break;
-        case QUIC_HDR_PROT_CIPHER_CHACHA:
-            cipher_name = "ChaCha20";
-            break;
-        default:
-            ERR_raise(ERR_LIB_SSL, ERR_R_UNSUPPORTED);
-            return 0;
+    case QUIC_HDR_PROT_CIPHER_AES_128:
+        cipher_name = "AES-128-ECB";
+        break;
+    case QUIC_HDR_PROT_CIPHER_AES_256:
+        cipher_name = "AES-256-ECB";
+        break;
+    case QUIC_HDR_PROT_CIPHER_CHACHA:
+        cipher_name = "ChaCha20";
+        break;
+    default:
+        ERR_raise(ERR_LIB_SSL, ERR_R_UNSUPPORTED);
+        return 0;
     }
 
     hpr->cipher_ctx = EVP_CIPHER_CTX_new();
@@ -49,14 +49,14 @@ int ossl_quic_hdr_protector_init(QUIC_HDR_PROTECTOR *hpr,
     }
 
     if (!EVP_CipherInit_ex(hpr->cipher_ctx, hpr->cipher, NULL,
-                           quic_hp_key, NULL, 1)) {
+            quic_hp_key, NULL, 1)) {
         ERR_raise(ERR_LIB_SSL, ERR_R_EVP_LIB);
         goto err;
     }
 
-    hpr->libctx     = libctx;
-    hpr->propq      = propq;
-    hpr->cipher_id  = cipher_id;
+    hpr->libctx = libctx;
+    hpr->propq = propq;
+    hpr->cipher_id = cipher_id;
     return 1;
 
 err:
@@ -74,12 +74,12 @@ void ossl_quic_hdr_protector_cleanup(QUIC_HDR_PROTECTOR *hpr)
 }
 
 static int hdr_generate_mask(QUIC_HDR_PROTECTOR *hpr,
-                             const unsigned char *sample, size_t sample_len,
-                             unsigned char *mask)
+    const unsigned char *sample, size_t sample_len,
+    unsigned char *mask)
 {
     int l = 0;
     unsigned char dst[16];
-    static const unsigned char zeroes[5] = {0};
+    static const unsigned char zeroes[5] = { 0 };
     size_t i;
 
     if (hpr->cipher_id == QUIC_HDR_PROT_CIPHER_AES_128
@@ -105,7 +105,7 @@ static int hdr_generate_mask(QUIC_HDR_PROTECTOR *hpr,
 
         if (!EVP_CipherInit_ex(hpr->cipher_ctx, NULL, NULL, NULL, sample, 1)
             || !EVP_CipherUpdate(hpr->cipher_ctx, mask, &l,
-                                 zeroes, sizeof(zeroes))) {
+                zeroes, sizeof(zeroes))) {
             ERR_raise(ERR_LIB_SSL, ERR_R_EVP_LIB);
             return 0;
         }
@@ -124,20 +124,20 @@ static int hdr_generate_mask(QUIC_HDR_PROTECTOR *hpr,
 }
 
 int ossl_quic_hdr_protector_decrypt(QUIC_HDR_PROTECTOR *hpr,
-                                    QUIC_PKT_HDR_PTRS *ptrs)
+    QUIC_PKT_HDR_PTRS *ptrs)
 {
     return ossl_quic_hdr_protector_decrypt_fields(hpr,
-                                                  ptrs->raw_sample,
-                                                  ptrs->raw_sample_len,
-                                                  ptrs->raw_start,
-                                                  ptrs->raw_pn);
+        ptrs->raw_sample,
+        ptrs->raw_sample_len,
+        ptrs->raw_start,
+        ptrs->raw_pn);
 }
 
 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)
 {
     unsigned char mask[5], pn_len, i;
 
@@ -154,20 +154,20 @@ int ossl_quic_hdr_protector_decrypt_fields(QUIC_HDR_PROTECTOR *hpr,
 }
 
 int ossl_quic_hdr_protector_encrypt(QUIC_HDR_PROTECTOR *hpr,
-                                    QUIC_PKT_HDR_PTRS *ptrs)
+    QUIC_PKT_HDR_PTRS *ptrs)
 {
     return ossl_quic_hdr_protector_encrypt_fields(hpr,
-                                                  ptrs->raw_sample,
-                                                  ptrs->raw_sample_len,
-                                                  ptrs->raw_start,
-                                                  ptrs->raw_pn);
+        ptrs->raw_sample,
+        ptrs->raw_sample_len,
+        ptrs->raw_start,
+        ptrs->raw_pn);
 }
 
 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)
 {
     unsigned char mask[5], pn_len, i;
 
@@ -183,12 +183,12 @@ int ossl_quic_hdr_protector_encrypt_fields(QUIC_HDR_PROTECTOR *hpr,
 }
 
 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)
 {
     unsigned int b0;
     unsigned char *pn = NULL;
@@ -198,19 +198,19 @@ int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
         *fail_cause = QUIC_PKT_HDR_DECODE_DECODE_ERR;
 
     if (ptrs != NULL) {
-        ptrs->raw_start         = (unsigned char *)PACKET_data(pkt);
-        ptrs->raw_sample        = NULL;
-        ptrs->raw_sample_len    = 0;
-        ptrs->raw_pn            = NULL;
+        ptrs->raw_start = (unsigned char *)PACKET_data(pkt);
+        ptrs->raw_sample = NULL;
+        ptrs->raw_sample_len = 0;
+        ptrs->raw_pn = NULL;
     }
 
     if (l < QUIC_MIN_VALID_PKT_LEN
         || !PACKET_get_1(pkt, &b0))
         return 0;
 
-    hdr->partial    = partial;
-    hdr->unused     = 0;
-    hdr->reserved   = 0;
+    hdr->partial = partial;
+    hdr->unused = 0;
+    hdr->reserved = 0;
 
     if ((b0 & 0x80) == 0) {
         /* Short header. */
@@ -221,17 +221,17 @@ int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
             || l < QUIC_MIN_VALID_PKT_LEN_CRYPTO)
             return 0;
 
-        hdr->type       = QUIC_PKT_TYPE_1RTT;
-        hdr->fixed      = 1;
-        hdr->spin_bit   = (b0 & 0x20) != 0;
+        hdr->type = QUIC_PKT_TYPE_1RTT;
+        hdr->fixed = 1;
+        hdr->spin_bit = (b0 & 0x20) != 0;
         if (partial) {
-            hdr->key_phase  = 0; /* protected, zero for now */
-            hdr->pn_len     = 0; /* protected, zero for now */
-            hdr->reserved   = 0; /* protected, zero for now */
+            hdr->key_phase = 0; /* protected, zero for now */
+            hdr->pn_len = 0; /* protected, zero for now */
+            hdr->reserved = 0; /* protected, zero for now */
         } else {
-            hdr->key_phase  = (b0 & 0x04) != 0;
-            hdr->pn_len     = (b0 & 0x03) + 1;
-            hdr->reserved   = (b0 & 0x18) >> 3;
+            hdr->key_phase = (b0 & 0x04) != 0;
+            hdr->pn_len = (b0 & 0x03) + 1;
+            hdr->reserved = (b0 & 0x18) >> 3;
         }
 
         /* Copy destination connection ID field to header structure. */
@@ -257,17 +257,17 @@ int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
         }
 
         /* Fields not used in short-header packets. */
-        hdr->version            = 0;
+        hdr->version = 0;
         hdr->src_conn_id.id_len = 0;
-        hdr->token              = NULL;
-        hdr->token_len          = 0;
+        hdr->token = NULL;
+        hdr->token_len = 0;
 
         /*
          * Short-header packets always come last in a datagram, the length
          * is the remainder of the buffer.
          */
-        hdr->len                = PACKET_remaining(pkt);
-        hdr->data               = PACKET_data(pkt);
+        hdr->len = PACKET_remaining(pkt);
+        hdr->data = PACKET_data(pkt);
 
         /*
          * Skip over payload. Since this is a short header packet, which cannot
@@ -299,7 +299,7 @@ int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
             || !PACKET_copy_bytes(pkt, hdr->src_conn_id.id, src_conn_id_len))
             return 0;
 
-        hdr->version            = (uint32_t)version;
+        hdr->version = (uint32_t)version;
         hdr->dst_conn_id.id_len = (unsigned char)dst_conn_id_len;
         hdr->src_conn_id.id_len = (unsigned char)src_conn_id_len;
 
@@ -309,11 +309,11 @@ int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
              * identified by a version field of 0 and the type bits in the first
              * byte are ignored (they may take any value, and we ignore them).
              */
-            hdr->type       = QUIC_PKT_TYPE_VERSION_NEG;
-            hdr->fixed      = (b0 & 0x40) != 0;
+            hdr->type = QUIC_PKT_TYPE_VERSION_NEG;
+            hdr->fixed = (b0 & 0x40) != 0;
 
-            hdr->data       = PACKET_data(pkt);
-            hdr->len        = PACKET_remaining(pkt);
+            hdr->data = PACKET_data(pkt);
+            hdr->len = PACKET_remaining(pkt);
 
             /*
              * Version negotiation packets must contain an array of u32s, so it
@@ -323,14 +323,14 @@ int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
                 return 0;
 
             /* Version negotiation packets are always fully decoded. */
-            hdr->partial    = 0;
+            hdr->partial = 0;
 
             /* Fields not used in version negotiation packets. */
-            hdr->pn_len             = 0;
-            hdr->spin_bit           = 0;
-            hdr->key_phase          = 0;
-            hdr->token              = NULL;
-            hdr->token_len          = 0;
+            hdr->pn_len = 0;
+            hdr->spin_bit = 0;
+            hdr->key_phase = 0;
+            hdr->token = NULL;
+            hdr->token_len = 0;
             memset(hdr->pn, 0, sizeof(hdr->pn));
 
             if (!PACKET_forward(pkt, hdr->len))
@@ -362,12 +362,12 @@ int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
                 break;
             }
 
-            hdr->pn_len     = 0;
-            hdr->fixed      = 1;
+            hdr->pn_len = 0;
+            hdr->fixed = 1;
 
             /* Fields not used in long-header packets. */
-            hdr->spin_bit   = 0;
-            hdr->key_phase  = 0;
+            hdr->spin_bit = 0;
+            hdr->key_phase = 0;
 
             if (hdr->type == QUIC_PKT_TYPE_INITIAL) {
                 /* Initial packet. */
@@ -378,24 +378,24 @@ int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
                     || !PACKET_get_bytes(pkt, &hdr->token, (size_t)token_len))
                     return 0;
 
-                hdr->token_len  = (size_t)token_len;
+                hdr->token_len = (size_t)token_len;
                 if (token_len == 0)
                     hdr->token = NULL;
             } else {
-                hdr->token      = NULL;
-                hdr->token_len  = 0;
+                hdr->token = NULL;
+                hdr->token_len = 0;
             }
 
             if (hdr->type == QUIC_PKT_TYPE_RETRY) {
                 /* Retry packet. */
-                hdr->data       = PACKET_data(pkt);
-                hdr->len        = PACKET_remaining(pkt);
+                hdr->data = PACKET_data(pkt);
+                hdr->len = PACKET_remaining(pkt);
 
                 /* Retry packets are always fully decoded. */
-                hdr->partial    = 0;
+                hdr->partial = 0;
 
                 /* Unused bits in Retry header. */
-                hdr->unused     = b0 & 0x0f;
+                hdr->unused = b0 & 0x0f;
 
                 /* Fields not used in Retry packets. */
                 memset(hdr->pn, 0, sizeof(hdr->pn));
@@ -406,11 +406,11 @@ int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
                 /* Initial, 0-RTT or Handshake packet. */
                 uint64_t len;
 
-                hdr->pn_len     = partial ? 0 : ((b0 & 0x03) + 1);
-                hdr->reserved   = partial ? 0 : ((b0 & 0x0C) >> 2);
+                hdr->pn_len = partial ? 0 : ((b0 & 0x03) + 1);
+                hdr->reserved = partial ? 0 : ((b0 & 0x0C) >> 2);
 
                 if (!PACKET_get_quic_vlint(pkt, &len)
-                        || len < sizeof(hdr->pn))
+                    || len < sizeof(hdr->pn))
                     return 0;
 
                 if (!nodata && len > PACKET_remaining(pkt))
@@ -452,8 +452,8 @@ int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
     if (ptrs != NULL) {
         ptrs->raw_pn = pn;
         if (pn != NULL) {
-            ptrs->raw_sample        = pn + 4;
-            ptrs->raw_sample_len    = PACKET_end(pkt) - ptrs->raw_sample;
+            ptrs->raw_sample = pn + 4;
+            ptrs->raw_sample_len = PACKET_end(pkt) - ptrs->raw_sample;
         }
     }
 
@@ -467,9 +467,9 @@ int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
 }
 
 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)
 {
     unsigned char b0;
     size_t off_start, off_sample, off_pn;
@@ -482,10 +482,10 @@ int ossl_quic_wire_encode_pkt_hdr(WPACKET *pkt,
         /* ptrs would not be stable on non-static WPACKET */
         if (!ossl_assert(pkt->staticbuf != NULL))
             return 0;
-        ptrs->raw_start         = NULL;
-        ptrs->raw_sample        = NULL;
-        ptrs->raw_sample_len    = 0;
-        ptrs->raw_pn            = 0;
+        ptrs->raw_start = NULL;
+        ptrs->raw_sample = NULL;
+        ptrs->raw_sample_len = 0;
+        ptrs->raw_pn = 0;
     }
 
     /* Cannot serialize a partial header, or one whose DCID length is wrong. */
@@ -507,10 +507,10 @@ int ossl_quic_wire_encode_pkt_hdr(WPACKET *pkt,
             return 0;
 
         b0 = (hdr->spin_bit << 5)
-             | (hdr->key_phase << 2)
-             | (hdr->pn_len - 1)
-             | (hdr->reserved << 3)
-             | 0x40; /* fixed bit */
+            | (hdr->key_phase << 2)
+            | (hdr->pn_len - 1)
+            | (hdr->reserved << 3)
+            | 0x40; /* fixed bit */
 
         if (!WPACKET_put_bytes_u8(pkt, b0)
             || !WPACKET_memcpy(pkt, hdr->dst_conn_id.id, short_conn_id_len)
@@ -530,20 +530,28 @@ int ossl_quic_wire_encode_pkt_hdr(WPACKET *pkt,
             return 0;
 
         switch (hdr->type) {
-            case QUIC_PKT_TYPE_VERSION_NEG:
-                if (hdr->version != 0)
-                    return 0;
+        case QUIC_PKT_TYPE_VERSION_NEG:
+            if (hdr->version != 0)
+                return 0;
 
-                /* Version negotiation packets use zero for the type bits */
-                raw_type = 0;
-                break;
+            /* Version negotiation packets use zero for the type bits */
+            raw_type = 0;
+            break;
 
-            case QUIC_PKT_TYPE_INITIAL:     raw_type = 0; break;
-            case QUIC_PKT_TYPE_0RTT:        raw_type = 1; break;
-            case QUIC_PKT_TYPE_HANDSHAKE:   raw_type = 2; break;
-            case QUIC_PKT_TYPE_RETRY:       raw_type = 3; break;
-            default:
-                return 0;
+        case QUIC_PKT_TYPE_INITIAL:
+            raw_type = 0;
+            break;
+        case QUIC_PKT_TYPE_0RTT:
+            raw_type = 1;
+            break;
+        case QUIC_PKT_TYPE_HANDSHAKE:
+            raw_type = 2;
+            break;
+        case QUIC_PKT_TYPE_RETRY:
+            raw_type = 3;
+            break;
+        default:
+            return 0;
         }
 
         b0 = (raw_type << 4) | 0x80; /* long */
@@ -560,10 +568,10 @@ int ossl_quic_wire_encode_pkt_hdr(WPACKET *pkt,
             || !WPACKET_put_bytes_u32(pkt, hdr->version)
             || !WPACKET_put_bytes_u8(pkt, hdr->dst_conn_id.id_len)
             || !WPACKET_memcpy(pkt, hdr->dst_conn_id.id,
-                               hdr->dst_conn_id.id_len)
+                hdr->dst_conn_id.id_len)
             || !WPACKET_put_bytes_u8(pkt, hdr->src_conn_id.id_len)
             || !WPACKET_memcpy(pkt, hdr->src_conn_id.id,
-                               hdr->src_conn_id.id_len))
+                hdr->src_conn_id.id_len))
             return 0;
 
         if (hdr->type == QUIC_PKT_TYPE_VERSION_NEG) {
@@ -597,18 +605,18 @@ int ossl_quic_wire_encode_pkt_hdr(WPACKET *pkt,
     off_sample = off_pn + 4;
 
     if (ptrs != NULL) {
-        ptrs->raw_start         = start;
-        ptrs->raw_sample        = start + (off_sample - off_start);
+        ptrs->raw_start = start;
+        ptrs->raw_sample = start + (off_sample - off_start);
         ptrs->raw_sample_len
             = WPACKET_get_curr(pkt) + hdr->len - ptrs->raw_sample;
-        ptrs->raw_pn            = start + (off_pn - off_start);
+        ptrs->raw_pn = start + (off_pn - off_start);
     }
 
     return 1;
 }
 
 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)
 {
     size_t len = 0, enclen;
 
@@ -670,9 +678,9 @@ int ossl_quic_wire_get_encoded_pkt_hdr_len(size_t short_conn_id_len,
 }
 
 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)
 {
     unsigned char b0;
     size_t blen;
@@ -720,46 +728,46 @@ int ossl_quic_wire_get_pkt_hdr_dst_conn_id(const unsigned char *buf,
 }
 
 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)
 {
     int64_t expected_pn, truncated_pn, candidate_pn, pn_win, pn_hwin, pn_mask;
 
     switch (enc_pn_len) {
-        case 1:
-            truncated_pn = enc_pn[0];
-            break;
-        case 2:
-            truncated_pn = ((QUIC_PN)enc_pn[0] << 8)
-                         |  (QUIC_PN)enc_pn[1];
-            break;
-        case 3:
-            truncated_pn = ((QUIC_PN)enc_pn[0] << 16)
-                         | ((QUIC_PN)enc_pn[1] << 8)
-                         |  (QUIC_PN)enc_pn[2];
-            break;
-        case 4:
-            truncated_pn = ((QUIC_PN)enc_pn[0] << 24)
-                         | ((QUIC_PN)enc_pn[1] << 16)
-                         | ((QUIC_PN)enc_pn[2] << 8)
-                         |  (QUIC_PN)enc_pn[3];
-            break;
-        default:
-            return 0;
+    case 1:
+        truncated_pn = enc_pn[0];
+        break;
+    case 2:
+        truncated_pn = ((QUIC_PN)enc_pn[0] << 8)
+            | (QUIC_PN)enc_pn[1];
+        break;
+    case 3:
+        truncated_pn = ((QUIC_PN)enc_pn[0] << 16)
+            | ((QUIC_PN)enc_pn[1] << 8)
+            | (QUIC_PN)enc_pn[2];
+        break;
+    case 4:
+        truncated_pn = ((QUIC_PN)enc_pn[0] << 24)
+            | ((QUIC_PN)enc_pn[1] << 16)
+            | ((QUIC_PN)enc_pn[2] << 8)
+            | (QUIC_PN)enc_pn[3];
+        break;
+    default:
+        return 0;
     }
 
     /* Implemented as per RFC 9000 Section A.3. */
-    expected_pn     = largest_pn + 1;
-    pn_win          = ((int64_t)1) << (enc_pn_len * 8);
-    pn_hwin         = pn_win / 2;
-    pn_mask         = pn_win - 1;
-    candidate_pn    = (expected_pn & ~pn_mask) | truncated_pn;
+    expected_pn = largest_pn + 1;
+    pn_win = ((int64_t)1) << (enc_pn_len * 8);
+    pn_hwin = pn_win / 2;
+    pn_mask = pn_win - 1;
+    candidate_pn = (expected_pn & ~pn_mask) | truncated_pn;
     if (candidate_pn <= expected_pn - pn_hwin
         && candidate_pn < (((int64_t)1) << 62) - pn_win)
         *res_pn = candidate_pn + pn_win;
     else if (candidate_pn > expected_pn + pn_hwin
-             && candidate_pn >= pn_win)
+        && candidate_pn >= pn_win)
         *res_pn = candidate_pn - pn_win;
     else
         *res_pn = candidate_pn;
@@ -768,7 +776,7 @@ int ossl_quic_wire_decode_pkt_hdr_pn(const unsigned char *enc_pn,
 
 /* From RFC 9000 Section A.2. Simplified implementation. */
 int ossl_quic_wire_determine_pn_len(QUIC_PN pn,
-                                    QUIC_PN largest_acked)
+    QUIC_PN largest_acked)
 {
     uint64_t num_unacked
         = (largest_acked == QUIC_PN_INVALID) ? pn + 1 : pn - largest_acked;
@@ -780,46 +788,49 @@ int ossl_quic_wire_determine_pn_len(QUIC_PN pn,
      * num_unacked \in (2**23,      ] -> 4 bytes
      */
 
-    if (num_unacked <= (1U<<7))  return 1;
-    if (num_unacked <= (1U<<15)) return 2;
-    if (num_unacked <= (1U<<23)) return 3;
+    if (num_unacked <= (1U << 7))
+        return 1;
+    if (num_unacked <= (1U << 15))
+        return 2;
+    if (num_unacked <= (1U << 23))
+        return 3;
     return 4;
 }
 
 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)
 {
     switch (enc_pn_len) {
-        case 1:
-            enc_pn[0] = (unsigned char)pn;
-            break;
-        case 2:
-            enc_pn[1] = (unsigned char)pn;
-            enc_pn[0] = (unsigned char)(pn >> 8);
-            break;
-        case 3:
-            enc_pn[2] = (unsigned char)pn;
-            enc_pn[1] = (unsigned char)(pn >> 8);
-            enc_pn[0] = (unsigned char)(pn >> 16);
-            break;
-        case 4:
-            enc_pn[3] = (unsigned char)pn;
-            enc_pn[2] = (unsigned char)(pn >> 8);
-            enc_pn[1] = (unsigned char)(pn >> 16);
-            enc_pn[0] = (unsigned char)(pn >> 24);
-            break;
-        default:
-            return 0;
+    case 1:
+        enc_pn[0] = (unsigned char)pn;
+        break;
+    case 2:
+        enc_pn[1] = (unsigned char)pn;
+        enc_pn[0] = (unsigned char)(pn >> 8);
+        break;
+    case 3:
+        enc_pn[2] = (unsigned char)pn;
+        enc_pn[1] = (unsigned char)(pn >> 8);
+        enc_pn[0] = (unsigned char)(pn >> 16);
+        break;
+    case 4:
+        enc_pn[3] = (unsigned char)pn;
+        enc_pn[2] = (unsigned char)(pn >> 8);
+        enc_pn[1] = (unsigned char)(pn >> 16);
+        enc_pn[0] = (unsigned char)(pn >> 24);
+        break;
+    default:
+        return 0;
     }
 
     return 1;
 }
 
 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)
 {
     unsigned char expected_tag[QUIC_RETRY_INTEGRITY_TAG_LEN];
     const unsigned char *actual_tag;
@@ -828,14 +839,14 @@ int ossl_quic_validate_retry_integrity_tag(OSSL_LIB_CTX *libctx,
         return 0;
 
     if (!ossl_quic_calculate_retry_integrity_tag(libctx, propq,
-                                                 hdr, client_initial_dcid,
-                                                 expected_tag))
+            hdr, client_initial_dcid,
+            expected_tag))
         return 0;
 
     actual_tag = hdr->data + hdr->len - QUIC_RETRY_INTEGRITY_TAG_LEN;
 
     return !CRYPTO_memcmp(expected_tag, actual_tag,
-                          QUIC_RETRY_INTEGRITY_TAG_LEN);
+        QUIC_RETRY_INTEGRITY_TAG_LEN);
 }
 
 /* RFC 9001 s. 5.8 */
@@ -850,10 +861,10 @@ static const unsigned char retry_integrity_nonce[] = {
 };
 
 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)
 {
     EVP_CIPHER *cipher = NULL;
     EVP_CIPHER_CTX *cctx = NULL;
@@ -892,14 +903,14 @@ int ossl_quic_calculate_retry_integrity_tag(OSSL_LIB_CTX *libctx,
     /* Prepend original DCID to the packet. */
     if (!WPACKET_put_bytes_u8(&wpkt, client_initial_dcid->id_len)
         || !WPACKET_memcpy(&wpkt, client_initial_dcid->id,
-                           client_initial_dcid->id_len)) {
+            client_initial_dcid->id_len)) {
         ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB);
         goto err;
     }
 
     /* Encode main retry header. */
     if (!ossl_quic_wire_encode_pkt_hdr(&wpkt, hdr2.dst_conn_id.id_len,
-                                       &hdr2, NULL))
+            &hdr2, NULL))
         goto err;
 
     if (!WPACKET_get_total_written(&wpkt, &hdr_enc_len)) {
@@ -920,7 +931,7 @@ int ossl_quic_calculate_retry_integrity_tag(OSSL_LIB_CTX *libctx,
     }
 
     if (!EVP_CipherInit_ex(cctx, cipher, NULL,
-                           retry_integrity_key, retry_integrity_nonce, /*enc=*/1)) {
+            retry_integrity_key, retry_integrity_nonce, /*enc=*/1)) {
         ERR_raise(ERR_LIB_SSL, ERR_R_EVP_LIB);
         goto err;
     }
@@ -933,7 +944,8 @@ int ossl_quic_calculate_retry_integrity_tag(OSSL_LIB_CTX *libctx,
 
     /* Feed packet body as AAD data. */
     if (EVP_CipherUpdate(cctx, NULL, &l, hdr->data,
-                         hdr->len - QUIC_RETRY_INTEGRITY_TAG_LEN) != 1) {
+            hdr->len - QUIC_RETRY_INTEGRITY_TAG_LEN)
+        != 1) {
         ERR_raise(ERR_LIB_SSL, ERR_R_EVP_LIB);
         goto err;
     }
@@ -945,8 +957,9 @@ int ossl_quic_calculate_retry_integrity_tag(OSSL_LIB_CTX *libctx,
     }
 
     if (EVP_CIPHER_CTX_ctrl(cctx, EVP_CTRL_AEAD_GET_TAG,
-                            QUIC_RETRY_INTEGRITY_TAG_LEN,
-                            tag) != 1) {
+            QUIC_RETRY_INTEGRITY_TAG_LEN,
+            tag)
+        != 1) {
         ERR_raise(ERR_LIB_SSL, ERR_R_EVP_LIB);
         goto err;
     }
diff --git a/ssl/quic/uint_set.c b/ssl/quic/uint_set.c
index faca906003b02..f81148c79af7c 100644
--- a/ssl/quic/uint_set.c
+++ b/ssl/quic/uint_set.c
@@ -103,7 +103,7 @@ static uint64_t u64_max(uint64_t x, uint64_t y)
  * b.
  */
 static int uint_range_overlaps(const UINT_RANGE *a,
-                               const UINT_RANGE *b)
+    const UINT_RANGE *b)
 {
     return u64_min(a->end, b->end)
         >= u64_max(a->start, b->start);
@@ -118,7 +118,7 @@ static UINT_SET_ITEM *create_set_item(uint64_t start, uint64_t end)
 
     ossl_list_uint_set_init_elem(x);
     x->range.start = start;
-    x->range.end   = end;
+    x->range.end = end;
     return x;
 }
 
@@ -219,7 +219,7 @@ int ossl_uint_set_insert(UINT_SET *s, const UINT_RANGE *range)
             }
             break;
         } else if (end < z->range.start
-                    && (zprev == NULL || start > zprev->range.end)) {
+            && (zprev == NULL || start > zprev->range.end)) {
             if (z->range.start == end + 1) {
                 /* We can extend the following range backwards. */
                 z->range.start = start;
diff --git a/ssl/record/methods/dtls_meth.c b/ssl/record/methods/dtls_meth.c
index a69629b07b53e..8cbd7678e193b 100644
--- a/ssl/record/methods/dtls_meth.c
+++ b/ssl/record/methods/dtls_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-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
@@ -46,20 +46,20 @@ static int dtls_record_replay_check(OSSL_RECORD_LAYER *rl, DTLS_BITMAP *bitmap)
     cmp = satsub64be(seq, bitmap->max_seq_num);
     if (cmp > 0) {
         ossl_tls_rl_record_set_seq_num(&rl->rrec[0], seq);
-        return 1;               /* this record in new */
+        return 1; /* this record in new */
     }
     shift = -cmp;
     if (shift >= sizeof(bitmap->map) * 8)
-        return 0;               /* stale, outside the window */
+        return 0; /* stale, outside the window */
     else if (bitmap->map & ((uint64_t)1 << shift))
-        return 0;               /* record previously received */
+        return 0; /* record previously received */
 
     ossl_tls_rl_record_set_seq_num(&rl->rrec[0], seq);
     return 1;
 }
 
 static void dtls_record_bitmap_update(OSSL_RECORD_LAYER *rl,
-                                      DTLS_BITMAP *bitmap)
+    DTLS_BITMAP *bitmap)
 {
     int cmp;
     unsigned int shift;
@@ -81,7 +81,7 @@ static void dtls_record_bitmap_update(OSSL_RECORD_LAYER *rl,
 }
 
 static DTLS_BITMAP *dtls_get_bitmap(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rr,
-                                    unsigned int *is_next_epoch)
+    unsigned int *is_next_epoch)
 {
     *is_next_epoch = 0;
 
@@ -171,7 +171,7 @@ static int dtls_process_record(OSSL_RECORD_LAYER *rl, DTLS_BITMAP *bitmap)
         i = rl->funcs->mac(rl, rr, md, 0 /* not send */);
         if (i == 0 || CRYPTO_memcmp(md, mac, (size_t)mac_size) != 0) {
             RLAYERfatal(rl, SSL_AD_BAD_RECORD_MAC,
-                        SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
+                SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
             return 0;
         }
         /*
@@ -207,15 +207,17 @@ static int dtls_process_record(OSSL_RECORD_LAYER *rl, DTLS_BITMAP *bitmap)
         goto end;
     }
     ERR_clear_last_mark();
-    OSSL_TRACE_BEGIN(TLS) {
+    OSSL_TRACE_BEGIN(TLS)
+    {
         BIO_printf(trc_out, "dec %zd\n", rr->length);
         BIO_dump_indent(trc_out, rr->data, rr->length, 4);
-    } OSSL_TRACE_END(TLS);
+    }
+    OSSL_TRACE_END(TLS);
 
     /* r->length is now the compressed data plus mac */
     if (!rl->use_etm
-            && (rl->enc_ctx != NULL)
-            && (EVP_MD_CTX_get0_md(rl->md_ctx) != NULL)) {
+        && (rl->enc_ctx != NULL)
+        && (EVP_MD_CTX_get0_md(rl->md_ctx) != NULL)) {
         /* rl->md_ctx != NULL => mac_size != -1 */
 
         i = rl->funcs->mac(rl, rr, md, 0 /* not send */);
@@ -237,7 +239,7 @@ static int dtls_process_record(OSSL_RECORD_LAYER *rl, DTLS_BITMAP *bitmap)
     if (rl->compctx != NULL) {
         if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH) {
             RLAYERfatal(rl, SSL_AD_RECORD_OVERFLOW,
-                        SSL_R_COMPRESSED_LENGTH_TOO_LONG);
+                SSL_R_COMPRESSED_LENGTH_TOO_LONG);
             goto end;
         }
         if (!tls_do_uncompress(rl, rr)) {
@@ -272,14 +274,14 @@ static int dtls_process_record(OSSL_RECORD_LAYER *rl, DTLS_BITMAP *bitmap)
     dtls_record_bitmap_update(rl, bitmap);
 
     ret = 1;
- end:
+end:
     if (macbuf.alloced)
         OPENSSL_free(macbuf.mac);
     return ret;
 }
 
 static int dtls_rlayer_buffer_record(OSSL_RECORD_LAYER *rl, struct pqueue_st *queue,
-                                     unsigned char *priority)
+    unsigned char *priority)
 {
     DTLS_RLAYER_RECORD_DATA *rdata;
     pitem *item;
@@ -348,7 +350,7 @@ static int dtls_copy_rlayer_record(OSSL_RECORD_LAYER *rl, pitem *item)
 }
 
 static int dtls_retrieve_rlayer_buffered_record(OSSL_RECORD_LAYER *rl,
-                                                struct pqueue_st *queue)
+    struct pqueue_st *queue)
 {
     pitem *item;
 
@@ -397,7 +399,7 @@ int dtls_get_more_records(OSSL_RECORD_LAYER *rl)
         }
     }
 
- again:
+again:
     /* if we're renegotiating, then there may be buffered records */
     if (dtls_retrieve_rlayer_buffered_record(rl, rl->processed_rcds)) {
         rl->num_recs = 1;
@@ -407,14 +409,13 @@ int dtls_get_more_records(OSSL_RECORD_LAYER *rl)
     /* get something from the wire */
 
     /* check if we have the header */
-    if ((rl->rstate != SSL_ST_READ_BODY) ||
-        (rl->packet_length < DTLS1_RT_HEADER_LENGTH)) {
+    if ((rl->rstate != SSL_ST_READ_BODY) || (rl->packet_length < DTLS1_RT_HEADER_LENGTH)) {
         rret = rl->funcs->read_n(rl, DTLS1_RT_HEADER_LENGTH,
-                                 TLS_BUFFER_get_len(&rl->rbuf), 0, 1, &n);
+            TLS_BUFFER_get_len(&rl->rbuf), 0, 1, &n);
         /* read timeout is handled by dtls1_read_bytes */
         if (rret < OSSL_RECORD_RETURN_SUCCESS) {
             /* RLAYERfatal() already called if appropriate */
-            return rret;         /* error or non-blocking */
+            return rret; /* error or non-blocking */
         }
 
         /* this packet contained a partial record, dump it */
@@ -443,7 +444,7 @@ int dtls_get_more_records(OSSL_RECORD_LAYER *rl)
 
         if (rl->msg_callback != NULL)
             rl->msg_callback(0, rr->rec_version, SSL3_RT_HEADER, rl->packet, DTLS1_RT_HEADER_LENGTH,
-                             rl->cbarg);
+                rl->cbarg);
 
         /*
          * Lets check the version. We tolerate alerts that don't have the exact
@@ -458,9 +459,7 @@ int dtls_get_more_records(OSSL_RECORD_LAYER *rl)
             }
         }
 
-        if (ssl_major !=
-                (rl->version == DTLS_ANY_VERSION ? DTLS1_VERSION_MAJOR
-                                                 : rl->version >> 8)) {
+        if (ssl_major != (rl->version == DTLS_ANY_VERSION ? DTLS1_VERSION_MAJOR : rl->version >> 8)) {
             /* wrong version, silently discard record */
             rr->length = 0;
             rl->packet_length = 0;
@@ -518,7 +517,7 @@ int dtls_get_more_records(OSSL_RECORD_LAYER *rl)
     if (bitmap == NULL) {
         rr->length = 0;
         rl->packet_length = 0; /* dump this record */
-        goto again;             /* get another record */
+        goto again; /* get another record */
     }
 #ifndef OPENSSL_NO_SCTP
     /* Only do replay check if no SCTP bio */
@@ -528,7 +527,7 @@ int dtls_get_more_records(OSSL_RECORD_LAYER *rl)
         if (!dtls_record_replay_check(rl, bitmap)) {
             rr->length = 0;
             rl->packet_length = 0; /* dump this record */
-            goto again;         /* get another record */
+            goto again; /* get another record */
         }
 #ifndef OPENSSL_NO_SCTP
     }
@@ -546,7 +545,8 @@ int dtls_get_more_records(OSSL_RECORD_LAYER *rl)
     if (is_next_epoch) {
         if (rl->in_init) {
             if (dtls_rlayer_buffer_record(rl, rl->unprocessed_rcds,
-                                          rr->seq_num) < 0) {
+                    rr->seq_num)
+                < 0) {
                 /* RLAYERfatal() already called */
                 return OSSL_RECORD_RETURN_FATAL;
             }
@@ -563,7 +563,7 @@ int dtls_get_more_records(OSSL_RECORD_LAYER *rl)
         }
         rr->length = 0;
         rl->packet_length = 0; /* dump this record */
-        goto again;             /* get another record */
+        goto again; /* get another record */
     }
 
     if (rl->funcs->post_process_record && !rl->funcs->post_process_record(rl, rr)) {
@@ -571,6 +571,12 @@ int dtls_get_more_records(OSSL_RECORD_LAYER *rl)
         return OSSL_RECORD_RETURN_FATAL;
     }
 
+    if (rr->length == 0) {
+        /* No payload data in this record. Dump it */
+        rl->packet_length = 0;
+        goto again;
+    }
+
     rl->num_recs = 1;
     return OSSL_RECORD_RETURN_SUCCESS;
 }
@@ -600,7 +606,7 @@ static int dtls_free(OSSL_RECORD_LAYER *rl)
             rdata = (DTLS_RLAYER_RECORD_DATA *)item->data;
             /* Push to the next record layer */
             ret &= BIO_write_ex(rl->next, rdata->packet, rdata->packet_length,
-                                &written);
+                &written);
             OPENSSL_free(rdata->rbuf.buf);
             OPENSSL_free(item->data);
             pitem_free(item);
@@ -608,7 +614,7 @@ static int dtls_free(OSSL_RECORD_LAYER *rl)
         pqueue_free(rl->unprocessed_rcds);
     }
 
-    if (rl->processed_rcds!= NULL) {
+    if (rl->processed_rcds != NULL) {
         while ((item = pqueue_pop(rl->processed_rcds)) != NULL) {
             rdata = (DTLS_RLAYER_RECORD_DATA *)item->data;
             OPENSSL_free(rdata->rbuf.buf);
@@ -623,25 +629,25 @@ static int dtls_free(OSSL_RECORD_LAYER *rl)
 
 static int
 dtls_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 **retrl)
+    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 **retrl)
 {
     int ret;
 
     ret = tls_int_new_record_layer(libctx, propq, vers, role, direction, level,
-                                   ciph, taglen, md, comp, prev,
-                                   transport, next, settings,
-                                   options, fns, cbarg, retrl);
+        ciph, taglen, md, comp, prev,
+        transport, next, settings,
+        options, fns, cbarg, retrl);
 
     if (ret != OSSL_RECORD_RETURN_SUCCESS)
         return ret;
@@ -650,7 +656,7 @@ dtls_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
     (*retrl)->processed_rcds = pqueue_new();
 
     if ((*retrl)->unprocessed_rcds == NULL
-            || (*retrl)->processed_rcds == NULL) {
+        || (*retrl)->processed_rcds == NULL) {
         dtls_free(*retrl);
         *retrl = NULL;
         ERR_raise(ERR_LIB_SSL, ERR_R_SSL_LIB);
@@ -678,10 +684,10 @@ dtls_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
     }
 
     ret = (*retrl)->funcs->set_crypto_state(*retrl, level, key, keylen, iv,
-                                            ivlen, mackey, mackeylen, ciph,
-                                            taglen, mactype, md, comp);
+        ivlen, mackey, mackeylen, ciph,
+        taglen, mactype, md, comp);
 
- err:
+err:
     if (ret != OSSL_RECORD_RETURN_SUCCESS) {
         dtls_free(*retrl);
         *retrl = NULL;
@@ -690,10 +696,10 @@ dtls_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
 }
 
 int dtls_prepare_record_header(OSSL_RECORD_LAYER *rl,
-                               WPACKET *thispkt,
-                               OSSL_RECORD_TEMPLATE *templ,
-                               uint8_t rectype,
-                               unsigned char **recdata)
+    WPACKET *thispkt,
+    OSSL_RECORD_TEMPLATE *templ,
+    uint8_t rectype,
+    unsigned char **recdata)
 {
     size_t maxcomplen;
 
@@ -704,15 +710,15 @@ int dtls_prepare_record_header(OSSL_RECORD_LAYER *rl,
         maxcomplen += SSL3_RT_MAX_COMPRESSED_OVERHEAD;
 
     if (!WPACKET_put_bytes_u8(thispkt, rectype)
-            || !WPACKET_put_bytes_u16(thispkt, templ->version)
-            || !WPACKET_put_bytes_u16(thispkt, rl->epoch)
-            || !WPACKET_memcpy(thispkt, &(rl->sequence[2]), 6)
-            || !WPACKET_start_sub_packet_u16(thispkt)
-            || (rl->eivlen > 0
-                && !WPACKET_allocate_bytes(thispkt, rl->eivlen, NULL))
-            || (maxcomplen > 0
-                && !WPACKET_reserve_bytes(thispkt, maxcomplen,
-                                          recdata))) {
+        || !WPACKET_put_bytes_u16(thispkt, templ->version)
+        || !WPACKET_put_bytes_u16(thispkt, rl->epoch)
+        || !WPACKET_memcpy(thispkt, &(rl->sequence[2]), 6)
+        || !WPACKET_start_sub_packet_u16(thispkt)
+        || (rl->eivlen > 0
+            && !WPACKET_allocate_bytes(thispkt, rl->eivlen, NULL))
+        || (maxcomplen > 0
+            && !WPACKET_reserve_bytes(thispkt, maxcomplen,
+                recdata))) {
         RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -721,13 +727,13 @@ int dtls_prepare_record_header(OSSL_RECORD_LAYER *rl,
 }
 
 int dtls_post_encryption_processing(OSSL_RECORD_LAYER *rl,
-                                    size_t mac_size,
-                                    OSSL_RECORD_TEMPLATE *thistempl,
-                                    WPACKET *thispkt,
-                                    TLS_RL_RECORD *thiswr)
+    size_t mac_size,
+    OSSL_RECORD_TEMPLATE *thistempl,
+    WPACKET *thispkt,
+    TLS_RL_RECORD *thiswr)
 {
     if (!tls_post_encryption_processing_default(rl, mac_size, thistempl,
-                                                thispkt, thiswr)) {
+            thispkt, thiswr)) {
         /* RLAYERfatal() already called */
         return 0;
     }
@@ -739,8 +745,7 @@ static size_t dtls_get_max_record_overhead(OSSL_RECORD_LAYER *rl)
 {
     size_t blocksize = 0;
 
-    if (rl->enc_ctx != NULL &&
-        (EVP_CIPHER_CTX_get_mode(rl->enc_ctx) == EVP_CIPH_CBC_MODE))
+    if (rl->enc_ctx != NULL && (EVP_CIPHER_CTX_get_mode(rl->enc_ctx) == EVP_CIPH_CBC_MODE))
         blocksize = EVP_CIPHER_CTX_get_block_size(rl->enc_ctx);
 
     /*
@@ -750,8 +755,7 @@ static size_t dtls_get_max_record_overhead(OSSL_RECORD_LAYER *rl)
      * ciphers or AEAD ciphers we don't now the digest (or there isn't one) so
      * we just trust that the taglen is correct.
      */
-    assert(rl->enc_ctx == NULL  || ((blocksize == 0 || rl->eivlen > 0)
-                                    && rl->taglen > 0));
+    assert(rl->enc_ctx == NULL || ((blocksize == 0 || rl->eivlen > 0) && rl->taglen > 0));
     assert(rl->md == NULL || (int)rl->taglen == EVP_MD_size(rl->md));
 
     /*
diff --git a/ssl/record/methods/ktls_meth.c b/ssl/record/methods/ktls_meth.c
index 33c7140e151f0..bfdcc24687f25 100644
--- a/ssl/record/methods/ktls_meth.c
+++ b/ssl/record/methods/ktls_meth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-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
@@ -18,7 +18,7 @@
 static struct record_functions_st ossl_ktls_funcs;
 
 #if defined(__FreeBSD__)
-# include "crypto/cryptodev.h"
+#include "crypto/cryptodev.h"
 
 /*-
  * Check if a given cipher is supported by the KTLS interface.
@@ -27,9 +27,9 @@ static struct record_functions_st ossl_ktls_funcs;
  * supports the cipher suite used at all.
  */
 static int ktls_int_check_supported_cipher(OSSL_RECORD_LAYER *rl,
-                                           const EVP_CIPHER *c,
-                                           const EVP_MD *md,
-                                           size_t taglen)
+    const EVP_CIPHER *c,
+    const EVP_MD *md,
+    size_t taglen)
 {
     switch (rl->version) {
     case TLS1_VERSION:
@@ -44,15 +44,15 @@ static int ktls_int_check_supported_cipher(OSSL_RECORD_LAYER *rl,
     }
 
     if (EVP_CIPHER_is_a(c, "AES-128-GCM")
-            || EVP_CIPHER_is_a(c, "AES-256-GCM")
-# ifdef OPENSSL_KTLS_CHACHA20_POLY1305
-            || EVP_CIPHER_is_a(c, "CHACHA20-POLY1305")
-# endif
-       )
+        || EVP_CIPHER_is_a(c, "AES-256-GCM")
+#ifdef OPENSSL_KTLS_CHACHA20_POLY1305
+        || EVP_CIPHER_is_a(c, "CHACHA20-POLY1305")
+#endif
+    )
         return 1;
 
     if (!EVP_CIPHER_is_a(c, "AES-128-CBC")
-            && !EVP_CIPHER_is_a(c, "AES-256-CBC"))
+        && !EVP_CIPHER_is_a(c, "AES-256-CBC"))
         return 0;
 
     if (rl->use_etm)
@@ -62,35 +62,34 @@ static int ktls_int_check_supported_cipher(OSSL_RECORD_LAYER *rl,
         return 0;
 
     if (EVP_MD_is_a(md, "SHA1")
-            || EVP_MD_is_a(md, "SHA2-256")
-            || EVP_MD_is_a(md, "SHA2-384"))
+        || EVP_MD_is_a(md, "SHA2-256")
+        || EVP_MD_is_a(md, "SHA2-384"))
         return 1;
 
     return 0;
 }
 
 /* Function to configure kernel TLS structure */
-static
-int ktls_configure_crypto(OSSL_LIB_CTX *libctx, int version, const EVP_CIPHER *c,
-                          EVP_MD *md, void *rl_sequence,
-                          ktls_crypto_info_t *crypto_info, int is_tx,
-                          unsigned char *iv, size_t ivlen,
-                          unsigned char *key, size_t keylen,
-                          unsigned char *mac_key, size_t mac_secret_size)
+static int ktls_configure_crypto(OSSL_LIB_CTX *libctx, int version, const EVP_CIPHER *c,
+    EVP_MD *md, void *rl_sequence,
+    ktls_crypto_info_t *crypto_info, int is_tx,
+    unsigned char *iv, size_t ivlen,
+    unsigned char *key, size_t keylen,
+    unsigned char *mac_key, size_t mac_secret_size)
 {
     memset(crypto_info, 0, sizeof(*crypto_info));
     if (EVP_CIPHER_is_a(c, "AES-128-GCM")
-            || EVP_CIPHER_is_a(c, "AES-256-GCM")) {
+        || EVP_CIPHER_is_a(c, "AES-256-GCM")) {
         crypto_info->cipher_algorithm = CRYPTO_AES_NIST_GCM_16;
         crypto_info->iv_len = ivlen;
     } else
-# ifdef OPENSSL_KTLS_CHACHA20_POLY1305
-    if (EVP_CIPHER_is_a(c, "CHACHA20-POLY1305")) {
+#ifdef OPENSSL_KTLS_CHACHA20_POLY1305
+        if (EVP_CIPHER_is_a(c, "CHACHA20-POLY1305")) {
         crypto_info->cipher_algorithm = CRYPTO_CHACHA20_POLY1305;
         crypto_info->iv_len = ivlen;
     } else
-# endif
-    if (EVP_CIPHER_is_a(c, "AES-128-CBC") || EVP_CIPHER_is_a(c, "AES-256-CBC")) {
+#endif
+        if (EVP_CIPHER_is_a(c, "AES-128-CBC") || EVP_CIPHER_is_a(c, "AES-256-CBC")) {
         if (md == NULL)
             return 0;
         if (EVP_MD_is_a(md, "SHA1"))
@@ -113,23 +112,23 @@ int ktls_configure_crypto(OSSL_LIB_CTX *libctx, int version, const EVP_CIPHER *c
     crypto_info->iv = iv;
     crypto_info->tls_vmajor = (version >> 8) & 0x000000ff;
     crypto_info->tls_vminor = (version & 0x000000ff);
-# ifdef TCP_RXTLS_ENABLE
+#ifdef TCP_RXTLS_ENABLE
     memcpy(crypto_info->rec_seq, rl_sequence, sizeof(crypto_info->rec_seq));
-# else
+#else
     if (!is_tx)
         return 0;
-# endif
+#endif
     return 1;
 };
 
-#endif                         /* __FreeBSD__ */
+#endif /* __FreeBSD__ */
 
 #if defined(OPENSSL_SYS_LINUX)
 /* Function to check supported ciphers in Linux */
 static int ktls_int_check_supported_cipher(OSSL_RECORD_LAYER *rl,
-                                           const EVP_CIPHER *c,
-                                           const EVP_MD *md,
-                                           size_t taglen)
+    const EVP_CIPHER *c,
+    const EVP_MD *md,
+    size_t taglen)
 {
     switch (rl->version) {
     case TLS1_2_VERSION:
@@ -145,23 +144,23 @@ static int ktls_int_check_supported_cipher(OSSL_RECORD_LAYER *rl,
      * Check that cipher is AES_GCM_128, AES_GCM_256, AES_CCM_128
      * or Chacha20-Poly1305
      */
-# ifdef OPENSSL_KTLS_AES_CCM_128
+#ifdef OPENSSL_KTLS_AES_CCM_128
     if (EVP_CIPHER_is_a(c, "AES-128-CCM")) {
         if (taglen != EVP_CCM_TLS_TAG_LEN)
             return 0;
         return 1;
     } else
-# endif
-    if (0
-# ifdef OPENSSL_KTLS_AES_GCM_128
-        || EVP_CIPHER_is_a(c, "AES-128-GCM")
-# endif
-# ifdef OPENSSL_KTLS_AES_GCM_256
-        || EVP_CIPHER_is_a(c, "AES-256-GCM")
-# endif
-# ifdef OPENSSL_KTLS_CHACHA20_POLY1305
-        || EVP_CIPHER_is_a(c, "ChaCha20-Poly1305")
-# endif
+#endif
+        if (0
+#ifdef OPENSSL_KTLS_AES_GCM_128
+            || EVP_CIPHER_is_a(c, "AES-128-GCM")
+#endif
+#ifdef OPENSSL_KTLS_AES_GCM_256
+            || EVP_CIPHER_is_a(c, "AES-256-GCM")
+#endif
+#ifdef OPENSSL_KTLS_CHACHA20_POLY1305
+            || EVP_CIPHER_is_a(c, "ChaCha20-Poly1305")
+#endif
         ) {
         return 1;
     }
@@ -169,42 +168,41 @@ static int ktls_int_check_supported_cipher(OSSL_RECORD_LAYER *rl,
 }
 
 /* Function to configure kernel TLS structure */
-static
-int ktls_configure_crypto(OSSL_LIB_CTX *libctx, int version, const EVP_CIPHER *c,
-                          const EVP_MD *md, void *rl_sequence,
-                          ktls_crypto_info_t *crypto_info, int is_tx,
-                          unsigned char *iv, size_t ivlen,
-                          unsigned char *key, size_t keylen,
-                          unsigned char *mac_key, size_t mac_secret_size)
+static int ktls_configure_crypto(OSSL_LIB_CTX *libctx, int version, const EVP_CIPHER *c,
+    const EVP_MD *md, void *rl_sequence,
+    ktls_crypto_info_t *crypto_info, int is_tx,
+    unsigned char *iv, size_t ivlen,
+    unsigned char *key, size_t keylen,
+    unsigned char *mac_key, size_t mac_secret_size)
 {
     unsigned char geniv[EVP_GCM_TLS_EXPLICIT_IV_LEN];
     unsigned char *eiv = NULL;
 
-# ifdef OPENSSL_NO_KTLS_RX
+#ifdef OPENSSL_NO_KTLS_RX
     if (!is_tx)
         return 0;
-# endif
+#endif
 
     if (EVP_CIPHER_get_mode(c) == EVP_CIPH_GCM_MODE
-            || EVP_CIPHER_get_mode(c) == EVP_CIPH_CCM_MODE) {
+        || EVP_CIPHER_get_mode(c) == EVP_CIPH_CCM_MODE) {
         if (!ossl_assert(EVP_GCM_TLS_FIXED_IV_LEN == EVP_CCM_TLS_FIXED_IV_LEN)
-                || !ossl_assert(EVP_GCM_TLS_EXPLICIT_IV_LEN
-                                == EVP_CCM_TLS_EXPLICIT_IV_LEN))
+            || !ossl_assert(EVP_GCM_TLS_EXPLICIT_IV_LEN
+                == EVP_CCM_TLS_EXPLICIT_IV_LEN))
             return 0;
         if (version == TLS1_2_VERSION) {
             if (!ossl_assert(ivlen == EVP_GCM_TLS_FIXED_IV_LEN))
                 return 0;
             if (is_tx) {
                 if (RAND_bytes_ex(libctx, geniv,
-                                EVP_GCM_TLS_EXPLICIT_IV_LEN, 0) <= 0)
+                        EVP_GCM_TLS_EXPLICIT_IV_LEN, 0)
+                    <= 0)
                     return 0;
             } else {
                 memset(geniv, 0, EVP_GCM_TLS_EXPLICIT_IV_LEN);
             }
             eiv = geniv;
         } else {
-            if (!ossl_assert(ivlen == EVP_GCM_TLS_FIXED_IV_LEN
-                                      + EVP_GCM_TLS_EXPLICIT_IV_LEN))
+            if (!ossl_assert(ivlen == EVP_GCM_TLS_FIXED_IV_LEN + EVP_GCM_TLS_EXPLICIT_IV_LEN))
                 return 0;
             eiv = iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE;
         }
@@ -212,12 +210,12 @@ int ktls_configure_crypto(OSSL_LIB_CTX *libctx, int version, const EVP_CIPHER *c
 
     memset(crypto_info, 0, sizeof(*crypto_info));
     switch (EVP_CIPHER_get_nid(c)) {
-# ifdef OPENSSL_KTLS_AES_GCM_128
+#ifdef OPENSSL_KTLS_AES_GCM_128
     case NID_aes_128_gcm:
         if (!ossl_assert(TLS_CIPHER_AES_GCM_128_SALT_SIZE
-                         == EVP_GCM_TLS_FIXED_IV_LEN)
-                || !ossl_assert(TLS_CIPHER_AES_GCM_128_IV_SIZE
-                                == EVP_GCM_TLS_EXPLICIT_IV_LEN))
+                == EVP_GCM_TLS_FIXED_IV_LEN)
+            || !ossl_assert(TLS_CIPHER_AES_GCM_128_IV_SIZE
+                == EVP_GCM_TLS_EXPLICIT_IV_LEN))
             return 0;
         crypto_info->gcm128.info.cipher_type = TLS_CIPHER_AES_GCM_128;
         crypto_info->gcm128.info.version = version;
@@ -226,15 +224,15 @@ int ktls_configure_crypto(OSSL_LIB_CTX *libctx, int version, const EVP_CIPHER *c
         memcpy(crypto_info->gcm128.salt, iv, TLS_CIPHER_AES_GCM_128_SALT_SIZE);
         memcpy(crypto_info->gcm128.key, key, keylen);
         memcpy(crypto_info->gcm128.rec_seq, rl_sequence,
-               TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE);
+            TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE);
         return 1;
-# endif
-# ifdef OPENSSL_KTLS_AES_GCM_256
+#endif
+#ifdef OPENSSL_KTLS_AES_GCM_256
     case NID_aes_256_gcm:
         if (!ossl_assert(TLS_CIPHER_AES_GCM_256_SALT_SIZE
-                         == EVP_GCM_TLS_FIXED_IV_LEN)
-                || !ossl_assert(TLS_CIPHER_AES_GCM_256_IV_SIZE
-                                == EVP_GCM_TLS_EXPLICIT_IV_LEN))
+                == EVP_GCM_TLS_FIXED_IV_LEN)
+            || !ossl_assert(TLS_CIPHER_AES_GCM_256_IV_SIZE
+                == EVP_GCM_TLS_EXPLICIT_IV_LEN))
             return 0;
         crypto_info->gcm256.info.cipher_type = TLS_CIPHER_AES_GCM_256;
         crypto_info->gcm256.info.version = version;
@@ -243,16 +241,16 @@ int ktls_configure_crypto(OSSL_LIB_CTX *libctx, int version, const EVP_CIPHER *c
         memcpy(crypto_info->gcm256.salt, iv, TLS_CIPHER_AES_GCM_256_SALT_SIZE);
         memcpy(crypto_info->gcm256.key, key, keylen);
         memcpy(crypto_info->gcm256.rec_seq, rl_sequence,
-               TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE);
+            TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE);
 
         return 1;
-# endif
-# ifdef OPENSSL_KTLS_AES_CCM_128
+#endif
+#ifdef OPENSSL_KTLS_AES_CCM_128
     case NID_aes_128_ccm:
         if (!ossl_assert(TLS_CIPHER_AES_CCM_128_SALT_SIZE
-                         == EVP_CCM_TLS_FIXED_IV_LEN)
-                || !ossl_assert(TLS_CIPHER_AES_CCM_128_IV_SIZE
-                                == EVP_CCM_TLS_EXPLICIT_IV_LEN))
+                == EVP_CCM_TLS_FIXED_IV_LEN)
+            || !ossl_assert(TLS_CIPHER_AES_CCM_128_IV_SIZE
+                == EVP_CCM_TLS_EXPLICIT_IV_LEN))
             return 0;
         crypto_info->ccm128.info.cipher_type = TLS_CIPHER_AES_CCM_128;
         crypto_info->ccm128.info.version = version;
@@ -261,10 +259,10 @@ int ktls_configure_crypto(OSSL_LIB_CTX *libctx, int version, const EVP_CIPHER *c
         memcpy(crypto_info->ccm128.salt, iv, TLS_CIPHER_AES_CCM_128_SALT_SIZE);
         memcpy(crypto_info->ccm128.key, key, keylen);
         memcpy(crypto_info->ccm128.rec_seq, rl_sequence,
-               TLS_CIPHER_AES_CCM_128_REC_SEQ_SIZE);
+            TLS_CIPHER_AES_CCM_128_REC_SEQ_SIZE);
         return 1;
-# endif
-# ifdef OPENSSL_KTLS_CHACHA20_POLY1305
+#endif
+#ifdef OPENSSL_KTLS_CHACHA20_POLY1305
     case NID_chacha20_poly1305:
         if (!ossl_assert(ivlen == TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE))
             return 0;
@@ -275,26 +273,25 @@ int ktls_configure_crypto(OSSL_LIB_CTX *libctx, int version, const EVP_CIPHER *c
         memcpy(crypto_info->chacha20poly1305.iv, iv, ivlen);
         memcpy(crypto_info->chacha20poly1305.key, key, keylen);
         memcpy(crypto_info->chacha20poly1305.rec_seq, rl_sequence,
-               TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE);
+            TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE);
         return 1;
-# endif
+#endif
     default:
         return 0;
     }
-
 }
 
 #endif /* OPENSSL_SYS_LINUX */
 
 static int ktls_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
-                                 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)
+    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)
 {
     ktls_crypto_info_t crypto_info;
 
@@ -326,16 +323,15 @@ static int ktls_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
     }
 
     if (!ktls_configure_crypto(rl->libctx, rl->version, ciph, md, rl->sequence,
-                               &crypto_info,
-                               rl->direction == OSSL_RECORD_DIRECTION_WRITE,
-                               iv, ivlen, key, keylen, mackey, mackeylen))
-       return OSSL_RECORD_RETURN_NON_FATAL_ERR;
+            &crypto_info,
+            rl->direction == OSSL_RECORD_DIRECTION_WRITE,
+            iv, ivlen, key, keylen, mackey, mackeylen))
+        return OSSL_RECORD_RETURN_NON_FATAL_ERR;
 
     if (!BIO_set_ktls(rl->bio, &crypto_info, rl->direction))
         return OSSL_RECORD_RETURN_NON_FATAL_ERR;
 
-    if (rl->direction == OSSL_RECORD_DIRECTION_WRITE &&
-        (rl->options & SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE) != 0)
+    if (rl->direction == OSSL_RECORD_DIRECTION_WRITE && (rl->options & SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE) != 0)
         /* Ignore errors. The application opts in to using the zerocopy
          * optimization. If the running kernel doesn't support it, just
          * continue without the optimization.
@@ -346,7 +342,7 @@ static int ktls_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
 }
 
 static int ktls_read_n(OSSL_RECORD_LAYER *rl, size_t n, size_t max, int extend,
-                       int clearold, size_t *readbytes)
+    int clearold, size_t *readbytes)
 {
     int ret;
 
@@ -356,15 +352,15 @@ static int ktls_read_n(OSSL_RECORD_LAYER *rl, size_t n, size_t max, int extend,
         switch (errno) {
         case EBADMSG:
             RLAYERfatal(rl, SSL_AD_BAD_RECORD_MAC,
-                        SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
+                SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
             break;
         case EMSGSIZE:
             RLAYERfatal(rl, SSL_AD_RECORD_OVERFLOW,
-                        SSL_R_PACKET_LENGTH_TOO_LONG);
+                SSL_R_PACKET_LENGTH_TOO_LONG);
             break;
         case EINVAL:
             RLAYERfatal(rl, SSL_AD_PROTOCOL_VERSION,
-                        SSL_R_WRONG_VERSION_NUMBER);
+                SSL_R_WRONG_VERSION_NUMBER);
             break;
         default:
             break;
@@ -375,8 +371,8 @@ static int ktls_read_n(OSSL_RECORD_LAYER *rl, size_t n, size_t max, int extend,
 }
 
 static int ktls_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *inrecs,
-                       size_t n_recs, int sending, SSL_MAC_BUF *mac,
-                       size_t macsize)
+    size_t n_recs, int sending, SSL_MAC_BUF *mac,
+    size_t macsize)
 {
     return 1;
 }
@@ -401,25 +397,25 @@ static int ktls_post_process_record(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec)
 
 static int
 ktls_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 **retrl)
+    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 **retrl)
 {
     int ret;
 
     ret = tls_int_new_record_layer(libctx, propq, vers, role, direction, level,
-                                   ciph, taglen, md, comp, prev,
-                                   transport, next, settings,
-                                   options, fns, cbarg, retrl);
+        ciph, taglen, md, comp, prev,
+        transport, next, settings,
+        options, fns, cbarg, retrl);
 
     if (ret != OSSL_RECORD_RETURN_SUCCESS)
         return ret;
@@ -427,11 +423,11 @@ ktls_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
     (*retrl)->funcs = &ossl_ktls_funcs;
 
     ret = (*retrl)->funcs->set_crypto_state(*retrl, level, key, keylen, iv,
-                                            ivlen, mackey, mackeylen, ciph,
-                                            taglen, mactype, md, comp);
+        ivlen, mackey, mackeylen, ciph,
+        taglen, mactype, md, comp);
 
     if (ret != OSSL_RECORD_RETURN_SUCCESS) {
-        OPENSSL_free(*retrl);
+        tls_free(*retrl);
         *retrl = NULL;
     } else {
         /*
@@ -444,8 +440,8 @@ ktls_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
 }
 
 static int ktls_allocate_write_buffers(OSSL_RECORD_LAYER *rl,
-                                       OSSL_RECORD_TEMPLATE *templates,
-                                       size_t numtempl, size_t *prefix)
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl, size_t *prefix)
 {
     if (!ossl_assert(numtempl == 1))
         return 0;
@@ -460,12 +456,12 @@ static int ktls_allocate_write_buffers(OSSL_RECORD_LAYER *rl,
 }
 
 static int ktls_initialise_write_packets(OSSL_RECORD_LAYER *rl,
-                                         OSSL_RECORD_TEMPLATE *templates,
-                                         size_t numtempl,
-                                         OSSL_RECORD_TEMPLATE *prefixtempl,
-                                         WPACKET *pkt,
-                                         TLS_BUFFER *bufs,
-                                         size_t *wpinited)
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl,
+    OSSL_RECORD_TEMPLATE *prefixtempl,
+    WPACKET *pkt,
+    TLS_BUFFER *bufs,
+    size_t *wpinited)
 {
     TLS_BUFFER *wb;
 
@@ -477,11 +473,11 @@ static int ktls_initialise_write_packets(OSSL_RECORD_LAYER *rl,
     wb->type = templates[0].type;
 
     /*
-    * ktls doesn't modify the buffer, but to avoid a warning we need
-    * to discard the const qualifier.
-    * This doesn't leak memory because the buffers have never been allocated
-    * with KTLS
-    */
+     * ktls doesn't modify the buffer, but to avoid a warning we need
+     * to discard the const qualifier.
+     * This doesn't leak memory because the buffers have never been allocated
+     * with KTLS
+     */
     TLS_BUFFER_set_buf(wb, (unsigned char *)templates[0].buf);
     TLS_BUFFER_set_offset(wb, 0);
     TLS_BUFFER_set_app_buffer(wb, 1);
@@ -490,10 +486,10 @@ static int ktls_initialise_write_packets(OSSL_RECORD_LAYER *rl,
 }
 
 static int ktls_prepare_record_header(OSSL_RECORD_LAYER *rl,
-                                      WPACKET *thispkt,
-                                      OSSL_RECORD_TEMPLATE *templ,
-                                      uint8_t rectype,
-                                      unsigned char **recdata)
+    WPACKET *thispkt,
+    OSSL_RECORD_TEMPLATE *templ,
+    uint8_t rectype,
+    unsigned char **recdata)
 {
     /* The kernel writes the record header, so nothing to do */
     *recdata = NULL;
@@ -502,19 +498,19 @@ static int ktls_prepare_record_header(OSSL_RECORD_LAYER *rl,
 }
 
 static int ktls_prepare_for_encryption(OSSL_RECORD_LAYER *rl,
-                                       size_t mac_size,
-                                       WPACKET *thispkt,
-                                       TLS_RL_RECORD *thiswr)
+    size_t mac_size,
+    WPACKET *thispkt,
+    TLS_RL_RECORD *thiswr)
 {
     /* No encryption, so nothing to do */
     return 1;
 }
 
 static int ktls_post_encryption_processing(OSSL_RECORD_LAYER *rl,
-                                           size_t mac_size,
-                                           OSSL_RECORD_TEMPLATE *templ,
-                                           WPACKET *thispkt,
-                                           TLS_RL_RECORD *thiswr)
+    size_t mac_size,
+    OSSL_RECORD_TEMPLATE *templ,
+    WPACKET *thispkt,
+    TLS_RL_RECORD *thiswr)
 {
     /* The kernel does anything that is needed, so nothing to do here */
     return 1;
diff --git a/ssl/record/methods/recmethod_local.h b/ssl/record/methods/recmethod_local.h
index 364a3a01bbe20..4ffce8d66385c 100644
--- a/ssl/record/methods/recmethod_local.h
+++ b/ssl/record/methods/recmethod_local.h
@@ -80,15 +80,14 @@ typedef struct tls_rl_record_st {
 
 /* Macros/functions provided by the TLS_RL_RECORD component */
 
-#define TLS_RL_RECORD_set_type(r, t)              ((r)->type = (t))
-#define TLS_RL_RECORD_set_rec_version(r, v)       ((r)->rec_version = (v))
-#define TLS_RL_RECORD_get_length(r)               ((r)->length)
-#define TLS_RL_RECORD_set_length(r, l)            ((r)->length = (l))
-#define TLS_RL_RECORD_add_length(r, l)            ((r)->length += (l))
-#define TLS_RL_RECORD_set_data(r, d)              ((r)->data = (d))
-#define TLS_RL_RECORD_set_input(r, i)             ((r)->input = (i))
-#define TLS_RL_RECORD_reset_input(r)              ((r)->input = (r)->data)
-
+#define TLS_RL_RECORD_set_type(r, t) ((r)->type = (t))
+#define TLS_RL_RECORD_set_rec_version(r, v) ((r)->rec_version = (v))
+#define TLS_RL_RECORD_get_length(r) ((r)->length)
+#define TLS_RL_RECORD_set_length(r, l) ((r)->length = (l))
+#define TLS_RL_RECORD_add_length(r, l) ((r)->length += (l))
+#define TLS_RL_RECORD_set_data(r, d) ((r)->data = (d))
+#define TLS_RL_RECORD_set_input(r, i) ((r)->input = (i))
+#define TLS_RL_RECORD_reset_input(r) ((r)->input = (r)->data)
 
 /* Protocol version specific function pointers */
 struct record_functions_st {
@@ -98,14 +97,14 @@ struct record_functions_st {
      * alternative record layer.
      */
     int (*set_crypto_state)(OSSL_RECORD_LAYER *rl, int level,
-                            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);
+        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);
 
     /*
      * Returns:
@@ -114,10 +113,10 @@ struct record_functions_st {
      *    1: Success or MtE decryption failed (MAC will be randomised)
      */
     int (*cipher)(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs, size_t n_recs,
-                  int sending, SSL_MAC_BUF *macs, size_t macsize);
+        int sending, SSL_MAC_BUF *macs, size_t macsize);
     /* Returns 1 for success or 0 for error */
     int (*mac)(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec, unsigned char *md,
-               int sending);
+        int sending);
 
     /* Return 1 for success or 0 for error */
     int (*set_protocol_version)(OSSL_RECORD_LAYER *rl, int version);
@@ -125,7 +124,7 @@ struct record_functions_st {
     /* Read related functions */
 
     int (*read_n)(OSSL_RECORD_LAYER *rl, size_t n, size_t max, int extend,
-                  int clearold, size_t *readbytes);
+        int clearold, size_t *readbytes);
 
     int (*get_more_records)(OSSL_RECORD_LAYER *rl);
 
@@ -138,16 +137,16 @@ struct record_functions_st {
     /* Write related functions */
 
     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);
 
     /* Return 1 for success or 0 for error */
     int (*write_records)(OSSL_RECORD_LAYER *rl, OSSL_RECORD_TEMPLATE *templates,
-                         size_t numtempl);
+        size_t numtempl);
 
     /* Allocate the rl->wbuf buffers. Return 1 for success or 0 for error */
     int (*allocate_write_buffers)(OSSL_RECORD_LAYER *rl,
-                                  OSSL_RECORD_TEMPLATE *templates,
-                                  size_t numtempl, size_t *prefix);
+        OSSL_RECORD_TEMPLATE *templates,
+        size_t numtempl, size_t *prefix);
 
     /*
      * Initialise the packets in the |pkt| array using the buffers in |rl->wbuf|.
@@ -158,27 +157,27 @@ struct record_functions_st {
      * initialised. This must be 0 on entry and will be filled in even on error.
      */
     int (*initialise_write_packets)(OSSL_RECORD_LAYER *rl,
-                                    OSSL_RECORD_TEMPLATE *templates,
-                                    size_t numtempl,
-                                    OSSL_RECORD_TEMPLATE *prefixtempl,
-                                    WPACKET *pkt,
-                                    TLS_BUFFER *bufs,
-                                    size_t *wpinited);
+        OSSL_RECORD_TEMPLATE *templates,
+        size_t numtempl,
+        OSSL_RECORD_TEMPLATE *prefixtempl,
+        WPACKET *pkt,
+        TLS_BUFFER *bufs,
+        size_t *wpinited);
 
     /* Get the actual record type to be used for a given template */
     uint8_t (*get_record_type)(OSSL_RECORD_LAYER *rl,
-                               OSSL_RECORD_TEMPLATE *template);
+        OSSL_RECORD_TEMPLATE *template);
 
     /* Write the record header data to the WPACKET */
     int (*prepare_record_header)(OSSL_RECORD_LAYER *rl, WPACKET *thispkt,
-                                 OSSL_RECORD_TEMPLATE *templ,
-                                 uint8_t rectype,
-                                 unsigned char **recdata);
+        OSSL_RECORD_TEMPLATE *templ,
+        uint8_t rectype,
+        unsigned char **recdata);
 
     int (*add_record_padding)(OSSL_RECORD_LAYER *rl,
-                              OSSL_RECORD_TEMPLATE *thistempl,
-                              WPACKET *thispkt,
-                              TLS_RL_RECORD *thiswr);
+        OSSL_RECORD_TEMPLATE *thistempl,
+        WPACKET *thispkt,
+        TLS_RL_RECORD *thiswr);
 
     /*
      * This applies any mac that might be necessary, ensures that we have enough
@@ -186,19 +185,19 @@ struct record_functions_st {
      * TLS_RL_RECORD ready for that encryption.
      */
     int (*prepare_for_encryption)(OSSL_RECORD_LAYER *rl,
-                                  size_t mac_size,
-                                  WPACKET *thispkt,
-                                  TLS_RL_RECORD *thiswr);
+        size_t mac_size,
+        WPACKET *thispkt,
+        TLS_RL_RECORD *thiswr);
 
     /*
      * Any updates required to the record after encryption has been applied. For
      * example, adding a MAC if using encrypt-then-mac
      */
     int (*post_encryption_processing)(OSSL_RECORD_LAYER *rl,
-                                      size_t mac_size,
-                                      OSSL_RECORD_TEMPLATE *thistempl,
-                                      WPACKET *thispkt,
-                                      TLS_RL_RECORD *thiswr);
+        size_t mac_size,
+        OSSL_RECORD_TEMPLATE *thistempl,
+        WPACKET *thispkt,
+        TLS_RL_RECORD *thiswr);
 
     /*
      * Some record layer implementations need to do some custom preparation of
@@ -335,8 +334,8 @@ struct ossl_record_layer_st {
     int tlstree;
 
     /* TLSv1.3 fields */
-    unsigned char *iv;     /* static IV */
-    unsigned char *nonce;  /* part of static IV followed by sequence number */
+    unsigned char *iv; /* static IV */
+    unsigned char *nonce; /* part of static IV followed by sequence number */
     int allow_plain_alerts;
 
     /* TLS "any" fields */
@@ -387,47 +386,47 @@ extern const struct record_functions_st dtls_1_funcs;
 extern const struct record_functions_st dtls_any_funcs;
 
 void ossl_rlayer_fatal(OSSL_RECORD_LAYER *rl, int al, int reason,
-                       const char *fmt, ...);
+    const char *fmt, ...);
 
 #define RLAYERfatal(rl, al, r) RLAYERfatal_data((rl), (al), (r), NULL)
-#define RLAYERfatal_data                                           \
-    (ERR_new(),                                                    \
-     ERR_set_debug(OPENSSL_FILE, OPENSSL_LINE, OPENSSL_FUNC),      \
-     ossl_rlayer_fatal)
+#define RLAYERfatal_data                                         \
+    (ERR_new(),                                                  \
+        ERR_set_debug(OPENSSL_FILE, OPENSSL_LINE, OPENSSL_FUNC), \
+        ossl_rlayer_fatal)
 
 #define RLAYER_USE_EXPLICIT_IV(rl) ((rl)->version == TLS1_1_VERSION \
-                                    || (rl)->version == TLS1_2_VERSION \
-                                    || (rl)->version == DTLS1_BAD_VER \
-                                    || (rl)->version == DTLS1_VERSION \
-                                    || (rl)->version == DTLS1_2_VERSION)
+    || (rl)->version == TLS1_2_VERSION                              \
+    || (rl)->version == DTLS1_BAD_VER                               \
+    || (rl)->version == DTLS1_VERSION                               \
+    || (rl)->version == DTLS1_2_VERSION)
 
 void ossl_tls_rl_record_set_seq_num(TLS_RL_RECORD *r,
-                                    const unsigned char *seq_num);
+    const unsigned char *seq_num);
 
 int ossl_set_tls_provider_parameters(OSSL_RECORD_LAYER *rl,
-                                     EVP_CIPHER_CTX *ctx,
-                                     const EVP_CIPHER *ciph,
-                                     const EVP_MD *md);
+    EVP_CIPHER_CTX *ctx,
+    const EVP_CIPHER *ciph,
+    const EVP_MD *md);
 
 int tls_increment_sequence_ctr(OSSL_RECORD_LAYER *rl);
 int tls_alloc_buffers(OSSL_RECORD_LAYER *rl);
 int tls_free_buffers(OSSL_RECORD_LAYER *rl);
 
 int tls_default_read_n(OSSL_RECORD_LAYER *rl, size_t n, size_t max, int extend,
-                       int clearold, size_t *readbytes);
+    int clearold, size_t *readbytes);
 int tls_get_more_records(OSSL_RECORD_LAYER *rl);
 int dtls_get_more_records(OSSL_RECORD_LAYER *rl);
 
 int dtls_prepare_record_header(OSSL_RECORD_LAYER *rl,
-                               WPACKET *thispkt,
-                               OSSL_RECORD_TEMPLATE *templ,
-                               uint8_t rectype,
-                               unsigned char **recdata);
+    WPACKET *thispkt,
+    OSSL_RECORD_TEMPLATE *templ,
+    uint8_t rectype,
+    unsigned char **recdata);
 int dtls_post_encryption_processing(OSSL_RECORD_LAYER *rl,
-                                    size_t mac_size,
-                                    OSSL_RECORD_TEMPLATE *thistempl,
-                                    WPACKET *thispkt,
-                                    TLS_RL_RECORD *thiswr);
+    size_t mac_size,
+    OSSL_RECORD_TEMPLATE *thistempl,
+    WPACKET *thispkt,
+    TLS_RL_RECORD *thiswr);
 
 int tls_default_set_protocol_version(OSSL_RECORD_LAYER *rl, int version);
 int tls_default_validate_record_header(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *re);
@@ -436,29 +435,28 @@ int tls_do_uncompress(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec);
 int tls_default_post_process_record(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec);
 int tls13_common_post_process_record(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec);
 
-int
-tls_int_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
-                         int role, int direction, int level,
-                         const EVP_CIPHER *ciph, size_t taglen,
-                         const EVP_MD *md, COMP_METHOD *comp, BIO *prev,
-                         BIO *transport, BIO *next,
-                         const OSSL_PARAM *settings, const OSSL_PARAM *options,
-                         const OSSL_DISPATCH *fns, void *cbarg,
-                         OSSL_RECORD_LAYER **retrl);
+int tls_int_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
+    int role, int direction, int level,
+    const EVP_CIPHER *ciph, size_t taglen,
+    const EVP_MD *md, COMP_METHOD *comp, BIO *prev,
+    BIO *transport, BIO *next,
+    const OSSL_PARAM *settings, const OSSL_PARAM *options,
+    const OSSL_DISPATCH *fns, void *cbarg,
+    OSSL_RECORD_LAYER **retrl);
 int tls_free(OSSL_RECORD_LAYER *rl);
 int tls_unprocessed_read_pending(OSSL_RECORD_LAYER *rl);
 int tls_processed_read_pending(OSSL_RECORD_LAYER *rl);
 size_t tls_app_data_pending(OSSL_RECORD_LAYER *rl);
 size_t tls_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);
 int tls_write_records(OSSL_RECORD_LAYER *rl, OSSL_RECORD_TEMPLATE *templates,
-                      size_t numtempl);
+    size_t numtempl);
 int tls_retry_write_records(OSSL_RECORD_LAYER *rl);
 int tls_get_alert_code(OSSL_RECORD_LAYER *rl);
 int tls_set1_bio(OSSL_RECORD_LAYER *rl, BIO *bio);
 int tls_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);
 int tls_release_record(OSSL_RECORD_LAYER *rl, void *rechandle, size_t length);
 int tls_default_set_protocol_version(OSSL_RECORD_LAYER *rl, int version);
 int tls_set_protocol_version(OSSL_RECORD_LAYER *rl, int version);
@@ -466,74 +464,74 @@ void tls_set_plain_alerts(OSSL_RECORD_LAYER *rl, int allow);
 void tls_set_first_handshake(OSSL_RECORD_LAYER *rl, int first);
 void tls_set_max_pipelines(OSSL_RECORD_LAYER *rl, size_t max_pipelines);
 void tls_get_state(OSSL_RECORD_LAYER *rl, const char **shortstr,
-                   const char **longstr);
+    const char **longstr);
 int tls_set_options(OSSL_RECORD_LAYER *rl, const OSSL_PARAM *options);
 const COMP_METHOD *tls_get_compression(OSSL_RECORD_LAYER *rl);
 void tls_set_max_frag_len(OSSL_RECORD_LAYER *rl, size_t max_frag_len);
 int tls_setup_read_buffer(OSSL_RECORD_LAYER *rl);
 int tls_setup_write_buffer(OSSL_RECORD_LAYER *rl, size_t numwpipes,
-                           size_t firstlen, size_t nextlen);
+    size_t firstlen, size_t nextlen);
 
 int tls_write_records_multiblock(OSSL_RECORD_LAYER *rl,
-                                 OSSL_RECORD_TEMPLATE *templates,
-                                 size_t numtempl);
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl);
 
 size_t tls_get_max_records_default(OSSL_RECORD_LAYER *rl, uint8_t type,
-                                   size_t len,
-                                   size_t maxfrag, size_t *preffrag);
+    size_t len,
+    size_t maxfrag, size_t *preffrag);
 size_t tls_get_max_records_multiblock(OSSL_RECORD_LAYER *rl, uint8_t type,
-                                      size_t len, size_t maxfrag,
-                                      size_t *preffrag);
+    size_t len, size_t maxfrag,
+    size_t *preffrag);
 int tls_allocate_write_buffers_default(OSSL_RECORD_LAYER *rl,
-                                       OSSL_RECORD_TEMPLATE *templates,
-                                       size_t numtempl, size_t *prefix);
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl, size_t *prefix);
 int tls_initialise_write_packets_default(OSSL_RECORD_LAYER *rl,
-                                         OSSL_RECORD_TEMPLATE *templates,
-                                         size_t numtempl,
-                                         OSSL_RECORD_TEMPLATE *prefixtempl,
-                                         WPACKET *pkt,
-                                         TLS_BUFFER *bufs,
-                                         size_t *wpinited);
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl,
+    OSSL_RECORD_TEMPLATE *prefixtempl,
+    WPACKET *pkt,
+    TLS_BUFFER *bufs,
+    size_t *wpinited);
 int tls1_allocate_write_buffers(OSSL_RECORD_LAYER *rl,
-                                OSSL_RECORD_TEMPLATE *templates,
-                                size_t numtempl, size_t *prefix);
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl, size_t *prefix);
 int tls1_initialise_write_packets(OSSL_RECORD_LAYER *rl,
-                                  OSSL_RECORD_TEMPLATE *templates,
-                                  size_t numtempl,
-                                  OSSL_RECORD_TEMPLATE *prefixtempl,
-                                  WPACKET *pkt,
-                                  TLS_BUFFER *bufs,
-                                  size_t *wpinited);
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl,
+    OSSL_RECORD_TEMPLATE *prefixtempl,
+    WPACKET *pkt,
+    TLS_BUFFER *bufs,
+    size_t *wpinited);
 int tls_prepare_record_header_default(OSSL_RECORD_LAYER *rl,
-                                      WPACKET *thispkt,
-                                      OSSL_RECORD_TEMPLATE *templ,
-                                      uint8_t rectype,
-                                      unsigned char **recdata);
+    WPACKET *thispkt,
+    OSSL_RECORD_TEMPLATE *templ,
+    uint8_t rectype,
+    unsigned char **recdata);
 int tls_prepare_for_encryption_default(OSSL_RECORD_LAYER *rl,
-                                       size_t mac_size,
-                                       WPACKET *thispkt,
-                                       TLS_RL_RECORD *thiswr);
+    size_t mac_size,
+    WPACKET *thispkt,
+    TLS_RL_RECORD *thiswr);
 int tls_post_encryption_processing_default(OSSL_RECORD_LAYER *rl,
-                                           size_t mac_size,
-                                           OSSL_RECORD_TEMPLATE *thistempl,
-                                           WPACKET *thispkt,
-                                           TLS_RL_RECORD *thiswr);
+    size_t mac_size,
+    OSSL_RECORD_TEMPLATE *thistempl,
+    WPACKET *thispkt,
+    TLS_RL_RECORD *thiswr);
 int tls_write_records_default(OSSL_RECORD_LAYER *rl,
-                              OSSL_RECORD_TEMPLATE *templates,
-                              size_t numtempl);
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl);
 
 /* Macros/functions provided by the TLS_BUFFER component */
 
-#define TLS_BUFFER_get_buf(b)              ((b)->buf)
-#define TLS_BUFFER_set_buf(b, n)           ((b)->buf = (n))
-#define TLS_BUFFER_get_len(b)              ((b)->len)
-#define TLS_BUFFER_get_left(b)             ((b)->left)
-#define TLS_BUFFER_set_left(b, l)          ((b)->left = (l))
-#define TLS_BUFFER_sub_left(b, l)          ((b)->left -= (l))
-#define TLS_BUFFER_get_offset(b)           ((b)->offset)
-#define TLS_BUFFER_set_offset(b, o)        ((b)->offset = (o))
-#define TLS_BUFFER_add_offset(b, o)        ((b)->offset += (o))
-#define TLS_BUFFER_set_app_buffer(b, l)    ((b)->app_buffer = (l))
-#define TLS_BUFFER_is_app_buffer(b)        ((b)->app_buffer)
+#define TLS_BUFFER_get_buf(b) ((b)->buf)
+#define TLS_BUFFER_set_buf(b, n) ((b)->buf = (n))
+#define TLS_BUFFER_get_len(b) ((b)->len)
+#define TLS_BUFFER_get_left(b) ((b)->left)
+#define TLS_BUFFER_set_left(b, l) ((b)->left = (l))
+#define TLS_BUFFER_sub_left(b, l) ((b)->left -= (l))
+#define TLS_BUFFER_get_offset(b) ((b)->offset)
+#define TLS_BUFFER_set_offset(b, o) ((b)->offset = (o))
+#define TLS_BUFFER_add_offset(b, o) ((b)->offset += (o))
+#define TLS_BUFFER_set_app_buffer(b, l) ((b)->app_buffer = (l))
+#define TLS_BUFFER_is_app_buffer(b) ((b)->app_buffer)
 
 void ossl_tls_buffer_release(TLS_BUFFER *b);
diff --git a/ssl/record/methods/ssl3_cbc.c b/ssl/record/methods/ssl3_cbc.c
index a8282989ed39e..48be4885bbb82 100644
--- a/ssl/record/methods/ssl3_cbc.c
+++ b/ssl/record/methods/ssl3_cbc.c
@@ -24,7 +24,7 @@
 
 #include <openssl/evp.h>
 #ifndef FIPS_MODULE
-# include <openssl/md5.h>
+#include <openssl/md5.h>
 #endif
 #include <openssl/sha.h>
 
@@ -50,11 +50,11 @@
  * u32toLE serializes an unsigned, 32-bit number (n) as four bytes at (p) in
  * little-endian order. The value of p is advanced by four.
  */
-# define u32toLE(n, p) \
-         (*((p)++) = (unsigned char)(n      ), \
-          *((p)++) = (unsigned char)(n >>  8), \
-          *((p)++) = (unsigned char)(n >> 16), \
-          *((p)++) = (unsigned char)(n >> 24))
+#define u32toLE(n, p)                        \
+    (*((p)++) = (unsigned char)(n),          \
+        *((p)++) = (unsigned char)(n >> 8),  \
+        *((p)++) = (unsigned char)(n >> 16), \
+        *((p)++) = (unsigned char)(n >> 24))
 
 /*
  * These functions serialize the state of a hash and thus perform the
@@ -101,7 +101,7 @@ static void tls1_sha512_final_raw(void *ctx, unsigned char *md_out)
         l2n8(sha512->h[i], md_out);
 }
 
-#undef  LARGEST_DIGEST_CTX
+#undef LARGEST_DIGEST_CTX
 #define LARGEST_DIGEST_CTX SHA512_CTX
 
 /*-
@@ -124,26 +124,26 @@ static void tls1_sha512_final_raw(void *ctx, unsigned char *md_out)
  * Returns 1 on success or 0 on error
  */
 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)
 {
     union {
         OSSL_UNION_ALIGN;
         unsigned char c[sizeof(LARGEST_DIGEST_CTX)];
     } md_state;
-    void (*md_final_raw) (void *ctx, unsigned char *md_out);
-    void (*md_transform) (void *ctx, const unsigned char *block);
+    void (*md_final_raw)(void *ctx, unsigned char *md_out);
+    void (*md_transform)(void *ctx, const unsigned char *block);
     size_t md_size, md_block_size = 64;
     size_t sslv3_pad_length = 40, header_length, variance_blocks,
-        len, max_mac_bytes, num_blocks,
-        num_starting_blocks, k, mac_end_offset, c, index_a, index_b;
-    size_t bits;          /* at most 18 bits */
+           len, max_mac_bytes, num_blocks,
+           num_starting_blocks, k, mac_end_offset, c, index_a, index_b;
+    size_t bits; /* at most 18 bits */
     unsigned char length_bytes[MAX_HASH_BIT_COUNT_BYTES];
     /* hmac_pad is the masked HMAC key. */
     unsigned char hmac_pad[MAX_HASH_BLOCK_SIZE];
@@ -174,8 +174,7 @@ int ssl3_cbc_digest_record(const EVP_MD *md,
         if (MD5_Init((MD5_CTX *)md_state.c) <= 0)
             return 0;
         md_final_raw = tls1_md5_final_raw;
-        md_transform =
-            (void (*)(void *ctx, const unsigned char *block))MD5_Transform;
+        md_transform = (void (*)(void *ctx, const unsigned char *block))MD5_Transform;
         md_size = 16;
         sslv3_pad_length = 48;
         length_is_big_endian = 0;
@@ -184,29 +183,25 @@ int ssl3_cbc_digest_record(const EVP_MD *md,
         if (SHA1_Init((SHA_CTX *)md_state.c) <= 0)
             return 0;
         md_final_raw = tls1_sha1_final_raw;
-        md_transform =
-            (void (*)(void *ctx, const unsigned char *block))SHA1_Transform;
+        md_transform = (void (*)(void *ctx, const unsigned char *block))SHA1_Transform;
         md_size = 20;
     } else if (EVP_MD_is_a(md, "SHA2-224")) {
         if (SHA224_Init((SHA256_CTX *)md_state.c) <= 0)
             return 0;
         md_final_raw = tls1_sha256_final_raw;
-        md_transform =
-            (void (*)(void *ctx, const unsigned char *block))SHA256_Transform;
+        md_transform = (void (*)(void *ctx, const unsigned char *block))SHA256_Transform;
         md_size = 224 / 8;
     } else if (EVP_MD_is_a(md, "SHA2-256")) {
         if (SHA256_Init((SHA256_CTX *)md_state.c) <= 0)
             return 0;
         md_final_raw = tls1_sha256_final_raw;
-        md_transform =
-            (void (*)(void *ctx, const unsigned char *block))SHA256_Transform;
+        md_transform = (void (*)(void *ctx, const unsigned char *block))SHA256_Transform;
         md_size = 32;
     } else if (EVP_MD_is_a(md, "SHA2-384")) {
         if (SHA384_Init((SHA512_CTX *)md_state.c) <= 0)
             return 0;
         md_final_raw = tls1_sha512_final_raw;
-        md_transform =
-            (void (*)(void *ctx, const unsigned char *block))SHA512_Transform;
+        md_transform = (void (*)(void *ctx, const unsigned char *block))SHA512_Transform;
         md_size = 384 / 8;
         md_block_size = 128;
         md_length_size = 16;
@@ -214,8 +209,7 @@ int ssl3_cbc_digest_record(const EVP_MD *md,
         if (SHA512_Init((SHA512_CTX *)md_state.c) <= 0)
             return 0;
         md_final_raw = tls1_sha512_final_raw;
-        md_transform =
-            (void (*)(void *ctx, const unsigned char *block))SHA512_Transform;
+        md_transform = (void (*)(void *ctx, const unsigned char *block))SHA512_Transform;
         md_size = 64;
         md_block_size = 128;
         md_length_size = 16;
@@ -230,17 +224,17 @@ int ssl3_cbc_digest_record(const EVP_MD *md,
     }
 
     if (!ossl_assert(md_length_size <= MAX_HASH_BIT_COUNT_BYTES)
-            || !ossl_assert(md_block_size <= MAX_HASH_BLOCK_SIZE)
-            || !ossl_assert(md_size <= EVP_MAX_MD_SIZE))
+        || !ossl_assert(md_block_size <= MAX_HASH_BLOCK_SIZE)
+        || !ossl_assert(md_size <= EVP_MAX_MD_SIZE))
         return 0;
 
     header_length = 13;
     if (is_sslv3) {
         header_length = mac_secret_length
-                        + sslv3_pad_length
-                        + 8  /* sequence number */
-                        + 1  /* record type */
-                        + 2; /* record length */
+            + sslv3_pad_length
+            + 8 /* sequence number */
+            + 1 /* record type */
+            + 2; /* record length */
     }
 
     /*
@@ -260,7 +254,8 @@ int ssl3_cbc_digest_record(const EVP_MD *md,
      */
     variance_blocks = is_sslv3 ? 2
                                : (((255 + 1 + md_size + md_block_size - 1)
-                                   / md_block_size) + 1);
+                                      / md_block_size)
+                                     + 1);
     /*
      * From now on we're dealing with the MAC, which conceptually has 13
      * bytes of `header' before the start of the data (TLS) or 71/75 bytes
@@ -273,9 +268,7 @@ int ssl3_cbc_digest_record(const EVP_MD *md,
      */
     max_mac_bytes = len - md_size - 1;
     /* num_blocks is the maximum number of hash blocks. */
-    num_blocks =
-        (max_mac_bytes + 1 + md_length_size + md_block_size -
-         1) / md_block_size;
+    num_blocks = (max_mac_bytes + 1 + md_length_size + md_block_size - 1) / md_block_size;
     /*
      * In order to calculate the MAC in constant time we have to handle the
      * final blocks specially because the padding value could cause the end
@@ -398,7 +391,7 @@ int ssl3_cbc_digest_record(const EVP_MD *md,
      * constant time, to |mac_out|.
      */
     for (i = num_starting_blocks; i <= num_starting_blocks + variance_blocks;
-         i++) {
+        i++) {
         unsigned char block[MAX_HASH_BLOCK_SIZE];
         unsigned char is_block_a = constant_time_eq_8_s(i, index_a);
         unsigned char is_block_b = constant_time_eq_8_s(i, index_b);
@@ -438,9 +431,7 @@ int ssl3_cbc_digest_record(const EVP_MD *md,
             if (j >= md_block_size - md_length_size) {
                 /* If this is index_b, write a length byte. */
                 b = constant_time_select_8(is_block_b,
-                                           length_bytes[j -
-                                                        (md_block_size -
-                                                         md_length_size)], b);
+                    length_bytes[j - (md_block_size - md_length_size)], b);
             }
             block[j] = b;
         }
@@ -480,7 +471,7 @@ int ssl3_cbc_digest_record(const EVP_MD *md,
         *md_out_size = md_out_size_u;
 
     ret = 1;
- err:
+err:
     EVP_MD_CTX_free(md_ctx);
     return ret;
 }
diff --git a/ssl/record/methods/ssl3_meth.c b/ssl/record/methods/ssl3_meth.c
index 6b5a1bed23ebe..3f28346027e36 100644
--- a/ssl/record/methods/ssl3_meth.c
+++ b/ssl/record/methods/ssl3_meth.c
@@ -15,14 +15,14 @@
 #include "recmethod_local.h"
 
 static int ssl3_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
-                                 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)
+    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)
 {
     EVP_CIPHER_CTX *ciph_ctx;
     int enc = (rl->direction == OSSL_RECORD_DIRECTION_WRITE) ? 1 : 0;
@@ -69,7 +69,7 @@ static int ssl3_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
      * different to that in ciph if we have an ENGINE in use
      */
     if (EVP_CIPHER_get0_provider(EVP_CIPHER_CTX_get0_cipher(ciph_ctx)) != NULL
-            && !ossl_set_tls_provider_parameters(rl, ciph_ctx, ciph, md)) {
+        && !ossl_set_tls_provider_parameters(rl, ciph_ctx, ciph, md)) {
         /* ERR_raise already called */
         return OSSL_RECORD_RETURN_FATAL;
     }
@@ -93,8 +93,8 @@ static int ssl3_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
  *    1: Success or Mac-then-encrypt decryption failed (MAC will be randomised)
  */
 static int ssl3_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *inrecs,
-                       size_t n_recs, int sending, SSL_MAC_BUF *mac,
-                       size_t macsize)
+    size_t n_recs, int sending, SSL_MAC_BUF *mac,
+    size_t macsize)
 {
     TLS_RL_RECORD *rec;
     EVP_CIPHER_CTX *ds;
@@ -154,7 +154,7 @@ static int ssl3_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *inrecs,
         int outlen;
 
         if (!EVP_CipherUpdate(ds, rec->data, &outlen, rec->input,
-                              (unsigned int)l))
+                (unsigned int)l))
             return 0;
         rec->length = outlen;
 
@@ -166,8 +166,8 @@ static int ssl3_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *inrecs,
             mac->alloced = 0;
 
             *p++ = OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_TLS_MAC,
-                                                  (void **)&mac->mac,
-                                                  macsize);
+                (void **)&mac->mac,
+                macsize);
             *p = OSSL_PARAM_construct_end();
 
             if (!EVP_CIPHER_CTX_get_params(ds, params)) {
@@ -185,13 +185,13 @@ static int ssl3_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *inrecs,
 
         if (!sending)
             return ssl3_cbc_remove_padding_and_mac(&rec->length,
-                                        rec->orig_len,
-                                        rec->data,
-                                        (mac != NULL) ? &mac->mac : NULL,
-                                        (mac != NULL) ? &mac->alloced : NULL,
-                                        bs,
-                                        macsize,
-                                        rl->libctx);
+                rec->orig_len,
+                rec->data,
+                (mac != NULL) ? &mac->mac : NULL,
+                (mac != NULL) ? &mac->alloced : NULL,
+                bs,
+                macsize,
+                rl->libctx);
     }
 
     return 1;
@@ -216,7 +216,7 @@ static const unsigned char ssl3_pad_2[48] = {
 };
 
 static int ssl3_mac(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec, unsigned char *md,
-                    int sending)
+    int sending)
 {
     unsigned char *mac_sec, *seq = rl->sequence;
     const EVP_MD_CTX *hash;
@@ -268,10 +268,11 @@ static int ssl3_mac(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec, unsigned char *md
 
         /* Final param == is SSLv3 */
         if (ssl3_cbc_digest_record(EVP_MD_CTX_get0_md(hash),
-                                   md, &md_size,
-                                   header, rec->input,
-                                   rec->length, rec->orig_len,
-                                   mac_sec, md_size, 1) <= 0)
+                md, &md_size,
+                header, rec->input,
+                rec->length, rec->orig_len,
+                mac_sec, md_size, 1)
+            <= 0)
             return 0;
 #endif
     } else {
diff --git a/ssl/record/methods/tls13_meth.c b/ssl/record/methods/tls13_meth.c
index 6bbba84d0d896..f35e0a5b4a31a 100644
--- a/ssl/record/methods/tls13_meth.c
+++ b/ssl/record/methods/tls13_meth.c
@@ -14,14 +14,14 @@
 #include "recmethod_local.h"
 
 static int tls13_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
-                                  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)
+    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)
 {
     EVP_CIPHER_CTX *ciph_ctx;
     EVP_MAC_CTX *mac_ctx;
@@ -51,7 +51,7 @@ static int tls13_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
         }
         EVP_MAC_free(mac);
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
-                                                (char *)EVP_MD_name(md), 0);
+            (char *)EVP_MD_name(md), 0);
         *p = OSSL_PARAM_construct_end();
         if (!EVP_MAC_init(mac_ctx, key, keylen, params)) {
             ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
@@ -70,21 +70,23 @@ static int tls13_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
 
     if (EVP_CipherInit_ex(ciph_ctx, ciph, NULL, NULL, NULL, enc) <= 0
         || EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_AEAD_SET_IVLEN, ivlen,
-                               NULL) <= 0
+               NULL)
+            <= 0
         || (mode == EVP_CIPH_CCM_MODE
             && EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_AEAD_SET_TAG, taglen,
-                                   NULL) <= 0)
+                   NULL)
+                <= 0)
         || EVP_CipherInit_ex(ciph_ctx, NULL, NULL, key, NULL, enc) <= 0) {
         ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
         return OSSL_RECORD_RETURN_FATAL;
     }
- end:
+end:
     return OSSL_RECORD_RETURN_SUCCESS;
 }
 
 static int tls13_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
-                        size_t n_recs, int sending, SSL_MAC_BUF *mac,
-                        size_t macsize)
+    size_t n_recs, int sending, SSL_MAC_BUF *mac,
+    size_t macsize)
 {
     EVP_CIPHER_CTX *enc_ctx;
     unsigned char recheader[SSL3_RT_HEADER_LENGTH];
@@ -169,12 +171,12 @@ static int tls13_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
 
     /* Set up the AAD */
     if (!WPACKET_init_static_len(&wpkt, recheader, sizeof(recheader), 0)
-            || !WPACKET_put_bytes_u8(&wpkt, rec->type)
-            || !WPACKET_put_bytes_u16(&wpkt, rec->rec_version)
-            || !WPACKET_put_bytes_u16(&wpkt, rec->length + rl->taglen)
-            || !WPACKET_get_total_written(&wpkt, &hdrlen)
-            || hdrlen != SSL3_RT_HEADER_LENGTH
-            || !WPACKET_finish(&wpkt)) {
+        || !WPACKET_put_bytes_u8(&wpkt, rec->type)
+        || !WPACKET_put_bytes_u16(&wpkt, rec->rec_version)
+        || !WPACKET_put_bytes_u16(&wpkt, rec->length + rl->taglen)
+        || !WPACKET_get_total_written(&wpkt, &hdrlen)
+        || hdrlen != SSL3_RT_HEADER_LENGTH
+        || !WPACKET_finish(&wpkt)) {
         RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         WPACKET_cleanup(&wpkt);
         return 0;
@@ -196,7 +198,8 @@ static int tls13_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
             memcpy(rec->data + rec->length, tag, rl->taglen);
             rec->length += rl->taglen;
         } else if (CRYPTO_memcmp(tag, rec->data + rec->length,
-                                 rl->taglen) != 0) {
+                       rl->taglen)
+            != 0) {
             goto end_mac;
         }
         ret = 1;
@@ -213,9 +216,7 @@ static int tls13_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
     mode = EVP_CIPHER_get_mode(cipher);
 
     if (EVP_CipherInit_ex(enc_ctx, NULL, NULL, NULL, nonce, sending) <= 0
-        || (!sending && EVP_CIPHER_CTX_ctrl(enc_ctx, EVP_CTRL_AEAD_SET_TAG,
-                                            rl->taglen,
-                                            rec->data + rec->length) <= 0)) {
+        || (!sending && EVP_CIPHER_CTX_ctrl(enc_ctx, EVP_CTRL_AEAD_SET_TAG, rl->taglen, rec->data + rec->length) <= 0)) {
         RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -225,20 +226,24 @@ static int tls13_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
      * any AAD.
      */
     if ((mode == EVP_CIPH_CCM_MODE
-                 && EVP_CipherUpdate(enc_ctx, NULL, &lenu, NULL,
-                                     (unsigned int)rec->length) <= 0)
-            || EVP_CipherUpdate(enc_ctx, NULL, &lenu, recheader,
-                                sizeof(recheader)) <= 0
-            || EVP_CipherUpdate(enc_ctx, rec->data, &lenu, rec->input,
-                                (unsigned int)rec->length) <= 0
-            || EVP_CipherFinal_ex(enc_ctx, rec->data + lenu, &lenf) <= 0
-            || (size_t)(lenu + lenf) != rec->length) {
+            && EVP_CipherUpdate(enc_ctx, NULL, &lenu, NULL,
+                   (unsigned int)rec->length)
+                <= 0)
+        || EVP_CipherUpdate(enc_ctx, NULL, &lenu, recheader,
+               sizeof(recheader))
+            <= 0
+        || EVP_CipherUpdate(enc_ctx, rec->data, &lenu, rec->input,
+               (unsigned int)rec->length)
+            <= 0
+        || EVP_CipherFinal_ex(enc_ctx, rec->data + lenu, &lenf) <= 0
+        || (size_t)(lenu + lenf) != rec->length) {
         return 0;
     }
     if (sending) {
         /* Add the tag */
         if (EVP_CIPHER_CTX_ctrl(enc_ctx, EVP_CTRL_AEAD_GET_TAG, rl->taglen,
-                                rec->data + rec->length) <= 0) {
+                rec->data + rec->length)
+            <= 0) {
             RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -249,12 +254,12 @@ static int tls13_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
 }
 
 static int tls13_validate_record_header(OSSL_RECORD_LAYER *rl,
-                                        TLS_RL_RECORD *rec)
+    TLS_RL_RECORD *rec)
 {
     if (rec->type != SSL3_RT_APPLICATION_DATA
-            && (rec->type != SSL3_RT_CHANGE_CIPHER_SPEC
-                || !rl->is_first_handshake)
-            && (rec->type != SSL3_RT_ALERT || !rl->allow_plain_alerts)) {
+        && (rec->type != SSL3_RT_CHANGE_CIPHER_SPEC
+            || !rl->is_first_handshake)
+        && (rec->type != SSL3_RT_ALERT || !rl->allow_plain_alerts)) {
         RLAYERfatal(rl, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_BAD_RECORD_TYPE);
         return 0;
     }
@@ -266,7 +271,7 @@ static int tls13_validate_record_header(OSSL_RECORD_LAYER *rl,
 
     if (rec->length > SSL3_RT_MAX_TLS13_ENCRYPTED_LENGTH) {
         RLAYERfatal(rl, SSL_AD_RECORD_OVERFLOW,
-                    SSL_R_ENCRYPTED_LENGTH_TOO_LONG);
+            SSL_R_ENCRYPTED_LENGTH_TOO_LONG);
         return 0;
     }
     return 1;
@@ -279,9 +284,9 @@ static int tls13_post_process_record(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec)
         size_t end;
 
         if (rec->length == 0
-                || rec->type != SSL3_RT_APPLICATION_DATA) {
+            || rec->type != SSL3_RT_APPLICATION_DATA) {
             RLAYERfatal(rl, SSL_AD_UNEXPECTED_MESSAGE,
-                        SSL_R_BAD_RECORD_TYPE);
+                SSL_R_BAD_RECORD_TYPE);
             return 0;
         }
 
@@ -307,7 +312,7 @@ static int tls13_post_process_record(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec)
 }
 
 static uint8_t tls13_get_record_type(OSSL_RECORD_LAYER *rl,
-                                     OSSL_RECORD_TEMPLATE *template)
+    OSSL_RECORD_TEMPLATE *template)
 {
     if (rl->allow_plain_alerts && template->type == SSL3_RT_ALERT)
         return SSL3_RT_ALERT;
@@ -321,9 +326,9 @@ static uint8_t tls13_get_record_type(OSSL_RECORD_LAYER *rl,
 }
 
 static int tls13_add_record_padding(OSSL_RECORD_LAYER *rl,
-                                    OSSL_RECORD_TEMPLATE *thistempl,
-                                    WPACKET *thispkt,
-                                    TLS_RL_RECORD *thiswr)
+    OSSL_RECORD_TEMPLATE *thistempl,
+    WPACKET *thispkt,
+    TLS_RL_RECORD *thiswr)
 {
     size_t rlen;
 
@@ -353,7 +358,7 @@ static int tls13_add_record_padding(OSSL_RECORD_LAYER *rl,
          * a change that could break some application that has
          * a client and server that both know what padding they
          * like, and that dislike any other padding. That'd need
-         * one of those to have been updated though so the 
+         * one of those to have been updated though so the
          * probability may be low enough that we could change
          * the "else if" below to just an "if" and pick the
          * larger of the library and callback's idea of padding.
@@ -373,7 +378,7 @@ static int tls13_add_record_padding(OSSL_RECORD_LAYER *rl,
             else if (thistempl->type == SSL3_RT_ALERT && rl->hs_padding > 0)
                 bp = rl->hs_padding;
             else if (thistempl->type == SSL3_RT_APPLICATION_DATA
-                     && rl->block_padding > 0)
+                && rl->block_padding > 0)
                 bp = rl->block_padding;
             if (bp > 0) {
                 mask = bp - 1;
@@ -395,7 +400,7 @@ static int tls13_add_record_padding(OSSL_RECORD_LAYER *rl,
                 padding = max_padding;
             if (!WPACKET_memset(thispkt, 0, padding)) {
                 RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR,
-                            ERR_R_INTERNAL_ERROR);
+                    ERR_R_INTERNAL_ERROR);
                 return 0;
             }
             TLS_RL_RECORD_add_length(thiswr, padding);
diff --git a/ssl/record/methods/tls1_meth.c b/ssl/record/methods/tls1_meth.c
index 9275e19fbd3fb..ed4a436dffc1d 100644
--- a/ssl/record/methods/tls1_meth.c
+++ b/ssl/record/methods/tls1_meth.c
@@ -17,14 +17,14 @@
 #include "recmethod_local.h"
 
 static int tls1_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
-                                 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)
+    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)
 {
     EVP_CIPHER_CTX *ciph_ctx;
     EVP_PKEY *mac_key;
@@ -62,8 +62,8 @@ static int tls1_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
     if ((EVP_CIPHER_get_flags(ciph) & EVP_CIPH_FLAG_AEAD_CIPHER) == 0) {
         if (mactype == EVP_PKEY_HMAC) {
             mac_key = EVP_PKEY_new_raw_private_key_ex(rl->libctx, "HMAC",
-                                                      rl->propq, mackey,
-                                                      mackeylen);
+                rl->propq, mackey,
+                mackeylen);
         } else {
             /*
              * If its not HMAC then the only other types of MAC we support are
@@ -71,12 +71,13 @@ static int tls1_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
              * a MAC key.
              */
             mac_key = EVP_PKEY_new_mac_key(mactype, NULL, mackey,
-                                           (int)mackeylen);
+                (int)mackeylen);
         }
         if (mac_key == NULL
             || EVP_DigestSignInit_ex(rl->md_ctx, NULL, EVP_MD_get0_name(md),
-                                     rl->libctx, rl->propq, mac_key,
-                                     NULL) <= 0) {
+                   rl->libctx, rl->propq, mac_key,
+                   NULL)
+                <= 0) {
             EVP_PKEY_free(mac_key);
             ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
             return OSSL_RECORD_RETURN_FATAL;
@@ -86,20 +87,24 @@ static int tls1_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
 
     if (EVP_CIPHER_get_mode(ciph) == EVP_CIPH_GCM_MODE) {
         if (!EVP_CipherInit_ex(ciph_ctx, ciph, NULL, key, NULL, enc)
-                || EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_GCM_SET_IV_FIXED,
-                                       (int)ivlen, iv) <= 0) {
+            || EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_GCM_SET_IV_FIXED,
+                   (int)ivlen, iv)
+                <= 0) {
             ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
             return OSSL_RECORD_RETURN_FATAL;
         }
     } else if (EVP_CIPHER_get_mode(ciph) == EVP_CIPH_CCM_MODE) {
         if (!EVP_CipherInit_ex(ciph_ctx, ciph, NULL, NULL, NULL, enc)
-                || EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_AEAD_SET_IVLEN, 12,
-                                       NULL) <= 0
-                || EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_AEAD_SET_TAG,
-                                       (int)taglen, NULL) <= 0
-                || EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_CCM_SET_IV_FIXED,
-                                       (int)ivlen, iv) <= 0
-                || !EVP_CipherInit_ex(ciph_ctx, NULL, NULL, key, NULL, enc)) {
+            || EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_AEAD_SET_IVLEN, 12,
+                   NULL)
+                <= 0
+            || EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_AEAD_SET_TAG,
+                   (int)taglen, NULL)
+                <= 0
+            || EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_CCM_SET_IV_FIXED,
+                   (int)ivlen, iv)
+                <= 0
+            || !EVP_CipherInit_ex(ciph_ctx, NULL, NULL, key, NULL, enc)) {
             ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
             return OSSL_RECORD_RETURN_FATAL;
         }
@@ -113,7 +118,8 @@ static int tls1_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
     if ((EVP_CIPHER_get_flags(ciph) & EVP_CIPH_FLAG_AEAD_CIPHER) != 0
         && mackeylen != 0
         && EVP_CIPHER_CTX_ctrl(ciph_ctx, EVP_CTRL_AEAD_SET_MAC_KEY,
-                               (int)mackeylen, mackey) <= 0) {
+               (int)mackeylen, mackey)
+            <= 0) {
         ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
         return OSSL_RECORD_RETURN_FATAL;
     }
@@ -123,7 +129,7 @@ static int tls1_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
      * different to that in ciph if we have an ENGINE in use
      */
     if (EVP_CIPHER_get0_provider(EVP_CIPHER_CTX_get0_cipher(ciph_ctx)) != NULL
-            && !ossl_set_tls_provider_parameters(rl, ciph_ctx, ciph, md)) {
+        && !ossl_set_tls_provider_parameters(rl, ciph_ctx, ciph, md)) {
         /* ERR_raise already called */
         return OSSL_RECORD_RETURN_FATAL;
     }
@@ -165,8 +171,8 @@ static int tls1_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
  *    1: Success or Mac-then-encrypt decryption failed (MAC will be randomised)
  */
 static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
-                       size_t n_recs, int sending, SSL_MAC_BUF *macs,
-                       size_t macsize)
+    size_t n_recs, int sending, SSL_MAC_BUF *macs,
+    size_t macsize)
 {
     EVP_CIPHER_CTX *ds;
     size_t reclen[SSL_MAX_PIPELINES];
@@ -213,7 +219,8 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
                     RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                     return 0;
                 } else if (RAND_bytes_ex(rl->libctx, recs[ctr].input,
-                                         ivlen, 0) <= 0) {
+                               ivlen, 0)
+                    <= 0) {
                     RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                     return 0;
                 }
@@ -236,7 +243,8 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
 
     if (n_recs > 1) {
         if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ds))
-                 & EVP_CIPH_FLAG_PIPELINE) == 0) {
+                & EVP_CIPH_FLAG_PIPELINE)
+            == 0) {
             /*
              * We shouldn't have been called with pipeline data if the
              * cipher doesn't support pipelining
@@ -249,7 +257,8 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
         reclen[ctr] = recs[ctr].length;
 
         if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ds))
-                 & EVP_CIPH_FLAG_AEAD_CIPHER) != 0) {
+                & EVP_CIPH_FLAG_AEAD_CIPHER)
+            != 0) {
             unsigned char *seq;
 
             seq = rl->sequence;
@@ -274,7 +283,7 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
             buf[ctr][11] = (unsigned char)(recs[ctr].length >> 8);
             buf[ctr][12] = (unsigned char)(recs[ctr].length & 0xff);
             pad = EVP_CIPHER_CTX_ctrl(ds, EVP_CTRL_AEAD_TLS1_AAD,
-                                      EVP_AEAD_TLS1_AAD_LEN, buf[ctr]);
+                EVP_AEAD_TLS1_AAD_LEN, buf[ctr]);
             if (pad <= 0) {
                 RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 return 0;
@@ -318,7 +327,8 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
             data[ctr] = recs[ctr].data;
 
         if (EVP_CIPHER_CTX_ctrl(ds, EVP_CTRL_SET_PIPELINE_OUTPUT_BUFS,
-                                (int)n_recs, data) <= 0) {
+                (int)n_recs, data)
+            <= 0) {
             RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, SSL_R_PIPELINE_FAILURE);
             return 0;
         }
@@ -327,9 +337,11 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
             data[ctr] = recs[ctr].input;
 
         if (EVP_CIPHER_CTX_ctrl(ds, EVP_CTRL_SET_PIPELINE_INPUT_BUFS,
-                                (int)n_recs, data) <= 0
+                (int)n_recs, data)
+                <= 0
             || EVP_CIPHER_CTX_ctrl(ds, EVP_CTRL_SET_PIPELINE_INPUT_LENS,
-                                   (int)n_recs, reclen) <= 0) {
+                   (int)n_recs, reclen)
+                <= 0) {
             RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, SSL_R_PIPELINE_FAILURE);
             return 0;
         }
@@ -347,7 +359,8 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
             decrement_seq = 1;
 
         if (EVP_CIPHER_CTX_ctrl(ds, EVP_CTRL_TLSTREE, decrement_seq,
-                                rl->sequence) <= 0) {
+                rl->sequence)
+            <= 0) {
 
             RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
@@ -364,7 +377,7 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
         }
 
         if (!EVP_CipherUpdate(ds, recs[0].data, &outlen, recs[0].input,
-                              (unsigned int)reclen[0]))
+                (unsigned int)reclen[0]))
             return 0;
         recs[0].length = outlen;
 
@@ -394,14 +407,14 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
                 macs[0].alloced = 0;
 
                 *p++ = OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_TLS_MAC,
-                                                      (void **)&macs[0].mac,
-                                                      macsize);
+                    (void **)&macs[0].mac,
+                    macsize);
                 *p = OSSL_PARAM_construct_end();
 
                 if (!EVP_CIPHER_CTX_get_params(ds, params)) {
                     /* Shouldn't normally happen */
                     RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR,
-                                ERR_R_INTERNAL_ERROR);
+                        ERR_R_INTERNAL_ERROR);
                     return 0;
                 }
             }
@@ -410,11 +423,12 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
         /* Legacy cipher */
 
         tmpr = EVP_Cipher(ds, recs[0].data, recs[0].input,
-                          (unsigned int)reclen[0]);
+            (unsigned int)reclen[0]);
         if ((EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(ds))
-                 & EVP_CIPH_FLAG_CUSTOM_CIPHER) != 0
-            ? (tmpr < 0)
-            : (tmpr == 0)) {
+                & EVP_CIPH_FLAG_CUSTOM_CIPHER)
+                    != 0
+                ? (tmpr < 0)
+                : (tmpr == 0)) {
             /* AEAD can fail to verify MAC */
             return 0;
         }
@@ -444,16 +458,17 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
                  * with a random MAC if padding is invalid
                  */
                 if (!tls1_cbc_remove_padding_and_mac(&recs[ctr].length,
-                                        recs[ctr].orig_len,
-                                        recs[ctr].data,
-                                        (macs != NULL) ? &macs[ctr].mac : NULL,
-                                        (macs != NULL) ? &macs[ctr].alloced
-                                                       : NULL,
-                                        bs,
-                                        pad ? (size_t)pad : macsize,
-                                        (EVP_CIPHER_get_flags(enc)
-                                        & EVP_CIPH_FLAG_AEAD_CIPHER) != 0,
-                                        rl->libctx))
+                        recs[ctr].orig_len,
+                        recs[ctr].data,
+                        (macs != NULL) ? &macs[ctr].mac : NULL,
+                        (macs != NULL) ? &macs[ctr].alloced
+                                       : NULL,
+                        bs,
+                        pad ? (size_t)pad : macsize,
+                        (EVP_CIPHER_get_flags(enc)
+                            & EVP_CIPH_FLAG_AEAD_CIPHER)
+                            != 0,
+                        rl->libctx))
                     return 0;
             }
         }
@@ -462,7 +477,7 @@ static int tls1_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
 }
 
 static int tls1_mac(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec, unsigned char *md,
-                    int sending)
+    int sending)
 {
     unsigned char *seq = rl->sequence;
     EVP_MD_CTX *hash;
@@ -490,8 +505,8 @@ static int tls1_mac(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec, unsigned char *md
     }
 
     if (!rl->isdtls
-            && rl->tlstree
-            && EVP_MD_CTX_ctrl(mac_ctx, EVP_MD_CTRL_TLSTREE, 0, seq) <= 0)
+        && rl->tlstree
+        && EVP_MD_CTX_ctrl(mac_ctx, EVP_MD_CTRL_TLSTREE, 0, seq) <= 0)
         goto end;
 
     if (rl->isdtls) {
@@ -517,11 +532,11 @@ static int tls1_mac(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec, unsigned char *md
         OSSL_PARAM tls_hmac_params[2], *p = tls_hmac_params;
 
         *p++ = OSSL_PARAM_construct_size_t(OSSL_MAC_PARAM_TLS_DATA_SIZE,
-                                           &rec->orig_len);
+            &rec->orig_len);
         *p++ = OSSL_PARAM_construct_end();
 
         if (!EVP_PKEY_CTX_set_params(EVP_MD_CTX_get_pkey_ctx(mac_ctx),
-                                     tls_hmac_params))
+                tls_hmac_params))
             goto end;
     }
 
@@ -530,65 +545,69 @@ static int tls1_mac(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec, unsigned char *md
         || EVP_DigestSignFinal(mac_ctx, md, &md_size) <= 0)
         goto end;
 
-    OSSL_TRACE_BEGIN(TLS) {
+    OSSL_TRACE_BEGIN(TLS)
+    {
         BIO_printf(trc_out, "seq:\n");
         BIO_dump_indent(trc_out, seq, 8, 4);
         BIO_printf(trc_out, "rec:\n");
         BIO_dump_indent(trc_out, rec->data, rec->length, 4);
-    } OSSL_TRACE_END(TLS);
+    }
+    OSSL_TRACE_END(TLS);
 
     if (!rl->isdtls && !tls_increment_sequence_ctr(rl)) {
         /* RLAYERfatal already called */
         goto end;
     }
 
-    OSSL_TRACE_BEGIN(TLS) {
+    OSSL_TRACE_BEGIN(TLS)
+    {
         BIO_printf(trc_out, "md:\n");
         BIO_dump_indent(trc_out, md, md_size, 4);
-    } OSSL_TRACE_END(TLS);
+    }
+    OSSL_TRACE_END(TLS);
     ret = 1;
- end:
+end:
     EVP_MD_CTX_free(hmac);
     return ret;
 }
 
 #if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD != 0
-# ifndef OPENSSL_NO_COMP
-#  define MAX_PREFIX_LEN ((SSL3_ALIGN_PAYLOAD - 1) \
-                           + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD \
-                           + SSL3_RT_HEADER_LENGTH \
-                           + SSL3_RT_MAX_COMPRESSED_OVERHEAD)
-# else
-#  define MAX_PREFIX_LEN ((SSL3_ALIGN_PAYLOAD - 1) \
-                           + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD \
-                           + SSL3_RT_HEADER_LENGTH)
-# endif /* OPENSSL_NO_COMP */
+#ifndef OPENSSL_NO_COMP
+#define MAX_PREFIX_LEN ((SSL3_ALIGN_PAYLOAD - 1) \
+    + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD        \
+    + SSL3_RT_HEADER_LENGTH                      \
+    + SSL3_RT_MAX_COMPRESSED_OVERHEAD)
+#else
+#define MAX_PREFIX_LEN ((SSL3_ALIGN_PAYLOAD - 1) \
+    + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD        \
+    + SSL3_RT_HEADER_LENGTH)
+#endif /* OPENSSL_NO_COMP */
+#else
+#ifndef OPENSSL_NO_COMP
+#define MAX_PREFIX_LEN (SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD \
+    + SSL3_RT_HEADER_LENGTH                                 \
+    + SSL3_RT_MAX_COMPRESSED_OVERHEAD)
 #else
-# ifndef OPENSSL_NO_COMP
-#  define MAX_PREFIX_LEN (SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD \
-                           + SSL3_RT_HEADER_LENGTH \
-                           + SSL3_RT_MAX_COMPRESSED_OVERHEAD)
-# else
-#  define MAX_PREFIX_LEN (SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD \
-                           + SSL3_RT_HEADER_LENGTH)
-# endif /* OPENSSL_NO_COMP */
+#define MAX_PREFIX_LEN (SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD \
+    + SSL3_RT_HEADER_LENGTH)
+#endif /* OPENSSL_NO_COMP */
 #endif
 
 /* This function is also used by the SSLv3 implementation */
 int tls1_allocate_write_buffers(OSSL_RECORD_LAYER *rl,
-                                OSSL_RECORD_TEMPLATE *templates,
-                                size_t numtempl, size_t *prefix)
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl, size_t *prefix)
 {
     /* Do we need to add an empty record prefix? */
     *prefix = rl->need_empty_fragments
-              && templates[0].type == SSL3_RT_APPLICATION_DATA;
+        && templates[0].type == SSL3_RT_APPLICATION_DATA;
 
     /*
      * In the prefix case we can allocate a much smaller buffer. Otherwise we
      * just allocate the default buffer size
      */
     if (!tls_setup_write_buffer(rl, numtempl + *prefix,
-                                *prefix ? MAX_PREFIX_LEN : 0, 0)) {
+            *prefix ? MAX_PREFIX_LEN : 0, 0)) {
         /* RLAYERfatal() already called */
         return 0;
     }
@@ -598,12 +617,12 @@ int tls1_allocate_write_buffers(OSSL_RECORD_LAYER *rl,
 
 /* This function is also used by the SSLv3 implementation */
 int tls1_initialise_write_packets(OSSL_RECORD_LAYER *rl,
-                                  OSSL_RECORD_TEMPLATE *templates,
-                                  size_t numtempl,
-                                  OSSL_RECORD_TEMPLATE *prefixtempl,
-                                  WPACKET *pkt,
-                                  TLS_BUFFER *bufs,
-                                  size_t *wpinited)
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl,
+    OSSL_RECORD_TEMPLATE *prefixtempl,
+    WPACKET *pkt,
+    TLS_BUFFER *bufs,
+    size_t *wpinited)
 {
     size_t align = 0;
     TLS_BUFFER *wb;
@@ -611,7 +630,7 @@ int tls1_initialise_write_packets(OSSL_RECORD_LAYER *rl,
 
     /* Do we need to add an empty record prefix? */
     prefix = rl->need_empty_fragments
-             && templates[0].type == SSL3_RT_APPLICATION_DATA;
+        && templates[0].type == SSL3_RT_APPLICATION_DATA;
 
     if (prefix) {
         /*
@@ -628,12 +647,12 @@ int tls1_initialise_write_packets(OSSL_RECORD_LAYER *rl,
 #if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD != 0
         align = (size_t)TLS_BUFFER_get_buf(wb) + SSL3_RT_HEADER_LENGTH;
         align = SSL3_ALIGN_PAYLOAD - 1
-                - ((align - 1) % SSL3_ALIGN_PAYLOAD);
+            - ((align - 1) % SSL3_ALIGN_PAYLOAD);
 #endif
         TLS_BUFFER_set_offset(wb, align);
 
         if (!WPACKET_init_static_len(&pkt[0], TLS_BUFFER_get_buf(wb),
-                                     TLS_BUFFER_get_len(wb), 0)) {
+                TLS_BUFFER_get_len(wb), 0)) {
             RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -645,9 +664,9 @@ int tls1_initialise_write_packets(OSSL_RECORD_LAYER *rl,
     }
 
     return tls_initialise_write_packets_default(rl, templates, numtempl,
-                                                NULL,
-                                                pkt + prefix, bufs + prefix,
-                                                wpinited);
+        NULL,
+        pkt + prefix, bufs + prefix,
+        wpinited);
 }
 
 /* TLSv1.0, TLSv1.1 and TLSv1.2 all use the same funcs */
diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c
index 80d4477bd0c06..bbfb3620f195d 100644
--- a/ssl/record/methods/tls_common.c
+++ b/ssl/record/methods/tls_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -40,13 +40,13 @@ static void TLS_RL_RECORD_release(TLS_RL_RECORD *r, size_t num_recs)
 }
 
 void ossl_tls_rl_record_set_seq_num(TLS_RL_RECORD *r,
-                                    const unsigned char *seq_num)
+    const unsigned char *seq_num)
 {
     memcpy(r->seq_num, seq_num, SEQ_NUM_SIZE);
 }
 
 void ossl_rlayer_fatal(OSSL_RECORD_LAYER *rl, int al, int reason,
-                       const char *fmt, ...)
+    const char *fmt, ...)
 {
     va_list args;
 
@@ -58,9 +58,9 @@ void ossl_rlayer_fatal(OSSL_RECORD_LAYER *rl, int al, int reason,
 }
 
 int ossl_set_tls_provider_parameters(OSSL_RECORD_LAYER *rl,
-                                     EVP_CIPHER_CTX *ctx,
-                                     const EVP_CIPHER *ciph,
-                                     const EVP_MD *md)
+    EVP_CIPHER_CTX *ctx,
+    const EVP_CIPHER *ciph,
+    const EVP_MD *md)
 {
     /*
      * Provided cipher, the TLS padding/MAC removal is performed provider
@@ -71,15 +71,15 @@ int ossl_set_tls_provider_parameters(OSSL_RECORD_LAYER *rl,
     int imacsize = -1;
 
     if ((EVP_CIPHER_get_flags(ciph) & EVP_CIPH_FLAG_AEAD_CIPHER) == 0
-            && !rl->use_etm)
+        && !rl->use_etm)
         imacsize = EVP_MD_get_size(md);
     if (imacsize > 0)
         macsize = (size_t)imacsize;
 
     *pprm++ = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_TLS_VERSION,
-                                       &rl->version);
+        &rl->version);
     *pprm++ = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_TLS_MAC_SIZE,
-                                          &macsize);
+        &macsize);
     *pprm = OSSL_PARAM_construct_end();
 
     if (!EVP_CIPHER_CTX_set_params(ctx, params)) {
@@ -116,7 +116,7 @@ static int tls_allow_compression(OSSL_RECORD_LAYER *rl)
         return 0;
 
     return rl->security == NULL
-           || rl->security(rl->cbarg, SSL_SECOP_COMPRESSION, 0, 0, NULL);
+        || rl->security(rl->cbarg, SSL_SECOP_COMPRESSION, 0, 0, NULL);
 }
 #endif
 
@@ -140,7 +140,7 @@ static void tls_release_write_buffer_int(OSSL_RECORD_LAYER *rl, size_t start)
 }
 
 int tls_setup_write_buffer(OSSL_RECORD_LAYER *rl, size_t numwpipes,
-                           size_t firstlen, size_t nextlen)
+    size_t firstlen, size_t nextlen)
 {
     unsigned char *p;
     size_t maxalign = 0, headerlen;
@@ -164,7 +164,7 @@ int tls_setup_write_buffer(OSSL_RECORD_LAYER *rl, size_t numwpipes,
 #endif
 
         defltlen = maxalign + headerlen + rl->eivlen + rl->max_frag_len
-                   + contenttypelen + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD;
+            + contenttypelen + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD;
 #ifndef OPENSSL_NO_COMP
         if (tls_allow_compression(rl))
             defltlen += SSL3_RT_MAX_COMPRESSED_OVERHEAD;
@@ -188,7 +188,7 @@ int tls_setup_write_buffer(OSSL_RECORD_LAYER *rl, size_t numwpipes,
 
         if (thiswb->len != len) {
             OPENSSL_free(thiswb->buf);
-            thiswb->buf = NULL;         /* force reallocation */
+            thiswb->buf = NULL; /* force reallocation */
         }
 
         p = thiswb->buf;
@@ -245,7 +245,7 @@ int tls_setup_read_buffer(OSSL_RECORD_LAYER *rl)
 
     if (b->buf == NULL) {
         len = rl->max_frag_len
-              + SSL3_RT_MAX_ENCRYPTED_OVERHEAD + headerlen + maxalign;
+            + SSL3_RT_MAX_ENCRYPTED_OVERHEAD + headerlen + maxalign;
 #ifndef OPENSSL_NO_COMP
         if (tls_allow_compression(rl))
             len += SSL3_RT_MAX_COMPRESSED_OVERHEAD;
@@ -292,7 +292,7 @@ static int tls_release_read_buffer(OSSL_RECORD_LAYER *rl)
  * Return values are as per SSL_read()
  */
 int tls_default_read_n(OSSL_RECORD_LAYER *rl, size_t n, size_t max, int extend,
-                       int clearold, size_t *readbytes)
+    int clearold, size_t *readbytes)
 {
     /*
      * If extend == 0, obtain new n-byte packet; if extend == 1, increase
@@ -443,7 +443,7 @@ int tls_default_read_n(OSSL_RECORD_LAYER *rl, size_t n, size_t max, int extend,
          */
         if (rl->isdtls) {
             if (n > left)
-                n = left;       /* makes the while condition false */
+                n = left; /* makes the while condition false */
         }
     }
 
@@ -495,13 +495,13 @@ static int tls_record_app_data_waiting(OSSL_RECORD_LAYER *rl)
 }
 
 static int rlayer_early_data_count_ok(OSSL_RECORD_LAYER *rl, size_t length,
-                                      size_t overhead, int send)
+    size_t overhead, int send)
 {
     uint32_t max_early_data = rl->max_early_data;
 
     if (max_early_data == 0) {
         RLAYERfatal(rl, send ? SSL_AD_INTERNAL_ERROR : SSL_AD_UNEXPECTED_MESSAGE,
-                    SSL_R_TOO_MUCH_EARLY_DATA);
+            SSL_R_TOO_MUCH_EARLY_DATA);
         return 0;
     }
 
@@ -510,7 +510,7 @@ static int rlayer_early_data_count_ok(OSSL_RECORD_LAYER *rl, size_t length,
 
     if (rl->early_data_count + length > max_early_data) {
         RLAYERfatal(rl, send ? SSL_AD_INTERNAL_ERROR : SSL_AD_UNEXPECTED_MESSAGE,
-                    SSL_R_TOO_MUCH_EARLY_DATA);
+            SSL_R_TOO_MUCH_EARLY_DATA);
         return 0;
     }
     rl->early_data_count += length;
@@ -526,7 +526,7 @@ static int rlayer_early_data_count_ok(OSSL_RECORD_LAYER *rl, size_t length,
  */
 #define MAX_EMPTY_RECORDS 32
 
-#define SSL2_RT_HEADER_LENGTH   2
+#define SSL2_RT_HEADER_LENGTH 2
 
 /*-
  * Call this to buffer new input records in rl->rrec.
@@ -575,14 +575,13 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
         thisrr = &rr[num_recs];
 
         /* check if we have the header */
-        if ((rl->rstate != SSL_ST_READ_BODY) ||
-            (rl->packet_length < SSL3_RT_HEADER_LENGTH)) {
+        if ((rl->rstate != SSL_ST_READ_BODY) || (rl->packet_length < SSL3_RT_HEADER_LENGTH)) {
             size_t sslv2len;
             unsigned int type;
 
             rret = rl->funcs->read_n(rl, SSL3_RT_HEADER_LENGTH,
-                                     TLS_BUFFER_get_len(rbuf), 0,
-                                     num_recs == 0 ? 1 : 0, &n);
+                TLS_BUFFER_get_len(rbuf), 0,
+                num_recs == 0 ? 1 : 0, &n);
 
             if (rret < OSSL_RECORD_RETURN_SUCCESS)
                 return rret; /* error or non-blocking */
@@ -596,7 +595,7 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
             }
             sslv2pkt = pkt;
             if (!PACKET_get_net_2_len(&sslv2pkt, &sslv2len)
-                    || !PACKET_get_1(&sslv2pkt, &type)) {
+                || !PACKET_get_1(&sslv2pkt, &type)) {
                 RLAYERfatal(rl, SSL_AD_DECODE_ERROR, ERR_R_INTERNAL_ERROR);
                 return OSSL_RECORD_RETURN_FATAL;
             }
@@ -604,9 +603,9 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
              * The first record received by the server may be a V2ClientHello.
              */
             if (rl->role == OSSL_RECORD_ROLE_SERVER
-                    && rl->is_first_record
-                    && (sslv2len & 0x8000) != 0
-                    && (type == SSL2_MT_CLIENT_HELLO)) {
+                && rl->is_first_record
+                && (sslv2len & 0x8000) != 0
+                && (type == SSL2_MT_CLIENT_HELLO)) {
                 /*
                  *  SSLv2 style record
                  *
@@ -622,9 +621,9 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
                 thisrr->length = sslv2len & 0x7fff;
 
                 if (thisrr->length > TLS_BUFFER_get_len(rbuf)
-                                     - SSL2_RT_HEADER_LENGTH) {
+                        - SSL2_RT_HEADER_LENGTH) {
                     RLAYERfatal(rl, SSL_AD_RECORD_OVERFLOW,
-                                SSL_R_PACKET_LENGTH_TOO_LONG);
+                        SSL_R_PACKET_LENGTH_TOO_LONG);
                     return OSSL_RECORD_RETURN_FATAL;
                 }
             } else {
@@ -632,8 +631,8 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
 
                 /* Pull apart the header into the TLS_RL_RECORD */
                 if (!PACKET_get_1(&pkt, &type)
-                        || !PACKET_get_net_2(&pkt, &version)
-                        || !PACKET_get_net_2_len(&pkt, &thisrr->length)) {
+                    || !PACKET_get_net_2(&pkt, &version)
+                    || !PACKET_get_net_2_len(&pkt, &thisrr->length)) {
                     if (rl->msg_callback != NULL)
                         rl->msg_callback(0, 0, SSL3_RT_HEADER, p, 5, rl->cbarg);
                     RLAYERfatal(rl, SSL_AD_DECODE_ERROR, ERR_R_INTERNAL_ERROR);
@@ -650,17 +649,16 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
                  */
                 if (thisrr->rec_version == SSL2_VERSION) {
                     RLAYERfatal(rl, SSL_AD_PROTOCOL_VERSION,
-                                SSL_R_WRONG_VERSION_NUMBER);
+                        SSL_R_WRONG_VERSION_NUMBER);
                     return OSSL_RECORD_RETURN_FATAL;
                 }
 
                 if (rl->msg_callback != NULL)
                     rl->msg_callback(0, version, SSL3_RT_HEADER, p, 5, rl->cbarg);
 
-                if (thisrr->length >
-                    TLS_BUFFER_get_len(rbuf) - SSL3_RT_HEADER_LENGTH) {
+                if (thisrr->length > TLS_BUFFER_get_len(rbuf) - SSL3_RT_HEADER_LENGTH) {
                     RLAYERfatal(rl, SSL_AD_RECORD_OVERFLOW,
-                                SSL_R_PACKET_LENGTH_TOO_LONG);
+                        SSL_R_PACKET_LENGTH_TOO_LONG);
                     return OSSL_RECORD_RETURN_FATAL;
                 }
             }
@@ -679,7 +677,7 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
          */
         if (thisrr->rec_version == SSL2_VERSION) {
             more = thisrr->length + SSL2_RT_HEADER_LENGTH
-                   - SSL3_RT_HEADER_LENGTH;
+                - SSL3_RT_HEADER_LENGTH;
         } else {
             more = thisrr->length;
         }
@@ -689,7 +687,7 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
 
             rret = rl->funcs->read_n(rl, more, more, 1, 0, &n);
             if (rret < OSSL_RECORD_RETURN_SUCCESS)
-                return rret;     /* error or non-blocking io */
+                return rret; /* error or non-blocking io */
         }
 
         /* set state for later operations */
@@ -728,24 +726,25 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
         rl->packet_length = 0;
         rl->is_first_record = 0;
     } while (num_recs < max_recs
-             && thisrr->type == SSL3_RT_APPLICATION_DATA
-             && RLAYER_USE_EXPLICIT_IV(rl)
-             && rl->enc_ctx != NULL
-             && (EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(rl->enc_ctx))
-                 & EVP_CIPH_FLAG_PIPELINE) != 0
-             && tls_record_app_data_waiting(rl));
+        && thisrr->type == SSL3_RT_APPLICATION_DATA
+        && RLAYER_USE_EXPLICIT_IV(rl)
+        && rl->enc_ctx != NULL
+        && (EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(rl->enc_ctx))
+               & EVP_CIPH_FLAG_PIPELINE)
+            != 0
+        && tls_record_app_data_waiting(rl));
 
     if (num_recs == 1
-            && thisrr->type == SSL3_RT_CHANGE_CIPHER_SPEC
-               /* The following can happen in tlsany_meth after HRR */
-            && rl->version == TLS1_3_VERSION
-            && rl->is_first_handshake) {
+        && thisrr->type == SSL3_RT_CHANGE_CIPHER_SPEC
+        /* The following can happen in tlsany_meth after HRR */
+        && rl->version == TLS1_3_VERSION
+        && rl->is_first_handshake) {
         /*
          * CCS messages must be exactly 1 byte long, containing the value 0x01
          */
         if (thisrr->length != 1 || thisrr->data[0] != 0x01) {
             RLAYERfatal(rl, SSL_AD_UNEXPECTED_MESSAGE,
-                        SSL_R_INVALID_CCS_MESSAGE);
+                SSL_R_INVALID_CCS_MESSAGE);
             return OSSL_RECORD_RETURN_FATAL;
         }
         /*
@@ -754,11 +753,11 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
          */
         if (rl->msg_callback != NULL)
             rl->msg_callback(0, TLS1_3_VERSION, SSL3_RT_CHANGE_CIPHER_SPEC,
-                             thisrr->data, 1, rl->cbarg);
+                thisrr->data, 1, rl->cbarg);
         thisrr->type = SSL3_RT_HANDSHAKE;
         if (++(rl->empty_record_count) > MAX_EMPTY_RECORDS) {
             RLAYERfatal(rl, SSL_AD_UNEXPECTED_MESSAGE,
-                        SSL_R_UNEXPECTED_CCS_MESSAGE);
+                SSL_R_UNEXPECTED_CCS_MESSAGE);
             return OSSL_RECORD_RETURN_FATAL;
         }
         rl->num_recs = 0;
@@ -800,7 +799,7 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
             i = rl->funcs->mac(rl, thisrr, md, 0 /* not send */);
             if (i == 0 || CRYPTO_memcmp(md, mac, mac_size) != 0) {
                 RLAYERfatal(rl, SSL_AD_BAD_RECORD_MAC,
-                            SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
+                    SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
                 return OSSL_RECORD_RETURN_FATAL;
             }
         }
@@ -835,8 +834,8 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
             goto end;
         }
         if (num_recs == 1
-                && rl->skip_early_data != NULL
-                && rl->skip_early_data(rl->cbarg)) {
+            && rl->skip_early_data != NULL
+            && rl->skip_early_data(rl->cbarg)) {
             /*
              * Valid early_data that we cannot decrypt will fail here. We treat
              * it like an empty record.
@@ -851,7 +850,7 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
             thisrr = &rr[0];
 
             if (!rlayer_early_data_count_ok(rl, thisrr->length,
-                                            EARLY_DATA_CIPHERTEXT_OVERHEAD, 0)) {
+                    EARLY_DATA_CIPHERTEXT_OVERHEAD, 0)) {
                 /* RLAYERfatal() already called */
                 goto end;
             }
@@ -867,20 +866,22 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
         }
         ERR_clear_last_mark();
         RLAYERfatal(rl, SSL_AD_BAD_RECORD_MAC,
-                    SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
+            SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
         goto end;
     } else {
         ERR_clear_last_mark();
     }
-    OSSL_TRACE_BEGIN(TLS) {
+    OSSL_TRACE_BEGIN(TLS)
+    {
         BIO_printf(trc_out, "dec %lu\n", (unsigned long)rr[0].length);
         BIO_dump_indent(trc_out, rr[0].data, rr[0].length, 4);
-    } OSSL_TRACE_END(TLS);
+    }
+    OSSL_TRACE_END(TLS);
 
     /* r->length is now the compressed data plus mac */
     if (rl->enc_ctx != NULL
-            && !rl->use_etm
-            && EVP_MD_CTX_get0_md(rl->md_ctx) != NULL) {
+        && !rl->use_etm
+        && EVP_MD_CTX_get0_md(rl->md_ctx) != NULL) {
         for (j = 0; j < num_recs; j++) {
             SSL_MAC_BUF *thismb = &macbufs[j];
 
@@ -893,8 +894,7 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
             if (thisrr->length > SSL3_RT_MAX_COMPRESSED_LENGTH + mac_size)
                 enc_err = 0;
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-            if (enc_err == 0 && mac_size > 0 && thismb != NULL &&
-                thismb->mac != NULL && (md[0] ^ thismb->mac[0]) != 0xFF) {
+            if (enc_err == 0 && mac_size > 0 && thismb != NULL && thismb->mac != NULL && (md[0] ^ thismb->mac[0]) != 0xFF) {
                 enc_err = 1;
             }
 #endif
@@ -914,7 +914,7 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
          * visible to an attacker (e.g. via a logfile)
          */
         RLAYERfatal(rl, SSL_AD_BAD_RECORD_MAC,
-                    SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
+            SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
         goto end;
     }
 
@@ -937,7 +937,7 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
          * be > SSL3_RT_MAX_PLAIN_LENGTH (and rl->max_frag_len must be ignored)
          */
         if (rl->max_frag_len != SSL3_RT_MAX_PLAIN_LENGTH
-                && thisrr->length > rl->max_frag_len) {
+            && thisrr->length > rl->max_frag_len) {
             RLAYERfatal(rl, SSL_AD_RECORD_OVERFLOW, SSL_R_DATA_LENGTH_TOO_LONG);
             goto end;
         }
@@ -955,7 +955,7 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
         if (thisrr->length == 0) {
             if (++(rl->empty_record_count) > MAX_EMPTY_RECORDS) {
                 RLAYERfatal(rl, SSL_AD_UNEXPECTED_MESSAGE,
-                            SSL_R_RECORD_TOO_SMALL);
+                    SSL_R_RECORD_TOO_SMALL);
                 goto end;
             }
         } else {
@@ -966,7 +966,7 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
     if (rl->level == OSSL_RECORD_PROTECTION_LEVEL_EARLY) {
         thisrr = &rr[0];
         if (thisrr->type == SSL3_RT_APPLICATION_DATA
-                && !rlayer_early_data_count_ok(rl, thisrr->length, 0, 0)) {
+            && !rlayer_early_data_count_ok(rl, thisrr->length, 0, 0)) {
             /* RLAYERfatal already called */
             goto end;
         }
@@ -976,7 +976,7 @@ int tls_get_more_records(OSSL_RECORD_LAYER *rl)
     rl->curr_rec = 0;
     rl->num_released = 0;
     ret = OSSL_RECORD_RETURN_SUCCESS;
- end:
+end:
     if (macbufs != NULL) {
         for (j = 0; j < num_recs; j++) {
             if (macbufs[j].alloced)
@@ -1008,7 +1008,7 @@ int tls_default_validate_record_header(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec
 
     if (rec->length > len) {
         RLAYERfatal(rl, SSL_AD_RECORD_OVERFLOW,
-                    SSL_R_ENCRYPTED_LENGTH_TOO_LONG);
+            SSL_R_ENCRYPTED_LENGTH_TOO_LONG);
         return 0;
     }
 
@@ -1021,8 +1021,8 @@ int tls_do_compress(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *wr)
     int i;
 
     i = COMP_compress_block(rl->compctx, wr->data,
-                            (int)(wr->length + SSL3_RT_MAX_COMPRESSED_OVERHEAD),
-                            wr->input, (int)wr->length);
+        (int)(wr->length + SSL3_RT_MAX_COMPRESSED_OVERHEAD),
+        wr->input, (int)wr->length);
     if (i < 0)
         return 0;
 
@@ -1047,7 +1047,7 @@ int tls_do_uncompress(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec)
         return 0;
 
     i = COMP_expand_block(rl->compctx, rec->comp, SSL3_RT_MAX_PLAIN_LENGTH,
-                          rec->data, (int)rec->length);
+        rec->data, (int)rec->length);
     if (i < 0)
         return 0;
     else
@@ -1065,12 +1065,12 @@ int tls_default_post_process_record(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec)
     if (rl->compctx != NULL) {
         if (rec->length > SSL3_RT_MAX_COMPRESSED_LENGTH) {
             RLAYERfatal(rl, SSL_AD_RECORD_OVERFLOW,
-                        SSL_R_COMPRESSED_LENGTH_TOO_LONG);
+                SSL_R_COMPRESSED_LENGTH_TOO_LONG);
             return 0;
         }
         if (!tls_do_uncompress(rl, rec)) {
             RLAYERfatal(rl, SSL_AD_DECOMPRESSION_FAILURE,
-                        SSL_R_BAD_DECOMPRESSION);
+                SSL_R_BAD_DECOMPRESSION);
             return 0;
         }
     }
@@ -1087,22 +1087,25 @@ int tls_default_post_process_record(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec)
 int tls13_common_post_process_record(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec)
 {
     if (rec->type != SSL3_RT_APPLICATION_DATA
-            && rec->type != SSL3_RT_ALERT
-            && rec->type != SSL3_RT_HANDSHAKE) {
+        && rec->type != SSL3_RT_ALERT
+        && rec->type != SSL3_RT_HANDSHAKE) {
         RLAYERfatal(rl, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_BAD_RECORD_TYPE);
         return 0;
     }
 
-    if (rl->msg_callback != NULL)
-        rl->msg_callback(0, rl->version, SSL3_RT_INNER_CONTENT_TYPE, &rec->type,
-                        1, rl->cbarg);
+    if (rl->msg_callback != NULL) {
+        unsigned char ctype = (unsigned char)rec->type;
+
+        rl->msg_callback(0, rl->version, SSL3_RT_INNER_CONTENT_TYPE, &ctype,
+            1, rl->cbarg);
+    }
 
     /*
      * TLSv1.3 alert and handshake records are required to be non-zero in
      * length.
      */
     if ((rec->type == SSL3_RT_HANDSHAKE || rec->type == SSL3_RT_ALERT)
-            && rec->length == 0) {
+        && rec->length == 0) {
         RLAYERfatal(rl, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_BAD_LENGTH);
         return 0;
     }
@@ -1111,8 +1114,8 @@ int tls13_common_post_process_record(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec)
 }
 
 int tls_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)
 {
     TLS_RL_RECORD *rec;
 
@@ -1160,7 +1163,7 @@ int tls_release_record(OSSL_RECORD_LAYER *rl, void *rechandle, size_t length)
     TLS_RL_RECORD *rec = &rl->rrec[rl->num_released];
 
     if (!ossl_assert(rl->num_released < rl->curr_rec)
-            || !ossl_assert(rechandle == rec)) {
+        || !ossl_assert(rechandle == rec)) {
         /* Should not happen */
         RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, SSL_R_INVALID_RECORD);
         return OSSL_RECORD_RETURN_FATAL;
@@ -1184,8 +1187,8 @@ int tls_release_record(OSSL_RECORD_LAYER *rl, void *rechandle, size_t length)
     rl->num_released++;
 
     if (rl->curr_rec == rl->num_released
-            && (rl->mode & SSL_MODE_RELEASE_BUFFERS) != 0
-            && TLS_BUFFER_get_left(&rl->rbuf) == 0)
+        && (rl->mode & SSL_MODE_RELEASE_BUFFERS) != 0
+        && TLS_BUFFER_get_left(&rl->rbuf) == 0)
         tls_release_read_buffer(rl);
 
     return OSSL_RECORD_RETURN_SUCCESS;
@@ -1209,20 +1212,20 @@ int tls_set_options(OSSL_RECORD_LAYER *rl, const OSSL_PARAM *options)
 
     if (rl->direction == OSSL_RECORD_DIRECTION_READ) {
         p = OSSL_PARAM_locate_const(options,
-                                    OSSL_LIBSSL_RECORD_LAYER_READ_BUFFER_LEN);
+            OSSL_LIBSSL_RECORD_LAYER_READ_BUFFER_LEN);
         if (p != NULL && !OSSL_PARAM_get_size_t(p, &rl->rbuf.default_len)) {
             ERR_raise(ERR_LIB_SSL, SSL_R_FAILED_TO_GET_PARAMETER);
             return 0;
         }
     } else {
         p = OSSL_PARAM_locate_const(options,
-                                    OSSL_LIBSSL_RECORD_LAYER_PARAM_BLOCK_PADDING);
+            OSSL_LIBSSL_RECORD_LAYER_PARAM_BLOCK_PADDING);
         if (p != NULL && !OSSL_PARAM_get_size_t(p, &rl->block_padding)) {
             ERR_raise(ERR_LIB_SSL, SSL_R_FAILED_TO_GET_PARAMETER);
             return 0;
         }
         p = OSSL_PARAM_locate_const(options,
-                                    OSSL_LIBSSL_RECORD_LAYER_PARAM_HS_PADDING);
+            OSSL_LIBSSL_RECORD_LAYER_PARAM_HS_PADDING);
         if (p != NULL && !OSSL_PARAM_get_size_t(p, &rl->hs_padding)) {
             ERR_raise(ERR_LIB_SSL, SSL_R_FAILED_TO_GET_PARAMETER);
             return 0;
@@ -1237,7 +1240,7 @@ int tls_set_options(OSSL_RECORD_LAYER *rl, const OSSL_PARAM *options)
          * we don't support that at this stage.
          */
         p = OSSL_PARAM_locate_const(options,
-                                    OSSL_LIBSSL_RECORD_LAYER_PARAM_READ_AHEAD);
+            OSSL_LIBSSL_RECORD_LAYER_PARAM_READ_AHEAD);
         if (p != NULL && !OSSL_PARAM_get_int(p, &rl->read_ahead)) {
             ERR_raise(ERR_LIB_SSL, SSL_R_FAILED_TO_GET_PARAMETER);
             return 0;
@@ -1247,15 +1250,14 @@ int tls_set_options(OSSL_RECORD_LAYER *rl, const OSSL_PARAM *options)
     return 1;
 }
 
-int
-tls_int_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
-                         int role, int direction, int level,
-                         const EVP_CIPHER *ciph, size_t taglen,
-                         const EVP_MD *md, COMP_METHOD *comp, BIO *prev,
-                         BIO *transport, BIO *next, const OSSL_PARAM *settings,
-                         const OSSL_PARAM *options,
-                         const OSSL_DISPATCH *fns, void *cbarg,
-                         OSSL_RECORD_LAYER **retrl)
+int tls_int_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
+    int role, int direction, int level,
+    const EVP_CIPHER *ciph, size_t taglen,
+    const EVP_MD *md, COMP_METHOD *comp, BIO *prev,
+    BIO *transport, BIO *next, const OSSL_PARAM *settings,
+    const OSSL_PARAM *options,
+    const OSSL_DISPATCH *fns, void *cbarg,
+    OSSL_RECORD_LAYER **retrl)
 {
     OSSL_RECORD_LAYER *rl = OPENSSL_zalloc(sizeof(*rl));
     const OSSL_PARAM *p;
@@ -1280,25 +1282,29 @@ tls_int_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
                     goto err;
                 }
             } else if (strcmp(p->key,
-                              OSSL_LIBSSL_RECORD_LAYER_PARAM_MAX_FRAG_LEN) == 0) {
+                           OSSL_LIBSSL_RECORD_LAYER_PARAM_MAX_FRAG_LEN)
+                == 0) {
                 if (!OSSL_PARAM_get_uint(p, &rl->max_frag_len)) {
                     ERR_raise(ERR_LIB_SSL, SSL_R_FAILED_TO_GET_PARAMETER);
                     goto err;
                 }
             } else if (strcmp(p->key,
-                              OSSL_LIBSSL_RECORD_LAYER_PARAM_MAX_EARLY_DATA) == 0) {
+                           OSSL_LIBSSL_RECORD_LAYER_PARAM_MAX_EARLY_DATA)
+                == 0) {
                 if (!OSSL_PARAM_get_uint32(p, &rl->max_early_data)) {
                     ERR_raise(ERR_LIB_SSL, SSL_R_FAILED_TO_GET_PARAMETER);
                     goto err;
                 }
             } else if (strcmp(p->key,
-                              OSSL_LIBSSL_RECORD_LAYER_PARAM_STREAM_MAC) == 0) {
+                           OSSL_LIBSSL_RECORD_LAYER_PARAM_STREAM_MAC)
+                == 0) {
                 if (!OSSL_PARAM_get_int(p, &rl->stream_mac)) {
                     ERR_raise(ERR_LIB_SSL, SSL_R_FAILED_TO_GET_PARAMETER);
                     goto err;
                 }
             } else if (strcmp(p->key,
-                              OSSL_LIBSSL_RECORD_LAYER_PARAM_TLSTREE) == 0) {
+                           OSSL_LIBSSL_RECORD_LAYER_PARAM_TLSTREE)
+                == 0) {
                 if (!OSSL_PARAM_get_int(p, &rl->tlstree)) {
                     ERR_raise(ERR_LIB_SSL, SSL_R_FAILED_TO_GET_PARAMETER);
                     goto err;
@@ -1365,9 +1371,9 @@ tls_int_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
     }
 
     if ((rl->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS) == 0
-            && rl->version <= TLS1_VERSION
-            && !EVP_CIPHER_is_a(ciph, "NULL")
-            && !EVP_CIPHER_is_a(ciph, "RC4")) {
+        && rl->version <= TLS1_VERSION
+        && !EVP_CIPHER_is_a(ciph, "NULL")
+        && !EVP_CIPHER_is_a(ciph, "RC4")) {
         /*
          * Enable vulnerability countermeasure for CBC ciphers with known-IV
          * problem (http://www.openssl.org/~bodo/tls-cbc.txt)
@@ -1377,32 +1383,32 @@ tls_int_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
 
     *retrl = rl;
     return OSSL_RECORD_RETURN_SUCCESS;
- err:
+err:
     tls_int_free(rl);
     return OSSL_RECORD_RETURN_FATAL;
 }
 
 static int
 tls_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 **retrl)
+    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 **retrl)
 {
     int ret;
 
     ret = tls_int_new_record_layer(libctx, propq, vers, role, direction, level,
-                                   ciph, taglen, md, comp, prev,
-                                   transport, next, settings,
-                                   options, fns, cbarg, retrl);
+        ciph, taglen, md, comp, prev,
+        transport, next, settings,
+        options, fns, cbarg, retrl);
 
     if (ret != OSSL_RECORD_RETURN_SUCCESS)
         return ret;
@@ -1430,10 +1436,10 @@ tls_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
     }
 
     ret = (*retrl)->funcs->set_crypto_state(*retrl, level, key, keylen, iv,
-                                            ivlen, mackey, mackeylen, ciph,
-                                            taglen, mactype, md, comp);
+        ivlen, mackey, mackeylen, ciph,
+        taglen, mactype, md, comp);
 
- err:
+err:
     if (ret != OSSL_RECORD_RETURN_SUCCESS) {
         tls_int_free(*retrl);
         *retrl = NULL;
@@ -1514,18 +1520,19 @@ size_t tls_app_data_pending(OSSL_RECORD_LAYER *rl)
 }
 
 size_t tls_get_max_records_default(OSSL_RECORD_LAYER *rl, uint8_t type,
-                                   size_t len,
-                                   size_t maxfrag, size_t *preffrag)
+    size_t len,
+    size_t maxfrag, size_t *preffrag)
 {
     /*
      * If we have a pipeline capable cipher, and we have been configured to use
      * it, then return the preferred number of pipelines.
      */
     if (rl->max_pipelines > 0
-            && rl->enc_ctx != NULL
-            && (EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(rl->enc_ctx))
-                & EVP_CIPH_FLAG_PIPELINE) != 0
-            && RLAYER_USE_EXPLICIT_IV(rl)) {
+        && rl->enc_ctx != NULL
+        && (EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(rl->enc_ctx))
+               & EVP_CIPH_FLAG_PIPELINE)
+            != 0
+        && RLAYER_USE_EXPLICIT_IV(rl)) {
         size_t pipes;
 
         if (len == 0)
@@ -1539,15 +1546,15 @@ size_t tls_get_max_records_default(OSSL_RECORD_LAYER *rl, uint8_t type,
 }
 
 size_t tls_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)
 {
     return rl->funcs->get_max_records(rl, type, len, maxfrag, preffrag);
 }
 
 int tls_allocate_write_buffers_default(OSSL_RECORD_LAYER *rl,
-                                         OSSL_RECORD_TEMPLATE *templates,
-                                         size_t numtempl,
-                                         size_t *prefix)
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl,
+    size_t *prefix)
 {
     if (!tls_setup_write_buffer(rl, numtempl, 0, 0)) {
         /* RLAYERfatal() already called */
@@ -1558,12 +1565,12 @@ int tls_allocate_write_buffers_default(OSSL_RECORD_LAYER *rl,
 }
 
 int tls_initialise_write_packets_default(OSSL_RECORD_LAYER *rl,
-                                         OSSL_RECORD_TEMPLATE *templates,
-                                         size_t numtempl,
-                                         OSSL_RECORD_TEMPLATE *prefixtempl,
-                                         WPACKET *pkt,
-                                         TLS_BUFFER *bufs,
-                                         size_t *wpinited)
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl,
+    OSSL_RECORD_TEMPLATE *prefixtempl,
+    WPACKET *pkt,
+    TLS_BUFFER *bufs,
+    size_t *wpinited)
 {
     WPACKET *thispkt;
     size_t j, align;
@@ -1579,12 +1586,12 @@ int tls_initialise_write_packets_default(OSSL_RECORD_LAYER *rl,
         align = (size_t)TLS_BUFFER_get_buf(wb);
         align += rl->isdtls ? DTLS1_RT_HEADER_LENGTH : SSL3_RT_HEADER_LENGTH;
         align = SSL3_ALIGN_PAYLOAD - 1
-                - ((align - 1) % SSL3_ALIGN_PAYLOAD);
+            - ((align - 1) % SSL3_ALIGN_PAYLOAD);
 #endif
         TLS_BUFFER_set_offset(wb, align);
 
         if (!WPACKET_init_static_len(thispkt, TLS_BUFFER_get_buf(wb),
-                                     TLS_BUFFER_get_len(wb), 0)) {
+                TLS_BUFFER_get_len(wb), 0)) {
             RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -1599,10 +1606,10 @@ int tls_initialise_write_packets_default(OSSL_RECORD_LAYER *rl,
 }
 
 int tls_prepare_record_header_default(OSSL_RECORD_LAYER *rl,
-                                      WPACKET *thispkt,
-                                      OSSL_RECORD_TEMPLATE *templ,
-                                      uint8_t rectype,
-                                      unsigned char **recdata)
+    WPACKET *thispkt,
+    OSSL_RECORD_TEMPLATE *templ,
+    uint8_t rectype,
+    unsigned char **recdata)
 {
     size_t maxcomplen;
 
@@ -1613,13 +1620,13 @@ int tls_prepare_record_header_default(OSSL_RECORD_LAYER *rl,
         maxcomplen += SSL3_RT_MAX_COMPRESSED_OVERHEAD;
 
     if (!WPACKET_put_bytes_u8(thispkt, rectype)
-            || !WPACKET_put_bytes_u16(thispkt, templ->version)
-            || !WPACKET_start_sub_packet_u16(thispkt)
-            || (rl->eivlen > 0
-                && !WPACKET_allocate_bytes(thispkt, rl->eivlen, NULL))
-            || (maxcomplen > 0
-                && !WPACKET_reserve_bytes(thispkt, maxcomplen,
-                                          recdata))) {
+        || !WPACKET_put_bytes_u16(thispkt, templ->version)
+        || !WPACKET_start_sub_packet_u16(thispkt)
+        || (rl->eivlen > 0
+            && !WPACKET_allocate_bytes(thispkt, rl->eivlen, NULL))
+        || (maxcomplen > 0
+            && !WPACKET_reserve_bytes(thispkt, maxcomplen,
+                recdata))) {
         RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -1628,9 +1635,9 @@ int tls_prepare_record_header_default(OSSL_RECORD_LAYER *rl,
 }
 
 int tls_prepare_for_encryption_default(OSSL_RECORD_LAYER *rl,
-                                       size_t mac_size,
-                                       WPACKET *thispkt,
-                                       TLS_RL_RECORD *thiswr)
+    size_t mac_size,
+    WPACKET *thispkt,
+    TLS_RL_RECORD *thiswr)
 {
     size_t len;
     unsigned char *recordstart;
@@ -1645,7 +1652,7 @@ int tls_prepare_for_encryption_default(OSSL_RECORD_LAYER *rl,
         unsigned char *mac;
 
         if (!WPACKET_allocate_bytes(thispkt, mac_size, &mac)
-                || !rl->funcs->mac(rl, thiswr, mac, 1)) {
+            || !rl->funcs->mac(rl, thiswr, mac, 1)) {
             RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -1657,13 +1664,12 @@ int tls_prepare_for_encryption_default(OSSL_RECORD_LAYER *rl,
      * max encrypted overhead does not need to include an allocation for that
      * MAC
      */
-    if (!WPACKET_reserve_bytes(thispkt, SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD
-                               - mac_size, NULL)
-            /*
-             * We also need next the amount of bytes written to this
-             * sub-packet
-             */
-            || !WPACKET_get_length(thispkt, &len)) {
+    if (!WPACKET_reserve_bytes(thispkt, SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD - mac_size, NULL)
+        /*
+         * We also need next the amount of bytes written to this
+         * sub-packet
+         */
+        || !WPACKET_get_length(thispkt, &len)) {
         RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -1678,10 +1684,10 @@ int tls_prepare_for_encryption_default(OSSL_RECORD_LAYER *rl,
 }
 
 int tls_post_encryption_processing_default(OSSL_RECORD_LAYER *rl,
-                                           size_t mac_size,
-                                           OSSL_RECORD_TEMPLATE *thistempl,
-                                           WPACKET *thispkt,
-                                           TLS_RL_RECORD *thiswr)
+    size_t mac_size,
+    OSSL_RECORD_TEMPLATE *thistempl,
+    WPACKET *thispkt,
+    TLS_RL_RECORD *thiswr)
 {
     size_t origlen, len;
     size_t headerlen = rl->isdtls ? DTLS1_RT_HEADER_LENGTH
@@ -1689,15 +1695,16 @@ int tls_post_encryption_processing_default(OSSL_RECORD_LAYER *rl,
 
     /* Allocate bytes for the encryption overhead */
     if (!WPACKET_get_length(thispkt, &origlen)
-               /* Check we allowed enough room for the encryption growth */
-            || !ossl_assert(origlen + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD
-                            - mac_size >= thiswr->length)
-            /* Encryption should never shrink the data! */
-            || origlen > thiswr->length
-            || (thiswr->length > origlen
-                && !WPACKET_allocate_bytes(thispkt,
-                                           thiswr->length - origlen,
-                                           NULL))) {
+        /* Check we allowed enough room for the encryption growth */
+        || !ossl_assert(origlen + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD
+                - mac_size
+            >= thiswr->length)
+        /* Encryption should never shrink the data! */
+        || origlen > thiswr->length
+        || (thiswr->length > origlen
+            && !WPACKET_allocate_bytes(thispkt,
+                thiswr->length - origlen,
+                NULL))) {
         RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -1705,7 +1712,7 @@ int tls_post_encryption_processing_default(OSSL_RECORD_LAYER *rl,
         unsigned char *mac;
 
         if (!WPACKET_allocate_bytes(thispkt, mac_size, &mac)
-                || !rl->funcs->mac(rl, thiswr, mac, 1)) {
+            || !rl->funcs->mac(rl, thiswr, mac, 1)) {
             RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -1714,7 +1721,7 @@ int tls_post_encryption_processing_default(OSSL_RECORD_LAYER *rl,
     }
 
     if (!WPACKET_get_length(thispkt, &len)
-            || !WPACKET_close(thispkt)) {
+        || !WPACKET_close(thispkt)) {
         RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -1724,13 +1731,13 @@ int tls_post_encryption_processing_default(OSSL_RECORD_LAYER *rl,
 
         recordstart = WPACKET_get_curr(thispkt) - len - headerlen;
         rl->msg_callback(1, thiswr->rec_version, SSL3_RT_HEADER, recordstart,
-                         headerlen, rl->cbarg);
+            headerlen, rl->cbarg);
 
         if (rl->version == TLS1_3_VERSION && rl->enc_ctx != NULL) {
             unsigned char ctype = thistempl->type;
 
             rl->msg_callback(1, thiswr->rec_version, SSL3_RT_INNER_CONTENT_TYPE,
-                             &ctype, 1, rl->cbarg);
+                &ctype, 1, rl->cbarg);
         }
     }
 
@@ -1745,8 +1752,8 @@ int tls_post_encryption_processing_default(OSSL_RECORD_LAYER *rl,
 }
 
 int tls_write_records_default(OSSL_RECORD_LAYER *rl,
-                              OSSL_RECORD_TEMPLATE *templates,
-                              size_t numtempl)
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl)
 {
     WPACKET pkt[SSL_MAX_PIPELINES + 1];
     TLS_RL_RECORD wr[SSL_MAX_PIPELINES + 1];
@@ -1772,8 +1779,8 @@ int tls_write_records_default(OSSL_RECORD_LAYER *rl,
     }
 
     if (!rl->funcs->initialise_write_packets(rl, templates, numtempl,
-                                             &prefixtempl, pkt, rl->wbuf,
-                                             &wpinited)) {
+            &prefixtempl, pkt, rl->wbuf,
+            &wpinited)) {
         /* RLAYERfatal() already called */
         goto err;
     }
@@ -1801,7 +1808,7 @@ int tls_write_records_default(OSSL_RECORD_LAYER *rl,
         TLS_RL_RECORD_set_rec_version(thiswr, thistempl->version);
 
         if (!rl->funcs->prepare_record_header(rl, thispkt, thistempl, rectype,
-                                              &compressdata)) {
+                &compressdata)) {
             /* RLAYERfatal() already called */
             goto err;
         }
@@ -1820,7 +1827,7 @@ int tls_write_records_default(OSSL_RECORD_LAYER *rl,
         /* first we compress */
         if (rl->compctx != NULL) {
             if (!tls_do_compress(rl, thiswr)
-                    || !WPACKET_allocate_bytes(thispkt, thiswr->length, NULL)) {
+                || !WPACKET_allocate_bytes(thispkt, thiswr->length, NULL)) {
                 RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, SSL_R_COMPRESSION_FAILURE);
                 goto err;
             }
@@ -1833,8 +1840,8 @@ int tls_write_records_default(OSSL_RECORD_LAYER *rl,
         }
 
         if (rl->funcs->add_record_padding != NULL
-                && !rl->funcs->add_record_padding(rl, thistempl, thispkt,
-                                                  thiswr)) {
+            && !rl->funcs->add_record_padding(rl, thistempl, thispkt,
+                thiswr)) {
             /* RLAYERfatal() already called */
             goto err;
         }
@@ -1867,7 +1874,7 @@ int tls_write_records_default(OSSL_RECORD_LAYER *rl,
         thistempl = (j < prefix) ? &prefixtempl : &templates[j - prefix];
 
         if (!rl->funcs->post_encryption_processing(rl, mac_size, thistempl,
-                                                   thispkt, thiswr)) {
+                thispkt, thiswr)) {
             /* RLAYERfatal() already called */
             goto err;
         }
@@ -1877,18 +1884,18 @@ int tls_write_records_default(OSSL_RECORD_LAYER *rl,
     }
 
     ret = 1;
- err:
+err:
     for (j = 0; j < wpinited; j++)
         WPACKET_cleanup(&pkt[j]);
     return ret;
 }
 
 int tls_write_records(OSSL_RECORD_LAYER *rl, OSSL_RECORD_TEMPLATE *templates,
-                      size_t numtempl)
+    size_t numtempl)
 {
     /* Check we don't have pending data waiting to write */
     if (!ossl_assert(rl->nextwbuf >= rl->numwpipes
-                     || TLS_BUFFER_get_left(&rl->wbuf[rl->nextwbuf]) == 0)) {
+            || TLS_BUFFER_get_left(&rl->wbuf[rl->nextwbuf]) == 0)) {
         RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return OSSL_RECORD_RETURN_FATAL;
     }
@@ -1922,10 +1929,8 @@ int tls_retry_write_records(OSSL_RECORD_LAYER *rl)
                 if (ret != OSSL_RECORD_RETURN_SUCCESS)
                     return ret;
             }
-            i = BIO_write(rl->bio, (char *)
-                          &(TLS_BUFFER_get_buf(thiswb)
-                            [TLS_BUFFER_get_offset(thiswb)]),
-                          (unsigned int)TLS_BUFFER_get_left(thiswb));
+            i = BIO_write(rl->bio, (char *)&(TLS_BUFFER_get_buf(thiswb)[TLS_BUFFER_get_offset(thiswb)]),
+                (unsigned int)TLS_BUFFER_get_left(thiswb));
             if (i >= 0) {
                 tmpwrit = i;
                 if (i == 0 && BIO_should_retry(rl->bio))
@@ -1937,7 +1942,7 @@ int tls_retry_write_records(OSSL_RECORD_LAYER *rl)
                     ret = OSSL_RECORD_RETURN_RETRY;
                 } else {
                     ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                                   "tls_retry_write_records failure");
+                        "tls_retry_write_records failure");
                     ret = OSSL_RECORD_RETURN_FATAL;
                 }
             }
@@ -1961,7 +1966,7 @@ int tls_retry_write_records(OSSL_RECORD_LAYER *rl)
                 continue;
 
             if (rl->nextwbuf == rl->numwpipes
-                    && (rl->mode & SSL_MODE_RELEASE_BUFFERS) != 0)
+                && (rl->mode & SSL_MODE_RELEASE_BUFFERS) != 0)
                 tls_release_write_buffer(rl);
             return OSSL_RECORD_RETURN_SUCCESS;
         } else if (i <= 0) {
@@ -1972,9 +1977,8 @@ int tls_retry_write_records(OSSL_RECORD_LAYER *rl)
                  */
                 TLS_BUFFER_set_left(thiswb, 0);
                 if (++(rl->nextwbuf) == rl->numwpipes
-                        && (rl->mode & SSL_MODE_RELEASE_BUFFERS) != 0)
+                    && (rl->mode & SSL_MODE_RELEASE_BUFFERS) != 0)
                     tls_release_write_buffer(rl);
-
             }
             return ret;
         }
@@ -2030,7 +2034,7 @@ void tls_set_max_pipelines(OSSL_RECORD_LAYER *rl, size_t max_pipelines)
 }
 
 void tls_get_state(OSSL_RECORD_LAYER *rl, const char **shortstr,
-                   const char **longstr)
+    const char **longstr)
 {
     const char *shrt, *lng;
 
@@ -2135,8 +2139,8 @@ int tls_free_buffers(OSSL_RECORD_LAYER *rl)
              * looks like real pending data and it is an error.
              */
             if (rl->nextwbuf != 0
-                    || rl->numwpipes != 1
-                    || TLS_BUFFER_get_left(&rl->wbuf[0]) != 0)
+                || rl->numwpipes != 1
+                || TLS_BUFFER_get_left(&rl->wbuf[0]) != 0)
                 return 0;
         }
         tls_release_write_buffer(rl);
@@ -2147,9 +2151,9 @@ int tls_free_buffers(OSSL_RECORD_LAYER *rl)
 
     /* If we have pending data to be read then fail */
     if (rl->curr_rec < rl->num_recs
-            || rl->curr_rec != rl->num_released
-            || TLS_BUFFER_get_left(&rl->rbuf) != 0
-            || rl->rstate == SSL_ST_READ_BODY)
+        || rl->curr_rec != rl->num_released
+        || TLS_BUFFER_get_left(&rl->rbuf) != 0
+        || rl->rstate == SSL_ST_READ_BODY)
         return 0;
 
     return tls_release_read_buffer(rl);
diff --git a/ssl/record/methods/tls_multib.c b/ssl/record/methods/tls_multib.c
index 3c2c30ef162a6..e0a6dc6a579cf 100644
--- a/ssl/record/methods/tls_multib.c
+++ b/ssl/record/methods/tls_multib.c
@@ -12,35 +12,33 @@
 #include "recmethod_local.h"
 
 #if defined(OPENSSL_SMALL_FOOTPRINT) \
-    || !(defined(AES_ASM) && (defined(__x86_64) \
-                              || defined(__x86_64__) \
-                              || defined(_M_AMD64) \
-                              || defined(_M_X64)))
-# undef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
-# define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0
+    || !(defined(AES_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)))
+#undef EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
+#define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0
 #endif
 
 static int tls_is_multiblock_capable(OSSL_RECORD_LAYER *rl, uint8_t type,
-                                     size_t len, size_t fraglen)
+    size_t len, size_t fraglen)
 {
 #if !defined(OPENSSL_NO_MULTIBLOCK) && EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
     if (type == SSL3_RT_APPLICATION_DATA
-            && len >= 4 * fraglen
-            && rl->compctx == NULL
-            && rl->msg_callback == NULL
-            && !rl->use_etm
-            && RLAYER_USE_EXPLICIT_IV(rl)
-            && !BIO_get_ktls_send(rl->bio)
-            && (EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(rl->enc_ctx))
-                & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK) != 0)
+        && len >= 4 * fraglen
+        && rl->compctx == NULL
+        && rl->msg_callback == NULL
+        && !rl->use_etm
+        && RLAYER_USE_EXPLICIT_IV(rl)
+        && !BIO_get_ktls_send(rl->bio)
+        && (EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(rl->enc_ctx))
+               & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)
+            != 0)
         return 1;
 #endif
     return 0;
 }
 
 size_t tls_get_max_records_multiblock(OSSL_RECORD_LAYER *rl, uint8_t type,
-                                      size_t len, size_t maxfrag,
-                                      size_t *preffrag)
+    size_t len, size_t maxfrag,
+    size_t *preffrag)
 {
     if (tls_is_multiblock_capable(rl, type, len, *preffrag)) {
         /* minimize address aliasing conflicts */
@@ -63,8 +61,8 @@ size_t tls_get_max_records_multiblock(OSSL_RECORD_LAYER *rl, uint8_t type,
  * -1 on fatal error.
  */
 static int tls_write_records_multiblock_int(OSSL_RECORD_LAYER *rl,
-                                            OSSL_RECORD_TEMPLATE *templates,
-                                            size_t numtempl)
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl)
 {
 #if !defined(OPENSSL_NO_MULTIBLOCK) && EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
     size_t i;
@@ -84,15 +82,15 @@ static int tls_write_records_multiblock_int(OSSL_RECORD_LAYER *rl,
      */
     for (i = 1; i < numtempl; i++) {
         if (templates[i - 1].type != templates[i].type
-                || templates[i - 1].buflen != templates[i].buflen
-                || templates[i - 1].buf + templates[i - 1].buflen
-                   != templates[i].buf)
+            || templates[i - 1].buflen != templates[i].buflen
+            || templates[i - 1].buf + templates[i - 1].buflen
+                != templates[i].buf)
             return 0;
     }
 
     totlen = templates[0].buflen * numtempl;
     if (!tls_is_multiblock_capable(rl, templates[0].type, totlen,
-                                   templates[0].buflen))
+            templates[0].buflen))
         return 0;
 
     /*
@@ -109,8 +107,8 @@ static int tls_write_records_multiblock_int(OSSL_RECORD_LAYER *rl,
      * buffer sizes will be spotted and the buffer reallocated.
      */
     packlen = EVP_CIPHER_CTX_ctrl(rl->enc_ctx,
-                                  EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE,
-                                  (int)templates[0].buflen, NULL);
+        EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE,
+        (int)templates[0].buflen, NULL);
     packlen *= numtempl;
     if (!tls_setup_write_buffer(rl, 1, packlen, packlen)) {
         /* RLAYERfatal() already called */
@@ -130,8 +128,8 @@ static int tls_write_records_multiblock_int(OSSL_RECORD_LAYER *rl,
     mb_param.len = totlen;
 
     packleni = EVP_CIPHER_CTX_ctrl(rl->enc_ctx,
-                                   EVP_CTRL_TLS1_1_MULTIBLOCK_AAD,
-                                   sizeof(mb_param), &mb_param);
+        EVP_CTRL_TLS1_1_MULTIBLOCK_AAD,
+        sizeof(mb_param), &mb_param);
     packlen = (size_t)packleni;
     if (packleni <= 0 || packlen > wb->len) { /* never happens */
         RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -143,8 +141,9 @@ static int tls_write_records_multiblock_int(OSSL_RECORD_LAYER *rl,
     mb_param.len = totlen;
 
     if (EVP_CIPHER_CTX_ctrl(rl->enc_ctx,
-                            EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT,
-                            sizeof(mb_param), &mb_param) <= 0) {
+            EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT,
+            sizeof(mb_param), &mb_param)
+        <= 0) {
         RLAYERfatal(rl, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return -1;
     }
@@ -152,21 +151,22 @@ static int tls_write_records_multiblock_int(OSSL_RECORD_LAYER *rl,
     rl->sequence[7] += mb_param.interleave;
     if (rl->sequence[7] < mb_param.interleave) {
         int j = 6;
-        while (j >= 0 && (++rl->sequence[j--]) == 0) ;
+        while (j >= 0 && (++rl->sequence[j--]) == 0)
+            ;
     }
 
     wb->offset = 0;
     wb->left = packlen;
 
     return 1;
-#else  /* !defined(OPENSSL_NO_MULTIBLOCK) && EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK */
+#else /* !defined(OPENSSL_NO_MULTIBLOCK) && EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK */
     return 0;
 #endif
 }
 
 int tls_write_records_multiblock(OSSL_RECORD_LAYER *rl,
-                                 OSSL_RECORD_TEMPLATE *templates,
-                                 size_t numtempl)
+    OSSL_RECORD_TEMPLATE *templates,
+    size_t numtempl)
 {
     int ret;
 
diff --git a/ssl/record/methods/tls_pad.c b/ssl/record/methods/tls_pad.c
index 23198f3a4935b..8e92ae95109dc 100644
--- a/ssl/record/methods/tls_pad.c
+++ b/ssl/record/methods/tls_pad.c
@@ -24,14 +24,14 @@
  */
 
 static int ssl3_cbc_copy_mac(size_t *reclen,
-                             size_t origreclen,
-                             unsigned char *recdata,
-                             unsigned char **mac,
-                             int *alloced,
-                             size_t block_size,
-                             size_t mac_size,
-                             size_t good,
-                             OSSL_LIB_CTX *libctx);
+    size_t origreclen,
+    unsigned char *recdata,
+    unsigned char **mac,
+    int *alloced,
+    size_t block_size,
+    size_t mac_size,
+    size_t good,
+    OSSL_LIB_CTX *libctx);
 
 /*-
  * ssl3_cbc_remove_padding removes padding from the decrypted, SSLv3, CBC
@@ -51,16 +51,16 @@ static int ssl3_cbc_copy_mac(size_t *reclen,
  *      MAC returned is random.
  */
 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)
 {
     size_t padding_length;
     size_t good;
-    const size_t overhead = 1 /* padding length byte */  + mac_size;
+    const size_t overhead = 1 /* padding length byte */ + mac_size;
 
     /*
      * These lengths are all public so we can test them in non-constant time.
@@ -75,7 +75,7 @@ int ssl3_cbc_remove_padding_and_mac(size_t *reclen,
     *reclen -= good & (padding_length + 1);
 
     return ssl3_cbc_copy_mac(reclen, origreclen, recdata, mac, alloced,
-                             block_size, mac_size, good, libctx);
+        block_size, mac_size, good, libctx);
 }
 
 /*-
@@ -96,18 +96,18 @@ int ssl3_cbc_remove_padding_and_mac(size_t *reclen,
  *      MAC returned is random.
  */
 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)
 {
     size_t good = -1;
     size_t padding_length, to_check, i;
     size_t overhead = ((block_size == 1) ? 0 : 1) /* padding length byte */
-                      + mac_size;
+        + mac_size;
 
     /*
      * These lengths are all public so we can test them in non-constant
@@ -136,7 +136,7 @@ int tls1_cbc_remove_padding_and_mac(size_t *reclen,
          * maximum amount of padding possible. (Again, the length of the record
          * is public information so we can use it.)
          */
-        to_check = 256;        /* maximum amount of padding, inc length byte. */
+        to_check = 256; /* maximum amount of padding, inc length byte. */
         if (to_check > *reclen)
             to_check = *reclen;
 
@@ -159,7 +159,7 @@ int tls1_cbc_remove_padding_and_mac(size_t *reclen,
     }
 
     return ssl3_cbc_copy_mac(reclen, origreclen, recdata, mac, alloced,
-                             block_size, mac_size, good, libctx);
+        block_size, mac_size, good, libctx);
 }
 
 /*-
@@ -180,14 +180,14 @@ int tls1_cbc_remove_padding_and_mac(size_t *reclen,
 #define CBC_MAC_ROTATE_IN_PLACE
 
 static int ssl3_cbc_copy_mac(size_t *reclen,
-                             size_t origreclen,
-                             unsigned char *recdata,
-                             unsigned char **mac,
-                             int *alloced,
-                             size_t block_size,
-                             size_t mac_size,
-                             size_t good,
-                             OSSL_LIB_CTX *libctx)
+    size_t origreclen,
+    unsigned char *recdata,
+    unsigned char **mac,
+    int *alloced,
+    size_t block_size,
+    size_t mac_size,
+    size_t good,
+    OSSL_LIB_CTX *libctx)
 {
 #if defined(CBC_MAC_ROTATE_IN_PLACE)
     unsigned char rotated_mac_buf[64 + EVP_MAX_MD_SIZE];
@@ -214,7 +214,7 @@ static int ssl3_cbc_copy_mac(size_t *reclen,
     size_t rotate_offset;
 
     if (!ossl_assert(origreclen >= mac_size
-                     && mac_size <= EVP_MAX_MD_SIZE))
+            && mac_size <= EVP_MAX_MD_SIZE))
         return 0;
 
     /* If no MAC then nothing to be done */
@@ -286,8 +286,8 @@ static int ssl3_cbc_copy_mac(size_t *reclen,
 
         /* If the padding wasn't good we emit a random MAC */
         out[j++] = constant_time_select_8((unsigned char)(good & 0xff),
-                                          aux3,
-                                          randmac[i]);
+            aux3,
+            randmac[i]);
         rotate_offset &= constant_time_lt_s(rotate_offset, mac_size);
     }
 #else
@@ -302,7 +302,7 @@ static int ssl3_cbc_copy_mac(size_t *reclen,
 
         /* If the padding wasn't good we emit a random MAC */
         out[i] = constant_time_select_8((unsigned char)(good & 0xff), out[i],
-                                        randmac[i]);
+            randmac[i]);
     }
 #endif
 
diff --git a/ssl/record/methods/tlsany_meth.c b/ssl/record/methods/tlsany_meth.c
index bbe873aaf5166..9961725439795 100644
--- a/ssl/record/methods/tlsany_meth.c
+++ b/ssl/record/methods/tlsany_meth.c
@@ -12,17 +12,17 @@
 #include "../record_local.h"
 #include "recmethod_local.h"
 
-#define MIN_SSL2_RECORD_LEN     9
+#define MIN_SSL2_RECORD_LEN 9
 
 static int tls_any_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
-                                    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)
+    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)
 {
     if (level != OSSL_RECORD_PROTECTION_LEVEL_NONE) {
         ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
@@ -35,8 +35,8 @@ static int tls_any_set_crypto_state(OSSL_RECORD_LAYER *rl, int level,
 }
 
 static int tls_any_cipher(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *recs,
-                          size_t n_recs, int sending, SSL_MAC_BUF *macs,
-                          size_t macsize)
+    size_t n_recs, int sending, SSL_MAC_BUF *macs,
+    size_t macsize)
 {
     return 1;
 }
@@ -64,29 +64,22 @@ static int tls_validate_record_header(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec)
                      * we have.
                      */
                     p = rl->packet;
-                    if (HAS_PREFIX((char *)p, "GET ") ||
-                        HAS_PREFIX((char *)p, "POST ") ||
-                        HAS_PREFIX((char *)p, "HEAD ") ||
-                        HAS_PREFIX((char *)p, "PATCH") ||
-                        HAS_PREFIX((char *)p, "OPTIO") ||
-                        HAS_PREFIX((char *)p, "DELET") ||
-                        HAS_PREFIX((char *)p, "TRACE") ||
-                        HAS_PREFIX((char *)p, "PUT ")) {
+                    if (HAS_PREFIX((char *)p, "GET ") || HAS_PREFIX((char *)p, "POST ") || HAS_PREFIX((char *)p, "HEAD ") || HAS_PREFIX((char *)p, "PATCH") || HAS_PREFIX((char *)p, "OPTIO") || HAS_PREFIX((char *)p, "DELET") || HAS_PREFIX((char *)p, "TRACE") || HAS_PREFIX((char *)p, "PUT ")) {
                         RLAYERfatal(rl, SSL_AD_NO_ALERT, SSL_R_HTTP_REQUEST);
                         return 0;
                     } else if (HAS_PREFIX((char *)p, "CONNE")) {
                         RLAYERfatal(rl, SSL_AD_NO_ALERT,
-                                    SSL_R_HTTPS_PROXY_REQUEST);
+                            SSL_R_HTTPS_PROXY_REQUEST);
                         return 0;
                     }
 
                     /* Doesn't look like TLS - don't send an alert */
                     RLAYERfatal(rl, SSL_AD_NO_ALERT,
-                                SSL_R_WRONG_VERSION_NUMBER);
+                        SSL_R_WRONG_VERSION_NUMBER);
                     return 0;
                 } else {
                     RLAYERfatal(rl, SSL_AD_PROTOCOL_VERSION,
-                                SSL_R_WRONG_VERSION_NUMBER);
+                        SSL_R_WRONG_VERSION_NUMBER);
                     return 0;
                 }
             }
@@ -108,14 +101,14 @@ static int tls_validate_record_header(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec)
                      * end.
                      */
                     RLAYERfatal(rl, SSL_AD_NO_ALERT,
-                                SSL_R_WRONG_VERSION_NUMBER);
+                        SSL_R_WRONG_VERSION_NUMBER);
                     return 0;
                 }
                 /* Send back error using their minor version number */
                 rl->version = (unsigned short)rec->rec_version;
             }
             RLAYERfatal(rl, SSL_AD_PROTOCOL_VERSION,
-                        SSL_R_WRONG_VERSION_NUMBER);
+                SSL_R_WRONG_VERSION_NUMBER);
             return 0;
         }
     }
@@ -141,9 +134,9 @@ static int tls_any_set_protocol_version(OSSL_RECORD_LAYER *rl, int vers)
 }
 
 static int tls_any_prepare_for_encryption(OSSL_RECORD_LAYER *rl,
-                                          size_t mac_size,
-                                          WPACKET *thispkt,
-                                          TLS_RL_RECORD *thiswr)
+    size_t mac_size,
+    WPACKET *thispkt,
+    TLS_RL_RECORD *thiswr)
 {
     /* No encryption, so nothing to do */
     return 1;
diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index deebbdc315148..a6ddbbffe4600 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -118,11 +118,9 @@ static int dtls_buffer_record(SSL_CONNECTION *s, TLS_RECORD *rec)
 
 #ifndef OPENSSL_NO_SCTP
     /* Store bio_dgram_sctp_rcvinfo struct */
-    if (BIO_dgram_is_sctp(s->rbio) &&
-        (ossl_statem_get_state(s) == TLS_ST_SR_FINISHED
-         || ossl_statem_get_state(s) == TLS_ST_CR_FINISHED)) {
+    if (BIO_dgram_is_sctp(s->rbio) && (ossl_statem_get_state(s) == TLS_ST_SR_FINISHED || ossl_statem_get_state(s) == TLS_ST_CR_FINISHED)) {
         BIO_ctrl(s->rbio, BIO_CTRL_DGRAM_SCTP_GET_RCVINFO,
-                 sizeof(rdata->recordinfo), &rdata->recordinfo);
+            sizeof(rdata->recordinfo), &rdata->recordinfo);
     }
 #endif
 
@@ -158,7 +156,7 @@ static void dtls_unbuffer_record(SSL_CONNECTION *s)
         /* Restore bio_dgram_sctp_rcvinfo struct */
         if (BIO_dgram_is_sctp(s->rbio)) {
             BIO_ctrl(s->rbio, BIO_CTRL_DGRAM_SCTP_SET_RCVINFO,
-                     sizeof(rdata->recordinfo), &rdata->recordinfo);
+                sizeof(rdata->recordinfo), &rdata->recordinfo);
         }
 #endif
 
@@ -197,21 +195,19 @@ static void dtls_unbuffer_record(SSL_CONNECTION *s)
  *             none of our business
  */
 int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
-                     unsigned char *buf, size_t len,
-                     int peek, size_t *readbytes)
+    unsigned char *buf, size_t len,
+    int peek, size_t *readbytes)
 {
     int i, j, ret;
     size_t n;
     TLS_RECORD *rr;
-    void (*cb) (const SSL *ssl, int type2, int val) = NULL;
+    void (*cb)(const SSL *ssl, int type2, int val) = NULL;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
     if (sc == NULL)
         return -1;
 
-    if ((type && (type != SSL3_RT_APPLICATION_DATA) &&
-         (type != SSL3_RT_HANDSHAKE)) ||
-        (peek && (type != SSL3_RT_APPLICATION_DATA))) {
+    if ((type && (type != SSL3_RT_APPLICATION_DATA) && (type != SSL3_RT_HANDSHAKE)) || (peek && (type != SSL3_RT_APPLICATION_DATA))) {
         SSLfatal(sc, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return -1;
     }
@@ -226,7 +222,7 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
             return -1;
     }
 
- start:
+start:
     sc->rwstate = SSL_NOTHING;
 
     /*
@@ -251,17 +247,17 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
             rr = &sc->rlayer.tlsrecs[sc->rlayer.num_recs];
 
             ret = HANDLE_RLAYER_READ_RETURN(sc,
-                    sc->rlayer.rrlmethod->read_record(sc->rlayer.rrl,
-                                                      &rr->rechandle,
-                                                      &rr->version, &rr->type,
-                                                      &rr->data, &rr->length,
-                                                      &rr->epoch, rr->seq_num));
+                sc->rlayer.rrlmethod->read_record(sc->rlayer.rrl,
+                    &rr->rechandle,
+                    &rr->version, &rr->type,
+                    &rr->data, &rr->length,
+                    &rr->epoch, rr->seq_num));
             if (ret <= 0) {
                 ret = dtls1_read_failed(sc, ret);
                 /*
-                * Anything other than a timeout is an error. SSLfatal() already
-                * called if appropriate.
-                */
+                 * Anything other than a timeout is an error. SSLfatal() already
+                 * called if appropriate.
+                 */
                 if (ret <= 0)
                     return ret;
                 else
@@ -270,7 +266,7 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
             rr->off = 0;
             sc->rlayer.num_recs++;
         } while (sc->rlayer.rrlmethod->processed_read_pending(sc->rlayer.rrl)
-                 && sc->rlayer.num_recs < SSL_MAX_PIPELINES);
+            && sc->rlayer.num_recs < SSL_MAX_PIPELINES);
     }
     rr = &sc->rlayer.tlsrecs[sc->rlayer.curr_rec];
 
@@ -284,7 +280,7 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
     /* we now have a packet which can be read and processed */
 
     if (sc->s3.change_cipher_spec /* set when we receive ChangeCipherSpec,
-                                  * reset by ssl3_get_finished */
+                                   * reset by ssl3_get_finished */
         && (rr->type != SSL3_RT_HANDSHAKE)) {
         /*
          * We now have application data between CCS and Finished. Most likely
@@ -324,9 +320,9 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
          * doing a handshake for the first time
          */
         if (SSL_in_init(s) && (type == SSL3_RT_APPLICATION_DATA)
-                && (SSL_IS_FIRST_HANDSHAKE(sc))) {
+            && (SSL_IS_FIRST_HANDSHAKE(sc))) {
             SSLfatal(sc, SSL_AD_UNEXPECTED_MESSAGE,
-                     SSL_R_APP_DATA_IN_HANDSHAKE);
+                SSL_R_APP_DATA_IN_HANDSHAKE);
             return -1;
         }
 
@@ -363,8 +359,7 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
          * app data. If there was an alert and there is no message to read
          * anymore, finally set shutdown.
          */
-        if (BIO_dgram_is_sctp(SSL_get_rbio(s)) &&
-            sc->d1->shutdown_received
+        if (BIO_dgram_is_sctp(SSL_get_rbio(s)) && sc->d1->shutdown_received
             && BIO_dgram_sctp_msg_waiting(SSL_get_rbio(s)) <= 0) {
             sc->shutdown |= SSL_RECEIVED_SHUTDOWN;
             return 0;
@@ -385,16 +380,16 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
         PACKET alert;
 
         if (!PACKET_buf_init(&alert, alert_bytes, rr->length)
-                || !PACKET_get_1(&alert, &alert_level)
-                || !PACKET_get_1(&alert, &alert_descr)
-                || PACKET_remaining(&alert) != 0) {
+            || !PACKET_get_1(&alert, &alert_level)
+            || !PACKET_get_1(&alert, &alert_descr)
+            || PACKET_remaining(&alert) != 0) {
             SSLfatal(sc, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_INVALID_ALERT);
             return -1;
         }
 
         if (sc->msg_callback)
             sc->msg_callback(0, sc->version, SSL3_RT_ALERT, alert_bytes, 2, s,
-                             sc->msg_callback_arg);
+                sc->msg_callback_arg);
 
         if (sc->info_callback != NULL)
             cb = sc->info_callback;
@@ -414,7 +409,7 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
             sc->rlayer.alert_count++;
             if (sc->rlayer.alert_count == MAX_WARN_ALERT_COUNT) {
                 SSLfatal(sc, SSL_AD_UNEXPECTED_MESSAGE,
-                         SSL_R_TOO_MANY_WARN_ALERTS);
+                    SSL_R_TOO_MANY_WARN_ALERTS);
                 return -1;
             }
 
@@ -425,8 +420,7 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
                  * after a close_notify alert. We have to check this first so
                  * that nothing gets discarded.
                  */
-                if (BIO_dgram_is_sctp(SSL_get_rbio(s)) &&
-                    BIO_dgram_sctp_msg_waiting(SSL_get_rbio(s)) > 0) {
+                if (BIO_dgram_is_sctp(SSL_get_rbio(s)) && BIO_dgram_sctp_msg_waiting(SSL_get_rbio(s)) > 0) {
                     sc->d1->shutdown_received = 1;
                     sc->rwstate = SSL_READING;
                     BIO_clear_retry_flags(SSL_get_rbio(s));
@@ -436,13 +430,24 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
 #endif
                 sc->shutdown |= SSL_RECEIVED_SHUTDOWN;
                 return 0;
+            } else if (alert_descr == SSL_AD_NO_RENEGOTIATION) {
+                /*
+                 * This is a warning but we receive it if we requested
+                 * renegotiation and the peer denied it. Terminate with a fatal
+                 * alert because if the application tried to renegotiate it
+                 * presumably had a good reason and expects it to succeed. In
+                 * the future we might have a renegotiation where we don't care
+                 * if the peer refused it where we carry on.
+                 */
+                SSLfatal(sc, SSL_AD_HANDSHAKE_FAILURE, SSL_R_NO_RENEGOTIATION);
+                return -1;
             }
         } else if (alert_level == SSL3_AL_FATAL) {
             sc->rwstate = SSL_NOTHING;
             sc->s3.fatal_alert = alert_descr;
             SSLfatal_data(sc, SSL_AD_NO_ALERT,
-                          SSL_AD_REASON_OFFSET + alert_descr,
-                          "SSL alert number %d", alert_descr);
+                SSL_AD_REASON_OFFSET + alert_descr,
+                "SSL alert number %d", alert_descr);
             sc->shutdown |= SSL_RECEIVED_SHUTDOWN;
             if (!ssl_release_record(sc, rr, 0))
                 return -1;
@@ -457,7 +462,7 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
     }
 
     if (sc->shutdown & SSL_SENT_SHUTDOWN) { /* but we have not received a
-                                            * shutdown */
+                                             * shutdown */
         sc->rwstate = SSL_NOTHING;
         if (!ssl_release_record(sc, rr, 0))
             return -1;
@@ -485,7 +490,7 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
          * at least enough record bytes for a message header
          */
         if (rr->epoch != sc->rlayer.d->r_epoch
-                || rr->length < DTLS1_HM_HEADER_LENGTH) {
+            || rr->length < DTLS1_HM_HEADER_LENGTH) {
             if (!ssl_release_record(sc, rr, 0))
                 return -1;
             goto start;
@@ -588,9 +593,7 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
          * application data at this point (session renegotiation not yet
          * started), we will indulge it.
          */
-        if (sc->s3.in_read_app_data &&
-            (sc->s3.total_renegotiations != 0) &&
-            ossl_statem_app_data_allowed(sc)) {
+        if (sc->s3.in_read_app_data && (sc->s3.total_renegotiations != 0) && ossl_statem_app_data_allowed(sc)) {
             sc->s3.in_read_app_data = 2;
             return -1;
         } else {
@@ -606,7 +609,7 @@ int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
  * not all data has been sent or non-blocking IO.
  */
 int dtls1_write_bytes(SSL_CONNECTION *s, uint8_t type, const void *buf,
-                      size_t len, size_t *written)
+    size_t len, size_t *written)
 {
     int i;
 
@@ -620,7 +623,7 @@ int dtls1_write_bytes(SSL_CONNECTION *s, uint8_t type, const void *buf,
 }
 
 int do_dtls1_write(SSL_CONNECTION *sc, uint8_t type, const unsigned char *buf,
-                   size_t len, size_t *written)
+    size_t len, size_t *written)
 {
     int i;
     OSSL_RECORD_TEMPLATE tmpl;
@@ -650,7 +653,7 @@ int do_dtls1_write(SSL_CONNECTION *sc, uint8_t type, const unsigned char *buf,
      * header: otherwise some clients will ignore it.
      */
     if (s->method->version == DTLS_ANY_VERSION
-            && sc->max_proto_version != DTLS1_BAD_VER)
+        && sc->max_proto_version != DTLS1_BAD_VER)
         tmpl.version = DTLS1_VERSION;
     else
         tmpl.version = sc->version;
@@ -658,7 +661,7 @@ int do_dtls1_write(SSL_CONNECTION *sc, uint8_t type, const unsigned char *buf,
     tmpl.buflen = len;
 
     ret = HANDLE_RLAYER_WRITE_RETURN(sc,
-              sc->rlayer.wrlmethod->write_records(sc->rlayer.wrl, &tmpl, 1));
+        sc->rlayer.wrlmethod->write_records(sc->rlayer.wrl, &tmpl, 1));
 
     if (ret > 0)
         *written = (int)len;
@@ -681,7 +684,8 @@ void dtls1_increment_epoch(SSL_CONNECTION *s, int rw)
     }
 }
 
-uint16_t dtls1_get_epoch(SSL_CONNECTION *s, int rw) {
+uint16_t dtls1_get_epoch(SSL_CONNECTION *s, int rw)
+{
     uint16_t epoch;
 
     if (rw & SSL3_CC_READ)
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index 0930222edb152..ba407478b4121 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -36,9 +36,8 @@ int RECORD_LAYER_clear(RECORD_LAYER *rl)
     /* Clear any buffered records we no longer need */
     while (rl->curr_rec < rl->num_recs)
         ret &= ssl_release_record(rl->s,
-                                  &(rl->tlsrecs[rl->curr_rec++]),
-                                  0);
-
+            &(rl->tlsrecs[rl->curr_rec++]),
+            0);
 
     rl->wnum = 0;
     memset(rl->handshake_fragment, 0, sizeof(rl->handshake_fragment));
@@ -78,20 +77,22 @@ int RECORD_LAYER_reset(RECORD_LAYER *rl)
 
     /* We try and reset both record layers even if one fails */
     ret &= ssl_set_new_record_layer(rl->s,
-                                    SSL_CONNECTION_IS_DTLS(rl->s)
-                                        ? DTLS_ANY_VERSION : TLS_ANY_VERSION,
-                                    OSSL_RECORD_DIRECTION_READ,
-                                    OSSL_RECORD_PROTECTION_LEVEL_NONE, NULL, 0,
-                                    NULL, 0, NULL, 0, NULL,  0, NULL, 0,
-                                    NID_undef, NULL, NULL, NULL);
+        SSL_CONNECTION_IS_DTLS(rl->s)
+            ? DTLS_ANY_VERSION
+            : TLS_ANY_VERSION,
+        OSSL_RECORD_DIRECTION_READ,
+        OSSL_RECORD_PROTECTION_LEVEL_NONE, NULL, 0,
+        NULL, 0, NULL, 0, NULL, 0, NULL, 0,
+        NID_undef, NULL, NULL, NULL);
 
     ret &= ssl_set_new_record_layer(rl->s,
-                                    SSL_CONNECTION_IS_DTLS(rl->s)
-                                        ? DTLS_ANY_VERSION : TLS_ANY_VERSION,
-                                    OSSL_RECORD_DIRECTION_WRITE,
-                                    OSSL_RECORD_PROTECTION_LEVEL_NONE, NULL, 0,
-                                    NULL, 0, NULL, 0, NULL,  0, NULL, 0,
-                                    NID_undef, NULL, NULL, NULL);
+        SSL_CONNECTION_IS_DTLS(rl->s)
+            ? DTLS_ANY_VERSION
+            : TLS_ANY_VERSION,
+        OSSL_RECORD_DIRECTION_WRITE,
+        OSSL_RECORD_PROTECTION_LEVEL_NONE, NULL, 0,
+        NULL, 0, NULL, 0, NULL, 0, NULL, 0,
+        NID_undef, NULL, NULL, NULL);
 
     /* SSLfatal already called in the event of failure */
     return ret;
@@ -107,7 +108,7 @@ int RECORD_LAYER_read_pending(const RECORD_LAYER *rl)
 int RECORD_LAYER_processed_read_pending(const RECORD_LAYER *rl)
 {
     return (rl->curr_rec < rl->num_recs)
-           || rl->rrlmethod->processed_read_pending(rl->rrl);
+        || rl->rrlmethod->processed_read_pending(rl->rrl);
 }
 
 int RECORD_LAYER_write_pending(const RECORD_LAYER *rl)
@@ -127,7 +128,7 @@ static uint32_t ossl_get_max_early_data(SSL_CONNECTION *s)
      */
     if (!s->server && sess->ext.max_early_data == 0) {
         if (!ossl_assert(s->psksession != NULL
-                         && s->psksession->ext.max_early_data > 0)) {
+                && s->psksession->ext.max_early_data > 0)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -140,13 +141,14 @@ static uint32_t ossl_get_max_early_data(SSL_CONNECTION *s)
         max_early_data = s->recv_max_early_data;
     else
         max_early_data = s->recv_max_early_data < sess->ext.max_early_data
-                         ? s->recv_max_early_data : sess->ext.max_early_data;
+            ? s->recv_max_early_data
+            : sess->ext.max_early_data;
 
     return max_early_data;
 }
 
 static int ossl_early_data_count_ok(SSL_CONNECTION *s, size_t length,
-                                    size_t overhead, int send)
+    size_t overhead, int send)
 {
     uint32_t max_early_data;
 
@@ -154,7 +156,7 @@ static int ossl_early_data_count_ok(SSL_CONNECTION *s, size_t length,
 
     if (max_early_data == 0) {
         SSLfatal(s, send ? SSL_AD_INTERNAL_ERROR : SSL_AD_UNEXPECTED_MESSAGE,
-                 SSL_R_TOO_MUCH_EARLY_DATA);
+            SSL_R_TOO_MUCH_EARLY_DATA);
         return 0;
     }
 
@@ -163,7 +165,7 @@ static int ossl_early_data_count_ok(SSL_CONNECTION *s, size_t length,
 
     if (s->early_data_count + length > max_early_data) {
         SSLfatal(s, send ? SSL_AD_INTERNAL_ERROR : SSL_AD_UNEXPECTED_MESSAGE,
-                 SSL_R_TOO_MUCH_EARLY_DATA);
+            SSL_R_TOO_MUCH_EARLY_DATA);
         return 0;
     }
     s->early_data_count += length;
@@ -248,7 +250,7 @@ const char *SSL_rstate_string(const SSL *s)
 }
 
 static int tls_write_check_pending(SSL_CONNECTION *s, uint8_t type,
-                                   const unsigned char *buf, size_t len)
+    const unsigned char *buf, size_t len)
 {
     if (s->rlayer.wpend_tot == 0)
         return 0;
@@ -269,7 +271,7 @@ static int tls_write_check_pending(SSL_CONNECTION *s, uint8_t type,
  * not all data has been sent or non-blocking IO.
  */
 int ssl3_write_bytes(SSL *ssl, uint8_t type, const void *buf_, size_t len,
-                     size_t *written)
+    size_t *written)
 {
     const unsigned char *buf = buf_;
     size_t tot;
@@ -301,7 +303,7 @@ int ssl3_write_bytes(SSL *ssl, uint8_t type, const void *buf_, size_t len,
     }
 
     if (s->early_data_state == SSL_EARLY_DATA_WRITING
-            && !ossl_early_data_count_ok(s, len, 0, 1)) {
+        && !ossl_early_data_count_ok(s, len, 0, 1)) {
         /* SSLfatal() already called */
         return -1;
     }
@@ -313,8 +315,7 @@ int ssl3_write_bytes(SSL *ssl, uint8_t type, const void *buf_, size_t len,
      * into init unless we have writes pending - in which case we should finish
      * doing that first.
      */
-    if (s->rlayer.wpend_tot == 0 && (s->key_update != SSL_KEY_UPDATE_NONE
-                                     || s->ext.extra_tickets_expected > 0))
+    if (s->rlayer.wpend_tot == 0 && (s->key_update != SSL_KEY_UPDATE_NONE || s->ext.extra_tickets_expected > 0))
         ossl_statem_set_in_init(s, 1);
 
     /*
@@ -323,7 +324,7 @@ int ssl3_write_bytes(SSL *ssl, uint8_t type, const void *buf_, size_t len,
      * messages yet.
      */
     if (SSL_in_init(ssl) && !ossl_statem_get_in_handshake(s)
-            && s->early_data_state != SSL_EARLY_DATA_UNAUTH_WRITING) {
+        && s->early_data_state != SSL_EARLY_DATA_UNAUTH_WRITING) {
         i = s->handshake_func(ssl);
         /* SSLfatal() already called */
         if (i < 0)
@@ -340,7 +341,7 @@ int ssl3_write_bytes(SSL *ssl, uint8_t type, const void *buf_, size_t len,
     } else if (i > 0) {
         /* Retry needed */
         i = HANDLE_RLAYER_WRITE_RETURN(s,
-                s->rlayer.wrlmethod->retry_write_records(s->rlayer.wrl));
+            s->rlayer.wrlmethod->retry_write_records(s->rlayer.wrl));
         if (i <= 0) {
             s->rlayer.wnum = tot;
             return i;
@@ -359,7 +360,7 @@ int ssl3_write_bytes(SSL *ssl, uint8_t type, const void *buf_, size_t len,
         s->rlayer.wpend_buf = buf;
     }
 
-    if (tot == len) {           /* done? */
+    if (tot == len) { /* done? */
         *written = tot;
         return 1;
     }
@@ -381,8 +382,8 @@ int ssl3_write_bytes(SSL *ssl, uint8_t type, const void *buf_, size_t len,
     split_send_fragment = ssl_get_split_send_fragment(s);
 
     if (max_send_fragment == 0
-            || split_send_fragment == 0
-            || split_send_fragment > max_send_fragment) {
+        || split_send_fragment == 0
+        || split_send_fragment > max_send_fragment) {
         /*
          * We should have prevented this when we set/get the split and max send
          * fragments so we shouldn't get here
@@ -397,9 +398,9 @@ int ssl3_write_bytes(SSL *ssl, uint8_t type, const void *buf_, size_t len,
      */
     recversion = (s->version == TLS1_3_VERSION) ? TLS1_2_VERSION : s->version;
     if (SSL_get_state(ssl) == TLS_ST_CW_CLNT_HELLO
-            && !s->renegotiate
-            && TLS1_get_version(ssl) > TLS1_VERSION
-            && s->hello_retry_request == SSL_HRR_NONE)
+        && !s->renegotiate
+        && TLS1_get_version(ssl) > TLS1_VERSION
+        && s->hello_retry_request == SSL_HRR_NONE)
         recversion = TLS1_VERSION;
 
     for (;;) {
@@ -407,18 +408,18 @@ int ssl3_write_bytes(SSL *ssl, uint8_t type, const void *buf_, size_t len,
         size_t j, lensofar = 0;
 
         /*
-        * Ask the record layer how it would like to split the amount of data
-        * that we have, and how many of those records it would like in one go.
-        */
+         * Ask the record layer how it would like to split the amount of data
+         * that we have, and how many of those records it would like in one go.
+         */
         maxpipes = s->rlayer.wrlmethod->get_max_records(s->rlayer.wrl, type, n,
-                                                        max_send_fragment,
-                                                        &split_send_fragment);
+            max_send_fragment,
+            &split_send_fragment);
         /*
-        * If max_pipelines is 0 then this means "undefined" and we default to
-        * whatever the record layer wants to do. Otherwise we use the smallest
-        * value from the number requested by the record layer, and max number
-        * configured by the user.
-        */
+         * If max_pipelines is 0 then this means "undefined" and we default to
+         * whatever the record layer wants to do. Otherwise we use the smallest
+         * value from the number requested by the record layer, and max number
+         * configured by the user.
+         */
         if (s->max_pipelines > 0 && maxpipes > s->max_pipelines)
             maxpipes = s->max_pipelines;
 
@@ -475,8 +476,8 @@ int ssl3_write_bytes(SSL *ssl, uint8_t type, const void *buf_, size_t len,
         }
 
         if (s->rlayer.wpend_tot == n
-                || (type == SSL3_RT_APPLICATION_DATA
-                    && (s->mode & SSL_MODE_ENABLE_PARTIAL_WRITE) != 0)) {
+            || (type == SSL3_RT_APPLICATION_DATA
+                && (s->mode & SSL_MODE_ENABLE_PARTIAL_WRITE) != 0)) {
             *written = tot + s->rlayer.wpend_tot;
             s->rlayer.wpend_tot = 0;
             return 1;
@@ -488,7 +489,7 @@ int ssl3_write_bytes(SSL *ssl, uint8_t type, const void *buf_, size_t len,
 }
 
 int ossl_tls_handle_rlayer_return(SSL_CONNECTION *s, int writing, int ret,
-                                  char *file, int line)
+    char *file, int line)
 {
     SSL *ssl = SSL_CONNECTION_GET_SSL(s);
 
@@ -506,7 +507,7 @@ int ossl_tls_handle_rlayer_return(SSL_CONNECTION *s, int writing, int ret,
                 ERR_new();
                 ERR_set_debug(file, line, 0);
                 ossl_statem_fatal(s, SSL_AD_INTERNAL_ERROR,
-                                  ERR_R_INTERNAL_ERROR, NULL);
+                    ERR_R_INTERNAL_ERROR, NULL);
                 ret = OSSL_RECORD_RETURN_FATAL;
             } else if ((s->options & SSL_OP_IGNORE_UNEXPECTED_EOF) != 0) {
                 SSL_set_shutdown(ssl, SSL_RECEIVED_SHUTDOWN);
@@ -519,7 +520,7 @@ int ossl_tls_handle_rlayer_return(SSL_CONNECTION *s, int writing, int ret,
                  * applications for control flow decisions.
                  */
                 ossl_statem_fatal(s, SSL_AD_DECODE_ERROR,
-                                  SSL_R_UNEXPECTED_EOF_WHILE_READING, NULL);
+                    SSL_R_UNEXPECTED_EOF_WHILE_READING, NULL);
             }
         } else if (ret == OSSL_RECORD_RETURN_FATAL) {
             int al = s->rlayer.rrlmethod->get_alert_code(s->rlayer.rrl);
@@ -551,6 +552,10 @@ int ossl_tls_handle_rlayer_return(SSL_CONNECTION *s, int writing, int ret,
     return ret;
 }
 
+/*
+ * Release data from a record.
+ * If length == 0 then we will release the entire record.
+ */
 int ssl_release_record(SSL_CONNECTION *s, TLS_RECORD *rr, size_t length)
 {
     assert(rr->length >= length);
@@ -560,8 +565,9 @@ int ssl_release_record(SSL_CONNECTION *s, TLS_RECORD *rr, size_t length)
         /* The record layer allocated the buffers for this record */
         if (HANDLE_RLAYER_READ_RETURN(s,
                 s->rlayer.rrlmethod->release_record(s->rlayer.rrl,
-                                                    rr->rechandle,
-                                                    length)) <= 0) {
+                    rr->rechandle,
+                    length))
+            <= 0) {
             /* RLAYER_fatal already called */
             return 0;
         }
@@ -572,6 +578,7 @@ int ssl_release_record(SSL_CONNECTION *s, TLS_RECORD *rr, size_t length)
         /* We allocated the buffers for this record (only happens with DTLS) */
         OPENSSL_free(rr->allocdata);
         rr->allocdata = NULL;
+        s->rlayer.curr_rec++;
     }
     rr->length -= length;
     if (rr->length > 0)
@@ -613,13 +620,13 @@ int ssl_release_record(SSL_CONNECTION *s, TLS_RECORD *rr, size_t length)
  *             none of our business
  */
 int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
-                    unsigned char *buf, size_t len,
-                    int peek, size_t *readbytes)
+    unsigned char *buf, size_t len,
+    int peek, size_t *readbytes)
 {
     int i, j, ret;
     size_t n, curr_rec, totalbytes;
     TLS_RECORD *rr;
-    void (*cb) (const SSL *ssl, int type2, int val) = NULL;
+    void (*cb)(const SSL *ssl, int type2, int val) = NULL;
     int is_tls13;
     SSL_CONNECTION *s = SSL_CONNECTION_FROM_SSL_ONLY(ssl);
 
@@ -634,7 +641,7 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
     }
 
     if ((type == SSL3_RT_HANDSHAKE) && (s->rlayer.handshake_fragment_len > 0))
-        /* (partially) satisfy request from storage */
+    /* (partially) satisfy request from storage */
     {
         unsigned char *src = s->rlayer.handshake_fragment;
         unsigned char *dst = buf;
@@ -672,7 +679,7 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
         if (i == 0)
             return -1;
     }
- start:
+start:
     s->rwstate = SSL_NOTHING;
 
     /*-
@@ -689,11 +696,11 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
             rr = &s->rlayer.tlsrecs[s->rlayer.num_recs];
 
             ret = HANDLE_RLAYER_READ_RETURN(s,
-                    s->rlayer.rrlmethod->read_record(s->rlayer.rrl,
-                                                     &rr->rechandle,
-                                                     &rr->version, &rr->type,
-                                                     &rr->data, &rr->length,
-                                                     NULL, NULL));
+                s->rlayer.rrlmethod->read_record(s->rlayer.rrl,
+                    &rr->rechandle,
+                    &rr->version, &rr->type,
+                    &rr->data, &rr->length,
+                    NULL, NULL));
             if (ret <= 0) {
                 /* SSLfatal() already called if appropriate */
                 return ret;
@@ -701,15 +708,15 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
             rr->off = 0;
             s->rlayer.num_recs++;
         } while (s->rlayer.rrlmethod->processed_read_pending(s->rlayer.rrl)
-                 && s->rlayer.num_recs < SSL_MAX_PIPELINES);
+            && s->rlayer.num_recs < SSL_MAX_PIPELINES);
     }
     rr = &s->rlayer.tlsrecs[s->rlayer.curr_rec];
 
     if (s->rlayer.handshake_fragment_len > 0
-            && rr->type != SSL3_RT_HANDSHAKE
-            && SSL_CONNECTION_IS_TLS13(s)) {
+        && rr->type != SSL3_RT_HANDSHAKE
+        && SSL_CONNECTION_IS_TLS13(s)) {
         SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE,
-                 SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA);
+            SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA);
         return -1;
     }
 
@@ -726,7 +733,7 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
                                   * reset by ssl3_get_finished */
         && (rr->type != SSL3_RT_HANDSHAKE)) {
         SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE,
-                 SSL_R_DATA_BETWEEN_CCS_AND_FINISHED);
+            SSL_R_DATA_BETWEEN_CCS_AND_FINISHED);
         return -1;
     }
 
@@ -754,7 +761,7 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
          * doing a handshake for the first time
          */
         if (SSL_in_init(ssl) && type == SSL3_RT_APPLICATION_DATA
-                && SSL_IS_FIRST_HANDSHAKE(s)) {
+            && SSL_IS_FIRST_HANDSHAKE(s)) {
             SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_APP_DATA_IN_HANDSHAKE);
             return -1;
         }
@@ -806,8 +813,8 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
             }
             totalbytes += n;
         } while (type == SSL3_RT_APPLICATION_DATA
-                    && curr_rec < s->rlayer.num_recs
-                    && totalbytes < len);
+            && curr_rec < s->rlayer.num_recs
+            && totalbytes < len);
         if (totalbytes == 0) {
             /* We must have read empty records. Get more data */
             goto start;
@@ -860,16 +867,16 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
         PACKET alert;
 
         if (!PACKET_buf_init(&alert, alert_bytes, rr->length)
-                || !PACKET_get_1(&alert, &alert_level)
-                || !PACKET_get_1(&alert, &alert_descr)
-                || PACKET_remaining(&alert) != 0) {
+            || !PACKET_get_1(&alert, &alert_level)
+            || !PACKET_get_1(&alert, &alert_descr)
+            || PACKET_remaining(&alert) != 0) {
             SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_INVALID_ALERT);
             return -1;
         }
 
         if (s->msg_callback)
             s->msg_callback(0, s->version, SSL3_RT_ALERT, alert_bytes, 2, ssl,
-                            s->msg_callback_arg);
+                s->msg_callback_arg);
 
         if (s->info_callback != NULL)
             cb = s->info_callback;
@@ -882,7 +889,7 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
         }
 
         if ((!is_tls13 && alert_level == SSL3_AL_WARNING)
-                || (is_tls13 && alert_descr == SSL_AD_USER_CANCELLED)) {
+            || (is_tls13 && alert_descr == SSL_AD_USER_CANCELLED)) {
             s->s3.warn_alert = alert_descr;
             if (!ssl_release_record(s, rr, 0))
                 return -1;
@@ -890,7 +897,7 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
             s->rlayer.alert_count++;
             if (s->rlayer.alert_count == MAX_WARN_ALERT_COUNT) {
                 SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE,
-                         SSL_R_TOO_MANY_WARN_ALERTS);
+                    SSL_R_TOO_MANY_WARN_ALERTS);
                 return -1;
             }
         }
@@ -902,15 +909,15 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
         if (is_tls13 && alert_descr == SSL_AD_USER_CANCELLED) {
             goto start;
         } else if (alert_descr == SSL_AD_CLOSE_NOTIFY
-                && (is_tls13 || alert_level == SSL3_AL_WARNING)) {
+            && (is_tls13 || alert_level == SSL3_AL_WARNING)) {
             s->shutdown |= SSL_RECEIVED_SHUTDOWN;
             return 0;
         } else if (alert_level == SSL3_AL_FATAL || is_tls13) {
             s->rwstate = SSL_NOTHING;
             s->s3.fatal_alert = alert_descr;
             SSLfatal_data(s, SSL_AD_NO_ALERT,
-                          SSL_AD_REASON_OFFSET + alert_descr,
-                          "SSL alert number %d", alert_descr);
+                SSL_AD_REASON_OFFSET + alert_descr,
+                "SSL alert number %d", alert_descr);
             s->shutdown |= SSL_RECEIVED_SHUTDOWN;
             if (!ssl_release_record(s, rr, 0))
                 return -1;
@@ -920,10 +927,10 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
             /*
              * This is a warning but we receive it if we requested
              * renegotiation and the peer denied it. Terminate with a fatal
-             * alert because if application tried to renegotiate it
+             * alert because if the application tried to renegotiate it
              * presumably had a good reason and expects it to succeed. In
-             * future we might have a renegotiation where we don't care if
-             * the peer refused it where we carry on.
+             * the future we might have a renegotiation where we don't care
+             * if the peer refused it where we carry on.
              */
             SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_NO_RENEGOTIATION);
             return -1;
@@ -971,7 +978,7 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
             if (!ssl_release_record(s, rr, 0))
                 return -1;
             SSLfatal(s, SSL_AD_NO_ALERT,
-                     SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY);
+                SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY);
             return -1;
         }
     }
@@ -1004,7 +1011,7 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
             return -1;
 
         if (*dest_len < dest_maxlen)
-            goto start;     /* fragment was too small */
+            goto start; /* fragment was too small */
     }
 
     if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC) {
@@ -1017,7 +1024,7 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
      * protocol violation)
      */
     if ((s->rlayer.handshake_fragment_len >= 4)
-            && !ossl_statem_get_in_handshake(s)) {
+        && !ossl_statem_get_in_handshake(s)) {
         int ined = (s->early_data_state == SSL_EARLY_DATA_READING);
 
         /* We found handshake data, so we're going back into init */
@@ -1101,7 +1108,7 @@ int ssl3_read_bytes(SSL *ssl, uint8_t type, uint8_t *recvd_type,
              * record.
              */
             if (!ossl_early_data_count_ok(s, rr->length,
-                                          EARLY_DATA_CIPHERTEXT_OVERHEAD, 0)) {
+                    EARLY_DATA_CIPHERTEXT_OVERHEAD, 0)) {
                 /* SSLfatal() already called */
                 return -1;
             }
@@ -1128,20 +1135,20 @@ int RECORD_LAYER_is_sslv2_record(RECORD_LAYER *rl)
 
 static OSSL_FUNC_rlayer_msg_callback_fn rlayer_msg_callback_wrapper;
 static void rlayer_msg_callback_wrapper(int write_p, int version,
-                                        int content_type, const void *buf,
-                                        size_t len, void *cbarg)
+    int content_type, const void *buf,
+    size_t len, void *cbarg)
 {
     SSL_CONNECTION *s = cbarg;
     SSL *ssl = SSL_CONNECTION_GET_USER_SSL(s);
 
     if (s->msg_callback != NULL)
         s->msg_callback(write_p, version, content_type, buf, len, ssl,
-                        s->msg_callback_arg);
+            s->msg_callback_arg);
 }
 
 static OSSL_FUNC_rlayer_security_fn rlayer_security_wrapper;
 static int rlayer_security_wrapper(void *cbarg, int op, int bits, int nid,
-                                   void *other)
+    void *other)
 {
     SSL_CONNECTION *s = cbarg;
 
@@ -1155,7 +1162,7 @@ static size_t rlayer_padding_wrapper(void *cbarg, int type, size_t len)
     SSL *ssl = SSL_CONNECTION_GET_USER_SSL(s);
 
     return s->rlayer.record_padding_cb(ssl, type, len,
-                                       s->rlayer.record_padding_arg);
+        s->rlayer.record_padding_arg);
 }
 
 static const OSSL_DISPATCH rlayer_dispatch[] = {
@@ -1167,16 +1174,16 @@ static const OSSL_DISPATCH rlayer_dispatch[] = {
 };
 
 void ossl_ssl_set_custom_record_layer(SSL_CONNECTION *s,
-                                      const OSSL_RECORD_METHOD *meth,
-                                      void *rlarg)
+    const OSSL_RECORD_METHOD *meth,
+    void *rlarg)
 {
     s->rlayer.custom_rlmethod = meth;
     s->rlayer.rlarg = rlarg;
 }
 
 static const OSSL_RECORD_METHOD *ssl_select_next_record_layer(SSL_CONNECTION *s,
-                                                              int direction,
-                                                              int level)
+    int direction,
+    int level)
 {
     if (s->rlayer.custom_rlmethod != NULL)
         return s->rlayer.custom_rlmethod;
@@ -1191,8 +1198,8 @@ static const OSSL_RECORD_METHOD *ssl_select_next_record_layer(SSL_CONNECTION *s,
 #ifndef OPENSSL_NO_KTLS
     /* KTLS does not support renegotiation */
     if (level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION
-            && (s->options & SSL_OP_ENABLE_KTLS) != 0
-            && (SSL_CONNECTION_IS_TLS13(s) || SSL_IS_FIRST_HANDSHAKE(s)))
+        && (s->options & SSL_OP_ENABLE_KTLS) != 0
+        && (SSL_CONNECTION_IS_TLS13(s) || SSL_IS_FIRST_HANDSHAKE(s)))
         return &ossl_ktls_record_method;
 #endif
 
@@ -1234,17 +1241,17 @@ static int ssl_post_record_layer_select(SSL_CONNECTION *s, int direction)
 }
 
 int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
-                             int direction, int level,
-                             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,
-                             const SSL_COMP *comp, const EVP_MD *kdfdigest)
+    int direction, int level,
+    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,
+    const SSL_COMP *comp, const EVP_MD *kdfdigest)
 {
     OSSL_PARAM options[5], *opts = options;
-    OSSL_PARAM settings[6], *set =  settings;
+    OSSL_PARAM settings[6], *set = settings;
     const OSSL_RECORD_METHOD **thismethod;
     OSSL_RECORD_LAYER **thisrl, *newrl = NULL;
     BIO *thisbio;
@@ -1252,8 +1259,8 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
     const OSSL_RECORD_METHOD *meth;
     int use_etm, stream_mac = 0, tlstree = 0;
     unsigned int maxfrag = (direction == OSSL_RECORD_DIRECTION_WRITE)
-                           ? ssl_get_max_send_fragment(s)
-                           : SSL3_RT_MAX_PLAIN_LENGTH;
+        ? ssl_get_max_send_fragment(s)
+        : SSL3_RT_MAX_PLAIN_LENGTH;
     int use_early_data = 0;
     uint32_t max_early_data;
     COMP_METHOD *compm = (comp == NULL) ? NULL : comp->method;
@@ -1280,19 +1287,19 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
 
     /* Parameters that *may* be supported by a record layer if passed */
     *opts++ = OSSL_PARAM_construct_uint64(OSSL_LIBSSL_RECORD_LAYER_PARAM_OPTIONS,
-                                          &s->options);
+        &s->options);
     *opts++ = OSSL_PARAM_construct_uint32(OSSL_LIBSSL_RECORD_LAYER_PARAM_MODE,
-                                          &s->mode);
+        &s->mode);
     if (direction == OSSL_RECORD_DIRECTION_READ) {
         *opts++ = OSSL_PARAM_construct_size_t(OSSL_LIBSSL_RECORD_LAYER_READ_BUFFER_LEN,
-                                              &s->rlayer.default_read_buf_len);
+            &s->rlayer.default_read_buf_len);
         *opts++ = OSSL_PARAM_construct_int(OSSL_LIBSSL_RECORD_LAYER_PARAM_READ_AHEAD,
-                                           &s->rlayer.read_ahead);
+            &s->rlayer.read_ahead);
     } else {
         *opts++ = OSSL_PARAM_construct_size_t(OSSL_LIBSSL_RECORD_LAYER_PARAM_BLOCK_PADDING,
-                                              &s->rlayer.block_padding);
+            &s->rlayer.block_padding);
         *opts++ = OSSL_PARAM_construct_size_t(OSSL_LIBSSL_RECORD_LAYER_PARAM_HS_PADDING,
-                                              &s->rlayer.hs_padding);
+            &s->rlayer.hs_padding);
     }
     *opts = OSSL_PARAM_construct_end();
 
@@ -1315,29 +1322,28 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
 
     if (use_etm)
         *set++ = OSSL_PARAM_construct_int(OSSL_LIBSSL_RECORD_LAYER_PARAM_USE_ETM,
-                                          &use_etm);
+            &use_etm);
 
     if (stream_mac)
         *set++ = OSSL_PARAM_construct_int(OSSL_LIBSSL_RECORD_LAYER_PARAM_STREAM_MAC,
-                                          &stream_mac);
+            &stream_mac);
 
     if (tlstree)
         *set++ = OSSL_PARAM_construct_int(OSSL_LIBSSL_RECORD_LAYER_PARAM_TLSTREE,
-                                          &tlstree);
+            &tlstree);
 
     /*
      * We only need to do this for the read side. The write side should already
      * have the correct value due to the ssl_get_max_send_fragment() call above
      */
     if (direction == OSSL_RECORD_DIRECTION_READ
-            && s->session != NULL
-            && USE_MAX_FRAGMENT_LENGTH_EXT(s->session))
+        && s->session != NULL
+        && USE_MAX_FRAGMENT_LENGTH_EXT(s->session))
         maxfrag = GET_MAX_FRAGMENT_LENGTH(s->session);
 
-
     if (maxfrag != SSL3_RT_MAX_PLAIN_LENGTH)
         *set++ = OSSL_PARAM_construct_uint(OSSL_LIBSSL_RECORD_LAYER_PARAM_MAX_FRAG_LEN,
-                                           &maxfrag);
+            &maxfrag);
 
     /*
      * The record layer must check the amount of early data sent or received
@@ -1346,7 +1352,7 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
      */
     if (s->server && direction == OSSL_RECORD_DIRECTION_READ) {
         use_early_data = (level == OSSL_RECORD_PROTECTION_LEVEL_EARLY
-                          || level == OSSL_RECORD_PROTECTION_LEVEL_HANDSHAKE);
+            || level == OSSL_RECORD_PROTECTION_LEVEL_HANDSHAKE);
     } else if (!s->server && direction == OSSL_RECORD_DIRECTION_WRITE) {
         use_early_data = (level == OSSL_RECORD_PROTECTION_LEVEL_EARLY);
     }
@@ -1355,7 +1361,7 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
 
         if (max_early_data != 0)
             *set++ = OSSL_PARAM_construct_uint32(OSSL_LIBSSL_RECORD_LAYER_PARAM_MAX_EARLY_DATA,
-                                                 &max_early_data);
+                &max_early_data);
     }
 
     *set = OSSL_PARAM_construct_end();
@@ -1371,7 +1377,7 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
         if (direction == OSSL_RECORD_DIRECTION_READ) {
             prev = s->rlayer.rrlnext;
             if (SSL_CONNECTION_IS_DTLS(s)
-                    && level != OSSL_RECORD_PROTECTION_LEVEL_NONE)
+                && level != OSSL_RECORD_PROTECTION_LEVEL_NONE)
                 epoch = dtls1_get_epoch(s, SSL3_CC_READ); /* new epoch */
 
 #ifndef OPENSSL_NO_DGRAM
@@ -1388,7 +1394,7 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
             s->rlayer.rrlnext = next;
         } else {
             if (SSL_CONNECTION_IS_DTLS(s)
-                    && level != OSSL_RECORD_PROTECTION_LEVEL_NONE)
+                && level != OSSL_RECORD_PROTECTION_LEVEL_NONE)
                 epoch = dtls1_get_epoch(s, SSL3_CC_WRITE); /* new epoch */
         }
 
@@ -1413,13 +1419,13 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
         }
 
         rlret = meth->new_record_layer(sctx->libctx, sctx->propq, version,
-                                       s->server, direction, level, epoch,
-                                       secret, secretlen, key, keylen, iv,
-                                       ivlen, mackey, mackeylen, ciph, taglen,
-                                       mactype, md, compm, kdfdigest, prev,
-                                       thisbio, next, NULL, NULL, settings,
-                                       options, rlayer_dispatch_tmp, s,
-                                       s->rlayer.rlarg, &newrl);
+            s->server, direction, level, epoch,
+            secret, secretlen, key, keylen, iv,
+            ivlen, mackey, mackeylen, ciph, taglen,
+            mactype, md, compm, kdfdigest, prev,
+            thisbio, next, NULL, NULL, settings,
+            options, rlayer_dispatch_tmp, s,
+            s->rlayer.rlarg, &newrl);
         BIO_free(prev);
         switch (rlret) {
         case OSSL_RECORD_RETURN_FATAL:
@@ -1457,8 +1463,8 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
      * free the record layer object (see dtls1_hm_fragment_free)
      */
     if (!SSL_CONNECTION_IS_DTLS(s)
-            || direction == OSSL_RECORD_DIRECTION_READ
-            || pqueue_peek(s->d1->sent_messages) == NULL) {
+        || direction == OSSL_RECORD_DIRECTION_READ
+        || pqueue_peek(s->d1->sent_messages) == NULL) {
         if (*thismethod != NULL && !(*thismethod)->free(*thisrl)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
@@ -1474,7 +1480,7 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
 int ssl_set_record_protocol_version(SSL_CONNECTION *s, int vers)
 {
     if (!ossl_assert(s->rlayer.rrlmethod != NULL)
-            || !ossl_assert(s->rlayer.wrlmethod != NULL))
+        || !ossl_assert(s->rlayer.wrlmethod != NULL))
         return 0;
     s->rlayer.rrlmethod->set_protocol_version(s->rlayer.rrl, s->version);
     s->rlayer.wrlmethod->set_protocol_version(s->rlayer.wrl, s->version);
diff --git a/ssl/record/record.h b/ssl/record/record.h
index 13f09fda8ccb7..8e7b88384524d 100644
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -17,7 +17,7 @@
  *                                                                           *
  *****************************************************************************/
 
-#define SEQ_NUM_SIZE                            8
+#define SEQ_NUM_SIZE 8
 
 typedef struct tls_record_st {
     void *rechandle;
@@ -131,8 +131,8 @@ typedef struct record_layer_st {
  *                                                                           *
  *****************************************************************************/
 
-#define RECORD_LAYER_set_read_ahead(rl, ra)     ((rl)->read_ahead = (ra))
-#define RECORD_LAYER_get_read_ahead(rl)         ((rl)->read_ahead)
+#define RECORD_LAYER_set_read_ahead(rl, ra) ((rl)->read_ahead = (ra))
+#define RECORD_LAYER_get_read_ahead(rl) ((rl)->read_ahead)
 
 void RECORD_LAYER_init(RECORD_LAYER *rl, SSL_CONNECTION *s);
 int RECORD_LAYER_clear(RECORD_LAYER *rl);
@@ -143,54 +143,50 @@ int RECORD_LAYER_write_pending(const RECORD_LAYER *rl);
 int RECORD_LAYER_is_sslv2_record(RECORD_LAYER *rl);
 __owur size_t ssl3_pending(const SSL *s);
 __owur int ssl3_write_bytes(SSL *s, uint8_t type, const void *buf, size_t len,
-                            size_t *written);
+    size_t *written);
 __owur int ssl3_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
-                           unsigned char *buf, size_t len, int peek,
-                           size_t *readbytes);
+    unsigned char *buf, size_t len, int peek,
+    size_t *readbytes);
 
 int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl);
 void DTLS_RECORD_LAYER_free(RECORD_LAYER *rl);
 void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl);
 __owur int dtls1_read_bytes(SSL *s, uint8_t type, uint8_t *recvd_type,
-                            unsigned char *buf, size_t len, int peek,
-                            size_t *readbytes);
+    unsigned char *buf, size_t len, int peek,
+    size_t *readbytes);
 __owur int dtls1_write_bytes(SSL_CONNECTION *s, uint8_t type, const void *buf,
-                             size_t len, size_t *written);
+    size_t len, size_t *written);
 int do_dtls1_write(SSL_CONNECTION *s, uint8_t type, const unsigned char *buf,
-                   size_t len, size_t *written);
+    size_t len, size_t *written);
 void dtls1_increment_epoch(SSL_CONNECTION *s, int rw);
 uint16_t dtls1_get_epoch(SSL_CONNECTION *s, int rw);
 int ssl_release_record(SSL_CONNECTION *s, TLS_RECORD *rr, size_t length);
 
-# define HANDLE_RLAYER_READ_RETURN(s, ret) \
+#define HANDLE_RLAYER_READ_RETURN(s, ret) \
     ossl_tls_handle_rlayer_return(s, 0, ret, OPENSSL_FILE, OPENSSL_LINE)
 
-# define HANDLE_RLAYER_WRITE_RETURN(s, ret) \
+#define HANDLE_RLAYER_WRITE_RETURN(s, ret) \
     ossl_tls_handle_rlayer_return(s, 1, ret, OPENSSL_FILE, OPENSSL_LINE)
 
 int ossl_tls_handle_rlayer_return(SSL_CONNECTION *s, int writing, int ret,
-                                  char *file, int line);
+    char *file, int line);
 
 int ssl_set_new_record_layer(SSL_CONNECTION *s, int version,
-                             int direction, int level,
-                             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,
-                             const SSL_COMP *comp, const EVP_MD *kdfdigest);
+    int direction, int level,
+    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,
+    const SSL_COMP *comp, const EVP_MD *kdfdigest);
 int ssl_set_record_protocol_version(SSL_CONNECTION *s, int vers);
 
-# define OSSL_FUNC_RLAYER_SKIP_EARLY_DATA        1
+#define OSSL_FUNC_RLAYER_SKIP_EARLY_DATA 1
 OSSL_CORE_MAKE_FUNC(int, rlayer_skip_early_data, (void *cbarg))
-# define OSSL_FUNC_RLAYER_MSG_CALLBACK           2
-OSSL_CORE_MAKE_FUNC(void, rlayer_msg_callback, (int write_p, int version,
-                                                int content_type,
-                                                const void *buf, size_t len,
-                                                void *cbarg))
-# define OSSL_FUNC_RLAYER_SECURITY               3
-OSSL_CORE_MAKE_FUNC(int, rlayer_security, (void *cbarg, int op, int bits,
-                                           int nid, void *other))
-# define OSSL_FUNC_RLAYER_PADDING                4
+#define OSSL_FUNC_RLAYER_MSG_CALLBACK 2
+OSSL_CORE_MAKE_FUNC(void, rlayer_msg_callback, (int write_p, int version, int content_type, const void *buf, size_t len, void *cbarg))
+#define OSSL_FUNC_RLAYER_SECURITY 3
+OSSL_CORE_MAKE_FUNC(int, rlayer_security, (void *cbarg, int op, int bits, int nid, void *other))
+#define OSSL_FUNC_RLAYER_PADDING 4
 OSSL_CORE_MAKE_FUNC(size_t, rlayer_padding, (void *cbarg, int type, size_t len))
diff --git a/ssl/record/record_local.h b/ssl/record/record_local.h
index 1acb588f8c986..bd7608db53cd4 100644
--- a/ssl/record/record_local.h
+++ b/ssl/record/record_local.h
@@ -14,4 +14,4 @@
  *                                                                           *
  *****************************************************************************/
 
-#define MAX_WARN_ALERT_COUNT    5
+#define MAX_WARN_ALERT_COUNT 5
diff --git a/ssl/rio/poll_builder.c b/ssl/rio/poll_builder.c
index 007e360d8716f..28d93ee1947a9 100644
--- a/ssl/rio/poll_builder.c
+++ b/ssl/rio/poll_builder.c
@@ -16,15 +16,17 @@ OSSL_SAFE_MATH_UNSIGNED(size_t, size_t)
 
 int ossl_rio_poll_builder_init(RIO_POLL_BUILDER *rpb)
 {
-#if RIO_POLL_METHOD == RIO_POLL_METHOD_SELECT
+#if RIO_POLL_METHOD == RIO_POLL_METHOD_NONE
+    return 0;
+#elif RIO_POLL_METHOD == RIO_POLL_METHOD_SELECT
     FD_ZERO(&rpb->rfd);
     FD_ZERO(&rpb->wfd);
     FD_ZERO(&rpb->efd);
-    rpb->hwm_fd     = -1;
+    rpb->hwm_fd = -1;
 #elif RIO_POLL_METHOD == RIO_POLL_METHOD_POLL
-    rpb->pfd_heap   = NULL;
-    rpb->pfd_num    = 0;
-    rpb->pfd_alloc  = OSSL_NELEM(rpb->pfds);
+    rpb->pfd_heap = NULL;
+    rpb->pfd_num = 0;
+    rpb->pfd_alloc = OSSL_NELEM(rpb->pfds);
 #endif
     return 1;
 }
@@ -61,14 +63,14 @@ static int rpb_ensure_alloc(RIO_POLL_BUILDER *rpb, size_t alloc)
         /* Copy the contents of the stacked array. */
         memcpy(pfd_heap_new, rpb->pfds, sizeof(rpb->pfds));
     }
-    rpb->pfd_heap   = pfd_heap_new;
-    rpb->pfd_alloc  = alloc;
+    rpb->pfd_heap = pfd_heap_new;
+    rpb->pfd_alloc = alloc;
     return 1;
 }
 #endif
 
 int ossl_rio_poll_builder_add_fd(RIO_POLL_BUILDER *rpb, int fd,
-                                 int want_read, int want_write)
+    int want_read, int want_write)
 {
 #if RIO_POLL_METHOD == RIO_POLL_METHOD_POLL
     size_t i;
@@ -81,14 +83,14 @@ int ossl_rio_poll_builder_add_fd(RIO_POLL_BUILDER *rpb, int fd,
 
 #if RIO_POLL_METHOD == RIO_POLL_METHOD_SELECT
 
-# ifndef OPENSSL_SYS_WINDOWS
+#ifndef OPENSSL_SYS_WINDOWS
     /*
      * On Windows there is no relevant limit to the magnitude of a fd value (see
      * above). On *NIX the fd_set uses a bitmap and we must check the limit.
      */
     if (fd >= FD_SETSIZE)
         return 0;
-# endif
+#endif
 
     if (want_read)
         openssl_fdset(fd, &rpb->rfd);
@@ -113,11 +115,13 @@ int ossl_rio_poll_builder_add_fd(RIO_POLL_BUILDER *rpb, int fd,
     if (i >= rpb->pfd_alloc) {
         if (!rpb_ensure_alloc(rpb, rpb->pfd_alloc * 2))
             return 0;
+        pfds = rpb->pfd_heap;
     }
 
+    assert((rpb->pfd_heap != NULL && rpb->pfd_heap == pfds) || (rpb->pfd_heap == NULL && rpb->pfds == pfds));
     assert(i <= rpb->pfd_num && rpb->pfd_num <= rpb->pfd_alloc);
-    pfds[i].fd      = fd;
-    pfds[i].events  = 0;
+    pfds[i].fd = fd;
+    pfds[i].events = 0;
 
     if (want_read)
         pfds[i].events |= POLLIN;
@@ -152,7 +156,7 @@ int ossl_rio_poll_builder_poll(RIO_POLL_BUILDER *rpb, OSSL_TIME deadline)
              * now > deadline.
              */
             timeout = ossl_time_to_timeval(ossl_time_subtract(deadline,
-                                                              ossl_time_now()));
+                ossl_time_now()));
 
         rc = select(rpb->hwm_fd + 1, &rpb->rfd, &rpb->wfd, &rpb->efd, p_timeout);
     } while (rc == -1 && get_last_socket_error_is_eintr());
@@ -164,10 +168,10 @@ int ossl_rio_poll_builder_poll(RIO_POLL_BUILDER *rpb, OSSL_TIME deadline)
             timeout_ms = -1;
         else
             timeout_ms = ossl_time2ms(ossl_time_subtract(deadline,
-                                                         ossl_time_now()));
+                ossl_time_now()));
 
         rc = poll(rpb->pfd_heap != NULL ? rpb->pfd_heap : rpb->pfds,
-                  rpb->pfd_num, timeout_ms);
+            rpb->pfd_num, timeout_ms);
     } while (rc == -1 && get_last_socket_error_is_eintr());
 #endif
 
diff --git a/ssl/rio/poll_builder.h b/ssl/rio/poll_builder.h
index ffc9bbf9fca78..1fe13eacbaba4 100644
--- a/ssl/rio/poll_builder.h
+++ b/ssl/rio/poll_builder.h
@@ -7,10 +7,10 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_POLL_BUILDER_H
-# define OSSL_POLL_BUILDER_H
+#define OSSL_POLL_BUILDER_H
 
-# include "poll_method.h"
-# include "internal/time.h"
+#include "poll_method.h"
+#include "internal/time.h"
 
 /*
  * RIO_POLL_BUILDER
@@ -23,17 +23,19 @@
  * FDs.
  */
 typedef struct rio_poll_builder_st {
-# if RIO_POLL_METHOD == RIO_POLL_METHOD_SELECT
-    fd_set          rfd, wfd, efd;
-    int             hwm_fd;
-# elif RIO_POLL_METHOD == RIO_POLL_METHOD_POLL
-#  define RIO_NUM_STACK_PFDS  32
-    struct pollfd   *pfd_heap;
-    struct pollfd   pfds[RIO_NUM_STACK_PFDS];
-    size_t          pfd_num, pfd_alloc;
-# else
-#  error Unknown RIO poll method
-# endif
+#if RIO_POLL_METHOD == RIO_POLL_METHOD_NONE
+    int unused_dummy; /* make microsoft compiler happy */
+#elif RIO_POLL_METHOD == RIO_POLL_METHOD_SELECT
+    fd_set rfd, wfd, efd;
+    int hwm_fd;
+#elif RIO_POLL_METHOD == RIO_POLL_METHOD_POLL
+#define RIO_NUM_STACK_PFDS 32
+    struct pollfd *pfd_heap;
+    struct pollfd pfds[RIO_NUM_STACK_PFDS];
+    size_t pfd_num, pfd_alloc;
+#else
+#error Unknown RIO poll method
+#endif
 } RIO_POLL_BUILDER;
 
 /*
@@ -60,7 +62,7 @@ void ossl_rio_poll_builder_cleanup(RIO_POLL_BUILDER *rpb);
  * Returns 1 on success and 0 on failure.
  */
 int ossl_rio_poll_builder_add_fd(RIO_POLL_BUILDER *rpb, int fd,
-                                 int want_read, int want_write);
+    int want_read, int want_write);
 
 /*
  * Polls the set of file descriptors added to a poll builder. deadline is a
diff --git a/ssl/rio/poll_immediate.c b/ssl/rio/poll_immediate.c
index 234ee81bdbb04..24b82f3a6a438 100644
--- a/ssl/rio/poll_immediate.c
+++ b/ssl/rio/poll_immediate.c
@@ -21,39 +21,39 @@
  * accessing pollfd structures (see Github issue #24236). That interferes
  * with our use of these names here. We simply undef them.
  */
-# undef revents
-# undef events
+#undef revents
+#undef events
 #endif
 
 #define ITEM_N(items, stride, n) \
-    (*(SSL_POLL_ITEM *)((char *)(items) + (n)*(stride)))
-
-#define FAIL_FROM(n)                                                        \
-    do {                                                                    \
-        size_t j;                                                           \
-                                                                            \
-        for (j = (n); j < num_items; ++j)                                   \
-            ITEM_N(items, stride, j).revents = 0;                           \
-                                                                            \
-        ok = 0;                                                             \
-        goto out;                                                           \
+    (*(SSL_POLL_ITEM *)((char *)(items) + (n) * (stride)))
+
+#define FAIL_FROM(n)                              \
+    do {                                          \
+        size_t j;                                 \
+                                                  \
+        for (j = (n); j < num_items; ++j)         \
+            ITEM_N(items, stride, j).revents = 0; \
+                                                  \
+        ok = 0;                                   \
+        goto out;                                 \
     } while (0)
 
-#define FAIL_ITEM(idx)                                                      \
-    do {                                                                    \
-        size_t idx_ = (idx);                                                \
-                                                                            \
-        ITEM_N(items, stride, idx_).revents = SSL_POLL_EVENT_F;             \
-        ++result_count;                                                     \
-        FAIL_FROM(idx_ + 1);                                                \
+#define FAIL_ITEM(idx)                                          \
+    do {                                                        \
+        size_t idx_ = (idx);                                    \
+                                                                \
+        ITEM_N(items, stride, idx_).revents = SSL_POLL_EVENT_F; \
+        ++result_count;                                         \
+        FAIL_FROM(idx_ + 1);                                    \
     } while (0)
 
 #ifndef OPENSSL_NO_QUIC
 static int poll_translate_ssl_quic(SSL *ssl,
-                                   QUIC_REACTOR_WAIT_CTX *wctx,
-                                   RIO_POLL_BUILDER *rpb,
-                                   uint64_t events,
-                                   int *abort_blocking)
+    QUIC_REACTOR_WAIT_CTX *wctx,
+    RIO_POLL_BUILDER *rpb,
+    uint64_t events,
+    int *abort_blocking)
 {
     BIO_POLL_DESCRIPTOR rd, wd;
     int fd1 = -1, fd2 = -1, fd_nfy = -1;
@@ -62,40 +62,40 @@ static int poll_translate_ssl_quic(SSL *ssl,
     if (SSL_net_read_desired(ssl)) {
         if (!SSL_get_rpoll_descriptor(ssl, &rd)) {
             ERR_raise_data(ERR_LIB_SSL, SSL_R_POLL_REQUEST_NOT_SUPPORTED,
-                           "SSL_poll requires the network BIOs underlying "
-                           "a QUIC SSL object provide poll descriptors");
+                "SSL_poll requires the network BIOs underlying "
+                "a QUIC SSL object provide poll descriptors");
             return 0;
         }
 
         if (rd.type != BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD) {
             ERR_raise_data(ERR_LIB_SSL, SSL_R_POLL_REQUEST_NOT_SUPPORTED,
-                           "SSL_poll requires the poll descriptors of the "
-                           "network BIOs underlying a QUIC SSL object be "
-                           "of socket type");
+                "SSL_poll requires the poll descriptors of the "
+                "network BIOs underlying a QUIC SSL object be "
+                "of socket type");
             return 0;
         }
 
-        fd1   = rd.value.fd;
+        fd1 = rd.value.fd;
         fd1_r = 1;
     }
 
     if (SSL_net_write_desired(ssl)) {
         if (!SSL_get_wpoll_descriptor(ssl, &wd)) {
             ERR_raise_data(ERR_LIB_SSL, SSL_R_POLL_REQUEST_NOT_SUPPORTED,
-                           "SSL_poll requires the network BIOs underlying "
-                           "a QUIC SSL object provide poll descriptors");
+                "SSL_poll requires the network BIOs underlying "
+                "a QUIC SSL object provide poll descriptors");
             return 0;
         }
 
         if (wd.type != BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD) {
             ERR_raise_data(ERR_LIB_SSL, SSL_R_POLL_REQUEST_NOT_SUPPORTED,
-                           "SSL_poll requires the poll descriptors of the "
-                           "network BIOs underlying a QUIC SSL object be "
-                           "of socket type");
+                "SSL_poll requires the poll descriptors of the "
+                "network BIOs underlying a QUIC SSL object be "
+                "of socket type");
             return 0;
         }
 
-        fd2   = wd.value.fd;
+        fd2 = wd.value.fd;
         fd2_w = 1;
     }
 
@@ -109,7 +109,7 @@ static int poll_translate_ssl_quic(SSL *ssl,
             return 0;
 
     if (fd2 != -1 && fd2_w)
-        if (!ossl_rio_poll_builder_add_fd(rpb, fd2, /*r = */0, fd2_w))
+        if (!ossl_rio_poll_builder_add_fd(rpb, fd2, /*r = */ 0, fd2_w))
             return 0;
 
     /*
@@ -123,7 +123,7 @@ static int poll_translate_ssl_quic(SSL *ssl,
     if (fd_nfy != -1) {
         uint64_t revents = 0;
 
-        if (!ossl_rio_poll_builder_add_fd(rpb, fd_nfy, /*r = */1, /*w = */0))
+        if (!ossl_rio_poll_builder_add_fd(rpb, fd_nfy, /*r = */ 1, /*w = */ 0))
             return 0;
 
         /* Tell QUIC domain we need to receive notifications. */
@@ -137,7 +137,7 @@ static int poll_translate_ssl_quic(SSL *ssl,
          * we needed to block). We now need to do another readout, in which case
          * blocking is to be aborted.
          */
-        if (!ossl_quic_conn_poll_events(ssl, events, /*do_tick = */0, &revents)) {
+        if (!ossl_quic_conn_poll_events(ssl, events, /*do_tick = */ 0, &revents)) {
             ossl_quic_leave_blocking_section(ssl, wctx);
             return 0;
         }
@@ -153,16 +153,16 @@ static int poll_translate_ssl_quic(SSL *ssl,
 }
 
 static void postpoll_translation_cleanup_ssl_quic(SSL *ssl,
-                                                  QUIC_REACTOR_WAIT_CTX *wctx)
+    QUIC_REACTOR_WAIT_CTX *wctx)
 {
     if (ossl_quic_get_notifier_fd(ssl) != -1)
         ossl_quic_leave_blocking_section(ssl, wctx);
 }
 
 static void postpoll_translation_cleanup(SSL_POLL_ITEM *items,
-                                         size_t num_items,
-                                         size_t stride,
-                                         QUIC_REACTOR_WAIT_CTX *wctx)
+    size_t num_items,
+    size_t stride,
+    QUIC_REACTOR_WAIT_CTX *wctx)
 {
     SSL_POLL_ITEM *item;
     SSL *ssl;
@@ -178,13 +178,13 @@ static void postpoll_translation_cleanup(SSL_POLL_ITEM *items,
                 break;
 
             switch (ssl->type) {
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
             case SSL_TYPE_QUIC_LISTENER:
             case SSL_TYPE_QUIC_CONNECTION:
             case SSL_TYPE_QUIC_XSO:
                 postpoll_translation_cleanup_ssl_quic(ssl, wctx);
                 break;
-# endif
+#endif
             default:
                 break;
             }
@@ -196,13 +196,13 @@ static void postpoll_translation_cleanup(SSL_POLL_ITEM *items,
 }
 
 static int poll_translate(SSL_POLL_ITEM *items,
-                          size_t num_items,
-                          size_t stride,
-                          QUIC_REACTOR_WAIT_CTX *wctx,
-                          RIO_POLL_BUILDER *rpb,
-                          OSSL_TIME *p_earliest_wakeup_deadline,
-                          int *abort_blocking,
-                          size_t *p_result_count)
+    size_t num_items,
+    size_t stride,
+    QUIC_REACTOR_WAIT_CTX *wctx,
+    RIO_POLL_BUILDER *rpb,
+    OSSL_TIME *p_earliest_wakeup_deadline,
+    int *abort_blocking,
+    size_t *p_result_count)
 {
     int ok = 1;
     SSL_POLL_ITEM *item;
@@ -224,12 +224,12 @@ static int poll_translate(SSL_POLL_ITEM *items,
                 break;
 
             switch (ssl->type) {
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
             case SSL_TYPE_QUIC_LISTENER:
             case SSL_TYPE_QUIC_CONNECTION:
             case SSL_TYPE_QUIC_XSO:
                 if (!poll_translate_ssl_quic(ssl, wctx, rpb, item->events,
-                                             abort_blocking))
+                        abort_blocking))
                     FAIL_ITEM(i);
 
                 if (*abort_blocking)
@@ -241,30 +241,31 @@ static int poll_translate(SSL_POLL_ITEM *items,
                 if (!is_infinite)
                     earliest_wakeup_deadline
                         = ossl_time_min(earliest_wakeup_deadline,
-                                        ossl_time_add(ossl_time_now(),
-                                                      ossl_time_from_timeval(timeout)));
+                            ossl_time_add(ossl_time_now(),
+                                ossl_time_from_timeval(timeout)));
 
                 break;
-# endif
+#endif
 
             default:
                 ERR_raise_data(ERR_LIB_SSL, SSL_R_POLL_REQUEST_NOT_SUPPORTED,
-                               "SSL_poll currently only supports QUIC SSL "
-                               "objects");
+                    "SSL_poll currently only supports QUIC SSL "
+                    "objects");
                 FAIL_ITEM(i);
             }
             break;
 
         case BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD:
             ERR_raise_data(ERR_LIB_SSL, SSL_R_POLL_REQUEST_NOT_SUPPORTED,
-                           "SSL_poll currently does not support polling "
-                           "sockets");
+                "SSL_poll currently does not support polling "
+                "sockets");
             FAIL_ITEM(i);
 
         default:
             ERR_raise_data(ERR_LIB_SSL, SSL_R_POLL_REQUEST_NOT_SUPPORTED,
-                           "SSL_poll does not support unknown poll descriptor "
-                           "type %d", item->desc.type);
+                "SSL_poll does not support unknown poll descriptor "
+                "type %d",
+                item->desc.type);
             FAIL_ITEM(i);
         }
     }
@@ -279,10 +280,10 @@ static int poll_translate(SSL_POLL_ITEM *items,
 }
 
 static int poll_block(SSL_POLL_ITEM *items,
-                      size_t num_items,
-                      size_t stride,
-                      OSSL_TIME user_deadline,
-                      size_t *p_result_count)
+    size_t num_items,
+    size_t stride,
+    OSSL_TIME user_deadline,
+    size_t *p_result_count)
 {
     int ok = 0, abort_blocking = 0;
     RIO_POLL_BUILDER rpb;
@@ -314,16 +315,16 @@ static int poll_block(SSL_POLL_ITEM *items,
     ossl_rio_poll_builder_init(&rpb);
 
     if (!poll_translate(items, num_items, stride, &wctx, &rpb,
-                        &earliest_wakeup_deadline,
-                        &abort_blocking,
-                        p_result_count))
+            &earliest_wakeup_deadline,
+            &abort_blocking,
+            p_result_count))
         goto out;
 
     if (abort_blocking)
         goto out;
 
     earliest_wakeup_deadline = ossl_time_min(earliest_wakeup_deadline,
-                                             user_deadline);
+        user_deadline);
 
     ok = ossl_rio_poll_builder_poll(&rpb, earliest_wakeup_deadline);
 
@@ -337,10 +338,10 @@ static int poll_block(SSL_POLL_ITEM *items,
 #endif
 
 static int poll_readout(SSL_POLL_ITEM *items,
-                        size_t num_items,
-                        size_t stride,
-                        int do_tick,
-                        size_t *p_result_count)
+    size_t num_items,
+    size_t stride,
+    int do_tick,
+    size_t *p_result_count)
 {
     int ok = 1;
     size_t i, result_count = 0;
@@ -352,9 +353,9 @@ static int poll_readout(SSL_POLL_ITEM *items,
     uint64_t revents;
 
     for (i = 0; i < num_items; ++i) {
-        item    = &ITEM_N(items, stride, i);
+        item = &ITEM_N(items, stride, i);
 #ifndef OPENSSL_NO_QUIC
-        events  = item->events;
+        events = item->events;
 #endif
         revents = 0;
 
@@ -382,20 +383,21 @@ static int poll_readout(SSL_POLL_ITEM *items,
 
             default:
                 ERR_raise_data(ERR_LIB_SSL, SSL_R_POLL_REQUEST_NOT_SUPPORTED,
-                               "SSL_poll currently only supports QUIC SSL "
-                               "objects");
+                    "SSL_poll currently only supports QUIC SSL "
+                    "objects");
                 FAIL_ITEM(i);
             }
             break;
         case BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD:
             ERR_raise_data(ERR_LIB_SSL, SSL_R_POLL_REQUEST_NOT_SUPPORTED,
-                           "SSL_poll currently does not support polling "
-                           "sockets");
+                "SSL_poll currently does not support polling "
+                "sockets");
             FAIL_ITEM(i);
         default:
             ERR_raise_data(ERR_LIB_SSL, SSL_R_POLL_REQUEST_NOT_SUPPORTED,
-                           "SSL_poll does not support unknown poll descriptor "
-                           "type %d", item->desc.type);
+                "SSL_poll does not support unknown poll descriptor "
+                "type %d",
+                item->desc.type);
             FAIL_ITEM(i);
         }
 
@@ -410,11 +412,11 @@ static int poll_readout(SSL_POLL_ITEM *items,
 }
 
 int SSL_poll(SSL_POLL_ITEM *items,
-             size_t num_items,
-             size_t stride,
-             const struct timeval *timeout,
-             uint64_t flags,
-             size_t *p_result_count)
+    size_t num_items,
+    size_t stride,
+    const struct timeval *timeout,
+    uint64_t flags,
+    size_t *p_result_count)
 {
     int ok = 1;
     size_t result_count = 0;
@@ -436,7 +438,7 @@ int SSL_poll(SSL_POLL_ITEM *items,
         deadline = ossl_time_zero();
     else
         deadline = ossl_time_add(ossl_time_now(),
-                                 ossl_time_from_timeval(*timeout));
+            ossl_time_from_timeval(*timeout));
 
     /* Loop until we have something to report. */
     for (;;) {
diff --git a/ssl/rio/poll_method.h b/ssl/rio/poll_method.h
index 9a6de8927089d..1e173fe4f8b5f 100644
--- a/ssl/rio/poll_method.h
+++ b/ssl/rio/poll_method.h
@@ -7,20 +7,23 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_POLL_METHOD_H
-# define OSSL_POLL_METHOD_H
+#define OSSL_POLL_METHOD_H
 
-# include "internal/common.h"
-# include "internal/sockets.h"
+#include "internal/common.h"
+#include "internal/sockets.h"
 
-# define RIO_POLL_METHOD_SELECT         1
-# define RIO_POLL_METHOD_POLL           2
+#define RIO_POLL_METHOD_SELECT 1
+#define RIO_POLL_METHOD_POLL 2
+#define RIO_POLL_METHOD_NONE 3
 
-# ifndef RIO_POLL_METHOD
-#  if !defined(OPENSSL_SYS_WINDOWS) && defined(POLLIN)
-#   define RIO_POLL_METHOD              RIO_POLL_METHOD_POLL
-#  else
-#   define RIO_POLL_METHOD              RIO_POLL_METHOD_SELECT
-#  endif
-# endif
+#ifndef RIO_POLL_METHOD
+#if defined(OPENSSL_SYS_UEFI)
+#define RIO_POLL_METHOD RIO_POLL_METHOD_NONE
+#elif !defined(OPENSSL_SYS_WINDOWS) && defined(POLLIN)
+#define RIO_POLL_METHOD RIO_POLL_METHOD_POLL
+#else
+#define RIO_POLL_METHOD RIO_POLL_METHOD_SELECT
+#endif
+#endif
 
 #endif
diff --git a/ssl/rio/rio_notifier.c b/ssl/rio/rio_notifier.c
index 6dbb2bdc4766f..ea40790d627bd 100644
--- a/ssl/rio/rio_notifier.c
+++ b/ssl/rio/rio_notifier.c
@@ -64,7 +64,7 @@ static ossl_inline int ensure_wsa_startup(void)
 static int create_socket(int domain, int socktype, int protocol)
 {
     int fd;
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
     static const int on = 1;
 
     /*
@@ -76,47 +76,47 @@ static int create_socket(int domain, int socktype, int protocol)
      * so we can get away with not including it for older platforms
      */
 
-#  ifdef WSA_FLAG_NO_HANDLE_INHERIT
+#ifdef WSA_FLAG_NO_HANDLE_INHERIT
     fd = (int)WSASocketA(domain, socktype, protocol, NULL, 0,
-                         WSA_FLAG_NO_HANDLE_INHERIT);
+        WSA_FLAG_NO_HANDLE_INHERIT);
 
     /*
      * Its also possible that someone is building a binary on a newer windows
      * SDK, but running it on a runtime that doesn't support inheritance
-     * supression.  In that case the above will return INVALID_SOCKET, and
+     * suppression.  In that case the above will return INVALID_SOCKET, and
      * our response for those older platforms is to try the call again
      * without the flag
      */
     if (fd == INVALID_SOCKET)
         fd = (int)WSASocketA(domain, socktype, protocol, NULL, 0, 0);
-#  else
+#else
     fd = (int)WSASocketA(domain, socktype, protocol, NULL, 0, 0);
-#  endif
+#endif
     if (fd == INVALID_SOCKET) {
         int err = get_last_socket_error();
 
         ERR_raise_data(ERR_LIB_SYS, err,
-                       "calling WSASocketA() = %d", err);
+            "calling WSASocketA() = %d", err);
         return INVALID_SOCKET;
     }
 
     /* Prevent interference with the socket from other processes on Windows. */
     if (setsockopt(fd, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (void *)&on, sizeof(on)) < 0) {
         ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
-                       "calling setsockopt()");
+            "calling setsockopt()");
         BIO_closesocket(fd);
         return INVALID_SOCKET;
     }
 
-# else
-#  if defined(SOCK_CLOEXEC)
+#else
+#if defined(SOCK_CLOEXEC)
     socktype |= SOCK_CLOEXEC;
-#  endif
+#endif
 
     fd = BIO_socket(domain, socktype, protocol, 0);
     if (fd == INVALID_SOCKET) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling BIO_socket()");
+            "calling BIO_socket()");
         return INVALID_SOCKET;
     }
 
@@ -126,11 +126,11 @@ static int create_socket(int domain, int socktype, int protocol)
      */
     if (!set_cloexec(fd)) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling set_cloexec()");
+            "calling set_cloexec()");
         BIO_closesocket(fd);
         return INVALID_SOCKET;
     }
-# endif
+#endif
 
     return fd;
 }
@@ -142,36 +142,36 @@ static int create_socket(int domain, int socktype, int protocol)
  *
  * Win32 does not support socketpair(2), and Win32 pipes are not compatible with
  * Winsock select(2). This means our only means of making select(2) wakeable is
- * to artifically create a loopback TCP connection and send bytes to it.
+ * to artificially create a loopback TCP connection and send bytes to it.
  */
 int ossl_rio_notifier_init(RIO_NOTIFIER *nfy)
 {
     int rc, lfd = -1, rfd = -1, wfd = -1;
-    struct sockaddr_in sa = {0}, accept_sa;
+    struct sockaddr_in sa = { 0 }, accept_sa;
     socklen_t sa_len = sizeof(sa), accept_sa_len = sizeof(accept_sa);
 
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
     if (!ensure_wsa_startup()) {
         ERR_raise_data(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR,
-                       "Cannot start Windows sockets");
+            "Cannot start Windows sockets");
         return 0;
     }
-# endif
+#endif
     /* Create a close-on-exec socket. */
     lfd = create_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
     if (lfd == INVALID_SOCKET) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling create_socket()");
+            "calling create_socket()");
         return 0;
     }
 
     /* Bind the socket to a random loopback port. */
-    sa.sin_family       = AF_INET;
-    sa.sin_addr.s_addr  = htonl(INADDR_LOOPBACK);
+    sa.sin_family = AF_INET;
+    sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
     rc = bind(lfd, (const struct sockaddr *)&sa, sizeof(sa));
     if (rc < 0) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling bind()");
+            "calling bind()");
         goto err;
     }
 
@@ -179,7 +179,7 @@ int ossl_rio_notifier_init(RIO_NOTIFIER *nfy)
     rc = getsockname(lfd, (struct sockaddr *)&sa, &sa_len);
     if (rc < 0) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling getsockname()");
+            "calling getsockname()");
         goto err;
     }
 
@@ -187,7 +187,7 @@ int ossl_rio_notifier_init(RIO_NOTIFIER *nfy)
     rc = listen(lfd, 1);
     if (rc < 0) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling listen()");
+            "calling listen()");
         goto err;
     }
 
@@ -195,7 +195,7 @@ int ossl_rio_notifier_init(RIO_NOTIFIER *nfy)
     wfd = create_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
     if (wfd == INVALID_SOCKET) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling create_socket()");
+            "calling create_socket()");
         goto err;
     }
 
@@ -205,7 +205,7 @@ int ossl_rio_notifier_init(RIO_NOTIFIER *nfy)
      */
     if (!BIO_set_tcp_ndelay(wfd, 1)) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling BIO_set_tcp_ndelay()");
+            "calling BIO_set_tcp_ndelay()");
         goto err;
     }
 
@@ -215,7 +215,7 @@ int ossl_rio_notifier_init(RIO_NOTIFIER *nfy)
     rc = connect(wfd, (struct sockaddr *)&sa, sizeof(sa));
     if (rc < 0) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling connect()");
+            "calling connect()");
         goto err;
     }
 
@@ -225,14 +225,14 @@ int ossl_rio_notifier_init(RIO_NOTIFIER *nfy)
     rfd = accept(lfd, (struct sockaddr *)&accept_sa, &accept_sa_len);
     if (rfd == INVALID_SOCKET) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling accept()");
+            "calling accept()");
         goto err;
     }
 
     rc = getsockname(wfd, (struct sockaddr *)&sa, &sa_len);
     if (rc < 0) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling getsockname()");
+            "calling getsockname()");
         goto err;
     }
 
@@ -246,20 +246,20 @@ int ossl_rio_notifier_init(RIO_NOTIFIER *nfy)
      */
     if (accept_sa.sin_family != AF_INET || accept_sa.sin_port != sa.sin_port) {
         ERR_raise_data(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR,
-                       "connected address differs from accepted address");
+            "connected address differs from accepted address");
         goto err;
     }
 
     /* Make both sides of the connection non-blocking. */
     if (!BIO_socket_nbio(rfd, 1)) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling BIO_socket_nbio()");
+            "calling BIO_socket_nbio()");
         goto err;
     }
 
     if (!BIO_socket_nbio(wfd, 1)) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling BIO_socket_nbio()");
+            "calling BIO_socket_nbio()");
         goto err;
     }
 
@@ -283,40 +283,40 @@ int ossl_rio_notifier_init(RIO_NOTIFIER *nfy)
 {
     int fds[2], domain = AF_INET, type = SOCK_STREAM;
 
-# if defined(SOCK_CLOEXEC)
+#if defined(SOCK_CLOEXEC)
     type |= SOCK_CLOEXEC;
-# endif
-# if defined(SOCK_NONBLOCK)
+#endif
+#if defined(SOCK_NONBLOCK)
     type |= SOCK_NONBLOCK;
-# endif
+#endif
 
-# if defined(OPENSSL_SYS_UNIX) && defined(AF_UNIX)
+#if defined(OPENSSL_SYS_UNIX) && defined(AF_UNIX)
     domain = AF_UNIX;
-# endif
+#endif
 
     if (socketpair(domain, type, 0, fds) < 0) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling socketpair()");
+            "calling socketpair()");
         return 0;
     }
 
     if (!set_cloexec(fds[0]) || !set_cloexec(fds[1])) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling set_cloexec()");
+            "calling set_cloexec()");
         goto err;
     }
 
-# if !defined(SOCK_NONBLOCK)
+#if !defined(SOCK_NONBLOCK)
     if (!BIO_socket_nbio(fds[0], 1) || !BIO_socket_nbio(fds[1], 1)) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling BIO_socket_nbio()");
+            "calling BIO_socket_nbio()");
         goto err;
     }
-# endif
+#endif
 
     if (domain == AF_INET && !BIO_set_tcp_ndelay(fds[1], 1)) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling BIO_set_tcp_ndelay()");
+            "calling BIO_set_tcp_ndelay()");
         goto err;
     }
 
@@ -370,7 +370,7 @@ int ossl_rio_notifier_unsignal(RIO_NOTIFIER *nfy)
     do
         rd = readsocket(nfy->rfd, (void *)buf, sizeof(buf));
     while (rd == sizeof(buf)
-           || (rd < 0 && get_last_socket_error_is_eintr()));
+        || (rd < 0 && get_last_socket_error_is_eintr()));
 
     if (rd < 0 && !BIO_fd_non_fatal_error(get_last_socket_error()))
         return 0;
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index 159b9e60fea9b..307f6dc9418bb 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -28,7 +28,7 @@ static int ssl3_generate_key_block(SSL_CONNECTION *s, unsigned char *km, int num
     SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(s);
 
 #ifdef CHARSET_EBCDIC
-    c = os_toascii[c];          /* 'A' in ASCII */
+    c = os_toascii[c]; /* 'A' in ASCII */
 #endif
     k = 0;
     md5 = ssl_evp_md_fetch(sctx->libctx, NID_md5, sctx->propq);
@@ -52,13 +52,13 @@ static int ssl3_generate_key_block(SSL_CONNECTION *s, unsigned char *km, int num
         if (!EVP_DigestInit_ex(s1, sha1, NULL)
             || !EVP_DigestUpdate(s1, buf, k)
             || !EVP_DigestUpdate(s1, s->session->master_key,
-                                 s->session->master_key_length)
+                s->session->master_key_length)
             || !EVP_DigestUpdate(s1, s->s3.server_random, SSL3_RANDOM_SIZE)
             || !EVP_DigestUpdate(s1, s->s3.client_random, SSL3_RANDOM_SIZE)
             || !EVP_DigestFinal_ex(s1, smd, NULL)
             || !EVP_DigestInit_ex(m5, md5, NULL)
             || !EVP_DigestUpdate(m5, s->session->master_key,
-                                 s->session->master_key_length)
+                s->session->master_key_length)
             || !EVP_DigestUpdate(m5, smd, SHA_DIGEST_LENGTH)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             goto err;
@@ -80,7 +80,7 @@ static int ssl3_generate_key_block(SSL_CONNECTION *s, unsigned char *km, int num
     }
     OPENSSL_cleanse(smd, sizeof(smd));
     ret = 1;
- err:
+err:
     EVP_MD_CTX_free(m5);
     EVP_MD_CTX_free(s1);
     ssl_evp_md_free(md5);
@@ -122,8 +122,7 @@ int ssl3_change_cipher_state(SSL_CONNECTION *s, int which)
     key_len = EVP_CIPHER_get_key_length(ciph);
     iv_len = EVP_CIPHER_get_iv_length(ciph);
 
-    if ((which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||
-        (which == SSL3_CHANGE_CIPHER_SERVER_READ)) {
+    if ((which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) || (which == SSL3_CHANGE_CIPHER_SERVER_READ)) {
         mac_secret = &(p[0]);
         n = md_len + md_len;
         key = &(p[n]);
@@ -146,16 +145,16 @@ int ssl3_change_cipher_state(SSL_CONNECTION *s, int which)
     }
 
     if (!ssl_set_new_record_layer(s, SSL3_VERSION,
-                                  direction,
-                                  OSSL_RECORD_PROTECTION_LEVEL_APPLICATION,
-                                  NULL, 0, key, key_len, iv, iv_len, mac_secret,
-                                  md_len, ciph, 0, NID_undef, md, comp, NULL)) {
+            direction,
+            OSSL_RECORD_PROTECTION_LEVEL_APPLICATION,
+            NULL, 0, key, key_len, iv, iv_len, mac_secret,
+            md_len, ciph, 0, NID_undef, md, comp, NULL)) {
         /* SSLfatal already called */
         goto err;
     }
 
     return 1;
- err:
+err:
     return 0;
 }
 
@@ -172,7 +171,7 @@ int ssl3_setup_key_block(SSL_CONNECTION *s)
         return 1;
 
     if (!ssl_cipher_get_evp(SSL_CONNECTION_GET_CTX(s), s->session, &c, &hash,
-                            NULL, NULL, &comp, 0)) {
+            NULL, NULL, &comp, 0)) {
         /* Error is already recorded */
         SSLfatal_alert(s, SSL_AD_INTERNAL_ERROR);
         return 0;
@@ -292,7 +291,7 @@ int ssl3_digest_cached_records(SSL_CONNECTION *s, int keep)
         md = ssl_handshake_md(s);
         if (md == NULL) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                     SSL_R_NO_SUITABLE_DIGEST_ALGORITHM);
+                SSL_R_NO_SUITABLE_DIGEST_ALGORITHM);
             return 0;
         }
         if (!EVP_DigestInit_ex(s->s3.handshake_dgst, md, NULL)
@@ -310,17 +309,17 @@ int ssl3_digest_cached_records(SSL_CONNECTION *s, int keep)
 }
 
 void ssl3_digest_master_key_set_params(const SSL_SESSION *session,
-                                       OSSL_PARAM params[])
+    OSSL_PARAM params[])
 {
     int n = 0;
     params[n++] = OSSL_PARAM_construct_octet_string(OSSL_DIGEST_PARAM_SSL3_MS,
-                                                    (void *)session->master_key,
-                                                    session->master_key_length);
+        (void *)session->master_key,
+        session->master_key_length);
     params[n++] = OSSL_PARAM_construct_end();
 }
 
 size_t ssl3_final_finish_mac(SSL_CONNECTION *s, const char *sender, size_t len,
-                             unsigned char *p)
+    unsigned char *p)
 {
     int ret;
     EVP_MD_CTX *ctx = NULL;
@@ -361,20 +360,20 @@ size_t ssl3_final_finish_mac(SSL_CONNECTION *s, const char *sender, size_t len,
         if (EVP_DigestUpdate(ctx, sender, len) <= 0
             || EVP_MD_CTX_set_params(ctx, digest_cmd_params) <= 0
             || EVP_DigestFinal_ex(ctx, p, NULL) <= 0) {
-                SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
-                ret = 0;
+            SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+            ret = 0;
         }
     }
 
- err:
+err:
     EVP_MD_CTX_free(ctx);
 
     return ret;
 }
 
 int ssl3_generate_master_secret(SSL_CONNECTION *s, unsigned char *out,
-                                unsigned char *p,
-                                size_t len, size_t *secret_size)
+    unsigned char *p,
+    size_t len, size_t *secret_size)
 {
     static const unsigned char *const salt[3] = {
 #ifndef CHARSET_EBCDIC
@@ -400,12 +399,15 @@ int ssl3_generate_master_secret(SSL_CONNECTION *s, unsigned char *out,
     for (i = 0; i < 3; i++) {
         if (EVP_DigestInit_ex(ctx, SSL_CONNECTION_GET_CTX(s)->sha1, NULL) <= 0
             || EVP_DigestUpdate(ctx, salt[i],
-                                strlen((const char *)salt[i])) <= 0
+                   strlen((const char *)salt[i]))
+                <= 0
             || EVP_DigestUpdate(ctx, p, len) <= 0
             || EVP_DigestUpdate(ctx, &(s->s3.client_random[0]),
-                                SSL3_RANDOM_SIZE) <= 0
+                   SSL3_RANDOM_SIZE)
+                <= 0
             || EVP_DigestUpdate(ctx, &(s->s3.server_random[0]),
-                                SSL3_RANDOM_SIZE) <= 0
+                   SSL3_RANDOM_SIZE)
+                <= 0
             || EVP_DigestFinal_ex(ctx, buf, &n) <= 0
             || EVP_DigestInit_ex(ctx, SSL_CONNECTION_GET_CTX(s)->md5, NULL) <= 0
             || EVP_DigestUpdate(ctx, p, len) <= 0
@@ -476,7 +478,7 @@ int ssl3_alert_code(int code)
     case SSL_AD_USER_CANCELLED:
         return SSL3_AD_HANDSHAKE_FAILURE;
     case SSL_AD_NO_RENEGOTIATION:
-        return -1;            /* Don't send it :-) */
+        return -1; /* Don't send it :-) */
     case SSL_AD_UNSUPPORTED_EXTENSION:
         return SSL3_AD_HANDSHAKE_FAILURE;
     case SSL_AD_CERTIFICATE_UNOBTAINABLE:
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 08b40420109b3..0e1445b38fb7d 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -23,9 +23,9 @@
 #include "internal/cryptlib.h"
 #include "internal/ssl_unwrap.h"
 
-#define TLS13_NUM_CIPHERS       OSSL_NELEM(tls13_ciphers)
-#define SSL3_NUM_CIPHERS        OSSL_NELEM(ssl3_ciphers)
-#define SSL3_NUM_SCSVS          OSSL_NELEM(ssl3_scsvs)
+#define TLS13_NUM_CIPHERS OSSL_NELEM(tls13_ciphers)
+#define SSL3_NUM_CIPHERS OSSL_NELEM(ssl3_ciphers)
+#define SSL3_NUM_SCSVS OSSL_NELEM(ssl3_scsvs)
 
 /* TLSv1.3 downgrade protection sentinel values */
 const unsigned char tls11downgrade[] = {
@@ -46,3230 +46,3629 @@ static SSL_CIPHER tls13_ciphers[] = {
         SSL_aANY,
         SSL_AES128GCM,
         SSL_AEAD,
-        TLS1_3_VERSION, TLS1_3_VERSION,
-        0, 0,
+        TLS1_3_VERSION,
+        TLS1_3_VERSION,
+        0,
+        0,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | SSL_QUIC,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_3_RFC_AES_256_GCM_SHA384,
+        TLS1_3_RFC_AES_256_GCM_SHA384,
+        TLS1_3_CK_AES_256_GCM_SHA384,
+        SSL_kANY,
+        SSL_aANY,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        TLS1_3_VERSION,
+        TLS1_3_VERSION,
+        0,
+        0,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | SSL_QUIC,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_3_RFC_CHACHA20_POLY1305_SHA256,
+        TLS1_3_RFC_CHACHA20_POLY1305_SHA256,
+        TLS1_3_CK_CHACHA20_POLY1305_SHA256,
+        SSL_kANY,
+        SSL_aANY,
+        SSL_CHACHA20POLY1305,
+        SSL_AEAD,
+        TLS1_3_VERSION,
+        TLS1_3_VERSION,
+        0,
+        0,
         SSL_HIGH,
         SSL_HANDSHAKE_MAC_SHA256 | SSL_QUIC,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_3_RFC_AES_128_CCM_SHA256,
+        TLS1_3_RFC_AES_128_CCM_SHA256,
+        TLS1_3_CK_AES_128_CCM_SHA256,
+        SSL_kANY,
+        SSL_aANY,
+        SSL_AES128CCM,
+        SSL_AEAD,
+        TLS1_3_VERSION,
+        TLS1_3_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_3_RFC_AES_128_CCM_8_SHA256,
+        TLS1_3_RFC_AES_128_CCM_8_SHA256,
+        TLS1_3_CK_AES_128_CCM_8_SHA256,
+        SSL_kANY,
+        SSL_aANY,
+        SSL_AES128CCM8,
+        SSL_AEAD,
+        TLS1_3_VERSION,
+        TLS1_3_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_SHA256,
+        64, /* CCM8 uses a short tag, so we have a low security strength */
+        128,
+    },
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        TLS1_3_RFC_SHA256_SHA256,
+        TLS1_3_RFC_SHA256_SHA256,
+        TLS1_3_CK_SHA256_SHA256,
+        SSL_kANY,
+        SSL_aANY,
+        SSL_eNULL,
+        SSL_SHA256,
+        TLS1_3_VERSION,
+        TLS1_3_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_STRONG_NONE,
+        SSL_HANDSHAKE_MAC_SHA256,
+        0,
+        256,
+    },
+    {
+        1,
+        TLS1_3_RFC_SHA384_SHA384,
+        TLS1_3_RFC_SHA384_SHA384,
+        TLS1_3_CK_SHA384_SHA384,
+        SSL_kANY,
+        SSL_aANY,
+        SSL_eNULL,
+        SSL_SHA384,
+        TLS1_3_VERSION,
+        TLS1_3_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_STRONG_NONE,
+        SSL_HANDSHAKE_MAC_SHA384,
+        0,
+        384,
+    },
+#endif
+};
+
+/*
+ * The list of available ciphers, mostly organized into the following
+ * groups:
+ *      Always there
+ *      EC
+ *      PSK
+ *      SRP (within that: RSA EC PSK)
+ *      Cipher families: Chacha/poly, Camellia, Gost, IDEA, SEED
+ *      Weak ciphers
+ */
+static SSL_CIPHER ssl3_ciphers[] = {
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        SSL3_TXT_RSA_NULL_MD5,
+        SSL3_RFC_RSA_NULL_MD5,
+        SSL3_CK_RSA_NULL_MD5,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_eNULL,
+        SSL_MD5,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+    {
+        1,
+        SSL3_TXT_RSA_NULL_SHA,
+        SSL3_RFC_RSA_NULL_SHA,
+        SSL3_CK_RSA_NULL_SHA,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_eNULL,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+#endif
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
+    {
+        1,
+        SSL3_TXT_RSA_DES_192_CBC3_SHA,
+        SSL3_RFC_RSA_DES_192_CBC3_SHA,
+        SSL3_CK_RSA_DES_192_CBC3_SHA,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+    {
+        1,
+        SSL3_TXT_DHE_DSS_DES_192_CBC3_SHA,
+        SSL3_RFC_DHE_DSS_DES_192_CBC3_SHA,
+        SSL3_CK_DHE_DSS_DES_192_CBC3_SHA,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+    {
+        1,
+        SSL3_TXT_DHE_RSA_DES_192_CBC3_SHA,
+        SSL3_RFC_DHE_RSA_DES_192_CBC3_SHA,
+        SSL3_CK_DHE_RSA_DES_192_CBC3_SHA,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+    {
+        1,
+        SSL3_TXT_ADH_DES_192_CBC_SHA,
+        SSL3_RFC_ADH_DES_192_CBC_SHA,
+        SSL3_CK_ADH_DES_192_CBC_SHA,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+#endif
+    {
+        1,
+        TLS1_TXT_RSA_WITH_AES_128_SHA,
+        TLS1_RFC_RSA_WITH_AES_128_SHA,
+        TLS1_CK_RSA_WITH_AES_128_SHA,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_AES_128_SHA,
+        TLS1_RFC_DHE_DSS_WITH_AES_128_SHA,
+        TLS1_CK_DHE_DSS_WITH_AES_128_SHA,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_128_SHA,
+        TLS1_RFC_DHE_RSA_WITH_AES_128_SHA,
+        TLS1_CK_DHE_RSA_WITH_AES_128_SHA,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ADH_WITH_AES_128_SHA,
+        TLS1_RFC_ADH_WITH_AES_128_SHA,
+        TLS1_CK_ADH_WITH_AES_128_SHA,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_WITH_AES_256_SHA,
+        TLS1_RFC_RSA_WITH_AES_256_SHA,
+        TLS1_CK_RSA_WITH_AES_256_SHA,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_AES_256_SHA,
+        TLS1_RFC_DHE_DSS_WITH_AES_256_SHA,
+        TLS1_CK_DHE_DSS_WITH_AES_256_SHA,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_256_SHA,
+        TLS1_RFC_DHE_RSA_WITH_AES_256_SHA,
+        TLS1_CK_DHE_RSA_WITH_AES_256_SHA,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ADH_WITH_AES_256_SHA,
+        TLS1_RFC_ADH_WITH_AES_256_SHA,
+        TLS1_CK_ADH_WITH_AES_256_SHA,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        TLS1_TXT_RSA_WITH_NULL_SHA256,
+        TLS1_RFC_RSA_WITH_NULL_SHA256,
+        TLS1_CK_RSA_WITH_NULL_SHA256,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_eNULL,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+#endif
+    {
+        1,
+        TLS1_TXT_RSA_WITH_AES_128_SHA256,
+        TLS1_RFC_RSA_WITH_AES_128_SHA256,
+        TLS1_CK_RSA_WITH_AES_128_SHA256,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_WITH_AES_256_SHA256,
+        TLS1_RFC_RSA_WITH_AES_256_SHA256,
+        TLS1_CK_RSA_WITH_AES_256_SHA256,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256,
+        TLS1_RFC_DHE_DSS_WITH_AES_128_SHA256,
+        TLS1_CK_DHE_DSS_WITH_AES_128_SHA256,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_AES128,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256,
+        TLS1_RFC_DHE_RSA_WITH_AES_128_SHA256,
+        TLS1_CK_DHE_RSA_WITH_AES_128_SHA256,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_AES_256_SHA256,
+        TLS1_RFC_DHE_DSS_WITH_AES_256_SHA256,
+        TLS1_CK_DHE_DSS_WITH_AES_256_SHA256,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_AES256,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256,
+        TLS1_RFC_DHE_RSA_WITH_AES_256_SHA256,
+        TLS1_CK_DHE_RSA_WITH_AES_256_SHA256,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ADH_WITH_AES_128_SHA256,
+        TLS1_RFC_ADH_WITH_AES_128_SHA256,
+        TLS1_CK_ADH_WITH_AES_128_SHA256,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_AES128,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ADH_WITH_AES_256_SHA256,
+        TLS1_RFC_ADH_WITH_AES_256_SHA256,
+        TLS1_CK_ADH_WITH_AES_256_SHA256,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_AES256,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_WITH_AES_128_GCM_SHA256,
+        TLS1_RFC_RSA_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_RSA_WITH_AES_128_GCM_SHA256,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_WITH_AES_256_GCM_SHA384,
+        TLS1_RFC_RSA_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_RSA_WITH_AES_256_GCM_SHA384,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256,
+        TLS1_RFC_DHE_RSA_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384,
+        TLS1_RFC_DHE_RSA_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_AES_128_GCM_SHA256,
+        TLS1_RFC_DHE_DSS_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_DHE_DSS_WITH_AES_128_GCM_SHA256,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_AES_256_GCM_SHA384,
+        TLS1_RFC_DHE_DSS_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_DHE_DSS_WITH_AES_256_GCM_SHA384,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ADH_WITH_AES_128_GCM_SHA256,
+        TLS1_RFC_ADH_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_ADH_WITH_AES_128_GCM_SHA256,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384,
+        TLS1_RFC_ADH_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_ADH_WITH_AES_256_GCM_SHA384,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_WITH_AES_128_CCM,
+        TLS1_RFC_RSA_WITH_AES_128_CCM,
+        TLS1_CK_RSA_WITH_AES_128_CCM,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES128CCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_WITH_AES_256_CCM,
+        TLS1_RFC_RSA_WITH_AES_256_CCM,
+        TLS1_CK_RSA_WITH_AES_256_CCM,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES256CCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_128_CCM,
+        TLS1_RFC_DHE_RSA_WITH_AES_128_CCM,
+        TLS1_CK_DHE_RSA_WITH_AES_128_CCM,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_AES128CCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_256_CCM,
+        TLS1_RFC_DHE_RSA_WITH_AES_256_CCM,
+        TLS1_CK_DHE_RSA_WITH_AES_256_CCM,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_AES256CCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_WITH_AES_128_CCM_8,
+        TLS1_RFC_RSA_WITH_AES_128_CCM_8,
+        TLS1_CK_RSA_WITH_AES_128_CCM_8,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES128CCM8,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        64, /* CCM8 uses a short tag, so we have a low security strength */
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_WITH_AES_256_CCM_8,
+        TLS1_RFC_RSA_WITH_AES_256_CCM_8,
+        TLS1_CK_RSA_WITH_AES_256_CCM_8,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES256CCM8,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        64, /* CCM8 uses a short tag, so we have a low security strength */
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_128_CCM_8,
+        TLS1_RFC_DHE_RSA_WITH_AES_128_CCM_8,
+        TLS1_CK_DHE_RSA_WITH_AES_128_CCM_8,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_AES128CCM8,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        64, /* CCM8 uses a short tag, so we have a low security strength */
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_256_CCM_8,
+        TLS1_RFC_DHE_RSA_WITH_AES_256_CCM_8,
+        TLS1_CK_DHE_RSA_WITH_AES_256_CCM_8,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_AES256CCM8,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        64, /* CCM8 uses a short tag, so we have a low security strength */
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_AES_128_CCM,
+        TLS1_RFC_PSK_WITH_AES_128_CCM,
+        TLS1_CK_PSK_WITH_AES_128_CCM,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_AES128CCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_AES_256_CCM,
+        TLS1_RFC_PSK_WITH_AES_256_CCM,
+        TLS1_CK_PSK_WITH_AES_256_CCM,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_AES256CCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_AES_128_CCM,
+        TLS1_RFC_DHE_PSK_WITH_AES_128_CCM,
+        TLS1_CK_DHE_PSK_WITH_AES_128_CCM,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_AES128CCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_AES_256_CCM,
+        TLS1_RFC_DHE_PSK_WITH_AES_256_CCM,
+        TLS1_CK_DHE_PSK_WITH_AES_256_CCM,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_AES256CCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_AES_128_CCM_8,
+        TLS1_RFC_PSK_WITH_AES_128_CCM_8,
+        TLS1_CK_PSK_WITH_AES_128_CCM_8,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_AES128CCM8,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        64, /* CCM8 uses a short tag, so we have a low security strength */
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_AES_256_CCM_8,
+        TLS1_RFC_PSK_WITH_AES_256_CCM_8,
+        TLS1_CK_PSK_WITH_AES_256_CCM_8,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_AES256CCM8,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        64, /* CCM8 uses a short tag, so we have a low security strength */
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_AES_128_CCM_8,
+        TLS1_RFC_DHE_PSK_WITH_AES_128_CCM_8,
+        TLS1_CK_DHE_PSK_WITH_AES_128_CCM_8,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_AES128CCM8,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        64, /* CCM8 uses a short tag, so we have a low security strength */
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_AES_256_CCM_8,
+        TLS1_RFC_DHE_PSK_WITH_AES_256_CCM_8,
+        TLS1_CK_DHE_PSK_WITH_AES_256_CCM_8,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_AES256CCM8,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        64, /* CCM8 uses a short tag, so we have a low security strength */
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CCM,
+        TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CCM,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CCM,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_AES128CCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM,
+        TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CCM,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CCM,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_AES256CCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CCM_8,
+        TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CCM_8,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CCM_8,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_AES128CCM8,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        64, /* CCM8 uses a short tag, so we have a low security strength */
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM_8,
+        TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CCM_8,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CCM_8,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_AES256CCM8,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        64, /* CCM8 uses a short tag, so we have a low security strength */
+        256,
+    },
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA,
+        TLS1_RFC_ECDHE_ECDSA_WITH_NULL_SHA,
+        TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_eNULL,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+#endif
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA,
+        TLS1_RFC_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA,
+        TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_3DES,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+#endif
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+        TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_AES128,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+        TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_AES256,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA,
+        TLS1_RFC_ECDHE_RSA_WITH_NULL_SHA,
+        TLS1_CK_ECDHE_RSA_WITH_NULL_SHA,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_eNULL,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+#endif
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA,
+        TLS1_RFC_ECDHE_RSA_WITH_DES_192_CBC3_SHA,
+        TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_3DES,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+#endif
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+        TLS1_RFC_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+        TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+        TLS1_RFC_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+        TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        TLS1_TXT_ECDH_anon_WITH_NULL_SHA,
+        TLS1_RFC_ECDH_anon_WITH_NULL_SHA,
+        TLS1_CK_ECDH_anon_WITH_NULL_SHA,
+        SSL_kECDHE,
+        SSL_aNULL,
+        SSL_eNULL,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+#endif
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
+    {
+        1,
+        TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA,
+        TLS1_RFC_ECDH_anon_WITH_DES_192_CBC3_SHA,
+        TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA,
+        SSL_kECDHE,
+        SSL_aNULL,
+        SSL_3DES,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+#endif
+    {
+        1,
+        TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA,
+        TLS1_RFC_ECDH_anon_WITH_AES_128_CBC_SHA,
+        TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA,
+        SSL_kECDHE,
+        SSL_aNULL,
+        SSL_AES128,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA,
+        TLS1_RFC_ECDH_anon_WITH_AES_256_CBC_SHA,
+        TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA,
+        SSL_kECDHE,
+        SSL_aNULL,
+        SSL_AES256,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256,
+        TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_SHA256,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_AES128,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384,
+        TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_SHA384,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_AES256,
+        SSL_SHA384,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256,
+        TLS1_RFC_ECDHE_RSA_WITH_AES_128_SHA256,
+        TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384,
+        TLS1_RFC_ECDHE_RSA_WITH_AES_256_SHA384,
+        TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA384,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+        TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+        TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+        TLS1_RFC_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+        TLS1_RFC_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        TLS1_TXT_PSK_WITH_NULL_SHA,
+        TLS1_RFC_PSK_WITH_NULL_SHA,
+        TLS1_CK_PSK_WITH_NULL_SHA,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_eNULL,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_NULL_SHA,
+        TLS1_RFC_DHE_PSK_WITH_NULL_SHA,
+        TLS1_CK_DHE_PSK_WITH_NULL_SHA,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_eNULL,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_NULL_SHA,
+        TLS1_RFC_RSA_PSK_WITH_NULL_SHA,
+        TLS1_CK_RSA_PSK_WITH_NULL_SHA,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_eNULL,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+#endif
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
+    {
+        1,
+        TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA,
+        TLS1_RFC_PSK_WITH_3DES_EDE_CBC_SHA,
+        TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+#endif
+    {
+        1,
+        TLS1_TXT_PSK_WITH_AES_128_CBC_SHA,
+        TLS1_RFC_PSK_WITH_AES_128_CBC_SHA,
+        TLS1_CK_PSK_WITH_AES_128_CBC_SHA,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_AES_256_CBC_SHA,
+        TLS1_RFC_PSK_WITH_AES_256_CBC_SHA,
+        TLS1_CK_PSK_WITH_AES_256_CBC_SHA,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_3DES_EDE_CBC_SHA,
+        TLS1_RFC_DHE_PSK_WITH_3DES_EDE_CBC_SHA,
+        TLS1_CK_DHE_PSK_WITH_3DES_EDE_CBC_SHA,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+#endif
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_AES_128_CBC_SHA,
+        TLS1_RFC_DHE_PSK_WITH_AES_128_CBC_SHA,
+        TLS1_CK_DHE_PSK_WITH_AES_128_CBC_SHA,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_AES_256_CBC_SHA,
+        TLS1_RFC_DHE_PSK_WITH_AES_256_CBC_SHA,
+        TLS1_CK_DHE_PSK_WITH_AES_256_CBC_SHA,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
+        TLS1_RFC_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
+        TLS1_CK_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+#endif
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_AES_128_CBC_SHA,
+        TLS1_RFC_RSA_PSK_WITH_AES_128_CBC_SHA,
+        TLS1_CK_RSA_PSK_WITH_AES_128_CBC_SHA,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_AES_256_CBC_SHA,
+        TLS1_RFC_RSA_PSK_WITH_AES_256_CBC_SHA,
+        TLS1_CK_RSA_PSK_WITH_AES_256_CBC_SHA,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_AES_128_GCM_SHA256,
+        TLS1_RFC_PSK_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_PSK_WITH_AES_128_GCM_SHA256,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_AES_256_GCM_SHA384,
+        TLS1_RFC_PSK_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_PSK_WITH_AES_256_GCM_SHA384,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_AES_128_GCM_SHA256,
+        TLS1_RFC_DHE_PSK_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_DHE_PSK_WITH_AES_128_GCM_SHA256,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_AES_256_GCM_SHA384,
+        TLS1_RFC_DHE_PSK_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_DHE_PSK_WITH_AES_256_GCM_SHA384,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_AES_128_GCM_SHA256,
+        TLS1_RFC_RSA_PSK_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_RSA_PSK_WITH_AES_128_GCM_SHA256,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_AES_256_GCM_SHA384,
+        TLS1_RFC_RSA_PSK_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_RSA_PSK_WITH_AES_256_GCM_SHA384,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_AES_128_CBC_SHA256,
+        TLS1_RFC_PSK_WITH_AES_128_CBC_SHA256,
+        TLS1_CK_PSK_WITH_AES_128_CBC_SHA256,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_AES128,
+        SSL_SHA256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_AES_256_CBC_SHA384,
+        TLS1_RFC_PSK_WITH_AES_256_CBC_SHA384,
+        TLS1_CK_PSK_WITH_AES_256_CBC_SHA384,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_AES256,
+        SSL_SHA384,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        TLS1_TXT_PSK_WITH_NULL_SHA256,
+        TLS1_RFC_PSK_WITH_NULL_SHA256,
+        TLS1_CK_PSK_WITH_NULL_SHA256,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_eNULL,
+        SSL_SHA256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_NULL_SHA384,
+        TLS1_RFC_PSK_WITH_NULL_SHA384,
+        TLS1_CK_PSK_WITH_NULL_SHA384,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_eNULL,
+        SSL_SHA384,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        0,
+        0,
+    },
+#endif
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_AES_128_CBC_SHA256,
+        TLS1_RFC_DHE_PSK_WITH_AES_128_CBC_SHA256,
+        TLS1_CK_DHE_PSK_WITH_AES_128_CBC_SHA256,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_AES128,
+        SSL_SHA256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_AES_256_CBC_SHA384,
+        TLS1_RFC_DHE_PSK_WITH_AES_256_CBC_SHA384,
+        TLS1_CK_DHE_PSK_WITH_AES_256_CBC_SHA384,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_AES256,
+        SSL_SHA384,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_NULL_SHA256,
+        TLS1_RFC_DHE_PSK_WITH_NULL_SHA256,
+        TLS1_CK_DHE_PSK_WITH_NULL_SHA256,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_eNULL,
+        SSL_SHA256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_NULL_SHA384,
+        TLS1_RFC_DHE_PSK_WITH_NULL_SHA384,
+        TLS1_CK_DHE_PSK_WITH_NULL_SHA384,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_eNULL,
+        SSL_SHA384,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        0,
+        0,
+    },
+#endif
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_AES_128_CBC_SHA256,
+        TLS1_RFC_RSA_PSK_WITH_AES_128_CBC_SHA256,
+        TLS1_CK_RSA_PSK_WITH_AES_128_CBC_SHA256,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_AES_256_CBC_SHA384,
+        TLS1_RFC_RSA_PSK_WITH_AES_256_CBC_SHA384,
+        TLS1_CK_RSA_PSK_WITH_AES_256_CBC_SHA384,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA384,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_NULL_SHA256,
+        TLS1_RFC_RSA_PSK_WITH_NULL_SHA256,
+        TLS1_CK_RSA_PSK_WITH_NULL_SHA256,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_eNULL,
+        SSL_SHA256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_NULL_SHA384,
+        TLS1_RFC_RSA_PSK_WITH_NULL_SHA384,
+        TLS1_CK_RSA_PSK_WITH_NULL_SHA384,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_eNULL,
+        SSL_SHA384,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        0,
+        0,
+    },
+#endif
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
+    {
+        1,
+        TLS1_TXT_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA,
+        TLS1_RFC_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA,
+        TLS1_CK_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA,
+        SSL_kECDHEPSK,
+        SSL_aPSK,
+        SSL_3DES,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+#endif
+    {
+        1,
+        TLS1_TXT_ECDHE_PSK_WITH_AES_128_CBC_SHA,
+        TLS1_RFC_ECDHE_PSK_WITH_AES_128_CBC_SHA,
+        TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA,
+        SSL_kECDHEPSK,
+        SSL_aPSK,
+        SSL_AES128,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_PSK_WITH_AES_256_CBC_SHA,
+        TLS1_RFC_ECDHE_PSK_WITH_AES_256_CBC_SHA,
+        TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA,
+        SSL_kECDHEPSK,
+        SSL_aPSK,
+        SSL_AES256,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
+        TLS1_RFC_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
+        TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
+        SSL_kECDHEPSK,
+        SSL_aPSK,
+        SSL_AES128,
+        SSL_SHA256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
+        TLS1_RFC_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
+        TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
+        SSL_kECDHEPSK,
+        SSL_aPSK,
+        SSL_AES256,
+        SSL_SHA384,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA,
+        TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA,
+        TLS1_CK_ECDHE_PSK_WITH_NULL_SHA,
+        SSL_kECDHEPSK,
+        SSL_aPSK,
+        SSL_eNULL,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA256,
+        TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA256,
+        TLS1_CK_ECDHE_PSK_WITH_NULL_SHA256,
+        SSL_kECDHEPSK,
+        SSL_aPSK,
+        SSL_eNULL,
+        SSL_SHA256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        0,
+        0,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA384,
+        TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA384,
+        TLS1_CK_ECDHE_PSK_WITH_NULL_SHA384,
+        SSL_kECDHEPSK,
+        SSL_aPSK,
+        SSL_eNULL,
+        SSL_SHA384,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_STRONG_NONE | SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        0,
+        0,
+    },
+#endif
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
+    {
+        1,
+        TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
+        TLS1_RFC_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
+        TLS1_CK_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
+        SSL_kSRP,
+        SSL_aSRP,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+    {
+        1,
+        TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
+        TLS1_RFC_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
+        TLS1_CK_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
+        SSL_kSRP,
+        SSL_aRSA,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+    {
+        1,
+        TLS1_TXT_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
+        TLS1_RFC_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
+        TLS1_CK_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
+        SSL_kSRP,
+        SSL_aDSS,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        112,
+        168,
+    },
+#endif
+    {
+        1,
+        TLS1_TXT_SRP_SHA_WITH_AES_128_CBC_SHA,
+        TLS1_RFC_SRP_SHA_WITH_AES_128_CBC_SHA,
+        TLS1_CK_SRP_SHA_WITH_AES_128_CBC_SHA,
+        SSL_kSRP,
+        SSL_aSRP,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
+        TLS1_RFC_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
+        TLS1_CK_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
+        SSL_kSRP,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
+        TLS1_RFC_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
+        TLS1_CK_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
+        SSL_kSRP,
+        SSL_aDSS,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_SRP_SHA_WITH_AES_256_CBC_SHA,
+        TLS1_RFC_SRP_SHA_WITH_AES_256_CBC_SHA,
+        TLS1_CK_SRP_SHA_WITH_AES_256_CBC_SHA,
+        SSL_kSRP,
+        SSL_aSRP,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
+        TLS1_RFC_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
+        TLS1_CK_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
+        SSL_kSRP,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_SRP_SHA_DSS_WITH_AES_256_CBC_SHA,
+        TLS1_RFC_SRP_SHA_DSS_WITH_AES_256_CBC_SHA,
+        TLS1_CK_SRP_SHA_DSS_WITH_AES_256_CBC_SHA,
+        SSL_kSRP,
+        SSL_aDSS,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305,
+        TLS1_RFC_DHE_RSA_WITH_CHACHA20_POLY1305,
+        TLS1_CK_DHE_RSA_WITH_CHACHA20_POLY1305,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_CHACHA20POLY1305,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305,
+        TLS1_RFC_ECDHE_RSA_WITH_CHACHA20_POLY1305,
+        TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_CHACHA20POLY1305,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
+        TLS1_RFC_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
+        TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_CHACHA20POLY1305,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_CHACHA20_POLY1305,
+        TLS1_RFC_PSK_WITH_CHACHA20_POLY1305,
+        TLS1_CK_PSK_WITH_CHACHA20_POLY1305,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_CHACHA20POLY1305,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_PSK_WITH_CHACHA20_POLY1305,
+        TLS1_RFC_ECDHE_PSK_WITH_CHACHA20_POLY1305,
+        TLS1_CK_ECDHE_PSK_WITH_CHACHA20_POLY1305,
+        SSL_kECDHEPSK,
+        SSL_aPSK,
+        SSL_CHACHA20POLY1305,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_CHACHA20_POLY1305,
+        TLS1_RFC_DHE_PSK_WITH_CHACHA20_POLY1305,
+        TLS1_CK_DHE_PSK_WITH_CHACHA20_POLY1305,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_CHACHA20POLY1305,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_CHACHA20_POLY1305,
+        TLS1_RFC_RSA_PSK_WITH_CHACHA20_POLY1305,
+        TLS1_CK_RSA_PSK_WITH_CHACHA20_POLY1305,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_CHACHA20POLY1305,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+
+    {
+        1,
+        TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_RFC_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_CAMELLIA128,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_RFC_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_CAMELLIA128,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_RFC_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_CAMELLIA128,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_RFC_ADH_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA256,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_CAMELLIA128,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+        TLS1_RFC_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+        TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_CAMELLIA256,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256,
+        TLS1_RFC_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256,
+        TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_CAMELLIA256,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+        TLS1_RFC_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+        TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_CAMELLIA256,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA256,
+        TLS1_RFC_ADH_WITH_CAMELLIA_256_CBC_SHA256,
+        TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA256,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_CAMELLIA256,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA,
+        TLS1_RFC_RSA_WITH_CAMELLIA_256_CBC_SHA,
+        TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_CAMELLIA256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
+        TLS1_RFC_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
+        TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_CAMELLIA256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
+        TLS1_RFC_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
+        TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_CAMELLIA256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA,
+        TLS1_RFC_ADH_WITH_CAMELLIA_256_CBC_SHA,
+        TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_CAMELLIA256,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA,
+        TLS1_RFC_RSA_WITH_CAMELLIA_128_CBC_SHA,
+        TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_CAMELLIA128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
+        TLS1_RFC_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
+        TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_CAMELLIA128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
+        TLS1_RFC_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
+        TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_CAMELLIA128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA,
+        TLS1_RFC_ADH_WITH_CAMELLIA_128_CBC_SHA,
+        TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_CAMELLIA128,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_RFC_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_CAMELLIA128,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
+        TLS1_RFC_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
+        TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_CAMELLIA256,
+        SSL_SHA384,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_RFC_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_CK_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_CAMELLIA128,
+        SSL_SHA256,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384,
+        TLS1_RFC_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384,
+        TLS1_CK_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_CAMELLIA256,
+        SSL_SHA384,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_RFC_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_CK_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_CAMELLIA128,
+        SSL_SHA256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+        TLS1_RFC_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+        TLS1_CK_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_CAMELLIA256,
+        SSL_SHA384,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_RFC_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_CK_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_CAMELLIA128,
+        SSL_SHA256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+        TLS1_RFC_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+        TLS1_CK_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_CAMELLIA256,
+        SSL_SHA384,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_RFC_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_CK_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_CAMELLIA128,
+        SSL_SHA256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+        TLS1_RFC_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+        TLS1_CK_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_CAMELLIA256,
+        SSL_SHA384,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_RFC_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+        TLS1_CK_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
+        SSL_kECDHEPSK,
+        SSL_aPSK,
+        SSL_CAMELLIA128,
+        SSL_SHA256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+        TLS1_RFC_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+        TLS1_CK_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
+        SSL_kECDHEPSK,
+        SSL_aPSK,
+        SSL_CAMELLIA256,
+        SSL_SHA384,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+
+#ifndef OPENSSL_NO_GOST
+    {
+        1,
+        "GOST2001-GOST89-GOST89",
+        "TLS_GOSTR341001_WITH_28147_CNT_IMIT",
+        0x3000081,
+        SSL_kGOST,
+        SSL_aGOST01,
+        SSL_eGOST2814789CNT,
+        SSL_GOST89MAC,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_GOST94 | TLS1_PRF_GOST94 | TLS1_STREAM_MAC,
+        256,
+        256,
+    },
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        "GOST2001-NULL-GOST94",
+        "TLS_GOSTR341001_WITH_NULL_GOSTR3411",
+        0x3000083,
+        SSL_kGOST,
+        SSL_aGOST01,
+        SSL_eNULL,
+        SSL_GOST94,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_STRONG_NONE,
+        SSL_HANDSHAKE_MAC_GOST94 | TLS1_PRF_GOST94,
+        0,
+        0,
+    },
+#endif
+    {
+        1,
+        "IANA-GOST2012-GOST8912-GOST8912",
+        NULL,
+        0x0300c102,
+        SSL_kGOST,
+        SSL_aGOST12 | SSL_aGOST01,
+        SSL_eGOST2814789CNT12,
+        SSL_GOST89MAC12,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_STREAM_MAC,
+        256,
+        256,
+    },
+    {
+        1,
+        "LEGACY-GOST2012-GOST8912-GOST8912",
+        NULL,
+        0x0300ff85,
+        SSL_kGOST,
+        SSL_aGOST12 | SSL_aGOST01,
+        SSL_eGOST2814789CNT12,
+        SSL_GOST89MAC12,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_STREAM_MAC,
+        256,
+        256,
+    },
+#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
+    {
+        1,
+        "GOST2012-NULL-GOST12",
+        NULL,
+        0x0300ff87,
+        SSL_kGOST,
+        SSL_aGOST12 | SSL_aGOST01,
+        SSL_eNULL,
+        SSL_GOST12_256,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_STRONG_NONE,
+        SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_STREAM_MAC,
+        0,
+        0,
+    },
+#endif
+    {
+        1,
+        "GOST2012-KUZNYECHIK-KUZNYECHIKOMAC",
+        NULL,
+        0x0300C100,
+        SSL_kGOST18,
+        SSL_aGOST12,
+        SSL_KUZNYECHIK,
+        SSL_KUZNYECHIKOMAC,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_TLSTREE,
+        256,
+        256,
+    },
+    {
+        1,
+        "GOST2012-MAGMA-MAGMAOMAC",
+        NULL,
+        0x0300C101,
+        SSL_kGOST18,
+        SSL_aGOST12,
+        SSL_MAGMA,
+        SSL_MAGMAOMAC,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_HIGH,
+        SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_TLSTREE,
+        256,
+        256,
+    },
+#endif /* OPENSSL_NO_GOST */
+
+    {
+        1,
+        SSL3_TXT_RSA_IDEA_128_SHA,
+        SSL3_RFC_RSA_IDEA_128_SHA,
+        SSL3_CK_RSA_IDEA_128_SHA,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_IDEA,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_1_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+
+    {
+        1,
+        TLS1_TXT_RSA_WITH_SEED_SHA,
+        TLS1_RFC_RSA_WITH_SEED_SHA,
+        TLS1_CK_RSA_WITH_SEED_SHA,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_SEED,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_SEED_SHA,
+        TLS1_RFC_DHE_DSS_WITH_SEED_SHA,
+        TLS1_CK_DHE_DSS_WITH_SEED_SHA,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_SEED,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_SEED_SHA,
+        TLS1_RFC_DHE_RSA_WITH_SEED_SHA,
+        TLS1_CK_DHE_RSA_WITH_SEED_SHA,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_SEED,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ADH_WITH_SEED_SHA,
+        TLS1_RFC_ADH_WITH_SEED_SHA,
+        TLS1_CK_ADH_WITH_SEED_SHA,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_SEED,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_BAD_VER,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        128,
+        128,
+    },
+
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
+    {
+        1,
+        SSL3_TXT_RSA_RC4_128_MD5,
+        SSL3_RFC_RSA_RC4_128_MD5,
+        SSL3_CK_RSA_RC4_128_MD5,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_RC4,
+        SSL_MD5,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        80,
+        128,
+    },
+    {
+        1,
+        SSL3_TXT_RSA_RC4_128_SHA,
+        SSL3_RFC_RSA_RC4_128_SHA,
+        SSL3_CK_RSA_RC4_128_SHA,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_RC4,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        80,
+        128,
+    },
+    {
+        1,
+        SSL3_TXT_ADH_RC4_128_MD5,
+        SSL3_RFC_ADH_RC4_128_MD5,
+        SSL3_CK_ADH_RC4_128_MD5,
+        SSL_kDHE,
+        SSL_aNULL,
+        SSL_RC4,
+        SSL_MD5,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        80,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_PSK_WITH_RC4_128_SHA,
+        TLS1_RFC_ECDHE_PSK_WITH_RC4_128_SHA,
+        TLS1_CK_ECDHE_PSK_WITH_RC4_128_SHA,
+        SSL_kECDHEPSK,
+        SSL_aPSK,
+        SSL_RC4,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        80,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA,
+        TLS1_RFC_ECDH_anon_WITH_RC4_128_SHA,
+        TLS1_CK_ECDH_anon_WITH_RC4_128_SHA,
+        SSL_kECDHE,
+        SSL_aNULL,
+        SSL_RC4,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        80,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA,
+        TLS1_RFC_ECDHE_ECDSA_WITH_RC4_128_SHA,
+        TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_RC4,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        80,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA,
+        TLS1_RFC_ECDHE_RSA_WITH_RC4_128_SHA,
+        TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_RC4,
+        SSL_SHA1,
+        TLS1_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        80,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_RC4_128_SHA,
+        TLS1_RFC_PSK_WITH_RC4_128_SHA,
+        TLS1_CK_PSK_WITH_RC4_128_SHA,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_RC4,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        80,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_RC4_128_SHA,
+        TLS1_RFC_RSA_PSK_WITH_RC4_128_SHA,
+        TLS1_CK_RSA_PSK_WITH_RC4_128_SHA,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_RC4,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        80,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_PSK_WITH_RC4_128_SHA,
+        TLS1_RFC_DHE_PSK_WITH_RC4_128_SHA,
+        TLS1_CK_DHE_PSK_WITH_RC4_128_SHA,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_RC4,
+        SSL_SHA1,
+        SSL3_VERSION,
+        TLS1_2_VERSION,
+        0,
+        0,
+        SSL_NOT_DEFAULT | SSL_MEDIUM,
+        SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
+        80,
+        128,
+    },
+#endif /* OPENSSL_NO_WEAK_SSL_CIPHERS */
+
+    {
+        1,
+        TLS1_TXT_RSA_WITH_ARIA_128_GCM_SHA256,
+        TLS1_RFC_RSA_WITH_ARIA_128_GCM_SHA256,
+        TLS1_CK_RSA_WITH_ARIA_128_GCM_SHA256,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_ARIA128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_WITH_ARIA_256_GCM_SHA384,
+        TLS1_RFC_RSA_WITH_ARIA_256_GCM_SHA384,
+        TLS1_CK_RSA_WITH_ARIA_256_GCM_SHA384,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_ARIA256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_ARIA_128_GCM_SHA256,
+        TLS1_RFC_DHE_RSA_WITH_ARIA_128_GCM_SHA256,
+        TLS1_CK_DHE_RSA_WITH_ARIA_128_GCM_SHA256,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_ARIA128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_ARIA_256_GCM_SHA384,
+        TLS1_RFC_DHE_RSA_WITH_ARIA_256_GCM_SHA384,
+        TLS1_CK_DHE_RSA_WITH_ARIA_256_GCM_SHA384,
+        SSL_kDHE,
+        SSL_aRSA,
+        SSL_ARIA256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_ARIA_128_GCM_SHA256,
+        TLS1_RFC_DHE_DSS_WITH_ARIA_128_GCM_SHA256,
+        TLS1_CK_DHE_DSS_WITH_ARIA_128_GCM_SHA256,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_ARIA128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_ARIA_256_GCM_SHA384,
+        TLS1_RFC_DHE_DSS_WITH_ARIA_256_GCM_SHA384,
+        TLS1_CK_DHE_DSS_WITH_ARIA_256_GCM_SHA384,
+        SSL_kDHE,
+        SSL_aDSS,
+        SSL_ARIA256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256,
+        TLS1_RFC_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256,
+        TLS1_CK_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_ARIA128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384,
+        TLS1_RFC_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384,
+        TLS1_CK_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384,
+        SSL_kECDHE,
+        SSL_aECDSA,
+        SSL_ARIA256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256,
+        TLS1_RFC_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256,
+        TLS1_CK_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_ARIA128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
         128,
         128,
-    }, {
+    },
+    {
         1,
-        TLS1_3_RFC_AES_256_GCM_SHA384,
-        TLS1_3_RFC_AES_256_GCM_SHA384,
-        TLS1_3_CK_AES_256_GCM_SHA384,
-        SSL_kANY,
-        SSL_aANY,
-        SSL_AES256GCM,
+        TLS1_TXT_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384,
+        TLS1_RFC_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384,
+        TLS1_CK_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384,
+        SSL_kECDHE,
+        SSL_aRSA,
+        SSL_ARIA256GCM,
         SSL_AEAD,
-        TLS1_3_VERSION, TLS1_3_VERSION,
-        0, 0,
-        SSL_HIGH,
-        SSL_HANDSHAKE_MAC_SHA384 | SSL_QUIC,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
         256,
         256,
     },
     {
         1,
-        TLS1_3_RFC_CHACHA20_POLY1305_SHA256,
-        TLS1_3_RFC_CHACHA20_POLY1305_SHA256,
-        TLS1_3_CK_CHACHA20_POLY1305_SHA256,
-        SSL_kANY,
-        SSL_aANY,
-        SSL_CHACHA20POLY1305,
+        TLS1_TXT_PSK_WITH_ARIA_128_GCM_SHA256,
+        TLS1_RFC_PSK_WITH_ARIA_128_GCM_SHA256,
+        TLS1_CK_PSK_WITH_ARIA_128_GCM_SHA256,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_ARIA128GCM,
         SSL_AEAD,
-        TLS1_3_VERSION, TLS1_3_VERSION,
-        0, 0,
-        SSL_HIGH,
-        SSL_HANDSHAKE_MAC_SHA256 | SSL_QUIC,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
+        128,
+    },
+    {
+        1,
+        TLS1_TXT_PSK_WITH_ARIA_256_GCM_SHA384,
+        TLS1_RFC_PSK_WITH_ARIA_256_GCM_SHA384,
+        TLS1_CK_PSK_WITH_ARIA_256_GCM_SHA384,
+        SSL_kPSK,
+        SSL_aPSK,
+        SSL_ARIA256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
         256,
         256,
     },
     {
         1,
-        TLS1_3_RFC_AES_128_CCM_SHA256,
-        TLS1_3_RFC_AES_128_CCM_SHA256,
-        TLS1_3_CK_AES_128_CCM_SHA256,
-        SSL_kANY,
-        SSL_aANY,
-        SSL_AES128CCM,
+        TLS1_TXT_DHE_PSK_WITH_ARIA_128_GCM_SHA256,
+        TLS1_RFC_DHE_PSK_WITH_ARIA_128_GCM_SHA256,
+        TLS1_CK_DHE_PSK_WITH_ARIA_128_GCM_SHA256,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_ARIA128GCM,
         SSL_AEAD,
-        TLS1_3_VERSION, TLS1_3_VERSION,
-        0, 0,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
         SSL_NOT_DEFAULT | SSL_HIGH,
-        SSL_HANDSHAKE_MAC_SHA256,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
         128,
         128,
-    }, {
+    },
+    {
         1,
-        TLS1_3_RFC_AES_128_CCM_8_SHA256,
-        TLS1_3_RFC_AES_128_CCM_8_SHA256,
-        TLS1_3_CK_AES_128_CCM_8_SHA256,
-        SSL_kANY,
-        SSL_aANY,
-        SSL_AES128CCM8,
+        TLS1_TXT_DHE_PSK_WITH_ARIA_256_GCM_SHA384,
+        TLS1_RFC_DHE_PSK_WITH_ARIA_256_GCM_SHA384,
+        TLS1_CK_DHE_PSK_WITH_ARIA_256_GCM_SHA384,
+        SSL_kDHEPSK,
+        SSL_aPSK,
+        SSL_ARIA256GCM,
         SSL_AEAD,
-        TLS1_3_VERSION, TLS1_3_VERSION,
-        0, 0,
-        SSL_NOT_DEFAULT | SSL_MEDIUM,
-        SSL_HANDSHAKE_MAC_SHA256,
-        64, /* CCM8 uses a short tag, so we have a low security strength */
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
+        256,
+    },
+    {
+        1,
+        TLS1_TXT_RSA_PSK_WITH_ARIA_128_GCM_SHA256,
+        TLS1_RFC_RSA_PSK_WITH_ARIA_128_GCM_SHA256,
+        TLS1_CK_RSA_PSK_WITH_ARIA_128_GCM_SHA256,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_ARIA128GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
+        128,
         128,
     },
-#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
     {
         1,
-        TLS1_3_RFC_SHA256_SHA256,
-        TLS1_3_RFC_SHA256_SHA256,
-        TLS1_3_CK_SHA256_SHA256,
-        SSL_kANY,
-        SSL_aANY,
-        SSL_eNULL,
-        SSL_SHA256,
-        TLS1_3_VERSION, TLS1_3_VERSION,
-        0, 0,
-        SSL_NOT_DEFAULT | SSL_STRONG_NONE,
-        SSL_HANDSHAKE_MAC_SHA256,
-        0,
+        TLS1_TXT_RSA_PSK_WITH_ARIA_256_GCM_SHA384,
+        TLS1_RFC_RSA_PSK_WITH_ARIA_256_GCM_SHA384,
+        TLS1_CK_RSA_PSK_WITH_ARIA_256_GCM_SHA384,
+        SSL_kRSAPSK,
+        SSL_aRSA,
+        SSL_ARIA256GCM,
+        SSL_AEAD,
+        TLS1_2_VERSION,
+        TLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        DTLS1_2_VERSION,
+        SSL_NOT_DEFAULT | SSL_HIGH,
+        SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
+        256,
         256,
-    }, {
-        1,
-        TLS1_3_RFC_SHA384_SHA384,
-        TLS1_3_RFC_SHA384_SHA384,
-        TLS1_3_CK_SHA384_SHA384,
-        SSL_kANY,
-        SSL_aANY,
-        SSL_eNULL,
-        SSL_SHA384,
-        TLS1_3_VERSION, TLS1_3_VERSION,
-        0, 0,
-        SSL_NOT_DEFAULT | SSL_STRONG_NONE,
-        SSL_HANDSHAKE_MAC_SHA384,
-        0,
-        384,
     },
-#endif
-};
-
-/*
- * The list of available ciphers, mostly organized into the following
- * groups:
- *      Always there
- *      EC
- *      PSK
- *      SRP (within that: RSA EC PSK)
- *      Cipher families: Chacha/poly, Camellia, Gost, IDEA, SEED
- *      Weak ciphers
- */
-static SSL_CIPHER ssl3_ciphers[] = {
-#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
-    {
-     1,
-     SSL3_TXT_RSA_NULL_MD5,
-     SSL3_RFC_RSA_NULL_MD5,
-     SSL3_CK_RSA_NULL_MD5,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_eNULL,
-     SSL_MD5,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-    {
-     1,
-     SSL3_TXT_RSA_NULL_SHA,
-     SSL3_RFC_RSA_NULL_SHA,
-     SSL3_CK_RSA_NULL_SHA,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_eNULL,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-#endif
-#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-    {
-     1,
-     SSL3_TXT_RSA_DES_192_CBC3_SHA,
-     SSL3_RFC_RSA_DES_192_CBC3_SHA,
-     SSL3_CK_RSA_DES_192_CBC3_SHA,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_3DES,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-    {
-     1,
-     SSL3_TXT_DHE_DSS_DES_192_CBC3_SHA,
-     SSL3_RFC_DHE_DSS_DES_192_CBC3_SHA,
-     SSL3_CK_DHE_DSS_DES_192_CBC3_SHA,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_3DES,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-    {
-     1,
-     SSL3_TXT_DHE_RSA_DES_192_CBC3_SHA,
-     SSL3_RFC_DHE_RSA_DES_192_CBC3_SHA,
-     SSL3_CK_DHE_RSA_DES_192_CBC3_SHA,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_3DES,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-    {
-     1,
-     SSL3_TXT_ADH_DES_192_CBC_SHA,
-     SSL3_RFC_ADH_DES_192_CBC_SHA,
-     SSL3_CK_ADH_DES_192_CBC_SHA,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_3DES,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-#endif
-    {
-     1,
-     TLS1_TXT_RSA_WITH_AES_128_SHA,
-     TLS1_RFC_RSA_WITH_AES_128_SHA,
-     TLS1_CK_RSA_WITH_AES_128_SHA,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_AES128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_AES_128_SHA,
-     TLS1_RFC_DHE_DSS_WITH_AES_128_SHA,
-     TLS1_CK_DHE_DSS_WITH_AES_128_SHA,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_AES128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_AES_128_SHA,
-     TLS1_RFC_DHE_RSA_WITH_AES_128_SHA,
-     TLS1_CK_DHE_RSA_WITH_AES_128_SHA,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_AES128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ADH_WITH_AES_128_SHA,
-     TLS1_RFC_ADH_WITH_AES_128_SHA,
-     TLS1_CK_ADH_WITH_AES_128_SHA,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_AES128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_WITH_AES_256_SHA,
-     TLS1_RFC_RSA_WITH_AES_256_SHA,
-     TLS1_CK_RSA_WITH_AES_256_SHA,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_AES256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_AES_256_SHA,
-     TLS1_RFC_DHE_DSS_WITH_AES_256_SHA,
-     TLS1_CK_DHE_DSS_WITH_AES_256_SHA,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_AES256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_AES_256_SHA,
-     TLS1_RFC_DHE_RSA_WITH_AES_256_SHA,
-     TLS1_CK_DHE_RSA_WITH_AES_256_SHA,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_AES256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ADH_WITH_AES_256_SHA,
-     TLS1_RFC_ADH_WITH_AES_256_SHA,
-     TLS1_CK_ADH_WITH_AES_256_SHA,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_AES256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
-    {
-     1,
-     TLS1_TXT_RSA_WITH_NULL_SHA256,
-     TLS1_RFC_RSA_WITH_NULL_SHA256,
-     TLS1_CK_RSA_WITH_NULL_SHA256,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_eNULL,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-#endif
-    {
-     1,
-     TLS1_TXT_RSA_WITH_AES_128_SHA256,
-     TLS1_RFC_RSA_WITH_AES_128_SHA256,
-     TLS1_CK_RSA_WITH_AES_128_SHA256,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_AES128,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_WITH_AES_256_SHA256,
-     TLS1_RFC_RSA_WITH_AES_256_SHA256,
-     TLS1_CK_RSA_WITH_AES_256_SHA256,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_AES256,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256,
-     TLS1_RFC_DHE_DSS_WITH_AES_128_SHA256,
-     TLS1_CK_DHE_DSS_WITH_AES_128_SHA256,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_AES128,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256,
-     TLS1_RFC_DHE_RSA_WITH_AES_128_SHA256,
-     TLS1_CK_DHE_RSA_WITH_AES_128_SHA256,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_AES128,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_AES_256_SHA256,
-     TLS1_RFC_DHE_DSS_WITH_AES_256_SHA256,
-     TLS1_CK_DHE_DSS_WITH_AES_256_SHA256,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_AES256,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256,
-     TLS1_RFC_DHE_RSA_WITH_AES_256_SHA256,
-     TLS1_CK_DHE_RSA_WITH_AES_256_SHA256,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_AES256,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ADH_WITH_AES_128_SHA256,
-     TLS1_RFC_ADH_WITH_AES_128_SHA256,
-     TLS1_CK_ADH_WITH_AES_128_SHA256,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_AES128,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ADH_WITH_AES_256_SHA256,
-     TLS1_RFC_ADH_WITH_AES_256_SHA256,
-     TLS1_CK_ADH_WITH_AES_256_SHA256,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_AES256,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_WITH_AES_128_GCM_SHA256,
-     TLS1_RFC_RSA_WITH_AES_128_GCM_SHA256,
-     TLS1_CK_RSA_WITH_AES_128_GCM_SHA256,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_AES128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_WITH_AES_256_GCM_SHA384,
-     TLS1_RFC_RSA_WITH_AES_256_GCM_SHA384,
-     TLS1_CK_RSA_WITH_AES_256_GCM_SHA384,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_AES256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256,
-     TLS1_RFC_DHE_RSA_WITH_AES_128_GCM_SHA256,
-     TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_AES128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384,
-     TLS1_RFC_DHE_RSA_WITH_AES_256_GCM_SHA384,
-     TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_AES256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_AES_128_GCM_SHA256,
-     TLS1_RFC_DHE_DSS_WITH_AES_128_GCM_SHA256,
-     TLS1_CK_DHE_DSS_WITH_AES_128_GCM_SHA256,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_AES128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_AES_256_GCM_SHA384,
-     TLS1_RFC_DHE_DSS_WITH_AES_256_GCM_SHA384,
-     TLS1_CK_DHE_DSS_WITH_AES_256_GCM_SHA384,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_AES256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ADH_WITH_AES_128_GCM_SHA256,
-     TLS1_RFC_ADH_WITH_AES_128_GCM_SHA256,
-     TLS1_CK_ADH_WITH_AES_128_GCM_SHA256,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_AES128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384,
-     TLS1_RFC_ADH_WITH_AES_256_GCM_SHA384,
-     TLS1_CK_ADH_WITH_AES_256_GCM_SHA384,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_AES256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_WITH_AES_128_CCM,
-     TLS1_RFC_RSA_WITH_AES_128_CCM,
-     TLS1_CK_RSA_WITH_AES_128_CCM,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_AES128CCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_WITH_AES_256_CCM,
-     TLS1_RFC_RSA_WITH_AES_256_CCM,
-     TLS1_CK_RSA_WITH_AES_256_CCM,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_AES256CCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_AES_128_CCM,
-     TLS1_RFC_DHE_RSA_WITH_AES_128_CCM,
-     TLS1_CK_DHE_RSA_WITH_AES_128_CCM,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_AES128CCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_AES_256_CCM,
-     TLS1_RFC_DHE_RSA_WITH_AES_256_CCM,
-     TLS1_CK_DHE_RSA_WITH_AES_256_CCM,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_AES256CCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_WITH_AES_128_CCM_8,
-     TLS1_RFC_RSA_WITH_AES_128_CCM_8,
-     TLS1_CK_RSA_WITH_AES_128_CCM_8,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_AES128CCM8,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     64, /* CCM8 uses a short tag, so we have a low security strength */
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_WITH_AES_256_CCM_8,
-     TLS1_RFC_RSA_WITH_AES_256_CCM_8,
-     TLS1_CK_RSA_WITH_AES_256_CCM_8,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_AES256CCM8,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     64, /* CCM8 uses a short tag, so we have a low security strength */
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_AES_128_CCM_8,
-     TLS1_RFC_DHE_RSA_WITH_AES_128_CCM_8,
-     TLS1_CK_DHE_RSA_WITH_AES_128_CCM_8,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_AES128CCM8,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     64, /* CCM8 uses a short tag, so we have a low security strength */
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_AES_256_CCM_8,
-     TLS1_RFC_DHE_RSA_WITH_AES_256_CCM_8,
-     TLS1_CK_DHE_RSA_WITH_AES_256_CCM_8,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_AES256CCM8,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     64, /* CCM8 uses a short tag, so we have a low security strength */
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_AES_128_CCM,
-     TLS1_RFC_PSK_WITH_AES_128_CCM,
-     TLS1_CK_PSK_WITH_AES_128_CCM,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_AES128CCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_AES_256_CCM,
-     TLS1_RFC_PSK_WITH_AES_256_CCM,
-     TLS1_CK_PSK_WITH_AES_256_CCM,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_AES256CCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_AES_128_CCM,
-     TLS1_RFC_DHE_PSK_WITH_AES_128_CCM,
-     TLS1_CK_DHE_PSK_WITH_AES_128_CCM,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_AES128CCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_AES_256_CCM,
-     TLS1_RFC_DHE_PSK_WITH_AES_256_CCM,
-     TLS1_CK_DHE_PSK_WITH_AES_256_CCM,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_AES256CCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_AES_128_CCM_8,
-     TLS1_RFC_PSK_WITH_AES_128_CCM_8,
-     TLS1_CK_PSK_WITH_AES_128_CCM_8,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_AES128CCM8,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     64, /* CCM8 uses a short tag, so we have a low security strength */
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_AES_256_CCM_8,
-     TLS1_RFC_PSK_WITH_AES_256_CCM_8,
-     TLS1_CK_PSK_WITH_AES_256_CCM_8,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_AES256CCM8,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     64, /* CCM8 uses a short tag, so we have a low security strength */
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_AES_128_CCM_8,
-     TLS1_RFC_DHE_PSK_WITH_AES_128_CCM_8,
-     TLS1_CK_DHE_PSK_WITH_AES_128_CCM_8,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_AES128CCM8,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     64, /* CCM8 uses a short tag, so we have a low security strength */
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_AES_256_CCM_8,
-     TLS1_RFC_DHE_PSK_WITH_AES_256_CCM_8,
-     TLS1_CK_DHE_PSK_WITH_AES_256_CCM_8,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_AES256CCM8,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     64, /* CCM8 uses a short tag, so we have a low security strength */
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CCM,
-     TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CCM,
-     TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CCM,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_AES128CCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM,
-     TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CCM,
-     TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CCM,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_AES256CCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CCM_8,
-     TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CCM_8,
-     TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CCM_8,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_AES128CCM8,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     64, /* CCM8 uses a short tag, so we have a low security strength */
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM_8,
-     TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CCM_8,
-     TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CCM_8,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_AES256CCM8,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     64, /* CCM8 uses a short tag, so we have a low security strength */
-     256,
-     },
-#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA,
-     TLS1_RFC_ECDHE_ECDSA_WITH_NULL_SHA,
-     TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_eNULL,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-#endif
-# ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA,
-     TLS1_RFC_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA,
-     TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_3DES,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-# endif
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-     TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-     TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_AES128,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-     TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-     TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_AES256,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA,
-     TLS1_RFC_ECDHE_RSA_WITH_NULL_SHA,
-     TLS1_CK_ECDHE_RSA_WITH_NULL_SHA,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_eNULL,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-#endif
-# ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA,
-     TLS1_RFC_ECDHE_RSA_WITH_DES_192_CBC3_SHA,
-     TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_3DES,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-# endif
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-     TLS1_RFC_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-     TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_AES128,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-     TLS1_RFC_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-     TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_AES256,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
-    {
-     1,
-     TLS1_TXT_ECDH_anon_WITH_NULL_SHA,
-     TLS1_RFC_ECDH_anon_WITH_NULL_SHA,
-     TLS1_CK_ECDH_anon_WITH_NULL_SHA,
-     SSL_kECDHE,
-     SSL_aNULL,
-     SSL_eNULL,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-#endif
-# ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-    {
-     1,
-     TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA,
-     TLS1_RFC_ECDH_anon_WITH_DES_192_CBC3_SHA,
-     TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA,
-     SSL_kECDHE,
-     SSL_aNULL,
-     SSL_3DES,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-# endif
-    {
-     1,
-     TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA,
-     TLS1_RFC_ECDH_anon_WITH_AES_128_CBC_SHA,
-     TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA,
-     SSL_kECDHE,
-     SSL_aNULL,
-     SSL_AES128,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA,
-     TLS1_RFC_ECDH_anon_WITH_AES_256_CBC_SHA,
-     TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA,
-     SSL_kECDHE,
-     SSL_aNULL,
-     SSL_AES256,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256,
-     TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_SHA256,
-     TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_AES128,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384,
-     TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_SHA384,
-     TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_AES256,
-     SSL_SHA384,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256,
-     TLS1_RFC_ECDHE_RSA_WITH_AES_128_SHA256,
-     TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_AES128,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384,
-     TLS1_RFC_ECDHE_RSA_WITH_AES_256_SHA384,
-     TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_AES256,
-     SSL_SHA384,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-     TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-     TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_AES128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-     TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-     TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_AES256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-     TLS1_RFC_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-     TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_AES128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-     TLS1_RFC_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-     TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_AES256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
-    {
-     1,
-     TLS1_TXT_PSK_WITH_NULL_SHA,
-     TLS1_RFC_PSK_WITH_NULL_SHA,
-     TLS1_CK_PSK_WITH_NULL_SHA,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_eNULL,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_NULL_SHA,
-     TLS1_RFC_DHE_PSK_WITH_NULL_SHA,
-     TLS1_CK_DHE_PSK_WITH_NULL_SHA,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_eNULL,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_NULL_SHA,
-     TLS1_RFC_RSA_PSK_WITH_NULL_SHA,
-     TLS1_CK_RSA_PSK_WITH_NULL_SHA,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_eNULL,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-#endif
-# ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-    {
-     1,
-     TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA,
-     TLS1_RFC_PSK_WITH_3DES_EDE_CBC_SHA,
-     TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_3DES,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-# endif
-    {
-     1,
-     TLS1_TXT_PSK_WITH_AES_128_CBC_SHA,
-     TLS1_RFC_PSK_WITH_AES_128_CBC_SHA,
-     TLS1_CK_PSK_WITH_AES_128_CBC_SHA,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_AES128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_AES_256_CBC_SHA,
-     TLS1_RFC_PSK_WITH_AES_256_CBC_SHA,
-     TLS1_CK_PSK_WITH_AES_256_CBC_SHA,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_AES256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-# ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_3DES_EDE_CBC_SHA,
-     TLS1_RFC_DHE_PSK_WITH_3DES_EDE_CBC_SHA,
-     TLS1_CK_DHE_PSK_WITH_3DES_EDE_CBC_SHA,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_3DES,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-# endif
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_AES_128_CBC_SHA,
-     TLS1_RFC_DHE_PSK_WITH_AES_128_CBC_SHA,
-     TLS1_CK_DHE_PSK_WITH_AES_128_CBC_SHA,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_AES128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_AES_256_CBC_SHA,
-     TLS1_RFC_DHE_PSK_WITH_AES_256_CBC_SHA,
-     TLS1_CK_DHE_PSK_WITH_AES_256_CBC_SHA,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_AES256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-# ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
-     TLS1_RFC_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
-     TLS1_CK_RSA_PSK_WITH_3DES_EDE_CBC_SHA,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_3DES,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-# endif
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_AES_128_CBC_SHA,
-     TLS1_RFC_RSA_PSK_WITH_AES_128_CBC_SHA,
-     TLS1_CK_RSA_PSK_WITH_AES_128_CBC_SHA,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_AES128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_AES_256_CBC_SHA,
-     TLS1_RFC_RSA_PSK_WITH_AES_256_CBC_SHA,
-     TLS1_CK_RSA_PSK_WITH_AES_256_CBC_SHA,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_AES256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_AES_128_GCM_SHA256,
-     TLS1_RFC_PSK_WITH_AES_128_GCM_SHA256,
-     TLS1_CK_PSK_WITH_AES_128_GCM_SHA256,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_AES128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_AES_256_GCM_SHA384,
-     TLS1_RFC_PSK_WITH_AES_256_GCM_SHA384,
-     TLS1_CK_PSK_WITH_AES_256_GCM_SHA384,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_AES256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_AES_128_GCM_SHA256,
-     TLS1_RFC_DHE_PSK_WITH_AES_128_GCM_SHA256,
-     TLS1_CK_DHE_PSK_WITH_AES_128_GCM_SHA256,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_AES128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_AES_256_GCM_SHA384,
-     TLS1_RFC_DHE_PSK_WITH_AES_256_GCM_SHA384,
-     TLS1_CK_DHE_PSK_WITH_AES_256_GCM_SHA384,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_AES256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_AES_128_GCM_SHA256,
-     TLS1_RFC_RSA_PSK_WITH_AES_128_GCM_SHA256,
-     TLS1_CK_RSA_PSK_WITH_AES_128_GCM_SHA256,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_AES128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_AES_256_GCM_SHA384,
-     TLS1_RFC_RSA_PSK_WITH_AES_256_GCM_SHA384,
-     TLS1_CK_RSA_PSK_WITH_AES_256_GCM_SHA384,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_AES256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_AES_128_CBC_SHA256,
-     TLS1_RFC_PSK_WITH_AES_128_CBC_SHA256,
-     TLS1_CK_PSK_WITH_AES_128_CBC_SHA256,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_AES128,
-     SSL_SHA256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_AES_256_CBC_SHA384,
-     TLS1_RFC_PSK_WITH_AES_256_CBC_SHA384,
-     TLS1_CK_PSK_WITH_AES_256_CBC_SHA384,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_AES256,
-     SSL_SHA384,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
-    {
-     1,
-     TLS1_TXT_PSK_WITH_NULL_SHA256,
-     TLS1_RFC_PSK_WITH_NULL_SHA256,
-     TLS1_CK_PSK_WITH_NULL_SHA256,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_eNULL,
-     SSL_SHA256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_NULL_SHA384,
-     TLS1_RFC_PSK_WITH_NULL_SHA384,
-     TLS1_CK_PSK_WITH_NULL_SHA384,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_eNULL,
-     SSL_SHA384,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     0,
-     0,
-     },
-#endif
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_AES_128_CBC_SHA256,
-     TLS1_RFC_DHE_PSK_WITH_AES_128_CBC_SHA256,
-     TLS1_CK_DHE_PSK_WITH_AES_128_CBC_SHA256,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_AES128,
-     SSL_SHA256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_AES_256_CBC_SHA384,
-     TLS1_RFC_DHE_PSK_WITH_AES_256_CBC_SHA384,
-     TLS1_CK_DHE_PSK_WITH_AES_256_CBC_SHA384,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_AES256,
-     SSL_SHA384,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_NULL_SHA256,
-     TLS1_RFC_DHE_PSK_WITH_NULL_SHA256,
-     TLS1_CK_DHE_PSK_WITH_NULL_SHA256,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_eNULL,
-     SSL_SHA256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_NULL_SHA384,
-     TLS1_RFC_DHE_PSK_WITH_NULL_SHA384,
-     TLS1_CK_DHE_PSK_WITH_NULL_SHA384,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_eNULL,
-     SSL_SHA384,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     0,
-     0,
-     },
-#endif
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_AES_128_CBC_SHA256,
-     TLS1_RFC_RSA_PSK_WITH_AES_128_CBC_SHA256,
-     TLS1_CK_RSA_PSK_WITH_AES_128_CBC_SHA256,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_AES128,
-     SSL_SHA256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_AES_256_CBC_SHA384,
-     TLS1_RFC_RSA_PSK_WITH_AES_256_CBC_SHA384,
-     TLS1_CK_RSA_PSK_WITH_AES_256_CBC_SHA384,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_AES256,
-     SSL_SHA384,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_NULL_SHA256,
-     TLS1_RFC_RSA_PSK_WITH_NULL_SHA256,
-     TLS1_CK_RSA_PSK_WITH_NULL_SHA256,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_eNULL,
-     SSL_SHA256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_NULL_SHA384,
-     TLS1_RFC_RSA_PSK_WITH_NULL_SHA384,
-     TLS1_CK_RSA_PSK_WITH_NULL_SHA384,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_eNULL,
-     SSL_SHA384,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     0,
-     0,
-     },
-#endif
-#  ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-    {
-     1,
-     TLS1_TXT_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA,
-     TLS1_RFC_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA,
-     TLS1_CK_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA,
-     SSL_kECDHEPSK,
-     SSL_aPSK,
-     SSL_3DES,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-#  endif
-    {
-     1,
-     TLS1_TXT_ECDHE_PSK_WITH_AES_128_CBC_SHA,
-     TLS1_RFC_ECDHE_PSK_WITH_AES_128_CBC_SHA,
-     TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA,
-     SSL_kECDHEPSK,
-     SSL_aPSK,
-     SSL_AES128,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_PSK_WITH_AES_256_CBC_SHA,
-     TLS1_RFC_ECDHE_PSK_WITH_AES_256_CBC_SHA,
-     TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA,
-     SSL_kECDHEPSK,
-     SSL_aPSK,
-     SSL_AES256,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
-     TLS1_RFC_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
-     TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
-     SSL_kECDHEPSK,
-     SSL_aPSK,
-     SSL_AES128,
-     SSL_SHA256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
-     TLS1_RFC_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
-     TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
-     SSL_kECDHEPSK,
-     SSL_aPSK,
-     SSL_AES256,
-     SSL_SHA384,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-#ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
-    {
-     1,
-     TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA,
-     TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA,
-     TLS1_CK_ECDHE_PSK_WITH_NULL_SHA,
-     SSL_kECDHEPSK,
-     SSL_aPSK,
-     SSL_eNULL,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA256,
-     TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA256,
-     TLS1_CK_ECDHE_PSK_WITH_NULL_SHA256,
-     SSL_kECDHEPSK,
-     SSL_aPSK,
-     SSL_eNULL,
-     SSL_SHA256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     0,
-     0,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA384,
-     TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA384,
-     TLS1_CK_ECDHE_PSK_WITH_NULL_SHA384,
-     SSL_kECDHEPSK,
-     SSL_aPSK,
-     SSL_eNULL,
-     SSL_SHA384,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_STRONG_NONE | SSL_FIPS,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     0,
-     0,
-     },
-#endif
-# ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-    {
-     1,
-     TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
-     TLS1_RFC_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
-     TLS1_CK_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
-     SSL_kSRP,
-     SSL_aSRP,
-     SSL_3DES,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-    {
-     1,
-     TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
-     TLS1_RFC_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
-     TLS1_CK_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
-     SSL_kSRP,
-     SSL_aRSA,
-     SSL_3DES,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-    {
-     1,
-     TLS1_TXT_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
-     TLS1_RFC_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
-     TLS1_CK_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
-     SSL_kSRP,
-     SSL_aDSS,
-     SSL_3DES,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     112,
-     168,
-     },
-# endif
-    {
-     1,
-     TLS1_TXT_SRP_SHA_WITH_AES_128_CBC_SHA,
-     TLS1_RFC_SRP_SHA_WITH_AES_128_CBC_SHA,
-     TLS1_CK_SRP_SHA_WITH_AES_128_CBC_SHA,
-     SSL_kSRP,
-     SSL_aSRP,
-     SSL_AES128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
-     TLS1_RFC_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
-     TLS1_CK_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
-     SSL_kSRP,
-     SSL_aRSA,
-     SSL_AES128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
-     TLS1_RFC_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
-     TLS1_CK_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
-     SSL_kSRP,
-     SSL_aDSS,
-     SSL_AES128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_SRP_SHA_WITH_AES_256_CBC_SHA,
-     TLS1_RFC_SRP_SHA_WITH_AES_256_CBC_SHA,
-     TLS1_CK_SRP_SHA_WITH_AES_256_CBC_SHA,
-     SSL_kSRP,
-     SSL_aSRP,
-     SSL_AES256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
-     TLS1_RFC_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
-     TLS1_CK_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
-     SSL_kSRP,
-     SSL_aRSA,
-     SSL_AES256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_SRP_SHA_DSS_WITH_AES_256_CBC_SHA,
-     TLS1_RFC_SRP_SHA_DSS_WITH_AES_256_CBC_SHA,
-     TLS1_CK_SRP_SHA_DSS_WITH_AES_256_CBC_SHA,
-     SSL_kSRP,
-     SSL_aDSS,
-     SSL_AES256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305,
-     TLS1_RFC_DHE_RSA_WITH_CHACHA20_POLY1305,
-     TLS1_CK_DHE_RSA_WITH_CHACHA20_POLY1305,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_CHACHA20POLY1305,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305,
-     TLS1_RFC_ECDHE_RSA_WITH_CHACHA20_POLY1305,
-     TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_CHACHA20POLY1305,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
-     TLS1_RFC_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
-     TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_CHACHA20POLY1305,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_CHACHA20_POLY1305,
-     TLS1_RFC_PSK_WITH_CHACHA20_POLY1305,
-     TLS1_CK_PSK_WITH_CHACHA20_POLY1305,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_CHACHA20POLY1305,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_PSK_WITH_CHACHA20_POLY1305,
-     TLS1_RFC_ECDHE_PSK_WITH_CHACHA20_POLY1305,
-     TLS1_CK_ECDHE_PSK_WITH_CHACHA20_POLY1305,
-     SSL_kECDHEPSK,
-     SSL_aPSK,
-     SSL_CHACHA20POLY1305,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_CHACHA20_POLY1305,
-     TLS1_RFC_DHE_PSK_WITH_CHACHA20_POLY1305,
-     TLS1_CK_DHE_PSK_WITH_CHACHA20_POLY1305,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_CHACHA20POLY1305,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_CHACHA20_POLY1305,
-     TLS1_RFC_RSA_PSK_WITH_CHACHA20_POLY1305,
-     TLS1_CK_RSA_PSK_WITH_CHACHA20_POLY1305,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_CHACHA20POLY1305,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-
-    {
-     1,
-     TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_RFC_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_CAMELLIA128,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_RFC_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_CAMELLIA128,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_RFC_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_CAMELLIA128,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_RFC_ADH_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA256,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_CAMELLIA128,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA256,
-     TLS1_RFC_RSA_WITH_CAMELLIA_256_CBC_SHA256,
-     TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA256,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_CAMELLIA256,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256,
-     TLS1_RFC_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256,
-     TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_CAMELLIA256,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
-     TLS1_RFC_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
-     TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_CAMELLIA256,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA256,
-     TLS1_RFC_ADH_WITH_CAMELLIA_256_CBC_SHA256,
-     TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA256,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_CAMELLIA256,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA,
-     TLS1_RFC_RSA_WITH_CAMELLIA_256_CBC_SHA,
-     TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_CAMELLIA256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
-     TLS1_RFC_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
-     TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_CAMELLIA256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
-     TLS1_RFC_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
-     TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_CAMELLIA256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA,
-     TLS1_RFC_ADH_WITH_CAMELLIA_256_CBC_SHA,
-     TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_CAMELLIA256,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA,
-     TLS1_RFC_RSA_WITH_CAMELLIA_128_CBC_SHA,
-     TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_CAMELLIA128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
-     TLS1_RFC_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
-     TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_CAMELLIA128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
-     TLS1_RFC_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
-     TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_CAMELLIA128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA,
-     TLS1_RFC_ADH_WITH_CAMELLIA_128_CBC_SHA,
-     TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_CAMELLIA128,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_RFC_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_CAMELLIA128,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
-     TLS1_RFC_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
-     TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_CAMELLIA256,
-     SSL_SHA384,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_RFC_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_CK_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_CAMELLIA128,
-     SSL_SHA256,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384,
-     TLS1_RFC_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384,
-     TLS1_CK_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_CAMELLIA256,
-     SSL_SHA384,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_RFC_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_CK_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_CAMELLIA128,
-     SSL_SHA256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-     TLS1_RFC_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-     TLS1_CK_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_CAMELLIA256,
-     SSL_SHA384,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_RFC_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_CK_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_CAMELLIA128,
-     SSL_SHA256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-     TLS1_RFC_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-     TLS1_CK_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_CAMELLIA256,
-     SSL_SHA384,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_RFC_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_CK_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_CAMELLIA128,
-     SSL_SHA256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-     TLS1_RFC_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-     TLS1_CK_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_CAMELLIA256,
-     SSL_SHA384,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_RFC_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-     TLS1_CK_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256,
-     SSL_kECDHEPSK,
-     SSL_aPSK,
-     SSL_CAMELLIA128,
-     SSL_SHA256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-     TLS1_RFC_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-     TLS1_CK_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384,
-     SSL_kECDHEPSK,
-     SSL_aPSK,
-     SSL_CAMELLIA256,
-     SSL_SHA384,
-     TLS1_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-
-#ifndef OPENSSL_NO_GOST
-    {
-     1,
-     "GOST2001-GOST89-GOST89",
-     "TLS_GOSTR341001_WITH_28147_CNT_IMIT",
-     0x3000081,
-     SSL_kGOST,
-     SSL_aGOST01,
-     SSL_eGOST2814789CNT,
-     SSL_GOST89MAC,
-     TLS1_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_GOST94 | TLS1_PRF_GOST94 | TLS1_STREAM_MAC,
-     256,
-     256,
-     },
-# ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
-    {
-     1,
-     "GOST2001-NULL-GOST94",
-     "TLS_GOSTR341001_WITH_NULL_GOSTR3411",
-     0x3000083,
-     SSL_kGOST,
-     SSL_aGOST01,
-     SSL_eNULL,
-     SSL_GOST94,
-     TLS1_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_STRONG_NONE,
-     SSL_HANDSHAKE_MAC_GOST94 | TLS1_PRF_GOST94,
-     0,
-     0,
-     },
-# endif
-    {
-     1,
-     "IANA-GOST2012-GOST8912-GOST8912",
-     NULL,
-     0x0300c102,
-     SSL_kGOST,
-     SSL_aGOST12 | SSL_aGOST01,
-     SSL_eGOST2814789CNT12,
-     SSL_GOST89MAC12,
-     TLS1_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_STREAM_MAC,
-     256,
-     256,
-     },
-    {
-     1,
-     "LEGACY-GOST2012-GOST8912-GOST8912",
-     NULL,
-     0x0300ff85,
-     SSL_kGOST,
-     SSL_aGOST12 | SSL_aGOST01,
-     SSL_eGOST2814789CNT12,
-     SSL_GOST89MAC12,
-     TLS1_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_STREAM_MAC,
-     256,
-     256,
-     },
-# ifndef OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
-    {
-     1,
-     "GOST2012-NULL-GOST12",
-     NULL,
-     0x0300ff87,
-     SSL_kGOST,
-     SSL_aGOST12 | SSL_aGOST01,
-     SSL_eNULL,
-     SSL_GOST12_256,
-     TLS1_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_STRONG_NONE,
-     SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_STREAM_MAC,
-     0,
-     0,
-     },
-# endif
-    {
-     1,
-     "GOST2012-KUZNYECHIK-KUZNYECHIKOMAC",
-     NULL,
-     0x0300C100,
-     SSL_kGOST18,
-     SSL_aGOST12,
-     SSL_KUZNYECHIK,
-     SSL_KUZNYECHIKOMAC,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_TLSTREE,
-     256,
-     256,
-     },
-    {
-     1,
-     "GOST2012-MAGMA-MAGMAOMAC",
-     NULL,
-     0x0300C101,
-     SSL_kGOST18,
-     SSL_aGOST12,
-     SSL_MAGMA,
-     SSL_MAGMAOMAC,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_HIGH,
-     SSL_HANDSHAKE_MAC_GOST12_256 | TLS1_PRF_GOST12_256 | TLS1_TLSTREE,
-     256,
-     256,
-     },
-#endif                          /* OPENSSL_NO_GOST */
-
-    {
-     1,
-     SSL3_TXT_RSA_IDEA_128_SHA,
-     SSL3_RFC_RSA_IDEA_128_SHA,
-     SSL3_CK_RSA_IDEA_128_SHA,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_IDEA,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_1_VERSION,
-     DTLS1_BAD_VER, DTLS1_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-
-    {
-     1,
-     TLS1_TXT_RSA_WITH_SEED_SHA,
-     TLS1_RFC_RSA_WITH_SEED_SHA,
-     TLS1_CK_RSA_WITH_SEED_SHA,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_SEED,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_SEED_SHA,
-     TLS1_RFC_DHE_DSS_WITH_SEED_SHA,
-     TLS1_CK_DHE_DSS_WITH_SEED_SHA,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_SEED,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_SEED_SHA,
-     TLS1_RFC_DHE_RSA_WITH_SEED_SHA,
-     TLS1_CK_DHE_RSA_WITH_SEED_SHA,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_SEED,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ADH_WITH_SEED_SHA,
-     TLS1_RFC_ADH_WITH_SEED_SHA,
-     TLS1_CK_ADH_WITH_SEED_SHA,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_SEED,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     DTLS1_BAD_VER, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     128,
-     128,
-     },
-
-#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
-    {
-     1,
-     SSL3_TXT_RSA_RC4_128_MD5,
-     SSL3_RFC_RSA_RC4_128_MD5,
-     SSL3_CK_RSA_RC4_128_MD5,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_RC4,
-     SSL_MD5,
-     SSL3_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     80,
-     128,
-     },
-    {
-     1,
-     SSL3_TXT_RSA_RC4_128_SHA,
-     SSL3_RFC_RSA_RC4_128_SHA,
-     SSL3_CK_RSA_RC4_128_SHA,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_RC4,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     80,
-     128,
-     },
-    {
-     1,
-     SSL3_TXT_ADH_RC4_128_MD5,
-     SSL3_RFC_ADH_RC4_128_MD5,
-     SSL3_CK_ADH_RC4_128_MD5,
-     SSL_kDHE,
-     SSL_aNULL,
-     SSL_RC4,
-     SSL_MD5,
-     SSL3_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     80,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_PSK_WITH_RC4_128_SHA,
-     TLS1_RFC_ECDHE_PSK_WITH_RC4_128_SHA,
-     TLS1_CK_ECDHE_PSK_WITH_RC4_128_SHA,
-     SSL_kECDHEPSK,
-     SSL_aPSK,
-     SSL_RC4,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     80,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA,
-     TLS1_RFC_ECDH_anon_WITH_RC4_128_SHA,
-     TLS1_CK_ECDH_anon_WITH_RC4_128_SHA,
-     SSL_kECDHE,
-     SSL_aNULL,
-     SSL_RC4,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     80,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA,
-     TLS1_RFC_ECDHE_ECDSA_WITH_RC4_128_SHA,
-     TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_RC4,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     80,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA,
-     TLS1_RFC_ECDHE_RSA_WITH_RC4_128_SHA,
-     TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_RC4,
-     SSL_SHA1,
-     TLS1_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     80,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_RC4_128_SHA,
-     TLS1_RFC_PSK_WITH_RC4_128_SHA,
-     TLS1_CK_PSK_WITH_RC4_128_SHA,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_RC4,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     80,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_RC4_128_SHA,
-     TLS1_RFC_RSA_PSK_WITH_RC4_128_SHA,
-     TLS1_CK_RSA_PSK_WITH_RC4_128_SHA,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_RC4,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     80,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_RC4_128_SHA,
-     TLS1_RFC_DHE_PSK_WITH_RC4_128_SHA,
-     TLS1_CK_DHE_PSK_WITH_RC4_128_SHA,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_RC4,
-     SSL_SHA1,
-     SSL3_VERSION, TLS1_2_VERSION,
-     0, 0,
-     SSL_NOT_DEFAULT | SSL_MEDIUM,
-     SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF,
-     80,
-     128,
-     },
-#endif                          /* OPENSSL_NO_WEAK_SSL_CIPHERS */
-
-    {
-     1,
-     TLS1_TXT_RSA_WITH_ARIA_128_GCM_SHA256,
-     TLS1_RFC_RSA_WITH_ARIA_128_GCM_SHA256,
-     TLS1_CK_RSA_WITH_ARIA_128_GCM_SHA256,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_ARIA128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_WITH_ARIA_256_GCM_SHA384,
-     TLS1_RFC_RSA_WITH_ARIA_256_GCM_SHA384,
-     TLS1_CK_RSA_WITH_ARIA_256_GCM_SHA384,
-     SSL_kRSA,
-     SSL_aRSA,
-     SSL_ARIA256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_ARIA_128_GCM_SHA256,
-     TLS1_RFC_DHE_RSA_WITH_ARIA_128_GCM_SHA256,
-     TLS1_CK_DHE_RSA_WITH_ARIA_128_GCM_SHA256,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_ARIA128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_RSA_WITH_ARIA_256_GCM_SHA384,
-     TLS1_RFC_DHE_RSA_WITH_ARIA_256_GCM_SHA384,
-     TLS1_CK_DHE_RSA_WITH_ARIA_256_GCM_SHA384,
-     SSL_kDHE,
-     SSL_aRSA,
-     SSL_ARIA256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_ARIA_128_GCM_SHA256,
-     TLS1_RFC_DHE_DSS_WITH_ARIA_128_GCM_SHA256,
-     TLS1_CK_DHE_DSS_WITH_ARIA_128_GCM_SHA256,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_ARIA128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_DSS_WITH_ARIA_256_GCM_SHA384,
-     TLS1_RFC_DHE_DSS_WITH_ARIA_256_GCM_SHA384,
-     TLS1_CK_DHE_DSS_WITH_ARIA_256_GCM_SHA384,
-     SSL_kDHE,
-     SSL_aDSS,
-     SSL_ARIA256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256,
-     TLS1_RFC_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256,
-     TLS1_CK_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_ARIA128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384,
-     TLS1_RFC_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384,
-     TLS1_CK_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384,
-     SSL_kECDHE,
-     SSL_aECDSA,
-     SSL_ARIA256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256,
-     TLS1_RFC_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256,
-     TLS1_CK_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_ARIA128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384,
-     TLS1_RFC_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384,
-     TLS1_CK_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384,
-     SSL_kECDHE,
-     SSL_aRSA,
-     SSL_ARIA256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_ARIA_128_GCM_SHA256,
-     TLS1_RFC_PSK_WITH_ARIA_128_GCM_SHA256,
-     TLS1_CK_PSK_WITH_ARIA_128_GCM_SHA256,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_ARIA128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_PSK_WITH_ARIA_256_GCM_SHA384,
-     TLS1_RFC_PSK_WITH_ARIA_256_GCM_SHA384,
-     TLS1_CK_PSK_WITH_ARIA_256_GCM_SHA384,
-     SSL_kPSK,
-     SSL_aPSK,
-     SSL_ARIA256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_ARIA_128_GCM_SHA256,
-     TLS1_RFC_DHE_PSK_WITH_ARIA_128_GCM_SHA256,
-     TLS1_CK_DHE_PSK_WITH_ARIA_128_GCM_SHA256,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_ARIA128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_DHE_PSK_WITH_ARIA_256_GCM_SHA384,
-     TLS1_RFC_DHE_PSK_WITH_ARIA_256_GCM_SHA384,
-     TLS1_CK_DHE_PSK_WITH_ARIA_256_GCM_SHA384,
-     SSL_kDHEPSK,
-     SSL_aPSK,
-     SSL_ARIA256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_ARIA_128_GCM_SHA256,
-     TLS1_RFC_RSA_PSK_WITH_ARIA_128_GCM_SHA256,
-     TLS1_CK_RSA_PSK_WITH_ARIA_128_GCM_SHA256,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_ARIA128GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256,
-     128,
-     128,
-     },
-    {
-     1,
-     TLS1_TXT_RSA_PSK_WITH_ARIA_256_GCM_SHA384,
-     TLS1_RFC_RSA_PSK_WITH_ARIA_256_GCM_SHA384,
-     TLS1_CK_RSA_PSK_WITH_ARIA_256_GCM_SHA384,
-     SSL_kRSAPSK,
-     SSL_aRSA,
-     SSL_ARIA256GCM,
-     SSL_AEAD,
-     TLS1_2_VERSION, TLS1_2_VERSION,
-     DTLS1_2_VERSION, DTLS1_2_VERSION,
-     SSL_NOT_DEFAULT | SSL_HIGH,
-     SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384,
-     256,
-     256,
-     },
 };
 
 /*
@@ -3279,18 +3678,40 @@ static SSL_CIPHER ssl3_ciphers[] = {
  */
 static SSL_CIPHER ssl3_scsvs[] = {
     {
-     0,
-     "TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
-     "TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
-     SSL3_CK_SCSV,
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0,
+        "TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
+        "TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
+        SSL3_CK_SCSV,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
     },
     {
-     0,
-     "TLS_FALLBACK_SCSV",
-     "TLS_FALLBACK_SCSV",
-     SSL3_CK_FALLBACK_SCSV,
-     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0,
+        "TLS_FALLBACK_SCSV",
+        "TLS_FALLBACK_SCSV",
+        SSL3_CK_FALLBACK_SCSV,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
     },
 };
 
@@ -3307,15 +3728,15 @@ static int cipher_compare(const void *a, const void *b)
 void ssl_sort_cipher_list(void)
 {
     qsort(tls13_ciphers, TLS13_NUM_CIPHERS, sizeof(tls13_ciphers[0]),
-          cipher_compare);
+        cipher_compare);
     qsort(ssl3_ciphers, SSL3_NUM_CIPHERS, sizeof(ssl3_ciphers[0]),
-          cipher_compare);
+        cipher_compare);
     qsort(ssl3_scsvs, SSL3_NUM_SCSVS, sizeof(ssl3_scsvs[0]), cipher_compare);
 }
 
 static int sslcon_undefined_function_1(SSL_CONNECTION *sc, unsigned char *r,
-                                       size_t s, const char *t, size_t u,
-                                       const unsigned char *v, size_t w, int x)
+    size_t s, const char *t, size_t u,
+    const unsigned char *v, size_t w, int x)
 {
     (void)r;
     (void)s;
@@ -3372,7 +3793,7 @@ int ssl3_set_handshake_header(SSL_CONNECTION *s, WPACKET *pkt, int htype)
 
     /* Set the content type and 3 bytes for the message len */
     if (!WPACKET_put_bytes_u8(pkt, htype)
-            || !WPACKET_start_sub_packet_u24(pkt))
+        || !WPACKET_start_sub_packet_u24(pkt))
         return 0;
 
     return 1;
@@ -3498,7 +3919,7 @@ int ssl3_clear(SSL *s)
      * NULL/zero-out everything in the s3 struct, but remember if we are doing
      * QUIC.
      */
-    flags = sc->s3.flags & TLS1_FLAGS_QUIC;
+    flags = sc->s3.flags & (TLS1_FLAGS_QUIC | TLS1_FLAGS_QUIC_INTERNAL);
     memset(&sc->s3, 0, sizeof(sc->s3));
     sc->s3.flags |= flags;
 
@@ -3555,50 +3976,46 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
         ret = (int)(sc->s3.flags);
         break;
 #if !defined(OPENSSL_NO_DEPRECATED_3_0)
-    case SSL_CTRL_SET_TMP_DH:
-        {
-            EVP_PKEY *pkdh = NULL;
-            if (parg == NULL) {
-                ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
-                return 0;
-            }
-            pkdh = ssl_dh_to_pkey(parg);
-            if (pkdh == NULL) {
-                ERR_raise(ERR_LIB_SSL, ERR_R_DH_LIB);
-                return 0;
-            }
-            if (!SSL_set0_tmp_dh_pkey(s, pkdh)) {
-                EVP_PKEY_free(pkdh);
-                return 0;
-            }
-            return 1;
+    case SSL_CTRL_SET_TMP_DH: {
+        EVP_PKEY *pkdh = NULL;
+        if (parg == NULL) {
+            ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
+            return 0;
         }
-        break;
-    case SSL_CTRL_SET_TMP_DH_CB:
-        {
-            ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-            return ret;
+        pkdh = ssl_dh_to_pkey(parg);
+        if (pkdh == NULL) {
+            ERR_raise(ERR_LIB_SSL, ERR_R_DH_LIB);
+            return 0;
+        }
+        if (!SSL_set0_tmp_dh_pkey(s, pkdh)) {
+            EVP_PKEY_free(pkdh);
+            return 0;
         }
+        return 1;
+    } break;
+    case SSL_CTRL_SET_TMP_DH_CB: {
+        ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+        return ret;
+    }
 #endif
     case SSL_CTRL_SET_DH_AUTO:
         sc->cert->dh_tmp_auto = larg;
         return 1;
 #if !defined(OPENSSL_NO_DEPRECATED_3_0)
-    case SSL_CTRL_SET_TMP_ECDH:
-        {
-            if (parg == NULL) {
-                ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
-                return 0;
-            }
-            return ssl_set_tmp_ecdh_groups(&sc->ext.supportedgroups,
-                                           &sc->ext.supportedgroups_len,
-                                           &sc->ext.keyshares,
-                                           &sc->ext.keyshares_len,
-                                           &sc->ext.tuples,
-                                           &sc->ext.tuples_len,
-                                           parg);
+    case SSL_CTRL_SET_TMP_ECDH: {
+        if (parg == NULL) {
+            ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
+            return 0;
         }
-#endif                          /* !OPENSSL_NO_DEPRECATED_3_0 */
+        return ssl_set_tmp_ecdh_groups(&sc->ext.supportedgroups,
+            &sc->ext.supportedgroups_len,
+            &sc->ext.keyshares,
+            &sc->ext.keyshares_len,
+            &sc->ext.tuples,
+            &sc->ext.tuples_len,
+            parg);
+    }
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
     case SSL_CTRL_SET_TLSEXT_HOSTNAME:
         /*
          * This API is only used for a client to set what SNI it will request
@@ -3668,7 +4085,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
     case SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP:
         *(unsigned char **)parg = sc->ext.ocsp.resp;
         if (sc->ext.ocsp.resp_len == 0
-                || sc->ext.ocsp.resp_len > LONG_MAX)
+            || sc->ext.ocsp.resp_len > LONG_MAX)
             return -1;
         return (long)sc->ext.ocsp.resp_len;
 
@@ -3720,70 +4137,67 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
         }
         return ssl_cert_set_current(sc->cert, larg);
 
-    case SSL_CTRL_GET_GROUPS:
-        {
-            uint16_t *clist;
-            size_t clistlen;
+    case SSL_CTRL_GET_GROUPS: {
+        uint16_t *clist;
+        size_t clistlen;
 
-            if (!sc->session)
-                return 0;
-            clist = sc->ext.peer_supportedgroups;
-            clistlen = sc->ext.peer_supportedgroups_len;
-            if (parg) {
-                size_t i;
-                int *cptr = parg;
-
-                for (i = 0; i < clistlen; i++) {
-                    const TLS_GROUP_INFO *cinf
-                        = tls1_group_id_lookup(s->ctx, clist[i]);
-
-                    if (cinf != NULL)
-                        cptr[i] = tls1_group_id2nid(cinf->group_id, 1);
-                    else
-                        cptr[i] = TLSEXT_nid_unknown | clist[i];
-                }
+        if (!sc->session)
+            return 0;
+        clist = sc->ext.peer_supportedgroups;
+        clistlen = sc->ext.peer_supportedgroups_len;
+        if (parg) {
+            size_t i;
+            int *cptr = parg;
+
+            for (i = 0; i < clistlen; i++) {
+                const TLS_GROUP_INFO *cinf
+                    = tls1_group_id_lookup(s->ctx, clist[i]);
+
+                if (cinf != NULL)
+                    cptr[i] = tls1_group_id2nid(cinf->group_id, 1);
+                else
+                    cptr[i] = TLSEXT_nid_unknown | clist[i];
             }
-            return (int)clistlen;
         }
+        return (int)clistlen;
+    }
 
     case SSL_CTRL_SET_GROUPS:
         return tls1_set_groups(&sc->ext.supportedgroups,
-                               &sc->ext.supportedgroups_len,
-                               &sc->ext.keyshares,
-                               &sc->ext.keyshares_len,
-                               &sc->ext.tuples,
-                               &sc->ext.tuples_len,
-                               parg, larg);
+            &sc->ext.supportedgroups_len,
+            &sc->ext.keyshares,
+            &sc->ext.keyshares_len,
+            &sc->ext.tuples,
+            &sc->ext.tuples_len,
+            parg, larg);
 
     case SSL_CTRL_SET_GROUPS_LIST:
         return tls1_set_groups_list(s->ctx,
-                                    &sc->ext.supportedgroups,
-                                    &sc->ext.supportedgroups_len,
-                                    &sc->ext.keyshares,
-                                    &sc->ext.keyshares_len,
-                                    &sc->ext.tuples,
-                                    &sc->ext.tuples_len,
-                                    parg);
-
-    case SSL_CTRL_GET_SHARED_GROUP:
-        {
-            uint16_t id = tls1_shared_group(sc, larg);
-
-            if (larg != -1)
-                return tls1_group_id2nid(id, 1);
-            return id;
-        }
-    case SSL_CTRL_GET_NEGOTIATED_GROUP:
-        {
-            unsigned int id;
-
-            if (SSL_CONNECTION_IS_TLS13(sc) && sc->s3.did_kex)
-                id = sc->s3.group_id;
-            else
-                id = (sc->session != NULL) ? sc->session->kex_group : NID_undef;
-            ret = tls1_group_id2nid(id, 1);
-            break;
-        }
+            &sc->ext.supportedgroups,
+            &sc->ext.supportedgroups_len,
+            &sc->ext.keyshares,
+            &sc->ext.keyshares_len,
+            &sc->ext.tuples,
+            &sc->ext.tuples_len,
+            parg);
+
+    case SSL_CTRL_GET_SHARED_GROUP: {
+        uint16_t id = tls1_shared_group(sc, larg);
+
+        if (larg != -1)
+            return tls1_group_id2nid(id, 1);
+        return id;
+    }
+    case SSL_CTRL_GET_NEGOTIATED_GROUP: {
+        unsigned int id;
+
+        if (SSL_CONNECTION_IS_TLS13(sc) && sc->s3.did_kex)
+            id = sc->s3.group_id;
+        else
+            id = (sc->session != NULL) ? sc->session->kex_group : NID_undef;
+        ret = tls1_group_id2nid(id, 1);
+        break;
+    }
     case SSL_CTRL_SET_SIGALGS:
         return tls1_set_sigalgs(sc->cert, parg, larg, 0);
 
@@ -3796,15 +4210,14 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
     case SSL_CTRL_SET_CLIENT_SIGALGS_LIST:
         return tls1_set_sigalgs_list(s->ctx, sc->cert, parg, 1);
 
-    case SSL_CTRL_GET_CLIENT_CERT_TYPES:
-        {
-            const unsigned char **pctype = parg;
-            if (sc->server || !sc->s3.tmp.cert_req)
-                return 0;
-            if (pctype)
-                *pctype = sc->s3.tmp.ctype;
-            return sc->s3.tmp.ctype_len;
-        }
+    case SSL_CTRL_GET_CLIENT_CERT_TYPES: {
+        const unsigned char **pctype = parg;
+        if (sc->server || !sc->s3.tmp.cert_req)
+            return 0;
+        if (pctype)
+            *pctype = sc->s3.tmp.ctype;
+        return sc->s3.tmp.ctype_len;
+    }
 
     case SSL_CTRL_SET_CLIENT_CERT_TYPES:
         if (!sc->server)
@@ -3872,23 +4285,21 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
             return 1;
         }
 
-    case SSL_CTRL_GET_EC_POINT_FORMATS:
-        {
-            const unsigned char **pformat = parg;
+    case SSL_CTRL_GET_EC_POINT_FORMATS: {
+        const unsigned char **pformat = parg;
 
-            if (sc->ext.peer_ecpointformats == NULL)
-                return 0;
-            *pformat = sc->ext.peer_ecpointformats;
-            return (int)sc->ext.peer_ecpointformats_len;
-        }
+        if (sc->ext.peer_ecpointformats == NULL)
+            return 0;
+        *pformat = sc->ext.peer_ecpointformats;
+        return (int)sc->ext.peer_ecpointformats_len;
+    }
 
-    case SSL_CTRL_GET_IANA_GROUPS:
-        {
-            if (parg != NULL) {
-                *(uint16_t **)parg = (uint16_t *)sc->ext.peer_supportedgroups;
-            }
-            return (int)sc->ext.peer_supportedgroups_len;
+    case SSL_CTRL_GET_IANA_GROUPS: {
+        if (parg != NULL) {
+            *(uint16_t **)parg = (uint16_t *)sc->ext.peer_supportedgroups;
         }
+        return (int)sc->ext.peer_supportedgroups_len;
+    }
 
     case SSL_CTRL_SET_MSG_CALLBACK_ARG:
         sc->msg_callback_arg = parg;
@@ -3900,7 +4311,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
     return ret;
 }
 
-long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void))
+long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)(void))
 {
     int ret = 0;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
@@ -3911,13 +4322,13 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void))
     switch (cmd) {
 #if !defined(OPENSSL_NO_DEPRECATED_3_0)
     case SSL_CTRL_SET_TMP_DH_CB:
-        sc->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))fp;
+        sc->cert->dh_tmp_cb = (DH * (*)(SSL *, int, int)) fp;
         ret = 1;
         break;
 #endif
     case SSL_CTRL_SET_TLSEXT_DEBUG_CB:
         sc->ext.debug_cb = (void (*)(SSL *, int, int,
-                                     const unsigned char *, int, void *))fp;
+            const unsigned char *, int, void *))fp;
         ret = 1;
         break;
 
@@ -3939,88 +4350,80 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
 {
     switch (cmd) {
 #if !defined(OPENSSL_NO_DEPRECATED_3_0)
-    case SSL_CTRL_SET_TMP_DH:
-        {
-            EVP_PKEY *pkdh = NULL;
-            if (parg == NULL) {
-                ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
-                return 0;
-            }
-            pkdh = ssl_dh_to_pkey(parg);
-            if (pkdh == NULL) {
-                ERR_raise(ERR_LIB_SSL, ERR_R_DH_LIB);
-                return 0;
-            }
-            if (!SSL_CTX_set0_tmp_dh_pkey(ctx, pkdh)) {
-                EVP_PKEY_free(pkdh);
-                return 0;
-            }
-            return 1;
+    case SSL_CTRL_SET_TMP_DH: {
+        EVP_PKEY *pkdh = NULL;
+        if (parg == NULL) {
+            ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
+            return 0;
         }
-    case SSL_CTRL_SET_TMP_DH_CB:
-        {
-            ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+        pkdh = ssl_dh_to_pkey(parg);
+        if (pkdh == NULL) {
+            ERR_raise(ERR_LIB_SSL, ERR_R_DH_LIB);
+            return 0;
+        }
+        if (!SSL_CTX_set0_tmp_dh_pkey(ctx, pkdh)) {
+            EVP_PKEY_free(pkdh);
             return 0;
         }
+        return 1;
+    }
+    case SSL_CTRL_SET_TMP_DH_CB: {
+        ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+        return 0;
+    }
 #endif
     case SSL_CTRL_SET_DH_AUTO:
         ctx->cert->dh_tmp_auto = larg;
         return 1;
 #if !defined(OPENSSL_NO_DEPRECATED_3_0)
-    case SSL_CTRL_SET_TMP_ECDH:
-        {
-            if (parg == NULL) {
-                ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
-                return 0;
-            }
-            return ssl_set_tmp_ecdh_groups(&ctx->ext.supportedgroups,
-                                           &ctx->ext.supportedgroups_len,
-                                           &ctx->ext.keyshares,
-                                           &ctx->ext.keyshares_len,
-                                           &ctx->ext.tuples,
-                                           &ctx->ext.tuples_len,
-                                           parg);
+    case SSL_CTRL_SET_TMP_ECDH: {
+        if (parg == NULL) {
+            ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_NULL_PARAMETER);
+            return 0;
         }
-#endif                          /* !OPENSSL_NO_DEPRECATED_3_0 */
+        return ssl_set_tmp_ecdh_groups(&ctx->ext.supportedgroups,
+            &ctx->ext.supportedgroups_len,
+            &ctx->ext.keyshares,
+            &ctx->ext.keyshares_len,
+            &ctx->ext.tuples,
+            &ctx->ext.tuples_len,
+            parg);
+    }
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
     case SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG:
         ctx->ext.servername_arg = parg;
         break;
     case SSL_CTRL_SET_TLSEXT_TICKET_KEYS:
-    case SSL_CTRL_GET_TLSEXT_TICKET_KEYS:
-        {
-            unsigned char *keys = parg;
-            long tick_keylen = (sizeof(ctx->ext.tick_key_name) +
-                                sizeof(ctx->ext.secure->tick_hmac_key) +
-                                sizeof(ctx->ext.secure->tick_aes_key));
-            if (keys == NULL)
-                return tick_keylen;
-            if (larg != tick_keylen) {
-                ERR_raise(ERR_LIB_SSL, SSL_R_INVALID_TICKET_KEYS_LENGTH);
-                return 0;
-            }
-            if (cmd == SSL_CTRL_SET_TLSEXT_TICKET_KEYS) {
-                memcpy(ctx->ext.tick_key_name, keys,
-                       sizeof(ctx->ext.tick_key_name));
-                memcpy(ctx->ext.secure->tick_hmac_key,
-                       keys + sizeof(ctx->ext.tick_key_name),
-                       sizeof(ctx->ext.secure->tick_hmac_key));
-                memcpy(ctx->ext.secure->tick_aes_key,
-                       keys + sizeof(ctx->ext.tick_key_name) +
-                       sizeof(ctx->ext.secure->tick_hmac_key),
-                       sizeof(ctx->ext.secure->tick_aes_key));
-            } else {
-                memcpy(keys, ctx->ext.tick_key_name,
-                       sizeof(ctx->ext.tick_key_name));
-                memcpy(keys + sizeof(ctx->ext.tick_key_name),
-                       ctx->ext.secure->tick_hmac_key,
-                       sizeof(ctx->ext.secure->tick_hmac_key));
-                memcpy(keys + sizeof(ctx->ext.tick_key_name) +
-                       sizeof(ctx->ext.secure->tick_hmac_key),
-                       ctx->ext.secure->tick_aes_key,
-                       sizeof(ctx->ext.secure->tick_aes_key));
-            }
-            return 1;
+    case SSL_CTRL_GET_TLSEXT_TICKET_KEYS: {
+        unsigned char *keys = parg;
+        long tick_keylen = (sizeof(ctx->ext.tick_key_name) + sizeof(ctx->ext.secure->tick_hmac_key) + sizeof(ctx->ext.secure->tick_aes_key));
+        if (keys == NULL)
+            return tick_keylen;
+        if (larg != tick_keylen) {
+            ERR_raise(ERR_LIB_SSL, SSL_R_INVALID_TICKET_KEYS_LENGTH);
+            return 0;
+        }
+        if (cmd == SSL_CTRL_SET_TLSEXT_TICKET_KEYS) {
+            memcpy(ctx->ext.tick_key_name, keys,
+                sizeof(ctx->ext.tick_key_name));
+            memcpy(ctx->ext.secure->tick_hmac_key,
+                keys + sizeof(ctx->ext.tick_key_name),
+                sizeof(ctx->ext.secure->tick_hmac_key));
+            memcpy(ctx->ext.secure->tick_aes_key,
+                keys + sizeof(ctx->ext.tick_key_name) + sizeof(ctx->ext.secure->tick_hmac_key),
+                sizeof(ctx->ext.secure->tick_aes_key));
+        } else {
+            memcpy(keys, ctx->ext.tick_key_name,
+                sizeof(ctx->ext.tick_key_name));
+            memcpy(keys + sizeof(ctx->ext.tick_key_name),
+                ctx->ext.secure->tick_hmac_key,
+                sizeof(ctx->ext.secure->tick_hmac_key));
+            memcpy(keys + sizeof(ctx->ext.tick_key_name) + sizeof(ctx->ext.secure->tick_hmac_key),
+                ctx->ext.secure->tick_aes_key,
+                sizeof(ctx->ext.secure->tick_aes_key));
         }
+        return 1;
+    }
 
     case SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE:
         return ctx->ext.status_type;
@@ -4034,11 +4437,11 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
         return 1;
 
     case SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG:
-        *(void**)parg = ctx->ext.status_arg;
+        *(void **)parg = ctx->ext.status_arg;
         break;
 
     case SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB:
-        *(int (**)(SSL*, void*))parg = ctx->ext.status_cb;
+        *(int (**)(SSL *, void *))parg = ctx->ext.status_cb;
         break;
 
 #ifndef OPENSSL_NO_SRP
@@ -4058,8 +4461,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
         }
         break;
     case SSL_CTRL_SET_TLS_EXT_SRP_PASSWORD:
-        ctx->srp_ctx.SRP_give_srp_client_pwd_callback =
-            srp_password_from_info_cb;
+        ctx->srp_ctx.SRP_give_srp_client_pwd_callback = srp_password_from_info_cb;
         if (ctx->srp_ctx.info != NULL)
             OPENSSL_free(ctx->srp_ctx.info);
         if ((ctx->srp_ctx.info = OPENSSL_strdup((char *)parg)) == NULL) {
@@ -4079,28 +4481,28 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
 
     case SSL_CTRL_SET_GROUPS:
         return tls1_set_groups(&ctx->ext.supportedgroups,
-                               &ctx->ext.supportedgroups_len,
-                               &ctx->ext.keyshares,
-                               &ctx->ext.keyshares_len,
-                               &ctx->ext.tuples,
-                               &ctx->ext.tuples_len,
-                               parg, larg);
+            &ctx->ext.supportedgroups_len,
+            &ctx->ext.keyshares,
+            &ctx->ext.keyshares_len,
+            &ctx->ext.tuples,
+            &ctx->ext.tuples_len,
+            parg, larg);
 
     case SSL_CTRL_SET_GROUPS_LIST:
         return tls1_set_groups_list(ctx,
-                                    &ctx->ext.supportedgroups,
-                                    &ctx->ext.supportedgroups_len,
-                                    &ctx->ext.keyshares,
-                                    &ctx->ext.keyshares_len,
-                                    &ctx->ext.tuples,
-                                    &ctx->ext.tuples_len,
-                                    parg);
+            &ctx->ext.supportedgroups,
+            &ctx->ext.supportedgroups_len,
+            &ctx->ext.keyshares,
+            &ctx->ext.keyshares_len,
+            &ctx->ext.tuples,
+            &ctx->ext.tuples_len,
+            parg);
 
     case SSL_CTRL_GET0_IMPLEMENTED_GROUPS:
         return tls1_get0_implemented_groups(ctx->min_proto_version,
-                                            ctx->max_proto_version,
-                                            ctx->group_list,
-                                            ctx->group_list_len, larg, parg);
+            ctx->max_proto_version,
+            ctx->group_list,
+            ctx->group_list_len, larg, parg);
 
     case SSL_CTRL_SET_SIGALGS:
         return tls1_set_sigalgs(ctx->cert, parg, larg, 0);
@@ -4186,15 +4588,13 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
     return 1;
 }
 
-long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void))
+long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
 {
     switch (cmd) {
 #if !defined(OPENSSL_NO_DEPRECATED_3_0)
-    case SSL_CTRL_SET_TMP_DH_CB:
-        {
-            ctx->cert->dh_tmp_cb = (DH *(*)(SSL *, int, int))fp;
-        }
-        break;
+    case SSL_CTRL_SET_TMP_DH_CB: {
+        ctx->cert->dh_tmp_cb = (DH * (*)(SSL *, int, int)) fp;
+    } break;
 #endif
     case SSL_CTRL_SET_TLSEXT_SERVERNAME_CB:
         ctx->ext.servername_cb = (int (*)(SSL *, int *, void *))fp;
@@ -4204,12 +4604,12 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void))
         ctx->ext.status_cb = (int (*)(SSL *, void *))fp;
         break;
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     case SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB:
         ctx->ext.ticket_key_cb = (int (*)(SSL *, unsigned char *,
-                                          unsigned char *,
-                                          EVP_CIPHER_CTX *,
-                                          HMAC_CTX *, int))fp;
+            unsigned char *,
+            EVP_CIPHER_CTX *,
+            HMAC_CTX *, int))fp;
         break;
 #endif
 
@@ -4220,29 +4620,23 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void))
         break;
     case SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB:
         ctx->srp_ctx.srp_Mask |= SSL_kSRP;
-        ctx->srp_ctx.TLS_ext_srp_username_callback =
-            (int (*)(SSL *, int *, void *))fp;
+        ctx->srp_ctx.TLS_ext_srp_username_callback = (int (*)(SSL *, int *, void *))fp;
         break;
     case SSL_CTRL_SET_SRP_GIVE_CLIENT_PWD_CB:
         ctx->srp_ctx.srp_Mask |= SSL_kSRP;
-        ctx->srp_ctx.SRP_give_srp_client_pwd_callback =
-            (char *(*)(SSL *, void *))fp;
+        ctx->srp_ctx.SRP_give_srp_client_pwd_callback = (char *(*)(SSL *, void *))fp;
         break;
 #endif
-    case SSL_CTRL_SET_NOT_RESUMABLE_SESS_CB:
-        {
-            ctx->not_resumable_session_cb = (int (*)(SSL *, int))fp;
-        }
-        break;
+    case SSL_CTRL_SET_NOT_RESUMABLE_SESS_CB: {
+        ctx->not_resumable_session_cb = (int (*)(SSL *, int))fp;
+    } break;
     default:
         return 0;
     }
     return 1;
 }
 
-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))
+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))
 {
     ctx->ext.ticket_key_evp_cb = fp;
     return 1;
@@ -4266,9 +4660,8 @@ const SSL_CIPHER *ssl3_get_cipher_by_id(uint32_t id)
 const SSL_CIPHER *ssl3_get_cipher_by_std_name(const char *stdname)
 {
     SSL_CIPHER *tbl;
-    SSL_CIPHER *alltabs[] = {tls13_ciphers, ssl3_ciphers, ssl3_scsvs};
-    size_t i, j, tblsize[] = {TLS13_NUM_CIPHERS, SSL3_NUM_CIPHERS,
-                              SSL3_NUM_SCSVS};
+    SSL_CIPHER *alltabs[] = { tls13_ciphers, ssl3_ciphers, ssl3_scsvs };
+    size_t i, j, tblsize[] = { TLS13_NUM_CIPHERS, SSL3_NUM_CIPHERS, SSL3_NUM_SCSVS };
 
     /* this is not efficient, necessary to optimize this? */
     for (j = 0; j < OSSL_NELEM(alltabs); j++) {
@@ -4290,8 +4683,8 @@ const SSL_CIPHER *ssl3_get_cipher_by_std_name(const char *stdname)
 const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)
 {
     return ssl3_get_cipher_by_id(SSL3_CK_CIPHERSUITE_FLAG
-                                 | ((uint32_t)p[0] << 8L)
-                                 | (uint32_t)p[1]);
+        | ((uint32_t)p[0] << 8L)
+        | (uint32_t)p[1]);
 }
 
 int ssl3_put_cipher_by_char(const SSL_CIPHER *c, WPACKET *pkt, size_t *len)
@@ -4317,7 +4710,7 @@ int ssl3_put_cipher_by_char(const SSL_CIPHER *c, WPACKET *pkt, size_t *len)
  * Returns the selected cipher or NULL when no common ciphers.
  */
 const SSL_CIPHER *ssl3_choose_cipher(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *clnt,
-                                     STACK_OF(SSL_CIPHER) *srvr)
+    STACK_OF(SSL_CIPHER) *srvr)
 {
     const SSL_CIPHER *c, *ret = NULL;
     STACK_OF(SSL_CIPHER) *prio, *allow;
@@ -4334,20 +4727,22 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *cl
      * pay with the price of sk_SSL_CIPHER_dup().
      */
 
-    OSSL_TRACE_BEGIN(TLS_CIPHER) {
+    OSSL_TRACE_BEGIN(TLS_CIPHER)
+    {
         BIO_printf(trc_out, "Server has %d from %p:\n",
-                   sk_SSL_CIPHER_num(srvr), (void *)srvr);
+            sk_SSL_CIPHER_num(srvr), (void *)srvr);
         for (i = 0; i < sk_SSL_CIPHER_num(srvr); ++i) {
             c = sk_SSL_CIPHER_value(srvr, i);
             BIO_printf(trc_out, "%p:%s\n", (void *)c, c->name);
         }
         BIO_printf(trc_out, "Client sent %d from %p:\n",
-                   sk_SSL_CIPHER_num(clnt), (void *)clnt);
+            sk_SSL_CIPHER_num(clnt), (void *)clnt);
         for (i = 0; i < sk_SSL_CIPHER_num(clnt); ++i) {
             c = sk_SSL_CIPHER_value(clnt, i);
             BIO_printf(trc_out, "%p:%s\n", (void *)c, c->name);
         }
-    } OSSL_TRACE_END(TLS_CIPHER);
+    }
+    OSSL_TRACE_END(TLS_CIPHER);
 
     /* SUITE-B takes precedence over server preference and ChaCha priortiy */
     if (tls1_suiteb(s)) {
@@ -4412,7 +4807,8 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *cl
          * that.
          */
         if (s->psk_server_callback != NULL) {
-            for (j = 0; j < s->ssl_pkey_num && !ssl_has_cert(s, j); j++);
+            for (j = 0; j < s->ssl_pkey_num && !ssl_has_cert(s, j); j++)
+                ;
             if (j == s->ssl_pkey_num) {
                 /* There are no certificates */
                 prefer_sha256 = 1;
@@ -4457,12 +4853,12 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *cl
             /* with PSK there must be server callback set */
             if ((alg_k & SSL_PSK) && s->psk_server_callback == NULL)
                 continue;
-#endif                          /* OPENSSL_NO_PSK */
+#endif /* OPENSSL_NO_PSK */
 
             ok = (alg_k & mask_k) && (alg_a & mask_a);
             OSSL_TRACE7(TLS_CIPHER,
-                        "%d:[%08lX:%08lX:%08lX:%08lX]%p:%s\n",
-                        ok, alg_k, alg_a, mask_k, mask_a, (void *)c, c->name);
+                "%d:[%08lX:%08lX:%08lX:%08lX]%p:%s\n",
+                ok, alg_k, alg_a, mask_k, mask_a, (void *)c, c->name);
 
             /*
              * if we are considering an ECC cipher suite that uses an ephemeral
@@ -4478,7 +4874,7 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *cl
         if (ii >= 0) {
             /* Check security callback permits this cipher */
             if (!ssl_security(s, SSL_SECOP_CIPHER_SHARED,
-                              c->strength_bits, 0, (void *)c))
+                    c->strength_bits, 0, (void *)c))
                 continue;
 
             if ((alg_k & SSL_kECDHE) && (alg_a & SSL_aECDSA)
@@ -4491,10 +4887,10 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *cl
             if (prefer_sha256) {
                 const SSL_CIPHER *tmp = sk_SSL_CIPHER_value(allow, ii);
                 const EVP_MD *md = ssl_md(SSL_CONNECTION_GET_CTX(s),
-                                          tmp->algorithm2);
+                    tmp->algorithm2);
 
                 if (md != NULL
-                        && EVP_MD_is_a(md, OSSL_DIGEST_NAME_SHA2_256)) {
+                    && EVP_MD_is_a(md, OSSL_DIGEST_NAME_SHA2_256)) {
                     ret = tmp;
                     break;
                 }
@@ -4543,7 +4939,7 @@ int ssl3_get_req_cert_type(SSL_CONNECTION *s, WPACKET *pkt)
         if (!WPACKET_put_bytes_u8(pkt, SSL3_CT_RSA_EPHEMERAL_DH))
             return 0;
         if (!(alg_a & SSL_aDSS)
-                && !WPACKET_put_bytes_u8(pkt, SSL3_CT_DSS_EPHEMERAL_DH))
+            && !WPACKET_put_bytes_u8(pkt, SSL3_CT_DSS_EPHEMERAL_DH))
             return 0;
     }
     if (!(alg_a & SSL_aRSA) && !WPACKET_put_bytes_u8(pkt, SSL3_CT_RSA_SIGN))
@@ -4556,8 +4952,8 @@ int ssl3_get_req_cert_type(SSL_CONNECTION *s, WPACKET *pkt)
      * need to check for SSL_kECDH or SSL_kECDHE
      */
     if (s->version >= TLS1_VERSION
-            && !(alg_a & SSL_aECDSA)
-            && !WPACKET_put_bytes_u8(pkt, TLS_CT_ECDSA_SIGN))
+        && !(alg_a & SSL_aECDSA)
+        && !WPACKET_put_bytes_u8(pkt, TLS_CT_ECDSA_SIGN))
         return 0;
 
     return 1;
@@ -4604,7 +5000,7 @@ int ssl3_shutdown(SSL *s)
          * written, s->s3.alert_dispatch will be > 0
          */
         if (sc->s3.alert_dispatch > 0)
-            return -1;        /* return WANT_WRITE */
+            return -1; /* return WANT_WRITE */
     } else if (sc->s3.alert_dispatch > 0) {
         /* resend it if not sent */
         ret = s->method->ssl_dispatch_alert(s);
@@ -4623,12 +5019,12 @@ int ssl3_shutdown(SSL *s)
          */
         s->method->ssl_read_bytes(s, 0, NULL, NULL, 0, 0, &readbytes);
         if (!(sc->shutdown & SSL_RECEIVED_SHUTDOWN)) {
-            return -1;        /* return WANT_READ */
+            return -1; /* return WANT_READ */
         }
     }
 
     if ((sc->shutdown == (SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN))
-            && sc->s3.alert_dispatch == SSL_ALERT_DISPATCH_NONE)
+        && sc->s3.alert_dispatch == SSL_ALERT_DISPATCH_NONE)
         return 1;
     else
         return 0;
@@ -4646,11 +5042,11 @@ int ssl3_write(SSL *s, const void *buf, size_t len, size_t *written)
         ssl3_renegotiate_check(s, 0);
 
     return s->method->ssl_write_bytes(s, SSL3_RT_APPLICATION_DATA, buf, len,
-                                      written);
+        written);
 }
 
 static int ssl3_read_internal(SSL *s, void *buf, size_t len, int peek,
-                              size_t *readbytes)
+    size_t *readbytes)
 {
     int ret;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s);
@@ -4662,9 +5058,8 @@ static int ssl3_read_internal(SSL *s, void *buf, size_t len, int peek,
     if (sc->s3.renegotiate)
         ssl3_renegotiate_check(s, 0);
     sc->s3.in_read_app_data = 1;
-    ret =
-        s->method->ssl_read_bytes(s, SSL3_RT_APPLICATION_DATA, NULL, buf, len,
-                                  peek, readbytes);
+    ret = s->method->ssl_read_bytes(s, SSL3_RT_APPLICATION_DATA, NULL, buf, len,
+        peek, readbytes);
     if ((ret == -1) && (sc->s3.in_read_app_data == 2)) {
         /*
          * ssl3_read_bytes decided to call s->handshake_func, which called
@@ -4674,9 +5069,8 @@ static int ssl3_read_internal(SSL *s, void *buf, size_t len, int peek,
          * application data again.
          */
         ossl_statem_set_in_handshake(sc, 1);
-        ret =
-            s->method->ssl_read_bytes(s, SSL3_RT_APPLICATION_DATA, NULL, buf,
-                                      len, peek, readbytes);
+        ret = s->method->ssl_read_bytes(s, SSL3_RT_APPLICATION_DATA, NULL, buf,
+            len, peek, readbytes);
         ossl_statem_set_in_handshake(sc, 0);
     } else
         sc->s3.in_read_app_data = 0;
@@ -4772,8 +5166,8 @@ long ssl_get_algorithm2(SSL_CONNECTION *s)
  * failure, 1 on success.
  */
 int ssl_fill_hello_random(SSL_CONNECTION *s, int server,
-                          unsigned char *result, size_t len,
-                          DOWNGRADE dgrd)
+    unsigned char *result, size_t len,
+    DOWNGRADE dgrd)
 {
     int send_time = 0, ret;
 
@@ -4795,21 +5189,21 @@ int ssl_fill_hello_random(SSL_CONNECTION *s, int server,
 
     if (ret > 0) {
         if (!ossl_assert(sizeof(tls11downgrade) < len)
-                || !ossl_assert(sizeof(tls12downgrade) < len))
-             return 0;
+            || !ossl_assert(sizeof(tls12downgrade) < len))
+            return 0;
         if (dgrd == DOWNGRADE_TO_1_2)
             memcpy(result + len - sizeof(tls12downgrade), tls12downgrade,
-                   sizeof(tls12downgrade));
+                sizeof(tls12downgrade));
         else if (dgrd == DOWNGRADE_TO_1_1)
             memcpy(result + len - sizeof(tls11downgrade), tls11downgrade,
-                   sizeof(tls11downgrade));
+                sizeof(tls11downgrade));
     }
 
     return ret;
 }
 
 int ssl_generate_master_secret(SSL_CONNECTION *s, unsigned char *pms,
-                               size_t pmslen, int free_pms)
+    size_t pmslen, int free_pms)
 {
     unsigned long alg_k = s->s3.tmp.new_cipher->algorithm_mkey;
     int ret = 0;
@@ -4845,8 +5239,8 @@ int ssl_generate_master_secret(SSL_CONNECTION *s, unsigned char *pms,
         s->s3.tmp.psk = NULL;
         s->s3.tmp.psklen = 0;
         if (!ssl->method->ssl3_enc->generate_master_secret(s,
-                    s->session->master_key, pskpms, pskpmslen,
-                    &s->session->master_key_length)) {
+                s->session->master_key, pskpms, pskpmslen,
+                &s->session->master_key_length)) {
             OPENSSL_clear_free(pskpms, pskpmslen);
             /* SSLfatal() already called */
             goto err;
@@ -4866,7 +5260,7 @@ int ssl_generate_master_secret(SSL_CONNECTION *s, unsigned char *pms,
     }
 
     ret = 1;
- err:
+err:
     if (pms) {
         if (free_pms)
             OPENSSL_clear_free(pms, pmslen);
@@ -4899,7 +5293,7 @@ EVP_PKEY *ssl_generate_pkey(SSL_CONNECTION *s, EVP_PKEY *pm)
         pkey = NULL;
     }
 
-    err:
+err:
     EVP_PKEY_CTX_free(pctx);
     return pkey;
 }
@@ -4918,7 +5312,7 @@ EVP_PKEY *ssl_generate_pkey_group(SSL_CONNECTION *s, uint16_t id)
     }
 
     pctx = EVP_PKEY_CTX_new_from_name(sctx->libctx, ginf->algorithm,
-                                      sctx->propq);
+        sctx->propq);
 
     if (pctx == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
@@ -4938,7 +5332,7 @@ EVP_PKEY *ssl_generate_pkey_group(SSL_CONNECTION *s, uint16_t id)
         pkey = NULL;
     }
 
- err:
+err:
     EVP_PKEY_CTX_free(pctx);
     return pkey;
 }
@@ -4957,7 +5351,7 @@ EVP_PKEY *ssl_generate_param_group(SSL_CONNECTION *s, uint16_t id)
         goto err;
 
     pctx = EVP_PKEY_CTX_new_from_name(sctx->libctx, ginf->algorithm,
-                                      sctx->propq);
+        sctx->propq);
 
     if (pctx == NULL)
         goto err;
@@ -4972,7 +5366,7 @@ EVP_PKEY *ssl_generate_param_group(SSL_CONNECTION *s, uint16_t id)
         pkey = NULL;
     }
 
- err:
+err:
     EVP_PKEY_CTX_free(pctx);
     return pkey;
 }
@@ -4990,8 +5384,8 @@ int ssl_gensecret(SSL_CONNECTION *s, unsigned char *pms, size_t pmslen)
          */
         if (!s->hit)
             rv = tls13_generate_secret(s, ssl_handshake_md(s), NULL, NULL,
-                    0,
-                    (unsigned char *)&s->early_secret);
+                0,
+                (unsigned char *)&s->early_secret);
         else
             rv = 1;
 
@@ -5026,7 +5420,7 @@ int ssl_derive(SSL_CONNECTION *s, EVP_PKEY *privkey, EVP_PKEY *pubkey, int gense
         goto err;
     }
 
-    if (SSL_CONNECTION_IS_TLS13(s) &&  EVP_PKEY_is_a(privkey, "DH"))
+    if (SSL_CONNECTION_IS_TLS13(s) && EVP_PKEY_is_a(privkey, "DH"))
         EVP_PKEY_CTX_set_dh_pad(pctx, 1);
 
     pms = OPENSSL_malloc(pmslen);
@@ -5036,7 +5430,10 @@ int ssl_derive(SSL_CONNECTION *s, EVP_PKEY *privkey, EVP_PKEY *pubkey, int gense
     }
 
     if (EVP_PKEY_derive(pctx, pms, &pmslen) <= 0) {
-        SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+        /*
+         * the public key was probably a weak key
+         */
+        SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_KEY_SHARE);
         goto err;
     }
 
@@ -5051,7 +5448,7 @@ int ssl_derive(SSL_CONNECTION *s, EVP_PKEY *privkey, EVP_PKEY *pubkey, int gense
         rv = 1;
     }
 
- err:
+err:
     OPENSSL_clear_free(pms, pmslen);
     EVP_PKEY_CTX_free(pctx);
     return rv;
@@ -5059,8 +5456,8 @@ int ssl_derive(SSL_CONNECTION *s, EVP_PKEY *privkey, EVP_PKEY *pubkey, int gense
 
 /* Decapsulate secrets for KEM */
 int ssl_decapsulate(SSL_CONNECTION *s, EVP_PKEY *privkey,
-                    const unsigned char *ct, size_t ctlen,
-                    int gensecret)
+    const unsigned char *ct, size_t ctlen,
+    int gensecret)
 {
     int rv = 0;
     unsigned char *pms = NULL;
@@ -5076,7 +5473,7 @@ int ssl_decapsulate(SSL_CONNECTION *s, EVP_PKEY *privkey,
     pctx = EVP_PKEY_CTX_new_from_pkey(sctx->libctx, privkey, sctx->propq);
 
     if (EVP_PKEY_decapsulate_init(pctx, NULL) <= 0
-            || EVP_PKEY_decapsulate(pctx, NULL, &pmslen, ct, ctlen) <= 0) {
+        || EVP_PKEY_decapsulate(pctx, NULL, &pmslen, ct, ctlen) <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -5103,15 +5500,15 @@ int ssl_decapsulate(SSL_CONNECTION *s, EVP_PKEY *privkey,
         rv = 1;
     }
 
- err:
+err:
     OPENSSL_clear_free(pms, pmslen);
     EVP_PKEY_CTX_free(pctx);
     return rv;
 }
 
 int ssl_encapsulate(SSL_CONNECTION *s, EVP_PKEY *pubkey,
-                    unsigned char **ctp, size_t *ctlenp,
-                    int gensecret)
+    unsigned char **ctp, size_t *ctlenp,
+    int gensecret)
 {
     int rv = 0;
     unsigned char *pms = NULL, *ct = NULL;
@@ -5127,8 +5524,8 @@ int ssl_encapsulate(SSL_CONNECTION *s, EVP_PKEY *pubkey,
     pctx = EVP_PKEY_CTX_new_from_pkey(sctx->libctx, pubkey, sctx->propq);
 
     if (EVP_PKEY_encapsulate_init(pctx, NULL) <= 0
-            || EVP_PKEY_encapsulate(pctx, NULL, &ctlen, NULL, &pmslen) <= 0
-            || pmslen == 0 || ctlen == 0) {
+        || EVP_PKEY_encapsulate(pctx, NULL, &ctlen, NULL, &pmslen) <= 0
+        || pmslen == 0 || ctlen == 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -5141,7 +5538,7 @@ int ssl_encapsulate(SSL_CONNECTION *s, EVP_PKEY *pubkey,
     }
 
     if (EVP_PKEY_encapsulate(pctx, ct, &ctlen, pms, &pmslen) <= 0) {
-        SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+        SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_KEY_SHARE);
         goto err;
     }
 
@@ -5163,7 +5560,7 @@ int ssl_encapsulate(SSL_CONNECTION *s, EVP_PKEY *pubkey,
         ct = NULL;
     }
 
- err:
+err:
     OPENSSL_clear_free(pms, pmslen);
     OPENSSL_free(ct);
     EVP_PKEY_CTX_free(pctx);
@@ -5186,7 +5583,8 @@ const char *SSL_get0_group_name(SSL *s)
     return tls1_group_id2name(s->ctx, id);
 }
 
-const char *SSL_group_to_name(SSL *s, int nid) {
+const char *SSL_group_to_name(SSL *s, int nid)
+{
     int group_id = 0;
     const TLS_GROUP_INFO *cinf = NULL;
 
diff --git a/ssl/s3_msg.c b/ssl/s3_msg.c
index 6505e00098129..ffe53bfe18180 100644
--- a/ssl/s3_msg.c
+++ b/ssl/s3_msg.c
@@ -79,7 +79,7 @@ int ssl3_send_alert(SSL_CONNECTION *s, int level, int desc)
 int ssl3_dispatch_alert(SSL *s)
 {
     int i, j;
-    void (*cb) (const SSL *ssl, int type, int val) = NULL;
+    void (*cb)(const SSL *ssl, int type, int val) = NULL;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
     OSSL_RECORD_TEMPLATE templ;
 
@@ -96,9 +96,9 @@ int ssl3_dispatch_alert(SSL *s)
     templ.version = (sc->version == TLS1_3_VERSION) ? TLS1_2_VERSION
                                                     : sc->version;
     if (SSL_get_state(s) == TLS_ST_CW_CLNT_HELLO
-            && !sc->renegotiate
-            && TLS1_get_version(s) > TLS1_VERSION
-            && sc->hello_retry_request == SSL_HRR_NONE) {
+        && !sc->renegotiate
+        && TLS1_get_version(s) > TLS1_VERSION
+        && sc->hello_retry_request == SSL_HRR_NONE) {
         templ.version = TLS1_VERSION;
     }
     templ.buf = &sc->s3.send_alert[0];
@@ -116,7 +116,7 @@ int ssl3_dispatch_alert(SSL *s)
         }
         /* Retry what we've already got pending */
         i = HANDLE_RLAYER_WRITE_RETURN(sc,
-                sc->rlayer.wrlmethod->retry_write_records(sc->rlayer.wrl));
+            sc->rlayer.wrlmethod->retry_write_records(sc->rlayer.wrl));
         if (i <= 0) {
             /* Could be NBIO. Keep alert_dispatch as SSL_ALERT_DISPATCH_RETRY */
             return -1;
@@ -127,7 +127,7 @@ int ssl3_dispatch_alert(SSL *s)
     }
 
     i = HANDLE_RLAYER_WRITE_RETURN(sc,
-            sc->rlayer.wrlmethod->write_records(sc->rlayer.wrl, &templ, 1));
+        sc->rlayer.wrlmethod->write_records(sc->rlayer.wrl, &templ, 1));
 
     if (i <= 0) {
         sc->s3.alert_dispatch = SSL_ALERT_DISPATCH_RETRY;
@@ -144,7 +144,7 @@ int ssl3_dispatch_alert(SSL *s)
 
         if (sc->msg_callback)
             sc->msg_callback(1, sc->version, SSL3_RT_ALERT, sc->s3.send_alert,
-                             2, s, sc->msg_callback_arg);
+                2, s, sc->msg_callback_arg);
 
         if (sc->info_callback != NULL)
             cb = sc->info_callback;
diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index 9964a8c1eeb38..5d4ec7e6ed871 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -81,14 +81,14 @@ ASN1_SEQUENCE(SSL_SESSION_ASN1) = {
     ASN1_EXP_OPT(SSL_SESSION_ASN1, peer_rpk, ASN1_OCTET_STRING, 20)
 } static_ASN1_SEQUENCE_END(SSL_SESSION_ASN1)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(SSL_SESSION_ASN1)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(SSL_SESSION_ASN1)
 
 /* Utility functions for i2d_SSL_SESSION */
 
 /* Initialise OCTET STRING from buffer and length */
 
 static void ssl_session_oinit(ASN1_OCTET_STRING **dest, ASN1_OCTET_STRING *os,
-                              const unsigned char *data, size_t len)
+    const unsigned char *data, size_t len)
 {
     os->data = (unsigned char *)data; /* justified cast: data is not modified */
     os->length = (int)len;
@@ -98,7 +98,7 @@ static void ssl_session_oinit(ASN1_OCTET_STRING **dest, ASN1_OCTET_STRING *os,
 
 /* Initialise OCTET STRING from string */
 static void ssl_session_sinit(ASN1_OCTET_STRING **dest, ASN1_OCTET_STRING *os,
-                              const char *data)
+    const char *data)
 {
     if (data != NULL)
         ssl_session_oinit(dest, os, (const unsigned char *)data, strlen(data));
@@ -160,13 +160,13 @@ int i2d_SSL_SESSION(const SSL_SESSION *in, unsigned char **pp)
 #endif
 
     ssl_session_oinit(&as.master_key, &master_key,
-                      in->master_key, in->master_key_length);
+        in->master_key, in->master_key_length);
 
     ssl_session_oinit(&as.session_id, &session_id,
-                      in->session_id, in->session_id_length);
+        in->session_id, in->session_id_length);
 
     ssl_session_oinit(&as.session_id_context, &sid_ctx,
-                      in->sid_ctx, in->sid_ctx_length);
+        in->sid_ctx, in->sid_ctx_length);
 
     as.time = (int64_t)ossl_time_to_time_t(in->time);
     as.timeout = (int64_t)ossl_time2seconds(in->timeout);
@@ -183,22 +183,22 @@ int i2d_SSL_SESSION(const SSL_SESSION *in, unsigned char **pp)
     }
 
     ssl_session_sinit(&as.tlsext_hostname, &tlsext_hostname,
-                      in->ext.hostname);
+        in->ext.hostname);
     if (in->ext.tick) {
         ssl_session_oinit(&as.tlsext_tick, &tlsext_tick,
-                          in->ext.tick, in->ext.ticklen);
+            in->ext.tick, in->ext.ticklen);
     }
     if (in->ext.tick_lifetime_hint > 0)
         as.tlsext_tick_lifetime_hint = in->ext.tick_lifetime_hint;
     as.tlsext_tick_age_add = in->ext.tick_age_add;
 #ifndef OPENSSL_NO_PSK
     ssl_session_sinit(&as.psk_identity_hint, &psk_identity_hint,
-                      in->psk_identity_hint);
+        in->psk_identity_hint);
     ssl_session_sinit(&as.psk_identity, &psk_identity, in->psk_identity);
-#endif                          /* OPENSSL_NO_PSK */
+#endif /* OPENSSL_NO_PSK */
 #ifndef OPENSSL_NO_SRP
     ssl_session_sinit(&as.srp_username, &srp_username, in->srp_username);
-#endif                          /* OPENSSL_NO_SRP */
+#endif /* OPENSSL_NO_SRP */
 
     as.flags = in->flags;
     as.max_early_data = in->ext.max_early_data;
@@ -207,7 +207,7 @@ int i2d_SSL_SESSION(const SSL_SESSION *in, unsigned char **pp)
         as.alpn_selected = NULL;
     else
         ssl_session_oinit(&as.alpn_selected, &alpn_selected,
-                          in->ext.alpn_selected, in->ext.alpn_selected_len);
+            in->ext.alpn_selected, in->ext.alpn_selected_len);
 
     as.tlsext_max_fragment_len_mode = in->ext.max_fragment_len_mode;
 
@@ -215,7 +215,7 @@ int i2d_SSL_SESSION(const SSL_SESSION *in, unsigned char **pp)
         as.ticket_appdata = NULL;
     else
         ssl_session_oinit(&as.ticket_appdata, &ticket_appdata,
-                          in->ticket_appdata, in->ticket_appdata_len);
+            in->ticket_appdata, in->ticket_appdata_len);
 
     ret = i2d_SSL_SESSION_ASN1(&as, pp);
     OPENSSL_free(peer_rpk.data);
@@ -241,7 +241,7 @@ static int ssl_session_strndup(char **pdst, ASN1_OCTET_STRING *src)
 /* Copy an OCTET STRING, return error if it exceeds maximum length */
 
 static int ssl_session_memcpy(unsigned char *dst, size_t *pdstlen,
-                              ASN1_OCTET_STRING *src, size_t maxlen)
+    ASN1_OCTET_STRING *src, size_t maxlen)
 {
     if (src == NULL || src->length == 0) {
         *pdstlen = 0;
@@ -255,13 +255,13 @@ static int ssl_session_memcpy(unsigned char *dst, size_t *pdstlen,
 }
 
 SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
-                             long length)
+    long length)
 {
     return d2i_SSL_SESSION_ex(a, pp, length, NULL, NULL);
 }
 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)
 {
     long id;
     size_t tmpl;
@@ -304,7 +304,7 @@ SSL_SESSION *d2i_SSL_SESSION_ex(SSL_SESSION **a, const unsigned char **pp,
     }
 
     id = 0x03000000L | ((unsigned long)as->cipher->data[0] << 8L)
-                     | (unsigned long)as->cipher->data[1];
+        | (unsigned long)as->cipher->data[1];
 
     ret->cipher_id = id;
     ret->cipher = ssl3_get_cipher_by_id(id);
@@ -312,11 +312,11 @@ SSL_SESSION *d2i_SSL_SESSION_ex(SSL_SESSION **a, const unsigned char **pp,
         goto err;
 
     if (!ssl_session_memcpy(ret->session_id, &ret->session_id_length,
-                            as->session_id, SSL3_MAX_SSL_SESSION_ID_LENGTH))
+            as->session_id, SSL3_MAX_SSL_SESSION_ID_LENGTH))
         goto err;
 
     if (!ssl_session_memcpy(ret->master_key, &tmpl,
-                            as->master_key, TLS13_MAX_RESUMPTION_PSK_LENGTH))
+            as->master_key, TLS13_MAX_RESUMPTION_PSK_LENGTH))
         goto err;
 
     ret->master_key_length = tmpl;
@@ -350,7 +350,7 @@ SSL_SESSION *d2i_SSL_SESSION_ex(SSL_SESSION **a, const unsigned char **pp,
     }
 
     if (!ssl_session_memcpy(ret->sid_ctx, &ret->sid_ctx_length,
-                            as->session_id_context, SSL_MAX_SID_CTX_LENGTH))
+            as->session_id_context, SSL_MAX_SID_CTX_LENGTH))
         goto err;
 
     /* NB: this defaults to zero which is X509_V_OK */
@@ -391,7 +391,7 @@ SSL_SESSION *d2i_SSL_SESSION_ex(SSL_SESSION **a, const unsigned char **pp,
 #ifndef OPENSSL_NO_SRP
     if (!ssl_session_strndup(&ret->srp_username, as->srp_username))
         goto err;
-#endif                          /* OPENSSL_NO_SRP */
+#endif /* OPENSSL_NO_SRP */
     /* Flags defaults to zero which is fine */
     ret->flags = (int32_t)as->flags;
     ret->ext.max_early_data = as->max_early_data;
@@ -425,7 +425,7 @@ SSL_SESSION *d2i_SSL_SESSION_ex(SSL_SESSION **a, const unsigned char **pp,
     *pp = p;
     return ret;
 
- err:
+err:
     M_ASN1_free_of(as, SSL_SESSION_ASN1);
     if ((a == NULL) || (*a != ret))
         SSL_SESSION_free(ret);
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index ae0f98044929e..adc5bb3d35c3e 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -28,19 +28,18 @@
 #include "internal/thread_once.h"
 #include "internal/ssl_unwrap.h"
 #ifndef OPENSSL_NO_POSIX_IO
-# include <sys/stat.h>
-# ifdef _WIN32
-#  define stat _stat
-# endif
-# ifndef S_ISDIR
-#  define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
-# endif
+#include <sys/stat.h>
+#ifdef _WIN32
+#define stat _stat
+#endif
+#ifndef S_ISDIR
+#define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
+#endif
 #endif
-
 
 static int ssl_security_default_callback(const SSL *s, const SSL_CTX *ctx,
-                                         int op, int bits, int nid, void *other,
-                                         void *ex);
+    int op, int bits, int nid, void *other,
+    void *ex);
 
 static CRYPTO_ONCE ssl_x509_store_ctx_once = CRYPTO_ONCE_STATIC_INIT;
 static volatile int ssl_x509_store_ctx_idx = -1;
@@ -48,8 +47,8 @@ static volatile int ssl_x509_store_ctx_idx = -1;
 DEFINE_RUN_ONCE_STATIC(ssl_x509_store_ctx_init)
 {
     ssl_x509_store_ctx_idx = X509_STORE_CTX_get_ex_new_index(0,
-                                                             "SSL for verify callback",
-                                                             NULL, NULL, NULL);
+        "SSL for verify callback",
+        NULL, NULL, NULL);
     return ssl_x509_store_ctx_idx >= 0;
 }
 
@@ -171,22 +170,22 @@ CERT *ssl_cert_dup(CERT *cert)
     /* Configured sigalgs copied across */
     if (cert->conf_sigalgs) {
         ret->conf_sigalgs = OPENSSL_malloc(cert->conf_sigalgslen
-                                           * sizeof(*cert->conf_sigalgs));
+            * sizeof(*cert->conf_sigalgs));
         if (ret->conf_sigalgs == NULL)
             goto err;
         memcpy(ret->conf_sigalgs, cert->conf_sigalgs,
-               cert->conf_sigalgslen * sizeof(*cert->conf_sigalgs));
+            cert->conf_sigalgslen * sizeof(*cert->conf_sigalgs));
         ret->conf_sigalgslen = cert->conf_sigalgslen;
     } else
         ret->conf_sigalgs = NULL;
 
     if (cert->client_sigalgs) {
         ret->client_sigalgs = OPENSSL_malloc(cert->client_sigalgslen
-                                             * sizeof(*cert->client_sigalgs));
+            * sizeof(*cert->client_sigalgs));
         if (ret->client_sigalgs == NULL)
             goto err;
         memcpy(ret->client_sigalgs, cert->client_sigalgs,
-               cert->client_sigalgslen * sizeof(*cert->client_sigalgs));
+            cert->client_sigalgslen * sizeof(*cert->client_sigalgs));
         ret->client_sigalgslen = cert->client_sigalgslen;
     } else
         ret->client_sigalgs = NULL;
@@ -230,7 +229,7 @@ CERT *ssl_cert_dup(CERT *cert)
 #endif
     return ret;
 
- err:
+err:
     ssl_cert_free(ret);
 
     return NULL;
@@ -412,7 +411,7 @@ int ssl_cert_set_current(CERT *c, long op)
     return 0;
 }
 
-void ssl_cert_set_cert_cb(CERT *c, int (*cb) (SSL *ssl, void *arg), void *arg)
+void ssl_cert_set_cert_cb(CERT *c, int (*cb)(SSL *ssl, void *arg), void *arg)
 {
     c->cert_cb = cb;
     c->cert_cb_arg = arg;
@@ -478,9 +477,9 @@ static int ssl_verify_internal(SSL_CONNECTION *s, STACK_OF(X509) *sk, EVP_PKEY *
     /* Set suite B flags if needed */
     X509_STORE_CTX_set_flags(ctx, tls1_suiteb(s));
     if (!X509_STORE_CTX_set_ex_data(ctx,
-            SSL_get_ex_data_X509_STORE_CTX_idx(), s)) {
+            SSL_get_ex_data_X509_STORE_CTX_idx(),
+            SSL_CONNECTION_GET_USER_SSL(s)))
         goto end;
-    }
 
     /* Verify via DANE if enabled */
     if (DANETLS_ENABLED(&s->dane))
@@ -525,7 +524,7 @@ static int ssl_verify_internal(SSL_CONNECTION *s, STACK_OF(X509) *sk, EVP_PKEY *
     /* Move peername from the store context params to the SSL handle's */
     X509_VERIFY_PARAM_move_peername(s->param, param);
 
- end:
+end:
     X509_STORE_CTX_free(ctx);
     return i;
 }
@@ -555,7 +554,7 @@ int ssl_verify_cert_chain(SSL_CONNECTION *s, STACK_OF(X509) *sk)
 }
 
 static void set0_CA_list(STACK_OF(X509_NAME) **ca_list,
-                        STACK_OF(X509_NAME) *name_list)
+    STACK_OF(X509_NAME) *name_list)
 {
     sk_X509_NAME_pop_free(*ca_list, X509_NAME_free);
     *ca_list = name_list;
@@ -580,7 +579,7 @@ STACK_OF(X509_NAME) *SSL_dup_CA_list(const STACK_OF(X509_NAME) *sk)
             sk_X509_NAME_pop_free(ret, X509_NAME_free);
             return NULL;
         }
-        sk_X509_NAME_push(ret, name);   /* Cannot fail after reserve call */
+        sk_X509_NAME_push(ret, name); /* Cannot fail after reserve call */
     }
     return ret;
 }
@@ -747,8 +746,8 @@ static unsigned long xname_hash(const X509_NAME *a)
 }
 
 STACK_OF(X509_NAME) *SSL_load_client_CA_file_ex(const char *file,
-                                                OSSL_LIB_CTX *libctx,
-                                                const char *propq)
+    OSSL_LIB_CTX *libctx,
+    const char *propq)
 {
     BIO *in = BIO_new(BIO_s_file());
     X509 *x = NULL;
@@ -808,11 +807,11 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file_ex(const char *file,
     }
     goto done;
 
- err:
+err:
     X509_NAME_free(xn);
     sk_X509_NAME_pop_free(ret, X509_NAME_free);
     ret = NULL;
- done:
+done:
     /* restore the old libctx */
     OSSL_LIB_CTX_set0_default(prev_libctx);
     BIO_free(in);
@@ -829,8 +828,8 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file)
 }
 
 static int add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
-                                           const char *file,
-                                           LHASH_OF(X509_NAME) *name_hash)
+    const char *file,
+    LHASH_OF(X509_NAME) *name_hash)
 {
     BIO *in;
     X509 *x = NULL;
@@ -870,16 +869,16 @@ static int add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
     ERR_clear_error();
     goto done;
 
- err:
+err:
     ret = 0;
- done:
+done:
     BIO_free(in);
     X509_free(x);
     return ret;
 }
 
 int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
-                                        const char *file)
+    const char *file)
 {
     X509_NAME *xn = NULL;
     int ret = 1;
@@ -912,15 +911,15 @@ int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
     ret = add_file_cert_subjects_to_stack(stack, file, name_hash);
     goto done;
 
- err:
+err:
     ret = 0;
- done:
+done:
     lh_X509_NAME_free(name_hash);
     return ret;
 }
 
 int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
-                                       const char *dir)
+    const char *dir)
 {
     OPENSSL_DIR_CTX *d = NULL;
     const char *filename;
@@ -980,14 +979,14 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
 
     if (errno) {
         ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                       "calling OPENSSL_dir_read(%s)", dir);
+            "calling OPENSSL_dir_read(%s)", dir);
         ERR_raise(ERR_LIB_SSL, ERR_R_SYS_LIB);
         goto err;
     }
 
     ret = 1;
 
- err:
+err:
     if (d)
         OPENSSL_DIR_end(&d);
     lh_X509_NAME_free(name_hash);
@@ -996,7 +995,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
 }
 
 static int add_uris_recursive(STACK_OF(X509_NAME) *stack,
-                              const char *uri, int depth)
+    const char *uri, int depth)
 {
     int ok = 1;
     OSSL_STORE_CTX *ctx = NULL;
@@ -1021,7 +1020,7 @@ static int add_uris_recursive(STACK_OF(X509_NAME) *stack,
              */
             if (depth > 0)
                 ok = add_uris_recursive(stack, OSSL_STORE_INFO_get0_NAME(info),
-                                        depth - 1);
+                    depth - 1);
         } else if (infotype == OSSL_STORE_INFO_CERT) {
             if ((x = OSSL_STORE_INFO_get0_CERT(info)) == NULL
                 || (xn = X509_get_subject_name(x)) == NULL
@@ -1043,19 +1042,19 @@ static int add_uris_recursive(STACK_OF(X509_NAME) *stack,
     ERR_clear_error();
     goto done;
 
- err:
+err:
     ok = 0;
     OSSL_STORE_INFO_free(info);
- done:
+done:
     OSSL_STORE_close(ctx);
 
     return ok;
 }
 
 int SSL_add_store_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
-                                         const char *store)
+    const char *store)
 {
-    int (*oldcmp) (const X509_NAME *const *a, const X509_NAME *const *b)
+    int (*oldcmp)(const X509_NAME *const *a, const X509_NAME *const *b)
         = sk_X509_NAME_set_cmp_func(stack, xname_sk_cmp);
     int ret = add_uris_recursive(stack, store, 1);
 
@@ -1113,7 +1112,7 @@ int ssl_build_cert_chain(SSL_CONNECTION *s, SSL_CTX *ctx, int flags)
     }
     /* Set suite B flags if needed */
     X509_STORE_CTX_set_flags(xs_ctx,
-                             c->cert_flags & SSL_CERT_FLAG_SUITEB_128_LOS);
+        c->cert_flags & SSL_CERT_FLAG_SUITEB_128_LOS);
 
     i = X509_verify_cert(xs_ctx);
     if (i <= 0 && flags & SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR) {
@@ -1127,7 +1126,7 @@ int ssl_build_cert_chain(SSL_CONNECTION *s, SSL_CTX *ctx, int flags)
     if (i <= 0) {
         i = X509_STORE_CTX_get_error(xs_ctx);
         ERR_raise_data(ERR_LIB_SSL, SSL_R_CERTIFICATE_VERIFY_FAILED,
-                       "Verify error:%s", X509_verify_cert_error_string(i));
+            "Verify error:%s", X509_verify_cert_error_string(i));
 
         goto err;
     }
@@ -1162,7 +1161,7 @@ int ssl_build_cert_chain(SSL_CONNECTION *s, SSL_CTX *ctx, int flags)
     cpk->chain = chain;
     if (rv == 0)
         rv = 1;
- err:
+err:
     if (flags & SSL_BUILD_CHAIN_FLAG_CHECK)
         X509_STORE_free(chain_store);
     X509_STORE_CTX_free(xs_ctx);
@@ -1220,8 +1219,8 @@ int ssl_get_security_level_bits(const SSL *s, const SSL_CTX *ctx, int *levelp)
 }
 
 static int ssl_security_default_callback(const SSL *s, const SSL_CTX *ctx,
-                                         int op, int bits, int nid, void *other,
-                                         void *ex)
+    int op, int bits, int nid, void *other,
+    void *ex)
 {
     int level, minbits, pfs_mask;
     const SSL_CONNECTION *sc;
@@ -1240,28 +1239,26 @@ static int ssl_security_default_callback(const SSL *s, const SSL_CTX *ctx,
     switch (op) {
     case SSL_SECOP_CIPHER_SUPPORTED:
     case SSL_SECOP_CIPHER_SHARED:
-    case SSL_SECOP_CIPHER_CHECK:
-        {
-            const SSL_CIPHER *c = other;
-            /* No ciphers below security level */
-            if (bits < minbits)
-                return 0;
-            /* No unauthenticated ciphersuites */
-            if (c->algorithm_auth & SSL_aNULL)
-                return 0;
-            /* No MD5 mac ciphersuites */
-            if (c->algorithm_mac & SSL_MD5)
-                return 0;
-            /* SHA1 HMAC is 160 bits of security */
-            if (minbits > 160 && c->algorithm_mac & SSL_SHA1)
-                return 0;
-            /* Level 3: forward secure ciphersuites only */
-            pfs_mask = SSL_kDHE | SSL_kECDHE | SSL_kDHEPSK | SSL_kECDHEPSK;
-            if (level >= 3 && c->min_tls != TLS1_3_VERSION &&
-                               !(c->algorithm_mkey & pfs_mask))
-                return 0;
-            break;
-        }
+    case SSL_SECOP_CIPHER_CHECK: {
+        const SSL_CIPHER *c = other;
+        /* No ciphers below security level */
+        if (bits < minbits)
+            return 0;
+        /* No unauthenticated ciphersuites */
+        if (c->algorithm_auth & SSL_aNULL)
+            return 0;
+        /* No MD5 mac ciphersuites */
+        if (c->algorithm_mac & SSL_MD5)
+            return 0;
+        /* SHA1 HMAC is 160 bits of security */
+        if (minbits > 160 && c->algorithm_mac & SSL_SHA1)
+            return 0;
+        /* Level 3: forward secure ciphersuites only */
+        pfs_mask = SSL_kDHE | SSL_kECDHE | SSL_kDHEPSK | SSL_kECDHEPSK;
+        if (level >= 3 && c->min_tls != TLS1_3_VERSION && !(c->algorithm_mkey & pfs_mask))
+            return 0;
+        break;
+    }
     case SSL_SECOP_VERSION:
         if ((sc = SSL_CONNECTION_FROM_CONST_SSL(s)) == NULL)
             return 0;
@@ -1294,13 +1291,13 @@ static int ssl_security_default_callback(const SSL *s, const SSL_CTX *ctx,
 int ssl_security(const SSL_CONNECTION *s, int op, int bits, int nid, void *other)
 {
     return s->cert->sec_cb(SSL_CONNECTION_GET_USER_SSL(s), NULL, op, bits, nid,
-                           other, s->cert->sec_ex);
+        other, s->cert->sec_ex);
 }
 
 int ssl_ctx_security(const SSL_CTX *ctx, int op, int bits, int nid, void *other)
 {
     return ctx->cert->sec_cb(NULL, ctx, op, bits, nid, other,
-                             ctx->cert->sec_ex);
+        ctx->cert->sec_ex);
 }
 
 int ssl_cert_lookup_by_nid(int nid, size_t *pidx, SSL_CTX *ctx)
@@ -1308,13 +1305,13 @@ int ssl_cert_lookup_by_nid(int nid, size_t *pidx, SSL_CTX *ctx)
     size_t i;
 
     for (i = 0; i < OSSL_NELEM(ssl_cert_info); i++) {
-        if (ssl_cert_info[i].nid == nid) {
+        if (ssl_cert_info[i].pkey_nid == nid) {
             *pidx = i;
             return 1;
         }
     }
     for (i = 0; i < ctx->sigalg_list_len; i++) {
-        if (ctx->ssl_cert_info[i].nid == nid) {
+        if (ctx->ssl_cert_info[i].pkey_nid == nid) {
             *pidx = SSL_PKEY_NUM + i;
             return 1;
         }
@@ -1330,8 +1327,8 @@ const SSL_CERT_LOOKUP *ssl_cert_lookup_by_pkey(const EVP_PKEY *pk, size_t *pidx,
     for (i = 0; i < OSSL_NELEM(ssl_cert_info); i++) {
         const SSL_CERT_LOOKUP *tmp_lu = &ssl_cert_info[i];
 
-        if (EVP_PKEY_is_a(pk, OBJ_nid2sn(tmp_lu->nid))
-            || EVP_PKEY_is_a(pk, OBJ_nid2ln(tmp_lu->nid))) {
+        if (EVP_PKEY_is_a(pk, OBJ_nid2sn(tmp_lu->pkey_nid))
+            || EVP_PKEY_is_a(pk, OBJ_nid2ln(tmp_lu->pkey_nid))) {
             if (pidx != NULL)
                 *pidx = i;
             return tmp_lu;
@@ -1341,8 +1338,8 @@ const SSL_CERT_LOOKUP *ssl_cert_lookup_by_pkey(const EVP_PKEY *pk, size_t *pidx,
     for (i = 0; i < ctx->sigalg_list_len; i++) {
         SSL_CERT_LOOKUP *tmp_lu = &(ctx->ssl_cert_info[i]);
 
-        if (EVP_PKEY_is_a(pk, OBJ_nid2sn(tmp_lu->nid))
-            || EVP_PKEY_is_a(pk, OBJ_nid2ln(tmp_lu->nid))) {
+        if (EVP_PKEY_is_a(pk, OBJ_nid2sn(tmp_lu->pkey_nid))
+            || EVP_PKEY_is_a(pk, OBJ_nid2ln(tmp_lu->pkey_nid))) {
             if (pidx != NULL)
                 *pidx = SSL_PKEY_NUM + i;
             return &ctx->ssl_cert_info[i];
diff --git a/ssl/ssl_cert_comp.c b/ssl/ssl_cert_comp.c
index 018fcc14a569f..a59b79811b8cf 100644
--- a/ssl/ssl_cert_comp.c
+++ b/ssl/ssl_cert_comp.c
@@ -63,9 +63,9 @@ static OSSL_COMP_CERT *OSSL_COMP_CERT_new(unsigned char *data, size_t len, size_
     OSSL_COMP_CERT *ret = NULL;
 
     if (!ossl_comp_has_alg(alg)
-            || data == NULL
-            || (ret = OPENSSL_zalloc(sizeof(*ret))) == NULL
-            || !CRYPTO_NEW_REF(&ret->references, 1))
+        || data == NULL
+        || (ret = OPENSSL_zalloc(sizeof(*ret))) == NULL
+        || !CRYPTO_NEW_REF(&ret->references, 1))
         goto err;
 
     ret->data = data;
@@ -73,7 +73,7 @@ static OSSL_COMP_CERT *OSSL_COMP_CERT_new(unsigned char *data, size_t len, size_
     ret->orig_len = orig_len;
     ret->alg = alg;
     return ret;
- err:
+err:
     ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE);
     OPENSSL_free(data);
     OPENSSL_free(ret);
@@ -81,13 +81,13 @@ static OSSL_COMP_CERT *OSSL_COMP_CERT_new(unsigned char *data, size_t len, size_
 }
 
 __owur static OSSL_COMP_CERT *OSSL_COMP_CERT_from_compressed_data(unsigned char *data, size_t len,
-                                                                  size_t orig_len, int alg)
+    size_t orig_len, int alg)
 {
     return OSSL_COMP_CERT_new(OPENSSL_memdup(data, len), len, orig_len, alg);
 }
 
 __owur static OSSL_COMP_CERT *OSSL_COMP_CERT_from_uncompressed_data(unsigned char *data, size_t len,
-                                                                    int alg)
+    int alg)
 {
     OSSL_COMP_CERT *ret = NULL;
     size_t max_length;
@@ -111,9 +111,9 @@ __owur static OSSL_COMP_CERT *OSSL_COMP_CERT_from_uncompressed_data(unsigned cha
     }
 
     if ((max_length = ossl_calculate_comp_expansion(alg, len)) == 0
-          || method == NULL
-          || (comp_ctx = COMP_CTX_new(method)) == NULL
-          || (comp_data = OPENSSL_zalloc(max_length)) == NULL)
+        || method == NULL
+        || (comp_ctx = COMP_CTX_new(method)) == NULL
+        || (comp_data = OPENSSL_zalloc(max_length)) == NULL)
         goto err;
 
     comp_length = COMP_compress_block(comp_ctx, comp_data, max_length, data, len);
@@ -123,7 +123,7 @@ __owur static OSSL_COMP_CERT *OSSL_COMP_CERT_from_uncompressed_data(unsigned cha
     ret = OSSL_COMP_CERT_new(comp_data, comp_length, len, alg);
     comp_data = NULL;
 
- err:
+err:
     OPENSSL_free(comp_data);
     COMP_CTX_free(comp_ctx);
     return ret;
@@ -200,9 +200,9 @@ static size_t ssl_get_cert_to_compress(SSL *ssl, CERT_PKEY *cpk, unsigned char *
     size_t ret = 0;
 
     if (sc == NULL
-            || cpk == NULL
-            || !sc->server
-            || !SSL_in_before(ssl))
+        || cpk == NULL
+        || !sc->server
+        || !SSL_in_before(ssl))
         return 0;
 
     /* Use the |tmppkt| for the to-be-compressed data */
@@ -221,7 +221,7 @@ static size_t ssl_get_cert_to_compress(SSL *ssl, CERT_PKEY *cpk, unsigned char *
         goto out;
     WPACKET_get_total_written(&tmppkt, &ret);
 
- out:
+out:
     WPACKET_cleanup(&tmppkt);
     if (ret != 0 && data != NULL)
         *data = (unsigned char *)buf.data;
@@ -237,8 +237,8 @@ static int ssl_compress_one_cert(SSL *ssl, CERT_PKEY *cpk, int alg)
     size_t length;
 
     if (cpk == NULL
-            || alg == TLSEXT_comp_cert_none
-            || !ossl_comp_has_alg(alg))
+        || alg == TLSEXT_comp_cert_none
+        || !ossl_comp_has_alg(alg))
         return 0;
 
     if ((length = ssl_get_cert_to_compress(ssl, cpk, &cert_data)) == 0)
@@ -263,8 +263,8 @@ static int ssl_compress_certs(SSL *ssl, CERT_PKEY *cpks, int alg_in)
     int count = 0;
 
     if (sc == NULL
-            || cpks == NULL
-            || !ossl_comp_has_alg(alg_in))
+        || cpks == NULL
+        || !ossl_comp_has_alg(alg_in))
         return 0;
 
     /* Look through the preferences to see what we have */
@@ -275,7 +275,7 @@ static int ssl_compress_certs(SSL *ssl, CERT_PKEY *cpks, int alg_in)
          */
         alg = sc->cert_comp_prefs[i];
         if ((alg_in == 0 && alg != TLSEXT_comp_cert_none)
-                || (alg_in != 0 && alg == alg_in)) {
+            || (alg_in != 0 && alg == alg_in)) {
 
             for (j = 0; j < SSL_PKEY_NUM; j++) {
                 /* No cert, move on */
@@ -299,7 +299,7 @@ static int ssl_compress_certs(SSL *ssl, CERT_PKEY *cpks, int alg_in)
 }
 
 static size_t ssl_get_compressed_cert(SSL *ssl, CERT_PKEY *cpk, int alg, unsigned char **data,
-                                      size_t *orig_len)
+    size_t *orig_len)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl);
     size_t cert_len = 0;
@@ -308,12 +308,12 @@ static size_t ssl_get_compressed_cert(SSL *ssl, CERT_PKEY *cpk, int alg, unsigne
     OSSL_COMP_CERT *comp_cert = NULL;
 
     if (sc == NULL
-            || cpk == NULL
-            || data == NULL
-            || orig_len == NULL
-            || !sc->server
-            || !SSL_in_before(ssl)
-            || !ossl_comp_has_alg(alg))
+        || cpk == NULL
+        || data == NULL
+        || orig_len == NULL
+        || !sc->server
+        || !SSL_in_before(ssl)
+        || !ossl_comp_has_alg(alg))
         return 0;
 
     if ((cert_len = ssl_get_cert_to_compress(ssl, cpk, &cert_data)) == 0)
@@ -328,14 +328,14 @@ static size_t ssl_get_compressed_cert(SSL *ssl, CERT_PKEY *cpk, int alg, unsigne
     *orig_len = comp_cert->orig_len;
     *data = comp_cert->data;
     comp_cert->data = NULL;
- err:
+err:
     OSSL_COMP_CERT_free(comp_cert);
     return comp_len;
 }
 
 static int ossl_set1_compressed_cert(CERT *cert, int algorithm,
-                                     unsigned char *comp_data, size_t comp_length,
-                                     size_t orig_length)
+    unsigned char *comp_data, size_t comp_length,
+    size_t orig_length)
 {
     OSSL_COMP_CERT *comp_cert;
 
@@ -344,7 +344,7 @@ static int ossl_set1_compressed_cert(CERT *cert, int algorithm,
         return 0;
 
     comp_cert = OSSL_COMP_CERT_from_compressed_data(comp_data, comp_length,
-                                                    orig_length, algorithm);
+        orig_length, algorithm);
     if (comp_cert == NULL)
         return 0;
 
@@ -438,12 +438,12 @@ size_t SSL_CTX_get1_compressed_cert(SSL_CTX *ctx, int alg, unsigned char **data,
     SSL_free(new);
     return ret;
 #else
-        return 0;
+    return 0;
 #endif
 }
 
 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)
 {
 #ifndef OPENSSL_NO_COMP_ALG
     return ossl_set1_compressed_cert(ctx->cert, algorithm, comp_data, comp_length, orig_length);
@@ -453,7 +453,7 @@ int SSL_CTX_set1_compressed_cert(SSL_CTX *ctx, int algorithm, unsigned char *com
 }
 
 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)
 {
 #ifndef OPENSSL_NO_COMP_ALG
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl);
diff --git a/ssl/ssl_cert_table.h b/ssl/ssl_cert_table.h
index e4dc8063b1fc9..f7fc9844c97e4 100644
--- a/ssl/ssl_cert_table.h
+++ b/ssl/ssl_cert_table.h
@@ -10,14 +10,14 @@
 /*
  * Certificate table information. NB: table entries must match SSL_PKEY indices
  */
-static const SSL_CERT_LOOKUP ssl_cert_info [] = {
-    {EVP_PKEY_RSA, SSL_aRSA}, /* SSL_PKEY_RSA */
-    {EVP_PKEY_RSA_PSS, SSL_aRSA}, /* SSL_PKEY_RSA_PSS_SIGN */
-    {EVP_PKEY_DSA, SSL_aDSS}, /* SSL_PKEY_DSA_SIGN */
-    {EVP_PKEY_EC, SSL_aECDSA}, /* SSL_PKEY_ECC */
-    {NID_id_GostR3410_2001, SSL_aGOST01}, /* SSL_PKEY_GOST01 */
-    {NID_id_GostR3410_2012_256, SSL_aGOST12}, /* SSL_PKEY_GOST12_256 */
-    {NID_id_GostR3410_2012_512, SSL_aGOST12}, /* SSL_PKEY_GOST12_512 */
-    {EVP_PKEY_ED25519, SSL_aECDSA}, /* SSL_PKEY_ED25519 */
-    {EVP_PKEY_ED448, SSL_aECDSA} /* SSL_PKEY_ED448 */
+static const SSL_CERT_LOOKUP ssl_cert_info[] = {
+    { EVP_PKEY_RSA, SSL_aRSA }, /* SSL_PKEY_RSA */
+    { EVP_PKEY_RSA_PSS, SSL_aRSA }, /* SSL_PKEY_RSA_PSS_SIGN */
+    { EVP_PKEY_DSA, SSL_aDSS }, /* SSL_PKEY_DSA_SIGN */
+    { EVP_PKEY_EC, SSL_aECDSA }, /* SSL_PKEY_ECC */
+    { NID_id_GostR3410_2001, SSL_aGOST01 }, /* SSL_PKEY_GOST01 */
+    { NID_id_GostR3410_2012_256, SSL_aGOST12 }, /* SSL_PKEY_GOST12_256 */
+    { NID_id_GostR3410_2012_512, SSL_aGOST12 }, /* SSL_PKEY_GOST12_512 */
+    { EVP_PKEY_ED25519, SSL_aECDSA }, /* SSL_PKEY_ED25519 */
+    { EVP_PKEY_ED448, SSL_aECDSA } /* SSL_PKEY_ED448 */
 };
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 6127cb7a4b480..7dccec6260652 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -33,81 +33,81 @@ typedef struct {
 
 /* Table of NIDs for each cipher */
 static const ssl_cipher_table ssl_cipher_table_cipher[SSL_ENC_NUM_IDX] = {
-    {SSL_DES, NID_des_cbc},     /* SSL_ENC_DES_IDX 0 */
-    {SSL_3DES, NID_des_ede3_cbc}, /* SSL_ENC_3DES_IDX 1 */
-    {SSL_RC4, NID_rc4},         /* SSL_ENC_RC4_IDX 2 */
-    {SSL_RC2, NID_rc2_cbc},     /* SSL_ENC_RC2_IDX 3 */
-    {SSL_IDEA, NID_idea_cbc},   /* SSL_ENC_IDEA_IDX 4 */
-    {SSL_eNULL, NID_undef},     /* SSL_ENC_NULL_IDX 5 */
-    {SSL_AES128, NID_aes_128_cbc}, /* SSL_ENC_AES128_IDX 6 */
-    {SSL_AES256, NID_aes_256_cbc}, /* SSL_ENC_AES256_IDX 7 */
-    {SSL_CAMELLIA128, NID_camellia_128_cbc}, /* SSL_ENC_CAMELLIA128_IDX 8 */
-    {SSL_CAMELLIA256, NID_camellia_256_cbc}, /* SSL_ENC_CAMELLIA256_IDX 9 */
-    {SSL_eGOST2814789CNT, NID_gost89_cnt}, /* SSL_ENC_GOST89_IDX 10 */
-    {SSL_SEED, NID_seed_cbc},   /* SSL_ENC_SEED_IDX 11 */
-    {SSL_AES128GCM, NID_aes_128_gcm}, /* SSL_ENC_AES128GCM_IDX 12 */
-    {SSL_AES256GCM, NID_aes_256_gcm}, /* SSL_ENC_AES256GCM_IDX 13 */
-    {SSL_AES128CCM, NID_aes_128_ccm}, /* SSL_ENC_AES128CCM_IDX 14 */
-    {SSL_AES256CCM, NID_aes_256_ccm}, /* SSL_ENC_AES256CCM_IDX 15 */
-    {SSL_AES128CCM8, NID_aes_128_ccm}, /* SSL_ENC_AES128CCM8_IDX 16 */
-    {SSL_AES256CCM8, NID_aes_256_ccm}, /* SSL_ENC_AES256CCM8_IDX 17 */
-    {SSL_eGOST2814789CNT12, NID_gost89_cnt_12}, /* SSL_ENC_GOST8912_IDX 18 */
-    {SSL_CHACHA20POLY1305, NID_chacha20_poly1305}, /* SSL_ENC_CHACHA_IDX 19 */
-    {SSL_ARIA128GCM, NID_aria_128_gcm}, /* SSL_ENC_ARIA128GCM_IDX 20 */
-    {SSL_ARIA256GCM, NID_aria_256_gcm}, /* SSL_ENC_ARIA256GCM_IDX 21 */
-    {SSL_MAGMA, NID_magma_ctr_acpkm}, /* SSL_ENC_MAGMA_IDX */
-    {SSL_KUZNYECHIK, NID_kuznyechik_ctr_acpkm}, /* SSL_ENC_KUZNYECHIK_IDX */
+    { SSL_DES, NID_des_cbc }, /* SSL_ENC_DES_IDX 0 */
+    { SSL_3DES, NID_des_ede3_cbc }, /* SSL_ENC_3DES_IDX 1 */
+    { SSL_RC4, NID_rc4 }, /* SSL_ENC_RC4_IDX 2 */
+    { SSL_RC2, NID_rc2_cbc }, /* SSL_ENC_RC2_IDX 3 */
+    { SSL_IDEA, NID_idea_cbc }, /* SSL_ENC_IDEA_IDX 4 */
+    { SSL_eNULL, NID_undef }, /* SSL_ENC_NULL_IDX 5 */
+    { SSL_AES128, NID_aes_128_cbc }, /* SSL_ENC_AES128_IDX 6 */
+    { SSL_AES256, NID_aes_256_cbc }, /* SSL_ENC_AES256_IDX 7 */
+    { SSL_CAMELLIA128, NID_camellia_128_cbc }, /* SSL_ENC_CAMELLIA128_IDX 8 */
+    { SSL_CAMELLIA256, NID_camellia_256_cbc }, /* SSL_ENC_CAMELLIA256_IDX 9 */
+    { SSL_eGOST2814789CNT, NID_gost89_cnt }, /* SSL_ENC_GOST89_IDX 10 */
+    { SSL_SEED, NID_seed_cbc }, /* SSL_ENC_SEED_IDX 11 */
+    { SSL_AES128GCM, NID_aes_128_gcm }, /* SSL_ENC_AES128GCM_IDX 12 */
+    { SSL_AES256GCM, NID_aes_256_gcm }, /* SSL_ENC_AES256GCM_IDX 13 */
+    { SSL_AES128CCM, NID_aes_128_ccm }, /* SSL_ENC_AES128CCM_IDX 14 */
+    { SSL_AES256CCM, NID_aes_256_ccm }, /* SSL_ENC_AES256CCM_IDX 15 */
+    { SSL_AES128CCM8, NID_aes_128_ccm }, /* SSL_ENC_AES128CCM8_IDX 16 */
+    { SSL_AES256CCM8, NID_aes_256_ccm }, /* SSL_ENC_AES256CCM8_IDX 17 */
+    { SSL_eGOST2814789CNT12, NID_gost89_cnt_12 }, /* SSL_ENC_GOST8912_IDX 18 */
+    { SSL_CHACHA20POLY1305, NID_chacha20_poly1305 }, /* SSL_ENC_CHACHA_IDX 19 */
+    { SSL_ARIA128GCM, NID_aria_128_gcm }, /* SSL_ENC_ARIA128GCM_IDX 20 */
+    { SSL_ARIA256GCM, NID_aria_256_gcm }, /* SSL_ENC_ARIA256GCM_IDX 21 */
+    { SSL_MAGMA, NID_magma_ctr_acpkm }, /* SSL_ENC_MAGMA_IDX */
+    { SSL_KUZNYECHIK, NID_kuznyechik_ctr_acpkm }, /* SSL_ENC_KUZNYECHIK_IDX */
 };
 
 /* NB: make sure indices in this table matches values above */
 static const ssl_cipher_table ssl_cipher_table_mac[SSL_MD_NUM_IDX] = {
-    {SSL_MD5, NID_md5},         /* SSL_MD_MD5_IDX 0 */
-    {SSL_SHA1, NID_sha1},       /* SSL_MD_SHA1_IDX 1 */
-    {SSL_GOST94, NID_id_GostR3411_94}, /* SSL_MD_GOST94_IDX 2 */
-    {SSL_GOST89MAC, NID_id_Gost28147_89_MAC}, /* SSL_MD_GOST89MAC_IDX 3 */
-    {SSL_SHA256, NID_sha256},   /* SSL_MD_SHA256_IDX 4 */
-    {SSL_SHA384, NID_sha384},   /* SSL_MD_SHA384_IDX 5 */
-    {SSL_GOST12_256, NID_id_GostR3411_2012_256}, /* SSL_MD_GOST12_256_IDX 6 */
-    {SSL_GOST89MAC12, NID_gost_mac_12}, /* SSL_MD_GOST89MAC12_IDX 7 */
-    {SSL_GOST12_512, NID_id_GostR3411_2012_512}, /* SSL_MD_GOST12_512_IDX 8 */
-    {0, NID_md5_sha1},          /* SSL_MD_MD5_SHA1_IDX 9 */
-    {0, NID_sha224},            /* SSL_MD_SHA224_IDX 10 */
-    {0, NID_sha512},            /* SSL_MD_SHA512_IDX 11 */
-    {SSL_MAGMAOMAC, NID_magma_mac}, /* sSL_MD_MAGMAOMAC_IDX */
-    {SSL_KUZNYECHIKOMAC, NID_kuznyechik_mac} /* SSL_MD_KUZNYECHIKOMAC_IDX */
+    { SSL_MD5, NID_md5 }, /* SSL_MD_MD5_IDX 0 */
+    { SSL_SHA1, NID_sha1 }, /* SSL_MD_SHA1_IDX 1 */
+    { SSL_GOST94, NID_id_GostR3411_94 }, /* SSL_MD_GOST94_IDX 2 */
+    { SSL_GOST89MAC, NID_id_Gost28147_89_MAC }, /* SSL_MD_GOST89MAC_IDX 3 */
+    { SSL_SHA256, NID_sha256 }, /* SSL_MD_SHA256_IDX 4 */
+    { SSL_SHA384, NID_sha384 }, /* SSL_MD_SHA384_IDX 5 */
+    { SSL_GOST12_256, NID_id_GostR3411_2012_256 }, /* SSL_MD_GOST12_256_IDX 6 */
+    { SSL_GOST89MAC12, NID_gost_mac_12 }, /* SSL_MD_GOST89MAC12_IDX 7 */
+    { SSL_GOST12_512, NID_id_GostR3411_2012_512 }, /* SSL_MD_GOST12_512_IDX 8 */
+    { 0, NID_md5_sha1 }, /* SSL_MD_MD5_SHA1_IDX 9 */
+    { 0, NID_sha224 }, /* SSL_MD_SHA224_IDX 10 */
+    { 0, NID_sha512 }, /* SSL_MD_SHA512_IDX 11 */
+    { SSL_MAGMAOMAC, NID_magma_mac }, /* sSL_MD_MAGMAOMAC_IDX */
+    { SSL_KUZNYECHIKOMAC, NID_kuznyechik_mac } /* SSL_MD_KUZNYECHIKOMAC_IDX */
 };
 
 /* *INDENT-OFF* */
 static const ssl_cipher_table ssl_cipher_table_kx[] = {
-    {SSL_kRSA,      NID_kx_rsa},
-    {SSL_kECDHE,    NID_kx_ecdhe},
-    {SSL_kDHE,      NID_kx_dhe},
-    {SSL_kECDHEPSK, NID_kx_ecdhe_psk},
-    {SSL_kDHEPSK,   NID_kx_dhe_psk},
-    {SSL_kRSAPSK,   NID_kx_rsa_psk},
-    {SSL_kPSK,      NID_kx_psk},
-    {SSL_kSRP,      NID_kx_srp},
-    {SSL_kGOST,     NID_kx_gost},
-    {SSL_kGOST18,   NID_kx_gost18},
-    {SSL_kANY,      NID_kx_any}
+    { SSL_kRSA, NID_kx_rsa },
+    { SSL_kECDHE, NID_kx_ecdhe },
+    { SSL_kDHE, NID_kx_dhe },
+    { SSL_kECDHEPSK, NID_kx_ecdhe_psk },
+    { SSL_kDHEPSK, NID_kx_dhe_psk },
+    { SSL_kRSAPSK, NID_kx_rsa_psk },
+    { SSL_kPSK, NID_kx_psk },
+    { SSL_kSRP, NID_kx_srp },
+    { SSL_kGOST, NID_kx_gost },
+    { SSL_kGOST18, NID_kx_gost18 },
+    { SSL_kANY, NID_kx_any }
 };
 
 static const ssl_cipher_table ssl_cipher_table_auth[] = {
-    {SSL_aRSA,    NID_auth_rsa},
-    {SSL_aECDSA,  NID_auth_ecdsa},
-    {SSL_aPSK,    NID_auth_psk},
-    {SSL_aDSS,    NID_auth_dss},
-    {SSL_aGOST01, NID_auth_gost01},
-    {SSL_aGOST12, NID_auth_gost12},
-    {SSL_aSRP,    NID_auth_srp},
-    {SSL_aNULL,   NID_auth_null},
-    {SSL_aANY,    NID_auth_any}
+    { SSL_aRSA, NID_auth_rsa },
+    { SSL_aECDSA, NID_auth_ecdsa },
+    { SSL_aPSK, NID_auth_psk },
+    { SSL_aDSS, NID_auth_dss },
+    { SSL_aGOST01, NID_auth_gost01 },
+    { SSL_aGOST12, NID_auth_gost12 },
+    { SSL_aSRP, NID_auth_srp },
+    { SSL_aNULL, NID_auth_null },
+    { SSL_aANY, NID_auth_any }
 };
 /* *INDENT-ON* */
 
 /* Utility function for table lookup */
 static int ssl_cipher_info_find(const ssl_cipher_table *table,
-                                size_t table_cnt, uint32_t mask)
+    size_t table_cnt, uint32_t mask)
 {
     size_t i;
     for (i = 0; i < table_cnt; i++, table++) {
@@ -136,16 +136,16 @@ static const int default_mac_pkey_id[SSL_MD_NUM_IDX] = {
     NID_undef, NID_undef, NID_undef, NID_undef, NID_undef
 };
 
-#define CIPHER_ADD      1
-#define CIPHER_KILL     2
-#define CIPHER_DEL      3
-#define CIPHER_ORD      4
-#define CIPHER_SPECIAL  5
+#define CIPHER_ADD 1
+#define CIPHER_KILL 2
+#define CIPHER_DEL 3
+#define CIPHER_ORD 4
+#define CIPHER_SPECIAL 5
 /*
  * Bump the ciphers to the top of the list.
  * This rule isn't currently supported by the public cipherstring API.
  */
-#define CIPHER_BUMP     6
+#define CIPHER_BUMP 6
 
 typedef struct cipher_order_st {
     const SSL_CIPHER *cipher;
@@ -156,122 +156,122 @@ typedef struct cipher_order_st {
 
 static const SSL_CIPHER cipher_aliases[] = {
     /* "ALL" doesn't include eNULL (must be specifically enabled) */
-    {0, SSL_TXT_ALL, NULL, 0, 0, 0, ~SSL_eNULL},
+    { 0, SSL_TXT_ALL, NULL, 0, 0, 0, ~SSL_eNULL },
     /* "COMPLEMENTOFALL" */
-    {0, SSL_TXT_CMPALL, NULL, 0, 0, 0, SSL_eNULL},
+    { 0, SSL_TXT_CMPALL, NULL, 0, 0, 0, SSL_eNULL },
 
     /*
      * "COMPLEMENTOFDEFAULT" (does *not* include ciphersuites not found in
      * ALL!)
      */
-    {0, SSL_TXT_CMPDEF, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, SSL_NOT_DEFAULT},
+    { 0, SSL_TXT_CMPDEF, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, SSL_NOT_DEFAULT },
 
     /*
      * key exchange aliases (some of those using only a single bit here
      * combine multiple key exchange algs according to the RFCs, e.g. kDHE
      * combines DHE_DSS and DHE_RSA)
      */
-    {0, SSL_TXT_kRSA, NULL, 0, SSL_kRSA},
+    { 0, SSL_TXT_kRSA, NULL, 0, SSL_kRSA },
 
-    {0, SSL_TXT_kEDH, NULL, 0, SSL_kDHE},
-    {0, SSL_TXT_kDHE, NULL, 0, SSL_kDHE},
-    {0, SSL_TXT_DH, NULL, 0, SSL_kDHE},
+    { 0, SSL_TXT_kEDH, NULL, 0, SSL_kDHE },
+    { 0, SSL_TXT_kDHE, NULL, 0, SSL_kDHE },
+    { 0, SSL_TXT_DH, NULL, 0, SSL_kDHE },
 
-    {0, SSL_TXT_kEECDH, NULL, 0, SSL_kECDHE},
-    {0, SSL_TXT_kECDHE, NULL, 0, SSL_kECDHE},
-    {0, SSL_TXT_ECDH, NULL, 0, SSL_kECDHE},
+    { 0, SSL_TXT_kEECDH, NULL, 0, SSL_kECDHE },
+    { 0, SSL_TXT_kECDHE, NULL, 0, SSL_kECDHE },
+    { 0, SSL_TXT_ECDH, NULL, 0, SSL_kECDHE },
 
-    {0, SSL_TXT_kPSK, NULL, 0, SSL_kPSK},
-    {0, SSL_TXT_kRSAPSK, NULL, 0, SSL_kRSAPSK},
-    {0, SSL_TXT_kECDHEPSK, NULL, 0, SSL_kECDHEPSK},
-    {0, SSL_TXT_kDHEPSK, NULL, 0, SSL_kDHEPSK},
-    {0, SSL_TXT_kSRP, NULL, 0, SSL_kSRP},
-    {0, SSL_TXT_kGOST, NULL, 0, SSL_kGOST},
-    {0, SSL_TXT_kGOST18, NULL, 0, SSL_kGOST18},
+    { 0, SSL_TXT_kPSK, NULL, 0, SSL_kPSK },
+    { 0, SSL_TXT_kRSAPSK, NULL, 0, SSL_kRSAPSK },
+    { 0, SSL_TXT_kECDHEPSK, NULL, 0, SSL_kECDHEPSK },
+    { 0, SSL_TXT_kDHEPSK, NULL, 0, SSL_kDHEPSK },
+    { 0, SSL_TXT_kSRP, NULL, 0, SSL_kSRP },
+    { 0, SSL_TXT_kGOST, NULL, 0, SSL_kGOST },
+    { 0, SSL_TXT_kGOST18, NULL, 0, SSL_kGOST18 },
 
     /* server authentication aliases */
-    {0, SSL_TXT_aRSA, NULL, 0, 0, SSL_aRSA},
-    {0, SSL_TXT_aDSS, NULL, 0, 0, SSL_aDSS},
-    {0, SSL_TXT_DSS, NULL, 0, 0, SSL_aDSS},
-    {0, SSL_TXT_aNULL, NULL, 0, 0, SSL_aNULL},
-    {0, SSL_TXT_aECDSA, NULL, 0, 0, SSL_aECDSA},
-    {0, SSL_TXT_ECDSA, NULL, 0, 0, SSL_aECDSA},
-    {0, SSL_TXT_aPSK, NULL, 0, 0, SSL_aPSK},
-    {0, SSL_TXT_aGOST01, NULL, 0, 0, SSL_aGOST01},
-    {0, SSL_TXT_aGOST12, NULL, 0, 0, SSL_aGOST12},
-    {0, SSL_TXT_aGOST, NULL, 0, 0, SSL_aGOST01 | SSL_aGOST12},
-    {0, SSL_TXT_aSRP, NULL, 0, 0, SSL_aSRP},
+    { 0, SSL_TXT_aRSA, NULL, 0, 0, SSL_aRSA },
+    { 0, SSL_TXT_aDSS, NULL, 0, 0, SSL_aDSS },
+    { 0, SSL_TXT_DSS, NULL, 0, 0, SSL_aDSS },
+    { 0, SSL_TXT_aNULL, NULL, 0, 0, SSL_aNULL },
+    { 0, SSL_TXT_aECDSA, NULL, 0, 0, SSL_aECDSA },
+    { 0, SSL_TXT_ECDSA, NULL, 0, 0, SSL_aECDSA },
+    { 0, SSL_TXT_aPSK, NULL, 0, 0, SSL_aPSK },
+    { 0, SSL_TXT_aGOST01, NULL, 0, 0, SSL_aGOST01 },
+    { 0, SSL_TXT_aGOST12, NULL, 0, 0, SSL_aGOST12 },
+    { 0, SSL_TXT_aGOST, NULL, 0, 0, SSL_aGOST01 | SSL_aGOST12 },
+    { 0, SSL_TXT_aSRP, NULL, 0, 0, SSL_aSRP },
 
     /* aliases combining key exchange and server authentication */
-    {0, SSL_TXT_EDH, NULL, 0, SSL_kDHE, ~SSL_aNULL},
-    {0, SSL_TXT_DHE, NULL, 0, SSL_kDHE, ~SSL_aNULL},
-    {0, SSL_TXT_EECDH, NULL, 0, SSL_kECDHE, ~SSL_aNULL},
-    {0, SSL_TXT_ECDHE, NULL, 0, SSL_kECDHE, ~SSL_aNULL},
-    {0, SSL_TXT_NULL, NULL, 0, 0, 0, SSL_eNULL},
-    {0, SSL_TXT_RSA, NULL, 0, SSL_kRSA, SSL_aRSA},
-    {0, SSL_TXT_ADH, NULL, 0, SSL_kDHE, SSL_aNULL},
-    {0, SSL_TXT_AECDH, NULL, 0, SSL_kECDHE, SSL_aNULL},
-    {0, SSL_TXT_PSK, NULL, 0, SSL_PSK},
-    {0, SSL_TXT_SRP, NULL, 0, SSL_kSRP},
+    { 0, SSL_TXT_EDH, NULL, 0, SSL_kDHE, ~SSL_aNULL },
+    { 0, SSL_TXT_DHE, NULL, 0, SSL_kDHE, ~SSL_aNULL },
+    { 0, SSL_TXT_EECDH, NULL, 0, SSL_kECDHE, ~SSL_aNULL },
+    { 0, SSL_TXT_ECDHE, NULL, 0, SSL_kECDHE, ~SSL_aNULL },
+    { 0, SSL_TXT_NULL, NULL, 0, 0, 0, SSL_eNULL },
+    { 0, SSL_TXT_RSA, NULL, 0, SSL_kRSA, SSL_aRSA },
+    { 0, SSL_TXT_ADH, NULL, 0, SSL_kDHE, SSL_aNULL },
+    { 0, SSL_TXT_AECDH, NULL, 0, SSL_kECDHE, SSL_aNULL },
+    { 0, SSL_TXT_PSK, NULL, 0, SSL_PSK },
+    { 0, SSL_TXT_SRP, NULL, 0, SSL_kSRP },
 
     /* symmetric encryption aliases */
-    {0, SSL_TXT_3DES, NULL, 0, 0, 0, SSL_3DES},
-    {0, SSL_TXT_RC4, NULL, 0, 0, 0, SSL_RC4},
-    {0, SSL_TXT_RC2, NULL, 0, 0, 0, SSL_RC2},
-    {0, SSL_TXT_IDEA, NULL, 0, 0, 0, SSL_IDEA},
-    {0, SSL_TXT_SEED, NULL, 0, 0, 0, SSL_SEED},
-    {0, SSL_TXT_eNULL, NULL, 0, 0, 0, SSL_eNULL},
-    {0, SSL_TXT_GOST, NULL, 0, 0, 0,
-     SSL_eGOST2814789CNT | SSL_eGOST2814789CNT12 | SSL_MAGMA | SSL_KUZNYECHIK},
-    {0, SSL_TXT_AES128, NULL, 0, 0, 0,
-     SSL_AES128 | SSL_AES128GCM | SSL_AES128CCM | SSL_AES128CCM8},
-    {0, SSL_TXT_AES256, NULL, 0, 0, 0,
-     SSL_AES256 | SSL_AES256GCM | SSL_AES256CCM | SSL_AES256CCM8},
-    {0, SSL_TXT_AES, NULL, 0, 0, 0, SSL_AES},
-    {0, SSL_TXT_AES_GCM, NULL, 0, 0, 0, SSL_AES128GCM | SSL_AES256GCM},
-    {0, SSL_TXT_AES_CCM, NULL, 0, 0, 0,
-     SSL_AES128CCM | SSL_AES256CCM | SSL_AES128CCM8 | SSL_AES256CCM8},
-    {0, SSL_TXT_AES_CCM_8, NULL, 0, 0, 0, SSL_AES128CCM8 | SSL_AES256CCM8},
-    {0, SSL_TXT_CAMELLIA128, NULL, 0, 0, 0, SSL_CAMELLIA128},
-    {0, SSL_TXT_CAMELLIA256, NULL, 0, 0, 0, SSL_CAMELLIA256},
-    {0, SSL_TXT_CAMELLIA, NULL, 0, 0, 0, SSL_CAMELLIA},
-    {0, SSL_TXT_CHACHA20, NULL, 0, 0, 0, SSL_CHACHA20},
-    {0, SSL_TXT_GOST2012_GOST8912_GOST8912, NULL, 0, 0, 0, SSL_eGOST2814789CNT12},
-
-    {0, SSL_TXT_ARIA, NULL, 0, 0, 0, SSL_ARIA},
-    {0, SSL_TXT_ARIA_GCM, NULL, 0, 0, 0, SSL_ARIA128GCM | SSL_ARIA256GCM},
-    {0, SSL_TXT_ARIA128, NULL, 0, 0, 0, SSL_ARIA128GCM},
-    {0, SSL_TXT_ARIA256, NULL, 0, 0, 0, SSL_ARIA256GCM},
-    {0, SSL_TXT_CBC, NULL, 0, 0, 0, SSL_CBC},
+    { 0, SSL_TXT_3DES, NULL, 0, 0, 0, SSL_3DES },
+    { 0, SSL_TXT_RC4, NULL, 0, 0, 0, SSL_RC4 },
+    { 0, SSL_TXT_RC2, NULL, 0, 0, 0, SSL_RC2 },
+    { 0, SSL_TXT_IDEA, NULL, 0, 0, 0, SSL_IDEA },
+    { 0, SSL_TXT_SEED, NULL, 0, 0, 0, SSL_SEED },
+    { 0, SSL_TXT_eNULL, NULL, 0, 0, 0, SSL_eNULL },
+    { 0, SSL_TXT_GOST, NULL, 0, 0, 0,
+        SSL_eGOST2814789CNT | SSL_eGOST2814789CNT12 | SSL_MAGMA | SSL_KUZNYECHIK },
+    { 0, SSL_TXT_AES128, NULL, 0, 0, 0,
+        SSL_AES128 | SSL_AES128GCM | SSL_AES128CCM | SSL_AES128CCM8 },
+    { 0, SSL_TXT_AES256, NULL, 0, 0, 0,
+        SSL_AES256 | SSL_AES256GCM | SSL_AES256CCM | SSL_AES256CCM8 },
+    { 0, SSL_TXT_AES, NULL, 0, 0, 0, SSL_AES },
+    { 0, SSL_TXT_AES_GCM, NULL, 0, 0, 0, SSL_AES128GCM | SSL_AES256GCM },
+    { 0, SSL_TXT_AES_CCM, NULL, 0, 0, 0,
+        SSL_AES128CCM | SSL_AES256CCM | SSL_AES128CCM8 | SSL_AES256CCM8 },
+    { 0, SSL_TXT_AES_CCM_8, NULL, 0, 0, 0, SSL_AES128CCM8 | SSL_AES256CCM8 },
+    { 0, SSL_TXT_CAMELLIA128, NULL, 0, 0, 0, SSL_CAMELLIA128 },
+    { 0, SSL_TXT_CAMELLIA256, NULL, 0, 0, 0, SSL_CAMELLIA256 },
+    { 0, SSL_TXT_CAMELLIA, NULL, 0, 0, 0, SSL_CAMELLIA },
+    { 0, SSL_TXT_CHACHA20, NULL, 0, 0, 0, SSL_CHACHA20 },
+    { 0, SSL_TXT_GOST2012_GOST8912_GOST8912, NULL, 0, 0, 0, SSL_eGOST2814789CNT12 },
+
+    { 0, SSL_TXT_ARIA, NULL, 0, 0, 0, SSL_ARIA },
+    { 0, SSL_TXT_ARIA_GCM, NULL, 0, 0, 0, SSL_ARIA128GCM | SSL_ARIA256GCM },
+    { 0, SSL_TXT_ARIA128, NULL, 0, 0, 0, SSL_ARIA128GCM },
+    { 0, SSL_TXT_ARIA256, NULL, 0, 0, 0, SSL_ARIA256GCM },
+    { 0, SSL_TXT_CBC, NULL, 0, 0, 0, SSL_CBC },
 
     /* MAC aliases */
-    {0, SSL_TXT_MD5, NULL, 0, 0, 0, 0, SSL_MD5},
-    {0, SSL_TXT_SHA1, NULL, 0, 0, 0, 0, SSL_SHA1},
-    {0, SSL_TXT_SHA, NULL, 0, 0, 0, 0, SSL_SHA1},
-    {0, SSL_TXT_GOST94, NULL, 0, 0, 0, 0, SSL_GOST94},
-    {0, SSL_TXT_GOST89MAC, NULL, 0, 0, 0, 0, SSL_GOST89MAC | SSL_GOST89MAC12},
-    {0, SSL_TXT_SHA256, NULL, 0, 0, 0, 0, SSL_SHA256},
-    {0, SSL_TXT_SHA384, NULL, 0, 0, 0, 0, SSL_SHA384},
-    {0, SSL_TXT_GOST12, NULL, 0, 0, 0, 0, SSL_GOST12_256},
+    { 0, SSL_TXT_MD5, NULL, 0, 0, 0, 0, SSL_MD5 },
+    { 0, SSL_TXT_SHA1, NULL, 0, 0, 0, 0, SSL_SHA1 },
+    { 0, SSL_TXT_SHA, NULL, 0, 0, 0, 0, SSL_SHA1 },
+    { 0, SSL_TXT_GOST94, NULL, 0, 0, 0, 0, SSL_GOST94 },
+    { 0, SSL_TXT_GOST89MAC, NULL, 0, 0, 0, 0, SSL_GOST89MAC | SSL_GOST89MAC12 },
+    { 0, SSL_TXT_SHA256, NULL, 0, 0, 0, 0, SSL_SHA256 },
+    { 0, SSL_TXT_SHA384, NULL, 0, 0, 0, 0, SSL_SHA384 },
+    { 0, SSL_TXT_GOST12, NULL, 0, 0, 0, 0, SSL_GOST12_256 },
 
     /* protocol version aliases */
-    {0, SSL_TXT_SSLV3, NULL, 0, 0, 0, 0, 0, SSL3_VERSION},
-    {0, SSL_TXT_TLSV1, NULL, 0, 0, 0, 0, 0, TLS1_VERSION},
-    {0, "TLSv1.0", NULL, 0, 0, 0, 0, 0, TLS1_VERSION},
-    {0, SSL_TXT_TLSV1_2, NULL, 0, 0, 0, 0, 0, TLS1_2_VERSION},
+    { 0, SSL_TXT_SSLV3, NULL, 0, 0, 0, 0, 0, SSL3_VERSION },
+    { 0, SSL_TXT_TLSV1, NULL, 0, 0, 0, 0, 0, TLS1_VERSION },
+    { 0, "TLSv1.0", NULL, 0, 0, 0, 0, 0, TLS1_VERSION },
+    { 0, SSL_TXT_TLSV1_2, NULL, 0, 0, 0, 0, 0, TLS1_2_VERSION },
 
     /* strength classes */
-    {0, SSL_TXT_LOW, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, SSL_LOW},
-    {0, SSL_TXT_MEDIUM, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, SSL_MEDIUM},
-    {0, SSL_TXT_HIGH, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, SSL_HIGH},
+    { 0, SSL_TXT_LOW, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, SSL_LOW },
+    { 0, SSL_TXT_MEDIUM, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, SSL_MEDIUM },
+    { 0, SSL_TXT_HIGH, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, SSL_HIGH },
     /* FIPS 140-2 approved ciphersuite */
-    {0, SSL_TXT_FIPS, NULL, 0, 0, 0, ~SSL_eNULL, 0, 0, 0, 0, 0, SSL_FIPS},
+    { 0, SSL_TXT_FIPS, NULL, 0, 0, 0, ~SSL_eNULL, 0, 0, 0, 0, 0, SSL_FIPS },
 
     /* "EDH-" aliases to "DHE-" labels (for backward compatibility) */
-    {0, SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA, NULL, 0,
-     SSL_kDHE, SSL_aDSS, SSL_3DES, SSL_SHA1, 0, 0, 0, 0, SSL_HIGH | SSL_FIPS},
-    {0, SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA, NULL, 0,
-     SSL_kDHE, SSL_aRSA, SSL_3DES, SSL_SHA1, 0, 0, 0, 0, SSL_HIGH | SSL_FIPS},
+    { 0, SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA, NULL, 0,
+        SSL_kDHE, SSL_aDSS, SSL_3DES, SSL_SHA1, 0, 0, 0, 0, SSL_HIGH | SSL_FIPS },
+    { 0, SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA, NULL, 0,
+        SSL_kDHE, SSL_aRSA, SSL_3DES, SSL_SHA1, 0, 0, 0, 0, SSL_HIGH | SSL_FIPS },
 
 };
 
@@ -286,8 +286,7 @@ static int get_optional_pkey_id(const char *pkey_name)
     const EVP_PKEY_ASN1_METHOD *ameth;
     int pkey_id = 0;
     ameth = EVP_PKEY_asn1_find_str(NULL, pkey_name, -1);
-    if (ameth && EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL,
-                                         ameth) > 0)
+    if (ameth && EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth) > 0)
         return pkey_id;
     return 0;
 }
@@ -302,7 +301,8 @@ static int get_optional_pkey_id(const char *pkey_name)
     ameth = EVP_PKEY_asn1_find_str(&tmpeng, pkey_name, -1);
     if (ameth) {
         if (EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL,
-                                    ameth) <= 0)
+                ameth)
+            <= 0)
             pkey_id = 0;
     }
     tls_engine_finish(tmpeng);
@@ -389,31 +389,27 @@ int ssl_load_ciphers(SSL_CTX *ctx)
      * present, disable appropriate auth and key exchange
      */
     memcpy(ctx->ssl_mac_pkey_id, default_mac_pkey_id,
-           sizeof(ctx->ssl_mac_pkey_id));
+        sizeof(ctx->ssl_mac_pkey_id));
 
-    ctx->ssl_mac_pkey_id[SSL_MD_GOST89MAC_IDX] =
-        get_optional_pkey_id(SN_id_Gost28147_89_MAC);
+    ctx->ssl_mac_pkey_id[SSL_MD_GOST89MAC_IDX] = get_optional_pkey_id(SN_id_Gost28147_89_MAC);
     if (ctx->ssl_mac_pkey_id[SSL_MD_GOST89MAC_IDX])
         ctx->ssl_mac_secret_size[SSL_MD_GOST89MAC_IDX] = 32;
     else
         ctx->disabled_mac_mask |= SSL_GOST89MAC;
 
-    ctx->ssl_mac_pkey_id[SSL_MD_GOST89MAC12_IDX] =
-        get_optional_pkey_id(SN_gost_mac_12);
+    ctx->ssl_mac_pkey_id[SSL_MD_GOST89MAC12_IDX] = get_optional_pkey_id(SN_gost_mac_12);
     if (ctx->ssl_mac_pkey_id[SSL_MD_GOST89MAC12_IDX])
         ctx->ssl_mac_secret_size[SSL_MD_GOST89MAC12_IDX] = 32;
     else
         ctx->disabled_mac_mask |= SSL_GOST89MAC12;
 
-    ctx->ssl_mac_pkey_id[SSL_MD_MAGMAOMAC_IDX] =
-        get_optional_pkey_id(SN_magma_mac);
+    ctx->ssl_mac_pkey_id[SSL_MD_MAGMAOMAC_IDX] = get_optional_pkey_id(SN_magma_mac);
     if (ctx->ssl_mac_pkey_id[SSL_MD_MAGMAOMAC_IDX])
         ctx->ssl_mac_secret_size[SSL_MD_MAGMAOMAC_IDX] = 32;
     else
         ctx->disabled_mac_mask |= SSL_MAGMAOMAC;
 
-    ctx->ssl_mac_pkey_id[SSL_MD_KUZNYECHIKOMAC_IDX] =
-        get_optional_pkey_id(SN_kuznyechik_mac);
+    ctx->ssl_mac_pkey_id[SSL_MD_KUZNYECHIKOMAC_IDX] = get_optional_pkey_id(SN_kuznyechik_mac);
     if (ctx->ssl_mac_pkey_id[SSL_MD_KUZNYECHIKOMAC_IDX])
         ctx->ssl_mac_secret_size[SSL_MD_KUZNYECHIKOMAC_IDX] = 32;
     else
@@ -428,21 +424,20 @@ int ssl_load_ciphers(SSL_CTX *ctx)
     /*
      * Disable GOST key exchange if no GOST signature algs are available *
      */
-    if ((ctx->disabled_auth_mask & (SSL_aGOST01 | SSL_aGOST12)) ==
-        (SSL_aGOST01 | SSL_aGOST12))
+    if ((ctx->disabled_auth_mask & (SSL_aGOST01 | SSL_aGOST12)) == (SSL_aGOST01 | SSL_aGOST12))
         ctx->disabled_mkey_mask |= SSL_kGOST;
 
-    if ((ctx->disabled_auth_mask & SSL_aGOST12) ==  SSL_aGOST12)
+    if ((ctx->disabled_auth_mask & SSL_aGOST12) == SSL_aGOST12)
         ctx->disabled_mkey_mask |= SSL_kGOST18;
 
     return 1;
 }
 
 int ssl_cipher_get_evp_cipher(SSL_CTX *ctx, const SSL_CIPHER *sslc,
-                              const EVP_CIPHER **enc)
+    const EVP_CIPHER **enc)
 {
     int i = ssl_cipher_info_lookup(ssl_cipher_table_cipher,
-                                   sslc->algorithm_enc);
+        sslc->algorithm_enc);
 
     if (i == -1) {
         *enc = NULL;
@@ -460,7 +455,7 @@ int ssl_cipher_get_evp_cipher(SSL_CTX *ctx, const SSL_CIPHER *sslc,
             const EVP_CIPHER *cipher = ctx->ssl_cipher_methods[i];
 
             if (cipher == NULL
-                    || !ssl_evp_cipher_up_ref(cipher))
+                || !ssl_evp_cipher_up_ref(cipher))
                 return 0;
             *enc = ctx->ssl_cipher_methods[i];
         }
@@ -469,8 +464,8 @@ int ssl_cipher_get_evp_cipher(SSL_CTX *ctx, const SSL_CIPHER *sslc,
 }
 
 int ssl_cipher_get_evp_md_mac(SSL_CTX *ctx, const SSL_CIPHER *sslc,
-                              const EVP_MD **md,
-                              int *mac_pkey_type, size_t *mac_secret_size)
+    const EVP_MD **md,
+    int *mac_pkey_type, size_t *mac_secret_size)
 {
     int i = ssl_cipher_info_lookup(ssl_cipher_table_mac, sslc->algorithm_mac);
 
@@ -483,7 +478,7 @@ int ssl_cipher_get_evp_md_mac(SSL_CTX *ctx, const SSL_CIPHER *sslc,
     } else {
         const EVP_MD *digest = ctx->ssl_digest_methods[i];
 
-        if (digest == NULL || !ssl_evp_md_up_ref(digest)) 
+        if (digest == NULL || !ssl_evp_md_up_ref(digest))
             return 0;
 
         *md = digest;
@@ -496,9 +491,9 @@ int ssl_cipher_get_evp_md_mac(SSL_CTX *ctx, const SSL_CIPHER *sslc,
 }
 
 int ssl_cipher_get_evp(SSL_CTX *ctx, const SSL_SESSION *s,
-                       const EVP_CIPHER **enc, const EVP_MD **md,
-                       int *mac_pkey_type, size_t *mac_secret_size,
-                       SSL_COMP **comp, int use_etm)
+    const EVP_CIPHER **enc, const EVP_MD **md,
+    int *mac_pkey_type, size_t *mac_secret_size,
+    SSL_COMP **comp, int use_etm)
 {
     int i;
     const SSL_CIPHER *c;
@@ -530,7 +525,7 @@ int ssl_cipher_get_evp(SSL_CTX *ctx, const SSL_SESSION *s,
         return 0;
 
     if (!ssl_cipher_get_evp_md_mac(ctx, c, md, mac_pkey_type,
-                                   mac_secret_size)) {
+            mac_secret_size)) {
         ssl_evp_cipher_free(*enc);
         return 0;
     }
@@ -543,34 +538,34 @@ int ssl_cipher_get_evp(SSL_CTX *ctx, const SSL_SESSION *s,
         const EVP_CIPHER *evp = NULL;
 
         if (use_etm
-                || s->ssl_version >> 8 != TLS1_VERSION_MAJOR
-                || s->ssl_version < TLS1_VERSION)
+            || s->ssl_version >> 8 != TLS1_VERSION_MAJOR
+            || s->ssl_version < TLS1_VERSION)
             return 1;
 
         if (c->algorithm_enc == SSL_RC4
-                && c->algorithm_mac == SSL_MD5)
+            && c->algorithm_mac == SSL_MD5)
             evp = ssl_evp_cipher_fetch(ctx->libctx, NID_rc4_hmac_md5,
-                                       ctx->propq);
+                ctx->propq);
         else if (c->algorithm_enc == SSL_AES128
-                    && c->algorithm_mac == SSL_SHA1)
+            && c->algorithm_mac == SSL_SHA1)
             evp = ssl_evp_cipher_fetch(ctx->libctx,
-                                       NID_aes_128_cbc_hmac_sha1,
-                                       ctx->propq);
+                NID_aes_128_cbc_hmac_sha1,
+                ctx->propq);
         else if (c->algorithm_enc == SSL_AES256
-                    && c->algorithm_mac == SSL_SHA1)
-             evp = ssl_evp_cipher_fetch(ctx->libctx,
-                                        NID_aes_256_cbc_hmac_sha1,
-                                        ctx->propq);
+            && c->algorithm_mac == SSL_SHA1)
+            evp = ssl_evp_cipher_fetch(ctx->libctx,
+                NID_aes_256_cbc_hmac_sha1,
+                ctx->propq);
         else if (c->algorithm_enc == SSL_AES128
-                    && c->algorithm_mac == SSL_SHA256)
+            && c->algorithm_mac == SSL_SHA256)
             evp = ssl_evp_cipher_fetch(ctx->libctx,
-                                       NID_aes_128_cbc_hmac_sha256,
-                                       ctx->propq);
+                NID_aes_128_cbc_hmac_sha256,
+                ctx->propq);
         else if (c->algorithm_enc == SSL_AES256
-                    && c->algorithm_mac == SSL_SHA256)
+            && c->algorithm_mac == SSL_SHA256)
             evp = ssl_evp_cipher_fetch(ctx->libctx,
-                                       NID_aes_256_cbc_hmac_sha256,
-                                       ctx->propq);
+                NID_aes_256_cbc_hmac_sha256,
+                ctx->propq);
 
         if (evp != NULL) {
             ssl_evp_cipher_free(*enc);
@@ -600,15 +595,14 @@ const EVP_MD *ssl_handshake_md(SSL_CONNECTION *s)
 const EVP_MD *ssl_prf_md(SSL_CONNECTION *s)
 {
     return ssl_md(SSL_CONNECTION_GET_CTX(s),
-                  ssl_get_algorithm2(s) >> TLS1_PRF_DGST_SHIFT);
+        ssl_get_algorithm2(s) >> TLS1_PRF_DGST_SHIFT);
 }
 
-
 #define ITEM_SEP(a) \
-        (((a) == ':') || ((a) == ' ') || ((a) == ';') || ((a) == ','))
+    (((a) == ':') || ((a) == ' ') || ((a) == ';') || ((a) == ','))
 
 static void ll_append_tail(CIPHER_ORDER **head, CIPHER_ORDER *curr,
-                           CIPHER_ORDER **tail)
+    CIPHER_ORDER **tail)
 {
     if (curr == *tail)
         return;
@@ -625,7 +619,7 @@ static void ll_append_tail(CIPHER_ORDER **head, CIPHER_ORDER *curr,
 }
 
 static void ll_append_head(CIPHER_ORDER **head, CIPHER_ORDER *curr,
-                           CIPHER_ORDER **tail)
+    CIPHER_ORDER **tail)
 {
     if (curr == *head)
         return;
@@ -642,14 +636,14 @@ static void ll_append_head(CIPHER_ORDER **head, CIPHER_ORDER *curr,
 }
 
 static void ssl_cipher_collect_ciphers(const SSL_METHOD *ssl_method,
-                                       int num_of_ciphers,
-                                       uint32_t disabled_mkey,
-                                       uint32_t disabled_auth,
-                                       uint32_t disabled_enc,
-                                       uint32_t disabled_mac,
-                                       CIPHER_ORDER *co_list,
-                                       CIPHER_ORDER **head_p,
-                                       CIPHER_ORDER **tail_p)
+    int num_of_ciphers,
+    uint32_t disabled_mkey,
+    uint32_t disabled_auth,
+    uint32_t disabled_enc,
+    uint32_t disabled_mac,
+    CIPHER_ORDER *co_list,
+    CIPHER_ORDER **head_p,
+    CIPHER_ORDER **tail_p)
 {
     int i, co_list_num;
     const SSL_CIPHER *c;
@@ -662,22 +656,17 @@ static void ssl_cipher_collect_ciphers(const SSL_METHOD *ssl_method,
      */
 
     /* Get the initial list of ciphers */
-    co_list_num = 0;            /* actual count of ciphers */
+    co_list_num = 0; /* actual count of ciphers */
     for (i = 0; i < num_of_ciphers; i++) {
         c = ssl_method->get_cipher(i);
         /* drop those that use any of that is not available */
         if (c == NULL || !c->valid)
             continue;
-        if ((c->algorithm_mkey & disabled_mkey) ||
-            (c->algorithm_auth & disabled_auth) ||
-            (c->algorithm_enc & disabled_enc) ||
-            (c->algorithm_mac & disabled_mac))
+        if ((c->algorithm_mkey & disabled_mkey) || (c->algorithm_auth & disabled_auth) || (c->algorithm_enc & disabled_enc) || (c->algorithm_mac & disabled_mac))
             continue;
-        if (((ssl_method->ssl3_enc->enc_flags & SSL_ENC_FLAG_DTLS) == 0) &&
-            c->min_tls == 0)
+        if (((ssl_method->ssl3_enc->enc_flags & SSL_ENC_FLAG_DTLS) == 0) && c->min_tls == 0)
             continue;
-        if (((ssl_method->ssl3_enc->enc_flags & SSL_ENC_FLAG_DTLS) != 0) &&
-            c->min_dtls == 0)
+        if (((ssl_method->ssl3_enc->enc_flags & SSL_ENC_FLAG_DTLS) != 0) && c->min_dtls == 0)
             continue;
 
         co_list[co_list_num].cipher = c;
@@ -712,12 +701,12 @@ static void ssl_cipher_collect_ciphers(const SSL_METHOD *ssl_method,
 }
 
 static void ssl_cipher_collect_aliases(const SSL_CIPHER **ca_list,
-                                       int num_of_group_aliases,
-                                       uint32_t disabled_mkey,
-                                       uint32_t disabled_auth,
-                                       uint32_t disabled_enc,
-                                       uint32_t disabled_mac,
-                                       CIPHER_ORDER *head)
+    int num_of_group_aliases,
+    uint32_t disabled_mkey,
+    uint32_t disabled_auth,
+    uint32_t disabled_enc,
+    uint32_t disabled_mac,
+    CIPHER_ORDER *head)
 {
     CIPHER_ORDER *ciph_curr;
     const SSL_CIPHER **ca_curr;
@@ -770,31 +759,32 @@ static void ssl_cipher_collect_aliases(const SSL_CIPHER **ca_list,
         ca_curr++;
     }
 
-    *ca_curr = NULL;            /* end of list */
+    *ca_curr = NULL; /* end of list */
 }
 
 static void ssl_cipher_apply_rule(uint32_t cipher_id, uint32_t alg_mkey,
-                                  uint32_t alg_auth, uint32_t alg_enc,
-                                  uint32_t alg_mac, int min_tls,
-                                  uint32_t algo_strength, int rule,
-                                  int32_t strength_bits, CIPHER_ORDER **head_p,
-                                  CIPHER_ORDER **tail_p)
+    uint32_t alg_auth, uint32_t alg_enc,
+    uint32_t alg_mac, int min_tls,
+    uint32_t algo_strength, int rule,
+    int32_t strength_bits, CIPHER_ORDER **head_p,
+    CIPHER_ORDER **tail_p)
 {
     CIPHER_ORDER *head, *tail, *curr, *next, *last;
     const SSL_CIPHER *cp;
     int reverse = 0;
 
-    OSSL_TRACE_BEGIN(TLS_CIPHER) {
+    OSSL_TRACE_BEGIN(TLS_CIPHER)
+    {
         BIO_printf(trc_out,
-                   "Applying rule %d with %08x/%08x/%08x/%08x/%08x %08x (%d)\n",
-                   rule, (unsigned int)alg_mkey, (unsigned int)alg_auth,
-                   (unsigned int)alg_enc, (unsigned int)alg_mac, min_tls,
-                   (unsigned int)algo_strength, (int)strength_bits);
+            "Applying rule %d with %08x/%08x/%08x/%08x/%08x %08x (%d)\n",
+            rule, (unsigned int)alg_mkey, (unsigned int)alg_auth,
+            (unsigned int)alg_enc, (unsigned int)alg_mac, min_tls,
+            (unsigned int)algo_strength, (int)strength_bits);
     }
 
     if (rule == CIPHER_DEL || rule == CIPHER_BUMP)
-        reverse = 1;            /* needed to maintain sorting between currently
-                                 * deleted ciphers */
+        reverse = 1; /* needed to maintain sorting between currently
+                      * deleted ciphers */
 
     head = *head_p;
     tail = *tail_p;
@@ -831,15 +821,15 @@ static void ssl_cipher_apply_rule(uint32_t cipher_id, uint32_t alg_mkey,
         } else {
             if (trc_out != NULL) {
                 BIO_printf(trc_out,
-                           "\nName: %s:"
-                           "\nAlgo = %08x/%08x/%08x/%08x/%08x Algo_strength = %08x\n",
-                           cp->name,
-                           (unsigned int)cp->algorithm_mkey,
-                           (unsigned int)cp->algorithm_auth,
-                           (unsigned int)cp->algorithm_enc,
-                           (unsigned int)cp->algorithm_mac,
-                           cp->min_tls,
-                           (unsigned int)cp->algo_strength);
+                    "\nName: %s:"
+                    "\nAlgo = %08x/%08x/%08x/%08x/%08x Algo_strength = %08x\n",
+                    cp->name,
+                    (unsigned int)cp->algorithm_mkey,
+                    (unsigned int)cp->algorithm_auth,
+                    (unsigned int)cp->algorithm_enc,
+                    (unsigned int)cp->algorithm_mac,
+                    cp->min_tls,
+                    (unsigned int)cp->algo_strength);
             }
             if (cipher_id != 0 && (cipher_id != cp->id))
                 continue;
@@ -917,7 +907,7 @@ static void ssl_cipher_apply_rule(uint32_t cipher_id, uint32_t alg_mkey,
 }
 
 static int ssl_cipher_strength_sort(CIPHER_ORDER **head_p,
-                                    CIPHER_ORDER **tail_p)
+    CIPHER_ORDER **tail_p)
 {
     int32_t max_strength_bits;
     int i, *number_uses;
@@ -956,16 +946,16 @@ static int ssl_cipher_strength_sort(CIPHER_ORDER **head_p,
     for (i = max_strength_bits; i >= 0; i--)
         if (number_uses[i] > 0)
             ssl_cipher_apply_rule(0, 0, 0, 0, 0, 0, 0, CIPHER_ORD, i, head_p,
-                                  tail_p);
+                tail_p);
 
     OPENSSL_free(number_uses);
     return 1;
 }
 
 static int ssl_cipher_process_rulestr(const char *rule_str,
-                                      CIPHER_ORDER **head_p,
-                                      CIPHER_ORDER **tail_p,
-                                      const SSL_CIPHER **ca_list, CERT *c)
+    CIPHER_ORDER **head_p,
+    CIPHER_ORDER **tail_p,
+    const SSL_CIPHER **ca_list, CERT *c)
 {
     uint32_t alg_mkey, alg_auth, alg_enc, alg_mac, algo_strength;
     int min_tls;
@@ -980,7 +970,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
         ch = *l;
 
         if (ch == '\0')
-            break;              /* done */
+            break; /* done */
         if (ch == '-') {
             rule = CIPHER_DEL;
             l++;
@@ -1014,13 +1004,10 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
             buf = l;
             buflen = 0;
 #ifndef CHARSET_EBCDIC
-            while (((ch >= 'A') && (ch <= 'Z')) ||
-                   ((ch >= '0') && (ch <= '9')) ||
-                   ((ch >= 'a') && (ch <= 'z')) ||
-                   (ch == '-') || (ch == '_') || (ch == '.') || (ch == '='))
+            while (((ch >= 'A') && (ch <= 'Z')) || ((ch >= '0') && (ch <= '9')) || ((ch >= 'a') && (ch <= 'z')) || (ch == '-') || (ch == '_') || (ch == '.') || (ch == '='))
 #else
             while (isalnum((unsigned char)ch) || (ch == '-') || (ch == '_') || (ch == '.')
-                   || (ch == '='))
+                || (ch == '='))
 #endif
             {
                 ch = *(++l);
@@ -1038,8 +1025,8 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
             }
 
             if (rule == CIPHER_SPECIAL) {
-                found = 0;      /* unused -- avoid compiler warning */
-                break;          /* special treatment */
+                found = 0; /* unused -- avoid compiler warning */
+                break; /* special treatment */
             }
 
             /* check for multi-part specification */
@@ -1069,8 +1056,8 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
                     found = 1;
                     break;
                 } else if (ca_list[j]->stdname != NULL
-                           && strncmp(buf, ca_list[j]->stdname, buflen) == 0
-                           && ca_list[j]->stdname[buflen] == '\0') {
+                    && strncmp(buf, ca_list[j]->stdname, buflen) == 0
+                    && ca_list[j]->stdname[buflen] == '\0') {
                     found = 1;
                     break;
                 } else
@@ -1078,7 +1065,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
             }
 
             if (!found)
-                break;          /* ignore this entry */
+                break; /* ignore this entry */
 
             if (ca_list[j]->algorithm_mkey) {
                 if (alg_mkey) {
@@ -1130,9 +1117,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
 
             if (ca_list[j]->algo_strength & SSL_STRONG_MASK) {
                 if (algo_strength & SSL_STRONG_MASK) {
-                    algo_strength &=
-                        (ca_list[j]->algo_strength & SSL_STRONG_MASK) |
-                        ~SSL_STRONG_MASK;
+                    algo_strength &= (ca_list[j]->algo_strength & SSL_STRONG_MASK) | ~SSL_STRONG_MASK;
                     if (!(algo_strength & SSL_STRONG_MASK)) {
                         found = 0;
                         break;
@@ -1144,16 +1129,13 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
 
             if (ca_list[j]->algo_strength & SSL_DEFAULT_MASK) {
                 if (algo_strength & SSL_DEFAULT_MASK) {
-                    algo_strength &=
-                        (ca_list[j]->algo_strength & SSL_DEFAULT_MASK) |
-                        ~SSL_DEFAULT_MASK;
+                    algo_strength &= (ca_list[j]->algo_strength & SSL_DEFAULT_MASK) | ~SSL_DEFAULT_MASK;
                     if (!(algo_strength & SSL_DEFAULT_MASK)) {
                         found = 0;
                         break;
                     }
                 } else {
-                    algo_strength |=
-                        ca_list[j]->algo_strength & SSL_DEFAULT_MASK;
+                    algo_strength |= ca_list[j]->algo_strength & SSL_DEFAULT_MASK;
                 }
             }
 
@@ -1214,22 +1196,22 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
                 l++;
         } else if (found) {
             ssl_cipher_apply_rule(cipher_id,
-                                  alg_mkey, alg_auth, alg_enc, alg_mac,
-                                  min_tls, algo_strength, rule, -1, head_p,
-                                  tail_p);
+                alg_mkey, alg_auth, alg_enc, alg_mac,
+                min_tls, algo_strength, rule, -1, head_p,
+                tail_p);
         } else {
             while ((*l != '\0') && !ITEM_SEP(*l))
                 l++;
         }
         if (*l == '\0')
-            break;              /* done */
+            break; /* done */
     }
 
     return retval;
 }
 
 static int check_suiteb_cipher_list(const SSL_METHOD *meth, CERT *c,
-                                    const char **prule_str)
+    const char **prule_str)
 {
     unsigned int suiteb_flags = 0, suiteb_comb2 = 0;
     if (HAS_PREFIX(*prule_str, "SUITEB128ONLY")) {
@@ -1264,8 +1246,7 @@ static int check_suiteb_cipher_list(const SSL_METHOD *meth, CERT *c,
         if (suiteb_comb2)
             *prule_str = "ECDHE-ECDSA-AES256-GCM-SHA384";
         else
-            *prule_str =
-                "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384";
+            *prule_str = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384";
         break;
     case SSL_CERT_FLAG_SUITEB_128_LOS_ONLY:
         *prule_str = "ECDHE-ECDSA-AES128-GCM-SHA256";
@@ -1313,8 +1294,8 @@ static __owur int set_ciphersuites(STACK_OF(SSL_CIPHER) **currciphers, const cha
 
     /* Parse the list. We explicitly allow an empty list */
     if (*str != '\0'
-            && (CONF_parse_list(str, ':', 1, ciphersuite_cb, newciphers) <= 0
-                || sk_SSL_CIPHER_num(newciphers) == 0)) {
+        && (CONF_parse_list(str, ':', 1, ciphersuite_cb, newciphers) <= 0
+            || sk_SSL_CIPHER_num(newciphers) == 0)) {
         ERR_raise(ERR_LIB_SSL, SSL_R_NO_CIPHER_MATCH);
         sk_SSL_CIPHER_free(newciphers);
         return 0;
@@ -1326,7 +1307,7 @@ static __owur int set_ciphersuites(STACK_OF(SSL_CIPHER) **currciphers, const cha
 }
 
 static int update_cipher_list_by_id(STACK_OF(SSL_CIPHER) **cipher_list_by_id,
-                                    STACK_OF(SSL_CIPHER) *cipherstack)
+    STACK_OF(SSL_CIPHER) *cipherstack)
 {
     STACK_OF(SSL_CIPHER) *tmp_cipher_list = sk_SSL_CIPHER_dup(cipherstack);
 
@@ -1344,9 +1325,9 @@ static int update_cipher_list_by_id(STACK_OF(SSL_CIPHER) **cipher_list_by_id,
 }
 
 static int update_cipher_list(SSL_CTX *ctx,
-                              STACK_OF(SSL_CIPHER) **cipher_list,
-                              STACK_OF(SSL_CIPHER) **cipher_list_by_id,
-                              STACK_OF(SSL_CIPHER) *tls13_ciphersuites)
+    STACK_OF(SSL_CIPHER) **cipher_list,
+    STACK_OF(SSL_CIPHER) **cipher_list_by_id,
+    STACK_OF(SSL_CIPHER) *tls13_ciphersuites)
 {
     int i;
     STACK_OF(SSL_CIPHER) *tmp_cipher_list = sk_SSL_CIPHER_dup(*cipher_list);
@@ -1359,8 +1340,8 @@ static int update_cipher_list(SSL_CTX *ctx,
      * list.
      */
     while (sk_SSL_CIPHER_num(tmp_cipher_list) > 0
-           && sk_SSL_CIPHER_value(tmp_cipher_list, 0)->min_tls
-              == TLS1_3_VERSION)
+        && sk_SSL_CIPHER_value(tmp_cipher_list, 0)->min_tls
+            == TLS1_3_VERSION)
         (void)sk_SSL_CIPHER_delete(tmp_cipher_list, 0);
 
     /* Insert the new TLSv1.3 ciphersuites */
@@ -1369,9 +1350,11 @@ static int update_cipher_list(SSL_CTX *ctx,
 
         /* Don't include any TLSv1.3 ciphersuites that are disabled */
         if ((sslc->algorithm_enc & ctx->disabled_enc_mask) == 0
-                && (ssl_cipher_table_mac[sslc->algorithm2
-                                         & SSL_HANDSHAKE_MAC_MASK].mask
-                    & ctx->disabled_mac_mask) == 0) {
+            && (ssl_cipher_table_mac[sslc->algorithm2
+                    & SSL_HANDSHAKE_MAC_MASK]
+                       .mask
+                   & ctx->disabled_mac_mask)
+                == 0) {
             sk_SSL_CIPHER_unshift(tmp_cipher_list, sslc);
         }
     }
@@ -1393,7 +1376,7 @@ int SSL_CTX_set_ciphersuites(SSL_CTX *ctx, const char *str)
 
     if (ret && ctx->cipher_list != NULL)
         return update_cipher_list(ctx, &ctx->cipher_list, &ctx->cipher_list_by_id,
-                                  ctx->tls13_ciphersuites);
+            ctx->tls13_ciphersuites);
 
     return ret;
 }
@@ -1415,18 +1398,18 @@ int SSL_set_ciphersuites(SSL *s, const char *str)
     }
     if (ret && sc->cipher_list != NULL)
         return update_cipher_list(s->ctx, &sc->cipher_list,
-                                  &sc->cipher_list_by_id,
-                                  sc->tls13_ciphersuites);
+            &sc->cipher_list_by_id,
+            sc->tls13_ciphersuites);
 
     return ret;
 }
 
 STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
-                                             STACK_OF(SSL_CIPHER) *tls13_ciphersuites,
-                                             STACK_OF(SSL_CIPHER) **cipher_list,
-                                             STACK_OF(SSL_CIPHER) **cipher_list_by_id,
-                                             const char *rule_str,
-                                             CERT *c)
+    STACK_OF(SSL_CIPHER) *tls13_ciphersuites,
+    STACK_OF(SSL_CIPHER) **cipher_list,
+    STACK_OF(SSL_CIPHER) **cipher_list_by_id,
+    const char *rule_str,
+    CERT *c)
 {
     int ok, num_of_ciphers, num_of_alias_max, num_of_group_aliases, i;
     uint32_t disabled_mkey, disabled_auth, disabled_enc, disabled_mac;
@@ -1465,12 +1448,12 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
     if (num_of_ciphers > 0) {
         co_list = OPENSSL_malloc(sizeof(*co_list) * num_of_ciphers);
         if (co_list == NULL)
-            return NULL;          /* Failure */
+            return NULL; /* Failure */
     }
 
     ssl_cipher_collect_ciphers(ssl_method, num_of_ciphers,
-                               disabled_mkey, disabled_auth, disabled_enc,
-                               disabled_mac, co_list, &head, &tail);
+        disabled_mkey, disabled_auth, disabled_enc,
+        disabled_mac, co_list, &head, &tail);
 
     /* Now arrange all ciphers by preference. */
 
@@ -1482,17 +1465,17 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
      * preference).
      */
     ssl_cipher_apply_rule(0, SSL_kECDHE, SSL_aECDSA, 0, 0, 0, 0, CIPHER_ADD,
-                          -1, &head, &tail);
+        -1, &head, &tail);
     ssl_cipher_apply_rule(0, SSL_kECDHE, 0, 0, 0, 0, 0, CIPHER_ADD, -1, &head,
-                          &tail);
+        &tail);
     ssl_cipher_apply_rule(0, SSL_kECDHE, 0, 0, 0, 0, 0, CIPHER_DEL, -1, &head,
-                          &tail);
+        &tail);
 
     /* Within each strength group, we prefer GCM over CHACHA... */
     ssl_cipher_apply_rule(0, 0, 0, SSL_AESGCM, 0, 0, 0, CIPHER_ADD, -1,
-                          &head, &tail);
+        &head, &tail);
     ssl_cipher_apply_rule(0, 0, 0, SSL_CHACHA20, 0, 0, 0, CIPHER_ADD, -1,
-                          &head, &tail);
+        &head, &tail);
 
     /*
      * ...and generally, our preferred cipher is AES.
@@ -1500,14 +1483,14 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
      * strength.
      */
     ssl_cipher_apply_rule(0, 0, 0, SSL_AES ^ SSL_AESGCM, 0, 0, 0, CIPHER_ADD,
-                          -1, &head, &tail);
+        -1, &head, &tail);
 
     /* Temporarily enable everything else for sorting */
     ssl_cipher_apply_rule(0, 0, 0, 0, 0, 0, 0, CIPHER_ADD, -1, &head, &tail);
 
     /* Low priority for MD5 */
     ssl_cipher_apply_rule(0, 0, 0, 0, SSL_MD5, 0, 0, CIPHER_ORD, -1, &head,
-                          &tail);
+        &tail);
 
     /*
      * Move anonymous ciphers to the end.  Usually, these will remain
@@ -1515,16 +1498,16 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
      * we prefer authenticated ciphers.)
      */
     ssl_cipher_apply_rule(0, 0, SSL_aNULL, 0, 0, 0, 0, CIPHER_ORD, -1, &head,
-                          &tail);
+        &tail);
 
     ssl_cipher_apply_rule(0, SSL_kRSA, 0, 0, 0, 0, 0, CIPHER_ORD, -1, &head,
-                          &tail);
+        &tail);
     ssl_cipher_apply_rule(0, SSL_kPSK, 0, 0, 0, 0, 0, CIPHER_ORD, -1, &head,
-                          &tail);
+        &tail);
 
     /* RC4 is sort-of broken -- move to the end */
     ssl_cipher_apply_rule(0, 0, 0, SSL_RC4, 0, 0, 0, CIPHER_ORD, -1, &head,
-                          &tail);
+        &tail);
 
     /*
      * Now sort by symmetric encryption strength.  The above ordering remains
@@ -1539,7 +1522,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
      * Partially overrule strength sort to prefer TLS 1.2 ciphers/PRFs.
      */
     ssl_cipher_apply_rule(0, 0, 0, 0, 0, TLS1_2_VERSION, 0, CIPHER_BUMP, -1,
-                          &head, &tail);
+        &head, &tail);
 
     /*
      * Irrespective of strength, enforce the following order:
@@ -1555,11 +1538,11 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
      * reverse order of preference.
      */
     ssl_cipher_apply_rule(0, 0, 0, 0, SSL_AEAD, 0, 0, CIPHER_BUMP, -1,
-                          &head, &tail);
+        &head, &tail);
     ssl_cipher_apply_rule(0, SSL_kDHE | SSL_kECDHE, 0, 0, 0, 0, 0,
-                          CIPHER_BUMP, -1, &head, &tail);
+        CIPHER_BUMP, -1, &head, &tail);
     ssl_cipher_apply_rule(0, SSL_kDHE | SSL_kECDHE, 0, 0, SSL_AEAD, 0, 0,
-                          CIPHER_BUMP, -1, &head, &tail);
+        CIPHER_BUMP, -1, &head, &tail);
 
     /* Now disable everything (maintaining the ordering!) */
     ssl_cipher_apply_rule(0, 0, 0, 0, 0, 0, 0, CIPHER_DEL, -1, &head, &tail);
@@ -1577,11 +1560,11 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
     ca_list = OPENSSL_malloc(sizeof(*ca_list) * num_of_alias_max);
     if (ca_list == NULL) {
         OPENSSL_free(co_list);
-        return NULL;          /* Failure */
+        return NULL; /* Failure */
     }
     ssl_cipher_collect_aliases(ca_list, num_of_group_aliases,
-                               disabled_mkey, disabled_auth, disabled_enc,
-                               disabled_mac, head);
+        disabled_mkey, disabled_auth, disabled_enc,
+        disabled_mac, head);
 
     /*
      * If the rule_string begins with DEFAULT, apply the default rule
@@ -1591,7 +1574,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
     rule_p = rule_str;
     if (HAS_PREFIX(rule_str, "DEFAULT")) {
         ok = ssl_cipher_process_rulestr(OSSL_default_cipher_list(),
-                                        &head, &tail, ca_list, c);
+            &head, &tail, ca_list, c);
         rule_p += 7;
         if (*rule_p == ':')
             rule_p++;
@@ -1600,9 +1583,9 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
     if (ok && (rule_p[0] != '\0'))
         ok = ssl_cipher_process_rulestr(rule_p, &head, &tail, ca_list, c);
 
-    OPENSSL_free(ca_list);      /* Not needed anymore */
+    OPENSSL_free(ca_list); /* Not needed anymore */
 
-    if (!ok) {                  /* Rule processing failure */
+    if (!ok) { /* Rule processing failure */
         OPENSSL_free(co_list);
         return NULL;
     }
@@ -1622,9 +1605,11 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
 
         /* Don't include any TLSv1.3 ciphers that are disabled */
         if ((sslc->algorithm_enc & disabled_enc) != 0
-                || (ssl_cipher_table_mac[sslc->algorithm2
-                                         & SSL_HANDSHAKE_MAC_MASK].mask
-                    & ctx->disabled_mac_mask) != 0) {
+            || (ssl_cipher_table_mac[sslc->algorithm2
+                    & SSL_HANDSHAKE_MAC_MASK]
+                       .mask
+                   & ctx->disabled_mac_mask)
+                != 0) {
             sk_SSL_CIPHER_delete(tls13_ciphersuites, i);
             i--;
             continue;
@@ -1637,7 +1622,8 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
         }
     }
 
-    OSSL_TRACE_BEGIN(TLS_CIPHER) {
+    OSSL_TRACE_BEGIN(TLS_CIPHER)
+    {
         BIO_printf(trc_out, "cipher selection:\n");
     }
     /*
@@ -1656,7 +1642,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
                 BIO_printf(trc_out, "<%s>\n", curr->cipher->name);
         }
     }
-    OPENSSL_free(co_list);      /* Not needed any longer */
+    OPENSSL_free(co_list); /* Not needed any longer */
     OSSL_TRACE_END(TLS_CIPHER);
 
     if (!update_cipher_list_by_id(cipher_list_by_id, cipherstack)) {
@@ -1965,7 +1951,7 @@ STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void)
 }
 
 STACK_OF(SSL_COMP) *SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP)
-                                                      *meths)
+        *meths)
 {
     return meths;
 }
@@ -1981,7 +1967,7 @@ STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void)
     STACK_OF(SSL_COMP) **rv;
 
     rv = (STACK_OF(SSL_COMP) **)OSSL_LIB_CTX_get_data(NULL,
-                                     OSSL_LIB_CTX_COMP_METHODS);
+        OSSL_LIB_CTX_COMP_METHODS);
     if (rv != NULL)
         return *rv;
     else
@@ -1989,13 +1975,13 @@ STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void)
 }
 
 STACK_OF(SSL_COMP) *SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP)
-                                                      *meths)
+        *meths)
 {
     STACK_OF(SSL_COMP) **comp_methods;
     STACK_OF(SSL_COMP) *old_meths;
 
     comp_methods = (STACK_OF(SSL_COMP) **)OSSL_LIB_CTX_get_data(NULL,
-                                              OSSL_LIB_CTX_COMP_METHODS);
+        OSSL_LIB_CTX_COMP_METHODS);
     if (comp_methods == NULL) {
         old_meths = meths;
     } else {
@@ -2080,8 +2066,8 @@ int SSL_COMP_get_id(const SSL_COMP *comp)
 }
 
 const SSL_CIPHER *ssl_get_cipher_by_char(SSL_CONNECTION *s,
-                                         const unsigned char *ptr,
-                                         int all)
+    const unsigned char *ptr,
+    int all)
 {
     const SSL_CIPHER *c = SSL_CONNECTION_GET_SSL(s)->method->get_cipher_by_char(ptr);
 
@@ -2133,10 +2119,11 @@ int SSL_CIPHER_get_auth_nid(const SSL_CIPHER *c)
     return ssl_cipher_table_auth[i].nid;
 }
 
-int ssl_get_md_idx(int md_nid) {
+int ssl_get_md_idx(int md_nid)
+{
     int i;
 
-    for(i = 0; i < SSL_MD_NUM_IDX; i++) {
+    for (i = 0; i < SSL_MD_NUM_IDX; i++) {
         if (md_nid == ssl_cipher_table_mac[i].nid)
             return i;
     }
@@ -2158,8 +2145,8 @@ int SSL_CIPHER_is_aead(const SSL_CIPHER *c)
 }
 
 int ssl_cipher_get_overhead(const SSL_CIPHER *c, size_t *mac_overhead,
-                            size_t *int_overhead, size_t *blocksize,
-                            size_t *ext_overhead)
+    size_t *int_overhead, size_t *blocksize,
+    size_t *ext_overhead)
 {
     int mac = 0, in = 0, blk = 0, out = 0;
 
@@ -2193,8 +2180,7 @@ int ssl_cipher_get_overhead(const SSL_CIPHER *c, size_t *mac_overhead,
 
             /* If it wasn't AEAD or SSL_eNULL, we expect it to be a
                known CBC cipher. */
-            if (e_ciph == NULL ||
-                EVP_CIPHER_get_mode(e_ciph) != EVP_CIPH_CBC_MODE)
+            if (e_ciph == NULL || EVP_CIPHER_get_mode(e_ciph) != EVP_CIPH_CBC_MODE)
                 return 0;
 
             in = 1; /* padding length byte */
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 946d20be527cc..0d93593880958 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -37,38 +37,38 @@ typedef struct {
 } ssl_switch_tbl;
 
 /* Sense of name is inverted e.g. "TLSv1" will clear SSL_OP_NO_TLSv1 */
-#define SSL_TFLAG_INV   0x1
+#define SSL_TFLAG_INV 0x1
 /* Mask for type of flag referred to */
 #define SSL_TFLAG_TYPE_MASK 0xf00
 /* Flag is for options */
-#define SSL_TFLAG_OPTION    0x000
+#define SSL_TFLAG_OPTION 0x000
 /* Flag is for cert_flags */
-#define SSL_TFLAG_CERT      0x100
+#define SSL_TFLAG_CERT 0x100
 /* Flag is for verify mode */
-#define SSL_TFLAG_VFY       0x200
+#define SSL_TFLAG_VFY 0x200
 /* Option can only be used for clients */
 #define SSL_TFLAG_CLIENT SSL_CONF_FLAG_CLIENT
 /* Option can only be used for servers */
 #define SSL_TFLAG_SERVER SSL_CONF_FLAG_SERVER
-#define SSL_TFLAG_BOTH (SSL_TFLAG_CLIENT|SSL_TFLAG_SERVER)
+#define SSL_TFLAG_BOTH (SSL_TFLAG_CLIENT | SSL_TFLAG_SERVER)
 
 #define SSL_FLAG_TBL(str, flag) \
-        {str, (int)(sizeof(str) - 1), SSL_TFLAG_BOTH, flag}
+    { str, (int)(sizeof(str) - 1), SSL_TFLAG_BOTH, flag }
 #define SSL_FLAG_TBL_SRV(str, flag) \
-        {str, (int)(sizeof(str) - 1), SSL_TFLAG_SERVER, flag}
+    { str, (int)(sizeof(str) - 1), SSL_TFLAG_SERVER, flag }
 #define SSL_FLAG_TBL_CLI(str, flag) \
-        {str, (int)(sizeof(str) - 1), SSL_TFLAG_CLIENT, flag}
+    { str, (int)(sizeof(str) - 1), SSL_TFLAG_CLIENT, flag }
 #define SSL_FLAG_TBL_INV(str, flag) \
-        {str, (int)(sizeof(str) - 1), SSL_TFLAG_INV|SSL_TFLAG_BOTH, flag}
+    { str, (int)(sizeof(str) - 1), SSL_TFLAG_INV | SSL_TFLAG_BOTH, flag }
 #define SSL_FLAG_TBL_SRV_INV(str, flag) \
-        {str, (int)(sizeof(str) - 1), SSL_TFLAG_INV|SSL_TFLAG_SERVER, flag}
+    { str, (int)(sizeof(str) - 1), SSL_TFLAG_INV | SSL_TFLAG_SERVER, flag }
 #define SSL_FLAG_TBL_CERT(str, flag) \
-        {str, (int)(sizeof(str) - 1), SSL_TFLAG_CERT|SSL_TFLAG_BOTH, flag}
+    { str, (int)(sizeof(str) - 1), SSL_TFLAG_CERT | SSL_TFLAG_BOTH, flag }
 
 #define SSL_FLAG_VFY_CLI(str, flag) \
-        {str, (int)(sizeof(str) - 1), SSL_TFLAG_VFY | SSL_TFLAG_CLIENT, flag}
+    { str, (int)(sizeof(str) - 1), SSL_TFLAG_VFY | SSL_TFLAG_CLIENT, flag }
 #define SSL_FLAG_VFY_SRV(str, flag) \
-        {str, (int)(sizeof(str) - 1), SSL_TFLAG_VFY | SSL_TFLAG_SERVER, flag}
+    { str, (int)(sizeof(str) - 1), SSL_TFLAG_VFY | SSL_TFLAG_SERVER, flag }
 
 /*
  * Opaque structure containing SSL configuration context.
@@ -109,7 +109,7 @@ struct ssl_conf_ctx_st {
 };
 
 static void ssl_set_option(SSL_CONF_CTX *cctx, unsigned int name_flags,
-                           uint64_t option_value, int onoff)
+    uint64_t option_value, int onoff)
 {
     uint32_t *pflags;
 
@@ -136,7 +136,6 @@ static void ssl_set_option(SSL_CONF_CTX *cctx, unsigned int name_flags,
 
     default:
         return;
-
     }
     if (onoff)
         *pflags |= option_value;
@@ -145,7 +144,7 @@ static void ssl_set_option(SSL_CONF_CTX *cctx, unsigned int name_flags,
 }
 
 static int ssl_match_option(SSL_CONF_CTX *cctx, const ssl_flag_tbl *tbl,
-                            const char *name, int namelen, int onoff)
+    const char *name, int namelen, int onoff)
 {
     /* If name not relevant for context skip */
     if (!(cctx->flags & tbl->name_flags & SSL_TFLAG_BOTH))
@@ -154,7 +153,7 @@ static int ssl_match_option(SSL_CONF_CTX *cctx, const ssl_flag_tbl *tbl,
         if (strcmp(tbl->name, name))
             return 0;
     } else if (tbl->namelen != namelen
-               || OPENSSL_strncasecmp(tbl->name, name, namelen))
+        || OPENSSL_strncasecmp(tbl->name, name, namelen))
         return 0;
     ssl_set_option(cctx, tbl->name_flags, tbl->option_value, onoff);
     return 1;
@@ -238,11 +237,10 @@ static int cmd_ECDHParameters(SSL_CONF_CTX *cctx, const char *value)
 
     /* Ignore values supported by 1.0.2 for the automatic selection */
     if ((cctx->flags & SSL_CONF_FLAG_FILE)
-            && (OPENSSL_strcasecmp(value, "+automatic") == 0
-                || OPENSSL_strcasecmp(value, "automatic") == 0))
+        && (OPENSSL_strcasecmp(value, "+automatic") == 0
+            || OPENSSL_strcasecmp(value, "automatic") == 0))
         return 1;
-    if ((cctx->flags & SSL_CONF_FLAG_CMDLINE) &&
-        strcmp(value, "auto") == 0)
+    if ((cctx->flags & SSL_CONF_FLAG_CMDLINE) && strcmp(value, "auto") == 0)
         return 1;
 
     /* ECDHParameters accepts a single group name */
@@ -316,14 +314,14 @@ static int protocol_from_string(const char *value)
      * shrink.
      */
     static const struct protocol_versions versions[] = {
-        {"None", 0},
-        {"SSLv3", SSL3_VERSION},
-        {"TLSv1", TLS1_VERSION},
-        {"TLSv1.1", TLS1_1_VERSION},
-        {"TLSv1.2", TLS1_2_VERSION},
-        {"TLSv1.3", TLS1_3_VERSION},
-        {"DTLSv1", DTLS1_VERSION},
-        {"DTLSv1.2", DTLS1_2_VERSION}
+        { "None", 0 },
+        { "SSLv3", SSL3_VERSION },
+        { "TLSv1", TLS1_VERSION },
+        { "TLSv1.1", TLS1_1_VERSION },
+        { "TLSv1.2", TLS1_2_VERSION },
+        { "TLSv1.3", TLS1_3_VERSION },
+        { "DTLSv1", DTLS1_VERSION },
+        { "DTLSv1.2", DTLS1_2_VERSION }
     };
     size_t i;
     size_t n = OSSL_NELEM(versions);
@@ -379,20 +377,20 @@ static int cmd_Options(SSL_CONF_CTX *cctx, const char *value)
     static const ssl_flag_tbl ssl_option_list[] = {
         SSL_FLAG_TBL_INV("SessionTicket", SSL_OP_NO_TICKET),
         SSL_FLAG_TBL_INV("EmptyFragments",
-                         SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS),
+            SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS),
         SSL_FLAG_TBL("Bugs", SSL_OP_ALL),
         SSL_FLAG_TBL_INV("Compression", SSL_OP_NO_COMPRESSION),
         SSL_FLAG_TBL_SRV("ServerPreference", SSL_OP_CIPHER_SERVER_PREFERENCE),
         SSL_FLAG_TBL_SRV("NoResumptionOnRenegotiation",
-                         SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION),
+            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION),
         SSL_FLAG_TBL_SRV("DHSingle", SSL_OP_SINGLE_DH_USE),
         SSL_FLAG_TBL_SRV("ECDHSingle", SSL_OP_SINGLE_ECDH_USE),
         SSL_FLAG_TBL("UnsafeLegacyRenegotiation",
-                     SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION),
+            SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION),
         SSL_FLAG_TBL("UnsafeLegacyServerConnect",
-                     SSL_OP_LEGACY_SERVER_CONNECT),
+            SSL_OP_LEGACY_SERVER_CONNECT),
         SSL_FLAG_TBL("ClientRenegotiation",
-                     SSL_OP_ALLOW_CLIENT_RENEGOTIATION),
+            SSL_OP_ALLOW_CLIENT_RENEGOTIATION),
         SSL_FLAG_TBL_INV("EncryptThenMac", SSL_OP_NO_ENCRYPT_THEN_MAC),
         SSL_FLAG_TBL("NoRenegotiation", SSL_OP_NO_RENEGOTIATION),
         SSL_FLAG_TBL("AllowNoDHEKEX", SSL_OP_ALLOW_NO_DHE_KEX),
@@ -422,13 +420,12 @@ static int cmd_VerifyMode(SSL_CONF_CTX *cctx, const char *value)
         SSL_FLAG_VFY_CLI("Peer", SSL_VERIFY_PEER),
         SSL_FLAG_VFY_SRV("Request", SSL_VERIFY_PEER),
         SSL_FLAG_VFY_SRV("Require",
-                         SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT),
+            SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT),
         SSL_FLAG_VFY_SRV("Once", SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE),
         SSL_FLAG_VFY_SRV("RequestPostHandshake",
-                         SSL_VERIFY_PEER | SSL_VERIFY_POST_HANDSHAKE),
+            SSL_VERIFY_PEER | SSL_VERIFY_POST_HANDSHAKE),
         SSL_FLAG_VFY_SRV("RequirePostHandshake",
-                         SSL_VERIFY_PEER | SSL_VERIFY_POST_HANDSHAKE |
-                         SSL_VERIFY_FAIL_IF_NO_PEER_CERT),
+            SSL_VERIFY_PEER | SSL_VERIFY_POST_HANDSHAKE | SSL_VERIFY_FAIL_IF_NO_PEER_CERT),
     };
     if (value == NULL)
         return -3;
@@ -494,8 +491,8 @@ static int cmd_ServerInfoFile(SSL_CONF_CTX *cctx, const char *value)
 }
 
 static int do_store(SSL_CONF_CTX *cctx,
-                    const char *CAfile, const char *CApath, const char *CAstore,
-                    int verify_store)
+    const char *CAfile, const char *CApath, const char *CAstore,
+    int verify_store)
 {
     CERT *cert;
     X509_STORE **st;
@@ -532,8 +529,7 @@ static int do_store(SSL_CONF_CTX *cctx,
         return 0;
     if (CApath != NULL && !X509_STORE_load_path(*st, CApath))
         return 0;
-    if (CAstore != NULL && !X509_STORE_load_store_ex(*st, CAstore, libctx,
-                                                     propq))
+    if (CAstore != NULL && !X509_STORE_load_store_ex(*st, CAstore, libctx, propq))
         return 0;
     return 1;
 }
@@ -627,14 +623,15 @@ static int cmd_DHParameters(SSL_CONF_CTX *cctx, const char *value)
 
         decoderctx
             = OSSL_DECODER_CTX_new_for_pkey(&dhpkey, "PEM", NULL, "DH",
-                                            OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                                            sslctx->libctx, sslctx->propq);
+                OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+                sslctx->libctx, sslctx->propq);
         if (decoderctx == NULL)
             goto end;
         ERR_set_mark();
         while (!OSSL_DECODER_from_bio(decoderctx, in)
-               && dhpkey == NULL
-               && !BIO_eof(in));
+            && dhpkey == NULL
+            && !BIO_eof(in))
+            ;
         OSSL_DECODER_CTX_free(decoderctx);
 
         if (dhpkey == NULL) {
@@ -654,7 +651,7 @@ static int cmd_DHParameters(SSL_CONF_CTX *cctx, const char *value)
         if ((rv = SSL_set0_tmp_dh_pkey(cctx->ssl, dhpkey)) > 0)
             dhpkey = NULL;
     }
- end:
+end:
     EVP_PKEY_free(dhpkey);
     BIO_free(in);
     return rv > 0;
@@ -693,18 +690,35 @@ static int cmd_RecordPadding(SSL_CONF_CTX *cctx, const char *value)
      * All we care about are non-negative values,
      * the setters check the range
      */
-    if (cctx->ctx)
-        rv = SSL_CTX_set_block_padding_ex(cctx->ctx, (size_t)block_padding,
-                                          (size_t)hs_padding);
-    if (cctx->ssl)
-        rv = SSL_set_block_padding_ex(cctx->ssl, (size_t)block_padding,
-                                      (size_t)hs_padding);
+    if (cctx->ctx) {
+        /*
+         * QUIC always pads TLS data at the packet level, and as such, attempting
+         * to set block padding at the record level fails in calls to SSL_CTX_set_block_padding_ex.
+         * However, when configuring record padding via config file, we have no idea if we are
+         * going to create TCP or QUIC based SSL's, so silently ignore this configuration option
+         * for QUIC.
+         */
+        if (SSL_CTX_is_quic(cctx->ctx))
+            rv = 1;
+        else
+            rv = SSL_CTX_set_block_padding_ex(cctx->ctx, (size_t)block_padding,
+                (size_t)hs_padding);
+    }
+    if (cctx->ssl) {
+        /*
+         * As above, ignore this config option for QUIC
+         */
+        if (SSL_is_quic(cctx->ssl))
+            rv = 1;
+        else
+            rv = SSL_set_block_padding_ex(cctx->ssl, (size_t)block_padding,
+                (size_t)hs_padding);
+    }
 out:
     OPENSSL_free(copy);
     return rv;
 }
 
-
 static int cmd_NumTickets(SSL_CONF_CTX *cctx, const char *value)
 {
     int rv = 0;
@@ -720,7 +734,7 @@ static int cmd_NumTickets(SSL_CONF_CTX *cctx, const char *value)
 }
 
 typedef struct {
-    int (*cmd) (SSL_CONF_CTX *cctx, const char *value);
+    int (*cmd)(SSL_CONF_CTX *cctx, const char *value);
     const char *str_file;
     const char *str_cmdline;
     unsigned short flags;
@@ -730,13 +744,13 @@ typedef struct {
 /* Table of supported parameters */
 
 #define SSL_CONF_CMD(name, cmdopt, flags, type) \
-        {cmd_##name, #name, cmdopt, flags, type}
+    { cmd_##name, #name, cmdopt, flags, type }
 
 #define SSL_CONF_CMD_STRING(name, cmdopt, flags) \
-        SSL_CONF_CMD(name, cmdopt, flags, SSL_CONF_TYPE_STRING)
+    SSL_CONF_CMD(name, cmdopt, flags, SSL_CONF_TYPE_STRING)
 
 #define SSL_CONF_CMD_SWITCH(name, flags) \
-        {0, NULL, name, flags, SSL_CONF_TYPE_NONE}
+    { 0, NULL, name, flags, SSL_CONF_TYPE_NONE }
 
 /* See apps/include/opt.h if you change this table. */
 /* The SSL_CONF_CMD_SWITCH should be the same order as ssl_cmd_switches */
@@ -784,92 +798,92 @@ static const ssl_conf_cmd_tbl ssl_conf_cmds[] = {
     SSL_CONF_CMD_STRING(Options, NULL, 0),
     SSL_CONF_CMD_STRING(VerifyMode, NULL, 0),
     SSL_CONF_CMD(Certificate, "cert", SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_FILE),
+        SSL_CONF_TYPE_FILE),
     SSL_CONF_CMD(PrivateKey, "key", SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_FILE),
+        SSL_CONF_TYPE_FILE),
     SSL_CONF_CMD(ServerInfoFile, NULL,
-                 SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_FILE),
+        SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE,
+        SSL_CONF_TYPE_FILE),
     SSL_CONF_CMD(ChainCAPath, "chainCApath", SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_DIR),
+        SSL_CONF_TYPE_DIR),
     SSL_CONF_CMD(ChainCAFile, "chainCAfile", SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_FILE),
+        SSL_CONF_TYPE_FILE),
     SSL_CONF_CMD(ChainCAStore, "chainCAstore", SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_STORE),
+        SSL_CONF_TYPE_STORE),
     SSL_CONF_CMD(VerifyCAPath, "verifyCApath", SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_DIR),
+        SSL_CONF_TYPE_DIR),
     SSL_CONF_CMD(VerifyCAFile, "verifyCAfile", SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_FILE),
+        SSL_CONF_TYPE_FILE),
     SSL_CONF_CMD(VerifyCAStore, "verifyCAstore", SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_STORE),
+        SSL_CONF_TYPE_STORE),
     SSL_CONF_CMD(RequestCAFile, "requestCAFile", SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_FILE),
+        SSL_CONF_TYPE_FILE),
     SSL_CONF_CMD(ClientCAFile, NULL,
-                 SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_FILE),
+        SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE,
+        SSL_CONF_TYPE_FILE),
     SSL_CONF_CMD(RequestCAPath, NULL, SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_DIR),
+        SSL_CONF_TYPE_DIR),
     SSL_CONF_CMD(ClientCAPath, NULL,
-                 SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_DIR),
+        SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE,
+        SSL_CONF_TYPE_DIR),
     SSL_CONF_CMD(RequestCAStore, "requestCAStore", SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_STORE),
+        SSL_CONF_TYPE_STORE),
     SSL_CONF_CMD(ClientCAStore, NULL,
-                 SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_STORE),
+        SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE,
+        SSL_CONF_TYPE_STORE),
     SSL_CONF_CMD(DHParameters, "dhparam",
-                 SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE,
-                 SSL_CONF_TYPE_FILE),
+        SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE,
+        SSL_CONF_TYPE_FILE),
     SSL_CONF_CMD_STRING(RecordPadding, "record_padding", 0),
     SSL_CONF_CMD_STRING(NumTickets, "num_tickets", SSL_CONF_FLAG_SERVER),
 };
 
 /* Supported switches: must match order of switches in ssl_conf_cmds */
 static const ssl_switch_tbl ssl_cmd_switches[] = {
-    {SSL_OP_NO_SSLv3, 0},       /* no_ssl3 */
-    {SSL_OP_NO_TLSv1, 0},       /* no_tls1 */
-    {SSL_OP_NO_TLSv1_1, 0},     /* no_tls1_1 */
-    {SSL_OP_NO_TLSv1_2, 0},     /* no_tls1_2 */
-    {SSL_OP_NO_TLSv1_3, 0},     /* no_tls1_3 */
-    {SSL_OP_ALL, 0},            /* bugs */
-    {SSL_OP_NO_COMPRESSION, 0}, /* no_comp */
-    {SSL_OP_NO_COMPRESSION, SSL_TFLAG_INV}, /* comp */
-    {SSL_OP_NO_TX_CERTIFICATE_COMPRESSION, 0}, /* no_tx_cert_comp */
-    {SSL_OP_NO_TX_CERTIFICATE_COMPRESSION, SSL_TFLAG_INV}, /* tx_cert_comp */
-    {SSL_OP_NO_RX_CERTIFICATE_COMPRESSION, 0}, /* no_rx_cert_comp */
-    {SSL_OP_NO_RX_CERTIFICATE_COMPRESSION, SSL_TFLAG_INV}, /* rx_cert_comp */
-    {SSL_OP_SINGLE_ECDH_USE, 0}, /* ecdh_single */
-    {SSL_OP_NO_TICKET, 0},      /* no_ticket */
-    {SSL_OP_CIPHER_SERVER_PREFERENCE, 0}, /* serverpref */
+    { SSL_OP_NO_SSLv3, 0 }, /* no_ssl3 */
+    { SSL_OP_NO_TLSv1, 0 }, /* no_tls1 */
+    { SSL_OP_NO_TLSv1_1, 0 }, /* no_tls1_1 */
+    { SSL_OP_NO_TLSv1_2, 0 }, /* no_tls1_2 */
+    { SSL_OP_NO_TLSv1_3, 0 }, /* no_tls1_3 */
+    { SSL_OP_ALL, 0 }, /* bugs */
+    { SSL_OP_NO_COMPRESSION, 0 }, /* no_comp */
+    { SSL_OP_NO_COMPRESSION, SSL_TFLAG_INV }, /* comp */
+    { SSL_OP_NO_TX_CERTIFICATE_COMPRESSION, 0 }, /* no_tx_cert_comp */
+    { SSL_OP_NO_TX_CERTIFICATE_COMPRESSION, SSL_TFLAG_INV }, /* tx_cert_comp */
+    { SSL_OP_NO_RX_CERTIFICATE_COMPRESSION, 0 }, /* no_rx_cert_comp */
+    { SSL_OP_NO_RX_CERTIFICATE_COMPRESSION, SSL_TFLAG_INV }, /* rx_cert_comp */
+    { SSL_OP_SINGLE_ECDH_USE, 0 }, /* ecdh_single */
+    { SSL_OP_NO_TICKET, 0 }, /* no_ticket */
+    { SSL_OP_CIPHER_SERVER_PREFERENCE, 0 }, /* serverpref */
     /* legacy_renegotiation */
-    {SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION, 0},
+    { SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION, 0 },
     /* Allow client renegotiation */
-    {SSL_OP_ALLOW_CLIENT_RENEGOTIATION, 0},
+    { SSL_OP_ALLOW_CLIENT_RENEGOTIATION, 0 },
     /* legacy_server_connect */
-    {SSL_OP_LEGACY_SERVER_CONNECT, 0},
+    { SSL_OP_LEGACY_SERVER_CONNECT, 0 },
     /* no_renegotiation */
-    {SSL_OP_NO_RENEGOTIATION, 0},
+    { SSL_OP_NO_RENEGOTIATION, 0 },
     /* no_resumption_on_reneg */
-    {SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION, 0},
+    { SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION, 0 },
     /* no_legacy_server_connect */
-    {SSL_OP_LEGACY_SERVER_CONNECT, SSL_TFLAG_INV},
+    { SSL_OP_LEGACY_SERVER_CONNECT, SSL_TFLAG_INV },
     /* allow_no_dhe_kex */
-    {SSL_OP_ALLOW_NO_DHE_KEX, 0},
+    { SSL_OP_ALLOW_NO_DHE_KEX, 0 },
     /* prefer_no_dhe_kex */
-    {SSL_OP_PREFER_NO_DHE_KEX, 0},
+    { SSL_OP_PREFER_NO_DHE_KEX, 0 },
     /* chacha reprioritization */
-    {SSL_OP_PRIORITIZE_CHACHA, 0},
-    {SSL_CERT_FLAG_TLS_STRICT, SSL_TFLAG_CERT}, /* strict */
+    { SSL_OP_PRIORITIZE_CHACHA, 0 },
+    { SSL_CERT_FLAG_TLS_STRICT, SSL_TFLAG_CERT }, /* strict */
     /* no_middlebox */
-    {SSL_OP_ENABLE_MIDDLEBOX_COMPAT, SSL_TFLAG_INV},
+    { SSL_OP_ENABLE_MIDDLEBOX_COMPAT, SSL_TFLAG_INV },
     /* anti_replay */
-    {SSL_OP_NO_ANTI_REPLAY, SSL_TFLAG_INV},
+    { SSL_OP_NO_ANTI_REPLAY, SSL_TFLAG_INV },
     /* no_anti_replay */
-    {SSL_OP_NO_ANTI_REPLAY, 0},
+    { SSL_OP_NO_ANTI_REPLAY, 0 },
     /* no Encrypt-then-Mac */
-    {SSL_OP_NO_ENCRYPT_THEN_MAC, 0},
+    { SSL_OP_NO_ENCRYPT_THEN_MAC, 0 },
     /* no Extended master secret */
-    {SSL_OP_NO_EXTENDED_MASTER_SECRET, 0},
+    { SSL_OP_NO_EXTENDED_MASTER_SECRET, 0 },
 };
 
 static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd)
@@ -880,11 +894,9 @@ static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd)
     if (cctx->prefix) {
         if (strlen(*pcmd) <= cctx->prefixlen)
             return 0;
-        if (cctx->flags & SSL_CONF_FLAG_CMDLINE &&
-            strncmp(*pcmd, cctx->prefix, cctx->prefixlen))
+        if (cctx->flags & SSL_CONF_FLAG_CMDLINE && strncmp(*pcmd, cctx->prefix, cctx->prefixlen))
             return 0;
-        if (cctx->flags & SSL_CONF_FLAG_FILE &&
-            OPENSSL_strncasecmp(*pcmd, cctx->prefix, cctx->prefixlen))
+        if (cctx->flags & SSL_CONF_FLAG_FILE && OPENSSL_strncasecmp(*pcmd, cctx->prefix, cctx->prefixlen))
             return 0;
         *pcmd += cctx->prefixlen;
     } else if (cctx->flags & SSL_CONF_FLAG_CMDLINE) {
@@ -911,7 +923,7 @@ static int ssl_conf_cmd_allowed(SSL_CONF_CTX *cctx, const ssl_conf_cmd_tbl *t)
 }
 
 static const ssl_conf_cmd_tbl *ssl_conf_cmd_lookup(SSL_CONF_CTX *cctx,
-                                                   const char *cmd)
+    const char *cmd)
 {
     const ssl_conf_cmd_tbl *t;
     size_t i;
@@ -978,15 +990,15 @@ int SSL_CONF_cmd(SSL_CONF_CTX *cctx, const char *cmd, const char *value)
         if (rv != -2)
             rv = 0;
 
- bad_value:
+    bad_value:
         if (cctx->flags & SSL_CONF_FLAG_SHOW_ERRORS)
             ERR_raise_data(ERR_LIB_SSL, SSL_R_BAD_VALUE,
-                           "cmd=%s, value=%s", cmd,
-                           value != NULL ? value : "<EMPTY>");
+                "cmd=%s, value=%s", cmd,
+                value != NULL ? value : "<EMPTY>");
         return rv;
     }
 
- unknown_cmd:
+unknown_cmd:
     if (cctx->flags & SSL_CONF_FLAG_SHOW_ERRORS)
         ERR_raise_data(ERR_LIB_SSL, SSL_R_UNKNOWN_CMD_NAME, "cmd=%s", cmd);
 
@@ -1150,7 +1162,7 @@ void SSL_CONF_CTX_set_ssl(SSL_CONF_CTX *cctx, SSL *ssl)
         cctx->pcert_flags = &sc->cert->cert_flags;
         cctx->pvfy_flags = &sc->verify_mode;
         cctx->cert_filename = OPENSSL_zalloc(sc->ssl_pkey_num
-                                             * sizeof(*cctx->cert_filename));
+            * sizeof(*cctx->cert_filename));
         if (cctx->cert_filename != NULL)
             cctx->num_cert_filename = sc->ssl_pkey_num;
     } else {
@@ -1174,7 +1186,7 @@ void SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *cctx, SSL_CTX *ctx)
         cctx->pcert_flags = &ctx->cert->cert_flags;
         cctx->pvfy_flags = &ctx->verify_mode;
         cctx->cert_filename = OPENSSL_zalloc((SSL_PKEY_NUM + ctx->sigalg_list_len)
-                                             * sizeof(*cctx->cert_filename));
+            * sizeof(*cctx->cert_filename));
         if (cctx->cert_filename != NULL)
             cctx->num_cert_filename = SSL_PKEY_NUM + ctx->sigalg_list_len;
     } else {
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c
index 2a879bdc78511..1e92658b7a41c 100644
--- a/ssl/ssl_init.c
+++ b/ssl/ssl_init.c
@@ -15,7 +15,7 @@
 #include <openssl/trace.h>
 #include "ssl_local.h"
 #include "internal/thread_once.h"
-#include "internal/rio_notifier.h"    /* for ossl_wsa_cleanup() */
+#include "internal/rio_notifier.h" /* for ossl_wsa_cleanup() */
 
 static int stopped;
 
@@ -25,7 +25,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_ssl_base)
 {
 #ifndef OPENSSL_NO_COMP
     OSSL_TRACE(INIT, "ossl_init_ssl_base: "
-               "SSL_COMP_get_compression_methods()\n");
+                     "SSL_COMP_get_compression_methods()\n");
     /*
      * This will initialise the built-in compression algorithms. The value
      * returned is a STACK_OF(SSL_COMP), but that can be discarded safely
@@ -61,7 +61,7 @@ int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
     }
 
     opts |= OPENSSL_INIT_ADD_ALL_CIPHERS
-         |  OPENSSL_INIT_ADD_ALL_DIGESTS;
+        | OPENSSL_INIT_ADD_ALL_DIGESTS;
 #ifndef OPENSSL_NO_AUTOLOAD_CONFIG
     if ((opts & OPENSSL_INIT_NO_LOAD_CONFIG) == 0)
         opts |= OPENSSL_INIT_LOAD_CONFIG;
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index fd0d6e2bb7473..ac77faa677ce2 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -33,8 +33,13 @@
 #include "internal/ssl_unwrap.h"
 #include "quic/quic_local.h"
 
+#ifndef OPENSSL_NO_SSLKEYLOG
+#include <sys/stat.h>
+#include <fcntl.h>
+#endif
+
 static int ssl_undefined_function_3(SSL_CONNECTION *sc, unsigned char *r,
-                                    unsigned char *s, size_t t, size_t *u)
+    unsigned char *s, size_t t, size_t *u)
 {
     return ssl_undefined_function(SSL_CONNECTION_GET_SSL(sc));
 }
@@ -45,7 +50,7 @@ static int ssl_undefined_function_4(SSL_CONNECTION *sc, int r)
 }
 
 static size_t ssl_undefined_function_5(SSL_CONNECTION *sc, const char *r,
-                                       size_t s, unsigned char *t)
+    size_t s, unsigned char *t)
 {
     return ssl_undefined_function(SSL_CONNECTION_GET_SSL(sc));
 }
@@ -56,8 +61,8 @@ static int ssl_undefined_function_6(int r)
 }
 
 static int ssl_undefined_function_7(SSL_CONNECTION *sc, unsigned char *r,
-                                    size_t s, const char *t, size_t u,
-                                    const unsigned char *v, size_t w, int x)
+    size_t s, const char *t, size_t u,
+    const unsigned char *v, size_t w, int x)
 {
     return ssl_undefined_function(SSL_CONNECTION_GET_SSL(sc));
 }
@@ -72,10 +77,10 @@ const SSL3_ENC_METHOD ssl3_undef_enc_method = {
     ssl_undefined_function_3,
     ssl_undefined_function_4,
     ssl_undefined_function_5,
-    NULL,                       /* client_finished_label */
-    0,                          /* client_finished_label_len */
-    NULL,                       /* server_finished_label */
-    0,                          /* server_finished_label_len */
+    NULL, /* client_finished_label */
+    0, /* client_finished_label_len */
+    NULL, /* server_finished_label */
+    0, /* server_finished_label_len */
     ssl_undefined_function_6,
     ssl_undefined_function_7,
 };
@@ -84,11 +89,13 @@ struct ssl_async_args {
     SSL *s;
     void *buf;
     size_t num;
-    enum { READFUNC, WRITEFUNC, OTHERFUNC } type;
+    enum { READFUNC,
+        WRITEFUNC,
+        OTHERFUNC } type;
     union {
-        int (*func_read) (SSL *, void *, size_t, size_t *);
-        int (*func_write) (SSL *, const void *, size_t, size_t *);
-        int (*func_other) (SSL *);
+        int (*func_read)(SSL *, void *, size_t, size_t *);
+        int (*func_write)(SSL *, const void *, size_t, size_t *);
+        int (*func_other)(SSL *);
     } f;
 };
 
@@ -97,15 +104,9 @@ static const struct {
     uint8_t ord;
     int nid;
 } dane_mds[] = {
-    {
-        DANETLS_MATCHING_FULL, 0, NID_undef
-    },
-    {
-        DANETLS_MATCHING_2256, 1, NID_sha256
-    },
-    {
-        DANETLS_MATCHING_2512, 2, NID_sha512
-    },
+    { DANETLS_MATCHING_FULL, 0, NID_undef },
+    { DANETLS_MATCHING_2256, 1, NID_sha256 },
+    { DANETLS_MATCHING_2512, 2, NID_sha512 },
 };
 
 static int dane_ctx_enable(struct dane_ctx_st *dctx)
@@ -113,7 +114,7 @@ static int dane_ctx_enable(struct dane_ctx_st *dctx)
     const EVP_MD **mdevp;
     uint8_t *mdord;
     uint8_t mdmax = DANETLS_MATCHING_LAST;
-    int n = ((int)mdmax) + 1;   /* int to handle PrivMatch(255) */
+    int n = ((int)mdmax) + 1; /* int to handle PrivMatch(255) */
     size_t i;
 
     if (dctx->mdevp != NULL)
@@ -132,8 +133,7 @@ static int dane_ctx_enable(struct dane_ctx_st *dctx)
     for (i = 0; i < OSSL_NELEM(dane_mds); ++i) {
         const EVP_MD *md;
 
-        if (dane_mds[i].nid == NID_undef ||
-            (md = EVP_get_digestbynid(dane_mds[i].nid)) == NULL)
+        if (dane_mds[i].nid == NID_undef || (md = EVP_get_digestbynid(dane_mds[i].nid)) == NULL)
             continue;
         mdevp[dane_mds[i].mtype] = md;
         mdord[dane_mds[i].mtype] = dane_mds[i].ord;
@@ -206,14 +206,15 @@ static int ssl_dane_dup(SSL_CONNECTION *to, SSL_CONNECTION *from)
         danetls_record *t = sk_danetls_record_value(from->dane.trecs, i);
 
         if (SSL_dane_tlsa_add(SSL_CONNECTION_GET_SSL(to), t->usage,
-                              t->selector, t->mtype, t->data, t->dlen) <= 0)
+                t->selector, t->mtype, t->data, t->dlen)
+            <= 0)
             return 0;
     }
     return 1;
 }
 
 static int dane_mtype_set(struct dane_ctx_st *dctx,
-                          const EVP_MD *md, uint8_t mtype, uint8_t ord)
+    const EVP_MD *md, uint8_t mtype, uint8_t ord)
 {
     int i;
 
@@ -261,9 +262,9 @@ static const EVP_MD *tlsa_md_get(SSL_DANE *dane, uint8_t mtype)
 }
 
 static int dane_tlsa_add(SSL_DANE *dane,
-                         uint8_t usage,
-                         uint8_t selector,
-                         uint8_t mtype, const unsigned char *data, size_t dlen)
+    uint8_t usage,
+    uint8_t selector,
+    uint8_t mtype, const unsigned char *data, size_t dlen)
 {
     danetls_record *t;
     const EVP_MD *md = NULL;
@@ -334,8 +335,7 @@ static int dane_tlsa_add(SSL_DANE *dane,
 
         switch (selector) {
         case DANETLS_SELECTOR_CERT:
-            if (!d2i_X509(&cert, &p, ilen) || p < data ||
-                dlen != (size_t)(p - data)) {
+            if (!d2i_X509(&cert, &p, ilen) || p < data || dlen != (size_t)(p - data)) {
                 X509_free(cert);
                 tlsa_free(t);
                 ERR_raise(ERR_LIB_SSL, SSL_R_DANE_TLSA_BAD_CERTIFICATE);
@@ -372,9 +372,7 @@ static int dane_tlsa_add(SSL_DANE *dane,
              * the chain with untrusted Full(0) certificates from DNS, in case
              * they are missing from the chain.
              */
-            if ((dane->certs == NULL &&
-                 (dane->certs = sk_X509_new_null()) == NULL) ||
-                !sk_X509_push(dane->certs, cert)) {
+            if ((dane->certs == NULL && (dane->certs = sk_X509_new_null()) == NULL) || !sk_X509_push(dane->certs, cert)) {
                 ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB);
                 X509_free(cert);
                 tlsa_free(t);
@@ -383,8 +381,7 @@ static int dane_tlsa_add(SSL_DANE *dane,
             break;
 
         case DANETLS_SELECTOR_SPKI:
-            if (!d2i_PUBKEY(&pkey, &p, ilen) || p < data ||
-                dlen != (size_t)(p - data)) {
+            if (!d2i_PUBKEY(&pkey, &p, ilen) || p < data || dlen != (size_t)(p - data)) {
                 EVP_PKEY_free(pkey);
                 tlsa_free(t);
                 ERR_raise(ERR_LIB_SSL, SSL_R_DANE_TLSA_BAD_PUBLIC_KEY);
@@ -492,7 +489,7 @@ static int ssl_check_allowed_versions(int min_version, int max_version)
             || (DTLS_VERSION_GE(min_version, DTLS1_2_VERSION)
                 && DTLS_VERSION_GE(DTLS1_2_VERSION, max_version))
 #endif
-            )
+        )
             return 0;
     } else {
         /* Regular TLS version checks. */
@@ -549,7 +546,7 @@ static int ssl_check_allowed_versions(int min_version, int max_version)
 #ifdef OPENSSL_NO_TLS1_3
             || (min_version <= TLS1_3_VERSION && TLS1_3_VERSION <= max_version)
 #endif
-            )
+        )
             return 0;
     }
     return 1;
@@ -561,10 +558,10 @@ static int ssl_check_allowed_versions(int min_version, int max_version)
  * This is used by platform version identification tools.
  * Do not inline this procedure or make it static.
  */
-# define OPENSSL_VPROC_STRING_(x)    x##_SSL
-# define OPENSSL_VPROC_STRING(x)     OPENSSL_VPROC_STRING_(x)
-# define OPENSSL_VPROC_FUNC          OPENSSL_VPROC_STRING(OPENSSL_VPROC)
-void OPENSSL_VPROC_FUNC(void) {}
+#define OPENSSL_VPROC_STRING_(x) x##_SSL
+#define OPENSSL_VPROC_STRING(x) OPENSSL_VPROC_STRING_(x)
+#define OPENSSL_VPROC_FUNC OPENSSL_VPROC_STRING(OPENSSL_VPROC)
+void OPENSSL_VPROC_FUNC(void) { }
 #endif
 
 int SSL_clear(SSL *s)
@@ -617,7 +614,7 @@ int ossl_ssl_connection_reset(SSL *s)
 
     sc->key_update = SSL_KEY_UPDATE_NONE;
     memset(sc->ext.compress_certificate_from_peer, 0,
-           sizeof(sc->ext.compress_certificate_from_peer));
+        sizeof(sc->ext.compress_certificate_from_peer));
     sc->ext.compress_certificate_sent = 0;
 
     EVP_MD_CTX_free(sc->pha_dgst);
@@ -652,6 +649,8 @@ int ossl_ssl_connection_reset(SSL *s)
             return 0;
     }
 
+    ossl_quic_tls_clear(sc->qtls);
+
     if (!RECORD_LAYER_reset(&sc->rlayer))
         return 0;
 
@@ -676,10 +675,10 @@ int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth)
         return 0;
     }
     sk = ssl_create_cipher_list(ctx,
-                                ctx->tls13_ciphersuites,
-                                &(ctx->cipher_list),
-                                &(ctx->cipher_list_by_id),
-                                OSSL_default_cipher_list(), ctx->cert);
+        ctx->tls13_ciphersuites,
+        &(ctx->cipher_list),
+        &(ctx->cipher_list_by_id),
+        OSSL_default_cipher_list(), ctx->cert);
     if ((sk == NULL) || (sk_SSL_CIPHER_num(sk) <= 0)) {
         ERR_raise(ERR_LIB_SSL, SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS);
         return 0;
@@ -730,7 +729,7 @@ int ossl_ssl_init(SSL *ssl, SSL_CTX *ctx, const SSL_METHOD *method, int type)
 }
 
 SSL *ossl_ssl_connection_new_int(SSL_CTX *ctx, SSL *user_ssl,
-                                 const SSL_METHOD *method)
+    const SSL_METHOD *method)
 {
     SSL_CONNECTION *s;
     SSL *ssl;
@@ -830,15 +829,13 @@ SSL *ossl_ssl_connection_new_int(SSL_CTX *ctx, SSL *user_ssl,
 
     s->session_ctx = ctx;
     if (ctx->ext.ecpointformats != NULL) {
-        s->ext.ecpointformats =
-            OPENSSL_memdup(ctx->ext.ecpointformats,
-                           ctx->ext.ecpointformats_len);
+        s->ext.ecpointformats = OPENSSL_memdup(ctx->ext.ecpointformats,
+            ctx->ext.ecpointformats_len);
         if (s->ext.ecpointformats == NULL) {
             s->ext.ecpointformats_len = 0;
             goto err;
         }
-        s->ext.ecpointformats_len =
-            ctx->ext.ecpointformats_len;
+        s->ext.ecpointformats_len = ctx->ext.ecpointformats_len;
     }
     if (ctx->ext.supportedgroups != NULL) {
         size_t add = 0;
@@ -846,10 +843,9 @@ SSL *ossl_ssl_connection_new_int(SSL_CTX *ctx, SSL *user_ssl,
         if (ctx->ext.supportedgroups_len == 0)
             /* Add 1 so allocation won't fail */
             add = 1;
-        s->ext.supportedgroups =
-            OPENSSL_memdup(ctx->ext.supportedgroups,
-                           (ctx->ext.supportedgroups_len + add)
-                           * sizeof(*ctx->ext.supportedgroups));
+        s->ext.supportedgroups = OPENSSL_memdup(ctx->ext.supportedgroups,
+            (ctx->ext.supportedgroups_len + add)
+                * sizeof(*ctx->ext.supportedgroups));
         if (s->ext.supportedgroups == NULL) {
             s->ext.supportedgroups_len = 0;
             goto err;
@@ -862,10 +858,9 @@ SSL *ossl_ssl_connection_new_int(SSL_CTX *ctx, SSL *user_ssl,
         if (ctx->ext.keyshares_len == 0)
             /* Add 1 so allocation won't fail */
             add = 1;
-        s->ext.keyshares =
-            OPENSSL_memdup(ctx->ext.keyshares,
-                           (ctx->ext.keyshares_len + add)
-                           * sizeof(*ctx->ext.keyshares));
+        s->ext.keyshares = OPENSSL_memdup(ctx->ext.keyshares,
+            (ctx->ext.keyshares_len + add)
+                * sizeof(*ctx->ext.keyshares));
         if (s->ext.keyshares == NULL) {
             s->ext.keyshares_len = 0;
             goto err;
@@ -878,10 +873,9 @@ SSL *ossl_ssl_connection_new_int(SSL_CTX *ctx, SSL *user_ssl,
         if (ctx->ext.tuples_len == 0)
             /* Add 1 so allocation won't fail */
             add = 1;
-        s->ext.tuples =
-            OPENSSL_memdup(ctx->ext.tuples,
-                           (ctx->ext.tuples_len + add)
-                           * sizeof(*ctx->ext.tuples));
+        s->ext.tuples = OPENSSL_memdup(ctx->ext.tuples,
+            (ctx->ext.tuples_len + add)
+                * sizeof(*ctx->ext.tuples));
         if (s->ext.tuples == NULL) {
             s->ext.tuples_len = 0;
             goto err;
@@ -941,14 +935,14 @@ SSL *ossl_ssl_connection_new_int(SSL_CTX *ctx, SSL *user_ssl,
 #endif
     if (ctx->client_cert_type != NULL) {
         s->client_cert_type = OPENSSL_memdup(ctx->client_cert_type,
-                                             ctx->client_cert_type_len);
+            ctx->client_cert_type_len);
         if (s->client_cert_type == NULL)
             goto sslerr;
         s->client_cert_type_len = ctx->client_cert_type_len;
     }
     if (ctx->server_cert_type != NULL) {
         s->server_cert_type = OPENSSL_memdup(ctx->server_cert_type,
-                                             ctx->server_cert_type_len);
+            ctx->server_cert_type_len);
         if (s->server_cert_type == NULL)
             goto sslerr;
         s->server_cert_type_len = ctx->server_cert_type_len;
@@ -956,21 +950,21 @@ SSL *ossl_ssl_connection_new_int(SSL_CTX *ctx, SSL *user_ssl,
 
 #ifndef OPENSSL_NO_CT
     if (!SSL_set_ct_validation_callback(ssl, ctx->ct_validation_callback,
-                                        ctx->ct_validation_callback_arg))
+            ctx->ct_validation_callback_arg))
         goto sslerr;
 #endif
 
     s->ssl_pkey_num = SSL_PKEY_NUM + ctx->sigalg_list_len;
     return ssl;
- cerr:
+cerr:
     ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB);
     goto err;
- asn1err:
+asn1err:
     ERR_raise(ERR_LIB_SSL, ERR_R_ASN1_LIB);
     goto err;
- sslerr:
+sslerr:
     ERR_raise(ERR_LIB_SSL, ERR_R_SSL_LIB);
- err:
+err:
     SSL_free(ssl);
     return NULL;
 }
@@ -1015,6 +1009,11 @@ int SSL_is_quic(const SSL *s)
     return IS_QUIC(s);
 }
 
+int SSL_CTX_is_quic(const SSL_CTX *c)
+{
+    return IS_QUIC_CTX(c);
+}
+
 int SSL_up_ref(SSL *s)
 {
     int i;
@@ -1028,7 +1027,7 @@ int SSL_up_ref(SSL *s)
 }
 
 int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx,
-                                   unsigned int sid_ctx_len)
+    unsigned int sid_ctx_len)
 {
     if (sid_ctx_len > SSL_MAX_SID_CTX_LENGTH) {
         ERR_raise(ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG);
@@ -1041,7 +1040,7 @@ int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx,
 }
 
 int SSL_set_session_id_context(SSL *ssl, const unsigned char *sid_ctx,
-                               unsigned int sid_ctx_len)
+    unsigned int sid_ctx_len)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl);
 
@@ -1079,7 +1078,7 @@ int SSL_set_generate_session_id(SSL *ssl, GEN_SESSION_CB cb)
 }
 
 int SSL_has_matching_session_id(const SSL *ssl, const unsigned char *id,
-                                unsigned int id_len)
+    unsigned int id_len)
 {
     /*
      * A quick examination of SSL_SESSION_hash and SSL_SESSION_cmp shows how
@@ -1135,52 +1134,55 @@ int SSL_set_trust(SSL *s, int trust)
     return X509_VERIFY_PARAM_set_trust(sc->param, trust);
 }
 
-int SSL_set1_host(SSL *s, const char *hostname)
+int SSL_set1_host(SSL *s, const char *host)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
     if (sc == NULL)
         return 0;
 
-    /* If a hostname is provided and parses as an IP address,
-     * treat it as such. */
-    if (hostname != NULL
-        && X509_VERIFY_PARAM_set1_ip_asc(sc->param, hostname) == 1)
+    /* clear hostname(s) and IP address in any case, also if host parses as an IP address */
+    (void)X509_VERIFY_PARAM_set1_host(sc->param, NULL, 0);
+    (void)X509_VERIFY_PARAM_set1_ip(sc->param, NULL, 0);
+    if (host == NULL)
         return 1;
 
-    return X509_VERIFY_PARAM_set1_host(sc->param, hostname, 0);
+    /* If a host is provided and parses as an IP address, treat it as such. */
+    return X509_VERIFY_PARAM_set1_ip_asc(sc->param, host)
+        || X509_VERIFY_PARAM_set1_host(sc->param, host, 0);
 }
 
-int SSL_add1_host(SSL *s, const char *hostname)
+int SSL_add1_host(SSL *s, const char *host)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
     if (sc == NULL)
         return 0;
 
-    /* If a hostname is provided and parses as an IP address,
-     * treat it as such. */
-    if (hostname) {
+    /* If a host is provided and parses as an IP address, treat it as such. */
+    if (host != NULL) {
         ASN1_OCTET_STRING *ip;
         char *old_ip;
 
-        ip = a2i_IPADDRESS(hostname);
-        if (ip) {
+        ip = a2i_IPADDRESS(host);
+        if (ip != NULL) {
             /* We didn't want it; only to check if it *is* an IP address */
             ASN1_OCTET_STRING_free(ip);
 
             old_ip = X509_VERIFY_PARAM_get1_ip_asc(sc->param);
-            if (old_ip) {
+            if (old_ip != NULL) {
                 OPENSSL_free(old_ip);
                 /* There can be only one IP address */
+                ERR_raise_data(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT,
+                    "IP address was already set");
                 return 0;
             }
 
-            return X509_VERIFY_PARAM_set1_ip_asc(sc->param, hostname);
+            return X509_VERIFY_PARAM_set1_ip_asc(sc->param, host);
         }
     }
 
-    return X509_VERIFY_PARAM_add1_host(sc->param, hostname, 0);
+    return X509_VERIFY_PARAM_add1_host(sc->param, host, 0);
 }
 
 void SSL_set_hostflags(SSL *s, unsigned int flags)
@@ -1322,7 +1324,7 @@ int SSL_get0_dane_authority(SSL *s, X509 **mcert, EVP_PKEY **mspki)
 }
 
 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)
 {
     SSL_DANE *dane;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
@@ -1360,7 +1362,7 @@ SSL_DANE *SSL_get0_dane(SSL *s)
 }
 
 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)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
@@ -1371,7 +1373,7 @@ int SSL_dane_tlsa_add(SSL *s, uint8_t usage, uint8_t selector,
 }
 
 int SSL_CTX_dane_mtype_set(SSL_CTX *ctx, const EVP_MD *md, uint8_t mtype,
-                           uint8_t ord)
+    uint8_t ord)
 {
     return dane_mtype_set(&ctx->dane, md, mtype, ord);
 }
@@ -1428,11 +1430,10 @@ void SSL_free(SSL *s)
         return;
     REF_ASSERT_ISNT(i < 0);
 
-    CRYPTO_free_ex_data(CRYPTO_EX_INDEX_SSL, s, &s->ex_data);
-
     if (s->method != NULL)
         s->method->ssl_free(s);
 
+    CRYPTO_free_ex_data(CRYPTO_EX_INDEX_SSL, s, &s->ex_data);
     SSL_CTX_free(s->ctx);
     CRYPTO_THREAD_lock_free(s->lock);
     CRYPTO_FREE_REF(&s->references);
@@ -1448,15 +1449,17 @@ void ossl_ssl_connection_free(SSL *ssl)
     if (s == NULL)
         return;
 
-    X509_VERIFY_PARAM_free(s->param);
-    dane_final(&s->dane);
-
-    /* Ignore return value */
+    /*
+     * Ignore return values. This could result in user callbacks being called
+     * e.g. for the QUIC TLS record layer. So we do this early before we have
+     * freed other things.
+     */
     ssl_free_wbio_buffer(s);
-
-    /* Ignore return value */
     RECORD_LAYER_clear(&s->rlayer);
 
+    X509_VERIFY_PARAM_free(s->param);
+    dane_final(&s->dane);
+
     BUF_MEM_free(s->init_buf);
 
     /* add extra stuff */
@@ -1722,17 +1725,8 @@ int SSL_set_fd(SSL *s, int fd)
     }
     BIO_set_fd(bio, fd, BIO_NOCLOSE);
     SSL_set_bio(s, bio, bio);
-#ifndef OPENSSL_NO_KTLS
-    /*
-     * The new socket is created successfully regardless of ktls_enable.
-     * ktls_enable doesn't change any functionality of the socket, except
-     * changing the setsockopt to enable the processing of ktls_start.
-     * Thus, it is not a problem to call it for non-TLS sockets.
-     */
-    ktls_enable(fd);
-#endif /* OPENSSL_NO_KTLS */
     ret = 1;
- err:
+err:
     return ret;
 }
 
@@ -1756,15 +1750,6 @@ int SSL_set_wfd(SSL *s, int fd)
         }
         BIO_set_fd(bio, fd, BIO_NOCLOSE);
         SSL_set0_wbio(s, bio);
-#ifndef OPENSSL_NO_KTLS
-        /*
-         * The new socket is created successfully regardless of ktls_enable.
-         * ktls_enable doesn't change any functionality of the socket, except
-         * changing the setsockopt to enable the processing of ktls_start.
-         * Thus, it is not a problem to call it for non-TLS sockets.
-         */
-        ktls_enable(fd);
-#endif /* OPENSSL_NO_KTLS */
     } else {
         if (!BIO_up_ref(rbio))
             return 0;
@@ -1855,7 +1840,8 @@ int SSL_get_verify_depth(const SSL *s)
     return X509_VERIFY_PARAM_get_depth(sc->param);
 }
 
-int (*SSL_get_verify_callback(const SSL *s)) (int, X509_STORE_CTX *) {
+int (*SSL_get_verify_callback(const SSL *s))(int, X509_STORE_CTX *)
+{
     const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s);
 
     if (sc == NULL)
@@ -1874,12 +1860,13 @@ int SSL_CTX_get_verify_depth(const SSL_CTX *ctx)
     return X509_VERIFY_PARAM_get_depth(ctx->param);
 }
 
-int (*SSL_CTX_get_verify_callback(const SSL_CTX *ctx)) (int, X509_STORE_CTX *) {
+int (*SSL_CTX_get_verify_callback(const SSL_CTX *ctx))(int, X509_STORE_CTX *)
+{
     return ctx->default_verify_callback;
 }
 
 void SSL_set_verify(SSL *s, int mode,
-                    int (*callback) (int ok, X509_STORE_CTX *ctx))
+    int (*callback)(int ok, X509_STORE_CTX *ctx))
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
@@ -1912,7 +1899,7 @@ void SSL_set_read_ahead(SSL *s, int yes)
     RECORD_LAYER_set_read_ahead(&sc->rlayer, yes);
 
     *opts++ = OSSL_PARAM_construct_int(OSSL_LIBSSL_RECORD_LAYER_PARAM_READ_AHEAD,
-                                       &sc->rlayer.read_ahead);
+        &sc->rlayer.read_ahead);
     *opts = OSSL_PARAM_construct_end();
 
     /* Ignore return value */
@@ -2078,8 +2065,7 @@ int SSL_CTX_check_private_key(const SSL_CTX *ctx)
         ERR_raise(ERR_LIB_SSL, SSL_R_NO_PRIVATE_KEY_ASSIGNED);
         return 0;
     }
-    return X509_check_private_key
-            (ctx->cert->key->x509, ctx->cert->key->privatekey);
+    return X509_check_private_key(ctx->cert->key->x509, ctx->cert->key->privatekey);
 }
 
 /* Fix this function so that it takes an optional type parameter */
@@ -2100,7 +2086,7 @@ int SSL_check_private_key(const SSL *ssl)
         return 0;
     }
     return X509_check_private_key(sc->cert->key->x509,
-                                   sc->cert->key->privatekey);
+        sc->cert->key->privatekey);
 }
 
 int SSL_waiting_for_async(SSL *s)
@@ -2130,7 +2116,7 @@ int SSL_get_all_async_fds(SSL *s, OSSL_ASYNC_FD *fds, size_t *numfds)
 }
 
 int SSL_get_changed_async_fds(SSL *s, OSSL_ASYNC_FD *addfd, size_t *numaddfds,
-                              OSSL_ASYNC_FD *delfd, size_t *numdelfds)
+    OSSL_ASYNC_FD *delfd, size_t *numdelfds)
 {
     ASYNC_WAIT_CTX *ctx;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
@@ -2141,7 +2127,7 @@ int SSL_get_changed_async_fds(SSL *s, OSSL_ASYNC_FD *addfd, size_t *numaddfds,
     if ((ctx = sc->waitctx) == NULL)
         return 0;
     return ASYNC_WAIT_CTX_get_changed_fds(ctx, addfd, numaddfds, delfd,
-                                          numdelfds);
+        numdelfds);
 }
 
 int SSL_CTX_set_async_callback(SSL_CTX *ctx, SSL_async_callback_fn callback)
@@ -2249,7 +2235,7 @@ static int ssl_async_wait_ctx_cb(void *arg)
 }
 
 static int ssl_start_async_job(SSL *s, struct ssl_async_args *args,
-                               int (*func) (void *))
+    int (*func)(void *))
 {
     int ret;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
@@ -2262,14 +2248,13 @@ static int ssl_start_async_job(SSL *s, struct ssl_async_args *args,
         if (sc->waitctx == NULL)
             return -1;
         if (sc->async_cb != NULL
-            && !ASYNC_WAIT_CTX_set_callback
-                 (sc->waitctx, ssl_async_wait_ctx_cb, s))
+            && !ASYNC_WAIT_CTX_set_callback(sc->waitctx, ssl_async_wait_ctx_cb, s))
             return -1;
     }
 
     sc->rwstate = SSL_NOTHING;
     switch (ASYNC_start_job(&sc->job, sc->waitctx, &ret, func, args,
-                            sizeof(struct ssl_async_args))) {
+        sizeof(struct ssl_async_args))) {
     case ASYNC_ERR:
         sc->rwstate = SSL_NOTHING;
         ERR_raise(ERR_LIB_SSL, SSL_R_FAILED_TO_INIT_ASYNC);
@@ -2340,7 +2325,7 @@ int ssl_read_internal(SSL *s, void *buf, size_t num, size_t *readbytes)
     }
 
     if (sc->early_data_state == SSL_EARLY_DATA_CONNECT_RETRY
-                || sc->early_data_state == SSL_EARLY_DATA_ACCEPT_RETRY) {
+        || sc->early_data_state == SSL_EARLY_DATA_ACCEPT_RETRY) {
         ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return 0;
     }
@@ -2438,8 +2423,7 @@ int SSL_read_early_data(SSL *s, void *buf, size_t num, size_t *readbytes)
              * SSL_EARLY_DATA_FINISHED_READING if we get an EndOfEarlyData
              * message
              */
-            if (ret > 0 || (ret <= 0 && sc->early_data_state
-                                        != SSL_EARLY_DATA_FINISHED_READING)) {
+            if (ret > 0 || (ret <= 0 && sc->early_data_state != SSL_EARLY_DATA_FINISHED_READING)) {
                 sc->early_data_state = SSL_EARLY_DATA_READ_RETRY;
                 return ret > 0 ? SSL_READ_EARLY_DATA_SUCCESS
                                : SSL_READ_EARLY_DATA_ERROR;
@@ -2527,7 +2511,6 @@ int SSL_peek(SSL *s, void *buf, int num)
     return ret;
 }
 
-
 int SSL_peek_ex(SSL *s, void *buf, size_t num, size_t *readbytes)
 {
     int ret = ssl_peek_internal(s, buf, num, readbytes);
@@ -2538,7 +2521,7 @@ int SSL_peek_ex(SSL *s, void *buf, size_t num, size_t *readbytes)
 }
 
 int ssl_write_internal(SSL *s, const void *buf, size_t num,
-                       uint64_t flags, size_t *written)
+    uint64_t flags, size_t *written)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
@@ -2567,8 +2550,8 @@ int ssl_write_internal(SSL *s, const void *buf, size_t num,
     }
 
     if (sc->early_data_state == SSL_EARLY_DATA_CONNECT_RETRY
-                || sc->early_data_state == SSL_EARLY_DATA_ACCEPT_RETRY
-                || sc->early_data_state == SSL_EARLY_DATA_READ_RETRY) {
+        || sc->early_data_state == SSL_EARLY_DATA_ACCEPT_RETRY
+        || sc->early_data_state == SSL_EARLY_DATA_READ_RETRY) {
         ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return 0;
     }
@@ -2642,20 +2625,18 @@ ossl_ssize_t SSL_sendfile(SSL *s, int fd, off_t offset, size_t size, int flags)
 
 #ifdef OPENSSL_NO_KTLS
     ERR_raise_data(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR,
-                   "can't call ktls_sendfile(), ktls disabled");
+        "can't call ktls_sendfile(), ktls disabled");
     return -1;
 #else
     ret = ktls_sendfile(SSL_get_wfd(s), fd, offset, size, flags);
     if (ret < 0) {
 #if defined(EAGAIN) && defined(EINTR) && defined(EBUSY)
-        if ((get_last_sys_error() == EAGAIN) ||
-            (get_last_sys_error() == EINTR) ||
-            (get_last_sys_error() == EBUSY))
+        if ((get_last_sys_error() == EAGAIN) || (get_last_sys_error() == EINTR) || (get_last_sys_error() == EBUSY))
             BIO_set_retry_write(sc->wbio);
         else
 #endif
             ERR_raise_data(ERR_LIB_SYS, get_last_sys_error(),
-                           "ktls_sendfile failure");
+                "ktls_sendfile failure");
         return ret;
     }
     sc->rwstate = SSL_NOTHING;
@@ -2691,7 +2672,7 @@ int SSL_write_ex(SSL *s, const void *buf, size_t num, size_t *written)
 }
 
 int SSL_write_ex2(SSL *s, const void *buf, size_t num, uint64_t flags,
-                  size_t *written)
+    size_t *written)
 {
     int ret = ssl_write_internal(s, buf, num, flags, written);
 
@@ -2714,9 +2695,9 @@ int SSL_write_early_data(SSL *s, const void *buf, size_t num, size_t *written)
     switch (sc->early_data_state) {
     case SSL_EARLY_DATA_NONE:
         if (sc->server
-                || !SSL_in_before(s)
-                || ((sc->session == NULL || sc->session->ext.max_early_data == 0)
-                     && (sc->psk_use_session_cb == NULL))) {
+            || !SSL_in_before(s)
+            || ((sc->session == NULL || sc->session->ext.max_early_data == 0)
+                && (sc->psk_use_session_cb == NULL))) {
             ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
             return 0;
         }
@@ -2836,7 +2817,7 @@ int SSL_key_update(SSL *s, int updatetype)
     }
 
     if (updatetype != SSL_KEY_UPDATE_NOT_REQUESTED
-            && updatetype != SSL_KEY_UPDATE_REQUESTED) {
+        && updatetype != SSL_KEY_UPDATE_REQUESTED) {
         ERR_raise(ERR_LIB_SSL, SSL_R_INVALID_KEY_UPDATE_TYPE);
         return 0;
     }
@@ -2943,8 +2924,8 @@ int SSL_new_session_ticket(SSL *s)
 
     /* If we are in init because we're sending tickets, okay to send more. */
     if ((SSL_in_init(s) && sc->ext.extra_tickets_expected == 0)
-            || SSL_IS_FIRST_HANDSHAKE(sc) || !sc->server
-            || !SSL_CONNECTION_IS_TLS13(sc))
+        || SSL_IS_FIRST_HANDSHAKE(sc) || !sc->server
+        || !SSL_CONNECTION_IS_TLS13(sc))
         return 0;
     sc->ext.extra_tickets_expected++;
     if (!RECORD_LAYER_write_pending(&sc->rlayer) && !SSL_in_init(s))
@@ -2991,14 +2972,13 @@ long ossl_ctrl_internal(SSL *s, int cmd, long larg, void *parg, int no_quic)
         RECORD_LAYER_set_read_ahead(&sc->rlayer, larg);
         return l;
 
-    case SSL_CTRL_MODE:
-    {
+    case SSL_CTRL_MODE: {
         OSSL_PARAM options[2], *opts = options;
 
         sc->mode |= larg;
 
         *opts++ = OSSL_PARAM_construct_uint32(OSSL_LIBSSL_RECORD_LAYER_PARAM_MODE,
-                                              &sc->mode);
+            &sc->mode);
         *opts = OSSL_PARAM_construct_end();
 
         /* Ignore return value */
@@ -3068,14 +3048,14 @@ long ossl_ctrl_internal(SSL *s, int cmd, long larg, void *parg, int no_quic)
             return 0;
     case SSL_CTRL_SET_MIN_PROTO_VERSION:
         return ssl_check_allowed_versions(larg, sc->max_proto_version)
-               && ssl_set_version_bound(s->defltmeth->version, (int)larg,
-                                        &sc->min_proto_version);
+            && ssl_set_version_bound(s->defltmeth->version, (int)larg,
+                &sc->min_proto_version);
     case SSL_CTRL_GET_MIN_PROTO_VERSION:
         return sc->min_proto_version;
     case SSL_CTRL_SET_MAX_PROTO_VERSION:
         return ssl_check_allowed_versions(sc->min_proto_version, larg)
-               && ssl_set_version_bound(s->defltmeth->version, (int)larg,
-                                        &sc->max_proto_version);
+            && ssl_set_version_bound(s->defltmeth->version, (int)larg,
+                &sc->max_proto_version);
     case SSL_CTRL_GET_MAX_PROTO_VERSION:
         return sc->max_proto_version;
     default:
@@ -3086,7 +3066,7 @@ long ossl_ctrl_internal(SSL *s, int cmd, long larg, void *parg, int no_quic)
     }
 }
 
-long SSL_callback_ctrl(SSL *s, int cmd, void (*fp) (void))
+long SSL_callback_ctrl(SSL *s, int cmd, void (*fp)(void))
 {
     return s->method->ssl_callback_ctrl(s, cmd, fp);
 }
@@ -3211,14 +3191,14 @@ long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
         return (ctx->cert->cert_flags &= ~larg);
     case SSL_CTRL_SET_MIN_PROTO_VERSION:
         return ssl_check_allowed_versions(larg, ctx->max_proto_version)
-               && ssl_set_version_bound(ctx->method->version, (int)larg,
-                                        &ctx->min_proto_version);
+            && ssl_set_version_bound(ctx->method->version, (int)larg,
+                &ctx->min_proto_version);
     case SSL_CTRL_GET_MIN_PROTO_VERSION:
         return ctx->min_proto_version;
     case SSL_CTRL_SET_MAX_PROTO_VERSION:
         return ssl_check_allowed_versions(ctx->min_proto_version, larg)
-               && ssl_set_version_bound(ctx->method->version, (int)larg,
-                                        &ctx->max_proto_version);
+            && ssl_set_version_bound(ctx->method->version, (int)larg,
+                &ctx->max_proto_version);
     case SSL_CTRL_GET_MAX_PROTO_VERSION:
         return ctx->max_proto_version;
     default:
@@ -3226,14 +3206,13 @@ long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
     }
 }
 
-long SSL_CTX_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void))
+long SSL_CTX_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
 {
     switch (cmd) {
     case SSL_CTRL_SET_MSG_CALLBACK:
-        ctx->msg_callback = (void (*)
-                             (int write_p, int version, int content_type,
-                              const void *buf, size_t len, SSL *ssl,
-                              void *arg))(fp);
+        ctx->msg_callback = (void (*)(int write_p, int version, int content_type,
+            const void *buf, size_t len, SSL *ssl,
+            void *arg))(fp);
         return 1;
 
     default:
@@ -3251,7 +3230,7 @@ int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b)
 }
 
 int ssl_cipher_ptr_id_cmp(const SSL_CIPHER *const *ap,
-                          const SSL_CIPHER *const *bp)
+    const SSL_CIPHER *const *bp)
 {
     if ((*ap)->id > (*bp)->id)
         return 1;
@@ -3325,7 +3304,7 @@ STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL_CONNECTION *s)
         if (s->cipher_list_by_id != NULL)
             return s->cipher_list_by_id;
         else if (s->ssl.ctx != NULL
-                 && s->ssl.ctx->cipher_list_by_id != NULL)
+            && s->ssl.ctx->cipher_list_by_id != NULL)
             return s->ssl.ctx->cipher_list_by_id;
     }
     return NULL;
@@ -3383,8 +3362,8 @@ int SSL_CTX_set_cipher_list(SSL_CTX *ctx, const char *str)
     STACK_OF(SSL_CIPHER) *sk;
 
     sk = ssl_create_cipher_list(ctx, ctx->tls13_ciphersuites,
-                                &ctx->cipher_list, &ctx->cipher_list_by_id, str,
-                                ctx->cert);
+        &ctx->cipher_list, &ctx->cipher_list_by_id, str,
+        ctx->cert);
     /*
      * ssl_create_cipher_list may return an empty stack if it was unable to
      * find a cipher matching the given rule string (for example if the rule
@@ -3413,8 +3392,8 @@ int SSL_set_cipher_list(SSL *s, const char *str)
 
     ctx = s->ctx;
     sk = ssl_create_cipher_list(ctx, sc->tls13_ciphersuites,
-                                &sc->cipher_list, &sc->cipher_list_by_id, str,
-                                sc->cert);
+        &sc->cipher_list, &sc->cipher_list_by_id, str,
+        sc->cert);
     /* see comment in SSL_CTX_set_cipher_list */
     if (sk == NULL)
         return 0;
@@ -3437,8 +3416,8 @@ char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size)
         return NULL;
 
     if (!sc->server
-            || sc->peer_ciphers == NULL
-            || size < 2)
+        || sc->peer_ciphers == NULL
+        || size < 2)
         return NULL;
 
     p = buf;
@@ -3457,18 +3436,20 @@ char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size)
         if (sk_SSL_CIPHER_find(srvrsk, c) < 0)
             continue;
 
-        n = OPENSSL_strnlen(c->name, size);
-        if (n >= size) {
-            if (p != buf)
-                --p;
-            *p = '\0';
-            return buf;
-        }
+        n = (int)OPENSSL_strnlen(c->name, size);
+        if (n >= size)
+            break;
+
         memcpy(p, c->name, n);
         p += n;
         *(p++) = ':';
         size -= n + 1;
     }
+
+    /* No overlap */
+    if (p == buf)
+        return NULL;
+
     p[-1] = '\0';
     return buf;
 }
@@ -3517,7 +3498,7 @@ const char *SSL_get_servername(const SSL *s, const int type)
          * - The function will return the servername requested by the client in
          *   this handshake or NULL if none was requested.
          */
-         if (sc->hit && !SSL_CONNECTION_IS_TLS13(sc))
+        if (sc->hit && !SSL_CONNECTION_IS_TLS13(sc))
             return sc->session->ext.hostname;
     } else {
         /**
@@ -3544,8 +3525,8 @@ const char *SSL_get_servername(const SSL *s, const int type)
          */
         if (SSL_in_before(s)) {
             if (sc->ext.hostname == NULL
-                    && sc->session != NULL
-                    && sc->session->ssl_version != TLS1_3_VERSION)
+                && sc->session != NULL
+                && sc->session->ssl_version != TLS1_3_VERSION)
                 return sc->session->ext.hostname;
         } else {
             if (!SSL_CONNECTION_IS_TLS13(sc) && sc->hit
@@ -3585,15 +3566,15 @@ int SSL_get_servername_type(const SSL *s)
  * found, or OPENSSL_NPN_NO_OVERLAP if the fallback case was reached.
  */
 int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
-                          const unsigned char *server,
-                          unsigned int server_len,
-                          const unsigned char *client, unsigned int client_len)
+    const unsigned char *server,
+    unsigned int server_len,
+    const unsigned char *client, unsigned int client_len)
 {
     PACKET cpkt, csubpkt, spkt, ssubpkt;
 
     if (!PACKET_buf_init(&cpkt, client, client_len)
-            || !PACKET_get_length_prefixed_1(&cpkt, &csubpkt)
-            || PACKET_remaining(&csubpkt) == 0) {
+        || !PACKET_get_length_prefixed_1(&cpkt, &csubpkt)
+        || PACKET_remaining(&csubpkt) == 0) {
         *out = NULL;
         *outlen = 0;
         return OPENSSL_NPN_NO_OVERLAP;
@@ -3616,7 +3597,7 @@ int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
             if (PACKET_buf_init(&cpkt, client, client_len)) {
                 while (PACKET_get_length_prefixed_1(&cpkt, &csubpkt)) {
                     if (PACKET_equal(&csubpkt, PACKET_data(&ssubpkt),
-                                     PACKET_remaining(&ssubpkt))) {
+                            PACKET_remaining(&ssubpkt))) {
                         /* We found a match */
                         *out = (unsigned char *)PACKET_data(&ssubpkt);
                         *outlen = (unsigned char)PACKET_remaining(&ssubpkt);
@@ -3649,7 +3630,7 @@ int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
  * provided by the callback.
  */
 void SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data,
-                                    unsigned *len)
+    unsigned *len)
 {
     const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s);
 
@@ -3679,8 +3660,8 @@ void SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data,
  * ServerHello.
  */
 void SSL_CTX_set_npn_advertised_cb(SSL_CTX *ctx,
-                                   SSL_CTX_npn_advertised_cb_func cb,
-                                   void *arg)
+    SSL_CTX_npn_advertised_cb_func cb,
+    void *arg)
 {
     if (IS_QUIC_CTX(ctx))
         /* NPN not allowed for QUIC */
@@ -3701,8 +3682,8 @@ void SSL_CTX_set_npn_advertised_cb(SSL_CTX *ctx,
  * a value other than SSL_TLSEXT_ERR_OK.
  */
 void SSL_CTX_set_npn_select_cb(SSL_CTX *ctx,
-                               SSL_CTX_npn_select_cb_func cb,
-                               void *arg)
+    SSL_CTX_npn_select_cb_func cb,
+    void *arg)
 {
     if (IS_QUIC_CTX(ctx))
         /* NPN not allowed for QUIC */
@@ -3732,7 +3713,7 @@ static int alpn_value_ok(const unsigned char *protos, unsigned int protos_len)
  * length-prefixed strings). Returns 0 on success.
  */
 int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const unsigned char *protos,
-                            unsigned int protos_len)
+    unsigned int protos_len)
 {
     unsigned char *alpn;
 
@@ -3762,7 +3743,7 @@ int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const unsigned char *protos,
  * length-prefixed strings). Returns 0 on success.
  */
 int SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos,
-                        unsigned int protos_len)
+    unsigned int protos_len)
 {
     unsigned char *alpn;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl);
@@ -3796,8 +3777,8 @@ int SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos,
  * from the client's list of offered protocols.
  */
 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)
 {
     ctx->ext.alpn_select_cb = cb;
     ctx->ext.alpn_select_cb_arg = arg;
@@ -3810,7 +3791,7 @@ void SSL_CTX_set_alpn_select_cb(SSL_CTX *ctx,
  * respond with a negotiated protocol then |*len| will be zero.
  */
 void SSL_get0_alpn_selected(const SSL *ssl, const unsigned char **data,
-                            unsigned int *len)
+    unsigned int *len)
 {
     const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(ssl);
 
@@ -3829,9 +3810,9 @@ void SSL_get0_alpn_selected(const SSL *ssl, const unsigned char **data,
 }
 
 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_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
@@ -3843,15 +3824,15 @@ int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
         return -1;
 
     return sc->ssl.method->ssl3_enc->export_keying_material(sc, out, olen, label,
-                                                            llen, context,
-                                                            contextlen,
-                                                            use_context);
+        llen, context,
+        contextlen,
+        use_context);
 }
 
 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)
+    const char *label, size_t llen,
+    const unsigned char *context,
+    size_t contextlen)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
@@ -3862,7 +3843,7 @@ int SSL_export_keying_material_early(SSL *s, unsigned char *out, size_t olen,
         return 0;
 
     return tls13_export_keying_material_early(sc, out, olen, label, llen,
-                                              context, contextlen);
+        context, contextlen);
 }
 
 static unsigned long ssl_session_hash(const SSL_SESSION *a)
@@ -3877,11 +3858,7 @@ static unsigned long ssl_session_hash(const SSL_SESSION *a)
         session_id = tmp_storage;
     }
 
-    l = (unsigned long)
-        ((unsigned long)session_id[0]) |
-        ((unsigned long)session_id[1] << 8L) |
-        ((unsigned long)session_id[2] << 16L) |
-        ((unsigned long)session_id[3] << 24L);
+    l = (unsigned long)((unsigned long)session_id[0]) | ((unsigned long)session_id[1] << 8L) | ((unsigned long)session_id[2] << 16L) | ((unsigned long)session_id[3] << 24L);
     return l;
 }
 
@@ -3937,15 +3914,15 @@ DEFINE_RUN_ONCE_STATIC(ssl_keylog_init)
  * @returns 1 always
  */
 static long check_keylog_bio_free(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)
 {
 
     /*
      * Note we _dont_ take the keylog_lock here
      * This is intentional, because we only free the keylog lock
-     * During SSL_CTX_free, in which we already posess the lock, so
-     * Theres no need to grab it again here
+     * During SSL_CTX_free, in which we already possess the lock, so
+     * There's no need to grab it again here
      */
     if (oper == BIO_CB_FREE)
         keylog_bio = NULL;
@@ -3977,8 +3954,35 @@ static void do_sslkeylogfile(const SSL *ssl, const char *line)
  * via ssl.h.
  */
 
+#ifndef OPENSSL_NO_SSLKEYLOG
+static BIO *get_sslkeylog_bio(const char *keylogfile)
+{
+#ifdef _POSIX_C_SOURCE
+    BIO *b;
+    int fdno = -1;
+    FILE *fp = NULL;
+
+    fdno = open(keylogfile, O_WRONLY | O_CREAT | O_APPEND, 0600);
+    if (fdno < 0)
+        return NULL;
+
+    fp = fdopen(fdno, "a");
+    if (fp == NULL) {
+        close(fdno);
+        return NULL;
+    }
+
+    if ((b = BIO_new_fp(fp, BIO_CLOSE)) == NULL)
+        fclose(fp);
+    return b;
+#else
+    return BIO_new_file(keylogfile, "a");
+#endif
+}
+#endif
+
 SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
-                        const SSL_METHOD *meth)
+    const SSL_METHOD *meth)
 {
     SSL_CTX *ret = NULL;
 #ifndef OPENSSL_NO_SSLKEYLOG
@@ -4096,9 +4100,9 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
     }
 
     if (!ssl_create_cipher_list(ret,
-                                ret->tls13_ciphersuites,
-                                &ret->cipher_list, &ret->cipher_list_by_id,
-                                OSSL_default_cipher_list(), ret->cert)
+            ret->tls13_ciphersuites,
+            &ret->cipher_list, &ret->cipher_list_by_id,
+            OSSL_default_cipher_list(), ret->cert)
         || sk_SSL_CIPHER_num(ret->cipher_list) <= 0) {
         ERR_raise(ERR_LIB_SSL, SSL_R_LIBRARY_HAS_NO_CIPHERS);
         goto err;
@@ -4144,15 +4148,19 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
 
     /* Setup RFC5077 ticket keys */
     if ((RAND_bytes_ex(libctx, ret->ext.tick_key_name,
-                       sizeof(ret->ext.tick_key_name), 0) <= 0)
+             sizeof(ret->ext.tick_key_name), 0)
+            <= 0)
         || (RAND_priv_bytes_ex(libctx, ret->ext.secure->tick_hmac_key,
-                               sizeof(ret->ext.secure->tick_hmac_key), 0) <= 0)
+                sizeof(ret->ext.secure->tick_hmac_key), 0)
+            <= 0)
         || (RAND_priv_bytes_ex(libctx, ret->ext.secure->tick_aes_key,
-                               sizeof(ret->ext.secure->tick_aes_key), 0) <= 0))
+                sizeof(ret->ext.secure->tick_aes_key), 0)
+            <= 0))
         ret->options |= SSL_OP_NO_TICKET;
 
     if (RAND_priv_bytes_ex(libctx, ret->ext.cookie_hmac_key,
-                           sizeof(ret->ext.cookie_hmac_key), 0) <= 0) {
+            sizeof(ret->ext.cookie_hmac_key), 0)
+        <= 0) {
         ERR_raise(ERR_LIB_SSL, ERR_R_RAND_LIB);
         goto err;
     }
@@ -4164,9 +4172,9 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
     }
 #endif
 #ifndef OPENSSL_NO_ENGINE
-# ifdef OPENSSL_SSL_CLIENT_ENGINE_AUTO
-#  define eng_strx(x)     #x
-#  define eng_str(x)      eng_strx(x)
+#ifdef OPENSSL_SSL_CLIENT_ENGINE_AUTO
+#define eng_strx(x) #x
+#define eng_str(x) eng_strx(x)
     /* Use specific client engine automatically... ignore errors */
     {
         ENGINE *eng;
@@ -4179,7 +4187,7 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
         if (!eng || !SSL_CTX_set_client_cert_engine(ret, eng))
             ERR_clear_error();
     }
-# endif
+#endif
 #endif
 
 #ifndef OPENSSL_NO_COMP_ALG
@@ -4239,14 +4247,14 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
     /* By default we send two session tickets automatically in TLSv1.3 */
     ret->num_tickets = 2;
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
     /* only create a cache for client CTX-es */
     if (meth == OSSL_QUIC_client_method())
         if ((ret->tokencache = ossl_quic_new_token_store()) == NULL)
             goto err;
     ret->domain_flags = 0;
     if (IS_QUIC_METHOD(meth)) {
-#  if defined(OPENSSL_THREADS)
+#if defined(OPENSSL_THREADS)
         if (meth == OSSL_QUIC_client_thread_method())
             ret->domain_flags
                 = SSL_DOMAIN_FLAG_MULTI_THREAD
@@ -4256,13 +4264,13 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
             ret->domain_flags
                 = SSL_DOMAIN_FLAG_MULTI_THREAD
                 | SSL_DOMAIN_FLAG_LEGACY_BLOCKING;
-#  else
+#else
         ret->domain_flags
             = SSL_DOMAIN_FLAG_SINGLE_THREAD
             | SSL_DOMAIN_FLAG_LEGACY_BLOCKING;
-#  endif
+#endif
     }
-# endif
+#endif
 
     if (!ssl_ctx_system_config(ret)) {
         ERR_raise(ERR_LIB_SSL, SSL_R_ERROR_IN_SYSTEM_DEFAULT_CONFIG);
@@ -4274,7 +4282,7 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
         /* Make sure we have a global lock allocated */
         if (!RUN_ONCE(&ssl_keylog_once, ssl_keylog_init)) {
             /* use a trace message as a warning */
-            OSSL_TRACE(TLS, "Unable to initalize keylog data\n");
+            OSSL_TRACE(TLS, "Unable to initialize keylog data\n");
             goto out;
         }
 
@@ -4289,7 +4297,7 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
              * if its already there.
              */
             if (keylog_bio == NULL) {
-                keylog_bio = BIO_new_file(keylogfile, "a");
+                keylog_bio = get_sslkeylog_bio(keylogfile);
                 if (keylog_bio == NULL) {
                     OSSL_TRACE(TLS, "Unable to create keylog bio\n");
                     goto out;
@@ -4309,7 +4317,7 @@ SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
 out:
 #endif
     return ret;
- err:
+err:
     SSL_CTX_free(ret);
 #ifndef OPENSSL_NO_SSLKEYLOG
     BIO_free(keylog_bio);
@@ -4515,15 +4523,15 @@ void *SSL_get_default_passwd_cb_userdata(SSL *s)
 }
 
 void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx,
-                                      int (*cb) (X509_STORE_CTX *, void *),
-                                      void *arg)
+    int (*cb)(X509_STORE_CTX *, void *),
+    void *arg)
 {
     ctx->app_verify_callback = cb;
     ctx->app_verify_arg = arg;
 }
 
 void SSL_CTX_set_verify(SSL_CTX *ctx, int mode,
-                        int (*cb) (int, X509_STORE_CTX *))
+    int (*cb)(int, X509_STORE_CTX *))
 {
     ctx->verify_mode = mode;
     ctx->default_verify_callback = cb;
@@ -4534,12 +4542,12 @@ void SSL_CTX_set_verify_depth(SSL_CTX *ctx, int depth)
     X509_VERIFY_PARAM_set_depth(ctx->param, depth);
 }
 
-void SSL_CTX_set_cert_cb(SSL_CTX *c, int (*cb) (SSL *ssl, void *arg), void *arg)
+void SSL_CTX_set_cert_cb(SSL_CTX *c, int (*cb)(SSL *ssl, void *arg), void *arg)
 {
     ssl_cert_set_cert_cb(c->cert, cb, arg);
 }
 
-void SSL_set_cert_cb(SSL *s, int (*cb) (SSL *ssl, void *arg), void *arg)
+void SSL_set_cert_cb(SSL *s, int (*cb)(SSL *ssl, void *arg), void *arg)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
@@ -4561,8 +4569,8 @@ void ssl_set_masks(SSL_CONNECTION *s)
         return;
 
     dh_tmp = (c->dh_tmp != NULL
-              || c->dh_tmp_cb != NULL
-              || c->dh_tmp_auto);
+        || c->dh_tmp_cb != NULL
+        || c->dh_tmp_auto);
 
     rsa_enc = pvalid[SSL_PKEY_RSA] & CERT_PKEY_VALID;
     rsa_sign = pvalid[SSL_PKEY_RSA] & CERT_PKEY_VALID;
@@ -4572,7 +4580,7 @@ void ssl_set_masks(SSL_CONNECTION *s)
     mask_a = 0;
 
     OSSL_TRACE4(TLS_CIPHER, "dh_tmp=%d rsa_enc=%d rsa_sign=%d dsa_sign=%d\n",
-               dh_tmp, rsa_enc, rsa_sign, dsa_sign);
+        dh_tmp, rsa_enc, rsa_sign, dsa_sign);
 
 #ifndef OPENSSL_NO_GOST
     if (ssl_has_cert(s, SSL_PKEY_GOST12_512)) {
@@ -4600,9 +4608,7 @@ void ssl_set_masks(SSL_CONNECTION *s)
      * if TLS 1.2 and peer supports it.
      */
 
-    if (rsa_enc || rsa_sign || (ssl_has_cert(s, SSL_PKEY_RSA_PSS_SIGN)
-                && pvalid[SSL_PKEY_RSA_PSS_SIGN] & CERT_PKEY_EXPLICIT_SIGN
-                && TLS1_get_version(&s->ssl) == TLS1_2_VERSION))
+    if (rsa_enc || rsa_sign || (ssl_has_cert(s, SSL_PKEY_RSA_PSS_SIGN) && pvalid[SSL_PKEY_RSA_PSS_SIGN] & CERT_PKEY_EXPLICIT_SIGN && TLS1_get_version(&s->ssl) == TLS1_2_VERSION))
         mask_a |= SSL_aRSA;
 
     if (dsa_sign) {
@@ -4625,7 +4631,7 @@ void ssl_set_masks(SSL_CONNECTION *s)
         if (pvalid[SSL_PKEY_RSA_PSS_SIGN] & CERT_PKEY_RPK)
             mask_a |= SSL_aRSA;
         if (pvalid[SSL_PKEY_ED25519] & CERT_PKEY_RPK
-                || pvalid[SSL_PKEY_ED448] & CERT_PKEY_RPK)
+            || pvalid[SSL_PKEY_ED448] & CERT_PKEY_RPK)
             mask_a |= SSL_aECDSA;
     }
 
@@ -4644,15 +4650,15 @@ void ssl_set_masks(SSL_CONNECTION *s)
     }
     /* Allow Ed25519 for TLS 1.2 if peer supports it */
     if (!(mask_a & SSL_aECDSA) && ssl_has_cert(s, SSL_PKEY_ED25519)
-            && pvalid[SSL_PKEY_ED25519] & CERT_PKEY_EXPLICIT_SIGN
-            && TLS1_get_version(&s->ssl) == TLS1_2_VERSION)
-            mask_a |= SSL_aECDSA;
+        && pvalid[SSL_PKEY_ED25519] & CERT_PKEY_EXPLICIT_SIGN
+        && TLS1_get_version(&s->ssl) == TLS1_2_VERSION)
+        mask_a |= SSL_aECDSA;
 
     /* Allow Ed448 for TLS 1.2 if peer supports it */
     if (!(mask_a & SSL_aECDSA) && ssl_has_cert(s, SSL_PKEY_ED448)
-            && pvalid[SSL_PKEY_ED448] & CERT_PKEY_EXPLICIT_SIGN
-            && TLS1_get_version(&s->ssl) == TLS1_2_VERSION)
-            mask_a |= SSL_aECDSA;
+        && pvalid[SSL_PKEY_ED448] & CERT_PKEY_EXPLICIT_SIGN
+        && TLS1_get_version(&s->ssl) == TLS1_2_VERSION)
+        mask_a |= SSL_aECDSA;
 
     mask_k |= SSL_kECDHE;
 
@@ -4680,12 +4686,12 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL_CONNECTION *s)
             return 0;
         }
     }
-    return 1;                   /* all checks are ok */
+    return 1; /* all checks are ok */
 }
 
 int ssl_get_server_cert_serverinfo(SSL_CONNECTION *s,
-                                   const unsigned char **serverinfo,
-                                   size_t *serverinfo_length)
+    const unsigned char **serverinfo,
+    size_t *serverinfo_length)
 {
     CERT_PKEY *cpk = s->s3.tmp.cert;
     *serverinfo_length = 0;
@@ -4720,7 +4726,7 @@ void ssl_update_cache(SSL_CONNECTION *s, int mode)
      * (clients can set SSL_VERIFY_PEER without needing a sid_ctx set).
      */
     if (s->server && s->session->sid_ctx_length == 0
-            && (s->verify_mode & SSL_VERIFY_PEER) != 0)
+        && (s->verify_mode & SSL_VERIFY_PEER) != 0)
         return;
 
     i = s->session_ctx->session_cache_mode;
@@ -4738,12 +4744,12 @@ void ssl_update_cache(SSL_CONNECTION *s, int mode)
          * - SSL_OP_NO_TICKET is set in which case it is a stateful ticket
          */
         if ((i & SSL_SESS_CACHE_NO_INTERNAL_STORE) == 0
-                && (!SSL_CONNECTION_IS_TLS13(s)
-                    || !s->server
-                    || (s->max_early_data > 0
-                        && (s->options & SSL_OP_NO_ANTI_REPLAY) == 0)
-                    || s->session_ctx->remove_session_cb != NULL
-                    || (s->options & SSL_OP_NO_TICKET) != 0))
+            && (!SSL_CONNECTION_IS_TLS13(s)
+                || !s->server
+                || (s->max_early_data > 0
+                    && (s->options & SSL_OP_NO_ANTI_REPLAY) == 0)
+                || s->session_ctx->remove_session_cb != NULL
+                || (s->options & SSL_OP_NO_TICKET) != 0))
             SSL_CTX_add_session(s->session_ctx, s->session);
 
         /*
@@ -4753,7 +4759,7 @@ void ssl_update_cache(SSL_CONNECTION *s, int mode)
          */
         if (s->session_ctx->new_session_cb != NULL && SSL_SESSION_up_ref(s->session)) {
             if (!s->session_ctx->new_session_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                                s->session))
+                    s->session))
                 SSL_SESSION_free(s->session);
         }
     }
@@ -4794,7 +4800,7 @@ int SSL_set_ssl_method(SSL *s, const SSL_METHOD *meth)
 
     if (s->method != meth) {
         const SSL_METHOD *sm = s->method;
-        int (*hf) (SSL *) = sc->handshake_func;
+        int (*hf)(SSL *) = sc->handshake_func;
 
         if (sm->version == meth->version)
             s->method = meth;
@@ -4915,8 +4921,7 @@ int ossl_ssl_get_error(const SSL *s, int i, int check_err)
     if (SSL_want_client_hello_cb(s))
         return SSL_ERROR_WANT_CLIENT_HELLO_CB;
 
-    if ((sc->shutdown & SSL_RECEIVED_SHUTDOWN) &&
-        (sc->s3.warn_alert == SSL_AD_CLOSE_NOTIFY))
+    if ((sc->shutdown & SSL_RECEIVED_SHUTDOWN) && (sc->s3.warn_alert == SSL_AD_CLOSE_NOTIFY))
         return SSL_ERROR_ZERO_RETURN;
 
     return SSL_ERROR_SYSCALL;
@@ -4944,6 +4949,9 @@ int SSL_do_handshake(SSL *s)
         return ossl_quic_do_handshake(s);
 #endif
 
+    if (sc == NULL)
+        return -1;
+
     if (sc->handshake_func == NULL) {
         ERR_raise(ERR_LIB_SSL, SSL_R_CONNECTION_TYPE_NOT_SET);
         return -1;
@@ -4967,12 +4975,6 @@ int SSL_do_handshake(SSL *s)
         }
     }
 
-    if (ret == 1 && SSL_IS_QUIC_HANDSHAKE(sc) && !SSL_is_init_finished(s)) {
-        sc->rwstate = SSL_READING;
-        BIO_clear_retry_flags(SSL_get_rbio(s));
-        BIO_set_retry_read(SSL_get_rbio(s));
-        ret = 0;
-    }
     return ret;
 }
 
@@ -4982,7 +4984,8 @@ void SSL_set_accept_state(SSL *s)
 
 #ifndef OPENSSL_NO_QUIC
     if (IS_QUIC(s)) {
-        ossl_quic_set_accept_state(s);
+        /* We suppress errors because this is a void function */
+        (void)ossl_quic_set_accept_state(s, 0 /* suppress errors */);
         return;
     }
 #endif
@@ -5001,7 +5004,8 @@ void SSL_set_connect_state(SSL *s)
 
 #ifndef OPENSSL_NO_QUIC
     if (IS_QUIC(s)) {
-        ossl_quic_set_connect_state(s);
+        /* We suppress errors because this is a void function */
+        (void)ossl_quic_set_connect_state(s, 0 /* suppress errors */);
         return;
     }
 #endif
@@ -5169,7 +5173,7 @@ SSL *SSL_dup(SSL *s)
         }
 
         if (!SSL_set_session_id_context(ret, sc->sid_ctx,
-                                        (int)sc->sid_ctx_length))
+                (int)sc->sid_ctx_length))
             goto err;
     }
 
@@ -5221,12 +5225,12 @@ SSL *SSL_dup(SSL *s)
 
     /* Dup the client_CA list */
     if (!dup_ca_names(&retsc->ca_names, sc->ca_names)
-            || !dup_ca_names(&retsc->client_ca_names, sc->client_ca_names))
+        || !dup_ca_names(&retsc->client_ca_names, sc->client_ca_names))
         goto err;
 
     return ret;
 
- err:
+err:
     SSL_free(ret);
     return NULL;
 }
@@ -5471,6 +5475,8 @@ SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx)
     new_cert = ssl_cert_dup(ctx->cert);
     if (new_cert == NULL)
         goto err;
+    if (!custom_exts_copy_conn(&new_cert->custext, &sc->cert->custext))
+        goto err;
     if (!custom_exts_copy_flags(&new_cert->custext, &sc->cert->custext))
         goto err;
 
@@ -5489,16 +5495,14 @@ SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx)
      * not match (i.e., it was set per-ssl with SSL_set_session_id_context),
      * leave it unchanged.
      */
-    if ((ssl->ctx != NULL) &&
-        (sc->sid_ctx_length == ssl->ctx->sid_ctx_length) &&
-        (memcmp(sc->sid_ctx, ssl->ctx->sid_ctx, sc->sid_ctx_length) == 0)) {
+    if ((ssl->ctx != NULL) && (sc->sid_ctx_length == ssl->ctx->sid_ctx_length) && (memcmp(sc->sid_ctx, ssl->ctx->sid_ctx, sc->sid_ctx_length) == 0)) {
         sc->sid_ctx_length = ctx->sid_ctx_length;
         memcpy(&sc->sid_ctx, &ctx->sid_ctx, sizeof(sc->sid_ctx));
     }
 
     ssl_cert_free(sc->cert);
     sc->cert = new_cert;
-    SSL_CTX_free(ssl->ctx);     /* decrement reference count */
+    SSL_CTX_free(ssl->ctx); /* decrement reference count */
     ssl->ctx = ctx;
 
     return ssl->ctx;
@@ -5511,7 +5515,7 @@ SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx)
 int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx)
 {
     return X509_STORE_set_default_paths_ex(ctx->cert_store, ctx->libctx,
-                                           ctx->propq);
+        ctx->propq);
 }
 
 int SSL_CTX_set_default_verify_dir(SSL_CTX *ctx)
@@ -5544,7 +5548,7 @@ int SSL_CTX_set_default_verify_file(SSL_CTX *ctx)
     ERR_set_mark();
 
     X509_LOOKUP_load_file_ex(lookup, NULL, X509_FILETYPE_DEFAULT, ctx->libctx,
-                             ctx->propq);
+        ctx->propq);
 
     ERR_pop_to_mark();
 
@@ -5572,7 +5576,7 @@ int SSL_CTX_set_default_verify_store(SSL_CTX *ctx)
 int SSL_CTX_load_verify_file(SSL_CTX *ctx, const char *CAfile)
 {
     return X509_STORE_load_file_ex(ctx->cert_store, CAfile, ctx->libctx,
-                                   ctx->propq);
+        ctx->propq);
 }
 
 int SSL_CTX_load_verify_dir(SSL_CTX *ctx, const char *CApath)
@@ -5583,11 +5587,11 @@ int SSL_CTX_load_verify_dir(SSL_CTX *ctx, const char *CApath)
 int SSL_CTX_load_verify_store(SSL_CTX *ctx, const char *CAstore)
 {
     return X509_STORE_load_store_ex(ctx->cert_store, CAstore, ctx->libctx,
-                                    ctx->propq);
+        ctx->propq);
 }
 
 int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
-                                  const char *CApath)
+    const char *CApath)
 {
     if (CAfile == NULL && CApath == NULL)
         return 0;
@@ -5599,7 +5603,7 @@ int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
 }
 
 void SSL_set_info_callback(SSL *ssl,
-                           void (*cb) (const SSL *ssl, int type, int val))
+    void (*cb)(const SSL *ssl, int type, int val))
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl);
 
@@ -5613,9 +5617,10 @@ void SSL_set_info_callback(SSL *ssl,
  * One compiler (Diab DCC) doesn't like argument names in returned function
  * pointer.
  */
-void (*SSL_get_info_callback(const SSL *ssl)) (const SSL * /* ssl */ ,
-                                               int /* type */ ,
-                                               int /* val */ ) {
+void (*SSL_get_info_callback(const SSL *ssl))(const SSL * /* ssl */,
+    int /* type */,
+    int /* val */)
+{
     const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(ssl);
 
     if (sc == NULL)
@@ -5675,7 +5680,7 @@ size_t SSL_get_server_random(const SSL *ssl, unsigned char *out, size_t outlen)
 }
 
 size_t SSL_SESSION_get_master_key(const SSL_SESSION *session,
-                                  unsigned char *out, size_t outlen)
+    unsigned char *out, size_t outlen)
 {
     if (outlen == 0)
         return session->master_key_length;
@@ -5686,7 +5691,7 @@ size_t SSL_SESSION_get_master_key(const SSL_SESSION *session,
 }
 
 int SSL_SESSION_set1_master_key(SSL_SESSION *sess, const unsigned char *in,
-                                size_t len)
+    size_t len)
 {
     if (len > sizeof(sess->master_key))
         return 0;
@@ -5696,7 +5701,6 @@ int SSL_SESSION_set1_master_key(SSL_SESSION *sess, const unsigned char *in,
     return 1;
 }
 
-
 int SSL_set_ex_data(SSL *s, int idx, void *arg)
 {
     return CRYPTO_set_ex_data(&s->ex_data, idx, arg);
@@ -5851,7 +5855,7 @@ 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)
 {
     ctx->psk_find_session_cb = cb;
 }
@@ -5867,47 +5871,47 @@ 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)
 {
     ctx->psk_use_session_cb = cb;
 }
 
 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))
 {
     SSL_CTX_callback_ctrl(ctx, SSL_CTRL_SET_MSG_CALLBACK, (void (*)(void))cb);
 }
 
 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))
+    void (*cb)(int write_p, int version,
+        int content_type, const void *buf,
+        size_t len, SSL *ssl, void *arg))
 {
     SSL_callback_ctrl(ssl, SSL_CTRL_SET_MSG_CALLBACK, (void (*)(void))cb);
 }
 
 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))
 {
     SSL_CTX_callback_ctrl(ctx, SSL_CTRL_SET_NOT_RESUMABLE_SESS_CB,
-                          (void (*)(void))cb);
+        (void (*)(void))cb);
 }
 
 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))
 {
     SSL_callback_ctrl(ssl, SSL_CTRL_SET_NOT_RESUMABLE_SESS_CB,
-                      (void (*)(void))cb);
+        (void (*)(void))cb);
 }
 
 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))
 {
     ctx->record_padding_cb = cb;
 }
@@ -5923,7 +5927,7 @@ void *SSL_CTX_get_record_padding_callback_arg(const SSL_CTX *ctx)
 }
 
 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)
 {
     if (IS_QUIC_CTX(ctx) && (app_block_size > 1 || hs_block_size > 1))
         return 0;
@@ -5952,8 +5956,8 @@ int SSL_CTX_set_block_padding(SSL_CTX *ctx, size_t 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))
 {
     BIO *b;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(ssl);
@@ -5990,7 +5994,7 @@ void *SSL_get_record_padding_callback_arg(const SSL *ssl)
 }
 
 int SSL_set_block_padding_ex(SSL *ssl, size_t app_block_size,
-                             size_t hs_block_size)
+    size_t hs_block_size)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(ssl);
 
@@ -6058,8 +6062,8 @@ size_t SSL_CTX_get_num_tickets(const SSL_CTX *ctx)
 
 /* Retrieve handshake hashes */
 int ssl_handshake_hash(SSL_CONNECTION *s,
-                       unsigned char *out, size_t outlen,
-                       size_t *hashlen)
+    unsigned char *out, size_t outlen,
+    size_t *hashlen)
 {
     EVP_MD_CTX *ctx = NULL;
     EVP_MD_CTX *hdgst = s->s3.handshake_dgst;
@@ -6086,7 +6090,7 @@ int ssl_handshake_hash(SSL_CONNECTION *s,
     *hashlen = hashleni;
 
     ret = 1;
- err:
+err:
     EVP_MD_CTX_free(ctx);
     return ret;
 }
@@ -6141,9 +6145,9 @@ 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 (*cb)(const SSL *s, const SSL_CTX *ctx,
+        int op, int bits, int nid,
+        void *other, void *ex))
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
@@ -6153,10 +6157,11 @@ void SSL_set_security_callback(SSL *s,
     sc->cert->sec_cb = cb;
 }
 
-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 (*SSL_get_security_callback(const SSL *s))(const SSL *s,
+    const SSL_CTX *ctx, int op,
+    int bits, int nid, void *other,
+    void *ex)
+{
     const SSL_CONNECTION *sc = SSL_CONNECTION_FROM_CONST_SSL(s);
 
     if (sc == NULL)
@@ -6196,19 +6201,20 @@ 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 (*cb)(const SSL *s, const SSL_CTX *ctx,
+        int op, int bits, int nid,
+        void *other, void *ex))
 {
     ctx->cert->sec_cb = cb;
 }
 
-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 (*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)
+{
     return ctx->cert->sec_cb;
 }
 
@@ -6264,7 +6270,7 @@ uint64_t SSL_set_options(SSL *s, uint64_t op)
     sc->options |= op;
 
     *opts++ = OSSL_PARAM_construct_uint64(OSSL_LIBSSL_RECORD_LAYER_PARAM_OPTIONS,
-                                          &sc->options);
+        &sc->options);
     *opts = OSSL_PARAM_construct_end();
 
     /* Ignore return value */
@@ -6295,7 +6301,7 @@ uint64_t SSL_clear_options(SSL *s, uint64_t op)
     sc->options &= ~op;
 
     *opts++ = OSSL_PARAM_construct_uint64(OSSL_LIBSSL_RECORD_LAYER_PARAM_OPTIONS,
-                                          &sc->options);
+        &sc->options);
     *opts = OSSL_PARAM_construct_end();
 
     /* Ignore return value */
@@ -6329,7 +6335,7 @@ IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id);
  * of error, likewise the |src| stack may be left in an intermediate state.
  */
 static int ct_move_scts(STACK_OF(SCT) **dst, STACK_OF(SCT) *src,
-                        sct_source_t origin)
+    sct_source_t origin)
 {
     int scts_moved = 0;
     SCT *sct = NULL;
@@ -6352,7 +6358,7 @@ static int ct_move_scts(STACK_OF(SCT) **dst, STACK_OF(SCT) *src,
     }
 
     return scts_moved;
- err:
+err:
     SCT_free(sct);
     return -1;
 }
@@ -6387,7 +6393,7 @@ static int ct_extract_tls_extension_scts(SSL_CONNECTION *s)
  */
 static int ct_extract_ocsp_response_scts(SSL_CONNECTION *s)
 {
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
     int scts_extracted = 0;
     const unsigned char *p;
     OCSP_BASICRESP *br = NULL;
@@ -6413,22 +6419,20 @@ static int ct_extract_ocsp_response_scts(SSL_CONNECTION *s)
         if (single == NULL)
             continue;
 
-        scts =
-            OCSP_SINGLERESP_get1_ext_d2i(single, NID_ct_cert_scts, NULL, NULL);
-        scts_extracted =
-            ct_move_scts(&s->scts, scts, SCT_SOURCE_OCSP_STAPLED_RESPONSE);
+        scts = OCSP_SINGLERESP_get1_ext_d2i(single, NID_ct_cert_scts, NULL, NULL);
+        scts_extracted = ct_move_scts(&s->scts, scts, SCT_SOURCE_OCSP_STAPLED_RESPONSE);
         if (scts_extracted < 0)
             goto err;
     }
- err:
+err:
     SCT_LIST_free(scts);
     OCSP_BASICRESP_free(br);
     OCSP_RESPONSE_free(rsp);
     return scts_extracted;
-# else
+#else
     /* Behave as if no OCSP response exists */
     return 0;
-# endif
+#endif
 }
 
 /*
@@ -6442,11 +6446,9 @@ static int ct_extract_x509v3_extension_scts(SSL_CONNECTION *s)
     X509 *cert = s->session != NULL ? s->session->peer : NULL;
 
     if (cert != NULL) {
-        STACK_OF(SCT) *scts =
-            X509_get_ext_d2i(cert, NID_ct_precert_scts, NULL, NULL);
+        STACK_OF(SCT) *scts = X509_get_ext_d2i(cert, NID_ct_precert_scts, NULL, NULL);
 
-        scts_extracted =
-            ct_move_scts(&s->scts, scts, SCT_SOURCE_X509V3_EXTENSION);
+        scts_extracted = ct_move_scts(&s->scts, scts, SCT_SOURCE_X509V3_EXTENSION);
 
         SCT_LIST_free(scts);
     }
@@ -6467,26 +6469,24 @@ const STACK_OF(SCT) *SSL_get0_peer_scts(SSL *s)
         return NULL;
 
     if (!sc->scts_parsed) {
-        if (ct_extract_tls_extension_scts(sc) < 0 ||
-            ct_extract_ocsp_response_scts(sc) < 0 ||
-            ct_extract_x509v3_extension_scts(sc) < 0)
+        if (ct_extract_tls_extension_scts(sc) < 0 || ct_extract_ocsp_response_scts(sc) < 0 || ct_extract_x509v3_extension_scts(sc) < 0)
             goto err;
 
         sc->scts_parsed = 1;
     }
     return sc->scts;
- err:
+err:
     return NULL;
 }
 
 static int ct_permissive(const CT_POLICY_EVAL_CTX *ctx,
-                         const STACK_OF(SCT) *scts, void *unused_arg)
+    const STACK_OF(SCT) *scts, void *unused_arg)
 {
     return 1;
 }
 
 static int ct_strict(const CT_POLICY_EVAL_CTX *ctx,
-                     const STACK_OF(SCT) *scts, void *unused_arg)
+    const STACK_OF(SCT) *scts, void *unused_arg)
 {
     int count = scts != NULL ? sk_SCT_num(scts) : 0;
     int i;
@@ -6503,7 +6503,7 @@ static int ct_strict(const CT_POLICY_EVAL_CTX *ctx,
 }
 
 int SSL_set_ct_validation_callback(SSL *s, ssl_ct_validation_cb callback,
-                                   void *arg)
+    void *arg)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
@@ -6514,9 +6514,7 @@ int SSL_set_ct_validation_callback(SSL *s, ssl_ct_validation_cb callback,
      * Since code exists that uses the custom extension handler for CT, look
      * for this and throw an error if they have already registered to use CT.
      */
-    if (callback != NULL && SSL_CTX_has_client_custom_ext(s->ctx,
-                                                          TLSEXT_TYPE_signed_certificate_timestamp))
-    {
+    if (callback != NULL && SSL_CTX_has_client_custom_ext(s->ctx, TLSEXT_TYPE_signed_certificate_timestamp)) {
         ERR_raise(ERR_LIB_SSL, SSL_R_CUSTOM_EXT_HANDLER_ALREADY_INSTALLED);
         return 0;
     }
@@ -6536,15 +6534,13 @@ int SSL_set_ct_validation_callback(SSL *s, ssl_ct_validation_cb callback,
 }
 
 int SSL_CTX_set_ct_validation_callback(SSL_CTX *ctx,
-                                       ssl_ct_validation_cb callback, void *arg)
+    ssl_ct_validation_cb callback, void *arg)
 {
     /*
      * Since code exists that uses the custom extension handler for CT, look for
      * this and throw an error if they have already registered to use CT.
      */
-    if (callback != NULL && SSL_CTX_has_client_custom_ext(ctx,
-                                                          TLSEXT_TYPE_signed_certificate_timestamp))
-    {
+    if (callback != NULL && SSL_CTX_has_client_custom_ext(ctx, TLSEXT_TYPE_signed_certificate_timestamp)) {
         ERR_raise(ERR_LIB_SSL, SSL_R_CUSTOM_EXT_HANDLER_ALREADY_INSTALLED);
         return 0;
     }
@@ -6589,9 +6585,7 @@ int ssl_validate_ct(SSL_CONNECTION *s)
      * applications that perform certificate verification and therefore will
      * process SCTs when enabled.
      */
-    if (s->ct_validation_callback == NULL || cert == NULL ||
-        s->verify_result != X509_V_OK ||
-        s->verified_chain == NULL || sk_X509_num(s->verified_chain) <= 1)
+    if (s->ct_validation_callback == NULL || cert == NULL || s->verify_result != X509_V_OK || s->verified_chain == NULL || sk_X509_num(s->verified_chain) <= 1)
         return 1;
 
     /*
@@ -6607,7 +6601,7 @@ int ssl_validate_ct(SSL_CONNECTION *s)
     }
 
     ctx = CT_POLICY_EVAL_CTX_new_ex(SSL_CONNECTION_GET_CTX(s)->libctx,
-                                    SSL_CONNECTION_GET_CTX(s)->propq);
+        SSL_CONNECTION_GET_CTX(s)->propq);
     if (ctx == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_CT_LIB);
         goto end;
@@ -6617,9 +6611,9 @@ int ssl_validate_ct(SSL_CONNECTION *s)
     CT_POLICY_EVAL_CTX_set1_cert(ctx, cert);
     CT_POLICY_EVAL_CTX_set1_issuer(ctx, issuer);
     CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(ctx,
-            SSL_CONNECTION_GET_CTX(s)->ctlog_store);
+        SSL_CONNECTION_GET_CTX(s)->ctlog_store);
     CT_POLICY_EVAL_CTX_set_time(
-            ctx, (uint64_t)SSL_SESSION_get_time_ex(s->session) * 1000);
+        ctx, (uint64_t)SSL_SESSION_get_time_ex(s->session) * 1000);
 
     scts = SSL_get0_peer_scts(SSL_CONNECTION_GET_SSL(s));
 
@@ -6644,11 +6638,11 @@ int ssl_validate_ct(SSL_CONNECTION *s)
 
     ret = s->ct_validation_callback(ctx, scts, s->ct_validation_callback_arg);
     if (ret < 0)
-        ret = 0;                /* This function returns 0 on failure */
+        ret = 0; /* This function returns 0 on failure */
     if (!ret)
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_CALLBACK_FAILED);
 
- end:
+end:
     CT_POLICY_EVAL_CTX_free(ctx);
     /*
      * With SSL_VERIFY_NONE the session may be cached and reused despite a
@@ -6717,17 +6711,17 @@ const CTLOG_STORE *SSL_CTX_get0_ctlog_store(const SSL_CTX *ctx)
     return ctx->ctlog_store;
 }
 
-#endif  /* OPENSSL_NO_CT */
+#endif /* OPENSSL_NO_CT */
 
 void SSL_CTX_set_client_hello_cb(SSL_CTX *c, SSL_client_hello_cb_fn cb,
-                                 void *arg)
+    void *arg)
 {
     c->client_hello_cb = cb;
     c->client_hello_cb_arg = arg;
 }
 
 void SSL_CTX_set_new_pending_conn_cb(SSL_CTX *c, SSL_new_pending_conn_cb_fn cb,
-                                     void *arg)
+    void *arg)
 {
     c->new_pending_conn_cb = cb;
     c->new_pending_conn_arg = arg;
@@ -6848,7 +6842,7 @@ int SSL_client_hello_get1_extensions_present(SSL *s, int **out, size_t *outlen)
     *out = present;
     *outlen = num;
     return 1;
- err:
+err:
     OPENSSL_free(present);
     return 0;
 }
@@ -6892,7 +6886,7 @@ int SSL_client_hello_get_extension_order(SSL *s, uint16_t *exts, size_t *num_ext
 }
 
 int SSL_client_hello_get0_ext(SSL *s, unsigned int type, const unsigned char **out,
-                       size_t *outlen)
+    size_t *outlen)
 {
     size_t i;
     RAW_EXTENSION *r;
@@ -6927,7 +6921,7 @@ int SSL_free_buffers(SSL *ssl)
     rl = &sc->rlayer;
 
     return rl->rrlmethod->free_buffers(rl->rrl)
-           && rl->wrlmethod->free_buffers(rl->wrl);
+        && rl->wrlmethod->free_buffers(rl->wrl);
 }
 
 int SSL_alloc_buffers(SSL *ssl)
@@ -6945,7 +6939,7 @@ int SSL_alloc_buffers(SSL *ssl)
     rl = &sc->rlayer;
 
     return rl->rrlmethod->alloc_buffers(rl->rrl)
-           && rl->wrlmethod->alloc_buffers(rl->wrl);
+        && rl->wrlmethod->alloc_buffers(rl->wrl);
 }
 
 void SSL_CTX_set_keylog_callback(SSL_CTX *ctx, SSL_CTX_keylog_cb_func cb)
@@ -6959,11 +6953,11 @@ SSL_CTX_keylog_cb_func SSL_CTX_get_keylog_callback(const SSL_CTX *ctx)
 }
 
 static int nss_keylog_int(const char *prefix,
-                          SSL_CONNECTION *sc,
-                          const uint8_t *parameter_1,
-                          size_t parameter_1_len,
-                          const uint8_t *parameter_2,
-                          size_t parameter_2_len)
+    SSL_CONNECTION *sc,
+    const uint8_t *parameter_1,
+    size_t parameter_1_len,
+    const uint8_t *parameter_2,
+    size_t parameter_2_len)
 {
     char *out = NULL;
     char *cursor = NULL;
@@ -7014,10 +7008,10 @@ static int nss_keylog_int(const char *prefix,
 }
 
 int ssl_log_rsa_client_key_exchange(SSL_CONNECTION *sc,
-                                    const uint8_t *encrypted_premaster,
-                                    size_t encrypted_premaster_len,
-                                    const uint8_t *premaster,
-                                    size_t premaster_len)
+    const uint8_t *encrypted_premaster,
+    size_t encrypted_premaster_len,
+    const uint8_t *premaster,
+    size_t premaster_len)
 {
     if (encrypted_premaster_len < 8) {
         SSLfatal(sc, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -7026,27 +7020,27 @@ int ssl_log_rsa_client_key_exchange(SSL_CONNECTION *sc,
 
     /* We only want the first 8 bytes of the encrypted premaster as a tag. */
     return nss_keylog_int("RSA",
-                          sc,
-                          encrypted_premaster,
-                          8,
-                          premaster,
-                          premaster_len);
+        sc,
+        encrypted_premaster,
+        8,
+        premaster,
+        premaster_len);
 }
 
 int ssl_log_secret(SSL_CONNECTION *sc,
-                   const char *label,
-                   const uint8_t *secret,
-                   size_t secret_len)
+    const char *label,
+    const uint8_t *secret,
+    size_t secret_len)
 {
     return nss_keylog_int(label,
-                          sc,
-                          sc->s3.client_random,
-                          SSL3_RANDOM_SIZE,
-                          secret,
-                          secret_len);
+        sc,
+        sc->s3.client_random,
+        SSL3_RANDOM_SIZE,
+        secret,
+        secret_len);
 }
 
-#define SSLV2_CIPHER_LEN    3
+#define SSLV2_CIPHER_LEN 3
 
 int ssl_cache_cipherlist(SSL_CONNECTION *s, PACKET *cipher_suites, int sslv2format)
 {
@@ -7088,14 +7082,14 @@ int ssl_cache_cipherlist(SSL_CONNECTION *s, PACKET *cipher_suites, int sslv2form
             return 0;
         }
         for (s->s3.tmp.ciphers_rawlen = 0;
-             PACKET_remaining(&sslv2ciphers) > 0;
-             raw += TLS_CIPHER_LEN) {
+            PACKET_remaining(&sslv2ciphers) > 0;
+            raw += TLS_CIPHER_LEN) {
             if (!PACKET_get_1(&sslv2ciphers, &leadbyte)
-                    || (leadbyte == 0
-                        && !PACKET_copy_bytes(&sslv2ciphers, raw,
-                                              TLS_CIPHER_LEN))
-                    || (leadbyte != 0
-                        && !PACKET_forward(&sslv2ciphers, TLS_CIPHER_LEN))) {
+                || (leadbyte == 0
+                    && !PACKET_copy_bytes(&sslv2ciphers, raw,
+                        TLS_CIPHER_LEN))
+                || (leadbyte != 0
+                    && !PACKET_forward(&sslv2ciphers, TLS_CIPHER_LEN))) {
                 SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_PACKET);
                 OPENSSL_free(s->s3.tmp.ciphers_raw);
                 s->s3.tmp.ciphers_raw = NULL;
@@ -7106,7 +7100,7 @@ int ssl_cache_cipherlist(SSL_CONNECTION *s, PACKET *cipher_suites, int sslv2form
                 s->s3.tmp.ciphers_rawlen += TLS_CIPHER_LEN;
         }
     } else if (!PACKET_memdup(cipher_suites, &s->s3.tmp.ciphers_raw,
-                           &s->s3.tmp.ciphers_rawlen)) {
+                   &s->s3.tmp.ciphers_rawlen)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -7114,8 +7108,8 @@ int ssl_cache_cipherlist(SSL_CONNECTION *s, PACKET *cipher_suites, int sslv2form
 }
 
 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)
 {
     PACKET pkt;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
@@ -7129,9 +7123,9 @@ int SSL_bytes_to_cipher_list(SSL *s, const unsigned char *bytes, size_t len,
 }
 
 int ossl_bytes_to_cipher_list(SSL_CONNECTION *s, PACKET *cipher_suites,
-                              STACK_OF(SSL_CIPHER) **skp,
-                              STACK_OF(SSL_CIPHER) **scsvs_out,
-                              int sslv2format, int fatal)
+    STACK_OF(SSL_CIPHER) **skp,
+    STACK_OF(SSL_CIPHER) **scsvs_out,
+    int sslv2format, int fatal)
 {
     const SSL_CIPHER *c;
     STACK_OF(SSL_CIPHER) *sk = NULL;
@@ -7153,7 +7147,7 @@ int ossl_bytes_to_cipher_list(SSL_CONNECTION *s, PACKET *cipher_suites,
     if (PACKET_remaining(cipher_suites) % n != 0) {
         if (fatal)
             SSLfatal(s, SSL_AD_DECODE_ERROR,
-                     SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST);
+                SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST);
         else
             ERR_raise(ERR_LIB_SSL, SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST);
         return 0;
@@ -7181,8 +7175,7 @@ int ossl_bytes_to_cipher_list(SSL_CONNECTION *s, PACKET *cipher_suites,
         /* For SSLv2-compat, ignore leading 0-byte. */
         c = ssl_get_cipher_by_char(s, sslv2format ? &cipher[1] : cipher, 1);
         if (c != NULL) {
-            if ((c->valid && !sk_SSL_CIPHER_push(sk, c)) ||
-                (!c->valid && !sk_SSL_CIPHER_push(scsvs, c))) {
+            if ((c->valid && !sk_SSL_CIPHER_push(sk, c)) || (!c->valid && !sk_SSL_CIPHER_push(scsvs, c))) {
                 if (fatal)
                     SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_CRYPTO_LIB);
                 else
@@ -7208,7 +7201,7 @@ int ossl_bytes_to_cipher_list(SSL_CONNECTION *s, PACKET *cipher_suites,
     else
         sk_SSL_CIPHER_free(scsvs);
     return 1;
- err:
+err:
     sk_SSL_CIPHER_free(sk);
     sk_SSL_CIPHER_free(scsvs);
     return 0;
@@ -7409,9 +7402,9 @@ int SSL_verify_client_post_handshake(SSL *ssl)
 }
 
 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)
 {
     ctx->generate_ticket_cb = gen_cb;
     ctx->decrypt_ticket_cb = dec_cb;
@@ -7420,16 +7413,16 @@ int SSL_CTX_set_session_ticket_cb(SSL_CTX *ctx,
 }
 
 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)
 {
     ctx->allow_early_data_cb = cb;
     ctx->allow_early_data_cb_data = 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)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL_ONLY(s);
 
@@ -7441,8 +7434,8 @@ void SSL_set_allow_early_data_cb(SSL *s,
 }
 
 const EVP_CIPHER *ssl_evp_cipher_fetch(OSSL_LIB_CTX *libctx,
-                                       int nid,
-                                       const char *properties)
+    int nid,
+    const char *properties)
 {
     const EVP_CIPHER *ciph;
 
@@ -7461,7 +7454,7 @@ const EVP_CIPHER *ssl_evp_cipher_fetch(OSSL_LIB_CTX *libctx,
         int decrypt_only = 0;
 
         params[0] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_DECRYPT_ONLY,
-                                             &decrypt_only);
+            &decrypt_only);
         params[1] = OSSL_PARAM_construct_end();
         if (EVP_CIPHER_get_params((EVP_CIPHER *)ciph, params)
             && decrypt_only) {
@@ -7474,7 +7467,6 @@ const EVP_CIPHER *ssl_evp_cipher_fetch(OSSL_LIB_CTX *libctx,
     return ciph;
 }
 
-
 int ssl_evp_cipher_up_ref(const EVP_CIPHER *cipher)
 {
     /* Don't up-ref an implicit EVP_CIPHER */
@@ -7503,8 +7495,8 @@ void ssl_evp_cipher_free(const EVP_CIPHER *cipher)
 }
 
 const EVP_MD *ssl_evp_md_fetch(OSSL_LIB_CTX *libctx,
-                               int nid,
-                               const char *properties)
+    int nid,
+    const char *properties)
 {
     const EVP_MD *md;
 
@@ -7554,7 +7546,7 @@ int SSL_set0_tmp_dh_pkey(SSL *s, EVP_PKEY *dhpkey)
         return 0;
 
     if (!ssl_security(sc, SSL_SECOP_TMP_DH,
-                      EVP_PKEY_get_security_bits(dhpkey), 0, dhpkey)) {
+            EVP_PKEY_get_security_bits(dhpkey), 0, dhpkey)) {
         ERR_raise(ERR_LIB_SSL, SSL_R_DH_KEY_TOO_SMALL);
         return 0;
     }
@@ -7566,7 +7558,7 @@ int SSL_set0_tmp_dh_pkey(SSL *s, EVP_PKEY *dhpkey)
 int SSL_CTX_set0_tmp_dh_pkey(SSL_CTX *ctx, EVP_PKEY *dhpkey)
 {
     if (!ssl_ctx_security(ctx, SSL_SECOP_TMP_DH,
-                          EVP_PKEY_get_security_bits(dhpkey), 0, dhpkey)) {
+            EVP_PKEY_get_security_bits(dhpkey), 0, dhpkey)) {
         ERR_raise(ERR_LIB_SSL, SSL_R_DH_KEY_TOO_SMALL);
         return 0;
     }
@@ -7616,7 +7608,7 @@ int SSL_get_event_timeout(SSL *s, struct timeval *tv, int *is_infinite)
         return 1;
     }
 
-    tv->tv_sec  = 1000000;
+    tv->tv_sec = 1000000;
     tv->tv_usec = 0;
     *is_infinite = 1;
     return 1;
@@ -7713,8 +7705,8 @@ int SSL_set1_initial_peer_addr(SSL *s, const BIO_ADDR *peer_addr)
 }
 
 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)
 {
 #ifndef OPENSSL_NO_QUIC
     if (!IS_QUIC(ssl))
@@ -7886,8 +7878,8 @@ size_t SSL_get_accept_stream_queue_len(SSL *s)
 }
 
 int SSL_stream_reset(SSL *s,
-                     const SSL_STREAM_RESET_ARGS *args,
-                     size_t args_len)
+    const SSL_STREAM_RESET_ARGS *args,
+    size_t args_len)
 {
 #ifndef OPENSSL_NO_QUIC
     if (!IS_QUIC(s))
@@ -7948,7 +7940,7 @@ int SSL_get_stream_write_error_code(SSL *s, uint64_t *app_error_code)
 }
 
 int SSL_get_conn_close_info(SSL *s, SSL_CONN_CLOSE_INFO *info,
-                            size_t info_len)
+    size_t info_len)
 {
 #ifndef OPENSSL_NO_QUIC
     if (!IS_QUIC(s))
@@ -7961,7 +7953,7 @@ int SSL_get_conn_close_info(SSL *s, SSL_CONN_CLOSE_INFO *info,
 }
 
 int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id,
-                       uint64_t *value)
+    uint64_t *value)
 {
 #ifndef OPENSSL_NO_QUIC
     if (IS_QUIC(s))
@@ -7973,7 +7965,7 @@ int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id,
 }
 
 int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id,
-                       uint64_t value)
+    uint64_t value)
 {
 #ifndef OPENSSL_NO_QUIC
     if (IS_QUIC(s))
@@ -8072,21 +8064,20 @@ int ossl_adjust_domain_flags(uint64_t domain_flags, uint64_t *p_domain_flags)
 {
     if ((domain_flags & ~OSSL_QUIC_SUPPORTED_DOMAIN_FLAGS) != 0) {
         ERR_raise_data(ERR_LIB_SSL, ERR_R_UNSUPPORTED,
-                       "unsupported domain flag requested");
+            "unsupported domain flag requested");
         return 0;
     }
 
     if ((domain_flags & SSL_DOMAIN_FLAG_THREAD_ASSISTED) != 0)
         domain_flags |= SSL_DOMAIN_FLAG_MULTI_THREAD;
 
-    if ((domain_flags & (SSL_DOMAIN_FLAG_MULTI_THREAD
-                         | SSL_DOMAIN_FLAG_SINGLE_THREAD)) == 0)
+    if ((domain_flags & (SSL_DOMAIN_FLAG_MULTI_THREAD | SSL_DOMAIN_FLAG_SINGLE_THREAD)) == 0)
         domain_flags |= SSL_DOMAIN_FLAG_MULTI_THREAD;
 
     if ((domain_flags & SSL_DOMAIN_FLAG_SINGLE_THREAD) != 0
         && (domain_flags & SSL_DOMAIN_FLAG_MULTI_THREAD) != 0) {
         ERR_raise_data(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT,
-                       "mutually exclusive domain flags specified");
+            "mutually exclusive domain flags specified");
         return 0;
     }
 
@@ -8094,13 +8085,13 @@ int ossl_adjust_domain_flags(uint64_t domain_flags, uint64_t *p_domain_flags)
      * Note: We treat MULTI_THREAD as a no-op in non-threaded builds, but
      * not THREAD_ASSISTED.
      */
-# ifndef OPENSSL_THREADS
+#ifndef OPENSSL_THREADS
     if ((domain_flags & SSL_DOMAIN_FLAG_THREAD_ASSISTED) != 0) {
         ERR_raise_data(ERR_LIB_SSL, ERR_R_UNSUPPORTED,
-                       "thread assisted mode not available in this build");
+            "thread assisted mode not available in this build");
         return 0;
     }
-# endif
+#endif
 
     *p_domain_flags = domain_flags;
     return 1;
@@ -8119,7 +8110,7 @@ int SSL_CTX_set_domain_flags(SSL_CTX *ctx, uint64_t domain_flags)
 #endif
 
     ERR_raise_data(ERR_LIB_SSL, ERR_R_UNSUPPORTED,
-                   "domain flags unsupported on this kind of SSL_CTX");
+        "domain flags unsupported on this kind of SSL_CTX");
     return 0;
 }
 
@@ -8135,7 +8126,7 @@ int SSL_CTX_get_domain_flags(const SSL_CTX *ctx, uint64_t *domain_flags)
 #endif
 
     ERR_raise_data(ERR_LIB_SSL, ERR_R_UNSUPPORTED,
-                   "domain flags unsupported on this kind of SSL_CTX");
+        "domain flags unsupported on this kind of SSL_CTX");
     return 0;
 }
 
@@ -8161,9 +8152,10 @@ int SSL_add_expected_rpk(SSL *s, EVP_PKEY *rpk)
         return 0;
 
     ret = SSL_dane_tlsa_add(s, DANETLS_USAGE_DANE_EE,
-                            DANETLS_SELECTOR_SPKI,
-                            DANETLS_MATCHING_FULL,
-                            data, (size_t)ret) > 0;
+              DANETLS_SELECTOR_SPKI,
+              DANETLS_MATCHING_FULL,
+              data, (size_t)ret)
+        > 0;
     OPENSSL_free(data);
     return ret;
 }
@@ -8231,9 +8223,9 @@ static int validate_cert_type(const unsigned char *val, size_t len)
 }
 
 static int set_cert_type(unsigned char **cert_type,
-                         size_t *cert_type_len,
-                         const unsigned char *val,
-                         size_t len)
+    size_t *cert_type_len,
+    const unsigned char *val,
+    size_t len)
 {
     unsigned char *tmp = NULL;
 
@@ -8257,7 +8249,7 @@ int SSL_set1_client_cert_type(SSL *s, const unsigned char *val, size_t len)
         return 0;
 
     return set_cert_type(&sc->client_cert_type, &sc->client_cert_type_len,
-                         val, len);
+        val, len);
 }
 
 int SSL_set1_server_cert_type(SSL *s, const unsigned char *val, size_t len)
@@ -8268,19 +8260,19 @@ int SSL_set1_server_cert_type(SSL *s, const unsigned char *val, size_t len)
         return 0;
 
     return set_cert_type(&sc->server_cert_type, &sc->server_cert_type_len,
-                         val, len);
+        val, len);
 }
 
 int SSL_CTX_set1_client_cert_type(SSL_CTX *ctx, const unsigned char *val, size_t len)
 {
     return set_cert_type(&ctx->client_cert_type, &ctx->client_cert_type_len,
-                         val, len);
+        val, len);
 }
 
 int SSL_CTX_set1_server_cert_type(SSL_CTX *ctx, const unsigned char *val, size_t len)
 {
     return set_cert_type(&ctx->server_cert_type, &ctx->server_cert_type_len,
-                         val, len);
+        val, len);
 }
 
 int SSL_get0_client_cert_type(const SSL *s, unsigned char **t, size_t *len)
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index 81b94ad1c2aa1..8fc8b64406153 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -10,57 +10,57 @@
  */
 
 #ifndef OSSL_SSL_LOCAL_H
-# define OSSL_SSL_LOCAL_H
-
-# include <stdlib.h>
-# include <time.h>
-# include <errno.h>
-# include "internal/common.h" /* for HAS_PREFIX */
-
-# include <openssl/buffer.h>
-# include <openssl/bio.h>
-# include <openssl/comp.h>
-# include <openssl/dsa.h>
-# include <openssl/err.h>
-# include <openssl/ssl.h>
-# include <openssl/async.h>
-# include <openssl/symhacks.h>
-# include <openssl/ct.h>
-# include "internal/recordmethod.h"
-# include "internal/statem.h"
-# include "internal/packet.h"
-# include "internal/dane.h"
-# include "internal/refcount.h"
-# include "internal/tsan_assist.h"
-# include "internal/bio.h"
-# include "internal/ktls.h"
-# include "internal/time.h"
-# include "internal/ssl.h"
-# include "internal/cryptlib.h"
-# include "internal/quic_predef.h"
-# include "record/record.h"
-# include "internal/quic_predef.h"
-# include "internal/quic_tls.h"
-
-# ifdef OPENSSL_BUILD_SHLIBSSL
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-# define TLS_MAX_VERSION_INTERNAL TLS1_3_VERSION
-# define DTLS_MAX_VERSION_INTERNAL DTLS1_2_VERSION
+#define OSSL_SSL_LOCAL_H
+
+#include <stdlib.h>
+#include <time.h>
+#include <errno.h>
+#include "internal/common.h" /* for HAS_PREFIX */
+
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#include <openssl/comp.h>
+#include <openssl/dsa.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+#include <openssl/async.h>
+#include <openssl/symhacks.h>
+#include <openssl/ct.h>
+#include "internal/recordmethod.h"
+#include "internal/statem.h"
+#include "internal/packet.h"
+#include "internal/dane.h"
+#include "internal/refcount.h"
+#include "internal/tsan_assist.h"
+#include "internal/bio.h"
+#include "internal/ktls.h"
+#include "internal/time.h"
+#include "internal/ssl.h"
+#include "internal/cryptlib.h"
+#include "internal/quic_predef.h"
+#include "record/record.h"
+#include "internal/quic_predef.h"
+#include "internal/quic_tls.h"
+
+#ifdef OPENSSL_BUILD_SHLIBSSL
+#undef OPENSSL_EXTERN
+#define OPENSSL_EXTERN OPENSSL_EXPORT
+#endif
+
+#define TLS_MAX_VERSION_INTERNAL TLS1_3_VERSION
+#define DTLS_MAX_VERSION_INTERNAL DTLS1_2_VERSION
 
 /*
  * DTLS version numbers are strange because they're inverted. Except for
  * DTLS1_BAD_VER, which should be considered "lower" than the rest.
  */
-# define dtls_ver_ordinal(v1) (((v1) == DTLS1_BAD_VER) ? 0xff00 : (v1))
-# define DTLS_VERSION_GT(v1, v2) (dtls_ver_ordinal(v1) < dtls_ver_ordinal(v2))
-# define DTLS_VERSION_GE(v1, v2) (dtls_ver_ordinal(v1) <= dtls_ver_ordinal(v2))
-# define DTLS_VERSION_LT(v1, v2) (dtls_ver_ordinal(v1) > dtls_ver_ordinal(v2))
-# define DTLS_VERSION_LE(v1, v2) (dtls_ver_ordinal(v1) >= dtls_ver_ordinal(v2))
+#define dtls_ver_ordinal(v1) (((v1) == DTLS1_BAD_VER) ? 0xff00 : (v1))
+#define DTLS_VERSION_GT(v1, v2) (dtls_ver_ordinal(v1) < dtls_ver_ordinal(v2))
+#define DTLS_VERSION_GE(v1, v2) (dtls_ver_ordinal(v1) <= dtls_ver_ordinal(v2))
+#define DTLS_VERSION_LT(v1, v2) (dtls_ver_ordinal(v1) > dtls_ver_ordinal(v2))
+#define DTLS_VERSION_LE(v1, v2) (dtls_ver_ordinal(v1) >= dtls_ver_ordinal(v2))
 
-# define SSL_AD_NO_ALERT    -1
+#define SSL_AD_NO_ALERT -1
 
 /*
  * Define the Bitmasks for SSL_CIPHER.algorithms.
@@ -78,293 +78,280 @@
 
 /* Bits for algorithm_mkey (key exchange algorithm) */
 /* RSA key exchange */
-# define SSL_kRSA                0x00000001U
+#define SSL_kRSA 0x00000001U
 /* tmp DH key no DH cert */
-# define SSL_kDHE                0x00000002U
+#define SSL_kDHE 0x00000002U
 /* ephemeral ECDH */
-# define SSL_kECDHE              0x00000004U
+#define SSL_kECDHE 0x00000004U
 /* PSK */
-# define SSL_kPSK                0x00000008U
+#define SSL_kPSK 0x00000008U
 /* GOST key exchange */
-# define SSL_kGOST               0x00000010U
+#define SSL_kGOST 0x00000010U
 /* SRP */
-# define SSL_kSRP                0x00000020U
+#define SSL_kSRP 0x00000020U
 
-# define SSL_kRSAPSK             0x00000040U
-# define SSL_kECDHEPSK           0x00000080U
-# define SSL_kDHEPSK             0x00000100U
+#define SSL_kRSAPSK 0x00000040U
+#define SSL_kECDHEPSK 0x00000080U
+#define SSL_kDHEPSK 0x00000100U
 /* GOST KDF key exchange, draft-smyshlyaev-tls12-gost-suites */
-# define SSL_kGOST18             0x00000200U
+#define SSL_kGOST18 0x00000200U
 
 /* all PSK */
 
-# define SSL_PSK     (SSL_kPSK | SSL_kRSAPSK | SSL_kECDHEPSK | SSL_kDHEPSK)
+#define SSL_PSK (SSL_kPSK | SSL_kRSAPSK | SSL_kECDHEPSK | SSL_kDHEPSK)
 
 /* Any appropriate key exchange algorithm (for TLS 1.3 ciphersuites) */
-# define SSL_kANY                0x00000000U
+#define SSL_kANY 0x00000000U
 
 /* Bits for algorithm_auth (server authentication) */
 /* RSA auth */
-# define SSL_aRSA                0x00000001U
+#define SSL_aRSA 0x00000001U
 /* DSS auth */
-# define SSL_aDSS                0x00000002U
+#define SSL_aDSS 0x00000002U
 /* no auth (i.e. use ADH or AECDH) */
-# define SSL_aNULL               0x00000004U
+#define SSL_aNULL 0x00000004U
 /* ECDSA auth*/
-# define SSL_aECDSA              0x00000008U
+#define SSL_aECDSA 0x00000008U
 /* PSK auth */
-# define SSL_aPSK                0x00000010U
+#define SSL_aPSK 0x00000010U
 /* GOST R 34.10-2001 signature auth */
-# define SSL_aGOST01             0x00000020U
+#define SSL_aGOST01 0x00000020U
 /* SRP auth */
-# define SSL_aSRP                0x00000040U
+#define SSL_aSRP 0x00000040U
 /* GOST R 34.10-2012 signature auth */
-# define SSL_aGOST12             0x00000080U
+#define SSL_aGOST12 0x00000080U
 /* Any appropriate signature auth (for TLS 1.3 ciphersuites) */
-# define SSL_aANY                0x00000000U
+#define SSL_aANY 0x00000000U
 /* All bits requiring a certificate */
 #define SSL_aCERT \
     (SSL_aRSA | SSL_aDSS | SSL_aECDSA | SSL_aGOST01 | SSL_aGOST12)
 
 /* Bits for algorithm_enc (symmetric encryption) */
-# define SSL_DES                 0x00000001U
-# define SSL_3DES                0x00000002U
-# define SSL_RC4                 0x00000004U
-# define SSL_RC2                 0x00000008U
-# define SSL_IDEA                0x00000010U
-# define SSL_eNULL               0x00000020U
-# define SSL_AES128              0x00000040U
-# define SSL_AES256              0x00000080U
-# define SSL_CAMELLIA128         0x00000100U
-# define SSL_CAMELLIA256         0x00000200U
-# define SSL_eGOST2814789CNT     0x00000400U
-# define SSL_SEED                0x00000800U
-# define SSL_AES128GCM           0x00001000U
-# define SSL_AES256GCM           0x00002000U
-# define SSL_AES128CCM           0x00004000U
-# define SSL_AES256CCM           0x00008000U
-# define SSL_AES128CCM8          0x00010000U
-# define SSL_AES256CCM8          0x00020000U
-# define SSL_eGOST2814789CNT12   0x00040000U
-# define SSL_CHACHA20POLY1305    0x00080000U
-# define SSL_ARIA128GCM          0x00100000U
-# define SSL_ARIA256GCM          0x00200000U
-# define SSL_MAGMA               0x00400000U
-# define SSL_KUZNYECHIK          0x00800000U
-
-# define SSL_AESGCM              (SSL_AES128GCM | SSL_AES256GCM)
-# define SSL_AESCCM              (SSL_AES128CCM | SSL_AES256CCM | SSL_AES128CCM8 | SSL_AES256CCM8)
-# define SSL_AES                 (SSL_AES128|SSL_AES256|SSL_AESGCM|SSL_AESCCM)
-# define SSL_CAMELLIA            (SSL_CAMELLIA128|SSL_CAMELLIA256)
-# define SSL_CHACHA20            (SSL_CHACHA20POLY1305)
-# define SSL_ARIAGCM             (SSL_ARIA128GCM | SSL_ARIA256GCM)
-# define SSL_ARIA                (SSL_ARIAGCM)
-# define SSL_CBC                 (SSL_DES | SSL_3DES | SSL_RC2 | SSL_IDEA \
-                                  | SSL_AES128 | SSL_AES256 | SSL_CAMELLIA128 \
-                                  | SSL_CAMELLIA256 | SSL_SEED)
+#define SSL_DES 0x00000001U
+#define SSL_3DES 0x00000002U
+#define SSL_RC4 0x00000004U
+#define SSL_RC2 0x00000008U
+#define SSL_IDEA 0x00000010U
+#define SSL_eNULL 0x00000020U
+#define SSL_AES128 0x00000040U
+#define SSL_AES256 0x00000080U
+#define SSL_CAMELLIA128 0x00000100U
+#define SSL_CAMELLIA256 0x00000200U
+#define SSL_eGOST2814789CNT 0x00000400U
+#define SSL_SEED 0x00000800U
+#define SSL_AES128GCM 0x00001000U
+#define SSL_AES256GCM 0x00002000U
+#define SSL_AES128CCM 0x00004000U
+#define SSL_AES256CCM 0x00008000U
+#define SSL_AES128CCM8 0x00010000U
+#define SSL_AES256CCM8 0x00020000U
+#define SSL_eGOST2814789CNT12 0x00040000U
+#define SSL_CHACHA20POLY1305 0x00080000U
+#define SSL_ARIA128GCM 0x00100000U
+#define SSL_ARIA256GCM 0x00200000U
+#define SSL_MAGMA 0x00400000U
+#define SSL_KUZNYECHIK 0x00800000U
+
+#define SSL_AESGCM (SSL_AES128GCM | SSL_AES256GCM)
+#define SSL_AESCCM (SSL_AES128CCM | SSL_AES256CCM | SSL_AES128CCM8 | SSL_AES256CCM8)
+#define SSL_AES (SSL_AES128 | SSL_AES256 | SSL_AESGCM | SSL_AESCCM)
+#define SSL_CAMELLIA (SSL_CAMELLIA128 | SSL_CAMELLIA256)
+#define SSL_CHACHA20 (SSL_CHACHA20POLY1305)
+#define SSL_ARIAGCM (SSL_ARIA128GCM | SSL_ARIA256GCM)
+#define SSL_ARIA (SSL_ARIAGCM)
+#define SSL_CBC (SSL_DES | SSL_3DES | SSL_RC2 | SSL_IDEA \
+    | SSL_AES128 | SSL_AES256 | SSL_CAMELLIA128          \
+    | SSL_CAMELLIA256 | SSL_SEED)
 
 /* Bits for algorithm_mac (symmetric authentication) */
 
-# define SSL_MD5                 0x00000001U
-# define SSL_SHA1                0x00000002U
-# define SSL_GOST94      0x00000004U
-# define SSL_GOST89MAC   0x00000008U
-# define SSL_SHA256              0x00000010U
-# define SSL_SHA384              0x00000020U
+#define SSL_MD5 0x00000001U
+#define SSL_SHA1 0x00000002U
+#define SSL_GOST94 0x00000004U
+#define SSL_GOST89MAC 0x00000008U
+#define SSL_SHA256 0x00000010U
+#define SSL_SHA384 0x00000020U
 /* Not a real MAC, just an indication it is part of cipher */
-# define SSL_AEAD                0x00000040U
-# define SSL_GOST12_256          0x00000080U
-# define SSL_GOST89MAC12         0x00000100U
-# define SSL_GOST12_512          0x00000200U
-# define SSL_MAGMAOMAC           0x00000400U
-# define SSL_KUZNYECHIKOMAC      0x00000800U
+#define SSL_AEAD 0x00000040U
+#define SSL_GOST12_256 0x00000080U
+#define SSL_GOST89MAC12 0x00000100U
+#define SSL_GOST12_512 0x00000200U
+#define SSL_MAGMAOMAC 0x00000400U
+#define SSL_KUZNYECHIKOMAC 0x00000800U
 
 /*
  * When adding new digest in the ssl_ciph.c and increment SSL_MD_NUM_IDX make
  * sure to update this constant too
  */
 
-# define SSL_MD_MD5_IDX  0
-# define SSL_MD_SHA1_IDX 1
-# define SSL_MD_GOST94_IDX 2
-# define SSL_MD_GOST89MAC_IDX 3
-# define SSL_MD_SHA256_IDX 4
-# define SSL_MD_SHA384_IDX 5
-# define SSL_MD_GOST12_256_IDX  6
-# define SSL_MD_GOST89MAC12_IDX 7
-# define SSL_MD_GOST12_512_IDX  8
-# define SSL_MD_MD5_SHA1_IDX 9
-# define SSL_MD_SHA224_IDX 10
-# define SSL_MD_SHA512_IDX 11
-# define SSL_MD_MAGMAOMAC_IDX 12
-# define SSL_MD_KUZNYECHIKOMAC_IDX 13
-# define SSL_MAX_DIGEST 14
-
-#define SSL_MD_NUM_IDX  SSL_MAX_DIGEST
+#define SSL_MD_MD5_IDX 0
+#define SSL_MD_SHA1_IDX 1
+#define SSL_MD_GOST94_IDX 2
+#define SSL_MD_GOST89MAC_IDX 3
+#define SSL_MD_SHA256_IDX 4
+#define SSL_MD_SHA384_IDX 5
+#define SSL_MD_GOST12_256_IDX 6
+#define SSL_MD_GOST89MAC12_IDX 7
+#define SSL_MD_GOST12_512_IDX 8
+#define SSL_MD_MD5_SHA1_IDX 9
+#define SSL_MD_SHA224_IDX 10
+#define SSL_MD_SHA512_IDX 11
+#define SSL_MD_MAGMAOMAC_IDX 12
+#define SSL_MD_KUZNYECHIKOMAC_IDX 13
+#define SSL_MAX_DIGEST 14
+
+#define SSL_MD_NUM_IDX SSL_MAX_DIGEST
 
 /* Bits for algorithm2 (handshake digests and other extra flags) */
 
 /* Bits 0-7 are handshake MAC */
-# define SSL_HANDSHAKE_MAC_MASK  0xFF
-# define SSL_HANDSHAKE_MAC_MD5_SHA1 SSL_MD_MD5_SHA1_IDX
-# define SSL_HANDSHAKE_MAC_SHA256   SSL_MD_SHA256_IDX
-# define SSL_HANDSHAKE_MAC_SHA384   SSL_MD_SHA384_IDX
-# define SSL_HANDSHAKE_MAC_GOST94 SSL_MD_GOST94_IDX
-# define SSL_HANDSHAKE_MAC_GOST12_256 SSL_MD_GOST12_256_IDX
-# define SSL_HANDSHAKE_MAC_GOST12_512 SSL_MD_GOST12_512_IDX
-# define SSL_HANDSHAKE_MAC_DEFAULT  SSL_HANDSHAKE_MAC_MD5_SHA1
+#define SSL_HANDSHAKE_MAC_MASK 0xFF
+#define SSL_HANDSHAKE_MAC_MD5_SHA1 SSL_MD_MD5_SHA1_IDX
+#define SSL_HANDSHAKE_MAC_SHA256 SSL_MD_SHA256_IDX
+#define SSL_HANDSHAKE_MAC_SHA384 SSL_MD_SHA384_IDX
+#define SSL_HANDSHAKE_MAC_GOST94 SSL_MD_GOST94_IDX
+#define SSL_HANDSHAKE_MAC_GOST12_256 SSL_MD_GOST12_256_IDX
+#define SSL_HANDSHAKE_MAC_GOST12_512 SSL_MD_GOST12_512_IDX
+#define SSL_HANDSHAKE_MAC_DEFAULT SSL_HANDSHAKE_MAC_MD5_SHA1
 
 /* Bits 8-15 bits are PRF */
-# define TLS1_PRF_DGST_SHIFT 8
-# define TLS1_PRF_SHA1_MD5 (SSL_MD_MD5_SHA1_IDX << TLS1_PRF_DGST_SHIFT)
-# define TLS1_PRF_SHA256 (SSL_MD_SHA256_IDX << TLS1_PRF_DGST_SHIFT)
-# define TLS1_PRF_SHA384 (SSL_MD_SHA384_IDX << TLS1_PRF_DGST_SHIFT)
-# define TLS1_PRF_GOST94 (SSL_MD_GOST94_IDX << TLS1_PRF_DGST_SHIFT)
-# define TLS1_PRF_GOST12_256 (SSL_MD_GOST12_256_IDX << TLS1_PRF_DGST_SHIFT)
-# define TLS1_PRF_GOST12_512 (SSL_MD_GOST12_512_IDX << TLS1_PRF_DGST_SHIFT)
-# define TLS1_PRF            (SSL_MD_MD5_SHA1_IDX << TLS1_PRF_DGST_SHIFT)
+#define TLS1_PRF_DGST_SHIFT 8
+#define TLS1_PRF_SHA1_MD5 (SSL_MD_MD5_SHA1_IDX << TLS1_PRF_DGST_SHIFT)
+#define TLS1_PRF_SHA256 (SSL_MD_SHA256_IDX << TLS1_PRF_DGST_SHIFT)
+#define TLS1_PRF_SHA384 (SSL_MD_SHA384_IDX << TLS1_PRF_DGST_SHIFT)
+#define TLS1_PRF_GOST94 (SSL_MD_GOST94_IDX << TLS1_PRF_DGST_SHIFT)
+#define TLS1_PRF_GOST12_256 (SSL_MD_GOST12_256_IDX << TLS1_PRF_DGST_SHIFT)
+#define TLS1_PRF_GOST12_512 (SSL_MD_GOST12_512_IDX << TLS1_PRF_DGST_SHIFT)
+#define TLS1_PRF (SSL_MD_MD5_SHA1_IDX << TLS1_PRF_DGST_SHIFT)
 
 /*
  * Stream MAC for GOST ciphersuites from cryptopro draft (currently this also
  * goes into algorithm2)
  */
-# define TLS1_STREAM_MAC 0x10000
+#define TLS1_STREAM_MAC 0x10000
 /*
  * TLSTREE cipher/mac key derivation from draft-smyshlyaev-tls12-gost-suites
  * (currently this also  goes into algorithm2)
  */
-# define TLS1_TLSTREE 0x20000
+#define TLS1_TLSTREE 0x20000
 
 /* Ciphersuite supported in QUIC */
-# define SSL_QUIC                0x00040000U
+#define SSL_QUIC 0x00040000U
 
-# define SSL_STRONG_MASK         0x0000001FU
-# define SSL_DEFAULT_MASK        0X00000020U
+#define SSL_STRONG_MASK 0x0000001FU
+#define SSL_DEFAULT_MASK 0X00000020U
 
-# define SSL_STRONG_NONE         0x00000001U
-# define SSL_LOW                 0x00000002U
-# define SSL_MEDIUM              0x00000004U
-# define SSL_HIGH                0x00000008U
-# define SSL_FIPS                0x00000010U
-# define SSL_NOT_DEFAULT         0x00000020U
+#define SSL_STRONG_NONE 0x00000001U
+#define SSL_LOW 0x00000002U
+#define SSL_MEDIUM 0x00000004U
+#define SSL_HIGH 0x00000008U
+#define SSL_FIPS 0x00000010U
+#define SSL_NOT_DEFAULT 0x00000020U
 
 /* we have used 0000003f - 26 bits left to go */
 
 /* Flag used on OpenSSL ciphersuite ids to indicate they are for SSLv3+ */
-# define SSL3_CK_CIPHERSUITE_FLAG                0x03000000
+#define SSL3_CK_CIPHERSUITE_FLAG 0x03000000
 
 /* Check if an SSL structure is using DTLS */
-# define SSL_CONNECTION_IS_DTLS(s) \
+#define SSL_CONNECTION_IS_DTLS(s) \
     (SSL_CONNECTION_GET_SSL(s)->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_DTLS)
 
 /* Check if an SSL_CTX structure is using DTLS */
-# define SSL_CTX_IS_DTLS(ctx) \
+#define SSL_CTX_IS_DTLS(ctx) \
     (ctx->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_DTLS)
 
 /* Check if we are using TLSv1.3 */
-# define SSL_CONNECTION_IS_TLS13(s) (!SSL_CONNECTION_IS_DTLS(s) \
+#define SSL_CONNECTION_IS_TLS13(s) (!SSL_CONNECTION_IS_DTLS(s)      \
     && SSL_CONNECTION_GET_SSL(s)->method->version >= TLS1_3_VERSION \
     && SSL_CONNECTION_GET_SSL(s)->method->version != TLS_ANY_VERSION)
 
-# define SSL_CONNECTION_TREAT_AS_TLS13(s) \
-    (SSL_CONNECTION_IS_TLS13(s) \
-     || (s)->early_data_state == SSL_EARLY_DATA_CONNECTING \
-     || (s)->early_data_state == SSL_EARLY_DATA_CONNECT_RETRY \
-     || (s)->early_data_state == SSL_EARLY_DATA_WRITING \
-     || (s)->early_data_state == SSL_EARLY_DATA_WRITE_RETRY \
-     || (s)->hello_retry_request == SSL_HRR_PENDING)
+#define SSL_CONNECTION_TREAT_AS_TLS13(s)                         \
+    (SSL_CONNECTION_IS_TLS13(s)                                  \
+        || (s)->early_data_state == SSL_EARLY_DATA_CONNECTING    \
+        || (s)->early_data_state == SSL_EARLY_DATA_CONNECT_RETRY \
+        || (s)->early_data_state == SSL_EARLY_DATA_WRITING       \
+        || (s)->early_data_state == SSL_EARLY_DATA_WRITE_RETRY   \
+        || (s)->hello_retry_request == SSL_HRR_PENDING)
 
-# define SSL_IS_FIRST_HANDSHAKE(s) ((s)->s3.tmp.finish_md_len == 0 \
-                                    || (s)->s3.tmp.peer_finish_md_len == 0)
+#define SSL_IS_FIRST_HANDSHAKE(s) ((s)->s3.tmp.finish_md_len == 0 \
+    || (s)->s3.tmp.peer_finish_md_len == 0)
 
 /*
  * See if we use signature algorithms extension and signature algorithm
  * before signatures.
  */
-# define SSL_USE_SIGALGS(s)      \
+#define SSL_USE_SIGALGS(s) \
     (SSL_CONNECTION_GET_SSL(s)->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_SIGALGS)
 /*
  * Allow TLS 1.2 ciphersuites: applies to DTLS 1.2 as well as TLS 1.2: may
  * apply to others in future.
  */
-# define SSL_USE_TLS1_2_CIPHERS(s)       \
+#define SSL_USE_TLS1_2_CIPHERS(s) \
     (SSL_CONNECTION_GET_SSL(s)->method->ssl3_enc->enc_flags & SSL_ENC_FLAG_TLS1_2_CIPHERS)
-/*
- * Determine if a client can use TLS 1.2 ciphersuites: can't rely on method
- * flags because it may not be set to correct version yet.
- */
-# define SSL_CLIENT_USE_TLS1_2_CIPHERS(s)        \
-    ((!SSL_CONNECTION_IS_DTLS(s) && s->client_version >= TLS1_2_VERSION) || \
-     (SSL_CONNECTION_IS_DTLS(s) && DTLS_VERSION_GE(s->client_version, DTLS1_2_VERSION)))
-/*
- * Determine if a client should send signature algorithms extension:
- * as with TLS1.2 cipher we can't rely on method flags.
- */
-# define SSL_CLIENT_USE_SIGALGS(s)        \
-    SSL_CLIENT_USE_TLS1_2_CIPHERS(s)
 
-# define IS_MAX_FRAGMENT_LENGTH_EXT_VALID(value) \
-    (((value) >= TLSEXT_max_fragment_length_512) && \
-     ((value) <= TLSEXT_max_fragment_length_4096))
-# define USE_MAX_FRAGMENT_LENGTH_EXT(session) \
+#define IS_MAX_FRAGMENT_LENGTH_EXT_VALID(value) \
+    (((value) >= TLSEXT_max_fragment_length_512) && ((value) <= TLSEXT_max_fragment_length_4096))
+#define USE_MAX_FRAGMENT_LENGTH_EXT(session) \
     IS_MAX_FRAGMENT_LENGTH_EXT_VALID(session->ext.max_fragment_len_mode)
-# define GET_MAX_FRAGMENT_LENGTH(session) \
+#define GET_MAX_FRAGMENT_LENGTH(session) \
     (512U << (session->ext.max_fragment_len_mode - 1))
 
-# define SSL_READ_ETM(s) (s->s3.flags & TLS1_FLAGS_ENCRYPT_THEN_MAC_READ)
-# define SSL_WRITE_ETM(s) (s->s3.flags & TLS1_FLAGS_ENCRYPT_THEN_MAC_WRITE)
+#define SSL_READ_ETM(s) (s->s3.flags & TLS1_FLAGS_ENCRYPT_THEN_MAC_READ)
+#define SSL_WRITE_ETM(s) (s->s3.flags & TLS1_FLAGS_ENCRYPT_THEN_MAC_WRITE)
 
-# define SSL_IS_QUIC_HANDSHAKE(s) (((s)->s3.flags & TLS1_FLAGS_QUIC) != 0)
+#define SSL_IS_QUIC_HANDSHAKE(s) (((s)->s3.flags & TLS1_FLAGS_QUIC) != 0)
+#define SSL_IS_QUIC_INT_HANDSHAKE(s) (((s)->s3.flags & TLS1_FLAGS_QUIC_INTERNAL) != 0)
 
 /* no end of early data */
-# define SSL_NO_EOED(s) SSL_IS_QUIC_HANDSHAKE(s)
+#define SSL_NO_EOED(s) SSL_IS_QUIC_HANDSHAKE(s)
 
 /* alert_dispatch values */
 
 /* No alert pending */
-# define SSL_ALERT_DISPATCH_NONE    0
+#define SSL_ALERT_DISPATCH_NONE 0
 /* Alert pending */
-# define SSL_ALERT_DISPATCH_PENDING 1
+#define SSL_ALERT_DISPATCH_PENDING 1
 /* Pending alert write needs to be retried */
-# define SSL_ALERT_DISPATCH_RETRY   2
+#define SSL_ALERT_DISPATCH_RETRY 2
 
 /* Mostly for SSLv3 */
-# define SSL_PKEY_RSA            0
-# define SSL_PKEY_RSA_PSS_SIGN   1
-# define SSL_PKEY_DSA_SIGN       2
-# define SSL_PKEY_ECC            3
-# define SSL_PKEY_GOST01         4
-# define SSL_PKEY_GOST12_256     5
-# define SSL_PKEY_GOST12_512     6
-# define SSL_PKEY_ED25519        7
-# define SSL_PKEY_ED448          8
-# define SSL_PKEY_NUM            9
-
-# define SSL_ENC_DES_IDX         0
-# define SSL_ENC_3DES_IDX        1
-# define SSL_ENC_RC4_IDX         2
-# define SSL_ENC_RC2_IDX         3
-# define SSL_ENC_IDEA_IDX        4
-# define SSL_ENC_NULL_IDX        5
-# define SSL_ENC_AES128_IDX      6
-# define SSL_ENC_AES256_IDX      7
-# define SSL_ENC_CAMELLIA128_IDX 8
-# define SSL_ENC_CAMELLIA256_IDX 9
-# define SSL_ENC_GOST89_IDX      10
-# define SSL_ENC_SEED_IDX        11
-# define SSL_ENC_AES128GCM_IDX   12
-# define SSL_ENC_AES256GCM_IDX   13
-# define SSL_ENC_AES128CCM_IDX   14
-# define SSL_ENC_AES256CCM_IDX   15
-# define SSL_ENC_AES128CCM8_IDX  16
-# define SSL_ENC_AES256CCM8_IDX  17
-# define SSL_ENC_GOST8912_IDX    18
-# define SSL_ENC_CHACHA_IDX      19
-# define SSL_ENC_ARIA128GCM_IDX  20
-# define SSL_ENC_ARIA256GCM_IDX  21
-# define SSL_ENC_MAGMA_IDX       22
-# define SSL_ENC_KUZNYECHIK_IDX  23
-# define SSL_ENC_NUM_IDX         24
+#define SSL_PKEY_RSA 0
+#define SSL_PKEY_RSA_PSS_SIGN 1
+#define SSL_PKEY_DSA_SIGN 2
+#define SSL_PKEY_ECC 3
+#define SSL_PKEY_GOST01 4
+#define SSL_PKEY_GOST12_256 5
+#define SSL_PKEY_GOST12_512 6
+#define SSL_PKEY_ED25519 7
+#define SSL_PKEY_ED448 8
+#define SSL_PKEY_NUM 9
+
+#define SSL_ENC_DES_IDX 0
+#define SSL_ENC_3DES_IDX 1
+#define SSL_ENC_RC4_IDX 2
+#define SSL_ENC_RC2_IDX 3
+#define SSL_ENC_IDEA_IDX 4
+#define SSL_ENC_NULL_IDX 5
+#define SSL_ENC_AES128_IDX 6
+#define SSL_ENC_AES256_IDX 7
+#define SSL_ENC_CAMELLIA128_IDX 8
+#define SSL_ENC_CAMELLIA256_IDX 9
+#define SSL_ENC_GOST89_IDX 10
+#define SSL_ENC_SEED_IDX 11
+#define SSL_ENC_AES128GCM_IDX 12
+#define SSL_ENC_AES256GCM_IDX 13
+#define SSL_ENC_AES128CCM_IDX 14
+#define SSL_ENC_AES256CCM_IDX 15
+#define SSL_ENC_AES128CCM8_IDX 16
+#define SSL_ENC_AES256CCM8_IDX 17
+#define SSL_ENC_GOST8912_IDX 18
+#define SSL_ENC_CHACHA_IDX 19
+#define SSL_ENC_ARIA128GCM_IDX 20
+#define SSL_ENC_ARIA256GCM_IDX 21
+#define SSL_ENC_MAGMA_IDX 22
+#define SSL_ENC_KUZNYECHIK_IDX 23
+#define SSL_ENC_NUM_IDX 24
 
 /*-
  * SSL_kRSA <- RSA_ENC
@@ -375,43 +362,43 @@
  */
 
 /* Certificate Type State */
-# define OSSL_CERT_TYPE_CTOS_NONE    0
-# define OSSL_CERT_TYPE_CTOS_GOOD    1
-# define OSSL_CERT_TYPE_CTOS_ERROR   2
+#define OSSL_CERT_TYPE_CTOS_NONE 0
+#define OSSL_CERT_TYPE_CTOS_GOOD 1
+#define OSSL_CERT_TYPE_CTOS_ERROR 2
 
 /* Post-Handshake Authentication state */
 typedef enum {
     SSL_PHA_NONE = 0,
-    SSL_PHA_EXT_SENT,        /* client-side only: extension sent */
-    SSL_PHA_EXT_RECEIVED,    /* server-side only: extension received */
+    SSL_PHA_EXT_SENT, /* client-side only: extension sent */
+    SSL_PHA_EXT_RECEIVED, /* server-side only: extension received */
     SSL_PHA_REQUEST_PENDING, /* server-side only: request pending */
-    SSL_PHA_REQUESTED        /* request received by client, or sent by server */
+    SSL_PHA_REQUESTED /* request received by client, or sent by server */
 } SSL_PHA_STATE;
 
 /* CipherSuite length. SSLv3 and all TLS versions. */
-# define TLS_CIPHER_LEN 2
+#define TLS_CIPHER_LEN 2
 /* used to hold info on the particular ciphers used */
 struct ssl_cipher_st {
     uint32_t valid;
-    const char *name;           /* text name */
-    const char *stdname;        /* RFC name */
-    uint32_t id;                /* id, 4 bytes, first is version */
+    const char *name; /* text name */
+    const char *stdname; /* RFC name */
+    uint32_t id; /* id, 4 bytes, first is version */
     /*
      * changed in 1.0.0: these four used to be portions of a single value
      * 'algorithms'
      */
-    uint32_t algorithm_mkey;    /* key exchange algorithm */
-    uint32_t algorithm_auth;    /* server authentication */
-    uint32_t algorithm_enc;     /* symmetric encryption */
-    uint32_t algorithm_mac;     /* symmetric authentication */
-    int min_tls;                /* minimum SSL/TLS protocol version */
-    int max_tls;                /* maximum SSL/TLS protocol version */
-    int min_dtls;               /* minimum DTLS protocol version */
-    int max_dtls;               /* maximum DTLS protocol version */
-    uint32_t algo_strength;     /* strength and export flags */
-    uint32_t algorithm2;        /* Extra flags */
-    int32_t strength_bits;      /* Number of bits really used */
-    uint32_t alg_bits;          /* Number of bits for algorithm */
+    uint32_t algorithm_mkey; /* key exchange algorithm */
+    uint32_t algorithm_auth; /* server authentication */
+    uint32_t algorithm_enc; /* symmetric encryption */
+    uint32_t algorithm_mac; /* symmetric authentication */
+    int min_tls; /* minimum SSL/TLS protocol version */
+    int max_tls; /* maximum SSL/TLS protocol version */
+    int min_dtls; /* minimum DTLS protocol version */
+    int max_dtls; /* maximum DTLS protocol version */
+    uint32_t algo_strength; /* strength and export flags */
+    uint32_t algorithm2; /* Extra flags */
+    int32_t strength_bits; /* Number of bits really used */
+    uint32_t alg_bits; /* Number of bits for algorithm */
 };
 
 /* Used to hold SSL/TLS functions */
@@ -419,46 +406,46 @@ struct ssl_method_st {
     int version;
     unsigned flags;
     uint64_t mask;
-    SSL *(*ssl_new) (SSL_CTX *ctx);
-    void (*ssl_free) (SSL *s);
-    int (*ssl_reset) (SSL *s);
-    int (*ssl_init) (SSL *s);
-    int (*ssl_clear) (SSL *s);
-    void (*ssl_deinit) (SSL *s);
-    int (*ssl_accept) (SSL *s);
-    int (*ssl_connect) (SSL *s);
-    int (*ssl_read) (SSL *s, void *buf, size_t len, size_t *readbytes);
-    int (*ssl_peek) (SSL *s, void *buf, size_t len, size_t *readbytes);
-    int (*ssl_write) (SSL *s, const void *buf, size_t len, size_t *written);
-    int (*ssl_shutdown) (SSL *s);
-    int (*ssl_renegotiate) (SSL *s);
-    int (*ssl_renegotiate_check) (SSL *s, int);
-    int (*ssl_read_bytes) (SSL *s, uint8_t type, uint8_t *recvd_type,
-                           unsigned char *buf, size_t len, int peek,
-                           size_t *readbytes);
-    int (*ssl_write_bytes) (SSL *s, uint8_t type, const void *buf_, size_t len,
-                            size_t *written);
-    int (*ssl_dispatch_alert) (SSL *s);
-    long (*ssl_ctrl) (SSL *s, int cmd, long larg, void *parg);
-    long (*ssl_ctx_ctrl) (SSL_CTX *ctx, int cmd, long larg, void *parg);
-    const SSL_CIPHER *(*get_cipher_by_char) (const unsigned char *ptr);
-    int (*put_cipher_by_char) (const SSL_CIPHER *cipher, WPACKET *pkt,
-                               size_t *len);
-    size_t (*ssl_pending) (const SSL *s);
-    int (*num_ciphers) (void);
-    const SSL_CIPHER *(*get_cipher) (unsigned ncipher);
-    OSSL_TIME (*get_timeout) (void);
+    SSL *(*ssl_new)(SSL_CTX *ctx);
+    void (*ssl_free)(SSL *s);
+    int (*ssl_reset)(SSL *s);
+    int (*ssl_init)(SSL *s);
+    int (*ssl_clear)(SSL *s);
+    void (*ssl_deinit)(SSL *s);
+    int (*ssl_accept)(SSL *s);
+    int (*ssl_connect)(SSL *s);
+    int (*ssl_read)(SSL *s, void *buf, size_t len, size_t *readbytes);
+    int (*ssl_peek)(SSL *s, void *buf, size_t len, size_t *readbytes);
+    int (*ssl_write)(SSL *s, const void *buf, size_t len, size_t *written);
+    int (*ssl_shutdown)(SSL *s);
+    int (*ssl_renegotiate)(SSL *s);
+    int (*ssl_renegotiate_check)(SSL *s, int);
+    int (*ssl_read_bytes)(SSL *s, uint8_t type, uint8_t *recvd_type,
+        unsigned char *buf, size_t len, int peek,
+        size_t *readbytes);
+    int (*ssl_write_bytes)(SSL *s, uint8_t type, const void *buf_, size_t len,
+        size_t *written);
+    int (*ssl_dispatch_alert)(SSL *s);
+    long (*ssl_ctrl)(SSL *s, int cmd, long larg, void *parg);
+    long (*ssl_ctx_ctrl)(SSL_CTX *ctx, int cmd, long larg, void *parg);
+    const SSL_CIPHER *(*get_cipher_by_char)(const unsigned char *ptr);
+    int (*put_cipher_by_char)(const SSL_CIPHER *cipher, WPACKET *pkt,
+        size_t *len);
+    size_t (*ssl_pending)(const SSL *s);
+    int (*num_ciphers)(void);
+    const SSL_CIPHER *(*get_cipher)(unsigned ncipher);
+    OSSL_TIME (*get_timeout)(void);
     const struct ssl3_enc_method *ssl3_enc; /* Extra SSLv3/TLS stuff */
-    int (*ssl_version) (void);
-    long (*ssl_callback_ctrl) (SSL *s, int cb_id, void (*fp) (void));
-    long (*ssl_ctx_callback_ctrl) (SSL_CTX *s, int cb_id, void (*fp) (void));
+    int (*ssl_version)(void);
+    long (*ssl_callback_ctrl)(SSL *s, int cb_id, void (*fp)(void));
+    long (*ssl_ctx_callback_ctrl)(SSL_CTX *s, int cb_id, void (*fp)(void));
 };
 
 /*
  * Matches the length of PSK_MAX_PSK_LEN. We keep it the same value for
  * consistency, even in the event of OPENSSL_NO_PSK being defined.
  */
-# define TLS13_MAX_RESUMPTION_PSK_LENGTH      512
+#define TLS13_MAX_RESUMPTION_PSK_LENGTH 512
 
 /*-
  * Lets make this into an ASN.1 type structure as follows
@@ -487,8 +474,8 @@ struct ssl_method_st {
  * I'm using EXPLICIT tags so I can read the damn things using asn1parse :-).
  */
 struct ssl_session_st {
-    int ssl_version;            /* what ssl version session info is being kept
-                                 * in here? */
+    int ssl_version; /* what ssl version session info is being kept
+                      * in here? */
     size_t master_key_length;
 
     /* TLSv1.3 early_secret used for external PSKs */
@@ -508,10 +495,10 @@ struct ssl_session_st {
      */
     size_t sid_ctx_length;
     unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-# ifndef OPENSSL_NO_PSK
+#ifndef OPENSSL_NO_PSK
     char *psk_identity_hint;
     char *psk_identity;
-# endif
+#endif
     /*
      * Used to indicate that session resumption is not allowed. Applications
      * can also set this bit for a new session via not_resumable_session_cb
@@ -528,22 +515,22 @@ struct ssl_session_st {
      * when app_verify_callback accepts a session where the peer's
      * certificate is not ok, we must remember the error for session reuse:
      */
-    long verify_result;         /* only for servers */
+    long verify_result; /* only for servers */
     OSSL_TIME timeout;
     OSSL_TIME time;
     OSSL_TIME calc_timeout;
     unsigned int compress_meth; /* Need to lookup the method */
     const SSL_CIPHER *cipher;
-    unsigned long cipher_id;    /* when ASN.1 loaded, this needs to be used to
-                                 * load the 'cipher' structure */
-    unsigned int kex_group;      /* TLS group from key exchange */
-    CRYPTO_EX_DATA ex_data;     /* application specific data */
+    unsigned long cipher_id; /* when ASN.1 loaded, this needs to be used to
+                              * load the 'cipher' structure */
+    unsigned int kex_group; /* TLS group from key exchange */
+    CRYPTO_EX_DATA ex_data; /* application specific data */
 
     struct {
         char *hostname;
         /* RFC4507 info */
         unsigned char *tick; /* Session ticket */
-        size_t ticklen;      /* Session ticket length */
+        size_t ticklen; /* Session ticket length */
         /* Session lifetime hint in seconds */
         unsigned long tick_lifetime_hint;
         uint32_t tick_age_add;
@@ -560,9 +547,9 @@ struct ssl_session_st {
          */
         uint8_t max_fragment_len_mode;
     } ext;
-# ifndef OPENSSL_NO_SRP
+#ifndef OPENSSL_NO_SRP
     char *srp_username;
-# endif
+#endif
     unsigned char *ticket_appdata;
     size_t ticket_appdata_len;
     uint32_t flags;
@@ -577,19 +564,19 @@ struct ssl_session_st {
 };
 
 /* Extended master secret support */
-# define SSL_SESS_FLAG_EXTMS             0x1
+#define SSL_SESS_FLAG_EXTMS 0x1
 
-# ifndef OPENSSL_NO_SRP
+#ifndef OPENSSL_NO_SRP
 
 typedef struct srp_ctx_st {
     /* param for all the callbacks */
     void *SRP_cb_arg;
     /* set client Hello login callback */
-    int (*TLS_ext_srp_username_callback) (SSL *, int *, void *);
+    int (*TLS_ext_srp_username_callback)(SSL *, int *, void *);
     /* set SRP N/g param callback for verification */
-    int (*SRP_verify_param_callback) (SSL *, void *);
+    int (*SRP_verify_param_callback)(SSL *, void *);
     /* set SRP client passwd callback */
-    char *(*SRP_give_srp_client_pwd_callback) (SSL *, void *);
+    char *(*SRP_give_srp_client_pwd_callback)(SSL *, void *);
     char *login;
     BIGNUM *N, *g, *s, *B, *A;
     BIGNUM *a, *b, *v;
@@ -598,7 +585,7 @@ typedef struct srp_ctx_st {
     unsigned long srp_Mask;
 } SRP_CTX;
 
-# endif
+#endif
 
 typedef enum {
     SSL_EARLY_DATA_NONE = 0,
@@ -626,7 +613,7 @@ typedef enum {
  * The longest tag length we know of is EVP_GCM_TLS_TAG_LEN. We don't count the
  * content of the alert record either which is 2 bytes.
  */
-# define EARLY_DATA_CIPHERTEXT_OVERHEAD ((6 * (EVP_GCM_TLS_TAG_LEN + 1)) + 2)
+#define EARLY_DATA_CIPHERTEXT_OVERHEAD ((6 * (EVP_GCM_TLS_TAG_LEN + 1)) + 2)
 
 /*
  * The allowance we have between the client's calculated ticket age and our own.
@@ -634,10 +621,9 @@ typedef enum {
  * client's age calculation is different by more than this than our own then we
  * do not allow that ticket for early_data.
  */
-# define TICKET_AGE_ALLOWANCE   ossl_seconds2time(10)
-
-#define MAX_COMPRESSIONS_SIZE   255
+#define TICKET_AGE_ALLOWANCE ossl_seconds2time(10)
 
+#define MAX_COMPRESSIONS_SIZE 255
 
 typedef struct raw_extension_st {
     /* Raw packet data for the extension */
@@ -710,8 +696,8 @@ DEFINE_LHASH_OF_EX(SSL_SESSION);
 /* Needed in ssl_cert.c */
 DEFINE_LHASH_OF_EX(X509_NAME);
 
-# define TLSEXT_KEYNAME_LENGTH  16
-# define TLSEXT_TICK_KEY_LENGTH 32
+#define TLSEXT_KEYNAME_LENGTH 16
+#define TLSEXT_TICK_KEY_LENGTH 32
 
 typedef struct ssl_ctx_ext_secure_st {
     unsigned char tick_hmac_key[TLSEXT_TICK_KEY_LENGTH];
@@ -727,57 +713,57 @@ typedef struct ssl_ctx_ext_secure_st {
  */
 typedef struct ssl_hmac_st {
     EVP_MAC_CTX *ctx;
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     HMAC_CTX *old_ctx;
-# endif
+#endif
 } SSL_HMAC;
 
 SSL_HMAC *ssl_hmac_new(const SSL_CTX *ctx);
 void ssl_hmac_free(SSL_HMAC *ctx);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 HMAC_CTX *ssl_hmac_get0_HMAC_CTX(SSL_HMAC *ctx);
-# endif
+#endif
 EVP_MAC_CTX *ssl_hmac_get0_EVP_MAC_CTX(SSL_HMAC *ctx);
 int ssl_hmac_init(SSL_HMAC *ctx, void *key, size_t len, char *md);
 int ssl_hmac_update(SSL_HMAC *ctx, const unsigned char *data, size_t len);
 int ssl_hmac_final(SSL_HMAC *ctx, unsigned char *md, size_t *len,
-                   size_t max_size);
+    size_t max_size);
 size_t ssl_hmac_size(const SSL_HMAC *ctx);
 
 int ssl_get_EC_curve_nid(const EVP_PKEY *pkey);
 __owur int tls13_set_encoded_pub_key(EVP_PKEY *pkey,
-                                     const unsigned char *enckey,
-                                     size_t enckeylen);
+    const unsigned char *enckey,
+    size_t enckeylen);
 
 typedef struct tls_group_info_st {
-    char *tlsname;           /* Curve Name as in TLS specs */
-    char *realname;          /* Curve Name according to provider */
-    char *algorithm;         /* Algorithm name to fetch */
-    unsigned int secbits;    /* Bits of security (from SP800-57) */
-    uint16_t group_id;       /* Group ID */
-    int mintls;              /* Minimum TLS version, -1 unsupported */
-    int maxtls;              /* Maximum TLS version (or 0 for undefined) */
-    int mindtls;             /* Minimum DTLS version, -1 unsupported */
-    int maxdtls;             /* Maximum DTLS version (or 0 for undefined) */
-    char is_kem;             /* Mode for this Group: 0 is KEX, 1 is KEM */
+    char *tlsname; /* Curve Name as in TLS specs */
+    char *realname; /* Curve Name according to provider */
+    char *algorithm; /* Algorithm name to fetch */
+    unsigned int secbits; /* Bits of security (from SP800-57) */
+    uint16_t group_id; /* Group ID */
+    int mintls; /* Minimum TLS version, -1 unsupported */
+    int maxtls; /* Maximum TLS version (or 0 for undefined) */
+    int mindtls; /* Minimum DTLS version, -1 unsupported */
+    int maxdtls; /* Maximum DTLS version (or 0 for undefined) */
+    char is_kem; /* Mode for this Group: 0 is KEX, 1 is KEM */
 } TLS_GROUP_INFO;
 
 typedef struct tls_sigalg_info_st {
-    char *name;              /* name as in IANA TLS specs */
-    uint16_t code_point;     /* IANA-specified code point of sigalg-name */
-    char *sigalg_name;       /* (combined) sigalg name */
-    char *sigalg_oid;        /* (combined) sigalg OID */
-    char *sig_name;          /* pure signature algorithm name */
-    char *sig_oid;           /* pure signature algorithm OID */
-    char *hash_name;         /* hash algorithm name */
-    char *hash_oid;          /* hash algorithm OID */
-    char *keytype;           /* keytype name */
-    char *keytype_oid;       /* keytype OID */
-    unsigned int secbits;    /* Bits of security (from SP800-57) */
-    int mintls;              /* Minimum TLS version, -1 unsupported */
-    int maxtls;              /* Maximum TLS version (or 0 for undefined) */
-    int mindtls;             /* Minimum DTLS version, -1 unsupported */
-    int maxdtls;             /* Maximum DTLS version (or 0 for undefined) */
+    char *name; /* name as in IANA TLS specs */
+    uint16_t code_point; /* IANA-specified code point of sigalg-name */
+    char *sigalg_name; /* (combined) sigalg name */
+    char *sigalg_oid; /* (combined) sigalg OID */
+    char *sig_name; /* pure signature algorithm name */
+    char *sig_oid; /* pure signature algorithm OID */
+    char *hash_name; /* hash algorithm name */
+    char *hash_oid; /* hash algorithm OID */
+    char *keytype; /* keytype name */
+    char *keytype_oid; /* keytype OID */
+    unsigned int secbits; /* Bits of security (from SP800-57) */
+    int mintls; /* Minimum TLS version, -1 unsupported */
+    int maxtls; /* Maximum TLS version (or 0 for undefined) */
+    int mindtls; /* Minimum DTLS version, -1 unsupported */
+    int maxdtls; /* Maximum DTLS version (or 0 for undefined) */
 } TLS_SIGALG_INFO;
 
 /*
@@ -785,24 +771,24 @@ typedef struct tls_sigalg_info_st {
  * CERT_PKEY entries
  */
 typedef struct {
-    int nid; /* NID of public key algorithm */
+    int pkey_nid; /* NID of public key algorithm */
     uint32_t amask; /* authmask corresponding to key type */
 } SSL_CERT_LOOKUP;
 
 /* flags values */
-# define TLS_GROUP_TYPE             0x0000000FU /* Mask for group type */
-# define TLS_GROUP_CURVE_PRIME      0x00000001U
-# define TLS_GROUP_CURVE_CHAR2      0x00000002U
-# define TLS_GROUP_CURVE_CUSTOM     0x00000004U
-# define TLS_GROUP_FFDHE            0x00000008U
-# define TLS_GROUP_ONLY_FOR_TLS1_3  0x00000010U
+#define TLS_GROUP_TYPE 0x0000000FU /* Mask for group type */
+#define TLS_GROUP_CURVE_PRIME 0x00000001U
+#define TLS_GROUP_CURVE_CHAR2 0x00000002U
+#define TLS_GROUP_CURVE_CUSTOM 0x00000004U
+#define TLS_GROUP_FFDHE 0x00000008U
+#define TLS_GROUP_ONLY_FOR_TLS1_3 0x00000010U
 
-# define TLS_GROUP_FFDHE_FOR_TLS1_3 (TLS_GROUP_FFDHE|TLS_GROUP_ONLY_FOR_TLS1_3)
+#define TLS_GROUP_FFDHE_FOR_TLS1_3 (TLS_GROUP_FFDHE | TLS_GROUP_ONLY_FOR_TLS1_3)
 
 /* We limit the number of key shares sent */
-# ifndef OPENSSL_CLIENT_MAX_KEY_SHARES
-#  define OPENSSL_CLIENT_MAX_KEY_SHARES 4
-# endif
+#ifndef OPENSSL_CLIENT_MAX_KEY_SHARES
+#define OPENSSL_CLIENT_MAX_KEY_SHARES 4
+#endif
 
 struct ssl_ctx_st {
     OSSL_LIB_CTX *libctx;
@@ -843,29 +829,29 @@ struct ssl_ctx_st {
      * removed from the cache.  After the call, OpenSSL will
      * SSL_SESSION_free() it.
      */
-    int (*new_session_cb) (struct ssl_st *ssl, SSL_SESSION *sess);
-    void (*remove_session_cb) (struct ssl_ctx_st *ctx, SSL_SESSION *sess);
-    SSL_SESSION *(*get_session_cb) (struct ssl_st *ssl,
-                                    const unsigned char *data, int len,
-                                    int *copy);
+    int (*new_session_cb)(struct ssl_st *ssl, SSL_SESSION *sess);
+    void (*remove_session_cb)(struct ssl_ctx_st *ctx, SSL_SESSION *sess);
+    SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl,
+        const unsigned char *data, int len,
+        int *copy);
     struct {
-        TSAN_QUALIFIER int sess_connect;       /* SSL new conn - started */
+        TSAN_QUALIFIER int sess_connect; /* SSL new conn - started */
         TSAN_QUALIFIER int sess_connect_renegotiate; /* SSL reneg - requested */
-        TSAN_QUALIFIER int sess_connect_good;  /* SSL new conne/reneg - finished */
-        TSAN_QUALIFIER int sess_accept;        /* SSL new accept - started */
+        TSAN_QUALIFIER int sess_connect_good; /* SSL new conne/reneg - finished */
+        TSAN_QUALIFIER int sess_accept; /* SSL new accept - started */
         TSAN_QUALIFIER int sess_accept_renegotiate; /* SSL reneg - requested */
-        TSAN_QUALIFIER int sess_accept_good;   /* SSL accept/reneg - finished */
-        TSAN_QUALIFIER int sess_miss;          /* session lookup misses */
-        TSAN_QUALIFIER int sess_timeout;       /* reuse attempt on timeouted session */
-        TSAN_QUALIFIER int sess_cache_full;    /* session removed due to full cache */
-        TSAN_QUALIFIER int sess_hit;           /* session reuse actually done */
-        TSAN_QUALIFIER int sess_cb_hit;        /* session-id that was not in
-                                                * the cache was passed back via
-                                                * the callback. This indicates
-                                                * that the application is
-                                                * supplying session-id's from
-                                                * other processes - spooky
-                                                * :-) */
+        TSAN_QUALIFIER int sess_accept_good; /* SSL accept/reneg - finished */
+        TSAN_QUALIFIER int sess_miss; /* session lookup misses */
+        TSAN_QUALIFIER int sess_timeout; /* reuse attempt on timeouted session */
+        TSAN_QUALIFIER int sess_cache_full; /* session removed due to full cache */
+        TSAN_QUALIFIER int sess_hit; /* session reuse actually done */
+        TSAN_QUALIFIER int sess_cb_hit; /* session-id that was not in
+                                         * the cache was passed back via
+                                         * the callback. This indicates
+                                         * that the application is
+                                         * supplying session-id's from
+                                         * other processes - spooky
+                                         * :-) */
     } stats;
 #ifdef TSAN_REQUIRES_LOCKING
     CRYPTO_RWLOCK *tsan_lock;
@@ -874,7 +860,7 @@ struct ssl_ctx_st {
     CRYPTO_REF_COUNT references;
 
     /* if defined, these override the X509_verify_cert() calls */
-    int (*app_verify_callback) (X509_STORE_CTX *, void *);
+    int (*app_verify_callback)(X509_STORE_CTX *, void *);
     void *app_verify_arg;
     /*
      * before OpenSSL 0.9.7, 'app_verify_arg' was ignored
@@ -888,28 +874,28 @@ struct ssl_ctx_st {
     void *default_passwd_callback_userdata;
 
     /* get client cert callback */
-    int (*client_cert_cb) (SSL *ssl, X509 **x509, EVP_PKEY **pkey);
+    int (*client_cert_cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey);
 
     /* cookie generate callback */
-    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);
 
     /* verify cookie callback */
-    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);
 
     /* TLS1.3 app-controlled cookie generate callback */
-    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);
 
     /* TLS1.3 verify app-controlled cookie callback */
-    int (*verify_stateless_cookie_cb) (SSL *ssl, const unsigned char *cookie,
-                                       size_t cookie_len);
+    int (*verify_stateless_cookie_cb)(SSL *ssl, const unsigned char *cookie,
+        size_t cookie_len);
 
     CRYPTO_EX_DATA ex_data;
 
-    const EVP_MD *md5;          /* For SSLv3/TLSv1 'ssl3-md5' */
-    const EVP_MD *sha1;         /* For SSLv3/TLSv1 'ssl3-sha1' */
+    const EVP_MD *md5; /* For SSLv3/TLSv1 'ssl3-md5' */
+    const EVP_MD *sha1; /* For SSLv3/TLSv1 'ssl3-sha1' */
 
     STACK_OF(X509) *extra_certs;
     STACK_OF(SSL_COMP) *comp_methods; /* stack of SSL_COMP, SSLv3/TLSv1 */
@@ -917,7 +903,7 @@ struct ssl_ctx_st {
     /* Default values used when no per-SSL value is defined follow */
 
     /* used if SSL's info_callback is NULL */
-    void (*info_callback) (const SSL *ssl, int type, int val);
+    void (*info_callback)(const SSL *ssl, int type, int val);
 
     /*
      * What we put in certificate_authorities extension for TLS 1.3
@@ -951,7 +937,7 @@ struct ssl_ctx_st {
     size_t sid_ctx_length;
     unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
     /* called 'verify_callback' in the SSL */
-    int (*default_verify_callback) (int ok, X509_STORE_CTX *ctx);
+    int (*default_verify_callback)(int ok, X509_STORE_CTX *ctx);
 
     /* Default generate session ID callback. */
     GEN_SESSION_CB generate_session_id;
@@ -960,15 +946,15 @@ struct ssl_ctx_st {
 
     int quiet_shutdown;
 
-# ifndef OPENSSL_NO_CT
-    CTLOG_STORE *ctlog_store;   /* CT Log Store */
+#ifndef OPENSSL_NO_CT
+    CTLOG_STORE *ctlog_store; /* CT Log Store */
     /*
      * Validates that the SCTs (Signed Certificate Timestamps) are sufficient.
      * If they are not, the connection should be aborted.
      */
     ssl_ct_validation_cb ct_validation_callback;
     void *ct_validation_callback_arg;
-# endif
+#endif
 
     /*
      * If we're using more than one pipeline how should we divide the data
@@ -987,12 +973,12 @@ struct ssl_ctx_st {
     /* The default read buffer length to use (0 means not set) */
     size_t default_read_buf_len;
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
     /*
      * Engine to pass requests for client certs to
      */
     ENGINE *client_cert_engine;
-# endif
+#endif
 
     /* ClientHello callback.  Mostly for extensions, but not entirely. */
     SSL_client_hello_cb_fn client_hello_cb;
@@ -1005,25 +991,25 @@ struct ssl_ctx_st {
     /* TLS extensions. */
     struct {
         /* TLS extensions servername callback */
-        int (*servername_cb) (SSL *, int *, void *);
+        int (*servername_cb)(SSL *, int *, void *);
         void *servername_arg;
         /* RFC 4507 session ticket keys */
         unsigned char tick_key_name[TLSEXT_KEYNAME_LENGTH];
         SSL_CTX_EXT_SECURE *secure;
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
         /* Callback to support customisation of ticket key setting */
-        int (*ticket_key_cb) (SSL *ssl,
-                              unsigned char *name, unsigned char *iv,
-                              EVP_CIPHER_CTX *ectx, HMAC_CTX *hctx, int enc);
+        int (*ticket_key_cb)(SSL *ssl,
+            unsigned char *name, unsigned char *iv,
+            EVP_CIPHER_CTX *ectx, HMAC_CTX *hctx, int enc);
 #endif
-        int (*ticket_key_evp_cb) (SSL *ssl,
-                                  unsigned char *name, unsigned char *iv,
-                                  EVP_CIPHER_CTX *ectx, EVP_MAC_CTX *hctx,
-                                  int enc);
+        int (*ticket_key_evp_cb)(SSL *ssl,
+            unsigned char *name, unsigned char *iv,
+            EVP_CIPHER_CTX *ectx, EVP_MAC_CTX *hctx,
+            int enc);
 
         /* certificate status request info */
         /* Callback for status request */
-        int (*status_cb) (SSL *ssl, void *arg);
+        int (*status_cb)(SSL *ssl, void *arg);
         void *status_arg;
         /* ext status type used for CSR extension (OCSP Stapling) */
         int status_type;
@@ -1058,11 +1044,11 @@ struct ssl_ctx_st {
          *       wire-format.
          *   inlen: the length of |in|.
          */
-        int (*alpn_select_cb) (SSL *s,
-                               const unsigned char **out,
-                               unsigned char *outlen,
-                               const unsigned char *in,
-                               unsigned int inlen, void *arg);
+        int (*alpn_select_cb)(SSL *s,
+            const unsigned char **out,
+            unsigned char *outlen,
+            const unsigned char *in,
+            unsigned int inlen, void *arg);
         void *alpn_select_cb_arg;
 
         /*
@@ -1072,7 +1058,7 @@ struct ssl_ctx_st {
         unsigned char *alpn;
         size_t alpn_len;
 
-# ifndef OPENSSL_NO_NEXTPROTONEG
+#ifndef OPENSSL_NO_NEXTPROTONEG
         /* Next protocol negotiation information */
 
         /*
@@ -1087,34 +1073,34 @@ struct ssl_ctx_st {
          */
         SSL_CTX_npn_select_cb_func npn_select_cb;
         void *npn_select_cb_arg;
-# endif
+#endif
 
         unsigned char cookie_hmac_key[SHA256_DIGEST_LENGTH];
     } ext;
 
-# ifndef OPENSSL_NO_PSK
+#ifndef OPENSSL_NO_PSK
     SSL_psk_client_cb_func psk_client_callback;
     SSL_psk_server_cb_func psk_server_callback;
-# endif
+#endif
     SSL_psk_find_session_cb_func psk_find_session_cb;
     SSL_psk_use_session_cb_func psk_use_session_cb;
 
-# ifndef OPENSSL_NO_SRP
-    SRP_CTX srp_ctx;            /* ctx for SRP authentication */
-# endif
+#ifndef OPENSSL_NO_SRP
+    SRP_CTX srp_ctx; /* ctx for SRP authentication */
+#endif
 
     /* Shared DANE context */
     struct dane_ctx_st dane;
 
-# ifndef OPENSSL_NO_SRTP
+#ifndef OPENSSL_NO_SRTP
     /* SRTP profiles we are willing to do from RFC 5764 */
     STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles;
-# endif
+#endif
     /*
      * Callback for disabling session caching and ticket support on a session
      * basis, depending on the chosen cipher.
      */
-    int (*not_resumable_session_cb) (SSL *ssl, int is_forward_secure);
+    int (*not_resumable_session_cb)(SSL *ssl, int is_forward_secure);
 
     CRYPTO_RWLOCK *lock;
 
@@ -1127,9 +1113,9 @@ struct ssl_ctx_st {
     /*
      * Private flag for internal key logging based on SSLKEYLOG env
      */
-# ifndef OPENSSL_NO_SSLKEYLOG
+#ifndef OPENSSL_NO_SSLKEYLOG
     uint32_t do_sslkeylog;
-# endif
+#endif
 
     /*
      * The maximum number of bytes advertised in session tickets that can be
@@ -1207,40 +1193,40 @@ struct ssl_ctx_st {
     unsigned char *server_cert_type;
     size_t server_cert_type_len;
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
     uint64_t domain_flags;
     SSL_TOKEN_STORE *tokencache;
-# endif
+#endif
 
-# ifndef OPENSSL_NO_QLOG
+#ifndef OPENSSL_NO_QLOG
     char *qlog_title; /* Session title for qlog */
-# endif
+#endif
 };
 
 typedef struct ossl_quic_tls_callbacks_st {
     int (*crypto_send_cb)(SSL *s, const unsigned char *buf, size_t buf_len,
-                          size_t *consumed, void *arg);
+        size_t *consumed, void *arg);
     int (*crypto_recv_rcd_cb)(SSL *s, const unsigned char **buf,
-                              size_t *bytes_read, void *arg);
+        size_t *bytes_read, void *arg);
     int (*crypto_release_rcd_cb)(SSL *s, size_t bytes_read, void *arg);
     int (*yield_secret_cb)(SSL *s, uint32_t prot_level, int direction,
-                           const unsigned char *secret, size_t secret_len,
-                           void *arg);
+        const unsigned char *secret, size_t secret_len,
+        void *arg);
     int (*got_transport_params_cb)(SSL *s, const unsigned char *params,
-                                   size_t params_len,
-                                   void *arg);
+        size_t params_len,
+        void *arg);
     int (*alert_cb)(SSL *s, unsigned char alert_code, void *arg);
 } OSSL_QUIC_TLS_CALLBACKS;
 
 typedef struct cert_pkey_st CERT_PKEY;
 
-#define SSL_TYPE_SSL_CONNECTION     0
-#define SSL_TYPE_QUIC_CONNECTION    0x80
-#define SSL_TYPE_QUIC_XSO           0x81
-#define SSL_TYPE_QUIC_LISTENER      0x82
-#define SSL_TYPE_QUIC_DOMAIN        0x83
+#define SSL_TYPE_SSL_CONNECTION 0
+#define SSL_TYPE_QUIC_CONNECTION 0x80
+#define SSL_TYPE_QUIC_XSO 0x81
+#define SSL_TYPE_QUIC_LISTENER 0x82
+#define SSL_TYPE_QUIC_DOMAIN 0x83
 
-#define SSL_TYPE_IS_QUIC(x)         (((x) & 0x80) != 0)
+#define SSL_TYPE_IS_QUIC(x) (((x) & 0x80) != 0)
 
 struct ssl_st {
     int type;
@@ -1284,7 +1270,7 @@ struct ssl_connection_st {
      * request needs re-doing when in SSL_accept or SSL_connect
      */
     int rwstate;
-    int (*handshake_func) (SSL *);
+    int (*handshake_func)(SSL *);
     /*
      * Imagine that here's a boolean member "init" that is switched as soon
      * as SSL_set_{accept/connect}_state is called for the first time, so
@@ -1311,11 +1297,11 @@ struct ssl_connection_st {
     /* where we are */
     OSSL_STATEM statem;
     SSL_EARLY_DATA_STATE early_data_state;
-    BUF_MEM *init_buf;          /* buffer used during init */
-    void *init_msg;             /* pointer to handshake message body, set by
-                                 * tls_get_message_header() */
-    size_t init_num;               /* amount read/written */
-    size_t init_off;               /* amount read/written */
+    BUF_MEM *init_buf; /* buffer used during init */
+    void *init_msg; /* pointer to handshake message body, set by
+                     * tls_get_message_header() */
+    size_t init_num; /* amount read/written */
+    size_t init_off; /* amount read/written */
 
     size_t ssl_pkey_num;
 
@@ -1369,7 +1355,7 @@ struct ssl_connection_st {
             int message_type;
             /* used to hold the new cipher we are going to use */
             const SSL_CIPHER *new_cipher;
-            EVP_PKEY *pkey;         /* holds short lived key exchange key */
+            EVP_PKEY *pkey; /* holds short lived key exchange key */
             /* holds the array of short lived key exchange key (pointers) */
             EVP_PKEY *ks_pkey[OPENSSL_CLIENT_MAX_KEY_SHARES];
             uint16_t ks_group_id[OPENSSL_CLIENT_MAX_KEY_SHARES]; /* The IDs of the keyshare keys */
@@ -1387,11 +1373,11 @@ struct ssl_connection_st {
             const EVP_MD *new_hash;
             int new_mac_pkey_type;
             size_t new_mac_secret_size;
-# ifndef OPENSSL_NO_COMP
+#ifndef OPENSSL_NO_COMP
             const SSL_COMP *new_compression;
-# else
+#else
             char *new_compression;
-# endif
+#endif
             int cert_request;
             /* Raw values of the cipher list from a client */
             unsigned char *ciphers_raw;
@@ -1399,11 +1385,11 @@ struct ssl_connection_st {
             /* Temporary storage for premaster secret */
             unsigned char *pms;
             size_t pmslen;
-# ifndef OPENSSL_NO_PSK
+#ifndef OPENSSL_NO_PSK
             /* Temporary storage for PSK key */
             unsigned char *psk;
             size_t psklen;
-# endif
+#endif
             /* Signature algorithm we actually use */
             const struct sigalg_lookup_st *sigalg;
             /* Pointer to certificate we use */
@@ -1450,12 +1436,12 @@ struct ssl_connection_st {
         size_t previous_server_finished_len;
         int send_connection_binding;
 
-# ifndef OPENSSL_NO_NEXTPROTONEG
+#ifndef OPENSSL_NO_NEXTPROTONEG
         /*
          * Set if we saw the Next Protocol Negotiation extension from our peer.
          */
         int npn_seen;
-# endif
+#endif
 
         /*
          * ALPN information (we are in the process of transitioning from NPN to
@@ -1496,12 +1482,12 @@ struct ssl_connection_st {
         uint16_t group_id_candidate;
     } s3;
 
-    struct dtls1_state_st *d1;  /* DTLSv1 variables */
+    struct dtls1_state_st *d1; /* DTLSv1 variables */
     /* callback that allows applications to peek at protocol messages */
-    void (*msg_callback) (int write_p, int version, int content_type,
-                          const void *buf, size_t len, SSL *ssl, void *arg);
+    void (*msg_callback)(int write_p, int version, int content_type,
+        const void *buf, size_t len, SSL *ssl, void *arg);
     void *msg_callback_arg;
-    int hit;                    /* reusing a previous session */
+    int hit; /* reusing a previous session */
     X509_VERIFY_PARAM *param;
     /* Per connection DANE state */
     SSL_DANE dane;
@@ -1545,8 +1531,9 @@ struct ssl_connection_st {
     size_t cert_verify_hash_len;
 
     /* Flag to indicate whether we should send a HelloRetryRequest or not */
-    enum {SSL_HRR_NONE = 0, SSL_HRR_PENDING, SSL_HRR_COMPLETE}
-        hello_retry_request;
+    enum { SSL_HRR_NONE = 0,
+        SSL_HRR_PENDING,
+        SSL_HRR_COMPLETE } hello_retry_request;
 
     /*
      * the session_id_context is used to ensure sessions are only reused in
@@ -1575,17 +1562,17 @@ struct ssl_connection_st {
      */
     uint32_t verify_mode;
     /* fail if callback returns 0 */
-    int (*verify_callback) (int ok, X509_STORE_CTX *ctx);
+    int (*verify_callback)(int ok, X509_STORE_CTX *ctx);
     /* optional informational callback */
-    void (*info_callback) (const SSL *ssl, int type, int val);
+    void (*info_callback)(const SSL *ssl, int type, int val);
     /* error bytes to be written */
     int error;
     /* actual code */
     int error_code;
-# ifndef OPENSSL_NO_PSK
+#ifndef OPENSSL_NO_PSK
     SSL_psk_client_cb_func psk_client_callback;
     SSL_psk_server_cb_func psk_server_callback;
-# endif
+#endif
     SSL_psk_find_session_cb_func psk_find_session_cb;
     SSL_psk_use_session_cb_func psk_use_session_cb;
 
@@ -1631,7 +1618,7 @@ struct ssl_connection_st {
         uint8_t extflags[TLSEXT_IDX_num_builtins];
         /* TLS extension debug callback */
         void (*debug_cb)(SSL *s, int client_server, int type,
-                         const unsigned char *data, int len, void *arg);
+            const unsigned char *data, int len, void *arg);
         void *debug_arg;
         char *hostname;
         /* certificate status request info */
@@ -1762,7 +1749,7 @@ struct ssl_connection_st {
      * 2 : don't call servername callback, no ack in server hello
      */
     int servername_done;
-# ifndef OPENSSL_NO_CT
+#ifndef OPENSSL_NO_CT
     /*
      * Validates that the SCTs (Signed Certificate Timestamps) are sufficient.
      * If they are not, the connection should be aborted.
@@ -1777,14 +1764,14 @@ struct ssl_connection_st {
     STACK_OF(SCT) *scts;
     /* Have we attempted to find/parse SCTs yet? */
     int scts_parsed;
-# endif
-    SSL_CTX *session_ctx;       /* initial ctx, used to store sessions */
-# ifndef OPENSSL_NO_SRTP
+#endif
+    SSL_CTX *session_ctx; /* initial ctx, used to store sessions */
+#ifndef OPENSSL_NO_SRTP
     /* What we'll do */
     STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles;
     /* What's been chosen */
     SRTP_PROTECTION_PROFILE *srtp_profile;
-# endif
+#endif
     /*-
      * 1 if we are renegotiating.
      * 2 if we are a server and are inside a handshake
@@ -1796,20 +1783,20 @@ struct ssl_connection_st {
     /* Post-handshake authentication state */
     SSL_PHA_STATE post_handshake_auth;
     int pha_enabled;
-    uint8_t* pha_context;
+    uint8_t *pha_context;
     size_t pha_context_len;
     int certreqs_sent;
     EVP_MD_CTX *pha_dgst; /* this is just the digest through ClientFinished */
 
-# ifndef OPENSSL_NO_SRP
+#ifndef OPENSSL_NO_SRP
     /* ctx for SRP authentication */
     SRP_CTX srp_ctx;
-# endif
+#endif
     /*
      * Callback for disabling session caching and ticket support on a session
      * basis, depending on the chosen cipher.
      */
-    int (*not_resumable_session_cb) (SSL *ssl, int is_forward_secure);
+    int (*not_resumable_session_cb)(SSL *ssl, int is_forward_secure);
 
     /* Record layer data */
     RECORD_LAYER rlayer;
@@ -1878,7 +1865,7 @@ struct ssl_connection_st {
 /*
  * Structure containing table entry of values associated with the signature
  * algorithms (signature scheme) extension
-*/
+ */
 typedef struct sigalg_lookup_st {
     /* TLS 1.3 signature scheme name */
     const char *name;
@@ -1911,12 +1898,12 @@ typedef struct sigalg_lookup_st {
 
 /* DTLS structures */
 
-# ifndef OPENSSL_NO_SCTP
-#  define DTLS1_SCTP_AUTH_LABEL   "EXPORTER_DTLS_OVER_SCTP"
-# endif
+#ifndef OPENSSL_NO_SCTP
+#define DTLS1_SCTP_AUTH_LABEL "EXPORTER_DTLS_OVER_SCTP"
+#endif
 
 /* Max MTU overhead we know about so far is 40 for IPv6 + 8 for UDP */
-# define DTLS1_MAX_MTU_OVERHEAD                   48
+#define DTLS1_MAX_MTU_OVERHEAD 48
 
 struct dtls1_retransmit_state {
     const OSSL_RECORD_METHOD *wrlmethod;
@@ -1943,7 +1930,7 @@ typedef struct pqueue_st pqueue;
 typedef struct pitem_st pitem;
 
 struct pitem_st {
-    unsigned char priority[8];  /* 64-bit value in big-endian encoding */
+    unsigned char priority[8]; /* 64-bit value in big-endian encoding */
     void *data;
     pitem *next;
 };
@@ -1974,8 +1961,8 @@ typedef struct dtls1_state_st {
     pqueue *buffered_messages;
     /* Buffered (sent) handshake records */
     pqueue *sent_messages;
-    size_t link_mtu;      /* max on-the-wire DTLS packet size */
-    size_t mtu;           /* max DTLS packet size */
+    size_t link_mtu; /* max on-the-wire DTLS packet size */
+    size_t mtu; /* max DTLS packet size */
     struct hm_header_st w_msg_hdr;
     struct hm_header_st r_msg_hdr;
     /* Number of alerts received so far */
@@ -1988,9 +1975,9 @@ typedef struct dtls1_state_st {
     unsigned int timeout_duration_us;
 
     unsigned int retransmitting;
-# ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
     int shutdown_received;
-# endif
+#endif
 
     DTLS_timer_cb timer_cb;
 
@@ -1999,11 +1986,11 @@ typedef struct dtls1_state_st {
 /*
  * From ECC-TLS draft, used in encoding the curve type in ECParameters
  */
-#  define EXPLICIT_PRIME_CURVE_TYPE  1
-#  define EXPLICIT_CHAR2_CURVE_TYPE  2
-#  define NAMED_CURVE_TYPE           3
+#define EXPLICIT_PRIME_CURVE_TYPE 1
+#define EXPLICIT_CHAR2_CURVE_TYPE 2
+#define NAMED_CURVE_TYPE 3
 
-# ifndef OPENSSL_NO_COMP_ALG
+#ifndef OPENSSL_NO_COMP_ALG
 struct ossl_comp_cert_st {
     unsigned char *data;
     size_t len;
@@ -2015,7 +2002,7 @@ typedef struct ossl_comp_cert_st OSSL_COMP_CERT;
 
 void OSSL_COMP_CERT_free(OSSL_COMP_CERT *c);
 int OSSL_COMP_CERT_up_ref(OSSL_COMP_CERT *c);
-# endif
+#endif
 
 struct cert_pkey_st {
     X509 *x509;
@@ -2031,17 +2018,17 @@ struct cert_pkey_st {
      */
     unsigned char *serverinfo;
     size_t serverinfo_length;
-# ifndef OPENSSL_NO_COMP_ALG
+#ifndef OPENSSL_NO_COMP_ALG
     /* Compressed certificate data - index 0 is unused */
     OSSL_COMP_CERT *comp_cert[TLSEXT_comp_cert_limit];
     int cert_comp_used;
-# endif
+#endif
 };
 /* Retrieve Suite B flags */
-# define tls1_suiteb(s)  (s->cert->cert_flags & SSL_CERT_FLAG_SUITEB_128_LOS)
+#define tls1_suiteb(s) (s->cert->cert_flags & SSL_CERT_FLAG_SUITEB_128_LOS)
 /* Uses to check strict mode: suite B modes are always strict */
-# define SSL_CERT_FLAGS_CHECK_TLS_STRICT \
-        (SSL_CERT_FLAG_SUITEB_128_LOS|SSL_CERT_FLAG_TLS_STRICT)
+#define SSL_CERT_FLAGS_CHECK_TLS_STRICT \
+    (SSL_CERT_FLAG_SUITEB_128_LOS | SSL_CERT_FLAG_TLS_STRICT)
 
 typedef enum {
     ENDPOINT_CLIENT = 0,
@@ -2049,7 +2036,6 @@ typedef enum {
     ENDPOINT_BOTH
 } ENDPOINT;
 
-
 typedef struct {
     unsigned short ext_type;
     ENDPOINT role;
@@ -2073,12 +2059,17 @@ typedef struct {
  * Indicates an extension has been received. Used to check for unsolicited or
  * duplicate extensions.
  */
-# define SSL_EXT_FLAG_RECEIVED   0x1
+#define SSL_EXT_FLAG_RECEIVED 0x1
 /*
  * Indicates an extension has been sent: used to enable sending of
  * corresponding ServerHello extension.
  */
-# define SSL_EXT_FLAG_SENT       0x2
+#define SSL_EXT_FLAG_SENT 0x2
+/*
+ * Indicates an extension that was set on SSL object and needs to be
+ * preserved when switching SSL contexts.
+ */
+#define SSL_EXT_FLAG_CONN 0x4
 
 typedef struct {
     custom_ext_method *meths;
@@ -2095,7 +2086,7 @@ typedef struct cert_st {
     CERT_PKEY *key;
 
     EVP_PKEY *dh_tmp;
-    DH *(*dh_tmp_cb) (SSL *ssl, int is_export, int keysize);
+    DH *(*dh_tmp_cb)(SSL *ssl, int is_export, int keysize);
     int dh_tmp_auto;
     /* Flags related to certificates */
     uint32_t cert_flags;
@@ -2129,7 +2120,7 @@ typedef struct cert_st {
      * allows advanced applications to select certificates on the fly: for
      * example based on supported signature algorithms or curves.
      */
-    int (*cert_cb) (SSL *ssl, void *arg);
+    int (*cert_cb)(SSL *ssl, void *arg);
     void *cert_cb_arg;
     /*
      * Optional X509_STORE for chain building or certificate validation If
@@ -2140,16 +2131,16 @@ typedef struct cert_st {
     /* Custom extensions */
     custom_ext_methods custext;
     /* Security callback */
-    int (*sec_cb) (const SSL *s, const SSL_CTX *ctx, int op, int bits, int nid,
-                   void *other, void *ex);
+    int (*sec_cb)(const SSL *s, const SSL_CTX *ctx, int op, int bits, int nid,
+        void *other, void *ex);
     /* Security level */
     int sec_level;
     void *sec_ex;
-# ifndef OPENSSL_NO_PSK
+#ifndef OPENSSL_NO_PSK
     /* If not NULL psk identity hint to use for servers */
     char *psk_identity_hint;
-# endif
-    CRYPTO_REF_COUNT references;             /* >1 only if SSL_copy_session_id is used */
+#endif
+    CRYPTO_REF_COUNT references; /* >1 only if SSL_copy_session_id is used */
 } CERT;
 
 /*
@@ -2157,50 +2148,50 @@ typedef struct cert_st {
  * of a mess of functions, but hell, think of it as an opaque structure :-)
  */
 typedef struct ssl3_enc_method {
-    int (*setup_key_block) (SSL_CONNECTION *);
-    int (*generate_master_secret) (SSL_CONNECTION *, unsigned char *,
-                                   unsigned char *, size_t, size_t *);
-    int (*change_cipher_state) (SSL_CONNECTION *, int);
-    size_t (*final_finish_mac) (SSL_CONNECTION *, const char *, size_t,
-                                unsigned char *);
+    int (*setup_key_block)(SSL_CONNECTION *);
+    int (*generate_master_secret)(SSL_CONNECTION *, unsigned char *,
+        unsigned char *, size_t, size_t *);
+    int (*change_cipher_state)(SSL_CONNECTION *, int);
+    size_t (*final_finish_mac)(SSL_CONNECTION *, const char *, size_t,
+        unsigned char *);
     const char *client_finished_label;
     size_t client_finished_label_len;
     const char *server_finished_label;
     size_t server_finished_label_len;
-    int (*alert_value) (int);
-    int (*export_keying_material) (SSL_CONNECTION *, unsigned char *, size_t,
-                                   const char *, size_t,
-                                   const unsigned char *, size_t,
-                                   int use_context);
+    int (*alert_value)(int);
+    int (*export_keying_material)(SSL_CONNECTION *, unsigned char *, size_t,
+        const char *, size_t,
+        const unsigned char *, size_t,
+        int use_context);
     /* Various flags indicating protocol version requirements */
     uint32_t enc_flags;
     /* Set the handshake header */
-    int (*set_handshake_header) (SSL_CONNECTION *s, WPACKET *pkt, int type);
+    int (*set_handshake_header)(SSL_CONNECTION *s, WPACKET *pkt, int type);
     /* Close construction of the handshake message */
-    int (*close_construct_packet) (SSL_CONNECTION *s, WPACKET *pkt, int htype);
+    int (*close_construct_packet)(SSL_CONNECTION *s, WPACKET *pkt, int htype);
     /* Write out handshake message */
-    int (*do_write) (SSL_CONNECTION *s);
+    int (*do_write)(SSL_CONNECTION *s);
 } SSL3_ENC_METHOD;
 
-# define ssl_set_handshake_header(s, pkt, htype) \
+#define ssl_set_handshake_header(s, pkt, htype) \
     SSL_CONNECTION_GET_SSL(s)->method->ssl3_enc->set_handshake_header((s), (pkt), (htype))
-# define ssl_close_construct_packet(s, pkt, htype) \
+#define ssl_close_construct_packet(s, pkt, htype) \
     SSL_CONNECTION_GET_SSL(s)->method->ssl3_enc->close_construct_packet((s), (pkt), (htype))
-# define ssl_do_write(s)  SSL_CONNECTION_GET_SSL(s)->method->ssl3_enc->do_write(s)
+#define ssl_do_write(s) SSL_CONNECTION_GET_SSL(s)->method->ssl3_enc->do_write(s)
 
 /* Values for enc_flags */
 
 /* Uses signature algorithms extension */
-# define SSL_ENC_FLAG_SIGALGS            0x2
+#define SSL_ENC_FLAG_SIGALGS 0x2
 /* Uses SHA256 default PRF */
-# define SSL_ENC_FLAG_SHA256_PRF         0x4
+#define SSL_ENC_FLAG_SHA256_PRF 0x4
 /* Is DTLS */
-# define SSL_ENC_FLAG_DTLS               0x8
+#define SSL_ENC_FLAG_DTLS 0x8
 /*
  * Allow TLS 1.2 ciphersuites: applies to DTLS 1.2 as well as TLS 1.2: may
  * apply to others in future.
  */
-# define SSL_ENC_FLAG_TLS1_2_CIPHERS     0x10
+#define SSL_ENC_FLAG_TLS1_2_CIPHERS 0x10
 
 typedef enum downgrade_en {
     DOWNGRADE_NONE,
@@ -2212,100 +2203,99 @@ typedef enum downgrade_en {
  * Dummy status type for the status_type extension. Indicates no status type
  * set
  */
-#define TLSEXT_STATUSTYPE_nothing  -1
+#define TLSEXT_STATUSTYPE_nothing -1
 
 /* Sigalgs values */
-#define TLSEXT_SIGALG_ecdsa_secp256r1_sha256                    0x0403
-#define TLSEXT_SIGALG_ecdsa_secp384r1_sha384                    0x0503
-#define TLSEXT_SIGALG_ecdsa_secp521r1_sha512                    0x0603
-#define TLSEXT_SIGALG_ecdsa_sha224                              0x0303
-#define TLSEXT_SIGALG_ecdsa_sha1                                0x0203
-#define TLSEXT_SIGALG_rsa_pss_rsae_sha256                       0x0804
-#define TLSEXT_SIGALG_rsa_pss_rsae_sha384                       0x0805
-#define TLSEXT_SIGALG_rsa_pss_rsae_sha512                       0x0806
-#define TLSEXT_SIGALG_rsa_pss_pss_sha256                        0x0809
-#define TLSEXT_SIGALG_rsa_pss_pss_sha384                        0x080a
-#define TLSEXT_SIGALG_rsa_pss_pss_sha512                        0x080b
-#define TLSEXT_SIGALG_rsa_pkcs1_sha256                          0x0401
-#define TLSEXT_SIGALG_rsa_pkcs1_sha384                          0x0501
-#define TLSEXT_SIGALG_rsa_pkcs1_sha512                          0x0601
-#define TLSEXT_SIGALG_rsa_pkcs1_sha224                          0x0301
-#define TLSEXT_SIGALG_rsa_pkcs1_sha1                            0x0201
-#define TLSEXT_SIGALG_dsa_sha256                                0x0402
-#define TLSEXT_SIGALG_dsa_sha384                                0x0502
-#define TLSEXT_SIGALG_dsa_sha512                                0x0602
-#define TLSEXT_SIGALG_dsa_sha224                                0x0302
-#define TLSEXT_SIGALG_dsa_sha1                                  0x0202
-#define TLSEXT_SIGALG_gostr34102012_256_intrinsic               0x0840
-#define TLSEXT_SIGALG_gostr34102012_512_intrinsic               0x0841
-#define TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256       0xeeee
-#define TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512       0xefef
-#define TLSEXT_SIGALG_gostr34102001_gostr3411                   0xeded
-
-#define TLSEXT_SIGALG_ed25519                                   0x0807
-#define TLSEXT_SIGALG_ed448                                     0x0808
-#define TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256              0x081a
-#define TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384              0x081b
-#define TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512              0x081c
-#define TLSEXT_SIGALG_mldsa44                                   0x0904
-#define TLSEXT_SIGALG_mldsa65                                   0x0905
-#define TLSEXT_SIGALG_mldsa87                                   0x0906
+#define TLSEXT_SIGALG_ecdsa_secp256r1_sha256 0x0403
+#define TLSEXT_SIGALG_ecdsa_secp384r1_sha384 0x0503
+#define TLSEXT_SIGALG_ecdsa_secp521r1_sha512 0x0603
+#define TLSEXT_SIGALG_ecdsa_sha224 0x0303
+#define TLSEXT_SIGALG_ecdsa_sha1 0x0203
+#define TLSEXT_SIGALG_rsa_pss_rsae_sha256 0x0804
+#define TLSEXT_SIGALG_rsa_pss_rsae_sha384 0x0805
+#define TLSEXT_SIGALG_rsa_pss_rsae_sha512 0x0806
+#define TLSEXT_SIGALG_rsa_pss_pss_sha256 0x0809
+#define TLSEXT_SIGALG_rsa_pss_pss_sha384 0x080a
+#define TLSEXT_SIGALG_rsa_pss_pss_sha512 0x080b
+#define TLSEXT_SIGALG_rsa_pkcs1_sha256 0x0401
+#define TLSEXT_SIGALG_rsa_pkcs1_sha384 0x0501
+#define TLSEXT_SIGALG_rsa_pkcs1_sha512 0x0601
+#define TLSEXT_SIGALG_rsa_pkcs1_sha224 0x0301
+#define TLSEXT_SIGALG_rsa_pkcs1_sha1 0x0201
+#define TLSEXT_SIGALG_dsa_sha256 0x0402
+#define TLSEXT_SIGALG_dsa_sha384 0x0502
+#define TLSEXT_SIGALG_dsa_sha512 0x0602
+#define TLSEXT_SIGALG_dsa_sha224 0x0302
+#define TLSEXT_SIGALG_dsa_sha1 0x0202
+#define TLSEXT_SIGALG_gostr34102012_256_intrinsic 0x0840
+#define TLSEXT_SIGALG_gostr34102012_512_intrinsic 0x0841
+#define TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256 0xeeee
+#define TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512 0xefef
+#define TLSEXT_SIGALG_gostr34102001_gostr3411 0xeded
+
+#define TLSEXT_SIGALG_ed25519 0x0807
+#define TLSEXT_SIGALG_ed448 0x0808
+#define TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256 0x081a
+#define TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384 0x081b
+#define TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512 0x081c
+#define TLSEXT_SIGALG_mldsa44 0x0904
+#define TLSEXT_SIGALG_mldsa65 0x0905
+#define TLSEXT_SIGALG_mldsa87 0x0906
 
 /* Sigalgs names */
-#define TLSEXT_SIGALG_ecdsa_secp256r1_sha256_name                    "ecdsa_secp256r1_sha256"
-#define TLSEXT_SIGALG_ecdsa_secp384r1_sha384_name                    "ecdsa_secp384r1_sha384"
-#define TLSEXT_SIGALG_ecdsa_secp521r1_sha512_name                    "ecdsa_secp521r1_sha512"
-#define TLSEXT_SIGALG_ecdsa_sha224_name                              "ecdsa_sha224"
-#define TLSEXT_SIGALG_ecdsa_sha1_name                                "ecdsa_sha1"
-#define TLSEXT_SIGALG_rsa_pss_rsae_sha256_name                       "rsa_pss_rsae_sha256"
-#define TLSEXT_SIGALG_rsa_pss_rsae_sha384_name                       "rsa_pss_rsae_sha384"
-#define TLSEXT_SIGALG_rsa_pss_rsae_sha512_name                       "rsa_pss_rsae_sha512"
-#define TLSEXT_SIGALG_rsa_pss_pss_sha256_name                        "rsa_pss_pss_sha256"
-#define TLSEXT_SIGALG_rsa_pss_pss_sha384_name                        "rsa_pss_pss_sha384"
-#define TLSEXT_SIGALG_rsa_pss_pss_sha512_name                        "rsa_pss_pss_sha512"
-#define TLSEXT_SIGALG_rsa_pkcs1_sha256_name                          "rsa_pkcs1_sha256"
-#define TLSEXT_SIGALG_rsa_pkcs1_sha384_name                          "rsa_pkcs1_sha384"
-#define TLSEXT_SIGALG_rsa_pkcs1_sha512_name                          "rsa_pkcs1_sha512"
-#define TLSEXT_SIGALG_rsa_pkcs1_sha224_name                          "rsa_pkcs1_sha224"
-#define TLSEXT_SIGALG_rsa_pkcs1_sha1_name                            "rsa_pkcs1_sha1"
-#define TLSEXT_SIGALG_dsa_sha256_name                                "dsa_sha256"
-#define TLSEXT_SIGALG_dsa_sha384_name                                "dsa_sha384"
-#define TLSEXT_SIGALG_dsa_sha512_name                                "dsa_sha512"
-#define TLSEXT_SIGALG_dsa_sha224_name                                "dsa_sha224"
-#define TLSEXT_SIGALG_dsa_sha1_name                                  "dsa_sha1"
-#define TLSEXT_SIGALG_gostr34102012_256_intrinsic_name               "gostr34102012_256"
-#define TLSEXT_SIGALG_gostr34102012_512_intrinsic_name               "gostr34102012_512"
-#define TLSEXT_SIGALG_gostr34102012_256_intrinsic_alias              "gost2012_256"
-#define TLSEXT_SIGALG_gostr34102012_512_intrinsic_alias              "gost2012_512"
-#define TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256_name       "gost2012_256"
-#define TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512_name       "gost2012_512"
-#define TLSEXT_SIGALG_gostr34102001_gostr3411_name                   "gost2001_gost94"
-
-#define TLSEXT_SIGALG_ed25519_name                                   "ed25519"
-#define TLSEXT_SIGALG_ed448_name                                     "ed448"
-#define TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256_name              "ecdsa_brainpoolP256r1tls13_sha256"
-#define TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384_name              "ecdsa_brainpoolP384r1tls13_sha384"
-#define TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512_name              "ecdsa_brainpoolP512r1tls13_sha512"
-#define TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256_alias             "ecdsa_brainpoolP256r1_sha256"
-#define TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384_alias             "ecdsa_brainpoolP384r1_sha384"
-#define TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512_alias             "ecdsa_brainpoolP512r1_sha512"
-#define TLSEXT_SIGALG_mldsa44_name                                   "mldsa44"
-#define TLSEXT_SIGALG_mldsa65_name                                   "mldsa65"
-#define TLSEXT_SIGALG_mldsa87_name                                   "mldsa87"
+#define TLSEXT_SIGALG_ecdsa_secp256r1_sha256_name "ecdsa_secp256r1_sha256"
+#define TLSEXT_SIGALG_ecdsa_secp384r1_sha384_name "ecdsa_secp384r1_sha384"
+#define TLSEXT_SIGALG_ecdsa_secp521r1_sha512_name "ecdsa_secp521r1_sha512"
+#define TLSEXT_SIGALG_ecdsa_sha224_name "ecdsa_sha224"
+#define TLSEXT_SIGALG_ecdsa_sha1_name "ecdsa_sha1"
+#define TLSEXT_SIGALG_rsa_pss_rsae_sha256_name "rsa_pss_rsae_sha256"
+#define TLSEXT_SIGALG_rsa_pss_rsae_sha384_name "rsa_pss_rsae_sha384"
+#define TLSEXT_SIGALG_rsa_pss_rsae_sha512_name "rsa_pss_rsae_sha512"
+#define TLSEXT_SIGALG_rsa_pss_pss_sha256_name "rsa_pss_pss_sha256"
+#define TLSEXT_SIGALG_rsa_pss_pss_sha384_name "rsa_pss_pss_sha384"
+#define TLSEXT_SIGALG_rsa_pss_pss_sha512_name "rsa_pss_pss_sha512"
+#define TLSEXT_SIGALG_rsa_pkcs1_sha256_name "rsa_pkcs1_sha256"
+#define TLSEXT_SIGALG_rsa_pkcs1_sha384_name "rsa_pkcs1_sha384"
+#define TLSEXT_SIGALG_rsa_pkcs1_sha512_name "rsa_pkcs1_sha512"
+#define TLSEXT_SIGALG_rsa_pkcs1_sha224_name "rsa_pkcs1_sha224"
+#define TLSEXT_SIGALG_rsa_pkcs1_sha1_name "rsa_pkcs1_sha1"
+#define TLSEXT_SIGALG_dsa_sha256_name "dsa_sha256"
+#define TLSEXT_SIGALG_dsa_sha384_name "dsa_sha384"
+#define TLSEXT_SIGALG_dsa_sha512_name "dsa_sha512"
+#define TLSEXT_SIGALG_dsa_sha224_name "dsa_sha224"
+#define TLSEXT_SIGALG_dsa_sha1_name "dsa_sha1"
+#define TLSEXT_SIGALG_gostr34102012_256_intrinsic_name "gostr34102012_256"
+#define TLSEXT_SIGALG_gostr34102012_512_intrinsic_name "gostr34102012_512"
+#define TLSEXT_SIGALG_gostr34102012_256_intrinsic_alias "gost2012_256"
+#define TLSEXT_SIGALG_gostr34102012_512_intrinsic_alias "gost2012_512"
+#define TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256_name "gost2012_256"
+#define TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512_name "gost2012_512"
+#define TLSEXT_SIGALG_gostr34102001_gostr3411_name "gost2001_gost94"
+
+#define TLSEXT_SIGALG_ed25519_name "ed25519"
+#define TLSEXT_SIGALG_ed448_name "ed448"
+#define TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256_name "ecdsa_brainpoolP256r1tls13_sha256"
+#define TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384_name "ecdsa_brainpoolP384r1tls13_sha384"
+#define TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512_name "ecdsa_brainpoolP512r1tls13_sha512"
+#define TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256_alias "ecdsa_brainpoolP256r1_sha256"
+#define TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384_alias "ecdsa_brainpoolP384r1_sha384"
+#define TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512_alias "ecdsa_brainpoolP512r1_sha512"
+#define TLSEXT_SIGALG_mldsa44_name "mldsa44"
+#define TLSEXT_SIGALG_mldsa65_name "mldsa65"
+#define TLSEXT_SIGALG_mldsa87_name "mldsa87"
 
 /* Known PSK key exchange modes */
-#define TLSEXT_KEX_MODE_KE                                      0x00
-#define TLSEXT_KEX_MODE_KE_DHE                                  0x01
+#define TLSEXT_KEX_MODE_KE 0x00
+#define TLSEXT_KEX_MODE_KE_DHE 0x01
 
 /*
  * Internal representations of key exchange modes
  */
-#define TLSEXT_KEX_MODE_FLAG_NONE                               0
-#define TLSEXT_KEX_MODE_FLAG_KE                                 1
-#define TLSEXT_KEX_MODE_FLAG_KE_DHE                             2
+#define TLSEXT_KEX_MODE_FLAG_NONE 0
+#define TLSEXT_KEX_MODE_FLAG_KE 1
+#define TLSEXT_KEX_MODE_FLAG_KE_DHE 2
 
-#define SSL_USE_PSS(s) (s->s3.tmp.peer_sigalg != NULL && \
-                        s->s3.tmp.peer_sigalg->sig == EVP_PKEY_RSA_PSS)
+#define SSL_USE_PSS(s) (s->s3.tmp.peer_sigalg != NULL && s->s3.tmp.peer_sigalg->sig == EVP_PKEY_RSA_PSS)
 
 /* TLSv1.3 downgrade protection sentinel values */
 extern const unsigned char tls11downgrade[8];
@@ -2347,133 +2337,133 @@ extern const SSL3_ENC_METHOD DTLSv1_2_enc_data;
 /*
  * Flags for SSL methods
  */
-# define SSL_METHOD_NO_FIPS      (1U<<0)
-# define SSL_METHOD_NO_SUITEB    (1U<<1)
-
-# define IMPLEMENT_tls_meth_func(version, flags, mask, func_name, s_accept, \
-                                 s_connect, enc_data) \
-const SSL_METHOD *func_name(void)  \
-        { \
-        static const SSL_METHOD func_name##_data= { \
-                version, \
-                flags, \
-                mask, \
-                ossl_ssl_connection_new, \
-                ossl_ssl_connection_free, \
-                ossl_ssl_connection_reset, \
-                tls1_new, \
-                tls1_clear, \
-                tls1_free, \
-                s_accept, \
-                s_connect, \
-                ssl3_read, \
-                ssl3_peek, \
-                ssl3_write, \
-                ssl3_shutdown, \
-                ssl3_renegotiate, \
-                ssl3_renegotiate_check, \
-                ssl3_read_bytes, \
-                ssl3_write_bytes, \
-                ssl3_dispatch_alert, \
-                ssl3_ctrl, \
-                ssl3_ctx_ctrl, \
-                ssl3_get_cipher_by_char, \
-                ssl3_put_cipher_by_char, \
-                ssl3_pending, \
-                ssl3_num_ciphers, \
-                ssl3_get_cipher, \
-                tls1_default_timeout, \
-                &enc_data, \
-                ssl_undefined_void_function, \
-                ssl3_callback_ctrl, \
-                ssl3_ctx_callback_ctrl, \
-        }; \
-        return &func_name##_data; \
-        }
-
-# define IMPLEMENT_ssl3_meth_func(func_name, s_accept, s_connect) \
-const SSL_METHOD *func_name(void)  \
-        { \
-        static const SSL_METHOD func_name##_data= { \
-                SSL3_VERSION, \
-                SSL_METHOD_NO_FIPS | SSL_METHOD_NO_SUITEB, \
-                SSL_OP_NO_SSLv3, \
-                ossl_ssl_connection_new, \
-                ossl_ssl_connection_free, \
-                ossl_ssl_connection_reset, \
-                ssl3_new, \
-                ssl3_clear, \
-                ssl3_free, \
-                s_accept, \
-                s_connect, \
-                ssl3_read, \
-                ssl3_peek, \
-                ssl3_write, \
-                ssl3_shutdown, \
-                ssl3_renegotiate, \
-                ssl3_renegotiate_check, \
-                ssl3_read_bytes, \
-                ssl3_write_bytes, \
-                ssl3_dispatch_alert, \
-                ssl3_ctrl, \
-                ssl3_ctx_ctrl, \
-                ssl3_get_cipher_by_char, \
-                ssl3_put_cipher_by_char, \
-                ssl3_pending, \
-                ssl3_num_ciphers, \
-                ssl3_get_cipher, \
-                ssl3_default_timeout, \
-                &SSLv3_enc_data, \
-                ssl_undefined_void_function, \
-                ssl3_callback_ctrl, \
-                ssl3_ctx_callback_ctrl, \
-        }; \
-        return &func_name##_data; \
-        }
-
-# define IMPLEMENT_dtls1_meth_func(version, flags, mask, func_name, s_accept, \
-                                        s_connect, enc_data) \
-const SSL_METHOD *func_name(void)  \
-        { \
-        static const SSL_METHOD func_name##_data= { \
-                version, \
-                flags, \
-                mask, \
-                ossl_ssl_connection_new, \
-                ossl_ssl_connection_free, \
-                ossl_ssl_connection_reset, \
-                dtls1_new, \
-                dtls1_clear, \
-                dtls1_free, \
-                s_accept, \
-                s_connect, \
-                ssl3_read, \
-                ssl3_peek, \
-                ssl3_write, \
-                dtls1_shutdown, \
-                ssl3_renegotiate, \
-                ssl3_renegotiate_check, \
-                dtls1_read_bytes, \
-                dtls1_write_app_data_bytes, \
-                dtls1_dispatch_alert, \
-                dtls1_ctrl, \
-                ssl3_ctx_ctrl, \
-                ssl3_get_cipher_by_char, \
-                ssl3_put_cipher_by_char, \
-                ssl3_pending, \
-                ssl3_num_ciphers, \
-                ssl3_get_cipher, \
-                dtls1_default_timeout, \
-                &enc_data, \
-                ssl_undefined_void_function, \
-                ssl3_callback_ctrl, \
-                ssl3_ctx_callback_ctrl, \
-        }; \
-        return &func_name##_data; \
-        }
+#define SSL_METHOD_NO_FIPS (1U << 0)
+#define SSL_METHOD_NO_SUITEB (1U << 1)
+
+#define IMPLEMENT_tls_meth_func(version, flags, mask, func_name, s_accept, \
+    s_connect, enc_data)                                                   \
+    const SSL_METHOD *func_name(void)                                      \
+    {                                                                      \
+        static const SSL_METHOD func_name##_data = {                       \
+            version,                                                       \
+            flags,                                                         \
+            mask,                                                          \
+            ossl_ssl_connection_new,                                       \
+            ossl_ssl_connection_free,                                      \
+            ossl_ssl_connection_reset,                                     \
+            tls1_new,                                                      \
+            tls1_clear,                                                    \
+            tls1_free,                                                     \
+            s_accept,                                                      \
+            s_connect,                                                     \
+            ssl3_read,                                                     \
+            ssl3_peek,                                                     \
+            ssl3_write,                                                    \
+            ssl3_shutdown,                                                 \
+            ssl3_renegotiate,                                              \
+            ssl3_renegotiate_check,                                        \
+            ssl3_read_bytes,                                               \
+            ssl3_write_bytes,                                              \
+            ssl3_dispatch_alert,                                           \
+            ssl3_ctrl,                                                     \
+            ssl3_ctx_ctrl,                                                 \
+            ssl3_get_cipher_by_char,                                       \
+            ssl3_put_cipher_by_char,                                       \
+            ssl3_pending,                                                  \
+            ssl3_num_ciphers,                                              \
+            ssl3_get_cipher,                                               \
+            tls1_default_timeout,                                          \
+            &enc_data,                                                     \
+            ssl_undefined_void_function,                                   \
+            ssl3_callback_ctrl,                                            \
+            ssl3_ctx_callback_ctrl,                                        \
+        };                                                                 \
+        return &func_name##_data;                                          \
+    }
+
+#define IMPLEMENT_ssl3_meth_func(func_name, s_accept, s_connect) \
+    const SSL_METHOD *func_name(void)                            \
+    {                                                            \
+        static const SSL_METHOD func_name##_data = {             \
+            SSL3_VERSION,                                        \
+            SSL_METHOD_NO_FIPS | SSL_METHOD_NO_SUITEB,           \
+            SSL_OP_NO_SSLv3,                                     \
+            ossl_ssl_connection_new,                             \
+            ossl_ssl_connection_free,                            \
+            ossl_ssl_connection_reset,                           \
+            ssl3_new,                                            \
+            ssl3_clear,                                          \
+            ssl3_free,                                           \
+            s_accept,                                            \
+            s_connect,                                           \
+            ssl3_read,                                           \
+            ssl3_peek,                                           \
+            ssl3_write,                                          \
+            ssl3_shutdown,                                       \
+            ssl3_renegotiate,                                    \
+            ssl3_renegotiate_check,                              \
+            ssl3_read_bytes,                                     \
+            ssl3_write_bytes,                                    \
+            ssl3_dispatch_alert,                                 \
+            ssl3_ctrl,                                           \
+            ssl3_ctx_ctrl,                                       \
+            ssl3_get_cipher_by_char,                             \
+            ssl3_put_cipher_by_char,                             \
+            ssl3_pending,                                        \
+            ssl3_num_ciphers,                                    \
+            ssl3_get_cipher,                                     \
+            ssl3_default_timeout,                                \
+            &SSLv3_enc_data,                                     \
+            ssl_undefined_void_function,                         \
+            ssl3_callback_ctrl,                                  \
+            ssl3_ctx_callback_ctrl,                              \
+        };                                                       \
+        return &func_name##_data;                                \
+    }
+
+#define IMPLEMENT_dtls1_meth_func(version, flags, mask, func_name, s_accept, \
+    s_connect, enc_data)                                                     \
+    const SSL_METHOD *func_name(void)                                        \
+    {                                                                        \
+        static const SSL_METHOD func_name##_data = {                         \
+            version,                                                         \
+            flags,                                                           \
+            mask,                                                            \
+            ossl_ssl_connection_new,                                         \
+            ossl_ssl_connection_free,                                        \
+            ossl_ssl_connection_reset,                                       \
+            dtls1_new,                                                       \
+            dtls1_clear,                                                     \
+            dtls1_free,                                                      \
+            s_accept,                                                        \
+            s_connect,                                                       \
+            ssl3_read,                                                       \
+            ssl3_peek,                                                       \
+            ssl3_write,                                                      \
+            dtls1_shutdown,                                                  \
+            ssl3_renegotiate,                                                \
+            ssl3_renegotiate_check,                                          \
+            dtls1_read_bytes,                                                \
+            dtls1_write_app_data_bytes,                                      \
+            dtls1_dispatch_alert,                                            \
+            dtls1_ctrl,                                                      \
+            ssl3_ctx_ctrl,                                                   \
+            ssl3_get_cipher_by_char,                                         \
+            ssl3_put_cipher_by_char,                                         \
+            ssl3_pending,                                                    \
+            ssl3_num_ciphers,                                                \
+            ssl3_get_cipher,                                                 \
+            dtls1_default_timeout,                                           \
+            &enc_data,                                                       \
+            ssl_undefined_void_function,                                     \
+            ssl3_callback_ctrl,                                              \
+            ssl3_ctx_callback_ctrl,                                          \
+        };                                                                   \
+        return &func_name##_data;                                            \
+    }
 
 struct openssl_ssl_test_functions {
-    int (*p_ssl_init_wbio_buffer) (SSL_CONNECTION *s);
+    int (*p_ssl_init_wbio_buffer)(SSL_CONNECTION *s);
 };
 
 const char *ssl_protocol_to_string(int version);
@@ -2485,7 +2475,7 @@ static ossl_inline int tls12_rpk_and_privkey(const SSL_CONNECTION *sc, int idx)
      * a private key, and NO CERTIFICATE
      */
     return ((sc->server && sc->ext.server_cert_type == TLSEXT_cert_type_rpk)
-            || (!sc->server && sc->ext.client_cert_type == TLSEXT_cert_type_rpk))
+               || (!sc->server && sc->ext.client_cert_type == TLSEXT_cert_type_rpk))
         && sc->cert->pkeys[idx].privatekey != NULL
         && sc->cert->pkeys[idx].x509 == NULL;
 }
@@ -2524,26 +2514,26 @@ static ossl_inline int ssl_has_cert(const SSL_CONNECTION *s, int idx)
 }
 
 static ossl_inline void tls1_get_peer_groups(SSL_CONNECTION *s,
-                                             const uint16_t **pgroups,
-                                             size_t *pgroupslen)
+    const uint16_t **pgroups,
+    size_t *pgroupslen)
 {
     *pgroups = s->ext.peer_supportedgroups;
     *pgroupslen = s->ext.peer_supportedgroups_len;
 }
 
-# ifndef OPENSSL_UNIT_TEST
+#ifndef OPENSSL_UNIT_TEST
 
 __owur int ossl_ssl_init(SSL *ssl, SSL_CTX *ctx, const SSL_METHOD *method,
-                         int type);
+    int type);
 __owur SSL *ossl_ssl_connection_new_int(SSL_CTX *ctx, SSL *user_ssl,
-                                        const SSL_METHOD *method);
+    const SSL_METHOD *method);
 __owur SSL *ossl_ssl_connection_new(SSL_CTX *ctx);
 void ossl_ssl_connection_free(SSL *ssl);
 __owur int ossl_ssl_connection_reset(SSL *ssl);
 
 __owur int ssl_read_internal(SSL *s, void *buf, size_t num, size_t *readbytes);
 __owur int ssl_write_internal(SSL *s, const void *buf, size_t num,
-                              uint64_t flags, size_t *written);
+    uint64_t flags, size_t *written);
 int ssl_clear_bad_session(SSL_CONNECTION *s);
 __owur CERT *ssl_cert_new(size_t ssl_pkey_num);
 __owur CERT *ssl_cert_dup(CERT *cert);
@@ -2552,77 +2542,77 @@ void ssl_cert_free(CERT *c);
 __owur int ssl_generate_session_id(SSL_CONNECTION *s, SSL_SESSION *ss);
 __owur int ssl_get_new_session(SSL_CONNECTION *s, int session);
 __owur SSL_SESSION *lookup_sess_in_cache(SSL_CONNECTION *s,
-                                         const unsigned char *sess_id,
-                                         size_t sess_id_len);
+    const unsigned char *sess_id,
+    size_t sess_id_len);
 __owur int ssl_get_prev_session(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello);
 __owur SSL_SESSION *ssl_session_dup(const SSL_SESSION *src, int ticket);
 __owur int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b);
 DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id);
 __owur int ssl_cipher_ptr_id_cmp(const SSL_CIPHER *const *ap,
-                                 const SSL_CIPHER *const *bp);
+    const SSL_CIPHER *const *bp);
 __owur STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_CTX *ctx,
-                                                    STACK_OF(SSL_CIPHER) *tls13_ciphersuites,
-                                                    STACK_OF(SSL_CIPHER) **cipher_list,
-                                                    STACK_OF(SSL_CIPHER) **cipher_list_by_id,
-                                                    const char *rule_str,
-                                                    CERT *c);
+    STACK_OF(SSL_CIPHER) *tls13_ciphersuites,
+    STACK_OF(SSL_CIPHER) **cipher_list,
+    STACK_OF(SSL_CIPHER) **cipher_list_by_id,
+    const char *rule_str,
+    CERT *c);
 __owur int ssl_cache_cipherlist(SSL_CONNECTION *s, PACKET *cipher_suites,
-                                int sslv2format);
+    int sslv2format);
 __owur int ossl_bytes_to_cipher_list(SSL_CONNECTION *s, PACKET *cipher_suites,
-                                     STACK_OF(SSL_CIPHER) **skp,
-                                     STACK_OF(SSL_CIPHER) **scsvs, int sslv2format,
-                                     int fatal);
+    STACK_OF(SSL_CIPHER) **skp,
+    STACK_OF(SSL_CIPHER) **scsvs, int sslv2format,
+    int fatal);
 void ssl_update_cache(SSL_CONNECTION *s, int mode);
 __owur int ssl_cipher_get_evp_cipher(SSL_CTX *ctx, const SSL_CIPHER *sslc,
-                                     const EVP_CIPHER **enc);
+    const EVP_CIPHER **enc);
 __owur int ssl_cipher_get_evp_md_mac(SSL_CTX *ctx, const SSL_CIPHER *sslc,
-                                     const EVP_MD **md,
-                                     int *mac_pkey_type, size_t *mac_secret_size);
+    const EVP_MD **md,
+    int *mac_pkey_type, size_t *mac_secret_size);
 __owur int ssl_cipher_get_evp(SSL_CTX *ctxc, const SSL_SESSION *s,
-                              const EVP_CIPHER **enc, const EVP_MD **md,
-                              int *mac_pkey_type, size_t *mac_secret_size,
-                              SSL_COMP **comp, int use_etm);
+    const EVP_CIPHER **enc, const EVP_MD **md,
+    int *mac_pkey_type, size_t *mac_secret_size,
+    SSL_COMP **comp, int use_etm);
 __owur int ssl_cipher_get_overhead(const SSL_CIPHER *c, size_t *mac_overhead,
-                                   size_t *int_overhead, size_t *blocksize,
-                                   size_t *ext_overhead);
+    size_t *int_overhead, size_t *blocksize,
+    size_t *ext_overhead);
 __owur int ssl_cert_is_disabled(SSL_CTX *ctx, size_t idx);
 __owur const SSL_CIPHER *ssl_get_cipher_by_char(SSL_CONNECTION *ssl,
-                                                const unsigned char *ptr,
-                                                int all);
+    const unsigned char *ptr,
+    int all);
 __owur int ssl_cert_set0_chain(SSL_CONNECTION *s, SSL_CTX *ctx,
-                               STACK_OF(X509) *chain);
+    STACK_OF(X509) *chain);
 __owur int ssl_cert_set1_chain(SSL_CONNECTION *s, SSL_CTX *ctx,
-                               STACK_OF(X509) *chain);
+    STACK_OF(X509) *chain);
 __owur int ssl_cert_add0_chain_cert(SSL_CONNECTION *s, SSL_CTX *ctx, X509 *x);
 __owur int ssl_cert_add1_chain_cert(SSL_CONNECTION *s, SSL_CTX *ctx, X509 *x);
 __owur int ssl_cert_select_current(CERT *c, X509 *x);
 __owur int ssl_cert_set_current(CERT *c, long arg);
-void ssl_cert_set_cert_cb(CERT *c, int (*cb) (SSL *ssl, void *arg), void *arg);
+void ssl_cert_set_cert_cb(CERT *c, int (*cb)(SSL *ssl, void *arg), void *arg);
 
 __owur int ssl_verify_cert_chain(SSL_CONNECTION *s, STACK_OF(X509) *sk);
 __owur int ssl_verify_rpk(SSL_CONNECTION *s, EVP_PKEY *rpk);
 __owur int ssl_build_cert_chain(SSL_CONNECTION *s, SSL_CTX *ctx, int flags);
 __owur int ssl_cert_set_cert_store(CERT *c, X509_STORE *store, int chain,
-                                   int ref);
+    int ref);
 __owur int ssl_cert_get_cert_store(CERT *c, X509_STORE **pstore, int chain);
 
 __owur int ssl_security(const SSL_CONNECTION *s, int op, int bits, int nid,
-                        void *other);
+    void *other);
 __owur int ssl_ctx_security(const SSL_CTX *ctx, int op, int bits, int nid,
-                            void *other);
+    void *other);
 int ssl_get_security_level_bits(const SSL *s, const SSL_CTX *ctx, int *levelp);
 
 __owur int ssl_cert_lookup_by_nid(int nid, size_t *pidx, SSL_CTX *ctx);
 __owur const SSL_CERT_LOOKUP *ssl_cert_lookup_by_pkey(const EVP_PKEY *pk,
-                                                      size_t *pidx,
-                                                      SSL_CTX *ctx);
+    size_t *pidx,
+    SSL_CTX *ctx);
 __owur const SSL_CERT_LOOKUP *ssl_cert_lookup_by_idx(size_t idx, SSL_CTX *ctx);
 
 int ssl_undefined_function(SSL *s);
 __owur int ssl_undefined_void_function(void);
 __owur int ssl_get_server_cert_serverinfo(SSL_CONNECTION *s,
-                                          const unsigned char **serverinfo,
-                                          size_t *serverinfo_length);
+    const unsigned char **serverinfo,
+    size_t *serverinfo_length);
 void ssl_set_masks(SSL_CONNECTION *s);
 __owur STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL_CONNECTION *sc);
 __owur int ssl_x509err2alert(int type);
@@ -2632,25 +2622,25 @@ __owur int ssl_setup_sigalgs(SSL_CTX *ctx);
 int ssl_load_groups(SSL_CTX *ctx);
 int ssl_load_sigalgs(SSL_CTX *ctx);
 __owur int ssl_fill_hello_random(SSL_CONNECTION *s, int server,
-                                 unsigned char *field, size_t len,
-                                 DOWNGRADE dgrd);
+    unsigned char *field, size_t len,
+    DOWNGRADE dgrd);
 __owur int ssl_generate_master_secret(SSL_CONNECTION *s, unsigned char *pms,
-                                      size_t pmslen, int free_pms);
+    size_t pmslen, int free_pms);
 __owur EVP_PKEY *ssl_generate_pkey(SSL_CONNECTION *s, EVP_PKEY *pm);
 __owur int ssl_gensecret(SSL_CONNECTION *s, unsigned char *pms, size_t pmslen);
 __owur int ssl_derive(SSL_CONNECTION *s, EVP_PKEY *privkey, EVP_PKEY *pubkey,
-                      int genmaster);
+    int genmaster);
 __owur int ssl_decapsulate(SSL_CONNECTION *s, EVP_PKEY *privkey,
-                           const unsigned char *ct, size_t ctlen,
-                           int gensecret);
+    const unsigned char *ct, size_t ctlen,
+    int gensecret);
 __owur int ssl_encapsulate(SSL_CONNECTION *s, EVP_PKEY *pubkey,
-                           unsigned char **ctp, size_t *ctlenp,
-                           int gensecret);
+    unsigned char **ctp, size_t *ctlenp,
+    int gensecret);
 __owur EVP_PKEY *ssl_dh_to_pkey(DH *dh);
 __owur int ssl_set_tmp_ecdh_groups(uint16_t **pext, size_t *pextlen,
-                                   uint16_t **ksext, size_t *ksextlen,
-                                   size_t **tplext, size_t *tplextlen,
-                                   void *key);
+    uint16_t **ksext, size_t *ksextlen,
+    size_t **tplext, size_t *tplextlen,
+    void *key);
 __owur unsigned int ssl_get_max_send_fragment(const SSL_CONNECTION *sc);
 __owur unsigned int ssl_get_split_send_fragment(const SSL_CONNECTION *sc);
 
@@ -2658,7 +2648,7 @@ __owur const SSL_CIPHER *ssl3_get_cipher_by_id(uint32_t id);
 __owur const SSL_CIPHER *ssl3_get_cipher_by_std_name(const char *stdname);
 __owur const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p);
 __owur int ssl3_put_cipher_by_char(const SSL_CIPHER *c, WPACKET *pkt,
-                                   size_t *len);
+    size_t *len);
 int ssl3_init_finished_mac(SSL_CONNECTION *s);
 __owur int ssl3_setup_key_block(SSL_CONNECTION *s);
 __owur int ssl3_change_cipher_state(SSL_CONNECTION *s, int which);
@@ -2666,26 +2656,26 @@ void ssl3_cleanup_key_block(SSL_CONNECTION *s);
 __owur int ssl3_do_write(SSL_CONNECTION *s, uint8_t type);
 int ssl3_send_alert(SSL_CONNECTION *s, int level, int desc);
 __owur int ssl3_generate_master_secret(SSL_CONNECTION *s, unsigned char *out,
-                                       unsigned char *p, size_t len,
-                                       size_t *secret_size);
+    unsigned char *p, size_t len,
+    size_t *secret_size);
 __owur int ssl3_get_req_cert_type(SSL_CONNECTION *s, WPACKET *pkt);
 __owur int ssl3_num_ciphers(void);
 __owur const SSL_CIPHER *ssl3_get_cipher(unsigned int u);
 int ssl3_renegotiate(SSL *ssl);
 int ssl3_renegotiate_check(SSL *ssl, int initok);
 void ssl3_digest_master_key_set_params(const SSL_SESSION *session,
-                                       OSSL_PARAM params[]);
+    OSSL_PARAM params[]);
 __owur int ssl3_dispatch_alert(SSL *s);
 __owur size_t ssl3_final_finish_mac(SSL_CONNECTION *s, const char *sender,
-                                    size_t slen, unsigned char *p);
+    size_t slen, unsigned char *p);
 __owur int ssl3_finish_mac(SSL_CONNECTION *s, const unsigned char *buf,
-                           size_t len);
+    size_t len);
 void ssl3_free_digest_list(SSL_CONNECTION *s);
 __owur unsigned long ssl3_output_cert_chain(SSL_CONNECTION *s, WPACKET *pkt,
-                                            CERT_PKEY *cpk, int for_comp);
+    CERT_PKEY *cpk, int for_comp);
 __owur const SSL_CIPHER *ssl3_choose_cipher(SSL_CONNECTION *s,
-                                            STACK_OF(SSL_CIPHER) *clnt,
-                                            STACK_OF(SSL_CIPHER) *srvr);
+    STACK_OF(SSL_CIPHER) *clnt,
+    STACK_OF(SSL_CIPHER) *srvr);
 __owur int ssl3_digest_cached_records(SSL_CONNECTION *s, int keep);
 __owur int ssl3_new(SSL *s);
 void ssl3_free(SSL *s);
@@ -2696,14 +2686,14 @@ __owur int ssl3_shutdown(SSL *s);
 int ssl3_clear(SSL *s);
 __owur long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg);
 __owur long ssl3_ctx_ctrl(SSL_CTX *s, int cmd, long larg, void *parg);
-__owur long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void));
-__owur long ssl3_ctx_callback_ctrl(SSL_CTX *s, int cmd, void (*fp) (void));
+__owur long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp)(void));
+__owur long ssl3_ctx_callback_ctrl(SSL_CTX *s, int cmd, void (*fp)(void));
 
 __owur int ssl3_do_change_cipher_spec(SSL_CONNECTION *s);
 __owur OSSL_TIME ssl3_default_timeout(void);
 
 __owur int ssl3_set_handshake_header(SSL_CONNECTION *s, WPACKET *pkt,
-                                     int htype);
+    int htype);
 __owur int tls_close_construct_packet(SSL_CONNECTION *s, WPACKET *pkt, int htype);
 __owur int tls_setup_handshake(SSL_CONNECTION *s);
 __owur int dtls1_set_handshake_header(SSL_CONNECTION *s, WPACKET *pkt, int htype);
@@ -2714,38 +2704,38 @@ __owur int ssl_allow_compression(SSL_CONNECTION *s);
 
 __owur int ssl_version_cmp(const SSL_CONNECTION *s, int versiona, int versionb);
 __owur int ssl_version_supported(const SSL_CONNECTION *s, int version,
-                                 const SSL_METHOD **meth);
+    const SSL_METHOD **meth);
 
 __owur int ssl_set_client_hello_version(SSL_CONNECTION *s);
 __owur int ssl_check_version_downgrade(SSL_CONNECTION *s);
 __owur int ssl_set_version_bound(int method_version, int version, int *bound);
 __owur int ssl_choose_server_version(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello,
-                                     DOWNGRADE *dgrd);
+    DOWNGRADE *dgrd);
 __owur int ssl_choose_client_version(SSL_CONNECTION *s, int version,
-                                     RAW_EXTENSION *extensions);
+    RAW_EXTENSION *extensions);
 __owur int ssl_get_min_max_version(const SSL_CONNECTION *s, int *min_version,
-                                   int *max_version, int *real_max);
+    int *max_version, int *real_max);
 
 __owur OSSL_TIME tls1_default_timeout(void);
 __owur int dtls1_do_write(SSL_CONNECTION *s, uint8_t type);
 void dtls1_set_message_header(SSL_CONNECTION *s,
-                              unsigned char mt,
-                              size_t len,
-                              size_t frag_off, size_t frag_len);
+    unsigned char mt,
+    size_t len,
+    size_t frag_off, size_t frag_len);
 
 int dtls1_write_app_data_bytes(SSL *s, uint8_t type, const void *buf_,
-                               size_t len, size_t *written);
+    size_t len, size_t *written);
 
 __owur int dtls1_read_failed(SSL_CONNECTION *s, int code);
 __owur int dtls1_buffer_message(SSL_CONNECTION *s, int ccs);
 __owur int dtls1_retransmit_message(SSL_CONNECTION *s, unsigned short seq,
-                                    int *found);
+    int *found);
 __owur int dtls1_get_queue_priority(unsigned short seq, int is_ccs);
 int dtls1_retransmit_buffered_messages(SSL_CONNECTION *s);
 void dtls1_clear_received_buffer(SSL_CONNECTION *s);
 void dtls1_clear_sent_buffer(SSL_CONNECTION *s);
 void dtls1_get_message_header(const unsigned char *data,
-                              struct hm_header_st *msg_hdr);
+    struct hm_header_st *msg_hdr);
 __owur OSSL_TIME dtls1_default_timeout(void);
 __owur int dtls1_get_timeout(const SSL_CONNECTION *s, OSSL_TIME *timeleft);
 __owur int dtls1_check_timeout_num(SSL_CONNECTION *s);
@@ -2754,7 +2744,7 @@ void dtls1_start_timer(SSL_CONNECTION *s);
 void dtls1_stop_timer(SSL_CONNECTION *s);
 __owur int dtls1_is_timer_expired(SSL_CONNECTION *s);
 __owur int dtls_raw_hello_verify_request(WPACKET *pkt, unsigned char *cookie,
-                                         size_t cookie_len);
+    size_t cookie_len);
 __owur size_t dtls1_min_mtu(SSL_CONNECTION *s);
 void dtls1_hm_fragment_free(hm_fragment *frag);
 __owur int dtls1_query_mtu(SSL_CONNECTION *s);
@@ -2777,63 +2767,65 @@ int ssl_free_wbio_buffer(SSL_CONNECTION *s);
 __owur int tls1_change_cipher_state(SSL_CONNECTION *s, int which);
 __owur int tls1_setup_key_block(SSL_CONNECTION *s);
 __owur size_t tls1_final_finish_mac(SSL_CONNECTION *s, const char *str,
-                                    size_t slen, unsigned char *p);
+    size_t slen, unsigned char *p);
 __owur int tls1_generate_master_secret(SSL_CONNECTION *s, unsigned char *out,
-                                       unsigned char *p, size_t len,
-                                       size_t *secret_size);
+    unsigned char *p, size_t len,
+    size_t *secret_size);
 __owur int tls13_setup_key_block(SSL_CONNECTION *s);
 __owur size_t tls13_final_finish_mac(SSL_CONNECTION *s, const char *str, size_t slen,
-                                     unsigned char *p);
+    unsigned char *p);
+__owur int tls13_store_handshake_traffic_hash(SSL_CONNECTION *s);
+__owur int tls13_store_server_finished_hash(SSL_CONNECTION *s);
 __owur int tls13_change_cipher_state(SSL_CONNECTION *s, int which);
 __owur int tls13_update_key(SSL_CONNECTION *s, int send);
 __owur int tls13_hkdf_expand(SSL_CONNECTION *s,
-                             const EVP_MD *md,
-                             const unsigned char *secret,
-                             const unsigned char *label, size_t labellen,
-                             const unsigned char *data, size_t datalen,
-                             unsigned char *out, size_t outlen, int fatal);
+    const EVP_MD *md,
+    const unsigned char *secret,
+    const unsigned char *label, size_t labellen,
+    const unsigned char *data, size_t datalen,
+    unsigned char *out, size_t outlen, int fatal);
 __owur int tls13_hkdf_expand_ex(OSSL_LIB_CTX *libctx, const char *propq,
-                                const EVP_MD *md,
-                                const unsigned char *secret,
-                                const unsigned char *label, size_t labellen,
-                                const unsigned char *data, size_t datalen,
-                                unsigned char *out, size_t outlen,
-                                int raise_error);
+    const EVP_MD *md,
+    const unsigned char *secret,
+    const unsigned char *label, size_t labellen,
+    const unsigned char *data, size_t datalen,
+    unsigned char *out, size_t outlen,
+    int raise_error);
 __owur int tls13_derive_key(SSL_CONNECTION *s, const EVP_MD *md,
-                            const unsigned char *secret, unsigned char *key,
-                            size_t keylen);
+    const unsigned char *secret, unsigned char *key,
+    size_t keylen);
 __owur int tls13_derive_iv(SSL_CONNECTION *s, const EVP_MD *md,
-                           const unsigned char *secret, unsigned char *iv,
-                           size_t ivlen);
+    const unsigned char *secret, unsigned char *iv,
+    size_t ivlen);
 __owur int tls13_derive_finishedkey(SSL_CONNECTION *s, const EVP_MD *md,
-                                    const unsigned char *secret,
-                                    unsigned char *fin, size_t finlen);
+    const unsigned char *secret,
+    unsigned char *fin, size_t finlen);
 int tls13_generate_secret(SSL_CONNECTION *s, const EVP_MD *md,
-                          const unsigned char *prevsecret,
-                          const unsigned char *insecret,
-                          size_t insecretlen,
-                          unsigned char *outsecret);
+    const unsigned char *prevsecret,
+    const unsigned char *insecret,
+    size_t insecretlen,
+    unsigned char *outsecret);
 __owur int tls13_generate_handshake_secret(SSL_CONNECTION *s,
-                                           const unsigned char *insecret,
-                                           size_t insecretlen);
+    const unsigned char *insecret,
+    size_t insecretlen);
 __owur int tls13_generate_master_secret(SSL_CONNECTION *s, unsigned char *out,
-                                        unsigned char *prev, size_t prevlen,
-                                        size_t *secret_size);
+    unsigned char *prev, size_t prevlen,
+    size_t *secret_size);
 __owur int tls1_export_keying_material(SSL_CONNECTION *s,
-                                       unsigned char *out, size_t olen,
-                                       const char *label, size_t llen,
-                                       const unsigned char *p, size_t plen,
-                                       int use_context);
+    unsigned char *out, size_t olen,
+    const char *label, size_t llen,
+    const unsigned char *p, size_t plen,
+    int use_context);
 __owur int tls13_export_keying_material(SSL_CONNECTION *s,
-                                        unsigned char *out, size_t olen,
-                                        const char *label, size_t llen,
-                                        const unsigned char *context,
-                                        size_t contextlen, int use_context);
+    unsigned char *out, size_t olen,
+    const char *label, size_t llen,
+    const unsigned char *context,
+    size_t contextlen, int use_context);
 __owur int tls13_export_keying_material_early(SSL_CONNECTION *s,
-                                              unsigned char *out, size_t olen,
-                                              const char *label, size_t llen,
-                                              const unsigned char *context,
-                                              size_t contextlen);
+    unsigned char *out, size_t olen,
+    const char *label, size_t llen,
+    const unsigned char *context,
+    size_t contextlen);
 __owur int tls1_alert_code(int code);
 __owur int tls13_alert_code(int code);
 __owur int ssl3_alert_code(int code);
@@ -2847,48 +2839,48 @@ __owur const char *tls1_group_id2name(SSL_CTX *ctx, uint16_t group_id);
 __owur int tls1_group_id2nid(uint16_t group_id, int include_unknown);
 __owur uint16_t tls1_nid2group_id(int nid);
 __owur int tls1_check_group_id(SSL_CONNECTION *s, uint16_t group_id,
-                               int check_own_curves);
+    int check_own_curves);
 __owur int tls1_get0_implemented_groups(int min_proto_version,
-                                        int max_proto_version,
-                                        TLS_GROUP_INFO *grps,
-                                        size_t num, long all,
-                                        STACK_OF(OPENSSL_CSTRING) *out);
+    int max_proto_version,
+    TLS_GROUP_INFO *grps,
+    size_t num, long all,
+    STACK_OF(OPENSSL_CSTRING) *out);
 __owur uint16_t tls1_shared_group(SSL_CONNECTION *s, int nmatch);
 __owur int tls1_set_groups(uint16_t **grpext, size_t *grpextlen,
-                           uint16_t **ksext, size_t *ksextlen,
-                           size_t **tplext, size_t *tplextlen,
-                           int *curves, size_t ncurves);
+    uint16_t **ksext, size_t *ksextlen,
+    size_t **tplext, size_t *tplextlen,
+    int *curves, size_t ncurves);
 __owur int tls1_set_groups_list(SSL_CTX *ctx,
-                                uint16_t **grpext, size_t *grpextlen,
-                                uint16_t **ksext, size_t *ksextlen,
-                                size_t **tplext, size_t *tplextlen,
-                                const char *str);
+    uint16_t **grpext, size_t *grpextlen,
+    uint16_t **ksext, size_t *ksextlen,
+    size_t **tplext, size_t *tplextlen,
+    const char *str);
 __owur EVP_PKEY *ssl_generate_pkey_group(SSL_CONNECTION *s, uint16_t id);
 __owur int tls_valid_group(SSL_CONNECTION *s, uint16_t group_id, int minversion,
-                           int maxversion, int isec, int *okfortls13);
+    int maxversion, int isec, int *okfortls13);
 __owur EVP_PKEY *ssl_generate_param_group(SSL_CONNECTION *s, uint16_t id);
 void tls1_get_formatlist(SSL_CONNECTION *s, const unsigned char **pformats,
-                         size_t *num_formats);
+    size_t *num_formats);
 __owur int tls1_check_ec_tmp_key(SSL_CONNECTION *s, unsigned long id);
 
 __owur int tls_group_allowed(SSL_CONNECTION *s, uint16_t curve, int op);
 void tls1_get_supported_groups(SSL_CONNECTION *s, const uint16_t **pgroups,
-                               size_t *pgroupslen);
+    size_t *pgroupslen);
 void tls1_get_requested_keyshare_groups(SSL_CONNECTION *s, const uint16_t **pgroups,
-                                        size_t *pgroupslen);
+    size_t *pgroupslen);
 void tls1_get_group_tuples(SSL_CONNECTION *s, const size_t **ptuples,
-                           size_t *ptupleslen);
+    size_t *ptupleslen);
 
 __owur int tls1_set_server_sigalgs(SSL_CONNECTION *s);
 
 __owur SSL_TICKET_STATUS tls_get_ticket_from_client(SSL_CONNECTION *s,
-                                                    CLIENTHELLO_MSG *hello,
-                                                    SSL_SESSION **ret);
+    CLIENTHELLO_MSG *hello,
+    SSL_SESSION **ret);
 __owur SSL_TICKET_STATUS tls_decrypt_ticket(SSL_CONNECTION *s,
-                                            const unsigned char *etick,
-                                            size_t eticklen,
-                                            const unsigned char *sess_id,
-                                            size_t sesslen, SSL_SESSION **psess);
+    const unsigned char *etick,
+    size_t eticklen,
+    const unsigned char *sess_id,
+    size_t sesslen, SSL_SESSION **psess);
 
 __owur int tls_use_ticket(SSL_CONNECTION *s);
 
@@ -2896,53 +2888,53 @@ void ssl_set_sig_mask(uint32_t *pmask_a, SSL_CONNECTION *s, int op);
 
 __owur int tls1_set_sigalgs_list(SSL_CTX *ctx, CERT *c, const char *str, int client);
 __owur int tls1_set_raw_sigalgs(CERT *c, const uint16_t *psigs, size_t salglen,
-                                int client);
+    int client);
 __owur int tls1_set_sigalgs(CERT *c, const int *salg, size_t salglen,
-                            int client);
+    int client);
 int tls1_check_chain(SSL_CONNECTION *s, X509 *x, EVP_PKEY *pk,
-                     STACK_OF(X509) *chain, int idx);
+    STACK_OF(X509) *chain, int idx);
 void tls1_set_cert_validity(SSL_CONNECTION *s);
 
-#  ifndef OPENSSL_NO_CT
+#ifndef OPENSSL_NO_CT
 __owur int ssl_validate_ct(SSL_CONNECTION *s);
-#  endif
+#endif
 
 __owur EVP_PKEY *ssl_get_auto_dh(SSL_CONNECTION *s);
 
 __owur int ssl_security_cert(SSL_CONNECTION *s, SSL_CTX *ctx, X509 *x, int vfy,
-                             int is_ee);
+    int is_ee);
 __owur int ssl_security_cert_chain(SSL_CONNECTION *s, STACK_OF(X509) *sk,
-                                   X509 *ex, int vfy);
+    X509 *ex, int vfy);
 
 int tls_choose_sigalg(SSL_CONNECTION *s, int fatalerrs);
 
 __owur long ssl_get_algorithm2(SSL_CONNECTION *s);
 __owur int tls12_copy_sigalgs(SSL_CONNECTION *s, WPACKET *pkt,
-                              const uint16_t *psig, size_t psiglen);
+    const uint16_t *psig, size_t psiglen);
 __owur int tls1_save_u16(PACKET *pkt, uint16_t **pdest, size_t *pdestlen);
 __owur int tls1_save_sigalgs(SSL_CONNECTION *s, PACKET *pkt, int cert);
 __owur int tls1_process_sigalgs(SSL_CONNECTION *s);
 __owur int tls1_set_peer_legacy_sigalg(SSL_CONNECTION *s, const EVP_PKEY *pkey);
 __owur int tls1_lookup_md(SSL_CTX *ctx, const SIGALG_LOOKUP *lu,
-                          const EVP_MD **pmd);
+    const EVP_MD **pmd);
 __owur size_t tls12_get_psigalgs(SSL_CONNECTION *s, int sent,
-                                 const uint16_t **psigs);
+    const uint16_t **psigs);
 __owur int tls_check_sigalg_curve(const SSL_CONNECTION *s, int curve);
 __owur int tls12_check_peer_sigalg(SSL_CONNECTION *s, uint16_t, EVP_PKEY *pkey);
 __owur int ssl_set_client_disabled(SSL_CONNECTION *s);
 __owur int ssl_cipher_disabled(const SSL_CONNECTION *s, const SSL_CIPHER *c,
-                               int op, int echde);
+    int op, int echde);
 
 __owur int ssl_handshake_hash(SSL_CONNECTION *s,
-                              unsigned char *out, size_t outlen,
-                              size_t *hashlen);
+    unsigned char *out, size_t outlen,
+    size_t *hashlen);
 __owur const EVP_MD *ssl_md(SSL_CTX *ctx, int idx);
 int ssl_get_md_idx(int md_nid);
 __owur const EVP_MD *ssl_handshake_md(SSL_CONNECTION *s);
 __owur const EVP_MD *ssl_prf_md(SSL_CONNECTION *s);
 
 __owur int ossl_adjust_domain_flags(uint64_t domain_flags,
-                                    uint64_t *p_domain_flags);
+    uint64_t *p_domain_flags);
 
 /*
  * ssl_log_rsa_client_key_exchange logs |premaster| to the SSL_CTX associated
@@ -2951,10 +2943,10 @@ __owur int ossl_adjust_domain_flags(uint64_t domain_flags,
  * |encrypted_premaster|.
  */
 __owur int ssl_log_rsa_client_key_exchange(SSL_CONNECTION *s,
-                                           const uint8_t *encrypted_premaster,
-                                           size_t encrypted_premaster_len,
-                                           const uint8_t *premaster,
-                                           size_t premaster_len);
+    const uint8_t *encrypted_premaster,
+    size_t encrypted_premaster_len,
+    const uint8_t *premaster,
+    size_t premaster_len);
 
 /*
  * ssl_log_secret logs |secret| to the SSL_CTX associated with |ssl|, if
@@ -2962,7 +2954,7 @@ __owur int ssl_log_rsa_client_key_exchange(SSL_CONNECTION *s,
  * the entry with |label|.
  */
 __owur int ssl_log_secret(SSL_CONNECTION *s, const char *label,
-                          const uint8_t *secret, size_t secret_len);
+    const uint8_t *secret, size_t secret_len);
 
 #define MASTER_SECRET_LABEL "CLIENT_RANDOM"
 #define CLIENT_EARLY_LABEL "CLIENT_EARLY_TRAFFIC_SECRET"
@@ -2986,43 +2978,45 @@ __owur int send_certificate_request(SSL_CONNECTION *s);
 /* statem/extensions_cust.c */
 
 custom_ext_method *custom_ext_find(const custom_ext_methods *exts,
-                                   ENDPOINT role, unsigned int ext_type,
-                                   size_t *idx);
+    ENDPOINT role, unsigned int ext_type,
+    size_t *idx);
 
 void custom_ext_init(custom_ext_methods *meths);
 
 int ossl_tls_add_custom_ext_intern(SSL_CTX *ctx, custom_ext_methods *exts,
-                                   ENDPOINT role, 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);
+    ENDPOINT role, 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);
 __owur int custom_ext_parse(SSL_CONNECTION *s, unsigned int context,
-                            unsigned int ext_type,
-                            const unsigned char *ext_data, size_t ext_size,
-                            X509 *x, size_t chainidx);
+    unsigned int ext_type,
+    const unsigned char *ext_data, size_t ext_size,
+    X509 *x, size_t chainidx);
 __owur int custom_ext_add(SSL_CONNECTION *s, int context, WPACKET *pkt, X509 *x,
-                          size_t chainidx, int maxversion);
+    size_t chainidx, int maxversion);
 
 __owur int custom_exts_copy(custom_ext_methods *dst,
-                            const custom_ext_methods *src);
+    const custom_ext_methods *src);
+__owur int custom_exts_copy_conn(custom_ext_methods *dst,
+    const custom_ext_methods *src);
 __owur int custom_exts_copy_flags(custom_ext_methods *dst,
-                                  const custom_ext_methods *src);
+    const custom_ext_methods *src);
 void custom_exts_free(custom_ext_methods *exts);
 
 /* ssl_mcnf.c */
 int ssl_ctx_system_config(SSL_CTX *ctx);
 
 const EVP_CIPHER *ssl_evp_cipher_fetch(OSSL_LIB_CTX *libctx,
-                                       int nid,
-                                       const char *properties);
+    int nid,
+    const char *properties);
 int ssl_evp_cipher_up_ref(const EVP_CIPHER *cipher);
 void ssl_evp_cipher_free(const EVP_CIPHER *cipher);
 const EVP_MD *ssl_evp_md_fetch(OSSL_LIB_CTX *libctx,
-                               int nid,
-                               const char *properties);
+    int nid,
+    const char *properties);
 int ssl_evp_md_up_ref(const EVP_MD *md);
 void ssl_evp_md_free(const EVP_MD *md);
 
@@ -3030,7 +3024,7 @@ void tls_engine_finish(ENGINE *e);
 const EVP_CIPHER *tls_get_cipher_from_engine(int nid);
 const EVP_MD *tls_get_digest_from_engine(int nid);
 int tls_engine_load_ssl_client_cert(SSL_CONNECTION *s, X509 **px509,
-                                    EVP_PKEY **ppkey);
+    EVP_PKEY **ppkey);
 int ssl_hmac_old_new(SSL_HMAC *ret);
 void ssl_hmac_old_free(SSL_HMAC *ctx);
 int ssl_hmac_old_init(SSL_HMAC *ctx, void *key, size_t len, char *md);
@@ -3048,11 +3042,11 @@ int ssl_srp_server_param_with_username_intern(SSL_CONNECTION *s, int *ad);
 
 void ssl_session_calculate_timeout(SSL_SESSION *ss);
 
-# else /* OPENSSL_UNIT_TEST */
+#else /* OPENSSL_UNIT_TEST */
 
-#  define ssl_init_wbio_buffer SSL_test_functions()->p_ssl_init_wbio_buffer
+#define ssl_init_wbio_buffer SSL_test_functions()->p_ssl_init_wbio_buffer
 
-# endif
+#endif
 
 /* Some helper routines to support TSAN operations safely */
 static ossl_unused ossl_inline int ssl_tsan_lock(const SSL_CTX *ctx)
@@ -3072,7 +3066,7 @@ static ossl_unused ossl_inline void ssl_tsan_unlock(const SSL_CTX *ctx)
 }
 
 static ossl_unused ossl_inline void ssl_tsan_counter(const SSL_CTX *ctx,
-                                                     TSAN_QUALIFIER int *stat)
+    TSAN_QUALIFIER int *stat)
 {
     if (ssl_tsan_lock(ctx)) {
         tsan_counter(stat);
@@ -3084,8 +3078,8 @@ int ossl_comp_has_alg(int a);
 size_t ossl_calculate_comp_expansion(int alg, size_t length);
 
 void ossl_ssl_set_custom_record_layer(SSL_CONNECTION *s,
-                                      const OSSL_RECORD_METHOD *meth,
-                                      void *rlarg);
+    const OSSL_RECORD_METHOD *meth,
+    void *rlarg);
 
 long ossl_ctrl_internal(SSL *s, int cmd, long larg, void *parg, int no_quic);
 
@@ -3093,81 +3087,34 @@ long ossl_ctrl_internal(SSL *s, int cmd, long larg, void *parg, int no_quic);
  * Options which no longer have any effect, but which can be implemented
  * as no-ops for QUIC.
  */
-#define OSSL_LEGACY_SSL_OPTIONS                 \
-    (SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG  | \
-     SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER        | \
-     SSL_OP_SSLEAY_080_CLIENT_DH_BUG          | \
-     SSL_OP_TLS_D5_BUG                        | \
-     SSL_OP_TLS_BLOCK_PADDING_BUG             | \
-     SSL_OP_MSIE_SSLV2_RSA_PADDING            | \
-     SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG       | \
-     SSL_OP_MICROSOFT_SESS_ID_BUG             | \
-     SSL_OP_NETSCAPE_CHALLENGE_BUG            | \
-     SSL_OP_PKCS1_CHECK_1                     | \
-     SSL_OP_PKCS1_CHECK_2                     | \
-     SSL_OP_SINGLE_DH_USE                     | \
-     SSL_OP_SINGLE_ECDH_USE                   | \
-     SSL_OP_EPHEMERAL_RSA                     )
+#define OSSL_LEGACY_SSL_OPTIONS \
+    (SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG | SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER | SSL_OP_SSLEAY_080_CLIENT_DH_BUG | SSL_OP_TLS_D5_BUG | SSL_OP_TLS_BLOCK_PADDING_BUG | SSL_OP_MSIE_SSLV2_RSA_PADDING | SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG | SSL_OP_MICROSOFT_SESS_ID_BUG | SSL_OP_NETSCAPE_CHALLENGE_BUG | SSL_OP_PKCS1_CHECK_1 | SSL_OP_PKCS1_CHECK_2 | SSL_OP_SINGLE_DH_USE | SSL_OP_SINGLE_ECDH_USE | SSL_OP_EPHEMERAL_RSA)
 
 /* This option is undefined in public headers with no-dtls1-method. */
 #ifndef SSL_OP_CISCO_ANYCONNECT
-# define SSL_OP_CISCO_ANYCONNECT 0
+#define SSL_OP_CISCO_ANYCONNECT 0
 #endif
 /*
  * Options which are no-ops under QUIC or TLSv1.3 and which are therefore
  * allowed but ignored under QUIC.
  */
-#define OSSL_TLS1_2_OPTIONS                     \
-    (SSL_OP_CRYPTOPRO_TLSEXT_BUG              | \
-     SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS       | \
-     SSL_OP_ALLOW_CLIENT_RENEGOTIATION        | \
-     SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION | \
-     SSL_OP_NO_COMPRESSION                    | \
-     SSL_OP_NO_SSLv3                          | \
-     SSL_OP_NO_TLSv1                          | \
-     SSL_OP_NO_TLSv1_1                        | \
-     SSL_OP_NO_TLSv1_2                        | \
-     SSL_OP_NO_DTLSv1                         | \
-     SSL_OP_NO_DTLSv1_2                       | \
-     SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION | \
-     SSL_OP_CISCO_ANYCONNECT                  | \
-     SSL_OP_NO_RENEGOTIATION                  | \
-     SSL_OP_NO_EXTENDED_MASTER_SECRET         | \
-     SSL_OP_NO_ENCRYPT_THEN_MAC               | \
-     SSL_OP_COOKIE_EXCHANGE                   | \
-     SSL_OP_LEGACY_SERVER_CONNECT             | \
-     SSL_OP_IGNORE_UNEXPECTED_EOF             )
+#define OSSL_TLS1_2_OPTIONS \
+    (SSL_OP_CRYPTOPRO_TLSEXT_BUG | SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS | SSL_OP_ALLOW_CLIENT_RENEGOTIATION | SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION | SSL_OP_NO_COMPRESSION | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 | SSL_OP_NO_DTLSv1 | SSL_OP_NO_DTLSv1_2 | SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION | SSL_OP_CISCO_ANYCONNECT | SSL_OP_NO_RENEGOTIATION | SSL_OP_NO_EXTENDED_MASTER_SECRET | SSL_OP_NO_ENCRYPT_THEN_MAC | SSL_OP_COOKIE_EXCHANGE | SSL_OP_LEGACY_SERVER_CONNECT | SSL_OP_IGNORE_UNEXPECTED_EOF)
 
 /* Total mask of connection-level options permitted or ignored under QUIC. */
-#define OSSL_QUIC_PERMITTED_OPTIONS_CONN        \
-    (OSSL_LEGACY_SSL_OPTIONS                  | \
-     OSSL_TLS1_2_OPTIONS                      | \
-     SSL_OP_CIPHER_SERVER_PREFERENCE          | \
-     SSL_OP_DISABLE_TLSEXT_CA_NAMES           | \
-     SSL_OP_NO_TX_CERTIFICATE_COMPRESSION     | \
-     SSL_OP_NO_RX_CERTIFICATE_COMPRESSION     | \
-     SSL_OP_PRIORITIZE_CHACHA                 | \
-     SSL_OP_NO_QUERY_MTU                      | \
-     SSL_OP_NO_TICKET                         | \
-     SSL_OP_NO_ANTI_REPLAY                    )
+#define OSSL_QUIC_PERMITTED_OPTIONS_CONN \
+    (OSSL_LEGACY_SSL_OPTIONS | OSSL_TLS1_2_OPTIONS | SSL_OP_CIPHER_SERVER_PREFERENCE | SSL_OP_DISABLE_TLSEXT_CA_NAMES | SSL_OP_NO_TX_CERTIFICATE_COMPRESSION | SSL_OP_NO_RX_CERTIFICATE_COMPRESSION | SSL_OP_PRIORITIZE_CHACHA | SSL_OP_NO_QUERY_MTU | SSL_OP_NO_TICKET | SSL_OP_NO_ANTI_REPLAY)
 
 /* Total mask of stream-level options permitted or ignored under QUIC. */
-#define OSSL_QUIC_PERMITTED_OPTIONS_STREAM      \
-    (OSSL_LEGACY_SSL_OPTIONS                  | \
-     OSSL_TLS1_2_OPTIONS                      | \
-     SSL_OP_CLEANSE_PLAINTEXT                 )
+#define OSSL_QUIC_PERMITTED_OPTIONS_STREAM \
+    (OSSL_LEGACY_SSL_OPTIONS | OSSL_TLS1_2_OPTIONS | SSL_OP_CLEANSE_PLAINTEXT)
 
 /* Total mask of options permitted on either connections or streams. */
-#define OSSL_QUIC_PERMITTED_OPTIONS             \
-    (OSSL_QUIC_PERMITTED_OPTIONS_CONN |         \
-     OSSL_QUIC_PERMITTED_OPTIONS_STREAM)
+#define OSSL_QUIC_PERMITTED_OPTIONS \
+    (OSSL_QUIC_PERMITTED_OPTIONS_CONN | OSSL_QUIC_PERMITTED_OPTIONS_STREAM)
 
 /* Total mask of domain flags supported on a QUIC SSL_CTX. */
-#define OSSL_QUIC_SUPPORTED_DOMAIN_FLAGS        \
-    (SSL_DOMAIN_FLAG_SINGLE_THREAD |            \
-     SSL_DOMAIN_FLAG_MULTI_THREAD |             \
-     SSL_DOMAIN_FLAG_THREAD_ASSISTED |          \
-     SSL_DOMAIN_FLAG_BLOCKING |                 \
-     SSL_DOMAIN_FLAG_LEGACY_BLOCKING)
+#define OSSL_QUIC_SUPPORTED_DOMAIN_FLAGS \
+    (SSL_DOMAIN_FLAG_SINGLE_THREAD | SSL_DOMAIN_FLAG_MULTI_THREAD | SSL_DOMAIN_FLAG_THREAD_ASSISTED | SSL_DOMAIN_FLAG_BLOCKING | SSL_DOMAIN_FLAG_LEGACY_BLOCKING)
 
 #endif
diff --git a/ssl/ssl_mcnf.c b/ssl/ssl_mcnf.c
index 06a23344b27d0..14e1f9f5d7b4a 100644
--- a/ssl/ssl_mcnf.c
+++ b/ssl/ssl_mcnf.c
@@ -42,7 +42,7 @@ static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name, int system)
     if (!conf_ssl_name_find(name, &idx)) {
         if (!system)
             ERR_raise_data(ERR_LIB_SSL, SSL_R_INVALID_CONFIGURATION_NAME,
-                           "name=%s", name);
+                "name=%s", name);
         goto err;
     }
     cmds = conf_ssl_get(idx, &name, &cmd_count);
@@ -85,7 +85,7 @@ static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name, int system)
     }
     if (!SSL_CONF_CTX_finish(cctx))
         ++err;
- err:
+err:
     OSSL_LIB_CTX_set0_default(prev_libctx);
     SSL_CONF_CTX_free(cctx);
     return err == 0 || (system && !conf_diagnostics);
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index e833bcdbc3776..17ccb5462fb4a 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -21,10 +21,10 @@
 static int ssl_set_cert(CERT *c, X509 *x509, SSL_CTX *ctx);
 static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey, SSL_CTX *ctx);
 
-#define  SYNTHV1CONTEXT     (SSL_EXT_TLS1_2_AND_BELOW_ONLY \
-                             | SSL_EXT_CLIENT_HELLO \
-                             | SSL_EXT_TLS1_2_SERVER_HELLO \
-                             | SSL_EXT_IGNORE_ON_RESUMPTION)
+#define SYNTHV1CONTEXT (SSL_EXT_TLS1_2_AND_BELOW_ONLY \
+    | SSL_EXT_CLIENT_HELLO                            \
+    | SSL_EXT_TLS1_2_SERVER_HELLO                     \
+    | SSL_EXT_IGNORE_ON_RESUMPTION)
 
 #define NAME_PREFIX1 "SERVERINFO FOR "
 #define NAME_PREFIX2 "SERVERINFOV2 FOR "
@@ -90,7 +90,7 @@ int SSL_use_certificate_file(SSL *ssl, const char *file, int type)
 
         j = ERR_R_PEM_LIB;
         cert = PEM_read_bio_X509(in, &x, sc->default_passwd_callback,
-                                 sc->default_passwd_callback_userdata);
+            sc->default_passwd_callback_userdata);
     } else {
         ERR_raise(ERR_LIB_SSL, SSL_R_BAD_SSL_FILETYPE);
         goto end;
@@ -102,7 +102,7 @@ int SSL_use_certificate_file(SSL *ssl, const char *file, int type)
     }
 
     ret = SSL_use_certificate(ssl, x);
- end:
+end:
     X509_free(x);
     BIO_free(in);
     return ret;
@@ -119,7 +119,7 @@ int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len)
         return 0;
     }
 
-    if (d2i_X509(&x, &d, (long)len)== NULL) {
+    if (d2i_X509(&x, &d, (long)len) == NULL) {
         X509_free(x);
         ERR_raise(ERR_LIB_SSL, ERR_R_ASN1_LIB);
         return 0;
@@ -140,7 +140,7 @@ static int ssl_set_pkey(CERT *c, EVP_PKEY *pkey, SSL_CTX *ctx)
     }
 
     if (c->pkeys[i].x509 != NULL
-            && !X509_check_private_key(c->pkeys[i].x509, pkey))
+        && !X509_check_private_key(c->pkeys[i].x509, pkey))
         return 0;
     if (!EVP_PKEY_up_ref(pkey))
         return 0;
@@ -196,14 +196,14 @@ int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type)
 
         j = ERR_R_PEM_LIB;
         pkey = PEM_read_bio_PrivateKey_ex(in, NULL,
-                                          sc->default_passwd_callback,
-                                          sc->default_passwd_callback_userdata,
-                                          ssl->ctx->libctx,
-                                          ssl->ctx->propq);
+            sc->default_passwd_callback,
+            sc->default_passwd_callback_userdata,
+            ssl->ctx->libctx,
+            ssl->ctx->propq);
     } else if (type == SSL_FILETYPE_ASN1) {
         j = ERR_R_ASN1_LIB;
         pkey = d2i_PrivateKey_ex_bio(in, NULL, ssl->ctx->libctx,
-                                     ssl->ctx->propq);
+            ssl->ctx->propq);
     } else {
         ERR_raise(ERR_LIB_SSL, SSL_R_BAD_SSL_FILETYPE);
         goto end;
@@ -214,13 +214,13 @@ int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type)
     }
     ret = SSL_use_PrivateKey(ssl, pkey);
     EVP_PKEY_free(pkey);
- end:
+end:
     BIO_free(in);
     return ret;
 }
 
 int SSL_use_PrivateKey_ASN1(int type, SSL *ssl, const unsigned char *d,
-                            long len)
+    long len)
 {
     int ret;
     const unsigned char *p;
@@ -228,7 +228,8 @@ int SSL_use_PrivateKey_ASN1(int type, SSL *ssl, const unsigned char *d,
 
     p = d;
     if ((pkey = d2i_PrivateKey_ex(type, NULL, &p, (long)len, ssl->ctx->libctx,
-                                  ssl->ctx->propq)) == NULL) {
+             ssl->ctx->propq))
+        == NULL) {
         ERR_raise(ERR_LIB_SSL, ERR_R_ASN1_LIB);
         return 0;
     }
@@ -341,7 +342,7 @@ int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type)
     } else if (type == SSL_FILETYPE_PEM) {
         j = ERR_R_PEM_LIB;
         cert = PEM_read_bio_X509(in, &x, ctx->default_passwd_callback,
-                                 ctx->default_passwd_callback_userdata);
+            ctx->default_passwd_callback_userdata);
     } else {
         ERR_raise(ERR_LIB_SSL, SSL_R_BAD_SSL_FILETYPE);
         goto end;
@@ -352,7 +353,7 @@ int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type)
     }
 
     ret = SSL_CTX_use_certificate(ctx, x);
- end:
+end:
     X509_free(x);
     BIO_free(in);
     return ret;
@@ -413,9 +414,9 @@ int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type)
     if (type == SSL_FILETYPE_PEM) {
         j = ERR_R_PEM_LIB;
         pkey = PEM_read_bio_PrivateKey_ex(in, NULL,
-                                       ctx->default_passwd_callback,
-                                       ctx->default_passwd_callback_userdata,
-                                       ctx->libctx, ctx->propq);
+            ctx->default_passwd_callback,
+            ctx->default_passwd_callback_userdata,
+            ctx->libctx, ctx->propq);
     } else if (type == SSL_FILETYPE_ASN1) {
         j = ERR_R_ASN1_LIB;
         pkey = d2i_PrivateKey_ex_bio(in, NULL, ctx->libctx, ctx->propq);
@@ -429,13 +430,13 @@ int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type)
     }
     ret = SSL_CTX_use_PrivateKey(ctx, pkey);
     EVP_PKEY_free(pkey);
- end:
+end:
     BIO_free(in);
     return ret;
 }
 
 int SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx,
-                                const unsigned char *d, long len)
+    const unsigned char *d, long len)
 {
     int ret;
     const unsigned char *p;
@@ -443,7 +444,8 @@ int SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx,
 
     p = d;
     if ((pkey = d2i_PrivateKey_ex(type, NULL, &p, (long)len, ctx->libctx,
-                                  ctx->propq)) == NULL) {
+             ctx->propq))
+        == NULL) {
         ERR_raise(ERR_LIB_SSL, ERR_R_ASN1_LIB);
         return 0;
     }
@@ -470,8 +472,8 @@ static int use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file)
     if (ctx == NULL && ssl == NULL)
         return 0;
 
-    ERR_clear_error();          /* clear error stack for
-                                 * SSL_CTX_use_certificate() */
+    ERR_clear_error(); /* clear error stack for
+                        * SSL_CTX_use_certificate() */
 
     if (ctx != NULL) {
         passwd_callback = ctx->default_passwd_callback;
@@ -508,7 +510,8 @@ static int use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file)
         goto end;
     }
     if (PEM_read_bio_X509_AUX(in, &x, passwd_callback,
-                              passwd_callback_userdata) == NULL) {
+            passwd_callback_userdata)
+        == NULL) {
         ERR_raise(ERR_LIB_SSL, ERR_R_PEM_LIB);
         goto end;
     }
@@ -519,8 +522,8 @@ static int use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file)
         ret = SSL_use_certificate(ssl, x);
 
     if (ERR_peek_error() != 0)
-        ret = 0;                /* Key/certificate mismatch doesn't imply
-                                 * ret==0 ... */
+        ret = 0; /* Key/certificate mismatch doesn't imply
+                  * ret==0 ... */
     if (ret) {
         /*
          * If we could set up our certificate, now proceed to the CA
@@ -547,7 +550,8 @@ static int use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file)
                 goto end;
             }
             if (PEM_read_bio_X509(in, &ca, passwd_callback,
-                                  passwd_callback_userdata) != NULL) {
+                    passwd_callback_userdata)
+                != NULL) {
                 if (ctx)
                     r = SSL_CTX_add0_chain_cert(ctx, ca);
                 else
@@ -573,10 +577,10 @@ static int use_certificate_chain_file(SSL_CTX *ctx, SSL *ssl, const char *file)
             && ERR_GET_REASON(err) == PEM_R_NO_START_LINE)
             ERR_clear_error();
         else
-            ret = 0;            /* some real error */
+            ret = 0; /* some real error */
     }
 
- end:
+end:
     X509_free(x);
     BIO_free(in);
     return ret;
@@ -593,10 +597,10 @@ int SSL_use_certificate_chain_file(SSL *ssl, const char *file)
 }
 
 static int serverinfo_find_extension(const unsigned char *serverinfo,
-                                     size_t serverinfo_length,
-                                     unsigned int extension_type,
-                                     const unsigned char **extension_data,
-                                     size_t *extension_length)
+    size_t serverinfo_length,
+    unsigned int extension_type,
+    const unsigned char **extension_data,
+    size_t *extension_length)
 {
     PACKET pkt, data;
 
@@ -614,27 +618,27 @@ static int serverinfo_find_extension(const unsigned char *serverinfo,
 
         /* end of serverinfo */
         if (PACKET_remaining(&pkt) == 0)
-            return 0;           /* Extension not found */
+            return 0; /* Extension not found */
 
         if (!PACKET_get_net_4(&pkt, &context)
-                || !PACKET_get_net_2(&pkt, &type)
-                || !PACKET_get_length_prefixed_2(&pkt, &data))
+            || !PACKET_get_net_2(&pkt, &type)
+            || !PACKET_get_length_prefixed_2(&pkt, &data))
             return -1;
 
         if (type == extension_type) {
             *extension_data = PACKET_data(&data);
             *extension_length = PACKET_remaining(&data);
-            return 1;           /* Success */
+            return 1; /* Success */
         }
     }
     /* Unreachable */
 }
 
 static int serverinfoex_srv_parse_cb(SSL *s, unsigned int ext_type,
-                                     unsigned int context,
-                                     const unsigned char *in,
-                                     size_t inlen, X509 *x, size_t chainidx,
-                                     int *al, void *arg)
+    unsigned int context,
+    const unsigned char *in,
+    size_t inlen, X509 *x, size_t chainidx,
+    int *al, void *arg)
 {
 
     if (inlen != 0) {
@@ -646,18 +650,18 @@ static int serverinfoex_srv_parse_cb(SSL *s, unsigned int ext_type,
 }
 
 static int serverinfo_srv_parse_cb(SSL *s, unsigned int ext_type,
-                                   const unsigned char *in,
-                                   size_t inlen, int *al, void *arg)
+    const unsigned char *in,
+    size_t inlen, int *al, void *arg)
 {
     return serverinfoex_srv_parse_cb(s, ext_type, 0, in, inlen, NULL, 0, al,
-                                     arg);
+        arg);
 }
 
 static int serverinfoex_srv_add_cb(SSL *s, unsigned int ext_type,
-                                   unsigned int context,
-                                   const unsigned char **out,
-                                   size_t *outlen, X509 *x, size_t chainidx,
-                                   int *al, void *arg)
+    unsigned int context,
+    const unsigned char **out,
+    size_t *outlen, X509 *x, size_t chainidx,
+    int *al, void *arg)
 {
     const unsigned char *serverinfo = NULL;
     size_t serverinfo_length = 0;
@@ -674,28 +678,29 @@ static int serverinfoex_srv_add_cb(SSL *s, unsigned int ext_type,
 
     /* Is there serverinfo data for the chosen server cert? */
     if ((ssl_get_server_cert_serverinfo(sc, &serverinfo,
-                                        &serverinfo_length)) != 0) {
+            &serverinfo_length))
+        != 0) {
         /* Find the relevant extension from the serverinfo */
         int retval = serverinfo_find_extension(serverinfo, serverinfo_length,
-                                               ext_type, out, outlen);
+            ext_type, out, outlen);
         if (retval == -1) {
             *al = SSL_AD_INTERNAL_ERROR;
-            return -1;          /* Error */
+            return -1; /* Error */
         }
         if (retval == 0)
-            return 0;           /* No extension found, don't send extension */
-        return 1;               /* Send extension */
+            return 0; /* No extension found, don't send extension */
+        return 1; /* Send extension */
     }
-    return 0;                   /* No serverinfo data found, don't send
-                                 * extension */
+    return 0; /* No serverinfo data found, don't send
+               * extension */
 }
 
 static int serverinfo_srv_add_cb(SSL *s, unsigned int ext_type,
-                                 const unsigned char **out, size_t *outlen,
-                                 int *al, void *arg)
+    const unsigned char **out, size_t *outlen,
+    int *al, void *arg)
 {
     return serverinfoex_srv_add_cb(s, ext_type, 0, out, outlen, NULL, 0, al,
-                                   arg);
+        arg);
 }
 
 /*
@@ -704,8 +709,8 @@ static int serverinfo_srv_add_cb(SSL *s, unsigned int ext_type,
  * the included extensions.
  */
 static int serverinfo_process_buffer(unsigned int version,
-                                     const unsigned char *serverinfo,
-                                     size_t serverinfo_length, SSL_CTX *ctx)
+    const unsigned char *serverinfo,
+    size_t serverinfo_length, SSL_CTX *ctx)
 {
     PACKET pkt;
 
@@ -724,8 +729,8 @@ static int serverinfo_process_buffer(unsigned int version,
         PACKET data;
 
         if ((version == SSL_SERVERINFOV2 && !PACKET_get_net_4(&pkt, &context))
-                || !PACKET_get_net_2(&pkt, &ext_type)
-                || !PACKET_get_length_prefixed_2(&pkt, &data))
+            || !PACKET_get_net_2(&pkt, &ext_type)
+            || !PACKET_get_length_prefixed_2(&pkt, &data))
             return 0;
 
         if (ctx == NULL)
@@ -744,17 +749,17 @@ static int serverinfo_process_buffer(unsigned int version,
          */
         if (version == SSL_SERVERINFOV1 || context == SYNTHV1CONTEXT) {
             if (!SSL_CTX_add_server_custom_ext(ctx, ext_type,
-                                               serverinfo_srv_add_cb,
-                                               NULL, NULL,
-                                               serverinfo_srv_parse_cb,
-                                               NULL))
+                    serverinfo_srv_add_cb,
+                    NULL, NULL,
+                    serverinfo_srv_parse_cb,
+                    NULL))
                 return 0;
         } else {
             if (!SSL_CTX_add_custom_ext(ctx, ext_type, context,
-                                        serverinfoex_srv_add_cb,
-                                        NULL, NULL,
-                                        serverinfoex_srv_parse_cb,
-                                        NULL))
+                    serverinfoex_srv_add_cb,
+                    NULL, NULL,
+                    serverinfoex_srv_parse_cb,
+                    NULL))
                 return 0;
         }
     }
@@ -773,9 +778,9 @@ static size_t extension_append_length(unsigned int version, size_t extension_len
 }
 
 static void extension_append(unsigned int version,
-                             const unsigned char *extension,
-                             const size_t extension_length,
-                             unsigned char *serverinfo)
+    const unsigned char *extension,
+    const size_t extension_length,
+    unsigned char *serverinfo)
 {
     const size_t contextoff = extension_contextoff(version);
 
@@ -791,8 +796,8 @@ static void extension_append(unsigned int version,
 }
 
 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)
 {
     unsigned char *new_serverinfo = NULL;
 
@@ -806,7 +811,7 @@ int SSL_CTX_use_serverinfo_ex(SSL_CTX *ctx, unsigned int version,
          * over the converted serverinfo.
          */
         const size_t sinfo_length = extension_append_length(SSL_SERVERINFOV1,
-                                                            serverinfo_length);
+            serverinfo_length);
         unsigned char *sinfo;
         int ret;
 
@@ -817,13 +822,13 @@ int SSL_CTX_use_serverinfo_ex(SSL_CTX *ctx, unsigned int version,
         extension_append(SSL_SERVERINFOV1, serverinfo, serverinfo_length, sinfo);
 
         ret = SSL_CTX_use_serverinfo_ex(ctx, SSL_SERVERINFOV2, sinfo,
-                                        sinfo_length);
+            sinfo_length);
 
         OPENSSL_free(sinfo);
         return ret;
     }
     if (!serverinfo_process_buffer(version, serverinfo, serverinfo_length,
-                                   NULL)) {
+            NULL)) {
         ERR_raise(ERR_LIB_SSL, SSL_R_INVALID_SERVERINFO_DATA);
         return 0;
     }
@@ -832,7 +837,7 @@ int SSL_CTX_use_serverinfo_ex(SSL_CTX *ctx, unsigned int version,
         return 0;
     }
     new_serverinfo = OPENSSL_realloc(ctx->cert->key->serverinfo,
-                                     serverinfo_length);
+        serverinfo_length);
     if (new_serverinfo == NULL)
         return 0;
     ctx->cert->key->serverinfo = new_serverinfo;
@@ -844,7 +849,7 @@ int SSL_CTX_use_serverinfo_ex(SSL_CTX *ctx, unsigned int version,
      * register callbacks.
      */
     if (!serverinfo_process_buffer(version, serverinfo, serverinfo_length,
-                                   ctx)) {
+            ctx)) {
         ERR_raise(ERR_LIB_SSL, SSL_R_INVALID_SERVERINFO_DATA);
         return 0;
     }
@@ -852,10 +857,10 @@ int SSL_CTX_use_serverinfo_ex(SSL_CTX *ctx, unsigned int version,
 }
 
 int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo,
-                           size_t serverinfo_length)
+    size_t serverinfo_length)
 {
     return SSL_CTX_use_serverinfo_ex(ctx, SSL_SERVERINFOV1, serverinfo,
-                                     serverinfo_length);
+        serverinfo_length);
 }
 
 int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file)
@@ -899,7 +904,7 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file)
             if (num_extensions == 0) {
                 ERR_raise(ERR_LIB_SSL, SSL_R_NO_PEM_EXTENSIONS);
                 goto end;
-            } else              /* End of file, we're done */
+            } else /* End of file, we're done */
                 break;
         }
         /* Check that PEM name starts with "BEGIN SERVERINFO FOR " */
@@ -927,16 +932,16 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file)
         if (version == SSL_SERVERINFOV1) {
             /* 4 byte header: 2 bytes type, 2 bytes len */
             if (extension_length < 4
-                    || (extension[2] << 8) + extension[3]
-                       != extension_length - 4) {
+                || (extension[2] << 8) + extension[3]
+                    != extension_length - 4) {
                 ERR_raise(ERR_LIB_SSL, SSL_R_BAD_DATA);
                 goto end;
             }
         } else {
             /* 8 byte header: 4 bytes context, 2 bytes type, 2 bytes len */
             if (extension_length < 8
-                    || (extension[6] << 8) + extension[7]
-                       != extension_length - 8) {
+                || (extension[6] << 8) + extension[7]
+                    != extension_length - 8) {
                 ERR_raise(ERR_LIB_SSL, SSL_R_BAD_DATA);
                 goto end;
             }
@@ -948,7 +953,7 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file)
             goto end;
         serverinfo = tmp;
         extension_append(version, extension, extension_length,
-                         serverinfo + serverinfo_length);
+            serverinfo + serverinfo_length);
         serverinfo_length += append_length;
 
         OPENSSL_free(name);
@@ -960,8 +965,8 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file)
     }
 
     ret = SSL_CTX_use_serverinfo_ex(ctx, SSL_SERVERINFOV2, serverinfo,
-                                    serverinfo_length);
- end:
+        serverinfo_length);
+end:
     /* SSL_CTX_use_serverinfo makes a local copy of the serverinfo. */
     OPENSSL_free(name);
     OPENSSL_free(header);
@@ -972,7 +977,7 @@ int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file)
 }
 
 static int ssl_set_cert_and_key(SSL *ssl, SSL_CTX *ctx, X509 *x509, EVP_PKEY *privatekey,
-                                STACK_OF(X509) *chain, int override)
+    STACK_OF(X509) *chain, int override)
 {
     int ret = 0;
     size_t i;
@@ -983,8 +988,7 @@ static int ssl_set_cert_and_key(SSL *ssl, SSL_CTX *ctx, X509 *x509, EVP_PKEY *pr
     EVP_PKEY *pubkey = NULL;
     SSL_CONNECTION *sc = NULL;
 
-    if (ctx == NULL &&
-        (sc = SSL_CONNECTION_FROM_SSL(ssl)) == NULL)
+    if (ctx == NULL && (sc = SSL_CONNECTION_FROM_SSL(ssl)) == NULL)
         return 0;
 
     c = sc != NULL ? sc->cert : ctx->cert;
@@ -1040,9 +1044,7 @@ static int ssl_set_cert_and_key(SSL *ssl, SSL_CTX *ctx, X509 *x509, EVP_PKEY *pr
         goto out;
     }
 
-    if (!override && (c->pkeys[i].x509 != NULL
-                      || c->pkeys[i].privatekey != NULL
-                      || c->pkeys[i].chain != NULL)) {
+    if (!override && (c->pkeys[i].x509 != NULL || c->pkeys[i].privatekey != NULL || c->pkeys[i].chain != NULL)) {
         /* No override, and something already there */
         ERR_raise(ERR_LIB_SSL, SSL_R_NOT_REPLACING_CERTIFICATE);
         goto out;
@@ -1056,10 +1058,13 @@ static int ssl_set_cert_and_key(SSL *ssl, SSL_CTX *ctx, X509 *x509, EVP_PKEY *pr
         }
     }
 
-    if (!X509_up_ref(x509))
+    if (!X509_up_ref(x509)) {
+        OSSL_STACK_OF_X509_free(dup_chain);
         goto out;
+    }
 
     if (!EVP_PKEY_up_ref(privatekey)) {
+        OSSL_STACK_OF_X509_free(dup_chain);
         X509_free(x509);
         goto out;
     }
@@ -1076,19 +1081,19 @@ static int ssl_set_cert_and_key(SSL *ssl, SSL_CTX *ctx, X509 *x509, EVP_PKEY *pr
     c->key = &(c->pkeys[i]);
 
     ret = 1;
- out:
+out:
     EVP_PKEY_free(pubkey);
     return ret;
 }
 
 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)
 {
     return ssl_set_cert_and_key(ssl, NULL, x509, privatekey, chain, override);
 }
 
 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)
 {
     return ssl_set_cert_and_key(NULL, ctx, x509, privatekey, chain, override);
 }
diff --git a/ssl/ssl_rsa_legacy.c b/ssl/ssl_rsa_legacy.c
index ce03fcd9907e6..ed95be5af8255 100644
--- a/ssl/ssl_rsa_legacy.c
+++ b/ssl/ssl_rsa_legacy.c
@@ -71,8 +71,8 @@ int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type)
     } else if (type == SSL_FILETYPE_PEM) {
         j = ERR_R_PEM_LIB;
         rsa = PEM_read_bio_RSAPrivateKey(in, NULL,
-                                         SSL_get_default_passwd_cb(ssl),
-                                         SSL_get_default_passwd_cb_userdata(ssl));
+            SSL_get_default_passwd_cb(ssl),
+            SSL_get_default_passwd_cb_userdata(ssl));
     } else {
         ERR_raise(ERR_LIB_SSL, SSL_R_BAD_SSL_FILETYPE);
         goto end;
@@ -83,7 +83,7 @@ int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type)
     }
     ret = SSL_use_RSAPrivateKey(ssl, rsa);
     RSA_free(rsa);
- end:
+end:
     BIO_free(in);
     return ret;
 }
@@ -162,8 +162,8 @@ int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type)
     } else if (type == SSL_FILETYPE_PEM) {
         j = ERR_R_PEM_LIB;
         rsa = PEM_read_bio_RSAPrivateKey(in, NULL,
-                                         SSL_CTX_get_default_passwd_cb(ctx),
-                                         SSL_CTX_get_default_passwd_cb_userdata(ctx));
+            SSL_CTX_get_default_passwd_cb(ctx),
+            SSL_CTX_get_default_passwd_cb_userdata(ctx));
     } else {
         ERR_raise(ERR_LIB_SSL, SSL_R_BAD_SSL_FILETYPE);
         goto end;
@@ -174,13 +174,13 @@ int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type)
     }
     ret = SSL_CTX_use_RSAPrivateKey(ctx, rsa);
     RSA_free(rsa);
- end:
+end:
     BIO_free(in);
     return ret;
 }
 
 int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d,
-                                   long len)
+    long len)
 {
     int ret;
     const unsigned char *p;
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 8e9aa64de5a7a..e54fb53e5294a 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2005 Nokia. All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -9,8 +9,8 @@
  */
 
 #if defined(__TANDEM) && defined(_SPT_MODEL_)
-# include <spthread.h>
-# include <spt_extensions.h> /* timeval */
+#include <spthread.h>
+#include <spt_extensions.h> /* timeval */
 #endif
 #include <stdio.h>
 #include <openssl/rand.h>
@@ -111,8 +111,8 @@ SSL_SESSION *SSL_SESSION_new(void)
         return NULL;
 
     ss->ext.max_fragment_len_mode = TLSEXT_max_fragment_length_UNSPECIFIED;
-    ss->verify_result = 1;      /* avoid 0 (= X509_V_OK) just in case */
-   /* 5 minute timeout by default */
+    ss->verify_result = 1; /* avoid 0 (= X509_V_OK) just in case */
+    /* 5 minute timeout by default */
     ss->timeout = ossl_seconds2time(60 * 5 + 4);
     ss->time = ossl_time_now();
     ssl_session_calculate_timeout(ss);
@@ -218,7 +218,7 @@ static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket)
 #endif
 
     if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_SSL_SESSION,
-                            &dest->ex_data, &src->ex_data)) {
+            &dest->ex_data, &src->ex_data)) {
         ERR_raise(ERR_LIB_SSL, ERR_R_CRYPTO_LIB);
         goto err;
     }
@@ -230,8 +230,7 @@ static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket)
     }
 
     if (ticket != 0 && src->ext.tick != NULL) {
-        dest->ext.tick =
-            OPENSSL_memdup(src->ext.tick, src->ext.ticklen);
+        dest->ext.tick = OPENSSL_memdup(src->ext.tick, src->ext.ticklen);
         if (dest->ext.tick == NULL)
             goto err;
     } else {
@@ -241,7 +240,7 @@ static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket)
 
     if (src->ext.alpn_selected != NULL) {
         dest->ext.alpn_selected = OPENSSL_memdup(src->ext.alpn_selected,
-                                                 src->ext.alpn_selected_len);
+            src->ext.alpn_selected_len);
         if (dest->ext.alpn_selected == NULL)
             goto err;
     }
@@ -255,14 +254,13 @@ static SSL_SESSION *ssl_session_dup_intern(const SSL_SESSION *src, int ticket)
 #endif
 
     if (src->ticket_appdata != NULL) {
-        dest->ticket_appdata =
-            OPENSSL_memdup(src->ticket_appdata, src->ticket_appdata_len);
+        dest->ticket_appdata = OPENSSL_memdup(src->ticket_appdata, src->ticket_appdata_len);
         if (dest->ticket_appdata == NULL)
             goto err;
     }
 
     return dest;
- err:
+err:
     SSL_SESSION_free(dest);
     return NULL;
 }
@@ -296,7 +294,7 @@ const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len)
 }
 
 const unsigned char *SSL_SESSION_get0_id_context(const SSL_SESSION *s,
-                                                unsigned int *len)
+    unsigned int *len)
 {
     if (len != NULL)
         *len = (unsigned int)s->sid_ctx_length;
@@ -321,7 +319,7 @@ unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s)
 
 #define MAX_SESS_ID_ATTEMPTS 10
 static int def_generate_session_id(SSL *ssl, unsigned char *id,
-                                   unsigned int *id_len)
+    unsigned int *id_len)
 {
     unsigned int retry = 0;
     do {
@@ -332,8 +330,7 @@ static int def_generate_session_id(SSL *ssl, unsigned char *id,
             id[0]++;
         }
 #endif
-    } while (SSL_has_matching_session_id(ssl, id, *id_len) &&
-           (++retry < MAX_SESS_ID_ATTEMPTS)) ;
+    } while (SSL_has_matching_session_id(ssl, id, *id_len) && (++retry < MAX_SESS_ID_ATTEMPTS));
     if (retry < MAX_SESS_ID_ATTEMPTS)
         return 1;
     /* else - woops a session_id match */
@@ -396,7 +393,7 @@ int ssl_generate_session_id(SSL_CONNECTION *s, SSL_SESSION *ss)
     if (!CRYPTO_THREAD_read_lock(s->session_ctx->lock)) {
         CRYPTO_THREAD_unlock(ssl->lock);
         SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                 SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED);
+            SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED);
         return 0;
     }
     if (s->generate_session_id)
@@ -411,7 +408,7 @@ int ssl_generate_session_id(SSL_CONNECTION *s, SSL_SESSION *ss)
     if (!cb(ssl, ss->session_id, &tmp)) {
         /* The callback failed */
         SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                 SSL_R_SSL_SESSION_ID_CALLBACK_FAILED);
+            SSL_R_SSL_SESSION_ID_CALLBACK_FAILED);
         return 0;
     }
     /*
@@ -421,13 +418,13 @@ int ssl_generate_session_id(SSL_CONNECTION *s, SSL_SESSION *ss)
     if (tmp == 0 || tmp > ss->session_id_length) {
         /* The callback set an illegal length */
         SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                 SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH);
+            SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH);
         return 0;
     }
     ss->session_id_length = tmp;
     /* Finally, check for a conflict */
     if (SSL_has_matching_session_id(ssl, ss->session_id,
-                                    (unsigned int)ss->session_id_length)) {
+            (unsigned int)ss->session_id_length)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_SSL_SESSION_ID_CONFLICT);
         return 0;
     }
@@ -492,13 +489,14 @@ int ssl_get_new_session(SSL_CONNECTION *s, int session)
 }
 
 SSL_SESSION *lookup_sess_in_cache(SSL_CONNECTION *s,
-                                  const unsigned char *sess_id,
-                                  size_t sess_id_len)
+    const unsigned char *sess_id,
+    size_t sess_id_len)
 {
     SSL_SESSION *ret = NULL;
 
     if ((s->session_ctx->session_cache_mode
-         & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP) == 0) {
+            & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)
+        == 0) {
         SSL_SESSION data;
 
         data.ssl_version = s->version;
@@ -527,7 +525,7 @@ SSL_SESSION *lookup_sess_in_cache(SSL_CONNECTION *s,
         int copy = 1;
 
         ret = s->session_ctx->get_session_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                             sess_id, sess_id_len, &copy);
+            sess_id, sess_id_len, &copy);
 
         if (ret != NULL) {
             if (ret->not_resumable) {
@@ -537,7 +535,7 @@ SSL_SESSION *lookup_sess_in_cache(SSL_CONNECTION *s,
                 return NULL;
             }
             ssl_tsan_counter(s->session_ctx,
-                             &s->session_ctx->stats.sess_cb_hit);
+                &s->session_ctx->stats.sess_cb_hit);
 
             /*
              * Increment reference count now if the session callback asks us
@@ -553,8 +551,7 @@ SSL_SESSION *lookup_sess_in_cache(SSL_CONNECTION *s,
              * Add the externally cached session to the internal cache as
              * well if and only if we are supposed to.
              */
-            if ((s->session_ctx->session_cache_mode &
-                 SSL_SESS_CACHE_NO_INTERNAL_STORE) == 0) {
+            if ((s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_STORE) == 0) {
                 /*
                  * Either return value of SSL_CTX_add_session should not
                  * interrupt the session resumption process. The return
@@ -595,18 +592,21 @@ int ssl_get_prev_session(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello)
     SSL_TICKET_STATUS r;
 
     if (SSL_CONNECTION_IS_TLS13(s)) {
+        SSL_SESSION_free(s->session);
+        s->session = NULL;
         /*
          * By default we will send a new ticket. This can be overridden in the
          * ticket processing.
          */
         s->ext.ticket_expected = 1;
         if (!tls_parse_extension(s, TLSEXT_IDX_psk_kex_modes,
-                                 SSL_EXT_CLIENT_HELLO, hello->pre_proc_exts,
-                                 NULL, 0)
-                || !tls_parse_extension(s, TLSEXT_IDX_psk, SSL_EXT_CLIENT_HELLO,
-                                        hello->pre_proc_exts, NULL, 0))
+                SSL_EXT_CLIENT_HELLO, hello->pre_proc_exts,
+                NULL, 0)
+            || !tls_parse_extension(s, TLSEXT_IDX_psk, SSL_EXT_CLIENT_HELLO,
+                hello->pre_proc_exts, NULL, 0))
             return -1;
 
+        /* If we resumed, s->session will now be set */
         ret = s->session;
     } else {
         /* sets s->ext.ticket_expected */
@@ -622,7 +622,7 @@ int ssl_get_prev_session(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello)
             if (hello->session_id_len > 0) {
                 try_session_cache = 1;
                 ret = lookup_sess_in_cache(s, hello->session_id,
-                                           hello->session_id_len);
+                    hello->session_id_len);
             }
             break;
         case SSL_TICKET_NO_DECRYPT:
@@ -647,7 +647,7 @@ int ssl_get_prev_session(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello)
          * We have the session requested by the client, but we don't want to
          * use it in this context.
          */
-        goto err;               /* treat like cache miss */
+        goto err; /* treat like cache miss */
     }
 
     if ((s->verify_mode & SSL_VERIFY_PEER) && s->sid_ctx_length == 0) {
@@ -662,7 +662,7 @@ int ssl_get_prev_session(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello)
          */
 
         SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                 SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED);
+            SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED);
         fatal = 1;
         goto err;
     }
@@ -680,7 +680,7 @@ int ssl_get_prev_session(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello)
     if (ret->flags & SSL_SESS_FLAG_EXTMS) {
         /* If old session includes extms, but new does not: abort handshake */
         if (!(s->s3.flags & TLS1_FLAGS_RECEIVED_EXTMS)) {
-            SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_INCONSISTENT_EXTMS);
+            SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_INCONSISTENT_EXTMS);
             fatal = 1;
             goto err;
         }
@@ -699,7 +699,7 @@ int ssl_get_prev_session(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello)
     s->verify_result = s->session->verify_result;
     return 1;
 
- err:
+err:
     if (ret != NULL) {
         SSL_SESSION_free(ret);
         /* In TLSv1.3 s->session was already set to ret, so we NULL it out */
@@ -758,8 +758,7 @@ int SSL_CTX_add_session(SSL_CTX *ctx, SSL_SESSION *c)
          * obtain the same session from an external cache)
          */
         s = NULL;
-    } else if (s == NULL &&
-               lh_SSL_SESSION_retrieve(ctx->sessions, c) == NULL) {
+    } else if (s == NULL && lh_SSL_SESSION_retrieve(ctx->sessions, c) == NULL) {
         /* s == NULL can also mean OOM error in lh_SSL_SESSION_insert ... */
 
         /*
@@ -801,7 +800,7 @@ int SSL_CTX_add_session(SSL_CTX *ctx, SSL_SESSION *c)
          * count because it already takes into account the cache
          */
 
-        SSL_SESSION_free(s);    /* s == c */
+        SSL_SESSION_free(s); /* s == c */
         ret = 0;
     }
     CRYPTO_THREAD_unlock(ctx->lock);
@@ -916,11 +915,11 @@ int SSL_set_session(SSL *s, SSL_SESSION *session)
 }
 
 int SSL_SESSION_set1_id(SSL_SESSION *s, const unsigned char *sid,
-                        unsigned int sid_len)
+    unsigned int sid_len)
 {
     if (sid_len > SSL_MAX_SSL_SESSION_ID_LENGTH) {
-      ERR_raise(ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_TOO_LONG);
-      return 0;
+        ERR_raise(ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_TOO_LONG);
+        return 0;
     }
     s->session_id_length = sid_len;
     if (sid != s->session_id && sid_len > 0)
@@ -959,7 +958,7 @@ long SSL_SESSION_get_timeout(const SSL_SESSION *s)
 #ifndef OPENSSL_NO_DEPRECATED_3_4
 long SSL_SESSION_get_time(const SSL_SESSION *s)
 {
-    return (long) SSL_SESSION_get_time_ex(s);
+    return (long)SSL_SESSION_get_time_ex(s);
 }
 #endif
 
@@ -993,7 +992,7 @@ time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t)
 #ifndef OPENSSL_NO_DEPRECATED_3_4
 long SSL_SESSION_set_time(SSL_SESSION *s, long t)
 {
-    return (long) SSL_SESSION_set_time_ex(s, (time_t) t);
+    return (long)SSL_SESSION_set_time_ex(s, (time_t)t);
 }
 #endif
 
@@ -1047,7 +1046,7 @@ 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)
 {
     *len = s->ext.ticklen;
     if (tick != NULL)
@@ -1067,15 +1066,15 @@ int SSL_SESSION_set_max_early_data(SSL_SESSION *s, uint32_t max_early_data)
 }
 
 void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
-                                    const unsigned char **alpn,
-                                    size_t *len)
+    const unsigned char **alpn,
+    size_t *len)
 {
     *alpn = s->ext.alpn_selected;
     *len = s->ext.alpn_selected_len;
 }
 
 int SSL_SESSION_set1_alpn_selected(SSL_SESSION *s, const unsigned char *alpn,
-                                   size_t len)
+    size_t len)
 {
     OPENSSL_free(s->ext.alpn_selected);
     if (alpn == NULL || len == 0) {
@@ -1104,7 +1103,7 @@ EVP_PKEY *SSL_SESSION_get0_peer_rpk(SSL_SESSION *s)
 }
 
 int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,
-                                unsigned int sid_ctx_len)
+    unsigned int sid_ctx_len)
 {
     if (sid_ctx_len > SSL_MAX_SID_CTX_LENGTH) {
         ERR_raise(ERR_LIB_SSL, SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG);
@@ -1124,7 +1123,7 @@ int SSL_SESSION_is_resumable(const SSL_SESSION *s)
      * session ID.
      */
     return !s->not_resumable
-           && (s->session_id_length > 0 || s->ext.ticklen > 0);
+        && (s->session_id_length > 0 || s->ext.ticklen > 0);
 }
 
 long SSL_CTX_set_timeout(SSL_CTX *s, long t)
@@ -1146,8 +1145,8 @@ long SSL_CTX_get_timeout(const SSL_CTX *s)
 }
 
 int SSL_set_session_secret_cb(SSL *s,
-                              tls_session_secret_cb_fn tls_session_secret_cb,
-                              void *arg)
+    tls_session_secret_cb_fn tls_session_secret_cb,
+    void *arg)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
@@ -1160,7 +1159,7 @@ int SSL_set_session_secret_cb(SSL *s,
 }
 
 int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
-                                  void *arg)
+    void *arg)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
@@ -1182,8 +1181,7 @@ int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len)
     if (sc->version >= TLS1_VERSION) {
         OPENSSL_free(sc->ext.session_ticket);
         sc->ext.session_ticket = NULL;
-        sc->ext.session_ticket =
-            OPENSSL_malloc(sizeof(TLS_SESSION_TICKET_EXT) + ext_len);
+        sc->ext.session_ticket = OPENSSL_malloc(sizeof(TLS_SESSION_TICKET_EXT) + ext_len);
         if (sc->ext.session_ticket == NULL)
             return 0;
 
@@ -1205,7 +1203,7 @@ int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len)
 #ifndef OPENSSL_NO_DEPRECATED_3_4
 void SSL_CTX_flush_sessions(SSL_CTX *s, long t)
 {
-    SSL_CTX_flush_sessions_ex(s, (time_t) t);
+    SSL_CTX_flush_sessions_ex(s, (time_t)t);
 }
 #endif
 
@@ -1260,10 +1258,7 @@ void SSL_CTX_flush_sessions_ex(SSL_CTX *s, time_t t)
 
 int ssl_clear_bad_session(SSL_CONNECTION *s)
 {
-    if ((s->session != NULL) &&
-        !(s->shutdown & SSL_SENT_SHUTDOWN) &&
-        !(SSL_in_init(SSL_CONNECTION_GET_SSL(s))
-          || SSL_in_before(SSL_CONNECTION_GET_SSL(s)))) {
+    if ((s->session != NULL) && !(s->shutdown & SSL_SENT_SHUTDOWN) && !(SSL_in_init(SSL_CONNECTION_GET_SSL(s)) || SSL_in_before(SSL_CONNECTION_GET_SSL(s)))) {
         SSL_CTX_remove_session(s->session_ctx, s->session);
         return 1;
     } else
@@ -1335,7 +1330,7 @@ static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s)
              * one session in the cache it will be caught above
              */
             next = ctx->session_cache_head->next;
-            while (next != (SSL_SESSION*)&(ctx->session_cache_tail)) {
+            while (next != (SSL_SESSION *)&(ctx->session_cache_tail)) {
                 if (timeoutcmp(s, next) >= 0) {
                     s->next = next;
                     s->prev = next->prev;
@@ -1351,76 +1346,82 @@ static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s)
 }
 
 void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx,
-                             int (*cb) (struct ssl_st *ssl, SSL_SESSION *sess))
+    int (*cb)(struct ssl_st *ssl, SSL_SESSION *sess))
 {
     ctx->new_session_cb = cb;
 }
 
-int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx)) (SSL *ssl, SSL_SESSION *sess) {
+int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(SSL *ssl, SSL_SESSION *sess)
+{
     return ctx->new_session_cb;
 }
 
 void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx,
-                                void (*cb) (SSL_CTX *ctx, SSL_SESSION *sess))
+    void (*cb)(SSL_CTX *ctx, SSL_SESSION *sess))
 {
     ctx->remove_session_cb = cb;
 }
 
-void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx)) (SSL_CTX *ctx,
-                                                  SSL_SESSION *sess) {
+void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(SSL_CTX *ctx,
+    SSL_SESSION *sess)
+{
     return ctx->remove_session_cb;
 }
 
 void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx,
-                             SSL_SESSION *(*cb) (SSL *ssl,
-                                                 const unsigned char *data,
-                                                 int len, int *copy))
+    SSL_SESSION *(*cb)(SSL *ssl,
+        const unsigned char *data,
+        int len, int *copy))
 {
     ctx->get_session_cb = cb;
 }
 
-SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx)) (SSL *ssl,
-                                                       const unsigned char
-                                                       *data, int len,
-                                                       int *copy) {
+SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(SSL *ssl,
+    const unsigned char
+        *data,
+    int len,
+    int *copy)
+{
     return ctx->get_session_cb;
 }
 
 void SSL_CTX_set_info_callback(SSL_CTX *ctx,
-                               void (*cb) (const SSL *ssl, int type, int val))
+    void (*cb)(const SSL *ssl, int type, int val))
 {
     ctx->info_callback = cb;
 }
 
-void (*SSL_CTX_get_info_callback(SSL_CTX *ctx)) (const SSL *ssl, int type,
-                                                 int val) {
+void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl, int type,
+    int val)
+{
     return ctx->info_callback;
 }
 
 void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx,
-                                int (*cb) (SSL *ssl, X509 **x509,
-                                           EVP_PKEY **pkey))
+    int (*cb)(SSL *ssl, X509 **x509,
+        EVP_PKEY **pkey))
 {
     ctx->client_cert_cb = cb;
 }
 
-int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx)) (SSL *ssl, X509 **x509,
-                                                 EVP_PKEY **pkey) {
+int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL *ssl, X509 **x509,
+    EVP_PKEY **pkey)
+{
     return ctx->client_cert_cb;
 }
 
 void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx,
-                                    int (*cb) (SSL *ssl,
-                                               unsigned char *cookie,
-                                               unsigned int *cookie_len))
+    int (*cb)(SSL *ssl,
+        unsigned char *cookie,
+        unsigned int *cookie_len))
 {
     ctx->app_gen_cookie_cb = cb;
 }
 
 void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx,
-                                  int (*cb) (SSL *ssl,
-                                             const unsigned char *cookie,
-                                             unsigned int cookie_len))
+    int (*cb)(SSL *ssl,
+        const unsigned char *cookie,
+        unsigned int cookie_len))
 {
     ctx->app_verify_cookie_cb = cb;
 }
@@ -1450,18 +1451,18 @@ int SSL_SESSION_get0_ticket_appdata(SSL_SESSION *ss, void **data, size_t *len)
 
 void SSL_CTX_set_stateless_cookie_generate_cb(
     SSL_CTX *ctx,
-    int (*cb) (SSL *ssl,
-               unsigned char *cookie,
-               size_t *cookie_len))
+    int (*cb)(SSL *ssl,
+        unsigned char *cookie,
+        size_t *cookie_len))
 {
     ctx->gen_stateless_cookie_cb = cb;
 }
 
 void SSL_CTX_set_stateless_cookie_verify_cb(
     SSL_CTX *ctx,
-    int (*cb) (SSL *ssl,
-               const unsigned char *cookie,
-               size_t cookie_len))
+    int (*cb)(SSL *ssl,
+        const unsigned char *cookie,
+        size_t cookie_len))
 {
     ctx->verify_stateless_cookie_cb = cb;
 }
diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c
index d928cb9bbd6fa..aeb03bfeb2bd3 100644
--- a/ssl/ssl_txt.c
+++ b/ssl/ssl_txt.c
@@ -49,17 +49,20 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
     if (x->cipher == NULL) {
         if (((x->cipher_id) & 0xff000000) == 0x02000000) {
             if (BIO_printf(bp, "    Cipher    : %06lX\n",
-                           x->cipher_id & 0xffffff) <= 0)
+                    x->cipher_id & 0xffffff)
+                <= 0)
                 goto err;
         } else {
             if (BIO_printf(bp, "    Cipher    : %04lX\n",
-                           x->cipher_id & 0xffff) <= 0)
+                    x->cipher_id & 0xffff)
+                <= 0)
                 goto err;
         }
     } else {
         if (BIO_printf(bp, "    Cipher    : %s\n",
-                       ((x->cipher->name == NULL) ? "unknown"
-                                                  : x->cipher->name)) <= 0)
+                ((x->cipher->name == NULL) ? "unknown"
+                                           : x->cipher->name))
+            <= 0)
             goto err;
     }
     if (BIO_puts(bp, "    Session-ID: ") <= 0)
@@ -90,8 +93,7 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
         goto err;
     if (BIO_puts(bp, "\n    PSK identity hint: ") <= 0)
         goto err;
-    if (BIO_printf
-        (bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") <= 0)
+    if (BIO_printf(bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") <= 0)
         goto err;
 #endif
 #ifndef OPENSSL_NO_SRP
@@ -102,15 +104,15 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
 #endif
     if (x->ext.tick_lifetime_hint) {
         if (BIO_printf(bp,
-                       "\n    TLS session ticket lifetime hint: %ld (seconds)",
-                       x->ext.tick_lifetime_hint) <= 0)
+                "\n    TLS session ticket lifetime hint: %ld (seconds)",
+                x->ext.tick_lifetime_hint)
+            <= 0)
             goto err;
     }
     if (x->ext.tick) {
         if (BIO_puts(bp, "\n    TLS session ticket:\n") <= 0)
             goto err;
-        if (BIO_dump_indent
-            (bp, (const char *)x->ext.tick, (int)x->ext.ticklen, 4)
+        if (BIO_dump_indent(bp, (const char *)x->ext.tick, (int)x->ext.ticklen, 4)
             <= 0)
             goto err;
     }
@@ -125,19 +127,22 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
                 goto err;
         } else {
             if (BIO_printf(bp, "\n    Compression: %d (%s)", comp->id,
-                           comp->name) <= 0)
+                    comp->name)
+                <= 0)
                 goto err;
         }
     }
 #endif
     if (!ossl_time_is_zero(x->time)) {
         if (BIO_printf(bp, "\n    Start Time: %lld",
-                       (long long)ossl_time_to_time_t(x->time)) <= 0)
+                (long long)ossl_time_to_time_t(x->time))
+            <= 0)
             goto err;
     }
     if (!ossl_time_is_zero(x->timeout)) {
         if (BIO_printf(bp, "\n    Timeout   : %lld (sec)",
-                       (long long)ossl_time2seconds(x->timeout)) <= 0)
+                (long long)ossl_time2seconds(x->timeout))
+            <= 0)
             goto err;
     }
     if (BIO_puts(bp, "\n") <= 0)
@@ -146,21 +151,24 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
     if (BIO_puts(bp, "    Verify return code: ") <= 0)
         goto err;
     if (BIO_printf(bp, "%ld (%s)\n", x->verify_result,
-                   X509_verify_cert_error_string(x->verify_result)) <= 0)
+            X509_verify_cert_error_string(x->verify_result))
+        <= 0)
         goto err;
 
     if (BIO_printf(bp, "    Extended master secret: %s\n",
-                   x->flags & SSL_SESS_FLAG_EXTMS ? "yes" : "no") <= 0)
+            x->flags & SSL_SESS_FLAG_EXTMS ? "yes" : "no")
+        <= 0)
         goto err;
 
     if (istls13) {
         if (BIO_printf(bp, "    Max Early Data: %u\n",
-                       (unsigned int)x->ext.max_early_data) <= 0)
+                (unsigned int)x->ext.max_early_data)
+            <= 0)
             goto err;
     }
 
     return 1;
- err:
+err:
     return 0;
 }
 
@@ -201,6 +209,6 @@ int SSL_SESSION_print_keylog(BIO *bp, const SSL_SESSION *x)
         goto err;
 
     return 1;
- err:
+err:
     return 0;
 }
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 1e0dc7b05592b..2de540f828f03 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -8,8 +8,8 @@
  */
 
 #if defined(__TANDEM) && defined(_SPT_MODEL_)
-# include <spthread.h>
-# include <spt_extensions.h> /* timeval */
+#include <spthread.h>
+#include <spt_extensions.h> /* timeval */
 #endif
 
 #include <string.h>
@@ -23,7 +23,7 @@ static int final_renegotiate(SSL_CONNECTION *s, unsigned int context, int sent);
 static int init_server_name(SSL_CONNECTION *s, unsigned int context);
 static int final_server_name(SSL_CONNECTION *s, unsigned int context, int sent);
 static int final_ec_pt_formats(SSL_CONNECTION *s, unsigned int context,
-                               int sent);
+    int sent);
 static int init_session_ticket(SSL_CONNECTION *s, unsigned int context);
 #ifndef OPENSSL_NO_OCSP
 static int init_status_request(SSL_CONNECTION *s, unsigned int context);
@@ -38,15 +38,15 @@ static int init_sig_algs(SSL_CONNECTION *s, unsigned int context);
 static int init_server_cert_type(SSL_CONNECTION *sc, unsigned int context);
 static int init_client_cert_type(SSL_CONNECTION *sc, unsigned int context);
 static int init_certificate_authorities(SSL_CONNECTION *s,
-                                        unsigned int context);
+    unsigned int context);
 static EXT_RETURN tls_construct_certificate_authorities(SSL_CONNECTION *s,
-                                                        WPACKET *pkt,
-                                                        unsigned int context,
-                                                        X509 *x,
-                                                        size_t chainidx);
+    WPACKET *pkt,
+    unsigned int context,
+    X509 *x,
+    size_t chainidx);
 static int tls_parse_certificate_authorities(SSL_CONNECTION *s, PACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 #ifndef OPENSSL_NO_SRP
 static int init_srp(SSL_CONNECTION *s, unsigned int context);
 #endif
@@ -61,19 +61,19 @@ static int init_srtp(SSL_CONNECTION *s, unsigned int context);
 #endif
 static int final_sig_algs(SSL_CONNECTION *s, unsigned int context, int sent);
 static int final_supported_versions(SSL_CONNECTION *s, unsigned int context,
-                                    int sent);
+    int sent);
 static int final_early_data(SSL_CONNECTION *s, unsigned int context, int sent);
 static int final_maxfragmentlen(SSL_CONNECTION *s, unsigned int context,
-                                int sent);
+    int sent);
 static int init_post_handshake_auth(SSL_CONNECTION *s, unsigned int context);
 static int final_psk(SSL_CONNECTION *s, unsigned int context, int sent);
 static int tls_init_compress_certificate(SSL_CONNECTION *sc, unsigned int context);
 static EXT_RETURN tls_construct_compress_certificate(SSL_CONNECTION *sc, WPACKET *pkt,
-                                                     unsigned int context,
-                                                     X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 static int tls_parse_compress_certificate(SSL_CONNECTION *sc, PACKET *pkt,
-                                          unsigned int context,
-                                          X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 
 /* Structure to define a built-in extension */
 typedef struct extensions_definition_st {
@@ -91,18 +91,18 @@ typedef struct extensions_definition_st {
     int (*init)(SSL_CONNECTION *s, unsigned int context);
     /* Parse extension sent from client to server */
     int (*parse_ctos)(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                      X509 *x, size_t chainidx);
+        X509 *x, size_t chainidx);
     /* Parse extension send from server to client */
     int (*parse_stoc)(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                      X509 *x, size_t chainidx);
+        X509 *x, size_t chainidx);
     /* Construct extension sent from server to client */
     EXT_RETURN (*construct_stoc)(SSL_CONNECTION *s, WPACKET *pkt,
-                                 unsigned int context,
-                                 X509 *x, size_t chainidx);
+        unsigned int context,
+        X509 *x, size_t chainidx);
     /* Construct extension sent from client to server */
     EXT_RETURN (*construct_ctos)(SSL_CONNECTION *s, WPACKET *pkt,
-                                 unsigned int context,
-                                 X509 *x, size_t chainidx);
+        unsigned int context,
+        X509 *x, size_t chainidx);
     /*
      * Finalise extension after parsing. Always called where an extensions was
      * initialised even if the extension was not present. |sent| is set to 1 if
@@ -140,296 +140,246 @@ typedef struct extensions_definition_st {
  */
 #define INVALID_EXTENSION { TLSEXT_TYPE_invalid, 0, NULL, NULL, NULL, NULL, NULL, NULL }
 static const EXTENSION_DEFINITION ext_defs[] = {
-    {
-        TLSEXT_TYPE_renegotiate,
+    { TLSEXT_TYPE_renegotiate,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_SSL3_ALLOWED | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
+            | SSL_EXT_SSL3_ALLOWED | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
         NULL, tls_parse_ctos_renegotiate, tls_parse_stoc_renegotiate,
         tls_construct_stoc_renegotiate, tls_construct_ctos_renegotiate,
-        final_renegotiate
-    },
-    {
-        TLSEXT_TYPE_server_name,
+        final_renegotiate },
+    { TLSEXT_TYPE_server_name,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
+            | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
         init_server_name,
         tls_parse_ctos_server_name, tls_parse_stoc_server_name,
         tls_construct_stoc_server_name, tls_construct_ctos_server_name,
-        final_server_name
-    },
-    {
-        TLSEXT_TYPE_max_fragment_length,
+        final_server_name },
+    { TLSEXT_TYPE_max_fragment_length,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
+            | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
         NULL, tls_parse_ctos_maxfragmentlen, tls_parse_stoc_maxfragmentlen,
         tls_construct_stoc_maxfragmentlen, tls_construct_ctos_maxfragmentlen,
-        final_maxfragmentlen
-    },
+        final_maxfragmentlen },
 #ifndef OPENSSL_NO_SRP
-    {
-        TLSEXT_TYPE_srp,
+    { TLSEXT_TYPE_srp,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
-        init_srp, tls_parse_ctos_srp, NULL, NULL, tls_construct_ctos_srp, NULL
-    },
+        init_srp, tls_parse_ctos_srp, NULL, NULL, tls_construct_ctos_srp, NULL },
 #else
     INVALID_EXTENSION,
 #endif
-    {
-        TLSEXT_TYPE_ec_point_formats,
+    { TLSEXT_TYPE_ec_point_formats,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
+            | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
         init_ec_point_formats, tls_parse_ctos_ec_pt_formats, tls_parse_stoc_ec_pt_formats,
         tls_construct_stoc_ec_pt_formats, tls_construct_ctos_ec_pt_formats,
-        final_ec_pt_formats
-    },
-    {
-        /*
-         * "supported_groups" is spread across several specifications.
-         * It was originally specified as "elliptic_curves" in RFC 4492,
-         * and broadened to include named FFDH groups by RFC 7919.
-         * Both RFCs 4492 and 7919 do not include a provision for the server
-         * to indicate to the client the complete list of groups supported
-         * by the server, with the server instead just indicating the
-         * selected group for this connection in the ServerKeyExchange
-         * message.  TLS 1.3 adds a scheme for the server to indicate
-         * to the client its list of supported groups in the
-         * EncryptedExtensions message, but none of the relevant
-         * specifications permit sending supported_groups in the ServerHello.
-         * Nonetheless (possibly due to the close proximity to the
-         * "ec_point_formats" extension, which is allowed in the ServerHello),
-         * there are several servers that send this extension in the
-         * ServerHello anyway.  Up to and including the 1.1.0 release,
-         * we did not check for the presence of nonpermitted extensions,
-         * so to avoid a regression, we must permit this extension in the
-         * TLS 1.2 ServerHello as well.
-         *
-         * Note that there is no tls_parse_stoc_supported_groups function,
-         * so we do not perform any additional parsing, validation, or
-         * processing on the server's group list -- this is just a minimal
-         * change to preserve compatibility with these misbehaving servers.
-         */
+        final_ec_pt_formats },
+    { /*
+       * "supported_groups" is spread across several specifications.
+       * It was originally specified as "elliptic_curves" in RFC 4492,
+       * and broadened to include named FFDH groups by RFC 7919.
+       * Both RFCs 4492 and 7919 do not include a provision for the server
+       * to indicate to the client the complete list of groups supported
+       * by the server, with the server instead just indicating the
+       * selected group for this connection in the ServerKeyExchange
+       * message.  TLS 1.3 adds a scheme for the server to indicate
+       * to the client its list of supported groups in the
+       * EncryptedExtensions message, but none of the relevant
+       * specifications permit sending supported_groups in the ServerHello.
+       * Nonetheless (possibly due to the close proximity to the
+       * "ec_point_formats" extension, which is allowed in the ServerHello),
+       * there are several servers that send this extension in the
+       * ServerHello anyway.  Up to and including the 1.1.0 release,
+       * we did not check for the presence of nonpermitted extensions,
+       * so to avoid a regression, we must permit this extension in the
+       * TLS 1.2 ServerHello as well.
+       *
+       * Note that there is no tls_parse_stoc_supported_groups function,
+       * so we do not perform any additional parsing, validation, or
+       * processing on the server's group list -- this is just a minimal
+       * change to preserve compatibility with these misbehaving servers.
+       */
         TLSEXT_TYPE_supported_groups,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS
-        | SSL_EXT_TLS1_2_SERVER_HELLO,
+            | SSL_EXT_TLS1_2_SERVER_HELLO,
         NULL, tls_parse_ctos_supported_groups, NULL,
         tls_construct_stoc_supported_groups,
-        tls_construct_ctos_supported_groups, NULL
-    },
-    {
-        TLSEXT_TYPE_session_ticket,
+        tls_construct_ctos_supported_groups, NULL },
+    { TLSEXT_TYPE_session_ticket,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
+            | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
         init_session_ticket, tls_parse_ctos_session_ticket,
         tls_parse_stoc_session_ticket, tls_construct_stoc_session_ticket,
-        tls_construct_ctos_session_ticket, NULL
-    },
+        tls_construct_ctos_session_ticket, NULL },
 #ifndef OPENSSL_NO_OCSP
-    {
-        TLSEXT_TYPE_status_request,
+    { TLSEXT_TYPE_status_request,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_3_CERTIFICATE | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
+            | SSL_EXT_TLS1_3_CERTIFICATE | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
         init_status_request, tls_parse_ctos_status_request,
         tls_parse_stoc_status_request, tls_construct_stoc_status_request,
-        tls_construct_ctos_status_request, NULL
-    },
+        tls_construct_ctos_status_request, NULL },
 #else
     INVALID_EXTENSION,
 #endif
 #ifndef OPENSSL_NO_NEXTPROTONEG
-    {
-        TLSEXT_TYPE_next_proto_neg,
+    { TLSEXT_TYPE_next_proto_neg,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
+            | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
         init_npn, tls_parse_ctos_npn, tls_parse_stoc_npn,
-        tls_construct_stoc_next_proto_neg, tls_construct_ctos_npn, NULL
-    },
+        tls_construct_stoc_next_proto_neg, tls_construct_ctos_npn, NULL },
 #else
     INVALID_EXTENSION,
 #endif
-    {
-        /*
-         * Must appear in this list after server_name so that finalisation
-         * happens after server_name callbacks
-         */
+    { /*
+       * Must appear in this list after server_name so that finalisation
+       * happens after server_name callbacks
+       */
         TLSEXT_TYPE_application_layer_protocol_negotiation,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
+            | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
         init_alpn, tls_parse_ctos_alpn, tls_parse_stoc_alpn,
-        tls_construct_stoc_alpn, tls_construct_ctos_alpn, final_alpn
-    },
+        tls_construct_stoc_alpn, tls_construct_ctos_alpn, final_alpn },
 #ifndef OPENSSL_NO_SRTP
-    {
-        TLSEXT_TYPE_use_srtp,
+    { TLSEXT_TYPE_use_srtp,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS | SSL_EXT_DTLS_ONLY,
+            | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS | SSL_EXT_DTLS_ONLY,
         init_srtp, tls_parse_ctos_use_srtp, tls_parse_stoc_use_srtp,
-        tls_construct_stoc_use_srtp, tls_construct_ctos_use_srtp, NULL
-    },
+        tls_construct_stoc_use_srtp, tls_construct_ctos_use_srtp, NULL },
 #else
     INVALID_EXTENSION,
 #endif
-    {
-        TLSEXT_TYPE_encrypt_then_mac,
+    { TLSEXT_TYPE_encrypt_then_mac,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
+            | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
         init_etm, tls_parse_ctos_etm, tls_parse_stoc_etm,
-        tls_construct_stoc_etm, tls_construct_ctos_etm, NULL
-    },
+        tls_construct_stoc_etm, tls_construct_ctos_etm, NULL },
 #ifndef OPENSSL_NO_CT
-    {
-        TLSEXT_TYPE_signed_certificate_timestamp,
+    { TLSEXT_TYPE_signed_certificate_timestamp,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_3_CERTIFICATE | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
+            | SSL_EXT_TLS1_3_CERTIFICATE | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
         NULL,
         /*
          * No server side support for this, but can be provided by a custom
          * extension. This is an exception to the rule that custom extensions
          * cannot override built in ones.
          */
-        NULL, tls_parse_stoc_sct, NULL, tls_construct_ctos_sct,  NULL
-    },
+        NULL, tls_parse_stoc_sct, NULL, tls_construct_ctos_sct, NULL },
 #else
     INVALID_EXTENSION,
 #endif
-    {
-        TLSEXT_TYPE_extended_master_secret,
+    { TLSEXT_TYPE_extended_master_secret,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
+            | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
         init_ems, tls_parse_ctos_ems, tls_parse_stoc_ems,
-        tls_construct_stoc_ems, tls_construct_ctos_ems, final_ems
-    },
-    {
-        TLSEXT_TYPE_signature_algorithms_cert,
+        tls_construct_stoc_ems, tls_construct_ctos_ems, final_ems },
+    { TLSEXT_TYPE_signature_algorithms_cert,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
         init_sig_algs_cert, tls_parse_ctos_sig_algs_cert,
         tls_parse_ctos_sig_algs_cert,
         /* We do not generate signature_algorithms_cert at present. */
-        NULL, NULL, NULL
-    },
+        NULL, NULL, NULL },
     {
         TLSEXT_TYPE_post_handshake_auth,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_ONLY,
         init_post_handshake_auth,
-        tls_parse_ctos_post_handshake_auth, NULL,
-        NULL, tls_construct_ctos_post_handshake_auth,
+        tls_parse_ctos_post_handshake_auth,
+        NULL,
+        NULL,
+        tls_construct_ctos_post_handshake_auth,
         NULL,
     },
-    {
-        TLSEXT_TYPE_client_cert_type,
+    { TLSEXT_TYPE_client_cert_type,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS
-        | SSL_EXT_TLS1_2_SERVER_HELLO,
+            | SSL_EXT_TLS1_2_SERVER_HELLO,
         init_client_cert_type,
         tls_parse_ctos_client_cert_type, tls_parse_stoc_client_cert_type,
         tls_construct_stoc_client_cert_type, tls_construct_ctos_client_cert_type,
-        NULL
-    },
-    {
-        TLSEXT_TYPE_server_cert_type,
+        NULL },
+    { TLSEXT_TYPE_server_cert_type,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS
-        | SSL_EXT_TLS1_2_SERVER_HELLO,
+            | SSL_EXT_TLS1_2_SERVER_HELLO,
         init_server_cert_type,
         tls_parse_ctos_server_cert_type, tls_parse_stoc_server_cert_type,
         tls_construct_stoc_server_cert_type, tls_construct_ctos_server_cert_type,
-        NULL
-    },
-    {
-        TLSEXT_TYPE_signature_algorithms,
+        NULL },
+    { TLSEXT_TYPE_signature_algorithms,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
         init_sig_algs, tls_parse_ctos_sig_algs,
         tls_parse_ctos_sig_algs, tls_construct_ctos_sig_algs,
-        tls_construct_ctos_sig_algs, final_sig_algs
-    },
-    {
-        TLSEXT_TYPE_supported_versions,
+        tls_construct_ctos_sig_algs, final_sig_algs },
+    { TLSEXT_TYPE_supported_versions,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_SERVER_HELLO
-        | SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST | SSL_EXT_TLS_IMPLEMENTATION_ONLY,
+            | SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST | SSL_EXT_TLS_IMPLEMENTATION_ONLY,
         NULL,
         /* Processed inline as part of version selection */
         NULL, tls_parse_stoc_supported_versions,
         tls_construct_stoc_supported_versions,
-        tls_construct_ctos_supported_versions, final_supported_versions
-    },
-    {
-        TLSEXT_TYPE_psk_kex_modes,
+        tls_construct_ctos_supported_versions, final_supported_versions },
+    { TLSEXT_TYPE_psk_kex_modes,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS_IMPLEMENTATION_ONLY
-        | SSL_EXT_TLS1_3_ONLY,
+            | SSL_EXT_TLS1_3_ONLY,
         init_psk_kex_modes, tls_parse_ctos_psk_kex_modes, NULL, NULL,
-        tls_construct_ctos_psk_kex_modes, NULL
-    },
-    {
-        /*
-         * Must be in this list after supported_groups. We need that to have
-         * been parsed before we do this one.
-         */
+        tls_construct_ctos_psk_kex_modes, NULL },
+    { /*
+       * Must be in this list after supported_groups. We need that to have
+       * been parsed before we do this one.
+       */
         TLSEXT_TYPE_key_share,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_SERVER_HELLO
-        | SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST | SSL_EXT_TLS_IMPLEMENTATION_ONLY
-        | SSL_EXT_TLS1_3_ONLY,
+            | SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST | SSL_EXT_TLS_IMPLEMENTATION_ONLY
+            | SSL_EXT_TLS1_3_ONLY,
         NULL, tls_parse_ctos_key_share, tls_parse_stoc_key_share,
         tls_construct_stoc_key_share, tls_construct_ctos_key_share,
-        final_key_share
-    },
-    {
-        /* Must be after key_share */
+        final_key_share },
+    { /* Must be after key_share */
         TLSEXT_TYPE_cookie,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST
-        | SSL_EXT_TLS_IMPLEMENTATION_ONLY | SSL_EXT_TLS1_3_ONLY,
+            | SSL_EXT_TLS_IMPLEMENTATION_ONLY | SSL_EXT_TLS1_3_ONLY,
         NULL, tls_parse_ctos_cookie, tls_parse_stoc_cookie,
-        tls_construct_stoc_cookie, tls_construct_ctos_cookie, NULL
-    },
-    {
-        /*
-         * Special unsolicited ServerHello extension only used when
-         * SSL_OP_CRYPTOPRO_TLSEXT_BUG is set. We allow it in a ClientHello but
-         * ignore it.
-         */
+        tls_construct_stoc_cookie, tls_construct_ctos_cookie, NULL },
+    { /*
+       * Special unsolicited ServerHello extension only used when
+       * SSL_OP_CRYPTOPRO_TLSEXT_BUG is set. We allow it in a ClientHello but
+       * ignore it.
+       */
         TLSEXT_TYPE_cryptopro_bug,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
-        NULL, NULL, NULL, tls_construct_stoc_cryptopro_bug, NULL, NULL
-    },
-    {
-        TLSEXT_TYPE_compress_certificate,
+            | SSL_EXT_TLS1_2_AND_BELOW_ONLY,
+        NULL, NULL, NULL, tls_construct_stoc_cryptopro_bug, NULL, NULL },
+    { TLSEXT_TYPE_compress_certificate,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST
-        | SSL_EXT_TLS_IMPLEMENTATION_ONLY | SSL_EXT_TLS1_3_ONLY,
+            | SSL_EXT_TLS_IMPLEMENTATION_ONLY | SSL_EXT_TLS1_3_ONLY,
         tls_init_compress_certificate,
         tls_parse_compress_certificate, tls_parse_compress_certificate,
         tls_construct_compress_certificate, tls_construct_compress_certificate,
-        NULL
-    },
-    {
-        TLSEXT_TYPE_early_data,
+        NULL },
+    { TLSEXT_TYPE_early_data,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS
-        | SSL_EXT_TLS1_3_NEW_SESSION_TICKET | SSL_EXT_TLS1_3_ONLY,
+            | SSL_EXT_TLS1_3_NEW_SESSION_TICKET | SSL_EXT_TLS1_3_ONLY,
         NULL, tls_parse_ctos_early_data, tls_parse_stoc_early_data,
         tls_construct_stoc_early_data, tls_construct_ctos_early_data,
-        final_early_data
-    },
+        final_early_data },
     {
         TLSEXT_TYPE_certificate_authorities,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST
-        | SSL_EXT_TLS1_3_ONLY,
+            | SSL_EXT_TLS1_3_ONLY,
         init_certificate_authorities,
-        tls_parse_certificate_authorities, tls_parse_certificate_authorities,
+        tls_parse_certificate_authorities,
+        tls_parse_certificate_authorities,
+        tls_construct_certificate_authorities,
         tls_construct_certificate_authorities,
-        tls_construct_certificate_authorities, NULL,
+        NULL,
     },
-    {
-        /* Must be immediately before pre_shared_key */
+    { /* Must be immediately before pre_shared_key */
         TLSEXT_TYPE_padding,
         SSL_EXT_CLIENT_HELLO,
         NULL,
         /* We send this, but don't read it */
-        NULL, NULL, NULL, tls_construct_ctos_padding, NULL
-    },
-    {
-        /* Required by the TLSv1.3 spec to always be the last extension */
+        NULL, NULL, NULL, tls_construct_ctos_padding, NULL },
+    { /* Required by the TLSv1.3 spec to always be the last extension */
         TLSEXT_TYPE_psk,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_SERVER_HELLO
-        | SSL_EXT_TLS_IMPLEMENTATION_ONLY | SSL_EXT_TLS1_3_ONLY,
+            | SSL_EXT_TLS_IMPLEMENTATION_ONLY | SSL_EXT_TLS1_3_ONLY,
         NULL, tls_parse_ctos_psk, tls_parse_stoc_psk, tls_construct_stoc_psk,
-        tls_construct_ctos_psk, final_psk
-    }
+        tls_construct_ctos_psk, final_psk }
 };
 
 /* Returns a TLSEXT_TYPE for the given index */
@@ -445,7 +395,7 @@ unsigned int ossl_get_extension_type(size_t idx)
 
 /* Check whether an extension's context matches the current context */
 static int validate_context(SSL_CONNECTION *s, unsigned int extctx,
-                            unsigned int thisctx)
+    unsigned int thisctx)
 {
     /* Check we're allowed to use this extension in this context */
     if ((thisctx & extctx) == 0)
@@ -462,7 +412,7 @@ static int validate_context(SSL_CONNECTION *s, unsigned int extctx,
 }
 
 int tls_validate_all_contexts(SSL_CONNECTION *s, unsigned int thisctx,
-                              RAW_EXTENSION *exts)
+    RAW_EXTENSION *exts)
 {
     size_t i, num_exts, builtin_num = OSSL_NELEM(ext_defs), offset;
     RAW_EXTENSION *thisext;
@@ -487,7 +437,7 @@ int tls_validate_all_contexts(SSL_CONNECTION *s, unsigned int thisctx,
             custom_ext_method *meth = NULL;
 
             meth = custom_ext_find(&s->cert->custext, role, thisext->type,
-                                   &offset);
+                &offset);
             if (!ossl_assert(meth != NULL))
                 return 0;
             context = meth->context;
@@ -507,8 +457,8 @@ int tls_validate_all_contexts(SSL_CONNECTION *s, unsigned int thisctx,
  * the definition for the extension we found.
  */
 static int verify_extension(SSL_CONNECTION *s, unsigned int context,
-                            unsigned int type, custom_ext_methods *meths,
-                            RAW_EXTENSION *rawexlist, RAW_EXTENSION **found)
+    unsigned int type, custom_ext_methods *meths,
+    RAW_EXTENSION *rawexlist, RAW_EXTENSION **found)
 {
     size_t i;
     size_t builtin_num = OSSL_NELEM(ext_defs);
@@ -555,7 +505,7 @@ static int verify_extension(SSL_CONNECTION *s, unsigned int context,
  * 1 if the extension is relevant for this context, and 0 otherwise
  */
 int extension_is_relevant(SSL_CONNECTION *s, unsigned int extctx,
-                          unsigned int thisctx)
+    unsigned int thisctx)
 {
     int is_tls13;
 
@@ -569,22 +519,22 @@ int extension_is_relevant(SSL_CONNECTION *s, unsigned int extctx,
         is_tls13 = SSL_CONNECTION_IS_TLS13(s);
 
     if ((SSL_CONNECTION_IS_DTLS(s)
-                && (extctx & SSL_EXT_TLS_IMPLEMENTATION_ONLY) != 0)
-            || (s->version == SSL3_VERSION
-                    && (extctx & SSL_EXT_SSL3_ALLOWED) == 0)
-            /*
-             * Note that SSL_IS_TLS13() means "TLS 1.3 has been negotiated",
-             * which is never true when generating the ClientHello.
-             * However, version negotiation *has* occurred by the time the
-             * ClientHello extensions are being parsed.
-             * Be careful to allow TLS 1.3-only extensions when generating
-             * the ClientHello.
-             */
-            || (is_tls13 && (extctx & SSL_EXT_TLS1_2_AND_BELOW_ONLY) != 0)
-            || (!is_tls13 && (extctx & SSL_EXT_TLS1_3_ONLY) != 0
-                && (thisctx & SSL_EXT_CLIENT_HELLO) == 0)
-            || (s->server && !is_tls13 && (extctx & SSL_EXT_TLS1_3_ONLY) != 0)
-            || (s->hit && (extctx & SSL_EXT_IGNORE_ON_RESUMPTION) != 0))
+            && (extctx & SSL_EXT_TLS_IMPLEMENTATION_ONLY) != 0)
+        || (s->version == SSL3_VERSION
+            && (extctx & SSL_EXT_SSL3_ALLOWED) == 0)
+        /*
+         * Note that SSL_IS_TLS13() means "TLS 1.3 has been negotiated",
+         * which is never true when generating the ClientHello.
+         * However, version negotiation *has* occurred by the time the
+         * ClientHello extensions are being parsed.
+         * Be careful to allow TLS 1.3-only extensions when generating
+         * the ClientHello.
+         */
+        || (is_tls13 && (extctx & SSL_EXT_TLS1_2_AND_BELOW_ONLY) != 0)
+        || (!is_tls13 && (extctx & SSL_EXT_TLS1_3_ONLY) != 0
+            && (thisctx & SSL_EXT_CLIENT_HELLO) == 0)
+        || (s->server && !is_tls13 && (extctx & SSL_EXT_TLS1_3_ONLY) != 0)
+        || (s->hit && (extctx & SSL_EXT_IGNORE_ON_RESUMPTION) != 0))
         return 0;
     return 1;
 }
@@ -606,8 +556,8 @@ int extension_is_relevant(SSL_CONNECTION *s, unsigned int extctx,
  * extensions that we know about. We ignore others.
  */
 int tls_collect_extensions(SSL_CONNECTION *s, PACKET *packet,
-                           unsigned int context,
-                           RAW_EXTENSION **res, size_t *len, int init)
+    unsigned int context,
+    RAW_EXTENSION **res, size_t *len, int init)
 {
     PACKET extensions = *packet;
     size_t i = 0;
@@ -638,8 +588,7 @@ int tls_collect_extensions(SSL_CONNECTION *s, PACKET *packet,
         PACKET extension;
         RAW_EXTENSION *thisex;
 
-        if (!PACKET_get_net_2(&extensions, &type) ||
-            !PACKET_get_length_prefixed_2(&extensions, &extension)) {
+        if (!PACKET_get_net_2(&extensions, &type) || !PACKET_get_length_prefixed_2(&extensions, &extension)) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
             goto err;
         }
@@ -649,10 +598,10 @@ int tls_collect_extensions(SSL_CONNECTION *s, PACKET *packet,
          * PSK extension, which must be the last one in the ClientHello.
          */
         if (!verify_extension(s, context, type, exts, raw_extensions, &thisex)
-                || (thisex != NULL && thisex->present == 1)
-                || (type == TLSEXT_TYPE_psk
-                    && (context & SSL_EXT_CLIENT_HELLO) != 0
-                    && PACKET_remaining(&extensions) != 0)) {
+            || (thisex != NULL && thisex->present == 1)
+            || (type == TLSEXT_TYPE_psk
+                && (context & SSL_EXT_CLIENT_HELLO) != 0
+                && PACKET_remaining(&extensions) != 0)) {
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_EXTENSION);
             goto err;
         }
@@ -672,20 +621,18 @@ int tls_collect_extensions(SSL_CONNECTION *s, PACKET *packet,
          * itself handle unsolicited response checks.
          */
         if (idx < OSSL_NELEM(ext_defs)
-                && (context & (SSL_EXT_CLIENT_HELLO
-                               | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST
-                               | SSL_EXT_TLS1_3_NEW_SESSION_TICKET)) == 0
-                && type != TLSEXT_TYPE_cookie
-                && type != TLSEXT_TYPE_renegotiate
-                && type != TLSEXT_TYPE_signed_certificate_timestamp
-                && (s->ext.extflags[idx] & SSL_EXT_FLAG_SENT) == 0
+            && (context & (SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST | SSL_EXT_TLS1_3_NEW_SESSION_TICKET)) == 0
+            && type != TLSEXT_TYPE_cookie
+            && type != TLSEXT_TYPE_renegotiate
+            && type != TLSEXT_TYPE_signed_certificate_timestamp
+            && (s->ext.extflags[idx] & SSL_EXT_FLAG_SENT) == 0
 #ifndef OPENSSL_NO_GOST
-                && !((context & SSL_EXT_TLS1_2_SERVER_HELLO) != 0
-                     && type == TLSEXT_TYPE_cryptopro_bug)
+            && !((context & SSL_EXT_TLS1_2_SERVER_HELLO) != 0
+                && type == TLSEXT_TYPE_cryptopro_bug)
 #endif
-                                                                ) {
+        ) {
             SSLfatal(s, SSL_AD_UNSUPPORTED_EXTENSION,
-                     SSL_R_UNSOLICITED_EXTENSION);
+                SSL_R_UNSOLICITED_EXTENSION);
             goto err;
         }
         if (thisex != NULL) {
@@ -695,9 +642,9 @@ int tls_collect_extensions(SSL_CONNECTION *s, PACKET *packet,
             thisex->received_order = i++;
             if (s->ext.debug_cb)
                 s->ext.debug_cb(SSL_CONNECTION_GET_USER_SSL(s), !s->server,
-                                thisex->type, PACKET_data(&thisex->data),
-                                PACKET_remaining(&thisex->data),
-                                s->ext.debug_arg);
+                    thisex->type, PACKET_data(&thisex->data),
+                    PACKET_remaining(&thisex->data),
+                    s->ext.debug_arg);
         }
     }
 
@@ -707,7 +654,7 @@ int tls_collect_extensions(SSL_CONNECTION *s, PACKET *packet,
          * whether we have found them or not
          */
         for (thisexd = ext_defs, i = 0; i < OSSL_NELEM(ext_defs);
-             i++, thisexd++) {
+            i++, thisexd++) {
             if (thisexd->init != NULL && (thisexd->context & context) != 0
                 && extension_is_relevant(s, thisexd->context, context)
                 && !thisexd->init(s, context)) {
@@ -722,7 +669,7 @@ int tls_collect_extensions(SSL_CONNECTION *s, PACKET *packet,
         *len = num_exts;
     return 1;
 
- err:
+err:
     OPENSSL_free(raw_extensions);
     return 0;
 }
@@ -738,11 +685,12 @@ int tls_collect_extensions(SSL_CONNECTION *s, PACKET *packet,
  * present this counted as success.
  */
 int tls_parse_extension(SSL_CONNECTION *s, TLSEXT_INDEX idx, int context,
-                        RAW_EXTENSION *exts, X509 *x, size_t chainidx)
+    RAW_EXTENSION *exts, X509 *x, size_t chainidx)
 {
     RAW_EXTENSION *currext = &exts[idx];
     int (*parser)(SSL_CONNECTION *s, PACKET *pkt, unsigned int context, X509 *x,
-                  size_t chainidx) = NULL;
+        size_t chainidx)
+        = NULL;
 
     /* Skip if the extension is not present */
     if (!currext->present)
@@ -775,9 +723,9 @@ int tls_parse_extension(SSL_CONNECTION *s, TLSEXT_INDEX idx, int context,
 
     /* Parse custom extensions */
     return custom_ext_parse(s, context, currext->type,
-                            PACKET_data(&currext->data),
-                            PACKET_remaining(&currext->data),
-                            x, chainidx);
+        PACKET_data(&currext->data),
+        PACKET_remaining(&currext->data),
+        x, chainidx);
 }
 
 /*
@@ -788,8 +736,8 @@ int tls_parse_extension(SSL_CONNECTION *s, TLSEXT_INDEX idx, int context,
  * its position in the |chainidx|, with 0 being the first certificate.
  */
 int tls_parse_all_extensions(SSL_CONNECTION *s, int context,
-                             RAW_EXTENSION *exts, X509 *x,
-                             size_t chainidx, int fin)
+    RAW_EXTENSION *exts, X509 *x,
+    size_t chainidx, int fin)
 {
     size_t i, numexts = OSSL_NELEM(ext_defs);
     const EXTENSION_DEFINITION *thisexd;
@@ -811,7 +759,7 @@ int tls_parse_all_extensions(SSL_CONNECTION *s, int context,
          * whether we have found them or not
          */
         for (i = 0, thisexd = ext_defs; i < OSSL_NELEM(ext_defs);
-             i++, thisexd++) {
+            i++, thisexd++) {
             if (thisexd->final != NULL && (thisexd->context & context) != 0
                 && !thisexd->final(s, context, exts[i].present)) {
                 /* SSLfatal() already called */
@@ -824,7 +772,7 @@ int tls_parse_all_extensions(SSL_CONNECTION *s, int context,
 }
 
 int should_add_extension(SSL_CONNECTION *s, unsigned int extctx,
-                         unsigned int thisctx, int max_version)
+    unsigned int thisctx, int max_version)
 {
     /* Skip if not relevant for our context */
     if ((extctx & thisctx) == 0)
@@ -832,9 +780,9 @@ int should_add_extension(SSL_CONNECTION *s, unsigned int extctx,
 
     /* Check if this extension is defined for our protocol. If not, skip */
     if (!extension_is_relevant(s, extctx, thisctx)
-            || ((extctx & SSL_EXT_TLS1_3_ONLY) != 0
-                && (thisctx & SSL_EXT_CLIENT_HELLO) != 0
-                && (SSL_CONNECTION_IS_DTLS(s) || max_version < TLS1_3_VERSION)))
+        || ((extctx & SSL_EXT_TLS1_3_ONLY) != 0
+            && (thisctx & SSL_EXT_CLIENT_HELLO) != 0
+            && (SSL_CONNECTION_IS_DTLS(s) || max_version < TLS1_3_VERSION)))
         return 0;
 
     return 1;
@@ -849,8 +797,8 @@ int should_add_extension(SSL_CONNECTION *s, unsigned int extctx,
  * failure construction stops at the first extension to fail to construct.
  */
 int tls_construct_extensions(SSL_CONNECTION *s, WPACKET *pkt,
-                             unsigned int context,
-                             X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     size_t i;
     int min_version, max_version = 0, reason;
@@ -858,15 +806,14 @@ int tls_construct_extensions(SSL_CONNECTION *s, WPACKET *pkt,
     int for_comp = (context & SSL_EXT_TLS1_3_CERTIFICATE_COMPRESSION) != 0;
 
     if (!WPACKET_start_sub_packet_u16(pkt)
-               /*
-                * If extensions are of zero length then we don't even add the
-                * extensions length bytes to a ClientHello/ServerHello
-                * (for non-TLSv1.3).
-                */
-            || ((context &
-                 (SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO)) != 0
-                && !WPACKET_set_flags(pkt,
-                                      WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH))) {
+        /*
+         * If extensions are of zero length then we don't even add the
+         * extensions length bytes to a ClientHello/ServerHello
+         * (for non-TLSv1.3).
+         */
+        || ((context & (SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO)) != 0
+            && !WPACKET_set_flags(pkt,
+                WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH))) {
         if (!for_comp)
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
@@ -893,8 +840,8 @@ int tls_construct_extensions(SSL_CONNECTION *s, WPACKET *pkt,
 
     for (i = 0, thisexd = ext_defs; i < OSSL_NELEM(ext_defs); i++, thisexd++) {
         EXT_RETURN (*construct)(SSL_CONNECTION *s, WPACKET *pkt,
-                                unsigned int context,
-                                X509 *x, size_t chainidx);
+            unsigned int context,
+            X509 *x, size_t chainidx);
         EXT_RETURN ret;
 
         /* Skip if not relevant for our context */
@@ -913,9 +860,7 @@ int tls_construct_extensions(SSL_CONNECTION *s, WPACKET *pkt,
             return 0;
         }
         if (ret == EXT_RETURN_SENT
-                && (context & (SSL_EXT_CLIENT_HELLO
-                               | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST
-                               | SSL_EXT_TLS1_3_NEW_SESSION_TICKET)) != 0)
+            && (context & (SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST | SSL_EXT_TLS1_3_NEW_SESSION_TICKET)) != 0)
             s->ext.extflags[i] |= SSL_EXT_FLAG_SENT;
     }
 
@@ -943,10 +888,10 @@ static int final_renegotiate(SSL_CONNECTION *s, unsigned int context, int sent)
          * renegotiation
          */
         if (!(s->options & SSL_OP_LEGACY_SERVER_CONNECT)
-                && !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)
-                && !sent) {
+            && !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)
+            && !sent) {
             SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                     SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
+                SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
             return 0;
         }
 
@@ -955,19 +900,18 @@ static int final_renegotiate(SSL_CONNECTION *s, unsigned int context, int sent)
 
     /* Need RI if renegotiating */
     if (s->renegotiate
-            && !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)
-            && !sent) {
+        && !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)
+        && !sent) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                 SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
+            SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
         return 0;
     }
 
-
     return 1;
 }
 
 static ossl_inline void ssl_tsan_decr(const SSL_CTX *ctx,
-                                      TSAN_QUALIFIER int *stat)
+    TSAN_QUALIFIER int *stat)
 {
     if (ssl_tsan_lock(ctx)) {
         tsan_decr(stat);
@@ -1003,10 +947,10 @@ static int final_server_name(SSL_CONNECTION *s, unsigned int context, int sent)
 
     if (sctx->ext.servername_cb != NULL)
         ret = sctx->ext.servername_cb(ussl, &altmp,
-                                      sctx->ext.servername_arg);
+            sctx->ext.servername_arg);
     else if (s->session_ctx->ext.servername_cb != NULL)
         ret = s->session_ctx->ext.servername_cb(ussl, &altmp,
-                                                s->session_ctx->ext.servername_arg);
+            s->session_ctx->ext.servername_arg);
 
     /*
      * For servers, propagate the SNI hostname from the temporary
@@ -1034,7 +978,7 @@ static int final_server_name(SSL_CONNECTION *s, unsigned int context, int sent)
      * exceed sess_accept (zero) for the new context.
      */
     if (SSL_IS_FIRST_HANDSHAKE(s) && sctx != s->session_ctx
-            && s->hello_retry_request == SSL_HRR_NONE) {
+        && s->hello_retry_request == SSL_HRR_NONE) {
         ssl_tsan_counter(sctx, &sctx->stats.sess_accept);
         ssl_tsan_decr(s->session_ctx, &s->session_ctx->stats.sess_accept);
     }
@@ -1045,10 +989,10 @@ static int final_server_name(SSL_CONNECTION *s, unsigned int context, int sent)
      * Also, if this is not a resumption, create a new session ID
      */
     if (ret == SSL_TLSEXT_ERR_OK && s->ext.ticket_expected
-            && was_ticket && (SSL_get_options(ssl) & SSL_OP_NO_TICKET) != 0) {
+        && was_ticket && (SSL_get_options(ssl) & SSL_OP_NO_TICKET) != 0) {
         s->ext.ticket_expected = 0;
         if (!s->hit) {
-            SSL_SESSION* ss = SSL_get_session(ssl);
+            SSL_SESSION *ss = SSL_get_session(ssl);
 
             if (ss != NULL) {
                 OPENSSL_free(ss->ext.tick);
@@ -1089,7 +1033,7 @@ static int final_server_name(SSL_CONNECTION *s, unsigned int context, int sent)
 }
 
 static int final_ec_pt_formats(SSL_CONNECTION *s, unsigned int context,
-                               int sent)
+    int sent)
 {
     unsigned long alg_k, alg_a;
 
@@ -1105,10 +1049,10 @@ static int final_ec_pt_formats(SSL_CONNECTION *s, unsigned int context,
      * must contain uncompressed.
      */
     if (s->ext.ecpointformats != NULL
-            && s->ext.ecpointformats_len > 0
-            && s->ext.peer_ecpointformats != NULL
-            && s->ext.peer_ecpointformats_len > 0
-            && ((alg_k & SSL_kECDHE) || (alg_a & SSL_aECDSA))) {
+        && s->ext.ecpointformats_len > 0
+        && s->ext.peer_ecpointformats != NULL
+        && s->ext.peer_ecpointformats_len > 0
+        && ((alg_k & SSL_kECDHE) || (alg_a & SSL_aECDSA))) {
         /* we are using an ECC cipher */
         size_t i;
         unsigned char *list = s->ext.peer_ecpointformats;
@@ -1119,7 +1063,7 @@ static int final_ec_pt_formats(SSL_CONNECTION *s, unsigned int context,
         }
         if (i == s->ext.peer_ecpointformats_len) {
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                     SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST);
+                SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST);
             return 0;
         }
     }
@@ -1179,7 +1123,7 @@ static int init_alpn(SSL_CONNECTION *s, unsigned int context)
 static int final_alpn(SSL_CONNECTION *s, unsigned int context, int sent)
 {
     if (!s->server && !sent && s->session->ext.alpn_selected != NULL)
-            s->ext.early_data_ok = 0;
+        s->ext.early_data_ok = 0;
 
     if (!s->server || !SSL_CONNECTION_IS_TLS13(s))
         return 1;
@@ -1207,7 +1151,7 @@ static int init_sig_algs(SSL_CONNECTION *s, unsigned int context)
 }
 
 static int init_sig_algs_cert(SSL_CONNECTION *s,
-                              ossl_unused unsigned int context)
+    ossl_unused unsigned int context)
 {
     /* Clear any signature algorithms extension received */
     OPENSSL_free(s->s3.tmp.peer_cert_sigalgs);
@@ -1269,8 +1213,7 @@ static int final_ems(SSL_CONNECTION *s, unsigned int context, int sent)
          * Check extended master secret extension is consistent with
          * original session.
          */
-        if (!(s->s3.flags & TLS1_FLAGS_RECEIVED_EXTMS) !=
-            !(s->session->flags & SSL_SESS_FLAG_EXTMS)) {
+        if (!(s->s3.flags & TLS1_FLAGS_RECEIVED_EXTMS) != !(s->session->flags & SSL_SESS_FLAG_EXTMS)) {
             SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_INCONSISTENT_EXTMS);
             return 0;
         }
@@ -1287,10 +1230,10 @@ static int init_certificate_authorities(SSL_CONNECTION *s, unsigned int context)
 }
 
 static EXT_RETURN tls_construct_certificate_authorities(SSL_CONNECTION *s,
-                                                        WPACKET *pkt,
-                                                        unsigned int context,
-                                                        X509 *x,
-                                                        size_t chainidx)
+    WPACKET *pkt,
+    unsigned int context,
+    X509 *x,
+    size_t chainidx)
 {
     const STACK_OF(X509_NAME) *ca_sk = get_ca_names(s);
 
@@ -1317,8 +1260,8 @@ static EXT_RETURN tls_construct_certificate_authorities(SSL_CONNECTION *s,
 }
 
 static int tls_parse_certificate_authorities(SSL_CONNECTION *s, PACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     if (!parse_ca_names(s, pkt))
         return 0;
@@ -1343,7 +1286,7 @@ static int final_sig_algs(SSL_CONNECTION *s, unsigned int context, int sent)
 {
     if (!sent && SSL_CONNECTION_IS_TLS13(s) && !s->hit) {
         SSLfatal(s, TLS13_AD_MISSING_EXTENSION,
-                 SSL_R_MISSING_SIGALGS_EXTENSION);
+            SSL_R_MISSING_SIGALGS_EXTENSION);
         return 0;
     }
 
@@ -1351,11 +1294,11 @@ static int final_sig_algs(SSL_CONNECTION *s, unsigned int context, int sent)
 }
 
 static int final_supported_versions(SSL_CONNECTION *s, unsigned int context,
-                                    int sent)
+    int sent)
 {
     if (!sent && context == SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST) {
         SSLfatal(s, TLS13_AD_MISSING_EXTENSION,
-                 SSL_R_MISSING_SUPPORTED_VERSIONS_EXTENSION);
+            SSL_R_MISSING_SUPPORTED_VERSIONS_EXTENSION);
         return 0;
     }
 
@@ -1384,7 +1327,7 @@ static int final_key_share(SSL_CONNECTION *s, unsigned int context, int sent)
      *     fail;
      */
     if (!s->server
-            && !sent) {
+        && !sent) {
         if ((s->ext.psk_kex_mode & TLSEXT_KEX_MODE_FLAG_KE) == 0) {
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_NO_SUITABLE_KEY_SHARE);
             return 0;
@@ -1432,7 +1375,7 @@ static int final_key_share(SSL_CONNECTION *s, unsigned int context, int sent)
         if (s->s3.peer_tmp != NULL) {
             /* We have a suitable key_share */
             if ((s->s3.flags & TLS1_FLAGS_STATELESS) != 0
-                    && !s->ext.cookieok) {
+                && !s->ext.cookieok) {
                 if (!ossl_assert(s->hello_retry_request == SSL_HRR_NONE)) {
                     /*
                      * If we are stateless then we wouldn't know about any
@@ -1448,8 +1391,8 @@ static int final_key_share(SSL_CONNECTION *s, unsigned int context, int sent)
         } else {
             /* No suitable key_share */
             if (s->hello_retry_request == SSL_HRR_NONE && sent
-                    && (!s->hit
-                        || (s->ext.psk_kex_mode & TLSEXT_KEX_MODE_FLAG_KE_DHE) != 0)) {
+                && (!s->hit
+                    || (s->ext.psk_kex_mode & TLSEXT_KEX_MODE_FLAG_KE_DHE) != 0)) {
 
                 /* Did we detect group overlap in tls_parse_ctos_key_share ? */
                 if (s->s3.group_id_candidate != 0) {
@@ -1460,16 +1403,15 @@ static int final_key_share(SSL_CONNECTION *s, unsigned int context, int sent)
                 }
             }
             if (!s->hit
-                    || (s->ext.psk_kex_mode & TLSEXT_KEX_MODE_FLAG_KE) == 0) {
+                || (s->ext.psk_kex_mode & TLSEXT_KEX_MODE_FLAG_KE) == 0) {
                 /* Nothing left we can do - just fail */
-                SSLfatal(s, sent ? SSL_AD_HANDSHAKE_FAILURE
-                                 : SSL_AD_MISSING_EXTENSION,
-                         SSL_R_NO_SUITABLE_KEY_SHARE);
+                SSLfatal(s, sent ? SSL_AD_HANDSHAKE_FAILURE : SSL_AD_MISSING_EXTENSION,
+                    SSL_R_NO_SUITABLE_KEY_SHARE);
                 return 0;
             }
 
             if ((s->s3.flags & TLS1_FLAGS_STATELESS) != 0
-                    && !s->ext.cookieok) {
+                && !s->ext.cookieok) {
                 if (!ossl_assert(s->hello_retry_request == SSL_HRR_NONE)) {
                     /*
                      * If we are stateless then we wouldn't know about any
@@ -1512,10 +1454,10 @@ static int init_psk_kex_modes(SSL_CONNECTION *s, unsigned int context)
 }
 
 int tls_psk_do_binder(SSL_CONNECTION *s, const EVP_MD *md,
-                      const unsigned char *msgstart,
-                      size_t binderoffset, const unsigned char *binderin,
-                      unsigned char *binderout, SSL_SESSION *sess, int sign,
-                      int external)
+    const unsigned char *msgstart,
+    size_t binderoffset, const unsigned char *binderin,
+    unsigned char *binderout, SSL_SESSION *sess, int sign,
+    int external)
 {
     EVP_PKEY *mackey = NULL;
     EVP_MD_CTX *mctx = NULL;
@@ -1541,9 +1483,9 @@ int tls_psk_do_binder(SSL_CONNECTION *s, const EVP_MD *md,
     hashsize = (size_t)hashsizei;
 
     if (external
-            && s->early_data_state == SSL_EARLY_DATA_CONNECTING
-            && s->session->ext.max_early_data == 0
-            && sess->ext.max_early_data > 0)
+        && s->early_data_state == SSL_EARLY_DATA_CONNECTING
+        && s->session->ext.max_early_data == 0
+        && sess->ext.max_early_data > 0)
         usepskfored = 1;
 
     if (external) {
@@ -1568,7 +1510,7 @@ int tls_psk_do_binder(SSL_CONNECTION *s, const EVP_MD *md,
         early_secret = (unsigned char *)sess->early_secret;
 
     if (!tls13_generate_secret(s, md, NULL, sess->master_key,
-                               sess->master_key_length, early_secret)) {
+            sess->master_key_length, early_secret)) {
         /* SSLfatal() already called */
         goto err;
     }
@@ -1579,15 +1521,15 @@ int tls_psk_do_binder(SSL_CONNECTION *s, const EVP_MD *md,
      */
     mctx = EVP_MD_CTX_new();
     if (mctx == NULL
-            || EVP_DigestInit_ex(mctx, md, NULL) <= 0
-            || EVP_DigestFinal_ex(mctx, hash, NULL) <= 0) {
+        || EVP_DigestInit_ex(mctx, md, NULL) <= 0
+        || EVP_DigestFinal_ex(mctx, hash, NULL) <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
 
     /* Generate the binder key */
     if (!tls13_hkdf_expand(s, md, early_secret, label, labelsize, hash,
-                           hashsize, binderkey, hashsize, 1)) {
+            hashsize, binderkey, hashsize, 1)) {
         /* SSLfatal() already called */
         goto err;
     }
@@ -1613,8 +1555,7 @@ int tls_psk_do_binder(SSL_CONNECTION *s, const EVP_MD *md,
         long hdatalen_l;
         void *hdata;
 
-        hdatalen = hdatalen_l =
-            BIO_get_mem_data(s->s3.handshake_buffer, &hdata);
+        hdatalen = hdatalen_l = BIO_get_mem_data(s->s3.handshake_buffer, &hdata);
         if (hdatalen_l <= 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_BAD_HANDSHAKE_LENGTH);
             goto err;
@@ -1629,10 +1570,10 @@ int tls_psk_do_binder(SSL_CONNECTION *s, const EVP_MD *md,
 
             /* Find how many bytes are left after the first two messages */
             if (!PACKET_buf_init(&hashprefix, hdata, hdatalen)
-                    || !PACKET_forward(&hashprefix, 1)
-                    || !PACKET_get_length_prefixed_3(&hashprefix, &msg)
-                    || !PACKET_forward(&hashprefix, 1)
-                    || !PACKET_get_length_prefixed_3(&hashprefix, &msg)) {
+                || !PACKET_forward(&hashprefix, 1)
+                || !PACKET_get_length_prefixed_3(&hashprefix, &msg)
+                || !PACKET_forward(&hashprefix, 1)
+                || !PACKET_get_length_prefixed_3(&hashprefix, &msg)) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 goto err;
             }
@@ -1646,14 +1587,14 @@ int tls_psk_do_binder(SSL_CONNECTION *s, const EVP_MD *md,
     }
 
     if (EVP_DigestUpdate(mctx, msgstart, binderoffset) <= 0
-            || EVP_DigestFinal_ex(mctx, hash, NULL) <= 0) {
+        || EVP_DigestFinal_ex(mctx, hash, NULL) <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
 
     mackey = EVP_PKEY_new_raw_private_key_ex(sctx->libctx, "HMAC",
-                                             sctx->propq, finishedkey,
-                                             hashsize);
+        sctx->propq, finishedkey,
+        hashsize);
     if (mackey == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
@@ -1664,10 +1605,11 @@ int tls_psk_do_binder(SSL_CONNECTION *s, const EVP_MD *md,
 
     bindersize = hashsize;
     if (EVP_DigestSignInit_ex(mctx, NULL, EVP_MD_get0_name(md), sctx->libctx,
-                              sctx->propq, mackey, NULL) <= 0
-            || EVP_DigestSignUpdate(mctx, hash, hashsize) <= 0
-            || EVP_DigestSignFinal(mctx, binderout, &bindersize) <= 0
-            || bindersize != hashsize) {
+            sctx->propq, mackey, NULL)
+            <= 0
+        || EVP_DigestSignUpdate(mctx, hash, hashsize) <= 0
+        || EVP_DigestSignFinal(mctx, binderout, &bindersize) <= 0
+        || bindersize != hashsize) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -1681,7 +1623,7 @@ int tls_psk_do_binder(SSL_CONNECTION *s, const EVP_MD *md,
             SSLfatal(s, SSL_AD_DECRYPT_ERROR, SSL_R_BINDER_DOES_NOT_VERIFY);
     }
 
- err:
+err:
     OPENSSL_cleanse(binderkey, sizeof(binderkey));
     OPENSSL_cleanse(finishedkey, sizeof(finishedkey));
     EVP_PKEY_free(mackey);
@@ -1697,8 +1639,8 @@ static int final_early_data(SSL_CONNECTION *s, unsigned int context, int sent)
 
     if (!s->server) {
         if (context == SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS
-                && sent
-                && !s->ext.early_data_ok) {
+            && sent
+            && !s->ext.early_data_ok) {
             /*
              * If we get here then the server accepted our early_data but we
              * later realised that it shouldn't have done (e.g. inconsistent
@@ -1712,19 +1654,19 @@ static int final_early_data(SSL_CONNECTION *s, unsigned int context, int sent)
     }
 
     if (s->max_early_data == 0
-            || !s->hit
-            || s->early_data_state != SSL_EARLY_DATA_ACCEPTING
-            || !s->ext.early_data_ok
-            || s->hello_retry_request != SSL_HRR_NONE
-            || (s->allow_early_data_cb != NULL
-                && !s->allow_early_data_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                           s->allow_early_data_cb_data))) {
+        || !s->hit
+        || s->early_data_state != SSL_EARLY_DATA_ACCEPTING
+        || !s->ext.early_data_ok
+        || s->hello_retry_request != SSL_HRR_NONE
+        || (s->allow_early_data_cb != NULL
+            && !s->allow_early_data_cb(SSL_CONNECTION_GET_USER_SSL(s),
+                s->allow_early_data_cb_data))) {
         s->ext.early_data = SSL_EARLY_DATA_REJECTED;
     } else {
         s->ext.early_data = SSL_EARLY_DATA_ACCEPTED;
 
         if (!tls13_change_cipher_state(s,
-                    SSL3_CC_EARLY | SSL3_CHANGE_CIPHER_SERVER_READ)) {
+                SSL3_CC_EARLY | SSL3_CHANGE_CIPHER_SERVER_READ)) {
             /* SSLfatal() already called */
             return 0;
         }
@@ -1734,24 +1676,27 @@ static int final_early_data(SSL_CONNECTION *s, unsigned int context, int sent)
 }
 
 static int final_maxfragmentlen(SSL_CONNECTION *s, unsigned int context,
-                                int sent)
+    int sent)
 {
+    if (s->session == NULL)
+        return 1;
+
     /* MaxFragmentLength defaults to disabled */
     if (s->session->ext.max_fragment_len_mode == TLSEXT_max_fragment_length_UNSPECIFIED)
         s->session->ext.max_fragment_len_mode = TLSEXT_max_fragment_length_DISABLED;
 
-    if (s->session && USE_MAX_FRAGMENT_LENGTH_EXT(s->session)) {
+    if (USE_MAX_FRAGMENT_LENGTH_EXT(s->session)) {
         s->rlayer.rrlmethod->set_max_frag_len(s->rlayer.rrl,
-                                              GET_MAX_FRAGMENT_LENGTH(s->session));
+            GET_MAX_FRAGMENT_LENGTH(s->session));
         s->rlayer.wrlmethod->set_max_frag_len(s->rlayer.wrl,
-                                              ssl_get_max_send_fragment(s));
+            ssl_get_max_send_fragment(s));
     }
 
     return 1;
 }
 
 static int init_post_handshake_auth(SSL_CONNECTION *s,
-                                    ossl_unused unsigned int context)
+    ossl_unused unsigned int context)
 {
     s->post_handshake_auth = SSL_PHA_NONE;
 
@@ -1765,9 +1710,9 @@ static int init_post_handshake_auth(SSL_CONNECTION *s,
 static int final_psk(SSL_CONNECTION *s, unsigned int context, int sent)
 {
     if (s->server && sent && s->clienthello != NULL
-            && !s->clienthello->pre_proc_exts[TLSEXT_IDX_psk_kex_modes].present) {
+        && !s->clienthello->pre_proc_exts[TLSEXT_IDX_psk_kex_modes].present) {
         SSLfatal(s, TLS13_AD_MISSING_EXTENSION,
-                 SSL_R_MISSING_PSK_KEX_MODES_EXTENSION);
+            SSL_R_MISSING_PSK_KEX_MODES_EXTENSION);
         return 0;
     }
 
@@ -1777,14 +1722,14 @@ static int final_psk(SSL_CONNECTION *s, unsigned int context, int sent)
 static int tls_init_compress_certificate(SSL_CONNECTION *sc, unsigned int context)
 {
     memset(sc->ext.compress_certificate_from_peer, 0,
-           sizeof(sc->ext.compress_certificate_from_peer));
+        sizeof(sc->ext.compress_certificate_from_peer));
     return 1;
 }
 
 /* The order these are put into the packet imply a preference order: [brotli, zlib, zstd] */
 static EXT_RETURN tls_construct_compress_certificate(SSL_CONNECTION *sc, WPACKET *pkt,
-                                                     unsigned int context,
-                                                     X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
 #ifndef OPENSSL_NO_COMP_ALG
     int i;
@@ -1812,8 +1757,8 @@ static EXT_RETURN tls_construct_compress_certificate(SSL_CONNECTION *sc, WPACKET
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_compress_certificate)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_start_sub_packet_u8(pkt))
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_start_sub_packet_u8(pkt))
         goto err;
 
     for (i = 0; sc->cert_comp_prefs[i] != TLSEXT_comp_cert_none; i++) {
@@ -1825,7 +1770,7 @@ static EXT_RETURN tls_construct_compress_certificate(SSL_CONNECTION *sc, WPACKET
 
     sc->ext.compress_certificate_sent = 1;
     return EXT_RETURN_SENT;
- err:
+err:
     SSLfatal(sc, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
     return EXT_RETURN_FAIL;
 #else
@@ -1856,7 +1801,7 @@ static int tls_comp_in_pref(SSL_CONNECTION *sc, int alg)
 #endif
 
 int tls_parse_compress_certificate(SSL_CONNECTION *sc, PACKET *pkt, unsigned int context,
-                                   X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
 #ifndef OPENSSL_NO_COMP_ALG
     PACKET supported_comp_algs;
@@ -1879,7 +1824,7 @@ int tls_parse_compress_certificate(SSL_CONNECTION *sc, PACKET *pkt, unsigned int
         return 1;
 
     if (!PACKET_as_length_prefixed_1(pkt, &supported_comp_algs)
-            || PACKET_remaining(&supported_comp_algs) == 0) {
+        || PACKET_remaining(&supported_comp_algs) == 0) {
         SSLfatal(sc, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
         return 0;
     }
@@ -1897,6 +1842,10 @@ int tls_parse_compress_certificate(SSL_CONNECTION *sc, PACKET *pkt, unsigned int
             already_set[comp] = 1;
         }
     }
+    if (PACKET_remaining(&supported_comp_algs) != 0) {
+        SSLfatal(sc, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
+        return 0;
+    }
 #endif
     return 1;
 }
diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index 8b6bc60efc548..305ca4ab46c9e 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -14,14 +14,14 @@
 #include "statem_local.h"
 
 EXT_RETURN tls_construct_ctos_renegotiate(SSL_CONNECTION *s, WPACKET *pkt,
-                                          unsigned int context, X509 *x,
-                                          size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     if (!s->renegotiate) {
         /* If not renegotiating, send an empty RI extension to indicate support */
 
 #if DTLS_MAX_VERSION_INTERNAL != DTLS1_2_VERSION
-# error Internal DTLS version error
+#error Internal DTLS version error
 #endif
 
         if (!SSL_CONNECTION_IS_DTLS(s)
@@ -35,7 +35,6 @@ EXT_RETURN tls_construct_ctos_renegotiate(SSL_CONNECTION *s, WPACKET *pkt,
             return EXT_RETURN_NOT_SENT;
         }
 
-
         if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_renegotiate)
             || !WPACKET_start_sub_packet_u16(pkt)
             || !WPACKET_put_bytes_u8(pkt, 0)
@@ -49,10 +48,10 @@ EXT_RETURN tls_construct_ctos_renegotiate(SSL_CONNECTION *s, WPACKET *pkt,
 
     /* Add a complete RI extension if renegotiating */
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_renegotiate)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_sub_memcpy_u8(pkt, s->s3.previous_client_finished,
-                               s->s3.previous_client_finished_len)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_sub_memcpy_u8(pkt, s->s3.previous_client_finished,
+            s->s3.previous_client_finished_len)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -61,23 +60,23 @@ EXT_RETURN tls_construct_ctos_renegotiate(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_ctos_server_name(SSL_CONNECTION *s, WPACKET *pkt,
-                                          unsigned int context, X509 *x,
-                                          size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     if (s->ext.hostname == NULL)
         return EXT_RETURN_NOT_SENT;
 
     /* Add TLS extension servername to the Client Hello message */
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_server_name)
-               /* Sub-packet for server_name extension */
-            || !WPACKET_start_sub_packet_u16(pkt)
-               /* Sub-packet for servername list (always 1 hostname)*/
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_put_bytes_u8(pkt, TLSEXT_NAMETYPE_host_name)
-            || !WPACKET_sub_memcpy_u16(pkt, s->ext.hostname,
-                                       strlen(s->ext.hostname))
-            || !WPACKET_close(pkt)
-            || !WPACKET_close(pkt)) {
+        /* Sub-packet for server_name extension */
+        || !WPACKET_start_sub_packet_u16(pkt)
+        /* Sub-packet for servername list (always 1 hostname)*/
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_put_bytes_u8(pkt, TLSEXT_NAMETYPE_host_name)
+        || !WPACKET_sub_memcpy_u16(pkt, s->ext.hostname,
+            strlen(s->ext.hostname))
+        || !WPACKET_close(pkt)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -87,8 +86,8 @@ EXT_RETURN tls_construct_ctos_server_name(SSL_CONNECTION *s, WPACKET *pkt,
 
 /* Push a Max Fragment Len extension into ClientHello */
 EXT_RETURN tls_construct_ctos_maxfragmentlen(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     if (s->ext.max_fragment_len_mode == TLSEXT_max_fragment_length_DISABLED)
         return EXT_RETURN_NOT_SENT;
@@ -99,10 +98,10 @@ EXT_RETURN tls_construct_ctos_maxfragmentlen(SSL_CONNECTION *s, WPACKET *pkt,
      * 1 byte for the Max Fragment Length code value.
      */
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_max_fragment_length)
-            /* Sub-packet for Max Fragment Length extension (1 byte) */
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_put_bytes_u8(pkt, s->ext.max_fragment_len_mode)
-            || !WPACKET_close(pkt)) {
+        /* Sub-packet for Max Fragment Length extension (1 byte) */
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_put_bytes_u8(pkt, s->ext.max_fragment_len_mode)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -112,23 +111,23 @@ EXT_RETURN tls_construct_ctos_maxfragmentlen(SSL_CONNECTION *s, WPACKET *pkt,
 
 #ifndef OPENSSL_NO_SRP
 EXT_RETURN tls_construct_ctos_srp(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     /* Add SRP username if there is one */
     if (s->srp_ctx.login == NULL)
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_srp)
-               /* Sub-packet for SRP extension */
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_start_sub_packet_u8(pkt)
-               /* login must not be zero...internal error if so */
-            || !WPACKET_set_flags(pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
-            || !WPACKET_memcpy(pkt, s->srp_ctx.login,
-                               strlen(s->srp_ctx.login))
-            || !WPACKET_close(pkt)
-            || !WPACKET_close(pkt)) {
+        /* Sub-packet for SRP extension */
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_start_sub_packet_u8(pkt)
+        /* login must not be zero...internal error if so */
+        || !WPACKET_set_flags(pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
+        || !WPACKET_memcpy(pkt, s->srp_ctx.login,
+            strlen(s->srp_ctx.login))
+        || !WPACKET_close(pkt)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -158,8 +157,8 @@ static int use_ecc(SSL_CONNECTION *s, int min_version, int max_version)
         alg_k = c->algorithm_mkey;
         alg_a = c->algorithm_auth;
         if ((alg_k & (SSL_kECDHE | SSL_kECDHEPSK))
-                || (alg_a & SSL_aECDSA)
-                || c->min_tls >= TLS1_3_VERSION) {
+            || (alg_a & SSL_aECDSA)
+            || c->min_tls >= TLS1_3_VERSION) {
             ret = 1;
             break;
         }
@@ -174,7 +173,7 @@ static int use_ecc(SSL_CONNECTION *s, int min_version, int max_version)
         uint16_t ctmp = pgroups[j];
 
         if (tls_valid_group(s, ctmp, min_version, max_version, 1, NULL)
-                && tls_group_allowed(s, ctmp, SSL_SECOP_CURVE_SUPPORTED))
+            && tls_group_allowed(s, ctmp, SSL_SECOP_CURVE_SUPPORTED))
             return 1;
     }
 
@@ -182,8 +181,8 @@ static int use_ecc(SSL_CONNECTION *s, int min_version, int max_version)
 }
 
 EXT_RETURN tls_construct_ctos_ec_pt_formats(SSL_CONNECTION *s, WPACKET *pkt,
-                                            unsigned int context, X509 *x,
-                                            size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     const unsigned char *pformats;
     size_t num_formats;
@@ -201,10 +200,10 @@ EXT_RETURN tls_construct_ctos_ec_pt_formats(SSL_CONNECTION *s, WPACKET *pkt,
     tls1_get_formatlist(s, &pformats, &num_formats);
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_ec_point_formats)
-               /* Sub-packet for formats extension */
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_sub_memcpy_u8(pkt, pformats, num_formats)
-            || !WPACKET_close(pkt)) {
+        /* Sub-packet for formats extension */
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_sub_memcpy_u8(pkt, pformats, num_formats)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -213,8 +212,8 @@ EXT_RETURN tls_construct_ctos_ec_pt_formats(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_ctos_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
-                                               unsigned int context, X509 *x,
-                                               size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     const uint16_t *pgroups = NULL;
     size_t num_groups = 0, i, tls13added = 0, added = 0;
@@ -231,7 +230,7 @@ EXT_RETURN tls_construct_ctos_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
      * if we don't have EC support then we don't send this extension.
      */
     if (!use_ecc(s, min_version, max_version)
-            && (SSL_CONNECTION_IS_DTLS(s) || max_version < TLS1_3_VERSION))
+        && (SSL_CONNECTION_IS_DTLS(s) || max_version < TLS1_3_VERSION))
         return EXT_RETURN_NOT_SENT;
 
     /*
@@ -240,10 +239,10 @@ EXT_RETURN tls_construct_ctos_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
     tls1_get_supported_groups(s, &pgroups, &num_groups);
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_supported_groups)
-               /* Sub-packet for supported_groups extension */
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_set_flags(pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)) {
+        /* Sub-packet for supported_groups extension */
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_set_flags(pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -253,7 +252,7 @@ EXT_RETURN tls_construct_ctos_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
         int okfortls13;
 
         if (tls_valid_group(s, ctmp, min_version, max_version, 0, &okfortls13)
-                && tls_group_allowed(s, ctmp, SSL_SECOP_CURVE_SUPPORTED)) {
+            && tls_group_allowed(s, ctmp, SSL_SECOP_CURVE_SUPPORTED)) {
             if (!WPACKET_put_bytes_u16(pkt, ctmp)) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 return EXT_RETURN_FAIL;
@@ -266,7 +265,7 @@ EXT_RETURN tls_construct_ctos_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
     if (!WPACKET_close(pkt) || !WPACKET_close(pkt)) {
         if (added == 0)
             SSLfatal_data(s, SSL_AD_INTERNAL_ERROR, SSL_R_NO_SUITABLE_GROUPS,
-                          "No groups enabled for max supported SSL/TLS version");
+                "No groups enabled for max supported SSL/TLS version");
         else
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
@@ -274,7 +273,7 @@ EXT_RETURN tls_construct_ctos_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
 
     if (tls13added == 0 && max_version == TLS1_3_VERSION) {
         SSLfatal_data(s, SSL_AD_INTERNAL_ERROR, SSL_R_NO_SUITABLE_GROUPS,
-                      "No groups enabled for max supported SSL/TLS version");
+            "No groups enabled for max supported SSL/TLS version");
         return EXT_RETURN_FAIL;
     }
 
@@ -282,8 +281,8 @@ EXT_RETURN tls_construct_ctos_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_ctos_session_ticket(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     size_t ticklen;
 
@@ -291,11 +290,11 @@ EXT_RETURN tls_construct_ctos_session_ticket(SSL_CONNECTION *s, WPACKET *pkt,
         return EXT_RETURN_NOT_SENT;
 
     if (!s->new_session && s->session != NULL
-            && s->session->ext.tick != NULL
-            && s->session->ssl_version != TLS1_3_VERSION) {
+        && s->session->ext.tick != NULL
+        && s->session->ssl_version != TLS1_3_VERSION) {
         ticklen = s->session->ext.ticklen;
     } else if (s->session && s->ext.session_ticket != NULL
-               && s->ext.session_ticket->data != NULL) {
+        && s->ext.session_ticket->data != NULL) {
         ticklen = s->ext.session_ticket->length;
         s->session->ext.tick = OPENSSL_malloc(ticklen);
         if (s->session->ext.tick == NULL) {
@@ -303,18 +302,17 @@ EXT_RETURN tls_construct_ctos_session_ticket(SSL_CONNECTION *s, WPACKET *pkt,
             return EXT_RETURN_FAIL;
         }
         memcpy(s->session->ext.tick,
-               s->ext.session_ticket->data, ticklen);
+            s->ext.session_ticket->data, ticklen);
         s->session->ext.ticklen = ticklen;
     } else {
         ticklen = 0;
     }
 
-    if (ticklen == 0 && s->ext.session_ticket != NULL &&
-            s->ext.session_ticket->data == NULL)
+    if (ticklen == 0 && s->ext.session_ticket != NULL && s->ext.session_ticket->data == NULL)
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_session_ticket)
-            || !WPACKET_sub_memcpy_u16(pkt, s->session->ext.tick, ticklen)) {
+        || !WPACKET_sub_memcpy_u16(pkt, s->session->ext.tick, ticklen)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -323,24 +321,38 @@ EXT_RETURN tls_construct_ctos_session_ticket(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_ctos_sig_algs(SSL_CONNECTION *s, WPACKET *pkt,
-                                       unsigned int context, X509 *x,
-                                       size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     size_t salglen;
     const uint16_t *salg;
 
-    if (!SSL_CLIENT_USE_SIGALGS(s))
-        return EXT_RETURN_NOT_SENT;
+    /*
+     * This used both in the initial hello and as part of renegotiation,
+     * in the latter case, the client version may be already set and may
+     * be lower than that initially offered in `client_version`.
+     */
+    if (!SSL_CONNECTION_IS_DTLS(s)) {
+        if (s->client_version < TLS1_2_VERSION
+            || (s->ssl.method->version != TLS_ANY_VERSION
+                && s->version < TLS1_2_VERSION))
+            return EXT_RETURN_NOT_SENT;
+    } else {
+        if (DTLS_VERSION_LT(s->client_version, DTLS1_2_VERSION)
+            || (s->ssl.method->version != DTLS_ANY_VERSION
+                && DTLS_VERSION_LT(s->version, DTLS1_2_VERSION)))
+            return EXT_RETURN_NOT_SENT;
+    }
 
     salglen = tls12_get_psigalgs(s, 1, &salg);
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_signature_algorithms)
-               /* Sub-packet for sig-algs extension */
-            || !WPACKET_start_sub_packet_u16(pkt)
-               /* Sub-packet for the actual list */
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !tls12_copy_sigalgs(s, pkt, salg, salglen)
-            || !WPACKET_close(pkt)
-            || !WPACKET_close(pkt)) {
+        /* Sub-packet for sig-algs extension */
+        || !WPACKET_start_sub_packet_u16(pkt)
+        /* Sub-packet for the actual list */
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !tls12_copy_sigalgs(s, pkt, salg, salglen)
+        || !WPACKET_close(pkt)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -350,8 +362,8 @@ EXT_RETURN tls_construct_ctos_sig_algs(SSL_CONNECTION *s, WPACKET *pkt,
 
 #ifndef OPENSSL_NO_OCSP
 EXT_RETURN tls_construct_ctos_status_request(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     int i;
 
@@ -363,11 +375,11 @@ EXT_RETURN tls_construct_ctos_status_request(SSL_CONNECTION *s, WPACKET *pkt,
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_status_request)
-               /* Sub-packet for status request extension */
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_put_bytes_u8(pkt, TLSEXT_STATUSTYPE_ocsp)
-               /* Sub-packet for the ids */
-            || !WPACKET_start_sub_packet_u16(pkt)) {
+        /* Sub-packet for status request extension */
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_put_bytes_u8(pkt, TLSEXT_STATUSTYPE_ocsp)
+        /* Sub-packet for the ids */
+        || !WPACKET_start_sub_packet_u16(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -377,15 +389,15 @@ EXT_RETURN tls_construct_ctos_status_request(SSL_CONNECTION *s, WPACKET *pkt,
         int idlen = i2d_OCSP_RESPID(id, NULL);
 
         if (idlen <= 0
-                   /* Sub-packet for an individual id */
-                || !WPACKET_sub_allocate_bytes_u16(pkt, idlen, &idbytes)
-                || i2d_OCSP_RESPID(id, &idbytes) != idlen) {
+            /* Sub-packet for an individual id */
+            || !WPACKET_sub_allocate_bytes_u16(pkt, idlen, &idbytes)
+            || i2d_OCSP_RESPID(id, &idbytes) != idlen) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return EXT_RETURN_FAIL;
         }
     }
     if (!WPACKET_close(pkt)
-            || !WPACKET_start_sub_packet_u16(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -398,11 +410,11 @@ EXT_RETURN tls_construct_ctos_status_request(SSL_CONNECTION *s, WPACKET *pkt,
             return EXT_RETURN_FAIL;
         }
         if (!WPACKET_allocate_bytes(pkt, extlen, &extbytes)
-                || i2d_X509_EXTENSIONS(s->ext.ocsp.exts, &extbytes)
-                   != extlen) {
+            || i2d_X509_EXTENSIONS(s->ext.ocsp.exts, &extbytes)
+                != extlen) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return EXT_RETURN_FAIL;
-       }
+        }
     }
     if (!WPACKET_close(pkt) || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -415,8 +427,8 @@ EXT_RETURN tls_construct_ctos_status_request(SSL_CONNECTION *s, WPACKET *pkt,
 
 #ifndef OPENSSL_NO_NEXTPROTONEG
 EXT_RETURN tls_construct_ctos_npn(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     if (SSL_CONNECTION_GET_CTX(s)->ext.npn_select_cb == NULL
         || !SSL_IS_FIRST_HANDSHAKE(s))
@@ -427,7 +439,7 @@ EXT_RETURN tls_construct_ctos_npn(SSL_CONNECTION *s, WPACKET *pkt,
      * for Next Protocol Negotiation
      */
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_next_proto_neg)
-            || !WPACKET_put_bytes_u16(pkt, 0)) {
+        || !WPACKET_put_bytes_u16(pkt, 0)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -437,8 +449,8 @@ EXT_RETURN tls_construct_ctos_npn(SSL_CONNECTION *s, WPACKET *pkt,
 #endif
 
 EXT_RETURN tls_construct_ctos_alpn(SSL_CONNECTION *s, WPACKET *pkt,
-                                   unsigned int context,
-                                   X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     s->s3.alpn_sent = 0;
 
@@ -446,11 +458,11 @@ EXT_RETURN tls_construct_ctos_alpn(SSL_CONNECTION *s, WPACKET *pkt,
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt,
-                TLSEXT_TYPE_application_layer_protocol_negotiation)
-               /* Sub-packet ALPN extension */
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_sub_memcpy_u16(pkt, s->ext.alpn, s->ext.alpn_len)
-            || !WPACKET_close(pkt)) {
+            TLSEXT_TYPE_application_layer_protocol_negotiation)
+        /* Sub-packet ALPN extension */
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_sub_memcpy_u16(pkt, s->ext.alpn, s->ext.alpn_len)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -459,11 +471,10 @@ EXT_RETURN tls_construct_ctos_alpn(SSL_CONNECTION *s, WPACKET *pkt,
     return EXT_RETURN_SENT;
 }
 
-
 #ifndef OPENSSL_NO_SRTP
 EXT_RETURN tls_construct_ctos_use_srtp(SSL_CONNECTION *s, WPACKET *pkt,
-                                       unsigned int context, X509 *x,
-                                       size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     SSL *ssl = SSL_CONNECTION_GET_SSL(s);
     STACK_OF(SRTP_PROTECTION_PROFILE) *clnt = SSL_get_srtp_profiles(ssl);
@@ -473,18 +484,17 @@ EXT_RETURN tls_construct_ctos_use_srtp(SSL_CONNECTION *s, WPACKET *pkt,
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_use_srtp)
-               /* Sub-packet for SRTP extension */
-            || !WPACKET_start_sub_packet_u16(pkt)
-               /* Sub-packet for the protection profile list */
-            || !WPACKET_start_sub_packet_u16(pkt)) {
+        /* Sub-packet for SRTP extension */
+        || !WPACKET_start_sub_packet_u16(pkt)
+        /* Sub-packet for the protection profile list */
+        || !WPACKET_start_sub_packet_u16(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
 
     end = sk_SRTP_PROTECTION_PROFILE_num(clnt);
     for (i = 0; i < end; i++) {
-        const SRTP_PROTECTION_PROFILE *prof =
-            sk_SRTP_PROTECTION_PROFILE_value(clnt, i);
+        const SRTP_PROTECTION_PROFILE *prof = sk_SRTP_PROTECTION_PROFILE_value(clnt, i);
 
         if (prof == NULL || !WPACKET_put_bytes_u16(pkt, prof->id)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -492,9 +502,9 @@ EXT_RETURN tls_construct_ctos_use_srtp(SSL_CONNECTION *s, WPACKET *pkt,
         }
     }
     if (!WPACKET_close(pkt)
-               /* Add an empty use_mki value */
-            || !WPACKET_put_bytes_u8(pkt, 0)
-            || !WPACKET_close(pkt)) {
+        /* Add an empty use_mki value */
+        || !WPACKET_put_bytes_u8(pkt, 0)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -504,14 +514,14 @@ EXT_RETURN tls_construct_ctos_use_srtp(SSL_CONNECTION *s, WPACKET *pkt,
 #endif
 
 EXT_RETURN tls_construct_ctos_etm(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     if (s->options & SSL_OP_NO_ENCRYPT_THEN_MAC)
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_encrypt_then_mac)
-            || !WPACKET_put_bytes_u16(pkt, 0)) {
+        || !WPACKET_put_bytes_u16(pkt, 0)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -521,8 +531,8 @@ EXT_RETURN tls_construct_ctos_etm(SSL_CONNECTION *s, WPACKET *pkt,
 
 #ifndef OPENSSL_NO_CT
 EXT_RETURN tls_construct_ctos_sct(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     if (s->ct_validation_callback == NULL)
         return EXT_RETURN_NOT_SENT;
@@ -532,7 +542,7 @@ EXT_RETURN tls_construct_ctos_sct(SSL_CONNECTION *s, WPACKET *pkt,
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_signed_certificate_timestamp)
-            || !WPACKET_put_bytes_u16(pkt, 0)) {
+        || !WPACKET_put_bytes_u16(pkt, 0)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -542,14 +552,14 @@ EXT_RETURN tls_construct_ctos_sct(SSL_CONNECTION *s, WPACKET *pkt,
 #endif
 
 EXT_RETURN tls_construct_ctos_ems(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     if (s->options & SSL_OP_NO_EXTENDED_MASTER_SECRET)
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_extended_master_secret)
-            || !WPACKET_put_bytes_u16(pkt, 0)) {
+        || !WPACKET_put_bytes_u16(pkt, 0)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -558,8 +568,8 @@ EXT_RETURN tls_construct_ctos_ems(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_ctos_supported_versions(SSL_CONNECTION *s, WPACKET *pkt,
-                                                 unsigned int context, X509 *x,
-                                                 size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     int currv, min_version, max_version, reason;
 
@@ -577,8 +587,8 @@ EXT_RETURN tls_construct_ctos_supported_versions(SSL_CONNECTION *s, WPACKET *pkt
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_supported_versions)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_start_sub_packet_u8(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_start_sub_packet_u8(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -601,19 +611,19 @@ EXT_RETURN tls_construct_ctos_supported_versions(SSL_CONNECTION *s, WPACKET *pkt
  * Construct a psk_kex_modes extension.
  */
 EXT_RETURN tls_construct_ctos_psk_kex_modes(SSL_CONNECTION *s, WPACKET *pkt,
-                                            unsigned int context, X509 *x,
-                                            size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
 #ifndef OPENSSL_NO_TLS1_3
     int nodhe = s->options & SSL_OP_ALLOW_NO_DHE_KEX;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_psk_kex_modes)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_start_sub_packet_u8(pkt)
-            || !WPACKET_put_bytes_u8(pkt, TLSEXT_KEX_MODE_KE_DHE)
-            || (nodhe && !WPACKET_put_bytes_u8(pkt, TLSEXT_KEX_MODE_KE))
-            || !WPACKET_close(pkt)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_start_sub_packet_u8(pkt)
+        || !WPACKET_put_bytes_u8(pkt, TLSEXT_KEX_MODE_KE_DHE)
+        || (nodhe && !WPACKET_put_bytes_u8(pkt, TLSEXT_KEX_MODE_KE))
+        || !WPACKET_close(pkt)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -653,7 +663,7 @@ static int add_key_share(SSL_CONNECTION *s, WPACKET *pkt, unsigned int group_id,
 
     /* Encode the public key. */
     encodedlen = EVP_PKEY_get1_encoded_public_key(key_share_key,
-                                                  &encoded_pubkey);
+        &encoded_pubkey);
     if (encodedlen == 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EC_LIB);
         goto err;
@@ -661,7 +671,7 @@ static int add_key_share(SSL_CONNECTION *s, WPACKET *pkt, unsigned int group_id,
 
     /* Create KeyShareEntry */
     if (!WPACKET_put_bytes_u16(pkt, group_id)
-            || !WPACKET_sub_memcpy_u16(pkt, encoded_pubkey, encodedlen)) {
+        || !WPACKET_sub_memcpy_u16(pkt, encoded_pubkey, encodedlen)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -680,7 +690,7 @@ static int add_key_share(SSL_CONNECTION *s, WPACKET *pkt, unsigned int group_id,
     OPENSSL_free(encoded_pubkey);
 
     return 1;
- err:
+err:
     if (key_share_key != s->s3.tmp.ks_pkey[loop_num])
         EVP_PKEY_free(key_share_key);
     OPENSSL_free(encoded_pubkey);
@@ -689,8 +699,8 @@ static int add_key_share(SSL_CONNECTION *s, WPACKET *pkt, unsigned int group_id,
 #endif
 
 EXT_RETURN tls_construct_ctos_key_share(SSL_CONNECTION *s, WPACKET *pkt,
-                                        unsigned int context, X509 *x,
-                                        size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
 #ifndef OPENSSL_NO_TLS1_3
     size_t i, num_groups = 0;
@@ -701,10 +711,10 @@ EXT_RETURN tls_construct_ctos_key_share(SSL_CONNECTION *s, WPACKET *pkt,
 
     /* key_share extension */
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_key_share)
-            /* Extension data sub-packet */
-            || !WPACKET_start_sub_packet_u16(pkt)
-            /* KeyShare list sub-packet */
-            || !WPACKET_start_sub_packet_u16(pkt)) {
+        /* Extension data sub-packet */
+        || !WPACKET_start_sub_packet_u16(pkt)
+        /* KeyShare list sub-packet */
+        || !WPACKET_start_sub_packet_u16(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -731,6 +741,7 @@ EXT_RETURN tls_construct_ctos_key_share(SSL_CONNECTION *s, WPACKET *pkt,
             /* SSLfatal() already called */
             return EXT_RETURN_FAIL;
         }
+        valid_keyshare++;
     } else {
         if (s->ext.supportedgroups == NULL) /* use default */
             add_only_one = 1;
@@ -739,7 +750,7 @@ EXT_RETURN tls_construct_ctos_key_share(SSL_CONNECTION *s, WPACKET *pkt,
             if (!tls_group_allowed(s, pgroups[i], SSL_SECOP_CURVE_SUPPORTED))
                 continue;
             if (!tls_valid_group(s, pgroups[i], TLS1_3_VERSION, TLS1_3_VERSION,
-                                 0, NULL))
+                    0, NULL))
                 continue;
 
             group_id = pgroups[i];
@@ -752,13 +763,18 @@ EXT_RETURN tls_construct_ctos_key_share(SSL_CONNECTION *s, WPACKET *pkt,
                 /* SSLfatal() already called */
                 return EXT_RETURN_FAIL;
             }
+            valid_keyshare++;
             if (add_only_one)
                 break;
-
-            valid_keyshare++;
         }
     }
 
+    if (valid_keyshare == 0) {
+        /* No key shares were allowed */
+        SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_NO_SUITABLE_KEY_SHARE);
+        return EXT_RETURN_FAIL;
+    }
+
     if (!WPACKET_close(pkt) || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
@@ -770,8 +786,8 @@ EXT_RETURN tls_construct_ctos_key_share(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_ctos_cookie(SSL_CONNECTION *s, WPACKET *pkt,
-                                     unsigned int context,
-                                     X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     EXT_RETURN ret = EXT_RETURN_FAIL;
 
@@ -780,17 +796,17 @@ EXT_RETURN tls_construct_ctos_cookie(SSL_CONNECTION *s, WPACKET *pkt,
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_cookie)
-               /* Extension data sub-packet */
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_sub_memcpy_u16(pkt, s->ext.tls13_cookie,
-                                       s->ext.tls13_cookie_len)
-            || !WPACKET_close(pkt)) {
+        /* Extension data sub-packet */
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_sub_memcpy_u16(pkt, s->ext.tls13_cookie,
+            s->ext.tls13_cookie_len)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto end;
     }
 
     ret = EXT_RETURN_SENT;
- end:
+end:
     OPENSSL_free(s->ext.tls13_cookie);
     s->ext.tls13_cookie = NULL;
     s->ext.tls13_cookie_len = 0;
@@ -799,12 +815,12 @@ EXT_RETURN tls_construct_ctos_cookie(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_ctos_early_data(SSL_CONNECTION *s, WPACKET *pkt,
-                                         unsigned int context, X509 *x,
-                                         size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
 #ifndef OPENSSL_NO_PSK
     char identity[PSK_MAX_IDENTITY_LEN + 1];
-#endif  /* OPENSSL_NO_PSK */
+#endif /* OPENSSL_NO_PSK */
     const unsigned char *id = NULL;
     size_t idlen = 0;
     SSL_SESSION *psksess = NULL;
@@ -816,9 +832,9 @@ EXT_RETURN tls_construct_ctos_early_data(SSL_CONNECTION *s, WPACKET *pkt,
         handmd = ssl_handshake_md(s);
 
     if (s->psk_use_session_cb != NULL
-            && (!s->psk_use_session_cb(ussl, handmd, &id, &idlen, &psksess)
-                || (psksess != NULL
-                    && psksess->ssl_version != TLS1_3_VERSION))) {
+        && (!s->psk_use_session_cb(ussl, handmd, &id, &idlen, &psksess)
+            || (psksess != NULL
+                && psksess->ssl_version != TLS1_3_VERSION))) {
         SSL_SESSION_free(psksess);
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_BAD_PSK);
         return EXT_RETURN_FAIL;
@@ -831,8 +847,8 @@ EXT_RETURN tls_construct_ctos_early_data(SSL_CONNECTION *s, WPACKET *pkt,
 
         memset(identity, 0, sizeof(identity));
         psklen = s->psk_client_callback(ussl, NULL,
-                                        identity, sizeof(identity) - 1,
-                                        psk, sizeof(psk));
+            identity, sizeof(identity) - 1,
+            psk, sizeof(psk));
 
         if (psklen > PSK_MAX_PSK_LEN) {
             SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, ERR_R_INTERNAL_ERROR);
@@ -853,7 +869,7 @@ EXT_RETURN tls_construct_ctos_early_data(SSL_CONNECTION *s, WPACKET *pkt,
              * the digest so we default to SHA256 as per the TLSv1.3 spec
              */
             cipher = SSL_CIPHER_find(SSL_CONNECTION_GET_SSL(s),
-                                     tls13_aes128gcmsha256_id);
+                tls13_aes128gcmsha256_id);
             if (cipher == NULL) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 return EXT_RETURN_FAIL;
@@ -861,9 +877,9 @@ EXT_RETURN tls_construct_ctos_early_data(SSL_CONNECTION *s, WPACKET *pkt,
 
             psksess = SSL_SESSION_new();
             if (psksess == NULL
-                    || !SSL_SESSION_set1_master_key(psksess, psk, psklen)
-                    || !SSL_SESSION_set_cipher(psksess, cipher)
-                    || !SSL_SESSION_set_protocol_version(psksess, TLS1_3_VERSION)) {
+                || !SSL_SESSION_set1_master_key(psksess, psk, psklen)
+                || !SSL_SESSION_set_cipher(psksess, cipher)
+                || !SSL_SESSION_set_protocol_version(psksess, TLS1_3_VERSION)) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 OPENSSL_cleanse(psk, psklen);
                 return EXT_RETURN_FAIL;
@@ -871,7 +887,7 @@ EXT_RETURN tls_construct_ctos_early_data(SSL_CONNECTION *s, WPACKET *pkt,
             OPENSSL_cleanse(psk, psklen);
         }
     }
-#endif  /* OPENSSL_NO_PSK */
+#endif /* OPENSSL_NO_PSK */
 
     SSL_SESSION_free(s->psksession);
     s->psksession = psksess;
@@ -887,8 +903,8 @@ EXT_RETURN tls_construct_ctos_early_data(SSL_CONNECTION *s, WPACKET *pkt,
     }
 
     if (s->early_data_state != SSL_EARLY_DATA_CONNECTING
-            || (s->session->ext.max_early_data == 0
-                && (psksess == NULL || psksess->ext.max_early_data == 0))) {
+        || (s->session->ext.max_early_data == 0
+            && (psksess == NULL || psksess->ext.max_early_data == 0))) {
         s->max_early_data = 0;
         return EXT_RETURN_NOT_SENT;
     }
@@ -897,10 +913,10 @@ EXT_RETURN tls_construct_ctos_early_data(SSL_CONNECTION *s, WPACKET *pkt,
 
     if (edsess->ext.hostname != NULL) {
         if (s->ext.hostname == NULL
-                || (s->ext.hostname != NULL
-                    && strcmp(s->ext.hostname, edsess->ext.hostname) != 0)) {
+            || (s->ext.hostname != NULL
+                && strcmp(s->ext.hostname, edsess->ext.hostname) != 0)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                     SSL_R_INCONSISTENT_EARLY_DATA_SNI);
+                SSL_R_INCONSISTENT_EARLY_DATA_SNI);
             return EXT_RETURN_FAIL;
         }
     }
@@ -924,21 +940,21 @@ EXT_RETURN tls_construct_ctos_early_data(SSL_CONNECTION *s, WPACKET *pkt,
         }
         while (PACKET_get_length_prefixed_1(&prots, &alpnpkt)) {
             if (PACKET_equal(&alpnpkt, edsess->ext.alpn_selected,
-                             edsess->ext.alpn_selected_len)) {
+                    edsess->ext.alpn_selected_len)) {
                 found = 1;
                 break;
             }
         }
         if (!found) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                     SSL_R_INCONSISTENT_EARLY_DATA_ALPN);
+                SSL_R_INCONSISTENT_EARLY_DATA_ALPN);
             return EXT_RETURN_FAIL;
         }
     }
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_early_data)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -953,8 +969,8 @@ EXT_RETURN tls_construct_ctos_early_data(SSL_CONNECTION *s, WPACKET *pkt,
     return EXT_RETURN_SENT;
 }
 
-#define F5_WORKAROUND_MIN_MSG_LEN   0xff
-#define F5_WORKAROUND_MAX_MSG_LEN   0x200
+#define F5_WORKAROUND_MIN_MSG_LEN 0xff
+#define F5_WORKAROUND_MAX_MSG_LEN 0x200
 
 /*
  * PSK pre binder overhead =
@@ -971,8 +987,8 @@ EXT_RETURN tls_construct_ctos_early_data(SSL_CONNECTION *s, WPACKET *pkt,
 #define PSK_PRE_BINDER_OVERHEAD (2 + 2 + 2 + 2 + 4 + 2 + 1)
 
 EXT_RETURN tls_construct_ctos_padding(SSL_CONNECTION *s, WPACKET *pkt,
-                                      unsigned int context, X509 *x,
-                                      size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     unsigned char *padbytes;
     size_t hlen;
@@ -996,10 +1012,10 @@ EXT_RETURN tls_construct_ctos_padding(SSL_CONNECTION *s, WPACKET *pkt,
      * extension, so we need to calculate how long it is going to be.
      */
     if (s->session->ssl_version == TLS1_3_VERSION
-            && s->session->ext.ticklen != 0
-            && s->session->cipher != NULL) {
+        && s->session->ext.ticklen != 0
+        && s->session->cipher != NULL) {
         const EVP_MD *md = ssl_md(SSL_CONNECTION_GET_CTX(s),
-                                  s->session->cipher->algorithm2);
+            s->session->cipher->algorithm2);
 
         if (md != NULL) {
             /*
@@ -1010,8 +1026,8 @@ EXT_RETURN tls_construct_ctos_padding(SSL_CONNECTION *s, WPACKET *pkt,
 
             if (md_size <= 0)
                 return EXT_RETURN_FAIL;
-            hlen +=  PSK_PRE_BINDER_OVERHEAD + s->session->ext.ticklen
-                     + md_size;
+            hlen += PSK_PRE_BINDER_OVERHEAD + s->session->ext.ticklen
+                + md_size;
         }
     }
 
@@ -1031,7 +1047,7 @@ EXT_RETURN tls_construct_ctos_padding(SSL_CONNECTION *s, WPACKET *pkt,
             hlen = 1;
 
         if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_padding)
-                || !WPACKET_sub_allocate_bytes_u16(pkt, hlen, &padbytes)) {
+            || !WPACKET_sub_allocate_bytes_u16(pkt, hlen, &padbytes)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return EXT_RETURN_FAIL;
         }
@@ -1045,8 +1061,8 @@ EXT_RETURN tls_construct_ctos_padding(SSL_CONNECTION *s, WPACKET *pkt,
  * Construct the pre_shared_key extension
  */
 EXT_RETURN tls_construct_ctos_psk(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
 #ifndef OPENSSL_NO_TLS1_3
     uint32_t agesec, agems = 0;
@@ -1071,7 +1087,7 @@ EXT_RETURN tls_construct_ctos_psk(SSL_CONNECTION *s, WPACKET *pkt,
      * so don't add this extension.
      */
     if (s->session->ssl_version != TLS1_3_VERSION
-            || (s->session->ext.ticklen == 0 && s->psksession == NULL))
+        || (s->session->ext.ticklen == 0 && s->psksession == NULL))
         return EXT_RETURN_NOT_SENT;
 
     if (s->hello_retry_request == SSL_HRR_PENDING)
@@ -1153,7 +1169,7 @@ EXT_RETURN tls_construct_ctos_psk(SSL_CONNECTION *s, WPACKET *pkt,
         dores = 1;
     }
 
- dopsksess:
+dopsksess:
     if (!dores && s->psksession == NULL)
         return EXT_RETURN_NOT_SENT;
 
@@ -1186,16 +1202,16 @@ EXT_RETURN tls_construct_ctos_psk(SSL_CONNECTION *s, WPACKET *pkt,
 
     /* Create the extension, but skip over the binder for now */
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_psk)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_start_sub_packet_u16(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_start_sub_packet_u16(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
 
     if (dores) {
         if (!WPACKET_sub_memcpy_u16(pkt, s->session->ext.tick,
-                                           s->session->ext.ticklen)
-                || !WPACKET_put_bytes_u32(pkt, agems)) {
+                s->session->ext.ticklen)
+            || !WPACKET_put_bytes_u32(pkt, agems)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return EXT_RETURN_FAIL;
         }
@@ -1203,8 +1219,8 @@ EXT_RETURN tls_construct_ctos_psk(SSL_CONNECTION *s, WPACKET *pkt,
 
     if (s->psksession != NULL) {
         if (!WPACKET_sub_memcpy_u16(pkt, s->psksession_id,
-                                    s->psksession_id_len)
-                || !WPACKET_put_bytes_u32(pkt, 0)) {
+                s->psksession_id_len)
+            || !WPACKET_put_bytes_u32(pkt, 0)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return EXT_RETURN_FAIL;
         }
@@ -1212,20 +1228,20 @@ EXT_RETURN tls_construct_ctos_psk(SSL_CONNECTION *s, WPACKET *pkt,
     }
 
     if (!WPACKET_close(pkt)
-            || !WPACKET_get_total_written(pkt, &binderoffset)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || (dores
-                && !WPACKET_sub_allocate_bytes_u8(pkt, reshashsize, &resbinder))
-            || (s->psksession != NULL
-                && !WPACKET_sub_allocate_bytes_u8(pkt, pskhashsize, &pskbinder))
-            || !WPACKET_close(pkt)
-            || !WPACKET_close(pkt)
-            || !WPACKET_get_total_written(pkt, &msglen)
-               /*
-                * We need to fill in all the sub-packet lengths now so we can
-                * calculate the HMAC of the message up to the binders
-                */
-            || !WPACKET_fill_lengths(pkt)) {
+        || !WPACKET_get_total_written(pkt, &binderoffset)
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || (dores
+            && !WPACKET_sub_allocate_bytes_u8(pkt, reshashsize, &resbinder))
+        || (s->psksession != NULL
+            && !WPACKET_sub_allocate_bytes_u8(pkt, pskhashsize, &pskbinder))
+        || !WPACKET_close(pkt)
+        || !WPACKET_close(pkt)
+        || !WPACKET_get_total_written(pkt, &msglen)
+        /*
+         * We need to fill in all the sub-packet lengths now so we can
+         * calculate the HMAC of the message up to the binders
+         */
+        || !WPACKET_fill_lengths(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1233,15 +1249,17 @@ EXT_RETURN tls_construct_ctos_psk(SSL_CONNECTION *s, WPACKET *pkt,
     msgstart = WPACKET_get_curr(pkt) - msglen;
 
     if (dores
-            && tls_psk_do_binder(s, mdres, msgstart, binderoffset, NULL,
-                                 resbinder, s->session, 1, 0) != 1) {
+        && tls_psk_do_binder(s, mdres, msgstart, binderoffset, NULL,
+               resbinder, s->session, 1, 0)
+            != 1) {
         /* SSLfatal() already called */
         return EXT_RETURN_FAIL;
     }
 
     if (s->psksession != NULL
-            && tls_psk_do_binder(s, mdpsk, msgstart, binderoffset, NULL,
-                                 pskbinder, s->psksession, 1, 1) != 1) {
+        && tls_psk_do_binder(s, mdpsk, msgstart, binderoffset, NULL,
+               pskbinder, s->psksession, 1, 1)
+            != 1) {
         /* SSLfatal() already called */
         return EXT_RETURN_FAIL;
     }
@@ -1253,9 +1271,9 @@ EXT_RETURN tls_construct_ctos_psk(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_ctos_post_handshake_auth(SSL_CONNECTION *s, WPACKET *pkt,
-                                                  ossl_unused unsigned int context,
-                                                  ossl_unused X509 *x,
-                                                  ossl_unused size_t chainidx)
+    ossl_unused unsigned int context,
+    ossl_unused X509 *x,
+    ossl_unused size_t chainidx)
 {
 #ifndef OPENSSL_NO_TLS1_3
     if (!s->pha_enabled)
@@ -1263,8 +1281,8 @@ EXT_RETURN tls_construct_ctos_post_handshake_auth(SSL_CONNECTION *s, WPACKET *pk
 
     /* construct extension - 0 length, no contents */
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_post_handshake_auth)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1277,13 +1295,12 @@ EXT_RETURN tls_construct_ctos_post_handshake_auth(SSL_CONNECTION *s, WPACKET *pk
 #endif
 }
 
-
 /*
  * Parse the server's renegotiation binding and abort if it's not right
  */
 int tls_parse_stoc_renegotiate(SSL_CONNECTION *s, PACKET *pkt,
-                               unsigned int context,
-                               X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     size_t expected_len = s->s3.previous_client_finished_len
         + s->s3.previous_server_finished_len;
@@ -1292,9 +1309,9 @@ int tls_parse_stoc_renegotiate(SSL_CONNECTION *s, PACKET *pkt,
 
     /* Check for logic errors */
     if (!ossl_assert(expected_len == 0
-                     || s->s3.previous_client_finished_len != 0)
+            || s->s3.previous_client_finished_len != 0)
         || !ossl_assert(expected_len == 0
-                        || s->s3.previous_server_finished_len != 0)) {
+            || s->s3.previous_server_finished_len != 0)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -1319,14 +1336,16 @@ int tls_parse_stoc_renegotiate(SSL_CONNECTION *s, PACKET *pkt,
 
     if (!PACKET_get_bytes(pkt, &data, s->s3.previous_client_finished_len)
         || memcmp(data, s->s3.previous_client_finished,
-                  s->s3.previous_client_finished_len) != 0) {
+               s->s3.previous_client_finished_len)
+            != 0) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_RENEGOTIATION_MISMATCH);
         return 0;
     }
 
     if (!PACKET_get_bytes(pkt, &data, s->s3.previous_server_finished_len)
         || memcmp(data, s->s3.previous_server_finished,
-                  s->s3.previous_server_finished_len) != 0) {
+               s->s3.previous_server_finished_len)
+            != 0) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_RENEGOTIATION_MISMATCH);
         return 0;
     }
@@ -1337,8 +1356,8 @@ int tls_parse_stoc_renegotiate(SSL_CONNECTION *s, PACKET *pkt,
 
 /* Parse the server's max fragment len extension packet */
 int tls_parse_stoc_maxfragmentlen(SSL_CONNECTION *s, PACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     unsigned int value;
 
@@ -1350,7 +1369,7 @@ int tls_parse_stoc_maxfragmentlen(SSL_CONNECTION *s, PACKET *pkt,
     /* |value| should contains a valid max-fragment-length code. */
     if (!IS_MAX_FRAGMENT_LENGTH_EXT_VALID(value)) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                 SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH);
+            SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH);
         return 0;
     }
 
@@ -1362,7 +1381,7 @@ int tls_parse_stoc_maxfragmentlen(SSL_CONNECTION *s, PACKET *pkt,
      */
     if (value != s->ext.max_fragment_len_mode) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                 SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH);
+            SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH);
         return 0;
     }
 
@@ -1376,8 +1395,8 @@ int tls_parse_stoc_maxfragmentlen(SSL_CONNECTION *s, PACKET *pkt,
 }
 
 int tls_parse_stoc_server_name(SSL_CONNECTION *s, PACKET *pkt,
-                               unsigned int context,
-                               X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     if (s->ext.hostname == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -1405,8 +1424,8 @@ int tls_parse_stoc_server_name(SSL_CONNECTION *s, PACKET *pkt,
 }
 
 int tls_parse_stoc_ec_pt_formats(SSL_CONNECTION *s, PACKET *pkt,
-                                 unsigned int context,
-                                 X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     size_t ecpointformats_len;
     PACKET ecptformatlist;
@@ -1434,8 +1453,8 @@ int tls_parse_stoc_ec_pt_formats(SSL_CONNECTION *s, PACKET *pkt,
         s->ext.peer_ecpointformats_len = ecpointformats_len;
 
         if (!PACKET_copy_bytes(&ecptformatlist,
-                               s->ext.peer_ecpointformats,
-                               ecpointformats_len)) {
+                s->ext.peer_ecpointformats,
+                ecpointformats_len)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -1445,15 +1464,12 @@ int tls_parse_stoc_ec_pt_formats(SSL_CONNECTION *s, PACKET *pkt,
 }
 
 int tls_parse_stoc_session_ticket(SSL_CONNECTION *s, PACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     SSL *ssl = SSL_CONNECTION_GET_USER_SSL(s);
 
-    if (s->ext.session_ticket_cb != NULL &&
-        !s->ext.session_ticket_cb(ssl, PACKET_data(pkt),
-                                  PACKET_remaining(pkt),
-                                  s->ext.session_ticket_cb_arg)) {
+    if (s->ext.session_ticket_cb != NULL && !s->ext.session_ticket_cb(ssl, PACKET_data(pkt), PACKET_remaining(pkt), s->ext.session_ticket_cb_arg)) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_BAD_EXTENSION);
         return 0;
     }
@@ -1474,8 +1490,8 @@ int tls_parse_stoc_session_ticket(SSL_CONNECTION *s, PACKET *pkt,
 
 #ifndef OPENSSL_NO_OCSP
 int tls_parse_stoc_status_request(SSL_CONNECTION *s, PACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     if (context == SSL_EXT_TLS1_3_CERTIFICATE_REQUEST) {
         /* We ignore this if the server sends a CertificateRequest */
@@ -1513,10 +1529,9 @@ int tls_parse_stoc_status_request(SSL_CONNECTION *s, PACKET *pkt,
 }
 #endif
 
-
 #ifndef OPENSSL_NO_CT
 int tls_parse_stoc_sct(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     if (context == SSL_EXT_TLS1_3_CERTIFICATE_REQUEST) {
         /* We ignore this if the server sends it in a CertificateRequest */
@@ -1550,23 +1565,25 @@ int tls_parse_stoc_sct(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
         }
     } else {
         ENDPOINT role = (context & SSL_EXT_TLS1_2_SERVER_HELLO) != 0
-                        ? ENDPOINT_CLIENT : ENDPOINT_BOTH;
+            ? ENDPOINT_CLIENT
+            : ENDPOINT_BOTH;
 
         /*
          * If we didn't ask for it then there must be a custom extension,
          * otherwise this is unsolicited.
          */
         if (custom_ext_find(&s->cert->custext, role,
-                            TLSEXT_TYPE_signed_certificate_timestamp,
-                            NULL) == NULL) {
+                TLSEXT_TYPE_signed_certificate_timestamp,
+                NULL)
+            == NULL) {
             SSLfatal(s, TLS1_AD_UNSUPPORTED_EXTENSION, SSL_R_BAD_EXTENSION);
             return 0;
         }
 
         if (!custom_ext_parse(s, context,
-                             TLSEXT_TYPE_signed_certificate_timestamp,
-                             PACKET_data(pkt), PACKET_remaining(pkt),
-                             x, chainidx)) {
+                TLSEXT_TYPE_signed_certificate_timestamp,
+                PACKET_data(pkt), PACKET_remaining(pkt),
+                x, chainidx)) {
             /* SSLfatal already called */
             return 0;
         }
@@ -1576,7 +1593,6 @@ int tls_parse_stoc_sct(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 }
 #endif
 
-
 #ifndef OPENSSL_NO_NEXTPROTONEG
 /*
  * ssl_next_proto_validate validates a Next Protocol Negotiation block. No
@@ -1599,7 +1615,7 @@ static int ssl_next_proto_validate(SSL_CONNECTION *s, PACKET *pkt)
 }
 
 int tls_parse_stoc_npn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     unsigned char *selected;
     unsigned char selected_len;
@@ -1623,10 +1639,11 @@ int tls_parse_stoc_npn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
         return 0;
     }
     if (sctx->ext.npn_select_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                &selected, &selected_len,
-                                PACKET_data(pkt), PACKET_remaining(pkt),
-                                sctx->ext.npn_select_cb_arg) != SSL_TLSEXT_ERR_OK
-            || selected_len == 0) {
+            &selected, &selected_len,
+            PACKET_data(pkt), PACKET_remaining(pkt),
+            sctx->ext.npn_select_cb_arg)
+            != SSL_TLSEXT_ERR_OK
+        || selected_len == 0) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_BAD_EXTENSION);
         return 0;
     }
@@ -1652,7 +1669,7 @@ int tls_parse_stoc_npn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 #endif
 
 int tls_parse_stoc_alpn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                        X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     size_t len;
     PACKET confpkt, protpkt;
@@ -1711,9 +1728,9 @@ int tls_parse_stoc_alpn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
     s->s3.alpn_selected_len = len;
 
     if (s->session->ext.alpn_selected == NULL
-            || s->session->ext.alpn_selected_len != len
-            || memcmp(s->session->ext.alpn_selected, s->s3.alpn_selected, len)
-               != 0) {
+        || s->session->ext.alpn_selected_len != len
+        || memcmp(s->session->ext.alpn_selected, s->s3.alpn_selected, len)
+            != 0) {
         /* ALPN not consistent with the old session so cannot use early_data */
         s->ext.early_data_ok = 0;
     }
@@ -1726,8 +1743,7 @@ int tls_parse_stoc_alpn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
         }
-        s->session->ext.alpn_selected =
-            OPENSSL_memdup(s->s3.alpn_selected, s->s3.alpn_selected_len);
+        s->session->ext.alpn_selected = OPENSSL_memdup(s->s3.alpn_selected, s->s3.alpn_selected_len);
         if (s->session->ext.alpn_selected == NULL) {
             s->session->ext.alpn_selected_len = 0;
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -1741,7 +1757,7 @@ int tls_parse_stoc_alpn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 
 #ifndef OPENSSL_NO_SRTP
 int tls_parse_stoc_use_srtp(SSL_CONNECTION *s, PACKET *pkt,
-                            unsigned int context, X509 *x, size_t chainidx)
+    unsigned int context, X509 *x, size_t chainidx)
 {
     unsigned int id, ct, mki;
     int i;
@@ -1749,11 +1765,11 @@ int tls_parse_stoc_use_srtp(SSL_CONNECTION *s, PACKET *pkt,
     SRTP_PROTECTION_PROFILE *prof;
 
     if (!PACKET_get_net_2(pkt, &ct) || ct != 2
-            || !PACKET_get_net_2(pkt, &id)
-            || !PACKET_get_1(pkt, &mki)
-            || PACKET_remaining(pkt) != 0) {
+        || !PACKET_get_net_2(pkt, &id)
+        || !PACKET_get_1(pkt, &mki)
+        || PACKET_remaining(pkt) != 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR,
-                 SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
+            SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
         return 0;
     }
 
@@ -1784,29 +1800,29 @@ int tls_parse_stoc_use_srtp(SSL_CONNECTION *s, PACKET *pkt,
     }
 
     SSLfatal(s, SSL_AD_DECODE_ERROR,
-             SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
+        SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
     return 0;
 }
 #endif
 
 int tls_parse_stoc_etm(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     /* Ignore if inappropriate ciphersuite */
     if (!(s->options & SSL_OP_NO_ENCRYPT_THEN_MAC)
-            && s->s3.tmp.new_cipher->algorithm_mac != SSL_AEAD
-            && s->s3.tmp.new_cipher->algorithm_enc != SSL_RC4
-            && s->s3.tmp.new_cipher->algorithm_enc != SSL_eGOST2814789CNT
-            && s->s3.tmp.new_cipher->algorithm_enc != SSL_eGOST2814789CNT12
-            && s->s3.tmp.new_cipher->algorithm_enc != SSL_MAGMA
-            && s->s3.tmp.new_cipher->algorithm_enc != SSL_KUZNYECHIK)
+        && s->s3.tmp.new_cipher->algorithm_mac != SSL_AEAD
+        && s->s3.tmp.new_cipher->algorithm_enc != SSL_RC4
+        && s->s3.tmp.new_cipher->algorithm_enc != SSL_eGOST2814789CNT
+        && s->s3.tmp.new_cipher->algorithm_enc != SSL_eGOST2814789CNT12
+        && s->s3.tmp.new_cipher->algorithm_enc != SSL_MAGMA
+        && s->s3.tmp.new_cipher->algorithm_enc != SSL_KUZNYECHIK)
         s->ext.use_etm = 1;
 
     return 1;
 }
 
 int tls_parse_stoc_ems(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     if (s->options & SSL_OP_NO_EXTENDED_MASTER_SECRET)
         return 1;
@@ -1818,13 +1834,13 @@ int tls_parse_stoc_ems(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 }
 
 int tls_parse_stoc_supported_versions(SSL_CONNECTION *s, PACKET *pkt,
-                                      unsigned int context,
-                                      X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     unsigned int version;
 
     if (!PACKET_get_net_2(pkt, &version)
-            || PACKET_remaining(pkt) != 0) {
+        || PACKET_remaining(pkt) != 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
         return 0;
     }
@@ -1835,7 +1851,7 @@ int tls_parse_stoc_supported_versions(SSL_CONNECTION *s, PACKET *pkt,
      */
     if (version != TLS1_3_VERSION) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                 SSL_R_BAD_PROTOCOL_VERSION_NUMBER);
+            SSL_R_BAD_PROTOCOL_VERSION_NUMBER);
         return 0;
     }
 
@@ -1854,8 +1870,8 @@ int tls_parse_stoc_supported_versions(SSL_CONNECTION *s, PACKET *pkt,
 }
 
 int tls_parse_stoc_key_share(SSL_CONNECTION *s, PACKET *pkt,
-                             unsigned int context, X509 *x,
-                             size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
 #ifndef OPENSSL_NO_TLS1_3
     unsigned int group_id;
@@ -1904,9 +1920,9 @@ int tls_parse_stoc_key_share(SSL_CONNECTION *s, PACKET *pkt,
                 break;
         }
         if (i >= num_groups
-                || !tls_group_allowed(s, group_id, SSL_SECOP_CURVE_SUPPORTED)
-                || !tls_valid_group(s, group_id, TLS1_3_VERSION, TLS1_3_VERSION,
-                                    0, NULL)) {
+            || !tls_group_allowed(s, group_id, SSL_SECOP_CURVE_SUPPORTED)
+            || !tls_valid_group(s, group_id, TLS1_3_VERSION, TLS1_3_VERSION,
+                0, NULL)) {
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_KEY_SHARE);
             return 0;
         }
@@ -1972,13 +1988,14 @@ int tls_parse_stoc_key_share(SSL_CONNECTION *s, PACKET *pkt,
     }
 
     if ((ginf = tls1_group_id_lookup(SSL_CONNECTION_GET_CTX(s),
-                                     group_id)) == NULL) {
+             group_id))
+        == NULL) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_KEY_SHARE);
         return 0;
     }
 
     if (!PACKET_as_length_prefixed_2(pkt, &encoded_pt)
-            || PACKET_remaining(&encoded_pt) == 0) {
+        || PACKET_remaining(&encoded_pt) == 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
         return 0;
     }
@@ -1993,7 +2010,8 @@ int tls_parse_stoc_key_share(SSL_CONNECTION *s, PACKET *pkt,
         }
 
         if (tls13_set_encoded_pub_key(skey, PACKET_data(&encoded_pt),
-                                      PACKET_remaining(&encoded_pt)) <= 0) {
+                PACKET_remaining(&encoded_pt))
+            <= 0) {
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_ECPOINT);
             EVP_PKEY_free(skey);
             return 0;
@@ -2022,13 +2040,13 @@ int tls_parse_stoc_key_share(SSL_CONNECTION *s, PACKET *pkt,
 }
 
 int tls_parse_stoc_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                          X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     PACKET cookie;
 
     if (!PACKET_as_length_prefixed_2(pkt, &cookie)
-            || !PACKET_memdup(&cookie, &s->ext.tls13_cookie,
-                              &s->ext.tls13_cookie_len)) {
+        || !PACKET_memdup(&cookie, &s->ext.tls13_cookie,
+            &s->ext.tls13_cookie_len)) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
         return 0;
     }
@@ -2037,14 +2055,14 @@ int tls_parse_stoc_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 }
 
 int tls_parse_stoc_early_data(SSL_CONNECTION *s, PACKET *pkt,
-                              unsigned int context,
-                              X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     if (context == SSL_EXT_TLS1_3_NEW_SESSION_TICKET) {
         unsigned long max_early_data;
 
         if (!PACKET_get_net_4(pkt, &max_early_data)
-                || PACKET_remaining(pkt) != 0) {
+            || PACKET_remaining(pkt) != 0) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_INVALID_MAX_EARLY_DATA);
             return 0;
         }
@@ -2076,7 +2094,7 @@ int tls_parse_stoc_early_data(SSL_CONNECTION *s, PACKET *pkt,
     }
 
     if (!s->ext.early_data_ok
-            || !s->hit) {
+        || !s->hit) {
         /*
          * If we get here then we didn't send early data, or we didn't resume
          * using the first identity, or the SNI/ALPN is not consistent so the
@@ -2092,8 +2110,8 @@ int tls_parse_stoc_early_data(SSL_CONNECTION *s, PACKET *pkt,
 }
 
 int tls_parse_stoc_psk(SSL_CONNECTION *s, PACKET *pkt,
-                       unsigned int context, X509 *x,
-                       size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
 #ifndef OPENSSL_NO_TLS1_3
     unsigned int identity;
@@ -2132,9 +2150,9 @@ int tls_parse_stoc_psk(SSL_CONNECTION *s, PACKET *pkt,
      * early_secret across that we generated earlier.
      */
     if ((s->early_data_state != SSL_EARLY_DATA_WRITE_RETRY
-                && s->early_data_state != SSL_EARLY_DATA_FINISHED_WRITING)
-            || s->session->ext.max_early_data > 0
-            || s->psksession->ext.max_early_data == 0)
+            && s->early_data_state != SSL_EARLY_DATA_FINISHED_WRITING)
+        || s->session->ext.max_early_data > 0
+        || s->psksession->ext.max_early_data == 0)
         memcpy(s->early_secret, s->psksession->early_secret, EVP_MAX_MD_SIZE);
 
     SSL_SESSION_free(s->session);
@@ -2150,17 +2168,17 @@ int tls_parse_stoc_psk(SSL_CONNECTION *s, PACKET *pkt,
 }
 
 EXT_RETURN tls_construct_ctos_client_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
-                                               unsigned int context,
-                                               X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     sc->ext.client_cert_type_ctos = OSSL_CERT_TYPE_CTOS_NONE;
     if (sc->client_cert_type == NULL)
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_client_cert_type)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_sub_memcpy_u8(pkt, sc->client_cert_type, sc->client_cert_type_len)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_sub_memcpy_u8(pkt, sc->client_cert_type, sc->client_cert_type_len)
+        || !WPACKET_close(pkt)) {
         SSLfatal(sc, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -2169,8 +2187,8 @@ EXT_RETURN tls_construct_ctos_client_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
 }
 
 int tls_parse_stoc_client_cert_type(SSL_CONNECTION *sc, PACKET *pkt,
-                                    unsigned int context,
-                                    X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     unsigned int type;
 
@@ -2202,17 +2220,17 @@ int tls_parse_stoc_client_cert_type(SSL_CONNECTION *sc, PACKET *pkt,
 }
 
 EXT_RETURN tls_construct_ctos_server_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
-                                               unsigned int context,
-                                               X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     sc->ext.server_cert_type_ctos = OSSL_CERT_TYPE_CTOS_NONE;
     if (sc->server_cert_type == NULL)
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_server_cert_type)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_sub_memcpy_u8(pkt, sc->server_cert_type, sc->server_cert_type_len)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_sub_memcpy_u8(pkt, sc->server_cert_type, sc->server_cert_type_len)
+        || !WPACKET_close(pkt)) {
         SSLfatal(sc, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -2221,8 +2239,8 @@ EXT_RETURN tls_construct_ctos_server_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
 }
 
 int tls_parse_stoc_server_cert_type(SSL_CONNECTION *sc, PACKET *pkt,
-                                    unsigned int context,
-                                    X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     unsigned int type;
 
diff --git a/ssl/statem/extensions_cust.c b/ssl/statem/extensions_cust.c
index b9d08da33f906..ce1c69bbdc1de 100644
--- a/ssl/statem/extensions_cust.c
+++ b/ssl/statem/extensions_cust.c
@@ -30,10 +30,10 @@ typedef struct {
  * Provide thin wrapper callbacks which convert new style arguments to old style
  */
 static int custom_ext_add_old_cb_wrap(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)
 {
     custom_ext_add_cb_wrap *add_cb_wrap = (custom_ext_add_cb_wrap *)add_arg;
 
@@ -41,12 +41,12 @@ static int custom_ext_add_old_cb_wrap(SSL *s, unsigned int ext_type,
         return 1;
 
     return add_cb_wrap->add_cb(s, ext_type, out, outlen, al,
-                               add_cb_wrap->add_arg);
+        add_cb_wrap->add_arg);
 }
 
 static void custom_ext_free_old_cb_wrap(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)
 {
     custom_ext_add_cb_wrap *add_cb_wrap = (custom_ext_add_cb_wrap *)add_arg;
 
@@ -57,19 +57,18 @@ static void custom_ext_free_old_cb_wrap(SSL *s, unsigned int ext_type,
 }
 
 static int custom_ext_parse_old_cb_wrap(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)
 {
-    custom_ext_parse_cb_wrap *parse_cb_wrap =
-        (custom_ext_parse_cb_wrap *)parse_arg;
+    custom_ext_parse_cb_wrap *parse_cb_wrap = (custom_ext_parse_cb_wrap *)parse_arg;
 
     if (parse_cb_wrap->parse_cb == NULL)
         return 1;
 
     return parse_cb_wrap->parse_cb(s, ext_type, in, inlen, al,
-                                   parse_cb_wrap->parse_arg);
+        parse_cb_wrap->parse_arg);
 }
 
 /*
@@ -80,16 +79,16 @@ static int custom_ext_parse_old_cb_wrap(SSL *s, unsigned int ext_type,
  * client, or ENDPOINT_BOTH for either
  */
 custom_ext_method *custom_ext_find(const custom_ext_methods *exts,
-                                   ENDPOINT role, unsigned int ext_type,
-                                   size_t *idx)
+    ENDPOINT role, unsigned int ext_type,
+    size_t *idx)
 {
     size_t i;
     custom_ext_method *meth = exts->meths;
 
     for (i = 0; i < exts->meths_count; i++, meth++) {
         if (ext_type == meth->ext_type
-                && (role == ENDPOINT_BOTH || role == meth->role
-                    || meth->role == ENDPOINT_BOTH)) {
+            && (role == ENDPOINT_BOTH || role == meth->role
+                || meth->role == ENDPOINT_BOTH)) {
             if (idx != NULL)
                 *idx = i;
             return meth;
@@ -107,14 +106,14 @@ void custom_ext_init(custom_ext_methods *exts)
     custom_ext_method *meth = exts->meths;
 
     for (i = 0; i < exts->meths_count; i++, meth++)
-        meth->ext_flags = 0;
+        meth->ext_flags &= ~(SSL_EXT_FLAG_SENT | SSL_EXT_FLAG_RECEIVED);
 }
 
 /* Pass received custom extension data to the application for parsing. */
 int custom_ext_parse(SSL_CONNECTION *s, unsigned int context,
-                     unsigned int ext_type,
-                     const unsigned char *ext_data, size_t ext_size, X509 *x,
-                     size_t chainidx)
+    unsigned int ext_type,
+    const unsigned char *ext_data, size_t ext_size, X509 *x,
+    size_t chainidx)
 {
     int al = 0;
     custom_ext_methods *exts = &s->cert->custext;
@@ -133,9 +132,7 @@ int custom_ext_parse(SSL_CONNECTION *s, unsigned int context,
     if (!extension_is_relevant(s, meth->context, context))
         return 1;
 
-    if ((context & (SSL_EXT_TLS1_2_SERVER_HELLO
-                    | SSL_EXT_TLS1_3_SERVER_HELLO
-                    | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS)) != 0) {
+    if ((context & (SSL_EXT_TLS1_2_SERVER_HELLO | SSL_EXT_TLS1_3_SERVER_HELLO | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS)) != 0) {
         /*
          * If it's ServerHello or EncryptedExtensions we can't have any
          * extensions not sent in ClientHello.
@@ -152,7 +149,7 @@ int custom_ext_parse(SSL_CONNECTION *s, unsigned int context,
      * extensions in the response messages
      */
     if ((context & (SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_3_CERTIFICATE_REQUEST))
-            != 0)
+        != 0)
         meth->ext_flags |= SSL_EXT_FLAG_RECEIVED;
 
     /* If no parse function set return success */
@@ -160,7 +157,8 @@ int custom_ext_parse(SSL_CONNECTION *s, unsigned int context,
         return 1;
 
     if (meth->parse_cb(SSL_CONNECTION_GET_USER_SSL(s), ext_type, context, ext_data,
-                       ext_size, x, chainidx, &al, meth->parse_arg) <= 0) {
+            ext_size, x, chainidx, &al, meth->parse_arg)
+        <= 0) {
         SSLfatal(s, al, SSL_R_BAD_EXTENSION);
         return 0;
     }
@@ -173,7 +171,7 @@ int custom_ext_parse(SSL_CONNECTION *s, unsigned int context,
  * buffer.
  */
 int custom_ext_add(SSL_CONNECTION *s, int context, WPACKET *pkt, X509 *x,
-                   size_t chainidx, int maxversion)
+    size_t chainidx, int maxversion)
 {
     custom_ext_methods *exts = &s->cert->custext;
     custom_ext_method *meth;
@@ -190,12 +188,7 @@ int custom_ext_add(SSL_CONNECTION *s, int context, WPACKET *pkt, X509 *x,
         if (!should_add_extension(s, meth->context, context, maxversion))
             continue;
 
-        if ((context & (SSL_EXT_TLS1_2_SERVER_HELLO
-                        | SSL_EXT_TLS1_3_SERVER_HELLO
-                        | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS
-                        | SSL_EXT_TLS1_3_CERTIFICATE
-                        | SSL_EXT_TLS1_3_RAW_PUBLIC_KEY
-                        | SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST)) != 0) {
+        if ((context & (SSL_EXT_TLS1_2_SERVER_HELLO | SSL_EXT_TLS1_3_SERVER_HELLO | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS | SSL_EXT_TLS1_3_CERTIFICATE | SSL_EXT_TLS1_3_RAW_PUBLIC_KEY | SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST)) != 0) {
             /* Only send extensions present in ClientHello/CertificateRequest */
             if (!(meth->ext_flags & SSL_EXT_FLAG_RECEIVED))
                 continue;
@@ -209,26 +202,26 @@ int custom_ext_add(SSL_CONNECTION *s, int context, WPACKET *pkt, X509 *x,
 
         if (meth->add_cb != NULL) {
             int cb_retval = meth->add_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                         meth->ext_type, context, &out,
-                                         &outlen, x, chainidx, &al,
-                                         meth->add_arg);
+                meth->ext_type, context, &out,
+                &outlen, x, chainidx, &al,
+                meth->add_arg);
 
             if (cb_retval < 0) {
                 if (!for_comp)
                     SSLfatal(s, al, SSL_R_CALLBACK_FAILED);
-                return 0;       /* error */
+                return 0; /* error */
             }
             if (cb_retval == 0)
-                continue;       /* skip this extension */
+                continue; /* skip this extension */
         }
 
         if (!WPACKET_put_bytes_u16(pkt, meth->ext_type)
-                || !WPACKET_start_sub_packet_u16(pkt)
-                || (outlen > 0 && !WPACKET_memcpy(pkt, out, outlen))
-                || !WPACKET_close(pkt)) {
+            || !WPACKET_start_sub_packet_u16(pkt)
+            || (outlen > 0 && !WPACKET_memcpy(pkt, out, outlen))
+            || !WPACKET_close(pkt)) {
             if (meth->free_cb != NULL)
                 meth->free_cb(SSL_CONNECTION_GET_USER_SSL(s), meth->ext_type,
-                              context, out, meth->add_arg);
+                    context, out, meth->add_arg);
             if (!for_comp)
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
@@ -240,7 +233,7 @@ int custom_ext_add(SSL_CONNECTION *s, int context, WPACKET *pkt, X509 *x,
             if (!ossl_assert((meth->ext_flags & SSL_EXT_FLAG_SENT) == 0)) {
                 if (meth->free_cb != NULL)
                     meth->free_cb(SSL_CONNECTION_GET_USER_SSL(s), meth->ext_type,
-                                  context, out, meth->add_arg);
+                        context, out, meth->add_arg);
                 if (!for_comp)
                     SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 return 0;
@@ -254,21 +247,21 @@ int custom_ext_add(SSL_CONNECTION *s, int context, WPACKET *pkt, X509 *x,
         }
         if (meth->free_cb != NULL)
             meth->free_cb(SSL_CONNECTION_GET_USER_SSL(s), meth->ext_type,
-                          context, out, meth->add_arg);
+                context, out, meth->add_arg);
     }
     return 1;
 }
 
 /* Copy the flags from src to dst for any extensions that exist in both */
 int custom_exts_copy_flags(custom_ext_methods *dst,
-                           const custom_ext_methods *src)
+    const custom_ext_methods *src)
 {
     size_t i;
     custom_ext_method *methsrc = src->meths;
 
     for (i = 0; i < src->meths_count; i++, methsrc++) {
         custom_ext_method *methdst = custom_ext_find(dst, methsrc->role,
-                                                     methsrc->ext_type, NULL);
+            methsrc->ext_type, NULL);
 
         if (methdst == NULL)
             continue;
@@ -279,6 +272,31 @@ int custom_exts_copy_flags(custom_ext_methods *dst,
     return 1;
 }
 
+/* Copy old style API wrapper arguments */
+static void custom_ext_copy_old_cb(custom_ext_method *methdst,
+    const custom_ext_method *methsrc,
+    int *err)
+{
+    if (methsrc->add_cb != custom_ext_add_old_cb_wrap)
+        return;
+
+    if (*err) {
+        methdst->add_arg = NULL;
+        methdst->parse_arg = NULL;
+        return;
+    }
+
+    methdst->add_arg = OPENSSL_memdup(methsrc->add_arg,
+        sizeof(custom_ext_add_cb_wrap));
+    methdst->parse_arg = OPENSSL_memdup(methsrc->parse_arg,
+        sizeof(custom_ext_parse_cb_wrap));
+
+    if (methdst->add_arg == NULL || methdst->parse_arg == NULL)
+        *err = 1;
+
+    return;
+}
+
 /* Copy table of custom extensions */
 int custom_exts_copy(custom_ext_methods *dst, const custom_ext_methods *src)
 {
@@ -286,38 +304,63 @@ int custom_exts_copy(custom_ext_methods *dst, const custom_ext_methods *src)
     int err = 0;
 
     if (src->meths_count > 0) {
-        dst->meths =
-            OPENSSL_memdup(src->meths,
-                           sizeof(*src->meths) * src->meths_count);
+        dst->meths = OPENSSL_memdup(src->meths,
+            sizeof(*src->meths) * src->meths_count);
         if (dst->meths == NULL)
             return 0;
         dst->meths_count = src->meths_count;
 
-        for (i = 0; i < src->meths_count; i++) {
-            custom_ext_method *methsrc = src->meths + i;
-            custom_ext_method *methdst = dst->meths + i;
+        for (i = 0; i < src->meths_count; i++)
+            custom_ext_copy_old_cb(&dst->meths[i], &src->meths[i], &err);
+    }
 
-            if (methsrc->add_cb != custom_ext_add_old_cb_wrap)
-                continue;
+    if (err) {
+        custom_exts_free(dst);
+        return 0;
+    }
 
-            /*
-             * We have found an old style API wrapper. We need to copy the
-             * arguments too.
-             */
+    return 1;
+}
 
-            if (err) {
-                methdst->add_arg = NULL;
-                methdst->parse_arg = NULL;
-                continue;
-            }
+/* Copy custom extensions that were set on connection */
+int custom_exts_copy_conn(custom_ext_methods *dst,
+    const custom_ext_methods *src)
+{
+    size_t i;
+    int err = 0;
+
+    if (src->meths_count > 0) {
+        size_t meths_count = 0;
 
-            methdst->add_arg = OPENSSL_memdup(methsrc->add_arg,
-                                              sizeof(custom_ext_add_cb_wrap));
-            methdst->parse_arg = OPENSSL_memdup(methsrc->parse_arg,
-                                            sizeof(custom_ext_parse_cb_wrap));
+        for (i = 0; i < src->meths_count; i++)
+            if ((src->meths[i].ext_flags & SSL_EXT_FLAG_CONN) != 0)
+                meths_count++;
+
+        if (meths_count > 0) {
+            custom_ext_method *methdst = OPENSSL_realloc(dst->meths,
+                (dst->meths_count + meths_count) * sizeof(custom_ext_method));
+
+            if (methdst == NULL)
+                return 0;
+
+            for (i = 0; i < dst->meths_count; i++)
+                custom_ext_copy_old_cb(&methdst[i], &dst->meths[i], &err);
+
+            dst->meths = methdst;
+            methdst += dst->meths_count;
+
+            for (i = 0; i < src->meths_count; i++) {
+                custom_ext_method *methsrc = &src->meths[i];
+
+                if ((methsrc->ext_flags & SSL_EXT_FLAG_CONN) == 0)
+                    continue;
+
+                memcpy(methdst, methsrc, sizeof(custom_ext_method));
+                custom_ext_copy_old_cb(methdst, methsrc, &err);
+                methdst++;
+            }
 
-            if (methdst->add_arg == NULL || methdst->parse_arg == NULL)
-                err = 1;
+            dst->meths_count += meths_count;
         }
     }
 
@@ -351,17 +394,18 @@ void custom_exts_free(custom_ext_methods *exts)
 int SSL_CTX_has_client_custom_ext(const SSL_CTX *ctx, unsigned int ext_type)
 {
     return custom_ext_find(&ctx->cert->custext, ENDPOINT_CLIENT, ext_type,
-                           NULL) != NULL;
+               NULL)
+        != NULL;
 }
 
 int ossl_tls_add_custom_ext_intern(SSL_CTX *ctx, custom_ext_methods *exts,
-                                   ENDPOINT role, 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)
+    ENDPOINT role, 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)
 {
     custom_ext_method *meth, *tmp;
 
@@ -382,9 +426,9 @@ int ossl_tls_add_custom_ext_intern(SSL_CTX *ctx, custom_ext_methods *exts,
      * these two things may not play well together.
      */
     if (ext_type == TLSEXT_TYPE_signed_certificate_timestamp
-            && (context & SSL_EXT_CLIENT_HELLO) != 0
-            && ctx != NULL
-            && SSL_CTX_ct_is_enabled(ctx))
+        && (context & SSL_EXT_CLIENT_HELLO) != 0
+        && ctx != NULL
+        && SSL_CTX_ct_is_enabled(ctx))
         return 0;
 #endif
 
@@ -393,7 +437,7 @@ int ossl_tls_add_custom_ext_intern(SSL_CTX *ctx, custom_ext_methods *exts,
      * for extension types that previously were not supported, but now are.
      */
     if (SSL_extension_supported(ext_type)
-            && ext_type != TLSEXT_TYPE_signed_certificate_timestamp)
+        && ext_type != TLSEXT_TYPE_signed_certificate_timestamp)
         return 0;
 
     /* Extension type must fit in 16 bits */
@@ -403,7 +447,7 @@ int ossl_tls_add_custom_ext_intern(SSL_CTX *ctx, custom_ext_methods *exts,
     if (custom_ext_find(exts, role, ext_type, NULL))
         return 0;
     tmp = OPENSSL_realloc(exts->meths,
-                          (exts->meths_count + 1) * sizeof(custom_ext_method));
+        (exts->meths_count + 1) * sizeof(custom_ext_method));
     if (tmp == NULL)
         return 0;
 
@@ -416,6 +460,7 @@ int ossl_tls_add_custom_ext_intern(SSL_CTX *ctx, custom_ext_methods *exts,
     meth->add_cb = add_cb;
     meth->free_cb = free_cb;
     meth->ext_type = ext_type;
+    meth->ext_flags = (ctx == NULL) ? SSL_EXT_FLAG_CONN : 0;
     meth->add_arg = add_arg;
     meth->parse_arg = parse_arg;
     exts->meths_count++;
@@ -423,12 +468,12 @@ int ossl_tls_add_custom_ext_intern(SSL_CTX *ctx, custom_ext_methods *exts,
 }
 
 static int add_old_custom_ext(SSL_CTX *ctx, ENDPOINT role,
-                              unsigned int ext_type,
-                              unsigned int context,
-                              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,
+    unsigned int context,
+    custom_ext_add_cb add_cb,
+    custom_ext_free_cb free_cb,
+    void *add_arg,
+    custom_ext_parse_cb parse_cb, void *parse_arg)
 {
     custom_ext_add_cb_wrap *add_cb_wrap
         = OPENSSL_malloc(sizeof(*add_cb_wrap));
@@ -449,12 +494,12 @@ static int add_old_custom_ext(SSL_CTX *ctx, ENDPOINT role,
     parse_cb_wrap->parse_cb = parse_cb;
 
     ret = ossl_tls_add_custom_ext_intern(ctx, NULL, role, ext_type,
-                                         context,
-                                         custom_ext_add_old_cb_wrap,
-                                         custom_ext_free_old_cb_wrap,
-                                         add_cb_wrap,
-                                         custom_ext_parse_old_cb_wrap,
-                                         parse_cb_wrap);
+        context,
+        custom_ext_add_old_cb_wrap,
+        custom_ext_free_old_cb_wrap,
+        add_cb_wrap,
+        custom_ext_parse_old_cb_wrap,
+        parse_cb_wrap);
 
     if (!ret) {
         OPENSSL_free(add_cb_wrap);
@@ -466,43 +511,43 @@ static int add_old_custom_ext(SSL_CTX *ctx, ENDPOINT role,
 
 /* Application level functions to add the old custom extension callbacks */
 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)
+    custom_ext_add_cb add_cb,
+    custom_ext_free_cb free_cb,
+    void *add_arg,
+    custom_ext_parse_cb parse_cb, void *parse_arg)
 {
     return add_old_custom_ext(ctx, ENDPOINT_CLIENT, ext_type,
-                              SSL_EXT_TLS1_2_AND_BELOW_ONLY
-                              | SSL_EXT_CLIENT_HELLO
-                              | SSL_EXT_TLS1_2_SERVER_HELLO
-                              | SSL_EXT_IGNORE_ON_RESUMPTION,
-                              add_cb, free_cb, add_arg, parse_cb, parse_arg);
+        SSL_EXT_TLS1_2_AND_BELOW_ONLY
+            | SSL_EXT_CLIENT_HELLO
+            | SSL_EXT_TLS1_2_SERVER_HELLO
+            | SSL_EXT_IGNORE_ON_RESUMPTION,
+        add_cb, free_cb, add_arg, parse_cb, parse_arg);
 }
 
 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)
+    custom_ext_add_cb add_cb,
+    custom_ext_free_cb free_cb,
+    void *add_arg,
+    custom_ext_parse_cb parse_cb, void *parse_arg)
 {
     return add_old_custom_ext(ctx, ENDPOINT_SERVER, ext_type,
-                              SSL_EXT_TLS1_2_AND_BELOW_ONLY
-                              | SSL_EXT_CLIENT_HELLO
-                              | SSL_EXT_TLS1_2_SERVER_HELLO
-                              | SSL_EXT_IGNORE_ON_RESUMPTION,
-                              add_cb, free_cb, add_arg, parse_cb, parse_arg);
+        SSL_EXT_TLS1_2_AND_BELOW_ONLY
+            | SSL_EXT_CLIENT_HELLO
+            | SSL_EXT_TLS1_2_SERVER_HELLO
+            | SSL_EXT_IGNORE_ON_RESUMPTION,
+        add_cb, free_cb, add_arg, parse_cb, parse_arg);
 }
 
 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)
 {
     return ossl_tls_add_custom_ext_intern(ctx, NULL, ENDPOINT_BOTH, ext_type,
-                                          context, add_cb, free_cb, add_arg,
-                                          parse_cb, parse_arg);
+        context, add_cb, free_cb, add_arg,
+        parse_cb, parse_arg);
 }
 
 int SSL_extension_supported(unsigned int ext_type)
diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index dd771207f6988..cdb914daedcf5 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -13,7 +13,7 @@
 #include "internal/cryptlib.h"
 #include "internal/ssl_unwrap.h"
 
-#define COOKIE_STATE_FORMAT_VERSION     1
+#define COOKIE_STATE_FORMAT_VERSION 1
 
 /*
  * 2 bytes for packet length, 2 bytes for format version, 2 bytes for
@@ -23,7 +23,7 @@
  * length bytes, SHA256_DIGEST_LENGTH bytes for the HMAC of the whole thing.
  */
 #define MAX_COOKIE_SIZE (2 + 2 + 2 + 2 + 2 + 1 + 8 + 2 + EVP_MAX_MD_SIZE + 1 \
-                         + SSL_COOKIE_LENGTH + SHA256_DIGEST_LENGTH)
+    + SSL_COOKIE_LENGTH + SHA256_DIGEST_LENGTH)
 
 /*
  * Message header + 2 bytes for protocol version + number of random bytes +
@@ -32,16 +32,16 @@
  * + 2 bytes for extension block length + 6 bytes for key_share extension
  * + 4 bytes for cookie extension header + the number of bytes in the cookie
  */
-#define MAX_HRR_SIZE    (SSL3_HM_HEADER_LENGTH + 2 + SSL3_RANDOM_SIZE + 1 \
-                         + SSL_MAX_SSL_SESSION_ID_LENGTH + 2 + 1 + 2 + 6 + 4 \
-                         + MAX_COOKIE_SIZE)
+#define MAX_HRR_SIZE (SSL3_HM_HEADER_LENGTH + 2 + SSL3_RANDOM_SIZE + 1 \
+    + SSL_MAX_SSL_SESSION_ID_LENGTH + 2 + 1 + 2 + 6 + 4                \
+    + MAX_COOKIE_SIZE)
 
 /*
  * Parse the client's renegotiation binding and abort if it's not right
  */
 int tls_parse_ctos_renegotiate(SSL_CONNECTION *s, PACKET *pkt,
-                               unsigned int context,
-                               X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     unsigned int ilen;
     const unsigned char *data;
@@ -61,7 +61,7 @@ int tls_parse_ctos_renegotiate(SSL_CONNECTION *s, PACKET *pkt,
     }
 
     ok = memcmp(data, s->s3.previous_client_finished,
-                    s->s3.previous_client_finished_len);
+        s->s3.previous_client_finished_len);
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
     if (ok) {
         if ((data[0] ^ s->s3.previous_client_finished[0]) != 0xFF) {
@@ -103,7 +103,7 @@ int tls_parse_ctos_renegotiate(SSL_CONNECTION *s, PACKET *pkt,
  * - On session reconnect, the servername extension may be absent.
  */
 int tls_parse_ctos_server_name(SSL_CONNECTION *s, PACKET *pkt,
-                               unsigned int context, X509 *x, size_t chainidx)
+    unsigned int context, X509 *x, size_t chainidx)
 {
     unsigned int servname_type;
     PACKET sni, hostname;
@@ -168,15 +168,15 @@ int tls_parse_ctos_server_name(SSL_CONNECTION *s, PACKET *pkt,
          */
         s->servername_done = (s->session->ext.hostname != NULL)
             && PACKET_equal(&hostname, s->session->ext.hostname,
-                            strlen(s->session->ext.hostname));
+                strlen(s->session->ext.hostname));
     }
 
     return 1;
 }
 
 int tls_parse_ctos_maxfragmentlen(SSL_CONNECTION *s, PACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     unsigned int value;
 
@@ -188,7 +188,7 @@ int tls_parse_ctos_maxfragmentlen(SSL_CONNECTION *s, PACKET *pkt,
     /* Received |value| should be a valid max-fragment-length code. */
     if (!IS_MAX_FRAGMENT_LENGTH_EXT_VALID(value)) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                 SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH);
+            SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH);
         return 0;
     }
 
@@ -218,12 +218,12 @@ int tls_parse_ctos_maxfragmentlen(SSL_CONNECTION *s, PACKET *pkt,
 
 #ifndef OPENSSL_NO_SRP
 int tls_parse_ctos_srp(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     PACKET srp_I;
 
     if (!PACKET_as_length_prefixed_1(pkt, &srp_I)
-            || PACKET_contains_zero_byte(&srp_I)) {
+        || PACKET_contains_zero_byte(&srp_I)) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
         return 0;
     }
@@ -238,8 +238,8 @@ int tls_parse_ctos_srp(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 #endif
 
 int tls_parse_ctos_ec_pt_formats(SSL_CONNECTION *s, PACKET *pkt,
-                                 unsigned int context,
-                                 X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     PACKET ec_point_format_list;
 
@@ -251,8 +251,8 @@ int tls_parse_ctos_ec_pt_formats(SSL_CONNECTION *s, PACKET *pkt,
 
     if (!s->hit) {
         if (!PACKET_memdup(&ec_point_format_list,
-                           &s->ext.peer_ecpointformats,
-                           &s->ext.peer_ecpointformats_len)) {
+                &s->ext.peer_ecpointformats,
+                &s->ext.peer_ecpointformats_len)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -262,13 +262,10 @@ int tls_parse_ctos_ec_pt_formats(SSL_CONNECTION *s, PACKET *pkt,
 }
 
 int tls_parse_ctos_session_ticket(SSL_CONNECTION *s, PACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
-    if (s->ext.session_ticket_cb &&
-            !s->ext.session_ticket_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                      PACKET_data(pkt), PACKET_remaining(pkt),
-                                      s->ext.session_ticket_cb_arg)) {
+    if (s->ext.session_ticket_cb && !s->ext.session_ticket_cb(SSL_CONNECTION_GET_USER_SSL(s), PACKET_data(pkt), PACKET_remaining(pkt), s->ext.session_ticket_cb_arg)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -277,19 +274,25 @@ int tls_parse_ctos_session_ticket(SSL_CONNECTION *s, PACKET *pkt,
 }
 
 int tls_parse_ctos_sig_algs_cert(SSL_CONNECTION *s, PACKET *pkt,
-                                 ossl_unused unsigned int context,
-                                 ossl_unused X509 *x,
-                                 ossl_unused size_t chainidx)
+    ossl_unused unsigned int context,
+    ossl_unused X509 *x,
+    ossl_unused size_t chainidx)
 {
     PACKET supported_sig_algs;
 
     if (!PACKET_as_length_prefixed_2(pkt, &supported_sig_algs)
-            || PACKET_remaining(&supported_sig_algs) == 0) {
+        || PACKET_remaining(&supported_sig_algs) == 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
         return 0;
     }
 
-    if (!s->hit && !tls1_save_sigalgs(s, &supported_sig_algs, 1)) {
+    /*
+     * We use this routine on both clients and servers, and when clients
+     * get asked for PHA we need to always save the sigalgs regardless
+     * of whether it was a resumption or not.
+     */
+    if ((!s->server || (s->server && !s->hit))
+        && !tls1_save_sigalgs(s, &supported_sig_algs, 1)) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
         return 0;
     }
@@ -298,17 +301,23 @@ int tls_parse_ctos_sig_algs_cert(SSL_CONNECTION *s, PACKET *pkt,
 }
 
 int tls_parse_ctos_sig_algs(SSL_CONNECTION *s, PACKET *pkt,
-                            unsigned int context, X509 *x, size_t chainidx)
+    unsigned int context, X509 *x, size_t chainidx)
 {
     PACKET supported_sig_algs;
 
     if (!PACKET_as_length_prefixed_2(pkt, &supported_sig_algs)
-            || PACKET_remaining(&supported_sig_algs) == 0) {
+        || PACKET_remaining(&supported_sig_algs) == 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
         return 0;
     }
 
-    if (!s->hit && !tls1_save_sigalgs(s, &supported_sig_algs, 0)) {
+    /*
+     * We use this routine on both clients and servers, and when clients
+     * get asked for PHA we need to always save the sigalgs regardless
+     * of whether it was a resumption or not.
+     */
+    if ((!s->server || (s->server && !s->hit))
+        && !tls1_save_sigalgs(s, &supported_sig_algs, 0)) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
         return 0;
     }
@@ -318,8 +327,8 @@ int tls_parse_ctos_sig_algs(SSL_CONNECTION *s, PACKET *pkt,
 
 #ifndef OPENSSL_NO_OCSP
 int tls_parse_ctos_status_request(SSL_CONNECTION *s, PACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     PACKET responder_id_list, exts;
 
@@ -344,7 +353,7 @@ int tls_parse_ctos_status_request(SSL_CONNECTION *s, PACKET *pkt,
         return 1;
     }
 
-    if (!PACKET_get_length_prefixed_2 (pkt, &responder_id_list)) {
+    if (!PACKET_get_length_prefixed_2(pkt, &responder_id_list)) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
         return 0;
     }
@@ -370,14 +379,14 @@ int tls_parse_ctos_status_request(SSL_CONNECTION *s, PACKET *pkt,
         const unsigned char *id_data;
 
         if (!PACKET_get_length_prefixed_2(&responder_id_list, &responder_id)
-                || PACKET_remaining(&responder_id) == 0) {
+            || PACKET_remaining(&responder_id) == 0) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
             return 0;
         }
 
         id_data = PACKET_data(&responder_id);
         id = d2i_OCSP_RESPID(NULL, &id_data,
-                             (int)PACKET_remaining(&responder_id));
+            (int)PACKET_remaining(&responder_id));
         if (id == NULL) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
             return 0;
@@ -408,9 +417,8 @@ int tls_parse_ctos_status_request(SSL_CONNECTION *s, PACKET *pkt,
         const unsigned char *ext_data = PACKET_data(&exts);
 
         sk_X509_EXTENSION_pop_free(s->ext.ocsp.exts,
-                                   X509_EXTENSION_free);
-        s->ext.ocsp.exts =
-            d2i_X509_EXTENSIONS(NULL, &ext_data, (int)PACKET_remaining(&exts));
+            X509_EXTENSION_free);
+        s->ext.ocsp.exts = d2i_X509_EXTENSIONS(NULL, &ext_data, (int)PACKET_remaining(&exts));
         if (s->ext.ocsp.exts == NULL || ext_data != PACKET_end(&exts)) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
             return 0;
@@ -423,7 +431,7 @@ int tls_parse_ctos_status_request(SSL_CONNECTION *s, PACKET *pkt,
 
 #ifndef OPENSSL_NO_NEXTPROTONEG
 int tls_parse_ctos_npn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     /*
      * We shouldn't accept this extension on a
@@ -441,7 +449,7 @@ int tls_parse_ctos_npn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
  * extension, not including type and length. Returns: 1 on success, 0 on error.
  */
 int tls_parse_ctos_alpn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                        X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     PACKET protocol_list, save_protocol_list, protocol;
 
@@ -458,7 +466,7 @@ int tls_parse_ctos_alpn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
     do {
         /* Protocol names can't be empty. */
         if (!PACKET_get_length_prefixed_1(&protocol_list, &protocol)
-                || PACKET_remaining(&protocol) == 0) {
+            || PACKET_remaining(&protocol) == 0) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
             return 0;
         }
@@ -468,7 +476,7 @@ int tls_parse_ctos_alpn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
     s->s3.alpn_proposed = NULL;
     s->s3.alpn_proposed_len = 0;
     if (!PACKET_memdup(&save_protocol_list,
-                       &s->s3.alpn_proposed, &s->s3.alpn_proposed_len)) {
+            &s->s3.alpn_proposed, &s->s3.alpn_proposed_len)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -478,7 +486,7 @@ int tls_parse_ctos_alpn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 
 #ifndef OPENSSL_NO_SRTP
 int tls_parse_ctos_use_srtp(SSL_CONNECTION *s, PACKET *pkt,
-                            unsigned int context, X509 *x, size_t chainidx)
+    unsigned int context, X509 *x, size_t chainidx)
 {
     STACK_OF(SRTP_PROTECTION_PROFILE) *srvr;
     unsigned int ct, mki_len, id;
@@ -492,9 +500,9 @@ int tls_parse_ctos_use_srtp(SSL_CONNECTION *s, PACKET *pkt,
 
     /* Pull off the length of the cipher suite list  and check it is even */
     if (!PACKET_get_net_2(pkt, &ct) || (ct & 1) != 0
-            || !PACKET_get_sub_packet(pkt, &subpkt, ct)) {
+        || !PACKET_get_sub_packet(pkt, &subpkt, ct)) {
         SSLfatal(s, SSL_AD_DECODE_ERROR,
-               SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
+            SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
         return 0;
     }
 
@@ -506,7 +514,7 @@ int tls_parse_ctos_use_srtp(SSL_CONNECTION *s, PACKET *pkt,
     while (PACKET_remaining(&subpkt)) {
         if (!PACKET_get_net_2(&subpkt, &id)) {
             SSLfatal(s, SSL_AD_DECODE_ERROR,
-                     SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
+                SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
             return 0;
         }
 
@@ -517,8 +525,7 @@ int tls_parse_ctos_use_srtp(SSL_CONNECTION *s, PACKET *pkt,
          * does nothing.
          */
         for (i = 0; i < srtp_pref; i++) {
-            SRTP_PROTECTION_PROFILE *sprof =
-                sk_SRTP_PROTECTION_PROFILE_value(srvr, i);
+            SRTP_PROTECTION_PROFILE *sprof = sk_SRTP_PROTECTION_PROFILE_value(srvr, i);
 
             if (sprof->id == id) {
                 s->srtp_profile = sprof;
@@ -531,7 +538,7 @@ int tls_parse_ctos_use_srtp(SSL_CONNECTION *s, PACKET *pkt,
     /* Now extract the MKI value as a sanity check, but discard it for now */
     if (!PACKET_get_1(pkt, &mki_len)) {
         SSLfatal(s, SSL_AD_DECODE_ERROR,
-                 SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
+            SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
         return 0;
     }
 
@@ -546,7 +553,7 @@ int tls_parse_ctos_use_srtp(SSL_CONNECTION *s, PACKET *pkt,
 #endif
 
 int tls_parse_ctos_etm(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     if (!(s->options & SSL_OP_NO_ENCRYPT_THEN_MAC))
         s->ext.use_etm = 1;
@@ -559,15 +566,15 @@ int tls_parse_ctos_etm(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
  * the raw PACKET data for the extension. Returns 1 on success or 0 on failure.
  */
 int tls_parse_ctos_psk_kex_modes(SSL_CONNECTION *s, PACKET *pkt,
-                                 unsigned int context,
-                                 X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
 #ifndef OPENSSL_NO_TLS1_3
     PACKET psk_kex_modes;
     unsigned int mode;
 
     if (!PACKET_as_length_prefixed_1(pkt, &psk_kex_modes)
-            || PACKET_remaining(&psk_kex_modes) == 0) {
+        || PACKET_remaining(&psk_kex_modes) == 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
         return 0;
     }
@@ -576,12 +583,12 @@ int tls_parse_ctos_psk_kex_modes(SSL_CONNECTION *s, PACKET *pkt,
         if (mode == TLSEXT_KEX_MODE_KE_DHE)
             s->ext.psk_kex_mode |= TLSEXT_KEX_MODE_FLAG_KE_DHE;
         else if (mode == TLSEXT_KEX_MODE_KE
-                && (s->options & SSL_OP_ALLOW_NO_DHE_KEX) != 0)
+            && (s->options & SSL_OP_ALLOW_NO_DHE_KEX) != 0)
             s->ext.psk_kex_mode |= TLSEXT_KEX_MODE_FLAG_KE;
     }
 
     if (((s->ext.psk_kex_mode & TLSEXT_KEX_MODE_FLAG_KE) != 0)
-            && (s->options & SSL_OP_PREFER_NO_DHE_KEX) != 0) {
+        && (s->options & SSL_OP_PREFER_NO_DHE_KEX) != 0) {
 
         /*
          * If NO_DHE is supported and preferred, then we only remember this
@@ -619,20 +626,21 @@ static int tls_accept_ksgroup(SSL_CONNECTION *s, uint16_t ksgroup, PACKET *encod
     s->session->kex_group = ksgroup;
     if ((s->s3.peer_tmp = ssl_generate_param_group(s, ksgroup)) == NULL) {
         SSLfatal(s,
-                 SSL_AD_INTERNAL_ERROR,
-                 SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS);
+            SSL_AD_INTERNAL_ERROR,
+            SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS);
         return 0;
     }
     if (tls13_set_encoded_pub_key(s->s3.peer_tmp,
-                                  PACKET_data(encoded_pubkey),
-                                  PACKET_remaining(encoded_pubkey)) <= 0) {
+            PACKET_data(encoded_pubkey),
+            PACKET_remaining(encoded_pubkey))
+        <= 0) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_ECPOINT);
         return 0;
     }
     return 1;
 }
 
-# define GROUPLIST_INCREMENT 32 /* Memory allocation chunk size (nominally 64 Bytes chunks) */
+#define GROUPLIST_INCREMENT 32 /* Memory allocation chunk size (nominally 64 Bytes chunks) */
 
 typedef enum KS_EXTRACTION_RESULT {
     EXTRACTION_FAILURE,
@@ -641,10 +649,10 @@ typedef enum KS_EXTRACTION_RESULT {
 } KS_EXTRACTION_RESULT;
 
 static KS_EXTRACTION_RESULT extract_keyshares(SSL_CONNECTION *s, PACKET *key_share_list,
-                                              const uint16_t *clntgroups, size_t clnt_num_groups,
-                                              const uint16_t *srvrgroups, size_t srvr_num_groups,
-                                              uint16_t **keyshares_arr, PACKET **encoded_pubkey_arr,
-                                              size_t *keyshares_cnt, size_t *keyshares_max)
+    const uint16_t *clntgroups, size_t clnt_num_groups,
+    const uint16_t *srvrgroups, size_t srvr_num_groups,
+    uint16_t **keyshares_arr, PACKET **encoded_pubkey_arr,
+    size_t *keyshares_cnt, size_t *keyshares_max)
 {
     PACKET encoded_pubkey;
     size_t key_share_pos = 0;
@@ -666,8 +674,8 @@ static KS_EXTRACTION_RESULT extract_keyshares(SSL_CONNECTION *s, PACKET *key_sha
     while (PACKET_remaining(key_share_list) > 0) {
         /* Get the group_id for the current share and its encoded_pubkey */
         if (!PACKET_get_net_2(key_share_list, &group_id)
-                || !PACKET_get_length_prefixed_2(key_share_list, &encoded_pubkey)
-                || PACKET_remaining(&encoded_pubkey) == 0) {
+            || !PACKET_get_length_prefixed_2(key_share_list, &encoded_pubkey)
+            || PACKET_remaining(&encoded_pubkey) == 0) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
             goto failure;
         }
@@ -677,8 +685,8 @@ static KS_EXTRACTION_RESULT extract_keyshares(SSL_CONNECTION *s, PACKET *key_sha
          * we requested, and must be the only key_share sent.
          */
         if (s->s3.group_id != 0
-                && (group_id != s->s3.group_id
-                    || PACKET_remaining(key_share_list) != 0)) {
+            && (group_id != s->s3.group_id
+                || PACKET_remaining(key_share_list) != 0)) {
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_KEY_SHARE);
             goto failure;
         }
@@ -719,9 +727,9 @@ static KS_EXTRACTION_RESULT extract_keyshares(SSL_CONNECTION *s, PACKET *key_sha
          * suitable for TLSv1.3 or which is not supported by the server
          */
         if (!check_in_list(s, group_id, srvrgroups, srvr_num_groups, 1, NULL)
-                || !tls_group_allowed(s, group_id, SSL_SECOP_CURVE_SUPPORTED)
-                || !tls_valid_group(s, group_id, TLS1_3_VERSION, TLS1_3_VERSION,
-                                    0, NULL)) {
+            || !tls_group_allowed(s, group_id, SSL_SECOP_CURVE_SUPPORTED)
+            || !tls_valid_group(s, group_id, TLS1_3_VERSION, TLS1_3_VERSION,
+                0, NULL)) {
             /* Share not suitable or not supported, check next share */
             continue;
         }
@@ -737,23 +745,25 @@ static KS_EXTRACTION_RESULT extract_keyshares(SSL_CONNECTION *s, PACKET *key_sha
          */
         if (*keyshares_cnt == *keyshares_max) {
             PACKET *tmp_pkt;
-            uint16_t *tmp =
-                OPENSSL_realloc(*keyshares_arr,
-                                (*keyshares_max + GROUPLIST_INCREMENT) * sizeof(**keyshares_arr));
+            uint16_t *tmp = OPENSSL_realloc(*keyshares_arr,
+                (*keyshares_max + GROUPLIST_INCREMENT) * sizeof(**keyshares_arr));
 
-            if (tmp == NULL)
+            if (tmp == NULL) {
+                SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 goto failure;
+            }
+
             *keyshares_arr = tmp;
-            tmp_pkt =
-                OPENSSL_realloc(*encoded_pubkey_arr,
-                                (*keyshares_max + GROUPLIST_INCREMENT) *
-                                sizeof(**encoded_pubkey_arr));
-            if (tmp_pkt == NULL)
+            tmp_pkt = OPENSSL_realloc(*encoded_pubkey_arr,
+                (*keyshares_max + GROUPLIST_INCREMENT) * sizeof(**encoded_pubkey_arr));
+            if (tmp_pkt == NULL) {
+                SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 goto failure;
+            }
+
             *encoded_pubkey_arr = tmp_pkt;
             *keyshares_max += GROUPLIST_INCREMENT;
         }
-
     }
 
     return EXTRACTION_SUCCESS;
@@ -774,10 +784,10 @@ static KS_EXTRACTION_RESULT extract_keyshares(SSL_CONNECTION *s, PACKET *key_sha
  */
 #ifndef OPENSSL_NO_TLS1_3
 static void check_overlap(SSL_CONNECTION *s,
-                          const uint16_t *prio_groups, size_t prio_num_groups,
-                          const uint16_t *candidate_groups, size_t candidate_num_groups,
-                          int *prio_group_idx, int *candidate_group_idx,
-                          uint16_t *selected_group)
+    const uint16_t *prio_groups, size_t prio_num_groups,
+    const uint16_t *candidate_groups, size_t candidate_num_groups,
+    int *prio_group_idx, int *candidate_group_idx,
+    uint16_t *selected_group)
 {
     uint16_t current_group;
     size_t group_idx = prio_num_groups;
@@ -789,11 +799,11 @@ static void check_overlap(SSL_CONNECTION *s,
 
     for (current_group = 0; current_group < candidate_num_groups; current_group++) {
         if (!check_in_list(s, candidate_groups[current_group], prio_groups,
-                           prio_num_groups, 1, &new_group_idx)
+                prio_num_groups, 1, &new_group_idx)
             || !tls_group_allowed(s, candidate_groups[current_group],
-                                  SSL_SECOP_CURVE_SUPPORTED)
+                SSL_SECOP_CURVE_SUPPORTED)
             || !tls_valid_group(s, candidate_groups[current_group], TLS1_3_VERSION,
-                                TLS1_3_VERSION, 0, NULL))
+                TLS1_3_VERSION, 0, NULL))
             /* No overlap or group not suitable, check next group */
             continue;
 
@@ -812,7 +822,7 @@ static void check_overlap(SSL_CONNECTION *s,
 #endif
 
 int tls_parse_ctos_key_share(SSL_CONNECTION *s, PACKET *pkt,
-                             unsigned int context, X509 *x, size_t chainidx)
+    unsigned int context, X509 *x, size_t chainidx)
 {
 #ifndef OPENSSL_NO_TLS1_3
     PACKET key_share_list;
@@ -858,7 +868,7 @@ int tls_parse_ctos_key_share(SSL_CONNECTION *s, PACKET *pkt,
          * extension.
          */
         SSLfatal(s, SSL_AD_MISSING_EXTENSION,
-                 SSL_R_MISSING_SUPPORTED_GROUPS_EXTENSION);
+            SSL_R_MISSING_SUPPORTED_GROUPS_EXTENSION);
         return 0;
     }
 
@@ -874,11 +884,11 @@ int tls_parse_ctos_key_share(SSL_CONNECTION *s, PACKET *pkt,
 
     /* We parse the key share extension and memorize the entries (after some checks) */
     ks_extraction_result = extract_keyshares(s,
-                                             &key_share_list,
-                                             clntgroups, clnt_num_groups,
-                                             srvrgroups, srvr_num_groups,
-                                             &keyshares_arr, &encoded_pubkey_arr,
-                                             &keyshares_cnt, &keyshares_max);
+        &key_share_list,
+        clntgroups, clnt_num_groups,
+        srvrgroups, srvr_num_groups,
+        &keyshares_arr, &encoded_pubkey_arr,
+        &keyshares_cnt, &keyshares_max);
 
     if (ks_extraction_result == EXTRACTION_FAILURE) /* Fatal error during tests */
         return 0; /* Memory already freed and SSLfatal already called */
@@ -886,7 +896,7 @@ int tls_parse_ctos_key_share(SSL_CONNECTION *s, PACKET *pkt,
         goto end;
 
     /*
-     * We now have the folowing lists available to make a decision for
+     * We now have the following lists available to make a decision for
      * which group the server should use for key exchange :
      * From client: clntgroups[clnt_num_groups],
      *              keyshares_arr[keyshares_cnt], encoded_pubkey_arr[keyshares_cnt]
@@ -912,13 +922,13 @@ int tls_parse_ctos_key_share(SSL_CONNECTION *s, PACKET *pkt,
             /* Server preference */
             /* Is there overlap with a key share group?  */
             check_overlap(s,
-                          first_group_in_tuple, number_of_groups_in_tuple,
-                          keyshares_arr, keyshares_cnt,
-                          &prio_group_idx, &candidate_group_idx,
-                          &group_id_candidate);
+                first_group_in_tuple, number_of_groups_in_tuple,
+                keyshares_arr, keyshares_cnt,
+                &prio_group_idx, &candidate_group_idx,
+                &group_id_candidate);
             if (group_id_candidate > 0) { /* Overlap found -> accept the key share group */
                 if (!tls_accept_ksgroup(s, group_id_candidate,
-                                        &encoded_pubkey_arr[candidate_group_idx]))
+                        &encoded_pubkey_arr[candidate_group_idx]))
                     goto err; /* SSLfatal already called */
                 /* We have all info for a SH, hence we're done here */
                 goto end;
@@ -928,10 +938,10 @@ int tls_parse_ctos_key_share(SSL_CONNECTION *s, PACKET *pkt,
                  * supported_group overlapping with the current tuple?
                  */
                 check_overlap(s,
-                              first_group_in_tuple, number_of_groups_in_tuple,
-                              clntgroups, clnt_num_groups,
-                              &prio_group_idx, &candidate_group_idx,
-                              &group_id_candidate);
+                    first_group_in_tuple, number_of_groups_in_tuple,
+                    clntgroups, clnt_num_groups,
+                    &prio_group_idx, &candidate_group_idx,
+                    &group_id_candidate);
                 if (group_id_candidate > 0) {
                     /*
                      * We did not have a key share overlap, but at least the supported
@@ -952,20 +962,20 @@ int tls_parse_ctos_key_share(SSL_CONNECTION *s, PACKET *pkt,
 
         } else { /* We have client preference */
             check_overlap(s,
-                          keyshares_arr, keyshares_cnt,
-                          first_group_in_tuple, number_of_groups_in_tuple,
-                          &prio_group_idx, &candidate_group_idx,
-                          &group_id_candidate);
+                keyshares_arr, keyshares_cnt,
+                first_group_in_tuple, number_of_groups_in_tuple,
+                &prio_group_idx, &candidate_group_idx,
+                &group_id_candidate);
             if (group_id_candidate > 0) {
                 if (!tls_accept_ksgroup(s, group_id_candidate, &encoded_pubkey_arr[prio_group_idx]))
                     goto err;
                 goto end;
             } else {
                 check_overlap(s,
-                              clntgroups, clnt_num_groups,
-                              first_group_in_tuple, number_of_groups_in_tuple,
-                              &prio_group_idx, &candidate_group_idx,
-                              &group_id_candidate);
+                    clntgroups, clnt_num_groups,
+                    first_group_in_tuple, number_of_groups_in_tuple,
+                    &prio_group_idx, &candidate_group_idx,
+                    &group_id_candidate);
                 if (group_id_candidate > 0) {
                     s->s3.group_id_candidate = group_id_candidate;
                     goto end;
@@ -991,7 +1001,7 @@ int tls_parse_ctos_key_share(SSL_CONNECTION *s, PACKET *pkt,
 }
 
 int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                          X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
 #ifndef OPENSSL_NO_TLS1_3
     unsigned int format, version, key_share, group_id;
@@ -1009,7 +1019,7 @@ int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 
     /* Ignore any cookie if we're not set up to verify it */
     if (sctx->verify_stateless_cookie_cb == NULL
-            || (s->s3.flags & TLS1_FLAGS_STATELESS) == 0)
+        || (s->s3.flags & TLS1_FLAGS_STATELESS) == 0)
         return 1;
 
     if (!PACKET_as_length_prefixed_2(pkt, &cookie)) {
@@ -1021,7 +1031,7 @@ int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
     data = PACKET_data(&raw);
     rawlen = PACKET_remaining(&raw);
     if (rawlen < SHA256_DIGEST_LENGTH
-            || !PACKET_forward(&raw, rawlen - SHA256_DIGEST_LENGTH)) {
+        || !PACKET_forward(&raw, rawlen - SHA256_DIGEST_LENGTH)) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
         return 0;
     }
@@ -1030,9 +1040,9 @@ int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
     /* Verify the HMAC of the cookie */
     hctx = EVP_MD_CTX_create();
     pkey = EVP_PKEY_new_raw_private_key_ex(sctx->libctx, "HMAC",
-                                           sctx->propq,
-                                           s->session_ctx->ext.cookie_hmac_key,
-                                           sizeof(s->session_ctx->ext.cookie_hmac_key));
+        sctx->propq,
+        s->session_ctx->ext.cookie_hmac_key,
+        sizeof(s->session_ctx->ext.cookie_hmac_key));
     if (hctx == NULL || pkey == NULL) {
         EVP_MD_CTX_free(hctx);
         EVP_PKEY_free(pkey);
@@ -1042,10 +1052,12 @@ int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 
     hmaclen = SHA256_DIGEST_LENGTH;
     if (EVP_DigestSignInit_ex(hctx, NULL, "SHA2-256", sctx->libctx,
-                              sctx->propq, pkey, NULL) <= 0
-            || EVP_DigestSign(hctx, hmac, &hmaclen, data,
-                              rawlen - SHA256_DIGEST_LENGTH) <= 0
-            || hmaclen != SHA256_DIGEST_LENGTH) {
+            sctx->propq, pkey, NULL)
+            <= 0
+        || EVP_DigestSign(hctx, hmac, &hmaclen, data,
+               rawlen - SHA256_DIGEST_LENGTH)
+            <= 0
+        || hmaclen != SHA256_DIGEST_LENGTH) {
         EVP_MD_CTX_free(hctx);
         EVP_PKEY_free(pkey);
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -1080,7 +1092,7 @@ int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
     }
     if (version != TLS1_3_VERSION) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                 SSL_R_BAD_PROTOCOL_VERSION_NUMBER);
+            SSL_R_BAD_PROTOCOL_VERSION_NUMBER);
         return 0;
     }
 
@@ -1095,8 +1107,8 @@ int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
         return 0;
     }
     if (group_id != s->s3.group_id
-            || s->s3.tmp.new_cipher
-               != ssl_get_cipher_by_char(s, ciphdata, 0)) {
+        || s->s3.tmp.new_cipher
+            != ssl_get_cipher_by_char(s, ciphdata, 0)) {
         /*
          * We chose a different cipher or group id this time around to what is
          * in the cookie. Something must have changed.
@@ -1106,10 +1118,10 @@ int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
     }
 
     if (!PACKET_get_1(&cookie, &key_share)
-            || !PACKET_get_net_8(&cookie, &tm)
-            || !PACKET_get_length_prefixed_2(&cookie, &chhash)
-            || !PACKET_get_length_prefixed_1(&cookie, &appcookie)
-            || PACKET_remaining(&cookie) != SHA256_DIGEST_LENGTH) {
+        || !PACKET_get_net_8(&cookie, &tm)
+        || !PACKET_get_length_prefixed_2(&cookie, &chhash)
+        || !PACKET_get_length_prefixed_1(&cookie, &appcookie)
+        || PACKET_remaining(&cookie) != SHA256_DIGEST_LENGTH) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
         return 0;
     }
@@ -1123,8 +1135,9 @@ int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 
     /* Verify the app cookie */
     if (sctx->verify_stateless_cookie_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                         PACKET_data(&appcookie),
-                                         PACKET_remaining(&appcookie)) == 0) {
+            PACKET_data(&appcookie),
+            PACKET_remaining(&appcookie))
+        == 0) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_COOKIE_MISMATCH);
         return 0;
     }
@@ -1139,45 +1152,45 @@ int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
         return 0;
     }
     if (!WPACKET_put_bytes_u8(&hrrpkt, SSL3_MT_SERVER_HELLO)
-            || !WPACKET_start_sub_packet_u24(&hrrpkt)
-            || !WPACKET_put_bytes_u16(&hrrpkt, TLS1_2_VERSION)
-            || !WPACKET_memcpy(&hrrpkt, hrrrandom, SSL3_RANDOM_SIZE)
-            || !WPACKET_sub_memcpy_u8(&hrrpkt, s->tmp_session_id,
-                                      s->tmp_session_id_len)
-            || !ssl->method->put_cipher_by_char(s->s3.tmp.new_cipher, &hrrpkt,
-                                                &ciphlen)
-            || !WPACKET_put_bytes_u8(&hrrpkt, 0)
-            || !WPACKET_start_sub_packet_u16(&hrrpkt)) {
+        || !WPACKET_start_sub_packet_u24(&hrrpkt)
+        || !WPACKET_put_bytes_u16(&hrrpkt, TLS1_2_VERSION)
+        || !WPACKET_memcpy(&hrrpkt, hrrrandom, SSL3_RANDOM_SIZE)
+        || !WPACKET_sub_memcpy_u8(&hrrpkt, s->tmp_session_id,
+            s->tmp_session_id_len)
+        || !ssl->method->put_cipher_by_char(s->s3.tmp.new_cipher, &hrrpkt,
+            &ciphlen)
+        || !WPACKET_put_bytes_u8(&hrrpkt, 0)
+        || !WPACKET_start_sub_packet_u16(&hrrpkt)) {
         WPACKET_cleanup(&hrrpkt);
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
     if (!WPACKET_put_bytes_u16(&hrrpkt, TLSEXT_TYPE_supported_versions)
-            || !WPACKET_start_sub_packet_u16(&hrrpkt)
-            || !WPACKET_put_bytes_u16(&hrrpkt, s->version)
-            || !WPACKET_close(&hrrpkt)) {
+        || !WPACKET_start_sub_packet_u16(&hrrpkt)
+        || !WPACKET_put_bytes_u16(&hrrpkt, s->version)
+        || !WPACKET_close(&hrrpkt)) {
         WPACKET_cleanup(&hrrpkt);
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
     if (key_share) {
         if (!WPACKET_put_bytes_u16(&hrrpkt, TLSEXT_TYPE_key_share)
-                || !WPACKET_start_sub_packet_u16(&hrrpkt)
-                || !WPACKET_put_bytes_u16(&hrrpkt, s->s3.group_id)
-                || !WPACKET_close(&hrrpkt)) {
+            || !WPACKET_start_sub_packet_u16(&hrrpkt)
+            || !WPACKET_put_bytes_u16(&hrrpkt, s->s3.group_id)
+            || !WPACKET_close(&hrrpkt)) {
             WPACKET_cleanup(&hrrpkt);
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
         }
     }
     if (!WPACKET_put_bytes_u16(&hrrpkt, TLSEXT_TYPE_cookie)
-            || !WPACKET_start_sub_packet_u16(&hrrpkt)
-            || !WPACKET_sub_memcpy_u16(&hrrpkt, data, rawlen)
-            || !WPACKET_close(&hrrpkt) /* cookie extension */
-            || !WPACKET_close(&hrrpkt) /* extension block */
-            || !WPACKET_close(&hrrpkt) /* message */
-            || !WPACKET_get_total_written(&hrrpkt, &hrrlen)
-            || !WPACKET_finish(&hrrpkt)) {
+        || !WPACKET_start_sub_packet_u16(&hrrpkt)
+        || !WPACKET_sub_memcpy_u16(&hrrpkt, data, rawlen)
+        || !WPACKET_close(&hrrpkt) /* cookie extension */
+        || !WPACKET_close(&hrrpkt) /* extension block */
+        || !WPACKET_close(&hrrpkt) /* message */
+        || !WPACKET_get_total_written(&hrrpkt, &hrrlen)
+        || !WPACKET_finish(&hrrpkt)) {
         WPACKET_cleanup(&hrrpkt);
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
@@ -1185,8 +1198,8 @@ int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 
     /* Reconstruct the transcript hash */
     if (!create_synthetic_message_hash(s, PACKET_data(&chhash),
-                                       PACKET_remaining(&chhash), hrr,
-                                       hrrlen)) {
+            PACKET_remaining(&chhash), hrr,
+            hrrlen)) {
         /* SSLfatal() already called */
         return 0;
     }
@@ -1201,15 +1214,15 @@ int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 }
 
 int tls_parse_ctos_supported_groups(SSL_CONNECTION *s, PACKET *pkt,
-                                    unsigned int context,
-                                    X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     PACKET supported_groups_list;
 
     /* Each group is 2 bytes and we must have at least 1. */
     if (!PACKET_as_length_prefixed_2(pkt, &supported_groups_list)
-            || PACKET_remaining(&supported_groups_list) == 0
-            || (PACKET_remaining(&supported_groups_list) % 2) != 0) {
+        || PACKET_remaining(&supported_groups_list) == 0
+        || (PACKET_remaining(&supported_groups_list) % 2) != 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
         return 0;
     }
@@ -1219,8 +1232,8 @@ int tls_parse_ctos_supported_groups(SSL_CONNECTION *s, PACKET *pkt,
         s->ext.peer_supportedgroups = NULL;
         s->ext.peer_supportedgroups_len = 0;
         if (!tls1_save_u16(&supported_groups_list,
-                           &s->ext.peer_supportedgroups,
-                           &s->ext.peer_supportedgroups_len)) {
+                &s->ext.peer_supportedgroups,
+                &s->ext.peer_supportedgroups_len)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -1230,7 +1243,7 @@ int tls_parse_ctos_supported_groups(SSL_CONNECTION *s, PACKET *pkt,
 }
 
 int tls_parse_ctos_ems(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     /* The extension must always be empty */
     if (PACKET_remaining(pkt) != 0) {
@@ -1246,9 +1259,8 @@ int tls_parse_ctos_ems(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
     return 1;
 }
 
-
 int tls_parse_ctos_early_data(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                              X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     if (PACKET_remaining(pkt) != 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
@@ -1264,25 +1276,25 @@ int tls_parse_ctos_early_data(SSL_CONNECTION *s, PACKET *pkt, unsigned int conte
 }
 
 static SSL_TICKET_STATUS tls_get_stateful_ticket(SSL_CONNECTION *s, PACKET *tick,
-                                                 SSL_SESSION **sess)
+    SSL_SESSION **sess)
 {
     SSL_SESSION *tmpsess = NULL;
 
     s->ext.ticket_expected = 1;
 
     switch (PACKET_remaining(tick)) {
-        case 0:
-            return SSL_TICKET_EMPTY;
+    case 0:
+        return SSL_TICKET_EMPTY;
 
-        case SSL_MAX_SSL_SESSION_ID_LENGTH:
-            break;
+    case SSL_MAX_SSL_SESSION_ID_LENGTH:
+        break;
 
-        default:
-            return SSL_TICKET_NO_DECRYPT;
+    default:
+        return SSL_TICKET_NO_DECRYPT;
     }
 
     tmpsess = lookup_sess_in_cache(s, PACKET_data(tick),
-                                   SSL_MAX_SSL_SESSION_ID_LENGTH);
+        SSL_MAX_SSL_SESSION_ID_LENGTH);
 
     if (tmpsess == NULL)
         return SSL_TICKET_NO_DECRYPT;
@@ -1292,7 +1304,7 @@ static SSL_TICKET_STATUS tls_get_stateful_ticket(SSL_CONNECTION *s, PACKET *tick
 }
 
 int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     PACKET identities, binders, binder;
     size_t binderoffset;
@@ -1308,7 +1320,8 @@ int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
      * ignore this extension
      */
     if ((s->ext.psk_kex_mode
-            & (TLSEXT_KEX_MODE_FLAG_KE | TLSEXT_KEX_MODE_FLAG_KE_DHE)) == 0)
+            & (TLSEXT_KEX_MODE_FLAG_KE | TLSEXT_KEX_MODE_FLAG_KE_DHE))
+        == 0)
         return 1;
 
     if (!PACKET_get_length_prefixed_2(pkt, &identities)) {
@@ -1323,23 +1336,23 @@ int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
         size_t idlen;
 
         if (!PACKET_get_length_prefixed_2(&identities, &identity)
-                || !PACKET_get_net_4(&identities, &ticket_agel)) {
+            || !PACKET_get_net_4(&identities, &ticket_agel)) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
             return 0;
         }
 
         idlen = PACKET_remaining(&identity);
         if (s->psk_find_session_cb != NULL
-                && !s->psk_find_session_cb(ussl, PACKET_data(&identity), idlen,
-                                           &sess)) {
+            && !s->psk_find_session_cb(ussl, PACKET_data(&identity), idlen,
+                &sess)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_BAD_EXTENSION);
             return 0;
         }
 
 #ifndef OPENSSL_NO_PSK
         if (sess == NULL
-                && s->psk_server_callback != NULL
-                && idlen <= PSK_MAX_IDENTITY_LEN) {
+            && s->psk_server_callback != NULL
+            && idlen <= PSK_MAX_IDENTITY_LEN) {
             char *pskid = NULL;
             unsigned char pskdata[PSK_MAX_PSK_LEN];
             unsigned int pskdatalen;
@@ -1349,7 +1362,7 @@ int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
                 return 0;
             }
             pskdatalen = s->psk_server_callback(ussl, pskid, pskdata,
-                                                sizeof(pskdata));
+                sizeof(pskdata));
             OPENSSL_free(pskid);
             if (pskdatalen > PSK_MAX_PSK_LEN) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -1363,7 +1376,7 @@ int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
                  * the digest so we default to SHA256 as per the TLSv1.3 spec
                  */
                 cipher = SSL_CIPHER_find(SSL_CONNECTION_GET_SSL(s),
-                                         tls13_aes128gcmsha256_id);
+                    tls13_aes128gcmsha256_id);
                 if (cipher == NULL) {
                     OPENSSL_cleanse(pskdata, pskdatalen);
                     SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -1372,11 +1385,11 @@ int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 
                 sess = SSL_SESSION_new();
                 if (sess == NULL
-                        || !SSL_SESSION_set1_master_key(sess, pskdata,
-                                                        pskdatalen)
-                        || !SSL_SESSION_set_cipher(sess, cipher)
-                        || !SSL_SESSION_set_protocol_version(sess,
-                                                             TLS1_3_VERSION)) {
+                    || !SSL_SESSION_set1_master_key(sess, pskdata,
+                        pskdatalen)
+                    || !SSL_SESSION_set_cipher(sess, cipher)
+                    || !SSL_SESSION_set_protocol_version(sess,
+                        TLS1_3_VERSION)) {
                     OPENSSL_cleanse(pskdata, pskdatalen);
                     SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                     goto err;
@@ -1417,13 +1430,13 @@ int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
              * is no point in using full stateless tickets.
              */
             if ((s->options & SSL_OP_NO_TICKET) != 0
-                    || (s->max_early_data > 0
-                        && (s->options & SSL_OP_NO_ANTI_REPLAY) == 0))
+                || (s->max_early_data > 0
+                    && (s->options & SSL_OP_NO_ANTI_REPLAY) == 0))
                 ret = tls_get_stateful_ticket(s, &identity, &sess);
             else
                 ret = tls_decrypt_ticket(s, PACKET_data(&identity),
-                                         PACKET_remaining(&identity), NULL, 0,
-                                         &sess);
+                    PACKET_remaining(&identity), NULL, 0,
+                    &sess);
 
             if (ret == SSL_TICKET_EMPTY) {
                 SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_EXTENSION);
@@ -1431,7 +1444,7 @@ int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
             }
 
             if (ret == SSL_TICKET_FATAL_ERR_MALLOC
-                    || ret == SSL_TICKET_FATAL_ERR_OTHER) {
+                || ret == SSL_TICKET_FATAL_ERR_OTHER) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 return 0;
             }
@@ -1440,15 +1453,15 @@ int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 
             /* Check for replay */
             if (s->max_early_data > 0
-                    && (s->options & SSL_OP_NO_ANTI_REPLAY) == 0
-                    && !SSL_CTX_remove_session(s->session_ctx, sess)) {
+                && (s->options & SSL_OP_NO_ANTI_REPLAY) == 0
+                && !SSL_CTX_remove_session(s->session_ctx, sess)) {
                 SSL_SESSION_free(sess);
                 sess = NULL;
                 continue;
             }
 
             age = ossl_time_subtract(ossl_ms2time(ticket_agel),
-                                     ossl_ms2time(sess->ext.tick_age_add));
+                ossl_ms2time(sess->ext.tick_age_add));
             t = ossl_time_subtract(ossl_time_now(), sess->time);
 
             /*
@@ -1463,10 +1476,11 @@ int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
             expire = ossl_time_add(t, ossl_ms2time(1000));
 
             if (id == 0
-                    && ossl_time_compare(sess->timeout, t) >= 0
-                    && ossl_time_compare(age, expire) <= 0
-                    && ossl_time_compare(ossl_time_add(age, TICKET_AGE_ALLOWANCE),
-                                         expire) >= 0) {
+                && ossl_time_compare(sess->timeout, t) >= 0
+                && ossl_time_compare(age, expire) <= 0
+                && ossl_time_compare(ossl_time_add(age, TICKET_AGE_ALLOWANCE),
+                       expire)
+                    >= 0) {
                 /*
                  * Ticket age is within tolerance and not expired. We allow it
                  * for early data
@@ -1482,7 +1496,7 @@ int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
         }
         if (!EVP_MD_is_a(md,
                 EVP_MD_get0_name(ssl_md(sctx,
-                                        s->s3.tmp.new_cipher->algorithm2)))) {
+                    s->s3.tmp.new_cipher->algorithm2)))) {
             /* The ciphersuite is not compatible with this session. */
             SSL_SESSION_free(sess);
             sess = NULL;
@@ -1518,8 +1532,9 @@ int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
         goto err;
     }
     if (tls_psk_do_binder(s, md, (const unsigned char *)s->init_buf->data,
-                          binderoffset, PACKET_data(&binder), NULL, sess, 0,
-                          ext) != 1) {
+            binderoffset, PACKET_data(&binder), NULL, sess, 0,
+            ext)
+        != 1) {
         /* SSLfatal() already called */
         goto err;
     }
@@ -1535,13 +1550,13 @@ int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
 }
 
 int tls_parse_ctos_post_handshake_auth(SSL_CONNECTION *s, PACKET *pkt,
-                                       ossl_unused unsigned int context,
-                                       ossl_unused X509 *x,
-                                       ossl_unused size_t chainidx)
+    ossl_unused unsigned int context,
+    ossl_unused X509 *x,
+    ossl_unused size_t chainidx)
 {
     if (PACKET_remaining(pkt) != 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR,
-                 SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR);
+            SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR);
         return 0;
     }
 
@@ -1554,22 +1569,22 @@ int tls_parse_ctos_post_handshake_auth(SSL_CONNECTION *s, PACKET *pkt,
  * Add the server's renegotiation binding
  */
 EXT_RETURN tls_construct_stoc_renegotiate(SSL_CONNECTION *s, WPACKET *pkt,
-                                          unsigned int context, X509 *x,
-                                          size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     if (!s->s3.send_connection_binding)
         return EXT_RETURN_NOT_SENT;
 
     /* Still add this even if SSL_OP_NO_RENEGOTIATION is set */
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_renegotiate)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_start_sub_packet_u8(pkt)
-            || !WPACKET_memcpy(pkt, s->s3.previous_client_finished,
-                               s->s3.previous_client_finished_len)
-            || !WPACKET_memcpy(pkt, s->s3.previous_server_finished,
-                               s->s3.previous_server_finished_len)
-            || !WPACKET_close(pkt)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_start_sub_packet_u8(pkt)
+        || !WPACKET_memcpy(pkt, s->s3.previous_client_finished,
+            s->s3.previous_client_finished_len)
+        || !WPACKET_memcpy(pkt, s->s3.previous_server_finished,
+            s->s3.previous_server_finished_len)
+        || !WPACKET_close(pkt)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1578,8 +1593,8 @@ EXT_RETURN tls_construct_stoc_renegotiate(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_stoc_server_name(SSL_CONNECTION *s, WPACKET *pkt,
-                                          unsigned int context, X509 *x,
-                                          size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     if (s->servername_done != 1)
         return EXT_RETURN_NOT_SENT;
@@ -1592,7 +1607,7 @@ EXT_RETURN tls_construct_stoc_server_name(SSL_CONNECTION *s, WPACKET *pkt,
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_server_name)
-            || !WPACKET_put_bytes_u16(pkt, 0)) {
+        || !WPACKET_put_bytes_u16(pkt, 0)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1602,8 +1617,8 @@ EXT_RETURN tls_construct_stoc_server_name(SSL_CONNECTION *s, WPACKET *pkt,
 
 /* Add/include the server's max fragment len extension into ServerHello */
 EXT_RETURN tls_construct_stoc_maxfragmentlen(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     if (!USE_MAX_FRAGMENT_LENGTH_EXT(s->session))
         return EXT_RETURN_NOT_SENT;
@@ -1624,13 +1639,13 @@ EXT_RETURN tls_construct_stoc_maxfragmentlen(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_stoc_ec_pt_formats(SSL_CONNECTION *s, WPACKET *pkt,
-                                            unsigned int context, X509 *x,
-                                            size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     unsigned long alg_k = s->s3.tmp.new_cipher->algorithm_mkey;
     unsigned long alg_a = s->s3.tmp.new_cipher->algorithm_auth;
     int using_ecc = ((alg_k & SSL_kECDHE) || (alg_a & SSL_aECDSA))
-                    && (s->ext.peer_ecpointformats != NULL);
+        && (s->ext.peer_ecpointformats != NULL);
     const unsigned char *plist;
     size_t plistlen;
 
@@ -1639,9 +1654,9 @@ EXT_RETURN tls_construct_stoc_ec_pt_formats(SSL_CONNECTION *s, WPACKET *pkt,
 
     tls1_get_formatlist(s, &plist, &plistlen);
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_ec_point_formats)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_sub_memcpy_u8(pkt, plist, plistlen)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_sub_memcpy_u8(pkt, plist, plistlen)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1650,8 +1665,8 @@ EXT_RETURN tls_construct_stoc_ec_pt_formats(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_stoc_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
-                                               unsigned int context, X509 *x,
-                                               size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     const uint16_t *groups;
     size_t numgroups, i, first = 1;
@@ -1674,7 +1689,7 @@ EXT_RETURN tls_construct_stoc_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
         uint16_t group = groups[i];
 
         if (tls_valid_group(s, group, version, version, 0, NULL)
-                && tls_group_allowed(s, group, SSL_SECOP_CURVE_SUPPORTED)) {
+            && tls_group_allowed(s, group, SSL_SECOP_CURVE_SUPPORTED)) {
             if (first) {
                 /*
                  * Check if the client is already using our preferred group. If
@@ -1685,9 +1700,9 @@ EXT_RETURN tls_construct_stoc_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
 
                 /* Add extension header */
                 if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_supported_groups)
-                           /* Sub-packet for supported_groups extension */
-                        || !WPACKET_start_sub_packet_u16(pkt)
-                        || !WPACKET_start_sub_packet_u16(pkt)) {
+                    /* Sub-packet for supported_groups extension */
+                    || !WPACKET_start_sub_packet_u16(pkt)
+                    || !WPACKET_start_sub_packet_u16(pkt)) {
                     SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                     return EXT_RETURN_FAIL;
                 }
@@ -1695,9 +1710,9 @@ EXT_RETURN tls_construct_stoc_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
                 first = 0;
             }
             if (!WPACKET_put_bytes_u16(pkt, group)) {
-                    SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
-                    return EXT_RETURN_FAIL;
-                }
+                SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+                return EXT_RETURN_FAIL;
+            }
         }
     }
 
@@ -1710,8 +1725,8 @@ EXT_RETURN tls_construct_stoc_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_stoc_session_ticket(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     if (!s->ext.ticket_expected || !tls_use_ticket(s)) {
         s->ext.ticket_expected = 0;
@@ -1719,7 +1734,7 @@ EXT_RETURN tls_construct_stoc_session_ticket(SSL_CONNECTION *s, WPACKET *pkt,
     }
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_session_ticket)
-            || !WPACKET_put_bytes_u16(pkt, 0)) {
+        || !WPACKET_put_bytes_u16(pkt, 0)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1729,8 +1744,8 @@ EXT_RETURN tls_construct_stoc_session_ticket(SSL_CONNECTION *s, WPACKET *pkt,
 
 #ifndef OPENSSL_NO_OCSP
 EXT_RETURN tls_construct_stoc_status_request(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     /* We don't currently support this extension inside a CertificateRequest */
     if (context == SSL_EXT_TLS1_3_CERTIFICATE_REQUEST)
@@ -1743,7 +1758,7 @@ EXT_RETURN tls_construct_stoc_status_request(SSL_CONNECTION *s, WPACKET *pkt,
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_status_request)
-            || !WPACKET_start_sub_packet_u16(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1754,8 +1769,8 @@ EXT_RETURN tls_construct_stoc_status_request(SSL_CONNECTION *s, WPACKET *pkt,
      * separate message
      */
     if (SSL_CONNECTION_IS_TLS13(s) && !tls_construct_cert_status_body(s, pkt)) {
-       /* SSLfatal() already called */
-       return EXT_RETURN_FAIL;
+        /* SSLfatal() already called */
+        return EXT_RETURN_FAIL;
     }
     if (!WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -1768,8 +1783,8 @@ EXT_RETURN tls_construct_stoc_status_request(SSL_CONNECTION *s, WPACKET *pkt,
 
 #ifndef OPENSSL_NO_NEXTPROTONEG
 EXT_RETURN tls_construct_stoc_next_proto_neg(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     const unsigned char *npa;
     unsigned int npalen;
@@ -1782,10 +1797,10 @@ EXT_RETURN tls_construct_stoc_next_proto_neg(SSL_CONNECTION *s, WPACKET *pkt,
         return EXT_RETURN_NOT_SENT;
 
     ret = sctx->ext.npn_advertised_cb(SSL_CONNECTION_GET_USER_SSL(s), &npa,
-                                      &npalen, sctx->ext.npn_advertised_cb_arg);
+        &npalen, sctx->ext.npn_advertised_cb_arg);
     if (ret == SSL_TLSEXT_ERR_OK) {
         if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_next_proto_neg)
-                || !WPACKET_sub_memcpy_u16(pkt, npa, npalen)) {
+            || !WPACKET_sub_memcpy_u16(pkt, npa, npalen)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return EXT_RETURN_FAIL;
         }
@@ -1798,19 +1813,19 @@ EXT_RETURN tls_construct_stoc_next_proto_neg(SSL_CONNECTION *s, WPACKET *pkt,
 #endif
 
 EXT_RETURN tls_construct_stoc_alpn(SSL_CONNECTION *s, WPACKET *pkt, unsigned int context,
-                                   X509 *x, size_t chainidx)
+    X509 *x, size_t chainidx)
 {
     if (s->s3.alpn_selected == NULL)
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt,
-                TLSEXT_TYPE_application_layer_protocol_negotiation)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_sub_memcpy_u8(pkt, s->s3.alpn_selected,
-                                      s->s3.alpn_selected_len)
-            || !WPACKET_close(pkt)
-            || !WPACKET_close(pkt)) {
+            TLSEXT_TYPE_application_layer_protocol_negotiation)
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_sub_memcpy_u8(pkt, s->s3.alpn_selected,
+            s->s3.alpn_selected_len)
+        || !WPACKET_close(pkt)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1820,18 +1835,18 @@ EXT_RETURN tls_construct_stoc_alpn(SSL_CONNECTION *s, WPACKET *pkt, unsigned int
 
 #ifndef OPENSSL_NO_SRTP
 EXT_RETURN tls_construct_stoc_use_srtp(SSL_CONNECTION *s, WPACKET *pkt,
-                                       unsigned int context, X509 *x,
-                                       size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     if (s->srtp_profile == NULL)
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_use_srtp)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_put_bytes_u16(pkt, 2)
-            || !WPACKET_put_bytes_u16(pkt, s->srtp_profile->id)
-            || !WPACKET_put_bytes_u8(pkt, 0)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_put_bytes_u16(pkt, 2)
+        || !WPACKET_put_bytes_u16(pkt, s->srtp_profile->id)
+        || !WPACKET_put_bytes_u8(pkt, 0)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1841,8 +1856,8 @@ EXT_RETURN tls_construct_stoc_use_srtp(SSL_CONNECTION *s, WPACKET *pkt,
 #endif
 
 EXT_RETURN tls_construct_stoc_etm(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     if (!s->ext.use_etm)
         return EXT_RETURN_NOT_SENT;
@@ -1862,7 +1877,7 @@ EXT_RETURN tls_construct_stoc_etm(SSL_CONNECTION *s, WPACKET *pkt,
     }
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_encrypt_then_mac)
-            || !WPACKET_put_bytes_u16(pkt, 0)) {
+        || !WPACKET_put_bytes_u16(pkt, 0)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1871,14 +1886,14 @@ EXT_RETURN tls_construct_stoc_etm(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_stoc_ems(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     if ((s->s3.flags & TLS1_FLAGS_RECEIVED_EXTMS) == 0)
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_extended_master_secret)
-            || !WPACKET_put_bytes_u16(pkt, 0)) {
+        || !WPACKET_put_bytes_u16(pkt, 0)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1887,8 +1902,8 @@ EXT_RETURN tls_construct_stoc_ems(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_stoc_supported_versions(SSL_CONNECTION *s, WPACKET *pkt,
-                                                 unsigned int context, X509 *x,
-                                                 size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     if (!ossl_assert(SSL_CONNECTION_IS_TLS13(s))) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -1896,9 +1911,9 @@ EXT_RETURN tls_construct_stoc_supported_versions(SSL_CONNECTION *s, WPACKET *pkt
     }
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_supported_versions)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_put_bytes_u16(pkt, s->version)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_put_bytes_u16(pkt, s->version)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1907,8 +1922,8 @@ EXT_RETURN tls_construct_stoc_supported_versions(SSL_CONNECTION *s, WPACKET *pkt
 }
 
 EXT_RETURN tls_construct_stoc_key_share(SSL_CONNECTION *s, WPACKET *pkt,
-                                        unsigned int context, X509 *x,
-                                        size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
 #ifndef OPENSSL_NO_TLS1_3
     unsigned char *encoded_pubkey;
@@ -1922,9 +1937,9 @@ EXT_RETURN tls_construct_stoc_key_share(SSL_CONNECTION *s, WPACKET *pkt,
             return EXT_RETURN_NOT_SENT;
         }
         if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_key_share)
-                || !WPACKET_start_sub_packet_u16(pkt)
-                || !WPACKET_put_bytes_u16(pkt, s->s3.group_id)
-                || !WPACKET_close(pkt)) {
+            || !WPACKET_start_sub_packet_u16(pkt)
+            || !WPACKET_put_bytes_u16(pkt, s->s3.group_id)
+            || !WPACKET_close(pkt)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return EXT_RETURN_FAIL;
         }
@@ -1952,14 +1967,15 @@ EXT_RETURN tls_construct_stoc_key_share(SSL_CONNECTION *s, WPACKET *pkt,
     }
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_key_share)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_put_bytes_u16(pkt, s->s3.group_id)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_put_bytes_u16(pkt, s->s3.group_id)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
 
     if ((ginf = tls1_group_id_lookup(SSL_CONNECTION_GET_CTX(s),
-                                     s->s3.group_id)) == NULL) {
+             s->s3.group_id))
+        == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -1981,7 +1997,7 @@ EXT_RETURN tls_construct_stoc_key_share(SSL_CONNECTION *s, WPACKET *pkt,
         }
 
         if (!WPACKET_sub_memcpy_u16(pkt, encoded_pubkey, encoded_pubkey_len)
-                || !WPACKET_close(pkt)) {
+            || !WPACKET_close(pkt)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             EVP_PKEY_free(skey);
             OPENSSL_free(encoded_pubkey);
@@ -2020,7 +2036,7 @@ EXT_RETURN tls_construct_stoc_key_share(SSL_CONNECTION *s, WPACKET *pkt,
         }
 
         if (!WPACKET_sub_memcpy_u16(pkt, ct, ctlen)
-                || !WPACKET_close(pkt)) {
+            || !WPACKET_close(pkt)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             OPENSSL_free(ct);
             return EXT_RETURN_FAIL;
@@ -2043,8 +2059,8 @@ EXT_RETURN tls_construct_stoc_key_share(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_stoc_cookie(SSL_CONNECTION *s, WPACKET *pkt,
-                                     unsigned int context,
-                                     X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
 #ifndef OPENSSL_NO_TLS1_3
     unsigned char *hashval1, *hashval2, *appcookie1, *appcookie2, *cookie;
@@ -2066,20 +2082,20 @@ EXT_RETURN tls_construct_stoc_cookie(SSL_CONNECTION *s, WPACKET *pkt,
     }
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_cookie)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_get_total_written(pkt, &startlen)
-            || !WPACKET_reserve_bytes(pkt, MAX_COOKIE_SIZE, &cookie)
-            || !WPACKET_put_bytes_u16(pkt, COOKIE_STATE_FORMAT_VERSION)
-            || !WPACKET_put_bytes_u16(pkt, TLS1_3_VERSION)
-            || !WPACKET_put_bytes_u16(pkt, s->s3.group_id)
-            || !ssl->method->put_cipher_by_char(s->s3.tmp.new_cipher, pkt,
-                                                &ciphlen)
-               /* Is there a key_share extension present in this HRR? */
-            || !WPACKET_put_bytes_u8(pkt, s->s3.peer_tmp == NULL)
-            || !WPACKET_put_bytes_u64(pkt, time(NULL))
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_reserve_bytes(pkt, EVP_MAX_MD_SIZE, &hashval1)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_get_total_written(pkt, &startlen)
+        || !WPACKET_reserve_bytes(pkt, MAX_COOKIE_SIZE, &cookie)
+        || !WPACKET_put_bytes_u16(pkt, COOKIE_STATE_FORMAT_VERSION)
+        || !WPACKET_put_bytes_u16(pkt, TLS1_3_VERSION)
+        || !WPACKET_put_bytes_u16(pkt, s->s3.group_id)
+        || !ssl->method->put_cipher_by_char(s->s3.tmp.new_cipher, pkt,
+            &ciphlen)
+        /* Is there a key_share extension present in this HRR? */
+        || !WPACKET_put_bytes_u8(pkt, s->s3.peer_tmp == NULL)
+        || !WPACKET_put_bytes_u64(pkt, time(NULL))
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_reserve_bytes(pkt, EVP_MAX_MD_SIZE, &hashval1)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -2090,32 +2106,33 @@ EXT_RETURN tls_construct_stoc_cookie(SSL_CONNECTION *s, WPACKET *pkt,
      * subsequently allocate them (below)
      */
     if (!ssl3_digest_cached_records(s, 0)
-            || !ssl_handshake_hash(s, hashval1, EVP_MAX_MD_SIZE, &hashlen)) {
+        || !ssl_handshake_hash(s, hashval1, EVP_MAX_MD_SIZE, &hashlen)) {
         /* SSLfatal() already called */
         return EXT_RETURN_FAIL;
     }
 
     if (!WPACKET_allocate_bytes(pkt, hashlen, &hashval2)
-            || !ossl_assert(hashval1 == hashval2)
-            || !WPACKET_close(pkt)
-            || !WPACKET_start_sub_packet_u8(pkt)
-            || !WPACKET_reserve_bytes(pkt, SSL_COOKIE_LENGTH, &appcookie1)) {
+        || !ossl_assert(hashval1 == hashval2)
+        || !WPACKET_close(pkt)
+        || !WPACKET_start_sub_packet_u8(pkt)
+        || !WPACKET_reserve_bytes(pkt, SSL_COOKIE_LENGTH, &appcookie1)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
 
     /* Generate the application cookie */
     if (sctx->gen_stateless_cookie_cb(ussl, appcookie1,
-                                      &appcookielen) == 0) {
+            &appcookielen)
+        == 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_COOKIE_GEN_CALLBACK_FAILURE);
         return EXT_RETURN_FAIL;
     }
 
     if (!WPACKET_allocate_bytes(pkt, appcookielen, &appcookie2)
-            || !ossl_assert(appcookie1 == appcookie2)
-            || !WPACKET_close(pkt)
-            || !WPACKET_get_total_written(pkt, &totcookielen)
-            || !WPACKET_reserve_bytes(pkt, SHA256_DIGEST_LENGTH, &hmac)) {
+        || !ossl_assert(appcookie1 == appcookie2)
+        || !WPACKET_close(pkt)
+        || !WPACKET_get_total_written(pkt, &totcookielen)
+        || !WPACKET_reserve_bytes(pkt, SHA256_DIGEST_LENGTH, &hmac)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -2130,18 +2147,20 @@ EXT_RETURN tls_construct_stoc_cookie(SSL_CONNECTION *s, WPACKET *pkt,
     /* HMAC the cookie */
     hctx = EVP_MD_CTX_create();
     pkey = EVP_PKEY_new_raw_private_key_ex(sctx->libctx, "HMAC",
-                                           sctx->propq,
-                                           s->session_ctx->ext.cookie_hmac_key,
-                                           sizeof(s->session_ctx->ext.cookie_hmac_key));
+        sctx->propq,
+        s->session_ctx->ext.cookie_hmac_key,
+        sizeof(s->session_ctx->ext.cookie_hmac_key));
     if (hctx == NULL || pkey == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
         goto err;
     }
 
     if (EVP_DigestSignInit_ex(hctx, NULL, "SHA2-256", sctx->libctx,
-                              sctx->propq, pkey, NULL) <= 0
-            || EVP_DigestSign(hctx, hmac, &hmaclen, cookie,
-                              totcookielen) <= 0) {
+            sctx->propq, pkey, NULL)
+            <= 0
+        || EVP_DigestSign(hctx, hmac, &hmaclen, cookie,
+               totcookielen)
+            <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -2152,17 +2171,17 @@ EXT_RETURN tls_construct_stoc_cookie(SSL_CONNECTION *s, WPACKET *pkt,
     }
 
     if (!WPACKET_allocate_bytes(pkt, hmaclen, &hmac2)
-            || !ossl_assert(hmac == hmac2)
-            || !ossl_assert(cookie == hmac - totcookielen)
-            || !WPACKET_close(pkt)
-            || !WPACKET_close(pkt)) {
+        || !ossl_assert(hmac == hmac2)
+        || !ossl_assert(cookie == hmac - totcookielen)
+        || !WPACKET_close(pkt)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
 
     ret = EXT_RETURN_SENT;
 
- err:
+err:
     EVP_MD_CTX_free(hctx);
     EVP_PKEY_free(pkey);
     return ret;
@@ -2172,12 +2191,12 @@ EXT_RETURN tls_construct_stoc_cookie(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_stoc_cryptopro_bug(SSL_CONNECTION *s, WPACKET *pkt,
-                                            unsigned int context, X509 *x,
-                                            size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     const unsigned char cryptopro_ext[36] = {
-        0xfd, 0xe8,         /* 65000 */
-        0x00, 0x20,         /* 32 bytes length */
+        0xfd, 0xe8, /* 65000 */
+        0x00, 0x20, /* 32 bytes length */
         0x30, 0x1e, 0x30, 0x08, 0x06, 0x06, 0x2a, 0x85,
         0x03, 0x02, 0x02, 0x09, 0x30, 0x08, 0x06, 0x06,
         0x2a, 0x85, 0x03, 0x02, 0x02, 0x16, 0x30, 0x08,
@@ -2185,9 +2204,10 @@ EXT_RETURN tls_construct_stoc_cryptopro_bug(SSL_CONNECTION *s, WPACKET *pkt,
     };
 
     if (((s->s3.tmp.new_cipher->id & 0xFFFF) != 0x80
-         && (s->s3.tmp.new_cipher->id & 0xFFFF) != 0x81)
-            || (SSL_get_options(SSL_CONNECTION_GET_SSL(s))
-                & SSL_OP_CRYPTOPRO_TLSEXT_BUG) == 0)
+            && (s->s3.tmp.new_cipher->id & 0xFFFF) != 0x81)
+        || (SSL_get_options(SSL_CONNECTION_GET_SSL(s))
+               & SSL_OP_CRYPTOPRO_TLSEXT_BUG)
+            == 0)
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_memcpy(pkt, cryptopro_ext, sizeof(cryptopro_ext))) {
@@ -2199,17 +2219,17 @@ EXT_RETURN tls_construct_stoc_cryptopro_bug(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_stoc_early_data(SSL_CONNECTION *s, WPACKET *pkt,
-                                         unsigned int context, X509 *x,
-                                         size_t chainidx)
+    unsigned int context, X509 *x,
+    size_t chainidx)
 {
     if (context == SSL_EXT_TLS1_3_NEW_SESSION_TICKET) {
         if (s->max_early_data == 0)
             return EXT_RETURN_NOT_SENT;
 
         if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_early_data)
-                || !WPACKET_start_sub_packet_u16(pkt)
-                || !WPACKET_put_bytes_u32(pkt, s->max_early_data)
-                || !WPACKET_close(pkt)) {
+            || !WPACKET_start_sub_packet_u16(pkt)
+            || !WPACKET_put_bytes_u32(pkt, s->max_early_data)
+            || !WPACKET_close(pkt)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return EXT_RETURN_FAIL;
         }
@@ -2221,8 +2241,8 @@ EXT_RETURN tls_construct_stoc_early_data(SSL_CONNECTION *s, WPACKET *pkt,
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_early_data)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -2231,16 +2251,16 @@ EXT_RETURN tls_construct_stoc_early_data(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_stoc_psk(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     if (!s->hit)
         return EXT_RETURN_NOT_SENT;
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_psk)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_put_bytes_u16(pkt, s->ext.tick_identity)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_put_bytes_u16(pkt, s->ext.tick_identity)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -2249,8 +2269,8 @@ EXT_RETURN tls_construct_stoc_psk(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 EXT_RETURN tls_construct_stoc_client_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
-                                               unsigned int context,
-                                               X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     if (sc->ext.client_cert_type_ctos == OSSL_CERT_TYPE_CTOS_ERROR
         && (send_certificate_request(sc)
@@ -2270,8 +2290,8 @@ EXT_RETURN tls_construct_stoc_client_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
      * but TLSv1.3 could do a PHA request if the client supports it
      */
     if ((!send_certificate_request(sc) && sc->post_handshake_auth != SSL_PHA_EXT_RECEIVED)
-            || sc->ext.client_cert_type_ctos != OSSL_CERT_TYPE_CTOS_GOOD
-            || sc->client_cert_type == NULL) {
+        || sc->ext.client_cert_type_ctos != OSSL_CERT_TYPE_CTOS_GOOD
+        || sc->client_cert_type == NULL) {
         /* if we don't send it, reset to TLSEXT_cert_type_x509 */
         sc->ext.client_cert_type_ctos = OSSL_CERT_TYPE_CTOS_NONE;
         sc->ext.client_cert_type = TLSEXT_cert_type_x509;
@@ -2279,9 +2299,9 @@ EXT_RETURN tls_construct_stoc_client_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
     }
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_client_cert_type)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_put_bytes_u8(pkt, sc->ext.client_cert_type)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_put_bytes_u8(pkt, sc->ext.client_cert_type)
+        || !WPACKET_close(pkt)) {
         SSLfatal(sc, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -2290,8 +2310,8 @@ EXT_RETURN tls_construct_stoc_client_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
 
 /* One of |pref|, |other| is configured and the values are sanitized */
 static int reconcile_cert_type(const unsigned char *pref, size_t pref_len,
-                               const unsigned char *other, size_t other_len,
-                               uint8_t *chosen_cert_type)
+    const unsigned char *other, size_t other_len,
+    uint8_t *chosen_cert_type)
 {
     size_t i;
 
@@ -2305,8 +2325,8 @@ static int reconcile_cert_type(const unsigned char *pref, size_t pref_len,
 }
 
 int tls_parse_ctos_client_cert_type(SSL_CONNECTION *sc, PACKET *pkt,
-                                    unsigned int context,
-                                    X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     PACKET supported_cert_types;
     const unsigned char *data;
@@ -2336,23 +2356,23 @@ int tls_parse_ctos_client_cert_type(SSL_CONNECTION *sc, PACKET *pkt,
     }
     /* client_cert_type: client (peer) has priority */
     sc->ext.client_cert_type_ctos = reconcile_cert_type(data, len,
-                                                        sc->client_cert_type, sc->client_cert_type_len,
-                                                        &sc->ext.client_cert_type);
+        sc->client_cert_type, sc->client_cert_type_len,
+        &sc->ext.client_cert_type);
 
     /* Ignore the error until sending - so we can check cert auth*/
     return 1;
 }
 
 EXT_RETURN tls_construct_stoc_server_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
-                                               unsigned int context,
-                                               X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     if (sc->ext.server_cert_type == TLSEXT_cert_type_x509) {
         sc->ext.server_cert_type_ctos = OSSL_CERT_TYPE_CTOS_NONE;
         return EXT_RETURN_NOT_SENT;
     }
     if (sc->ext.server_cert_type_ctos != OSSL_CERT_TYPE_CTOS_GOOD
-            || sc->server_cert_type == NULL) {
+        || sc->server_cert_type == NULL) {
         /* if we don't send it, reset to TLSEXT_cert_type_x509 */
         sc->ext.server_cert_type_ctos = OSSL_CERT_TYPE_CTOS_NONE;
         sc->ext.server_cert_type = TLSEXT_cert_type_x509;
@@ -2360,9 +2380,9 @@ EXT_RETURN tls_construct_stoc_server_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
     }
 
     if (!WPACKET_put_bytes_u16(pkt, TLSEXT_TYPE_server_cert_type)
-            || !WPACKET_start_sub_packet_u16(pkt)
-            || !WPACKET_put_bytes_u8(pkt, sc->ext.server_cert_type)
-            || !WPACKET_close(pkt)) {
+        || !WPACKET_start_sub_packet_u16(pkt)
+        || !WPACKET_put_bytes_u8(pkt, sc->ext.server_cert_type)
+        || !WPACKET_close(pkt)) {
         SSLfatal(sc, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
@@ -2370,8 +2390,8 @@ EXT_RETURN tls_construct_stoc_server_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
 }
 
 int tls_parse_ctos_server_cert_type(SSL_CONNECTION *sc, PACKET *pkt,
-                                    unsigned int context,
-                                    X509 *x, size_t chainidx)
+    unsigned int context,
+    X509 *x, size_t chainidx)
 {
     PACKET supported_cert_types;
     const unsigned char *data;
@@ -2399,8 +2419,8 @@ int tls_parse_ctos_server_cert_type(SSL_CONNECTION *sc, PACKET *pkt,
     }
     /* server_cert_type: server (this) has priority */
     sc->ext.server_cert_type_ctos = reconcile_cert_type(sc->server_cert_type, sc->server_cert_type_len,
-                                                        data, len,
-                                                        &sc->ext.server_cert_type);
+        data, len,
+        &sc->ext.server_cert_type);
     if (sc->ext.server_cert_type_ctos == OSSL_CERT_TYPE_CTOS_GOOD)
         return 1;
 
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index e76fde810b6b4..3342cb06d2081 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -10,8 +10,8 @@
 #include "internal/e_os.h"
 
 #if defined(__TANDEM) && defined(_SPT_MODEL_)
-# include <spthread.h>
-# include <spt_extensions.h> /* timeval */
+#include <spthread.h>
+#include <spt_extensions.h> /* timeval */
 #endif
 
 #include "internal/cryptlib.h"
@@ -148,7 +148,7 @@ void ossl_statem_send_fatal(SSL_CONNECTION *s, int al)
 {
     /* We shouldn't call SSLfatal() twice. Once is enough */
     if (s->statem.in_init && s->statem.state == MSG_FLOW_ERROR)
-      return;
+        return;
     ossl_statem_set_in_init(s, 1);
     s->statem.state = MSG_FLOW_ERROR;
     if (al != SSL_AD_NO_ALERT)
@@ -162,7 +162,7 @@ void ossl_statem_send_fatal(SSL_CONNECTION *s, int al)
  * This is a permanent error for the current connection.
  */
 void ossl_statem_fatal(SSL_CONNECTION *s, int al, int reason,
-                       const char *fmt, ...)
+    const char *fmt, ...)
 {
     va_list args;
 
@@ -178,10 +178,10 @@ void ossl_statem_fatal(SSL_CONNECTION *s, int al, int reason,
  * a fatal error state. We verify that we are, and set it if not (this would
  * indicate a bug).
  */
-#define check_fatal(s) \
-    do { \
-        if (!ossl_assert((s)->statem.in_init \
-                         && (s)->statem.state == MSG_FLOW_ERROR)) \
+#define check_fatal(s)                                               \
+    do {                                                             \
+        if (!ossl_assert((s)->statem.in_init                         \
+                && (s)->statem.state == MSG_FLOW_ERROR))             \
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_MISSING_FATAL); \
     } while (0)
 
@@ -227,8 +227,8 @@ int ossl_statem_skip_early_data(SSL_CONNECTION *s)
         return 0;
 
     if (!s->server
-            || s->statem.hand_state != TLS_ST_EARLY_DATA
-            || s->hello_retry_request == SSL_HRR_COMPLETE)
+        || s->statem.hand_state != TLS_ST_EARLY_DATA
+        || s->hello_retry_request == SSL_HRR_COMPLETE)
         return 0;
 
     return 1;
@@ -244,18 +244,9 @@ int ossl_statem_skip_early_data(SSL_CONNECTION *s)
  */
 int ossl_statem_check_finish_init(SSL_CONNECTION *s, int sending)
 {
-    int i = SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_SERVER_READ;
-
-    if (s->server && SSL_NO_EOED(s) && s->ext.early_data == SSL_EARLY_DATA_ACCEPTED
-        && s->early_data_state != SSL_EARLY_DATA_FINISHED_READING
-            && s->statem.hand_state == TLS_ST_EARLY_DATA) {
-        s->early_data_state = SSL_EARLY_DATA_FINISHED_READING;
-        if (!SSL_CONNECTION_GET_SSL(s)->method->ssl3_enc->change_cipher_state(s, i))
-            return 0;
-    }
     if (sending == -1) {
         if (s->statem.hand_state == TLS_ST_PENDING_EARLY_DATA_END
-                || s->statem.hand_state == TLS_ST_EARLY_DATA) {
+            || s->statem.hand_state == TLS_ST_EARLY_DATA) {
             ossl_statem_set_in_init(s, 1);
             if (s->early_data_state == SSL_EARLY_DATA_WRITE_RETRY) {
                 /*
@@ -266,10 +257,9 @@ int ossl_statem_check_finish_init(SSL_CONNECTION *s, int sending)
             }
         }
     } else if (!s->server) {
-        if ((sending && (s->statem.hand_state == TLS_ST_PENDING_EARLY_DATA_END
-                      || s->statem.hand_state == TLS_ST_EARLY_DATA)
-                  && s->early_data_state != SSL_EARLY_DATA_WRITING)
-                || (!sending && s->statem.hand_state == TLS_ST_EARLY_DATA)) {
+        if ((sending && (s->statem.hand_state == TLS_ST_PENDING_EARLY_DATA_END || s->statem.hand_state == TLS_ST_EARLY_DATA)
+                && s->early_data_state != SSL_EARLY_DATA_WRITING)
+            || (!sending && s->statem.hand_state == TLS_ST_EARLY_DATA)) {
             ossl_statem_set_in_init(s, 1);
             /*
              * SSL_write() has been called directly. We don't allow any more
@@ -280,7 +270,7 @@ int ossl_statem_check_finish_init(SSL_CONNECTION *s, int sending)
         }
     } else {
         if (s->early_data_state == SSL_EARLY_DATA_FINISHED_READING
-                && s->statem.hand_state == TLS_ST_EARLY_DATA)
+            && s->statem.hand_state == TLS_ST_EARLY_DATA)
             ossl_statem_set_in_init(s, 1);
     }
     return 1;
@@ -320,7 +310,7 @@ int ossl_statem_accept(SSL *s)
     return state_machine(sc, 1);
 }
 
-typedef void (*info_cb) (const SSL *, int, int);
+typedef void (*info_cb)(const SSL *, int, int);
 
 static info_cb get_callback(SSL_CONNECTION *s)
 {
@@ -365,7 +355,7 @@ static info_cb get_callback(SSL_CONNECTION *s)
 static int state_machine(SSL_CONNECTION *s, int server)
 {
     BUF_MEM *buf = NULL;
-    void (*cb) (const SSL *ssl, int type, int val) = NULL;
+    void (*cb)(const SSL *ssl, int type, int val) = NULL;
     OSSL_STATEM *st = &s->statem;
     int ret = -1;
     int ssret;
@@ -398,13 +388,13 @@ static int state_machine(SSL_CONNECTION *s, int server)
          * identifier other than 0.
          */
         BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE,
-                 st->in_handshake, NULL);
+            st->in_handshake, NULL);
     }
 #endif
 
     /* Initialise state machine */
     if (st->state == MSG_FLOW_UNINITED
-            || st->state == MSG_FLOW_FINISHED) {
+        || st->state == MSG_FLOW_FINISHED) {
         if (st->state == MSG_FLOW_UNINITED) {
             st->hand_state = TLS_ST_BEFORE;
             st->request_state = TLS_ST_BEFORE;
@@ -423,8 +413,7 @@ static int state_machine(SSL_CONNECTION *s, int server)
          */
 
         if (SSL_CONNECTION_IS_DTLS(s)) {
-            if ((s->version & 0xff00) != (DTLS1_VERSION & 0xff00) &&
-                (server || (s->version & 0xff00) != (DTLS1_BAD_VER & 0xff00))) {
+            if ((s->version & 0xff00) != (DTLS1_VERSION & 0xff00) && (server || (s->version & 0xff00) != (DTLS1_BAD_VER & 0xff00))) {
                 SSLfatal(s, SSL_AD_NO_ALERT, ERR_R_INTERNAL_ERROR);
                 goto end;
             }
@@ -473,7 +462,7 @@ static int state_machine(SSL_CONNECTION *s, int server)
             }
 
         if ((SSL_in_before(ssl))
-                || s->renegotiate) {
+            || s->renegotiate) {
             if (!tls_setup_handshake(s)) {
                 /* SSLfatal() already called */
                 goto end;
@@ -518,7 +507,7 @@ static int state_machine(SSL_CONNECTION *s, int server)
 
     ret = 1;
 
- end:
+end:
     st->in_handshake--;
 
 #ifndef OPENSSL_NO_SCTP
@@ -528,7 +517,7 @@ static int state_machine(SSL_CONNECTION *s, int server)
          * identifier other than 0.
          */
         BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE,
-                 st->in_handshake, NULL);
+            st->in_handshake, NULL);
     }
 #endif
 
@@ -552,7 +541,8 @@ static void init_read_state_machine(SSL_CONNECTION *s)
     st->read_state = READ_STATE_HEADER;
 }
 
-static int grow_init_buf(SSL_CONNECTION *s, size_t size) {
+static int grow_init_buf(SSL_CONNECTION *s, size_t size)
+{
 
     size_t msg_offset = (char *)s->init_msg - s->init_buf->data;
 
@@ -598,12 +588,12 @@ static SUB_STATE_RETURN read_state_machine(SSL_CONNECTION *s)
     OSSL_STATEM *st = &s->statem;
     int ret, mt;
     size_t len = 0;
-    int (*transition) (SSL_CONNECTION *s, int mt);
+    int (*transition)(SSL_CONNECTION *s, int mt);
     PACKET pkt;
-    MSG_PROCESS_RETURN(*process_message) (SSL_CONNECTION *s, PACKET *pkt);
-    WORK_STATE(*post_process_message) (SSL_CONNECTION *s, WORK_STATE wst);
-    size_t (*max_message_size) (SSL_CONNECTION *s);
-    void (*cb) (const SSL *ssl, int type, int val) = NULL;
+    MSG_PROCESS_RETURN (*process_message)(SSL_CONNECTION *s, PACKET *pkt);
+    WORK_STATE (*post_process_message)(SSL_CONNECTION *s, WORK_STATE wst);
+    size_t (*max_message_size)(SSL_CONNECTION *s);
+    void (*cb)(const SSL *ssl, int type, int val) = NULL;
     SSL *ssl = SSL_CONNECTION_GET_USER_SSL(s);
 
     cb = get_callback(s);
@@ -659,15 +649,14 @@ static SUB_STATE_RETURN read_state_machine(SSL_CONNECTION *s)
 
             if (s->s3.tmp.message_size > max_message_size(s)) {
                 SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                         SSL_R_EXCESSIVE_MESSAGE_SIZE);
+                    SSL_R_EXCESSIVE_MESSAGE_SIZE);
                 return SUB_STATE_ERROR;
             }
 
             /* dtls_get_message already did this */
             if (!SSL_CONNECTION_IS_DTLS(s)
-                    && s->s3.tmp.message_size > 0
-                    && !grow_init_buf(s, s->s3.tmp.message_size
-                                         + SSL3_HM_HEADER_LENGTH)) {
+                && s->s3.tmp.message_size > 0
+                && !grow_init_buf(s, s->s3.tmp.message_size + SSL3_HM_HEADER_LENGTH)) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_BUF_LIB);
                 return SUB_STATE_ERROR;
             }
@@ -737,6 +726,7 @@ static SUB_STATE_RETURN read_state_machine(SSL_CONNECTION *s)
                 st->read_state = READ_STATE_HEADER;
                 break;
 
+            case WORK_FINISHED_SWAP:
             case WORK_FINISHED_STOP:
                 if (SSL_CONNECTION_IS_DTLS(s)) {
                     dtls1_stop_timer(s);
@@ -816,15 +806,15 @@ static SUB_STATE_RETURN write_state_machine(SSL_CONNECTION *s)
 {
     OSSL_STATEM *st = &s->statem;
     int ret;
-    WRITE_TRAN(*transition) (SSL_CONNECTION *s);
-    WORK_STATE(*pre_work) (SSL_CONNECTION *s, WORK_STATE wst);
-    WORK_STATE(*post_work) (SSL_CONNECTION *s, WORK_STATE wst);
-    int (*get_construct_message_f) (SSL_CONNECTION *s,
-                                    CON_FUNC_RETURN (**confunc) (SSL_CONNECTION *s,
-                                                                 WPACKET *pkt),
-                                    int *mt);
-    void (*cb) (const SSL *ssl, int type, int val) = NULL;
-    CON_FUNC_RETURN (*confunc) (SSL_CONNECTION *s, WPACKET *pkt);
+    WRITE_TRAN (*transition)(SSL_CONNECTION *s);
+    WORK_STATE (*pre_work)(SSL_CONNECTION *s, WORK_STATE wst);
+    WORK_STATE (*post_work)(SSL_CONNECTION *s, WORK_STATE wst);
+    int (*get_construct_message_f)(SSL_CONNECTION *s,
+        CON_FUNC_RETURN (**confunc)(SSL_CONNECTION *s,
+            WPACKET *pkt),
+        int *mt);
+    void (*cb)(const SSL *ssl, int type, int val) = NULL;
+    CON_FUNC_RETURN (*confunc)(SSL_CONNECTION *s, WPACKET *pkt);
     int mt;
     WPACKET pkt;
     SSL *ssl = SSL_CONNECTION_GET_USER_SSL(s);
@@ -882,6 +872,9 @@ static SUB_STATE_RETURN write_state_machine(SSL_CONNECTION *s)
                 st->write_state = WRITE_STATE_SEND;
                 break;
 
+            case WORK_FINISHED_SWAP:
+                return SUB_STATE_FINISHED;
+
             case WORK_FINISHED_STOP:
                 return SUB_STATE_END_HANDSHAKE;
             }
@@ -896,7 +889,7 @@ static SUB_STATE_RETURN write_state_machine(SSL_CONNECTION *s)
                 break;
             }
             if (!WPACKET_init(&pkt, s->init_buf)
-                    || !ssl_set_handshake_header(s, &pkt, mt)) {
+                || !ssl_set_handshake_header(s, &pkt, mt)) {
                 WPACKET_cleanup(&pkt);
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 return SUB_STATE_ERROR;
@@ -921,7 +914,7 @@ static SUB_STATE_RETURN write_state_machine(SSL_CONNECTION *s)
                 } /* else success */
             }
             if (!ssl_close_construct_packet(s, &pkt, mt)
-                    || !WPACKET_finish(&pkt)) {
+                || !WPACKET_finish(&pkt)) {
                 WPACKET_cleanup(&pkt);
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 return SUB_STATE_ERROR;
@@ -955,6 +948,9 @@ static SUB_STATE_RETURN write_state_machine(SSL_CONNECTION *s)
                 st->write_state = WRITE_STATE_TRANSITION;
                 break;
 
+            case WORK_FINISHED_SWAP:
+                return SUB_STATE_FINISHED;
+
             case WORK_FINISHED_STOP:
                 return SUB_STATE_END_HANDSHAKE;
             }
@@ -1026,7 +1022,7 @@ int ossl_statem_app_data_allowed(SSL_CONNECTION *s)
 int ossl_statem_export_allowed(SSL_CONNECTION *s)
 {
     return s->s3.previous_server_finished_len != 0
-           && s->statem.hand_state != TLS_ST_SW_FINISHED;
+        && s->statem.hand_state != TLS_ST_SW_FINISHED;
 }
 
 /*
@@ -1041,5 +1037,5 @@ int ossl_statem_export_early_allowed(SSL_CONNECTION *s)
      * as we have sent early_data.
      */
     return s->ext.early_data == SSL_EARLY_DATA_ACCEPTED
-           || (!s->server && s->ext.early_data != SSL_EARLY_DATA_NOT_SENT);
+        || (!s->server && s->ext.early_data != SSL_EARLY_DATA_NOT_SENT);
 }
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 9989d6bb93421..0619fbd6f13aa 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -31,14 +31,14 @@
 #include "internal/ssl_unwrap.h"
 
 static MSG_PROCESS_RETURN tls_process_as_hello_retry_request(SSL_CONNECTION *s,
-                                                             PACKET *pkt);
+    PACKET *pkt);
 static MSG_PROCESS_RETURN tls_process_encrypted_extensions(SSL_CONNECTION *s,
-                                                           PACKET *pkt);
+    PACKET *pkt);
 
 static ossl_inline int cert_req_allowed(SSL_CONNECTION *s);
 static int key_exchange_expected(SSL_CONNECTION *s);
 static int ssl_cipher_list_to_bytes(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *sk,
-                                    WPACKET *pkt);
+    WPACKET *pkt);
 
 static ossl_inline int received_server_cert(SSL_CONNECTION *sc)
 {
@@ -56,7 +56,7 @@ static ossl_inline int cert_req_allowed(SSL_CONNECTION *s)
 {
     /* TLS does not like anon-DH with client cert */
     if ((s->version > SSL3_VERSION
-         && (s->s3.tmp.new_cipher->algorithm_auth & SSL_aNULL))
+            && (s->s3.tmp.new_cipher->algorithm_auth & SSL_aNULL))
         || (s->s3.tmp.new_cipher->algorithm_auth & (SSL_aSRP | SSL_aPSK)))
         return 0;
 
@@ -78,8 +78,7 @@ static int key_exchange_expected(SSL_CONNECTION *s)
      * Can't skip server key exchange if this is an ephemeral
      * ciphersuite or for SRP
      */
-    if (alg_k & (SSL_kDHE | SSL_kECDHE | SSL_kDHEPSK | SSL_kECDHEPSK
-                 | SSL_kSRP)) {
+    if (alg_k & (SSL_kDHE | SSL_kECDHE | SSL_kDHEPSK | SSL_kECDHEPSK | SSL_kSRP)) {
         return 1;
     }
 
@@ -144,7 +143,7 @@ static int ossl_statem_client13_read_transition(SSL_CONNECTION *s, int mt)
             }
 #ifndef OPENSSL_NO_COMP_ALG
             if (mt == SSL3_MT_COMPRESSED_CERTIFICATE
-                    && s->ext.compress_certificate_sent) {
+                && s->ext.compress_certificate_sent) {
                 st->hand_state = TLS_ST_CR_COMP_CERT;
                 return 1;
             }
@@ -159,7 +158,7 @@ static int ossl_statem_client13_read_transition(SSL_CONNECTION *s, int mt)
         }
 #ifndef OPENSSL_NO_COMP_ALG
         if (mt == SSL3_MT_COMPRESSED_CERTIFICATE
-                && s->ext.compress_certificate_sent) {
+            && s->ext.compress_certificate_sent) {
             st->hand_state = TLS_ST_CR_COMP_CERT;
             return 1;
         }
@@ -193,7 +192,7 @@ static int ossl_statem_client13_read_transition(SSL_CONNECTION *s, int mt)
         if (mt == SSL3_MT_CERTIFICATE_REQUEST) {
 #if DTLS_MAX_VERSION_INTERNAL != DTLS1_2_VERSION
             /* Restore digest for PHA before adding message.*/
-# error Internal DTLS version error
+#error Internal DTLS version error
 #endif
             if (!SSL_CONNECTION_IS_DTLS(s)
                 && s->post_handshake_auth == SSL_PHA_EXT_SENT) {
@@ -290,9 +289,9 @@ int ossl_statem_client_read_transition(SSL_CONNECTION *s, int mt)
                 st->hand_state = DTLS_ST_CR_HELLO_VERIFY_REQUEST;
                 return 1;
             } else if (s->version >= TLS1_VERSION
-                       && s->ext.session_secret_cb != NULL
-                       && s->session->ext.tick != NULL
-                       && mt == SSL3_MT_CHANGE_CIPHER_SPEC) {
+                && s->ext.session_secret_cb != NULL
+                && s->session->ext.tick != NULL
+                && mt == SSL3_MT_CHANGE_CIPHER_SPEC) {
                 /*
                  * Normally, we can tell if the server is resuming the session
                  * from the session ID. EAP-FAST (RFC 4851), however, relies on
@@ -303,7 +302,7 @@ int ossl_statem_client_read_transition(SSL_CONNECTION *s, int mt)
                 st->hand_state = TLS_ST_CR_CHANGE;
                 return 1;
             } else if (!(s->s3.tmp.new_cipher->algorithm_auth
-                         & (SSL_aNULL | SSL_aSRP | SSL_aPSK))) {
+                           & (SSL_aNULL | SSL_aSRP | SSL_aPSK))) {
                 if (mt == SSL3_MT_CERTIFICATE) {
                     st->hand_state = TLS_ST_CR_CERT;
                     return 1;
@@ -319,7 +318,7 @@ int ossl_statem_client_read_transition(SSL_CONNECTION *s, int mt)
                         return 1;
                     }
                 } else if (mt == SSL3_MT_CERTIFICATE_REQUEST
-                           && cert_req_allowed(s)) {
+                    && cert_req_allowed(s)) {
                     st->hand_state = TLS_ST_CR_CERT_REQ;
                     return 1;
                 } else if (mt == SSL3_MT_SERVER_DONE) {
@@ -345,8 +344,7 @@ int ossl_statem_client_read_transition(SSL_CONNECTION *s, int mt)
     case TLS_ST_CR_CERT_STATUS:
         ske_expected = key_exchange_expected(s);
         /* SKE is optional for some PSK ciphersuites */
-        if (ske_expected || ((s->s3.tmp.new_cipher->algorithm_mkey & SSL_PSK)
-                             && mt == SSL3_MT_SERVER_KEY_EXCHANGE)) {
+        if (ske_expected || ((s->s3.tmp.new_cipher->algorithm_mkey & SSL_PSK) && mt == SSL3_MT_SERVER_KEY_EXCHANGE)) {
             if (mt == SSL3_MT_SERVER_KEY_EXCHANGE) {
                 st->hand_state = TLS_ST_CR_KEY_EXCH;
                 return 1;
@@ -406,7 +404,7 @@ int ossl_statem_client_read_transition(SSL_CONNECTION *s, int mt)
         break;
     }
 
- err:
+err:
     /* No valid transition found */
     if (SSL_CONNECTION_IS_DTLS(s) && mt == SSL3_MT_CHANGE_CIPHER_SPEC) {
         BIO *rbio;
@@ -475,10 +473,10 @@ static WRITE_TRAN ossl_statem_client13_write_transition(SSL_CONNECTION *s)
 
     case TLS_ST_CR_FINISHED:
         if (s->early_data_state == SSL_EARLY_DATA_WRITE_RETRY
-                || s->early_data_state == SSL_EARLY_DATA_FINISHED_WRITING)
+            || s->early_data_state == SSL_EARLY_DATA_FINISHED_WRITING)
             st->hand_state = TLS_ST_PENDING_EARLY_DATA_END;
         else if ((s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0
-                 && s->hello_retry_request == SSL_HRR_NONE)
+            && s->hello_retry_request == SSL_HRR_NONE)
             st->hand_state = TLS_ST_CW_CHANGE;
         else if (s->s3.tmp.cert_req == 0)
             st->hand_state = TLS_ST_CW_FINISHED;
@@ -511,7 +509,7 @@ static WRITE_TRAN ossl_statem_client13_write_transition(SSL_CONNECTION *s)
     case TLS_ST_CW_CERT:
         /* If a non-empty Certificate we also send CertificateVerify */
         st->hand_state = (s->s3.tmp.cert_req == 1) ? TLS_ST_CW_CERT_VRFY
-                                                    : TLS_ST_CW_FINISHED;
+                                                   : TLS_ST_CW_FINISHED;
         return WRITE_TRAN_CONTINUE;
 
     case TLS_ST_CW_CERT_VRFY:
@@ -573,7 +571,8 @@ WRITE_TRAN ossl_statem_client_write_transition(SSL_CONNECTION *s)
         return WRITE_TRAN_CONTINUE;
 
     case TLS_ST_CW_CLNT_HELLO:
-        if (s->early_data_state == SSL_EARLY_DATA_CONNECTING) {
+        if (s->early_data_state == SSL_EARLY_DATA_CONNECTING
+            && !SSL_IS_QUIC_HANDSHAKE(s)) {
             /*
              * We are assuming this is a TLSv1.3 connection, although we haven't
              * actually selected a version yet.
@@ -598,7 +597,7 @@ WRITE_TRAN ossl_statem_client_write_transition(SSL_CONNECTION *s)
          * because we did early data.
          */
         if ((s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0
-                && s->early_data_state != SSL_EARLY_DATA_FINISHED_WRITING)
+            && s->early_data_state != SSL_EARLY_DATA_FINISHED_WRITING)
             st->hand_state = TLS_ST_CW_CHANGE;
         else
             st->hand_state = TLS_ST_CW_CLNT_HELLO;
@@ -736,12 +735,12 @@ WORK_STATE ossl_statem_client_pre_work(SSL_CONNECTION *s, WORK_STATE wst)
              * write record layer in order to write in plaintext again.
              */
             if (!ssl_set_new_record_layer(s,
-                                          TLS_ANY_VERSION,
-                                          OSSL_RECORD_DIRECTION_WRITE,
-                                          OSSL_RECORD_PROTECTION_LEVEL_NONE,
-                                          NULL, 0, NULL, 0, NULL, 0, NULL,  0,
-                                          NULL, 0, NID_undef, NULL, NULL,
-                                          NULL)) {
+                    TLS_ANY_VERSION,
+                    OSSL_RECORD_DIRECTION_WRITE,
+                    OSSL_RECORD_PROTECTION_LEVEL_NONE,
+                    NULL, 0, NULL, 0, NULL, 0, NULL, 0,
+                    NULL, 0, NID_undef, NULL, NULL,
+                    NULL)) {
                 /* SSLfatal already called */
                 return WORK_ERROR;
             }
@@ -773,7 +772,7 @@ WORK_STATE ossl_statem_client_pre_work(SSL_CONNECTION *s, WORK_STATE wst)
          * on with the handshake. Otherwise we pause here.
          */
         if (s->early_data_state == SSL_EARLY_DATA_FINISHED_WRITING
-                || s->early_data_state == SSL_EARLY_DATA_NONE)
+            || s->early_data_state == SSL_EARLY_DATA_NONE)
             return WORK_FINISHED_CONTINUE;
         /* Fall through */
 
@@ -806,7 +805,7 @@ WORK_STATE ossl_statem_client_post_work(SSL_CONNECTION *s, WORK_STATE wst)
 
     case TLS_ST_CW_CLNT_HELLO:
         if (s->early_data_state == SSL_EARLY_DATA_CONNECTING
-                && s->max_early_data > 0) {
+            && s->max_early_data > 0) {
             /*
              * We haven't selected TLSv1.3 yet so we don't call the change
              * cipher state function associated with the SSL_METHOD. Instead
@@ -814,7 +813,7 @@ WORK_STATE ossl_statem_client_post_work(SSL_CONNECTION *s, WORK_STATE wst)
              */
             if ((s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) == 0) {
                 if (!tls13_change_cipher_state(s,
-                            SSL3_CC_EARLY | SSL3_CHANGE_CIPHER_CLIENT_WRITE)) {
+                        SSL3_CC_EARLY | SSL3_CHANGE_CIPHER_CLIENT_WRITE)) {
                     /* SSLfatal() already called */
                     return WORK_ERROR;
                 }
@@ -842,14 +841,14 @@ WORK_STATE ossl_statem_client_post_work(SSL_CONNECTION *s, WORK_STATE wst)
             || s->hello_retry_request == SSL_HRR_PENDING)
             break;
         if (s->early_data_state == SSL_EARLY_DATA_CONNECTING
-                    && s->max_early_data > 0) {
+            && s->max_early_data > 0) {
             /*
              * We haven't selected TLSv1.3 yet so we don't call the change
              * cipher state function associated with the SSL_METHOD. Instead
              * we call tls13_change_cipher_state() directly.
              */
             if (!tls13_change_cipher_state(s,
-                        SSL3_CC_EARLY | SSL3_CHANGE_CIPHER_CLIENT_WRITE))
+                    SSL3_CC_EARLY | SSL3_CHANGE_CIPHER_CLIENT_WRITE))
                 return WORK_ERROR;
             break;
         }
@@ -868,7 +867,7 @@ WORK_STATE ossl_statem_client_post_work(SSL_CONNECTION *s, WORK_STATE wst)
         }
 
         if (!ssl->method->ssl3_enc->change_cipher_state(s,
-                                          SSL3_CHANGE_CIPHER_CLIENT_WRITE)) {
+                SSL3_CHANGE_CIPHER_CLIENT_WRITE)) {
             /* SSLfatal() already called */
             return WORK_ERROR;
         }
@@ -876,11 +875,11 @@ WORK_STATE ossl_statem_client_post_work(SSL_CONNECTION *s, WORK_STATE wst)
 #ifndef OPENSSL_NO_SCTP
         if (SSL_CONNECTION_IS_DTLS(s) && s->hit) {
             /*
-            * Change to new shared key of SCTP-Auth, will be ignored if
-            * no SCTP used.
-            */
+             * Change to new shared key of SCTP-Auth, will be ignored if
+             * no SCTP used.
+             */
             BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY,
-                     0, NULL);
+                0, NULL);
         }
 #endif
         break;
@@ -893,7 +892,7 @@ WORK_STATE ossl_statem_client_post_work(SSL_CONNECTION *s, WORK_STATE wst)
              * no SCTP used.
              */
             BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY,
-                     0, NULL);
+                0, NULL);
         }
 #endif
         if (statem_flush(s) != 1)
@@ -910,6 +909,17 @@ WORK_STATE ossl_statem_client_post_work(SSL_CONNECTION *s, WORK_STATE wst)
                     /* SSLfatal() already called */
                     return WORK_ERROR;
                 }
+                /*
+                 * For QUIC we deferred setting up these keys until now so
+                 * that we can ensure write keys are always set up before read
+                 * keys.
+                 */
+                if (SSL_IS_QUIC_HANDSHAKE(s)
+                    && !ssl->method->ssl3_enc->change_cipher_state(s,
+                        SSL3_CC_APPLICATION | SSL3_CHANGE_CIPHER_CLIENT_READ)) {
+                    /* SSLfatal() already called */
+                    return WORK_ERROR;
+                }
             }
         }
         break;
@@ -936,7 +946,7 @@ WORK_STATE ossl_statem_client_post_work(SSL_CONNECTION *s, WORK_STATE wst)
  *   0: Error
  */
 int ossl_statem_client_construct_message(SSL_CONNECTION *s,
-                                         confunc_f *confunc, int *mt)
+    confunc_f *confunc, int *mt)
 {
     OSSL_STATEM *st = &s->statem;
 
@@ -1078,7 +1088,7 @@ size_t ossl_statem_client_max_message_size(SSL_CONNECTION *s)
  * Process a message that the client has received from the server.
  */
 MSG_PROCESS_RETURN ossl_statem_client_process_message(SSL_CONNECTION *s,
-                                                      PACKET *pkt)
+    PACKET *pkt)
 {
     OSSL_STATEM *st = &s->statem;
 
@@ -1142,7 +1152,7 @@ MSG_PROCESS_RETURN ossl_statem_client_process_message(SSL_CONNECTION *s,
  * from the server
  */
 WORK_STATE ossl_statem_client_post_process_message(SSL_CONNECTION *s,
-                                                   WORK_STATE wst)
+    WORK_STATE wst)
 {
     OSSL_STATEM *st = &s->statem;
 
@@ -1182,10 +1192,10 @@ CON_FUNC_RETURN tls_construct_client_hello(SSL_CONNECTION *s, WPACKET *pkt)
     }
 
     if (sess == NULL
-            || !ssl_version_supported(s, sess->ssl_version, NULL)
-            || !SSL_SESSION_is_resumable(sess)) {
+        || !ssl_version_supported(s, sess->ssl_version, NULL)
+        || !SSL_SESSION_is_resumable(sess)) {
         if (s->hello_retry_request == SSL_HRR_NONE
-                && !ssl_get_new_session(s, 0)) {
+            && !ssl_get_new_session(s, 0)) {
             /* SSLfatal() already called */
             return CON_FUNC_ERROR;
         }
@@ -1211,8 +1221,7 @@ CON_FUNC_RETURN tls_construct_client_hello(SSL_CONNECTION *s, WPACKET *pkt)
         i = (s->hello_retry_request == SSL_HRR_NONE);
     }
 
-    if (i && ssl_fill_hello_random(s, 0, p, sizeof(s->s3.client_random),
-                                   DOWNGRADE_NONE) <= 0) {
+    if (i && ssl_fill_hello_random(s, 0, p, sizeof(s->s3.client_random), DOWNGRADE_NONE) <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return CON_FUNC_ERROR;
     }
@@ -1251,7 +1260,7 @@ CON_FUNC_RETURN tls_construct_client_hello(SSL_CONNECTION *s, WPACKET *pkt)
      * supported_versions extension for the real supported versions.
      */
     if (!WPACKET_put_bytes_u16(pkt, s->client_version)
-            || !WPACKET_memcpy(pkt, s->s3.client_random, SSL3_RANDOM_SIZE)) {
+        || !WPACKET_memcpy(pkt, s->s3.client_random, SSL3_RANDOM_SIZE)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return CON_FUNC_ERROR;
     }
@@ -1260,13 +1269,14 @@ CON_FUNC_RETURN tls_construct_client_hello(SSL_CONNECTION *s, WPACKET *pkt)
     session_id = s->session->session_id;
     if (s->new_session || s->session->ssl_version == TLS1_3_VERSION) {
         if (s->version == TLS1_3_VERSION
-                && (s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0) {
+            && (s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0) {
             sess_id_len = sizeof(s->tmp_session_id);
             s->tmp_session_id_len = sess_id_len;
             session_id = s->tmp_session_id;
             if (s->hello_retry_request == SSL_HRR_NONE
-                    && RAND_bytes_ex(sctx->libctx, s->tmp_session_id,
-                                     sess_id_len, 0) <= 0) {
+                && RAND_bytes_ex(sctx->libctx, s->tmp_session_id,
+                       sess_id_len, 0)
+                    <= 0) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 return CON_FUNC_ERROR;
             }
@@ -1282,9 +1292,8 @@ CON_FUNC_RETURN tls_construct_client_hello(SSL_CONNECTION *s, WPACKET *pkt)
         }
     }
     if (!WPACKET_start_sub_packet_u8(pkt)
-            || (sess_id_len != 0 && !WPACKET_memcpy(pkt, session_id,
-                                                    sess_id_len))
-            || !WPACKET_close(pkt)) {
+        || (sess_id_len != 0 && !WPACKET_memcpy(pkt, session_id, sess_id_len))
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return CON_FUNC_ERROR;
     }
@@ -1292,8 +1301,8 @@ CON_FUNC_RETURN tls_construct_client_hello(SSL_CONNECTION *s, WPACKET *pkt)
     /* cookie stuff for DTLS */
     if (SSL_CONNECTION_IS_DTLS(s)) {
         if (s->d1->cookie_len > sizeof(s->d1->cookie)
-                || !WPACKET_sub_memcpy_u8(pkt, s->d1->cookie,
-                                          s->d1->cookie_len)) {
+            || !WPACKET_sub_memcpy_u8(pkt, s->d1->cookie,
+                s->d1->cookie_len)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return CON_FUNC_ERROR;
         }
@@ -1306,7 +1315,7 @@ CON_FUNC_RETURN tls_construct_client_hello(SSL_CONNECTION *s, WPACKET *pkt)
     }
 
     if (!ssl_cipher_list_to_bytes(s, SSL_get_ciphers(SSL_CONNECTION_GET_SSL(s)),
-                                  pkt)) {
+            pkt)) {
         /* SSLfatal() already called */
         return CON_FUNC_ERROR;
     }
@@ -1322,9 +1331,9 @@ CON_FUNC_RETURN tls_construct_client_hello(SSL_CONNECTION *s, WPACKET *pkt)
     }
 #ifndef OPENSSL_NO_COMP
     if (ssl_allow_compression(s)
-            && sctx->comp_methods
-            && (SSL_CONNECTION_IS_DTLS(s)
-                || s->s3.tmp.max_ver < TLS1_3_VERSION)) {
+        && sctx->comp_methods
+        && (SSL_CONNECTION_IS_DTLS(s)
+            || s->s3.tmp.max_ver < TLS1_3_VERSION)) {
         int compnum = sk_SSL_COMP_num(sctx->comp_methods);
         for (i = 0; i < compnum; i++) {
             comp = sk_SSL_COMP_value(sctx->comp_methods, i);
@@ -1377,7 +1386,7 @@ MSG_PROCESS_RETURN dtls_process_hello_verify(SSL_CONNECTION *s, PACKET *pkt)
 }
 
 static int set_client_ciphersuite(SSL_CONNECTION *s,
-                                  const unsigned char *cipherchars)
+    const unsigned char *cipherchars)
 {
     STACK_OF(SSL_CIPHER) *sk;
     const SSL_CIPHER *c;
@@ -1408,7 +1417,7 @@ static int set_client_ciphersuite(SSL_CONNECTION *s,
     }
 
     if (SSL_CONNECTION_IS_TLS13(s) && s->s3.tmp.new_cipher != NULL
-            && s->s3.tmp.new_cipher->id != c->id) {
+        && s->s3.tmp.new_cipher->id != c->id) {
         /* ServerHello selected a different ciphersuite to that in the HRR */
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_WRONG_CIPHER_RETURNED);
         return 0;
@@ -1434,9 +1443,9 @@ static int set_client_ciphersuite(SSL_CONNECTION *s,
              * ciphersuite as long as the hash is the same.
              */
             if (md == NULL
-                    || md != ssl_md(sctx, s->session->cipher->algorithm2)) {
+                || md != ssl_md(sctx, s->session->cipher->algorithm2)) {
                 SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                         SSL_R_CIPHERSUITE_DIGEST_HAS_CHANGED);
+                    SSL_R_CIPHERSUITE_DIGEST_HAS_CHANGED);
                 return 0;
             }
         } else {
@@ -1445,7 +1454,7 @@ static int set_client_ciphersuite(SSL_CONNECTION *s,
              * ciphersuite.
              */
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                     SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
+                SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
             return 0;
         }
     }
@@ -1477,9 +1486,9 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
 
     /* load the server random */
     if (s->version == TLS1_3_VERSION
-            && sversion == TLS1_2_VERSION
-            && PACKET_remaining(pkt) >= SSL3_RANDOM_SIZE
-            && memcmp(hrrrandom, PACKET_data(pkt), SSL3_RANDOM_SIZE) == 0) {
+        && sversion == TLS1_2_VERSION
+        && PACKET_remaining(pkt) >= SSL3_RANDOM_SIZE
+        && memcmp(hrrrandom, PACKET_data(pkt), SSL3_RANDOM_SIZE) == 0) {
         if (s->hello_retry_request != SSL_HRR_NONE) {
             SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_UNEXPECTED_MESSAGE);
             goto err;
@@ -1528,16 +1537,16 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
     if (PACKET_remaining(pkt) == 0 && !hrr) {
         PACKET_null_init(&extpkt);
     } else if (!PACKET_as_length_prefixed_2(pkt, &extpkt)
-               || PACKET_remaining(pkt) != 0) {
+        || PACKET_remaining(pkt) != 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_LENGTH);
         goto err;
     }
 
     if (!hrr) {
         if (!tls_collect_extensions(s, &extpkt,
-                                    SSL_EXT_TLS1_2_SERVER_HELLO
-                                    | SSL_EXT_TLS1_3_SERVER_HELLO,
-                                    &extensions, NULL, 1)) {
+                SSL_EXT_TLS1_2_SERVER_HELLO
+                    | SSL_EXT_TLS1_3_SERVER_HELLO,
+                &extensions, NULL, 1)) {
             /* SSLfatal() already called */
             goto err;
         }
@@ -1551,13 +1560,14 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
     if (SSL_CONNECTION_IS_TLS13(s) || hrr) {
         if (compression != 0) {
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                     SSL_R_INVALID_COMPRESSION_ALGORITHM);
+                SSL_R_INVALID_COMPRESSION_ALGORITHM);
             goto err;
         }
 
         if (session_id_len != s->tmp_session_id_len
-                || memcmp(PACKET_data(&session_id), s->tmp_session_id,
-                          session_id_len) != 0) {
+            || memcmp(PACKET_data(&session_id), s->tmp_session_id,
+                   session_id_len)
+                != 0) {
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_INVALID_SESSION_ID);
             goto err;
         }
@@ -1592,14 +1602,14 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
          */
         if (RECORD_LAYER_processed_read_pending(&s->rlayer)) {
             SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE,
-                     SSL_R_NOT_ON_RECORD_BOUNDARY);
+                SSL_R_NOT_ON_RECORD_BOUNDARY);
             goto err;
         }
 
         /* This will set s->hit if we are resuming */
         if (!tls_parse_extension(s, TLSEXT_IDX_psk,
-                                 SSL_EXT_TLS1_3_SERVER_HELLO,
-                                 extensions, NULL, 0)) {
+                SSL_EXT_TLS1_3_SERVER_HELLO,
+                extensions, NULL, 0)) {
             /* SSLfatal() already called */
             goto err;
         }
@@ -1617,7 +1627,7 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
          * message to see if the server wants to resume.
          */
         if (s->version >= TLS1_VERSION
-                && s->ext.session_secret_cb != NULL && s->session->ext.tick) {
+            && s->ext.session_secret_cb != NULL && s->session->ext.tick) {
             const SSL_CIPHER *pref_cipher = NULL;
             /*
              * s->session->master_key_length is a size_t, but this is an int for
@@ -1627,13 +1637,12 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
 
             master_key_length = sizeof(s->session->master_key);
             if (s->ext.session_secret_cb(ussl, s->session->master_key,
-                                         &master_key_length,
-                                         NULL, &pref_cipher,
-                                         s->ext.session_secret_cb_arg)
-                     && master_key_length > 0) {
+                    &master_key_length,
+                    NULL, &pref_cipher,
+                    s->ext.session_secret_cb_arg)
+                && master_key_length > 0) {
                 s->session->master_key_length = master_key_length;
-                s->session->cipher = pref_cipher ?
-                    pref_cipher : ssl_get_cipher_by_char(s, cipherchars, 0);
+                s->session->cipher = pref_cipher ? pref_cipher : ssl_get_cipher_by_char(s, cipherchars, 0);
             } else {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 goto err;
@@ -1641,18 +1650,19 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
         }
 
         if (session_id_len != 0
-                && session_id_len == s->session->session_id_length
-                && memcmp(PACKET_data(&session_id), s->session->session_id,
-                          session_id_len) == 0)
+            && session_id_len == s->session->session_id_length
+            && memcmp(PACKET_data(&session_id), s->session->session_id,
+                   session_id_len)
+                == 0)
             s->hit = 1;
     }
 
     if (s->hit) {
         if (s->sid_ctx_length != s->session->sid_ctx_length
-                || memcmp(s->session->sid_ctx, s->sid_ctx, s->sid_ctx_length)) {
+            || memcmp(s->session->sid_ctx, s->sid_ctx, s->sid_ctx_length)) {
             /* actually a client application bug */
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                     SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
+                SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
             goto err;
         }
     } else {
@@ -1683,14 +1693,14 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
             /* session_id_len could be 0 */
             if (session_id_len > 0)
                 memcpy(s->session->session_id, PACKET_data(&session_id),
-                       session_id_len);
+                    session_id_len);
         }
     }
 
     /* Session version and negotiated protocol version should match */
     if (s->version != s->session->ssl_version) {
         SSLfatal(s, SSL_AD_PROTOCOL_VERSION,
-                 SSL_R_SSL_SESSION_VERSION_MISMATCH);
+            SSL_R_SSL_SESSION_VERSION_MISMATCH);
         goto err;
     }
     /*
@@ -1708,7 +1718,7 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
 #ifdef OPENSSL_NO_COMP
     if (compression != 0) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                 SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
+            SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
         goto err;
     }
     /*
@@ -1722,7 +1732,7 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
 #else
     if (s->hit && compression != s->session->compress_meth) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                 SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED);
+            SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED);
         goto err;
     }
     if (compression == 0)
@@ -1732,12 +1742,12 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
         goto err;
     } else {
         comp = ssl3_comp_find(SSL_CONNECTION_GET_CTX(s)->comp_methods,
-                              compression);
+            compression);
     }
 
     if (compression != 0 && comp == NULL) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                 SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
+            SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
         goto err;
     } else {
         s->s3.tmp.new_compression = comp;
@@ -1760,7 +1770,7 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
          * no SCTP used.
          */
         memcpy(labelbuffer, DTLS1_SCTP_AUTH_LABEL,
-               sizeof(DTLS1_SCTP_AUTH_LABEL));
+            sizeof(DTLS1_SCTP_AUTH_LABEL));
 
         /* Don't include the terminating zero. */
         labellen = sizeof(labelbuffer) - 1;
@@ -1768,16 +1778,17 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
             labellen += 1;
 
         if (SSL_export_keying_material(ssl, sctpauthkey,
-                                       sizeof(sctpauthkey),
-                                       labelbuffer,
-                                       labellen, NULL, 0, 0) <= 0) {
+                sizeof(sctpauthkey),
+                labelbuffer,
+                labellen, NULL, 0, 0)
+            <= 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             goto err;
         }
 
         BIO_ctrl(SSL_get_wbio(ssl),
-                 BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,
-                 sizeof(sctpauthkey), sctpauthkey);
+            BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,
+            sizeof(sctpauthkey), sctpauthkey);
     }
 #endif
 
@@ -1787,8 +1798,7 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
      */
     if (SSL_CONNECTION_IS_TLS13(s)) {
         if (!ssl->method->ssl3_enc->setup_key_block(s)
-                || !ssl->method->ssl3_enc->change_cipher_state(s,
-                    SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_CLIENT_READ)) {
+            || !tls13_store_handshake_traffic_hash(s)) {
             /* SSLfatal() already called */
             goto err;
         }
@@ -1801,10 +1811,17 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
          * are changed. Since QUIC doesn't do TLS early data or need middlebox
          * compat this doesn't cause a problem.
          */
-        if (s->early_data_state == SSL_EARLY_DATA_NONE
-                && (s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) == 0
-                && !ssl->method->ssl3_enc->change_cipher_state(s,
+        if (SSL_IS_QUIC_HANDSHAKE(s)
+            || (s->early_data_state == SSL_EARLY_DATA_NONE
+                && (s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) == 0)) {
+            if (!ssl->method->ssl3_enc->change_cipher_state(s,
                     SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_CLIENT_WRITE)) {
+                /* SSLfatal() already called */
+                goto err;
+            }
+        }
+        if (!ssl->method->ssl3_enc->change_cipher_state(s,
+                SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_CLIENT_READ)) {
             /* SSLfatal() already called */
             goto err;
         }
@@ -1812,13 +1829,13 @@ MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s, PACKET *pkt)
 
     OPENSSL_free(extensions);
     return MSG_PROCESS_CONTINUE_READING;
- err:
+err:
     OPENSSL_free(extensions);
     return MSG_PROCESS_ERROR;
 }
 
 static MSG_PROCESS_RETURN tls_process_as_hello_retry_request(SSL_CONNECTION *s,
-                                                             PACKET *extpkt)
+    PACKET *extpkt)
 {
     RAW_EXTENSION *extensions = NULL;
 
@@ -1827,12 +1844,12 @@ static MSG_PROCESS_RETURN tls_process_as_hello_retry_request(SSL_CONNECTION *s,
      * the old wrlmethod.
      */
     if (s->early_data_state == SSL_EARLY_DATA_FINISHED_WRITING
-            && !ssl_set_new_record_layer(s,
-                                         TLS_ANY_VERSION,
-                                         OSSL_RECORD_DIRECTION_WRITE,
-                                         OSSL_RECORD_PROTECTION_LEVEL_NONE,
-                                         NULL, 0, NULL, 0, NULL, 0, NULL,  0,
-                                         NULL, 0, NID_undef, NULL, NULL, NULL)) {
+        && !ssl_set_new_record_layer(s,
+            TLS_ANY_VERSION,
+            OSSL_RECORD_DIRECTION_WRITE,
+            OSSL_RECORD_PROTECTION_LEVEL_NONE,
+            NULL, 0, NULL, 0, NULL, 0, NULL, 0,
+            NULL, 0, NID_undef, NULL, NULL, NULL)) {
         /* SSLfatal already called */
         goto err;
     }
@@ -1840,9 +1857,9 @@ static MSG_PROCESS_RETURN tls_process_as_hello_retry_request(SSL_CONNECTION *s,
     s->rlayer.wrlmethod->set_protocol_version(s->rlayer.wrl, TLS1_3_VERSION);
 
     if (!tls_collect_extensions(s, extpkt, SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST,
-                                &extensions, NULL, 1)
-            || !tls_parse_all_extensions(s, SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST,
-                                         extensions, NULL, 0, 1)) {
+            &extensions, NULL, 1)
+        || !tls_parse_all_extensions(s, SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST,
+            extensions, NULL, 0, 1)) {
         /* SSLfatal() already called */
         goto err;
     }
@@ -1875,13 +1892,13 @@ static MSG_PROCESS_RETURN tls_process_as_hello_retry_request(SSL_CONNECTION *s,
      * for HRR messages.
      */
     if (!ssl3_finish_mac(s, (unsigned char *)s->init_buf->data,
-                                s->init_num + SSL3_HM_HEADER_LENGTH)) {
+            s->init_num + SSL3_HM_HEADER_LENGTH)) {
         /* SSLfatal() already called */
         goto err;
     }
 
     return MSG_PROCESS_FINISHED_READING;
- err:
+err:
     OPENSSL_free(extensions);
     return MSG_PROCESS_ERROR;
 }
@@ -1907,7 +1924,7 @@ MSG_PROCESS_RETURN tls_process_server_rpk(SSL_CONNECTION *sc, PACKET *pkt)
 }
 
 static WORK_STATE tls_post_process_server_rpk(SSL_CONNECTION *sc,
-                                              WORK_STATE wst)
+    WORK_STATE wst)
 {
     size_t certidx;
     const SSL_CERT_LOOKUP *clu;
@@ -1915,7 +1932,7 @@ static WORK_STATE tls_post_process_server_rpk(SSL_CONNECTION *sc,
 
     if (sc->session->peer_rpk == NULL) {
         SSLfatal(sc, SSL_AD_ILLEGAL_PARAMETER,
-                 SSL_R_INVALID_RAW_PUBLIC_KEY);
+            SSL_R_INVALID_RAW_PUBLIC_KEY);
         return WORK_ERROR;
     }
 
@@ -1927,16 +1944,17 @@ static WORK_STATE tls_post_process_server_rpk(SSL_CONNECTION *sc,
     if (v_ok <= 0 && sc->verify_mode != SSL_VERIFY_NONE) {
         ERR_clear_last_mark();
         SSLfatal(sc, ssl_x509err2alert(sc->verify_result),
-                 SSL_R_CERTIFICATE_VERIFY_FAILED);
+            SSL_R_CERTIFICATE_VERIFY_FAILED);
         return WORK_ERROR;
     }
-    ERR_pop_to_mark();      /* but we keep s->verify_result */
+    ERR_pop_to_mark(); /* but we keep s->verify_result */
     if (v_ok > 0 && sc->rwstate == SSL_RETRY_VERIFY) {
         return WORK_MORE_A;
     }
 
     if ((clu = ssl_cert_lookup_by_pkey(sc->session->peer_rpk, &certidx,
-                                       SSL_CONNECTION_GET_CTX(sc))) == NULL) {
+             SSL_CONNECTION_GET_CTX(sc)))
+        == NULL) {
         SSLfatal(sc, SSL_AD_ILLEGAL_PARAMETER, SSL_R_UNKNOWN_CERTIFICATE_TYPE);
         return WORK_ERROR;
     }
@@ -1962,9 +1980,9 @@ static WORK_STATE tls_post_process_server_rpk(SSL_CONNECTION *sc,
 
     /* Save the current hash state for when we receive the CertificateVerify */
     if (SSL_CONNECTION_IS_TLS13(sc)
-            && !ssl_handshake_hash(sc, sc->cert_verify_hash,
-                                   sizeof(sc->cert_verify_hash),
-                                   &sc->cert_verify_hash_len)) {
+        && !ssl_handshake_hash(sc, sc->cert_verify_hash,
+            sizeof(sc->cert_verify_hash),
+            &sc->cert_verify_hash_len)) {
         /* SSLfatal() already called */
         return WORK_ERROR;
     }
@@ -1974,7 +1992,7 @@ static WORK_STATE tls_post_process_server_rpk(SSL_CONNECTION *sc,
 
 /* prepare server cert verification by setting s->session->peer_chain from pkt */
 MSG_PROCESS_RETURN tls_process_server_certificate(SSL_CONNECTION *s,
-                                                  PACKET *pkt)
+    PACKET *pkt)
 {
     unsigned long cert_list_len, cert_len;
     X509 *x = NULL;
@@ -1987,7 +2005,7 @@ MSG_PROCESS_RETURN tls_process_server_certificate(SSL_CONNECTION *s,
         return tls_process_server_rpk(s, pkt);
     if (s->ext.server_cert_type != TLSEXT_cert_type_x509) {
         SSLfatal(s, SSL_AD_UNSUPPORTED_CERTIFICATE,
-                 SSL_R_UNKNOWN_CERTIFICATE_TYPE);
+            SSL_R_UNKNOWN_CERTIFICATE_TYPE);
         goto err;
     }
 
@@ -1997,10 +2015,10 @@ MSG_PROCESS_RETURN tls_process_server_certificate(SSL_CONNECTION *s,
     }
 
     if ((SSL_CONNECTION_IS_TLS13(s) && !PACKET_get_1(pkt, &context))
-            || context != 0
-            || !PACKET_get_net_3(pkt, &cert_list_len)
-            || PACKET_remaining(pkt) != cert_list_len
-            || PACKET_remaining(pkt) == 0) {
+        || context != 0
+        || !PACKET_get_net_3(pkt, &cert_list_len)
+        || PACKET_remaining(pkt) != cert_list_len
+        || PACKET_remaining(pkt) == 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
         goto err;
     }
@@ -2018,7 +2036,8 @@ MSG_PROCESS_RETURN tls_process_server_certificate(SSL_CONNECTION *s,
             goto err;
         }
         if (d2i_X509(&x, (const unsigned char **)&certbytes,
-                     cert_len) == NULL) {
+                cert_len)
+            == NULL) {
             SSLfatal(s, SSL_AD_BAD_CERTIFICATE, ERR_R_ASN1_LIB);
             goto err;
         }
@@ -2037,11 +2056,11 @@ MSG_PROCESS_RETURN tls_process_server_certificate(SSL_CONNECTION *s,
                 goto err;
             }
             if (!tls_collect_extensions(s, &extensions,
-                                        SSL_EXT_TLS1_3_CERTIFICATE, &rawexts,
-                                        NULL, chainidx == 0)
+                    SSL_EXT_TLS1_3_CERTIFICATE, &rawexts,
+                    NULL, chainidx == 0)
                 || !tls_parse_all_extensions(s, SSL_EXT_TLS1_3_CERTIFICATE,
-                                             rawexts, x, chainidx,
-                                             PACKET_remaining(pkt) == 0)) {
+                    rawexts, x, chainidx,
+                    PACKET_remaining(pkt) == 0)) {
                 OPENSSL_free(rawexts);
                 /* SSLfatal already called */
                 goto err;
@@ -2057,7 +2076,7 @@ MSG_PROCESS_RETURN tls_process_server_certificate(SSL_CONNECTION *s,
     }
     return MSG_PROCESS_CONTINUE_PROCESSING;
 
- err:
+err:
     X509_free(x);
     OSSL_STACK_OF_X509_free(s->session->peer_chain);
     s->session->peer_chain = NULL;
@@ -2070,7 +2089,7 @@ MSG_PROCESS_RETURN tls_process_server_certificate(SSL_CONNECTION *s,
  * Else the peer certificate verification callback may request retry.
  */
 WORK_STATE tls_post_process_server_certificate(SSL_CONNECTION *s,
-                                               WORK_STATE wst)
+    WORK_STATE wst)
 {
     X509 *x;
     EVP_PKEY *pkey = NULL;
@@ -2103,10 +2122,10 @@ WORK_STATE tls_post_process_server_certificate(SSL_CONNECTION *s,
     if (i <= 0 && s->verify_mode != SSL_VERIFY_NONE) {
         ERR_clear_last_mark();
         SSLfatal(s, ssl_x509err2alert(s->verify_result),
-                 SSL_R_CERTIFICATE_VERIFY_FAILED);
+            SSL_R_CERTIFICATE_VERIFY_FAILED);
         return WORK_ERROR;
     }
-    ERR_pop_to_mark();      /* but we keep s->verify_result */
+    ERR_pop_to_mark(); /* but we keep s->verify_result */
     if (i > 0 && s->rwstate == SSL_RETRY_VERIFY)
         return WORK_MORE_A;
 
@@ -2120,12 +2139,13 @@ WORK_STATE tls_post_process_server_certificate(SSL_CONNECTION *s,
 
     if (pkey == NULL || EVP_PKEY_missing_parameters(pkey)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                 SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
+            SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
         return WORK_ERROR;
     }
 
     if ((clu = ssl_cert_lookup_by_pkey(pkey, &certidx,
-				       SSL_CONNECTION_GET_CTX(s))) == NULL) {
+             SSL_CONNECTION_GET_CTX(s)))
+        == NULL) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_UNKNOWN_CERTIFICATE_TYPE);
         return WORK_ERROR;
     }
@@ -2155,9 +2175,9 @@ WORK_STATE tls_post_process_server_certificate(SSL_CONNECTION *s,
 
     /* Save the current hash state for when we receive the CertificateVerify */
     if (SSL_CONNECTION_IS_TLS13(s)
-            && !ssl_handshake_hash(s, s->cert_verify_hash,
-                                   sizeof(s->cert_verify_hash),
-                                   &s->cert_verify_hash_len)) {
+        && !ssl_handshake_hash(s, s->cert_verify_hash,
+            sizeof(s->cert_verify_hash),
+            &s->cert_verify_hash_len)) {
         /* SSLfatal() already called */;
         return WORK_ERROR;
     }
@@ -2206,7 +2226,7 @@ static int tls_process_ske_psk_preamble(SSL_CONNECTION *s, PACKET *pkt)
         OPENSSL_free(s->session->psk_identity_hint);
         s->session->psk_identity_hint = NULL;
     } else if (!PACKET_strndup(&psk_identity_hint,
-                               &s->session->psk_identity_hint)) {
+                   &s->session->psk_identity_hint)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -2231,18 +2251,18 @@ static int tls_process_ske_srp(SSL_CONNECTION *s, PACKET *pkt, EVP_PKEY **pkey)
         return 0;
     }
 
-    if ((s->srp_ctx.N =
-         BN_bin2bn(PACKET_data(&prime),
-                   (int)PACKET_remaining(&prime), NULL)) == NULL
-        || (s->srp_ctx.g =
-            BN_bin2bn(PACKET_data(&generator),
-                      (int)PACKET_remaining(&generator), NULL)) == NULL
-        || (s->srp_ctx.s =
-            BN_bin2bn(PACKET_data(&salt),
-                      (int)PACKET_remaining(&salt), NULL)) == NULL
-        || (s->srp_ctx.B =
-            BN_bin2bn(PACKET_data(&server_pub),
-                      (int)PACKET_remaining(&server_pub), NULL)) == NULL) {
+    if ((s->srp_ctx.N = BN_bin2bn(PACKET_data(&prime),
+             (int)PACKET_remaining(&prime), NULL))
+            == NULL
+        || (s->srp_ctx.g = BN_bin2bn(PACKET_data(&generator),
+                (int)PACKET_remaining(&generator), NULL))
+            == NULL
+        || (s->srp_ctx.s = BN_bin2bn(PACKET_data(&salt),
+                (int)PACKET_remaining(&salt), NULL))
+            == NULL
+        || (s->srp_ctx.B = BN_bin2bn(PACKET_data(&server_pub),
+                (int)PACKET_remaining(&server_pub), NULL))
+            == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_BN_LIB);
         return 0;
     }
@@ -2283,9 +2303,9 @@ static int tls_process_ske_dhe(SSL_CONNECTION *s, PACKET *pkt, EVP_PKEY **pkey)
 
     p = BN_bin2bn(PACKET_data(&prime), (int)PACKET_remaining(&prime), NULL);
     g = BN_bin2bn(PACKET_data(&generator), (int)PACKET_remaining(&generator),
-                  NULL);
+        NULL);
     bnpub_key = BN_bin2bn(PACKET_data(&pub_key),
-                          (int)PACKET_remaining(&pub_key), NULL);
+        (int)PACKET_remaining(&pub_key), NULL);
     if (p == NULL || g == NULL || bnpub_key == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_BN_LIB);
         goto err;
@@ -2293,11 +2313,11 @@ static int tls_process_ske_dhe(SSL_CONNECTION *s, PACKET *pkt, EVP_PKEY **pkey)
 
     tmpl = OSSL_PARAM_BLD_new();
     if (tmpl == NULL
-            || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P, p)
-            || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_G, g)
-            || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PUB_KEY,
-                                       bnpub_key)
-            || (params = OSSL_PARAM_BLD_to_param(tmpl)) == NULL) {
+        || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P, p)
+        || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_G, g)
+        || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_PUB_KEY,
+            bnpub_key)
+        || (params = OSSL_PARAM_BLD_to_param(tmpl)) == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -2308,7 +2328,7 @@ static int tls_process_ske_dhe(SSL_CONNECTION *s, PACKET *pkt, EVP_PKEY **pkey)
         goto err;
     }
     if (EVP_PKEY_fromdata_init(pctx) <= 0
-            || EVP_PKEY_fromdata(pctx, &peer_tmp, EVP_PKEY_KEYPAIR, params) <= 0) {
+        || EVP_PKEY_fromdata(pctx, &peer_tmp, EVP_PKEY_KEYPAIR, params) <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_BAD_DH_VALUE);
         goto err;
     }
@@ -2316,21 +2336,21 @@ static int tls_process_ske_dhe(SSL_CONNECTION *s, PACKET *pkt, EVP_PKEY **pkey)
     EVP_PKEY_CTX_free(pctx);
     pctx = EVP_PKEY_CTX_new_from_pkey(sctx->libctx, peer_tmp, sctx->propq);
     if (pctx == NULL
-            /*
-             * EVP_PKEY_param_check() will verify that the DH params are using
-             * a safe prime. In this context, because we're using ephemeral DH,
-             * we're ok with it not being a safe prime.
-             * EVP_PKEY_param_check_quick() skips the safe prime check.
-             */
-            || EVP_PKEY_param_check_quick(pctx) != 1
-            || EVP_PKEY_public_check(pctx) != 1) {
+        /*
+         * EVP_PKEY_param_check() will verify that the DH params are using
+         * a safe prime. In this context, because we're using ephemeral DH,
+         * we're ok with it not being a safe prime.
+         * EVP_PKEY_param_check_quick() skips the safe prime check.
+         */
+        || EVP_PKEY_param_check_quick(pctx) != 1
+        || EVP_PKEY_public_check(pctx) != 1) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_DH_VALUE);
         goto err;
     }
 
     if (!ssl_security(s, SSL_SECOP_TMP_DH,
-                      EVP_PKEY_get_security_bits(peer_tmp),
-                      0, peer_tmp)) {
+            EVP_PKEY_get_security_bits(peer_tmp),
+            0, peer_tmp)) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_DH_KEY_TOO_SMALL);
         goto err;
     }
@@ -2348,7 +2368,7 @@ static int tls_process_ske_dhe(SSL_CONNECTION *s, PACKET *pkt, EVP_PKEY **pkey)
 
     ret = 1;
 
- err:
+err:
     OSSL_PARAM_BLD_free(tmpl);
     OSSL_PARAM_free(params);
     EVP_PKEY_free(peer_tmp);
@@ -2379,14 +2399,14 @@ static int tls_process_ske_ecdhe(SSL_CONNECTION *s, PACKET *pkt, EVP_PKEY **pkey
      * server has sent an invalid curve.
      */
     if (curve_type != NAMED_CURVE_TYPE
-            || !tls1_check_group_id(s, curve_id, 1)) {
+        || !tls1_check_group_id(s, curve_id, 1)) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_WRONG_CURVE);
         return 0;
     }
 
     if ((s->s3.peer_tmp = ssl_generate_param_group(s, curve_id)) == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                 SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS);
+            SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS);
         return 0;
     }
 
@@ -2396,8 +2416,9 @@ static int tls_process_ske_ecdhe(SSL_CONNECTION *s, PACKET *pkt, EVP_PKEY **pkey
     }
 
     if (EVP_PKEY_set1_encoded_public_key(s->s3.peer_tmp,
-                                         PACKET_data(&encoded_pt),
-                                         PACKET_remaining(&encoded_pt)) <= 0) {
+            PACKET_data(&encoded_pt),
+            PACKET_remaining(&encoded_pt))
+        <= 0) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_ECPOINT);
         return 0;
     }
@@ -2476,8 +2497,7 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL_CONNECTION *s, PACKET *pkt)
          * equals the length of the parameters.
          */
         if (!PACKET_get_sub_packet(&save_param_start, &params,
-                                   PACKET_remaining(&save_param_start) -
-                                   PACKET_remaining(pkt))) {
+                PACKET_remaining(&save_param_start) - PACKET_remaining(pkt))) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, ERR_R_INTERNAL_ERROR);
             goto err;
         }
@@ -2489,24 +2509,24 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL_CONNECTION *s, PACKET *pkt)
                 SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_TOO_SHORT);
                 goto err;
             }
-            if (tls12_check_peer_sigalg(s, sigalg, pkey) <=0) {
+            if (tls12_check_peer_sigalg(s, sigalg, pkey) <= 0) {
                 /* SSLfatal() already called */
                 goto err;
             }
         } else if (!tls1_set_peer_legacy_sigalg(s, pkey)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                     SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED);
+                SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED);
             goto err;
         }
 
         if (!tls1_lookup_md(sctx, s->s3.tmp.peer_sigalg, &md)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                     SSL_R_NO_SUITABLE_DIGEST_ALGORITHM);
+                SSL_R_NO_SUITABLE_DIGEST_ALGORITHM);
             goto err;
         }
         if (SSL_USE_SIGALGS(s))
             OSSL_TRACE1(TLS, "USING TLSv1.2 HASH %s\n",
-                        md == NULL ? "n/a" : EVP_MD_get0_name(md));
+                md == NULL ? "n/a" : EVP_MD_get0_name(md));
 
         if (!PACKET_get_length_prefixed_2(pkt, &signature)
             || PACKET_remaining(pkt) != 0) {
@@ -2521,29 +2541,31 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL_CONNECTION *s, PACKET *pkt)
         }
 
         if (EVP_DigestVerifyInit_ex(md_ctx, &pctx,
-                                    md == NULL ? NULL : EVP_MD_get0_name(md),
-                                    sctx->libctx, sctx->propq, pkey,
-                                    NULL) <= 0) {
+                md == NULL ? NULL : EVP_MD_get0_name(md),
+                sctx->libctx, sctx->propq, pkey,
+                NULL)
+            <= 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
             goto err;
         }
         if (SSL_USE_PSS(s)) {
             if (EVP_PKEY_CTX_set_rsa_padding(pctx, RSA_PKCS1_PSS_PADDING) <= 0
                 || EVP_PKEY_CTX_set_rsa_pss_saltlen(pctx,
-                                                RSA_PSS_SALTLEN_DIGEST) <= 0) {
+                       RSA_PSS_SALTLEN_DIGEST)
+                    <= 0) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
                 goto err;
             }
         }
         tbslen = construct_key_exchange_tbs(s, &tbs, PACKET_data(&params),
-                                            PACKET_remaining(&params));
+            PACKET_remaining(&params));
         if (tbslen == 0) {
             /* SSLfatal() already called */
             goto err;
         }
 
         rv = EVP_DigestVerify(md_ctx, PACKET_data(&signature),
-                              PACKET_remaining(&signature), tbs, tbslen);
+            PACKET_remaining(&signature), tbs, tbslen);
         OPENSSL_free(tbs);
         if (rv <= 0) {
             SSLfatal(s, SSL_AD_DECRYPT_ERROR, SSL_R_BAD_SIGNATURE);
@@ -2570,13 +2592,13 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL_CONNECTION *s, PACKET *pkt)
     }
 
     return MSG_PROCESS_CONTINUE_READING;
- err:
+err:
     EVP_MD_CTX_free(md_ctx);
     return MSG_PROCESS_ERROR;
 }
 
 MSG_PROCESS_RETURN tls_process_certificate_request(SSL_CONNECTION *s,
-                                                   PACKET *pkt)
+    PACKET *pkt)
 {
     /* Clear certificate validity flags */
     if (s->s3.tmp.valid_flags != NULL)
@@ -2609,8 +2631,7 @@ MSG_PROCESS_RETURN tls_process_certificate_request(SSL_CONNECTION *s,
         s->pha_context = NULL;
         s->pha_context_len = 0;
 
-        if (!PACKET_get_length_prefixed_1(pkt, &reqctx) ||
-            !PACKET_memdup(&reqctx, &s->pha_context, &s->pha_context_len)) {
+        if (!PACKET_get_length_prefixed_1(pkt, &reqctx) || !PACKET_memdup(&reqctx, &s->pha_context, &s->pha_context_len)) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
             return MSG_PROCESS_ERROR;
         }
@@ -2620,10 +2641,10 @@ MSG_PROCESS_RETURN tls_process_certificate_request(SSL_CONNECTION *s,
             return MSG_PROCESS_ERROR;
         }
         if (!tls_collect_extensions(s, &extensions,
-                                    SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
-                                    &rawexts, NULL, 1)
+                SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
+                &rawexts, NULL, 1)
             || !tls_parse_all_extensions(s, SSL_EXT_TLS1_3_CERTIFICATE_REQUEST,
-                                         rawexts, NULL, 0, 1)) {
+                rawexts, NULL, 0, 1)) {
             /* SSLfatal() already called */
             OPENSSL_free(rawexts);
             return MSG_PROCESS_ERROR;
@@ -2661,7 +2682,7 @@ MSG_PROCESS_RETURN tls_process_certificate_request(SSL_CONNECTION *s,
              */
             if (!tls1_save_sigalgs(s, &sigalgs, 0)) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                         SSL_R_SIGNATURE_ALGORITHMS_ERROR);
+                    SSL_R_SIGNATURE_ALGORITHMS_ERROR);
                 return MSG_PROCESS_ERROR;
             }
             if (!tls1_process_sigalgs(s)) {
@@ -2701,7 +2722,7 @@ MSG_PROCESS_RETURN tls_process_certificate_request(SSL_CONNECTION *s,
 }
 
 MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL_CONNECTION *s,
-                                                  PACKET *pkt)
+    PACKET *pkt)
 {
     unsigned int ticklen;
     unsigned long ticket_lifetime_hint, age_add = 0;
@@ -2719,7 +2740,7 @@ MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL_CONNECTION *s,
                 || !PACKET_get_length_prefixed_1(pkt, &nonce)))
         || !PACKET_get_net_2(pkt, &ticklen)
         || (SSL_CONNECTION_IS_TLS13(s) ? (ticklen == 0
-                                          || PACKET_remaining(pkt) < ticklen)
+                                             || PACKET_remaining(pkt) < ticklen)
                                        : PACKET_remaining(pkt) != ticklen)) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
         goto err;
@@ -2754,7 +2775,7 @@ MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL_CONNECTION *s,
         }
 
         if ((s->session_ctx->session_cache_mode & SSL_SESS_CACHE_CLIENT) != 0
-                && !SSL_CONNECTION_IS_TLS13(s)) {
+            && !SSL_CONNECTION_IS_TLS13(s)) {
             /*
              * In TLSv1.2 and below the arrival of a new tickets signals that
              * any old ticket we were using is now out of date, so we remove the
@@ -2792,17 +2813,17 @@ MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL_CONNECTION *s,
         PACKET extpkt;
 
         if (!PACKET_as_length_prefixed_2(pkt, &extpkt)
-                || PACKET_remaining(pkt) != 0) {
+            || PACKET_remaining(pkt) != 0) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
             goto err;
         }
 
         if (!tls_collect_extensions(s, &extpkt,
-                                    SSL_EXT_TLS1_3_NEW_SESSION_TICKET, &exts,
-                                    NULL, 1)
-                || !tls_parse_all_extensions(s,
-                                             SSL_EXT_TLS1_3_NEW_SESSION_TICKET,
-                                             exts, NULL, 0, 1)) {
+                SSL_EXT_TLS1_3_NEW_SESSION_TICKET, &exts,
+                NULL, 1)
+            || !tls_parse_all_extensions(s,
+                SSL_EXT_TLS1_3_NEW_SESSION_TICKET,
+                exts, NULL, 0, 1)) {
             /* SSLfatal() already called */
             goto err;
         }
@@ -2830,8 +2851,8 @@ MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL_CONNECTION *s,
      * but s->session->session_id_length is a size_t
      */
     if (!EVP_Digest(s->session->ext.tick, ticklen,
-                    s->session->session_id, &sess_len,
-                    sha256, NULL)) {
+            s->session->session_id, &sess_len,
+            sha256, NULL)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
         goto err;
     }
@@ -2845,7 +2866,9 @@ MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL_CONNECTION *s,
         const EVP_MD *md = ssl_handshake_md(s);
         int hashleni = EVP_MD_get_size(md);
         size_t hashlen;
-        static const unsigned char nonce_label[] = "resumption";
+        /* ASCII: "resumption", in hex for EBCDIC compatibility */
+        static const unsigned char nonce_label[] = { 0x72, 0x65, 0x73, 0x75, 0x6D,
+            0x70, 0x74, 0x69, 0x6F, 0x6E };
 
         /* Ensure cast to size_t is safe */
         if (!ossl_assert(hashleni > 0)) {
@@ -2855,12 +2878,12 @@ MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL_CONNECTION *s,
         hashlen = (size_t)hashleni;
 
         if (!tls13_hkdf_expand(s, md, s->resumption_master_secret,
-                               nonce_label,
-                               sizeof(nonce_label) - 1,
-                               PACKET_data(&nonce),
-                               PACKET_remaining(&nonce),
-                               s->session->master_key,
-                               hashlen, 1)) {
+                nonce_label,
+                sizeof(nonce_label),
+                PACKET_data(&nonce),
+                PACKET_remaining(&nonce),
+                s->session->master_key,
+                hashlen, 1)) {
             /* SSLfatal() already called */
             goto err;
         }
@@ -2872,7 +2895,7 @@ MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL_CONNECTION *s,
     }
 
     return MSG_PROCESS_CONTINUE_READING;
- err:
+err:
     EVP_MD_free(sha256);
     OPENSSL_free(exts);
     return MSG_PROCESS_ERROR;
@@ -2912,7 +2935,6 @@ int tls_process_cert_status_body(SSL_CONNECTION *s, PACKET *pkt)
     return 1;
 }
 
-
 MSG_PROCESS_RETURN tls_process_cert_status(SSL_CONNECTION *s, PACKET *pkt)
 {
     if (!tls_process_cert_status_body(s, pkt)) {
@@ -2948,18 +2970,18 @@ int tls_process_initial_server_flight(SSL_CONNECTION *s)
      * message, or NULL and -1 otherwise
      */
     if (s->ext.status_type != TLSEXT_STATUSTYPE_nothing
-            && sctx->ext.status_cb != NULL) {
+        && sctx->ext.status_cb != NULL) {
         int ret = sctx->ext.status_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                      sctx->ext.status_arg);
+            sctx->ext.status_arg);
 
         if (ret == 0) {
             SSLfatal(s, SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE,
-                     SSL_R_INVALID_STATUS_RESPONSE);
+                SSL_R_INVALID_STATUS_RESPONSE);
             return 0;
         }
         if (ret < 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                     SSL_R_OCSP_CALLBACK_FAILURE);
+                SSL_R_OCSP_CALLBACK_FAILURE);
             return 0;
         }
     }
@@ -3024,13 +3046,13 @@ static int tls_construct_cke_psk_preamble(SSL_CONNECTION *s, WPACKET *pkt)
     memset(identity, 0, sizeof(identity));
 
     psklen = s->psk_client_callback(SSL_CONNECTION_GET_USER_SSL(s),
-                                    s->session->psk_identity_hint,
-                                    identity, sizeof(identity) - 1,
-                                    psk, sizeof(psk));
+        s->session->psk_identity_hint,
+        identity, sizeof(identity) - 1,
+        psk, sizeof(psk));
 
     if (psklen > PSK_MAX_PSK_LEN) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, ERR_R_INTERNAL_ERROR);
-        psklen = PSK_MAX_PSK_LEN;   /* Avoid overrunning the array on cleanse */
+        psklen = PSK_MAX_PSK_LEN; /* Avoid overrunning the array on cleanse */
         goto err;
     } else if (psklen == 0) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_PSK_IDENTITY_NOT_FOUND);
@@ -3058,14 +3080,14 @@ static int tls_construct_cke_psk_preamble(SSL_CONNECTION *s, WPACKET *pkt)
     s->session->psk_identity = tmpidentity;
     tmpidentity = NULL;
 
-    if (!WPACKET_sub_memcpy_u16(pkt, identity, identitylen))  {
+    if (!WPACKET_sub_memcpy_u16(pkt, identity, identitylen)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
 
     ret = 1;
 
- err:
+err:
     OPENSSL_cleanse(psk, psklen);
     OPENSSL_cleanse(identity, sizeof(identity));
     OPENSSL_clear_free(tmppsk, psklen);
@@ -3133,7 +3155,7 @@ static int tls_construct_cke_rsa(SSL_CONNECTION *s, WPACKET *pkt)
         goto err;
     }
     if (!WPACKET_allocate_bytes(pkt, enclen, &encdata)
-            || EVP_PKEY_encrypt(pctx, encdata, &enclen, pms, pmslen) <= 0) {
+        || EVP_PKEY_encrypt(pctx, encdata, &enclen, pms, pmslen) <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_BAD_RSA_ENCRYPT);
         goto err;
     }
@@ -3156,7 +3178,7 @@ static int tls_construct_cke_rsa(SSL_CONNECTION *s, WPACKET *pkt)
     s->s3.tmp.pmslen = pmslen;
 
     return 1;
- err:
+err:
     OPENSSL_clear_free(pms, pmslen);
     EVP_PKEY_CTX_free(pctx);
 
@@ -3220,7 +3242,7 @@ static int tls_construct_cke_dhe(SSL_CONNECTION *s, WPACKET *pkt)
     }
 
     ret = 1;
- err:
+err:
     OPENSSL_free(encoded_pub);
     EVP_PKEY_free(ckey);
     return ret;
@@ -3264,7 +3286,7 @@ static int tls_construct_cke_ecdhe(SSL_CONNECTION *s, WPACKET *pkt)
     }
 
     ret = 1;
- err:
+err:
     OPENSSL_free(encodedPoint);
     EVP_PKEY_free(ckey);
     return ret;
@@ -3293,13 +3315,13 @@ static int tls_construct_cke_gost(SSL_CONNECTION *s, WPACKET *pkt)
      */
     if ((pkey = tls_get_peer_pkey(s)) == NULL) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                 SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER);
+            SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER);
         return 0;
     }
 
     pkey_ctx = EVP_PKEY_CTX_new_from_pkey(sctx->libctx,
-                                          pkey,
-                                          sctx->propq);
+        pkey,
+        sctx->propq);
     if (pkey_ctx == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
         return 0;
@@ -3333,9 +3355,11 @@ static int tls_construct_cke_gost(SSL_CONNECTION *s, WPACKET *pkt)
     if (ukm_hash == NULL
         || EVP_DigestInit(ukm_hash, EVP_get_digestbynid(dgst_nid)) <= 0
         || EVP_DigestUpdate(ukm_hash, s->s3.client_random,
-                            SSL3_RANDOM_SIZE) <= 0
+               SSL3_RANDOM_SIZE)
+            <= 0
         || EVP_DigestUpdate(ukm_hash, s->s3.server_random,
-                            SSL3_RANDOM_SIZE) <= 0
+               SSL3_RANDOM_SIZE)
+            <= 0
         || EVP_DigestFinal_ex(ukm_hash, shared_ukm, &md_len) <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
@@ -3343,7 +3367,8 @@ static int tls_construct_cke_gost(SSL_CONNECTION *s, WPACKET *pkt)
     EVP_MD_CTX_free(ukm_hash);
     ukm_hash = NULL;
     if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, EVP_PKEY_OP_ENCRYPT,
-                          EVP_PKEY_CTRL_SET_IV, 8, shared_ukm) <= 0) {
+            EVP_PKEY_CTRL_SET_IV, 8, shared_ukm)
+        <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_LIBRARY_BUG);
         goto err;
     }
@@ -3358,8 +3383,8 @@ static int tls_construct_cke_gost(SSL_CONNECTION *s, WPACKET *pkt)
     }
 
     if (!WPACKET_put_bytes_u8(pkt, V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED)
-            || (msglen >= 0x80 && !WPACKET_put_bytes_u8(pkt, 0x81))
-            || !WPACKET_sub_memcpy_u8(pkt, tmp, msglen)) {
+        || (msglen >= 0x80 && !WPACKET_put_bytes_u8(pkt, 0x81))
+        || !WPACKET_sub_memcpy_u8(pkt, tmp, msglen)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -3369,7 +3394,7 @@ static int tls_construct_cke_gost(SSL_CONNECTION *s, WPACKET *pkt)
     s->s3.tmp.pmslen = pmslen;
 
     return 1;
- err:
+err:
     EVP_PKEY_CTX_free(pkey_ctx);
     OPENSSL_clear_free(pms, pmslen);
     EVP_MD_CTX_free(ukm_hash);
@@ -3397,7 +3422,7 @@ int ossl_gost_ukm(const SSL_CONNECTION *s, unsigned char *dgst_buf)
     unsigned int md_len;
     SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(s);
     const EVP_MD *md = ssl_evp_md_fetch(sctx->libctx, NID_id_GostR3411_2012_256,
-                                        sctx->propq);
+        sctx->propq);
 
     if (md == NULL)
         return 0;
@@ -3455,16 +3480,16 @@ static int tls_construct_cke_gost18(SSL_CONNECTION *s, WPACKET *pkt)
         goto err;
     }
 
-     /* Get server certificate PKEY and create ctx from it */
+    /* Get server certificate PKEY and create ctx from it */
     if ((pkey = tls_get_peer_pkey(s)) == NULL) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                 SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER);
+            SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER);
         goto err;
     }
 
     pkey_ctx = EVP_PKEY_CTX_new_from_pkey(sctx->libctx,
-                                          pkey,
-                                          sctx->propq);
+        pkey,
+        sctx->propq);
     if (pkey_ctx == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
         goto err;
@@ -3477,13 +3502,15 @@ static int tls_construct_cke_gost18(SSL_CONNECTION *s, WPACKET *pkt)
 
     /* Reuse EVP_PKEY_CTRL_SET_IV, make choice in engine code */
     if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, EVP_PKEY_OP_ENCRYPT,
-                          EVP_PKEY_CTRL_SET_IV, 32, rnd_dgst) <= 0) {
+            EVP_PKEY_CTRL_SET_IV, 32, rnd_dgst)
+        <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_LIBRARY_BUG);
         goto err;
     }
 
     if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, EVP_PKEY_OP_ENCRYPT,
-                          EVP_PKEY_CTRL_CIPHER, cipher_nid, NULL) <= 0) {
+            EVP_PKEY_CTRL_CIPHER, cipher_nid, NULL)
+        <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_LIBRARY_BUG);
         goto err;
     }
@@ -3494,7 +3521,7 @@ static int tls_construct_cke_gost18(SSL_CONNECTION *s, WPACKET *pkt)
     }
 
     if (!WPACKET_allocate_bytes(pkt, msglen, &encdata)
-            || EVP_PKEY_encrypt(pkey_ctx, encdata, &msglen, pms, pmslen) <= 0) {
+        || EVP_PKEY_encrypt(pkey_ctx, encdata, &msglen, pms, pmslen) <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
         goto err;
     }
@@ -3505,7 +3532,7 @@ static int tls_construct_cke_gost18(SSL_CONNECTION *s, WPACKET *pkt)
     s->s3.tmp.pmslen = pmslen;
 
     return 1;
- err:
+err:
     EVP_PKEY_CTX_free(pkey_ctx);
     OPENSSL_clear_free(pms, pmslen);
     return 0;
@@ -3521,8 +3548,8 @@ static int tls_construct_cke_srp(SSL_CONNECTION *s, WPACKET *pkt)
     unsigned char *abytes = NULL;
 
     if (s->srp_ctx.A == NULL
-            || !WPACKET_sub_allocate_bytes_u16(pkt, BN_num_bytes(s->srp_ctx.A),
-                                               &abytes)) {
+        || !WPACKET_sub_allocate_bytes_u16(pkt, BN_num_bytes(s->srp_ctx.A),
+            &abytes)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -3543,7 +3570,7 @@ static int tls_construct_cke_srp(SSL_CONNECTION *s, WPACKET *pkt)
 }
 
 CON_FUNC_RETURN tls_construct_client_key_exchange(SSL_CONNECTION *s,
-                                                  WPACKET *pkt)
+    WPACKET *pkt)
 {
     unsigned long alg_k;
 
@@ -3581,7 +3608,7 @@ CON_FUNC_RETURN tls_construct_client_key_exchange(SSL_CONNECTION *s,
     }
 
     return CON_FUNC_SUCCESS;
- err:
+err:
     OPENSSL_clear_free(s->s3.tmp.pms, s->s3.tmp.pmslen);
     s->s3.tmp.pms = NULL;
     s->s3.tmp.pmslen = 0;
@@ -3638,7 +3665,7 @@ int tls_client_key_exchange_post_work(SSL_CONNECTION *s)
          * used.
          */
         memcpy(labelbuffer, DTLS1_SCTP_AUTH_LABEL,
-               sizeof(DTLS1_SCTP_AUTH_LABEL));
+            sizeof(DTLS1_SCTP_AUTH_LABEL));
 
         /* Don't include the terminating zero. */
         labellen = sizeof(labelbuffer) - 1;
@@ -3646,19 +3673,20 @@ int tls_client_key_exchange_post_work(SSL_CONNECTION *s)
             labellen += 1;
 
         if (SSL_export_keying_material(ssl, sctpauthkey,
-                                       sizeof(sctpauthkey), labelbuffer,
-                                       labellen, NULL, 0, 0) <= 0) {
+                sizeof(sctpauthkey), labelbuffer,
+                labellen, NULL, 0, 0)
+            <= 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             goto err;
         }
 
         BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,
-                 sizeof(sctpauthkey), sctpauthkey);
+            sizeof(sctpauthkey), sctpauthkey);
     }
 #endif
 
     return 1;
- err:
+err:
     OPENSSL_clear_free(pms, pmslen);
     s->s3.tmp.pms = NULL;
     s->s3.tmp.pmslen = 0;
@@ -3679,8 +3707,7 @@ static int ssl3_check_client_certificate(SSL_CONNECTION *s)
      * If strict mode check suitability of chain before using it. This also
      * adjusts suite B digest if necessary.
      */
-    if (s->cert->cert_flags & SSL_CERT_FLAGS_CHECK_TLS_STRICT &&
-        !tls1_check_chain(s, NULL, NULL, NULL, -2))
+    if (s->cert->cert_flags & SSL_CERT_FLAGS_CHECK_TLS_STRICT && !tls1_check_chain(s, NULL, NULL, NULL, -2))
         return 0;
     return 1;
 }
@@ -3758,7 +3785,7 @@ WORK_STATE tls_prepare_client_certificate(SSL_CONNECTION *s, WORK_STATE wst)
         }
 
         if (!SSL_CONNECTION_IS_TLS13(s)
-                || (s->options & SSL_OP_NO_TX_CERTIFICATE_COMPRESSION) != 0)
+            || (s->options & SSL_OP_NO_TX_CERTIFICATE_COMPRESSION) != 0)
             s->ext.compress_certificate_from_peer[0] = TLSEXT_comp_cert_none;
 
         if (s->post_handshake_auth == SSL_PHA_REQUESTED)
@@ -3772,7 +3799,7 @@ WORK_STATE tls_prepare_client_certificate(SSL_CONNECTION *s, WORK_STATE wst)
 }
 
 CON_FUNC_RETURN tls_construct_client_certificate(SSL_CONNECTION *s,
-                                                 WPACKET *pkt)
+    WPACKET *pkt)
 {
     CERT_PKEY *cpk = NULL;
     SSL *ssl = SSL_CONNECTION_GET_SSL(s);
@@ -3815,11 +3842,12 @@ CON_FUNC_RETURN tls_construct_client_certificate(SSL_CONNECTION *s,
      * moment. We need to do it now.
      */
     if (SSL_CONNECTION_IS_TLS13(s)
-            && SSL_IS_FIRST_HANDSHAKE(s)
-            && (s->early_data_state != SSL_EARLY_DATA_NONE
-                || (s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0)
-            && (!ssl->method->ssl3_enc->change_cipher_state(s,
-                    SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_CLIENT_WRITE))) {
+        && !SSL_IS_QUIC_HANDSHAKE(s)
+        && SSL_IS_FIRST_HANDSHAKE(s)
+        && (s->early_data_state != SSL_EARLY_DATA_NONE
+            || (s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0)
+        && (!ssl->method->ssl3_enc->change_cipher_state(s,
+            SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_CLIENT_WRITE))) {
         /*
          * This is a fatal error, which leaves enc_write_ctx in an inconsistent
          * state and thus ssl3_send_alert may crash.
@@ -3833,7 +3861,7 @@ CON_FUNC_RETURN tls_construct_client_certificate(SSL_CONNECTION *s,
 
 #ifndef OPENSSL_NO_COMP_ALG
 CON_FUNC_RETURN tls_construct_client_compressed_certificate(SSL_CONNECTION *sc,
-                                                            WPACKET *pkt)
+    WPACKET *pkt)
 {
     SSL *ssl = SSL_CONNECTION_GET_SSL(sc);
     WPACKET tmppkt;
@@ -3866,8 +3894,8 @@ CON_FUNC_RETURN tls_construct_client_compressed_certificate(SSL_CONNECTION *sc,
 
     /* continue with the real |pkt| */
     if (!WPACKET_put_bytes_u16(pkt, alg)
-            || !WPACKET_get_total_written(&tmppkt, &length)
-            || !WPACKET_put_bytes_u24(pkt, length))
+        || !WPACKET_get_total_written(&tmppkt, &length)
+        || !WPACKET_put_bytes_u24(pkt, length))
         goto err;
 
     switch (alg) {
@@ -3886,17 +3914,17 @@ CON_FUNC_RETURN tls_construct_client_compressed_certificate(SSL_CONNECTION *sc,
     max_length = ossl_calculate_comp_expansion(alg, length);
 
     if ((comp = COMP_CTX_new(method)) == NULL
-            || !WPACKET_start_sub_packet_u24(pkt)
-            || !WPACKET_reserve_bytes(pkt, max_length, NULL))
+        || !WPACKET_start_sub_packet_u24(pkt)
+        || !WPACKET_reserve_bytes(pkt, max_length, NULL))
         goto err;
 
     comp_len = COMP_compress_block(comp, WPACKET_get_curr(pkt), max_length,
-                                   (unsigned char *)buf->data, length);
+        (unsigned char *)buf->data, length);
     if (comp_len <= 0)
         goto err;
 
     if (!WPACKET_allocate_bytes(pkt, comp_len, NULL)
-            || !WPACKET_close(pkt))
+        || !WPACKET_close(pkt))
         goto err;
 
     /*
@@ -3905,10 +3933,11 @@ CON_FUNC_RETURN tls_construct_client_compressed_certificate(SSL_CONNECTION *sc,
      * moment. We need to do it now.
      */
     if (SSL_IS_FIRST_HANDSHAKE(sc)
-            && (sc->early_data_state != SSL_EARLY_DATA_NONE
-                || (sc->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0)
-            && (!ssl->method->ssl3_enc->change_cipher_state(sc,
-                    SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_CLIENT_WRITE))) {
+        && !SSL_IS_QUIC_HANDSHAKE(sc)
+        && (sc->early_data_state != SSL_EARLY_DATA_NONE
+            || (sc->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0)
+        && (!ssl->method->ssl3_enc->change_cipher_state(sc,
+            SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_CLIENT_WRITE))) {
         /*
          * This is a fatal error, which leaves sc->enc_write_ctx in an
          * inconsistent state and thus ssl3_send_alert may crash.
@@ -3919,9 +3948,9 @@ CON_FUNC_RETURN tls_construct_client_compressed_certificate(SSL_CONNECTION *sc,
     ret = 1;
     goto out;
 
- err:
+err:
     SSLfatal(sc, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
- out:
+out:
     if (buf != NULL) {
         /* If |buf| is NULL, then |tmppkt| could not have been initialized */
         WPACKET_cleanup(&tmppkt);
@@ -3958,7 +3987,7 @@ int ssl3_check_cert_and_algorithm(SSL_CONNECTION *s)
 
     if (alg_k & (SSL_kRSA | SSL_kRSAPSK) && idx != SSL_PKEY_RSA) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                 SSL_R_MISSING_RSA_ENCRYPTING_CERT);
+            SSL_R_MISSING_RSA_ENCRYPTING_CERT);
         return 0;
     }
 
@@ -3991,7 +4020,7 @@ CON_FUNC_RETURN tls_construct_next_proto(SSL_CONNECTION *s, WPACKET *pkt)
     padding_len = 32 - ((len + 2) % 32);
 
     if (!WPACKET_sub_memcpy_u8(pkt, s->ext.npn, len)
-            || !WPACKET_sub_allocate_bytes_u8(pkt, padding_len, &padding)) {
+        || !WPACKET_sub_allocate_bytes_u8(pkt, padding_len, &padding)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return CON_FUNC_ERROR;
     }
@@ -4033,22 +4062,22 @@ MSG_PROCESS_RETURN tls_process_hello_req(SSL_CONNECTION *s, PACKET *pkt)
 }
 
 static MSG_PROCESS_RETURN tls_process_encrypted_extensions(SSL_CONNECTION *s,
-                                                           PACKET *pkt)
+    PACKET *pkt)
 {
     PACKET extensions;
     RAW_EXTENSION *rawexts = NULL;
 
     if (!PACKET_as_length_prefixed_2(pkt, &extensions)
-            || PACKET_remaining(pkt) != 0) {
+        || PACKET_remaining(pkt) != 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
         goto err;
     }
 
     if (!tls_collect_extensions(s, &extensions,
-                                SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS, &rawexts,
-                                NULL, 1)
-            || !tls_parse_all_extensions(s, SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
-                                         rawexts, NULL, 0, 1)) {
+            SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS, &rawexts,
+            NULL, 1)
+        || !tls_parse_all_extensions(s, SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
+            rawexts, NULL, 0, 1)) {
         /* SSLfatal() already called */
         goto err;
     }
@@ -4056,7 +4085,7 @@ static MSG_PROCESS_RETURN tls_process_encrypted_extensions(SSL_CONNECTION *s,
     OPENSSL_free(rawexts);
     return MSG_PROCESS_CONTINUE_READING;
 
- err:
+err:
     OPENSSL_free(rawexts);
     return MSG_PROCESS_ERROR;
 }
@@ -4079,14 +4108,14 @@ int ssl_do_client_cert_cb(SSL_CONNECTION *s, X509 **px509, EVP_PKEY **ppkey)
 }
 
 int ssl_cipher_list_to_bytes(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *sk,
-                             WPACKET *pkt)
+    WPACKET *pkt)
 {
     int i;
     size_t totlen = 0, len, maxlen, maxverok = 0;
     int empty_reneg_info_scsv = !s->renegotiate
-                                && !SSL_CONNECTION_IS_DTLS(s)
-                                && ssl_security(s, SSL_SECOP_VERSION, 0, TLS1_VERSION, NULL)
-                                && s->min_proto_version <= TLS1_VERSION;
+        && !SSL_CONNECTION_IS_DTLS(s)
+        && ssl_security(s, SSL_SECOP_VERSION, 0, TLS1_VERSION, NULL)
+        && s->min_proto_version <= TLS1_VERSION;
     SSL *ssl = SSL_CONNECTION_GET_SSL(s);
 
     /* Set disabled masks for this session */
@@ -4101,9 +4130,9 @@ int ssl_cipher_list_to_bytes(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *sk,
     }
 
 #ifdef OPENSSL_MAX_TLS1_2_CIPHER_LENGTH
-# if OPENSSL_MAX_TLS1_2_CIPHER_LENGTH < 6
-#  error Max cipher length too short
-# endif
+#if OPENSSL_MAX_TLS1_2_CIPHER_LENGTH < 6
+#error Max cipher length too short
+#endif
     /*
      * Some servers hang if client hello > 256 bytes as hack workaround
      * chop number of supported ciphers to keep it well below this if we
@@ -4140,7 +4169,7 @@ int ssl_cipher_list_to_bytes(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *sk,
             int maxproto = SSL_CONNECTION_IS_DTLS(s) ? c->max_dtls : c->max_tls;
 
             if (ssl_version_cmp(s, maxproto, s->s3.tmp.max_ver) >= 0
-                    && ssl_version_cmp(s, minproto, s->s3.tmp.max_ver) <= 0)
+                && ssl_version_cmp(s, minproto, s->s3.tmp.max_ver) <= 0)
                 maxverok = 1;
         }
 
@@ -4148,13 +4177,12 @@ int ssl_cipher_list_to_bytes(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *sk,
     }
 
     if (totlen == 0 || !maxverok) {
-        const char *maxvertext =
-            !maxverok
+        const char *maxvertext = !maxverok
             ? "No ciphers enabled for max supported SSL/TLS version"
             : NULL;
 
         SSLfatal_data(s, SSL_AD_INTERNAL_ERROR, SSL_R_NO_CIPHERS_AVAILABLE,
-                      maxvertext);
+            maxvertext);
         return 0;
     }
 
@@ -4185,7 +4213,7 @@ int ssl_cipher_list_to_bytes(SSL_CONNECTION *s, STACK_OF(SSL_CIPHER) *sk,
 CON_FUNC_RETURN tls_construct_end_of_early_data(SSL_CONNECTION *s, WPACKET *pkt)
 {
     if (s->early_data_state != SSL_EARLY_DATA_WRITE_RETRY
-            && s->early_data_state != SSL_EARLY_DATA_FINISHED_WRITING) {
+        && s->early_data_state != SSL_EARLY_DATA_FINISHED_WRITING) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
         return CON_FUNC_ERROR;
     }
diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index b8d976b235d70..4052ef6219b8b 100644
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -16,29 +16,37 @@
 #include "internal/cryptlib.h"
 #include "internal/ssl_unwrap.h"
 #include <openssl/buffer.h>
-#include <openssl/objects.h>
-#include <openssl/evp.h>
-#include <openssl/x509.h>
 
 #define RSMBLY_BITMASK_SIZE(msg_len) (((msg_len) + 7) / 8)
 
-#define RSMBLY_BITMASK_MARK(bitmask, start, end) { \
-                        if ((end) - (start) <= 8) { \
-                                long ii; \
-                                for (ii = (start); ii < (end); ii++) bitmask[((ii) >> 3)] |= (1 << ((ii) & 7)); \
-                        } else { \
-                                long ii; \
-                                bitmask[((start) >> 3)] |= bitmask_start_values[((start) & 7)]; \
-                                for (ii = (((start) >> 3) + 1); ii < ((((end) - 1)) >> 3); ii++) bitmask[ii] = 0xff; \
-                                bitmask[(((end) - 1) >> 3)] |= bitmask_end_values[((end) & 7)]; \
-                        } }
-
-#define RSMBLY_BITMASK_IS_COMPLETE(bitmask, msg_len, is_complete) { \
-                        long ii; \
-                        is_complete = 1; \
-                        if (bitmask[(((msg_len) - 1) >> 3)] != bitmask_end_values[((msg_len) & 7)]) is_complete = 0; \
-                        if (is_complete) for (ii = (((msg_len) - 1) >> 3) - 1; ii >= 0 ; ii--) \
-                                if (bitmask[ii] != 0xff) { is_complete = 0; break; } }
+#define RSMBLY_BITMASK_MARK(bitmask, start, end)                             \
+    {                                                                        \
+        if ((end) - (start) <= 8) {                                          \
+            long ii;                                                         \
+            for (ii = (start); ii < (end); ii++)                             \
+                bitmask[((ii) >> 3)] |= (1 << ((ii) & 7));                   \
+        } else {                                                             \
+            long ii;                                                         \
+            bitmask[((start) >> 3)] |= bitmask_start_values[((start) & 7)];  \
+            for (ii = (((start) >> 3) + 1); ii < ((((end) - 1)) >> 3); ii++) \
+                bitmask[ii] = 0xff;                                          \
+            bitmask[(((end) - 1) >> 3)] |= bitmask_end_values[((end) & 7)];  \
+        }                                                                    \
+    }
+
+#define RSMBLY_BITMASK_IS_COMPLETE(bitmask, msg_len, is_complete)                   \
+    {                                                                               \
+        long ii;                                                                    \
+        is_complete = 1;                                                            \
+        if (bitmask[(((msg_len) - 1) >> 3)] != bitmask_end_values[((msg_len) & 7)]) \
+            is_complete = 0;                                                        \
+        if (is_complete)                                                            \
+            for (ii = (((msg_len) - 1) >> 3) - 1; ii >= 0; ii--)                    \
+                if (bitmask[ii] != 0xff) {                                          \
+                    is_complete = 0;                                                \
+                    break;                                                          \
+                }                                                                   \
+    }
 
 static const unsigned char bitmask_start_values[] = {
     0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80
@@ -48,16 +56,16 @@ static const unsigned char bitmask_end_values[] = {
 };
 
 static void dtls1_fix_message_header(SSL_CONNECTION *s, size_t frag_off,
-                                     size_t frag_len);
+    size_t frag_len);
 static unsigned char *dtls1_write_message_header(SSL_CONNECTION *s,
-                                                 unsigned char *p);
+    unsigned char *p);
 static void dtls1_set_message_header_int(SSL_CONNECTION *s, unsigned char mt,
-                                         size_t len,
-                                         unsigned short seq_num,
-                                         size_t frag_off,
-                                         size_t frag_len);
+    size_t len,
+    unsigned short seq_num,
+    size_t frag_off,
+    size_t frag_len);
 static int dtls_get_reassembled_message(SSL_CONNECTION *s, int *errtype,
-                                        size_t *len);
+    size_t *len);
 
 static hm_fragment *dtls1_hm_fragment_new(size_t frag_len, int reassembly)
 {
@@ -116,6 +124,7 @@ int dtls1_do_write(SSL_CONNECTION *s, uint8_t type)
     size_t len, frag_off, overhead, used_len;
     SSL *ssl = SSL_CONNECTION_GET_SSL(s);
     SSL *ussl = SSL_CONNECTION_GET_USER_SSL(s);
+    uint8_t saved_payload[DTLS1_HM_HEADER_LENGTH];
 
     if (!dtls1_query_mtu(s))
         return -1;
@@ -125,8 +134,7 @@ int dtls1_do_write(SSL_CONNECTION *s, uint8_t type)
         return -1;
 
     if (s->init_off == 0 && type == SSL3_RT_HANDSHAKE) {
-        if (!ossl_assert(s->init_num ==
-                         s->d1->w_msg_hdr.msg_len + DTLS1_HM_HEADER_LENGTH))
+        if (!ossl_assert(s->init_num == s->d1->w_msg_hdr.msg_len + DTLS1_HM_HEADER_LENGTH))
             return -1;
     }
 
@@ -218,13 +226,26 @@ int dtls1_do_write(SSL_CONNECTION *s, uint8_t type)
             }
             dtls1_fix_message_header(s, frag_off, len - DTLS1_HM_HEADER_LENGTH);
 
+            /*
+             * Save the data that will be overwritten by
+             * dtls1_write_messsage_header so no corruption occurs when using
+             * a msg callback.
+             */
+            if (s->msg_callback && s->init_off != 0)
+                memcpy(saved_payload, &s->init_buf->data[s->init_off],
+                    sizeof(saved_payload));
+
             dtls1_write_message_header(s,
-                                       (unsigned char *)&s->init_buf->
-                                       data[s->init_off]);
+                (unsigned char *)&s->init_buf->data[s->init_off]);
         }
 
         ret = dtls1_write_bytes(s, type, &s->init_buf->data[s->init_off], len,
-                                &written);
+            &written);
+
+        if (type == SSL3_RT_HANDSHAKE && s->msg_callback && s->init_off != 0)
+            memcpy(&s->init_buf->data[s->init_off], saved_payload,
+                sizeof(saved_payload));
+
         if (ret <= 0) {
             /*
              * might need to update MTU here, but we don't know which
@@ -232,8 +253,7 @@ int dtls1_do_write(SSL_CONNECTION *s, uint8_t type)
              * retransmit anything.  continue as if everything is fine and
              * wait for an alert to handle the retransmit
              */
-            if (retry && BIO_ctrl(SSL_get_wbio(ssl),
-                                  BIO_CTRL_DGRAM_MTU_EXCEEDED, 0, NULL) > 0) {
+            if (retry && BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_MTU_EXCEEDED, 0, NULL) > 0) {
                 if (!(SSL_get_options(ssl) & SSL_OP_NO_QUERY_MTU)) {
                     if (!dtls1_query_mtu(s))
                         return -1;
@@ -261,15 +281,14 @@ int dtls1_do_write(SSL_CONNECTION *s, uint8_t type)
              * then the best thing to do is probably carry on regardless.
              */
             assert(s->s3.tmp.new_compression != NULL
-                   || BIO_wpending(s->wbio) <= (int)s->d1->mtu);
+                || BIO_wpending(s->wbio) <= (int)s->d1->mtu);
 
             if (type == SSL3_RT_HANDSHAKE && !s->d1->retransmitting) {
                 /*
                  * should not be done for 'Hello Request's, but in that case
                  * we'll ignore the result anyway
                  */
-                unsigned char *p =
-                    (unsigned char *)&s->init_buf->data[s->init_off];
+                unsigned char *p = (unsigned char *)&s->init_buf->data[s->init_off];
                 const struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
                 size_t xlen;
 
@@ -297,8 +316,8 @@ int dtls1_do_write(SSL_CONNECTION *s, uint8_t type)
             if (written == s->init_num) {
                 if (s->msg_callback)
                     s->msg_callback(1, s->version, type, s->init_buf->data,
-                                    (size_t)(s->init_off + s->init_num), ussl,
-                                    s->msg_callback_arg);
+                        s->init_off + s->init_num, ussl,
+                        s->msg_callback_arg);
 
                 s->init_off = 0; /* done writing this message */
                 s->init_num = 0;
@@ -333,10 +352,10 @@ int dtls_get_message(SSL_CONNECTION *s, int *mt)
     msg_hdr = &s->d1->r_msg_hdr;
     memset(msg_hdr, 0, sizeof(*msg_hdr));
 
- again:
+again:
     if (!dtls_get_reassembled_message(s, &errtype, &tmplen)) {
         if (errtype == DTLS1_HM_BAD_FRAGMENT
-                || errtype == DTLS1_HM_FRAGMENT_RETRY) {
+            || errtype == DTLS1_HM_FRAGMENT_RETRY) {
             /* bad fragment received */
             goto again;
         }
@@ -350,8 +369,8 @@ int dtls_get_message(SSL_CONNECTION *s, int *mt)
     if (*mt == SSL3_MT_CHANGE_CIPHER_SPEC) {
         if (s->msg_callback) {
             s->msg_callback(0, s->version, SSL3_RT_CHANGE_CIPHER_SPEC,
-                            p, 1, SSL_CONNECTION_GET_USER_SSL(s),
-                            s->msg_callback_arg);
+                p, 1, SSL_CONNECTION_GET_USER_SSL(s),
+                s->msg_callback_arg);
         }
         /*
          * This isn't a real handshake message so skip the processing below.
@@ -410,10 +429,10 @@ int dtls_get_message_body(SSL_CONNECTION *s, size_t *len)
 
     if (s->msg_callback)
         s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
-                        s->init_buf->data, s->init_num + DTLS1_HM_HEADER_LENGTH,
-                        SSL_CONNECTION_GET_USER_SSL(s), s->msg_callback_arg);
+            s->init_buf->data, s->init_num + DTLS1_HM_HEADER_LENGTH,
+            SSL_CONNECTION_GET_USER_SSL(s), s->msg_callback_arg);
 
- end:
+end:
     *len = s->init_num;
     return 1;
 }
@@ -432,7 +451,7 @@ static size_t dtls1_max_handshake_message_len(const SSL_CONNECTION *s)
 }
 
 static int dtls1_preprocess_fragment(SSL_CONNECTION *s,
-                                     struct hm_header_st *msg_hdr)
+    struct hm_header_st *msg_hdr)
 {
     size_t frag_off, frag_len, msg_len;
 
@@ -442,7 +461,7 @@ static int dtls1_preprocess_fragment(SSL_CONNECTION *s,
 
     /* sanity checking */
     if ((frag_off + frag_len) > msg_len
-            || msg_len > dtls1_max_handshake_message_len(s)) {
+        || msg_len > dtls1_max_handshake_message_len(s)) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_EXCESSIVE_MESSAGE_SIZE);
         return 0;
     }
@@ -505,9 +524,9 @@ static int dtls1_retrieve_buffered_fragment(SSL_CONNECTION *s, size_t *len)
             hm_fragment *nextfrag;
 
             if (!s->server
-                    || frag->msg_header.seq != 0
-                    || s->d1->handshake_read_seq != 1
-                    || s->statem.hand_state != DTLS_ST_SW_HELLO_VERIFY_REQUEST) {
+                || frag->msg_header.seq != 0
+                || s->d1->handshake_read_seq != 1
+                || s->statem.hand_state != DTLS_ST_SW_HELLO_VERIFY_REQUEST) {
                 /*
                  * This is a stale message that has been buffered so clear it.
                  * It is safe to pop this message from the queue even though
@@ -530,9 +549,9 @@ static int dtls1_retrieve_buffered_fragment(SSL_CONNECTION *s, size_t *len)
                     nextfrag = (hm_fragment *)next->data;
                     if (nextfrag->msg_header.seq == s->d1->handshake_read_seq) {
                         /*
-                        * We have fragments for both a ClientHello without
-                        * cookie and one with. Ditch the one without.
-                        */
+                         * We have fragments for both a ClientHello without
+                         * cookie and one with. Ditch the one without.
+                         */
                         pqueue_pop(s->d1->buffered_messages);
                         dtls1_hm_fragment_free(frag);
                         pitem_free(item);
@@ -560,10 +579,9 @@ static int dtls1_retrieve_buffered_fragment(SSL_CONNECTION *s, size_t *len)
         ret = dtls1_preprocess_fragment(s, &frag->msg_header);
 
         if (ret && frag->msg_header.frag_len > 0) {
-            unsigned char *p =
-                (unsigned char *)s->init_buf->data + DTLS1_HM_HEADER_LENGTH;
+            unsigned char *p = (unsigned char *)s->init_buf->data + DTLS1_HM_HEADER_LENGTH;
             memcpy(&p[frag->msg_header.frag_off], frag->fragment,
-                   frag->msg_header.frag_len);
+                frag->msg_header.frag_len);
         }
 
         dtls1_hm_fragment_free(frag);
@@ -593,7 +611,7 @@ static int dtls1_retrieve_buffered_fragment(SSL_CONNECTION *s, size_t *len)
 }
 
 static int dtls1_reassemble_fragment(SSL_CONNECTION *s,
-                                     const struct hm_header_st *msg_hdr)
+    const struct hm_header_st *msg_hdr)
 {
     hm_fragment *frag = NULL;
     pitem *item = NULL;
@@ -603,8 +621,7 @@ static int dtls1_reassemble_fragment(SSL_CONNECTION *s,
     size_t readbytes;
     SSL *ssl = SSL_CONNECTION_GET_SSL(s);
 
-    if ((msg_hdr->frag_off + frag_len) > msg_hdr->msg_len ||
-        msg_hdr->msg_len > dtls1_max_handshake_message_len(s))
+    if ((msg_hdr->frag_off + frag_len) > msg_hdr->msg_len || msg_hdr->msg_len > dtls1_max_handshake_message_len(s))
         goto err;
 
     if (frag_len == 0) {
@@ -643,10 +660,8 @@ static int dtls1_reassemble_fragment(SSL_CONNECTION *s,
 
         while (frag_len) {
             i = ssl->method->ssl_read_bytes(ssl, SSL3_RT_HANDSHAKE, NULL,
-                                            devnull,
-                                            frag_len >
-                                            sizeof(devnull) ? sizeof(devnull) :
-                                            frag_len, 0, &readbytes);
+                devnull,
+                frag_len > sizeof(devnull) ? sizeof(devnull) : frag_len, 0, &readbytes);
             if (i <= 0)
                 goto err;
             frag_len -= readbytes;
@@ -656,20 +671,20 @@ static int dtls1_reassemble_fragment(SSL_CONNECTION *s,
 
     /* read the body of the fragment (header has already been read */
     i = ssl->method->ssl_read_bytes(ssl, SSL3_RT_HANDSHAKE, NULL,
-                                    frag->fragment + msg_hdr->frag_off,
-                                    frag_len, 0, &readbytes);
+        frag->fragment + msg_hdr->frag_off,
+        frag_len, 0, &readbytes);
     if (i <= 0 || readbytes != frag_len)
         i = -1;
     if (i <= 0)
         goto err;
 
     RSMBLY_BITMASK_MARK(frag->reassembly, (long)msg_hdr->frag_off,
-                        (long)(msg_hdr->frag_off + frag_len));
+        (long)(msg_hdr->frag_off + frag_len));
 
     if (!ossl_assert(msg_hdr->msg_len > 0))
         goto err;
     RSMBLY_BITMASK_IS_COMPLETE(frag->reassembly, (long)msg_hdr->msg_len,
-                               is_complete);
+        is_complete);
 
     if (is_complete) {
         OPENSSL_free(frag->reassembly);
@@ -696,14 +711,14 @@ static int dtls1_reassemble_fragment(SSL_CONNECTION *s,
 
     return DTLS1_HM_FRAGMENT_RETRY;
 
- err:
+err:
     if (item == NULL)
         dtls1_hm_fragment_free(frag);
     return -1;
 }
 
 static int dtls1_process_out_of_seq_message(SSL_CONNECTION *s,
-                                            const struct hm_header_st *msg_hdr)
+    const struct hm_header_st *msg_hdr)
 {
     int i = -1;
     hm_fragment *frag = NULL;
@@ -734,17 +749,13 @@ static int dtls1_process_out_of_seq_message(SSL_CONNECTION *s,
      * in the future, already in the queue or if we received a FINISHED
      * before the SERVER_HELLO, which then must be a stale retransmit.
      */
-    if (msg_hdr->seq <= s->d1->handshake_read_seq ||
-        msg_hdr->seq > s->d1->handshake_read_seq + 10 || item != NULL ||
-        (s->d1->handshake_read_seq == 0 && msg_hdr->type == SSL3_MT_FINISHED)) {
+    if (msg_hdr->seq <= s->d1->handshake_read_seq || msg_hdr->seq > s->d1->handshake_read_seq + 10 || item != NULL || (s->d1->handshake_read_seq == 0 && msg_hdr->type == SSL3_MT_FINISHED)) {
         unsigned char devnull[256];
 
         while (frag_len) {
             i = ssl->method->ssl_read_bytes(ssl, SSL3_RT_HANDSHAKE, NULL,
-                                            devnull,
-                                            frag_len >
-                                            sizeof(devnull) ? sizeof(devnull) :
-                                            frag_len, 0, &readbytes);
+                devnull,
+                frag_len > sizeof(devnull) ? sizeof(devnull) : frag_len, 0, &readbytes);
             if (i <= 0)
                 goto err;
             frag_len -= readbytes;
@@ -768,9 +779,9 @@ static int dtls1_process_out_of_seq_message(SSL_CONNECTION *s,
              * read the body of the fragment (header has already been read
              */
             i = ssl->method->ssl_read_bytes(ssl, SSL3_RT_HANDSHAKE, NULL,
-                                            frag->fragment, frag_len, 0,
-                                            &readbytes);
-            if (i<=0 || readbytes != frag_len)
+                frag->fragment, frag_len, 0,
+                &readbytes);
+            if (i <= 0 || readbytes != frag_len)
                 i = -1;
             if (i <= 0)
                 goto err;
@@ -795,14 +806,14 @@ static int dtls1_process_out_of_seq_message(SSL_CONNECTION *s,
 
     return DTLS1_HM_FRAGMENT_RETRY;
 
- err:
+err:
     if (item == NULL)
         dtls1_hm_fragment_free(frag);
     return 0;
 }
 
 static int dtls_get_reassembled_message(SSL_CONNECTION *s, int *errtype,
-                                        size_t *len)
+    size_t *len)
 {
     size_t mlen, frag_off, frag_len;
     int i, ret;
@@ -818,7 +829,7 @@ static int dtls_get_reassembled_message(SSL_CONNECTION *s, int *errtype,
 
     p = (unsigned char *)s->init_buf->data;
 
- redo:
+redo:
     /* see if we have the required fragment already */
     ret = dtls1_retrieve_buffered_fragment(s, &frag_len);
     if (ret < 0) {
@@ -833,8 +844,8 @@ static int dtls_get_reassembled_message(SSL_CONNECTION *s, int *errtype,
 
     /* read handshake message header */
     i = ssl->method->ssl_read_bytes(ssl, SSL3_RT_HANDSHAKE, &recvd_type, p,
-                                    DTLS1_HM_HEADER_LENGTH, 0, &readbytes);
-    if (i <= 0) {               /* nbio, or an error */
+        DTLS1_HM_HEADER_LENGTH, 0, &readbytes);
+    if (i <= 0) { /* nbio, or an error */
         s->rwstate = SSL_READING;
         *len = 0;
         return 0;
@@ -842,7 +853,7 @@ static int dtls_get_reassembled_message(SSL_CONNECTION *s, int *errtype,
     if (recvd_type == SSL3_RT_CHANGE_CIPHER_SPEC) {
         if (p[0] != SSL3_MT_CCS) {
             SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE,
-                     SSL_R_BAD_CHANGE_CIPHER_SPEC);
+                SSL_R_BAD_CHANGE_CIPHER_SPEC);
             goto f_err;
         }
 
@@ -884,10 +895,10 @@ static int dtls_get_reassembled_message(SSL_CONNECTION *s, int *errtype,
      */
     if (msg_hdr.seq != s->d1->handshake_read_seq) {
         if (!s->server
-                || msg_hdr.seq != 0
-                || s->d1->handshake_read_seq != 1
-                || p[0] != SSL3_MT_CLIENT_HELLO
-                || s->statem.hand_state != DTLS_ST_SW_HELLO_VERIFY_REQUEST) {
+            || msg_hdr.seq != 0
+            || s->d1->handshake_read_seq != 1
+            || p[0] != SSL3_MT_CLIENT_HELLO
+            || s->statem.hand_state != DTLS_ST_SW_HELLO_VERIFY_REQUEST) {
             *errtype = dtls1_process_out_of_seq_message(s, &msg_hdr);
             return 0;
         }
@@ -905,9 +916,9 @@ static int dtls_get_reassembled_message(SSL_CONNECTION *s, int *errtype,
     }
 
     if (!s->server
-            && s->d1->r_msg_hdr.frag_off == 0
-            && s->statem.hand_state != TLS_ST_OK
-            && p[0] == SSL3_MT_HELLO_REQUEST) {
+        && s->d1->r_msg_hdr.frag_off == 0
+        && s->statem.hand_state != TLS_ST_OK
+        && p[0] == SSL3_MT_HELLO_REQUEST) {
         /*
          * The server may always send 'Hello Request' messages -- we are
          * doing a handshake anyway now, so ignore them if their format is
@@ -916,12 +927,12 @@ static int dtls_get_reassembled_message(SSL_CONNECTION *s, int *errtype,
         if (p[1] == 0 && p[2] == 0 && p[3] == 0) {
             if (s->msg_callback)
                 s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
-                                p, DTLS1_HM_HEADER_LENGTH, ussl,
-                                s->msg_callback_arg);
+                    p, DTLS1_HM_HEADER_LENGTH, ussl,
+                    s->msg_callback_arg);
 
             s->init_num = 0;
             goto redo;
-        } else {                /* Incorrectly formatted Hello request */
+        } else { /* Incorrectly formatted Hello request */
 
             SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_UNEXPECTED_MESSAGE);
             goto f_err;
@@ -934,10 +945,11 @@ static int dtls_get_reassembled_message(SSL_CONNECTION *s, int *errtype,
     }
 
     if (frag_len > 0) {
-        p += DTLS1_HM_HEADER_LENGTH;
+        /* dtls1_preprocess_fragment() above could reallocate init_buf */
+        p = (unsigned char *)s->init_buf->data + DTLS1_HM_HEADER_LENGTH;
 
         i = ssl->method->ssl_read_bytes(ssl, SSL3_RT_HANDSHAKE, NULL,
-                                        &p[frag_off], frag_len, 0, &readbytes);
+            &p[frag_off], frag_len, 0, &readbytes);
 
         /*
          * This shouldn't ever fail due to NBIO because we already checked
@@ -981,7 +993,7 @@ static int dtls_get_reassembled_message(SSL_CONNECTION *s, int *errtype,
     *len = s->init_num = frag_len;
     return 1;
 
- f_err:
+f_err:
     s->init_num = 0;
     *len = 0;
     return 0;
@@ -994,7 +1006,7 @@ static int dtls_get_reassembled_message(SSL_CONNECTION *s, int *errtype,
  * ssl->session->read_hash              assign
  */
 CON_FUNC_RETURN dtls_construct_change_cipher_spec(SSL_CONNECTION *s,
-                                                  WPACKET *pkt)
+    WPACKET *pkt)
 {
     if (s->version == DTLS1_BAD_VER) {
         s->d1->next_handshake_write_seq++;
@@ -1101,10 +1113,7 @@ int dtls1_retransmit_buffered_messages(SSL_CONNECTION *s)
 
     for (item = pqueue_next(&iter); item != NULL; item = pqueue_next(&iter)) {
         frag = (hm_fragment *)item->data;
-        if (dtls1_retransmit_message(s, (unsigned short)
-                                     dtls1_get_queue_priority
-                                     (frag->msg_header.seq,
-                                      frag->msg_header.is_ccs), &found) <= 0)
+        if (dtls1_retransmit_message(s, (unsigned short)dtls1_get_queue_priority(frag->msg_header.seq, frag->msg_header.is_ccs), &found) <= 0)
             return -1;
     }
 
@@ -1132,16 +1141,13 @@ int dtls1_buffer_message(SSL_CONNECTION *s, int is_ccs)
 
     if (is_ccs) {
         /* For DTLS1_BAD_VER the header length is non-standard */
-        if (!ossl_assert(s->d1->w_msg_hdr.msg_len +
-                         ((s->version ==
-                           DTLS1_BAD_VER) ? 3 : DTLS1_CCS_HEADER_LENGTH)
-                         == (unsigned int)s->init_num)) {
+        if (!ossl_assert(s->d1->w_msg_hdr.msg_len + ((s->version == DTLS1_BAD_VER) ? 3 : DTLS1_CCS_HEADER_LENGTH)
+                == (unsigned int)s->init_num)) {
             dtls1_hm_fragment_free(frag);
             return 0;
         }
     } else {
-        if (!ossl_assert(s->d1->w_msg_hdr.msg_len +
-                         DTLS1_HM_HEADER_LENGTH == (unsigned int)s->init_num)) {
+        if (!ossl_assert(s->d1->w_msg_hdr.msg_len + DTLS1_HM_HEADER_LENGTH == (unsigned int)s->init_num)) {
             dtls1_hm_fragment_free(frag);
             return 0;
         }
@@ -1158,16 +1164,12 @@ int dtls1_buffer_message(SSL_CONNECTION *s, int is_ccs)
     frag->msg_header.saved_retransmit_state.wrlmethod = s->rlayer.wrlmethod;
     frag->msg_header.saved_retransmit_state.wrl = s->rlayer.wrl;
 
-
     memset(seq64be, 0, sizeof(seq64be));
-    seq64be[6] =
-        (unsigned
-         char)(dtls1_get_queue_priority(frag->msg_header.seq,
-                                        frag->msg_header.is_ccs) >> 8);
-    seq64be[7] =
-        (unsigned
-         char)(dtls1_get_queue_priority(frag->msg_header.seq,
-                                        frag->msg_header.is_ccs));
+    seq64be[6] = (unsigned char)(dtls1_get_queue_priority(frag->msg_header.seq,
+                                     frag->msg_header.is_ccs)
+        >> 8);
+    seq64be[7] = (unsigned char)(dtls1_get_queue_priority(frag->msg_header.seq,
+        frag->msg_header.is_ccs));
 
     item = pitem_new(seq64be, frag);
     if (item == NULL) {
@@ -1210,13 +1212,13 @@ int dtls1_retransmit_message(SSL_CONNECTION *s, unsigned short seq, int *found)
         header_length = DTLS1_HM_HEADER_LENGTH;
 
     memcpy(s->init_buf->data, frag->fragment,
-           frag->msg_header.msg_len + header_length);
+        frag->msg_header.msg_len + header_length);
     s->init_num = frag->msg_header.msg_len + header_length;
 
     dtls1_set_message_header_int(s, frag->msg_header.type,
-                                 frag->msg_header.msg_len,
-                                 frag->msg_header.seq, 0,
-                                 frag->msg_header.frag_len);
+        frag->msg_header.msg_len,
+        frag->msg_header.seq, 0,
+        frag->msg_header.frag_len);
 
     /* save current state */
     saved_state.wrlmethod = s->rlayer.wrlmethod;
@@ -1234,8 +1236,7 @@ int dtls1_retransmit_message(SSL_CONNECTION *s, unsigned short seq, int *found)
      */
     s->rlayer.wrlmethod->set1_bio(s->rlayer.wrl, s->wbio);
 
-    ret = dtls1_do_write(s, frag->msg_header.is_ccs ?
-                         SSL3_RT_CHANGE_CIPHER_SPEC : SSL3_RT_HANDSHAKE);
+    ret = dtls1_do_write(s, frag->msg_header.is_ccs ? SSL3_RT_CHANGE_CIPHER_SPEC : SSL3_RT_HANDSHAKE);
 
     /* restore current state */
     s->rlayer.wrlmethod = saved_state.wrlmethod;
@@ -1248,8 +1249,8 @@ int dtls1_retransmit_message(SSL_CONNECTION *s, unsigned short seq, int *found)
 }
 
 void dtls1_set_message_header(SSL_CONNECTION *s,
-                              unsigned char mt, size_t len,
-                              size_t frag_off, size_t frag_len)
+    unsigned char mt, size_t len,
+    size_t frag_off, size_t frag_len)
 {
     if (frag_off == 0) {
         s->d1->handshake_write_seq = s->d1->next_handshake_write_seq;
@@ -1257,14 +1258,14 @@ void dtls1_set_message_header(SSL_CONNECTION *s,
     }
 
     dtls1_set_message_header_int(s, mt, len, s->d1->handshake_write_seq,
-                                 frag_off, frag_len);
+        frag_off, frag_len);
 }
 
 /* don't actually do the writing, wait till the MTU has been retrieved */
 static void
 dtls1_set_message_header_int(SSL_CONNECTION *s, unsigned char mt,
-                             size_t len, unsigned short seq_num,
-                             size_t frag_off, size_t frag_len)
+    size_t len, unsigned short seq_num,
+    size_t frag_off, size_t frag_len)
 {
     struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
 
@@ -1285,7 +1286,7 @@ dtls1_fix_message_header(SSL_CONNECTION *s, size_t frag_off, size_t frag_len)
 }
 
 static unsigned char *dtls1_write_message_header(SSL_CONNECTION *s,
-                                                 unsigned char *p)
+    unsigned char *p)
 {
     struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
 
@@ -1299,8 +1300,7 @@ static unsigned char *dtls1_write_message_header(SSL_CONNECTION *s,
     return p;
 }
 
-void dtls1_get_message_header(const unsigned char *data, struct
-                              hm_header_st *msg_hdr)
+void dtls1_get_message_header(const unsigned char *data, struct hm_header_st *msg_hdr)
 {
     memset(msg_hdr, 0, sizeof(*msg_hdr));
     msg_hdr->type = *(data++);
@@ -1318,7 +1318,7 @@ int dtls1_set_handshake_header(SSL_CONNECTION *s, WPACKET *pkt, int htype)
     if (htype == SSL3_MT_CHANGE_CIPHER_SPEC) {
         s->d1->handshake_write_seq = s->d1->next_handshake_write_seq;
         dtls1_set_message_header_int(s, SSL3_MT_CCS, 0,
-                                     s->d1->handshake_write_seq, 0, 0);
+            s->d1->handshake_write_seq, 0, 0);
         if (!WPACKET_put_bytes_u8(pkt, SSL3_MT_CCS))
             return 0;
     } else {
@@ -1328,7 +1328,7 @@ int dtls1_set_handshake_header(SSL_CONNECTION *s, WPACKET *pkt, int htype)
          * filled in later
          */
         if (!WPACKET_allocate_bytes(pkt, DTLS1_HM_HEADER_LENGTH, &header)
-                || !WPACKET_start_sub_packet(pkt))
+            || !WPACKET_start_sub_packet(pkt))
             return 0;
     }
 
@@ -1340,8 +1340,8 @@ int dtls1_close_construct_packet(SSL_CONNECTION *s, WPACKET *pkt, int htype)
     size_t msglen;
 
     if ((htype != SSL3_MT_CHANGE_CIPHER_SPEC && !WPACKET_close(pkt))
-            || !WPACKET_get_length(pkt, &msglen)
-            || msglen > INT_MAX)
+        || !WPACKET_get_length(pkt, &msglen)
+        || msglen > INT_MAX)
         return 0;
 
     if (htype != SSL3_MT_CHANGE_CIPHER_SPEC) {
@@ -1353,8 +1353,7 @@ int dtls1_close_construct_packet(SSL_CONNECTION *s, WPACKET *pkt, int htype)
 
     if (htype != DTLS1_MT_HELLO_VERIFY_REQUEST) {
         /* Buffer the message to handle re-xmits */
-        if (!dtls1_buffer_message(s, htype == SSL3_MT_CHANGE_CIPHER_SPEC
-                                     ? 1 : 0))
+        if (!dtls1_buffer_message(s, htype == SSL3_MT_CHANGE_CIPHER_SPEC ? 1 : 0))
             return 0;
     }
 
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index a23d83eacec20..aa9d196780eb9 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -39,9 +39,9 @@ const unsigned char hrrrandom[] = {
 };
 
 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)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
@@ -71,19 +71,19 @@ int ssl3_do_write(SSL_CONNECTION *s, uint8_t type)
      * we've been asked to write. Does not happen in normal operation.
      */
     if (s->statem.mutate_handshake_cb != NULL
-            && !s->statem.write_in_progress
-            && type == SSL3_RT_HANDSHAKE
-            && s->init_num >= SSL3_HM_HEADER_LENGTH) {
+        && !s->statem.write_in_progress
+        && type == SSL3_RT_HANDSHAKE
+        && s->init_num >= SSL3_HM_HEADER_LENGTH) {
         unsigned char *msg;
         size_t msglen;
 
         if (!s->statem.mutate_handshake_cb((unsigned char *)s->init_buf->data,
-                                           s->init_num,
-                                           &msg, &msglen,
-                                           s->statem.mutatearg))
+                s->init_num,
+                &msg, &msglen,
+                s->statem.mutatearg))
             return -1;
         if (msglen < SSL3_HM_HEADER_LENGTH
-                || !BUF_MEM_grow(s->init_buf, msglen))
+            || !BUF_MEM_grow(s->init_buf, msglen))
             return -1;
         memcpy(s->init_buf->data, msg, msglen);
         s->init_num = msglen;
@@ -93,7 +93,7 @@ int ssl3_do_write(SSL_CONNECTION *s, uint8_t type)
     }
 
     ret = ssl3_write_bytes(ssl, type, &s->init_buf->data[s->init_off],
-                           s->init_num, &written);
+        s->init_num, &written);
     if (ret <= 0)
         return -1;
     if (type == SSL3_RT_HANDSHAKE)
@@ -104,18 +104,18 @@ int ssl3_do_write(SSL_CONNECTION *s, uint8_t type)
          */
         if (!SSL_CONNECTION_IS_TLS13(s)
             || (s->statem.hand_state != TLS_ST_SW_SESSION_TICKET
-                                 && s->statem.hand_state != TLS_ST_CW_KEY_UPDATE
-                                 && s->statem.hand_state != TLS_ST_SW_KEY_UPDATE))
+                && s->statem.hand_state != TLS_ST_CW_KEY_UPDATE
+                && s->statem.hand_state != TLS_ST_SW_KEY_UPDATE))
             if (!ssl3_finish_mac(s,
-                                 (unsigned char *)&s->init_buf->data[s->init_off],
-                                 written))
+                    (unsigned char *)&s->init_buf->data[s->init_off],
+                    written))
                 return -1;
     if (written == s->init_num) {
         s->statem.write_in_progress = 0;
         if (s->msg_callback)
             s->msg_callback(1, s->version, type, s->init_buf->data,
-                            (size_t)(s->init_off + s->init_num), ussl,
-                            s->msg_callback_arg);
+                (size_t)(s->init_off + s->init_num), ussl,
+                s->msg_callback_arg);
         return 1;
     }
     s->init_off += written;
@@ -128,8 +128,8 @@ int tls_close_construct_packet(SSL_CONNECTION *s, WPACKET *pkt, int htype)
     size_t msglen;
 
     if ((htype != SSL3_MT_CHANGE_CIPHER_SPEC && !WPACKET_close(pkt))
-            || !WPACKET_get_length(pkt, &msglen)
-            || msglen > INT_MAX)
+        || !WPACKET_get_length(pkt, &msglen)
+        || msglen > INT_MAX)
         return 0;
     s->init_num = (int)msglen;
     s->init_off = 0;
@@ -160,26 +160,26 @@ int tls_setup_handshake(SSL_CONNECTION *s)
     if (sctx->ssl_digest_methods[SSL_MD_MD5_SHA1_IDX] == NULL) {
         int negotiated_minversion;
         int md5sha1_needed_maxversion = SSL_CONNECTION_IS_DTLS(s)
-                                        ? DTLS1_VERSION : TLS1_1_VERSION;
+            ? DTLS1_VERSION
+            : TLS1_1_VERSION;
 
         /* We don't have MD5-SHA1 - do we need it? */
         if (ssl_version_cmp(s, ver_max, md5sha1_needed_maxversion) <= 0) {
             SSLfatal_data(s, SSL_AD_HANDSHAKE_FAILURE,
-                          SSL_R_NO_SUITABLE_DIGEST_ALGORITHM,
-                          "The max supported SSL/TLS version needs the"
-                          " MD5-SHA1 digest but it is not available"
-                          " in the loaded providers. Use (D)TLSv1.2 or"
-                          " above, or load different providers");
+                SSL_R_NO_SUITABLE_DIGEST_ALGORITHM,
+                "The max supported SSL/TLS version needs the"
+                " MD5-SHA1 digest but it is not available"
+                " in the loaded providers. Use (D)TLSv1.2 or"
+                " above, or load different providers");
             return 0;
         }
 
         ok = 1;
 
         /* Don't allow TLSv1.1 or below to be negotiated */
-        negotiated_minversion = SSL_CONNECTION_IS_DTLS(s) ?
-                                DTLS1_2_VERSION : TLS1_2_VERSION;
+        negotiated_minversion = SSL_CONNECTION_IS_DTLS(s) ? DTLS1_2_VERSION : TLS1_2_VERSION;
         if (ssl_version_cmp(s, ver_min, negotiated_minversion) < 0)
-                ok = SSL_set_min_proto_version(ssl, negotiated_minversion);
+            ok = SSL_set_min_proto_version(ssl, negotiated_minversion);
         if (!ok) {
             /* Shouldn't happen */
             SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, ERR_R_INTERNAL_ERROR);
@@ -200,21 +200,23 @@ int tls_setup_handshake(SSL_CONNECTION *s)
         for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) {
             const SSL_CIPHER *c = sk_SSL_CIPHER_value(ciphers, i);
             int cipher_minprotover = SSL_CONNECTION_IS_DTLS(s)
-                                     ? c->min_dtls : c->min_tls;
+                ? c->min_dtls
+                : c->min_tls;
             int cipher_maxprotover = SSL_CONNECTION_IS_DTLS(s)
-                                     ? c->max_dtls : c->max_tls;
+                ? c->max_dtls
+                : c->max_tls;
 
             if (ssl_version_cmp(s, ver_max, cipher_minprotover) >= 0
-                    && ssl_version_cmp(s, ver_max, cipher_maxprotover) <= 0) {
+                && ssl_version_cmp(s, ver_max, cipher_maxprotover) <= 0) {
                 ok = 1;
                 break;
             }
         }
         if (!ok) {
             SSLfatal_data(s, SSL_AD_HANDSHAKE_FAILURE,
-                          SSL_R_NO_CIPHERS_AVAILABLE,
-                          "No ciphers enabled for max supported "
-                          "SSL/TLS version");
+                SSL_R_NO_CIPHERS_AVAILABLE,
+                "No ciphers enabled for max supported "
+                "SSL/TLS version");
             return 0;
         }
         if (SSL_IS_FIRST_HANDSHAKE(s)) {
@@ -231,7 +233,7 @@ int tls_setup_handshake(SSL_CONNECTION *s)
             ssl_tsan_counter(s->session_ctx, &s->session_ctx->stats.sess_connect);
         else
             ssl_tsan_counter(s->session_ctx,
-                         &s->session_ctx->stats.sess_connect_renegotiate);
+                &s->session_ctx->stats.sess_connect_renegotiate);
 
         /* mark client_random uninitialized */
         memset(s->s3.client_random, 0, sizeof(s->s3.client_random));
@@ -250,18 +252,18 @@ int tls_setup_handshake(SSL_CONNECTION *s)
  * Size of the to-be-signed TLS13 data, without the hash size itself:
  * 64 bytes of value 32, 33 context bytes, 1 byte separator
  */
-#define TLS13_TBS_START_SIZE            64
-#define TLS13_TBS_PREAMBLE_SIZE         (TLS13_TBS_START_SIZE + 33 + 1)
+#define TLS13_TBS_START_SIZE 64
+#define TLS13_TBS_PREAMBLE_SIZE (TLS13_TBS_START_SIZE + 33 + 1)
 
 static int get_cert_verify_tbs_data(SSL_CONNECTION *s, unsigned char *tls13tbs,
-                                    void **hdata, size_t *hdatalen)
+    void **hdata, size_t *hdatalen)
 {
     /* ASCII: "TLS 1.3, server CertificateVerify", in hex for EBCDIC compatibility */
     static const char servercontext[] = "\x54\x4c\x53\x20\x31\x2e\x33\x2c\x20\x73\x65\x72"
-        "\x76\x65\x72\x20\x43\x65\x72\x74\x69\x66\x69\x63\x61\x74\x65\x56\x65\x72\x69\x66\x79";
+                                        "\x76\x65\x72\x20\x43\x65\x72\x74\x69\x66\x69\x63\x61\x74\x65\x56\x65\x72\x69\x66\x79";
     /* ASCII: "TLS 1.3, client CertificateVerify", in hex for EBCDIC compatibility */
     static const char clientcontext[] = "\x54\x4c\x53\x20\x31\x2e\x33\x2c\x20\x63\x6c\x69"
-        "\x65\x6e\x74\x20\x43\x65\x72\x74\x69\x66\x69\x63\x61\x74\x65\x56\x65\x72\x69\x66\x79";
+                                        "\x65\x6e\x74\x20\x43\x65\x72\x74\x69\x66\x69\x63\x61\x74\x65\x56\x65\x72\x69\x66\x79";
 
     if (SSL_CONNECTION_IS_TLS13(s)) {
         size_t hashlen;
@@ -270,7 +272,7 @@ static int get_cert_verify_tbs_data(SSL_CONNECTION *s, unsigned char *tls13tbs,
         memset(tls13tbs, 32, TLS13_TBS_START_SIZE);
         /* This copies the 33 bytes of context plus the 0 separator byte */
         if (s->statem.hand_state == TLS_ST_CR_CERT_VRFY
-                 || s->statem.hand_state == TLS_ST_SW_CERT_VRFY)
+            || s->statem.hand_state == TLS_ST_SW_CERT_VRFY)
             strcpy((char *)tls13tbs + TLS13_TBS_START_SIZE, servercontext);
         else
             strcpy((char *)tls13tbs + TLS13_TBS_START_SIZE, clientcontext);
@@ -281,12 +283,12 @@ static int get_cert_verify_tbs_data(SSL_CONNECTION *s, unsigned char *tls13tbs,
          * that includes the CertVerify itself.
          */
         if (s->statem.hand_state == TLS_ST_CR_CERT_VRFY
-                || s->statem.hand_state == TLS_ST_SR_CERT_VRFY) {
+            || s->statem.hand_state == TLS_ST_SR_CERT_VRFY) {
             memcpy(tls13tbs + TLS13_TBS_PREAMBLE_SIZE, s->cert_verify_hash,
-                   s->cert_verify_hash_len);
+                s->cert_verify_hash_len);
             hashlen = s->cert_verify_hash_len;
         } else if (!ssl_handshake_hash(s, tls13tbs + TLS13_TBS_PREAMBLE_SIZE,
-                                       EVP_MAX_MD_SIZE, &hashlen)) {
+                       EVP_MAX_MD_SIZE, &hashlen)) {
             /* SSLfatal() already called */
             return 0;
         }
@@ -350,9 +352,10 @@ CON_FUNC_RETURN tls_construct_cert_verify(SSL_CONNECTION *s, WPACKET *pkt)
     }
 
     if (EVP_DigestSignInit_ex(mctx, &pctx,
-                              md == NULL ? NULL : EVP_MD_get0_name(md),
-                              sctx->libctx, sctx->propq, pkey,
-                              NULL) <= 0) {
+            md == NULL ? NULL : EVP_MD_get0_name(md),
+            sctx->libctx, sctx->propq, pkey,
+            NULL)
+        <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
         goto err;
     }
@@ -360,7 +363,8 @@ CON_FUNC_RETURN tls_construct_cert_verify(SSL_CONNECTION *s, WPACKET *pkt)
     if (lu->sig == EVP_PKEY_RSA_PSS) {
         if (EVP_PKEY_CTX_set_rsa_padding(pctx, RSA_PKCS1_PSS_PADDING) <= 0
             || EVP_PKEY_CTX_set_rsa_pss_saltlen(pctx,
-                                                RSA_PSS_SALTLEN_DIGEST) <= 0) {
+                   RSA_PSS_SALTLEN_DIGEST)
+                <= 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
             goto err;
         }
@@ -372,8 +376,9 @@ CON_FUNC_RETURN tls_construct_cert_verify(SSL_CONNECTION *s, WPACKET *pkt)
          */
         if (EVP_DigestSignUpdate(mctx, hdata, hdatalen) <= 0
             || EVP_MD_CTX_ctrl(mctx, EVP_CTRL_SSL3_MASTER_SECRET,
-                               (int)s->session->master_key_length,
-                               s->session->master_key) <= 0
+                   (int)s->session->master_key_length,
+                   s->session->master_key)
+                <= 0
             || EVP_DigestSignFinal(mctx, NULL, &siglen) <= 0) {
 
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
@@ -381,7 +386,7 @@ CON_FUNC_RETURN tls_construct_cert_verify(SSL_CONNECTION *s, WPACKET *pkt)
         }
         sig = OPENSSL_malloc(siglen);
         if (sig == NULL
-                || EVP_DigestSignFinal(mctx, sig, &siglen) <= 0) {
+            || EVP_DigestSignFinal(mctx, sig, &siglen) <= 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
             goto err;
         }
@@ -396,7 +401,7 @@ CON_FUNC_RETURN tls_construct_cert_verify(SSL_CONNECTION *s, WPACKET *pkt)
         }
         sig = OPENSSL_malloc(siglen);
         if (sig == NULL
-                || EVP_DigestSign(mctx, sig, &siglen, hdata, hdatalen) <= 0) {
+            || EVP_DigestSign(mctx, sig, &siglen, hdata, hdatalen) <= 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
             goto err;
         }
@@ -427,7 +432,7 @@ CON_FUNC_RETURN tls_construct_cert_verify(SSL_CONNECTION *s, WPACKET *pkt)
     OPENSSL_free(sig);
     EVP_MD_CTX_free(mctx);
     return CON_FUNC_SUCCESS;
- err:
+err:
     OPENSSL_free(sig);
     EVP_MD_CTX_free(mctx);
     return CON_FUNC_ERROR;
@@ -464,7 +469,7 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL_CONNECTION *s, PACKET *pkt)
 
     if (ssl_cert_lookup_by_pkey(pkey, NULL, sctx) == NULL) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                 SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE);
+            SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE);
         goto err;
     }
 
@@ -480,9 +485,9 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL_CONNECTION *s, PACKET *pkt)
             goto err;
         }
     } else if (!tls1_set_peer_legacy_sigalg(s, pkey)) {
-            SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                     SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED);
-            goto err;
+        SSLfatal(s, SSL_AD_INTERNAL_ERROR,
+            SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED);
+        goto err;
     }
 
     if (!tls1_lookup_md(sctx, s->s3.tmp.peer_sigalg, &md)) {
@@ -492,7 +497,7 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL_CONNECTION *s, PACKET *pkt)
 
     if (SSL_USE_SIGALGS(s))
         OSSL_TRACE1(TLS, "USING TLSv1.2 HASH %s\n",
-                    md == NULL ? "n/a" : EVP_MD_get0_name(md));
+            md == NULL ? "n/a" : EVP_MD_get0_name(md));
 
     /* Check for broken implementations of GOST ciphersuites */
     /*
@@ -502,14 +507,14 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL_CONNECTION *s, PACKET *pkt)
 #ifndef OPENSSL_NO_GOST
     if (!SSL_USE_SIGALGS(s)
         && ((PACKET_remaining(pkt) == 64
-             && (EVP_PKEY_get_id(pkey) == NID_id_GostR3410_2001
-                 || EVP_PKEY_get_id(pkey) == NID_id_GostR3410_2012_256))
+                && (EVP_PKEY_get_id(pkey) == NID_id_GostR3410_2001
+                    || EVP_PKEY_get_id(pkey) == NID_id_GostR3410_2012_256))
             || (PACKET_remaining(pkt) == 128
                 && EVP_PKEY_get_id(pkey) == NID_id_GostR3410_2012_512))) {
         len = PACKET_remaining(pkt);
     } else
 #endif
-    if (!PACKET_get_net_2(pkt, &len)) {
+        if (!PACKET_get_net_2(pkt, &len)) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
         goto err;
     }
@@ -529,12 +534,13 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL_CONNECTION *s, PACKET *pkt)
     }
 
     OSSL_TRACE1(TLS, "Using client verify alg %s\n",
-                md == NULL ? "n/a" : EVP_MD_get0_name(md));
+        md == NULL ? "n/a" : EVP_MD_get0_name(md));
 
     if (EVP_DigestVerifyInit_ex(mctx, &pctx,
-                                md == NULL ? NULL : EVP_MD_get0_name(md),
-                                sctx->libctx, sctx->propq, pkey,
-                                NULL) <= 0) {
+            md == NULL ? NULL : EVP_MD_get0_name(md),
+            sctx->libctx, sctx->propq, pkey,
+            NULL)
+        <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
         goto err;
     }
@@ -555,16 +561,18 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL_CONNECTION *s, PACKET *pkt)
     if (SSL_USE_PSS(s)) {
         if (EVP_PKEY_CTX_set_rsa_padding(pctx, RSA_PKCS1_PSS_PADDING) <= 0
             || EVP_PKEY_CTX_set_rsa_pss_saltlen(pctx,
-                                                RSA_PSS_SALTLEN_DIGEST) <= 0) {
+                   RSA_PSS_SALTLEN_DIGEST)
+                <= 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
             goto err;
         }
     }
     if (s->version == SSL3_VERSION) {
         if (EVP_DigestVerifyUpdate(mctx, hdata, hdatalen) <= 0
-                || EVP_MD_CTX_ctrl(mctx, EVP_CTRL_SSL3_MASTER_SECRET,
-                                   (int)s->session->master_key_length,
-                                    s->session->master_key) <= 0) {
+            || EVP_MD_CTX_ctrl(mctx, EVP_CTRL_SSL3_MASTER_SECRET,
+                   (int)s->session->master_key_length,
+                   s->session->master_key)
+                <= 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EVP_LIB);
             goto err;
         }
@@ -597,7 +605,7 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL_CONNECTION *s, PACKET *pkt)
         ret = MSG_PROCESS_CONTINUE_PROCESSING;
     else
         ret = MSG_PROCESS_CONTINUE_READING;
- err:
+err:
     BIO_free(s->s3.handshake_buffer);
     s->s3.handshake_buffer = NULL;
     EVP_MD_CTX_free(mctx);
@@ -625,12 +633,14 @@ CON_FUNC_RETURN tls_construct_finished(SSL_CONNECTION *s, WPACKET *pkt)
      * then we need to do it now.
      */
     if (SSL_CONNECTION_IS_TLS13(s)
-            && !s->server
-            && (s->early_data_state != SSL_EARLY_DATA_NONE
-                || (s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0)
-            && s->s3.tmp.cert_req == 0
-            && (!ssl->method->ssl3_enc->change_cipher_state(s,
-                    SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_CLIENT_WRITE))) {;
+        && !s->server
+        && !SSL_IS_QUIC_HANDSHAKE(s)
+        && (s->early_data_state != SSL_EARLY_DATA_NONE
+            || (s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0)
+        && s->s3.tmp.cert_req == 0
+        && (!ssl->method->ssl3_enc->change_cipher_state(s,
+            SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_CLIENT_WRITE))) {
+        ;
         /* SSLfatal() already called */
         return CON_FUNC_ERROR;
     }
@@ -644,8 +654,8 @@ CON_FUNC_RETURN tls_construct_finished(SSL_CONNECTION *s, WPACKET *pkt)
     }
 
     finish_md_len = ssl->method->ssl3_enc->final_finish_mac(s,
-                                                            sender, slen,
-                                                            s->s3.tmp.finish_md);
+        sender, slen,
+        s->s3.tmp.finish_md);
     if (finish_md_len == 0) {
         /* SSLfatal() already called */
         return CON_FUNC_ERROR;
@@ -664,7 +674,7 @@ CON_FUNC_RETURN tls_construct_finished(SSL_CONNECTION *s, WPACKET *pkt)
      */
     if (!SSL_CONNECTION_IS_TLS13(s)
         && !ssl_log_secret(s, MASTER_SECRET_LABEL, s->session->master_key,
-                           s->session->master_key_length)) {
+            s->session->master_key_length)) {
         /* SSLfatal() already called */
         return CON_FUNC_ERROR;
     }
@@ -678,11 +688,11 @@ CON_FUNC_RETURN tls_construct_finished(SSL_CONNECTION *s, WPACKET *pkt)
     }
     if (!s->server) {
         memcpy(s->s3.previous_client_finished, s->s3.tmp.finish_md,
-               finish_md_len);
+            finish_md_len);
         s->s3.previous_client_finished_len = finish_md_len;
     } else {
         memcpy(s->s3.previous_server_finished, s->s3.tmp.finish_md,
-               finish_md_len);
+            finish_md_len);
         s->s3.previous_server_finished_len = finish_md_len;
     }
 
@@ -714,7 +724,7 @@ MSG_PROCESS_RETURN tls_process_key_update(SSL_CONNECTION *s, PACKET *pkt)
     }
 
     if (!PACKET_get_1(pkt, &updatetype)
-            || PACKET_remaining(pkt) != 0) {
+        || PACKET_remaining(pkt) != 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_KEY_UPDATE);
         return MSG_PROCESS_ERROR;
     }
@@ -724,7 +734,7 @@ MSG_PROCESS_RETURN tls_process_key_update(SSL_CONNECTION *s, PACKET *pkt)
      * didn't recognise.
      */
     if (updatetype != SSL_KEY_UPDATE_NOT_REQUESTED
-            && updatetype != SSL_KEY_UPDATE_REQUESTED) {
+        && updatetype != SSL_KEY_UPDATE_REQUESTED) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_BAD_KEY_UPDATE);
         return MSG_PROCESS_ERROR;
     }
@@ -763,9 +773,8 @@ int ssl3_take_mac(SSL_CONNECTION *s)
         slen = ssl->method->ssl3_enc->client_finished_label_len;
     }
 
-    s->s3.tmp.peer_finish_md_len =
-        ssl->method->ssl3_enc->final_finish_mac(s, sender, slen,
-                                                s->s3.tmp.peer_finish_md);
+    s->s3.tmp.peer_finish_md_len = ssl->method->ssl3_enc->final_finish_mac(s, sender, slen,
+        s->s3.tmp.peer_finish_md);
 
     if (s->s3.tmp.peer_finish_md_len == 0) {
         /* SSLfatal() already called */
@@ -776,7 +785,7 @@ int ssl3_take_mac(SSL_CONNECTION *s)
 }
 
 MSG_PROCESS_RETURN tls_process_change_cipher_spec(SSL_CONNECTION *s,
-                                                  PACKET *pkt)
+    PACKET *pkt)
 {
     size_t remain;
 
@@ -788,7 +797,7 @@ MSG_PROCESS_RETURN tls_process_change_cipher_spec(SSL_CONNECTION *s,
      */
     if (SSL_CONNECTION_IS_DTLS(s)) {
         if ((s->version == DTLS1_BAD_VER
-             && remain != DTLS1_CCS_HEADER_LENGTH + 1)
+                && remain != DTLS1_CCS_HEADER_LENGTH + 1)
             || (s->version != DTLS1_BAD_VER
                 && remain != DTLS1_CCS_HEADER_LENGTH - 1)) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_BAD_CHANGE_CIPHER_SPEC);
@@ -824,7 +833,7 @@ MSG_PROCESS_RETURN tls_process_change_cipher_spec(SSL_CONNECTION *s,
          * SCTP is used
          */
         BIO_ctrl(SSL_get_wbio(SSL_CONNECTION_GET_SSL(s)),
-                 BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD, 1, NULL);
+            BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD, 1, NULL);
 #endif
     }
 
@@ -838,22 +847,21 @@ MSG_PROCESS_RETURN tls_process_finished(SSL_CONNECTION *s, PACKET *pkt)
     int was_first = SSL_IS_FIRST_HANDSHAKE(s);
     int ok;
 
-
     /* This is a real handshake so make sure we clean it up at the end */
     if (s->server) {
         /*
-        * To get this far we must have read encrypted data from the client. We
-        * no longer tolerate unencrypted alerts. This is ignored if less than
-        * TLSv1.3
-        */
+         * To get this far we must have read encrypted data from the client. We
+         * no longer tolerate unencrypted alerts. This is ignored if less than
+         * TLSv1.3
+         */
         if (s->rlayer.rrlmethod->set_plain_alerts != NULL)
             s->rlayer.rrlmethod->set_plain_alerts(s->rlayer.rrl, 0);
         if (s->post_handshake_auth != SSL_PHA_REQUESTED)
             s->statem.cleanuphand = 1;
         if (SSL_CONNECTION_IS_TLS13(s)
             && !tls13_save_handshake_digest_for_pha(s)) {
-                /* SSLfatal() already called */
-                return MSG_PROCESS_ERROR;
+            /* SSLfatal() already called */
+            return MSG_PROCESS_ERROR;
         }
     }
 
@@ -882,7 +890,7 @@ MSG_PROCESS_RETURN tls_process_finished(SSL_CONNECTION *s, PACKET *pkt)
     }
 
     ok = CRYPTO_memcmp(PACKET_data(pkt), s->s3.tmp.peer_finish_md,
-                       md_len);
+        md_len);
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
     if (ok != 0) {
         if ((PACKET_data(pkt)[0] ^ s->s3.tmp.peer_finish_md[0]) != 0xFF) {
@@ -904,11 +912,11 @@ MSG_PROCESS_RETURN tls_process_finished(SSL_CONNECTION *s, PACKET *pkt)
     }
     if (s->server) {
         memcpy(s->s3.previous_client_finished, s->s3.tmp.peer_finish_md,
-               md_len);
+            md_len);
         s->s3.previous_client_finished_len = md_len;
     } else {
         memcpy(s->s3.previous_server_finished, s->s3.tmp.peer_finish_md,
-               md_len);
+            md_len);
         s->s3.previous_server_finished_len = md_len;
     }
 
@@ -918,9 +926,7 @@ MSG_PROCESS_RETURN tls_process_finished(SSL_CONNECTION *s, PACKET *pkt)
      */
     if (SSL_CONNECTION_IS_TLS13(s)) {
         if (s->server) {
-            if (s->post_handshake_auth != SSL_PHA_REQUESTED &&
-                    !ssl->method->ssl3_enc->change_cipher_state(s,
-                        SSL3_CC_APPLICATION | SSL3_CHANGE_CIPHER_SERVER_READ)) {
+            if (s->post_handshake_auth != SSL_PHA_REQUESTED && !ssl->method->ssl3_enc->change_cipher_state(s, SSL3_CC_APPLICATION | SSL3_CHANGE_CIPHER_SERVER_READ)) {
                 /* SSLfatal() already called */
                 return MSG_PROCESS_ERROR;
             }
@@ -933,7 +939,21 @@ MSG_PROCESS_RETURN tls_process_finished(SSL_CONNECTION *s, PACKET *pkt)
                 /* SSLfatal() already called */
                 return MSG_PROCESS_ERROR;
             }
-            if (!ssl->method->ssl3_enc->change_cipher_state(s,
+            if (!tls13_store_server_finished_hash(s)) {
+                /* SSLfatal() already called */
+                return MSG_PROCESS_ERROR;
+            }
+
+            /*
+             * For non-QUIC we set up the client's app data read keys now, so
+             * that we can go straight into reading 0.5RTT data from the server.
+             * For QUIC we don't do that, and instead defer setting up the keys
+             * until after we have set up the write keys in order to ensure that
+             * write keys are always set up before read keys (so that if we read
+             * a message we have the correct keys in place to ack it)
+             */
+            if (!SSL_IS_QUIC_HANDSHAKE(s)
+                && !ssl->method->ssl3_enc->change_cipher_state(s,
                     SSL3_CC_APPLICATION | SSL3_CHANGE_CIPHER_CLIENT_READ)) {
                 /* SSLfatal() already called */
                 return MSG_PROCESS_ERROR;
@@ -946,8 +966,8 @@ MSG_PROCESS_RETURN tls_process_finished(SSL_CONNECTION *s, PACKET *pkt)
     }
 
     if (was_first
-            && !SSL_IS_FIRST_HANDSHAKE(s)
-            && s->rlayer.rrlmethod->set_first_handshake != NULL)
+        && !SSL_IS_FIRST_HANDSHAKE(s)
+        && s->rlayer.rrlmethod->set_first_handshake != NULL)
         s->rlayer.rrlmethod->set_first_handshake(s->rlayer.rrl, 0);
 
     return MSG_PROCESS_FINISHED_READING;
@@ -965,7 +985,7 @@ CON_FUNC_RETURN tls_construct_change_cipher_spec(SSL_CONNECTION *s, WPACKET *pkt
 
 /* Add a certificate to the WPACKET */
 static int ssl_add_cert_to_wpacket(SSL_CONNECTION *s, WPACKET *pkt,
-                                   X509 *x, int chain, int for_comp)
+    X509 *x, int chain, int for_comp)
 {
     int len;
     unsigned char *outbytes;
@@ -981,14 +1001,14 @@ static int ssl_add_cert_to_wpacket(SSL_CONNECTION *s, WPACKET *pkt,
         return 0;
     }
     if (!WPACKET_sub_allocate_bytes_u24(pkt, len, &outbytes)
-            || i2d_X509(x, &outbytes) != len) {
+        || i2d_X509(x, &outbytes) != len) {
         if (!for_comp)
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
 
     if ((SSL_CONNECTION_IS_TLS13(s) || for_comp)
-            && !tls_construct_extensions(s, pkt, context, x, chain)) {
+        && !tls_construct_extensions(s, pkt, context, x, chain)) {
         /* SSLfatal() already called */
         return 0;
     }
@@ -1028,7 +1048,7 @@ static int ssl_add_cert_chain(SSL_CONNECTION *s, WPACKET *pkt, CERT_PKEY *cpk, i
 
     if (chain_store != NULL) {
         X509_STORE_CTX *xs_ctx = X509_STORE_CTX_new_ex(sctx->libctx,
-                                                       sctx->propq);
+            sctx->propq);
 
         if (xs_ctx == NULL) {
             if (!for_comp)
@@ -1097,7 +1117,7 @@ static int ssl_add_cert_chain(SSL_CONNECTION *s, WPACKET *pkt, CERT_PKEY *cpk, i
     return 1;
 }
 
-EVP_PKEY* tls_get_peer_pkey(const SSL_CONNECTION *sc)
+EVP_PKEY *tls_get_peer_pkey(const SSL_CONNECTION *sc)
 {
     if (sc->session->peer_rpk != NULL)
         return sc->session->peer_rpk;
@@ -1259,13 +1279,13 @@ int tls_process_rpk(SSL_CONNECTION *sc, PACKET *pkt, EVP_PKEY **peer_rpk)
     }
     spkistart = spki;
     if ((pkey = d2i_PUBKEY_ex(NULL, &spki, spki_len, sctx->libctx, sctx->propq)) == NULL
-            || spki != (spkistart + spki_len)) {
+        || spki != (spkistart + spki_len)) {
         SSLfatal(sc, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
         goto err;
     }
     if (EVP_PKEY_missing_parameters(pkey)) {
         SSLfatal(sc, SSL_AD_INTERNAL_ERROR,
-                 SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
+            SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
         goto err;
     }
 
@@ -1276,18 +1296,18 @@ int tls_process_rpk(SSL_CONNECTION *sc, PACKET *pkt, EVP_PKEY **peer_rpk)
             goto err;
         }
         if (!PACKET_as_length_prefixed_2(pkt, &extensions)
-                || PACKET_remaining(pkt) != 0) {
+            || PACKET_remaining(pkt) != 0) {
             SSLfatal(sc, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
             goto err;
         }
         if (!tls_collect_extensions(sc, &extensions, SSL_EXT_TLS1_3_RAW_PUBLIC_KEY,
-                                    &rawexts, NULL, 1)) {
+                &rawexts, NULL, 1)) {
             /* SSLfatal already called */
             goto err;
         }
         /* chain index is always zero and fin always 1 for RPK */
         if (!tls_parse_all_extensions(sc, SSL_EXT_TLS1_3_RAW_PUBLIC_KEY,
-                                      rawexts, NULL, 0, 1)) {
+                rawexts, NULL, 0, 1)) {
             /* SSLfatal already called */
             goto err;
         }
@@ -1298,7 +1318,7 @@ int tls_process_rpk(SSL_CONNECTION *sc, PACKET *pkt, EVP_PKEY **peer_rpk)
         pkey = NULL;
     }
 
- err:
+err:
     OPENSSL_free(rawexts);
     EVP_PKEY_free(pkey);
     return ret;
@@ -1366,7 +1386,7 @@ unsigned long tls_output_rpk(SSL_CONNECTION *sc, WPACKET *pkt, CERT_PKEY *cpk)
          * |x509| may be NULL, which raw public-key extensions need to handle.
          */
         if (!tls_construct_extensions(sc, pkt, SSL_EXT_TLS1_3_RAW_PUBLIC_KEY,
-                                      x509, 0)) {
+                x509, 0)) {
             /* SSLfatal() already called */
             goto err;
         }
@@ -1377,13 +1397,13 @@ unsigned long tls_output_rpk(SSL_CONNECTION *sc, WPACKET *pkt, CERT_PKEY *cpk)
     }
 
     ret = 1;
- err:
+err:
     OPENSSL_free(pdata);
     return ret;
 }
 
 unsigned long ssl3_output_cert_chain(SSL_CONNECTION *s, WPACKET *pkt,
-                                     CERT_PKEY *cpk, int for_comp)
+    CERT_PKEY *cpk, int for_comp)
 {
     if (!WPACKET_start_sub_packet_u24(pkt)) {
         if (!for_comp)
@@ -1409,9 +1429,9 @@ unsigned long ssl3_output_cert_chain(SSL_CONNECTION *s, WPACKET *pkt,
  * freed up as well.
  */
 WORK_STATE tls_finish_handshake(SSL_CONNECTION *s, ossl_unused WORK_STATE wst,
-                                int clearbufs, int stop)
+    int clearbufs, int stop)
 {
-    void (*cb) (const SSL *ssl, int type, int val) = NULL;
+    void (*cb)(const SSL *ssl, int type, int val) = NULL;
     int cleanuphand = s->statem.cleanuphand;
     SSL *ssl = SSL_CONNECTION_GET_USER_SSL(s);
     SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(s);
@@ -1427,7 +1447,7 @@ WORK_STATE tls_finish_handshake(SSL_CONNECTION *s, ossl_unused WORK_STATE wst,
              */
             || BIO_dgram_is_sctp(SSL_get_wbio(SSL_CONNECTION_GET_SSL(s)))
 #endif
-            ) {
+        ) {
             /*
              * We don't do this in DTLS over UDP because we may still need the init_buf
              * in case there are any unexpected retransmits
@@ -1444,7 +1464,7 @@ WORK_STATE tls_finish_handshake(SSL_CONNECTION *s, ossl_unused WORK_STATE wst,
     }
 
     if (SSL_CONNECTION_IS_TLS13(s) && !s->server
-            && s->post_handshake_auth == SSL_PHA_REQUESTED)
+        && s->post_handshake_auth == SSL_PHA_REQUESTED)
         s->post_handshake_auth = SSL_PHA_EXT_SENT;
 
     /*
@@ -1478,7 +1498,8 @@ WORK_STATE tls_finish_handshake(SSL_CONNECTION *s, ossl_unused WORK_STATE wst,
                  * so we remove this one from the cache.
                  */
                 if ((s->session_ctx->session_cache_mode
-                     & SSL_SESS_CACHE_CLIENT) != 0)
+                        & SSL_SESS_CACHE_CLIENT)
+                    != 0)
                     SSL_CTX_remove_session(s->session_ctx, s->session);
             } else {
                 /*
@@ -1489,11 +1510,11 @@ WORK_STATE tls_finish_handshake(SSL_CONNECTION *s, ossl_unused WORK_STATE wst,
             }
             if (s->hit)
                 ssl_tsan_counter(s->session_ctx,
-                                 &s->session_ctx->stats.sess_hit);
+                    &s->session_ctx->stats.sess_hit);
 
             s->handshake_func = ossl_statem_connect;
             ssl_tsan_counter(s->session_ctx,
-                             &s->session_ctx->stats.sess_connect_good);
+                &s->session_ctx->stats.sess_connect_good);
         }
 
         if (SSL_CONNECTION_IS_DTLS(s)) {
@@ -1515,8 +1536,8 @@ WORK_STATE tls_finish_handshake(SSL_CONNECTION *s, ossl_unused WORK_STATE wst,
 
     if (cb != NULL) {
         if (cleanuphand
-                || !SSL_CONNECTION_IS_TLS13(s)
-                || SSL_IS_FIRST_HANDSHAKE(s))
+            || !SSL_CONNECTION_IS_TLS13(s)
+            || SSL_IS_FIRST_HANDSHAKE(s))
             cb(ssl, SSL_CB_HANDSHAKE_DONE, 1);
     }
 
@@ -1544,9 +1565,9 @@ int tls_get_message_header(SSL_CONNECTION *s, int *mt)
     do {
         while (s->init_num < SSL3_HM_HEADER_LENGTH) {
             i = ssl->method->ssl_read_bytes(ssl, SSL3_RT_HANDSHAKE, &recvd_type,
-                                            &p[s->init_num],
-                                            SSL3_HM_HEADER_LENGTH - s->init_num,
-                                            0, &readbytes);
+                &p[s->init_num],
+                SSL3_HM_HEADER_LENGTH - s->init_num,
+                0, &readbytes);
             if (i <= 0) {
                 s->rwstate = SSL_READING;
                 return 0;
@@ -1558,11 +1579,11 @@ int tls_get_message_header(SSL_CONNECTION *s, int *mt)
                  */
                 if (s->init_num != 0 || readbytes != 1 || p[0] != SSL3_MT_CCS) {
                     SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE,
-                             SSL_R_BAD_CHANGE_CIPHER_SPEC);
+                        SSL_R_BAD_CHANGE_CIPHER_SPEC);
                     return 0;
                 }
                 if (s->statem.hand_state == TLS_ST_BEFORE
-                        && (s->s3.flags & TLS1_FLAGS_STATELESS) != 0) {
+                    && (s->s3.flags & TLS1_FLAGS_STATELESS) != 0) {
                     /*
                      * We are stateless and we received a CCS. Probably this is
                      * from a client between the first and second ClientHellos.
@@ -1579,7 +1600,7 @@ int tls_get_message_header(SSL_CONNECTION *s, int *mt)
                 return 1;
             } else if (recvd_type != SSL3_RT_HANDSHAKE) {
                 SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE,
-                         SSL_R_CCS_RECEIVED_EARLY);
+                    SSL_R_CCS_RECEIVED_EARLY);
                 return 0;
             }
             s->init_num += readbytes;
@@ -1588,7 +1609,7 @@ int tls_get_message_header(SSL_CONNECTION *s, int *mt)
         skip_message = 0;
         if (!s->server)
             if (s->statem.hand_state != TLS_ST_OK
-                    && p[0] == SSL3_MT_HELLO_REQUEST)
+                && p[0] == SSL3_MT_HELLO_REQUEST)
                 /*
                  * The server may always send 'Hello Request' messages --
                  * we are doing a handshake anyway now, so ignore them if
@@ -1601,8 +1622,8 @@ int tls_get_message_header(SSL_CONNECTION *s, int *mt)
 
                     if (s->msg_callback)
                         s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
-                                        p, SSL3_HM_HEADER_LENGTH, ussl,
-                                        s->msg_callback_arg);
+                            p, SSL3_HM_HEADER_LENGTH, ussl,
+                            s->msg_callback_arg);
                 }
     } while (skip_message);
     /* s->init_num == SSL3_HM_HEADER_LENGTH */
@@ -1628,7 +1649,7 @@ int tls_get_message_header(SSL_CONNECTION *s, int *mt)
         /* BUF_MEM_grow takes an 'int' parameter */
         if (l > (INT_MAX - SSL3_HM_HEADER_LENGTH)) {
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                     SSL_R_EXCESSIVE_MESSAGE_SIZE);
+                SSL_R_EXCESSIVE_MESSAGE_SIZE);
             return 0;
         }
         s->s3.tmp.message_size = l;
@@ -1658,7 +1679,7 @@ int tls_get_message_body(SSL_CONNECTION *s, size_t *len)
     n = s->s3.tmp.message_size - s->init_num;
     while (n > 0) {
         i = ssl->method->ssl_read_bytes(ssl, SSL3_RT_HANDSHAKE, NULL,
-                                        &p[s->init_num], n, 0, &readbytes);
+            &p[s->init_num], n, 0, &readbytes);
         if (i <= 0) {
             s->rwstate = SSL_READING;
             *len = 0;
@@ -1681,14 +1702,14 @@ int tls_get_message_body(SSL_CONNECTION *s, size_t *len)
     /* Feed this message into MAC computation. */
     if (RECORD_LAYER_is_sslv2_record(&s->rlayer)) {
         if (!ssl3_finish_mac(s, (unsigned char *)s->init_buf->data,
-                             s->init_num)) {
+                s->init_num)) {
             /* SSLfatal() already called */
             *len = 0;
             return 0;
         }
         if (s->msg_callback)
             s->msg_callback(0, SSL2_VERSION, 0, s->init_buf->data,
-                            (size_t)s->init_num, ussl, s->msg_callback_arg);
+                (size_t)s->init_num, ussl, s->msg_callback_arg);
     } else {
         /*
          * We defer feeding in the HRR until later. We'll do it as part of
@@ -1696,18 +1717,19 @@ int tls_get_message_body(SSL_CONNECTION *s, size_t *len)
          * The TLsv1.3 handshake transcript stops at the ClientFinished
          * message.
          */
-#define SERVER_HELLO_RANDOM_OFFSET  (SSL3_HM_HEADER_LENGTH + 2)
+#define SERVER_HELLO_RANDOM_OFFSET (SSL3_HM_HEADER_LENGTH + 2)
         /* KeyUpdate and NewSessionTicket do not need to be added */
         if (!SSL_CONNECTION_IS_TLS13(s)
             || (s->s3.tmp.message_type != SSL3_MT_NEWSESSION_TICKET
-                         && s->s3.tmp.message_type != SSL3_MT_KEY_UPDATE)) {
+                && s->s3.tmp.message_type != SSL3_MT_KEY_UPDATE)) {
             if (s->s3.tmp.message_type != SSL3_MT_SERVER_HELLO
-                    || s->init_num < SERVER_HELLO_RANDOM_OFFSET + SSL3_RANDOM_SIZE
-                    || memcmp(hrrrandom,
-                              s->init_buf->data + SERVER_HELLO_RANDOM_OFFSET,
-                              SSL3_RANDOM_SIZE) != 0) {
+                || s->init_num < SERVER_HELLO_RANDOM_OFFSET + SSL3_RANDOM_SIZE
+                || memcmp(hrrrandom,
+                       s->init_buf->data + SERVER_HELLO_RANDOM_OFFSET,
+                       SSL3_RANDOM_SIZE)
+                    != 0) {
                 if (!ssl3_finish_mac(s, (unsigned char *)s->init_buf->data,
-                                     s->init_num + SSL3_HM_HEADER_LENGTH)) {
+                        s->init_num + SSL3_HM_HEADER_LENGTH)) {
                     /* SSLfatal() already called */
                     *len = 0;
                     return 0;
@@ -1716,8 +1738,8 @@ int tls_get_message_body(SSL_CONNECTION *s, size_t *len)
         }
         if (s->msg_callback)
             s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->init_buf->data,
-                            (size_t)s->init_num + SSL3_HM_HEADER_LENGTH, ussl,
-                            s->msg_callback_arg);
+                (size_t)s->init_num + SSL3_HM_HEADER_LENGTH, ussl,
+                s->msg_callback_arg);
     }
 
     *len = s->init_num;
@@ -1725,49 +1747,49 @@ int tls_get_message_body(SSL_CONNECTION *s, size_t *len)
 }
 
 static const X509ERR2ALERT x509table[] = {
-    {X509_V_ERR_APPLICATION_VERIFICATION, SSL_AD_HANDSHAKE_FAILURE},
-    {X509_V_ERR_CA_KEY_TOO_SMALL, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_EC_KEY_EXPLICIT_PARAMS, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_CA_MD_TOO_WEAK, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_CERT_CHAIN_TOO_LONG, SSL_AD_UNKNOWN_CA},
-    {X509_V_ERR_CERT_HAS_EXPIRED, SSL_AD_CERTIFICATE_EXPIRED},
-    {X509_V_ERR_CERT_NOT_YET_VALID, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_CERT_REJECTED, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_CERT_REVOKED, SSL_AD_CERTIFICATE_REVOKED},
-    {X509_V_ERR_CERT_SIGNATURE_FAILURE, SSL_AD_DECRYPT_ERROR},
-    {X509_V_ERR_CERT_UNTRUSTED, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_CRL_HAS_EXPIRED, SSL_AD_CERTIFICATE_EXPIRED},
-    {X509_V_ERR_CRL_NOT_YET_VALID, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_CRL_SIGNATURE_FAILURE, SSL_AD_DECRYPT_ERROR},
-    {X509_V_ERR_DANE_NO_MATCH, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT, SSL_AD_UNKNOWN_CA},
-    {X509_V_ERR_EE_KEY_TOO_SMALL, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_EMAIL_MISMATCH, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_HOSTNAME_MISMATCH, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_INVALID_CA, SSL_AD_UNKNOWN_CA},
-    {X509_V_ERR_INVALID_CALL, SSL_AD_INTERNAL_ERROR},
-    {X509_V_ERR_INVALID_PURPOSE, SSL_AD_UNSUPPORTED_CERTIFICATE},
-    {X509_V_ERR_IP_ADDRESS_MISMATCH, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_OUT_OF_MEM, SSL_AD_INTERNAL_ERROR},
-    {X509_V_ERR_PATH_LENGTH_EXCEEDED, SSL_AD_UNKNOWN_CA},
-    {X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN, SSL_AD_UNKNOWN_CA},
-    {X509_V_ERR_STORE_LOOKUP, SSL_AD_INTERNAL_ERROR},
-    {X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE, SSL_AD_BAD_CERTIFICATE},
-    {X509_V_ERR_UNABLE_TO_GET_CRL, SSL_AD_UNKNOWN_CA},
-    {X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER, SSL_AD_UNKNOWN_CA},
-    {X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT, SSL_AD_UNKNOWN_CA},
-    {X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, SSL_AD_UNKNOWN_CA},
-    {X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, SSL_AD_UNKNOWN_CA},
-    {X509_V_ERR_UNSPECIFIED, SSL_AD_INTERNAL_ERROR},
+    { X509_V_ERR_APPLICATION_VERIFICATION, SSL_AD_HANDSHAKE_FAILURE },
+    { X509_V_ERR_CA_KEY_TOO_SMALL, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_EC_KEY_EXPLICIT_PARAMS, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_CA_MD_TOO_WEAK, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_CERT_CHAIN_TOO_LONG, SSL_AD_UNKNOWN_CA },
+    { X509_V_ERR_CERT_HAS_EXPIRED, SSL_AD_CERTIFICATE_EXPIRED },
+    { X509_V_ERR_CERT_NOT_YET_VALID, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_CERT_REJECTED, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_CERT_REVOKED, SSL_AD_CERTIFICATE_REVOKED },
+    { X509_V_ERR_CERT_SIGNATURE_FAILURE, SSL_AD_DECRYPT_ERROR },
+    { X509_V_ERR_CERT_UNTRUSTED, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_CRL_HAS_EXPIRED, SSL_AD_CERTIFICATE_EXPIRED },
+    { X509_V_ERR_CRL_NOT_YET_VALID, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_CRL_SIGNATURE_FAILURE, SSL_AD_DECRYPT_ERROR },
+    { X509_V_ERR_DANE_NO_MATCH, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT, SSL_AD_UNKNOWN_CA },
+    { X509_V_ERR_EE_KEY_TOO_SMALL, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_EMAIL_MISMATCH, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_HOSTNAME_MISMATCH, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_INVALID_CA, SSL_AD_UNKNOWN_CA },
+    { X509_V_ERR_INVALID_CALL, SSL_AD_INTERNAL_ERROR },
+    { X509_V_ERR_INVALID_PURPOSE, SSL_AD_UNSUPPORTED_CERTIFICATE },
+    { X509_V_ERR_IP_ADDRESS_MISMATCH, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_OUT_OF_MEM, SSL_AD_INTERNAL_ERROR },
+    { X509_V_ERR_PATH_LENGTH_EXCEEDED, SSL_AD_UNKNOWN_CA },
+    { X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN, SSL_AD_UNKNOWN_CA },
+    { X509_V_ERR_STORE_LOOKUP, SSL_AD_INTERNAL_ERROR },
+    { X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE, SSL_AD_BAD_CERTIFICATE },
+    { X509_V_ERR_UNABLE_TO_GET_CRL, SSL_AD_UNKNOWN_CA },
+    { X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER, SSL_AD_UNKNOWN_CA },
+    { X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT, SSL_AD_UNKNOWN_CA },
+    { X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, SSL_AD_UNKNOWN_CA },
+    { X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, SSL_AD_UNKNOWN_CA },
+    { X509_V_ERR_UNSPECIFIED, SSL_AD_INTERNAL_ERROR },
 
     /* Last entry; return this if we don't find the value above. */
-    {X509_V_OK, SSL_AD_CERTIFICATE_UNKNOWN}
+    { X509_V_OK, SSL_AD_CERTIFICATE_UNKNOWN }
 };
 
 int ssl_x509err2alert(int x509err)
@@ -1808,63 +1830,63 @@ int ssl_version_cmp(const SSL_CONNECTION *s, int versiona, int versionb)
 
 typedef struct {
     int version;
-    const SSL_METHOD *(*cmeth) (void);
-    const SSL_METHOD *(*smeth) (void);
+    const SSL_METHOD *(*cmeth)(void);
+    const SSL_METHOD *(*smeth)(void);
 } version_info;
 
 #if TLS_MAX_VERSION_INTERNAL != TLS1_3_VERSION
-# error Code needs update for TLS_method() support beyond TLS1_3_VERSION.
+#error Code needs update for TLS_method() support beyond TLS1_3_VERSION.
 #endif
 
 /* Must be in order high to low */
 static const version_info tls_version_table[] = {
 #ifndef OPENSSL_NO_TLS1_3
-    {TLS1_3_VERSION, tlsv1_3_client_method, tlsv1_3_server_method},
+    { TLS1_3_VERSION, tlsv1_3_client_method, tlsv1_3_server_method },
 #else
-    {TLS1_3_VERSION, NULL, NULL},
+    { TLS1_3_VERSION, NULL, NULL },
 #endif
 #ifndef OPENSSL_NO_TLS1_2
-    {TLS1_2_VERSION, tlsv1_2_client_method, tlsv1_2_server_method},
+    { TLS1_2_VERSION, tlsv1_2_client_method, tlsv1_2_server_method },
 #else
-    {TLS1_2_VERSION, NULL, NULL},
+    { TLS1_2_VERSION, NULL, NULL },
 #endif
 #ifndef OPENSSL_NO_TLS1_1
-    {TLS1_1_VERSION, tlsv1_1_client_method, tlsv1_1_server_method},
+    { TLS1_1_VERSION, tlsv1_1_client_method, tlsv1_1_server_method },
 #else
-    {TLS1_1_VERSION, NULL, NULL},
+    { TLS1_1_VERSION, NULL, NULL },
 #endif
 #ifndef OPENSSL_NO_TLS1
-    {TLS1_VERSION, tlsv1_client_method, tlsv1_server_method},
+    { TLS1_VERSION, tlsv1_client_method, tlsv1_server_method },
 #else
-    {TLS1_VERSION, NULL, NULL},
+    { TLS1_VERSION, NULL, NULL },
 #endif
 #ifndef OPENSSL_NO_SSL3
-    {SSL3_VERSION, sslv3_client_method, sslv3_server_method},
+    { SSL3_VERSION, sslv3_client_method, sslv3_server_method },
 #else
-    {SSL3_VERSION, NULL, NULL},
+    { SSL3_VERSION, NULL, NULL },
 #endif
-    {0, NULL, NULL},
+    { 0, NULL, NULL },
 };
 
 #if DTLS_MAX_VERSION_INTERNAL != DTLS1_2_VERSION
-# error Code needs update for DTLS_method() support beyond DTLS1_2_VERSION.
+#error Code needs update for DTLS_method() support beyond DTLS1_2_VERSION.
 #endif
 
 /* Must be in order high to low */
 static const version_info dtls_version_table[] = {
 #ifndef OPENSSL_NO_DTLS1_2
-    {DTLS1_2_VERSION, dtlsv1_2_client_method, dtlsv1_2_server_method},
+    { DTLS1_2_VERSION, dtlsv1_2_client_method, dtlsv1_2_server_method },
 #else
-    {DTLS1_2_VERSION, NULL, NULL},
+    { DTLS1_2_VERSION, NULL, NULL },
 #endif
 #ifndef OPENSSL_NO_DTLS1
-    {DTLS1_VERSION, dtlsv1_client_method, dtlsv1_server_method},
-    {DTLS1_BAD_VER, dtls_bad_ver_client_method, NULL},
+    { DTLS1_VERSION, dtlsv1_client_method, dtlsv1_server_method },
+    { DTLS1_BAD_VER, dtls_bad_ver_client_method, NULL },
 #else
-    {DTLS1_VERSION, NULL, NULL},
-    {DTLS1_BAD_VER, NULL, NULL},
+    { DTLS1_VERSION, NULL, NULL },
+    { DTLS1_BAD_VER, NULL, NULL },
 #endif
-    {0, NULL, NULL},
+    { 0, NULL, NULL },
 };
 
 /*
@@ -1879,13 +1901,10 @@ static int ssl_method_error(const SSL_CONNECTION *s, const SSL_METHOD *method)
 {
     int version = method->version;
 
-    if ((s->min_proto_version != 0 &&
-        ssl_version_cmp(s, version, s->min_proto_version) < 0) ||
-        ssl_security(s, SSL_SECOP_VERSION, 0, version, NULL) == 0)
+    if ((s->min_proto_version != 0 && ssl_version_cmp(s, version, s->min_proto_version) < 0) || ssl_security(s, SSL_SECOP_VERSION, 0, version, NULL) == 0)
         return SSL_R_VERSION_TOO_LOW;
 
-    if (s->max_proto_version != 0 &&
-        ssl_version_cmp(s, version, s->max_proto_version) > 0)
+    if (s->max_proto_version != 0 && ssl_version_cmp(s, version, s->max_proto_version) > 0)
         return SSL_R_VERSION_TOO_HIGH;
 
     if ((s->options & method->mask) != 0)
@@ -1915,7 +1934,7 @@ static int is_tls13_capable(const SSL_CONNECTION *s)
      * cb is set then we just assume TLSv1.3 will be ok
      */
     if (sctx->ext.servername_cb != NULL
-            || s->session_ctx->ext.servername_cb != NULL)
+        || s->session_ctx->ext.servername_cb != NULL)
         return 1;
 
 #ifndef OPENSSL_NO_PSK
@@ -1965,7 +1984,7 @@ static int is_tls13_capable(const SSL_CONNECTION *s)
  * Returns 1 when supported, otherwise 0
  */
 int ssl_version_supported(const SSL_CONNECTION *s, int version,
-                          const SSL_METHOD **meth)
+    const SSL_METHOD **meth)
 {
     const version_info *vent;
     const version_info *table;
@@ -1983,17 +2002,17 @@ int ssl_version_supported(const SSL_CONNECTION *s, int version,
     }
 
     for (vent = table;
-         vent->version != 0 && ssl_version_cmp(s, version, vent->version) <= 0;
-         ++vent) {
+        vent->version != 0 && ssl_version_cmp(s, version, vent->version) <= 0;
+        ++vent) {
         const SSL_METHOD *(*thismeth)(void) = s->server ? vent->smeth
                                                         : vent->cmeth;
 
         if (thismeth != NULL
-                && ssl_version_cmp(s, version, vent->version) == 0
-                && ssl_method_error(s, thismeth()) == 0
-                && (!s->server
-                    || version != TLS1_3_VERSION
-                    || is_tls13_capable(s))) {
+            && ssl_version_cmp(s, version, vent->version) == 0
+            && ssl_method_error(s, thismeth()) == 0
+            && (!s->server
+                || version != TLS1_3_VERSION
+                || is_tls13_capable(s))) {
             if (meth != NULL)
                 *meth = thismeth();
             return 1;
@@ -2111,18 +2130,18 @@ int ssl_set_version_bound(int method_version, int version, int *bound)
 static void check_for_downgrade(SSL_CONNECTION *s, int vers, DOWNGRADE *dgrd)
 {
     if (vers == TLS1_2_VERSION
-            && ssl_version_supported(s, TLS1_3_VERSION, NULL)) {
+        && ssl_version_supported(s, TLS1_3_VERSION, NULL)) {
         *dgrd = DOWNGRADE_TO_1_2;
     } else if (!SSL_CONNECTION_IS_DTLS(s)
-            && vers < TLS1_2_VERSION
-               /*
-                * We need to ensure that a server that disables TLSv1.2
-                * (creating a hole between TLSv1.3 and TLSv1.1) can still
-                * complete handshakes with clients that support TLSv1.2 and
-                * below. Therefore we do not enable the sentinel if TLSv1.3 is
-                * enabled and TLSv1.2 is not.
-                */
-            && ssl_version_supported(s, TLS1_2_VERSION, NULL)) {
+        && vers < TLS1_2_VERSION
+        /*
+         * We need to ensure that a server that disables TLSv1.2
+         * (creating a hole between TLSv1.3 and TLSv1.1) can still
+         * complete handshakes with clients that support TLSv1.2 and
+         * below. Therefore we do not enable the sentinel if TLSv1.3 is
+         * enabled and TLSv1.2 is not.
+         */
+        && ssl_version_supported(s, TLS1_2_VERSION, NULL)) {
         *dgrd = DOWNGRADE_TO_1_1;
     } else {
         *dgrd = DOWNGRADE_NONE;
@@ -2139,7 +2158,7 @@ static void check_for_downgrade(SSL_CONNECTION *s, int vers, DOWNGRADE *dgrd)
  * Returns 0 on success or an SSL error reason number on failure.
  */
 int ssl_choose_server_version(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello,
-                              DOWNGRADE *dgrd)
+    DOWNGRADE *dgrd)
 {
     /*-
      * With version-flexible methods we have an initial state with:
@@ -2265,8 +2284,7 @@ int ssl_choose_server_version(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello,
     for (vent = table; vent->version != 0; ++vent) {
         const SSL_METHOD *method;
 
-        if (vent->smeth == NULL ||
-            ssl_version_cmp(s, client_version, vent->version) < 0)
+        if (vent->smeth == NULL || ssl_version_cmp(s, client_version, vent->version) < 0)
             continue;
         method = vent->smeth();
         if (ssl_method_error(s, method) == 0) {
@@ -2295,7 +2313,7 @@ int ssl_choose_server_version(SSL_CONNECTION *s, CLIENTHELLO_MSG *hello,
  * Returns 1 on success or 0 on error.
  */
 int ssl_choose_client_version(SSL_CONNECTION *s, int version,
-                              RAW_EXTENSION *extensions)
+    RAW_EXTENSION *extensions)
 {
     const version_info *vent;
     const version_info *table;
@@ -2307,15 +2325,16 @@ int ssl_choose_client_version(SSL_CONNECTION *s, int version,
 
     /* This will overwrite s->version if the extension is present */
     if (!tls_parse_extension(s, TLSEXT_IDX_supported_versions,
-                             SSL_EXT_TLS1_2_SERVER_HELLO
-                             | SSL_EXT_TLS1_3_SERVER_HELLO, extensions,
-                             NULL, 0)) {
+            SSL_EXT_TLS1_2_SERVER_HELLO
+                | SSL_EXT_TLS1_3_SERVER_HELLO,
+            extensions,
+            NULL, 0)) {
         s->version = origv;
         return 0;
     }
 
     if (s->hello_retry_request != SSL_HRR_NONE
-            && s->version != TLS1_3_VERSION) {
+        && s->version != TLS1_3_VERSION) {
         s->version = origv;
         SSLfatal(s, SSL_AD_PROTOCOL_VERSION, SSL_R_WRONG_SSL_VERSION);
         return 0;
@@ -2365,26 +2384,29 @@ int ssl_choose_client_version(SSL_CONNECTION *s, int version,
         real_max = ver_max;
 
     /* Check for downgrades */
-    if (s->version == TLS1_2_VERSION && real_max > s->version) {
-        if (memcmp(tls12downgrade,
-                   s->s3.server_random + SSL3_RANDOM_SIZE
-                                        - sizeof(tls12downgrade),
-                   sizeof(tls12downgrade)) == 0) {
+    /* TODO(DTLSv1.3): Update this code for DTLSv1.3 */
+    if (!SSL_CONNECTION_IS_DTLS(s) && real_max > s->version) {
+        /* Signal applies to all versions */
+        if (memcmp(tls11downgrade,
+                s->s3.server_random + SSL3_RANDOM_SIZE
+                    - sizeof(tls11downgrade),
+                sizeof(tls11downgrade))
+            == 0) {
             s->version = origv;
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                     SSL_R_INAPPROPRIATE_FALLBACK);
+                SSL_R_INAPPROPRIATE_FALLBACK);
             return 0;
         }
-    } else if (!SSL_CONNECTION_IS_DTLS(s)
-               && s->version < TLS1_2_VERSION
-               && real_max > s->version) {
-        if (memcmp(tls11downgrade,
+        /* Only when accepting TLS1.3 */
+        if (real_max == TLS1_3_VERSION
+            && memcmp(tls12downgrade,
                    s->s3.server_random + SSL3_RANDOM_SIZE
-                                        - sizeof(tls11downgrade),
-                   sizeof(tls11downgrade)) == 0) {
+                       - sizeof(tls12downgrade),
+                   sizeof(tls12downgrade))
+                == 0) {
             s->version = origv;
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                     SSL_R_INAPPROPRIATE_FALLBACK);
+                SSL_R_INAPPROPRIATE_FALLBACK);
             return 0;
         }
     }
@@ -2429,7 +2451,7 @@ int ssl_choose_client_version(SSL_CONNECTION *s, int version,
  * min_version and max_version will also be set to 0.
  */
 int ssl_get_min_max_version(const SSL_CONNECTION *s, int *min_version,
-                            int *max_version, int *real_max)
+    int *max_version, int *real_max)
 {
     int version, tmp_real_max;
     int hole;
@@ -2580,7 +2602,7 @@ int ssl_set_client_hello_version(SSL_CONNECTION *s)
  * where the group was found.
  */
 int check_in_list(SSL_CONNECTION *s, uint16_t group_id, const uint16_t *groups,
-                  size_t num_groups, int checkallow, size_t *pos)
+    size_t num_groups, int checkallow, size_t *pos)
 {
     size_t i;
 
@@ -2591,8 +2613,8 @@ int check_in_list(SSL_CONNECTION *s, uint16_t group_id, const uint16_t *groups,
         uint16_t group = groups[i];
 
         if (group_id == group
-                && (!checkallow
-                    || tls_group_allowed(s, group, SSL_SECOP_CURVE_CHECK))) {
+            && (!checkallow
+                || tls_group_allowed(s, group, SSL_SECOP_CURVE_CHECK))) {
             if (pos != NULL)
                 *pos = i;
             return 1;
@@ -2604,9 +2626,9 @@ int check_in_list(SSL_CONNECTION *s, uint16_t group_id, const uint16_t *groups,
 
 /* Replace ClientHello1 in the transcript hash with a synthetic message */
 int create_synthetic_message_hash(SSL_CONNECTION *s,
-                                  const unsigned char *hashval,
-                                  size_t hashlen, const unsigned char *hrr,
-                                  size_t hrrlen)
+    const unsigned char *hashval,
+    size_t hashlen, const unsigned char *hrr,
+    size_t hrrlen)
 {
     unsigned char hashvaltmp[EVP_MAX_MD_SIZE];
     unsigned char msghdr[SSL3_HM_HEADER_LENGTH];
@@ -2618,8 +2640,8 @@ int create_synthetic_message_hash(SSL_CONNECTION *s,
         hashlen = 0;
         /* Get the hash of the initial ClientHello */
         if (!ssl3_digest_cached_records(s, 0)
-                || !ssl_handshake_hash(s, hashvaltmp, sizeof(hashvaltmp),
-                                       &hashlen)) {
+            || !ssl_handshake_hash(s, hashvaltmp, sizeof(hashvaltmp),
+                &hashlen)) {
             /* SSLfatal() already called */
             return 0;
         }
@@ -2635,7 +2657,7 @@ int create_synthetic_message_hash(SSL_CONNECTION *s,
     msghdr[0] = SSL3_MT_MESSAGE_HASH;
     msghdr[SSL3_HM_HEADER_LENGTH - 1] = (unsigned char)hashlen;
     if (!ssl3_finish_mac(s, msghdr, SSL3_HM_HEADER_LENGTH)
-            || !ssl3_finish_mac(s, hashval, hashlen)) {
+        || !ssl3_finish_mac(s, hashval, hashlen)) {
         /* SSLfatal() already called */
         return 0;
     }
@@ -2646,10 +2668,10 @@ int create_synthetic_message_hash(SSL_CONNECTION *s,
      * receiving a ClientHello2 with a cookie.
      */
     if (hrr != NULL
-            && (!ssl3_finish_mac(s, hrr, hrrlen)
-                || !ssl3_finish_mac(s, (unsigned char *)s->init_buf->data,
-                                    s->s3.tmp.message_size
-                                    + SSL3_HM_HEADER_LENGTH))) {
+        && (!ssl3_finish_mac(s, hrr, hrrlen)
+            || !ssl3_finish_mac(s, (unsigned char *)s->init_buf->data,
+                s->s3.tmp.message_size
+                    + SSL3_HM_HEADER_LENGTH))) {
         /* SSLfatal() already called */
         return 0;
     }
@@ -2710,7 +2732,7 @@ int parse_ca_names(SSL_CONNECTION *s, PACKET *pkt)
 
     return 1;
 
- err:
+err:
     sk_X509_NAME_pop_free(ca_sk, X509_NAME_free);
     X509_NAME_free(xn);
     return 0;
@@ -2734,7 +2756,7 @@ const STACK_OF(X509_NAME) *get_ca_names(SSL_CONNECTION *s)
 }
 
 int construct_ca_names(SSL_CONNECTION *s, const STACK_OF(X509_NAME) *ca_sk,
-                       WPACKET *pkt)
+    WPACKET *pkt)
 {
     /* Start sub-packet for client CA list */
     if (!WPACKET_start_sub_packet_u16(pkt)) {
@@ -2751,10 +2773,10 @@ int construct_ca_names(SSL_CONNECTION *s, const STACK_OF(X509_NAME) *ca_sk,
             int namelen;
 
             if (name == NULL
-                    || (namelen = i2d_X509_NAME(name, NULL)) < 0
-                    || !WPACKET_sub_allocate_bytes_u16(pkt, namelen,
-                                                       &namebytes)
-                    || i2d_X509_NAME(name, &namebytes) != namelen) {
+                || (namelen = i2d_X509_NAME(name, NULL)) < 0
+                || !WPACKET_sub_allocate_bytes_u16(pkt, namelen,
+                    &namebytes)
+                || i2d_X509_NAME(name, &namebytes) != namelen) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 return 0;
             }
@@ -2771,7 +2793,7 @@ int construct_ca_names(SSL_CONNECTION *s, const STACK_OF(X509_NAME) *ca_sk,
 
 /* Create a buffer containing data to be signed for server key exchange */
 size_t construct_key_exchange_tbs(SSL_CONNECTION *s, unsigned char **ptbs,
-                                  const void *param, size_t paramlen)
+    const void *param, size_t paramlen)
 {
     size_t tbslen = 2 * SSL3_RANDOM_SIZE + paramlen;
     unsigned char *tbs = OPENSSL_malloc(tbslen);
@@ -2806,7 +2828,7 @@ int tls13_save_handshake_digest_for_pha(SSL_CONNECTION *s)
             return 0;
         }
         if (!EVP_MD_CTX_copy_ex(s->pha_dgst,
-                                s->s3.handshake_dgst)) {
+                s->s3.handshake_dgst)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             EVP_MD_CTX_free(s->pha_dgst);
             s->pha_dgst = NULL;
@@ -2827,7 +2849,7 @@ int tls13_restore_handshake_digest_for_pha(SSL_CONNECTION *s)
         return 0;
     }
     if (!EVP_MD_CTX_copy_ex(s->s3.handshake_dgst,
-                            s->pha_dgst)) {
+            s->pha_dgst)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -2836,9 +2858,9 @@ int tls13_restore_handshake_digest_for_pha(SSL_CONNECTION *s)
 
 #ifndef OPENSSL_NO_COMP_ALG
 MSG_PROCESS_RETURN tls13_process_compressed_certificate(SSL_CONNECTION *sc,
-                                                        PACKET *pkt,
-                                                        PACKET *tmppkt,
-                                                        BUF_MEM *buf)
+    PACKET *pkt,
+    PACKET *tmppkt,
+    BUF_MEM *buf)
 {
     MSG_PROCESS_RETURN ret = MSG_PROCESS_ERROR;
     int comp_alg;
@@ -2853,7 +2875,7 @@ MSG_PROCESS_RETURN tls13_process_compressed_certificate(SSL_CONNECTION *sc,
         SSLfatal(sc, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
-    if (!PACKET_get_net_2(pkt, (unsigned int*)&comp_alg)) {
+    if (!PACKET_get_net_2(pkt, (unsigned int *)&comp_alg)) {
         SSLfatal(sc, SSL_AD_BAD_CERTIFICATE, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -2896,6 +2918,12 @@ MSG_PROCESS_RETURN tls13_process_compressed_certificate(SSL_CONNECTION *sc,
         goto err;
     }
 
+    /* Prevent excessive pre-decompression allocation */
+    if (expected_length > sc->max_cert_list) {
+        SSLfatal(sc, SSL_AD_BAD_CERTIFICATE, SSL_R_EXCESSIVE_MESSAGE_SIZE);
+        goto err;
+    }
+
     if (PACKET_remaining(pkt) != comp_length || comp_length == 0) {
         SSLfatal(sc, SSL_AD_DECODE_ERROR, SSL_R_BAD_DECOMPRESSION);
         goto err;
@@ -2904,12 +2932,13 @@ MSG_PROCESS_RETURN tls13_process_compressed_certificate(SSL_CONNECTION *sc,
     if (!BUF_MEM_grow(buf, expected_length)
         || !PACKET_buf_init(tmppkt, (unsigned char *)buf->data, expected_length)
         || COMP_expand_block(comp, (unsigned char *)buf->data, expected_length,
-                             (unsigned char*)PACKET_data(pkt), comp_length) != (int)expected_length) {
+               (unsigned char *)PACKET_data(pkt), comp_length)
+            != (int)expected_length) {
         SSLfatal(sc, SSL_AD_BAD_CERTIFICATE, SSL_R_BAD_DECOMPRESSION);
         goto err;
     }
     ret = MSG_PROCESS_CONTINUE_PROCESSING;
- err:
+err:
     COMP_CTX_free(comp);
     return ret;
 }
diff --git a/ssl/statem/statem_local.h b/ssl/statem/statem_local.h
index 352f9b8cec7ad..e1d57eb8c6460 100644
--- a/ssl/statem/statem_local.h
+++ b/ssl/statem/statem_local.h
@@ -18,31 +18,31 @@
 
 /* The spec allows for a longer length than this, but we limit it */
 #define HELLO_VERIFY_REQUEST_MAX_LENGTH 258
-#define END_OF_EARLY_DATA_MAX_LENGTH    0
-#define HELLO_RETRY_REQUEST_MAX_LENGTH  20000
+#define END_OF_EARLY_DATA_MAX_LENGTH 0
+#define HELLO_RETRY_REQUEST_MAX_LENGTH 20000
 #define ENCRYPTED_EXTENSIONS_MAX_LENGTH 20000
 #define SESSION_TICKET_MAX_LENGTH_TLS13 131338
 #define SESSION_TICKET_MAX_LENGTH_TLS12 65541
-#define SERVER_KEY_EXCH_MAX_LENGTH      102400
-#define SERVER_HELLO_DONE_MAX_LENGTH    0
-#define KEY_UPDATE_MAX_LENGTH           1
-#define CCS_MAX_LENGTH                  1
+#define SERVER_KEY_EXCH_MAX_LENGTH 102400
+#define SERVER_HELLO_DONE_MAX_LENGTH 0
+#define KEY_UPDATE_MAX_LENGTH 1
+#define CCS_MAX_LENGTH 1
 
 /* Max ServerHello size permitted by RFC 8446 */
-#define SERVER_HELLO_MAX_LENGTH         65607
+#define SERVER_HELLO_MAX_LENGTH 65607
 
 /* Max CertificateVerify size permitted by RFC 8446 */
-#define CERTIFICATE_VERIFY_MAX_LENGTH   65539
+#define CERTIFICATE_VERIFY_MAX_LENGTH 65539
 
 /* Max should actually be 36 but we are generous */
-#define FINISHED_MAX_LENGTH             64
+#define FINISHED_MAX_LENGTH 64
 
 /* Dummy message type */
-#define SSL3_MT_DUMMY   -1
+#define SSL3_MT_DUMMY -1
 
 /* Invalid extension ID for non-supported extensions */
-#define TLSEXT_TYPE_invalid            0x10000
-#define TLSEXT_TYPE_out_of_range       0x10001
+#define TLSEXT_TYPE_invalid 0x10000
+#define TLSEXT_TYPE_out_of_range 0x10001
 unsigned int ossl_get_extension_type(size_t idx);
 
 extern const unsigned char hrrrandom[];
@@ -62,21 +62,21 @@ typedef enum {
     MSG_PROCESS_CONTINUE_READING
 } MSG_PROCESS_RETURN;
 
-typedef CON_FUNC_RETURN (*confunc_f) (SSL_CONNECTION *s, WPACKET *pkt);
+typedef CON_FUNC_RETURN (*confunc_f)(SSL_CONNECTION *s, WPACKET *pkt);
 
 int ssl3_take_mac(SSL_CONNECTION *s);
 int check_in_list(SSL_CONNECTION *s, uint16_t group_id, const uint16_t *groups,
-                  size_t num_groups, int checkallow, size_t *pos);
+    size_t num_groups, int checkallow, size_t *pos);
 int create_synthetic_message_hash(SSL_CONNECTION *s,
-                                  const unsigned char *hashval,
-                                  size_t hashlen, const unsigned char *hrr,
-                                  size_t hrrlen);
+    const unsigned char *hashval,
+    size_t hashlen, const unsigned char *hrr,
+    size_t hrrlen);
 int parse_ca_names(SSL_CONNECTION *s, PACKET *pkt);
 const STACK_OF(X509_NAME) *get_ca_names(SSL_CONNECTION *s);
 int construct_ca_names(SSL_CONNECTION *s, const STACK_OF(X509_NAME) *ca_sk,
-                       WPACKET *pkt);
+    WPACKET *pkt);
 size_t construct_key_exchange_tbs(SSL_CONNECTION *s, unsigned char **ptbs,
-                                  const void *param, size_t paramlen);
+    const void *param, size_t paramlen);
 
 /*
  * TLS/DTLS client state machine functions
@@ -86,12 +86,12 @@ WRITE_TRAN ossl_statem_client_write_transition(SSL_CONNECTION *s);
 WORK_STATE ossl_statem_client_pre_work(SSL_CONNECTION *s, WORK_STATE wst);
 WORK_STATE ossl_statem_client_post_work(SSL_CONNECTION *s, WORK_STATE wst);
 int ossl_statem_client_construct_message(SSL_CONNECTION *s,
-                                         confunc_f *confunc, int *mt);
+    confunc_f *confunc, int *mt);
 size_t ossl_statem_client_max_message_size(SSL_CONNECTION *s);
 MSG_PROCESS_RETURN ossl_statem_client_process_message(SSL_CONNECTION *s,
-                                                      PACKET *pkt);
+    PACKET *pkt);
 WORK_STATE ossl_statem_client_post_process_message(SSL_CONNECTION *s,
-                                                   WORK_STATE wst);
+    WORK_STATE wst);
 
 /*
  * TLS/DTLS server state machine functions
@@ -101,12 +101,12 @@ WRITE_TRAN ossl_statem_server_write_transition(SSL_CONNECTION *s);
 WORK_STATE ossl_statem_server_pre_work(SSL_CONNECTION *s, WORK_STATE wst);
 WORK_STATE ossl_statem_server_post_work(SSL_CONNECTION *s, WORK_STATE wst);
 int ossl_statem_server_construct_message(SSL_CONNECTION *s,
-                                         confunc_f *confunc,int *mt);
+    confunc_f *confunc, int *mt);
 size_t ossl_statem_server_max_message_size(SSL_CONNECTION *s);
 MSG_PROCESS_RETURN ossl_statem_server_process_message(SSL_CONNECTION *s,
-                                                      PACKET *pkt);
+    PACKET *pkt);
 WORK_STATE ossl_statem_server_post_process_message(SSL_CONNECTION *s,
-                                                   WORK_STATE wst);
+    WORK_STATE wst);
 
 /* Functions for getting new message data */
 __owur int tls_get_message_header(SSL_CONNECTION *s, int *mt);
@@ -117,76 +117,76 @@ __owur int dtls_get_message_body(SSL_CONNECTION *s, size_t *len);
 /* Message construction and processing functions */
 __owur int tls_process_initial_server_flight(SSL_CONNECTION *s);
 __owur MSG_PROCESS_RETURN tls_process_change_cipher_spec(SSL_CONNECTION *s,
-                                                         PACKET *pkt);
+    PACKET *pkt);
 __owur MSG_PROCESS_RETURN tls_process_finished(SSL_CONNECTION *s, PACKET *pkt);
-__owur CON_FUNC_RETURN  tls_construct_change_cipher_spec(SSL_CONNECTION *s,
-                                                         WPACKET *pkt);
+__owur CON_FUNC_RETURN tls_construct_change_cipher_spec(SSL_CONNECTION *s,
+    WPACKET *pkt);
 __owur CON_FUNC_RETURN dtls_construct_change_cipher_spec(SSL_CONNECTION *s,
-                                                         WPACKET *pkt);
+    WPACKET *pkt);
 
 __owur CON_FUNC_RETURN tls_construct_finished(SSL_CONNECTION *s, WPACKET *pkt);
 __owur CON_FUNC_RETURN tls_construct_key_update(SSL_CONNECTION *s, WPACKET *pkt);
 __owur MSG_PROCESS_RETURN tls_process_key_update(SSL_CONNECTION *s,
-                                                 PACKET *pkt);
+    PACKET *pkt);
 __owur WORK_STATE tls_finish_handshake(SSL_CONNECTION *s, WORK_STATE wst,
-                                       int clearbufs, int stop);
+    int clearbufs, int stop);
 __owur WORK_STATE dtls_wait_for_dry(SSL_CONNECTION *s);
 
 #ifndef OPENSSL_NO_COMP_ALG
 __owur MSG_PROCESS_RETURN tls13_process_compressed_certificate(SSL_CONNECTION *sc,
-                                                               PACKET *pkt,
-                                                               PACKET *tmppkt,
-                                                               BUF_MEM *buf);
+    PACKET *pkt,
+    PACKET *tmppkt,
+    BUF_MEM *buf);
 #endif
 
 /* some client-only functions */
 __owur CON_FUNC_RETURN tls_construct_client_hello(SSL_CONNECTION *s,
-                                                  WPACKET *pkt);
+    WPACKET *pkt);
 __owur MSG_PROCESS_RETURN tls_process_server_hello(SSL_CONNECTION *s,
-                                                   PACKET *pkt);
+    PACKET *pkt);
 __owur MSG_PROCESS_RETURN tls_process_certificate_request(SSL_CONNECTION *s,
-                                                          PACKET *pkt);
+    PACKET *pkt);
 __owur MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL_CONNECTION *s,
-                                                         PACKET *pkt);
+    PACKET *pkt);
 __owur int tls_process_cert_status_body(SSL_CONNECTION *s, PACKET *pkt);
 __owur MSG_PROCESS_RETURN tls_process_cert_status(SSL_CONNECTION *s,
-                                                  PACKET *pkt);
+    PACKET *pkt);
 __owur MSG_PROCESS_RETURN tls_process_server_done(SSL_CONNECTION *s,
-                                                  PACKET *pkt);
+    PACKET *pkt);
 __owur CON_FUNC_RETURN tls_construct_cert_verify(SSL_CONNECTION *s,
-                                                 WPACKET *pkt);
+    WPACKET *pkt);
 __owur WORK_STATE tls_prepare_client_certificate(SSL_CONNECTION *s,
-                                                 WORK_STATE wst);
+    WORK_STATE wst);
 __owur CON_FUNC_RETURN tls_construct_client_certificate(SSL_CONNECTION *s,
-                                                        WPACKET *pkt);
+    WPACKET *pkt);
 #ifndef OPENSSL_NO_COMP_ALG
 __owur CON_FUNC_RETURN tls_construct_client_compressed_certificate(SSL_CONNECTION *sc,
-                                                                   WPACKET *pkt);
+    WPACKET *pkt);
 #endif
 __owur int ssl_do_client_cert_cb(SSL_CONNECTION *s, X509 **px509,
-                                 EVP_PKEY **ppkey);
+    EVP_PKEY **ppkey);
 __owur CON_FUNC_RETURN tls_construct_client_key_exchange(SSL_CONNECTION *s,
-                                                         WPACKET *pkt);
+    WPACKET *pkt);
 __owur int tls_client_key_exchange_post_work(SSL_CONNECTION *s);
 __owur int tls_construct_cert_status_body(SSL_CONNECTION *s, WPACKET *pkt);
 __owur CON_FUNC_RETURN tls_construct_cert_status(SSL_CONNECTION *s,
-                                                 WPACKET *pkt);
+    WPACKET *pkt);
 __owur MSG_PROCESS_RETURN tls_process_key_exchange(SSL_CONNECTION *s,
-                                                   PACKET *pkt);
+    PACKET *pkt);
 __owur MSG_PROCESS_RETURN tls_process_server_rpk(SSL_CONNECTION *sc,
-                                                 PACKET *pkt);
+    PACKET *pkt);
 __owur MSG_PROCESS_RETURN tls_process_client_rpk(SSL_CONNECTION *sc,
-                                                 PACKET *pkt);
+    PACKET *pkt);
 __owur unsigned long tls_output_rpk(SSL_CONNECTION *sc, WPACKET *pkt,
-                                    CERT_PKEY *cpk);
+    CERT_PKEY *cpk);
 __owur int tls_process_rpk(SSL_CONNECTION *s, PACKET *pkt, EVP_PKEY **peer_rpk);
 __owur MSG_PROCESS_RETURN tls_process_server_certificate(SSL_CONNECTION *s,
-                                                         PACKET *pkt);
+    PACKET *pkt);
 __owur WORK_STATE tls_post_process_server_certificate(SSL_CONNECTION *s,
-                                                      WORK_STATE wst);
+    WORK_STATE wst);
 #ifndef OPENSSL_NO_COMP_ALG
 __owur MSG_PROCESS_RETURN tls_process_server_compressed_certificate(SSL_CONNECTION *sc,
-                                                                    PACKET *pkt);
+    PACKET *pkt);
 #endif
 __owur int ssl3_check_cert_and_algorithm(SSL_CONNECTION *s);
 #ifndef OPENSSL_NO_NEXTPROTONEG
@@ -195,49 +195,49 @@ __owur CON_FUNC_RETURN tls_construct_next_proto(SSL_CONNECTION *s, WPACKET *pkt)
 __owur MSG_PROCESS_RETURN tls_process_hello_req(SSL_CONNECTION *s, PACKET *pkt);
 __owur MSG_PROCESS_RETURN dtls_process_hello_verify(SSL_CONNECTION *s, PACKET *pkt);
 __owur CON_FUNC_RETURN tls_construct_end_of_early_data(SSL_CONNECTION *s,
-                                                       WPACKET *pkt);
+    WPACKET *pkt);
 
 /* some server-only functions */
 __owur MSG_PROCESS_RETURN tls_process_client_hello(SSL_CONNECTION *s,
-                                                   PACKET *pkt);
+    PACKET *pkt);
 __owur WORK_STATE tls_post_process_client_hello(SSL_CONNECTION *s,
-                                                WORK_STATE wst);
+    WORK_STATE wst);
 __owur CON_FUNC_RETURN tls_construct_server_hello(SSL_CONNECTION *s,
-                                                  WPACKET *pkt);
+    WPACKET *pkt);
 __owur CON_FUNC_RETURN dtls_construct_hello_verify_request(SSL_CONNECTION *s,
-                                                           WPACKET *pkt);
+    WPACKET *pkt);
 __owur CON_FUNC_RETURN tls_construct_server_certificate(SSL_CONNECTION *s,
-                                                        WPACKET *pkt);
+    WPACKET *pkt);
 #ifndef OPENSSL_NO_COMP_ALG
 __owur CON_FUNC_RETURN tls_construct_server_compressed_certificate(SSL_CONNECTION *sc,
-                                                                   WPACKET *pkt);
+    WPACKET *pkt);
 #endif
 __owur CON_FUNC_RETURN tls_construct_server_key_exchange(SSL_CONNECTION *s,
-                                                         WPACKET *pkt);
+    WPACKET *pkt);
 __owur CON_FUNC_RETURN tls_construct_certificate_request(SSL_CONNECTION *s,
-                                                         WPACKET *pkt);
+    WPACKET *pkt);
 __owur CON_FUNC_RETURN tls_construct_server_done(SSL_CONNECTION *s,
-                                                 WPACKET *pkt);
+    WPACKET *pkt);
 __owur MSG_PROCESS_RETURN tls_process_client_certificate(SSL_CONNECTION *s,
-                                                         PACKET *pkt);
+    PACKET *pkt);
 #ifndef OPENSSL_NO_COMP_ALG
 __owur MSG_PROCESS_RETURN tls_process_client_compressed_certificate(SSL_CONNECTION *sc,
-                                                                    PACKET *pkt);
+    PACKET *pkt);
 #endif
 __owur MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL_CONNECTION *s,
-                                                          PACKET *pkt);
+    PACKET *pkt);
 __owur WORK_STATE tls_post_process_client_key_exchange(SSL_CONNECTION *s,
-                                                       WORK_STATE wst);
+    WORK_STATE wst);
 __owur MSG_PROCESS_RETURN tls_process_cert_verify(SSL_CONNECTION *s,
-                                                  PACKET *pkt);
+    PACKET *pkt);
 #ifndef OPENSSL_NO_NEXTPROTONEG
 __owur MSG_PROCESS_RETURN tls_process_next_proto(SSL_CONNECTION *s,
-                                                 PACKET *pkt);
+    PACKET *pkt);
 #endif
 __owur CON_FUNC_RETURN tls_construct_new_session_ticket(SSL_CONNECTION *s,
-                                                        WPACKET *pkt);
+    WPACKET *pkt);
 MSG_PROCESS_RETURN tls_process_end_of_early_data(SSL_CONNECTION *s,
-                                                 PACKET *pkt);
+    PACKET *pkt);
 
 #ifndef OPENSSL_NO_GOST
 /* These functions are used in GOST18 CKE, both for client and server */
@@ -254,319 +254,319 @@ typedef enum ext_return_en {
 } EXT_RETURN;
 
 __owur int tls_validate_all_contexts(SSL_CONNECTION *s, unsigned int thisctx,
-                                     RAW_EXTENSION *exts);
+    RAW_EXTENSION *exts);
 __owur int extension_is_relevant(SSL_CONNECTION *s, unsigned int extctx,
-                                 unsigned int thisctx);
+    unsigned int thisctx);
 __owur int tls_collect_extensions(SSL_CONNECTION *s, PACKET *packet,
-                                  unsigned int context,
-                                  RAW_EXTENSION **res, size_t *len, int init);
+    unsigned int context,
+    RAW_EXTENSION **res, size_t *len, int init);
 __owur int tls_parse_extension(SSL_CONNECTION *s, TLSEXT_INDEX idx, int context,
-                               RAW_EXTENSION *exts,  X509 *x, size_t chainidx);
+    RAW_EXTENSION *exts, X509 *x, size_t chainidx);
 __owur int tls_parse_all_extensions(SSL_CONNECTION *s, int context,
-                                    RAW_EXTENSION *exts,
-                                    X509 *x, size_t chainidx, int fin);
+    RAW_EXTENSION *exts,
+    X509 *x, size_t chainidx, int fin);
 __owur int should_add_extension(SSL_CONNECTION *s, unsigned int extctx,
-                                unsigned int thisctx, int max_version);
+    unsigned int thisctx, int max_version);
 __owur int tls_construct_extensions(SSL_CONNECTION *s, WPACKET *pkt,
-                                    unsigned int context,
-                                    X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 
 __owur int tls_psk_do_binder(SSL_CONNECTION *s, const EVP_MD *md,
-                             const unsigned char *msgstart,
-                             size_t binderoffset, const unsigned char *binderin,
-                             unsigned char *binderout,
-                             SSL_SESSION *sess, int sign, int external);
+    const unsigned char *msgstart,
+    size_t binderoffset, const unsigned char *binderin,
+    unsigned char *binderout,
+    SSL_SESSION *sess, int sign, int external);
 
 /* Server Extension processing */
 int tls_parse_ctos_renegotiate(SSL_CONNECTION *s, PACKET *pkt,
-                               unsigned int context,
-                               X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_server_name(SSL_CONNECTION *s, PACKET *pkt,
-                               unsigned int context,
-                               X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_maxfragmentlen(SSL_CONNECTION *s, PACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 #ifndef OPENSSL_NO_SRP
 int tls_parse_ctos_srp(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 #endif
 int tls_parse_ctos_early_data(SSL_CONNECTION *s, PACKET *pkt,
-                              unsigned int context,
-                              X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_ec_pt_formats(SSL_CONNECTION *s, PACKET *pkt,
-                                 unsigned int context,
-                                 X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_supported_groups(SSL_CONNECTION *s, PACKET *pkt,
-                                    unsigned int context,
-                                    X509 *x, size_t chainidxl);
+    unsigned int context,
+    X509 *x, size_t chainidxl);
 int tls_parse_ctos_session_ticket(SSL_CONNECTION *s, PACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_sig_algs_cert(SSL_CONNECTION *s, PACKET *pkt,
-                                 unsigned int context,
-                                 X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_sig_algs(SSL_CONNECTION *s, PACKET *pkt,
-                            unsigned int context, X509 *x, size_t chainidx);
+    unsigned int context, X509 *x, size_t chainidx);
 #ifndef OPENSSL_NO_OCSP
 int tls_parse_ctos_status_request(SSL_CONNECTION *s, PACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 #endif
 #ifndef OPENSSL_NO_NEXTPROTONEG
 int tls_parse_ctos_npn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 #endif
 int tls_parse_ctos_alpn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                        X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 #ifndef OPENSSL_NO_SRTP
 int tls_parse_ctos_use_srtp(SSL_CONNECTION *s, PACKET *pkt,
-                            unsigned int context, X509 *x, size_t chainidx);
+    unsigned int context, X509 *x, size_t chainidx);
 #endif
 int tls_parse_ctos_etm(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_key_share(SSL_CONNECTION *s, PACKET *pkt,
-                             unsigned int context, X509 *x, size_t chainidx);
+    unsigned int context, X509 *x, size_t chainidx);
 int tls_parse_ctos_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                          X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_ems(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_psk_kex_modes(SSL_CONNECTION *s, PACKET *pkt,
-                                 unsigned int context,
-                                 X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_post_handshake_auth(SSL_CONNECTION *, PACKET *pkt,
-                                       unsigned int context,
-                                       X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 
 EXT_RETURN tls_construct_stoc_renegotiate(SSL_CONNECTION *s, WPACKET *pkt,
-                                          unsigned int context, X509 *x,
-                                          size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_stoc_server_name(SSL_CONNECTION *s, WPACKET *pkt,
-                                          unsigned int context, X509 *x,
-                                          size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_stoc_early_data(SSL_CONNECTION *s, WPACKET *pkt,
-                                         unsigned int context, X509 *x,
-                                         size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_stoc_maxfragmentlen(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_stoc_ec_pt_formats(SSL_CONNECTION *s, WPACKET *pkt,
-                                            unsigned int context, X509 *x,
-                                            size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_stoc_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
-                                               unsigned int context, X509 *x,
-                                               size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_stoc_session_ticket(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 #ifndef OPENSSL_NO_OCSP
 EXT_RETURN tls_construct_stoc_status_request(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 #endif
 #ifndef OPENSSL_NO_NEXTPROTONEG
 EXT_RETURN tls_construct_stoc_next_proto_neg(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 #endif
 EXT_RETURN tls_construct_stoc_alpn(SSL_CONNECTION *s, WPACKET *pkt,
-                                   unsigned int context,
-                                   X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 #ifndef OPENSSL_NO_SRTP
 EXT_RETURN tls_construct_stoc_use_srtp(SSL_CONNECTION *s, WPACKET *pkt,
-                                       unsigned int context,
-                                       X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 #endif
 EXT_RETURN tls_construct_stoc_etm(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 EXT_RETURN tls_construct_stoc_ems(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 EXT_RETURN tls_construct_stoc_supported_versions(SSL_CONNECTION *s, WPACKET *pkt,
-                                                 unsigned int context, X509 *x,
-                                                 size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_stoc_key_share(SSL_CONNECTION *s, WPACKET *pkt,
-                                        unsigned int context, X509 *x,
-                                        size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_stoc_cookie(SSL_CONNECTION *s, WPACKET *pkt,
-                                     unsigned int context,
-                                     X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 /*
  * Not in public headers as this is not an official extension. Only used when
  * SSL_OP_CRYPTOPRO_TLSEXT_BUG is set.
  */
-#define TLSEXT_TYPE_cryptopro_bug      0xfde8
+#define TLSEXT_TYPE_cryptopro_bug 0xfde8
 EXT_RETURN tls_construct_stoc_cryptopro_bug(SSL_CONNECTION *s, WPACKET *pkt,
-                                            unsigned int context, X509 *x,
-                                            size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_stoc_psk(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 
 /* Client Extension processing */
 EXT_RETURN tls_construct_ctos_renegotiate(SSL_CONNECTION *s, WPACKET *pkt,
-                                          unsigned int context,
-                                          X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 EXT_RETURN tls_construct_ctos_server_name(SSL_CONNECTION *s, WPACKET *pkt,
-                                          unsigned int context,
-                                          X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 EXT_RETURN tls_construct_ctos_maxfragmentlen(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context,
-                                             X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 #ifndef OPENSSL_NO_SRP
 EXT_RETURN tls_construct_ctos_srp(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context, X509 *x,
-                                  size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 #endif
 EXT_RETURN tls_construct_ctos_ec_pt_formats(SSL_CONNECTION *s, WPACKET *pkt,
-                                            unsigned int context, X509 *x,
-                                            size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_ctos_supported_groups(SSL_CONNECTION *s, WPACKET *pkt,
-                                               unsigned int context, X509 *x,
-                                               size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 
 EXT_RETURN tls_construct_ctos_early_data(SSL_CONNECTION *s, WPACKET *pkt,
-                                         unsigned int context, X509 *x,
-                                         size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_ctos_session_ticket(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_ctos_sig_algs(SSL_CONNECTION *s, WPACKET *pkt,
-                                       unsigned int context, X509 *x,
-                                       size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 #ifndef OPENSSL_NO_OCSP
 EXT_RETURN tls_construct_ctos_status_request(SSL_CONNECTION *s, WPACKET *pkt,
-                                             unsigned int context, X509 *x,
-                                             size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 #endif
 #ifndef OPENSSL_NO_NEXTPROTONEG
 EXT_RETURN tls_construct_ctos_npn(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 #endif
 EXT_RETURN tls_construct_ctos_alpn(SSL_CONNECTION *s, WPACKET *pkt,
-                                   unsigned int context,
-                                   X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 #ifndef OPENSSL_NO_SRTP
 EXT_RETURN tls_construct_ctos_use_srtp(SSL_CONNECTION *s, WPACKET *pkt,
-                                       unsigned int context,
-                                       X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 #endif
 EXT_RETURN tls_construct_ctos_etm(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 #ifndef OPENSSL_NO_CT
 EXT_RETURN tls_construct_ctos_sct(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 #endif
 EXT_RETURN tls_construct_ctos_ems(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 EXT_RETURN tls_construct_ctos_supported_versions(SSL_CONNECTION *s, WPACKET *pkt,
-                                                 unsigned int context, X509 *x,
-                                                 size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_ctos_key_share(SSL_CONNECTION *s, WPACKET *pkt,
-                                        unsigned int context, X509 *x,
-                                        size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_ctos_psk_kex_modes(SSL_CONNECTION *s, WPACKET *pkt,
-                                            unsigned int context, X509 *x,
-                                            size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_ctos_cookie(SSL_CONNECTION *s, WPACKET *pkt,
-                                     unsigned int context,
-                                     X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 EXT_RETURN tls_construct_ctos_padding(SSL_CONNECTION *s, WPACKET *pkt,
-                                      unsigned int context, X509 *x,
-                                      size_t chainidx);
+    unsigned int context, X509 *x,
+    size_t chainidx);
 EXT_RETURN tls_construct_ctos_psk(SSL_CONNECTION *s, WPACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 EXT_RETURN tls_construct_ctos_post_handshake_auth(SSL_CONNECTION *s, WPACKET *pkt,
-                                                  unsigned int context,
-                                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 
 int tls_parse_stoc_renegotiate(SSL_CONNECTION *s, PACKET *pkt,
-                               unsigned int context,
-                               X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_stoc_server_name(SSL_CONNECTION *s, PACKET *pkt,
-                               unsigned int context,
-                               X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_stoc_early_data(SSL_CONNECTION *s, PACKET *pkt,
-                              unsigned int context,
-                              X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_stoc_maxfragmentlen(SSL_CONNECTION *s, PACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_stoc_ec_pt_formats(SSL_CONNECTION *s, PACKET *pkt,
-                                 unsigned int context,
-                                 X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_stoc_session_ticket(SSL_CONNECTION *s, PACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 #ifndef OPENSSL_NO_OCSP
 int tls_parse_stoc_status_request(SSL_CONNECTION *s, PACKET *pkt,
-                                  unsigned int context,
-                                  X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 #endif
 #ifndef OPENSSL_NO_CT
 int tls_parse_stoc_sct(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 #endif
 #ifndef OPENSSL_NO_NEXTPROTONEG
 int tls_parse_stoc_npn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 #endif
 int tls_parse_stoc_alpn(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                        X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 #ifndef OPENSSL_NO_SRTP
 int tls_parse_stoc_use_srtp(SSL_CONNECTION *s, PACKET *pkt,
-                            unsigned int context, X509 *x, size_t chainidx);
+    unsigned int context, X509 *x, size_t chainidx);
 #endif
 int tls_parse_stoc_etm(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 int tls_parse_stoc_ems(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 int tls_parse_stoc_supported_versions(SSL_CONNECTION *s, PACKET *pkt,
-                                      unsigned int context,
-                                      X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_stoc_key_share(SSL_CONNECTION *s, PACKET *pkt,
-                             unsigned int context, X509 *x, size_t chainidx);
+    unsigned int context, X509 *x, size_t chainidx);
 int tls_parse_stoc_cookie(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                          X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 int tls_parse_stoc_psk(SSL_CONNECTION *s, PACKET *pkt, unsigned int context,
-                       X509 *x, size_t chainidx);
+    X509 *x, size_t chainidx);
 
 int tls_handle_alpn(SSL_CONNECTION *s);
 
 int tls13_save_handshake_digest_for_pha(SSL_CONNECTION *s);
 int tls13_restore_handshake_digest_for_pha(SSL_CONNECTION *s);
 
-__owur EVP_PKEY* tls_get_peer_pkey(const SSL_CONNECTION *sc);
+__owur EVP_PKEY *tls_get_peer_pkey(const SSL_CONNECTION *sc);
 /* RFC7250 */
 EXT_RETURN tls_construct_ctos_client_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
-                                               unsigned int context,
-                                               X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 EXT_RETURN tls_construct_stoc_client_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
-                                               unsigned int context,
-                                               X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_client_cert_type(SSL_CONNECTION *sc, PACKET *pkt,
-                                    unsigned int context,
-                                    X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_stoc_client_cert_type(SSL_CONNECTION *sc, PACKET *pkt,
-                                    unsigned int context,
-                               X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 EXT_RETURN tls_construct_ctos_server_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
-                                               unsigned int context,
-                                               X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 EXT_RETURN tls_construct_stoc_server_cert_type(SSL_CONNECTION *sc, WPACKET *pkt,
-                                               unsigned int context,
-                                               X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_ctos_server_cert_type(SSL_CONNECTION *sc, PACKET *pkt,
-                                    unsigned int context,
-                                    X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
 int tls_parse_stoc_server_cert_type(SSL_CONNECTION *s, PACKET *pkt,
-                                    unsigned int context,
-                                    X509 *x, size_t chainidx);
+    unsigned int context,
+    X509 *x, size_t chainidx);
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index cd062a00d5be8..6079176f99881 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -32,24 +32,24 @@
 #include <openssl/comp.h>
 #include "internal/comp.h"
 
-#define TICKET_NONCE_SIZE       8
+#define TICKET_NONCE_SIZE 8
 
 typedef struct {
-  ASN1_TYPE *kxBlob;
-  ASN1_TYPE *opaqueBlob;
+    ASN1_TYPE *kxBlob;
+    ASN1_TYPE *opaqueBlob;
 } GOST_KX_MESSAGE;
 
 DECLARE_ASN1_FUNCTIONS(GOST_KX_MESSAGE)
 
 ASN1_SEQUENCE(GOST_KX_MESSAGE) = {
-  ASN1_SIMPLE(GOST_KX_MESSAGE,  kxBlob, ASN1_ANY),
-  ASN1_OPT(GOST_KX_MESSAGE, opaqueBlob, ASN1_ANY),
+    ASN1_SIMPLE(GOST_KX_MESSAGE, kxBlob, ASN1_ANY),
+    ASN1_OPT(GOST_KX_MESSAGE, opaqueBlob, ASN1_ANY),
 } ASN1_SEQUENCE_END(GOST_KX_MESSAGE)
 
 IMPLEMENT_ASN1_FUNCTIONS(GOST_KX_MESSAGE)
 
 static CON_FUNC_RETURN tls_construct_encrypted_extensions(SSL_CONNECTION *s,
-                                                          WPACKET *pkt);
+    WPACKET *pkt);
 
 static ossl_inline int received_client_cert(const SSL_CONNECTION *sc)
 {
@@ -86,7 +86,7 @@ static int ossl_statem_server13_read_transition(SSL_CONNECTION *s, int mt)
             }
             break;
         } else if (s->ext.early_data == SSL_EARLY_DATA_ACCEPTED
-                   && !SSL_NO_EOED(s)) {
+            && !SSL_NO_EOED(s)) {
             if (mt == SSL3_MT_END_OF_EARLY_DATA) {
                 st->hand_state = TLS_ST_SR_END_OF_EARLY_DATA;
                 return 1;
@@ -104,7 +104,7 @@ static int ossl_statem_server13_read_transition(SSL_CONNECTION *s, int mt)
             }
 #ifndef OPENSSL_NO_COMP_ALG
             if (mt == SSL3_MT_COMPRESSED_CERTIFICATE
-                    && s->ext.compress_certificate_sent) {
+                && s->ext.compress_certificate_sent) {
                 st->hand_state = TLS_ST_SR_COMP_CERT;
                 return 1;
             }
@@ -154,7 +154,7 @@ static int ossl_statem_server13_read_transition(SSL_CONNECTION *s, int mt)
             }
 #ifndef OPENSSL_NO_COMP_ALG
             if (mt == SSL3_MT_COMPRESSED_CERTIFICATE
-                    && s->ext.compress_certificate_sent) {
+                && s->ext.compress_certificate_sent) {
                 st->hand_state = TLS_ST_SR_COMP_CERT;
                 return 1;
             }
@@ -226,7 +226,7 @@ int ossl_statem_server_read_transition(SSL_CONNECTION *s, int mt)
                          * cert.
                          */
                         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                                 SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
+                            SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
                         return 0;
                     }
                     st->hand_state = TLS_ST_SR_KEY_EXCH;
@@ -321,7 +321,7 @@ int ossl_statem_server_read_transition(SSL_CONNECTION *s, int mt)
         break;
     }
 
- err:
+err:
     /* No valid transition found */
     if (SSL_CONNECTION_IS_DTLS(s) && mt == SSL3_MT_CHANGE_CIPHER_SPEC) {
         BIO *rbio;
@@ -361,10 +361,10 @@ static int send_server_key_exchange(SSL_CONNECTION *s)
      * key exchange.
      */
     if (alg_k & (SSL_kDHE | SSL_kECDHE)
-        /*
-         * PSK: send ServerKeyExchange if PSK identity hint if
-         * provided
-         */
+    /*
+     * PSK: send ServerKeyExchange if PSK identity hint if
+     * provided
+     */
 #ifndef OPENSSL_NO_PSK
         /* Only send SKE if we have identity hint for plain PSK */
         || ((alg_k & (SSL_kPSK | SSL_kRSAPSK))
@@ -376,7 +376,7 @@ static int send_server_key_exchange(SSL_CONNECTION *s)
         /* SRP: send ServerKeyExchange */
         || (alg_k & SSL_kSRP)
 #endif
-        ) {
+    ) {
         return 1;
     }
 
@@ -414,40 +414,39 @@ static int get_compressed_certificate_alg(SSL_CONNECTION *sc)
 int send_certificate_request(SSL_CONNECTION *s)
 {
     if (
-           /* don't request cert unless asked for it: */
-           s->verify_mode & SSL_VERIFY_PEER
-           /*
-            * don't request if post-handshake-only unless doing
-            * post-handshake in TLSv1.3:
-            */
-           && (!SSL_CONNECTION_IS_TLS13(s)
-               || !(s->verify_mode & SSL_VERIFY_POST_HANDSHAKE)
-               || s->post_handshake_auth == SSL_PHA_REQUEST_PENDING)
-           /*
-            * if SSL_VERIFY_CLIENT_ONCE is set, don't request cert
-            * a second time:
-            */
-           && (s->certreqs_sent < 1 ||
-               !(s->verify_mode & SSL_VERIFY_CLIENT_ONCE))
-           /*
-            * never request cert in anonymous ciphersuites (see
-            * section "Certificate request" in SSL 3 drafts and in
-            * RFC 2246):
-            */
-           && (!(s->s3.tmp.new_cipher->algorithm_auth & SSL_aNULL)
-               /*
-                * ... except when the application insists on
-                * verification (against the specs, but statem_clnt.c accepts
-                * this for SSL 3)
-                */
-               || (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT))
-           /* don't request certificate for SRP auth */
-           && !(s->s3.tmp.new_cipher->algorithm_auth & SSL_aSRP)
-           /*
-            * With normal PSK Certificates and Certificate Requests
-            * are omitted
-            */
-           && !(s->s3.tmp.new_cipher->algorithm_auth & SSL_aPSK)) {
+        /* don't request cert unless asked for it: */
+        s->verify_mode & SSL_VERIFY_PEER
+        /*
+         * don't request if post-handshake-only unless doing
+         * post-handshake in TLSv1.3:
+         */
+        && (!SSL_CONNECTION_IS_TLS13(s)
+            || !(s->verify_mode & SSL_VERIFY_POST_HANDSHAKE)
+            || s->post_handshake_auth == SSL_PHA_REQUEST_PENDING)
+        /*
+         * if SSL_VERIFY_CLIENT_ONCE is set, don't request cert
+         * a second time:
+         */
+        && (s->certreqs_sent < 1 || !(s->verify_mode & SSL_VERIFY_CLIENT_ONCE))
+        /*
+         * never request cert in anonymous ciphersuites (see
+         * section "Certificate request" in SSL 3 drafts and in
+         * RFC 2246):
+         */
+        && (!(s->s3.tmp.new_cipher->algorithm_auth & SSL_aNULL)
+            /*
+             * ... except when the application insists on
+             * verification (against the specs, but statem_clnt.c accepts
+             * this for SSL 3)
+             */
+            || (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT))
+        /* don't request certificate for SRP auth */
+        && !(s->s3.tmp.new_cipher->algorithm_auth & SSL_aSRP)
+        /*
+         * With normal PSK Certificates and Certificate Requests
+         * are omitted
+         */
+        && !(s->s3.tmp.new_cipher->algorithm_auth & SSL_aPSK)) {
         return 1;
     }
 
@@ -503,7 +502,7 @@ static WRITE_TRAN ossl_statem_server13_write_transition(SSL_CONNECTION *s)
 
     case TLS_ST_SW_SRVR_HELLO:
         if ((s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0
-                && s->hello_retry_request != SSL_HRR_COMPLETE)
+            && s->hello_retry_request != SSL_HRR_COMPLETE)
             st->hand_state = TLS_ST_SW_CHANGE;
         else if (s->hello_retry_request == SSL_HRR_PENDING)
             st->hand_state = TLS_ST_EARLY_DATA;
@@ -670,8 +669,7 @@ WRITE_TRAN ossl_statem_server_write_transition(SSL_CONNECTION *s)
         } else {
             /* Check if it is anon DH or anon ECDH, */
             /* normal PSK or SRP */
-            if (!(s->s3.tmp.new_cipher->algorithm_auth &
-                  (SSL_aNULL | SSL_aSRP | SSL_aPSK))) {
+            if (!(s->s3.tmp.new_cipher->algorithm_auth & (SSL_aNULL | SSL_aSRP | SSL_aPSK))) {
                 st->hand_state = TLS_ST_SW_CERT;
             } else if (send_server_key_exchange(s)) {
                 st->hand_state = TLS_ST_SW_KEY_EXCH;
@@ -791,7 +789,7 @@ WORK_STATE ossl_statem_server_pre_work(SSL_CONNECTION *s, WORK_STATE wst)
 
     case TLS_ST_SW_SESSION_TICKET:
         if (SSL_CONNECTION_IS_TLS13(s) && s->sent_tickets == 0
-                && s->ext.extra_tickets_expected == 0) {
+            && s->ext.extra_tickets_expected == 0) {
             /*
              * Actually this is the end of the handshake, but we're going
              * straight into writing the session ticket out. So we finish off
@@ -837,8 +835,22 @@ WORK_STATE ossl_statem_server_pre_work(SSL_CONNECTION *s, WORK_STATE wst)
 
     case TLS_ST_EARLY_DATA:
         if (s->early_data_state != SSL_EARLY_DATA_ACCEPTING
-                && (s->s3.flags & TLS1_FLAGS_STATELESS) == 0)
+            && (s->s3.flags & TLS1_FLAGS_STATELESS) == 0)
             return WORK_FINISHED_CONTINUE;
+
+        /*
+         * In QUIC with 0-RTT we just carry on when otherwise we would stop
+         * to allow the server to read early data
+         */
+        if (SSL_NO_EOED(s) && s->ext.early_data == SSL_EARLY_DATA_ACCEPTED
+            && s->early_data_state != SSL_EARLY_DATA_FINISHED_READING) {
+            s->early_data_state = SSL_EARLY_DATA_FINISHED_READING;
+            if (!ssl->method->ssl3_enc->change_cipher_state(s, SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_SERVER_READ)) {
+                SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+                return WORK_ERROR;
+            }
+            return WORK_FINISHED_SWAP;
+        }
         /* Fall through */
 
     case TLS_ST_OK:
@@ -913,7 +925,7 @@ WORK_STATE ossl_statem_server_post_work(SSL_CONNECTION *s, WORK_STATE wst)
         if (SSL_CONNECTION_IS_TLS13(s)
             && s->hello_retry_request == SSL_HRR_PENDING) {
             if ((s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) == 0
-                    && statem_flush(s) != 1)
+                && statem_flush(s) != 1)
                 return WORK_MORE_A;
             break;
         }
@@ -928,7 +940,7 @@ WORK_STATE ossl_statem_server_post_work(SSL_CONNECTION *s, WORK_STATE wst)
              * SCTP used.
              */
             memcpy(labelbuffer, DTLS1_SCTP_AUTH_LABEL,
-                   sizeof(DTLS1_SCTP_AUTH_LABEL));
+                sizeof(DTLS1_SCTP_AUTH_LABEL));
 
             /* Don't include the terminating zero. */
             labellen = sizeof(labelbuffer) - 1;
@@ -936,20 +948,21 @@ WORK_STATE ossl_statem_server_post_work(SSL_CONNECTION *s, WORK_STATE wst)
                 labellen += 1;
 
             if (SSL_export_keying_material(ssl, sctpauthkey,
-                                           sizeof(sctpauthkey), labelbuffer,
-                                           labellen, NULL, 0,
-                                           0) <= 0) {
+                    sizeof(sctpauthkey), labelbuffer,
+                    labellen, NULL, 0,
+                    0)
+                <= 0) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 return WORK_ERROR;
             }
 
             BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,
-                     sizeof(sctpauthkey), sctpauthkey);
+                sizeof(sctpauthkey), sctpauthkey);
         }
 #endif
         if (!SSL_CONNECTION_IS_TLS13(s)
-                || ((s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0
-                    && s->hello_retry_request != SSL_HRR_COMPLETE))
+            || ((s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0
+                && s->hello_retry_request != SSL_HRR_COMPLETE))
             break;
         /* Fall through */
 
@@ -962,15 +975,16 @@ WORK_STATE ossl_statem_server_post_work(SSL_CONNECTION *s, WORK_STATE wst)
 
         if (SSL_CONNECTION_IS_TLS13(s)) {
             if (!ssl->method->ssl3_enc->setup_key_block(s)
+                || !tls13_store_handshake_traffic_hash(s)
                 || !ssl->method->ssl3_enc->change_cipher_state(s,
-                        SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_SERVER_WRITE)) {
+                    SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_SERVER_WRITE)) {
                 /* SSLfatal() already called */
                 return WORK_ERROR;
             }
 
             if (s->ext.early_data != SSL_EARLY_DATA_ACCEPTED
                 && !ssl->method->ssl3_enc->change_cipher_state(s,
-                        SSL3_CC_HANDSHAKE |SSL3_CHANGE_CIPHER_SERVER_READ)) {
+                    SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_SERVER_READ)) {
                 /* SSLfatal() already called */
                 return WORK_ERROR;
             }
@@ -991,11 +1005,11 @@ WORK_STATE ossl_statem_server_post_work(SSL_CONNECTION *s, WORK_STATE wst)
              * no SCTP used.
              */
             BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY,
-                     0, NULL);
+                0, NULL);
         }
 #endif
         if (!ssl->method->ssl3_enc->change_cipher_state(s,
-                                SSL3_CHANGE_CIPHER_SERVER_WRITE)) {
+                SSL3_CHANGE_CIPHER_SERVER_WRITE)) {
             /* SSLfatal() already called */
             return WORK_ERROR;
         }
@@ -1016,19 +1030,20 @@ WORK_STATE ossl_statem_server_post_work(SSL_CONNECTION *s, WORK_STATE wst)
              * no SCTP used.
              */
             BIO_ctrl(SSL_get_wbio(ssl), BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY,
-                     0, NULL);
+                0, NULL);
         }
 #endif
         if (SSL_CONNECTION_IS_TLS13(s)) {
             /* TLS 1.3 gets the secret size from the handshake md */
             size_t dummy;
             if (!ssl->method->ssl3_enc->generate_master_secret(s,
-                        s->master_secret, s->handshake_secret, 0,
-                        &dummy)
+                    s->master_secret, s->handshake_secret, 0,
+                    &dummy)
+                || !tls13_store_server_finished_hash(s)
                 || !ssl->method->ssl3_enc->change_cipher_state(s,
-                        SSL3_CC_APPLICATION | SSL3_CHANGE_CIPHER_SERVER_WRITE))
-            /* SSLfatal() already called */
-            return WORK_ERROR;
+                    SSL3_CC_APPLICATION | SSL3_CHANGE_CIPHER_SERVER_WRITE))
+                /* SSLfatal() already called */
+                return WORK_ERROR;
         }
         break;
 
@@ -1038,7 +1053,7 @@ WORK_STATE ossl_statem_server_post_work(SSL_CONNECTION *s, WORK_STATE wst)
                 return WORK_MORE_A;
         } else {
             if (!SSL_CONNECTION_IS_TLS13(s)
-                    || (s->options & SSL_OP_NO_TX_CERTIFICATE_COMPRESSION) != 0)
+                || (s->options & SSL_OP_NO_TX_CERTIFICATE_COMPRESSION) != 0)
                 s->ext.compress_certificate_from_peer[0] = TLSEXT_comp_cert_none;
         }
         break;
@@ -1046,7 +1061,7 @@ WORK_STATE ossl_statem_server_post_work(SSL_CONNECTION *s, WORK_STATE wst)
     case TLS_ST_SW_ENCRYPTED_EXTENSIONS:
         if (!s->hit && !send_certificate_request(s)) {
             if (!SSL_CONNECTION_IS_TLS13(s)
-                    || (s->options & SSL_OP_NO_TX_CERTIFICATE_COMPRESSION) != 0)
+                || (s->options & SSL_OP_NO_TX_CERTIFICATE_COMPRESSION) != 0)
                 s->ext.compress_certificate_from_peer[0] = TLSEXT_comp_cert_none;
         }
         break;
@@ -1064,7 +1079,7 @@ WORK_STATE ossl_statem_server_post_work(SSL_CONNECTION *s, WORK_STATE wst)
         clear_sys_error();
         if (SSL_CONNECTION_IS_TLS13(s) && statem_flush(s) != 1) {
             if (SSL_get_error(ssl, 0) == SSL_ERROR_SYSCALL
-                    && conn_is_closed()) {
+                && conn_is_closed()) {
                 /*
                  * We ignore connection closed errors in TLSv1.3 when sending a
                  * NewSessionTicket and behave as if we were successful. This is
@@ -1093,7 +1108,7 @@ WORK_STATE ossl_statem_server_post_work(SSL_CONNECTION *s, WORK_STATE wst)
  *   0: Error
  */
 int ossl_statem_server_construct_message(SSL_CONNECTION *s,
-                                         confunc_f *confunc, int *mt)
+    confunc_f *confunc, int *mt)
 {
     OSSL_STATEM *st = &s->statem;
 
@@ -1144,7 +1159,6 @@ int ossl_statem_server_construct_message(SSL_CONNECTION *s,
         *mt = SSL3_MT_CERTIFICATE_VERIFY;
         break;
 
-
     case TLS_ST_SW_KEY_EXCH:
         *confunc = tls_construct_server_key_exchange;
         *mt = SSL3_MT_SERVER_KEY_EXCHANGE;
@@ -1209,10 +1223,10 @@ int ossl_statem_server_construct_message(SSL_CONNECTION *s,
  *  2 + # length of extensions
  *  2^16-1 # maximum length of extensions
  */
-#define CLIENT_HELLO_MAX_LENGTH         131396
+#define CLIENT_HELLO_MAX_LENGTH 131396
 
-#define CLIENT_KEY_EXCH_MAX_LENGTH      2048
-#define NEXT_PROTO_MAX_LENGTH           514
+#define CLIENT_KEY_EXCH_MAX_LENGTH 2048
+#define NEXT_PROTO_MAX_LENGTH 514
 
 /*
  * Returns the maximum allowed length for the current message that we are
@@ -1263,7 +1277,7 @@ size_t ossl_statem_server_max_message_size(SSL_CONNECTION *s)
  * Process a message that the server has received from the client.
  */
 MSG_PROCESS_RETURN ossl_statem_server_process_message(SSL_CONNECTION *s,
-                                                      PACKET *pkt)
+    PACKET *pkt)
 {
     OSSL_STATEM *st = &s->statem;
 
@@ -1306,7 +1320,6 @@ MSG_PROCESS_RETURN ossl_statem_server_process_message(SSL_CONNECTION *s,
 
     case TLS_ST_SR_KEY_UPDATE:
         return tls_process_key_update(s, pkt);
-
     }
 }
 
@@ -1315,7 +1328,7 @@ MSG_PROCESS_RETURN ossl_statem_server_process_message(SSL_CONNECTION *s,
  * from the client
  */
 WORK_STATE ossl_statem_server_post_process_message(SSL_CONNECTION *s,
-                                                   WORK_STATE wst)
+    WORK_STATE wst)
 {
     OSSL_STATEM *st = &s->statem;
 
@@ -1340,15 +1353,14 @@ static int ssl_check_srp_ext_ClientHello(SSL_CONNECTION *s)
     int ret;
     int al = SSL_AD_UNRECOGNIZED_NAME;
 
-    if ((s->s3.tmp.new_cipher->algorithm_mkey & SSL_kSRP) &&
-        (s->srp_ctx.TLS_ext_srp_username_callback != NULL)) {
+    if ((s->s3.tmp.new_cipher->algorithm_mkey & SSL_kSRP) && (s->srp_ctx.TLS_ext_srp_username_callback != NULL)) {
         if (s->srp_ctx.login == NULL) {
             /*
              * RFC 5054 says SHOULD reject, we do so if There is no srp
              * login name
              */
             SSLfatal(s, SSL_AD_UNKNOWN_PSK_IDENTITY,
-                     SSL_R_PSK_IDENTITY_NOT_FOUND);
+                SSL_R_PSK_IDENTITY_NOT_FOUND);
             return -1;
         } else {
             ret = ssl_srp_server_param_with_username_intern(s, &al);
@@ -1356,9 +1368,9 @@ static int ssl_check_srp_ext_ClientHello(SSL_CONNECTION *s)
                 return 0;
             if (ret == SSL3_AL_FATAL) {
                 SSLfatal(s, al,
-                         al == SSL_AD_UNKNOWN_PSK_IDENTITY
-                         ? SSL_R_PSK_IDENTITY_NOT_FOUND
-                         : SSL_R_CLIENTHELLO_TLSEXT);
+                    al == SSL_AD_UNKNOWN_PSK_IDENTITY
+                        ? SSL_R_PSK_IDENTITY_NOT_FOUND
+                        : SSL_R_CLIENTHELLO_TLSEXT);
                 return -1;
             }
         }
@@ -1368,25 +1380,26 @@ static int ssl_check_srp_ext_ClientHello(SSL_CONNECTION *s)
 #endif
 
 int dtls_raw_hello_verify_request(WPACKET *pkt, unsigned char *cookie,
-                                  size_t cookie_len)
+    size_t cookie_len)
 {
     /* Always use DTLS 1.0 version: see RFC 6347 */
     if (!WPACKET_put_bytes_u16(pkt, DTLS1_VERSION)
-            || !WPACKET_sub_memcpy_u8(pkt, cookie, cookie_len))
+        || !WPACKET_sub_memcpy_u8(pkt, cookie, cookie_len))
         return 0;
 
     return 1;
 }
 
 CON_FUNC_RETURN dtls_construct_hello_verify_request(SSL_CONNECTION *s,
-                                                    WPACKET *pkt)
+    WPACKET *pkt)
 {
     unsigned int cookie_leni;
     SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(s);
 
     if (sctx->app_gen_cookie_cb == NULL
         || sctx->app_gen_cookie_cb(SSL_CONNECTION_GET_USER_SSL(s), s->d1->cookie,
-                                   &cookie_leni) == 0
+               &cookie_leni)
+            == 0
         || cookie_leni > DTLS1_COOKIE_LENGTH) {
         SSLfatal(s, SSL_AD_NO_ALERT, SSL_R_COOKIE_GEN_CALLBACK_FAILURE);
         return CON_FUNC_ERROR;
@@ -1394,7 +1407,7 @@ CON_FUNC_RETURN dtls_construct_hello_verify_request(SSL_CONNECTION *s,
     s->d1->cookie_len = cookie_leni;
 
     if (!dtls_raw_hello_verify_request(pkt, s->d1->cookie,
-                                       s->d1->cookie_len)) {
+            s->d1->cookie_len)) {
         SSLfatal(s, SSL_AD_NO_ALERT, ERR_R_INTERNAL_ERROR);
         return CON_FUNC_ERROR;
     }
@@ -1417,29 +1430,45 @@ CON_FUNC_RETURN dtls_construct_hello_verify_request(SSL_CONNECTION *s,
  * 10.8..10.8.3 (which don't work).
  */
 static void ssl_check_for_safari(SSL_CONNECTION *s,
-                                 const CLIENTHELLO_MSG *hello)
+    const CLIENTHELLO_MSG *hello)
 {
     static const unsigned char kSafariExtensionsBlock[] = {
-        0x00, 0x0a,             /* elliptic_curves extension */
-        0x00, 0x08,             /* 8 bytes */
-        0x00, 0x06,             /* 6 bytes of curve ids */
-        0x00, 0x17,             /* P-256 */
-        0x00, 0x18,             /* P-384 */
-        0x00, 0x19,             /* P-521 */
-
-        0x00, 0x0b,             /* ec_point_formats */
-        0x00, 0x02,             /* 2 bytes */
-        0x01,                   /* 1 point format */
-        0x00,                   /* uncompressed */
+        0x00,
+        0x0a, /* elliptic_curves extension */
+        0x00,
+        0x08, /* 8 bytes */
+        0x00,
+        0x06, /* 6 bytes of curve ids */
+        0x00,
+        0x17, /* P-256 */
+        0x00,
+        0x18, /* P-384 */
+        0x00,
+        0x19, /* P-521 */
+
+        0x00,
+        0x0b, /* ec_point_formats */
+        0x00,
+        0x02, /* 2 bytes */
+        0x01, /* 1 point format */
+        0x00, /* uncompressed */
         /* The following is only present in TLS 1.2 */
-        0x00, 0x0d,             /* signature_algorithms */
-        0x00, 0x0c,             /* 12 bytes */
-        0x00, 0x0a,             /* 10 bytes */
-        0x05, 0x01,             /* SHA-384/RSA */
-        0x04, 0x01,             /* SHA-256/RSA */
-        0x02, 0x01,             /* SHA-1/RSA */
-        0x04, 0x03,             /* SHA-256/ECDSA */
-        0x02, 0x03,             /* SHA-1/ECDSA */
+        0x00,
+        0x0d, /* signature_algorithms */
+        0x00,
+        0x0c, /* 12 bytes */
+        0x00,
+        0x0a, /* 10 bytes */
+        0x05,
+        0x01, /* SHA-384/RSA */
+        0x04,
+        0x01, /* SHA-256/RSA */
+        0x02,
+        0x01, /* SHA-1/RSA */
+        0x04,
+        0x03, /* SHA-256/ECDSA */
+        0x02,
+        0x03, /* SHA-1/ECDSA */
     };
     /* Length of the common prefix (first two extensions). */
     static const size_t kSafariCommonExtensionsLength = 18;
@@ -1459,16 +1488,18 @@ static void ssl_check_for_safari(SSL_CONNECTION *s,
         return;
 
     ext_len = TLS1_get_client_version(
-        SSL_CONNECTION_GET_SSL(s)) >= TLS1_2_VERSION ?
-                      sizeof(kSafariExtensionsBlock) : kSafariCommonExtensionsLength;
+                  SSL_CONNECTION_GET_SSL(s))
+            >= TLS1_2_VERSION
+        ? sizeof(kSafariExtensionsBlock)
+        : kSafariCommonExtensionsLength;
 
     s->s3.is_probably_safari = PACKET_equal(&tmppkt, kSafariExtensionsBlock,
-                                             ext_len);
+        ext_len);
 }
 
-#define RENEG_OPTIONS_OK(options) \
+#define RENEG_OPTIONS_OK(options)             \
     ((options & SSL_OP_NO_RENEGOTIATION) == 0 \
-     && (options & SSL_OP_ALLOW_CLIENT_RENEGOTIATION) != 0)
+        && (options & SSL_OP_ALLOW_CLIENT_RENEGOTIATION) != 0)
 
 MSG_PROCESS_RETURN tls_process_client_hello(SSL_CONNECTION *s, PACKET *pkt)
 {
@@ -1484,9 +1515,10 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL_CONNECTION *s, PACKET *pkt)
             goto err;
         }
         if (!RENEG_OPTIONS_OK(s->options)
-                || (!s->s3.send_connection_binding
-                    && (s->options
-                        & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION) == 0)) {
+            || (!s->s3.send_connection_binding
+                && (s->options
+                       & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)
+                    == 0)) {
             ssl3_send_alert(s, SSL3_AL_WARNING, SSL_AD_NO_RENEGOTIATION);
             return MSG_PROCESS_FINISHED_READING;
         }
@@ -1510,7 +1542,7 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL_CONNECTION *s, PACKET *pkt)
         unsigned int mt;
 
         if (!SSL_IS_FIRST_HANDSHAKE(s)
-                || s->hello_retry_request != SSL_HRR_NONE) {
+            || s->hello_retry_request != SSL_HRR_NONE) {
             SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_R_UNEXPECTED_MESSAGE);
             goto err;
         }
@@ -1570,7 +1602,7 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL_CONNECTION *s, PACKET *pkt)
         }
 
         if (!PACKET_get_sub_packet(pkt, &clienthello->ciphersuites,
-                                   ciphersuite_len)
+                ciphersuite_len)
             || !PACKET_copy_bytes(pkt, clienthello->session_id, session_id_len)
             || !PACKET_get_sub_packet(pkt, &challenge, challenge_len)
             /* No extensions. */
@@ -1586,11 +1618,11 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL_CONNECTION *s, PACKET *pkt)
          * sizeof(clienthello->random) does.
          */
         challenge_len = challenge_len > SSL3_RANDOM_SIZE
-                        ? SSL3_RANDOM_SIZE : challenge_len;
+            ? SSL3_RANDOM_SIZE
+            : challenge_len;
         memset(clienthello->random, 0, SSL3_RANDOM_SIZE);
         if (!PACKET_copy_bytes(&challenge,
-                               clienthello->random + SSL3_RANDOM_SIZE -
-                               challenge_len, challenge_len)
+                clienthello->random + SSL3_RANDOM_SIZE - challenge_len, challenge_len)
             /* Advertise only null compression. */
             || !PACKET_buf_init(&compression, &null_compression, 1)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -1603,8 +1635,8 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL_CONNECTION *s, PACKET *pkt)
         if (!PACKET_copy_bytes(pkt, clienthello->random, SSL3_RANDOM_SIZE)
             || !PACKET_get_length_prefixed_1(pkt, &session_id)
             || !PACKET_copy_all(&session_id, clienthello->session_id,
-                    SSL_MAX_SSL_SESSION_ID_LENGTH,
-                    &clienthello->session_id_len)) {
+                SSL_MAX_SSL_SESSION_ID_LENGTH,
+                &clienthello->session_id_len)) {
             SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
             goto err;
         }
@@ -1615,8 +1647,8 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL_CONNECTION *s, PACKET *pkt)
                 goto err;
             }
             if (!PACKET_copy_all(&cookie, clienthello->dtls_cookie,
-                                 DTLS1_COOKIE_LENGTH,
-                                 &clienthello->dtls_cookie_len)) {
+                    DTLS1_COOKIE_LENGTH,
+                    &clienthello->dtls_cookie_len)) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 goto err;
             }
@@ -1648,7 +1680,7 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL_CONNECTION *s, PACKET *pkt)
             PACKET_null_init(&clienthello->extensions);
         } else {
             if (!PACKET_get_length_prefixed_2(pkt, &clienthello->extensions)
-                    || PACKET_remaining(pkt) != 0) {
+                || PACKET_remaining(pkt) != 0) {
                 SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
                 goto err;
             }
@@ -1656,8 +1688,8 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL_CONNECTION *s, PACKET *pkt)
     }
 
     if (!PACKET_copy_all(&compression, clienthello->compressions,
-                         MAX_COMPRESSIONS_SIZE,
-                         &clienthello->compressions_len)) {
+            MAX_COMPRESSIONS_SIZE,
+            &clienthello->compressions_len)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -1665,8 +1697,8 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL_CONNECTION *s, PACKET *pkt)
     /* Preserve the raw extensions PACKET for later use */
     extensions = clienthello->extensions;
     if (!tls_collect_extensions(s, &extensions, SSL_EXT_CLIENT_HELLO,
-                                &clienthello->pre_proc_exts,
-                                &clienthello->pre_proc_exts_len, 1)) {
+            &clienthello->pre_proc_exts,
+            &clienthello->pre_proc_exts_len, 1)) {
         /* SSLfatal already been called */
         goto err;
     }
@@ -1674,7 +1706,7 @@ MSG_PROCESS_RETURN tls_process_client_hello(SSL_CONNECTION *s, PACKET *pkt)
 
     return MSG_PROCESS_CONTINUE_PROCESSING;
 
- err:
+err:
     if (clienthello != NULL)
         OPENSSL_free(clienthello->pre_proc_exts);
     OPENSSL_free(clienthello);
@@ -1724,8 +1756,8 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
 
     if (clienthello->isv2) {
         if (clienthello->legacy_version == SSL2_VERSION
-                || (clienthello->legacy_version & 0xff00)
-                   != (SSL3_VERSION_MAJOR << 8)) {
+            || (clienthello->legacy_version & 0xff00)
+                != (SSL3_VERSION_MAJOR << 8)) {
             /*
              * This is real SSLv2 or something completely unknown. We don't
              * support it.
@@ -1761,16 +1793,18 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
         if (SSL_get_options(ssl) & SSL_OP_COOKIE_EXCHANGE) {
             if (sctx->app_verify_cookie_cb != NULL) {
                 if (sctx->app_verify_cookie_cb(ussl, clienthello->dtls_cookie,
-                                               clienthello->dtls_cookie_len) == 0) {
+                        clienthello->dtls_cookie_len)
+                    == 0) {
                     SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                             SSL_R_COOKIE_MISMATCH);
+                        SSL_R_COOKIE_MISMATCH);
                     goto err;
                     /* else cookie verification succeeded */
                 }
                 /* default verification */
             } else if (s->d1->cookie_len != clienthello->dtls_cookie_len
-                    || memcmp(clienthello->dtls_cookie, s->d1->cookie,
-                              s->d1->cookie_len) != 0) {
+                || memcmp(clienthello->dtls_cookie, s->d1->cookie,
+                       s->d1->cookie_len)
+                    != 0) {
                 SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_COOKIE_MISMATCH);
                 goto err;
             }
@@ -1781,9 +1815,9 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
     s->hit = 0;
 
     if (!ssl_cache_cipherlist(s, &clienthello->ciphersuites,
-                              clienthello->isv2) ||
-        !ossl_bytes_to_cipher_list(s, &clienthello->ciphersuites, &ciphers,
-                                   &scsvs, clienthello->isv2, 1)) {
+            clienthello->isv2)
+        || !ossl_bytes_to_cipher_list(s, &clienthello->ciphersuites, &ciphers,
+            &scsvs, clienthello->isv2, 1)) {
         /* SSLfatal() already called */
         goto err;
     }
@@ -1797,12 +1831,11 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
                 if (s->renegotiate) {
                     /* SCSV is fatal if renegotiating */
                     SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                             SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING);
+                        SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING);
                     goto err;
                 }
                 s->s3.send_connection_binding = 1;
-            } else if (SSL_CIPHER_get_id(c) == SSL3_CK_FALLBACK_SCSV &&
-                       !ssl_check_version_downgrade(s)) {
+            } else if (SSL_CIPHER_get_id(c) == SSL3_CK_FALLBACK_SCSV && !ssl_check_version_downgrade(s)) {
                 /*
                  * This SCSV indicates that the client previously tried
                  * a higher version.  We should fail if the current version
@@ -1811,7 +1844,7 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
                  * an insecure downgrade.
                  */
                 SSLfatal(s, SSL_AD_INAPPROPRIATE_FALLBACK,
-                         SSL_R_INAPPROPRIATE_FALLBACK);
+                    SSL_R_INAPPROPRIATE_FALLBACK);
                 goto err;
             }
         }
@@ -1819,16 +1852,15 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
 
     /* For TLSv1.3 we must select the ciphersuite *before* session resumption */
     if (SSL_CONNECTION_IS_TLS13(s)) {
-        const SSL_CIPHER *cipher =
-            ssl3_choose_cipher(s, ciphers, SSL_get_ciphers(ssl));
+        const SSL_CIPHER *cipher = ssl3_choose_cipher(s, ciphers, SSL_get_ciphers(ssl));
 
         if (cipher == NULL) {
             SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_NO_SHARED_CIPHER);
             goto err;
         }
         if (s->hello_retry_request == SSL_HRR_PENDING
-                && (s->s3.tmp.new_cipher == NULL
-                    || s->s3.tmp.new_cipher->id != cipher->id)) {
+            && (s->s3.tmp.new_cipher == NULL
+                || s->s3.tmp.new_cipher->id != cipher->id)) {
             /*
              * A previous HRR picked a different ciphersuite to the one we
              * just selected. Something must have changed.
@@ -1841,8 +1873,8 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
 
     /* We need to do this before getting the session */
     if (!tls_parse_extension(s, TLSEXT_IDX_extended_master_secret,
-                             SSL_EXT_CLIENT_HELLO,
-                             clienthello->pre_proc_exts, NULL, 0)) {
+            SSL_EXT_CLIENT_HELLO,
+            clienthello->pre_proc_exts, NULL, 0)) {
         /* SSLfatal() already called */
         goto err;
     }
@@ -1863,9 +1895,7 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
      * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION setting will be
      * ignored.
      */
-    if (clienthello->isv2 ||
-        (s->new_session &&
-         (s->options & SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION))) {
+    if (clienthello->isv2 || (s->new_session && (s->options & SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION))) {
         if (!ssl_get_new_session(s, 1)) {
             /* SSLfatal() already called */
             goto err;
@@ -1889,7 +1919,7 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
 
     if (SSL_CONNECTION_IS_TLS13(s)) {
         memcpy(s->tmp_session_id, s->clienthello->session_id,
-               s->clienthello->session_id_len);
+            s->clienthello->session_id_len);
         s->tmp_session_id_len = s->clienthello->session_id_len;
     }
 
@@ -1901,15 +1931,16 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
         j = 0;
         id = s->session->cipher->id;
 
-        OSSL_TRACE_BEGIN(TLS_CIPHER) {
+        OSSL_TRACE_BEGIN(TLS_CIPHER)
+        {
             BIO_printf(trc_out, "client sent %d ciphers\n",
-                       sk_SSL_CIPHER_num(ciphers));
+                sk_SSL_CIPHER_num(ciphers));
         }
         for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) {
             c = sk_SSL_CIPHER_value(ciphers, i);
             if (trc_out != NULL)
                 BIO_printf(trc_out, "client [%2d of %2d]:%s\n", i,
-                           sk_SSL_CIPHER_num(ciphers), SSL_CIPHER_get_name(c));
+                    sk_SSL_CIPHER_num(ciphers), SSL_CIPHER_get_name(c));
             if (c->id == id) {
                 j = 1;
                 break;
@@ -1921,7 +1952,7 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
              * to reuse it
              */
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                     SSL_R_REQUIRED_CIPHER_MISSING);
+                SSL_R_REQUIRED_CIPHER_MISSING);
             OSSL_TRACE_CANCEL(TLS_CIPHER);
             goto err;
         }
@@ -1935,9 +1966,10 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
     }
     /* Make sure at least the null compression is supported. */
     if (memchr(clienthello->compressions, 0,
-               clienthello->compressions_len) == NULL) {
+            clienthello->compressions_len)
+        == NULL) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                 SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING);
+            SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING);
         goto err;
     }
 
@@ -1946,7 +1978,7 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
 
     /* TLS extensions */
     if (!tls_parse_all_extensions(s, SSL_EXT_CLIENT_HELLO,
-                                  clienthello->pre_proc_exts, NULL, 0, 1)) {
+            clienthello->pre_proc_exts, NULL, 0, 1)) {
         /* SSLfatal() already called */
         goto err;
     }
@@ -1972,10 +2004,10 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
     }
 
     if (!s->hit
-            && s->version >= TLS1_VERSION
-            && !SSL_CONNECTION_IS_TLS13(s)
-            && !SSL_CONNECTION_IS_DTLS(s)
-            && s->ext.session_secret_cb != NULL) {
+        && s->version >= TLS1_VERSION
+        && !SSL_CONNECTION_IS_TLS13(s)
+        && !SSL_CONNECTION_IS_DTLS(s)
+        && s->ext.session_secret_cb != NULL) {
         const SSL_CIPHER *pref_cipher = NULL;
         /*
          * s->session->master_key_length is a size_t, but this is an int for
@@ -1985,10 +2017,10 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
 
         master_key_length = sizeof(s->session->master_key);
         if (s->ext.session_secret_cb(ussl, s->session->master_key,
-                                     &master_key_length, ciphers,
-                                     &pref_cipher,
-                                     s->ext.session_secret_cb_arg)
-                && master_key_length > 0) {
+                &master_key_length, ciphers,
+                &pref_cipher,
+                s->ext.session_secret_cb_arg)
+            && master_key_length > 0) {
             s->session->master_key_length = master_key_length;
             s->hit = 1;
             s->peer_ciphers = ciphers;
@@ -1999,7 +2031,7 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
             /* check if some cipher was preferred by call back */
             if (pref_cipher == NULL)
                 pref_cipher = ssl3_choose_cipher(s, s->peer_ciphers,
-                                                 SSL_get_ciphers(ssl));
+                    SSL_get_ciphers(ssl));
             if (pref_cipher == NULL) {
                 SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_NO_SHARED_CIPHER);
                 goto err;
@@ -2027,7 +2059,7 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
          */
         if (clienthello->compressions_len != 1) {
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                     SSL_R_INVALID_COMPRESSION_ALGORITHM);
+                SSL_R_INVALID_COMPRESSION_ALGORITHM);
             goto err;
         }
     }
@@ -2040,7 +2072,7 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
         /* Can't disable compression */
         if (!ssl_allow_compression(s)) {
             SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                     SSL_R_INCONSISTENT_COMPRESSION);
+                SSL_R_INCONSISTENT_COMPRESSION);
             goto err;
         }
         /* Look for resumed compression method */
@@ -2053,7 +2085,7 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
         }
         if (s->s3.tmp.new_compression == NULL) {
             SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                     SSL_R_INVALID_COMPRESSION_ALGORITHM);
+                SSL_R_INVALID_COMPRESSION_ALGORITHM);
             goto err;
         }
         /* Look for resumed method in compression list */
@@ -2063,7 +2095,7 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
         }
         if (k >= clienthello->compressions_len) {
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                     SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING);
+                SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING);
             goto err;
         }
     } else if (s->hit) {
@@ -2130,7 +2162,7 @@ static int tls_early_post_process_client_hello(SSL_CONNECTION *s)
     OPENSSL_free(s->clienthello);
     s->clienthello = NULL;
     return 1;
- err:
+err:
     sk_SSL_CIPHER_free(ciphers);
     sk_SSL_CIPHER_free(scsvs);
     OPENSSL_free(clienthello->pre_proc_exts);
@@ -2157,7 +2189,7 @@ static int tls_handle_status_request(SSL_CONNECTION *s)
      * influence which certificate is sent
      */
     if (s->ext.status_type != TLSEXT_STATUSTYPE_nothing && sctx != NULL
-            && sctx->ext.status_cb != NULL) {
+        && sctx->ext.status_cb != NULL) {
         int ret;
 
         /* If no certificate can't return certificate status */
@@ -2168,7 +2200,7 @@ static int tls_handle_status_request(SSL_CONNECTION *s)
              */
             s->cert->key = s->s3.tmp.cert;
             ret = sctx->ext.status_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                      sctx->ext.status_arg);
+                sctx->ext.status_arg);
             switch (ret) {
                 /* We don't want to send a status request response */
             case SSL_TLSEXT_ERR_NOACK:
@@ -2203,10 +2235,10 @@ int tls_handle_alpn(SSL_CONNECTION *s)
 
     if (sctx->ext.alpn_select_cb != NULL && s->s3.alpn_proposed != NULL) {
         int r = sctx->ext.alpn_select_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                         &selected, &selected_len,
-                                         s->s3.alpn_proposed,
-                                         (unsigned int)s->s3.alpn_proposed_len,
-                                         sctx->ext.alpn_select_cb_arg);
+            &selected, &selected_len,
+            s->s3.alpn_proposed,
+            (unsigned int)s->s3.alpn_proposed_len,
+            sctx->ext.alpn_select_cb_arg);
 
         if (r == SSL_TLSEXT_ERR_OK) {
             OPENSSL_free(s->s3.alpn_selected);
@@ -2224,9 +2256,10 @@ int tls_handle_alpn(SSL_CONNECTION *s)
 
             /* Check ALPN is consistent with session */
             if (s->session->ext.alpn_selected == NULL
-                        || selected_len != s->session->ext.alpn_selected_len
-                        || memcmp(selected, s->session->ext.alpn_selected,
-                                  selected_len) != 0) {
+                || selected_len != s->session->ext.alpn_selected_len
+                || memcmp(selected, s->session->ext.alpn_selected,
+                       selected_len)
+                    != 0) {
                 /* Not consistent so can't be used for early_data */
                 s->ext.early_data_ok = 0;
 
@@ -2238,14 +2271,14 @@ int tls_handle_alpn(SSL_CONNECTION *s)
                      */
                     if (!ossl_assert(s->session->ext.alpn_selected == NULL)) {
                         SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                                 ERR_R_INTERNAL_ERROR);
+                            ERR_R_INTERNAL_ERROR);
                         return 0;
                     }
                     s->session->ext.alpn_selected = OPENSSL_memdup(selected,
-                                                                   selected_len);
+                        selected_len);
                     if (s->session->ext.alpn_selected == NULL) {
                         SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                                 ERR_R_INTERNAL_ERROR);
+                            ERR_R_INTERNAL_ERROR);
                         return 0;
                     }
                     s->session->ext.alpn_selected_len = selected_len;
@@ -2255,7 +2288,7 @@ int tls_handle_alpn(SSL_CONNECTION *s)
             return 1;
         } else if (r != SSL_TLSEXT_ERR_NOACK) {
             SSLfatal(s, SSL_AD_NO_APPLICATION_PROTOCOL,
-                     SSL_R_NO_APPLICATION_PROTOCOL);
+                SSL_R_NO_APPLICATION_PROTOCOL);
             return 0;
         }
         /*
@@ -2308,13 +2341,12 @@ WORK_STATE tls_post_process_client_hello(SSL_CONNECTION *s, WORK_STATE wst)
 
             /* In TLSv1.3 we selected the ciphersuite before resumption */
             if (!SSL_CONNECTION_IS_TLS13(s)) {
-                cipher =
-                    ssl3_choose_cipher(s, s->peer_ciphers,
-                                       SSL_get_ciphers(ssl));
+                cipher = ssl3_choose_cipher(s, s->peer_ciphers,
+                    SSL_get_ciphers(ssl));
 
                 if (cipher == NULL) {
                     SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                             SSL_R_NO_SHARED_CIPHER);
+                        SSL_R_NO_SHARED_CIPHER);
                     goto err;
                 }
                 s->s3.tmp.new_cipher = cipher;
@@ -2326,10 +2358,10 @@ WORK_STATE tls_post_process_client_hello(SSL_CONNECTION *s, WORK_STATE wst)
                 }
                 /* check whether we should disable session resumption */
                 if (s->not_resumable_session_cb != NULL)
-                    s->session->not_resumable =
-                        s->not_resumable_session_cb(ussl,
-                            ((s->s3.tmp.new_cipher->algorithm_mkey
-                              & (SSL_kDHE | SSL_kECDHE)) != 0));
+                    s->session->not_resumable = s->not_resumable_session_cb(ussl,
+                        ((s->s3.tmp.new_cipher->algorithm_mkey
+                             & (SSL_kDHE | SSL_kECDHE))
+                            != 0));
                 if (s->session->not_resumable)
                     /* do not send a session ticket */
                     s->ext.ticket_expected = 0;
@@ -2390,7 +2422,7 @@ WORK_STATE tls_post_process_client_hello(SSL_CONNECTION *s, WORK_STATE wst)
 #endif
 
     return WORK_FINISHED_STOP;
- err:
+err:
     return WORK_ERROR;
 }
 
@@ -2401,18 +2433,19 @@ CON_FUNC_RETURN tls_construct_server_hello(SSL_CONNECTION *s, WPACKET *pkt)
     int version;
     unsigned char *session_id;
     int usetls13 = SSL_CONNECTION_IS_TLS13(s)
-                   || s->hello_retry_request == SSL_HRR_PENDING;
+        || s->hello_retry_request == SSL_HRR_PENDING;
 
     version = usetls13 ? TLS1_2_VERSION : s->version;
     if (!WPACKET_put_bytes_u16(pkt, version)
-               /*
-                * Random stuff. Filling of the server_random takes place in
-                * tls_process_client_hello()
-                */
-            || !WPACKET_memcpy(pkt,
-                               s->hello_retry_request == SSL_HRR_PENDING
-                                   ? hrrrandom : s->s3.server_random,
-                               SSL3_RANDOM_SIZE)) {
+        /*
+         * Random stuff. Filling of the server_random takes place in
+         * tls_process_client_hello()
+         */
+        || !WPACKET_memcpy(pkt,
+            s->hello_retry_request == SSL_HRR_PENDING
+                ? hrrrandom
+                : s->s3.server_random,
+            SSL3_RANDOM_SIZE)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return CON_FUNC_ERROR;
     }
@@ -2436,7 +2469,7 @@ CON_FUNC_RETURN tls_construct_server_hello(SSL_CONNECTION *s, WPACKET *pkt)
      * to send back.
      */
     if (!(SSL_CONNECTION_GET_CTX(s)->session_cache_mode & SSL_SESS_CACHE_SERVER)
-            && !s->hit)
+        && !s->hit)
         s->session->session_id_length = 0;
 
     if (usetls13) {
@@ -2463,20 +2496,20 @@ CON_FUNC_RETURN tls_construct_server_hello(SSL_CONNECTION *s, WPACKET *pkt)
 #endif
 
     if (!WPACKET_sub_memcpy_u8(pkt, session_id, sl)
-            || !SSL_CONNECTION_GET_SSL(s)->method->put_cipher_by_char(s->s3.tmp.new_cipher,
-                                                                      pkt, &len)
-            || !WPACKET_put_bytes_u8(pkt, compm)) {
+        || !SSL_CONNECTION_GET_SSL(s)->method->put_cipher_by_char(s->s3.tmp.new_cipher,
+            pkt, &len)
+        || !WPACKET_put_bytes_u8(pkt, compm)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return CON_FUNC_ERROR;
     }
 
     if (!tls_construct_extensions(s, pkt,
-                                  s->hello_retry_request == SSL_HRR_PENDING
-                                      ? SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST
-                                      : (SSL_CONNECTION_IS_TLS13(s)
-                                          ? SSL_EXT_TLS1_3_SERVER_HELLO
-                                          : SSL_EXT_TLS1_2_SERVER_HELLO),
-                                  NULL, 0)) {
+            s->hello_retry_request == SSL_HRR_PENDING
+                ? SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST
+                : (SSL_CONNECTION_IS_TLS13(s)
+                          ? SSL_EXT_TLS1_3_SERVER_HELLO
+                          : SSL_EXT_TLS1_2_SERVER_HELLO),
+            NULL, 0)) {
         /* SSLfatal() already called */
         return CON_FUNC_ERROR;
     }
@@ -2496,7 +2529,7 @@ CON_FUNC_RETURN tls_construct_server_hello(SSL_CONNECTION *s, WPACKET *pkt)
             return CON_FUNC_ERROR;
         }
     } else if (!(s->verify_mode & SSL_VERIFY_PEER)
-                && !ssl3_digest_cached_records(s, 0)) {
+        && !ssl3_digest_cached_records(s, 0)) {
         /* SSLfatal() already called */;
         return CON_FUNC_ERROR;
     }
@@ -2516,7 +2549,7 @@ CON_FUNC_RETURN tls_construct_server_done(SSL_CONNECTION *s, WPACKET *pkt)
 }
 
 CON_FUNC_RETURN tls_construct_server_key_exchange(SSL_CONNECTION *s,
-                                                  WPACKET *pkt)
+    WPACKET *pkt)
 {
     EVP_PKEY *pkdh = NULL;
     unsigned char *encodedPoint = NULL;
@@ -2550,124 +2583,122 @@ CON_FUNC_RETURN tls_construct_server_key_exchange(SSL_CONNECTION *s,
     /* Plain PSK or RSAPSK nothing to do */
     if (type & (SSL_kPSK | SSL_kRSAPSK)) {
     } else
-#endif                          /* !OPENSSL_NO_PSK */
-    if (type & (SSL_kDHE | SSL_kDHEPSK)) {
-        CERT *cert = s->cert;
-        EVP_PKEY *pkdhp = NULL;
-
-        if (s->cert->dh_tmp_auto) {
-            pkdh = ssl_get_auto_dh(s);
-            if (pkdh == NULL) {
-                SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
-                goto err;
+#endif /* !OPENSSL_NO_PSK */
+        if (type & (SSL_kDHE | SSL_kDHEPSK)) {
+            CERT *cert = s->cert;
+            EVP_PKEY *pkdhp = NULL;
+
+            if (s->cert->dh_tmp_auto) {
+                pkdh = ssl_get_auto_dh(s);
+                if (pkdh == NULL) {
+                    SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+                    goto err;
+                }
+                pkdhp = pkdh;
+            } else {
+                pkdhp = cert->dh_tmp;
             }
-            pkdhp = pkdh;
-        } else {
-            pkdhp = cert->dh_tmp;
-        }
 #if !defined(OPENSSL_NO_DEPRECATED_3_0)
-        if ((pkdhp == NULL) && (s->cert->dh_tmp_cb != NULL)) {
-            pkdh = ssl_dh_to_pkey(s->cert->dh_tmp_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                                     0, 1024));
-            if (pkdh == NULL) {
+            if ((pkdhp == NULL) && (s->cert->dh_tmp_cb != NULL)) {
+                pkdh = ssl_dh_to_pkey(s->cert->dh_tmp_cb(SSL_CONNECTION_GET_USER_SSL(s),
+                    0, 1024));
+                if (pkdh == NULL) {
+                    SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+                    goto err;
+                }
+                pkdhp = pkdh;
+            }
+#endif
+            if (pkdhp == NULL) {
+                SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_MISSING_TMP_DH_KEY);
+                goto err;
+            }
+            if (!ssl_security(s, SSL_SECOP_TMP_DH,
+                    EVP_PKEY_get_security_bits(pkdhp), 0, pkdhp)) {
+                SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_DH_KEY_TOO_SMALL);
+                goto err;
+            }
+            if (s->s3.tmp.pkey != NULL) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 goto err;
             }
-            pkdhp = pkdh;
-        }
-#endif
-        if (pkdhp == NULL) {
-            SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_MISSING_TMP_DH_KEY);
-            goto err;
-        }
-        if (!ssl_security(s, SSL_SECOP_TMP_DH,
-                          EVP_PKEY_get_security_bits(pkdhp), 0, pkdhp)) {
-            SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_DH_KEY_TOO_SMALL);
-            goto err;
-        }
-        if (s->s3.tmp.pkey != NULL) {
-            SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
-            goto err;
-        }
 
-        s->s3.tmp.pkey = ssl_generate_pkey(s, pkdhp);
-        if (s->s3.tmp.pkey == NULL) {
-            SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
-            goto err;
-        }
+            s->s3.tmp.pkey = ssl_generate_pkey(s, pkdhp);
+            if (s->s3.tmp.pkey == NULL) {
+                SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+                goto err;
+            }
 
-        EVP_PKEY_free(pkdh);
-        pkdh = NULL;
+            EVP_PKEY_free(pkdh);
+            pkdh = NULL;
 
-        /* These BIGNUMs need to be freed when we're finished */
-        freer = 1;
-        if (!EVP_PKEY_get_bn_param(s->s3.tmp.pkey, OSSL_PKEY_PARAM_FFC_P,
-                                   &r[0])
+            /* These BIGNUMs need to be freed when we're finished */
+            freer = 1;
+            if (!EVP_PKEY_get_bn_param(s->s3.tmp.pkey, OSSL_PKEY_PARAM_FFC_P,
+                    &r[0])
                 || !EVP_PKEY_get_bn_param(s->s3.tmp.pkey, OSSL_PKEY_PARAM_FFC_G,
-                                          &r[1])
+                    &r[1])
                 || !EVP_PKEY_get_bn_param(s->s3.tmp.pkey,
-                                          OSSL_PKEY_PARAM_PUB_KEY, &r[2])) {
-            SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
-            goto err;
-        }
-    } else if (type & (SSL_kECDHE | SSL_kECDHEPSK)) {
+                    OSSL_PKEY_PARAM_PUB_KEY, &r[2])) {
+                SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+                goto err;
+            }
+        } else if (type & (SSL_kECDHE | SSL_kECDHEPSK)) {
 
-        if (s->s3.tmp.pkey != NULL) {
-            SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
-            goto err;
-        }
+            if (s->s3.tmp.pkey != NULL) {
+                SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
+                goto err;
+            }
 
-        /* Get NID of appropriate shared curve */
-        curve_id = tls1_shared_group(s, -2);
-        if (curve_id == 0) {
-            SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                     SSL_R_UNSUPPORTED_ELLIPTIC_CURVE);
-            goto err;
-        }
-        /* Cache the group used in the SSL_SESSION */
-        s->session->kex_group = curve_id;
-        /* Generate a new key for this curve */
-        s->s3.tmp.pkey = ssl_generate_pkey_group(s, curve_id);
-        if (s->s3.tmp.pkey == NULL) {
-            /* SSLfatal() already called */
-            goto err;
-        }
+            /* Get NID of appropriate shared curve */
+            curve_id = tls1_shared_group(s, -2);
+            if (curve_id == 0) {
+                SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
+                    SSL_R_UNSUPPORTED_ELLIPTIC_CURVE);
+                goto err;
+            }
+            /* Cache the group used in the SSL_SESSION */
+            s->session->kex_group = curve_id;
+            /* Generate a new key for this curve */
+            s->s3.tmp.pkey = ssl_generate_pkey_group(s, curve_id);
+            if (s->s3.tmp.pkey == NULL) {
+                /* SSLfatal() already called */
+                goto err;
+            }
 
-        /* Encode the public key. */
-        encodedlen = EVP_PKEY_get1_encoded_public_key(s->s3.tmp.pkey,
-                                                      &encodedPoint);
-        if (encodedlen == 0) {
-            SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EC_LIB);
-            goto err;
-        }
+            /* Encode the public key. */
+            encodedlen = EVP_PKEY_get1_encoded_public_key(s->s3.tmp.pkey,
+                &encodedPoint);
+            if (encodedlen == 0) {
+                SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_EC_LIB);
+                goto err;
+            }
 
-        /*
-         * We'll generate the serverKeyExchange message explicitly so we
-         * can set these to NULLs
-         */
-        r[0] = NULL;
-        r[1] = NULL;
-        r[2] = NULL;
-        r[3] = NULL;
-    } else
+            /*
+             * We'll generate the serverKeyExchange message explicitly so we
+             * can set these to NULLs
+             */
+            r[0] = NULL;
+            r[1] = NULL;
+            r[2] = NULL;
+            r[3] = NULL;
+        } else
 #ifndef OPENSSL_NO_SRP
-    if (type & SSL_kSRP) {
-        if ((s->srp_ctx.N == NULL) ||
-            (s->srp_ctx.g == NULL) ||
-            (s->srp_ctx.s == NULL) || (s->srp_ctx.B == NULL)) {
-            SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_MISSING_SRP_PARAM);
+            if (type & SSL_kSRP) {
+            if ((s->srp_ctx.N == NULL) || (s->srp_ctx.g == NULL) || (s->srp_ctx.s == NULL) || (s->srp_ctx.B == NULL)) {
+                SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_MISSING_SRP_PARAM);
+                goto err;
+            }
+            r[0] = s->srp_ctx.N;
+            r[1] = s->srp_ctx.g;
+            r[2] = s->srp_ctx.s;
+            r[3] = s->srp_ctx.B;
+        } else
+#endif
+        {
+            SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
             goto err;
         }
-        r[0] = s->srp_ctx.N;
-        r[1] = s->srp_ctx.g;
-        r[2] = s->srp_ctx.s;
-        r[3] = s->srp_ctx.B;
-    } else
-#endif
-    {
-        SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
-        goto err;
-    }
 
     if (((s->s3.tmp.new_cipher->algorithm_auth & (SSL_aNULL | SSL_aSRP)) != 0)
         || ((s->s3.tmp.new_cipher->algorithm_mkey & SSL_PSK)) != 0) {
@@ -2680,15 +2711,16 @@ CON_FUNC_RETURN tls_construct_server_key_exchange(SSL_CONNECTION *s,
 #ifndef OPENSSL_NO_PSK
     if (type & SSL_PSK) {
         size_t len = (s->cert->psk_identity_hint == NULL)
-                        ? 0 : strlen(s->cert->psk_identity_hint);
+            ? 0
+            : strlen(s->cert->psk_identity_hint);
 
         /*
          * It should not happen that len > PSK_MAX_IDENTITY_LEN - we already
          * checked this when we set the identity hint - but just in case
          */
         if (len > PSK_MAX_IDENTITY_LEN
-                || !WPACKET_sub_memcpy_u16(pkt, s->cert->psk_identity_hint,
-                                           len)) {
+            || !WPACKET_sub_memcpy_u16(pkt, s->cert->psk_identity_hint,
+                len)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             goto err;
         }
@@ -2729,7 +2761,7 @@ CON_FUNC_RETURN tls_construct_server_key_exchange(SSL_CONNECTION *s,
         }
 
         if (!WPACKET_allocate_bytes(pkt, BN_num_bytes(r[i]), &binval)
-                || !WPACKET_close(pkt)) {
+            || !WPACKET_close(pkt)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             goto err;
         }
@@ -2745,9 +2777,9 @@ CON_FUNC_RETURN tls_construct_server_key_exchange(SSL_CONNECTION *s,
          * point itself
          */
         if (!WPACKET_put_bytes_u8(pkt, NAMED_CURVE_TYPE)
-                || !WPACKET_put_bytes_u8(pkt, 0)
-                || !WPACKET_put_bytes_u8(pkt, curve_id)
-                || !WPACKET_sub_memcpy_u8(pkt, encodedPoint, encodedlen)) {
+            || !WPACKET_put_bytes_u8(pkt, 0)
+            || !WPACKET_put_bytes_u8(pkt, curve_id)
+            || !WPACKET_sub_memcpy_u8(pkt, encodedPoint, encodedlen)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             goto err;
         }
@@ -2779,9 +2811,10 @@ CON_FUNC_RETURN tls_construct_server_key_exchange(SSL_CONNECTION *s,
         }
 
         if (EVP_DigestSignInit_ex(md_ctx, &pctx,
-                                  md == NULL ? NULL : EVP_MD_get0_name(md),
-                                  sctx->libctx, sctx->propq, pkey,
-                                  NULL) <= 0) {
+                md == NULL ? NULL : EVP_MD_get0_name(md),
+                sctx->libctx, sctx->propq, pkey,
+                NULL)
+            <= 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             goto err;
         }
@@ -2793,18 +2826,18 @@ CON_FUNC_RETURN tls_construct_server_key_exchange(SSL_CONNECTION *s,
             }
         }
         tbslen = construct_key_exchange_tbs(s, &tbs,
-                                            s->init_buf->data + paramoffset,
-                                            paramlen);
+            s->init_buf->data + paramoffset,
+            paramlen);
         if (tbslen == 0) {
             /* SSLfatal() already called */
             goto err;
         }
 
-        if (EVP_DigestSign(md_ctx, NULL, &siglen, tbs, tbslen) <=0
-                || !WPACKET_sub_reserve_bytes_u16(pkt, siglen, &sigbytes1)
-                || EVP_DigestSign(md_ctx, sigbytes1, &siglen, tbs, tbslen) <= 0
-                || !WPACKET_sub_allocate_bytes_u16(pkt, siglen, &sigbytes2)
-                || sigbytes1 != sigbytes2) {
+        if (EVP_DigestSign(md_ctx, NULL, &siglen, tbs, tbslen) <= 0
+            || !WPACKET_sub_reserve_bytes_u16(pkt, siglen, &sigbytes1)
+            || EVP_DigestSign(md_ctx, sigbytes1, &siglen, tbs, tbslen) <= 0
+            || !WPACKET_sub_allocate_bytes_u16(pkt, siglen, &sigbytes2)
+            || sigbytes1 != sigbytes2) {
             OPENSSL_free(tbs);
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             goto err;
@@ -2813,7 +2846,7 @@ CON_FUNC_RETURN tls_construct_server_key_exchange(SSL_CONNECTION *s,
     }
 
     ret = CON_FUNC_SUCCESS;
- err:
+err:
     EVP_PKEY_free(pkdh);
     OPENSSL_free(encodedPoint);
     EVP_MD_CTX_free(md_ctx);
@@ -2827,7 +2860,7 @@ CON_FUNC_RETURN tls_construct_server_key_exchange(SSL_CONNECTION *s,
 }
 
 CON_FUNC_RETURN tls_construct_certificate_request(SSL_CONNECTION *s,
-                                                  WPACKET *pkt)
+    WPACKET *pkt)
 {
     if (SSL_CONNECTION_IS_TLS13(s)) {
         /* Send random context when doing post-handshake auth */
@@ -2840,9 +2873,10 @@ CON_FUNC_RETURN tls_construct_certificate_request(SSL_CONNECTION *s,
                 return CON_FUNC_ERROR;
             }
             if (RAND_bytes_ex(SSL_CONNECTION_GET_CTX(s)->libctx,
-                              s->pha_context, s->pha_context_len, 0) <= 0
-                    || !WPACKET_sub_memcpy_u8(pkt, s->pha_context,
-                                              s->pha_context_len)) {
+                    s->pha_context, s->pha_context_len, 0)
+                    <= 0
+                || !WPACKET_sub_memcpy_u8(pkt, s->pha_context,
+                    s->pha_context_len)) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 return CON_FUNC_ERROR;
             }
@@ -2859,8 +2893,8 @@ CON_FUNC_RETURN tls_construct_certificate_request(SSL_CONNECTION *s,
         }
 
         if (!tls_construct_extensions(s, pkt,
-                                      SSL_EXT_TLS1_3_CERTIFICATE_REQUEST, NULL,
-                                      0)) {
+                SSL_EXT_TLS1_3_CERTIFICATE_REQUEST, NULL,
+                0)) {
             /* SSLfatal() already called */
             return CON_FUNC_ERROR;
         }
@@ -2879,9 +2913,9 @@ CON_FUNC_RETURN tls_construct_certificate_request(SSL_CONNECTION *s,
         size_t nl = tls12_get_psigalgs(s, 1, &psigs);
 
         if (!WPACKET_start_sub_packet_u16(pkt)
-                || !WPACKET_set_flags(pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
-                || !tls12_copy_sigalgs(s, pkt, psigs, nl)
-                || !WPACKET_close(pkt)) {
+            || !WPACKET_set_flags(pkt, WPACKET_FLAGS_NON_ZERO_LENGTH)
+            || !tls12_copy_sigalgs(s, pkt, psigs, nl)
+            || !WPACKET_close(pkt)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return CON_FUNC_ERROR;
         }
@@ -2892,7 +2926,7 @@ CON_FUNC_RETURN tls_construct_certificate_request(SSL_CONNECTION *s,
         return CON_FUNC_ERROR;
     }
 
- done:
+done:
     s->certreqs_sent++;
     s->s3.tmp.cert_request = 1;
     return CON_FUNC_SUCCESS;
@@ -2924,8 +2958,8 @@ static int tls_process_cke_psk_preamble(SSL_CONNECTION *s, PACKET *pkt)
     }
 
     psklen = s->psk_server_callback(SSL_CONNECTION_GET_USER_SSL(s),
-                                    s->session->psk_identity,
-                                    psk, sizeof(psk));
+        s->session->psk_identity,
+        psk, sizeof(psk));
 
     if (psklen > PSK_MAX_PSK_LEN) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
@@ -3011,23 +3045,24 @@ static int tls_process_cke_rsa(SSL_CONNECTION *s, PACKET *pkt)
      * See https://tools.ietf.org/html/rfc5246#section-7.4.7.1
      */
     if (EVP_PKEY_decrypt_init(ctx) <= 0
-            || EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_WITH_TLS_PADDING) <= 0) {
+        || EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_WITH_TLS_PADDING) <= 0) {
         SSLfatal(s, SSL_AD_DECRYPT_ERROR, SSL_R_DECRYPTION_FAILED);
         goto err;
     }
 
     *p++ = OSSL_PARAM_construct_uint(OSSL_ASYM_CIPHER_PARAM_TLS_CLIENT_VERSION,
-                                     (unsigned int *)&s->client_version);
-   if ((s->options & SSL_OP_TLS_ROLLBACK_BUG) != 0)
+        (unsigned int *)&s->client_version);
+    if ((s->options & SSL_OP_TLS_ROLLBACK_BUG) != 0)
         *p++ = OSSL_PARAM_construct_uint(
             OSSL_ASYM_CIPHER_PARAM_TLS_NEGOTIATED_VERSION,
             (unsigned int *)&s->version);
     *p++ = OSSL_PARAM_construct_end();
 
     if (!EVP_PKEY_CTX_set_params(ctx, params)
-            || EVP_PKEY_decrypt(ctx, rsa_decrypt, &outlen,
-                                PACKET_data(&enc_premaster),
-                                PACKET_remaining(&enc_premaster)) <= 0) {
+        || EVP_PKEY_decrypt(ctx, rsa_decrypt, &outlen,
+               PACKET_data(&enc_premaster),
+               PACKET_remaining(&enc_premaster))
+            <= 0) {
         SSLfatal(s, SSL_AD_DECRYPT_ERROR, SSL_R_DECRYPTION_FAILED);
         goto err;
     }
@@ -3049,7 +3084,7 @@ static int tls_process_cke_rsa(SSL_CONNECTION *s, PACKET *pkt)
     }
 
     ret = 1;
- err:
+err:
     OPENSSL_free(rsa_decrypt);
     EVP_PKEY_CTX_free(ctx);
     return ret;
@@ -3101,7 +3136,7 @@ static int tls_process_cke_dhe(SSL_CONNECTION *s, PACKET *pkt)
     ret = 1;
     EVP_PKEY_free(s->s3.tmp.pkey);
     s->s3.tmp.pkey = NULL;
- err:
+err:
     EVP_PKEY_free(ckey);
     return ret;
 }
@@ -3156,7 +3191,7 @@ static int tls_process_cke_ecdhe(SSL_CONNECTION *s, PACKET *pkt)
     ret = 1;
     EVP_PKEY_free(s->s3.tmp.pkey);
     s->s3.tmp.pkey = NULL;
- err:
+err:
     EVP_PKEY_free(ckey);
 
     return ret;
@@ -3258,10 +3293,10 @@ static int tls_process_cke_gost(SSL_CONNECTION *s, PACKET *pkt)
      * We have nothing to do with this blob so we just skip it */
     pKX = d2i_GOST_KX_MESSAGE(NULL, &ptr, PACKET_remaining(pkt));
     if (pKX == NULL
-       || pKX->kxBlob == NULL
-       || ASN1_TYPE_get(pKX->kxBlob) != V_ASN1_SEQUENCE) {
-         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_DECRYPTION_FAILED);
-         goto err;
+        || pKX->kxBlob == NULL
+        || ASN1_TYPE_get(pKX->kxBlob) != V_ASN1_SEQUENCE) {
+        SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_DECRYPTION_FAILED);
+        goto err;
     }
 
     if (!PACKET_forward(pkt, ptr - PACKET_data(pkt))) {
@@ -3278,7 +3313,8 @@ static int tls_process_cke_gost(SSL_CONNECTION *s, PACKET *pkt)
     start = pKX->kxBlob->value.sequence->data;
 
     if (EVP_PKEY_decrypt(pkey_ctx, premaster_secret, &outlen, start,
-                         inlen) <= 0) {
+            inlen)
+        <= 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_DECRYPTION_FAILED);
         goto err;
     }
@@ -3289,11 +3325,12 @@ static int tls_process_cke_gost(SSL_CONNECTION *s, PACKET *pkt)
     }
     /* Check if pubkey from client certificate was used */
     if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2,
-                          NULL) > 0)
+            NULL)
+        > 0)
         s->statem.no_cert_verify = 1;
 
     ret = 1;
- err:
+err:
     EVP_PKEY_CTX_free(pkey_ctx);
     GOST_KX_MESSAGE_free(pKX);
     return ret;
@@ -3328,9 +3365,7 @@ static int tls_process_cke_gost18(SSL_CONNECTION *s, PACKET *pkt)
     }
 
     /* Get our certificate private key */
-    pk = s->cert->pkeys[SSL_PKEY_GOST12_512].privatekey != NULL ?
-         s->cert->pkeys[SSL_PKEY_GOST12_512].privatekey :
-         s->cert->pkeys[SSL_PKEY_GOST12_256].privatekey;
+    pk = s->cert->pkeys[SSL_PKEY_GOST12_512].privatekey != NULL ? s->cert->pkeys[SSL_PKEY_GOST12_512].privatekey : s->cert->pkeys[SSL_PKEY_GOST12_256].privatekey;
     if (pk == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_BAD_HANDSHAKE_STATE);
         goto err;
@@ -3348,13 +3383,15 @@ static int tls_process_cke_gost18(SSL_CONNECTION *s, PACKET *pkt)
 
     /* Reuse EVP_PKEY_CTRL_SET_IV, make choice in engine code depending on size */
     if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, EVP_PKEY_OP_DECRYPT,
-                          EVP_PKEY_CTRL_SET_IV, 32, rnd_dgst) <= 0) {
+            EVP_PKEY_CTRL_SET_IV, 32, rnd_dgst)
+        <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_LIBRARY_BUG);
         goto err;
     }
 
     if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, EVP_PKEY_OP_DECRYPT,
-                          EVP_PKEY_CTRL_CIPHER, cipher_nid, NULL) <= 0) {
+            EVP_PKEY_CTRL_CIPHER, cipher_nid, NULL)
+        <= 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_LIBRARY_BUG);
         goto err;
     }
@@ -3367,12 +3404,12 @@ static int tls_process_cke_gost18(SSL_CONNECTION *s, PACKET *pkt)
     }
     /* Generate master secret */
     if (!ssl_generate_master_secret(s, premaster_secret, outlen, 0)) {
-         /* SSLfatal() already called */
-         goto err;
+        /* SSLfatal() already called */
+        goto err;
     }
     ret = 1;
 
- err:
+err:
     EVP_PKEY_CTX_free(pkey_ctx);
     return ret;
 #else
@@ -3383,7 +3420,7 @@ static int tls_process_cke_gost18(SSL_CONNECTION *s, PACKET *pkt)
 }
 
 MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL_CONNECTION *s,
-                                                   PACKET *pkt)
+    PACKET *pkt)
 {
     unsigned long alg_k;
 
@@ -3442,7 +3479,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL_CONNECTION *s,
     }
 
     return MSG_PROCESS_CONTINUE_PROCESSING;
- err:
+err:
 #ifndef OPENSSL_NO_PSK
     OPENSSL_clear_free(s->s3.tmp.psk, s->s3.tmp.psklen);
     s->s3.tmp.psk = NULL;
@@ -3452,7 +3489,7 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL_CONNECTION *s,
 }
 
 WORK_STATE tls_post_process_client_key_exchange(SSL_CONNECTION *s,
-                                                WORK_STATE wst)
+    WORK_STATE wst)
 {
 #ifndef OPENSSL_NO_SCTP
     if (wst == WORK_MORE_A) {
@@ -3465,7 +3502,7 @@ WORK_STATE tls_post_process_client_key_exchange(SSL_CONNECTION *s,
              * used.
              */
             memcpy(labelbuffer, DTLS1_SCTP_AUTH_LABEL,
-                   sizeof(DTLS1_SCTP_AUTH_LABEL));
+                sizeof(DTLS1_SCTP_AUTH_LABEL));
 
             /* Don't include the terminating zero. */
             labellen = sizeof(labelbuffer) - 1;
@@ -3473,16 +3510,17 @@ WORK_STATE tls_post_process_client_key_exchange(SSL_CONNECTION *s,
                 labellen += 1;
 
             if (SSL_export_keying_material(SSL_CONNECTION_GET_SSL(s),
-                                           sctpauthkey,
-                                           sizeof(sctpauthkey), labelbuffer,
-                                           labellen, NULL, 0,
-                                           0) <= 0) {
+                    sctpauthkey,
+                    sizeof(sctpauthkey), labelbuffer,
+                    labellen, NULL, 0,
+                    0)
+                <= 0) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 return WORK_ERROR;
             }
 
             BIO_ctrl(s->wbio, BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY,
-                     sizeof(sctpauthkey), sctpauthkey);
+                sizeof(sctpauthkey), sctpauthkey);
         }
     }
 #endif
@@ -3528,15 +3566,15 @@ MSG_PROCESS_RETURN tls_process_client_rpk(SSL_CONNECTION *sc, PACKET *pkt)
 
     if (peer_rpk == NULL) {
         if ((sc->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)
-                && (sc->verify_mode & SSL_VERIFY_PEER)) {
+            && (sc->verify_mode & SSL_VERIFY_PEER)) {
             SSLfatal(sc, SSL_AD_CERTIFICATE_REQUIRED,
-                     SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
+                SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
             goto err;
         }
     } else {
         if (ssl_verify_rpk(sc, peer_rpk) <= 0) {
             SSLfatal(sc, ssl_x509err2alert(sc->verify_result),
-                     SSL_R_CERTIFICATE_VERIFY_FAILED);
+                SSL_R_CERTIFICATE_VERIFY_FAILED);
             goto err;
         }
     }
@@ -3583,8 +3621,8 @@ MSG_PROCESS_RETURN tls_process_client_rpk(SSL_CONNECTION *sc, PACKET *pkt)
 
         /* Save the current hash state for when we receive the CertificateVerify */
         if (!ssl_handshake_hash(sc, sc->cert_verify_hash,
-                                sizeof(sc->cert_verify_hash),
-                                &sc->cert_verify_hash_len)) {
+                sizeof(sc->cert_verify_hash),
+                &sc->cert_verify_hash_len)) {
             /* SSLfatal() already called */;
             goto err;
         }
@@ -3595,13 +3633,13 @@ MSG_PROCESS_RETURN tls_process_client_rpk(SSL_CONNECTION *sc, PACKET *pkt)
 
     ret = MSG_PROCESS_CONTINUE_READING;
 
- err:
+err:
     EVP_PKEY_free(peer_rpk);
     return ret;
 }
 
 MSG_PROCESS_RETURN tls_process_client_certificate(SSL_CONNECTION *s,
-                                                  PACKET *pkt)
+    PACKET *pkt)
 {
     int i;
     MSG_PROCESS_RETURN ret = MSG_PROCESS_ERROR;
@@ -3626,7 +3664,7 @@ MSG_PROCESS_RETURN tls_process_client_certificate(SSL_CONNECTION *s,
 
     if (s->ext.client_cert_type != TLSEXT_cert_type_x509) {
         SSLfatal(s, SSL_AD_UNSUPPORTED_CERTIFICATE,
-                 SSL_R_UNKNOWN_CERTIFICATE_TYPE);
+            SSL_R_UNKNOWN_CERTIFICATE_TYPE);
         goto err;
     }
 
@@ -3637,16 +3675,16 @@ MSG_PROCESS_RETURN tls_process_client_certificate(SSL_CONNECTION *s,
 
     if (SSL_CONNECTION_IS_TLS13(s)
         && (!PACKET_get_length_prefixed_1(pkt, &context)
-                || (s->pha_context == NULL && PACKET_remaining(&context) != 0)
-                || (s->pha_context != NULL
-                    && !PACKET_equal(&context, s->pha_context,
-                                     s->pha_context_len)))) {
+            || (s->pha_context == NULL && PACKET_remaining(&context) != 0)
+            || (s->pha_context != NULL
+                && !PACKET_equal(&context, s->pha_context,
+                    s->pha_context_len)))) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_INVALID_CONTEXT);
         goto err;
     }
 
     if (!PACKET_get_length_prefixed_3(pkt, &spkt)
-            || PACKET_remaining(pkt) != 0) {
+        || PACKET_remaining(pkt) != 0) {
         SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_R_LENGTH_MISMATCH);
         goto err;
     }
@@ -3683,11 +3721,11 @@ MSG_PROCESS_RETURN tls_process_client_certificate(SSL_CONNECTION *s,
                 goto err;
             }
             if (!tls_collect_extensions(s, &extensions,
-                                        SSL_EXT_TLS1_3_CERTIFICATE, &rawexts,
-                                        NULL, chainidx == 0)
+                    SSL_EXT_TLS1_3_CERTIFICATE, &rawexts,
+                    NULL, chainidx == 0)
                 || !tls_parse_all_extensions(s, SSL_EXT_TLS1_3_CERTIFICATE,
-                                             rawexts, x, chainidx,
-                                             PACKET_remaining(&spkt) == 0)) {
+                    rawexts, x, chainidx,
+                    PACKET_remaining(&spkt) == 0)) {
                 OPENSSL_free(rawexts);
                 goto err;
             }
@@ -3705,14 +3743,13 @@ MSG_PROCESS_RETURN tls_process_client_certificate(SSL_CONNECTION *s,
         /* TLS does not mind 0 certs returned */
         if (s->version == SSL3_VERSION) {
             SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                     SSL_R_NO_CERTIFICATES_RETURNED);
+                SSL_R_NO_CERTIFICATES_RETURNED);
             goto err;
         }
         /* Fail for TLS only if we required a certificate */
-        else if ((s->verify_mode & SSL_VERIFY_PEER) &&
-                 (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) {
+        else if ((s->verify_mode & SSL_VERIFY_PEER) && (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) {
             SSLfatal(s, SSL_AD_CERTIFICATE_REQUIRED,
-                     SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
+                SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
             goto err;
         }
         /* No client certificate so digest cached records */
@@ -3725,13 +3762,13 @@ MSG_PROCESS_RETURN tls_process_client_certificate(SSL_CONNECTION *s,
         i = ssl_verify_cert_chain(s, sk);
         if (i <= 0) {
             SSLfatal(s, ssl_x509err2alert(s->verify_result),
-                     SSL_R_CERTIFICATE_VERIFY_FAILED);
+                SSL_R_CERTIFICATE_VERIFY_FAILED);
             goto err;
         }
         pkey = X509_get0_pubkey(sk_X509_value(sk, 0));
         if (pkey == NULL) {
             SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                     SSL_R_UNKNOWN_CERTIFICATE_TYPE);
+                SSL_R_UNKNOWN_CERTIFICATE_TYPE);
             goto err;
         }
     }
@@ -3782,8 +3819,8 @@ MSG_PROCESS_RETURN tls_process_client_certificate(SSL_CONNECTION *s,
     /* Save the current hash state for when we receive the CertificateVerify */
     if (SSL_CONNECTION_IS_TLS13(s)) {
         if (!ssl_handshake_hash(s, s->cert_verify_hash,
-                                sizeof(s->cert_verify_hash),
-                                &s->cert_verify_hash_len)) {
+                sizeof(s->cert_verify_hash),
+                &s->cert_verify_hash_len)) {
             /* SSLfatal() already called */
             goto err;
         }
@@ -3794,7 +3831,7 @@ MSG_PROCESS_RETURN tls_process_client_certificate(SSL_CONNECTION *s,
 
     ret = MSG_PROCESS_CONTINUE_READING;
 
- err:
+err:
     X509_free(x);
     OSSL_STACK_OF_X509_free(sk);
     return ret;
@@ -3868,10 +3905,10 @@ CON_FUNC_RETURN tls_construct_server_compressed_certificate(SSL_CONNECTION *sc,
      * Use pre-compressed certificate
      */
     if (!WPACKET_put_bytes_u16(pkt, alg)
-            || !WPACKET_put_bytes_u24(pkt, cc->orig_len)
-            || !WPACKET_start_sub_packet_u24(pkt)
-            || !WPACKET_memcpy(pkt, cc->data, cc->len)
-            || !WPACKET_close(pkt))
+        || !WPACKET_put_bytes_u24(pkt, cc->orig_len)
+        || !WPACKET_start_sub_packet_u24(pkt)
+        || !WPACKET_memcpy(pkt, cc->data, cc->len)
+        || !WPACKET_close(pkt))
         return 0;
 
     sc->s3.tmp.cert->cert_comp_used++;
@@ -3880,7 +3917,7 @@ CON_FUNC_RETURN tls_construct_server_compressed_certificate(SSL_CONNECTION *sc,
 #endif
 
 static int create_ticket_prequel(SSL_CONNECTION *s, WPACKET *pkt,
-                                 uint32_t age_add, unsigned char *tick_nonce)
+    uint32_t age_add, unsigned char *tick_nonce)
 {
     uint32_t timeout = (uint32_t)ossl_time2seconds(s->session->timeout);
 
@@ -3895,7 +3932,8 @@ static int create_ticket_prequel(SSL_CONNECTION *s, WPACKET *pkt,
 
     if (SSL_CONNECTION_IS_TLS13(s)) {
         if (ossl_time_compare(s->session->timeout,
-                              ossl_seconds2time(ONE_WEEK_SEC)) > 0)
+                ossl_seconds2time(ONE_WEEK_SEC))
+            > 0)
             timeout = ONE_WEEK_SEC;
     } else if (s->hit)
         timeout = 0;
@@ -3907,7 +3945,7 @@ static int create_ticket_prequel(SSL_CONNECTION *s, WPACKET *pkt,
 
     if (SSL_CONNECTION_IS_TLS13(s)) {
         if (!WPACKET_put_bytes_u32(pkt, age_add)
-                || !WPACKET_sub_memcpy_u8(pkt, tick_nonce, TICKET_NONCE_SIZE)) {
+            || !WPACKET_sub_memcpy_u8(pkt, tick_nonce, TICKET_NONCE_SIZE)) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             return 0;
         }
@@ -3923,9 +3961,9 @@ static int create_ticket_prequel(SSL_CONNECTION *s, WPACKET *pkt,
 }
 
 static CON_FUNC_RETURN construct_stateless_ticket(SSL_CONNECTION *s,
-                                                  WPACKET *pkt,
-                                                  uint32_t age_add,
-                                                  unsigned char *tick_nonce)
+    WPACKET *pkt,
+    uint32_t age_add,
+    unsigned char *tick_nonce)
 {
     unsigned char *senc = NULL;
     EVP_CIPHER_CTX *ctx = NULL;
@@ -3982,7 +4020,7 @@ static CON_FUNC_RETURN construct_stateless_ticket(SSL_CONNECTION *s,
      */
     const_p = senc;
     sess = d2i_SSL_SESSION_ex(NULL, &const_p, slen_full, sctx->libctx,
-                              sctx->propq);
+        sctx->propq);
     if (sess == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
@@ -4017,13 +4055,13 @@ static CON_FUNC_RETURN construct_stateless_ticket(SSL_CONNECTION *s,
 
         if (tctx->ext.ticket_key_evp_cb != NULL)
             ret = tctx->ext.ticket_key_evp_cb(ssl, key_name, iv, ctx,
-                                              ssl_hmac_get0_EVP_MAC_CTX(hctx),
-                                              1);
+                ssl_hmac_get0_EVP_MAC_CTX(hctx),
+                1);
 #ifndef OPENSSL_NO_DEPRECATED_3_0
         else if (tctx->ext.ticket_key_cb != NULL)
             /* if 0 is returned, write an empty ticket */
             ret = tctx->ext.ticket_key_cb(ssl, key_name, iv, ctx,
-                                          ssl_hmac_get0_HMAC_CTX(hctx), 1);
+                ssl_hmac_get0_HMAC_CTX(hctx), 1);
 #endif
 
         if (ret == 0) {
@@ -4038,7 +4076,7 @@ static CON_FUNC_RETURN construct_stateless_ticket(SSL_CONNECTION *s,
             }
             /* Put timeout and length */
             if (!WPACKET_put_bytes_u32(pkt, 0)
-                    || !WPACKET_put_bytes_u16(pkt, 0)) {
+                || !WPACKET_put_bytes_u16(pkt, 0)) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 goto err;
             }
@@ -4058,7 +4096,7 @@ static CON_FUNC_RETURN construct_stateless_ticket(SSL_CONNECTION *s,
         }
     } else {
         EVP_CIPHER *cipher = EVP_CIPHER_fetch(sctx->libctx, "AES-256-CBC",
-                                              sctx->propq);
+            sctx->propq);
 
         if (cipher == NULL) {
             /* Error is already recorded */
@@ -4068,19 +4106,19 @@ static CON_FUNC_RETURN construct_stateless_ticket(SSL_CONNECTION *s,
 
         iv_len = EVP_CIPHER_get_iv_length(cipher);
         if (iv_len < 0
-                || RAND_bytes_ex(sctx->libctx, iv, iv_len, 0) <= 0
-                || !EVP_EncryptInit_ex(ctx, cipher, NULL,
-                                       tctx->ext.secure->tick_aes_key, iv)
-                || !ssl_hmac_init(hctx, tctx->ext.secure->tick_hmac_key,
-                                  sizeof(tctx->ext.secure->tick_hmac_key),
-                                  "SHA256")) {
+            || RAND_bytes_ex(sctx->libctx, iv, iv_len, 0) <= 0
+            || !EVP_EncryptInit_ex(ctx, cipher, NULL,
+                tctx->ext.secure->tick_aes_key, iv)
+            || !ssl_hmac_init(hctx, tctx->ext.secure->tick_hmac_key,
+                sizeof(tctx->ext.secure->tick_hmac_key),
+                "SHA256")) {
             EVP_CIPHER_free(cipher);
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             goto err;
         }
         EVP_CIPHER_free(cipher);
         memcpy(key_name, tctx->ext.tick_key_name,
-               sizeof(tctx->ext.tick_key_name));
+            sizeof(tctx->ext.tick_key_name));
     }
 
     if (!create_ticket_prequel(s, pkt, age_add, tick_nonce)) {
@@ -4089,29 +4127,29 @@ static CON_FUNC_RETURN construct_stateless_ticket(SSL_CONNECTION *s,
     }
 
     if (!WPACKET_get_total_written(pkt, &macoffset)
-               /* Output key name */
-            || !WPACKET_memcpy(pkt, key_name, sizeof(key_name))
-               /* output IV */
-            || !WPACKET_memcpy(pkt, iv, iv_len)
-            || !WPACKET_reserve_bytes(pkt, slen + EVP_MAX_BLOCK_LENGTH,
-                                      &encdata1)
-               /* Encrypt session data */
-            || !EVP_EncryptUpdate(ctx, encdata1, &len, senc, slen)
-            || !WPACKET_allocate_bytes(pkt, len, &encdata2)
-            || encdata1 != encdata2
-            || !EVP_EncryptFinal(ctx, encdata1 + len, &lenfinal)
-            || !WPACKET_allocate_bytes(pkt, lenfinal, &encdata2)
-            || encdata1 + len != encdata2
-            || len + lenfinal > slen + EVP_MAX_BLOCK_LENGTH
-            || !WPACKET_get_total_written(pkt, &macendoffset)
-            || !ssl_hmac_update(hctx,
-                                (unsigned char *)s->init_buf->data + macoffset,
-                                macendoffset - macoffset)
-            || !WPACKET_reserve_bytes(pkt, EVP_MAX_MD_SIZE, &macdata1)
-            || !ssl_hmac_final(hctx, macdata1, &hlen, EVP_MAX_MD_SIZE)
-            || hlen > EVP_MAX_MD_SIZE
-            || !WPACKET_allocate_bytes(pkt, hlen, &macdata2)
-            || macdata1 != macdata2) {
+        /* Output key name */
+        || !WPACKET_memcpy(pkt, key_name, sizeof(key_name))
+        /* output IV */
+        || !WPACKET_memcpy(pkt, iv, iv_len)
+        || !WPACKET_reserve_bytes(pkt, slen + EVP_MAX_BLOCK_LENGTH,
+            &encdata1)
+        /* Encrypt session data */
+        || !EVP_EncryptUpdate(ctx, encdata1, &len, senc, slen)
+        || !WPACKET_allocate_bytes(pkt, len, &encdata2)
+        || encdata1 != encdata2
+        || !EVP_EncryptFinal(ctx, encdata1 + len, &lenfinal)
+        || !WPACKET_allocate_bytes(pkt, lenfinal, &encdata2)
+        || encdata1 + len != encdata2
+        || len + lenfinal > slen + EVP_MAX_BLOCK_LENGTH
+        || !WPACKET_get_total_written(pkt, &macendoffset)
+        || !ssl_hmac_update(hctx,
+            (unsigned char *)s->init_buf->data + macoffset,
+            macendoffset - macoffset)
+        || !WPACKET_reserve_bytes(pkt, EVP_MAX_MD_SIZE, &macdata1)
+        || !ssl_hmac_final(hctx, macdata1, &hlen, EVP_MAX_MD_SIZE)
+        || hlen > EVP_MAX_MD_SIZE
+        || !WPACKET_allocate_bytes(pkt, hlen, &macdata2)
+        || macdata1 != macdata2) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -4123,7 +4161,7 @@ static CON_FUNC_RETURN construct_stateless_ticket(SSL_CONNECTION *s,
     }
 
     ok = CON_FUNC_SUCCESS;
- err:
+err:
     OPENSSL_free(senc);
     EVP_CIPHER_CTX_free(ctx);
     ssl_hmac_free(hctx);
@@ -4131,8 +4169,8 @@ static CON_FUNC_RETURN construct_stateless_ticket(SSL_CONNECTION *s,
 }
 
 static int construct_stateful_ticket(SSL_CONNECTION *s, WPACKET *pkt,
-                                     uint32_t age_add,
-                                     unsigned char *tick_nonce)
+    uint32_t age_add,
+    unsigned char *tick_nonce)
 {
     if (!create_ticket_prequel(s, pkt, age_add, tick_nonce)) {
         /* SSLfatal() already called */
@@ -4140,8 +4178,8 @@ static int construct_stateful_ticket(SSL_CONNECTION *s, WPACKET *pkt,
     }
 
     if (!WPACKET_memcpy(pkt, s->session->session_id,
-                        s->session->session_id_length)
-            || !WPACKET_close(pkt)) {
+            s->session->session_id_length)
+        || !WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -4178,7 +4216,9 @@ CON_FUNC_RETURN tls_construct_new_session_ticket(SSL_CONNECTION *s, WPACKET *pkt
     if (SSL_CONNECTION_IS_TLS13(s)) {
         size_t i, hashlen;
         uint64_t nonce;
-        static const unsigned char nonce_label[] = "resumption";
+        /* ASCII: "resumption", in hex for EBCDIC compatibility */
+        static const unsigned char nonce_label[] = { 0x72, 0x65, 0x73, 0x75, 0x6D,
+            0x70, 0x74, 0x69, 0x6F, 0x6E };
         const EVP_MD *md = ssl_handshake_md(s);
         int hashleni = EVP_MD_get_size(md);
 
@@ -4211,7 +4251,8 @@ CON_FUNC_RETURN tls_construct_new_session_ticket(SSL_CONNECTION *s, WPACKET *pkt
             goto err;
         }
         if (RAND_bytes_ex(SSL_CONNECTION_GET_CTX(s)->libctx,
-                          age_add_u.age_add_c, sizeof(age_add_u), 0) <= 0) {
+                age_add_u.age_add_c, sizeof(age_add_u), 0)
+            <= 0) {
             SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
             goto err;
         }
@@ -4224,12 +4265,12 @@ CON_FUNC_RETURN tls_construct_new_session_ticket(SSL_CONNECTION *s, WPACKET *pkt
         }
 
         if (!tls13_hkdf_expand(s, md, s->resumption_master_secret,
-                               nonce_label,
-                               sizeof(nonce_label) - 1,
-                               tick_nonce,
-                               TICKET_NONCE_SIZE,
-                               s->session->master_key,
-                               hashlen, 1)) {
+                nonce_label,
+                sizeof(nonce_label),
+                tick_nonce,
+                TICKET_NONCE_SIZE,
+                s->session->master_key,
+                hashlen, 1)) {
             /* SSLfatal() already called */
             goto err;
         }
@@ -4239,8 +4280,7 @@ CON_FUNC_RETURN tls_construct_new_session_ticket(SSL_CONNECTION *s, WPACKET *pkt
         ssl_session_calculate_timeout(s->session);
         if (s->s3.alpn_selected != NULL) {
             OPENSSL_free(s->session->ext.alpn_selected);
-            s->session->ext.alpn_selected =
-                OPENSSL_memdup(s->s3.alpn_selected, s->s3.alpn_selected_len);
+            s->session->ext.alpn_selected = OPENSSL_memdup(s->s3.alpn_selected, s->s3.alpn_selected_len);
             if (s->session->ext.alpn_selected == NULL) {
                 s->session->ext.alpn_selected_len = 0;
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_CRYPTO_LIB);
@@ -4251,9 +4291,7 @@ CON_FUNC_RETURN tls_construct_new_session_ticket(SSL_CONNECTION *s, WPACKET *pkt
         s->session->ext.max_early_data = s->max_early_data;
     }
 
-    if (tctx->generate_ticket_cb != NULL &&
-        tctx->generate_ticket_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                 tctx->ticket_cb_data) == 0) {
+    if (tctx->generate_ticket_cb != NULL && tctx->generate_ticket_cb(SSL_CONNECTION_GET_USER_SSL(s), tctx->ticket_cb_data) == 0) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -4263,9 +4301,9 @@ CON_FUNC_RETURN tls_construct_new_session_ticket(SSL_CONNECTION *s, WPACKET *pkt
      * is no point in using full stateless tickets.
      */
     if (SSL_CONNECTION_IS_TLS13(s)
-            && ((s->options & SSL_OP_NO_TICKET) != 0
-                || (s->max_early_data > 0
-                    && (s->options & SSL_OP_NO_ANTI_REPLAY) == 0))) {
+        && ((s->options & SSL_OP_NO_TICKET) != 0
+            || (s->max_early_data > 0
+                && (s->options & SSL_OP_NO_ANTI_REPLAY) == 0))) {
         if (!construct_stateful_ticket(s, pkt, age_add_u.age_add, tick_nonce)) {
             /* SSLfatal() already called */
             goto err;
@@ -4274,7 +4312,7 @@ CON_FUNC_RETURN tls_construct_new_session_ticket(SSL_CONNECTION *s, WPACKET *pkt
         CON_FUNC_RETURN tmpret;
 
         tmpret = construct_stateless_ticket(s, pkt, age_add_u.age_add,
-                                            tick_nonce);
+            tick_nonce);
         if (tmpret != CON_FUNC_SUCCESS) {
             if (tmpret == CON_FUNC_DONT_SEND) {
                 /* Non-fatal. Abort construction but continue */
@@ -4289,8 +4327,8 @@ CON_FUNC_RETURN tls_construct_new_session_ticket(SSL_CONNECTION *s, WPACKET *pkt
 
     if (SSL_CONNECTION_IS_TLS13(s)) {
         if (!tls_construct_extensions(s, pkt,
-                                      SSL_EXT_TLS1_3_NEW_SESSION_TICKET,
-                                      NULL, 0)) {
+                SSL_EXT_TLS1_3_NEW_SESSION_TICKET,
+                NULL, 0)) {
             /* SSLfatal() already called */
             goto err;
         }
@@ -4299,7 +4337,7 @@ CON_FUNC_RETURN tls_construct_new_session_ticket(SSL_CONNECTION *s, WPACKET *pkt
     }
 
     ret = CON_FUNC_SUCCESS;
- err:
+err:
     return ret;
 }
 
@@ -4310,8 +4348,8 @@ CON_FUNC_RETURN tls_construct_new_session_ticket(SSL_CONNECTION *s, WPACKET *pkt
 int tls_construct_cert_status_body(SSL_CONNECTION *s, WPACKET *pkt)
 {
     if (!WPACKET_put_bytes_u8(pkt, s->ext.status_type)
-            || !WPACKET_sub_memcpy_u24(pkt, s->ext.ocsp.resp,
-                                       s->ext.ocsp.resp_len)) {
+        || !WPACKET_sub_memcpy_u24(pkt, s->ext.ocsp.resp,
+            s->ext.ocsp.resp_len)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return 0;
     }
@@ -4366,10 +4404,10 @@ MSG_PROCESS_RETURN tls_process_next_proto(SSL_CONNECTION *s, PACKET *pkt)
 #endif
 
 static CON_FUNC_RETURN tls_construct_encrypted_extensions(SSL_CONNECTION *s,
-                                                          WPACKET *pkt)
+    WPACKET *pkt)
 {
     if (!tls_construct_extensions(s, pkt, SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS,
-                                  NULL, 0)) {
+            NULL, 0)) {
         /* SSLfatal() already called */
         return CON_FUNC_ERROR;
     }
@@ -4385,7 +4423,7 @@ MSG_PROCESS_RETURN tls_process_end_of_early_data(SSL_CONNECTION *s, PACKET *pkt)
     }
 
     if (s->early_data_state != SSL_EARLY_DATA_READING
-            && s->early_data_state != SSL_EARLY_DATA_READ_RETRY) {
+        && s->early_data_state != SSL_EARLY_DATA_READ_RETRY) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         return MSG_PROCESS_ERROR;
     }
@@ -4401,7 +4439,7 @@ MSG_PROCESS_RETURN tls_process_end_of_early_data(SSL_CONNECTION *s, PACKET *pkt)
 
     s->early_data_state = SSL_EARLY_DATA_FINISHED_READING;
     if (!SSL_CONNECTION_GET_SSL(s)->method->ssl3_enc->change_cipher_state(s,
-                SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_SERVER_READ)) {
+            SSL3_CC_HANDSHAKE | SSL3_CHANGE_CIPHER_SERVER_READ)) {
         /* SSLfatal() already called */
         return MSG_PROCESS_ERROR;
     }
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 474ea7bf5b661..8978e0c630e60 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -24,13 +24,13 @@
 
 /* seed1 through seed5 are concatenated */
 static int tls1_PRF(SSL_CONNECTION *s,
-                    const void *seed1, size_t seed1_len,
-                    const void *seed2, size_t seed2_len,
-                    const void *seed3, size_t seed3_len,
-                    const void *seed4, size_t seed4_len,
-                    const void *seed5, size_t seed5_len,
-                    const unsigned char *sec, size_t slen,
-                    unsigned char *out, size_t olen, int fatal)
+    const void *seed1, size_t seed1_len,
+    const void *seed2, size_t seed2_len,
+    const void *seed3, size_t seed3_len,
+    const void *seed4, size_t seed4_len,
+    const void *seed5, size_t seed5_len,
+    const unsigned char *sec, size_t slen,
+    unsigned char *out, size_t olen, int fatal)
 {
     const EVP_MD *md = ssl_prf_md(s);
     EVP_KDF *kdf;
@@ -47,8 +47,8 @@ static int tls1_PRF(SSL_CONNECTION *s,
         return 0;
     }
     kdf = EVP_KDF_fetch(SSL_CONNECTION_GET_CTX(s)->libctx,
-                        OSSL_KDF_NAME_TLS1_PRF,
-                        SSL_CONNECTION_GET_CTX(s)->propq);
+        OSSL_KDF_NAME_TLS1_PRF,
+        SSL_CONNECTION_GET_CTX(s)->propq);
     if (kdf == NULL)
         goto err;
     kctx = EVP_KDF_CTX_new(kdf);
@@ -57,27 +57,27 @@ static int tls1_PRF(SSL_CONNECTION *s,
         goto err;
     mdname = EVP_MD_get0_name(md);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)mdname, 0);
+        (char *)mdname, 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SECRET,
-                                             (unsigned char *)sec,
-                                             (size_t)slen);
+        (unsigned char *)sec,
+        (size_t)slen);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SEED,
-                                             (void *)seed1, (size_t)seed1_len);
+        (void *)seed1, (size_t)seed1_len);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SEED,
-                                             (void *)seed2, (size_t)seed2_len);
+        (void *)seed2, (size_t)seed2_len);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SEED,
-                                             (void *)seed3, (size_t)seed3_len);
+        (void *)seed3, (size_t)seed3_len);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SEED,
-                                             (void *)seed4, (size_t)seed4_len);
+        (void *)seed4, (size_t)seed4_len);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SEED,
-                                             (void *)seed5, (size_t)seed5_len);
+        (void *)seed5, (size_t)seed5_len);
     *p = OSSL_PARAM_construct_end();
     if (EVP_KDF_derive(kctx, out, olen, params)) {
         EVP_KDF_CTX_free(kctx);
         return 1;
     }
 
- err:
+err:
     if (fatal)
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
     else
@@ -87,17 +87,17 @@ static int tls1_PRF(SSL_CONNECTION *s,
 }
 
 static int tls1_generate_key_block(SSL_CONNECTION *s, unsigned char *km,
-                                   size_t num)
+    size_t num)
 {
     int ret;
 
     /* Calls SSLfatal() as required */
     ret = tls1_PRF(s,
-                   TLS_MD_KEY_EXPANSION_CONST,
-                   TLS_MD_KEY_EXPANSION_CONST_SIZE, s->s3.server_random,
-                   SSL3_RANDOM_SIZE, s->s3.client_random, SSL3_RANDOM_SIZE,
-                   NULL, 0, NULL, 0, s->session->master_key,
-                   s->session->master_key_length, km, num, 1);
+        TLS_MD_KEY_EXPANSION_CONST,
+        TLS_MD_KEY_EXPANSION_CONST_SIZE, s->s3.server_random,
+        SSL3_RANDOM_SIZE, s->s3.client_random, SSL3_RANDOM_SIZE,
+        NULL, 0, NULL, 0, s->session->master_key,
+        s->session->master_key_length, km, num, 1);
 
     return ret;
 }
@@ -149,8 +149,7 @@ int tls1_change_cipher_state(SSL_CONNECTION *s, int which)
         goto err;
     }
     k = iivlen;
-    if ((which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||
-        (which == SSL3_CHANGE_CIPHER_SERVER_READ)) {
+    if ((which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) || (which == SSL3_CHANGE_CIPHER_SERVER_READ)) {
         mac_secret = &(p[0]);
         n = i + i;
         key = &(p[n]);
@@ -178,7 +177,8 @@ int tls1_change_cipher_state(SSL_CONNECTION *s, int which)
         break;
     case EVP_CIPH_CCM_MODE:
         if ((s->s3.tmp.new_cipher->algorithm_enc
-                & (SSL_AES128CCM8 | SSL_AES256CCM8)) != 0)
+                & (SSL_AES128CCM8 | SSL_AES256CCM8))
+            != 0)
             taglen = EVP_CCM8_TLS_TAG_LEN;
         else
             taglen = EVP_CCM_TLS_TAG_LEN;
@@ -233,23 +233,25 @@ int tls1_change_cipher_state(SSL_CONNECTION *s, int which)
         dtls1_increment_epoch(s, which);
 
     if (!ssl_set_new_record_layer(s, s->version, direction,
-                                    OSSL_RECORD_PROTECTION_LEVEL_APPLICATION,
-                                    NULL, 0, key, cl, iv, (size_t)k, mac_secret,
-                                    mac_secret_size, c, taglen, mac_type,
-                                    m, comp, NULL)) {
+            OSSL_RECORD_PROTECTION_LEVEL_APPLICATION,
+            NULL, 0, key, cl, iv, (size_t)k, mac_secret,
+            mac_secret_size, c, taglen, mac_type,
+            m, comp, NULL)) {
         /* SSLfatal already called */
         goto err;
     }
 
-    OSSL_TRACE_BEGIN(TLS) {
+    OSSL_TRACE_BEGIN(TLS)
+    {
         BIO_printf(trc_out, "which = %04X, key:\n", which);
         BIO_dump_indent(trc_out, key, EVP_CIPHER_get_key_length(c), 4);
         BIO_printf(trc_out, "iv:\n");
         BIO_dump_indent(trc_out, iv, k, 4);
-    } OSSL_TRACE_END(TLS);
+    }
+    OSSL_TRACE_END(TLS);
 
     return 1;
- err:
+err:
     return 0;
 }
 
@@ -268,8 +270,8 @@ int tls1_setup_key_block(SSL_CONNECTION *s)
         return 1;
 
     if (!ssl_cipher_get_evp(SSL_CONNECTION_GET_CTX(s), s->session, &c, &hash,
-                            &mac_type, &mac_secret_size, &comp,
-                            s->ext.use_etm)) {
+            &mac_type, &mac_secret_size, &comp,
+            s->ext.use_etm)) {
         /* Error is already recorded */
         SSLfatal_alert(s, SSL_AD_INTERNAL_ERROR);
         return 0;
@@ -299,7 +301,8 @@ int tls1_setup_key_block(SSL_CONNECTION *s)
     s->s3.tmp.key_block_length = num;
     s->s3.tmp.key_block = p;
 
-    OSSL_TRACE_BEGIN(TLS) {
+    OSSL_TRACE_BEGIN(TLS)
+    {
         BIO_printf(trc_out, "key block length: %zu\n", num);
         BIO_printf(trc_out, "client random\n");
         BIO_dump_indent(trc_out, s->s3.client_random, SSL3_RANDOM_SIZE, 4);
@@ -307,27 +310,30 @@ int tls1_setup_key_block(SSL_CONNECTION *s)
         BIO_dump_indent(trc_out, s->s3.server_random, SSL3_RANDOM_SIZE, 4);
         BIO_printf(trc_out, "master key\n");
         BIO_dump_indent(trc_out,
-                        s->session->master_key,
-                        s->session->master_key_length, 4);
-    } OSSL_TRACE_END(TLS);
+            s->session->master_key,
+            s->session->master_key_length, 4);
+    }
+    OSSL_TRACE_END(TLS);
 
     if (!tls1_generate_key_block(s, p, num)) {
         /* SSLfatal() already called */
         goto err;
     }
 
-    OSSL_TRACE_BEGIN(TLS) {
+    OSSL_TRACE_BEGIN(TLS)
+    {
         BIO_printf(trc_out, "key block\n");
         BIO_dump_indent(trc_out, p, num, 4);
-    } OSSL_TRACE_END(TLS);
+    }
+    OSSL_TRACE_END(TLS);
 
     ret = 1;
- err:
+err:
     return ret;
 }
 
 size_t tls1_final_finish_mac(SSL_CONNECTION *s, const char *str,
-                             size_t slen, unsigned char *out)
+    size_t slen, unsigned char *out)
 {
     size_t hashlen;
     unsigned char hash[EVP_MAX_MD_SIZE];
@@ -347,8 +353,8 @@ size_t tls1_final_finish_mac(SSL_CONNECTION *s, const char *str,
     }
 
     if (!tls1_PRF(s, str, slen, hash, hashlen, NULL, 0, NULL, 0, NULL, 0,
-                  s->session->master_key, s->session->master_key_length,
-                  out, finished_size, 1)) {
+            s->session->master_key, s->session->master_key_length,
+            out, finished_size, 1)) {
         /* SSLfatal() already called */
         return 0;
     }
@@ -357,8 +363,8 @@ size_t tls1_final_finish_mac(SSL_CONNECTION *s, const char *str,
 }
 
 int tls1_generate_master_secret(SSL_CONNECTION *s, unsigned char *out,
-                                unsigned char *p, size_t len,
-                                size_t *secret_size)
+    unsigned char *p, size_t len,
+    size_t *secret_size)
 {
     if (s->session->flags & SSL_SESS_FLAG_EXTMS) {
         unsigned char hash[EVP_MAX_MD_SIZE * 2];
@@ -369,41 +375,44 @@ int tls1_generate_master_secret(SSL_CONNECTION *s, unsigned char *out,
          * point (after client key exchange and before certificate verify)
          */
         if (!ssl3_digest_cached_records(s, 1)
-                || !ssl_handshake_hash(s, hash, sizeof(hash), &hashlen)) {
+            || !ssl_handshake_hash(s, hash, sizeof(hash), &hashlen)) {
             /* SSLfatal() already called */
             return 0;
         }
-        OSSL_TRACE_BEGIN(TLS) {
+        OSSL_TRACE_BEGIN(TLS)
+        {
             BIO_printf(trc_out, "Handshake hashes:\n");
             BIO_dump(trc_out, (char *)hash, hashlen);
-        } OSSL_TRACE_END(TLS);
+        }
+        OSSL_TRACE_END(TLS);
         if (!tls1_PRF(s,
-                      TLS_MD_EXTENDED_MASTER_SECRET_CONST,
-                      TLS_MD_EXTENDED_MASTER_SECRET_CONST_SIZE,
-                      hash, hashlen,
-                      NULL, 0,
-                      NULL, 0,
-                      NULL, 0, p, len, out,
-                      SSL3_MASTER_SECRET_SIZE, 1)) {
+                TLS_MD_EXTENDED_MASTER_SECRET_CONST,
+                TLS_MD_EXTENDED_MASTER_SECRET_CONST_SIZE,
+                hash, hashlen,
+                NULL, 0,
+                NULL, 0,
+                NULL, 0, p, len, out,
+                SSL3_MASTER_SECRET_SIZE, 1)) {
             /* SSLfatal() already called */
             return 0;
         }
         OPENSSL_cleanse(hash, hashlen);
     } else {
         if (!tls1_PRF(s,
-                      TLS_MD_MASTER_SECRET_CONST,
-                      TLS_MD_MASTER_SECRET_CONST_SIZE,
-                      s->s3.client_random, SSL3_RANDOM_SIZE,
-                      NULL, 0,
-                      s->s3.server_random, SSL3_RANDOM_SIZE,
-                      NULL, 0, p, len, out,
-                      SSL3_MASTER_SECRET_SIZE, 1)) {
-           /* SSLfatal() already called */
+                TLS_MD_MASTER_SECRET_CONST,
+                TLS_MD_MASTER_SECRET_CONST_SIZE,
+                s->s3.client_random, SSL3_RANDOM_SIZE,
+                NULL, 0,
+                s->s3.server_random, SSL3_RANDOM_SIZE,
+                NULL, 0, p, len, out,
+                SSL3_MASTER_SECRET_SIZE, 1)) {
+            /* SSLfatal() already called */
             return 0;
         }
     }
 
-    OSSL_TRACE_BEGIN(TLS) {
+    OSSL_TRACE_BEGIN(TLS)
+    {
         BIO_printf(trc_out, "Premaster Secret:\n");
         BIO_dump_indent(trc_out, p, len, 4);
         BIO_printf(trc_out, "Client Random:\n");
@@ -412,18 +421,19 @@ int tls1_generate_master_secret(SSL_CONNECTION *s, unsigned char *out,
         BIO_dump_indent(trc_out, s->s3.server_random, SSL3_RANDOM_SIZE, 4);
         BIO_printf(trc_out, "Master Secret:\n");
         BIO_dump_indent(trc_out,
-                        s->session->master_key,
-                        SSL3_MASTER_SECRET_SIZE, 4);
-    } OSSL_TRACE_END(TLS);
+            s->session->master_key,
+            SSL3_MASTER_SECRET_SIZE, 4);
+    }
+    OSSL_TRACE_END(TLS);
 
     *secret_size = SSL3_MASTER_SECRET_SIZE;
     return 1;
 }
 
 int tls1_export_keying_material(SSL_CONNECTION *s, unsigned char *out,
-                                size_t olen, const char *label, size_t llen,
-                                const unsigned char *context,
-                                size_t contextlen, int use_context)
+    size_t olen, const char *label, size_t llen,
+    const unsigned char *context,
+    size_t contextlen, int use_context)
 {
     unsigned char *val = NULL;
     size_t vallen = 0, currentvalpos;
@@ -475,34 +485,39 @@ int tls1_export_keying_material(SSL_CONNECTION *s, unsigned char *out,
      * the comparisons won't have buffer overflow
      */
     if (memcmp(val, TLS_MD_CLIENT_FINISH_CONST,
-               TLS_MD_CLIENT_FINISH_CONST_SIZE) == 0)
+            TLS_MD_CLIENT_FINISH_CONST_SIZE)
+        == 0)
         goto err1;
     if (memcmp(val, TLS_MD_SERVER_FINISH_CONST,
-               TLS_MD_SERVER_FINISH_CONST_SIZE) == 0)
+            TLS_MD_SERVER_FINISH_CONST_SIZE)
+        == 0)
         goto err1;
     if (memcmp(val, TLS_MD_MASTER_SECRET_CONST,
-               TLS_MD_MASTER_SECRET_CONST_SIZE) == 0)
+            TLS_MD_MASTER_SECRET_CONST_SIZE)
+        == 0)
         goto err1;
     if (memcmp(val, TLS_MD_EXTENDED_MASTER_SECRET_CONST,
-               TLS_MD_EXTENDED_MASTER_SECRET_CONST_SIZE) == 0)
+            TLS_MD_EXTENDED_MASTER_SECRET_CONST_SIZE)
+        == 0)
         goto err1;
     if (memcmp(val, TLS_MD_KEY_EXPANSION_CONST,
-               TLS_MD_KEY_EXPANSION_CONST_SIZE) == 0)
+            TLS_MD_KEY_EXPANSION_CONST_SIZE)
+        == 0)
         goto err1;
 
     rv = tls1_PRF(s,
-                  val, vallen,
-                  NULL, 0,
-                  NULL, 0,
-                  NULL, 0,
-                  NULL, 0,
-                  s->session->master_key, s->session->master_key_length,
-                  out, olen, 0);
+        val, vallen,
+        NULL, 0,
+        NULL, 0,
+        NULL, 0,
+        NULL, 0,
+        s->session->master_key, s->session->master_key_length,
+        out, olen, 0);
 
     goto ret;
- err1:
+err1:
     ERR_raise(ERR_LIB_SSL, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL);
- ret:
+ret:
     OPENSSL_clear_free(val, vallen);
     return rv;
 }
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 8f5f9b4c4bdbd..cd471a636db16 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -146,51 +146,51 @@ static const struct {
     int nid;
     uint16_t group_id;
 } nid_to_group[] = {
-    {NID_sect163k1, OSSL_TLS_GROUP_ID_sect163k1},
-    {NID_sect163r1, OSSL_TLS_GROUP_ID_sect163r1},
-    {NID_sect163r2, OSSL_TLS_GROUP_ID_sect163r2},
-    {NID_sect193r1, OSSL_TLS_GROUP_ID_sect193r1},
-    {NID_sect193r2, OSSL_TLS_GROUP_ID_sect193r2},
-    {NID_sect233k1, OSSL_TLS_GROUP_ID_sect233k1},
-    {NID_sect233r1, OSSL_TLS_GROUP_ID_sect233r1},
-    {NID_sect239k1, OSSL_TLS_GROUP_ID_sect239k1},
-    {NID_sect283k1, OSSL_TLS_GROUP_ID_sect283k1},
-    {NID_sect283r1, OSSL_TLS_GROUP_ID_sect283r1},
-    {NID_sect409k1, OSSL_TLS_GROUP_ID_sect409k1},
-    {NID_sect409r1, OSSL_TLS_GROUP_ID_sect409r1},
-    {NID_sect571k1, OSSL_TLS_GROUP_ID_sect571k1},
-    {NID_sect571r1, OSSL_TLS_GROUP_ID_sect571r1},
-    {NID_secp160k1, OSSL_TLS_GROUP_ID_secp160k1},
-    {NID_secp160r1, OSSL_TLS_GROUP_ID_secp160r1},
-    {NID_secp160r2, OSSL_TLS_GROUP_ID_secp160r2},
-    {NID_secp192k1, OSSL_TLS_GROUP_ID_secp192k1},
-    {NID_X9_62_prime192v1, OSSL_TLS_GROUP_ID_secp192r1},
-    {NID_secp224k1, OSSL_TLS_GROUP_ID_secp224k1},
-    {NID_secp224r1, OSSL_TLS_GROUP_ID_secp224r1},
-    {NID_secp256k1, OSSL_TLS_GROUP_ID_secp256k1},
-    {NID_X9_62_prime256v1, OSSL_TLS_GROUP_ID_secp256r1},
-    {NID_secp384r1, OSSL_TLS_GROUP_ID_secp384r1},
-    {NID_secp521r1, OSSL_TLS_GROUP_ID_secp521r1},
-    {NID_brainpoolP256r1, OSSL_TLS_GROUP_ID_brainpoolP256r1},
-    {NID_brainpoolP384r1, OSSL_TLS_GROUP_ID_brainpoolP384r1},
-    {NID_brainpoolP512r1, OSSL_TLS_GROUP_ID_brainpoolP512r1},
-    {EVP_PKEY_X25519, OSSL_TLS_GROUP_ID_x25519},
-    {EVP_PKEY_X448, OSSL_TLS_GROUP_ID_x448},
-    {NID_brainpoolP256r1tls13, OSSL_TLS_GROUP_ID_brainpoolP256r1_tls13},
-    {NID_brainpoolP384r1tls13, OSSL_TLS_GROUP_ID_brainpoolP384r1_tls13},
-    {NID_brainpoolP512r1tls13, OSSL_TLS_GROUP_ID_brainpoolP512r1_tls13},
-    {NID_id_tc26_gost_3410_2012_256_paramSetA, OSSL_TLS_GROUP_ID_gc256A},
-    {NID_id_tc26_gost_3410_2012_256_paramSetB, OSSL_TLS_GROUP_ID_gc256B},
-    {NID_id_tc26_gost_3410_2012_256_paramSetC, OSSL_TLS_GROUP_ID_gc256C},
-    {NID_id_tc26_gost_3410_2012_256_paramSetD, OSSL_TLS_GROUP_ID_gc256D},
-    {NID_id_tc26_gost_3410_2012_512_paramSetA, OSSL_TLS_GROUP_ID_gc512A},
-    {NID_id_tc26_gost_3410_2012_512_paramSetB, OSSL_TLS_GROUP_ID_gc512B},
-    {NID_id_tc26_gost_3410_2012_512_paramSetC, OSSL_TLS_GROUP_ID_gc512C},
-    {NID_ffdhe2048, OSSL_TLS_GROUP_ID_ffdhe2048},
-    {NID_ffdhe3072, OSSL_TLS_GROUP_ID_ffdhe3072},
-    {NID_ffdhe4096, OSSL_TLS_GROUP_ID_ffdhe4096},
-    {NID_ffdhe6144, OSSL_TLS_GROUP_ID_ffdhe6144},
-    {NID_ffdhe8192, OSSL_TLS_GROUP_ID_ffdhe8192}
+    { NID_sect163k1, OSSL_TLS_GROUP_ID_sect163k1 },
+    { NID_sect163r1, OSSL_TLS_GROUP_ID_sect163r1 },
+    { NID_sect163r2, OSSL_TLS_GROUP_ID_sect163r2 },
+    { NID_sect193r1, OSSL_TLS_GROUP_ID_sect193r1 },
+    { NID_sect193r2, OSSL_TLS_GROUP_ID_sect193r2 },
+    { NID_sect233k1, OSSL_TLS_GROUP_ID_sect233k1 },
+    { NID_sect233r1, OSSL_TLS_GROUP_ID_sect233r1 },
+    { NID_sect239k1, OSSL_TLS_GROUP_ID_sect239k1 },
+    { NID_sect283k1, OSSL_TLS_GROUP_ID_sect283k1 },
+    { NID_sect283r1, OSSL_TLS_GROUP_ID_sect283r1 },
+    { NID_sect409k1, OSSL_TLS_GROUP_ID_sect409k1 },
+    { NID_sect409r1, OSSL_TLS_GROUP_ID_sect409r1 },
+    { NID_sect571k1, OSSL_TLS_GROUP_ID_sect571k1 },
+    { NID_sect571r1, OSSL_TLS_GROUP_ID_sect571r1 },
+    { NID_secp160k1, OSSL_TLS_GROUP_ID_secp160k1 },
+    { NID_secp160r1, OSSL_TLS_GROUP_ID_secp160r1 },
+    { NID_secp160r2, OSSL_TLS_GROUP_ID_secp160r2 },
+    { NID_secp192k1, OSSL_TLS_GROUP_ID_secp192k1 },
+    { NID_X9_62_prime192v1, OSSL_TLS_GROUP_ID_secp192r1 },
+    { NID_secp224k1, OSSL_TLS_GROUP_ID_secp224k1 },
+    { NID_secp224r1, OSSL_TLS_GROUP_ID_secp224r1 },
+    { NID_secp256k1, OSSL_TLS_GROUP_ID_secp256k1 },
+    { NID_X9_62_prime256v1, OSSL_TLS_GROUP_ID_secp256r1 },
+    { NID_secp384r1, OSSL_TLS_GROUP_ID_secp384r1 },
+    { NID_secp521r1, OSSL_TLS_GROUP_ID_secp521r1 },
+    { NID_brainpoolP256r1, OSSL_TLS_GROUP_ID_brainpoolP256r1 },
+    { NID_brainpoolP384r1, OSSL_TLS_GROUP_ID_brainpoolP384r1 },
+    { NID_brainpoolP512r1, OSSL_TLS_GROUP_ID_brainpoolP512r1 },
+    { EVP_PKEY_X25519, OSSL_TLS_GROUP_ID_x25519 },
+    { EVP_PKEY_X448, OSSL_TLS_GROUP_ID_x448 },
+    { NID_brainpoolP256r1tls13, OSSL_TLS_GROUP_ID_brainpoolP256r1_tls13 },
+    { NID_brainpoolP384r1tls13, OSSL_TLS_GROUP_ID_brainpoolP384r1_tls13 },
+    { NID_brainpoolP512r1tls13, OSSL_TLS_GROUP_ID_brainpoolP512r1_tls13 },
+    { NID_id_tc26_gost_3410_2012_256_paramSetA, OSSL_TLS_GROUP_ID_gc256A },
+    { NID_id_tc26_gost_3410_2012_256_paramSetB, OSSL_TLS_GROUP_ID_gc256B },
+    { NID_id_tc26_gost_3410_2012_256_paramSetC, OSSL_TLS_GROUP_ID_gc256C },
+    { NID_id_tc26_gost_3410_2012_256_paramSetD, OSSL_TLS_GROUP_ID_gc256D },
+    { NID_id_tc26_gost_3410_2012_512_paramSetA, OSSL_TLS_GROUP_ID_gc512A },
+    { NID_id_tc26_gost_3410_2012_512_paramSetB, OSSL_TLS_GROUP_ID_gc512B },
+    { NID_id_tc26_gost_3410_2012_512_paramSetC, OSSL_TLS_GROUP_ID_gc512C },
+    { NID_ffdhe2048, OSSL_TLS_GROUP_ID_ffdhe2048 },
+    { NID_ffdhe3072, OSSL_TLS_GROUP_ID_ffdhe3072 },
+    { NID_ffdhe4096, OSSL_TLS_GROUP_ID_ffdhe4096 },
+    { NID_ffdhe6144, OSSL_TLS_GROUP_ID_ffdhe6144 },
+    { NID_ffdhe8192, OSSL_TLS_GROUP_ID_ffdhe8192 }
 };
 
 static const unsigned char ecformats_default[] = {
@@ -218,7 +218,7 @@ struct provider_ctx_data_st {
     OSSL_PROVIDER *provider;
 };
 
-#define TLS_GROUP_LIST_MALLOC_BLOCK_SIZE        10
+#define TLS_GROUP_LIST_MALLOC_BLOCK_SIZE 10
 static OSSL_CALLBACK add_provider_groups;
 static int add_provider_groups(const OSSL_PARAM params[], void *data)
 {
@@ -236,18 +236,18 @@ static int add_provider_groups(const OSSL_PARAM params[], void *data)
 
         if (ctx->group_list_max_len == 0)
             tmp = OPENSSL_malloc(sizeof(TLS_GROUP_INFO)
-                                 * TLS_GROUP_LIST_MALLOC_BLOCK_SIZE);
+                * TLS_GROUP_LIST_MALLOC_BLOCK_SIZE);
         else
             tmp = OPENSSL_realloc(ctx->group_list,
-                                  (ctx->group_list_max_len
-                                   + TLS_GROUP_LIST_MALLOC_BLOCK_SIZE)
-                                  * sizeof(TLS_GROUP_INFO));
+                (ctx->group_list_max_len
+                    + TLS_GROUP_LIST_MALLOC_BLOCK_SIZE)
+                    * sizeof(TLS_GROUP_INFO));
         if (tmp == NULL)
             return 0;
         ctx->group_list = tmp;
         memset(tmp + ctx->group_list_max_len,
-               0,
-               sizeof(TLS_GROUP_INFO) * TLS_GROUP_LIST_MALLOC_BLOCK_SIZE);
+            0,
+            sizeof(TLS_GROUP_INFO) * TLS_GROUP_LIST_MALLOC_BLOCK_SIZE);
         ctx->group_list_max_len += TLS_GROUP_LIST_MALLOC_BLOCK_SIZE;
     }
 
@@ -339,7 +339,7 @@ static int add_provider_groups(const OSSL_PARAM params[], void *data)
         EVP_KEYMGMT_free(keymgmt);
     }
     ERR_pop_to_mark();
- err:
+err:
     if (ginf != NULL) {
         OPENSSL_free(ginf->tlsname);
         OPENSSL_free(ginf->realname);
@@ -356,7 +356,7 @@ static int discover_provider_groups(OSSL_PROVIDER *provider, void *vctx)
     pgd.ctx = vctx;
     pgd.provider = provider;
     return OSSL_PROVIDER_get_capabilities(provider, "TLS-GROUP",
-                                          add_provider_groups, &pgd);
+        add_provider_groups, &pgd);
 }
 
 int ssl_load_groups(SSL_CTX *ctx)
@@ -367,7 +367,16 @@ int ssl_load_groups(SSL_CTX *ctx)
     return SSL_CTX_set1_groups_list(ctx, TLS_DEFAULT_GROUP_LIST);
 }
 
-#define TLS_SIGALG_LIST_MALLOC_BLOCK_SIZE        10
+static const char *inferred_keytype(const TLS_SIGALG_INFO *sinf)
+{
+    return (sinf->keytype != NULL
+            ? sinf->keytype
+            : (sinf->sig_name != NULL
+                      ? sinf->sig_name
+                      : sinf->sigalg_name));
+}
+
+#define TLS_SIGALG_LIST_MALLOC_BLOCK_SIZE 10
 static OSSL_CALLBACK add_provider_sigalgs;
 static int add_provider_sigalgs(const OSSL_PARAM params[], void *data)
 {
@@ -386,17 +395,17 @@ static int add_provider_sigalgs(const OSSL_PARAM params[], void *data)
 
         if (ctx->sigalg_list_max_len == 0)
             tmp = OPENSSL_malloc(sizeof(TLS_SIGALG_INFO)
-                                 * TLS_SIGALG_LIST_MALLOC_BLOCK_SIZE);
+                * TLS_SIGALG_LIST_MALLOC_BLOCK_SIZE);
         else
             tmp = OPENSSL_realloc(ctx->sigalg_list,
-                                  (ctx->sigalg_list_max_len
-                                   + TLS_SIGALG_LIST_MALLOC_BLOCK_SIZE)
-                                  * sizeof(TLS_SIGALG_INFO));
+                (ctx->sigalg_list_max_len
+                    + TLS_SIGALG_LIST_MALLOC_BLOCK_SIZE)
+                    * sizeof(TLS_SIGALG_INFO));
         if (tmp == NULL)
             return 0;
         ctx->sigalg_list = tmp;
         memset(tmp + ctx->sigalg_list_max_len, 0,
-               sizeof(TLS_SIGALG_INFO) * TLS_SIGALG_LIST_MALLOC_BLOCK_SIZE);
+            sizeof(TLS_SIGALG_INFO) * TLS_SIGALG_LIST_MALLOC_BLOCK_SIZE);
         ctx->sigalg_list_max_len += TLS_SIGALG_LIST_MALLOC_BLOCK_SIZE;
     }
 
@@ -424,7 +433,7 @@ static int add_provider_sigalgs(const OSSL_PARAM params[], void *data)
         goto err;
 
     p = OSSL_PARAM_locate_const(params,
-                                OSSL_CAPABILITY_TLS_SIGALG_CODE_POINT);
+        OSSL_CAPABILITY_TLS_SIGALG_CODE_POINT);
     if (p == NULL
         || !OSSL_PARAM_get_uint(p, &code_point)
         || code_point > UINT16_MAX) {
@@ -434,7 +443,7 @@ static int add_provider_sigalgs(const OSSL_PARAM params[], void *data)
     sinf->code_point = (uint16_t)code_point;
 
     p = OSSL_PARAM_locate_const(params,
-                                OSSL_CAPABILITY_TLS_SIGALG_SECURITY_BITS);
+        OSSL_CAPABILITY_TLS_SIGALG_SECURITY_BITS);
     if (p == NULL || !OSSL_PARAM_get_uint(p, &sinf->secbits)) {
         ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT);
         goto err;
@@ -538,8 +547,7 @@ static int add_provider_sigalgs(const OSSL_PARAM params[], void *data)
         goto err;
     }
     /* DTLS version numbers grow downward */
-    if ((sinf->maxdtls != 0) && (sinf->maxdtls != -1) &&
-        ((sinf->maxdtls > sinf->mindtls))) {
+    if ((sinf->maxdtls != 0) && (sinf->maxdtls != -1) && ((sinf->maxdtls > sinf->mindtls))) {
         ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT);
         goto err;
     }
@@ -557,16 +565,13 @@ static int add_provider_sigalgs(const OSSL_PARAM params[], void *data)
         ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT);
         goto err;
     }
-    if ((sinf->maxtls != 0) && (sinf->maxtls != -1) &&
-        ((sinf->maxtls < sinf->mintls))) {
+    if ((sinf->maxtls != 0) && (sinf->maxtls != -1) && ((sinf->maxtls < sinf->mintls))) {
         ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT);
         goto err;
     }
-    if ((sinf->mintls != 0) && (sinf->mintls != -1) &&
-        ((sinf->mintls > TLS1_3_VERSION)))
+    if ((sinf->mintls != 0) && (sinf->mintls != -1) && ((sinf->mintls > TLS1_3_VERSION)))
         sinf->mintls = sinf->maxtls = -1;
-    if ((sinf->maxtls != 0) && (sinf->maxtls != -1) &&
-        ((sinf->maxtls < TLS1_3_VERSION)))
+    if ((sinf->maxtls != 0) && (sinf->maxtls != -1) && ((sinf->maxtls < TLS1_3_VERSION)))
         sinf->mintls = sinf->maxtls = -1;
 
     /* Ignore unusable sigalgs */
@@ -583,11 +588,7 @@ static int add_provider_sigalgs(const OSSL_PARAM params[], void *data)
      */
     ret = 1;
     ERR_set_mark();
-    keytype = (sinf->keytype != NULL
-               ? sinf->keytype
-               : (sinf->sig_name != NULL
-                  ? sinf->sig_name
-                  : sinf->sigalg_name));
+    keytype = inferred_keytype(sinf);
     keymgmt = EVP_KEYMGMT_fetch(ctx->libctx, keytype, ctx->propq);
     if (keymgmt != NULL) {
         /*
@@ -612,10 +613,9 @@ static int add_provider_sigalgs(const OSSL_PARAM params[], void *data)
              */
             OBJ_create(sinf->sigalg_oid, sinf->sigalg_name, NULL);
             /* sanity check: Without successful registration don't use alg */
-            if ((OBJ_txt2nid(sinf->sigalg_name) == NID_undef) ||
-                (OBJ_nid2obj(OBJ_txt2nid(sinf->sigalg_name)) == NULL)) {
-                    ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT);
-                    goto err;
+            if ((OBJ_txt2nid(sinf->sigalg_name) == NID_undef) || (OBJ_nid2obj(OBJ_txt2nid(sinf->sigalg_name)) == NULL)) {
+                ERR_raise(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT);
+                goto err;
             }
             if (sinf->sig_name != NULL)
                 OBJ_create(sinf->sig_oid, sinf->sig_name, NULL);
@@ -624,17 +624,17 @@ static int add_provider_sigalgs(const OSSL_PARAM params[], void *data)
             if (sinf->hash_name != NULL)
                 OBJ_create(sinf->hash_oid, sinf->hash_name, NULL);
             OBJ_add_sigid(OBJ_txt2nid(sinf->sigalg_name),
-                          (sinf->hash_name != NULL
-                           ? OBJ_txt2nid(sinf->hash_name)
-                           : NID_undef),
-                          OBJ_txt2nid(keytype));
+                (sinf->hash_name != NULL
+                        ? OBJ_txt2nid(sinf->hash_name)
+                        : NID_undef),
+                OBJ_txt2nid(keytype));
             ctx->sigalg_list_len++;
             sinf = NULL;
         }
         EVP_KEYMGMT_free(keymgmt);
     }
     ERR_pop_to_mark();
- err:
+err:
     if (sinf != NULL) {
         OPENSSL_free(sinf->name);
         sinf->name = NULL;
@@ -665,7 +665,7 @@ static int discover_provider_sigalgs(OSSL_PROVIDER *provider, void *vctx)
     pgd.ctx = vctx;
     pgd.provider = provider;
     OSSL_PROVIDER_get_capabilities(provider, "TLS-SIGALG",
-                                   add_provider_sigalgs, &pgd);
+        add_provider_sigalgs, &pgd);
     /*
      * Always OK, even if provider doesn't support the capability:
      * Reconsider testing retval when legacy sigalgs are also loaded this way.
@@ -687,8 +687,9 @@ int ssl_load_sigalgs(SSL_CTX *ctx)
         ctx->ssl_cert_info = OPENSSL_zalloc(sizeof(lu) * ctx->sigalg_list_len);
         if (ctx->ssl_cert_info == NULL)
             return 0;
-        for(i = 0; i < ctx->sigalg_list_len; i++) {
-            ctx->ssl_cert_info[i].nid = OBJ_txt2nid(ctx->sigalg_list[i].sigalg_name);
+        for (i = 0; i < ctx->sigalg_list_len; i++) {
+            const char *keytype = inferred_keytype(&ctx->sigalg_list[i]);
+            ctx->ssl_cert_info[i].pkey_nid = OBJ_txt2nid(keytype);
             ctx->ssl_cert_info[i].amask = SSL_aANY;
         }
     }
@@ -707,7 +708,7 @@ static uint16_t tls1_group_name2id(SSL_CTX *ctx, const char *name)
 
     for (i = 0; i < ctx->group_list_len; i++) {
         if (OPENSSL_strcasecmp(ctx->group_list[i].tlsname, name) == 0
-                || OPENSSL_strcasecmp(ctx->group_list[i].realname, name) == 0)
+            || OPENSSL_strcasecmp(ctx->group_list[i].realname, name) == 0)
             return ctx->group_list[i].group_id;
     }
 
@@ -747,8 +748,7 @@ int tls1_group_id2nid(uint16_t group_id, int include_unknown)
      * Return well known Group NIDs - for backwards compatibility. This won't
      * work for groups we don't know about.
      */
-    for (i = 0; i < OSSL_NELEM(nid_to_group); i++)
-    {
+    for (i = 0; i < OSSL_NELEM(nid_to_group); i++) {
         if (nid_to_group[i].group_id == group_id)
             return nid_to_group[i].nid;
     }
@@ -765,8 +765,7 @@ uint16_t tls1_nid2group_id(int nid)
      * Return well known Group ids - for backwards compatibility. This won't
      * work for groups we don't know about.
      */
-    for (i = 0; i < OSSL_NELEM(nid_to_group); i++)
-    {
+    for (i = 0; i < OSSL_NELEM(nid_to_group); i++) {
         if (nid_to_group[i].nid == nid)
             return nid_to_group[i].group_id;
     }
@@ -779,7 +778,7 @@ uint16_t tls1_nid2group_id(int nid)
  * the number of groups supported.
  */
 void tls1_get_supported_groups(SSL_CONNECTION *s, const uint16_t **pgroups,
-                               size_t *pgroupslen)
+    size_t *pgroupslen)
 {
     SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(s);
 
@@ -826,7 +825,7 @@ void tls1_get_supported_groups(SSL_CONNECTION *s, const uint16_t **pgroups,
  * combination with setting add_only_one = 1 is applied.
  */
 void tls1_get_requested_keyshare_groups(SSL_CONNECTION *s, const uint16_t **pgroups,
-                                        size_t *pgroupslen)
+    size_t *pgroupslen)
 {
     SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(s);
 
@@ -840,7 +839,7 @@ void tls1_get_requested_keyshare_groups(SSL_CONNECTION *s, const uint16_t **pgro
 }
 
 void tls1_get_group_tuples(SSL_CONNECTION *s, const size_t **ptuples,
-                           size_t *ptupleslen)
+    size_t *ptupleslen)
 {
     SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(s);
 
@@ -854,11 +853,11 @@ void tls1_get_group_tuples(SSL_CONNECTION *s, const size_t **ptuples,
 }
 
 int tls_valid_group(SSL_CONNECTION *s, uint16_t group_id,
-                    int minversion, int maxversion,
-                    int isec, int *okfortls13)
+    int minversion, int maxversion,
+    int isec, int *okfortls13)
 {
     const TLS_GROUP_INFO *ginfo = tls1_group_id_lookup(SSL_CONNECTION_GET_CTX(s),
-                                                       group_id);
+        group_id);
     int ret;
     int group_minversion, group_maxversion;
 
@@ -883,12 +882,12 @@ int tls_valid_group(SSL_CONNECTION *s, uint16_t group_id,
     if (!SSL_CONNECTION_IS_DTLS(s)) {
         if (ret && okfortls13 != NULL && maxversion == TLS1_3_VERSION)
             *okfortls13 = (group_maxversion == 0)
-                          || (group_maxversion >= TLS1_3_VERSION);
+                || (group_maxversion >= TLS1_3_VERSION);
     }
     ret &= !isec
-           || strcmp(ginfo->algorithm, "EC") == 0
-           || strcmp(ginfo->algorithm, "X25519") == 0
-           || strcmp(ginfo->algorithm, "X448") == 0;
+        || strcmp(ginfo->algorithm, "EC") == 0
+        || strcmp(ginfo->algorithm, "X25519") == 0
+        || strcmp(ginfo->algorithm, "X448") == 0;
 
     return ret;
 }
@@ -897,7 +896,7 @@ int tls_valid_group(SSL_CONNECTION *s, uint16_t group_id,
 int tls_group_allowed(SSL_CONNECTION *s, uint16_t group, int op)
 {
     const TLS_GROUP_INFO *ginfo = tls1_group_id_lookup(SSL_CONNECTION_GET_CTX(s),
-                                                       group);
+        group);
     unsigned char gtmp[2];
 
     if (ginfo == NULL)
@@ -906,7 +905,7 @@ int tls_group_allowed(SSL_CONNECTION *s, uint16_t group, int op)
     gtmp[0] = group >> 8;
     gtmp[1] = group & 0xff;
     return ssl_security(s, op, ginfo->secbits,
-                        tls1_group_id2nid(ginfo->group_id, 0), (void *)gtmp);
+        tls1_group_id2nid(ginfo->group_id, 0), (void *)gtmp);
 }
 
 /* Return 1 if "id" is in "list" */
@@ -932,7 +931,7 @@ static void free_wrapper(TLS_GROUP_IX *a)
 }
 
 static int tls_group_ix_cmp(const TLS_GROUP_IX *const *a,
-                            const TLS_GROUP_IX *const *b)
+    const TLS_GROUP_IX *const *b)
 {
     int idcmpab = (*a)->grp->group_id < (*b)->grp->group_id;
     int idcmpba = (*b)->grp->group_id < (*a)->grp->group_id;
@@ -947,8 +946,8 @@ static int tls_group_ix_cmp(const TLS_GROUP_IX *const *a,
 }
 
 int tls1_get0_implemented_groups(int min_proto_version, int max_proto_version,
-                                 TLS_GROUP_INFO *grps, size_t num, long all,
-                                 STACK_OF(OPENSSL_CSTRING) *out)
+    TLS_GROUP_INFO *grps, size_t num, long all,
+    STACK_OF(OPENSSL_CSTRING) *out)
 {
     STACK_OF(TLS_GROUP_IX) *collect = NULL;
     TLS_GROUP_IX *gix;
@@ -962,7 +961,7 @@ int tls1_get0_implemented_groups(int min_proto_version, int max_proto_version,
         return 0;
     for (ix = 0; ix < num; ++ix, ++grps) {
         if (grps->mintls > 0 && max_proto_version > 0
-             && grps->mintls > max_proto_version)
+            && grps->mintls > max_proto_version)
             continue;
         if (grps->maxtls > 0 && min_proto_version > 0
             && grps->maxtls < min_proto_version)
@@ -972,8 +971,10 @@ int tls1_get0_implemented_groups(int min_proto_version, int max_proto_version,
             goto end;
         gix->grp = grps;
         gix->ix = ix;
-        if (sk_TLS_GROUP_IX_push(collect, gix) <= 0)
+        if (sk_TLS_GROUP_IX_push(collect, gix) <= 0) {
+            OPENSSL_free(gix);
             goto end;
+        }
     }
 
     sk_TLS_GROUP_IX_sort(collect);
@@ -988,7 +989,7 @@ int tls1_get0_implemented_groups(int min_proto_version, int max_proto_version,
     }
     ret = 1;
 
-  end:
+end:
     sk_TLS_GROUP_IX_pop_free(collect, free_wrapper);
     return ret;
 }
@@ -1046,16 +1047,18 @@ uint16_t tls1_shared_group(SSL_CONNECTION *s, int nmatch)
         int minversion, maxversion;
 
         if (!tls1_in_list(id, supp, num_supp)
-                || !tls_group_allowed(s, id, SSL_SECOP_CURVE_SHARED))
+            || !tls_group_allowed(s, id, SSL_SECOP_CURVE_SHARED))
             continue;
         inf = tls1_group_id_lookup(ctx, id);
         if (!ossl_assert(inf != NULL))
             return 0;
 
         minversion = SSL_CONNECTION_IS_DTLS(s)
-                         ? inf->mindtls : inf->mintls;
+            ? inf->mindtls
+            : inf->mintls;
         maxversion = SSL_CONNECTION_IS_DTLS(s)
-                         ? inf->maxdtls : inf->maxtls;
+            ? inf->maxdtls
+            : inf->maxtls;
         if (maxversion == -1)
             continue;
         if ((minversion != 0 && ssl_version_cmp(s, s->version, minversion) < 0)
@@ -1065,7 +1068,7 @@ uint16_t tls1_shared_group(SSL_CONNECTION *s, int nmatch)
 
         if (nmatch == k)
             return id;
-         k++;
+        k++;
     }
     if (nmatch == -1)
         return k;
@@ -1074,9 +1077,9 @@ uint16_t tls1_shared_group(SSL_CONNECTION *s, int nmatch)
 }
 
 int tls1_set_groups(uint16_t **grpext, size_t *grpextlen,
-                    uint16_t **ksext, size_t *ksextlen,
-                    size_t **tplext, size_t *tplextlen,
-                    int *groups, size_t ngroups)
+    uint16_t **ksext, size_t *ksextlen,
+    size_t **tplext, size_t *tplextlen,
+    int *groups, size_t ngroups)
 {
     uint16_t *glist = NULL, *kslist = NULL;
     size_t *tpllist = NULL;
@@ -1117,7 +1120,13 @@ int tls1_set_groups(uint16_t **grpext, size_t *grpextlen,
     OPENSSL_free(*tplext);
     *grpext = glist;
     *grpextlen = ngroups;
-    kslist[0] = glist[0];
+    /*
+     * No * prefix was used, let tls_construct_ctos_key_share choose a key
+     * share. This has the advantage that it will filter unsupported groups
+     * before choosing one, which this function does not do. See also the
+     * comment for tls1_get_requested_keyshare_groups.
+     */
+    kslist[0] = 0;
     *ksext = kslist;
     *ksextlen = 1;
     tpllist[0] = ngroups;
@@ -1141,15 +1150,15 @@ int tls1_set_groups(uint16_t **grpext, size_t *grpextlen,
 typedef struct {
     const char *list_name; /* The name of this pseudo group */
     const char *group_string; /* The group string of this pseudo group */
-} default_group_string_st;    /* (can include '?', '*'. '-', '/' as needed) */
+} default_group_string_st; /* (can include '?', '*'. '-', '/' as needed) */
 
 /* Built-in pseudo group-names must start with a (D or d) */
 static const char *DEFAULT_GROUPNAME_FIRST_CHARACTER = "D";
 
 /* The list of all built-in pseudo-group-name structures */
 static const default_group_string_st default_group_strings[] = {
-    {DEFAULT_GROUP_NAME, TLS_DEFAULT_GROUP_LIST},
-    {SUITE_B_GROUP_NAME, SUITE_B_GROUP_LIST}
+    { DEFAULT_GROUP_NAME, TLS_DEFAULT_GROUP_LIST },
+    { SUITE_B_GROUP_NAME, SUITE_B_GROUP_LIST }
 };
 
 /*
@@ -1161,13 +1170,13 @@ typedef struct {
     uint16_t groupID;
 } name2id_st;
 static const name2id_st name2id_arr[] = {
-    {"GC256A", OSSL_TLS_GROUP_ID_gc256A },
-    {"GC256B", OSSL_TLS_GROUP_ID_gc256B },
-    {"GC256C", OSSL_TLS_GROUP_ID_gc256C },
-    {"GC256D", OSSL_TLS_GROUP_ID_gc256D },
-    {"GC512A", OSSL_TLS_GROUP_ID_gc512A },
-    {"GC512B", OSSL_TLS_GROUP_ID_gc512B },
-    {"GC512C", OSSL_TLS_GROUP_ID_gc512C },
+    { "GC256A", OSSL_TLS_GROUP_ID_gc256A },
+    { "GC256B", OSSL_TLS_GROUP_ID_gc256B },
+    { "GC256C", OSSL_TLS_GROUP_ID_gc256C },
+    { "GC256D", OSSL_TLS_GROUP_ID_gc256D },
+    { "GC512A", OSSL_TLS_GROUP_ID_gc512A },
+    { "GC512B", OSSL_TLS_GROUP_ID_gc512B },
+    { "GC512C", OSSL_TLS_GROUP_ID_gc512C },
 };
 
 /*
@@ -1188,30 +1197,30 @@ static const name2id_st name2id_arr[] = {
  */
 #ifndef TUPLE_DELIMITER_CHARACTER
 /* The prefix characters to indicate group tuple boundaries */
-# define TUPLE_DELIMITER_CHARACTER '/'
+#define TUPLE_DELIMITER_CHARACTER '/'
 #endif
 #ifndef GROUP_DELIMITER_CHARACTER
 /* The prefix characters to indicate group tuple boundaries */
-# define GROUP_DELIMITER_CHARACTER ':'
+#define GROUP_DELIMITER_CHARACTER ':'
 #endif
 #ifndef IGNORE_UNKNOWN_GROUP_CHARACTER
 /* The prefix character to ignore unknown groups */
-# define IGNORE_UNKNOWN_GROUP_CHARACTER '?'
+#define IGNORE_UNKNOWN_GROUP_CHARACTER '?'
 #endif
 #ifndef KEY_SHARE_INDICATOR_CHARACTER
 /* The prefix character to trigger a key share addition */
-# define KEY_SHARE_INDICATOR_CHARACTER '*'
+#define KEY_SHARE_INDICATOR_CHARACTER '*'
 #endif
 #ifndef REMOVE_GROUP_INDICATOR_CHARACTER
 /* The prefix character to trigger a key share removal */
-# define REMOVE_GROUP_INDICATOR_CHARACTER '-'
+#define REMOVE_GROUP_INDICATOR_CHARACTER '-'
 #endif
-static const char prefixes[] = {TUPLE_DELIMITER_CHARACTER,
-                                GROUP_DELIMITER_CHARACTER,
-                                IGNORE_UNKNOWN_GROUP_CHARACTER,
-                                KEY_SHARE_INDICATOR_CHARACTER,
-                                REMOVE_GROUP_INDICATOR_CHARACTER,
-                                '\0'};
+static const char prefixes[] = { TUPLE_DELIMITER_CHARACTER,
+    GROUP_DELIMITER_CHARACTER,
+    IGNORE_UNKNOWN_GROUP_CHARACTER,
+    KEY_SHARE_INDICATOR_CHARACTER,
+    REMOVE_GROUP_INDICATOR_CHARACTER,
+    '\0' };
 
 /*
  * High-level description of how group strings are analyzed:
@@ -1271,8 +1280,8 @@ static int gid_cb(const char *elem, int len, void *arg)
 
     /* Check the possible prefixes (remark: Leading and trailing spaces already cleared) */
     while (continue_while_loop && len > 0
-           && ((current_prefix = strchr(prefixes, elem[0])) != NULL
-               || OPENSSL_strncasecmp(current_prefix = (char *)DEFAULT_GROUPNAME_FIRST_CHARACTER, elem, 1) == 0)) {
+        && ((current_prefix = strchr(prefixes, elem[0])) != NULL
+            || OPENSSL_strncasecmp(current_prefix = (char *)DEFAULT_GROUPNAME_FIRST_CHARACTER, elem, 1) == 0)) {
 
         switch (*current_prefix) {
         case TUPLE_DELIMITER_CHARACTER:
@@ -1328,30 +1337,26 @@ static int gid_cb(const char *elem, int len, void *arg)
                      * First, we restore any keyshare prefix in a new zero-terminated string
                      * (if not already present)
                      */
-                    restored_default_group_string = OPENSSL_malloc((1 /* max prefix length */ +
-                                                                    strlen(default_group_strings[i].group_string) +
-                                                                    1 /* \0 */) * sizeof(char));
+                    restored_default_group_string = OPENSSL_malloc((1 /* max prefix length */ + strlen(default_group_strings[i].group_string) + 1 /* \0 */) * sizeof(char));
                     if (restored_default_group_string == NULL)
                         return 0;
                     if (add_keyshare
                         /* Remark: we tolerate a duplicated keyshare indicator here */
                         && default_group_strings[i].group_string[0]
-                        != KEY_SHARE_INDICATOR_CHARACTER)
-                        restored_default_group_string[restored_prefix_index++] =
-                            KEY_SHARE_INDICATOR_CHARACTER;
+                            != KEY_SHARE_INDICATOR_CHARACTER)
+                        restored_default_group_string[restored_prefix_index++] = KEY_SHARE_INDICATOR_CHARACTER;
 
                     memcpy(restored_default_group_string + restored_prefix_index,
-                           default_group_strings[i].group_string,
-                           strlen(default_group_strings[i].group_string));
-                    restored_default_group_string[strlen(default_group_strings[i].group_string) +
-                                                  restored_prefix_index] = '\0';
+                        default_group_strings[i].group_string,
+                        strlen(default_group_strings[i].group_string));
+                    restored_default_group_string[strlen(default_group_strings[i].group_string) + restored_prefix_index] = '\0';
                     /* We execute the recursive call */
                     garg->ignore_unknown_default = 1; /* We ignore unknown groups for DEFAULT_XYZ */
                     /* we enforce group mode (= append tuple) for DEFAULT_XYZ group lists */
                     garg->tuple_mode = 0;
                     /* We use the tuple_cb callback to process the pseudo group tuple */
                     retval = CONF_parse_list(restored_default_group_string,
-                                             TUPLE_DELIMITER_CHARACTER, 1, tuple_cb, garg);
+                        TUPLE_DELIMITER_CHARACTER, 1, tuple_cb, garg);
                     garg->tuple_mode = 1; /* next call to tuple_cb will again start new tuple */
                     garg->ignore_unknown_default = 0; /* reset to original value */
                     /* We don't need the \0-terminated string anymore */
@@ -1378,9 +1383,8 @@ static int gid_cb(const char *elem, int len, void *arg)
 
     /* Memory management in case more groups are present compared to initial allocation */
     if (garg->gidcnt == garg->gidmax) {
-        uint16_t *tmp =
-            OPENSSL_realloc(garg->gid_arr,
-                            (garg->gidmax + GROUPLIST_INCREMENT) * sizeof(*garg->gid_arr));
+        uint16_t *tmp = OPENSSL_realloc(garg->gid_arr,
+            (garg->gidmax + GROUPLIST_INCREMENT) * sizeof(*garg->gid_arr));
 
         if (tmp == NULL)
             return 0;
@@ -1390,9 +1394,8 @@ static int gid_cb(const char *elem, int len, void *arg)
     }
     /* Memory management for key share groups */
     if (garg->ksidcnt == garg->ksidmax) {
-        uint16_t *tmp =
-            OPENSSL_realloc(garg->ksid_arr,
-                            (garg->ksidmax + GROUPLIST_INCREMENT) * sizeof(*garg->ksid_arr));
+        uint16_t *tmp = OPENSSL_realloc(garg->ksid_arr,
+            (garg->ksidmax + GROUPLIST_INCREMENT) * sizeof(*garg->ksid_arr));
 
         if (tmp == NULL)
             return 0;
@@ -1535,9 +1538,8 @@ static int tuple_cb(const char *tuple, int len, void *arg)
 
     /* Memory management for tuples */
     if (garg->tplcnt == garg->tplmax) {
-        size_t *tmp =
-            OPENSSL_realloc(garg->tuplcnt_arr,
-                            (garg->tplmax + GROUPLIST_INCREMENT) * sizeof(*garg->tuplcnt_arr));
+        size_t *tmp = OPENSSL_realloc(garg->tuplcnt_arr,
+            (garg->tplmax + GROUPLIST_INCREMENT) * sizeof(*garg->tuplcnt_arr));
 
         if (tmp == NULL)
             return 0;
@@ -1573,18 +1575,18 @@ static int tuple_cb(const char *tuple, int len, void *arg)
 /*
  * Set groups and prepare generation of keyshares based on a string of groupnames,
  * names separated by the group or the tuple delimiter, with per-group prefixes to
- * (1) add a key share for this group, (2) ignore the group if unkown to the current
+ * (1) add a key share for this group, (2) ignore the group if unknown to the current
  * context, (3) delete a previous occurrence of the group in the current tuple.
  *
- * The list parsing is done in two hierachical steps: The top-level step extracts the
+ * The list parsing is done in two hierarchical steps: The top-level step extracts the
  * string of a tuple using tuple_cb, while the next lower step uses gid_cb to
  * parse and process the groups inside a tuple
  */
 int tls1_set_groups_list(SSL_CTX *ctx,
-                         uint16_t **grpext, size_t *grpextlen,
-                         uint16_t **ksext, size_t *ksextlen,
-                         size_t **tplext, size_t *tplextlen,
-                         const char *str)
+    uint16_t **grpext, size_t *grpextlen,
+    uint16_t **ksext, size_t *ksextlen,
+    size_t **tplext, size_t *tplextlen,
+    const char *str)
 {
     size_t i = 0, j;
     int ret = 0, parse_ret = 0;
@@ -1631,12 +1633,12 @@ int tls1_set_groups_list(SSL_CTX *ctx,
         goto end;
     if (parse_ret == -1) {
         ERR_raise_data(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT,
-                       "Syntax error in '%s'", str);
+            "Syntax error in '%s'", str);
         goto end;
     }
 
     /*
-     * We check whether a tuple was completly emptied by using "-" prefix
+     * We check whether a tuple was completely emptied by using "-" prefix
      * excessively, in which case we remove the tuple
      */
     for (i = j = 0; j < gcb.tplcnt; j++) {
@@ -1652,8 +1654,8 @@ int tls1_set_groups_list(SSL_CTX *ctx,
 
     if (gcb.ksidcnt > OPENSSL_CLIENT_MAX_KEY_SHARES) {
         ERR_raise_data(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT,
-                       "To many keyshares requested in '%s' (max = %d)",
-                       str, OPENSSL_CLIENT_MAX_KEY_SHARES);
+            "To many keyshares requested in '%s' (max = %d)",
+            str, OPENSSL_CLIENT_MAX_KEY_SHARES);
         goto end;
     }
 
@@ -1670,20 +1672,19 @@ int tls1_set_groups_list(SSL_CTX *ctx,
         gcb.ksid_arr[0] = 0;
     }
 
- empty_list:
+empty_list:
     /*
      * A call to tls1_set_groups_list with any of the args (other than ctx) set
      * to NULL only does a syntax check, hence we're done here and report success
      */
-    if (grpext == NULL || ksext == NULL || tplext == NULL ||
-        grpextlen == NULL || ksextlen == NULL || tplextlen == NULL) {
+    if (grpext == NULL || ksext == NULL || tplext == NULL || grpextlen == NULL || ksextlen == NULL || tplextlen == NULL) {
         ret = 1;
         goto end;
     }
 
     /*
      * tuple_cb and gid_cb combo ensures there are no duplicates or unknown groups so we
-     * can just go ahead and set the results (after diposing the existing)
+     * can just go ahead and set the results (after disposing the existing)
      */
     OPENSSL_free(*grpext);
     *grpext = gcb.gid_arr;
@@ -1697,7 +1698,7 @@ int tls1_set_groups_list(SSL_CTX *ctx,
 
     return 1;
 
- end:
+end:
     OPENSSL_free(gcb.gid_arr);
     OPENSSL_free(gcb.tuplcnt_arr);
     OPENSSL_free(gcb.ksid_arr);
@@ -1706,8 +1707,8 @@ int tls1_set_groups_list(SSL_CTX *ctx,
 
 /* Check a group id matches preferences */
 int tls1_check_group_id(SSL_CONNECTION *s, uint16_t group_id,
-                        int check_own_groups)
-    {
+    int check_own_groups)
+{
     const uint16_t *groups;
     size_t groups_len;
 
@@ -1754,12 +1755,12 @@ int tls1_check_group_id(SSL_CONNECTION *s, uint16_t group_id,
      * extension, so groups_len == 0 always means no extension.
      */
     if (groups_len == 0)
-            return 1;
+        return 1;
     return tls1_in_list(group_id, groups, groups_len);
 }
 
 void tls1_get_formatlist(SSL_CONNECTION *s, const unsigned char **pformats,
-                         size_t *num_formats)
+    size_t *num_formats)
 {
     /*
      * If we have a custom point format list use it otherwise use default
@@ -1788,13 +1789,12 @@ static int tls1_check_pkey_comp(SSL_CONNECTION *s, EVP_PKEY *pkey)
     if (!EVP_PKEY_is_a(pkey, "EC"))
         return 1;
 
-
     /* Get required compression id */
     point_conv = EVP_PKEY_get_ec_point_conv_form(pkey);
     if (point_conv == 0)
         return 0;
     if (point_conv == POINT_CONVERSION_UNCOMPRESSED) {
-            comp_id = TLSEXT_ECPOINTFORMAT_uncompressed;
+        comp_id = TLSEXT_ECPOINTFORMAT_uncompressed;
     } else if (SSL_CONNECTION_IS_TLS13(s)) {
         /*
          * ec_point_formats extension is not used in TLSv1.3 so we ignore
@@ -1873,7 +1873,7 @@ static int tls1_check_cert_param(SSL_CONNECTION *s, X509 *x, int check_ee_md)
         else if (group_id == OSSL_TLS_GROUP_ID_secp384r1)
             check_md = NID_ecdsa_with_SHA384;
         else
-            return 0;           /* Should never happen */
+            return 0; /* Should never happen */
         for (i = 0; i < s->shared_sigalgslen; i++) {
             if (check_md == s->shared_sigalgs[i]->sigandhash)
                 return 1;
@@ -1957,198 +1957,197 @@ static const uint16_t tls12_sigalgs[] = {
 #endif
 };
 
-
 static const uint16_t suiteb_sigalgs[] = {
     TLSEXT_SIGALG_ecdsa_secp256r1_sha256,
     TLSEXT_SIGALG_ecdsa_secp384r1_sha384
 };
 
 static const SIGALG_LOOKUP sigalg_lookup_tbl[] = {
-    {TLSEXT_SIGALG_ecdsa_secp256r1_sha256_name,
-     "ECDSA+SHA256", TLSEXT_SIGALG_ecdsa_secp256r1_sha256,
-     NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
-     NID_ecdsa_with_SHA256, NID_X9_62_prime256v1, 1, 0,
-     TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0},
-    {TLSEXT_SIGALG_ecdsa_secp384r1_sha384_name,
-     "ECDSA+SHA384", TLSEXT_SIGALG_ecdsa_secp384r1_sha384,
-     NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
-     NID_ecdsa_with_SHA384, NID_secp384r1, 1, 0,
-     TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0},
-    {TLSEXT_SIGALG_ecdsa_secp521r1_sha512_name,
-     "ECDSA+SHA512", TLSEXT_SIGALG_ecdsa_secp521r1_sha512,
-     NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
-     NID_ecdsa_with_SHA512, NID_secp521r1, 1, 0,
-     TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0},
-
-    {TLSEXT_SIGALG_ed25519_name,
-     NULL, TLSEXT_SIGALG_ed25519,
-     NID_undef, -1, EVP_PKEY_ED25519, SSL_PKEY_ED25519,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0},
-    {TLSEXT_SIGALG_ed448_name,
-     NULL, TLSEXT_SIGALG_ed448,
-     NID_undef, -1, EVP_PKEY_ED448, SSL_PKEY_ED448,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0},
-
-    {TLSEXT_SIGALG_ecdsa_sha224_name,
-     "ECDSA+SHA224", TLSEXT_SIGALG_ecdsa_sha224,
-     NID_sha224, SSL_MD_SHA224_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
-     NID_ecdsa_with_SHA224, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-    {TLSEXT_SIGALG_ecdsa_sha1_name,
-     "ECDSA+SHA1", TLSEXT_SIGALG_ecdsa_sha1,
-     NID_sha1, SSL_MD_SHA1_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
-     NID_ecdsa_with_SHA1, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-
-    {TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256_name,
-     TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256_alias,
-     TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256,
-     NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
-     NID_ecdsa_with_SHA256, NID_brainpoolP256r1, 1, 0,
-     TLS1_3_VERSION, 0, -1, -1},
-    {TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384_name,
-     TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384_alias,
-     TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384,
-     NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
-     NID_ecdsa_with_SHA384, NID_brainpoolP384r1, 1, 0,
-     TLS1_3_VERSION, 0, -1, -1},
-    {TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512_name,
-     TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512_alias,
-     TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512,
-     NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
-     NID_ecdsa_with_SHA512, NID_brainpoolP512r1, 1, 0,
-     TLS1_3_VERSION, 0, -1, -1},
-
-    {TLSEXT_SIGALG_rsa_pss_rsae_sha256_name,
-     "PSS+SHA256", TLSEXT_SIGALG_rsa_pss_rsae_sha256,
-     NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0},
-    {TLSEXT_SIGALG_rsa_pss_rsae_sha384_name,
-     "PSS+SHA384", TLSEXT_SIGALG_rsa_pss_rsae_sha384,
-     NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0},
-    {TLSEXT_SIGALG_rsa_pss_rsae_sha512_name,
-     "PSS+SHA512", TLSEXT_SIGALG_rsa_pss_rsae_sha512,
-     NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0},
-
-    {TLSEXT_SIGALG_rsa_pss_pss_sha256_name,
-     NULL, TLSEXT_SIGALG_rsa_pss_pss_sha256,
-     NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA_PSS_SIGN,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0},
-    {TLSEXT_SIGALG_rsa_pss_pss_sha384_name,
-     NULL, TLSEXT_SIGALG_rsa_pss_pss_sha384,
-     NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA_PSS_SIGN,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0},
-    {TLSEXT_SIGALG_rsa_pss_pss_sha512_name,
-     NULL, TLSEXT_SIGALG_rsa_pss_pss_sha512,
-     NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA_PSS_SIGN,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0},
-
-    {TLSEXT_SIGALG_rsa_pkcs1_sha256_name,
-     "RSA+SHA256", TLSEXT_SIGALG_rsa_pkcs1_sha256,
-     NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
-     NID_sha256WithRSAEncryption, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-    {TLSEXT_SIGALG_rsa_pkcs1_sha384_name,
-     "RSA+SHA384", TLSEXT_SIGALG_rsa_pkcs1_sha384,
-     NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
-     NID_sha384WithRSAEncryption, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-    {TLSEXT_SIGALG_rsa_pkcs1_sha512_name,
-     "RSA+SHA512", TLSEXT_SIGALG_rsa_pkcs1_sha512,
-     NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
-     NID_sha512WithRSAEncryption, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-
-    {TLSEXT_SIGALG_rsa_pkcs1_sha224_name,
-     "RSA+SHA224", TLSEXT_SIGALG_rsa_pkcs1_sha224,
-     NID_sha224, SSL_MD_SHA224_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
-     NID_sha224WithRSAEncryption, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-    {TLSEXT_SIGALG_rsa_pkcs1_sha1_name,
-     "RSA+SHA1", TLSEXT_SIGALG_rsa_pkcs1_sha1,
-     NID_sha1, SSL_MD_SHA1_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
-     NID_sha1WithRSAEncryption, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-
-    {TLSEXT_SIGALG_dsa_sha256_name,
-     "DSA+SHA256", TLSEXT_SIGALG_dsa_sha256,
-     NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
-     NID_dsa_with_SHA256, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-    {TLSEXT_SIGALG_dsa_sha384_name,
-     "DSA+SHA384", TLSEXT_SIGALG_dsa_sha384,
-     NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-    {TLSEXT_SIGALG_dsa_sha512_name,
-     "DSA+SHA512", TLSEXT_SIGALG_dsa_sha512,
-     NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-    {TLSEXT_SIGALG_dsa_sha224_name,
-     "DSA+SHA224", TLSEXT_SIGALG_dsa_sha224,
-     NID_sha224, SSL_MD_SHA224_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-    {TLSEXT_SIGALG_dsa_sha1_name,
-     "DSA+SHA1", TLSEXT_SIGALG_dsa_sha1,
-     NID_sha1, SSL_MD_SHA1_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
-     NID_dsaWithSHA1, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
+    { TLSEXT_SIGALG_ecdsa_secp256r1_sha256_name,
+        "ECDSA+SHA256", TLSEXT_SIGALG_ecdsa_secp256r1_sha256,
+        NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
+        NID_ecdsa_with_SHA256, NID_X9_62_prime256v1, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+    { TLSEXT_SIGALG_ecdsa_secp384r1_sha384_name,
+        "ECDSA+SHA384", TLSEXT_SIGALG_ecdsa_secp384r1_sha384,
+        NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
+        NID_ecdsa_with_SHA384, NID_secp384r1, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+    { TLSEXT_SIGALG_ecdsa_secp521r1_sha512_name,
+        "ECDSA+SHA512", TLSEXT_SIGALG_ecdsa_secp521r1_sha512,
+        NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
+        NID_ecdsa_with_SHA512, NID_secp521r1, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+
+    { TLSEXT_SIGALG_ed25519_name,
+        NULL, TLSEXT_SIGALG_ed25519,
+        NID_undef, -1, EVP_PKEY_ED25519, SSL_PKEY_ED25519,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+    { TLSEXT_SIGALG_ed448_name,
+        NULL, TLSEXT_SIGALG_ed448,
+        NID_undef, -1, EVP_PKEY_ED448, SSL_PKEY_ED448,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+
+    { TLSEXT_SIGALG_ecdsa_sha224_name,
+        "ECDSA+SHA224", TLSEXT_SIGALG_ecdsa_sha224,
+        NID_sha224, SSL_MD_SHA224_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
+        NID_ecdsa_with_SHA224, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
+    { TLSEXT_SIGALG_ecdsa_sha1_name,
+        "ECDSA+SHA1", TLSEXT_SIGALG_ecdsa_sha1,
+        NID_sha1, SSL_MD_SHA1_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
+        NID_ecdsa_with_SHA1, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
+
+    { TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256_name,
+        TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256_alias,
+        TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256,
+        NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
+        NID_ecdsa_with_SHA256, NID_brainpoolP256r1, 1, 0,
+        TLS1_3_VERSION, 0, -1, -1 },
+    { TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384_name,
+        TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384_alias,
+        TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384,
+        NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
+        NID_ecdsa_with_SHA384, NID_brainpoolP384r1, 1, 0,
+        TLS1_3_VERSION, 0, -1, -1 },
+    { TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512_name,
+        TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512_alias,
+        TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512,
+        NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_EC, SSL_PKEY_ECC,
+        NID_ecdsa_with_SHA512, NID_brainpoolP512r1, 1, 0,
+        TLS1_3_VERSION, 0, -1, -1 },
+
+    { TLSEXT_SIGALG_rsa_pss_rsae_sha256_name,
+        "PSS+SHA256", TLSEXT_SIGALG_rsa_pss_rsae_sha256,
+        NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+    { TLSEXT_SIGALG_rsa_pss_rsae_sha384_name,
+        "PSS+SHA384", TLSEXT_SIGALG_rsa_pss_rsae_sha384,
+        NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+    { TLSEXT_SIGALG_rsa_pss_rsae_sha512_name,
+        "PSS+SHA512", TLSEXT_SIGALG_rsa_pss_rsae_sha512,
+        NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+
+    { TLSEXT_SIGALG_rsa_pss_pss_sha256_name,
+        NULL, TLSEXT_SIGALG_rsa_pss_pss_sha256,
+        NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA_PSS_SIGN,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+    { TLSEXT_SIGALG_rsa_pss_pss_sha384_name,
+        NULL, TLSEXT_SIGALG_rsa_pss_pss_sha384,
+        NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA_PSS_SIGN,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+    { TLSEXT_SIGALG_rsa_pss_pss_sha512_name,
+        NULL, TLSEXT_SIGALG_rsa_pss_pss_sha512,
+        NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_RSA_PSS, SSL_PKEY_RSA_PSS_SIGN,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+
+    { TLSEXT_SIGALG_rsa_pkcs1_sha256_name,
+        "RSA+SHA256", TLSEXT_SIGALG_rsa_pkcs1_sha256,
+        NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
+        NID_sha256WithRSAEncryption, NID_undef, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+    { TLSEXT_SIGALG_rsa_pkcs1_sha384_name,
+        "RSA+SHA384", TLSEXT_SIGALG_rsa_pkcs1_sha384,
+        NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
+        NID_sha384WithRSAEncryption, NID_undef, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+    { TLSEXT_SIGALG_rsa_pkcs1_sha512_name,
+        "RSA+SHA512", TLSEXT_SIGALG_rsa_pkcs1_sha512,
+        NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
+        NID_sha512WithRSAEncryption, NID_undef, 1, 0,
+        TLS1_2_VERSION, 0, DTLS1_2_VERSION, 0 },
+
+    { TLSEXT_SIGALG_rsa_pkcs1_sha224_name,
+        "RSA+SHA224", TLSEXT_SIGALG_rsa_pkcs1_sha224,
+        NID_sha224, SSL_MD_SHA224_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
+        NID_sha224WithRSAEncryption, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
+    { TLSEXT_SIGALG_rsa_pkcs1_sha1_name,
+        "RSA+SHA1", TLSEXT_SIGALG_rsa_pkcs1_sha1,
+        NID_sha1, SSL_MD_SHA1_IDX, EVP_PKEY_RSA, SSL_PKEY_RSA,
+        NID_sha1WithRSAEncryption, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
+
+    { TLSEXT_SIGALG_dsa_sha256_name,
+        "DSA+SHA256", TLSEXT_SIGALG_dsa_sha256,
+        NID_sha256, SSL_MD_SHA256_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
+        NID_dsa_with_SHA256, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
+    { TLSEXT_SIGALG_dsa_sha384_name,
+        "DSA+SHA384", TLSEXT_SIGALG_dsa_sha384,
+        NID_sha384, SSL_MD_SHA384_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
+    { TLSEXT_SIGALG_dsa_sha512_name,
+        "DSA+SHA512", TLSEXT_SIGALG_dsa_sha512,
+        NID_sha512, SSL_MD_SHA512_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
+    { TLSEXT_SIGALG_dsa_sha224_name,
+        "DSA+SHA224", TLSEXT_SIGALG_dsa_sha224,
+        NID_sha224, SSL_MD_SHA224_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
+    { TLSEXT_SIGALG_dsa_sha1_name,
+        "DSA+SHA1", TLSEXT_SIGALG_dsa_sha1,
+        NID_sha1, SSL_MD_SHA1_IDX, EVP_PKEY_DSA, SSL_PKEY_DSA_SIGN,
+        NID_dsaWithSHA1, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
 
 #ifndef OPENSSL_NO_GOST
-    {TLSEXT_SIGALG_gostr34102012_256_intrinsic_alias, /* RFC9189 */
-     TLSEXT_SIGALG_gostr34102012_256_intrinsic_name,
-     TLSEXT_SIGALG_gostr34102012_256_intrinsic,
-     NID_id_GostR3411_2012_256, SSL_MD_GOST12_256_IDX,
-     NID_id_GostR3410_2012_256, SSL_PKEY_GOST12_256,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-    {TLSEXT_SIGALG_gostr34102012_256_intrinsic_alias, /* RFC9189 */
-     TLSEXT_SIGALG_gostr34102012_256_intrinsic_name,
-     TLSEXT_SIGALG_gostr34102012_512_intrinsic,
-     NID_id_GostR3411_2012_512, SSL_MD_GOST12_512_IDX,
-     NID_id_GostR3410_2012_512, SSL_PKEY_GOST12_512,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-
-    {TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256_name,
-     NULL, TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256,
-     NID_id_GostR3411_2012_256, SSL_MD_GOST12_256_IDX,
-     NID_id_GostR3410_2012_256, SSL_PKEY_GOST12_256,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-    {TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512_name,
-     NULL, TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512,
-     NID_id_GostR3411_2012_512, SSL_MD_GOST12_512_IDX,
-     NID_id_GostR3410_2012_512, SSL_PKEY_GOST12_512,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
-    {TLSEXT_SIGALG_gostr34102001_gostr3411_name,
-     NULL, TLSEXT_SIGALG_gostr34102001_gostr3411,
-     NID_id_GostR3411_94, SSL_MD_GOST94_IDX,
-     NID_id_GostR3410_2001, SSL_PKEY_GOST01,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION},
+    { TLSEXT_SIGALG_gostr34102012_256_intrinsic_alias, /* RFC9189 */
+        TLSEXT_SIGALG_gostr34102012_256_intrinsic_name,
+        TLSEXT_SIGALG_gostr34102012_256_intrinsic,
+        NID_id_GostR3411_2012_256, SSL_MD_GOST12_256_IDX,
+        NID_id_GostR3410_2012_256, SSL_PKEY_GOST12_256,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
+    { TLSEXT_SIGALG_gostr34102012_256_intrinsic_alias, /* RFC9189 */
+        TLSEXT_SIGALG_gostr34102012_256_intrinsic_name,
+        TLSEXT_SIGALG_gostr34102012_512_intrinsic,
+        NID_id_GostR3411_2012_512, SSL_MD_GOST12_512_IDX,
+        NID_id_GostR3410_2012_512, SSL_PKEY_GOST12_512,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
+
+    { TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256_name,
+        NULL, TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256,
+        NID_id_GostR3411_2012_256, SSL_MD_GOST12_256_IDX,
+        NID_id_GostR3410_2012_256, SSL_PKEY_GOST12_256,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
+    { TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512_name,
+        NULL, TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512,
+        NID_id_GostR3411_2012_512, SSL_MD_GOST12_512_IDX,
+        NID_id_GostR3410_2012_512, SSL_PKEY_GOST12_512,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
+    { TLSEXT_SIGALG_gostr34102001_gostr3411_name,
+        NULL, TLSEXT_SIGALG_gostr34102001_gostr3411,
+        NID_id_GostR3411_94, SSL_MD_GOST94_IDX,
+        NID_id_GostR3410_2001, SSL_PKEY_GOST01,
+        NID_undef, NID_undef, 1, 0,
+        TLS1_2_VERSION, TLS1_2_VERSION, DTLS1_2_VERSION, DTLS1_2_VERSION },
 #endif
 };
 /* Legacy sigalgs for TLS < 1.2 RSA TLS signatures */
 static const SIGALG_LOOKUP legacy_rsa_sigalg = {
     "rsa_pkcs1_md5_sha1", NULL, 0,
-     NID_md5_sha1, SSL_MD_MD5_SHA1_IDX,
-     EVP_PKEY_RSA, SSL_PKEY_RSA,
-     NID_undef, NID_undef, 1, 0,
-     TLS1_VERSION, TLS1_2_VERSION, DTLS1_VERSION, DTLS1_2_VERSION
+    NID_md5_sha1, SSL_MD_MD5_SHA1_IDX,
+    EVP_PKEY_RSA, SSL_PKEY_RSA,
+    NID_undef, NID_undef, 1, 0,
+    TLS1_VERSION, TLS1_2_VERSION, DTLS1_VERSION, DTLS1_2_VERSION
 };
 
 /*
@@ -2195,7 +2194,7 @@ int ssl_setup_sigalgs(SSL_CTX *ctx)
     ERR_set_mark();
     /* First fill cache and tls12_sigalgs list from legacy algorithm list */
     for (i = 0, lu = sigalg_lookup_tbl;
-         i < OSSL_NELEM(sigalg_lookup_tbl); lu++, i++) {
+        i < OSSL_NELEM(sigalg_lookup_tbl); lu++, i++) {
         EVP_PKEY_CTX *pctx;
 
         cache[i] = *lu;
@@ -2209,7 +2208,7 @@ int ssl_setup_sigalgs(SSL_CTX *ctx)
          * independently - but not as a combination. We ignore this for now.
          */
         if (lu->hash != NID_undef
-                && ctx->ssl_digest_methods[lu->hash_idx] == NULL) {
+            && ctx->ssl_digest_methods[lu->hash_idx] == NULL) {
             cache[i].available = 0;
             continue;
         }
@@ -2233,7 +2232,7 @@ int ssl_setup_sigalgs(SSL_CTX *ctx)
         cache[cache_idx].name12 = si.sigalg_name;
         cache[cache_idx].sigalg = si.code_point;
         tls12_sigalgs_list[cache_idx] = si.code_point;
-        cache[cache_idx].hash = si.hash_name?OBJ_txt2nid(si.hash_name):NID_undef;
+        cache[cache_idx].hash = si.hash_name ? OBJ_txt2nid(si.hash_name) : NID_undef;
         cache[cache_idx].hash_idx = ssl_get_md_idx(cache[cache_idx].hash);
         cache[cache_idx].sig = OBJ_txt2nid(si.sigalg_name);
         cache[cache_idx].sig_idx = i + SSL_PKEY_NUM;
@@ -2283,7 +2282,7 @@ int ssl_setup_sigalgs(SSL_CTX *ctx)
     tls12_sigalgs_list = NULL;
 
     ret = 1;
- err:
+err:
     OPENSSL_free(cache);
     OPENSSL_free(tls12_sigalgs_list);
     EVP_PKEY_free(tmpkey);
@@ -2306,7 +2305,7 @@ char *SSL_get1_builtin_sigalgs(OSSL_LIB_CTX *libctx)
     retval[0] = (char)0;
 
     for (i = 0, lu = sigalg_lookup_tbl;
-         i < OSSL_NELEM(sigalg_lookup_tbl); lu++, i++) {
+        i < OSSL_NELEM(sigalg_lookup_tbl); lu++, i++) {
         EVP_PKEY_CTX *pctx;
         int enabled = 1;
 
@@ -2367,7 +2366,7 @@ char *SSL_get1_builtin_sigalgs(OSSL_LIB_CTX *libctx)
 
 /* Lookup TLS signature algorithm */
 static const SIGALG_LOOKUP *tls1_lookup_sigalg(const SSL_CTX *ctx,
-                                               uint16_t sigalg)
+    uint16_t sigalg)
 {
     size_t i;
     const SIGALG_LOOKUP *lu = ctx->sigalg_lookup_cache;
@@ -2411,7 +2410,7 @@ int tls1_lookup_md(SSL_CTX *ctx, const SIGALG_LOOKUP *lu, const EVP_MD **pmd)
  */
 #define RSA_PSS_MINIMUM_KEY_SIZE(md) (2 * EVP_MD_get_size(md) + 2)
 static int rsa_pss_check_min_key_size(SSL_CTX *ctx, const EVP_PKEY *pkey,
-                                      const SIGALG_LOOKUP *lu)
+    const SIGALG_LOOKUP *lu)
 {
     const EVP_MD *md;
 
@@ -2434,7 +2433,7 @@ static int rsa_pss_check_min_key_size(SSL_CTX *ctx, const EVP_PKEY *pkey,
  * Returns the signature algorithm to use, or NULL on error.
  */
 static const SIGALG_LOOKUP *tls1_get_legacy_sigalg(const SSL_CONNECTION *s,
-                                                   int idx)
+    int idx)
 {
     if (idx == -1) {
         if (s->server) {
@@ -2460,7 +2459,7 @@ static const SIGALG_LOOKUP *tls1_get_legacy_sigalg(const SSL_CONNECTION *s,
                 int real_idx;
 
                 for (real_idx = SSL_PKEY_GOST12_512; real_idx >= SSL_PKEY_GOST01;
-                     real_idx--) {
+                    real_idx--) {
                     if (s->cert->pkeys[real_idx].privatekey != NULL) {
                         idx = real_idx;
                         break;
@@ -2475,11 +2474,11 @@ static const SIGALG_LOOKUP *tls1_get_legacy_sigalg(const SSL_CONNECTION *s,
                 int real_idx;
 
                 for (real_idx = SSL_PKEY_GOST12_512; real_idx >= SSL_PKEY_GOST12_256;
-                     real_idx--) {
-                     if (s->cert->pkeys[real_idx].privatekey != NULL) {
-                         idx = real_idx;
-                         break;
-                     }
+                    real_idx--) {
+                    if (s->cert->pkeys[real_idx].privatekey != NULL) {
+                        idx = real_idx;
+                        break;
+                    }
                 }
             }
         } else {
@@ -2490,9 +2489,8 @@ static const SIGALG_LOOKUP *tls1_get_legacy_sigalg(const SSL_CONNECTION *s,
         return NULL;
 
     if (SSL_USE_SIGALGS(s) || idx != SSL_PKEY_RSA) {
-        const SIGALG_LOOKUP *lu =
-            tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s),
-                               tls_default_sigalg[idx]);
+        const SIGALG_LOOKUP *lu = tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s),
+            tls_default_sigalg[idx]);
 
         if (lu == NULL)
             return NULL;
@@ -2563,8 +2561,8 @@ size_t tls12_get_psigalgs(SSL_CONNECTION *s, int sent, const uint16_t **psigs)
  */
 int tls_check_sigalg_curve(const SSL_CONNECTION *s, int curve)
 {
-   const uint16_t *sigs;
-   size_t siglen, i;
+    const uint16_t *sigs;
+    size_t siglen, i;
 
     if (s->cert->conf_sigalgs) {
         sigs = s->cert->conf_sigalgs;
@@ -2575,14 +2573,13 @@ int tls_check_sigalg_curve(const SSL_CONNECTION *s, int curve)
     }
 
     for (i = 0; i < siglen; i++) {
-        const SIGALG_LOOKUP *lu =
-            tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s), sigs[i]);
+        const SIGALG_LOOKUP *lu = tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s), sigs[i]);
 
         if (lu == NULL)
             continue;
         if (lu->sig == EVP_PKEY_EC
-                && lu->curve != NID_undef
-                && curve == lu->curve)
+            && lu->curve != NID_undef
+            && curve == lu->curve)
             return 1;
     }
 
@@ -2600,8 +2597,7 @@ static int sigalg_security_bits(SSL_CTX *ctx, const SIGALG_LOOKUP *lu)
 
     if (!tls1_lookup_md(ctx, lu, &md))
         return 0;
-    if (md != NULL)
-    {
+    if (md != NULL) {
         int md_type = EVP_MD_get_type(md);
 
         /* Security bits: half digest bits */
@@ -2636,12 +2632,49 @@ static int sigalg_security_bits(SSL_CTX *ctx, const SIGALG_LOOKUP *lu)
      * in the (provider-loaded) sigalg_list structure
      */
     if ((secbits == 0) && (lu->sig_idx >= SSL_PKEY_NUM)
-               && ((lu->sig_idx - SSL_PKEY_NUM) < (int)ctx->sigalg_list_len)) {
+        && ((lu->sig_idx - SSL_PKEY_NUM) < (int)ctx->sigalg_list_len)) {
         secbits = ctx->sigalg_list[lu->sig_idx - SSL_PKEY_NUM].secbits;
     }
     return secbits;
 }
 
+static int tls_sigalg_compat(SSL_CONNECTION *sc, const SIGALG_LOOKUP *lu)
+{
+    int minversion, maxversion;
+    int minproto, maxproto;
+
+    if (!lu->available)
+        return 0;
+
+    if (SSL_CONNECTION_IS_DTLS(sc)) {
+        if (sc->ssl.method->version == DTLS_ANY_VERSION) {
+            minproto = sc->min_proto_version;
+            maxproto = sc->max_proto_version;
+        } else {
+            maxproto = minproto = sc->version;
+        }
+        minversion = lu->mindtls;
+        maxversion = lu->maxdtls;
+    } else {
+        if (sc->ssl.method->version == TLS_ANY_VERSION) {
+            minproto = sc->min_proto_version;
+            maxproto = sc->max_proto_version;
+        } else {
+            maxproto = minproto = sc->version;
+        }
+        minversion = lu->mintls;
+        maxversion = lu->maxtls;
+    }
+    if (minversion == -1 || maxversion == -1
+        || (minversion != 0 && maxproto != 0
+            && ssl_version_cmp(sc, minversion, maxproto) > 0)
+        || (maxversion != 0 && minproto != 0
+            && ssl_version_cmp(sc, maxversion, minproto) < 0)
+        || !tls12_sigalg_allowed(sc, SSL_SECOP_SIGALG_SUPPORTED, lu))
+        return 0;
+    return 1;
+}
+
 /*
  * Check signature algorithm is consistent with sent supported signature
  * algorithms and if so set relevant digest and signature scheme in
@@ -2656,7 +2689,6 @@ int tls12_check_peer_sigalg(SSL_CONNECTION *s, uint16_t sig, EVP_PKEY *pkey)
     int pkeyid = -1;
     const SIGALG_LOOKUP *lu;
     int secbits = 0;
-    int minversion, maxversion;
 
     pkeyid = EVP_PKEY_get_id(pkey);
 
@@ -2673,25 +2705,21 @@ int tls12_check_peer_sigalg(SSL_CONNECTION *s, uint16_t sig, EVP_PKEY *pkey)
 
     /* Is this code point available and compatible with the protocol */
     lu = tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s), sig);
-    if (lu == NULL) {
-        SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_WRONG_SIGNATURE_TYPE);
-        return 0;
-    }
-    minversion = SSL_CONNECTION_IS_DTLS(s) ? lu->mindtls : lu->mintls;
-    maxversion = SSL_CONNECTION_IS_DTLS(s) ? lu->maxdtls : lu->maxtls;
-    if (minversion == -1 || maxversion == -1 || !lu->available
-        || (minversion != 0 && s->max_proto_version != 0
-            && ssl_version_cmp(s, minversion, s->max_proto_version) > 0)
-        || (maxversion != 0 && s->min_proto_version != 0
-            && ssl_version_cmp(s, maxversion, s->min_proto_version) < 0)
-        || !tls12_sigalg_allowed(s, SSL_SECOP_SIGALG_SUPPORTED, lu)) {
+    if (lu == NULL || !tls_sigalg_compat(s, lu)) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_WRONG_SIGNATURE_TYPE);
         return 0;
     }
 
-    /* if this sigalg is loaded, set so far unknown pkeyid to its sig NID */
-    if (pkeyid == EVP_PKEY_KEYMGMT)
-        pkeyid = lu->sig;
+    /* If we don't know the pkey nid yet go and find it */
+    if (pkeyid == EVP_PKEY_KEYMGMT) {
+        const SSL_CERT_LOOKUP *scl = ssl_cert_lookup_by_pkey(pkey, NULL, SSL_CONNECTION_GET_CTX(s));
+
+        if (scl == NULL) {
+            SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_WRONG_SIGNATURE_TYPE);
+            return 0;
+        }
+        pkeyid = scl->pkey_nid;
+    }
 
     /* Should never happen */
     if (pkeyid == -1) {
@@ -2706,15 +2734,15 @@ int tls12_check_peer_sigalg(SSL_CONNECTION *s, uint16_t sig, EVP_PKEY *pkey)
     if ((SSL_CONNECTION_IS_TLS13(s)
             && (lu->hash == NID_sha1 || lu->hash == NID_sha224))
         || (pkeyid != lu->sig
-        && (lu->sig != EVP_PKEY_RSA_PSS || pkeyid != EVP_PKEY_RSA))) {
+            && (lu->sig != EVP_PKEY_RSA_PSS || pkeyid != EVP_PKEY_RSA))) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_WRONG_SIGNATURE_TYPE);
         return 0;
     }
     /* Check the sigalg is consistent with the key OID */
     if (!ssl_cert_lookup_by_nid(
-                 (pkeyid == EVP_PKEY_RSA_PSS) ? EVP_PKEY_get_id(pkey) : pkeyid,
-                 &cidx, SSL_CONNECTION_GET_CTX(s))
-            || lu->sig_idx != (int)cidx) {
+            (pkeyid == EVP_PKEY_RSA_PSS) ? EVP_PKEY_get_id(pkey) : pkeyid,
+            &cidx, SSL_CONNECTION_GET_CTX(s))
+        || lu->sig_idx != (int)cidx) {
         SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER, SSL_R_WRONG_SIGNATURE_TYPE);
         return 0;
     }
@@ -2724,7 +2752,7 @@ int tls12_check_peer_sigalg(SSL_CONNECTION *s, uint16_t sig, EVP_PKEY *pkey)
         /* Check point compression is permitted */
         if (!tls1_check_pkey_comp(s, pkey)) {
             SSLfatal(s, SSL_AD_ILLEGAL_PARAMETER,
-                     SSL_R_ILLEGAL_POINT_COMPRESSION);
+                SSL_R_ILLEGAL_POINT_COMPRESSION);
             return 0;
         }
 
@@ -2748,7 +2776,7 @@ int tls12_check_peer_sigalg(SSL_CONNECTION *s, uint16_t sig, EVP_PKEY *pkey)
                 if (sig != TLSEXT_SIGALG_ecdsa_secp256r1_sha256
                     && sig != TLSEXT_SIGALG_ecdsa_secp384r1_sha384) {
                     SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                             SSL_R_WRONG_SIGNATURE_TYPE);
+                        SSL_R_WRONG_SIGNATURE_TYPE);
                     return 0;
                 }
             }
@@ -2765,8 +2793,7 @@ int tls12_check_peer_sigalg(SSL_CONNECTION *s, uint16_t sig, EVP_PKEY *pkey)
             break;
     }
     /* Allow fallback to SHA1 if not strict mode */
-    if (i == sent_sigslen && (lu->hash != NID_sha1
-        || s->cert->cert_flags & SSL_CERT_FLAGS_CHECK_TLS_STRICT)) {
+    if (i == sent_sigslen && (lu->hash != NID_sha1 || s->cert->cert_flags & SSL_CERT_FLAGS_CHECK_TLS_STRICT)) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_WRONG_SIGNATURE_TYPE);
         return 0;
     }
@@ -2781,10 +2808,7 @@ int tls12_check_peer_sigalg(SSL_CONNECTION *s, uint16_t sig, EVP_PKEY *pkey)
     sigalgstr[0] = (sig >> 8) & 0xff;
     sigalgstr[1] = sig & 0xff;
     secbits = sigalg_security_bits(SSL_CONNECTION_GET_CTX(s), lu);
-    if (secbits == 0 ||
-        !ssl_security(s, SSL_SECOP_SIGALG_CHECK, secbits,
-                      md != NULL ? EVP_MD_get_type(md) : NID_undef,
-                      (void *)sigalgstr)) {
+    if (secbits == 0 || !ssl_security(s, SSL_SECOP_SIGALG_CHECK, secbits, md != NULL ? EVP_MD_get_type(md) : NID_undef, (void *)sigalgstr)) {
         SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_R_WRONG_SIGNATURE_TYPE);
         return 0;
     }
@@ -2835,7 +2859,8 @@ int ssl_set_client_disabled(SSL_CONNECTION *s)
     s->s3.tmp.mask_k = 0;
     ssl_set_sig_mask(&s->s3.tmp.mask_a, s, SSL_SECOP_SIGALG_MASK);
     if (ssl_get_min_max_version(s, &s->s3.tmp.min_ver,
-                                &s->s3.tmp.max_ver, NULL) != 0)
+            &s->s3.tmp.max_ver, NULL)
+        != 0)
         return 0;
 #ifndef OPENSSL_NO_PSK
     /* with PSK there must be client callback set */
@@ -2843,7 +2868,7 @@ int ssl_set_client_disabled(SSL_CONNECTION *s)
         s->s3.tmp.mask_a |= SSL_aPSK;
         s->s3.tmp.mask_k |= SSL_PSK;
     }
-#endif                          /* OPENSSL_NO_PSK */
+#endif /* OPENSSL_NO_PSK */
 #ifndef OPENSSL_NO_SRP
     if (!(s->srp_ctx.srp_Mask & SSL_kSRP)) {
         s->s3.tmp.mask_a |= SSL_aSRP;
@@ -2863,7 +2888,7 @@ int ssl_set_client_disabled(SSL_CONNECTION *s)
  * Returns 1 when it's disabled, 0 when enabled.
  */
 int ssl_cipher_disabled(const SSL_CONNECTION *s, const SSL_CIPHER *c,
-                        int op, int ecdhe)
+    int op, int ecdhe)
 {
     int minversion = SSL_CONNECTION_IS_DTLS(s) ? c->min_dtls : c->min_tls;
     int maxversion = SSL_CONNECTION_IS_DTLS(s) ? c->max_dtls : c->max_tls;
@@ -2874,7 +2899,7 @@ int ssl_cipher_disabled(const SSL_CONNECTION *s, const SSL_CIPHER *c,
     if (s->s3.tmp.max_ver == 0)
         return 1;
 
-    if (SSL_IS_QUIC_HANDSHAKE(s))
+    if (SSL_IS_QUIC_INT_HANDSHAKE(s))
         /* For QUIC, only allow these ciphersuites. */
         switch (SSL_CIPHER_get_id(c)) {
         case TLS1_3_CK_AES_128_GCM_SHA256:
@@ -2890,8 +2915,8 @@ int ssl_cipher_disabled(const SSL_CONNECTION *s, const SSL_CIPHER *c,
      * in SSLv3 if we are a client
      */
     if (minversion == TLS1_VERSION
-            && ecdhe
-            && (c->algorithm_mkey & (SSL_kECDHE | SSL_kECDHEPSK)) != 0)
+        && ecdhe
+        && (c->algorithm_mkey & (SSL_kECDHE | SSL_kECDHEPSK)) != 0)
         minversion = SSL3_VERSION;
 
     if (ssl_version_cmp(s, minversion, s->s3.tmp.max_ver) > 0
@@ -2929,7 +2954,7 @@ int tls1_set_server_sigalgs(SSL_CONNECTION *s)
      * the default algorithm for each certificate type
      */
     if (s->s3.tmp.peer_cert_sigalgs == NULL
-            && s->s3.tmp.peer_sigalgs == NULL) {
+        && s->s3.tmp.peer_sigalgs == NULL) {
         const uint16_t *sent_sigs;
         size_t sent_sigslen = tls12_get_psigalgs(s, 1, &sent_sigs);
 
@@ -2942,8 +2967,8 @@ int tls1_set_server_sigalgs(SSL_CONNECTION *s)
             /* Check default matches a type we sent */
             for (j = 0; j < sent_sigslen; j++) {
                 if (lu->sigalg == sent_sigs[j]) {
-                        s->s3.tmp.valid_flags[i] = CERT_PKEY_SIGN;
-                        break;
+                    s->s3.tmp.valid_flags[i] = CERT_PKEY_SIGN;
+                    break;
                 }
             }
         }
@@ -2959,7 +2984,7 @@ int tls1_set_server_sigalgs(SSL_CONNECTION *s)
 
     /* Fatal error if no shared signature algorithms */
     SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-             SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS);
+        SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS);
     return 0;
 }
 
@@ -2971,8 +2996,8 @@ int tls1_set_server_sigalgs(SSL_CONNECTION *s)
  *       point to the resulting session.
  */
 SSL_TICKET_STATUS tls_get_ticket_from_client(SSL_CONNECTION *s,
-                                             CLIENTHELLO_MSG *hello,
-                                             SSL_SESSION **ret)
+    CLIENTHELLO_MSG *hello,
+    SSL_SESSION **ret)
 {
     size_t size;
     RAW_EXTENSION *ticketext;
@@ -2995,7 +3020,7 @@ SSL_TICKET_STATUS tls_get_ticket_from_client(SSL_CONNECTION *s,
     size = PACKET_remaining(&ticketext->data);
 
     return tls_decrypt_ticket(s, PACKET_data(&ticketext->data), size,
-                              hello->session_id, hello->session_id_len, ret);
+        hello->session_id, hello->session_id_len, ret);
 }
 
 /*-
@@ -3022,10 +3047,10 @@ SSL_TICKET_STATUS tls_get_ticket_from_client(SSL_CONNECTION *s,
  *       point to the resulting session.
  */
 SSL_TICKET_STATUS tls_decrypt_ticket(SSL_CONNECTION *s,
-                                     const unsigned char *etick,
-                                     size_t eticklen,
-                                     const unsigned char *sess_id,
-                                     size_t sesslen, SSL_SESSION **psess)
+    const unsigned char *etick,
+    size_t eticklen,
+    const unsigned char *sess_id,
+    size_t sesslen, SSL_SESSION **psess)
 {
     SSL_SESSION *sess = NULL;
     unsigned char *sdec;
@@ -3086,17 +3111,17 @@ SSL_TICKET_STATUS tls_decrypt_ticket(SSL_CONNECTION *s,
 
         if (tctx->ext.ticket_key_evp_cb != NULL)
             rv = tctx->ext.ticket_key_evp_cb(SSL_CONNECTION_GET_USER_SSL(s),
-                                             nctick,
-                                             nctick + TLSEXT_KEYNAME_LENGTH,
-                                             ctx,
-                                             ssl_hmac_get0_EVP_MAC_CTX(hctx),
-                                             0);
+                nctick,
+                nctick + TLSEXT_KEYNAME_LENGTH,
+                ctx,
+                ssl_hmac_get0_EVP_MAC_CTX(hctx),
+                0);
 #ifndef OPENSSL_NO_DEPRECATED_3_0
         else if (tctx->ext.ticket_key_cb != NULL)
             /* if 0 is returned, write an empty ticket */
             rv = tctx->ext.ticket_key_cb(SSL_CONNECTION_GET_USER_SSL(s), nctick,
-                                         nctick + TLSEXT_KEYNAME_LENGTH,
-                                         ctx, ssl_hmac_get0_HMAC_CTX(hctx), 0);
+                nctick + TLSEXT_KEYNAME_LENGTH,
+                ctx, ssl_hmac_get0_HMAC_CTX(hctx), 0);
 #endif
         if (rv < 0) {
             ret = SSL_TICKET_FATAL_ERR_OTHER;
@@ -3113,20 +3138,23 @@ SSL_TICKET_STATUS tls_decrypt_ticket(SSL_CONNECTION *s,
 
         /* Check key name matches */
         if (memcmp(etick, tctx->ext.tick_key_name,
-                   TLSEXT_KEYNAME_LENGTH) != 0) {
+                TLSEXT_KEYNAME_LENGTH)
+            != 0) {
             ret = SSL_TICKET_NO_DECRYPT;
             goto end;
         }
 
         aes256cbc = EVP_CIPHER_fetch(sctx->libctx, "AES-256-CBC",
-                                     sctx->propq);
+            sctx->propq);
         if (aes256cbc == NULL
             || ssl_hmac_init(hctx, tctx->ext.secure->tick_hmac_key,
-                             sizeof(tctx->ext.secure->tick_hmac_key),
-                             "SHA256") <= 0
+                   sizeof(tctx->ext.secure->tick_hmac_key),
+                   "SHA256")
+                <= 0
             || EVP_DecryptInit_ex(ctx, aes256cbc, NULL,
-                                  tctx->ext.secure->tick_aes_key,
-                                  etick + TLSEXT_KEYNAME_LENGTH) <= 0) {
+                   tctx->ext.secure->tick_aes_key,
+                   etick + TLSEXT_KEYNAME_LENGTH)
+                <= 0) {
             EVP_CIPHER_free(aes256cbc);
             ret = SSL_TICKET_FATAL_ERR_OTHER;
             goto end;
@@ -3173,8 +3201,7 @@ SSL_TICKET_STATUS tls_decrypt_ticket(SSL_CONNECTION *s,
     p = etick + TLSEXT_KEYNAME_LENGTH + ivlen;
     eticklen -= TLSEXT_KEYNAME_LENGTH + ivlen;
     sdec = OPENSSL_malloc(eticklen);
-    if (sdec == NULL || EVP_DecryptUpdate(ctx, sdec, &slen, p,
-                                          (int)eticklen) <= 0) {
+    if (sdec == NULL || EVP_DecryptUpdate(ctx, sdec, &slen, p, (int)eticklen) <= 0) {
         OPENSSL_free(sdec);
         ret = SSL_TICKET_FATAL_ERR_OTHER;
         goto end;
@@ -3220,7 +3247,7 @@ SSL_TICKET_STATUS tls_decrypt_ticket(SSL_CONNECTION *s,
      */
     ret = SSL_TICKET_NO_DECRYPT;
 
- end:
+end:
     EVP_CIPHER_CTX_free(ctx);
     ssl_hmac_free(hctx);
 
@@ -3230,19 +3257,19 @@ SSL_TICKET_STATUS tls_decrypt_ticket(SSL_CONNECTION *s,
      * performs any action
      */
     if (s->session_ctx->decrypt_ticket_cb != NULL
-            && (ret == SSL_TICKET_EMPTY
-                || ret == SSL_TICKET_NO_DECRYPT
-                || ret == SSL_TICKET_SUCCESS
-                || ret == SSL_TICKET_SUCCESS_RENEW)) {
+        && (ret == SSL_TICKET_EMPTY
+            || ret == SSL_TICKET_NO_DECRYPT
+            || ret == SSL_TICKET_SUCCESS
+            || ret == SSL_TICKET_SUCCESS_RENEW)) {
         size_t keyname_len = eticklen;
         int retcb;
 
         if (keyname_len > TLSEXT_KEYNAME_LENGTH)
             keyname_len = TLSEXT_KEYNAME_LENGTH;
         retcb = s->session_ctx->decrypt_ticket_cb(SSL_CONNECTION_GET_SSL(s),
-                                                  sess, etick, keyname_len,
-                                                  ret,
-                                                  s->session_ctx->ticket_cb_data);
+            sess, etick, keyname_len,
+            ret,
+            s->session_ctx->ticket_cb_data);
         switch (retcb) {
         case SSL_TICKET_RETURN_ABORT:
             ret = SSL_TICKET_FATAL_ERR_OTHER;
@@ -3265,7 +3292,7 @@ SSL_TICKET_STATUS tls_decrypt_ticket(SSL_CONNECTION *s,
         case SSL_TICKET_RETURN_USE:
         case SSL_TICKET_RETURN_USE_RENEW:
             if (ret != SSL_TICKET_SUCCESS
-                    && ret != SSL_TICKET_SUCCESS_RENEW)
+                && ret != SSL_TICKET_SUCCESS_RENEW)
                 ret = SSL_TICKET_FATAL_ERR_OTHER;
             else if (retcb == SSL_TICKET_RETURN_USE)
                 ret = SSL_TICKET_SUCCESS;
@@ -3294,7 +3321,7 @@ SSL_TICKET_STATUS tls_decrypt_ticket(SSL_CONNECTION *s,
 
 /* Check to see if a signature algorithm is allowed */
 static int tls12_sigalg_allowed(const SSL_CONNECTION *s, int op,
-                                const SIGALG_LOOKUP *lu)
+    const SIGALG_LOOKUP *lu)
 {
     unsigned char sigalgstr[2];
     int secbits;
@@ -3320,14 +3347,14 @@ static int tls12_sigalg_allowed(const SSL_CONNECTION *s, int op,
         return 0;
 
     if (lu->sig == NID_id_GostR3410_2012_256
-            || lu->sig == NID_id_GostR3410_2012_512
-            || lu->sig == NID_id_GostR3410_2001) {
+        || lu->sig == NID_id_GostR3410_2012_512
+        || lu->sig == NID_id_GostR3410_2001) {
         /* We never allow GOST sig algs on the server with TLSv1.3 */
         if (s->server && SSL_CONNECTION_IS_TLS13(s))
             return 0;
         if (!s->server
-                && SSL_CONNECTION_GET_SSL(s)->method->version == TLS_ANY_VERSION
-                && s->s3.tmp.max_ver >= TLS1_3_VERSION) {
+            && SSL_CONNECTION_GET_SSL(s)->method->version == TLS_ANY_VERSION
+            && s->s3.tmp.max_ver >= TLS1_3_VERSION) {
             int i, num;
             STACK_OF(SSL_CIPHER) *sk;
 
@@ -3382,47 +3409,35 @@ void ssl_set_sig_mask(uint32_t *pmask_a, SSL_CONNECTION *s, int op)
      */
     sigalgslen = tls12_get_psigalgs(s, 1, &sigalgs);
     for (i = 0; i < sigalgslen; i++, sigalgs++) {
-        const SIGALG_LOOKUP *lu =
-            tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s), *sigalgs);
+        const SIGALG_LOOKUP *lu = tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s), *sigalgs);
         const SSL_CERT_LOOKUP *clu;
 
         if (lu == NULL)
             continue;
 
         clu = ssl_cert_lookup_by_idx(lu->sig_idx,
-                                     SSL_CONNECTION_GET_CTX(s));
+            SSL_CONNECTION_GET_CTX(s));
         if (clu == NULL)
-                continue;
+            continue;
 
         /* If algorithm is disabled see if we can enable it */
         if ((clu->amask & disabled_mask) != 0
-                && tls12_sigalg_allowed(s, op, lu))
+            && tls12_sigalg_allowed(s, op, lu))
             disabled_mask &= ~clu->amask;
     }
     *pmask_a |= disabled_mask;
 }
 
 int tls12_copy_sigalgs(SSL_CONNECTION *s, WPACKET *pkt,
-                       const uint16_t *psig, size_t psiglen)
+    const uint16_t *psig, size_t psiglen)
 {
     size_t i;
     int rv = 0;
 
     for (i = 0; i < psiglen; i++, psig++) {
-        const SIGALG_LOOKUP *lu =
-            tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s), *psig);
-        int minversion, maxversion;
+        const SIGALG_LOOKUP *lu = tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s), *psig);
 
-        if (lu == NULL)
-            continue;
-        minversion = SSL_CONNECTION_IS_DTLS(s) ? lu->mindtls : lu->mintls;
-        maxversion = SSL_CONNECTION_IS_DTLS(s) ? lu->maxdtls : lu->maxtls;
-        if (minversion == -1 || maxversion == -1 || !lu->available
-            || (minversion != 0 && s->max_proto_version != 0
-                && ssl_version_cmp(s, minversion, s->max_proto_version) > 0)
-            || (maxversion != 0 && s->min_proto_version != 0
-                && ssl_version_cmp(s, maxversion, s->min_proto_version) < 0)
-            || !tls12_sigalg_allowed(s, SSL_SECOP_SIGALG_SUPPORTED, lu))
+        if (lu == NULL || !tls_sigalg_compat(s, lu))
             continue;
         if (!WPACKET_put_bytes_u16(pkt, *psig))
             return 0;
@@ -3430,10 +3445,7 @@ int tls12_copy_sigalgs(SSL_CONNECTION *s, WPACKET *pkt,
          * If TLS 1.3 must have at least one valid TLS 1.3 message
          * signing algorithm: i.e. neither RSA nor SHA1/SHA224
          */
-        if (rv == 0 && (!SSL_CONNECTION_IS_TLS13(s)
-            || (lu->sig != EVP_PKEY_RSA
-                && lu->hash != NID_sha1
-                && lu->hash != NID_sha224)))
+        if (rv == 0 && (!SSL_CONNECTION_IS_TLS13(s) || (lu->sig != EVP_PKEY_RSA && lu->hash != NID_sha1 && lu->hash != NID_sha224)))
             rv = 1;
     }
     if (rv == 0)
@@ -3443,19 +3455,18 @@ int tls12_copy_sigalgs(SSL_CONNECTION *s, WPACKET *pkt,
 
 /* Given preference and allowed sigalgs set shared sigalgs */
 static size_t tls12_shared_sigalgs(SSL_CONNECTION *s,
-                                   const SIGALG_LOOKUP **shsig,
-                                   const uint16_t *pref, size_t preflen,
-                                   const uint16_t *allow, size_t allowlen)
+    const SIGALG_LOOKUP **shsig,
+    const uint16_t *pref, size_t preflen,
+    const uint16_t *allow, size_t allowlen)
 {
     const uint16_t *ptmp, *atmp;
     size_t i, j, nmatch = 0;
     for (i = 0, ptmp = pref; i < preflen; i++, ptmp++) {
-        const SIGALG_LOOKUP *lu =
-            tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s), *ptmp);
+        const SIGALG_LOOKUP *lu = tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s), *ptmp);
 
         /* Skip disabled hashes or signature algorithms */
         if (lu == NULL
-                || !tls12_sigalg_allowed(s, SSL_SECOP_SIGALG_SHARED, lu))
+            || !tls12_sigalg_allowed(s, SSL_SECOP_SIGALG_SHARED, lu))
             continue;
         for (j = 0, atmp = allow; j < allowlen; j++, atmp++) {
             if (*ptmp == *atmp) {
@@ -3557,11 +3568,10 @@ int tls1_save_sigalgs(SSL_CONNECTION *s, PACKET *pkt, int cert)
 
     if (cert)
         return tls1_save_u16(pkt, &s->s3.tmp.peer_cert_sigalgs,
-                             &s->s3.tmp.peer_cert_sigalgslen);
+            &s->s3.tmp.peer_cert_sigalgslen);
     else
         return tls1_save_u16(pkt, &s->s3.tmp.peer_sigalgs,
-                             &s->s3.tmp.peer_sigalgslen);
-
+            &s->s3.tmp.peer_sigalgslen);
 }
 
 /* Set preferred digest for each key type */
@@ -3593,8 +3603,8 @@ int tls1_process_sigalgs(SSL_CONNECTION *s)
 }
 
 int SSL_get_sigalgs(SSL *s, int idx,
-                    int *psign, int *phash, int *psignhash,
-                    unsigned char *rsig, unsigned char *rhash)
+    int *psign, int *phash, int *psignhash,
+    unsigned char *rsig, unsigned char *rhash)
 {
     uint16_t *psig;
     size_t numsigalgs;
@@ -3630,8 +3640,8 @@ int SSL_get_sigalgs(SSL *s, int idx,
 }
 
 int SSL_get_shared_sigalgs(SSL *s, int idx,
-                           int *psign, int *phash, int *psignhash,
-                           unsigned char *rsig, unsigned char *rhash)
+    int *psign, int *phash, int *psignhash,
+    unsigned char *rsig, unsigned char *rhash)
 {
     const SIGALG_LOOKUP *shsigalgs;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
@@ -3673,7 +3683,7 @@ static void get_sigorhash(int *psig, int *phash, const char *str)
     if (OPENSSL_strcasecmp(str, "RSA") == 0) {
         *psig = EVP_PKEY_RSA;
     } else if (OPENSSL_strcasecmp(str, "RSA-PSS") == 0
-               || OPENSSL_strcasecmp(str, "PSS") == 0) {
+        || OPENSSL_strcasecmp(str, "PSS") == 0) {
         *psig = EVP_PKEY_RSA_PSS;
     } else if (OPENSSL_strcasecmp(str, "DSA") == 0) {
         *psig = EVP_PKEY_DSA;
@@ -3686,7 +3696,7 @@ static void get_sigorhash(int *psig, int *phash, const char *str)
     }
 }
 /* Maximum length of a signature algorithm string component */
-#define TLS_MAX_SIGSTRING_LEN   40
+#define TLS_MAX_SIGSTRING_LEN 40
 
 static int sig_cb(const char *elem, int len, void *arg)
 {
@@ -3731,15 +3741,14 @@ static int sig_cb(const char *elem, int len, void *arg)
                     /* Ignore known, but unavailable sigalgs. */
                     if (!sarg->ctx->sigalg_lookup_cache[i].available)
                         return 1;
-                    sarg->sigalgs[sarg->sigalgcnt++] =
-                        sarg->ctx->sigalg_lookup_cache[i].sigalg;
+                    sarg->sigalgs[sarg->sigalgcnt++] = sarg->ctx->sigalg_lookup_cache[i].sigalg;
                     goto found;
                 }
             }
         } else {
             /* Syntax checks use the built-in sigalgs */
             for (i = 0, s = sigalg_lookup_tbl;
-                 i < OSSL_NELEM(sigalg_lookup_tbl); i++, s++) {
+                i < OSSL_NELEM(sigalg_lookup_tbl); i++, s++) {
                 iana = s->name;
                 alias = s->name12;
                 if ((alias != NULL && OPENSSL_strcasecmp(etmp, alias) == 0)
@@ -3782,7 +3791,7 @@ static int sig_cb(const char *elem, int len, void *arg)
     /* Ignore unknown algorithms if ignore_unknown */
     return ignore_unknown;
 
- found:
+found:
     /* Ignore duplicates */
     for (i = 0; i < sarg->sigalgcnt - 1; i++) {
         if (sarg->sigalgs[i] == sarg->sigalgs[sarg->sigalgcnt - 1]) {
@@ -3808,7 +3817,7 @@ int tls1_set_sigalgs_list(SSL_CTX *ctx, CERT *c, const char *str, int client)
         return 0;
     if (sig.sigalgcnt == 0) {
         ERR_raise_data(ERR_LIB_SSL, ERR_R_PASSED_INVALID_ARGUMENT,
-                       "No valid signature algorithms in '%s'", str);
+            "No valid signature algorithms in '%s'", str);
         return 0;
     }
     if (c == NULL)
@@ -3817,7 +3826,7 @@ int tls1_set_sigalgs_list(SSL_CTX *ctx, CERT *c, const char *str, int client)
 }
 
 int tls1_set_raw_sigalgs(CERT *c, const uint16_t *psigs, size_t salglen,
-                     int client)
+    int client)
 {
     uint16_t *sigalgs;
 
@@ -3854,7 +3863,7 @@ int tls1_set_sigalgs(CERT *c, const int *psig_nids, size_t salglen, int client)
         int sig_id = *psig_nids++;
 
         for (j = 0, curr = sigalg_lookup_tbl; j < OSSL_NELEM(sigalg_lookup_tbl);
-             j++, curr++) {
+            j++, curr++) {
             if (curr->hash == md_id && curr->sig == sig_id) {
                 *sptr++ = curr->sigalg;
                 break;
@@ -3877,7 +3886,7 @@ int tls1_set_sigalgs(CERT *c, const int *psig_nids, size_t salglen, int client)
 
     return 1;
 
- err:
+err:
     OPENSSL_free(sigalgs);
     return 0;
 }
@@ -3889,7 +3898,17 @@ static int tls1_check_sig_alg(SSL_CONNECTION *s, X509 *x, int default_nid)
     const SIGALG_LOOKUP *sigalg;
     size_t sigalgslen;
 
-    if (default_nid == -1)
+    /*-
+     * RFC 8446, section 4.2.3:
+     *
+     * The signatures on certificates that are self-signed or certificates
+     * that are trust anchors are not validated, since they begin a
+     * certification path (see [RFC5280], Section 3.2).  A certificate that
+     * begins a certification path MAY use a signature algorithm that is not
+     * advertised as being supported in the "signature_algorithms"
+     * extension.
+     */
+    if (default_nid == -1 || X509_self_signed(x, 0))
         return 1;
     sig_nid = X509_get_signature_nid(x);
     if (default_nid)
@@ -3907,11 +3926,33 @@ static int tls1_check_sig_alg(SSL_CONNECTION *s, X509 *x, int default_nid)
         sigalgslen = s->shared_sigalgslen;
     }
     for (i = 0; i < sigalgslen; i++) {
+        int mdnid, pknid;
+
         sigalg = use_pc_sigalgs
-                 ? tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s),
-                                      s->s3.tmp.peer_cert_sigalgs[i])
-                 : s->shared_sigalgs[i];
-        if (sigalg != NULL && sig_nid == sigalg->sigandhash)
+            ? tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s),
+                  s->s3.tmp.peer_cert_sigalgs[i])
+            : s->shared_sigalgs[i];
+        if (sigalg == NULL)
+            continue;
+        if (sig_nid == sigalg->sigandhash)
+            return 1;
+        if (sigalg->sig != EVP_PKEY_RSA_PSS)
+            continue;
+        /*
+         * Accept RSA PKCS#1 signatures in certificates when the signature
+         * algorithms include RSA-PSS with a matching digest algorithm.
+         *
+         * When a TLS 1.3 peer inadvertently omits the legacy RSA PKCS#1 code
+         * points, and we're doing strict checking of the certificate chain (in
+         * a cert_cb via SSL_check_chain()) we may then reject RSA signed
+         * certificates in the chain, but the TLS requirement on PSS should not
+         * extend to certificates.  Though the peer can in fact list the legacy
+         * sigalgs for just this purpose, it is not likely that a better chain
+         * signed with RSA-PSS is available.
+         */
+        if (!OBJ_find_sigid_algs(sig_nid, &mdnid, &pknid))
+            continue;
+        if (pknid == EVP_PKEY_RSA && mdnid == sigalg->hash)
             return 1;
     }
     return 0;
@@ -3940,14 +3981,14 @@ static int ssl_check_ca_name(STACK_OF(X509_NAME) *names, X509 *x)
 /* Flags which need to be set for a certificate when strict mode not set */
 
 #define CERT_PKEY_VALID_FLAGS \
-        (CERT_PKEY_EE_SIGNATURE|CERT_PKEY_EE_PARAM)
+    (CERT_PKEY_EE_SIGNATURE | CERT_PKEY_EE_PARAM)
 /* Strict mode flags */
-#define CERT_PKEY_STRICT_FLAGS \
-         (CERT_PKEY_VALID_FLAGS|CERT_PKEY_CA_SIGNATURE|CERT_PKEY_CA_PARAM \
-         | CERT_PKEY_ISSUER_NAME|CERT_PKEY_CERT_TYPE)
+#define CERT_PKEY_STRICT_FLAGS                                           \
+    (CERT_PKEY_VALID_FLAGS | CERT_PKEY_CA_SIGNATURE | CERT_PKEY_CA_PARAM \
+        | CERT_PKEY_ISSUER_NAME | CERT_PKEY_CERT_TYPE)
 
 int tls1_check_chain(SSL_CONNECTION *s, X509 *x, EVP_PKEY *pk,
-                     STACK_OF(X509) *chain, int idx)
+    STACK_OF(X509) *chain, int idx)
 {
     int i;
     int rv = 0;
@@ -3992,7 +4033,8 @@ int tls1_check_chain(SSL_CONNECTION *s, X509 *x, EVP_PKEY *pk,
             return 0;
 
         if (ssl_cert_lookup_by_pkey(pk, &certidx,
-                                    SSL_CONNECTION_GET_CTX(s)) == NULL)
+                SSL_CONNECTION_GET_CTX(s))
+            == NULL)
             return 0;
         idx = certidx;
         pvalid = s->s3.tmp.valid_flags + idx;
@@ -4025,9 +4067,9 @@ int tls1_check_chain(SSL_CONNECTION *s, X509 *x, EVP_PKEY *pk,
         int rsign = 0;
 
         if (s->s3.tmp.peer_cert_sigalgs != NULL
-                || s->s3.tmp.peer_sigalgs != NULL) {
+            || s->s3.tmp.peer_sigalgs != NULL) {
             default_nid = 0;
-        /* If no sigalgs extension use defaults from RFC5246 */
+            /* If no sigalgs extension use defaults from RFC5246 */
         } else {
             switch (idx) {
             case SSL_PKEY_RSA:
@@ -4073,8 +4115,7 @@ int tls1_check_chain(SSL_CONNECTION *s, X509 *x, EVP_PKEY *pk,
             size_t j;
             const uint16_t *p = c->conf_sigalgs;
             for (j = 0; j < c->conf_sigalgslen; j++, p++) {
-                const SIGALG_LOOKUP *lu =
-                    tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s), *p);
+                const SIGALG_LOOKUP *lu = tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s), *p);
 
                 if (lu != NULL && lu->hash == NID_sha1 && lu->sig == rsign)
                     break;
@@ -4113,7 +4154,7 @@ int tls1_check_chain(SSL_CONNECTION *s, X509 *x, EVP_PKEY *pk,
     /* Else not TLS 1.2, so mark EE and CA signing algorithms OK */
     else if (check_flags)
         rv |= CERT_PKEY_EE_SIGNATURE | CERT_PKEY_CA_SIGNATURE;
- skip_sigs:
+skip_sigs:
     /* Check cert parameters are consistent */
     if (tls1_check_cert_param(s, x, 1))
         rv |= CERT_PKEY_EE_PARAM;
@@ -4186,7 +4227,7 @@ int tls1_check_chain(SSL_CONNECTION *s, X509 *x, EVP_PKEY *pk,
     if (!check_flags || (rv & check_flags) == check_flags)
         rv |= CERT_PKEY_VALID;
 
- end:
+end:
 
     if (TLS1_get_version(SSL_CONNECTION_GET_SSL(s)) >= TLS1_2_VERSION)
         rv |= *pvalid & (CERT_PKEY_EXPLICIT_SIGN | CERT_PKEY_SIGN);
@@ -4259,7 +4300,7 @@ EVP_PKEY *ssl_get_auto_dh(SSL_CONNECTION *s)
 
     /* Do not pick a prime that is too weak for the current security level */
     sec_level_bits = ssl_get_security_level_bits(SSL_CONNECTION_GET_SSL(s),
-                                                 NULL, NULL);
+        NULL, NULL);
     if (dh_secbits < sec_level_bits)
         dh_secbits = sec_level_bits;
 
@@ -4278,18 +4319,18 @@ EVP_PKEY *ssl_get_auto_dh(SSL_CONNECTION *s)
 
     pctx = EVP_PKEY_CTX_new_from_name(sctx->libctx, "DH", sctx->propq);
     if (pctx == NULL
-            || EVP_PKEY_fromdata_init(pctx) != 1)
+        || EVP_PKEY_fromdata_init(pctx) != 1)
         goto err;
 
     tmpl = OSSL_PARAM_BLD_new();
     if (tmpl == NULL
-            || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P, p)
-            || !OSSL_PARAM_BLD_push_uint(tmpl, OSSL_PKEY_PARAM_FFC_G, 2))
+        || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P, p)
+        || !OSSL_PARAM_BLD_push_uint(tmpl, OSSL_PKEY_PARAM_FFC_G, 2))
         goto err;
 
     params = OSSL_PARAM_BLD_to_param(tmpl);
     if (params == NULL
-            || EVP_PKEY_fromdata(pctx, &dhp, EVP_PKEY_KEY_PARAMETERS, params) != 1)
+        || EVP_PKEY_fromdata(pctx, &dhp, EVP_PKEY_KEY_PARAMETERS, params) != 1)
         goto err;
 
 err:
@@ -4301,7 +4342,7 @@ EVP_PKEY *ssl_get_auto_dh(SSL_CONNECTION *s)
 }
 
 static int ssl_security_cert_key(SSL_CONNECTION *s, SSL_CTX *ctx, X509 *x,
-                                 int op)
+    int op)
 {
     int secbits = -1;
     EVP_PKEY *pkey = X509_get0_pubkey(x);
@@ -4322,7 +4363,7 @@ static int ssl_security_cert_key(SSL_CONNECTION *s, SSL_CTX *ctx, X509 *x,
 }
 
 static int ssl_security_cert_sig(SSL_CONNECTION *s, SSL_CTX *ctx, X509 *x,
-                                 int op)
+    int op)
 {
     /* Lookup signature algorithm digest */
     int secbits, nid, pknid;
@@ -4342,7 +4383,7 @@ static int ssl_security_cert_sig(SSL_CONNECTION *s, SSL_CTX *ctx, X509 *x,
 }
 
 int ssl_security_cert(SSL_CONNECTION *s, SSL_CTX *ctx, X509 *x, int vfy,
-                      int is_ee)
+    int is_ee)
 {
     if (vfy)
         vfy = SSL_SECOP_PEER;
@@ -4365,7 +4406,7 @@ int ssl_security_cert(SSL_CONNECTION *s, SSL_CTX *ctx, X509 *x, int vfy,
  */
 
 int ssl_security_cert_chain(SSL_CONNECTION *s, STACK_OF(X509) *sk,
-                            X509 *x, int vfy)
+    X509 *x, int vfy)
 {
     int rv, start_idx, i;
 
@@ -4396,22 +4437,22 @@ int ssl_security_cert_chain(SSL_CONNECTION *s, STACK_OF(X509) *sk,
  */
 
 static int tls12_get_cert_sigalg_idx(const SSL_CONNECTION *s,
-                                     const SIGALG_LOOKUP *lu)
+    const SIGALG_LOOKUP *lu)
 {
     int sig_idx = lu->sig_idx;
     const SSL_CERT_LOOKUP *clu = ssl_cert_lookup_by_idx(sig_idx,
-                                                        SSL_CONNECTION_GET_CTX(s));
+        SSL_CONNECTION_GET_CTX(s));
 
     /* If not recognised or not supported by cipher mask it is not suitable */
     if (clu == NULL
-            || (clu->amask & s->s3.tmp.new_cipher->algorithm_auth) == 0
-            || (clu->nid == EVP_PKEY_RSA_PSS
-                && (s->s3.tmp.new_cipher->algorithm_mkey & SSL_kRSA) != 0))
+        || (clu->amask & s->s3.tmp.new_cipher->algorithm_auth) == 0
+        || (clu->pkey_nid == EVP_PKEY_RSA_PSS
+            && (s->s3.tmp.new_cipher->algorithm_mkey & SSL_kRSA) != 0))
         return -1;
 
     /* If doing RPK, the CERT_PKEY won't be "valid" */
     if (tls12_rpk_and_privkey(s, sig_idx))
-        return  s->s3.tmp.valid_flags[sig_idx] & CERT_PKEY_RPK ? sig_idx : -1;
+        return s->s3.tmp.valid_flags[sig_idx] & CERT_PKEY_RPK ? sig_idx : -1;
 
     return s->s3.tmp.valid_flags[sig_idx] & CERT_PKEY_VALID ? sig_idx : -1;
 }
@@ -4423,7 +4464,7 @@ static int tls12_get_cert_sigalg_idx(const SSL_CONNECTION *s,
  * Returns true if the cert is usable and false otherwise.
  */
 static int check_cert_usable(SSL_CONNECTION *s, const SIGALG_LOOKUP *sig,
-                             X509 *x, EVP_PKEY *pkey)
+    X509 *x, EVP_PKEY *pkey)
 {
     const SIGALG_LOOKUP *lu;
     int mdnid, pknid, supported;
@@ -4438,8 +4479,8 @@ static int check_cert_usable(SSL_CONNECTION *s, const SIGALG_LOOKUP *sig,
     if (sig->hash != NID_undef)
         mdname = OBJ_nid2sn(sig->hash);
     supported = EVP_PKEY_digestsign_supports_digest(pkey, sctx->libctx,
-                                                    mdname,
-                                                    sctx->propq);
+        mdname,
+        sctx->propq);
     if (supported <= 0)
         return 0;
 
@@ -4452,7 +4493,7 @@ static int check_cert_usable(SSL_CONNECTION *s, const SIGALG_LOOKUP *sig,
             return 0;
         for (i = 0; i < s->s3.tmp.peer_cert_sigalgslen; i++) {
             lu = tls1_lookup_sigalg(SSL_CONNECTION_GET_CTX(s),
-                                    s->s3.tmp.peer_cert_sigalgs[i]);
+                s->s3.tmp.peer_cert_sigalgs[i]);
             if (lu == NULL)
                 continue;
 
@@ -4491,7 +4532,7 @@ static int has_usable_cert(SSL_CONNECTION *s, const SIGALG_LOOKUP *sig, int idx)
         return 0;
 
     return check_cert_usable(s, sig, s->cert->pkeys[idx].x509,
-                             s->cert->pkeys[idx].privatekey);
+        s->cert->pkeys[idx].privatekey);
 }
 
 /*
@@ -4499,7 +4540,7 @@ static int has_usable_cert(SSL_CONNECTION *s, const SIGALG_LOOKUP *sig, int idx)
  * specified signature scheme |sig|, or false otherwise.
  */
 static int is_cert_usable(SSL_CONNECTION *s, const SIGALG_LOOKUP *sig, X509 *x,
-                          EVP_PKEY *pkey)
+    EVP_PKEY *pkey)
 {
     size_t idx;
 
@@ -4519,7 +4560,7 @@ static int is_cert_usable(SSL_CONNECTION *s, const SIGALG_LOOKUP *sig, X509 *x,
  * available certs/keys to find one that works.
  */
 static const SIGALG_LOOKUP *find_sig_alg(SSL_CONNECTION *s, X509 *x,
-                                         EVP_PKEY *pkey)
+    EVP_PKEY *pkey)
 {
     const SIGALG_LOOKUP *lu = NULL;
     size_t i;
@@ -4529,33 +4570,20 @@ static const SIGALG_LOOKUP *find_sig_alg(SSL_CONNECTION *s, X509 *x,
 
     /* Look for a shared sigalgs matching possible certificates */
     for (i = 0; i < s->shared_sigalgslen; i++) {
-        int dtls, minversion, maxversion;
-
         /* Skip SHA1, SHA224, DSA and RSA if not PSS */
         lu = s->shared_sigalgs[i];
         if (lu->hash == NID_sha1
             || lu->hash == NID_sha224
             || lu->sig == EVP_PKEY_DSA
-            || lu->sig == EVP_PKEY_RSA)
-            continue;
-
-        /*
-         * By this point the protocol version should already be chosen.  Check
-         * the sigalg version bounds.
-         */
-        dtls = SSL_CONNECTION_IS_DTLS(s);
-        minversion = dtls ? lu->mindtls : lu->mintls;
-        maxversion = dtls ? lu->maxdtls : lu->maxtls;
-        if (minversion != 0 && ssl_version_cmp(s, minversion, s->version) > 0)
-            continue;
-        if (maxversion != 0 && ssl_version_cmp(s, maxversion, s->version) < 0)
+            || lu->sig == EVP_PKEY_RSA
+            || !tls_sigalg_compat(s, lu))
             continue;
 
         /* Check that we have a cert, and signature_algorithms_cert */
         if (!tls1_lookup_md(sctx, lu, NULL))
             continue;
         if ((pkey == NULL && !has_usable_cert(s, lu, -1))
-                || (pkey != NULL && !is_cert_usable(s, lu, x, pkey)))
+            || (pkey != NULL && !is_cert_usable(s, lu, x, pkey)))
             continue;
 
         tmppkey = (pkey != NULL) ? pkey
@@ -4605,7 +4633,7 @@ int tls_choose_sigalg(SSL_CONNECTION *s, int fatalerrs)
             if (!fatalerrs)
                 return 1;
             SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                     SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
+                SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
             return 0;
         }
     } else {
@@ -4613,7 +4641,7 @@ int tls_choose_sigalg(SSL_CONNECTION *s, int fatalerrs)
         if (!(s->s3.tmp.new_cipher->algorithm_auth & SSL_aCERT))
             return 1;
         if (!s->server && !ssl_has_cert(s, s->cert->key - s->cert->pkeys))
-                return 1;
+            return 1;
 
         if (SSL_USE_SIGALGS(s)) {
             size_t i;
@@ -4624,27 +4652,17 @@ int tls_choose_sigalg(SSL_CONNECTION *s, int fatalerrs)
                 /* For Suite B need to match signature algorithm to curve */
                 if (tls1_suiteb(s))
                     curve = ssl_get_EC_curve_nid(s->cert->pkeys[SSL_PKEY_ECC]
-                                                 .privatekey);
+                            .privatekey);
 
                 /*
                  * Find highest preference signature algorithm matching
                  * cert type
                  */
                 for (i = 0; i < s->shared_sigalgslen; i++) {
-                    int dtls, minversion, maxversion;
-
                     /* Check the sigalg version bounds */
                     lu = s->shared_sigalgs[i];
-                    dtls = SSL_CONNECTION_IS_DTLS(s);
-                    minversion = dtls ? lu->mindtls : lu->mintls;
-                    maxversion = dtls ? lu->maxdtls : lu->maxtls;
-                    if (minversion != 0
-                        && ssl_version_cmp(s, minversion, s->version) > 0)
-                        continue;
-                    if (maxversion != 0
-                        && ssl_version_cmp(s, maxversion, s->version) < 0)
+                    if (!tls_sigalg_compat(s, lu))
                         continue;
-
                     if (s->server) {
                         if ((sig_idx = tls12_get_cert_sigalg_idx(s, lu)) == -1)
                             continue;
@@ -4676,24 +4694,25 @@ int tls_choose_sigalg(SSL_CONNECTION *s, int fatalerrs)
                  */
                 if (i == s->shared_sigalgslen
                     && (s->s3.tmp.new_cipher->algorithm_auth
-                        & (SSL_aGOST01 | SSL_aGOST12)) != 0) {
-                  if ((lu = tls1_get_legacy_sigalg(s, -1)) == NULL) {
-                    if (!fatalerrs)
-                      return 1;
-                    SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                             SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
-                    return 0;
-                  } else {
-                    i = 0;
-                    sig_idx = lu->sig_idx;
-                  }
+                           & (SSL_aGOST01 | SSL_aGOST12))
+                        != 0) {
+                    if ((lu = tls1_get_legacy_sigalg(s, -1)) == NULL) {
+                        if (!fatalerrs)
+                            return 1;
+                        SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
+                            SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
+                        return 0;
+                    } else {
+                        i = 0;
+                        sig_idx = lu->sig_idx;
+                    }
                 }
 #endif
                 if (i == s->shared_sigalgslen) {
                     if (!fatalerrs)
                         return 1;
                     SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                             SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
+                        SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
                     return 0;
                 }
             } else {
@@ -4707,7 +4726,7 @@ int tls_choose_sigalg(SSL_CONNECTION *s, int fatalerrs)
                     if (!fatalerrs)
                         return 1;
                     SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                             SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
+                        SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
                     return 0;
                 }
 
@@ -4715,14 +4734,14 @@ int tls_choose_sigalg(SSL_CONNECTION *s, int fatalerrs)
                 sent_sigslen = tls12_get_psigalgs(s, 1, &sent_sigs);
                 for (i = 0; i < sent_sigslen; i++, sent_sigs++) {
                     if (lu->sigalg == *sent_sigs
-                            && has_usable_cert(s, lu, lu->sig_idx))
+                        && has_usable_cert(s, lu, lu->sig_idx))
                         break;
                 }
                 if (i == sent_sigslen) {
                     if (!fatalerrs)
                         return 1;
                     SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE,
-                             SSL_R_WRONG_SIGNATURE_TYPE);
+                        SSL_R_WRONG_SIGNATURE_TYPE);
                     return 0;
                 }
             }
@@ -4731,7 +4750,7 @@ int tls_choose_sigalg(SSL_CONNECTION *s, int fatalerrs)
                 if (!fatalerrs)
                     return 1;
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                         SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
+                    SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM);
                 return 0;
             }
         }
@@ -4747,7 +4766,7 @@ int tls_choose_sigalg(SSL_CONNECTION *s, int fatalerrs)
 int SSL_CTX_set_tlsext_max_fragment_length(SSL_CTX *ctx, uint8_t mode)
 {
     if (mode != TLSEXT_max_fragment_length_DISABLED
-            && !IS_MAX_FRAGMENT_LENGTH_EXT_VALID(mode)) {
+        && !IS_MAX_FRAGMENT_LENGTH_EXT_VALID(mode)) {
         ERR_raise(ERR_LIB_SSL, SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH);
         return 0;
     }
@@ -4765,7 +4784,7 @@ int SSL_set_tlsext_max_fragment_length(SSL *ssl, uint8_t mode)
         return 0;
 
     if (mode != TLSEXT_max_fragment_length_DISABLED
-            && !IS_MAX_FRAGMENT_LENGTH_EXT_VALID(mode)) {
+        && !IS_MAX_FRAGMENT_LENGTH_EXT_VALID(mode)) {
         ERR_raise(ERR_LIB_SSL, SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH);
         return 0;
     }
@@ -4793,7 +4812,7 @@ SSL_HMAC *ssl_hmac_new(const SSL_CTX *ctx)
         return NULL;
 #ifndef OPENSSL_NO_DEPRECATED_3_0
     if (ctx->ext.ticket_key_evp_cb == NULL
-            && ctx->ext.ticket_key_cb != NULL) {
+        && ctx->ext.ticket_key_cb != NULL) {
         if (!ssl_hmac_old_new(ret))
             goto err;
         return ret;
@@ -4804,7 +4823,7 @@ SSL_HMAC *ssl_hmac_new(const SSL_CTX *ctx)
         goto err;
     EVP_MAC_free(mac);
     return ret;
- err:
+err:
     EVP_MAC_CTX_free(ret->ctx);
     EVP_MAC_free(mac);
     OPENSSL_free(ret);
@@ -4856,7 +4875,7 @@ int ssl_hmac_update(SSL_HMAC *ctx, const unsigned char *data, size_t len)
 }
 
 int ssl_hmac_final(SSL_HMAC *ctx, unsigned char *md, size_t *len,
-                   size_t max_size)
+    size_t max_size)
 {
     if (ctx->ctx != NULL)
         return EVP_MAC_final(ctx->ctx, md, len, max_size);
@@ -4889,8 +4908,8 @@ int ssl_get_EC_curve_nid(const EVP_PKEY *pkey)
 }
 
 __owur int tls13_set_encoded_pub_key(EVP_PKEY *pkey,
-                                     const unsigned char *enckey,
-                                     size_t enckeylen)
+    const unsigned char *enckey,
+    size_t enckeylen)
 {
     if (EVP_PKEY_is_a(pkey, "DH")) {
         int bits = EVP_PKEY_get_bits(pkey);
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 35c60feb4371e..e8075d04278c1 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -21,15 +21,15 @@ typedef struct {
     const char *name;
 } ssl_trace_tbl;
 
-# define ssl_trace_str(val, tbl) \
+#define ssl_trace_str(val, tbl) \
     do_ssl_trace_str(val, tbl, OSSL_NELEM(tbl))
 
-# define ssl_trace_list(bio, indent, msg, msglen, value, table) \
-    do_ssl_trace_list(bio, indent, msg, msglen, value, \
-                      table, OSSL_NELEM(table))
+#define ssl_trace_list(bio, indent, msg, msglen, value, table) \
+    do_ssl_trace_list(bio, indent, msg, msglen, value,         \
+        table, OSSL_NELEM(table))
 
 static const char *do_ssl_trace_str(int val, const ssl_trace_tbl *tbl,
-                                    size_t ntbl)
+    size_t ntbl)
 {
     size_t i;
 
@@ -41,8 +41,8 @@ static const char *do_ssl_trace_str(int val, const ssl_trace_tbl *tbl,
 }
 
 static int do_ssl_trace_list(BIO *bio, int indent,
-                             const unsigned char *msg, size_t msglen,
-                             size_t vlen, const ssl_trace_tbl *tbl, size_t ntbl)
+    const unsigned char *msg, size_t msglen,
+    size_t vlen, const ssl_trace_tbl *tbl, size_t ntbl)
 {
     int val;
 
@@ -63,586 +63,590 @@ static int do_ssl_trace_list(BIO *bio, int indent,
 /* Version number */
 
 static const ssl_trace_tbl ssl_version_tbl[] = {
-    {SSL3_VERSION, "SSL 3.0"},
-    {TLS1_VERSION, "TLS 1.0"},
-    {TLS1_1_VERSION, "TLS 1.1"},
-    {TLS1_2_VERSION, "TLS 1.2"},
-    {TLS1_3_VERSION, "TLS 1.3"},
-    {DTLS1_VERSION, "DTLS 1.0"},
-    {DTLS1_2_VERSION, "DTLS 1.2"},
-    {DTLS1_BAD_VER, "DTLS 1.0 (bad)"}
+    { SSL3_VERSION, "SSL 3.0" },
+    { TLS1_VERSION, "TLS 1.0" },
+    { TLS1_1_VERSION, "TLS 1.1" },
+    { TLS1_2_VERSION, "TLS 1.2" },
+    { TLS1_3_VERSION, "TLS 1.3" },
+    { DTLS1_VERSION, "DTLS 1.0" },
+    { DTLS1_2_VERSION, "DTLS 1.2" },
+    { DTLS1_BAD_VER, "DTLS 1.0 (bad)" }
 };
 
 static const ssl_trace_tbl ssl_content_tbl[] = {
-    {SSL3_RT_CHANGE_CIPHER_SPEC, "ChangeCipherSpec"},
-    {SSL3_RT_ALERT, "Alert"},
-    {SSL3_RT_HANDSHAKE, "Handshake"},
-    {SSL3_RT_APPLICATION_DATA, "ApplicationData"},
+    { SSL3_RT_CHANGE_CIPHER_SPEC, "ChangeCipherSpec" },
+    { SSL3_RT_ALERT, "Alert" },
+    { SSL3_RT_HANDSHAKE, "Handshake" },
+    { SSL3_RT_APPLICATION_DATA, "ApplicationData" },
 };
 
 /* Handshake types, sorted by ascending id  */
 static const ssl_trace_tbl ssl_handshake_tbl[] = {
-    {SSL3_MT_HELLO_REQUEST, "HelloRequest"},
-    {SSL3_MT_CLIENT_HELLO, "ClientHello"},
-    {SSL3_MT_SERVER_HELLO, "ServerHello"},
-    {DTLS1_MT_HELLO_VERIFY_REQUEST, "HelloVerifyRequest"},
-    {SSL3_MT_NEWSESSION_TICKET, "NewSessionTicket"},
-    {SSL3_MT_END_OF_EARLY_DATA, "EndOfEarlyData"},
-    {SSL3_MT_ENCRYPTED_EXTENSIONS, "EncryptedExtensions"},
-    {SSL3_MT_CERTIFICATE, "Certificate"},
-    {SSL3_MT_SERVER_KEY_EXCHANGE, "ServerKeyExchange"},
-    {SSL3_MT_CERTIFICATE_REQUEST, "CertificateRequest"},
-    {SSL3_MT_SERVER_DONE, "ServerHelloDone"},
-    {SSL3_MT_CERTIFICATE_VERIFY, "CertificateVerify"},
-    {SSL3_MT_CLIENT_KEY_EXCHANGE, "ClientKeyExchange"},
-    {SSL3_MT_FINISHED, "Finished"},
-    {SSL3_MT_CERTIFICATE_URL, "CertificateUrl"},
-    {SSL3_MT_CERTIFICATE_STATUS, "CertificateStatus"},
-    {SSL3_MT_SUPPLEMENTAL_DATA, "SupplementalData"},
-    {SSL3_MT_KEY_UPDATE, "KeyUpdate"},
-    {SSL3_MT_COMPRESSED_CERTIFICATE, "CompressedCertificate"},
-# ifndef OPENSSL_NO_NEXTPROTONEG
-    {SSL3_MT_NEXT_PROTO, "NextProto"},
-# endif
-    {SSL3_MT_MESSAGE_HASH, "MessageHash"}
+    { SSL3_MT_HELLO_REQUEST, "HelloRequest" },
+    { SSL3_MT_CLIENT_HELLO, "ClientHello" },
+    { SSL3_MT_SERVER_HELLO, "ServerHello" },
+    { DTLS1_MT_HELLO_VERIFY_REQUEST, "HelloVerifyRequest" },
+    { SSL3_MT_NEWSESSION_TICKET, "NewSessionTicket" },
+    { SSL3_MT_END_OF_EARLY_DATA, "EndOfEarlyData" },
+    { SSL3_MT_ENCRYPTED_EXTENSIONS, "EncryptedExtensions" },
+    { SSL3_MT_CERTIFICATE, "Certificate" },
+    { SSL3_MT_SERVER_KEY_EXCHANGE, "ServerKeyExchange" },
+    { SSL3_MT_CERTIFICATE_REQUEST, "CertificateRequest" },
+    { SSL3_MT_SERVER_DONE, "ServerHelloDone" },
+    { SSL3_MT_CERTIFICATE_VERIFY, "CertificateVerify" },
+    { SSL3_MT_CLIENT_KEY_EXCHANGE, "ClientKeyExchange" },
+    { SSL3_MT_FINISHED, "Finished" },
+    { SSL3_MT_CERTIFICATE_URL, "CertificateUrl" },
+    { SSL3_MT_CERTIFICATE_STATUS, "CertificateStatus" },
+    { SSL3_MT_SUPPLEMENTAL_DATA, "SupplementalData" },
+    { SSL3_MT_KEY_UPDATE, "KeyUpdate" },
+    { SSL3_MT_COMPRESSED_CERTIFICATE, "CompressedCertificate" },
+#ifndef OPENSSL_NO_NEXTPROTONEG
+    { SSL3_MT_NEXT_PROTO, "NextProto" },
+#endif
+    { SSL3_MT_MESSAGE_HASH, "MessageHash" }
 };
 
 /* Cipher suites */
 static const ssl_trace_tbl ssl_ciphers_tbl[] = {
-    {0x0000, "TLS_NULL_WITH_NULL_NULL"},
-    {0x0001, "TLS_RSA_WITH_NULL_MD5"},
-    {0x0002, "TLS_RSA_WITH_NULL_SHA"},
-    {0x0003, "TLS_RSA_EXPORT_WITH_RC4_40_MD5"},
-    {0x0004, "TLS_RSA_WITH_RC4_128_MD5"},
-    {0x0005, "TLS_RSA_WITH_RC4_128_SHA"},
-    {0x0006, "TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5"},
-    {0x0007, "TLS_RSA_WITH_IDEA_CBC_SHA"},
-    {0x0008, "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA"},
-    {0x0009, "TLS_RSA_WITH_DES_CBC_SHA"},
-    {0x000A, "TLS_RSA_WITH_3DES_EDE_CBC_SHA"},
-    {0x000B, "TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA"},
-    {0x000C, "TLS_DH_DSS_WITH_DES_CBC_SHA"},
-    {0x000D, "TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA"},
-    {0x000E, "TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA"},
-    {0x000F, "TLS_DH_RSA_WITH_DES_CBC_SHA"},
-    {0x0010, "TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA"},
-    {0x0011, "TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"},
-    {0x0012, "TLS_DHE_DSS_WITH_DES_CBC_SHA"},
-    {0x0013, "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA"},
-    {0x0014, "TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA"},
-    {0x0015, "TLS_DHE_RSA_WITH_DES_CBC_SHA"},
-    {0x0016, "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA"},
-    {0x0017, "TLS_DH_anon_EXPORT_WITH_RC4_40_MD5"},
-    {0x0018, "TLS_DH_anon_WITH_RC4_128_MD5"},
-    {0x0019, "TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA"},
-    {0x001A, "TLS_DH_anon_WITH_DES_CBC_SHA"},
-    {0x001B, "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA"},
-    {0x001D, "SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA"},
-    {0x001E, "SSL_FORTEZZA_KEA_WITH_RC4_128_SHA"},
-    {0x001F, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA"},
-    {0x0020, "TLS_KRB5_WITH_RC4_128_SHA"},
-    {0x0021, "TLS_KRB5_WITH_IDEA_CBC_SHA"},
-    {0x0022, "TLS_KRB5_WITH_DES_CBC_MD5"},
-    {0x0023, "TLS_KRB5_WITH_3DES_EDE_CBC_MD5"},
-    {0x0024, "TLS_KRB5_WITH_RC4_128_MD5"},
-    {0x0025, "TLS_KRB5_WITH_IDEA_CBC_MD5"},
-    {0x0026, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA"},
-    {0x0027, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_SHA"},
-    {0x0028, "TLS_KRB5_EXPORT_WITH_RC4_40_SHA"},
-    {0x0029, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5"},
-    {0x002A, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5"},
-    {0x002B, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5"},
-    {0x002C, "TLS_PSK_WITH_NULL_SHA"},
-    {0x002D, "TLS_DHE_PSK_WITH_NULL_SHA"},
-    {0x002E, "TLS_RSA_PSK_WITH_NULL_SHA"},
-    {0x002F, "TLS_RSA_WITH_AES_128_CBC_SHA"},
-    {0x0030, "TLS_DH_DSS_WITH_AES_128_CBC_SHA"},
-    {0x0031, "TLS_DH_RSA_WITH_AES_128_CBC_SHA"},
-    {0x0032, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA"},
-    {0x0033, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA"},
-    {0x0034, "TLS_DH_anon_WITH_AES_128_CBC_SHA"},
-    {0x0035, "TLS_RSA_WITH_AES_256_CBC_SHA"},
-    {0x0036, "TLS_DH_DSS_WITH_AES_256_CBC_SHA"},
-    {0x0037, "TLS_DH_RSA_WITH_AES_256_CBC_SHA"},
-    {0x0038, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA"},
-    {0x0039, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA"},
-    {0x003A, "TLS_DH_anon_WITH_AES_256_CBC_SHA"},
-    {0x003B, "TLS_RSA_WITH_NULL_SHA256"},
-    {0x003C, "TLS_RSA_WITH_AES_128_CBC_SHA256"},
-    {0x003D, "TLS_RSA_WITH_AES_256_CBC_SHA256"},
-    {0x003E, "TLS_DH_DSS_WITH_AES_128_CBC_SHA256"},
-    {0x003F, "TLS_DH_RSA_WITH_AES_128_CBC_SHA256"},
-    {0x0040, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256"},
-    {0x0041, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA"},
-    {0x0042, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA"},
-    {0x0043, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA"},
-    {0x0044, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA"},
-    {0x0045, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA"},
-    {0x0046, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA"},
-    {0x0067, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"},
-    {0x0068, "TLS_DH_DSS_WITH_AES_256_CBC_SHA256"},
-    {0x0069, "TLS_DH_RSA_WITH_AES_256_CBC_SHA256"},
-    {0x006A, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"},
-    {0x006B, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"},
-    {0x006C, "TLS_DH_anon_WITH_AES_128_CBC_SHA256"},
-    {0x006D, "TLS_DH_anon_WITH_AES_256_CBC_SHA256"},
-    {0x0081, "TLS_GOSTR341001_WITH_28147_CNT_IMIT"},
-    {0x0083, "TLS_GOSTR341001_WITH_NULL_GOSTR3411"},
-    {0x0084, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"},
-    {0x0085, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA"},
-    {0x0086, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA"},
-    {0x0087, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA"},
-    {0x0088, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA"},
-    {0x0089, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA"},
-    {0x008A, "TLS_PSK_WITH_RC4_128_SHA"},
-    {0x008B, "TLS_PSK_WITH_3DES_EDE_CBC_SHA"},
-    {0x008C, "TLS_PSK_WITH_AES_128_CBC_SHA"},
-    {0x008D, "TLS_PSK_WITH_AES_256_CBC_SHA"},
-    {0x008E, "TLS_DHE_PSK_WITH_RC4_128_SHA"},
-    {0x008F, "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA"},
-    {0x0090, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA"},
-    {0x0091, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA"},
-    {0x0092, "TLS_RSA_PSK_WITH_RC4_128_SHA"},
-    {0x0093, "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA"},
-    {0x0094, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA"},
-    {0x0095, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA"},
-    {0x0096, "TLS_RSA_WITH_SEED_CBC_SHA"},
-    {0x0097, "TLS_DH_DSS_WITH_SEED_CBC_SHA"},
-    {0x0098, "TLS_DH_RSA_WITH_SEED_CBC_SHA"},
-    {0x0099, "TLS_DHE_DSS_WITH_SEED_CBC_SHA"},
-    {0x009A, "TLS_DHE_RSA_WITH_SEED_CBC_SHA"},
-    {0x009B, "TLS_DH_anon_WITH_SEED_CBC_SHA"},
-    {0x009C, "TLS_RSA_WITH_AES_128_GCM_SHA256"},
-    {0x009D, "TLS_RSA_WITH_AES_256_GCM_SHA384"},
-    {0x009E, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"},
-    {0x009F, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"},
-    {0x00A0, "TLS_DH_RSA_WITH_AES_128_GCM_SHA256"},
-    {0x00A1, "TLS_DH_RSA_WITH_AES_256_GCM_SHA384"},
-    {0x00A2, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256"},
-    {0x00A3, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384"},
-    {0x00A4, "TLS_DH_DSS_WITH_AES_128_GCM_SHA256"},
-    {0x00A5, "TLS_DH_DSS_WITH_AES_256_GCM_SHA384"},
-    {0x00A6, "TLS_DH_anon_WITH_AES_128_GCM_SHA256"},
-    {0x00A7, "TLS_DH_anon_WITH_AES_256_GCM_SHA384"},
-    {0x00A8, "TLS_PSK_WITH_AES_128_GCM_SHA256"},
-    {0x00A9, "TLS_PSK_WITH_AES_256_GCM_SHA384"},
-    {0x00AA, "TLS_DHE_PSK_WITH_AES_128_GCM_SHA256"},
-    {0x00AB, "TLS_DHE_PSK_WITH_AES_256_GCM_SHA384"},
-    {0x00AC, "TLS_RSA_PSK_WITH_AES_128_GCM_SHA256"},
-    {0x00AD, "TLS_RSA_PSK_WITH_AES_256_GCM_SHA384"},
-    {0x00AE, "TLS_PSK_WITH_AES_128_CBC_SHA256"},
-    {0x00AF, "TLS_PSK_WITH_AES_256_CBC_SHA384"},
-    {0x00B0, "TLS_PSK_WITH_NULL_SHA256"},
-    {0x00B1, "TLS_PSK_WITH_NULL_SHA384"},
-    {0x00B2, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA256"},
-    {0x00B3, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA384"},
-    {0x00B4, "TLS_DHE_PSK_WITH_NULL_SHA256"},
-    {0x00B5, "TLS_DHE_PSK_WITH_NULL_SHA384"},
-    {0x00B6, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA256"},
-    {0x00B7, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA384"},
-    {0x00B8, "TLS_RSA_PSK_WITH_NULL_SHA256"},
-    {0x00B9, "TLS_RSA_PSK_WITH_NULL_SHA384"},
-    {0x00BA, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0x00BB, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0x00BC, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0x00BD, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0x00BE, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0x00BF, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0x00C0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256"},
-    {0x00C1, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256"},
-    {0x00C2, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256"},
-    {0x00C3, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256"},
-    {0x00C4, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256"},
-    {0x00C5, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256"},
-    {0x00FF, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"},
-    {0x5600, "TLS_FALLBACK_SCSV"},
-    {0xC001, "TLS_ECDH_ECDSA_WITH_NULL_SHA"},
-    {0xC002, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA"},
-    {0xC003, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"},
-    {0xC004, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA"},
-    {0xC005, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"},
-    {0xC006, "TLS_ECDHE_ECDSA_WITH_NULL_SHA"},
-    {0xC007, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"},
-    {0xC008, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"},
-    {0xC009, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"},
-    {0xC00A, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"},
-    {0xC00B, "TLS_ECDH_RSA_WITH_NULL_SHA"},
-    {0xC00C, "TLS_ECDH_RSA_WITH_RC4_128_SHA"},
-    {0xC00D, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA"},
-    {0xC00E, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA"},
-    {0xC00F, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA"},
-    {0xC010, "TLS_ECDHE_RSA_WITH_NULL_SHA"},
-    {0xC011, "TLS_ECDHE_RSA_WITH_RC4_128_SHA"},
-    {0xC012, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"},
-    {0xC013, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"},
-    {0xC014, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"},
-    {0xC015, "TLS_ECDH_anon_WITH_NULL_SHA"},
-    {0xC016, "TLS_ECDH_anon_WITH_RC4_128_SHA"},
-    {0xC017, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"},
-    {0xC018, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"},
-    {0xC019, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"},
-    {0xC01A, "TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA"},
-    {0xC01B, "TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA"},
-    {0xC01C, "TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA"},
-    {0xC01D, "TLS_SRP_SHA_WITH_AES_128_CBC_SHA"},
-    {0xC01E, "TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA"},
-    {0xC01F, "TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA"},
-    {0xC020, "TLS_SRP_SHA_WITH_AES_256_CBC_SHA"},
-    {0xC021, "TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA"},
-    {0xC022, "TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA"},
-    {0xC023, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"},
-    {0xC024, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"},
-    {0xC025, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256"},
-    {0xC026, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384"},
-    {0xC027, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"},
-    {0xC028, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"},
-    {0xC029, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256"},
-    {0xC02A, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384"},
-    {0xC02B, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"},
-    {0xC02C, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"},
-    {0xC02D, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256"},
-    {0xC02E, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384"},
-    {0xC02F, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"},
-    {0xC030, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"},
-    {0xC031, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"},
-    {0xC032, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384"},
-    {0xC033, "TLS_ECDHE_PSK_WITH_RC4_128_SHA"},
-    {0xC034, "TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA"},
-    {0xC035, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA"},
-    {0xC036, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA"},
-    {0xC037, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256"},
-    {0xC038, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384"},
-    {0xC039, "TLS_ECDHE_PSK_WITH_NULL_SHA"},
-    {0xC03A, "TLS_ECDHE_PSK_WITH_NULL_SHA256"},
-    {0xC03B, "TLS_ECDHE_PSK_WITH_NULL_SHA384"},
-    {0xC03C, "TLS_RSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC03D, "TLS_RSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC03E, "TLS_DH_DSS_WITH_ARIA_128_CBC_SHA256"},
-    {0xC03F, "TLS_DH_DSS_WITH_ARIA_256_CBC_SHA384"},
-    {0xC040, "TLS_DH_RSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC041, "TLS_DH_RSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC042, "TLS_DHE_DSS_WITH_ARIA_128_CBC_SHA256"},
-    {0xC043, "TLS_DHE_DSS_WITH_ARIA_256_CBC_SHA384"},
-    {0xC044, "TLS_DHE_RSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC045, "TLS_DHE_RSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC046, "TLS_DH_anon_WITH_ARIA_128_CBC_SHA256"},
-    {0xC047, "TLS_DH_anon_WITH_ARIA_256_CBC_SHA384"},
-    {0xC048, "TLS_ECDHE_ECDSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC049, "TLS_ECDHE_ECDSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC04A, "TLS_ECDH_ECDSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC04B, "TLS_ECDH_ECDSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC04C, "TLS_ECDHE_RSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC04D, "TLS_ECDHE_RSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC04E, "TLS_ECDH_RSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC04F, "TLS_ECDH_RSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC050, "TLS_RSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC051, "TLS_RSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC052, "TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC053, "TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC054, "TLS_DH_RSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC055, "TLS_DH_RSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC056, "TLS_DHE_DSS_WITH_ARIA_128_GCM_SHA256"},
-    {0xC057, "TLS_DHE_DSS_WITH_ARIA_256_GCM_SHA384"},
-    {0xC058, "TLS_DH_DSS_WITH_ARIA_128_GCM_SHA256"},
-    {0xC059, "TLS_DH_DSS_WITH_ARIA_256_GCM_SHA384"},
-    {0xC05A, "TLS_DH_anon_WITH_ARIA_128_GCM_SHA256"},
-    {0xC05B, "TLS_DH_anon_WITH_ARIA_256_GCM_SHA384"},
-    {0xC05C, "TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC05D, "TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC05E, "TLS_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC05F, "TLS_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC060, "TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC061, "TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC062, "TLS_ECDH_RSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC063, "TLS_ECDH_RSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC064, "TLS_PSK_WITH_ARIA_128_CBC_SHA256"},
-    {0xC065, "TLS_PSK_WITH_ARIA_256_CBC_SHA384"},
-    {0xC066, "TLS_DHE_PSK_WITH_ARIA_128_CBC_SHA256"},
-    {0xC067, "TLS_DHE_PSK_WITH_ARIA_256_CBC_SHA384"},
-    {0xC068, "TLS_RSA_PSK_WITH_ARIA_128_CBC_SHA256"},
-    {0xC069, "TLS_RSA_PSK_WITH_ARIA_256_CBC_SHA384"},
-    {0xC06A, "TLS_PSK_WITH_ARIA_128_GCM_SHA256"},
-    {0xC06B, "TLS_PSK_WITH_ARIA_256_GCM_SHA384"},
-    {0xC06C, "TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256"},
-    {0xC06D, "TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384"},
-    {0xC06E, "TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256"},
-    {0xC06F, "TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384"},
-    {0xC070, "TLS_ECDHE_PSK_WITH_ARIA_128_CBC_SHA256"},
-    {0xC071, "TLS_ECDHE_PSK_WITH_ARIA_256_CBC_SHA384"},
-    {0xC072, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC073, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC074, "TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC075, "TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC076, "TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC077, "TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC078, "TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC079, "TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC07A, "TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC07B, "TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC07C, "TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC07D, "TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC07E, "TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC07F, "TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC080, "TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC081, "TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC082, "TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC083, "TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC084, "TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC085, "TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC086, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC087, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC088, "TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC089, "TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC08A, "TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC08B, "TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC08C, "TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC08D, "TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC08E, "TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC08F, "TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC090, "TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC091, "TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC092, "TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC093, "TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC094, "TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC095, "TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC096, "TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC097, "TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC098, "TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC099, "TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC09A, "TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC09B, "TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC09C, "TLS_RSA_WITH_AES_128_CCM"},
-    {0xC09D, "TLS_RSA_WITH_AES_256_CCM"},
-    {0xC09E, "TLS_DHE_RSA_WITH_AES_128_CCM"},
-    {0xC09F, "TLS_DHE_RSA_WITH_AES_256_CCM"},
-    {0xC0A0, "TLS_RSA_WITH_AES_128_CCM_8"},
-    {0xC0A1, "TLS_RSA_WITH_AES_256_CCM_8"},
-    {0xC0A2, "TLS_DHE_RSA_WITH_AES_128_CCM_8"},
-    {0xC0A3, "TLS_DHE_RSA_WITH_AES_256_CCM_8"},
-    {0xC0A4, "TLS_PSK_WITH_AES_128_CCM"},
-    {0xC0A5, "TLS_PSK_WITH_AES_256_CCM"},
-    {0xC0A6, "TLS_DHE_PSK_WITH_AES_128_CCM"},
-    {0xC0A7, "TLS_DHE_PSK_WITH_AES_256_CCM"},
-    {0xC0A8, "TLS_PSK_WITH_AES_128_CCM_8"},
-    {0xC0A9, "TLS_PSK_WITH_AES_256_CCM_8"},
-    {0xC0AA, "TLS_PSK_DHE_WITH_AES_128_CCM_8"},
-    {0xC0AB, "TLS_PSK_DHE_WITH_AES_256_CCM_8"},
-    {0xC0AC, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM"},
-    {0xC0AD, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM"},
-    {0xC0AE, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8"},
-    {0xC0AF, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8"},
-    {0xC102, "IANA-GOST2012-GOST8912-GOST8912"},
-    {0xCCA8, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"},
-    {0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"},
-    {0xCCAA, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"},
-    {0xCCAB, "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256"},
-    {0xCCAC, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"},
-    {0xCCAD, "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256"},
-    {0xCCAE, "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256"},
-    {0x1301, "TLS_AES_128_GCM_SHA256"},
-    {0x1302, "TLS_AES_256_GCM_SHA384"},
-    {0x1303, "TLS_CHACHA20_POLY1305_SHA256"},
-    {0x1304, "TLS_AES_128_CCM_SHA256"},
-    {0x1305, "TLS_AES_128_CCM_8_SHA256"},
-    {0xFEFE, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"},
-    {0xFEFF, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA"},
-    {0xFF85, "LEGACY-GOST2012-GOST8912-GOST8912"},
-    {0xFF87, "GOST2012-NULL-GOST12"},
-    {0xC0B4, "TLS_SHA256_SHA256"},
-    {0xC0B5, "TLS_SHA384_SHA384"},
-    {0xC100, "GOST2012-KUZNYECHIK-KUZNYECHIKOMAC"},
-    {0xC101, "GOST2012-MAGMA-MAGMAOMAC"},
-    {0xC102, "GOST2012-GOST8912-IANA"},
+    { 0x0000, "TLS_NULL_WITH_NULL_NULL" },
+    { 0x0001, "TLS_RSA_WITH_NULL_MD5" },
+    { 0x0002, "TLS_RSA_WITH_NULL_SHA" },
+    { 0x0003, "TLS_RSA_EXPORT_WITH_RC4_40_MD5" },
+    { 0x0004, "TLS_RSA_WITH_RC4_128_MD5" },
+    { 0x0005, "TLS_RSA_WITH_RC4_128_SHA" },
+    { 0x0006, "TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5" },
+    { 0x0007, "TLS_RSA_WITH_IDEA_CBC_SHA" },
+    { 0x0008, "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA" },
+    { 0x0009, "TLS_RSA_WITH_DES_CBC_SHA" },
+    { 0x000A, "TLS_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0x000B, "TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA" },
+    { 0x000C, "TLS_DH_DSS_WITH_DES_CBC_SHA" },
+    { 0x000D, "TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA" },
+    { 0x000E, "TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA" },
+    { 0x000F, "TLS_DH_RSA_WITH_DES_CBC_SHA" },
+    { 0x0010, "TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0x0011, "TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA" },
+    { 0x0012, "TLS_DHE_DSS_WITH_DES_CBC_SHA" },
+    { 0x0013, "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA" },
+    { 0x0014, "TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA" },
+    { 0x0015, "TLS_DHE_RSA_WITH_DES_CBC_SHA" },
+    { 0x0016, "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0x0017, "TLS_DH_anon_EXPORT_WITH_RC4_40_MD5" },
+    { 0x0018, "TLS_DH_anon_WITH_RC4_128_MD5" },
+    { 0x0019, "TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA" },
+    { 0x001A, "TLS_DH_anon_WITH_DES_CBC_SHA" },
+    { 0x001B, "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA" },
+    { 0x001D, "SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA" },
+    { 0x001E, "SSL_FORTEZZA_KEA_WITH_RC4_128_SHA" },
+    { 0x001F, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA" },
+    { 0x0020, "TLS_KRB5_WITH_RC4_128_SHA" },
+    { 0x0021, "TLS_KRB5_WITH_IDEA_CBC_SHA" },
+    { 0x0022, "TLS_KRB5_WITH_DES_CBC_MD5" },
+    { 0x0023, "TLS_KRB5_WITH_3DES_EDE_CBC_MD5" },
+    { 0x0024, "TLS_KRB5_WITH_RC4_128_MD5" },
+    { 0x0025, "TLS_KRB5_WITH_IDEA_CBC_MD5" },
+    { 0x0026, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA" },
+    { 0x0027, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_SHA" },
+    { 0x0028, "TLS_KRB5_EXPORT_WITH_RC4_40_SHA" },
+    { 0x0029, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5" },
+    { 0x002A, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5" },
+    { 0x002B, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5" },
+    { 0x002C, "TLS_PSK_WITH_NULL_SHA" },
+    { 0x002D, "TLS_DHE_PSK_WITH_NULL_SHA" },
+    { 0x002E, "TLS_RSA_PSK_WITH_NULL_SHA" },
+    { 0x002F, "TLS_RSA_WITH_AES_128_CBC_SHA" },
+    { 0x0030, "TLS_DH_DSS_WITH_AES_128_CBC_SHA" },
+    { 0x0031, "TLS_DH_RSA_WITH_AES_128_CBC_SHA" },
+    { 0x0032, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA" },
+    { 0x0033, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA" },
+    { 0x0034, "TLS_DH_anon_WITH_AES_128_CBC_SHA" },
+    { 0x0035, "TLS_RSA_WITH_AES_256_CBC_SHA" },
+    { 0x0036, "TLS_DH_DSS_WITH_AES_256_CBC_SHA" },
+    { 0x0037, "TLS_DH_RSA_WITH_AES_256_CBC_SHA" },
+    { 0x0038, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA" },
+    { 0x0039, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA" },
+    { 0x003A, "TLS_DH_anon_WITH_AES_256_CBC_SHA" },
+    { 0x003B, "TLS_RSA_WITH_NULL_SHA256" },
+    { 0x003C, "TLS_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0x003D, "TLS_RSA_WITH_AES_256_CBC_SHA256" },
+    { 0x003E, "TLS_DH_DSS_WITH_AES_128_CBC_SHA256" },
+    { 0x003F, "TLS_DH_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0x0040, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256" },
+    { 0x0041, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA" },
+    { 0x0042, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA" },
+    { 0x0043, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA" },
+    { 0x0044, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA" },
+    { 0x0045, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA" },
+    { 0x0046, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA" },
+    { 0x0067, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0x0068, "TLS_DH_DSS_WITH_AES_256_CBC_SHA256" },
+    { 0x0069, "TLS_DH_RSA_WITH_AES_256_CBC_SHA256" },
+    { 0x006A, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256" },
+    { 0x006B, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256" },
+    { 0x006C, "TLS_DH_anon_WITH_AES_128_CBC_SHA256" },
+    { 0x006D, "TLS_DH_anon_WITH_AES_256_CBC_SHA256" },
+    { 0x0081, "TLS_GOSTR341001_WITH_28147_CNT_IMIT" },
+    { 0x0083, "TLS_GOSTR341001_WITH_NULL_GOSTR3411" },
+    { 0x0084, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA" },
+    { 0x0085, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA" },
+    { 0x0086, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA" },
+    { 0x0087, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA" },
+    { 0x0088, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA" },
+    { 0x0089, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA" },
+    { 0x008A, "TLS_PSK_WITH_RC4_128_SHA" },
+    { 0x008B, "TLS_PSK_WITH_3DES_EDE_CBC_SHA" },
+    { 0x008C, "TLS_PSK_WITH_AES_128_CBC_SHA" },
+    { 0x008D, "TLS_PSK_WITH_AES_256_CBC_SHA" },
+    { 0x008E, "TLS_DHE_PSK_WITH_RC4_128_SHA" },
+    { 0x008F, "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA" },
+    { 0x0090, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA" },
+    { 0x0091, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA" },
+    { 0x0092, "TLS_RSA_PSK_WITH_RC4_128_SHA" },
+    { 0x0093, "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA" },
+    { 0x0094, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA" },
+    { 0x0095, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA" },
+    { 0x0096, "TLS_RSA_WITH_SEED_CBC_SHA" },
+    { 0x0097, "TLS_DH_DSS_WITH_SEED_CBC_SHA" },
+    { 0x0098, "TLS_DH_RSA_WITH_SEED_CBC_SHA" },
+    { 0x0099, "TLS_DHE_DSS_WITH_SEED_CBC_SHA" },
+    { 0x009A, "TLS_DHE_RSA_WITH_SEED_CBC_SHA" },
+    { 0x009B, "TLS_DH_anon_WITH_SEED_CBC_SHA" },
+    { 0x009C, "TLS_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0x009D, "TLS_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0x009E, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0x009F, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0x00A0, "TLS_DH_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0x00A1, "TLS_DH_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0x00A2, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256" },
+    { 0x00A3, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384" },
+    { 0x00A4, "TLS_DH_DSS_WITH_AES_128_GCM_SHA256" },
+    { 0x00A5, "TLS_DH_DSS_WITH_AES_256_GCM_SHA384" },
+    { 0x00A6, "TLS_DH_anon_WITH_AES_128_GCM_SHA256" },
+    { 0x00A7, "TLS_DH_anon_WITH_AES_256_GCM_SHA384" },
+    { 0x00A8, "TLS_PSK_WITH_AES_128_GCM_SHA256" },
+    { 0x00A9, "TLS_PSK_WITH_AES_256_GCM_SHA384" },
+    { 0x00AA, "TLS_DHE_PSK_WITH_AES_128_GCM_SHA256" },
+    { 0x00AB, "TLS_DHE_PSK_WITH_AES_256_GCM_SHA384" },
+    { 0x00AC, "TLS_RSA_PSK_WITH_AES_128_GCM_SHA256" },
+    { 0x00AD, "TLS_RSA_PSK_WITH_AES_256_GCM_SHA384" },
+    { 0x00AE, "TLS_PSK_WITH_AES_128_CBC_SHA256" },
+    { 0x00AF, "TLS_PSK_WITH_AES_256_CBC_SHA384" },
+    { 0x00B0, "TLS_PSK_WITH_NULL_SHA256" },
+    { 0x00B1, "TLS_PSK_WITH_NULL_SHA384" },
+    { 0x00B2, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA256" },
+    { 0x00B3, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA384" },
+    { 0x00B4, "TLS_DHE_PSK_WITH_NULL_SHA256" },
+    { 0x00B5, "TLS_DHE_PSK_WITH_NULL_SHA384" },
+    { 0x00B6, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA256" },
+    { 0x00B7, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA384" },
+    { 0x00B8, "TLS_RSA_PSK_WITH_NULL_SHA256" },
+    { 0x00B9, "TLS_RSA_PSK_WITH_NULL_SHA384" },
+    { 0x00BA, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0x00BB, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0x00BC, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0x00BD, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0x00BE, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0x00BF, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0x00C0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
+    { 0x00C1, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256" },
+    { 0x00C2, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
+    { 0x00C3, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256" },
+    { 0x00C4, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
+    { 0x00C5, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256" },
+    { 0x00FF, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" },
+    { 0x5600, "TLS_FALLBACK_SCSV" },
+    { 0xC001, "TLS_ECDH_ECDSA_WITH_NULL_SHA" },
+    { 0xC002, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA" },
+    { 0xC003, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC004, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA" },
+    { 0xC005, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA" },
+    { 0xC006, "TLS_ECDHE_ECDSA_WITH_NULL_SHA" },
+    { 0xC007, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA" },
+    { 0xC008, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC009, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA" },
+    { 0xC00A, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA" },
+    { 0xC00B, "TLS_ECDH_RSA_WITH_NULL_SHA" },
+    { 0xC00C, "TLS_ECDH_RSA_WITH_RC4_128_SHA" },
+    { 0xC00D, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC00E, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA" },
+    { 0xC00F, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA" },
+    { 0xC010, "TLS_ECDHE_RSA_WITH_NULL_SHA" },
+    { 0xC011, "TLS_ECDHE_RSA_WITH_RC4_128_SHA" },
+    { 0xC012, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC013, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA" },
+    { 0xC014, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA" },
+    { 0xC015, "TLS_ECDH_anon_WITH_NULL_SHA" },
+    { 0xC016, "TLS_ECDH_anon_WITH_RC4_128_SHA" },
+    { 0xC017, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC018, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA" },
+    { 0xC019, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA" },
+    { 0xC01A, "TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC01B, "TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC01C, "TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC01D, "TLS_SRP_SHA_WITH_AES_128_CBC_SHA" },
+    { 0xC01E, "TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA" },
+    { 0xC01F, "TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA" },
+    { 0xC020, "TLS_SRP_SHA_WITH_AES_256_CBC_SHA" },
+    { 0xC021, "TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA" },
+    { 0xC022, "TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA" },
+    { 0xC023, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256" },
+    { 0xC024, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384" },
+    { 0xC025, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256" },
+    { 0xC026, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384" },
+    { 0xC027, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0xC028, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384" },
+    { 0xC029, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0xC02A, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384" },
+    { 0xC02B, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" },
+    { 0xC02C, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" },
+    { 0xC02D, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256" },
+    { 0xC02E, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384" },
+    { 0xC02F, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0xC030, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0xC031, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0xC032, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0xC033, "TLS_ECDHE_PSK_WITH_RC4_128_SHA" },
+    { 0xC034, "TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC035, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA" },
+    { 0xC036, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA" },
+    { 0xC037, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256" },
+    { 0xC038, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384" },
+    { 0xC039, "TLS_ECDHE_PSK_WITH_NULL_SHA" },
+    { 0xC03A, "TLS_ECDHE_PSK_WITH_NULL_SHA256" },
+    { 0xC03B, "TLS_ECDHE_PSK_WITH_NULL_SHA384" },
+    { 0xC03C, "TLS_RSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC03D, "TLS_RSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC03E, "TLS_DH_DSS_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC03F, "TLS_DH_DSS_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC040, "TLS_DH_RSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC041, "TLS_DH_RSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC042, "TLS_DHE_DSS_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC043, "TLS_DHE_DSS_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC044, "TLS_DHE_RSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC045, "TLS_DHE_RSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC046, "TLS_DH_anon_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC047, "TLS_DH_anon_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC048, "TLS_ECDHE_ECDSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC049, "TLS_ECDHE_ECDSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC04A, "TLS_ECDH_ECDSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC04B, "TLS_ECDH_ECDSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC04C, "TLS_ECDHE_RSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC04D, "TLS_ECDHE_RSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC04E, "TLS_ECDH_RSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC04F, "TLS_ECDH_RSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC050, "TLS_RSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC051, "TLS_RSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC052, "TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC053, "TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC054, "TLS_DH_RSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC055, "TLS_DH_RSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC056, "TLS_DHE_DSS_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC057, "TLS_DHE_DSS_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC058, "TLS_DH_DSS_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC059, "TLS_DH_DSS_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC05A, "TLS_DH_anon_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC05B, "TLS_DH_anon_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC05C, "TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC05D, "TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC05E, "TLS_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC05F, "TLS_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC060, "TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC061, "TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC062, "TLS_ECDH_RSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC063, "TLS_ECDH_RSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC064, "TLS_PSK_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC065, "TLS_PSK_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC066, "TLS_DHE_PSK_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC067, "TLS_DHE_PSK_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC068, "TLS_RSA_PSK_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC069, "TLS_RSA_PSK_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC06A, "TLS_PSK_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC06B, "TLS_PSK_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC06C, "TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC06D, "TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC06E, "TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC06F, "TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC070, "TLS_ECDHE_PSK_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC071, "TLS_ECDHE_PSK_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC072, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC073, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC074, "TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC075, "TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC076, "TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC077, "TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC078, "TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC079, "TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC07A, "TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC07B, "TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC07C, "TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC07D, "TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC07E, "TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC07F, "TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC080, "TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC081, "TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC082, "TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC083, "TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC084, "TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC085, "TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC086, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC087, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC088, "TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC089, "TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC08A, "TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC08B, "TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC08C, "TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC08D, "TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC08E, "TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC08F, "TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC090, "TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC091, "TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC092, "TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC093, "TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC094, "TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC095, "TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC096, "TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC097, "TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC098, "TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC099, "TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC09A, "TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC09B, "TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC09C, "TLS_RSA_WITH_AES_128_CCM" },
+    { 0xC09D, "TLS_RSA_WITH_AES_256_CCM" },
+    { 0xC09E, "TLS_DHE_RSA_WITH_AES_128_CCM" },
+    { 0xC09F, "TLS_DHE_RSA_WITH_AES_256_CCM" },
+    { 0xC0A0, "TLS_RSA_WITH_AES_128_CCM_8" },
+    { 0xC0A1, "TLS_RSA_WITH_AES_256_CCM_8" },
+    { 0xC0A2, "TLS_DHE_RSA_WITH_AES_128_CCM_8" },
+    { 0xC0A3, "TLS_DHE_RSA_WITH_AES_256_CCM_8" },
+    { 0xC0A4, "TLS_PSK_WITH_AES_128_CCM" },
+    { 0xC0A5, "TLS_PSK_WITH_AES_256_CCM" },
+    { 0xC0A6, "TLS_DHE_PSK_WITH_AES_128_CCM" },
+    { 0xC0A7, "TLS_DHE_PSK_WITH_AES_256_CCM" },
+    { 0xC0A8, "TLS_PSK_WITH_AES_128_CCM_8" },
+    { 0xC0A9, "TLS_PSK_WITH_AES_256_CCM_8" },
+    { 0xC0AA, "TLS_PSK_DHE_WITH_AES_128_CCM_8" },
+    { 0xC0AB, "TLS_PSK_DHE_WITH_AES_256_CCM_8" },
+    { 0xC0AC, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM" },
+    { 0xC0AD, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM" },
+    { 0xC0AE, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8" },
+    { 0xC0AF, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8" },
+    { 0xC102, "IANA-GOST2012-GOST8912-GOST8912" },
+    { 0xCCA8, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0xCCAA, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0xCCAB, "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0xCCAC, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0xCCAD, "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0xCCAE, "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0x1301, "TLS_AES_128_GCM_SHA256" },
+    { 0x1302, "TLS_AES_256_GCM_SHA384" },
+    { 0x1303, "TLS_CHACHA20_POLY1305_SHA256" },
+    { 0x1304, "TLS_AES_128_CCM_SHA256" },
+    { 0x1305, "TLS_AES_128_CCM_8_SHA256" },
+    { 0xFEFE, "SSL_RSA_FIPS_WITH_DES_CBC_SHA" },
+    { 0xFEFF, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA" },
+    { 0xFF85, "LEGACY-GOST2012-GOST8912-GOST8912" },
+    { 0xFF87, "GOST2012-NULL-GOST12" },
+    { 0xC0B4, "TLS_SHA256_SHA256" },
+    { 0xC0B5, "TLS_SHA384_SHA384" },
+    { 0xC100, "GOST2012-KUZNYECHIK-KUZNYECHIKOMAC" },
+    { 0xC101, "GOST2012-MAGMA-MAGMAOMAC" },
+    { 0xC102, "GOST2012-GOST8912-IANA" },
 };
 
 /* Compression methods */
 static const ssl_trace_tbl ssl_comp_tbl[] = {
-    {0x0000, "No Compression"},
-    {0x0001, "Zlib Compression"}
+    { 0x0000, "No Compression" },
+    { 0x0001, "Zlib Compression" }
 };
 
 /* Extensions sorted by ascending id */
 static const ssl_trace_tbl ssl_exts_tbl[] = {
-    {TLSEXT_TYPE_server_name, "server_name"},
-    {TLSEXT_TYPE_max_fragment_length, "max_fragment_length"},
-    {TLSEXT_TYPE_client_certificate_url, "client_certificate_url"},
-    {TLSEXT_TYPE_trusted_ca_keys, "trusted_ca_keys"},
-    {TLSEXT_TYPE_truncated_hmac, "truncated_hmac"},
-    {TLSEXT_TYPE_status_request, "status_request"},
-    {TLSEXT_TYPE_user_mapping, "user_mapping"},
-    {TLSEXT_TYPE_client_authz, "client_authz"},
-    {TLSEXT_TYPE_server_authz, "server_authz"},
-    {TLSEXT_TYPE_cert_type, "cert_type"},
-    {TLSEXT_TYPE_supported_groups, "supported_groups"},
-    {TLSEXT_TYPE_ec_point_formats, "ec_point_formats"},
-    {TLSEXT_TYPE_srp, "srp"},
-    {TLSEXT_TYPE_signature_algorithms, "signature_algorithms"},
-    {TLSEXT_TYPE_use_srtp, "use_srtp"},
-    {TLSEXT_TYPE_application_layer_protocol_negotiation,
-     "application_layer_protocol_negotiation"},
-    {TLSEXT_TYPE_signed_certificate_timestamp, "signed_certificate_timestamps"},
-    {TLSEXT_TYPE_client_cert_type, "client_cert_type"},
-    {TLSEXT_TYPE_server_cert_type, "server_cert_type"},
-    {TLSEXT_TYPE_padding, "padding"},
-    {TLSEXT_TYPE_encrypt_then_mac, "encrypt_then_mac"},
-    {TLSEXT_TYPE_extended_master_secret, "extended_master_secret"},
-    {TLSEXT_TYPE_compress_certificate, "compress_certificate"},
-    {TLSEXT_TYPE_session_ticket, "session_ticket"},
-    {TLSEXT_TYPE_psk, "psk"},
-    {TLSEXT_TYPE_early_data, "early_data"},
-    {TLSEXT_TYPE_supported_versions, "supported_versions"},
-    {TLSEXT_TYPE_cookie, "cookie_ext"},
-    {TLSEXT_TYPE_psk_kex_modes, "psk_key_exchange_modes"},
-    {TLSEXT_TYPE_certificate_authorities, "certificate_authorities"},
-    {TLSEXT_TYPE_post_handshake_auth, "post_handshake_auth"},
-    {TLSEXT_TYPE_signature_algorithms_cert, "signature_algorithms_cert"},
-    {TLSEXT_TYPE_key_share, "key_share"},
-    {TLSEXT_TYPE_renegotiate, "renegotiate"},
-# ifndef OPENSSL_NO_NEXTPROTONEG
-    {TLSEXT_TYPE_next_proto_neg, "next_proto_neg"},
-# endif
+    { TLSEXT_TYPE_server_name, "server_name" },
+    { TLSEXT_TYPE_max_fragment_length, "max_fragment_length" },
+    { TLSEXT_TYPE_client_certificate_url, "client_certificate_url" },
+    { TLSEXT_TYPE_trusted_ca_keys, "trusted_ca_keys" },
+    { TLSEXT_TYPE_truncated_hmac, "truncated_hmac" },
+    { TLSEXT_TYPE_status_request, "status_request" },
+    { TLSEXT_TYPE_user_mapping, "user_mapping" },
+    { TLSEXT_TYPE_client_authz, "client_authz" },
+    { TLSEXT_TYPE_server_authz, "server_authz" },
+    { TLSEXT_TYPE_cert_type, "cert_type" },
+    { TLSEXT_TYPE_supported_groups, "supported_groups" },
+    { TLSEXT_TYPE_ec_point_formats, "ec_point_formats" },
+    { TLSEXT_TYPE_srp, "srp" },
+    { TLSEXT_TYPE_signature_algorithms, "signature_algorithms" },
+    { TLSEXT_TYPE_use_srtp, "use_srtp" },
+    { TLSEXT_TYPE_application_layer_protocol_negotiation,
+        "application_layer_protocol_negotiation" },
+    { TLSEXT_TYPE_signed_certificate_timestamp, "signed_certificate_timestamps" },
+    { TLSEXT_TYPE_client_cert_type, "client_cert_type" },
+    { TLSEXT_TYPE_server_cert_type, "server_cert_type" },
+    { TLSEXT_TYPE_padding, "padding" },
+    { TLSEXT_TYPE_encrypt_then_mac, "encrypt_then_mac" },
+    { TLSEXT_TYPE_extended_master_secret, "extended_master_secret" },
+    { TLSEXT_TYPE_compress_certificate, "compress_certificate" },
+    { TLSEXT_TYPE_session_ticket, "session_ticket" },
+    { TLSEXT_TYPE_psk, "psk" },
+    { TLSEXT_TYPE_early_data, "early_data" },
+    { TLSEXT_TYPE_supported_versions, "supported_versions" },
+    { TLSEXT_TYPE_cookie, "cookie_ext" },
+    { TLSEXT_TYPE_psk_kex_modes, "psk_key_exchange_modes" },
+    { TLSEXT_TYPE_certificate_authorities, "certificate_authorities" },
+    { TLSEXT_TYPE_post_handshake_auth, "post_handshake_auth" },
+    { TLSEXT_TYPE_signature_algorithms_cert, "signature_algorithms_cert" },
+    { TLSEXT_TYPE_key_share, "key_share" },
+    { TLSEXT_TYPE_renegotiate, "renegotiate" },
+#ifndef OPENSSL_NO_NEXTPROTONEG
+    { TLSEXT_TYPE_next_proto_neg, "next_proto_neg" },
+#endif
 };
 
 static const ssl_trace_tbl ssl_groups_tbl[] = {
-    {1, "sect163k1 (K-163)"},
-    {2, "sect163r1"},
-    {3, "sect163r2 (B-163)"},
-    {4, "sect193r1"},
-    {5, "sect193r2"},
-    {6, "sect233k1 (K-233)"},
-    {7, "sect233r1 (B-233)"},
-    {8, "sect239k1"},
-    {9, "sect283k1 (K-283)"},
-    {10, "sect283r1 (B-283)"},
-    {11, "sect409k1 (K-409)"},
-    {12, "sect409r1 (B-409)"},
-    {13, "sect571k1 (K-571)"},
-    {14, "sect571r1 (B-571)"},
-    {15, "secp160k1"},
-    {16, "secp160r1"},
-    {17, "secp160r2"},
-    {18, "secp192k1"},
-    {19, "secp192r1 (P-192)"},
-    {20, "secp224k1"},
-    {21, "secp224r1 (P-224)"},
-    {22, "secp256k1"},
-    {23, "secp256r1 (P-256)"},
-    {24, "secp384r1 (P-384)"},
-    {25, "secp521r1 (P-521)"},
-    {26, "brainpoolP256r1"},
-    {27, "brainpoolP384r1"},
-    {28, "brainpoolP512r1"},
-    {29, "ecdh_x25519"},
-    {30, "ecdh_x448"},
-    {31, "brainpoolP256r1tls13"},
-    {32, "brainpoolP384r1tls13"},
-    {33, "brainpoolP512r1tls13"},
-    {34, "GC256A"},
-    {35, "GC256B"},
-    {36, "GC256C"},
-    {37, "GC256D"},
-    {38, "GC512A"},
-    {39, "GC512B"},
-    {40, "GC512C"},
-    {256, "ffdhe2048"},
-    {257, "ffdhe3072"},
-    {258, "ffdhe4096"},
-    {259, "ffdhe6144"},
-    {260, "ffdhe8192"},
-    {4587, "SecP256r1MLKEM768"},
-    {4588, "X25519MLKEM768"},
-    {25497, "X25519Kyber768Draft00"},
-    {25498, "SecP256r1Kyber768Draft00"},
-    {0xFF01, "arbitrary_explicit_prime_curves"},
-    {0xFF02, "arbitrary_explicit_char2_curves"}
+    { 1, "sect163k1 (K-163)" },
+    { 2, "sect163r1" },
+    { 3, "sect163r2 (B-163)" },
+    { 4, "sect193r1" },
+    { 5, "sect193r2" },
+    { 6, "sect233k1 (K-233)" },
+    { 7, "sect233r1 (B-233)" },
+    { 8, "sect239k1" },
+    { 9, "sect283k1 (K-283)" },
+    { 10, "sect283r1 (B-283)" },
+    { 11, "sect409k1 (K-409)" },
+    { 12, "sect409r1 (B-409)" },
+    { 13, "sect571k1 (K-571)" },
+    { 14, "sect571r1 (B-571)" },
+    { 15, "secp160k1" },
+    { 16, "secp160r1" },
+    { 17, "secp160r2" },
+    { 18, "secp192k1" },
+    { 19, "secp192r1 (P-192)" },
+    { 20, "secp224k1" },
+    { 21, "secp224r1 (P-224)" },
+    { 22, "secp256k1" },
+    { 23, "secp256r1 (P-256)" },
+    { 24, "secp384r1 (P-384)" },
+    { 25, "secp521r1 (P-521)" },
+    { 26, "brainpoolP256r1" },
+    { 27, "brainpoolP384r1" },
+    { 28, "brainpoolP512r1" },
+    { 29, "ecdh_x25519" },
+    { 30, "ecdh_x448" },
+    { 31, "brainpoolP256r1tls13" },
+    { 32, "brainpoolP384r1tls13" },
+    { 33, "brainpoolP512r1tls13" },
+    { 34, "GC256A" },
+    { 35, "GC256B" },
+    { 36, "GC256C" },
+    { 37, "GC256D" },
+    { 38, "GC512A" },
+    { 39, "GC512B" },
+    { 40, "GC512C" },
+    { 256, "ffdhe2048" },
+    { 257, "ffdhe3072" },
+    { 258, "ffdhe4096" },
+    { 259, "ffdhe6144" },
+    { 260, "ffdhe8192" },
+    { 512, "MLKEM512" },
+    { 513, "MLKEM768" },
+    { 514, "MLKEM1024" },
+    { 4587, "SecP256r1MLKEM768" },
+    { 4588, "X25519MLKEM768" },
+    { 4589, "SecP384r1MLKEM1024" },
+    { 25497, "X25519Kyber768Draft00" },
+    { 25498, "SecP256r1Kyber768Draft00" },
+    { 0xFF01, "arbitrary_explicit_prime_curves" },
+    { 0xFF02, "arbitrary_explicit_char2_curves" }
 };
 
 static const ssl_trace_tbl ssl_point_tbl[] = {
-    {0, "uncompressed"},
-    {1, "ansiX962_compressed_prime"},
-    {2, "ansiX962_compressed_char2"}
+    { 0, "uncompressed" },
+    { 1, "ansiX962_compressed_prime" },
+    { 2, "ansiX962_compressed_char2" }
 };
 
 static const ssl_trace_tbl ssl_mfl_tbl[] = {
-    {0, "disabled"},
-    {1, "max_fragment_length := 2^9 (512 bytes)"},
-    {2, "max_fragment_length := 2^10 (1024 bytes)"},
-    {3, "max_fragment_length := 2^11 (2048 bytes)"},
-    {4, "max_fragment_length := 2^12 (4096 bytes)"}
+    { 0, "disabled" },
+    { 1, "max_fragment_length := 2^9 (512 bytes)" },
+    { 2, "max_fragment_length := 2^10 (1024 bytes)" },
+    { 3, "max_fragment_length := 2^11 (2048 bytes)" },
+    { 4, "max_fragment_length := 2^12 (4096 bytes)" }
 };
 
 static const ssl_trace_tbl ssl_sigalg_tbl[] = {
-    {TLSEXT_SIGALG_ecdsa_secp256r1_sha256, TLSEXT_SIGALG_ecdsa_secp256r1_sha256_name},
-    {TLSEXT_SIGALG_ecdsa_secp384r1_sha384, TLSEXT_SIGALG_ecdsa_secp384r1_sha384_name},
-    {TLSEXT_SIGALG_ecdsa_secp521r1_sha512,TLSEXT_SIGALG_ecdsa_secp521r1_sha512_name},
-    {TLSEXT_SIGALG_ecdsa_sha224, TLSEXT_SIGALG_ecdsa_sha224_name},
-    {TLSEXT_SIGALG_ed25519, TLSEXT_SIGALG_ed25519_name},
-    {TLSEXT_SIGALG_ed448, TLSEXT_SIGALG_ed448_name},
-    {TLSEXT_SIGALG_ecdsa_sha1, TLSEXT_SIGALG_ecdsa_sha1_name},
-    {TLSEXT_SIGALG_rsa_pss_rsae_sha256, TLSEXT_SIGALG_rsa_pss_rsae_sha256_name},
-    {TLSEXT_SIGALG_rsa_pss_rsae_sha384, TLSEXT_SIGALG_rsa_pss_rsae_sha384_name},
-    {TLSEXT_SIGALG_rsa_pss_rsae_sha512, TLSEXT_SIGALG_rsa_pss_rsae_sha512_name},
-    {TLSEXT_SIGALG_rsa_pss_pss_sha256, TLSEXT_SIGALG_rsa_pss_pss_sha256_name},
-    {TLSEXT_SIGALG_rsa_pss_pss_sha384, TLSEXT_SIGALG_rsa_pss_pss_sha384_name},
-    {TLSEXT_SIGALG_rsa_pss_pss_sha512, TLSEXT_SIGALG_rsa_pss_pss_sha512_name},
-    {TLSEXT_SIGALG_rsa_pkcs1_sha256, TLSEXT_SIGALG_rsa_pkcs1_sha256_name},
-    {TLSEXT_SIGALG_rsa_pkcs1_sha384, TLSEXT_SIGALG_rsa_pkcs1_sha384_name},
-    {TLSEXT_SIGALG_rsa_pkcs1_sha512, TLSEXT_SIGALG_rsa_pkcs1_sha512_name},
-    {TLSEXT_SIGALG_rsa_pkcs1_sha224, TLSEXT_SIGALG_rsa_pkcs1_sha224_name},
-    {TLSEXT_SIGALG_rsa_pkcs1_sha1, TLSEXT_SIGALG_rsa_pkcs1_sha1_name},
-    {TLSEXT_SIGALG_dsa_sha256, TLSEXT_SIGALG_dsa_sha256_name},
-    {TLSEXT_SIGALG_dsa_sha384, TLSEXT_SIGALG_dsa_sha384_name},
-    {TLSEXT_SIGALG_dsa_sha512, TLSEXT_SIGALG_dsa_sha512_name},
-    {TLSEXT_SIGALG_dsa_sha224, TLSEXT_SIGALG_dsa_sha224_name},
-    {TLSEXT_SIGALG_dsa_sha1, TLSEXT_SIGALG_dsa_sha1_name},
-    {TLSEXT_SIGALG_gostr34102012_256_intrinsic, TLSEXT_SIGALG_gostr34102012_256_intrinsic_name},
-    {TLSEXT_SIGALG_gostr34102012_512_intrinsic, TLSEXT_SIGALG_gostr34102012_512_intrinsic_name},
-    {TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256, TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256_name},
-    {TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512, TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512_name},
-    {TLSEXT_SIGALG_gostr34102001_gostr3411, TLSEXT_SIGALG_gostr34102001_gostr3411_name},
-    {TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256, TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256_name},
-    {TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384, TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384_name},
-    {TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512, TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512_name},
+    { TLSEXT_SIGALG_ecdsa_secp256r1_sha256, TLSEXT_SIGALG_ecdsa_secp256r1_sha256_name },
+    { TLSEXT_SIGALG_ecdsa_secp384r1_sha384, TLSEXT_SIGALG_ecdsa_secp384r1_sha384_name },
+    { TLSEXT_SIGALG_ecdsa_secp521r1_sha512, TLSEXT_SIGALG_ecdsa_secp521r1_sha512_name },
+    { TLSEXT_SIGALG_ecdsa_sha224, TLSEXT_SIGALG_ecdsa_sha224_name },
+    { TLSEXT_SIGALG_ed25519, TLSEXT_SIGALG_ed25519_name },
+    { TLSEXT_SIGALG_ed448, TLSEXT_SIGALG_ed448_name },
+    { TLSEXT_SIGALG_ecdsa_sha1, TLSEXT_SIGALG_ecdsa_sha1_name },
+    { TLSEXT_SIGALG_rsa_pss_rsae_sha256, TLSEXT_SIGALG_rsa_pss_rsae_sha256_name },
+    { TLSEXT_SIGALG_rsa_pss_rsae_sha384, TLSEXT_SIGALG_rsa_pss_rsae_sha384_name },
+    { TLSEXT_SIGALG_rsa_pss_rsae_sha512, TLSEXT_SIGALG_rsa_pss_rsae_sha512_name },
+    { TLSEXT_SIGALG_rsa_pss_pss_sha256, TLSEXT_SIGALG_rsa_pss_pss_sha256_name },
+    { TLSEXT_SIGALG_rsa_pss_pss_sha384, TLSEXT_SIGALG_rsa_pss_pss_sha384_name },
+    { TLSEXT_SIGALG_rsa_pss_pss_sha512, TLSEXT_SIGALG_rsa_pss_pss_sha512_name },
+    { TLSEXT_SIGALG_rsa_pkcs1_sha256, TLSEXT_SIGALG_rsa_pkcs1_sha256_name },
+    { TLSEXT_SIGALG_rsa_pkcs1_sha384, TLSEXT_SIGALG_rsa_pkcs1_sha384_name },
+    { TLSEXT_SIGALG_rsa_pkcs1_sha512, TLSEXT_SIGALG_rsa_pkcs1_sha512_name },
+    { TLSEXT_SIGALG_rsa_pkcs1_sha224, TLSEXT_SIGALG_rsa_pkcs1_sha224_name },
+    { TLSEXT_SIGALG_rsa_pkcs1_sha1, TLSEXT_SIGALG_rsa_pkcs1_sha1_name },
+    { TLSEXT_SIGALG_dsa_sha256, TLSEXT_SIGALG_dsa_sha256_name },
+    { TLSEXT_SIGALG_dsa_sha384, TLSEXT_SIGALG_dsa_sha384_name },
+    { TLSEXT_SIGALG_dsa_sha512, TLSEXT_SIGALG_dsa_sha512_name },
+    { TLSEXT_SIGALG_dsa_sha224, TLSEXT_SIGALG_dsa_sha224_name },
+    { TLSEXT_SIGALG_dsa_sha1, TLSEXT_SIGALG_dsa_sha1_name },
+    { TLSEXT_SIGALG_gostr34102012_256_intrinsic, TLSEXT_SIGALG_gostr34102012_256_intrinsic_name },
+    { TLSEXT_SIGALG_gostr34102012_512_intrinsic, TLSEXT_SIGALG_gostr34102012_512_intrinsic_name },
+    { TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256, TLSEXT_SIGALG_gostr34102012_256_gostr34112012_256_name },
+    { TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512, TLSEXT_SIGALG_gostr34102012_512_gostr34112012_512_name },
+    { TLSEXT_SIGALG_gostr34102001_gostr3411, TLSEXT_SIGALG_gostr34102001_gostr3411_name },
+    { TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256, TLSEXT_SIGALG_ecdsa_brainpoolP256r1_sha256_name },
+    { TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384, TLSEXT_SIGALG_ecdsa_brainpoolP384r1_sha384_name },
+    { TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512, TLSEXT_SIGALG_ecdsa_brainpoolP512r1_sha512_name },
     /*
      * Well known groups that we happen to know about, but only come from
      * provider capability declarations (hence no macros for the
      * codepoints/names)
      */
-    {0x0904, "mldsa44"},
-    {0x0905, "mldsa65"},
-    {0x0906, "mldsa87"}
+    { 0x0904, "mldsa44" },
+    { 0x0905, "mldsa65" },
+    { 0x0906, "mldsa87" }
 };
 
 static const ssl_trace_tbl ssl_ctype_tbl[] = {
-    {1, "rsa_sign"},
-    {2, "dss_sign"},
-    {3, "rsa_fixed_dh"},
-    {4, "dss_fixed_dh"},
-    {5, "rsa_ephemeral_dh"},
-    {6, "dss_ephemeral_dh"},
-    {20, "fortezza_dms"},
-    {64, "ecdsa_sign"},
-    {65, "rsa_fixed_ecdh"},
-    {66, "ecdsa_fixed_ecdh"},
-    {67, "gost_sign256"},
-    {68, "gost_sign512"},
+    { 1, "rsa_sign" },
+    { 2, "dss_sign" },
+    { 3, "rsa_fixed_dh" },
+    { 4, "dss_fixed_dh" },
+    { 5, "rsa_ephemeral_dh" },
+    { 6, "dss_ephemeral_dh" },
+    { 20, "fortezza_dms" },
+    { 64, "ecdsa_sign" },
+    { 65, "rsa_fixed_ecdh" },
+    { 66, "ecdsa_fixed_ecdh" },
+    { 67, "gost_sign256" },
+    { 68, "gost_sign512" },
 };
 
 static const ssl_trace_tbl ssl_psk_kex_modes_tbl[] = {
-    {TLSEXT_KEX_MODE_KE, "psk_ke"},
-    {TLSEXT_KEX_MODE_KE_DHE, "psk_dhe_ke"}
+    { TLSEXT_KEX_MODE_KE, "psk_ke" },
+    { TLSEXT_KEX_MODE_KE_DHE, "psk_dhe_ke" }
 };
 
 static const ssl_trace_tbl ssl_key_update_tbl[] = {
-    {SSL_KEY_UPDATE_NOT_REQUESTED, "update_not_requested"},
-    {SSL_KEY_UPDATE_REQUESTED, "update_requested"}
+    { SSL_KEY_UPDATE_NOT_REQUESTED, "update_not_requested" },
+    { SSL_KEY_UPDATE_REQUESTED, "update_requested" }
 };
 
 static const ssl_trace_tbl ssl_comp_cert_tbl[] = {
-    {TLSEXT_comp_cert_none, "none"},
-    {TLSEXT_comp_cert_zlib, "zlib"},
-    {TLSEXT_comp_cert_brotli, "brotli"},
-    {TLSEXT_comp_cert_zstd, "zstd"}
+    { TLSEXT_comp_cert_none, "none" },
+    { TLSEXT_comp_cert_zlib, "zlib" },
+    { TLSEXT_comp_cert_brotli, "brotli" },
+    { TLSEXT_comp_cert_zstd, "zstd" }
 };
 
 /*
@@ -651,14 +655,14 @@ static const ssl_trace_tbl ssl_comp_cert_tbl[] = {
  * at least report them in traces
  */
 static const ssl_trace_tbl ssl_cert_type_tbl[] = {
-    {TLSEXT_cert_type_x509, "x509"},
-    {TLSEXT_cert_type_pgp, "pgp"},
-    {TLSEXT_cert_type_rpk, "rpk"},
-    {TLSEXT_cert_type_1609dot2, "1609dot2"}
+    { TLSEXT_cert_type_x509, "x509" },
+    { TLSEXT_cert_type_pgp, "pgp" },
+    { TLSEXT_cert_type_rpk, "rpk" },
+    { TLSEXT_cert_type_1609dot2, "1609dot2" }
 };
 
 static void ssl_print_hex(BIO *bio, int indent, const char *name,
-                          const unsigned char *msg, size_t msglen)
+    const unsigned char *msg, size_t msglen)
 {
     size_t i;
 
@@ -670,7 +674,7 @@ static void ssl_print_hex(BIO *bio, int indent, const char *name,
 }
 
 static int ssl_print_hexbuf(BIO *bio, int indent, const char *name, size_t nlen,
-                            const unsigned char **pmsg, size_t *pmsglen)
+    const unsigned char **pmsg, size_t *pmsglen)
 {
     size_t blen;
     const unsigned char *p = *pmsg;
@@ -690,8 +694,8 @@ static int ssl_print_hexbuf(BIO *bio, int indent, const char *name, size_t nlen,
 }
 
 static int ssl_print_version(BIO *bio, int indent, const char *name,
-                             const unsigned char **pmsg, size_t *pmsglen,
-                             unsigned int *version)
+    const unsigned char **pmsg, size_t *pmsglen,
+    unsigned int *version)
 {
     int vers;
 
@@ -702,14 +706,14 @@ static int ssl_print_version(BIO *bio, int indent, const char *name,
         *version = vers;
     BIO_indent(bio, indent, 80);
     BIO_printf(bio, "%s=0x%x (%s)\n",
-               name, vers, ssl_trace_str(vers, ssl_version_tbl));
+        name, vers, ssl_trace_str(vers, ssl_version_tbl));
     *pmsg += 2;
     *pmsglen -= 2;
     return 1;
 }
 
 static int ssl_print_random(BIO *bio, int indent,
-                            const unsigned char **pmsg, size_t *pmsglen)
+    const unsigned char **pmsg, size_t *pmsglen)
 {
     unsigned int tm;
     const unsigned char *p = *pmsg;
@@ -717,9 +721,9 @@ static int ssl_print_random(BIO *bio, int indent,
     if (*pmsglen < 32)
         return 0;
     tm = ((unsigned int)p[0] << 24)
-         | ((unsigned int)p[1] << 16)
-         | ((unsigned int)p[2] << 8)
-         | (unsigned int)p[3];
+        | ((unsigned int)p[1] << 16)
+        | ((unsigned int)p[2] << 8)
+        | (unsigned int)p[3];
     p += 4;
     BIO_indent(bio, indent, 80);
     BIO_puts(bio, "Random:\n");
@@ -732,7 +736,7 @@ static int ssl_print_random(BIO *bio, int indent,
 }
 
 static int ssl_print_signature(BIO *bio, int indent, const SSL_CONNECTION *sc,
-                               const unsigned char **pmsg, size_t *pmsglen)
+    const unsigned char **pmsg, size_t *pmsglen)
 {
     if (*pmsglen < 2)
         return 0;
@@ -742,7 +746,7 @@ static int ssl_print_signature(BIO *bio, int indent, const SSL_CONNECTION *sc,
 
         BIO_indent(bio, indent, 80);
         BIO_printf(bio, "Signature Algorithm: %s (0x%04x)\n",
-                   ssl_trace_str(sigalg, ssl_sigalg_tbl), sigalg);
+            ssl_trace_str(sigalg, ssl_sigalg_tbl), sigalg);
         *pmsg += 2;
         *pmsglen -= 2;
     }
@@ -750,8 +754,8 @@ static int ssl_print_signature(BIO *bio, int indent, const SSL_CONNECTION *sc,
 }
 
 static int ssl_print_extension(BIO *bio, int indent, int server,
-                               unsigned char mt, int extype,
-                               const unsigned char *ext, size_t extlen)
+    unsigned char mt, int extype,
+    const unsigned char *ext, size_t extlen)
 {
     size_t xlen, share_len;
     unsigned int sigalg;
@@ -759,7 +763,7 @@ static int ssl_print_extension(BIO *bio, int indent, int server,
 
     BIO_indent(bio, indent, 80);
     BIO_printf(bio, "extension_type=%s(%d), length=%d\n",
-               ssl_trace_str(extype, ssl_exts_tbl), extype, (int)extlen);
+        ssl_trace_str(extype, ssl_exts_tbl), extype, (int)extlen);
     switch (extype) {
     case TLSEXT_TYPE_compress_certificate:
         if (extlen < 1)
@@ -824,7 +828,7 @@ static int ssl_print_extension(BIO *bio, int indent, int server,
             BIO_indent(bio, indent + 2, 80);
             sigalg = (ext[0] << 8) | ext[1];
             BIO_printf(bio, "%s (0x%04x)\n",
-                       ssl_trace_str(sigalg, ssl_sigalg_tbl), sigalg);
+                ssl_trace_str(sigalg, ssl_sigalg_tbl), sigalg);
             xlen -= 2;
             ext += 2;
         }
@@ -867,7 +871,7 @@ static int ssl_print_extension(BIO *bio, int indent, int server,
             group_id = (ext[0] << 8) | ext[1];
             BIO_indent(bio, indent + 4, 80);
             BIO_printf(bio, "NamedGroup: %s (%d)\n",
-                       ssl_trace_str(group_id, ssl_groups_tbl), group_id);
+                ssl_trace_str(group_id, ssl_groups_tbl), group_id);
             break;
         }
         if (extlen < 2)
@@ -893,7 +897,7 @@ static int ssl_print_extension(BIO *bio, int indent, int server,
                 return 0;
             BIO_indent(bio, indent + 4, 80);
             BIO_printf(bio, "NamedGroup: %s (%d)\n",
-                       ssl_trace_str(group_id, ssl_groups_tbl), group_id);
+                ssl_trace_str(group_id, ssl_groups_tbl), group_id);
             ssl_print_hex(bio, indent + 4, "key_exchange: ", ext, share_len);
         }
         break;
@@ -907,7 +911,7 @@ static int ssl_print_extension(BIO *bio, int indent, int server,
             version = (ext[0] << 8) | ext[1];
             BIO_indent(bio, indent + 4, 80);
             BIO_printf(bio, "%s (%d)\n",
-                       ssl_trace_str(version, ssl_version_tbl), version);
+                ssl_trace_str(version, ssl_version_tbl), version);
             break;
         }
         if (extlen < 1)
@@ -916,7 +920,7 @@ static int ssl_print_extension(BIO *bio, int indent, int server,
         if (extlen != xlen + 1)
             return 0;
         return ssl_trace_list(bio, indent + 2, ext + 1, xlen, 2,
-                              ssl_version_tbl);
+            ssl_version_tbl);
 
     case TLSEXT_TYPE_psk_kex_modes:
         if (extlen < 1)
@@ -925,7 +929,7 @@ static int ssl_print_extension(BIO *bio, int indent, int server,
         if (extlen != xlen + 1)
             return 0;
         return ssl_trace_list(bio, indent + 2, ext + 1, xlen, 1,
-                              ssl_psk_kex_modes_tbl);
+            ssl_psk_kex_modes_tbl);
 
     case TLSEXT_TYPE_early_data:
         if (mt != SSL3_MT_NEWSESSION_TICKET)
@@ -933,9 +937,9 @@ static int ssl_print_extension(BIO *bio, int indent, int server,
         if (extlen != 4)
             return 0;
         max_early_data = ((unsigned int)ext[0] << 24)
-                         | ((unsigned int)ext[1] << 16)
-                         | ((unsigned int)ext[2] << 8)
-                         | (unsigned int)ext[3];
+            | ((unsigned int)ext[1] << 16)
+            | ((unsigned int)ext[2] << 8)
+            | (unsigned int)ext[3];
         BIO_indent(bio, indent + 2, 80);
         BIO_printf(bio, "max_early_data=%u\n", (unsigned int)max_early_data);
         break;
@@ -961,8 +965,8 @@ static int ssl_print_extension(BIO *bio, int indent, int server,
 }
 
 static int ssl_print_extensions(BIO *bio, int indent, int server,
-                                unsigned char mt, const unsigned char **msgin,
-                                size_t *msginlen)
+    unsigned char mt, const unsigned char **msgin,
+    size_t *msginlen)
 {
     size_t extslen, msglen = *msginlen;
     const unsigned char *msg = *msgin;
@@ -996,13 +1000,13 @@ static int ssl_print_extensions(BIO *bio, int indent, int server,
         extlen = (msg[2] << 8) | msg[3];
         if (extslen < extlen + 4) {
             BIO_printf(bio, "extensions, extype = %d, extlen = %d\n", extype,
-                       (int)extlen);
+                (int)extlen);
             BIO_dump_indent(bio, (const char *)msg, extslen, indent + 2);
             return 0;
         }
         msg += 4;
         if (!ssl_print_extension(bio, indent + 2, server, mt, extype, msg,
-                                 extlen))
+                extlen))
             return 0;
         msg += extlen;
         extslen -= extlen + 4;
@@ -1014,7 +1018,7 @@ static int ssl_print_extensions(BIO *bio, int indent, int server,
 }
 
 static int ssl_print_client_hello(BIO *bio, const SSL_CONNECTION *sc, int indent,
-                                  const unsigned char *msg, size_t msglen)
+    const unsigned char *msg, size_t msglen)
 {
     size_t len;
     unsigned int cs;
@@ -1042,7 +1046,7 @@ static int ssl_print_client_hello(BIO *bio, const SSL_CONNECTION *sc, int indent
         cs = (msg[0] << 8) | msg[1];
         BIO_indent(bio, indent + 2, 80);
         BIO_printf(bio, "{0x%02X, 0x%02X} %s\n",
-                   msg[0], msg[1], ssl_trace_str(cs, ssl_ciphers_tbl));
+            msg[0], msg[1], ssl_trace_str(cs, ssl_ciphers_tbl));
         msg += 2;
         msglen -= 2;
         len -= 2;
@@ -1059,19 +1063,19 @@ static int ssl_print_client_hello(BIO *bio, const SSL_CONNECTION *sc, int indent
     while (len > 0) {
         BIO_indent(bio, indent + 2, 80);
         BIO_printf(bio, "%s (0x%02X)\n",
-                   ssl_trace_str(msg[0], ssl_comp_tbl), msg[0]);
+            ssl_trace_str(msg[0], ssl_comp_tbl), msg[0]);
         msg++;
         msglen--;
         len--;
     }
     if (!ssl_print_extensions(bio, indent, 0, SSL3_MT_CLIENT_HELLO, &msg,
-                              &msglen))
+            &msglen))
         return 0;
     return 1;
 }
 
 static int dtls_print_hello_vfyrequest(BIO *bio, int indent,
-                                       const unsigned char *msg, size_t msglen)
+    const unsigned char *msg, size_t msglen)
 {
     if (!ssl_print_version(bio, indent, "server_version", &msg, &msglen, NULL))
         return 0;
@@ -1081,7 +1085,7 @@ static int dtls_print_hello_vfyrequest(BIO *bio, int indent,
 }
 
 static int ssl_print_server_hello(BIO *bio, int indent,
-                                  const unsigned char *msg, size_t msglen)
+    const unsigned char *msg, size_t msglen)
 {
     unsigned int cs;
     unsigned int vers;
@@ -1091,14 +1095,14 @@ static int ssl_print_server_hello(BIO *bio, int indent,
     if (!ssl_print_random(bio, indent, &msg, &msglen))
         return 0;
     if (vers != TLS1_3_VERSION
-            && !ssl_print_hexbuf(bio, indent, "session_id", 1, &msg, &msglen))
+        && !ssl_print_hexbuf(bio, indent, "session_id", 1, &msg, &msglen))
         return 0;
     if (msglen < 2)
         return 0;
     cs = (msg[0] << 8) | msg[1];
     BIO_indent(bio, indent, 80);
     BIO_printf(bio, "cipher_suite {0x%02X, 0x%02X} %s\n",
-               msg[0], msg[1], ssl_trace_str(cs, ssl_ciphers_tbl));
+        msg[0], msg[1], ssl_trace_str(cs, ssl_ciphers_tbl));
     msg += 2;
     msglen -= 2;
     if (vers != TLS1_3_VERSION) {
@@ -1106,12 +1110,12 @@ static int ssl_print_server_hello(BIO *bio, int indent,
             return 0;
         BIO_indent(bio, indent, 80);
         BIO_printf(bio, "compression_method: %s (0x%02X)\n",
-                   ssl_trace_str(msg[0], ssl_comp_tbl), msg[0]);
+            ssl_trace_str(msg[0], ssl_comp_tbl), msg[0]);
         msg++;
         msglen--;
     }
     if (!ssl_print_extensions(bio, indent, 1, SSL3_MT_SERVER_HELLO, &msg,
-                              &msglen))
+            &msglen))
         return 0;
     return 1;
 }
@@ -1165,7 +1169,7 @@ static int ssl_get_keyex(const char **pname, const SSL_CONNECTION *sc)
 }
 
 static int ssl_print_client_keyex(BIO *bio, int indent, const SSL_CONNECTION *sc,
-                                  const unsigned char *msg, size_t msglen)
+    const unsigned char *msg, size_t msglen)
 {
     const char *algname;
     int id = ssl_get_keyex(&algname, sc);
@@ -1174,7 +1178,7 @@ static int ssl_print_client_keyex(BIO *bio, int indent, const SSL_CONNECTION *sc
     BIO_printf(bio, "KeyExchangeAlgorithm=%s\n", algname);
     if (id & SSL_PSK) {
         if (!ssl_print_hexbuf(bio, indent + 2,
-                              "psk_identity", 2, &msg, &msglen))
+                "psk_identity", 2, &msg, &msglen))
             return 0;
     }
     switch (id) {
@@ -1183,10 +1187,10 @@ static int ssl_print_client_keyex(BIO *bio, int indent, const SSL_CONNECTION *sc
     case SSL_kRSAPSK:
         if (TLS1_get_version(SSL_CONNECTION_GET_SSL(sc)) == SSL3_VERSION) {
             ssl_print_hex(bio, indent + 2,
-                          "EncryptedPreMasterSecret", msg, msglen);
+                "EncryptedPreMasterSecret", msg, msglen);
         } else {
             if (!ssl_print_hexbuf(bio, indent + 2,
-                                  "EncryptedPreMasterSecret", 2, &msg, &msglen))
+                    "EncryptedPreMasterSecret", 2, &msg, &msglen))
                 return 0;
         }
         break;
@@ -1208,7 +1212,7 @@ static int ssl_print_client_keyex(BIO *bio, int indent, const SSL_CONNECTION *sc
         break;
     case SSL_kGOST18:
         ssl_print_hex(bio, indent + 2,
-                      "GOST-wrapped PreMasterSecret", msg, msglen);
+            "GOST-wrapped PreMasterSecret", msg, msglen);
         msglen = 0;
         break;
     }
@@ -1217,7 +1221,7 @@ static int ssl_print_client_keyex(BIO *bio, int indent, const SSL_CONNECTION *sc
 }
 
 static int ssl_print_server_keyex(BIO *bio, int indent, const SSL_CONNECTION *sc,
-                                  const unsigned char *msg, size_t msglen)
+    const unsigned char *msg, size_t msglen)
 {
     const char *algname;
     int id = ssl_get_keyex(&algname, sc);
@@ -1226,7 +1230,7 @@ static int ssl_print_server_keyex(BIO *bio, int indent, const SSL_CONNECTION *sc
     BIO_printf(bio, "KeyExchangeAlgorithm=%s\n", algname);
     if (id & SSL_PSK) {
         if (!ssl_print_hexbuf(bio, indent + 2,
-                              "psk_identity_hint", 2, &msg, &msglen))
+                "psk_identity_hint", 2, &msg, &msglen))
             return 0;
     }
     switch (id) {
@@ -1235,7 +1239,7 @@ static int ssl_print_server_keyex(BIO *bio, int indent, const SSL_CONNECTION *sc
         if (!ssl_print_hexbuf(bio, indent + 2, "rsa_modulus", 2, &msg, &msglen))
             return 0;
         if (!ssl_print_hexbuf(bio, indent + 2, "rsa_exponent", 2,
-                              &msg, &msglen))
+                &msg, &msglen))
             return 0;
         break;
 
@@ -1264,7 +1268,7 @@ static int ssl_print_server_keyex(BIO *bio, int indent, const SSL_CONNECTION *sc
                 return 0;
             curve = (msg[1] << 8) | msg[2];
             BIO_printf(bio, "named_curve: %s (%d)\n",
-                       ssl_trace_str(curve, ssl_groups_tbl), curve);
+                ssl_trace_str(curve, ssl_groups_tbl), curve);
             msg += 3;
             msglen -= 3;
             if (!ssl_print_hexbuf(bio, indent + 2, "point", 1, &msg, &msglen))
@@ -1285,7 +1289,7 @@ static int ssl_print_server_keyex(BIO *bio, int indent, const SSL_CONNECTION *sc
 }
 
 static int ssl_print_certificate(BIO *bio, const SSL_CONNECTION *sc, int indent,
-                                 const unsigned char **pmsg, size_t *pmsglen)
+    const unsigned char **pmsg, size_t *pmsglen)
 {
     size_t msglen = *pmsglen;
     size_t clen;
@@ -1306,8 +1310,8 @@ static int ssl_print_certificate(BIO *bio, const SSL_CONNECTION *sc, int indent,
         X509_free(x);
         x = NULL;
     }
-    if (x ==  NULL)
-        BIO_puts(bio, "<UNPARSEABLE CERTIFICATE>\n");
+    if (x == NULL)
+        BIO_puts(bio, "<UNPARSABLE CERTIFICATE>\n");
     else {
         BIO_puts(bio, "\n------details-----\n");
         X509_print_ex(bio, x, XN_FLAG_ONELINE, 0);
@@ -1325,8 +1329,8 @@ static int ssl_print_certificate(BIO *bio, const SSL_CONNECTION *sc, int indent,
 }
 
 static int ssl_print_raw_public_key(BIO *bio, const SSL *ssl, int server,
-                                    int indent, const unsigned char **pmsg,
-                                    size_t *pmsglen)
+    int indent, const unsigned char **pmsg,
+    size_t *pmsglen)
 {
     EVP_PKEY *pkey;
     size_t clen;
@@ -1355,13 +1359,13 @@ static int ssl_print_raw_public_key(BIO *bio, const SSL *ssl, int server,
 }
 
 static int ssl_print_certificates(BIO *bio, const SSL_CONNECTION *sc, int server,
-                                  int indent, const unsigned char *msg,
-                                  size_t msglen)
+    int indent, const unsigned char *msg,
+    size_t msglen)
 {
     size_t clen;
 
     if (SSL_CONNECTION_IS_TLS13(sc)
-            && !ssl_print_hexbuf(bio, indent, "context", 1, &msg, &msglen))
+        && !ssl_print_hexbuf(bio, indent, "context", 1, &msg, &msglen))
         return 0;
 
     if (msglen < 3)
@@ -1371,12 +1375,12 @@ static int ssl_print_certificates(BIO *bio, const SSL_CONNECTION *sc, int server
         return 0;
     msg += 3;
     if ((server && sc->ext.server_cert_type == TLSEXT_cert_type_rpk)
-            || (!server && sc->ext.client_cert_type == TLSEXT_cert_type_rpk)) {
+        || (!server && sc->ext.client_cert_type == TLSEXT_cert_type_rpk)) {
         if (!ssl_print_raw_public_key(bio, &sc->ssl, server, indent, &msg, &clen))
             return 0;
         if (SSL_CONNECTION_IS_TLS13(sc)
             && !ssl_print_extensions(bio, indent + 2, server,
-                                     SSL3_MT_CERTIFICATE, &msg, &clen))
+                SSL3_MT_CERTIFICATE, &msg, &clen))
             return 0;
         return 1;
     }
@@ -1387,17 +1391,16 @@ static int ssl_print_certificates(BIO *bio, const SSL_CONNECTION *sc, int server
             return 0;
         if (SSL_CONNECTION_IS_TLS13(sc)
             && !ssl_print_extensions(bio, indent + 2, server,
-                                     SSL3_MT_CERTIFICATE, &msg, &clen))
+                SSL3_MT_CERTIFICATE, &msg, &clen))
             return 0;
-
     }
     return 1;
 }
 
 static int ssl_print_compressed_certificates(BIO *bio, const SSL_CONNECTION *sc,
-                                             int server, int indent,
-                                             const unsigned char *msg,
-                                             size_t msglen)
+    int server, int indent,
+    const unsigned char *msg,
+    size_t msglen)
 {
     size_t uclen;
     size_t clen;
@@ -1406,7 +1409,7 @@ static int ssl_print_compressed_certificates(BIO *bio, const SSL_CONNECTION *sc,
 #ifndef OPENSSL_NO_COMP_ALG
     COMP_METHOD *method;
     COMP_CTX *comp = NULL;
-    unsigned char* ucdata = NULL;
+    unsigned char *ucdata = NULL;
 #endif
 
     if (msglen < 8)
@@ -1454,11 +1457,11 @@ static int ssl_print_compressed_certificates(BIO *bio, const SSL_CONNECTION *sc,
     }
 
     if ((comp = COMP_CTX_new(method)) == NULL
-            || COMP_expand_block(comp, ucdata, uclen, (unsigned char*)msg, clen) != (int)uclen)
+        || COMP_expand_block(comp, ucdata, uclen, (unsigned char *)msg, clen) != (int)uclen)
         goto err;
 
     ret = ssl_print_certificates(bio, sc, server, indent, ucdata, uclen);
- err:
+err:
     COMP_CTX_free(comp);
     OPENSSL_free(ucdata);
 #endif
@@ -1466,7 +1469,7 @@ static int ssl_print_compressed_certificates(BIO *bio, const SSL_CONNECTION *sc,
 }
 
 static int ssl_print_cert_request(BIO *bio, int indent, const SSL_CONNECTION *sc,
-                                  const unsigned char *msg, size_t msglen)
+    const unsigned char *msg, size_t msglen)
 {
     size_t xlen;
     unsigned int sigalg;
@@ -1475,7 +1478,7 @@ static int ssl_print_cert_request(BIO *bio, int indent, const SSL_CONNECTION *sc
         if (!ssl_print_hexbuf(bio, indent, "request_context", 1, &msg, &msglen))
             return 0;
         if (!ssl_print_extensions(bio, indent, 1,
-                                  SSL3_MT_CERTIFICATE_REQUEST, &msg, &msglen))
+                SSL3_MT_CERTIFICATE_REQUEST, &msg, &msglen))
             return 0;
         return 1;
     } else {
@@ -1506,7 +1509,7 @@ static int ssl_print_cert_request(BIO *bio, int indent, const SSL_CONNECTION *sc
             BIO_indent(bio, indent + 2, 80);
             sigalg = (msg[0] << 8) | msg[1];
             BIO_printf(bio, "%s (0x%04x)\n",
-                       ssl_trace_str(sigalg, ssl_sigalg_tbl), sigalg);
+                ssl_trace_str(sigalg, ssl_sigalg_tbl), sigalg);
             xlen -= 2;
             msg += 2;
         }
@@ -1537,7 +1540,7 @@ static int ssl_print_cert_request(BIO *bio, int indent, const SSL_CONNECTION *sc
         p = msg;
         nm = d2i_X509_NAME(NULL, &p, dlen);
         if (!nm) {
-            BIO_puts(bio, "<UNPARSEABLE DN>\n");
+            BIO_puts(bio, "<UNPARSABLE DN>\n");
         } else {
             X509_NAME_print_ex(bio, nm, 0, XN_FLAG_ONELINE);
             BIO_puts(bio, "\n");
@@ -1548,14 +1551,14 @@ static int ssl_print_cert_request(BIO *bio, int indent, const SSL_CONNECTION *sc
     }
     if (SSL_CONNECTION_IS_TLS13(sc)) {
         if (!ssl_print_hexbuf(bio, indent, "request_extensions", 2,
-                              &msg, &msglen))
+                &msg, &msglen))
             return 0;
     }
     return msglen == 0;
 }
 
 static int ssl_print_ticket(BIO *bio, int indent, const SSL_CONNECTION *sc,
-                            const unsigned char *msg, size_t msglen)
+    const unsigned char *msg, size_t msglen)
 {
     unsigned int tick_life;
 
@@ -1567,9 +1570,9 @@ static int ssl_print_ticket(BIO *bio, int indent, const SSL_CONNECTION *sc,
     if (msglen < 4)
         return 0;
     tick_life = ((unsigned int)msg[0] << 24)
-                | ((unsigned int)msg[1] << 16)
-                | ((unsigned int)msg[2] << 8)
-                | (unsigned int)msg[3];
+        | ((unsigned int)msg[1] << 16)
+        | ((unsigned int)msg[2] << 8)
+        | (unsigned int)msg[3];
     msglen -= 4;
     msg += 4;
     BIO_indent(bio, indent + 2, 80);
@@ -1579,8 +1582,7 @@ static int ssl_print_ticket(BIO *bio, int indent, const SSL_CONNECTION *sc,
 
         if (msglen < 4)
             return 0;
-        ticket_age_add =
-            ((unsigned int)msg[0] << 24)
+        ticket_age_add = ((unsigned int)msg[0] << 24)
             | ((unsigned int)msg[1] << 16)
             | ((unsigned int)msg[2] << 8)
             | (unsigned int)msg[3];
@@ -1589,14 +1591,14 @@ static int ssl_print_ticket(BIO *bio, int indent, const SSL_CONNECTION *sc,
         BIO_indent(bio, indent + 2, 80);
         BIO_printf(bio, "ticket_age_add=%u\n", ticket_age_add);
         if (!ssl_print_hexbuf(bio, indent + 2, "ticket_nonce", 1, &msg,
-                              &msglen))
+                &msglen))
             return 0;
     }
     if (!ssl_print_hexbuf(bio, indent + 2, "ticket", 2, &msg, &msglen))
         return 0;
     if (SSL_CONNECTION_IS_TLS13(sc)
-            && !ssl_print_extensions(bio, indent + 2, 0,
-                                     SSL3_MT_NEWSESSION_TICKET, &msg, &msglen))
+        && !ssl_print_extensions(bio, indent + 2, 0,
+            SSL3_MT_NEWSESSION_TICKET, &msg, &msglen))
         return 0;
     if (msglen)
         return 0;
@@ -1604,8 +1606,8 @@ static int ssl_print_ticket(BIO *bio, int indent, const SSL_CONNECTION *sc,
 }
 
 static int ssl_print_handshake(BIO *bio, const SSL_CONNECTION *sc, int server,
-                               const unsigned char *msg, size_t msglen,
-                               int indent)
+    const unsigned char *msg, size_t msglen,
+    int indent)
 {
     size_t hlen;
     unsigned char htype;
@@ -1616,7 +1618,7 @@ static int ssl_print_handshake(BIO *bio, const SSL_CONNECTION *sc, int server,
     hlen = (msg[1] << 16) | (msg[2] << 8) | msg[3];
     BIO_indent(bio, indent, 80);
     BIO_printf(bio, "%s, Length=%d\n",
-               ssl_trace_str(htype, ssl_handshake_tbl), (int)hlen);
+        ssl_trace_str(htype, ssl_handshake_tbl), (int)hlen);
     msg += 4;
     msglen -= 4;
     if (SSL_CONNECTION_IS_DTLS(sc)) {
@@ -1624,10 +1626,10 @@ static int ssl_print_handshake(BIO *bio, const SSL_CONNECTION *sc, int server,
             return 0;
         BIO_indent(bio, indent, 80);
         BIO_printf(bio, "message_seq=%d, fragment_offset=%d, "
-                   "fragment_length=%d\n",
-                   (msg[0] << 8) | msg[1],
-                   (msg[2] << 16) | (msg[3] << 8) | msg[4],
-                   (msg[5] << 16) | (msg[6] << 8) | msg[7]);
+                        "fragment_length=%d\n",
+            (msg[0] << 8) | msg[1],
+            (msg[2] << 16) | (msg[3] << 8) | msg[4],
+            (msg[5] << 16) | (msg[6] << 8) | msg[7]);
         msg += 8;
         msglen -= 8;
     }
@@ -1696,7 +1698,7 @@ static int ssl_print_handshake(BIO *bio, const SSL_CONNECTION *sc, int server,
 
     case SSL3_MT_ENCRYPTED_EXTENSIONS:
         if (!ssl_print_extensions(bio, indent + 2, 1,
-                                  SSL3_MT_ENCRYPTED_EXTENSIONS, &msg, &msglen))
+                SSL3_MT_ENCRYPTED_EXTENSIONS, &msg, &msglen))
             return 0;
         break;
 
@@ -1706,7 +1708,7 @@ static int ssl_print_handshake(BIO *bio, const SSL_CONNECTION *sc, int server,
             return 0;
         }
         if (!ssl_trace_list(bio, indent + 2, msg, msglen, 1,
-                            ssl_key_update_tbl))
+                ssl_key_update_tbl))
             return 0;
         break;
 
@@ -1719,7 +1721,7 @@ static int ssl_print_handshake(BIO *bio, const SSL_CONNECTION *sc, int server,
 }
 
 void SSL_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)
 {
     const unsigned char *msg = buf;
     BIO *bio = arg;
@@ -1729,7 +1731,7 @@ void SSL_trace(int write_p, int version, int content_type,
 
     if (qc != NULL) {
         if (ossl_quic_trace(write_p, version, content_type, buf, msglen, ssl,
-                            arg))
+                arg))
             return;
         /*
          * Otherwise ossl_quic_trace didn't handle this content_type so we
@@ -1742,43 +1744,40 @@ void SSL_trace(int write_p, int version, int content_type,
         return;
 
     switch (content_type) {
-    case SSL3_RT_HEADER:
-        {
-            int hvers;
-
-            /* avoid overlapping with length at the end of buffer */
-            if (msglen < (size_t)(SSL_CONNECTION_IS_DTLS(sc) ?
-                     DTLS1_RT_HEADER_LENGTH : SSL3_RT_HEADER_LENGTH)) {
-                BIO_puts(bio, write_p ? "Sent" : "Received");
-                ssl_print_hex(bio, 0, " too short message", msg, msglen);
-                break;
-            }
-            hvers = msg[1] << 8 | msg[2];
-            BIO_puts(bio, write_p ? "Sent" : "Received");
-            BIO_printf(bio, " TLS Record\nHeader:\n  Version = %s (0x%x)\n",
-                       ssl_trace_str(hvers, ssl_version_tbl), hvers);
-            if (SSL_CONNECTION_IS_DTLS(sc)) {
-                BIO_printf(bio,
-                           "  epoch=%d, sequence_number=%04x%04x%04x\n",
-                           (msg[3] << 8 | msg[4]),
-                           (msg[5] << 8 | msg[6]),
-                           (msg[7] << 8 | msg[8]), (msg[9] << 8 | msg[10]));
-            }
+    case SSL3_RT_HEADER: {
+        int hvers;
 
-            BIO_printf(bio, "  Content Type = %s (%d)\n  Length = %d",
-                       ssl_trace_str(msg[0], ssl_content_tbl), msg[0],
-                       msg[msglen - 2] << 8 | msg[msglen - 1]);
+        /* avoid overlapping with length at the end of buffer */
+        if (msglen < (size_t)(SSL_CONNECTION_IS_DTLS(sc) ? DTLS1_RT_HEADER_LENGTH : SSL3_RT_HEADER_LENGTH)) {
+            BIO_puts(bio, write_p ? "Sent" : "Received");
+            ssl_print_hex(bio, 0, " too short message", msg, msglen);
+            break;
         }
-        break;
+        hvers = msg[1] << 8 | msg[2];
+        BIO_puts(bio, write_p ? "Sent" : "Received");
+        BIO_printf(bio, " TLS Record\nHeader:\n  Version = %s (0x%x)\n",
+            ssl_trace_str(hvers, ssl_version_tbl), hvers);
+        if (SSL_CONNECTION_IS_DTLS(sc)) {
+            BIO_printf(bio,
+                "  epoch=%d, sequence_number=%04x%04x%04x\n",
+                (msg[3] << 8 | msg[4]),
+                (msg[5] << 8 | msg[6]),
+                (msg[7] << 8 | msg[8]), (msg[9] << 8 | msg[10]));
+        }
+
+        BIO_printf(bio, "  Content Type = %s (%d)\n  Length = %d",
+            ssl_trace_str(msg[0], ssl_content_tbl), msg[0],
+            msg[msglen - 2] << 8 | msg[msglen - 1]);
+    } break;
 
     case SSL3_RT_INNER_CONTENT_TYPE:
         BIO_printf(bio, "  Inner Content Type = %s (%d)",
-                   ssl_trace_str(msg[0], ssl_content_tbl), msg[0]);
+            ssl_trace_str(msg[0], ssl_content_tbl), msg[0]);
         break;
 
     case SSL3_RT_HANDSHAKE:
         if (!ssl_print_handshake(bio, sc, sc->server ? write_p : !write_p,
-                                 msg, msglen, 4))
+                msg, msglen, 4))
             BIO_printf(bio, "Message length parse error!\n");
         break;
 
@@ -1794,10 +1793,9 @@ void SSL_trace(int write_p, int version, int content_type,
             BIO_puts(bio, "    Illegal Alert Length\n");
         else {
             BIO_printf(bio, "    Level=%s(%d), description=%s(%d)\n",
-                       SSL_alert_type_string_long(msg[0] << 8),
-                       msg[0], SSL_alert_desc_string_long(msg[1]), msg[1]);
+                SSL_alert_type_string_long(msg[0] << 8),
+                msg[0], SSL_alert_desc_string_long(msg[1]), msg[1]);
         }
-
     }
 
     BIO_puts(bio, "\n");
diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
index 6bddc9b51c4ab..de201d9243019 100644
--- a/ssl/tls13_enc.c
+++ b/ssl/tls13_enc.c
@@ -17,7 +17,7 @@
 #include <openssl/kdf.h>
 #include <openssl/core_names.h>
 
-#define TLS13_MAX_LABEL_LEN     249
+#define TLS13_MAX_LABEL_LEN 249
 
 /* ASCII: "tls13 ", in hex for EBCDIC compatibility */
 static const unsigned char label_prefix[] = "\x74\x6C\x73\x31\x33\x20";
@@ -31,11 +31,11 @@ static const unsigned char label_prefix[] = "\x74\x6C\x73\x31\x33\x20";
  * If |raise_error| is set, ERR_raise is called on failure.
  */
 int tls13_hkdf_expand_ex(OSSL_LIB_CTX *libctx, const char *propq,
-                         const EVP_MD *md,
-                         const unsigned char *secret,
-                         const unsigned char *label, size_t labellen,
-                         const unsigned char *data, size_t datalen,
-                         unsigned char *out, size_t outlen, int raise_error)
+    const EVP_MD *md,
+    const unsigned char *secret,
+    const unsigned char *label, size_t labellen,
+    const unsigned char *data, size_t datalen,
+    unsigned char *out, size_t outlen, int raise_error)
 {
     EVP_KDF *kdf = EVP_KDF_fetch(libctx, OSSL_KDF_NAME_TLS1_3_KDF, propq);
     EVP_KDF_CTX *kctx;
@@ -72,18 +72,18 @@ int tls13_hkdf_expand_ex(OSSL_LIB_CTX *libctx, const char *propq,
 
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_MODE, &mode);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)mdname, 0);
+        (char *)mdname, 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
-                                             (unsigned char *)secret, hashlen);
+        (unsigned char *)secret, hashlen);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PREFIX,
-                                             (unsigned char *)label_prefix,
-                                             sizeof(label_prefix) - 1);
+        (unsigned char *)label_prefix,
+        sizeof(label_prefix) - 1);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_LABEL,
-                                             (unsigned char *)label, labellen);
+        (unsigned char *)label, labellen);
     if (data != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_DATA,
-                                                 (unsigned char *)data,
-                                                 datalen);
+            (unsigned char *)data,
+            datalen);
     *p++ = OSSL_PARAM_construct_end();
 
     ret = EVP_KDF_derive(kctx, out, outlen, params) <= 0;
@@ -98,17 +98,17 @@ int tls13_hkdf_expand_ex(OSSL_LIB_CTX *libctx, const char *propq,
 }
 
 int tls13_hkdf_expand(SSL_CONNECTION *s, const EVP_MD *md,
-                      const unsigned char *secret,
-                      const unsigned char *label, size_t labellen,
-                      const unsigned char *data, size_t datalen,
-                      unsigned char *out, size_t outlen, int fatal)
+    const unsigned char *secret,
+    const unsigned char *label, size_t labellen,
+    const unsigned char *data, size_t datalen,
+    unsigned char *out, size_t outlen, int fatal)
 {
     int ret;
     SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(s);
 
     ret = tls13_hkdf_expand_ex(sctx->libctx, sctx->propq, md,
-                               secret, label, labellen, data, datalen,
-                               out, outlen, !fatal);
+        secret, label, labellen, data, datalen,
+        out, outlen, !fatal);
     if (ret == 0 && fatal)
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
 
@@ -120,14 +120,14 @@ int tls13_hkdf_expand(SSL_CONNECTION *s, const EVP_MD *md,
  * success  0 on failure.
  */
 int tls13_derive_key(SSL_CONNECTION *s, const EVP_MD *md,
-                     const unsigned char *secret,
-                     unsigned char *key, size_t keylen)
+    const unsigned char *secret,
+    unsigned char *key, size_t keylen)
 {
     /* ASCII: "key", in hex for EBCDIC compatibility */
     static const unsigned char keylabel[] = "\x6B\x65\x79";
 
     return tls13_hkdf_expand(s, md, secret, keylabel, sizeof(keylabel) - 1,
-                             NULL, 0, key, keylen, 1);
+        NULL, 0, key, keylen, 1);
 }
 
 /*
@@ -135,25 +135,25 @@ int tls13_derive_key(SSL_CONNECTION *s, const EVP_MD *md,
  * success  0 on failure.
  */
 int tls13_derive_iv(SSL_CONNECTION *s, const EVP_MD *md,
-                    const unsigned char *secret,
-                    unsigned char *iv, size_t ivlen)
+    const unsigned char *secret,
+    unsigned char *iv, size_t ivlen)
 {
     /* ASCII: "iv", in hex for EBCDIC compatibility */
     static const unsigned char ivlabel[] = "\x69\x76";
 
     return tls13_hkdf_expand(s, md, secret, ivlabel, sizeof(ivlabel) - 1,
-                             NULL, 0, iv, ivlen, 1);
+        NULL, 0, iv, ivlen, 1);
 }
 
 int tls13_derive_finishedkey(SSL_CONNECTION *s, const EVP_MD *md,
-                             const unsigned char *secret,
-                             unsigned char *fin, size_t finlen)
+    const unsigned char *secret,
+    unsigned char *fin, size_t finlen)
 {
     /* ASCII: "finished", in hex for EBCDIC compatibility */
     static const unsigned char finishedlabel[] = "\x66\x69\x6E\x69\x73\x68\x65\x64";
 
     return tls13_hkdf_expand(s, md, secret, finishedlabel,
-                             sizeof(finishedlabel) - 1, NULL, 0, fin, finlen, 1);
+        sizeof(finishedlabel) - 1, NULL, 0, fin, finlen, 1);
 }
 
 /*
@@ -162,10 +162,10 @@ int tls13_derive_finishedkey(SSL_CONNECTION *s, const EVP_MD *md,
  * pointed to by |outsecret|. Returns 1 on success  0 on failure.
  */
 int tls13_generate_secret(SSL_CONNECTION *s, const EVP_MD *md,
-                          const unsigned char *prevsecret,
-                          const unsigned char *insecret,
-                          size_t insecretlen,
-                          unsigned char *outsecret)
+    const unsigned char *prevsecret,
+    const unsigned char *insecret,
+    size_t insecretlen,
+    unsigned char *outsecret)
 {
     size_t mdlen;
     int mdleni;
@@ -198,20 +198,20 @@ int tls13_generate_secret(SSL_CONNECTION *s, const EVP_MD *md,
 
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_MODE, &mode);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)mdname, 0);
+        (char *)mdname, 0);
     if (insecret != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
-                                                 (unsigned char *)insecret,
-                                                 insecretlen);
+            (unsigned char *)insecret,
+            insecretlen);
     if (prevsecret != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                                 (unsigned char *)prevsecret, mdlen);
+            (unsigned char *)prevsecret, mdlen);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PREFIX,
-                                             (unsigned char *)label_prefix,
-                                             sizeof(label_prefix) - 1);
+        (unsigned char *)label_prefix,
+        sizeof(label_prefix) - 1);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_LABEL,
-                                             (unsigned char *)derived_secret_label,
-                                             sizeof(derived_secret_label) - 1);
+        (unsigned char *)derived_secret_label,
+        sizeof(derived_secret_label) - 1);
     *p++ = OSSL_PARAM_construct_end();
 
     ret = EVP_KDF_derive(kctx, outsecret, mdlen, params) <= 0;
@@ -229,13 +229,13 @@ int tls13_generate_secret(SSL_CONNECTION *s, const EVP_MD *md,
  * generated. Returns 1 on success  0 on failure.
  */
 int tls13_generate_handshake_secret(SSL_CONNECTION *s,
-                                    const unsigned char *insecret,
-                                    size_t insecretlen)
+    const unsigned char *insecret,
+    size_t insecretlen)
 {
     /* Calls SSLfatal() if required */
     return tls13_generate_secret(s, ssl_handshake_md(s), s->early_secret,
-                                 insecret, insecretlen,
-                                 (unsigned char *)&s->handshake_secret);
+        insecret, insecretlen,
+        (unsigned char *)&s->handshake_secret);
 }
 
 /*
@@ -244,8 +244,8 @@ int tls13_generate_handshake_secret(SSL_CONNECTION *s,
  * failure.
  */
 int tls13_generate_master_secret(SSL_CONNECTION *s, unsigned char *out,
-                                 unsigned char *prev, size_t prevlen,
-                                 size_t *secret_size)
+    unsigned char *prev, size_t prevlen,
+    size_t *secret_size)
 {
     const EVP_MD *md = ssl_handshake_md(s);
     int md_size;
@@ -265,7 +265,7 @@ int tls13_generate_master_secret(SSL_CONNECTION *s, unsigned char *out,
  * 0 on error.
  */
 size_t tls13_final_finish_mac(SSL_CONNECTION *s, const char *str, size_t slen,
-                             unsigned char *out)
+    unsigned char *out)
 {
     const EVP_MD *md = ssl_handshake_md(s);
     const char *mdname = EVP_MD_get0_name(md);
@@ -282,8 +282,8 @@ size_t tls13_final_finish_mac(SSL_CONNECTION *s, const char *str, size_t slen,
     /* Safe to cast away const here since we're not "getting" any data */
     if (sctx->propq != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_PROPERTIES,
-                                                (char *)sctx->propq,
-                                                0);
+            (char *)sctx->propq,
+            0);
     *p = OSSL_PARAM_construct_end();
 
     if (!ssl_handshake_hash(s, hash, sizeof(hash), &hashlen)) {
@@ -297,21 +297,21 @@ size_t tls13_final_finish_mac(SSL_CONNECTION *s, const char *str, size_t slen,
         key = s->client_finished_secret;
     } else {
         if (!tls13_derive_finishedkey(s, md,
-                                      s->client_app_traffic_secret,
-                                      finsecret, hashlen))
+                s->client_app_traffic_secret,
+                finsecret, hashlen))
             goto err;
         key = finsecret;
     }
 
     if (!EVP_Q_mac(sctx->libctx, "HMAC", sctx->propq, mdname,
-                   params, key, hashlen, hash, hashlen,
-                   /* outsize as per sizeof(peer_finish_md) */
-                   out, EVP_MAX_MD_SIZE * 2, &len)) {
+            params, key, hashlen, hash, hashlen,
+            /* outsize as per sizeof(peer_finish_md) */
+            out, EVP_MAX_MD_SIZE * 2, &len)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
 
- err:
+err:
     OPENSSL_cleanse(finsecret, sizeof(finsecret));
     return len;
 }
@@ -329,7 +329,7 @@ int tls13_setup_key_block(SSL_CONNECTION *s)
 
     s->session->cipher = s->s3.tmp.new_cipher;
     if (!ssl_cipher_get_evp(SSL_CONNECTION_GET_CTX(s), s->session, &c, &hash,
-                            &mac_type, &mac_secret_size, NULL, 0)) {
+            &mac_type, &mac_secret_size, NULL, 0)) {
         /* Error is already recorded */
         SSLfatal_alert(s, SSL_AD_INTERNAL_ERROR);
         return 0;
@@ -346,16 +346,16 @@ int tls13_setup_key_block(SSL_CONNECTION *s)
 }
 
 static int derive_secret_key_and_iv(SSL_CONNECTION *s, const EVP_MD *md,
-                                    const EVP_CIPHER *ciph,
-                                    int mac_type,
-                                    const EVP_MD *mac_md,
-                                    const unsigned char *insecret,
-                                    const unsigned char *hash,
-                                    const unsigned char *label,
-                                    size_t labellen, unsigned char *secret,
-                                    unsigned char *key, size_t *keylen,
-                                    unsigned char **iv, size_t *ivlen,
-                                    size_t *taglen)
+    const EVP_CIPHER *ciph,
+    int mac_type,
+    const EVP_MD *mac_md,
+    const unsigned char *insecret,
+    const unsigned char *hash,
+    const unsigned char *label,
+    size_t labellen, unsigned char *secret,
+    unsigned char *key, size_t *keylen,
+    unsigned char **iv, size_t *ivlen,
+    size_t *taglen)
 {
     int hashleni = EVP_MD_get_size(md);
     size_t hashlen;
@@ -369,7 +369,7 @@ static int derive_secret_key_and_iv(SSL_CONNECTION *s, const EVP_MD *md,
     hashlen = (size_t)hashleni;
 
     if (!tls13_hkdf_expand(s, md, insecret, label, labellen, hash, hashlen,
-                           secret, hashlen, 1)) {
+            secret, hashlen, 1)) {
         /* SSLfatal() already called */
         return 0;
     }
@@ -438,7 +438,7 @@ static int derive_secret_key_and_iv(SSL_CONNECTION *s, const EVP_MD *md,
     }
 
     if (!tls13_derive_key(s, md, secret, key, *keylen)
-            || !tls13_derive_iv(s, md, secret, *iv, *ivlen)) {
+        || !tls13_derive_iv(s, md, secret, *iv, *ivlen)) {
         /* SSLfatal() already called */
         return 0;
     }
@@ -446,6 +446,31 @@ static int derive_secret_key_and_iv(SSL_CONNECTION *s, const EVP_MD *md,
     return 1;
 }
 
+static int tls13_store_hash(SSL_CONNECTION *s, unsigned char *hash, size_t len)
+{
+    size_t hashlen;
+
+    if (!ssl3_digest_cached_records(s, 1)
+        || !ssl_handshake_hash(s, hash, len, &hashlen)) {
+        /* SSLfatal() already called */;
+        return 0;
+    }
+
+    return 1;
+}
+
+int tls13_store_handshake_traffic_hash(SSL_CONNECTION *s)
+{
+    return tls13_store_hash(s, s->handshake_traffic_hash,
+        sizeof(s->handshake_traffic_hash));
+}
+
+int tls13_store_server_finished_hash(SSL_CONNECTION *s)
+{
+    return tls13_store_hash(s, s->server_finished_hash,
+        sizeof(s->server_finished_hash));
+}
+
 int tls13_change_cipher_state(SSL_CONNECTION *s, int which)
 {
     /* ASCII: "c e traffic", in hex for EBCDIC compatibility */
@@ -487,7 +512,7 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which)
                                                 : OSSL_RECORD_DIRECTION_WRITE;
 
     if (((which & SSL3_CC_CLIENT) && (which & SSL3_CC_WRITE))
-            || ((which & SSL3_CC_SERVER) && (which & SSL3_CC_READ))) {
+        || ((which & SSL3_CC_SERVER) && (which & SSL3_CC_READ))) {
         if ((which & SSL3_CC_EARLY) != 0) {
             EVP_MD_CTX *mdctx = NULL;
             long handlen;
@@ -507,16 +532,15 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which)
             }
 
             if (s->early_data_state == SSL_EARLY_DATA_CONNECTING
-                    && s->max_early_data > 0
-                    && s->session->ext.max_early_data == 0) {
+                && s->max_early_data > 0
+                && s->session->ext.max_early_data == 0) {
                 /*
                  * If we are attempting to send early data, and we've decided to
                  * actually do it but max_early_data in s->session is 0 then we
                  * must be using an external PSK.
                  */
                 if (!ossl_assert(s->psksession != NULL
-                        && s->max_early_data ==
-                           s->psksession->ext.max_early_data)) {
+                        && s->max_early_data == s->psksession->ext.max_early_data)) {
                     SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                     goto err;
                 }
@@ -539,7 +563,7 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which)
 
             if (((EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) == 0)
                 && (!ssl_cipher_get_evp_md_mac(sctx, sslcipher, &mac_md,
-                                               &mac_pkey_type, NULL))) {
+                    &mac_pkey_type, NULL))) {
                 SSLfatal_alert(s, SSL_AD_INTERNAL_ERROR);
                 goto err;
             }
@@ -557,8 +581,8 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which)
 
             md = ssl_md(sctx, sslcipher->algorithm2);
             if (md == NULL || !EVP_DigestInit_ex(mdctx, md, NULL)
-                    || !EVP_DigestUpdate(mdctx, hdata, handlen)
-                    || !EVP_DigestFinal_ex(mdctx, hashval, &hashlenui)) {
+                || !EVP_DigestUpdate(mdctx, hdata, handlen)
+                || !EVP_DigestFinal_ex(mdctx, hashval, &hashlenui)) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 EVP_MD_CTX_free(mdctx);
                 goto err;
@@ -567,17 +591,17 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which)
             EVP_MD_CTX_free(mdctx);
 
             if (!tls13_hkdf_expand(s, md, insecret,
-                                   early_exporter_master_secret,
-                                   sizeof(early_exporter_master_secret) - 1,
-                                   hashval, hashlen,
-                                   s->early_exporter_master_secret, hashlen,
-                                   1)) {
+                    early_exporter_master_secret,
+                    sizeof(early_exporter_master_secret) - 1,
+                    hashval, hashlen,
+                    s->early_exporter_master_secret, hashlen,
+                    1)) {
                 SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
                 goto err;
             }
 
             if (!ssl_log_secret(s, EARLY_EXPORTER_SECRET_LABEL,
-                                s->early_exporter_master_secret, hashlen)) {
+                    s->early_exporter_master_secret, hashlen)) {
                 /* SSLfatal() already called */
                 goto err;
             }
@@ -633,6 +657,7 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which)
             label = server_application_traffic;
             labellen = sizeof(server_application_traffic) - 1;
             log_label = SERVER_APPLICATION_LABEL;
+            hash = s->server_finished_hash;
         }
     }
 
@@ -642,32 +667,22 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which)
         mac_md = s->s3.tmp.new_hash;
         mac_pkey_type = s->s3.tmp.new_mac_pkey_type;
         if (!ssl3_digest_cached_records(s, 1)
-                || !ssl_handshake_hash(s, hashval, sizeof(hashval), &hashlen)) {
+            || !ssl_handshake_hash(s, hashval, sizeof(hashval), &hashlen)) {
             /* SSLfatal() already called */;
             goto err;
         }
     }
 
-    /*
-     * Save the hash of handshakes up to now for use when we calculate the
-     * client application traffic secret
-     */
-    if (label == server_application_traffic)
-        memcpy(s->server_finished_hash, hashval, hashlen);
-
-    if (label == server_handshake_traffic)
-        memcpy(s->handshake_traffic_hash, hashval, hashlen);
-
     if (label == client_application_traffic) {
         /*
          * We also create the resumption master secret, but this time use the
          * hash for the whole handshake including the Client Finished
          */
         if (!tls13_hkdf_expand(s, ssl_handshake_md(s), insecret,
-                               resumption_master_secret,
-                               sizeof(resumption_master_secret) - 1,
-                               hashval, hashlen, s->resumption_master_secret,
-                               hashlen, 1)) {
+                resumption_master_secret,
+                sizeof(resumption_master_secret) - 1,
+                hashval, hashlen, s->resumption_master_secret,
+                hashlen, 1)) {
             /* SSLfatal() already called */
             goto err;
         }
@@ -678,8 +693,8 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which)
         goto err;
 
     if (!derive_secret_key_and_iv(s, md, cipher, mac_pkey_type, mac_md,
-                                  insecret, hash, label, labellen, secret, key,
-                                  &keylen, &iv, &ivlen, &taglen)) {
+            insecret, hash, label, labellen, secret, key,
+            &keylen, &iv, &ivlen, &taglen)) {
         /* SSLfatal() already called */
         goto err;
     }
@@ -688,16 +703,16 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which)
         memcpy(s->server_app_traffic_secret, secret, hashlen);
         /* Now we create the exporter master secret */
         if (!tls13_hkdf_expand(s, ssl_handshake_md(s), insecret,
-                               exporter_master_secret,
-                               sizeof(exporter_master_secret) - 1,
-                               hash, hashlen, s->exporter_master_secret,
-                               hashlen, 1)) {
+                exporter_master_secret,
+                sizeof(exporter_master_secret) - 1,
+                hash, hashlen, s->exporter_master_secret,
+                hashlen, 1)) {
             /* SSLfatal() already called */
             goto err;
         }
 
         if (!ssl_log_secret(s, EXPORTER_SECRET_LABEL, s->exporter_master_secret,
-                            hashlen)) {
+                hashlen)) {
             /* SSLfatal() already called */
             goto err;
         }
@@ -710,8 +725,8 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which)
     }
 
     if (finsecret != NULL
-            && !tls13_derive_finishedkey(s, ssl_handshake_md(s), secret,
-                                         finsecret, (size_t)finsecretlen)) {
+        && !tls13_derive_finishedkey(s, ssl_handshake_md(s), secret,
+            finsecret, (size_t)finsecretlen)) {
         /* SSLfatal() already called */
         goto err;
     }
@@ -724,22 +739,22 @@ int tls13_change_cipher_state(SSL_CONNECTION *s, int which)
     }
 
     level = (which & SSL3_CC_EARLY) != 0
-            ? OSSL_RECORD_PROTECTION_LEVEL_EARLY
-            : ((which &SSL3_CC_HANDSHAKE) != 0
-               ? OSSL_RECORD_PROTECTION_LEVEL_HANDSHAKE
-               : OSSL_RECORD_PROTECTION_LEVEL_APPLICATION);
+        ? OSSL_RECORD_PROTECTION_LEVEL_EARLY
+        : ((which & SSL3_CC_HANDSHAKE) != 0
+                  ? OSSL_RECORD_PROTECTION_LEVEL_HANDSHAKE
+                  : OSSL_RECORD_PROTECTION_LEVEL_APPLICATION);
 
     if (!ssl_set_new_record_layer(s, s->version,
-                                  direction,
-                                  level, secret, hashlen, key, keylen, iv,
-                                  ivlen, NULL, 0, cipher, taglen,
-                                  mac_pkey_type, mac_md, NULL, md)) {
+            direction,
+            level, secret, hashlen, key, keylen, iv,
+            ivlen, NULL, 0, cipher, taglen,
+            mac_pkey_type, mac_md, NULL, md)) {
         /* SSLfatal already called */
         goto err;
     }
 
     ret = 1;
- err:
+err:
     if ((which & SSL3_CC_EARLY) != 0) {
         /* We up-refed this so now we need to down ref */
         if ((EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) == 0)
@@ -782,12 +797,12 @@ int tls13_update_key(SSL_CONNECTION *s, int sending)
         insecret = s->client_app_traffic_secret;
 
     if (!derive_secret_key_and_iv(s, md,
-                                  s->s3.tmp.new_sym_enc,
-                                  s->s3.tmp.new_mac_pkey_type, s->s3.tmp.new_hash,
-                                  insecret, NULL,
-                                  application_traffic,
-                                  sizeof(application_traffic) - 1, secret, key,
-                                  &keylen, &iv, &ivlen, &taglen)) {
+            s->s3.tmp.new_sym_enc,
+            s->s3.tmp.new_mac_pkey_type, s->s3.tmp.new_hash,
+            insecret, NULL,
+            application_traffic,
+            sizeof(application_traffic) - 1, secret, key,
+            &keylen, &iv, &ivlen, &taglen)) {
         /* SSLfatal() already called */
         goto err;
     }
@@ -795,11 +810,11 @@ int tls13_update_key(SSL_CONNECTION *s, int sending)
     memcpy(insecret, secret, hashlen);
 
     if (!ssl_set_new_record_layer(s, s->version,
-                            direction,
-                            OSSL_RECORD_PROTECTION_LEVEL_APPLICATION,
-                            insecret, hashlen, key, keylen, iv, ivlen, NULL, 0,
-                            s->s3.tmp.new_sym_enc, taglen, NID_undef, NULL,
-                            NULL, md)) {
+            direction,
+            OSSL_RECORD_PROTECTION_LEVEL_APPLICATION,
+            insecret, hashlen, key, keylen, iv, ivlen, NULL, 0,
+            s->s3.tmp.new_sym_enc, taglen, NID_undef, NULL,
+            NULL, md)) {
         /* SSLfatal already called */
         goto err;
     }
@@ -811,7 +826,7 @@ int tls13_update_key(SSL_CONNECTION *s, int sending)
         goto err;
     }
     ret = 1;
- err:
+err:
     OPENSSL_cleanse(key, sizeof(key));
     OPENSSL_cleanse(secret, sizeof(secret));
     if (iv != iv_intern)
@@ -829,10 +844,10 @@ int tls13_alert_code(int code)
 }
 
 int tls13_export_keying_material(SSL_CONNECTION *s,
-                                 unsigned char *out, size_t olen,
-                                 const char *label, size_t llen,
-                                 const unsigned char *context,
-                                 size_t contextlen, int use_context)
+    unsigned char *out, size_t olen,
+    const char *label, size_t llen,
+    const unsigned char *context,
+    size_t contextlen, int use_context)
 {
     unsigned char exportsecret[EVP_MAX_MD_SIZE];
     /* ASCII: "exporter", in hex for EBCDIC compatibility */
@@ -850,29 +865,29 @@ int tls13_export_keying_material(SSL_CONNECTION *s,
         contextlen = 0;
 
     if (EVP_DigestInit_ex(ctx, md, NULL) <= 0
-            || EVP_DigestUpdate(ctx, context, contextlen) <= 0
-            || EVP_DigestFinal_ex(ctx, hash, &hashsize) <= 0
-            || EVP_DigestInit_ex(ctx, md, NULL) <= 0
-            || EVP_DigestFinal_ex(ctx, data, &datalen) <= 0
-            || !tls13_hkdf_expand(s, md, s->exporter_master_secret,
-                                  (const unsigned char *)label, llen,
-                                  data, datalen, exportsecret, hashsize, 0)
-            || !tls13_hkdf_expand(s, md, exportsecret, exporterlabel,
-                                  sizeof(exporterlabel) - 1, hash, hashsize,
-                                  out, olen, 0))
+        || EVP_DigestUpdate(ctx, context, contextlen) <= 0
+        || EVP_DigestFinal_ex(ctx, hash, &hashsize) <= 0
+        || EVP_DigestInit_ex(ctx, md, NULL) <= 0
+        || EVP_DigestFinal_ex(ctx, data, &datalen) <= 0
+        || !tls13_hkdf_expand(s, md, s->exporter_master_secret,
+            (const unsigned char *)label, llen,
+            data, datalen, exportsecret, hashsize, 0)
+        || !tls13_hkdf_expand(s, md, exportsecret, exporterlabel,
+            sizeof(exporterlabel) - 1, hash, hashsize,
+            out, olen, 0))
         goto err;
 
     ret = 1;
- err:
+err:
     EVP_MD_CTX_free(ctx);
     return ret;
 }
 
 int tls13_export_keying_material_early(SSL_CONNECTION *s,
-                                       unsigned char *out, size_t olen,
-                                       const char *label, size_t llen,
-                                       const unsigned char *context,
-                                       size_t contextlen)
+    unsigned char *out, size_t olen,
+    const char *label, size_t llen,
+    const unsigned char *context,
+    size_t contextlen)
 {
     /* ASCII: "exporter", in hex for EBCDIC compatibility */
     static const unsigned char exporterlabel[] = "\x65\x78\x70\x6F\x72\x74\x65\x72";
@@ -888,7 +903,7 @@ int tls13_export_keying_material_early(SSL_CONNECTION *s,
         goto err;
 
     if (!s->server && s->max_early_data > 0
-            && s->session->ext.max_early_data == 0)
+        && s->session->ext.max_early_data == 0)
         sslcipher = SSL_SESSION_get0_cipher(s->psksession);
     else
         sslcipher = SSL_SESSION_get0_cipher(s->session);
@@ -911,21 +926,21 @@ int tls13_export_keying_material_early(SSL_CONNECTION *s,
      * Here Transcript-Hash is the cipher suite hash algorithm.
      */
     if (md == NULL
-            || EVP_DigestInit_ex(ctx, md, NULL) <= 0
-            || EVP_DigestUpdate(ctx, context, contextlen) <= 0
-            || EVP_DigestFinal_ex(ctx, hash, &hashsize) <= 0
-            || EVP_DigestInit_ex(ctx, md, NULL) <= 0
-            || EVP_DigestFinal_ex(ctx, data, &datalen) <= 0
-            || !tls13_hkdf_expand(s, md, s->early_exporter_master_secret,
-                                  (const unsigned char *)label, llen,
-                                  data, datalen, exportsecret, hashsize, 0)
-            || !tls13_hkdf_expand(s, md, exportsecret, exporterlabel,
-                                  sizeof(exporterlabel) - 1, hash, hashsize,
-                                  out, olen, 0))
+        || EVP_DigestInit_ex(ctx, md, NULL) <= 0
+        || EVP_DigestUpdate(ctx, context, contextlen) <= 0
+        || EVP_DigestFinal_ex(ctx, hash, &hashsize) <= 0
+        || EVP_DigestInit_ex(ctx, md, NULL) <= 0
+        || EVP_DigestFinal_ex(ctx, data, &datalen) <= 0
+        || !tls13_hkdf_expand(s, md, s->early_exporter_master_secret,
+            (const unsigned char *)label, llen,
+            data, datalen, exportsecret, hashsize, 0)
+        || !tls13_hkdf_expand(s, md, exportsecret, exporterlabel,
+            sizeof(exporterlabel) - 1, hash, hashsize,
+            out, olen, 0))
         goto err;
 
     ret = 1;
- err:
+err:
     EVP_MD_CTX_free(ctx);
     return ret;
 }
diff --git a/ssl/tls_depr.c b/ssl/tls_depr.c
index 64a9a7942b3ff..72cc528ec851e 100644
--- a/ssl/tls_depr.c
+++ b/ssl/tls_depr.c
@@ -66,14 +66,14 @@ const EVP_MD *tls_get_digest_from_engine(int nid)
 
 #ifndef OPENSSL_NO_ENGINE
 int tls_engine_load_ssl_client_cert(SSL_CONNECTION *s, X509 **px509,
-                                    EVP_PKEY **ppkey)
+    EVP_PKEY **ppkey)
 {
     SSL *ssl = SSL_CONNECTION_GET_SSL(s);
 
     return ENGINE_load_ssl_client_cert(SSL_CONNECTION_GET_CTX(s)->client_cert_engine,
-                                       ssl,
-                                       SSL_get_client_CA_list(ssl),
-                                       px509, ppkey, NULL, NULL, NULL);
+        ssl,
+        SSL_get_client_CA_list(ssl),
+        px509, ppkey, NULL, NULL, NULL);
 }
 #endif
 
@@ -153,7 +153,7 @@ HMAC_CTX *ssl_hmac_get0_HMAC_CTX(SSL_HMAC *ctx)
 /* Some deprecated public APIs pass DH objects */
 EVP_PKEY *ssl_dh_to_pkey(DH *dh)
 {
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
     EVP_PKEY *ret;
 
     if (dh == NULL)
@@ -164,18 +164,18 @@ EVP_PKEY *ssl_dh_to_pkey(DH *dh)
         return NULL;
     }
     return ret;
-# else
+#else
     return NULL;
-# endif
+#endif
 }
 
 /* Some deprecated public APIs pass EC_KEY objects */
 int ssl_set_tmp_ecdh_groups(uint16_t **pext, size_t *pextlen,
-                            uint16_t **ksext, size_t *ksextlen,
-                            size_t **tplext, size_t *tplextlen,
-                            void *key)
+    uint16_t **ksext, size_t *ksextlen,
+    size_t **tplext, size_t *tplextlen,
+    void *key)
 {
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
     const EC_GROUP *group = EC_KEY_get0_group((const EC_KEY *)key);
     int nid;
 
@@ -187,12 +187,12 @@ int ssl_set_tmp_ecdh_groups(uint16_t **pext, size_t *pextlen,
     if (nid == NID_undef)
         return 0;
     return tls1_set_groups(pext, pextlen,
-                           ksext, ksextlen,
-                           tplext, tplextlen,
-                           &nid, 1);
-# else
+        ksext, ksextlen,
+        tplext, tplextlen,
+        &nid, 1);
+#else
     return 0;
-# endif
+#endif
 }
 
 /*
@@ -200,18 +200,17 @@ int ssl_set_tmp_ecdh_groups(uint16_t **pext, size_t *pextlen,
  * ctx: the SSL context.
  * dh: the callback
  */
-# if !defined(OPENSSL_NO_DH)
+#if !defined(OPENSSL_NO_DH)
 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))
 {
     SSL_CTX_callback_ctrl(ctx, SSL_CTRL_SET_TMP_DH_CB, (void (*)(void))dh);
 }
 
-void SSL_set_tmp_dh_callback(SSL *ssl, DH *(*dh) (SSL *ssl, int is_export,
-                                                  int keylength))
+void SSL_set_tmp_dh_callback(SSL *ssl, DH *(*dh)(SSL *ssl, int is_export, int keylength))
 {
     SSL_callback_ctrl(ssl, SSL_CTRL_SET_TMP_DH_CB, (void (*)(void))dh);
 }
-# endif
+#endif
 #endif /* OPENSSL_NO_DEPRECATED */
diff --git a/ssl/tls_srp.c b/ssl/tls_srp.c
index e61bed5f0525c..51f0950a16f1d 100644
--- a/ssl/tls_srp.c
+++ b/ssl/tls_srp.c
@@ -24,7 +24,7 @@
 #include "internal/ssl_unwrap.h"
 
 #ifndef OPENSSL_NO_SRP
-# include <openssl/srp.h>
+#include <openssl/srp.h>
 
 /*
  * The public API SSL_CTX_SRP_CTX_free() is deprecated so we use
@@ -100,50 +100,30 @@ int ssl_srp_ctx_init_intern(SSL_CONNECTION *s)
 
     s->srp_ctx.SRP_cb_arg = ctx->srp_ctx.SRP_cb_arg;
     /* set client Hello login callback */
-    s->srp_ctx.TLS_ext_srp_username_callback =
-        ctx->srp_ctx.TLS_ext_srp_username_callback;
+    s->srp_ctx.TLS_ext_srp_username_callback = ctx->srp_ctx.TLS_ext_srp_username_callback;
     /* set SRP N/g param callback for verification */
-    s->srp_ctx.SRP_verify_param_callback =
-        ctx->srp_ctx.SRP_verify_param_callback;
+    s->srp_ctx.SRP_verify_param_callback = ctx->srp_ctx.SRP_verify_param_callback;
     /* set SRP client passwd callback */
-    s->srp_ctx.SRP_give_srp_client_pwd_callback =
-        ctx->srp_ctx.SRP_give_srp_client_pwd_callback;
+    s->srp_ctx.SRP_give_srp_client_pwd_callback = ctx->srp_ctx.SRP_give_srp_client_pwd_callback;
 
     s->srp_ctx.strength = ctx->srp_ctx.strength;
 
-    if (((ctx->srp_ctx.N != NULL) &&
-         ((s->srp_ctx.N = BN_dup(ctx->srp_ctx.N)) == NULL)) ||
-        ((ctx->srp_ctx.g != NULL) &&
-         ((s->srp_ctx.g = BN_dup(ctx->srp_ctx.g)) == NULL)) ||
-        ((ctx->srp_ctx.s != NULL) &&
-         ((s->srp_ctx.s = BN_dup(ctx->srp_ctx.s)) == NULL)) ||
-        ((ctx->srp_ctx.B != NULL) &&
-         ((s->srp_ctx.B = BN_dup(ctx->srp_ctx.B)) == NULL)) ||
-        ((ctx->srp_ctx.A != NULL) &&
-         ((s->srp_ctx.A = BN_dup(ctx->srp_ctx.A)) == NULL)) ||
-        ((ctx->srp_ctx.a != NULL) &&
-         ((s->srp_ctx.a = BN_dup(ctx->srp_ctx.a)) == NULL)) ||
-        ((ctx->srp_ctx.v != NULL) &&
-         ((s->srp_ctx.v = BN_dup(ctx->srp_ctx.v)) == NULL)) ||
-        ((ctx->srp_ctx.b != NULL) &&
-         ((s->srp_ctx.b = BN_dup(ctx->srp_ctx.b)) == NULL))) {
+    if (((ctx->srp_ctx.N != NULL) && ((s->srp_ctx.N = BN_dup(ctx->srp_ctx.N)) == NULL)) || ((ctx->srp_ctx.g != NULL) && ((s->srp_ctx.g = BN_dup(ctx->srp_ctx.g)) == NULL)) || ((ctx->srp_ctx.s != NULL) && ((s->srp_ctx.s = BN_dup(ctx->srp_ctx.s)) == NULL)) || ((ctx->srp_ctx.B != NULL) && ((s->srp_ctx.B = BN_dup(ctx->srp_ctx.B)) == NULL)) || ((ctx->srp_ctx.A != NULL) && ((s->srp_ctx.A = BN_dup(ctx->srp_ctx.A)) == NULL)) || ((ctx->srp_ctx.a != NULL) && ((s->srp_ctx.a = BN_dup(ctx->srp_ctx.a)) == NULL)) || ((ctx->srp_ctx.v != NULL) && ((s->srp_ctx.v = BN_dup(ctx->srp_ctx.v)) == NULL)) || ((ctx->srp_ctx.b != NULL) && ((s->srp_ctx.b = BN_dup(ctx->srp_ctx.b)) == NULL))) {
         ERR_raise(ERR_LIB_SSL, ERR_R_BN_LIB);
         goto err;
     }
-    if ((ctx->srp_ctx.login != NULL) &&
-        ((s->srp_ctx.login = OPENSSL_strdup(ctx->srp_ctx.login)) == NULL)) {
+    if ((ctx->srp_ctx.login != NULL) && ((s->srp_ctx.login = OPENSSL_strdup(ctx->srp_ctx.login)) == NULL)) {
         ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
         goto err;
     }
-    if ((ctx->srp_ctx.info != NULL) &&
-        ((s->srp_ctx.info = OPENSSL_strdup(ctx->srp_ctx.info)) == NULL)) {
+    if ((ctx->srp_ctx.info != NULL) && ((s->srp_ctx.info = OPENSSL_strdup(ctx->srp_ctx.info)) == NULL)) {
         ERR_raise(ERR_LIB_SSL, ERR_R_INTERNAL_ERROR);
         goto err;
     }
     s->srp_ctx.srp_Mask = ctx->srp_ctx.srp_Mask;
 
     return 1;
- err:
+err:
     OPENSSL_free(s->srp_ctx.login);
     OPENSSL_free(s->srp_ctx.info);
     BN_free(s->srp_ctx.N);
@@ -198,32 +178,27 @@ int ssl_srp_server_param_with_username_intern(SSL_CONNECTION *s, int *ad)
     SSL_CTX *sctx = SSL_CONNECTION_GET_CTX(s);
 
     *ad = SSL_AD_UNKNOWN_PSK_IDENTITY;
-    if ((s->srp_ctx.TLS_ext_srp_username_callback != NULL) &&
-        ((al =
-          s->srp_ctx.TLS_ext_srp_username_callback(SSL_CONNECTION_GET_USER_SSL(s),
-                                                   ad,
-                                                   s->srp_ctx.SRP_cb_arg)) !=
-         SSL_ERROR_NONE))
+    if ((s->srp_ctx.TLS_ext_srp_username_callback != NULL) && ((al = s->srp_ctx.TLS_ext_srp_username_callback(SSL_CONNECTION_GET_USER_SSL(s), ad, s->srp_ctx.SRP_cb_arg)) != SSL_ERROR_NONE))
         return al;
 
     *ad = SSL_AD_INTERNAL_ERROR;
-    if ((s->srp_ctx.N == NULL) ||
-        (s->srp_ctx.g == NULL) ||
-        (s->srp_ctx.s == NULL) || (s->srp_ctx.v == NULL))
+    if ((s->srp_ctx.N == NULL) || (s->srp_ctx.g == NULL) || (s->srp_ctx.s == NULL) || (s->srp_ctx.v == NULL))
         return SSL3_AL_FATAL;
 
     if (RAND_priv_bytes_ex(SSL_CONNECTION_GET_CTX(s)->libctx, b, sizeof(b),
-                           0) <= 0)
+            0)
+        <= 0)
         return SSL3_AL_FATAL;
     s->srp_ctx.b = BN_bin2bn(b, sizeof(b), NULL);
     OPENSSL_cleanse(b, sizeof(b));
 
     /* Calculate:  B = (kv + g^b) % N  */
 
-    return ((s->srp_ctx.B =
-             SRP_Calc_B_ex(s->srp_ctx.b, s->srp_ctx.N, s->srp_ctx.g,
-                           s->srp_ctx.v, sctx->libctx, sctx->propq)) !=
-            NULL) ? SSL_ERROR_NONE : SSL3_AL_FATAL;
+    return ((s->srp_ctx.B = SRP_Calc_B_ex(s->srp_ctx.b, s->srp_ctx.N, s->srp_ctx.g,
+                 s->srp_ctx.v, sctx->libctx, sctx->propq))
+               != NULL)
+        ? SSL_ERROR_NONE
+        : SSL3_AL_FATAL;
 }
 
 int SSL_srp_server_param_with_username(SSL *s, int *ad)
@@ -241,7 +216,7 @@ int SSL_srp_server_param_with_username(SSL *s, int *ad)
  * fly
  */
 int SSL_set_srp_server_param_pw(SSL *s, const char *user, const char *pass,
-                                const char *grp)
+    const char *grp)
 {
     SRP_gN *GN;
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
@@ -259,15 +234,15 @@ int SSL_set_srp_server_param_pw(SSL *s, const char *user, const char *pass,
     BN_clear_free(sc->srp_ctx.s);
     sc->srp_ctx.s = NULL;
     if (!SRP_create_verifier_BN_ex(user, pass, &sc->srp_ctx.s, &sc->srp_ctx.v,
-                                   sc->srp_ctx.N, sc->srp_ctx.g, s->ctx->libctx,
-                                   s->ctx->propq))
+            sc->srp_ctx.N, sc->srp_ctx.g, s->ctx->libctx,
+            s->ctx->propq))
         return -1;
 
     return 1;
 }
 
 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)
 {
     SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s);
 
@@ -317,8 +292,7 @@ int SSL_set_srp_server_param(SSL *s, const BIGNUM *N, const BIGNUM *g,
             return -1;
     }
 
-    if (!(sc->srp_ctx.N) ||
-        !(sc->srp_ctx.g) || !(sc->srp_ctx.s) || !(sc->srp_ctx.v))
+    if (!(sc->srp_ctx.N) || !(sc->srp_ctx.g) || !(sc->srp_ctx.s) || !(sc->srp_ctx.v))
         return -1;
 
     return 1;
@@ -334,10 +308,12 @@ int srp_generate_server_master_secret(SSL_CONNECTION *s)
     if (!SRP_Verify_A_mod_N(s->srp_ctx.A, s->srp_ctx.N))
         goto err;
     if ((u = SRP_Calc_u_ex(s->srp_ctx.A, s->srp_ctx.B, s->srp_ctx.N,
-                           sctx->libctx, sctx->propq)) == NULL)
+             sctx->libctx, sctx->propq))
+        == NULL)
         goto err;
     if ((K = SRP_Calc_server_key(s->srp_ctx.A, s->srp_ctx.v, u, s->srp_ctx.b,
-                                 s->srp_ctx.N)) == NULL)
+             s->srp_ctx.N))
+        == NULL)
         goto err;
 
     tmp_len = BN_num_bytes(K);
@@ -348,7 +324,7 @@ int srp_generate_server_master_secret(SSL_CONNECTION *s)
     BN_bn2bin(K, tmp);
     /* Calls SSLfatal() as required */
     ret = ssl_generate_master_secret(s, tmp, tmp_len, 1);
- err:
+err:
     BN_clear_free(K);
     BN_clear_free(u);
     return ret;
@@ -367,26 +343,28 @@ int srp_generate_client_master_secret(SSL_CONNECTION *s)
      * Checks if b % n == 0
      */
     if (SRP_Verify_B_mod_N(s->srp_ctx.B, s->srp_ctx.N) == 0
-            || (u = SRP_Calc_u_ex(s->srp_ctx.A, s->srp_ctx.B, s->srp_ctx.N,
-                                  sctx->libctx, sctx->propq))
-               == NULL
-            || s->srp_ctx.SRP_give_srp_client_pwd_callback == NULL) {
+        || (u = SRP_Calc_u_ex(s->srp_ctx.A, s->srp_ctx.B, s->srp_ctx.N,
+                sctx->libctx, sctx->propq))
+            == NULL
+        || s->srp_ctx.SRP_give_srp_client_pwd_callback == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
     if ((passwd = s->srp_ctx.SRP_give_srp_client_pwd_callback(SSL_CONNECTION_GET_USER_SSL(s),
-                                                              s->srp_ctx.SRP_cb_arg))
-            == NULL) {
+             s->srp_ctx.SRP_cb_arg))
+        == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_R_CALLBACK_FAILED);
         goto err;
     }
     if ((x = SRP_Calc_x_ex(s->srp_ctx.s, s->srp_ctx.login, passwd,
-                           sctx->libctx, sctx->propq)) == NULL
-            || (K = SRP_Calc_client_key_ex(s->srp_ctx.N, s->srp_ctx.B,
-                                           s->srp_ctx.g, x,
-                                           s->srp_ctx.a, u,
-                                           sctx->libctx,
-                                           sctx->propq)) == NULL) {
+             sctx->libctx, sctx->propq))
+            == NULL
+        || (K = SRP_Calc_client_key_ex(s->srp_ctx.N, s->srp_ctx.B,
+                s->srp_ctx.g, x,
+                s->srp_ctx.a, u,
+                sctx->libctx,
+                sctx->propq))
+            == NULL) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
         goto err;
     }
@@ -399,7 +377,7 @@ int srp_generate_client_master_secret(SSL_CONNECTION *s)
     BN_bn2bin(K, tmp);
     /* Calls SSLfatal() as required */
     ret = ssl_generate_master_secret(s, tmp, tmp_len, 1);
- err:
+err:
     BN_clear_free(K);
     BN_clear_free(x);
     if (passwd != NULL)
@@ -428,13 +406,14 @@ int srp_verify_server_param(SSL_CONNECTION *s)
 
     if (srp->SRP_verify_param_callback) {
         if (srp->SRP_verify_param_callback(SSL_CONNECTION_GET_USER_SSL(s),
-                                           srp->SRP_cb_arg) <= 0) {
+                srp->SRP_cb_arg)
+            <= 0) {
             SSLfatal(s, SSL_AD_INSUFFICIENT_SECURITY, SSL_R_CALLBACK_FAILED);
             return 0;
         }
     } else if (!SRP_check_known_gN_param(srp->g, srp->N)) {
         SSLfatal(s, SSL_AD_INSUFFICIENT_SECURITY,
-                 SSL_R_INSUFFICIENT_SECURITY);
+            SSL_R_INSUFFICIENT_SECURITY);
         return 0;
     }
 
@@ -450,7 +429,8 @@ int ssl_srp_calc_a_param_intern(SSL_CONNECTION *s)
     unsigned char rnd[SSL_MAX_MASTER_KEY_LENGTH];
 
     if (RAND_priv_bytes_ex(SSL_CONNECTION_GET_CTX(s)->libctx,
-                           rnd, sizeof(rnd), 0) <= 0)
+            rnd, sizeof(rnd), 0)
+        <= 0)
         return 0;
     s->srp_ctx.a = BN_bin2bn(rnd, sizeof(rnd), s->srp_ctx.a);
     OPENSSL_cleanse(rnd, sizeof(rnd));
@@ -519,8 +499,8 @@ char *SSL_get_srp_userinfo(SSL *s)
     return s->ctx->srp_ctx.info;
 }
 
-# define tls1_ctx_ctrl ssl3_ctx_ctrl
-# define tls1_ctx_callback_ctrl ssl3_ctx_callback_ctrl
+#define tls1_ctx_ctrl ssl3_ctx_ctrl
+#define tls1_ctx_callback_ctrl ssl3_ctx_callback_ctrl
 
 int SSL_CTX_set_srp_username(SSL_CTX *ctx, char *name)
 {
@@ -535,14 +515,14 @@ int SSL_CTX_set_srp_password(SSL_CTX *ctx, char *password)
 int SSL_CTX_set_srp_strength(SSL_CTX *ctx, int strength)
 {
     return tls1_ctx_ctrl(ctx, SSL_CTRL_SET_TLS_EXT_SRP_STRENGTH, strength,
-                         NULL);
+        NULL);
 }
 
 int SSL_CTX_set_srp_verify_param_callback(SSL_CTX *ctx,
-                                          int (*cb) (SSL *, void *))
+    int (*cb)(SSL *, void *))
 {
     return tls1_ctx_callback_ctrl(ctx, SSL_CTRL_SET_SRP_VERIFY_PARAM_CB,
-                                  (void (*)(void))cb);
+        (void (*)(void))cb);
 }
 
 int SSL_CTX_set_srp_cb_arg(SSL_CTX *ctx, void *arg)
@@ -551,17 +531,17 @@ int SSL_CTX_set_srp_cb_arg(SSL_CTX *ctx, void *arg)
 }
 
 int SSL_CTX_set_srp_username_callback(SSL_CTX *ctx,
-                                      int (*cb) (SSL *, int *, void *))
+    int (*cb)(SSL *, int *, void *))
 {
     return tls1_ctx_callback_ctrl(ctx, SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB,
-                                  (void (*)(void))cb);
+        (void (*)(void))cb);
 }
 
 int SSL_CTX_set_srp_client_pwd_callback(SSL_CTX *ctx,
-                                        char *(*cb) (SSL *, void *))
+    char *(*cb)(SSL *, void *))
 {
     return tls1_ctx_callback_ctrl(ctx, SSL_CTRL_SET_SRP_GIVE_CLIENT_PWD_CB,
-                                  (void (*)(void))cb);
+        (void (*)(void))cb);
 }
 
 #endif
diff --git a/test/acvp_test.c b/test/acvp_test.c
index 2bcc886fd2904..15c87c57a7717 100644
--- a/test/acvp_test.c
+++ b/test/acvp_test.c
@@ -60,14 +60,14 @@ const OPTIONS *test_get_options(void)
     static const OPTIONS test_options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the libctx" },
+            "The configuration file to use for the libctx" },
         { NULL }
     };
     return test_options;
 }
 
 static int pkey_get_bn_bytes(EVP_PKEY *pkey, const char *name,
-                             unsigned char **out, size_t *out_len)
+    unsigned char **out, size_t *out_len)
 {
     unsigned char *buf = NULL;
     BIGNUM *bn = NULL;
@@ -93,8 +93,8 @@ static int pkey_get_bn_bytes(EVP_PKEY *pkey, const char *name,
 }
 
 static int sig_gen(EVP_PKEY *pkey, OSSL_PARAM *params, const char *digest_name,
-                   const unsigned char *msg, size_t msg_len,
-                   unsigned char **sig_out, size_t *sig_out_len)
+    const unsigned char *msg, size_t msg_len,
+    unsigned char **sig_out, size_t *sig_out_len)
 {
     int ret = 0;
     EVP_MD_CTX *md_ctx = NULL;
@@ -107,7 +107,8 @@ static int sig_gen(EVP_PKEY *pkey, OSSL_PARAM *params, const char *digest_name,
     if (!TEST_ptr(sig = OPENSSL_malloc(sz))
         || !TEST_ptr(md_ctx = EVP_MD_CTX_new())
         || !TEST_int_eq(EVP_DigestSignInit_ex(md_ctx, NULL, digest_name, libctx,
-                                              NULL, pkey, p), 1)
+                            NULL, pkey, p),
+            1)
         || !TEST_int_gt(EVP_DigestSign(md_ctx, sig, &sig_len, msg, msg_len), 0))
         goto err;
     *sig_out = sig;
@@ -126,15 +127,15 @@ static int check_verify_message(EVP_PKEY_CTX *pkey_ctx, int expected)
     int verify_message = -1;
 
     if (!OSSL_PROVIDER_available(libctx, "fips")
-            || fips_provider_version_match(libctx, "<3.4.0"))
+        || fips_provider_version_match(libctx, "<3.4.0"))
         return 1;
 
     *p++ = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_FIPS_VERIFY_MESSAGE,
-                                    &verify_message);
+        &verify_message);
     *p = OSSL_PARAM_construct_end();
 
     if (!TEST_true(EVP_PKEY_CTX_get_params(pkey_ctx, params))
-            || !TEST_int_eq(verify_message, expected))
+        || !TEST_int_eq(verify_message, expected))
         return 0;
     return 1;
 }
@@ -154,11 +155,11 @@ static int ecdsa_keygen_test(int id)
     if (!TEST_ptr(pkey = EVP_PKEY_Q_keygen(libctx, NULL, "EC", tst->curve_name))
         || !TEST_int_ge(self_test_args.called, 3)
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_PRIV_KEY, &priv,
-                                        &priv_len))
+            &priv_len))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_EC_PUB_X, &pubx,
-                                        &pubx_len))
+            &pubx_len))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_EC_PUB_Y, &puby,
-                                        &puby_len)))
+            &puby_len)))
         goto err;
 
     test_output_memory("qy", puby, puby_len);
@@ -176,8 +177,8 @@ static int ecdsa_keygen_test(int id)
 }
 
 static int ecdsa_create_pkey(EVP_PKEY **pkey, const char *curve_name,
-                             const unsigned char *pub, size_t pub_len,
-                             int expected)
+    const unsigned char *pub, size_t pub_len,
+    int expected)
 {
     int ret = 0;
     EVP_PKEY_CTX *ctx = NULL;
@@ -187,16 +188,19 @@ static int ecdsa_create_pkey(EVP_PKEY **pkey, const char *curve_name,
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || (curve_name != NULL
             && !TEST_true(OSSL_PARAM_BLD_push_utf8_string(
-                              bld, OSSL_PKEY_PARAM_GROUP_NAME, curve_name, 0) > 0))
+                              bld, OSSL_PKEY_PARAM_GROUP_NAME, curve_name, 0)
+                > 0))
         || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                                                       OSSL_PKEY_PARAM_PUB_KEY,
-                                                       pub, pub_len) > 0)
+                          OSSL_PKEY_PARAM_PUB_KEY,
+                          pub, pub_len)
+            > 0)
         || !TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
         || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "EC", NULL))
         || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, pkey, EVP_PKEY_PUBLIC_KEY,
-                                          params), expected))
-    goto err;
+                            params),
+            expected))
+        goto err;
 
     ret = 1;
 err:
@@ -215,7 +219,7 @@ static int ecdsa_pub_verify_test(int id)
     EVP_PKEY *pkey = NULL;
 
     if (!TEST_true(ecdsa_create_pkey(&pkey, tst->curve_name,
-                                     tst->pub, tst->pub_len, tst->pass)))
+            tst->pub, tst->pub_len, tst->pass)))
         goto err;
 
     if (tst->pass) {
@@ -232,8 +236,8 @@ static int ecdsa_pub_verify_test(int id)
 
 /* Extract r and s  from an ecdsa signature */
 static int get_ecdsa_sig_rs_bytes(const unsigned char *sig, size_t sig_len,
-                                  unsigned char **r, unsigned char **s,
-                                  size_t *rlen, size_t *slen)
+    unsigned char **r, unsigned char **s,
+    size_t *rlen, size_t *slen)
 {
     int ret = 0;
     unsigned char *rbuf = NULL, *sbuf = NULL;
@@ -285,7 +289,7 @@ static int ecdsa_siggen_test(int id)
         goto err;
 
     if (!TEST_true(sig_gen(pkey, NULL, tst->digest_alg, tst->msg, tst->msg_len,
-                           &sig, &sig_len))
+            &sig, &sig_len))
         || !TEST_true(get_ecdsa_sig_rs_bytes(sig, sig_len, &r, &s, &rlen, &slen)))
         goto err;
     test_output_memory("r", r, rlen);
@@ -312,7 +316,7 @@ static int ecdsa_sigver_test(int id)
     const struct ecdsa_sigver_st *tst = &ecdsa_sigver_data[id];
 
     if (!TEST_true(ecdsa_create_pkey(&pkey, tst->curve_name,
-                                     tst->pub, tst->pub_len, 1)))
+            tst->pub, tst->pub_len, 1)))
         goto err;
 
     if (!TEST_ptr(sign = ECDSA_SIG_new())
@@ -325,11 +329,12 @@ static int ecdsa_sigver_test(int id)
     if (!TEST_int_gt((sig_len = i2d_ECDSA_SIG(sign, &sig)), 0)
         || !TEST_ptr(md_ctx = EVP_MD_CTX_new())
         || !TEST_true(EVP_DigestVerifyInit_ex(md_ctx, NULL, tst->digest_alg,
-                                              libctx, NULL, pkey, NULL))
+            libctx, NULL, pkey, NULL))
         || !TEST_ptr(pkey_ctx = EVP_MD_CTX_get_pkey_ctx(md_ctx))
         || !check_verify_message(pkey_ctx, 1)
         || !TEST_int_eq(EVP_DigestVerify(md_ctx, sig, sig_len,
-                                         tst->msg, tst->msg_len), tst->pass)
+                            tst->msg, tst->msg_len),
+            tst->pass)
         || !check_verify_message(pkey_ctx, 1)
         || !TEST_true(EVP_PKEY_verify_init(pkey_ctx))
         || !check_verify_message(pkey_ctx, 0))
@@ -344,7 +349,6 @@ static int ecdsa_sigver_test(int id)
     EVP_PKEY_free(pkey);
     EVP_MD_CTX_free(md_ctx);
     return ret;
-
 }
 
 static int ecdh_cofactor_derive_test(int tstid)
@@ -374,23 +378,23 @@ static int ecdh_cofactor_derive_test(int tstid)
     prms = NULL;
     if (t->key_cofactor != COFACTOR_NOT_SET) {
         params[0] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_USE_COFACTOR_ECDH,
-                                             &use_cofactordh);
+            &use_cofactordh);
         prms = params;
     }
     if (!TEST_int_eq(EVP_PKEY_set_params(peer1, prms), 1)
-            || !TEST_ptr(p1ctx = EVP_PKEY_CTX_new_from_pkey(libctx, peer1, NULL)))
+        || !TEST_ptr(p1ctx = EVP_PKEY_CTX_new_from_pkey(libctx, peer1, NULL)))
         goto err;
 
     prms = NULL;
     if (t->derive_cofactor_mode != COFACTOR_NOT_SET) {
         params[0] = OSSL_PARAM_construct_int(OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE,
-                                             &cofactor_mode);
+            &cofactor_mode);
         prms = params;
     }
     if (!TEST_int_eq(EVP_PKEY_derive_init_ex(p1ctx, prms), 1)
-            || !TEST_int_eq(EVP_PKEY_derive_set_peer(p1ctx, peer2), 1)
-            || !TEST_int_eq(EVP_PKEY_derive(p1ctx, secret1, &secret1_len),
-                            t->expected))
+        || !TEST_int_eq(EVP_PKEY_derive_set_peer(p1ctx, peer2), 1)
+        || !TEST_int_eq(EVP_PKEY_derive(p1ctx, secret1, &secret1_len),
+            t->expected))
         goto err;
 
     ret = 1;
@@ -399,8 +403,9 @@ static int ecdh_cofactor_derive_test(int tstid)
         static const char *state[] = { "unset", "-1", "disabled", "enabled" };
 
         TEST_note("ECDH derive() was expected to %s if key cofactor is"
-                  "%s and derive mode is %s", t->expected ? "Pass" : "Fail",
-                  state[2 + t->key_cofactor], state[2 + t->derive_cofactor_mode]);
+                  "%s and derive mode is %s",
+            t->expected ? "Pass" : "Fail",
+            state[2 + t->key_cofactor], state[2 + t->derive_cofactor_mode]);
     }
     EVP_PKEY_free(peer1);
     EVP_PKEY_free(peer2);
@@ -412,7 +417,7 @@ static int ecdh_cofactor_derive_test(int tstid)
 
 #if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECX)
 static int pkey_get_octet_bytes(EVP_PKEY *pkey, const char *name,
-                                unsigned char **out, size_t *out_len)
+    unsigned char **out, size_t *out_len)
 {
     size_t len = 0;
     unsigned char *buf = NULL;
@@ -436,8 +441,8 @@ static int pkey_get_octet_bytes(EVP_PKEY *pkey, const char *name,
 
 #ifndef OPENSSL_NO_ECX
 static int eddsa_create_pkey(EVP_PKEY **pkey, const char *algname,
-                             const unsigned char *pub, size_t pub_len,
-                             int expected)
+    const unsigned char *pub, size_t pub_len,
+    int expected)
 {
     int ret = 0;
     EVP_PKEY_CTX *ctx = NULL;
@@ -446,13 +451,15 @@ static int eddsa_create_pkey(EVP_PKEY **pkey, const char *algname,
 
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                                                       OSSL_PKEY_PARAM_PUB_KEY,
-                                                       pub, pub_len) > 0)
+                          OSSL_PKEY_PARAM_PUB_KEY,
+                          pub, pub_len)
+            > 0)
         || !TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
         || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, algname, NULL))
         || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, pkey, EVP_PKEY_PUBLIC_KEY,
-                                          params), expected))
+                            params),
+            expected))
         goto err;
 
     ret = 1;
@@ -471,11 +478,11 @@ static int eddsa_pub_verify_test(int id)
     EVP_PKEY *pkey = NULL;
 
     if (!TEST_true(eddsa_create_pkey(&pkey, tst->curve_name,
-                                     tst->pub, tst->pub_len, 1)))
+            tst->pub, tst->pub_len, 1)))
         goto err;
 
     if (!TEST_ptr(key_ctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, ""))
-            || !TEST_int_eq(EVP_PKEY_public_check(key_ctx), tst->pass))
+        || !TEST_int_eq(EVP_PKEY_public_check(key_ctx), tst->pass))
         goto err;
     ret = 1;
 err:
@@ -497,9 +504,9 @@ static int eddsa_keygen_test(int id)
     if (!TEST_ptr(pkey = EVP_PKEY_Q_keygen(libctx, NULL, tst->curve_name))
         || !TEST_int_ge(self_test_args.called, 3)
         || !TEST_true(pkey_get_octet_bytes(pkey, OSSL_PKEY_PARAM_PRIV_KEY,
-                                           &priv, &priv_len))
+            &priv, &priv_len))
         || !TEST_true(pkey_get_octet_bytes(pkey, OSSL_PKEY_PARAM_PUB_KEY, &pub,
-                                           &pub_len)))
+            &pub_len)))
         goto err;
 
     test_output_memory("q", pub, pub_len);
@@ -540,7 +547,7 @@ static EVP_PKEY *dsa_keygen(int L, int N)
 
     if (!TEST_ptr(param_key = dsa_paramgen(L, N))
         || !TEST_ptr(keygen_ctx = EVP_PKEY_CTX_new_from_pkey(libctx, param_key,
-                                                             NULL))
+                         NULL))
         || !TEST_int_gt(EVP_PKEY_keygen_init(keygen_ctx), 0)
         || !TEST_int_gt(EVP_PKEY_keygen(keygen_ctx, &key), 0))
         goto err;
@@ -563,15 +570,15 @@ static int dsa_keygen_test(int id)
         return TEST_skip("DSA signing is not allowed");
     if (!TEST_ptr(param_key = dsa_paramgen(tst->L, tst->N))
         || !TEST_ptr(keygen_ctx = EVP_PKEY_CTX_new_from_pkey(libctx, param_key,
-                                                             NULL))
+                         NULL))
         || !TEST_int_gt(EVP_PKEY_keygen_init(keygen_ctx), 0))
         goto err;
     for (i = 0; i < 2; ++i) {
         if (!TEST_int_gt(EVP_PKEY_keygen(keygen_ctx, &key), 0)
             || !TEST_true(pkey_get_bn_bytes(key, OSSL_PKEY_PARAM_PRIV_KEY,
-                                            &priv, &priv_len))
+                &priv, &priv_len))
             || !TEST_true(pkey_get_bn_bytes(key, OSSL_PKEY_PARAM_PUB_KEY,
-                                            &pub, &pub_len)))
+                &pub, &pub_len)))
             goto err;
         test_output_memory("y", pub, pub_len);
         test_output_memory("x", priv, priv_len);
@@ -605,7 +612,7 @@ static int dsa_paramgen_test(int id)
         || !TEST_int_gt(EVP_PKEY_paramgen_init(paramgen_ctx), 0)
         || !TEST_true(EVP_PKEY_CTX_set_dsa_paramgen_bits(paramgen_ctx, tst->L))
         || !TEST_true(EVP_PKEY_CTX_set_dsa_paramgen_q_bits(paramgen_ctx,
-                                                           tst->N)))
+            tst->N)))
         goto err;
 
     if (!dsasign_allowed) {
@@ -614,15 +621,15 @@ static int dsa_paramgen_test(int id)
     } else {
         if (!TEST_true(EVP_PKEY_paramgen(paramgen_ctx, &param_key))
             || !TEST_true(pkey_get_bn_bytes(param_key, OSSL_PKEY_PARAM_FFC_P,
-                                            &p, &plen))
+                &p, &plen))
             || !TEST_true(pkey_get_bn_bytes(param_key, OSSL_PKEY_PARAM_FFC_Q,
-                                            &q, &qlen))
+                &q, &qlen))
             || !TEST_true(pkey_get_octet_bytes(param_key,
-                                               OSSL_PKEY_PARAM_FFC_SEED,
-                                               &seed, &seedlen))
+                OSSL_PKEY_PARAM_FFC_SEED,
+                &seed, &seedlen))
             || !TEST_true(EVP_PKEY_get_int_param(param_key,
-                                                 OSSL_PKEY_PARAM_FFC_PCOUNTER,
-                                                 &counter)))
+                OSSL_PKEY_PARAM_FFC_PCOUNTER,
+                &counter)))
             goto err;
         test_output_memory("p", p, plen);
         test_output_memory("q", q, qlen);
@@ -640,14 +647,14 @@ static int dsa_paramgen_test(int id)
 }
 
 static int dsa_create_pkey(EVP_PKEY **pkey,
-                           const unsigned char *p, size_t p_len,
-                           const unsigned char *q, size_t q_len,
-                           const unsigned char *g, size_t g_len,
-                           const unsigned char *seed, size_t seed_len,
-                           int counter,
-                           int validate_pq, int validate_g,
-                           const unsigned char *pub, size_t pub_len,
-                           BN_CTX *bn_ctx)
+    const unsigned char *p, size_t p_len,
+    const unsigned char *q, size_t q_len,
+    const unsigned char *g, size_t g_len,
+    const unsigned char *seed, size_t seed_len,
+    int counter,
+    int validate_pq, int validate_g,
+    const unsigned char *pub, size_t pub_len,
+    BN_CTX *bn_ctx)
 {
     int ret = 0;
     EVP_PKEY_CTX *ctx = NULL;
@@ -659,49 +666,50 @@ static int dsa_create_pkey(EVP_PKEY **pkey,
         || !TEST_ptr(p_bn = BN_CTX_get(bn_ctx))
         || !TEST_ptr(BN_bin2bn(p, p_len, p_bn))
         || !TEST_true(OSSL_PARAM_BLD_push_int(bld,
-                                              OSSL_PKEY_PARAM_FFC_VALIDATE_PQ,
-                                              validate_pq))
+            OSSL_PKEY_PARAM_FFC_VALIDATE_PQ,
+            validate_pq))
         || !TEST_true(OSSL_PARAM_BLD_push_int(bld,
-                                              OSSL_PKEY_PARAM_FFC_VALIDATE_G,
-                                              validate_g))
+            OSSL_PKEY_PARAM_FFC_VALIDATE_G,
+            validate_g))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_P, p_bn))
         || !TEST_ptr(q_bn = BN_CTX_get(bn_ctx))
         || !TEST_ptr(BN_bin2bn(q, q_len, q_bn))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_Q, q_bn)))
         goto err;
 
-     if (g != NULL) {
-         if (!TEST_ptr(g_bn = BN_CTX_get(bn_ctx))
-             || !TEST_ptr(BN_bin2bn(g, g_len, g_bn))
-             || !TEST_true(OSSL_PARAM_BLD_push_BN(bld,
-                                                  OSSL_PKEY_PARAM_FFC_G, g_bn)))
-             goto err;
-     }
-     if (seed != NULL) {
-         if (!TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                            OSSL_PKEY_PARAM_FFC_SEED, seed, seed_len)))
-             goto err;
-     }
-     if (counter != -1) {
-         if (!TEST_true(OSSL_PARAM_BLD_push_int(bld,
-                                                OSSL_PKEY_PARAM_FFC_PCOUNTER,
-                                                counter)))
-             goto err;
-     }
-     if (pub != NULL) {
-         if (!TEST_ptr(pub_bn = BN_CTX_get(bn_ctx))
-             || !TEST_ptr(BN_bin2bn(pub, pub_len, pub_bn))
-             || !TEST_true(OSSL_PARAM_BLD_push_BN(bld,
-                                                  OSSL_PKEY_PARAM_PUB_KEY,
-                                                  pub_bn)))
-             goto err;
-     }
-     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
-         || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "DSA", NULL))
-         || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
-         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, pkey, EVP_PKEY_PUBLIC_KEY,
-                                           params), 1))
-         goto err;
+    if (g != NULL) {
+        if (!TEST_ptr(g_bn = BN_CTX_get(bn_ctx))
+            || !TEST_ptr(BN_bin2bn(g, g_len, g_bn))
+            || !TEST_true(OSSL_PARAM_BLD_push_BN(bld,
+                OSSL_PKEY_PARAM_FFC_G, g_bn)))
+            goto err;
+    }
+    if (seed != NULL) {
+        if (!TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
+                OSSL_PKEY_PARAM_FFC_SEED, seed, seed_len)))
+            goto err;
+    }
+    if (counter != -1) {
+        if (!TEST_true(OSSL_PARAM_BLD_push_int(bld,
+                OSSL_PKEY_PARAM_FFC_PCOUNTER,
+                counter)))
+            goto err;
+    }
+    if (pub != NULL) {
+        if (!TEST_ptr(pub_bn = BN_CTX_get(bn_ctx))
+            || !TEST_ptr(BN_bin2bn(pub, pub_len, pub_bn))
+            || !TEST_true(OSSL_PARAM_BLD_push_BN(bld,
+                OSSL_PKEY_PARAM_PUB_KEY,
+                pub_bn)))
+            goto err;
+    }
+    if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
+        || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "DSA", NULL))
+        || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
+        || !TEST_int_eq(EVP_PKEY_fromdata(ctx, pkey, EVP_PKEY_PUBLIC_KEY,
+                            params),
+            1))
+        goto err;
 
     ret = 1;
 err:
@@ -721,13 +729,13 @@ static int dsa_pqver_test(int id)
 
     if (!TEST_ptr(bn_ctx = BN_CTX_new_ex(libctx))
         || !TEST_true(dsa_create_pkey(&param_key, tst->p, tst->p_len,
-                                      tst->q, tst->q_len, NULL, 0,
-                                      tst->seed, tst->seed_len, tst->counter,
-                                      1, 0,
-                                      NULL, 0,
-                                      bn_ctx))
+            tst->q, tst->q_len, NULL, 0,
+            tst->seed, tst->seed_len, tst->counter,
+            1, 0,
+            NULL, 0,
+            bn_ctx))
         || !TEST_ptr(key_ctx = EVP_PKEY_CTX_new_from_pkey(libctx, param_key,
-                                                          NULL))
+                         NULL))
         || !TEST_int_eq(EVP_PKEY_param_check(key_ctx), tst->pass))
         goto err;
 
@@ -741,8 +749,8 @@ static int dsa_pqver_test(int id)
 
 /* Extract r and s from a dsa signature */
 static int get_dsa_sig_rs_bytes(const unsigned char *sig, size_t sig_len,
-                                unsigned char **r, unsigned char **s,
-                                size_t *r_len, size_t *s_len)
+    unsigned char **r, unsigned char **s,
+    size_t *r_len, size_t *s_len)
 {
     int ret = 0;
     unsigned char *rbuf = NULL, *sbuf = NULL;
@@ -795,7 +803,7 @@ static int dsa_siggen_test(int id)
         if (!TEST_ptr(pkey = dsa_keygen(tst->L, tst->N)))
             goto err;
         if (!TEST_true(sig_gen(pkey, NULL, tst->digest_alg, tst->msg, tst->msg_len,
-                               &sig, &sig_len))
+                &sig, &sig_len))
             || !TEST_true(get_dsa_sig_rs_bytes(sig, sig_len, &r, &s, &rlen, &slen)))
             goto err;
         test_output_memory("r", r, rlen);
@@ -823,13 +831,13 @@ static int dsa_sigver_test(int id)
     unsigned char digest[EVP_MAX_MD_SIZE];
     unsigned int digest_len;
     BN_CTX *bn_ctx = NULL;
-    const struct dsa_sigver_st *tst  = &dsa_sigver_data[id];
+    const struct dsa_sigver_st *tst = &dsa_sigver_data[id];
 
     if (!TEST_ptr(bn_ctx = BN_CTX_new())
         || !TEST_true(dsa_create_pkey(&pkey, tst->p, tst->p_len,
-                                      tst->q, tst->q_len, tst->g, tst->g_len,
-                                      NULL, 0, 0, 0, 0, tst->pub, tst->pub_len,
-                                      bn_ctx)))
+            tst->q, tst->q_len, tst->g, tst->g_len,
+            NULL, 0, 0, 0, 0, tst->pub, tst->pub_len,
+            bn_ctx)))
         goto err;
 
     if (!TEST_ptr(sign = DSA_SIG_new())
@@ -841,14 +849,14 @@ static int dsa_sigver_test(int id)
 
     if (!TEST_ptr(md = EVP_MD_fetch(libctx, tst->digest_alg, ""))
         || !TEST_true(EVP_Digest(tst->msg, tst->msg_len,
-                                 digest, &digest_len, md, NULL)))
+            digest, &digest_len, md, NULL)))
         goto err;
 
     if (!TEST_int_gt((sig_len = i2d_DSA_SIG(sign, &sig)), 0)
         || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, ""))
         || !TEST_int_gt(EVP_PKEY_verify_init(ctx), 0)
         || !TEST_int_eq(EVP_PKEY_verify(ctx, sig, sig_len, digest, digest_len),
-                        tst->pass))
+            tst->pass))
         goto err;
     ret = 1;
 err:
@@ -864,14 +872,13 @@ static int dsa_sigver_test(int id)
 }
 #endif /* OPENSSL_NO_DSA */
 
-
 /* cipher encrypt/decrypt */
 static int cipher_enc(const char *alg,
-                      const unsigned char *pt, size_t pt_len,
-                      const unsigned char *key, size_t key_len,
-                      const unsigned char *iv, size_t iv_len,
-                      const unsigned char *ct, size_t ct_len,
-                      int enc)
+    const unsigned char *pt, size_t pt_len,
+    const unsigned char *key, size_t key_len,
+    const unsigned char *iv, size_t iv_len,
+    const unsigned char *ct, size_t ct_len,
+    int enc)
 {
     int ret = 0, out_len = 0, len = 0;
     EVP_CIPHER_CTX *ctx = NULL;
@@ -902,23 +909,23 @@ static int cipher_enc_dec_test(int id)
     const int enc = 1;
 
     return TEST_true(cipher_enc(tst->alg, tst->pt, tst->pt_len,
-                                tst->key, tst->key_len,
-                                tst->iv, tst->iv_len,
-                                tst->ct, tst->ct_len, enc))
-           && TEST_true(cipher_enc(tst->alg, tst->ct, tst->ct_len,
-                                   tst->key, tst->key_len,
-                                   tst->iv, tst->iv_len,
-                                   tst->pt, tst->pt_len, !enc));
+               tst->key, tst->key_len,
+               tst->iv, tst->iv_len,
+               tst->ct, tst->ct_len, enc))
+        && TEST_true(cipher_enc(tst->alg, tst->ct, tst->ct_len,
+            tst->key, tst->key_len,
+            tst->iv, tst->iv_len,
+            tst->pt, tst->pt_len, !enc));
 }
 
 static int aes_ccm_enc_dec(const char *alg,
-                           const unsigned char *pt, size_t pt_len,
-                           const unsigned char *key, size_t key_len,
-                           const unsigned char *iv, size_t iv_len,
-                           const unsigned char *aad, size_t aad_len,
-                           const unsigned char *ct, size_t ct_len,
-                           const unsigned char *tag, size_t tag_len,
-                           int enc, int pass)
+    const unsigned char *pt, size_t pt_len,
+    const unsigned char *key, size_t key_len,
+    const unsigned char *iv, size_t iv_len,
+    const unsigned char *aad, size_t aad_len,
+    const unsigned char *ct, size_t ct_len,
+    const unsigned char *tag, size_t tag_len,
+    int enc, int pass)
 {
     int ret = 0;
     EVP_CIPHER_CTX *ctx;
@@ -927,15 +934,17 @@ static int aes_ccm_enc_dec(const char *alg,
     unsigned char out[1024];
 
     TEST_note("%s : %s : expected to %s", alg, enc ? "encrypt" : "decrypt",
-              pass ? "pass" : "fail");
+        pass ? "pass" : "fail");
 
     if (!TEST_ptr(ctx = EVP_CIPHER_CTX_new())
         || !TEST_ptr(cipher = EVP_CIPHER_fetch(libctx, alg, ""))
         || !TEST_true(EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc))
         || !TEST_int_gt(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, iv_len,
-                                          NULL), 0)
+                            NULL),
+            0)
         || !TEST_int_gt(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len,
-                                          enc ? NULL : (void *)tag), 0)
+                            enc ? NULL : (void *)tag),
+            0)
         || !TEST_true(EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc))
         || !TEST_true(EVP_CIPHER_CTX_set_padding(ctx, 0))
         || !TEST_true(EVP_CipherUpdate(ctx, NULL, &len, NULL, pt_len))
@@ -952,7 +961,8 @@ static int aes_ccm_enc_dec(const char *alg,
     if (enc) {
         out_len += len;
         if (!TEST_int_gt(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG,
-                                           tag_len, out + out_len), 0)
+                             tag_len, out + out_len),
+                0)
             || !TEST_mem_eq(out, out_len, ct, ct_len)
             || !TEST_mem_eq(out + out_len, tag_len, tag, tag_len))
             goto err;
@@ -983,31 +993,31 @@ static int aes_ccm_enc_dec_test(int id)
         return 0;
 
     return aes_ccm_enc_dec(tst->alg, tst->pt, tst->pt_len,
-                           tst->key, tst->key_len,
-                           tst->iv, tst->iv_len, tst->aad, tst->aad_len,
-                           tst->ct, ct_len, tag, tag_len, enc, pass)
-            && aes_ccm_enc_dec(tst->alg, tst->ct, ct_len,
-                               tst->key, tst->key_len,
-                               tst->iv, tst->iv_len, tst->aad, tst->aad_len,
-                               tst->pt, tst->pt_len, tag, tag_len, !enc, pass)
-            /* test that it fails if the tag is incorrect */
-            && aes_ccm_enc_dec(tst->alg, tst->ct, ct_len,
-                               tst->key, tst->key_len,
-                               tst->iv, tst->iv_len, tst->aad, tst->aad_len,
-                               tst->pt, tst->pt_len,
-                               tag - 1, tag_len, !enc, !pass);
+               tst->key, tst->key_len,
+               tst->iv, tst->iv_len, tst->aad, tst->aad_len,
+               tst->ct, ct_len, tag, tag_len, enc, pass)
+        && aes_ccm_enc_dec(tst->alg, tst->ct, ct_len,
+            tst->key, tst->key_len,
+            tst->iv, tst->iv_len, tst->aad, tst->aad_len,
+            tst->pt, tst->pt_len, tag, tag_len, !enc, pass)
+        /* test that it fails if the tag is incorrect */
+        && aes_ccm_enc_dec(tst->alg, tst->ct, ct_len,
+            tst->key, tst->key_len,
+            tst->iv, tst->iv_len, tst->aad, tst->aad_len,
+            tst->pt, tst->pt_len,
+            tag - 1, tag_len, !enc, !pass);
 }
 
 static int aes_gcm_enc_dec(const char *alg,
-                           const unsigned char *pt, size_t pt_len,
-                           const unsigned char *key, size_t key_len,
-                           const unsigned char *iv, size_t iv_len,
-                           const unsigned char *aad, size_t aad_len,
-                           const unsigned char *ct, size_t ct_len,
-                           const unsigned char *tag, size_t tag_len,
-                           int enc, int pass,
-                           unsigned char *out, int *out_len,
-                           unsigned char *outiv)
+    const unsigned char *pt, size_t pt_len,
+    const unsigned char *key, size_t key_len,
+    const unsigned char *iv, size_t iv_len,
+    const unsigned char *aad, size_t aad_len,
+    const unsigned char *ct, size_t ct_len,
+    const unsigned char *tag, size_t tag_len,
+    int enc, int pass,
+    unsigned char *out, int *out_len,
+    unsigned char *outiv)
 {
     int ret = 0;
     EVP_CIPHER_CTX *ctx;
@@ -1015,18 +1025,20 @@ static int aes_gcm_enc_dec(const char *alg,
     int olen, len;
 
     TEST_note("%s : %s : expected to %s", alg, enc ? "encrypt" : "decrypt",
-              pass ? "pass" : "fail");
+        pass ? "pass" : "fail");
 
     if (!TEST_ptr(ctx = EVP_CIPHER_CTX_new())
         || !TEST_ptr(cipher = EVP_CIPHER_fetch(libctx, alg, ""))
         || !TEST_true(EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc))
         || !TEST_int_gt(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, iv_len,
-                                          NULL), 0))
+                            NULL),
+            0))
         goto err;
 
     if (!enc) {
         if (!TEST_int_gt(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len,
-                                           (void *)tag), 0))
+                             (void *)tag),
+                0))
             goto err;
     }
     /*
@@ -1049,10 +1061,11 @@ static int aes_gcm_enc_dec(const char *alg,
     olen += len;
     if (enc) {
         if ((ct != NULL && !TEST_mem_eq(out, olen, ct, ct_len))
-                || !TEST_int_gt(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG,
-                                                    tag_len, out + olen), 0)
-                || (tag != NULL
-                    && !TEST_mem_eq(out + olen, tag_len, tag, tag_len)))
+            || !TEST_int_gt(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG,
+                                tag_len, out + olen),
+                0)
+            || (tag != NULL
+                && !TEST_mem_eq(out + olen, tag_len, tag, tag_len)))
             goto err;
     } else {
         if (ct != NULL && !TEST_mem_eq(out, olen, ct, ct_len))
@@ -1071,11 +1084,11 @@ static int aes_gcm_enc_dec(const char *alg,
             *p++ = OSSL_PARAM_construct_uint(ivgenkey, &iv_generated);
         if (outiv != NULL)
             *p = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_IV,
-                                                   outiv, iv_len);
+                outiv, iv_len);
         if (!TEST_true(EVP_CIPHER_CTX_get_params(ctx, params)))
             goto err;
         if (ivgen != 0
-                && !TEST_uint_eq(iv_generated, (enc == 0 || iv != NULL ? 0 : 1)))
+            && !TEST_uint_eq(iv_generated, (enc == 0 || iv != NULL ? 0 : 1)))
             goto err;
     }
     if (out_len != NULL)
@@ -1096,21 +1109,21 @@ static int aes_gcm_enc_dec_test(int id)
     unsigned char out[1024];
 
     return aes_gcm_enc_dec(tst->alg, tst->pt, tst->pt_len,
-                           tst->key, tst->key_len,
-                           tst->iv, tst->iv_len, tst->aad, tst->aad_len,
-                           tst->ct, tst->ct_len, tst->tag, tst->tag_len,
-                           enc, pass, out, NULL, NULL)
-            && aes_gcm_enc_dec(tst->alg, tst->ct, tst->ct_len,
-                               tst->key, tst->key_len,
-                               tst->iv, tst->iv_len, tst->aad, tst->aad_len,
-                               tst->pt, tst->pt_len, tst->tag, tst->tag_len,
-                               !enc, pass, out, NULL, NULL)
-            /* Fail if incorrect tag passed to decrypt */
-            && aes_gcm_enc_dec(tst->alg, tst->ct, tst->ct_len,
-                               tst->key, tst->key_len,
-                               tst->iv, tst->iv_len, tst->aad, tst->aad_len,
-                               tst->pt, tst->pt_len, tst->aad, tst->tag_len,
-                               !enc, !pass, out, NULL, NULL);
+               tst->key, tst->key_len,
+               tst->iv, tst->iv_len, tst->aad, tst->aad_len,
+               tst->ct, tst->ct_len, tst->tag, tst->tag_len,
+               enc, pass, out, NULL, NULL)
+        && aes_gcm_enc_dec(tst->alg, tst->ct, tst->ct_len,
+            tst->key, tst->key_len,
+            tst->iv, tst->iv_len, tst->aad, tst->aad_len,
+            tst->pt, tst->pt_len, tst->tag, tst->tag_len,
+            !enc, pass, out, NULL, NULL)
+        /* Fail if incorrect tag passed to decrypt */
+        && aes_gcm_enc_dec(tst->alg, tst->ct, tst->ct_len,
+            tst->key, tst->key_len,
+            tst->iv, tst->iv_len, tst->aad, tst->aad_len,
+            tst->pt, tst->pt_len, tst->aad, tst->tag_len,
+            !enc, !pass, out, NULL, NULL);
 }
 
 static int aes_gcm_gen_iv_internal_test(void)
@@ -1123,22 +1136,22 @@ static int aes_gcm_gen_iv_internal_test(void)
     unsigned char iv[16];
 
     return aes_gcm_enc_dec(tst->alg, tst->pt, tst->pt_len,
-                           tst->key, tst->key_len,
-                           NULL, tst->iv_len, tst->aad, tst->aad_len,
-                           NULL, tst->ct_len, NULL, tst->tag_len,
-                           enc, pass, out, &out_len, iv)
-            && aes_gcm_enc_dec(tst->alg, out, out_len,
-                               tst->key, tst->key_len,
-                               iv, tst->iv_len, tst->aad, tst->aad_len,
-                               tst->pt, tst->pt_len, out + out_len, tst->tag_len,
-                               !enc, pass, out, NULL, NULL);
+               tst->key, tst->key_len,
+               NULL, tst->iv_len, tst->aad, tst->aad_len,
+               NULL, tst->ct_len, NULL, tst->tag_len,
+               enc, pass, out, &out_len, iv)
+        && aes_gcm_enc_dec(tst->alg, out, out_len,
+            tst->key, tst->key_len,
+            iv, tst->iv_len, tst->aad, tst->aad_len,
+            tst->pt, tst->pt_len, out + out_len, tst->tag_len,
+            !enc, pass, out, NULL, NULL);
 }
 
 #ifndef OPENSSL_NO_DH
 static int dh_create_pkey(EVP_PKEY **pkey, const char *group_name,
-                          const unsigned char *pub, size_t pub_len,
-                          const unsigned char *priv, size_t priv_len,
-                          BN_CTX *bn_ctx, int pass)
+    const unsigned char *pub, size_t pub_len,
+    const unsigned char *priv, size_t priv_len,
+    BN_CTX *bn_ctx, int pass)
 {
     int ret = 0;
     EVP_PKEY_CTX *ctx = NULL;
@@ -1149,22 +1162,23 @@ static int dh_create_pkey(EVP_PKEY **pkey, const char *group_name,
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || (group_name != NULL
             && !TEST_int_gt(OSSL_PARAM_BLD_push_utf8_string(
-                              bld, OSSL_PKEY_PARAM_GROUP_NAME,
-                              group_name, 0), 0)))
+                                bld, OSSL_PKEY_PARAM_GROUP_NAME,
+                                group_name, 0),
+                0)))
         goto err;
 
     if (pub != NULL) {
         if (!TEST_ptr(pub_bn = BN_CTX_get(bn_ctx))
             || !TEST_ptr(BN_bin2bn(pub, pub_len, pub_bn))
             || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PUB_KEY,
-                                                 pub_bn)))
+                pub_bn)))
             goto err;
     }
     if (priv != NULL) {
         if (!TEST_ptr(priv_bn = BN_CTX_get(bn_ctx))
             || !TEST_ptr(BN_bin2bn(priv, priv_len, priv_bn))
             || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY,
-                                                 priv_bn)))
+                priv_bn)))
             goto err;
     }
 
@@ -1172,8 +1186,8 @@ static int dh_create_pkey(EVP_PKEY **pkey, const char *group_name,
         || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "DH", NULL))
         || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, pkey, EVP_PKEY_KEYPAIR, params),
-                        pass))
-    goto err;
+            pass))
+        goto err;
 
     ret = 1;
 err:
@@ -1195,7 +1209,7 @@ static int dh_safe_prime_keygen_test(int id)
     const struct dh_safe_prime_keygen_st *tst = &dh_safe_prime_keygen_data[id];
 
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                 (char *)tst->group_name, 0);
+        (char *)tst->group_name, 0);
     params[1] = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "DH", NULL))
@@ -1203,9 +1217,9 @@ static int dh_safe_prime_keygen_test(int id)
         || !TEST_true(EVP_PKEY_CTX_set_params(ctx, params))
         || !TEST_int_gt(EVP_PKEY_keygen(ctx, &pkey), 0)
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_PRIV_KEY,
-                                        &priv, &priv_len))
+            &priv, &priv_len))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_PUB_KEY,
-                                        &pub, &pub_len)))
+            &pub, &pub_len)))
         goto err;
 
     test_output_memory("x", priv, priv_len);
@@ -1229,8 +1243,8 @@ static int dh_safe_prime_keyver_test(int id)
 
     if (!TEST_ptr(bn_ctx = BN_CTX_new_ex(libctx))
         || !TEST_true(dh_create_pkey(&pkey, tst->group_name,
-                                     tst->pub, tst->pub_len,
-                                     tst->priv, tst->priv_len, bn_ctx, 1))
+            tst->pub, tst->pub_len,
+            tst->priv, tst->priv_len, bn_ctx, 1))
         || !TEST_ptr(key_ctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey, ""))
         || !TEST_int_eq(EVP_PKEY_check(key_ctx), tst->pass))
         goto err;
@@ -1244,12 +1258,11 @@ static int dh_safe_prime_keyver_test(int id)
 }
 #endif /* OPENSSL_NO_DH */
 
-
 static int rsa_create_pkey(EVP_PKEY **pkey,
-                           const unsigned char *n, size_t n_len,
-                           const unsigned char *e, size_t e_len,
-                           const unsigned char *d, size_t d_len,
-                           BN_CTX *bn_ctx)
+    const unsigned char *n, size_t n_len,
+    const unsigned char *e, size_t e_len,
+    const unsigned char *d, size_t d_len,
+    BN_CTX *bn_ctx)
 {
     int ret = 0;
     EVP_PKEY_CTX *ctx = NULL;
@@ -1267,21 +1280,21 @@ static int rsa_create_pkey(EVP_PKEY **pkey,
         if (!TEST_ptr(e_bn = BN_CTX_get(bn_ctx))
             || !TEST_ptr(BN_bin2bn(e, e_len, e_bn))
             || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_E,
-                          e_bn)))
+                e_bn)))
             goto err;
     }
     if (d != NULL) {
         if (!TEST_ptr(d_bn = BN_CTX_get(bn_ctx))
             || !TEST_ptr(BN_bin2bn(d, d_len, d_bn))
             || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_D,
-                          d_bn)))
+                d_bn)))
             goto err;
     }
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
         || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "RSA", NULL))
         || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, pkey, EVP_PKEY_KEYPAIR, params),
-                        1))
+            1))
         goto err;
 
     ret = 1;
@@ -1318,17 +1331,17 @@ static int rsa_keygen_test(int id)
         || !TEST_ptr(xq2_bn = BN_bin2bn(tst->xq2, tst->xq2_len, NULL))
         || !TEST_ptr(xq_bn = BN_bin2bn(tst->xq, tst->xq_len, NULL))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_TEST_XP1,
-                                             xp1_bn))
+            xp1_bn))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_TEST_XP2,
-                                             xp2_bn))
+            xp2_bn))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_TEST_XP,
-                                             xp_bn))
+            xp_bn))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_TEST_XQ1,
-                                             xq1_bn))
+            xq1_bn))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_TEST_XQ2,
-                                             xq2_bn))
+            xq2_bn))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_TEST_XQ,
-                                             xq_bn))
+            xq_bn))
         || !TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld)))
         goto err;
 
@@ -1340,21 +1353,21 @@ static int rsa_keygen_test(int id)
         || !TEST_int_gt(EVP_PKEY_CTX_set1_rsa_keygen_pubexp(ctx, e_bn), 0)
         || !TEST_int_gt(EVP_PKEY_keygen(ctx, &pkey), 0)
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_TEST_P1,
-                                        &p1, &p1_len))
+            &p1, &p1_len))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_TEST_P2,
-                                        &p2, &p2_len))
+            &p2, &p2_len))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_TEST_Q1,
-                                        &q1, &q1_len))
+            &q1, &q1_len))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_TEST_Q2,
-                                        &q2, &q2_len))
+            &q2, &q2_len))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_FACTOR1,
-                                        &p, &p_len))
+            &p, &p_len))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_FACTOR2,
-                                        &q, &q_len))
+            &q, &q_len))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_N,
-                                        &n, &n_len))
+            &n, &n_len))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_D,
-                                        &d, &d_len)))
+            &d, &d_len)))
         goto err;
 
     if (!TEST_mem_eq(tst->p1, tst->p1_len, p1, p1_len)
@@ -1410,27 +1423,27 @@ static int rsa_siggen_test(int id)
     int salt_len = tst->pss_salt_len;
 
     if (!rsa_sign_x931_pad_allowed
-            && (strcmp(tst->sig_pad_mode, OSSL_PKEY_RSA_PAD_MODE_X931) == 0))
+        && (strcmp(tst->sig_pad_mode, OSSL_PKEY_RSA_PAD_MODE_X931) == 0))
         return TEST_skip("x931 signing is not allowed");
 
     TEST_note("RSA %s signature generation", tst->sig_pad_mode);
 
     p = params;
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_PAD_MODE,
-                                            (char *)tst->sig_pad_mode, 0);
+        (char *)tst->sig_pad_mode, 0);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_DIGEST,
-                                            (char *)tst->digest_alg, 0);
+        (char *)tst->digest_alg, 0);
     if (salt_len >= 0)
         *p++ = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_PSS_SALTLEN,
-                                        &salt_len);
+            &salt_len);
     *p++ = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(pkey = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", tst->mod))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_N, &n, &n_len))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_E, &e, &e_len))
         || !TEST_true(sig_gen(pkey, params, tst->digest_alg,
-                              tst->msg, tst->msg_len,
-                              &sig, &sig_len)))
+            tst->msg, tst->msg_len,
+            &sig, &sig_len)))
         goto err;
     test_output_memory("n", n, n_len);
     test_output_memory("e", e, e_len);
@@ -1452,33 +1465,34 @@ static int rsa_sigver_test(int id)
     EVP_MD_CTX *md_ctx = NULL;
     BN_CTX *bn_ctx = NULL;
     OSSL_PARAM params[4], *p;
-    const struct rsa_sigver_st *tst  = &rsa_sigver_data[id];
+    const struct rsa_sigver_st *tst = &rsa_sigver_data[id];
     int salt_len = tst->pss_salt_len;
 
     TEST_note("RSA %s Signature Verify : expected to %s ", tst->sig_pad_mode,
-               tst->pass == PASS ? "pass" : "fail");
+        tst->pass == PASS ? "pass" : "fail");
 
     p = params;
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_PAD_MODE,
-                                            (char *)tst->sig_pad_mode, 0);
+        (char *)tst->sig_pad_mode, 0);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_DIGEST,
-                                            (char *)tst->digest_alg, 0);
+        (char *)tst->digest_alg, 0);
     if (salt_len >= 0)
         *p++ = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_PSS_SALTLEN,
-                                        &salt_len);
+            &salt_len);
     *p = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(bn_ctx = BN_CTX_new())
         || !TEST_true(rsa_create_pkey(&pkey, tst->n, tst->n_len,
-                                      tst->e, tst->e_len, NULL, 0, bn_ctx))
+            tst->e, tst->e_len, NULL, 0, bn_ctx))
         || !TEST_ptr(md_ctx = EVP_MD_CTX_new())
         || !TEST_true(EVP_DigestVerifyInit_ex(md_ctx, &pkey_ctx,
-                                              tst->digest_alg, libctx, NULL,
-                                              pkey, NULL))
+            tst->digest_alg, libctx, NULL,
+            pkey, NULL))
         || !check_verify_message(pkey_ctx, 1)
         || !TEST_true(EVP_PKEY_CTX_set_params(pkey_ctx, params))
         || !TEST_int_eq(EVP_DigestVerify(md_ctx, tst->sig, tst->sig_len,
-                                         tst->msg, tst->msg_len), tst->pass)
+                            tst->msg, tst->msg_len),
+            tst->pass)
         || !check_verify_message(pkey_ctx, 1)
         || !TEST_true(EVP_PKEY_verify_init(pkey_ctx))
         || !check_verify_message(pkey_ctx, 0))
@@ -1502,7 +1516,7 @@ static int rsa_decryption_primitive_test(int id)
     unsigned char *n = NULL, *e = NULL;
     size_t n_len = 0, e_len = 0;
     BN_CTX *bn_ctx = NULL;
-    const struct rsa_decrypt_prim_st *tst  = &rsa_decrypt_prim_data[id];
+    const struct rsa_decrypt_prim_st *tst = &rsa_decrypt_prim_data[id];
 
     if (!TEST_ptr(pkey = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", (size_t)2048))
         || !TEST_true(pkey_get_bn_bytes(pkey, OSSL_PKEY_PARAM_RSA_N, &n, &n_len))
@@ -1568,7 +1582,7 @@ static int drbg_test(int id)
     unsigned char returned_bits[64];
     const size_t returned_bits_len = sizeof(returned_bits);
     unsigned int strength = 256;
-    const struct drbg_st *tst  = &drbg_data[id];
+    const struct drbg_st *tst = &drbg_data[id];
     int res = 0;
 
     /* Create the seed source */
@@ -1590,20 +1604,20 @@ static int drbg_test(int id)
 
     /* Set the DRBG up */
     params[0] = OSSL_PARAM_construct_int(OSSL_DRBG_PARAM_USE_DF,
-                                         (int *)&tst->use_df);
+        (int *)&tst->use_df);
     params[1] = OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_CIPHER,
-                                                 (char *)tst->cipher, 0);
+        (char *)tst->cipher, 0);
     params[2] = OSSL_PARAM_construct_end();
     if (!TEST_true(EVP_RAND_CTX_set_params(ctx, params)))
         goto err;
 
     /* Feed in the entropy and nonce */
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                                  (void *)tst->entropy_input,
-                                                  tst->entropy_input_len);
+        (void *)tst->entropy_input,
+        tst->entropy_input_len);
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_NONCE,
-                                                  (void *)tst->nonce,
-                                                  tst->nonce_len);
+        (void *)tst->nonce,
+        tst->nonce_len);
     params[2] = OSSL_PARAM_construct_end();
     if (!TEST_true(EVP_RAND_CTX_set_params(parent, params)))
         goto err;
@@ -1615,9 +1629,9 @@ static int drbg_test(int id)
      */
     if (!TEST_true(EVP_RAND_instantiate(ctx, 0, 0, (void *)"", 0, NULL))
         || !TEST_true(EVP_RAND_generate(ctx, returned_bits, returned_bits_len,
-                                        0, 0, NULL, 0))
+            0, 0, NULL, 0))
         || !TEST_true(EVP_RAND_generate(ctx, returned_bits, returned_bits_len,
-                                        0, 0, NULL, 0)))
+            0, 0, NULL, 0)))
         goto err;
 
     test_output_memory("returned bits", returned_bits, returned_bits_len);
@@ -1629,7 +1643,7 @@ static int drbg_test(int id)
 
     /* Verify the output */
     if (!TEST_mem_eq(returned_bits, returned_bits_len,
-                     tst->returned_bits, tst->returned_bits_len))
+            tst->returned_bits, tst->returned_bits_len))
         goto err;
     res = 1;
 err:
@@ -1673,7 +1687,7 @@ static int aes_cfb1_bits_test(void)
         goto err;
     if (!TEST_ptr(params = EVP_CIPHER_CTX_settable_params(ctx))
         || !TEST_ptr(p = OSSL_PARAM_locate_const(params,
-                                                 OSSL_CIPHER_PARAM_USE_BITS)))
+                         OSSL_CIPHER_PARAM_USE_BITS)))
         goto err;
     EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS);
     if (!TEST_int_gt(EVP_CipherUpdate(ctx, out, &outlen, pt, 7), 0))
@@ -1701,7 +1715,7 @@ int setup_tests(void)
             config_file = opt_arg();
             break;
         case OPT_TEST_CASES:
-           break;
+            break;
         default:
         case OPT_ERR:
             return 0;
@@ -1726,13 +1740,13 @@ int setup_tests(void)
     ADD_ALL_TESTS(rsa_siggen_test, OSSL_NELEM(rsa_siggen_data));
     ADD_ALL_TESTS(rsa_sigver_test, OSSL_NELEM(rsa_sigver_data));
     ADD_ALL_TESTS(rsa_decryption_primitive_test,
-                  OSSL_NELEM(rsa_decrypt_prim_data));
+        OSSL_NELEM(rsa_decrypt_prim_data));
 
 #ifndef OPENSSL_NO_DH
     ADD_ALL_TESTS(dh_safe_prime_keygen_test,
-                  OSSL_NELEM(dh_safe_prime_keygen_data));
+        OSSL_NELEM(dh_safe_prime_keygen_data));
     ADD_ALL_TESTS(dh_safe_prime_keyver_test,
-                  OSSL_NELEM(dh_safe_prime_keyver_data));
+        OSSL_NELEM(dh_safe_prime_keyver_data));
 #endif /* OPENSSL_NO_DH */
 
 #ifndef OPENSSL_NO_DSA
@@ -1751,7 +1765,7 @@ int setup_tests(void)
     ADD_ALL_TESTS(ecdsa_siggen_test, OSSL_NELEM(ecdsa_siggen_data));
     ADD_ALL_TESTS(ecdsa_sigver_test, OSSL_NELEM(ecdsa_sigver_data));
     ADD_ALL_TESTS(ecdh_cofactor_derive_test,
-                  OSSL_NELEM(ecdh_cofactor_derive_data));
+        OSSL_NELEM(ecdh_cofactor_derive_data));
 #endif /* OPENSSL_NO_EC */
 
 #ifndef OPENSSL_NO_ECX
diff --git a/test/aesgcmtest.c b/test/aesgcmtest.c
index 25e6f65fa97e4..737c0af696023 100644
--- a/test/aesgcmtest.c
+++ b/test/aesgcmtest.c
@@ -36,7 +36,7 @@ static const unsigned char gcm_tag[] = {
 };
 
 static int do_encrypt(unsigned char *iv_gen, unsigned char *ct, int *ct_len,
-                      unsigned char *tag, int *tag_len)
+    unsigned char *tag, int *tag_len)
 {
     int ret = 0;
     EVP_CIPHER_CTX *ctx = NULL;
@@ -45,26 +45,31 @@ static int do_encrypt(unsigned char *iv_gen, unsigned char *ct, int *ct_len,
 
     *tag_len = 16;
     ret = TEST_ptr(ctx = EVP_CIPHER_CTX_new())
-          && TEST_true(EVP_EncryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, NULL,
-                                          NULL) > 0)
-          && TEST_true(EVP_EncryptInit_ex(ctx, NULL, NULL, gcm_key,
-                                          iv_gen != NULL ? NULL : gcm_iv) > 0)
-          && TEST_true(EVP_EncryptUpdate(ctx, NULL, &outlen, gcm_aad,
-                                         sizeof(gcm_aad)) > 0)
-          && TEST_true(EVP_EncryptUpdate(ctx, ct, ct_len, gcm_pt,
-                                         sizeof(gcm_pt)) > 0)
-          && TEST_true(EVP_EncryptFinal_ex(ctx, outbuf, &outlen) > 0)
-          && TEST_int_eq(EVP_CIPHER_CTX_get_tag_length(ctx), 16)
-          && TEST_true(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, 16,
-                                           tag) > 0)
-          && TEST_true(iv_gen == NULL
-                  || EVP_CIPHER_CTX_get_original_iv(ctx, iv_gen, 12));
+        && TEST_true(EVP_EncryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, NULL,
+                         NULL)
+            > 0)
+        && TEST_true(EVP_EncryptInit_ex(ctx, NULL, NULL, gcm_key,
+                         iv_gen != NULL ? NULL : gcm_iv)
+            > 0)
+        && TEST_true(EVP_EncryptUpdate(ctx, NULL, &outlen, gcm_aad,
+                         sizeof(gcm_aad))
+            > 0)
+        && TEST_true(EVP_EncryptUpdate(ctx, ct, ct_len, gcm_pt,
+                         sizeof(gcm_pt))
+            > 0)
+        && TEST_true(EVP_EncryptFinal_ex(ctx, outbuf, &outlen) > 0)
+        && TEST_int_eq(EVP_CIPHER_CTX_get_tag_length(ctx), 16)
+        && TEST_true(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, 16,
+                         tag)
+            > 0)
+        && TEST_true(iv_gen == NULL
+            || EVP_CIPHER_CTX_get_original_iv(ctx, iv_gen, 12));
     EVP_CIPHER_CTX_free(ctx);
     return ret;
 }
 
 static int do_decrypt(const unsigned char *iv, const unsigned char *ct,
-                      int ct_len, const unsigned char *tag, int tag_len)
+    int ct_len, const unsigned char *tag, int tag_len)
 {
     int ret = 0;
     EVP_CIPHER_CTX *ctx = NULL;
@@ -73,18 +78,22 @@ static int do_decrypt(const unsigned char *iv, const unsigned char *ct,
     unsigned char outbuf[32];
 
     ret = TEST_ptr(ctx = EVP_CIPHER_CTX_new())
-              && TEST_true(EVP_DecryptInit_ex(ctx, EVP_aes_256_gcm(), NULL,
-                                              NULL, NULL) > 0)
-              && TEST_true(EVP_DecryptInit_ex(ctx, NULL, NULL, gcm_key, iv) > 0)
-              && TEST_int_eq(EVP_CIPHER_CTX_get_tag_length(ctx), 16)
-              && TEST_true(EVP_DecryptUpdate(ctx, NULL, &outlen, gcm_aad,
-                                             sizeof(gcm_aad)) > 0)
-              && TEST_true(EVP_DecryptUpdate(ctx, pt, &ptlen, ct,
-                                             ct_len) > 0)
-              && TEST_true(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
-                                               tag_len, (void *)tag) > 0)
-              && TEST_true(EVP_DecryptFinal_ex(ctx, outbuf, &outlen) > 0)
-              && TEST_mem_eq(gcm_pt, sizeof(gcm_pt), pt, ptlen);
+        && TEST_true(EVP_DecryptInit_ex(ctx, EVP_aes_256_gcm(), NULL,
+                         NULL, NULL)
+            > 0)
+        && TEST_true(EVP_DecryptInit_ex(ctx, NULL, NULL, gcm_key, iv) > 0)
+        && TEST_int_eq(EVP_CIPHER_CTX_get_tag_length(ctx), 16)
+        && TEST_true(EVP_DecryptUpdate(ctx, NULL, &outlen, gcm_aad,
+                         sizeof(gcm_aad))
+            > 0)
+        && TEST_true(EVP_DecryptUpdate(ctx, pt, &ptlen, ct,
+                         ct_len)
+            > 0)
+        && TEST_true(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
+                         tag_len, (void *)tag)
+            > 0)
+        && TEST_true(EVP_DecryptFinal_ex(ctx, outbuf, &outlen) > 0)
+        && TEST_mem_eq(gcm_pt, sizeof(gcm_pt), pt, ptlen);
 
     EVP_CIPHER_CTX_free(ctx);
     return ret;
@@ -97,9 +106,9 @@ static int kat_test(void)
     int ctlen = 0, taglen = 0;
 
     return do_encrypt(NULL, ct, &ctlen, tag, &taglen)
-           && TEST_mem_eq(gcm_ct, sizeof(gcm_ct), ct, ctlen)
-           && TEST_mem_eq(gcm_tag, sizeof(gcm_tag), tag, taglen)
-           && do_decrypt(gcm_iv, ct, ctlen, tag, taglen);
+        && TEST_mem_eq(gcm_ct, sizeof(gcm_ct), ct, ctlen)
+        && TEST_mem_eq(gcm_tag, sizeof(gcm_tag), tag, taglen)
+        && do_decrypt(gcm_iv, ct, ctlen, tag, taglen);
 }
 
 static int badkeylen_test(void)
@@ -109,9 +118,9 @@ static int badkeylen_test(void)
     const EVP_CIPHER *cipher;
 
     ret = TEST_ptr(cipher = EVP_aes_192_gcm())
-          && TEST_ptr(ctx = EVP_CIPHER_CTX_new())
-          && TEST_true(EVP_EncryptInit_ex(ctx, cipher, NULL, NULL, NULL))
-          && TEST_int_le(EVP_CIPHER_CTX_set_key_length(ctx, 2), 0);
+        && TEST_ptr(ctx = EVP_CIPHER_CTX_new())
+        && TEST_true(EVP_EncryptInit_ex(ctx, cipher, NULL, NULL, NULL))
+        && TEST_int_le(EVP_CIPHER_CTX_set_key_length(ctx, 2), 0);
     EVP_CIPHER_CTX_free(ctx);
     return ret;
 }
@@ -124,7 +133,7 @@ static int ivgen_test(void)
     int ctlen = 0, taglen = 0;
 
     return do_encrypt(iv_gen, ct, &ctlen, tag, &taglen)
-           && do_decrypt(iv_gen, ct, ctlen, tag, taglen);
+        && do_decrypt(iv_gen, ct, ctlen, tag, taglen);
 }
 
 int setup_tests(void)
diff --git a/test/afalgtest.c b/test/afalgtest.c
index 764f07e927709..0a51d31707e64 100644
--- a/test/afalgtest.c
+++ b/test/afalgtest.c
@@ -20,7 +20,7 @@
 #include "testutil.h"
 
 /* Use a buffer size which is not aligned to block size */
-#define BUFFER_SIZE     17
+#define BUFFER_SIZE 17
 
 #ifndef OPENSSL_NO_ENGINE
 static ENGINE *e;
@@ -34,24 +34,18 @@ static int test_afalg_aes_cbc(int keysize_idx)
     const unsigned char *enc_result = NULL;
     int encl, encf, decl, decf;
     int ret = 0;
-    static const unsigned char key[] =
-        "\x06\xa9\x21\x40\x36\xb8\xa1\x5b\x51\x2e\x03\xd5\x34\x12\x00\x06"
-        "\x06\xa9\x21\x40\x36\xb8\xa1\x5b\x51\x2e\x03\xd5\x34\x12\x00\x06";
-    static const unsigned char iv[] =
-        "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30\xb4\x22\xda\x80\x2c\x9f\xac\x41";
+    static const unsigned char key[] = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b\x51\x2e\x03\xd5\x34\x12\x00\x06"
+                                       "\x06\xa9\x21\x40\x36\xb8\xa1\x5b\x51\x2e\x03\xd5\x34\x12\x00\x06";
+    static const unsigned char iv[] = "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30\xb4\x22\xda\x80\x2c\x9f\xac\x41";
     /* input = "Single block msg\n" 17 Bytes*/
-    static const unsigned char in[BUFFER_SIZE] =
-        "\x53\x69\x6e\x67\x6c\x65\x20\x62\x6c\x6f\x63\x6b\x20\x6d\x73\x67"
-        "\x0a";
-    static const unsigned char encresult_128[BUFFER_SIZE] =
-        "\xe3\x53\x77\x9c\x10\x79\xae\xb8\x27\x08\x94\x2d\xbe\x77\x18\x1a"
-        "\x2d";
-    static const unsigned char encresult_192[BUFFER_SIZE] =
-        "\xf7\xe4\x26\xd1\xd5\x4f\x8f\x39\xb1\x9e\xe0\xdf\x61\xb9\xc2\x55"
-        "\xeb";
-    static const unsigned char encresult_256[BUFFER_SIZE] =
-        "\xa0\x76\x85\xfd\xc1\x65\x71\x9d\xc7\xe9\x13\x6e\xae\x55\x49\xb4"
-        "\x13";
+    static const unsigned char in[BUFFER_SIZE] = "\x53\x69\x6e\x67\x6c\x65\x20\x62\x6c\x6f\x63\x6b\x20\x6d\x73\x67"
+                                                 "\x0a";
+    static const unsigned char encresult_128[BUFFER_SIZE] = "\xe3\x53\x77\x9c\x10\x79\xae\xb8\x27\x08\x94\x2d\xbe\x77\x18\x1a"
+                                                            "\x2d";
+    static const unsigned char encresult_192[BUFFER_SIZE] = "\xf7\xe4\x26\xd1\xd5\x4f\x8f\x39\xb1\x9e\xe0\xdf\x61\xb9\xc2\x55"
+                                                            "\xeb";
+    static const unsigned char encresult_256[BUFFER_SIZE] = "\xa0\x76\x85\xfd\xc1\x65\x71\x9d\xc7\xe9\x13\x6e\xae\x55\x49\xb4"
+                                                            "\x13";
 
 #ifdef OSSL_SANITIZE_MEMORY
     /*
@@ -64,27 +58,27 @@ static int test_afalg_aes_cbc(int keysize_idx)
 #endif
 
     switch (keysize_idx) {
-        case 0:
-            cipher = EVP_aes_128_cbc();
-            enc_result = &encresult_128[0];
-            break;
-        case 1:
-            cipher = EVP_aes_192_cbc();
-            enc_result = &encresult_192[0];
-            break;
-        case 2:
-            cipher = EVP_aes_256_cbc();
-            enc_result = &encresult_256[0];
-            break;
-        default:
-            cipher = NULL;
+    case 0:
+        cipher = EVP_aes_128_cbc();
+        enc_result = &encresult_128[0];
+        break;
+    case 1:
+        cipher = EVP_aes_192_cbc();
+        enc_result = &encresult_192[0];
+        break;
+    case 2:
+        cipher = EVP_aes_256_cbc();
+        enc_result = &encresult_256[0];
+        break;
+    default:
+        cipher = NULL;
     }
     if (!TEST_ptr(ctx = EVP_CIPHER_CTX_new()))
-            return 0;
+        return 0;
 
     if (!TEST_true(EVP_CipherInit_ex(ctx, cipher, e, key, iv, 1))
-            || !TEST_true(EVP_CipherUpdate(ctx, ebuf, &encl, in, BUFFER_SIZE))
-            || !TEST_true(EVP_CipherFinal_ex(ctx, ebuf + encl, &encf)))
+        || !TEST_true(EVP_CipherUpdate(ctx, ebuf, &encl, in, BUFFER_SIZE))
+        || !TEST_true(EVP_CipherFinal_ex(ctx, ebuf + encl, &encf)))
         goto end;
     encl += encf;
 
@@ -92,19 +86,19 @@ static int test_afalg_aes_cbc(int keysize_idx)
         goto end;
 
     if (!TEST_true(EVP_CIPHER_CTX_reset(ctx))
-            || !TEST_true(EVP_CipherInit_ex(ctx, cipher, e, key, iv, 0))
-            || !TEST_true(EVP_CipherUpdate(ctx, dbuf, &decl, ebuf, encl))
-            || !TEST_true(EVP_CipherFinal_ex(ctx, dbuf + decl, &decf)))
+        || !TEST_true(EVP_CipherInit_ex(ctx, cipher, e, key, iv, 0))
+        || !TEST_true(EVP_CipherUpdate(ctx, dbuf, &decl, ebuf, encl))
+        || !TEST_true(EVP_CipherFinal_ex(ctx, dbuf + decl, &decf)))
         goto end;
     decl += decf;
 
     if (!TEST_int_eq(decl, BUFFER_SIZE)
-            || !TEST_mem_eq(dbuf, BUFFER_SIZE, in, BUFFER_SIZE))
+        || !TEST_mem_eq(dbuf, BUFFER_SIZE, in, BUFFER_SIZE))
         goto end;
 
     ret = 1;
 
- end:
+end:
     EVP_CIPHER_CTX_free(ctx);
     return ret;
 }
@@ -130,9 +124,9 @@ static int test_pr16743(void)
 int global_init(void)
 {
     ENGINE_load_builtin_engines();
-# ifndef OPENSSL_NO_STATIC_ENGINE
+#ifndef OPENSSL_NO_STATIC_ENGINE
     OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL);
-# endif
+#endif
     return 1;
 }
 #endif
diff --git a/test/algorithmid_test.c b/test/algorithmid_test.c
index 0104425c1d4af..a7cf1406c6d21 100644
--- a/test/algorithmid_test.c
+++ b/test/algorithmid_test.c
@@ -14,9 +14,9 @@
 #include "testutil.h"
 
 /* Collected arguments */
-static const char *eecert_filename = NULL;  /* For test_x509_file() */
-static const char *cacert_filename = NULL;  /* For test_x509_file() */
-static const char *pubkey_filename = NULL;  /* For test_spki_file() */
+static const char *eecert_filename = NULL; /* For test_x509_file() */
+static const char *cacert_filename = NULL; /* For test_x509_file() */
+static const char *pubkey_filename = NULL; /* For test_spki_file() */
 
 #define ALGORITHMID_NAME "algorithm-id"
 
@@ -35,7 +35,7 @@ static int test_spki_aid(X509_PUBKEY *pubkey, const char *filename)
     const OSSL_PARAM *gettable_params = NULL;
     OSSL_PARAM params[] = {
         OSSL_PARAM_octet_string(ALGORITHMID_NAME,
-                                &algid_prov, sizeof(algid_prov)),
+            &algid_prov, sizeof(algid_prov)),
         OSSL_PARAM_END
     };
     int ret = 0;
@@ -58,10 +58,11 @@ static int test_spki_aid(X509_PUBKEY *pubkey, const char *filename)
      * in this function.
      */
     if ((keydata = evp_pkey_export_to_provider(pkey, NULL,
-                                               &keymgmt, NULL)) == NULL) {
+             &keymgmt, NULL))
+        == NULL) {
         TEST_info("The public key found in '%s' doesn't have provider support."
                   "  Skipping...",
-                  filename);
+            filename);
         ret = 1;
         goto end;
     }
@@ -70,7 +71,7 @@ static int test_spki_aid(X509_PUBKEY *pubkey, const char *filename)
         TEST_info("The AlgorithmID key type (%s) for the public key found in"
                   " '%s' doesn't match the key type of the extracted public"
                   " key.",
-                  name, filename);
+            name, filename);
         ret = 1;
         goto end;
     }
@@ -79,7 +80,7 @@ static int test_spki_aid(X509_PUBKEY *pubkey, const char *filename)
         || !TEST_ptr(OSSL_PARAM_locate_const(gettable_params, ALGORITHMID_NAME))) {
         TEST_info("The %s provider keymgmt appears to lack support for algorithm-id."
                   "  Skipping...",
-                  name);
+            name);
         ret = 1;
         goto end;
     }
@@ -91,10 +92,10 @@ static int test_spki_aid(X509_PUBKEY *pubkey, const char *filename)
 
     /* We now have all the algorithm IDs we need, let's compare them */
     if (TEST_mem_eq(algid_legacy, algid_legacy_len,
-                    algid_prov, algid_prov_len))
+            algid_prov, algid_prov_len))
         ret = 1;
 
- end:
+end:
     EVP_KEYMGMT_free(keymgmt);
     OPENSSL_free(algid_legacy);
     return ret;
@@ -108,7 +109,7 @@ static int test_x509_spki_aid(X509 *cert, const char *filename)
 }
 
 static int test_x509_sig_aid(X509 *eecert, const char *ee_filename,
-                             X509 *cacert, const char *ca_filename)
+    X509 *cacert, const char *ca_filename)
 {
     const ASN1_OBJECT *sig_oid = NULL;
     const X509_ALGOR *alg = NULL;
@@ -123,7 +124,7 @@ static int test_x509_sig_aid(X509 *eecert, const char *ee_filename,
     const OSSL_PARAM *gettable_params = NULL;
     OSSL_PARAM params[] = {
         OSSL_PARAM_octet_string("algorithm-id",
-                                &algid_prov, sizeof(algid_prov)),
+            &algid_prov, sizeof(algid_prov)),
         OSSL_PARAM_END
     };
     int ret = 0;
@@ -139,9 +140,9 @@ static int test_x509_sig_aid(X509 *eecert, const char *ee_filename,
 
     if (!TEST_true(EVP_PKEY_is_a(pkey, OBJ_nid2sn(pkey_nid)))) {
         TEST_info("The '%s' pubkey can't be used to verify the '%s' signature",
-                  ca_filename, ee_filename);
+            ca_filename, ee_filename);
         TEST_info("Signature algorithm is %s (pkey type %s, hash type %s)",
-                  OBJ_nid2sn(sig_nid), OBJ_nid2sn(pkey_nid), OBJ_nid2sn(dig_nid));
+            OBJ_nid2sn(sig_nid), OBJ_nid2sn(pkey_nid), OBJ_nid2sn(dig_nid));
         TEST_info("Pkey key type is %s", EVP_PKEY_get0_type_name(pkey));
         goto end;
     }
@@ -151,11 +152,11 @@ static int test_x509_sig_aid(X509 *eecert, const char *ee_filename,
 
     if (!TEST_ptr(mdctx = EVP_MD_CTX_new())
         || !TEST_true(EVP_DigestVerifyInit_ex(mdctx, &pctx,
-                                              OBJ_nid2sn(dig_nid),
-                                              NULL, NULL, pkey, NULL))) {
+            OBJ_nid2sn(dig_nid),
+            NULL, NULL, pkey, NULL))) {
         TEST_info("Couldn't initialize a DigestVerify operation with "
                   "pkey type %s and hash type %s",
-                  OBJ_nid2sn(pkey_nid), OBJ_nid2sn(dig_nid));
+            OBJ_nid2sn(pkey_nid), OBJ_nid2sn(dig_nid));
         goto end;
     }
 
@@ -163,7 +164,7 @@ static int test_x509_sig_aid(X509 *eecert, const char *ee_filename,
         || !TEST_ptr(OSSL_PARAM_locate_const(gettable_params, ALGORITHMID_NAME))) {
         TEST_info("The %s provider keymgmt appears to lack support for algorithm-id"
                   "  Skipping...",
-                  OBJ_nid2sn(pkey_nid));
+            OBJ_nid2sn(pkey_nid));
         ret = 1;
         goto end;
     }
@@ -175,10 +176,10 @@ static int test_x509_sig_aid(X509 *eecert, const char *ee_filename,
 
     /* We now have all the algorithm IDs we need, let's compare them */
     if (TEST_mem_eq(algid_legacy, algid_legacy_len,
-                    algid_prov, algid_prov_len))
+            algid_prov, algid_prov_len))
         ret = 1;
 
- end:
+end:
     EVP_MD_CTX_free(mdctx);
     /* pctx is free by EVP_MD_CTX_free() */
     OPENSSL_free(algid_legacy);
@@ -199,13 +200,13 @@ static int test_spki_file(void)
 
     if ((pubkey = PEM_read_bio_X509_PUBKEY(b, NULL, NULL, NULL)) == NULL) {
         TEST_error("'%s' doesn't appear to be a SubjectPublicKeyInfo in PEM format\n",
-                   pubkey_filename);
+            pubkey_filename);
         TEST_openssl_errors();
         goto end;
     }
 
     ret = test_spki_aid(pubkey, pubkey_filename);
- end:
+end:
     BIO_free(b);
     X509_PUBKEY_free(pubkey);
     return ret;
@@ -230,13 +231,13 @@ static int test_x509_files(void)
 
     if ((eecert = PEM_read_bio_X509(bee, NULL, NULL, NULL)) == NULL) {
         TEST_error("'%s' doesn't appear to be a X.509 certificate in PEM format\n",
-                   eecert_filename);
+            eecert_filename);
         TEST_openssl_errors();
         goto end;
     }
     if ((cacert = PEM_read_bio_X509(bca, NULL, NULL, NULL)) == NULL) {
         TEST_error("'%s' doesn't appear to be a X.509 certificate in PEM format\n",
-                   cacert_filename);
+            cacert_filename);
         TEST_openssl_errors();
         goto end;
     }
@@ -244,7 +245,7 @@ static int test_x509_files(void)
     ret = test_x509_sig_aid(eecert, eecert_filename, cacert, cacert_filename)
         & test_x509_spki_aid(eecert, eecert_filename)
         & test_x509_spki_aid(cacert, cacert_filename);
- end:
+end:
     BIO_free(bee);
     BIO_free(bca);
     X509_free(eecert);
@@ -267,7 +268,7 @@ const OPTIONS *test_get_options(void)
         { "x509", OPT_X509, '-', "Test X.509 certificates.  Requires two files" },
         { "spki", OPT_SPKI, '-', "Test public keys in SubjectPublicKeyInfo form.  Requires one file" },
         { OPT_HELP_STR, 1, '-',
-          "file...\tFile(s) to run tests on.  All files must be PEM encoded.\n" },
+            "file...\tFile(s) to run tests on.  All files must be PEM encoded.\n" },
         { NULL }
     };
     return test_options;
@@ -287,7 +288,7 @@ int setup_tests(void)
             spki = 1;
             break;
         case OPT_TEST_CASES:
-           break;
+            break;
         default:
         case OPT_ERR:
             return 0;
diff --git a/test/asn1_decode_test.c b/test/asn1_decode_test.c
index 04d73f350983c..7796968c2389a 100644
--- a/test/asn1_decode_test.c
+++ b/test/asn1_decode_test.c
@@ -18,16 +18,16 @@
 #include "testutil.h"
 
 #ifdef __GNUC__
-# pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 #ifdef __clang__
-# pragma clang diagnostic ignored "-Wunused-function"
+#pragma clang diagnostic ignored "-Wunused-function"
 #endif
 
 /* Badly coded ASN.1 INTEGER zero wrapped in a sequence */
 static unsigned char t_invalid_zero[] = {
-    0x30, 0x02,                  /* SEQUENCE tag + length */
-    0x02, 0x00                   /* INTEGER tag + length */
+    0x30, 0x02, /* SEQUENCE tag + length */
+    0x02, 0x00 /* INTEGER tag + length */
 };
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -41,17 +41,16 @@ ASN1_SEQUENCE(ASN1_LONG_DATA) = {
     ASN1_EMBED(ASN1_LONG_DATA, test_long, LONG),
 } static_ASN1_SEQUENCE_END(ASN1_LONG_DATA)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_LONG_DATA)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_LONG_DATA)
 IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(ASN1_LONG_DATA)
 
 static int test_long(void)
 {
     const unsigned char *p = t_invalid_zero;
-    ASN1_LONG_DATA *dectst =
-        d2i_ASN1_LONG_DATA(NULL, &p, sizeof(t_invalid_zero));
+    ASN1_LONG_DATA *dectst = d2i_ASN1_LONG_DATA(NULL, &p, sizeof(t_invalid_zero));
 
     if (dectst == NULL)
-        return 0;                /* Fail */
+        return 0; /* Fail */
 
     ASN1_LONG_DATA_free(dectst);
     return 1;
@@ -68,17 +67,16 @@ ASN1_SEQUENCE(ASN1_INT32_DATA) = {
     ASN1_EMBED(ASN1_INT32_DATA, test_int32, INT32),
 } static_ASN1_SEQUENCE_END(ASN1_INT32_DATA)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_INT32_DATA)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_INT32_DATA)
 IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(ASN1_INT32_DATA)
 
 static int test_int32(void)
 {
     const unsigned char *p = t_invalid_zero;
-    ASN1_INT32_DATA *dectst =
-        d2i_ASN1_INT32_DATA(NULL, &p, sizeof(t_invalid_zero));
+    ASN1_INT32_DATA *dectst = d2i_ASN1_INT32_DATA(NULL, &p, sizeof(t_invalid_zero));
 
     if (dectst == NULL)
-        return 0;                /* Fail */
+        return 0; /* Fail */
 
     ASN1_INT32_DATA_free(dectst);
     return 1;
@@ -94,17 +92,16 @@ ASN1_SEQUENCE(ASN1_UINT32_DATA) = {
     ASN1_EMBED(ASN1_UINT32_DATA, test_uint32, UINT32),
 } static_ASN1_SEQUENCE_END(ASN1_UINT32_DATA)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_UINT32_DATA)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_UINT32_DATA)
 IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(ASN1_UINT32_DATA)
 
 static int test_uint32(void)
 {
     const unsigned char *p = t_invalid_zero;
-    ASN1_UINT32_DATA *dectst =
-        d2i_ASN1_UINT32_DATA(NULL, &p, sizeof(t_invalid_zero));
+    ASN1_UINT32_DATA *dectst = d2i_ASN1_UINT32_DATA(NULL, &p, sizeof(t_invalid_zero));
 
     if (dectst == NULL)
-        return 0;                /* Fail */
+        return 0; /* Fail */
 
     ASN1_UINT32_DATA_free(dectst);
     return 1;
@@ -120,17 +117,16 @@ ASN1_SEQUENCE(ASN1_INT64_DATA) = {
     ASN1_EMBED(ASN1_INT64_DATA, test_int64, INT64),
 } static_ASN1_SEQUENCE_END(ASN1_INT64_DATA)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_INT64_DATA)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_INT64_DATA)
 IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(ASN1_INT64_DATA)
 
 static int test_int64(void)
 {
     const unsigned char *p = t_invalid_zero;
-    ASN1_INT64_DATA *dectst =
-        d2i_ASN1_INT64_DATA(NULL, &p, sizeof(t_invalid_zero));
+    ASN1_INT64_DATA *dectst = d2i_ASN1_INT64_DATA(NULL, &p, sizeof(t_invalid_zero));
 
     if (dectst == NULL)
-        return 0;                /* Fail */
+        return 0; /* Fail */
 
     ASN1_INT64_DATA_free(dectst);
     return 1;
@@ -146,17 +142,16 @@ ASN1_SEQUENCE(ASN1_UINT64_DATA) = {
     ASN1_EMBED(ASN1_UINT64_DATA, test_uint64, UINT64),
 } static_ASN1_SEQUENCE_END(ASN1_UINT64_DATA)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_UINT64_DATA)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_UINT64_DATA)
 IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(ASN1_UINT64_DATA)
 
 static int test_uint64(void)
 {
     const unsigned char *p = t_invalid_zero;
-    ASN1_UINT64_DATA *dectst =
-        d2i_ASN1_UINT64_DATA(NULL, &p, sizeof(t_invalid_zero));
+    ASN1_UINT64_DATA *dectst = d2i_ASN1_UINT64_DATA(NULL, &p, sizeof(t_invalid_zero));
 
     if (dectst == NULL)
-        return 0;                /* Fail */
+        return 0; /* Fail */
 
     ASN1_UINT64_DATA_free(dectst);
     return 1;
@@ -168,8 +163,21 @@ static int test_gentime(void)
 {
     /* Underflowing GeneralizedTime 161208193400Z (YYMMDDHHMMSSZ) */
     const unsigned char der[] = {
-        0x18, 0x0d, 0x31, 0x36, 0x31, 0x32, 0x30, 0x38, 0x31,
-        0x39, 0x33, 0x34, 0x30, 0x30, 0x5a,
+        0x18,
+        0x0d,
+        0x31,
+        0x36,
+        0x31,
+        0x32,
+        0x30,
+        0x38,
+        0x31,
+        0x39,
+        0x33,
+        0x34,
+        0x30,
+        0x30,
+        0x5a,
     };
     const unsigned char *p;
     int der_len, rc = 1;
@@ -192,8 +200,19 @@ static int test_utctime(void)
 {
     /* Underflowing UTCTime 0205104700Z (MMDDHHMMSSZ) */
     const unsigned char der[] = {
-        0x17, 0x0b, 0x30, 0x32, 0x30, 0x35, 0x31, 0x30,
-        0x34, 0x37, 0x30, 0x30, 0x5a,
+        0x17,
+        0x0b,
+        0x30,
+        0x32,
+        0x30,
+        0x35,
+        0x31,
+        0x30,
+        0x34,
+        0x37,
+        0x30,
+        0x30,
+        0x5a,
     };
     const unsigned char *p;
     int der_len, rc = 1;
@@ -224,20 +243,20 @@ ASN1_SEQUENCE(INVALIDTEMPLATE) = {
     ASN1_IMP(INVALIDTEMPLATE, invalidDirString, DIRECTORYSTRING, 12)
 } static_ASN1_SEQUENCE_END(INVALIDTEMPLATE)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(INVALIDTEMPLATE)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(INVALIDTEMPLATE)
 IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(INVALIDTEMPLATE)
 
 /* Empty sequence for invalid template test */
 static unsigned char t_invalid_template[] = {
-    0x30, 0x03,                  /* SEQUENCE tag + length */
-    0x0c, 0x01, 0x41             /* UTF8String, length 1, "A" */
+    0x30, 0x03, /* SEQUENCE tag + length */
+    0x0c, 0x01, 0x41 /* UTF8String, length 1, "A" */
 };
 
 static int test_invalid_template(void)
 {
     const unsigned char *p = t_invalid_template;
     INVALIDTEMPLATE *tmp = d2i_INVALIDTEMPLATE(NULL, &p,
-                                               sizeof(t_invalid_template));
+        sizeof(t_invalid_template));
 
     /* We expect a NULL pointer return */
     if (TEST_ptr_null(tmp))
@@ -260,7 +279,7 @@ static int test_reuse_asn1_object(void)
     /* Create an object that owns dynamically allocated 'sn' and 'ln' fields */
 
     if (!TEST_ptr(obj = ASN1_OBJECT_create(NID_undef, cn_der, sizeof(cn_der),
-                                           "C", "countryName")))
+                      "C", "countryName")))
         goto err;
     /* reuse obj - this should not leak sn and ln */
     if (!TEST_ptr(d2i_ASN1_OBJECT(&obj, &p, sizeof(oid_der))))
diff --git a/test/asn1_dsa_internal_test.c b/test/asn1_dsa_internal_test.c
index 9beb382af7628..143009887b6bd 100644
--- a/test/asn1_dsa_internal_test.c
+++ b/test/asn1_dsa_internal_test.c
@@ -15,28 +15,28 @@
 #include "testutil.h"
 
 static unsigned char t_dsa_sig[] = {
-    0x30, 0x06,                  /* SEQUENCE tag + length */
-    0x02, 0x01, 0x01,            /* INTEGER tag + length + content */
-    0x02, 0x01, 0x02             /* INTEGER tag + length + content */
+    0x30, 0x06, /* SEQUENCE tag + length */
+    0x02, 0x01, 0x01, /* INTEGER tag + length + content */
+    0x02, 0x01, 0x02 /* INTEGER tag + length + content */
 };
 
 static unsigned char t_dsa_sig_extra[] = {
-    0x30, 0x06,                  /* SEQUENCE tag + length */
-    0x02, 0x01, 0x01,            /* INTEGER tag + length + content */
-    0x02, 0x01, 0x02,            /* INTEGER tag + length + content */
-    0x05, 0x00                   /* NULL tag + length */
+    0x30, 0x06, /* SEQUENCE tag + length */
+    0x02, 0x01, 0x01, /* INTEGER tag + length + content */
+    0x02, 0x01, 0x02, /* INTEGER tag + length + content */
+    0x05, 0x00 /* NULL tag + length */
 };
 
 static unsigned char t_dsa_sig_msb[] = {
-    0x30, 0x08,                  /* SEQUENCE tag + length */
-    0x02, 0x02, 0x00, 0x81,      /* INTEGER tag + length + content */
-    0x02, 0x02, 0x00, 0x82       /* INTEGER tag + length + content */
+    0x30, 0x08, /* SEQUENCE tag + length */
+    0x02, 0x02, 0x00, 0x81, /* INTEGER tag + length + content */
+    0x02, 0x02, 0x00, 0x82 /* INTEGER tag + length + content */
 };
 
 static unsigned char t_dsa_sig_two[] = {
-    0x30, 0x08,                  /* SEQUENCE tag + length */
-    0x02, 0x02, 0x01, 0x00,      /* INTEGER tag + length + content */
-    0x02, 0x02, 0x02, 0x00       /* INTEGER tag + length + content */
+    0x30, 0x08, /* SEQUENCE tag + length */
+    0x02, 0x02, 0x01, 0x00, /* INTEGER tag + length + content */
+    0x02, 0x02, 0x02, 0x00 /* INTEGER tag + length + content */
 };
 
 /*
@@ -44,9 +44,9 @@ static unsigned char t_dsa_sig_two[] = {
  * (valid) INTEGER.
  */
 static unsigned char t_invalid_int_zero[] = {
-    0x30, 0x05,                  /* SEQUENCE tag + length */
-    0x02, 0x00,                  /* INTEGER tag + length */
-    0x02, 0x01, 0x2a             /* INTEGER tag + length */
+    0x30, 0x05, /* SEQUENCE tag + length */
+    0x02, 0x00, /* INTEGER tag + length */
+    0x02, 0x01, 0x2a /* INTEGER tag + length */
 };
 
 /*
@@ -54,9 +54,9 @@ static unsigned char t_invalid_int_zero[] = {
  * with another (valid) INTEGER.
  */
 static unsigned char t_invalid_int[] = {
-    0x30, 0x07,                  /* SEQUENCE tag + length */
-    0x02, 0x02, 0x00, 0x7f,      /* INTEGER tag + length */
-    0x02, 0x01, 0x2a             /* INTEGER tag + length */
+    0x30, 0x07, /* SEQUENCE tag + length */
+    0x02, 0x02, 0x00, 0x7f, /* INTEGER tag + length */
+    0x02, 0x01, 0x2a /* INTEGER tag + length */
 };
 
 /*
@@ -64,21 +64,21 @@ static unsigned char t_invalid_int[] = {
  * (valid) INTEGER.
  */
 static unsigned char t_neg_int[] = {
-    0x30, 0x06,                  /* SEQUENCE tag + length */
-    0x02, 0x01, 0xaa,            /* INTEGER tag + length */
-    0x02, 0x01, 0x2a             /* INTEGER tag + length */
+    0x30, 0x06, /* SEQUENCE tag + length */
+    0x02, 0x01, 0xaa, /* INTEGER tag + length */
+    0x02, 0x01, 0x2a /* INTEGER tag + length */
 };
 
 static unsigned char t_trunc_der[] = {
-    0x30, 0x08,                  /* SEQUENCE tag + length */
-    0x02, 0x02, 0x00, 0x81,      /* INTEGER tag + length */
-    0x02, 0x02, 0x00             /* INTEGER tag + length */
+    0x30, 0x08, /* SEQUENCE tag + length */
+    0x02, 0x02, 0x00, 0x81, /* INTEGER tag + length */
+    0x02, 0x02, 0x00 /* INTEGER tag + length */
 };
 
 static unsigned char t_trunc_seq[] = {
-    0x30, 0x07,                  /* SEQUENCE tag + length */
-    0x02, 0x02, 0x00, 0x81,      /* INTEGER tag + length */
-    0x02, 0x02, 0x00, 0x82       /* INTEGER tag + length */
+    0x30, 0x07, /* SEQUENCE tag + length */
+    0x02, 0x02, 0x00, 0x81, /* INTEGER tag + length */
+    0x02, 0x02, 0x00, 0x82 /* INTEGER tag + length */
 };
 
 static int test_decode(void)
@@ -94,8 +94,8 @@ static int test_decode(void)
     /* Positive tests */
     pder = t_dsa_sig;
     if (ossl_decode_der_dsa_sig(r, s, &pder, sizeof(t_dsa_sig)) == 0
-            || !TEST_ptr_eq(pder, (t_dsa_sig + sizeof(t_dsa_sig)))
-            || !TEST_BN_eq_word(r, 1) || !TEST_BN_eq_word(s, 2)) {
+        || !TEST_ptr_eq(pder, (t_dsa_sig + sizeof(t_dsa_sig)))
+        || !TEST_BN_eq_word(r, 1) || !TEST_BN_eq_word(s, 2)) {
         TEST_info("asn1_dsa test_decode: t_dsa_sig failed");
         goto fail;
     }
@@ -104,9 +104,9 @@ static int test_decode(void)
     BN_clear(s);
     pder = t_dsa_sig_extra;
     if (ossl_decode_der_dsa_sig(r, s, &pder, sizeof(t_dsa_sig_extra)) == 0
-            || !TEST_ptr_eq(pder,
-                            (t_dsa_sig_extra + sizeof(t_dsa_sig_extra) - 2))
-            || !TEST_BN_eq_word(r, 1) || !TEST_BN_eq_word(s, 2)) {
+        || !TEST_ptr_eq(pder,
+            (t_dsa_sig_extra + sizeof(t_dsa_sig_extra) - 2))
+        || !TEST_BN_eq_word(r, 1) || !TEST_BN_eq_word(s, 2)) {
         TEST_info("asn1_dsa test_decode: t_dsa_sig_extra failed");
         goto fail;
     }
@@ -115,8 +115,8 @@ static int test_decode(void)
     BN_clear(s);
     pder = t_dsa_sig_msb;
     if (ossl_decode_der_dsa_sig(r, s, &pder, sizeof(t_dsa_sig_msb)) == 0
-            || !TEST_ptr_eq(pder, (t_dsa_sig_msb + sizeof(t_dsa_sig_msb)))
-            || !TEST_BN_eq_word(r, 0x81) || !TEST_BN_eq_word(s, 0x82)) {
+        || !TEST_ptr_eq(pder, (t_dsa_sig_msb + sizeof(t_dsa_sig_msb)))
+        || !TEST_BN_eq_word(r, 0x81) || !TEST_BN_eq_word(s, 0x82)) {
         TEST_info("asn1_dsa test_decode: t_dsa_sig_msb failed");
         goto fail;
     }
@@ -125,8 +125,8 @@ static int test_decode(void)
     BN_clear(s);
     pder = t_dsa_sig_two;
     if (ossl_decode_der_dsa_sig(r, s, &pder, sizeof(t_dsa_sig_two)) == 0
-            || !TEST_ptr_eq(pder, (t_dsa_sig_two + sizeof(t_dsa_sig_two)))
-            || !TEST_BN_eq_word(r, 0x100) || !TEST_BN_eq_word(s, 0x200)) {
+        || !TEST_ptr_eq(pder, (t_dsa_sig_two + sizeof(t_dsa_sig_two)))
+        || !TEST_BN_eq_word(r, 0x100) || !TEST_BN_eq_word(s, 0x200)) {
         TEST_info("asn1_dsa test_decode: t_dsa_sig_two failed");
         goto fail;
     }
diff --git a/test/asn1_encode_test.c b/test/asn1_encode_test.c
index 88899dc93779d..7d7cc0100bf1e 100644
--- a/test/asn1_encode_test.c
+++ b/test/asn1_encode_test.c
@@ -16,12 +16,12 @@
 #include "testutil.h"
 
 #ifdef __GNUC__
-# pragma GCC diagnostic ignored "-Wunused-function"
-# pragma GCC diagnostic ignored "-Wformat"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wformat"
 #endif
 #ifdef __clang__
-# pragma clang diagnostic ignored "-Wunused-function"
-# pragma clang diagnostic ignored "-Wformat"
+#pragma clang diagnostic ignored "-Wunused-function"
+#pragma clang diagnostic ignored "-Wformat"
 #endif
 
 /***** Custom test data ******************************************************/
@@ -93,9 +93,11 @@ typedef struct {
     unsigned char *bytes2;
     size_t nbytes2;
 } TEST_CUSTOM_DATA;
-#define CUSTOM_DATA(v)                          \
-    { v, sizeof(v), t_one, sizeof(t_one) },     \
-    { t_one, sizeof(t_one), v, sizeof(v) }
+#define CUSTOM_DATA(v)                      \
+    { v, sizeof(v), t_one, sizeof(t_one) }, \
+    {                                       \
+        t_one, sizeof(t_one), v, sizeof(v)  \
+    }
 
 static TEST_CUSTOM_DATA test_custom_data[] = {
     CUSTOM_DATA(t_zero),
@@ -117,7 +119,6 @@ static TEST_CUSTOM_DATA test_custom_data[] = {
     CUSTOM_DATA(t_4bytes_5_negpad),
 };
 
-
 /***** Type specific test data ***********************************************/
 
 /*
@@ -129,12 +130,14 @@ static TEST_CUSTOM_DATA test_custom_data[] = {
  * For easy creation of arrays of expected data.  These macros correspond to
  * the uses of CUSTOM_DATA above.
  */
-#define CUSTOM_EXPECTED_SUCCESS(num, znum)      \
-    { 0xff, num, 1 },                           \
-    { 0xff, 1, znum }
-#define CUSTOM_EXPECTED_FAILURE                 \
-    { 0, 0, 0 },                                \
-    { 0, 0, 0 }
+#define CUSTOM_EXPECTED_SUCCESS(num, znum) \
+    { 0xff, num, 1 },                      \
+    {                                      \
+        0xff, 1, znum                      \
+    }
+#define CUSTOM_EXPECTED_FAILURE \
+    { 0, 0, 0 },                \
+        { 0, 0, 0 }
 
 /*
  * A structure to collect all test information in.  There MUST be one instance
@@ -146,7 +149,7 @@ typedef void ifree_fn(void *a);
 typedef struct {
     ASN1_ITEM_EXP *asn1_type;
     const char *name;
-    int skip;                    /* 1 if this package should be skipped */
+    int skip; /* 1 if this package should be skipped */
 
     /* An array of structures to compare decoded custom data with */
     void *encode_expectations;
@@ -170,14 +173,14 @@ typedef struct {
 } TEST_PACKAGE;
 
 /* To facilitate the creation of an encdec_data array */
-#define ENCDEC_DATA(num, znum)                  \
+#define ENCDEC_DATA(num, znum) \
     { 0xff, num, 1 }, { 0xff, 1, znum }
-#define ENCDEC_ARRAY(max, zmax, min, zmin)      \
-    ENCDEC_DATA(max,zmax),                      \
-    ENCDEC_DATA(min,zmin),                      \
-    ENCDEC_DATA(1, 1),                          \
-    ENCDEC_DATA(-1, -1),                        \
-    ENCDEC_DATA(0, ASN1_LONG_UNDEF)
+#define ENCDEC_ARRAY(max, zmax, min, zmin) \
+    ENCDEC_DATA(max, zmax),                \
+        ENCDEC_DATA(min, zmin),            \
+        ENCDEC_DATA(1, 1),                 \
+        ENCDEC_DATA(-1, -1),               \
+        ENCDEC_DATA(0, ASN1_LONG_UNDEF)
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 /***** LONG ******************************************************************/
@@ -195,28 +198,30 @@ ASN1_SEQUENCE(ASN1_LONG_DATA) = {
     ASN1_EXP_OPT(ASN1_LONG_DATA, test_zlong, ZLONG, 0)
 } static_ASN1_SEQUENCE_END(ASN1_LONG_DATA)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_LONG_DATA)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_LONG_DATA)
 IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(ASN1_LONG_DATA)
 
 static ASN1_LONG_DATA long_expected_32bit[] = {
     /* The following should fail on the second because it's the default */
-    { 0xff, 0, 1 }, { 0, 0, 0 }, /* t_zero */
-    { 0, 0, 0 }, { 0xff, 1, 0x7fffffff }, /* t_longundef */
+    { 0xff, 0, 1 },
+    { 0, 0, 0 }, /* t_zero */
+    { 0, 0, 0 },
+    { 0xff, 1, 0x7fffffff }, /* t_longundef */
     CUSTOM_EXPECTED_SUCCESS(1, 1), /* t_one */
     CUSTOM_EXPECTED_SUCCESS(-1, -1), /* t_one_neg */
     CUSTOM_EXPECTED_SUCCESS(-256, -256), /* t_minus_256 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_9bytes_1 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_1 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_2 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_3_pad */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_4_neg */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_5_negpad */
-    CUSTOM_EXPECTED_FAILURE,     /* t_5bytes_1 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_1 (too large positive) */
-    CUSTOM_EXPECTED_SUCCESS(INT32_MAX - 1, INT32_MAX -1), /* t_4bytes_2 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_3_pad (illegal padding) */
+    CUSTOM_EXPECTED_FAILURE, /* t_9bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_2 */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_3_pad */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_4_neg */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_5_negpad */
+    CUSTOM_EXPECTED_FAILURE, /* t_5bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_1 (too large positive) */
+    CUSTOM_EXPECTED_SUCCESS(INT32_MAX - 1, INT32_MAX - 1), /* t_4bytes_2 */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_3_pad (illegal padding) */
     CUSTOM_EXPECTED_SUCCESS(INT32_MIN, INT32_MIN), /* t_4bytes_4_neg */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_5_negpad (illegal padding) */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_5_negpad (illegal padding) */
 };
 static ASN1_LONG_DATA long_encdec_data_32bit[] = {
     ENCDEC_ARRAY(LONG_MAX - 1, LONG_MAX, LONG_MIN, LONG_MIN),
@@ -236,23 +241,25 @@ static TEST_PACKAGE long_test_package_32bit = {
 
 static ASN1_LONG_DATA long_expected_64bit[] = {
     /* The following should fail on the second because it's the default */
-    { 0xff, 0, 1 }, { 0, 0, 0 }, /* t_zero */
-    { 0, 0, 0 }, { 0xff, 1, 0x7fffffff }, /* t_longundef */
+    { 0xff, 0, 1 },
+    { 0, 0, 0 }, /* t_zero */
+    { 0, 0, 0 },
+    { 0xff, 1, 0x7fffffff }, /* t_longundef */
     CUSTOM_EXPECTED_SUCCESS(1, 1), /* t_one */
     CUSTOM_EXPECTED_SUCCESS(-1, -1), /* t_one_neg */
     CUSTOM_EXPECTED_SUCCESS(-256, -256), /* t_minus_256 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_9bytes_1 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_9bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_1 */
     CUSTOM_EXPECTED_SUCCESS(LONG_MAX, LONG_MAX), /* t_8bytes_2 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_3_pad (illegal padding) */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_3_pad (illegal padding) */
     CUSTOM_EXPECTED_SUCCESS(LONG_MIN, LONG_MIN), /* t_8bytes_4_neg */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_5_negpad (illegal padding) */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_5_negpad (illegal padding) */
     CUSTOM_EXPECTED_SUCCESS((long)0x1ffffffff, (long)0x1ffffffff), /* t_5bytes_1 */
     CUSTOM_EXPECTED_SUCCESS((long)0x80000000, (long)0x80000000), /* t_4bytes_1 */
-    CUSTOM_EXPECTED_SUCCESS(INT32_MAX - 1, INT32_MAX -1), /* t_4bytes_2 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_3_pad (illegal padding) */
+    CUSTOM_EXPECTED_SUCCESS(INT32_MAX - 1, INT32_MAX - 1), /* t_4bytes_2 */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_3_pad (illegal padding) */
     CUSTOM_EXPECTED_SUCCESS(INT32_MIN, INT32_MIN), /* t_4bytes_4_neg */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_5_negpad (illegal padding) */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_5_negpad (illegal padding) */
 };
 static ASN1_LONG_DATA long_encdec_data_64bit[] = {
     ENCDEC_ARRAY(LONG_MAX, LONG_MAX, LONG_MIN, LONG_MIN),
@@ -285,7 +292,7 @@ ASN1_SEQUENCE(ASN1_INT32_DATA) = {
     ASN1_EXP_OPT_EMBED(ASN1_INT32_DATA, test_zint32, ZINT32, 0)
 } static_ASN1_SEQUENCE_END(ASN1_INT32_DATA)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_INT32_DATA)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_INT32_DATA)
 IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(ASN1_INT32_DATA)
 
 static ASN1_INT32_DATA int32_expected[] = {
@@ -294,18 +301,18 @@ static ASN1_INT32_DATA int32_expected[] = {
     CUSTOM_EXPECTED_SUCCESS(1, 1), /* t_one */
     CUSTOM_EXPECTED_SUCCESS(-1, -1), /* t_one_neg */
     CUSTOM_EXPECTED_SUCCESS(-256, -256), /* t_minus_256 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_9bytes_1 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_1 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_2 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_3_pad */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_4_neg */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_5_negpad */
-    CUSTOM_EXPECTED_FAILURE,     /* t_5bytes_1 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_1 (too large positive) */
-    CUSTOM_EXPECTED_SUCCESS(INT32_MAX - 1, INT32_MAX -1), /* t_4bytes_2 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_3_pad (illegal padding) */
+    CUSTOM_EXPECTED_FAILURE, /* t_9bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_2 */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_3_pad */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_4_neg */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_5_negpad */
+    CUSTOM_EXPECTED_FAILURE, /* t_5bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_1 (too large positive) */
+    CUSTOM_EXPECTED_SUCCESS(INT32_MAX - 1, INT32_MAX - 1), /* t_4bytes_2 */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_3_pad (illegal padding) */
     CUSTOM_EXPECTED_SUCCESS(INT32_MIN, INT32_MIN), /* t_4bytes_4_neg */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_5_negpad (illegal padding) */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_5_negpad (illegal padding) */
 };
 static ASN1_INT32_DATA int32_encdec_data[] = {
     ENCDEC_ARRAY(INT32_MAX, INT32_MAX, INT32_MIN, INT32_MIN),
@@ -333,27 +340,27 @@ ASN1_SEQUENCE(ASN1_UINT32_DATA) = {
     ASN1_EXP_OPT_EMBED(ASN1_UINT32_DATA, test_zuint32, ZUINT32, 0)
 } static_ASN1_SEQUENCE_END(ASN1_UINT32_DATA)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_UINT32_DATA)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_UINT32_DATA)
 IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(ASN1_UINT32_DATA)
 
 static ASN1_UINT32_DATA uint32_expected[] = {
     CUSTOM_EXPECTED_SUCCESS(0, 0), /* t_zero */
     CUSTOM_EXPECTED_SUCCESS(ASN1_LONG_UNDEF, ASN1_LONG_UNDEF), /* t_zero */
     CUSTOM_EXPECTED_SUCCESS(1, 1), /* t_one */
-    CUSTOM_EXPECTED_FAILURE,     /* t_one_neg (illegal negative value) */
-    CUSTOM_EXPECTED_FAILURE,     /* t_minus_256 (illegal negative value) */
-    CUSTOM_EXPECTED_FAILURE,     /* t_9bytes_1 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_1 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_2 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_3_pad */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_4_neg */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_5_negpad */
-    CUSTOM_EXPECTED_FAILURE,     /* t_5bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_one_neg (illegal negative value) */
+    CUSTOM_EXPECTED_FAILURE, /* t_minus_256 (illegal negative value) */
+    CUSTOM_EXPECTED_FAILURE, /* t_9bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_2 */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_3_pad */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_4_neg */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_5_negpad */
+    CUSTOM_EXPECTED_FAILURE, /* t_5bytes_1 */
     CUSTOM_EXPECTED_SUCCESS(0x80000000, 0x80000000), /* t_4bytes_1 */
-    CUSTOM_EXPECTED_SUCCESS(INT32_MAX - 1, INT32_MAX -1), /* t_4bytes_2 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_3_pad (illegal padding) */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_4_neg (illegal negative value) */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_5_negpad (illegal padding) */
+    CUSTOM_EXPECTED_SUCCESS(INT32_MAX - 1, INT32_MAX - 1), /* t_4bytes_2 */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_3_pad (illegal padding) */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_4_neg (illegal negative value) */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_5_negpad (illegal padding) */
 };
 static ASN1_UINT32_DATA uint32_encdec_data[] = {
     ENCDEC_ARRAY(UINT32_MAX, UINT32_MAX, 0, 0),
@@ -381,7 +388,7 @@ ASN1_SEQUENCE(ASN1_INT64_DATA) = {
     ASN1_EXP_OPT_EMBED(ASN1_INT64_DATA, test_zint64, ZINT64, 0)
 } static_ASN1_SEQUENCE_END(ASN1_INT64_DATA)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_INT64_DATA)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_INT64_DATA)
 IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(ASN1_INT64_DATA)
 
 static ASN1_INT64_DATA int64_expected[] = {
@@ -390,18 +397,18 @@ static ASN1_INT64_DATA int64_expected[] = {
     CUSTOM_EXPECTED_SUCCESS(1, 1), /* t_one */
     CUSTOM_EXPECTED_SUCCESS(-1, -1), /* t_one_neg */
     CUSTOM_EXPECTED_SUCCESS(-256, -256), /* t_minus_256 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_9bytes_1 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_1 (too large positive) */
+    CUSTOM_EXPECTED_FAILURE, /* t_9bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_1 (too large positive) */
     CUSTOM_EXPECTED_SUCCESS(INT64_MAX, INT64_MAX), /* t_8bytes_2 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_3_pad (illegal padding) */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_3_pad (illegal padding) */
     CUSTOM_EXPECTED_SUCCESS(INT64_MIN, INT64_MIN), /* t_8bytes_4_neg */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_5_negpad (illegal padding) */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_5_negpad (illegal padding) */
     CUSTOM_EXPECTED_SUCCESS(0x1ffffffffULL, 0x1ffffffffULL), /* t_5bytes_1 */
     CUSTOM_EXPECTED_SUCCESS(0x80000000, 0x80000000), /* t_4bytes_1 */
-    CUSTOM_EXPECTED_SUCCESS(INT32_MAX - 1, INT32_MAX -1), /* t_4bytes_2 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_3_pad (illegal padding) */
+    CUSTOM_EXPECTED_SUCCESS(INT32_MAX - 1, INT32_MAX - 1), /* t_4bytes_2 */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_3_pad (illegal padding) */
     CUSTOM_EXPECTED_SUCCESS(INT32_MIN, INT32_MIN), /* t_4bytes_4_neg */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_5_negpad (illegal padding) */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_5_negpad (illegal padding) */
 };
 static ASN1_INT64_DATA int64_encdec_data[] = {
     ENCDEC_ARRAY(INT64_MAX, INT64_MAX, INT64_MIN, INT64_MIN),
@@ -430,28 +437,28 @@ ASN1_SEQUENCE(ASN1_UINT64_DATA) = {
     ASN1_EXP_OPT_EMBED(ASN1_UINT64_DATA, test_zuint64, ZUINT64, 0)
 } static_ASN1_SEQUENCE_END(ASN1_UINT64_DATA)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_UINT64_DATA)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_UINT64_DATA)
 IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(ASN1_UINT64_DATA)
 
 static ASN1_UINT64_DATA uint64_expected[] = {
     CUSTOM_EXPECTED_SUCCESS(0, 0), /* t_zero */
     CUSTOM_EXPECTED_SUCCESS(ASN1_LONG_UNDEF, ASN1_LONG_UNDEF), /* t_zero */
     CUSTOM_EXPECTED_SUCCESS(1, 1), /* t_one */
-    CUSTOM_EXPECTED_FAILURE,     /* t_one_neg (illegal negative value) */
-    CUSTOM_EXPECTED_FAILURE,     /* t_minus_256 (illegal negative value) */
-    CUSTOM_EXPECTED_FAILURE,     /* t_9bytes_1 */
-    CUSTOM_EXPECTED_SUCCESS((uint64_t)INT64_MAX+1, (uint64_t)INT64_MAX+1),
-                                 /* t_8bytes_1 */
+    CUSTOM_EXPECTED_FAILURE, /* t_one_neg (illegal negative value) */
+    CUSTOM_EXPECTED_FAILURE, /* t_minus_256 (illegal negative value) */
+    CUSTOM_EXPECTED_FAILURE, /* t_9bytes_1 */
+    CUSTOM_EXPECTED_SUCCESS((uint64_t)INT64_MAX + 1, (uint64_t)INT64_MAX + 1),
+    /* t_8bytes_1 */
     CUSTOM_EXPECTED_SUCCESS(INT64_MAX, INT64_MAX), /* t_8bytes_2 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_3_pad */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_4_neg */
-    CUSTOM_EXPECTED_FAILURE,     /* t_8bytes_5_negpad */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_3_pad */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_4_neg */
+    CUSTOM_EXPECTED_FAILURE, /* t_8bytes_5_negpad */
     CUSTOM_EXPECTED_SUCCESS(0x1ffffffffULL, 0x1ffffffffULL), /* t_5bytes_1 */
     CUSTOM_EXPECTED_SUCCESS(0x80000000, 0x80000000), /* t_4bytes_1 */
-    CUSTOM_EXPECTED_SUCCESS(INT32_MAX - 1, INT32_MAX -1), /* t_4bytes_2 */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_3_pad (illegal padding) */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_4_neg (illegal negative value) */
-    CUSTOM_EXPECTED_FAILURE,     /* t_4bytes_5_negpad (illegal padding) */
+    CUSTOM_EXPECTED_SUCCESS(INT32_MAX - 1, INT32_MAX - 1), /* t_4bytes_2 */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_3_pad (illegal padding) */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_4_neg (illegal negative value) */
+    CUSTOM_EXPECTED_FAILURE, /* t_4bytes_5_negpad (illegal padding) */
 };
 static ASN1_UINT64_DATA uint64_encdec_data[] = {
     ENCDEC_ARRAY(UINT64_MAX, UINT64_MAX, 0, 0),
@@ -467,11 +474,10 @@ static TEST_PACKAGE uint64_test_package = {
 
 /***** General testing functions *********************************************/
 
-
 /* Template structure to map onto any test data structure */
 typedef struct {
     ASN1_BOOLEAN success;
-    unsigned char bytes[1];       /* In reality, there's more */
+    unsigned char bytes[1]; /* In reality, there's more */
 } EXPECTED;
 
 /*
@@ -482,8 +488,8 @@ typedef struct {
  *      1       decoded structure was what was expected (success)
  */
 static int do_decode(unsigned char *bytes, long nbytes,
-                     const EXPECTED *expected, size_t expected_size,
-                     const TEST_PACKAGE *package)
+    const EXPECTED *expected, size_t expected_size,
+    const TEST_PACKAGE *package)
 {
     EXPECTED *enctst = NULL;
     const unsigned char *start;
@@ -518,8 +524,8 @@ static int do_decode(unsigned char *bytes, long nbytes,
  *      1       encoded DER was what was expected (success)
  */
 static int do_encode(EXPECTED *input,
-                     const unsigned char *expected, size_t expected_len,
-                     const TEST_PACKAGE *package)
+    const unsigned char *expected, size_t expected_len,
+    const TEST_PACKAGE *package)
 {
     unsigned char *data = NULL;
     int len;
@@ -547,7 +553,7 @@ static int do_encode(EXPECTED *input,
 
 /* Do an encode/decode round trip */
 static int do_enc_dec(EXPECTED *bytes, long nbytes,
-                      const TEST_PACKAGE *package)
+    const TEST_PACKAGE *package)
 {
     unsigned char *data = NULL;
     int len;
@@ -592,7 +598,7 @@ static size_t der_encode_length(size_t len, unsigned char **pp)
 }
 
 static size_t make_custom_der(const TEST_CUSTOM_DATA *custom_data,
-                              unsigned char **encoding, int explicit_default)
+    unsigned char **encoding, int explicit_default)
 {
     size_t firstbytes, secondbytes = 0, secondbytesinner = 0, seqbytes;
     const unsigned char t_true[] = { V_ASN1_BOOLEAN, 0x01, 0xff };
@@ -602,8 +608,7 @@ static size_t make_custom_der(const TEST_CUSTOM_DATA *custom_data,
     /*
      * The first item is just an INTEGER tag, INTEGER length and INTEGER content
      */
-    firstbytes =
-        1 + der_encode_length(custom_data->nbytes1, NULL)
+    firstbytes = 1 + der_encode_length(custom_data->nbytes1, NULL)
         + custom_data->nbytes1;
 
     for (i = custom_data->nbytes2; i > 0; i--) {
@@ -615,11 +620,9 @@ static size_t make_custom_der(const TEST_CUSTOM_DATA *custom_data,
          * The second item is an explicit tag, content length, INTEGER tag,
          * INTEGER length, INTEGER bytes
          */
-        secondbytesinner =
-            1 + der_encode_length(custom_data->nbytes2, NULL)
+        secondbytesinner = 1 + der_encode_length(custom_data->nbytes2, NULL)
             + custom_data->nbytes2;
-        secondbytes =
-            1 + der_encode_length(secondbytesinner, NULL) + secondbytesinner;
+        secondbytes = 1 + der_encode_length(secondbytesinner, NULL) + secondbytesinner;
     }
 
     /*
@@ -627,8 +630,7 @@ static size_t make_custom_der(const TEST_CUSTOM_DATA *custom_data,
      * (copied from t_true), the first (firstbytes) and second (secondbytes)
      * items
      */
-    seqbytes =
-        1 + der_encode_length(sizeof(t_true) + firstbytes + secondbytes, NULL)
+    seqbytes = 1 + der_encode_length(sizeof(t_true) + firstbytes + secondbytes, NULL)
         + sizeof(t_true) + firstbytes + secondbytes;
 
     *encoding = p = OPENSSL_malloc(seqbytes);
@@ -667,8 +669,8 @@ static size_t make_custom_der(const TEST_CUSTOM_DATA *custom_data,
 
 /* Attempt to decode a custom encoding of the test structure */
 static int do_decode_custom(const TEST_CUSTOM_DATA *custom_data,
-                            const EXPECTED *expected, size_t expected_size,
-                            const TEST_PACKAGE *package)
+    const EXPECTED *expected, size_t expected_size,
+    const TEST_PACKAGE *package)
 {
     unsigned char *encoding = NULL;
     /*
@@ -682,7 +684,7 @@ static int do_decode_custom(const TEST_CUSTOM_DATA *custom_data,
         return -1;
 
     ret = do_decode(encoding, encoding_length, expected, expected_size,
-                    package);
+        package);
     OPENSSL_free(encoding);
 
     return ret;
@@ -690,8 +692,8 @@ static int do_decode_custom(const TEST_CUSTOM_DATA *custom_data,
 
 /* Attempt to encode the test structure and compare it to custom DER */
 static int do_encode_custom(EXPECTED *input,
-                            const TEST_CUSTOM_DATA *custom_data,
-                            const TEST_PACKAGE *package)
+    const TEST_CUSTOM_DATA *custom_data,
+    const TEST_PACKAGE *package)
 {
     unsigned char *expected = NULL;
     size_t expected_length = make_custom_der(custom_data, &expected, 0);
@@ -717,15 +719,14 @@ static int do_print_item(const TEST_PACKAGE *package)
     if ((o = OPENSSL_malloc(DATA_BUF_SIZE)) == NULL)
         return 0;
 
-    (void)RAND_bytes((unsigned char*)o,
-                     (int)package->encode_expectations_elem_size);
+    (void)RAND_bytes((unsigned char *)o,
+        (int)package->encode_expectations_elem_size);
     ret = ASN1_item_print(bio_err, o, 0, i, NULL);
     OPENSSL_free(o);
 
     return ret;
 }
 
-
 static int test_intern(const TEST_PACKAGE *package)
 {
     unsigned int i;
@@ -748,14 +749,14 @@ static int test_intern(const TEST_PACKAGE *package)
         case -1:
             if (expected->success) {
                 TEST_error("Failed custom encode round trip %u of %s",
-                           i, package->name);
+                    i, package->name);
                 TEST_openssl_errors();
                 fail++;
             }
             break;
         case 0:
             TEST_error("Custom encode round trip %u of %s mismatch",
-                       i, package->name);
+                i, package->name);
             TEST_openssl_errors();
             fail++;
             break;
@@ -763,22 +764,22 @@ static int test_intern(const TEST_PACKAGE *package)
             break;
         default:
             OPENSSL_die("do_encode_custom() return unknown value",
-                        __FILE__, __LINE__);
+                __FILE__, __LINE__);
         }
         switch (do_decode_custom(&test_custom_data[i], expected,
-                                 package->encode_expectations_elem_size,
-                                 package)) {
+            package->encode_expectations_elem_size,
+            package)) {
         case -1:
             if (expected->success) {
                 TEST_error("Failed custom decode round trip %u of %s",
-                           i, package->name);
+                    i, package->name);
                 TEST_openssl_errors();
                 fail++;
             }
             break;
         case 0:
             TEST_error("Custom decode round trip %u of %s mismatch",
-                       i, package->name);
+                i, package->name);
             TEST_openssl_errors();
             fail++;
             break;
@@ -786,7 +787,7 @@ static int test_intern(const TEST_PACKAGE *package)
             break;
         default:
             OPENSSL_die("do_decode_custom() return unknown value",
-                        __FILE__, __LINE__);
+                __FILE__, __LINE__);
         }
     }
 
@@ -801,21 +802,21 @@ static int test_intern(const TEST_PACKAGE *package)
         case -1:
             if (expected->success) {
                 TEST_error("Failed encode/decode round trip %u of %s",
-                           i, package->name);
+                    i, package->name);
                 TEST_openssl_errors();
                 fail++;
             }
             break;
         case 0:
             TEST_error("Encode/decode round trip %u of %s mismatch",
-                       i, package->name);
+                i, package->name);
             fail++;
             break;
         case 1:
             break;
         default:
             OPENSSL_die("do_enc_dec() return unknown value",
-                        __FILE__, __LINE__);
+                __FILE__, __LINE__);
         }
     }
 
@@ -872,7 +873,7 @@ ASN1_SEQUENCE(INVALIDTEMPLATE) = {
     ASN1_IMP(INVALIDTEMPLATE, invalidDirString, DIRECTORYSTRING, 12)
 } static_ASN1_SEQUENCE_END(INVALIDTEMPLATE)
 
-IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(INVALIDTEMPLATE)
+    IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(INVALIDTEMPLATE)
 IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(INVALIDTEMPLATE)
 
 static int test_invalid_template(void)
@@ -891,7 +892,6 @@ static int test_invalid_template(void)
     return ret < 0;
 }
 
-
 int setup_tests(void)
 {
 #ifndef OPENSSL_NO_DEPRECATED_3_0
diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index 3c2222d988dfb..4e58da2b755ce 100644
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -54,7 +54,7 @@ static int test_tbl_standard(void)
     TEST_info("asn1 tbl_standard: out of order");
     for (tmp = tbl_standard, i = 0; i < OSSL_NELEM(tbl_standard); i++, tmp++)
         TEST_note("asn1 tbl_standard: Index %zu, NID %d, Name=%s",
-                  i, tmp->nid, OBJ_nid2ln(tmp->nid));
+            i, tmp->nid, OBJ_nid2ln(tmp->nid));
 
     return 0;
 }
@@ -76,7 +76,7 @@ static int test_standard_methods(void)
     int ok = 1;
 
     for (tmp = standard_methods, i = 0; i < OSSL_NELEM(standard_methods);
-         i++, tmp++) {
+        i++, tmp++) {
         if ((*tmp)->pkey_id < last_pkey_id) {
             last_pkey_id = 0;
             break;
@@ -92,9 +92,9 @@ static int test_standard_methods(void)
          * Anything else is an error and may lead to a corrupt ASN1 method table
          */
         if (!TEST_true(((*tmp)->pem_str == NULL && ((*tmp)->pkey_flags & ASN1_PKEY_ALIAS) != 0)
-                       || ((*tmp)->pem_str != NULL && ((*tmp)->pkey_flags & ASN1_PKEY_ALIAS) == 0))) {
+                || ((*tmp)->pem_str != NULL && ((*tmp)->pkey_flags & ASN1_PKEY_ALIAS) == 0))) {
             TEST_note("asn1 standard methods: Index %zu, pkey ID %d, Name=%s",
-                      i, (*tmp)->pkey_id, OBJ_nid2sn((*tmp)->pkey_id));
+                i, (*tmp)->pkey_id, OBJ_nid2sn((*tmp)->pkey_id));
             ok = 0;
         }
     }
@@ -106,9 +106,9 @@ static int test_standard_methods(void)
 
     TEST_note("asn1 standard methods: out of order");
     for (tmp = standard_methods, i = 0; i < OSSL_NELEM(standard_methods);
-         i++, tmp++)
+        i++, tmp++)
         TEST_note("asn1 standard methods: Index %zu, pkey ID %d, Name=%s",
-                  i, (*tmp)->pkey_id, OBJ_nid2sn((*tmp)->pkey_id));
+            i, (*tmp)->pkey_id, OBJ_nid2sn((*tmp)->pkey_id));
 
     return 0;
 }
@@ -134,7 +134,7 @@ static int test_empty_nonoptional_content(void)
         || !TEST_true(RSA_set0_key(rsa, n, e, NULL)))
         goto end;
 
-    n = e = NULL;                /* They are now "owned" by |rsa| */
+    n = e = NULL; /* They are now "owned" by |rsa| */
 
     /*
      * This SHOULD fail, as we're trying to encode a public key as a private
@@ -143,7 +143,7 @@ static int test_empty_nonoptional_content(void)
     if (TEST_int_le(i2d_RSAPrivateKey(rsa, NULL), 0))
         ok = 1;
 
- end:
+end:
     RSA_free(rsa);
     BN_free(n);
     BN_free(e);
@@ -163,8 +163,8 @@ static int test_unicode(const unsigned char *univ, size_t len, int expected)
 
     for (; univ < end; univ += 4) {
         if (!TEST_int_eq(ASN1_mbstring_copy(NULL, univ, 4, MBSTRING_UNIV,
-                                            B_ASN1_UTF8STRING),
-                         expected))
+                             B_ASN1_UTF8STRING),
+                expected))
             ok = 0;
     }
     return ok;
@@ -190,6 +190,16 @@ static int test_unicode_range(void)
     return ok;
 }
 
+static int test_invalid_utf8(void)
+{
+    const unsigned char inv_utf8[] = "\xF4\x90\x80\x80";
+    unsigned long val;
+
+    if (!TEST_int_lt(UTF8_getc(inv_utf8, sizeof(inv_utf8), &val), 0))
+        return 0;
+    return 1;
+}
+
 /**********************************************************************
  *
  * Tests of object creation
@@ -241,14 +251,14 @@ static int test_obj_create(void)
         || !TEST_true(test_obj_create_once(arc "6", NULL, ln_prefix "6"))
         || !TEST_int_ne(OBJ_ln2nid(ln_prefix "6"), NID_undef)
         || !TEST_true(test_obj_create_once(arc "7",
-                                           sn_prefix "7", ln_prefix "7"))
+            sn_prefix "7", ln_prefix "7"))
         || !TEST_int_ne(OBJ_sn2nid(sn_prefix "7"), NID_undef)
         || !TEST_int_ne(OBJ_ln2nid(ln_prefix "7"), NID_undef))
         return 0;
 
     if (!TEST_false(test_obj_create_once(NULL, NULL, NULL))
         || !TEST_false(test_obj_create_once(broken_arc "8",
-                                            sn_prefix "8", ln_prefix "8")))
+            sn_prefix "8", ln_prefix "8")))
         return 0;
 
     return 1;
@@ -264,13 +274,31 @@ static int test_obj_nid_undef(void)
     return 1;
 }
 
+static int test_mbstring_ncopy(void)
+{
+    ASN1_STRING *str = NULL;
+    const unsigned char in[] = { 0xFF, 0xFE, 0xFF, 0xFE };
+    int inlen = 4;
+    int inform = MBSTRING_UNIV;
+
+    if (!TEST_int_eq(ASN1_mbstring_ncopy(&str, in, inlen, inform, B_ASN1_GENERALSTRING, 0, 0), -1)
+        || !TEST_int_eq(ASN1_mbstring_ncopy(&str, in, inlen, inform, B_ASN1_VISIBLESTRING, 0, 0), -1)
+        || !TEST_int_eq(ASN1_mbstring_ncopy(&str, in, inlen, inform, B_ASN1_VIDEOTEXSTRING, 0, 0), -1)
+        || !TEST_int_eq(ASN1_mbstring_ncopy(&str, in, inlen, inform, B_ASN1_GENERALIZEDTIME, 0, 0), -1))
+        return 0;
+
+    return 1;
+}
+
 int setup_tests(void)
 {
     ADD_TEST(test_tbl_standard);
     ADD_TEST(test_standard_methods);
     ADD_TEST(test_empty_nonoptional_content);
     ADD_TEST(test_unicode_range);
+    ADD_TEST(test_invalid_utf8);
     ADD_TEST(test_obj_create);
     ADD_TEST(test_obj_nid_undef);
+    ADD_TEST(test_mbstring_ncopy);
     return 1;
 }
diff --git a/test/asn1_stable_parse_test.c b/test/asn1_stable_parse_test.c
index 2cda581afc5a1..34183e62cdd50 100644
--- a/test/asn1_stable_parse_test.c
+++ b/test/asn1_stable_parse_test.c
@@ -24,13 +24,12 @@ const OPTIONS *test_get_options(void)
     static const OPTIONS options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the libctx" },
+            "The configuration file to use for the libctx" },
         { NULL }
     };
     return options;
 }
 
-
 /*
  * Test that parsing a config file with incorrect stable settings aren't parsed
  * and appropriate errors are raised
diff --git a/test/asn1_string_table_test.c b/test/asn1_string_table_test.c
index 5c3501b210c92..41992fad2613b 100644
--- a/test/asn1_string_table_test.c
+++ b/test/asn1_string_table_test.c
@@ -66,7 +66,7 @@ static int test_string_tbl(void)
     }
 
     rv = 1;
- out:
+out:
     return rv;
 }
 
diff --git a/test/asn1_time_test.c b/test/asn1_time_test.c
index 32bc4ff2adb1b..6e18cd00bc983 100644
--- a/test/asn1_time_test.c
+++ b/test/asn1_time_test.c
@@ -21,13 +21,13 @@
 #include "internal/nelem.h"
 
 struct testdata {
-    char *data;             /* TIME string value */
-    int type;               /* GENERALIZED OR UTC */
-    int expected_type;      /* expected type after set/set_string_gmt */
-    int check_result;       /* check result */
-    time_t t;               /* expected time_t*/
-    int cmp_result;         /* comparison to baseline result */
-    int convert_result;     /* conversion result */
+    char *data; /* TIME string value */
+    int type; /* GENERALIZED OR UTC */
+    int expected_type; /* expected type after set/set_string_gmt */
+    int check_result; /* check result */
+    time_t t; /* expected time_t*/
+    int cmp_result; /* comparison to baseline result */
+    int convert_result; /* conversion result */
 };
 
 struct TESTDATA_asn1_to_utc {
@@ -78,82 +78,538 @@ static const struct TESTDATA_asn1_to_utc asn1_to_utc[] = {
 };
 
 static struct testdata tbl_testdata_pos[] = {
-    { "0",                 V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, }, /* Bad time */
-    { "ABCD",              V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "0ABCD",             V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "1-700101000000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "`9700101000000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "19700101000000Z",   V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         0,           0,  0, 0, },
-    { "A00101000000Z",     V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         0,           0,  0, 0, },
-    { "A9700101000000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "1A700101000000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "19A00101000000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "197A0101000000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "1970A101000000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "19700A01000000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "197001A1000000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "1970010A000000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "19700101A00000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "197001010A0000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "1970010100A000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "19700101000A00Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "197001010000A0Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "1970010100000AZ",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "700101000000X",     V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         0,           0,  0, 0, },
-    { "19700101000000X",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "209912312359Z",     V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "199912310000Z",     V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 0,           0,  0, 0, },
-    { "9912312359Z",       V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         0,           0,  0, 0, },
-    { "9912310000Z",       V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         0,           0,  0, 0, },
-    { "19700101000000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         1,           0, -1, 1, }, /* Epoch begins */
-    { "700101000000Z",     V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         1,           0, -1, 1, }, /* ditto */
-    { "20380119031407Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         1,  0x7FFFFFFF,  1, 1, }, /* Max 32bit time_t */
-    { "380119031407Z",     V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         1,  0x7FFFFFFF,  1, 1, },
-    { "20371231235959Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         1,  2145916799,  1, 1, }, /* Just before 2038 */
-    { "20371231235959Z",   V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         0,           0,  0, 1, }, /* Bad UTC time */
-    { "371231235959Z",     V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         1,  2145916799,  1, 1, },
-    { "19701006121456Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         1,    24063296, -1, 1, },
-    { "701006121456Z",     V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         1,    24063296, -1, 1, },
-    { "19991231000000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         1,   946598400,  0, 1, }, /* Match baseline */
-    { "991231000000Z",     V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         1,   946598400,  0, 1, },
-    { "9912310000+0000",   V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         1,   946598400,  0, 1, },
-    { "199912310000+0000", V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         1,   946598400,  0, 1, },
-    { "9912310000-0000",   V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         1,   946598400,  0, 1, },
-    { "199912310000-0000", V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         1,   946598400,  0, 1, },
-    { "199912310100+0100", V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         1,   946598400,  0, 1, },
-    { "199912302300-0100", V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         1,   946598400,  0, 1, },
-    { "199912302300-A000", V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         0,   946598400,  0, 1, },
-    { "199912302300-0A00", V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         0,   946598400,  0, 1, },
-    { "9912310100+0100",   V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         1,   946598400,  0, 1, },
-    { "9912302300-0100",   V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         1,   946598400,  0, 1, },
+    {
+        "0",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    }, /* Bad time */
+    {
+        "ABCD",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "0ABCD",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "1-700101000000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "`9700101000000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "19700101000000Z",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "A00101000000Z",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "A9700101000000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "1A700101000000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "19A00101000000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "197A0101000000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "1970A101000000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "19700A01000000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "197001A1000000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "1970010A000000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "19700101A00000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "197001010A0000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "1970010100A000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "19700101000A00Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "197001010000A0Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "1970010100000AZ",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "700101000000X",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "19700101000000X",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "209912312359Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "199912310000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "9912312359Z",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "9912310000Z",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        0,
+        0,
+        0,
+        0,
+    },
+    {
+        "19700101000000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        1,
+        0,
+        -1,
+        1,
+    }, /* Epoch begins */
+    {
+        "700101000000Z",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        1,
+        0,
+        -1,
+        1,
+    }, /* ditto */
+    {
+        "20380119031407Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        1,
+        0x7FFFFFFF,
+        1,
+        1,
+    }, /* Max 32bit time_t */
+    {
+        "380119031407Z",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        1,
+        0x7FFFFFFF,
+        1,
+        1,
+    },
+    {
+        "20371231235959Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        1,
+        2145916799,
+        1,
+        1,
+    }, /* Just before 2038 */
+    {
+        "20371231235959Z",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        0,
+        0,
+        0,
+        1,
+    }, /* Bad UTC time */
+    {
+        "371231235959Z",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        1,
+        2145916799,
+        1,
+        1,
+    },
+    {
+        "19701006121456Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        1,
+        24063296,
+        -1,
+        1,
+    },
+    {
+        "701006121456Z",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        1,
+        24063296,
+        -1,
+        1,
+    },
+    {
+        "19991231000000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        1,
+        946598400,
+        0,
+        1,
+    }, /* Match baseline */
+    {
+        "991231000000Z",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        1,
+        946598400,
+        0,
+        1,
+    },
+    {
+        "9912310000+0000",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        1,
+        946598400,
+        0,
+        1,
+    },
+    {
+        "199912310000+0000",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        1,
+        946598400,
+        0,
+        1,
+    },
+    {
+        "9912310000-0000",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        1,
+        946598400,
+        0,
+        1,
+    },
+    {
+        "199912310000-0000",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        1,
+        946598400,
+        0,
+        1,
+    },
+    {
+        "199912310100+0100",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        1,
+        946598400,
+        0,
+        1,
+    },
+    {
+        "199912302300-0100",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        1,
+        946598400,
+        0,
+        1,
+    },
+    {
+        "199912302300-A000",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        0,
+        946598400,
+        0,
+        1,
+    },
+    {
+        "199912302300-0A00",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        0,
+        946598400,
+        0,
+        1,
+    },
+    {
+        "9912310100+0100",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        1,
+        946598400,
+        0,
+        1,
+    },
+    {
+        "9912302300-0100",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        1,
+        946598400,
+        0,
+        1,
+    },
 };
 
 /* ASSUMES SIGNED TIME_T */
 static struct testdata tbl_testdata_neg[] = {
-    { "19011213204552Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 1,     INT_MIN, -1, 0, },
-    { "691006121456Z",     V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         1,    -7472704, -1, 1, },
-    { "19691006121456Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         1,    -7472704, -1, 1, },
+    {
+        "19011213204552Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        1,
+        INT_MIN,
+        -1,
+        0,
+    },
+    {
+        "691006121456Z",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        1,
+        -7472704,
+        -1,
+        1,
+    },
+    {
+        "19691006121456Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        1,
+        -7472704,
+        -1,
+        1,
+    },
 };
 
 /* explicit casts to time_t short warnings on systems with 32-bit time_t */
 static struct testdata tbl_testdata_pos_64bit[] = {
-    { "20380119031408Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         1,  (time_t)0x80000000,  1, 1, },
-    { "20380119031409Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_UTCTIME,         1,  (time_t)0x80000001,  1, 1, },
-    { "380119031408Z",     V_ASN1_UTCTIME,         V_ASN1_UTCTIME,         1,  (time_t)0x80000000,  1, 1, },
-    { "20500101120000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 1,  (time_t)0x967b1ec0,  1, 0, },
+    {
+        "20380119031408Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        1,
+        (time_t)0x80000000,
+        1,
+        1,
+    },
+    {
+        "20380119031409Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_UTCTIME,
+        1,
+        (time_t)0x80000001,
+        1,
+        1,
+    },
+    {
+        "380119031408Z",
+        V_ASN1_UTCTIME,
+        V_ASN1_UTCTIME,
+        1,
+        (time_t)0x80000000,
+        1,
+        1,
+    },
+    {
+        "20500101120000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        1,
+        (time_t)0x967b1ec0,
+        1,
+        0,
+    },
 };
 
 /* ASSUMES SIGNED TIME_T */
 static struct testdata tbl_testdata_neg_64bit[] = {
-    { "19011213204551Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 1, (time_t)-2147483649LL, -1, 0, },
-    { "19000101120000Z",   V_ASN1_GENERALIZEDTIME, V_ASN1_GENERALIZEDTIME, 1, (time_t)-2208945600LL, -1, 0, },
+    {
+        "19011213204551Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        1,
+        (time_t)-2147483649LL,
+        -1,
+        0,
+    },
+    {
+        "19000101120000Z",
+        V_ASN1_GENERALIZEDTIME,
+        V_ASN1_GENERALIZEDTIME,
+        1,
+        (time_t)-2208945600LL,
+        -1,
+        0,
+    },
 };
 
 /* A baseline time to compare to */
 static ASN1_TIME gtime = {
     15,
     V_ASN1_GENERALIZEDTIME,
-    (unsigned char*)"19991231000000Z",
+    (unsigned char *)"19991231000000Z",
     0
 };
 static time_t gtime_t = 946598400;
@@ -166,8 +622,8 @@ static int test_table(struct testdata *tbl, int idx)
     struct testdata *td = &tbl[idx];
     int day, sec;
 
-    atime.data = (unsigned char*)td->data;
-    atime.length = strlen((char*)atime.data);
+    atime.data = (unsigned char *)td->data;
+    atime.length = strlen((char *)atime.data);
     atime.type = td->type;
     atime.flags = 0;
 
@@ -195,9 +651,7 @@ static int test_table(struct testdata *tbl, int idx)
     if (!TEST_true(ASN1_TIME_diff(&day, &sec, &gtime, &atime))) {
         TEST_info("ASN1_TIME_diff(%s) to baseline failed", atime.data);
         error = 1;
-    } else if (!((td->cmp_result == 0 && TEST_true((day == 0 && sec == 0))) ||
-                 (td->cmp_result == -1 && TEST_true((day < 0 || sec < 0))) ||
-                 (td->cmp_result == 1 && TEST_true((day > 0 || sec > 0))))) {
+    } else if (!((td->cmp_result == 0 && TEST_true((day == 0 && sec == 0))) || (td->cmp_result == -1 && TEST_true((day < 0 || sec < 0))) || (td->cmp_result == 1 && TEST_true((day > 0 || sec > 0))))) {
         TEST_info("ASN1_TIME_diff(%s) to baseline bad comparison", atime.data);
         error = 1;
     }
@@ -215,7 +669,7 @@ static int test_table(struct testdata *tbl, int idx)
         int local_error = 0;
         if (!TEST_int_eq(ASN1_TIME_cmp_time_t(ptime, td->t), 0)) {
             TEST_info("ASN1_TIME_set(%ld) compare failed (%s->%s)",
-                    (long)td->t, td->data, ptime->data);
+                (long)td->t, td->data, ptime->data);
             local_error = error = 1;
         }
         if (!TEST_int_eq(ptime->type, td->expected_type)) {
@@ -337,31 +791,31 @@ static unsigned char TOMORROW_GEN_STR[] = "20170826000000Z";
 static unsigned char TODAY_UTC_STR[] = "170825000000Z";
 static unsigned char TOMORROW_UTC_STR[] = "170826000000Z";
 
-#define TODAY_GEN    { sizeof(TODAY_GEN_STR)-1, V_ASN1_GENERALIZEDTIME, TODAY_GEN_STR, 0 }
-#define TOMORROW_GEN { sizeof(TOMORROW_GEN_STR)-1, V_ASN1_GENERALIZEDTIME, TOMORROW_GEN_STR, 0 }
-#define TODAY_UTC    { sizeof(TODAY_UTC_STR)-1, V_ASN1_UTCTIME, TODAY_UTC_STR, 0 }
-#define TOMORROW_UTC { sizeof(TOMORROW_UTC_STR)-1, V_ASN1_UTCTIME, TOMORROW_UTC_STR, 0 }
+#define TODAY_GEN { sizeof(TODAY_GEN_STR) - 1, V_ASN1_GENERALIZEDTIME, TODAY_GEN_STR, 0 }
+#define TOMORROW_GEN { sizeof(TOMORROW_GEN_STR) - 1, V_ASN1_GENERALIZEDTIME, TOMORROW_GEN_STR, 0 }
+#define TODAY_UTC { sizeof(TODAY_UTC_STR) - 1, V_ASN1_UTCTIME, TODAY_UTC_STR, 0 }
+#define TOMORROW_UTC { sizeof(TOMORROW_UTC_STR) - 1, V_ASN1_UTCTIME, TOMORROW_UTC_STR, 0 }
 
 static struct compare_testdata tbl_compare_testdata[] = {
-    { TODAY_GEN,    TODAY_GEN,     0 },
-    { TODAY_GEN,    TODAY_UTC,     0 },
-    { TODAY_GEN,    TOMORROW_GEN, -1 },
-    { TODAY_GEN,    TOMORROW_UTC, -1 },
-
-    { TODAY_UTC,    TODAY_GEN,     0 },
-    { TODAY_UTC,    TODAY_UTC,     0 },
-    { TODAY_UTC,    TOMORROW_GEN, -1 },
-    { TODAY_UTC,    TOMORROW_UTC, -1 },
-
-    { TOMORROW_GEN, TODAY_GEN,     1 },
-    { TOMORROW_GEN, TODAY_UTC,     1 },
-    { TOMORROW_GEN, TOMORROW_GEN,  0 },
-    { TOMORROW_GEN, TOMORROW_UTC,  0 },
-
-    { TOMORROW_UTC, TODAY_GEN,     1 },
-    { TOMORROW_UTC, TODAY_UTC,     1 },
-    { TOMORROW_UTC, TOMORROW_GEN,  0 },
-    { TOMORROW_UTC, TOMORROW_UTC,  0 }
+    { TODAY_GEN, TODAY_GEN, 0 },
+    { TODAY_GEN, TODAY_UTC, 0 },
+    { TODAY_GEN, TOMORROW_GEN, -1 },
+    { TODAY_GEN, TOMORROW_UTC, -1 },
+
+    { TODAY_UTC, TODAY_GEN, 0 },
+    { TODAY_UTC, TODAY_UTC, 0 },
+    { TODAY_UTC, TOMORROW_GEN, -1 },
+    { TODAY_UTC, TOMORROW_UTC, -1 },
+
+    { TOMORROW_GEN, TODAY_GEN, 1 },
+    { TOMORROW_GEN, TODAY_UTC, 1 },
+    { TOMORROW_GEN, TOMORROW_GEN, 0 },
+    { TOMORROW_GEN, TOMORROW_UTC, 0 },
+
+    { TOMORROW_UTC, TODAY_GEN, 1 },
+    { TOMORROW_UTC, TODAY_UTC, 1 },
+    { TOMORROW_UTC, TOMORROW_GEN, 0 },
+    { TOMORROW_UTC, TOMORROW_UTC, 0 }
 };
 
 static int test_table_compare(int idx)
@@ -423,7 +877,7 @@ static int test_time_dup(void)
     }
 
     ret = 1;
- err:
+err:
     ASN1_STRING_free(asn1_time);
     ASN1_STRING_free(asn1_gentime);
     ASN1_STRING_free(asn1_time_dup);
@@ -438,9 +892,9 @@ static int convert_asn1_to_time_t(int idx)
 
     if (!TEST_time_t_eq(testdateutc, asn1_to_utc[idx].expected)) {
         TEST_info("test_asn1_string_to_time_t (%s) failed: expected %lli, got %lli\n",
-                  asn1_to_utc[idx].input,
-                  (long long int)asn1_to_utc[idx].expected,
-                  (long long int)testdateutc);
+            asn1_to_utc[idx].input,
+            (long long int)asn1_to_utc[idx].expected,
+            (long long int)testdateutc);
         return 0;
     }
     return 1;
diff --git a/test/asynciotest.c b/test/asynciotest.c
index 10c958f667fbd..7d152125df5e4 100644
--- a/test/asynciotest.c
+++ b/test/asynciotest.c
@@ -33,7 +33,7 @@ static int async_gets(BIO *bp, char *buf, int size);
 static int async_puts(BIO *bp, const char *str);
 
 /* Choose a sufficiently large type likely to be unused for this custom BIO */
-# define BIO_TYPE_ASYNC_FILTER  (0x80 | BIO_TYPE_FILTER)
+#define BIO_TYPE_ASYNC_FILTER (0x80 | BIO_TYPE_FILTER)
 
 static BIO_METHOD *methods_async = NULL;
 
@@ -46,7 +46,7 @@ static const BIO_METHOD *bio_f_async_filter(void)
 {
     if (methods_async == NULL) {
         methods_async = BIO_meth_new(BIO_TYPE_ASYNC_FILTER, "Async filter");
-        if (   methods_async == NULL
+        if (methods_async == NULL
             || !BIO_meth_set_write(methods_async, async_write)
             || !BIO_meth_set_read(methods_async, async_read)
             || !BIO_meth_set_puts(methods_async, async_puts)
@@ -114,12 +114,12 @@ static int async_read(BIO *bio, char *out, int outl)
     return ret;
 }
 
-#define MIN_RECORD_LEN  6
+#define MIN_RECORD_LEN 6
 
-#define CONTENTTYPEPOS  0
-#define VERSIONHIPOS    1
-#define VERSIONLOPOS    2
-#define DATAPOS         5
+#define CONTENTTYPEPOS 0
+#define VERSIONHIPOS 1
+#define VERSIONLOPOS 2
+#define DATAPOS 5
 
 static int async_write(BIO *bio, const char *in, int inl)
 {
@@ -151,9 +151,9 @@ static int async_write(BIO *bio, const char *in, int inl)
                 unsigned int msgtype = 0, negversion = 0;
 
                 if (!PACKET_get_1(&pkt, &contenttype)
-                        || !PACKET_get_1(&pkt, &versionhi)
-                        || !PACKET_get_1(&pkt, &versionlo)
-                        || !PACKET_get_length_prefixed_2(&pkt, &payload))
+                    || !PACKET_get_1(&pkt, &versionhi)
+                    || !PACKET_get_1(&pkt, &versionlo)
+                    || !PACKET_get_length_prefixed_2(&pkt, &payload))
                     return -1;
 
                 /* Pretend we wrote out the record header */
@@ -161,25 +161,25 @@ static int async_write(BIO *bio, const char *in, int inl)
 
                 wholebody = payload;
                 if (contenttype == SSL3_RT_HANDSHAKE
-                        && !PACKET_get_1(&wholebody, &msgtype))
+                    && !PACKET_get_1(&wholebody, &msgtype))
                     return -1;
 
                 if (msgtype == SSL3_MT_SERVER_HELLO) {
                     if (!PACKET_forward(&wholebody,
-                                            SSL3_HM_HEADER_LENGTH - 1)
-                            || !PACKET_get_net_2(&wholebody, &negversion)
-                               /* Skip random (32 bytes) */
-                            || !PACKET_forward(&wholebody, 32)
-                               /* Skip session id */
-                            || !PACKET_get_length_prefixed_1(&wholebody,
-                                                             &sessionid)
-                               /*
-                                * Skip ciphersuite (2 bytes) and compression
-                                * method (1 byte)
-                                */
-                            || !PACKET_forward(&wholebody, 2 + 1)
-                            || !PACKET_get_length_prefixed_2(&wholebody,
-                                                             &extensions))
+                            SSL3_HM_HEADER_LENGTH - 1)
+                        || !PACKET_get_net_2(&wholebody, &negversion)
+                        /* Skip random (32 bytes) */
+                        || !PACKET_forward(&wholebody, 32)
+                        /* Skip session id */
+                        || !PACKET_get_length_prefixed_1(&wholebody,
+                            &sessionid)
+                        /*
+                         * Skip ciphersuite (2 bytes) and compression
+                         * method (1 byte)
+                         */
+                        || !PACKET_forward(&wholebody, 2 + 1)
+                        || !PACKET_get_length_prefixed_2(&wholebody,
+                            &extensions))
                         return -1;
 
                     /*
@@ -191,13 +191,13 @@ static int async_write(BIO *bio, const char *in, int inl)
                         PACKET extbody;
 
                         if (!PACKET_get_net_2(&extensions, &type)
-                                || !PACKET_get_length_prefixed_2(&extensions,
+                            || !PACKET_get_length_prefixed_2(&extensions,
                                 &extbody))
                             return -1;
 
                         if (type == TLSEXT_TYPE_supported_versions
-                                && (!PACKET_get_net_2(&extbody, &negversion)
-                                    || PACKET_remaining(&extbody) != 0))
+                            && (!PACKET_get_net_2(&extbody, &negversion)
+                                || PACKET_remaining(&extbody) != 0))
                             return -1;
                     }
                 }
@@ -212,7 +212,7 @@ static int async_write(BIO *bio, const char *in, int inl)
                         0, /* Version lo */
                         0, /* Length hi */
                         1, /* Length lo */
-                        0  /* Data */
+                        0 /* Data */
                     };
 
                     smallrec[CONTENTTYPEPOS] = contenttype;
@@ -229,8 +229,8 @@ static int async_write(BIO *bio, const char *in, int inl)
                  * TLS1.2), otherwise we get a bad record MAC
                  */
                 if (contenttype == SSL3_RT_CHANGE_CIPHER_SPEC
-                        || (negversion == TLS1_3_VERSION
-                            && msgtype == SSL3_MT_SERVER_HELLO)) {
+                    || (negversion == TLS1_3_VERSION
+                        && msgtype == SSL3_MT_SERVER_HELLO)) {
                     fragment = 0;
                     break;
                 }
@@ -284,7 +284,7 @@ static int async_puts(BIO *bio, const char *str)
     return async_write(bio, str, strlen(str));
 }
 
-#define MAX_ATTEMPTS    100
+#define MAX_ATTEMPTS 100
 
 static int test_asyncio(int test)
 {
@@ -297,9 +297,9 @@ static int test_asyncio(int test)
     char buf[sizeof(testdata)];
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION, 0,
-                                       &serverctx, &clientctx, cert, privkey)))
+            TLS_client_method(),
+            TLS1_VERSION, 0,
+            &serverctx, &clientctx, cert, privkey)))
         goto end;
 
     /*
@@ -311,11 +311,10 @@ static int test_asyncio(int test)
     if (test == 1)
         fragment = 1;
 
-
     s_to_c_fbio = BIO_new(bio_f_async_filter());
     c_to_s_fbio = BIO_new(bio_f_async_filter());
     if (!TEST_ptr(s_to_c_fbio)
-            || !TEST_ptr(c_to_s_fbio)) {
+        || !TEST_ptr(c_to_s_fbio)) {
         BIO_free(s_to_c_fbio);
         BIO_free(c_to_s_fbio);
         goto end;
@@ -323,9 +322,9 @@ static int test_asyncio(int test)
 
     /* BIOs get freed on error */
     if (!TEST_true(create_ssl_objects(serverctx, clientctx, &serverssl,
-                                      &clientssl, s_to_c_fbio, c_to_s_fbio))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                          SSL_ERROR_NONE)))
+            &clientssl, s_to_c_fbio, c_to_s_fbio))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     /*
@@ -348,8 +347,7 @@ static int test_asyncio(int test)
             } else {
                 int ssl_error = SSL_get_error(clientssl, ret);
 
-                if (!TEST_false(ssl_error == SSL_ERROR_SYSCALL ||
-                                ssl_error == SSL_ERROR_SSL))
+                if (!TEST_false(ssl_error == SSL_ERROR_SYSCALL || ssl_error == SSL_ERROR_SSL))
                     goto end;
             }
         }
@@ -361,16 +359,14 @@ static int test_asyncio(int test)
          * it could fail once for each byte read, including all overhead
          * bytes from the record header/padding etc.
          */
-        for (ret = -1, i = 0, len = 0; len != sizeof(testdata) &&
-                i < MAX_ATTEMPTS; i++) {
+        for (ret = -1, i = 0, len = 0; len != sizeof(testdata) && i < MAX_ATTEMPTS; i++) {
             ret = SSL_read(serverssl, buf + len, sizeof(buf) - len);
             if (ret > 0) {
                 len += ret;
             } else {
                 int ssl_error = SSL_get_error(serverssl, ret);
 
-                if (!TEST_false(ssl_error == SSL_ERROR_SYSCALL ||
-                                ssl_error == SSL_ERROR_SSL))
+                if (!TEST_false(ssl_error == SSL_ERROR_SYSCALL || ssl_error == SSL_ERROR_SSL))
                     goto end;
             }
         }
@@ -385,7 +381,7 @@ static int test_asyncio(int test)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(clientssl);
     SSL_free(serverssl);
     SSL_CTX_free(clientctx);
@@ -404,7 +400,7 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(cert = test_get_argument(0))
-            || !TEST_ptr(privkey = test_get_argument(1)))
+        || !TEST_ptr(privkey = test_get_argument(1)))
         return 0;
 
     ADD_ALL_TESTS(test_asyncio, 2);
diff --git a/test/asynctest.c b/test/asynctest.c
index a441d09ad4b90..dbdb093be84dd 100644
--- a/test/asynctest.c
+++ b/test/asynctest.c
@@ -8,7 +8,7 @@
  */
 
 #ifdef _WIN32
-# include <windows.h>
+#include <windows.h>
 #endif
 
 #include <stdio.h>
@@ -72,13 +72,12 @@ static int change_deflt_libctx(void *args)
         goto err;
 
     ret = 1;
- err:
+err:
     OSSL_LIB_CTX_free(libctx);
     return ret;
 }
 
-
-#define MAGIC_WAIT_FD   ((OSSL_ASYNC_FD)99)
+#define MAGIC_WAIT_FD ((OSSL_ASYNC_FD)99)
 static int waitfd(void *args)
 {
     ASYNC_JOB *job;
@@ -128,25 +127,25 @@ static int test_ASYNC_init_thread(void)
     int funcret1, funcret2, funcret3;
     ASYNC_WAIT_CTX *waitctx = NULL;
 
-    if (       !ASYNC_init_thread(2, 0)
-            || (waitctx = ASYNC_WAIT_CTX_new()) == NULL
-            || ASYNC_start_job(&job1, waitctx, &funcret1, only_pause, NULL, 0)
-                != ASYNC_PAUSE
-            || ASYNC_start_job(&job2, waitctx, &funcret2, only_pause, NULL, 0)
-                != ASYNC_PAUSE
-            || ASYNC_start_job(&job3, waitctx, &funcret3, only_pause, NULL, 0)
-                != ASYNC_NO_JOBS
-            || ASYNC_start_job(&job1, waitctx, &funcret1, only_pause, NULL, 0)
-                != ASYNC_FINISH
-            || ASYNC_start_job(&job3, waitctx, &funcret3, only_pause, NULL, 0)
-                != ASYNC_PAUSE
-            || ASYNC_start_job(&job2, waitctx, &funcret2, only_pause, NULL, 0)
-                != ASYNC_FINISH
-            || ASYNC_start_job(&job3, waitctx, &funcret3, only_pause, NULL, 0)
-                != ASYNC_FINISH
-            || funcret1 != 1
-            || funcret2 != 1
-            || funcret3 != 1) {
+    if (!ASYNC_init_thread(2, 0)
+        || (waitctx = ASYNC_WAIT_CTX_new()) == NULL
+        || ASYNC_start_job(&job1, waitctx, &funcret1, only_pause, NULL, 0)
+            != ASYNC_PAUSE
+        || ASYNC_start_job(&job2, waitctx, &funcret2, only_pause, NULL, 0)
+            != ASYNC_PAUSE
+        || ASYNC_start_job(&job3, waitctx, &funcret3, only_pause, NULL, 0)
+            != ASYNC_NO_JOBS
+        || ASYNC_start_job(&job1, waitctx, &funcret1, only_pause, NULL, 0)
+            != ASYNC_FINISH
+        || ASYNC_start_job(&job3, waitctx, &funcret3, only_pause, NULL, 0)
+            != ASYNC_PAUSE
+        || ASYNC_start_job(&job2, waitctx, &funcret2, only_pause, NULL, 0)
+            != ASYNC_FINISH
+        || ASYNC_start_job(&job3, waitctx, &funcret3, only_pause, NULL, 0)
+            != ASYNC_FINISH
+        || funcret1 != 1
+        || funcret2 != 1
+        || funcret3 != 1) {
         fprintf(stderr, "test_ASYNC_init_thread() failed\n");
         ASYNC_WAIT_CTX_free(waitctx);
         ASYNC_cleanup_thread();
@@ -172,17 +171,17 @@ static int test_ASYNC_callback_status(void)
     void *get_arg;
     int set_status = 1;
 
-    if (       !ASYNC_init_thread(1, 0)
-            || (waitctx = ASYNC_WAIT_CTX_new()) == NULL
-            || ASYNC_WAIT_CTX_set_callback(waitctx, test_callback, (void*)&set_arg)
-               != 1
-            || ASYNC_WAIT_CTX_get_callback(waitctx, &get_callback, &get_arg)
-               != 1
-            || test_callback != get_callback
-            || get_arg != (void*)&set_arg
-            || (*get_callback)(get_arg) != 1
-            || ASYNC_WAIT_CTX_set_status(waitctx, set_status) != 1
-            || set_status != ASYNC_WAIT_CTX_get_status(waitctx)) {
+    if (!ASYNC_init_thread(1, 0)
+        || (waitctx = ASYNC_WAIT_CTX_new()) == NULL
+        || ASYNC_WAIT_CTX_set_callback(waitctx, test_callback, (void *)&set_arg)
+            != 1
+        || ASYNC_WAIT_CTX_get_callback(waitctx, &get_callback, &get_arg)
+            != 1
+        || test_callback != get_callback
+        || get_arg != (void *)&set_arg
+        || (*get_callback)(get_arg) != 1
+        || ASYNC_WAIT_CTX_set_status(waitctx, set_status) != 1
+        || set_status != ASYNC_WAIT_CTX_get_status(waitctx)) {
         fprintf(stderr, "test_ASYNC_callback_status() failed\n");
         ASYNC_WAIT_CTX_free(waitctx);
         ASYNC_cleanup_thread();
@@ -192,7 +191,6 @@ static int test_ASYNC_callback_status(void)
     ASYNC_WAIT_CTX_free(waitctx);
     ASYNC_cleanup_thread();
     return 1;
-
 }
 
 static int test_ASYNC_start_job(void)
@@ -203,15 +201,15 @@ static int test_ASYNC_start_job(void)
 
     ctr = 0;
 
-    if (       !ASYNC_init_thread(1, 0)
-            || (waitctx = ASYNC_WAIT_CTX_new()) == NULL
-            || ASYNC_start_job(&job, waitctx, &funcret, add_two, NULL, 0)
-               != ASYNC_PAUSE
-            || ctr != 1
-            || ASYNC_start_job(&job, waitctx, &funcret, add_two, NULL, 0)
-               != ASYNC_FINISH
-            || ctr != 2
-            || funcret != 2) {
+    if (!ASYNC_init_thread(1, 0)
+        || (waitctx = ASYNC_WAIT_CTX_new()) == NULL
+        || ASYNC_start_job(&job, waitctx, &funcret, add_two, NULL, 0)
+            != ASYNC_PAUSE
+        || ctr != 1
+        || ASYNC_start_job(&job, waitctx, &funcret, add_two, NULL, 0)
+            != ASYNC_FINISH
+        || ctr != 2
+        || funcret != 2) {
         fprintf(stderr, "test_ASYNC_start_job() failed\n");
         ASYNC_WAIT_CTX_free(waitctx);
         ASYNC_cleanup_thread();
@@ -231,14 +229,14 @@ static int test_ASYNC_get_current_job(void)
 
     currjob = NULL;
 
-    if (       !ASYNC_init_thread(1, 0)
-            || (waitctx = ASYNC_WAIT_CTX_new()) == NULL
-            || ASYNC_start_job(&job, waitctx, &funcret, save_current, NULL, 0)
-                != ASYNC_PAUSE
-            || currjob != job
-            || ASYNC_start_job(&job, waitctx, &funcret, save_current, NULL, 0)
-                != ASYNC_FINISH
-            || funcret != 1) {
+    if (!ASYNC_init_thread(1, 0)
+        || (waitctx = ASYNC_WAIT_CTX_new()) == NULL
+        || ASYNC_start_job(&job, waitctx, &funcret, save_current, NULL, 0)
+            != ASYNC_PAUSE
+        || currjob != job
+        || ASYNC_start_job(&job, waitctx, &funcret, save_current, NULL, 0)
+            != ASYNC_FINISH
+        || funcret != 1) {
         fprintf(stderr, "test_ASYNC_get_current_job() failed\n");
         ASYNC_WAIT_CTX_free(waitctx);
         ASYNC_cleanup_thread();
@@ -258,54 +256,54 @@ static int test_ASYNC_WAIT_CTX_get_all_fds(void)
     OSSL_ASYNC_FD fd = OSSL_BAD_ASYNC_FD, delfd = OSSL_BAD_ASYNC_FD;
     size_t numfds, numdelfds;
 
-    if (       !ASYNC_init_thread(1, 0)
-            || (waitctx = ASYNC_WAIT_CTX_new()) == NULL
-               /* On first run we're not expecting any wait fds */
-            || ASYNC_start_job(&job, waitctx, &funcret, waitfd, NULL, 0)
-                != ASYNC_PAUSE
-            || !ASYNC_WAIT_CTX_get_all_fds(waitctx, NULL, &numfds)
-            || numfds != 0
-            || !ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &numfds, NULL,
-                                               &numdelfds)
-            || numfds != 0
-            || numdelfds != 0
-               /* On second run we're expecting one added fd */
-            || ASYNC_start_job(&job, waitctx, &funcret, waitfd, NULL, 0)
-                != ASYNC_PAUSE
-            || !ASYNC_WAIT_CTX_get_all_fds(waitctx, NULL, &numfds)
-            || numfds != 1
-            || !ASYNC_WAIT_CTX_get_all_fds(waitctx, &fd, &numfds)
-            || fd != MAGIC_WAIT_FD
-            || (fd = OSSL_BAD_ASYNC_FD, 0) /* Assign to something else */
-            || !ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &numfds, NULL,
-                                               &numdelfds)
-            || numfds != 1
-            || numdelfds != 0
-            || !ASYNC_WAIT_CTX_get_changed_fds(waitctx, &fd, &numfds, NULL,
-                                               &numdelfds)
-            || fd != MAGIC_WAIT_FD
-               /* On third run we expect one deleted fd */
-            || ASYNC_start_job(&job, waitctx, &funcret, waitfd, NULL, 0)
-                != ASYNC_PAUSE
-            || !ASYNC_WAIT_CTX_get_all_fds(waitctx, NULL, &numfds)
-            || numfds != 0
-            || !ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &numfds, NULL,
-                                               &numdelfds)
-            || numfds != 0
-            || numdelfds != 1
-            || !ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &numfds, &delfd,
-                                               &numdelfds)
-            || delfd != MAGIC_WAIT_FD
-            /* On last run we are not expecting any wait fd */
-            || ASYNC_start_job(&job, waitctx, &funcret, waitfd, NULL, 0)
-                != ASYNC_FINISH
-            || !ASYNC_WAIT_CTX_get_all_fds(waitctx, NULL, &numfds)
-            || numfds != 0
-            || !ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &numfds, NULL,
-                                               &numdelfds)
-            || numfds != 0
-            || numdelfds != 0
-            || funcret != 1) {
+    if (!ASYNC_init_thread(1, 0)
+        || (waitctx = ASYNC_WAIT_CTX_new()) == NULL
+        /* On first run we're not expecting any wait fds */
+        || ASYNC_start_job(&job, waitctx, &funcret, waitfd, NULL, 0)
+            != ASYNC_PAUSE
+        || !ASYNC_WAIT_CTX_get_all_fds(waitctx, NULL, &numfds)
+        || numfds != 0
+        || !ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &numfds, NULL,
+            &numdelfds)
+        || numfds != 0
+        || numdelfds != 0
+        /* On second run we're expecting one added fd */
+        || ASYNC_start_job(&job, waitctx, &funcret, waitfd, NULL, 0)
+            != ASYNC_PAUSE
+        || !ASYNC_WAIT_CTX_get_all_fds(waitctx, NULL, &numfds)
+        || numfds != 1
+        || !ASYNC_WAIT_CTX_get_all_fds(waitctx, &fd, &numfds)
+        || fd != MAGIC_WAIT_FD
+        || (fd = OSSL_BAD_ASYNC_FD, 0) /* Assign to something else */
+        || !ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &numfds, NULL,
+            &numdelfds)
+        || numfds != 1
+        || numdelfds != 0
+        || !ASYNC_WAIT_CTX_get_changed_fds(waitctx, &fd, &numfds, NULL,
+            &numdelfds)
+        || fd != MAGIC_WAIT_FD
+        /* On third run we expect one deleted fd */
+        || ASYNC_start_job(&job, waitctx, &funcret, waitfd, NULL, 0)
+            != ASYNC_PAUSE
+        || !ASYNC_WAIT_CTX_get_all_fds(waitctx, NULL, &numfds)
+        || numfds != 0
+        || !ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &numfds, NULL,
+            &numdelfds)
+        || numfds != 0
+        || numdelfds != 1
+        || !ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &numfds, &delfd,
+            &numdelfds)
+        || delfd != MAGIC_WAIT_FD
+        /* On last run we are not expecting any wait fd */
+        || ASYNC_start_job(&job, waitctx, &funcret, waitfd, NULL, 0)
+            != ASYNC_FINISH
+        || !ASYNC_WAIT_CTX_get_all_fds(waitctx, NULL, &numfds)
+        || numfds != 0
+        || !ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &numfds, NULL,
+            &numdelfds)
+        || numfds != 0
+        || numdelfds != 0
+        || funcret != 1) {
         fprintf(stderr, "test_ASYNC_get_wait_fd() failed\n");
         ASYNC_WAIT_CTX_free(waitctx);
         ASYNC_cleanup_thread();
@@ -323,13 +321,13 @@ static int test_ASYNC_block_pause(void)
     int funcret;
     ASYNC_WAIT_CTX *waitctx = NULL;
 
-    if (       !ASYNC_init_thread(1, 0)
-            || (waitctx = ASYNC_WAIT_CTX_new()) == NULL
-            || ASYNC_start_job(&job, waitctx, &funcret, blockpause, NULL, 0)
-                != ASYNC_PAUSE
-            || ASYNC_start_job(&job, waitctx, &funcret, blockpause, NULL, 0)
-                != ASYNC_FINISH
-            || funcret != 1) {
+    if (!ASYNC_init_thread(1, 0)
+        || (waitctx = ASYNC_WAIT_CTX_new()) == NULL
+        || ASYNC_start_job(&job, waitctx, &funcret, blockpause, NULL, 0)
+            != ASYNC_PAUSE
+        || ASYNC_start_job(&job, waitctx, &funcret, blockpause, NULL, 0)
+            != ASYNC_FINISH
+        || funcret != 1) {
         fprintf(stderr, "test_ASYNC_block_pause() failed\n");
         ASYNC_WAIT_CTX_free(waitctx);
         ASYNC_cleanup_thread();
@@ -352,18 +350,18 @@ static int test_ASYNC_start_job_ex(void)
 
     if (libctx == NULL) {
         fprintf(stderr,
-                "test_ASYNC_start_job_ex() failed to create libctx\n");
+            "test_ASYNC_start_job_ex() failed to create libctx\n");
         goto err;
     }
 
     globalctx = oldctx = OSSL_LIB_CTX_set0_default(libctx);
 
     if ((waitctx = ASYNC_WAIT_CTX_new()) == NULL
-            || ASYNC_start_job(&job, waitctx, &funcret, change_deflt_libctx,
-                               NULL, 0)
-               != ASYNC_PAUSE) {
+        || ASYNC_start_job(&job, waitctx, &funcret, change_deflt_libctx,
+               NULL, 0)
+            != ASYNC_PAUSE) {
         fprintf(stderr,
-                "test_ASYNC_start_job_ex() failed to start job\n");
+            "test_ASYNC_start_job_ex() failed to start job\n");
         goto err;
     }
 
@@ -372,14 +370,14 @@ static int test_ASYNC_start_job_ex(void)
     oldctx = OSSL_LIB_CTX_set0_default(tmpctx);
     if (tmpctx != libctx) {
         fprintf(stderr,
-                "test_ASYNC_start_job_ex() failed - unexpected libctx\n");
+            "test_ASYNC_start_job_ex() failed - unexpected libctx\n");
         goto err;
     }
 
     if (ASYNC_start_job(&job, waitctx, &funcret, change_deflt_libctx, NULL, 0)
-               != ASYNC_PAUSE) {
+        != ASYNC_PAUSE) {
         fprintf(stderr,
-                "test_ASYNC_start_job_ex() - restarting job failed\n");
+            "test_ASYNC_start_job_ex() - restarting job failed\n");
         goto err;
     }
 
@@ -387,15 +385,15 @@ static int test_ASYNC_start_job_ex(void)
     tmpctx = OSSL_LIB_CTX_set0_default(oldctx);
     if (tmpctx != libctx) {
         fprintf(stderr,
-                "test_ASYNC_start_job_ex() failed - unexpected libctx\n");
+            "test_ASYNC_start_job_ex() failed - unexpected libctx\n");
         goto err;
     }
 
     if (ASYNC_start_job(&job, waitctx, &funcret, change_deflt_libctx, NULL, 0)
-               != ASYNC_FINISH
-                || funcret != 1) {
+            != ASYNC_FINISH
+        || funcret != 1) {
         fprintf(stderr,
-                "test_ASYNC_start_job_ex() - finishing job failed\n");
+            "test_ASYNC_start_job_ex() - finishing job failed\n");
         goto err;
     }
 
@@ -404,12 +402,12 @@ static int test_ASYNC_start_job_ex(void)
     OSSL_LIB_CTX_set0_default(tmpctx);
     if (tmpctx != globalctx) {
         fprintf(stderr,
-                "test_ASYNC_start_job_ex() failed - global libctx check failed\n");
+            "test_ASYNC_start_job_ex() failed - global libctx check failed\n");
         goto err;
     }
 
     ret = 1;
- err:
+err:
     ASYNC_WAIT_CTX_free(waitctx);
     ASYNC_cleanup_thread();
     OSSL_LIB_CTX_free(libctx);
@@ -434,26 +432,27 @@ static int test_ASYNC_set_mem_functions(void)
     ASYNC_stack_free_fn free_fn;
 
     /* Not all platforms support this */
-    if (ASYNC_set_mem_functions(test_alloc_stack, test_free_stack) == 0) return 1;
+    if (ASYNC_set_mem_functions(test_alloc_stack, test_free_stack) == 0)
+        return 1;
 
     ASYNC_get_mem_functions(&alloc_fn, &free_fn);
 
     if ((alloc_fn != test_alloc_stack) || (free_fn != test_free_stack)) {
         fprintf(stderr,
-                "test_ASYNC_set_mem_functions() - setting and retrieving custom allocators failed\n");
+            "test_ASYNC_set_mem_functions() - setting and retrieving custom allocators failed\n");
         return 0;
     }
 
     if (!ASYNC_init_thread(1, 1)) {
         fprintf(stderr,
-                "test_ASYNC_set_mem_functions() - failed initialising ctx pool\n");
+            "test_ASYNC_set_mem_functions() - failed initialising ctx pool\n");
         return 0;
     }
     ASYNC_cleanup_thread();
 
     if (!custom_alloc_used || !custom_free_used) {
-         fprintf(stderr,
-                "test_ASYNC_set_mem_functions() - custom allocation functions not used\n");
+        fprintf(stderr,
+            "test_ASYNC_set_mem_functions() - custom allocation functions not used\n");
 
         return 0;
     }
@@ -465,16 +464,16 @@ int main(int argc, char **argv)
 {
     if (!ASYNC_is_capable()) {
         fprintf(stderr,
-                "OpenSSL build is not ASYNC capable - skipping async tests\n");
+            "OpenSSL build is not ASYNC capable - skipping async tests\n");
     } else {
         if (!test_ASYNC_init_thread()
-                || !test_ASYNC_callback_status()
-                || !test_ASYNC_start_job()
-                || !test_ASYNC_get_current_job()
-                || !test_ASYNC_WAIT_CTX_get_all_fds()
-                || !test_ASYNC_block_pause()
-                || !test_ASYNC_start_job_ex()
-                || !test_ASYNC_set_mem_functions()) {
+            || !test_ASYNC_callback_status()
+            || !test_ASYNC_start_job()
+            || !test_ASYNC_get_current_job()
+            || !test_ASYNC_WAIT_CTX_get_all_fds()
+            || !test_ASYNC_block_pause()
+            || !test_ASYNC_start_job_ex()
+            || !test_ASYNC_set_mem_functions()) {
             return 1;
         }
     }
diff --git a/test/bad_dtls_test.c b/test/bad_dtls_test.c
index 1df8cd84fe012..eef951ea57280 100644
--- a/test/bad_dtls_test.c
+++ b/test/bad_dtls_test.c
@@ -63,9 +63,9 @@ static unsigned char key_block[104];
 static EVP_MD_CTX *handshake_md;
 
 static int do_PRF(const void *seed1, int seed1_len,
-                  const void *seed2, int seed2_len,
-                  const void *seed3, int seed3_len,
-                  unsigned char *out, int olen)
+    const void *seed2, int seed2_len,
+    const void *seed3, int seed3_len,
+    unsigned char *out, int olen)
 {
     EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_TLS1_PRF, NULL);
     size_t outlen = olen;
@@ -85,24 +85,105 @@ static int do_PRF(const void *seed1, int seed1_len,
 static SSL_SESSION *client_session(void)
 {
     static unsigned char session_asn1[] = {
-        0x30, 0x5F,              /* SEQUENCE, length 0x5F */
-        0x02, 0x01, 0x01,        /* INTEGER, SSL_SESSION_ASN1_VERSION */
-        0x02, 0x02, 0x01, 0x00,  /* INTEGER, DTLS1_BAD_VER */
-        0x04, 0x02, 0x00, 0x2F,  /* OCTET_STRING, AES128-SHA */
-        0x04, 0x20,              /* OCTET_STRING, session id */
+        0x30,
+        0x5F, /* SEQUENCE, length 0x5F */
+        0x02,
+        0x01,
+        0x01, /* INTEGER, SSL_SESSION_ASN1_VERSION */
+        0x02,
+        0x02,
+        0x01,
+        0x00, /* INTEGER, DTLS1_BAD_VER */
+        0x04,
+        0x02,
+        0x00,
+        0x2F, /* OCTET_STRING, AES128-SHA */
+        0x04,
+        0x20, /* OCTET_STRING, session id */
 #define SS_SESSID_OFS 15 /* Session ID goes here */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x04, 0x30,              /* OCTET_STRING, master secret */
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x04,
+        0x30, /* OCTET_STRING, master secret */
 #define SS_SECRET_OFS 49 /* Master secret goes here */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
     };
     const unsigned char *p = session_asn1;
 
@@ -153,8 +234,7 @@ static int validate_client_hello(BIO *wbio)
         return 0;
 
     /* Check session id length and content */
-    if (!PACKET_get_length_prefixed_1(&pkt, &pkt2) ||
-        !PACKET_equal(&pkt2, session_id, sizeof(session_id)))
+    if (!PACKET_get_length_prefixed_1(&pkt, &pkt2) || !PACKET_equal(&pkt2, session_id, sizeof(session_id)))
         return 0;
 
     /* Check cookie */
@@ -183,8 +263,7 @@ static int validate_client_hello(BIO *wbio)
         return 0;
 
     /* Update handshake MAC for second ClientHello (with cookie) */
-    if (cookie_found && !EVP_DigestUpdate(handshake_md, data + MAC_OFFSET,
-                                          len - MAC_OFFSET))
+    if (cookie_found && !EVP_DigestUpdate(handshake_md, data + MAC_OFFSET, len - MAC_OFFSET))
         return 0;
 
     (void)BIO_reset(wbio);
@@ -196,21 +275,54 @@ static int send_hello_verify(BIO *rbio)
 {
     static unsigned char hello_verify[] = {
         0x16, /* Handshake */
-        0x01, 0x00, /* DTLS1_BAD_VER */
-        0x00, 0x00, /* Epoch 0 */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* Seq# 0 */
-        0x00, 0x23, /* Length */
+        0x01,
+        0x00, /* DTLS1_BAD_VER */
+        0x00,
+        0x00, /* Epoch 0 */
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00, /* Seq# 0 */
+        0x00,
+        0x23, /* Length */
         0x03, /* Hello Verify */
-        0x00, 0x00, 0x17, /* Length */
-        0x00, 0x00, /* Seq# 0 */
-        0x00, 0x00, 0x00, /* Fragment offset */
-        0x00, 0x00, 0x17, /* Fragment length */
-        0x01, 0x00, /* DTLS1_BAD_VER */
+        0x00,
+        0x00,
+        0x17, /* Length */
+        0x00,
+        0x00, /* Seq# 0 */
+        0x00,
+        0x00,
+        0x00, /* Fragment offset */
+        0x00,
+        0x00,
+        0x17, /* Fragment length */
+        0x01,
+        0x00, /* DTLS1_BAD_VER */
         0x14, /* Cookie length */
 #define HV_COOKIE_OFS 28 /* Cookie goes here */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
     };
 
     memcpy(hello_verify + HV_COOKIE_OFS, cookie, sizeof(cookie));
@@ -224,44 +336,127 @@ static int send_server_hello(BIO *rbio)
 {
     static unsigned char server_hello[] = {
         0x16, /* Handshake */
-        0x01, 0x00, /* DTLS1_BAD_VER */
-        0x00, 0x00, /* Epoch 0 */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x01, /* Seq# 1 */
-        0x00, 0x52, /* Length */
+        0x01,
+        0x00, /* DTLS1_BAD_VER */
+        0x00,
+        0x00, /* Epoch 0 */
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x01, /* Seq# 1 */
+        0x00,
+        0x52, /* Length */
         0x02, /* Server Hello */
-        0x00, 0x00, 0x46, /* Length */
-        0x00, 0x01, /* Seq# */
-        0x00, 0x00, 0x00, /* Fragment offset */
-        0x00, 0x00, 0x46, /* Fragment length */
-        0x01, 0x00, /* DTLS1_BAD_VER */
+        0x00,
+        0x00,
+        0x46, /* Length */
+        0x00,
+        0x01, /* Seq# */
+        0x00,
+        0x00,
+        0x00, /* Fragment offset */
+        0x00,
+        0x00,
+        0x46, /* Fragment length */
+        0x01,
+        0x00, /* DTLS1_BAD_VER */
 #define SH_RANDOM_OFS 27 /* Server random goes here */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
         0x20, /* Session ID length */
 #define SH_SESSID_OFS 60 /* Session ID goes here */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x2f, /* Cipher suite AES128-SHA */
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x2f, /* Cipher suite AES128-SHA */
         0x00, /* Compression null */
     };
     static unsigned char change_cipher_spec[] = {
         0x14, /* Change Cipher Spec */
-        0x01, 0x00, /* DTLS1_BAD_VER */
-        0x00, 0x00, /* Epoch 0 */
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x02, /* Seq# 2 */
-        0x00, 0x03, /* Length */
-        0x01, 0x00, 0x02, /* Message */
+        0x01,
+        0x00, /* DTLS1_BAD_VER */
+        0x00,
+        0x00, /* Epoch 0 */
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x02, /* Seq# 2 */
+        0x00,
+        0x03, /* Length */
+        0x01,
+        0x00,
+        0x02, /* Message */
     };
 
     memcpy(server_hello + SH_RANDOM_OFS, server_random, sizeof(server_random));
     memcpy(server_hello + SH_SESSID_OFS, session_id, sizeof(session_id));
 
     if (!EVP_DigestUpdate(handshake_md, server_hello + MAC_OFFSET,
-                          sizeof(server_hello) - MAC_OFFSET))
+            sizeof(server_hello) - MAC_OFFSET))
         return 0;
 
     BIO_write(rbio, server_hello, sizeof(server_hello));
@@ -272,7 +467,7 @@ static int send_server_hello(BIO *rbio)
 
 /* Create header, HMAC, pad, encrypt and send a record */
 static int send_record(BIO *rbio, unsigned char type, uint64_t seqnr,
-                       const void *msg, size_t len)
+    const void *msg, size_t len)
 {
     /* Note that the order of the record header fields on the wire,
      * and in the HMAC, is different. So we just keep them in separate
@@ -307,21 +502,21 @@ static int send_record(BIO *rbio, unsigned char type, uint64_t seqnr,
 
     /* Append HMAC to data */
     if (!TEST_ptr(hmac = EVP_MAC_fetch(NULL, "HMAC", NULL))
-            || !TEST_ptr(ctx = EVP_MAC_CTX_new(hmac)))
+        || !TEST_ptr(ctx = EVP_MAC_CTX_new(hmac)))
         goto end;
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
-                                                 "SHA1", 0);
+        "SHA1", 0);
     params[1] = OSSL_PARAM_construct_end();
     lenbytes[0] = (unsigned char)(len >> 8);
     lenbytes[1] = (unsigned char)(len);
     if (!EVP_MAC_init(ctx, mac_key, 20, params)
-            || !EVP_MAC_update(ctx, epoch, 2)
-            || !EVP_MAC_update(ctx, seq, 6)
-            || !EVP_MAC_update(ctx, &type, 1)
-            || !EVP_MAC_update(ctx, ver, 2)      /* Version */
-            || !EVP_MAC_update(ctx, lenbytes, 2) /* Length */
-            || !EVP_MAC_update(ctx, enc, len)    /* Finally the data itself */
-            || !EVP_MAC_final(ctx, enc + len, NULL, SHA_DIGEST_LENGTH))
+        || !EVP_MAC_update(ctx, epoch, 2)
+        || !EVP_MAC_update(ctx, seq, 6)
+        || !EVP_MAC_update(ctx, &type, 1)
+        || !EVP_MAC_update(ctx, ver, 2) /* Version */
+        || !EVP_MAC_update(ctx, lenbytes, 2) /* Length */
+        || !EVP_MAC_update(ctx, enc, len) /* Finally the data itself */
+        || !EVP_MAC_final(ctx, enc + len, NULL, SHA_DIGEST_LENGTH))
         goto end;
 
     /* Append padding bytes */
@@ -332,10 +527,10 @@ static int send_record(BIO *rbio, unsigned char type, uint64_t seqnr,
 
     /* Generate IV, and encrypt */
     if (!TEST_int_gt(RAND_bytes(iv, sizeof(iv)), 0)
-            || !TEST_ptr(enc_ctx = EVP_CIPHER_CTX_new())
-            || !TEST_true(EVP_CipherInit_ex(enc_ctx, EVP_aes_128_cbc(), NULL,
-                                            enc_key, iv, 1))
-            || !TEST_int_ge(EVP_Cipher(enc_ctx, enc, enc, len), 0))
+        || !TEST_ptr(enc_ctx = EVP_CIPHER_CTX_new())
+        || !TEST_true(EVP_CipherInit_ex(enc_ctx, EVP_aes_128_cbc(), NULL,
+            enc_key, iv, 1))
+        || !TEST_int_ge(EVP_Cipher(enc_ctx, enc, enc, len), 0))
         goto end;
 
     /* Finally write header (from fragmented variables), IV and encrypted record */
@@ -350,7 +545,7 @@ static int send_record(BIO *rbio, unsigned char type, uint64_t seqnr,
     BIO_write(rbio, iv, sizeof(iv));
     BIO_write(rbio, enc, len);
     ret = 1;
- end:
+end:
     EVP_MAC_free(hmac);
     EVP_MAC_CTX_free(ctx);
     EVP_CIPHER_CTX_free(enc_ctx);
@@ -360,13 +555,19 @@ static int send_record(BIO *rbio, unsigned char type, uint64_t seqnr,
 
 static int send_finished(SSL *s, BIO *rbio)
 {
-    static unsigned char finished_msg[DTLS1_HM_HEADER_LENGTH +
-                                      TLS1_FINISH_MAC_LENGTH] = {
+    static unsigned char finished_msg[DTLS1_HM_HEADER_LENGTH + TLS1_FINISH_MAC_LENGTH] = {
         0x14, /* Finished */
-        0x00, 0x00, 0x0c, /* Length */
-        0x00, 0x03, /* Seq# 3 */
-        0x00, 0x00, 0x00, /* Fragment offset */
-        0x00, 0x00, 0x0c, /* Fragment length */
+        0x00,
+        0x00,
+        0x0c, /* Length */
+        0x00,
+        0x03, /* Seq# 3 */
+        0x00,
+        0x00,
+        0x00, /* Fragment offset */
+        0x00,
+        0x00,
+        0x0c, /* Fragment length */
         /* Finished MAC (12 bytes) */
     };
     unsigned char handshake_hash[EVP_MAX_MD_SIZE];
@@ -374,9 +575,9 @@ static int send_finished(SSL *s, BIO *rbio)
 
     /* Derive key material */
     do_PRF(TLS_MD_KEY_EXPANSION_CONST, TLS_MD_KEY_EXPANSION_CONST_SIZE,
-           server_random, SSL3_RANDOM_SIZE,
-           client_random, SSL3_RANDOM_SIZE,
-           key_block, sizeof(key_block));
+        server_random, SSL3_RANDOM_SIZE,
+        client_random, SSL3_RANDOM_SIZE,
+        key_block, sizeof(key_block));
 
     /* Generate Finished MAC */
     if (!EVP_DigestFinal_ex(handshake_md, handshake_hash, NULL))
@@ -386,12 +587,12 @@ static int send_finished(SSL *s, BIO *rbio)
     if (md_size <= 0)
         return 0;
     do_PRF(TLS_MD_SERVER_FINISH_CONST, TLS_MD_SERVER_FINISH_CONST_SIZE,
-           handshake_hash, md_size,
-           NULL, 0,
-           finished_msg + DTLS1_HM_HEADER_LENGTH, TLS1_FINISH_MAC_LENGTH);
+        handshake_hash, md_size,
+        NULL, 0,
+        finished_msg + DTLS1_HM_HEADER_LENGTH, TLS1_FINISH_MAC_LENGTH);
 
     return send_record(rbio, SSL3_RT_HANDSHAKE, 0,
-                       finished_msg, sizeof(finished_msg));
+        finished_msg, sizeof(finished_msg));
 }
 
 static int validate_ccs(BIO *wbio)
@@ -446,7 +647,7 @@ static int validate_ccs(BIO *wbio)
 }
 
 #define NODROP(x) { x##UL, 0 }
-#define DROP(x)   { x##UL, 1 }
+#define DROP(x) { x##UL, 1 }
 
 static struct {
     uint64_t seq;
@@ -490,30 +691,30 @@ static int test_bad_dtls(void)
 
     handshake_md = EVP_MD_CTX_new();
     if (!TEST_ptr(handshake_md)
-            || !TEST_true(EVP_DigestInit_ex(handshake_md, EVP_md5_sha1(),
-                                            NULL)))
+        || !TEST_true(EVP_DigestInit_ex(handshake_md, EVP_md5_sha1(),
+            NULL)))
         goto end;
 
     ctx = SSL_CTX_new(DTLS_client_method());
     if (!TEST_ptr(ctx)
-            || !TEST_true(SSL_CTX_set_min_proto_version(ctx, DTLS1_BAD_VER))
-            || !TEST_true(SSL_CTX_set_max_proto_version(ctx, DTLS1_BAD_VER))
-            || !TEST_true(SSL_CTX_set_options(ctx,
-                                              SSL_OP_LEGACY_SERVER_CONNECT))
-            || !TEST_true(SSL_CTX_set_cipher_list(ctx, "AES128-SHA")))
+        || !TEST_true(SSL_CTX_set_min_proto_version(ctx, DTLS1_BAD_VER))
+        || !TEST_true(SSL_CTX_set_max_proto_version(ctx, DTLS1_BAD_VER))
+        || !TEST_true(SSL_CTX_set_options(ctx,
+            SSL_OP_LEGACY_SERVER_CONNECT))
+        || !TEST_true(SSL_CTX_set_cipher_list(ctx, "AES128-SHA")))
         goto end;
 
     SSL_CTX_set_security_level(ctx, 0);
     con = SSL_new(ctx);
     if (!TEST_ptr(con)
-            || !TEST_true(SSL_set_session(con, sess)))
+        || !TEST_true(SSL_set_session(con, sess)))
         goto end;
 
     rbio = BIO_new(BIO_s_mem());
     wbio = BIO_new(BIO_s_mem());
 
     if (!TEST_ptr(rbio)
-            || !TEST_ptr(wbio))
+        || !TEST_ptr(wbio))
         goto end;
 
     SSL_set_bio(con, rbio, wbio);
@@ -537,27 +738,27 @@ static int test_bad_dtls(void)
     /* Send initial ClientHello */
     ret = SSL_do_handshake(con);
     if (!TEST_int_le(ret, 0)
-            || !TEST_int_eq(SSL_get_error(con, ret), SSL_ERROR_WANT_READ)
-            || !TEST_int_eq(validate_client_hello(wbio), 1)
-            || !TEST_true(send_hello_verify(rbio)))
+        || !TEST_int_eq(SSL_get_error(con, ret), SSL_ERROR_WANT_READ)
+        || !TEST_int_eq(validate_client_hello(wbio), 1)
+        || !TEST_true(send_hello_verify(rbio)))
         goto end;
 
     ret = SSL_do_handshake(con);
     if (!TEST_int_le(ret, 0)
-            || !TEST_int_eq(SSL_get_error(con, ret), SSL_ERROR_WANT_READ)
-            || !TEST_int_eq(validate_client_hello(wbio), 2)
-            || !TEST_true(send_server_hello(rbio)))
+        || !TEST_int_eq(SSL_get_error(con, ret), SSL_ERROR_WANT_READ)
+        || !TEST_int_eq(validate_client_hello(wbio), 2)
+        || !TEST_true(send_server_hello(rbio)))
         goto end;
 
     ret = SSL_do_handshake(con);
     if (!TEST_int_le(ret, 0)
-            || !TEST_int_eq(SSL_get_error(con, ret), SSL_ERROR_WANT_READ)
-            || !TEST_true(send_finished(con, rbio)))
+        || !TEST_int_eq(SSL_get_error(con, ret), SSL_ERROR_WANT_READ)
+        || !TEST_true(send_finished(con, rbio)))
         goto end;
 
     ret = SSL_do_handshake(con);
     if (!TEST_int_gt(ret, 0)
-            || !TEST_true(validate_ccs(wbio)))
+        || !TEST_true(validate_ccs(wbio)))
         goto end;
 
     /* While we're here and crafting packets by hand, we might as well do a
@@ -569,9 +770,9 @@ static int test_bad_dtls(void)
         uint64_t recv_buf[2];
 
         if (!TEST_true(send_record(rbio, SSL3_RT_APPLICATION_DATA, tests[i].seq,
-                                   &tests[i].seq, sizeof(uint64_t)))) {
+                &tests[i].seq, sizeof(uint64_t)))) {
             TEST_error("Failed to send data seq #0x%x%08x (%d)\n",
-                       (unsigned int)(tests[i].seq >> 32), (unsigned int)tests[i].seq, i);
+                (unsigned int)(tests[i].seq >> 32), (unsigned int)tests[i].seq, i);
             goto end;
         }
 
@@ -581,7 +782,7 @@ static int test_bad_dtls(void)
         ret = SSL_read(con, recv_buf, 2 * sizeof(uint64_t));
         if (!TEST_int_eq(ret, (int)sizeof(uint64_t))) {
             TEST_error("SSL_read failed or wrong size on seq#0x%x%08x (%d)\n",
-                       (unsigned int)(tests[i].seq >> 32), (unsigned int)tests[i].seq, i);
+                (unsigned int)(tests[i].seq >> 32), (unsigned int)tests[i].seq, i);
             goto end;
         }
         if (!TEST_true(recv_buf[0] == tests[i].seq))
@@ -589,12 +790,12 @@ static int test_bad_dtls(void)
     }
 
     /* The last test cannot be DROP() */
-    if (!TEST_false(tests[i-1].drop))
+    if (!TEST_false(tests[i - 1].drop))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(sess);
     BIO_free(rbio);
     BIO_free(wbio);
diff --git a/test/bftest.c b/test/bftest.c
index 99e95edfc13da..bbe2a0aa1987b 100644
--- a/test/bftest.c
+++ b/test/bftest.c
@@ -22,11 +22,11 @@
 #include "internal/nelem.h"
 
 #ifndef OPENSSL_NO_BF
-# include <openssl/blowfish.h>
+#include <openssl/blowfish.h>
 
-# ifdef CHARSET_EBCDIC
-#  include <openssl/ebcdic.h>
-# endif
+#ifdef CHARSET_EBCDIC
+#include <openssl/ebcdic.h>
+#endif
 
 static char bf_key[2][30] = {
     "abcdefghijklmnopqrstuvwxyz",
@@ -35,128 +35,128 @@ static char bf_key[2][30] = {
 
 /* big endian */
 static BF_LONG bf_plain[2][2] = {
-    {0x424c4f57L, 0x46495348L},
-    {0xfedcba98L, 0x76543210L}
+    { 0x424c4f57L, 0x46495348L },
+    { 0xfedcba98L, 0x76543210L }
 };
 
 static BF_LONG bf_cipher[2][2] = {
-    {0x324ed0feL, 0xf413a203L},
-    {0xcc91732bL, 0x8022f684L}
+    { 0x324ed0feL, 0xf413a203L },
+    { 0xcc91732bL, 0x8022f684L }
 };
 
 /************/
 
 /* Lets use the DES test vectors :-) */
-# define NUM_TESTS 34
+#define NUM_TESTS 34
 static unsigned char ecb_data[NUM_TESTS][8] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-    {0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10},
-    {0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57},
-    {0x01, 0x31, 0xD9, 0x61, 0x9D, 0xC1, 0x37, 0x6E},
-    {0x07, 0xA1, 0x13, 0x3E, 0x4A, 0x0B, 0x26, 0x86},
-    {0x38, 0x49, 0x67, 0x4C, 0x26, 0x02, 0x31, 0x9E},
-    {0x04, 0xB9, 0x15, 0xBA, 0x43, 0xFE, 0xB5, 0xB6},
-    {0x01, 0x13, 0xB9, 0x70, 0xFD, 0x34, 0xF2, 0xCE},
-    {0x01, 0x70, 0xF1, 0x75, 0x46, 0x8F, 0xB5, 0xE6},
-    {0x43, 0x29, 0x7F, 0xAD, 0x38, 0xE3, 0x73, 0xFE},
-    {0x07, 0xA7, 0x13, 0x70, 0x45, 0xDA, 0x2A, 0x16},
-    {0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F},
-    {0x37, 0xD0, 0x6B, 0xB5, 0x16, 0xCB, 0x75, 0x46},
-    {0x1F, 0x08, 0x26, 0x0D, 0x1A, 0xC2, 0x46, 0x5E},
-    {0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76},
-    {0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xB0, 0x07},
-    {0x49, 0x79, 0x3E, 0xBC, 0x79, 0xB3, 0x25, 0x8F},
-    {0x4F, 0xB0, 0x5E, 0x15, 0x15, 0xAB, 0x73, 0xA7},
-    {0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF},
-    {0x01, 0x83, 0x10, 0xDC, 0x40, 0x9B, 0x26, 0xD6},
-    {0x1C, 0x58, 0x7F, 0x1C, 0x13, 0x92, 0x4F, 0xEF},
-    {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
-    {0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E},
-    {0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10}
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+    { 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 },
+    { 0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57 },
+    { 0x01, 0x31, 0xD9, 0x61, 0x9D, 0xC1, 0x37, 0x6E },
+    { 0x07, 0xA1, 0x13, 0x3E, 0x4A, 0x0B, 0x26, 0x86 },
+    { 0x38, 0x49, 0x67, 0x4C, 0x26, 0x02, 0x31, 0x9E },
+    { 0x04, 0xB9, 0x15, 0xBA, 0x43, 0xFE, 0xB5, 0xB6 },
+    { 0x01, 0x13, 0xB9, 0x70, 0xFD, 0x34, 0xF2, 0xCE },
+    { 0x01, 0x70, 0xF1, 0x75, 0x46, 0x8F, 0xB5, 0xE6 },
+    { 0x43, 0x29, 0x7F, 0xAD, 0x38, 0xE3, 0x73, 0xFE },
+    { 0x07, 0xA7, 0x13, 0x70, 0x45, 0xDA, 0x2A, 0x16 },
+    { 0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F },
+    { 0x37, 0xD0, 0x6B, 0xB5, 0x16, 0xCB, 0x75, 0x46 },
+    { 0x1F, 0x08, 0x26, 0x0D, 0x1A, 0xC2, 0x46, 0x5E },
+    { 0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76 },
+    { 0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xB0, 0x07 },
+    { 0x49, 0x79, 0x3E, 0xBC, 0x79, 0xB3, 0x25, 0x8F },
+    { 0x4F, 0xB0, 0x5E, 0x15, 0x15, 0xAB, 0x73, 0xA7 },
+    { 0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF },
+    { 0x01, 0x83, 0x10, 0xDC, 0x40, 0x9B, 0x26, 0xD6 },
+    { 0x1C, 0x58, 0x7F, 0x1C, 0x13, 0x92, 0x4F, 0xEF },
+    { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
+    { 0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E },
+    { 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 }
 };
 
 static unsigned char plain_data[NUM_TESTS][8] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-    {0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
-    {0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
-    {0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0x01, 0xA1, 0xD6, 0xD0, 0x39, 0x77, 0x67, 0x42},
-    {0x5C, 0xD5, 0x4C, 0xA8, 0x3D, 0xEF, 0x57, 0xDA},
-    {0x02, 0x48, 0xD4, 0x38, 0x06, 0xF6, 0x71, 0x72},
-    {0x51, 0x45, 0x4B, 0x58, 0x2D, 0xDF, 0x44, 0x0A},
-    {0x42, 0xFD, 0x44, 0x30, 0x59, 0x57, 0x7F, 0xA2},
-    {0x05, 0x9B, 0x5E, 0x08, 0x51, 0xCF, 0x14, 0x3A},
-    {0x07, 0x56, 0xD8, 0xE0, 0x77, 0x47, 0x61, 0xD2},
-    {0x76, 0x25, 0x14, 0xB8, 0x29, 0xBF, 0x48, 0x6A},
-    {0x3B, 0xDD, 0x11, 0x90, 0x49, 0x37, 0x28, 0x02},
-    {0x26, 0x95, 0x5F, 0x68, 0x35, 0xAF, 0x60, 0x9A},
-    {0x16, 0x4D, 0x5E, 0x40, 0x4F, 0x27, 0x52, 0x32},
-    {0x6B, 0x05, 0x6E, 0x18, 0x75, 0x9F, 0x5C, 0xCA},
-    {0x00, 0x4B, 0xD6, 0xEF, 0x09, 0x17, 0x60, 0x62},
-    {0x48, 0x0D, 0x39, 0x00, 0x6E, 0xE7, 0x62, 0xF2},
-    {0x43, 0x75, 0x40, 0xC8, 0x69, 0x8F, 0x3C, 0xFA},
-    {0x07, 0x2D, 0x43, 0xA0, 0x77, 0x07, 0x52, 0x92},
-    {0x02, 0xFE, 0x55, 0x77, 0x81, 0x17, 0xF1, 0x2A},
-    {0x1D, 0x9D, 0x5C, 0x50, 0x18, 0xF7, 0x28, 0xC2},
-    {0x30, 0x55, 0x32, 0x28, 0x6D, 0x6F, 0x29, 0x5A},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+    { 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
+    { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 },
+    { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x01, 0xA1, 0xD6, 0xD0, 0x39, 0x77, 0x67, 0x42 },
+    { 0x5C, 0xD5, 0x4C, 0xA8, 0x3D, 0xEF, 0x57, 0xDA },
+    { 0x02, 0x48, 0xD4, 0x38, 0x06, 0xF6, 0x71, 0x72 },
+    { 0x51, 0x45, 0x4B, 0x58, 0x2D, 0xDF, 0x44, 0x0A },
+    { 0x42, 0xFD, 0x44, 0x30, 0x59, 0x57, 0x7F, 0xA2 },
+    { 0x05, 0x9B, 0x5E, 0x08, 0x51, 0xCF, 0x14, 0x3A },
+    { 0x07, 0x56, 0xD8, 0xE0, 0x77, 0x47, 0x61, 0xD2 },
+    { 0x76, 0x25, 0x14, 0xB8, 0x29, 0xBF, 0x48, 0x6A },
+    { 0x3B, 0xDD, 0x11, 0x90, 0x49, 0x37, 0x28, 0x02 },
+    { 0x26, 0x95, 0x5F, 0x68, 0x35, 0xAF, 0x60, 0x9A },
+    { 0x16, 0x4D, 0x5E, 0x40, 0x4F, 0x27, 0x52, 0x32 },
+    { 0x6B, 0x05, 0x6E, 0x18, 0x75, 0x9F, 0x5C, 0xCA },
+    { 0x00, 0x4B, 0xD6, 0xEF, 0x09, 0x17, 0x60, 0x62 },
+    { 0x48, 0x0D, 0x39, 0x00, 0x6E, 0xE7, 0x62, 0xF2 },
+    { 0x43, 0x75, 0x40, 0xC8, 0x69, 0x8F, 0x3C, 0xFA },
+    { 0x07, 0x2D, 0x43, 0xA0, 0x77, 0x07, 0x52, 0x92 },
+    { 0x02, 0xFE, 0x55, 0x77, 0x81, 0x17, 0xF1, 0x2A },
+    { 0x1D, 0x9D, 0x5C, 0x50, 0x18, 0xF7, 0x28, 0xC2 },
+    { 0x30, 0x55, 0x32, 0x28, 0x6D, 0x6F, 0x29, 0x5A },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
 };
 
 static unsigned char cipher_data[NUM_TESTS][8] = {
-    {0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78},
-    {0x51, 0x86, 0x6F, 0xD5, 0xB8, 0x5E, 0xCB, 0x8A},
-    {0x7D, 0x85, 0x6F, 0x9A, 0x61, 0x30, 0x63, 0xF2},
-    {0x24, 0x66, 0xDD, 0x87, 0x8B, 0x96, 0x3C, 0x9D},
-    {0x61, 0xF9, 0xC3, 0x80, 0x22, 0x81, 0xB0, 0x96},
-    {0x7D, 0x0C, 0xC6, 0x30, 0xAF, 0xDA, 0x1E, 0xC7},
-    {0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78},
-    {0x0A, 0xCE, 0xAB, 0x0F, 0xC6, 0xA0, 0xA2, 0x8D},
-    {0x59, 0xC6, 0x82, 0x45, 0xEB, 0x05, 0x28, 0x2B},
-    {0xB1, 0xB8, 0xCC, 0x0B, 0x25, 0x0F, 0x09, 0xA0},
-    {0x17, 0x30, 0xE5, 0x77, 0x8B, 0xEA, 0x1D, 0xA4},
-    {0xA2, 0x5E, 0x78, 0x56, 0xCF, 0x26, 0x51, 0xEB},
-    {0x35, 0x38, 0x82, 0xB1, 0x09, 0xCE, 0x8F, 0x1A},
-    {0x48, 0xF4, 0xD0, 0x88, 0x4C, 0x37, 0x99, 0x18},
-    {0x43, 0x21, 0x93, 0xB7, 0x89, 0x51, 0xFC, 0x98},
-    {0x13, 0xF0, 0x41, 0x54, 0xD6, 0x9D, 0x1A, 0xE5},
-    {0x2E, 0xED, 0xDA, 0x93, 0xFF, 0xD3, 0x9C, 0x79},
-    {0xD8, 0x87, 0xE0, 0x39, 0x3C, 0x2D, 0xA6, 0xE3},
-    {0x5F, 0x99, 0xD0, 0x4F, 0x5B, 0x16, 0x39, 0x69},
-    {0x4A, 0x05, 0x7A, 0x3B, 0x24, 0xD3, 0x97, 0x7B},
-    {0x45, 0x20, 0x31, 0xC1, 0xE4, 0xFA, 0xDA, 0x8E},
-    {0x75, 0x55, 0xAE, 0x39, 0xF5, 0x9B, 0x87, 0xBD},
-    {0x53, 0xC5, 0x5F, 0x9C, 0xB4, 0x9F, 0xC0, 0x19},
-    {0x7A, 0x8E, 0x7B, 0xFA, 0x93, 0x7E, 0x89, 0xA3},
-    {0xCF, 0x9C, 0x5D, 0x7A, 0x49, 0x86, 0xAD, 0xB5},
-    {0xD1, 0xAB, 0xB2, 0x90, 0x65, 0x8B, 0xC7, 0x78},
-    {0x55, 0xCB, 0x37, 0x74, 0xD1, 0x3E, 0xF2, 0x01},
-    {0xFA, 0x34, 0xEC, 0x48, 0x47, 0xB2, 0x68, 0xB2},
-    {0xA7, 0x90, 0x79, 0x51, 0x08, 0xEA, 0x3C, 0xAE},
-    {0xC3, 0x9E, 0x07, 0x2D, 0x9F, 0xAC, 0x63, 0x1D},
-    {0x01, 0x49, 0x33, 0xE0, 0xCD, 0xAF, 0xF6, 0xE4},
-    {0xF2, 0x1E, 0x9A, 0x77, 0xB7, 0x1C, 0x49, 0xBC},
-    {0x24, 0x59, 0x46, 0x88, 0x57, 0x54, 0x36, 0x9A},
-    {0x6B, 0x5C, 0x5A, 0x9C, 0x5D, 0x9E, 0x0A, 0x5A},
+    { 0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78 },
+    { 0x51, 0x86, 0x6F, 0xD5, 0xB8, 0x5E, 0xCB, 0x8A },
+    { 0x7D, 0x85, 0x6F, 0x9A, 0x61, 0x30, 0x63, 0xF2 },
+    { 0x24, 0x66, 0xDD, 0x87, 0x8B, 0x96, 0x3C, 0x9D },
+    { 0x61, 0xF9, 0xC3, 0x80, 0x22, 0x81, 0xB0, 0x96 },
+    { 0x7D, 0x0C, 0xC6, 0x30, 0xAF, 0xDA, 0x1E, 0xC7 },
+    { 0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78 },
+    { 0x0A, 0xCE, 0xAB, 0x0F, 0xC6, 0xA0, 0xA2, 0x8D },
+    { 0x59, 0xC6, 0x82, 0x45, 0xEB, 0x05, 0x28, 0x2B },
+    { 0xB1, 0xB8, 0xCC, 0x0B, 0x25, 0x0F, 0x09, 0xA0 },
+    { 0x17, 0x30, 0xE5, 0x77, 0x8B, 0xEA, 0x1D, 0xA4 },
+    { 0xA2, 0x5E, 0x78, 0x56, 0xCF, 0x26, 0x51, 0xEB },
+    { 0x35, 0x38, 0x82, 0xB1, 0x09, 0xCE, 0x8F, 0x1A },
+    { 0x48, 0xF4, 0xD0, 0x88, 0x4C, 0x37, 0x99, 0x18 },
+    { 0x43, 0x21, 0x93, 0xB7, 0x89, 0x51, 0xFC, 0x98 },
+    { 0x13, 0xF0, 0x41, 0x54, 0xD6, 0x9D, 0x1A, 0xE5 },
+    { 0x2E, 0xED, 0xDA, 0x93, 0xFF, 0xD3, 0x9C, 0x79 },
+    { 0xD8, 0x87, 0xE0, 0x39, 0x3C, 0x2D, 0xA6, 0xE3 },
+    { 0x5F, 0x99, 0xD0, 0x4F, 0x5B, 0x16, 0x39, 0x69 },
+    { 0x4A, 0x05, 0x7A, 0x3B, 0x24, 0xD3, 0x97, 0x7B },
+    { 0x45, 0x20, 0x31, 0xC1, 0xE4, 0xFA, 0xDA, 0x8E },
+    { 0x75, 0x55, 0xAE, 0x39, 0xF5, 0x9B, 0x87, 0xBD },
+    { 0x53, 0xC5, 0x5F, 0x9C, 0xB4, 0x9F, 0xC0, 0x19 },
+    { 0x7A, 0x8E, 0x7B, 0xFA, 0x93, 0x7E, 0x89, 0xA3 },
+    { 0xCF, 0x9C, 0x5D, 0x7A, 0x49, 0x86, 0xAD, 0xB5 },
+    { 0xD1, 0xAB, 0xB2, 0x90, 0x65, 0x8B, 0xC7, 0x78 },
+    { 0x55, 0xCB, 0x37, 0x74, 0xD1, 0x3E, 0xF2, 0x01 },
+    { 0xFA, 0x34, 0xEC, 0x48, 0x47, 0xB2, 0x68, 0xB2 },
+    { 0xA7, 0x90, 0x79, 0x51, 0x08, 0xEA, 0x3C, 0xAE },
+    { 0xC3, 0x9E, 0x07, 0x2D, 0x9F, 0xAC, 0x63, 0x1D },
+    { 0x01, 0x49, 0x33, 0xE0, 0xCD, 0xAF, 0xF6, 0xE4 },
+    { 0xF2, 0x1E, 0x9A, 0x77, 0xB7, 0x1C, 0x49, 0xBC },
+    { 0x24, 0x59, 0x46, 0x88, 0x57, 0x54, 0x36, 0x9A },
+    { 0x6B, 0x5C, 0x5A, 0x9C, 0x5D, 0x9E, 0x0A, 0x5A },
 };
 
 static unsigned char cbc_key[16] = {
@@ -188,7 +188,7 @@ static unsigned char ofb64_ok[] = {
     0x63, 0xC2, 0xCF, 0x80, 0xDA
 };
 
-# define KEY_TEST_NUM    25
+#define KEY_TEST_NUM 25
 static unsigned char key_test[KEY_TEST_NUM] = {
     0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87,
     0x78, 0x69, 0x5a, 0x4b, 0x3c, 0x2d, 0x1e, 0x0f,
@@ -201,30 +201,30 @@ static unsigned char key_data[8] = {
 };
 
 static unsigned char key_out[KEY_TEST_NUM][8] = {
-    {0xF9, 0xAD, 0x59, 0x7C, 0x49, 0xDB, 0x00, 0x5E},
-    {0xE9, 0x1D, 0x21, 0xC1, 0xD9, 0x61, 0xA6, 0xD6},
-    {0xE9, 0xC2, 0xB7, 0x0A, 0x1B, 0xC6, 0x5C, 0xF3},
-    {0xBE, 0x1E, 0x63, 0x94, 0x08, 0x64, 0x0F, 0x05},
-    {0xB3, 0x9E, 0x44, 0x48, 0x1B, 0xDB, 0x1E, 0x6E},
-    {0x94, 0x57, 0xAA, 0x83, 0xB1, 0x92, 0x8C, 0x0D},
-    {0x8B, 0xB7, 0x70, 0x32, 0xF9, 0x60, 0x62, 0x9D},
-    {0xE8, 0x7A, 0x24, 0x4E, 0x2C, 0xC8, 0x5E, 0x82},
-    {0x15, 0x75, 0x0E, 0x7A, 0x4F, 0x4E, 0xC5, 0x77},
-    {0x12, 0x2B, 0xA7, 0x0B, 0x3A, 0xB6, 0x4A, 0xE0},
-    {0x3A, 0x83, 0x3C, 0x9A, 0xFF, 0xC5, 0x37, 0xF6},
-    {0x94, 0x09, 0xDA, 0x87, 0xA9, 0x0F, 0x6B, 0xF2},
-    {0x88, 0x4F, 0x80, 0x62, 0x50, 0x60, 0xB8, 0xB4},
-    {0x1F, 0x85, 0x03, 0x1C, 0x19, 0xE1, 0x19, 0x68},
-    {0x79, 0xD9, 0x37, 0x3A, 0x71, 0x4C, 0xA3, 0x4F},
-    {0x93, 0x14, 0x28, 0x87, 0xEE, 0x3B, 0xE1, 0x5C},
-    {0x03, 0x42, 0x9E, 0x83, 0x8C, 0xE2, 0xD1, 0x4B},
-    {0xA4, 0x29, 0x9E, 0x27, 0x46, 0x9F, 0xF6, 0x7B},
-    {0xAF, 0xD5, 0xAE, 0xD1, 0xC1, 0xBC, 0x96, 0xA8},
-    {0x10, 0x85, 0x1C, 0x0E, 0x38, 0x58, 0xDA, 0x9F},
-    {0xE6, 0xF5, 0x1E, 0xD7, 0x9B, 0x9D, 0xB2, 0x1F},
-    {0x64, 0xA6, 0xE1, 0x4A, 0xFD, 0x36, 0xB4, 0x6F},
-    {0x80, 0xC7, 0xD7, 0xD4, 0x5A, 0x54, 0x79, 0xAD},
-    {0x05, 0x04, 0x4B, 0x62, 0xFA, 0x52, 0xD0, 0x80},
+    { 0xF9, 0xAD, 0x59, 0x7C, 0x49, 0xDB, 0x00, 0x5E },
+    { 0xE9, 0x1D, 0x21, 0xC1, 0xD9, 0x61, 0xA6, 0xD6 },
+    { 0xE9, 0xC2, 0xB7, 0x0A, 0x1B, 0xC6, 0x5C, 0xF3 },
+    { 0xBE, 0x1E, 0x63, 0x94, 0x08, 0x64, 0x0F, 0x05 },
+    { 0xB3, 0x9E, 0x44, 0x48, 0x1B, 0xDB, 0x1E, 0x6E },
+    { 0x94, 0x57, 0xAA, 0x83, 0xB1, 0x92, 0x8C, 0x0D },
+    { 0x8B, 0xB7, 0x70, 0x32, 0xF9, 0x60, 0x62, 0x9D },
+    { 0xE8, 0x7A, 0x24, 0x4E, 0x2C, 0xC8, 0x5E, 0x82 },
+    { 0x15, 0x75, 0x0E, 0x7A, 0x4F, 0x4E, 0xC5, 0x77 },
+    { 0x12, 0x2B, 0xA7, 0x0B, 0x3A, 0xB6, 0x4A, 0xE0 },
+    { 0x3A, 0x83, 0x3C, 0x9A, 0xFF, 0xC5, 0x37, 0xF6 },
+    { 0x94, 0x09, 0xDA, 0x87, 0xA9, 0x0F, 0x6B, 0xF2 },
+    { 0x88, 0x4F, 0x80, 0x62, 0x50, 0x60, 0xB8, 0xB4 },
+    { 0x1F, 0x85, 0x03, 0x1C, 0x19, 0xE1, 0x19, 0x68 },
+    { 0x79, 0xD9, 0x37, 0x3A, 0x71, 0x4C, 0xA3, 0x4F },
+    { 0x93, 0x14, 0x28, 0x87, 0xEE, 0x3B, 0xE1, 0x5C },
+    { 0x03, 0x42, 0x9E, 0x83, 0x8C, 0xE2, 0xD1, 0x4B },
+    { 0xA4, 0x29, 0x9E, 0x27, 0x46, 0x9F, 0xF6, 0x7B },
+    { 0xAF, 0xD5, 0xAE, 0xD1, 0xC1, 0xBC, 0x96, 0xA8 },
+    { 0x10, 0x85, 0x1C, 0x0E, 0x38, 0x58, 0xDA, 0x9F },
+    { 0xE6, 0xF5, 0x1E, 0xD7, 0x9B, 0x9D, 0xB2, 0x1F },
+    { 0x64, 0xA6, 0xE1, 0x4A, 0xFD, 0x36, 0xB4, 0x6F },
+    { 0x80, 0xC7, 0xD7, 0xD4, 0x5A, 0x54, 0x79, 0xAD },
+    { 0x05, 0x04, 0x4B, 0x62, 0xFA, 0x52, 0xD0, 0x80 },
 };
 
 static int print_test_data(void)
@@ -338,7 +338,7 @@ static int test_bf_set_key(int n)
     BF_KEY key;
     unsigned char out[8];
 
-    BF_set_key(&key, n+1, key_test);
+    BF_set_key(&key, n + 1, key_test);
     BF_ecb_encrypt(key_data, out, &key, BF_ENCRYPT);
     /* mips-sgi-irix6.5-gcc  vv  -mabi=64 bug workaround */
     if (!TEST_mem_eq(out, 8, &(key_out[n][0]), 8))
@@ -361,7 +361,7 @@ static int test_bf_cbc(void)
     memset(cbc_out, 0, sizeof(cbc_out));
     memcpy(iv, cbc_iv, sizeof(iv));
     BF_cbc_encrypt((unsigned char *)cbc_data, cbc_out, len,
-                   &key, iv, BF_ENCRYPT);
+        &key, iv, BF_ENCRYPT);
     if (!TEST_mem_eq(cbc_out, 32, cbc_ok, 32))
         ret = 0;
 
@@ -388,9 +388,9 @@ static int test_bf_cfb64(void)
     memcpy(iv, cbc_iv, 8);
     n = 0;
     BF_cfb64_encrypt((unsigned char *)cbc_data, cbc_out, (long)13,
-                     &key, iv, &n, BF_ENCRYPT);
+        &key, iv, &n, BF_ENCRYPT);
     BF_cfb64_encrypt((unsigned char *)&(cbc_data[13]), &(cbc_out[13]),
-                     len - 13, &key, iv, &n, BF_ENCRYPT);
+        len - 13, &key, iv, &n, BF_ENCRYPT);
     if (!TEST_mem_eq(cbc_out, (int)len, cfb64_ok, (int)len))
         ret = 0;
 
@@ -398,7 +398,7 @@ static int test_bf_cfb64(void)
     memcpy(iv, cbc_iv, 8);
     BF_cfb64_encrypt(cbc_out, cbc_in, 17, &key, iv, &n, BF_DECRYPT);
     BF_cfb64_encrypt(&(cbc_out[17]), &(cbc_in[17]), len - 17,
-                     &key, iv, &n, BF_DECRYPT);
+        &key, iv, &n, BF_DECRYPT);
     if (!TEST_mem_eq(cbc_in, (int)len, cbc_data, (int)len))
         ret = 0;
 
@@ -420,9 +420,9 @@ static int test_bf_ofb64(void)
     memcpy(iv, cbc_iv, 8);
     n = 0;
     BF_ofb64_encrypt((unsigned char *)cbc_data, cbc_out, (long)13, &key, iv,
-                     &n);
+        &n);
     BF_ofb64_encrypt((unsigned char *)&(cbc_data[13]), &(cbc_out[13]),
-                     len - 13, &key, iv, &n);
+        len - 13, &key, iv, &n);
     if (!TEST_mem_eq(cbc_out, (int)len, ofb64_ok, (int)len))
         ret = 0;
 
@@ -448,7 +448,7 @@ const OPTIONS *test_get_options(void)
 {
     static const OPTIONS test_options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
-        { "print", OPT_PRINT, '-', "Output test tables instead of running tests"},
+        { "print", OPT_PRINT, '-', "Output test tables instead of running tests" },
         { NULL }
     };
     return test_options;
@@ -458,13 +458,13 @@ int setup_tests(void)
 {
 #ifndef OPENSSL_NO_BF
     OPTION_CHOICE o;
-# ifdef CHARSET_EBCDIC
+#ifdef CHARSET_EBCDIC
     int n;
     ebcdic2ascii(cbc_data, cbc_data, strlen(cbc_data));
     for (n = 0; n < 2; n++) {
         ebcdic2ascii(bf_key[n], bf_key[n], strlen(bf_key[n]));
     }
-# endif
+#endif
 
     while ((o = opt_next()) != OPT_EOF) {
         switch (o) {
@@ -474,13 +474,13 @@ int setup_tests(void)
         case OPT_TEST_CASES:
             break;
         default:
-           return 0;
+            return 0;
         }
     }
 
     ADD_ALL_TESTS(test_bf_ecb_raw, 2);
     ADD_ALL_TESTS(test_bf_ecb, NUM_TESTS);
-    ADD_ALL_TESTS(test_bf_set_key, KEY_TEST_NUM-1);
+    ADD_ALL_TESTS(test_bf_set_key, KEY_TEST_NUM - 1);
     ADD_TEST(test_bf_cbc);
     ADD_TEST(test_bf_cfb64);
     ADD_TEST(test_bf_ofb64);
diff --git a/test/bio_addr_test.c b/test/bio_addr_test.c
index 38ea3de36c94d..15761f5464ac8 100644
--- a/test/bio_addr_test.c
+++ b/test/bio_addr_test.c
@@ -38,7 +38,7 @@ static BIO_ADDR *make_dummy_addr(int family)
     size_t wherelen;
 
     /* Fill with a dummy address */
-    switch(family) {
+    switch (family) {
     case AF_INET:
         where = &(sa.sin.sin_addr);
         wherelen = sizeof(sa.sin.sin_addr);
@@ -113,17 +113,17 @@ static int bio_addr_is_eq(const BIO_ADDR *a, const BIO_ADDR *b)
 
     adata = OPENSSL_malloc(alen);
     if (!TEST_ptr(adata)
-            || !BIO_ADDR_rawaddress(a, adata, &alen))
+        || !BIO_ADDR_rawaddress(a, adata, &alen))
         goto err;
 
     bdata = OPENSSL_malloc(blen);
     if (!TEST_ptr(bdata)
-            || !BIO_ADDR_rawaddress(b, bdata, &blen))
+        || !BIO_ADDR_rawaddress(b, bdata, &blen))
         goto err;
 
     ret = (memcmp(adata, bdata, alen) == 0);
 
- err:
+err:
     OPENSSL_free(adata);
     OPENSSL_free(bdata);
     return ret;
@@ -158,7 +158,7 @@ static int test_bio_addr_copy_dup(int idx)
         goto err;
 
     ret = 1;
- err:
+err:
     BIO_ADDR_free(src);
     BIO_ADDR_free(dst);
     return ret;
diff --git a/test/bio_base64_test.c b/test/bio_base64_test.c
index 8d6ca7b58e1ee..902a303a75f51 100644
--- a/test/bio_base64_test.c
+++ b/test/bio_base64_test.c
@@ -27,11 +27,11 @@ typedef struct {
     int no_nl;
 } test_case;
 
-#define BUFMAX 0xa0000          /* Encode at most 640kB. */
-#define sEOF "-EOF"             /* '-' as in PEM and MIME boundaries */
-#define junk "#foo"             /* Skipped initial content */
+#define BUFMAX 0xa0000 /* Encode at most 640kB. */
+#define sEOF "-EOF" /* '-' as in PEM and MIME boundaries */
+#define junk "#foo" /* Skipped initial content */
 
-#define EOF_RETURN (-1729)      /* Distinct from -1, etc., internal results */
+#define EOF_RETURN (-1729) /* Distinct from -1, etc., internal results */
 #define NLEN 6
 #define NVAR 5
 /*
@@ -91,10 +91,9 @@ static int memoutws(BIO *mem, char c, unsigned wscnt, unsigned llen, int *pos)
  * before some of the base64 code points.
  */
 static int encode(unsigned const char *buf, unsigned buflen, char *encoded,
-                  int trunc, unsigned llen, unsigned wscnt, BIO *mem)
+    int trunc, unsigned llen, unsigned wscnt, BIO *mem)
 {
-    static const unsigned char b64[65] =
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    static const unsigned char b64[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
     int pos = 0;
     char nl = '\n';
 
@@ -149,8 +148,8 @@ static int encode(unsigned const char *buf, unsigned buflen, char *encoded,
 }
 
 static int genb64(char *prefix, char *suffix, unsigned const char *buf,
-                  unsigned buflen, int trunc, char *encoded, unsigned llen,
-                  unsigned wscnt, char **out)
+    unsigned buflen, int trunc, char *encoded, unsigned llen,
+    unsigned wscnt, char **out)
 {
     int preflen = strlen(prefix);
     int sufflen = strlen(suffix);
@@ -162,11 +161,9 @@ static int genb64(char *prefix, char *suffix, unsigned const char *buf,
     if (mem == NULL)
         return -1;
 
-    if ((*prefix && (BIO_write(mem, prefix, preflen) != preflen
-                     || BIO_write(mem, &newline, 1) != 1))
+    if ((*prefix && (BIO_write(mem, prefix, preflen) != preflen || BIO_write(mem, &newline, 1) != 1))
         || encode(buf, buflen, encoded, trunc, llen, wscnt, mem) <= 0
-        || (*suffix && (BIO_write(mem, suffix, sufflen) != sufflen
-                        || BIO_write(mem, &newline, 1) != 1))) {
+        || (*suffix && (BIO_write(mem, suffix, sufflen) != sufflen || BIO_write(mem, &newline, 1) != 1))) {
         BIO_free(mem);
         return -1;
     }
@@ -176,7 +173,7 @@ static int genb64(char *prefix, char *suffix, unsigned const char *buf,
     *out = bptr->data;
     outlen = bptr->length;
     bptr->data = NULL;
-    (void) BIO_set_close(mem, BIO_NOCLOSE);
+    (void)BIO_set_close(mem, BIO_NOCLOSE);
     BIO_free(mem);
     BUF_MEM_free(bptr);
 
@@ -217,7 +214,7 @@ static int test_bio_base64_run(test_case *t, int llen, int wscnt)
     }
 
     elen = genb64(t->prefix, t->suffix, raw, t->bytes, t->trunc, t->encoded,
-                  llen, wscnt, &encoded);
+        llen, wscnt, &encoded);
     if (elen < 0 || (bio = BIO_new(BIO_s_mem())) == NULL) {
         OPENSSL_free(raw);
         OPENSSL_free(out);
@@ -232,7 +229,7 @@ static int test_bio_base64_run(test_case *t, int llen, int wscnt)
 
     /*
      * When the input is long enough, and the source bio is retriable, exercise
-     * retries by writting the input to the underlying BIO in two steps (1024
+     * retries by writing the input to the underlying BIO in two steps (1024
      * bytes, then the rest) and trying to decode some data after each write.
      */
     n1 = elen;
@@ -268,7 +265,7 @@ static int test_bio_base64_run(test_case *t, int llen, int wscnt)
     if (t->retry)
         BIO_set_mem_eof_return(bio, 0);
 
-    if (n < (int) out_len)
+    if (n < (int)out_len)
         /* Perform the last read, checking its result */
         ret = BIO_read(b64, out + n, out_len - n);
     else {
@@ -293,8 +290,8 @@ static int test_bio_base64_run(test_case *t, int llen, int wscnt)
         if ((ret = ret < 0 ? 0 : -1) != 0)
             TEST_error("Final read result was non-negative");
     } else if (ret != 0
-             || n != (int) t->bytes
-             || (n > 0 && memcmp(raw, out, n) != 0)) {
+        || n != (int)t->bytes
+        || (n > 0 && memcmp(raw, out, n) != 0)) {
         TEST_error("Failed to decode expected data");
         ret = -1;
     }
@@ -386,10 +383,10 @@ static int test_bio_base64_generated(int idx)
 
     t.prefix = prefixes[variant];
     t.encoded = NULL;
-    t.bytes  = lengths[lencase];
+    t.bytes = lengths[lencase];
     t.trunc = 0;
     if (padcase && padcase < 3)
-        t.bytes  += padcase;
+        t.bytes += padcase;
     else if (padcase >= 3)
         t.trunc = padcase - 2;
     t.suffix = suffixes[variant];
@@ -424,7 +421,7 @@ static int test_bio_base64_corner_case_bug(int idx)
 
     /* Expected decode length */
     t.bytes = 6;
-    t.trunc = 0;    /* ignored */
+    t.trunc = 0; /* ignored */
 
     return generic_case(&t, 0);
 }
diff --git a/test/bio_callback_test.c b/test/bio_callback_test.c
index c84346814e145..824702fe227fe 100644
--- a/test/bio_callback_test.c
+++ b/test/bio_callback_test.c
@@ -14,28 +14,28 @@
 #include "testutil.h"
 
 #define MAXCOUNT 5
-static int         my_param_count;
-static BIO        *my_param_b[MAXCOUNT];
-static int         my_param_oper[MAXCOUNT];
+static int my_param_count;
+static BIO *my_param_b[MAXCOUNT];
+static int my_param_oper[MAXCOUNT];
 static const char *my_param_argp[MAXCOUNT];
-static int         my_param_argi[MAXCOUNT];
-static long        my_param_argl[MAXCOUNT];
-static long        my_param_ret[MAXCOUNT];
-static size_t      my_param_len[MAXCOUNT];
-static size_t      my_param_processed[MAXCOUNT];
+static int my_param_argi[MAXCOUNT];
+static long my_param_argl[MAXCOUNT];
+static long my_param_ret[MAXCOUNT];
+static size_t my_param_len[MAXCOUNT];
+static size_t my_param_processed[MAXCOUNT];
 
 static long my_bio_cb_ex(BIO *b, 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)
 {
     if (my_param_count >= MAXCOUNT)
         return -1;
-    my_param_b[my_param_count]    = b;
+    my_param_b[my_param_count] = b;
     my_param_oper[my_param_count] = oper;
     my_param_argp[my_param_count] = argp;
     my_param_argi[my_param_count] = argi;
     my_param_argl[my_param_count] = argl;
-    my_param_ret[my_param_count]  = ret;
-    my_param_len[my_param_count]  = len;
+    my_param_ret[my_param_count] = ret;
+    my_param_len[my_param_count] = len;
     my_param_processed[my_param_count] = processed != NULL ? *processed : 0;
 
     my_param_count++;
@@ -62,127 +62,127 @@ static int test_bio_callback_ex(void)
     BIO_set_callback_ex(bio, my_bio_cb_ex);
     i = BIO_write(bio, test1, test1len);
     if (!TEST_int_eq(i, test1len)
-            || !TEST_int_eq(my_param_count, 2)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_WRITE)
-            || !TEST_ptr_eq(my_param_argp[0], test1)
-            || !TEST_size_t_eq(my_param_len[0], test1len)
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_int_eq((int)my_param_ret[0], 1)
-            || !TEST_ptr_eq(my_param_b[1], bio)
-            || !TEST_int_eq(my_param_oper[1], BIO_CB_WRITE | BIO_CB_RETURN)
-            || !TEST_ptr_eq(my_param_argp[1], test1)
-            || !TEST_size_t_eq(my_param_len[1], test1len)
-            || !TEST_long_eq(my_param_argl[1], 0L)
-            || !TEST_size_t_eq(my_param_processed[1], test1len)
-            || !TEST_int_eq((int)my_param_ret[1], 1))
+        || !TEST_int_eq(my_param_count, 2)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_WRITE)
+        || !TEST_ptr_eq(my_param_argp[0], test1)
+        || !TEST_size_t_eq(my_param_len[0], test1len)
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_int_eq((int)my_param_ret[0], 1)
+        || !TEST_ptr_eq(my_param_b[1], bio)
+        || !TEST_int_eq(my_param_oper[1], BIO_CB_WRITE | BIO_CB_RETURN)
+        || !TEST_ptr_eq(my_param_argp[1], test1)
+        || !TEST_size_t_eq(my_param_len[1], test1len)
+        || !TEST_long_eq(my_param_argl[1], 0L)
+        || !TEST_size_t_eq(my_param_processed[1], test1len)
+        || !TEST_int_eq((int)my_param_ret[1], 1))
         goto err;
 
     my_param_count = 0;
     i = BIO_read(bio, buf, sizeof(buf));
     if (!TEST_mem_eq(buf, i, test1, test1len)
-            || !TEST_int_eq(my_param_count, 2)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_READ)
-            || !TEST_ptr_eq(my_param_argp[0], buf)
-            || !TEST_size_t_eq(my_param_len[0], sizeof(buf))
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_int_eq((int)my_param_ret[0], 1)
-            || !TEST_ptr_eq(my_param_b[1], bio)
-            || !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN)
-            || !TEST_ptr_eq(my_param_argp[1], buf)
-            || !TEST_size_t_eq(my_param_len[1], sizeof(buf))
-            || !TEST_long_eq(my_param_argl[1], 0L)
-            || !TEST_size_t_eq(my_param_processed[1], test1len)
-            || !TEST_int_eq((int)my_param_ret[1], 1))
+        || !TEST_int_eq(my_param_count, 2)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_READ)
+        || !TEST_ptr_eq(my_param_argp[0], buf)
+        || !TEST_size_t_eq(my_param_len[0], sizeof(buf))
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_int_eq((int)my_param_ret[0], 1)
+        || !TEST_ptr_eq(my_param_b[1], bio)
+        || !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN)
+        || !TEST_ptr_eq(my_param_argp[1], buf)
+        || !TEST_size_t_eq(my_param_len[1], sizeof(buf))
+        || !TEST_long_eq(my_param_argl[1], 0L)
+        || !TEST_size_t_eq(my_param_processed[1], test1len)
+        || !TEST_int_eq((int)my_param_ret[1], 1))
         goto err;
 
     /* By default a mem bio returns -1 if it has run out of data */
     my_param_count = 0;
     i = BIO_read(bio, buf, sizeof(buf));
     if (!TEST_int_eq(i, -1)
-            || !TEST_int_eq(my_param_count, 2)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_READ)
-            || !TEST_ptr_eq(my_param_argp[0], buf)
-            || !TEST_size_t_eq(my_param_len[0], sizeof(buf))
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_int_eq((int)my_param_ret[0], 1)
-            || !TEST_ptr_eq(my_param_b[1], bio)
-            || !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN)
-            || !TEST_ptr_eq(my_param_argp[1], buf)
-            || !TEST_size_t_eq(my_param_len[1], sizeof(buf))
-            || !TEST_long_eq(my_param_argl[1], 0L)
-            || !TEST_size_t_eq(my_param_processed[1], 0)
-            || !TEST_int_eq((int)my_param_ret[1], -1))
+        || !TEST_int_eq(my_param_count, 2)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_READ)
+        || !TEST_ptr_eq(my_param_argp[0], buf)
+        || !TEST_size_t_eq(my_param_len[0], sizeof(buf))
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_int_eq((int)my_param_ret[0], 1)
+        || !TEST_ptr_eq(my_param_b[1], bio)
+        || !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN)
+        || !TEST_ptr_eq(my_param_argp[1], buf)
+        || !TEST_size_t_eq(my_param_len[1], sizeof(buf))
+        || !TEST_long_eq(my_param_argl[1], 0L)
+        || !TEST_size_t_eq(my_param_processed[1], 0)
+        || !TEST_int_eq((int)my_param_ret[1], -1))
         goto err;
 
     /* Force the mem bio to return 0 if it has run out of data */
     my_param_count = 0;
     i = BIO_set_mem_eof_return(bio, 0);
     if (!TEST_int_eq(i, 1)
-            || !TEST_int_eq(my_param_count, 2)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_CTRL)
-            || !TEST_ptr_eq(my_param_argp[0], NULL)
-            || !TEST_int_eq(my_param_argi[0], BIO_C_SET_BUF_MEM_EOF_RETURN)
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_int_eq((int)my_param_ret[0], 1)
-            || !TEST_ptr_eq(my_param_b[1], bio)
-            || !TEST_int_eq(my_param_oper[1], BIO_CB_CTRL | BIO_CB_RETURN)
-            || !TEST_ptr_eq(my_param_argp[1], NULL)
-            || !TEST_int_eq(my_param_argi[1], BIO_C_SET_BUF_MEM_EOF_RETURN)
-            || !TEST_long_eq(my_param_argl[1], 0L)
-            || !TEST_int_eq((int)my_param_ret[1], 1))
+        || !TEST_int_eq(my_param_count, 2)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_CTRL)
+        || !TEST_ptr_eq(my_param_argp[0], NULL)
+        || !TEST_int_eq(my_param_argi[0], BIO_C_SET_BUF_MEM_EOF_RETURN)
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_int_eq((int)my_param_ret[0], 1)
+        || !TEST_ptr_eq(my_param_b[1], bio)
+        || !TEST_int_eq(my_param_oper[1], BIO_CB_CTRL | BIO_CB_RETURN)
+        || !TEST_ptr_eq(my_param_argp[1], NULL)
+        || !TEST_int_eq(my_param_argi[1], BIO_C_SET_BUF_MEM_EOF_RETURN)
+        || !TEST_long_eq(my_param_argl[1], 0L)
+        || !TEST_int_eq((int)my_param_ret[1], 1))
         goto err;
     my_param_count = 0;
     i = BIO_read(bio, buf, sizeof(buf));
     if (!TEST_int_eq(i, 0)
-            || !TEST_int_eq(my_param_count, 2)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_READ)
-            || !TEST_ptr_eq(my_param_argp[0], buf)
-            || !TEST_size_t_eq(my_param_len[0], sizeof(buf))
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_int_eq((int)my_param_ret[0], 1)
-            || !TEST_ptr_eq(my_param_b[1], bio)
-            || !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN)
-            || !TEST_ptr_eq(my_param_argp[1], buf)
-            || !TEST_size_t_eq(my_param_len[1], sizeof(buf))
-            || !TEST_long_eq(my_param_argl[1], 0L)
-            || !TEST_size_t_eq(my_param_processed[1], 0)
-            || !TEST_int_eq((int)my_param_ret[1], 0))
+        || !TEST_int_eq(my_param_count, 2)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_READ)
+        || !TEST_ptr_eq(my_param_argp[0], buf)
+        || !TEST_size_t_eq(my_param_len[0], sizeof(buf))
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_int_eq((int)my_param_ret[0], 1)
+        || !TEST_ptr_eq(my_param_b[1], bio)
+        || !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN)
+        || !TEST_ptr_eq(my_param_argp[1], buf)
+        || !TEST_size_t_eq(my_param_len[1], sizeof(buf))
+        || !TEST_long_eq(my_param_argl[1], 0L)
+        || !TEST_size_t_eq(my_param_processed[1], 0)
+        || !TEST_int_eq((int)my_param_ret[1], 0))
         goto err;
 
     my_param_count = 0;
     i = BIO_puts(bio, test2);
     if (!TEST_int_eq(i, 5)
-            || !TEST_int_eq(my_param_count, 2)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_PUTS)
-            || !TEST_ptr_eq(my_param_argp[0], test2)
-            || !TEST_int_eq(my_param_argi[0], 0)
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_int_eq((int)my_param_ret[0], 1)
-            || !TEST_ptr_eq(my_param_b[1], bio)
-            || !TEST_int_eq(my_param_oper[1], BIO_CB_PUTS | BIO_CB_RETURN)
-            || !TEST_ptr_eq(my_param_argp[1], test2)
-            || !TEST_int_eq(my_param_argi[1], 0)
-            || !TEST_long_eq(my_param_argl[1], 0L)
-            || !TEST_size_t_eq(my_param_processed[1], test2len)
-            || !TEST_int_eq((int)my_param_ret[1], 1))
+        || !TEST_int_eq(my_param_count, 2)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_PUTS)
+        || !TEST_ptr_eq(my_param_argp[0], test2)
+        || !TEST_int_eq(my_param_argi[0], 0)
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_int_eq((int)my_param_ret[0], 1)
+        || !TEST_ptr_eq(my_param_b[1], bio)
+        || !TEST_int_eq(my_param_oper[1], BIO_CB_PUTS | BIO_CB_RETURN)
+        || !TEST_ptr_eq(my_param_argp[1], test2)
+        || !TEST_int_eq(my_param_argi[1], 0)
+        || !TEST_long_eq(my_param_argl[1], 0L)
+        || !TEST_size_t_eq(my_param_processed[1], test2len)
+        || !TEST_int_eq((int)my_param_ret[1], 1))
         goto err;
 
     my_param_count = 0;
     i = BIO_free(bio);
     if (!TEST_int_eq(i, 1)
-            || !TEST_int_eq(my_param_count, 1)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_FREE)
-            || !TEST_ptr_eq(my_param_argp[0], NULL)
-            || !TEST_int_eq(my_param_argi[0], 0)
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_int_eq((int)my_param_ret[0], 1))
+        || !TEST_int_eq(my_param_count, 1)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_FREE)
+        || !TEST_ptr_eq(my_param_argp[0], NULL)
+        || !TEST_int_eq(my_param_argi[0], 0)
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_int_eq((int)my_param_ret[0], 1))
         goto finish;
 
     ok = 1;
@@ -200,16 +200,16 @@ static int test_bio_callback_ex(void)
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 static long my_bio_callback(BIO *b, int oper, const char *argp, int argi,
-                            long argl, long ret)
+    long argl, long ret)
 {
     if (my_param_count >= MAXCOUNT)
         return -1;
-    my_param_b[my_param_count]    = b;
+    my_param_b[my_param_count] = b;
     my_param_oper[my_param_count] = oper;
     my_param_argp[my_param_count] = argp;
     my_param_argi[my_param_count] = argi;
     my_param_argl[my_param_count] = argl;
-    my_param_ret[my_param_count]  = ret;
+    my_param_ret[my_param_count] = ret;
     my_param_count++;
     return ret;
 }
@@ -234,56 +234,56 @@ static int test_bio_callback(void)
     BIO_set_callback(bio, my_bio_callback);
     i = BIO_write(bio, test1, test1len);
     if (!TEST_int_eq(i, test1len)
-            || !TEST_int_eq(my_param_count, 2)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_WRITE)
-            || !TEST_ptr_eq(my_param_argp[0], test1)
-            || !TEST_int_eq(my_param_argi[0], test1len)
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_long_eq(my_param_ret[0], 1L)
-            || !TEST_ptr_eq(my_param_b[1], bio)
-            || !TEST_int_eq(my_param_oper[1], BIO_CB_WRITE | BIO_CB_RETURN)
-            || !TEST_ptr_eq(my_param_argp[1], test1)
-            || !TEST_int_eq(my_param_argi[1], test1len)
-            || !TEST_long_eq(my_param_argl[1], 0L)
-            || !TEST_long_eq(my_param_ret[1], (long)test1len))
+        || !TEST_int_eq(my_param_count, 2)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_WRITE)
+        || !TEST_ptr_eq(my_param_argp[0], test1)
+        || !TEST_int_eq(my_param_argi[0], test1len)
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_long_eq(my_param_ret[0], 1L)
+        || !TEST_ptr_eq(my_param_b[1], bio)
+        || !TEST_int_eq(my_param_oper[1], BIO_CB_WRITE | BIO_CB_RETURN)
+        || !TEST_ptr_eq(my_param_argp[1], test1)
+        || !TEST_int_eq(my_param_argi[1], test1len)
+        || !TEST_long_eq(my_param_argl[1], 0L)
+        || !TEST_long_eq(my_param_ret[1], (long)test1len))
         goto err;
 
     my_param_count = 0;
     i = BIO_read(bio, buf, sizeof(buf));
     if (!TEST_mem_eq(buf, i, test1, test1len)
-            || !TEST_int_eq(my_param_count, 2)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_READ)
-            || !TEST_ptr_eq(my_param_argp[0], buf)
-            || !TEST_int_eq(my_param_argi[0], sizeof(buf))
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_long_eq(my_param_ret[0], 1L)
-            || !TEST_ptr_eq(my_param_b[1], bio)
-            || !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN)
-            || !TEST_ptr_eq(my_param_argp[1], buf)
-            || !TEST_int_eq(my_param_argi[1], sizeof(buf))
-            || !TEST_long_eq(my_param_argl[1], 0L)
-            || !TEST_long_eq(my_param_ret[1], (long)test1len))
+        || !TEST_int_eq(my_param_count, 2)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_READ)
+        || !TEST_ptr_eq(my_param_argp[0], buf)
+        || !TEST_int_eq(my_param_argi[0], sizeof(buf))
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_long_eq(my_param_ret[0], 1L)
+        || !TEST_ptr_eq(my_param_b[1], bio)
+        || !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN)
+        || !TEST_ptr_eq(my_param_argp[1], buf)
+        || !TEST_int_eq(my_param_argi[1], sizeof(buf))
+        || !TEST_long_eq(my_param_argl[1], 0L)
+        || !TEST_long_eq(my_param_ret[1], (long)test1len))
         goto err;
 
     /* By default a mem bio returns -1 if it has run out of data */
     my_param_count = 0;
     i = BIO_read(bio, buf, sizeof(buf));
     if (!TEST_int_eq(i, -1)
-            || !TEST_int_eq(my_param_count, 2)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_READ)
-            || !TEST_ptr_eq(my_param_argp[0], buf)
-            || !TEST_int_eq(my_param_argi[0], sizeof(buf))
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_long_eq(my_param_ret[0], 1L)
-            || !TEST_ptr_eq(my_param_b[1], bio)
-            || !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN)
-            || !TEST_ptr_eq(my_param_argp[1], buf)
-            || !TEST_int_eq(my_param_argi[1], sizeof(buf))
-            || !TEST_long_eq(my_param_argl[1], 0L)
-            || !TEST_long_eq(my_param_ret[1], -1L))
+        || !TEST_int_eq(my_param_count, 2)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_READ)
+        || !TEST_ptr_eq(my_param_argp[0], buf)
+        || !TEST_int_eq(my_param_argi[0], sizeof(buf))
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_long_eq(my_param_ret[0], 1L)
+        || !TEST_ptr_eq(my_param_b[1], bio)
+        || !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN)
+        || !TEST_ptr_eq(my_param_argp[1], buf)
+        || !TEST_int_eq(my_param_argi[1], sizeof(buf))
+        || !TEST_long_eq(my_param_argl[1], 0L)
+        || !TEST_long_eq(my_param_ret[1], -1L))
         goto err;
 
     /* Force the mem bio to return 0 if it has run out of data */
@@ -291,49 +291,49 @@ static int test_bio_callback(void)
     my_param_count = 0;
     i = BIO_read(bio, buf, sizeof(buf));
     if (!TEST_int_eq(i, 0)
-            || !TEST_int_eq(my_param_count, 2)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_READ)
-            || !TEST_ptr_eq(my_param_argp[0], buf)
-            || !TEST_int_eq(my_param_argi[0], sizeof(buf))
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_long_eq(my_param_ret[0], 1L)
-            || !TEST_ptr_eq(my_param_b[1], bio)
-            || !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN)
-            || !TEST_ptr_eq(my_param_argp[1], buf)
-            || !TEST_int_eq(my_param_argi[1], sizeof(buf))
-            || !TEST_long_eq(my_param_argl[1], 0L)
-            || !TEST_long_eq(my_param_ret[1], 0L))
+        || !TEST_int_eq(my_param_count, 2)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_READ)
+        || !TEST_ptr_eq(my_param_argp[0], buf)
+        || !TEST_int_eq(my_param_argi[0], sizeof(buf))
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_long_eq(my_param_ret[0], 1L)
+        || !TEST_ptr_eq(my_param_b[1], bio)
+        || !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN)
+        || !TEST_ptr_eq(my_param_argp[1], buf)
+        || !TEST_int_eq(my_param_argi[1], sizeof(buf))
+        || !TEST_long_eq(my_param_argl[1], 0L)
+        || !TEST_long_eq(my_param_ret[1], 0L))
         goto err;
 
     my_param_count = 0;
     i = BIO_puts(bio, test2);
     if (!TEST_int_eq(i, 5)
-            || !TEST_int_eq(my_param_count, 2)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_PUTS)
-            || !TEST_ptr_eq(my_param_argp[0], test2)
-            || !TEST_int_eq(my_param_argi[0], 0)
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_long_eq(my_param_ret[0], 1L)
-            || !TEST_ptr_eq(my_param_b[1], bio)
-            || !TEST_int_eq(my_param_oper[1], BIO_CB_PUTS | BIO_CB_RETURN)
-            || !TEST_ptr_eq(my_param_argp[1], test2)
-            || !TEST_int_eq(my_param_argi[1], 0)
-            || !TEST_long_eq(my_param_argl[1], 0L)
-            || !TEST_long_eq(my_param_ret[1], (long)test2len))
+        || !TEST_int_eq(my_param_count, 2)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_PUTS)
+        || !TEST_ptr_eq(my_param_argp[0], test2)
+        || !TEST_int_eq(my_param_argi[0], 0)
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_long_eq(my_param_ret[0], 1L)
+        || !TEST_ptr_eq(my_param_b[1], bio)
+        || !TEST_int_eq(my_param_oper[1], BIO_CB_PUTS | BIO_CB_RETURN)
+        || !TEST_ptr_eq(my_param_argp[1], test2)
+        || !TEST_int_eq(my_param_argi[1], 0)
+        || !TEST_long_eq(my_param_argl[1], 0L)
+        || !TEST_long_eq(my_param_ret[1], (long)test2len))
         goto err;
 
     my_param_count = 0;
     i = BIO_free(bio);
     if (!TEST_int_eq(i, 1)
-            || !TEST_int_eq(my_param_count, 1)
-            || !TEST_ptr_eq(my_param_b[0], bio)
-            || !TEST_int_eq(my_param_oper[0], BIO_CB_FREE)
-            || !TEST_ptr_eq(my_param_argp[0], NULL)
-            || !TEST_int_eq(my_param_argi[0], 0)
-            || !TEST_long_eq(my_param_argl[0], 0L)
-            || !TEST_long_eq(my_param_ret[0], 1L))
+        || !TEST_int_eq(my_param_count, 1)
+        || !TEST_ptr_eq(my_param_b[0], bio)
+        || !TEST_int_eq(my_param_oper[0], BIO_CB_FREE)
+        || !TEST_ptr_eq(my_param_argp[0], NULL)
+        || !TEST_int_eq(my_param_argi[0], 0)
+        || !TEST_long_eq(my_param_argl[0], 0L)
+        || !TEST_long_eq(my_param_ret[0], 1L))
         goto finish;
 
     ok = 1;
diff --git a/test/bio_comp_test.c b/test/bio_comp_test.c
index 75ae46adb6fba..2a63bff52ddbd 100644
--- a/test/bio_comp_test.c
+++ b/test/bio_comp_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -17,11 +17,11 @@
 #include "testutil/output.h"
 #include "testutil/tu_local.h"
 
-#define COMPRESS  1
-#define EXPAND    0
+#define COMPRESS 1
+#define EXPAND 0
 
-#define BUFFER_SIZE    32 * 1024
-#define NUM_SIZES      4
+#define BUFFER_SIZE 32 * 1024
+#define NUM_SIZES 4
 static int sizes[NUM_SIZES] = { 64, 512, 2048, 16 * 1024 };
 
 /* using global buffers */
@@ -69,7 +69,7 @@ static int do_bio_comp_test(const BIO_METHOD *meth, size_t size)
         goto err;
 
     ret = 1;
- err:
+err:
     BIO_free(bexp);
     BIO_free(bcomp);
     BIO_free(bmem);
@@ -83,8 +83,10 @@ static int do_bio_comp(const BIO_METHOD *meth, int n)
     int size = sizes[n % 4];
     int type = n / 4;
 
-    if (!TEST_ptr(original = OPENSSL_malloc(BUFFER_SIZE))
-        || !TEST_ptr(result = OPENSSL_malloc(BUFFER_SIZE)))
+    original = OPENSSL_malloc(BUFFER_SIZE);
+    result = OPENSSL_malloc(BUFFER_SIZE);
+
+    if (!TEST_ptr(original) || !TEST_ptr(result))
         goto err;
 
     switch (type) {
@@ -113,7 +115,7 @@ static int do_bio_comp(const BIO_METHOD *meth, int n)
     if (!TEST_true(do_bio_comp_test(meth, size)))
         goto err;
     success = 1;
- err:
+err:
     OPENSSL_free(original);
     OPENSSL_free(result);
     return success;
diff --git a/test/bio_core_test.c b/test/bio_core_test.c
index be2ae49932e77..103441766b384 100644
--- a/test/bio_core_test.c
+++ b/test/bio_core_test.c
@@ -17,13 +17,13 @@ struct ossl_core_bio_st {
 };
 
 static int tst_bio_core_read_ex(OSSL_CORE_BIO *bio, char *data, size_t data_len,
-                                size_t *bytes_read)
+    size_t *bytes_read)
 {
     return BIO_read_ex(bio->bio, data, data_len, bytes_read);
 }
 
 static int tst_bio_core_write_ex(OSSL_CORE_BIO *bio, const char *data,
-                                 size_t data_len, size_t *written)
+    size_t data_len, size_t *written)
 {
     return BIO_write_ex(bio->bio, data, data_len, written);
 }
@@ -75,31 +75,31 @@ static int test_bio_core(void)
 
     corebio.bio = BIO_new(BIO_s_mem());
     if (!TEST_ptr(corebio.bio)
-            || !TEST_ptr(libctx)
-               /*
-                * Attempting to create a corebio in a libctx that was not
-                * created via OSSL_LIB_CTX_new_from_dispatch() should fail.
-                */
-            || !TEST_ptr_null((cbiobad = BIO_new_from_core_bio(NULL, &corebio)))
-            || !TEST_ptr((cbio = BIO_new_from_core_bio(libctx, &corebio))))
+        || !TEST_ptr(libctx)
+        /*
+         * Attempting to create a corebio in a libctx that was not
+         * created via OSSL_LIB_CTX_new_from_dispatch() should fail.
+         */
+        || !TEST_ptr_null((cbiobad = BIO_new_from_core_bio(NULL, &corebio)))
+        || !TEST_ptr((cbio = BIO_new_from_core_bio(libctx, &corebio))))
         goto err;
 
     if (!TEST_int_gt(BIO_puts(corebio.bio, msg), 0)
-               /* Test a ctrl via BIO_eof */
-            || !TEST_false(BIO_eof(cbio))
-            || !TEST_int_gt(BIO_gets(cbio, buf, sizeof(buf)), 0)
-            || !TEST_true(BIO_eof(cbio))
-            || !TEST_str_eq(buf, msg))
+        /* Test a ctrl via BIO_eof */
+        || !TEST_false(BIO_eof(cbio))
+        || !TEST_int_gt(BIO_gets(cbio, buf, sizeof(buf)), 0)
+        || !TEST_true(BIO_eof(cbio))
+        || !TEST_str_eq(buf, msg))
         goto err;
 
     buf[0] = '\0';
     if (!TEST_int_gt(BIO_write(cbio, msg, strlen(msg) + 1), 0)
-            || !TEST_int_gt(BIO_read(cbio, buf, sizeof(buf)), 0)
-            || !TEST_str_eq(buf, msg))
+        || !TEST_int_gt(BIO_read(cbio, buf, sizeof(buf)), 0)
+        || !TEST_str_eq(buf, msg))
         goto err;
 
     testresult = 1;
- err:
+err:
     BIO_free(cbiobad);
     BIO_free(cbio);
     BIO_free(corebio.bio);
diff --git a/test/bio_dgram_test.c b/test/bio_dgram_test.c
index aca016ca95b07..e2c528c47e5da 100644
--- a/test/bio_dgram_test.c
+++ b/test/bio_dgram_test.c
@@ -62,14 +62,14 @@ static int compare_addr(const BIO_ADDR *a, const BIO_ADDR *b)
 }
 
 static int do_sendmmsg(BIO *b, BIO_MSG *msg,
-                       size_t num_msg, uint64_t flags,
-                       size_t *num_processed)
+    size_t num_msg, uint64_t flags,
+    size_t *num_processed)
 {
     size_t done;
 
-    for (done = 0; done < num_msg; ) {
+    for (done = 0; done < num_msg;) {
         if (!BIO_sendmmsg(b, msg + done, sizeof(BIO_MSG),
-                          num_msg - done, flags, num_processed))
+                num_msg - done, flags, num_processed))
             return 0;
 
         done += *num_processed;
@@ -80,14 +80,14 @@ static int do_sendmmsg(BIO *b, BIO_MSG *msg,
 }
 
 static int do_recvmmsg(BIO *b, BIO_MSG *msg,
-                       size_t num_msg, uint64_t flags,
-                       size_t *num_processed)
+    size_t num_msg, uint64_t flags,
+    size_t *num_processed)
 {
     size_t done;
 
-    for (done = 0; done < num_msg; ) {
+    for (done = 0; done < num_msg;) {
         if (!BIO_recvmmsg(b, msg + done, sizeof(BIO_MSG),
-                          num_msg - done, flags, num_processed))
+                num_msg - done, flags, num_processed))
             return 0;
 
         done += *num_processed;
@@ -110,7 +110,7 @@ static int test_bio_dgram_impl(int af, int use_local)
 #endif
     void *pina;
     size_t inal, i;
-    union BIO_sock_info_u info1 = {0}, info2 = {0};
+    union BIO_sock_info_u info1 = { 0 }, info2 = { 0 };
     char rx_buf[128], rx_buf2[128];
     BIO_MSG tx_msg[128], rx_msg[128];
     char tx_buf[128];
@@ -234,17 +234,17 @@ static int test_bio_dgram_impl(int af, int use_local)
         goto err;
 
     /* Now test using sendmmsg/recvmmsg with no peer set */
-    tx_msg[0].data      = "apple";
-    tx_msg[0].data_len  = 5;
-    tx_msg[0].peer      = NULL;
-    tx_msg[0].local     = NULL;
-    tx_msg[0].flags     = 0;
-
-    tx_msg[1].data      = "orange";
-    tx_msg[1].data_len  = 6;
-    tx_msg[1].peer      = NULL;
-    tx_msg[1].local     = NULL;
-    tx_msg[1].flags     = 0;
+    tx_msg[0].data = "apple";
+    tx_msg[0].data_len = 5;
+    tx_msg[0].peer = NULL;
+    tx_msg[0].local = NULL;
+    tx_msg[0].flags = 0;
+
+    tx_msg[1].data = "orange";
+    tx_msg[1].data_len = 6;
+    tx_msg[1].peer = NULL;
+    tx_msg[1].local = NULL;
+    tx_msg[1].flags = 0;
 
     /* First effort should fail due to missing destination address */
     if (!TEST_false(do_sendmmsg(b1, tx_msg, 2, 0, &num_processed))
@@ -255,12 +255,12 @@ static int test_bio_dgram_impl(int af, int use_local)
      * Second effort should fail due to local being requested
      * when not enabled
      */
-    tx_msg[0].peer  = addr2;
+    tx_msg[0].peer = addr2;
     tx_msg[0].local = addr1;
-    tx_msg[1].peer  = addr2;
+    tx_msg[1].peer = addr2;
     tx_msg[1].local = addr1;
     if (!TEST_false(do_sendmmsg(b1, tx_msg, 2, 0, &num_processed)
-        || !TEST_size_t_eq(num_processed, 0)))
+            || !TEST_size_t_eq(num_processed, 0)))
         goto err;
 
     /* Enable local if we are using it */
@@ -279,18 +279,18 @@ static int test_bio_dgram_impl(int af, int use_local)
         goto err;
 
     /* Now try receiving */
-    rx_msg[0].data      = rx_buf;
-    rx_msg[0].data_len  = sizeof(rx_buf);
-    rx_msg[0].peer      = addr3;
-    rx_msg[0].local     = addr4;
-    rx_msg[0].flags     = (1UL<<31); /* undefined flag, should be erased */
+    rx_msg[0].data = rx_buf;
+    rx_msg[0].data_len = sizeof(rx_buf);
+    rx_msg[0].peer = addr3;
+    rx_msg[0].local = addr4;
+    rx_msg[0].flags = (1UL << 31); /* undefined flag, should be erased */
     memset(rx_buf, 0, sizeof(rx_buf));
 
-    rx_msg[1].data      = rx_buf2;
-    rx_msg[1].data_len  = sizeof(rx_buf2);
-    rx_msg[1].peer      = addr5;
-    rx_msg[1].local     = addr6;
-    rx_msg[1].flags     = (1UL<<31); /* undefined flag, should be erased */
+    rx_msg[1].data = rx_buf2;
+    rx_msg[1].data_len = sizeof(rx_buf2);
+    rx_msg[1].peer = addr5;
+    rx_msg[1].local = addr6;
+    rx_msg[1].flags = (1UL << 31); /* undefined flag, should be erased */
     memset(rx_buf2, 0, sizeof(rx_buf2));
 
     /*
@@ -308,10 +308,10 @@ static int test_bio_dgram_impl(int af, int use_local)
     if (!TEST_int_eq((int)rx_msg[1].data_len, sizeof(rx_buf2)))
         goto err;
 
-    if (!TEST_ulong_eq((unsigned long)rx_msg[0].flags, 1UL<<31))
+    if (!TEST_ulong_eq((unsigned long)rx_msg[0].flags, 1UL << 31))
         goto err;
 
-    if (!TEST_ulong_eq((unsigned long)rx_msg[1].flags, 1UL<<31))
+    if (!TEST_ulong_eq((unsigned long)rx_msg[1].flags, 1UL << 31))
         goto err;
 
     /* Enable local if we are using it */
@@ -383,11 +383,11 @@ static int test_bio_dgram_impl(int af, int use_local)
      */
     for (i = 0; i < OSSL_NELEM(tx_msg); ++i) {
         tx_buf[i] = (char)i;
-        tx_msg[i].data      = tx_buf + i;
-        tx_msg[i].data_len  = 1;
-        tx_msg[i].peer      = addr2;
-        tx_msg[i].local     = use_local ? addr1 : NULL;
-        tx_msg[i].flags     = 0;
+        tx_msg[i].data = tx_buf + i;
+        tx_msg[i].data_len = 1;
+        tx_msg[i].peer = addr2;
+        tx_msg[i].local = use_local ? addr1 : NULL;
+        tx_msg[i].flags = 0;
     }
     if (!TEST_true(do_sendmmsg(b1, tx_msg, OSSL_NELEM(tx_msg), 0, &num_processed))
         || !TEST_size_t_eq(num_processed, OSSL_NELEM(tx_msg)))
@@ -399,11 +399,11 @@ static int test_bio_dgram_impl(int af, int use_local)
      */
     for (i = 0; i < OSSL_NELEM(rx_msg); ++i) {
         rx_buf[i] = '\0';
-        rx_msg[i].data      = rx_buf + i;
-        rx_msg[i].data_len  = 1;
-        rx_msg[i].peer      = NULL;
-        rx_msg[i].local     = NULL;
-        rx_msg[i].flags     = 0;
+        rx_msg[i].data = rx_buf + i;
+        rx_msg[i].data_len = 1;
+        rx_msg[i].peer = NULL;
+        rx_msg[i].local = NULL;
+        rx_msg[i].flags = 0;
     }
     if (!TEST_true(do_recvmmsg(b2, rx_msg, OSSL_NELEM(rx_msg), 0, &num_processed))
         || !TEST_size_t_eq(num_processed, OSSL_NELEM(rx_msg)))
@@ -435,12 +435,12 @@ struct bio_dgram_case {
 
 static const struct bio_dgram_case bio_dgram_cases[] = {
     /* Test without local */
-    { AF_INET,  0 },
+    { AF_INET, 0 },
 #if OPENSSL_USE_IPV6
     { AF_INET6, 0 },
 #endif
     /* Test with local */
-    { AF_INET,  1 },
+    { AF_INET, 1 },
 #if OPENSSL_USE_IPV6
     { AF_INET6, 1 }
 #endif
@@ -449,17 +449,17 @@ static const struct bio_dgram_case bio_dgram_cases[] = {
 static int test_bio_dgram(int idx)
 {
     return test_bio_dgram_impl(bio_dgram_cases[idx].af,
-                               bio_dgram_cases[idx].local);
+        bio_dgram_cases[idx].local);
 }
 
-# if !defined(OPENSSL_NO_CHACHA)
+#if !defined(OPENSSL_NO_CHACHA)
 static int random_data(const uint32_t *key, uint8_t *data, size_t data_len, size_t offset)
 {
     int ret = 0, outl;
     EVP_CIPHER_CTX *ctx = NULL;
     EVP_CIPHER *cipher = NULL;
     static const uint8_t zeroes[2048];
-    uint32_t counter[4] = {0};
+    uint32_t counter[4] = { 0 };
 
     counter[0] = (uint32_t)offset;
 
@@ -479,7 +479,7 @@ static int random_data(const uint32_t *key, uint8_t *data, size_t data_len, size
         if (EVP_EncryptUpdate(ctx, data, &outl, zeroes, outl) != 1)
             goto err;
 
-        data     += outl;
+        data += outl;
         data_len -= outl;
     }
 
@@ -502,9 +502,9 @@ static int test_bio_dgram_pair(int idx)
     struct in_addr in_local;
     size_t total = 0;
     const uint32_t ref_caps = BIO_DGRAM_CAP_HANDLES_SRC_ADDR
-                            | BIO_DGRAM_CAP_HANDLES_DST_ADDR
-                            | BIO_DGRAM_CAP_PROVIDES_SRC_ADDR
-                            | BIO_DGRAM_CAP_PROVIDES_DST_ADDR;
+        | BIO_DGRAM_CAP_HANDLES_DST_ADDR
+        | BIO_DGRAM_CAP_PROVIDES_SRC_ADDR
+        | BIO_DGRAM_CAP_PROVIDES_DST_ADDR;
 
     memset(msgs, 0, sizeof(msgs));
     memset(rmsgs, 0, sizeof(rmsgs));
@@ -552,7 +552,7 @@ static int test_bio_dgram_pair(int idx)
         if (!TEST_int_eq(random_data(key, scratch, sizeof(scratch), i), 1))
             goto err;
 
-        blen = ((*(uint32_t*)scratch) % mtu1) + 1;
+        blen = ((*(uint32_t *)scratch) % mtu1) + 1;
         r = BIO_write(bio1, scratch + 4, blen);
         if (r == -1)
             break;
@@ -585,7 +585,7 @@ static int test_bio_dgram_pair(int idx)
         if (!TEST_int_eq(random_data(key, scratch, sizeof(scratch), i), 1))
             goto err;
 
-        blen = ((*(uint32_t*)scratch) % mtu1) + 1;
+        blen = ((*(uint32_t *)scratch) % mtu1) + 1;
         r = BIO_read(bio2, scratch2, sizeof(scratch2));
         if (!TEST_int_eq(r, blen))
             goto err;
@@ -602,22 +602,22 @@ static int test_bio_dgram_pair(int idx)
     if (!TEST_int_eq(random_data(key, scratch, sizeof(scratch), 0), 1))
         goto err;
 
-    msgs[0].data     = scratch;
+    msgs[0].data = scratch;
     msgs[0].data_len = 19;
-    msgs[1].data     = scratch + 19;
+    msgs[1].data = scratch + 19;
     msgs[1].data_len = 46;
 
     if (!TEST_true(BIO_sendmmsg(bio1, msgs, sizeof(BIO_MSG), OSSL_NELEM(msgs), 0,
-                                &num_processed))
+            &num_processed))
         || !TEST_size_t_eq(num_processed, 2))
         goto err;
 
-    rmsgs[0].data       = scratch2;
-    rmsgs[0].data_len   = 64;
-    rmsgs[1].data       = scratch2 + 64;
-    rmsgs[1].data_len   = 64;
+    rmsgs[0].data = scratch2;
+    rmsgs[0].data_len = 64;
+    rmsgs[1].data = scratch2 + 64;
+    rmsgs[1].data_len = 64;
     if (!TEST_true(BIO_recvmmsg(bio2, rmsgs, sizeof(BIO_MSG), OSSL_NELEM(rmsgs), 0,
-                                &num_processed))
+            &num_processed))
         || !TEST_size_t_eq(num_processed, 2))
         goto err;
 
@@ -633,7 +633,8 @@ static int test_bio_dgram_pair(int idx)
         goto err;
 
     if (!TEST_int_eq(BIO_ADDR_rawmake(addr1, AF_INET, &in_local,
-                                      sizeof(in_local), 1234), 1))
+                         sizeof(in_local), 1234),
+            1))
         goto err;
 
     addr2 = BIO_ADDR_new();
@@ -641,7 +642,8 @@ static int test_bio_dgram_pair(int idx)
         goto err;
 
     if (!TEST_int_eq(BIO_ADDR_rawmake(addr2, AF_INET, &in_local,
-                                      sizeof(in_local), 2345), 1))
+                         sizeof(in_local), 2345),
+            1))
         goto err;
 
     addr3 = BIO_ADDR_new();
@@ -656,7 +658,7 @@ static int test_bio_dgram_pair(int idx)
 
     /* fails due to lack of caps on peer */
     if (!TEST_false(BIO_sendmmsg(bio1, msgs, sizeof(BIO_MSG),
-                                 OSSL_NELEM(msgs), 0, &num_processed))
+            OSSL_NELEM(msgs), 0, &num_processed))
         || !TEST_size_t_eq(num_processed, 0))
         goto err;
 
@@ -684,12 +686,12 @@ static int test_bio_dgram_pair(int idx)
     if (!TEST_int_eq(BIO_dgram_set_local_addr_enable(bio2, 1), 1))
         goto err;
 
-    rmsgs[0].data       = scratch2;
-    rmsgs[0].data_len   = 64;
-    rmsgs[0].peer       = addr3;
-    rmsgs[0].local      = addr4;
+    rmsgs[0].data = scratch2;
+    rmsgs[0].data_len = 64;
+    rmsgs[0].peer = addr3;
+    rmsgs[0].local = addr4;
     if (!TEST_true(BIO_recvmmsg(bio2, rmsgs, sizeof(BIO_MSG), OSSL_NELEM(rmsgs), 0,
-                                &num_processed))
+            &num_processed))
         || !TEST_size_t_eq(num_processed, 1))
         goto err;
 
@@ -716,14 +718,14 @@ static int test_bio_dgram_pair(int idx)
         || !TEST_size_t_eq(num_processed, 1))
         goto err;
 
-    rmsgs[0].data       = scratch2;
-    rmsgs[0].data_len   = 64;
+    rmsgs[0].data = scratch2;
+    rmsgs[0].data_len = 64;
     if (!TEST_true(BIO_recvmmsg(bio2, rmsgs, sizeof(BIO_MSG), OSSL_NELEM(rmsgs), 0, &num_processed))
         || !TEST_size_t_eq(num_processed, 1))
         goto err;
 
     if (!TEST_mem_eq(rmsgs[0].data, rmsgs[0].data_len,
-                     msgs[0].data, msgs[0].data_len))
+            msgs[0].data, msgs[0].data_len))
         goto err;
 
     if (!TEST_int_eq(BIO_ADDR_family(addr3), AF_INET))
@@ -773,7 +775,7 @@ static int test_bio_dgram_pair(int idx)
     BIO_ADDR_free(addr4);
     return testresult;
 }
-# endif /* !defined(OPENSSL_NO_CHACHA) */
+#endif /* !defined(OPENSSL_NO_CHACHA) */
 #endif /* !defined(OPENSSL_NO_DGRAM) && !defined(OPENSSL_NO_SOCK) */
 
 int setup_tests(void)
@@ -785,9 +787,9 @@ int setup_tests(void)
 
 #if !defined(OPENSSL_NO_DGRAM) && !defined(OPENSSL_NO_SOCK)
     ADD_ALL_TESTS(test_bio_dgram, OSSL_NELEM(bio_dgram_cases));
-# if !defined(OPENSSL_NO_CHACHA)
+#if !defined(OPENSSL_NO_CHACHA)
     ADD_ALL_TESTS(test_bio_dgram_pair, 3);
-# endif
+#endif
 #endif
 
     return 1;
diff --git a/test/bio_enc_test.c b/test/bio_enc_test.c
index b12cf9c38bf78..02bab70b125da 100644
--- a/test/bio_enc_test.c
+++ b/test/bio_enc_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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
@@ -14,12 +14,12 @@
 
 #include "testutil.h"
 
-#define ENCRYPT  1
-#define DECRYPT  0
+#define ENCRYPT 1
+#define DECRYPT 0
 
-#define DATA_SIZE    1024
-#define MAX_IV       32
-#define BUF_SIZE     (DATA_SIZE + MAX_IV)
+#define DATA_SIZE 1024
+#define MAX_IV 32
+#define BUF_SIZE (DATA_SIZE + MAX_IV)
 
 static const unsigned char KEY[] = {
     0x51, 0x50, 0xd1, 0x77, 0x2f, 0x50, 0x83, 0x4a,
@@ -35,8 +35,8 @@ static const unsigned char IV[] = {
     0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
 };
 
-static int do_bio_cipher(const EVP_CIPHER* cipher, const unsigned char* key,
-    const unsigned char* iv)
+static int do_bio_cipher(const EVP_CIPHER *cipher, const unsigned char *key,
+    const unsigned char *iv)
 {
     BIO *b, *mem;
     static unsigned char inp[BUF_SIZE] = { 0 };
@@ -115,7 +115,7 @@ static int do_bio_cipher(const EVP_CIPHER* cipher, const unsigned char* key,
             goto err;
         BIO_push(b, mem);
         memset(out, 0, sizeof(out));
-        for (len = 0; (delta = BIO_read(b, out + len, i)); ) {
+        for (len = 0; (delta = BIO_read(b, out + len, i));) {
             len += delta;
         }
         BIO_free_all(b);
@@ -139,7 +139,17 @@ static int do_bio_cipher(const EVP_CIPHER* cipher, const unsigned char* key,
     if (!TEST_ptr(mem))
         goto err;
     BIO_push(b, mem);
+#if 0
+    /*
+     * This is wrong to do, it always fails, and incorrectly ends up
+     * calling `EVP_CipherFinal()` and setting ctx->finished = 1, ...
+     * all of which are unwanted.  But just deleting this is less
+     * instructive to future readers of the code.  Don't call BIO_flush
+     * until you're done either reading or writing and want to finalise
+     * the state.
+     */
     (void)BIO_flush(b);
+#endif
     memset(out, 0, sizeof(out));
     len = BIO_read(b, out, sizeof(out));
     BIO_free_all(b);
@@ -193,7 +203,7 @@ static int do_bio_cipher(const EVP_CIPHER* cipher, const unsigned char* key,
             goto err;
         BIO_push(b, mem);
         memset(out, 0, sizeof(out));
-        for (len = 0; (delta = BIO_read(b, out + len, i)); ) {
+        for (len = 0; (delta = BIO_read(b, out + len, i));) {
             len += delta;
         }
         BIO_free_all(b);
@@ -211,13 +221,13 @@ static int do_bio_cipher(const EVP_CIPHER* cipher, const unsigned char* key,
     return 0;
 }
 
-static int do_test_bio_cipher(const EVP_CIPHER* cipher, int idx)
+static int do_test_bio_cipher(const EVP_CIPHER *cipher, int idx)
 {
     switch (idx) {
-        case 0:
-            return do_bio_cipher(cipher, KEY, NULL);
-        case 1:
-            return do_bio_cipher(cipher, KEY, IV);
+    case 0:
+        return do_bio_cipher(cipher, KEY, NULL);
+    case 1:
+        return do_bio_cipher(cipher, KEY, IV);
     }
     return 0;
 }
@@ -242,19 +252,80 @@ static int test_bio_enc_aes_256_ofb(int idx)
     return do_test_bio_cipher(EVP_aes_256_ofb(), idx);
 }
 
-# ifndef OPENSSL_NO_CHACHA
+#ifndef OPENSSL_NO_CHACHA
 static int test_bio_enc_chacha20(int idx)
 {
     return do_test_bio_cipher(EVP_chacha20(), idx);
 }
 
-#  ifndef OPENSSL_NO_POLY1305
+#ifndef OPENSSL_NO_POLY1305
 static int test_bio_enc_chacha20_poly1305(int idx)
 {
     return do_test_bio_cipher(EVP_chacha20_poly1305(), idx);
 }
-#  endif
-# endif
+#endif
+#endif
+
+static int test_bio_enc_eof_read_flush(void)
+{
+    /* Length chosen to ensure base64 encoding employs padding */
+    const unsigned char pbuf[] = "Attack at dawn";
+    unsigned char cbuf[16]; /* At least as long as pbuf */
+    const EVP_CIPHER *cipher = EVP_aes_256_gcm();
+    EVP_CIPHER_CTX *ctx = NULL;
+    BIO *mem = NULL, *b64 = NULL, *cbio = NULL;
+    unsigned char tag[16];
+    size_t key_size, iv_size;
+    int n, ret = 0;
+
+    memset(tag, 0, sizeof(tag));
+    if (!TEST_ptr(cipher)
+        || !TEST_int_gt((key_size = EVP_CIPHER_key_length(cipher)), 0)
+        || !TEST_int_gt((iv_size = EVP_CIPHER_iv_length(cipher)), 0)
+        || !TEST_ptr(mem = BIO_new(BIO_s_mem()))
+        || !TEST_ptr(b64 = BIO_new(BIO_f_base64()))
+        || !TEST_ptr(cbio = BIO_new(BIO_f_cipher()))
+        || !TEST_ptr(BIO_push(b64, mem))
+        || !TEST_ptr(BIO_push(cbio, b64))
+        || !TEST_int_gt(BIO_get_cipher_ctx(cbio, &ctx), 0)
+        || !TEST_true(EVP_CipherInit_ex(ctx, cipher, NULL, KEY, IV, ENCRYPT))
+        || !TEST_int_gt(BIO_write(cbio, pbuf, sizeof(pbuf) - 1), 0)
+        || !TEST_int_gt(BIO_flush(cbio), 0)
+        || !TEST_int_gt(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG,
+                            sizeof(tag), tag),
+            0))
+        goto end;
+    BIO_free(cbio);
+    BIO_free(b64);
+    b64 = cbio = NULL;
+
+    BIO_set_mem_eof_return(mem, 0);
+    BIO_set_flags(mem, BIO_FLAGS_NONCLEAR_RST);
+    if (!TEST_int_gt(BIO_reset(mem), 0)
+        || !TEST_ptr(b64 = BIO_new(BIO_f_base64()))
+        || !TEST_ptr(cbio = BIO_new(BIO_f_cipher()))
+        || !TEST_ptr(BIO_push(b64, mem))
+        || !TEST_ptr(BIO_push(cbio, b64))
+        || !TEST_int_gt(BIO_get_cipher_ctx(cbio, &ctx), 0)
+        || !TEST_true(EVP_CipherInit_ex(ctx, cipher, NULL, KEY, IV, DECRYPT))
+        || !TEST_int_gt(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG,
+                            sizeof(tag), tag),
+            0)
+        || !TEST_int_gt((n = BIO_read(cbio, cbuf, sizeof(cbuf))), 0)
+        || !TEST_true(BIO_get_cipher_status(cbio))
+        /* Evaluate both and report whether either or both failed */
+        || (!TEST_int_gt(BIO_flush(cbio), 0) + !TEST_true(BIO_get_cipher_status(cbio)))
+        || !TEST_mem_eq(cbuf, n, pbuf, sizeof(pbuf) - 1))
+        goto end;
+
+    ret = 1;
+
+end:
+    BIO_free(cbio);
+    BIO_free(b64);
+    BIO_free(mem);
+    return ret;
+}
 
 int setup_tests(void)
 {
@@ -262,11 +333,12 @@ int setup_tests(void)
     ADD_ALL_TESTS(test_bio_enc_aes_128_ctr, 2);
     ADD_ALL_TESTS(test_bio_enc_aes_256_cfb, 2);
     ADD_ALL_TESTS(test_bio_enc_aes_256_ofb, 2);
-# ifndef OPENSSL_NO_CHACHA
+#ifndef OPENSSL_NO_CHACHA
     ADD_ALL_TESTS(test_bio_enc_chacha20, 2);
-#  ifndef OPENSSL_NO_POLY1305
+#ifndef OPENSSL_NO_POLY1305
     ADD_ALL_TESTS(test_bio_enc_chacha20_poly1305, 2);
-#  endif
-# endif
+#endif
+#endif
+    ADD_TEST(test_bio_enc_eof_read_flush);
     return 1;
 }
diff --git a/test/bio_memleak_test.c b/test/bio_memleak_test.c
index d9c744ff49cc5..c899b2941bfc3 100644
--- a/test/bio_memleak_test.c
+++ b/test/bio_memleak_test.c
@@ -25,7 +25,7 @@ static int test_bio_memleak(void)
     if (!TEST_ptr(bio))
         goto finish;
     bufmem.length = sizeof(str);
-    bufmem.data = (char *) str;
+    bufmem.data = (char *)str;
     bufmem.max = bufmem.length;
     BIO_set_mem_buf(bio, &bufmem, BIO_NOCLOSE);
     BIO_set_flags(bio, BIO_FLAGS_MEM_RDONLY);
@@ -35,7 +35,7 @@ static int test_bio_memleak(void)
         goto finish;
     ok = 1;
 
- finish:
+finish:
     BIO_free(bio);
     return ok;
 }
@@ -62,7 +62,7 @@ static int test_bio_get_mem(void)
         goto finish;
     ok = 1;
 
- finish:
+finish:
     BIO_free(bio);
     BUF_MEM_free(bufmem);
     return ok;
@@ -98,7 +98,7 @@ static int test_bio_new_mem_buf(void)
         goto finish;
     ok = 1;
 
- finish:
+finish:
     BIO_free(bio);
     return ok;
 }
@@ -139,7 +139,7 @@ static int test_bio_rdonly_mem_buf(void)
         goto finish;
     ok = 1;
 
- finish:
+finish:
     BIO_free(bio);
     BIO_free(bio2);
     return ok;
@@ -176,7 +176,7 @@ static int test_bio_rdwr_rdonly(void)
 
     ok = 1;
 
- finish:
+finish:
     BIO_free(bio);
     return ok;
 }
@@ -216,19 +216,19 @@ static int test_bio_nonclear_rst(void)
 
     ok = 1;
 
- finish:
+finish:
     BIO_free(bio);
     return ok;
 }
 
 static int error_callback_fired;
 static long BIO_error_callback(BIO *bio, int cmd, 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)
 {
     if ((cmd & (BIO_CB_READ | BIO_CB_RETURN)) != 0) {
         error_callback_fired = 1;
-        ret = 0;  /* fail for read operations to simulate error in input BIO */
+        ret = 0; /* fail for read operations to simulate error in input BIO */
     }
     return ret;
 }
@@ -246,7 +246,7 @@ static int test_bio_i2d_ASN1_mime(void)
         goto finish;
 
     bufmem.length = sizeof(str);
-    bufmem.data = (char *) str;
+    bufmem.data = (char *)str;
     bufmem.max = bufmem.length;
     BIO_set_mem_buf(bio, &bufmem, BIO_NOCLOSE);
     BIO_set_flags(bio, BIO_FLAGS_MEM_RDONLY);
@@ -261,9 +261,9 @@ static int test_bio_i2d_ASN1_mime(void)
 
     error_callback_fired = 0;
 
-    if (!TEST_false(i2d_ASN1_bio_stream(out, (ASN1_VALUE*) p7, bio,
-                                        SMIME_STREAM | SMIME_BINARY,
-                                        ASN1_ITEM_rptr(PKCS7))))
+    if (!TEST_false(i2d_ASN1_bio_stream(out, (ASN1_VALUE *)p7, bio,
+            SMIME_STREAM | SMIME_BINARY,
+            ASN1_ITEM_rptr(PKCS7))))
         goto finish;
 
     if (!TEST_int_eq(error_callback_fired, 1))
@@ -271,7 +271,7 @@ static int test_bio_i2d_ASN1_mime(void)
 
     ok = 1;
 
- finish:
+finish:
     BIO_free(bio);
     BIO_free(out);
     PKCS7_free(p7);
diff --git a/test/bio_meth_test.c b/test/bio_meth_test.c
index 3eeafe3a23c16..90aa5108e58e5 100644
--- a/test/bio_meth_test.c
+++ b/test/bio_meth_test.c
@@ -22,7 +22,7 @@ static int test_bio_meth(void)
 
     if (!TEST_ptr(meth1 = BIO_meth_new(id, "Method1"))
         || !TEST_ptr(meth2 = BIO_meth_new(BIO_TYPE_NONE, "Method2"))
-        || !TEST_ptr(meth3 = BIO_meth_new(BIO_TYPE_NONE|BIO_TYPE_FILTER, "Method3"))
+        || !TEST_ptr(meth3 = BIO_meth_new(BIO_TYPE_NONE | BIO_TYPE_FILTER, "Method3"))
         || !TEST_ptr(bio1 = BIO_new(meth1))
         || !TEST_ptr(bio2 = BIO_new(meth2))
         || !TEST_ptr(bio3 = BIO_new(meth3))
diff --git a/test/bio_prefix_text.c b/test/bio_prefix_text.c
index c16986fcad8bb..9fd76e3bf0ba8 100644
--- a/test/bio_prefix_text.c
+++ b/test/bio_prefix_text.c
@@ -118,7 +118,7 @@ static int setup_bio_chain(const char *progname)
         }
     }
     return chain != NULL;
- err:
+err:
     /* Free the chain we built up */
     BIO_free_all(next);
     OPENSSL_free(chain);
@@ -158,7 +158,6 @@ static int setup(void)
     OPENSSL_assert(bio_out != NULL);
     OPENSSL_assert(bio_err != NULL);
 
-
     while ((o = opt_next()) != OPT_EOF) {
         switch (o) {
         case OPT_AMOUNT:
@@ -166,18 +165,18 @@ static int setup(void)
             amount = strtoul(arg, &endptr, 10);
             if (endptr[0] != '\0') {
                 BIO_printf(bio_err,
-                           "%s: -n argument isn't a decimal number: %s",
-                           progname, arg);
+                    "%s: -n argument isn't a decimal number: %s",
+                    progname, arg);
                 return 0;
             }
             if (amount < 1) {
                 BIO_printf(bio_err, "%s: must set up at least one filter",
-                           progname);
+                    progname);
                 return 0;
             }
             if (!setup_bio_chain(progname)) {
                 BIO_printf(bio_err, "%s: failed setting up filter chain",
-                           progname);
+                    progname);
                 return 0;
             }
             break;
@@ -193,8 +192,8 @@ static int setup(void)
                 idx = strtoul(arg, &endptr, 10);
                 if (endptr[0] != ':') {
                     BIO_printf(bio_err,
-                               "%s: -i index isn't a decimal number: %s",
-                               progname, arg);
+                        "%s: -i index isn't a decimal number: %s",
+                        progname, arg);
                     return 0;
                 }
                 colon++;
@@ -204,18 +203,18 @@ static int setup(void)
             indent = strtoul(colon, &endptr, 10);
             if (endptr[0] != '\0') {
                 BIO_printf(bio_err,
-                           "%s: -i value isn't a decimal number: %s",
-                           progname, arg);
+                    "%s: -i value isn't a decimal number: %s",
+                    progname, arg);
                 return 0;
             }
             if (idx >= amount) {
                 BIO_printf(bio_err, "%s: index (%zu) not within range 0..%zu",
-                           progname, idx, amount - 1);
+                    progname, idx, amount - 1);
                 return 0;
             }
             if (BIO_set_indent(chain[idx], (long)indent) <= 0) {
                 BIO_printf(bio_err, "%s: failed setting indentation: %s",
-                           progname, arg);
+                    progname, arg);
                 return 0;
             }
             break;
@@ -231,8 +230,8 @@ static int setup(void)
                 idx = strtoul(arg, &endptr, 10);
                 if (endptr[0] != ':') {
                     BIO_printf(bio_err,
-                               "%s: -p index isn't a decimal number: %s",
-                               progname, arg);
+                        "%s: -p index isn't a decimal number: %s",
+                        progname, arg);
                     return 0;
                 }
                 colon++;
@@ -241,12 +240,12 @@ static int setup(void)
             }
             if (idx >= amount) {
                 BIO_printf(bio_err, "%s: index (%zu) not within range 0..%zu",
-                           progname, idx, amount - 1);
+                    progname, idx, amount - 1);
                 return 0;
             }
             if (BIO_set_prefix(chain[idx], colon) <= 0) {
                 BIO_printf(bio_err, "%s: failed setting prefix: %s",
-                           progname, arg);
+                    progname, arg);
                 return 0;
             }
             break;
diff --git a/test/bio_pw_callback_test.c b/test/bio_pw_callback_test.c
index e11368454a8c9..0fb79238f9116 100644
--- a/test/bio_pw_callback_test.c
+++ b/test/bio_pw_callback_test.c
@@ -63,7 +63,7 @@ const OPTIONS *test_get_options(void)
     static const OPTIONS test_options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
         { "keyfile", OPT_KEY_FILE, '<',
-          "The PEM file with the encrypted key to load" },
+            "The PEM file with the encrypted key to load" },
         { NULL }
     };
     return test_options;
@@ -152,7 +152,7 @@ static int write_callback(char *buf, int size, int rwflag, void *u)
 }
 
 static int re_encrypt_key(char **enc_data, int *enc_data_size,
-                          KEY_ENCODING key_encoding)
+    KEY_ENCODING key_encoding)
 {
     CALLBACK_DATA cb_data;
     int w_ret = 0;
@@ -171,11 +171,11 @@ static int re_encrypt_key(char **enc_data, int *enc_data_size,
     switch (key_encoding) {
     case KE_PEM:
         w_ret = PEM_write_bio_PrivateKey(bio, original_pkey, EVP_aes_256_cbc(),
-                                         NULL, 0, write_callback, &cb_data);
+            NULL, 0, write_callback, &cb_data);
         break;
     case KE_PKCS8:
         w_ret = i2d_PKCS8PrivateKey_bio(bio, original_pkey, EVP_aes_256_cbc(),
-                                        NULL, 0, write_callback, &cb_data);
+            NULL, 0, write_callback, &cb_data);
         break;
     }
     if (!TEST_int_ne(w_ret, 0))
@@ -197,8 +197,8 @@ static int re_encrypt_key(char **enc_data, int *enc_data_size,
 }
 
 static int decrypt_key(char *enc_data, int enc_data_size,
-                       KEY_ENCODING key_encoding,
-                       EXPECTED_RESULT expected_result)
+    KEY_ENCODING key_encoding,
+    EXPECTED_RESULT expected_result)
 {
     CALLBACK_DATA cb_data;
     EVP_PKEY *r_ret = NULL;
@@ -237,8 +237,8 @@ static int decrypt_key(char *enc_data, int enc_data_size,
 }
 
 static int full_cycle_test(KEY_ENCODING key_encoding, CALLBACK_TEST write_test,
-                           CALLBACK_TEST read_test,
-                           EXPECTED_RESULT expected_read_result)
+    CALLBACK_TEST read_test,
+    EXPECTED_RESULT expected_read_result)
 {
     char *enc_data = NULL;
     int enc_data_size = 0;
@@ -249,7 +249,7 @@ static int full_cycle_test(KEY_ENCODING key_encoding, CALLBACK_TEST write_test,
         goto err;
     callback_test = read_test;
     if (!decrypt_key(enc_data, enc_data_size, key_encoding,
-                     expected_read_result))
+            expected_read_result))
         goto err;
     ret = 1;
 err:
@@ -265,7 +265,7 @@ static int test_pem_negative(void)
 static int test_pem_zero_length(void)
 {
     return full_cycle_test(KE_PEM, CB_TEST_ZERO_LENGTH, CB_TEST_ZERO_LENGTH,
-                           ER_SUCCESS);
+        ER_SUCCESS);
 }
 
 static int test_pem_weak(void)
@@ -291,13 +291,13 @@ static int test_pem_a0a_a0b(void)
 static int test_pem_match_size(void)
 {
     return full_cycle_test(KE_PEM, CB_TEST_MATCH_SIZE, CB_TEST_MATCH_SIZE,
-                           ER_SUCCESS);
+        ER_SUCCESS);
 }
 
 static int test_pem_exceed_size(void)
 {
     return full_cycle_test(KE_PEM, CB_TEST_MATCH_SIZE, CB_TEST_EXCEED_SIZE,
-                           ER_FAILURE);
+        ER_FAILURE);
 }
 
 static int test_pkcs8_negative(void)
@@ -308,7 +308,7 @@ static int test_pkcs8_negative(void)
 static int test_pkcs8_zero_length(void)
 {
     return full_cycle_test(KE_PKCS8, CB_TEST_ZERO_LENGTH, CB_TEST_ZERO_LENGTH,
-                           ER_SUCCESS);
+        ER_SUCCESS);
 }
 
 static int test_pkcs8_weak(void)
@@ -319,7 +319,7 @@ static int test_pkcs8_weak(void)
 static int test_pkcs8_16zero(void)
 {
     return full_cycle_test(KE_PKCS8, CB_TEST_16ZERO, CB_TEST_16ZERO,
-                           ER_SUCCESS);
+        ER_SUCCESS);
 }
 
 static int test_pkcs8_a0a(void)
@@ -335,13 +335,13 @@ static int test_pkcs8_a0a_a0b(void)
 static int test_pkcs8_match_size(void)
 {
     return full_cycle_test(KE_PKCS8, CB_TEST_MATCH_SIZE, CB_TEST_MATCH_SIZE,
-                           ER_SUCCESS);
+        ER_SUCCESS);
 }
 
 static int test_pkcs8_exceed_size(void)
 {
     return full_cycle_test(KE_PKCS8, CB_TEST_MATCH_SIZE, CB_TEST_EXCEED_SIZE,
-                           ER_FAILURE);
+        ER_FAILURE);
 }
 
 static int callback_original_pw(char *buf, int size, int rwflag, void *u)
@@ -372,7 +372,7 @@ int setup_tests(void)
     if (!TEST_ptr(bio = BIO_new_file(key_file, "r")))
         return 0;
     if (!TEST_ptr(PEM_read_bio_PrivateKey(bio, &original_pkey,
-                                          callback_original_pw, NULL)))
+            callback_original_pw, NULL)))
         return 0;
     BIO_free(bio);
 
diff --git a/test/bio_readbuffer_test.c b/test/bio_readbuffer_test.c
index 58a03c216365a..18e63f2dc78d5 100644
--- a/test/bio_readbuffer_test.c
+++ b/test/bio_readbuffer_test.c
@@ -34,7 +34,8 @@ static int test_readbuffer_file_bio(int tstid)
     /* Open a file BIO and read all the data */
     if (!TEST_ptr(in = BIO_new_file(filename, "r"))
         || !TEST_int_eq(BIO_read_ex(in, expected, sizeof(expected),
-                                    &readbytes), 1)
+                            &readbytes),
+            1)
         || !TEST_int_lt(readbytes, sizeof(expected)))
         goto err;
     BIO_free(in);
diff --git a/test/bio_tfo_test.c b/test/bio_tfo_test.c
index 43057e0133302..33cf635b67580 100644
--- a/test/bio_tfo_test.c
+++ b/test/bio_tfo_test.c
@@ -15,15 +15,15 @@
 
 /* If OS support is added in crypto/bio/bio_tfo.h, add it here */
 #if defined(OPENSSL_SYS_LINUX)
-# define GOOD_OS 1
+#define GOOD_OS 1
 #elif defined(__FreeBSD__)
-# define GOOD_OS 1
+#define GOOD_OS 1
 #elif defined(OPENSSL_SYS_MACOSX)
-# define GOOD_OS 1
+#define GOOD_OS 1
 #else
-# ifdef GOOD_OS
-#  undef GOOD_OS
-# endif
+#ifdef GOOD_OS
+#undef GOOD_OS
+#endif
 #endif
 
 #if !defined(OPENSSL_NO_TFO) && defined(GOOD_OS)
@@ -46,8 +46,8 @@
  * The 4th time is client-TFO only, the 5th time is server-TFO only.
  */
 
-#  define SOCKET_DATA "FooBar"
-#  define SOCKET_DATA_LEN sizeof(SOCKET_DATA)
+#define SOCKET_DATA "FooBar"
+#define SOCKET_DATA_LEN sizeof(SOCKET_DATA)
 
 static int test_bio_tfo(int idx)
 {
@@ -81,10 +81,10 @@ static int test_bio_tfo(int idx)
 
     /* ACCEPT SOCKET */
     if (!TEST_ptr(abio = BIO_new_accept("localhost:0"))
-            || !TEST_true(BIO_set_nbio_accept(abio, 1))
-            || !TEST_true(BIO_set_tfo_accept(abio, server_tfo))
-            || !TEST_int_gt(BIO_do_accept(abio), 0)
-            || !TEST_ptr(port = BIO_get_accept_port(abio))) {
+        || !TEST_true(BIO_set_nbio_accept(abio, 1))
+        || !TEST_true(BIO_set_tfo_accept(abio, server_tfo))
+        || !TEST_int_gt(BIO_do_accept(abio), 0)
+        || !TEST_ptr(port = BIO_get_accept_port(abio))) {
         sockerr = get_last_socket_error();
         goto err;
     }
@@ -93,9 +93,9 @@ static int test_bio_tfo(int idx)
 
     /* CLIENT SOCKET */
     if (!TEST_ptr(cbio = BIO_new_connect("localhost"))
-            || !TEST_long_gt(BIO_set_conn_port(cbio, port), 0)
-            || !TEST_long_gt(BIO_set_nbio(cbio, 1), 0)
-            || !TEST_long_gt(BIO_set_tfo(cbio, client_tfo), 0)) {
+        || !TEST_long_gt(BIO_set_conn_port(cbio, port), 0)
+        || !TEST_long_gt(BIO_set_nbio(cbio, 1), 0)
+        || !TEST_long_gt(BIO_set_tfo(cbio, client_tfo), 0)) {
         sockerr = get_last_socket_error();
         goto err;
     }
@@ -173,9 +173,9 @@ static int test_bio_tfo(int idx)
     }
     BIO_printf(bio_err, "Success: Server accepted socket after write\n");
     if (!TEST_ptr(sbio = BIO_pop(abio))
-            || !TEST_true(BIO_read_ex(sbio, read_buffer, sizeof(read_buffer), &bytes))
-            || !TEST_size_t_eq(bytes, SOCKET_DATA_LEN)
-            || !TEST_strn_eq(read_buffer, SOCKET_DATA, SOCKET_DATA_LEN)) {
+        || !TEST_true(BIO_read_ex(sbio, read_buffer, sizeof(read_buffer), &bytes))
+        || !TEST_size_t_eq(bytes, SOCKET_DATA_LEN)
+        || !TEST_strn_eq(read_buffer, SOCKET_DATA, SOCKET_DATA_LEN)) {
         sockerr = get_last_socket_error();
         goto err;
     }
@@ -242,31 +242,31 @@ static int test_fd_tfo(int idx)
         goto err;
 
     switch (ai->ai_family) {
-        case AF_INET:
-            port = ((struct sockaddr_in *)ai->ai_addr)->sin_port;
-            addr = &((struct sockaddr_in *)ai->ai_addr)->sin_addr;
-            addrlen = sizeof(((struct sockaddr_in *)ai->ai_addr)->sin_addr);
-            BIO_printf(bio_err, "Using IPv4\n");
-            break;
-        case AF_INET6:
-            port = ((struct sockaddr_in6 *)ai->ai_addr)->sin6_port;
-            addr = &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr;
-            addrlen = sizeof(((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr);
-            BIO_printf(bio_err, "Using IPv6\n");
-            break;
-        default:
-            BIO_printf(bio_err, "Unknown address family %d\n", ai->ai_family);
-            goto err;
+    case AF_INET:
+        port = ((struct sockaddr_in *)ai->ai_addr)->sin_port;
+        addr = &((struct sockaddr_in *)ai->ai_addr)->sin_addr;
+        addrlen = sizeof(((struct sockaddr_in *)ai->ai_addr)->sin_addr);
+        BIO_printf(bio_err, "Using IPv4\n");
+        break;
+    case AF_INET6:
+        port = ((struct sockaddr_in6 *)ai->ai_addr)->sin6_port;
+        addr = &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr;
+        addrlen = sizeof(((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr);
+        BIO_printf(bio_err, "Using IPv6\n");
+        break;
+    default:
+        BIO_printf(bio_err, "Unknown address family %d\n", ai->ai_family);
+        goto err;
     }
 
     if (!TEST_ptr(baddr = BIO_ADDR_new())
-            || !TEST_true(BIO_ADDR_rawmake(baddr, ai->ai_family, addr, addrlen, port)))
+        || !TEST_true(BIO_ADDR_rawmake(baddr, ai->ai_family, addr, addrlen, port)))
         goto err;
 
     /* ACCEPT SOCKET */
 
     if (!TEST_int_ge(afd = BIO_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol, 0), 0)
-            || !TEST_true(BIO_listen(afd, baddr, server_flags)))
+        || !TEST_true(BIO_listen(afd, baddr, server_flags)))
         goto err;
 
     /* UPDATE ADDRESS WITH PORT */
@@ -275,21 +275,21 @@ static int test_fd_tfo(int idx)
         goto err;
 
     switch (sstorage.ss_family) {
-        case AF_INET:
-            port = ((struct sockaddr_in *)&sstorage)->sin_port;
-            addr = &((struct sockaddr_in *)&sstorage)->sin_addr;
-            addrlen = sizeof(((struct sockaddr_in *)&sstorage)->sin_addr);
-            break;
-        case AF_INET6:
-            port = ((struct sockaddr_in6 *)&sstorage)->sin6_port;
-            addr = &((struct sockaddr_in6 *)&sstorage)->sin6_addr;
-            addrlen = sizeof(((struct sockaddr_in6 *)&sstorage)->sin6_addr);
-            break;
-        default:
-            goto err;
+    case AF_INET:
+        port = ((struct sockaddr_in *)&sstorage)->sin_port;
+        addr = &((struct sockaddr_in *)&sstorage)->sin_addr;
+        addrlen = sizeof(((struct sockaddr_in *)&sstorage)->sin_addr);
+        break;
+    case AF_INET6:
+        port = ((struct sockaddr_in6 *)&sstorage)->sin6_port;
+        addr = &((struct sockaddr_in6 *)&sstorage)->sin6_addr;
+        addrlen = sizeof(((struct sockaddr_in6 *)&sstorage)->sin6_addr);
+        break;
+    default:
+        goto err;
     }
 
-    if(!TEST_true(BIO_ADDR_rawmake(baddr, sstorage.ss_family, addr, addrlen, port)))
+    if (!TEST_true(BIO_ADDR_rawmake(baddr, sstorage.ss_family, addr, addrlen, port)))
         goto err;
 
     /* CLIENT SOCKET */
@@ -356,7 +356,8 @@ static int test_fd_tfo(int idx)
     /* SEND DATA: this should establish the actual TFO connection */
 #ifdef OSSL_TFO_SENDTO
     if (!TEST_int_ge(sendto(cfd, SOCKET_DATA, SOCKET_DATA_LEN, OSSL_TFO_SENDTO,
-                            (struct sockaddr *)&sstorage, slen), 0)) {
+                         (struct sockaddr *)&sstorage, slen),
+            0)) {
         sockerr = get_last_socket_error();
         goto err;
     }
@@ -384,7 +385,7 @@ static int test_fd_tfo(int idx)
     BIO_printf(bio_err, "Success: Server accepted socket after write\n");
     bytes_read = readsocket(sfd, read_buffer, sizeof(read_buffer));
     if (!TEST_int_eq(bytes_read, SOCKET_DATA_LEN)
-            || !TEST_strn_eq(read_buffer, SOCKET_DATA, SOCKET_DATA_LEN)) {
+        || !TEST_strn_eq(read_buffer, SOCKET_DATA, SOCKET_DATA_LEN)) {
         sockerr = get_last_socket_error();
         goto err;
     }
diff --git a/test/bioprinttest.c b/test/bioprinttest.c
index 5ac5025c40e83..54c4b7df16a5b 100644
--- a/test/bioprinttest.c
+++ b/test/bioprinttest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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
@@ -19,90 +19,97 @@
 
 static int justprint = 0;
 
-static char *fpexpected[][10][5] = {
+static char *fpexpected[][11][5] = {
     {
-    /*  00 */ { "0.0000e+00", "0.0000", "0", "0.0000E+00", "0" },
-    /*  01 */ { "6.7000e-01", "0.6700", "0.67", "6.7000E-01", "0.67" },
-    /*  02 */ { "6.6667e-01", "0.6667", "0.6667", "6.6667E-01", "0.6667" },
-    /*  03 */ { "6.6667e-04", "0.0007", "0.0006667", "6.6667E-04", "0.0006667" },
-    /*  04 */ { "6.6667e-05", "0.0001", "6.667e-05", "6.6667E-05", "6.667E-05" },
-    /*  05 */ { "6.6667e+00", "6.6667", "6.667", "6.6667E+00", "6.667" },
-    /*  06 */ { "6.6667e+01", "66.6667", "66.67", "6.6667E+01", "66.67" },
-    /*  07 */ { "6.6667e+02", "666.6667", "666.7", "6.6667E+02", "666.7" },
-    /*  08 */ { "6.6667e+03", "6666.6667", "6667", "6.6667E+03", "6667" },
-    /*  09 */ { "6.6667e+04", "66666.6667", "6.667e+04", "6.6667E+04", "6.667E+04" },
+        /*  0.00 */ { "0.0000e+00", "0.0000", "0", "0.0000E+00", "0" },
+        /*  0.01 */ { "6.7000e-01", "0.6700", "0.67", "6.7000E-01", "0.67" },
+        /*  0.02 */ { "6.6667e-01", "0.6667", "0.6667", "6.6667E-01", "0.6667" },
+        /*  0.03 */ { "6.6667e-04", "0.0007", "0.0006667", "6.6667E-04", "0.0006667" },
+        /*  0.04 */ { "6.6667e-05", "0.0001", "6.667e-05", "6.6667E-05", "6.667E-05" },
+        /*  0.05 */ { "6.6667e+00", "6.6667", "6.667", "6.6667E+00", "6.667" },
+        /*  0.06 */ { "6.6667e+01", "66.6667", "66.67", "6.6667E+01", "66.67" },
+        /*  0.07 */ { "6.6667e+02", "666.6667", "666.7", "6.6667E+02", "666.7" },
+        /*  0.08 */ { "6.6667e+03", "6666.6667", "6667", "6.6667E+03", "6667" },
+        /*  0.09 */ { "6.6667e+04", "66666.6667", "6.667e+04", "6.6667E+04", "6.667E+04" },
+        /*  0.10 */ { "-6.6667e+04", "-66666.6667", "-6.667e+04", "-6.6667E+04", "-6.667E+04" },
     },
     {
-    /*  10 */ { "0.00000e+00", "0.00000", "0", "0.00000E+00", "0" },
-    /*  11 */ { "6.70000e-01", "0.67000", "0.67", "6.70000E-01", "0.67" },
-    /*  12 */ { "6.66667e-01", "0.66667", "0.66667", "6.66667E-01", "0.66667" },
-    /*  13 */ { "6.66667e-04", "0.00067", "0.00066667", "6.66667E-04", "0.00066667" },
-    /*  14 */ { "6.66667e-05", "0.00007", "6.6667e-05", "6.66667E-05", "6.6667E-05" },
-    /*  15 */ { "6.66667e+00", "6.66667", "6.6667", "6.66667E+00", "6.6667" },
-    /*  16 */ { "6.66667e+01", "66.66667", "66.667", "6.66667E+01", "66.667" },
-    /*  17 */ { "6.66667e+02", "666.66667", "666.67", "6.66667E+02", "666.67" },
-    /*  18 */ { "6.66667e+03", "6666.66667", "6666.7", "6.66667E+03", "6666.7" },
-    /*  19 */ { "6.66667e+04", "66666.66667", "66667", "6.66667E+04", "66667" },
+        /*  1.00 */ { "0.00000e+00", "0.00000", "0", "0.00000E+00", "0" },
+        /*  1.01 */ { "6.70000e-01", "0.67000", "0.67", "6.70000E-01", "0.67" },
+        /*  1.02 */ { "6.66667e-01", "0.66667", "0.66667", "6.66667E-01", "0.66667" },
+        /*  1.03 */ { "6.66667e-04", "0.00067", "0.00066667", "6.66667E-04", "0.00066667" },
+        /*  1.04 */ { "6.66667e-05", "0.00007", "6.6667e-05", "6.66667E-05", "6.6667E-05" },
+        /*  1.05 */ { "6.66667e+00", "6.66667", "6.6667", "6.66667E+00", "6.6667" },
+        /*  1.06 */ { "6.66667e+01", "66.66667", "66.667", "6.66667E+01", "66.667" },
+        /*  1.07 */ { "6.66667e+02", "666.66667", "666.67", "6.66667E+02", "666.67" },
+        /*  1.08 */ { "6.66667e+03", "6666.66667", "6666.7", "6.66667E+03", "6666.7" },
+        /*  1.09 */ { "6.66667e+04", "66666.66667", "66667", "6.66667E+04", "66667" },
+        /*  1.10 */ { "-6.66667e+04", "-66666.66667", "-66667", "-6.66667E+04", "-66667" },
     },
     {
-    /*  20 */ { "  0.0000e+00", "      0.0000", "           0", "  0.0000E+00", "           0" },
-    /*  21 */ { "  6.7000e-01", "      0.6700", "        0.67", "  6.7000E-01", "        0.67" },
-    /*  22 */ { "  6.6667e-01", "      0.6667", "      0.6667", "  6.6667E-01", "      0.6667" },
-    /*  23 */ { "  6.6667e-04", "      0.0007", "   0.0006667", "  6.6667E-04", "   0.0006667" },
-    /*  24 */ { "  6.6667e-05", "      0.0001", "   6.667e-05", "  6.6667E-05", "   6.667E-05" },
-    /*  25 */ { "  6.6667e+00", "      6.6667", "       6.667", "  6.6667E+00", "       6.667" },
-    /*  26 */ { "  6.6667e+01", "     66.6667", "       66.67", "  6.6667E+01", "       66.67" },
-    /*  27 */ { "  6.6667e+02", "    666.6667", "       666.7", "  6.6667E+02", "       666.7" },
-    /*  28 */ { "  6.6667e+03", "   6666.6667", "        6667", "  6.6667E+03", "        6667" },
-    /*  29 */ { "  6.6667e+04", "  66666.6667", "   6.667e+04", "  6.6667E+04", "   6.667E+04" },
+        /*  2.00 */ { "  0.0000e+00", "      0.0000", "           0", "  0.0000E+00", "           0" },
+        /*  2.01 */ { "  6.7000e-01", "      0.6700", "        0.67", "  6.7000E-01", "        0.67" },
+        /*  2.02 */ { "  6.6667e-01", "      0.6667", "      0.6667", "  6.6667E-01", "      0.6667" },
+        /*  2.03 */ { "  6.6667e-04", "      0.0007", "   0.0006667", "  6.6667E-04", "   0.0006667" },
+        /*  2.04 */ { "  6.6667e-05", "      0.0001", "   6.667e-05", "  6.6667E-05", "   6.667E-05" },
+        /*  2.05 */ { "  6.6667e+00", "      6.6667", "       6.667", "  6.6667E+00", "       6.667" },
+        /*  2.06 */ { "  6.6667e+01", "     66.6667", "       66.67", "  6.6667E+01", "       66.67" },
+        /*  2.07 */ { "  6.6667e+02", "    666.6667", "       666.7", "  6.6667E+02", "       666.7" },
+        /*  2.08 */ { "  6.6667e+03", "   6666.6667", "        6667", "  6.6667E+03", "        6667" },
+        /*  2.09 */ { "  6.6667e+04", "  66666.6667", "   6.667e+04", "  6.6667E+04", "   6.667E+04" },
+        /*  2.10 */ { " -6.6667e+04", " -66666.6667", "  -6.667e+04", " -6.6667E+04", "  -6.667E+04" },
     },
     {
-    /*  30 */ { " 0.00000e+00", "     0.00000", "           0", " 0.00000E+00", "           0" },
-    /*  31 */ { " 6.70000e-01", "     0.67000", "        0.67", " 6.70000E-01", "        0.67" },
-    /*  32 */ { " 6.66667e-01", "     0.66667", "     0.66667", " 6.66667E-01", "     0.66667" },
-    /*  33 */ { " 6.66667e-04", "     0.00067", "  0.00066667", " 6.66667E-04", "  0.00066667" },
-    /*  34 */ { " 6.66667e-05", "     0.00007", "  6.6667e-05", " 6.66667E-05", "  6.6667E-05" },
-    /*  35 */ { " 6.66667e+00", "     6.66667", "      6.6667", " 6.66667E+00", "      6.6667" },
-    /*  36 */ { " 6.66667e+01", "    66.66667", "      66.667", " 6.66667E+01", "      66.667" },
-    /*  37 */ { " 6.66667e+02", "   666.66667", "      666.67", " 6.66667E+02", "      666.67" },
-    /*  38 */ { " 6.66667e+03", "  6666.66667", "      6666.7", " 6.66667E+03", "      6666.7" },
-    /*  39 */ { " 6.66667e+04", " 66666.66667", "       66667", " 6.66667E+04", "       66667" },
+        /*  3.00 */ { " 0.00000e+00", "     0.00000", "           0", " 0.00000E+00", "           0" },
+        /*  3.01 */ { " 6.70000e-01", "     0.67000", "        0.67", " 6.70000E-01", "        0.67" },
+        /*  3.02 */ { " 6.66667e-01", "     0.66667", "     0.66667", " 6.66667E-01", "     0.66667" },
+        /*  3.03 */ { " 6.66667e-04", "     0.00067", "  0.00066667", " 6.66667E-04", "  0.00066667" },
+        /*  3.04 */ { " 6.66667e-05", "     0.00007", "  6.6667e-05", " 6.66667E-05", "  6.6667E-05" },
+        /*  3.05 */ { " 6.66667e+00", "     6.66667", "      6.6667", " 6.66667E+00", "      6.6667" },
+        /*  3.06 */ { " 6.66667e+01", "    66.66667", "      66.667", " 6.66667E+01", "      66.667" },
+        /*  3.07 */ { " 6.66667e+02", "   666.66667", "      666.67", " 6.66667E+02", "      666.67" },
+        /*  3.08 */ { " 6.66667e+03", "  6666.66667", "      6666.7", " 6.66667E+03", "      6666.7" },
+        /*  3.09 */ { " 6.66667e+04", " 66666.66667", "       66667", " 6.66667E+04", "       66667" },
+        /*  3.10 */ { "-6.66667e+04", "-66666.66667", "      -66667", "-6.66667E+04", "      -66667" },
     },
     {
-    /*  40 */ { "0e+00", "0", "0", "0E+00", "0" },
-    /*  41 */ { "7e-01", "1", "0.7", "7E-01", "0.7" },
-    /*  42 */ { "7e-01", "1", "0.7", "7E-01", "0.7" },
-    /*  43 */ { "7e-04", "0", "0.0007", "7E-04", "0.0007" },
-    /*  44 */ { "7e-05", "0", "7e-05", "7E-05", "7E-05" },
-    /*  45 */ { "7e+00", "7", "7", "7E+00", "7" },
-    /*  46 */ { "7e+01", "67", "7e+01", "7E+01", "7E+01" },
-    /*  47 */ { "7e+02", "667", "7e+02", "7E+02", "7E+02" },
-    /*  48 */ { "7e+03", "6667", "7e+03", "7E+03", "7E+03" },
-    /*  49 */ { "7e+04", "66667", "7e+04", "7E+04", "7E+04" },
+        /*  4.00 */ { "0e+00", "0", "0", "0E+00", "0" },
+        /*  4.01 */ { "7e-01", "1", "0.7", "7E-01", "0.7" },
+        /*  4.02 */ { "7e-01", "1", "0.7", "7E-01", "0.7" },
+        /*  4.03 */ { "7e-04", "0", "0.0007", "7E-04", "0.0007" },
+        /*  4.04 */ { "7e-05", "0", "7e-05", "7E-05", "7E-05" },
+        /*  4.05 */ { "7e+00", "7", "7", "7E+00", "7" },
+        /*  4.06 */ { "7e+01", "67", "7e+01", "7E+01", "7E+01" },
+        /*  4.07 */ { "7e+02", "667", "7e+02", "7E+02", "7E+02" },
+        /*  4.08 */ { "7e+03", "6667", "7e+03", "7E+03", "7E+03" },
+        /*  4.09 */ { "7e+04", "66667", "7e+04", "7E+04", "7E+04" },
+        /*  4.10 */ { "-7e+04", "-66667", "-7e+04", "-7E+04", "-7E+04" },
     },
     {
-    /*  50 */ { "0.000000e+00", "0.000000", "0", "0.000000E+00", "0" },
-    /*  51 */ { "6.700000e-01", "0.670000", "0.67", "6.700000E-01", "0.67" },
-    /*  52 */ { "6.666667e-01", "0.666667", "0.666667", "6.666667E-01", "0.666667" },
-    /*  53 */ { "6.666667e-04", "0.000667", "0.000666667", "6.666667E-04", "0.000666667" },
-    /*  54 */ { "6.666667e-05", "0.000067", "6.66667e-05", "6.666667E-05", "6.66667E-05" },
-    /*  55 */ { "6.666667e+00", "6.666667", "6.66667", "6.666667E+00", "6.66667" },
-    /*  56 */ { "6.666667e+01", "66.666667", "66.6667", "6.666667E+01", "66.6667" },
-    /*  57 */ { "6.666667e+02", "666.666667", "666.667", "6.666667E+02", "666.667" },
-    /*  58 */ { "6.666667e+03", "6666.666667", "6666.67", "6.666667E+03", "6666.67" },
-    /*  59 */ { "6.666667e+04", "66666.666667", "66666.7", "6.666667E+04", "66666.7" },
+        /*  5.00 */ { "0.000000e+00", "0.000000", "0", "0.000000E+00", "0" },
+        /*  5.01 */ { "6.700000e-01", "0.670000", "0.67", "6.700000E-01", "0.67" },
+        /*  5.02 */ { "6.666667e-01", "0.666667", "0.666667", "6.666667E-01", "0.666667" },
+        /*  5.03 */ { "6.666667e-04", "0.000667", "0.000666667", "6.666667E-04", "0.000666667" },
+        /*  5.04 */ { "6.666667e-05", "0.000067", "6.66667e-05", "6.666667E-05", "6.66667E-05" },
+        /*  5.05 */ { "6.666667e+00", "6.666667", "6.66667", "6.666667E+00", "6.66667" },
+        /*  5.06 */ { "6.666667e+01", "66.666667", "66.6667", "6.666667E+01", "66.6667" },
+        /*  5.07 */ { "6.666667e+02", "666.666667", "666.667", "6.666667E+02", "666.667" },
+        /*  5.08 */ { "6.666667e+03", "6666.666667", "6666.67", "6.666667E+03", "6666.67" },
+        /*  5.09 */ { "6.666667e+04", "66666.666667", "66666.7", "6.666667E+04", "66666.7" },
+        /*  5.10 */ { "-6.666667e+04", "-66666.666667", "-66666.7", "-6.666667E+04", "-66666.7" },
     },
     {
-    /*  60 */ { "0.0000e+00", "000.0000", "00000000", "0.0000E+00", "00000000" },
-    /*  61 */ { "6.7000e-01", "000.6700", "00000.67", "6.7000E-01", "00000.67" },
-    /*  62 */ { "6.6667e-01", "000.6667", "000.6667", "6.6667E-01", "000.6667" },
-    /*  63 */ { "6.6667e-04", "000.0007", "0.0006667", "6.6667E-04", "0.0006667" },
-    /*  64 */ { "6.6667e-05", "000.0001", "6.667e-05", "6.6667E-05", "6.667E-05" },
-    /*  65 */ { "6.6667e+00", "006.6667", "0006.667", "6.6667E+00", "0006.667" },
-    /*  66 */ { "6.6667e+01", "066.6667", "00066.67", "6.6667E+01", "00066.67" },
-    /*  67 */ { "6.6667e+02", "666.6667", "000666.7", "6.6667E+02", "000666.7" },
-    /*  68 */ { "6.6667e+03", "6666.6667", "00006667", "6.6667E+03", "00006667" },
-    /*  69 */ { "6.6667e+04", "66666.6667", "6.667e+04", "6.6667E+04", "6.667E+04" },
+        /*  6.00 */ { "0.0000e+00", "000.0000", "00000000", "0.0000E+00", "00000000" },
+        /*  6.01 */ { "6.7000e-01", "000.6700", "00000.67", "6.7000E-01", "00000.67" },
+        /*  6.02 */ { "6.6667e-01", "000.6667", "000.6667", "6.6667E-01", "000.6667" },
+        /*  6.03 */ { "6.6667e-04", "000.0007", "0.0006667", "6.6667E-04", "0.0006667" },
+        /*  6.04 */ { "6.6667e-05", "000.0001", "6.667e-05", "6.6667E-05", "6.667E-05" },
+        /*  6.05 */ { "6.6667e+00", "006.6667", "0006.667", "6.6667E+00", "0006.667" },
+        /*  6.06 */ { "6.6667e+01", "066.6667", "00066.67", "6.6667E+01", "00066.67" },
+        /*  6.07 */ { "6.6667e+02", "666.6667", "000666.7", "6.6667E+02", "000666.7" },
+        /*  6.08 */ { "6.6667e+03", "6666.6667", "00006667", "6.6667E+03", "00006667" },
+        /*  6.09 */ { "6.6667e+04", "66666.6667", "6.667e+04", "6.6667E+04", "6.667E+04" },
+        /*  6.10 */ { "-6.6667e+04", "-66666.6667", "-6.667e+04", "-6.6667E+04", "-6.667E+04" },
     },
 };
 
@@ -113,16 +120,14 @@ typedef struct z_data_st {
 } z_data;
 
 static z_data zu_data[] = {
-    { SIZE_MAX, "%zu", (sizeof(size_t) == 4 ? "4294967295"
-                        : sizeof(size_t) == 8 ? "18446744073709551615"
-                        : "") },
+    { SIZE_MAX, "%zu", (sizeof(size_t) == 4 ? "4294967295" : sizeof(size_t) == 8 ? "18446744073709551615"
+                                                                                 : "") },
     /*
      * in 2-complement, the unsigned number divided by two plus one becomes the
      * smallest possible negative signed number of the corresponding type
      */
-    { SIZE_MAX / 2 + 1, "%zi", (sizeof(size_t) == 4 ? "-2147483648"
-                                : sizeof(size_t) == 8 ? "-9223372036854775808"
-                                : "") },
+    { SIZE_MAX / 2 + 1, "%zi", (sizeof(size_t) == 4 ? "-2147483648" : sizeof(size_t) == 8 ? "-9223372036854775808"
+                                                                                          : "") },
     { 0, "%zu", "0" },
     { 0, "%zi", "0" },
 };
@@ -166,7 +171,6 @@ static int test_j(int i)
     return 1;
 }
 
-
 /* Precision and width. */
 typedef struct pw_st {
     int p;
@@ -196,19 +200,19 @@ static int dofptest(int test, int sub, double val, const char *width, int prec)
 
         if (prec >= 0)
             BIO_snprintf(format, sizeof(format), "%%%s.%d%s", width, prec,
-                         fspec);
+                fspec);
         else
             BIO_snprintf(format, sizeof(format), "%%%s%s", width, fspec);
         BIO_snprintf(result, sizeof(result), format, val);
 
         if (justprint) {
             if (i == 0)
-                printf("    /*  %d%d */ { \"%s\"", test, sub, result);
+                printf("    /*  %d.%02d */ { \"%s\"", test, sub, result);
             else
                 printf(", \"%s\"", result);
         } else if (!TEST_str_eq(fpexpected[test][sub][i], result)) {
             TEST_info("test %d format=|%s| exp=|%s|, ret=|%s|",
-                    test, format, fpexpected[test][sub][i], result);
+                test, format, fpexpected[test][sub][i], result);
             ret = 0;
         }
     }
@@ -234,7 +238,8 @@ static int test_fp(int i)
         && TEST_true(dofptest(i, t++, 66.0 + frac, pwp->w, pwp->p))
         && TEST_true(dofptest(i, t++, 666.0 + frac, pwp->w, pwp->p))
         && TEST_true(dofptest(i, t++, 6666.0 + frac, pwp->w, pwp->p))
-        && TEST_true(dofptest(i, t++, 66666.0 + frac, pwp->w, pwp->p));
+        && TEST_true(dofptest(i, t++, 66666.0 + frac, pwp->w, pwp->p))
+        && TEST_true(dofptest(i, t++, -66666.0 - frac, pwp->w, pwp->p));
     if (justprint)
         printf("    },\n");
     return r;
@@ -246,7 +251,8 @@ static int test_big(void)
 
     /* Test excessively big number. Should fail */
     if (!TEST_int_eq(BIO_snprintf(buf, sizeof(buf),
-                                  "%f\n", 2 * (double)ULONG_MAX), -1))
+                         "%f\n", 2 * (double)ULONG_MAX),
+            -1))
         return 0;
 
     return 1;
@@ -358,4 +364,3 @@ int test_flush_taperr(void)
 {
     return fflush(stderr);
 }
-
diff --git a/test/bn_internal_test.c b/test/bn_internal_test.c
index 7ef398a8b3edb..43960937a605e 100644
--- a/test/bn_internal_test.c
+++ b/test/bn_internal_test.c
@@ -31,12 +31,12 @@ static int test_is_prime_enhanced(void)
     BIGNUM *bn = NULL;
 
     ret = TEST_ptr(bn = BN_new())
-          /* test passing a prime returns the correct status */
-          && TEST_true(BN_set_word(bn, 11))
-          /* return extra parameters related to composite */
-          && TEST_true(ossl_bn_miller_rabin_is_prime(bn, 10, ctx, NULL, 1,
-                                                     &status))
-          && TEST_int_eq(status, BN_PRIMETEST_PROBABLY_PRIME);
+        /* test passing a prime returns the correct status */
+        && TEST_true(BN_set_word(bn, 11))
+        /* return extra parameters related to composite */
+        && TEST_true(ossl_bn_miller_rabin_is_prime(bn, 10, ctx, NULL, 1,
+            &status))
+        && TEST_int_eq(status, BN_PRIMETEST_PROBABLY_PRIME);
     BN_free(bn);
     return ret;
 }
@@ -52,11 +52,11 @@ static int test_is_composite_enhanced(int id)
     BIGNUM *bn = NULL;
 
     ret = TEST_ptr(bn = BN_new())
-          /* negative tests for different composite numbers */
-          && TEST_true(BN_set_word(bn, composites[id]))
-          && TEST_true(ossl_bn_miller_rabin_is_prime(bn, 10, ctx, NULL, 1,
-                                                     &status))
-          && TEST_int_ne(status, BN_PRIMETEST_PROBABLY_PRIME);
+        /* negative tests for different composite numbers */
+        && TEST_true(BN_set_word(bn, composites[id]))
+        && TEST_true(ossl_bn_miller_rabin_is_prime(bn, 10, ctx, NULL, 1,
+            &status))
+        && TEST_int_ne(status, BN_PRIMETEST_PROBABLY_PRIME);
 
     BN_free(bn);
     return ret;
@@ -102,4 +102,3 @@ void cleanup_tests(void)
 {
     BN_CTX_free(ctx);
 }
-
diff --git a/test/bn_rand_range.h b/test/bn_rand_range.h
index 2a63ef721966e..20f6b4bd229a6 100644
--- a/test/bn_rand_range.h
+++ b/test/bn_rand_range.h
@@ -15,44 +15,43 @@ static const struct {
     unsigned int iterations;
     double critical;
 } rand_range_cases[] = {
-    {     2,     200,     3.841459 },
-    {     3,     300,     5.991465 },
-    {     4,     400,     7.814728 },
-    {     5,     500,     9.487729 },
-    {     6,     600,    11.070498 },
-    {     7,     700,    12.591587 },
-    {     8,     800,    14.067140 },
-    {     9,     900,    15.507313 },
-    {    10,    1000,    16.918978 },
-    {    11,    1100,    18.307038 },
-    {    12,    1200,    19.675138 },
-    {    13,    1300,    21.026070 },
-    {    14,    1400,    22.362032 },
-    {    15,    1500,    23.684791 },
-    {    16,    1600,    24.995790 },
-    {    17,    1700,    26.296228 },
-    {    18,    1800,    27.587112 },
-    {    19,    1900,    28.869299 },
-    {    20,    2000,    30.143527 },
-    {    30,    3000,    42.556968 },
-    {    40,    4000,    54.572228 },
-    {    50,    5000,    66.338649 },
-    {    60,    6000,    77.930524 },
-    {    70,    7000,    89.391208 },
-    {    80,    8000,   100.748619 },
-    {    90,    9000,   112.021986 },
-    {   100,   10000,   123.225221 },
-    {  1000,   10000,  1073.642651 },
-    {  2000,   20000,  2104.128222 },
-    {  3000,   30000,  3127.515432 },
-    {  4000,   40000,  4147.230012 },
-    {  5000,   50000,  5164.598069 },
-    {  6000,   60000,  6180.299514 },
-    {  7000,   70000,  7194.738181 },
-    {  8000,   80000,  8208.177159 },
-    {  9000,   90000,  9220.799176 },
-    { 10000,  100000, 10232.737266 },
+    { 2, 200, 3.841459 },
+    { 3, 300, 5.991465 },
+    { 4, 400, 7.814728 },
+    { 5, 500, 9.487729 },
+    { 6, 600, 11.070498 },
+    { 7, 700, 12.591587 },
+    { 8, 800, 14.067140 },
+    { 9, 900, 15.507313 },
+    { 10, 1000, 16.918978 },
+    { 11, 1100, 18.307038 },
+    { 12, 1200, 19.675138 },
+    { 13, 1300, 21.026070 },
+    { 14, 1400, 22.362032 },
+    { 15, 1500, 23.684791 },
+    { 16, 1600, 24.995790 },
+    { 17, 1700, 26.296228 },
+    { 18, 1800, 27.587112 },
+    { 19, 1900, 28.869299 },
+    { 20, 2000, 30.143527 },
+    { 30, 3000, 42.556968 },
+    { 40, 4000, 54.572228 },
+    { 50, 5000, 66.338649 },
+    { 60, 6000, 77.930524 },
+    { 70, 7000, 89.391208 },
+    { 80, 8000, 100.748619 },
+    { 90, 9000, 112.021986 },
+    { 100, 10000, 123.225221 },
+    { 1000, 10000, 1073.642651 },
+    { 2000, 20000, 2104.128222 },
+    { 3000, 30000, 3127.515432 },
+    { 4000, 40000, 4147.230012 },
+    { 5000, 50000, 5164.598069 },
+    { 6000, 60000, 6180.299514 },
+    { 7000, 70000, 7194.738181 },
+    { 8000, 80000, 8208.177159 },
+    { 9000, 90000, 9220.799176 },
+    { 10000, 100000, 10232.737266 },
 };
 
 static const int binomial_critical = 29;
-
diff --git a/test/bntest.c b/test/bntest.c
index 3b3671a622598..d8c71def932d9 100644
--- a/test/bntest.c
+++ b/test/bntest.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 #ifdef __TANDEM
-# include <strings.h> /* strcasecmp */
+#include <strings.h> /* strcasecmp */
 #endif
 #include <ctype.h>
 
@@ -39,8 +39,8 @@ typedef struct mpitest_st {
     size_t mpi_len;
 } MPITEST;
 
-static const int NUM0 = 100;           /* number of tests */
-static const int NUM1 = 50;            /* additional tests for some functions */
+static const int NUM0 = 100; /* number of tests */
+static const int NUM1 = 50; /* additional tests for some functions */
 static const int NUM_PRIME_TESTS = 20;
 static BN_CTX *ctx;
 
@@ -60,7 +60,7 @@ static const char *findattr(STANZA *s, const char *key)
     int i = s->numpairs;
     PAIR *pp = s->pairs;
 
-    for ( ; --i >= 0; pp++)
+    for (; --i >= 0; pp++)
         if (OPENSSL_strcasecmp(pp->key, key) == 0)
             return pp->value;
     return NULL;
@@ -117,12 +117,12 @@ static int getint(STANZA *s, int *out, const char *attribute)
     int st = 0;
 
     if (!TEST_ptr(ret = getBN(s, attribute))
-            || !TEST_ulong_le(word = BN_get_word(ret), INT_MAX))
+        || !TEST_ulong_le(word = BN_get_word(ret), INT_MAX))
         goto err;
 
     *out = (int)word;
     st = 1;
- err:
+err:
     BN_free(ret);
     return st;
 }
@@ -154,9 +154,9 @@ static int test_swap(void)
     int top, cond, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(d = BN_new()))
+        || !TEST_ptr(b = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(d = BN_new()))
         goto err;
 
     if (!(TEST_true(BN_bntest_rand(a, 1024, 1, 0))
@@ -169,7 +169,7 @@ static int test_swap(void)
     /* regular swap */
     BN_swap(a, b);
     if (!equalBN("swap", a, d)
-            || !equalBN("swap", b, c))
+        || !equalBN("swap", b, c))
         goto err;
 
     /* regular swap: same pointer */
@@ -181,7 +181,7 @@ static int test_swap(void)
     cond = 1;
     BN_consttime_swap(cond, a, b, top);
     if (!equalBN("cswap true", a, c)
-            || !equalBN("cswap true", b, d))
+        || !equalBN("cswap true", b, d))
         goto err;
 
     /* conditional swap: true, same pointer */
@@ -193,7 +193,7 @@ static int test_swap(void)
     cond = 0;
     BN_consttime_swap(cond, a, b, top);
     if (!equalBN("cswap false", a, c)
-            || !equalBN("cswap false", b, d))
+        || !equalBN("cswap false", b, d))
         goto err;
 
     /* conditional swap: false, same pointer */
@@ -206,29 +206,29 @@ static int test_swap(void)
 
     BN_swap(a, b);
     if (!equalBN("swap, flags", a, d)
-            || !equalBN("swap, flags", b, c)
-            || !TEST_true(BN_get_flags(b, BN_FLG_CONSTTIME))
-            || !TEST_false(BN_get_flags(a, BN_FLG_CONSTTIME)))
+        || !equalBN("swap, flags", b, c)
+        || !TEST_true(BN_get_flags(b, BN_FLG_CONSTTIME))
+        || !TEST_false(BN_get_flags(a, BN_FLG_CONSTTIME)))
         goto err;
 
     cond = 1;
     BN_consttime_swap(cond, a, b, top);
     if (!equalBN("cswap true, flags", a, c)
-            || !equalBN("cswap true, flags", b, d)
-            || !TEST_true(BN_get_flags(a, BN_FLG_CONSTTIME))
-            || !TEST_false(BN_get_flags(b, BN_FLG_CONSTTIME)))
+        || !equalBN("cswap true, flags", b, d)
+        || !TEST_true(BN_get_flags(a, BN_FLG_CONSTTIME))
+        || !TEST_false(BN_get_flags(b, BN_FLG_CONSTTIME)))
         goto err;
 
     cond = 0;
     BN_consttime_swap(cond, a, b, top);
     if (!equalBN("cswap false, flags", a, c)
-            || !equalBN("cswap false, flags", b, d)
-            || !TEST_true(BN_get_flags(a, BN_FLG_CONSTTIME))
-            || !TEST_false(BN_get_flags(b, BN_FLG_CONSTTIME)))
+        || !equalBN("cswap false, flags", b, d)
+        || !TEST_true(BN_get_flags(a, BN_FLG_CONSTTIME))
+        || !TEST_false(BN_get_flags(b, BN_FLG_CONSTTIME)))
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(c);
@@ -242,16 +242,16 @@ static int test_sub(void)
     int i, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b = BN_new())
-            || !TEST_ptr(c = BN_new()))
+        || !TEST_ptr(b = BN_new())
+        || !TEST_ptr(c = BN_new()))
         goto err;
 
     for (i = 0; i < NUM0 + NUM1; i++) {
         if (i < NUM1) {
             if (!(TEST_true(BN_bntest_rand(a, 512, 0, 0)))
-                    && TEST_ptr(BN_copy(b, a))
-                    && TEST_int_ne(BN_set_bit(a, i), 0)
-                    && TEST_true(BN_add_word(b, i)))
+                && TEST_ptr(BN_copy(b, a))
+                && TEST_int_ne(BN_set_bit(a, i), 0)
+                && TEST_true(BN_add_word(b, i)))
                 goto err;
         } else {
             if (!TEST_true(BN_bntest_rand(b, 400 + i - NUM1, 0, 0)))
@@ -266,7 +266,7 @@ static int test_sub(void)
             goto err;
     }
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(c);
@@ -280,11 +280,11 @@ static int test_div_recip(void)
     int st = 0, i;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(d = BN_new())
-            || !TEST_ptr(e = BN_new())
-            || !TEST_ptr(recp = BN_RECP_CTX_new()))
+        || !TEST_ptr(b = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(d = BN_new())
+        || !TEST_ptr(e = BN_new())
+        || !TEST_ptr(recp = BN_RECP_CTX_new()))
         goto err;
 
     for (i = 0; i < NUM0 + NUM1; i++) {
@@ -309,7 +309,7 @@ static int test_div_recip(void)
             goto err;
     }
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(c);
@@ -322,10 +322,10 @@ static int test_div_recip(void)
 static struct {
     int n, divisor, result, remainder;
 } signed_mod_tests[] = {
-    {  10,   3,   3,   1 },
-    { -10,   3,  -3,  -1 },
-    {  10,  -3,  -3,   1 },
-    { -10,  -3,   3,  -1 },
+    { 10, 3, 3, 1 },
+    { -10, 3, -3, -1 },
+    { 10, -3, -3, 1 },
+    { -10, -3, 3, -1 },
 };
 
 static BIGNUM *set_signed_bn(int value)
@@ -348,16 +348,16 @@ static int test_signed_mod_replace_ab(int n)
     int st = 0;
 
     if (!TEST_ptr(a = set_signed_bn(signed_mod_tests[n].n))
-            || !TEST_ptr(b = set_signed_bn(signed_mod_tests[n].divisor))
-            || !TEST_ptr(c = set_signed_bn(signed_mod_tests[n].result))
-            || !TEST_ptr(d = set_signed_bn(signed_mod_tests[n].remainder)))
+        || !TEST_ptr(b = set_signed_bn(signed_mod_tests[n].divisor))
+        || !TEST_ptr(c = set_signed_bn(signed_mod_tests[n].result))
+        || !TEST_ptr(d = set_signed_bn(signed_mod_tests[n].remainder)))
         goto err;
 
     if (TEST_true(BN_div(a, b, a, b, ctx))
-            && TEST_BN_eq(a, c)
-            && TEST_BN_eq(b, d))
+        && TEST_BN_eq(a, c)
+        && TEST_BN_eq(b, d))
         st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(c);
@@ -371,16 +371,16 @@ static int test_signed_mod_replace_ba(int n)
     int st = 0;
 
     if (!TEST_ptr(a = set_signed_bn(signed_mod_tests[n].n))
-            || !TEST_ptr(b = set_signed_bn(signed_mod_tests[n].divisor))
-            || !TEST_ptr(c = set_signed_bn(signed_mod_tests[n].result))
-            || !TEST_ptr(d = set_signed_bn(signed_mod_tests[n].remainder)))
+        || !TEST_ptr(b = set_signed_bn(signed_mod_tests[n].divisor))
+        || !TEST_ptr(c = set_signed_bn(signed_mod_tests[n].result))
+        || !TEST_ptr(d = set_signed_bn(signed_mod_tests[n].remainder)))
         goto err;
 
     if (TEST_true(BN_div(b, a, a, b, ctx))
-            && TEST_BN_eq(b, c)
-            && TEST_BN_eq(a, d))
+        && TEST_BN_eq(b, c)
+        && TEST_BN_eq(a, d))
         st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(c);
@@ -394,10 +394,10 @@ static int test_mod(void)
     int st = 0, i;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(d = BN_new())
-            || !TEST_ptr(e = BN_new()))
+        || !TEST_ptr(b = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(d = BN_new())
+        || !TEST_ptr(e = BN_new()))
         goto err;
 
     if (!(TEST_true(BN_bntest_rand(a, 1024, 0, 0))))
@@ -416,7 +416,7 @@ static int test_mod(void)
             goto err;
     }
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(c);
@@ -477,14 +477,14 @@ static int test_modexp_mont5(void)
     int st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(p = BN_new())
-            || !TEST_ptr(m = BN_new())
-            || !TEST_ptr(d = BN_new())
-            || !TEST_ptr(e = BN_new())
-            || !TEST_ptr(b = BN_new())
-            || !TEST_ptr(n = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(mont = BN_MONT_CTX_new()))
+        || !TEST_ptr(p = BN_new())
+        || !TEST_ptr(m = BN_new())
+        || !TEST_ptr(d = BN_new())
+        || !TEST_ptr(e = BN_new())
+        || !TEST_ptr(b = BN_new())
+        || !TEST_ptr(n = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(mont = BN_MONT_CTX_new()))
         goto err;
 
     /* must be odd for montgomery */
@@ -501,20 +501,20 @@ static int test_modexp_mont5(void)
 
     /* Regression test for carry bug in mulx4x_mont */
     if (!(TEST_true(BN_hex2bn(&a,
-        "7878787878787878787878787878787878787878787878787878787878787878"
-        "7878787878787878787878787878787878787878787878787878787878787878"
-        "7878787878787878787878787878787878787878787878787878787878787878"
-        "7878787878787878787878787878787878787878787878787878787878787878"))
-        && TEST_true(BN_hex2bn(&b,
-        "095D72C08C097BA488C5E439C655A192EAFB6380073D8C2664668EDDB4060744"
-        "E16E57FB4EDB9AE10A0CEFCDC28A894F689A128379DB279D48A2E20849D68593"
-        "9B7803BCF46CEBF5C533FB0DD35B080593DE5472E3FE5DB951B8BFF9B4CB8F03"
-        "9CC638A5EE8CDD703719F8000E6A9F63BEED5F2FCD52FF293EA05A251BB4AB81"))
-        && TEST_true(BN_hex2bn(&n,
-        "D78AF684E71DB0C39CFF4E64FB9DB567132CB9C50CC98009FEB820B26F2DED9B"
-        "91B9B5E2B83AE0AE4EB4E0523CA726BFBE969B89FD754F674CE99118C3F2D1C5"
-        "D81FDC7C54E02B60262B241D53C040E99E45826ECA37A804668E690E1AFC1CA4"
-        "2C9A15D84D4954425F0B7642FC0BD9D7B24E2618D2DCC9B729D944BADACFDDAF"))))
+              "7878787878787878787878787878787878787878787878787878787878787878"
+              "7878787878787878787878787878787878787878787878787878787878787878"
+              "7878787878787878787878787878787878787878787878787878787878787878"
+              "7878787878787878787878787878787878787878787878787878787878787878"))
+            && TEST_true(BN_hex2bn(&b,
+                "095D72C08C097BA488C5E439C655A192EAFB6380073D8C2664668EDDB4060744"
+                "E16E57FB4EDB9AE10A0CEFCDC28A894F689A128379DB279D48A2E20849D68593"
+                "9B7803BCF46CEBF5C533FB0DD35B080593DE5472E3FE5DB951B8BFF9B4CB8F03"
+                "9CC638A5EE8CDD703719F8000E6A9F63BEED5F2FCD52FF293EA05A251BB4AB81"))
+            && TEST_true(BN_hex2bn(&n,
+                "D78AF684E71DB0C39CFF4E64FB9DB567132CB9C50CC98009FEB820B26F2DED9B"
+                "91B9B5E2B83AE0AE4EB4E0523CA726BFBE969B89FD754F674CE99118C3F2D1C5"
+                "D81FDC7C54E02B60262B241D53C040E99E45826ECA37A804668E690E1AFC1CA4"
+                "2C9A15D84D4954425F0B7642FC0BD9D7B24E2618D2DCC9B729D944BADACFDDAF"))))
         goto err;
 
     if (!(TEST_true(BN_MONT_CTX_set(mont, n, ctx))
@@ -538,7 +538,7 @@ static int test_modexp_mont5(void)
     /* Regression test for carry bug in bn_sqrx8x_internal */
     {
         static const char *ahex[] = {
-                      "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
             "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
             "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
             "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
@@ -553,7 +553,7 @@ static int test_modexp_mont5(void)
             NULL
         };
         static const char *nhex[] = {
-                      "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
             "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
             "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
             "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
@@ -578,42 +578,42 @@ static int test_modexp_mont5(void)
         goto err;
 
     if (!TEST_true(BN_mod_mul_montgomery(c, a, a, mont, ctx))
-            || !TEST_true(BN_mod_mul_montgomery(d, a, b, mont, ctx))
-            || !TEST_BN_eq(c, d))
+        || !TEST_true(BN_mod_mul_montgomery(d, a, b, mont, ctx))
+        || !TEST_BN_eq(c, d))
         goto err;
 
     /* Regression test for bug in BN_from_montgomery_word */
     if (!(TEST_true(BN_hex2bn(&a,
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"))
-         && TEST_true(BN_hex2bn(&n,
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"))
-        && TEST_true(BN_MONT_CTX_set(mont, n, ctx))
-        && TEST_false(BN_mod_mul_montgomery(d, a, a, mont, ctx))))
+              "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+              "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+              "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"))
+            && TEST_true(BN_hex2bn(&n,
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"))
+            && TEST_true(BN_MONT_CTX_set(mont, n, ctx))
+            && TEST_false(BN_mod_mul_montgomery(d, a, a, mont, ctx))))
         goto err;
 
     /* Regression test for bug in rsaz_1024_mul_avx2 */
     if (!(TEST_true(BN_hex2bn(&a,
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2020202020DF"))
-        && TEST_true(BN_hex2bn(&b,
-        "2020202020202020202020202020202020202020202020202020202020202020"
-        "2020202020202020202020202020202020202020202020202020202020202020"
-        "20202020202020FF202020202020202020202020202020202020202020202020"
-        "2020202020202020202020202020202020202020202020202020202020202020"))
-        && TEST_true(BN_hex2bn(&n,
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2020202020FF"))
-        && TEST_true(BN_MONT_CTX_set(mont, n, ctx))
-        && TEST_true(BN_mod_exp_mont_consttime(c, a, b, n, ctx, mont))
-        && TEST_true(BN_mod_exp_mont(d, a, b, n, ctx, mont))
-        && TEST_BN_eq(c, d)))
+              "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+              "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+              "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+              "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2020202020DF"))
+            && TEST_true(BN_hex2bn(&b,
+                "2020202020202020202020202020202020202020202020202020202020202020"
+                "2020202020202020202020202020202020202020202020202020202020202020"
+                "20202020202020FF202020202020202020202020202020202020202020202020"
+                "2020202020202020202020202020202020202020202020202020202020202020"))
+            && TEST_true(BN_hex2bn(&n,
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2020202020FF"))
+            && TEST_true(BN_MONT_CTX_set(mont, n, ctx))
+            && TEST_true(BN_mod_exp_mont_consttime(c, a, b, n, ctx, mont))
+            && TEST_true(BN_mod_exp_mont(d, a, b, n, ctx, mont))
+            && TEST_BN_eq(c, d)))
         goto err;
 
     /*
@@ -621,22 +621,22 @@ static int test_modexp_mont5(void)
      * BN_mod_exp_mont_consttime should reduce the input first.
      */
     if (!(TEST_true(BN_hex2bn(&a,
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2020202020DF"))
-        && TEST_true(BN_hex2bn(&b,
-        "1FA53F26F8811C58BE0357897AA5E165693230BC9DF5F01DFA6A2D59229EC69D"
-        "9DE6A89C36E3B6957B22D6FAAD5A3C73AE587B710DBE92E83D3A9A3339A085CB"
-        "B58F508CA4F837924BB52CC1698B7FDC2FD74362456A595A5B58E38E38E38E38"
-        "E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E"))
-        && TEST_true(BN_hex2bn(&n,
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2020202020DF"))
-        && TEST_true(BN_MONT_CTX_set(mont, n, ctx))
-        && TEST_true(BN_mod_exp_mont_consttime(c, a, b, n, ctx, mont))))
+              "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+              "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+              "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+              "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2020202020DF"))
+            && TEST_true(BN_hex2bn(&b,
+                "1FA53F26F8811C58BE0357897AA5E165693230BC9DF5F01DFA6A2D59229EC69D"
+                "9DE6A89C36E3B6957B22D6FAAD5A3C73AE587B710DBE92E83D3A9A3339A085CB"
+                "B58F508CA4F837924BB52CC1698B7FDC2FD74362456A595A5B58E38E38E38E38"
+                "E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E38E"))
+            && TEST_true(BN_hex2bn(&n,
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2020202020DF"))
+            && TEST_true(BN_MONT_CTX_set(mont, n, ctx))
+            && TEST_true(BN_mod_exp_mont_consttime(c, a, b, n, ctx, mont))))
         goto err;
     BN_zero(d);
     if (!TEST_BN_eq(c, d))
@@ -656,7 +656,8 @@ static int test_modexp_mont5(void)
             "a359473ec376f329bdae6a19f503be6d4be7393c4e43468831234e27e3838680",
             "b949390d2e416a3f9759e5349ab4c253f6f29f819a6fe4cbfd27ada34903300e",
             "da021f62839f5878a36f1bc3085375b00fd5fa3e68d316c0fdace87a97558465",
-            NULL};
+            NULL
+        };
         static const char *phex[] = {
             "f95dc0f980fbd22e90caa5a387cc4a369f3f830d50dd321c40db8c09a7e1a241",
             "a536e096622d3280c0c1ba849c1f4a79bf490f60006d081e8cf69960189f0d31",
@@ -666,7 +667,8 @@ static int test_modexp_mont5(void)
             "5df089292820477802a43cf5b6b94e999e8c9944ddebb0d0e95a60f88cb7e813",
             "ba110d20e1024774107dd02949031864923b3cb8c3f7250d6d1287b0a40db6a4",
             "7bd5a469518eb65aa207ddc47d8c6e5fc8e0c105be8fc1d4b57b2e27540471d5",
-            NULL};
+            NULL
+        };
         static const char *mhex[] = {
             "fef15d5ce4625f1bccfbba49fc8439c72bf8202af039a2259678941b60bb4a8f",
             "2987e965d58fd8cf86a856674d519763d0e1211cc9f8596971050d56d9b35db3",
@@ -676,14 +678,15 @@ static int test_modexp_mont5(void)
             "c633bd309c016e37736da92129d0b053d4ab28d21ad7d8b6fab2a8bbdc8ee647",
             "d2fbcf2cf426cf892e6f5639e0252993965dfb73ccd277407014ea784aaa280c",
             "b7b03972bc8b0baa72360bdb44b82415b86b2f260f877791cd33ba8f2d65229b",
-            NULL};
+            NULL
+        };
 
         if (!TEST_true(parse_bigBN(&e, ehex))
-                || !TEST_true(parse_bigBN(&p, phex))
-                || !TEST_true(parse_bigBN(&m, mhex))
-                || !TEST_true(BN_mod_exp_mont_consttime(d, e, p, m, ctx, NULL))
-                || !TEST_true(BN_mod_exp_simple(a, e, p, m, ctx))
-                || !TEST_BN_eq(a, d))
+            || !TEST_true(parse_bigBN(&p, phex))
+            || !TEST_true(parse_bigBN(&m, mhex))
+            || !TEST_true(BN_mod_exp_mont_consttime(d, e, p, m, ctx, NULL))
+            || !TEST_true(BN_mod_exp_simple(a, e, p, m, ctx))
+            || !TEST_BN_eq(a, d))
             goto err;
     }
 
@@ -692,7 +695,7 @@ static int test_modexp_mont5(void)
         goto err;
     BN_zero(a);
     if (!TEST_true(BN_mod_exp_mont_consttime(d, a, p, m, ctx, NULL))
-            || !TEST_BN_eq_zero(d))
+        || !TEST_BN_eq_zero(d))
         goto err;
 
     /*
@@ -704,9 +707,9 @@ static int test_modexp_mont5(void)
             && TEST_true(BN_MONT_CTX_set(mont, m, ctx))))
         goto err;
     if (!TEST_true(BN_from_montgomery(e, a, mont, ctx))
-            || !TEST_true(BN_mod_exp_mont_consttime(d, e, p, m, ctx, NULL))
-            || !TEST_true(BN_mod_exp_simple(a, e, p, m, ctx))
-            || !TEST_BN_eq(a, d))
+        || !TEST_true(BN_mod_exp_mont_consttime(d, e, p, m, ctx, NULL))
+        || !TEST_true(BN_mod_exp_simple(a, e, p, m, ctx))
+        || !TEST_BN_eq(a, d))
         goto err;
 
     /* Finally, some regular test vectors. */
@@ -718,7 +721,7 @@ static int test_modexp_mont5(void)
 
     st = 1;
 
- err:
+err:
     BN_MONT_CTX_free(mont);
     BN_free(a);
     BN_free(p);
@@ -738,8 +741,8 @@ static int test_gf2m_add(void)
     int i, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b = BN_new())
-            || !TEST_ptr(c = BN_new()))
+        || !TEST_ptr(b = BN_new())
+        || !TEST_ptr(c = BN_new()))
         goto err;
 
     for (i = 0; i < NUM0; i++) {
@@ -751,7 +754,7 @@ static int test_gf2m_add(void)
         if (!(TEST_true(BN_GF2m_add(c, a, b))
                 /* Test that two added values have the correct parity. */
                 && TEST_false((BN_is_odd(a) && BN_is_odd(c))
-                        || (!BN_is_odd(a) && !BN_is_odd(c)))))
+                    || (!BN_is_odd(a) && !BN_is_odd(c)))))
             goto err;
         if (!(TEST_true(BN_GF2m_add(c, c, c))
                 /* Test that c + c = 0. */
@@ -759,7 +762,7 @@ static int test_gf2m_add(void)
             goto err;
     }
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(c);
@@ -768,15 +771,15 @@ static int test_gf2m_add(void)
 
 static int test_gf2m_mod(void)
 {
-    BIGNUM *a = NULL, *b[2] = {NULL, NULL}, *c = NULL, *d = NULL, *e = NULL;
+    BIGNUM *a = NULL, *b[2] = { NULL, NULL }, *c = NULL, *d = NULL, *e = NULL;
     int i, j, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b[0] = BN_new())
-            || !TEST_ptr(b[1] = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(d = BN_new())
-            || !TEST_ptr(e = BN_new()))
+        || !TEST_ptr(b[0] = BN_new())
+        || !TEST_ptr(b[1] = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(d = BN_new())
+        || !TEST_ptr(e = BN_new()))
         goto err;
 
     if (!(TEST_true(BN_GF2m_arr2poly(p0, b[0]))
@@ -796,7 +799,7 @@ static int test_gf2m_mod(void)
         }
     }
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b[0]);
     BN_free(b[1]);
@@ -808,19 +811,19 @@ static int test_gf2m_mod(void)
 
 static int test_gf2m_mul(void)
 {
-    BIGNUM *a, *b[2] = {NULL, NULL}, *c = NULL, *d = NULL;
+    BIGNUM *a, *b[2] = { NULL, NULL }, *c = NULL, *d = NULL;
     BIGNUM *e = NULL, *f = NULL, *g = NULL, *h = NULL;
     int i, j, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b[0] = BN_new())
-            || !TEST_ptr(b[1] = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(d = BN_new())
-            || !TEST_ptr(e = BN_new())
-            || !TEST_ptr(f = BN_new())
-            || !TEST_ptr(g = BN_new())
-            || !TEST_ptr(h = BN_new()))
+        || !TEST_ptr(b[0] = BN_new())
+        || !TEST_ptr(b[1] = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(d = BN_new())
+        || !TEST_ptr(e = BN_new())
+        || !TEST_ptr(f = BN_new())
+        || !TEST_ptr(g = BN_new())
+        || !TEST_ptr(h = BN_new()))
         goto err;
 
     if (!(TEST_true(BN_GF2m_arr2poly(p0, b[0]))
@@ -846,7 +849,7 @@ static int test_gf2m_mul(void)
     }
     st = 1;
 
- err:
+err:
     BN_free(a);
     BN_free(b[0]);
     BN_free(b[1]);
@@ -861,14 +864,14 @@ static int test_gf2m_mul(void)
 
 static int test_gf2m_sqr(void)
 {
-    BIGNUM *a = NULL, *b[2] = {NULL, NULL}, *c = NULL, *d = NULL;
+    BIGNUM *a = NULL, *b[2] = { NULL, NULL }, *c = NULL, *d = NULL;
     int i, j, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b[0] = BN_new())
-            || !TEST_ptr(b[1] = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(d = BN_new()))
+        || !TEST_ptr(b[0] = BN_new())
+        || !TEST_ptr(b[1] = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(d = BN_new()))
         goto err;
 
     if (!(TEST_true(BN_GF2m_arr2poly(p0, b[0]))
@@ -877,7 +880,7 @@ static int test_gf2m_sqr(void)
 
     for (i = 0; i < NUM0; i++) {
         if (!TEST_true(BN_bntest_rand(a, 1024, 0, 0)))
-                goto err;
+            goto err;
         for (j = 0; j < 2; j++) {
             if (!(TEST_true(BN_GF2m_mod_sqr(c, a, b[j], ctx))
                     && TEST_true(BN_copy(d, a))
@@ -889,7 +892,7 @@ static int test_gf2m_sqr(void)
         }
     }
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b[0]);
     BN_free(b[1]);
@@ -900,14 +903,14 @@ static int test_gf2m_sqr(void)
 
 static int test_gf2m_modinv(void)
 {
-    BIGNUM *a = NULL, *b[2] = {NULL, NULL}, *c = NULL, *d = NULL;
+    BIGNUM *a = NULL, *b[2] = { NULL, NULL }, *c = NULL, *d = NULL;
     int i, j, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b[0] = BN_new())
-            || !TEST_ptr(b[1] = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(d = BN_new()))
+        || !TEST_ptr(b[0] = BN_new())
+        || !TEST_ptr(b[1] = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(d = BN_new()))
         goto err;
 
     /* Test that a non-sensical, too small value causes a failure */
@@ -934,7 +937,7 @@ static int test_gf2m_modinv(void)
         }
     }
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b[0]);
     BN_free(b[1]);
@@ -945,17 +948,17 @@ static int test_gf2m_modinv(void)
 
 static int test_gf2m_moddiv(void)
 {
-    BIGNUM *a = NULL, *b[2] = {NULL, NULL}, *c = NULL, *d = NULL;
+    BIGNUM *a = NULL, *b[2] = { NULL, NULL }, *c = NULL, *d = NULL;
     BIGNUM *e = NULL, *f = NULL;
     int i, j, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b[0] = BN_new())
-            || !TEST_ptr(b[1] = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(d = BN_new())
-            || !TEST_ptr(e = BN_new())
-            || !TEST_ptr(f = BN_new()))
+        || !TEST_ptr(b[0] = BN_new())
+        || !TEST_ptr(b[1] = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(d = BN_new())
+        || !TEST_ptr(e = BN_new())
+        || !TEST_ptr(f = BN_new()))
         goto err;
 
     if (!(TEST_true(BN_GF2m_arr2poly(p0, b[0]))
@@ -976,7 +979,7 @@ static int test_gf2m_moddiv(void)
         }
     }
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b[0]);
     BN_free(b[1]);
@@ -989,17 +992,17 @@ static int test_gf2m_moddiv(void)
 
 static int test_gf2m_modexp(void)
 {
-    BIGNUM *a = NULL, *b[2] = {NULL, NULL}, *c = NULL, *d = NULL;
+    BIGNUM *a = NULL, *b[2] = { NULL, NULL }, *c = NULL, *d = NULL;
     BIGNUM *e = NULL, *f = NULL;
     int i, j, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b[0] = BN_new())
-            || !TEST_ptr(b[1] = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(d = BN_new())
-            || !TEST_ptr(e = BN_new())
-            || !TEST_ptr(f = BN_new()))
+        || !TEST_ptr(b[0] = BN_new())
+        || !TEST_ptr(b[1] = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(d = BN_new())
+        || !TEST_ptr(e = BN_new())
+        || !TEST_ptr(f = BN_new()))
         goto err;
 
     if (!(TEST_true(BN_GF2m_arr2poly(p0, b[0]))
@@ -1024,7 +1027,7 @@ static int test_gf2m_modexp(void)
         }
     }
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b[0]);
     BN_free(b[1]);
@@ -1037,17 +1040,17 @@ static int test_gf2m_modexp(void)
 
 static int test_gf2m_modsqrt(void)
 {
-    BIGNUM *a = NULL, *b[2] = {NULL, NULL}, *c = NULL, *d = NULL;
+    BIGNUM *a = NULL, *b[2] = { NULL, NULL }, *c = NULL, *d = NULL;
     BIGNUM *e = NULL, *f = NULL;
     int i, j, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b[0] = BN_new())
-            || !TEST_ptr(b[1] = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(d = BN_new())
-            || !TEST_ptr(e = BN_new())
-            || !TEST_ptr(f = BN_new()))
+        || !TEST_ptr(b[0] = BN_new())
+        || !TEST_ptr(b[1] = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(d = BN_new())
+        || !TEST_ptr(e = BN_new())
+        || !TEST_ptr(f = BN_new()))
         goto err;
 
     if (!(TEST_true(BN_GF2m_arr2poly(p0, b[0]))
@@ -1069,7 +1072,7 @@ static int test_gf2m_modsqrt(void)
         }
     }
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b[0]);
     BN_free(b[1]);
@@ -1082,16 +1085,16 @@ static int test_gf2m_modsqrt(void)
 
 static int test_gf2m_modsolvequad(void)
 {
-    BIGNUM *a = NULL, *b[2] = {NULL, NULL}, *c = NULL, *d = NULL;
+    BIGNUM *a = NULL, *b[2] = { NULL, NULL }, *c = NULL, *d = NULL;
     BIGNUM *e = NULL;
     int i, j, s = 0, t, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b[0] = BN_new())
-            || !TEST_ptr(b[1] = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(d = BN_new())
-            || !TEST_ptr(e = BN_new()))
+        || !TEST_ptr(b[0] = BN_new())
+        || !TEST_ptr(b[1] = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(d = BN_new())
+        || !TEST_ptr(e = BN_new()))
         goto err;
 
     if (!(TEST_true(BN_GF2m_arr2poly(p0, b[0]))
@@ -1123,7 +1126,7 @@ static int test_gf2m_modsolvequad(void)
         goto err;
     }
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b[0]);
     BN_free(b[1]);
@@ -1140,9 +1143,9 @@ static int test_kronecker(void)
     int i, legendre, kronecker, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b = BN_new())
-            || !TEST_ptr(r = BN_new())
-            || !TEST_ptr(t = BN_new()))
+        || !TEST_ptr(b = BN_new())
+        || !TEST_ptr(r = BN_new())
+        || !TEST_ptr(t = BN_new()))
         goto err;
 
     /*
@@ -1204,7 +1207,7 @@ static int test_kronecker(void)
     }
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(r);
@@ -1219,17 +1222,17 @@ static int file_sum(STANZA *s)
     int st = 0;
 
     if (!TEST_ptr(a = getBN(s, "A"))
-            || !TEST_ptr(b = getBN(s, "B"))
-            || !TEST_ptr(sum = getBN(s, "Sum"))
-            || !TEST_ptr(ret = BN_new()))
+        || !TEST_ptr(b = getBN(s, "B"))
+        || !TEST_ptr(sum = getBN(s, "Sum"))
+        || !TEST_ptr(ret = BN_new()))
         goto err;
 
     if (!TEST_true(BN_add(ret, a, b))
-            || !equalBN("A + B", sum, ret)
-            || !TEST_true(BN_sub(ret, sum, a))
-            || !equalBN("Sum - A", b, ret)
-            || !TEST_true(BN_sub(ret, sum, b))
-            || !equalBN("Sum - B", a, ret))
+        || !equalBN("A + B", sum, ret)
+        || !TEST_true(BN_sub(ret, sum, a))
+        || !equalBN("Sum - A", b, ret)
+        || !TEST_true(BN_sub(ret, sum, b))
+        || !equalBN("Sum - B", a, ret))
         goto err;
 
     /*
@@ -1238,23 +1241,23 @@ static int file_sum(STANZA *s)
      * There is no test for all of |r|, |a|, and |b| pointint to the same BIGNUM.
      */
     if (!TEST_true(BN_copy(ret, a))
-            || !TEST_true(BN_add(ret, ret, b))
-            || !equalBN("A + B (r is a)", sum, ret)
-            || !TEST_true(BN_copy(ret, b))
-            || !TEST_true(BN_add(ret, a, ret))
-            || !equalBN("A + B (r is b)", sum, ret)
-            || !TEST_true(BN_copy(ret, sum))
-            || !TEST_true(BN_sub(ret, ret, a))
-            || !equalBN("Sum - A (r is a)", b, ret)
-            || !TEST_true(BN_copy(ret, a))
-            || !TEST_true(BN_sub(ret, sum, ret))
-            || !equalBN("Sum - A (r is b)", b, ret)
-            || !TEST_true(BN_copy(ret, sum))
-            || !TEST_true(BN_sub(ret, ret, b))
-            || !equalBN("Sum - B (r is a)", a, ret)
-            || !TEST_true(BN_copy(ret, b))
-            || !TEST_true(BN_sub(ret, sum, ret))
-            || !equalBN("Sum - B (r is b)", a, ret))
+        || !TEST_true(BN_add(ret, ret, b))
+        || !equalBN("A + B (r is a)", sum, ret)
+        || !TEST_true(BN_copy(ret, b))
+        || !TEST_true(BN_add(ret, a, ret))
+        || !equalBN("A + B (r is b)", sum, ret)
+        || !TEST_true(BN_copy(ret, sum))
+        || !TEST_true(BN_sub(ret, ret, a))
+        || !equalBN("Sum - A (r is a)", b, ret)
+        || !TEST_true(BN_copy(ret, a))
+        || !TEST_true(BN_sub(ret, sum, ret))
+        || !equalBN("Sum - A (r is b)", b, ret)
+        || !TEST_true(BN_copy(ret, sum))
+        || !TEST_true(BN_sub(ret, ret, b))
+        || !equalBN("Sum - B (r is a)", a, ret)
+        || !TEST_true(BN_copy(ret, b))
+        || !TEST_true(BN_sub(ret, sum, ret))
+        || !equalBN("Sum - B (r is b)", a, ret))
         goto err;
 
     /*
@@ -1265,11 +1268,11 @@ static int file_sum(STANZA *s)
      */
     if (!BN_is_negative(a) && !BN_is_negative(b) && BN_cmp(a, b) >= 0) {
         if (!TEST_true(BN_uadd(ret, a, b))
-                || !equalBN("A +u B", sum, ret)
-                || !TEST_true(BN_usub(ret, sum, a))
-                || !equalBN("Sum -u A", b, ret)
-                || !TEST_true(BN_usub(ret, sum, b))
-                || !equalBN("Sum -u B", a, ret))
+            || !equalBN("A +u B", sum, ret)
+            || !TEST_true(BN_usub(ret, sum, a))
+            || !equalBN("Sum -u A", b, ret)
+            || !TEST_true(BN_usub(ret, sum, b))
+            || !equalBN("Sum -u B", a, ret))
             goto err;
         /*
          * Test that the functions work when |r| and |a| point to the same
@@ -1278,23 +1281,23 @@ static int file_sum(STANZA *s)
          * BIGNUM.
          */
         if (!TEST_true(BN_copy(ret, a))
-                || !TEST_true(BN_uadd(ret, ret, b))
-                || !equalBN("A +u B (r is a)", sum, ret)
-                || !TEST_true(BN_copy(ret, b))
-                || !TEST_true(BN_uadd(ret, a, ret))
-                || !equalBN("A +u B (r is b)", sum, ret)
-                || !TEST_true(BN_copy(ret, sum))
-                || !TEST_true(BN_usub(ret, ret, a))
-                || !equalBN("Sum -u A (r is a)", b, ret)
-                || !TEST_true(BN_copy(ret, a))
-                || !TEST_true(BN_usub(ret, sum, ret))
-                || !equalBN("Sum -u A (r is b)", b, ret)
-                || !TEST_true(BN_copy(ret, sum))
-                || !TEST_true(BN_usub(ret, ret, b))
-                || !equalBN("Sum -u B (r is a)", a, ret)
-                || !TEST_true(BN_copy(ret, b))
-                || !TEST_true(BN_usub(ret, sum, ret))
-                || !equalBN("Sum -u B (r is b)", a, ret))
+            || !TEST_true(BN_uadd(ret, ret, b))
+            || !equalBN("A +u B (r is a)", sum, ret)
+            || !TEST_true(BN_copy(ret, b))
+            || !TEST_true(BN_uadd(ret, a, ret))
+            || !equalBN("A +u B (r is b)", sum, ret)
+            || !TEST_true(BN_copy(ret, sum))
+            || !TEST_true(BN_usub(ret, ret, a))
+            || !equalBN("Sum -u A (r is a)", b, ret)
+            || !TEST_true(BN_copy(ret, a))
+            || !TEST_true(BN_usub(ret, sum, ret))
+            || !equalBN("Sum -u A (r is b)", b, ret)
+            || !TEST_true(BN_copy(ret, sum))
+            || !TEST_true(BN_usub(ret, ret, b))
+            || !equalBN("Sum -u B (r is a)", a, ret)
+            || !TEST_true(BN_copy(ret, b))
+            || !TEST_true(BN_usub(ret, sum, ret))
+            || !equalBN("Sum -u B (r is b)", a, ret))
             goto err;
     }
 
@@ -1304,16 +1307,16 @@ static int file_sum(STANZA *s)
     b_word = BN_get_word(b);
     if (!BN_is_negative(b) && b_word != (BN_ULONG)-1) {
         if (!TEST_true(BN_copy(ret, a))
-                || !TEST_true(BN_add_word(ret, b_word))
-                || !equalBN("A + B (word)", sum, ret)
-                || !TEST_true(BN_copy(ret, sum))
-                || !TEST_true(BN_sub_word(ret, b_word))
-                || !equalBN("Sum - B (word)", a, ret))
+            || !TEST_true(BN_add_word(ret, b_word))
+            || !equalBN("A + B (word)", sum, ret)
+            || !TEST_true(BN_copy(ret, sum))
+            || !TEST_true(BN_sub_word(ret, b_word))
+            || !equalBN("Sum - B (word)", a, ret))
             goto err;
     }
     st = 1;
 
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(sum);
@@ -1328,41 +1331,41 @@ static int file_lshift1(STANZA *s)
     int st = 0;
 
     if (!TEST_ptr(a = getBN(s, "A"))
-            || !TEST_ptr(lshift1 = getBN(s, "LShift1"))
-            || !TEST_ptr(zero = BN_new())
-            || !TEST_ptr(ret = BN_new())
-            || !TEST_ptr(two = BN_new())
-            || !TEST_ptr(remainder = BN_new()))
+        || !TEST_ptr(lshift1 = getBN(s, "LShift1"))
+        || !TEST_ptr(zero = BN_new())
+        || !TEST_ptr(ret = BN_new())
+        || !TEST_ptr(two = BN_new())
+        || !TEST_ptr(remainder = BN_new()))
         goto err;
 
     BN_zero(zero);
 
     if (!TEST_true(BN_set_word(two, 2))
-            || !TEST_true(BN_add(ret, a, a))
-            || !equalBN("A + A", lshift1, ret)
-            || !TEST_true(BN_mul(ret, a, two, ctx))
-            || !equalBN("A * 2", lshift1, ret)
-            || !TEST_true(BN_div(ret, remainder, lshift1, two, ctx))
-            || !equalBN("LShift1 / 2", a, ret)
-            || !equalBN("LShift1 % 2", zero, remainder)
-            || !TEST_true(BN_lshift1(ret, a))
-            || !equalBN("A << 1", lshift1, ret)
-            || !TEST_true(BN_rshift1(ret, lshift1))
-            || !equalBN("LShift >> 1", a, ret)
-            || !TEST_true(BN_rshift1(ret, lshift1))
-            || !equalBN("LShift >> 1", a, ret))
+        || !TEST_true(BN_add(ret, a, a))
+        || !equalBN("A + A", lshift1, ret)
+        || !TEST_true(BN_mul(ret, a, two, ctx))
+        || !equalBN("A * 2", lshift1, ret)
+        || !TEST_true(BN_div(ret, remainder, lshift1, two, ctx))
+        || !equalBN("LShift1 / 2", a, ret)
+        || !equalBN("LShift1 % 2", zero, remainder)
+        || !TEST_true(BN_lshift1(ret, a))
+        || !equalBN("A << 1", lshift1, ret)
+        || !TEST_true(BN_rshift1(ret, lshift1))
+        || !equalBN("LShift >> 1", a, ret)
+        || !TEST_true(BN_rshift1(ret, lshift1))
+        || !equalBN("LShift >> 1", a, ret))
         goto err;
 
     /* Set the LSB to 1 and test rshift1 again. */
     if (!TEST_true(BN_set_bit(lshift1, 0))
-            || !TEST_true(BN_div(ret, NULL /* rem */ , lshift1, two, ctx))
-            || !equalBN("(LShift1 | 1) / 2", a, ret)
-            || !TEST_true(BN_rshift1(ret, lshift1))
-            || !equalBN("(LShift | 1) >> 1", a, ret))
+        || !TEST_true(BN_div(ret, NULL /* rem */, lshift1, two, ctx))
+        || !equalBN("(LShift1 | 1) / 2", a, ret)
+        || !TEST_true(BN_rshift1(ret, lshift1))
+        || !equalBN("(LShift | 1) >> 1", a, ret))
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(lshift1);
     BN_free(zero);
@@ -1379,19 +1382,19 @@ static int file_lshift(STANZA *s)
     int n = 0, st = 0;
 
     if (!TEST_ptr(a = getBN(s, "A"))
-            || !TEST_ptr(lshift = getBN(s, "LShift"))
-            || !TEST_ptr(ret = BN_new())
-            || !getint(s, &n, "N"))
+        || !TEST_ptr(lshift = getBN(s, "LShift"))
+        || !TEST_ptr(ret = BN_new())
+        || !getint(s, &n, "N"))
         goto err;
 
     if (!TEST_true(BN_lshift(ret, a, n))
-            || !equalBN("A << N", lshift, ret)
-            || !TEST_true(BN_rshift(ret, lshift, n))
-            || !equalBN("A >> N", a, ret))
+        || !equalBN("A << N", lshift, ret)
+        || !TEST_true(BN_rshift(ret, lshift, n))
+        || !equalBN("A >> N", a, ret))
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(lshift);
     BN_free(ret);
@@ -1404,24 +1407,24 @@ static int file_rshift(STANZA *s)
     int n = 0, st = 0;
 
     if (!TEST_ptr(a = getBN(s, "A"))
-            || !TEST_ptr(rshift = getBN(s, "RShift"))
-            || !TEST_ptr(ret = BN_new())
-            || !getint(s, &n, "N"))
+        || !TEST_ptr(rshift = getBN(s, "RShift"))
+        || !TEST_ptr(ret = BN_new())
+        || !getint(s, &n, "N"))
         goto err;
 
     if (!TEST_true(BN_rshift(ret, a, n))
-            || !equalBN("A >> N", rshift, ret))
+        || !equalBN("A >> N", rshift, ret))
         goto err;
 
     /* If N == 1, try with rshift1 as well */
     if (n == 1) {
         if (!TEST_true(BN_rshift1(ret, a))
-                || !equalBN("A >> 1 (rshift1)", rshift, ret))
+            || !equalBN("A >> 1 (rshift1)", rshift, ret))
             goto err;
     }
     st = 1;
 
- err:
+err:
     BN_free(a);
     BN_free(rshift);
     BN_free(ret);
@@ -1435,32 +1438,32 @@ static int file_square(STANZA *s)
     int st = 0;
 
     if (!TEST_ptr(a = getBN(s, "A"))
-            || !TEST_ptr(square = getBN(s, "Square"))
-            || !TEST_ptr(zero = BN_new())
-            || !TEST_ptr(ret = BN_new())
-            || !TEST_ptr(remainder = BN_new()))
+        || !TEST_ptr(square = getBN(s, "Square"))
+        || !TEST_ptr(zero = BN_new())
+        || !TEST_ptr(ret = BN_new())
+        || !TEST_ptr(remainder = BN_new()))
         goto err;
 
     BN_zero(zero);
     if (!TEST_true(BN_sqr(ret, a, ctx))
-            || !equalBN("A^2", square, ret)
-            || !TEST_true(BN_mul(ret, a, a, ctx))
-            || !equalBN("A * A", square, ret)
-            || !TEST_true(BN_div(ret, remainder, square, a, ctx))
-            || !equalBN("Square / A", a, ret)
-            || !equalBN("Square % A", zero, remainder))
+        || !equalBN("A^2", square, ret)
+        || !TEST_true(BN_mul(ret, a, a, ctx))
+        || !equalBN("A * A", square, ret)
+        || !TEST_true(BN_div(ret, remainder, square, a, ctx))
+        || !equalBN("Square / A", a, ret)
+        || !equalBN("Square % A", zero, remainder))
         goto err;
 
 #if HAVE_BN_SQRT
     BN_set_negative(a, 0);
     if (!TEST_true(BN_sqrt(ret, square, ctx))
-            || !equalBN("sqrt(Square)", a, ret))
+        || !equalBN("sqrt(Square)", a, ret))
         goto err;
 
     /* BN_sqrt should fail on non-squares and negative numbers. */
     if (!TEST_BN_eq_zero(square)) {
         if (!TEST_ptr(tmp = BN_new())
-                || !TEST_true(BN_copy(tmp, square)))
+            || !TEST_true(BN_copy(tmp, square)))
             goto err;
         BN_set_negative(tmp, 1);
 
@@ -1478,7 +1481,7 @@ static int file_square(STANZA *s)
 #endif
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(square);
     BN_free(zero);
@@ -1495,27 +1498,27 @@ static int file_product(STANZA *s)
     int st = 0;
 
     if (!TEST_ptr(a = getBN(s, "A"))
-            || !TEST_ptr(b = getBN(s, "B"))
-            || !TEST_ptr(product = getBN(s, "Product"))
-            || !TEST_ptr(ret = BN_new())
-            || !TEST_ptr(remainder = BN_new())
-            || !TEST_ptr(zero = BN_new()))
+        || !TEST_ptr(b = getBN(s, "B"))
+        || !TEST_ptr(product = getBN(s, "Product"))
+        || !TEST_ptr(ret = BN_new())
+        || !TEST_ptr(remainder = BN_new())
+        || !TEST_ptr(zero = BN_new()))
         goto err;
 
     BN_zero(zero);
 
     if (!TEST_true(BN_mul(ret, a, b, ctx))
-            || !equalBN("A * B", product, ret)
-            || !TEST_true(BN_div(ret, remainder, product, a, ctx))
-            || !equalBN("Product / A", b, ret)
-            || !equalBN("Product % A", zero, remainder)
-            || !TEST_true(BN_div(ret, remainder, product, b, ctx))
-            || !equalBN("Product / B", a, ret)
-            || !equalBN("Product % B", zero, remainder))
+        || !equalBN("A * B", product, ret)
+        || !TEST_true(BN_div(ret, remainder, product, a, ctx))
+        || !equalBN("Product / A", b, ret)
+        || !equalBN("Product % A", zero, remainder)
+        || !TEST_true(BN_div(ret, remainder, product, b, ctx))
+        || !equalBN("Product / B", a, ret)
+        || !equalBN("Product % B", zero, remainder))
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(product);
@@ -1533,20 +1536,20 @@ static int file_quotient(STANZA *s)
     int st = 0;
 
     if (!TEST_ptr(a = getBN(s, "A"))
-            || !TEST_ptr(b = getBN(s, "B"))
-            || !TEST_ptr(quotient = getBN(s, "Quotient"))
-            || !TEST_ptr(remainder = getBN(s, "Remainder"))
-            || !TEST_ptr(ret = BN_new())
-            || !TEST_ptr(ret2 = BN_new())
-            || !TEST_ptr(nnmod = BN_new()))
+        || !TEST_ptr(b = getBN(s, "B"))
+        || !TEST_ptr(quotient = getBN(s, "Quotient"))
+        || !TEST_ptr(remainder = getBN(s, "Remainder"))
+        || !TEST_ptr(ret = BN_new())
+        || !TEST_ptr(ret2 = BN_new())
+        || !TEST_ptr(nnmod = BN_new()))
         goto err;
 
     if (!TEST_true(BN_div(ret, ret2, a, b, ctx))
-            || !equalBN("A / B", quotient, ret)
-            || !equalBN("A % B", remainder, ret2)
-            || !TEST_true(BN_mul(ret, quotient, b, ctx))
-            || !TEST_true(BN_add(ret, ret, remainder))
-            || !equalBN("Quotient * B + Remainder", a, ret))
+        || !equalBN("A / B", quotient, ret)
+        || !equalBN("A % B", remainder, ret2)
+        || !TEST_true(BN_mul(ret, quotient, b, ctx))
+        || !TEST_true(BN_add(ret, ret, remainder))
+        || !equalBN("Quotient * B + Remainder", a, ret))
         goto err;
 
     /*
@@ -1564,22 +1567,22 @@ static int file_quotient(STANZA *s)
         if (ret_word != remainder_word) {
 #ifdef BN_DEC_FMT1
             TEST_error(
-                    "Got A %% B (word) = " BN_DEC_FMT1 ", wanted " BN_DEC_FMT1,
-                    ret_word, remainder_word);
+                "Got A %% B (word) = " BN_DEC_FMT1 ", wanted " BN_DEC_FMT1,
+                ret_word, remainder_word);
 #else
             TEST_error("Got A %% B (word) mismatch");
 #endif
             goto err;
         }
-        if (!equalBN ("A / B (word)", quotient, ret))
+        if (!equalBN("A / B (word)", quotient, ret))
             goto err;
 
         ret_word = BN_mod_word(a, b_word);
         if (ret_word != remainder_word) {
 #ifdef BN_DEC_FMT1
             TEST_error(
-                    "Got A %% B (word) = " BN_DEC_FMT1 ", wanted " BN_DEC_FMT1 "",
-                    ret_word, remainder_word);
+                "Got A %% B (word) = " BN_DEC_FMT1 ", wanted " BN_DEC_FMT1 "",
+                ret_word, remainder_word);
 #else
             TEST_error("Got A %% B (word) mismatch");
 #endif
@@ -1590,15 +1593,15 @@ static int file_quotient(STANZA *s)
     /* Test BN_nnmod. */
     if (!BN_is_negative(b)) {
         if (!TEST_true(BN_copy(nnmod, remainder))
-                || (BN_is_negative(nnmod)
-                        && !TEST_true(BN_add(nnmod, nnmod, b)))
-                || !TEST_true(BN_nnmod(ret, a, b, ctx))
-                || !equalBN("A % B (non-negative)", nnmod, ret))
+            || (BN_is_negative(nnmod)
+                && !TEST_true(BN_add(nnmod, nnmod, b)))
+            || !TEST_true(BN_nnmod(ret, a, b, ctx))
+            || !equalBN("A % B (non-negative)", nnmod, ret))
             goto err;
     }
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(quotient);
@@ -1615,14 +1618,14 @@ static int file_modmul(STANZA *s)
     int st = 0;
 
     if (!TEST_ptr(a = getBN(s, "A"))
-            || !TEST_ptr(b = getBN(s, "B"))
-            || !TEST_ptr(m = getBN(s, "M"))
-            || !TEST_ptr(mod_mul = getBN(s, "ModMul"))
-            || !TEST_ptr(ret = BN_new()))
+        || !TEST_ptr(b = getBN(s, "B"))
+        || !TEST_ptr(m = getBN(s, "M"))
+        || !TEST_ptr(mod_mul = getBN(s, "ModMul"))
+        || !TEST_ptr(ret = BN_new()))
         goto err;
 
     if (!TEST_true(BN_mod_mul(ret, a, b, m, ctx))
-            || !equalBN("A * B (mod M)", mod_mul, ret))
+        || !equalBN("A * B (mod M)", mod_mul, ret))
         goto err;
 
     if (BN_is_odd(m)) {
@@ -1632,15 +1635,15 @@ static int file_modmul(STANZA *s)
         BIGNUM *b_tmp = BN_new();
 
         if (mont == NULL || a_tmp == NULL || b_tmp == NULL
-                || !TEST_true(BN_MONT_CTX_set(mont, m, ctx))
-                || !TEST_true(BN_nnmod(a_tmp, a, m, ctx))
-                || !TEST_true(BN_nnmod(b_tmp, b, m, ctx))
-                || !TEST_true(BN_to_montgomery(a_tmp, a_tmp, mont, ctx))
-                || !TEST_true(BN_to_montgomery(b_tmp, b_tmp, mont, ctx))
-                || !TEST_true(BN_mod_mul_montgomery(ret, a_tmp, b_tmp,
-                                                    mont, ctx))
-                || !TEST_true(BN_from_montgomery(ret, ret, mont, ctx))
-                || !equalBN("A * B (mod M) (mont)", mod_mul, ret))
+            || !TEST_true(BN_MONT_CTX_set(mont, m, ctx))
+            || !TEST_true(BN_nnmod(a_tmp, a, m, ctx))
+            || !TEST_true(BN_nnmod(b_tmp, b, m, ctx))
+            || !TEST_true(BN_to_montgomery(a_tmp, a_tmp, mont, ctx))
+            || !TEST_true(BN_to_montgomery(b_tmp, b_tmp, mont, ctx))
+            || !TEST_true(BN_mod_mul_montgomery(ret, a_tmp, b_tmp,
+                mont, ctx))
+            || !TEST_true(BN_from_montgomery(ret, ret, mont, ctx))
+            || !equalBN("A * B (mod M) (mont)", mod_mul, ret))
             st = 0;
         else
             st = 1;
@@ -1652,7 +1655,7 @@ static int file_modmul(STANZA *s)
     }
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(m);
@@ -1668,23 +1671,23 @@ static int file_modexp(STANZA *s)
     int st = 0;
 
     if (!TEST_ptr(a = getBN(s, "A"))
-            || !TEST_ptr(e = getBN(s, "E"))
-            || !TEST_ptr(m = getBN(s, "M"))
-            || !TEST_ptr(mod_exp = getBN(s, "ModExp"))
-            || !TEST_ptr(ret = BN_new())
-            || !TEST_ptr(d = BN_new()))
+        || !TEST_ptr(e = getBN(s, "E"))
+        || !TEST_ptr(m = getBN(s, "M"))
+        || !TEST_ptr(mod_exp = getBN(s, "ModExp"))
+        || !TEST_ptr(ret = BN_new())
+        || !TEST_ptr(d = BN_new()))
         goto err;
 
     if (!TEST_true(BN_mod_exp(ret, a, e, m, ctx))
-            || !equalBN("A ^ E (mod M)", mod_exp, ret))
+        || !equalBN("A ^ E (mod M)", mod_exp, ret))
         goto err;
 
     if (BN_is_odd(m)) {
         if (!TEST_true(BN_mod_exp_mont(ret, a, e, m, ctx, NULL))
-                || !equalBN("A ^ E (mod M) (mont)", mod_exp, ret)
-                || !TEST_true(BN_mod_exp_mont_consttime(ret, a, e, m,
-                                                        ctx, NULL))
-                || !equalBN("A ^ E (mod M) (mont const", mod_exp, ret))
+            || !equalBN("A ^ E (mod M) (mont)", mod_exp, ret)
+            || !TEST_true(BN_mod_exp_mont_consttime(ret, a, e, m,
+                ctx, NULL))
+            || !equalBN("A ^ E (mod M) (mont const", mod_exp, ret))
             goto err;
     }
 
@@ -1704,7 +1707,7 @@ static int file_modexp(STANZA *s)
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(c);
@@ -1722,17 +1725,17 @@ static int file_exp(STANZA *s)
     int st = 0;
 
     if (!TEST_ptr(a = getBN(s, "A"))
-            || !TEST_ptr(e = getBN(s, "E"))
-            || !TEST_ptr(exp = getBN(s, "Exp"))
-            || !TEST_ptr(ret = BN_new()))
+        || !TEST_ptr(e = getBN(s, "E"))
+        || !TEST_ptr(exp = getBN(s, "Exp"))
+        || !TEST_ptr(ret = BN_new()))
         goto err;
 
     if (!TEST_true(BN_exp(ret, a, e, ctx))
-            || !equalBN("A ^ E", exp, ret))
+        || !equalBN("A ^ E", exp, ret))
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(e);
     BN_free(exp);
@@ -1746,10 +1749,10 @@ static int file_modsqrt(STANZA *s)
     int st = 0;
 
     if (!TEST_ptr(a = getBN(s, "A"))
-            || !TEST_ptr(p = getBN(s, "P"))
-            || !TEST_ptr(mod_sqrt = getBN(s, "ModSqrt"))
-            || !TEST_ptr(ret = BN_new())
-            || !TEST_ptr(ret2 = BN_new()))
+        || !TEST_ptr(p = getBN(s, "P"))
+        || !TEST_ptr(mod_sqrt = getBN(s, "ModSqrt"))
+        || !TEST_ptr(ret = BN_new())
+        || !TEST_ptr(ret2 = BN_new()))
         goto err;
 
     if (BN_is_negative(mod_sqrt)) {
@@ -1763,16 +1766,16 @@ static int file_modsqrt(STANZA *s)
 
     /* There are two possible answers. */
     if (!TEST_ptr(BN_mod_sqrt(ret, a, p, ctx))
-            || !TEST_true(BN_sub(ret2, p, ret)))
+        || !TEST_true(BN_sub(ret2, p, ret)))
         goto err;
 
     /* The first condition should NOT be a test. */
     if (BN_cmp(ret2, mod_sqrt) != 0
-            && !equalBN("sqrt(A) (mod P)", mod_sqrt, ret))
+        && !equalBN("sqrt(A) (mod P)", mod_sqrt, ret))
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(p);
     BN_free(mod_sqrt);
@@ -1787,17 +1790,17 @@ static int file_gcd(STANZA *s)
     int st = 0;
 
     if (!TEST_ptr(a = getBN(s, "A"))
-            || !TEST_ptr(b = getBN(s, "B"))
-            || !TEST_ptr(gcd = getBN(s, "GCD"))
-            || !TEST_ptr(ret = BN_new()))
+        || !TEST_ptr(b = getBN(s, "B"))
+        || !TEST_ptr(gcd = getBN(s, "GCD"))
+        || !TEST_ptr(ret = BN_new()))
         goto err;
 
     if (!TEST_true(BN_gcd(ret, a, b, ctx))
-            || !equalBN("gcd(A,B)", gcd, ret))
+        || !equalBN("gcd(A,B)", gcd, ret))
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(gcd);
@@ -1826,12 +1829,12 @@ static int test_bn2padded(void)
 
     /* Test a random numbers at various byte lengths. */
     for (bytes = 128 - 7; bytes <= 128; bytes++) {
-# define TOP_BIT_ON 0
-# define BOTTOM_BIT_NOTOUCH 0
+#define TOP_BIT_ON 0
+#define BOTTOM_BIT_NOTOUCH 0
         if (!TEST_true(BN_rand(n, bytes * 8, TOP_BIT_ON, BOTTOM_BIT_NOTOUCH)))
             goto err;
         if (!TEST_int_eq(BN_num_bytes(n), bytes)
-                || !TEST_int_eq(BN_bn2bin(n, reference), bytes))
+            || !TEST_int_eq(BN_bn2bin(n, reference), bytes))
             goto err;
         /* Empty buffer should fail. */
         if (!TEST_int_eq(BN_bn2binpad(n, NULL, 0), -1))
@@ -1841,81 +1844,81 @@ static int test_bn2padded(void)
             goto err;
         /* Exactly right size should encode. */
         if (!TEST_int_eq(BN_bn2binpad(n, out, bytes), bytes)
-                || !TEST_mem_eq(out, bytes, reference, bytes))
+            || !TEST_mem_eq(out, bytes, reference, bytes))
             goto err;
         /* Pad up one byte extra. */
         if (!TEST_int_eq(BN_bn2binpad(n, out, bytes + 1), bytes + 1)
-                || !TEST_mem_eq(out + 1, bytes, reference, bytes)
-                || !TEST_mem_eq(out, 1, zeros, 1))
+            || !TEST_mem_eq(out + 1, bytes, reference, bytes)
+            || !TEST_mem_eq(out, 1, zeros, 1))
             goto err;
         /* Pad up to 256. */
         if (!TEST_int_eq(BN_bn2binpad(n, out, sizeof(out)), sizeof(out))
-                || !TEST_mem_eq(out + sizeof(out) - bytes, bytes,
-                                reference, bytes)
-                || !TEST_mem_eq(out, sizeof(out) - bytes,
-                                zeros, sizeof(out) - bytes))
+            || !TEST_mem_eq(out + sizeof(out) - bytes, bytes,
+                reference, bytes)
+            || !TEST_mem_eq(out, sizeof(out) - bytes,
+                zeros, sizeof(out) - bytes))
             goto err;
     }
 
     st = 1;
- err:
+err:
     BN_free(n);
     return st;
 }
 
 static const MPITEST kSignedTests_BE[] = {
-    {"-1", "\xff", 1},
-    {"0", "", 0},
-    {"1", "\x01", 1},
+    { "-1", "\xff", 1 },
+    { "0", "", 0 },
+    { "1", "\x01", 1 },
     /*
      * The above cover the basics, now let's go for possible bignum
      * chunk edges and other word edges (for a broad definition of
      * "word", i.e. 1 byte included).
      */
     /* 1 byte edge */
-    {"127", "\x7f", 1},
-    {"-127", "\x81", 1},
-    {"128", "\x00\x80", 2},
-    {"-128", "\x80", 1},
-    {"129", "\x00\x81", 2},
-    {"-129", "\xff\x7f", 2},
-    {"255", "\x00\xff", 2},
-    {"-255", "\xff\x01", 2},
-    {"256", "\x01\x00", 2},
-    {"-256", "\xff\x00", 2},
+    { "127", "\x7f", 1 },
+    { "-127", "\x81", 1 },
+    { "128", "\x00\x80", 2 },
+    { "-128", "\x80", 1 },
+    { "129", "\x00\x81", 2 },
+    { "-129", "\xff\x7f", 2 },
+    { "255", "\x00\xff", 2 },
+    { "-255", "\xff\x01", 2 },
+    { "256", "\x01\x00", 2 },
+    { "-256", "\xff\x00", 2 },
     /* 2 byte edge */
-    {"32767", "\x7f\xff", 2},
-    {"-32767", "\x80\x01", 2},
-    {"32768", "\x00\x80\x00", 3},
-    {"-32768", "\x80\x00", 2},
-    {"32769", "\x00\x80\x01", 3},
-    {"-32769", "\xff\x7f\xff", 3},
-    {"65535", "\x00\xff\xff", 3},
-    {"-65535", "\xff\x00\x01", 3},
-    {"65536", "\x01\x00\x00", 3},
-    {"-65536", "\xff\x00\x00", 3},
+    { "32767", "\x7f\xff", 2 },
+    { "-32767", "\x80\x01", 2 },
+    { "32768", "\x00\x80\x00", 3 },
+    { "-32768", "\x80\x00", 2 },
+    { "32769", "\x00\x80\x01", 3 },
+    { "-32769", "\xff\x7f\xff", 3 },
+    { "65535", "\x00\xff\xff", 3 },
+    { "-65535", "\xff\x00\x01", 3 },
+    { "65536", "\x01\x00\x00", 3 },
+    { "-65536", "\xff\x00\x00", 3 },
     /* 4 byte edge */
-    {"2147483647", "\x7f\xff\xff\xff", 4},
-    {"-2147483647", "\x80\x00\x00\x01", 4},
-    {"2147483648", "\x00\x80\x00\x00\x00", 5},
-    {"-2147483648", "\x80\x00\x00\x00", 4},
-    {"2147483649", "\x00\x80\x00\x00\x01", 5},
-    {"-2147483649", "\xff\x7f\xff\xff\xff", 5},
-    {"4294967295", "\x00\xff\xff\xff\xff", 5},
-    {"-4294967295", "\xff\x00\x00\x00\x01", 5},
-    {"4294967296", "\x01\x00\x00\x00\x00", 5},
-    {"-4294967296", "\xff\x00\x00\x00\x00", 5},
+    { "2147483647", "\x7f\xff\xff\xff", 4 },
+    { "-2147483647", "\x80\x00\x00\x01", 4 },
+    { "2147483648", "\x00\x80\x00\x00\x00", 5 },
+    { "-2147483648", "\x80\x00\x00\x00", 4 },
+    { "2147483649", "\x00\x80\x00\x00\x01", 5 },
+    { "-2147483649", "\xff\x7f\xff\xff\xff", 5 },
+    { "4294967295", "\x00\xff\xff\xff\xff", 5 },
+    { "-4294967295", "\xff\x00\x00\x00\x01", 5 },
+    { "4294967296", "\x01\x00\x00\x00\x00", 5 },
+    { "-4294967296", "\xff\x00\x00\x00\x00", 5 },
     /* 8 byte edge */
-    {"9223372036854775807", "\x7f\xff\xff\xff\xff\xff\xff\xff", 8},
-    {"-9223372036854775807", "\x80\x00\x00\x00\x00\x00\x00\x01", 8},
-    {"9223372036854775808", "\x00\x80\x00\x00\x00\x00\x00\x00\x00", 9},
-    {"-9223372036854775808", "\x80\x00\x00\x00\x00\x00\x00\x00", 8},
-    {"9223372036854775809", "\x00\x80\x00\x00\x00\x00\x00\x00\x01", 9},
-    {"-9223372036854775809", "\xff\x7f\xff\xff\xff\xff\xff\xff\xff", 9},
-    {"18446744073709551615", "\x00\xff\xff\xff\xff\xff\xff\xff\xff", 9},
-    {"-18446744073709551615", "\xff\x00\x00\x00\x00\x00\x00\x00\x01", 9},
-    {"18446744073709551616", "\x01\x00\x00\x00\x00\x00\x00\x00\x00", 9},
-    {"-18446744073709551616", "\xff\x00\x00\x00\x00\x00\x00\x00\x00", 9},
+    { "9223372036854775807", "\x7f\xff\xff\xff\xff\xff\xff\xff", 8 },
+    { "-9223372036854775807", "\x80\x00\x00\x00\x00\x00\x00\x01", 8 },
+    { "9223372036854775808", "\x00\x80\x00\x00\x00\x00\x00\x00\x00", 9 },
+    { "-9223372036854775808", "\x80\x00\x00\x00\x00\x00\x00\x00", 8 },
+    { "9223372036854775809", "\x00\x80\x00\x00\x00\x00\x00\x00\x01", 9 },
+    { "-9223372036854775809", "\xff\x7f\xff\xff\xff\xff\xff\xff\xff", 9 },
+    { "18446744073709551615", "\x00\xff\xff\xff\xff\xff\xff\xff\xff", 9 },
+    { "-18446744073709551615", "\xff\x00\x00\x00\x00\x00\x00\x00\x01", 9 },
+    { "18446744073709551616", "\x01\x00\x00\x00\x00\x00\x00\x00\x00", 9 },
+    { "-18446744073709551616", "\xff\x00\x00\x00\x00\x00\x00\x00\x00", 9 },
 };
 
 static int copy_reversed(uint8_t *dst, uint8_t *src, size_t len)
@@ -1943,7 +1946,7 @@ static int test_bn2signed(int i)
      */
     i = sizeof(scratch) - test->mpi_len;
     if (!TEST_int_eq(BN_signed_bn2bin(bn, scratch, sizeof(scratch)),
-                     sizeof(scratch))
+            sizeof(scratch))
         || !TEST_true(copy_reversed(reversed, scratch, sizeof(scratch)))
         || !TEST_mem_eq(test->mpi, test->mpi_len, scratch + i, test->mpi_len))
         goto err;
@@ -1970,7 +1973,7 @@ static int test_bn2signed(int i)
      */
     i = sizeof(reversed) - test->mpi_len;
     if (!TEST_int_eq(BN_signed_bn2lebin(bn, scratch, sizeof(scratch)),
-                     sizeof(scratch))
+            sizeof(scratch))
         || !TEST_true(copy_reversed(reversed, scratch, sizeof(scratch)))
         || !TEST_mem_eq(test->mpi, test->mpi_len, reversed + i, test->mpi_len))
         goto err;
@@ -1988,7 +1991,7 @@ static int test_bn2signed(int i)
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(bn2);
     BN_free(bn);
     return st;
@@ -2000,65 +2003,65 @@ static int test_dec2bn(void)
     int st = 0;
 
     if (!TEST_int_eq(parsedecBN(&bn, "0"), 1)
-            || !TEST_BN_eq_word(bn, 0)
-            || !TEST_BN_eq_zero(bn)
-            || !TEST_BN_le_zero(bn)
-            || !TEST_BN_ge_zero(bn)
-            || !TEST_BN_even(bn))
+        || !TEST_BN_eq_word(bn, 0)
+        || !TEST_BN_eq_zero(bn)
+        || !TEST_BN_le_zero(bn)
+        || !TEST_BN_ge_zero(bn)
+        || !TEST_BN_even(bn))
         goto err;
     BN_free(bn);
     bn = NULL;
 
     if (!TEST_int_eq(parsedecBN(&bn, "256"), 3)
-            || !TEST_BN_eq_word(bn, 256)
-            || !TEST_BN_ge_zero(bn)
-            || !TEST_BN_gt_zero(bn)
-            || !TEST_BN_ne_zero(bn)
-            || !TEST_BN_even(bn))
+        || !TEST_BN_eq_word(bn, 256)
+        || !TEST_BN_ge_zero(bn)
+        || !TEST_BN_gt_zero(bn)
+        || !TEST_BN_ne_zero(bn)
+        || !TEST_BN_even(bn))
         goto err;
     BN_free(bn);
     bn = NULL;
 
     if (!TEST_int_eq(parsedecBN(&bn, "-42"), 3)
-            || !TEST_BN_abs_eq_word(bn, 42)
-            || !TEST_BN_lt_zero(bn)
-            || !TEST_BN_le_zero(bn)
-            || !TEST_BN_ne_zero(bn)
-            || !TEST_BN_even(bn))
+        || !TEST_BN_abs_eq_word(bn, 42)
+        || !TEST_BN_lt_zero(bn)
+        || !TEST_BN_le_zero(bn)
+        || !TEST_BN_ne_zero(bn)
+        || !TEST_BN_even(bn))
         goto err;
     BN_free(bn);
     bn = NULL;
 
     if (!TEST_int_eq(parsedecBN(&bn, "1"), 1)
-            || !TEST_BN_eq_word(bn, 1)
-            || !TEST_BN_ne_zero(bn)
-            || !TEST_BN_gt_zero(bn)
-            || !TEST_BN_ge_zero(bn)
-            || !TEST_BN_eq_one(bn)
-            || !TEST_BN_odd(bn))
+        || !TEST_BN_eq_word(bn, 1)
+        || !TEST_BN_ne_zero(bn)
+        || !TEST_BN_gt_zero(bn)
+        || !TEST_BN_ge_zero(bn)
+        || !TEST_BN_eq_one(bn)
+        || !TEST_BN_odd(bn))
         goto err;
     BN_free(bn);
     bn = NULL;
 
     if (!TEST_int_eq(parsedecBN(&bn, "-0"), 2)
-            || !TEST_BN_eq_zero(bn)
-            || !TEST_BN_ge_zero(bn)
-            || !TEST_BN_le_zero(bn)
-            || !TEST_BN_even(bn))
+        || !TEST_BN_eq_zero(bn)
+        || !TEST_BN_ge_zero(bn)
+        || !TEST_BN_le_zero(bn)
+        || !TEST_BN_even(bn))
         goto err;
     BN_free(bn);
     bn = NULL;
 
     if (!TEST_int_eq(parsedecBN(&bn, "42trailing garbage is ignored"), 2)
-            || !TEST_BN_abs_eq_word(bn, 42)
-            || !TEST_BN_ge_zero(bn)
-            || !TEST_BN_gt_zero(bn)
-            || !TEST_BN_ne_zero(bn)
-            || !TEST_BN_even(bn))
+        || !TEST_BN_abs_eq_word(bn, 42)
+        || !TEST_BN_ge_zero(bn)
+        || !TEST_BN_gt_zero(bn)
+        || !TEST_BN_ne_zero(bn)
+        || !TEST_BN_even(bn))
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(bn);
     return st;
 }
@@ -2069,62 +2072,62 @@ static int test_hex2bn(void)
     int st = 0;
 
     if (!TEST_int_eq(parseBN(&bn, "0"), 1)
-            || !TEST_BN_eq_zero(bn)
-            || !TEST_BN_ge_zero(bn)
-            || !TEST_BN_even(bn))
+        || !TEST_BN_eq_zero(bn)
+        || !TEST_BN_ge_zero(bn)
+        || !TEST_BN_even(bn))
         goto err;
     BN_free(bn);
     bn = NULL;
 
     if (!TEST_int_eq(parseBN(&bn, "256"), 3)
-            || !TEST_BN_eq_word(bn, 0x256)
-            || !TEST_BN_ge_zero(bn)
-            || !TEST_BN_gt_zero(bn)
-            || !TEST_BN_ne_zero(bn)
-            || !TEST_BN_even(bn))
+        || !TEST_BN_eq_word(bn, 0x256)
+        || !TEST_BN_ge_zero(bn)
+        || !TEST_BN_gt_zero(bn)
+        || !TEST_BN_ne_zero(bn)
+        || !TEST_BN_even(bn))
         goto err;
     BN_free(bn);
     bn = NULL;
 
     if (!TEST_int_eq(parseBN(&bn, "-42"), 3)
-            || !TEST_BN_abs_eq_word(bn, 0x42)
-            || !TEST_BN_lt_zero(bn)
-            || !TEST_BN_le_zero(bn)
-            || !TEST_BN_ne_zero(bn)
-            || !TEST_BN_even(bn))
+        || !TEST_BN_abs_eq_word(bn, 0x42)
+        || !TEST_BN_lt_zero(bn)
+        || !TEST_BN_le_zero(bn)
+        || !TEST_BN_ne_zero(bn)
+        || !TEST_BN_even(bn))
         goto err;
     BN_free(bn);
     bn = NULL;
 
     if (!TEST_int_eq(parseBN(&bn, "cb"), 2)
-            || !TEST_BN_eq_word(bn, 0xCB)
-            || !TEST_BN_ge_zero(bn)
-            || !TEST_BN_gt_zero(bn)
-            || !TEST_BN_ne_zero(bn)
-            || !TEST_BN_odd(bn))
+        || !TEST_BN_eq_word(bn, 0xCB)
+        || !TEST_BN_ge_zero(bn)
+        || !TEST_BN_gt_zero(bn)
+        || !TEST_BN_ne_zero(bn)
+        || !TEST_BN_odd(bn))
         goto err;
     BN_free(bn);
     bn = NULL;
 
     if (!TEST_int_eq(parseBN(&bn, "-0"), 2)
-            || !TEST_BN_eq_zero(bn)
-            || !TEST_BN_ge_zero(bn)
-            || !TEST_BN_le_zero(bn)
-            || !TEST_BN_even(bn))
+        || !TEST_BN_eq_zero(bn)
+        || !TEST_BN_ge_zero(bn)
+        || !TEST_BN_le_zero(bn)
+        || !TEST_BN_even(bn))
         goto err;
     BN_free(bn);
     bn = NULL;
 
     if (!TEST_int_eq(parseBN(&bn, "abctrailing garbage is ignored"), 3)
-            || !TEST_BN_eq_word(bn, 0xabc)
-            || !TEST_BN_ge_zero(bn)
-            || !TEST_BN_gt_zero(bn)
-            || !TEST_BN_ne_zero(bn)
-            || !TEST_BN_even(bn))
+        || !TEST_BN_eq_word(bn, 0xabc)
+        || !TEST_BN_ge_zero(bn)
+        || !TEST_BN_gt_zero(bn)
+        || !TEST_BN_ne_zero(bn)
+        || !TEST_BN_even(bn))
         goto err;
     st = 1;
 
- err:
+err:
     BN_free(bn);
     return st;
 }
@@ -2138,58 +2141,58 @@ static int test_asc2bn(void)
         goto err;
 
     if (!TEST_true(BN_asc2bn(&bn, "0"))
-            || !TEST_BN_eq_zero(bn)
-            || !TEST_BN_ge_zero(bn))
+        || !TEST_BN_eq_zero(bn)
+        || !TEST_BN_ge_zero(bn))
         goto err;
 
     if (!TEST_true(BN_asc2bn(&bn, "256"))
-            || !TEST_BN_eq_word(bn, 256)
-            || !TEST_BN_ge_zero(bn))
+        || !TEST_BN_eq_word(bn, 256)
+        || !TEST_BN_ge_zero(bn))
         goto err;
 
     if (!TEST_true(BN_asc2bn(&bn, "-42"))
-            || !TEST_BN_abs_eq_word(bn, 42)
-            || !TEST_BN_lt_zero(bn))
+        || !TEST_BN_abs_eq_word(bn, 42)
+        || !TEST_BN_lt_zero(bn))
         goto err;
 
     if (!TEST_true(BN_asc2bn(&bn, "0x1234"))
-            || !TEST_BN_eq_word(bn, 0x1234)
-            || !TEST_BN_ge_zero(bn))
+        || !TEST_BN_eq_word(bn, 0x1234)
+        || !TEST_BN_ge_zero(bn))
         goto err;
 
     if (!TEST_true(BN_asc2bn(&bn, "0X1234"))
-            || !TEST_BN_eq_word(bn, 0x1234)
-            || !TEST_BN_ge_zero(bn))
+        || !TEST_BN_eq_word(bn, 0x1234)
+        || !TEST_BN_ge_zero(bn))
         goto err;
 
     if (!TEST_true(BN_asc2bn(&bn, "-0xabcd"))
-            || !TEST_BN_abs_eq_word(bn, 0xabcd)
-            || !TEST_BN_lt_zero(bn))
+        || !TEST_BN_abs_eq_word(bn, 0xabcd)
+        || !TEST_BN_lt_zero(bn))
         goto err;
 
     if (!TEST_true(BN_asc2bn(&bn, "-0"))
-            || !TEST_BN_eq_zero(bn)
-            || !TEST_BN_ge_zero(bn))
+        || !TEST_BN_eq_zero(bn)
+        || !TEST_BN_ge_zero(bn))
         goto err;
 
     if (!TEST_true(BN_asc2bn(&bn, "123trailing garbage is ignored"))
-            || !TEST_BN_eq_word(bn, 123)
-            || !TEST_BN_ge_zero(bn))
+        || !TEST_BN_eq_word(bn, 123)
+        || !TEST_BN_ge_zero(bn))
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(bn);
     return st;
 }
 
 static const MPITEST kMPITests[] = {
-    {"0", "\x00\x00\x00\x00", 4},
-    {"1", "\x00\x00\x00\x01\x01", 5},
-    {"-1", "\x00\x00\x00\x01\x81", 5},
-    {"128", "\x00\x00\x00\x02\x00\x80", 6},
-    {"256", "\x00\x00\x00\x02\x01\x00", 6},
-    {"-256", "\x00\x00\x00\x02\x81\x00", 6},
+    { "0", "\x00\x00\x00\x00", 4 },
+    { "1", "\x00\x00\x00\x01\x01", 5 },
+    { "-1", "\x00\x00\x00\x01\x81", 5 },
+    { "128", "\x00\x00\x00\x02\x00\x80", 6 },
+    { "256", "\x00\x00\x00\x02\x01\x00", 6 },
+    { "-256", "\x00\x00\x00\x02\x81\x00", 6 },
 };
 
 static int test_mpi(int i)
@@ -2202,14 +2205,14 @@ static int test_mpi(int i)
     int st = 0;
 
     if (!TEST_ptr(bn = BN_new())
-            || !TEST_true(BN_asc2bn(&bn, test->base10)))
+        || !TEST_true(BN_asc2bn(&bn, test->base10)))
         goto err;
     mpi_len = BN_bn2mpi(bn, NULL);
     if (!TEST_size_t_le(mpi_len, sizeof(scratch)))
         goto err;
 
     if (!TEST_size_t_eq(mpi_len2 = BN_bn2mpi(bn, scratch), mpi_len)
-            || !TEST_mem_eq(test->mpi, test->mpi_len, scratch, mpi_len))
+        || !TEST_mem_eq(test->mpi, test->mpi_len, scratch, mpi_len))
         goto err;
 
     if (!TEST_ptr(bn2 = BN_mpi2bn(scratch, mpi_len, NULL)))
@@ -2222,7 +2225,7 @@ static int test_mpi(int i)
     BN_free(bn2);
 
     st = 1;
- err:
+err:
     BN_free(bn);
     return st;
 }
@@ -2236,14 +2239,14 @@ static int test_bin2zero(void)
     if (!TEST_ptr(zbn = BN_new()))
         goto err;
 
-#define zerotest(fn)                           \
+#define zerotest(fn)                    \
     if (!TEST_ptr(fn(input, 1, zbn))    \
-        || !TEST_true(BN_is_zero(zbn))   \
+        || !TEST_true(BN_is_zero(zbn))  \
         || !TEST_ptr(fn(input, 0, zbn)) \
-        || !TEST_true(BN_is_zero(zbn))   \
+        || !TEST_true(BN_is_zero(zbn))  \
         || !TEST_ptr(fn(NULL, 0, zbn))  \
-        || !TEST_true(BN_is_zero(zbn)))  \
-        goto err
+        || !TEST_true(BN_is_zero(zbn))) \
+    goto err
 
     zerotest(BN_bin2bn);
     zerotest(BN_signed_bin2bn);
@@ -2252,7 +2255,7 @@ static int test_bin2zero(void)
 #undef zerotest
 
     ret = 1;
- err:
+err:
     BN_free(zbn);
     return ret;
 }
@@ -2272,13 +2275,13 @@ static int test_bin2bn_lengths(void)
         || !TEST_true(BN_set_word(bn_expected_le, 0x201)))
         goto err;
 
-#define lengthtest(fn, e)                                       \
-    if (!TEST_ptr_null(fn(input, -1, bn_##e))                   \
-        || !TEST_ptr(fn(input, 0, bn_##e))                      \
-        || !TEST_true(BN_is_zero(bn_##e))                       \
-        || !TEST_ptr(fn(input, 2, bn_##e))                      \
-        || !TEST_int_eq(BN_cmp(bn_##e, bn_expected_##e), 0))    \
-        goto err
+#define lengthtest(fn, e)                                    \
+    if (!TEST_ptr_null(fn(input, -1, bn_##e))                \
+        || !TEST_ptr(fn(input, 0, bn_##e))                   \
+        || !TEST_true(BN_is_zero(bn_##e))                    \
+        || !TEST_ptr(fn(input, 2, bn_##e))                   \
+        || !TEST_int_eq(BN_cmp(bn_##e, bn_expected_##e), 0)) \
+    goto err
 
     lengthtest(BN_bin2bn, be);
     lengthtest(BN_signed_bin2bn, be);
@@ -2287,7 +2290,7 @@ static int test_bin2bn_lengths(void)
 #undef lengthtest
 
     ret = 1;
- err:
+err:
     BN_free(bn_be);
     BN_free(bn_expected_be);
     BN_free(bn_le);
@@ -2304,19 +2307,19 @@ static int test_rand(void)
         return 0;
 
     /* Test BN_rand for degenerate cases with |top| and |bottom| parameters. */
-    if (!TEST_false(BN_rand(bn, 0, 0 /* top */ , 0 /* bottom */ ))
-            || !TEST_false(BN_rand(bn, 0, 1 /* top */ , 1 /* bottom */ ))
-            || !TEST_true(BN_rand(bn, 1, 0 /* top */ , 0 /* bottom */ ))
-            || !TEST_BN_eq_one(bn)
-            || !TEST_false(BN_rand(bn, 1, 1 /* top */ , 0 /* bottom */ ))
-            || !TEST_true(BN_rand(bn, 1, -1 /* top */ , 1 /* bottom */ ))
-            || !TEST_BN_eq_one(bn)
-            || !TEST_true(BN_rand(bn, 2, 1 /* top */ , 0 /* bottom */ ))
-            || !TEST_BN_eq_word(bn, 3))
+    if (!TEST_false(BN_rand(bn, 0, 0 /* top */, 0 /* bottom */))
+        || !TEST_false(BN_rand(bn, 0, 1 /* top */, 1 /* bottom */))
+        || !TEST_true(BN_rand(bn, 1, 0 /* top */, 0 /* bottom */))
+        || !TEST_BN_eq_one(bn)
+        || !TEST_false(BN_rand(bn, 1, 1 /* top */, 0 /* bottom */))
+        || !TEST_true(BN_rand(bn, 1, -1 /* top */, 1 /* bottom */))
+        || !TEST_BN_eq_one(bn)
+        || !TEST_true(BN_rand(bn, 2, 1 /* top */, 0 /* bottom */))
+        || !TEST_BN_eq_word(bn, 3))
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(bn);
     return st;
 }
@@ -2376,7 +2379,7 @@ static int test_rand_range_single(size_t n)
     if (sum > critical) {
         TEST_info("Chi^2 test negative %.4f > %4.f", sum, critical);
         TEST_note("test case %zu  range %u  iterations %u", n + 1, range,
-                  iterations);
+            iterations);
         goto err;
     }
 
@@ -2408,9 +2411,9 @@ static int test_negzero(void)
     int consttime, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b = BN_new())
-            || !TEST_ptr(c = BN_new())
-            || !TEST_ptr(d = BN_new()))
+        || !TEST_ptr(b = BN_new())
+        || !TEST_ptr(c = BN_new())
+        || !TEST_ptr(d = BN_new()))
         goto err;
 
     /* Test that BN_mul never gives negative zero. */
@@ -2421,12 +2424,12 @@ static int test_negzero(void)
     if (!TEST_true(BN_mul(c, a, b, ctx)))
         goto err;
     if (!TEST_BN_eq_zero(c)
-            || !TEST_BN_ge_zero(c))
+        || !TEST_BN_ge_zero(c))
         goto err;
 
     for (consttime = 0; consttime < 2; consttime++) {
         if (!TEST_ptr(numerator = BN_new())
-                || !TEST_ptr(denominator = BN_new()))
+            || !TEST_ptr(denominator = BN_new()))
             goto err;
         if (consttime) {
             BN_set_flags(numerator, BN_FLG_CONSTTIME);
@@ -2434,19 +2437,19 @@ static int test_negzero(void)
         }
         /* Test that BN_div never gives negative zero in the quotient. */
         if (!TEST_true(BN_set_word(numerator, 1))
-                || !TEST_true(BN_set_word(denominator, 2)))
+            || !TEST_true(BN_set_word(denominator, 2)))
             goto err;
         BN_set_negative(numerator, 1);
         if (!TEST_true(BN_div(a, b, numerator, denominator, ctx))
-                || !TEST_BN_eq_zero(a)
-                || !TEST_BN_ge_zero(a))
+            || !TEST_BN_eq_zero(a)
+            || !TEST_BN_ge_zero(a))
             goto err;
 
         /* Test that BN_div never gives negative zero in the remainder. */
         if (!TEST_true(BN_set_word(denominator, 1))
-                || !TEST_true(BN_div(a, b, numerator, denominator, ctx))
-                || !TEST_BN_eq_zero(b)
-                || !TEST_BN_ge_zero(b))
+            || !TEST_true(BN_div(a, b, numerator, denominator, ctx))
+            || !TEST_BN_eq_zero(b)
+            || !TEST_BN_ge_zero(b))
             goto err;
         BN_free(numerator);
         BN_free(denominator);
@@ -2460,7 +2463,7 @@ static int test_negzero(void)
         goto err;
     st = 1;
 
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(c);
@@ -2477,9 +2480,9 @@ static int test_badmod(void)
     int st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b = BN_new())
-            || !TEST_ptr(zero = BN_new())
-            || !TEST_ptr(mont = BN_MONT_CTX_new()))
+        || !TEST_ptr(b = BN_new())
+        || !TEST_ptr(zero = BN_new())
+        || !TEST_ptr(mont = BN_MONT_CTX_new()))
         goto err;
     BN_zero(zero);
 
@@ -2496,12 +2499,12 @@ static int test_badmod(void)
     ERR_clear_error();
 
     if (!TEST_false(BN_mod_exp_mont(a, BN_value_one(), BN_value_one(),
-                                    zero, ctx, NULL)))
+            zero, ctx, NULL)))
         goto err;
     ERR_clear_error();
 
     if (!TEST_false(BN_mod_exp_mont_consttime(a, BN_value_one(), BN_value_one(),
-                                              zero, ctx, NULL)))
+            zero, ctx, NULL)))
         goto err;
     ERR_clear_error();
 
@@ -2518,17 +2521,17 @@ static int test_badmod(void)
     ERR_clear_error();
 
     if (!TEST_false(BN_mod_exp_mont(a, BN_value_one(), BN_value_one(),
-                                    b, ctx, NULL)))
+            b, ctx, NULL)))
         goto err;
     ERR_clear_error();
 
     if (!TEST_false(BN_mod_exp_mont_consttime(a, BN_value_one(), BN_value_one(),
-                                              b, ctx, NULL)))
+            b, ctx, NULL)))
         goto err;
     ERR_clear_error();
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(zero);
@@ -2542,27 +2545,27 @@ static int test_expmodzero(void)
     int st = 0;
 
     if (!TEST_ptr(zero = BN_new())
-            || !TEST_ptr(a = BN_new())
-            || !TEST_ptr(r = BN_new()))
+        || !TEST_ptr(a = BN_new())
+        || !TEST_ptr(r = BN_new()))
         goto err;
     BN_zero(zero);
 
     if (!TEST_true(BN_mod_exp(r, a, zero, BN_value_one(), NULL))
-            || !TEST_BN_eq_zero(r)
-            || !TEST_true(BN_mod_exp_mont(r, a, zero, BN_value_one(),
-                                          NULL, NULL))
-            || !TEST_BN_eq_zero(r)
-            || !TEST_true(BN_mod_exp_mont_consttime(r, a, zero,
-                                                    BN_value_one(),
-                                                    NULL, NULL))
-            || !TEST_BN_eq_zero(r)
-            || !TEST_true(BN_mod_exp_mont_word(r, 42, zero,
-                                               BN_value_one(), NULL, NULL))
-            || !TEST_BN_eq_zero(r))
+        || !TEST_BN_eq_zero(r)
+        || !TEST_true(BN_mod_exp_mont(r, a, zero, BN_value_one(),
+            NULL, NULL))
+        || !TEST_BN_eq_zero(r)
+        || !TEST_true(BN_mod_exp_mont_consttime(r, a, zero,
+            BN_value_one(),
+            NULL, NULL))
+        || !TEST_BN_eq_zero(r)
+        || !TEST_true(BN_mod_exp_mont_word(r, 42, zero,
+            BN_value_one(), NULL, NULL))
+        || !TEST_BN_eq_zero(r))
         goto err;
 
     st = 1;
- err:
+err:
     BN_free(zero);
     BN_free(a);
     BN_free(r);
@@ -2578,29 +2581,29 @@ static int test_expmodone(void)
     BIGNUM *m = BN_new();
 
     if (!TEST_ptr(r)
-            || !TEST_ptr(a)
-            || !TEST_ptr(p)
-            || !TEST_ptr(p)
-            || !TEST_ptr(m)
-            || !TEST_true(BN_set_word(a, 1))
-            || !TEST_true(BN_set_word(p, 0))
-            || !TEST_true(BN_set_word(m, 1)))
+        || !TEST_ptr(a)
+        || !TEST_ptr(p)
+        || !TEST_ptr(p)
+        || !TEST_ptr(m)
+        || !TEST_true(BN_set_word(a, 1))
+        || !TEST_true(BN_set_word(p, 0))
+        || !TEST_true(BN_set_word(m, 1)))
         goto err;
 
     /* Calculate r = 1 ^ 0 mod 1, and check the result is always 0 */
     for (i = 0; i < 2; i++) {
         if (!TEST_true(BN_mod_exp(r, a, p, m, NULL))
-                || !TEST_BN_eq_zero(r)
-                || !TEST_true(BN_mod_exp_mont(r, a, p, m, NULL, NULL))
-                || !TEST_BN_eq_zero(r)
-                || !TEST_true(BN_mod_exp_mont_consttime(r, a, p, m, NULL, NULL))
-                || !TEST_BN_eq_zero(r)
-                || !TEST_true(BN_mod_exp_mont_word(r, 1, p, m, NULL, NULL))
-                || !TEST_BN_eq_zero(r)
-                || !TEST_true(BN_mod_exp_simple(r, a, p, m, NULL))
-                || !TEST_BN_eq_zero(r)
-                || !TEST_true(BN_mod_exp_recp(r, a, p, m, NULL))
-                || !TEST_BN_eq_zero(r))
+            || !TEST_BN_eq_zero(r)
+            || !TEST_true(BN_mod_exp_mont(r, a, p, m, NULL, NULL))
+            || !TEST_BN_eq_zero(r)
+            || !TEST_true(BN_mod_exp_mont_consttime(r, a, p, m, NULL, NULL))
+            || !TEST_BN_eq_zero(r)
+            || !TEST_true(BN_mod_exp_mont_word(r, 1, p, m, NULL, NULL))
+            || !TEST_BN_eq_zero(r)
+            || !TEST_true(BN_mod_exp_simple(r, a, p, m, NULL))
+            || !TEST_BN_eq_zero(r)
+            || !TEST_true(BN_mod_exp_recp(r, a, p, m, NULL))
+            || !TEST_BN_eq_zero(r))
             goto err;
         /* Repeat for r = 1 ^ 0 mod -1 */
         if (i == 0)
@@ -2608,7 +2611,7 @@ static int test_expmodone(void)
     }
 
     ret = 1;
- err:
+err:
     BN_free(r);
     BN_free(a);
     BN_free(p);
@@ -2626,17 +2629,17 @@ static int test_smallprime(int kBits)
 
     if (kBits <= 1) {
         if (!TEST_false(BN_generate_prime_ex(r, kBits, 0,
-                                             NULL, NULL, NULL)))
+                NULL, NULL, NULL)))
             goto err;
     } else {
         if (!TEST_true(BN_generate_prime_ex(r, kBits, 0,
-                                            NULL, NULL, NULL))
-                || !TEST_int_eq(BN_num_bits(r), kBits))
+                NULL, NULL, NULL))
+            || !TEST_int_eq(BN_num_bits(r), kBits))
             goto err;
     }
 
     st = 1;
- err:
+err:
     BN_free(r);
     return st;
 }
@@ -2651,17 +2654,17 @@ static int test_smallsafeprime(int kBits)
 
     if (kBits <= 5 && kBits != 3) {
         if (!TEST_false(BN_generate_prime_ex(r, kBits, 1,
-                                             NULL, NULL, NULL)))
+                NULL, NULL, NULL)))
             goto err;
     } else {
         if (!TEST_true(BN_generate_prime_ex(r, kBits, 1,
-                                            NULL, NULL, NULL))
-                || !TEST_int_eq(BN_num_bits(r), kBits))
+                NULL, NULL, NULL))
+            || !TEST_int_eq(BN_num_bits(r), kBits))
             goto err;
     }
 
     st = 1;
- err:
+err:
     BN_free(r);
     return st;
 }
@@ -2679,13 +2682,13 @@ static int test_is_prime(int i)
 
     for (trial = 0; trial <= 1; ++trial) {
         if (!TEST_true(BN_set_word(r, primes[i]))
-                || !TEST_int_eq(BN_check_prime(r, ctx, NULL),
-                                1))
+            || !TEST_int_eq(BN_check_prime(r, ctx, NULL),
+                1))
             goto err;
     }
 
     ret = 1;
- err:
+err:
     BN_free(r);
     return ret;
 }
@@ -2703,12 +2706,12 @@ static int test_not_prime(int i)
 
     for (trial = 0; trial <= 1; ++trial) {
         if (!TEST_true(BN_set_word(r, not_primes[i]))
-                || !TEST_int_eq(BN_check_prime(r, ctx, NULL), 0))
+            || !TEST_int_eq(BN_check_prime(r, ctx, NULL), 0))
             goto err;
     }
 
     ret = 1;
- err:
+err:
     BN_free(r);
     return ret;
 }
@@ -2728,7 +2731,7 @@ static int test_ctx_set_ct_flag(BN_CTX *c)
     }
 
     st = 1;
- err:
+err:
     BN_CTX_end(c);
     return st;
 }
@@ -2748,7 +2751,7 @@ static int test_ctx_check_ct_flag(BN_CTX *c)
     }
 
     st = 1;
- err:
+err:
     BN_CTX_end(c);
     return st;
 }
@@ -2782,18 +2785,18 @@ static int test_ctx_consttime_flag(void)
     int st = 0;
 
     if (!TEST_ptr(nctx = BN_CTX_new())
-            || !TEST_ptr(sctx = BN_CTX_secure_new()))
+        || !TEST_ptr(sctx = BN_CTX_secure_new()))
         goto err;
 
     for (i = 0; i < 2; i++) {
         BN_CTX *c = i == 0 ? nctx : sctx;
         if (!TEST_true(test_ctx_set_ct_flag(c))
-                || !TEST_true(test_ctx_check_ct_flag(c)))
+            || !TEST_true(test_ctx_check_ct_flag(c)))
             goto err;
     }
 
     st = 1;
- err:
+err:
     BN_CTX_free(nctx);
     BN_CTX_free(sctx);
     return st;
@@ -2805,14 +2808,14 @@ static int test_coprime(void)
     int ret = 0;
 
     ret = TEST_ptr(a = BN_new())
-          && TEST_ptr(b = BN_new())
-          && TEST_true(BN_set_word(a, 66))
-          && TEST_true(BN_set_word(b, 99))
-          && TEST_int_eq(BN_are_coprime(a, b, ctx), 0)
-          && TEST_int_eq(BN_are_coprime(b, a, ctx), 0)
-          && TEST_true(BN_set_word(a, 67))
-          && TEST_int_eq(BN_are_coprime(a, b, ctx), 1)
-          && TEST_int_eq(BN_are_coprime(b, a, ctx), 1);
+        && TEST_ptr(b = BN_new())
+        && TEST_true(BN_set_word(a, 66))
+        && TEST_true(BN_set_word(b, 99))
+        && TEST_int_eq(BN_are_coprime(a, b, ctx), 0)
+        && TEST_int_eq(BN_are_coprime(b, a, ctx), 0)
+        && TEST_true(BN_set_word(a, 67))
+        && TEST_int_eq(BN_are_coprime(a, b, ctx), 1)
+        && TEST_int_eq(BN_are_coprime(b, a, ctx), 1);
     BN_free(a);
     BN_free(b);
     return ret;
@@ -2824,23 +2827,23 @@ static int test_gcd_prime(void)
     int i, st = 0;
 
     if (!TEST_ptr(a = BN_new())
-            || !TEST_ptr(b = BN_new())
-            || !TEST_ptr(gcd = BN_new()))
+        || !TEST_ptr(b = BN_new())
+        || !TEST_ptr(gcd = BN_new()))
         goto err;
 
     if (!TEST_true(BN_generate_prime_ex(a, 1024, 0, NULL, NULL, NULL)))
-            goto err;
+        goto err;
     for (i = 0; i < NUM_PRIME_TESTS; i++) {
         if (!TEST_true(BN_generate_prime_ex(b, 1024, 0,
-                                            NULL, NULL, NULL))
-                || !TEST_true(BN_gcd(gcd, a, b, ctx))
-                || !TEST_true(BN_is_one(gcd))
-                || !TEST_true(BN_are_coprime(a, b, ctx)))
+                NULL, NULL, NULL))
+            || !TEST_true(BN_gcd(gcd, a, b, ctx))
+            || !TEST_true(BN_is_one(gcd))
+            || !TEST_true(BN_are_coprime(a, b, ctx)))
             goto err;
     }
 
     st = 1;
- err:
+err:
     BN_free(a);
     BN_free(b);
     BN_free(gcd);
@@ -2855,219 +2858,202 @@ typedef struct mod_exp_test_st {
 } MOD_EXP_TEST;
 
 static const MOD_EXP_TEST ModExpTests[] = {
-   /* original test vectors for rsaz_512_sqr bug, by OSS-Fuzz */
-   {
-       "1166180238001879113042182292626169621106255558914000595999312084"
-       "4627946820899490684928760491249738643524880720584249698100907201"
-       "002086675047927600340800371",
-       "8000000000000000000000000000000000000000000000000000000000000000"
-       "0000000000000000000000000000000000000000000000000000000000000000"
-       "00000000",
-       "1340780792684523720980737645613191762604395855615117867483316354"
-       "3294276330515137663421134775482798690129946803802212663956180562"
-       "088664022929883876655300863",
-       "8243904058268085430037326628480645845409758077568738532059032482"
-       "8294114415890603594730158120426756266457928475330450251339773498"
-       "26758407619521544102068438"
-   },
-   {
-       "4974270041410803822078866696159586946995877618987010219312844726"
-       "0284386121835740784990869050050504348861513337232530490826340663"
-       "197278031692737429054",
-       "4974270041410803822078866696159586946995877428188754995041148539"
-       "1663243362592271353668158565195557417149981094324650322556843202"
-       "946445882670777892608",
-       "1340780716511420227215592830971452482815377482627251725537099028"
-       "4429769497230131760206012644403029349547320953206103351725462999"
-       "947509743623340557059752191",
-       "5296244594780707015616522701706118082963369547253192207884519362"
-       "1767869984947542695665420219028522815539559194793619684334900442"
-       "49304558011362360473525933"
-   },
-   /* test vectors for rsaz_512_srq bug, with rcx/rbx=1 */
-   {   /* between first and second iteration */
-       "5148719036160389201525610950887605325980251964889646556085286545"
-       "3931548809178823413169359635978762036512397113080988070677858033"
-       "36463909753993540214027190",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042158",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042159",
-       "1"
-   },
-   {   /* between second and third iteration */
-       "8908340854353752577419678771330460827942371434853054158622636544"
-       "8151360109722890949471912566649465436296659601091730745087014189"
-       "2672764191218875181826063",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042158",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042159",
-       "1"
-   },
-   {   /* between third and fourth iteration */
-       "3427446396505596330634350984901719674479522569002785244080234738"
-       "4288743635435746136297299366444548736533053717416735379073185344"
-       "26985272974404612945608761",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042158",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042159",
-       "1"
-   },
-   {   /* between fourth and fifth iteration */
-       "3472743044917564564078857826111874560045331237315597383869652985"
-       "6919870028890895988478351133601517365908445058405433832718206902"
-       "4088133164805266956353542",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042158",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042159",
-       "1"
-   },
-   {   /* between fifth and sixth iteration */
-       "3608632990153469264412378349742339216742409743898601587274768025"
-       "0110772032985643555192767717344946174122842255204082586753499651"
-       "14483434992887431333675068",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042158",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042159",
-       "1"
-   },
-   {   /* between sixth and seventh iteration */
-       "8455374370234070242910508226941981520235709767260723212165264877"
-       "8689064388017521524568434328264431772644802567028663962962025746"
-       "9283458217850119569539086",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042158",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042159",
-       "1"
-   },
-   {   /* between seventh and eighth iteration */
-       "5155371529688532178421209781159131443543419764974688878527112131"
-       "7446518205609427412336183157918981038066636807317733319323257603"
-       "04416292040754017461076359",
-       "1005585594745694782468051874865438459560952436544429503329267108"
-       "2791323022555160232601405723625177570767523893639864538140315412"
-       "108959927459825236754563832",
-       "1005585594745694782468051874865438459560952436544429503329267108"
-       "2791323022555160232601405723625177570767523893639864538140315412"
-       "108959927459825236754563833",
-       "1"
-   },
-   /* test vectors for rsaz_512_srq bug, with rcx/rbx=2 */
-   {   /* between first and second iteration */
-       "3155666506033786929967309937640790361084670559125912405342594979"
-       "4345142818528956285490897841406338022378565972533508820577760065"
-       "58494345853302083699912572",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042158",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042159",
-       "1"
-   },
-   {   /* between second and third iteration */
-       "3789819583801342198190405714582958759005991915505282362397087750"
-       "4213544724644823098843135685133927198668818185338794377239590049"
-       "41019388529192775771488319",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042158",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042159",
-       "1"
-   },
-   {   /* between third and forth iteration */
-       "4695752552040706867080542538786056470322165281761525158189220280"
-       "4025547447667484759200742764246905647644662050122968912279199065"
-       "48065034299166336940507214",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042158",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042159",
-       "1"
-   },
-   {   /* between forth and fifth iteration */
-       "2159140240970485794188159431017382878636879856244045329971239574"
-       "8919691133560661162828034323196457386059819832804593989740268964"
-       "74502911811812651475927076",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042158",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042159",
-       "1"
-   },
-   {   /* between fifth and sixth iteration */
-       "5239312332984325668414624633307915097111691815000872662334695514"
-       "5436533521392362443557163429336808208137221322444780490437871903"
-       "99972784701334569424519255",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042158",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042159",
-       "1"
-   },
-   {   /* between sixth and seventh iteration */
-       "1977953647322612860406858017869125467496941904523063466791308891"
-       "1172796739058531929470539758361774569875505293428856181093904091"
-       "33788264851714311303725089",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042158",
-       "6703903964971298549787012499102923063739682910296196688861780721"
-       "8608820150367734884009371490834517138450159290932430254268769414"
-       "05973284973216824503042159",
-       "1"
-   },
-   {   /* between seventh and eighth iteration */
-       "6456987954117763835533395796948878140715006860263624787492985786"
-       "8514630216966738305923915688821526449499763719943997120302368211"
-       "04813318117996225041943964",
-       "1340780792994259709957402499820584612747936582059239337772356144"
-       "3721764030073546976801874298166903427690031858186486050853753882"
-       "811946551499689575296532556",
-       "1340780792994259709957402499820584612747936582059239337772356144"
-       "3721764030073546976801874298166903427690031858186486050853753882"
-       "811946551499689575296532557",
-       "1"
-   }
+    /* original test vectors for rsaz_512_sqr bug, by OSS-Fuzz */
+    {
+        "1166180238001879113042182292626169621106255558914000595999312084"
+        "4627946820899490684928760491249738643524880720584249698100907201"
+        "002086675047927600340800371",
+        "8000000000000000000000000000000000000000000000000000000000000000"
+        "0000000000000000000000000000000000000000000000000000000000000000"
+        "00000000",
+        "1340780792684523720980737645613191762604395855615117867483316354"
+        "3294276330515137663421134775482798690129946803802212663956180562"
+        "088664022929883876655300863",
+        "8243904058268085430037326628480645845409758077568738532059032482"
+        "8294114415890603594730158120426756266457928475330450251339773498"
+        "26758407619521544102068438" },
+    { "4974270041410803822078866696159586946995877618987010219312844726"
+      "0284386121835740784990869050050504348861513337232530490826340663"
+      "197278031692737429054",
+        "4974270041410803822078866696159586946995877428188754995041148539"
+        "1663243362592271353668158565195557417149981094324650322556843202"
+        "946445882670777892608",
+        "1340780716511420227215592830971452482815377482627251725537099028"
+        "4429769497230131760206012644403029349547320953206103351725462999"
+        "947509743623340557059752191",
+        "5296244594780707015616522701706118082963369547253192207884519362"
+        "1767869984947542695665420219028522815539559194793619684334900442"
+        "49304558011362360473525933" },
+    /* test vectors for rsaz_512_srq bug, with rcx/rbx=1 */
+    { /* between first and second iteration */
+        "5148719036160389201525610950887605325980251964889646556085286545"
+        "3931548809178823413169359635978762036512397113080988070677858033"
+        "36463909753993540214027190",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042158",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042159",
+        "1" },
+    { /* between second and third iteration */
+        "8908340854353752577419678771330460827942371434853054158622636544"
+        "8151360109722890949471912566649465436296659601091730745087014189"
+        "2672764191218875181826063",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042158",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042159",
+        "1" },
+    { /* between third and fourth iteration */
+        "3427446396505596330634350984901719674479522569002785244080234738"
+        "4288743635435746136297299366444548736533053717416735379073185344"
+        "26985272974404612945608761",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042158",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042159",
+        "1" },
+    { /* between fourth and fifth iteration */
+        "3472743044917564564078857826111874560045331237315597383869652985"
+        "6919870028890895988478351133601517365908445058405433832718206902"
+        "4088133164805266956353542",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042158",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042159",
+        "1" },
+    { /* between fifth and sixth iteration */
+        "3608632990153469264412378349742339216742409743898601587274768025"
+        "0110772032985643555192767717344946174122842255204082586753499651"
+        "14483434992887431333675068",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042158",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042159",
+        "1" },
+    { /* between sixth and seventh iteration */
+        "8455374370234070242910508226941981520235709767260723212165264877"
+        "8689064388017521524568434328264431772644802567028663962962025746"
+        "9283458217850119569539086",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042158",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042159",
+        "1" },
+    { /* between seventh and eighth iteration */
+        "5155371529688532178421209781159131443543419764974688878527112131"
+        "7446518205609427412336183157918981038066636807317733319323257603"
+        "04416292040754017461076359",
+        "1005585594745694782468051874865438459560952436544429503329267108"
+        "2791323022555160232601405723625177570767523893639864538140315412"
+        "108959927459825236754563832",
+        "1005585594745694782468051874865438459560952436544429503329267108"
+        "2791323022555160232601405723625177570767523893639864538140315412"
+        "108959927459825236754563833",
+        "1" },
+    /* test vectors for rsaz_512_srq bug, with rcx/rbx=2 */
+    { /* between first and second iteration */
+        "3155666506033786929967309937640790361084670559125912405342594979"
+        "4345142818528956285490897841406338022378565972533508820577760065"
+        "58494345853302083699912572",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042158",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042159",
+        "1" },
+    { /* between second and third iteration */
+        "3789819583801342198190405714582958759005991915505282362397087750"
+        "4213544724644823098843135685133927198668818185338794377239590049"
+        "41019388529192775771488319",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042158",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042159",
+        "1" },
+    { /* between third and forth iteration */
+        "4695752552040706867080542538786056470322165281761525158189220280"
+        "4025547447667484759200742764246905647644662050122968912279199065"
+        "48065034299166336940507214",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042158",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042159",
+        "1" },
+    { /* between forth and fifth iteration */
+        "2159140240970485794188159431017382878636879856244045329971239574"
+        "8919691133560661162828034323196457386059819832804593989740268964"
+        "74502911811812651475927076",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042158",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042159",
+        "1" },
+    { /* between fifth and sixth iteration */
+        "5239312332984325668414624633307915097111691815000872662334695514"
+        "5436533521392362443557163429336808208137221322444780490437871903"
+        "99972784701334569424519255",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042158",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042159",
+        "1" },
+    { /* between sixth and seventh iteration */
+        "1977953647322612860406858017869125467496941904523063466791308891"
+        "1172796739058531929470539758361774569875505293428856181093904091"
+        "33788264851714311303725089",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042158",
+        "6703903964971298549787012499102923063739682910296196688861780721"
+        "8608820150367734884009371490834517138450159290932430254268769414"
+        "05973284973216824503042159",
+        "1" },
+    { /* between seventh and eighth iteration */
+        "6456987954117763835533395796948878140715006860263624787492985786"
+        "8514630216966738305923915688821526449499763719943997120302368211"
+        "04813318117996225041943964",
+        "1340780792994259709957402499820584612747936582059239337772356144"
+        "3721764030073546976801874298166903427690031858186486050853753882"
+        "811946551499689575296532556",
+        "1340780792994259709957402499820584612747936582059239337772356144"
+        "3721764030073546976801874298166903427690031858186486050853753882"
+        "811946551499689575296532557",
+        "1" }
 };
 
 static int test_mod_exp(int i)
 {
     const MOD_EXP_TEST *test = &ModExpTests[i];
     int res = 0;
-    BIGNUM* result = NULL;
+    BIGNUM *result = NULL;
     BIGNUM *base = NULL, *exponent = NULL, *modulo = NULL;
     char *s = NULL;
 
     if (!TEST_ptr(result = BN_new())
-            || !TEST_true(BN_dec2bn(&base, test->base))
-            || !TEST_true(BN_dec2bn(&exponent, test->exp))
-            || !TEST_true(BN_dec2bn(&modulo, test->mod)))
+        || !TEST_true(BN_dec2bn(&base, test->base))
+        || !TEST_true(BN_dec2bn(&exponent, test->exp))
+        || !TEST_true(BN_dec2bn(&modulo, test->mod)))
         goto err;
 
     if (!TEST_int_eq(BN_mod_exp(result, base, exponent, modulo, ctx), 1))
@@ -3081,7 +3067,7 @@ static int test_mod_exp(int i)
 
     res = 1;
 
- err:
+err:
     OPENSSL_free(s);
     BN_free(result);
     BN_free(base);
@@ -3094,14 +3080,14 @@ static int test_mod_exp_consttime(int i)
 {
     const MOD_EXP_TEST *test = &ModExpTests[i];
     int res = 0;
-    BIGNUM* result = NULL;
+    BIGNUM *result = NULL;
     BIGNUM *base = NULL, *exponent = NULL, *modulo = NULL;
     char *s = NULL;
 
     if (!TEST_ptr(result = BN_new())
-            || !TEST_true(BN_dec2bn(&base, test->base))
-            || !TEST_true(BN_dec2bn(&exponent, test->exp))
-            || !TEST_true(BN_dec2bn(&modulo, test->mod)))
+        || !TEST_true(BN_dec2bn(&base, test->base))
+        || !TEST_true(BN_dec2bn(&exponent, test->exp))
+        || !TEST_true(BN_dec2bn(&modulo, test->mod)))
         goto err;
 
     BN_set_flags(base, BN_FLG_CONSTTIME);
@@ -3119,7 +3105,7 @@ static int test_mod_exp_consttime(int i)
 
     res = 1;
 
- err:
+err:
     OPENSSL_free(s);
     BN_free(result);
     BN_free(base);
@@ -3140,24 +3126,25 @@ static int test_mod_exp2_mont(void)
            *exp_m = NULL;
 
     if (!TEST_ptr(exp_result = BN_new())
-            || !TEST_ptr(exp_a1 = BN_new())
-            || !TEST_ptr(exp_p1 = BN_new())
-            || !TEST_ptr(exp_a2 = BN_new())
-            || !TEST_ptr(exp_p2 = BN_new())
-            || !TEST_ptr(exp_m = BN_new()))
+        || !TEST_ptr(exp_a1 = BN_new())
+        || !TEST_ptr(exp_p1 = BN_new())
+        || !TEST_ptr(exp_a2 = BN_new())
+        || !TEST_ptr(exp_p2 = BN_new())
+        || !TEST_ptr(exp_m = BN_new()))
         goto err;
 
     if (!TEST_true(BN_one(exp_a1))
-            || !TEST_true(BN_one(exp_p1))
-            || !TEST_true(BN_one(exp_a2))
-            || !TEST_true(BN_one(exp_p2)))
+        || !TEST_true(BN_one(exp_p1))
+        || !TEST_true(BN_one(exp_a2))
+        || !TEST_true(BN_one(exp_p2)))
         goto err;
 
     BN_zero(exp_m);
 
     /* input of 0 is even, so must fail */
     if (!TEST_int_eq(BN_mod_exp2_mont(exp_result, exp_a1, exp_p1, exp_a2,
-                exp_p2, exp_m, ctx, NULL), 0))
+                         exp_p2, exp_m, ctx, NULL),
+            0))
         goto err;
 
     res = 1;
@@ -3226,7 +3213,8 @@ static int test_mod_exp_alias(int idx)
         goto err;
 
     if (!TEST_int_eq((idx == 0 ? BN_mod_exp_simple
-                               : BN_mod_exp_recp)(r, a, b, c, ctx), 1))
+                               : BN_mod_exp_recp)(r, a, b, c, ctx),
+            1))
         goto err;
     if (!TEST_ptr_ne(str = BN_bn2dec(r), NULL))
         goto err;
@@ -3240,7 +3228,8 @@ static int test_mod_exp_alias(int idx)
 
     /* Aliasing with exponent must work. */
     if (!TEST_int_eq((idx == 0 ? BN_mod_exp_simple
-                               : BN_mod_exp_recp)(r, a, r, c, ctx), 1))
+                               : BN_mod_exp_recp)(r, a, r, c, ctx),
+            1))
         goto err;
     if (!TEST_ptr_ne(str = BN_bn2dec(r), NULL))
         goto err;
@@ -3277,27 +3266,27 @@ static int test_mod_exp_alias(int idx)
 static int file_test_run(STANZA *s)
 {
     static const FILETEST filetests[] = {
-        {"Sum", file_sum},
-        {"LShift1", file_lshift1},
-        {"LShift", file_lshift},
-        {"RShift", file_rshift},
-        {"Square", file_square},
-        {"Product", file_product},
-        {"Quotient", file_quotient},
-        {"ModMul", file_modmul},
-        {"ModExp", file_modexp},
-        {"Exp", file_exp},
-        {"ModSqrt", file_modsqrt},
-        {"GCD", file_gcd},
+        { "Sum", file_sum },
+        { "LShift1", file_lshift1 },
+        { "LShift", file_lshift },
+        { "RShift", file_rshift },
+        { "Square", file_square },
+        { "Product", file_product },
+        { "Quotient", file_quotient },
+        { "ModMul", file_modmul },
+        { "ModExp", file_modexp },
+        { "Exp", file_exp },
+        { "ModSqrt", file_modsqrt },
+        { "GCD", file_gcd },
     };
     int numtests = OSSL_NELEM(filetests);
     const FILETEST *tp = filetests;
 
-    for ( ; --numtests >= 0; tp++) {
+    for (; --numtests >= 0; tp++) {
         if (findattr(s, tp->name) != NULL) {
             if (!tp->func(s)) {
                 TEST_info("%s:%d: Failed %s test",
-                          s->test_file, s->start, tp->name);
+                    s->test_file, s->start, tp->name);
                 return 0;
             }
             return 1;
@@ -3349,7 +3338,7 @@ const OPTIONS *test_get_options(void)
         OPT_TEST_OPTIONS_WITH_EXTRA_USAGE("[file...]\n"),
         { "stochastic", OPT_STOCHASTIC_TESTS, '-', "Run stochastic tests" },
         { OPT_HELP_STR, 1, '-',
-          "file\tFile to run tests on. Normal tests are not run\n" },
+            "file\tFile to run tests on. Normal tests are not run\n" },
         { NULL }
     };
     return test_options;
@@ -3366,13 +3355,13 @@ int setup_tests(void)
             stochastic = 1;
             break;
         case OPT_TEST_CASES:
-           break;
+            break;
         default:
         case OPT_ERR:
             return 0;
         }
     }
-    n  = test_get_argument_count();
+    n = test_get_argument_count();
 
     if (!TEST_ptr(ctx = BN_CTX_new()))
         return 0;
diff --git a/test/build.info b/test/build.info
index 9d9be6b642e99..3dca6117796be 100644
--- a/test/build.info
+++ b/test/build.info
@@ -31,7 +31,8 @@ IF[{- !$disabled{tests} -}]
           testutil/format_output.c testutil/load.c testutil/fake_random.c \
           testutil/test_cleanup.c testutil/main.c testutil/testutil_init.c \
           testutil/options.c testutil/test_options.c testutil/provider.c \
-          testutil/apps_shims.c testutil/random.c testutil/helper.c $LIBAPPSSRC
+          testutil/apps_shims.c testutil/random.c testutil/helper.c \
+          testutil/compare.c $LIBAPPSSRC
   INCLUDE[libtestutil.a]=../include ../apps/include ..
   DEPEND[libtestutil.a]=../libcrypto
 
diff --git a/test/build_wincrypt_test.c b/test/build_wincrypt_test.c
index 550e600b48854..5a956919f29e3 100644
--- a/test/build_wincrypt_test.c
+++ b/test/build_wincrypt_test.c
@@ -15,25 +15,25 @@
 #include <openssl/types.h>
 
 #ifdef _WIN32
-# ifndef WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-# endif
-# include <windows.h>
-# include <wincrypt.h>
-# ifndef X509_NAME
-#  ifndef PEDANTIC
-#    ifdef _MSC_VER
-#      pragma message("wincrypt.h no longer defining X509_NAME before OpenSSL headers")
-#    else
-#      warning "wincrypt.h no longer defining X509_NAME before OpenSSL headers"
-#    endif
-#  endif
-# endif
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#include <wincrypt.h>
+#ifndef X509_NAME
+#ifndef PEDANTIC
+#ifdef _MSC_VER
+#pragma message("wincrypt.h no longer defining X509_NAME before OpenSSL headers")
+#else
+#warning "wincrypt.h no longer defining X509_NAME before OpenSSL headers"
+#endif
+#endif
+#endif
 #endif
 
 #include <openssl/opensslconf.h>
 #ifndef OPENSSL_NO_STDIO
-# include <stdio.h>
+#include <stdio.h>
 #endif
 
 #include <openssl/evp.h>
diff --git a/test/byteorder_test.c b/test/byteorder_test.c
index 4bb7f597ebef6..effaaa006659b 100644
--- a/test/byteorder_test.c
+++ b/test/byteorder_test.c
@@ -18,9 +18,9 @@ static int test_byteorder(void)
     restin = OPENSSL_load_u16_le(&u16, in);
     restout = OPENSSL_store_u16_le(out, u16);
     if (!TEST_true(u16 == 0x0100U
-                   && memcmp(in, out, (size_t) 2) == 0
-                   && restin == in + 2
-                   && restout == out + 2)) {
+            && memcmp(in, out, (size_t)2) == 0
+            && restin == in + 2
+            && restout == out + 2)) {
         TEST_info("Failed byteorder.h u16 LE load/store");
         return 0;
     }
@@ -29,9 +29,9 @@ static int test_byteorder(void)
     restin = OPENSSL_load_u16_be(&u16, in);
     restout = OPENSSL_store_u16_be(out, u16);
     if (!TEST_true(u16 == 0x0001U
-                   && memcmp(in, out, (size_t) 2) == 0
-                   && restin == in + 2
-                   && restout == out + 2)) {
+            && memcmp(in, out, (size_t)2) == 0
+            && restin == in + 2
+            && restout == out + 2)) {
         TEST_info("Failed byteorder.h u16 BE load/store");
         return 0;
     }
@@ -40,9 +40,9 @@ static int test_byteorder(void)
     restin = OPENSSL_load_u32_le(&u32, in);
     restout = OPENSSL_store_u32_le(out, u32);
     if (!TEST_true(u32 == 0x03020100UL
-                   && memcmp(in, out, (size_t) 4) == 0
-                   && restin == in + 4
-                   && restout == out + 4)) {
+            && memcmp(in, out, (size_t)4) == 0
+            && restin == in + 4
+            && restout == out + 4)) {
         TEST_info("Failed byteorder.h u32 LE load/store");
         return 0;
     }
@@ -51,9 +51,9 @@ static int test_byteorder(void)
     restin = OPENSSL_load_u32_be(&u32, in);
     restout = OPENSSL_store_u32_be(out, u32);
     if (!TEST_true(u32 == 0x00010203UL
-                  && memcmp(in, out, (size_t) 4) == 0
-                  && restin == in + 4
-                  && restout == out + 4)) {
+            && memcmp(in, out, (size_t)4) == 0
+            && restin == in + 4
+            && restout == out + 4)) {
         TEST_info("Failed byteorder.h u32 BE load/store");
         return 0;
     }
@@ -62,9 +62,9 @@ static int test_byteorder(void)
     restin = OPENSSL_load_u64_le(&u64, in);
     restout = OPENSSL_store_u64_le(out, u64);
     if (!TEST_true(u64 == 0x0706050403020100ULL
-                   && memcmp(in, out, (size_t) 8) == 0
-                   && restin == in + 8
-                   && restout == out + 8)) {
+            && memcmp(in, out, (size_t)8) == 0
+            && restin == in + 8
+            && restout == out + 8)) {
         TEST_info("Failed byteorder.h u64 LE load/store");
         return 0;
     }
@@ -73,9 +73,9 @@ static int test_byteorder(void)
     restin = OPENSSL_load_u64_be(&u64, in);
     restout = OPENSSL_store_u64_be(out, u64);
     if (!TEST_true(u64 == 0x0001020304050607ULL
-                   && memcmp(in, out, (size_t) 8) == 0
-                   && restin == in + 8
-                   && restout == out + 8)) {
+            && memcmp(in, out, (size_t)8) == 0
+            && restin == in + 8
+            && restout == out + 8)) {
         TEST_info("Failed byteorder.h u64 BE load/store");
         return 0;
     }
diff --git a/test/ca_internals_test.c b/test/ca_internals_test.c
index 10c3cd90ae699..0b0b2f3b70976 100644
--- a/test/ca_internals_test.c
+++ b/test/ca_internals_test.c
@@ -90,4 +90,3 @@ int setup_tests(void)
     TEST_error("%s: command '%s' is not supported for testing\n", binname, command);
     return 0;
 }
-
diff --git a/test/casttest.c b/test/casttest.c
index 8500a0ab3d438..6bc091be9dd87 100644
--- a/test/casttest.c
+++ b/test/casttest.c
@@ -22,7 +22,7 @@
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_CAST
-# include <openssl/cast.h>
+#include <openssl/cast.h>
 
 static unsigned char k[16] = {
     0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78,
@@ -36,9 +36,9 @@ static unsigned char in[8] = {
 static int k_len[3] = { 16, 10, 5 };
 
 static unsigned char c[3][8] = {
-    {0x23, 0x8B, 0x4F, 0xE5, 0x84, 0x7E, 0x44, 0xB2},
-    {0xEB, 0x6A, 0x71, 0x1A, 0x2C, 0x02, 0x27, 0x1B},
-    {0x7A, 0xC8, 0x16, 0xD1, 0x6E, 0x9B, 0x30, 0x2E},
+    { 0x23, 0x8B, 0x4F, 0xE5, 0x84, 0x7E, 0x44, 0xB2 },
+    { 0xEB, 0x6A, 0x71, 0x1A, 0x2C, 0x02, 0x27, 0x1B },
+    { 0x7A, 0xC8, 0x16, 0xD1, 0x6E, 0x9B, 0x30, 0x2E },
 };
 
 static unsigned char in_a[16] = {
@@ -102,7 +102,7 @@ static int cast_test_iterations(void)
     }
 
     if (!TEST_mem_eq(out_a, sizeof(c_a), c_a, sizeof(c_a))
-            || !TEST_mem_eq(out_b, sizeof(c_b), c_b, sizeof(c_b)))
+        || !TEST_mem_eq(out_b, sizeof(c_b), c_b, sizeof(c_b)))
         testresult = 0;
 
     return testresult;
diff --git a/test/cc_dummy.c b/test/cc_dummy.c
index 4b2bc041998ed..ac6d4002251b5 100644
--- a/test/cc_dummy.c
+++ b/test/cc_dummy.c
@@ -18,7 +18,7 @@ typedef struct ossl_cc_dummy_st {
 static void dummy_update_diag(OSSL_CC_DUMMY *d);
 
 static OSSL_CC_DATA *dummy_new(OSSL_TIME (*now_cb)(void *arg),
-                               void *now_cb_arg)
+    void *now_cb_arg)
 {
     OSSL_CC_DUMMY *d = OPENSSL_zalloc(sizeof(*d));
 
@@ -36,7 +36,6 @@ static void dummy_free(OSSL_CC_DATA *cc)
 
 static void dummy_reset(OSSL_CC_DATA *cc)
 {
-
 }
 
 static int dummy_set_input_params(OSSL_CC_DATA *cc, const OSSL_PARAM *params)
@@ -105,31 +104,31 @@ static OSSL_TIME dummy_get_wakeup_deadline(OSSL_CC_DATA *cc)
 }
 
 static int dummy_on_data_sent(OSSL_CC_DATA *cc,
-                              uint64_t num_bytes)
+    uint64_t num_bytes)
 {
     return 1;
 }
 
 static int dummy_on_data_acked(OSSL_CC_DATA *cc,
-                               const OSSL_CC_ACK_INFO *info)
+    const OSSL_CC_ACK_INFO *info)
 {
     return 1;
 }
 
 static int dummy_on_data_lost(OSSL_CC_DATA *cc,
-                              const OSSL_CC_LOSS_INFO *info)
+    const OSSL_CC_LOSS_INFO *info)
 {
     return 1;
 }
 
 static int dummy_on_data_lost_finished(OSSL_CC_DATA *cc,
-                                       uint32_t flags)
+    uint32_t flags)
 {
     return 1;
 }
 
 static int dummy_on_data_invalidated(OSSL_CC_DATA *cc,
-                                     uint64_t num_bytes)
+    uint64_t num_bytes)
 {
     return 1;
 }
diff --git a/test/cert_comp_test.c b/test/cert_comp_test.c
index 956b84222264e..a369d8473beae 100644
--- a/test/cert_comp_test.c
+++ b/test/cert_comp_test.c
@@ -12,7 +12,7 @@
  * when the deprecated calls are not hidden
  */
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# define OPENSSL_SUPPRESS_DEPRECATED
+#define OPENSSL_SUPPRESS_DEPRECATED
 #endif
 
 #include <openssl/ssl.h>
@@ -29,7 +29,7 @@
  * If we don't have ec or dh then there are no built-in groups that are usable
  * with TLSv1.3
  */
-# define OSSL_NO_USABLE_TLS1_3
+#define OSSL_NO_USABLE_TLS1_3
 #endif
 
 #if !defined(OSSL_NO_USEABLE_TLS1_3)
@@ -54,11 +54,11 @@ static int client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
         return 0;
 
     if (!TEST_ptr(xcert = X509_new_ex(NULL, NULL))
-            || !TEST_ptr(PEM_read_bio_X509(in, &xcert, NULL, NULL))
-            || !TEST_ptr(priv_in = BIO_new_file(privkey, "r"))
-            || !TEST_ptr(privpkey = PEM_read_bio_PrivateKey_ex(priv_in, NULL,
-                                                               NULL, NULL,
-                                                               NULL, NULL)))
+        || !TEST_ptr(PEM_read_bio_X509(in, &xcert, NULL, NULL))
+        || !TEST_ptr(priv_in = BIO_new_file(privkey, "r"))
+        || !TEST_ptr(privpkey = PEM_read_bio_PrivateKey_ex(priv_in, NULL,
+                         NULL, NULL,
+                         NULL, NULL)))
         goto err;
 
     *x509 = xcert;
@@ -100,14 +100,14 @@ static int ssl_comp_cert(SSL *ssl, int alg)
         goto err;
     retval = alg;
 
- err:
+err:
     OPENSSL_free(comp_data);
     return retval;
 }
 
 static void cert_comp_info_cb(const SSL *s, int where, int ret)
 {
-    int *seen = (int*)SSL_get_app_data(s);
+    int *seen = (int *)SSL_get_app_data(s);
 
     if (SSL_is_server(s)) {
         /* TLS_ST_SR_COMP_CERT */
@@ -160,9 +160,9 @@ static int test_ssl_cert_comp(int test)
     }
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_3_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            TLS1_3_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
     if (test == 3) {
         /* coverity[deadcode] */
@@ -185,13 +185,13 @@ static int test_ssl_cert_comp(int test)
         SSL_CTX_set_verify(sctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, verify_cb);
     }
 
-    if (test == 1 || test== 2 || test == 3) {
+    if (test == 1 || test == 2 || test == 3) {
         if (!TEST_true(SSL_CTX_compress_certs(sctx, expected_server)))
             goto end;
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (!TEST_true(SSL_set_app_data(clientssl, &client_seen)))
@@ -216,7 +216,7 @@ static int test_ssl_cert_comp(int test)
         if (!TEST_int_eq(sc->cert->key->cert_comp_used, 0))
             goto end;
 
-        if (!TEST_false(*(int*)SSL_get_app_data(clientssl)))
+        if (!TEST_false(*(int *)SSL_get_app_data(clientssl)))
             goto end;
     } else {
         SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(serverssl);
@@ -224,19 +224,19 @@ static int test_ssl_cert_comp(int test)
         if (!TEST_int_gt(sc->cert->key->cert_comp_used, 0))
             goto end;
 
-        if (!TEST_true(*(int*)SSL_get_app_data(clientssl)))
+        if (!TEST_true(*(int *)SSL_get_app_data(clientssl)))
             goto end;
     }
 
     if (test == 2) {
         /* Only for client auth */
-        if (!TEST_true(*(int*)SSL_get_app_data(serverssl)))
+        if (!TEST_true(*(int *)SSL_get_app_data(serverssl)))
             goto end;
     }
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -270,7 +270,7 @@ int setup_tests(void)
     ADD_ALL_TESTS(test_ssl_cert_comp, 4);
     return 1;
 
- err:
+err:
     OPENSSL_free(cert);
     OPENSSL_free(privkey);
     return 0;
diff --git a/test/certs/p256-ee-rsa-ca-cert.pem b/test/certs/p256-ee-rsa-ca-cert.pem
new file mode 100644
index 0000000000000..e0a57ed886ee4
--- /dev/null
+++ b/test/certs/p256-ee-rsa-ca-cert.pem
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICQDCCASigAwIBAgIBAjANBgkqhkiG9w0BAQsFADANMQswCQYDVQQDDAJDQTAg
+Fw0yNTAzMjYwNDAwMThaGA8yMTI1MDMyNzA0MDAxOFowHzEdMBsGA1UEAwwUUC0y
+NTYgY2VydCBFRSBpc3N1ZXIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS75MkU
+kSmDEElkBVwaw5WD7XE2wjO4DWyu0ayOZ49RceBzoL0Y/xLcVWDt+89MJ5IbvAsI
+OAdF/7WFpbrz/LgFo2IwYDAdBgNVHQ4EFgQUm0m0pKJWq4YY6Q/2x7BIJhyLyMAw
+HwYDVR0jBBgwFoAUtBEz8dfiXvdTniAiEE+GBr8fyV4wCQYDVR0TBAIwADATBgNV
+HSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEARKppcgmGU7D79Qyd
+gTr5mJVtEWKpkV+WZbOqYRaLeZpRxhFJ0nUlgKgnN7Ck8KY9Zdx5u6bF2N0rXZyl
+J1XnrDtrjadFsVg/j4aFHlSRz9mPxCvl4MAq/cQDyFv+BSel2cuM7+ZPM9BO0256
+0+kVJscMImkEJ3JuAQHz7i/TBK4uk1H9C8IGWWwNK0unWQyZyWtAT7NDa6bjoktf
+FBpcG9D2398TWBZeaO6w31en4SKUqCzJ43MLsJJ4bPP8TEl4vf3skEhwAfeN/yyB
+rO+RInqHuaZ0yGbZNwYotvGaVKToYYt1p4otTy+NSoeXk7SIYW3c6beGRtlaPDzq
+da3+vg==
+-----END CERTIFICATE-----
diff --git a/test/certs/p256-ee-rsa-ca-key.pem b/test/certs/p256-ee-rsa-ca-key.pem
new file mode 100644
index 0000000000000..7892d5d7de347
--- /dev/null
+++ b/test/certs/p256-ee-rsa-ca-key.pem
@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgzekrCs3M+7Mim6iA
+m+Ok4GMMI3YbWEQycJj431k23WWhRANCAAS75MkUkSmDEElkBVwaw5WD7XE2wjO4
+DWyu0ayOZ49RceBzoL0Y/xLcVWDt+89MJ5IbvAsIOAdF/7WFpbrz/LgF
+-----END PRIVATE KEY-----
diff --git a/test/certs/setup.sh b/test/certs/setup.sh
index 28b8196c78497..5bd87087cc1f3 100755
--- a/test/certs/setup.sh
+++ b/test/certs/setup.sh
@@ -493,3 +493,8 @@ OPENSSL_SIGALG="sha3-224" ./mkcert.sh genee server.example ee-key-ec-named-named
 OPENSSL_SIGALG="sha3-256" ./mkcert.sh genee server.example ee-key-ec-named-named ee-cert-ec-sha3-256 ca-key-ec-named ca-cert-ec-named
 OPENSSL_SIGALG="sha3-384" ./mkcert.sh genee server.example ee-key-ec-named-named ee-cert-ec-sha3-384 ca-key-ec-named ca-cert-ec-named
 OPENSSL_SIGALG="sha3-512" ./mkcert.sh genee server.example ee-key-ec-named-named ee-cert-ec-sha3-512 ca-key-ec-named ca-cert-ec-named
+
+# EC cert seigned RSA intermediate CA
+OPENSSL_KEYALG=ec OPENSSL_KEYBITS=prime256v1 ./mkcert.sh genee \
+    "P-256 cert EE issuer" p256-ee-rsa-ca-key \
+    p256-ee-rsa-ca-cert ca-key ca-cert
diff --git a/test/cipher_overhead_test.c b/test/cipher_overhead_test.c
index 2001b332958c4..176d6cc8770b5 100644
--- a/test/cipher_overhead_test.c
+++ b/test/cipher_overhead_test.c
@@ -21,7 +21,7 @@ static int cipher_enabled(const SSL_CIPHER *ciph)
         return 1;
 
     if (ciph->algorithm_enc != SSL_eNULL
-            && EVP_get_cipherbynid(SSL_CIPHER_get_cipher_nid(ciph)) == NULL)
+        && EVP_get_cipherbynid(SSL_CIPHER_get_cipher_nid(ciph)) == NULL)
         return 0;
 
     if (EVP_get_digestbynid(SSL_CIPHER_get_digest_nid(ciph)) == NULL)
@@ -49,7 +49,7 @@ static int cipher_overhead(void)
             ret = 0;
         } else {
             TEST_info("Cipher %s: %zu %zu %zu %zu",
-                      ciph->name, mac, in, blk, ex);
+                ciph->name, mac, in, blk, ex);
         }
     }
     return ret;
diff --git a/test/cipherbytes_test.c b/test/cipherbytes_test.c
index ed4eacbdf356b..3e73781cfed8d 100644
--- a/test/cipherbytes_test.c
+++ b/test/cipherbytes_test.c
@@ -27,12 +27,12 @@ static SSL *s;
 static int test_empty(void)
 {
     STACK_OF(SSL_CIPHER) *sk = NULL, *scsv = NULL;
-    const unsigned char bytes[] = {0x00};
+    const unsigned char bytes[] = { 0x00 };
     int ret = 0;
 
     if (!TEST_int_eq(SSL_bytes_to_cipher_list(s, bytes, 0, 0, &sk, &scsv), 0)
-            || !TEST_ptr_null(sk)
-            || !TEST_ptr_null(scsv))
+        || !TEST_ptr_null(sk)
+        || !TEST_ptr_null(scsv))
         goto err;
     ret = 1;
 
@@ -46,17 +46,17 @@ static int test_unsupported(void)
 {
     STACK_OF(SSL_CIPHER) *sk, *scsv;
     /* ECDH-RSA-AES256 (unsupported), ECDHE-ECDSA-AES128, <unassigned> */
-    const unsigned char bytes[] = {0xc0, 0x0f, 0x00, 0x2f, 0x01, 0x00};
+    const unsigned char bytes[] = { 0xc0, 0x0f, 0x00, 0x2f, 0x01, 0x00 };
     int ret = 0;
 
     if (!TEST_true(SSL_bytes_to_cipher_list(s, bytes, sizeof(bytes),
-                                            0, &sk, &scsv))
-            || !TEST_ptr(sk)
-            || !TEST_int_eq(sk_SSL_CIPHER_num(sk), 1)
-            || !TEST_ptr(scsv)
-            || !TEST_int_eq(sk_SSL_CIPHER_num(scsv), 0)
-            || !TEST_str_eq(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 0)),
-                            "AES128-SHA"))
+            0, &sk, &scsv))
+        || !TEST_ptr(sk)
+        || !TEST_int_eq(sk_SSL_CIPHER_num(sk), 1)
+        || !TEST_ptr(scsv)
+        || !TEST_int_eq(sk_SSL_CIPHER_num(scsv), 0)
+        || !TEST_str_eq(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 0)),
+            "AES128-SHA"))
         goto err;
 
     ret = 1;
@@ -71,21 +71,23 @@ static int test_v2(void)
     STACK_OF(SSL_CIPHER) *sk, *scsv;
     /* ECDHE-ECDSA-AES256GCM, SSL2_RC4_1238_WITH_MD5,
      * ECDHE-ECDSA-CHACHA20-POLY1305 */
-    const unsigned char bytes[] = {0x00, 0x00, 0x35, 0x01, 0x00, 0x80,
-                                   0x00, 0x00, 0x33};
+    const unsigned char bytes[] = { 0x00, 0x00, 0x35, 0x01, 0x00, 0x80,
+        0x00, 0x00, 0x33 };
     int ret = 0;
 
     if (!TEST_true(SSL_bytes_to_cipher_list(s, bytes, sizeof(bytes), 1,
-                                            &sk, &scsv))
-            || !TEST_ptr(sk)
-            || !TEST_int_eq(sk_SSL_CIPHER_num(sk), 2)
-            || !TEST_ptr(scsv)
-            || !TEST_int_eq(sk_SSL_CIPHER_num(scsv), 0))
+            &sk, &scsv))
+        || !TEST_ptr(sk)
+        || !TEST_int_eq(sk_SSL_CIPHER_num(sk), 2)
+        || !TEST_ptr(scsv)
+        || !TEST_int_eq(sk_SSL_CIPHER_num(scsv), 0))
         goto err;
     if (strcmp(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 0)),
-               "AES256-SHA") != 0 ||
-        strcmp(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 1)),
-               "DHE-RSA-AES128-SHA") != 0)
+            "AES256-SHA")
+            != 0
+        || strcmp(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 1)),
+               "DHE-RSA-AES128-SHA")
+            != 0)
         goto err;
 
     ret = 1;
@@ -101,25 +103,25 @@ static int test_v3(void)
     STACK_OF(SSL_CIPHER) *sk = NULL, *scsv = NULL;
     /* ECDHE-ECDSA-AES256GCM, ECDHE-ECDSA-CHACHAPOLY, DHE-RSA-AES256GCM,
      * EMPTY-RENEGOTIATION-INFO-SCSV, FALLBACK-SCSV */
-    const unsigned char bytes[] = {0x00, 0x2f, 0x00, 0x33, 0x00, 0x9f, 0x00, 0xff,
-                                   0x56, 0x00};
+    const unsigned char bytes[] = { 0x00, 0x2f, 0x00, 0x33, 0x00, 0x9f, 0x00, 0xff,
+        0x56, 0x00 };
     int ret = 0;
 
     if (!SSL_bytes_to_cipher_list(s, bytes, sizeof(bytes), 0, &sk, &scsv)
-            || !TEST_ptr(sk)
-            || !TEST_int_eq(sk_SSL_CIPHER_num(sk), 3)
-            || !TEST_ptr(scsv)
-            || !TEST_int_eq(sk_SSL_CIPHER_num(scsv), 2)
-            || !TEST_str_eq(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 0)),
-                            "AES128-SHA")
-            || !TEST_str_eq(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 1)),
-                            "DHE-RSA-AES128-SHA")
-            || !TEST_str_eq(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 2)),
-                            "DHE-RSA-AES256-GCM-SHA384")
-            || !TEST_str_eq(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(scsv, 0)),
-                            "TLS_EMPTY_RENEGOTIATION_INFO_SCSV")
-            || !TEST_str_eq(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(scsv, 1)),
-                            "TLS_FALLBACK_SCSV"))
+        || !TEST_ptr(sk)
+        || !TEST_int_eq(sk_SSL_CIPHER_num(sk), 3)
+        || !TEST_ptr(scsv)
+        || !TEST_int_eq(sk_SSL_CIPHER_num(scsv), 2)
+        || !TEST_str_eq(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 0)),
+            "AES128-SHA")
+        || !TEST_str_eq(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 1)),
+            "DHE-RSA-AES128-SHA")
+        || !TEST_str_eq(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(sk, 2)),
+            "DHE-RSA-AES256-GCM-SHA384")
+        || !TEST_str_eq(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(scsv, 0)),
+            "TLS_EMPTY_RENEGOTIATION_INFO_SCSV")
+        || !TEST_str_eq(SSL_CIPHER_get_name(sk_SSL_CIPHER_value(scsv, 1)),
+            "TLS_FALLBACK_SCSV"))
         goto err;
 
     ret = 1;
@@ -132,7 +134,7 @@ static int test_v3(void)
 int setup_tests(void)
 {
     if (!TEST_ptr(ctx = SSL_CTX_new(TLS_server_method()))
-            || !TEST_ptr(s = SSL_new(ctx)))
+        || !TEST_ptr(s = SSL_new(ctx)))
         return 0;
 
     ADD_TEST(test_empty);
diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c
index c46e431b0018a..9874e6bad6413 100644
--- a/test/cipherlist_test.c
+++ b/test/cipherlist_test.c
@@ -27,7 +27,6 @@ typedef struct cipherlist_test_fixture {
     SSL_CTX *client;
 } CIPHERLIST_TEST_FIXTURE;
 
-
 static void tear_down(CIPHERLIST_TEST_FIXTURE *fixture)
 {
     if (fixture != NULL) {
@@ -46,7 +45,7 @@ static CIPHERLIST_TEST_FIXTURE *set_up(const char *const test_case_name)
         return NULL;
     fixture->test_case_name = test_case_name;
     if (!TEST_ptr(fixture->server = SSL_CTX_new(TLS_server_method()))
-            || !TEST_ptr(fixture->client = SSL_CTX_new(TLS_client_method()))) {
+        || !TEST_ptr(fixture->client = SSL_CTX_new(TLS_client_method()))) {
         tear_down(fixture);
         return NULL;
     }
@@ -65,69 +64,69 @@ static CIPHERLIST_TEST_FIXTURE *set_up(const char *const test_case_name)
 static const uint32_t default_ciphers_in_order[] = {
 #ifndef OPENSSL_NO_TLS1_3
     TLS1_3_CK_AES_256_GCM_SHA384,
-# if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
+#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
     TLS1_3_CK_CHACHA20_POLY1305_SHA256,
-# endif
+#endif
     TLS1_3_CK_AES_128_GCM_SHA256,
 #endif
 #ifndef OPENSSL_NO_TLS1_2
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
     TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
     TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-# endif
-# ifndef OPENSSL_NO_DH
+#endif
+#ifndef OPENSSL_NO_DH
     TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384,
-# endif
+#endif
 
-# if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
-#  ifndef OPENSSL_NO_EC
+#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
+#ifndef OPENSSL_NO_EC
     TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
     TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305,
-#  endif
-#  ifndef OPENSSL_NO_DH
+#endif
+#ifndef OPENSSL_NO_DH
     TLS1_CK_DHE_RSA_WITH_CHACHA20_POLY1305,
-#  endif
-# endif  /* !OPENSSL_NO_CHACHA && !OPENSSL_NO_POLY1305 */
+#endif
+#endif /* !OPENSSL_NO_CHACHA && !OPENSSL_NO_POLY1305 */
 
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
     TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
     TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-# endif
-# ifndef OPENSSL_NO_DH
+#endif
+#ifndef OPENSSL_NO_DH
     TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256,
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
     TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384,
     TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384,
-# endif
-# ifndef OPENSSL_NO_DH
+#endif
+#ifndef OPENSSL_NO_DH
     TLS1_CK_DHE_RSA_WITH_AES_256_SHA256,
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
     TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256,
     TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256,
-# endif
-# ifndef OPENSSL_NO_DH
+#endif
+#ifndef OPENSSL_NO_DH
     TLS1_CK_DHE_RSA_WITH_AES_128_SHA256,
-# endif
-#endif  /* !OPENSSL_NO_TLS1_2 */
+#endif
+#endif /* !OPENSSL_NO_TLS1_2 */
 
 #if !defined(OPENSSL_NO_TLS1_2) || defined(OPENSSL_NO_TLS1_3)
-    /* These won't be usable if TLSv1.3 is available but TLSv1.2 isn't */
-# ifndef OPENSSL_NO_EC
+/* These won't be usable if TLSv1.3 is available but TLSv1.2 isn't */
+#ifndef OPENSSL_NO_EC
     TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
     TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-# endif
- #ifndef OPENSSL_NO_DH
+#endif
+#ifndef OPENSSL_NO_DH
     TLS1_CK_DHE_RSA_WITH_AES_256_SHA,
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
     TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
     TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-# endif
-# ifndef OPENSSL_NO_DH
+#endif
+#ifndef OPENSSL_NO_DH
     TLS1_CK_DHE_RSA_WITH_AES_128_SHA,
-# endif
+#endif
 #endif /* !defined(OPENSSL_NO_TLS1_2) || defined(OPENSSL_NO_TLS1_3) */
 
 #ifndef OPENSSL_NO_TLS1_2
@@ -156,7 +155,7 @@ static int test_default_cipherlist(SSL_CTX *ctx)
         return 0;
 
     if (!TEST_ptr(ssl = SSL_new(ctx))
-            || !TEST_ptr(ciphers = SSL_get1_supported_ciphers(ssl)))
+        || !TEST_ptr(ciphers = SSL_get1_supported_ciphers(ssl)))
         goto err;
 
     num_expected_ciphers = OSSL_NELEM(default_ciphers_in_order);
@@ -175,7 +174,7 @@ static int test_default_cipherlist(SSL_CTX *ctx)
 
     ret = 1;
 
- err:
+err:
     sk_SSL_CIPHER_free(ciphers);
     SSL_free(ssl);
     return ret;
@@ -205,7 +204,7 @@ static int test_default_cipherlist_explicit(void)
 {
     SETUP_CIPHERLIST_TEST_FIXTURE();
     if (!TEST_true(SSL_CTX_set_cipher_list(fixture->server, "DEFAULT"))
-            || !TEST_true(SSL_CTX_set_cipher_list(fixture->client, "DEFAULT"))) {
+        || !TEST_true(SSL_CTX_set_cipher_list(fixture->client, "DEFAULT"))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -228,13 +227,13 @@ static int test_default_cipherlist_clear(void)
     s = SSL_new(fixture->client);
 
     if (!TEST_ptr(s))
-      goto end;
+        goto end;
 
     if (!TEST_int_eq(SSL_set_cipher_list(s, "no-such"), 0))
         goto end;
 
     if (!TEST_int_eq(ERR_GET_REASON(ERR_get_error()),
-                SSL_R_NO_CIPHER_MATCH))
+            SSL_R_NO_CIPHER_MATCH))
         goto end;
 
     result = 1;
@@ -249,7 +248,7 @@ static int test_stdname_cipherlist(void)
 {
     SETUP_CIPHERLIST_TEST_FIXTURE();
     if (!TEST_true(SSL_CTX_set_cipher_list(fixture->server, TLS1_RFC_RSA_WITH_AES_128_SHA))
-            || !TEST_true(SSL_CTX_set_cipher_list(fixture->client, TLS1_RFC_RSA_WITH_AES_128_SHA))) {
+        || !TEST_true(SSL_CTX_set_cipher_list(fixture->client, TLS1_RFC_RSA_WITH_AES_128_SHA))) {
         goto end;
     }
     result = 1;
diff --git a/test/ciphername_test.c b/test/ciphername_test.c
index de7af03f94b2c..cc29846990844 100644
--- a/test/ciphername_test.c
+++ b/test/ciphername_test.c
@@ -29,342 +29,342 @@ typedef struct cipher_id_name {
 
 /* Cipher suites, copied from t1_trce.c */
 static CIPHER_ID_NAME cipher_names[] = {
-    {0x0000, "TLS_NULL_WITH_NULL_NULL"},
-    {0x0001, "TLS_RSA_WITH_NULL_MD5"},
-    {0x0002, "TLS_RSA_WITH_NULL_SHA"},
-    {0x0003, "TLS_RSA_EXPORT_WITH_RC4_40_MD5"},
-    {0x0004, "TLS_RSA_WITH_RC4_128_MD5"},
-    {0x0005, "TLS_RSA_WITH_RC4_128_SHA"},
-    {0x0006, "TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5"},
-    {0x0007, "TLS_RSA_WITH_IDEA_CBC_SHA"},
-    {0x0008, "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA"},
-    {0x0009, "TLS_RSA_WITH_DES_CBC_SHA"},
-    {0x000A, "TLS_RSA_WITH_3DES_EDE_CBC_SHA"},
-    {0x000B, "TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA"},
-    {0x000C, "TLS_DH_DSS_WITH_DES_CBC_SHA"},
-    {0x000D, "TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA"},
-    {0x000E, "TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA"},
-    {0x000F, "TLS_DH_RSA_WITH_DES_CBC_SHA"},
-    {0x0010, "TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA"},
-    {0x0011, "TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA"},
-    {0x0012, "TLS_DHE_DSS_WITH_DES_CBC_SHA"},
-    {0x0013, "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA"},
-    {0x0014, "TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA"},
-    {0x0015, "TLS_DHE_RSA_WITH_DES_CBC_SHA"},
-    {0x0016, "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA"},
-    {0x0017, "TLS_DH_anon_EXPORT_WITH_RC4_40_MD5"},
-    {0x0018, "TLS_DH_anon_WITH_RC4_128_MD5"},
-    {0x0019, "TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA"},
-    {0x001A, "TLS_DH_anon_WITH_DES_CBC_SHA"},
-    {0x001B, "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA"},
-    {0x001D, "SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA"},
-    {0x001E, "SSL_FORTEZZA_KEA_WITH_RC4_128_SHA"},
-    {0x001F, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA"},
-    {0x0020, "TLS_KRB5_WITH_RC4_128_SHA"},
-    {0x0021, "TLS_KRB5_WITH_IDEA_CBC_SHA"},
-    {0x0022, "TLS_KRB5_WITH_DES_CBC_MD5"},
-    {0x0023, "TLS_KRB5_WITH_3DES_EDE_CBC_MD5"},
-    {0x0024, "TLS_KRB5_WITH_RC4_128_MD5"},
-    {0x0025, "TLS_KRB5_WITH_IDEA_CBC_MD5"},
-    {0x0026, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA"},
-    {0x0027, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_SHA"},
-    {0x0028, "TLS_KRB5_EXPORT_WITH_RC4_40_SHA"},
-    {0x0029, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5"},
-    {0x002A, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5"},
-    {0x002B, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5"},
-    {0x002C, "TLS_PSK_WITH_NULL_SHA"},
-    {0x002D, "TLS_DHE_PSK_WITH_NULL_SHA"},
-    {0x002E, "TLS_RSA_PSK_WITH_NULL_SHA"},
-    {0x002F, "TLS_RSA_WITH_AES_128_CBC_SHA"},
-    {0x0030, "TLS_DH_DSS_WITH_AES_128_CBC_SHA"},
-    {0x0031, "TLS_DH_RSA_WITH_AES_128_CBC_SHA"},
-    {0x0032, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA"},
-    {0x0033, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA"},
-    {0x0034, "TLS_DH_anon_WITH_AES_128_CBC_SHA"},
-    {0x0035, "TLS_RSA_WITH_AES_256_CBC_SHA"},
-    {0x0036, "TLS_DH_DSS_WITH_AES_256_CBC_SHA"},
-    {0x0037, "TLS_DH_RSA_WITH_AES_256_CBC_SHA"},
-    {0x0038, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA"},
-    {0x0039, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA"},
-    {0x003A, "TLS_DH_anon_WITH_AES_256_CBC_SHA"},
-    {0x003B, "TLS_RSA_WITH_NULL_SHA256"},
-    {0x003C, "TLS_RSA_WITH_AES_128_CBC_SHA256"},
-    {0x003D, "TLS_RSA_WITH_AES_256_CBC_SHA256"},
-    {0x003E, "TLS_DH_DSS_WITH_AES_128_CBC_SHA256"},
-    {0x003F, "TLS_DH_RSA_WITH_AES_128_CBC_SHA256"},
-    {0x0040, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256"},
-    {0x0041, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA"},
-    {0x0042, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA"},
-    {0x0043, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA"},
-    {0x0044, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA"},
-    {0x0045, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA"},
-    {0x0046, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA"},
-    {0x0067, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"},
-    {0x0068, "TLS_DH_DSS_WITH_AES_256_CBC_SHA256"},
-    {0x0069, "TLS_DH_RSA_WITH_AES_256_CBC_SHA256"},
-    {0x006A, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"},
-    {0x006B, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"},
-    {0x006C, "TLS_DH_anon_WITH_AES_128_CBC_SHA256"},
-    {0x006D, "TLS_DH_anon_WITH_AES_256_CBC_SHA256"},
-    {0x0084, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"},
-    {0x0085, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA"},
-    {0x0086, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA"},
-    {0x0087, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA"},
-    {0x0088, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA"},
-    {0x0089, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA"},
-    {0x008A, "TLS_PSK_WITH_RC4_128_SHA"},
-    {0x008B, "TLS_PSK_WITH_3DES_EDE_CBC_SHA"},
-    {0x008C, "TLS_PSK_WITH_AES_128_CBC_SHA"},
-    {0x008D, "TLS_PSK_WITH_AES_256_CBC_SHA"},
-    {0x008E, "TLS_DHE_PSK_WITH_RC4_128_SHA"},
-    {0x008F, "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA"},
-    {0x0090, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA"},
-    {0x0091, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA"},
-    {0x0092, "TLS_RSA_PSK_WITH_RC4_128_SHA"},
-    {0x0093, "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA"},
-    {0x0094, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA"},
-    {0x0095, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA"},
-    {0x0096, "TLS_RSA_WITH_SEED_CBC_SHA"},
-    {0x0097, "TLS_DH_DSS_WITH_SEED_CBC_SHA"},
-    {0x0098, "TLS_DH_RSA_WITH_SEED_CBC_SHA"},
-    {0x0099, "TLS_DHE_DSS_WITH_SEED_CBC_SHA"},
-    {0x009A, "TLS_DHE_RSA_WITH_SEED_CBC_SHA"},
-    {0x009B, "TLS_DH_anon_WITH_SEED_CBC_SHA"},
-    {0x009C, "TLS_RSA_WITH_AES_128_GCM_SHA256"},
-    {0x009D, "TLS_RSA_WITH_AES_256_GCM_SHA384"},
-    {0x009E, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"},
-    {0x009F, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"},
-    {0x00A0, "TLS_DH_RSA_WITH_AES_128_GCM_SHA256"},
-    {0x00A1, "TLS_DH_RSA_WITH_AES_256_GCM_SHA384"},
-    {0x00A2, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256"},
-    {0x00A3, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384"},
-    {0x00A4, "TLS_DH_DSS_WITH_AES_128_GCM_SHA256"},
-    {0x00A5, "TLS_DH_DSS_WITH_AES_256_GCM_SHA384"},
-    {0x00A6, "TLS_DH_anon_WITH_AES_128_GCM_SHA256"},
-    {0x00A7, "TLS_DH_anon_WITH_AES_256_GCM_SHA384"},
-    {0x00A8, "TLS_PSK_WITH_AES_128_GCM_SHA256"},
-    {0x00A9, "TLS_PSK_WITH_AES_256_GCM_SHA384"},
-    {0x00AA, "TLS_DHE_PSK_WITH_AES_128_GCM_SHA256"},
-    {0x00AB, "TLS_DHE_PSK_WITH_AES_256_GCM_SHA384"},
-    {0x00AC, "TLS_RSA_PSK_WITH_AES_128_GCM_SHA256"},
-    {0x00AD, "TLS_RSA_PSK_WITH_AES_256_GCM_SHA384"},
-    {0x00AE, "TLS_PSK_WITH_AES_128_CBC_SHA256"},
-    {0x00AF, "TLS_PSK_WITH_AES_256_CBC_SHA384"},
-    {0x00B0, "TLS_PSK_WITH_NULL_SHA256"},
-    {0x00B1, "TLS_PSK_WITH_NULL_SHA384"},
-    {0x00B2, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA256"},
-    {0x00B3, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA384"},
-    {0x00B4, "TLS_DHE_PSK_WITH_NULL_SHA256"},
-    {0x00B5, "TLS_DHE_PSK_WITH_NULL_SHA384"},
-    {0x00B6, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA256"},
-    {0x00B7, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA384"},
-    {0x00B8, "TLS_RSA_PSK_WITH_NULL_SHA256"},
-    {0x00B9, "TLS_RSA_PSK_WITH_NULL_SHA384"},
-    {0x00BA, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0x00BB, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0x00BC, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0x00BD, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0x00BE, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0x00BF, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0x00C0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256"},
-    {0x00C1, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256"},
-    {0x00C2, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256"},
-    {0x00C3, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256"},
-    {0x00C4, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256"},
-    {0x00C5, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256"},
-    {0x00FF, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV"},
-    {0x5600, "TLS_FALLBACK_SCSV"},
-    {0xC001, "TLS_ECDH_ECDSA_WITH_NULL_SHA"},
-    {0xC002, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA"},
-    {0xC003, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA"},
-    {0xC004, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA"},
-    {0xC005, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA"},
-    {0xC006, "TLS_ECDHE_ECDSA_WITH_NULL_SHA"},
-    {0xC007, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"},
-    {0xC008, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"},
-    {0xC009, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"},
-    {0xC00A, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"},
-    {0xC00B, "TLS_ECDH_RSA_WITH_NULL_SHA"},
-    {0xC00C, "TLS_ECDH_RSA_WITH_RC4_128_SHA"},
-    {0xC00D, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA"},
-    {0xC00E, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA"},
-    {0xC00F, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA"},
-    {0xC010, "TLS_ECDHE_RSA_WITH_NULL_SHA"},
-    {0xC011, "TLS_ECDHE_RSA_WITH_RC4_128_SHA"},
-    {0xC012, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"},
-    {0xC013, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"},
-    {0xC014, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"},
-    {0xC015, "TLS_ECDH_anon_WITH_NULL_SHA"},
-    {0xC016, "TLS_ECDH_anon_WITH_RC4_128_SHA"},
-    {0xC017, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"},
-    {0xC018, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"},
-    {0xC019, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"},
-    {0xC01A, "TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA"},
-    {0xC01B, "TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA"},
-    {0xC01C, "TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA"},
-    {0xC01D, "TLS_SRP_SHA_WITH_AES_128_CBC_SHA"},
-    {0xC01E, "TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA"},
-    {0xC01F, "TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA"},
-    {0xC020, "TLS_SRP_SHA_WITH_AES_256_CBC_SHA"},
-    {0xC021, "TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA"},
-    {0xC022, "TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA"},
-    {0xC023, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"},
-    {0xC024, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"},
-    {0xC025, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256"},
-    {0xC026, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384"},
-    {0xC027, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"},
-    {0xC028, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"},
-    {0xC029, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256"},
-    {0xC02A, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384"},
-    {0xC02B, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"},
-    {0xC02C, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"},
-    {0xC02D, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256"},
-    {0xC02E, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384"},
-    {0xC02F, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"},
-    {0xC030, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"},
-    {0xC031, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256"},
-    {0xC032, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384"},
-    {0xC033, "TLS_ECDHE_PSK_WITH_RC4_128_SHA"},
-    {0xC034, "TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA"},
-    {0xC035, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA"},
-    {0xC036, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA"},
-    {0xC037, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256"},
-    {0xC038, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384"},
-    {0xC039, "TLS_ECDHE_PSK_WITH_NULL_SHA"},
-    {0xC03A, "TLS_ECDHE_PSK_WITH_NULL_SHA256"},
-    {0xC03B, "TLS_ECDHE_PSK_WITH_NULL_SHA384"},
-    {0xC03C, "TLS_RSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC03D, "TLS_RSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC03E, "TLS_DH_DSS_WITH_ARIA_128_CBC_SHA256"},
-    {0xC03F, "TLS_DH_DSS_WITH_ARIA_256_CBC_SHA384"},
-    {0xC040, "TLS_DH_RSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC041, "TLS_DH_RSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC042, "TLS_DHE_DSS_WITH_ARIA_128_CBC_SHA256"},
-    {0xC043, "TLS_DHE_DSS_WITH_ARIA_256_CBC_SHA384"},
-    {0xC044, "TLS_DHE_RSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC045, "TLS_DHE_RSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC046, "TLS_DH_anon_WITH_ARIA_128_CBC_SHA256"},
-    {0xC047, "TLS_DH_anon_WITH_ARIA_256_CBC_SHA384"},
-    {0xC048, "TLS_ECDHE_ECDSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC049, "TLS_ECDHE_ECDSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC04A, "TLS_ECDH_ECDSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC04B, "TLS_ECDH_ECDSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC04C, "TLS_ECDHE_RSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC04D, "TLS_ECDHE_RSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC04E, "TLS_ECDH_RSA_WITH_ARIA_128_CBC_SHA256"},
-    {0xC04F, "TLS_ECDH_RSA_WITH_ARIA_256_CBC_SHA384"},
-    {0xC050, "TLS_RSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC051, "TLS_RSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC052, "TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC053, "TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC054, "TLS_DH_RSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC055, "TLS_DH_RSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC056, "TLS_DHE_DSS_WITH_ARIA_128_GCM_SHA256"},
-    {0xC057, "TLS_DHE_DSS_WITH_ARIA_256_GCM_SHA384"},
-    {0xC058, "TLS_DH_DSS_WITH_ARIA_128_GCM_SHA256"},
-    {0xC059, "TLS_DH_DSS_WITH_ARIA_256_GCM_SHA384"},
-    {0xC05A, "TLS_DH_anon_WITH_ARIA_128_GCM_SHA256"},
-    {0xC05B, "TLS_DH_anon_WITH_ARIA_256_GCM_SHA384"},
-    {0xC05C, "TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC05D, "TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC05E, "TLS_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC05F, "TLS_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC060, "TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC061, "TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC062, "TLS_ECDH_RSA_WITH_ARIA_128_GCM_SHA256"},
-    {0xC063, "TLS_ECDH_RSA_WITH_ARIA_256_GCM_SHA384"},
-    {0xC064, "TLS_PSK_WITH_ARIA_128_CBC_SHA256"},
-    {0xC065, "TLS_PSK_WITH_ARIA_256_CBC_SHA384"},
-    {0xC066, "TLS_DHE_PSK_WITH_ARIA_128_CBC_SHA256"},
-    {0xC067, "TLS_DHE_PSK_WITH_ARIA_256_CBC_SHA384"},
-    {0xC068, "TLS_RSA_PSK_WITH_ARIA_128_CBC_SHA256"},
-    {0xC069, "TLS_RSA_PSK_WITH_ARIA_256_CBC_SHA384"},
-    {0xC06A, "TLS_PSK_WITH_ARIA_128_GCM_SHA256"},
-    {0xC06B, "TLS_PSK_WITH_ARIA_256_GCM_SHA384"},
-    {0xC06C, "TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256"},
-    {0xC06D, "TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384"},
-    {0xC06E, "TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256"},
-    {0xC06F, "TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384"},
-    {0xC070, "TLS_ECDHE_PSK_WITH_ARIA_128_CBC_SHA256"},
-    {0xC071, "TLS_ECDHE_PSK_WITH_ARIA_256_CBC_SHA384"},
-    {0xC072, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC073, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC074, "TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC075, "TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC076, "TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC077, "TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC078, "TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC079, "TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC07A, "TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC07B, "TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC07C, "TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC07D, "TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC07E, "TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC07F, "TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC080, "TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC081, "TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC082, "TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC083, "TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC084, "TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC085, "TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC086, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC087, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC088, "TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC089, "TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC08A, "TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC08B, "TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC08C, "TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC08D, "TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC08E, "TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC08F, "TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC090, "TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC091, "TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC092, "TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256"},
-    {0xC093, "TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384"},
-    {0xC094, "TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC095, "TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC096, "TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC097, "TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC098, "TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC099, "TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC09A, "TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256"},
-    {0xC09B, "TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384"},
-    {0xC09C, "TLS_RSA_WITH_AES_128_CCM"},
-    {0xC09D, "TLS_RSA_WITH_AES_256_CCM"},
-    {0xC09E, "TLS_DHE_RSA_WITH_AES_128_CCM"},
-    {0xC09F, "TLS_DHE_RSA_WITH_AES_256_CCM"},
-    {0xC0A0, "TLS_RSA_WITH_AES_128_CCM_8"},
-    {0xC0A1, "TLS_RSA_WITH_AES_256_CCM_8"},
-    {0xC0A2, "TLS_DHE_RSA_WITH_AES_128_CCM_8"},
-    {0xC0A3, "TLS_DHE_RSA_WITH_AES_256_CCM_8"},
-    {0xC0A4, "TLS_PSK_WITH_AES_128_CCM"},
-    {0xC0A5, "TLS_PSK_WITH_AES_256_CCM"},
-    {0xC0A6, "TLS_DHE_PSK_WITH_AES_128_CCM"},
-    {0xC0A7, "TLS_DHE_PSK_WITH_AES_256_CCM"},
-    {0xC0A8, "TLS_PSK_WITH_AES_128_CCM_8"},
-    {0xC0A9, "TLS_PSK_WITH_AES_256_CCM_8"},
-    {0xC0AA, "TLS_PSK_DHE_WITH_AES_128_CCM_8"},
-    {0xC0AB, "TLS_PSK_DHE_WITH_AES_256_CCM_8"},
-    {0xC0AC, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM"},
-    {0xC0AD, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM"},
-    {0xC0AE, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8"},
-    {0xC0AF, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8"},
-    {0xCCA8, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"},
-    {0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"},
-    {0xCCAA, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"},
-    {0xCCAB, "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256"},
-    {0xCCAC, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"},
-    {0xCCAD, "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256"},
-    {0xCCAE, "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256"},
-    {0x1301, "TLS_AES_128_GCM_SHA256"},
-    {0x1302, "TLS_AES_256_GCM_SHA384"},
-    {0x1303, "TLS_CHACHA20_POLY1305_SHA256"},
-    {0x1304, "TLS_AES_128_CCM_SHA256"},
-    {0x1305, "TLS_AES_128_CCM_8_SHA256"},
-    {0xC0B4, "TLS_SHA256_SHA256"},
-    {0xC0B5, "TLS_SHA384_SHA384"},
-    {0xFEFE, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"},
-    {0xFEFF, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA"},
+    { 0x0000, "TLS_NULL_WITH_NULL_NULL" },
+    { 0x0001, "TLS_RSA_WITH_NULL_MD5" },
+    { 0x0002, "TLS_RSA_WITH_NULL_SHA" },
+    { 0x0003, "TLS_RSA_EXPORT_WITH_RC4_40_MD5" },
+    { 0x0004, "TLS_RSA_WITH_RC4_128_MD5" },
+    { 0x0005, "TLS_RSA_WITH_RC4_128_SHA" },
+    { 0x0006, "TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5" },
+    { 0x0007, "TLS_RSA_WITH_IDEA_CBC_SHA" },
+    { 0x0008, "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA" },
+    { 0x0009, "TLS_RSA_WITH_DES_CBC_SHA" },
+    { 0x000A, "TLS_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0x000B, "TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA" },
+    { 0x000C, "TLS_DH_DSS_WITH_DES_CBC_SHA" },
+    { 0x000D, "TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA" },
+    { 0x000E, "TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA" },
+    { 0x000F, "TLS_DH_RSA_WITH_DES_CBC_SHA" },
+    { 0x0010, "TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0x0011, "TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA" },
+    { 0x0012, "TLS_DHE_DSS_WITH_DES_CBC_SHA" },
+    { 0x0013, "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA" },
+    { 0x0014, "TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA" },
+    { 0x0015, "TLS_DHE_RSA_WITH_DES_CBC_SHA" },
+    { 0x0016, "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0x0017, "TLS_DH_anon_EXPORT_WITH_RC4_40_MD5" },
+    { 0x0018, "TLS_DH_anon_WITH_RC4_128_MD5" },
+    { 0x0019, "TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA" },
+    { 0x001A, "TLS_DH_anon_WITH_DES_CBC_SHA" },
+    { 0x001B, "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA" },
+    { 0x001D, "SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA" },
+    { 0x001E, "SSL_FORTEZZA_KEA_WITH_RC4_128_SHA" },
+    { 0x001F, "TLS_KRB5_WITH_3DES_EDE_CBC_SHA" },
+    { 0x0020, "TLS_KRB5_WITH_RC4_128_SHA" },
+    { 0x0021, "TLS_KRB5_WITH_IDEA_CBC_SHA" },
+    { 0x0022, "TLS_KRB5_WITH_DES_CBC_MD5" },
+    { 0x0023, "TLS_KRB5_WITH_3DES_EDE_CBC_MD5" },
+    { 0x0024, "TLS_KRB5_WITH_RC4_128_MD5" },
+    { 0x0025, "TLS_KRB5_WITH_IDEA_CBC_MD5" },
+    { 0x0026, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA" },
+    { 0x0027, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_SHA" },
+    { 0x0028, "TLS_KRB5_EXPORT_WITH_RC4_40_SHA" },
+    { 0x0029, "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5" },
+    { 0x002A, "TLS_KRB5_EXPORT_WITH_RC2_CBC_40_MD5" },
+    { 0x002B, "TLS_KRB5_EXPORT_WITH_RC4_40_MD5" },
+    { 0x002C, "TLS_PSK_WITH_NULL_SHA" },
+    { 0x002D, "TLS_DHE_PSK_WITH_NULL_SHA" },
+    { 0x002E, "TLS_RSA_PSK_WITH_NULL_SHA" },
+    { 0x002F, "TLS_RSA_WITH_AES_128_CBC_SHA" },
+    { 0x0030, "TLS_DH_DSS_WITH_AES_128_CBC_SHA" },
+    { 0x0031, "TLS_DH_RSA_WITH_AES_128_CBC_SHA" },
+    { 0x0032, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA" },
+    { 0x0033, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA" },
+    { 0x0034, "TLS_DH_anon_WITH_AES_128_CBC_SHA" },
+    { 0x0035, "TLS_RSA_WITH_AES_256_CBC_SHA" },
+    { 0x0036, "TLS_DH_DSS_WITH_AES_256_CBC_SHA" },
+    { 0x0037, "TLS_DH_RSA_WITH_AES_256_CBC_SHA" },
+    { 0x0038, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA" },
+    { 0x0039, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA" },
+    { 0x003A, "TLS_DH_anon_WITH_AES_256_CBC_SHA" },
+    { 0x003B, "TLS_RSA_WITH_NULL_SHA256" },
+    { 0x003C, "TLS_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0x003D, "TLS_RSA_WITH_AES_256_CBC_SHA256" },
+    { 0x003E, "TLS_DH_DSS_WITH_AES_128_CBC_SHA256" },
+    { 0x003F, "TLS_DH_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0x0040, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256" },
+    { 0x0041, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA" },
+    { 0x0042, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA" },
+    { 0x0043, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA" },
+    { 0x0044, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA" },
+    { 0x0045, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA" },
+    { 0x0046, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA" },
+    { 0x0067, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0x0068, "TLS_DH_DSS_WITH_AES_256_CBC_SHA256" },
+    { 0x0069, "TLS_DH_RSA_WITH_AES_256_CBC_SHA256" },
+    { 0x006A, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256" },
+    { 0x006B, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256" },
+    { 0x006C, "TLS_DH_anon_WITH_AES_128_CBC_SHA256" },
+    { 0x006D, "TLS_DH_anon_WITH_AES_256_CBC_SHA256" },
+    { 0x0084, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA" },
+    { 0x0085, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA" },
+    { 0x0086, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA" },
+    { 0x0087, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA" },
+    { 0x0088, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA" },
+    { 0x0089, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA" },
+    { 0x008A, "TLS_PSK_WITH_RC4_128_SHA" },
+    { 0x008B, "TLS_PSK_WITH_3DES_EDE_CBC_SHA" },
+    { 0x008C, "TLS_PSK_WITH_AES_128_CBC_SHA" },
+    { 0x008D, "TLS_PSK_WITH_AES_256_CBC_SHA" },
+    { 0x008E, "TLS_DHE_PSK_WITH_RC4_128_SHA" },
+    { 0x008F, "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA" },
+    { 0x0090, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA" },
+    { 0x0091, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA" },
+    { 0x0092, "TLS_RSA_PSK_WITH_RC4_128_SHA" },
+    { 0x0093, "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA" },
+    { 0x0094, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA" },
+    { 0x0095, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA" },
+    { 0x0096, "TLS_RSA_WITH_SEED_CBC_SHA" },
+    { 0x0097, "TLS_DH_DSS_WITH_SEED_CBC_SHA" },
+    { 0x0098, "TLS_DH_RSA_WITH_SEED_CBC_SHA" },
+    { 0x0099, "TLS_DHE_DSS_WITH_SEED_CBC_SHA" },
+    { 0x009A, "TLS_DHE_RSA_WITH_SEED_CBC_SHA" },
+    { 0x009B, "TLS_DH_anon_WITH_SEED_CBC_SHA" },
+    { 0x009C, "TLS_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0x009D, "TLS_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0x009E, "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0x009F, "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0x00A0, "TLS_DH_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0x00A1, "TLS_DH_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0x00A2, "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256" },
+    { 0x00A3, "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384" },
+    { 0x00A4, "TLS_DH_DSS_WITH_AES_128_GCM_SHA256" },
+    { 0x00A5, "TLS_DH_DSS_WITH_AES_256_GCM_SHA384" },
+    { 0x00A6, "TLS_DH_anon_WITH_AES_128_GCM_SHA256" },
+    { 0x00A7, "TLS_DH_anon_WITH_AES_256_GCM_SHA384" },
+    { 0x00A8, "TLS_PSK_WITH_AES_128_GCM_SHA256" },
+    { 0x00A9, "TLS_PSK_WITH_AES_256_GCM_SHA384" },
+    { 0x00AA, "TLS_DHE_PSK_WITH_AES_128_GCM_SHA256" },
+    { 0x00AB, "TLS_DHE_PSK_WITH_AES_256_GCM_SHA384" },
+    { 0x00AC, "TLS_RSA_PSK_WITH_AES_128_GCM_SHA256" },
+    { 0x00AD, "TLS_RSA_PSK_WITH_AES_256_GCM_SHA384" },
+    { 0x00AE, "TLS_PSK_WITH_AES_128_CBC_SHA256" },
+    { 0x00AF, "TLS_PSK_WITH_AES_256_CBC_SHA384" },
+    { 0x00B0, "TLS_PSK_WITH_NULL_SHA256" },
+    { 0x00B1, "TLS_PSK_WITH_NULL_SHA384" },
+    { 0x00B2, "TLS_DHE_PSK_WITH_AES_128_CBC_SHA256" },
+    { 0x00B3, "TLS_DHE_PSK_WITH_AES_256_CBC_SHA384" },
+    { 0x00B4, "TLS_DHE_PSK_WITH_NULL_SHA256" },
+    { 0x00B5, "TLS_DHE_PSK_WITH_NULL_SHA384" },
+    { 0x00B6, "TLS_RSA_PSK_WITH_AES_128_CBC_SHA256" },
+    { 0x00B7, "TLS_RSA_PSK_WITH_AES_256_CBC_SHA384" },
+    { 0x00B8, "TLS_RSA_PSK_WITH_NULL_SHA256" },
+    { 0x00B9, "TLS_RSA_PSK_WITH_NULL_SHA384" },
+    { 0x00BA, "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0x00BB, "TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0x00BC, "TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0x00BD, "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0x00BE, "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0x00BF, "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0x00C0, "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
+    { 0x00C1, "TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256" },
+    { 0x00C2, "TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
+    { 0x00C3, "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256" },
+    { 0x00C4, "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256" },
+    { 0x00C5, "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256" },
+    { 0x00FF, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" },
+    { 0x5600, "TLS_FALLBACK_SCSV" },
+    { 0xC001, "TLS_ECDH_ECDSA_WITH_NULL_SHA" },
+    { 0xC002, "TLS_ECDH_ECDSA_WITH_RC4_128_SHA" },
+    { 0xC003, "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC004, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA" },
+    { 0xC005, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA" },
+    { 0xC006, "TLS_ECDHE_ECDSA_WITH_NULL_SHA" },
+    { 0xC007, "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA" },
+    { 0xC008, "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC009, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA" },
+    { 0xC00A, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA" },
+    { 0xC00B, "TLS_ECDH_RSA_WITH_NULL_SHA" },
+    { 0xC00C, "TLS_ECDH_RSA_WITH_RC4_128_SHA" },
+    { 0xC00D, "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC00E, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA" },
+    { 0xC00F, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA" },
+    { 0xC010, "TLS_ECDHE_RSA_WITH_NULL_SHA" },
+    { 0xC011, "TLS_ECDHE_RSA_WITH_RC4_128_SHA" },
+    { 0xC012, "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC013, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA" },
+    { 0xC014, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA" },
+    { 0xC015, "TLS_ECDH_anon_WITH_NULL_SHA" },
+    { 0xC016, "TLS_ECDH_anon_WITH_RC4_128_SHA" },
+    { 0xC017, "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC018, "TLS_ECDH_anon_WITH_AES_128_CBC_SHA" },
+    { 0xC019, "TLS_ECDH_anon_WITH_AES_256_CBC_SHA" },
+    { 0xC01A, "TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC01B, "TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC01C, "TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC01D, "TLS_SRP_SHA_WITH_AES_128_CBC_SHA" },
+    { 0xC01E, "TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA" },
+    { 0xC01F, "TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA" },
+    { 0xC020, "TLS_SRP_SHA_WITH_AES_256_CBC_SHA" },
+    { 0xC021, "TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA" },
+    { 0xC022, "TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA" },
+    { 0xC023, "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256" },
+    { 0xC024, "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384" },
+    { 0xC025, "TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256" },
+    { 0xC026, "TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384" },
+    { 0xC027, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0xC028, "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384" },
+    { 0xC029, "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256" },
+    { 0xC02A, "TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384" },
+    { 0xC02B, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" },
+    { 0xC02C, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" },
+    { 0xC02D, "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256" },
+    { 0xC02E, "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384" },
+    { 0xC02F, "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0xC030, "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0xC031, "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256" },
+    { 0xC032, "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384" },
+    { 0xC033, "TLS_ECDHE_PSK_WITH_RC4_128_SHA" },
+    { 0xC034, "TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA" },
+    { 0xC035, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA" },
+    { 0xC036, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA" },
+    { 0xC037, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256" },
+    { 0xC038, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384" },
+    { 0xC039, "TLS_ECDHE_PSK_WITH_NULL_SHA" },
+    { 0xC03A, "TLS_ECDHE_PSK_WITH_NULL_SHA256" },
+    { 0xC03B, "TLS_ECDHE_PSK_WITH_NULL_SHA384" },
+    { 0xC03C, "TLS_RSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC03D, "TLS_RSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC03E, "TLS_DH_DSS_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC03F, "TLS_DH_DSS_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC040, "TLS_DH_RSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC041, "TLS_DH_RSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC042, "TLS_DHE_DSS_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC043, "TLS_DHE_DSS_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC044, "TLS_DHE_RSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC045, "TLS_DHE_RSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC046, "TLS_DH_anon_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC047, "TLS_DH_anon_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC048, "TLS_ECDHE_ECDSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC049, "TLS_ECDHE_ECDSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC04A, "TLS_ECDH_ECDSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC04B, "TLS_ECDH_ECDSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC04C, "TLS_ECDHE_RSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC04D, "TLS_ECDHE_RSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC04E, "TLS_ECDH_RSA_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC04F, "TLS_ECDH_RSA_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC050, "TLS_RSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC051, "TLS_RSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC052, "TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC053, "TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC054, "TLS_DH_RSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC055, "TLS_DH_RSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC056, "TLS_DHE_DSS_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC057, "TLS_DHE_DSS_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC058, "TLS_DH_DSS_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC059, "TLS_DH_DSS_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC05A, "TLS_DH_anon_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC05B, "TLS_DH_anon_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC05C, "TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC05D, "TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC05E, "TLS_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC05F, "TLS_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC060, "TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC061, "TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC062, "TLS_ECDH_RSA_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC063, "TLS_ECDH_RSA_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC064, "TLS_PSK_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC065, "TLS_PSK_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC066, "TLS_DHE_PSK_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC067, "TLS_DHE_PSK_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC068, "TLS_RSA_PSK_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC069, "TLS_RSA_PSK_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC06A, "TLS_PSK_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC06B, "TLS_PSK_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC06C, "TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC06D, "TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC06E, "TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256" },
+    { 0xC06F, "TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384" },
+    { 0xC070, "TLS_ECDHE_PSK_WITH_ARIA_128_CBC_SHA256" },
+    { 0xC071, "TLS_ECDHE_PSK_WITH_ARIA_256_CBC_SHA384" },
+    { 0xC072, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC073, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC074, "TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC075, "TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC076, "TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC077, "TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC078, "TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC079, "TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC07A, "TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC07B, "TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC07C, "TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC07D, "TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC07E, "TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC07F, "TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC080, "TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC081, "TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC082, "TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC083, "TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC084, "TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC085, "TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC086, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC087, "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC088, "TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC089, "TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC08A, "TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC08B, "TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC08C, "TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC08D, "TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC08E, "TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC08F, "TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC090, "TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC091, "TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC092, "TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256" },
+    { 0xC093, "TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384" },
+    { 0xC094, "TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC095, "TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC096, "TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC097, "TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC098, "TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC099, "TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC09A, "TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256" },
+    { 0xC09B, "TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384" },
+    { 0xC09C, "TLS_RSA_WITH_AES_128_CCM" },
+    { 0xC09D, "TLS_RSA_WITH_AES_256_CCM" },
+    { 0xC09E, "TLS_DHE_RSA_WITH_AES_128_CCM" },
+    { 0xC09F, "TLS_DHE_RSA_WITH_AES_256_CCM" },
+    { 0xC0A0, "TLS_RSA_WITH_AES_128_CCM_8" },
+    { 0xC0A1, "TLS_RSA_WITH_AES_256_CCM_8" },
+    { 0xC0A2, "TLS_DHE_RSA_WITH_AES_128_CCM_8" },
+    { 0xC0A3, "TLS_DHE_RSA_WITH_AES_256_CCM_8" },
+    { 0xC0A4, "TLS_PSK_WITH_AES_128_CCM" },
+    { 0xC0A5, "TLS_PSK_WITH_AES_256_CCM" },
+    { 0xC0A6, "TLS_DHE_PSK_WITH_AES_128_CCM" },
+    { 0xC0A7, "TLS_DHE_PSK_WITH_AES_256_CCM" },
+    { 0xC0A8, "TLS_PSK_WITH_AES_128_CCM_8" },
+    { 0xC0A9, "TLS_PSK_WITH_AES_256_CCM_8" },
+    { 0xC0AA, "TLS_PSK_DHE_WITH_AES_128_CCM_8" },
+    { 0xC0AB, "TLS_PSK_DHE_WITH_AES_256_CCM_8" },
+    { 0xC0AC, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM" },
+    { 0xC0AD, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM" },
+    { 0xC0AE, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8" },
+    { 0xC0AF, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8" },
+    { 0xCCA8, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0xCCAA, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0xCCAB, "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0xCCAC, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0xCCAD, "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0xCCAE, "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256" },
+    { 0x1301, "TLS_AES_128_GCM_SHA256" },
+    { 0x1302, "TLS_AES_256_GCM_SHA384" },
+    { 0x1303, "TLS_CHACHA20_POLY1305_SHA256" },
+    { 0x1304, "TLS_AES_128_CCM_SHA256" },
+    { 0x1305, "TLS_AES_128_CCM_8_SHA256" },
+    { 0xC0B4, "TLS_SHA256_SHA256" },
+    { 0xC0B5, "TLS_SHA384_SHA384" },
+    { 0xFEFE, "SSL_RSA_FIPS_WITH_DES_CBC_SHA" },
+    { 0xFEFF, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA" },
 };
 
 static const char *get_std_name_by_id(int id)
@@ -433,20 +433,20 @@ static int test_cipher_name(void)
     for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
         c = sk_SSL_CIPHER_value(sk, i);
         id = SSL_CIPHER_get_id(c) & 0xFFFF;
-        if ((id == 0xC102) || (id == 0xFF85) ||(id == 0xFF87))
+        if ((id == 0xC102) || (id == 0xFF85) || (id == 0xFF87))
             /* skip GOST2012-GOST8912-GOST891 and GOST2012-NULL-GOST12 */
             continue;
         p = SSL_CIPHER_standard_name(c);
         q = get_std_name_by_id(id);
         if (!TEST_ptr(p)) {
             TEST_info("test_cipher_name failed: expected %s, got NULL, cipher %x\n",
-                      q, id);
+                q, id);
             goto err;
         }
         /* check if p is a valid standard name */
         if (!TEST_str_eq(p, q)) {
             TEST_info("test_cipher_name(std) failed: expected %s, got %s, cipher %x\n",
-                       q, p, id);
+                q, p, id);
             goto err;
         }
         /* test OPENSSL_cipher_name */
@@ -454,7 +454,7 @@ static int test_cipher_name(void)
         r = OPENSSL_cipher_name(p);
         if (!TEST_str_eq(r, q)) {
             TEST_info("test_cipher_name(ossl) failed: expected %s, got %s, cipher %x\n",
-                       q, r, id);
+                q, r, id);
             goto err;
         }
     }
diff --git a/test/clienthellotest.c b/test/clienthellotest.c
index 7fc21d9b12624..c483547207dcd 100644
--- a/test/clienthellotest.c
+++ b/test/clienthellotest.c
@@ -21,33 +21,31 @@
 
 #include "testutil.h"
 
-#define CLIENT_VERSION_LEN      2
+#define CLIENT_VERSION_LEN 2
 
-#define TOTAL_NUM_TESTS                         3
+#define TOTAL_NUM_TESTS 3
 
 /*
  * Test that explicitly setting ticket data results in it appearing in the
  * ClientHello for a negotiated SSL/TLS version
  */
-#define TEST_SET_SESSION_TICK_DATA_VER_NEG      0
+#define TEST_SET_SESSION_TICK_DATA_VER_NEG 0
 /* Enable padding and make sure ClientHello is long enough to require it */
-#define TEST_ADD_PADDING                        1
+#define TEST_ADD_PADDING 1
 /* Enable padding and make sure ClientHello is short enough to not need it */
-#define TEST_PADDING_NOT_NEEDED                 2
+#define TEST_PADDING_NOT_NEEDED 2
 
-#define F5_WORKAROUND_MIN_MSG_LEN   0x7f
-#define F5_WORKAROUND_MAX_MSG_LEN   0x200
+#define F5_WORKAROUND_MIN_MSG_LEN 0x7f
+#define F5_WORKAROUND_MAX_MSG_LEN 0x200
 
 /* Dummy ALPN protocols used to pad out the size of the ClientHello */
 /* ASCII 'O' = 79 = 0x4F = EBCDIC '|'*/
 #ifdef CHARSET_EBCDIC
-static const char alpn_prots[] =
-    "|1234567890123456789012345678901234567890123456789012345678901234567890123456789"
-    "|1234567890123456789012345678901234567890123456789012345678901234567890123456789";
+static const char alpn_prots[] = "|1234567890123456789012345678901234567890123456789012345678901234567890123456789"
+                                 "|1234567890123456789012345678901234567890123456789012345678901234567890123456789";
 #else
-static const char alpn_prots[] =
-    "O1234567890123456789012345678901234567890123456789012345678901234567890123456789"
-    "O1234567890123456789012345678901234567890123456789012345678901234567890123456789";
+static const char alpn_prots[] = "O1234567890123456789012345678901234567890123456789012345678901234567890123456789"
+                                 "O1234567890123456789012345678901234567890123456789012345678901234567890123456789";
 #endif
 
 static int test_client_hello(int currtest)
@@ -100,7 +98,7 @@ static int test_client_hello(int currtest)
         SSL_CTX_clear_options(ctx, SSL_OP_ENABLE_MIDDLEBOX_COMPAT);
         /* Avoid large keyshares */
         if (!TEST_true(SSL_CTX_set1_groups_list(ctx,
-                       "?X25519:?secp256r1:?ffdhe2048:?ffdhe3072")))
+                "?X25519:?secp256r1:?ffdhe2048:?ffdhe3072")))
             goto end;
         /*
          * Add some dummy ALPN protocols so that the ClientHello is at least
@@ -108,18 +106,18 @@ static int test_client_hello(int currtest)
          * needed.
          */
         if (currtest == TEST_ADD_PADDING) {
-             if (!TEST_false(SSL_CTX_set_alpn_protos(ctx,
-                                    (unsigned char *)alpn_prots,
-                                    sizeof(alpn_prots) - 1)))
+            if (!TEST_false(SSL_CTX_set_alpn_protos(ctx,
+                    (unsigned char *)alpn_prots,
+                    sizeof(alpn_prots) - 1)))
                 goto end;
-        /*
-         * Otherwise we need to make sure we have a small enough message to
-         * not need padding.
-         */
+            /*
+             * Otherwise we need to make sure we have a small enough message to
+             * not need padding.
+             */
         } else if (!TEST_true(SSL_CTX_set_cipher_list(ctx,
-                              "AES128-SHA"))
-                   || !TEST_true(SSL_CTX_set_ciphersuites(ctx,
-                                 "TLS_AES_128_GCM_SHA256"))) {
+                       "AES128-SHA"))
+            || !TEST_true(SSL_CTX_set_ciphersuites(ctx,
+                "TLS_AES_128_GCM_SHA256"))) {
             goto end;
         }
         break;
@@ -134,7 +132,7 @@ static int test_client_hello(int currtest)
 
     rbio = BIO_new(BIO_s_mem());
     wbio = BIO_new(BIO_s_mem());
-    if (!TEST_ptr(rbio)|| !TEST_ptr(wbio)) {
+    if (!TEST_ptr(rbio) || !TEST_ptr(wbio)) {
         BIO_free(rbio);
         BIO_free(wbio);
         goto end;
@@ -145,7 +143,7 @@ static int test_client_hello(int currtest)
 
     if (currtest == TEST_SET_SESSION_TICK_DATA_VER_NEG) {
         if (!TEST_true(SSL_set_session_ticket_ext(con, dummytick,
-                                                  strlen(dummytick))))
+                strlen(dummytick))))
             goto end;
     }
 
@@ -155,39 +153,38 @@ static int test_client_hello(int currtest)
     }
 
     if (!TEST_long_ge(len = BIO_get_mem_data(wbio, (char **)&data), 0)
-            || !TEST_true(PACKET_buf_init(&pkt, data, len))
-               /* Skip the record header */
-            || !PACKET_forward(&pkt, SSL3_RT_HEADER_LENGTH))
+        || !TEST_true(PACKET_buf_init(&pkt, data, len))
+        /* Skip the record header */
+        || !PACKET_forward(&pkt, SSL3_RT_HEADER_LENGTH))
         goto end;
 
     msglen = PACKET_remaining(&pkt);
 
     /* Skip the handshake message header */
     if (!TEST_true(PACKET_forward(&pkt, SSL3_HM_HEADER_LENGTH))
-               /* Skip client version and random */
-            || !TEST_true(PACKET_forward(&pkt, CLIENT_VERSION_LEN
-                                               + SSL3_RANDOM_SIZE))
-               /* Skip session id */
-            || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
-               /* Skip ciphers */
-            || !TEST_true(PACKET_get_length_prefixed_2(&pkt, &pkt2))
-               /* Skip compression */
-            || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
-               /* Extensions len */
-            || !TEST_true(PACKET_as_length_prefixed_2(&pkt, &pkt2)))
+        /* Skip client version and random */
+        || !TEST_true(PACKET_forward(&pkt, CLIENT_VERSION_LEN + SSL3_RANDOM_SIZE))
+        /* Skip session id */
+        || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
+        /* Skip ciphers */
+        || !TEST_true(PACKET_get_length_prefixed_2(&pkt, &pkt2))
+        /* Skip compression */
+        || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
+        /* Extensions len */
+        || !TEST_true(PACKET_as_length_prefixed_2(&pkt, &pkt2)))
         goto end;
 
     /* Loop through all extensions */
     while (PACKET_remaining(&pkt2)) {
 
         if (!TEST_true(PACKET_get_net_2(&pkt2, &type))
-                || !TEST_true(PACKET_get_length_prefixed_2(&pkt2, &pkt3)))
+            || !TEST_true(PACKET_get_length_prefixed_2(&pkt2, &pkt3)))
             goto end;
 
         if (type == TLSEXT_TYPE_session_ticket) {
             if (currtest == TEST_SET_SESSION_TICK_DATA_VER_NEG) {
                 if (TEST_true(PACKET_equal(&pkt3, dummytick,
-                                           strlen(dummytick)))) {
+                        strlen(dummytick)))) {
                     /* Ticket data is as we expected */
                     testresult = 1;
                 }
diff --git a/test/cmactest.c b/test/cmactest.c
index a550d4edecd1b..0195b30389dbb 100644
--- a/test/cmactest.c
+++ b/test/cmactest.c
@@ -38,101 +38,74 @@ static struct test_st {
     int data_len;
     const char *mac;
 } test[] = {
-    {
-        {
-            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
-            0x0b, 0x0c, 0x0d, 0x0e, 0x0f
-        },
+    { { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+          0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
         16,
         "My test data",
         12,
-        "29cec977c48f63c200bd5c4a6881b224"
-    },
-    {
-        {
-            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
-            0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
-            0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
-        },
+        "29cec977c48f63c200bd5c4a6881b224" },
+    { { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+          0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
+          0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
         32,
         "My test data",
         12,
-        "db6493aa04e4761f473b2b453c031c9a"
-    },
-    {
-        {
-            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
-            0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
-            0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
-        },
+        "db6493aa04e4761f473b2b453c031c9a" },
+    { { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+          0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
+          0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
         32,
         "My test data again",
         18,
-        "65c11c75ecf590badd0a5e56cbb8af60"
-    },
+        "65c11c75ecf590badd0a5e56cbb8af60" },
     /* for aes-128-cbc */
     {
-        {
-            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
-            0x0b, 0x0c, 0x0d, 0x0e, 0x0f
-        },
+        { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+            0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
         16,
         /* repeat the string below until filling 3072 bytes */
         "#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789#",
         3072,
-        "35da8a02a7afce90e5b711308cee2dee"
-    },
+        "35da8a02a7afce90e5b711308cee2dee" },
     /* for aes-192-cbc */
     {
-        {
-            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+        { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
             0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
-            0x16, 0x17
-        },
+            0x16, 0x17 },
         24,
         /* repeat the string below until filling 4095 bytes */
         "#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789#",
         4095,
-        "59053f4e81f3593610f987adb547c5b2"
-    },
+        "59053f4e81f3593610f987adb547c5b2" },
     /* for aes-256-cbc */
     {
-        {
-            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+        { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
             0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
-            0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
-        },
+            0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
         32,
         /* repeat the string below until filling 2560 bytes */
         "#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789#",
         2560,
-        "9c6cf85f7f4baca99725764a0df973a9"
-    },
+        "9c6cf85f7f4baca99725764a0df973a9" },
     /* for des-ede3-cbc */
     {
-        {
-            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+        { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
             0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
-            0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
-        },
+            0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
         24,
         /* repeat the string below until filling 2048 bytes */
         "#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789#",
         2048,
-        "2c2fccc7fcc5d98a"
-    },
+        "2c2fccc7fcc5d98a" },
     /* for sm4-cbc */
     {
-        {
-            0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
-            0x0b, 0x0c, 0x0d, 0x0e, 0x0f
-        },
+        { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+            0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
         16,
         /* repeat the string below until filling 2049 bytes */
         "#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789#",
         2049,
-        "c9a9cbc82a3b2d96074e386fce1216f2"
-    },
+        "c9a9cbc82a3b2d96074e386fce1216f2" },
 };
 
 static char *pt(unsigned char *md, unsigned int len);
@@ -146,17 +119,17 @@ static int test_cmac_bad(void)
     if (!TEST_ptr(ctx)
         || !TEST_false(CMAC_Init(ctx, NULL, 0, NULL, NULL))
         || !TEST_false(CMAC_Update(ctx, test[0].data, test[0].data_len))
-           /* Should be able to pass cipher first, and then key */
+        /* Should be able to pass cipher first, and then key */
         || !TEST_true(CMAC_Init(ctx, NULL, 0, EVP_aes_128_cbc(), NULL))
-           /* Must have a key */
+        /* Must have a key */
         || !TEST_false(CMAC_Update(ctx, test[0].data, test[0].data_len))
-           /* Now supply the key */
+        /* Now supply the key */
         || !TEST_true(CMAC_Init(ctx, test[0].key, test[0].key_len, NULL, NULL))
-           /* Update should now work */
+        /* Update should now work */
         || !TEST_true(CMAC_Update(ctx, test[0].data, test[0].data_len))
-           /* XTS is not a suitable cipher to use */
+        /* XTS is not a suitable cipher to use */
         || !TEST_false(CMAC_Init(ctx, xtskey, sizeof(xtskey), EVP_aes_128_xts(),
-                                 NULL))
+            NULL))
         || !TEST_false(CMAC_Update(ctx, test[0].data, test[0].data_len)))
         goto err;
 
@@ -195,7 +168,7 @@ static int test_cmac_run(void)
     }
 
     if (!TEST_true(CMAC_Init(ctx, test[0].key, test[0].key_len,
-                             EVP_aes_128_cbc(), NULL))
+            EVP_aes_128_cbc(), NULL))
         || !TEST_true(CMAC_Update(ctx, test[0].data, test[0].data_len))
         || !TEST_true(CMAC_Final(ctx, buf, &len)))
         goto err;
@@ -205,7 +178,7 @@ static int test_cmac_run(void)
         goto err;
 
     if (!TEST_true(CMAC_Init(ctx, test[1].key, test[1].key_len,
-                             EVP_aes_256_cbc(), NULL))
+            EVP_aes_256_cbc(), NULL))
         || !TEST_true(CMAC_Update(ctx, test[1].data, test[1].data_len))
         || !TEST_true(CMAC_Final(ctx, buf, &len)))
         goto err;
@@ -242,7 +215,7 @@ static int test_cmac_run(void)
 
     /* Test data length is greater than 1 block length */
     if (!TEST_true(CMAC_Init(ctx, test[3].key, test[3].key_len,
-                             EVP_aes_128_cbc(), NULL))
+            EVP_aes_128_cbc(), NULL))
         || !TEST_true(CMAC_Update(ctx, test[3].data, test[3].data_len))
         || !TEST_true(CMAC_Final(ctx, buf, &len)))
         goto err;
@@ -251,7 +224,7 @@ static int test_cmac_run(void)
         goto err;
 
     if (!TEST_true(CMAC_Init(ctx, test[4].key, test[4].key_len,
-                             EVP_aes_192_cbc(), NULL))
+            EVP_aes_192_cbc(), NULL))
         || !TEST_true(CMAC_Update(ctx, test[4].data, test[4].data_len))
         || !TEST_true(CMAC_Final(ctx, buf, &len)))
         goto err;
@@ -260,7 +233,7 @@ static int test_cmac_run(void)
         goto err;
 
     if (!TEST_true(CMAC_Init(ctx, test[5].key, test[5].key_len,
-                             EVP_aes_256_cbc(), NULL))
+            EVP_aes_256_cbc(), NULL))
         || !TEST_true(CMAC_Update(ctx, test[5].data, test[5].data_len))
         || !TEST_true(CMAC_Final(ctx, buf, &len)))
         goto err;
@@ -270,7 +243,7 @@ static int test_cmac_run(void)
 
 #ifndef OPENSSL_NO_DES
     if (!TEST_true(CMAC_Init(ctx, test[6].key, test[6].key_len,
-                             EVP_des_ede3_cbc(), NULL))
+            EVP_des_ede3_cbc(), NULL))
         || !TEST_true(CMAC_Update(ctx, test[6].data, test[6].data_len))
         || !TEST_true(CMAC_Final(ctx, buf, &len)))
         goto err;
@@ -281,7 +254,7 @@ static int test_cmac_run(void)
 
 #ifndef OPENSSL_NO_SM4
     if (!TEST_true(CMAC_Init(ctx, test[7].key, test[7].key_len,
-                             EVP_sm4_cbc(), NULL))
+            EVP_sm4_cbc(), NULL))
         || !TEST_true(CMAC_Update(ctx, test[7].data, test[7].data_len))
         || !TEST_true(CMAC_Final(ctx, buf, &len)))
         goto err;
@@ -310,7 +283,7 @@ static int test_cmac_copy(void)
         goto err;
 
     if (!TEST_true(CMAC_Init(ctx, test[0].key, test[0].key_len,
-                             EVP_aes_128_cbc(), NULL))
+            EVP_aes_128_cbc(), NULL))
         || !TEST_true(CMAC_Update(ctx, test[0].data, test[0].data_len))
         || !TEST_true(CMAC_CTX_copy(ctx2, ctx))
         || !TEST_true(CMAC_Final(ctx2, buf, &len)))
@@ -335,7 +308,7 @@ static char *pt(unsigned char *md, unsigned int len)
 
     for (i = 0; i < len && (i + 1) * OSSL_HEX_CHARS_PER_BYTE < sizeof(buf); i++)
         BIO_snprintf(buf + i * OSSL_HEX_CHARS_PER_BYTE,
-                     OSSL_HEX_CHARS_PER_BYTE + 1, "%02x", md[i]);
+            OSSL_HEX_CHARS_PER_BYTE + 1, "%02x", md[i]);
     return buf;
 }
 
@@ -346,4 +319,3 @@ int setup_tests(void)
     ADD_TEST(test_cmac_copy);
     return 1;
 }
-
diff --git a/test/cmp_asn_test.c b/test/cmp_asn_test.c
index 786bd3296e0f7..6990b9b93dfc9 100644
--- a/test/cmp_asn_test.c
+++ b/test/cmp_asn_test.c
@@ -63,7 +63,7 @@ static int execute_cmp_asn1_get_int_test(CMP_ASN_TEST_FIXTURE *fixture)
         goto err;
     res = TEST_int_eq(-2, ossl_cmp_asn1_get_int(asn1integer));
 
- err:
+err:
     ASN1_INTEGER_free(asn1integer);
     return res;
 }
@@ -77,15 +77,14 @@ static int test_cmp_asn1_get_int(void)
 }
 
 static int execute_CMP_ASN1_OCTET_STRING_set1_test(CMP_ASN_TEST_FIXTURE *
-                                                   fixture)
+        fixture)
 {
     if (!TEST_int_eq(fixture->expected,
-                     ossl_cmp_asn1_octet_string_set1(&fixture->tgt_string,
-                                                     fixture->src_string)))
+            ossl_cmp_asn1_octet_string_set1(&fixture->tgt_string,
+                fixture->src_string)))
         return 0;
     if (fixture->expected != 0)
-        return TEST_int_eq(0, ASN1_OCTET_STRING_cmp(fixture->tgt_string,
-                                                    fixture->src_string));
+        return TEST_int_eq(0, ASN1_OCTET_STRING_cmp(fixture->tgt_string, fixture->src_string));
     return 1;
 }
 
@@ -94,9 +93,9 @@ static int test_ASN1_OCTET_STRING_set(void)
     SETUP_TEST_FIXTURE(CMP_ASN_TEST_FIXTURE, set_up);
     fixture->expected = 1;
     if (!TEST_ptr(fixture->tgt_string = ASN1_OCTET_STRING_new())
-            || !TEST_ptr(fixture->src_string = ASN1_OCTET_STRING_new())
-            || !TEST_true(ASN1_OCTET_STRING_set(fixture->src_string, rand_data,
-                                                sizeof(rand_data)))) {
+        || !TEST_ptr(fixture->src_string = ASN1_OCTET_STRING_new())
+        || !TEST_true(ASN1_OCTET_STRING_set(fixture->src_string, rand_data,
+            sizeof(rand_data)))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -109,9 +108,9 @@ static int test_ASN1_OCTET_STRING_set_tgt_is_src(void)
     SETUP_TEST_FIXTURE(CMP_ASN_TEST_FIXTURE, set_up);
     fixture->expected = 1;
     if (!TEST_ptr(fixture->src_string = ASN1_OCTET_STRING_new())
-            || !(fixture->tgt_string = fixture->src_string)
-            || !TEST_true(ASN1_OCTET_STRING_set(fixture->src_string, rand_data,
-                                                sizeof(rand_data)))) {
+        || !(fixture->tgt_string = fixture->src_string)
+        || !TEST_true(ASN1_OCTET_STRING_set(fixture->src_string, rand_data,
+            sizeof(rand_data)))) {
         tear_down(fixture);
         fixture = NULL;
     }
diff --git a/test/cmp_client_test.c b/test/cmp_client_test.c
index 4b3b5f4929c94..b0681e85876ca 100644
--- a/test/cmp_client_test.c
+++ b/test/cmp_client_test.c
@@ -61,30 +61,29 @@ static CMP_SES_TEST_FIXTURE *set_up(const char *const test_case_name)
         return NULL;
     fixture->test_case_name = test_case_name;
     if (!TEST_ptr(fixture->srv_ctx = ossl_cmp_mock_srv_new(libctx, NULL))
-            || !OSSL_CMP_SRV_CTX_set_accept_unprotected(fixture->srv_ctx, 1)
-            || !ossl_cmp_mock_srv_set1_refCert(fixture->srv_ctx, client_cert)
-            || !ossl_cmp_mock_srv_set1_certOut(fixture->srv_ctx, client_cert)
-            || (srv_cmp_ctx =
-                OSSL_CMP_SRV_CTX_get0_cmp_ctx(fixture->srv_ctx)) == NULL
-            || !OSSL_CMP_CTX_set1_cert(srv_cmp_ctx, server_cert)
-            || !OSSL_CMP_CTX_set1_pkey(srv_cmp_ctx, server_key))
+        || !OSSL_CMP_SRV_CTX_set_accept_unprotected(fixture->srv_ctx, 1)
+        || !ossl_cmp_mock_srv_set1_refCert(fixture->srv_ctx, client_cert)
+        || !ossl_cmp_mock_srv_set1_certOut(fixture->srv_ctx, client_cert)
+        || (srv_cmp_ctx = OSSL_CMP_SRV_CTX_get0_cmp_ctx(fixture->srv_ctx)) == NULL
+        || !OSSL_CMP_CTX_set1_cert(srv_cmp_ctx, server_cert)
+        || !OSSL_CMP_CTX_set1_pkey(srv_cmp_ctx, server_key))
         goto err;
     if (!TEST_ptr(fixture->cmp_ctx = ctx = OSSL_CMP_CTX_new(libctx, NULL))
-            || !OSSL_CMP_CTX_set_log_cb(fixture->cmp_ctx, print_to_bio_out)
-            || !OSSL_CMP_CTX_set_transfer_cb(ctx, OSSL_CMP_CTX_server_perform)
-            || !OSSL_CMP_CTX_set_transfer_cb_arg(ctx, fixture->srv_ctx)
-            || !OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_UNPROTECTED_SEND, 1)
-            || !OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_UNPROTECTED_ERRORS, 1)
-            || !OSSL_CMP_CTX_set1_oldCert(ctx, client_cert)
-            || !OSSL_CMP_CTX_set1_pkey(ctx, client_key)
-            /* client_key is by default used also for newPkey */
-            || !OSSL_CMP_CTX_set1_srvCert(ctx, server_cert)
-            || !OSSL_CMP_CTX_set1_referenceValue(ctx, ref, sizeof(ref)))
+        || !OSSL_CMP_CTX_set_log_cb(fixture->cmp_ctx, print_to_bio_out)
+        || !OSSL_CMP_CTX_set_transfer_cb(ctx, OSSL_CMP_CTX_server_perform)
+        || !OSSL_CMP_CTX_set_transfer_cb_arg(ctx, fixture->srv_ctx)
+        || !OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_UNPROTECTED_SEND, 1)
+        || !OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_UNPROTECTED_ERRORS, 1)
+        || !OSSL_CMP_CTX_set1_oldCert(ctx, client_cert)
+        || !OSSL_CMP_CTX_set1_pkey(ctx, client_key)
+        /* client_key is by default used also for newPkey */
+        || !OSSL_CMP_CTX_set1_srvCert(ctx, server_cert)
+        || !OSSL_CMP_CTX_set1_referenceValue(ctx, ref, sizeof(ref)))
         goto err;
     fixture->req_type = -1;
     return fixture;
 
- err:
+err:
     tear_down(fixture);
     return NULL;
 }
@@ -92,9 +91,9 @@ static CMP_SES_TEST_FIXTURE *set_up(const char *const test_case_name)
 static int execute_exec_RR_ses_test(CMP_SES_TEST_FIXTURE *fixt)
 {
     return TEST_int_eq(OSSL_CMP_CTX_get_status(fixt->cmp_ctx),
-                       OSSL_CMP_PKISTATUS_unspecified)
+               OSSL_CMP_PKISTATUS_unspecified)
         && TEST_int_eq(OSSL_CMP_exec_RR_ses(fixt->cmp_ctx),
-                       fixt->expected == OSSL_CMP_PKISTATUS_accepted)
+            fixt->expected == OSSL_CMP_PKISTATUS_accepted)
         && TEST_int_eq(OSSL_CMP_CTX_get_status(fixt->cmp_ctx), fixt->expected);
 }
 
@@ -110,8 +109,9 @@ static int execute_exec_GENM_ses_test_single(CMP_SES_TEST_FIXTURE *fixture)
 
     sk_OSSL_CMP_ITAV_pop_free(itavs, OSSL_CMP_ITAV_free);
     return TEST_int_eq(OSSL_CMP_CTX_get_status(ctx), fixture->expected)
-        && fixture->expected == OSSL_CMP_PKISTATUS_accepted ?
-        TEST_ptr(itavs) : TEST_ptr_null(itavs);
+            && fixture->expected == OSSL_CMP_PKISTATUS_accepted
+        ? TEST_ptr(itavs)
+        : TEST_ptr_null(itavs);
 }
 
 static int execute_exec_GENM_ses_test(CMP_SES_TEST_FIXTURE *fixture)
@@ -130,7 +130,7 @@ static int execute_exec_certrequest_ses_test(CMP_SES_TEST_FIXTURE *fixture)
     OSSL_CMP_CTX_print_errors(ctx);
     if (!TEST_int_eq(status, fixture->expected)
         && !(fixture->expected == OSSL_CMP_PKISTATUS_waiting
-             && TEST_int_eq(status, OSSL_CMP_PKISTATUS_trans)))
+            && TEST_int_eq(status, OSSL_CMP_PKISTATUS_trans)))
         return 0;
     if (fixture->expected != OSSL_CMP_PKISTATUS_accepted)
         return TEST_ptr_null(res);
@@ -153,7 +153,7 @@ static int test_exec_RR_ses(int request_error)
     if (request_error)
         OSSL_CMP_CTX_set1_oldCert(fixture->cmp_ctx, NULL);
     fixture->expected = request_error ? OSSL_CMP_PKISTATUS_request
-        : OSSL_CMP_PKISTATUS_accepted;
+                                      : OSSL_CMP_PKISTATUS_accepted;
     EXECUTE_TEST(execute_exec_RR_ses_test, tear_down);
     return result;
 }
@@ -172,9 +172,9 @@ static int test_exec_RR_ses_receive_error(void)
 {
     SETUP_TEST_FIXTURE(CMP_SES_TEST_FIXTURE, set_up);
     ossl_cmp_mock_srv_set_statusInfo(fixture->srv_ctx,
-                                     OSSL_CMP_PKISTATUS_rejection,
-                                     OSSL_CMP_CTX_FAILINFO_signerNotTrusted,
-                                     "test string");
+        OSSL_CMP_PKISTATUS_rejection,
+        OSSL_CMP_CTX_FAILINFO_signerNotTrusted,
+        "test string");
     ossl_cmp_mock_srv_set_sendError(fixture->srv_ctx, OSSL_CMP_PKIBODY_RR);
     fixture->expected = OSSL_CMP_PKISTATUS_rejection;
     EXECUTE_TEST(execute_exec_RR_ses_test, tear_down);
@@ -198,8 +198,8 @@ static int test_exec_IR_ses(void)
 }
 
 static int test_exec_REQ_ses_poll(int req_type, int check_after,
-                                  int poll_count, int total_timeout,
-                                  int expect)
+    int poll_count, int total_timeout,
+    int expect)
 {
     SETUP_TEST_FIXTURE(CMP_SES_TEST_FIXTURE, set_up);
     fixture->req_type = req_type;
@@ -207,7 +207,7 @@ static int test_exec_REQ_ses_poll(int req_type, int check_after,
     ossl_cmp_mock_srv_set_checkAfterTime(fixture->srv_ctx, check_after);
     ossl_cmp_mock_srv_set_pollCount(fixture->srv_ctx, poll_count);
     OSSL_CMP_CTX_set_option(fixture->cmp_ctx,
-                            OSSL_CMP_OPT_TOTAL_TIMEOUT, total_timeout);
+        OSSL_CMP_OPT_TOTAL_TIMEOUT, total_timeout);
 
     if (req_type == OSSL_CMP_PKIBODY_IR) {
         EXECUTE_TEST(execute_exec_certrequest_ses_test, tear_down);
@@ -221,21 +221,22 @@ static int checkAfter = 1;
 static int test_exec_IR_ses_poll_ok(void)
 {
     return test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_IR, checkAfter, 2, 0,
-                                  OSSL_CMP_PKISTATUS_accepted);
+        OSSL_CMP_PKISTATUS_accepted);
 }
 
 static int test_exec_IR_ses_poll_no_timeout(void)
 {
     return test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_IR, checkAfter,
-                                  2 /* pollCount */, checkAfter + 4,
-                                  OSSL_CMP_PKISTATUS_accepted);
+        2 /* pollCount */,
+        checkAfter + 14, /* usually 4 is sufficient */
+        OSSL_CMP_PKISTATUS_accepted);
 }
 
 static int test_exec_IR_ses_poll_total_timeout(void)
 {
     return !test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_IR, checkAfter + 1,
-                                   3 /* pollCount */, checkAfter + 6,
-                                   OSSL_CMP_PKISTATUS_waiting);
+        3 /* pollCount */, checkAfter + 6,
+        OSSL_CMP_PKISTATUS_waiting);
 }
 
 static int test_exec_CR_ses(int implicit_confirm, int granted, int reject)
@@ -243,12 +244,12 @@ static int test_exec_CR_ses(int implicit_confirm, int granted, int reject)
     SETUP_TEST_FIXTURE(CMP_SES_TEST_FIXTURE, set_up);
     fixture->req_type = OSSL_CMP_PKIBODY_CR;
     OSSL_CMP_CTX_set_option(fixture->cmp_ctx,
-                            OSSL_CMP_OPT_IMPLICIT_CONFIRM, implicit_confirm);
+        OSSL_CMP_OPT_IMPLICIT_CONFIRM, implicit_confirm);
     OSSL_CMP_SRV_CTX_set_grant_implicit_confirm(fixture->srv_ctx, granted);
     ossl_cmp_mock_srv_set_sendError(fixture->srv_ctx,
-                                    reject ? OSSL_CMP_PKIBODY_CERTCONF : -1);
+        reject ? OSSL_CMP_PKIBODY_CERTCONF : -1);
     fixture->expected = reject ? OSSL_CMP_PKISTATUS_rejection
-        : OSSL_CMP_PKISTATUS_accepted;
+                               : OSSL_CMP_PKISTATUS_accepted;
     EXECUTE_TEST(execute_exec_certrequest_ses_test, tear_down);
     return result;
 }
@@ -284,9 +285,9 @@ static int test_exec_KUR_ses(int transfer_error, int pubkey, int raverified)
     }
     if (pubkey || raverified)
         OSSL_CMP_CTX_set_option(fixture->cmp_ctx, OSSL_CMP_OPT_POPO_METHOD,
-                                OSSL_CRMF_POPO_RAVERIFIED);
-    fixture->expected = transfer_error ? OSSL_CMP_PKISTATUS_trans :
-        raverified ? OSSL_CMP_PKISTATUS_rejection : OSSL_CMP_PKISTATUS_accepted;
+            OSSL_CRMF_POPO_RAVERIFIED);
+    fixture->expected = transfer_error ? OSSL_CMP_PKISTATUS_trans : raverified ? OSSL_CMP_PKISTATUS_rejection
+                                                                               : OSSL_CMP_PKISTATUS_accepted;
     EXECUTE_TEST(execute_exec_certrequest_ses_test, tear_down);
     return result;
 }
@@ -321,7 +322,7 @@ static int test_exec_KUR_ses_wrong_pub(void)
 }
 
 static int test_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
-                            const char **txt)
+    const char **txt)
 {
     int *reject = OSSL_CMP_CTX_get_certConf_cb_arg(ctx);
 
@@ -340,7 +341,7 @@ static int test_exec_P10CR_ses(int reject)
     SETUP_TEST_FIXTURE(CMP_SES_TEST_FIXTURE, set_up);
     fixture->req_type = OSSL_CMP_PKIBODY_P10CR;
     fixture->expected = reject ? OSSL_CMP_PKISTATUS_rejection
-        : OSSL_CMP_PKISTATUS_accepted;
+                               : OSSL_CMP_PKISTATUS_accepted;
     ctx = fixture->cmp_ctx;
     if (!TEST_ptr(csr = load_csr_der(pkcs10_f, libctx))
         || !TEST_true(OSSL_CMP_CTX_set1_p10CSR(ctx, csr))
@@ -380,9 +381,9 @@ static int execute_try_certreq_poll_test(CMP_SES_TEST_FIXTURE *fixture)
         && check_after == CHECK_AFTER
         && TEST_ptr_eq(OSSL_CMP_CTX_get0_newCert(ctx), NULL)
         && TEST_int_eq(fixture->expected,
-                       OSSL_CMP_try_certreq(ctx, TYPE, NULL, NULL))
+            OSSL_CMP_try_certreq(ctx, TYPE, NULL, NULL))
         && TEST_int_eq(0,
-                       X509_cmp(OSSL_CMP_CTX_get0_newCert(ctx), client_cert));
+            X509_cmp(OSSL_CMP_CTX_get0_newCert(ctx), client_cert));
 }
 
 static int test_try_certreq_poll(void)
@@ -406,7 +407,7 @@ static int execute_try_certreq_poll_abort_test(CMP_SES_TEST_FIXTURE *fixture)
         && check_after == CHECK_AFTER
         && TEST_ptr_eq(OSSL_CMP_CTX_get0_newCert(ctx), NULL)
         && TEST_int_eq(fixture->expected,
-                       OSSL_CMP_try_certreq(ctx, -1 /* abort */, NULL, NULL))
+            OSSL_CMP_try_certreq(ctx, -1 /* abort */, NULL, NULL))
         && TEST_ptr_eq(OSSL_CMP_CTX_get0_newCert(fixture->cmp_ctx), NULL);
 }
 
@@ -421,21 +422,21 @@ static int test_try_certreq_poll_abort(void)
 static int test_exec_GENM_ses_poll_ok(void)
 {
     return test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_GENM, checkAfter, 2, 0,
-                                  OSSL_CMP_PKISTATUS_accepted);
+        OSSL_CMP_PKISTATUS_accepted);
 }
 
 static int test_exec_GENM_ses_poll_no_timeout(void)
 {
     return test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_GENM, checkAfter,
-                                  1 /* pollCount */, checkAfter + 1,
-                                  OSSL_CMP_PKISTATUS_accepted);
+        1 /* pollCount */, checkAfter + 1,
+        OSSL_CMP_PKISTATUS_accepted);
 }
 
 static int test_exec_GENM_ses_poll_total_timeout(void)
 {
     return test_exec_REQ_ses_poll(OSSL_CMP_PKIBODY_GENM, checkAfter + 1,
-                                  3 /* pollCount */, checkAfter + 2,
-                                  OSSL_CMP_PKISTATUS_waiting);
+        3 /* pollCount */, checkAfter + 2,
+        OSSL_CMP_PKISTATUS_waiting);
 }
 
 static int test_exec_GENM_ses(int transfer_error, int total_timeout, int expect)
@@ -470,21 +471,19 @@ static int test_exec_GENM_ses_total_timeout(void)
 
 static int execute_exchange_certConf_test(CMP_SES_TEST_FIXTURE *fixture)
 {
-    int res =
-        ossl_cmp_exchange_certConf(fixture->cmp_ctx, OSSL_CMP_CERTREQID,
-                                   OSSL_CMP_PKIFAILUREINFO_addInfoNotAvailable,
-                                   "abcdefg");
+    int res = ossl_cmp_exchange_certConf(fixture->cmp_ctx, OSSL_CMP_CERTREQID,
+        OSSL_CMP_PKIFAILUREINFO_addInfoNotAvailable,
+        "abcdefg");
 
     return TEST_int_eq(fixture->expected, res);
 }
 
 static int execute_exchange_error_test(CMP_SES_TEST_FIXTURE *fixture)
 {
-    int res =
-        ossl_cmp_exchange_error(fixture->cmp_ctx,
-                                OSSL_CMP_PKISTATUS_rejection,
-                                1 << OSSL_CMP_PKIFAILUREINFO_unsupportedVersion,
-                                "foo_status", 999, "foo_details");
+    int res = ossl_cmp_exchange_error(fixture->cmp_ctx,
+        OSSL_CMP_PKISTATUS_rejection,
+        1 << OSSL_CMP_PKIFAILUREINFO_unsupportedVersion,
+        "foo_status", 999, "foo_details");
 
     return TEST_int_eq(fixture->expected, res);
 }
@@ -532,10 +531,10 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(server_key_f = test_get_argument(0))
-            || !TEST_ptr(server_cert_f = test_get_argument(1))
-            || !TEST_ptr(client_key_f = test_get_argument(2))
-            || !TEST_ptr(client_cert_f = test_get_argument(3))
-            || !TEST_ptr(pkcs10_f = test_get_argument(4))) {
+        || !TEST_ptr(server_cert_f = test_get_argument(1))
+        || !TEST_ptr(client_key_f = test_get_argument(2))
+        || !TEST_ptr(client_cert_f = test_get_argument(3))
+        || !TEST_ptr(pkcs10_f = test_get_argument(4))) {
         TEST_error("usage: cmp_client_test %s", USAGE);
         return 0;
     }
@@ -544,10 +543,10 @@ int setup_tests(void)
         return 0;
 
     if (!TEST_ptr(server_key = load_pkey_pem(server_key_f, libctx))
-            || !TEST_ptr(server_cert = load_cert_pem(server_cert_f, libctx))
-            || !TEST_ptr(client_key = load_pkey_pem(client_key_f, libctx))
-            || !TEST_ptr(client_cert = load_cert_pem(client_cert_f, libctx))
-            || !TEST_int_eq(1, RAND_bytes_ex(libctx, ref, sizeof(ref), 0))) {
+        || !TEST_ptr(server_cert = load_cert_pem(server_cert_f, libctx))
+        || !TEST_ptr(client_key = load_pkey_pem(client_key_f, libctx))
+        || !TEST_ptr(client_cert = load_cert_pem(client_cert_f, libctx))
+        || !TEST_int_eq(1, RAND_bytes_ex(libctx, ref, sizeof(ref), 0))) {
         cleanup_tests();
         return 0;
     }
diff --git a/test/cmp_ctx_test.c b/test/cmp_ctx_test.c
index f38493b33445c..04f7ed8bcb3ac 100644
--- a/test/cmp_ctx_test.c
+++ b/test/cmp_ctx_test.c
@@ -69,16 +69,16 @@ static int execute_CTX_reinit_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture)
     ctx->status = 1;
     ctx->failInfoCode = 1;
     if (!ossl_cmp_ctx_set0_statusString(ctx, sk_ASN1_UTF8STRING_new_null())
-            || !ossl_cmp_ctx_set0_newCert(ctx, X509_new())
-            || !TEST_ptr(certs = sk_X509_new_1())
-            || !ossl_cmp_ctx_set1_newChain(ctx, certs)
-            || !ossl_cmp_ctx_set1_caPubs(ctx, certs)
-            || !ossl_cmp_ctx_set1_extraCertsIn(ctx, certs)
-            || !ossl_cmp_ctx_set1_validatedSrvCert(ctx, cert)
-            || !TEST_ptr(bytes = ASN1_OCTET_STRING_new())
-            || !OSSL_CMP_CTX_set1_transactionID(ctx, bytes)
-            || !OSSL_CMP_CTX_set1_senderNonce(ctx, bytes)
-            || !ossl_cmp_ctx_set1_recipNonce(ctx, bytes))
+        || !ossl_cmp_ctx_set0_newCert(ctx, X509_new())
+        || !TEST_ptr(certs = sk_X509_new_1())
+        || !ossl_cmp_ctx_set1_newChain(ctx, certs)
+        || !ossl_cmp_ctx_set1_caPubs(ctx, certs)
+        || !ossl_cmp_ctx_set1_extraCertsIn(ctx, certs)
+        || !ossl_cmp_ctx_set1_validatedSrvCert(ctx, cert)
+        || !TEST_ptr(bytes = ASN1_OCTET_STRING_new())
+        || !OSSL_CMP_CTX_set1_transactionID(ctx, bytes)
+        || !OSSL_CMP_CTX_set1_senderNonce(ctx, bytes)
+        || !ossl_cmp_ctx_set1_recipNonce(ctx, bytes))
         goto err;
 
     if (!TEST_true(OSSL_CMP_CTX_reinit(ctx)))
@@ -86,22 +86,22 @@ static int execute_CTX_reinit_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture)
 
     /* check whether values have been reset to default in all relevant fields */
     if (!TEST_true(ctx->status == -1
-                       && ctx->failInfoCode == -1
-                       && ctx->statusString == NULL
-                       && ctx->newCert == NULL
-                       && ctx->newChain == NULL
-                       && ctx->caPubs == NULL
-                       && ctx->extraCertsIn == NULL
-                       && ctx->validatedSrvCert == NULL
-                       && ctx->transactionID == NULL
-                       && ctx->senderNonce == NULL
-                       && ctx->recipNonce == NULL))
+            && ctx->failInfoCode == -1
+            && ctx->statusString == NULL
+            && ctx->newCert == NULL
+            && ctx->newChain == NULL
+            && ctx->caPubs == NULL
+            && ctx->extraCertsIn == NULL
+            && ctx->validatedSrvCert == NULL
+            && ctx->transactionID == NULL
+            && ctx->senderNonce == NULL
+            && ctx->recipNonce == NULL))
         goto err;
 
     /* this does not check that all remaining fields are untouched */
     res = 1;
 
- err:
+err:
     X509_free(cert);
     sk_X509_pop_X509_free(certs);
     ASN1_OCTET_STRING_free(bytes);
@@ -134,19 +134,19 @@ static int test_CTX_reinit(void)
 
 static int msg_total_size = 0;
 static int msg_total_size_log_cb(const char *func, const char *file, int line,
-                                 OSSL_CMP_severity level, const char *msg)
+    OSSL_CMP_severity level, const char *msg)
 {
     msg_total_size += strlen(msg);
     TEST_note("total=%d len=%zu msg='%s'\n", msg_total_size, strlen(msg), msg);
     return 1;
 }
 
-# define STR64 "This is a 64 bytes looooooooooooooooooooooooooooooooong string.\n"
+#define STR64 "This is a 64 bytes looooooooooooooooooooooooooooooooong string.\n"
 /* max string length ISO C90 compilers are required to support is 509. */
-# define STR509 STR64 STR64 STR64 STR64 STR64 STR64 STR64 \
+#define STR509 STR64 STR64 STR64 STR64 STR64 STR64 STR64 \
     "This is a 61 bytes loooooooooooooooooooooooooooooong string.\n"
 static const char *const max_str_literal = STR509;
-# define STR_SEP "<SEP>"
+#define STR_SEP "<SEP>"
 
 static int execute_CTX_print_errors_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture)
 {
@@ -159,10 +159,10 @@ static int execute_CTX_print_errors_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture)
     if (!TEST_true(ctx->log_cb == NULL))
         res = 0;
 
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
     ERR_raise(ERR_LIB_CMP, CMP_R_MULTIPLE_SAN_SOURCES);
     OSSL_CMP_CTX_print_errors(ctx); /* should print above error to STDERR */
-# endif
+#endif
 
     /* this should work regardless of OPENSSL_NO_STDIO and OPENSSL_NO_TRACE: */
     if (!TEST_true(OSSL_CMP_CTX_set_log_cb(ctx, msg_total_size_log_cb)))
@@ -176,11 +176,14 @@ static int execute_CTX_print_errors_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture)
         base_err_msg_size += strlen("NULL_ARGUMENT");
         expected_size = base_err_msg_size;
         ossl_cmp_add_error_data("data1"); /* should prepend separator ":" */
-        expected_size += strlen(":" "data1");
+        expected_size += strlen(":"
+                                "data1");
         ossl_cmp_add_error_data("data2"); /* should prepend separator " : " */
-        expected_size += strlen(" : " "data2");
+        expected_size += strlen(" : "
+                                "data2");
         ossl_cmp_add_error_line("new line"); /* should prepend separator "\n" */
-        expected_size += strlen("\n" "new line");
+        expected_size += strlen("\n"
+                                "new line");
         OSSL_CMP_CTX_print_errors(ctx);
         if (!TEST_int_eq(msg_total_size, expected_size))
             res = 0;
@@ -210,8 +213,7 @@ static int test_CTX_print_errors(void)
 }
 #endif
 
-static
-int execute_CTX_reqExtensions_have_SAN_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture)
+static int execute_CTX_reqExtensions_have_SAN_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture)
 {
     OSSL_CMP_CTX *ctx = fixture->ctx;
     const int len = 16;
@@ -225,14 +227,14 @@ int execute_CTX_reqExtensions_have_SAN_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture)
         return 0;
 
     if (!TEST_int_eq(1, RAND_bytes(str, len))
-            || !TEST_ptr(data = ASN1_OCTET_STRING_new())
-            || !TEST_true(ASN1_OCTET_STRING_set(data, str, len)))
+        || !TEST_ptr(data = ASN1_OCTET_STRING_new())
+        || !TEST_true(ASN1_OCTET_STRING_set(data, str, len)))
         goto err;
     ext = X509_EXTENSION_create_by_NID(NULL, NID_subject_alt_name, 0, data);
     if (!TEST_ptr(ext)
-            || !TEST_ptr(exts = sk_X509_EXTENSION_new_null())
-            || !TEST_true(sk_X509_EXTENSION_push(exts, ext))
-            || !TEST_true(OSSL_CMP_CTX_set0_reqExtensions(ctx, exts))) {
+        || !TEST_ptr(exts = sk_X509_EXTENSION_new_null())
+        || !TEST_true(sk_X509_EXTENSION_push(exts, ext))
+        || !TEST_true(OSSL_CMP_CTX_set0_reqExtensions(ctx, exts))) {
         X509_EXTENSION_free(ext);
         sk_X509_EXTENSION_free(exts);
         goto err;
@@ -242,7 +244,7 @@ int execute_CTX_reqExtensions_have_SAN_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture)
         res = TEST_false(OSSL_CMP_CTX_reqExtensions_have_SAN(ctx));
         X509_EXTENSION_free(ext);
     }
- err:
+err:
     ASN1_OCTET_STRING_free(data);
     return res;
 }
@@ -254,19 +256,22 @@ static int test_CTX_reqExtensions_have_SAN(void)
     return result;
 }
 
-static int test_log_line;
+static int test_log_line_start;
+static int test_log_line_end;
 static int test_log_cb_res = 0;
 static int test_log_cb(const char *func, const char *file, int line,
-                       OSSL_CMP_severity level, const char *msg)
+    OSSL_CMP_severity level, const char *msg)
 {
     test_log_cb_res =
 #ifndef PEDANTIC
         (TEST_str_eq(func, "execute_cmp_ctx_log_cb_test")
-         || TEST_str_eq(func, "(unknown function)")) &&
+            || TEST_str_eq(func, "(unknown function)"))
+        &&
 #endif
         (TEST_str_eq(file, OPENSSL_FILE)
-         || TEST_str_eq(file, "(no file)"))
-        && (TEST_int_eq(line, test_log_line) || TEST_int_eq(line, 0))
+            || TEST_str_eq(file, "(no file)"))
+        && (TEST_int_eq(line, test_log_line_start) || TEST_int_eq(line, 0)
+            || TEST_int_eq(line, test_log_line_end))
         && (TEST_int_eq(level, OSSL_CMP_LOG_INFO) || TEST_int_eq(level, -1))
         && TEST_str_eq(msg, "ok");
     return 1;
@@ -295,14 +300,16 @@ static int execute_cmp_ctx_log_cb_test(OSSL_CMP_CTX_TEST_FIXTURE *fixture)
     if (!TEST_true(OSSL_CMP_CTX_set_log_cb(ctx, test_log_cb))) {
         res = 0;
     } else {
-        test_log_line = OPENSSL_LINE + 1;
+        test_log_line_start = OPENSSL_LINE + 1;
         ossl_cmp_log2(INFO, ctx, "%s%c", "o", 'k');
+        test_log_line_end = OPENSSL_LINE - 1;
         if (!TEST_int_eq(test_log_cb_res, 1))
             res = 0;
         OSSL_CMP_CTX_set_log_verbosity(ctx, OSSL_CMP_LOG_ERR);
         test_log_cb_res = -1; /* callback should not be called at all */
-        test_log_line = OPENSSL_LINE + 1;
+        test_log_line_start = OPENSSL_LINE + 1;
         ossl_cmp_log2(INFO, ctx, "%s%c", "o", 'k');
+        test_log_line_end = OPENSSL_LINE - 1;
         if (!TEST_int_eq(test_log_cb_res, -1))
             res = 0;
     }
@@ -326,13 +333,13 @@ static BIO *test_http_cb(BIO *bio, void *arg, int use_ssl, int detail)
 #endif
 
 static OSSL_CMP_MSG *test_transfer_cb(OSSL_CMP_CTX *ctx,
-                                      const OSSL_CMP_MSG *req)
+    const OSSL_CMP_MSG *req)
 {
     return NULL;
 }
 
 static int test_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
-                            const char **txt)
+    const char **txt)
 {
     return 0;
 }
@@ -347,148 +354,147 @@ typedef OSSL_CMP_CTX CMP_CTX; /* prevents rewriting type name by below macro */
 #define get0 0
 #define get1 1
 
-#define DEFINE_SET_GET_BASE_TEST(PREFIX, SETN, GETN, DUP, FIELD, TYPE, ERR, \
-                                 DEFAULT, NEW, FREE) \
-static int \
-execute_CTX_##SETN##_##GETN##_##FIELD(OSSL_CMP_CTX_TEST_FIXTURE *fixture) \
-{ \
-    CMP_CTX *ctx = fixture->ctx; \
-    int (*set_fn)(CMP_CTX *ctx, TYPE) = \
-        (int (*)(CMP_CTX *ctx, TYPE))PREFIX##_##SETN##_##FIELD; \
-    /* need type cast in above assignment as TYPE arg sometimes is const */ \
-    TYPE (*get_fn)(const CMP_CTX *ctx) = OSSL_CMP_CTX_##GETN##_##FIELD; \
-    TYPE val1_to_free = NEW; \
-    TYPE val1 = val1_to_free; \
-    TYPE val1_read = 0; /* 0 works for any type */ \
-    TYPE val2_to_free = NEW; \
-    TYPE val2 = val2_to_free; \
-    TYPE val2_read = 0; \
-    TYPE val3_read = 0; \
-    int res = 1; \
-    \
-    if (!TEST_int_eq(ERR_peek_error(), 0)) \
-        res = 0; \
-    if (PREFIX == 1) { /* exported setter functions must test ctx == NULL */ \
-        if ((*set_fn)(NULL, val1) || ERR_peek_error() == 0) { \
-            TEST_error("setter did not return error on ctx == NULL"); \
-            res = 0; \
-        } \
-    } \
-    ERR_clear_error(); \
-    \
-    if ((*get_fn)(NULL) != ERR || ERR_peek_error() == 0) { \
-        TEST_error("getter did not return error on ctx == NULL"); \
-        res = 0; \
-    } \
-    ERR_clear_error(); \
-    \
-    val1_read = (*get_fn)(ctx); \
-    if (!DEFAULT(val1_read)) { \
-        TEST_error("did not get default value"); \
-        res = 0; \
-    } \
-    if (!(*set_fn)(ctx, val1)) { \
-        TEST_error("setting first value failed"); \
-        res = 0; \
-    } \
-    if (SETN == 0) \
-        val1_to_free = 0; /* 0 works for any type */ \
-    \
-    if (GETN == 1) \
-        FREE(val1_read); \
-    val1_read = (*get_fn)(ctx); \
-    if (SETN == 0) { \
-        if (val1_read != val1) { \
-            TEST_error("set/get first value did not match"); \
-            res = 0; \
-        } \
-    } else { \
-        if (DUP && val1_read == val1) { \
-            TEST_error("first set did not dup the value"); \
-            val1_read = 0; \
-            res = 0; \
-        } \
-        if (DEFAULT(val1_read)) { \
-            TEST_error("first set had no effect"); \
-            res = 0; \
-        } \
-    } \
-    \
-    if (!(*set_fn)(ctx, val2)) { \
-        TEST_error("setting second value failed"); \
-        res = 0; \
-    } \
-    if (SETN == 0) \
-        val2_to_free = 0; \
-    \
-    val2_read = (*get_fn)(ctx); \
-    if (DEFAULT(val2_read)) { \
-        TEST_error("second set reset the value"); \
-        res = 0; \
-    } \
-    if (SETN == 0 && GETN == 0) { \
-        if (val2_read != val2) { \
-            TEST_error("set/get second value did not match"); \
-            res = 0; \
-        } \
-    } else { \
-        if (DUP && val2_read == val2) { \
-            TEST_error("second set did not dup the value"); \
-            val2_read = 0; \
-            res = 0; \
-        } \
-        if (val2 == val1) { \
-            TEST_error("second value is same as first value"); \
-            res = 0; \
-        } \
-        if (GETN == 1 && val2_read == val1_read) { \
-            /* \
-             * Note that if GETN == 0 then possibly val2_read == val1_read \
-             * because set1 may allocate the new copy at the same location. \
-             */ \
-            TEST_error("second get returned same as first get"); \
-            res = 0; \
-        } \
-    } \
-    \
-    val3_read = (*get_fn)(ctx); \
-    if (DEFAULT(val3_read)) { \
-        TEST_error("third set reset the value"); \
-        res = 0; \
-    } \
-    if (GETN == 0) { \
-        if (val3_read != val2_read) { \
-            TEST_error("third get gave different value"); \
-            res = 0; \
-        } \
-    } else { \
-        if (DUP && val3_read == val2_read) { \
-            TEST_error("third get did not create a new dup"); \
-            val3_read = 0; \
-            res = 0; \
-        } \
-    } \
-    /* this does not check that all remaining fields are untouched */ \
-    \
-    if (!TEST_int_eq(ERR_peek_error(), 0)) \
-        res = 0; \
-    \
-    FREE(val1_to_free); \
-    FREE(val2_to_free); \
-    if (GETN == 1) { \
-        FREE(val1_read); \
-        FREE(val2_read); \
-        FREE(val3_read); \
-    } \
-    return TEST_true(res); \
-} \
-\
-static int test_CTX_##SETN##_##GETN##_##FIELD(void) \
-{ \
-    SETUP_TEST_FIXTURE(OSSL_CMP_CTX_TEST_FIXTURE, set_up); \
-    EXECUTE_TEST(execute_CTX_##SETN##_##GETN##_##FIELD, tear_down); \
-    return result; \
-}
+#define DEFINE_SET_GET_BASE_TEST(PREFIX, SETN, GETN, DUP, FIELD, TYPE, ERR,                            \
+    DEFAULT, NEW, FREE)                                                                                \
+    static int                                                                                         \
+    execute_CTX_##SETN##_##GETN##_##FIELD(OSSL_CMP_CTX_TEST_FIXTURE *fixture)                          \
+    {                                                                                                  \
+        CMP_CTX *ctx = fixture->ctx;                                                                   \
+        int (*set_fn)(CMP_CTX * ctx, TYPE) = (int (*)(CMP_CTX * ctx, TYPE)) PREFIX##_##SETN##_##FIELD; \
+        /* need type cast in above assignment as TYPE arg sometimes is const */                        \
+        TYPE (*get_fn)(const CMP_CTX *ctx) = OSSL_CMP_CTX_##GETN##_##FIELD;                            \
+        TYPE val1_to_free = NEW;                                                                       \
+        TYPE val1 = val1_to_free;                                                                      \
+        TYPE val1_read = 0; /* 0 works for any type */                                                 \
+        TYPE val2_to_free = NEW;                                                                       \
+        TYPE val2 = val2_to_free;                                                                      \
+        TYPE val2_read = 0;                                                                            \
+        TYPE val3_read = 0;                                                                            \
+        int res = 1;                                                                                   \
+                                                                                                       \
+        if (!TEST_int_eq(ERR_peek_error(), 0))                                                         \
+            res = 0;                                                                                   \
+        if (PREFIX == 1) { /* exported setter functions must test ctx == NULL */                       \
+            if ((*set_fn)(NULL, val1) || ERR_peek_error() == 0) {                                      \
+                TEST_error("setter did not return error on ctx == NULL");                              \
+                res = 0;                                                                               \
+            }                                                                                          \
+        }                                                                                              \
+        ERR_clear_error();                                                                             \
+                                                                                                       \
+        if ((*get_fn)(NULL) != ERR || ERR_peek_error() == 0) {                                         \
+            TEST_error("getter did not return error on ctx == NULL");                                  \
+            res = 0;                                                                                   \
+        }                                                                                              \
+        ERR_clear_error();                                                                             \
+                                                                                                       \
+        val1_read = (*get_fn)(ctx);                                                                    \
+        if (!DEFAULT(val1_read)) {                                                                     \
+            TEST_error("did not get default value");                                                   \
+            res = 0;                                                                                   \
+        }                                                                                              \
+        if (!(*set_fn)(ctx, val1)) {                                                                   \
+            TEST_error("setting first value failed");                                                  \
+            res = 0;                                                                                   \
+        }                                                                                              \
+        if (SETN == 0)                                                                                 \
+            val1_to_free = 0; /* 0 works for any type */                                               \
+                                                                                                       \
+        if (GETN == 1)                                                                                 \
+            FREE(val1_read);                                                                           \
+        val1_read = (*get_fn)(ctx);                                                                    \
+        if (SETN == 0) {                                                                               \
+            if (val1_read != val1) {                                                                   \
+                TEST_error("set/get first value did not match");                                       \
+                res = 0;                                                                               \
+            }                                                                                          \
+        } else {                                                                                       \
+            if (DUP && val1_read == val1) {                                                            \
+                TEST_error("first set did not dup the value");                                         \
+                val1_read = 0;                                                                         \
+                res = 0;                                                                               \
+            }                                                                                          \
+            if (DEFAULT(val1_read)) {                                                                  \
+                TEST_error("first set had no effect");                                                 \
+                res = 0;                                                                               \
+            }                                                                                          \
+        }                                                                                              \
+                                                                                                       \
+        if (!(*set_fn)(ctx, val2)) {                                                                   \
+            TEST_error("setting second value failed");                                                 \
+            res = 0;                                                                                   \
+        }                                                                                              \
+        if (SETN == 0)                                                                                 \
+            val2_to_free = 0;                                                                          \
+                                                                                                       \
+        val2_read = (*get_fn)(ctx);                                                                    \
+        if (DEFAULT(val2_read)) {                                                                      \
+            TEST_error("second set reset the value");                                                  \
+            res = 0;                                                                                   \
+        }                                                                                              \
+        if (SETN == 0 && GETN == 0) {                                                                  \
+            if (val2_read != val2) {                                                                   \
+                TEST_error("set/get second value did not match");                                      \
+                res = 0;                                                                               \
+            }                                                                                          \
+        } else {                                                                                       \
+            if (DUP && val2_read == val2) {                                                            \
+                TEST_error("second set did not dup the value");                                        \
+                val2_read = 0;                                                                         \
+                res = 0;                                                                               \
+            }                                                                                          \
+            if (val2 == val1) {                                                                        \
+                TEST_error("second value is same as first value");                                     \
+                res = 0;                                                                               \
+            }                                                                                          \
+            if (GETN == 1 && val2_read == val1_read) {                                                 \
+                /*                                                                                     \
+                 * Note that if GETN == 0 then possibly val2_read == val1_read                         \
+                 * because set1 may allocate the new copy at the same location.                        \
+                 */                                                                                    \
+                TEST_error("second get returned same as first get");                                   \
+                res = 0;                                                                               \
+            }                                                                                          \
+        }                                                                                              \
+                                                                                                       \
+        val3_read = (*get_fn)(ctx);                                                                    \
+        if (DEFAULT(val3_read)) {                                                                      \
+            TEST_error("third set reset the value");                                                   \
+            res = 0;                                                                                   \
+        }                                                                                              \
+        if (GETN == 0) {                                                                               \
+            if (val3_read != val2_read) {                                                              \
+                TEST_error("third get gave different value");                                          \
+                res = 0;                                                                               \
+            }                                                                                          \
+        } else {                                                                                       \
+            if (DUP && val3_read == val2_read) {                                                       \
+                TEST_error("third get did not create a new dup");                                      \
+                val3_read = 0;                                                                         \
+                res = 0;                                                                               \
+            }                                                                                          \
+        }                                                                                              \
+        /* this does not check that all remaining fields are untouched */                              \
+                                                                                                       \
+        if (!TEST_int_eq(ERR_peek_error(), 0))                                                         \
+            res = 0;                                                                                   \
+                                                                                                       \
+        FREE(val1_to_free);                                                                            \
+        FREE(val2_to_free);                                                                            \
+        if (GETN == 1) {                                                                               \
+            FREE(val1_read);                                                                           \
+            FREE(val2_read);                                                                           \
+            FREE(val3_read);                                                                           \
+        }                                                                                              \
+        return TEST_true(res);                                                                         \
+    }                                                                                                  \
+                                                                                                       \
+    static int test_CTX_##SETN##_##GETN##_##FIELD(void)                                                \
+    {                                                                                                  \
+        SETUP_TEST_FIXTURE(OSSL_CMP_CTX_TEST_FIXTURE, set_up);                                         \
+        EXECUTE_TEST(execute_CTX_##SETN##_##GETN##_##FIELD, tear_down);                                \
+        return result;                                                                                 \
+    }
 
 static char *char_new(void)
 {
@@ -518,224 +524,222 @@ static X509_STORE *X509_STORE_new_1(void)
 #define IS_0(x) ((x) == 0) /* for any type */
 #define DROP(x) (void)(x) /* dummy free() for non-pointer and function types */
 
-#define RET_IF_NULL_ARG(ctx, ret) \
-    if (ctx == NULL) { \
+#define RET_IF_NULL_ARG(ctx, ret)                    \
+    if (ctx == NULL) {                               \
         ERR_raise(ERR_LIB_CMP, CMP_R_NULL_ARGUMENT); \
-        return ret; \
+        return ret;                                  \
     }
 
 /* cannot use PREFIX instead of OSSL_CMP and CTX due to #define OSSL_CMP_CTX */
-#define DEFINE_SET_GET_TEST(OSSL_CMP, CTX, N, M, DUP, FIELD, TYPE) \
+#define DEFINE_SET_GET_TEST(OSSL_CMP, CTX, N, M, DUP, FIELD, TYPE)         \
     DEFINE_SET_GET_BASE_TEST(OSSL_CMP##_##CTX, set##N, get##M, DUP, FIELD, \
-                             TYPE *, NULL, IS_0, TYPE##_new(), TYPE##_free)
+        TYPE *, NULL, IS_0, TYPE##_new(), TYPE##_free)
 
 #define DEFINE_SET_GET_SK_TEST_DEFAULT(OSSL_CMP, CTX, N, M, FIELD, ELEM_TYPE, \
-                                       DEFAULT, NEW, FREE) \
-    DEFINE_SET_GET_BASE_TEST(OSSL_CMP##_##CTX, set##N, get##M, 1, FIELD, \
-                             STACK_OF(ELEM_TYPE)*, NULL, DEFAULT, NEW, FREE)
-#define DEFINE_SET_GET_SK_TEST(OSSL_CMP, CTX, N, M, FIELD, T) \
+    DEFAULT, NEW, FREE)                                                       \
+    DEFINE_SET_GET_BASE_TEST(OSSL_CMP##_##CTX, set##N, get##M, 1, FIELD,      \
+        STACK_OF(ELEM_TYPE) *, NULL, DEFAULT, NEW, FREE)
+#define DEFINE_SET_GET_SK_TEST(OSSL_CMP, CTX, N, M, FIELD, T)     \
     DEFINE_SET_GET_SK_TEST_DEFAULT(OSSL_CMP, CTX, N, M, FIELD, T, \
-                                   IS_0, sk_##T##_new_null(), sk_##T##_free)
-#define DEFINE_SET_GET_SK_X509_TEST(OSSL_CMP, CTX, N, M, FNAME) \
+        IS_0, sk_##T##_new_null(), sk_##T##_free)
+#define DEFINE_SET_GET_SK_X509_TEST(OSSL_CMP, CTX, N, M, FNAME)      \
     DEFINE_SET_GET_SK_TEST_DEFAULT(OSSL_CMP, CTX, N, M, FNAME, X509, \
-                                   EMPTY_SK_X509, \
-                                   sk_X509_new_1(), sk_X509_pop_X509_free)
+        EMPTY_SK_X509,                                               \
+        sk_X509_new_1(), sk_X509_pop_X509_free)
 
 #define DEFINE_SET_GET_TEST_DEFAULT(OSSL_CMP, CTX, N, M, DUP, FIELD, TYPE, \
-                                    DEFAULT) \
+    DEFAULT)                                                               \
     DEFINE_SET_GET_BASE_TEST(OSSL_CMP##_##CTX, set##N, get##M, DUP, FIELD, \
-                             TYPE *, NULL, DEFAULT, TYPE##_new(), TYPE##_free)
+        TYPE *, NULL, DEFAULT, TYPE##_new(), TYPE##_free)
 #define DEFINE_SET_TEST_DEFAULT(OSSL_CMP, CTX, N, DUP, FIELD, TYPE, DEFAULT) \
-    static TYPE *OSSL_CMP_CTX_get0_##FIELD(const CMP_CTX *ctx) \
-    { \
-        RET_IF_NULL_ARG(ctx, NULL); \
-        return (TYPE *)ctx->FIELD; \
-    } \
+    static TYPE *OSSL_CMP_CTX_get0_##FIELD(const CMP_CTX *ctx)               \
+    {                                                                        \
+        RET_IF_NULL_ARG(ctx, NULL);                                          \
+        return (TYPE *)ctx->FIELD;                                           \
+    }                                                                        \
     DEFINE_SET_GET_TEST_DEFAULT(OSSL_CMP, CTX, N, 0, DUP, FIELD, TYPE, DEFAULT)
 #define DEFINE_SET_TEST(OSSL_CMP, CTX, N, DUP, FIELD, TYPE) \
     DEFINE_SET_TEST_DEFAULT(OSSL_CMP, CTX, N, DUP, FIELD, TYPE, IS_0)
 
-#define DEFINE_SET_SK_TEST(OSSL_CMP, CTX, N, FIELD, TYPE) \
+#define DEFINE_SET_SK_TEST(OSSL_CMP, CTX, N, FIELD, TYPE)                \
     static STACK_OF(TYPE) *OSSL_CMP_CTX_get0_##FIELD(const CMP_CTX *ctx) \
-    { \
-        RET_IF_NULL_ARG(ctx, NULL); \
-        return ctx->FIELD; \
-    } \
-    DEFINE_SET_GET_BASE_TEST(OSSL_CMP##_##CTX, set##N, get0, 1, FIELD, \
-                             STACK_OF(TYPE)*, NULL, IS_0, \
-                             sk_##TYPE##_new_null(), sk_##TYPE##_free)
+    {                                                                    \
+        RET_IF_NULL_ARG(ctx, NULL);                                      \
+        return ctx->FIELD;                                               \
+    }                                                                    \
+    DEFINE_SET_GET_BASE_TEST(OSSL_CMP##_##CTX, set##N, get0, 1, FIELD,   \
+        STACK_OF(TYPE) *, NULL, IS_0,                                    \
+        sk_##TYPE##_new_null(), sk_##TYPE##_free)
 
 #ifndef OPENSSL_NO_HTTP
 typedef OSSL_HTTP_bio_cb_t OSSL_CMP_http_cb_t;
 #endif
-#define DEFINE_SET_CB_TEST(FIELD) \
+#define DEFINE_SET_CB_TEST(FIELD)                                            \
     static OSSL_CMP_##FIELD##_t OSSL_CMP_CTX_get_##FIELD(const CMP_CTX *ctx) \
-    { \
-        RET_IF_NULL_ARG(ctx, NULL); \
-        return ctx->FIELD; \
-    } \
-    DEFINE_SET_GET_BASE_TEST(OSSL_CMP_CTX, set, get, 0, FIELD, \
-                             OSSL_CMP_##FIELD##_t, NULL, IS_0, \
-                             test_##FIELD, DROP)
-#define DEFINE_SET_GET_P_VOID_TEST(FIELD) \
+    {                                                                        \
+        RET_IF_NULL_ARG(ctx, NULL);                                          \
+        return ctx->FIELD;                                                   \
+    }                                                                        \
+    DEFINE_SET_GET_BASE_TEST(OSSL_CMP_CTX, set, get, 0, FIELD,               \
+        OSSL_CMP_##FIELD##_t, NULL, IS_0,                                    \
+        test_##FIELD, DROP)
+#define DEFINE_SET_GET_P_VOID_TEST(FIELD)                              \
     DEFINE_SET_GET_BASE_TEST(OSSL_CMP_CTX, set, get, 0, FIELD, void *, \
-                             NULL, IS_0, ((void *)1), DROP)
+        NULL, IS_0, ((void *)1), DROP)
 
-#define DEFINE_SET_GET_INT_TEST_DEFAULT(OSSL_CMP, CTX, FIELD, DEFAULT) \
+#define DEFINE_SET_GET_INT_TEST_DEFAULT(OSSL_CMP, CTX, FIELD, DEFAULT)      \
     DEFINE_SET_GET_BASE_TEST(OSSL_CMP##_##CTX, set, get, 0, FIELD, int, -1, \
-                             DEFAULT, 1, DROP)
+        DEFAULT, 1, DROP)
 #define DEFINE_SET_GET_INT_TEST(OSSL_CMP, CTX, FIELD) \
     DEFINE_SET_GET_INT_TEST_DEFAULT(OSSL_CMP, CTX, FIELD, IS_NEG)
-#define DEFINE_SET_INT_TEST(FIELD) \
+#define DEFINE_SET_INT_TEST(FIELD)                          \
     static int OSSL_CMP_CTX_get_##FIELD(const CMP_CTX *ctx) \
-    { \
-        RET_IF_NULL_ARG(ctx, -1); \
-        return ctx->FIELD; \
-    } \
+    {                                                       \
+        RET_IF_NULL_ARG(ctx, -1);                           \
+        return ctx->FIELD;                                  \
+    }                                                       \
     DEFINE_SET_GET_INT_TEST_DEFAULT(OSSL_CMP, CTX, FIELD, IS_0)
 
-#define DEFINE_SET_GET_ARG_FN(SETN, GETN, FIELD, ARG, T) \
+#define DEFINE_SET_GET_ARG_FN(SETN, GETN, FIELD, ARG, T)                  \
     static int OSSL_CMP_CTX_##SETN##_##FIELD##_##ARG(CMP_CTX *ctx, T val) \
-    { \
-        return OSSL_CMP_CTX_##SETN##_##FIELD(ctx, ARG, val); \
-    } \
-    \
-    static T OSSL_CMP_CTX_##GETN##_##FIELD##_##ARG(const CMP_CTX *ctx) \
-    { \
-        return OSSL_CMP_CTX_##GETN##_##FIELD(ctx, ARG); \
+    {                                                                     \
+        return OSSL_CMP_CTX_##SETN##_##FIELD(ctx, ARG, val);              \
+    }                                                                     \
+                                                                          \
+    static T OSSL_CMP_CTX_##GETN##_##FIELD##_##ARG(const CMP_CTX *ctx)    \
+    {                                                                     \
+        return OSSL_CMP_CTX_##GETN##_##FIELD(ctx, ARG);                   \
     }
 
-#define DEFINE_SET_GET1_STR_FN(SETN, FIELD) \
-    static int OSSL_CMP_CTX_##SETN##_##FIELD##_str(CMP_CTX *ctx, char *val)\
-    { \
-        return OSSL_CMP_CTX_##SETN##_##FIELD(ctx, (unsigned char *)val, \
-                                             strlen(val));              \
-    } \
-    \
-    static char *OSSL_CMP_CTX_get1_##FIELD##_str(const CMP_CTX *ctx) \
-    { \
-        const ASN1_OCTET_STRING *bytes = NULL; \
-        \
-        RET_IF_NULL_ARG(ctx, NULL); \
-        bytes = ctx->FIELD; \
-        return bytes == NULL ? NULL : \
-            OPENSSL_strndup((char *)bytes->data, bytes->length); \
+#define DEFINE_SET_GET1_STR_FN(SETN, FIELD)                                                \
+    static int OSSL_CMP_CTX_##SETN##_##FIELD##_str(CMP_CTX *ctx, char *val)                \
+    {                                                                                      \
+        return OSSL_CMP_CTX_##SETN##_##FIELD(ctx, (unsigned char *)val,                    \
+            strlen(val));                                                                  \
+    }                                                                                      \
+                                                                                           \
+    static char *OSSL_CMP_CTX_get1_##FIELD##_str(const CMP_CTX *ctx)                       \
+    {                                                                                      \
+        const ASN1_OCTET_STRING *bytes = NULL;                                             \
+                                                                                           \
+        RET_IF_NULL_ARG(ctx, NULL);                                                        \
+        bytes = ctx->FIELD;                                                                \
+        return bytes == NULL ? NULL : OPENSSL_strndup((char *)bytes->data, bytes->length); \
     }
 
 #define push 0
 #define push0 0
 #define push1 1
-#define DEFINE_PUSH_BASE_TEST(PUSHN, DUP, FIELD, ELEM, TYPE, T, \
-                              DEFAULT, NEW, FREE) \
-static TYPE sk_top_##FIELD(const CMP_CTX *ctx) \
-{ \
-    return sk_##T##_value(ctx->FIELD, sk_##T##_num(ctx->FIELD) - 1); \
-} \
-\
-static int execute_CTX_##PUSHN##_##ELEM(OSSL_CMP_CTX_TEST_FIXTURE *fixture) \
-{ \
-    CMP_CTX *ctx = fixture->ctx; \
-    int (*push_fn)(CMP_CTX *ctx, TYPE) = \
-        (int (*)(CMP_CTX *ctx, TYPE))OSSL_CMP_CTX_##PUSHN##_##ELEM; \
-    /* \
-     * need type cast in above assignment because TYPE arg sometimes is const \
-     */ \
-    int n_elem = sk_##T##_num(ctx->FIELD); \
-    STACK_OF(TYPE) field_read; \
-    TYPE val1_to_free = NEW; \
-    TYPE val1 = val1_to_free; \
-    TYPE val1_read = 0; /* 0 works for any type */ \
-    TYPE val2_to_free = NEW; \
-    TYPE val2 = val2_to_free; \
-    TYPE val2_read = 0; \
-    int res = 1; \
-    \
-    if (!TEST_int_eq(ERR_peek_error(), 0)) \
-        res = 0; \
-    if ((*push_fn)(NULL, val1) || ERR_peek_error() == 0) { \
-        TEST_error("pusher did not return error on ctx == NULL"); \
-        res = 0; \
-    } \
-    ERR_clear_error(); \
-    \
-    if (n_elem < 0) /* can happen for NULL stack */ \
-        n_elem = 0; \
-    field_read = ctx->FIELD; \
-    if (!DEFAULT(field_read)) { \
-        TEST_error("did not get default value for stack field"); \
-        res = 0; \
-    } \
-    if (!(*push_fn)(ctx, val1)) { \
-        TEST_error("pushing first value failed"); \
-        res = 0; \
-    } \
-    if (PUSHN == 0) \
-        val1_to_free = 0; /* 0 works for any type */ \
-    \
-    if (sk_##T##_num(ctx->FIELD) != ++n_elem) { \
-        TEST_error("pushing first value did not increment number"); \
-        res = 0; \
-    } \
-    val1_read = sk_top_##FIELD(ctx); \
-    if (PUSHN == 0) { \
-        if (val1_read != val1) { \
-            TEST_error("push/sk_top first value did not match"); \
-            res = 0; \
-        } \
-    } else { \
-        if (DUP && val1_read == val1) { \
-            TEST_error("first push did not dup the value"); \
-            res = 0; \
-        } \
-    } \
-    \
-    if (!(*push_fn)(ctx, val2)) { \
-        TEST_error("pushing second value failed"); \
-        res = 0; \
-    } \
-    if (PUSHN == 0) \
-        val2_to_free = 0; \
-    \
-    if (sk_##T##_num(ctx->FIELD) != ++n_elem) { \
-        TEST_error("pushing second value did not increment number"); \
-        res = 0; \
-    } \
-    val2_read = sk_top_##FIELD(ctx); \
-    if (PUSHN == 0) { \
-        if (val2_read != val2) { \
-            TEST_error("push/sk_top second value did not match"); \
-            res = 0; \
-        } \
-    } else { \
-        if (DUP && val2_read == val2) { \
-            TEST_error("second push did not dup the value"); \
-            res = 0; \
-        } \
-        if (val2 == val1) { \
-            TEST_error("second value is same as first value"); \
-            res = 0; \
-        } \
-    } \
-    /* this does not check if all remaining fields and elems are untouched */ \
-    \
-    if (!TEST_int_eq(ERR_peek_error(), 0)) \
-        res = 0; \
-    \
-    FREE(val1_to_free); \
-    FREE(val2_to_free); \
-    return TEST_true(res); \
-} \
-\
-static int test_CTX_##PUSHN##_##ELEM(void) \
-{ \
-    SETUP_TEST_FIXTURE(OSSL_CMP_CTX_TEST_FIXTURE, set_up); \
-    EXECUTE_TEST(execute_CTX_##PUSHN##_##ELEM, tear_down); \
-    return result; \
-} \
-
-#define DEFINE_PUSH_TEST(N, DUP, FIELD, ELEM, TYPE) \
+#define DEFINE_PUSH_BASE_TEST(PUSHN, DUP, FIELD, ELEM, TYPE, T,                                             \
+    DEFAULT, NEW, FREE)                                                                                     \
+    static TYPE sk_top_##FIELD(const CMP_CTX *ctx)                                                          \
+    {                                                                                                       \
+        return sk_##T##_value(ctx->FIELD, sk_##T##_num(ctx->FIELD) - 1);                                    \
+    }                                                                                                       \
+                                                                                                            \
+    static int execute_CTX_##PUSHN##_##ELEM(OSSL_CMP_CTX_TEST_FIXTURE *fixture)                             \
+    {                                                                                                       \
+        CMP_CTX *ctx = fixture->ctx;                                                                        \
+        int (*push_fn)(CMP_CTX * ctx, TYPE) = (int (*)(CMP_CTX * ctx, TYPE)) OSSL_CMP_CTX_##PUSHN##_##ELEM; \
+        /*                                                                                                  \
+         * need type cast in above assignment because TYPE arg sometimes is const                           \
+         */                                                                                                 \
+        int n_elem = sk_##T##_num(ctx->FIELD);                                                              \
+        STACK_OF(TYPE) field_read;                                                                          \
+        TYPE val1_to_free = NEW;                                                                            \
+        TYPE val1 = val1_to_free;                                                                           \
+        TYPE val1_read = 0; /* 0 works for any type */                                                      \
+        TYPE val2_to_free = NEW;                                                                            \
+        TYPE val2 = val2_to_free;                                                                           \
+        TYPE val2_read = 0;                                                                                 \
+        int res = 1;                                                                                        \
+                                                                                                            \
+        if (!TEST_int_eq(ERR_peek_error(), 0))                                                              \
+            res = 0;                                                                                        \
+        if ((*push_fn)(NULL, val1) || ERR_peek_error() == 0) {                                              \
+            TEST_error("pusher did not return error on ctx == NULL");                                       \
+            res = 0;                                                                                        \
+        }                                                                                                   \
+        ERR_clear_error();                                                                                  \
+                                                                                                            \
+        if (n_elem < 0) /* can happen for NULL stack */                                                     \
+            n_elem = 0;                                                                                     \
+        field_read = ctx->FIELD;                                                                            \
+        if (!DEFAULT(field_read)) {                                                                         \
+            TEST_error("did not get default value for stack field");                                        \
+            res = 0;                                                                                        \
+        }                                                                                                   \
+        if (!(*push_fn)(ctx, val1)) {                                                                       \
+            TEST_error("pushing first value failed");                                                       \
+            res = 0;                                                                                        \
+        }                                                                                                   \
+        if (PUSHN == 0)                                                                                     \
+            val1_to_free = 0; /* 0 works for any type */                                                    \
+                                                                                                            \
+        if (sk_##T##_num(ctx->FIELD) != ++n_elem) {                                                         \
+            TEST_error("pushing first value did not increment number");                                     \
+            res = 0;                                                                                        \
+        }                                                                                                   \
+        val1_read = sk_top_##FIELD(ctx);                                                                    \
+        if (PUSHN == 0) {                                                                                   \
+            if (val1_read != val1) {                                                                        \
+                TEST_error("push/sk_top first value did not match");                                        \
+                res = 0;                                                                                    \
+            }                                                                                               \
+        } else {                                                                                            \
+            if (DUP && val1_read == val1) {                                                                 \
+                TEST_error("first push did not dup the value");                                             \
+                res = 0;                                                                                    \
+            }                                                                                               \
+        }                                                                                                   \
+                                                                                                            \
+        if (!(*push_fn)(ctx, val2)) {                                                                       \
+            TEST_error("pushing second value failed");                                                      \
+            res = 0;                                                                                        \
+        }                                                                                                   \
+        if (PUSHN == 0)                                                                                     \
+            val2_to_free = 0;                                                                               \
+                                                                                                            \
+        if (sk_##T##_num(ctx->FIELD) != ++n_elem) {                                                         \
+            TEST_error("pushing second value did not increment number");                                    \
+            res = 0;                                                                                        \
+        }                                                                                                   \
+        val2_read = sk_top_##FIELD(ctx);                                                                    \
+        if (PUSHN == 0) {                                                                                   \
+            if (val2_read != val2) {                                                                        \
+                TEST_error("push/sk_top second value did not match");                                       \
+                res = 0;                                                                                    \
+            }                                                                                               \
+        } else {                                                                                            \
+            if (DUP && val2_read == val2) {                                                                 \
+                TEST_error("second push did not dup the value");                                            \
+                res = 0;                                                                                    \
+            }                                                                                               \
+            if (val2 == val1) {                                                                             \
+                TEST_error("second value is same as first value");                                          \
+                res = 0;                                                                                    \
+            }                                                                                               \
+        }                                                                                                   \
+        /* this does not check if all remaining fields and elems are untouched */                           \
+                                                                                                            \
+        if (!TEST_int_eq(ERR_peek_error(), 0))                                                              \
+            res = 0;                                                                                        \
+                                                                                                            \
+        FREE(val1_to_free);                                                                                 \
+        FREE(val2_to_free);                                                                                 \
+        return TEST_true(res);                                                                              \
+    }                                                                                                       \
+                                                                                                            \
+    static int test_CTX_##PUSHN##_##ELEM(void)                                                              \
+    {                                                                                                       \
+        SETUP_TEST_FIXTURE(OSSL_CMP_CTX_TEST_FIXTURE, set_up);                                              \
+        EXECUTE_TEST(execute_CTX_##PUSHN##_##ELEM, tear_down);                                              \
+        return result;                                                                                      \
+    }
+
+#define DEFINE_PUSH_TEST(N, DUP, FIELD, ELEM, TYPE)                \
     DEFINE_PUSH_BASE_TEST(push##N, DUP, FIELD, ELEM, TYPE *, TYPE, \
-                          IS_0, TYPE##_new(), TYPE##_free)
+        IS_0, TYPE##_new(), TYPE##_free)
 
 void cleanup_tests(void)
 {
@@ -743,8 +747,8 @@ void cleanup_tests(void)
 }
 
 DEFINE_SET_GET_ARG_FN(set, get, option, 35, int) /* OPT_IGNORE_KEYUSAGE */
-DEFINE_SET_GET_BASE_TEST(OSSL_CMP_CTX, set, get, 0, option_35, int, -1, IS_0, \
-                         1 /* true */, DROP)
+DEFINE_SET_GET_BASE_TEST(OSSL_CMP_CTX, set, get, 0, option_35, int, -1, IS_0,
+    1 /* true */, DROP)
 
 DEFINE_SET_CB_TEST(log_cb)
 
@@ -764,8 +768,8 @@ DEFINE_SET_TEST(OSSL_CMP, CTX, 1, 0, srvCert, X509)
 DEFINE_SET_GET_TEST(ossl_cmp, ctx, 1, 0, 0, validatedSrvCert, X509)
 DEFINE_SET_TEST(OSSL_CMP, CTX, 1, 1, expected_sender, X509_NAME)
 DEFINE_SET_GET_BASE_TEST(OSSL_CMP_CTX, set0, get0, 0, trusted,
-                         X509_STORE *, NULL,
-                         DEFAULT_STORE, X509_STORE_new_1(), X509_STORE_free)
+    X509_STORE *, NULL,
+    DEFAULT_STORE, X509_STORE_new_1(), X509_STORE_free)
 DEFINE_SET_GET_SK_X509_TEST(OSSL_CMP, CTX, 1, 0, untrusted)
 
 DEFINE_SET_TEST(OSSL_CMP, CTX, 1, 0, cert, X509)
@@ -780,7 +784,7 @@ DEFINE_SET_GET_ARG_FN(set0, get0, newPkey, 0, EVP_PKEY *) /* priv == 0 */
 DEFINE_SET_GET_TEST(OSSL_CMP, CTX, 0, 0, 0, newPkey_0, EVP_PKEY)
 DEFINE_SET_GET1_STR_FN(set1, referenceValue)
 DEFINE_SET_GET_TEST_DEFAULT(OSSL_CMP, CTX, 1, 1, 1, referenceValue_str, char,
-                            IS_0)
+    IS_0)
 DEFINE_SET_GET1_STR_FN(set1, secretValue)
 DEFINE_SET_GET_TEST_DEFAULT(OSSL_CMP, CTX, 1, 1, 1, secretValue_str, char, IS_0)
 DEFINE_SET_TEST(OSSL_CMP, CTX, 1, 1, issuer, X509_NAME)
@@ -807,7 +811,7 @@ DEFINE_SET_GET_SK_X509_TEST(ossl_cmp, ctx, 1, 1, caPubs)
 DEFINE_SET_GET_SK_X509_TEST(ossl_cmp, ctx, 1, 1, extraCertsIn)
 
 DEFINE_SET_TEST_DEFAULT(OSSL_CMP, CTX, 1, 1, transactionID, ASN1_OCTET_STRING,
-                        IS_0)
+    IS_0)
 DEFINE_SET_TEST(OSSL_CMP, CTX, 1, 1, senderNonce, ASN1_OCTET_STRING)
 DEFINE_SET_TEST(ossl_cmp, ctx, 1, 1, recipNonce, ASN1_OCTET_STRING)
 
diff --git a/test/cmp_hdr_test.c b/test/cmp_hdr_test.c
index 8cdf6b9b07a6e..cbffb87b23e14 100644
--- a/test/cmp_hdr_test.c
+++ b/test/cmp_hdr_test.c
@@ -41,7 +41,7 @@ static CMP_HDR_TEST_FIXTURE *set_up(const char *const test_case_name)
         goto err;
     return fixture;
 
- err:
+err:
     tear_down(fixture);
     return NULL;
 }
@@ -65,9 +65,9 @@ static int test_HDR_set_get_pvno(void)
     return result;
 }
 
-#define X509_NAME_ADD(n, rd, s) \
+#define X509_NAME_ADD(n, rd, s)                                               \
     X509_NAME_add_entry_by_txt((n), (rd), MBSTRING_ASC, (unsigned char *)(s), \
-                               -1, -1, 0)
+        -1, -1, 0)
 
 static int execute_HDR_get0_senderNonce_test(CMP_HDR_TEST_FIXTURE *fixture)
 {
@@ -80,14 +80,14 @@ static int execute_HDR_get0_senderNonce_test(CMP_HDR_TEST_FIXTURE *fixture)
 
     X509_NAME_ADD(sender, "CN", "A common sender name");
     if (!TEST_int_eq(OSSL_CMP_CTX_set1_subjectName(fixture->cmp_ctx, sender),
-                     1))
+            1))
         goto err;
     if (!TEST_int_eq(ossl_cmp_hdr_init(fixture->cmp_ctx, fixture->hdr),
-                     1))
+            1))
         goto err;
     sn = ossl_cmp_hdr_get0_senderNonce(fixture->hdr);
     if (!TEST_int_eq(ASN1_OCTET_STRING_cmp(fixture->cmp_ctx->senderNonce, sn),
-                     0))
+            0))
         goto err;
 
     res = 1;
@@ -121,7 +121,8 @@ static int execute_HDR_set1_sender_test(CMP_HDR_TEST_FIXTURE *fixture)
         goto err;
 
     if (!TEST_int_eq(X509_NAME_cmp(fixture->hdr->sender->d.directoryName,
-                                   x509name), 0))
+                         x509name),
+            0))
         goto err;
 
     res = 1;
@@ -155,7 +156,8 @@ static int execute_HDR_set1_recipient_test(CMP_HDR_TEST_FIXTURE *fixture)
         goto err;
 
     if (!TEST_int_eq(X509_NAME_cmp(fixture->hdr->recipient->d.directoryName,
-                                   x509name), 0))
+                         x509name),
+            0))
         goto err;
 
     res = 1;
@@ -220,15 +222,17 @@ static int execute_HDR_set1_senderKID_test(CMP_HDR_TEST_FIXTURE *fixture)
         goto err;
 
     if (!TEST_int_eq(ASN1_OCTET_STRING_set(senderKID, rand_data,
-                                           sizeof(rand_data)), 1))
+                         sizeof(rand_data)),
+            1))
         goto err;
     if (!TEST_int_eq(ossl_cmp_hdr_set1_senderKID(fixture->hdr, senderKID), 1))
         goto err;
     if (!TEST_int_eq(ASN1_OCTET_STRING_cmp(fixture->hdr->senderKID,
-                                           senderKID), 0))
+                         senderKID),
+            0))
         goto err;
     res = 1;
- err:
+err:
     ASN1_OCTET_STRING_free(senderKID);
     return res;
 }
@@ -259,7 +263,7 @@ static int execute_HDR_push0_freeText_test(CMP_HDR_TEST_FIXTURE *fixture)
 
     return 1;
 
- err:
+err:
     ASN1_UTF8STRING_free(text);
     return 0;
 }
@@ -292,7 +296,7 @@ static int execute_HDR_push1_freeText_test(CMP_HDR_TEST_FIXTURE *fixture)
         goto err;
 
     res = 1;
- err:
+err:
     ASN1_UTF8STRING_free(text);
 
     return res;
@@ -315,11 +319,10 @@ execute_HDR_generalInfo_push0_item_test(CMP_HDR_TEST_FIXTURE *fixture)
         return 0;
 
     if (!TEST_int_eq(ossl_cmp_hdr_generalInfo_push0_item(fixture->hdr, itav),
-                     1))
+            1))
         return 0;
 
-    if (!TEST_true(itav == sk_OSSL_CMP_ITAV_value(fixture->hdr->generalInfo,
-                                                  0)))
+    if (!TEST_true(itav == sk_OSSL_CMP_ITAV_value(fixture->hdr->generalInfo, 0)))
         return 0;
 
     return 1;
@@ -349,7 +352,7 @@ execute_HDR_generalInfo_push1_items_test(CMP_HDR_TEST_FIXTURE *fixture)
         return 0;
 
     if (!TEST_ptr(val)
-            || !TEST_true(ASN1_INTEGER_set(asn1int, 88))) {
+        || !TEST_true(ASN1_INTEGER_set(asn1int, 88))) {
         ASN1_INTEGER_free(asn1int);
         return 0;
     }
@@ -365,7 +368,7 @@ execute_HDR_generalInfo_push1_items_test(CMP_HDR_TEST_FIXTURE *fixture)
     }
 
     if (!TEST_int_eq(ossl_cmp_hdr_generalInfo_push1_items(fixture->hdr, itavs),
-                     1))
+            1))
         goto err;
     ginfo = fixture->hdr->generalInfo;
     pushed_itav = sk_OSSL_CMP_ITAV_value(ginfo, 0);
@@ -379,7 +382,7 @@ execute_HDR_generalInfo_push1_items_test(CMP_HDR_TEST_FIXTURE *fixture)
 
     res = 1;
 
- err:
+err:
     sk_OSSL_CMP_ITAV_pop_free(itavs, OSSL_CMP_ITAV_free);
     return res;
 }
@@ -394,7 +397,7 @@ static int test_HDR_generalInfo_push1_items(void)
 
 static int
 execute_HDR_set_and_check_implicitConfirm_test(CMP_HDR_TEST_FIXTURE
-                                               * fixture)
+        *fixture)
 {
     return TEST_false(ossl_cmp_hdr_has_implicitConfirm(fixture->hdr))
         && TEST_true(ossl_cmp_hdr_set_implicitConfirm(fixture->hdr))
@@ -414,7 +417,7 @@ static int execute_HDR_init_test(CMP_HDR_TEST_FIXTURE *fixture)
     ASN1_OCTET_STRING *ctx_nonce;
 
     if (!TEST_int_eq(fixture->expected,
-                     ossl_cmp_hdr_init(fixture->cmp_ctx, fixture->hdr)))
+            ossl_cmp_hdr_init(fixture->cmp_ctx, fixture->hdr)))
         return 0;
     if (fixture->expected == 0)
         return 1;
@@ -423,20 +426,19 @@ static int execute_HDR_init_test(CMP_HDR_TEST_FIXTURE *fixture)
         return 0;
 
     header_nonce = ossl_cmp_hdr_get0_senderNonce(fixture->hdr);
-    if (!TEST_int_eq(0, ASN1_OCTET_STRING_cmp(header_nonce,
-                                              fixture->cmp_ctx->senderNonce)))
+    if (!TEST_int_eq(0, ASN1_OCTET_STRING_cmp(header_nonce, fixture->cmp_ctx->senderNonce)))
         return 0;
     header_transactionID = OSSL_CMP_HDR_get0_transactionID(fixture->hdr);
     if (!TEST_true(ASN1_OCTET_STRING_cmp(header_transactionID,
-                                         fixture->cmp_ctx->transactionID) == 0))
+                       fixture->cmp_ctx->transactionID)
+            == 0))
         return 0;
 
     header_nonce = OSSL_CMP_HDR_get0_recipNonce(fixture->hdr);
     ctx_nonce = fixture->cmp_ctx->recipNonce;
     if (ctx_nonce != NULL
-            && (!TEST_ptr(header_nonce)
-                    || !TEST_int_eq(0, ASN1_OCTET_STRING_cmp(header_nonce,
-                                                             ctx_nonce))))
+        && (!TEST_ptr(header_nonce)
+            || !TEST_int_eq(0, ASN1_OCTET_STRING_cmp(header_nonce, ctx_nonce))))
         return 0;
 
     return 1;
@@ -450,8 +452,8 @@ static int test_HDR_init_with_ref(void)
 
     fixture->expected = 1;
     if (!TEST_int_eq(1, RAND_bytes(ref, sizeof(ref)))
-            || !TEST_true(OSSL_CMP_CTX_set1_referenceValue(fixture->cmp_ctx,
-                                                           ref, sizeof(ref)))) {
+        || !TEST_true(OSSL_CMP_CTX_set1_referenceValue(fixture->cmp_ctx,
+            ref, sizeof(ref)))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -466,9 +468,9 @@ static int test_HDR_init_with_subject(void)
     SETUP_TEST_FIXTURE(CMP_HDR_TEST_FIXTURE, set_up);
     fixture->expected = 1;
     if (!TEST_ptr(subject = X509_NAME_new())
-            || !TEST_true(X509_NAME_ADD(subject, "CN", "Common Name"))
-            || !TEST_true(OSSL_CMP_CTX_set1_subjectName(fixture->cmp_ctx,
-                                                        subject))) {
+        || !TEST_true(X509_NAME_ADD(subject, "CN", "Common Name"))
+        || !TEST_true(OSSL_CMP_CTX_set1_subjectName(fixture->cmp_ctx,
+            subject))) {
         tear_down(fixture);
         fixture = NULL;
     }
diff --git a/test/cmp_msg_test.c b/test/cmp_msg_test.c
index e98b5624285b5..f84a49a8fe841 100644
--- a/test/cmp_msg_test.c
+++ b/test/cmp_msg_test.c
@@ -54,9 +54,9 @@ static CMP_MSG_TEST_FIXTURE *set_up(const char *const test_case_name)
     fixture->test_case_name = test_case_name;
 
     if (!TEST_ptr(fixture->cmp_ctx = OSSL_CMP_CTX_new(libctx, NULL))
-            || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 1))
-            || !TEST_true(OSSL_CMP_CTX_set1_referenceValue(fixture->cmp_ctx,
-                                                           ref, sizeof(ref)))) {
+        || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 1))
+        || !TEST_true(OSSL_CMP_CTX_set1_referenceValue(fixture->cmp_ctx,
+            ref, sizeof(ref)))) {
         tear_down(fixture);
         return NULL;
     }
@@ -66,16 +66,14 @@ static CMP_MSG_TEST_FIXTURE *set_up(const char *const test_case_name)
 static EVP_PKEY *newkey = NULL;
 static X509 *cert = NULL;
 
-#define EXECUTE_MSG_CREATION_TEST(expr) \
-    do { \
-        OSSL_CMP_MSG *msg = NULL; \
-        int good = fixture->expected != 0 ? \
-            TEST_ptr(msg = (expr)) && TEST_true(valid_asn1_encoding(msg)) : \
-            TEST_ptr_null(msg = (expr)); \
- \
-        OSSL_CMP_MSG_free(msg); \
-        ERR_print_errors_fp(stderr); \
-        return good; \
+#define EXECUTE_MSG_CREATION_TEST(expr)                                                                                                  \
+    do {                                                                                                                                 \
+        OSSL_CMP_MSG *msg = NULL;                                                                                                        \
+        int good = fixture->expected != 0 ? TEST_ptr(msg = (expr)) && TEST_true(valid_asn1_encoding(msg)) : TEST_ptr_null(msg = (expr)); \
+                                                                                                                                         \
+        OSSL_CMP_MSG_free(msg);                                                                                                          \
+        ERR_print_errors_fp(stderr);                                                                                                     \
+        return good;                                                                                                                     \
     } while (0)
 
 /*-
@@ -88,15 +86,15 @@ static X509 *cert = NULL;
 static int execute_certreq_create_test(CMP_MSG_TEST_FIXTURE *fixture)
 {
     EXECUTE_MSG_CREATION_TEST(ossl_cmp_certreq_new(fixture->cmp_ctx,
-                                                   fixture->bodytype,
-                                                   NULL));
+        fixture->bodytype,
+        NULL));
 }
 
 static int execute_errormsg_create_test(CMP_MSG_TEST_FIXTURE *fixture)
 {
     EXECUTE_MSG_CREATION_TEST(ossl_cmp_error_new(fixture->cmp_ctx, fixture->si,
-                                                 fixture->err_code,
-                                                 "details", 0));
+        fixture->err_code,
+        "details", 0));
 }
 
 static int execute_rr_create_test(CMP_MSG_TEST_FIXTURE *fixture)
@@ -106,9 +104,8 @@ static int execute_rr_create_test(CMP_MSG_TEST_FIXTURE *fixture)
 
 static int execute_certconf_create_test(CMP_MSG_TEST_FIXTURE *fixture)
 {
-    EXECUTE_MSG_CREATION_TEST(ossl_cmp_certConf_new
-                              (fixture->cmp_ctx, OSSL_CMP_CERTREQID,
-                               fixture->fail_info, NULL));
+    EXECUTE_MSG_CREATION_TEST(ossl_cmp_certConf_new(fixture->cmp_ctx, OSSL_CMP_CERTREQID,
+        fixture->fail_info, NULL));
 }
 
 static int execute_genm_create_test(CMP_MSG_TEST_FIXTURE *fixture)
@@ -123,8 +120,7 @@ static int execute_pollreq_create_test(CMP_MSG_TEST_FIXTURE *fixture)
 
 static int execute_pkimessage_create_test(CMP_MSG_TEST_FIXTURE *fixture)
 {
-    EXECUTE_MSG_CREATION_TEST(ossl_cmp_msg_create
-                              (fixture->cmp_ctx, fixture->bodytype));
+    EXECUTE_MSG_CREATION_TEST(ossl_cmp_msg_create(fixture->cmp_ctx, fixture->bodytype));
 }
 
 static int set1_newPkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey)
@@ -151,10 +147,10 @@ static int test_cmp_create_ir_protection_set(void)
     fixture->err_code = -1;
     fixture->expected = 1;
     if (!TEST_int_eq(1, RAND_bytes_ex(libctx, secret, sizeof(secret), 0))
-            || !TEST_true(SET_OPT_UNPROTECTED_SEND(ctx, 0))
-            || !TEST_true(set1_newPkey(ctx, newkey))
-            || !TEST_true(OSSL_CMP_CTX_set1_secretValue(ctx, secret,
-                                                        sizeof(secret)))) {
+        || !TEST_true(SET_OPT_UNPROTECTED_SEND(ctx, 0))
+        || !TEST_true(set1_newPkey(ctx, newkey))
+        || !TEST_true(OSSL_CMP_CTX_set1_secretValue(ctx, secret,
+            sizeof(secret)))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -169,9 +165,9 @@ static int test_cmp_create_ir_protection_fails(void)
     fixture->err_code = -1;
     fixture->expected = 0;
     if (!TEST_true(OSSL_CMP_CTX_set1_pkey(fixture->cmp_ctx, newkey))
-            || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0))
-            /* newkey used by default for signing does not match cert: */
-            || !TEST_true(OSSL_CMP_CTX_set1_cert(fixture->cmp_ctx, cert))) {
+        || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0))
+        /* newkey used by default for signing does not match cert: */
+        || !TEST_true(OSSL_CMP_CTX_set1_cert(fixture->cmp_ctx, cert))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -228,8 +224,8 @@ static int test_cmp_create_p10cr(void)
     fixture->err_code = CMP_R_ERROR_CREATING_CERTREQ;
     fixture->expected = 1;
     if (!TEST_ptr(p10cr = load_csr_der(pkcs10_f, libctx))
-            || !TEST_true(set1_newPkey(ctx, newkey))
-            || !TEST_true(OSSL_CMP_CTX_set1_p10CSR(ctx, p10cr))) {
+        || !TEST_true(set1_newPkey(ctx, newkey))
+        || !TEST_true(OSSL_CMP_CTX_set1_p10CSR(ctx, p10cr))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -259,7 +255,7 @@ static int test_cmp_create_kur(void)
     fixture->err_code = -1;
     fixture->expected = 1;
     if (!TEST_true(set1_newPkey(fixture->cmp_ctx, newkey))
-            || !TEST_true(OSSL_CMP_CTX_set1_oldCert(fixture->cmp_ctx, cert))) {
+        || !TEST_true(OSSL_CMP_CTX_set1_oldCert(fixture->cmp_ctx, cert))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -287,7 +283,7 @@ static int test_cmp_create_certconf(void)
     fixture->fail_info = 0;
     fixture->expected = 1;
     if (!TEST_true(ossl_cmp_ctx_set0_newCert(fixture->cmp_ctx,
-                                             X509_dup(cert)))) {
+            X509_dup(cert)))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -301,7 +297,7 @@ static int test_cmp_create_certconf_badAlg(void)
     fixture->fail_info = 1 << OSSL_CMP_PKIFAILUREINFO_badAlg;
     fixture->expected = 1;
     if (!TEST_true(ossl_cmp_ctx_set0_newCert(fixture->cmp_ctx,
-                                             X509_dup(cert)))) {
+            X509_dup(cert)))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -315,7 +311,7 @@ static int test_cmp_create_certconf_fail_info_max(void)
     fixture->fail_info = 1 << OSSL_CMP_PKIFAILUREINFO_MAX;
     fixture->expected = 1;
     if (!TEST_true(ossl_cmp_ctx_set0_newCert(fixture->cmp_ctx,
-                                             X509_dup(cert)))) {
+            X509_dup(cert)))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -327,8 +323,8 @@ static int test_cmp_create_error_msg(void)
 {
     SETUP_TEST_FIXTURE(CMP_MSG_TEST_FIXTURE, set_up);
     fixture->si = OSSL_CMP_STATUSINFO_new(OSSL_CMP_PKISTATUS_rejection,
-                                          OSSL_CMP_PKIFAILUREINFO_systemFailure,
-                                          NULL);
+        OSSL_CMP_PKIFAILUREINFO_systemFailure,
+        NULL);
     fixture->err_code = -1;
     fixture->expected = 1; /* expected: message creation is successful */
     if (!TEST_true(set1_newPkey(fixture->cmp_ctx, newkey))) {
@@ -367,7 +363,7 @@ static int test_cmp_create_genm(void)
     fixture->expected = 1;
     iv = OSSL_CMP_ITAV_create(OBJ_nid2obj(NID_id_it_implicitConfirm), NULL);
     if (!TEST_ptr(iv)
-            || !TEST_true(OSSL_CMP_CTX_push0_genm_ITAV(fixture->cmp_ctx, iv))) {
+        || !TEST_true(OSSL_CMP_CTX_push0_genm_ITAV(fixture->cmp_ctx, iv))) {
         OSSL_CMP_ITAV_free(iv);
         tear_down(fixture);
         fixture = NULL;
@@ -391,11 +387,9 @@ static int execute_certrep_create(CMP_MSG_TEST_FIXTURE *fixture)
         goto err;
     if ((cresp->certifiedKeyPair = OSSL_CMP_CERTIFIEDKEYPAIR_new()) == NULL)
         goto err;
-    cresp->certifiedKeyPair->certOrEncCert->type =
-        OSSL_CMP_CERTORENCCERT_CERTIFICATE;
-    if ((cresp->certifiedKeyPair->certOrEncCert->value.certificate =
-         X509_dup(cert)) == NULL
-            || !sk_OSSL_CMP_CERTRESPONSE_push(crepmsg->response, cresp))
+    cresp->certifiedKeyPair->certOrEncCert->type = OSSL_CMP_CERTORENCCERT_CERTIFICATE;
+    if ((cresp->certifiedKeyPair->certOrEncCert->value.certificate = X509_dup(cert)) == NULL
+        || !sk_OSSL_CMP_CERTRESPONSE_push(crepmsg->response, cresp))
         goto err;
     cresp = NULL;
     read_cresp = ossl_cmp_certrepmessage_get0_certresponse(crepmsg, 99);
@@ -408,7 +402,7 @@ static int execute_certrep_create(CMP_MSG_TEST_FIXTURE *fixture)
         goto err;
 
     res = 1;
- err:
+err:
     X509_free(certfromresp);
     OSSL_CMP_CERTRESPONSE_free(cresp);
     OSSL_CMP_CERTREPMESSAGE_free(crepmsg);
@@ -435,10 +429,10 @@ static int execute_rp_create(CMP_MSG_TEST_FIXTURE *fixture)
         goto err;
 
     if (!X509_NAME_add_entry_by_txt(issuer, "CN", MBSTRING_ASC,
-                                    (unsigned char *)"The Issuer", -1, -1, 0)
-            || !ASN1_INTEGER_set(serial, 99)
-            || (cid = OSSL_CRMF_CERTID_gen(issuer, serial)) == NULL
-            || (rpmsg = ossl_cmp_rp_new(fixture->cmp_ctx, si, cid, 1)) == NULL)
+            (unsigned char *)"The Issuer", -1, -1, 0)
+        || !ASN1_INTEGER_set(serial, 99)
+        || (cid = OSSL_CRMF_CERTID_gen(issuer, serial)) == NULL
+        || (rpmsg = ossl_cmp_rp_new(fixture->cmp_ctx, si, cid, 1)) == NULL)
         goto err;
 
     if (!TEST_ptr(ossl_cmp_revrepcontent_get_CertId(rpmsg->body->value.rp, 0)))
@@ -448,7 +442,7 @@ static int execute_rp_create(CMP_MSG_TEST_FIXTURE *fixture)
         goto err;
 
     res = 1;
- err:
+err:
     ASN1_INTEGER_free(serial);
     X509_NAME_free(issuer);
     OSSL_CRMF_CERTID_free(cid);
@@ -472,15 +466,13 @@ static int execute_pollrep_create(CMP_MSG_TEST_FIXTURE *fixture)
     pollrep = ossl_cmp_pollRep_new(fixture->cmp_ctx, 77, 2000);
     if (!TEST_ptr(pollrep))
         return 0;
-    if (!TEST_ptr(ossl_cmp_pollrepcontent_get0_pollrep(pollrep->body->
-                                                       value.pollRep, 77)))
+    if (!TEST_ptr(ossl_cmp_pollrepcontent_get0_pollrep(pollrep->body->value.pollRep, 77)))
         goto err;
-    if (!TEST_ptr_null(ossl_cmp_pollrepcontent_get0_pollrep(pollrep->body->
-                                                            value.pollRep, 88)))
+    if (!TEST_ptr_null(ossl_cmp_pollrepcontent_get0_pollrep(pollrep->body->value.pollRep, 88)))
         goto err;
 
     res = 1;
- err:
+err:
     OSSL_CMP_MSG_free(pollrep);
     return res;
 }
@@ -554,8 +546,8 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(newkey_f = test_get_argument(0))
-            || !TEST_ptr(server_cert_f = test_get_argument(1))
-            || !TEST_ptr(pkcs10_f = test_get_argument(2))) {
+        || !TEST_ptr(server_cert_f = test_get_argument(1))
+        || !TEST_ptr(pkcs10_f = test_get_argument(2))) {
         TEST_error("usage: cmp_msg_test %s", USAGE);
         return 0;
     }
@@ -564,8 +556,8 @@ int setup_tests(void)
         return 0;
 
     if (!TEST_ptr(newkey = load_pkey_pem(newkey_f, libctx))
-            || !TEST_ptr(cert = load_cert_pem(server_cert_f, libctx))
-            || !TEST_int_eq(1, RAND_bytes_ex(libctx, ref, sizeof(ref), 0))) {
+        || !TEST_ptr(cert = load_cert_pem(server_cert_f, libctx))
+        || !TEST_int_eq(1, RAND_bytes_ex(libctx, ref, sizeof(ref), 0))) {
         cleanup_tests();
         return 0;
     }
@@ -591,6 +583,6 @@ int setup_tests(void)
     ADD_TEST(test_cmp_create_certrep);
     ADD_TEST(test_cmp_create_pollrep);
     ADD_ALL_TESTS_NOSUBTEST(test_cmp_pkimessage_create,
-                            OSSL_CMP_PKIBODY_POLLREP + 1);
+        OSSL_CMP_PKIBODY_POLLREP + 1);
     return 1;
 }
diff --git a/test/cmp_protect_test.c b/test/cmp_protect_test.c
index 9b975b86c3a6d..3bbdc095199b4 100644
--- a/test/cmp_protect_test.c
+++ b/test/cmp_protect_test.c
@@ -75,12 +75,11 @@ static X509 *server_cert = NULL;
 static unsigned char rand_data[OSSL_CMP_TRANSACTIONID_LENGTH];
 static OSSL_CMP_MSG *ir_unprotected, *ir_protected;
 static X509 *endentity1 = NULL, *endentity2 = NULL,
-    *root = NULL, *intermediate = NULL;
+            *root = NULL, *intermediate = NULL;
 
 static int execute_calc_protection_fails_test(CMP_PROTECT_TEST_FIXTURE *fixture)
 {
-    ASN1_BIT_STRING *protection =
-        ossl_cmp_calc_protection(fixture->cmp_ctx, fixture->msg);
+    ASN1_BIT_STRING *protection = ossl_cmp_calc_protection(fixture->cmp_ctx, fixture->msg);
     int res = TEST_ptr_null(protection);
 
     ASN1_BIT_STRING_free(protection);
@@ -89,11 +88,11 @@ static int execute_calc_protection_fails_test(CMP_PROTECT_TEST_FIXTURE *fixture)
 
 static int execute_calc_protection_pbmac_test(CMP_PROTECT_TEST_FIXTURE *fixture)
 {
-    ASN1_BIT_STRING *protection =
-        ossl_cmp_calc_protection(fixture->cmp_ctx, fixture->msg);
+    ASN1_BIT_STRING *protection = ossl_cmp_calc_protection(fixture->cmp_ctx, fixture->msg);
     int res = TEST_ptr(protection)
-            && TEST_true(ASN1_STRING_cmp(protection,
-                                         fixture->msg->protection) == 0);
+        && TEST_true(ASN1_STRING_cmp(protection,
+                         fixture->msg->protection)
+            == 0);
 
     ASN1_BIT_STRING_free(protection);
     return res;
@@ -104,28 +103,28 @@ static int execute_calc_protection_pbmac_test(CMP_PROTECT_TEST_FIXTURE *fixture)
  * but without the need for an OSSL_CMP_CTX or an X509 certificate.
  */
 static int verify_signature(OSSL_CMP_MSG *msg,
-                            ASN1_BIT_STRING *protection,
-                            EVP_PKEY *pkey, EVP_MD *digest)
+    ASN1_BIT_STRING *protection,
+    EVP_PKEY *pkey, EVP_MD *digest)
 {
     OSSL_CMP_PROTECTEDPART prot_part;
 
     prot_part.header = OSSL_CMP_MSG_get0_header(msg);
     prot_part.body = msg->body;
     return ASN1_item_verify_ex(ASN1_ITEM_rptr(OSSL_CMP_PROTECTEDPART),
-                               msg->header->protectionAlg, protection,
-                               &prot_part, NULL, pkey, libctx, NULL) > 0;
+               msg->header->protectionAlg, protection,
+               &prot_part, NULL, pkey, libctx, NULL)
+        > 0;
 }
 
 /* Calls OSSL_CMP_calc_protection and compares and verifies signature */
 static int execute_calc_protection_signature_test(CMP_PROTECT_TEST_FIXTURE *
-                                                  fixture)
+        fixture)
 {
-    ASN1_BIT_STRING *protection =
-        ossl_cmp_calc_protection(fixture->cmp_ctx, fixture->msg);
+    ASN1_BIT_STRING *protection = ossl_cmp_calc_protection(fixture->cmp_ctx, fixture->msg);
     int ret = (TEST_ptr(protection)
-               && TEST_true(verify_signature(fixture->msg, protection,
-                                             fixture->pubkey,
-                                             fixture->cmp_ctx->digest)));
+        && TEST_true(verify_signature(fixture->msg, protection,
+            fixture->pubkey,
+            fixture->cmp_ctx->digest)));
 
     ASN1_BIT_STRING_free(protection);
     return ret;
@@ -135,8 +134,7 @@ static int test_cmp_calc_protection_no_key_no_secret(void)
 {
     SETUP_TEST_FIXTURE(CMP_PROTECT_TEST_FIXTURE, set_up);
     if (!TEST_ptr(fixture->msg = load_pkimsg(ir_unprotected_f, libctx))
-            || !TEST_ptr(fixture->msg->header->protectionAlg =
-                         X509_ALGOR_new() /* no specific alg needed here */)) {
+        || !TEST_ptr(fixture->msg->header->protectionAlg = X509_ALGOR_new() /* no specific alg needed here */)) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -179,8 +177,8 @@ static int test_cmp_calc_protection_pbmac(void)
 
     SETUP_TEST_FIXTURE(CMP_PROTECT_TEST_FIXTURE, set_up);
     if (!TEST_true(OSSL_CMP_CTX_set1_secretValue(fixture->cmp_ctx,
-                                                 sec_insta, sizeof(sec_insta)))
-            || !TEST_ptr(fixture->msg = load_pkimsg(ip_PBM_f, libctx))) {
+            sec_insta, sizeof(sec_insta)))
+        || !TEST_ptr(fixture->msg = load_pkimsg(ip_PBM_f, libctx))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -190,7 +188,7 @@ static int test_cmp_calc_protection_pbmac(void)
 static int execute_MSG_protect_test(CMP_PROTECT_TEST_FIXTURE *fixture)
 {
     return TEST_int_eq(fixture->expected,
-                       ossl_cmp_msg_protect(fixture->cmp_ctx, fixture->msg));
+        ossl_cmp_msg_protect(fixture->cmp_ctx, fixture->msg));
 }
 
 #define SET_OPT_UNPROTECTED_SEND(ctx, val) \
@@ -201,7 +199,7 @@ static int test_MSG_protect_unprotected_request(void)
 
     fixture->expected = 1;
     if (!TEST_ptr(fixture->msg = OSSL_CMP_MSG_dup(ir_unprotected))
-            || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 1))) {
+        || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 1))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -217,16 +215,16 @@ static int test_MSG_protect_with_msg_sig_alg_protection_plus_rsa_key(void)
     fixture->expected = 1;
 
     if (!TEST_ptr(fixture->msg = OSSL_CMP_MSG_dup(ir_unprotected))
-            || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0))
-            /*
-             * Use half of the 16 bytes of random input
-             * for each reference and secret value
-             */
-            || !TEST_true(OSSL_CMP_CTX_set1_referenceValue(fixture->cmp_ctx,
-                                                           rand_data, size))
-            || !TEST_true(OSSL_CMP_CTX_set1_secretValue(fixture->cmp_ctx,
-                                                        rand_data + size,
-                                                        size))) {
+        || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0))
+        /*
+         * Use half of the 16 bytes of random input
+         * for each reference and secret value
+         */
+        || !TEST_true(OSSL_CMP_CTX_set1_referenceValue(fixture->cmp_ctx,
+            rand_data, size))
+        || !TEST_true(OSSL_CMP_CTX_set1_secretValue(fixture->cmp_ctx,
+            rand_data + size,
+            size))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -239,12 +237,11 @@ static int test_MSG_protect_with_certificate_and_key(void)
     SETUP_TEST_FIXTURE(CMP_PROTECT_TEST_FIXTURE, set_up);
     fixture->expected = 1;
 
-    if (!TEST_ptr(fixture->msg =
-                  OSSL_CMP_MSG_dup(ir_unprotected))
-            || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0))
-            || !TEST_true(OSSL_CMP_CTX_set1_pkey(fixture->cmp_ctx, server_key))
-            || !TEST_true(OSSL_CMP_CTX_set1_cert(fixture->cmp_ctx,
-                                                 server_cert))) {
+    if (!TEST_ptr(fixture->msg = OSSL_CMP_MSG_dup(ir_unprotected))
+        || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0))
+        || !TEST_true(OSSL_CMP_CTX_set1_pkey(fixture->cmp_ctx, server_key))
+        || !TEST_true(OSSL_CMP_CTX_set1_cert(fixture->cmp_ctx,
+            server_cert))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -259,11 +256,10 @@ static int test_MSG_protect_certificate_based_without_cert(void)
     SETUP_TEST_FIXTURE(CMP_PROTECT_TEST_FIXTURE, set_up);
     ctx = fixture->cmp_ctx;
     fixture->expected = 0;
-    if (!TEST_ptr(fixture->msg =
-                  OSSL_CMP_MSG_dup(ir_unprotected))
-            || !TEST_true(SET_OPT_UNPROTECTED_SEND(ctx, 0))
-            || !TEST_true(EVP_PKEY_up_ref(server_key))
-            || !TEST_true(OSSL_CMP_CTX_set0_newPkey(ctx, 1, server_key))) {
+    if (!TEST_ptr(fixture->msg = OSSL_CMP_MSG_dup(ir_unprotected))
+        || !TEST_true(SET_OPT_UNPROTECTED_SEND(ctx, 0))
+        || !TEST_true(EVP_PKEY_up_ref(server_key))
+        || !TEST_true(OSSL_CMP_CTX_set0_newPkey(ctx, 1, server_key))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -276,7 +272,7 @@ static int test_MSG_protect_no_key_no_secret(void)
     SETUP_TEST_FIXTURE(CMP_PROTECT_TEST_FIXTURE, set_up);
     fixture->expected = 0;
     if (!TEST_ptr(fixture->msg = OSSL_CMP_MSG_dup(ir_unprotected))
-            || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0))) {
+        || !TEST_true(SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -292,13 +288,13 @@ static int test_MSG_protect_pbmac_no_sender(int with_ref)
     SETUP_TEST_FIXTURE(CMP_PROTECT_TEST_FIXTURE, set_up);
     fixture->expected = with_ref;
     if (!TEST_ptr(fixture->msg = OSSL_CMP_MSG_dup(ir_unprotected))
-            || !SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0)
-            || !ossl_cmp_hdr_set1_sender(fixture->msg->header, NULL)
-            || !OSSL_CMP_CTX_set1_secretValue(fixture->cmp_ctx,
-                                              secret, sizeof(secret))
-            || (!OSSL_CMP_CTX_set1_referenceValue(fixture->cmp_ctx,
-                                                  with_ref ? ref : NULL,
-                                                  sizeof(ref)))) {
+        || !SET_OPT_UNPROTECTED_SEND(fixture->cmp_ctx, 0)
+        || !ossl_cmp_hdr_set1_sender(fixture->msg->header, NULL)
+        || !OSSL_CMP_CTX_set1_secretValue(fixture->cmp_ctx,
+            secret, sizeof(secret))
+        || (!OSSL_CMP_CTX_set1_referenceValue(fixture->cmp_ctx,
+            with_ref ? ref : NULL,
+            sizeof(ref)))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -319,7 +315,7 @@ static int test_MSG_protect_pbmac_no_sender_no_ref(void)
 static int execute_MSG_add_extraCerts_test(CMP_PROTECT_TEST_FIXTURE *fixture)
 {
     return TEST_true(ossl_cmp_msg_add_extraCerts(fixture->cmp_ctx,
-                                                 fixture->msg));
+        fixture->msg));
 }
 
 static int test_MSG_add_extraCerts(void)
@@ -340,9 +336,8 @@ static int execute_cmp_build_cert_chain_test(CMP_PROTECT_TEST_FIXTURE *fixture)
     int ret = 0;
     OSSL_CMP_CTX *ctx = fixture->cmp_ctx;
     X509_STORE *store;
-    STACK_OF(X509) *chain =
-        X509_build_chain(fixture->cert, fixture->certs, NULL,
-                         fixture->with_ss, ctx->libctx, ctx->propq);
+    STACK_OF(X509) *chain = X509_build_chain(fixture->cert, fixture->certs, NULL,
+        fixture->with_ss, ctx->libctx, ctx->propq);
 
     if (TEST_ptr(chain)) {
         /* Check whether chain built is equal to the expected one */
@@ -353,11 +348,11 @@ static int execute_cmp_build_cert_chain_test(CMP_PROTECT_TEST_FIXTURE *fixture)
         return 0;
 
     if (TEST_ptr(store = X509_STORE_new())
-            && TEST_true(X509_STORE_add_cert(store, root))) {
+        && TEST_true(X509_STORE_add_cert(store, root))) {
         X509_VERIFY_PARAM_set_flags(X509_STORE_get0_param(store),
-                                    X509_V_FLAG_NO_CHECK_TIME);
+            X509_V_FLAG_NO_CHECK_TIME);
         chain = X509_build_chain(fixture->cert, fixture->certs, store,
-                                 fixture->with_ss, ctx->libctx, ctx->propq);
+            fixture->with_ss, ctx->libctx, ctx->propq);
         ret = TEST_int_eq(fixture->expected, chain != NULL);
         if (ret && chain != NULL) {
             /* Check whether chain built is equal to the expected one */
@@ -376,12 +371,12 @@ static int test_cmp_build_cert_chain(void)
     fixture->with_ss = 0;
     fixture->cert = endentity2;
     if (!TEST_ptr(fixture->certs = sk_X509_new_null())
-            || !TEST_ptr(fixture->chain = sk_X509_new_null())
-            || !TEST_true(sk_X509_push(fixture->certs, endentity1))
-            || !TEST_true(sk_X509_push(fixture->certs, root))
-            || !TEST_true(sk_X509_push(fixture->certs, intermediate))
-            || !TEST_true(sk_X509_push(fixture->chain, endentity2))
-            || !TEST_true(sk_X509_push(fixture->chain, intermediate))) {
+        || !TEST_ptr(fixture->chain = sk_X509_new_null())
+        || !TEST_true(sk_X509_push(fixture->certs, endentity1))
+        || !TEST_true(sk_X509_push(fixture->certs, root))
+        || !TEST_true(sk_X509_push(fixture->certs, intermediate))
+        || !TEST_true(sk_X509_push(fixture->chain, endentity2))
+        || !TEST_true(sk_X509_push(fixture->chain, intermediate))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -402,10 +397,10 @@ static int test_cmp_build_cert_chain_missing_intermediate(void)
     fixture->with_ss = 0;
     fixture->cert = endentity2;
     if (!TEST_ptr(fixture->certs = sk_X509_new_null())
-            || !TEST_ptr(fixture->chain = sk_X509_new_null())
-            || !TEST_true(sk_X509_push(fixture->certs, endentity1))
-            || !TEST_true(sk_X509_push(fixture->certs, root))
-            || !TEST_true(sk_X509_push(fixture->chain, endentity2))) {
+        || !TEST_ptr(fixture->chain = sk_X509_new_null())
+        || !TEST_true(sk_X509_push(fixture->certs, endentity1))
+        || !TEST_true(sk_X509_push(fixture->certs, root))
+        || !TEST_true(sk_X509_push(fixture->chain, endentity2))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -420,11 +415,11 @@ static int test_cmp_build_cert_chain_no_root(void)
     fixture->with_ss = 0;
     fixture->cert = endentity2;
     if (!TEST_ptr(fixture->certs = sk_X509_new_null())
-            || !TEST_ptr(fixture->chain = sk_X509_new_null())
-            || !TEST_true(sk_X509_push(fixture->certs, endentity1))
-            || !TEST_true(sk_X509_push(fixture->certs, intermediate))
-            || !TEST_true(sk_X509_push(fixture->chain, endentity2))
-            || !TEST_true(sk_X509_push(fixture->chain, intermediate))) {
+        || !TEST_ptr(fixture->chain = sk_X509_new_null())
+        || !TEST_true(sk_X509_push(fixture->certs, endentity1))
+        || !TEST_true(sk_X509_push(fixture->certs, intermediate))
+        || !TEST_true(sk_X509_push(fixture->chain, endentity2))
+        || !TEST_true(sk_X509_push(fixture->chain, intermediate))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -439,9 +434,9 @@ static int test_cmp_build_cert_chain_only_root(void)
     fixture->with_ss = 0; /* still chain must include the only cert (root) */
     fixture->cert = root;
     if (!TEST_ptr(fixture->certs = sk_X509_new_null())
-            || !TEST_ptr(fixture->chain = sk_X509_new_null())
-            || !TEST_true(sk_X509_push(fixture->certs, root))
-            || !TEST_true(sk_X509_push(fixture->chain, root))) {
+        || !TEST_ptr(fixture->chain = sk_X509_new_null())
+        || !TEST_true(sk_X509_push(fixture->certs, root))
+        || !TEST_true(sk_X509_push(fixture->chain, root))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -456,8 +451,8 @@ static int test_cmp_build_cert_chain_no_certs(void)
     fixture->with_ss = 0;
     fixture->cert = endentity2;
     if (!TEST_ptr(fixture->certs = sk_X509_new_null())
-            || !TEST_ptr(fixture->chain = sk_X509_new_null())
-            || !TEST_true(sk_X509_push(fixture->chain, endentity2))) {
+        || !TEST_ptr(fixture->chain = sk_X509_new_null())
+        || !TEST_true(sk_X509_push(fixture->chain, endentity2))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -473,18 +468,17 @@ static int execute_X509_STORE_test(CMP_PROTECT_TEST_FIXTURE *fixture)
     int res = 0;
 
     if (!TEST_true(ossl_cmp_X509_STORE_add1_certs(store,
-                                                  fixture->certs,
-                                                  fixture->callback_arg)))
+            fixture->certs,
+            fixture->callback_arg)))
         goto err;
     sk = X509_STORE_get1_all_certs(store);
     if (!TEST_int_eq(0, STACK_OF_X509_cmp(sk, fixture->chain)))
         goto err;
     res = 1;
- err:
+err:
     X509_STORE_free(store);
     OSSL_STACK_OF_X509_free(sk);
     return res;
-
 }
 
 static int test_X509_STORE(void)
@@ -492,11 +486,11 @@ static int test_X509_STORE(void)
     SETUP_TEST_FIXTURE(CMP_PROTECT_TEST_FIXTURE, set_up);
     fixture->callback_arg = 0; /* self-issued allowed */
     if (!TEST_ptr(fixture->certs = sk_X509_new_null())
-            || !sk_X509_push(fixture->certs, endentity1)
-            || !sk_X509_push(fixture->certs, endentity2)
-            || !sk_X509_push(fixture->certs, root)
-            || !sk_X509_push(fixture->certs, intermediate)
-            || !TEST_ptr(fixture->chain = sk_X509_dup(fixture->certs))) {
+        || !sk_X509_push(fixture->certs, endentity1)
+        || !sk_X509_push(fixture->certs, endentity2)
+        || !sk_X509_push(fixture->certs, root)
+        || !sk_X509_push(fixture->certs, intermediate)
+        || !TEST_ptr(fixture->chain = sk_X509_dup(fixture->certs))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -511,10 +505,10 @@ static int test_X509_STORE_only_self_issued(void)
     fixture->chain = sk_X509_new_null();
     fixture->callback_arg = 1; /* only self-issued */
     if (!TEST_true(sk_X509_push(fixture->certs, endentity1))
-            || !TEST_true(sk_X509_push(fixture->certs, endentity2))
-            || !TEST_true(sk_X509_push(fixture->certs, root))
-            || !TEST_true(sk_X509_push(fixture->certs, intermediate))
-            || !TEST_true(sk_X509_push(fixture->chain, root))) {
+        || !TEST_true(sk_X509_push(fixture->certs, endentity2))
+        || !TEST_true(sk_X509_push(fixture->certs, root))
+        || !TEST_true(sk_X509_push(fixture->certs, intermediate))
+        || !TEST_true(sk_X509_push(fixture->chain, root))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -542,10 +536,10 @@ void cleanup_tests(void)
     OSSL_LIB_CTX_free(libctx);
 }
 
-#define USAGE "prot_RSA.pem IR_protected.der prot_Ed.pem " \
-    "GENM_protected_Ed.der IR_unprotected.der IP_PBM.der " \
-    "server.crt server.pem EndEntity1.crt EndEntity2.crt Root_CA.crt " \
-    "Intermediate_CA.crt module_name [module_conf_file]\n"
+#define USAGE "prot_RSA.pem IR_protected.der prot_Ed.pem "                       \
+              "GENM_protected_Ed.der IR_unprotected.der IP_PBM.der "             \
+              "server.crt server.pem EndEntity1.crt EndEntity2.crt Root_CA.crt " \
+              "Intermediate_CA.crt module_name [module_conf_file]\n"
 OPT_TEST_DECLARE_USAGE(USAGE)
 
 int setup_tests(void)
@@ -566,17 +560,17 @@ int setup_tests(void)
 
     RAND_bytes(rand_data, OSSL_CMP_TRANSACTIONID_LENGTH);
     if (!TEST_ptr(prot_RSA_f = test_get_argument(0))
-            || !TEST_ptr(ir_protected_f = test_get_argument(1))
-            || !TEST_ptr(prot_Ed_f = test_get_argument(2))
-            || !TEST_ptr(genm_prot_Ed_f = test_get_argument(3))
-            || !TEST_ptr(ir_unprotected_f = test_get_argument(4))
-            || !TEST_ptr(ip_PBM_f = test_get_argument(5))
-            || !TEST_ptr(server_cert_f = test_get_argument(6))
-            || !TEST_ptr(server_key_f = test_get_argument(7))
-            || !TEST_ptr(endentity1_f = test_get_argument(8))
-            || !TEST_ptr(endentity2_f = test_get_argument(9))
-            || !TEST_ptr(root_f = test_get_argument(10))
-            || !TEST_ptr(intermediate_f = test_get_argument(11))) {
+        || !TEST_ptr(ir_protected_f = test_get_argument(1))
+        || !TEST_ptr(prot_Ed_f = test_get_argument(2))
+        || !TEST_ptr(genm_prot_Ed_f = test_get_argument(3))
+        || !TEST_ptr(ir_unprotected_f = test_get_argument(4))
+        || !TEST_ptr(ip_PBM_f = test_get_argument(5))
+        || !TEST_ptr(server_cert_f = test_get_argument(6))
+        || !TEST_ptr(server_key_f = test_get_argument(7))
+        || !TEST_ptr(endentity1_f = test_get_argument(8))
+        || !TEST_ptr(endentity2_f = test_get_argument(9))
+        || !TEST_ptr(root_f = test_get_argument(10))
+        || !TEST_ptr(intermediate_f = test_get_argument(11))) {
         TEST_error("usage: cmp_protect_test %s", USAGE);
         return 0;
     }
@@ -585,7 +579,7 @@ int setup_tests(void)
         return 0;
 
     if (!TEST_ptr(server_key = load_pkey_pem(server_key_f, libctx))
-            || !TEST_ptr(server_cert = load_cert_pem(server_cert_f, libctx)))
+        || !TEST_ptr(server_cert = load_cert_pem(server_cert_f, libctx)))
         return 0;
 
     if (!TEST_ptr(prot_RSA_key = load_pkey_pem(prot_RSA_f, libctx)))
@@ -601,9 +595,9 @@ int setup_tests(void)
         || !TEST_ptr(ir_unprotected = load_pkimsg(ir_unprotected_f, libctx)))
         return 0;
     if (!TEST_ptr(endentity1 = load_cert_pem(endentity1_f, libctx))
-            || !TEST_ptr(endentity2 = load_cert_pem(endentity2_f, libctx))
-            || !TEST_ptr(root = load_cert_pem(root_f, libctx))
-            || !TEST_ptr(intermediate = load_cert_pem(intermediate_f, libctx)))
+        || !TEST_ptr(endentity2 = load_cert_pem(endentity2_f, libctx))
+        || !TEST_ptr(root = load_cert_pem(root_f, libctx))
+        || !TEST_ptr(intermediate = load_cert_pem(intermediate_f, libctx)))
         return 0;
     if (!TEST_int_eq(1, RAND_bytes(rand_data, OSSL_CMP_TRANSACTIONID_LENGTH)))
         return 0;
diff --git a/test/cmp_server_test.c b/test/cmp_server_test.c
index 5e778ab656e6b..cba6fd8909e2a 100644
--- a/test/cmp_server_test.c
+++ b/test/cmp_server_test.c
@@ -39,7 +39,7 @@ static CMP_SRV_TEST_FIXTURE *set_up(const char *const test_case_name)
         goto err;
     return fixture;
 
- err:
+err:
     tear_down(fixture);
     return NULL;
 }
@@ -47,13 +47,13 @@ static CMP_SRV_TEST_FIXTURE *set_up(const char *const test_case_name)
 static int dummy_errorCode = CMP_R_MULTIPLE_SAN_SOURCES; /* any reason code */
 
 static OSSL_CMP_PKISI *process_cert_request(OSSL_CMP_SRV_CTX *srv_ctx,
-                                            const OSSL_CMP_MSG *cert_req,
-                                            int certReqId,
-                                            const OSSL_CRMF_MSG *crm,
-                                            const X509_REQ *p10cr,
-                                            X509 **certOut,
-                                            STACK_OF(X509) **chainOut,
-                                            STACK_OF(X509) **caPubs)
+    const OSSL_CMP_MSG *cert_req,
+    int certReqId,
+    const OSSL_CRMF_MSG *crm,
+    const X509_REQ *p10cr,
+    X509 **certOut,
+    STACK_OF(X509) **chainOut,
+    STACK_OF(X509) **caPubs)
 {
     ERR_raise(ERR_LIB_CMP, dummy_errorCode);
     return NULL;
@@ -70,41 +70,41 @@ static int execute_test_handle_request(CMP_SRV_TEST_FIXTURE *fixture)
     int res = 0;
 
     if (!TEST_ptr(client_ctx = OSSL_CMP_CTX_new(libctx, NULL))
-            || !TEST_true(OSSL_CMP_CTX_set_transfer_cb_arg(client_ctx, ctx)))
+        || !TEST_true(OSSL_CMP_CTX_set_transfer_cb_arg(client_ctx, ctx)))
         goto end;
 
     if (!TEST_true(OSSL_CMP_SRV_CTX_init(ctx, dummy_custom_ctx,
-                                         process_cert_request, NULL, NULL,
-                                         NULL, NULL, NULL))
+            process_cert_request, NULL, NULL,
+            NULL, NULL, NULL))
         || !TEST_true(OSSL_CMP_SRV_CTX_init_trans(ctx, NULL, NULL))
         || !TEST_ptr(custom_ctx = OSSL_CMP_SRV_CTX_get0_custom_ctx(ctx))
         || !TEST_int_eq(strcmp(custom_ctx, dummy_custom_ctx), 0))
         goto end;
 
     if (!TEST_true(OSSL_CMP_SRV_CTX_set_send_unprotected_errors(ctx, 0))
-            || !TEST_true(OSSL_CMP_SRV_CTX_set_accept_unprotected(ctx, 0))
-            || !TEST_true(OSSL_CMP_SRV_CTX_set_accept_raverified(ctx, 1))
-            || !TEST_true(OSSL_CMP_SRV_CTX_set_grant_implicit_confirm(ctx, 1)))
+        || !TEST_true(OSSL_CMP_SRV_CTX_set_accept_unprotected(ctx, 0))
+        || !TEST_true(OSSL_CMP_SRV_CTX_set_accept_raverified(ctx, 1))
+        || !TEST_true(OSSL_CMP_SRV_CTX_set_grant_implicit_confirm(ctx, 1)))
         goto end;
 
     if (!TEST_ptr(cmp_ctx = OSSL_CMP_SRV_CTX_get0_cmp_ctx(ctx))
-            || !OSSL_CMP_CTX_set1_referenceValue(cmp_ctx,
-                                                 (unsigned char *)"server", 6)
-            || !OSSL_CMP_CTX_set1_secretValue(cmp_ctx,
-                                              (unsigned char *)"1234", 4))
+        || !OSSL_CMP_CTX_set1_referenceValue(cmp_ctx,
+            (unsigned char *)"server", 6)
+        || !OSSL_CMP_CTX_set1_secretValue(cmp_ctx,
+            (unsigned char *)"1234", 4))
         goto end;
 
     if (!TEST_ptr(rsp = OSSL_CMP_CTX_server_perform(client_ctx, fixture->req))
-            || !TEST_int_eq(OSSL_CMP_MSG_get_bodytype(rsp),
-                            OSSL_CMP_PKIBODY_ERROR)
-            || !TEST_ptr(errorContent = rsp->body->value.error)
-            || !TEST_int_eq(ASN1_INTEGER_get(errorContent->errorCode),
-                            ERR_PACK(ERR_LIB_CMP, 0, dummy_errorCode)))
+        || !TEST_int_eq(OSSL_CMP_MSG_get_bodytype(rsp),
+            OSSL_CMP_PKIBODY_ERROR)
+        || !TEST_ptr(errorContent = rsp->body->value.error)
+        || !TEST_int_eq(ASN1_INTEGER_get(errorContent->errorCode),
+            ERR_PACK(ERR_LIB_CMP, 0, dummy_errorCode)))
         goto end;
 
     res = 1;
 
- end:
+end:
     OSSL_CMP_MSG_free(rsp);
     OSSL_CMP_CTX_free(client_ctx);
     return res;
diff --git a/test/cmp_status_test.c b/test/cmp_status_test.c
index ac1c54ac198aa..3dc897c46506a 100644
--- a/test/cmp_status_test.c
+++ b/test/cmp_status_test.c
@@ -14,7 +14,7 @@
 typedef struct test_fixture {
     const char *test_case_name;
     int pkistatus;
-    const char *str;  /* Not freed by tear_down */
+    const char *str; /* Not freed by tear_down */
     const char *text; /* Not freed by tear_down */
     int pkifailure;
 } CMP_STATUS_TEST_FIXTURE;
@@ -45,33 +45,32 @@ static int execute_PKISI_test(CMP_STATUS_TEST_FIXTURE *fixture)
     int res = 0, i;
 
     if (!TEST_ptr(si = OSSL_CMP_STATUSINFO_new(fixture->pkistatus,
-                                               fixture->pkifailure,
-                                               fixture->text)))
+                      fixture->pkifailure,
+                      fixture->text)))
         goto end;
 
     status = ossl_cmp_pkisi_get_status(si);
     if (!TEST_int_eq(fixture->pkistatus, status)
-            || !TEST_str_eq(fixture->str, ossl_cmp_PKIStatus_to_string(status)))
+        || !TEST_str_eq(fixture->str, ossl_cmp_PKIStatus_to_string(status)))
         goto end;
 
-    if (!TEST_ptr(statusString =
-                  sk_ASN1_UTF8STRING_value(ossl_cmp_pkisi_get0_statusString(si),
-                                           0))
-            || !TEST_mem_eq(fixture->text, strlen(fixture->text),
-                            (char *)statusString->data, statusString->length))
+    if (!TEST_ptr(statusString = sk_ASN1_UTF8STRING_value(ossl_cmp_pkisi_get0_statusString(si),
+                      0))
+        || !TEST_mem_eq(fixture->text, strlen(fixture->text),
+            (char *)statusString->data, statusString->length))
         goto end;
 
     if (!TEST_int_eq(fixture->pkifailure,
-                     ossl_cmp_pkisi_get_pkifailureinfo(si)))
+            ossl_cmp_pkisi_get_pkifailureinfo(si)))
         goto end;
     for (i = 0; i <= OSSL_CMP_PKIFAILUREINFO_MAX; i++)
         if (!TEST_int_eq((fixture->pkifailure >> i) & 1,
-                         ossl_cmp_pkisi_check_pkifailureinfo(si, i)))
+                ossl_cmp_pkisi_check_pkifailureinfo(si, i)))
             goto end;
 
     res = 1;
 
- end:
+end:
     OSSL_CMP_PKISI_free(si);
     return res;
 }
@@ -82,8 +81,7 @@ static int test_PKISI(void)
     fixture->pkistatus = OSSL_CMP_PKISTATUS_revocationNotification;
     fixture->str = "PKIStatus: revocation notification - a revocation of the cert has occurred";
     fixture->text = "this is an additional text describing the failure";
-    fixture->pkifailure = OSSL_CMP_CTX_FAILINFO_unsupportedVersion |
-        OSSL_CMP_CTX_FAILINFO_badDataFormat;
+    fixture->pkifailure = OSSL_CMP_CTX_FAILINFO_unsupportedVersion | OSSL_CMP_CTX_FAILINFO_badDataFormat;
     EXECUTE_TEST(execute_PKISI_test, tear_down);
     return result;
 }
diff --git a/test/cmp_vfy_test.c b/test/cmp_vfy_test.c
index 114b1044975fa..70d776c0f572e 100644
--- a/test/cmp_vfy_test.c
+++ b/test/cmp_vfy_test.c
@@ -60,9 +60,9 @@ static CMP_VFY_TEST_FIXTURE *set_up(const char *const test_case_name)
     ts = X509_STORE_new();
     fixture->test_case_name = test_case_name;
     if (ts == NULL
-            || !TEST_ptr(fixture->cmp_ctx = OSSL_CMP_CTX_new(libctx, NULL))
-            || !OSSL_CMP_CTX_set0_trusted(fixture->cmp_ctx, ts)
-            || !OSSL_CMP_CTX_set_log_cb(fixture->cmp_ctx, print_to_bio_out)) {
+        || !TEST_ptr(fixture->cmp_ctx = OSSL_CMP_CTX_new(libctx, NULL))
+        || !OSSL_CMP_CTX_set0_trusted(fixture->cmp_ctx, ts)
+        || !OSSL_CMP_CTX_set_log_cb(fixture->cmp_ctx, print_to_bio_out)) {
         tear_down(fixture);
         X509_STORE_free(ts);
         return NULL;
@@ -76,7 +76,7 @@ static X509 *srvcert = NULL;
 static X509 *clcert = NULL;
 /* chain */
 static X509 *endentity1 = NULL, *endentity2 = NULL,
-    *intermediate = NULL, *root = NULL;
+            *intermediate = NULL, *root = NULL;
 /* INSTA chain */
 static X509 *insta_cert = NULL, *instaca_cert = NULL;
 
@@ -109,8 +109,8 @@ static int execute_verify_popo_test(CMP_VFY_TEST_FIXTURE *fixture)
             return 0;
     }
     return TEST_int_eq(fixture->expected,
-                       ossl_cmp_verify_popo(fixture->cmp_ctx, fixture->msg,
-                                            fixture->additional_arg));
+        ossl_cmp_verify_popo(fixture->cmp_ctx, fixture->msg,
+            fixture->additional_arg));
 }
 
 static int test_verify_popo(void)
@@ -135,8 +135,8 @@ static int test_verify_popo_bad(void)
 static int execute_validate_msg_test(CMP_VFY_TEST_FIXTURE *fixture)
 {
     int res = TEST_int_eq(fixture->expected,
-                          ossl_cmp_msg_check_update(fixture->cmp_ctx,
-                                                    fixture->msg, NULL, 0));
+        ossl_cmp_msg_check_update(fixture->cmp_ctx,
+            fixture->msg, NULL, 0));
     X509 *validated = OSSL_CMP_CTX_get0_validatedSrvCert(fixture->cmp_ctx);
 
     return res && (!fixture->expected || TEST_ptr_eq(validated, fixture->cert));
@@ -146,8 +146,8 @@ static int execute_validate_cert_path_test(CMP_VFY_TEST_FIXTURE *fixture)
 {
     X509_STORE *ts = OSSL_CMP_CTX_get0_trusted(fixture->cmp_ctx);
     int res = TEST_int_eq(fixture->expected,
-                          OSSL_CMP_validate_cert_path(fixture->cmp_ctx,
-                                                      ts, fixture->cert));
+        OSSL_CMP_validate_cert_path(fixture->cmp_ctx,
+            ts, fixture->cert));
 
     OSSL_CMP_CTX_print_errors(fixture->cmp_ctx);
     return res;
@@ -160,9 +160,9 @@ static int test_validate_msg_mac_alg_protection(int miss, int wrong)
 
     fixture->expected = !miss && !wrong;
     if (!TEST_true(miss ? OSSL_CMP_CTX_set0_trusted(fixture->cmp_ctx, NULL)
-                   : OSSL_CMP_CTX_set1_secretValue(fixture->cmp_ctx, sec_1,
-                                                   wrong ? 4 : sizeof(sec_1)))
-            || !TEST_ptr(fixture->msg = load_pkimsg(ip_waiting_f, libctx))) {
+                        : OSSL_CMP_CTX_set1_secretValue(fixture->cmp_ctx, sec_1,
+                              wrong ? 4 : sizeof(sec_1)))
+        || !TEST_ptr(fixture->msg = load_pkimsg(ip_waiting_f, libctx))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -198,8 +198,8 @@ static int test_validate_msg_mac_alg_protection_bad(void)
     fixture->expected = 0;
 
     if (!TEST_true(OSSL_CMP_CTX_set1_secretValue(fixture->cmp_ctx, sec_bad,
-                                                 sizeof(sec_bad)))
-            || !TEST_ptr(fixture->msg = load_pkimsg(ip_waiting_f, libctx))) {
+            sizeof(sec_bad)))
+        || !TEST_ptr(fixture->msg = load_pkimsg(ip_waiting_f, libctx))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -216,7 +216,7 @@ static int add_trusted(OSSL_CMP_CTX *ctx, X509 *cert)
 static int add_untrusted(OSSL_CMP_CTX *ctx, X509 *cert)
 {
     return X509_add_cert(OSSL_CMP_CTX_get0_untrusted(ctx), cert,
-                         X509_ADD_FLAG_UP_REF);
+        X509_ADD_FLAG_UP_REF);
 }
 
 static int test_validate_msg_signature_partial_chain(int expired)
@@ -229,8 +229,8 @@ static int test_validate_msg_signature_partial_chain(int expired)
     ts = OSSL_CMP_CTX_get0_trusted(fixture->cmp_ctx);
     fixture->expected = !expired;
     if (ts == NULL
-            || !TEST_ptr(fixture->msg = load_pkimsg(ir_protected_f, libctx))
-            || !add_trusted(fixture->cmp_ctx, srvcert)) {
+        || !TEST_ptr(fixture->msg = load_pkimsg(ir_protected_f, libctx))
+        || !add_trusted(fixture->cmp_ctx, srvcert)) {
         tear_down(fixture);
         fixture = NULL;
     } else {
@@ -263,9 +263,9 @@ static int test_validate_msg_signature_srvcert(int bad_sig, int miss, int wrong)
     fixture->expected = !bad_sig && !wrong && !miss;
     if (!TEST_ptr(fixture->msg = load_pkimsg(ir_protected_f, libctx))
         || !TEST_true(miss ? OSSL_CMP_CTX_set1_secretValue(fixture->cmp_ctx,
-                                                           sec_1, sizeof(sec_1))
-                      :  OSSL_CMP_CTX_set1_srvCert(fixture->cmp_ctx,
-                                                   wrong? clcert : srvcert))
+                                 sec_1, sizeof(sec_1))
+                           : OSSL_CMP_CTX_set1_srvCert(fixture->cmp_ctx,
+                                 wrong ? clcert : srvcert))
         || (bad_sig && !flip_bit(fixture->msg->protection))) {
         tear_down(fixture);
         fixture = NULL;
@@ -304,8 +304,8 @@ static int test_validate_msg_signature_sender_cert_untrusted(void)
     fixture->cert = insta_cert;
     fixture->expected = 1;
     if (!TEST_ptr(fixture->msg = load_pkimsg(ir_protected_0_extracerts, libctx))
-            || !add_trusted(fixture->cmp_ctx, instaca_cert)
-            || !add_untrusted(fixture->cmp_ctx, insta_cert)) {
+        || !add_trusted(fixture->cmp_ctx, instaca_cert)
+        || !add_untrusted(fixture->cmp_ctx, insta_cert)) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -319,8 +319,8 @@ static int test_validate_msg_signature_sender_cert_trusted(void)
     fixture->cert = insta_cert;
     fixture->expected = 1;
     if (!TEST_ptr(fixture->msg = load_pkimsg(ir_protected_0_extracerts, libctx))
-            || !add_trusted(fixture->cmp_ctx, instaca_cert)
-            || !add_trusted(fixture->cmp_ctx, insta_cert)) {
+        || !add_trusted(fixture->cmp_ctx, instaca_cert)
+        || !add_trusted(fixture->cmp_ctx, insta_cert)) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -333,7 +333,7 @@ static int test_validate_msg_signature_sender_cert_extracert(void)
     SETUP_TEST_FIXTURE(CMP_VFY_TEST_FIXTURE, set_up);
     fixture->expected = 1;
     if (!TEST_ptr(fixture->msg = load_pkimsg(ir_protected_2_extracerts, libctx))
-            || !add_trusted(fixture->cmp_ctx, instaca_cert)) {
+        || !add_trusted(fixture->cmp_ctx, instaca_cert)) {
         tear_down(fixture);
         fixture = NULL;
     } else {
@@ -348,8 +348,7 @@ static int test_validate_msg_signature_sender_cert_absent(void)
 {
     SETUP_TEST_FIXTURE(CMP_VFY_TEST_FIXTURE, set_up);
     fixture->expected = 0;
-    if (!TEST_ptr(fixture->msg =
-                  load_pkimsg(ir_protected_0_extracerts, libctx))) {
+    if (!TEST_ptr(fixture->msg = load_pkimsg(ir_protected_0_extracerts, libctx))) {
         tear_down(fixture);
         fixture = NULL;
     }
@@ -408,8 +407,8 @@ static void setup_path(CMP_VFY_TEST_FIXTURE **fixture, X509 *wrong, int expired)
         X509_VERIFY_PARAM_set_time(vpm, test_time_after_expiration);
     }
     if (!add_trusted((*fixture)->cmp_ctx, wrong == NULL ? root : wrong)
-            || !add_untrusted((*fixture)->cmp_ctx, endentity1)
-            || !add_untrusted((*fixture)->cmp_ctx, intermediate)) {
+        || !add_untrusted((*fixture)->cmp_ctx, endentity1)
+        || !add_untrusted((*fixture)->cmp_ctx, intermediate)) {
         tear_down((*fixture));
         (*fixture) = NULL;
     }
@@ -445,33 +444,32 @@ static int execute_msg_check_test(CMP_VFY_TEST_FIXTURE *fixture)
     const ASN1_OCTET_STRING *tid = OSSL_CMP_HDR_get0_transactionID(hdr);
 
     if (!TEST_int_eq(fixture->expected,
-                     ossl_cmp_msg_check_update(fixture->cmp_ctx,
-                                               fixture->msg,
-                                               fixture->allow_unprotected_cb,
-                                               fixture->additional_arg)))
+            ossl_cmp_msg_check_update(fixture->cmp_ctx,
+                fixture->msg,
+                fixture->allow_unprotected_cb,
+                fixture->additional_arg)))
         return 0;
 
     if (fixture->expected == 0) /* error expected already during above check */
         return 1;
-    return
-        TEST_int_eq(0,
-                    ASN1_OCTET_STRING_cmp(ossl_cmp_hdr_get0_senderNonce(hdr),
-                                          fixture->cmp_ctx->recipNonce))
+    return TEST_int_eq(0,
+               ASN1_OCTET_STRING_cmp(ossl_cmp_hdr_get0_senderNonce(hdr),
+                   fixture->cmp_ctx->recipNonce))
         && TEST_int_eq(0,
-                       ASN1_OCTET_STRING_cmp(tid,
-                                             fixture->cmp_ctx->transactionID));
+            ASN1_OCTET_STRING_cmp(tid,
+                fixture->cmp_ctx->transactionID));
 }
 
 static int allow_unprotected(const OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg,
-                             int invalid_protection, int allow)
+    int invalid_protection, int allow)
 {
     return allow;
 }
 
 static void setup_check_update(CMP_VFY_TEST_FIXTURE **fixture, int expected,
-                               ossl_cmp_allow_unprotected_cb_t cb, int arg,
-                               const unsigned char *trid_data,
-                               const unsigned char *nonce_data)
+    ossl_cmp_allow_unprotected_cb_t cb, int arg,
+    const unsigned char *trid_data,
+    const unsigned char *nonce_data)
 {
     OSSL_CMP_CTX *ctx = (*fixture)->cmp_ctx;
     int nonce_len = OSSL_CMP_SENDERNONCE_LENGTH;
@@ -483,7 +481,7 @@ static void setup_check_update(CMP_VFY_TEST_FIXTURE **fixture, int expected,
     if ((*fixture)->msg == NULL
         || (nonce_data != NULL
             && !ossl_cmp_asn1_octet_string_set1_bytes(&ctx->senderNonce,
-                                                      nonce_data, nonce_len))) {
+                nonce_data, nonce_len))) {
         tear_down((*fixture));
         (*fixture) = NULL;
     } else if (trid_data != NULL) {
@@ -491,7 +489,7 @@ static void setup_check_update(CMP_VFY_TEST_FIXTURE **fixture, int expected,
 
         if (trid == NULL
             || !ASN1_OCTET_STRING_set(trid, trid_data,
-                                      OSSL_CMP_TRANSACTIONID_LENGTH)
+                OSSL_CMP_TRANSACTIONID_LENGTH)
             || !OSSL_CMP_CTX_set1_transactionID(ctx, trid)) {
             tear_down((*fixture));
             (*fixture) = NULL;
@@ -592,14 +590,14 @@ void cleanup_tests(void)
     return;
 }
 
-#define USAGE "server.crt client.crt " \
-    "EndEntity1.crt EndEntity2.crt " \
-    "Root_CA.crt Intermediate_CA.crt " \
-    "CMP_IR_protected.der CMP_IR_unprotected.der " \
-    "IP_waitingStatus_PBM.der IR_rmprotection.der " \
-    "insta.cert.pem insta_ca.cert.pem " \
-    "IR_protected_0_extraCerts.der " \
-    "IR_protected_2_extraCerts.der module_name [module_conf_file]\n"
+#define USAGE "server.crt client.crt "                        \
+              "EndEntity1.crt EndEntity2.crt "                \
+              "Root_CA.crt Intermediate_CA.crt "              \
+              "CMP_IR_protected.der CMP_IR_unprotected.der "  \
+              "IP_waitingStatus_PBM.der IR_rmprotection.der " \
+              "insta.cert.pem insta_ca.cert.pem "             \
+              "IR_protected_0_extraCerts.der "                \
+              "IR_protected_2_extraCerts.der module_name [module_conf_file]\n"
 OPT_TEST_DECLARE_USAGE(USAGE)
 
 int setup_tests(void)
@@ -607,11 +605,11 @@ int setup_tests(void)
     /* Set test time stamps */
     struct tm ts = { 0 };
 
-    ts.tm_year = 2018 - 1900;      /* 2018 */
-    ts.tm_mon = 1;                 /* February */
-    ts.tm_mday = 18;               /* 18th */
+    ts.tm_year = 2018 - 1900; /* 2018 */
+    ts.tm_mon = 1; /* February */
+    ts.tm_mday = 18; /* 18th */
     test_time_valid = mktime(&ts); /* February 18th 2018 */
-    ts.tm_year += 10;              /* February 18th 2028 */
+    ts.tm_year += 10; /* February 18th 2028 */
     test_time_after_expiration = mktime(&ts);
 
     if (!test_skip_common_options()) {
@@ -621,19 +619,19 @@ int setup_tests(void)
 
     RAND_bytes(rand_data, OSSL_CMP_TRANSACTIONID_LENGTH);
     if (!TEST_ptr(server_f = test_get_argument(0))
-            || !TEST_ptr(client_f = test_get_argument(1))
-            || !TEST_ptr(endentity1_f = test_get_argument(2))
-            || !TEST_ptr(endentity2_f = test_get_argument(3))
-            || !TEST_ptr(root_f = test_get_argument(4))
-            || !TEST_ptr(intermediate_f = test_get_argument(5))
-            || !TEST_ptr(ir_protected_f = test_get_argument(6))
-            || !TEST_ptr(ir_unprotected_f = test_get_argument(7))
-            || !TEST_ptr(ip_waiting_f = test_get_argument(8))
-            || !TEST_ptr(ir_rmprotection_f = test_get_argument(9))
-            || !TEST_ptr(instacert_f = test_get_argument(10))
-            || !TEST_ptr(instaca_f = test_get_argument(11))
-            || !TEST_ptr(ir_protected_0_extracerts = test_get_argument(12))
-            || !TEST_ptr(ir_protected_2_extracerts = test_get_argument(13))) {
+        || !TEST_ptr(client_f = test_get_argument(1))
+        || !TEST_ptr(endentity1_f = test_get_argument(2))
+        || !TEST_ptr(endentity2_f = test_get_argument(3))
+        || !TEST_ptr(root_f = test_get_argument(4))
+        || !TEST_ptr(intermediate_f = test_get_argument(5))
+        || !TEST_ptr(ir_protected_f = test_get_argument(6))
+        || !TEST_ptr(ir_unprotected_f = test_get_argument(7))
+        || !TEST_ptr(ip_waiting_f = test_get_argument(8))
+        || !TEST_ptr(ir_rmprotection_f = test_get_argument(9))
+        || !TEST_ptr(instacert_f = test_get_argument(10))
+        || !TEST_ptr(instaca_f = test_get_argument(11))
+        || !TEST_ptr(ir_protected_0_extracerts = test_get_argument(12))
+        || !TEST_ptr(ir_protected_2_extracerts = test_get_argument(13))) {
         TEST_error("usage: cmp_vfy_test %s", USAGE);
         return 0;
     }
@@ -643,24 +641,24 @@ int setup_tests(void)
 
     /* Load certificates for cert chain */
     if (!TEST_ptr(endentity1 = load_cert_pem(endentity1_f, libctx))
-            || !TEST_ptr(endentity2 = load_cert_pem(endentity2_f, libctx))
-            || !TEST_ptr(root = load_cert_pem(root_f, NULL))
-            || !TEST_ptr(intermediate = load_cert_pem(intermediate_f, libctx)))
+        || !TEST_ptr(endentity2 = load_cert_pem(endentity2_f, libctx))
+        || !TEST_ptr(root = load_cert_pem(root_f, NULL))
+        || !TEST_ptr(intermediate = load_cert_pem(intermediate_f, libctx)))
         goto err;
 
     if (!TEST_ptr(insta_cert = load_cert_pem(instacert_f, libctx))
-            || !TEST_ptr(instaca_cert = load_cert_pem(instaca_f, libctx)))
+        || !TEST_ptr(instaca_cert = load_cert_pem(instaca_f, libctx)))
         goto err;
 
     /* Load certificates for message validation */
     if (!TEST_ptr(srvcert = load_cert_pem(server_f, libctx))
-            || !TEST_ptr(clcert = load_cert_pem(client_f, libctx)))
+        || !TEST_ptr(clcert = load_cert_pem(client_f, libctx)))
         goto err;
     if (!TEST_int_eq(1, RAND_bytes(rand_data, OSSL_CMP_TRANSACTIONID_LENGTH)))
         goto err;
     if (!TEST_ptr(ir_unprotected = load_pkimsg(ir_unprotected_f, libctx))
-            || !TEST_ptr(ir_rmprotection = load_pkimsg(ir_rmprotection_f,
-                                                       libctx)))
+        || !TEST_ptr(ir_rmprotection = load_pkimsg(ir_rmprotection_f,
+                         libctx)))
         goto err;
 
     /* Message validation tests */
@@ -717,8 +715,7 @@ int setup_tests(void)
 
     return 1;
 
- err:
+err:
     cleanup_tests();
     return 0;
-
 }
diff --git a/test/cms-msg/enveloped-content-type-for-aes-gcm.pem b/test/cms-msg/enveloped-content-type-for-aes-gcm.pem
new file mode 100644
index 0000000000000..b0610a7ec8a24
--- /dev/null
+++ b/test/cms-msg/enveloped-content-type-for-aes-gcm.pem
@@ -0,0 +1,7 @@
+-----BEGIN PKCS7-----
+MIAGCSqGSIb3DQEHA6CAMIACAQIxNqI0AgEEMAgEBkMwRkVFMDALBglghkgBZQME
+AQUEGPN0q9rM3neSiY7HIADpnqWym33mRZC4JDCABgkqhkiG9w0BBwEwHgYJYIZI
+AWUDBAEGMBEEDIExQGiHZFSYa0ZBqQIBEKCABGNap+JL1B21Mq7ojKPzVuxtRkg3
+LWt8khnK1EzfmV7e64l5KnTdjq9+gfbwOfbuhTavfBI7VK/ZtpH3HII4fCOe37kV
+mju8/YnYeRq2KcxESmJBySV/veMwxqmHGAw71JyHpg4AAAAAAAAAAAAA
+-----END PKCS7-----
diff --git a/test/cmsapitest.c b/test/cmsapitest.c
index 59dd7faeb2843..0752d14df09c4 100644
--- a/test/cmsapitest.c
+++ b/test/cmsapitest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2026 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -9,10 +9,10 @@
 
 #include <string.h>
 
+#include <openssl/pem.h>
 #include <openssl/cms.h>
 #include <openssl/bio.h>
 #include <openssl/x509.h>
-#include <openssl/pem.h>
 #include "../crypto/cms/cms_local.h" /* for d.signedData and d.envelopedData */
 
 #include "testutil.h"
@@ -20,6 +20,7 @@
 static X509 *cert = NULL;
 static EVP_PKEY *privkey = NULL;
 static char *derin = NULL;
+static char *too_long_iv_cms_in = NULL;
 
 static int test_encrypt_decrypt(const EVP_CIPHER *cipher)
 {
@@ -28,7 +29,7 @@ static int test_encrypt_decrypt(const EVP_CIPHER *cipher)
     const char *msg = "Hello world";
     BIO *msgbio = BIO_new_mem_buf(msg, strlen(msg));
     BIO *outmsgbio = BIO_new(BIO_s_mem());
-    CMS_ContentInfo* content = NULL;
+    CMS_ContentInfo *content = NULL;
     BIO *contentbio = NULL;
     char buf[80];
 
@@ -43,22 +44,22 @@ static int test_encrypt_decrypt(const EVP_CIPHER *cipher)
         goto end;
 
     if (!TEST_true(CMS_decrypt(content, privkey, cert, NULL, outmsgbio,
-                               CMS_TEXT)))
+            CMS_TEXT)))
         goto end;
 
-    if (!TEST_ptr(contentbio =
-                  CMS_EnvelopedData_decrypt(content->d.envelopedData,
-                                            NULL, privkey, cert, NULL,
-                                            CMS_TEXT, NULL, NULL)))
+    if (!(EVP_CIPHER_get_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)
+        && !TEST_ptr(contentbio = CMS_EnvelopedData_decrypt(content->d.envelopedData,
+                         NULL, privkey, cert, NULL,
+                         CMS_TEXT, NULL, NULL)))
         goto end;
 
     /* Check we got the message we first started with */
     if (!TEST_int_eq(BIO_gets(outmsgbio, buf, sizeof(buf)), strlen(msg))
-            || !TEST_int_eq(strcmp(buf, msg), 0))
+        || !TEST_int_eq(strcmp(buf, msg), 0))
         goto end;
 
     testresult = 1;
- end:
+end:
     BIO_free(contentbio);
     sk_X509_free(certstack);
     BIO_free(msgbio);
@@ -306,9 +307,8 @@ static int test_d2i_CMS_bio_NULL(void)
     ret = TEST_ptr(bio = BIO_new_mem_buf(cms_data, sizeof(cms_data)))
         && TEST_ptr(cms = d2i_CMS_bio(bio, NULL))
         && TEST_true(CMS_verify(cms, NULL, NULL, NULL, NULL, flags))
-        && TEST_ptr(content =
-                    CMS_SignedData_verify(cms->d.signedData, NULL, NULL, NULL,
-                                          NULL, NULL, flags, NULL, NULL));
+        && TEST_ptr(content = CMS_SignedData_verify(cms->d.signedData, NULL, NULL, NULL,
+                        NULL, NULL, flags, NULL, NULL));
     BIO_free(content);
     CMS_ContentInfo_free(cms);
     BIO_free(bio);
@@ -357,7 +357,7 @@ static int test_d2i_CMS_decode(const int idx)
     int ret = 0;
 
     if (!TEST_ptr(bio = BIO_new_file(derin, "r")))
-      goto end;
+        goto end;
 
     switch (idx) {
     case 0:
@@ -385,6 +385,133 @@ static int test_d2i_CMS_decode(const int idx)
     return ret;
 }
 
+static int test_CMS_set1_key_mem_leak(void)
+{
+    CMS_ContentInfo *cms;
+    unsigned char key[32] = { 0 };
+    int ret = 0;
+
+    if (!TEST_ptr(cms = CMS_ContentInfo_new()))
+        return 0;
+
+    if (!TEST_true(CMS_EncryptedData_set1_key(cms, EVP_aes_256_cbc(),
+            key, 32)))
+        goto end;
+
+    if (!TEST_true(CMS_EncryptedData_set1_key(cms, EVP_aes_128_cbc(),
+            key, 16)))
+        goto end;
+
+    ret = 1;
+end:
+    CMS_ContentInfo_free(cms);
+    return ret;
+}
+
+static int test_encrypted_data(void)
+{
+    const char *msg = "Hello world";
+    BIO *msgbio = BIO_new_mem_buf(msg, (int)strlen(msg));
+    uint8_t key[16] = { 0 };
+    size_t keylen = 16;
+    CMS_ContentInfo *cms;
+    BIO *decryptbio = BIO_new(BIO_s_mem());
+    char buf[80];
+    int ret = 0;
+
+    cms = CMS_EncryptedData_encrypt(msgbio, EVP_aes_128_cbc(), key, keylen, SMIME_BINARY);
+    if (!TEST_ptr(cms))
+        goto end;
+
+    if (!TEST_true(CMS_EncryptedData_decrypt(cms, key, keylen, NULL, decryptbio, SMIME_BINARY)))
+        goto end;
+
+    /* Check we got the message we first started with */
+    if (!TEST_int_eq(BIO_gets(decryptbio, buf, sizeof(buf)), (int)strlen(msg))
+        || !TEST_int_eq(strcmp(buf, msg), 0))
+        goto end;
+
+    ret = 1;
+end:
+    CMS_ContentInfo_free(cms);
+    BIO_free(msgbio);
+    BIO_free(decryptbio);
+    return ret;
+}
+
+static int test_encrypted_data_aead(void)
+{
+    const char *msg = "Hello world";
+    BIO *msgbio = BIO_new_mem_buf(msg, (int)strlen(msg));
+    uint8_t key[16] = { 0 };
+    size_t keylen = 16;
+    CMS_ContentInfo *cms;
+    BIO *decryptbio = BIO_new(BIO_s_mem());
+    int ret = 0;
+
+    cms = CMS_ContentInfo_new();
+    if (!TEST_ptr(cms))
+        goto end;
+
+    /*
+     * AEAD algorithms are not supported by the CMS EncryptedData so setting
+     * the cipher to AES GCM 128 will result in a failure
+     */
+    if (!TEST_false(CMS_EncryptedData_set1_key(cms, EVP_aes_128_gcm(), key, keylen)))
+        goto end;
+
+    CMS_ContentInfo_free(cms);
+    cms = NULL;
+
+    /*
+     * AEAD algorithms are not supported by the CMS EncryptedData so setting
+     * the cipher to AES GCM 128 will result in a failure
+     */
+    cms = CMS_EncryptedData_encrypt(msgbio, EVP_aes_128_gcm(), key, keylen, SMIME_BINARY);
+    if (!TEST_ptr_null(cms))
+        goto end;
+
+    ret = 1;
+
+end:
+    CMS_ContentInfo_free(cms);
+    BIO_free(msgbio);
+    BIO_free(decryptbio);
+    return ret;
+}
+
+static int test_cms_aesgcm_iv_too_long(void)
+{
+    int ret = 0;
+    BIO *cmsbio = NULL, *out = NULL;
+    CMS_ContentInfo *cms = NULL;
+    unsigned long err = 0;
+
+    if (!TEST_ptr(cmsbio = BIO_new_file(too_long_iv_cms_in, "r")))
+        goto end;
+
+    if (!TEST_ptr(cms = PEM_read_bio_CMS(cmsbio, NULL, NULL, NULL)))
+        goto end;
+
+    /* Must fail cleanly (no crash) */
+    if (!TEST_false(CMS_decrypt(cms, privkey, cert, NULL, out, 0)))
+        goto end;
+    err = ERR_peek_last_error();
+    if (!TEST_ulong_ne(err, 0))
+        goto end;
+    if (!TEST_int_eq(ERR_GET_LIB(err), ERR_LIB_CMS))
+        goto end;
+    if (!TEST_int_eq(ERR_GET_REASON(err), CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR))
+        goto end;
+
+    ret = 1;
+end:
+    CMS_ContentInfo_free(cms);
+    BIO_free(cmsbio);
+    BIO_free(out);
+    return ret;
+}
+
 OPT_TEST_DECLARE_USAGE("certfile privkeyfile derfile\n")
 
 int setup_tests(void)
@@ -398,8 +525,9 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(certin = test_get_argument(0))
-            || !TEST_ptr(privkeyin = test_get_argument(1))
-            || !TEST_ptr(derin = test_get_argument(2)))
+        || !TEST_ptr(privkeyin = test_get_argument(1))
+        || !TEST_ptr(derin = test_get_argument(2))
+        || !TEST_ptr(too_long_iv_cms_in = test_get_argument(3)))
         return 0;
 
     certbio = BIO_new_file(certin, "r");
@@ -431,7 +559,11 @@ int setup_tests(void)
     ADD_TEST(test_encrypt_decrypt_aes_256_gcm);
     ADD_TEST(test_CMS_add1_cert);
     ADD_TEST(test_d2i_CMS_bio_NULL);
+    ADD_TEST(test_CMS_set1_key_mem_leak);
+    ADD_TEST(test_encrypted_data);
+    ADD_TEST(test_encrypted_data_aead);
     ADD_ALL_TESTS(test_d2i_CMS_decode, 2);
+    ADD_TEST(test_cms_aesgcm_iv_too_long);
     return 1;
 }
 
diff --git a/test/conf_include_test.c b/test/conf_include_test.c
index 2b16c6ebe49d4..cd1d4881b9264 100644
--- a/test/conf_include_test.c
+++ b/test/conf_include_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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
@@ -14,26 +14,26 @@
 #include "testutil.h"
 
 #ifdef _WIN32
-# include <direct.h>
-# define DIRSEP "/\\"
-# ifndef __BORLANDC__
-#  define chdir _chdir
-# endif
-# define DIRSEP_PRESERVE 0
+#include <direct.h>
+#define DIRSEP "/\\"
+#ifndef __BORLANDC__
+#define chdir _chdir
+#endif
+#define DIRSEP_PRESERVE 0
 #elif !defined(OPENSSL_NO_POSIX_IO)
-# include <unistd.h>
-# ifndef OPENSSL_SYS_VMS
-#  define DIRSEP "/"
-#  define DIRSEP_PRESERVE 0
-# else
-#  define DIRSEP "/]:"
-#  define DIRSEP_PRESERVE 1
-# endif
+#include <unistd.h>
+#ifndef OPENSSL_SYS_VMS
+#define DIRSEP "/"
+#define DIRSEP_PRESERVE 0
+#else
+#define DIRSEP "/]:"
+#define DIRSEP_PRESERVE 1
+#endif
 #else
 /* the test does not work without chdir() */
-# define chdir(x) (-1);
-# define DIRSEP "/"
-#  define DIRSEP_PRESERVE 0
+#define chdir(x) (-1);
+#define DIRSEP "/"
+#define DIRSEP_PRESERVE 0
 #endif
 
 /* changes path to that of the filename */
@@ -59,8 +59,8 @@ static char *change_path(const char *file)
 
     ret = chdir(s);
     if (ret == 0)
-        new_config_name = strdup(last + DIRSEP_PRESERVE + 1);
- err:
+        new_config_name = OPENSSL_strdup(last + DIRSEP_PRESERVE + 1);
+err:
     OPENSSL_free(s);
     return new_config_name;
 }
@@ -149,17 +149,17 @@ static int test_load_config(void)
 
 static int test_check_null_numbers(void)
 {
-#if defined(_BSD_SOURCE) \
-        || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) \
-        || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+#if defined(_BSD_SOURCE)                                        \
+    || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) \
+    || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
     long val = 0;
 
     /* Verify that a NULL config with a present environment variable returns
      * success and the value.
      */
     if (!TEST_int_eq(setenv("FNORD", "123", 1), 0)
-            || !TEST_true(NCONF_get_number(NULL, "missing", "FNORD", &val))
-            || !TEST_long_eq(val, 123)) {
+        || !TEST_true(NCONF_get_number(NULL, "missing", "FNORD", &val))
+        || !TEST_long_eq(val, 123)) {
         TEST_note("environment variable with NULL conf failed");
         return 0;
     }
@@ -169,7 +169,7 @@ static int test_check_null_numbers(void)
      * a failure code.
      */
     if (!TEST_int_eq(unsetenv("FNORD"), 0)
-            || !TEST_false(NCONF_get_number(NULL, "missing", "FNORD", &val))) {
+        || !TEST_false(NCONF_get_number(NULL, "missing", "FNORD", &val))) {
         TEST_note("missing environment variable with NULL conf failed");
         return 0;
     }
@@ -179,9 +179,9 @@ static int test_check_null_numbers(void)
 
 static int test_check_overflow(void)
 {
-#if defined(_BSD_SOURCE) \
-        || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) \
-        || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+#if defined(_BSD_SOURCE)                                        \
+    || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) \
+    || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
     long val = 0;
     char max[(sizeof(long) * 8) / 3 + 3];
     char *p;
@@ -189,7 +189,7 @@ static int test_check_overflow(void)
     p = max + BIO_snprintf(max, sizeof(max), "0%ld", LONG_MAX) - 1;
     setenv("FNORD", max, 1);
     if (!TEST_true(NCONF_get_number(NULL, "missing", "FNORD", &val))
-            || !TEST_long_eq(val, LONG_MAX))
+        || !TEST_long_eq(val, LONG_MAX))
         return 0;
 
     while (++*p > '9')
@@ -238,7 +238,7 @@ const OPTIONS *test_get_options(void)
         OPT_TEST_OPTIONS_WITH_EXTRA_USAGE("conf_file\n"),
         { "f", OPT_FAIL, '-', "A failure is expected" },
         { "providers", OPT_TEST_PROV, '-',
-          "Test for activated default and legacy providers"},
+            "Test for activated default and legacy providers" },
         { NULL }
     };
     return test_options;
diff --git a/test/constant_time_test.c b/test/constant_time_test.c
index ad54dbef458fe..07177d36208a9 100644
--- a/test/constant_time_test.c
+++ b/test/constant_time_test.c
@@ -58,9 +58,9 @@ static uint64_t test_values_64[] = {
     UINT64_MAX / 2 + 1, UINT64_MAX - 1, UINT64_MAX
 };
 
-static int test_binary_op(unsigned int (*op) (unsigned int a, unsigned int b),
-                          const char *op_name, unsigned int a, unsigned int b,
-                          int is_true)
+static int test_binary_op(unsigned int (*op)(unsigned int a, unsigned int b),
+    const char *op_name, unsigned int a, unsigned int b,
+    int is_true)
 {
     if (is_true && !TEST_uint_eq(op(a, b), CONSTTIME_TRUE))
         return 0;
@@ -69,10 +69,9 @@ static int test_binary_op(unsigned int (*op) (unsigned int a, unsigned int b),
     return 1;
 }
 
-static int test_binary_op_8(unsigned
-                            char (*op) (unsigned int a, unsigned int b),
-                            const char *op_name, unsigned int a,
-                            unsigned int b, int is_true)
+static int test_binary_op_8(unsigned char (*op)(unsigned int a, unsigned int b),
+    const char *op_name, unsigned int a,
+    unsigned int b, int is_true)
 {
     if (is_true && !TEST_uint_eq(op(a, b), CONSTTIME_TRUE_8))
         return 0;
@@ -81,9 +80,9 @@ static int test_binary_op_8(unsigned
     return 1;
 }
 
-static int test_binary_op_s(size_t (*op) (size_t a, size_t b),
-                            const char *op_name, size_t a, size_t b,
-                            int is_true)
+static int test_binary_op_s(size_t (*op)(size_t a, size_t b),
+    const char *op_name, size_t a, size_t b,
+    int is_true)
 {
     if (is_true && !TEST_size_t_eq(op(a, b), CONSTTIME_TRUE_S))
         return 0;
@@ -93,8 +92,8 @@ static int test_binary_op_s(size_t (*op) (size_t a, size_t b),
 }
 
 static int test_binary_op_64(uint64_t (*op)(uint64_t a, uint64_t b),
-                             const char *op_name, uint64_t a, uint64_t b,
-                             int is_true)
+    const char *op_name, uint64_t a, uint64_t b,
+    int is_true)
 {
     uint64_t c = op(a, b);
 
@@ -260,18 +259,18 @@ static int test_binops(int i)
         unsigned int b = test_values[j];
 
         if (!test_select(a, b)
-                || !test_binary_op(&constant_time_lt, "ct_lt",
-                                   a, b, a < b)
-                || !test_binary_op(&constant_time_lt, "constant_time_lt",
-                                   b, a, b < a)
-                || !test_binary_op(&constant_time_ge, "constant_time_ge",
-                                   a, b, a >= b)
-                || !test_binary_op(&constant_time_ge, "constant_time_ge",
-                                   b, a, b >= a)
-                || !test_binary_op(&constant_time_eq, "constant_time_eq",
-                                   a, b, a == b)
-                || !test_binary_op(&constant_time_eq, "constant_time_eq",
-                                   b, a, b == a))
+            || !test_binary_op(&constant_time_lt, "ct_lt",
+                a, b, a < b)
+            || !test_binary_op(&constant_time_lt, "constant_time_lt",
+                b, a, b < a)
+            || !test_binary_op(&constant_time_ge, "constant_time_ge",
+                a, b, a >= b)
+            || !test_binary_op(&constant_time_ge, "constant_time_ge",
+                b, a, b >= a)
+            || !test_binary_op(&constant_time_eq, "constant_time_eq",
+                a, b, a == b)
+            || !test_binary_op(&constant_time_eq, "constant_time_eq",
+                b, a, b == a))
             ret = 0;
     }
     return ret;
@@ -287,17 +286,17 @@ static int test_binops_8(int i)
         unsigned int b = test_values_8[j];
 
         if (!test_binary_op_8(&constant_time_lt_8, "constant_time_lt_8",
-                                     a, b, a < b)
-                || !test_binary_op_8(&constant_time_lt_8, "constant_time_lt_8",
-                                     b, a, b < a)
-                || !test_binary_op_8(&constant_time_ge_8, "constant_time_ge_8",
-                                     a, b, a >= b)
-                || !test_binary_op_8(&constant_time_ge_8, "constant_time_ge_8",
-                                     b, a, b >= a)
-                || !test_binary_op_8(&constant_time_eq_8, "constant_time_eq_8",
-                                     a, b, a == b)
-                || !test_binary_op_8(&constant_time_eq_8, "constant_time_eq_8",
-                                     b, a, b == a))
+                a, b, a < b)
+            || !test_binary_op_8(&constant_time_lt_8, "constant_time_lt_8",
+                b, a, b < a)
+            || !test_binary_op_8(&constant_time_ge_8, "constant_time_ge_8",
+                a, b, a >= b)
+            || !test_binary_op_8(&constant_time_ge_8, "constant_time_ge_8",
+                b, a, b >= a)
+            || !test_binary_op_8(&constant_time_eq_8, "constant_time_eq_8",
+                a, b, a == b)
+            || !test_binary_op_8(&constant_time_eq_8, "constant_time_eq_8",
+                b, a, b == a))
             ret = 0;
     }
     return ret;
@@ -313,19 +312,19 @@ static int test_binops_s(int i)
         size_t b = test_values_s[j];
 
         if (!test_select_s(a, b)
-                || !test_eq_s(a, b)
-                || !test_binary_op_s(&constant_time_lt_s, "constant_time_lt_s",
-                                     a, b, a < b)
-                || !test_binary_op_s(&constant_time_lt_s, "constant_time_lt_s",
-                                     b, a, b < a)
-                || !test_binary_op_s(&constant_time_ge_s, "constant_time_ge_s",
-                                     a, b, a >= b)
-                || !test_binary_op_s(&constant_time_ge_s, "constant_time_ge_s",
-                                     b, a, b >= a)
-                || !test_binary_op_s(&constant_time_eq_s, "constant_time_eq_s",
-                                     a, b, a == b)
-                || !test_binary_op_s(&constant_time_eq_s, "constant_time_eq_s",
-                                     b, a, b == a))
+            || !test_eq_s(a, b)
+            || !test_binary_op_s(&constant_time_lt_s, "constant_time_lt_s",
+                a, b, a < b)
+            || !test_binary_op_s(&constant_time_lt_s, "constant_time_lt_s",
+                b, a, b < a)
+            || !test_binary_op_s(&constant_time_ge_s, "constant_time_ge_s",
+                a, b, a >= b)
+            || !test_binary_op_s(&constant_time_ge_s, "constant_time_ge_s",
+                b, a, b >= a)
+            || !test_binary_op_s(&constant_time_eq_s, "constant_time_eq_s",
+                a, b, a == b)
+            || !test_binary_op_s(&constant_time_eq_s, "constant_time_eq_s",
+                b, a, b == a))
             ret = 0;
     }
     return ret;
@@ -341,8 +340,8 @@ static int test_signed(int i)
         int d = signed_test_values[j];
 
         if (!test_select_int(c, d)
-                || !test_eq_int(c, d)
-                || !test_eq_int_8(c, d))
+            || !test_eq_int(c, d)
+            || !test_eq_int_8(c, d))
             ret = 0;
     }
     return ret;
@@ -387,8 +386,8 @@ static int test_64values(int i)
         uint64_t h = test_values_64[j];
 
         if (!test_binary_op_64(&constant_time_lt_64, "constant_time_lt_64",
-                               g, h, g < h)
-                || !test_select_64(g, h)) {
+                g, h, g < h)
+            || !test_select_64(g, h)) {
             TEST_info("test_64values failed i=%d j=%d", i, j);
             ret = 0;
         }
diff --git a/test/context_internal_test.c b/test/context_internal_test.c
index 238d48db8d13b..d46c5f2803e58 100644
--- a/test/context_internal_test.c
+++ b/test/context_internal_test.c
@@ -20,13 +20,13 @@ static int test_set0_default(void)
     int testresult = 0;
 
     if (!TEST_ptr(global)
-            || !TEST_ptr(local)
-            || !TEST_ptr_eq(global, OSSL_LIB_CTX_set0_default(NULL)))
+        || !TEST_ptr(local)
+        || !TEST_ptr_eq(global, OSSL_LIB_CTX_set0_default(NULL)))
         goto err;
 
     /* Check we can change the local default context */
     if (!TEST_ptr(prev = OSSL_LIB_CTX_set0_default(local))
-            || !TEST_ptr_eq(global, prev))
+        || !TEST_ptr_eq(global, prev))
         goto err;
 
     /* Calling OSSL_LIB_CTX_set0_default() with a NULL should be a no-op */
@@ -39,11 +39,11 @@ static int test_set0_default(void)
 
     /* Check we can swap back to the global default */
     if (!TEST_ptr(prev = OSSL_LIB_CTX_set0_default(global))
-            || !TEST_ptr_eq(local, prev))
+        || !TEST_ptr_eq(local, prev))
         goto err;
 
     testresult = 1;
- err:
+err:
     OSSL_LIB_CTX_free(local);
     return testresult;
 }
@@ -70,7 +70,7 @@ static int test_set_get_conf_diagnostics(void)
         goto err;
 
     res = 1;
- err:
+err:
     OSSL_LIB_CTX_free(ctx);
     return res;
 }
diff --git a/test/crltest.c b/test/crltest.c
index c184481220248..b89bef9c67357 100644
--- a/test/crltest.c
+++ b/test/crltest.c
@@ -9,6 +9,7 @@
 
 #include "internal/nelem.h"
 #include <string.h>
+#include <time.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/err.h>
@@ -17,7 +18,16 @@
 
 #include "testutil.h"
 
+/*
+ * We cannot use old certificates for new tests because the private key
+ * associated with them is no longer available. Therefore, we add kCRLTestLeaf,
+ * kCRLTestLeaf2 and PARAM_TIME2, as well as pass the verification time to the
+ * verify function as a parameter. Certificates and CRL from
+ * https://github.com/openssl/openssl/issues/27506 are used.
+ */
+
 #define PARAM_TIME 1474934400 /* Sep 27th, 2016 */
+#define PARAM_TIME2 1753284700 /* July 23th, 2025 */
 
 static const char *kCRLTestRoot[] = {
     "-----BEGIN CERTIFICATE-----\n",
@@ -70,6 +80,61 @@ static const char *kCRLTestLeaf[] = {
     NULL
 };
 
+static const char *kCRLTestRoot2[] = {
+    "-----BEGIN CERTIFICATE-----\n",
+    "MIID4zCCAsugAwIBAgIUGTcyNat9hTOo8nnGdzF7MTzL9WAwDQYJKoZIhvcNAQEL\n",
+    "BQAweTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM\n",
+    "DVNhbiBGcmFuY2lzY28xEzARBgNVBAoMCk15IENvbXBhbnkxEzARBgNVBAMMCk15\n",
+    "IFJvb3QgQ0ExEzARBgNVBAsMCk15IFJvb3QgQ0EwHhcNMjUwMzAzMDcxNDA0WhcN\n",
+    "MzUwMzAxMDcxNDA0WjB5MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5p\n",
+    "YTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzETMBEGA1UECgwKTXkgQ29tcGFueTET\n",
+    "MBEGA1UEAwwKTXkgUm9vdCBDQTETMBEGA1UECwwKTXkgUm9vdCBDQTCCASIwDQYJ\n",
+    "KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6jjwkmV+pse430MQfyaWv+JtAd2r6K\n",
+    "qzEquBcoofzuf/yvdEhQPjK3bcotgfEcFq3QMo1MJ7vqRHEIu0hJ+5ZnEQtIRcrg\n",
+    "Vm7/EoVCBpDc9BDtW40TDp69z9kaKyyKYy6rxmSKgJydGBeGGMwBxgTK/o0xAriC\n",
+    "C3lLXHT8G8YMamKUpToPL5iCRX+GJPnnizB2ODvpQGMWkbp9+1xEc4dD7Db2wfUb\n",
+    "gatDYUoGndQKWD49UhURavQZeLpDxlz93YutRRkZTWc4IB7WebiEb39BDjSP3QYm\n",
+    "2h+rZYyjp3Gxy8pBNTPzE9Dk4yjiqS7o3WGvi/S6zKTLDvWl9t6pMOMCAwEAAaNj\n",
+    "MGEwHQYDVR0OBBYEFNdhiR+Tlot2VBbp5XfcfLdlG4AkMA4GA1UdDwEB/wQEAwIB\n",
+    "hjAfBgNVHSMEGDAWgBTXYYkfk5aLdlQW6eV33Hy3ZRuAJDAPBgNVHRMBAf8EBTAD\n",
+    "AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCvwutY0WMcKoqulifnYfhxGLtXSSvD2GET\n",
+    "uNRv+S1KI5JKcAdfvnbNDpUwlujMDIpe3ewmv9i6kcitpHwZXdVAw6KWagJ0kDSt\n",
+    "jbArJxuuuFmSFDS7kj8x7FZok5quAWDSSg+ubV2tCVxmDuTs1WXJXD3l9g+3J9GU\n",
+    "kyeFMKqwRp8w22vm9ilgXrzeesAmmAg/pEb56ljTPeaONQxVe7KJhv2q8J17sML8\n",
+    "BE7TdVx7UFQbO/t9XqdT5O9eF8JUx4Vn4QSr+jdjJ/ns4T3/IC9dJq9k7tjD48iA\n",
+    "TNc+7x+uj8P39VA96HpjujVakj8/qn5SQMPJgDds+MSXrX+6JBWm\n",
+    "-----END CERTIFICATE-----\n",
+    NULL
+};
+
+static const char *kCRLTestLeaf2[] = {
+    "-----BEGIN CERTIFICATE-----\n",
+    "MIIECjCCAvKgAwIBAgIUPxuMqMtuN1j3XZVRVrNmaTCIP04wDQYJKoZIhvcNAQEL\n",
+    "BQAweTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM\n",
+    "DVNhbiBGcmFuY2lzY28xEzARBgNVBAoMCk15IENvbXBhbnkxEzARBgNVBAMMCk15\n",
+    "IFJvb3QgQ0ExEzARBgNVBAsMCk15IFJvb3QgQ0EwHhcNMjUwNDE3MTAxNjQ5WhcN\n",
+    "MjYwNDE3MTAxNjQ5WjBoMQswCQYDVQQGEwJDTjEQMA4GA1UECAwHQmVpamluZzEQ\n",
+    "MA4GA1UEBwwHQmVpamluZzEYMBYGA1UECgwPTXkgT3JnYW5pemF0aW9uMRswGQYD\n",
+    "VQQDDBJNeSBJbnRlcm1lZGlhdGUgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw\n",
+    "ggEKAoIBAQDIxRxZQokflDaLYoD21HT2U4EshqtKpSf9zPS5unBMCfnQkU4IJjBF\n",
+    "3qQmfgz5ZOpZv3x0w48fDjiysk0eOVCFAo+uixEjMeuln6Wj3taetch2Sk0YNm5J\n",
+    "SJCNF2olHZXn5R8ngEmho2j1wbwNnpcccZyRNzUSjR9oAgObkP3O7fyQKJRxwNU0\n",
+    "sN7mfoyEOczKtUaYbqi2gPx6OOqNLjXlLmfZ8PJagKCN/oYkGU5PoRNXp65Znhu6\n",
+    "s8FuSmvTodu8Qhs9Uizo+SycaBXn5Fbqt32S+9vPfhH9FfELDfQIaBp+iQAxcKPX\n",
+    "tUglXEjiEVrbNf722PuWIWN9EIBolULVAgMBAAGjgZowgZcwEgYDVR0TAQH/BAgw\n",
+    "BgEB/wIBATAxBgNVHR8EKjAoMCagJKAihiBodHRwOi8vbG9jYWxob3N0OjgwMDAv\n",
+    "Y2FfY3JsLmRlcjAdBgNVHQ4EFgQUh40vFgoopz5GUggPEEk2+bKgbwQwHwYDVR0j\n",
+    "BBgwFoAU12GJH5OWi3ZUFunld9x8t2UbgCQwDgYDVR0PAQH/BAQDAgGGMA0GCSqG\n",
+    "SIb3DQEBCwUAA4IBAQDANfJuTgo0vRaMPYqOeW8R4jLHdVazdGLeQQ/85vXr/Gl1\n",
+    "aL40tLp4yZbThxuxTzPzfY1OGkG69YQ/8Vo0gCEi5KjBMYPKmZISKy1MwROQ1Jfp\n",
+    "HkmyZk1TfuzG/4fN/bun2gjpDYcihf4xA4NhSVzQyvqm1N6VkTgK+bEWTOGzqw66\n",
+    "6IYPN6oVDmLbwU1EvV3rggB7HUJCJP4qW9DbAQRAijUurPUGoU2vEbrSyYkfQXCf\n",
+    "p4ouOTMl6O7bJ110SKzxbCfWqom+iAwHlU2tOPVmOp1CLDCClMRNHIFMDGAoBomH\n",
+    "s01wD+IcIi9OkQEbqVb/XDKes8fqzQgTtSM9C9Ot\n",
+    "-----END CERTIFICATE-----\n",
+    NULL
+};
+
 static const char *kBasicCRL[] = {
     "-----BEGIN X509 CRL-----\n",
     "MIIBpzCBkAIBATANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJVUzETMBEGA1UE\n",
@@ -124,6 +189,24 @@ static const char *kBadIssuerCRL[] = {
     NULL
 };
 
+static const char *kEmptyIdpCRL[] = {
+    "-----BEGIN X509 CRL-----\n",
+    "MIICOTCCASECAQEwDQYJKoZIhvcNAQELBQAweTELMAkGA1UEBhMCVVMxEzARBgNV\n",
+    "BAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xEzARBgNVBAoM\n",
+    "Ck15IENvbXBhbnkxEzARBgNVBAMMCk15IFJvb3QgQ0ExEzARBgNVBAsMCk15IFJv\n",
+    "b3QgQ0EXDTI1MDEwMTAwMDAwMFoXDTI1MTIwMTAwMDAwMFowJzAlAhQcgAIu+B8k\n",
+    "Be6WphLcth/grHAeXhcNMjUwNDE3MTAxNjUxWqBLMEkwGAYDVR0UBBECDxnP/97a\n",
+    "dO3y9qRGDM7hQDAfBgNVHSMEGDAWgBTXYYkfk5aLdlQW6eV33Hy3ZRuAJDAMBgNV\n",
+    "HRwBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAf+mtlDi9IftsYwTcxYYKxE203\n",
+    "+prttFB00om29jjtkGYRxcs3vZQRTvera21YFn3mrS/lxvhBq6GMx0I61AQ48Pr4\n",
+    "63bDvZgf+/P6T2+MLgLds23o3TOfy2SBSdnFEcN0bFUgF5U0bFpQqlQWx+FYhrAf\n",
+    "ZX3RAhURiKKfGKGeVOVKS0u+x666FoDQ7pbhbHM3+jnuzdtv8RQMkj1AZMw0FMl8\n",
+    "m2dFQhZqT9WdJqZAc8ldc6V3a0rUeOV8BUPACf1k4B0CKhn4draIqltZkWgl3cmU\n",
+    "SX2V/a51lS12orfNYSEx+vtJ9gpx4LDxyOnai18vueVyljrXuQSrcYuxS2Cd\n",
+    "-----END X509 CRL-----\n",
+    NULL
+};
+
 /*
  * This is kBasicCRL but with a critical issuing distribution point
  * extension.
@@ -189,6 +272,8 @@ static const char **unknown_critical_crls[] = {
 
 static X509 *test_root = NULL;
 static X509 *test_leaf = NULL;
+static X509 *test_root2 = NULL;
+static X509 *test_leaf2 = NULL;
 
 /*
  * Glue an array of strings together.  Return a BIO and put the string
@@ -251,7 +336,7 @@ static X509 *X509_from_strings(const char **pem)
  * Returns a value from X509_V_ERR_xxx or X509_V_OK.
  */
 static int verify(X509 *leaf, X509 *root, STACK_OF(X509_CRL) *crls,
-                  unsigned long flags)
+    unsigned long flags, time_t verification_time)
 {
     X509_STORE_CTX *ctx = X509_STORE_CTX_new();
     X509_STORE *store = X509_STORE_new();
@@ -276,8 +361,8 @@ static int verify(X509 *leaf, X509 *root, STACK_OF(X509_CRL) *crls,
         goto err;
     X509_STORE_CTX_set0_trusted_stack(ctx, roots);
     X509_STORE_CTX_set0_crls(ctx, crls);
-    X509_VERIFY_PARAM_set_time(param, PARAM_TIME);
-    if (!TEST_long_eq((long)X509_VERIFY_PARAM_get_time(param), PARAM_TIME))
+    X509_VERIFY_PARAM_set_time(param, verification_time);
+    if (!TEST_long_eq((long)X509_VERIFY_PARAM_get_time(param), (long)verification_time))
         goto err;
     X509_VERIFY_PARAM_set_depth(param, 16);
     if (flags)
@@ -340,11 +425,13 @@ static int test_basic_crl(void)
     r = TEST_ptr(basic_crl)
         && TEST_ptr(revoked_crl)
         && TEST_int_eq(verify(test_leaf, test_root,
-                              make_CRL_stack(basic_crl, NULL),
-                              X509_V_FLAG_CRL_CHECK), X509_V_OK)
+                           make_CRL_stack(basic_crl, NULL),
+                           X509_V_FLAG_CRL_CHECK, PARAM_TIME),
+            X509_V_OK)
         && TEST_int_eq(verify(test_leaf, test_root,
-                              make_CRL_stack(basic_crl, revoked_crl),
-                              X509_V_FLAG_CRL_CHECK), X509_V_ERR_CERT_REVOKED);
+                           make_CRL_stack(basic_crl, revoked_crl),
+                           X509_V_FLAG_CRL_CHECK, PARAM_TIME),
+            X509_V_ERR_CERT_REVOKED);
     X509_CRL_free(basic_crl);
     X509_CRL_free(revoked_crl);
     return r;
@@ -353,8 +440,8 @@ static int test_basic_crl(void)
 static int test_no_crl(void)
 {
     return TEST_int_eq(verify(test_leaf, test_root, NULL,
-                              X509_V_FLAG_CRL_CHECK),
-                       X509_V_ERR_UNABLE_TO_GET_CRL);
+                           X509_V_FLAG_CRL_CHECK, PARAM_TIME),
+        X509_V_ERR_UNABLE_TO_GET_CRL);
 }
 
 static int test_bad_issuer_crl(void)
@@ -364,13 +451,27 @@ static int test_bad_issuer_crl(void)
 
     r = TEST_ptr(bad_issuer_crl)
         && TEST_int_eq(verify(test_leaf, test_root,
-                              make_CRL_stack(bad_issuer_crl, NULL),
-                              X509_V_FLAG_CRL_CHECK),
-                       X509_V_ERR_UNABLE_TO_GET_CRL);
+                           make_CRL_stack(bad_issuer_crl, NULL),
+                           X509_V_FLAG_CRL_CHECK, PARAM_TIME),
+            X509_V_ERR_UNABLE_TO_GET_CRL);
     X509_CRL_free(bad_issuer_crl);
     return r;
 }
 
+static int test_crl_empty_idp(void)
+{
+    X509_CRL *empty_idp_crl = CRL_from_strings(kEmptyIdpCRL);
+    int r;
+
+    r = TEST_ptr(empty_idp_crl)
+        && TEST_int_eq(verify(test_leaf2, test_root2,
+                           make_CRL_stack(empty_idp_crl, NULL),
+                           X509_V_FLAG_CRL_CHECK, PARAM_TIME2),
+            X509_V_ERR_UNABLE_TO_GET_CRL);
+    X509_CRL_free(empty_idp_crl);
+    return r;
+}
+
 static int test_known_critical_crl(void)
 {
     X509_CRL *known_critical_crl = CRL_from_strings(kKnownCriticalCRL);
@@ -378,8 +479,9 @@ static int test_known_critical_crl(void)
 
     r = TEST_ptr(known_critical_crl)
         && TEST_int_eq(verify(test_leaf, test_root,
-                              make_CRL_stack(known_critical_crl, NULL),
-                              X509_V_FLAG_CRL_CHECK), X509_V_OK);
+                           make_CRL_stack(known_critical_crl, NULL),
+                           X509_V_FLAG_CRL_CHECK, PARAM_TIME),
+            X509_V_OK);
     X509_CRL_free(known_critical_crl);
     return r;
 }
@@ -391,9 +493,9 @@ static int test_unknown_critical_crl(int n)
 
     r = TEST_ptr(unknown_critical_crl)
         && TEST_int_eq(verify(test_leaf, test_root,
-                              make_CRL_stack(unknown_critical_crl, NULL),
-                              X509_V_FLAG_CRL_CHECK),
-                       X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION);
+                           make_CRL_stack(unknown_critical_crl, NULL),
+                           X509_V_FLAG_CRL_CHECK, PARAM_TIME),
+            X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION);
     X509_CRL_free(unknown_critical_crl);
     return r;
 }
@@ -412,7 +514,7 @@ static int test_reuse_crl(int idx)
     if (idx & 1) {
         if (!TEST_true(X509_CRL_up_ref(reused_crl)))
             goto err;
-	addref_crl = reused_crl;
+        addref_crl = reused_crl;
     }
 
     idx >>= 1;
@@ -426,25 +528,25 @@ static int test_reuse_crl(int idx)
     switch (idx) {
     case 0: /* valid PEM + invalid DER */
         if (!TEST_ptr_null(result)
-                || !TEST_ptr_null(reused_crl))
+            || !TEST_ptr_null(reused_crl))
             goto err;
         break;
     case 1: /* invalid PEM */
         if (!TEST_ptr_null(result)
-                || !TEST_ptr(reused_crl))
+            || !TEST_ptr(reused_crl))
             goto err;
         break;
     case 2:
         if (!TEST_ptr(result)
-                || !TEST_ptr(reused_crl)
-                || !TEST_ptr_eq(result, reused_crl))
+            || !TEST_ptr(reused_crl)
+            || !TEST_ptr_eq(result, reused_crl))
             goto err;
         break;
     }
 
     r = 1;
 
- err:
+err:
     OPENSSL_free(p);
     BIO_free(b);
     X509_CRL_free(reused_crl);
@@ -452,16 +554,81 @@ static int test_reuse_crl(int idx)
     return r;
 }
 
+/*
+ * Test to make sure X509_verify_cert sets the issuer, reasons, and
+ * CRL score of the CRLs it gets from X509_STORE_CTX->get_crl
+ */
+
+static int get_crl_fn(X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x)
+{
+    *crl = CRL_from_strings(kBasicCRL);
+    return 1;
+}
+
+static int test_get_crl_fn_score(void)
+{
+    X509_STORE_CTX *ctx = X509_STORE_CTX_new();
+    X509_STORE *store = X509_STORE_new();
+    X509_VERIFY_PARAM *param = X509_VERIFY_PARAM_new();
+    STACK_OF(X509) *roots = sk_X509_new_null();
+
+    int status = X509_V_ERR_UNSPECIFIED;
+
+    if (!TEST_ptr(ctx)
+        || !TEST_ptr(store)
+        || !TEST_ptr(param)
+        || !TEST_ptr(roots))
+        goto err;
+
+    /* Create a stack; upref the cert because we free it below. */
+    if (!TEST_true(X509_up_ref(test_root)))
+        goto err;
+    if (!TEST_true(sk_X509_push(roots, test_root))) {
+        X509_free(test_root);
+        goto err;
+    }
+    if (!TEST_true(X509_STORE_CTX_init(ctx, store, test_leaf, NULL)))
+        goto err;
+
+    X509_STORE_CTX_set0_trusted_stack(ctx, roots);
+    X509_STORE_CTX_set_get_crl(ctx, &get_crl_fn);
+    X509_VERIFY_PARAM_set_time(param, PARAM_TIME);
+    if (!TEST_long_eq((long)X509_VERIFY_PARAM_get_time(param),
+            (long)PARAM_TIME))
+        goto err;
+    X509_VERIFY_PARAM_set_depth(param, 16);
+    X509_VERIFY_PARAM_set_flags(param, X509_V_FLAG_CRL_CHECK);
+    X509_STORE_CTX_set0_param(ctx, param);
+    param = NULL;
+
+    ERR_clear_error();
+    status = X509_verify_cert(ctx) == 1 ? X509_V_OK
+                                        : X509_STORE_CTX_get_error(ctx);
+
+    TEST_int_eq(status, X509_V_OK);
+
+err:
+    OSSL_STACK_OF_X509_free(roots);
+    X509_VERIFY_PARAM_free(param);
+    X509_STORE_CTX_free(ctx);
+    X509_STORE_free(store);
+    return status == X509_V_OK;
+}
+
 int setup_tests(void)
 {
     if (!TEST_ptr(test_root = X509_from_strings(kCRLTestRoot))
-        || !TEST_ptr(test_leaf = X509_from_strings(kCRLTestLeaf)))
+        || !TEST_ptr(test_leaf = X509_from_strings(kCRLTestLeaf))
+        || !TEST_ptr(test_root2 = X509_from_strings(kCRLTestRoot2))
+        || !TEST_ptr(test_leaf2 = X509_from_strings(kCRLTestLeaf2)))
         return 0;
 
     ADD_TEST(test_no_crl);
     ADD_TEST(test_basic_crl);
     ADD_TEST(test_bad_issuer_crl);
+    ADD_TEST(test_crl_empty_idp);
     ADD_TEST(test_known_critical_crl);
+    ADD_TEST(test_get_crl_fn_score);
     ADD_ALL_TESTS(test_unknown_critical_crl, OSSL_NELEM(unknown_critical_crls));
     ADD_ALL_TESTS(test_reuse_crl, 6);
     return 1;
@@ -471,4 +638,6 @@ void cleanup_tests(void)
 {
     X509_free(test_root);
     X509_free(test_leaf);
+    X509_free(test_root2);
+    X509_free(test_leaf2);
 }
diff --git a/test/ct_test.c b/test/ct_test.c
index f98dd6060285e..183e7d8de6d2d 100644
--- a/test/ct_test.c
+++ b/test/ct_test.c
@@ -23,7 +23,7 @@
 #ifndef OPENSSL_NO_CT
 
 /* Used when declaring buffers to read text files into */
-# define CT_TEST_MAX_FILE_SIZE 8096
+#define CT_TEST_MAX_FILE_SIZE 8096
 
 static char *certs_dir = NULL;
 static char *ct_dir = NULL;
@@ -33,7 +33,7 @@ typedef struct ct_test_fixture {
     /* The current time in milliseconds */
     uint64_t epoch_time_in_ms;
     /* The CT log store to use during tests */
-    CTLOG_STORE* ctlog_store;
+    CTLOG_STORE *ctlog_store;
     /* Set the following to test handling of SCTs in X509 certificates */
     const char *certs_dir;
     char *certificate_file;
@@ -66,8 +66,8 @@ static CT_TEST_FIXTURE *set_up(const char *const test_case_name)
     fixture->test_case_name = test_case_name;
     fixture->epoch_time_in_ms = 1580335307000ULL; /* Wed 29 Jan 2020 10:01:47 PM UTC */
     if (!TEST_ptr(fixture->ctlog_store = CTLOG_STORE_new())
-            || !TEST_int_eq(
-                    CTLOG_STORE_load_default_file(fixture->ctlog_store), 1))
+        || !TEST_int_eq(
+            CTLOG_STORE_load_default_file(fixture->ctlog_store), 1))
         goto end;
     return fixture;
 
@@ -106,7 +106,7 @@ static X509 *load_pem_cert(const char *dir, const char *file)
 }
 
 static int read_text_file(const char *dir, const char *file,
-                          char *buffer, int buffer_length)
+    char *buffer, int buffer_length)
 {
     int len = -1;
     char *file_path = test_mk_file_path(dir, file);
@@ -124,7 +124,7 @@ static int read_text_file(const char *dir, const char *file,
 }
 
 static int compare_sct_list_printout(STACK_OF(SCT) *sct,
-                                     const char *expected_output)
+    const char *expected_output)
 {
     BIO *text_buffer = NULL;
     char *actual_output = NULL;
@@ -150,15 +150,15 @@ static int compare_sct_list_printout(STACK_OF(SCT) *sct,
 }
 
 static int compare_extension_printout(X509_EXTENSION *extension,
-                                      const char *expected_output)
+    const char *expected_output)
 {
     BIO *text_buffer = NULL;
     char *actual_output = NULL;
     int result = 0;
 
     if (!TEST_ptr(text_buffer = BIO_new(BIO_s_mem()))
-            || !TEST_true(X509V3_EXT_print(text_buffer, extension,
-                                           X509V3_EXT_DEFAULT, 0)))
+        || !TEST_true(X509V3_EXT_print(text_buffer, extension,
+            X509V3_EXT_DEFAULT, 0)))
         goto end;
 
     /* Append \n because it's easier to create files that end with one. */
@@ -181,7 +181,7 @@ static int compare_extension_printout(X509_EXTENSION *extension,
 }
 
 static int assert_validity(CT_TEST_FIXTURE *fixture, STACK_OF(SCT) *scts,
-                           CT_POLICY_EVAL_CTX *policy_ctx)
+    CT_POLICY_EVAL_CTX *policy_ctx)
 {
     int invalid_sct_count = 0;
     int valid_sct_count = 0;
@@ -210,11 +210,10 @@ static int assert_validity(CT_TEST_FIXTURE *fixture, STACK_OF(SCT) *scts,
     }
 
     if (!TEST_int_eq(valid_sct_count, fixture->expected_valid_sct_count)) {
-        int unverified_sct_count = sk_SCT_num(scts) -
-                                        invalid_sct_count - valid_sct_count;
+        int unverified_sct_count = sk_SCT_num(scts) - invalid_sct_count - valid_sct_count;
 
         TEST_info("%d SCTs failed, %d SCTs unverified",
-                  invalid_sct_count, unverified_sct_count);
+            invalid_sct_count, unverified_sct_count);
         return 0;
     }
 
@@ -235,8 +234,8 @@ static int execute_cert_test(CT_TEST_FIXTURE *fixture)
 
     if (fixture->sct_text_file != NULL) {
         sct_text_len = read_text_file(fixture->sct_dir, fixture->sct_text_file,
-                                      expected_sct_text,
-                                      CT_TEST_MAX_FILE_SIZE - 1);
+            expected_sct_text,
+            CT_TEST_MAX_FILE_SIZE - 1);
 
         if (!TEST_int_ge(sct_text_len, 0))
             goto end;
@@ -244,7 +243,7 @@ static int execute_cert_test(CT_TEST_FIXTURE *fixture)
     }
 
     CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(
-            ct_policy_ctx, fixture->ctlog_store);
+        ct_policy_ctx, fixture->ctlog_store);
 
     CT_POLICY_EVAL_CTX_set_time(ct_policy_ctx, fixture->epoch_time_in_ms);
 
@@ -254,20 +253,19 @@ static int execute_cert_test(CT_TEST_FIXTURE *fixture)
         X509_EXTENSION *sct_extension = NULL;
 
         if (!TEST_ptr(cert = load_pem_cert(fixture->certs_dir,
-                                           fixture->certificate_file)))
+                          fixture->certificate_file)))
             goto end;
 
         CT_POLICY_EVAL_CTX_set1_cert(ct_policy_ctx, cert);
 
         if (fixture->issuer_file != NULL) {
             if (!TEST_ptr(issuer = load_pem_cert(fixture->certs_dir,
-                                                 fixture->issuer_file)))
+                              fixture->issuer_file)))
                 goto end;
             CT_POLICY_EVAL_CTX_set1_issuer(ct_policy_ctx, issuer);
         }
 
-        sct_extension_index =
-                X509_get_ext_by_NID(cert, NID_ct_precert_scts, -1);
+        sct_extension_index = X509_get_ext_by_NID(cert, NID_ct_precert_scts, -1);
         sct_extension = X509_get_ext(cert, sct_extension_index);
         if (fixture->expected_sct_count > 0) {
             if (!TEST_ptr(sct_extension))
@@ -275,15 +273,15 @@ static int execute_cert_test(CT_TEST_FIXTURE *fixture)
 
             if (fixture->sct_text_file
                 && !compare_extension_printout(sct_extension,
-                                               expected_sct_text))
-                    goto end;
+                    expected_sct_text))
+                goto end;
 
             scts = X509V3_EXT_d2i(sct_extension);
             for (i = 0; i < sk_SCT_num(scts); ++i) {
                 SCT *sct_i = sk_SCT_value(scts, i);
 
                 if (!TEST_int_eq(SCT_get_source(sct_i),
-                                 SCT_SOURCE_X509V3_EXTENSION)) {
+                        SCT_SOURCE_X509V3_EXTENSION)) {
                     goto end;
                 }
             }
@@ -310,12 +308,12 @@ static int execute_cert_test(CT_TEST_FIXTURE *fixture)
 
         if (fixture->sct_text_file
             && !compare_sct_list_printout(scts, expected_sct_text)) {
-                goto end;
+            goto end;
         }
 
         tls_sct_list_len = i2o_SCT_LIST(scts, &tls_sct_list);
         if (!TEST_mem_eq(fixture->tls_sct_list, fixture->tls_sct_list_len,
-                         tls_sct_list, tls_sct_list_len))
+                tls_sct_list, tls_sct_list_len))
             goto end;
     }
     success = 1;
@@ -330,8 +328,8 @@ static int execute_cert_test(CT_TEST_FIXTURE *fixture)
     return success;
 }
 
-# define SETUP_CT_TEST_FIXTURE() SETUP_TEST_FIXTURE(CT_TEST_FIXTURE, set_up)
-# define EXECUTE_CT_TEST() EXECUTE_TEST(execute_cert_test, tear_down)
+#define SETUP_CT_TEST_FIXTURE() SETUP_TEST_FIXTURE(CT_TEST_FIXTURE, set_up)
+#define EXECUTE_CT_TEST() EXECUTE_TEST(execute_cert_test, tear_down)
 
 static int test_no_scts_in_certificate(void)
 {
@@ -411,22 +409,22 @@ static int test_verify_fails_for_future_sct(void)
 static int test_decode_tls_sct(void)
 {
     const unsigned char tls_sct_list[] = "\x00\x78" /* length of list */
-        "\x00\x76"
-        "\x00" /* version */
-        /* log ID */
-        "\xDF\x1C\x2E\xC1\x15\x00\x94\x52\x47\xA9\x61\x68\x32\x5D\xDC\x5C\x79"
-        "\x59\xE8\xF7\xC6\xD3\x88\xFC\x00\x2E\x0B\xBD\x3F\x74\xD7\x64"
-        "\x00\x00\x01\x3D\xDB\x27\xDF\x93" /* timestamp */
-        "\x00\x00" /* extensions length */
-        "" /* extensions */
-        "\x04\x03" /* hash and signature algorithms */
-        "\x00\x47" /* signature length */
-        /* signature */
-        "\x30\x45\x02\x20\x48\x2F\x67\x51\xAF\x35\xDB\xA6\x54\x36\xBE\x1F\xD6"
-        "\x64\x0F\x3D\xBF\x9A\x41\x42\x94\x95\x92\x45\x30\x28\x8F\xA3\xE5\xE2"
-        "\x3E\x06\x02\x21\x00\xE4\xED\xC0\xDB\x3A\xC5\x72\xB1\xE2\xF5\xE8\xAB"
-        "\x6A\x68\x06\x53\x98\x7D\xCF\x41\x02\x7D\xFE\xFF\xA1\x05\x51\x9D\x89"
-        "\xED\xBF\x08";
+                                         "\x00\x76"
+                                         "\x00" /* version */
+                                         /* log ID */
+                                         "\xDF\x1C\x2E\xC1\x15\x00\x94\x52\x47\xA9\x61\x68\x32\x5D\xDC\x5C\x79"
+                                         "\x59\xE8\xF7\xC6\xD3\x88\xFC\x00\x2E\x0B\xBD\x3F\x74\xD7\x64"
+                                         "\x00\x00\x01\x3D\xDB\x27\xDF\x93" /* timestamp */
+                                         "\x00\x00" /* extensions length */
+                                         "" /* extensions */
+                                         "\x04\x03" /* hash and signature algorithms */
+                                         "\x00\x47" /* signature length */
+                                         /* signature */
+                                         "\x30\x45\x02\x20\x48\x2F\x67\x51\xAF\x35\xDB\xA6\x54\x36\xBE\x1F\xD6"
+                                         "\x64\x0F\x3D\xBF\x9A\x41\x42\x94\x95\x92\x45\x30\x28\x8F\xA3\xE5\xE2"
+                                         "\x3E\x06\x02\x21\x00\xE4\xED\xC0\xDB\x3A\xC5\x72\xB1\xE2\xF5\xE8\xAB"
+                                         "\x6A\x68\x06\x53\x98\x7D\xCF\x41\x02\x7D\xFE\xFF\xA1\x05\x51\x9D\x89"
+                                         "\xED\xBF\x08";
 
     SETUP_CT_TEST_FIXTURE();
     fixture->tls_sct_list = tls_sct_list;
@@ -443,22 +441,20 @@ static int test_encode_tls_sct(void)
     const uint64_t timestamp = 1;
     const char extensions[] = "";
     const char signature[] = "BAMARzBAMiBIL2dRrzXbplQ2vh/WZA89v5pBQpSVkkUwKI+j5"
-            "eI+BgIhAOTtwNs6xXKx4vXoq2poBlOYfc9BAn3+/6EFUZ2J7b8I";
+                             "eI+BgIhAOTtwNs6xXKx4vXoq2poBlOYfc9BAn3+/6EFUZ2J7b8I";
     SCT *sct = NULL;
 
     SETUP_CT_TEST_FIXTURE();
 
     fixture->sct_list = sk_SCT_new_null();
-    if (fixture->sct_list == NULL)
-    {
+    if (fixture->sct_list == NULL) {
         tear_down(fixture);
         return 0;
     }
 
     if (!TEST_ptr(sct = SCT_new_from_base64(SCT_VERSION_V1, log_id,
-                                            CT_LOG_ENTRY_TYPE_X509, timestamp,
-                                            extensions, signature)))
-    {
+                      CT_LOG_ENTRY_TYPE_X509, timestamp,
+                      extensions, signature))) {
         tear_down(fixture);
         return 0;
     }
@@ -482,12 +478,11 @@ static int test_default_ct_policy_eval_ctx_time_is_now(void)
 {
     int success = 0;
     CT_POLICY_EVAL_CTX *ct_policy_ctx = CT_POLICY_EVAL_CTX_new();
-    const time_t default_time =
-        (time_t)(CT_POLICY_EVAL_CTX_get_time(ct_policy_ctx) / 1000);
-    const time_t time_tolerance = 600;  /* 10 minutes */
+    const time_t default_time = (time_t)(CT_POLICY_EVAL_CTX_get_time(ct_policy_ctx) / 1000);
+    const time_t time_tolerance = 600; /* 10 minutes */
 
     if (!TEST_time_t_le(abs((int)difftime(time(NULL), default_time)),
-                        time_tolerance))
+            time_tolerance))
         goto end;
 
     success = 1;
diff --git a/test/ctype_internal_test.c b/test/ctype_internal_test.c
index e2e7dc0bac92c..94b39d741ca1b 100644
--- a/test/ctype_internal_test.c
+++ b/test/ctype_internal_test.c
@@ -34,19 +34,19 @@ static int test_ctype_chars(int n)
         return 1;
 
     return TEST_int_eq(isalpha(n) != 0, ossl_isalpha(n) != 0)
-           && TEST_int_eq(isalnum(n) != 0, ossl_isalnum(n) != 0)
+        && TEST_int_eq(isalnum(n) != 0, ossl_isalnum(n) != 0)
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-           && TEST_int_eq(isblank(n) != 0, ossl_isblank(n) != 0)
+        && TEST_int_eq(isblank(n) != 0, ossl_isblank(n) != 0)
 #endif
-           && TEST_int_eq(iscntrl(n) != 0, ossl_iscntrl(n) != 0)
-           && TEST_int_eq(isdigit(n) != 0, ossl_isdigit(n) != 0)
-           && TEST_int_eq(isgraph(n) != 0, ossl_isgraph(n) != 0)
-           && TEST_int_eq(islower(n) != 0, ossl_islower(n) != 0)
-           && TEST_int_eq(isprint(n) != 0, ossl_isprint(n) != 0)
-           && TEST_int_eq(ispunct(n) != 0, ossl_ispunct(n) != 0)
-           && TEST_int_eq(isspace(n) != 0, ossl_isspace(n) != 0)
-           && TEST_int_eq(isupper(n) != 0, ossl_isupper(n) != 0)
-           && TEST_int_eq(isxdigit(n) != 0, ossl_isxdigit(n) != 0);
+        && TEST_int_eq(iscntrl(n) != 0, ossl_iscntrl(n) != 0)
+        && TEST_int_eq(isdigit(n) != 0, ossl_isdigit(n) != 0)
+        && TEST_int_eq(isgraph(n) != 0, ossl_isgraph(n) != 0)
+        && TEST_int_eq(islower(n) != 0, ossl_islower(n) != 0)
+        && TEST_int_eq(isprint(n) != 0, ossl_isprint(n) != 0)
+        && TEST_int_eq(ispunct(n) != 0, ossl_ispunct(n) != 0)
+        && TEST_int_eq(isspace(n) != 0, ossl_isspace(n) != 0)
+        && TEST_int_eq(isupper(n) != 0, ossl_isupper(n) != 0)
+        && TEST_int_eq(isxdigit(n) != 0, ossl_isxdigit(n) != 0);
 }
 
 static struct {
@@ -59,20 +59,20 @@ static struct {
     { '0', '0' },
     { '%', '%' },
     { '~', '~' },
-    {   0,   0 },
+    { 0, 0 },
     { EOF, EOF }
 };
 
 static int test_ctype_toupper(int n)
 {
     return TEST_int_eq(ossl_toupper(case_change[n].l), case_change[n].u)
-           && TEST_int_eq(ossl_toupper(case_change[n].u), case_change[n].u);
+        && TEST_int_eq(ossl_toupper(case_change[n].u), case_change[n].u);
 }
 
 static int test_ctype_tolower(int n)
 {
     return TEST_int_eq(ossl_tolower(case_change[n].u), case_change[n].l)
-           && TEST_int_eq(ossl_tolower(case_change[n].l), case_change[n].l);
+        && TEST_int_eq(ossl_tolower(case_change[n].l), case_change[n].l);
 }
 
 static int test_ctype_eof(void)
diff --git a/test/curve448_internal_test.c b/test/curve448_internal_test.c
index c0b3ae3c80c3b..8987fae4994c7 100644
--- a/test/curve448_internal_test.c
+++ b/test/curve448_internal_test.c
@@ -76,25 +76,21 @@ static const uint8_t in_u3[56] = {
 };
 
 static const uint8_t out_u3[3][56] = {
-    {
-        0x3f, 0x48, 0x2c, 0x8a, 0x9f, 0x19, 0xb0, 0x1e, 0x6c, 0x46, 0xee, 0x97,
+    { 0x3f, 0x48, 0x2c, 0x8a, 0x9f, 0x19, 0xb0, 0x1e, 0x6c, 0x46, 0xee, 0x97,
         0x11, 0xd9, 0xdc, 0x14, 0xfd, 0x4b, 0xf6, 0x7a, 0xf3, 0x07, 0x65, 0xc2,
         0xae, 0x2b, 0x84, 0x6a, 0x4d, 0x23, 0xa8, 0xcd, 0x0d, 0xb8, 0x97, 0x08,
         0x62, 0x39, 0x49, 0x2c, 0xaf, 0x35, 0x0b, 0x51, 0xf8, 0x33, 0x86, 0x8b,
-        0x9b, 0xc2, 0xb3, 0xbc, 0xa9, 0xcf, 0x41, 0x13
-    }, {
-        0xaa, 0x3b, 0x47, 0x49, 0xd5, 0x5b, 0x9d, 0xaf, 0x1e, 0x5b, 0x00, 0x28,
+        0x9b, 0xc2, 0xb3, 0xbc, 0xa9, 0xcf, 0x41, 0x13 },
+    { 0xaa, 0x3b, 0x47, 0x49, 0xd5, 0x5b, 0x9d, 0xaf, 0x1e, 0x5b, 0x00, 0x28,
         0x88, 0x26, 0xc4, 0x67, 0x27, 0x4c, 0xe3, 0xeb, 0xbd, 0xd5, 0xc1, 0x7b,
         0x97, 0x5e, 0x09, 0xd4, 0xaf, 0x6c, 0x67, 0xcf, 0x10, 0xd0, 0x87, 0x20,
         0x2d, 0xb8, 0x82, 0x86, 0xe2, 0xb7, 0x9f, 0xce, 0xea, 0x3e, 0xc3, 0x53,
-        0xef, 0x54, 0xfa, 0xa2, 0x6e, 0x21, 0x9f, 0x38
-    }, {
-        0x07, 0x7f, 0x45, 0x36, 0x81, 0xca, 0xca, 0x36, 0x93, 0x19, 0x84, 0x20,
+        0xef, 0x54, 0xfa, 0xa2, 0x6e, 0x21, 0x9f, 0x38 },
+    { 0x07, 0x7f, 0x45, 0x36, 0x81, 0xca, 0xca, 0x36, 0x93, 0x19, 0x84, 0x20,
         0xbb, 0xe5, 0x15, 0xca, 0xe0, 0x00, 0x24, 0x72, 0x51, 0x9b, 0x3e, 0x67,
         0x66, 0x1a, 0x7e, 0x89, 0xca, 0xb9, 0x46, 0x95, 0xc8, 0xf4, 0xbc, 0xd6,
         0x6e, 0x61, 0xb9, 0xb9, 0xc9, 0x46, 0xda, 0x8d, 0x52, 0x4d, 0xe3, 0xd6,
-        0x9b, 0xd9, 0xd9, 0xd6, 0x6b, 0x99, 0x7e, 0x37
-    }
+        0x9b, 0xd9, 0xd9, 0xd6, 0x6b, 0x99, 0x7e, 0x37 }
 };
 
 /* Test vectors from RFC8032 for Ed448 */
@@ -583,13 +579,13 @@ static const uint8_t phsig2[114] = {
 };
 
 static const uint8_t *dohash(EVP_MD_CTX *hashctx, const uint8_t *msg,
-                             size_t msglen)
+    size_t msglen)
 {
     static uint8_t hashout[64];
 
     if (!EVP_DigestInit_ex(hashctx, EVP_shake256(), NULL)
-            || !EVP_DigestUpdate(hashctx, msg, msglen)
-            || !EVP_DigestFinalXOF(hashctx, hashout, sizeof(hashout)))
+        || !EVP_DigestUpdate(hashctx, msg, msglen)
+        || !EVP_DigestFinalXOF(hashctx, hashout, sizeof(hashout)))
         return NULL;
 
     return hashout;
@@ -601,45 +597,47 @@ static int test_ed448(void)
     EVP_MD_CTX *hashctx = EVP_MD_CTX_new();
 
     if (!TEST_ptr(hashctx)
-            || !TEST_true(ossl_ed448_sign(NULL, outsig, NULL, 0, pubkey1,
-                                          privkey1, NULL, 0, 0, NULL))
-            || !TEST_int_eq(memcmp(sig1, outsig, sizeof(sig1)), 0)
-            || !TEST_true(ossl_ed448_sign(NULL, outsig, msg2, sizeof(msg2),
-                                          pubkey2, privkey2, NULL, 0, 0, NULL))
-            || !TEST_int_eq(memcmp(sig2, outsig, sizeof(sig2)), 0)
-            || !TEST_true(ossl_ed448_sign(NULL, outsig, msg3, sizeof(msg3),
-                                          pubkey3, privkey3, context3,
-                                          sizeof(context3), 0, NULL))
-            || !TEST_int_eq(memcmp(sig3, outsig, sizeof(sig3)), 0)
-            || !TEST_true(ossl_ed448_sign(NULL, outsig, msg4, sizeof(msg4),
-                                          pubkey4, privkey4, NULL, 0, 0, NULL))
-            || !TEST_int_eq(memcmp(sig4, outsig, sizeof(sig4)), 0)
-            || !TEST_true(ossl_ed448_sign(NULL, outsig, msg5, sizeof(msg5),
-                                          pubkey5, privkey5, NULL, 0, 0, NULL))
-            || !TEST_int_eq(memcmp(sig5, outsig, sizeof(sig5)), 0)
-            || !TEST_true(ossl_ed448_sign(NULL, outsig, msg6, sizeof(msg6),
-                                          pubkey6, privkey6, NULL, 0, 0, NULL))
-            || !TEST_int_eq(memcmp(sig6, outsig, sizeof(sig6)), 0)
-            || !TEST_true(ossl_ed448_sign(NULL, outsig, msg7, sizeof(msg7),
-                                          pubkey7, privkey7, NULL, 0, 0, NULL))
-            || !TEST_int_eq(memcmp(sig7, outsig, sizeof(sig7)), 0)
-            || !TEST_true(ossl_ed448_sign(NULL, outsig, msg8, sizeof(msg8),
-                                          pubkey8, privkey8, NULL, 0, 0, NULL))
-            || !TEST_int_eq(memcmp(sig8, outsig, sizeof(sig8)), 0)
-            || !TEST_true(ossl_ed448_sign(NULL, outsig, msg9, sizeof(msg9),
-                                          pubkey9, privkey9, NULL, 0, 0, NULL))
-            || !TEST_int_eq(memcmp(sig9, outsig, sizeof(sig9)), 0)
-            || !TEST_true(ossl_ed448_sign(NULL, outsig,
-                                          dohash(hashctx, phmsg1,
-                                                 sizeof(phmsg1)), 64, phpubkey1,
-                                                 phprivkey1, NULL, 0, 1, NULL))
-            || !TEST_int_eq(memcmp(phsig1, outsig, sizeof(phsig1)), 0)
-            || !TEST_true(ossl_ed448_sign(NULL, outsig,
-                                          dohash(hashctx, phmsg2,
-                                                 sizeof(phmsg2)), 64, phpubkey2,
-                                                 phprivkey2, phcontext2,
-                                                 sizeof(phcontext2), 1, NULL))
-            || !TEST_int_eq(memcmp(phsig2, outsig, sizeof(phsig2)), 0)) {
+        || !TEST_true(ossl_ed448_sign(NULL, outsig, NULL, 0, pubkey1,
+            privkey1, NULL, 0, 0, NULL))
+        || !TEST_int_eq(memcmp(sig1, outsig, sizeof(sig1)), 0)
+        || !TEST_true(ossl_ed448_sign(NULL, outsig, msg2, sizeof(msg2),
+            pubkey2, privkey2, NULL, 0, 0, NULL))
+        || !TEST_int_eq(memcmp(sig2, outsig, sizeof(sig2)), 0)
+        || !TEST_true(ossl_ed448_sign(NULL, outsig, msg3, sizeof(msg3),
+            pubkey3, privkey3, context3,
+            sizeof(context3), 0, NULL))
+        || !TEST_int_eq(memcmp(sig3, outsig, sizeof(sig3)), 0)
+        || !TEST_true(ossl_ed448_sign(NULL, outsig, msg4, sizeof(msg4),
+            pubkey4, privkey4, NULL, 0, 0, NULL))
+        || !TEST_int_eq(memcmp(sig4, outsig, sizeof(sig4)), 0)
+        || !TEST_true(ossl_ed448_sign(NULL, outsig, msg5, sizeof(msg5),
+            pubkey5, privkey5, NULL, 0, 0, NULL))
+        || !TEST_int_eq(memcmp(sig5, outsig, sizeof(sig5)), 0)
+        || !TEST_true(ossl_ed448_sign(NULL, outsig, msg6, sizeof(msg6),
+            pubkey6, privkey6, NULL, 0, 0, NULL))
+        || !TEST_int_eq(memcmp(sig6, outsig, sizeof(sig6)), 0)
+        || !TEST_true(ossl_ed448_sign(NULL, outsig, msg7, sizeof(msg7),
+            pubkey7, privkey7, NULL, 0, 0, NULL))
+        || !TEST_int_eq(memcmp(sig7, outsig, sizeof(sig7)), 0)
+        || !TEST_true(ossl_ed448_sign(NULL, outsig, msg8, sizeof(msg8),
+            pubkey8, privkey8, NULL, 0, 0, NULL))
+        || !TEST_int_eq(memcmp(sig8, outsig, sizeof(sig8)), 0)
+        || !TEST_true(ossl_ed448_sign(NULL, outsig, msg9, sizeof(msg9),
+            pubkey9, privkey9, NULL, 0, 0, NULL))
+        || !TEST_int_eq(memcmp(sig9, outsig, sizeof(sig9)), 0)
+        || !TEST_true(ossl_ed448_sign(NULL, outsig,
+            dohash(hashctx, phmsg1,
+                sizeof(phmsg1)),
+            64, phpubkey1,
+            phprivkey1, NULL, 0, 1, NULL))
+        || !TEST_int_eq(memcmp(phsig1, outsig, sizeof(phsig1)), 0)
+        || !TEST_true(ossl_ed448_sign(NULL, outsig,
+            dohash(hashctx, phmsg2,
+                sizeof(phmsg2)),
+            64, phpubkey2,
+            phprivkey2, phcontext2,
+            sizeof(phcontext2), 1, NULL))
+        || !TEST_int_eq(memcmp(phsig2, outsig, sizeof(phsig2)), 0)) {
         EVP_MD_CTX_free(hashctx);
         return 0;
     }
@@ -657,9 +655,9 @@ static int test_x448(void)
     /* Curve448 tests */
 
     if (!TEST_true(ossl_x448(out, in_scalar1, in_u1))
-          || !TEST_int_eq(memcmp(out, out_u1, sizeof(out)), 0)
-          || !TEST_true(ossl_x448(out, in_scalar2, in_u2))
-          || !TEST_int_eq(memcmp(out, out_u2, sizeof(out)), 0))
+        || !TEST_int_eq(memcmp(out, out_u1, sizeof(out)), 0)
+        || !TEST_true(ossl_x448(out, in_scalar2, in_u2))
+        || !TEST_int_eq(memcmp(out, out_u2, sizeof(out)), 0))
         return 0;
 
     memcpy(u, in_u3, sizeof(u));
@@ -701,7 +699,7 @@ const OPTIONS *test_get_options(void)
         OPT_TEST_OPTIONS_WITH_EXTRA_USAGE("conf_file\n"),
         { "f", OPT_SLOW, '-', "Enables a slow test" },
         { "v", OPT_PROGRESS, '-',
-              "Enables verbose mode (prints progress dots)" },
+            "Enables verbose mode (prints progress dots)" },
         { NULL }
     };
     return test_options;
diff --git a/test/d2i_test.c b/test/d2i_test.c
index c095dfef37e84..05d2892de0769 100644
--- a/test/d2i_test.c
+++ b/test/d2i_test.c
@@ -95,7 +95,7 @@ static int test_bad_asn1(void)
     if (TEST_int_eq(expected_error, ASN1_OK))
         ret = 1;
 
- err:
+err:
     /* Don't indicate success for memory allocation errors */
     if (ret == 1
         && !TEST_false(ERR_GET_REASON(ERR_peek_error()) == ERR_R_MALLOC_FAILURE))
@@ -120,11 +120,11 @@ int setup_tests(void)
     size_t i;
 
     static error_enum expected_errors[] = {
-        {"OK", ASN1_OK},
-        {"BIO", ASN1_BIO},
-        {"decode", ASN1_DECODE},
-        {"encode", ASN1_ENCODE},
-        {"compare", ASN1_COMPARE}
+        { "OK", ASN1_OK },
+        { "BIO", ASN1_BIO },
+        { "decode", ASN1_DECODE },
+        { "encode", ASN1_ENCODE },
+        { "compare", ASN1_COMPARE }
     };
 
     if (!test_skip_common_options()) {
@@ -133,8 +133,8 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(test_type_name = test_get_argument(0))
-            || !TEST_ptr(expected_error_string = test_get_argument(1))
-            || !TEST_ptr(test_file = test_get_argument(2)))
+        || !TEST_ptr(expected_error_string = test_get_argument(1))
+        || !TEST_ptr(test_file = test_get_argument(2)))
         return 0;
 
     item_type = ASN1_ITEM_lookup(test_type_name);
diff --git a/test/danetest.c b/test/danetest.c
index d7ef87b6d2674..f849e3f7f39f1 100644
--- a/test/danetest.c
+++ b/test/danetest.c
@@ -20,7 +20,7 @@
 #include <openssl/err.h>
 #include <openssl/conf.h>
 #ifndef OPENSSL_NO_ENGINE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include "testutil.h"
 
@@ -61,17 +61,16 @@ static int verify_chain(SSL *ssl, STACK_OF(X509) *chain)
     int store_ctx_idx = SSL_get_ex_data_X509_STORE_CTX_idx();
 
     if (!TEST_ptr(store_ctx = X509_STORE_CTX_new())
-            || !TEST_ptr(ssl_ctx = SSL_get_SSL_CTX(ssl))
-            || !TEST_ptr(store = SSL_CTX_get_cert_store(ssl_ctx))
-            || !TEST_true(X509_STORE_CTX_init(store_ctx, store, NULL, chain))
-            || !TEST_true(X509_STORE_CTX_set_ex_data(store_ctx, store_ctx_idx,
-                                                     ssl)))
+        || !TEST_ptr(ssl_ctx = SSL_get_SSL_CTX(ssl))
+        || !TEST_ptr(store = SSL_CTX_get_cert_store(ssl_ctx))
+        || !TEST_true(X509_STORE_CTX_init(store_ctx, store, NULL, chain))
+        || !TEST_true(X509_STORE_CTX_set_ex_data(store_ctx, store_ctx_idx,
+            ssl)))
         goto end;
 
-    X509_STORE_CTX_set_default(store_ctx, SSL_is_server(ssl)
-                               ? "ssl_client" : "ssl_server");
+    X509_STORE_CTX_set_default(store_ctx, SSL_is_server(ssl) ? "ssl_client" : "ssl_server");
     X509_VERIFY_PARAM_set1(X509_STORE_CTX_get0_param(store_ctx),
-                           SSL_get0_param(ssl));
+        SSL_get0_param(ssl));
     store_ctx_dane_init(store_ctx, ssl);
 
     if (SSL_get_verify_callback(ssl) != NULL)
@@ -103,19 +102,20 @@ static STACK_OF(X509) *load_chain(BIO *fp, int nelem)
         goto err;
 
     for (count = 0;
-         count < nelem && errtype == 0
-         && PEM_read_bio(fp, &name, &header, &data, &len) == 1;
-         ++count) {
+        count < nelem && errtype == 0
+        && PEM_read_bio(fp, &name, &header, &data, &len) == 1;
+        ++count) {
         if (strcmp(name, PEM_STRING_X509) == 0
-                || strcmp(name, PEM_STRING_X509_TRUSTED) == 0
-                || strcmp(name, PEM_STRING_X509_OLD) == 0) {
+            || strcmp(name, PEM_STRING_X509_TRUSTED) == 0
+            || strcmp(name, PEM_STRING_X509_OLD) == 0) {
             d2i_X509_t d = strcmp(name, PEM_STRING_X509_TRUSTED) != 0
-                ? d2i_X509_AUX : d2i_X509;
+                ? d2i_X509_AUX
+                : d2i_X509;
             X509 *cert;
             const unsigned char *p = data;
 
             if (!TEST_ptr(cert = d(0, &p, len))
-                    || !TEST_long_eq(p - data, len)) {
+                || !TEST_long_eq(p - data, len)) {
                 TEST_info("Certificate parsing error");
                 goto err;
             }
@@ -224,9 +224,7 @@ static ossl_ssize_t checked_uint8(const char *in, void *out)
     v = strtol(cp, &endp, 10);
     e = restore_errno();
 
-    if (((v == LONG_MIN || v == LONG_MAX) && e == ERANGE) ||
-        endp == cp || !isspace(_UC(*endp)) ||
-        v != (*(uint8_t *)result = (uint8_t) v)) {
+    if (((v == LONG_MIN || v == LONG_MAX) && e == ERANGE) || endp == cp || !isspace(_UC(*endp)) || v != (*(uint8_t *)result = (uint8_t)v)) {
         return -1;
     }
     for (cp = endp; isspace(_UC(*cp)); ++cp)
@@ -251,7 +249,9 @@ static int tlsa_import_rr(SSL *ssl, const char *rrdata)
         { &selector, "selector", checked_uint8 },
         { &mtype, "mtype", checked_uint8 },
         { &data, "data", hexdecode },
-        { NULL, }
+        {
+            NULL,
+        }
     };
     int ret;
     struct tlsa_field *f;
@@ -288,7 +288,7 @@ static int allws(const char *cp)
 }
 
 static int test_tlsafile(SSL_CTX *ctx, const char *base_name,
-                         BIO *f, const char *path)
+    BIO *f, const char *path)
 {
     char *line;
     int testno = 0;
@@ -313,7 +313,8 @@ static int test_tlsafile(SSL_CTX *ctx, const char *base_name,
 
         ++testno;
         if (sscanf(line, "%d %d %d %d %d%n",
-                   &ntlsa, &ncert, &noncheck, &want, &want_depth, &off) != 5
+                &ntlsa, &ncert, &noncheck, &want, &want_depth, &off)
+                != 5
             || !allws(line + off)) {
             TEST_error("Malformed line for test %d", testno);
             return 0;
@@ -360,7 +361,7 @@ static int test_tlsafile(SSL_CTX *ctx, const char *base_name,
         if (!TEST_int_eq(err, want)) {
             if (want == X509_V_OK)
                 TEST_info("Verification failure in test %d: %d=%s",
-                          testno, err, X509_verify_cert_error_string(err));
+                    testno, err, X509_verify_cert_error_string(err));
             else
                 TEST_info("Unexpected error in test %d", testno);
             ret = 0;
@@ -388,12 +389,12 @@ static int run_tlsatest(void)
     int ret = 0;
 
     if (!TEST_ptr(f = BIO_new_file(tlsafile, "r"))
-            || !TEST_ptr(ctx = SSL_CTX_new(TLS_client_method()))
-            || !TEST_int_gt(SSL_CTX_dane_enable(ctx), 0)
-            || !TEST_true(SSL_CTX_load_verify_file(ctx, CAfile))
-            || !TEST_int_gt(SSL_CTX_dane_mtype_set(ctx, EVP_sha512(), 2, 1), 0)
-            || !TEST_int_gt(SSL_CTX_dane_mtype_set(ctx, EVP_sha256(), 1, 2), 0)
-            || !TEST_int_gt(test_tlsafile(ctx, basedomain, f, tlsafile), 0))
+        || !TEST_ptr(ctx = SSL_CTX_new(TLS_client_method()))
+        || !TEST_int_gt(SSL_CTX_dane_enable(ctx), 0)
+        || !TEST_true(SSL_CTX_load_verify_file(ctx, CAfile))
+        || !TEST_int_gt(SSL_CTX_dane_mtype_set(ctx, EVP_sha512(), 2, 1), 0)
+        || !TEST_int_gt(SSL_CTX_dane_mtype_set(ctx, EVP_sha256(), 1, 2), 0)
+        || !TEST_int_gt(test_tlsafile(ctx, basedomain, f, tlsafile), 0))
         goto end;
     ret = 1;
 
@@ -414,8 +415,8 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(basedomain = test_get_argument(0))
-            || !TEST_ptr(CAfile = test_get_argument(1))
-            || !TEST_ptr(tlsafile = test_get_argument(2)))
+        || !TEST_ptr(CAfile = test_get_argument(1))
+        || !TEST_ptr(tlsafile = test_get_argument(2)))
         return 0;
 
     ADD_TEST(run_tlsatest);
diff --git a/test/decoder_propq_test.c b/test/decoder_propq_test.c
index aa374da74c28b..3854be083cd90 100644
--- a/test/decoder_propq_test.c
+++ b/test/decoder_propq_test.c
@@ -30,9 +30,9 @@ const OPTIONS *test_get_options(void)
     static const OPTIONS test_options[] = {
         OPT_TEST_OPTIONS_WITH_EXTRA_USAGE("file\n"),
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the libctx" },
+            "The configuration file to use for the libctx" },
         { "provider", OPT_PROVIDER_NAME, 's',
-          "The provider to load (The default value is 'default')" },
+            "The provider to load (The default value is 'default')" },
         { OPT_HELP_STR, 1, '-', "file\tFile to decode.\n" },
         { NULL }
     };
@@ -96,7 +96,7 @@ int setup_tests(void)
             config_file = opt_arg();
             break;
         case OPT_TEST_CASES:
-           break;
+            break;
         default:
         case OPT_ERR:
             return 0;
diff --git a/test/default-recordpadding.cnf b/test/default-recordpadding.cnf
new file mode 100644
index 0000000000000..a948e4359b56e
--- /dev/null
+++ b/test/default-recordpadding.cnf
@@ -0,0 +1,27 @@
+openssl_conf = openssl_init
+
+# Comment out the next line to ignore configuration errors
+config_diagnostics = 1
+
+[openssl_init]
+providers = provider_sect
+ssl_conf = ssl_section
+
+[ssl_section]
+system_default = system_default_section
+
+# Set block and record padding
+# Note: QUIC objects should ignore this, as they
+# always pad during datagram encryption
+[system_default_section]
+RecordPadding = 128,256
+
+[provider_sect]
+default = default_sect
+legacy  = legacy_sect
+
+[default_sect]
+activate = true
+
+[legacy_sect]
+activate = false
diff --git a/test/defltfips_test.c b/test/defltfips_test.c
index 685a2e1d2677d..16d834b020c09 100644
--- a/test/defltfips_test.c
+++ b/test/defltfips_test.c
@@ -35,7 +35,7 @@ static int test_is_fips_enabled(void)
      * loading the FIPS provider.
      */
     if (!TEST_int_eq(is_fips || bad_fips, is_fips_enabled)
-            || !TEST_int_eq(is_fips && !bad_fips, is_fips_loaded))
+        || !TEST_int_eq(is_fips && !bad_fips, is_fips_loaded))
         return 0;
 
     /*
@@ -53,7 +53,7 @@ static int test_is_fips_enabled(void)
             return 0;
         if (is_fips
             && !TEST_str_eq(OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(sha256)),
-                            "fips")) {
+                "fips")) {
             EVP_MD_free(sha256);
             return 0;
         }
diff --git a/test/destest.c b/test/destest.c
index 7bc844ae88bdd..d851eeb195fb9 100644
--- a/test/destest.c
+++ b/test/destest.c
@@ -20,161 +20,161 @@
 #include "internal/nelem.h"
 
 #ifndef OPENSSL_NO_DES
-# include <openssl/des.h>
+#include <openssl/des.h>
 
 /* In case any platform doesn't use unsigned int for its checksums */
-# define TEST_cs_eq  TEST_uint_eq
+#define TEST_cs_eq TEST_uint_eq
 
-# define DATA_BUF_SIZE      20
+#define DATA_BUF_SIZE 20
 
 /* tisk tisk - the test keys don't all have odd parity :-( */
 /* test data */
-# define NUM_TESTS 34
+#define NUM_TESTS 34
 static unsigned char key_data[NUM_TESTS][8] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-    {0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10},
-    {0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57},
-    {0x01, 0x31, 0xD9, 0x61, 0x9D, 0xC1, 0x37, 0x6E},
-    {0x07, 0xA1, 0x13, 0x3E, 0x4A, 0x0B, 0x26, 0x86},
-    {0x38, 0x49, 0x67, 0x4C, 0x26, 0x02, 0x31, 0x9E},
-    {0x04, 0xB9, 0x15, 0xBA, 0x43, 0xFE, 0xB5, 0xB6},
-    {0x01, 0x13, 0xB9, 0x70, 0xFD, 0x34, 0xF2, 0xCE},
-    {0x01, 0x70, 0xF1, 0x75, 0x46, 0x8F, 0xB5, 0xE6},
-    {0x43, 0x29, 0x7F, 0xAD, 0x38, 0xE3, 0x73, 0xFE},
-    {0x07, 0xA7, 0x13, 0x70, 0x45, 0xDA, 0x2A, 0x16},
-    {0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F},
-    {0x37, 0xD0, 0x6B, 0xB5, 0x16, 0xCB, 0x75, 0x46},
-    {0x1F, 0x08, 0x26, 0x0D, 0x1A, 0xC2, 0x46, 0x5E},
-    {0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76},
-    {0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xB0, 0x07},
-    {0x49, 0x79, 0x3E, 0xBC, 0x79, 0xB3, 0x25, 0x8F},
-    {0x4F, 0xB0, 0x5E, 0x15, 0x15, 0xAB, 0x73, 0xA7},
-    {0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF},
-    {0x01, 0x83, 0x10, 0xDC, 0x40, 0x9B, 0x26, 0xD6},
-    {0x1C, 0x58, 0x7F, 0x1C, 0x13, 0x92, 0x4F, 0xEF},
-    {0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
-    {0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E},
-    {0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10}
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+    { 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 },
+    { 0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57 },
+    { 0x01, 0x31, 0xD9, 0x61, 0x9D, 0xC1, 0x37, 0x6E },
+    { 0x07, 0xA1, 0x13, 0x3E, 0x4A, 0x0B, 0x26, 0x86 },
+    { 0x38, 0x49, 0x67, 0x4C, 0x26, 0x02, 0x31, 0x9E },
+    { 0x04, 0xB9, 0x15, 0xBA, 0x43, 0xFE, 0xB5, 0xB6 },
+    { 0x01, 0x13, 0xB9, 0x70, 0xFD, 0x34, 0xF2, 0xCE },
+    { 0x01, 0x70, 0xF1, 0x75, 0x46, 0x8F, 0xB5, 0xE6 },
+    { 0x43, 0x29, 0x7F, 0xAD, 0x38, 0xE3, 0x73, 0xFE },
+    { 0x07, 0xA7, 0x13, 0x70, 0x45, 0xDA, 0x2A, 0x16 },
+    { 0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F },
+    { 0x37, 0xD0, 0x6B, 0xB5, 0x16, 0xCB, 0x75, 0x46 },
+    { 0x1F, 0x08, 0x26, 0x0D, 0x1A, 0xC2, 0x46, 0x5E },
+    { 0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76 },
+    { 0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xB0, 0x07 },
+    { 0x49, 0x79, 0x3E, 0xBC, 0x79, 0xB3, 0x25, 0x8F },
+    { 0x4F, 0xB0, 0x5E, 0x15, 0x15, 0xAB, 0x73, 0xA7 },
+    { 0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF },
+    { 0x01, 0x83, 0x10, 0xDC, 0x40, 0x9B, 0x26, 0xD6 },
+    { 0x1C, 0x58, 0x7F, 0x1C, 0x13, 0x92, 0x4F, 0xEF },
+    { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
+    { 0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E },
+    { 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 }
 };
 
 static unsigned char plain_data[NUM_TESTS][8] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-    {0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
-    {0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
-    {0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0x01, 0xA1, 0xD6, 0xD0, 0x39, 0x77, 0x67, 0x42},
-    {0x5C, 0xD5, 0x4C, 0xA8, 0x3D, 0xEF, 0x57, 0xDA},
-    {0x02, 0x48, 0xD4, 0x38, 0x06, 0xF6, 0x71, 0x72},
-    {0x51, 0x45, 0x4B, 0x58, 0x2D, 0xDF, 0x44, 0x0A},
-    {0x42, 0xFD, 0x44, 0x30, 0x59, 0x57, 0x7F, 0xA2},
-    {0x05, 0x9B, 0x5E, 0x08, 0x51, 0xCF, 0x14, 0x3A},
-    {0x07, 0x56, 0xD8, 0xE0, 0x77, 0x47, 0x61, 0xD2},
-    {0x76, 0x25, 0x14, 0xB8, 0x29, 0xBF, 0x48, 0x6A},
-    {0x3B, 0xDD, 0x11, 0x90, 0x49, 0x37, 0x28, 0x02},
-    {0x26, 0x95, 0x5F, 0x68, 0x35, 0xAF, 0x60, 0x9A},
-    {0x16, 0x4D, 0x5E, 0x40, 0x4F, 0x27, 0x52, 0x32},
-    {0x6B, 0x05, 0x6E, 0x18, 0x75, 0x9F, 0x5C, 0xCA},
-    {0x00, 0x4B, 0xD6, 0xEF, 0x09, 0x17, 0x60, 0x62},
-    {0x48, 0x0D, 0x39, 0x00, 0x6E, 0xE7, 0x62, 0xF2},
-    {0x43, 0x75, 0x40, 0xC8, 0x69, 0x8F, 0x3C, 0xFA},
-    {0x07, 0x2D, 0x43, 0xA0, 0x77, 0x07, 0x52, 0x92},
-    {0x02, 0xFE, 0x55, 0x77, 0x81, 0x17, 0xF1, 0x2A},
-    {0x1D, 0x9D, 0x5C, 0x50, 0x18, 0xF7, 0x28, 0xC2},
-    {0x30, 0x55, 0x32, 0x28, 0x6D, 0x6F, 0x29, 0x5A},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+    { 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
+    { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 },
+    { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x01, 0xA1, 0xD6, 0xD0, 0x39, 0x77, 0x67, 0x42 },
+    { 0x5C, 0xD5, 0x4C, 0xA8, 0x3D, 0xEF, 0x57, 0xDA },
+    { 0x02, 0x48, 0xD4, 0x38, 0x06, 0xF6, 0x71, 0x72 },
+    { 0x51, 0x45, 0x4B, 0x58, 0x2D, 0xDF, 0x44, 0x0A },
+    { 0x42, 0xFD, 0x44, 0x30, 0x59, 0x57, 0x7F, 0xA2 },
+    { 0x05, 0x9B, 0x5E, 0x08, 0x51, 0xCF, 0x14, 0x3A },
+    { 0x07, 0x56, 0xD8, 0xE0, 0x77, 0x47, 0x61, 0xD2 },
+    { 0x76, 0x25, 0x14, 0xB8, 0x29, 0xBF, 0x48, 0x6A },
+    { 0x3B, 0xDD, 0x11, 0x90, 0x49, 0x37, 0x28, 0x02 },
+    { 0x26, 0x95, 0x5F, 0x68, 0x35, 0xAF, 0x60, 0x9A },
+    { 0x16, 0x4D, 0x5E, 0x40, 0x4F, 0x27, 0x52, 0x32 },
+    { 0x6B, 0x05, 0x6E, 0x18, 0x75, 0x9F, 0x5C, 0xCA },
+    { 0x00, 0x4B, 0xD6, 0xEF, 0x09, 0x17, 0x60, 0x62 },
+    { 0x48, 0x0D, 0x39, 0x00, 0x6E, 0xE7, 0x62, 0xF2 },
+    { 0x43, 0x75, 0x40, 0xC8, 0x69, 0x8F, 0x3C, 0xFA },
+    { 0x07, 0x2D, 0x43, 0xA0, 0x77, 0x07, 0x52, 0x92 },
+    { 0x02, 0xFE, 0x55, 0x77, 0x81, 0x17, 0xF1, 0x2A },
+    { 0x1D, 0x9D, 0x5C, 0x50, 0x18, 0xF7, 0x28, 0xC2 },
+    { 0x30, 0x55, 0x32, 0x28, 0x6D, 0x6F, 0x29, 0x5A },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }
 };
 
 static unsigned char cipher_data[NUM_TESTS][8] = {
-    {0x8C, 0xA6, 0x4D, 0xE9, 0xC1, 0xB1, 0x23, 0xA7},
-    {0x73, 0x59, 0xB2, 0x16, 0x3E, 0x4E, 0xDC, 0x58},
-    {0x95, 0x8E, 0x6E, 0x62, 0x7A, 0x05, 0x55, 0x7B},
-    {0xF4, 0x03, 0x79, 0xAB, 0x9E, 0x0E, 0xC5, 0x33},
-    {0x17, 0x66, 0x8D, 0xFC, 0x72, 0x92, 0x53, 0x2D},
-    {0x8A, 0x5A, 0xE1, 0xF8, 0x1A, 0xB8, 0xF2, 0xDD},
-    {0x8C, 0xA6, 0x4D, 0xE9, 0xC1, 0xB1, 0x23, 0xA7},
-    {0xED, 0x39, 0xD9, 0x50, 0xFA, 0x74, 0xBC, 0xC4},
-    {0x69, 0x0F, 0x5B, 0x0D, 0x9A, 0x26, 0x93, 0x9B},
-    {0x7A, 0x38, 0x9D, 0x10, 0x35, 0x4B, 0xD2, 0x71},
-    {0x86, 0x8E, 0xBB, 0x51, 0xCA, 0xB4, 0x59, 0x9A},
-    {0x71, 0x78, 0x87, 0x6E, 0x01, 0xF1, 0x9B, 0x2A},
-    {0xAF, 0x37, 0xFB, 0x42, 0x1F, 0x8C, 0x40, 0x95},
-    {0x86, 0xA5, 0x60, 0xF1, 0x0E, 0xC6, 0xD8, 0x5B},
-    {0x0C, 0xD3, 0xDA, 0x02, 0x00, 0x21, 0xDC, 0x09},
-    {0xEA, 0x67, 0x6B, 0x2C, 0xB7, 0xDB, 0x2B, 0x7A},
-    {0xDF, 0xD6, 0x4A, 0x81, 0x5C, 0xAF, 0x1A, 0x0F},
-    {0x5C, 0x51, 0x3C, 0x9C, 0x48, 0x86, 0xC0, 0x88},
-    {0x0A, 0x2A, 0xEE, 0xAE, 0x3F, 0xF4, 0xAB, 0x77},
-    {0xEF, 0x1B, 0xF0, 0x3E, 0x5D, 0xFA, 0x57, 0x5A},
-    {0x88, 0xBF, 0x0D, 0xB6, 0xD7, 0x0D, 0xEE, 0x56},
-    {0xA1, 0xF9, 0x91, 0x55, 0x41, 0x02, 0x0B, 0x56},
-    {0x6F, 0xBF, 0x1C, 0xAF, 0xCF, 0xFD, 0x05, 0x56},
-    {0x2F, 0x22, 0xE4, 0x9B, 0xAB, 0x7C, 0xA1, 0xAC},
-    {0x5A, 0x6B, 0x61, 0x2C, 0xC2, 0x6C, 0xCE, 0x4A},
-    {0x5F, 0x4C, 0x03, 0x8E, 0xD1, 0x2B, 0x2E, 0x41},
-    {0x63, 0xFA, 0xC0, 0xD0, 0x34, 0xD9, 0xF7, 0x93},
-    {0x61, 0x7B, 0x3A, 0x0C, 0xE8, 0xF0, 0x71, 0x00},
-    {0xDB, 0x95, 0x86, 0x05, 0xF8, 0xC8, 0xC6, 0x06},
-    {0xED, 0xBF, 0xD1, 0xC6, 0x6C, 0x29, 0xCC, 0xC7},
-    {0x35, 0x55, 0x50, 0xB2, 0x15, 0x0E, 0x24, 0x51},
-    {0xCA, 0xAA, 0xAF, 0x4D, 0xEA, 0xF1, 0xDB, 0xAE},
-    {0xD5, 0xD4, 0x4F, 0xF7, 0x20, 0x68, 0x3D, 0x0D},
-    {0x2A, 0x2B, 0xB0, 0x08, 0xDF, 0x97, 0xC2, 0xF2}
+    { 0x8C, 0xA6, 0x4D, 0xE9, 0xC1, 0xB1, 0x23, 0xA7 },
+    { 0x73, 0x59, 0xB2, 0x16, 0x3E, 0x4E, 0xDC, 0x58 },
+    { 0x95, 0x8E, 0x6E, 0x62, 0x7A, 0x05, 0x55, 0x7B },
+    { 0xF4, 0x03, 0x79, 0xAB, 0x9E, 0x0E, 0xC5, 0x33 },
+    { 0x17, 0x66, 0x8D, 0xFC, 0x72, 0x92, 0x53, 0x2D },
+    { 0x8A, 0x5A, 0xE1, 0xF8, 0x1A, 0xB8, 0xF2, 0xDD },
+    { 0x8C, 0xA6, 0x4D, 0xE9, 0xC1, 0xB1, 0x23, 0xA7 },
+    { 0xED, 0x39, 0xD9, 0x50, 0xFA, 0x74, 0xBC, 0xC4 },
+    { 0x69, 0x0F, 0x5B, 0x0D, 0x9A, 0x26, 0x93, 0x9B },
+    { 0x7A, 0x38, 0x9D, 0x10, 0x35, 0x4B, 0xD2, 0x71 },
+    { 0x86, 0x8E, 0xBB, 0x51, 0xCA, 0xB4, 0x59, 0x9A },
+    { 0x71, 0x78, 0x87, 0x6E, 0x01, 0xF1, 0x9B, 0x2A },
+    { 0xAF, 0x37, 0xFB, 0x42, 0x1F, 0x8C, 0x40, 0x95 },
+    { 0x86, 0xA5, 0x60, 0xF1, 0x0E, 0xC6, 0xD8, 0x5B },
+    { 0x0C, 0xD3, 0xDA, 0x02, 0x00, 0x21, 0xDC, 0x09 },
+    { 0xEA, 0x67, 0x6B, 0x2C, 0xB7, 0xDB, 0x2B, 0x7A },
+    { 0xDF, 0xD6, 0x4A, 0x81, 0x5C, 0xAF, 0x1A, 0x0F },
+    { 0x5C, 0x51, 0x3C, 0x9C, 0x48, 0x86, 0xC0, 0x88 },
+    { 0x0A, 0x2A, 0xEE, 0xAE, 0x3F, 0xF4, 0xAB, 0x77 },
+    { 0xEF, 0x1B, 0xF0, 0x3E, 0x5D, 0xFA, 0x57, 0x5A },
+    { 0x88, 0xBF, 0x0D, 0xB6, 0xD7, 0x0D, 0xEE, 0x56 },
+    { 0xA1, 0xF9, 0x91, 0x55, 0x41, 0x02, 0x0B, 0x56 },
+    { 0x6F, 0xBF, 0x1C, 0xAF, 0xCF, 0xFD, 0x05, 0x56 },
+    { 0x2F, 0x22, 0xE4, 0x9B, 0xAB, 0x7C, 0xA1, 0xAC },
+    { 0x5A, 0x6B, 0x61, 0x2C, 0xC2, 0x6C, 0xCE, 0x4A },
+    { 0x5F, 0x4C, 0x03, 0x8E, 0xD1, 0x2B, 0x2E, 0x41 },
+    { 0x63, 0xFA, 0xC0, 0xD0, 0x34, 0xD9, 0xF7, 0x93 },
+    { 0x61, 0x7B, 0x3A, 0x0C, 0xE8, 0xF0, 0x71, 0x00 },
+    { 0xDB, 0x95, 0x86, 0x05, 0xF8, 0xC8, 0xC6, 0x06 },
+    { 0xED, 0xBF, 0xD1, 0xC6, 0x6C, 0x29, 0xCC, 0xC7 },
+    { 0x35, 0x55, 0x50, 0xB2, 0x15, 0x0E, 0x24, 0x51 },
+    { 0xCA, 0xAA, 0xAF, 0x4D, 0xEA, 0xF1, 0xDB, 0xAE },
+    { 0xD5, 0xD4, 0x4F, 0xF7, 0x20, 0x68, 0x3D, 0x0D },
+    { 0x2A, 0x2B, 0xB0, 0x08, 0xDF, 0x97, 0xC2, 0xF2 }
 };
 
 static unsigned char cipher_ecb2[NUM_TESTS - 1][8] = {
-    {0x92, 0x95, 0xB5, 0x9B, 0xB3, 0x84, 0x73, 0x6E},
-    {0x19, 0x9E, 0x9D, 0x6D, 0xF3, 0x9A, 0xA8, 0x16},
-    {0x2A, 0x4B, 0x4D, 0x24, 0x52, 0x43, 0x84, 0x27},
-    {0x35, 0x84, 0x3C, 0x01, 0x9D, 0x18, 0xC5, 0xB6},
-    {0x4A, 0x5B, 0x2F, 0x42, 0xAA, 0x77, 0x19, 0x25},
-    {0xA0, 0x6B, 0xA9, 0xB8, 0xCA, 0x5B, 0x17, 0x8A},
-    {0xAB, 0x9D, 0xB7, 0xFB, 0xED, 0x95, 0xF2, 0x74},
-    {0x3D, 0x25, 0x6C, 0x23, 0xA7, 0x25, 0x2F, 0xD6},
-    {0xB7, 0x6F, 0xAB, 0x4F, 0xBD, 0xBD, 0xB7, 0x67},
-    {0x8F, 0x68, 0x27, 0xD6, 0x9C, 0xF4, 0x1A, 0x10},
-    {0x82, 0x57, 0xA1, 0xD6, 0x50, 0x5E, 0x81, 0x85},
-    {0xA2, 0x0F, 0x0A, 0xCD, 0x80, 0x89, 0x7D, 0xFA},
-    {0xCD, 0x2A, 0x53, 0x3A, 0xDB, 0x0D, 0x7E, 0xF3},
-    {0xD2, 0xC2, 0xBE, 0x27, 0xE8, 0x1B, 0x68, 0xE3},
-    {0xE9, 0x24, 0xCF, 0x4F, 0x89, 0x3C, 0x5B, 0x0A},
-    {0xA7, 0x18, 0xC3, 0x9F, 0xFA, 0x9F, 0xD7, 0x69},
-    {0x77, 0x2C, 0x79, 0xB1, 0xD2, 0x31, 0x7E, 0xB1},
-    {0x49, 0xAB, 0x92, 0x7F, 0xD0, 0x22, 0x00, 0xB7},
-    {0xCE, 0x1C, 0x6C, 0x7D, 0x85, 0xE3, 0x4A, 0x6F},
-    {0xBE, 0x91, 0xD6, 0xE1, 0x27, 0xB2, 0xE9, 0x87},
-    {0x70, 0x28, 0xAE, 0x8F, 0xD1, 0xF5, 0x74, 0x1A},
-    {0xAA, 0x37, 0x80, 0xBB, 0xF3, 0x22, 0x1D, 0xDE},
-    {0xA6, 0xC4, 0xD2, 0x5E, 0x28, 0x93, 0xAC, 0xB3},
-    {0x22, 0x07, 0x81, 0x5A, 0xE4, 0xB7, 0x1A, 0xAD},
-    {0xDC, 0xCE, 0x05, 0xE7, 0x07, 0xBD, 0xF5, 0x84},
-    {0x26, 0x1D, 0x39, 0x2C, 0xB3, 0xBA, 0xA5, 0x85},
-    {0xB4, 0xF7, 0x0F, 0x72, 0xFB, 0x04, 0xF0, 0xDC},
-    {0x95, 0xBA, 0xA9, 0x4E, 0x87, 0x36, 0xF2, 0x89},
-    {0xD4, 0x07, 0x3A, 0xF1, 0x5A, 0x17, 0x82, 0x0E},
-    {0xEF, 0x6F, 0xAF, 0xA7, 0x66, 0x1A, 0x7E, 0x89},
-    {0xC1, 0x97, 0xF5, 0x58, 0x74, 0x8A, 0x20, 0xE7},
-    {0x43, 0x34, 0xCF, 0xDA, 0x22, 0xC4, 0x86, 0xC8},
-    {0x08, 0xD7, 0xB4, 0xFB, 0x62, 0x9D, 0x08, 0x85}
+    { 0x92, 0x95, 0xB5, 0x9B, 0xB3, 0x84, 0x73, 0x6E },
+    { 0x19, 0x9E, 0x9D, 0x6D, 0xF3, 0x9A, 0xA8, 0x16 },
+    { 0x2A, 0x4B, 0x4D, 0x24, 0x52, 0x43, 0x84, 0x27 },
+    { 0x35, 0x84, 0x3C, 0x01, 0x9D, 0x18, 0xC5, 0xB6 },
+    { 0x4A, 0x5B, 0x2F, 0x42, 0xAA, 0x77, 0x19, 0x25 },
+    { 0xA0, 0x6B, 0xA9, 0xB8, 0xCA, 0x5B, 0x17, 0x8A },
+    { 0xAB, 0x9D, 0xB7, 0xFB, 0xED, 0x95, 0xF2, 0x74 },
+    { 0x3D, 0x25, 0x6C, 0x23, 0xA7, 0x25, 0x2F, 0xD6 },
+    { 0xB7, 0x6F, 0xAB, 0x4F, 0xBD, 0xBD, 0xB7, 0x67 },
+    { 0x8F, 0x68, 0x27, 0xD6, 0x9C, 0xF4, 0x1A, 0x10 },
+    { 0x82, 0x57, 0xA1, 0xD6, 0x50, 0x5E, 0x81, 0x85 },
+    { 0xA2, 0x0F, 0x0A, 0xCD, 0x80, 0x89, 0x7D, 0xFA },
+    { 0xCD, 0x2A, 0x53, 0x3A, 0xDB, 0x0D, 0x7E, 0xF3 },
+    { 0xD2, 0xC2, 0xBE, 0x27, 0xE8, 0x1B, 0x68, 0xE3 },
+    { 0xE9, 0x24, 0xCF, 0x4F, 0x89, 0x3C, 0x5B, 0x0A },
+    { 0xA7, 0x18, 0xC3, 0x9F, 0xFA, 0x9F, 0xD7, 0x69 },
+    { 0x77, 0x2C, 0x79, 0xB1, 0xD2, 0x31, 0x7E, 0xB1 },
+    { 0x49, 0xAB, 0x92, 0x7F, 0xD0, 0x22, 0x00, 0xB7 },
+    { 0xCE, 0x1C, 0x6C, 0x7D, 0x85, 0xE3, 0x4A, 0x6F },
+    { 0xBE, 0x91, 0xD6, 0xE1, 0x27, 0xB2, 0xE9, 0x87 },
+    { 0x70, 0x28, 0xAE, 0x8F, 0xD1, 0xF5, 0x74, 0x1A },
+    { 0xAA, 0x37, 0x80, 0xBB, 0xF3, 0x22, 0x1D, 0xDE },
+    { 0xA6, 0xC4, 0xD2, 0x5E, 0x28, 0x93, 0xAC, 0xB3 },
+    { 0x22, 0x07, 0x81, 0x5A, 0xE4, 0xB7, 0x1A, 0xAD },
+    { 0xDC, 0xCE, 0x05, 0xE7, 0x07, 0xBD, 0xF5, 0x84 },
+    { 0x26, 0x1D, 0x39, 0x2C, 0xB3, 0xBA, 0xA5, 0x85 },
+    { 0xB4, 0xF7, 0x0F, 0x72, 0xFB, 0x04, 0xF0, 0xDC },
+    { 0x95, 0xBA, 0xA9, 0x4E, 0x87, 0x36, 0xF2, 0x89 },
+    { 0xD4, 0x07, 0x3A, 0xF1, 0x5A, 0x17, 0x82, 0x0E },
+    { 0xEF, 0x6F, 0xAF, 0xA7, 0x66, 0x1A, 0x7E, 0x89 },
+    { 0xC1, 0x97, 0xF5, 0x58, 0x74, 0x8A, 0x20, 0xE7 },
+    { 0x43, 0x34, 0xCF, 0xDA, 0x22, 0xC4, 0x86, 0xC8 },
+    { 0x08, 0xD7, 0xB4, 0xFB, 0x62, 0x9D, 0x08, 0x85 }
 };
 
 static unsigned char cbc_key[8] = {
@@ -195,11 +195,46 @@ static unsigned char cbc_iv[8] = {
  */
 /* static char cbc_data[40]="7654321 Now is the time for \0001"; */
 static unsigned char cbc_data[40] = {
-    0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x20,
-    0x4E, 0x6F, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74,
-    0x68, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x20,
-    0x66, 0x6F, 0x72, 0x20, 0x00, 0x31, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x37,
+    0x36,
+    0x35,
+    0x34,
+    0x33,
+    0x32,
+    0x31,
+    0x20,
+    0x4E,
+    0x6F,
+    0x77,
+    0x20,
+    0x69,
+    0x73,
+    0x20,
+    0x74,
+    0x68,
+    0x65,
+    0x20,
+    0x74,
+    0x69,
+    0x6D,
+    0x65,
+    0x20,
+    0x66,
+    0x6F,
+    0x72,
+    0x20,
+    0x00,
+    0x31,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
 };
 
 static unsigned char cbc_ok[32] = {
@@ -209,26 +244,82 @@ static unsigned char cbc_ok[32] = {
     0x1d, 0x26, 0x93, 0x97, 0xf7, 0xfe, 0x62, 0xb4
 };
 
-# ifdef SCREW_THE_PARITY
-#  error "SCREW_THE_PARITY is not meant to be defined."
-#  error "Original vectors are preserved for reference only."
+#ifdef SCREW_THE_PARITY
+#error "SCREW_THE_PARITY is not meant to be defined."
+#error "Original vectors are preserved for reference only."
 static unsigned char cbc2_key[8] = {
     0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87
 };
 static unsigned char xcbc_ok[32] = {
-    0x86, 0x74, 0x81, 0x0D, 0x61, 0xA4, 0xA5, 0x48,
-    0xB9, 0x93, 0x03, 0xE1, 0xB8, 0xBB, 0xBD, 0xBD,
-    0x64, 0x30, 0x0B, 0xB9, 0x06, 0x65, 0x81, 0x76,
-    0x04, 0x1D, 0x77, 0x62, 0x17, 0xCA, 0x2B, 0xD2,
+    0x86,
+    0x74,
+    0x81,
+    0x0D,
+    0x61,
+    0xA4,
+    0xA5,
+    0x48,
+    0xB9,
+    0x93,
+    0x03,
+    0xE1,
+    0xB8,
+    0xBB,
+    0xBD,
+    0xBD,
+    0x64,
+    0x30,
+    0x0B,
+    0xB9,
+    0x06,
+    0x65,
+    0x81,
+    0x76,
+    0x04,
+    0x1D,
+    0x77,
+    0x62,
+    0x17,
+    0xCA,
+    0x2B,
+    0xD2,
 };
-# else
+#else
 static unsigned char xcbc_ok[32] = {
-    0x84, 0x6B, 0x29, 0x14, 0x85, 0x1E, 0x9A, 0x29,
-    0x54, 0x73, 0x2F, 0x8A, 0xA0, 0xA6, 0x11, 0xC1,
-    0x15, 0xCD, 0xC2, 0xD7, 0x95, 0x1B, 0x10, 0x53,
-    0xA6, 0x3C, 0x5E, 0x03, 0xB2, 0x1A, 0xA3, 0xC4,
+    0x84,
+    0x6B,
+    0x29,
+    0x14,
+    0x85,
+    0x1E,
+    0x9A,
+    0x29,
+    0x54,
+    0x73,
+    0x2F,
+    0x8A,
+    0xA0,
+    0xA6,
+    0x11,
+    0xC1,
+    0x15,
+    0xCD,
+    0xC2,
+    0xD7,
+    0x95,
+    0x1B,
+    0x10,
+    0x53,
+    0xA6,
+    0x3C,
+    0x5E,
+    0x03,
+    0xB2,
+    0x1A,
+    0xA3,
+    0xC4,
 };
-# endif
+#endif
 
 static unsigned char cbc3_ok[32] = {
     0x3F, 0xE3, 0x01, 0xC9, 0x62, 0xAC, 0x01, 0xD0,
@@ -330,12 +421,12 @@ static int test_des_ecb(int i)
 
     if (!TEST_mem_eq(out, 8, cipher_data[i], 8)) {
         TEST_info("Encryption error %2d k=%s p=%s", i + 1,
-                  pt(key_data[i], b1), pt(in, b2));
+            pt(key_data[i], b1), pt(in, b2));
         return 0;
     }
     if (!TEST_mem_eq(in, 8, outin, 8)) {
         TEST_info("Decryption error %2d k=%s p=%s", i + 1,
-                  pt(key_data[i], b1), pt(out, b2));
+            pt(key_data[i], b1), pt(out, b2));
         return 0;
     }
     return 1;
@@ -358,12 +449,12 @@ static int test_des_ede_ecb(int i)
 
     if (!TEST_mem_eq(out, 8, cipher_ecb2[i], 8)) {
         TEST_info("Encryption error %2d k=%s p=%s", i + 1,
-                  pt(key_data[i], b1), pt(in, b2));
+            pt(key_data[i], b1), pt(in, b2));
         return 0;
     }
     if (!TEST_mem_eq(in, 8, outin, 8)) {
         TEST_info("Decryption error %2d k=%s p=%s ", i + 1,
-                  pt(key_data[i], b1), pt(out, b2));
+            pt(key_data[i], b1), pt(out, b2));
         return 0;
     }
     return 1;
@@ -383,13 +474,13 @@ static int test_des_cbc(void)
     memset(cbc_in, 0, sizeof(cbc_in));
     memcpy(iv3, cbc_iv, sizeof(cbc_iv));
     DES_ncbc_encrypt(cbc_data, cbc_out, cbc_data_len + 1, &ks,
-                     &iv3, DES_ENCRYPT);
+        &iv3, DES_ENCRYPT);
     if (!TEST_mem_eq(cbc_out, 32, cbc_ok, 32))
         return 0;
 
     memcpy(iv3, cbc_iv, sizeof(cbc_iv));
     DES_ncbc_encrypt(cbc_out, cbc_in, cbc_data_len + 1, &ks,
-                     &iv3, DES_DECRYPT);
+        &iv3, DES_DECRYPT);
     return TEST_mem_eq(cbc_in, cbc_data_len, cbc_data, cbc_data_len);
 }
 
@@ -407,12 +498,12 @@ static int test_des_ede_cbc(void)
     memset(cbc_in, 0, sizeof(cbc_in));
     memcpy(iv3, cbc_iv, sizeof(cbc_iv));
     DES_xcbc_encrypt(cbc_data, cbc_out, n, &ks, &iv3, &cbc2_key, &cbc3_key,
-                     DES_ENCRYPT);
+        DES_ENCRYPT);
     if (!TEST_mem_eq(cbc_out, sizeof(xcbc_ok), xcbc_ok, sizeof(xcbc_ok)))
         return 0;
     memcpy(iv3, cbc_iv, sizeof(cbc_iv));
     DES_xcbc_encrypt(cbc_out, cbc_in, n, &ks, &iv3, &cbc2_key, &cbc3_key,
-                     DES_DECRYPT);
+        DES_DECRYPT);
     return TEST_mem_eq(cbc_data, n, cbc_data, n);
 }
 
@@ -436,15 +527,15 @@ static int test_ede_cbc(void)
     memcpy(iv3, cbc_iv, sizeof(cbc_iv));
 
     DES_ede3_cbc_encrypt(cbc_data, cbc_out, 16L, &ks, &ks2, &ks3, &iv3,
-                         DES_ENCRYPT);
+        DES_ENCRYPT);
     DES_ede3_cbc_encrypt(&cbc_data[16], &cbc_out[16], i - 16, &ks, &ks2,
-                         &ks3, &iv3, DES_ENCRYPT);
+        &ks3, &iv3, DES_ENCRYPT);
     if (!TEST_mem_eq(cbc_out, n, cbc3_ok, n))
         return 0;
 
     memcpy(iv3, cbc_iv, sizeof(cbc_iv));
     DES_ede3_cbc_encrypt(cbc_out, cbc_in, i, &ks, &ks2, &ks3, &iv3,
-                         DES_DECRYPT);
+        DES_DECRYPT);
     return TEST_mem_eq(cbc_in, i, cbc_data, i);
 }
 
@@ -506,11 +597,11 @@ static int test_des_pcbc(void)
     memset(cbc_out, 0, sizeof(cbc_out));
     memset(cbc_in, 0, sizeof(cbc_in));
     DES_pcbc_encrypt(cbc_data, cbc_out, n, &ks,
-                     &cbc_iv, DES_ENCRYPT);
+        &cbc_iv, DES_ENCRYPT);
     if (!TEST_mem_eq(cbc_out, sizeof(pcbc_ok), pcbc_ok, sizeof(pcbc_ok)))
         return 0;
     DES_pcbc_encrypt(cbc_out, cbc_in, n, &ks,
-                     &cbc_iv, DES_DECRYPT);
+        &cbc_iv, DES_DECRYPT);
     return TEST_mem_eq(cbc_in, n, cbc_data, n);
 }
 
@@ -521,12 +612,12 @@ static int cfb_test(int bits, unsigned char *cfb_cipher)
     DES_set_key_checked(&cfb_key, &ks);
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     DES_cfb_encrypt(plain, cfb_buf1, bits, sizeof(plain), &ks, &cfb_tmp,
-                    DES_ENCRYPT);
+        DES_ENCRYPT);
     if (!TEST_mem_eq(cfb_cipher, sizeof(plain), cfb_buf1, sizeof(plain)))
         return 0;
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     DES_cfb_encrypt(cfb_buf1, cfb_buf2, bits, sizeof(plain), &ks, &cfb_tmp,
-                    DES_DECRYPT);
+        DES_DECRYPT);
     return TEST_mem_eq(plain, sizeof(plain), cfb_buf2, sizeof(plain));
 }
 
@@ -564,28 +655,28 @@ static int test_des_cfb64(void)
     n = 0;
     DES_cfb64_encrypt(plain, cfb_buf1, 12, &ks, &cfb_tmp, &n, DES_ENCRYPT);
     DES_cfb64_encrypt(&plain[12], &cfb_buf1[12], sizeof(plain) - 12, &ks,
-                      &cfb_tmp, &n, DES_ENCRYPT);
+        &cfb_tmp, &n, DES_ENCRYPT);
     if (!TEST_mem_eq(cfb_cipher64, sizeof(plain), cfb_buf1, sizeof(plain)))
         return 0;
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     n = 0;
     DES_cfb64_encrypt(cfb_buf1, cfb_buf2, 17, &ks, &cfb_tmp, &n, DES_DECRYPT);
     DES_cfb64_encrypt(&cfb_buf1[17], &cfb_buf2[17],
-                      sizeof(plain) - 17, &ks, &cfb_tmp, &n, DES_DECRYPT);
+        sizeof(plain) - 17, &ks, &cfb_tmp, &n, DES_DECRYPT);
     if (!TEST_mem_eq(plain, sizeof(plain), cfb_buf2, sizeof(plain)))
         return 0;
 
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     for (i = 0; i < sizeof(plain); i++)
         DES_cfb_encrypt(&plain[i], &cfb_buf1[i], 8, 1, &ks, &cfb_tmp,
-                        DES_ENCRYPT);
+            DES_ENCRYPT);
     if (!TEST_mem_eq(cfb_cipher8, sizeof(plain), cfb_buf1, sizeof(plain)))
         return 0;
 
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     for (i = 0; i < sizeof(plain); i++)
         DES_cfb_encrypt(&cfb_buf1[i], &cfb_buf2[i], 8, 1, &ks, &cfb_tmp,
-                        DES_DECRYPT);
+            DES_DECRYPT);
     return TEST_mem_eq(plain, sizeof(plain), cfb_buf2, sizeof(plain));
 }
 
@@ -598,17 +689,17 @@ static int test_des_ede_cfb64(void)
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     n = 0;
     DES_ede3_cfb64_encrypt(plain, cfb_buf1, 12, &ks, &ks, &ks, &cfb_tmp, &n,
-                           DES_ENCRYPT);
+        DES_ENCRYPT);
     DES_ede3_cfb64_encrypt(&plain[12], &cfb_buf1[12], sizeof(plain) - 12, &ks,
-                           &ks, &ks, &cfb_tmp, &n, DES_ENCRYPT);
+        &ks, &ks, &cfb_tmp, &n, DES_ENCRYPT);
     if (!TEST_mem_eq(cfb_cipher64, sizeof(plain), cfb_buf1, sizeof(plain)))
         return 0;
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_iv));
     n = 0;
     DES_ede3_cfb64_encrypt(cfb_buf1, cfb_buf2, (long)17, &ks, &ks, &ks,
-                           &cfb_tmp, &n, DES_DECRYPT);
+        &cfb_tmp, &n, DES_DECRYPT);
     DES_ede3_cfb64_encrypt(&cfb_buf1[17], &cfb_buf2[17], sizeof(plain) - 17,
-                           &ks, &ks, &ks, &cfb_tmp, &n, DES_DECRYPT);
+        &ks, &ks, &ks, &cfb_tmp, &n, DES_DECRYPT);
     return TEST_mem_eq(plain, sizeof(plain), cfb_buf2, sizeof(plain));
 }
 
@@ -624,7 +715,7 @@ static int test_des_ofb(void)
 
     memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
     DES_ofb_encrypt(ofb_buf1, ofb_buf2, 64, sizeof(ofb_buf1) / 8, &ks,
-                    &ofb_tmp);
+        &ofb_tmp);
     return TEST_mem_eq(plain, sizeof(ofb_buf2), ofb_buf2, sizeof(ofb_buf2));
 }
 
@@ -647,7 +738,7 @@ static int test_des_ofb64(void)
     memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
     num = 0;
     DES_ofb64_encrypt(ofb_buf1, ofb_buf2, sizeof(ofb_buf1), &ks, &ofb_tmp,
-                      &num);
+        &num);
     return TEST_mem_eq(plain, sizeof(ofb_buf2), ofb_buf2, sizeof(ofb_buf2));
 }
 
@@ -664,14 +755,14 @@ static int test_des_ede_ofb64(void)
     num = 0;
     for (i = 0; i < sizeof(plain); i++) {
         DES_ede3_ofb64_encrypt(&plain[i], &ofb_buf1[i], 1, &ks, &ks,
-                               &ks, &ofb_tmp, &num);
+            &ks, &ofb_tmp, &num);
     }
     if (!TEST_mem_eq(ofb_cipher, sizeof(ofb_buf1), ofb_buf1, sizeof(ofb_buf1)))
         return 0;
     memcpy(ofb_tmp, ofb_iv, sizeof(ofb_iv));
     num = 0;
     DES_ede3_ofb64_encrypt(ofb_buf1, ofb_buf2, sizeof(ofb_buf1), &ks, &ks, &ks,
-                           &ofb_tmp, &num);
+        &ofb_tmp, &num);
     return TEST_mem_eq(plain, sizeof(ofb_buf2), ofb_buf2, sizeof(ofb_buf2));
 }
 
@@ -683,7 +774,7 @@ static int test_des_cbc_cksum(void)
 
     DES_set_key_checked(&cbc_key, &ks);
     cs = DES_cbc_cksum(cbc_data, &cret, strlen((char *)cbc_data), &ks,
-                       &cbc_iv);
+        &cbc_iv);
     if (!TEST_cs_eq(cs, cbc_cksum_ret))
         return 0;
     return TEST_mem_eq(cret, 8, cbc_cksum_data, 8);
@@ -694,8 +785,8 @@ static int test_des_quad_cksum(void)
     DES_LONG cs, lqret[4];
 
     cs = DES_quad_cksum(cbc_data, (DES_cblock *)lqret,
-                        (long)strlen((char *)cbc_data), 2,
-                        (DES_cblock *)cbc_iv);
+        (long)strlen((char *)cbc_data), 2,
+        (DES_cblock *)cbc_iv);
     if (!TEST_cs_eq(cs, 0x70d7a63aL))
         return 0;
     if (!TEST_cs_eq(lqret[0], 0x327eba8dL))
@@ -729,11 +820,11 @@ static int test_des_key_wrap(int idx)
 
     /* Some sanity checks and cipher loading */
     if (!TEST_size_t_le(in_bytes, sizeof(in))
-            || !TEST_ptr(cipher = EVP_CIPHER_fetch(NULL, "DES3-WRAP", NULL))
-            || !TEST_int_eq(bs = EVP_CIPHER_get_block_size(cipher), 8)
-            || !TEST_size_t_eq(bs * 3u, sizeof(key))
-            || !TEST_true(in_bytes % bs == 0)
-            || !TEST_ptr(ctx = EVP_CIPHER_CTX_new()))
+        || !TEST_ptr(cipher = EVP_CIPHER_fetch(NULL, "DES3-WRAP", NULL))
+        || !TEST_int_eq(bs = EVP_CIPHER_get_block_size(cipher), 8)
+        || !TEST_size_t_eq(bs * 3u, sizeof(key))
+        || !TEST_true(in_bytes % bs == 0)
+        || !TEST_ptr(ctx = EVP_CIPHER_CTX_new()))
         goto err;
 
     /* Create random data to end to end test */
@@ -748,8 +839,8 @@ static int test_des_key_wrap(int idx)
     /* Wrap / encrypt the key */
     clen_upd = sizeof(c_txt);
     if (!TEST_true(EVP_EncryptInit(ctx, cipher, key, NULL))
-            || !TEST_true(EVP_EncryptUpdate(ctx, c_txt, &clen_upd,
-                                            in, in_bytes)))
+        || !TEST_true(EVP_EncryptUpdate(ctx, c_txt, &clen_upd,
+            in, in_bytes)))
         goto err;
 
     expect = (in_bytes + (bs - 1)) / bs * bs + 2 * bs;
@@ -758,15 +849,15 @@ static int test_des_key_wrap(int idx)
 
     clen_fin = sizeof(c_txt) - clen_upd;
     if (!TEST_true(EVP_EncryptFinal(ctx, c_txt + clen_upd, &clen_fin))
-            || !TEST_int_eq(clen_fin, 0))
+        || !TEST_int_eq(clen_fin, 0))
         goto err;
     clen = clen_upd + clen_fin;
 
     /* Decrypt the wrapped key */
     plen_upd = sizeof(p_txt);
     if (!TEST_true(EVP_DecryptInit(ctx, cipher, key, NULL))
-            || !TEST_true(EVP_DecryptUpdate(ctx, p_txt, &plen_upd,
-                                            c_txt, clen)))
+        || !TEST_true(EVP_DecryptUpdate(ctx, p_txt, &plen_upd,
+            c_txt, clen)))
         goto err;
     plen_fin = sizeof(p_txt) - plen_upd;
     if (!TEST_true(EVP_DecryptFinal(ctx, p_txt + plen_upd, &plen_fin)))
@@ -776,7 +867,7 @@ static int test_des_key_wrap(int idx)
     if (!TEST_mem_eq(in, in_bytes, p_txt, plen))
         goto err;
     res = 1;
- err:
+err:
     EVP_CIPHER_free(cipher);
     EVP_CIPHER_CTX_free(ctx);
     return res;
@@ -795,25 +886,25 @@ static struct {
     int expect;
 } weak_keys[] = {
     /* weak keys */
-    {{0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, 1 },
-    {{0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE}, 1 },
-    {{0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E}, 1 },
-    {{0xE0, 0xE0, 0xE0, 0xE0, 0xF1, 0xF1, 0xF1, 0xF1}, 1 },
+    { { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }, 1 },
+    { { 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE }, 1 },
+    { { 0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E }, 1 },
+    { { 0xE0, 0xE0, 0xE0, 0xE0, 0xF1, 0xF1, 0xF1, 0xF1 }, 1 },
     /* semi-weak keys */
-    {{0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE}, 1 },
-    {{0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01}, 1 },
-    {{0x1F, 0xE0, 0x1F, 0xE0, 0x0E, 0xF1, 0x0E, 0xF1}, 1 },
-    {{0xE0, 0x1F, 0xE0, 0x1F, 0xF1, 0x0E, 0xF1, 0x0E}, 1 },
-    {{0x01, 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1}, 1 },
-    {{0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1, 0x01}, 1 },
-    {{0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E, 0xFE}, 1 },
-    {{0xFE, 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E}, 1 },
-    {{0x01, 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E}, 1 },
-    {{0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E, 0x01}, 1 },
-    {{0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE}, 1 },
-    {{0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1}, 1 },
+    { { 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE }, 1 },
+    { { 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01, 0xFE, 0x01 }, 1 },
+    { { 0x1F, 0xE0, 0x1F, 0xE0, 0x0E, 0xF1, 0x0E, 0xF1 }, 1 },
+    { { 0xE0, 0x1F, 0xE0, 0x1F, 0xF1, 0x0E, 0xF1, 0x0E }, 1 },
+    { { 0x01, 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1 }, 1 },
+    { { 0xE0, 0x01, 0xE0, 0x01, 0xF1, 0x01, 0xF1, 0x01 }, 1 },
+    { { 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E, 0xFE }, 1 },
+    { { 0xFE, 0x1F, 0xFE, 0x1F, 0xFE, 0x0E, 0xFE, 0x0E }, 1 },
+    { { 0x01, 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E }, 1 },
+    { { 0x1F, 0x01, 0x1F, 0x01, 0x0E, 0x01, 0x0E, 0x01 }, 1 },
+    { { 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE }, 1 },
+    { { 0xFE, 0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1 }, 1 },
     /* good key */
-    {{0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF}, 0 }
+    { { 0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF }, 0 }
 };
 
 static int test_des_weak_keys(int n)
@@ -827,19 +918,19 @@ static struct {
     const DES_cblock key;
     int expect;
 } bad_parity_keys[] = {
-    {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 0 },
-    {{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, 0 },
+    { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0 },
+    { { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, 0 },
     /* Perturb each byte in turn to create even parity */
-    {{0x48, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF}, 0 },
-    {{0x49, 0xE8, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF}, 0 },
-    {{0x49, 0xE9, 0x5C, 0x6D, 0x4C, 0xA2, 0x29, 0xBF}, 0 },
-    {{0x49, 0xE9, 0x5D, 0x7D, 0x4C, 0xA2, 0x29, 0xBF}, 0 },
-    {{0x49, 0xE9, 0x5D, 0x6D, 0x5C, 0xA2, 0x29, 0xBF}, 0 },
-    {{0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA3, 0x29, 0xBF}, 0 },
-    {{0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x39, 0xBF}, 0 },
-    {{0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBE}, 0 },
+    { { 0x48, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF }, 0 },
+    { { 0x49, 0xE8, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF }, 0 },
+    { { 0x49, 0xE9, 0x5C, 0x6D, 0x4C, 0xA2, 0x29, 0xBF }, 0 },
+    { { 0x49, 0xE9, 0x5D, 0x7D, 0x4C, 0xA2, 0x29, 0xBF }, 0 },
+    { { 0x49, 0xE9, 0x5D, 0x6D, 0x5C, 0xA2, 0x29, 0xBF }, 0 },
+    { { 0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA3, 0x29, 0xBF }, 0 },
+    { { 0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x39, 0xBF }, 0 },
+    { { 0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBE }, 0 },
     /* Odd parity version of above */
-    {{0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF}, 1 }
+    { { 0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF }, 1 }
 };
 
 static int test_des_check_bad_parity(int n)
@@ -858,14 +949,14 @@ static int test_des_two_key(void)
     unsigned char key[16];
 
     if (!TEST_ptr(cipher = EVP_CIPHER_fetch(NULL, "DES-EDE-ECB", NULL))
-            || !TEST_ptr(ctx = EVP_CIPHER_CTX_new())
-            || !EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, 1)
-            || !EVP_CIPHER_CTX_set_key_length(ctx, sizeof(key))
-            || !EVP_CIPHER_CTX_rand_key(ctx, key))
+        || !TEST_ptr(ctx = EVP_CIPHER_CTX_new())
+        || !EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, 1)
+        || !EVP_CIPHER_CTX_set_key_length(ctx, sizeof(key))
+        || !EVP_CIPHER_CTX_rand_key(ctx, key))
         goto err;
 
     res = 1;
- err:
+err:
     EVP_CIPHER_free(cipher);
     EVP_CIPHER_CTX_free(ctx);
     return res;
diff --git a/test/dhtest.c b/test/dhtest.c
index bef706909c734..839d7ff83dace 100644
--- a/test/dhtest.c
+++ b/test/dhtest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -28,9 +28,9 @@
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_DH
-# include <openssl/dh.h>
-# include "crypto/bn_dh.h"
-# include "crypto/dh.h"
+#include <openssl/dh.h>
+#include "crypto/bn_dh.h"
+#include "crypto/dh.h"
 
 static int cb(int p, int n, BN_GENCB *arg);
 
@@ -77,15 +77,15 @@ static int dh_test(void)
         goto err2;
     i ^= DH_MODULUS_TOO_SMALL;
     if (!TEST_false(i & DH_CHECK_P_NOT_PRIME)
-            || !TEST_false(i & DH_CHECK_P_NOT_SAFE_PRIME)
-            || !TEST_false(i & DH_UNABLE_TO_CHECK_GENERATOR)
-            || !TEST_false(i & DH_NOT_SUITABLE_GENERATOR)
-            || !TEST_false(i & DH_CHECK_Q_NOT_PRIME)
-            || !TEST_false(i & DH_CHECK_INVALID_Q_VALUE)
-            || !TEST_false(i & DH_CHECK_INVALID_J_VALUE)
-            || !TEST_false(i & DH_MODULUS_TOO_SMALL)
-            || !TEST_false(i & DH_MODULUS_TOO_LARGE)
-            || !TEST_false(i))
+        || !TEST_false(i & DH_CHECK_P_NOT_SAFE_PRIME)
+        || !TEST_false(i & DH_UNABLE_TO_CHECK_GENERATOR)
+        || !TEST_false(i & DH_NOT_SUITABLE_GENERATOR)
+        || !TEST_false(i & DH_CHECK_Q_NOT_PRIME)
+        || !TEST_false(i & DH_CHECK_INVALID_Q_VALUE)
+        || !TEST_false(i & DH_CHECK_INVALID_J_VALUE)
+        || !TEST_false(i & DH_MODULUS_TOO_SMALL)
+        || !TEST_false(i & DH_MODULUS_TOO_LARGE)
+        || !TEST_false(i))
         goto err2;
 
     /* test the combined getter for p, q, and g */
@@ -135,7 +135,7 @@ static int dh_test(void)
 
     /* Modulus of size: dh check max modulus bits + 1 */
     if (!TEST_true(BN_set_word(p, 1))
-            || !TEST_true(BN_lshift(p, p, OPENSSL_DH_CHECK_MAX_MODULUS_BITS)))
+        || !TEST_true(BN_lshift(p, p, OPENSSL_DH_CHECK_MAX_MODULUS_BITS)))
         goto err3;
 
     /*
@@ -156,23 +156,23 @@ static int dh_test(void)
         goto err3;
     BN_GENCB_set(_cb, &cb, NULL);
     if (!TEST_ptr(a = DH_new())
-            || !TEST_true(DH_generate_parameters_ex(a, 512,
-                                                    DH_GENERATOR_5, _cb)))
+        || !TEST_true(DH_generate_parameters_ex(a, 512,
+            DH_GENERATOR_5, _cb)))
         goto err3;
 
     /* ... and check whether it is valid */
     if (!TEST_true(DH_check(a, &i)))
         goto err3;
     if (!TEST_false(i & DH_CHECK_P_NOT_PRIME)
-            || !TEST_false(i & DH_CHECK_P_NOT_SAFE_PRIME)
-            || !TEST_false(i & DH_UNABLE_TO_CHECK_GENERATOR)
-            || !TEST_false(i & DH_NOT_SUITABLE_GENERATOR)
-            || !TEST_false(i & DH_CHECK_Q_NOT_PRIME)
-            || !TEST_false(i & DH_CHECK_INVALID_Q_VALUE)
-            || !TEST_false(i & DH_CHECK_INVALID_J_VALUE)
-            || !TEST_false(i & DH_MODULUS_TOO_SMALL)
-            || !TEST_false(i & DH_MODULUS_TOO_LARGE)
-            || !TEST_false(i))
+        || !TEST_false(i & DH_CHECK_P_NOT_SAFE_PRIME)
+        || !TEST_false(i & DH_UNABLE_TO_CHECK_GENERATOR)
+        || !TEST_false(i & DH_NOT_SUITABLE_GENERATOR)
+        || !TEST_false(i & DH_CHECK_Q_NOT_PRIME)
+        || !TEST_false(i & DH_CHECK_INVALID_Q_VALUE)
+        || !TEST_false(i & DH_CHECK_INVALID_J_VALUE)
+        || !TEST_false(i & DH_MODULUS_TOO_SMALL)
+        || !TEST_false(i & DH_MODULUS_TOO_LARGE)
+        || !TEST_false(i))
         goto err3;
 
     DH_get0_pqg(a, &ap, NULL, &ag);
@@ -182,8 +182,8 @@ static int dh_test(void)
         goto err3;
 
     if (!TEST_ptr(bp = BN_dup(ap))
-            || !TEST_ptr(bg = BN_dup(ag))
-            || !TEST_true(DH_set0_pqg(b, bp, NULL, bg)))
+        || !TEST_ptr(bg = BN_dup(ag))
+        || !TEST_true(DH_set0_pqg(b, bp, NULL, bg)))
         goto err3;
     bp = bg = NULL;
 
@@ -201,44 +201,44 @@ static int dh_test(void)
 
     /* Also test with a private-key-only copy of |b|. */
     if (!TEST_ptr(c = DHparams_dup(b))
-            || !TEST_ptr(cpriv_key = BN_dup(bpriv_key))
-            || !TEST_true(DH_set0_key(c, NULL, cpriv_key)))
+        || !TEST_ptr(cpriv_key = BN_dup(bpriv_key))
+        || !TEST_true(DH_set0_key(c, NULL, cpriv_key)))
         goto err3;
     cpriv_key = NULL;
 
     alen = DH_size(a);
     if (!TEST_ptr(abuf = OPENSSL_malloc(alen))
-            || !TEST_true((aout = DH_compute_key(abuf, bpub_key, a)) != -1))
+        || !TEST_int_gt((aout = DH_compute_key(abuf, bpub_key, a)), 0))
         goto err3;
 
     blen = DH_size(b);
     if (!TEST_ptr(bbuf = OPENSSL_malloc(blen))
-            || !TEST_true((bout = DH_compute_key(bbuf, apub_key, b)) != -1))
+        || !TEST_int_gt((bout = DH_compute_key(bbuf, apub_key, b)), 0))
         goto err3;
 
     clen = DH_size(c);
     if (!TEST_ptr(cbuf = OPENSSL_malloc(clen))
-            || !TEST_true((cout = DH_compute_key(cbuf, apub_key, c)) != -1))
+        || !TEST_int_gt((cout = DH_compute_key(cbuf, apub_key, c)), 0))
         goto err3;
 
     if (!TEST_true(aout >= 20)
-            || !TEST_mem_eq(abuf, aout, bbuf, bout)
-            || !TEST_mem_eq(abuf, aout, cbuf, cout))
+        || !TEST_mem_eq(abuf, aout, bbuf, bout)
+        || !TEST_mem_eq(abuf, aout, cbuf, cout))
         goto err3;
 
     ret = 1;
     goto success;
 
- err1:
+err1:
     /* an error occurred before p,q,g were assigned to dh */
     BN_free(p);
     BN_free(q);
     BN_free(g);
- err2:
+err2:
     /* an error occurred before priv_key was assigned to dh */
     BN_free(priv_key);
- err3:
- success:
+err3:
+success:
     OPENSSL_free(abuf);
     OPENSSL_free(bbuf);
     OPENSSL_free(cbuf);
@@ -546,7 +546,7 @@ static const unsigned char dhtest_2048_256_Z[] = {
 };
 
 typedef struct {
-    DH *(*get_param) (void);
+    DH *(*get_param)(void);
     const unsigned char *xA;
     size_t xA_len;
     const unsigned char *yA;
@@ -559,19 +559,19 @@ typedef struct {
     size_t Z_len;
 } rfc5114_td;
 
-# define make_rfc5114_td(pre) { \
-        DH_get_##pre, \
-        dhtest_##pre##_xA, sizeof(dhtest_##pre##_xA), \
-        dhtest_##pre##_yA, sizeof(dhtest_##pre##_yA), \
-        dhtest_##pre##_xB, sizeof(dhtest_##pre##_xB), \
-        dhtest_##pre##_yB, sizeof(dhtest_##pre##_yB), \
-        dhtest_##pre##_Z, sizeof(dhtest_##pre##_Z) \
-        }
+#define make_rfc5114_td(pre) {                    \
+    DH_get_##pre,                                 \
+    dhtest_##pre##_xA, sizeof(dhtest_##pre##_xA), \
+    dhtest_##pre##_yA, sizeof(dhtest_##pre##_yA), \
+    dhtest_##pre##_xB, sizeof(dhtest_##pre##_xB), \
+    dhtest_##pre##_yB, sizeof(dhtest_##pre##_yB), \
+    dhtest_##pre##_Z, sizeof(dhtest_##pre##_Z)    \
+}
 
 static const rfc5114_td rfctd[] = {
-        make_rfc5114_td(1024_160),
-        make_rfc5114_td(2048_224),
-        make_rfc5114_td(2048_256)
+    make_rfc5114_td(1024_160),
+    make_rfc5114_td(2048_224),
+    make_rfc5114_td(2048_256)
 };
 
 static int rfc5114_test(void)
@@ -590,28 +590,28 @@ static int rfc5114_test(void)
         td = rfctd + i;
         /* Set up DH structures setting key components */
         if (!TEST_ptr(dhA = td->get_param())
-                || !TEST_ptr(dhB = td->get_param()))
+            || !TEST_ptr(dhB = td->get_param()))
             goto bad_err;
 
         if (!TEST_ptr(priv_key = BN_bin2bn(td->xA, td->xA_len, NULL))
-                || !TEST_ptr(pub_key = BN_bin2bn(td->yA, td->yA_len, NULL))
-                || !TEST_true(DH_set0_key(dhA, pub_key, priv_key)))
+            || !TEST_ptr(pub_key = BN_bin2bn(td->yA, td->yA_len, NULL))
+            || !TEST_true(DH_set0_key(dhA, pub_key, priv_key)))
             goto bad_err;
 
         if (!TEST_ptr(priv_key = BN_bin2bn(td->xB, td->xB_len, NULL))
-                || !TEST_ptr(pub_key = BN_bin2bn(td->yB, td->yB_len, NULL))
-                || !TEST_true(DH_set0_key(dhB, pub_key, priv_key)))
+            || !TEST_ptr(pub_key = BN_bin2bn(td->yB, td->yB_len, NULL))
+            || !TEST_true(DH_set0_key(dhB, pub_key, priv_key)))
             goto bad_err;
         priv_key = pub_key = NULL;
 
         if (!TEST_int_gt(szA = DH_size(dhA), 0)
-                || !TEST_int_gt(szB = DH_size(dhB), 0)
-                || !TEST_size_t_eq(td->Z_len, (size_t)szA)
-                || !TEST_size_t_eq(td->Z_len, (size_t)szB))
+            || !TEST_int_gt(szB = DH_size(dhB), 0)
+            || !TEST_size_t_eq(td->Z_len, (size_t)szA)
+            || !TEST_size_t_eq(td->Z_len, (size_t)szB))
             goto err;
 
         if (!TEST_ptr(Z1 = OPENSSL_malloc((size_t)szA))
-                || !TEST_ptr(Z2 = OPENSSL_malloc((size_t)szB)))
+            || !TEST_ptr(Z2 = OPENSSL_malloc((size_t)szB)))
             goto bad_err;
         /*
          * Work out shared secrets using both sides and compare with expected
@@ -626,7 +626,7 @@ static int rfc5114_test(void)
             goto bad_err;
 
         if (!TEST_mem_eq(Z1, td->Z_len, td->Z, td->Z_len)
-                || !TEST_mem_eq(Z2, td->Z_len, td->Z, td->Z_len))
+            || !TEST_mem_eq(Z2, td->Z_len, td->Z, td->Z_len))
             goto err;
 
         DH_free(dhA);
@@ -640,7 +640,7 @@ static int rfc5114_test(void)
     }
     return 1;
 
- bad_err:
+bad_err:
     DH_free(dhA);
     DH_free(dhB);
     BN_free(pub_key);
@@ -650,7 +650,7 @@ static int rfc5114_test(void)
     TEST_error("Initialisation error RFC5114 set %d\n", i + 1);
     return 0;
 
- err:
+err:
     DH_free(dhA);
     DH_free(dhB);
     OPENSSL_free(Z1);
@@ -669,15 +669,15 @@ static int rfc7919_test(void)
     int ret = 0;
 
     if (!TEST_ptr(a = DH_new_by_nid(NID_ffdhe2048)))
-         goto err;
+        goto err;
 
     if (!DH_check(a, &i))
         goto err;
     if (!TEST_false(i & DH_CHECK_P_NOT_PRIME)
-            || !TEST_false(i & DH_CHECK_P_NOT_SAFE_PRIME)
-            || !TEST_false(i & DH_UNABLE_TO_CHECK_GENERATOR)
-            || !TEST_false(i & DH_NOT_SUITABLE_GENERATOR)
-            || !TEST_false(i))
+        || !TEST_false(i & DH_CHECK_P_NOT_SAFE_PRIME)
+        || !TEST_false(i & DH_UNABLE_TO_CHECK_GENERATOR)
+        || !TEST_false(i & DH_NOT_SUITABLE_GENERATOR)
+        || !TEST_false(i))
         goto err;
 
     if (!DH_generate_key(a))
@@ -694,21 +694,21 @@ static int rfc7919_test(void)
 
     alen = DH_size(a);
     if (!TEST_int_gt(alen, 0) || !TEST_ptr(abuf = OPENSSL_malloc(alen))
-            || !TEST_true((aout = DH_compute_key(abuf, bpub_key, a)) != -1))
+        || !TEST_int_gt((aout = DH_compute_key(abuf, bpub_key, a)), 0))
         goto err;
 
     blen = DH_size(b);
     if (!TEST_int_gt(blen, 0) || !TEST_ptr(bbuf = OPENSSL_malloc(blen))
-            || !TEST_true((bout = DH_compute_key(bbuf, apub_key, b)) != -1))
+        || !TEST_int_gt((bout = DH_compute_key(bbuf, apub_key, b)), 0))
         goto err;
 
     if (!TEST_true(aout >= 20)
-            || !TEST_mem_eq(abuf, aout, bbuf, bout))
+        || !TEST_mem_eq(abuf, aout, bbuf, bout))
         goto err;
 
     ret = 1;
 
- err:
+err:
     OPENSSL_free(abuf);
     OPENSSL_free(bbuf);
     DH_free(a);
@@ -835,9 +835,9 @@ static int dh_get_nid(void)
 
     /* Test that after changing g it is no longer a named group */
     if (!TEST_ptr(gcpy = BN_dup(BN_value_one())))
-       goto err;
+        goto err;
     if (!TEST_true(DH_set0_pqg(dh2, NULL, NULL, gcpy)))
-       goto err;
+        goto err;
     gcpy = NULL;
     if (!TEST_int_eq(DH_get_nid(dh2), NID_undef))
         goto err;
@@ -924,10 +924,10 @@ static int dh_load_pkcs3_namedgroup_privlen_test(void)
     const unsigned char *p = dh_pub_der;
 
     ret = TEST_ptr(pkey = d2i_PUBKEY_ex(NULL, &p, sizeof(dh_pub_der),
-                                        NULL, NULL))
-          && TEST_true(EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_DH_PRIV_LEN,
-                                              &privlen))
-          && TEST_int_eq(privlen, 1024);
+                       NULL, NULL))
+        && TEST_true(EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_DH_PRIV_LEN,
+            &privlen))
+        && TEST_int_eq(privlen, 1024);
 
     EVP_PKEY_free(pkey);
     return ret;
diff --git a/test/drbgtest.c b/test/drbgtest.c
index f12493b5cf82d..69be07a744ff3 100644
--- a/test/drbgtest.c
+++ b/test/drbgtest.c
@@ -25,13 +25,13 @@
 #include "../crypto/evp/evp_local.h"
 
 #if defined(_WIN32)
-# include <windows.h>
+#include <windows.h>
 #endif
 
 #if defined(OPENSSL_SYS_UNIX)
-# include <sys/types.h>
-# include <sys/wait.h>
-# include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
 #endif
 
 #include "testutil.h"
@@ -66,7 +66,6 @@ static int rand_priv_bytes(unsigned char *buf, int num)
     return gen_bytes(RAND_get0_private(NULL), buf, num);
 }
 
-
 /* size of random output generated in test_drbg_reseed() */
 #define RANDOM_SIZE 16
 
@@ -89,10 +88,10 @@ static unsigned int query_rand_uint(EVP_RAND_CTX *drbg, const char *name)
     return 0;
 }
 
-#define DRBG_UINT(name)                                 \
-    static unsigned int name(EVP_RAND_CTX *drbg)        \
-    {                                                   \
-        return query_rand_uint(drbg, #name);            \
+#define DRBG_UINT(name)                          \
+    static unsigned int name(EVP_RAND_CTX *drbg) \
+    {                                            \
+        return query_rand_uint(drbg, #name);     \
     }
 DRBG_UINT(reseed_counter)
 
@@ -145,7 +144,7 @@ static int using_fips_rng(void)
     return strstr(name, "FIPS Provider") != NULL;
 }
 
- /*
+/*
  * Disable CRNG testing if it is enabled.
  * This stub remains to indicate the calling locations where it is necessary.
  * Once the RNG infrastructure is able to disable these tests, it should be
@@ -172,16 +171,15 @@ static int disable_crngt(EVP_RAND_CTX *drbg)
  *                |before_reseed| time.
  */
 static int test_drbg_reseed(int expect_success,
-                            EVP_RAND_CTX *primary,
-                            EVP_RAND_CTX *public,
-                            EVP_RAND_CTX *private,
-                            unsigned char *public_random,
-                            unsigned char *private_random,
-                            int expect_primary_reseed,
-                            int expect_public_reseed,
-                            int expect_private_reseed,
-                            time_t reseed_when
-                           )
+    EVP_RAND_CTX *primary,
+    EVP_RAND_CTX *public,
+    EVP_RAND_CTX *private,
+    unsigned char *public_random,
+    unsigned char *private_random,
+    int expect_primary_reseed,
+    int expect_public_reseed,
+    int expect_private_reseed,
+    time_t reseed_when)
 {
     time_t before_reseed, after_reseed;
     int expected_state = (expect_success ? DRBG_READY : DRBG_ERROR);
@@ -213,14 +211,15 @@ static int test_drbg_reseed(int expect_success,
 
     /* Generate random output from the public and private DRBG */
     before_reseed = expect_primary_reseed == 1 ? reseed_when : 0;
-    if (!TEST_int_eq(rand_bytes((unsigned char*)public_random,
-                                RANDOM_SIZE), expect_success)
-        || !TEST_int_eq(rand_priv_bytes((unsigned char*) private_random,
-                                        RANDOM_SIZE), expect_success))
+    if (!TEST_int_eq(rand_bytes((unsigned char *)public_random,
+                         RANDOM_SIZE),
+            expect_success)
+        || !TEST_int_eq(rand_priv_bytes((unsigned char *)private_random,
+                            RANDOM_SIZE),
+            expect_success))
         return 0;
     after_reseed = time(NULL);
 
-
     /*
      * step 3: check postconditions
      */
@@ -240,16 +239,16 @@ static int test_drbg_reseed(int expect_success,
     if (expect_public_reseed >= 0) {
         /* Test whether public DRBG was reseeded as expected */
         if (!TEST_int_ge(reseed_counter(public), public_reseed)
-                || !TEST_uint_ge(reseed_counter(public),
-                                 reseed_counter(primary)))
+            || !TEST_uint_ge(reseed_counter(public),
+                reseed_counter(primary)))
             return 0;
     }
 
     if (expect_private_reseed >= 0) {
         /* Test whether public DRBG was reseeded as expected */
         if (!TEST_int_ge(reseed_counter(private), private_reseed)
-                || !TEST_uint_ge(reseed_counter(private),
-                                 reseed_counter(primary)))
+            || !TEST_uint_ge(reseed_counter(private),
+                reseed_counter(primary)))
             return 0;
     }
 
@@ -270,7 +269,6 @@ static int test_drbg_reseed(int expect_success,
     return 1;
 }
 
-
 #if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD)
 /* number of children to fork */
 #define DRBG_FORK_COUNT 9
@@ -281,10 +279,10 @@ typedef struct drbg_fork_result_st {
 
     unsigned char random[RANDOM_SIZE]; /* random output */
 
-    int pindex;               /* process index (0: parent, 1,2,3...: children)*/
-    pid_t pid;                /* process id */
-    int private;              /* true if the private drbg was used */
-    char name[10];            /* 'parent' resp. 'child 1', 'child 2', ... */
+    int pindex; /* process index (0: parent, 1,2,3...: children)*/
+    pid_t pid; /* process id */
+    int private; /* true if the private drbg was used */
+    char name[10]; /* 'parent' resp. 'child 1', 'child 2', ... */
 } drbg_fork_result;
 
 /*
@@ -328,9 +326,9 @@ static int compare_rand_chunk(const void *left, const void *right)
  * the parent process.
  */
 static int test_drbg_reseed_in_child(EVP_RAND_CTX *primary,
-                                     EVP_RAND_CTX *public,
-                                     EVP_RAND_CTX *private,
-                                     drbg_fork_result result[2])
+    EVP_RAND_CTX *public,
+    EVP_RAND_CTX *private,
+    drbg_fork_result result[2])
 {
     int rv = 0, status;
     int fd[2];
@@ -353,7 +351,7 @@ static int test_drbg_reseed_in_child(EVP_RAND_CTX *primary,
         if (TEST_int_eq(waitpid(pid, &status, 0), pid)
             && TEST_int_eq(status, 0)
             && TEST_true(read(fd[0], &random[0], sizeof(random))
-                          == sizeof(random))) {
+                == sizeof(random))) {
 
             /* random output of public drbg */
             result[0].pid = pid;
@@ -380,10 +378,10 @@ static int test_drbg_reseed_in_child(EVP_RAND_CTX *primary,
 
         /* check whether all three DRBGs reseed and send output to parent */
         if (TEST_true(test_drbg_reseed(1, primary, public, private,
-                                        &random[0], &random[RANDOM_SIZE],
-                                       1, 1, 1, 0))
+                &random[0], &random[RANDOM_SIZE],
+                1, 1, 1, 0))
             && TEST_true(write(fd[1], random, sizeof(random))
-                         == sizeof(random))) {
+                == sizeof(random))) {
 
             rv = 1;
         }
@@ -397,23 +395,23 @@ static int test_drbg_reseed_in_child(EVP_RAND_CTX *primary,
 }
 
 static int test_rand_reseed_on_fork(EVP_RAND_CTX *primary,
-                                    EVP_RAND_CTX *public,
-                                    EVP_RAND_CTX *private)
+    EVP_RAND_CTX *public,
+    EVP_RAND_CTX *private)
 {
     unsigned int i;
     pid_t pid = getpid();
     int verbose = (getenv("V") != NULL);
     int success = 1;
-    int duplicate[2] = {0, 0};
+    int duplicate[2] = { 0, 0 };
     unsigned char random[2 * RANDOM_SIZE];
     unsigned char sample[DRBG_FORK_RESULT_COUNT * RANDOM_SIZE];
     unsigned char *psample = &sample[0];
     drbg_fork_result result[DRBG_FORK_RESULT_COUNT];
     drbg_fork_result *presult = &result[2];
 
-    memset(&result,  0, sizeof(result));
+    memset(&result, 0, sizeof(result));
 
-    for (i = 1 ; i <= DRBG_FORK_COUNT ; ++i) {
+    for (i = 1; i <= DRBG_FORK_COUNT; ++i) {
 
         presult[0].pindex = presult[1].pindex = i;
 
@@ -422,9 +420,9 @@ static int test_rand_reseed_on_fork(EVP_RAND_CTX *primary,
 
         /* collect the random output of the children */
         if (!TEST_true(test_drbg_reseed_in_child(primary,
-                                                 public,
-                                                 private,
-                                                 presult)))
+                public,
+                private,
+                presult)))
             return 0;
 
         presult += 2;
@@ -432,9 +430,9 @@ static int test_rand_reseed_on_fork(EVP_RAND_CTX *primary,
 
     /* collect the random output of the parent */
     if (!TEST_true(test_drbg_reseed(1,
-                                    primary, public, private,
-                                    &random[0], &random[RANDOM_SIZE],
-                                    0, 0, 0, 0)))
+            primary, public, private,
+            &random[0], &random[RANDOM_SIZE],
+            0, 0, 0, 0)))
         return 0;
 
     strcpy(result[0].name, "parent");
@@ -451,18 +449,18 @@ static int test_rand_reseed_on_fork(EVP_RAND_CTX *primary,
     memcpy(result[1].random, &random[RANDOM_SIZE], RANDOM_SIZE);
 
     /* collect all sampled random data in a single buffer */
-    for (i = 0 ; i < DRBG_FORK_RESULT_COUNT ; ++i) {
+    for (i = 0; i < DRBG_FORK_RESULT_COUNT; ++i) {
         memcpy(psample, &result[i].random[0], RANDOM_SIZE);
         psample += RANDOM_SIZE;
     }
 
     /* sort the results... */
     qsort(result, DRBG_FORK_RESULT_COUNT, sizeof(drbg_fork_result),
-          compare_drbg_fork_result);
+        compare_drbg_fork_result);
 
     /* ...and count duplicate prefixes by looking at the first byte only */
-    for (i = 1 ; i < DRBG_FORK_RESULT_COUNT ; ++i) {
-        if (result[i].random[0] == result[i-1].random[0]) {
+    for (i = 1; i < DRBG_FORK_RESULT_COUNT; ++i) {
+        if (result[i].random[0] == result[i - 1].random[0]) {
             /* count public and private duplicates separately */
             ++duplicate[result[i].private];
         }
@@ -483,10 +481,10 @@ static int test_rand_reseed_on_fork(EVP_RAND_CTX *primary,
     duplicate[0] = 0;
 
     /* sort the two-byte chunks... */
-    qsort(sample, sizeof(sample)/2, 2, compare_rand_chunk);
+    qsort(sample, sizeof(sample) / 2, 2, compare_rand_chunk);
 
     /* ...and count duplicate chunks */
-    for (i = 2, psample = sample + 2 ; i < sizeof(sample) ; i += 2, psample += 2) {
+    for (i = 2, psample = sample + 2; i < sizeof(sample); i += 2, psample += 2) {
         if (compare_rand_chunk(psample - 2, psample) == 0)
             ++duplicate[0];
     }
@@ -499,15 +497,14 @@ static int test_rand_reseed_on_fork(EVP_RAND_CTX *primary,
 
     if (verbose || !success) {
 
-        for (i = 0 ; i < DRBG_FORK_RESULT_COUNT ; ++i) {
+        for (i = 0; i < DRBG_FORK_RESULT_COUNT; ++i) {
             char *rand_hex = OPENSSL_buf2hexstr(result[i].random, RANDOM_SIZE);
 
             TEST_note("    random: %s, pid: %d (%s, %s)",
-                      rand_hex,
-                      result[i].pid,
-                      result[i].name,
-                      result[i].private ? "private" : "public"
-                      );
+                rand_hex,
+                result[i].pid,
+                result[i].name,
+                result[i].private ? "private" : "public");
 
             OPENSSL_free(rand_hex);
         }
@@ -588,18 +585,18 @@ static int test_rand_reseed(void)
      * Test initial seeding of shared DRBGs
      */
     if (!TEST_true(test_drbg_reseed(1,
-                                    primary, public, private,
-                                    NULL, NULL,
-                                    1, 1, 1, 0)))
+            primary, public, private,
+            NULL, NULL,
+            1, 1, 1, 0)))
         goto error;
 
     /*
      * Test initial state of shared DRBGs
      */
     if (!TEST_true(test_drbg_reseed(1,
-                                    primary, public, private,
-                                    NULL, NULL,
-                                    0, 0, 0, 0)))
+            primary, public, private,
+            NULL, NULL,
+            0, 0, 0, 0)))
         goto error;
 
     /*
@@ -608,9 +605,9 @@ static int test_rand_reseed(void)
      */
     inc_reseed_counter(primary);
     if (!TEST_true(test_drbg_reseed(1,
-                                    primary, public, private,
-                                    NULL, NULL,
-                                    0, 1, 1, 0)))
+            primary, public, private,
+            NULL, NULL,
+            0, 1, 1, 0)))
         goto error;
 
     /*
@@ -620,9 +617,9 @@ static int test_rand_reseed(void)
     inc_reseed_counter(primary);
     inc_reseed_counter(private);
     if (!TEST_true(test_drbg_reseed(1,
-                                    primary, public, private,
-                                    NULL, NULL,
-                                    0, 1, 0, 0)))
+            primary, public, private,
+            NULL, NULL,
+            0, 1, 0, 0)))
         goto error;
 
     /*
@@ -632,9 +629,9 @@ static int test_rand_reseed(void)
     inc_reseed_counter(primary);
     inc_reseed_counter(public);
     if (!TEST_true(test_drbg_reseed(1,
-                                    primary, public, private,
-                                    NULL, NULL,
-                                    0, 0, 1, 0)))
+            primary, public, private,
+            NULL, NULL,
+            0, 0, 1, 0)))
         goto error;
 
     /* fill 'randomness' buffer with some arbitrary data */
@@ -651,16 +648,16 @@ static int test_rand_reseed(void)
     before_reseed = time(NULL);
     RAND_add(rand_add_buf, sizeof(rand_add_buf), sizeof(rand_add_buf));
     if (!TEST_true(test_drbg_reseed(1,
-                                    primary, public, private,
-                                    NULL, NULL,
-                                    1, 1, 1,
-                                    before_reseed)))
+            primary, public, private,
+            NULL, NULL,
+            1, 1, 1,
+            before_reseed)))
         goto error;
 
     rv = 1;
 
 error:
-   return rv;
+    return rv;
 }
 
 #if defined(OPENSSL_THREADS)
@@ -672,7 +669,7 @@ static int set_reseed_time_interval(EVP_RAND_CTX *drbg, int t)
     OSSL_PARAM params[2];
 
     params[0] = OSSL_PARAM_construct_int(OSSL_DRBG_PARAM_RESEED_TIME_INTERVAL,
-                                         &t);
+        &t);
     params[1] = OSSL_PARAM_construct_end();
     return EVP_RAND_CTX_set_params(drbg, params);
 }
@@ -684,9 +681,9 @@ static void run_multi_thread_test(void)
     EVP_RAND_CTX *public = NULL, *private = NULL;
 
     if (!TEST_ptr(public = RAND_get0_public(NULL))
-            || !TEST_ptr(private = RAND_get0_private(NULL))
-            || !TEST_true(set_reseed_time_interval(private, 1))
-            || !TEST_true(set_reseed_time_interval(public, 1))) {
+        || !TEST_ptr(private = RAND_get0_private(NULL))
+        || !TEST_true(set_reseed_time_interval(private, 1))
+        || !TEST_true(set_reseed_time_interval(public, 1))) {
         multi_thread_rand_bytes_succeeded = 0;
         return;
     }
@@ -696,11 +693,10 @@ static void run_multi_thread_test(void)
             multi_thread_rand_bytes_succeeded = 0;
         if (rand_priv_bytes(buf, sizeof(buf)) <= 0)
             multi_thread_rand_priv_bytes_succeeded = 0;
-    }
-    while (time(NULL) - start < 5);
+    } while (time(NULL) - start < 5);
 }
 
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
 
 typedef HANDLE thread_t;
 
@@ -726,7 +722,7 @@ static int wait_for_thread(thread_t thread)
     return WaitForSingleObject(thread, INFINITE) == 0;
 }
 
-# else
+#else
 
 typedef pthread_t thread_t;
 
@@ -751,13 +747,13 @@ static int wait_for_thread(thread_t thread)
     return pthread_join(thread, NULL) == 0;
 }
 
-# endif
+#endif
 
 /*
  * The main thread will also run the test, so we'll have THREADS+1 parallel
  * tests running
  */
-# define THREADS 3
+#define THREADS 3
 
 static int test_multi_thread(void)
 {
@@ -786,12 +782,12 @@ static EVP_RAND_CTX *new_drbg(EVP_RAND_CTX *parent)
     EVP_RAND_CTX *drbg = NULL;
 
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_CIPHER,
-                                                 "AES-256-CTR", 0);
+        "AES-256-CTR", 0);
     params[1] = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(rand = EVP_RAND_fetch(NULL, "CTR-DRBG", NULL))
-            || !TEST_ptr(drbg = EVP_RAND_CTX_new(rand, parent))
-            || !TEST_true(EVP_RAND_CTX_set_params(drbg, params))) {
+        || !TEST_ptr(drbg = EVP_RAND_CTX_new(rand, parent))
+        || !TEST_true(EVP_RAND_CTX_set_params(drbg, params))) {
         EVP_RAND_CTX_free(drbg);
         drbg = NULL;
     }
diff --git a/test/dsa_no_digest_size_test.c b/test/dsa_no_digest_size_test.c
index 35bfa390394aa..c2781ea324ec3 100644
--- a/test/dsa_no_digest_size_test.c
+++ b/test/dsa_no_digest_size_test.c
@@ -101,8 +101,8 @@ static DSA *load_dsa_params(void)
     if (dsa == NULL)
         return NULL;
     if (!DSA_set0_pqg(dsa, p = BN_bin2bn(dsap_2048, sizeof(dsap_2048), NULL),
-                           q = BN_bin2bn(dsaq_2048, sizeof(dsaq_2048), NULL),
-                           g = BN_bin2bn(dsag_2048, sizeof(dsag_2048), NULL))) {
+            q = BN_bin2bn(dsaq_2048, sizeof(dsaq_2048), NULL),
+            g = BN_bin2bn(dsag_2048, sizeof(dsag_2048), NULL))) {
         DSA_free(dsa);
         BN_free(p);
         BN_free(q);
@@ -140,9 +140,7 @@ static int sign_and_verify(int len)
     EVP_PKEY_CTX *ctx = NULL;
     EVP_PKEY *pkey = NULL;
 
-    if (!TEST_ptr(dataToSign) ||
-        !TEST_ptr(paddedData) ||
-        !TEST_int_eq(RAND_bytes(dataToSign, len), 1))
+    if (!TEST_ptr(dataToSign) || !TEST_ptr(paddedData) || !TEST_int_eq(RAND_bytes(dataToSign, len), 1))
         goto end;
 
     memset(paddedData, 0, digestlen);
@@ -212,7 +210,8 @@ static int sign_and_verify(int len)
     return ok;
 }
 
-static int dsa_exact_size_test(void) {
+static int dsa_exact_size_test(void)
+{
     /*
      * For a 2048-bit p, q should be either 224 or 256 bits per the table in
      * FIPS 186-4 4.2.
@@ -221,11 +220,13 @@ static int dsa_exact_size_test(void) {
     return sign_and_verify(224 / 8) && sign_and_verify(256 / 8);
 }
 
-static int dsa_small_digest_test(void) {
+static int dsa_small_digest_test(void)
+{
     return sign_and_verify(16) && sign_and_verify(1);
 }
 
-static int dsa_large_digest_test(void) {
+static int dsa_large_digest_test(void)
+{
     return sign_and_verify(33) && sign_and_verify(64);
 }
 
@@ -248,4 +249,3 @@ int setup_tests(void)
 #endif
     return 1;
 }
-
diff --git a/test/dsatest.c b/test/dsatest.c
index 04fabc0cb949b..c4742bc3a4f74 100644
--- a/test/dsatest.c
+++ b/test/dsatest.c
@@ -33,29 +33,158 @@
 static int dsa_cb(int p, int n, BN_GENCB *arg);
 
 static unsigned char out_p[] = {
-    0x8d, 0xf2, 0xa4, 0x94, 0x49, 0x22, 0x76, 0xaa,
-    0x3d, 0x25, 0x75, 0x9b, 0xb0, 0x68, 0x69, 0xcb,
-    0xea, 0xc0, 0xd8, 0x3a, 0xfb, 0x8d, 0x0c, 0xf7,
-    0xcb, 0xb8, 0x32, 0x4f, 0x0d, 0x78, 0x82, 0xe5,
-    0xd0, 0x76, 0x2f, 0xc5, 0xb7, 0x21, 0x0e, 0xaf,
-    0xc2, 0xe9, 0xad, 0xac, 0x32, 0xab, 0x7a, 0xac,
-    0x49, 0x69, 0x3d, 0xfb, 0xf8, 0x37, 0x24, 0xc2,
-    0xec, 0x07, 0x36, 0xee, 0x31, 0xc8, 0x02, 0x91,
+    0x8d,
+    0xf2,
+    0xa4,
+    0x94,
+    0x49,
+    0x22,
+    0x76,
+    0xaa,
+    0x3d,
+    0x25,
+    0x75,
+    0x9b,
+    0xb0,
+    0x68,
+    0x69,
+    0xcb,
+    0xea,
+    0xc0,
+    0xd8,
+    0x3a,
+    0xfb,
+    0x8d,
+    0x0c,
+    0xf7,
+    0xcb,
+    0xb8,
+    0x32,
+    0x4f,
+    0x0d,
+    0x78,
+    0x82,
+    0xe5,
+    0xd0,
+    0x76,
+    0x2f,
+    0xc5,
+    0xb7,
+    0x21,
+    0x0e,
+    0xaf,
+    0xc2,
+    0xe9,
+    0xad,
+    0xac,
+    0x32,
+    0xab,
+    0x7a,
+    0xac,
+    0x49,
+    0x69,
+    0x3d,
+    0xfb,
+    0xf8,
+    0x37,
+    0x24,
+    0xc2,
+    0xec,
+    0x07,
+    0x36,
+    0xee,
+    0x31,
+    0xc8,
+    0x02,
+    0x91,
 };
 static unsigned char out_q[] = {
-    0xc7, 0x73, 0x21, 0x8c, 0x73, 0x7e, 0xc8, 0xee,
-    0x99, 0x3b, 0x4f, 0x2d, 0xed, 0x30, 0xf4, 0x8e,
-    0xda, 0xce, 0x91, 0x5f,
+    0xc7,
+    0x73,
+    0x21,
+    0x8c,
+    0x73,
+    0x7e,
+    0xc8,
+    0xee,
+    0x99,
+    0x3b,
+    0x4f,
+    0x2d,
+    0xed,
+    0x30,
+    0xf4,
+    0x8e,
+    0xda,
+    0xce,
+    0x91,
+    0x5f,
 };
 static unsigned char out_g[] = {
-    0x62, 0x6d, 0x02, 0x78, 0x39, 0xea, 0x0a, 0x13,
-    0x41, 0x31, 0x63, 0xa5, 0x5b, 0x4c, 0xb5, 0x00,
-    0x29, 0x9d, 0x55, 0x22, 0x95, 0x6c, 0xef, 0xcb,
-    0x3b, 0xff, 0x10, 0xf3, 0x99, 0xce, 0x2c, 0x2e,
-    0x71, 0xcb, 0x9d, 0xe5, 0xfa, 0x24, 0xba, 0xbf,
-    0x58, 0xe5, 0xb7, 0x95, 0x21, 0x92, 0x5c, 0x9c,
-    0xc4, 0x2e, 0x9f, 0x6f, 0x46, 0x4b, 0x08, 0x8c,
-    0xc5, 0x72, 0xaf, 0x53, 0xe6, 0xd7, 0x88, 0x02,
+    0x62,
+    0x6d,
+    0x02,
+    0x78,
+    0x39,
+    0xea,
+    0x0a,
+    0x13,
+    0x41,
+    0x31,
+    0x63,
+    0xa5,
+    0x5b,
+    0x4c,
+    0xb5,
+    0x00,
+    0x29,
+    0x9d,
+    0x55,
+    0x22,
+    0x95,
+    0x6c,
+    0xef,
+    0xcb,
+    0x3b,
+    0xff,
+    0x10,
+    0xf3,
+    0x99,
+    0xce,
+    0x2c,
+    0x2e,
+    0x71,
+    0xcb,
+    0x9d,
+    0xe5,
+    0xfa,
+    0x24,
+    0xba,
+    0xbf,
+    0x58,
+    0xe5,
+    0xb7,
+    0x95,
+    0x21,
+    0x92,
+    0x5c,
+    0x9c,
+    0xc4,
+    0x2e,
+    0x9f,
+    0x6f,
+    0x46,
+    0x4b,
+    0x08,
+    0x8c,
+    0xc5,
+    0x72,
+    0xaf,
+    0x53,
+    0xe6,
+    0xd7,
+    0x88,
+    0x02,
 };
 
 static int dsa_test(void)
@@ -73,9 +202,26 @@ static int dsa_test(void)
      * PUB 186 and also appear in Appendix 5 to FIPS PIB 186-1
      */
     static unsigned char seed[20] = {
-        0xd5, 0x01, 0x4e, 0x4b, 0x60, 0xef, 0x2b, 0xa8,
-        0xb6, 0x21, 0x1b, 0x40, 0x62, 0xba, 0x32, 0x24,
-        0xe0, 0x42, 0x7d, 0xd3,
+        0xd5,
+        0x01,
+        0x4e,
+        0x4b,
+        0x60,
+        0xef,
+        0x2b,
+        0xa8,
+        0xb6,
+        0x21,
+        0x1b,
+        0x40,
+        0x62,
+        0xba,
+        0x32,
+        0x24,
+        0xe0,
+        0x42,
+        0x7d,
+        0xd3,
     };
     static const unsigned char str1[] = "12345678901234567890";
 
@@ -85,7 +231,7 @@ static int dsa_test(void)
     BN_GENCB_set(cb, dsa_cb, NULL);
     if (!TEST_ptr(dsa = DSA_new())
         || !TEST_true(DSA_generate_parameters_ex(dsa, 512, seed, 20,
-                                                &counter, &h, cb)))
+            &counter, &h, cb)))
         goto end;
 
     if (!TEST_int_eq(counter, 105))
@@ -115,7 +261,7 @@ static int dsa_test(void)
         goto end;
     if (TEST_int_gt(DSA_verify(0, str1, 20, sig, siglen, dsa), 0))
         ret = 1;
- end:
+end:
     DSA_free(dsa);
     BN_GENCB_free(cb);
     return ret;
@@ -137,14 +283,14 @@ static int dsa_cb(int p, int n, BN_GENCB *arg)
     return 1;
 }
 
-# define P      0
-# define Q      1
-# define G      2
-# define SEED   3
-# define PCOUNT 4
-# define GINDEX 5
-# define HCOUNT 6
-# define GROUP  7
+#define P 0
+#define Q 1
+#define G 2
+#define SEED 3
+#define PCOUNT 4
+#define GINDEX 5
+#define HCOUNT 6
+#define GROUP 7
 
 static int dsa_keygen_test(void)
 {
@@ -164,7 +310,7 @@ static int dsa_keygen_test(void)
         0x95, 0x26, 0x3f, 0x03, 0xdc, 0x00, 0x3f, 0x44,
         0x7b, 0x2a, 0xc7, 0x29
     };
-    static const unsigned char expected_p[]= {
+    static const unsigned char expected_p[] = {
         0xdb, 0x47, 0x07, 0xaf, 0xf0, 0x06, 0x49, 0x55,
         0xc9, 0xbb, 0x09, 0x41, 0xb8, 0xdb, 0x1f, 0xbc,
         0xa8, 0xed, 0x12, 0x06, 0x7f, 0x88, 0x49, 0xb8,
@@ -198,13 +344,13 @@ static int dsa_keygen_test(void)
         0xb1, 0x1b, 0x0d, 0xfc, 0x70, 0xec, 0x85, 0xc2,
         0xc5, 0xba, 0xb9, 0x69, 0x3f, 0x88, 0xbc, 0xcb
     };
-    static const unsigned char expected_q[]= {
+    static const unsigned char expected_q[] = {
         0x99, 0xb6, 0xa0, 0xee, 0xb3, 0xa6, 0x99, 0x1a,
         0xb6, 0x67, 0x8d, 0xc1, 0x2b, 0x9b, 0xce, 0x2b,
         0x01, 0x72, 0x5a, 0x65, 0x76, 0x3d, 0x93, 0x69,
         0xe2, 0x56, 0xae, 0xd7
     };
-    static const unsigned char expected_g[]= {
+    static const unsigned char expected_g[] = {
         0x63, 0xf8, 0xb6, 0xee, 0x2a, 0x27, 0xaf, 0x4f,
         0x4c, 0xf6, 0x08, 0x28, 0x87, 0x4a, 0xe7, 0x1f,
         0x45, 0x46, 0x27, 0x52, 0x3b, 0x7f, 0x6f, 0xd2,
@@ -250,14 +396,14 @@ static int dsa_keygen_test(void)
         || !TEST_ptr(EVP_PKEY_CTX_gettable_params(pg_ctx))
         || !TEST_ptr(settables = EVP_PKEY_CTX_settable_params(pg_ctx))
         || !TEST_ptr(OSSL_PARAM_locate_const(settables,
-                                             OSSL_PKEY_PARAM_FFC_PBITS))
+            OSSL_PKEY_PARAM_FFC_PBITS))
         || !TEST_true(EVP_PKEY_CTX_set_dsa_paramgen_type(pg_ctx, "fips186_4"))
         || !TEST_true(EVP_PKEY_CTX_set_dsa_paramgen_bits(pg_ctx, 2048))
         || !TEST_true(EVP_PKEY_CTX_set_dsa_paramgen_q_bits(pg_ctx, 224))
         || !TEST_true(EVP_PKEY_CTX_set_dsa_paramgen_seed(pg_ctx, seed_data,
-                                                         sizeof(seed_data)))
+            sizeof(seed_data)))
         || !TEST_true(EVP_PKEY_CTX_set_dsa_paramgen_md_props(pg_ctx, "SHA256",
-                                                             ""))
+            ""))
         || !TEST_int_gt(EVP_PKEY_generate(pg_ctx, &param_key), 0)
         || !TEST_ptr(kg_ctx = EVP_PKEY_CTX_new_from_pkey(NULL, param_key, NULL))
         || !TEST_int_gt(EVP_PKEY_keygen_init(kg_ctx), 0)
@@ -271,23 +417,23 @@ static int dsa_keygen_test(void)
         || !TEST_true(EVP_PKEY_get_bn_param(key, OSSL_PKEY_PARAM_FFC_G, &g_out))
         || !TEST_BN_eq(g_in, g_out)
         || !TEST_true(EVP_PKEY_get_octet_string_param(
-                          key, OSSL_PKEY_PARAM_FFC_SEED, seed_out,
-                          sizeof(seed_out), &len))
+            key, OSSL_PKEY_PARAM_FFC_SEED, seed_out,
+            sizeof(seed_out), &len))
         || !TEST_mem_eq(seed_out, len, seed_data, sizeof(seed_data))
         || !TEST_true(EVP_PKEY_get_int_param(key, OSSL_PKEY_PARAM_FFC_GINDEX,
-                                             &gindex_out))
+            &gindex_out))
         || !TEST_int_eq(gindex_out, -1)
         || !TEST_true(EVP_PKEY_get_int_param(key, OSSL_PKEY_PARAM_FFC_H,
-                                             &hcount_out))
+            &hcount_out))
         || !TEST_int_eq(hcount_out, expected_h)
         || !TEST_true(EVP_PKEY_get_int_param(key,
-                                             OSSL_PKEY_PARAM_FFC_PCOUNTER,
-                                             &pcount_out))
+            OSSL_PKEY_PARAM_FFC_PCOUNTER,
+            &pcount_out))
         || !TEST_int_eq(pcount_out, expected_c)
         || !TEST_false(EVP_PKEY_get_utf8_string_param(key,
-                                                      OSSL_PKEY_PARAM_GROUP_NAME,
-                                                      group_out,
-                                                      sizeof(group_out), &len)))
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            group_out,
+            sizeof(group_out), &len)))
         goto end;
     ret = 1;
 end:
@@ -312,12 +458,12 @@ static int test_dsa_default_paramgen_validate(int i)
     EVP_PKEY *params = NULL;
 
     ret = TEST_ptr(gen_ctx = EVP_PKEY_CTX_new_from_name(NULL, "DSA", NULL))
-          && TEST_int_gt(EVP_PKEY_paramgen_init(gen_ctx), 0)
-          && (i == 0
-              || TEST_true(EVP_PKEY_CTX_set_dsa_paramgen_bits(gen_ctx, 512)))
-          && TEST_int_gt(EVP_PKEY_generate(gen_ctx, &params), 0)
-          && TEST_ptr(check_ctx = EVP_PKEY_CTX_new_from_pkey(NULL, params, NULL))
-          && TEST_int_gt(EVP_PKEY_param_check(check_ctx), 0);
+        && TEST_int_gt(EVP_PKEY_paramgen_init(gen_ctx), 0)
+        && (i == 0
+            || TEST_true(EVP_PKEY_CTX_set_dsa_paramgen_bits(gen_ctx, 512)))
+        && TEST_int_gt(EVP_PKEY_generate(gen_ctx, &params), 0)
+        && TEST_ptr(check_ctx = EVP_PKEY_CTX_new_from_pkey(NULL, params, NULL))
+        && TEST_int_gt(EVP_PKEY_param_check(check_ctx), 0);
 
     EVP_PKEY_free(params);
     EVP_PKEY_CTX_free(check_ctx);
diff --git a/test/dtls_mtu_test.c b/test/dtls_mtu_test.c
index f1b705fd59e68..1baba206e64a4 100644
--- a/test/dtls_mtu_test.c
+++ b/test/dtls_mtu_test.c
@@ -24,9 +24,9 @@
 static int debug = 0;
 
 static unsigned int clnt_psk_callback(SSL *ssl, const char *hint,
-                                      char *ident, unsigned int max_ident_len,
-                                      unsigned char *psk,
-                                      unsigned int max_psk_len)
+    char *ident, unsigned int max_ident_len,
+    unsigned char *psk,
+    unsigned int max_psk_len)
 {
     BIO_snprintf(ident, max_ident_len, "psk");
 
@@ -38,8 +38,8 @@ static unsigned int clnt_psk_callback(SSL *ssl, const char *hint,
 }
 
 static unsigned int srvr_psk_callback(SSL *ssl, const char *identity,
-                                      unsigned char *psk,
-                                      unsigned int max_psk_len)
+    unsigned char *psk,
+    unsigned int max_psk_len)
 {
     if (max_psk_len > 20)
         max_psk_len = 20;
@@ -61,17 +61,17 @@ static int mtu_test(SSL_CTX *ctx, const char *cs, int no_etm)
     memset(buf, 0x5a, sizeof(buf));
 
     if (!TEST_true(create_ssl_objects(ctx, ctx, &srvr_ssl, &clnt_ssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (no_etm)
         SSL_set_options(srvr_ssl, SSL_OP_NO_ENCRYPT_THEN_MAC);
 
     if (!TEST_true(SSL_set_cipher_list(srvr_ssl, cs))
-            || !TEST_true(SSL_set_cipher_list(clnt_ssl, cs))
-            || !TEST_ptr(sc_bio = SSL_get_rbio(srvr_ssl))
-            || !TEST_true(create_ssl_connection(clnt_ssl, srvr_ssl,
-                                                SSL_ERROR_NONE)))
+        || !TEST_true(SSL_set_cipher_list(clnt_ssl, cs))
+        || !TEST_ptr(sc_bio = SSL_get_rbio(srvr_ssl))
+        || !TEST_true(create_ssl_connection(clnt_ssl, srvr_ssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     if (debug)
@@ -84,8 +84,8 @@ static int mtu_test(SSL_CTX *ctx, const char *cs, int no_etm)
         mtus[i] = DTLS_get_data_mtu(clnt_ssl);
         if (debug)
             TEST_info("%s%s MTU for record mtu %d = %lu",
-                      cs, no_etm ? "-noEtM" : "",
-                      500 + i, (unsigned long)mtus[i]);
+                cs, no_etm ? "-noEtM" : "",
+                500 + i, (unsigned long)mtus[i]);
         if (!TEST_size_t_ne(mtus[i], 0)) {
             TEST_info("Cipher %s MTU %d", cs, 500 + i);
             goto end;
@@ -117,8 +117,8 @@ static int mtu_test(SSL_CTX *ctx, const char *cs, int no_etm)
                  * that made a record *larger* than the record MTU 500+j!
                  */
                 TEST_error("%s: s=%lu, mtus[i]=%lu, reclen=%lu, i=%d",
-                           cs, (unsigned long)s, (unsigned long)mtus[i],
-                           (unsigned long)reclen, 500 + i);
+                    cs, (unsigned long)s, (unsigned long)mtus[i],
+                    (unsigned long)reclen, 500 + i);
                 goto end;
             }
             if (!TEST_false(s > mtus[i] && reclen <= (size_t)(500 + i))) {
@@ -128,8 +128,8 @@ static int mtu_test(SSL_CTX *ctx, const char *cs, int no_etm)
                  * was overly pessimistic.
                  */
                 TEST_error("%s: s=%lu, mtus[i]=%lu, reclen=%lu, i=%d",
-                           cs, (unsigned long)s, (unsigned long)mtus[i],
-                           (unsigned long)reclen, 500 + i);
+                    cs, (unsigned long)s, (unsigned long)mtus[i],
+                    (unsigned long)reclen, 500 + i);
                 goto end;
             }
         }
@@ -139,7 +139,7 @@ static int mtu_test(SSL_CTX *ctx, const char *cs, int no_etm)
     rv = 1;
     if (SSL_READ_ETM(clnt_sc))
         rv = 2;
- end:
+end:
     SSL_free(clnt_ssl);
     SSL_free(srvr_ssl);
     return rv;
@@ -187,7 +187,7 @@ static int run_mtu_tests(void)
         TEST_info("%s without EtM OK", cipher_name);
     }
 
- end:
+end:
     SSL_CTX_free(ctx);
     return ret;
 }
@@ -210,7 +210,7 @@ static int test_server_mtu_larger_than_max_fragment_length(void)
 #endif
 
     if (!TEST_true(create_ssl_objects(ctx, ctx, &srvr_ssl, &clnt_ssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     SSL_set_options(srvr_ssl, SSL_OP_NO_QUERY_MTU);
@@ -218,15 +218,15 @@ static int test_server_mtu_larger_than_max_fragment_length(void)
         goto end;
 
     SSL_set_tlsext_max_fragment_length(clnt_ssl,
-                                       TLSEXT_max_fragment_length_512);
+        TLSEXT_max_fragment_length_512);
 
     if (!TEST_true(create_ssl_connection(srvr_ssl, clnt_ssl,
-                                         SSL_ERROR_NONE)))
+            SSL_ERROR_NONE)))
         goto end;
 
     rv = 1;
 
- end:
+end:
     SSL_free(clnt_ssl);
     SSL_free(srvr_ssl);
     SSL_CTX_free(ctx);
diff --git a/test/dtlstest.c b/test/dtlstest.c
index 011d8775c1578..725d7dc4f2b86 100644
--- a/test/dtlstest.c
+++ b/test/dtlstest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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
@@ -20,10 +20,9 @@ static char *cert = NULL;
 static char *privkey = NULL;
 static unsigned int timer_cb_count;
 
-#define NUM_TESTS   2
+#define NUM_TESTS 2
 
-
-#define DUMMY_CERT_STATUS_LEN  12
+#define DUMMY_CERT_STATUS_LEN 12
 
 static unsigned char certstatus[] = {
     SSL3_RT_HANDSHAKE, /* Content type */
@@ -45,7 +44,7 @@ static unsigned char certstatus[] = {
 static const char dummy_cookie[] = "0123456";
 
 static int generate_cookie_cb(SSL *ssl, unsigned char *cookie,
-                              unsigned int *cookie_len)
+    unsigned int *cookie_len)
 {
     memcpy(cookie, dummy_cookie, sizeof(dummy_cookie));
     *cookie_len = sizeof(dummy_cookie);
@@ -53,7 +52,7 @@ static int generate_cookie_cb(SSL *ssl, unsigned char *cookie,
 }
 
 static int verify_cookie_cb(SSL *ssl, const unsigned char *cookie,
-                            unsigned int cookie_len)
+    unsigned int cookie_len)
 {
     return TEST_mem_eq(cookie, cookie_len, dummy_cookie, sizeof(dummy_cookie));
 }
@@ -78,9 +77,9 @@ static int test_dtls_unprocessed(int testidx)
     timer_cb_count = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, DTLS_server_method(),
-                                       DTLS_client_method(),
-                                       DTLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            DTLS_client_method(),
+            DTLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         return 0;
 
 #ifndef OPENSSL_NO_DTLS1_2
@@ -89,8 +88,8 @@ static int test_dtls_unprocessed(int testidx)
 #else
     /* Default sigalgs are SHA1 based in <DTLS1.2 which is in security level 0 */
     if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "AES128-SHA:@SECLEVEL=0"))
-            || !TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                                  "AES128-SHA:@SECLEVEL=0")))
+        || !TEST_true(SSL_CTX_set_cipher_list(cctx,
+            "AES128-SHA:@SECLEVEL=0")))
         goto end;
 #endif
 
@@ -100,7 +99,7 @@ static int test_dtls_unprocessed(int testidx)
 
     /* BIO is freed by create_ssl_connection on error */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl1, &clientssl1,
-                                      NULL, c_to_s_fbio)))
+            NULL, c_to_s_fbio)))
         goto end;
 
     DTLS_set_timer_cb(clientssl1, timer_cb);
@@ -116,7 +115,7 @@ static int test_dtls_unprocessed(int testidx)
     c_to_s_mempacket = SSL_get_wbio(clientssl1);
     c_to_s_mempacket = BIO_next(c_to_s_mempacket);
     mempacket_test_inject(c_to_s_mempacket, (char *)certstatus,
-                          sizeof(certstatus), 1, INJECT_PACKET_IGNORE_REC_SEQ);
+        sizeof(certstatus), 1, INJECT_PACKET_IGNORE_REC_SEQ);
 
     /*
      * Create the connection. We use "create_bare_ssl_connection" here so that
@@ -125,7 +124,7 @@ static int test_dtls_unprocessed(int testidx)
      * they will fail to decrypt.
      */
     if (!TEST_true(create_bare_ssl_connection(serverssl1, clientssl1,
-                                              SSL_ERROR_NONE, 0, 0)))
+            SSL_ERROR_NONE, 0, 0)))
         goto end;
 
     if (timer_cb_count == 0) {
@@ -134,7 +133,7 @@ static int test_dtls_unprocessed(int testidx)
     }
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl1);
     SSL_free(clientssl1);
     SSL_CTX_free(sctx);
@@ -157,29 +156,25 @@ static int test_dtls_unprocessed(int testidx)
 #define CLI_TO_SRV_EPOCH_0_RECS 3
 #define CLI_TO_SRV_EPOCH_1_RECS 1
 #if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
-# define SRV_TO_CLI_EPOCH_0_RECS 10
+#define SRV_TO_CLI_EPOCH_0_RECS 10
 #else
 /*
  * In this case we have no ServerKeyExchange message, because we don't have
  * ECDHE or DHE. When it is present it gets fragmented into 3 records in this
  * test.
  */
-# define SRV_TO_CLI_EPOCH_0_RECS 9
+#define SRV_TO_CLI_EPOCH_0_RECS 9
 #endif
 #define SRV_TO_CLI_EPOCH_1_RECS 1
 #define TOTAL_FULL_HAND_RECORDS \
-            (CLI_TO_SRV_COOKIE_EXCH + SRV_TO_CLI_COOKIE_EXCH + \
-             CLI_TO_SRV_EPOCH_0_RECS + CLI_TO_SRV_EPOCH_1_RECS + \
-             SRV_TO_CLI_EPOCH_0_RECS + SRV_TO_CLI_EPOCH_1_RECS)
+    (CLI_TO_SRV_COOKIE_EXCH + SRV_TO_CLI_COOKIE_EXCH + CLI_TO_SRV_EPOCH_0_RECS + CLI_TO_SRV_EPOCH_1_RECS + SRV_TO_CLI_EPOCH_0_RECS + SRV_TO_CLI_EPOCH_1_RECS)
 
 #define CLI_TO_SRV_RESUME_EPOCH_0_RECS 3
 #define CLI_TO_SRV_RESUME_EPOCH_1_RECS 1
 #define SRV_TO_CLI_RESUME_EPOCH_0_RECS 2
 #define SRV_TO_CLI_RESUME_EPOCH_1_RECS 1
 #define TOTAL_RESUME_HAND_RECORDS \
-            (CLI_TO_SRV_RESUME_COOKIE_EXCH + SRV_TO_CLI_COOKIE_EXCH + \
-             CLI_TO_SRV_RESUME_EPOCH_0_RECS + CLI_TO_SRV_RESUME_EPOCH_1_RECS + \
-             SRV_TO_CLI_RESUME_EPOCH_0_RECS + SRV_TO_CLI_RESUME_EPOCH_1_RECS)
+    (CLI_TO_SRV_RESUME_COOKIE_EXCH + SRV_TO_CLI_COOKIE_EXCH + CLI_TO_SRV_RESUME_EPOCH_0_RECS + CLI_TO_SRV_RESUME_EPOCH_1_RECS + SRV_TO_CLI_RESUME_EPOCH_0_RECS + SRV_TO_CLI_RESUME_EPOCH_1_RECS)
 
 #define TOTAL_RECORDS (TOTAL_FULL_HAND_RECORDS + TOTAL_RESUME_HAND_RECORDS)
 
@@ -200,16 +195,16 @@ static int test_dtls_drop_records(int idx)
     int srv_to_cli_epoch0;
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, DTLS_server_method(),
-                                       DTLS_client_method(),
-                                       DTLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            DTLS_client_method(),
+            DTLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         return 0;
 
 #ifdef OPENSSL_NO_DTLS1_2
     /* Default sigalgs are SHA1 based in <DTLS1.2 which is in security level 0 */
     if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "DEFAULT:@SECLEVEL=0"))
-            || !TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                                  "DEFAULT:@SECLEVEL=0")))
+        || !TEST_true(SSL_CTX_set_cipher_list(cctx,
+            "DEFAULT:@SECLEVEL=0")))
         goto end;
 #endif
 
@@ -223,10 +218,10 @@ static int test_dtls_drop_records(int idx)
     if (idx >= TOTAL_FULL_HAND_RECORDS) {
         /* We're going to do a resumption handshake. Get a session first. */
         if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                          NULL, NULL))
-                || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                              SSL_ERROR_NONE))
-                || !TEST_ptr(sess = SSL_get1_session(clientssl)))
+                NULL, NULL))
+            || !TEST_true(create_ssl_connection(serverssl, clientssl,
+                SSL_ERROR_NONE))
+            || !TEST_ptr(sess = SSL_get1_session(clientssl)))
             goto end;
 
         SSL_shutdown(clientssl);
@@ -253,7 +248,7 @@ static int test_dtls_drop_records(int idx)
 
     /* BIO is freed by create_ssl_connection on error */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, c_to_s_fbio)))
+            NULL, c_to_s_fbio)))
         goto end;
 
     if (sess != NULL) {
@@ -278,7 +273,7 @@ static int test_dtls_drop_records(int idx)
             epoch = 1;
             idx -= cli_to_srv_cookie + cli_to_srv_epoch0;
         }
-         mempackbio = BIO_next(mempackbio);
+        mempackbio = BIO_next(mempackbio);
     }
     BIO_ctrl(mempackbio, MEMPACKET_CTRL_SET_DROP_EPOCH, epoch, NULL);
     BIO_ctrl(mempackbio, MEMPACKET_CTRL_SET_DROP_REC, idx, NULL);
@@ -291,11 +286,12 @@ static int test_dtls_drop_records(int idx)
 
     /* If the test did what we planned then it should have dropped a record */
     if (!TEST_int_eq((int)BIO_ctrl(mempackbio, MEMPACKET_CTRL_GET_DROP_REC, 0,
-                                   NULL), -1))
+                         NULL),
+            -1))
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_SESSION_free(sess);
     SSL_free(serverssl);
     SSL_free(clientssl);
@@ -313,9 +309,9 @@ static int test_cookie(void)
     int testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, DTLS_server_method(),
-                                       DTLS_client_method(),
-                                       DTLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            DTLS_client_method(),
+            DTLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         return 0;
 
     SSL_CTX_set_options(sctx, SSL_OP_COOKIE_EXCHANGE);
@@ -325,19 +321,19 @@ static int test_cookie(void)
 #ifdef OPENSSL_NO_DTLS1_2
     /* Default sigalgs are SHA1 based in <DTLS1.2 which is in security level 0 */
     if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "DEFAULT:@SECLEVEL=0"))
-            || !TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                                  "DEFAULT:@SECLEVEL=0")))
+        || !TEST_true(SSL_CTX_set_cipher_list(cctx,
+            "DEFAULT:@SECLEVEL=0")))
         goto end;
 #endif
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -353,21 +349,21 @@ static int test_dtls_duplicate_records(void)
     int testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, DTLS_server_method(),
-                                       DTLS_client_method(),
-                                       DTLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            DTLS_client_method(),
+            DTLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         return 0;
 
 #ifdef OPENSSL_NO_DTLS1_2
     /* Default sigalgs are SHA1 based in <DTLS1.2 which is in security level 0 */
     if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "DEFAULT:@SECLEVEL=0"))
-            || !TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                                  "DEFAULT:@SECLEVEL=0")))
+        || !TEST_true(SSL_CTX_set_cipher_list(cctx,
+            "DEFAULT:@SECLEVEL=0")))
         goto end;
 #endif
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     DTLS_set_timer_cb(clientssl, timer_cb);
@@ -380,7 +376,7 @@ static int test_dtls_duplicate_records(void)
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -419,10 +415,9 @@ static int test_just_finished(void)
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     };
 
-
     if (!TEST_true(create_ssl_ctx_pair(NULL, DTLS_server_method(),
-                                       NULL, 0, 0,
-                                       &sctx, NULL, cert, privkey)))
+            NULL, 0, 0,
+            &sctx, NULL, cert, privkey)))
         return 0;
 
 #ifdef OPENSSL_NO_DTLS1_2
@@ -459,7 +454,7 @@ static int test_just_finished(void)
         goto end;
 
     testresult = 1;
- end:
+end:
     BIO_free(rbio);
     BIO_free(wbio);
     SSL_free(serverssl);
@@ -485,9 +480,9 @@ static int test_swap_records(int idx)
     char buf[10];
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, DTLS_server_method(),
-                                       DTLS_client_method(),
-                                       DTLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            DTLS_client_method(),
+            DTLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         return 0;
 
 #ifndef OPENSSL_NO_DTLS1_2
@@ -496,13 +491,13 @@ static int test_swap_records(int idx)
 #else
     /* Default sigalgs are SHA1 based in <DTLS1.2 which is in security level 0 */
     if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "AES128-SHA:@SECLEVEL=0"))
-            || !TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                                  "AES128-SHA:@SECLEVEL=0")))
+        || !TEST_true(SSL_CTX_set_cipher_list(cctx,
+            "AES128-SHA:@SECLEVEL=0")))
         goto end;
 #endif
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &sssl, &cssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     /* Send flight 1: ClientHello */
@@ -521,7 +516,7 @@ static int test_swap_records(int idx)
         /* Swap Finished and CCS within the datagram */
         bio = SSL_get_wbio(cssl);
         if (!TEST_ptr(bio)
-                || !TEST_true(mempacket_swap_epoch(bio)))
+            || !TEST_true(mempacket_swap_epoch(bio)))
             goto end;
     }
 
@@ -561,24 +556,123 @@ static int test_swap_records(int idx)
     if (idx == 0 || idx == 1) {
         /* App data was not received early, so it should not be pending */
         if (!TEST_int_eq(SSL_pending(cssl), 0)
-                || !TEST_false(SSL_has_pending(cssl)))
+            || !TEST_false(SSL_has_pending(cssl)))
             goto end;
 
     } else {
         /* We received the app data early so it should be buffered already */
         if (!TEST_int_eq(SSL_pending(cssl), (int)sizeof(msg))
-                || !TEST_true(SSL_has_pending(cssl)))
+            || !TEST_true(SSL_has_pending(cssl)))
             goto end;
     }
 
     /*
-    * Recv flight 5 (app data)
-    */
+     * Recv flight 5 (app data)
+     */
+    if (!TEST_int_eq(SSL_read(cssl, buf, sizeof(buf)), (int)sizeof(msg)))
+        goto end;
+
+    testresult = 1;
+end:
+    SSL_free(cssl);
+    SSL_free(sssl);
+    SSL_CTX_free(cctx);
+    SSL_CTX_free(sctx);
+
+    return testresult;
+}
+
+static int test_duplicate_app_data(void)
+{
+    SSL_CTX *sctx = NULL, *cctx = NULL;
+    SSL *sssl = NULL, *cssl = NULL;
+    int testresult = 0;
+    BIO *bio;
+    char msg[] = { 0x00, 0x01, 0x02, 0x03 };
+    char buf[10];
+    int ret;
+
+    if (!TEST_true(create_ssl_ctx_pair(NULL, DTLS_server_method(),
+            DTLS_client_method(),
+            DTLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
+        return 0;
+
+#ifndef OPENSSL_NO_DTLS1_2
+    if (!TEST_true(SSL_CTX_set_cipher_list(cctx, "AES128-SHA")))
+        goto end;
+#else
+    /* Default sigalgs are SHA1 based in <DTLS1.2 which is in security level 0 */
+    if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "AES128-SHA:@SECLEVEL=0"))
+        || !TEST_true(SSL_CTX_set_cipher_list(cctx,
+            "AES128-SHA:@SECLEVEL=0")))
+        goto end;
+#endif
+
+    if (!TEST_true(create_ssl_objects(sctx, cctx, &sssl, &cssl,
+            NULL, NULL)))
+        goto end;
+
+    /* Send flight 1: ClientHello */
+    if (!TEST_int_le(SSL_connect(cssl), 0))
+        goto end;
+
+    /* Recv flight 1, send flight 2: ServerHello, Certificate, ServerHelloDone */
+    if (!TEST_int_le(SSL_accept(sssl), 0))
+        goto end;
+
+    /* Recv flight 2, send flight 3: ClientKeyExchange, CCS, Finished */
+    if (!TEST_int_le(SSL_connect(cssl), 0))
+        goto end;
+
+    /* Recv flight 3, send flight 4: datagram 0(NST, CCS) datagram 1(Finished) */
+    if (!TEST_int_gt(SSL_accept(sssl), 0))
+        goto end;
+
+    bio = SSL_get_wbio(sssl);
+    if (!TEST_ptr(bio))
+        goto end;
+
+    /*
+     * Send flight 4 (cont'd): datagram 2(app data)
+     * + datagram 3 (app data duplicate)
+     */
+    if (!TEST_int_eq(SSL_write(sssl, msg, sizeof(msg)), (int)sizeof(msg)))
+        goto end;
+
+    if (!TEST_true(mempacket_dup_last_packet(bio)))
+        goto end;
+
+    /* App data comes before NST/CCS */
+    if (!TEST_true(mempacket_move_packet(bio, 0, 2)))
+        goto end;
+
+    /*
+     * Recv flight 4 (datagram 2): app data + flight 4 (datagram 0): NST, CCS, +
+     *      + flight 4 (datagram 1): Finished
+     */
+    if (!TEST_int_gt(SSL_connect(cssl), 0))
+        goto end;
+
+    /*
+     * Read flight 4 (app data)
+     */
     if (!TEST_int_eq(SSL_read(cssl, buf, sizeof(buf)), (int)sizeof(msg)))
         goto end;
 
+    if (!TEST_mem_eq(buf, sizeof(msg), msg, sizeof(msg)))
+        goto end;
+
+    /*
+     * Read flight 4, datagram 3. We expect the duplicated app data to have been
+     * dropped, with no more data available
+     */
+    if (!TEST_int_le(ret = SSL_read(cssl, buf, sizeof(buf)), 0)
+        || !TEST_int_eq(SSL_get_error(cssl, ret), SSL_ERROR_WANT_READ))
+        goto end;
+
     testresult = 1;
- end:
+end:
     SSL_free(cssl);
     SSL_free(sssl);
     SSL_CTX_free(cctx);
@@ -595,16 +689,16 @@ static int test_listen(void)
     int testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, DTLS_server_method(),
-                                       DTLS_client_method(),
-                                       DTLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            DTLS_client_method(),
+            DTLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         return 0;
 
 #ifdef OPENSSL_NO_DTLS1_2
     /* Default sigalgs are SHA1 based in <DTLS1.2 which is in security level 0 */
     if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "DEFAULT:@SECLEVEL=0"))
-            || !TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                                  "DEFAULT:@SECLEVEL=0")))
+        || !TEST_true(SSL_CTX_set_cipher_list(cctx,
+            "DEFAULT:@SECLEVEL=0")))
         goto end;
 #endif
 
@@ -612,7 +706,7 @@ static int test_listen(void)
     SSL_CTX_set_cookie_verify_cb(sctx, verify_cookie_cb);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     DTLS_set_timer_cb(clientssl, timer_cb);
@@ -623,11 +717,11 @@ static int test_listen(void)
      * DTLSv1_listen() is used.
      */
     if (!TEST_true(create_bare_ssl_connection(serverssl, clientssl,
-                                              SSL_ERROR_NONE, 1, 1)))
+            SSL_ERROR_NONE, 1, 1)))
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -646,7 +740,7 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(cert = test_get_argument(0))
-            || !TEST_ptr(privkey = test_get_argument(1)))
+        || !TEST_ptr(privkey = test_get_argument(1)))
         return 0;
 
     ADD_ALL_TESTS(test_dtls_unprocessed, NUM_TESTS);
@@ -658,6 +752,7 @@ int setup_tests(void)
     ADD_TEST(test_just_finished);
     ADD_ALL_TESTS(test_swap_records, 4);
     ADD_TEST(test_listen);
+    ADD_TEST(test_duplicate_app_data);
 
     return 1;
 }
diff --git a/test/dtlsv1listentest.c b/test/dtlsv1listentest.c
index 212bdfd782172..eb08fdb4e0be6 100644
--- a/test/dtlsv1listentest.c
+++ b/test/dtlsv1listentest.c
@@ -158,7 +158,6 @@ static const unsigned char clienthello_cookie_frag[] = {
     0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13 /* Cookie */
 };
 
-
 /* A ClientHello with a bad cookie */
 static const unsigned char clienthello_badcookie[] = {
     0x16, /* Handshake */
@@ -242,7 +241,9 @@ typedef struct {
      * VERIFY == 0 return value, HelloVerifyRequest sent
      * DROP == 0 return value, no output
      */
-    enum {GOOD, VERIFY, DROP} outtype;
+    enum { GOOD,
+        VERIFY,
+        DROP } outtype;
 } tests;
 
 static tests testpackets[9] = {
@@ -257,7 +258,7 @@ static tests testpackets[9] = {
     { record_short, sizeof(record_short), DROP }
 };
 
-# define COOKIE_LEN  20
+#define COOKIE_LEN 20
 
 static int cookie_gen(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len)
 {
@@ -271,7 +272,7 @@ static int cookie_gen(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len)
 }
 
 static int cookie_verify(SSL *ssl, const unsigned char *cookie,
-                         unsigned int cookie_len)
+    unsigned int cookie_len)
 {
     unsigned int i;
 
@@ -299,14 +300,14 @@ static int dtls_listen_test(int i)
     int ret, success = 0;
 
     if (!TEST_ptr(ctx = SSL_CTX_new(DTLS_server_method()))
-            || !TEST_ptr(peer = BIO_ADDR_new()))
+        || !TEST_ptr(peer = BIO_ADDR_new()))
         goto err;
     SSL_CTX_set_cookie_generate_cb(ctx, cookie_gen);
     SSL_CTX_set_cookie_verify_cb(ctx, cookie_verify);
 
     /* Create an SSL object and set the BIO */
     if (!TEST_ptr(ssl = SSL_new(ctx))
-            || !TEST_ptr(outbio = BIO_new(BIO_s_mem())))
+        || !TEST_ptr(outbio = BIO_new(BIO_s_mem())))
         goto err;
     SSL_set0_wbio(ssl, outbio);
 
@@ -323,7 +324,7 @@ static int dtls_listen_test(int i)
 
     if (tp->outtype == VERIFY) {
         if (!TEST_int_eq(ret, 0)
-                || !TEST_mem_eq(data, datalen, verify, sizeof(verify)))
+            || !TEST_mem_eq(data, datalen, verify, sizeof(verify)))
             goto err;
     } else if (datalen == 0) {
         if (!TEST_true((ret == 0 && tp->outtype == DROP)
@@ -338,7 +339,7 @@ static int dtls_listen_test(int i)
     SSL_set0_rbio(ssl, NULL);
     success = 1;
 
- err:
+err:
     /* Also frees up outbio */
     SSL_free(ssl);
     SSL_CTX_free(ctx);
diff --git a/test/ec_internal_test.c b/test/ec_internal_test.c
index 0268142ae7fda..3756c0b2dadf3 100644
--- a/test/ec_internal_test.c
+++ b/test/ec_internal_test.c
@@ -40,15 +40,12 @@ static int group_field_tests(const EC_GROUP *group, BN_CTX *ctx)
         || !TEST_true(BN_is_one(b))
         /* (1/a)*a = 1 */
         || !TEST_true(BN_rand(a, BN_num_bits(group->field) - 1,
-                              BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY))
+            BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY))
         || !TEST_true(group->meth->field_inv(group, b, a, ctx))
-        || (group->meth->field_encode &&
-            !TEST_true(group->meth->field_encode(group, a, a, ctx)))
-        || (group->meth->field_encode &&
-            !TEST_true(group->meth->field_encode(group, b, b, ctx)))
+        || (group->meth->field_encode && !TEST_true(group->meth->field_encode(group, a, a, ctx)))
+        || (group->meth->field_encode && !TEST_true(group->meth->field_encode(group, b, b, ctx)))
         || !TEST_true(group->meth->field_mul(group, c, a, b, ctx))
-        || (group->meth->field_decode &&
-            !TEST_true(group->meth->field_decode(group, c, c, ctx)))
+        || (group->meth->field_decode && !TEST_true(group->meth->field_decode(group, c, c, ctx)))
         || !TEST_true(BN_is_one(c)))
         goto err;
 
@@ -56,25 +53,23 @@ static int group_field_tests(const EC_GROUP *group, BN_CTX *ctx)
     BN_zero(a);
     if (!TEST_false(group->meth->field_inv(group, b, a, ctx))
         || !TEST_true(ERR_GET_LIB(ERR_peek_last_error()) == ERR_LIB_EC)
-        || !TEST_true(ERR_GET_REASON(ERR_peek_last_error()) ==
-                      EC_R_CANNOT_INVERT)
+        || !TEST_true(ERR_GET_REASON(ERR_peek_last_error()) == EC_R_CANNOT_INVERT)
         /* 1/p = error */
         || !TEST_false(group->meth->field_inv(group, b, group->field, ctx))
         || !TEST_true(ERR_GET_LIB(ERR_peek_last_error()) == ERR_LIB_EC)
-        || !TEST_true(ERR_GET_REASON(ERR_peek_last_error()) ==
-                      EC_R_CANNOT_INVERT))
+        || !TEST_true(ERR_GET_REASON(ERR_peek_last_error()) == EC_R_CANNOT_INVERT))
         goto err;
 
     ERR_clear_error();
     ret = 1;
- err:
+err:
     BN_CTX_end(ctx);
     return ret;
 }
 
 /* wrapper for group_field_tests for explicit curve params and EC_METHOD */
 static int field_tests(const EC_METHOD *meth, const unsigned char *params,
-                       int len)
+    int len)
 {
     BN_CTX *ctx = NULL;
     BIGNUM *p = NULL, *a = NULL, *b = NULL;
@@ -97,7 +92,7 @@ static int field_tests(const EC_METHOD *meth, const unsigned char *params,
         goto err;
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     if (group != NULL)
@@ -144,7 +139,7 @@ static int field_tests_ecp_simple(void)
 {
     TEST_info("Testing EC_GFp_simple_method()\n");
     return field_tests(EC_GFp_simple_method(), params_p256,
-                       sizeof(params_p256) / 3);
+        sizeof(params_p256) / 3);
 }
 
 /* test EC_GFp_mont_method directly */
@@ -152,7 +147,7 @@ static int field_tests_ecp_mont(void)
 {
     TEST_info("Testing EC_GFp_mont_method()\n");
     return field_tests(EC_GFp_mont_method(), params_p256,
-                       sizeof(params_p256) / 3);
+        sizeof(params_p256) / 3);
 }
 
 #ifndef OPENSSL_NO_EC2M
@@ -192,11 +187,11 @@ static int ec2m_field_sanity(void)
         goto out;
     if (!TEST_ptr_null(group3 = EC_GROUP_new_curve_GF2m(p, a, b, ctx)))
         TEST_error("GF2m polynomial degree > %d accepted",
-                   OPENSSL_ECC_MAX_FIELD_BITS);
+            OPENSSL_ECC_MAX_FIELD_BITS);
 
     ret = group1 == NULL && group2 == NULL && group3 == NULL;
 
- out:
+out:
     EC_GROUP_free(group1);
     EC_GROUP_free(group2);
     EC_GROUP_free(group3);
@@ -211,7 +206,7 @@ static int field_tests_ec2_simple(void)
 {
     TEST_info("Testing EC_GF2m_simple_method()\n");
     return field_tests(EC_GF2m_simple_method(), params_b283,
-                       sizeof(params_b283) / 3);
+        sizeof(params_b283) / 3);
 }
 #endif
 
@@ -231,7 +226,7 @@ static int field_tests_default(int n)
         goto err;
 
     ret = 1;
- err:
+err:
     if (group != NULL)
         EC_GROUP_free(group);
     if (ctx != NULL)
@@ -252,12 +247,10 @@ static int underflow_test(void)
     BIGNUM *x1 = NULL, *y1 = NULL, *z1 = NULL, *x2 = NULL, *y2 = NULL;
     BIGNUM *k = NULL;
     int testresult = 0;
-    const char *x1str =
-        "1534f0077fffffe87e9adcfe000000000000000000003e05a21d2400002e031b1f4"
-        "b80000c6fafa4f3c1288798d624a247b5e2ffffffffffffffefe099241900004";
-    const char *p521m1 =
-        "1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-        "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe";
+    const char *x1str = "1534f0077fffffe87e9adcfe000000000000000000003e05a21d2400002e031b1f4"
+                        "b80000c6fafa4f3c1288798d624a247b5e2ffffffffffffffefe099241900004";
+    const char *p521m1 = "1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                         "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe";
 
     ctx = BN_CTX_new();
     if (!TEST_ptr(ctx))
@@ -281,24 +274,24 @@ static int underflow_test(void)
         goto err;
 
     if (!TEST_int_gt(BN_hex2bn(&x1, x1str), 0)
-            || !TEST_int_gt(BN_hex2bn(&y1, p521m1), 0)
-            || !TEST_int_gt(BN_hex2bn(&z1, p521m1), 0)
-            || !TEST_int_gt(BN_hex2bn(&k, "02"), 0)
-            || !TEST_true(ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(grp, P, x1,
-                                                                             y1, z1, ctx))
-            || !TEST_true(EC_POINT_mul(grp, Q, NULL, P, k, ctx))
-            || !TEST_true(EC_POINT_get_affine_coordinates(grp, Q, x1, y1, ctx))
-            || !TEST_true(EC_POINT_dbl(grp, R, P, ctx))
-            || !TEST_true(EC_POINT_get_affine_coordinates(grp, R, x2, y2, ctx)))
+        || !TEST_int_gt(BN_hex2bn(&y1, p521m1), 0)
+        || !TEST_int_gt(BN_hex2bn(&z1, p521m1), 0)
+        || !TEST_int_gt(BN_hex2bn(&k, "02"), 0)
+        || !TEST_true(ossl_ec_GFp_simple_set_Jprojective_coordinates_GFp(grp, P, x1,
+            y1, z1, ctx))
+        || !TEST_true(EC_POINT_mul(grp, Q, NULL, P, k, ctx))
+        || !TEST_true(EC_POINT_get_affine_coordinates(grp, Q, x1, y1, ctx))
+        || !TEST_true(EC_POINT_dbl(grp, R, P, ctx))
+        || !TEST_true(EC_POINT_get_affine_coordinates(grp, R, x2, y2, ctx)))
         goto err;
 
     if (!TEST_int_eq(BN_cmp(x1, x2), 0)
-            || !TEST_int_eq(BN_cmp(y1, y2), 0))
+        || !TEST_int_eq(BN_cmp(y1, y2), 0))
         goto err;
 
     testresult = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     EC_POINT_free(P);
     EC_POINT_free(Q);
@@ -337,7 +330,7 @@ static int set_private_key(void)
 
     testresult = 1;
 
- err:
+err:
     EC_KEY_free(key);
     EC_KEY_free(aux_key);
     return testresult;
@@ -387,10 +380,10 @@ static int decoded_flag_test(void)
         || !TEST_ptr(grp_copy = EC_GROUP_new_from_ecpkparameters(ecpkparams))
         || !TEST_int_eq(grp_copy->decoded_from_explicit_params, 0)
         || !TEST_ptr(key = EC_KEY_new())
-    /* Test EC_KEY_decoded_from_explicit_params on key without a group */
+        /* Test EC_KEY_decoded_from_explicit_params on key without a group */
         || !TEST_int_eq(EC_KEY_decoded_from_explicit_params(key), -1)
         || !TEST_int_eq(EC_KEY_set_group(key, grp_copy), 1)
-    /* Test EC_KEY_decoded_from_explicit_params negative case */
+        /* Test EC_KEY_decoded_from_explicit_params negative case */
         || !TEST_int_eq(EC_KEY_decoded_from_explicit_params(key), 0))
         goto err;
     EC_GROUP_free(grp_copy);
@@ -426,13 +419,13 @@ static int decoded_flag_test(void)
         || !TEST_int_eq(EC_GROUP_get_asn1_flag(grp_copy), OPENSSL_EC_EXPLICIT_CURVE)
         || !TEST_int_eq(grp_copy->decoded_from_explicit_params, 1)
         || !TEST_int_eq(EC_KEY_set_group(key, grp_copy), 1)
-    /* Test EC_KEY_decoded_from_explicit_params positive case */
+        /* Test EC_KEY_decoded_from_explicit_params positive case */
         || !TEST_int_eq(EC_KEY_decoded_from_explicit_params(key), 1))
         goto err;
 
     testresult = 1;
 
- err:
+err:
     EC_KEY_free(key);
     EC_GROUP_free(grp);
     EC_GROUP_free(grp_copy);
@@ -443,8 +436,7 @@ static int decoded_flag_test(void)
     return testresult;
 }
 
-static
-int ecpkparams_i2d2i_test(int n)
+static int ecpkparams_i2d2i_test(int n)
 {
     EC_GROUP *g1 = NULL, *g2 = NULL;
     FILE *fp = NULL;
@@ -457,7 +449,7 @@ int ecpkparams_i2d2i_test(int n)
 
     /* encode params to file */
     if (!TEST_ptr(fp = fopen("params.der", "wb"))
-            || !TEST_true(i2d_ECPKParameters_fp(fp, g1)))
+        || !TEST_true(i2d_ECPKParameters_fp(fp, g1)))
         goto end;
 
     /* flush and close file */
@@ -469,7 +461,7 @@ int ecpkparams_i2d2i_test(int n)
 
     /* decode params from file */
     if (!TEST_ptr(fp = fopen("params.der", "rb"))
-            || !TEST_ptr(g2 = d2i_ECPKParameters_fp(fp, NULL)))
+        || !TEST_ptr(g2 = d2i_ECPKParameters_fp(fp, NULL)))
         goto end;
 
     testresult = 1; /* PASS */
@@ -484,7 +476,6 @@ int ecpkparams_i2d2i_test(int n)
     return testresult;
 }
 
-
 static int check_bn_mont_ctx(BN_MONT_CTX *mont, BIGNUM *mod, BN_CTX *ctx)
 {
     int ret = 0;
@@ -503,7 +494,7 @@ static int check_bn_mont_ctx(BN_MONT_CTX *mont, BIGNUM *mod, BN_CTX *ctx)
 
     ret = 1;
 
- err:
+err:
     BN_MONT_CTX_free(regenerated);
     return ret;
 }
@@ -525,7 +516,7 @@ static int montgomery_correctness_test(EC_GROUP *group)
             goto err;
     }
     ret = 1;
- err:
+err:
     BN_CTX_free(ctx);
     return ret;
 }
@@ -537,11 +528,11 @@ static int named_group_creation_test(void)
 
     if (!TEST_ptr(group = EC_GROUP_new_by_curve_name(NID_X9_62_prime256v1))
         || !TEST_true(montgomery_correctness_test(group)))
-      goto err;
+        goto err;
 
     ret = 1;
 
- err:
+err:
     EC_GROUP_free(group);
     return ret;
 }
diff --git a/test/ecdsatest.c b/test/ecdsatest.c
index 0ddbf6690dcac..6afaa2cf183af 100644
--- a/test/ecdsatest.c
+++ b/test/ecdsatest.c
@@ -18,12 +18,12 @@
 
 #ifndef OPENSSL_NO_EC
 
-# include <openssl/evp.h>
-# include <openssl/bn.h>
-# include <openssl/ec.h>
-# include <openssl/rand.h>
-# include "internal/nelem.h"
-# include "ecdsatest.h"
+#include <openssl/evp.h>
+#include <openssl/bn.h>
+#include <openssl/ec.h>
+#include <openssl/rand.h>
+#include "internal/nelem.h"
+#include "ecdsatest.h"
 
 static fake_random_generate_cb fbytes;
 
@@ -33,7 +33,7 @@ static EC_builtin_curve *curves = NULL;
 static OSSL_PROVIDER *fake_rand = NULL;
 
 static int fbytes(unsigned char *buf, size_t num, ossl_unused const char *name,
-                  EVP_RAND_CTX *ctx)
+    EVP_RAND_CTX *ctx)
 {
     int ret = 0;
     static int fbytes_counter = 0;
@@ -51,7 +51,7 @@ static int fbytes(unsigned char *buf, size_t num, ossl_unused const char *name,
 
     fbytes_counter = (fbytes_counter + 1) % OSSL_NELEM(numbers);
     ret = 1;
- err:
+err:
     BN_free(tmp);
     return ret;
 }
@@ -120,7 +120,7 @@ static int x9_62_tests(int n)
     fake_rand_set_callback(RAND_get0_private(NULL), &fbytes);
     if (!TEST_true(EC_KEY_generate_key(key))
         || !TEST_true(p_len = EC_KEY_key2buf(key, POINT_CONVERSION_UNCOMPRESSED,
-                                             &pbuf, NULL))
+                          &pbuf, NULL))
         || !TEST_ptr(qbuf = OPENSSL_hexstr2buf(ecdsa_cavs_kats[n].Q, &q_len))
         || !TEST_int_eq(q_len, p_len)
         || !TEST_mem_eq(qbuf, q_len, pbuf, p_len))
@@ -130,7 +130,7 @@ static int x9_62_tests(int n)
     fake_rand_set_callback(RAND_get0_private(NULL), &fbytes);
     if (!TEST_true(ECDSA_sign_setup(key, NULL, &kinv, &rp))
         || !TEST_ptr(signature = ECDSA_do_sign_ex(digest, dgst_len,
-                                                  kinv, rp, key))
+                         kinv, rp, key))
         /* verify the signature */
         || !TEST_int_eq(ECDSA_do_verify(digest, dgst_len, signature, key), 1))
         goto err;
@@ -143,7 +143,7 @@ static int x9_62_tests(int n)
 
     ret = 1;
 
- err:
+err:
     OPENSSL_free(message);
     OPENSSL_free(pbuf);
     OPENSSL_free(qbuf);
@@ -210,16 +210,16 @@ static int test_builtin(int n, int as)
      */
     if (nid == NID_sm2 && as == EVP_PKEY_EC) {
         TEST_info("skipped: EC key type unsupported for curve %s",
-                  OBJ_nid2sn(nid));
+            OBJ_nid2sn(nid));
         return 1;
     } else if (nid != NID_sm2 && as == EVP_PKEY_SM2) {
         TEST_info("skipped: SM2 key type unsupported for curve %s",
-                  OBJ_nid2sn(nid));
+            OBJ_nid2sn(nid));
         return 1;
     }
 
     TEST_info("testing ECDSA for curve %s as %s key type", OBJ_nid2sn(nid),
-              as == EVP_PKEY_EC ? "EC" : "SM2");
+        as == EVP_PKEY_EC ? "EC" : "SM2");
 
     if (!TEST_ptr(mctx = EVP_MD_CTX_new())
         /* get some random message data */
@@ -326,7 +326,7 @@ static int test_builtin(int n, int as)
         goto err;
 
     ret = 1;
- err:
+err:
     EVP_PKEY_free(pkey);
     EVP_PKEY_free(pkey_neg);
     EVP_PKEY_free(dup_pk);
@@ -340,12 +340,12 @@ static int test_builtin_as_ec(int n)
     return test_builtin(n, EVP_PKEY_EC);
 }
 
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 static int test_builtin_as_sm2(int n)
 {
     return test_builtin(n, EVP_PKEY_SM2);
 }
-# endif
+#endif
 
 static int test_ecdsa_sig_NULL(void)
 {
@@ -358,27 +358,33 @@ static int test_ecdsa_sig_NULL(void)
     BIGNUM *kinv = NULL, *rp = NULL;
 
     ret = TEST_ptr(eckey = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1))
-          && TEST_int_eq(EC_KEY_generate_key(eckey), 1)
-          && TEST_int_eq(ECDSA_sign(0, dgst, sizeof(dgst), NULL, &siglen0,
-                                    eckey), 1)
-          && TEST_int_gt(siglen0, 0)
-          && TEST_ptr(sig = OPENSSL_malloc(siglen0))
-          && TEST_int_eq(ECDSA_sign(0, dgst, sizeof(dgst), sig, &siglen,
-                                    eckey), 1)
-          && TEST_int_gt(siglen, 0)
-          && TEST_int_le(siglen, siglen0)
-          && TEST_int_eq(ECDSA_verify(0, dgst, sizeof(dgst), sig, siglen,
-                                      eckey), 1)
-          && TEST_int_eq(ECDSA_sign_setup(eckey, NULL, &kinv, &rp), 1)
-          && TEST_int_eq(ECDSA_sign_ex(0, dgst, sizeof(dgst), NULL, &siglen,
-                                       kinv, rp, eckey), 1)
-          && TEST_int_gt(siglen, 0)
-          && TEST_int_le(siglen, siglen0)
-          && TEST_int_eq(ECDSA_sign_ex(0, dgst, sizeof(dgst), sig, &siglen0,
-                                       kinv, rp, eckey), 1)
-          && TEST_int_eq(siglen, siglen0)
-          && TEST_int_eq(ECDSA_verify(0, dgst, sizeof(dgst), sig, siglen,
-                                      eckey), 1);
+        && TEST_int_eq(EC_KEY_generate_key(eckey), 1)
+        && TEST_int_eq(ECDSA_sign(0, dgst, sizeof(dgst), NULL, &siglen0,
+                           eckey),
+            1)
+        && TEST_int_gt(siglen0, 0)
+        && TEST_ptr(sig = OPENSSL_malloc(siglen0))
+        && TEST_int_eq(ECDSA_sign(0, dgst, sizeof(dgst), sig, &siglen,
+                           eckey),
+            1)
+        && TEST_int_gt(siglen, 0)
+        && TEST_int_le(siglen, siglen0)
+        && TEST_int_eq(ECDSA_verify(0, dgst, sizeof(dgst), sig, siglen,
+                           eckey),
+            1)
+        && TEST_int_eq(ECDSA_sign_setup(eckey, NULL, &kinv, &rp), 1)
+        && TEST_int_eq(ECDSA_sign_ex(0, dgst, sizeof(dgst), NULL, &siglen,
+                           kinv, rp, eckey),
+            1)
+        && TEST_int_gt(siglen, 0)
+        && TEST_int_le(siglen, siglen0)
+        && TEST_int_eq(ECDSA_sign_ex(0, dgst, sizeof(dgst), sig, &siglen0,
+                           kinv, rp, eckey),
+            1)
+        && TEST_int_eq(siglen, siglen0)
+        && TEST_int_eq(ECDSA_verify(0, dgst, sizeof(dgst), sig, siglen,
+                           eckey),
+            1);
     EC_KEY_free(eckey);
     OPENSSL_free(sig);
     BN_free(kinv);
@@ -406,9 +412,9 @@ int setup_tests(void)
     }
     ADD_ALL_TESTS(test_builtin_as_ec, crv_len);
     ADD_TEST(test_ecdsa_sig_NULL);
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
     ADD_ALL_TESTS(test_builtin_as_sm2, crv_len);
-# endif
+#endif
     ADD_ALL_TESTS(x9_62_tests, OSSL_NELEM(ecdsa_cavs_kats));
 #endif
     return 1;
diff --git a/test/ecdsatest.h b/test/ecdsatest.h
index 63fe31902582f..700d7b5253c85 100644
--- a/test/ecdsatest.h
+++ b/test/ecdsatest.h
@@ -8,7 +8,7 @@
  */
 
 #ifndef OSSL_TEST_ECDSATEST_H
-# define OSSL_TEST_ECDSATEST_H
+#define OSSL_TEST_ECDSATEST_H
 
 /*-
  * NIST CAVP ECDSA KATs:
@@ -21,10194 +21,10195 @@
  */
 
 typedef struct {
-    const int nid;              /* curve NID */
-    const int md_nid;           /* hash function NID */
-    const char *msg;            /* message to sign */
-    const char *d;              /* ECDSA private key */
-    const char *Q;              /* ECDSA public key: Q = dG */
-    const char *k;              /* ECDSA nonce */
-    const char *r;              /* ECDSA signature (r,s) */
+    const int nid; /* curve NID */
+    const int md_nid; /* hash function NID */
+    const char *msg; /* message to sign */
+    const char *d; /* ECDSA private key */
+    const char *Q; /* ECDSA public key: Q = dG */
+    const char *k; /* ECDSA nonce */
+    const char *r; /* ECDSA signature (r,s) */
     const char *s;
 } ecdsa_cavs_kat_t;
 
 static const ecdsa_cavs_kat_t ecdsa_cavs_kats[] = {
     /* prime KATs from X9.62 */
-    {NID_X9_62_prime192v1, NID_sha1,
-     "616263",                  /* "abc" */
-     "1a8d598fc15bf0fd89030b5cb1111aeb92ae8baf5ea475fb",
-     "0462b12d60690cdcf330babab6e69763b471f994dd702d16a563bf5ec08069705ffff65e"
-     "5ca5c0d69716dfcb3474373902",
-     "fa6de29746bbeb7f8bb1e761f85f7dfb2983169d82fa2f4e",
-     "885052380ff147b734c330c43d39b2c4a89f29b0f749fead",
-     "e9ecc78106def82bf1070cf1d4d804c3cb390046951df686"},
-    {NID_X9_62_prime239v1, NID_sha1,
-     "616263",                  /* "abc" */
-     "7ef7c6fabefffdea864206e80b0b08a9331ed93e698561b64ca0f7777f3d",
-     "045b6dc53bc61a2548ffb0f671472de6c9521a9d2d2534e65abfcbd5fe0c707fd9f1ed2e"
-     "65f09f6ce0893baf5e8e31e6ae82ea8c3592335be906d38dee",
-     "656c7196bf87dcc5d1f1020906df2782360d36b2de7a17ece37d503784af",
-     "2cb7f36803ebb9c427c58d8265f11fc5084747133078fc279de874fbecb0",
-     "2eeae988104e9c2234a3c2beb1f53bfa5dc11ff36a875d1e3ccb1f7e45cf"},
+    { NID_X9_62_prime192v1, NID_sha1,
+        "616263", /* "abc" */
+        "1a8d598fc15bf0fd89030b5cb1111aeb92ae8baf5ea475fb",
+        "0462b12d60690cdcf330babab6e69763b471f994dd702d16a563bf5ec08069705ffff65e"
+        "5ca5c0d69716dfcb3474373902",
+        "fa6de29746bbeb7f8bb1e761f85f7dfb2983169d82fa2f4e",
+        "885052380ff147b734c330c43d39b2c4a89f29b0f749fead",
+        "e9ecc78106def82bf1070cf1d4d804c3cb390046951df686" },
+    { NID_X9_62_prime239v1, NID_sha1,
+        "616263", /* "abc" */
+        "7ef7c6fabefffdea864206e80b0b08a9331ed93e698561b64ca0f7777f3d",
+        "045b6dc53bc61a2548ffb0f671472de6c9521a9d2d2534e65abfcbd5fe0c707fd9f1ed2e"
+        "65f09f6ce0893baf5e8e31e6ae82ea8c3592335be906d38dee",
+        "656c7196bf87dcc5d1f1020906df2782360d36b2de7a17ece37d503784af",
+        "2cb7f36803ebb9c427c58d8265f11fc5084747133078fc279de874fbecb0",
+        "2eeae988104e9c2234a3c2beb1f53bfa5dc11ff36a875d1e3ccb1f7e45cf" },
     /* prime KATs from NIST CAVP */
-    {NID_secp224r1, NID_sha224,
-     "699325d6fc8fbbb4981a6ded3c3a54ad2e4e3db8a5669201912064c64e700c139248cdc1"
-     "9495df081c3fc60245b9f25fc9e301b845b3d703a694986e4641ae3c7e5a19e6d6edbf1d"
-     "61e535f49a8fad5f4ac26397cfec682f161a5fcd32c5e780668b0181a91955157635536a"
-     "22367308036e2070f544ad4fff3d5122c76fad5d",
-     "16797b5c0c7ed5461e2ff1b88e6eafa03c0f46bf072000dfc830d615",
-     "04605495756e6e88f1d07ae5f98787af9b4da8a641d1a9492a12174eabf5cc733b17decc"
-     "806ef1df861a42505d0af9ef7c3df3959b8dfc6669",
-     "d9a5a7328117f48b4b8dd8c17dae722e756b3ff64bd29a527137eec0",
-     "2fc2cff8cdd4866b1d74e45b07d333af46b7af0888049d0fdbc7b0d6",
-     "8d9cc4c8ea93e0fd9d6431b9a1fd99b88f281793396321b11dac41eb"},
-    {NID_secp224r1, NID_sha224,
-     "7de42b44db0aa8bfdcdac9add227e8f0cc7ad1d94693beb5e1d325e5f3f85b3bd033fc25"
-     "e9469a89733a65d1fa641f7e67d668e7c71d736233c4cba20eb83c368c506affe77946b5"
-     "e2ec693798aecd7ff943cd8fab90affddf5ad5b8d1af332e6c5fe4a2df16837700b2781e"
-     "08821d4fbdd8373517f5b19f9e63b89cfeeeef6f",
-     "cf020a1ff36c28511191482ed1e5259c60d383606c581948c3fbe2c5",
-     "04fa21f85b99d3dc18c6d53351fbcb1e2d029c00fa7d1663a3dd94695ee9e79578f8988b"
-     "168edff1a8b34a5ed9598cc20acd1f0aed36715d88",
-     "c780d047454824af98677cf310117e5f9e99627d02414f136aed8e83",
-     "45145f06b566ec9fd0fee1b6c6551a4535c7a3bbfc0fede45f4f5038",
-     "7302dff12545b069cf27df49b26e4781270585463656f2834917c3ca"},
-    {NID_secp224r1, NID_sha224,
-     "af0da3adab82784909e2b3dadcecba21eced3c60d7572023dea171044d9a10e8ba67d31b"
-     "04904541b87fff32a10ccc6580869055fec6216a00320a28899859a6b61faba58a0bc10c"
-     "2ba07ea16f214c3ddcc9fc5622ad1253b63fe7e95227ae3c9caa9962cffc8b1c4e826003"
-     "6469d25ab0c8e3643a820b8b3a4d8d43e4b728f9",
-     "dde6f173fa9f307d206ce46b4f02851ebce9638a989330249fd30b73",
-     "04fc21a99b060afb0d9dbf3250ea3c4da10be94ce627a65874d8e4a630e8373ab7190890"
-     "326aac4aacca3eba89e15d1086a05434dd033fd3f3",
-     "6629366a156840477df4875cfba4f8faa809e394893e1f5525326d07",
-     "41f8e2b1ae5add7c24da8725a067585a3ad6d5a9ed9580beb226f23a",
-     "a5d71bff02dce997305dd337128046f36714398f4ef6647599712fae"},
-    {NID_secp224r1, NID_sha224,
-     "cfa56ae89727df6b7266f69d6636bf738f9e4f15f49c42a0123edac4b3743f32ea52389f"
-     "919ceb90575c4184897773b2f2fc5b3fcb354880f15c93383215d3c2551fcc1b4180a1ac"
-     "0f69c969bbc306acd115ce3976eff518540f43ad4076dbb5fbad9ce9b3234f1148b8f5e0"
-     "59192ff480fc4bcbd00d25f4d9f5ed4ba5693b6c",
-     "aeee9071248f077590ac647794b678ad371f8e0f1e14e9fbff49671e",
-     "04fad0a34991bbf89982ad9cf89337b4bd2565f84d5bdd004289fc1cc35d8b6764f28c81"
-     "63a12855a5c266efeb9388df4994b85a8b4f1bd3bc",
-     "1d35d027cd5a569e25c5768c48ed0c2b127c0f99cb4e52ea094fe689",
-     "2258184ef9f0fa698735379972ce9adf034af76017668bfcdab978de",
-     "866fb8e505dea6c909c2c9143ec869d1bac2282cf12366130ff2146c"},
-    {NID_secp224r1, NID_sha224,
-     "c223c8009018321b987a615c3414d2bb15954933569ca989de32d6bf11107bc47a330ab6"
-     "d88d9b50d106cf5777d1b736b14bc48deda1bc573a9a7dd42cd061860645306dce7a5ba8"
-     "c60f135a6a21999421ce8c4670fe7287a7e9ea3aa1e0fa82721f33e6e823957fe86e2283"
-     "c89ef92b13cd0333c4bb70865ae1919bf538ea34",
-     "29c204b2954e1406a015020f9d6b3d7c00658298feb2d17440b2c1a4",
-     "040e0fc15e775a75d45f872e5021b554cc0579da19125e1a49299c7630cb64fe462d025a"
-     "e2a1394746bdbf8251f7ca5a1d6bb13e0edf6b7b09",
-     "39547c10bb947d69f6c3af701f2528e011a1e80a6d04cc5a37466c02",
-     "86622c376d326cdf679bcabf8eb034bf49f0c188f3fc3afd0006325d",
-     "26613d3b33c70e635d7a998f254a5b15d2a3642bf321e8cff08f1e84"},
-    {NID_secp224r1, NID_sha224,
-     "1c27273d95182c74c100d85b5c08f4b26874c2abc87f127f304aedbf52ef6540eba16dd6"
-     "64ae1e9e30ea1e66ff9cc9ab5a80b5bcbd19dde88a29ff10b50a6abd73388e8071306c68"
-     "d0c9f6caa26b7e68de29312be959b9f4a5481f5a2ad2070a396ed3de21096541cf58c4a1"
-     "3308e08867565bf2df9d649357a83cdcf18d2cd9",
-     "8986a97b24be042a1547642f19678de4e281a68f1e794e343dabb131",
-     "042c070e68e8478341938f3d5026a1fe01e778cdffbebbdd7a4cd29209cde21c9c7c6590"
-     "ba300715a7adac278385a5175b6b4ea749c4b6a681",
-     "509712f9c0f3370f6a09154159975945f0107dd1cee7327c68eaa90b",
-     "57afda5139b180de96373c3d649700682e37efd56ae182335f081013",
-     "eb6cd58650cfb26dfdf21de32fa17464a6efc46830eedc16977342e6"},
-    {NID_secp224r1, NID_sha224,
-     "069ae374971627f6b8503f3aa63ab52bcf4f3fcae65b98cdbbf917a5b08a10dc76005671"
-     "4db279806a8d43485320e6fee0f1e0562e077ee270ace8d3c478d79bcdff9cf8b92fdea6"
-     "8421d4a276f8e62ae379387ae06b60af9eb3c40bd7a768aeffccdc8a08bc78ca2eca1806"
-     "1058043a0e441209c5c594842838a4d9d778a053",
-     "d9aa95e14cb34980cfddadddfa92bde1310acaff249f73ff5b09a974",
-     "043a0d4b8e5fad1ea1abb8d3fb742cd45cd0b76d136e5bbb33206ad120c90ac83276b2fa"
-     "3757b0f226cd7360a313bc96fd8329c76a7306cc7d",
-     "1f1739af68a3cee7c5f09e9e09d6485d9cd64cc4085bc2bc89795aaf",
-     "09bbdd003532d025d7c3204c00747cd52ecdfbc7ce3dde8ffbea23e1",
-     "1e745e80948779a5cc8dc5cb193beebb550ec9c2647f4948bf58ba7d"},
-    {NID_secp224r1, NID_sha224,
-     "d0d5ae3e33600aa21c1606caec449eee678c87cb593594be1fbb048cc7cfd076e5cc7132"
-     "ebe290c4c014e7a517a0d5972759acfa1438d9d2e5d236d19ac92136f6252b7e5bea7588"
-     "dcba6522b6b18128f003ecab5cb4908832fb5a375cf820f8f0e9ee870653a73dc2282f2d"
-     "45622a2f0e85cba05c567baf1b9862b79a4b244e",
-     "380fb6154ad3d2e755a17df1f047f84712d4ec9e47d34d4054ea29a8",
-     "044772c27cca3348b1801ae87b01cb564c8cf9b81c23cc74468a907927de9d253935b096"
-     "17a1655c42d385bf48504e06fa386f5fa533a21dcb",
-     "14dbdffa326ba2f3d64f79ff966d9ee6c1aba0d51e9a8e59f5686dc1",
-     "ff6d52a09ca4c3b82da0440864d6717e1be0b50b6dcf5e1d74c0ff56",
-     "09490be77bc834c1efaa23410dcbf800e6fae40d62a737214c5a4418"},
-    {NID_secp224r1, NID_sha224,
-     "79b7375ae7a4f2e4adad8765d14c1540cd9979db38076c157c1837c760ca6febbb18fd42"
-     "152335929b735e1a08041bd38d315cd4c6b7dd2729de8752f531f07fe4ddc4f1899debc0"
-     "311eef0019170b58e08895b439ddf09fbf0aeb1e2fd35c2ef7ae402308c3637733802601"
-     "dd218fb14c22f57870835b10818369d57d318405",
-     "6b98ec50d6b7f7ebc3a2183ff9388f75e924243827ddded8721186e2",
-     "041f249911b125348e6e0a473479105cc4b8cfb4fa32d897810fc69ffea17db03b9877d1"
-     "b6328329061ea67aec5a38a884362e9e5b7d7642dc",
-     "ab3a41fedc77d1f96f3103cc7dce215bf45054a755cf101735fef503",
-     "70ccc0824542e296d17a79320d422f1edcf9253840dafe4427033f40",
-     "e3823699c355b61ab1894be3371765fae2b720405a7ce5e790ca8c00"},
-    {NID_secp224r1, NID_sha224,
-     "8c7de96e6880d5b6efc19646b9d3d56490775cb3faab342e64db2e388c4bd9e94c4e69a6"
-     "3ccdb7e007a19711e69c06f106b71c983a6d97c4589045666c6ab5ea7b5b6d096ddf6fd3"
-     "5b819f1506a3c37ddd40929504f9f079c8d83820fc8493f97b2298aebe48fdb4ff472b29"
-     "018fc2b1163a22bfbb1de413e8645e871291a9f6",
-     "8dda0ef4170bf73077d685e7709f6f747ced08eb4cde98ef06ab7bd7",
-     "047df67b960ee7a2cb62b22932457360ab1e046c1ec84b91ae65642003c764ca9fc1b0cc"
-     "2233fa57bdcfedaab0131fb7b5f557d6ca57f4afe0",
-     "9ef6ebd178a76402968bc8ec8b257174a04fb5e2d65c1ab34ab039b9",
-     "eef9e8428105704133e0f19636c89e570485e577786df2b09f99602a",
-     "8c01f0162891e4b9536243cb86a6e5c177323cca09777366caf2693c"},
-    {NID_secp224r1, NID_sha224,
-     "c89766374c5a5ccef5823e7a9b54af835ac56afbbb517bd77bfecf3fea876bd0cc9ea486"
-     "e3d685cfe3fb05f25d9c67992cd7863c80a55c7a263249eb3996c4698ad7381131bf3700"
-     "b7b24d7ca281a100cf2b750e7f0f933e662a08d9f9e47d779fb03754bd20931262ff381a"
-     "2fe7d1dc94f4a0520de73fa72020494d3133ecf7",
-     "3dbe18cd88fa49febfcb60f0369a67b2379a466d906ac46a8b8d522b",
-     "04b10150fd797eb870d377f1dbfa197f7d0f0ad29965af573ec13cc42a17b63ccefbe27f"
-     "b2a1139e5757b1082aeaa564f478c23a8f631eed5c",
-     "385803b262ee2ee875838b3a645a745d2e199ae112ef73a25d68d15f",
-     "1d293b697f297af77872582eb7f543dc250ec79ad453300d264a3b70",
-     "517a91b89c4859fcc10834242e710c5f0fed90ac938aa5ccdb7c66de"},
-    {NID_secp224r1, NID_sha224,
-     "30f0e3b502eec5646929d48fd46aa73991d82079c7bd50a38b38ec0bd84167c8cf5ba39b"
-     "ec26999e70208af9b445046cd9d20c82b7629ca1e51bdd00daddbc35f9eb036a15ac5789"
-     "8642d9db09479a38cc80a2e41e380c8a766b2d623de2de798e1eabc02234b89b85d60154"
-     "460c3bf12764f3fbf17fcccc82df516a2fbe4ecf",
-     "c906b667f38c5135ea96c95722c713dbd125d61156a546f49ddaadc6",
-     "043c9b4ef1748a1925578658d3af51995b989ad760790157b25fe0982655648f4ff4edfb"
-     "899e9a13bd8d20f5c24b35dc6a6a4e42ed5983b4a0",
-     "b04d78d8ac40fefadb99f389a06d93f6b5b72198c1be02dbff6195f0",
-     "4bdd3c84647bad93dcaffd1b54eb87fc61a5704b19d7e6d756d11ad0",
-     "fdd81e5dca54158514f44ba2330271eff4c618330328451e2d93b9fb"},
-    {NID_secp224r1, NID_sha224,
-     "6bbb4bf987c8e5069e47c1a541b48b8a3e6d14bfd9ac6dfaa7503b64ab5e1a55f63e91cf"
-     "5c3e703ac27ad88756dd7fb2d73b909fc15302d0592b974d47e72e60ed339a40b34d39a4"
-     "9b69ea4a5d26ce86f3ca00a70f1cd416a6a5722e8f39d1f0e966981803d6f46dac34e4c7"
-     "640204cd0d9f1e53fc3acf30096cd00fa80b3ae9",
-     "3456745fbd51eac9b8095cd687b112f93d1b58352dbe02c66bb9b0cc",
-     "04f0acdfbc75a748a4a0ac55281754b5c4a364b7d61c5390b334daae1086587a6768f235"
-     "bf523fbfc6e062c7401ac2b0242cfe4e5fb34f4057",
-     "854b20c61bcdf7a89959dbf0985880bb14b628f01c65ef4f6446f1c1",
-     "a2601fbb9fe89f39814735febb349143baa934170ffb91c6448a7823",
-     "bf90f9305616020a0e34ef30803fc15fa97dffc0948452bbf6cb5f66"},
-    {NID_secp224r1, NID_sha224,
-     "05b8f8e56214d4217323f2066f974f638f0b83689fc4ed1201848230efdc1fbca8f70359"
-     "cecc921050141d3b02c2f17aa306fc2ce5fc06e7d0f4be162fcd985a0b687b4ba09b681c"
-     "b52ffe890bf5bb4a104cb2e770c04df433013605eb8c72a09902f4246d6c22b8c191ef1b"
-     "0bece10d5ce2744fc7345307dd1b41b6eff0ca89",
-     "2c522af64baaca7b7a08044312f5e265ec6e09b2272f462cc705e4c3",
-     "045fad3c047074b5de1960247d0cc216b4e3fb7f3b9cd960575c8479fce4fc9c7f05ff0b"
-     "040eb171fdd2a1dfe2572c564c2003a08c3179a422",
-     "9267763383f8db55eed5b1ca8f4937dc2e0ca6175066dc3d4a4586af",
-     "422e2e9fe535eb62f11f5f8ce87cf2e9ec65e61c06737cf6a0019ae6",
-     "116cfcf0965b7bc63aecade71d189d7e98a0434b124f2afbe3ccf0a9"},
-    {NID_secp224r1, NID_sha224,
-     "e5c979f0832242b143077bce6ef146a53bb4c53abfc033473c59f3c4095a68b7a504b609"
-     "f2ab163b5f88f374f0f3bff8762278b1f1c37323b9ed448e3de33e6443796a9ecaa466aa"
-     "75175375418186c352018a57ce874e44ae72401d5c0f401b5a51804724c10653fded9066"
-     "e8994d36a137fdeb9364601daeef09fd174dde4a",
-     "3eff7d07edda14e8beba397accfee060dbe2a41587a703bbe0a0b912",
-     "046dd84f4d66f362844e41a7913c40b4aad5fa9ba56bb44c2d2ed9efac15f65ebcdf2fd9"
-     "f8035385a330bdabec0f1cd9cc7bc31d2fadbe7cda",
-     "7bb48839d7717bab1fdde89bf4f7b4509d1c2c12510925e13655dead",
-     "127051d85326049115f307af2bc426f6c2d08f4774a0b496fb6982b1",
-     "6857e84418c1d1179333b4e5307e92abade0b74f7521ad78044bf597"},
-    {NID_secp224r1, NID_sha256,
-     "2b49de971bb0f705a3fb5914eb7638d72884a6c3550667dbfdf301adf26bde02f387fd42"
-     "6a31be6c9ff8bfe8690c8113c88576427f1466508458349fc86036afcfb66448b947707e"
-     "791e71f558b2bf4e7e7507773aaf4e9af51eda95cbce0a0f752b216f8a54a045d47801ff"
-     "410ee411a1b66a516f278327df2462fb5619470e",
-     "888fc992893bdd8aa02c80768832605d020b81ae0b25474154ec89aa",
-     "044c741e4d20103670b7161ae72271082155838418084335338ac38fa4db7919151ac285"
-     "87b72bad7ab180ec8e95ab9e2c8d81d9b9d7e2e383",
-     "06f7a56007825433c4c61153df1a135eee2f38ec687b492ed40d9c90",
-     "0909c9b9cae8d2790e29db6afdb45c04f5b072c4c20410c7dc9b6772",
-     "298f4fcae1fe271da1e0345d11d07a1fca43f58af4c113b909eedea0"},
-    {NID_secp224r1, NID_sha256,
-     "1fa7201d96ad4d190415f2656d1387fa886afc38e5cd18b8c60da367acf32c627d2c9ea1"
-     "9ef3f030e559fc2a21695cdbb65ddf6ba36a70af0d3fa292a32de31da6acc6108ab2be8b"
-     "d37843338f0c37c2d62648d3d49013edeb9e179dadf78bf885f95e712fcdfcc8a172e47c"
-     "09ab159f3a00ed7b930f628c3c48257e92fc7407",
-     "5b5a3e186e7d5b9b0fbdfc74a05e0a3d85dc4be4c87269190c839972",
-     "04897089f4ef05b943eeac06589f0e09ccc571a6add3eb1610a2fc830f62ba3f6b3e6f0f"
-     "062058b93e6f25b6041246c5be13584a41cae7e244",
-     "5b6f7eca2bcc5899fce41b8169d48cd57cf0c4a1b66a30a150072676",
-     "f12c9985d454ffbc899ebbbb6cf43e3debcac7f19029f8f2f35cce31",
-     "12fcb848adbd8b1b4c72b2b54a04d936e4a5f480ae2a3ea2e3c1baae"},
-    {NID_secp224r1, NID_sha256,
-     "74715fe10748a5b98b138f390f7ca9629c584c5d6ad268fc455c8de2e800b73fa1ea9aae"
-     "e85de58baa2ce9ce68d822fc31842c6b153baef3a12bf6b4541f74af65430ae931a64c8b"
-     "4950ad1c76b31aea8c229b3623390e233c112586aa5907bbe419841f54f0a7d6d19c003b"
-     "91dc84bbb59b14ec477a1e9d194c137e21c75bbb",
-     "f60b3a4d4e31c7005a3d2d0f91cb096d016a8ddb5ab10ecb2a549170",
-     "0440a4ab1e6a9f84b4dedb81795e6a7124d1cfdfd7ec64c5d4b9e3266683aa32a3c2fc06"
-     "8e62626f2dafce5d7f050e826e5c145cd2d13d1b27",
-     "c31150420dfb38ba8347e29add189ec3e38c14b0c541497fb90bf395",
-     "bf6c6daa89b21211ea2c9f45192d91603378d46b1a5057962dafaf12",
-     "cb6b237950e0f0369323055cd1f643528c7a64616f75b11c4ddd63c7"},
-    {NID_secp224r1, NID_sha256,
-     "d10131982dd1a1d839aba383cd72855bf41061c0cb04dfa1acad3181f240341d744ca600"
-     "2b52f25fb3c63f16d050c4a4ef2c0ebf5f16ce987558f4b9d4a5ad3c6b81b617de00e04b"
-     "a32282d8bf223bfedbb325b741dfdc8f56fa85c65d42f05f6a1330d8cc6664ad32050dd7"
-     "b9e3993f4d6c91e5e12cbd9e82196e009ad22560",
-     "c8fc474d3b1cba5981348de5aef0839e376f9f18e7588f1eed7c8c85",
-     "0466f49457ed15f67ed4042195856f052fe774077f61cebcb9efddc3653a6e3f3423eec7"
-     "308a69eb1b0416d67cc3b84d24f251d7cbdb45c079",
-     "5e5405ae9ab6164bb476c1bb021ec78480e0488736e4f8222920fbd9",
-     "7b7beaf9f696ca1a8051527478c4c075ab45aa4768937886dbf38618",
-     "93d4cf110a37c5a6f15c4e6024822118539e860dee2f60b8c3f462f6"},
-    {NID_secp224r1, NID_sha256,
-     "ef9dbd90ded96ad627a0a987ab90537a3e7acc1fdfa991088e9d999fd726e3ce1e1bd89a"
-     "7df08d8c2bf51085254c89dc67bc21e8a1a93f33a38c18c0ce3880e958ac3e3dbe8aec49"
-     "f981821c4ac6812dd29fab3a9ebe7fbd799fb50f12021b48d1d9abca8842547b3b99befa"
-     "612cc8b4ca5f9412e0352e72ab1344a0ac2913db",
-     "04ef5d2a45341e2ace9af8a6ebd25f6cde45453f55b7a724eb6c21f6",
-     "048d642868e4d0f55ee62a2052e6b806b566d2ac79dbde7939fe72577379505a57cd5690"
-     "4d2523b3e1281e9021167657d38aeb7d42fc8ec849",
-     "ec60ea6f3d6b74d102e5574182566b7e79a69699a307fee70a2d0d22",
-     "2fd7fcbb7832c97ce325301dd338b279a9e28b8933284d49c6eabcf6",
-     "550b2f1efc312805a6ed8f252e692d8ee19eaa5bcd5d0cda63a1a3f0"},
-    {NID_secp224r1, NID_sha256,
-     "4cc91f744ac858d3577e48813219aa3538dd813b186b42d1e6218376f07cc1cc448ddd6b"
-     "37240e98bf953f49cf54d65c12878b33c0bf6eb1c60254f0b6fa974f847e53abc56773ee"
-     "f6f29885dfc619e6a48fc15a667ca94001a0c945b6357a53221b0f4b266181456b0d2d25"
-     "e90708777f1a6f85971c00140c631c1991e0fd06",
-     "35d4bbe77d149812339e85c79483cb270bdac56bbf30b5ef3d1f4d39",
-     "047924b1d7f5920cce98e25094e40f2eb3eb80d70b17e14b3d36c3671c26c5af35f71e61"
-     "858582b7cc2b41790597c53ee514ffdf7a289d108c",
-     "751869c1d0e79eb30aae8fbfb6d97bfa332123fd6b6c72c9cd3c1796",
-     "26bb1b92b0f01e94eba5fa429271371db527ce857abba13bd1103f64",
-     "836aba9c63e1252c2b2d72a21e6a41b82241ebe32647e7f814652bcb"},
-    {NID_secp224r1, NID_sha256,
-     "58f43cc1924de4bc5867664adbc9d26b4f096a43aca47c27c52851b006dc2a658919ef9c"
-     "e5b5ac48372703be15ac51631c2bd84b88f479f113b0569a9a09e230ec1e8e573474c607"
-     "5284d3e57d973829af35325d9e7dab4a5f9b065155bbcaff3642a82ef4c9b9e127d3575c"
-     "050721653da3b087d3fa394192897a5519527d19",
-     "2c291a393281b75264c9b8817af684fa86a1cdc900822f74039dc5d6",
-     "0418cb5826ad60e6696bf07655032a3749f6577ca36da3ccd6e66a137c194e14820fe02d"
-     "784fd1363ff7a30399518309765bd3f4412d646da2",
-     "e2a860416229dfd3f5a5cc92344ca015093a543943a0d8f73bf2b2fd",
-     "00e300c1ef4a8c4ca5da6413856f8981db49de29bdf03f32ffc3ceab",
-     "f250f18a51ba5f63e1584097841099fa6ae4e98ee458c061d1d5aed7"},
-    {NID_secp224r1, NID_sha256,
-     "113a2806b052fde683ee09453098e402204155afb3776fd1cad3a9103421d327eab8f9ec"
-     "0dd050ffcc83f93b34ea707705fabeccfe43ab1a71c95298fd3ec769d99ead1066950eee"
-     "677d225816e0faad19cf69e1b35d16771689e2092cafe16d7c0dd7b0db73fffb8d0f3eae"
-     "d83004dd21e753530ec939c89ba25578fa5f785b",
-     "831ea25dbeda33d272a1382c5def0e83929170ab06a629eed6ee244b",
-     "04076518e393940d42dfd09819409d66966d8c9189c83d554a9cc8a08244d0ceaf4c0f50"
-     "e46bea4a52e30423ce3ada19edd363ac5694c65cb8",
-     "6be6dd9f6a083915ccba54626caf12d246d3aece0a7eda7d8d85599c",
-     "ff1460946e06fb6f5d35e8d2625ca70ffb9b45308e3fabf6ad8351b1",
-     "6029aa3990918e8cb8a388d53b0772e5cdfff49c3405fe0d3a95933a"},
-    {NID_secp224r1, NID_sha256,
-     "64cbfc8f2e2149a31b3e8a80c4a552f6c62aaeb7990b6e0ee55500a9d17be04213406578"
-     "caf315951086dff5c2af3b5ce17d425d185101ef26f86396ba3a129a4f3f8e2dd595f59e"
-     "fb6c0f5c2dcc394569d7268695e9ac7daa84203f1f1895f1f9e4b514a5c9cd23baa63454"
-     "710144fe735ad9b8f42d8c43267aa434a26d7e5f",
-     "70f74c7324ef137318b610ead8ddc5b964e0eed3750b20612fc2e67b",
-     "04279649e2a2918e683520cde3fc98b0ae58a7100e8de35e7c9cc797b6aa4de6be34be61"
-     "f02880139787b9038f4554a8ef1c994b887c2974b5",
-     "8e984864f86f7a2a73f3edda17dbccd13fac8fa4b872814abf223b1b",
-     "3b18736fa11d04e27e2614cda03a63ec11a180f357b0b3192920d09c",
-     "2f0f3dbd570727b14fbb29155538e62c930dd51c4035275c1365dc60"},
-    {NID_secp224r1, NID_sha256,
-     "a10a11c8e30fff118d371daf824f16c08200b83ea059436466a4611ccac93b2dea2de8c1"
-     "006f946196aef7fe9b0c251a391b0340f21797798278b412ff2b53842eec6450728e2bca"
-     "062f8337a2c204b9ea04ff660cd4d4db559f2f11c4d8ef199021339fcc82396f7a93926c"
-     "f5f247e37d8067fe50692de54f102bd5ab51925c",
-     "026be5789886d25039c11d7d58a11a6e1d52cb1d5657561f2165b8a8",
-     "043fa617c50b177da1a2bdb98b780ad21ad1195c4bd24465f6187de3c9e3fd8d8876dfd0"
-     "3a4a4e31a1acad3a08d983826d286c250c4e5620c1",
-     "0128b8e3f50731eb5fcc223517fc0cf6b96cd1d2807eb4524bc46f77",
-     "3a6b633f96f3d0b6d54f7fb29ac33709e4f0dd8fa0e51606ed9765ca",
-     "63e8c119dfa51784decd864f6911f2210a80f8f02d472d88df10d119"},
-    {NID_secp224r1, NID_sha256,
-     "b3f720bf566ffa369259f4361959ae0641d2755ec264a4c4349981df2b02563275b2b9ad"
-     "b5aee47f7a456760a971991ffed6b17809bb9694138d1677fa916123795239353158fc6b"
-     "22d10f20d26f5d2dcd8c56c44373eea5b93067dba2d7c5318dac2e9e8714873cb1b37f58"
-     "c011fd14fa1e535554efe05f468bfc8e11cd8b99",
-     "e79c18d935c2839644762867aa793201f96a3cde080c5968412ce784",
-     "04b7ae1e992b1c7fde1141f40bd913358538ca0f07f62b729f13cea327811252d12120e0"
-     "4805fc171a439d382c43b68a21e1a0bdf5e4ec1da4",
-     "7abedab1d36f4f0959a03d968b27dd5708223b66e0fc48594d827361",
-     "d35047d74e1e7305bb8c1a94e8ae47cb1591c3437a3e185e00afe710",
-     "d9c425c9d5feb776ac8952e6c4eee0ecd68aef2f0e7bff2e49c9185e"},
-    {NID_secp224r1, NID_sha256,
-     "0a398a46df7ccc48d1e7833f8bbc67100f1ef77a62dc78bbc115b2a662f9591fbaaa91ad"
-     "3d788e2fdd1b3164e45293d4f5686c151296901768028ac80ded4bf89c647ad35f0c7c4c"
-     "b318c0c757c1d83c44d850e5fd4677281b3f13b1ee54de79c8c042813f9d3312dcc6111a"
-     "68299cb7e829557d7f3d96e702f65aefc6499415",
-     "0d087f9d1f8ae29c9cf791490efc4a5789a9d52038c4b1d22494ad8c",
-     "04cd95cf8fb1cd21690f40d647f2353672a1076cc6c46bddaad2d0fc56934262f74d9ee0"
-     "f8a2754f64cb7415923d64bf00c94a39b52803f577",
-     "557d0e3995dc6377b3911546dd7aeaeec62a6d8f2af6a274382fc37f",
-     "56df0ea6afdcc232ceb41729eec00cf906b69b6e28423a36d3c92cc5",
-     "f4f70fd948c9a147f55317fdea7b8a84c33e721014552d5800d63edc"},
-    {NID_secp224r1, NID_sha256,
-     "8c33616821a6038b448d8918668977fcf1ef5aa0cf7c341837b39bbcc9bca875a3757f4b"
-     "392630e9995b9bbe4eb66978b877586adaa02f99d2344dae082a7603351d8ffcfca081ab"
-     "403cd0acb90d078dd1d0789c2eb3185c62bff2d9f04cd38e509e3b83c12ed0a5c6808fc4"
-     "2f7ba5b06acdc496c8ad9be648ee6a4505f8560f",
-     "0830aebb6577d3a3be3ba54a4501c987b0e0bb593267b9bbadb66583",
-     "04b88652020e083ccc1c43dc83d1881884dd4c7e3b4e3460b344b1ea6422b69b517f86d7"
-     "c26dc37c0f8feb4bb07fe876149fbcc3334fd2805b",
-     "e4f4a3280574c704c2fde47ca81ec883d27f2c5a961a294db7cda9d2",
-     "b30b8a0079d9a134b5e1618c2ac63e3fbe0e95866b9dbc5f423f2707",
-     "3dc36746610271ef66e0aa52cc2ccadc5c9b08dc769e4dc4f6538c11"},
-    {NID_secp224r1, NID_sha256,
-     "94d56535fd4edfe67a0daa6579f9d53bf6b7b8830ae2aeb62892ff59f18756ddf2811b44"
-     "9c7d20d65d54f8507de4e7c50eaa084830637812aa4b250a4d61ab67845be36e4a41cdc0"
-     "a70f8d6e3a63d4514f0dc197e6486015046a316153d5f3a3a4a0ae1ed7ea5fa55e12e73d"
-     "333333685c02e0eb636234ea7e6d4b76b4b76b5a",
-     "2acc9b97e625263e8e4cd164302c7d1e078bfcdd706111a13ccda5b2",
-     "04ce1a06f82df874dded37cca03b56c0648e4e8917ecd40ee73ee61588ceb6177b8f1ac7"
-     "c5c6e6e1f7737cc3026952ee392badd2cd7af32f9d",
-     "e401fa80f96480d437ed4f61a783888062ec33d530b188fd48016a6d",
-     "28674f447c4742e4087bbccfb522fbad4e18b56031d2ce8f532b078a",
-     "a5a7a13d15b423dd17771f73cea98d89dbffa846cc209b45c0e29b76"},
-    {NID_secp224r1, NID_sha256,
-     "5d8ebdf9eb28b47bdafaa36bf0b66a9eaf99b6c83959da4f2b1151b4f4ecd28fb115a64c"
-     "0cb9491093a7e9b9c53ec423e4c72e7765bb9c818da0e8c428667e44474a71db4867130c"
-     "77c40bfd8544b2d7b9d6464d2b8e6a48482153256a32437c3a747231f51134dd14c70340"
-     "7e31146a6fcde23bededcf16950486e90ca69ac0",
-     "f4e873d4fb944fb52323406f933815092b7672221de4d1c45917f3fc",
-     "040dc2cdddb990341adb1de73f02d87fc3822485a659a15145f4251d5fcf78b2a83c7352"
-     "eda1af2c74e1804ea04b35f76c04e89d90281dc2bb",
-     "5d1476c682a64162fd2fdc82696fc8cab1469a86f707ea2757416e40",
-     "82982b38ed465138df4018d7cfb835edcb591cb57446ca49d163782b",
-     "8ef1d7b326cabee7f7ab95b7b98d3c27a069c0fd95a1599c0ccb422b"},
-    {NID_secp224r1, NID_sha384,
-     "25e4416695f77551fdce276355528ccf1ddc2483821c5d22d751d50111ca2fadc6593b52"
-     "c74f4b5957494f1df25b0b2f86950d0d19229ec6506fee8581d2dd09d48418b146ff16bd"
-     "84a17ca0dc83b1888eb407376da6c8a88fa1e60b8c2a2471dfde4b3996ef673d5bde3d70"
-     "c434dc9f2488e9de16ae657d29e5e59ec922a1ec",
-     "62c572ee0d6f81b27e591d788bfc2f42b5105d2663078dfb58069ebd",
-     "04bd6ba605639b98fa8113a16a3bb004ddfaec901c98a931206165f4a5a3190b10ef39e8"
-     "8abd60b2293b4707512b45c6c5ed5794cc11454427",
-     "0f0bb1e428bcdebf4dc62a5278068efc0f8ce75f89e89b3630f102b2",
-     "aac0ea27e129f544abcc77f110e70bbdd5aa3e425dc39d5e8887025d",
-     "10e5dd06aee6b8419a04aa33d9d5678b0039c3acc3c4b61fe106bfdc"},
-    {NID_secp224r1, NID_sha384,
-     "9164d633a553deccf3cbd2effccf1387fa3177cd28c95d94a7d1a3e159c5e5c027758cc2"
-     "6493301b2f4d141d8d07a5fe5fead987ce5f30abeafcb48c302afc6c2309f0e93d9b6818"
-     "cbb6972d222cb7b01302dfe202ae83b89f53150ae4a0e2b8fc0fd1091f19b4ab2e6ab213"
-     "ab322d04f2c5f57113bfad3c5675227237abf773",
-     "e2f86bf73ba9336fa023343060f038e9ad41e5fe868e9f80574619a3",
-     "04f5d5346f17898ea6bbdfff19c216a8757a5dc37b95315f5481628381ae61fd172ac8b7"
-     "a4f13870a932dece465834cbd4f50bbcfb802c824e",
-     "35724ac043e3b44b73b5a7919cf675190306d26aa67c27c28c873534",
-     "535147c265af138eec50c7fb570bcc8d2e6f675597b0fcc034e536bc",
-     "743812c188a1dddf9fb34b90738f8b2e58760d6cd20ccceb1bb9c516"},
-    {NID_secp224r1, NID_sha384,
-     "019df05929321ecea7ee1de4f412aba1c8d3c24437db04b194a68a0a59dd871be10bd3a4"
-     "be6edf551350ea49fc7155a4d887e1221486291abe77a30633a4c4f7868fe2df24311cba"
-     "0c73804883954460e122387ed414111ff96ff1aebac8b6a6491d8a0d16e48a63bf3d027c"
-     "0f68ee4a4b234d73b412196706af8ea022b4dcef",
-     "b0a203438e2586d7575bc417a4a798e47abc22aa3955b58fc2789f17",
-     "04dc5d217862a1e5b00c95affa9d8b925a72b9beaeb7a86dc397e788d85f05f8e976ae1e"
-     "b1036eca6d683a82850795bf9127dee5f8b2859445",
-     "408e9c8b1f33136d6ddb93ff3a498bc09d4eee99bf69cdd5af0aa5a2",
-     "1b5a964c8b1fc634c6e2b82322499df1d7f0c12a4d2a77723c816ab8",
-     "cf54599a36ca064fae0aa936de5266f87704409d22a15d28c01b7f2a"},
-    {NID_secp224r1, NID_sha384,
-     "5d09d2b1d3fa6e12c10d8b26dc9aabc8dc02bd06e63ff33f8bb91ede4b8694592a69e4ed"
-     "4cdf6820069e2b9c7803658949e877ffe23bf90bcf5ce1409c06c71d86885a94048b05ac"
-     "0ec9db193e489a5a2bfa367caf6aa8ecdb032be366174343f6875d2fe1785e8d77334f5f"
-     "469cec64998e08d3303e5c9a1923b34fdc105d65",
-     "efcfa50fad6fb2065f9a55f28c0c42fa24c809ccb19b6fc6d8ffb085",
-     "0461521a0cfb72be77ba33cb3b8e022743cd9130ff49e97093b71aa178ce0819aedaf6fc"
-     "e639d0e593f8ab0147eeb6058f5f2b448231584ea9",
-     "d1eea821f286eae6ebc1f61b08f9ad4323a3787e94af4c32cd31351b",
-     "b37caaa71103752ac559f9eb4943324409ebfa8b585f684dcaa5c411",
-     "7c28e7619e2944ab4b7be022878c8052ebdf2cae5dff4f976c49686a"},
-    {NID_secp224r1, NID_sha384,
-     "50f6dfc81c6cf189e0a310f992907fe93356cee9dea9a41c7671a8daf3f4cfe0c459ce61"
-     "22c1e731dbf7593419d7114cb73b46956158a982c5d52c72f43f0f822046093c69aeff1f"
-     "7e4cd8af00ba655c5baa2e7b6a400b4be1f6fd51b3e4cfb35a69c80a28c5cafb771b6c2e"
-     "52e0aeef0e3fd045e8d40745f3f8b74fd969f816",
-     "61a17816937987764cdc064dc7b5b4f5b16db1023acdfe25902957dd",
-     "04a7e975c0a8f87c683bb8e31bc160843a7b69c945f4850bd60e1c08c08930a454dcc2aa"
-     "13bed7ea89368b2c9d689d816b2acf4e52585ee9c4",
-     "44b1fdec2629f9075f89c134ac28ff19bfddaa9db02a5d7f853582b4",
-     "b0f5635d8bc9c53a1d54a3ec63de59ed66e6b2358d4ab79755414326",
-     "67c68fe265c7e5aba4232deeafb88545a2aa266fb9f2c2bb3f3ae8d2"},
-    {NID_secp224r1, NID_sha384,
-     "e90129ac6672c85bb7b6b18e9dc199c96c81fd65034b53c77818364d512366fb9cd1bc7c"
-     "82404c451e561fc1ed916c0948f6ac561b33a1ccca093f07684b8c2bafa9e966377bd208"
-     "556018a5bafb9edcecf70498c7140fe9c8cf3ad8b8c3b0aa489df797944465047465415b"
-     "b0e24333235fcdd59a98829a3941eaaf62033e82",
-     "79d5367314ec664aa0f6ca36f95549502a05bf8400bf532d669fab8d",
-     "043191f0237102dac159032ab2dde53cf56c9ec827b5caddfe9e83c02ab496b1bdcca443"
-     "4ac0d0d91ea38ff3bc33f9f54095bfe17796d5a9e2",
-     "da529c52f5cc1f435d873109cd991d6cd7e1631d9ff1dd9521dd5db6",
-     "8e0ac63903f4921755430572c3f08bc272790639bdf1009fe2a9a714",
-     "6278c841a2d0a270791fe54b36c49d426d67907aa4e4f59c8638ad97"},
-    {NID_secp224r1, NID_sha384,
-     "3c9a483c9bee33b601549c592a82e95b4319b1e74b777877f0971bcb4273716b268e8f99"
-     "f876e42f942f4cf08284896bbc1ffbf094ac0956c3cedfc3580cffa8c74fc6db29a371f2"
-     "da2d05edb9185ece741fe0d3fabfe9d5b4d373755ebed13dc6840cfa3283b9ea46ec8b95"
-     "c434f253ae86998182e9cc0e95ee64f323fc74b0",
-     "1320eedad4745121793a7eaf732b0b4498f7cb456cac8cf45a1f66f0",
-     "049fdd99906ab77fd29e9021bde947d05a7a9eb153612269bfb0899bc9681b65b9ac8e4c"
-     "2899bb622dafb253b7bf5a6e38e5f6595f997c291a",
-     "66ed8d8934633f4125f593cf1b1d3745c4db1f15dde60cf46ca1c7f2",
-     "80199485a3a96447b39f7679cd47412a78675ba17dcbd10465dc5b48",
-     "a251fd9f136a3cb0dd0bc80659ae032e4a761ba7045da0034553fb8c"},
-    {NID_secp224r1, NID_sha384,
-     "bfc073fdda63c5fccaa0ca8770c293e8154e7aec56128bbac4fdbd541d602216ebf7ca1e"
-     "02b514d6e396f20683802ba3f334310a9226576926e3bb19ceee27738d13377cbafeb09d"
-     "091043501702a07aa31d1f29d50ddc55adcf16ffd40578e734a4e6cb6535f26ad48e0c62"
-     "ad90e79720000e87d419e92dca3e11f943655b03",
-     "e18821329447d3f65ba7279e96bd4624ffa1b32b90f6e8331b1e876d",
-     "0446c9ed837232c47022df2f1a1578fbe65ac9f2e81c98a74cc22ea31a6fc5e9568ae62b"
-     "31412a0b0b367242e9fd7e518c83aa06a069e1d90d",
-     "a4c1eb402a2fb3af26e0e14a3d2fc8ed3bc1a8b2475270356a79fdd3",
-     "d478b68733d8ad44be46766e7b66af782fbdc7ff7ed0b191176da98a",
-     "5eae9160ccf71fd1d359d89cecce72ef8afaeee2365f6ba828aa450a"},
-    {NID_secp224r1, NID_sha384,
-     "08079955d1a1f33728128c73673ec9f21a6ce138dcab5adc4dc068e6ab57314b9fbd8b01"
-     "3123b2fdafa9524fbdd0288777a233de8055cccfad83046ada6a19f01c47817496667bba"
-     "8fc8b9456fc0e044a562d931dab1adcb66af8b66325bdf28d83ded3e2937958ccd19da54"
-     "0d70ef2c189f55a506c9c0d63406394c5bd3823b",
-     "f73e030d5a696b358986d3efaca121cf71f775f8835a21e6135145d7",
-     "049ca2c6ea87ac8dd3a23a5b4010841a7c8af309038882ae44634bcf55b0a347dbd5ded3"
-     "b8702ac5a457e8b32bd4de06fd315095fa1b7d5fe1",
-     "e3cc786c1288ea567836c51d6d69dd0cab5c015987d936ccc3a4beb3",
-     "f1234da71761b7a0f49e661a419d2a739bdc4544bf87690e3d2f96db",
-     "096d16bf8020c3d3c233894ad8eb81206010e62c6e692a215e088fd4"},
-    {NID_secp224r1, NID_sha384,
-     "23900b768f6cd42b8a8df0dcbc9cb5daec8de36b9d5c619adcc1ba2b649103d5af123746"
-     "cdf19c3fd0665a6fb9338156182aa06181e3c6e37ce56979612af2927440424f89cef43f"
-     "c754854b8a5c43370808cf5f9929cf47712512ce2f8a2a20d2e9f568c2848b27dfbe0914"
-     "2843c83905ffa5da3b15501761b03dbc2c5398b6",
-     "7a0789323f8741c157a1753ae165ecaf8e8b03a60561f8b80cee467c",
-     "04101271a9addd4bd1f19d00bf116c8524f52cefd598e85dc381597acb2f17d14f4d8ccb"
-     "28b216553718152ba7c104646d8eca986dd9ddea39",
-     "d169f04f05b60c625cda864d187938863964dab7bb3b9dfc04b05519",
-     "e4a51be686a764b709da23ab48b1985e153c6ee238d945e743907afc",
-     "118a8f1ffe3cd556ce6345bd1a398dd9cc3729b7fd6d8af9bfd82f40"},
-    {NID_secp224r1, NID_sha384,
-     "1eb28c0bcdd18f73e347f957ece15b4cc83a771b0877e1feaac38e24028fb38ccea8b54e"
-     "e017dc7c3d5a1327bc6f40b294aa65d7dc487f278846cd101ee84202f14b38aa2c275046"
-     "aa2577f65ebaea41cd383e8def2fd0b4444dcf426fa75c4082cd7fa035cdb1e0d34a3c79"
-     "d42130f5b0273eae75bc701dda3aebe7358f41b5",
-     "78e795d0edb11fd9e28dc26b21e751aa89bea0d87932ef11c95c0e18",
-     "049edd544107977134bf6360d43ccabb3c94d627c03963c0a04b439627ece4c61d319a0e"
-     "41f3de7863e7c355bac94395aaa74cdb5f74a87a5b",
-     "36f7c0f76808b826a0a974a1fd6e155e00a73f1d34674a8f88be405a",
-     "3e319444438bc2cc92f323ea842cb402b3c3c2448c89869ef7998edb",
-     "3420cc38f058f41c31e71f4b1ad488f801111c73541de69fcee60695"},
-    {NID_secp224r1, NID_sha384,
-     "efab51855407438fd5c250670366bca3c026ecec4a59394f00d8a4b51746d0c456436665"
-     "6d507e3e13e62fe7abeb976b8859895848dbaecf6582f1898ea06f00d4247702ed9721bd"
-     "375aa83ae4c67c2eaa6e080777ea5ecf2cf787d785389560ac91cf63a52f0373c3185e18"
-     "a3b8a466e21b61a239f1b77624eb1acacc76c4e1",
-     "bee02d8bc5bffb3fd3b4c9d6f686409f02662d10150d1e58d689966a",
-     "048848f964c847fe9dddc774618d4588c9cd56bbe588d7b1fb369c8bfaebbb699fbd0dc0"
-     "8859fe9132285fe20dff3b9d561c0640b6e0717607",
-     "59f1450d857b40e5552a4b8cd4ab0df2f01716635d172c1106840f21",
-     "a206d8398a16a991bc217f77f23c6f648384f254f255a8a876404444",
-     "eb1169cb5b1423dc0bfaffe565ae57f986e00de06405e3e7b605862e"},
-    {NID_secp224r1, NID_sha384,
-     "31c29ca10279a417f0cc9b1382cf54dbfdfc89f2e6ef08c403c11f580cbf8674b141ed1a"
-     "417563282d99a55fc616d836421cde9424815c95e7fb7668bf3f137b29937f14882d74e0"
-     "34b732d78d91af7721aac4950734f5fa5d4b4d35534974f8cab6d2e6dca75ddb57e99148"
-     "c8a59df9fc5bcd723e546e8356f671cf2f65640a",
-     "dc0ddf6e501418bb8eafc5d7ccc143369e2aa441df8fc57d5f94a738",
-     "04063a5d632f4144376e14cfb03ad8ccf1489b613acd184d20dff66545e77727f057b043"
-     "d8a0f7458196b72e92d11f85b0891c6aaa9d915f58",
-     "ff0e5cae2671db7a1b90e22c63e7570bdd27352d45bac31e338debe0",
-     "5bc0b4998481ecbd3b6609184a84ca41d69b08c37138097f559259f8",
-     "0df8828eb1ca85e46405b94e1a2972c34c5e620a54e2f640f04aecc5"},
-    {NID_secp224r1, NID_sha384,
-     "8db476f92e332519c1a0ece5d8deded6efbd2d8e8784eea0a6b4c3b4296c35f5f8de4317"
-     "e5c1627b91fb1973fee86c06e4992aa5a20cb7475c8808ff1da354d07a488dffa7838c6e"
-     "c1e3f99e3acba831f27bee8434eeda3eb36d0c6df3658883cd40068b1bed841310f6eb38"
-     "d4a3d07d85848770ff7933c054cd8b34662660b1",
-     "229d89b2fcf8441ffc95ebb2ac2ef156e25825782044b2b8bd6a3e01",
-     "04de616848d8044a44789ef1ba3a6dd66fe9257ddc57f7534e59a701be26cbf74a6d25e5"
-     "b34b96d30f327abd574cff7f7dbe6686573a7d6c5c",
-     "3b18ca6ec8e8e255ac88f64302745ca0b73ff94b2b2d48be95b4aaee",
-     "fa94fd8b827c06115c1eefd50afc02ce5926ee0e789667783c01c34b",
-     "edf766a66973cfc33e4159966c07321a7f6549c3c60e8586ef41402b"},
-    {NID_secp224r1, NID_sha384,
-     "fcb272c828fe8fd3c6f8de9410c7b6e2b36717c1b0e5e359e9109bd7fc378978aa98182a"
-     "9d99961898ed88999b050d3b64d1457d7a899d6d273b9f4dde2aafa36d76329d62509043"
-     "c338f265fc4c7d938459b7fa3b230a9f6cb632b61489546bb4181a5ad7f0d7369b8caced"
-     "48eb374b075b2b325bc86add0f3b680cd9e80acd",
-     "97d747068147c0393a0bb5c159e2c9f1bd538f6204823294883abe28",
-     "043858a576eef2ce24d01766997fb81b3f3f78b6104cd188610be221d795ffc677ac7bfe"
-     "3e0bb4cffb17355a964c8356a807151b3cba5d1f4e",
-     "c1a2ec1ef16cfd5107c892790daefbed061be78bd8576696b60f64d5",
-     "18c908541843fcdac99b9ff6bb397f3f8094d16b42670216e4eaa2d7",
-     "c107a8a508ff57c5d4f78f86cc37e129c864d1c44ed5e73909613b74"},
-    {NID_secp224r1, NID_sha512,
-     "7522492bdb916a597b8121f3e5c273b1d2800ef8c1db4f7dcbae633b60d7da5193ba53a6"
-     "3d7a377b351897c3b24903ae1cd1994211b259be3e6ae2cbc8970e4957fdf782c7d1bc7a"
-     "91c80c8ef65468d4ef35428f26e2940ae8b0bd9b8074236bf6c00d0ebe83f9ddb2ade0f8"
-     "35138d39f33b59f244e0037c171f1ba7045a96f5",
-     "ba5374541c13597bded6880849184a593d69d3d4f0b1cb4d0919cbd6",
-     "04ac635fe00e8b7a3c8ef5655bdfb7f83e8532e59c0cc0b6534d810ffa1d067aebeba66e"
-     "79b28ecfe59ac6fdf5e1970dc3a84499c9d90cd8e2",
-     "187ed1f45c466cbafcd4b9577fb222408c011225dcccfd20f08b8d89",
-     "f83d54945997584c923c09662c34cf9ad1e987da8bfd9be600e7a098",
-     "4ff2dba9dba992c98a095b1144a539310e1a570e20c88b7d0aa1955c"},
-    {NID_secp224r1, NID_sha512,
-     "61097114ff855c3e34a62d9b853f8982d35f29cfa4a89893badbca7849e5fb437a1a38d6"
-     "451bf0ca5a0d528e352b8e4b57f2ea359a7fc8841d49dd3e570f9b016f14156b0bbc4be8"
-     "22e260bd147ec081454969e11cb0034b7450ef4deb7ed6edb977e2f4ed60121aa095fb0a"
-     "b40240dc329ecc917f5c64b4410612af065ee9dd",
-     "1e27187134d0a63542adf4665fba22f00cfc7b0a1e02effe913ceedc",
-     "04ecaea8ceea55c3bd418fd34a4ff2499e25e66a104eed846bc00c31d23933a356ab1f2d"
-     "abc303ff0a5d076131e77032e6f502336883bf78a7",
-     "34cb597deae9a3b1cada937abcd247161b19b2b336b20e2e42ae01f1",
-     "58177ba46fb291490b39368774accf72736412c1fb5ee0f27b9b1e02",
-     "58337d78b95a080bfcabb5809bee012501b4da84b8ef310a4628f11c"},
-    {NID_secp224r1, NID_sha512,
-     "dd09ae6c982bb1440ca175a87766fefeacc49393ff797c446200662744f37a6e30c5d33b"
-     "a70cbd8f12277fd6cc0704c17478bbab2a3047469e9618e3c340a9c8caaff5ce7c8a4d90"
-     "ecae6a9b84b813419dec14460298e7521c9b7fdb7a2089328005bd51d57f92a1bcbeecd3"
-     "4aa40482b549e006bbf6c4ce66d34a22dda4e0e0",
-     "0905b40e6c29bfcbf55e04266f68f10ca8d3905001d68bb61a27749b",
-     "04d656b73b131aa4c6336a57849ce0d3682b6ab2113d013711e8c297626328335ffc2029"
-     "afbfe2a15cc5636978778c3f9dab84840b05f2e705",
-     "dc82840d147f893497a82f023d7d2cbf0a3a5b2ac6cc1b9b23e504be",
-     "583af080e0ec7c1ba5a491a84889b7b7b11ccfe18927c7c219b11757",
-     "b23700035349df25d839f0973bef78a7515287de6c83707907074fa6"},
-    {NID_secp224r1, NID_sha512,
-     "37a73e2774d3b274db426c89b945696daa96035031f72cea01894b24508c7f81961ec254"
-     "d36ed6a0f448e11cf7950af769dc6cd2c47e52c6caf0ea92c270974f0214b4db436c36a6"
-     "0fb722060a6bb544462a82e1714f5906ec32886f7d59ebf289541c3a00ec1e004892ef2b"
-     "1286a0194f55d083c6ec92c64b8fd1452e1c68ba",
-     "afbaede5d75e4f241dd5b53220f3f5b9c1aa1d5d298e2d43236452dc",
-     "04fe83e59fc8ea8b939355d3258fe53a64d45f63031a0716b7cc416173f151d23060f1c8"
-     "56eb7f1f58be72a7228c3af89e43b56e9695b558c7",
-     "0fbbe7b40136c81a8fb894498d5502157a1cf5a89d0643de92cd38f6",
-     "24f3f457c7b72b7e759d5a8afbf330e31c5d8d2e36f92c0e79c5d87d",
-     "36fd1193def34f12a960740fd79fb38bf2b480726ccad540eb42cdf8"},
-    {NID_secp224r1, NID_sha512,
-     "9dc2046ffdc6804544db964481abe5d2d276a2a9eeec4c7ad40215b1de23561d402db69b"
-     "d0f6eec2254711eea4487c64d9a6b62c3ebaf5ffa8db6e7e3a6e17154d126967a47a853a"
-     "6f8339bdca9be306a13c7f992ded7619b0da59909a49b1e0930360e05b47f18628a36d69"
-     "b2f87f2bfddd6a5d4a72f84dc76dbdd43f3a6a35",
-     "950b07b0c2b7539a21b5135bfede214733f2e009647d38d8b21d760c",
-     "04f43d13bbfcee3b724063b3910fea49fd591b81e86fdb813b1a492d0c6b4c8d6fa5dc66"
-     "1889e3cf5ec64997a78222837885f85d2fe9b684fb",
-     "83e110d0d1e700d2f36543028737d2a2f1474aa3b4b28998a39e4793",
-     "2685265bc878e85d10ab13293dec190881a57c4a467f8fc2170432ea",
-     "80a347bb49036522369339bd6485a967cdda818915d8eb947302fcf9"},
-    {NID_secp224r1, NID_sha512,
-     "d9c6847fce688c5e7525a1098b545cb6c15dcd21a02761fc82fc664372a667390680135f"
-     "91c01a2fa5430c634b1a6d1cd6002d8aa021e7bf5956a7901c2f81bc25d502ba5f55a55f"
-     "30c0323dc68205cbefec0538e68654e7b327ac1743641896c3e740d8f66f400902b304ea"
-     "faa4e0d8cffae140536f0922444cc3216a675697",
-     "015bd9f5dfef393b431c3c7fced24385d861ccb563542574a5d2a9bc",
-     "04e868690641e2cda13b289a6c5d2fb175940396044d9cf27b4f2240af4c78c9abdf2b7f"
-     "c67ed4497001d7bcf1daca1739dc14a661f91d7c40",
-     "e2374350f47c08f3c1359d4edf87e61d1ba4e7dd1540d8d9062efa79",
-     "e12dc088d2bc032bb214c77d0e0fb749fc8e61ebe1ed72996f1084b6",
-     "0ab58aa31e0bba5fbc76855e6549f1036fba0a589aeab978ab01b8fb"},
-    {NID_secp224r1, NID_sha512,
-     "69df8a01b66f04930efd2012ff2243874f256ca8758145d2a9e4ecc84d0dbdbd0dc494ae"
-     "06db0ccbe819918137c90957114558580d6623efbafdd342b38dad9f08708084d32f874f"
-     "ba04782ce26aaab78de2102ad171f8a8f2b30b5bd3d55fdac5fa3acd6f7def7e61c25339"
-     "38572b331ba6d1c02bd74bfdbf7337ade8f4a190",
-     "0a3c259df933247445acffb6d8265b601d597fb9997dc2a1eb4deef4",
-     "04e67f4385a9da54253cc371ee9bc6739ae6385a4b87669c7baf0c460d2bb00b6ddd7b67"
-     "d9ac5653ec04ca8529fbf16f815c04da3c2e58e82d",
-     "8bf5859665b6a23e6b05a311580f60187ba1c4ae89e44877fb48af66",
-     "653675fb993c3fa9e57b32e33029ec230b966e8077c72c1ec90ddefc",
-     "792723bf87e315147cd4303de7f1dfe95cd7658ebb95c38c1a196140"},
-    {NID_secp224r1, NID_sha512,
-     "927524982b8d60777c1105c86fac05f634abf58c73f84fb95d81ba0b86e1e43592c4fcad"
-     "2e395a40fbe7005697d86088e2fb3bb7287eb3f917d4f2dc281f5cbe65d05b4f9623bca8"
-     "49b10a03beca6aa2056a12ebb91cf257ac448c5e9a78f8349a6a29b17c8978bef43a443c"
-     "bb8a149eb23f794844fc41693f2dbb97181444be",
-     "a1c8ef463f9e7e3dd63e677412f87cf9ea4ac9a6a2dae629da5b9916",
-     "04400e5cd4b315ceb309545cd3277acb70bdae2073fda6ad896ea14b27fbe1d2466cd2e1"
-     "16f38248bd5cabaa6cbe6c4a2694d998abd7b0c991",
-     "82f55a25d3ed6e47c22a6eed0fa52ed0818b87d6ea7950281dfefc09",
-     "16305a46a3f6f9e216ef8f6a6f5f0760d064a885657c864e1c1ea035",
-     "58fd97050bfbca6f87e64e1458c4ad80bae26e280356da344ad3b25d"},
-    {NID_secp224r1, NID_sha512,
-     "5f9042283561e7f19a436d01c7ef5a950a6d77ede5629cd7e43c0a5d58e8c5673c37945a"
-     "453291d12938253c71dbe12c8b022ba7276eda6be034ef5ec1ec77dbd1e08f0d7b8e7725"
-     "b7ec671c075e008a20f77f4ab266f97079b0aa6337df59a33b881954084057b21f294dd1"
-     "4bcb0869a4a6f1f597955ec7bf9d19bb3537a66a",
-     "fa511dbf6fef7e5e9c73e4555eb75d435f7884322d9faf5d78cacc0b",
-     "04e8dccd706c31f895f2f261ab979cbab51b8ae28196bcc12a42046380ec246be8e71ea3"
-     "859cb717a59990fe22e4b76858ff49becd70739a01",
-     "a37d665fe4314aa4cd03eb8e6a1f366b43e11fdb419c96b48f787b62",
-     "05e4909bcc172ab4140be291aad4660e375032bce2d762b6269ba764",
-     "e347a1c9d3670690e1d8d1d4cd9579848f442199c10526488da5cebf"},
-    {NID_secp224r1, NID_sha512,
-     "c2ae5573d3bf396523bfb703db8502fd0760cd1be528f6ddbfb95aad399e0b19f3bd9e0f"
-     "abdb05d49e3f893dffec5b627c9c2f7ad5f32e92e4e27a38cb5c28657657377fdfa1b66c"
-     "d7ac3d15c6d49df92d284db99f69744f37dc7cb4e7d52920fdb200a7942623a7057ba82e"
-     "467dcccaa5da416b48510d8364446a6a5e2a5aa8",
-     "a58bd53646400a646f0e4208320dc679a9664d1c6bfb27fdc8eac7ea",
-     "04e22e0dc4ecd96eb0071b72ba4b4988bf784f3fe73cb81bfb93d9ac4fb3e213e518bee1"
-     "367a4fb3703b9008bac9d95a1fc4aa61225fff9f3c",
-     "42c5b6f87d3bb1ed74f5ee8398d8f8c61e9e50ffa7a1da12d39893f9",
-     "5c0e5c6f057de1e99ef5d237a60d7a07fa9a42b120a82f573d9fb7b2",
-     "2fffc0bf550bd2f650fed085a84501cacfa6a1bb984df1f9237eaa59"},
-    {NID_secp224r1, NID_sha512,
-     "03c1a1cd30a039d0dcb22fee2450a7fa79495a0d0f4f43d2de4d75bce003c0334a8860f5"
-     "c164dbd94888a9f751235a3e570d31070e3e1293a7be616af7176600585d36ac01360015"
-     "7d2569d491da4b8a3bf3630c26e0b9925412189f50b0ae6f04c86477932e2ecd8c354610"
-     "6ae1ebc684cc3adb27ed665eddece886adea4ce3",
-     "64bd4452b572cc95510ac2e572f41136299ff17f6e8448f4ffb571d0",
-     "0492521fa25c2e034d127e0921efdb167f0b2ff8b20504487ed87fa264e72c770e37375a"
-     "d7dc2c4e63e5701826f6606f6ffb9461ee61b4e872",
-     "eaf76ee4d7e00d13d8a6d03dffd07ad9a8bb6dc8176c9f93059b1b7f",
-     "cf5058e2a6cf5e61a138b013eb292f38a1b9f07239ae5941dbce8919",
-     "d14198621650d985d270bc997da6e78588fd0ef843b874c66a3de3c3"},
-    {NID_secp224r1, NID_sha512,
-     "888f6d9bc7c86c0079fbfd42d8c08d6958f40f6e570fb0b1f03d2f8f8a63df4fcc87b379"
-     "a222cf835820a999d34996e08961f13b86b075e7fd1c303cd3baa44de42168561589012f"
-     "7e5300da4f8bdf470c07119a5d9f7ba7293568cd7c6a1b7fc1e41cda40bed7d46e5a28af"
-     "67ae2aabfefe67a86a1c601e6f5ee543e09bd7b6",
-     "7f3edb710df9d982f486233d0c176aa88f5a0ee81efa9b8145020294",
-     "04e7611e013e7b43ff5b8b57ad83333bffcc9e469ad23070b5791dc5947784da0a11dbe1"
-     "6208c6e0b6d5029e71fbec4dffc9fa046d3eeb71c9",
-     "94db7ef9a232593091eb9a74f289529c7e0d7fef21f80b3c8556b75e",
-     "a971f45bab10b1d16d7234ca8e4ec987da20d9e867f28aa063296e23",
-     "e38c538d65a7e1a28fd3ec53f015a7e5beb60e9d309f1e3ba4b2c3d2"},
-    {NID_secp224r1, NID_sha512,
-     "48453340f1317769e6ee6e103153714365731163dc18f84e9f2fa4b120f9c5a9645ee2f9"
-     "b66c84c26d95912b422b009b64af96aa418b2427a4209f2e7513ba8e43ec8cf20b34e752"
-     "9b22eb1199545afe9a9f7d9bcb320aec9ee0162f91c0d1dd9674c9c284f25199c5e109f6"
-     "f84d7ed0d269cc6413edb81bc2c83e37d644d8b9",
-     "b569f8296ff1d9cc01fffd9919016e5730c1858bdb7b99527153751a",
-     "04242f34959516a4706172f7dede23110efa314bff22eb320ab88feeff45e3227710900a"
-     "8acfc9bcce728119d042f64ca40876c2b380ee46e0",
-     "ae61523866a8f43e6cdd42ba27a34ed06527e8a5842901a64c393f76",
-     "c2732a4e0815f9f785500e80147e9486994446beccf8a6a352b97585",
-     "6ecaece6487d7920e398f7f951ab7c7aba5832dabf03704106ad1244"},
-    {NID_secp224r1, NID_sha512,
-     "4bdfd3b91d83108409ad765b256e0c9b9937ecf647f8e6f9fc807e2e72af8246178b3fe0"
-     "46b4ea10170450d71a4eec790ecb05f03d7077341de26c4db7eeae24d55c9a9093e837df"
-     "db38168fe8230cb9605825a1282fecd741989bfcdb34678fe077477927f66bd26d003e5d"
-     "da22043341a14dd31841ba483ad5ce2701e0f68e",
-     "41a4dd8eee39232b728516e2f21e66011e7426a6b25986c3ffa237e4",
-     "04c32988171caab178bf50dc7310bc7f604df5a9d19a8e602519c72d8af8985d112ad9de"
-     "05969e5364d943c1cc5cd198359f4c62b19da0e117",
-     "827d4999da81fa920c8492ccc1e2d5cdafed9754cf7382a859952071",
-     "89c61da7422ccd676baec07e2185c12e947a2374eede87847304be6c",
-     "2685379624717ea28422e8d001c090405a130b4ef9f1ac726c3ca502"},
-    {NID_secp224r1, NID_sha512,
-     "e6cdee8558bc1eacc24e82f0624ce8d02cc8d925b4dd3dec3a72f4a4e0fb76076bfa3ef2"
-     "e2c33bdd7c27b322bdc09bbfee8fe46f75dbd7bbd2af09690b7137943efe21706e0a1b6d"
-     "3089540fc58d85ddb55ea836616db573e36c521be008893f40a0a7c349602cc178ea43be"
-     "59d31ec6449e7ff2c5379379f7d7645134df1bc3",
-     "67fa50569257c8cc89ac0325db4902003a62f30b917f53e4035a7e04",
-     "046773a0436a9c42635730413b19aa4166f08c69c0e5002953da42253b555138290b093b"
-     "f2fe79acda9131d920cd1e7ac43fb8775776cd713c",
-     "557cb45fd3a30b3bdbf08c56eabbd4478736024aaa52bf8448096453",
-     "8e92cf7a674aa5f7542dd95c695589a05747431692edd04804299b8f",
-     "af4908b41f8180b71a6ff10fd51f3d143147af6ddddf7534d3284ed9"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "ff624d0ba02c7b6370c1622eec3fa2186ea681d1659e0a845448e777b75a8e77a77bb26e"
-     "5733179d58ef9bc8a4e8b6971aef2539f77ab0963a3415bbd6258339bd1bf55de65db520"
-     "c63f5b8eab3d55debd05e9494212170f5d65b3286b8b668705b1e2b2b5568610617abb51"
-     "d2dd0cb450ef59df4b907da90cfa7b268de8c4c2",
-     "708309a7449e156b0db70e5b52e606c7e094ed676ce8953bf6c14757c826f590",
-     "0429578c7ab6ce0d11493c95d5ea05d299d536801ca9cbd50e9924e43b733b83ab08c804"
-     "9879c6278b2273348474158515accaa38344106ef96803c5a05adc4800",
-     "58f741771620bdc428e91a32d86d230873e9140336fcfb1e122892ee1d501bdc",
-     "4a19274429e40522234b8785dc25fc524f179dcc95ff09b3c9770fc71f54ca0d",
-     "58982b79a65b7320f5b92d13bdaecdd1259e760f0f718ba933fd098f6f75d4b7"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "9155e91fd9155eeed15afd83487ea1a3af04c5998b77c0fe8c43dcc479440a8a9a89efe8"
-     "83d9385cb9edfde10b43bce61fb63669935ad39419cf29ef3a936931733bfc2378e253e7"
-     "3b7ae9a3ec7a6a7932ab10f1e5b94d05160c053988f3bdc9167155d069337d42c9a70566"
-     "19efc031fa5ec7310d29bd28980b1e3559757578",
-     "90c5386100b137a75b0bb495002b28697a451add2f1f22cb65f735e8aaeace98",
-     "044a92396ff7930b1da9a873a479a28a9896af6cc3d39345b949b726dc3cd978b5475abb"
-     "18eaed948879b9c1453e3ef2755dd90f77519ec7b6a30297aad08e4931",
-     "36f853b5c54b1ec61588c9c6137eb56e7a708f09c57513093e4ecf6d739900e5",
-     "38b29558511061cfabdc8e5bb65ac2976d1aa2ba9a5deab8074097b2172bb9ad",
-     "0de2cde610502b6e03c0b23602eafbcd3faf886c81d111d156b7aa550f5bcd51"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "b242a7586a1383368a33c88264889adfa3be45422fbef4a2df4e3c5325a9c7757017e0d5"
-     "cf4bbf4de7f99d189f81f1fd2f0dd645574d1eb0d547eead9375677819297c1abe62526a"
-     "e29fc54cdd11bfe17714f2fbd2d0d0e8d297ff98535980482dd5c1ebdc5a7274aabf1382"
-     "c9f2315ca61391e3943856e4c5e616c2f1f7be0d",
-     "a3a43cece9c1abeff81099fb344d01f7d8df66447b95a667ee368f924bccf870",
-     "045775174deb0248112e069cb86f1546ac7a78bc2127d0cb953bad46384dd6be5ba27020"
-     "952971cc0b0c3abd06e9ca3e141a4943f560564eba31e5288928bc7ce7",
-     "a0d9a7a245bd9b9aa86cecb89341c9de2e4f9b5d095a8150826c7ba7fb3e7df7",
-     "b02a440add66a9ff9c3c0e9acf1be678f6bd48a10cbdec2ad6d186ffe05f3f2a",
-     "a98bea42aec56a1fcecec00a1cc69b01fcbcf5de7ac1b2f2dcc09b6db064f92b"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "b64005da76b24715880af94dba379acc25a047b06066c9bedc8f17b8c74e74f4fc720d9f"
-     "4ef0e2a659e0756931c080587ebdcd0f85e819aea6dacb327a9d96496da53ea21aef3b2e"
-     "793a9c0def5196acec99891f46ead78a85bc7ab644765781d3543da9fbf9fec916dca975"
-     "ef3b4271e50ecc68bf79b2d8935e2b25fc063358",
-     "7bbc8ff13f6f921f21e949b224c16b7176c5984d312b671cf6c2e4841135fc7f",
-     "04f888e913ec6f3cd8b31eb89e4f8aaa8887d30ae5348ed7118696949d5b8cc7c108895d"
-     "09620500d244e5035e262dea3f2867cd8967b226324d5c05220d8b410c",
-     "21c942f3b487accbf7fadc1c4b7a6c7567ce876c195022459fa1ebf6d04ffbaa",
-     "2e6cc883b8acc904ee9691ef4a9f1f5a9e5fbfde847cda3be833f949fb9c7182",
-     "2ac48f7a930912131a8b4e3ab495307817c465d638c2a9ea5ae9e2808806e20a"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "fe6e1ea477640655eaa1f6e3352d4bce53eb3d95424df7f238e93d8531da8f36bc35fa6b"
-     "e4bf5a6a382e06e855139eb617a9cc9376b4dafacbd80876343b12628619d7cbe1bff675"
-     "7e3706111ed53898c0219823adbc044eaf8c6ad449df8f6aab9d444dadb5c3380eec0d91"
-     "694df5fc4b30280d4b87d27e67ae58a1df828963",
-     "daf5ec7a4eebc20d9485796c355b4a65ad254fe19b998d0507e91ea24135f45d",
-     "04137c465085c1b1b8cccbe9fccbe9d0295a331aaf332f3ed2e285d16e574b943bd3e8d5"
-     "a24cd218c19760b0e85b35a8569945aa857cbf0fd6a3ce127581b217b6",
-     "343251dffa56e6a612fec7b078f9c3819eab402a72686b894a47a08fd97e6c23",
-     "775e25a296bd259510ae9375f548997bec8a744900022945281dc8c4d94f2b5b",
-     "d87592ceab773ae103daebbb56a04144aaccb1e14efc1024dc36c0e382df1f70"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "907c0c00dc080a688548957b5b8b1f33ba378de1368023dcad43242411f554eb7d392d3e"
-     "5c1668fad3944ff9634105343d83b8c85d2a988da5f5dc60ee0518327caed6dd5cf4e9bc"
-     "6222deb46d00abde745f9b71d6e7aee6c7fdfc9ed053f2c0b611d4c6863088bd012ea981"
-     "0ee94f8e58905970ebd07353f1f409a371ed03e3",
-     "8729a8396f262dabd991aa404cc1753581cea405f0d19222a0b3f210de8ee3c5",
-     "0482b1f1a7af9b48ca8452613d7032beb0e4f28fe710306aeccc959e4d03662a355e39f3"
-     "3574097b8d32b471a591972496f5d44db344c037d13f06fafc75f016fd",
-     "6de9e21f0b2cacc1762b3558fd44d3cf156b85dbef430dd28d59713bfb9cfa0b",
-     "a754b42720e71925d51fcef76151405a3696cc8f9fc9ca7b46d0b16edd7fb699",
-     "603924780439cc16ac4cf97c2c3065bc95353aa9179d0ab5f0322ca82f851cf2"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "771c4d7bce05610a3e71b272096b57f0d1efcce33a1cb4f714d6ebc0865b2773ec5eedc2"
-     "5fae81dee1d256474dbd9676623614c150916e6ed92ce4430b26037d28fa5252ef6b10c0"
-     "9dc2f7ee5a36a1ea7897b69f389d9f5075e271d92f4eb97b148f3abcb1e5be0b4feb8278"
-     "613d18abf6da60bfe448238aa04d7f11b71f44c5",
-     "f1b62413935fc589ad2280f6892599ad994dae8ca3655ed4f7318cc89b61aa96",
-     "04e0bbfe4016eea93e6f509518cbffc25d492de6ebbf80465a461caa5bdc0181593231ee"
-     "7a119d84fa56e3034d50fea85929aec2eb437abc7646821e1bf805fb50",
-     "7a33eeb9f469afd55de2fb786847a1d3e7797929305c0f90d953b6f143bb8fc6",
-     "96d1c9399948254ea381631fc0f43ea808110506db8aacf081df5535ac5eb8ad",
-     "73bf3691260dddd9997c97313f2a70783eacf8d15bdfb34bb13025cdfae72f70"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "a3b2825235718fc679b942e8ac38fb4f54415a213c65875b5453d18ca012320ddfbbc58b"
-     "991eaebadfc2d1a28d4f0cd82652b12e4d5bfda89eda3be12ac52188e38e8cce32a264a3"
-     "00c0e463631f525ae501348594f980392c76b4a12ddc88e5ca086cb8685d03895919a862"
-     "7725a3e00c4728e2b7c6f6a14fc342b2937fc3dd",
-     "4caaa26f93f009682bbba6db6b265aec17b7ec1542bda458e8550b9e68eed18d",
-     "04e3c58c1c254d11c7e781ad133e4c36dd1b5de362120d336a58e7b68813f3fbee59760d"
-     "b66120afe0d962c81a8e5586588fd19de2f40556371611c73af22c8a68",
-     "c0d37142dc8b0d614fad20c4d35af6eb819e259e513ddeac1e1c273e7e1dc1bb",
-     "25dd8e4086c62a40d2a310e2f90f6af5cb7e677b4dfdb4dc4e99e23ea2f0e6dc",
-     "90ad62c179b0c9d61f521dde1cd762bfd224b5525c39c3706f2549313ddb4f39"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "3e6e2a9bffd729ee5d4807849cd4250021d8184cda723df6ab0e5c939d39237c8e58af9d"
-     "869fe62d3c97b3298a99e891e5e11aa68b11a087573a40a3e83c7965e7910d72f81cad0f"
-     "42accc5c25a4fd3cdd8cee63757bbbfbdae98be2bc867d3bcb1333c4632cb0a55dffeb77"
-     "d8b119c466cd889ec468454fabe6fbee7102deaf",
-     "7af4b150bb7167cb68037f280d0823ce5320c01a92b1b56ee1b88547481b1de9",
-     "04cb3634ec4f0cbb99986be788f889e586026d5a851e80d15382f1bdb1bda2bc7551e4e4"
-     "3bc16fb114896b18198a1aebe6054ba20ed0c0317c1b8776158c0e6bfb",
-     "98edd59fafbcaee5f64e84eb5ed59fff45d14aabada47cee2fa674377173627a",
-     "261a1cdb0fd93c0fb06ea6068b6b03c330a12f621a7eba76682a1d152c0e8d08",
-     "7ca049bad54feee101d6db807635ffb8bdb05a38e445c8c3d65d60df143514c5"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "52e5c308e70329a17c71eaedb66bbee303c8ec48a6f1a2efb235d308563cd58553d434e1"
-     "2f353227a9ea28608ec9c820ed83c95124e7a886f7e832a2de1032e78dc059208f9ec354"
-     "170b2b1cab992b52ac01e6c0e4e1b0112686962edc53ab226dafcc9fc7baed2cd9307160"
-     "e8572edb125935db49289b178f35a8ad23f4f801",
-     "52ad53e849e30bec0e6345c3e9d98ebc808b19496c1ef16d72ab4a00bbb8c634",
-     "047cca1334bfc2a78728c50b370399be3f9690d445aa03c701da643eeb0b0f7fa83f7522"
-     "238668e615405e49b2f63faee58286000a30cdb4b564ac0df99bc8950f",
-     "8650c30712fc253610884fbba4a332a4574d4b7822f7776cab1df8f5fa05442a",
-     "a18194c7ac5829afc408d78dde19542837e7be82706c3941b2d9c5e036bb51e0",
-     "188ead1cdf7c1d21114ff56d0421ffd501ab978ef58337462c0fa736d86299af"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "d3e9e82051d4c84d699453c9ff44c7c09f6523bb92232bcf30bf3c380224249de2964e87"
-     "1d56a364d6955c81ef91d06482a6c7c61bc70f66ef22fad128d15416e7174312619134f9"
-     "68f1009f92cbf99248932efb533ff113fb6d949e21d6b80dfbbe69010c8d1ccb0f3808ea"
-     "309bb0bac1a222168c95b088847e613749b19d04",
-     "80754962a864be1803bc441fa331e126005bfc6d8b09ed38b7e69d9a030a5d27",
-     "040aaeed6dd1ae020d6eefc98ec4241ac93cbd3c8afed05bb28007e7da5727571b2dda1d"
-     "5b7872eb94dfffb456115037ff8d3e72f8ebdd8fcfc42391f96809be69",
-     "738e050aeefe54ecba5be5f93a97bbcb7557d701f9da2d7e88483454b97b55a8",
-     "8cb9f41dfdcb9604e0725ac9b78fc0db916dc071186ee982f6dba3da36f02efa",
-     "5c87fe868fd4282fb114f5d70e9590a10a5d35cedf3ff6402ba5c4344738a32e"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "968951c2c1918436fe19fa2fe2152656a08f9a6b8aa6201920f1b424da98cee71928897f"
-     "f087620cc5c551320b1e75a1e98d7d98a5bd5361c9393759614a6087cc0f7fb01fcb1737"
-     "83eb4c4c23961a8231ac4a07d72e683b0c1bd4c51ef1b031df875e7b8d5a6e0628949f5b"
-     "8f157f43dccaea3b2a4fc11181e6b451e06ceb37",
-     "cfa8c8bd810eb0d73585f36280ecdd296ee098511be8ad5eac68984eca8eb19d",
-     "04c227a2af15dfa8734e11c0c50f77e24e77ed58dd8cccf1b0e9fa06bee1c64766b68659"
-     "2ce3745eb300d2704083db55e1fa8274e4cb7e256889ccc0bb34a60570",
-     "2d6b449bb38b543d6b6d34ff8cb053f5e5b337f949b069b21f421995ebb28823",
-     "5e89d3c9b103c2fa3cb8cebeec23640acda0257d63ffbe2d509bfc49fab1dca6",
-     "d70c5b1eeb29e016af9925798d24e166c23d58fedd2f1a3bbdb1ef78cdbfb63a"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "78048628932e1c1cdd1e70932bd7b76f704ba08d7e7d825d3de763bf1a062315f4af16ec"
-     "cefe0b6ebadccaf403d013f50833ce2c54e24eea8345e25f93b69bb048988d102240225c"
-     "eacf5003e2abdcc90299f4bf2c101585d36ecdd7a155953c674789d070480d1ef47cc785"
-     "8e97a6d87c41c6922a00ea12539f251826e141b4",
-     "b2021e2665ce543b7feadd0cd5a4bd57ffcc5b32deb860b4d736d9880855da3c",
-     "04722e0abad4504b7832a148746153777694714eca220eced2b2156ca64cfed3ddf0351b"
-     "357b3081e859c46cad5328c5afa10546e92bc6c3fd541796ac30397a75",
-     "b15bbce4b382145de7ecd670d947e77555ef7cd1693bd53c694e2b52b04d10e1",
-     "9d086dcd22da165a43091991bede9c1c14515e656633cb759ec2c17f51c35253",
-     "23595ad1cb714559faaecaf946beb9a71e584616030ceaed8a8470f4bf62768f"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "9b0800c443e693067591737fdbcf0966fdfa50872d41d0c189d87cbc34c2771ee5e1255f"
-     "d604f09fcf167fda16437c245d299147299c69046895d22482db29aba37ff57f756716cd"
-     "3d6223077f747c4caffbecc0a7c9dfaaafd9a9817470ded8777e6355838ac54d11b2f0fc"
-     "3f43668ff949cc31de0c2d15af5ef17884e4d66a",
-     "0c9bce6a568ca239395fc3552755575cbcdddb1d89f6f5ab354517a057b17b48",
-     "044814d454495df7103e2da383aba55f7842fd84f1750ee5801ad32c10d0be6c7da0bd03"
-     "9d5097c8f0770477f6b18d247876e88e528bf0453eab515ffab8a9eda3",
-     "d414f1525cdcc41eba1652de017c034ebcc7946cb2efe4713d09f67c85b83153",
-     "84db02c678f9a21208cec8564d145a35ba8c6f26b4eb7e19522e439720dae44c",
-     "537c564da0d2dc5ac4376c5f0ca3b628d01d48df47a83d842c927e4d6db1e16d"},
-    {NID_X9_62_prime256v1, NID_sha224,
-     "fc3b8291c172dae635a6859f525beaf01cf683765d7c86f1a4d768df7cae055f639eccc0"
-     "8d7a0272394d949f82d5e12d69c08e2483e11a1d28a4c61f18193106e12e5de4a9d0b4bf"
-     "341e2acd6b715dc83ae5ff63328f8346f35521ca378b311299947f63ec593a5e32e6bd11"
-     "ec4edb0e75302a9f54d21226d23314729e061016",
-     "1daa385ec7c7f8a09adfcaea42801a4de4c889fb5c6eb4e92bc611d596d68e3f",
-     "04f04e9f2831d9697ae146c7d4552e5f91085cc46778400b75b76f00205252941dbd2671"
-     "48174cd0c2b019cd0a5256e2f3f889d1e597160372b5a1339c8d787f10",
-     "7707db348ee6f60365b43a2a994e9b40ed56fe03c2c31c7e781bc4ffadcba760",
-     "5d95c385eeba0f15db0b80ae151912409128c9c80e554246067b8f6a36d85ea5",
-     "db5d8a1e345f883e4fcb3871276f170b783c1a1e9da6b6615913368a8526f1c3"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "5905238877c77421f73e43ee3da6f2d9e2ccad5fc942dcec0cbd25482935faaf416983fe"
-     "165b1a045ee2bcd2e6dca3bdf46c4310a7461f9a37960ca672d3feb5473e253605fb1ddf"
-     "d28065b53cb5858a8ad28175bf9bd386a5e471ea7a65c17cc934a9d791e91491eb3754d0"
-     "3799790fe2d308d16146d5c9b0d0debd97d79ce8",
-     "519b423d715f8b581f4fa8ee59f4771a5b44c8130b4e3eacca54a56dda72b464",
-     "041ccbe91c075fc7f4f033bfa248db8fccd3565de94bbfb12f3c59ff46c271bf83ce4014"
-     "c68811f9a21a1fdb2c0e6113e06db7ca93b7404e78dc7ccd5ca89a4ca9",
-     "94a1bbb14b906a61a280f245f9e93c7f3b4a6247824f5d33b9670787642a68de",
-     "f3ac8061b514795b8843e3d6629527ed2afd6b1f6a555a7acabb5e6f79c8c2ac",
-     "8bf77819ca05a6b2786c76262bf7371cef97b218e96f175a3ccdda2acc058903"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "c35e2f092553c55772926bdbe87c9796827d17024dbb9233a545366e2e5987dd344deb72"
-     "df987144b8c6c43bc41b654b94cc856e16b96d7a821c8ec039b503e3d86728c494a967d8"
-     "3011a0e090b5d54cd47f4e366c0912bc808fbb2ea96efac88fb3ebec9342738e225f7c7c"
-     "2b011ce375b56621a20642b4d36e060db4524af1",
-     "0f56db78ca460b055c500064824bed999a25aaf48ebb519ac201537b85479813",
-     "04e266ddfdc12668db30d4ca3e8f7749432c416044f2d2b8c10bf3d4012aeffa8abfa864"
-     "04a2e9ffe67d47c587ef7a97a7f456b863b4d02cfc6928973ab5b1cb39",
-     "6d3e71882c3b83b156bb14e0ab184aa9fb728068d3ae9fac421187ae0b2f34c6",
-     "976d3a4e9d23326dc0baa9fa560b7c4e53f42864f508483a6473b6a11079b2db",
-     "1b766e9ceb71ba6c01dcd46e0af462cd4cfa652ae5017d4555b8eeefe36e1932"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "3c054e333a94259c36af09ab5b4ff9beb3492f8d5b4282d16801daccb29f70fe61a0b37f"
-     "fef5c04cd1b70e85b1f549a1c4dc672985e50f43ea037efa9964f096b5f62f7ffdf8d6bf"
-     "b2cc859558f5a393cb949dbd48f269343b5263dcdb9c556eca074f2e98e6d94c2c29a677"
-     "afaf806edf79b15a3fcd46e7067b7669f83188ee",
-     "e283871239837e13b95f789e6e1af63bf61c918c992e62bca040d64cad1fc2ef",
-     "0474ccd8a62fba0e667c50929a53f78c21b8ff0c3c737b0b40b1750b2302b0bde829074e"
-     "21f3a0ef88b9efdf10d06aa4c295cc1671f758ca0e4cd108803d0f2614",
-     "ad5e887eb2b380b8d8280ad6e5ff8a60f4d26243e0124c2f31a297b5d0835de2",
-     "35fb60f5ca0f3ca08542fb3cc641c8263a2cab7a90ee6a5e1583fac2bb6f6bd1",
-     "ee59d81bc9db1055cc0ed97b159d8784af04e98511d0a9a407b99bb292572e96"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "0989122410d522af64ceb07da2c865219046b4c3d9d99b01278c07ff63eaf1039cb787ae"
-     "9e2dd46436cc0415f280c562bebb83a23e639e476a02ec8cff7ea06cd12c86dcc3adefbf"
-     "1a9e9a9b6646c7599ec631b0da9a60debeb9b3e19324977f3b4f36892c8a38671c8e1cc8"
-     "e50fcd50f9e51deaf98272f9266fc702e4e57c30",
-     "a3d2d3b7596f6592ce98b4bfe10d41837f10027a90d7bb75349490018cf72d07",
-     "04322f80371bf6e044bc49391d97c1714ab87f990b949bc178cb7c43b7c22d89e13c15d5"
-     "4a5cc6b9f09de8457e873eb3deb1fceb54b0b295da6050294fae7fd999",
-     "24fc90e1da13f17ef9fe84cc96b9471ed1aaac17e3a4bae33a115df4e5834f18",
-     "d7c562370af617b581c84a2468cc8bd50bb1cbf322de41b7887ce07c0e5884ca",
-     "b46d9f2d8c4bf83546ff178f1d78937c008d64e8ecc5cbb825cb21d94d670d89"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "dc66e39f9bbfd9865318531ffe9207f934fa615a5b285708a5e9c46b7775150e818d7f24"
-     "d2a123df3672fff2094e3fd3df6fbe259e3989dd5edfcccbe7d45e26a775a5c4329a084f"
-     "057c42c13f3248e3fd6f0c76678f890f513c32292dd306eaa84a59abe34b16cb5e38d0e8"
-     "85525d10336ca443e1682aa04a7af832b0eee4e7",
-     "53a0e8a8fe93db01e7ae94e1a9882a102ebd079b3a535827d583626c272d280d",
-     "041bcec4570e1ec2436596b8ded58f60c3b1ebc6a403bc5543040ba829630572448af62a"
-     "4c683f096b28558320737bf83b9959a46ad2521004ef74cf85e67494e1",
-     "5d833e8d24cc7a402d7ee7ec852a3587cddeb48358cea71b0bedb8fabe84e0c4",
-     "18caaf7b663507a8bcd992b836dec9dc5703c080af5e51dfa3a9a7c387182604",
-     "77c68928ac3b88d985fb43fb615fb7ff45c18ba5c81af796c613dfa98352d29c"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "600974e7d8c5508e2c1aab0783ad0d7c4494ab2b4da265c2fe496421c4df238b0be25f25"
-     "659157c8a225fb03953607f7df996acfd402f147e37aee2f1693e3bf1c35eab3ae360a2b"
-     "d91d04622ea47f83d863d2dfecb618e8b8bdc39e17d15d672eee03bb4ce2cc5cf6b217e5"
-     "faf3f336fdd87d972d3a8b8a593ba85955cc9d71",
-     "4af107e8e2194c830ffb712a65511bc9186a133007855b49ab4b3833aefc4a1d",
-     "04a32e50be3dae2c8ba3f5e4bdae14cf7645420d425ead94036c22dd6c4fc59e00d623bf"
-     "641160c289d6742c6257ae6ba574446dd1d0e74db3aaa80900b78d4ae9",
-     "e18f96f84dfa2fd3cdfaec9159d4c338cd54ad314134f0b31e20591fc238d0ab",
-     "8524c5024e2d9a73bde8c72d9129f57873bbad0ed05215a372a84fdbc78f2e68",
-     "d18c2caf3b1072f87064ec5e8953f51301cada03469c640244760328eb5a05cb"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "dfa6cb9b39adda6c74cc8b2a8b53a12c499ab9dee01b4123642b4f11af336a91a5c9ce05"
-     "20eb2395a6190ecbf6169c4cba81941de8e76c9c908eb843b98ce95e0da29c5d43880402"
-     "64e05e07030a577cc5d176387154eabae2af52a83e85c61c7c61da930c9b19e45d7e34c8"
-     "516dc3c238fddd6e450a77455d534c48a152010b",
-     "78dfaa09f1076850b3e206e477494cddcfb822aaa0128475053592c48ebaf4ab",
-     "048bcfe2a721ca6d753968f564ec4315be4857e28bef1908f61a366b1f03c974790f6757"
-     "6a30b8e20d4232d8530b52fb4c89cbc589ede291e499ddd15fe870ab96",
-     "295544dbb2da3da170741c9b2c6551d40af7ed4e891445f11a02b66a5c258a77",
-     "c5a186d72df452015480f7f338970bfe825087f05c0088d95305f87aacc9b254",
-     "84a58f9e9d9e735344b316b1aa1ab5185665b85147dc82d92e969d7bee31ca30"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "51d2547cbff92431174aa7fc7302139519d98071c755ff1c92e4694b58587ea560f72f32"
-     "fc6dd4dee7d22bb7387381d0256e2862d0644cdf2c277c5d740fa089830eb52bf79d1e75"
-     "b8596ecf0ea58a0b9df61e0c9754bfcd62efab6ea1bd216bf181c5593da79f10135a9bc6"
-     "e164f1854bc8859734341aad237ba29a81a3fc8b",
-     "80e692e3eb9fcd8c7d44e7de9f7a5952686407f90025a1d87e52c7096a62618a",
-     "04a88bc8430279c8c0400a77d751f26c0abc93e5de4ad9a4166357952fe041e7672d365a"
-     "1eef25ead579cc9a069b6abc1b16b81c35f18785ce26a10ba6d1381185",
-     "7c80fd66d62cc076cef2d030c17c0a69c99611549cb32c4ff662475adbe84b22",
-     "9d0c6afb6df3bced455b459cc21387e14929392664bb8741a3693a1795ca6902",
-     "d7f9ddd191f1f412869429209ee3814c75c72fa46a9cccf804a2f5cc0b7e739f"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "558c2ac13026402bad4a0a83ebc9468e50f7ffab06d6f981e5db1d082098065bcff6f21a"
-     "7a74558b1e8612914b8b5a0aa28ed5b574c36ac4ea5868432a62bb8ef0695d27c1e3ceaf"
-     "75c7b251c65ddb268696f07c16d2767973d85beb443f211e6445e7fe5d46f0dce70d58a4"
-     "cd9fe70688c035688ea8c6baec65a5fc7e2c93e8",
-     "5e666c0db0214c3b627a8e48541cc84a8b6fd15f300da4dff5d18aec6c55b881",
-     "041bc487570f040dc94196c9befe8ab2b6de77208b1f38bdaae28f9645c4d2bc3aec8160"
-     "2abd8345e71867c8210313737865b8aa186851e1b48eaca140320f5d8f",
-     "2e7625a48874d86c9e467f890aaa7cd6ebdf71c0102bfdcfa24565d6af3fdce9",
-     "2f9e2b4e9f747c657f705bffd124ee178bbc5391c86d056717b140c153570fd9",
-     "f5413bfd85949da8d83de83ab0d19b2986613e224d1901d76919de23ccd03199"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "4d55c99ef6bd54621662c3d110c3cb627c03d6311393b264ab97b90a4b15214a5593ba25"
-     "10a53d63fb34be251facb697c973e11b665cb7920f1684b0031b4dd370cb927ca7168b0b"
-     "f8ad285e05e9e31e34bc24024739fdc10b78586f29eff94412034e3b606ed850ec2c1900"
-     "e8e68151fc4aee5adebb066eb6da4eaa5681378e",
-     "f73f455271c877c4d5334627e37c278f68d143014b0a05aa62f308b2101c5308",
-     "04b8188bd68701fc396dab53125d4d28ea33a91daf6d21485f4770f6ea8c565dde423f05"
-     "8810f277f8fe076f6db56e9285a1bf2c2a1dae145095edd9c04970bc4a",
-     "62f8665fd6e26b3fa069e85281777a9b1f0dfd2c0b9f54a086d0c109ff9fd615",
-     "1cc628533d0004b2b20e7f4baad0b8bb5e0673db159bbccf92491aef61fc9620",
-     "880e0bbf82a8cf818ed46ba03cf0fc6c898e36fca36cc7fdb1d2db7503634430"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "f8248ad47d97c18c984f1f5c10950dc1404713c56b6ea397e01e6dd925e903b4fadfe2c9"
-     "e877169e71ce3c7fe5ce70ee4255d9cdc26f6943bf48687874de64f6cf30a012512e787b"
-     "88059bbf561162bdcc23a3742c835ac144cc14167b1bd6727e940540a9c99f3cbb41fb1d"
-     "cb00d76dda04995847c657f4c19d303eb09eb48a",
-     "b20d705d9bd7c2b8dc60393a5357f632990e599a0975573ac67fd89b49187906",
-     "0451f99d2d52d4a6e734484a018b7ca2f895c2929b6754a3a03224d07ae61166ce4737da"
-     "963c6ef7247fb88d19f9b0c667cac7fe12837fdab88c66f10d3c14cad1",
-     "72b656f6b35b9ccbc712c9f1f3b1a14cbbebaec41c4bca8da18f492a062d6f6f",
-     "9886ae46c1415c3bc959e82b760ad760aab66885a84e620aa339fdf102465c42",
-     "2bf3a80bc04faa35ebecc0f4864ac02d349f6f126e0f988501b8d3075409a26c"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "3b6ee2425940b3d240d35b97b6dcd61ed3423d8e71a0ada35d47b322d17b35ea0472f35e"
-     "dd1d252f87b8b65ef4b716669fc9ac28b00d34a9d66ad118c9d94e7f46d0b4f6c2b2d339"
-     "fd6bcd351241a387cc82609057048c12c4ec3d85c661975c45b300cb96930d89370a327c"
-     "98b67defaa89497aa8ef994c77f1130f752f94a4",
-     "d4234bebfbc821050341a37e1240efe5e33763cbbb2ef76a1c79e24724e5a5e7",
-     "048fb287f0202ad57ae841aea35f29b2e1d53e196d0ddd9aec24813d64c0922fb71f6daf"
-     "f1aa2dd2d6d3741623eecb5e7b612997a1039aab2e5cf2de969cfea573",
-     "d926fe10f1bfd9855610f4f5a3d666b1a149344057e35537373372ead8b1a778",
-     "490efd106be11fc365c7467eb89b8d39e15d65175356775deab211163c2504cb",
-     "644300fc0da4d40fb8c6ead510d14f0bd4e1321a469e9c0a581464c7186b7aa7"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "c5204b81ec0a4df5b7e9fda3dc245f98082ae7f4efe81998dcaa286bd4507ca840a53d21"
-     "b01e904f55e38f78c3757d5a5a4a44b1d5d4e480be3afb5b394a5d2840af42b1b4083d40"
-     "afbfe22d702f370d32dbfd392e128ea4724d66a3701da41ae2f03bb4d91bb946c7969404"
-     "cb544f71eb7a49eb4c4ec55799bda1eb545143a7",
-     "b58f5211dff440626bb56d0ad483193d606cf21f36d9830543327292f4d25d8c",
-     "0468229b48c2fe19d3db034e4c15077eb7471a66031f28a980821873915298ba76303e8e"
-     "e3742a893f78b810991da697083dd8f11128c47651c27a56740a80c24c",
-     "e158bf4a2d19a99149d9cdb879294ccb7aaeae03d75ddd616ef8ae51a6dc1071",
-     "e67a9717ccf96841489d6541f4f6adb12d17b59a6bef847b6183b8fcf16a32eb",
-     "9ae6ba6d637706849a6a9fc388cf0232d85c26ea0d1fe7437adb48de58364333"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "72e81fe221fb402148d8b7ab03549f1180bcc03d41ca59d7653801f0ba853add1f6d29ed"
-     "d7f9abc621b2d548f8dbf8979bd16608d2d8fc3260b4ebc0dd42482481d548c7075711b5"
-     "759649c41f439fad69954956c9326841ea6492956829f9e0dc789f73633b40f6ac77bcae"
-     "6dfc7930cfe89e526d1684365c5b0be2437fdb01",
-     "54c066711cdb061eda07e5275f7e95a9962c6764b84f6f1f3ab5a588e0a2afb1",
-     "040a7dbb8bf50cb605eb2268b081f26d6b08e012f952c4b70a5a1e6e7d46af98bbf26dd7"
-     "d799930062480849962ccf5004edcfd307c044f4e8f667c9baa834eeae",
-     "646fe933e96c3b8f9f507498e907fdd201f08478d0202c752a7c2cfebf4d061a",
-     "b53ce4da1aa7c0dc77a1896ab716b921499aed78df725b1504aba1597ba0c64b",
-     "d7c246dc7ad0e67700c373edcfdd1c0a0495fc954549ad579df6ed1438840851"},
-    {NID_X9_62_prime256v1, NID_sha256,
-     "21188c3edd5de088dacc1076b9e1bcecd79de1003c2414c3866173054dc82dde85169baa"
-     "77993adb20c269f60a5226111828578bcc7c29e6e8d2dae81806152c8ba0c6ada1986a19"
-     "83ebeec1473a73a04795b6319d48662d40881c1723a706f516fe75300f92408aa1dc6ae4"
-     "288d2046f23c1aa2e54b7fb6448a0da922bd7f34",
-     "34fa4682bf6cb5b16783adcd18f0e6879b92185f76d7c920409f904f522db4b1",
-     "04105d22d9c626520faca13e7ced382dcbe93498315f00cc0ac39c4821d0d737376c47f3"
-     "cbbfa97dfcebe16270b8c7d5d3a5900b888c42520d751e8faf3b401ef4",
-     "a6f463ee72c9492bc792fe98163112837aebd07bab7a84aaed05be64db3086f4",
-     "542c40a18140a6266d6f0286e24e9a7bad7650e72ef0e2131e629c076d962663",
-     "4f7f65305e24a6bbb5cff714ba8f5a2cee5bdc89ba8d75dcbf21966ce38eb66f"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "e0b8596b375f3306bbc6e77a0b42f7469d7e83635990e74aa6d713594a3a24498feff500"
-     "6790742d9c2e9b47d714bee932435db747c6e733e3d8de41f2f91311f2e9fd8e02565163"
-     "1ffd84f66732d3473fbd1627e63dc7194048ebec93c95c159b5039ab5e79e42c80b484a9"
-     "43f125de3da1e04e5bf9c16671ad55a1117d3306",
-     "b6faf2c8922235c589c27368a3b3e6e2f42eb6073bf9507f19eed0746c79dced",
-     "04e0e7b99bc62d8dd67883e39ed9fa0657789c5ff556cc1fd8dd1e2a55e9e3f24363fbfd"
-     "0232b95578075c903a4dbf85ad58f8350516e1ec89b0ee1f5e1362da69",
-     "9980b9cdfcef3ab8e219b9827ed6afdd4dbf20bd927e9cd01f15762703487007",
-     "f5087878e212b703578f5c66f434883f3ef414dc23e2e8d8ab6a8d159ed5ad83",
-     "306b4c6c20213707982dffbb30fba99b96e792163dd59dbe606e734328dd7c8a"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "099a0131179fff4c6928e49886d2fdb3a9f239b7dd5fa828a52cbbe3fcfabecfbba3e192"
-     "159b887b5d13aa1e14e6a07ccbb21f6ad8b7e88fee6bea9b86dea40ffb962f38554056fb"
-     "7c5bb486418915f7e7e9b9033fe3baaf9a069db98bc02fa8af3d3d1859a11375d6f98aa2"
-     "ce632606d0800dff7f55b40f971a8586ed6b39e9",
-     "118958fd0ff0f0b0ed11d3cf8fa664bc17cdb5fed1f4a8fc52d0b1ae30412181",
-     "04afda82260c9f42122a3f11c6058839488f6d7977f6f2a263c67d06e27ea2c3550ae2bb"
-     "dd2207c590332c5bfeb4c8b5b16622134bd4dc55382ae806435468058b",
-     "23129a99eeda3d99a44a5778a46e8e7568b91c31fb7a8628c5d9820d4bed4a6b",
-     "e446600cab1286ebc3bb332012a2f5cc33b0a5ef7291d5a62a84de5969d77946",
-     "cf89b12793ee1792eb26283b48fa0bdcb45ae6f6ad4b02564bf786bb97057d5a"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "0fbc07ea947c946bea26afa10c51511039b94ddbc4e2e4184ca3559260da24a14522d149"
-     "7ca5e77a5d1a8e86583aeea1f5d4ff9b04a6aa0de79cd88fdb85e01f171143535f2f7c23"
-     "b050289d7e05cebccdd131888572534bae0061bdcc3015206b9270b0d5af9f1da2f9de91"
-     "772d178a632c3261a1e7b3fb255608b3801962f9",
-     "3e647357cd5b754fad0fdb876eaf9b1abd7b60536f383c81ce5745ec80826431",
-     "04702b2c94d039e590dd5c8f9736e753cf5824aacf33ee3de74fe1f5f7c858d5ed0c2889"
-     "4e907af99fb0d18c9e98f19ac80dd77abfa4bebe45055c0857b82a0f4d",
-     "9beab7722f0bcb468e5f234e074170a60225255de494108459abdf603c6e8b35",
-     "c4021fb7185a07096547af1fb06932e37cf8bd90cf593dea48d48614fa237e5e",
-     "7fb45d09e2172bec8d3e330aa06c43fbb5f625525485234e7714b7f6e92ba8f1"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "1e38d750d936d8522e9db1873fb4996bef97f8da3c6674a1223d29263f1234a90b751785"
-     "316444e9ba698bc8ab6cd010638d182c9adad4e334b2bd7529f0ae8e9a52ad60f59804b2"
-     "d780ed52bdd33b0bf5400147c28b4304e5e3434505ae7ce30d4b239e7e6f0ecf058badd5"
-     "b388eddbad64d24d2430dd04b4ddee98f972988f",
-     "76c17c2efc99891f3697ba4d71850e5816a1b65562cc39a13da4b6da9051b0fd",
-     "04d12512e934c367e4c4384dbd010e93416840288a0ba00b299b4e7c0d91578b57ebf883"
-     "5661d9b578f18d14ae4acf9c357c0dc8b7112fc32824a685ed72754e23",
-     "77cffa6f9a73904306f9fcd3f6bbb37f52d71e39931bb4aec28f9b076e436ccf",
-     "4d5a9d95b0f09ce8704b0f457b39059ee606092310df65d3f8ae7a2a424cf232",
-     "7d3c014ca470a73cef1d1da86f2a541148ad542fbccaf9149d1b0b030441a7eb"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "abcf0e0f046b2e0672d1cc6c0a114905627cbbdefdf9752f0c31660aa95f2d0ede72d179"
-     "19a9e9b1add3213164e0c9b5ae3c76f1a2f79d3eeb444e6741521019d8bd5ca391b28c10"
-     "63347f07afcfbb705be4b52261c19ebaf1d6f054a74d86fb5d091fa7f229450996b76f0a"
-     "da5f977b09b58488eebfb5f5e9539a8fd89662ab",
-     "67b9dea6a575b5103999efffce29cca688c781782a41129fdecbce76608174de",
-     "04b4238b029fc0b7d9a5286d8c29b6f3d5a569e9108d44d889cd795c4a385905be8cb3ff"
-     "f8f6cca7187c6a9ad0a2b1d9f40ae01b32a7e8f8c4ca75d71a1fffb309",
-     "d02617f26ede3584f0afcfc89554cdfb2ae188c192092fdde3436335fafe43f1",
-     "26fd9147d0c86440689ff2d75569795650140506970791c90ace0924b44f1586",
-     "00a34b00c20a8099df4b0a757cbef8fea1cb3ea7ced5fbf7e987f70b25ee6d4f"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "dc3d4884c741a4a687593c79fb4e35c5c13c781dca16db561d7e393577f7b62ca41a6e25"
-     "9fc1fb8d0c4e1e062517a0fdf95558b7799f20c211796167953e6372c11829beec64869d"
-     "67bf3ee1f1455dd87acfbdbcc597056e7fb347a17688ad32fda7ccc3572da7677d7255c2"
-     "61738f07763cd45973c728c6e9adbeecadc3d961",
-     "ecf644ea9b6c3a04fdfe2de4fdcb55fdcdfcf738c0b3176575fa91515194b566",
-     "04c3bdc7c795ec94620a2cfff614c13a3390a5e86c892e53a24d3ed22228bc85bf70480f"
-     "c5cf4aacd73e24618b61b5c56c1ced8c4f1b869580ea538e68c7a61ca3",
-     "53291d51f68d9a12d1dcdc58892b2f786cc15f631f16997d2a49bace513557d4",
-     "a860c8b286edf973ce4ce4cf6e70dc9bbf3818c36c023a845677a9963705df8b",
-     "5630f986b1c45e36e127dd7932221c4272a8cc6e255e89f0f0ca4ec3a9f76494"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "719bf1911ae5b5e08f1d97b92a5089c0ab9d6f1c175ac7199086aeeaa416a17e6d6f8486"
-     "c711d386f284f096296689a54d330c8efb0f5fa1c5ba128d3234a3da856c2a94667ef710"
-     "3616a64c913135f4e1dc50e38daa60610f732ad1bedfcc396f87169392520314a6b6b9af"
-     "6793dbabad4599525228cc7c9c32c4d8e097ddf6",
-     "4961485cbc978f8456ec5ac7cfc9f7d9298f99415ecae69c8491b258c029bfee",
-     "048d40bf2299e05d758d421972e81cfb0cce68b949240dc30f315836acc70bef035674e6"
-     "f77f8b46f46cca937d83b128dffbe9bd7e0d3d08aa2cbbfdfb16f72c9a",
-     "373a825b5a74b7b9e02f8d4d876b577b4c3984168d704ba9f95b19c05ed590af",
-     "ef6fb386ad044b63feb7445fa16b10319018e9cea9ef42bca83bdad01992234a",
-     "ac1f42f652eb1786e57be01d847c81f7efa072ba566d4583af4f1551a3f76c65"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "7cf19f4c851e97c5bca11a39f0074c3b7bd3274e7dd75d0447b7b84995dfc9f716bf08c2"
-     "5347f56fcc5e5149cb3f9cfb39d408ace5a5c47e75f7a827fa0bb9921bb5b23a6053dbe1"
-     "fa2bba341ac874d9b1333fc4dc224854949f5c8d8a5fedd02fb26fdfcd3be351aec0fcbe"
-     "f18972956c6ec0effaf057eb4420b6d28e0c008c",
-     "587907e7f215cf0d2cb2c9e6963d45b6e535ed426c828a6ea2fb637cca4c5cbd",
-     "04660da45c413cc9c9526202c16b402af602d30daaa7c342f1e722f15199407f31e6f8cb"
-     "b06913cc718f2d69ba2fb3137f04a41c27c676d1a80fbf30ea3ca46439",
-     "6b8eb7c0d8af9456b95dd70561a0e902863e6dfa1c28d0fd4a0509f1c2a647b2",
-     "08fabf9b57de81875bfa7a4118e3e44cfb38ec6a9b2014940207ba3b1c583038",
-     "a58d199b1deba7350616230d867b2747a3459421811c291836abee715b8f67b4"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "b892ffabb809e98a99b0a79895445fc734fa1b6159f9cddb6d21e510708bdab6076633ac"
-     "30aaef43db566c0d21f4381db46711fe3812c5ce0fb4a40e3d5d8ab24e4e82d3560c6dc7"
-     "c37794ee17d4a144065ef99c8d1c88bc22ad8c4c27d85ad518fa5747ae35276fc104829d"
-     "3f5c72fc2a9ea55a1c3a87007cd133263f79e405",
-     "24b1e5676d1a9d6b645a984141a157c124531feeb92d915110aef474b1e27666",
-     "04b4909a5bdf25f7659f4ef35e4b811429fb2c59126e3dad09100b46aea6ebe7a6760ae0"
-     "15fa6af5c9749c4030fdb5de6e58c6b5b1944829105cf7edf7d3a22cfb",
-     "88794923d8943b5dbcc7a7a76503880ff7da632b0883aaa60a9fcc71bf880fd6",
-     "6ec9a340b77fae3c7827fa96d997e92722ff2a928217b6dd3c628f3d49ae4ce6",
-     "637b54bbcfb7e7d8a41ea317fcfca8ad74eb3bb6b778bc7ef9dec009281976f7"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "8144e37014c95e13231cbd6fa64772771f93b44e37f7b02f592099cc146343edd4f4ec9f"
-     "a1bc68d7f2e9ee78fc370443aa2803ff4ca52ee49a2f4daf2c8181ea7b8475b3a0f608fc"
-     "3279d09e2d057fbe3f2ffbe5133796124781299c6da60cfe7ecea3abc30706ded2cdf18f"
-     "9d788e59f2c31662df3abe01a9b12304fb8d5c8c",
-     "bce49c7b03dcdc72393b0a67cf5aa5df870f5aaa6137ada1edc7862e0981ec67",
-     "04c786d9421d67b72b922cf3def2a25eeb5e73f34543eb50b152e738a98afb0ca5679627"
-     "1e79e2496f9e74b126b1123a3d067de56b5605d6f51c8f6e1d5bb93aba",
-     "89e690d78a5e0d2b8ce9f7fcbf34e2605fd9584760fa7729043397612dd21f94",
-     "07e5054c384839584624e8d730454dc27e673c4a90cbf129d88b91250341854d",
-     "f7e665b88614d0c5cbb3007cafe713763d81831525971f1747d92e4d1ca263a7"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "a3683d120807f0a030feed679785326698c3702f1983eaba1b70ddfa7f0b3188060b845e"
-     "2b67ed57ee68087746710450f7427cb34655d719c0acbc09ac696adb4b22aba1b9322b71"
-     "11076e67053a55f62b501a4bca0ad9d50a868f51aeeb4ef27823236f5267e8da83e14304"
-     "7422ce140d66e05e44dc84fb3a4506b2a5d7caa8",
-     "73188a923bc0b289e81c3db48d826917910f1b957700f8925425c1fb27cabab9",
-     "0486662c014ab666ee770723be8da38c5cd299efc6480fc6f8c3603438fa8397b9f26b33"
-     "07a650c3863faaa5f642f3ba1384c3d3a02edd3d48c657c269609cc3fc",
-     "ec90584ab3b383b590626f36ed4f5110e49888aec7ae7a9c5ea62dd2dc378666",
-     "13e9ad59112fde3af4163eb5c2400b5e9a602576d5869ac1c569075f08c90ff6",
-     "708ac65ff2b0baaccc6dd954e2a93df46016bd04457636de06798fcc17f02be5"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "b1df8051b213fc5f636537e37e212eb20b2423e6467a9c7081336a870e6373fc835899d5"
-     "9e546c0ac668cc81ce4921e88f42e6da2a109a03b4f4e819a17c955b8d099ec6b282fb49"
-     "5258dca13ec779c459da909475519a3477223c06b99afbd77f9922e7cbef844b93f3ce5f"
-     "50db816b2e0d8b1575d2e17a6b8db9111d6da578",
-     "f637d55763fe819541588e0c603f288a693cc66823c6bb7b8e003bd38580ebce",
-     "0474a4620c578601475fc169a9b84be613b4a16cb6acab8fd98848a6ec9fbd133d42b9e3"
-     "5d347c107e63bd55f525f915bcf1e3d2b81d002d3c39acf10fc30645a1",
-     "4d578f5099636234d9c1d566f1215d5d887ae5d47022be17dbf32a11a03f053b",
-     "113a933ebc4d94ce1cef781e4829df0c493b0685d39fb2048ce01b21c398dbba",
-     "3005bd4ec63dbd04ce9ff0c6246ad65d27fcf62edb2b7e461589f9f0e7446ffd"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "0b918ede985b5c491797d0a81446b2933be312f419b212e3aae9ba5914c00af431747a9d"
-     "287a7c7761e9bcbc8a12aaf9d4a76d13dad59fc742f8f218ef66eb67035220a07acc1a35"
-     "7c5b562ecb6b895cf725c4230412fefac72097f2c2b829ed58742d7c327cad0f1058df1b"
-     "ddd4ae9c6d2aba25480424308684cecd6517cdd8",
-     "2e357d51517ff93b821f895932fddded8347f32596b812308e6f1baf7dd8a47f",
-     "047e4078a1d50c669fb2996dd9bacb0c3ac7ede4f58fa0fa1222e78dbf5d1f41860014e4"
-     "6e90cc171fbb83ea34c6b78202ea8137a7d926f0169147ed5ae3d6596f",
-     "be522b0940b9a40d84bf790fe6abdc252877e671f2efa63a33a65a512fc2aa5c",
-     "a26b9ad775ac37ff4c7f042cdc4872c5e4e5e800485f488ddfaaed379f468090",
-     "f88eae2019bebbba62b453b8ee3472ca5c67c267964cffe0cf2d2933c1723dff"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "0fab26fde1a4467ca930dbe513ccc3452b70313cccde2994eead2fde85c8da1db84d7d06"
-     "a024c9e88629d5344224a4eae01b21a2665d5f7f36d5524bf5367d7f8b6a71ea05d413d4"
-     "afde33777f0a3be49c9e6aa29ea447746a9e77ce27232a550b31dd4e7c9bc8913485f2dc"
-     "83a56298051c92461fd46b14cc895c300a4fb874",
-     "77d60cacbbac86ab89009403c97289b5900466856887d3e6112af427f7f0f50b",
-     "04a62032dfdb87e25ed0c70cad20d927c7effeb2638e6c88ddd670f74df16090e544c5ee"
-     "2cf740ded468f5d2efe13daa7c5234645a37c073af35330d03a4fed976",
-     "06c1e692b045f425a21347ecf72833d0242906c7c1094f805566cdcb1256e394",
-     "eb173b51fb0aec318950d097e7fda5c34e529519631c3e2c9b4550b903da417d",
-     "ca2c13574bf1b7d56e9dc18315036a31b8bceddf3e2c2902dcb40f0cc9e31b45"},
-    {NID_X9_62_prime256v1, NID_sha384,
-     "7843f157ef8566722a7d69da67de7599ee65cb3975508f70c612b3289190e364141781e0"
-     "b832f2d9627122742f4b5871ceeafcd09ba5ec90cae6bcc01ae32b50f13f63918dfb5177"
-     "df9797c6273b92d103c3f7a3fc2050d2b196cc872c57b77f9bdb1782d4195445fcc6236d"
-     "d8bd14c8bcbc8223a6739f6a17c9a861e8c821a6",
-     "486854e77962117f49e09378de6c9e3b3522fa752b10b2c810bf48db584d7388",
-     "04760b5624bd64d19c866e54ccd74ad7f98851afdbc3ddeae3ec2c52a135be9cfafeca15"
-     "ce9350877102eee0f5af18b2fed89dc86b7df0bf7bc2963c1638e36fe8",
-     "e4f77c6442eca239b01b0254e11a4182782d96f48ab521cc3d1d68df12b5a41a",
-     "bdff14e4600309c2c77f79a25963a955b5b500a7b2d34cb172cd6acd52905c7b",
-     "b0479cdb3df79923ec36a104a129534c5d59f622be7d613aa04530ad2507d3a2"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "6c8572b6a3a4a9e8e03dbeed99334d41661b8a8417074f335ab1845f6cc852adb8c01d98"
-     "20fcf8e10699cc827a8fbdca2cbd46cc66e4e6b7ba41ec3efa733587e4a30ec552cd8dda"
-     "b8163e148e50f4d090782897f3ddac84a41e1fcfe8c56b6152c0097b0d634b41011471ff"
-     "d004f43eb4aafc038197ec6bae2b4470e869bded",
-     "9dd0d3a3d514c2a8adb162b81e3adfba3299309f7d2018f607bdb15b1a25f499",
-     "046b738de3398b6ac57b9591f9d7985dd4f32137ad3460dcf8970c1390cb9eaf8d83bc61"
-     "e26d2bbbd3cf2d2ab445a2bc4ab5dde41f4a13078fd1d3cc36ab596d57",
-     "9106192170ccb3c64684d48287bb81bbed51b40d503462c900e5c7aae43e380a",
-     "275fa760878b4dc05e9d157fedfd8e9b1c9c861222a712748cb4b7754c043fb1",
-     "699d906bb8435a05345af3b37e3b357786939e94caae257852f0503adb1e0f7e"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "7e3c8fe162d48cc8c5b11b5e5ebc05ebc45c439bdbc0b0902145921b8383037cb0812222"
-     "031598cd1a56fa71694fbd304cc62938233465ec39c6e49f57dfe823983b6923c4e86563"
-     "3949183e6b90e9e06d8275f3907d97967d47b6239fe2847b7d49cf16ba69d2862083cf1b"
-     "ccf7afe34fdc90e21998964107b64abe6b89d126",
-     "f9bf909b7973bf0e3dad0e43dcb2d7fa8bda49dbe6e5357f8f0e2bd119be30e6",
-     "04f2a6674d4e86152a527199bed293fa63acde1b4d8a92b62e552210ba45c38792c72565"
-     "c24f0eee6a094af341ddd8579747b865f91c8ed5b44cda8a19cc93776f",
-     "e547791f7185850f03d0c58419648f65b9d29cdc22ed1de2a64280220cfcafba",
-     "4782903d2aaf8b190dab5cae2223388d2d8bd845b3875d37485c54e1ded1d3d8",
-     "dfb40e406bfa074f0bf832771b2b9f186e2211f0bca279644a0ca8559acf39da"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "d5aa8ac9218ca661cd177756af6fbb5a40a3fecfd4eea6d5872fbb9a2884784aa9b5f0c0"
-     "23a6e0da5cf6364754ee6465b4ee2d0ddc745b02994c98427a213c849537da5a4477b3ab"
-     "fe02648be67f26e80b56a33150490d062aaac137aa47f11cfeddba855bab9e4e028532a5"
-     "63326d927f9e6e3292b1fb248ee90b6f429798db",
-     "724567d21ef682dfc6dc4d46853880cfa86fe6fea0efd51fac456f03c3d36ead",
-     "0470b877b5e365fcf08140b1eca119baba662879f38e059d074a2cb60b03ea5d395f56f9"
-     "4d591df40b9f3b8763ac4b3dbe622c956d5bd0c55658b6f46fa3deb201",
-     "79d6c967ed23c763ece9ca4b026218004c84dc2d4ccc86cf05c5d0f791f6279b",
-     "2ba2ea2d316f8937f184ad3028e364574d20a202e4e7513d7af57ac2456804d1",
-     "64fe94968d18c5967c799e0349041b9e40e6c6c92ebb475e80dd82f51cf07320"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "790b06054afc9c3fc4dfe72df19dd5d68d108cfcfca6212804f6d534fd2fbe489bd8f64b"
-     "f205ce04bcb50124a12ce5238fc3fe7dd76e6fa640206af52549f133d593a1bfd423ab73"
-     "7f3326fa79433cde293236f90d4238f0dd38ed69492ddbd9c3eae583b6325a95dec3166f"
-     "e52b21658293d8c137830ef45297d67813b7a508",
-     "29c5d54d7d1f099d50f949bfce8d6073dae059c5a19cc70834722f18a7199edd",
-     "043088d4f45d274cc5f418c8ecc4cbcf96be87491f420250f8cbc01cdf2503ec47634db4"
-     "8198129237ed068c88ff5809f6211921a6258f548f4b64dd125921b78b",
-     "0508ad7774908b5705895fda5c3b7a3032bf85dab7232bf981177019f3d76460",
-     "acd9f3b63626c5f32103e90e1dd1695907b1904aa9b14f2132caef331321971b",
-     "15c04a8bd6c13ed5e9961814b2f406f064670153e4d5465dcef63c1d9dd52a87"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "6d549aa87afdb8bfa60d22a68e2783b27e8db46041e4df04be0c261c4734b608a96f198d"
-     "1cdb8d082ae48579ec9defcf21fbc72803764a58c31e5323d5452b9fb57c8991d3174914"
-     "0da7ef067b18bf0d7dfbae6eefd0d8064f334bf7e9ec1e028daed4e86e17635ec2e409a3"
-     "ed1238048a45882c5c57501b314e636b9bc81cbe",
-     "0d8095da1abba06b0d349c226511f642dabbf1043ad41baa4e14297afe8a3117",
-     "0475a45758ced45ecf55f755cb56ca2601d794ebeaeb2e6107fe2fc443f580e23c5303d4"
-     "7d5a75ec821d51a2ee7548448208c699eca0cd89810ffc1aa4faf81ead",
-     "5165c54def4026ab648f7768c4f1488bcb183f6db7ffe02c7022a529a116482a",
-     "ebc85fc4176b446b3384ccc62fc2526b45665561a0e7e9404ac376c90e450b59",
-     "8b2c09428e62c5109d17ed0cf8f9fd7c370d018a2a73f701effc9b17d04852c6"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "1906e48b7f889ee3ff7ab0807a7aa88f53f4018808870bfed6372a77330c737647961324"
-     "c2b4d46f6ee8b01190474951a701b048ae86579ff8e3fc889fecf926b17f98958ac7534e"
-     "6e781ca2db2baa380dec766cfb2a3eca2a9d5818967d64dfab84f768d24ec122eebacaab"
-     "0a4dc3a75f37331bb1c43dd8966cc09ec4945bbd",
-     "52fe57da3427b1a75cb816f61c4e8e0e0551b94c01382b1a80837940ed579e61",
-     "042177e20a2092a46667debdcc21e7e45d6da72f124adecbc5ada6a7bcc7b401d5550e46"
-     "8f2626070a080afeeb98edd75a721eb773c8e62149f3e903cf9c4d7b61",
-     "0464fe9674b01ff5bd8be21af3399fad66f90ad30f4e8ee6e2eb9bcccfd5185c",
-     "f8250f073f34034c1cde58f69a85e2f5a030703ebdd4dbfb98d3b3690db7d114",
-     "a9e83e05f1d6e0fef782f186bedf43684c825ac480174d48b0e4d31505e27498"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "7b59fef13daf01afec35dea3276541be681c4916767f34d4e874464d20979863ee77ad0f"
-     "d1635bcdf93e9f62ed69ae52ec90aab5bbf87f8951213747ccec9f38c775c1df1e9d7f73"
-     "5c2ce39b42edb3b0c5086247556cfea539995c5d9689765288ec600848ecf085c01ca738"
-     "bbef11f5d12d4457db988b4add90be00781024ad",
-     "003d91611445919f59bfe3ca71fe0bfdeb0e39a7195e83ac03a37c7eceef0df2",
-     "047b9c592f61aae0555855d0b9ebb6fd00fb6746e8842e2523565c858630b9ba00d35b2e"
-     "168b1875bbc563bea5e8d63c4e38957c774a65e762959a349eaf263ba0",
-     "ef9df291ea27a4b45708f7608723c27d7d56b7df0599a54bc2c2fabbff373b40",
-     "66d057fd39958b0e4932bacd70a1769bbadcb62e4470937b45497a3d4500fabb",
-     "6c853b889e18b5a49ee54b54dd1aaedfdd642e30eba171c5cab677f0df9e7318"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "041a6767a935dc3d8985eb4e608b0cbfebe7f93789d4200bcfe595277ac2b0f402889b58"
-     "0b72def5da778a680fd380c955421f626d52dd9a83ea180187b850e1b72a4ec6dd63235e"
-     "598fd15a9b19f8ce9aec1d23f0bd6ea4d92360d50f951152bc9a01354732ba0cf90aaed3"
-     "3c307c1de8fa3d14f9489151b8377b57c7215f0b",
-     "48f13d393899cd835c4193670ec62f28e4c4903e0bbe5817bf0996831a720bb7",
-     "0482a1a96f4648393c5e42633ecdeb1d8245c78c5ea236b5bab460dedcc8924bc0e8cbf0"
-     "3c34b5154f876de19f3bb6fd43cd2eabf6e7c95467bcfa8c8fc42d76fd",
-     "efed736e627899fea944007eea39a4a63c0c2e26491cd12adb546be3e5c68f7d",
-     "cf7fc24bdaa09ac0cca8497e13298b961380668613c7493954048c06385a7044",
-     "f38b1c8306cf82ab76ee3a772b14416b49993fe11f986e9b0f0593c52ec91525"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "7905a9036e022c78b2c9efd40b77b0a194fbc1d45462779b0b76ad30dc52c564e48a493d"
-     "8249a061e62f26f453ba566538a4d43c64fb9fdbd1f36409316433c6f074e1b47b544a84"
-     "7de25fc67d81ac801ed9f7371a43da39001c90766f943e629d74d0436ba1240c3d7fab99"
-     "0d586a6d6ef1771786722df56448815f2feda48f",
-     "95c99cf9ec26480275f23de419e41bb779590f0eab5cf9095d37dd70cb75e870",
-     "0442c292b0fbcc9f457ae361d940a9d45ad9427431a105a6e5cd90a345fe3507f7313b08"
-     "fd2fa351908b3178051ee782cc62b9954ad95d4119aa564900f8ade70c",
-     "4c08dd0f8b72ae9c674e1e448d4e2afe3a1ee69927fa23bbff3716f0b99553b7",
-     "f2bc35eb1b8488b9e8d4a1dbb200e1abcb855458e1557dc1bf988278a174eb3b",
-     "ed9a2ec043a1d578e8eba6f57217976310e8674385ad2da08d6146c629de1cd9"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "cf25e4642d4f39d15afb7aec79469d82fc9aedb8f89964e79b749a852d931d3743650280"
-     "4e39555f5a3c75dd958fd5291ada647c1a5e38fe7b1048f16f2b711fdd5d39acc0812ca6"
-     "5bd50d7f8119f2fd195ab16633503a78ee9102c1f9c4c22568e0b54bd4fa3f5ff7b49160"
-     "bf23e7e2231b1ebebbdaf0e4a7d4484158a87e07",
-     "e15e835d0e2217bc7c6f05a498f20af1cd56f2f165c23d225eb3360aa2c5cbcf",
-     "0489dd22052ec3ab4840206a62f2270c21e7836d1a9109a3407dd0974c7802b9aee91609"
-     "ba35c7008b080c77a9068d97a14ca77b97299e74945217672b2fd5faf0",
-     "c9f621441c235fc47ec34eef4c08625df1ec74918e1f86075b753f2589f4c60b",
-     "a70d1a2d555d599bfb8c9b1f0d43725341151d17a8d0845fa56f3563703528a7",
-     "4e05c45adf41783e394a5312f86e66871c4be4896948c85966879d5c66d54b37"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "7562c445b35883cc937be6349b4cefc3556a80255d70f09e28c3f393daac19442a7eeced"
-     "cdfbe8f7628e30cd8939537ec56d5c9645d43340eb4e78fc5dd4322de8a07966b262770d"
-     "7ff13a071ff3dce560718e60ed3086b7e0003a6abafe91af90af86733ce8689440bf73d2"
-     "aa0acfe9776036e877599acbabfcb03bb3b50faa",
-     "808c08c0d77423a6feaaffc8f98a2948f17726e67c15eeae4e672edbe388f98c",
-     "04b0c0ad5e1f6001d8e9018ec611b2e3b91923e69fa6c98690ab644d650f640c42610539"
-     "c0b9ed21ac0a2f27527c1a61d9b47cbf033187b1a6ada006eb5b2662ed",
-     "1f6d4a905c761a53d54c362976717d0d7fc94d222bb5489e4830080a1a67535d",
-     "83404dcf8320baf206381800071e6a75160342d19743b4f176960d669dd03d07",
-     "3f75dcf102008b2989f81683ae45e9f1d4b67a6ef6fd5c8af44828af80e1cfb5"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "051c2db8e71e44653ea1cb0afc9e0abdf12658e9e761bfb767c20c7ab4adfcb18ed9b5c3"
-     "72a3ac11d8a43c55f7f99b33355437891686d42362abd71db8b6d84dd694d6982f061217"
-     "8a937aa934b9ac3c0794c39027bdd767841c4370666c80dbc0f8132ca27474f553d266de"
-     "efd7c9dbad6d734f9006bb557567701bb7e6a7c9",
-     "f7c6315f0081acd8f09c7a2c3ec1b7ece20180b0a6365a27dcd8f71b729558f9",
-     "04250f7112d381c1751860045d9bcaf20dbeb25a001431f96ac6f19109362ffebb49fba9"
-     "efe73546135a5a31ab3753e247034741ce839d3d94bd73936c4a17e4aa",
-     "68c299be2c0c6d52d208d5d1a9e0ffa2af19b4833271404e5876e0aa93987866",
-     "7b195e92d2ba95911cda7570607e112d02a1c847ddaa33924734b51f5d81adab",
-     "10d9f206755cef70ab5143ac43f3f8d38aea2644f31d52eaf3b472ee816e11e5"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "4dcb7b62ba31b866fce7c1feedf0be1f67bf611dbc2e2e86f004422f67b3bc1839c6958e"
-     "b1dc3ead137c3d7f88aa97244577a775c8021b1642a8647bba82871e3c15d0749ed343ea"
-     "6cad38f123835d8ef66b0719273105e924e8685b65fd5dc430efbc35b05a6097f17ebc59"
-     "43cdcd9abcba752b7f8f37027409bd6e11cd158f",
-     "f547735a9409386dbff719ce2dae03c50cb437d6b30cc7fa3ea20d9aec17e5a5",
-     "044ca87c5845fb04c2f76ae3273073b0523e356a445e4e95737260eba9e2d021db0f8647"
-     "5d07f82655320fdf2cd8db23b21905b1b1f2f9c48e2df87e24119c4880",
-     "91bd7d97f7ed3253cedefc144771bb8acbbda6eb24f9d752bbe1dd018e1384c7",
-     "008c1755d3df81e64e25270dbaa9396641556df7ffc7ac9add6739c382705397",
-     "77df443c729b039aded5b516b1077fecdd9986402d2c4b01734ba91e055e87fc"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "efe55737771070d5ac79236b04e3fbaf4f2e9bed187d1930680fcf1aba769674bf426310"
-     "f21245006f528779347d28b8aeacd2b1d5e3456dcbf188b2be8c07f19219e4067c1e7c97"
-     "14784285d8bac79a76b56f2e2676ea93994f11eb573af1d03fc8ed1118eafc7f07a82f32"
-     "63c33eb85e497e18f435d4076a774f42d276c323",
-     "26a1aa4b927a516b661986895aff58f40b78cc5d0c767eda7eaa3dbb835b5628",
-     "0428afa3b0f81a0e95ad302f487a9b679fcdef8d3f40236ec4d4dbf4bb0cbba8b2bb4ac1"
-     "be8405cbae8a553fbc28e29e2e689fabe7def26d653a1dafc023f3cecf",
-     "f98e1933c7fad4acbe94d95c1b013e1d6931fa8f67e6dbb677b564ef7c3e56ce",
-     "15a9a5412d6a03edd71b84c121ce9a94cdd166e40da9ce4d79f1afff6a395a53",
-     "86bbc2b6c63bad706ec0b093578e3f064736ec69c0dba59b9e3e7f73762a4dc3"},
-    {NID_X9_62_prime256v1, NID_sha512,
-     "ea95859cc13cccb37198d919803be89c2ee10befdcaf5d5afa09dcc529d333ae1e4ffd3b"
-     "d8ba8642203badd7a80a3f77eeee9402eed365d53f05c1a995c536f8236ba6b6ff889739"
-     "3506660cc8ea82b2163aa6a1855251c87d935e23857fe35b889427b449de7274d7754bde"
-     "ace960b4303c5dd5f745a5cfd580293d6548c832",
-     "6a5ca39aae2d45aa331f18a8598a3f2db32781f7c92efd4f64ee3bbe0c4c4e49",
-     "04c62cc4a39ace01006ad48cf49a3e71466955bbeeca5d318d672695df926b3aa4c85ccf"
-     "517bf2ebd9ad6a9e99254def0d74d1d2fd611e328b4a3988d4f045fe6f",
-     "dac00c462bc85bf39c31b5e01df33e2ec1569e6efcb334bf18f0951992ac6160",
-     "6e7ff8ec7a5c48e0877224a9fa8481283de45fcbee23b4c252b0c622442c26ad",
-     "3dfac320b9c873318117da6bd856000a392b815659e5aa2a6a1852ccb2501df3"},
-    {NID_secp384r1, NID_sha224,
-     "39f0b25d4c15b09a0692b22fbacbb5f8aee184cb75887e2ebe0cd3be5d3815d29f9b587e"
-     "10b3168c939054a89df11068e5c3fac21af742bf4c3e9512f5569674e7ad8b39042bcd73"
-     "e4b7ce3e64fbea1c434ed01ad4ad8b5b569f6a0b9a1144f94097925672e59ba97bc4d33b"
-     "e2fa21b46c3dadbfb3a1f89afa199d4b44189938",
-     "0af857beff08046f23b03c4299eda86490393bde88e4f74348886b200555276b93b37d4f"
-     "6fdec17c0ea581a30c59c727",
-     "0400ea9d109dbaa3900461a9236453952b1f1c2a5aa12f6d500ac774acdff84ab7cb71a0"
-     "f91bcd55aaa57cb8b4fbb3087d0fc0e3116c9e94be583b02b21b1eb168d8facf39552793"
-     "60cbcd86e04ee50751054cfaebcf542538ac113d56ccc38b3e",
-     "e2f0ce83c5bbef3a6eccd1744f893bb52952475d2531a2854a88ff0aa9b12c65961e2e51"
-     "7fb334ef40e0c0d7a31ed5f5",
-     "c36e5f0d3de71411e6e519f63e0f56cff432330a04fefef2993fdb56343e49f2f7db5fca"
-     "b7728acc1e33d4692553c02e",
-     "0d4064399d58cd771ab9420d438757f5936c3808e97081e457bc862a0c905295dca60ee9"
-     "4f4537591c6c7d217453909b"},
-    {NID_secp384r1, NID_sha224,
-     "5a3c80e608ed3ac75a6e45f6e94d374271a6d42b67a481860d5d309cc8b37c79cb61f171"
-     "6dc8aa84cb309ef9d68eb7fc6cf4b42333f316a5c30e74198c8b340926e340c5de47674a"
-     "707293c4aa2a1a2274a602f01c26b156e895499c60b38ef53fc2032e7485c168d73700d6"
-     "fa14232596a0e4997854a0b05d02e351b9d3de96",
-     "047dd5baab23f439ec23b58b7e6ff4cc37813cccb4ea73bb2308e6b82b3170edfe0e131e"
-     "ca50841bf1b686e651c57246",
-     "04de92ff09af2950854a70f2178d2ed50cc7042a7188301a1ea81d9629ad3c29795cb7f0"
-     "d56630a401e4d6e5bed0068d1e6135adbd8624130735e64e65ecbd43770dcc12b28e737b"
-     "5ed033666f34c918eb5589508e4a13b9243374a118a628dd0b",
-     "f3922351d14f1e5af84faab12fe57ded30f185afe5547aeb3061104740ecc42a8df0c27f"
-     "3877b4d855642b78938c4e05",
-     "38e181870cb797c1f4e6598cfd032add1cb60447d33473038d06df73919f844eddd16f40"
-     "f911075f8a4bacc0d924e684",
-     "a58dd1ca18aa31277de66c30c3bb7a14b53705ce6c547ed2cb0e336f63c42809422efffc"
-     "c722d1155f2254330a02b278"},
-    {NID_secp384r1, NID_sha224,
-     "e7d974c5dbd3bfb8a2fb92fdd782f997d04be79e9713944ce13c5eb6f75dfdec811b7ee4"
-     "b3859114b07f263846ae13f795eec8f3cb5b7565baff68e0fdd5e09ba8b176d5a71cb03f"
-     "bc5546e6937fba560acb4db24bd42de1851432b96e8ca4078313cb849bce29c9d8052586"
-     "01d67cd0259e255f3048682e8fdbdda3398c3e31",
-     "54ba9c740535574cebc41ca5dc950629674ee94730353ac521aafd1c342d3f8ac52046ed"
-     "804264e1440d7fe409c45c83",
-     "043db95ded500b2506b627270bac75688dd7d44f47029adeff99397ab4b6329a38dbb278"
-     "a0fc58fe4914e6ae31721a6875049288341553a9ac3dc2d9e18e7a92c43dd3c25ca866f0"
-     "cb4c68127bef6b0e4ba85713d27d45c7d0dc57e5782a6bf733",
-     "04324bd078807f6b18507a93ee60da02031717217ee5ce569750737be912be72da087ac0"
-     "0f50e13fdf7249a6ae33f73e",
-     "b2752aa7abc1e5a29421c9c76620bcc3049ecc97e6bc39fcca126f505a9a1bfae3bde89f"
-     "b751a1aa7b66fa8db3891ef0",
-     "f1c69e6d818ca7ae3a477049b46420cebd910c0a9a477fd1a67a38d628d6edaac123aebf"
-     "ca67c53a5c80fe454dba7a9d"},
-    {NID_secp384r1, NID_sha224,
-     "a670fda4d1d56c70de1d8680328043b2b7029633caf0ee59ffe1421c914bb937133d5a0f"
-     "9214846b2e0b350455a74c4ab434c56de65a17139bb8212bf1c76071a37536fa29348f87"
-     "1dbb26baa92eb93d97e923a6d2ffd9be25cbc33075e494e6db657bd8dc053fe4e17148d8"
-     "cf6e2058164f2b5766750eb01bbe7b361cdb848c",
-     "dabe87bbe95499bac23bc83c8b7307fe04be198f00059e2bf67c9611feaffb2c8f274f6a"
-     "a50eb99c3074186d8067d659",
-     "04c2aa0a695125279705917e02a4f258cade4c3ff9140a071414babf87764f426f7f36ff"
-     "da9d5f3394375d24864235476f8f9808da0ce0227cf453f9e456f557db9752e23b45cce4"
-     "baad5fee3844ddd7e1112bcec01ea9d67c7a76f3535bd0cb58",
-     "65a0305854033cbc6fe3ca139c40ca354d45801ecb59f4a923c251dc6b25d12d452d99b5"
-     "d6711fdb5efac812aa464cc4",
-     "c7fc32997d17ac79baf5789e4503f5f1a8863872bc350a91f12dd3ef8cf78c254e829217"
-     "809e8e00b6b8d4d85be3f1fd",
-     "1422e1838a22496df93486bce1142961dbd8478ae844b8dda54e210afdae0d9e930d587c"
-     "91bb600b0bde7237186d94e6"},
-    {NID_secp384r1, NID_sha224,
-     "7843f918fe2588bcfe756e1f05b491d913523255aa006818be20b676c957f4edb8df863c"
-     "6f5f8c15b3b80c7a2aa277b70d53f210bdfb856337980c406ea140e439dd321471407f37"
-     "4f69877b2d82367eed51e3c82c13948616dcb301d0c31f8f0352f2846abd9e72071f446a"
-     "2f1bd3339a09ae41b84e150fd18f4ba5d3c6bfa0",
-     "df43107a1deb24d02e31d479087bd669e2bc3e50f1f44b7db9484a7143cdca6a3391bddf"
-     "ea72dc940dbce8ec5efbd718",
-     "0476bd4be5d520471162cb5c36f80038301b325f845d9642204a84d78b3e721098932827"
-     "bf872bde0a9f86383953667d29415116b8b878f896a5aa4dbbdc21076f27135d8bbcaaca"
-     "02489ef639d742bd63f377da0c8e8ab36ff19b4a7cc5d4ceb4",
-     "798abad5a30d1805794540057388ee05e2422901c6335f985b9d4447b3ef75524751abfe"
-     "ab6409ad6bf77d4ae3014558",
-     "98744e5c6742fa5118a74a70db4957647a3cc12add4e876b45974a6a8707809f871daadb"
-     "fc0b865e01624f706b65f10c",
-     "9e256e8da8eff5a0c83baaa1ef4f7be798eba9543bf97adb0fff8719f5406ea1207a0cf7"
-     "03d99aa8f02169724b492273"},
-    {NID_secp384r1, NID_sha224,
-     "caa83d5ab07febbd2e0fe2d63738b9b7b8752594bea7aaf50345b3d2f316653a8c9222f2"
-     "b7877b64679e9573e81461a426029e45b8873a575094a1d572e0d32a9f0a9c6bcb9a2868"
-     "543b7d8bbe4a69a09e7321f05f8366cced1b72df526f895b60aed2c39c249653c7839538"
-     "770d4e5f47d3926ec0d168ab6a1af15bf1dca1f7",
-     "ea7a563ba2a7f5ab69973dca1f1a0d1572f0c59817cd3b62ad356c2099e2cdca1c553323"
-     "563f9dfbb333b126d84abc7f",
-     "04cf4717c5f5de668b785f06bdc9845df5a09e4edd83f4669756407cbb60807305c632bc"
-     "49f818f4a84b194369aa07736f7391e4982af8a2218f704f627d01f0508bfc8304992a2d"
-     "598a420bf2eb519f33bd7caf79380793733b3dba0cc5e2b9d8",
-     "7b9606b3df7b2a340dbc68d9754de0734e1faeb5a0135578a97628d948702235c60b20c8"
-     "002c8fcf906783e1b389e754",
-     "0d680010bed373287f9767955b5d2850e150b6713b49e453eb280148e45230c853d99ea2"
-     "d2f8fcbd3ddcba19aeec0af1",
-     "64329763a930ab5452afdb0557fef16ff71810d6343dfc9c6ae18905c3d274db6554cdc6"
-     "9d6078a1ca03284474a94f30"},
-    {NID_secp384r1, NID_sha224,
-     "594603458d6534974aeeafba919c4d0f4cb6843a3af41204bbb88aeb2fca2772d305163d"
-     "ba863da050aabedbaf89db521955d1715de95bbcef979ecdc0c976181ece00355385f8a8"
-     "f8cce127c9eac15ce3e958a3ed686184674ec9a50eb63271606ee7fdcb1323da3c3db8e8"
-     "9cad1fb42139a32d08abcfbf0d4ccfca18c89a86",
-     "4cc70cb35b3ddeb0df53a6bd7bd05f8ff4392a2db7344f2d443761484b3a468a4ee3d1a8"
-     "b27113d57283fd18b05f7829",
-     "0440e1fe21df34bb85a642a0abe819ebd128f7e39b84d8dcc4a9a599b372fb9588da1484"
-     "600ec28b1297bb685f9ae77831f3aa69ada57879fdcbe8df19cefabc308add7d03b17b1f"
-     "ac2f7783fece6a8dfe20bc36f518692677d96e3f730a67a671",
-     "8eda401d98f5688c34d8dbebcd3991c87c0442b0379154eaa2e5287dabe9a9e34cfc1305"
-     "d11ff68781df25d5611b331d",
-     "ff2d772786e159448bba26afd8c3281941a4cb0c56fec6f5cccb4c292c4ee0f7af9bd39b"
-     "be2d88148732585e104fdb30",
-     "07a1d890770daa949a17797dca7af3e8163da981ec330c03d63d1a8312c152be6a718163"
-     "205ffa08da7dcc163ba261f4"},
-    {NID_secp384r1, NID_sha224,
-     "733252d2bd35547838be22656cc7aa67eff0af0b13b428f77267a513c6824c3dbae53306"
-     "8b6817e82665f009560affcfe4b2ddb5b667a644fc1a42d24f24e0947e0dc50fb62c919b"
-     "c1fe4e7ded5e28f2e6d80fcf66a081fb2763526f8def5a81a4ddd38be0b59ee839da1643"
-     "eeeaee7b1927cec12cf3da67c02bc5465151e346",
-     "366d15e4cd7605c71560a418bd0f382fd7cd7ad3090ff1b2dfbed74336166a905e1b760c"
-     "f0bccee7a0e66c5ebfb831f1",
-     "04a143f277ab36a10b645ff6c58241ea67ffdc8acf12d60973068390f06b4d8f4d773b10"
-     "c1ebf6889b1cfa73ebb90f6ca17a17cad29bb507b309021f6f92cb5c10ba535f4a3e317f"
-     "cc68cfd02d3ccd269f465169c73d30ff308f5350d881b08aec",
-     "dbe545f920bc3d704c43d834bab21e40df12ec9e16a619a3e6b3f08760c26aae6e4fd91f"
-     "ad00f745194794b74bb1baee",
-     "cdc39b12bba30da66fe9554713c05880ddc27afa4d2d151440f124c351fb9496dc950465"
-     "16b0921083347d64369846ac",
-     "797d0344e49f9ba87a187c50f664e5015d449e346b1a7bd9427c5be559fc58173651880d"
-     "5aadf053f81899d3368d6181"},
-    {NID_secp384r1, NID_sha224,
-     "5a182bd174feb038dfae3346267156bf663167f713dea1ce936b0edb815cd9b8c8e4d411"
-     "c786ba2494a81442617255db7158b142e720d86c9b56680fb9efd4298cdd69079a281534"
-     "94c42a24251c7ad42ecf7e97eabc1b3997529b2a297cbad2474269b87a0b1e385f2d7f8b"
-     "6eb8d1cd75eaf7e91d1acbecd45d7b2bfbbe3216",
-     "e357d869857a52a06e1ece5593d16407022354780eb9a7cb8575cef327f877d22322c006"
-     "b3c8c11e3d7d296a708bdb6d",
-     "04ce9a2185a68d6094aa5849a6efe78b349946f7380f0c79aa9664246cfcc71a879e90ad"
-     "78a0474f58644c6a208168150e8354fa47673cb3e07d446521345706c5515584b2602f92"
-     "1c3b9c44dded9e2c3f90ce47adb36d7e5f9f95a8c5ad8af397",
-     "1e77367ac4e10924854d135ad2f2507f39e2bafdbce33ff256bcbe9a7329b8d27185218b"
-     "cc3550aafbe3390e84c77292",
-     "df3182d49ad70959fb0c95bc7312750ce70fc87f1a328d39d9b29ac05d31305ce7209d6c"
-     "24d13225d9567b489f7a187b",
-     "d812b05abab0e96de13291e1f0da6479444ed5cd9d959b76f6cb43d394769035364f7c83"
-     "1a104dc7b5bd9b4a8e64df64"},
-    {NID_secp384r1, NID_sha224,
-     "aaa99fb1c71340d785a18f6f668e898c25cf7a0ac31d13c5b388b7233408493a5a109af6"
-     "d07065376b96f4903df7aba2b2af671a18772bb0472490d1240cde28967680727dd4acd4"
-     "7e0308920a75da857a6eeedee5b6586d45dff3d8a680599665aa895c89dd7770b824b7de"
-     "e477ac5e7602d409d3cc553090c970b50811dbab",
-     "745a18db47324a3710b993d115b2834339315e84e7006eafd889fb49bd3cc5a8b50c9052"
-     "6e65e6c53bddd2916d14bead",
-     "04f692578c6f77531210aef55c9e004ce3b66cf268c6900dde31a8bbb76e7562e3fb7624"
-     "2de34ca330d2501030aa11946640965833b28de926c46de060aa25beaeda98f8415a6b1e"
-     "3564aa77870cf4c89bd4fde92c8f5d9bf0eb41721586859d8e",
-     "11b9b36720abcac084efdb44c9f5b7d039e3250cb1e9c47850189ba3cfc1489d858b2a44"
-     "df357772b61d919c7e729c0f",
-     "02b252c99820cf50e6ce060ab55bd4f682276e29b4ae4197417432e6a7bfb8cf0bac89df"
-     "e105456af805d822cee77696",
-     "8e248bbf7d7028d63177e565c9d1666ee5be4d1ffbfffc9c7814b0cd38f74b98f3f2cd59"
-     "be42b9f132bfe5ee789cd96c"},
-    {NID_secp384r1, NID_sha224,
-     "1fadfa8254d3a0b82d137cfdd82043d5dc1fef195d5297b09cc5cfb061f59c933451c0dc"
-     "2a11b4037f34f88dacb803251f8880c4b72585c3c196e6fb23484ca43a191f8e41b9b9a3"
-     "7e2e6fcaab6738c3c62d1c98e1c620bb788b7b51a04f998a510efdba0d3418622fe8ce20"
-     "3b3fcd553b9b4206365a39031797ad11e49745ec",
-     "93f20963ea5011ff4f26481e359309e634195f6289134087bd2e83eee008c962780a6797"
-     "84ee7ac6acda03d663ed27e0",
-     "040edcde3533ea019e18f1a3cd97b7962e8823dda36c389f8f9287549f796d11376392b8"
-     "a01c7a80f127a8f75795e04f5463d7c458dccfc02f5148d755d59f9bbc8e3c3ea3490877"
-     "7928440747795955741296abcdd5386676419ed8049fedb489",
-     "3ad308faf04c42ee5ac69d36bc0aa9a96aacf55ea0f27dac4f52e088f023d206340a6324"
-     "874ffad169ff80624de24c96",
-     "209b72f9aae72c4339813573c3a8408a9e0be641ca863d81d9d14c48d0bf4cd44a1a7985"
-     "cff07b5d68f3f9478475645b",
-     "f6292e599b22a76eda95393cf59f4745fa6c472effd1f781879ad9a4437a98080b0b07da"
-     "dad0c249631c682d2836a977"},
-    {NID_secp384r1, NID_sha224,
-     "9ecb6f5ed3ba666a8536a81ef65012c2cb8b433508798d84708abb06dfb75503886f7838"
-     "4fb8c7a4d2d49ef539d9b8a0b60938c7f07471dda91f258b0d99691b38a8403a2bb3f956"
-     "bdfd09baba16d9b6877097a9b6213481b47a06e139d23ec7abad5668d21f912fdb70d31b"
-     "b9adf9b3ce80e308252fa81a51674f88d02db72b",
-     "f175e6ac42fd48ec9d652c10707c039c67c4cc61d8c45a373dcda6e4ca6c53e947e49c24"
-     "e01b48e7cdf92edfe6d316a1",
-     "04a40c64f595491ce15790a5a87fbe64c1800247b42acd08fe5257700719f46afc8acce0"
-     "e4ede0517a312092d5e3d089cdd565df9dc2f381cc0c5d84f382a43a98018524c0b4708a"
-     "44b3e2817f9719f29fbf9c15803591ed9b4790c5adaba9f433",
-     "812dcaa6d4f9a43ccc553288065d13761581485aa903a500a690ccafbd330ba4818c977b"
-     "98c4bb57f8a182a1afacfae9",
-     "d000f18d3e4c162ff0d16f662e6703e7a6f5bff7a333ed266fa4f44c752415946c34945c"
-     "342c20f739677186b1d80ab3",
-     "ae7f1271c89e0aaa238710d039ea73a69110cc28fcf426f2fe6754b63a59e417fa84f903"
-     "cf7dccb5468b43ff083bbfd5"},
-    {NID_secp384r1, NID_sha224,
-     "e55bfca78d98e68d1b63688db12485578f36c489766f4d0bfaa0088433ff12133aaca455"
-     "805095f2e655940860958b3ead111d9070778ee3bbf3e47e43d9eba8b8d9b1fdf72f793f"
-     "cde2bcaa334f3e35fa2cca531ea7cf27fe9ccba741e38ac26129b2d612bf54a34e0ae6c1"
-     "66c0fef07fcd2b9ac253d7e041a500f7be7b8369",
-     "46c4f0b228b28aaa0ec8cfdf1d0ed3408b7ae049312fb9eaf5f3892720e68684cc8ad298"
-     "44a3dc9d110edf6916dfb8bb",
-     "0413ddec844731b7e30c467451df08ca11d6c581cb64abd8a257671cffd26f5ccad4df7b"
-     "9ee8924047a88a5d2d7567609cd74ca94f590fd1d13e190cc1e03c3da6c3faab15c7dda0"
-     "34af3deefee8aeec3628fa8b1978c54cfcd071baa319a46ec0",
-     "2a9dd520207c40a379cd4036adef9ee60fa8bc8c0d39b3ad91850ac93fd543f218b16885"
-     "81f23481a090b0e4c73792ac",
-     "94e08cca20fe3866f643f53ec65faf3f2b4d80cd9bcc8ff8f88bb28da9eada324fc2d048"
-     "908dd3d08a9e0ebb547731bc",
-     "8e6f82c4d3069b14f4c844b4ca133a9503493265c9f77a7d4775eda67de76798a23dd7ea"
-     "48e0ac3c337dd62bf058319d"},
-    {NID_secp384r1, NID_sha224,
-     "02c6b3c83bd34b288d96409162aa4ff114e9d134bf948046eb5ebcc0c7fe9dfceadda83e"
-     "d69da2fac00c8840f6c702a3fc5e6959d70f7e8af923e99e4937232ae3b841ffefd2e62f"
-     "ab3671a7c94a0281b8ea5bc176add57c5c9b6893fe7f5d48ce7256b96510810c4e046168"
-     "a3c5be9843b84d5268a50349b3444341aa5490dd",
-     "1d7b71ef01d0d33a8513a3aed3cabb83829589c8021087a740ca65b570777089be721a61"
-     "172b874a22a1f81aef3f8bb6",
-     "048d2721370df8f097d5a69396249a315f6037dc7045b3da11eacae6d43036f779d5de70"
-     "53d101768b42cc2b1283a3aaeaa046039ae662141f9954d278183eaa2e03917fe58583e3"
-     "2d344074d59d60caa5b0949c53066525d5cca923e2f201502e",
-     "d1b25ad25581cad17e96f1d302251681fee5b2efbb71c3c15ff035b2145d015d18e0e52d"
-     "c3187ab5a560277b3a3929b0",
-     "d836f52b14c7391744868daa2d5cf27eb9380b9b6176195573d5b04842e9f2fc3794d6cf"
-     "877feafee63d11b05f6a6bee",
-     "8b89042fef2c04d4bd6c9d66a06a010514321d623a5f8d57ba5ac3686872eaabca9e0ba2"
-     "d058ae7028e870acf03ca32d"},
-    {NID_secp384r1, NID_sha224,
-     "94f8bfbb9dd6c9b6193e84c2023a27dea00fd48356909faec2161972439686c146184f80"
-     "686bc09e1a698af7df9dea3d24d9e9fd6d7348a146339c839282cf8984345dc6a51096d7"
-     "4ad238c35233012ad729f262481ec7cd6488f13a6ebac3f3d23438c7ccb5a66e2bf820e9"
-     "2b71c730bb12fd64ea1770d1f892e5b1e14a9e5c",
-     "cf53bdd4c91fe5aa4d82f116bd68153c907963fa3c9d478c9462bb03c79039493a8eaeb8"
-     "55773f2df37e4e551d509dcd",
-     "043a65b26c08102b44838f8c2327ea080daf1e4fc45bb279ce03af13a2f9575f0fff9e2e"
-     "4423a58594ce95d1e710b590cefe9dcbcb2ec6e8bd8ed3af3ff0aa619e900cc8bab3f50f"
-     "6e5f79fac09164fb6a2077cc4f1fed3e9ec6899e91db329bf3",
-     "df31908c9289d1fe25e055df199591b23e266433ab8657cc82cb3bca96b88720e229f8df"
-     "d42d8b78af7db69342430bca",
-     "6770eea9369d6718e60dd0b91aee845ff7ed7e0fcc91675f56d32e5227fd3a4612bbcb15"
-     "56fe94a989b9e3bcc25bb20e",
-     "c43072f706c98126d06a82b04251e3ecb0ba66c4bb6cd7c025919b9cc6019cdc635256d2"
-     "a7fa017b806b1e88649d2c0d"},
-    {NID_secp384r1, NID_sha256,
-     "663b12ebf44b7ed3872b385477381f4b11adeb0aec9e0e2478776313d536376dc8fd5f3c"
-     "715bb6ddf32c01ee1d6f8b731785732c0d8441df636d8145577e7b3138e43c32a61bc124"
-     "2e0e73d62d624cdc924856076bdbbf1ec04ad4420732ef0c53d42479a08235fcfc4db4d8"
-     "69c4eb2828c73928cdc3e3758362d1b770809997",
-     "c602bc74a34592c311a6569661e0832c84f7207274676cc42a89f058162630184b52f0d9"
-     "9b855a7783c987476d7f9e6b",
-     "040400193b21f07cd059826e9453d3e96dd145041c97d49ff6b7047f86bb0b0439e90927"
-     "4cb9c282bfab88674c0765bc75f70d89c52acbc70468d2c5ae75c76d7f69b76af62dcf95"
-     "e99eba5dd11adf8f42ec9a425b0c5ec98e2f234a926b82a147",
-     "c10b5c25c4683d0b7827d0d88697cdc0932496b5299b798c0dd1e7af6cc757ccb30fcd3d"
-     "36ead4a804877e24f3a32443",
-     "b11db00cdaf53286d4483f38cd02785948477ed7ebc2ad609054551da0ab0359978c6185"
-     "1788aa2ec3267946d440e878",
-     "16007873c5b0604ce68112a8fee973e8e2b6e3319c683a762ff5065a076512d7c98b27e7"
-     "4b7887671048ac027df8cbf2"},
-    {NID_secp384r1, NID_sha256,
-     "784d7f4686c01bea32cb6cab8c089fb25c341080d9832e04feac6ea63a341079cbd562a7"
-     "5365c63cf7e63e7e1dddc9e99db75ccee59c5295340c2bba36f457690a8f05c62ab001e3"
-     "d6b333780117d1456a9c8b27d6c2504db9c1428dad8ba797a4419914fcc636f0f14ede3f"
-     "ba49b023b12a77a2176b0b8ff55a895dcaf8dbce",
-     "0287f62a5aa8432ff5e95618ec8f9ccaa870dde99c30b51b7673378efe4ccac598f4bbeb"
-     "bfd8993f9abb747b6ad638b9",
-     "04b36418a3014074ec9bbcc6a4b2367a4fb464cca7ec0a324cb68670d5c5e03e7a7eb07d"
-     "a117c5ea50b665ab62bd02a4914ea299c30e7d76e2c5905babada2d3bb4ee5eb35a5a236"
-     "05cdb0d5133471a53eb9e6758e49105a4eaf29d2267ba84ef2",
-     "935eeab3edeb281fbd4eead0d9c0babd4b10ff18a31663ee9de3bfa9ae8f9d266441158e"
-     "a31c889ded9b3c592da77fd7",
-     "738f9cb28f3b991335ef17b62559255faf75cad370a222464a492e27bb173c7f16b22100"
-     "ada6b695875c7e4b1a28f158",
-     "bc998c30e1491cd5d60dc7d1c38333165efe036b2a78db9b8f0e85ee68619cfba654e11a"
-     "e5ca5ee5a87099c27cf22442"},
-    {NID_secp384r1, NID_sha256,
-     "45e47fccc5bd6801f237cdbeac8f66ebc75f8b71a6da556d2e002352bd85bf269b6bc7c9"
-     "28d7bb1b0422601e4dd80b29d5906f8fcac212fe0eaaf52eda552303259cbcbe532e60ab"
-     "d3d38d786a45e39a2875bce675800a3eaeb9e42983d9fd9031180abd9adccc9ba30c6c19"
-     "8b4202c4dd70f241e969a3c412724b9b595bc28a",
-     "d44d3108873977036c9b97e03f914cba2f5775b68c425d550995574081191da764acc501"
-     "96f6d2508082a150af5cd41f",
-     "04c703835d723c85c643260379d8445b0c816fe9534351921e14a8e147fe140ec7b0c4d7"
-     "04f8dc66a232b2333b28f03deec5d0bb054053fd86c26f147c4966757aa04b00513a02d4"
-     "27b8d06c16055c607955efdc518d338abfe7927c195dc28588",
-     "c80f63e080650c8a21e4f63a62ec909adfb7d877f365d11ee1cb260baf112eb4730c161c"
-     "1d99dba98fc0d5bbd00dc97d",
-     "81de2810cde421997013513951a3d537c51a013110d6dbb29251410bcb5ba001a9686b84"
-     "90f1e581e282fd2ed0974b22",
-     "9cab0bbaffe91c7677ec3dd1f17060211a3cc0be574cbca064aa8c4b66ba6e64f3d80e83"
-     "da895042ca32d311c388d950"},
-    {NID_secp384r1, NID_sha256,
-     "c33ff63b4e6891e00b2349b3f2907c417ca355560544a91e24a7a0ee260d6850aeded29f"
-     "c0176b6039ca6187e8333391047cceaf14b1077df8f147dad84d36b2dac5666dc2f69dc9"
-     "b58b88cc73956efdb3b47f91831d5875051c76b0c4e9fc087012a1f03eeee85d6745b46a"
-     "a50bd9cb0110c2c94508765cec162ee1aa841d73",
-     "d5b72cbb6ec68aca46b9c27ad992afd8ffa02cb3067b234fcfa6e272e3b31be760695ff7"
-     "df988b57663057ab19dd65e3",
-     "04135a6542612f1468d8a4d01ff1914e532b1dd64d3627db9d403dc325651d3f82b0f6f0"
-     "fd1dbdeca2be967c4fb3793b5fcbbd40f6d3a38d0dfb64582ff4789d7b268241bc0c36de"
-     "2884bccfaeeff3b7b2b46a30bb35719804e0d11124b4e7f480",
-     "9da6de7c87c101b68db64fea40d97f8ad974ceb88224c6796c690cbf61b8bd8eede8470b"
-     "3caf6e6106b66cf3f0eebd55",
-     "17840911ecdf6ae0428b2634f442163c2c11b8dbf0cc7a5596fbe4d33e3e52f9d99e99ad"
-     "169867b1f39e89c9180cedc2",
-     "dd7ed67e480866d0474379ea4afff72870746f4feef2153be42f13bf472b1613d7faa5c0"
-     "abb7f7464070f94d7cf3f234"},
-    {NID_secp384r1, NID_sha256,
-     "f562f2b9d84b0e96a52532c3b43c39c8018c738bd8dc3797a7de7353971b2729d522d696"
-     "1b1f2e4df3f6a4bd3653e6d72b74fc0dba92ab939c4b542e994e5db6dd8ed4f56f651e69"
-     "9052e791237ae1f552f990ad156226ae8f7bf17fcbfa564f749604f97e9df0879d509857"
-     "47d981422a23040fe52f5ec74caf1d4aaad8a710",
-     "218ee54a71ef2ccf012aca231fee28a2c665fc395ff5cd20bde9b8df598c282664abf915"
-     "9c5b3923132983f945056d93",
-     "0401989ff07a7a452d8084937448be946bfedac4049cea34b3db6f7c91d07d69e926cce0"
-     "af3d6e88855a28120cf3dba8dfeb064e029d7539d4b301aabafe8de8870162deffe6383b"
-     "c63cc005add6ee1d5ced4a5761219c60cd58ad5b2a7c74aaa9",
-     "c5d39b436d851d94691f5f4aa9ef447f7989d984f279ae8b091aef5449ac062bcc056774"
-     "0f914624ad5b99fc32f9af0b",
-     "07d5b1b12877e8cb5e0aa5e71eeeb17bf0aa203064c7e98b3a1798a74dc9717252dc47c7"
-     "f06aaf1d5fe15b868323bbb9",
-     "69428cf101a7af5d08161a9fd7af212e02e33b6062aebdce4c96bf3a0684b5394cb902ca"
-     "7c2dec6e2f01f40c4576009d"},
-    {NID_secp384r1, NID_sha256,
-     "ace953ae851f571d71779aa120915f27450b236da23e9106f8d0756abdd2586193794122"
-     "8d225d5fb1aa1b1ebf759b1e326aeb3b6cd0cd87edd2ab9f6a7ad67b63d2c501d6a550ed"
-     "b2e7c9d216cc8af78dd33546af64d00abed4d0d2cfc5c9a7b5a055dbe8f7547902d185cf"
-     "46937314832bc5c602419a82ab83dbd9d3bd5aff",
-     "e6ab171f6937c000e144950801ad91023ae8e8476856c2592d9f7d5bb7180fd729211803"
-     "d39a412ead6c0be761cfa5d1",
-     "0438bc42b8c9d8866d09b214398d584b1b24a488dfacc3420d1e9506aa825b19fdf1ba74"
-     "e7b8f547f47b571467fe8c4d1f5179d62668d3f6a7ab5c8e3761a685e12008fb87d0529a"
-     "97645f65cfb5364376c1b6682e0ffcddd0bcd995c41d013ad3",
-     "05e9718aea9669c9e434f73866da5f252dec6d24c47a1c4ee3233450b6ec626de9746ebe"
-     "095b285558dfc89fc1b622fe",
-     "df9bab9dd1f22ec6f27116f38831cb2089aa78aa8c073024a0faddd9a48e810a5e8e2cad"
-     "d80fbf8dbd6088c71fe30b5b",
-     "1e0e8718567d12d18558c57f9e87a755c309e4ffb497335a3adfc8d7475ce8fd882d5dc3"
-     "3a8f5a16274b7ad74bb7862a"},
-    {NID_secp384r1, NID_sha256,
-     "9635ab832240be95301bedb94c5aec169eedc198cbbdfedcf41e9b586143d829b4597a6b"
-     "2a81902828332825fd84a785f187a3894e21bd99d22c4f94dcf34453fc052f15ec64d144"
-     "7c932cb38fcdd30b7be851963409c11881438cbaad7e96f9efbde317f2235d66af804477"
-     "a5dfe9f0c51448383830050ecf228889f83631e1",
-     "14acd516c7198798fd42ab0684d18df1cd1c99e304312752b3035bed6535a8975dff8acf"
-     "c2ba1675787c817b5bff6960",
-     "0429909d143cf7ee9c74b11d52f1a8f3ebd4a720c135612ca5618d3f432f03a95602ee75"
-     "a2057e1d7aab51d0648ac0b334404b6c5adffbadfa1b0380ae89fed96ec1ca16cc28661e"
-     "623d0f1c8b130fbaa96dd7257eae2bf03c2d3dcbc3dbc82c58",
-     "7f623c103eaa9099a0462e55f80519c565adaeffcb57a29993f3a8a92e63a560be8f0fb9"
-     "d23dc80bff1064bb41abad79",
-     "932ab291950c16b2b19a8036cd2e905714c6229cb190a73b3ea49c48dd8e76063a453c7c"
-     "3267a57597d2973678216296",
-     "d17d4c5ddbb9c27beebf526f113b416c8abfad53d11c4224813c7f351ba41a77dd4e77d6"
-     "e4a65bef2c9f62cc37a469a5"},
-    {NID_secp384r1, NID_sha256,
-     "d98b9a7d4fe9d0fd95de5056af164a8b7882cd34ab5bde83a2abb32dc361eb56a479a3a6"
-     "119db3b91dcad26a42d2206749567f0d97c34a981a91fc734921821a429f6a53401743a5"
-     "c406ba9d560f956203abc9d1f32f1a13e7d7b290f75c95fdbf857ea597021461c06a3aac"
-     "fa554ede3d69e4ff03bbbee5b7463ec77de2b3b2",
-     "2e780550984f3a00cb1e412429b33493c6eb6cd86d12f9d80588c247dcf567bd04296d2d"
-     "4b24b889d9c54954b7f38f57",
-     "0437dac42ef04663238443ef33e8addee2e78c40d50a1751913a7f5c37d1f23a26c7f86e"
-     "16055c788b8ca9554f06b2f2efbbed1549652904e3d00c39b01cc0460dbaf3185e6190c2"
-     "705677a9701de1fe56dff4f4d8418ee15059ff8fc36800982d",
-     "b788ca82811b0d4e4841765c71eafaa1e575378beedcd3860d8b92db3d070ac5aef7c425"
-     "067860fbee6c50cf0c642bbb",
-     "7292b3851870daeb2555a8a2fb198ead78739fcfb75327e5c32a82c6b77d58983e5ad548"
-     "ccb75dcf9411039c9576d9b9",
-     "a378c61802d9f1dd062b6e18f16416a954018f77df4df95ad1b983570377d5cfce4cc786"
-     "1759e802c52f81abc4f49aac"},
-    {NID_secp384r1, NID_sha256,
-     "1b4c754ac1c28dc415a71eac816bde68de7e8db66409af835838c5bb2c605111108a3bf1"
-     "3606ed5d8ade5ed72e50503e0de664416393d178ea4eec834d8d6f15039847b410080fd5"
-     "529b426e5aadd8451c20ebd92d787921f33e147bcbeb327b104d4aab1157fc1df33e4d76"
-     "8404b5ccb7110055c2508c600f429fd0c21b5784",
-     "a24d0fe90808aecc5d90626d7e6da7c9be5dfd4e1233c7f0f71f1b7c1c6fd318fafe1855"
-     "9c94718f044cf02ed5107cb1",
-     "04ec8ae1fb9bb88589d27d6f27d790392853396f37bc0c381631d85800fc668eea0886bf"
-     "1c6cff801147df19778d5b16041e1a8336c1e2506f8ee388b55cc648ae73b9295ea78467"
-     "979d2affb364536fad28120f51ec62a67cbb6ce7784780389f",
-     "755d025509b73cf1ea8817beb772ad150b4c17a52378be187daffe3db0158921e5e552d1"
-     "ca3c85df28519939f3cb794d",
-     "23ff2ffa62bbd427d49995d9c9950116e0d5a06ef076a4553448bc109e6482c5e87d4c83"
-     "3bc88de0bc722bc98cae2e61",
-     "9aea13d487c3ea6917e16374caafcf0321c12a80d28902dd8cd81909bb04b8c439e2491e"
-     "504756742d0d0bfb15a9c34c"},
-    {NID_secp384r1, NID_sha256,
-     "3cd8c053741dd9f974c6c5dbf8a1e5728e9b5eafb1cbcfc3452f5fbbda32a8c7564dee15"
-     "7e8d902c52514361da6d972934a56b3276e2a9379e328e24282e0db697c5bc29090fc489"
-     "ec46b7b188325dd4e96494c250de0f4a89fe2ccf919eaefcfb50c288113e6df92714feb7"
-     "f46e0822478c796d0f4ff3447a32997e892693ce",
-     "1c172e25732555afee7ded67a496f3f11babc0875898619f4519c29321e201e8ba1149f2"
-     "c20b48e5efba235d58fea7c3",
-     "0413e9e2c8bbcfe26e8f5f43c86268c5980ee693236a6b8777f3a7323718baa21005b482"
-     "d08aafc6fa6e3667d91353544c9ba181b3ee505be030f87ecd249b00670a791489b42af0"
-     "4976013483ff95b630c91c01e95757e906129f2f9b4ce719a8",
-     "08aec9a9e58bdc028805eb5dc86073d05fff1f5fb3fd17f510fc08f9272d84ba7aa66b6f"
-     "77d84fe6360bd538192bf01a",
-     "2b4337c3dfbc886ffad7858ae2480cb62227e12205a70361c42f1a5ca9e658ee30fc3cf4"
-     "030d85bd065edad83b99821f",
-     "2550cef8574bf17fb3d6b0c9d04ab266962bac3621bac233ff2e4989712d2a4a07171c0a"
-     "ebd3040cd6a32c3bd3efb8b5"},
-    {NID_secp384r1, NID_sha256,
-     "ed955dda6d9650124804d3deb6aeef900e520faf98b1ef6f14efcada7ca2433f09329b70"
-     "897305e59c89024d76e466b28fe02cb2a9b12e2478c66470259d7c282137a19e5a04ffad"
-     "ea55245c0f34a681593fedc42931d8b3321b3d82e9cc102cd00540ad311ec7bd8c9d06db"
-     "21bea4ca3dc74d98931ae0d40494aefc2345132c",
-     "5b96555dbd602e71d4d5d3aee19fd1ea084ee23d4f55c10937056762bc2015cbded2e898"
-     "a487f5482ab7e1e971245907",
-     "046e14c17bb831b0112d7f3543c5fd17c78379a516c9e0539b03b8b4bfdead2820343fc8"
-     "4b0382807573ded6c4d97b70037f60021d2de77546db666721c9aec84c3e2ba8de0ba774"
-     "43600dc77e6839bbf9316271adb22d4cb47d08f745ecb1dafd",
-     "7ad6f4ffd2b429ba10c6f112f800cacf1ad508cf8eba880893bb9659c1ddaaec57dcdc09"
-     "3a114500460d457bdde324f2",
-     "faea950ca513806bc59028c638d6302ffc86978c3ff1f06db015dd7c4777050186cb8dd8"
-     "71f5e926e1416539c1939c2f",
-     "2c592240eabb8a1f9878e1b5c9d5d3ced7b3a7ae571f5a86494ed2ca567a36eb72e7bea8"
-     "934bded29594bccf67ca84bd"},
-    {NID_secp384r1, NID_sha256,
-     "ce395b001da2a58e49691605d44af4206306f62f561bf2394060d2a5591a350277166bed"
-     "043819035f1e60b5b3fb5ae113ddd0473f8ef6b2b050c472c2a264e1d8b3ca82a4f158c4"
-     "0f2d78d9ce5e5ea6de243f2e1f13f47f6c6f403b270912c81c636be35b396ca58468b3fb"
-     "60aa83911d61441a0528d973bc31f965d4059080",
-     "8df9c3c710a25192f3dea970910bb3784e3509874cccf4334823eb9f7a8d05b067f2d812"
-     "d61e878e24b093089a0b8245",
-     "0492c9e32b20cbe6d4ed0727c6c942cf804a72031d6dfd69078b5e78ebce2d192268f1f5"
-     "e2abce5aaf1f8d6a35f136837fd5167905fa7689e03b9fb1487c566f62b36f2bc1c4a2bf"
-     "b6a836113b5c8d46f7c1ca51b628b14397fbc06ec9a07f4849",
-     "258dd05919735cd48627c9fe9fac5c252604aa7c2ae0460d7c1149cd96b7bd2ba195ad39"
-     "3bf392a2499f06aead5ba050",
-     "413793bcce52eda0f5b675a8d687cce86d5c9e1659b38a89e96246b5e05f8b0934d17dbb"
-     "a3b2ea44c838aa5fd87125d1",
-     "ce7309fc2d6e3438818a1a29a997410b025b0403de20795b97c86c46034a6b02afeed279"
-     "aeb06522d4de941bfdf50469"},
-    {NID_secp384r1, NID_sha256,
-     "ffefe316455ae4ffdb890bb804bf7d31424ea060ecacff419d0f7134ff76ad434063c0ec"
-     "0f8bb7059584d3a03f3625bb9e9f66ace1a47ac4b8f3e76fc7c420c55edb1427d1fa15b3"
-     "87ad73d02b0595c4e74321be8822752230a0dcfb85d60bfa186da7623a8ec3eb1633f0a2"
-     "94b23ae87216b14ccee9ef56418dcfab9427371e",
-     "6002cb01ad2ce6e7101665d47729c863b6435c3875de57a93f99da834f73e3e6e2b3880e"
-     "06de3e6bd1d51ea1807ab0d7",
-     "04e4216e1a20af8e8e3e74653ac016545001066e53e64af679ad1c85841bb475aed3e00e"
-     "ad052ae9955f48d675ff4ace568804c17641be21d4c6386902c9c5c888af25d97ca38370"
-     "3ea4a85cf93bbab360c0bbd2993374da499a303778650270b9",
-     "6b9507fd2844df0949f8b67b6fde986e50173713ac03df2edf65cb339859321cd3a2b9aa"
-     "b8356f95dec62460ab19c822",
-     "018891f6381ed358b422f79a299cf0789cee783ba388af4d82cbbe17f3709751b7fd9400"
-     "e9702820c28b9afc62fdf489",
-     "aef73bd590802b2fd2a65c4f7fec89f9b24ecc199a69254785925f334cd1977c5e1f858b"
-     "d9830d7d7d243ea707b1af0b"},
-    {NID_secp384r1, NID_sha256,
-     "304bccb718b3a9e12669913490cc5bcc1979287b56c628fad706c354241e88d10e81445a"
-     "2853e3fc32ece094ba1abc3fdcab61da27f9a0fca739371049fed462ee6b08fa31cde127"
-     "20f8144a6f00ce9b1a7a6eadd231f126717074b4efb5c72ce673ca5859000a436f67a338"
-     "d698759f12c461247c45a361fb6cb661fdbe6714",
-     "d8559c3543afc6f7b3dc037a687bad2630283757ba7862fd23ed14e2151a4cf5fed3d249"
-     "268f780e0b96b6b46274a2d5",
-     "045f94223918f2ec9f0a08342cb99e724881c92453957c59672860f69daac01b660331a0"
-     "f5845e50f1f27766b219c89e7ed76d83396130d10d1168d76c7fc83742ffffbe66d9f4da"
-     "4ca3f95f5ad6dac8cc7bb65d16d317d37aa99fdbf30ec7439c",
-     "4ad5a92b5b8e170b71c8a7ed419dc624c7680004562b8d16a37b6e639f581ce81d5f0d98"
-     "cce44d54c4e7136229148340",
-     "f7baa6a5488ab462ea59aa31a36402b15880c68110b6069f51ede0c3b52a7b1e5bf926fd"
-     "be95768931b7d5f87058835c",
-     "28b1c4ef448a432f7c91b98b0c6471691e888211b6af907369a8930859b8cdb2e94f466a"
-     "44f4e52f46df9b0d65e35de6"},
-    {NID_secp384r1, NID_sha256,
-     "64f9f05c2805acf59c047b5f5d2e20c39277b6d6380f70f87b72327a76170b872bfe4b25"
-     "c451602acfb6a631bb885e2655aee8abe44f69c90fb21ffde03cef2a452c468c6369867d"
-     "fd8aa26ac24e16aa53b292375a8d8fbf988e302bf00088e4c061aa12c421d8fe3cbd7273"
-     "b0e8993701df1c59431f436a08b8e15bd123d133",
-     "b9208cbfd186ddfa3efd5b71342ae1efb01a13ebc4c2a992a2cbee7254b7846a4252ece1"
-     "104b89d13d835911f8511224",
-     "04166e6d96cb60d916fd19888a2dd945a3306ff0d7b0a5e30729f47d3dac3de2be3fd5cd"
-     "7437e9a80d6c48cf960d2d36f8e6b2b70f131092ae210f29cc6bad701318bddb31bddf92"
-     "1695855c6208941100d0cee5d10799f8b835afe3ea510e8229",
-     "da706ab5f61531f2378b3c0a2b342108cd119eadaa88b859df64923bccfb0ec2393fd312"
-     "826f65c15a6587d1d460015b",
-     "d9124c42858080c62400e4d4d8136304e03d910cbe9b9b3487f4d27c7e0540a314d34bef"
-     "8c850045c8746ca631c11c42",
-     "bbf6424a3b70166fa799f49e918439d515327039258ef9bd88435a59c9c19659f8ec3c86"
-     "60720b0c08354ff60e0f5a76"},
-    {NID_secp384r1, NID_sha384,
-     "6b45d88037392e1371d9fd1cd174e9c1838d11c3d6133dc17e65fa0c485dcca9f52d41b6"
-     "0161246039e42ec784d49400bffdb51459f5de654091301a09378f93464d52118b48d44b"
-     "30d781eb1dbed09da11fb4c818dbd442d161aba4b9edc79f05e4b7e401651395b53bd8b5"
-     "bd3f2aaa6a00877fa9b45cadb8e648550b4c6cbe",
-     "201b432d8df14324182d6261db3e4b3f46a8284482d52e370da41e6cbdf45ec2952f5db7"
-     "ccbce3bc29449f4fb080ac97",
-     "04c2b47944fb5de342d03285880177ca5f7d0f2fcad7678cce4229d6e1932fcac11bfc3c"
-     "3e97d942a3c56bf34123013dbf37257906a8223866eda0743c519616a76a758ae58aee81"
-     "c5fd35fbf3a855b7754a36d4a0672df95d6c44a81cf7620c2d",
-     "dcedabf85978e090f733c6e16646fa34df9ded6e5ce28c6676a00f58a25283db8885e16c"
-     "e5bf97f917c81e1f25c9c771",
-     "50835a9251bad008106177ef004b091a1e4235cd0da84fff54542b0ed755c1d6f251609d"
-     "14ecf18f9e1ddfe69b946e32",
-     "0475f3d30c6463b646e8d3bf2455830314611cbde404be518b14464fdb195fdcc92eb222"
-     "e61f426a4a592c00a6a89721"},
-    {NID_secp384r1, NID_sha384,
-     "d768f41e6e8ec2125d6cf5786d1ba96668ac6566c5cdbbe407f7f2051f3ad6b1acdbfe13"
-     "edf0d0a86fa110f405406b69085219b5a234ebdb93153241f785d45811b3540d1c37424c"
-     "c7194424787a51b79679266484c787fb1ded6d1a26b9567d5ea68f04be416caf3be9bd2c"
-     "afa208fe2a9e234d3ae557c65d3fe6da4cb48da4",
-     "23d9f4ea6d87b7d6163d64256e3449255db14786401a51daa7847161bf56d494325ad2ac"
-     "8ba928394e01061d882c3528",
-     "045d42d6301c54a438f65970bae2a098cbc567e98840006e356221966c86d82e8eca515b"
-     "ca850eaa3cd41f175f03a0cbfd4aef5a0ceece95d382bd70ab5ce1cb77408bae42b51a08"
-     "816d5e5e1d3da8c18fcc95564a752730b0aabea983ccea4e2e",
-     "67ba379366049008593eac124f59ab017358892ee0c063d38f3758bb849fd25d867c3561"
-     "563cac1532a323b228dc0890",
-     "fb318f4cb1276282bb43f733a7fb7c567ce94f4d02924fc758635ab2d1107108bf159b85"
-     "db080cdc3b30fbb5400016f3",
-     "588e3d7af5da03eae255ecb1813100d95edc243476b724b22db8e85377660d7645ddc1c2"
-     "c2ee4eaea8b683dbe22f86ca"},
-    {NID_secp384r1, NID_sha384,
-     "6af6652e92a17b7898e40b6776fabaf0d74cf88d8f0ebfa6088309cbe09fac472eeac2aa"
-     "8ea96b8c12e993d14c93f8ef4e8b547afe7ae5e4f3973170b35deb3239898918c70c1056"
-     "332c3f894cd643d2d9b93c2561aac069577bbab45803250a31cd62226cab94d8cba7261d"
-     "ce9fe88c210c212b54329d76a273522c8ba91ddf",
-     "b5f670e98d8befc46f6f51fb2997069550c2a52ebfb4e5e25dd905352d9ef89eed5c2ecd"
-     "16521853aadb1b52b8c42ae6",
-     "0444ffb2a3a95e12d87c72b5ea0a8a7cb89f56b3bd46342b2303608d7216301c21b5d292"
-     "1d80b6628dc512ccb84e2fc278e4c1002f1828abaec768cadcb7cf42fbf93b1709ccae6d"
-     "f5b134c41fae2b9a188bfbe1eccff0bd348517d7227f2071a6",
-     "229e67638f712f57bea4c2b02279d5ccad1e7c9e201c77f6f01aeb81ea90e62b44b2d210"
-     "7fd66d35e56608fff65e28e4",
-     "b11db592e4ebc75b6472b879b1d8ce57452c615aef20f67a280f8bca9b11a30ad4ac9d69"
-     "541258c7dd5d0b4ab8dd7d49",
-     "4eb51db8004e46d438359abf060a9444616cb46b4f99c9a05b53ba6df02e914c9c0b6cc3"
-     "a9791d804d2e4c0984dab1cc"},
-    {NID_secp384r1, NID_sha384,
-     "b96d74b2265dd895d94e25092fb9262dc4f2f7a328a3c0c3da134b2d0a4e2058ca994e34"
-     "45c5ff4f812738e1b0c0f7a126486942a12e674a21f22d0886d68df2375f41685d694d48"
-     "7a718024933a7c4306f33f1a4267d469c530b0fed4e7dea520a19dd68bf0203cc87cad65"
-     "2260ed43b7b23f6ed140d3085875190191a0381a",
-     "de5975d8932533f092e76295ed6b23f10fc5fba48bfb82c6cc714826baf0126813247f8b"
-     "d51d5738503654ab22459976",
-     "04f1fabafc01fec7e96d982528d9ef3a2a18b7fe8ae0fa0673977341c7ae4ae8d8d3d674"
-     "20343d013a984f5f61da29ae381a31cf902c46343d01b2ebb614bc789c313b5f91f9302a"
-     "d9418e9c797563e2fa3d44500f47b4e26ad8fdec1a816d1dcf",
-     "fc5940e661542436f9265c34bce407eff6364bd471aa79b90c906d923e15c9ed96eea4e8"
-     "6f3238ea86161d13b7d9359d",
-     "c2fbdd6a56789024082173725d797ef9fd6accb6ae664b7260f9e83cb8ab2490428c8b9c"
-     "52e153612295432fec4d59cd",
-     "8056c5bb57f41f73082888b234fcda320a33250b5da012ba1fdb4924355ae679012d81d2"
-     "c08fc0f8634c708a4833232f"},
-    {NID_secp384r1, NID_sha384,
-     "7cec7480a037ff40c232c1d2d6e8cd4c080bbeecdaf3886fccc9f129bb6d202c316eca76"
-     "c8ad4e76079afe622f833a16f4907e817260c1fa68b10c7a151a37eb8c036b057ed4652c"
-     "353db4b4a34b37c9a2b300fb5f5fcfb8aa8adae13db359160f70a9241546140e550af007"
-     "3468683377e6771b6508327408c245d78911c2cc",
-     "11e0d470dc31fab0f5722f87b74a6c8d7414115e58ceb38bfcdced367beac3adbf1fe9ba"
-     "5a04f72e978b1eb54597eabc",
-     "041950166989164cbfd97968c7e8adb6fbca1873ebef811ea259eb48b7d584627f0e6d6c"
-     "64defe23cbc95236505a252aa141ef424b5cb076d4e32accd9250ea75fcf4ffd81814040"
-     "c050d58c0a29b06be11edf67c911b403e418b7277417e52906",
-     "e56904028226eb04f8d071e3f9cefec91075a81ca0fa87b44cae148fe1ce9827b5d1910d"
-     "b2336d0eb9813ddba3e4d7b5",
-     "c38ef30f55624e8935680c29f8c24824877cf48ffc0ef015e62de1068893353030d1193b"
-     "f9d34237d7ce6ba92c98b0fe",
-     "651b8c3d5c9d5b936d300802a06d82ad54f7b1ba4327b2f031c0c5b0cb215ad4354edc7f"
-     "932d934e877dfa1cf51b13fe"},
-    {NID_secp384r1, NID_sha384,
-     "00ce978603229710345c9ad7c1c2dba3596b196528eea25bd822d43ca8f76a024e292177"
-     "03dd0652c8a615284fc3edcc1c5ad1c8d5a8521c8e104c016a24e50c2e25066dcb56596f"
-     "913b872767e3627aa3e55ec812e9fdac7c2f1beade83aef093e24c9c953982adf431a776"
-     "880ae4583be158e11cdab1cbca3ad3a66900213d",
-     "5c6bbf9fbcbb7b97c9535f57b431ed1ccae1945b7e8a4f1b032016b07810bd24a9e20055"
-     "c0e9306650df59ef7e2cd8c2",
-     "042e01c5b59e619e00b79060a1e8ef695472e23bf9a511fc3d5ed77a334a242557098e40"
-     "972713732c5291c97adf9cf2cf563e3fe4ad807e803b9e961b08da4dde4cea8925649da0"
-     "d93221ce4cdceabc6a1db7612180a8c6bef3579c65539b97e9",
-     "03d23f1277b949cb6380211ad9d338e6f76c3eedac95989b91d0243cfb734a54b19bca45"
-     "a5d13d6a4b9f815d919eea77",
-     "abab65308f0b79c4f3a9ff28dd490acb0c320434094cef93e75adfe17e5820dc1f77544c"
-     "faaacdc8cf9ac8b38e174bef",
-     "11b783d879a6de054b316af7d56e526c3dce96c85289122e3ad927cfa77bfc50b4a96c97"
-     "f85b1b8221be2df083ff58fb"},
-    {NID_secp384r1, NID_sha384,
-     "54a255c18692c6162a46add176a0ae8361dcb8948f092d8d7bac83e160431794d3b98128"
-     "49bf1994bcdcfba56e8540c8a9ee5b93414548f2a653191b6bb28bda8dc70d45cc1b92a4"
-     "89f58a2d54f85766cb3c90de7dd88e690d8ebc9a79987eee1989df35af5e35522f83d85c"
-     "48dda89863171c8b0bf4853ae28c2ac45c764416",
-     "ffc7dedeff8343721f72046bc3c126626c177b0e48e247f44fd61f8469d4d5f0a74147fa"
-     "baa334495cc1f986ebc5f0b1",
-     "0451c78c979452edd53b563f63eb3e854a5b23e87f1b2103942b65f77d024471f75c8ce1"
-     "cc0dfef83292b368112aa5126e313e6aaf09caa3ba30f13072b2134878f14a4a01ee8632"
-     "6cccbff3d079b4df097dc57985e8c8c834a10cb9d766169366",
-     "c3de91dbe4f777698773da70dd610ef1a7efe4dc00d734399c7dd100728006a502822a5a"
-     "7ff9129ffd8adf6c1fc1211a",
-     "f4f477855819ad8b1763f53691b76afbc4a31a638b1e08c293f9bcd55decf797f9913ca1"
-     "28d4b45b2e2ea3e82c6cf565",
-     "7c26be29569ef95480a6d0c1af49dc10a51a0a8931345e48c0c39498bfb94d62962980b5"
-     "6143a7b41a2fddc8794c1b7f"},
-    {NID_secp384r1, NID_sha384,
-     "692a78f90d4f9d5aee5da536314a78d68c1feabbfe5d1ccea7f6059a66c4b310f8051c41"
-     "1c409ccf6e19a0cbd8b8e100c48317fe8c6d4f8a638b9551ce7ee178020f04f7da3001a0"
-     "e6855225fb3c9b375e4ed964588a1a41a095f3f476c42d52ffd23ce1702c93b56d4425d3"
-     "befcf75d0951b6fd5c05b05455bdaf205fe70ca2",
-     "adca364ef144a21df64b163615e8349cf74ee9dbf728104215c532073a7f74e2f6738577"
-     "9f7f74ab344cc3c7da061cf6",
-     "04ef948daae68242330a7358ef73f23b56c07e37126266db3fa6eea233a04a9b3e491523"
-     "3dd6754427cd4b71b75854077d009453ef1828eaff9e17c856d4fc1895ab60051312c3e1"
-     "db1e3766566438b2990cbf9945c2545619e3e0145bc6a79004",
-     "a2da3fae2e6da3cf11b49861afb34fba357fea89f54b35ce5ed7434ae09103fe53e2be75"
-     "b93fc579fedf919f6d5e407e",
-     "dda994b9c428b57e9f8bbaebba0d682e3aac6ed828e3a1e99a7fc4c804bff8df151137f5"
-     "39c7389d80e23d9f3ee497bf",
-     "a0d6b10ceffd0e1b29cf784476f9173ba6ecd2cfc7929725f2d6e24e0db5a4721683640e"
-     "aa2bbe151fb57560f9ce594b"},
-    {NID_secp384r1, NID_sha384,
-     "3b309bb912ab2a51681451ed18ad79e95d968abc35423a67036a02af92f575a0c89f1b66"
-     "8afe22c7037ad1199e757a8f06b281c33e9a40bab69c9874e0bb680b905d909b9dc24a9f"
-     "e89bb3d7f7d47082b25093c59754f8c19d1f81f30334a8cdd50a3cb72f96d4b3c305e60a"
-     "439a7e93aeb640dd3c8de37d63c60fb469c2d3ed",
-     "39bea008ec8a217866dcbdb1b93da34d1d3e851d011df9ef44b7828b3453a54aa70f1df9"
-     "932170804eacd207e4f7e91d",
-     "045709ec4305a9c3271c304face6c148142490b827a73a4c17affcfd01fffd7eaa65d2fd"
-     "edfa2419fc64ed910823513fafb083cda1cf3be6371b6c06e729ea6299213428db571193"
-     "47247ec1fcd44204386cc0bca3f452d9d864b39efbfc89d6b2",
-     "3c90cc7b6984056f570542a51cbe497ce4c11aeae8fc35e8fd6a0d9adeb650e8644f9d1d"
-     "5e4341b5adc81e27f284c08f",
-     "d13646895afb1bfd1953551bb922809c95ad65d6abe94eb3719c899aa1f6dba6b01222c7"
-     "f283900fe98628b7597b6ea6",
-     "4a9a38afda04c0a6b0058943b679bd02205b14d0f3d49b8f31aac289129780cdb1c555de"
-     "f8c3f9106b478729e0c7efaa"},
-    {NID_secp384r1, NID_sha384,
-     "f072b72b8783289463da118613c43824d11441dba364c289de03ff5fab3a6f60e85957d8"
-     "ff211f1cb62fa90216fb727106f692e5ae0844b11b710e5a12c69df3ed895b94e8769ecd"
-     "15ff433762d6e8e94d8e6a72645b213b0231344e2c968056766c5dd6b5a5df41971858b8"
-     "5e99afbf859400f839b42cd129068efabeea4a26",
-     "e849cf948b241362e3e20c458b52df044f2a72deb0f41c1bb0673e7c04cdd70811215059"
-     "032b5ca3cc69c345dcce4cf7",
-     "0406c037a0cbf43fdf335dff33de06d34348405353f9fdf2ce1361efba30fb204aea9dbd"
-     "2e30da0a10fd2d876188371be6360d38f3940e34679204b98fbf70b8a4d97f25443e46d0"
-     "807ab634ed5891ad864dd7703557aa933cd380e26eea662a43",
-     "32386b2593c85e877b70e5e5495936f65dc49553caef1aa6cc14d9cd370c442a0ccfab4c"
-     "0da9ec311b67913b1b575a9d",
-     "5886078d3495767e330c7507b7ca0fa07a50e59912a416d89f0ab1aa4e88153d6eaf0088"
-     "2d1b4aa64153153352d853b5",
-     "2cc10023bf1bf8ccfd14b06b82cc2114449a352389c8ff9f6f78cdc4e32bde69f3869da0"
-     "e17f691b329682ae7a36e1aa"},
-    {NID_secp384r1, NID_sha384,
-     "cf4945350be8133b575c4ad6c9585e0b83ff1ed17989b6cd6c71b41b5264e828b4e11599"
-     "5b1ae77528e7e9002ac1b5669064442645929f9d7dd70927cb93f95edeb73e8624f4bc89"
-     "7ec4c2c7581cb626916f29b2d6e6c2fba8c59a71e30754b459d81b912a12798182bcff40"
-     "19c7bdfe929cc769bcc2414befe7d2906add4271",
-     "d89607475d509ef23dc9f476eae4280c986de741b63560670fa2bd605f5049f1972792c0"
-     "413a5b3b4b34e7a38b70b7ca",
-     "0449a1c631f31cf5c45b2676b1f130cbf9be683d0a50dffae0d147c1e9913ab1090c6529"
-     "a84f47ddc7cf025921b771355a1e207eece62f2bcc6bdabc1113158145170be97469a290"
-     "4eaaa93aad85b86a19719207f3e423051f5b9cbbe2754eefcb",
-     "78613c570c8d33b7dd1bd1561d87e36282e8cf4843e7c344a2b2bb6a0da94756d670eeaf"
-     "fe434f7ae7c780f7cf05ca08",
-     "66f92b39aa3f4aeb9e2dc03ac3855406fa3ebbab0a6c88a78d7a03482f0c9868d7b78bc0"
-     "81ede0947c7f37bf193074ba",
-     "e5c64ed98d7f3701193f25dd237d59c91c0da6e26215e0889d82e6d3e416693f8d58843c"
-     "f30ab10ab8d0edd9170b53ad"},
-    {NID_secp384r1, NID_sha384,
-     "d9b5cf0b50416573ff3c63133275a18394dd4326be2041e8d97e6e4e3855a4a177e9d26d"
-     "fd223fe8aa74564edb49bd72de19916fb6f001f44530d5c18e2c332bce1b7415df5927ec"
-     "e5f3824f34d174b963136b53aef1fb78fb0c06a201a40b2db38e4d8216fc1e392a798c8a"
-     "b4b3a314496b7f1087804ebfa89bf96e9cdb80c0",
-     "083e7152734adf342520ae377087a223688de2899b10cfcb34a0b36bca500a4dfa530e23"
-     "43e6a39da7ae1eb0862b4a0d",
-     "0470a0f16b6c61172659b027ed19b18fd8f57bd28dc0501f207bd6b0bb065b5671cf3dd1"
-     "ed13d388dcf6ccc766597aa6044f845bf01c3c3f6126a7368c3454f51425801ee0b72e63"
-     "fb6799b4420bfdebe3e37c7246db627cc82c09654979c700bb",
-     "28096ababe29a075fbdf894709a20d0fdedb01ed3eeacb642a33a0da6aed726e13caf6cf"
-     "206792ec359f0c9f9b567552",
-     "ee2923f9b9999ea05b5e57f505bed5c6ba0420def42c6fa90eef7a6ef770786525546de2"
-     "7cdeb2f8586f8f29fb4ee67c",
-     "50ef923fb217c4cf65a48b94412fda430fac685f0da7bd574557c6c50f5b22e0c8354d99"
-     "f2c2f2c2691f252f93c7d84a"},
-    {NID_secp384r1, NID_sha384,
-     "9e4042d8438a405475b7dab1cd783eb6ce1d1bffa46ac9dfda622b23ac31057b922eced8"
-     "e2ed7b3241efeafd7c9ab372bf16230f7134647f2956fb793989d3c885a5ae064e85ed97"
-     "1b64f5f561e7ddb79d49aa6ebe727c671c67879b794554c04de0e05d68264855745ef3c9"
-     "567bd646d5c5f8728b797c181b6b6a876e167663",
-     "63578d416215aff2cc78f9b926d4c7740a77c142944e104aa7422b19a616898262d46a8a"
-     "942d5e8d5db135ee8b09a368",
-     "04cadbacef4406099316db2ce3206adc636c2bb0a835847ed7941efb02862472f3150338"
-     "f13f4860d47f39b7e098f0a390752ad0f22c9c264336cde11bbc95d1816ed4d1b1500db6"
-     "b8dce259a42832e613c31178c2c7995206a62e201ba108f570",
-     "7b69c5d5b4d05c9950dc94c27d58403b4c52c004b80a80418ad3a89aabc5d34f21926729"
-     "e76afd280cc8ee88c9805a2a",
-     "db054addb6161ee49c6ce2e4d646d7670754747b6737ca8516e9d1e87859937c3ef9b1d2"
-     "663e10d7e4bd00ec85b7a97a",
-     "fcc504e0f00ef29587e4bc22faada4db30e2cb1ac552680a65785ae87beb666c792513f2"
-     "be7a3180fc544296841a0e27"},
-    {NID_secp384r1, NID_sha384,
-     "0b14a7484a40b68a3ce1273b8a48b8fdb65ba900d98541c4bbd07b97e31bcc4c85545a03"
-     "e9deab3c563f47a036ff60d0361684ba241b5aa68bb46f440da22181ee328a011de98eff"
-     "34ba235ec10612b07bdfa6b3dc4ccc5e82d3a8d057e1862fef3def5a1804696f84699fda"
-     "2ec4175a54a4d08bcb4f0406fdac4eddadf5e29b",
-     "ed4df19971658b74868800b3b81bc877807743b25c65740f1d6377542afe2c6427612c84"
-     "0ada31a8eb794718f37c7283",
-     "0433093a0568757e8b58df5b72ea5fe5bf26e6f7aeb541b4c6a8c189c93721749bcacecc"
-     "f2982a2f0702586a9f812fc66febe320d09e1f0662189d50b85a20403b821ac0d000afdb"
-     "f66a0a33f304726c69e354d81c50b94ba3a5250efc31319cd1",
-     "d9b4cd1bdfa83e608289634dbfcee643f07315baf743fc91922880b55a2feda3b38ddf60"
-     "40d3ba10985cd1285fc690d5",
-     "009c74063e206a4259b53decff5445683a03f44fa67252b76bd3581081c714f882f882df"
-     "915e97dbeab061fa8b3cc4e7",
-     "d40e09d3468b46699948007e8f59845766dbf694b9c62066890dd055c0cb9a0caf0aa611"
-     "fb9f466ad0bbb00dbe29d7eb"},
-    {NID_secp384r1, NID_sha384,
-     "0e646c6c3cc0f9fdedef934b7195fe3837836a9f6f263968af95ef84cd035750f3cdb649"
-     "de745c874a6ef66b3dd83b66068b4335bc0a97184182e3965c722b3b1aee488c3620adb8"
-     "35a8140e199f4fc83a88b02881816b366a09316e25685217f9221157fc05b2d8d2bc8553"
-     "72183da7af3f0a14148a09def37a332f8eb40dc9",
-     "e9c7e9a79618d6ff3274da1abd0ff3ed0ec1ae3b54c3a4fd8d68d98fb04326b7633fc637"
-     "e0b195228d0edba6bb1468fb",
-     "04a39ac353ca787982c577aff1e8601ce192aa90fd0de4c0ed627f66a8b6f02ae5131554"
-     "3f72ffc1c48a7269b25e7c289a9064a507b66b340b6e0e0d5ffaa67dd20e6dafc0ea6a6f"
-     "aee1635177af256f9108a22e9edf736ab4ae8e96dc207b1fa9",
-     "b094cb3a5c1440cfab9dc56d0ec2eff00f2110dea203654c70757254aa5912a7e73972e6"
-     "07459b1f4861e0b08a5cc763",
-     "ee82c0f90501136eb0dc0e459ad17bf3be1b1c8b8d05c60068a9306a346326ff7344776a"
-     "95f1f7e2e2cf9477130e735c",
-     "af10b90f203af23b7500e070536e64629ba19245d6ef39aab57fcdb1b73c4c6bf7070c62"
-     "63544633d3d358c12a178138"},
-    {NID_secp384r1, NID_sha512,
-     "67d9eb88f289454d61def4764d1573db49b875cfb11e139d7eacc4b7a79d3db3bf720819"
-     "1b2b2078cbbcc974ec0da1ed5e0c10ec37f6181bf81c0f32972a125df64e3b3e1d838ec7"
-     "da8dfe0b7fcc911e43159a79c73df5fa252b98790be511d8a732fcbf011aacc7d45d8027"
-     "d50a347703d613ceda09f650c6104c9459537c8f",
-     "217afba406d8ab32ee07b0f27eef789fc201d121ffab76c8fbe3c2d352c594909abe591c"
-     "6f86233992362c9d631baf7c",
-     "04fb937e4a303617b71b6c1a25f2ac786087328a3e26bdef55e52d46ab5e69e5411bf9fc"
-     "55f5df9994d2bf82e8f39a153ea97d9075e92fa5bfe67e6ec18e21cc4d11fde59a68aef7"
-     "2c0e46a28f31a9d60385f41f39da468f4e6c3d3fbac9046765",
-     "90338a7f6ffce541366ca2987c3b3ca527992d1efcf1dd2723fbd241a24cff19990f2af5"
-     "fd6419ed2104b4a59b5ae631",
-     "c269d9c4619aafdf5f4b3100211dddb14693abe25551e04f9499c91152a296d7449c08b3"
-     "6f87d1e16e8e15fee4a7f5c8",
-     "77ffed5c61665152d52161dc13ac3fbae5786928a3d736f42d34a9e4d6d4a70a02d5af90"
-     "fa37a23a318902ae2656c071"},
-    {NID_secp384r1, NID_sha512,
-     "45db86829c363c80160659e3c5c7d7971abb1f6f0d495709bba908d7aa99c9df64b3408a"
-     "51bd69aba8870e2aaff488ef138f3123cf94391d081f357e21906a4e2f311defe527c55e"
-     "0231579957c51def507f835cceb466eb2593a509dcbee2f09e0dde6693b2bfe17697c9e8"
-     "6dd672f5797339cbe9ea8a7c6309b061eca7aef5",
-     "0a3f45a28a355381a919372f60320d6610cfb69c3e318eb1607db3cadfc42b728b77a6a9"
-     "e9e333de9183c58933daf60f",
-     "04832cbb7061a719a316e73dbad348fa67cd17c33f40b9000a3d3b691a2a2cd821052566"
-     "717c3ead01089b56086af1366f1e15a048d1dce642d9ebcbfac7f92b1bcee90fd0240cc7"
-     "9abd29e32e0e655c4ee1fd34fb88178bba92aca100e7794ed0",
-     "2a78e651623ba604c42cf094fc7d046629306f508853427ba091448800d1092c041bb232"
-     "3035fc9d19a8d44950f7dcc3",
-     "0db0cc9a2bda8dd7e565ad36f91b1c5756d78164dc8a72a5bee4b6bc45ea38c7a16b01d0"
-     "5b1893d4e06b62db24c30385",
-     "abd383edaeda7d0b8de1b54fcd3c28874fed62ab266f1f84c8ba796a7b54e5e0695fdb43"
-     "ce7fe90ed00fa468d87bca64"},
-    {NID_secp384r1, NID_sha512,
-     "4672fce0721d37c5be166bffa4b30d753bcf104b9b414db994b3ed33f36af4935ea59a0b"
-     "b92db66448b3f57dad4fc67cef10ce141bf82c536be604b89a0bc0e8bca605b867880049"
-     "d97142d30538fc543bd9d4fab7fdbe2f703815cdb6361beb66acff764bc275f910d16624"
-     "45b07b92830db69a5994857f53657ed5ca282648",
-     "2e408c57921939f0e0fe2e80ce74a4fa4a1b4fa7ab070206298fe894d655be50e2583af9"
-     "e45544b5d69c73dce8a2c8e7",
-     "04a2b24a5ad4a2e91f12199ed7699e3f297e27bf8b8ea8fbe7ed28366f3544cd8e680c23"
-     "8450f8a6422b40829d6647b25c2732be0075536e6519f6a099b975a40f8e0de337fa4d48"
-     "bd0762b43f41cab8deafdef9cfbb9973e457801e3bf9c93304",
-     "b10b6258afdde81f9c971cc1526d942e20cafac02f59fee10f98e99b8674636bff1d84a6"
-     "eaa49c0de8d8cfdc90d8ce84",
-     "be428a8de89a364a134719141ee8d776a3a8338f1132b07e01b28573d8eaf3b9008b6330"
-     "4c48821e53638b6141f9660b",
-     "866181dbef5c147d391bed6adcee408c339982c307adc718c2b9ab9e5642d8dedc36dd64"
-     "02559a3ab614c99c1e56b529"},
-    {NID_secp384r1, NID_sha512,
-     "9ae48fdd9bfc5cb0f4d4761e28b2073bda05a3e3fe82c212e66701dc4573cc67a829b0f8"
-     "2d7520b1bf11db0c6d1743822bbe41bb0adbd7222aa5fae70fbd1a31f2d4453a01c81e06"
-     "4d775388468be96f6063f8673b7b8d4455fe1bd4c801ad5e625a015eaa4a1a18da490d2a"
-     "f8642201eaba3c611cbd65f861d8e19ca82a1ee6",
-     "1c285da72a8eb1c3c38faab8d3bb4e68dc95c797082b9a3991a21c1de54759071ecf2265"
-     "fb1eff504ab24174bc6710cf",
-     "0411acb1b5cc59a4f1df1913a8d6e91cbdafb8206dc44aff7d9da45906b664fc33194d99"
-     "35a82aa4d62f39618897c86025832ed0b9575fff52a3603bfe89f312751b4c396da98324"
-     "117a61b3f525d27b2266f6cfb22be07e50b6874435e380ed62",
-     "2513075e02cc7fb3cff7b7adde46da31c5493749b5cf02758bd5b098a838bfd4d5e4c7fb"
-     "8268bdc37e219c30efebe878",
-     "b3d638b3be45f14f170da5bdc22d2114deac93ab340a25b3af2b5c18584bb9147e00dc6c"
-     "67a2274f79aa4838793eb63f",
-     "876112bdca2c725eb2f6dbd76d07710a31f0c16d38430cb0817f320a25a9ecfec8a66137"
-     "d0304612ae29a6a484fd3319"},
-    {NID_secp384r1, NID_sha512,
-     "817d6a110a8fd0ca7b4d565558f68b59a156744d4c5aac5c6610c95451793de2a756f774"
-     "558c61d21818d3ebeeeb71d132da1c23a02f4b305eccc5cd46bd21dfc173a8a91098354f"
-     "10ffbb21bf63d9f4c3feb231c736504549a78fd76d39f3ad35c36178f5c233742d2917d5"
-     "611d2073124845f1e3615b2ef25199a7a547e882",
-     "9da37e104938019fbdcf247e3df879a282c45f8fb57e6655e36b47723af42bec3b820f66"
-     "0436deb3de123a21de0ca37b",
-     "04722d0ea6891d509b18b85ca56f74deb5c3030d2a30433824123d430d03c99279572c3b"
-     "28ecf01e747b9db8acc55d0ba37e2605ea7092214f366f3639037bffd89fe103c646e990"
-     "839d3a1ced8d78edb5b9bc60d834fd8e2a3c17e920bdae023a",
-     "c8c18e53a9aa5915288c33132bd09323638f7995cd89162073984ed84e72e07a37e18c4c"
-     "023933eace92c35d10e6b1b6",
-     "6512a8a2be731e301dcf4803764297862bbfa0ac8daed64d8e98b34618ecb20520fc5d3c"
-     "f890b7783edf86e7ea407541",
-     "4ff10301f7b4168fae066361376007c1d7aa89a75c87719d0b54711ffef5ef3726f3eef8"
-     "4f7ebc025c110bde511b17f6"},
-    {NID_secp384r1, NID_sha512,
-     "464f10ec6fb229a51db5fd0e122f2cb8a9a022117e2987f4007bf5565b2c16aba0714e2e"
-     "3cdd0c100d55ac3017e36fc7501ad8309ab9572aa65424c9eb2e580a119c55777676ec49"
-     "8df53ef6ae78fd8a988130ee0e6082bf1ef71cd4c946021018a8ca7154d13b174c638912"
-     "613b0bdb9001c302bf7e443ad2124ab2c1cce212",
-     "0661ab3bf9f7bef51bec7dff758de289154557beb9ce18cc4b8cc09a871e8322af259cf1"
-     "88b593dc62f03a19e75f7f69",
-     "04b4f100558043858efa728082d9b99ad5192b59b0947434f5ba7ff2514508a6d71ba54e"
-     "7221c31cb0712103272b3f6fa434f6df4eeb2da11498044635067c2715ed15ae251c78ff"
-     "b9030d87909ea8539b66394e93109ca54c0406cf99960c3e93",
-     "84a87137edb6894f96c5a8e94a3765162034feb84dfea94e1c71411170c285a80321ec79"
-     "99e25861844143209804882c",
-     "4dc9d1b949b36e3c3847ac1c7ed114e1bc9cbe76119cf6fcd3f1b69ee6ee54e3255f1bb2"
-     "88fe2f8bd6d4049a21793c27",
-     "56a561d647b62ccae1e6df818b1a6fbde66c82ef0ff69ee415f183e7daf76be22630c7e0"
-     "2cd3fd729dfa490f26824584"},
-    {NID_secp384r1, NID_sha512,
-     "4e3e0fb96320ddccde8b463c273654c4f7164920b1d63430921d2e808dee403e6420eedd"
-     "a0a557b911d00736a4f8798dd4ef26673efd6d190988ad4929ec64f8685cfb76070a36cd"
-     "6a3a4bf2f54fb08a349d44642b6f614043fef9b2813b63457c76537d23da7b37310334f7"
-     "ba76edf1999dad86f72aa3446445a65952ac4e50",
-     "66e7cfdeb7f264cf786e35210f458c32223c3a12a3bc4b63d53a5776bc9b069928452484"
-     "f6241caa3781fd1a4109d4db",
-     "043c7682de540ab231daf21bf9fc80bda6abf7e17dcc79d476c7b7c3bd4d42d386877fd8"
-     "ba495c1b0333e04fb5fd2a15050a1582e4f4d72abea9d3476aff8369c41261f0c5dddf2c"
-     "a82e10f7a163f73df09473d9e5e2552187104e4cc7c6d83611",
-     "2fa266f5cce190eb77614933ca6a55121ad8bae168ff7a9043d96d13b5ca2fe70101ff9f"
-     "e1e2b2cd7413e6aa8f49abde",
-     "e7ecda9da0c52d0474a9f70094dc8f061d7d6a22210d3b69a7be8f389aa666f256322099"
-     "b87d16ad35357ea856574dba",
-     "ba348eb40a2830ec5a1130264ac0a8675420b1ae243e808a778135809ece21f42c0c8811"
-     "66321102b4f02df4c5c7ed9d"},
-    {NID_secp384r1, NID_sha512,
-     "c466b6b6baf7e6ffa876ec06105e2d43534e0517c07b1c4c9fb67ba81ce09525a7721ec3"
-     "c290f2b1f65b6463d41598e7a25b2238501629953a5ca955b644354fb6856733a2e5bb8f"
-     "5bc21a0c803493f5539f9fb83aab3dba2c982989c2270c61ab244b68bfe1b948d00c2ed9"
-     "75e09c29b5f8a7effcad8652a148cc880d503217",
-     "92c2f7ee64af86d003ab484e12b82fcf245fc330761057fec5b7af8f7e0a2d85b468c21d"
-     "171460fcb829cae7b986316d",
-     "04ca43a306479bf8fb537d4b9ff9d635bbb2a0d60d9e854d5b7e269d09d91f78c6b90b61"
-     "6e4c931629453645a2bb371e14356c4d7f10e690614eaf7f82ba0f9dc1aad98130c0ad9f"
-     "e353deec565cc04bef789a0a4242322e0058b46cd02f2de77d",
-     "6ec81fb74f8725ba225f317264460ee300cfd2f02092000989acbdad4799cf55c244a65c"
-     "557113328fe20282e6badb55",
-     "cd7a4309bcebc25a8e10899fe2eda5f8b2dbcf329cd2f3d65befd67393e83fba2f8a67a1"
-     "5c01a6ac8314f9f5e87a9dca",
-     "6dcfc0426bc148e67e91d4784e3d7e9bc3b7ce3676be62daa7f3f55dfdff6d9dc735b5e3"
-     "e0bbd0785db1f76f7ac065f3"},
-    {NID_secp384r1, NID_sha512,
-     "feac892b7720af80b3c9eede51e923f18d3d0c5de4c31f4aa75e36df7c7c2fd8f4177885"
-     "1a24b69e67dccb65e159dd5c383243bad7cfedcc5e85c8a01c34b0b94ba8e07e4c024c09"
-     "d279b3731e8b62f9562d3c4f5042567efe42a9d0eaaabab28bc6f11232fc8ceaaf4518d9"
-     "f3b2bebf020294496b7f6b879e69503f75fecd3d",
-     "15347caaad1067f1848a676bd0a8c52021ae604b79d02775a0459226e0391a3acd26653c"
-     "916fcfe86149fb0ee0904476",
-     "04e5a0463163964d984f5bad0072d45bc2059939e60a826ccca36c151460ae360f5d6679"
-     "f60fe43e999b6da5841c96e48a30f2dd425a3fa2c95d34124217250b39e3b4a14f3e6e41"
-     "5ae8e5b0409eb72f43f78b64d0ce6f2d49980d6f04cd1391db",
-     "1a2d224db4bb9c241ca5cab18920fad615fa25c1db0de0f024cb3ace0d11ef72b0568854"
-     "46659f67650fdff692517b1c",
-     "87b4de0fb21df38dfc9a4b1e350da67547e307f55b5b9dd6615e408afe7c3553a6e02722"
-     "847367439e636074faa2182b",
-     "375d965753b9ed6c6c08576726f8308c2f8dbd2737824464e71265d47907e26f615bbeb8"
-     "203ec617520d4ecd1851dc44"},
-    {NID_secp384r1, NID_sha512,
-     "cf2982e3bf174ce547741b969403cd11e9553067e6af8177d89511a0eb040db924530bdb"
-     "a65d8b1ff714228db0737c1756f509e1506014a10736e65be2f91980a73891496e90ff27"
-     "14a3601c7565cdcef5a395e2e0e1652f138d90d61eaa9cba993b823245647f6e07cec9b8"
-     "b4449cd68a29741cd1579c66e548ca0d0acf33aa",
-     "ac1cb5e59bda2eff3413a3bab80308f9fb32c595283c795de4c17fdae8d4647b5f108fd0"
-     "801aee22adb7db129283b5aa",
-     "04bc6b1a718284803553c173089c397870aaaecca579bb8e81a8cfa12473cd2057567fa8"
-     "726a19ed427cc035baeec2c55114f82997d1129b669f0015350e47ad561b1b13441af4fb"
-     "44656f15ed0c5706984d66655accc52f2e943eef39cb1cdc21",
-     "8053a46e875f446056b06d4318fa3e8977622de7207cbf0996bf35b0e9b19aaa507f642b"
-     "cf0be9f048f1af09806f6946",
-     "a994eb15b64114ce8a9342d18b5edda96a6d76314a5ac03da723699177d352a4a9f3b712"
-     "1b11a91e43a6af4025da51d6",
-     "8183ae33a888e99aa76882da0a6705ad102f2bbd9572fad0d2e4d6d70151970469e00c52"
-     "20e59c14724d771c1384b302"},
-    {NID_secp384r1, NID_sha512,
-     "bf9fdd4107ef5a6070108771ac9eee4f0c8043bf0d04db772a47294f4137e2439d94b337"
-     "114b074e57e0cb78d0ccf352a2833e9788ee2a1a9ffeacd34f38fcefb86653d70c7dadd4"
-     "cf6548d608e70acdef6c7530974b92c813798add659752a8c72b05e1ad9c65c21834ce6f"
-     "be49d8a1426b5a54270794436d284364fac6ec1a",
-     "205f1eb3dfacff2bdd8590e43e613b92512d6a415c5951bda7a6c37db3aae39b9b7ec6ed"
-     "d256609e75373419087fa71f",
-     "04c9f1f63a18c761b077a1ec35fbb2de635db9b8592c36194a01769b57728c7755d4c79b"
-     "3d5b97a1a4631e30c86d03f13cf8c4a38770054d5cc9bb9182e6d4638242c4fd16e869ac"
-     "22e44c4b9402d594e0c6f5df6a9a7de32a4893d9f6588f1950",
-     "ecd395c5d8b7d6e6b2b19644e0d2e6086c912c6a0f5b8ed4b94b7290b65852c9741ce8ee"
-     "b08d8751ead8a183e17d76c6",
-     "e81331d78b438b0b8d98c1be03385ba5d614af182f1677f259126cc3de7eaac6c19b02be"
-     "955d936b6bf9c27c6796e6f0",
-     "17c2b7a8e0fc93909762aa9f86f9561e759ecb88f02337b2018363be6095d9e4324a6d32"
-     "96046686624b5efad6b52878"},
-    {NID_secp384r1, NID_sha512,
-     "5d634fb39a2239256107dc68db19751540b4badac9ecf2fce644724401d6d632b3ae3b2e"
-     "6d05746b77ddc0c899878032248c263eda08d3d004d35952ad7a9cfe19343d14b37f9f63"
-     "2245e7b7b5fae3cb31c5231f82b9f1884f2de7578fbf156c430257031ba97bc6579843bc"
-     "7f59fcb9a6449a4cd942dffa6adb929cf219f0ad",
-     "e21e3a739e7ded418df5d3e7bc2c4ae8da76266a1fc4c89e5b09923db80a72217f1e9615"
-     "8031be42914cf3ee725748c1",
-     "040f753171922b5334f3dd2778a64ce2da8295121939beae71ad85e5344e893be0fd03cf"
-     "14e1f031adec098e0c4409449c45c10a0ffc0eb2f1cec5c89b698061108313ee7d449ad5"
-     "80efad344f0e7cf35be8a18fca620f112e57bdc746abdace55",
-     "d06bea06b25e6c30e866b1eb0657b45673e37b709013fb28fd7373afc8277cbc861354f8"
-     "21d0bd1927e52ec083a0f41f",
-     "e8d4a31dd0e7d2522be62a32608e744c3775ceb606dc897899f0c73f1a40ce9a8be854cd"
-     "506e65cd81fd7fa2c616cb7b",
-     "8151b681b6b6046d3c36f332d06d9ba7751e740631cdb759f88c50a25a8e950d5023df8a"
-     "15c77243743733c4feaf21d5"},
-    {NID_secp384r1, NID_sha512,
-     "c9b4ff721b3e886f0dc05856ffff0aabb64a8504b1746a47fdd73e6b7ebc068f06ac7ffa"
-     "44c757e4de207fc3cbfaf0469d3ac6795d40630bcafe8c658627e4bc6b86fd6a2135afbc"
-     "18ccc8e6d0e1e86016930ca92edc5aa3fbe2c57de136d0ea5f41642b6a5d0ddeb380f245"
-     "4d76a16639d663687f2a2e29fb9304243900d26d",
-     "93434d3c03ec1da8510b74902c3b3e0cb9e8d7dccad37594d28b93e065b468d9af4892a0"
-     "3763a63eae060c769119c23c",
-     "04a52c25f2af70e5bc6a992ecef4ea54e831ed5b9453747d28aec5cffb2fcfee05be80c5"
-     "cbab21606b5507aa23878adee12cf2a9afeff83f3041dc8a05f016ccae58aa1a0e0dc6be"
-     "9d928e97f2598c9ba5e9718d5eb74c9cfb516fd8c09f55f5b9",
-     "13d047708ae5228d6e3bbada0e385afdb3b735b31123454fdf40afe3c36efed563fd2cce"
-     "84dcc45c553b0993d9ca9ec3",
-     "a0203f6f2c456baac03538ed506a182e57a25151802cf4b2557613b2fb615ebd4c50ddc5"
-     "05f87c048a45bad3b2fc371c",
-     "0eab56457c4080400fa3af124761d5a01fef35f9649edba8b97d22116386f3b8b363e97e"
-     "f3f82616d5d825df1cf865ef"},
-    {NID_secp384r1, NID_sha512,
-     "db2ad659cf21bc9c1f7e6469c5f262b73261d49f7b1755fc137636e8ce0202f929dca446"
-     "6c422284c10be8f351f36333ebc04b1888cba217c0fec872b2dfc3aa0d544e5e06a9518a"
-     "8cfe3df5b20fbcb14a9bf218e3bf6a8e024530a17bab50906be34d9f9bba69af0b11d8ed"
-     "426b9ec75c3bd1f2e5b8756e4a72ff846bc9e498",
-     "e36339ddbe8787062a9bc4e1540690915dd2a2f11b3fe9ee946e281a0a2cbed426df405e"
-     "d9cb0eca42f85443efd09e0c",
-     "04a1ffb4b790d1593e907369b69de10b93cddbb02c6131f787422364d9d692768ef80979"
-     "70306cce16c97f2b10c538efa7d0692028601ea794d2563ffe9facc7273938fab47dd00b"
-     "8960be15549a9c2b3f8552583eb4c6cd212fe486c159c79153",
-     "2226f7329378cecd697f36ae151546643d67760856854661e31d424fae662da910e2157d"
-     "a9bb6dfbe3622296e0b5710c",
-     "20dcc25b67dd997621f437f65d78347fb57f8295b1b14453b1128203cda892bcfe726a2f"
-     "107d30975d63172e56f11d76",
-     "51cff592cbef75ef8321c8fa1e4229c4298b8180e427bee4e91d1e24fc28a729cf296beb"
-     "728960d2a58cf26773d8e2e2"},
-    {NID_secp384r1, NID_sha512,
-     "dbd8ddc02771a5ff7359d5216536b2e524a2d0b6ff180fa29a41a8847b6f45f1b1d52344"
-     "d32aea62a23ea3d8584deaaea38ee92d1314fdb4fbbecdad27ac810f02de0452332939f6"
-     "44aa9fe526d313cea81b9c3f6a8dbbeafc899d0cdaeb1dca05160a8a039662c4c845a3db"
-     "b07be2bc8c9150e344103e404411668c48aa7792",
-     "5da87be7af63fdaf40662bd2ba87597f54d7d52fae4b298308956cddbe5664f1e3c48cc6"
-     "fd3c99291b0ce7a62a99a855",
-     "0454c79da7f8faeeee6f3a1fdc664e405d5c0fb3b904715f3a9d89d6fda7eabe6cee86ef"
-     "82c19fca0d1a29e09c1acfcf18926c17d68778eb066c2078cdb688b17399e54bde5a79ef"
-     "1852352a58967dff02c17a792d39f95c76d146fdc086fe26b0",
-     "1b686b45a31b31f6de9ed5362e18a3f8c8feded3d3b251b134835843b7ae8ede57c61dc6"
-     "1a30993123ac7699de4b6eac",
-     "9dbfa147375767dde81b014f1e3bf579c44dd22486998a9b6f9e0920e53faa11eed29a4e"
-     "2356e393afd1f5c1b060a958",
-     "e4d318391f7cbfe70da78908d42db85225c85f4f2ff413ecad50aad5833abe91bdd5f6d6"
-     "4b0cd281398eab19452087dd"},
-    {NID_secp521r1, NID_sha224,
-     "58ec2b2ceb80207ff51b17688bd5850f9388ce0b4a4f7316f5af6f52cfc4dde4192b6dbd"
-     "97b56f93d1e4073517ac6c6140429b5484e266d07127e28b8e613ddf65888cbd5242b2f0"
-     "eee4d5754eb11f25dfa5c3f87c790de371856c882731a157083a00d8eae29a57884dbbfc"
-     "d98922c12cf5d73066daabe3bf3f42cfbdb9d853",
-     "1d7bb864c5b5ecae019296cf9b5c63a166f5f1113942819b1933d889a96d12245777a994"
-     "28f93de4fc9a18d709bf91889d7f8dddd522b4c364aeae13c983e9fae46",
-     "0401a7596d38aac7868327ddc1ef5e8178cf052b7ebc512828e8a45955d85bef49494d15"
-     "278198bbcc5454358c12a2af9a3874e7002e1a2f02fcb36ff3e3b4bc0c69e70184902e51"
-     "5982bb225b8c84f245e61b327c08e94d41c07d0b4101a963e02fe52f6a9f33e8b1de2394"
-     "e0cb74c40790b4e489b5500e6804cabed0fe8c192443d4027b",
-     "141f679033b27ec29219afd8aa123d5e535c227badbe2c86ff6eafa5116e9778000f5385"
-     "79a80ca4739b1675b8ff8b6245347852aa524fe9aad781f9b672e0bb3ff",
-     "06b973a638bde22d8c1c0d804d94e40538526093705f92c0c4dac2c72e7db013a9c89ffc"
-     "5b12a396886305ddf0cbaa7f10cdd4cd8866334c8abfc800e5cca365391",
-     "0b0a01eca07a3964dd27d9ba6f3750615ea36434979dc73e153cd8ed1dbcde2885ead575"
-     "7ebcabba117a64fcff9b5085d848f107f0c9ecc83dfa2fa09ada3503028"},
-    {NID_secp521r1, NID_sha224,
-     "2449a53e0581f1b56d1e463b1c1686d33b3491efe1f3cc0443ba05d65694597cc7a2595b"
-     "da9cae939166eb03cec624a788c9bbab69a39fb6554649131a56b26295683d8ac1aea969"
-     "040413df405325425146c1e3a138d2f4f772ae2ed917cc36465acd66150058622440d7e7"
-     "7b3ad621e1c43a3f277da88d850d608079d9b911",
-     "17e49b8ea8f9d1b7c0378e378a7a42e68e12cf78779ed41dcd29a090ae7e0f883b0d0f2c"
-     "bc8f0473c0ad6732bea40d371a7f363bc6537d075bd1a4c23e558b0bc73",
-     "0400156cd2c485012ea5d5aadad724fb87558637de37b34485c4cf7c8cbc3e4f106cb1ef"
-     "d3e64f0adf99ddb51e3ac991bdd90785172386cdaf2c582cc46d6c99b0fed101edeeda71"
-     "7554252b9f1e13553d4af028ec9e158dbe12332684fc1676dc731f39138a5d301376505a"
-     "9ab04d562cc1659b0be9cb2b5e03bad8b412f2699c245b0ba2",
-     "1dc3e60a788caa5f62cb079f332d7e5c918974643dca3ab3566a599642cd84964fbef43c"
-     "e94290041fe3d2c8c26104d9c73a57a7d4724613242531083b49e255f33",
-     "12592c0be6cce18efb2b972cd193d036dcb850f2390fa8b9b86b2f876548bc424fb3bc13"
-     "c1e5c415fa09d0ecfcae5bf76fb23e8322d7eecb264a2ae6d20ef50d405",
-     "11bc9713be88e3b9912a3e5f5d7b56f20573e979b1a75d04ce339f724bddffa4665d2599"
-     "5fe24d32507d8a07c5e10169f5338ef2827737f7b0291752b21237217e3"},
-    {NID_secp521r1, NID_sha224,
-     "7ba05797b5b67e1adfafb7fae20c0c0abe1543c94cee92d5021e1abc57720a6107999c70"
-     "eacf3d4a79702cd4e6885fa1b7155398ac729d1ed6b45e51fe114c46caf444b20b406ad9"
-     "cde6b9b2687aa645b46b51ab790b67047219e7290df1a797f35949aaf912a0a8556bb210"
-     "18e7f70427c0fc018e461755378b981d0d9df3a9",
-     "135ea346852f837d10c1b2dfb8012ae8215801a7e85d4446dadd993c68d1e9206e1d8651"
-     "b7ed763b95f707a52410eeef4f21ae9429828289eaea1fd9caadf826ace",
-     "04018d40cc4573892b3e467d314c39c95615ee0510e3e4dbc9fa28f6cd1f73e7acde15ad"
-     "7c8c5339df9a7774f8155130e7d1f8de9139ddd6dfe1841c1e64c38ea98243017021782d"
-     "33dc513716c83afe7ba5e7abef9cb25b31f483661115b8d6b5ae469aaf6f3d54baa3b658"
-     "a9af9b6249fd4d5ea7a07cb8b600f1df72b81dac614cfc384a",
-     "0c24acc1edb3777212e5b0bac744eadf4eda11fa150753b355bf96b189e6f57fc02284bb"
-     "22d8b3cd8bba7a09aae9f4ea955b382063425a6f8da2f99b9647b147172",
-     "183da7b8a9f9d5f08903359c1a2435b085fcf26a2ed09ab71357bb7634054acc569535e6"
-     "fe81d28233e4703005fc4bf83ce794d9463d575795aa0f03398e854cefd",
-     "0b3621145b9866ab7809139795cc30cd0404127a7f0fafa793660491009f6c53724fdb0b"
-     "1ffbf0fd51c131180b8a957fe66e76d2970247c024261c768dee9abbfb9"},
-    {NID_secp521r1, NID_sha224,
-     "716dabdb22a1c854ec60420249905a1d7ca68dd573efaff7542e76f0eae54a1828db69a3"
-     "9a1206cd05e10e681f24881b131e042ed9e19f5995c253840e937b809dfb8027fed71d54"
-     "1860f318691c13a2eb514daa5889410f256305f3b5b47cc16f7a7dad6359589b5f4568de"
-     "4c4aae2357a8ea5e0ebaa5b89063eb3aa44eb952",
-     "1393cb1ee9bfd7f7b9c057ecc66b43e807e12515f66ed7e9c9210ba1514693965988e567"
-     "fbad7c3f17231aacee0e9b9a4b1940504b1cd4fd5edfaa62ba4e3e476fc",
-     "0401e855c935139c8092092cfa733db1292530506eeb2bbb1687f9602c36d97a6714e998"
-     "892d5d3b842d1896a6ece9d549e9792881a256256137b3dff180c96cc5d07b018d83b6e9"
-     "3cd287311f7bf7c1d7f9eeabcf0b69c12f2d8f40e333e81e956d968532a37a4c04d76187"
-     "4df293b484cd7053b03fdbc2fdcd3b4c412d6f272fb7c93fe6",
-     "1d98619bdc04735d30c222fc67da82c069aea5f449af5e8c4db10c1786c0cb9e6f2cc0bb"
-     "66fa6be18c485570d648dafcd0a973c43d5c94e9a9dacbd3170e53fa2a0",
-     "0bf47fabe107ce0ec03e2ad60a79b058e1bebb18568b6a8cdbe86032e71aa30c15766105"
-     "b2ea952cfa79bcab046df601159f96e179bbcf252dc68ac73d31481fdae",
-     "1f918fec69cd07d90f9d892b7117e7519c3224947f4262f1fd97077dd5386a6c78aeddff"
-     "3ee97e59ea353f06029f1336f0d6ef5c0f4b17ca59343a55319b7bfc3db"},
-    {NID_secp521r1, NID_sha224,
-     "9cc9c2f131fe3ac7ea91ae6d832c7788cbbf34f68e839269c336ceef7bef6f20c0a62ea8"
-     "cc340a333a3002145d07eba4cf4026a0c4b26b0217a0046701de92d573d7c87a386a1ea6"
-     "8dc80525b7dcc9be41b451ad9f3d16819e2a0a0b5a0c56736da3709e64761f97cae2399d"
-     "e2a4022dc4c3d73c7a1735c36dbde86c4bc5b6f7",
-     "179fa164e051c5851e8a37d82c181e809a05fea9a3f083299b22684f59aa27e40dc5a33b"
-     "3f7949338764d46bfe1f355134750518b856d98d9167ef07aac3092c549",
-     "0401857cc7bbed20e87b3fd9a104956aa20c6502192910e0e7598410526ebfe1c99397b8"
-     "5189612a60c51fb8f4dd5cb08a8cd2e702563062dcb043410715c5323a004601fce8d135"
-     "284310d2f38c216030634b32cd223222f0d9d8d2b7c55477c4b8b74fc6c96a6092f34b05"
-     "ca44d3633a5037c2166c479a032bb4f949f89fc1ba5236d07d",
-     "16d9704c0cee791f2938bb2a8a595752a3635c2f557efeecefd719414b5f2aaf846080f5"
-     "82c76eae7a8fddf81859b49d0131c212524d55defa67dca1a9a28ca400f",
-     "1c9a4e51774384e8362876a87c572e6463a54413c7c6252c552ebb182f83e45ace436ade"
-     "4ca373d8a7216e83efb62c8b41c4d5132a0afa65078f16d189baca39187",
-     "1e92a7dd5fea29a666398e1df5775cbb5664fe6943fe4c1d2bba516b7543c84df584458e"
-     "53919c4ffab579a26fb3c892a5d1a77b0a07428c89350f8b559e627b014"},
-    {NID_secp521r1, NID_sha224,
-     "14c69f8d660f7a6b37b13a6d9788eff16311b67598ab8368039ea1d9146e54f55a83b3d1"
-     "3d7ac9652135933c68fafd993a582253be0deea282d86046c2fb6fd3a7b2c80874ced28d"
-     "8bed791bd4134c796bb7baf195bdd0dc6fa03fdb7f98755ca063fb1349e56fd0375cf947"
-     "74df4203b34495404ebb86f1c7875b85174c574c",
-     "13dabca37130ba278eae2b3d106b5407711b0d3b437fbf1c952f0773571570764d2c7cb8"
-     "896a8815f3f1975b21adc6697898e5c0a4242092fc1b80db819a4702df4",
-     "0400bc2aebf40cd435bc37d73c09d05f2fd71321111a767c2b0d446f90dd4a186839c694"
-     "ceb734e027e7ee948f0f63e4d3f1656d3d543df23c342a599306909b34710901f4c98ac0"
-     "3f0718e58d5d1762c920445b11dbdd60ec7f60095809204e14965a4ecb0be6fea06adbac"
-     "8ba431d6f144c75c199225df2a619a34be99897125b3a10af8",
-     "0401187c8b89945a1e48cda9ee52167789f4121e67482a7ac797899f5d3d2e623aed31e4"
-     "adae08a8d43e69028fa074d2650317cbc765f6ed191cf0317b4bae57881",
-     "1e572afed754016fba43fc33e352932c4db65efcb84e2bd159b40fc5925893b161effc40"
-     "240be28d8c07154d2615f605c6f0451b976522d95afd37f46602df7a12a",
-     "030370c1c5352c2b663ac1858b42f69545b2f58ed5b2c007f303726977d3c756b5d644ec"
-     "6788f94c886f78269aa190a3d8d1ae10e4fd24d937c4556fb9e1953fd6d"},
-    {NID_secp521r1, NID_sha224,
-     "8d8e75df200c177dbfe61be61567b82177ea5ec58e2781168d2277d2fd42668f01248ca3"
-     "eb29ffa2689b12ae40f9c429532b6d2e1f15891322b825a0a072a1c68fa09e78cfdef3e9"
-     "5ed6fdf7233a43cb68236560d49a3278f0b3f47cb08f475bd9ab2f60755ea4a1767de931"
-     "3b71a1b9ea87ef33f34682efbda263b0f8cc2f52",
-     "198681adbde7840d7ccd9cf1fb82056433fb4dd26bddf909af7b3b99da1ca2c05c8d4560"
-     "ecd80ba68f376f8b487897e374e99a9288ed7e3645cc0d00a478aae8d16",
-     "040057ce3777af7032f1f82308682e71fe09f88bf29dacd5018a725e1caa4b1e2bfdd894"
-     "fe618f9266f31ba089856dc9c1b70e4a2faa08b4b744d1aafcd5ae99e2c7360199bcfef2"
-     "021bc5890d7d39ec5dc0c26956801e84cae742cf6c50386eb289b6e97754dd25a94abf81"
-     "f1cb1b36935b5eb29f4b32a6516d2ff6a7d23064a0daec94b3",
-     "19d2d74ad8ee2d85048f386998a71899ef6c960b4ab324e5fd1c0a076c5a632fd0009500"
-     "076522e052c5c9806eef7056da48df6b16eb71cdf0f1838b0e21715fce0",
-     "18ecacbcffd5414bbb96728e5f2d4c90178e27733d13617e134ec788022db124374bbaa1"
-     "1e2c77fe3f38d1af6e998e1b0266b77380984c423e80ffa6ff2bcafd57a",
-     "1c727f34b6a378f3087721a54e9796499b597ecf6666b8f18312d67e1190a8a66e878efc"
-     "2367b551267494e0245979ef4deed6d2cbf2c3711af6d82ccfeb101a377"},
-    {NID_secp521r1, NID_sha224,
-     "10631c3d438870f311c905e569a58e56d20a2a560e857f0f9bac2bb7233ec40c79de1452"
-     "94da0937e6b5e5c34fff4e6270823e5c8553c07d4adf25f614845b2eac731c5773ebbd71"
-     "6ab45698d156d043859945de57473389954d223522fbafecf560b07ef9ba861bcc1df9a7"
-     "a89cdd6debf4cd9bf2cf28c193393569ccbd0398",
-     "08c4c0fd9696d86e99a6c1c32349a89a0b0c8384f2829d1281730d4e9af1df1ad5a0bcfc"
-     "cc6a03a703b210defd5d49a6fb82536f88b885776f0f7861c6fc010ef37",
-     "040164ac88ed9afe137f648dd89cdd9956682830cac5f7c1a06d19a1b19f82bb1d22dfee"
-     "fea30d35c11202fed93fd5ce64835d27c6564d6e181287fa04a2d20994986b005cb83669"
-     "265f5380ccefe6b4f85fdf0049e6703f6f378a0b2e52ed0fbbcf300afebb722f4ed48e38"
-     "19cb976c1d60e2ba05646b478f6dfecfbae730e9644c297f00",
-     "189801432cba9bf8c0763d43b6ec3b8636e62324587a4e27905b09a58e4aa66d07d096db"
-     "ce87824e837be1c243dd741f983c535a5dd2f077aac8beee9918258d3cb",
-     "0917723f7241e8dc7cd746b699ab621d068dd3a90e906aaf0a4862744b96fd4e5ccdb9c7"
-     "796c27f7196e693d06ec209464c3ea60ad6313e9b77cceaa14767e6651c",
-     "0957b0ecdc3668f6efa5d0957615bcfffd6419c5e57579b74f960f65ae3fb9e8284322ff"
-     "710b066f7e0959ac926d3cf9a594bdb70bbec756c96910b26a2486dee9e"},
-    {NID_secp521r1, NID_sha224,
-     "80aad6d696cbe654faa0d0a24d2f50d46e4f00a1b488ea1a98ed06c44d1d0c568beb4ab3"
-     "674fc2b1d2d3da1053f28940e89ba1244899e8515cabdd66e99a77df31e90d93e37a8a24"
-     "0e803a998209988fc829e239150da058a300489e33bf3dcdaf7d06069e74569fee77f4e3"
-     "875d0a713ccd2b7e9d7be62b34b6e375e84209ef",
-     "1466d14f8fbe25544b209c5e6a000b771ef107867e28ed489a42015119d1aa64bff51d6b"
-     "7a0ac88673bbc3618c917561cff4a41cdb7c2833dab5ebb9d0ddf2ca256",
-     "0401dc8b71d55700573a26af6698b92b66180cf43e153edadb720780321dbb4e71d28e0a"
-     "488e4201d207fc4848fe9dd10dcabec44492656a3ff7a665fe932445c82d0b01920b1633"
-     "1b7abeb3db883a31288ef66f80b7728b008b3cc33e03a68f68d9e653a86e3177bbc00014"
-     "fa5ea4c1608c0d455c2e2ac7bd8ab8519ebf19955edf1baf8d",
-     "160d04420e0d31b0df476f83393b1f9aff68389cc3299e42ef348d97646f7531a722b66d"
-     "dfb9501bbb5c4a41d84c78be7233b11489bceb817d23060e6017433fab8",
-     "08077aabd0a342f03f912007c586cfedfc63f93d1118f720d5b62b3ce141a60f86f111df"
-     "d8fc2e31a6778981f1a5e28f29a7369bd7897bb41240c8d3a9c170e0ee0",
-     "00abc75fc154b93840579457820957e89d1260fee0a4b9bb1946f61ca1e71afd76bb5e10"
-     "77b3e38ceb39d1fac5ef8b217c4110617b3ad118e02b3fcc2a39ef38613"},
-    {NID_secp521r1, NID_sha224,
-     "8a7792a2870d2dd341cd9c4a2a9ec2da753dcb0f692b70b64cef2e22071389c70b3b188d"
-     "ea5f409fb435cbd09082f59de6bc2ff9e65f91b7acc51e6e7f8e513148cb3c7c4664f227"
-     "d5c704626b0fda447aa87b9d47cd99789b88628eb642ed250312de5ba6b25f3d5342a3cb"
-     "b7ebd69b0044ee2b4c9ba5e3f5195afb6bea823d",
-     "01a99fcf54c9b85010f20dc4e48199266c70767e18b2c618044542cd0e23733817776a1a"
-     "45dbd74a8e8244a313d96c779f723013cd88886cb7a08ef7ee8fdd862e7",
-     "0401912d33b01d51e2f777bdbd1ada23f2b1a9faf2be2f2a3b152547db9b149b697dd718"
-     "24ca96547462e347bc4ef9530e7466318c25338c7e04323b1ba5fd25ea716200bbe9b1e3"
-     "a84accd69b76b253f556c63e3f374e3de0d1f5e3600fc19215533b2e40d6b32c3af33314"
-     "d223ea2366a51d1a337af858f69326389276f91be5c466e649",
-     "14fafd60cb026f50c23481867772411bb426ec6b97054e025b35db74fe8ea8f74faa2d36"
-     "e7d40b4652d1f61794878510b49b7b4fe4349afccd24fc45fec2fd9e9e7",
-     "18b1df1b6d7030a23a154cacce4a2e3761cc6251ff8bf6c9f6c89d0a15123baef9b338ad"
-     "a59728349ce685c03109fcde512ed01a40afd2ca34e1bc02ecf2871d45c",
-     "0a399f9b9e21aeddf450429fec2dc5749e4a4c7e4f94cee736004dcc089c47635da22845"
-     "992cd076a4f0a01d2cc1b0af6e17b81a802361699b862157ad6cad8bd1d"},
-    {NID_secp521r1, NID_sha224,
-     "f971bcd396efb8392207b5ca72ac62649b47732fba8feaa8e84f7fb36b3edb5d7b5333fb"
-     "fa39a4f882cb42fe57cd1ace43d06aaad33d0603741a18bc261caa14f29ead389f7c2053"
-     "6d406e9d39c34079812ba26b39baedf5feb1ef1f79990496dd019c87e38c38c486ec1c25"
-     "1da2a8a9a57854b80fcd513285e8dee8c43a9890",
-     "1b6015d898611fbaf0b66a344fa18d1d488564352bf1c2da40f52cd997952f8ccb436b69"
-     "3851f9ccb69c519d8a033cf27035c27233324f10e9969a3b384e1c1dc73",
-     "040110c6177ceb44b0aec814063f297c0c890671220413dbd900e4f037a67d87583eaf4b"
-     "6a9a1d2092472c17641362313c6a96f19829bb982e76e3a993932b848c7a9700f6e566c4"
-     "e49b2ee70a900dc53295640f3a4a66732df80b29f497f4ae2fa61d0949f7f4b12556967b"
-     "b92201a4f5d1384d741120c95b617b99c47a61e11c93a482d6",
-     "1a88667b9bdfe72fb87a6999a59b8b139e18ef9273261549bc394d884db5aa64a0bc7c7d"
-     "38a8ef17333478d2119d826e2540560d65f52b9a6dc91be1340cfd8f8f8",
-     "015f73def52ea47ddb03e0a5d154999642202e06e6734ac930c1dc84756c67bbb1cca9f2"
-     "1f92d61bfdb2052c5dd2833349610f68139393d77250a7662ef7bd17cbe",
-     "155c744a729f83b27d1f325a91e63a0d564fe96ff91eaa1bad3bff17d2abffa065d14a1d"
-     "20a04dd993f6ed3260b60bcc6401e31f6bc75aaafe03e8c1a9cd14d2708"},
-    {NID_secp521r1, NID_sha224,
-     "ec0d468447222506b4ead04ea1a17e2aa96eeb3e5f066367975dbaea426104f2111c45e2"
-     "06752896e5fa7594d74ed184493598783cb8079e0e915b638d5c317fa978d9011b44a76b"
-     "28d752462adf305bde321431f7f34b017c9a35bae8786755a62e746480fa3524d398a6ff"
-     "5fdc6cec54c07221cce61e46fd0a1af932fa8a33",
-     "05e0d47bf37f83bcc9cd834245c42420b68751ac552f8a4aae8c24b6064ae3d33508ecd2"
-     "c17ec391558ec79c8440117ad80e5e22770dac7f2017b755255000c853c",
-     "0401a6effc96a7f23a44bf9988f64e5cfafdae23fa14e4bee530af35d7a4ddf6b80dcd0d"
-     "937be9dd2db3adcda2f5216fecbce867ee67e7e3773082f255156e31358c2f01e7760190"
-     "dfbe07ec2df87067597087de262c1e0a12355456faba91b2e7277050d73b924e14c0e93b"
-     "8457a8b3e1f4207ce6e754274f88ad75c000d1b2977edc9c1a",
-     "18afea9a6a408db1e7a7bb1437a3d276f231eacfc57678bfa229d78681cbe4e800e60653"
-     "32a3128db65d3aa446bb35b517dca26b02e106e1311881a95b0302d15e8",
-     "01c49b3c1d21f1678bdbe1ac12167e95e06617190bdee1a729c1c649210da19e2e210f66"
-     "89e1310513bfe2ac6c0f4ee5f324f344b31b18df341eaadb826d07adc9b",
-     "129d4931ba457443012f6ffecd002f2abc3a4b65a58fee8457917ebcf24b29a1d3055b7f"
-     "c62939a74ebb0c3582172ee7c3c75e0b2fa2367c6e04df63a7a91d593ad"},
-    {NID_secp521r1, NID_sha224,
-     "d891da97d2b612fa6483ee7870e0f10fc12a89f9e33d636f587f72e0049f5888782ccde3"
-     "ea737e2abca41492bac291e20de5b84157a43c5ea900aef761006a4471072ab6ae6d515f"
-     "fe227695d3ff2341355b8398f72a723ae947f9618237c4b6642a36974860b452c0c62026"
-     "88bc0814710cbbff4b8e0d1395e8671ae67ada01",
-     "1804ab8f90ff518b58019a0b30c9ed8e00326d42671b71b067e6f815ac6752fa35016bd3"
-     "3455ab51ad4550424034419db8314a91362c28e29a80fbd193670f56ace",
-     "0400a79529d23a832412825c3c2ad5f121c436af0f29990347ecfa586ce2e57fd3c7e062"
-     "4d8db1f099c53473dbc2578f85416ad2ac958a162051014fb96bf07f9e1d17017c0750f2"
-     "6df0c621d2d243c6c99f195f0086947b1bf0f43731555f5d677e2d4a082fb5fe8da87e15"
-     "92a5fa31777da3299cede5a6f756edf81c85b77853388bb3ab",
-     "042d7c36fec0415bc875deb0fab0c64548554062e618aee3aa6670ffd68ab579fe620d3a"
-     "9316357267fd3111c0ed567dca663acd94b646d2ba0771953cd9690ef42",
-     "0d01dfbef126febbdfa03ef43603fd73bc7d2296dce052216e965fed7bb8cbbc24142bfc"
-     "ddb60c2e0bef185833a225daa0c91a2d9665176d4ad9986da785f4bfcf0",
-     "16627e2614dbcd371693c10bbf579c90c31a46c8d88adf59912c0c529047b053a7c77151"
-     "42f64dcf5945dbc69ff5b706c4b0f5448d04dd1f0b5a4c3765148bf253d"},
-    {NID_secp521r1, NID_sha224,
-     "924e4afc979d1fd1ec8ab17e02b69964a1f025882611d9ba57c772175926944e42c68422"
-     "d15f9326285538a348f9301e593e02c35a9817b160c05e21003d202473db69df695191be"
-     "22db05615561951867f8425f88c29ba8997a41a2f96b5cee791307369671543373ea91d5"
-     "ed9d6a34794d33305db8975b061864e6b0fe775f",
-     "0159bff3a4e42b133e20148950452d99681de6649a56b904ee3358d6dd01fb6c76ea0534"
-     "5cb9ea216e5f5db9ecec201880bdff0ed02ac28a6891c164036c538b8a8",
-     "04012d7f260e570cf548743d0557077139d65245c7b854ca58c85920ac2b290f2abfeccd"
-     "3bb4217ee4a29b92513ddce3b5cbf7488fb65180bb74aeb7575f8682337ef50175601862"
-     "30c7e8bff0bffce1272afcd37534f317b453b40716436a44e4731a3ec90a8f17c53357bc"
-     "54e6ff22fc5b4ca892321aa7891252d140ece88e25258b63d5",
-     "14b8a30f988cefdc0edec59537264edb0b697d8c4f9e8507cf72bc01c761304bd2019da1"
-     "d67e577b84c1c43dd034b7569f16635a771542b0399737025b8d817e1c3",
-     "0fc50939ebca4f4daa83e7eaf6907cb08f330c01d6ea497b86becda43dfcad47cb5c48f5"
-     "eb2cc924228628070bcd144088c449a7873242ba86badf796097dbecd6d",
-     "0ccb6463c4301ba5c043e47ed508d57dd908fd0d533af89fd3b11e76343a1cf2954ce90b"
-     "0eb18cbc36acd6d76b3906612d8a0feec6ebed13d88650ed9c708b28a11"},
-    {NID_secp521r1, NID_sha224,
-     "c64319c8aa1c1ae676630045ae488aedebca19d753704182c4bf3b306b75db98e9be4382"
-     "34233c2f14e3b97c2f55236950629885ac1e0bd015db0f912913ffb6f1361c4cc25c3cd4"
-     "34583b0f7a5a9e1a549aa523614268037973b65eb59c0c16a19a49bfaa13d507b29d5c7a"
-     "146cd8da2917665100ac9de2d75fa48cb708ac79",
-     "17418dfc0fc3d38f02aa06b7df6afa9e0d08540fc40da2b459c727cff052eb0827bdb3d5"
-     "3f61eb3033eb083c224086e48e3eea7e85e31428ffe517328e253f166ad",
-     "04000188366b9419a900ab0ed9633426d51e25e8dc03f4f0e7549904243981ec469c8d6d"
-     "938f6714ee620e63bb0ec536376a73d24d40e58ad9eb44d1e6063f2eb4c51d009889b920"
-     "3d52b9243fd515294a674afd6b81df4637ffdddc43a7414741eda78d8aa862c9cbbb618a"
-     "cec55bb9a29aac59616fc804a52a97a9fc4d03254f4469effe",
-     "1211c8824dcbfa0e1e15a04779c9068aed2431daeac298260795e6a80401f11f6d52d36b"
-     "cee3cfa36627989c49d11475163aa201d2cd4c5394144a6bb500bbaf02b",
-     "1d59401b8ac438855d545a699991142685077a409de2418c7ccfe01a4771b3870e76287a"
-     "9654c209b58a12b0f51e8dc568e33140a6b630324f7ef17caa64bf4c139",
-     "143af360b7971095b3b50679a13cd49217189eaee4713f4201720175216573c68f7ac6f6"
-     "88bfe6eb940a2d971809bf36c0a77decc553b025ed41935a3898685183b"},
-    {NID_secp521r1, NID_sha256,
-     "8ab8176b16278db54f84328ae0b75ef8f0cd18afdf40c04ad0927ed0f6d9e47470396c8e"
-     "87cde7a9be2ffbfe6c9658c88b7de4d582111119c433b2e4a504493f0a1166e3a3ea0d7b"
-     "93358f4a297d63f65a5e752f94e2ee7f49ebcc742fa3eb03a617d00c574245b77a200338"
-     "54d82964b2949e2247637239ab00baf4d170d97c",
-     "1e8c05996b85e6f3f875712a09c1b40672b5e7a78d5852de01585c5fb990bf3812c32455"
-     "34a714389ae9014d677a449efd658254e610da8e6cad33414b9d33e0d7a",
-     "04007d042ca19408524e68b981f1419351e3b84736c77fe58fee7d11317df2e850d960c7"
-     "dd10d10ba714c8a609d163502b79d682e8bbecd4f52591d2748533e45a867a0197ac6416"
-     "111ccf987d290459ebc8ad9ec56e49059c992155539a36a626631f4a2d89164b985154f2"
-     "dddc0281ee5b5178271f3a76a0914c3fcd1f97be8e8376efb3",
-     "0dc8daaacddb8fd2ff5c34a5ce183a42261ad3c64dbfc095e58924364dc47ea1c05e2599"
-     "aae917c2c95f47d6bb37da008af9f55730ddbe4d8ded24f9e8daa46db6a",
-     "09dd1f2a716843eedec7a6645ac834d4336e7b18e35701f06cae9d6b290d41491424735f"
-     "3b57e829ad5de055eaeef1778f051c1ee152bf2131a081e53df2a567a8a",
-     "02148e8428d70a72bc9fa986c38c2c97deda0420f222f9dc99d32c0acba699dc7ba0a2b7"
-     "9ce5999ff61bd0b233c744a893bc105bca5c235423e531612da65d72e62"},
-    {NID_secp521r1, NID_sha256,
-     "c4bc2cec829036469e55acdd277745034e4e3cc4fcd2f50ec8bd89055c19795a1e051ccf"
-     "9aa178e12f9beab6a016a7257e391faa536eaa5c969396d4e1ade36795a82ebc709d9422"
-     "de8497e5b68e7292538d4ccdc6dd66d27a3ece6a2844962b77db073df9489c9710585ba0"
-     "3d53fa430dbc6626dc03b61d53fc180b9af5dea6",
-     "0b65bf33b2f27d52cbfabcadce741e691bf4762089afd37964de1a0deda98331bf8c7402"
-     "0a14b52d44d26e2f6fa7bcddbe83be7db17a0c8a1b376469cf92c6da27c",
-     "04010038bb9a7aea626de68c14c64243150e72c69e2f8a1ab922bfbdaa6f33d24fb4542c"
-     "0324357b0dd640bbcd07632ecd253f64ca2bfbfbf3de9b24fffd0568ab82da00faf867d9"
-     "5308cc36d6f46844a0f535dc70f9768eed011a2464d2f308fa1d8e72c3616aec7e705169"
-     "08183ffce7fdd36984a15f73efaa3858c2edf16a784d40e6c2",
-     "14aeb96c57d99677a1f5e4588064215e7e9af4027bfb8f31ff6126dbf341b8e6f719465e"
-     "4273e91ba32670feca802549808322b7ee108bb20653cf20f93284d365f",
-     "075ead62edf7d86c5d1bc2443d1aeb5dc034fd999e6ea012cef7499d9d050cd97d262095"
-     "884e9fc89a42e15bd3dee80fe3c1ba10f4caabc4aabb86347023028b663",
-     "129a992a6ff66d41948d11fa680f732b1a74315b804c982805190ed9d2fae223f2b14998"
-     "0b9241998cdea0c5672595a8a49d5186a0ef7a46c0a376f925bdda81726"},
-    {NID_secp521r1, NID_sha256,
-     "1c1b641d0511a0625a4b33e7639d7a057e27f3a7f818e67f593286c8a4c827bb1f3e4f39"
-     "9027e57f18a45403a310c785b50e5a03517c72b45ef8c242a57b162debf2e80c1cf6c7b9"
-     "0237aede5f4ab1fcaf8187be3beb524c223cc0ceff24429eb181a5eea364a748c7132148"
-     "80d976c2cd497fd65ab3854ad0d6c2c1913d3a06",
-     "02c4e660609e99becd61c14d043e8b419a663010cc1d8f9469897d7d0a4f076a619a7214"
-     "a2a9d07957b028f7d8539ba7430d0b9a7de08beeeae8452d7bb0eac669d",
-     "0400fb3868238ca840dbb36ecc6cf04f5f773ea0ab8e8b0fdcf779dc4039a8d7146a4175"
-     "04e953c0cb5e7f4e599cc2c168deda8b7f16084b5582f89f2ece4cae5167f701f90b5c15"
-     "eeda48e747cf3ee8183166a49dbfac6161cbd09d29d40a6854f4c495e88a435892a920cd"
-     "aad20d41985890b648badd4f0a858ffcbd9afdfc23134ede18",
-     "1f875bbf882cd6dd034a87916c7b3ba54b41b2ea2ce84ebaf4e393fcf7291fee09dec2b5"
-     "bb8b6490997c9e62f077c34f0947fe14cec99b906dd6bf0b5d301e75ca1",
-     "07aa70425697736b298233249f5d0cf25c99e640c9ff88035ef1804820e1bfe7d043755f"
-     "02d7a079494f7fa6dc26740c4e6b7b430c63f29c67bbd3a5c88d2f0e8d1",
-     "0e0d42e4ff11cf5be37a9fda348514d5097a662f214687cbfb28ff42d635b13029871ca4"
-     "f464bb1fbce02d5da4d5fb61b2a071844259fc863d136197bec3a61e7c7"},
-    {NID_secp521r1, NID_sha256,
-     "adb5f069b2b501a3ebb83d4f1808eb07710ac4a7b12532996855a20bcc54b2f76812915f"
-     "632163c3654ff13d187d007152617cf859200194b59c5e81fc6cc9eb1ceb75d654050f26"
-     "0caa79c265254089270ccd02607fdcf3246119738c496dc3a4bd5d3be15789fc3d29a08d"
-     "6d921febe2f40aef286d5d4330b07198c7f4588e",
-     "17c3522007a90357ff0bda7d3a36e66df88ca9721fb80e8f63f50255d47ee819068d018f"
-     "14c6dd7c6ad176f69a4500e6f63caf5cf780531004f85009c69b9c1230c",
-     "04013a4bea0eed80c66ea973a9d3d4a90b6abbb5dee57d8affaf93390a8783a20982eba6"
-     "44d2e2809f66530adeeee7f9a1da7515447e9ba118999f76f170c375f621f7012f9dfaee"
-     "40a75d8442b39b37a5c19ea124b464236e9b9a31bae6780cfd50f7ea4a700154b5ea0fee"
-     "b64e9b35a1b0e33e46900cca1f34d13bb17e5017769841af27",
-     "18388a49caeda35859ef02702c1fd45ff26991998bd9d5e189c12c36cdae3f642ddd4a79"
-     "561bd1d3e1cd9359de8f5c9e1604a312d207a27b08a6033f2741794ced5",
-     "15c6264795837dfea19f91876455f564f073c5c84a3c9d76e67872ae0447ba0d4850d872"
-     "1302b25bec7ebfedd2721de140b2f3dead547042b24b0876117e7093cc1",
-     "060eb74236c189a28ed20bd0822eb22d75f7d97c9043a3c8e3f6d4c90bc8ca02ac4d37c1"
-     "171c799a1c7dfd2fcbf83406b5e48c051e0fbf0fd937bfe6c3db4e18154"},
-    {NID_secp521r1, NID_sha256,
-     "f253484d121d1ce8a88def6a3e9e78c47f4025ead6f73285bf90647102645b0c32d4d867"
-     "42a50b8b7a42d5f6156a6faf588212b7dc72c3ffd13973bdba732b554d8bffc57d04f816"
-     "7aef21ee941ee6ffb6cce0f49445bd707da8deb35dca650aaf761c3aa66a5ebccddd15ae"
-     "e21293f63061a7f4bfc3787c2cd62c806a1a9985",
-     "0c4dad55871d3bd65b016d143ddd7a195cc868b3048c8bbcb1435622036bdb5e0dec7178"
-     "ca0138c610238e0365968f6ddd191bbfacc91948088044d9966f652ff25",
-     "040014858a3b9bd426b678fdcf93fc53d17e7a9e8fe022442aaaba65399d12fd3a6a3819"
-     "58fb0f07ac6088f4e490506ec0f1ab4d0dbd461126f7eb46ff69cfa8bd88af018c18ce29"
-     "ecc6d79d26a2de0cd31c4b32e84b5e90f6ba748f86c5afbd89618aceb9079460cbd1a826"
-     "1ed5476973e61bf1d17ea78b022387443800c9247d21dde550",
-     "05577108f4187a173e5c29e927a8fc8f5ffd37e184254a6e381ff1018955aec91a35f300"
-     "85e8cee6a7555c10f9efdce26d62f2b4b52dfdbaeafc3a30983e2d50d5b",
-     "0344375ae7c804cbe32ced7a20976efae5d9c19eb88b6e24514d1d0cfb728b0f4601098b"
-     "18b2e98f42b5222dd5237d4d87767007bf5acb185c5526d72047e2cb1a1",
-     "02de4cfa908c73c1102d6fb7062baf54a056a9517701e036c9c51e09899d60051612d593"
-     "48945f845dffebec5aa395b2fac7229929033615788777306ccad96d0a3"},
-    {NID_secp521r1, NID_sha256,
-     "33bab1c369c495db1610965bc0b0546a216e8dd00cd0e602a605d40bc8812bbf1ffa6714"
-     "3f896c436b8f7cf0bed308054f1e1ff77f4d0a13c1e831efbd0e2fcfb3eadab9f755f070"
-     "ba9aeaceb0a5110f2f8b0c1f7b1aa96a7f2d038a1b72e26400819b1f73d925ea4e34d6ac"
-     "af59d0a461a34ce5d65c9c937a80e844e323a16d",
-     "03d4749fadcc2008f098de70545a669133c548ce0e32eec1276ff531bcff535331445557"
-     "28ad8906d17f091cc0514571691107350b6561858e90dbe19633aaf31bf",
-     "04010fe5986b65f6e65d13c88c4d2aed781a91026904f82129d46779bdadaf6b733c845a"
-     "934e941ab4a285efdea9c96ecc9dc784d87e4d937b42c337b3a9cb111a96000077853768"
-     "a2a4d6f596f57414e57ec60b76d3cd5ece8351cd1f335ebcb8801a3d91fb82c65caaeb5c"
-     "31eea9918367bb5906863ff3ccaf7a6cee415e0d75c15ac2e0",
-     "1fbb4de337b09e935a6dc6215ffcfcb85d236cc490585e73251a8b8bac37cfa36c5d1df5"
-     "f4536d33659be1e7a442529a783452f7efda74a4f661b6a127f9248aaf7",
-     "09d8f10eeff6178594c89d6e8184f9502117384813243ddf9ccf3c8eac5dc6502c472dfc"
-     "1487a5caffc569f7dedd14a8ebcb310e9bacdb79fb6655aba026cdf87f2",
-     "0f74236c7915d638708d17c9f10e39dda358faf9bbb821d8dcda0d151aac143bfb165ad0"
-     "a23a65cd3de532e32cad928728f5ae1c16f58fc16577f3ca8e36f9e708b"},
-    {NID_secp521r1, NID_sha256,
-     "08c8b7faaac8e1154042d162dca1df0f66e0001b3c5ecf49b6a4334ce4e8a754a1a8e4da"
-     "f8ec09cf1e521c96547aed5172ef852e82c03cddd851a9f992183ac5199594f288dbcc53"
-     "a9bb6128561ff3236a7b4b0dce8eaf7d45e64e782955ee1b690ce6a73ece47dc4409b690"
-     "de6b7928cbe60c42fc6a5ddf1d729faf1cc3885e",
-     "096a77b591bba65023ba92f8a51029725b555caf6eff129879d28f6400e760439d6e69ce"
-     "662f6f1aecf3869f7b6057b530a3c6ff8ed9e86d5944f583ee0b3fbb570",
-     "0400fdf6aed933dba73913142ef8bdcd4b760db8500831cd11d7707ab852a6372c05d112"
-     "a1e7fbc7b514c42142c7370d9f4129493cd75cc6f2daf83747078f15229db600ef91dffb"
-     "3c43080a59534b95ca585ee87f6145f6a0199b2b82c89f456d8bd8e6ac71c78039c08177"
-     "184484eb2ebd372f189db3a58fab961a75a18afec1ee32764a",
-     "13aa7b0471317a2a139c2f90df1c40d75e5a8a830fbaf87030fffdb2ef6f2c93d1310c9e"
-     "d7fe9d7bcd4fe46537ff2495bc9c4f0aaff11461f5e4bebbfbce9a8740a",
-     "1c7a21800962c91d4651553633b18612d931bb88bff8b743ed595b4e869437e50f8e84fb"
-     "f334c99061db123a1c40b73b07e203790561a37df65a660355ba2017d78",
-     "1301e1782559a38f1ca0eebe9bed0f5c7c33103d506a24f8a688f500ee1fe37f97b66853"
-     "19279e82e6fe43cfd823ccbc123309974cffa76c4f8d41ec02a3cbc45f1"},
-    {NID_secp521r1, NID_sha256,
-     "ba74eed74282811631bd2069e862381e4e2a1e4e9a357b1c159a9ce69786f864b60fe90e"
-     "eb32d8b72b099986fc594965a33285f7185b415df58fead7b8b50fc60d073680881d7435"
-     "609ad1d22fd21e789b6730e232b0d2e888889fb82d6ad0337ab909308676164d4f47df44"
-     "b21190eca8ba0f94995e60ad9bb02938461eee61",
-     "015152382bfd4f7932a8668026e705e9e73daa8bade21e80ea62cf91bd2448ebc4487b50"
-     "8ca2bdaaf072e3706ba87252d64761c6885a65dcafa64c5573c224ae9e6",
-     "04000b8c7c0186a77dc6e9addd2018188a6a40c3e2ba396f30bbd9293dba2841d57d6086"
-     "6b37f587432719b544d8bf7eb06d90a8c0dc9c93b0c53d53b2f667077228ca01dd2e5c73"
-     "ab908ae34f701689f1cd3cf5186d3a2bc941e208bf3ef970e5e429ee9b154d73286b2e5d"
-     "a423e75b7c7b78c7bdf915da92279db43265a0cdefca51f86a",
-     "0d03506999f5cc9ec3304072984a20a9c64a22ad9b418495ca904f4bbddc96e76d34672c"
-     "b52763339d3f3bc5b1701c00a675b972797e3a086314da1a8d338436566",
-     "085406c0ff5ec91f598bb579ad8714ad718c3e133d5dcc2e67c5d2339c146b69919cac07"
-     "f3bc2bda218f4c7c8be04855e2ca6fff7fbdc4fc0fda87c8c3081cad4f5",
-     "1b45f2066e583636215ae135afc202b8bf3f301eccff2e1c0198b9aeddf695fa8179488e"
-     "7b622fc307f601e2f6551815117cc836bb09ef888f8e64a45d9c84ad30c"},
-    {NID_secp521r1, NID_sha256,
-     "dc71f171a28bdc30968c39f08f999b88dc04c550e261ecf1124d67f05edeae7e87fe9b81"
-     "35a96fe2bc3996a4f47213d9d191184a76bd6310e1ee5cb67ea7fc3ef6f641a0ba165198"
-     "040fa668192b75a4754fc02c224bd4a74aade5a8c814adf151c2bfeda65165a04ef359e3"
-     "9847c84e312afb66d4cd1db50d41ef3fe5f31296",
-     "1750ff0ca0c166560b2034bc5760fe0b3915340bc43216e9de0c1d4a76550e8b2036e8b8"
-     "74230f8d29354aed43e183610f24fd4abd4b0be2f111dae942bd7a121f7",
-     "0401b4b8947192a7c0166c0e0b2791e217370836283e805f3ee11cfb78445aba3c5bc39f"
-     "e594e01916617ad59e7c8e740d8f2d07d88905d3f33bd5e51aafd4943c5dc601175d1172"
-     "32836c28e717ce2a55e59f4ec550effde30d18e3d99e42c6aa2283c7b3e7f2f6ff1fca60"
-     "5dde78c3a5bffa689347b4c93f51ba59a1787bb7d5e43861dc",
-     "023645023d6bdf20652cdce1185c4ef225c66d54f18632d99ccf743bf554d04c214c88ce"
-     "52a4f71ec75c899ad1b3c07c34112ca20b55c217ff1d72c9528e2774ce8",
-     "1e933f68ce0f8403cb16822b8e0564b1d39a35f27b53e4ae0bcdff3e051759464afbc349"
-     "98ba7c8a7ee34ef6c1aaa722cffe48356fd0b738058358d4c768b3186c1",
-     "0a67368a305508ce6d25d29c84f552a4a513998990fef4936244f891a2909c30d5fdc9e8"
-     "a267ecbf3c597138f4a08f7e92bee57d5420eadd700fee864bf78b2614b"},
-    {NID_secp521r1, NID_sha256,
-     "b895788d7828aaeace4f6b61a072ffa344d8ea324962ba6dab5efda93f65bf64a0f2ac6d"
-     "5721d03ee70e2aef21cdba69fd29040199160e3a293b772ffb961ed694a8dc82800dab79"
-     "367a4809a864e4aff6bc837aaa868e952b771b76591c0bb82249034e3208e593d85973d3"
-     "fea753a95b16e221b2561644535c0131fe834ae7",
-     "023048bc16e00e58c4a4c7cc62ee80ea57f745bda35715510ed0fc29f62359ff60b0cf85"
-     "b673383b87a6e1a792d93ab8549281515850fa24d6a2d93a20a2fff3d6e",
-     "0400ba3dc98326a15999351a2ec6c59e221d7d9e7ee7152a6f71686c9797f3f330d31501"
-     "23620d547813ba9d7cc6c6d35cc9a087d07dff780e4821e74ad05f3762efd6018b051af9"
-     "824b5f614d23ecadd591e38edbfe910ad6cbebc3e8a6bec11ea90691c17deb3bc5f34a4a"
-     "3acd90b7b10f521f6ee7b3cfbfdc03b72d5a8783a4a77c3e4c",
-     "06099d2667f06c58798757632d07d8b3efbe9c1323efb0c244be6b12b3b163ba1b7cf524"
-     "6c98dcc0771665a66696d687af5f28ed664fd87d5093df6427523d4db84",
-     "10dc80ea853064a2ba5a781f108aca3785c5ec0aa45aa05ba31d4de671170797589e863d"
-     "54a3a986aadf6f670277f50355713dfb27d4ec7e348f787910b3cd668cd",
-     "018572bfad4f62e3694d1f2e6ffd432faed2e2b9d7e3611a07138212f1e79e6c394839f7"
-     "cfae96bc368422630016fb9346681eadc5f9699e7331c3b5fde6d65e4c6"},
-    {NID_secp521r1, NID_sha256,
-     "2c5bd848c476e34b427cfe5676692e588e1957957db7b5704492bd02104a38216535607f"
-     "5d092dc40020130c04a3aaf0f1c52409834926d69a05d3f3188187a71d402a10ba34eac8"
-     "629b4c6359b1095f30f710219298bf06b9f19bfc299981d7e251ca232a0a85338a7e0246"
-     "4731d1b25d4a1f68baf97064516590644820c998",
-     "02b8b866ce4503bb40ffc2c3c990465c72473f901d6ebe6a119ca49fcec8221b3b4fa7ec"
-     "4e8e9a10dbd90c739065ad6a3a0dd98d1d6f6dcb0720f25a99357a40938",
-     "0401b8c7a169d5455f16bfe5df1ba5d6ec9c76e4bad9968d4f5f96be5878a7b6f71d74bf"
-     "ac0076dd278bc4630629f3294646f17d6b6c712b0087e2c4d576039cfdc8b9018faffd54"
-     "22dfd1b61432fa77b9a288b2b7d546656c0dcca3032179e6f45ee3cf61d6a447fc51731c"
-     "b54457343a41569fcf78cef42895f4da5efcb14ea1fc065f8d",
-     "0ac89e813f94042292aa1e77c73773c85cf881a9343b3f50711f13fa17b50f4e5cb04ac5"
-     "f6fc3106a6ef4c9732016c4e08e301eefac19199459129a41a7589e0628",
-     "05bc7a253a028ee8b7253979b8d689d41d8df6fae7736341f22e28b6faf0cbbdebbd2ef4"
-     "d73e56d2021af2c646dc15539a7c1e1c4dc9c7674808bd7968d8a66f947",
-     "0fd71575837a43a4cf1c47d0485cfd503c2cf36ebcea0fdef946ad29acb7fb2e7c6daf6b"
-     "4eb741eb211081aed6207d02569f1518988f275ad94c7fd4735cb18a92e"},
-    {NID_secp521r1, NID_sha256,
-     "65a0b97048067a0c9040acbb5d7f6e2e6ac462e1e0064a8ce5b5bbf8e57059e25a3ef8c8"
-     "0fc9037ae08f63e63f5bdb9378c322ad9b2daf839fad7a75b1027abb6f70f110247da7e9"
-     "71c7c52914e5a4f7761854432fa16b2a521e7bcaee2c735a87cad20c535bf6d04a87340c"
-     "229bf9af8647eedca9e2dc0b5aa90f7fea3cdc0a",
-     "0a43b32ad7327ec92c0a67279f417c8ada6f40d6282fe79d6dc23b8702147a31162e6462"
-     "91e8df460d39d7cdbdd7b2e7c6c89509b7ed3071b68d4a518ba48e63662",
-     "040172fb25a3e22c2a88975d7a814f3e02d5bb74cfb0aaa082c5af580019b429fddd8c7f"
-     "9e09b6938f62e8c31019b25571aaceef3c0d479079db9a9b533ee8e1670abd00ff551622"
-     "3b6cc7c711705f15b91db559014e96d3839249c5c849f2aced228a8998177a1e91177abb"
-     "b24b57a8ea84d944e0c95da860ae0925f1b40c0e1b7c9e0a46",
-     "0383eda042e06c0297fbd279a2ad40559c5c12ad458f73458eebcc92b308d3c4fcec20a5"
-     "b59f698e16fa6ea02dba8661b6955f67c052f67b0a56460869f24cfdf7d",
-     "1b9c35356b9d068f33aa22a61370dae44a6cb030497a34fb52af23c6b684677370268f06"
-     "bb4433be6795a71de570088aec17ce0c9933d2f76c7edce7f406f62fedd",
-     "06f07ea453cfa20ad604ba855332f62834657b0b795684d50c1562a675456e37f4dae45f"
-     "0df47d8e27e47bc9ce9c9cbba1554c5b94b0b17401b73c8d0c0902c6cc4"},
-    {NID_secp521r1, NID_sha256,
-     "d6e366a87808eea5d39fe77cac4b8c754e865a796062e2ec89f72165cd41fe04c4814806"
-     "8c570e0d29afe9011e7e7a2461f4d9897d8c1fa14b4ff88cab40059d17ab724f4039244e"
-     "97fcecb07f9ffeec2fb9d6b1896700fe374104a8c44af01a10e93b268d25367bf2bef488"
-     "b8abcc1ef0e14c3e6e1621b2d58753f21e28b86f",
-     "03c08fdccb089faee91dac3f56f556654a153cebb32f238488d925afd4c7027707118a37"
-     "2f2a2db132516e12ec25f1664953f123ac2ac8f12e0dcbbb61ff40fb721",
-     "040193301fc0791996ca29e2350723bd9aa0991ddbb4a78348ee72bdcd9ed63ce110ba34"
-     "96f2ce0331b5c00d4d674c1b70114e17ce44a73c3e16bab14ed1ee924202e400aea9b288"
-     "cfb2933ec0a40efa8e2108774e09b3863b3193d0dac6cc16ccaa5bd5f9ce133aec5cd3b6"
-     "2cbaeec04703e4b61b19572705db38cfaa1907c3d7c785b0cd",
-     "0d0e90d5ee7b5036655ad5c8f6a112c4b21c9449ca91c5c78421e364a2160bbac4428303"
-     "657bc11ea69f59fb0fe85a41b8f155a362343094456fd2a39f2a79e4804",
-     "1a8c23a2965d365a4c2ffd0802ae8b3a69c6b84a1ba77fd8a5f2f61e8ec3a1dcb336f136"
-     "e2a997252eaa94caf9b5ad6c9ecff5bf33abf547ca84985bb89908a11d7",
-     "1cc42a2dd97aa42b9df5ea430e0d4cb13106dd6da6e8c9315c96ed7b052db365bbde6960"
-     "c9a965954a4398c18ea7db9593bbfc3c3b6b3466ff806fccac3de6424ab"},
-    {NID_secp521r1, NID_sha256,
-     "f99e1d272d0f5fb9c4f986e873d070ec638422bc04b47c715595e2cf1a701cdf88bc6c4b"
-     "20085b357bad12ccba67cac8a5ca07f31ba432f9154ff1fadefd487a83a9c37e49fb70a2"
-     "f170e58889cab0552e0a3806ccfa2a60d96e346851d84b7de6d1a4b8cf37567dc161a84f"
-     "13421e3412457d4bc27f6213453c8519a2d7daa2",
-     "0969b515f356f8bb605ee131e80e8831e340902f3c6257270f7dedb2ba9d876a2ae55b4a"
-     "17f5d9acd46c1b26366c7e4e4e90a0ee5cff69ed9b278e5b1156a435f7e",
-     "0400fc7ae62b05ed6c34077cbcbb869629528a1656e2e6d403884e79a21f5f612e91fc83"
-     "c3a8ac1478d58852f0e8ba120d5855983afd1a719949afa8a21aec407516c300aa705da6"
-     "459a90eaa2c057f2e6614fb72fc730d6fdebe70e968c93dbc9858534768ea2666553cd01"
-     "db132331441823950a17e8d2345a3cab039c22b21bfe7bd3b9",
-     "19029260f88e19360b70c11107a92f06faa64524cfbd9f70fecf02bd5a94f390582a7f4c"
-     "92c5313bb91dc881596768d86f75a0d6f452094adbe11d6643d1a0b2135",
-     "07f2158e9b9fa995199608263969498923cf918fdc736427c72ce27ce4a3540dce2e8e5e"
-     "63a8fc7ba46f7fa42480efbf79c6ed39521f6e6ec056079e453e80a89d9",
-     "08e349eed6f1e28b0dbf0a8aeb1d67e59a95b54a699f083db885f50d702f3c6a4069591a"
-     "faa5b80b3c75efb1674ebd32c7ead0040d115945f9a52ee3a51806cad45"},
-    {NID_secp521r1, NID_sha256,
-     "91f1ca8ce6681f4e1f117b918ae787a888798a9df3afc9d0e922f51cdd6e7f7e55da996f"
-     "7e3615f1d41e4292479859a44fa18a5a006662610f1aaa2884f843c2e73d441753e0ead5"
-     "1dffc366250616c706f07128940dd6312ff3eda6f0e2b4e441b3d74c592b97d9cd910f97"
-     "9d7f39767b379e7f36a7519f2a4a251ef5e8aae1",
-     "013be0bf0cb060dbba02e90e43c6ba6022f201de35160192d33574a67f3f79df969d3ae8"
-     "7850071aac346b5f386fc645ed1977bea2e8446e0c5890784e369124418",
-     "040167d8b8308259c730931db828a5f69697ec0773a79bdedbaaf15114a4937011c5ae36"
-     "ab0503957373fee6b1c4650f91a3b0c92c2d604a3559dd2e856a9a84f551d9019d2c1346"
-     "aadaa3090b5981f5353243300a4ff0ab961c4ee530f4133fe85e6aab5bad42e747eee029"
-     "8c2b8051c8be7049109ad3e1b572dda1cac4a03010f99f206e",
-     "1a363a344996aac9a3ac040066a65856edfb36f10bb687d4821a2e0299b329c6b60e3547"
-     "dde03bdbd1afa98b0b75d79cf5aac0ef7a3116266cadf3dfbd46f8a4bfc",
-     "1ff097485faf32ce9e0c557ee064587c12c4834e7f0988cf181d07ba9ee15ae85a8208b6"
-     "1850080fc4bbedbd82536181d43973459f0d696ac5e6b8f2330b179d180",
-     "0306dc3c382af13c99d44db7a84ed813c8719c6ed3bbe751ead0d487b5a4aa018129862b"
-     "7d282cce0bc2059a56d7722f4b226f9deb85da12d5b40648bf6ec568128"},
-    {NID_secp521r1, NID_sha384,
-     "dbc094402c5b559d53168c6f0c550d827499c6fb2186ae2db15b89b4e6f46220386d6f01"
-     "bebde91b6ceb3ec7b4696e2cbfd14894dd0b7d656d23396ce920044f9ca514bf115cf98e"
-     "caa55b950a9e49365c2f3a05be5020e93db92c37437513044973e792af814d0ffad2c8ec"
-     "c89ae4b35ccb19318f0b988a7d33ec5a4fe85dfe",
-     "095976d387d814e68aeb09abecdbf4228db7232cd3229569ade537f33e07ed0da0abdee8"
-     "4ab057c9a00049f45250e2719d1ecaccf91c0e6fcdd4016b75bdd98a950",
-     "04013b4ab7bc1ddf7fd74ca6f75ac560c94169f435361e74eba1f8e759ac70ab3af138d8"
-     "807aca3d8e73b5c2eb787f6dcca2718122bd94f08943a686b115d869d3f40600f293c1d6"
-     "27b44e7954d0546270665888144a94d437679d074787959d0d944d8223b9d4b5d068b4fb"
-     "bd1176a004b476810475cd2a200b83eccd226d08b444a71e71",
-     "0a8d90686bd1104627836afe698effe22c51aa3b651737a940f2b0f9cd72c594575e550a"
-     "db142e467a3f631f4429514df8296d8f5144df86faa9e3a8f13939ad5b3",
-     "02128f77df66d16a604ffcd1a515e039d49bf6b91a215b814b2a1c88d32039521fbd142f"
-     "717817b838450229025670d99c1fd5ab18bd965f093cae7accff0675aae",
-     "008dc65a243700a84619dce14e44ea8557e36631db1a55de15865497dbfd66e76a7471f7"
-     "8e510c04e613ced332aa563432a1017da8b81c146059ccc7930153103a6"},
-    {NID_secp521r1, NID_sha384,
-     "114187efd1f6d6c46473fed0c1922987c79be2144439c6f61183caf2045bfb419f8cddc8"
-     "2267d14540624975f27232117729ccfeacccc7ecd5b71473c69d128152931865a60e6a10"
-     "4b67afe5ed443bdbcdc45372f1a85012bbc4614d4c0c534aacd9ab78664dda9b1f1e2558"
-     "78e8ac59e23c56a686f567e4b15c66f0e7c0931e",
-     "04ceb9896da32f2df630580de979515d698fbf1dd96bea889b98fc0efd0751ed35e6bcf7"
-     "5bc5d99172b0960ffd3d8b683fbffd4174b379fbdecd7b138bb9025574b",
-     "0400e7a3d30d5bd443549d50e9b297aaa87bc80b5c9e94169602d9d43d6d0c490c0bed8c"
-     "c2170288b106bdbf4c9f1ce53fd699af0b4c64b494b08520e57dc01ab9a8b001d81056d3"
-     "7aec8a75d588f6d05977416e6f24ad0117a7f4450036d695612e7bc2771caed80e580314"
-     "eebc88c8fc51c453f066e752481f212b57165d67f8a44f375a",
-     "046639c5a3ec15afae5e4a7a418ac760846512d880c359bc2c751b199ce43b10887e861b"
-     "14127809754dbea47f6cc0140d2817e3f5b9a80ce01abd81f81b748433a",
-     "0f913de91e19bd8f943d542ae357bacc942a0967abc9be6c06239a379db8cc733fa50013"
-     "e0b0f088bce9d630262feaa33b30d84f91bcf5ce9976e4e740fcb112f84",
-     "08a73a5c9c24235e0d9cecaac653f68ce5a6fb186ce67fa058d6ddbbd4d0a8c4d194e571"
-     "148e8ad6c8882b4e33d2f60fb23dd7d07a1ae60864e8277918f592b3dc6"},
-    {NID_secp521r1, NID_sha384,
-     "6744b69fc2420fe00f2352399bd58719e4ecdd6d602e2c80f194d607e58b27a0854745bf"
-     "d6d504de2eb30b04cee0f44af710dd77e2f816ac3ac5692fad2d1d417893bb0edba2707a"
-     "4c146a486f8728ca696d35cc52e9c7187c82d4bdb92eb954794e5ad15133f6bfea1f025d"
-     "a32ada710a3014cf11095b3ff69a94d087f17753",
-     "00a8db566bd771a9689ea5188c63d586b9c8b576dbe74c06d618576f61365e90b843d003"
-     "47fdd084fec4ba229fe671ccdd5d9a3afee821a84af9560cd455ed72e8f",
-     "04004f5b790cbe2984b71d41af5efed6c6893d15e13f31816d55a9c2926a104eee66f1ad"
-     "a83115d1388551218773b8b9d1138e3e3f027bb4392c90c14fd232580b4a1100660eb160"
-     "e9bfc8c5619e70e948e238c6fd37739bc1bb657b8e8436e63628f91992be7e63d9a73596"
-     "23a1340642777b22026feb51116a6c50c54c3589b9bd39b6cb",
-     "1e7b5e53571a24bd102dd7ad44a4b8d8a4e60e5957bc3c4e5d3c73109f55233f072e572c"
-     "7892f425ba5e64d3cb7966096bb34a47e26cd5b3e3b44108b310d9f681b",
-     "1a88bcd7e2bdff6e497d943dde432fb3f855a7177c466319cb53b701230c299db0302762"
-     "69685857d1e3f28110e690f2f529c8d18115eb381f313bc891d92ad278e",
-     "146f1984ea879274dfd5e86ad92e564a4de081523ddbb1c397b8f9595911ef2e6501bc08"
-     "1584d5340f7aa47e1af036234ac6f27a5ac31f78dd3b0ff1a62693c630d"},
-    {NID_secp521r1, NID_sha384,
-     "16001f4dcf9e76aa134b12b867f252735144e523e40fba9b4811b07448a24ef4ccf3e81f"
-     "e9d7f8097ae1d216a51b6eefc83880885e5b14a5eeee025c4232319c4b8bce26807d1b38"
-     "6ad6a964deb3bdca30ee196cfdd717facfad5c77d9b1d05fdd96875e9675e85029ecbf4f"
-     "94c524624746b7c42870c14a9a1454acf3354474",
-     "1a300b8bf028449344d0e736145d9dd7c4075a783cb749e1ec7988d60440a07021a25a3d"
-     "e74ea5e3d7bd4ab774d8ad6163adae31877ef0b2bd50e26e9e4be8a7b66",
-     "04005055b9ad726ba8a48219b0ecbfffb89f8428de895b231f676705b7de9f2022d9ff4e"
-     "0114ebb52dea342f9bf76b2fb060c020e29d92074ebb1fbfe5290a58c8bc1000415af7f2"
-     "0a6e945315adbf757316bb486c80780a0a3a15b4b9609f126d7341053a2b726ab63cb46f"
-     "eee527b0bf532b32b477e5671aea23d9b3c3e604b9029954b5",
-     "05a2e92717bb4dab3ee76724d4d9c2d58a32b873e491e36127985f0c9960c610962ca1c4"
-     "510dba75c98d83beebdc58b1d8678e054640951d11db1bd2d8a4ab8476b",
-     "104a78ce94f878822daaf00ee527fbdbf6cceb3cbb23a2caa485e4109466de8910252f92"
-     "379ab292cac8d1eda164f880c0067696e733fc8588a27703a3e1f5b8f1f",
-     "1ffe23e8ab5a31668a81161a234ea14879771fe9866f8872eb6edb672e0fe91d2bb75c97"
-     "67a2dfbac7c15c802211236b22ea41ecd055a0b8b311ffc4255f86d5c67"},
-    {NID_secp521r1, NID_sha384,
-     "a9824a7b810aa16690083a00d422842971baf400c3563baa789c5653fc13416111c0236c"
-     "67c68e95a13cec0df50324dcc9ae780ce4232607cb57dd9b2c61b382f0fa51fd4e283e2c"
-     "55ffe272597651659fbd88cd03bfa9652cd54b01a7034c83a602709879e1325c77969beb"
-     "fd93932ce09a23eae607374602201614ff84b141",
-     "06a253acd79912a74270fc0703ed6507ab20a970f2bc2277f782062092cf0e60ae1ca1bb"
-     "44dec003169bc25ef6e7123dd04692f77b181a6d7e692e66b09d35a540c",
-     "0401f15c6b1df156fdd8381cd7446e039435e445f8f36f0247475058da0e371bf72753f6"
-     "e39f98066bc79370b038c39687ba18e16cb118fe6538b7568c5403c251f6b7012d2b4f46"
-     "b854eeae75f1c63f55b76bf0c604d47f870c28a50ecdeb52bba1dd9a0ff12e680804ff86"
-     "4111207652da7dd10b49edf66bb86be00bc06672de91982457",
-     "165faf3727e42fd61345cfa7b93e55fb4bf583b24bdc14ce635b6c99dbd788012f14da9a"
-     "210b677c44acdd851e672f1a48188d6b8946c0efeebfe8a597ba0090a2c",
-     "1ad9463d2759abd568626548578deefdcd8b2d050ce6d9c7ed05feca20167484b86e89bd"
-     "cc936fd647e0f8aedd7b6add2b8cf13ff6ff013c2b5540c6c56fda97a0c",
-     "1645a7d0e11015256cfb034adca198695eea6aedd44d9fbf496850ccfed950f43fffd8db"
-     "f41e113f2d3837d8a5dd62b2ed580112ff05800b1f73196e5576810e15b"},
-    {NID_secp521r1, NID_sha384,
-     "90d8bbf714fd2120d2144022bf29520842d9fbd2dc8bb734b3e892ba0285c6a342d6e1e3"
-     "7cc11a62083566e45b039cc65506d20a7d8b51d763d25f0d9eaf3d38601af612c5798a8a"
-     "2c712d968592b6ed689b88bbab95259ad34da26af9dda80f2f8a02960370bdb7e7595c0a"
-     "4fffb465d7ad0c4665b5ec0e7d50c6a8238c7f53",
-     "0d5a5d3ddfd2170f9d2653b91967efc8a5157f8720d740dd974e272aab000cc1a4e6c630"
-     "348754ab923cafb5056fc584b3706628051c557fce67744ee58ba7a56d0",
-     "040128a4da5fc995678e457ceb3929adee93c280f851abe900fa21f4f809dafad4e33b38"
-     "1e0cd49ce8dd50e2e281cea162bfd60a1d6a1c0ee2228e6a011e171b559ab8006eb0917c"
-     "d72256992c49ea527f6bb0315f13d8047794a0f1da1e93737703b1c2a74a00441ef3b47b"
-     "6a2ff789c49ae32d91cabe7b29247aeec44f6c40a76597a2ca",
-     "03269983a5c2bcc98e9476f5abf82424566b1f08b17204d29e310ece88f99eb677a537f8"
-     "6fe2529e409cfef2c12929644100099e0de2f27c0f0ac11105a4dca935b",
-     "1a5257ae1e8187ba954f535b86ff9b8d6a181a3b95c250d090cb4e9c3bfbd03aa64696a7"
-     "6c569728ef67780d6338d70ce46da40b87a3e49bfe154b93930890dfa93",
-     "05b6ccdfd5c63c7db76d3a0478064a2a376e0e050cb093be795a72a549247c2e4adba918"
-     "3145c63d46479dbbdcf09986a6f64c09c7e16abc4853f6376c9558b014a"},
-    {NID_secp521r1, NID_sha384,
-     "09952b1e09995e95bf0022e911c6ab1a463b0a1fdd0eec69117b34af1103c720b5760021"
-     "7de7cd178fef92de5391e550af72a8dcf7badf25b06dd039417f9a7d0f5be88fcd4e9655"
-     "931d5b605452a667c9d1bae91d3476e7d51cff4108f116a49966fb3a7cff8df1c09734ce"
-     "5620faf2dccb3dc5d94e7e9ac812da31f6d07a38",
-     "1bcedf920fa148361671b43c64e3186e1937eb1bd4b28cbd84c421472394552889bc0550"
-     "9aa732ef69d732b21b750523fdfd811f36467690fe94e01e64c9d5cbbe9",
-     "0400d33c151d202a5d4d831348e940b027ee32e4b0b9b48d823a05c67ff3bdaee0189fc6"
-     "680565f352c062e99968afc643208b4f9c7af185b861658a88c4ad0fcc8ba200e4441ddb"
-     "546468ad8ffa6074f137edfbb81e82e0e7d8f05c4c54598aa996a9cde54cb371f642bfdd"
-     "4ae7eca5b769696030027129a4183da93567ad142a2dff5183",
-     "046e619b83aac868b26d0b3cbfab55e630e0b55c461985b5d00f94ff3a5ce90ff412cebf"
-     "46bbd84550d2031d573ca27d924624428360708c8d8491c29eb01d30f2e",
-     "08427c0f0ac0263472cd423c0fb554bf3c851b9c775c566ab0f6878717bd57665830767b"
-     "05b7789c5c0b078195bd943dc737325552d32877ecb04a7c41bd07cd80c",
-     "10bb6652d6a624c40a7dd06828f15774130d02369ceb1a7d03b553e16e17b7fa5b5401f1"
-     "5885d5e4fc2e55c0c7a1b97871ab02f76386b93a16aa6e7eb65debac6dd"},
-    {NID_secp521r1, NID_sha384,
-     "0bb0f80cff309c65ff7729c59c517d50fc0ed5be405ef70cb910c3f62c328c90853d4473"
-     "530b654dda6156e149bc2222a8a7f9be665240e2fbe9d03f78a2356af0bacd1edb84c480"
-     "1adc8293a8a0bd6123d1cf6ba216aca807a7eb4dca76b493eb6e3dbb69d36f0f00f85622"
-     "2f24d9b93ec34c3b261be2fca0451c00571928e5",
-     "03789e04b3a2a0254ade3380172c150d2fad033885e02ea8bea5b92db3f4adbab190ae42"
-     "3080a1154dfedec694c25eab46ce638be3db4e4cba67bc39f62d6e7db2d",
-     "0401dbc2cf19627bdccf02432b1761f296275230c150cdde823ce3141ec315d7d05e16b2"
-     "c29e2a67491078d5316883e933d85b4b10d4f64c477d3c4e0442dc928983a2007562e720"
-     "807dd118d3d8b265b3abc61a71fce43e3dce0e7b5ae18b7a4cb01ecc00d39c1f22e150a9"
-     "a8728997e502144f5b3f6fa9b4cb8a4136212b082ca394e3f6",
-     "0fbccd8d7804bdd1d1d721b5ec74d4ba37603bc306f9fce2ec241853d8e07334e6b4b12c"
-     "4ecca0c54bd71193dd7146507933a20737c5f3e15085830fab9b30ca57b",
-     "181915a3998d8fa214f9715f4ca928d09c36de168dc15c6970a8a062b5cea2dc969b2437"
-     "ca17b684f78a1fd583aad8e6c762c8f4ab0c91b86a497145e3ca440d307",
-     "15a6c18c5c77f5470b27d061eafdc26b78561941a3b2ab0f5c81d40899fc053c3d9ed12d"
-     "7d61e298abbae470009c7b2157731c58d7b16a66fa5abaf5e8a1b8ed394"},
-    {NID_secp521r1, NID_sha384,
-     "7efacf213382ce30804e78b7256854d759147dba9729c51b2759465715bf2c421034c23d"
-     "c651c13d6cce95f71fe6a84dfbee5768163ac5789ac0474c5ddf4115684683c5f7c204b3"
-     "3b8bcc0c03ac58f66cef2f53b721fe2fac91ad841126101a88f512a7c2ded38549d9f050"
-     "d4b7961dda48a1489f026c5d111701762418cfe3",
-     "124700aa9186353e298edefc57bec0c7d0201cca10c1d80dd408d5d71040592b0ac59fac"
-     "dadfa8712445f5977ef8d4854022720c3f02d60e0732dbb2f171fcf1490",
-     "0400c80fc4cecae5d53348524ddba6a160b735c75b22fdb39af17e2a613d09246e3bb0fd"
-     "3f2978577f6db5d2118e05c7898024808f8eb8e021d7969cdcf7fc981200bb01a880c939"
-     "43fd446d4b3923b574d2221c1bb7b645fb5534dda60e827b497666ff586b77921f7e7f60"
-     "5147947194cffd2fef0678880b89cc0bc7fb74fa96d4b112d7",
-     "01a05238d595ded5c61d3bf6fde257dbf13095af8a5cb3a2e579e8e4c550fe31d12b71cc"
-     "2dbcb295e6c4fd0fb8c22d1b741c097cc59d826ced1a8771f09983143c4",
-     "132762bc81e9922a8d642e3a9d0218affa21fa2331cfcb9e452545c5981c64a8f7e4cc8e"
-     "68056023b2aa78bead59061d19c7f646c931163a91e544b106b3be8de9e",
-     "0c3a1b0b000c3169984132add51d611e2cb7069a262a6983d2ae72b459c36e6469509bdb"
-     "0f473600b8686700b08910779dee9ba83f82e755d4a4ef5f124eb09397f"},
-    {NID_secp521r1, NID_sha384,
-     "28edff8b9d85f5f58499cc11f492abdfab25e8945975bbaeee910afa2b8fc1295ec61406"
-     "309ce4e09f4ab4f462959fc2a2786802466eb26d3b01be6919893ae75d0fdc2dc8a82e66"
-     "2550f9fce9627dd364188aaba5c6faa1b2d8a2235adfa5ad0dc140f88a2b2f103f5690e8"
-     "77d07fe8fd30d02d2b2729bd3d8eb5b23a21f54c",
-     "1f532d01af885cb4ad5c329ca5d421c5c021883bd5404c798d617679bb8b094cbb7e15c8"
-     "32fb436325c5302313ce5e496f9513455e7021ffad75777a19b226acfa1",
-     "0400c0bd76b0027b85bdd879052220da1494d503f6a4bb972105a48ae98e7dda8c2d9fd9"
-     "336f5646385b961ef68e8464e3a95b00f96614b1a408ceaa2c87b077b6a8fb017eb7eb5c"
-     "78db7819af92e8537d110d9f05a5e24f954f4dde21c224d4040f059ec99e051702f39041"
-     "3d2708d18f84d82998c61847475250fb844b20082cbe651a6b",
-     "14e66853e0f7cd3300ebcae06048532e19cbb95bee140edc1c867ce7310637651445b6df"
-     "eb1d99d2e32f2ffb787ebe3fe35032277f185d3dad84f95806924550abe",
-     "0c5b3a57161098e2e8e16e0a5ae8ecf4a14df14927eea18ed4925d11dc429dda14515932"
-     "3ba970174b194b9b4608a8fa2373b7a825c5e8bd80574e49698285c2c82",
-     "1a0c038a51796158b42eb5b0dac37aff9ab93b903a47e06ebbdd15946e4bcc9a3b3875b1"
-     "8cf6294c33fc6c3693cef04ed1a43d08951e664c760e2cf3fb4e47490d2"},
-    {NID_secp521r1, NID_sha384,
-     "bae2a8897c742fd99fbf813351cd009d3f2e18d825ca22e115276484bce8f82f8c7c0c21"
-     "dd2af208404d8ef45bb5a6c41693912b630897d5246801bf0775aa9bbac8be98cb861d17"
-     "2c3563dc59e78a58ed13c66dea496471b3ad0eeae8995293e4ab97373edc1837ffc95ff1"
-     "cc0c1e90e64ea8680b2ca5f1e09bf86b99b343b6",
-     "11abf508bca68a85a54bc0659e77efad3c86112c9db04db2883e76144aa446918bb4bb07"
-     "84b0b6a0e9aa47399fe3de5aaecfd8894a0d130bb0c366c40d9d5050745",
-     "04005c0ea363a3a12633ea39d564587ebdd3a22a175ef32b9ebfc7311304b19cb3a62b5a"
-     "dc36f6afb6a6f7fabbf810ee89fdb72854fefd613e7798e9b9ff5938ea54c600bd06a85e"
-     "47b885c08124b55a3fcc07ca61647cda6efbfdbd21b24d1ea7a4c7300d46cd798e76063a"
-     "a979adef6f0698b15e5b7ae8a2ab39ab4f50b2d20614db6317",
-     "19cadb8c7eb10565aa4567e0709873918720f0e4b42b4817afb0b0547c70cd1100229dea"
-     "e97a276b9c98ea58b01d4839fee86336d749d123b03e8b1a31166acc110",
-     "0667448a8bbef1c810d40646977dc22f3dfb52a4d80928ded5e976e199cbed02fbd5a085"
-     "46756ece14548d721a6eb380d0e1a71ad0660dbcac6163c776eedd3e249",
-     "0ae7f0a238daaddb7fb4a1707fe5132daf653f8e19f732347134c96f1dd798f867c479a4"
-     "a4609a568a15b61afed70790adbde13ac5f68c468d0230852c1a2c22581"},
-    {NID_secp521r1, NID_sha384,
-     "d57a26a9593e72bfc87322524639bcaae5f2252d18b99cdaa03b14445b0b8a4dd53928f6"
-     "6a2e4f202fb25b19cad0eb2f1bfda2ab9b0eb668cdcd0fe72f5d9ef2e45e0218590f7ab9"
-     "d2c9342202610c698bc786cce108a7d4a6730a13e9ea1b470e781f1237d3f84f44abde80"
-     "8516975546bd89075ef9a9732bfd7ee33b6f4399",
-     "18dbf520d58177e4b7a0627674d220137983f486dd2fd3639f19751804e80df0655db6af"
-     "d829cdf75238de525e1a7a9f048049b593dd64b4b96cc013f970c05ea1f",
-     "04018b872690c37995be324ddb5c2bd5462841bb062f8e63da248a853de79c3d6bb9a2eb"
-     "1e6933afda0998ca43491cc807b08ace2d5336a43d0ab50563a2d3d98755f00002ff3122"
-     "1aa32aa6546f35e8fe5b9361f938362a5e89e77ae130ba8bce3729e912dfac35a2fd21ef"
-     "e84b45b8be2a340850e4b574e1885b35c2afbe196b57c6cf4c",
-     "098faeb73054639cb2e4442cd68e7b3a13f4b3f397a7b26f303afa40789f8ddd3d918f1c"
-     "e4f0be53c8cb69c380744e2297d7fc01e2b3daef4ce64dd3a2644234753",
-     "09c0e7649f814f70a8416cb78bc4601472a363fe97f5c587305778169677860dd97f87b5"
-     "ab07c3a953bc4615fc34634509d6a25621bdded33ed42446d059509c190",
-     "120b90e1cfb8a1b5e530df7b17d1128bc051ca4f1a65dd9c9d9d3c59d2f00c7c1e994c52"
-     "b8671d40294b4d574d2c04475d5bebeacd3a0d3870a54dc7a4805614f40"},
-    {NID_secp521r1, NID_sha384,
-     "8fdcf5084b12cfc043dd3416b46274e021bbed95d341d3c500c102a5609d3a34de29f8fa"
-     "9f0adb611a1f47a97ad981f8129d718fc0d6c709eab1a3490db8d550f34eb905b9e00663"
-     "543afc5bc155e368e0bc919a8b8c9fa42093603537a5614927efa6be819ed42ececbf1a8"
-     "0a61e6e0a7f9b5bc43b9238e62d5df0571fea152",
-     "002764f5696aa813cd55d30948585f86288ae05aeb264ca157cd09e1d09a10515a849b07"
-     "91b755ccc656a34707be9e52f5762d290a7d2bcd6de52c600ff862eaf4e",
-     "040127279c88719dc614db387f102e55104ea1c704ac7f57f3bca936f728439b76556730"
-     "dd7cde2ac1ad0a4c2c2f036ab6f00cf34cb87ea36113571f300713044106d20134a0786c"
-     "31f5f2291b83c50fb579ae4c620b95e5a8bdc0c7e1ee6b996c89d764f1b20403e7faa203"
-     "f397425ada297045dd8ba0e4b155d4900da249e934faab7991",
-     "08bffb0778cbb06466cecc114b9e89ca243a2b2b5e2597db920bc73a8bbcbe3f57144ad3"
-     "3409ef7faaab430e13f4c42d304d11347360c84972ca20b1539cce3a288",
-     "1f8f504e64a502e51e7c129517931c3b71f0d8a63b19cfe01ff7c951c6525249608b3ef5"
-     "d00061d77eb6b3d69581adeaa3732c773bbb9b919c3e7c71fdc09f44d06",
-     "058044fc64b340604ffd02a5b2918d76fd6fb59ea895feab7aa218e6f1e8c8f226eb9ee3"
-     "45ef8140183a69272582005077b008006aab11597e808d7ff1e8382c924"},
-    {NID_secp521r1, NID_sha384,
-     "00669f433934992257bed55861df679804107d7fa491672574a7624949c60049b0533383"
-     "c88d6896c8de860704c3e6a6aefce83efa57c4d57e9ab253da5d15e1f53ab6dce218b592"
-     "772ab0bc01fee8e63368e85c0639301456fe2d44cd5396a7f2b22761cd03b80eba7883ee"
-     "de8249a2f5db2183bf00550c5c002f45a5e4fb31",
-     "1b0c9acd3eeb618b4b0de4db402206f0f29adc69d7ad324b6db6601b351f723ac8fe949e"
-     "eacd34228649bf0126276e5aceb0137d00c30dd858aef2d6b6449de2e89",
-     "0401811c8884486aaa083ddee1c51cb6e861cb830bd5eaa929f72efadbbd1286566ae7e7"
-     "ba7fde7e02529900d35ee64591652d28798bfc1bed0d192602a9cf5a7d22e3006d7fc9dd"
-     "494816cfd29613d4689af67f7d0a2e6fbad5d4d6e0130189172a1ab601c5ca71deaa8bfc"
-     "b5a190d49da191672ff6fc048e146cb902acec5eae6d87e60a",
-     "1fdc4f108070af3c66c9ba7b6c1f2603a19ceb4760399df81228cfc7eafde1082b5a0716"
-     "a3ff82fbe84726f14dd0db3376ca184a78c3c60679bab6cd45f77f9b9ce",
-     "1ec310339ff056faeb341c4499c43782078b04be1725ae9a6cdcb6011c46d1a4eb3d75c3"
-     "58225e4ec142fd1cd344186f5eb597f7ba559ddfa954824365d5b6edaec",
-     "005b679a33fdb7e04834f071cd0ac514c04add9f2614ab9bbd9b407b1420fed3f3e02a10"
-     "8e7e279899e43dcf64ae4083c289a87cd7d2103bdc036a95d36800ac7c6"},
-    {NID_secp521r1, NID_sha384,
-     "4be81dcfab39a64d6f00c0d7fff94dabdf3473dc49f0e12900df328d6584b854fbaebaf3"
-     "194c433e9e21743342e2dd056b445c8aa7d30a38504b366a8fa889dc8ecec35b31300707"
-     "87e7bf0f22fab5bea54a07d3a75368605397ba74dbf2923ef20c37a0d9c64caebcc93157"
-     "456b57b98d4becb13fecb7cc7f3740a6057af287",
-     "181e1037bbec7ca2f271343e5f6e9125162c8a8a46ae8baa7ca7296602ae9d56c994b3b9"
-     "4d359f2b3b3a01deb7a123f07d9e0c2e729d37cc5abdec0f5281931308a",
-     "0400cfa5a8a3f15eb8c419095673f1d0bd63b396ff9813c18dfe5aa31f40b50b82481f9e"
-     "d2edd47ae5ea6a48ea01f7e0ad0000edf7b66f8909ee94f141d5a07efe315c018af728f7"
-     "318b96d57f19c1104415c8d5989565465e429bc30cf65ced12a1c5856ac86fca02388bc1"
-     "51cf89959a4f048597a9e728f3034aa39259b59870946187bf",
-     "09078beaba465ba7a8b3624e644ac1e97c654533a58ac755e90bd606e2214f11a48cb51f"
-     "9007865a0f569d967ea0370801421846a89f3d09eb0a481289270919f14",
-     "19cf91a38cc20b9269e7467857b1fc7eabb8cea915a3135f727d471e5bfcfb66d321fabe"
-     "283a2cf38d4c5a6ecb6e8cbee1030474373bb87fcdfcc95cf857a8d25d0",
-     "1cf9acd9449c57589c950f287842f9e2487c5610955b2b5035f6aacfd2402f511998a1a9"
-     "42b39c307fc2bcab2c8d0dae94b5547ddccfb1012ca985b3edf42bbba8b"},
-    {NID_secp521r1, NID_sha512,
-     "9ecd500c60e701404922e58ab20cc002651fdee7cbc9336adda33e4c1088fab1964ecb79"
-     "04dc6856865d6c8e15041ccf2d5ac302e99d346ff2f686531d25521678d4fd3f76bbf2c8"
-     "93d246cb4d7693792fe18172108146853103a51f824acc621cb7311d2463c3361ea70725"
-     "4f2b052bc22cb8012873dcbb95bf1a5cc53ab89f",
-     "0f749d32704bc533ca82cef0acf103d8f4fba67f08d2678e515ed7db886267ffaf02fab0"
-     "080dca2359b72f574ccc29a0f218c8655c0cccf9fee6c5e567aa14cb926",
-     "040061387fd6b95914e885f912edfbb5fb274655027f216c4091ca83e19336740fd81aed"
-     "fe047f51b42bdf68161121013e0d55b117a14e4303f926c8debb77a7fdaad100e7d0c75c"
-     "38626e895ca21526b9f9fdf84dcecb93f2b233390550d2b1463b7ee3f58df7346435ff04"
-     "34199583c97c665a97f12f706f2357da4b40288def888e59e6",
-     "03af5ab6caa29a6de86a5bab9aa83c3b16a17ffcd52b5c60c769be3053cdddeac60812d1"
-     "2fecf46cfe1f3db9ac9dcf881fcec3f0aa733d4ecbb83c7593e864c6df1",
-     "04de826ea704ad10bc0f7538af8a3843f284f55c8b946af9235af5af74f2b76e099e4bc7"
-     "2fd79d28a380f8d4b4c919ac290d248c37983ba05aea42e2dd79fdd33e8",
-     "087488c859a96fea266ea13bf6d114c429b163be97a57559086edb64aed4a18594b46fb9"
-     "efc7fd25d8b2de8f09ca0587f54bd287299f47b2ff124aac566e8ee3b43"},
-    {NID_secp521r1, NID_sha512,
-     "b3c63e5f5a21c4bfe3dbc644354d9a949186d6a9e1dd873828782aa6a0f1df2f64114a43"
-     "0b1c13fe8a2e09099e1ed05ef70de698161039ded73bcb50b312673bb073f8a792ac140a"
-     "78a8b7f3586dffb1fc8be4f54516d57418ccc9945025ce3acf1eb84f69ceee5e9bd10c18"
-     "c251dbc481562cd3aae54b54ab618cb1eeda33cf",
-     "1a4d2623a7d59c55f408331ba8d1523b94d6bf8ac83375ceb57a2b395a5bcf977cfc1623"
-     "4d4a97d6f6ee25a99aa5bff15ff535891bcb7ae849a583e01ac49e0e9b6",
-     "04004d5c8afee038984d2ea96681ec0dccb6b52dfa4ee2e2a77a23c8cf43ef19905a34d6"
-     "f5d8c5cf0981ed804d89d175b17d1a63522ceb1e785c0f5a1d2f3d15e513520014368b8e"
-     "746807b2b68f3615cd78d761a464ddd7918fc8df51d225962fdf1e3dc243e265100ff0ec"
-     "133359e332e44dd49afd8e5f38fe86133573432d33c02fa0a3",
-     "0bc2c0f37155859303de6fa539a39714e195c37c6ea826e224c8218584ae09cd0d1cc14d"
-     "94d93f2d83c96e4ef68517fdb3f383da5404e5a426bfc5d424e253c181b",
-     "1a3c4a6386c4fb614fba2cb9e74201e1aaa0001aa931a2a939c92e04b8344535a20f53c6"
-     "e3c69c75c2e5d2fe3549ed27e6713cb0f4a9a94f6189eb33bff7d453fce",
-     "16a997f81aa0bea2e1469c8c1dab7df02a8b2086ba482c43af04f2174831f2b176165879"
-     "5adfbdd44190a9b06fe10e578987369f3a2eced147cff89d8c2818f7471"},
-    {NID_secp521r1, NID_sha512,
-     "6e0f96d56505ffd2d005d5677dbf926345f0ff0a5da456bbcbcfdc2d33c8d878b0bc8511"
-     "401c73168d161c23a88b04d7a9629a7a6fbcff241071b0d212248fcc2c94fa5c086909ad"
-     "b8f4b9772b4293b4acf5215ea2fc72f8cec57b5a13792d7859b6d40348fc3ba3f5e7062a"
-     "19075a9edb713ddcd391aefc90f46bbd81e2557b",
-     "14787f95fb1057a2f3867b8407e54abb91740c097dac5024be92d5d65666bb16e4879f3d"
-     "3904d6eab269cf5e7b632ab3c5f342108d1d4230c30165fba3a1bf1c66f",
-     "0400c2d540a7557f4530de35bbd94da8a6defbff783f54a65292f8f76341c996cea38795"
-     "805a1b97174a9147a8644282e0d7040a6f83423ef2a0453248156393a1782e0119f746c5"
-     "df8cec24e4849ac1870d0d8594c799d2ceb6c3bdf891dfbd2242e7ea24d6aec316621473"
-     "4acc4cbf4da8f71e2429c5c187b2b3a048527c861f58a9b97f",
-     "186cd803e6e0c9925022e41cb68671adba3ead5548c2b1cd09348ab19612b7af3820fd14"
-     "da5fe1d7b550ed1a3c8d2f30592cd7745a3c09ee7b5dcfa9ed31bdd0f1f",
-     "10ed3ab6d07a15dc3376494501c27ce5f78c8a2b30cc809d3f9c3bf1aef437e590ef66ab"
-     "ae4e49065ead1af5f752ec145acfa98329f17bca9991a199579c41f9229",
-     "08c3457fe1f93d635bb52df9218bf3b49a7a345b8a8a988ac0a254340546752cddf02e6c"
-     "e47eee58ea398fdc9130e55a4c09f5ae548c715f5bcd539f07a34034d78"},
-    {NID_secp521r1, NID_sha512,
-     "3f12ab17af3c3680aad22196337cedb0a9dba22387a7c555b46e84176a6f841800455238"
-     "6ada4deec59fdabb0d25e1c6668a96f100b352f8dabd24b2262bd2a3d0f825602d54150b"
-     "dc4bcbd5b8e0ca52bc8d2c70ff2af9b03e20730d6bd9ec1d091a3e5c877259bcff4fd2c1"
-     "7a12bfc4b08117ec39fe4762be128d0883a37e9d",
-     "15807c101099c8d1d3f24b212af2c0ce525432d7779262eed0709275de9a1d8a8eeeadf2"
-     "f909cf08b4720815bc1205a23ad1f825618cb78bde747acad8049ca9742",
-     "040160d7ea2e128ab3fabd1a3ad5455cb45e2f977c2354a1345d4ae0c7ce4e492fb9ff95"
-     "8eddc2aa61735e5c1971fa6c99beda0f424a20c3ce969380aaa52ef5f5daa8014e4c83f9"
-     "0d196945fb4fe1e41913488aa53e24c1d2142d35a1eed69fed784c0ef44d71bc21afe0a0"
-     "065b3b87069217a5abab4355cf8f4ceae5657cd4b9c8008f1f",
-     "096731f8c52e72ffcc095dd2ee4eec3da13c628f570dba169b4a7460ab471149abdede0b"
-     "63e4f96faf57eab809c7d2f203fd5ab406c7bd79869b7fae9c62f97c794",
-     "1e2bf98d1186d7bd3509f517c220de51c9200981e9b344b9fb0d36f34d969026c80311e7"
-     "e73bb13789a99e0d59e82ebe0e9595d9747204c5f5550c30d934aa30c05",
-     "12fed45cc874dc3ed3a11dd70f7d5c61451fbea497dd63e226e10364e0718d3722c27c7b"
-     "4e5027051d54b8f2a57fc58bc070a55b1a5877b0f388d768837ef2e9cec"},
-    {NID_secp521r1, NID_sha512,
-     "a1eed24b3b7c33296c2491d6ee092ec6124f85cf566bb5bc35bffb5c734e34547242e575"
-     "93e962fb76aee9e800eed2d702cc301499060b76406b347f3d1c86456978950737703c81"
-     "59001e6778f69c734a56e5ce5938bd0e0de0877d55adeee48b0d8dfa4ac65fd2d3ce3e12"
-     "878bac5c7014f9284d161b2a3e7d5c88569a45f6",
-     "18692def0b516edcdd362f42669999cf27a65482f9358fcab312c6869e22ac469b82ca90"
-     "36fe123935b8b9ed064acb347227a6e377fb156ec833dab9f170c2ac697",
-     "0401ceee0be3293d8c0fc3e38a78df55e85e6b4bbce0b9995251f0ac55234140f82ae0a4"
-     "34b2bb41dc0aa5ecf950d4628f82c7f4f67651b804d55d844a02c1da6606f701f775eb6b"
-     "3c5e43fc754052d1f7fc5b99137afc15d231a0199a702fc065c917e628a54e038cbfebe0"
-     "5c90988b65183b368a2061e5b5c1b025bbf2b748fae00ba297",
-     "161cf5d37953e09e12dc0091dc35d5fb3754c5c874e474d2b4a4f1a90b870dff6d99fb15"
-     "6498516e25b9a6a0763170702bb8507fdba4a6131c7258f6ffc3add81fd",
-     "14dfa43046302b81fd9a34a454dea25ccb594ace8df4f9d98556ca5076bcd44b2a9775df"
-     "aca50282b2c8988868e5a31d9eb08e794016996942088d43ad3379eb9a1",
-     "120be63bd97691f6258b5e78817f2dd6bf5a7bf79d01b8b1c3382860c4b00f89894c72f9"
-     "3a69f3119cb74c90b03e9ede27bd298b357b9616a7282d176f3899aaa24"},
-    {NID_secp521r1, NID_sha512,
-     "9aace26837695e6596007a54e4bccdd5ffb16dc6844140e2eeeb584b15acb2bbffd203c7"
-     "4440b6ee8db676fd200b4186a8c3e957c19e74d4d865ada83f80655323dfa3570907ed3c"
-     "e853b6e8cc375ed2d758a2f5ad265dd3b47650517a49b3d02df9e0c60c21576378c2b3a0"
-     "8481eec129b2a75608e13e6420127a3a63c8a3f1",
-     "0a63f9cdefbccdd0d5c9630b309027fa139c31e39ca26686d76c22d4093a2a5e5ec4e230"
-     "8ce43eb8e563187b5bd811cc6b626eace4063047ac0420c3fdcff5bdc04",
-     "04014cab9759d4487987b8a00afd16d7199585b730fb0bfe63796272dde9135e7cb9e27c"
-     "ec51207c876d9214214b8c76f82e7363f5086902a577e1c50b4fbf35ce996601a83f0caa"
-     "01ca2166e1206292342f47f358009e8b891d3cb817aec290e0cf2f47e7fc637e39dca039"
-     "49391839684f76b94d34e5abc7bb750cb44486cce525eb0093",
-     "01e51fd877dbbcd2ab138fd215d508879298d10c7fcbdcc918802407088eb6ca0f18976a"
-     "13f2c0a57867b0298512fc85515b209c4435e9ef30ab01ba649838bc7a0",
-     "11a1323f6132d85482d9b0f73be838d8f9e78647934f2570fededca7c234cc46aa1b97da"
-     "5ac1b27b714f7a171dc4209cbb0d90e4f793c4c192dc039c31310d6d99b",
-     "0386a5a0fc55d36ca7231a9537fee6b9e51c2255363d9c9e7cb7185669b302660e23133e"
-     "b21eb56d305d36e69a79f5b6fa25b46ec61b7f699e1e9e927fb0bceca06"},
-    {NID_secp521r1, NID_sha512,
-     "ac2175940545d4fbab6e2e651c6830aba562e0c11c919e797c43eff9f187a68a9e5a128e"
-     "3e2a330b955a3f4577d3f826529ad1b03d7b60f7ad678f005053b41dc0f8d267f3685c6a"
-     "be1a0e9a733c44b2f3ca48b90806f935141c842e3a6c06a58f5343d75e3585971a734f4a"
-     "e1074ce5b54f74bd9342f4bbca738d260393f43e",
-     "024f7d67dfc0d43a26cc7c19cb511d30a097a1e27e5efe29e9e76e43849af170fd9ad57d"
-     "5b22b1c8840b59ebf562371871e12d2c1baefc1abaedc872ed5d2666ad6",
-     "04009da1536154b46e3169265ccba2b4da9b4b06a7462a067c6909f6c0dd8e19a7bc2ac1"
-     "a47763ec4be06c1bec57d28c55ee936cb19588cc1398fe4ea3bd07e6676b7f014150cdf2"
-     "5da0925926422e1fd4dcfcffb05bdf8682c54d67a9bd438d21de5af43a15d979b320a847"
-     "683b6d12ac1383a7183095e9da491c3b4a7c28874625e70f87",
-     "1c1308f31716d85294b3b5f1dc87d616093b7654907f55289499b419f38ceeb906d2c9fe"
-     "4cc3d80c5a38c53f9739311b0b198111fede72ebde3b0d2bc4c2ef090d2",
-     "00dbf787ce07c453c6c6a67b0bf6850c8d6ca693a3e9818d7453487844c9048a7a2e48ff"
-     "982b64eb9712461b26b5127c4dc57f9a6ad1e15d8cd56d4fd6da7186429",
-     "0c6f1c7774caf198fc189beb7e21ca92ceccc3f9875f0e2d07dc1d15bcc8f210b6dd376b"
-     "f65bb6a454bf563d7f563c1041d62d6078828a57538b25ba54723170665"},
-    {NID_secp521r1, NID_sha512,
-     "6266f09710e2434cb3da3b15396556765db2ddcd221dce257eab7399c7c4901359251129"
-     "32716af1434053b8b9fe340563e57a0b9776f9ac92cbb5fba18b05c0a2fafbed7240b3f9"
-     "3cd1780c980ff5fe92610e36c0177cabe82367c84cee9020cf26c1d74ae3eb9b9b512cb8"
-     "b3cb3d81b17cf20dc76591b2b394ef1c62ac12ee",
-     "0349471460c205d836aa37dcd6c7322809e4e8ef81501e5da87284b267d843897746b330"
-     "16f50a7b702964910361ed51d0afd9d8559a47f0b7c25b2bc952ce8ed9e",
-     "04000bbd4e8a016b0c254e754f68f0f4ed081320d529ecdc7899cfb5a67dd04bc85b3aa6"
-     "891a3ed2c9861ae76c3847d81780c23ad84153ea2042d7fd5d517a26ff3ce400645953af"
-     "c3c1b3b74fdf503e7d3f982d7ee17611d60f8eb42a4bddbec2b67db1f09b54440c30b44e"
-     "8071d404658285cb571462001218fc8c5e5b98b9fae28272e6",
-     "00eb2bd8bb56b9d2e97c51247baf734cc655c39e0bfda35375f0ac2fe82fad699bf19895"
-     "77e24afb33c3868f91111e24fefe7dec802f3323ac013bec6c048fe5568",
-     "14bf63bdbc014aa352544bd1e83ede484807ed760619fa6bc38c4f8640840195e1f2f149"
-     "b29903ca4b6934404fb1f7de5e39b1ea04dba42819c75dbef6a93ebe269",
-     "05d1bcf2295240ce4415042306abd494b4bda7cf36f2ee2931518d2454faa01c606be120"
-     "b057062f2f3a174cb09c14f57ab6ef41cb3802140da22074d0e46f908d4"},
-    {NID_secp521r1, NID_sha512,
-     "3de9e617a6868dca1a1432d503f923535da3f9b34426b2a4822174399c73b1c1ee673114"
-     "10a58c17202ac767844b2024d8aa21a205707d93865693ac25a24fc87034fa3a7a7e27c3"
-     "344cb03b87602c15180a5fe6a9dd90cd11af4a0f150207bf2d83f55b12c088adae99aa8c"
-     "fa659311b3a25beb99056643760d6a282126b9b2",
-     "07788d34758b20efc330c67483be3999d1d1a16fd0da81ed28895ebb35ee21093d37ea1a"
-     "c808946c275c44454a216195eb3eb3aea1b53a329eca4eb82dd48c784f5",
-     "0400157d80bd426f6c3cee903c24b73faa02e758607c3e102d6e643b7269c299684fdaba"
-     "1acddb83ee686a60acca53cddb2fe976149205c8b8ab6ad1458bc00993cc43016e33cbed"
-     "05721b284dacc8c8fbe2d118c347fc2e2670e691d5d53daf6ef2dfec464a5fbf46f8efce"
-     "81ac226915e11d43c11c8229fca2327815e1f8da5fe95021fc",
-     "0a73477264a9cc69d359464abb1ac098a18c0fb3ea35e4f2e6e1b060dab05bef1255d9f9"
-     "c9b9fbb89712e5afe13745ae6fd5917a9aedb0f2860d03a0d8f113ea10c",
-     "07e315d8d958b8ce27eaf4f3782294341d2a46fb1457a60eb9fe93a9ae86f3764716c4f5"
-     "f124bd6b114781ed59c3f24e18aa35c903211b2f2039d85862932987d68",
-     "1bcc1d211ebc120a97d465b603a1bb1e470109e0a55d2f1b5c597803931bd6d7718f010d"
-     "7d289b31533e9fcef3d141974e5955bc7f0ee342b9cad05e29a3dded30e"},
-    {NID_secp521r1, NID_sha512,
-     "aa48851af7ef17abe233163b7185130f4646203c205e22bcc2a5a3697bcab998c73a9ffe"
-     "1d3ea0b7978ce7df937a72586eb5ca60b0d939a7d1c115c820171c89c8116b7e2c7b98cf"
-     "0f14e4c4df3cb2f319ad3ab0ea25ff14526ddc037469f000bf82100acd4cdf94feb4eba4"
-     "ea1726f0569336604a473aee67d71afebb569209",
-     "1f98696772221e6cccd5569ed8aed3c435ee86a04689c7a64d20c30f6fe1c59cc10c6d29"
-     "10261d30c3b96117a669e19cfe5b696b68feeacf61f6a3dea55e6e5837a",
-     "04007002872c200e16d57e8e53f7bce6e9a7832c387f6f9c29c6b75526262c57bc2b56d6"
-     "3e9558c5761c1d62708357f586d3aab41c6a7ca3bf6c32d9c3ca40f9a2796a01fe3e5247"
-     "2ef224fb38d5a0a14875b52c2f50b82b99eea98d826c77e6a9ccf798de5ffa92a0d65965"
-     "f740c702a3027be66b9c844f1b2e96c134eb3fdf3edddcf11c",
-     "1a277cf0414c6adb621d1cc0311ec908401ce040c6687ed45a0cdf2910c42c9f1954a457"
-     "2d8e659733d5e26cbd35e3260be40017b2f5d38ec42315f5c0b056c596d",
-     "0d732ba8b3e9c9e0a495249e152e5bee69d94e9ff012d001b140d4b5d082aa9df77e10b6"
-     "5f115a594a50114722db42fa5fbe457c5bd05e7ac7ee510aa68fe7b1e7f",
-     "134ac5e1ee339727df80c35ff5b2891596dd14d6cfd137bafd50ab98e2c1ab4008a0bd03"
-     "552618d217912a9ec502a902f2353e757c3b5776309f7f2cfebf913e9cd"},
-    {NID_secp521r1, NID_sha512,
-     "b0d5d52259af364eb2d1a5027e5f7d0afe4b999cc5dd2268cfe76f51d2f17b541bdd7867"
-     "e23a1bb897705153d9432a24012108979c6a2c9e2567c9531d012f9e4be764419491a52e"
-     "ae2e127430b0ab58cb8e216515a821b3db206447c235bf44ee304201b483b2a88844abaa"
-     "18bca0147dfff7e502397dd62e15524f67eb2df2",
-     "13c3852a6bc8825b45fd7da1754078913d77f4e586216a6eb08b6f03adce7464f5dbc2be"
-     "a0eb7b12d103870ef045f53d67e3600d7eba07aac5db03f71b64db1cceb",
-     "0400c97a4ebcbbe701c9f7be127e87079edf479b76d3c14bfbee693e1638e5bff8d4705a"
-     "c0c14597529dbe13356ca85eb03a418edfe144ce6cbf3533016d4efc29dbd4011c75b7a8"
-     "894ef64109ac2dea972e7fd5f79b75dab1bf9441a5b8b86f1dc1324426fa6cf4e7b973b4"
-     "4e3d0576c52e5c9edf8ce2fc18cb3c28742d44419f044667f8",
-     "1e25b86db041f21c2503d547e2b1b655f0b99d5b6c0e1cf2bdbd8a8c6a053f5d79d78c55"
-     "b4ef75bff764a74edc920b35536e3c470b6f6b8fd53898f3bbc467539ef",
-     "1dce45ea592b34d016497882c48dc0c7afb1c8e0f81a051800d7ab8da9d237efd892207b"
-     "c9401f1d30650f66af8d5349fc5b19727756270722d5a8adb0a49b72d0a",
-     "0b79ffcdc33e028b1ab894cb751ec792a69e3011b201a76f3b878655bc31efd1c0bf3b98"
-     "aea2b14f262c19d142e008b98e890ebbf464d3b025764dd2f73c4251b1a"},
-    {NID_secp521r1, NID_sha512,
-     "9599788344976779383a7a0812a096943a1f771ee484d586af1a06207478e4c0be9c200d"
-     "42460fe837e24b266c8852d80d3c53cc52ffb1913fc3261145fc6da575611efd16c02605"
-     "9a2e64f802517ffd1b6b34de10ad2909c65c2155e8d939b8115400c1d793d23955b15f5d"
-     "1c13c962ff92b4a815cee0e10f8e14e1f6e6cd38",
-     "1654eaa1f6eec7159ee2d36fb24d15d6d33a128f36c52e2437f7d1b5a44ea4fa965c0a26"
-     "d0066f92c8b82bd136491e929686c8bde61b7c704daab54ed1e1bdf6b77",
-     "0401f269692c47a55242bb08731ff920f4915bfcecf4d4431a8b487c90d08565272c52ca"
-     "90c47397f7604bc643982e34d05178e979c2cff7ea1b9eaec18d69ca7382de00750bdd86"
-     "6fba3e92c29599c002ac6f9e2bf39af8521b7b133f70510e9918a94d3c279edec97ab75e"
-     "cda95e3dd7861af84c543371c055dc74eeeff7061726818327",
-     "1b7519becd00d750459d63a72f13318b6ac61b8c8e7077cf9415c9b4b924f35514c9c28a"
-     "0fae43d06e31c670a873716156aa7bc744577d62476e038b116576a9e53",
-     "183bddb46c249e868ef231a1ebd85d0773bf8105a092ab7d884d677a1e9b7d6014d6358c"
-     "09538a99d9dca8f36f163ac1827df420c3f9360cc66900a9737a7f756f3",
-     "0d05ee3e64bac4e56d9d8bd511c8a43941e953cba4e5d83c0553acb87091ff54f3aad4d6"
-     "9d9f15e520a2551cc14f2c86bb45513fef0295e381a7635486bd3917b50"},
-    {NID_secp521r1, NID_sha512,
-     "fdde51acfd04eb0ad892ce9d6c0f90eb91ce765cbe3ce9d3f2defe8f691324d26b968b8b"
-     "90e77706b068585f2a3ee7bf3e910528f7403c5af745a6f9d7ba6c53abd885c3b1be5834"
-     "15b128f4d3f224daf8563476bd9aa61e9c8518c144335f8f879c03696bddbe3ac37a8fbe"
-     "de29861611feaa87e325e2f60278b4893ed57fb0",
-     "1cba5d561bf18656991eba9a1dde8bde547885ea1f0abe7f2837e569ca52f53df5e64e4a"
-     "547c4f26458b5d9626ed6d702e5ab1dd585cf36a0c84f768fac946cfd4c",
-     "04012857c2244fa04db3b73db4847927db63cce2fa6cb22724466d3e20bc950a9250a15e"
-     "afd99f236a801e5271e8f90d9e8a97f37c12f7da65bce8a2c93bcd2552620500f394e37c"
-     "17d5b8e35b488fa05a607dbc74264965043a1fb60e92edc212296ae72d7d6fe2e3457e67"
-     "be853664e1da64f57e44bd259076b3bb2b06a2c604fea1be9d",
-     "0e790238796fee7b5885dc0784c7041a4cc7ca4ba757d9f7906ad1fcbab5667e3734bc23"
-     "09a48047442535ff89144b518f730ff55c0c67eeb4c880c2dfd2fb60d69",
-     "1d7ce382295a2a109064ea03f0ad8761dd60eefb9c207a20e3c5551e82ac6d2ee5922b3e"
-     "9655a65ba6c359dcbf8fa843fbe87239a5c3e3eaecec0407d2fcdb687c2",
-     "161963a6237b8955a8a756d8df5dbd303140bb90143b1da5f07b32f9cb64733dc6316080"
-     "924733f1e2c81ade9d0be71b5b95b55666026a035a93ab3004d0bc0b19f"},
-    {NID_secp521r1, NID_sha512,
-     "beb34c997f905c77451ac392f7957a0ab8b23325bd5c63ca31c109ac8f655a1e3094240c"
-     "b8a99284f8091de2ab9a7db2504d16251980b86be89ec3a3f41162698bab51848880633e"
-     "0b71a38f8896335853d8e836a2454ecab2acdcc052c8f659be1d703b13ae1b090334ac50"
-     "ab0137ddb5e8b924c0e3d2e5789daaef2fdd4a1e",
-     "0972e7ff25adf8a032535e5b19463cfe306b90803bf27fabc6046ae0807d2312fbab85d1"
-     "da61b80b2d5d48f4e5886f27fca050b84563aee1926ae6b2564cd756d63",
-     "0401d7f1e9e610619daa9d2efa563610a371677fe8b58048fdc55a98a49970f6afa6649c"
-     "516f9c72085ca3722aa595f45f2803402b01c832d28aac63d9941f1a25dfea01571facce"
-     "3fcfe733a8eef4e8305dfe99103a370f82b3f8d75085414f2592ad44969a2ef8196c8b98"
-     "09f0eca2f7ddc71c47879e3f37a40b9fecf97992b97af29721",
-     "0517f6e4002479dc89e8cbb55b7c426d128776ca82cf81be8c1da9557178783f40e3d047"
-     "db7e77867f1af030a51de470ee3128c22e9c2d642d71e4904ab5a76edfa",
-     "1c3262a3a3fb74fa5124b71a6c7f7b7e6d56738eabaf7666b372b299b0c99ee8a16be3df"
-     "88dd955de093fc8c049f76ee83a4138cee41e5fe94755d27a52ee44032f",
-     "072fd88bb1684c4ca9531748dfce4c161037fcd6ae5c2803b7117fb60d3db5df7df38059"
-     "1aaf3073a3031306b76f062dcc547ded23f6690293c34a710e7e9a226c3"},
-    {NID_secp521r1, NID_sha512,
-     "543c374af90c34f50ee195006d5f9d8dd986d09ad182fcbefa085567275eee1e742bfe0a"
-     "f3d058675adeb5b9f87f248b00a9fbd2aa779129123a5b983f2f26fc3caf2ea34277550c"
-     "22fe8c814c739b46972d50232993cddd63a3c99e20f5c5067d9b57e2d5db94317a5a16b5"
-     "c12b5c4cafbc79cbc2f9940f074bbc7d0dc71e90",
-     "1f0ec8da29295394f2f072672db014861be33bfd9f91349dad5566ff396bea055e53b1d6"
-     "1c8c4e5c9f6e129ed75a49f91cce1d5530ad4e78c2b793a63195eb9f0da",
-     "04009ec1a3761fe3958073b9647f34202c5e8ca2428d056facc4f3fedc7077fa87f1d1eb"
-     "30cc74f6e3ff3d3f82df2641cea1eb3ff1529e8a3866ae2055aacec0bf68c400bed0261b"
-     "91f664c3ff53e337d8321cb988c3edc03b46754680097e5a8585245d80d0b7045c75a9c5"
-     "be7f599d3b5eea08d828acb6294ae515a3df57a37f903ef62e",
-     "0ac3b6d61ebda99e23301fa198d686a13c0832af594b289c9a55669ce6d6201138476901"
-     "3748b68465527a597ed6858a06a99d50493562b3a7dbcee975ad34657d8",
-     "0cef3f4babe6f9875e5db28c27d6a197d607c3641a90f10c2cc2cb302ba658aa151dc76c"
-     "507488b99f4b3c8bb404fb5c852f959273f412cbdd5e713c5e3f0e67f94",
-     "0097ed9e005416fc944e26bcc3661a09b35c128fcccdc2742739c8a301a338dd77d9d135"
-     "71612a3b9524a6164b09fe73643bbc31447ee31ef44a490843e4e7db23f"}
-# ifndef OPENSSL_NO_EC2M
+    { NID_secp224r1, NID_sha224,
+        "699325d6fc8fbbb4981a6ded3c3a54ad2e4e3db8a5669201912064c64e700c139248cdc1"
+        "9495df081c3fc60245b9f25fc9e301b845b3d703a694986e4641ae3c7e5a19e6d6edbf1d"
+        "61e535f49a8fad5f4ac26397cfec682f161a5fcd32c5e780668b0181a91955157635536a"
+        "22367308036e2070f544ad4fff3d5122c76fad5d",
+        "16797b5c0c7ed5461e2ff1b88e6eafa03c0f46bf072000dfc830d615",
+        "04605495756e6e88f1d07ae5f98787af9b4da8a641d1a9492a12174eabf5cc733b17decc"
+        "806ef1df861a42505d0af9ef7c3df3959b8dfc6669",
+        "d9a5a7328117f48b4b8dd8c17dae722e756b3ff64bd29a527137eec0",
+        "2fc2cff8cdd4866b1d74e45b07d333af46b7af0888049d0fdbc7b0d6",
+        "8d9cc4c8ea93e0fd9d6431b9a1fd99b88f281793396321b11dac41eb" },
+    { NID_secp224r1, NID_sha224,
+        "7de42b44db0aa8bfdcdac9add227e8f0cc7ad1d94693beb5e1d325e5f3f85b3bd033fc25"
+        "e9469a89733a65d1fa641f7e67d668e7c71d736233c4cba20eb83c368c506affe77946b5"
+        "e2ec693798aecd7ff943cd8fab90affddf5ad5b8d1af332e6c5fe4a2df16837700b2781e"
+        "08821d4fbdd8373517f5b19f9e63b89cfeeeef6f",
+        "cf020a1ff36c28511191482ed1e5259c60d383606c581948c3fbe2c5",
+        "04fa21f85b99d3dc18c6d53351fbcb1e2d029c00fa7d1663a3dd94695ee9e79578f8988b"
+        "168edff1a8b34a5ed9598cc20acd1f0aed36715d88",
+        "c780d047454824af98677cf310117e5f9e99627d02414f136aed8e83",
+        "45145f06b566ec9fd0fee1b6c6551a4535c7a3bbfc0fede45f4f5038",
+        "7302dff12545b069cf27df49b26e4781270585463656f2834917c3ca" },
+    { NID_secp224r1, NID_sha224,
+        "af0da3adab82784909e2b3dadcecba21eced3c60d7572023dea171044d9a10e8ba67d31b"
+        "04904541b87fff32a10ccc6580869055fec6216a00320a28899859a6b61faba58a0bc10c"
+        "2ba07ea16f214c3ddcc9fc5622ad1253b63fe7e95227ae3c9caa9962cffc8b1c4e826003"
+        "6469d25ab0c8e3643a820b8b3a4d8d43e4b728f9",
+        "dde6f173fa9f307d206ce46b4f02851ebce9638a989330249fd30b73",
+        "04fc21a99b060afb0d9dbf3250ea3c4da10be94ce627a65874d8e4a630e8373ab7190890"
+        "326aac4aacca3eba89e15d1086a05434dd033fd3f3",
+        "6629366a156840477df4875cfba4f8faa809e394893e1f5525326d07",
+        "41f8e2b1ae5add7c24da8725a067585a3ad6d5a9ed9580beb226f23a",
+        "a5d71bff02dce997305dd337128046f36714398f4ef6647599712fae" },
+    { NID_secp224r1, NID_sha224,
+        "cfa56ae89727df6b7266f69d6636bf738f9e4f15f49c42a0123edac4b3743f32ea52389f"
+        "919ceb90575c4184897773b2f2fc5b3fcb354880f15c93383215d3c2551fcc1b4180a1ac"
+        "0f69c969bbc306acd115ce3976eff518540f43ad4076dbb5fbad9ce9b3234f1148b8f5e0"
+        "59192ff480fc4bcbd00d25f4d9f5ed4ba5693b6c",
+        "aeee9071248f077590ac647794b678ad371f8e0f1e14e9fbff49671e",
+        "04fad0a34991bbf89982ad9cf89337b4bd2565f84d5bdd004289fc1cc35d8b6764f28c81"
+        "63a12855a5c266efeb9388df4994b85a8b4f1bd3bc",
+        "1d35d027cd5a569e25c5768c48ed0c2b127c0f99cb4e52ea094fe689",
+        "2258184ef9f0fa698735379972ce9adf034af76017668bfcdab978de",
+        "866fb8e505dea6c909c2c9143ec869d1bac2282cf12366130ff2146c" },
+    { NID_secp224r1, NID_sha224,
+        "c223c8009018321b987a615c3414d2bb15954933569ca989de32d6bf11107bc47a330ab6"
+        "d88d9b50d106cf5777d1b736b14bc48deda1bc573a9a7dd42cd061860645306dce7a5ba8"
+        "c60f135a6a21999421ce8c4670fe7287a7e9ea3aa1e0fa82721f33e6e823957fe86e2283"
+        "c89ef92b13cd0333c4bb70865ae1919bf538ea34",
+        "29c204b2954e1406a015020f9d6b3d7c00658298feb2d17440b2c1a4",
+        "040e0fc15e775a75d45f872e5021b554cc0579da19125e1a49299c7630cb64fe462d025a"
+        "e2a1394746bdbf8251f7ca5a1d6bb13e0edf6b7b09",
+        "39547c10bb947d69f6c3af701f2528e011a1e80a6d04cc5a37466c02",
+        "86622c376d326cdf679bcabf8eb034bf49f0c188f3fc3afd0006325d",
+        "26613d3b33c70e635d7a998f254a5b15d2a3642bf321e8cff08f1e84" },
+    { NID_secp224r1, NID_sha224,
+        "1c27273d95182c74c100d85b5c08f4b26874c2abc87f127f304aedbf52ef6540eba16dd6"
+        "64ae1e9e30ea1e66ff9cc9ab5a80b5bcbd19dde88a29ff10b50a6abd73388e8071306c68"
+        "d0c9f6caa26b7e68de29312be959b9f4a5481f5a2ad2070a396ed3de21096541cf58c4a1"
+        "3308e08867565bf2df9d649357a83cdcf18d2cd9",
+        "8986a97b24be042a1547642f19678de4e281a68f1e794e343dabb131",
+        "042c070e68e8478341938f3d5026a1fe01e778cdffbebbdd7a4cd29209cde21c9c7c6590"
+        "ba300715a7adac278385a5175b6b4ea749c4b6a681",
+        "509712f9c0f3370f6a09154159975945f0107dd1cee7327c68eaa90b",
+        "57afda5139b180de96373c3d649700682e37efd56ae182335f081013",
+        "eb6cd58650cfb26dfdf21de32fa17464a6efc46830eedc16977342e6" },
+    { NID_secp224r1, NID_sha224,
+        "069ae374971627f6b8503f3aa63ab52bcf4f3fcae65b98cdbbf917a5b08a10dc76005671"
+        "4db279806a8d43485320e6fee0f1e0562e077ee270ace8d3c478d79bcdff9cf8b92fdea6"
+        "8421d4a276f8e62ae379387ae06b60af9eb3c40bd7a768aeffccdc8a08bc78ca2eca1806"
+        "1058043a0e441209c5c594842838a4d9d778a053",
+        "d9aa95e14cb34980cfddadddfa92bde1310acaff249f73ff5b09a974",
+        "043a0d4b8e5fad1ea1abb8d3fb742cd45cd0b76d136e5bbb33206ad120c90ac83276b2fa"
+        "3757b0f226cd7360a313bc96fd8329c76a7306cc7d",
+        "1f1739af68a3cee7c5f09e9e09d6485d9cd64cc4085bc2bc89795aaf",
+        "09bbdd003532d025d7c3204c00747cd52ecdfbc7ce3dde8ffbea23e1",
+        "1e745e80948779a5cc8dc5cb193beebb550ec9c2647f4948bf58ba7d" },
+    { NID_secp224r1, NID_sha224,
+        "d0d5ae3e33600aa21c1606caec449eee678c87cb593594be1fbb048cc7cfd076e5cc7132"
+        "ebe290c4c014e7a517a0d5972759acfa1438d9d2e5d236d19ac92136f6252b7e5bea7588"
+        "dcba6522b6b18128f003ecab5cb4908832fb5a375cf820f8f0e9ee870653a73dc2282f2d"
+        "45622a2f0e85cba05c567baf1b9862b79a4b244e",
+        "380fb6154ad3d2e755a17df1f047f84712d4ec9e47d34d4054ea29a8",
+        "044772c27cca3348b1801ae87b01cb564c8cf9b81c23cc74468a907927de9d253935b096"
+        "17a1655c42d385bf48504e06fa386f5fa533a21dcb",
+        "14dbdffa326ba2f3d64f79ff966d9ee6c1aba0d51e9a8e59f5686dc1",
+        "ff6d52a09ca4c3b82da0440864d6717e1be0b50b6dcf5e1d74c0ff56",
+        "09490be77bc834c1efaa23410dcbf800e6fae40d62a737214c5a4418" },
+    { NID_secp224r1, NID_sha224,
+        "79b7375ae7a4f2e4adad8765d14c1540cd9979db38076c157c1837c760ca6febbb18fd42"
+        "152335929b735e1a08041bd38d315cd4c6b7dd2729de8752f531f07fe4ddc4f1899debc0"
+        "311eef0019170b58e08895b439ddf09fbf0aeb1e2fd35c2ef7ae402308c3637733802601"
+        "dd218fb14c22f57870835b10818369d57d318405",
+        "6b98ec50d6b7f7ebc3a2183ff9388f75e924243827ddded8721186e2",
+        "041f249911b125348e6e0a473479105cc4b8cfb4fa32d897810fc69ffea17db03b9877d1"
+        "b6328329061ea67aec5a38a884362e9e5b7d7642dc",
+        "ab3a41fedc77d1f96f3103cc7dce215bf45054a755cf101735fef503",
+        "70ccc0824542e296d17a79320d422f1edcf9253840dafe4427033f40",
+        "e3823699c355b61ab1894be3371765fae2b720405a7ce5e790ca8c00" },
+    { NID_secp224r1, NID_sha224,
+        "8c7de96e6880d5b6efc19646b9d3d56490775cb3faab342e64db2e388c4bd9e94c4e69a6"
+        "3ccdb7e007a19711e69c06f106b71c983a6d97c4589045666c6ab5ea7b5b6d096ddf6fd3"
+        "5b819f1506a3c37ddd40929504f9f079c8d83820fc8493f97b2298aebe48fdb4ff472b29"
+        "018fc2b1163a22bfbb1de413e8645e871291a9f6",
+        "8dda0ef4170bf73077d685e7709f6f747ced08eb4cde98ef06ab7bd7",
+        "047df67b960ee7a2cb62b22932457360ab1e046c1ec84b91ae65642003c764ca9fc1b0cc"
+        "2233fa57bdcfedaab0131fb7b5f557d6ca57f4afe0",
+        "9ef6ebd178a76402968bc8ec8b257174a04fb5e2d65c1ab34ab039b9",
+        "eef9e8428105704133e0f19636c89e570485e577786df2b09f99602a",
+        "8c01f0162891e4b9536243cb86a6e5c177323cca09777366caf2693c" },
+    { NID_secp224r1, NID_sha224,
+        "c89766374c5a5ccef5823e7a9b54af835ac56afbbb517bd77bfecf3fea876bd0cc9ea486"
+        "e3d685cfe3fb05f25d9c67992cd7863c80a55c7a263249eb3996c4698ad7381131bf3700"
+        "b7b24d7ca281a100cf2b750e7f0f933e662a08d9f9e47d779fb03754bd20931262ff381a"
+        "2fe7d1dc94f4a0520de73fa72020494d3133ecf7",
+        "3dbe18cd88fa49febfcb60f0369a67b2379a466d906ac46a8b8d522b",
+        "04b10150fd797eb870d377f1dbfa197f7d0f0ad29965af573ec13cc42a17b63ccefbe27f"
+        "b2a1139e5757b1082aeaa564f478c23a8f631eed5c",
+        "385803b262ee2ee875838b3a645a745d2e199ae112ef73a25d68d15f",
+        "1d293b697f297af77872582eb7f543dc250ec79ad453300d264a3b70",
+        "517a91b89c4859fcc10834242e710c5f0fed90ac938aa5ccdb7c66de" },
+    { NID_secp224r1, NID_sha224,
+        "30f0e3b502eec5646929d48fd46aa73991d82079c7bd50a38b38ec0bd84167c8cf5ba39b"
+        "ec26999e70208af9b445046cd9d20c82b7629ca1e51bdd00daddbc35f9eb036a15ac5789"
+        "8642d9db09479a38cc80a2e41e380c8a766b2d623de2de798e1eabc02234b89b85d60154"
+        "460c3bf12764f3fbf17fcccc82df516a2fbe4ecf",
+        "c906b667f38c5135ea96c95722c713dbd125d61156a546f49ddaadc6",
+        "043c9b4ef1748a1925578658d3af51995b989ad760790157b25fe0982655648f4ff4edfb"
+        "899e9a13bd8d20f5c24b35dc6a6a4e42ed5983b4a0",
+        "b04d78d8ac40fefadb99f389a06d93f6b5b72198c1be02dbff6195f0",
+        "4bdd3c84647bad93dcaffd1b54eb87fc61a5704b19d7e6d756d11ad0",
+        "fdd81e5dca54158514f44ba2330271eff4c618330328451e2d93b9fb" },
+    { NID_secp224r1, NID_sha224,
+        "6bbb4bf987c8e5069e47c1a541b48b8a3e6d14bfd9ac6dfaa7503b64ab5e1a55f63e91cf"
+        "5c3e703ac27ad88756dd7fb2d73b909fc15302d0592b974d47e72e60ed339a40b34d39a4"
+        "9b69ea4a5d26ce86f3ca00a70f1cd416a6a5722e8f39d1f0e966981803d6f46dac34e4c7"
+        "640204cd0d9f1e53fc3acf30096cd00fa80b3ae9",
+        "3456745fbd51eac9b8095cd687b112f93d1b58352dbe02c66bb9b0cc",
+        "04f0acdfbc75a748a4a0ac55281754b5c4a364b7d61c5390b334daae1086587a6768f235"
+        "bf523fbfc6e062c7401ac2b0242cfe4e5fb34f4057",
+        "854b20c61bcdf7a89959dbf0985880bb14b628f01c65ef4f6446f1c1",
+        "a2601fbb9fe89f39814735febb349143baa934170ffb91c6448a7823",
+        "bf90f9305616020a0e34ef30803fc15fa97dffc0948452bbf6cb5f66" },
+    { NID_secp224r1, NID_sha224,
+        "05b8f8e56214d4217323f2066f974f638f0b83689fc4ed1201848230efdc1fbca8f70359"
+        "cecc921050141d3b02c2f17aa306fc2ce5fc06e7d0f4be162fcd985a0b687b4ba09b681c"
+        "b52ffe890bf5bb4a104cb2e770c04df433013605eb8c72a09902f4246d6c22b8c191ef1b"
+        "0bece10d5ce2744fc7345307dd1b41b6eff0ca89",
+        "2c522af64baaca7b7a08044312f5e265ec6e09b2272f462cc705e4c3",
+        "045fad3c047074b5de1960247d0cc216b4e3fb7f3b9cd960575c8479fce4fc9c7f05ff0b"
+        "040eb171fdd2a1dfe2572c564c2003a08c3179a422",
+        "9267763383f8db55eed5b1ca8f4937dc2e0ca6175066dc3d4a4586af",
+        "422e2e9fe535eb62f11f5f8ce87cf2e9ec65e61c06737cf6a0019ae6",
+        "116cfcf0965b7bc63aecade71d189d7e98a0434b124f2afbe3ccf0a9" },
+    { NID_secp224r1, NID_sha224,
+        "e5c979f0832242b143077bce6ef146a53bb4c53abfc033473c59f3c4095a68b7a504b609"
+        "f2ab163b5f88f374f0f3bff8762278b1f1c37323b9ed448e3de33e6443796a9ecaa466aa"
+        "75175375418186c352018a57ce874e44ae72401d5c0f401b5a51804724c10653fded9066"
+        "e8994d36a137fdeb9364601daeef09fd174dde4a",
+        "3eff7d07edda14e8beba397accfee060dbe2a41587a703bbe0a0b912",
+        "046dd84f4d66f362844e41a7913c40b4aad5fa9ba56bb44c2d2ed9efac15f65ebcdf2fd9"
+        "f8035385a330bdabec0f1cd9cc7bc31d2fadbe7cda",
+        "7bb48839d7717bab1fdde89bf4f7b4509d1c2c12510925e13655dead",
+        "127051d85326049115f307af2bc426f6c2d08f4774a0b496fb6982b1",
+        "6857e84418c1d1179333b4e5307e92abade0b74f7521ad78044bf597" },
+    { NID_secp224r1, NID_sha256,
+        "2b49de971bb0f705a3fb5914eb7638d72884a6c3550667dbfdf301adf26bde02f387fd42"
+        "6a31be6c9ff8bfe8690c8113c88576427f1466508458349fc86036afcfb66448b947707e"
+        "791e71f558b2bf4e7e7507773aaf4e9af51eda95cbce0a0f752b216f8a54a045d47801ff"
+        "410ee411a1b66a516f278327df2462fb5619470e",
+        "888fc992893bdd8aa02c80768832605d020b81ae0b25474154ec89aa",
+        "044c741e4d20103670b7161ae72271082155838418084335338ac38fa4db7919151ac285"
+        "87b72bad7ab180ec8e95ab9e2c8d81d9b9d7e2e383",
+        "06f7a56007825433c4c61153df1a135eee2f38ec687b492ed40d9c90",
+        "0909c9b9cae8d2790e29db6afdb45c04f5b072c4c20410c7dc9b6772",
+        "298f4fcae1fe271da1e0345d11d07a1fca43f58af4c113b909eedea0" },
+    { NID_secp224r1, NID_sha256,
+        "1fa7201d96ad4d190415f2656d1387fa886afc38e5cd18b8c60da367acf32c627d2c9ea1"
+        "9ef3f030e559fc2a21695cdbb65ddf6ba36a70af0d3fa292a32de31da6acc6108ab2be8b"
+        "d37843338f0c37c2d62648d3d49013edeb9e179dadf78bf885f95e712fcdfcc8a172e47c"
+        "09ab159f3a00ed7b930f628c3c48257e92fc7407",
+        "5b5a3e186e7d5b9b0fbdfc74a05e0a3d85dc4be4c87269190c839972",
+        "04897089f4ef05b943eeac06589f0e09ccc571a6add3eb1610a2fc830f62ba3f6b3e6f0f"
+        "062058b93e6f25b6041246c5be13584a41cae7e244",
+        "5b6f7eca2bcc5899fce41b8169d48cd57cf0c4a1b66a30a150072676",
+        "f12c9985d454ffbc899ebbbb6cf43e3debcac7f19029f8f2f35cce31",
+        "12fcb848adbd8b1b4c72b2b54a04d936e4a5f480ae2a3ea2e3c1baae" },
+    { NID_secp224r1, NID_sha256,
+        "74715fe10748a5b98b138f390f7ca9629c584c5d6ad268fc455c8de2e800b73fa1ea9aae"
+        "e85de58baa2ce9ce68d822fc31842c6b153baef3a12bf6b4541f74af65430ae931a64c8b"
+        "4950ad1c76b31aea8c229b3623390e233c112586aa5907bbe419841f54f0a7d6d19c003b"
+        "91dc84bbb59b14ec477a1e9d194c137e21c75bbb",
+        "f60b3a4d4e31c7005a3d2d0f91cb096d016a8ddb5ab10ecb2a549170",
+        "0440a4ab1e6a9f84b4dedb81795e6a7124d1cfdfd7ec64c5d4b9e3266683aa32a3c2fc06"
+        "8e62626f2dafce5d7f050e826e5c145cd2d13d1b27",
+        "c31150420dfb38ba8347e29add189ec3e38c14b0c541497fb90bf395",
+        "bf6c6daa89b21211ea2c9f45192d91603378d46b1a5057962dafaf12",
+        "cb6b237950e0f0369323055cd1f643528c7a64616f75b11c4ddd63c7" },
+    { NID_secp224r1, NID_sha256,
+        "d10131982dd1a1d839aba383cd72855bf41061c0cb04dfa1acad3181f240341d744ca600"
+        "2b52f25fb3c63f16d050c4a4ef2c0ebf5f16ce987558f4b9d4a5ad3c6b81b617de00e04b"
+        "a32282d8bf223bfedbb325b741dfdc8f56fa85c65d42f05f6a1330d8cc6664ad32050dd7"
+        "b9e3993f4d6c91e5e12cbd9e82196e009ad22560",
+        "c8fc474d3b1cba5981348de5aef0839e376f9f18e7588f1eed7c8c85",
+        "0466f49457ed15f67ed4042195856f052fe774077f61cebcb9efddc3653a6e3f3423eec7"
+        "308a69eb1b0416d67cc3b84d24f251d7cbdb45c079",
+        "5e5405ae9ab6164bb476c1bb021ec78480e0488736e4f8222920fbd9",
+        "7b7beaf9f696ca1a8051527478c4c075ab45aa4768937886dbf38618",
+        "93d4cf110a37c5a6f15c4e6024822118539e860dee2f60b8c3f462f6" },
+    { NID_secp224r1, NID_sha256,
+        "ef9dbd90ded96ad627a0a987ab90537a3e7acc1fdfa991088e9d999fd726e3ce1e1bd89a"
+        "7df08d8c2bf51085254c89dc67bc21e8a1a93f33a38c18c0ce3880e958ac3e3dbe8aec49"
+        "f981821c4ac6812dd29fab3a9ebe7fbd799fb50f12021b48d1d9abca8842547b3b99befa"
+        "612cc8b4ca5f9412e0352e72ab1344a0ac2913db",
+        "04ef5d2a45341e2ace9af8a6ebd25f6cde45453f55b7a724eb6c21f6",
+        "048d642868e4d0f55ee62a2052e6b806b566d2ac79dbde7939fe72577379505a57cd5690"
+        "4d2523b3e1281e9021167657d38aeb7d42fc8ec849",
+        "ec60ea6f3d6b74d102e5574182566b7e79a69699a307fee70a2d0d22",
+        "2fd7fcbb7832c97ce325301dd338b279a9e28b8933284d49c6eabcf6",
+        "550b2f1efc312805a6ed8f252e692d8ee19eaa5bcd5d0cda63a1a3f0" },
+    { NID_secp224r1, NID_sha256,
+        "4cc91f744ac858d3577e48813219aa3538dd813b186b42d1e6218376f07cc1cc448ddd6b"
+        "37240e98bf953f49cf54d65c12878b33c0bf6eb1c60254f0b6fa974f847e53abc56773ee"
+        "f6f29885dfc619e6a48fc15a667ca94001a0c945b6357a53221b0f4b266181456b0d2d25"
+        "e90708777f1a6f85971c00140c631c1991e0fd06",
+        "35d4bbe77d149812339e85c79483cb270bdac56bbf30b5ef3d1f4d39",
+        "047924b1d7f5920cce98e25094e40f2eb3eb80d70b17e14b3d36c3671c26c5af35f71e61"
+        "858582b7cc2b41790597c53ee514ffdf7a289d108c",
+        "751869c1d0e79eb30aae8fbfb6d97bfa332123fd6b6c72c9cd3c1796",
+        "26bb1b92b0f01e94eba5fa429271371db527ce857abba13bd1103f64",
+        "836aba9c63e1252c2b2d72a21e6a41b82241ebe32647e7f814652bcb" },
+    { NID_secp224r1, NID_sha256,
+        "58f43cc1924de4bc5867664adbc9d26b4f096a43aca47c27c52851b006dc2a658919ef9c"
+        "e5b5ac48372703be15ac51631c2bd84b88f479f113b0569a9a09e230ec1e8e573474c607"
+        "5284d3e57d973829af35325d9e7dab4a5f9b065155bbcaff3642a82ef4c9b9e127d3575c"
+        "050721653da3b087d3fa394192897a5519527d19",
+        "2c291a393281b75264c9b8817af684fa86a1cdc900822f74039dc5d6",
+        "0418cb5826ad60e6696bf07655032a3749f6577ca36da3ccd6e66a137c194e14820fe02d"
+        "784fd1363ff7a30399518309765bd3f4412d646da2",
+        "e2a860416229dfd3f5a5cc92344ca015093a543943a0d8f73bf2b2fd",
+        "00e300c1ef4a8c4ca5da6413856f8981db49de29bdf03f32ffc3ceab",
+        "f250f18a51ba5f63e1584097841099fa6ae4e98ee458c061d1d5aed7" },
+    { NID_secp224r1, NID_sha256,
+        "113a2806b052fde683ee09453098e402204155afb3776fd1cad3a9103421d327eab8f9ec"
+        "0dd050ffcc83f93b34ea707705fabeccfe43ab1a71c95298fd3ec769d99ead1066950eee"
+        "677d225816e0faad19cf69e1b35d16771689e2092cafe16d7c0dd7b0db73fffb8d0f3eae"
+        "d83004dd21e753530ec939c89ba25578fa5f785b",
+        "831ea25dbeda33d272a1382c5def0e83929170ab06a629eed6ee244b",
+        "04076518e393940d42dfd09819409d66966d8c9189c83d554a9cc8a08244d0ceaf4c0f50"
+        "e46bea4a52e30423ce3ada19edd363ac5694c65cb8",
+        "6be6dd9f6a083915ccba54626caf12d246d3aece0a7eda7d8d85599c",
+        "ff1460946e06fb6f5d35e8d2625ca70ffb9b45308e3fabf6ad8351b1",
+        "6029aa3990918e8cb8a388d53b0772e5cdfff49c3405fe0d3a95933a" },
+    { NID_secp224r1, NID_sha256,
+        "64cbfc8f2e2149a31b3e8a80c4a552f6c62aaeb7990b6e0ee55500a9d17be04213406578"
+        "caf315951086dff5c2af3b5ce17d425d185101ef26f86396ba3a129a4f3f8e2dd595f59e"
+        "fb6c0f5c2dcc394569d7268695e9ac7daa84203f1f1895f1f9e4b514a5c9cd23baa63454"
+        "710144fe735ad9b8f42d8c43267aa434a26d7e5f",
+        "70f74c7324ef137318b610ead8ddc5b964e0eed3750b20612fc2e67b",
+        "04279649e2a2918e683520cde3fc98b0ae58a7100e8de35e7c9cc797b6aa4de6be34be61"
+        "f02880139787b9038f4554a8ef1c994b887c2974b5",
+        "8e984864f86f7a2a73f3edda17dbccd13fac8fa4b872814abf223b1b",
+        "3b18736fa11d04e27e2614cda03a63ec11a180f357b0b3192920d09c",
+        "2f0f3dbd570727b14fbb29155538e62c930dd51c4035275c1365dc60" },
+    { NID_secp224r1, NID_sha256,
+        "a10a11c8e30fff118d371daf824f16c08200b83ea059436466a4611ccac93b2dea2de8c1"
+        "006f946196aef7fe9b0c251a391b0340f21797798278b412ff2b53842eec6450728e2bca"
+        "062f8337a2c204b9ea04ff660cd4d4db559f2f11c4d8ef199021339fcc82396f7a93926c"
+        "f5f247e37d8067fe50692de54f102bd5ab51925c",
+        "026be5789886d25039c11d7d58a11a6e1d52cb1d5657561f2165b8a8",
+        "043fa617c50b177da1a2bdb98b780ad21ad1195c4bd24465f6187de3c9e3fd8d8876dfd0"
+        "3a4a4e31a1acad3a08d983826d286c250c4e5620c1",
+        "0128b8e3f50731eb5fcc223517fc0cf6b96cd1d2807eb4524bc46f77",
+        "3a6b633f96f3d0b6d54f7fb29ac33709e4f0dd8fa0e51606ed9765ca",
+        "63e8c119dfa51784decd864f6911f2210a80f8f02d472d88df10d119" },
+    { NID_secp224r1, NID_sha256,
+        "b3f720bf566ffa369259f4361959ae0641d2755ec264a4c4349981df2b02563275b2b9ad"
+        "b5aee47f7a456760a971991ffed6b17809bb9694138d1677fa916123795239353158fc6b"
+        "22d10f20d26f5d2dcd8c56c44373eea5b93067dba2d7c5318dac2e9e8714873cb1b37f58"
+        "c011fd14fa1e535554efe05f468bfc8e11cd8b99",
+        "e79c18d935c2839644762867aa793201f96a3cde080c5968412ce784",
+        "04b7ae1e992b1c7fde1141f40bd913358538ca0f07f62b729f13cea327811252d12120e0"
+        "4805fc171a439d382c43b68a21e1a0bdf5e4ec1da4",
+        "7abedab1d36f4f0959a03d968b27dd5708223b66e0fc48594d827361",
+        "d35047d74e1e7305bb8c1a94e8ae47cb1591c3437a3e185e00afe710",
+        "d9c425c9d5feb776ac8952e6c4eee0ecd68aef2f0e7bff2e49c9185e" },
+    { NID_secp224r1, NID_sha256,
+        "0a398a46df7ccc48d1e7833f8bbc67100f1ef77a62dc78bbc115b2a662f9591fbaaa91ad"
+        "3d788e2fdd1b3164e45293d4f5686c151296901768028ac80ded4bf89c647ad35f0c7c4c"
+        "b318c0c757c1d83c44d850e5fd4677281b3f13b1ee54de79c8c042813f9d3312dcc6111a"
+        "68299cb7e829557d7f3d96e702f65aefc6499415",
+        "0d087f9d1f8ae29c9cf791490efc4a5789a9d52038c4b1d22494ad8c",
+        "04cd95cf8fb1cd21690f40d647f2353672a1076cc6c46bddaad2d0fc56934262f74d9ee0"
+        "f8a2754f64cb7415923d64bf00c94a39b52803f577",
+        "557d0e3995dc6377b3911546dd7aeaeec62a6d8f2af6a274382fc37f",
+        "56df0ea6afdcc232ceb41729eec00cf906b69b6e28423a36d3c92cc5",
+        "f4f70fd948c9a147f55317fdea7b8a84c33e721014552d5800d63edc" },
+    { NID_secp224r1, NID_sha256,
+        "8c33616821a6038b448d8918668977fcf1ef5aa0cf7c341837b39bbcc9bca875a3757f4b"
+        "392630e9995b9bbe4eb66978b877586adaa02f99d2344dae082a7603351d8ffcfca081ab"
+        "403cd0acb90d078dd1d0789c2eb3185c62bff2d9f04cd38e509e3b83c12ed0a5c6808fc4"
+        "2f7ba5b06acdc496c8ad9be648ee6a4505f8560f",
+        "0830aebb6577d3a3be3ba54a4501c987b0e0bb593267b9bbadb66583",
+        "04b88652020e083ccc1c43dc83d1881884dd4c7e3b4e3460b344b1ea6422b69b517f86d7"
+        "c26dc37c0f8feb4bb07fe876149fbcc3334fd2805b",
+        "e4f4a3280574c704c2fde47ca81ec883d27f2c5a961a294db7cda9d2",
+        "b30b8a0079d9a134b5e1618c2ac63e3fbe0e95866b9dbc5f423f2707",
+        "3dc36746610271ef66e0aa52cc2ccadc5c9b08dc769e4dc4f6538c11" },
+    { NID_secp224r1, NID_sha256,
+        "94d56535fd4edfe67a0daa6579f9d53bf6b7b8830ae2aeb62892ff59f18756ddf2811b44"
+        "9c7d20d65d54f8507de4e7c50eaa084830637812aa4b250a4d61ab67845be36e4a41cdc0"
+        "a70f8d6e3a63d4514f0dc197e6486015046a316153d5f3a3a4a0ae1ed7ea5fa55e12e73d"
+        "333333685c02e0eb636234ea7e6d4b76b4b76b5a",
+        "2acc9b97e625263e8e4cd164302c7d1e078bfcdd706111a13ccda5b2",
+        "04ce1a06f82df874dded37cca03b56c0648e4e8917ecd40ee73ee61588ceb6177b8f1ac7"
+        "c5c6e6e1f7737cc3026952ee392badd2cd7af32f9d",
+        "e401fa80f96480d437ed4f61a783888062ec33d530b188fd48016a6d",
+        "28674f447c4742e4087bbccfb522fbad4e18b56031d2ce8f532b078a",
+        "a5a7a13d15b423dd17771f73cea98d89dbffa846cc209b45c0e29b76" },
+    { NID_secp224r1, NID_sha256,
+        "5d8ebdf9eb28b47bdafaa36bf0b66a9eaf99b6c83959da4f2b1151b4f4ecd28fb115a64c"
+        "0cb9491093a7e9b9c53ec423e4c72e7765bb9c818da0e8c428667e44474a71db4867130c"
+        "77c40bfd8544b2d7b9d6464d2b8e6a48482153256a32437c3a747231f51134dd14c70340"
+        "7e31146a6fcde23bededcf16950486e90ca69ac0",
+        "f4e873d4fb944fb52323406f933815092b7672221de4d1c45917f3fc",
+        "040dc2cdddb990341adb1de73f02d87fc3822485a659a15145f4251d5fcf78b2a83c7352"
+        "eda1af2c74e1804ea04b35f76c04e89d90281dc2bb",
+        "5d1476c682a64162fd2fdc82696fc8cab1469a86f707ea2757416e40",
+        "82982b38ed465138df4018d7cfb835edcb591cb57446ca49d163782b",
+        "8ef1d7b326cabee7f7ab95b7b98d3c27a069c0fd95a1599c0ccb422b" },
+    { NID_secp224r1, NID_sha384,
+        "25e4416695f77551fdce276355528ccf1ddc2483821c5d22d751d50111ca2fadc6593b52"
+        "c74f4b5957494f1df25b0b2f86950d0d19229ec6506fee8581d2dd09d48418b146ff16bd"
+        "84a17ca0dc83b1888eb407376da6c8a88fa1e60b8c2a2471dfde4b3996ef673d5bde3d70"
+        "c434dc9f2488e9de16ae657d29e5e59ec922a1ec",
+        "62c572ee0d6f81b27e591d788bfc2f42b5105d2663078dfb58069ebd",
+        "04bd6ba605639b98fa8113a16a3bb004ddfaec901c98a931206165f4a5a3190b10ef39e8"
+        "8abd60b2293b4707512b45c6c5ed5794cc11454427",
+        "0f0bb1e428bcdebf4dc62a5278068efc0f8ce75f89e89b3630f102b2",
+        "aac0ea27e129f544abcc77f110e70bbdd5aa3e425dc39d5e8887025d",
+        "10e5dd06aee6b8419a04aa33d9d5678b0039c3acc3c4b61fe106bfdc" },
+    { NID_secp224r1, NID_sha384,
+        "9164d633a553deccf3cbd2effccf1387fa3177cd28c95d94a7d1a3e159c5e5c027758cc2"
+        "6493301b2f4d141d8d07a5fe5fead987ce5f30abeafcb48c302afc6c2309f0e93d9b6818"
+        "cbb6972d222cb7b01302dfe202ae83b89f53150ae4a0e2b8fc0fd1091f19b4ab2e6ab213"
+        "ab322d04f2c5f57113bfad3c5675227237abf773",
+        "e2f86bf73ba9336fa023343060f038e9ad41e5fe868e9f80574619a3",
+        "04f5d5346f17898ea6bbdfff19c216a8757a5dc37b95315f5481628381ae61fd172ac8b7"
+        "a4f13870a932dece465834cbd4f50bbcfb802c824e",
+        "35724ac043e3b44b73b5a7919cf675190306d26aa67c27c28c873534",
+        "535147c265af138eec50c7fb570bcc8d2e6f675597b0fcc034e536bc",
+        "743812c188a1dddf9fb34b90738f8b2e58760d6cd20ccceb1bb9c516" },
+    { NID_secp224r1, NID_sha384,
+        "019df05929321ecea7ee1de4f412aba1c8d3c24437db04b194a68a0a59dd871be10bd3a4"
+        "be6edf551350ea49fc7155a4d887e1221486291abe77a30633a4c4f7868fe2df24311cba"
+        "0c73804883954460e122387ed414111ff96ff1aebac8b6a6491d8a0d16e48a63bf3d027c"
+        "0f68ee4a4b234d73b412196706af8ea022b4dcef",
+        "b0a203438e2586d7575bc417a4a798e47abc22aa3955b58fc2789f17",
+        "04dc5d217862a1e5b00c95affa9d8b925a72b9beaeb7a86dc397e788d85f05f8e976ae1e"
+        "b1036eca6d683a82850795bf9127dee5f8b2859445",
+        "408e9c8b1f33136d6ddb93ff3a498bc09d4eee99bf69cdd5af0aa5a2",
+        "1b5a964c8b1fc634c6e2b82322499df1d7f0c12a4d2a77723c816ab8",
+        "cf54599a36ca064fae0aa936de5266f87704409d22a15d28c01b7f2a" },
+    { NID_secp224r1, NID_sha384,
+        "5d09d2b1d3fa6e12c10d8b26dc9aabc8dc02bd06e63ff33f8bb91ede4b8694592a69e4ed"
+        "4cdf6820069e2b9c7803658949e877ffe23bf90bcf5ce1409c06c71d86885a94048b05ac"
+        "0ec9db193e489a5a2bfa367caf6aa8ecdb032be366174343f6875d2fe1785e8d77334f5f"
+        "469cec64998e08d3303e5c9a1923b34fdc105d65",
+        "efcfa50fad6fb2065f9a55f28c0c42fa24c809ccb19b6fc6d8ffb085",
+        "0461521a0cfb72be77ba33cb3b8e022743cd9130ff49e97093b71aa178ce0819aedaf6fc"
+        "e639d0e593f8ab0147eeb6058f5f2b448231584ea9",
+        "d1eea821f286eae6ebc1f61b08f9ad4323a3787e94af4c32cd31351b",
+        "b37caaa71103752ac559f9eb4943324409ebfa8b585f684dcaa5c411",
+        "7c28e7619e2944ab4b7be022878c8052ebdf2cae5dff4f976c49686a" },
+    { NID_secp224r1, NID_sha384,
+        "50f6dfc81c6cf189e0a310f992907fe93356cee9dea9a41c7671a8daf3f4cfe0c459ce61"
+        "22c1e731dbf7593419d7114cb73b46956158a982c5d52c72f43f0f822046093c69aeff1f"
+        "7e4cd8af00ba655c5baa2e7b6a400b4be1f6fd51b3e4cfb35a69c80a28c5cafb771b6c2e"
+        "52e0aeef0e3fd045e8d40745f3f8b74fd969f816",
+        "61a17816937987764cdc064dc7b5b4f5b16db1023acdfe25902957dd",
+        "04a7e975c0a8f87c683bb8e31bc160843a7b69c945f4850bd60e1c08c08930a454dcc2aa"
+        "13bed7ea89368b2c9d689d816b2acf4e52585ee9c4",
+        "44b1fdec2629f9075f89c134ac28ff19bfddaa9db02a5d7f853582b4",
+        "b0f5635d8bc9c53a1d54a3ec63de59ed66e6b2358d4ab79755414326",
+        "67c68fe265c7e5aba4232deeafb88545a2aa266fb9f2c2bb3f3ae8d2" },
+    { NID_secp224r1, NID_sha384,
+        "e90129ac6672c85bb7b6b18e9dc199c96c81fd65034b53c77818364d512366fb9cd1bc7c"
+        "82404c451e561fc1ed916c0948f6ac561b33a1ccca093f07684b8c2bafa9e966377bd208"
+        "556018a5bafb9edcecf70498c7140fe9c8cf3ad8b8c3b0aa489df797944465047465415b"
+        "b0e24333235fcdd59a98829a3941eaaf62033e82",
+        "79d5367314ec664aa0f6ca36f95549502a05bf8400bf532d669fab8d",
+        "043191f0237102dac159032ab2dde53cf56c9ec827b5caddfe9e83c02ab496b1bdcca443"
+        "4ac0d0d91ea38ff3bc33f9f54095bfe17796d5a9e2",
+        "da529c52f5cc1f435d873109cd991d6cd7e1631d9ff1dd9521dd5db6",
+        "8e0ac63903f4921755430572c3f08bc272790639bdf1009fe2a9a714",
+        "6278c841a2d0a270791fe54b36c49d426d67907aa4e4f59c8638ad97" },
+    { NID_secp224r1, NID_sha384,
+        "3c9a483c9bee33b601549c592a82e95b4319b1e74b777877f0971bcb4273716b268e8f99"
+        "f876e42f942f4cf08284896bbc1ffbf094ac0956c3cedfc3580cffa8c74fc6db29a371f2"
+        "da2d05edb9185ece741fe0d3fabfe9d5b4d373755ebed13dc6840cfa3283b9ea46ec8b95"
+        "c434f253ae86998182e9cc0e95ee64f323fc74b0",
+        "1320eedad4745121793a7eaf732b0b4498f7cb456cac8cf45a1f66f0",
+        "049fdd99906ab77fd29e9021bde947d05a7a9eb153612269bfb0899bc9681b65b9ac8e4c"
+        "2899bb622dafb253b7bf5a6e38e5f6595f997c291a",
+        "66ed8d8934633f4125f593cf1b1d3745c4db1f15dde60cf46ca1c7f2",
+        "80199485a3a96447b39f7679cd47412a78675ba17dcbd10465dc5b48",
+        "a251fd9f136a3cb0dd0bc80659ae032e4a761ba7045da0034553fb8c" },
+    { NID_secp224r1, NID_sha384,
+        "bfc073fdda63c5fccaa0ca8770c293e8154e7aec56128bbac4fdbd541d602216ebf7ca1e"
+        "02b514d6e396f20683802ba3f334310a9226576926e3bb19ceee27738d13377cbafeb09d"
+        "091043501702a07aa31d1f29d50ddc55adcf16ffd40578e734a4e6cb6535f26ad48e0c62"
+        "ad90e79720000e87d419e92dca3e11f943655b03",
+        "e18821329447d3f65ba7279e96bd4624ffa1b32b90f6e8331b1e876d",
+        "0446c9ed837232c47022df2f1a1578fbe65ac9f2e81c98a74cc22ea31a6fc5e9568ae62b"
+        "31412a0b0b367242e9fd7e518c83aa06a069e1d90d",
+        "a4c1eb402a2fb3af26e0e14a3d2fc8ed3bc1a8b2475270356a79fdd3",
+        "d478b68733d8ad44be46766e7b66af782fbdc7ff7ed0b191176da98a",
+        "5eae9160ccf71fd1d359d89cecce72ef8afaeee2365f6ba828aa450a" },
+    { NID_secp224r1, NID_sha384,
+        "08079955d1a1f33728128c73673ec9f21a6ce138dcab5adc4dc068e6ab57314b9fbd8b01"
+        "3123b2fdafa9524fbdd0288777a233de8055cccfad83046ada6a19f01c47817496667bba"
+        "8fc8b9456fc0e044a562d931dab1adcb66af8b66325bdf28d83ded3e2937958ccd19da54"
+        "0d70ef2c189f55a506c9c0d63406394c5bd3823b",
+        "f73e030d5a696b358986d3efaca121cf71f775f8835a21e6135145d7",
+        "049ca2c6ea87ac8dd3a23a5b4010841a7c8af309038882ae44634bcf55b0a347dbd5ded3"
+        "b8702ac5a457e8b32bd4de06fd315095fa1b7d5fe1",
+        "e3cc786c1288ea567836c51d6d69dd0cab5c015987d936ccc3a4beb3",
+        "f1234da71761b7a0f49e661a419d2a739bdc4544bf87690e3d2f96db",
+        "096d16bf8020c3d3c233894ad8eb81206010e62c6e692a215e088fd4" },
+    { NID_secp224r1, NID_sha384,
+        "23900b768f6cd42b8a8df0dcbc9cb5daec8de36b9d5c619adcc1ba2b649103d5af123746"
+        "cdf19c3fd0665a6fb9338156182aa06181e3c6e37ce56979612af2927440424f89cef43f"
+        "c754854b8a5c43370808cf5f9929cf47712512ce2f8a2a20d2e9f568c2848b27dfbe0914"
+        "2843c83905ffa5da3b15501761b03dbc2c5398b6",
+        "7a0789323f8741c157a1753ae165ecaf8e8b03a60561f8b80cee467c",
+        "04101271a9addd4bd1f19d00bf116c8524f52cefd598e85dc381597acb2f17d14f4d8ccb"
+        "28b216553718152ba7c104646d8eca986dd9ddea39",
+        "d169f04f05b60c625cda864d187938863964dab7bb3b9dfc04b05519",
+        "e4a51be686a764b709da23ab48b1985e153c6ee238d945e743907afc",
+        "118a8f1ffe3cd556ce6345bd1a398dd9cc3729b7fd6d8af9bfd82f40" },
+    { NID_secp224r1, NID_sha384,
+        "1eb28c0bcdd18f73e347f957ece15b4cc83a771b0877e1feaac38e24028fb38ccea8b54e"
+        "e017dc7c3d5a1327bc6f40b294aa65d7dc487f278846cd101ee84202f14b38aa2c275046"
+        "aa2577f65ebaea41cd383e8def2fd0b4444dcf426fa75c4082cd7fa035cdb1e0d34a3c79"
+        "d42130f5b0273eae75bc701dda3aebe7358f41b5",
+        "78e795d0edb11fd9e28dc26b21e751aa89bea0d87932ef11c95c0e18",
+        "049edd544107977134bf6360d43ccabb3c94d627c03963c0a04b439627ece4c61d319a0e"
+        "41f3de7863e7c355bac94395aaa74cdb5f74a87a5b",
+        "36f7c0f76808b826a0a974a1fd6e155e00a73f1d34674a8f88be405a",
+        "3e319444438bc2cc92f323ea842cb402b3c3c2448c89869ef7998edb",
+        "3420cc38f058f41c31e71f4b1ad488f801111c73541de69fcee60695" },
+    { NID_secp224r1, NID_sha384,
+        "efab51855407438fd5c250670366bca3c026ecec4a59394f00d8a4b51746d0c456436665"
+        "6d507e3e13e62fe7abeb976b8859895848dbaecf6582f1898ea06f00d4247702ed9721bd"
+        "375aa83ae4c67c2eaa6e080777ea5ecf2cf787d785389560ac91cf63a52f0373c3185e18"
+        "a3b8a466e21b61a239f1b77624eb1acacc76c4e1",
+        "bee02d8bc5bffb3fd3b4c9d6f686409f02662d10150d1e58d689966a",
+        "048848f964c847fe9dddc774618d4588c9cd56bbe588d7b1fb369c8bfaebbb699fbd0dc0"
+        "8859fe9132285fe20dff3b9d561c0640b6e0717607",
+        "59f1450d857b40e5552a4b8cd4ab0df2f01716635d172c1106840f21",
+        "a206d8398a16a991bc217f77f23c6f648384f254f255a8a876404444",
+        "eb1169cb5b1423dc0bfaffe565ae57f986e00de06405e3e7b605862e" },
+    { NID_secp224r1, NID_sha384,
+        "31c29ca10279a417f0cc9b1382cf54dbfdfc89f2e6ef08c403c11f580cbf8674b141ed1a"
+        "417563282d99a55fc616d836421cde9424815c95e7fb7668bf3f137b29937f14882d74e0"
+        "34b732d78d91af7721aac4950734f5fa5d4b4d35534974f8cab6d2e6dca75ddb57e99148"
+        "c8a59df9fc5bcd723e546e8356f671cf2f65640a",
+        "dc0ddf6e501418bb8eafc5d7ccc143369e2aa441df8fc57d5f94a738",
+        "04063a5d632f4144376e14cfb03ad8ccf1489b613acd184d20dff66545e77727f057b043"
+        "d8a0f7458196b72e92d11f85b0891c6aaa9d915f58",
+        "ff0e5cae2671db7a1b90e22c63e7570bdd27352d45bac31e338debe0",
+        "5bc0b4998481ecbd3b6609184a84ca41d69b08c37138097f559259f8",
+        "0df8828eb1ca85e46405b94e1a2972c34c5e620a54e2f640f04aecc5" },
+    { NID_secp224r1, NID_sha384,
+        "8db476f92e332519c1a0ece5d8deded6efbd2d8e8784eea0a6b4c3b4296c35f5f8de4317"
+        "e5c1627b91fb1973fee86c06e4992aa5a20cb7475c8808ff1da354d07a488dffa7838c6e"
+        "c1e3f99e3acba831f27bee8434eeda3eb36d0c6df3658883cd40068b1bed841310f6eb38"
+        "d4a3d07d85848770ff7933c054cd8b34662660b1",
+        "229d89b2fcf8441ffc95ebb2ac2ef156e25825782044b2b8bd6a3e01",
+        "04de616848d8044a44789ef1ba3a6dd66fe9257ddc57f7534e59a701be26cbf74a6d25e5"
+        "b34b96d30f327abd574cff7f7dbe6686573a7d6c5c",
+        "3b18ca6ec8e8e255ac88f64302745ca0b73ff94b2b2d48be95b4aaee",
+        "fa94fd8b827c06115c1eefd50afc02ce5926ee0e789667783c01c34b",
+        "edf766a66973cfc33e4159966c07321a7f6549c3c60e8586ef41402b" },
+    { NID_secp224r1, NID_sha384,
+        "fcb272c828fe8fd3c6f8de9410c7b6e2b36717c1b0e5e359e9109bd7fc378978aa98182a"
+        "9d99961898ed88999b050d3b64d1457d7a899d6d273b9f4dde2aafa36d76329d62509043"
+        "c338f265fc4c7d938459b7fa3b230a9f6cb632b61489546bb4181a5ad7f0d7369b8caced"
+        "48eb374b075b2b325bc86add0f3b680cd9e80acd",
+        "97d747068147c0393a0bb5c159e2c9f1bd538f6204823294883abe28",
+        "043858a576eef2ce24d01766997fb81b3f3f78b6104cd188610be221d795ffc677ac7bfe"
+        "3e0bb4cffb17355a964c8356a807151b3cba5d1f4e",
+        "c1a2ec1ef16cfd5107c892790daefbed061be78bd8576696b60f64d5",
+        "18c908541843fcdac99b9ff6bb397f3f8094d16b42670216e4eaa2d7",
+        "c107a8a508ff57c5d4f78f86cc37e129c864d1c44ed5e73909613b74" },
+    { NID_secp224r1, NID_sha512,
+        "7522492bdb916a597b8121f3e5c273b1d2800ef8c1db4f7dcbae633b60d7da5193ba53a6"
+        "3d7a377b351897c3b24903ae1cd1994211b259be3e6ae2cbc8970e4957fdf782c7d1bc7a"
+        "91c80c8ef65468d4ef35428f26e2940ae8b0bd9b8074236bf6c00d0ebe83f9ddb2ade0f8"
+        "35138d39f33b59f244e0037c171f1ba7045a96f5",
+        "ba5374541c13597bded6880849184a593d69d3d4f0b1cb4d0919cbd6",
+        "04ac635fe00e8b7a3c8ef5655bdfb7f83e8532e59c0cc0b6534d810ffa1d067aebeba66e"
+        "79b28ecfe59ac6fdf5e1970dc3a84499c9d90cd8e2",
+        "187ed1f45c466cbafcd4b9577fb222408c011225dcccfd20f08b8d89",
+        "f83d54945997584c923c09662c34cf9ad1e987da8bfd9be600e7a098",
+        "4ff2dba9dba992c98a095b1144a539310e1a570e20c88b7d0aa1955c" },
+    { NID_secp224r1, NID_sha512,
+        "61097114ff855c3e34a62d9b853f8982d35f29cfa4a89893badbca7849e5fb437a1a38d6"
+        "451bf0ca5a0d528e352b8e4b57f2ea359a7fc8841d49dd3e570f9b016f14156b0bbc4be8"
+        "22e260bd147ec081454969e11cb0034b7450ef4deb7ed6edb977e2f4ed60121aa095fb0a"
+        "b40240dc329ecc917f5c64b4410612af065ee9dd",
+        "1e27187134d0a63542adf4665fba22f00cfc7b0a1e02effe913ceedc",
+        "04ecaea8ceea55c3bd418fd34a4ff2499e25e66a104eed846bc00c31d23933a356ab1f2d"
+        "abc303ff0a5d076131e77032e6f502336883bf78a7",
+        "34cb597deae9a3b1cada937abcd247161b19b2b336b20e2e42ae01f1",
+        "58177ba46fb291490b39368774accf72736412c1fb5ee0f27b9b1e02",
+        "58337d78b95a080bfcabb5809bee012501b4da84b8ef310a4628f11c" },
+    { NID_secp224r1, NID_sha512,
+        "dd09ae6c982bb1440ca175a87766fefeacc49393ff797c446200662744f37a6e30c5d33b"
+        "a70cbd8f12277fd6cc0704c17478bbab2a3047469e9618e3c340a9c8caaff5ce7c8a4d90"
+        "ecae6a9b84b813419dec14460298e7521c9b7fdb7a2089328005bd51d57f92a1bcbeecd3"
+        "4aa40482b549e006bbf6c4ce66d34a22dda4e0e0",
+        "0905b40e6c29bfcbf55e04266f68f10ca8d3905001d68bb61a27749b",
+        "04d656b73b131aa4c6336a57849ce0d3682b6ab2113d013711e8c297626328335ffc2029"
+        "afbfe2a15cc5636978778c3f9dab84840b05f2e705",
+        "dc82840d147f893497a82f023d7d2cbf0a3a5b2ac6cc1b9b23e504be",
+        "583af080e0ec7c1ba5a491a84889b7b7b11ccfe18927c7c219b11757",
+        "b23700035349df25d839f0973bef78a7515287de6c83707907074fa6" },
+    { NID_secp224r1, NID_sha512,
+        "37a73e2774d3b274db426c89b945696daa96035031f72cea01894b24508c7f81961ec254"
+        "d36ed6a0f448e11cf7950af769dc6cd2c47e52c6caf0ea92c270974f0214b4db436c36a6"
+        "0fb722060a6bb544462a82e1714f5906ec32886f7d59ebf289541c3a00ec1e004892ef2b"
+        "1286a0194f55d083c6ec92c64b8fd1452e1c68ba",
+        "afbaede5d75e4f241dd5b53220f3f5b9c1aa1d5d298e2d43236452dc",
+        "04fe83e59fc8ea8b939355d3258fe53a64d45f63031a0716b7cc416173f151d23060f1c8"
+        "56eb7f1f58be72a7228c3af89e43b56e9695b558c7",
+        "0fbbe7b40136c81a8fb894498d5502157a1cf5a89d0643de92cd38f6",
+        "24f3f457c7b72b7e759d5a8afbf330e31c5d8d2e36f92c0e79c5d87d",
+        "36fd1193def34f12a960740fd79fb38bf2b480726ccad540eb42cdf8" },
+    { NID_secp224r1, NID_sha512,
+        "9dc2046ffdc6804544db964481abe5d2d276a2a9eeec4c7ad40215b1de23561d402db69b"
+        "d0f6eec2254711eea4487c64d9a6b62c3ebaf5ffa8db6e7e3a6e17154d126967a47a853a"
+        "6f8339bdca9be306a13c7f992ded7619b0da59909a49b1e0930360e05b47f18628a36d69"
+        "b2f87f2bfddd6a5d4a72f84dc76dbdd43f3a6a35",
+        "950b07b0c2b7539a21b5135bfede214733f2e009647d38d8b21d760c",
+        "04f43d13bbfcee3b724063b3910fea49fd591b81e86fdb813b1a492d0c6b4c8d6fa5dc66"
+        "1889e3cf5ec64997a78222837885f85d2fe9b684fb",
+        "83e110d0d1e700d2f36543028737d2a2f1474aa3b4b28998a39e4793",
+        "2685265bc878e85d10ab13293dec190881a57c4a467f8fc2170432ea",
+        "80a347bb49036522369339bd6485a967cdda818915d8eb947302fcf9" },
+    { NID_secp224r1, NID_sha512,
+        "d9c6847fce688c5e7525a1098b545cb6c15dcd21a02761fc82fc664372a667390680135f"
+        "91c01a2fa5430c634b1a6d1cd6002d8aa021e7bf5956a7901c2f81bc25d502ba5f55a55f"
+        "30c0323dc68205cbefec0538e68654e7b327ac1743641896c3e740d8f66f400902b304ea"
+        "faa4e0d8cffae140536f0922444cc3216a675697",
+        "015bd9f5dfef393b431c3c7fced24385d861ccb563542574a5d2a9bc",
+        "04e868690641e2cda13b289a6c5d2fb175940396044d9cf27b4f2240af4c78c9abdf2b7f"
+        "c67ed4497001d7bcf1daca1739dc14a661f91d7c40",
+        "e2374350f47c08f3c1359d4edf87e61d1ba4e7dd1540d8d9062efa79",
+        "e12dc088d2bc032bb214c77d0e0fb749fc8e61ebe1ed72996f1084b6",
+        "0ab58aa31e0bba5fbc76855e6549f1036fba0a589aeab978ab01b8fb" },
+    { NID_secp224r1, NID_sha512,
+        "69df8a01b66f04930efd2012ff2243874f256ca8758145d2a9e4ecc84d0dbdbd0dc494ae"
+        "06db0ccbe819918137c90957114558580d6623efbafdd342b38dad9f08708084d32f874f"
+        "ba04782ce26aaab78de2102ad171f8a8f2b30b5bd3d55fdac5fa3acd6f7def7e61c25339"
+        "38572b331ba6d1c02bd74bfdbf7337ade8f4a190",
+        "0a3c259df933247445acffb6d8265b601d597fb9997dc2a1eb4deef4",
+        "04e67f4385a9da54253cc371ee9bc6739ae6385a4b87669c7baf0c460d2bb00b6ddd7b67"
+        "d9ac5653ec04ca8529fbf16f815c04da3c2e58e82d",
+        "8bf5859665b6a23e6b05a311580f60187ba1c4ae89e44877fb48af66",
+        "653675fb993c3fa9e57b32e33029ec230b966e8077c72c1ec90ddefc",
+        "792723bf87e315147cd4303de7f1dfe95cd7658ebb95c38c1a196140" },
+    { NID_secp224r1, NID_sha512,
+        "927524982b8d60777c1105c86fac05f634abf58c73f84fb95d81ba0b86e1e43592c4fcad"
+        "2e395a40fbe7005697d86088e2fb3bb7287eb3f917d4f2dc281f5cbe65d05b4f9623bca8"
+        "49b10a03beca6aa2056a12ebb91cf257ac448c5e9a78f8349a6a29b17c8978bef43a443c"
+        "bb8a149eb23f794844fc41693f2dbb97181444be",
+        "a1c8ef463f9e7e3dd63e677412f87cf9ea4ac9a6a2dae629da5b9916",
+        "04400e5cd4b315ceb309545cd3277acb70bdae2073fda6ad896ea14b27fbe1d2466cd2e1"
+        "16f38248bd5cabaa6cbe6c4a2694d998abd7b0c991",
+        "82f55a25d3ed6e47c22a6eed0fa52ed0818b87d6ea7950281dfefc09",
+        "16305a46a3f6f9e216ef8f6a6f5f0760d064a885657c864e1c1ea035",
+        "58fd97050bfbca6f87e64e1458c4ad80bae26e280356da344ad3b25d" },
+    { NID_secp224r1, NID_sha512,
+        "5f9042283561e7f19a436d01c7ef5a950a6d77ede5629cd7e43c0a5d58e8c5673c37945a"
+        "453291d12938253c71dbe12c8b022ba7276eda6be034ef5ec1ec77dbd1e08f0d7b8e7725"
+        "b7ec671c075e008a20f77f4ab266f97079b0aa6337df59a33b881954084057b21f294dd1"
+        "4bcb0869a4a6f1f597955ec7bf9d19bb3537a66a",
+        "fa511dbf6fef7e5e9c73e4555eb75d435f7884322d9faf5d78cacc0b",
+        "04e8dccd706c31f895f2f261ab979cbab51b8ae28196bcc12a42046380ec246be8e71ea3"
+        "859cb717a59990fe22e4b76858ff49becd70739a01",
+        "a37d665fe4314aa4cd03eb8e6a1f366b43e11fdb419c96b48f787b62",
+        "05e4909bcc172ab4140be291aad4660e375032bce2d762b6269ba764",
+        "e347a1c9d3670690e1d8d1d4cd9579848f442199c10526488da5cebf" },
+    { NID_secp224r1, NID_sha512,
+        "c2ae5573d3bf396523bfb703db8502fd0760cd1be528f6ddbfb95aad399e0b19f3bd9e0f"
+        "abdb05d49e3f893dffec5b627c9c2f7ad5f32e92e4e27a38cb5c28657657377fdfa1b66c"
+        "d7ac3d15c6d49df92d284db99f69744f37dc7cb4e7d52920fdb200a7942623a7057ba82e"
+        "467dcccaa5da416b48510d8364446a6a5e2a5aa8",
+        "a58bd53646400a646f0e4208320dc679a9664d1c6bfb27fdc8eac7ea",
+        "04e22e0dc4ecd96eb0071b72ba4b4988bf784f3fe73cb81bfb93d9ac4fb3e213e518bee1"
+        "367a4fb3703b9008bac9d95a1fc4aa61225fff9f3c",
+        "42c5b6f87d3bb1ed74f5ee8398d8f8c61e9e50ffa7a1da12d39893f9",
+        "5c0e5c6f057de1e99ef5d237a60d7a07fa9a42b120a82f573d9fb7b2",
+        "2fffc0bf550bd2f650fed085a84501cacfa6a1bb984df1f9237eaa59" },
+    { NID_secp224r1, NID_sha512,
+        "03c1a1cd30a039d0dcb22fee2450a7fa79495a0d0f4f43d2de4d75bce003c0334a8860f5"
+        "c164dbd94888a9f751235a3e570d31070e3e1293a7be616af7176600585d36ac01360015"
+        "7d2569d491da4b8a3bf3630c26e0b9925412189f50b0ae6f04c86477932e2ecd8c354610"
+        "6ae1ebc684cc3adb27ed665eddece886adea4ce3",
+        "64bd4452b572cc95510ac2e572f41136299ff17f6e8448f4ffb571d0",
+        "0492521fa25c2e034d127e0921efdb167f0b2ff8b20504487ed87fa264e72c770e37375a"
+        "d7dc2c4e63e5701826f6606f6ffb9461ee61b4e872",
+        "eaf76ee4d7e00d13d8a6d03dffd07ad9a8bb6dc8176c9f93059b1b7f",
+        "cf5058e2a6cf5e61a138b013eb292f38a1b9f07239ae5941dbce8919",
+        "d14198621650d985d270bc997da6e78588fd0ef843b874c66a3de3c3" },
+    { NID_secp224r1, NID_sha512,
+        "888f6d9bc7c86c0079fbfd42d8c08d6958f40f6e570fb0b1f03d2f8f8a63df4fcc87b379"
+        "a222cf835820a999d34996e08961f13b86b075e7fd1c303cd3baa44de42168561589012f"
+        "7e5300da4f8bdf470c07119a5d9f7ba7293568cd7c6a1b7fc1e41cda40bed7d46e5a28af"
+        "67ae2aabfefe67a86a1c601e6f5ee543e09bd7b6",
+        "7f3edb710df9d982f486233d0c176aa88f5a0ee81efa9b8145020294",
+        "04e7611e013e7b43ff5b8b57ad83333bffcc9e469ad23070b5791dc5947784da0a11dbe1"
+        "6208c6e0b6d5029e71fbec4dffc9fa046d3eeb71c9",
+        "94db7ef9a232593091eb9a74f289529c7e0d7fef21f80b3c8556b75e",
+        "a971f45bab10b1d16d7234ca8e4ec987da20d9e867f28aa063296e23",
+        "e38c538d65a7e1a28fd3ec53f015a7e5beb60e9d309f1e3ba4b2c3d2" },
+    { NID_secp224r1, NID_sha512,
+        "48453340f1317769e6ee6e103153714365731163dc18f84e9f2fa4b120f9c5a9645ee2f9"
+        "b66c84c26d95912b422b009b64af96aa418b2427a4209f2e7513ba8e43ec8cf20b34e752"
+        "9b22eb1199545afe9a9f7d9bcb320aec9ee0162f91c0d1dd9674c9c284f25199c5e109f6"
+        "f84d7ed0d269cc6413edb81bc2c83e37d644d8b9",
+        "b569f8296ff1d9cc01fffd9919016e5730c1858bdb7b99527153751a",
+        "04242f34959516a4706172f7dede23110efa314bff22eb320ab88feeff45e3227710900a"
+        "8acfc9bcce728119d042f64ca40876c2b380ee46e0",
+        "ae61523866a8f43e6cdd42ba27a34ed06527e8a5842901a64c393f76",
+        "c2732a4e0815f9f785500e80147e9486994446beccf8a6a352b97585",
+        "6ecaece6487d7920e398f7f951ab7c7aba5832dabf03704106ad1244" },
+    { NID_secp224r1, NID_sha512,
+        "4bdfd3b91d83108409ad765b256e0c9b9937ecf647f8e6f9fc807e2e72af8246178b3fe0"
+        "46b4ea10170450d71a4eec790ecb05f03d7077341de26c4db7eeae24d55c9a9093e837df"
+        "db38168fe8230cb9605825a1282fecd741989bfcdb34678fe077477927f66bd26d003e5d"
+        "da22043341a14dd31841ba483ad5ce2701e0f68e",
+        "41a4dd8eee39232b728516e2f21e66011e7426a6b25986c3ffa237e4",
+        "04c32988171caab178bf50dc7310bc7f604df5a9d19a8e602519c72d8af8985d112ad9de"
+        "05969e5364d943c1cc5cd198359f4c62b19da0e117",
+        "827d4999da81fa920c8492ccc1e2d5cdafed9754cf7382a859952071",
+        "89c61da7422ccd676baec07e2185c12e947a2374eede87847304be6c",
+        "2685379624717ea28422e8d001c090405a130b4ef9f1ac726c3ca502" },
+    { NID_secp224r1, NID_sha512,
+        "e6cdee8558bc1eacc24e82f0624ce8d02cc8d925b4dd3dec3a72f4a4e0fb76076bfa3ef2"
+        "e2c33bdd7c27b322bdc09bbfee8fe46f75dbd7bbd2af09690b7137943efe21706e0a1b6d"
+        "3089540fc58d85ddb55ea836616db573e36c521be008893f40a0a7c349602cc178ea43be"
+        "59d31ec6449e7ff2c5379379f7d7645134df1bc3",
+        "67fa50569257c8cc89ac0325db4902003a62f30b917f53e4035a7e04",
+        "046773a0436a9c42635730413b19aa4166f08c69c0e5002953da42253b555138290b093b"
+        "f2fe79acda9131d920cd1e7ac43fb8775776cd713c",
+        "557cb45fd3a30b3bdbf08c56eabbd4478736024aaa52bf8448096453",
+        "8e92cf7a674aa5f7542dd95c695589a05747431692edd04804299b8f",
+        "af4908b41f8180b71a6ff10fd51f3d143147af6ddddf7534d3284ed9" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "ff624d0ba02c7b6370c1622eec3fa2186ea681d1659e0a845448e777b75a8e77a77bb26e"
+        "5733179d58ef9bc8a4e8b6971aef2539f77ab0963a3415bbd6258339bd1bf55de65db520"
+        "c63f5b8eab3d55debd05e9494212170f5d65b3286b8b668705b1e2b2b5568610617abb51"
+        "d2dd0cb450ef59df4b907da90cfa7b268de8c4c2",
+        "708309a7449e156b0db70e5b52e606c7e094ed676ce8953bf6c14757c826f590",
+        "0429578c7ab6ce0d11493c95d5ea05d299d536801ca9cbd50e9924e43b733b83ab08c804"
+        "9879c6278b2273348474158515accaa38344106ef96803c5a05adc4800",
+        "58f741771620bdc428e91a32d86d230873e9140336fcfb1e122892ee1d501bdc",
+        "4a19274429e40522234b8785dc25fc524f179dcc95ff09b3c9770fc71f54ca0d",
+        "58982b79a65b7320f5b92d13bdaecdd1259e760f0f718ba933fd098f6f75d4b7" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "9155e91fd9155eeed15afd83487ea1a3af04c5998b77c0fe8c43dcc479440a8a9a89efe8"
+        "83d9385cb9edfde10b43bce61fb63669935ad39419cf29ef3a936931733bfc2378e253e7"
+        "3b7ae9a3ec7a6a7932ab10f1e5b94d05160c053988f3bdc9167155d069337d42c9a70566"
+        "19efc031fa5ec7310d29bd28980b1e3559757578",
+        "90c5386100b137a75b0bb495002b28697a451add2f1f22cb65f735e8aaeace98",
+        "044a92396ff7930b1da9a873a479a28a9896af6cc3d39345b949b726dc3cd978b5475abb"
+        "18eaed948879b9c1453e3ef2755dd90f77519ec7b6a30297aad08e4931",
+        "36f853b5c54b1ec61588c9c6137eb56e7a708f09c57513093e4ecf6d739900e5",
+        "38b29558511061cfabdc8e5bb65ac2976d1aa2ba9a5deab8074097b2172bb9ad",
+        "0de2cde610502b6e03c0b23602eafbcd3faf886c81d111d156b7aa550f5bcd51" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "b242a7586a1383368a33c88264889adfa3be45422fbef4a2df4e3c5325a9c7757017e0d5"
+        "cf4bbf4de7f99d189f81f1fd2f0dd645574d1eb0d547eead9375677819297c1abe62526a"
+        "e29fc54cdd11bfe17714f2fbd2d0d0e8d297ff98535980482dd5c1ebdc5a7274aabf1382"
+        "c9f2315ca61391e3943856e4c5e616c2f1f7be0d",
+        "a3a43cece9c1abeff81099fb344d01f7d8df66447b95a667ee368f924bccf870",
+        "045775174deb0248112e069cb86f1546ac7a78bc2127d0cb953bad46384dd6be5ba27020"
+        "952971cc0b0c3abd06e9ca3e141a4943f560564eba31e5288928bc7ce7",
+        "a0d9a7a245bd9b9aa86cecb89341c9de2e4f9b5d095a8150826c7ba7fb3e7df7",
+        "b02a440add66a9ff9c3c0e9acf1be678f6bd48a10cbdec2ad6d186ffe05f3f2a",
+        "a98bea42aec56a1fcecec00a1cc69b01fcbcf5de7ac1b2f2dcc09b6db064f92b" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "b64005da76b24715880af94dba379acc25a047b06066c9bedc8f17b8c74e74f4fc720d9f"
+        "4ef0e2a659e0756931c080587ebdcd0f85e819aea6dacb327a9d96496da53ea21aef3b2e"
+        "793a9c0def5196acec99891f46ead78a85bc7ab644765781d3543da9fbf9fec916dca975"
+        "ef3b4271e50ecc68bf79b2d8935e2b25fc063358",
+        "7bbc8ff13f6f921f21e949b224c16b7176c5984d312b671cf6c2e4841135fc7f",
+        "04f888e913ec6f3cd8b31eb89e4f8aaa8887d30ae5348ed7118696949d5b8cc7c108895d"
+        "09620500d244e5035e262dea3f2867cd8967b226324d5c05220d8b410c",
+        "21c942f3b487accbf7fadc1c4b7a6c7567ce876c195022459fa1ebf6d04ffbaa",
+        "2e6cc883b8acc904ee9691ef4a9f1f5a9e5fbfde847cda3be833f949fb9c7182",
+        "2ac48f7a930912131a8b4e3ab495307817c465d638c2a9ea5ae9e2808806e20a" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "fe6e1ea477640655eaa1f6e3352d4bce53eb3d95424df7f238e93d8531da8f36bc35fa6b"
+        "e4bf5a6a382e06e855139eb617a9cc9376b4dafacbd80876343b12628619d7cbe1bff675"
+        "7e3706111ed53898c0219823adbc044eaf8c6ad449df8f6aab9d444dadb5c3380eec0d91"
+        "694df5fc4b30280d4b87d27e67ae58a1df828963",
+        "daf5ec7a4eebc20d9485796c355b4a65ad254fe19b998d0507e91ea24135f45d",
+        "04137c465085c1b1b8cccbe9fccbe9d0295a331aaf332f3ed2e285d16e574b943bd3e8d5"
+        "a24cd218c19760b0e85b35a8569945aa857cbf0fd6a3ce127581b217b6",
+        "343251dffa56e6a612fec7b078f9c3819eab402a72686b894a47a08fd97e6c23",
+        "775e25a296bd259510ae9375f548997bec8a744900022945281dc8c4d94f2b5b",
+        "d87592ceab773ae103daebbb56a04144aaccb1e14efc1024dc36c0e382df1f70" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "907c0c00dc080a688548957b5b8b1f33ba378de1368023dcad43242411f554eb7d392d3e"
+        "5c1668fad3944ff9634105343d83b8c85d2a988da5f5dc60ee0518327caed6dd5cf4e9bc"
+        "6222deb46d00abde745f9b71d6e7aee6c7fdfc9ed053f2c0b611d4c6863088bd012ea981"
+        "0ee94f8e58905970ebd07353f1f409a371ed03e3",
+        "8729a8396f262dabd991aa404cc1753581cea405f0d19222a0b3f210de8ee3c5",
+        "0482b1f1a7af9b48ca8452613d7032beb0e4f28fe710306aeccc959e4d03662a355e39f3"
+        "3574097b8d32b471a591972496f5d44db344c037d13f06fafc75f016fd",
+        "6de9e21f0b2cacc1762b3558fd44d3cf156b85dbef430dd28d59713bfb9cfa0b",
+        "a754b42720e71925d51fcef76151405a3696cc8f9fc9ca7b46d0b16edd7fb699",
+        "603924780439cc16ac4cf97c2c3065bc95353aa9179d0ab5f0322ca82f851cf2" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "771c4d7bce05610a3e71b272096b57f0d1efcce33a1cb4f714d6ebc0865b2773ec5eedc2"
+        "5fae81dee1d256474dbd9676623614c150916e6ed92ce4430b26037d28fa5252ef6b10c0"
+        "9dc2f7ee5a36a1ea7897b69f389d9f5075e271d92f4eb97b148f3abcb1e5be0b4feb8278"
+        "613d18abf6da60bfe448238aa04d7f11b71f44c5",
+        "f1b62413935fc589ad2280f6892599ad994dae8ca3655ed4f7318cc89b61aa96",
+        "04e0bbfe4016eea93e6f509518cbffc25d492de6ebbf80465a461caa5bdc0181593231ee"
+        "7a119d84fa56e3034d50fea85929aec2eb437abc7646821e1bf805fb50",
+        "7a33eeb9f469afd55de2fb786847a1d3e7797929305c0f90d953b6f143bb8fc6",
+        "96d1c9399948254ea381631fc0f43ea808110506db8aacf081df5535ac5eb8ad",
+        "73bf3691260dddd9997c97313f2a70783eacf8d15bdfb34bb13025cdfae72f70" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "a3b2825235718fc679b942e8ac38fb4f54415a213c65875b5453d18ca012320ddfbbc58b"
+        "991eaebadfc2d1a28d4f0cd82652b12e4d5bfda89eda3be12ac52188e38e8cce32a264a3"
+        "00c0e463631f525ae501348594f980392c76b4a12ddc88e5ca086cb8685d03895919a862"
+        "7725a3e00c4728e2b7c6f6a14fc342b2937fc3dd",
+        "4caaa26f93f009682bbba6db6b265aec17b7ec1542bda458e8550b9e68eed18d",
+        "04e3c58c1c254d11c7e781ad133e4c36dd1b5de362120d336a58e7b68813f3fbee59760d"
+        "b66120afe0d962c81a8e5586588fd19de2f40556371611c73af22c8a68",
+        "c0d37142dc8b0d614fad20c4d35af6eb819e259e513ddeac1e1c273e7e1dc1bb",
+        "25dd8e4086c62a40d2a310e2f90f6af5cb7e677b4dfdb4dc4e99e23ea2f0e6dc",
+        "90ad62c179b0c9d61f521dde1cd762bfd224b5525c39c3706f2549313ddb4f39" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "3e6e2a9bffd729ee5d4807849cd4250021d8184cda723df6ab0e5c939d39237c8e58af9d"
+        "869fe62d3c97b3298a99e891e5e11aa68b11a087573a40a3e83c7965e7910d72f81cad0f"
+        "42accc5c25a4fd3cdd8cee63757bbbfbdae98be2bc867d3bcb1333c4632cb0a55dffeb77"
+        "d8b119c466cd889ec468454fabe6fbee7102deaf",
+        "7af4b150bb7167cb68037f280d0823ce5320c01a92b1b56ee1b88547481b1de9",
+        "04cb3634ec4f0cbb99986be788f889e586026d5a851e80d15382f1bdb1bda2bc7551e4e4"
+        "3bc16fb114896b18198a1aebe6054ba20ed0c0317c1b8776158c0e6bfb",
+        "98edd59fafbcaee5f64e84eb5ed59fff45d14aabada47cee2fa674377173627a",
+        "261a1cdb0fd93c0fb06ea6068b6b03c330a12f621a7eba76682a1d152c0e8d08",
+        "7ca049bad54feee101d6db807635ffb8bdb05a38e445c8c3d65d60df143514c5" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "52e5c308e70329a17c71eaedb66bbee303c8ec48a6f1a2efb235d308563cd58553d434e1"
+        "2f353227a9ea28608ec9c820ed83c95124e7a886f7e832a2de1032e78dc059208f9ec354"
+        "170b2b1cab992b52ac01e6c0e4e1b0112686962edc53ab226dafcc9fc7baed2cd9307160"
+        "e8572edb125935db49289b178f35a8ad23f4f801",
+        "52ad53e849e30bec0e6345c3e9d98ebc808b19496c1ef16d72ab4a00bbb8c634",
+        "047cca1334bfc2a78728c50b370399be3f9690d445aa03c701da643eeb0b0f7fa83f7522"
+        "238668e615405e49b2f63faee58286000a30cdb4b564ac0df99bc8950f",
+        "8650c30712fc253610884fbba4a332a4574d4b7822f7776cab1df8f5fa05442a",
+        "a18194c7ac5829afc408d78dde19542837e7be82706c3941b2d9c5e036bb51e0",
+        "188ead1cdf7c1d21114ff56d0421ffd501ab978ef58337462c0fa736d86299af" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "d3e9e82051d4c84d699453c9ff44c7c09f6523bb92232bcf30bf3c380224249de2964e87"
+        "1d56a364d6955c81ef91d06482a6c7c61bc70f66ef22fad128d15416e7174312619134f9"
+        "68f1009f92cbf99248932efb533ff113fb6d949e21d6b80dfbbe69010c8d1ccb0f3808ea"
+        "309bb0bac1a222168c95b088847e613749b19d04",
+        "80754962a864be1803bc441fa331e126005bfc6d8b09ed38b7e69d9a030a5d27",
+        "040aaeed6dd1ae020d6eefc98ec4241ac93cbd3c8afed05bb28007e7da5727571b2dda1d"
+        "5b7872eb94dfffb456115037ff8d3e72f8ebdd8fcfc42391f96809be69",
+        "738e050aeefe54ecba5be5f93a97bbcb7557d701f9da2d7e88483454b97b55a8",
+        "8cb9f41dfdcb9604e0725ac9b78fc0db916dc071186ee982f6dba3da36f02efa",
+        "5c87fe868fd4282fb114f5d70e9590a10a5d35cedf3ff6402ba5c4344738a32e" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "968951c2c1918436fe19fa2fe2152656a08f9a6b8aa6201920f1b424da98cee71928897f"
+        "f087620cc5c551320b1e75a1e98d7d98a5bd5361c9393759614a6087cc0f7fb01fcb1737"
+        "83eb4c4c23961a8231ac4a07d72e683b0c1bd4c51ef1b031df875e7b8d5a6e0628949f5b"
+        "8f157f43dccaea3b2a4fc11181e6b451e06ceb37",
+        "cfa8c8bd810eb0d73585f36280ecdd296ee098511be8ad5eac68984eca8eb19d",
+        "04c227a2af15dfa8734e11c0c50f77e24e77ed58dd8cccf1b0e9fa06bee1c64766b68659"
+        "2ce3745eb300d2704083db55e1fa8274e4cb7e256889ccc0bb34a60570",
+        "2d6b449bb38b543d6b6d34ff8cb053f5e5b337f949b069b21f421995ebb28823",
+        "5e89d3c9b103c2fa3cb8cebeec23640acda0257d63ffbe2d509bfc49fab1dca6",
+        "d70c5b1eeb29e016af9925798d24e166c23d58fedd2f1a3bbdb1ef78cdbfb63a" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "78048628932e1c1cdd1e70932bd7b76f704ba08d7e7d825d3de763bf1a062315f4af16ec"
+        "cefe0b6ebadccaf403d013f50833ce2c54e24eea8345e25f93b69bb048988d102240225c"
+        "eacf5003e2abdcc90299f4bf2c101585d36ecdd7a155953c674789d070480d1ef47cc785"
+        "8e97a6d87c41c6922a00ea12539f251826e141b4",
+        "b2021e2665ce543b7feadd0cd5a4bd57ffcc5b32deb860b4d736d9880855da3c",
+        "04722e0abad4504b7832a148746153777694714eca220eced2b2156ca64cfed3ddf0351b"
+        "357b3081e859c46cad5328c5afa10546e92bc6c3fd541796ac30397a75",
+        "b15bbce4b382145de7ecd670d947e77555ef7cd1693bd53c694e2b52b04d10e1",
+        "9d086dcd22da165a43091991bede9c1c14515e656633cb759ec2c17f51c35253",
+        "23595ad1cb714559faaecaf946beb9a71e584616030ceaed8a8470f4bf62768f" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "9b0800c443e693067591737fdbcf0966fdfa50872d41d0c189d87cbc34c2771ee5e1255f"
+        "d604f09fcf167fda16437c245d299147299c69046895d22482db29aba37ff57f756716cd"
+        "3d6223077f747c4caffbecc0a7c9dfaaafd9a9817470ded8777e6355838ac54d11b2f0fc"
+        "3f43668ff949cc31de0c2d15af5ef17884e4d66a",
+        "0c9bce6a568ca239395fc3552755575cbcdddb1d89f6f5ab354517a057b17b48",
+        "044814d454495df7103e2da383aba55f7842fd84f1750ee5801ad32c10d0be6c7da0bd03"
+        "9d5097c8f0770477f6b18d247876e88e528bf0453eab515ffab8a9eda3",
+        "d414f1525cdcc41eba1652de017c034ebcc7946cb2efe4713d09f67c85b83153",
+        "84db02c678f9a21208cec8564d145a35ba8c6f26b4eb7e19522e439720dae44c",
+        "537c564da0d2dc5ac4376c5f0ca3b628d01d48df47a83d842c927e4d6db1e16d" },
+    { NID_X9_62_prime256v1, NID_sha224,
+        "fc3b8291c172dae635a6859f525beaf01cf683765d7c86f1a4d768df7cae055f639eccc0"
+        "8d7a0272394d949f82d5e12d69c08e2483e11a1d28a4c61f18193106e12e5de4a9d0b4bf"
+        "341e2acd6b715dc83ae5ff63328f8346f35521ca378b311299947f63ec593a5e32e6bd11"
+        "ec4edb0e75302a9f54d21226d23314729e061016",
+        "1daa385ec7c7f8a09adfcaea42801a4de4c889fb5c6eb4e92bc611d596d68e3f",
+        "04f04e9f2831d9697ae146c7d4552e5f91085cc46778400b75b76f00205252941dbd2671"
+        "48174cd0c2b019cd0a5256e2f3f889d1e597160372b5a1339c8d787f10",
+        "7707db348ee6f60365b43a2a994e9b40ed56fe03c2c31c7e781bc4ffadcba760",
+        "5d95c385eeba0f15db0b80ae151912409128c9c80e554246067b8f6a36d85ea5",
+        "db5d8a1e345f883e4fcb3871276f170b783c1a1e9da6b6615913368a8526f1c3" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "5905238877c77421f73e43ee3da6f2d9e2ccad5fc942dcec0cbd25482935faaf416983fe"
+        "165b1a045ee2bcd2e6dca3bdf46c4310a7461f9a37960ca672d3feb5473e253605fb1ddf"
+        "d28065b53cb5858a8ad28175bf9bd386a5e471ea7a65c17cc934a9d791e91491eb3754d0"
+        "3799790fe2d308d16146d5c9b0d0debd97d79ce8",
+        "519b423d715f8b581f4fa8ee59f4771a5b44c8130b4e3eacca54a56dda72b464",
+        "041ccbe91c075fc7f4f033bfa248db8fccd3565de94bbfb12f3c59ff46c271bf83ce4014"
+        "c68811f9a21a1fdb2c0e6113e06db7ca93b7404e78dc7ccd5ca89a4ca9",
+        "94a1bbb14b906a61a280f245f9e93c7f3b4a6247824f5d33b9670787642a68de",
+        "f3ac8061b514795b8843e3d6629527ed2afd6b1f6a555a7acabb5e6f79c8c2ac",
+        "8bf77819ca05a6b2786c76262bf7371cef97b218e96f175a3ccdda2acc058903" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "c35e2f092553c55772926bdbe87c9796827d17024dbb9233a545366e2e5987dd344deb72"
+        "df987144b8c6c43bc41b654b94cc856e16b96d7a821c8ec039b503e3d86728c494a967d8"
+        "3011a0e090b5d54cd47f4e366c0912bc808fbb2ea96efac88fb3ebec9342738e225f7c7c"
+        "2b011ce375b56621a20642b4d36e060db4524af1",
+        "0f56db78ca460b055c500064824bed999a25aaf48ebb519ac201537b85479813",
+        "04e266ddfdc12668db30d4ca3e8f7749432c416044f2d2b8c10bf3d4012aeffa8abfa864"
+        "04a2e9ffe67d47c587ef7a97a7f456b863b4d02cfc6928973ab5b1cb39",
+        "6d3e71882c3b83b156bb14e0ab184aa9fb728068d3ae9fac421187ae0b2f34c6",
+        "976d3a4e9d23326dc0baa9fa560b7c4e53f42864f508483a6473b6a11079b2db",
+        "1b766e9ceb71ba6c01dcd46e0af462cd4cfa652ae5017d4555b8eeefe36e1932" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "3c054e333a94259c36af09ab5b4ff9beb3492f8d5b4282d16801daccb29f70fe61a0b37f"
+        "fef5c04cd1b70e85b1f549a1c4dc672985e50f43ea037efa9964f096b5f62f7ffdf8d6bf"
+        "b2cc859558f5a393cb949dbd48f269343b5263dcdb9c556eca074f2e98e6d94c2c29a677"
+        "afaf806edf79b15a3fcd46e7067b7669f83188ee",
+        "e283871239837e13b95f789e6e1af63bf61c918c992e62bca040d64cad1fc2ef",
+        "0474ccd8a62fba0e667c50929a53f78c21b8ff0c3c737b0b40b1750b2302b0bde829074e"
+        "21f3a0ef88b9efdf10d06aa4c295cc1671f758ca0e4cd108803d0f2614",
+        "ad5e887eb2b380b8d8280ad6e5ff8a60f4d26243e0124c2f31a297b5d0835de2",
+        "35fb60f5ca0f3ca08542fb3cc641c8263a2cab7a90ee6a5e1583fac2bb6f6bd1",
+        "ee59d81bc9db1055cc0ed97b159d8784af04e98511d0a9a407b99bb292572e96" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "0989122410d522af64ceb07da2c865219046b4c3d9d99b01278c07ff63eaf1039cb787ae"
+        "9e2dd46436cc0415f280c562bebb83a23e639e476a02ec8cff7ea06cd12c86dcc3adefbf"
+        "1a9e9a9b6646c7599ec631b0da9a60debeb9b3e19324977f3b4f36892c8a38671c8e1cc8"
+        "e50fcd50f9e51deaf98272f9266fc702e4e57c30",
+        "a3d2d3b7596f6592ce98b4bfe10d41837f10027a90d7bb75349490018cf72d07",
+        "04322f80371bf6e044bc49391d97c1714ab87f990b949bc178cb7c43b7c22d89e13c15d5"
+        "4a5cc6b9f09de8457e873eb3deb1fceb54b0b295da6050294fae7fd999",
+        "24fc90e1da13f17ef9fe84cc96b9471ed1aaac17e3a4bae33a115df4e5834f18",
+        "d7c562370af617b581c84a2468cc8bd50bb1cbf322de41b7887ce07c0e5884ca",
+        "b46d9f2d8c4bf83546ff178f1d78937c008d64e8ecc5cbb825cb21d94d670d89" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "dc66e39f9bbfd9865318531ffe9207f934fa615a5b285708a5e9c46b7775150e818d7f24"
+        "d2a123df3672fff2094e3fd3df6fbe259e3989dd5edfcccbe7d45e26a775a5c4329a084f"
+        "057c42c13f3248e3fd6f0c76678f890f513c32292dd306eaa84a59abe34b16cb5e38d0e8"
+        "85525d10336ca443e1682aa04a7af832b0eee4e7",
+        "53a0e8a8fe93db01e7ae94e1a9882a102ebd079b3a535827d583626c272d280d",
+        "041bcec4570e1ec2436596b8ded58f60c3b1ebc6a403bc5543040ba829630572448af62a"
+        "4c683f096b28558320737bf83b9959a46ad2521004ef74cf85e67494e1",
+        "5d833e8d24cc7a402d7ee7ec852a3587cddeb48358cea71b0bedb8fabe84e0c4",
+        "18caaf7b663507a8bcd992b836dec9dc5703c080af5e51dfa3a9a7c387182604",
+        "77c68928ac3b88d985fb43fb615fb7ff45c18ba5c81af796c613dfa98352d29c" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "600974e7d8c5508e2c1aab0783ad0d7c4494ab2b4da265c2fe496421c4df238b0be25f25"
+        "659157c8a225fb03953607f7df996acfd402f147e37aee2f1693e3bf1c35eab3ae360a2b"
+        "d91d04622ea47f83d863d2dfecb618e8b8bdc39e17d15d672eee03bb4ce2cc5cf6b217e5"
+        "faf3f336fdd87d972d3a8b8a593ba85955cc9d71",
+        "4af107e8e2194c830ffb712a65511bc9186a133007855b49ab4b3833aefc4a1d",
+        "04a32e50be3dae2c8ba3f5e4bdae14cf7645420d425ead94036c22dd6c4fc59e00d623bf"
+        "641160c289d6742c6257ae6ba574446dd1d0e74db3aaa80900b78d4ae9",
+        "e18f96f84dfa2fd3cdfaec9159d4c338cd54ad314134f0b31e20591fc238d0ab",
+        "8524c5024e2d9a73bde8c72d9129f57873bbad0ed05215a372a84fdbc78f2e68",
+        "d18c2caf3b1072f87064ec5e8953f51301cada03469c640244760328eb5a05cb" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "dfa6cb9b39adda6c74cc8b2a8b53a12c499ab9dee01b4123642b4f11af336a91a5c9ce05"
+        "20eb2395a6190ecbf6169c4cba81941de8e76c9c908eb843b98ce95e0da29c5d43880402"
+        "64e05e07030a577cc5d176387154eabae2af52a83e85c61c7c61da930c9b19e45d7e34c8"
+        "516dc3c238fddd6e450a77455d534c48a152010b",
+        "78dfaa09f1076850b3e206e477494cddcfb822aaa0128475053592c48ebaf4ab",
+        "048bcfe2a721ca6d753968f564ec4315be4857e28bef1908f61a366b1f03c974790f6757"
+        "6a30b8e20d4232d8530b52fb4c89cbc589ede291e499ddd15fe870ab96",
+        "295544dbb2da3da170741c9b2c6551d40af7ed4e891445f11a02b66a5c258a77",
+        "c5a186d72df452015480f7f338970bfe825087f05c0088d95305f87aacc9b254",
+        "84a58f9e9d9e735344b316b1aa1ab5185665b85147dc82d92e969d7bee31ca30" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "51d2547cbff92431174aa7fc7302139519d98071c755ff1c92e4694b58587ea560f72f32"
+        "fc6dd4dee7d22bb7387381d0256e2862d0644cdf2c277c5d740fa089830eb52bf79d1e75"
+        "b8596ecf0ea58a0b9df61e0c9754bfcd62efab6ea1bd216bf181c5593da79f10135a9bc6"
+        "e164f1854bc8859734341aad237ba29a81a3fc8b",
+        "80e692e3eb9fcd8c7d44e7de9f7a5952686407f90025a1d87e52c7096a62618a",
+        "04a88bc8430279c8c0400a77d751f26c0abc93e5de4ad9a4166357952fe041e7672d365a"
+        "1eef25ead579cc9a069b6abc1b16b81c35f18785ce26a10ba6d1381185",
+        "7c80fd66d62cc076cef2d030c17c0a69c99611549cb32c4ff662475adbe84b22",
+        "9d0c6afb6df3bced455b459cc21387e14929392664bb8741a3693a1795ca6902",
+        "d7f9ddd191f1f412869429209ee3814c75c72fa46a9cccf804a2f5cc0b7e739f" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "558c2ac13026402bad4a0a83ebc9468e50f7ffab06d6f981e5db1d082098065bcff6f21a"
+        "7a74558b1e8612914b8b5a0aa28ed5b574c36ac4ea5868432a62bb8ef0695d27c1e3ceaf"
+        "75c7b251c65ddb268696f07c16d2767973d85beb443f211e6445e7fe5d46f0dce70d58a4"
+        "cd9fe70688c035688ea8c6baec65a5fc7e2c93e8",
+        "5e666c0db0214c3b627a8e48541cc84a8b6fd15f300da4dff5d18aec6c55b881",
+        "041bc487570f040dc94196c9befe8ab2b6de77208b1f38bdaae28f9645c4d2bc3aec8160"
+        "2abd8345e71867c8210313737865b8aa186851e1b48eaca140320f5d8f",
+        "2e7625a48874d86c9e467f890aaa7cd6ebdf71c0102bfdcfa24565d6af3fdce9",
+        "2f9e2b4e9f747c657f705bffd124ee178bbc5391c86d056717b140c153570fd9",
+        "f5413bfd85949da8d83de83ab0d19b2986613e224d1901d76919de23ccd03199" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "4d55c99ef6bd54621662c3d110c3cb627c03d6311393b264ab97b90a4b15214a5593ba25"
+        "10a53d63fb34be251facb697c973e11b665cb7920f1684b0031b4dd370cb927ca7168b0b"
+        "f8ad285e05e9e31e34bc24024739fdc10b78586f29eff94412034e3b606ed850ec2c1900"
+        "e8e68151fc4aee5adebb066eb6da4eaa5681378e",
+        "f73f455271c877c4d5334627e37c278f68d143014b0a05aa62f308b2101c5308",
+        "04b8188bd68701fc396dab53125d4d28ea33a91daf6d21485f4770f6ea8c565dde423f05"
+        "8810f277f8fe076f6db56e9285a1bf2c2a1dae145095edd9c04970bc4a",
+        "62f8665fd6e26b3fa069e85281777a9b1f0dfd2c0b9f54a086d0c109ff9fd615",
+        "1cc628533d0004b2b20e7f4baad0b8bb5e0673db159bbccf92491aef61fc9620",
+        "880e0bbf82a8cf818ed46ba03cf0fc6c898e36fca36cc7fdb1d2db7503634430" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "f8248ad47d97c18c984f1f5c10950dc1404713c56b6ea397e01e6dd925e903b4fadfe2c9"
+        "e877169e71ce3c7fe5ce70ee4255d9cdc26f6943bf48687874de64f6cf30a012512e787b"
+        "88059bbf561162bdcc23a3742c835ac144cc14167b1bd6727e940540a9c99f3cbb41fb1d"
+        "cb00d76dda04995847c657f4c19d303eb09eb48a",
+        "b20d705d9bd7c2b8dc60393a5357f632990e599a0975573ac67fd89b49187906",
+        "0451f99d2d52d4a6e734484a018b7ca2f895c2929b6754a3a03224d07ae61166ce4737da"
+        "963c6ef7247fb88d19f9b0c667cac7fe12837fdab88c66f10d3c14cad1",
+        "72b656f6b35b9ccbc712c9f1f3b1a14cbbebaec41c4bca8da18f492a062d6f6f",
+        "9886ae46c1415c3bc959e82b760ad760aab66885a84e620aa339fdf102465c42",
+        "2bf3a80bc04faa35ebecc0f4864ac02d349f6f126e0f988501b8d3075409a26c" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "3b6ee2425940b3d240d35b97b6dcd61ed3423d8e71a0ada35d47b322d17b35ea0472f35e"
+        "dd1d252f87b8b65ef4b716669fc9ac28b00d34a9d66ad118c9d94e7f46d0b4f6c2b2d339"
+        "fd6bcd351241a387cc82609057048c12c4ec3d85c661975c45b300cb96930d89370a327c"
+        "98b67defaa89497aa8ef994c77f1130f752f94a4",
+        "d4234bebfbc821050341a37e1240efe5e33763cbbb2ef76a1c79e24724e5a5e7",
+        "048fb287f0202ad57ae841aea35f29b2e1d53e196d0ddd9aec24813d64c0922fb71f6daf"
+        "f1aa2dd2d6d3741623eecb5e7b612997a1039aab2e5cf2de969cfea573",
+        "d926fe10f1bfd9855610f4f5a3d666b1a149344057e35537373372ead8b1a778",
+        "490efd106be11fc365c7467eb89b8d39e15d65175356775deab211163c2504cb",
+        "644300fc0da4d40fb8c6ead510d14f0bd4e1321a469e9c0a581464c7186b7aa7" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "c5204b81ec0a4df5b7e9fda3dc245f98082ae7f4efe81998dcaa286bd4507ca840a53d21"
+        "b01e904f55e38f78c3757d5a5a4a44b1d5d4e480be3afb5b394a5d2840af42b1b4083d40"
+        "afbfe22d702f370d32dbfd392e128ea4724d66a3701da41ae2f03bb4d91bb946c7969404"
+        "cb544f71eb7a49eb4c4ec55799bda1eb545143a7",
+        "b58f5211dff440626bb56d0ad483193d606cf21f36d9830543327292f4d25d8c",
+        "0468229b48c2fe19d3db034e4c15077eb7471a66031f28a980821873915298ba76303e8e"
+        "e3742a893f78b810991da697083dd8f11128c47651c27a56740a80c24c",
+        "e158bf4a2d19a99149d9cdb879294ccb7aaeae03d75ddd616ef8ae51a6dc1071",
+        "e67a9717ccf96841489d6541f4f6adb12d17b59a6bef847b6183b8fcf16a32eb",
+        "9ae6ba6d637706849a6a9fc388cf0232d85c26ea0d1fe7437adb48de58364333" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "72e81fe221fb402148d8b7ab03549f1180bcc03d41ca59d7653801f0ba853add1f6d29ed"
+        "d7f9abc621b2d548f8dbf8979bd16608d2d8fc3260b4ebc0dd42482481d548c7075711b5"
+        "759649c41f439fad69954956c9326841ea6492956829f9e0dc789f73633b40f6ac77bcae"
+        "6dfc7930cfe89e526d1684365c5b0be2437fdb01",
+        "54c066711cdb061eda07e5275f7e95a9962c6764b84f6f1f3ab5a588e0a2afb1",
+        "040a7dbb8bf50cb605eb2268b081f26d6b08e012f952c4b70a5a1e6e7d46af98bbf26dd7"
+        "d799930062480849962ccf5004edcfd307c044f4e8f667c9baa834eeae",
+        "646fe933e96c3b8f9f507498e907fdd201f08478d0202c752a7c2cfebf4d061a",
+        "b53ce4da1aa7c0dc77a1896ab716b921499aed78df725b1504aba1597ba0c64b",
+        "d7c246dc7ad0e67700c373edcfdd1c0a0495fc954549ad579df6ed1438840851" },
+    { NID_X9_62_prime256v1, NID_sha256,
+        "21188c3edd5de088dacc1076b9e1bcecd79de1003c2414c3866173054dc82dde85169baa"
+        "77993adb20c269f60a5226111828578bcc7c29e6e8d2dae81806152c8ba0c6ada1986a19"
+        "83ebeec1473a73a04795b6319d48662d40881c1723a706f516fe75300f92408aa1dc6ae4"
+        "288d2046f23c1aa2e54b7fb6448a0da922bd7f34",
+        "34fa4682bf6cb5b16783adcd18f0e6879b92185f76d7c920409f904f522db4b1",
+        "04105d22d9c626520faca13e7ced382dcbe93498315f00cc0ac39c4821d0d737376c47f3"
+        "cbbfa97dfcebe16270b8c7d5d3a5900b888c42520d751e8faf3b401ef4",
+        "a6f463ee72c9492bc792fe98163112837aebd07bab7a84aaed05be64db3086f4",
+        "542c40a18140a6266d6f0286e24e9a7bad7650e72ef0e2131e629c076d962663",
+        "4f7f65305e24a6bbb5cff714ba8f5a2cee5bdc89ba8d75dcbf21966ce38eb66f" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "e0b8596b375f3306bbc6e77a0b42f7469d7e83635990e74aa6d713594a3a24498feff500"
+        "6790742d9c2e9b47d714bee932435db747c6e733e3d8de41f2f91311f2e9fd8e02565163"
+        "1ffd84f66732d3473fbd1627e63dc7194048ebec93c95c159b5039ab5e79e42c80b484a9"
+        "43f125de3da1e04e5bf9c16671ad55a1117d3306",
+        "b6faf2c8922235c589c27368a3b3e6e2f42eb6073bf9507f19eed0746c79dced",
+        "04e0e7b99bc62d8dd67883e39ed9fa0657789c5ff556cc1fd8dd1e2a55e9e3f24363fbfd"
+        "0232b95578075c903a4dbf85ad58f8350516e1ec89b0ee1f5e1362da69",
+        "9980b9cdfcef3ab8e219b9827ed6afdd4dbf20bd927e9cd01f15762703487007",
+        "f5087878e212b703578f5c66f434883f3ef414dc23e2e8d8ab6a8d159ed5ad83",
+        "306b4c6c20213707982dffbb30fba99b96e792163dd59dbe606e734328dd7c8a" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "099a0131179fff4c6928e49886d2fdb3a9f239b7dd5fa828a52cbbe3fcfabecfbba3e192"
+        "159b887b5d13aa1e14e6a07ccbb21f6ad8b7e88fee6bea9b86dea40ffb962f38554056fb"
+        "7c5bb486418915f7e7e9b9033fe3baaf9a069db98bc02fa8af3d3d1859a11375d6f98aa2"
+        "ce632606d0800dff7f55b40f971a8586ed6b39e9",
+        "118958fd0ff0f0b0ed11d3cf8fa664bc17cdb5fed1f4a8fc52d0b1ae30412181",
+        "04afda82260c9f42122a3f11c6058839488f6d7977f6f2a263c67d06e27ea2c3550ae2bb"
+        "dd2207c590332c5bfeb4c8b5b16622134bd4dc55382ae806435468058b",
+        "23129a99eeda3d99a44a5778a46e8e7568b91c31fb7a8628c5d9820d4bed4a6b",
+        "e446600cab1286ebc3bb332012a2f5cc33b0a5ef7291d5a62a84de5969d77946",
+        "cf89b12793ee1792eb26283b48fa0bdcb45ae6f6ad4b02564bf786bb97057d5a" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "0fbc07ea947c946bea26afa10c51511039b94ddbc4e2e4184ca3559260da24a14522d149"
+        "7ca5e77a5d1a8e86583aeea1f5d4ff9b04a6aa0de79cd88fdb85e01f171143535f2f7c23"
+        "b050289d7e05cebccdd131888572534bae0061bdcc3015206b9270b0d5af9f1da2f9de91"
+        "772d178a632c3261a1e7b3fb255608b3801962f9",
+        "3e647357cd5b754fad0fdb876eaf9b1abd7b60536f383c81ce5745ec80826431",
+        "04702b2c94d039e590dd5c8f9736e753cf5824aacf33ee3de74fe1f5f7c858d5ed0c2889"
+        "4e907af99fb0d18c9e98f19ac80dd77abfa4bebe45055c0857b82a0f4d",
+        "9beab7722f0bcb468e5f234e074170a60225255de494108459abdf603c6e8b35",
+        "c4021fb7185a07096547af1fb06932e37cf8bd90cf593dea48d48614fa237e5e",
+        "7fb45d09e2172bec8d3e330aa06c43fbb5f625525485234e7714b7f6e92ba8f1" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "1e38d750d936d8522e9db1873fb4996bef97f8da3c6674a1223d29263f1234a90b751785"
+        "316444e9ba698bc8ab6cd010638d182c9adad4e334b2bd7529f0ae8e9a52ad60f59804b2"
+        "d780ed52bdd33b0bf5400147c28b4304e5e3434505ae7ce30d4b239e7e6f0ecf058badd5"
+        "b388eddbad64d24d2430dd04b4ddee98f972988f",
+        "76c17c2efc99891f3697ba4d71850e5816a1b65562cc39a13da4b6da9051b0fd",
+        "04d12512e934c367e4c4384dbd010e93416840288a0ba00b299b4e7c0d91578b57ebf883"
+        "5661d9b578f18d14ae4acf9c357c0dc8b7112fc32824a685ed72754e23",
+        "77cffa6f9a73904306f9fcd3f6bbb37f52d71e39931bb4aec28f9b076e436ccf",
+        "4d5a9d95b0f09ce8704b0f457b39059ee606092310df65d3f8ae7a2a424cf232",
+        "7d3c014ca470a73cef1d1da86f2a541148ad542fbccaf9149d1b0b030441a7eb" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "abcf0e0f046b2e0672d1cc6c0a114905627cbbdefdf9752f0c31660aa95f2d0ede72d179"
+        "19a9e9b1add3213164e0c9b5ae3c76f1a2f79d3eeb444e6741521019d8bd5ca391b28c10"
+        "63347f07afcfbb705be4b52261c19ebaf1d6f054a74d86fb5d091fa7f229450996b76f0a"
+        "da5f977b09b58488eebfb5f5e9539a8fd89662ab",
+        "67b9dea6a575b5103999efffce29cca688c781782a41129fdecbce76608174de",
+        "04b4238b029fc0b7d9a5286d8c29b6f3d5a569e9108d44d889cd795c4a385905be8cb3ff"
+        "f8f6cca7187c6a9ad0a2b1d9f40ae01b32a7e8f8c4ca75d71a1fffb309",
+        "d02617f26ede3584f0afcfc89554cdfb2ae188c192092fdde3436335fafe43f1",
+        "26fd9147d0c86440689ff2d75569795650140506970791c90ace0924b44f1586",
+        "00a34b00c20a8099df4b0a757cbef8fea1cb3ea7ced5fbf7e987f70b25ee6d4f" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "dc3d4884c741a4a687593c79fb4e35c5c13c781dca16db561d7e393577f7b62ca41a6e25"
+        "9fc1fb8d0c4e1e062517a0fdf95558b7799f20c211796167953e6372c11829beec64869d"
+        "67bf3ee1f1455dd87acfbdbcc597056e7fb347a17688ad32fda7ccc3572da7677d7255c2"
+        "61738f07763cd45973c728c6e9adbeecadc3d961",
+        "ecf644ea9b6c3a04fdfe2de4fdcb55fdcdfcf738c0b3176575fa91515194b566",
+        "04c3bdc7c795ec94620a2cfff614c13a3390a5e86c892e53a24d3ed22228bc85bf70480f"
+        "c5cf4aacd73e24618b61b5c56c1ced8c4f1b869580ea538e68c7a61ca3",
+        "53291d51f68d9a12d1dcdc58892b2f786cc15f631f16997d2a49bace513557d4",
+        "a860c8b286edf973ce4ce4cf6e70dc9bbf3818c36c023a845677a9963705df8b",
+        "5630f986b1c45e36e127dd7932221c4272a8cc6e255e89f0f0ca4ec3a9f76494" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "719bf1911ae5b5e08f1d97b92a5089c0ab9d6f1c175ac7199086aeeaa416a17e6d6f8486"
+        "c711d386f284f096296689a54d330c8efb0f5fa1c5ba128d3234a3da856c2a94667ef710"
+        "3616a64c913135f4e1dc50e38daa60610f732ad1bedfcc396f87169392520314a6b6b9af"
+        "6793dbabad4599525228cc7c9c32c4d8e097ddf6",
+        "4961485cbc978f8456ec5ac7cfc9f7d9298f99415ecae69c8491b258c029bfee",
+        "048d40bf2299e05d758d421972e81cfb0cce68b949240dc30f315836acc70bef035674e6"
+        "f77f8b46f46cca937d83b128dffbe9bd7e0d3d08aa2cbbfdfb16f72c9a",
+        "373a825b5a74b7b9e02f8d4d876b577b4c3984168d704ba9f95b19c05ed590af",
+        "ef6fb386ad044b63feb7445fa16b10319018e9cea9ef42bca83bdad01992234a",
+        "ac1f42f652eb1786e57be01d847c81f7efa072ba566d4583af4f1551a3f76c65" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "7cf19f4c851e97c5bca11a39f0074c3b7bd3274e7dd75d0447b7b84995dfc9f716bf08c2"
+        "5347f56fcc5e5149cb3f9cfb39d408ace5a5c47e75f7a827fa0bb9921bb5b23a6053dbe1"
+        "fa2bba341ac874d9b1333fc4dc224854949f5c8d8a5fedd02fb26fdfcd3be351aec0fcbe"
+        "f18972956c6ec0effaf057eb4420b6d28e0c008c",
+        "587907e7f215cf0d2cb2c9e6963d45b6e535ed426c828a6ea2fb637cca4c5cbd",
+        "04660da45c413cc9c9526202c16b402af602d30daaa7c342f1e722f15199407f31e6f8cb"
+        "b06913cc718f2d69ba2fb3137f04a41c27c676d1a80fbf30ea3ca46439",
+        "6b8eb7c0d8af9456b95dd70561a0e902863e6dfa1c28d0fd4a0509f1c2a647b2",
+        "08fabf9b57de81875bfa7a4118e3e44cfb38ec6a9b2014940207ba3b1c583038",
+        "a58d199b1deba7350616230d867b2747a3459421811c291836abee715b8f67b4" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "b892ffabb809e98a99b0a79895445fc734fa1b6159f9cddb6d21e510708bdab6076633ac"
+        "30aaef43db566c0d21f4381db46711fe3812c5ce0fb4a40e3d5d8ab24e4e82d3560c6dc7"
+        "c37794ee17d4a144065ef99c8d1c88bc22ad8c4c27d85ad518fa5747ae35276fc104829d"
+        "3f5c72fc2a9ea55a1c3a87007cd133263f79e405",
+        "24b1e5676d1a9d6b645a984141a157c124531feeb92d915110aef474b1e27666",
+        "04b4909a5bdf25f7659f4ef35e4b811429fb2c59126e3dad09100b46aea6ebe7a6760ae0"
+        "15fa6af5c9749c4030fdb5de6e58c6b5b1944829105cf7edf7d3a22cfb",
+        "88794923d8943b5dbcc7a7a76503880ff7da632b0883aaa60a9fcc71bf880fd6",
+        "6ec9a340b77fae3c7827fa96d997e92722ff2a928217b6dd3c628f3d49ae4ce6",
+        "637b54bbcfb7e7d8a41ea317fcfca8ad74eb3bb6b778bc7ef9dec009281976f7" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "8144e37014c95e13231cbd6fa64772771f93b44e37f7b02f592099cc146343edd4f4ec9f"
+        "a1bc68d7f2e9ee78fc370443aa2803ff4ca52ee49a2f4daf2c8181ea7b8475b3a0f608fc"
+        "3279d09e2d057fbe3f2ffbe5133796124781299c6da60cfe7ecea3abc30706ded2cdf18f"
+        "9d788e59f2c31662df3abe01a9b12304fb8d5c8c",
+        "bce49c7b03dcdc72393b0a67cf5aa5df870f5aaa6137ada1edc7862e0981ec67",
+        "04c786d9421d67b72b922cf3def2a25eeb5e73f34543eb50b152e738a98afb0ca5679627"
+        "1e79e2496f9e74b126b1123a3d067de56b5605d6f51c8f6e1d5bb93aba",
+        "89e690d78a5e0d2b8ce9f7fcbf34e2605fd9584760fa7729043397612dd21f94",
+        "07e5054c384839584624e8d730454dc27e673c4a90cbf129d88b91250341854d",
+        "f7e665b88614d0c5cbb3007cafe713763d81831525971f1747d92e4d1ca263a7" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "a3683d120807f0a030feed679785326698c3702f1983eaba1b70ddfa7f0b3188060b845e"
+        "2b67ed57ee68087746710450f7427cb34655d719c0acbc09ac696adb4b22aba1b9322b71"
+        "11076e67053a55f62b501a4bca0ad9d50a868f51aeeb4ef27823236f5267e8da83e14304"
+        "7422ce140d66e05e44dc84fb3a4506b2a5d7caa8",
+        "73188a923bc0b289e81c3db48d826917910f1b957700f8925425c1fb27cabab9",
+        "0486662c014ab666ee770723be8da38c5cd299efc6480fc6f8c3603438fa8397b9f26b33"
+        "07a650c3863faaa5f642f3ba1384c3d3a02edd3d48c657c269609cc3fc",
+        "ec90584ab3b383b590626f36ed4f5110e49888aec7ae7a9c5ea62dd2dc378666",
+        "13e9ad59112fde3af4163eb5c2400b5e9a602576d5869ac1c569075f08c90ff6",
+        "708ac65ff2b0baaccc6dd954e2a93df46016bd04457636de06798fcc17f02be5" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "b1df8051b213fc5f636537e37e212eb20b2423e6467a9c7081336a870e6373fc835899d5"
+        "9e546c0ac668cc81ce4921e88f42e6da2a109a03b4f4e819a17c955b8d099ec6b282fb49"
+        "5258dca13ec779c459da909475519a3477223c06b99afbd77f9922e7cbef844b93f3ce5f"
+        "50db816b2e0d8b1575d2e17a6b8db9111d6da578",
+        "f637d55763fe819541588e0c603f288a693cc66823c6bb7b8e003bd38580ebce",
+        "0474a4620c578601475fc169a9b84be613b4a16cb6acab8fd98848a6ec9fbd133d42b9e3"
+        "5d347c107e63bd55f525f915bcf1e3d2b81d002d3c39acf10fc30645a1",
+        "4d578f5099636234d9c1d566f1215d5d887ae5d47022be17dbf32a11a03f053b",
+        "113a933ebc4d94ce1cef781e4829df0c493b0685d39fb2048ce01b21c398dbba",
+        "3005bd4ec63dbd04ce9ff0c6246ad65d27fcf62edb2b7e461589f9f0e7446ffd" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "0b918ede985b5c491797d0a81446b2933be312f419b212e3aae9ba5914c00af431747a9d"
+        "287a7c7761e9bcbc8a12aaf9d4a76d13dad59fc742f8f218ef66eb67035220a07acc1a35"
+        "7c5b562ecb6b895cf725c4230412fefac72097f2c2b829ed58742d7c327cad0f1058df1b"
+        "ddd4ae9c6d2aba25480424308684cecd6517cdd8",
+        "2e357d51517ff93b821f895932fddded8347f32596b812308e6f1baf7dd8a47f",
+        "047e4078a1d50c669fb2996dd9bacb0c3ac7ede4f58fa0fa1222e78dbf5d1f41860014e4"
+        "6e90cc171fbb83ea34c6b78202ea8137a7d926f0169147ed5ae3d6596f",
+        "be522b0940b9a40d84bf790fe6abdc252877e671f2efa63a33a65a512fc2aa5c",
+        "a26b9ad775ac37ff4c7f042cdc4872c5e4e5e800485f488ddfaaed379f468090",
+        "f88eae2019bebbba62b453b8ee3472ca5c67c267964cffe0cf2d2933c1723dff" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "0fab26fde1a4467ca930dbe513ccc3452b70313cccde2994eead2fde85c8da1db84d7d06"
+        "a024c9e88629d5344224a4eae01b21a2665d5f7f36d5524bf5367d7f8b6a71ea05d413d4"
+        "afde33777f0a3be49c9e6aa29ea447746a9e77ce27232a550b31dd4e7c9bc8913485f2dc"
+        "83a56298051c92461fd46b14cc895c300a4fb874",
+        "77d60cacbbac86ab89009403c97289b5900466856887d3e6112af427f7f0f50b",
+        "04a62032dfdb87e25ed0c70cad20d927c7effeb2638e6c88ddd670f74df16090e544c5ee"
+        "2cf740ded468f5d2efe13daa7c5234645a37c073af35330d03a4fed976",
+        "06c1e692b045f425a21347ecf72833d0242906c7c1094f805566cdcb1256e394",
+        "eb173b51fb0aec318950d097e7fda5c34e529519631c3e2c9b4550b903da417d",
+        "ca2c13574bf1b7d56e9dc18315036a31b8bceddf3e2c2902dcb40f0cc9e31b45" },
+    { NID_X9_62_prime256v1, NID_sha384,
+        "7843f157ef8566722a7d69da67de7599ee65cb3975508f70c612b3289190e364141781e0"
+        "b832f2d9627122742f4b5871ceeafcd09ba5ec90cae6bcc01ae32b50f13f63918dfb5177"
+        "df9797c6273b92d103c3f7a3fc2050d2b196cc872c57b77f9bdb1782d4195445fcc6236d"
+        "d8bd14c8bcbc8223a6739f6a17c9a861e8c821a6",
+        "486854e77962117f49e09378de6c9e3b3522fa752b10b2c810bf48db584d7388",
+        "04760b5624bd64d19c866e54ccd74ad7f98851afdbc3ddeae3ec2c52a135be9cfafeca15"
+        "ce9350877102eee0f5af18b2fed89dc86b7df0bf7bc2963c1638e36fe8",
+        "e4f77c6442eca239b01b0254e11a4182782d96f48ab521cc3d1d68df12b5a41a",
+        "bdff14e4600309c2c77f79a25963a955b5b500a7b2d34cb172cd6acd52905c7b",
+        "b0479cdb3df79923ec36a104a129534c5d59f622be7d613aa04530ad2507d3a2" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "6c8572b6a3a4a9e8e03dbeed99334d41661b8a8417074f335ab1845f6cc852adb8c01d98"
+        "20fcf8e10699cc827a8fbdca2cbd46cc66e4e6b7ba41ec3efa733587e4a30ec552cd8dda"
+        "b8163e148e50f4d090782897f3ddac84a41e1fcfe8c56b6152c0097b0d634b41011471ff"
+        "d004f43eb4aafc038197ec6bae2b4470e869bded",
+        "9dd0d3a3d514c2a8adb162b81e3adfba3299309f7d2018f607bdb15b1a25f499",
+        "046b738de3398b6ac57b9591f9d7985dd4f32137ad3460dcf8970c1390cb9eaf8d83bc61"
+        "e26d2bbbd3cf2d2ab445a2bc4ab5dde41f4a13078fd1d3cc36ab596d57",
+        "9106192170ccb3c64684d48287bb81bbed51b40d503462c900e5c7aae43e380a",
+        "275fa760878b4dc05e9d157fedfd8e9b1c9c861222a712748cb4b7754c043fb1",
+        "699d906bb8435a05345af3b37e3b357786939e94caae257852f0503adb1e0f7e" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "7e3c8fe162d48cc8c5b11b5e5ebc05ebc45c439bdbc0b0902145921b8383037cb0812222"
+        "031598cd1a56fa71694fbd304cc62938233465ec39c6e49f57dfe823983b6923c4e86563"
+        "3949183e6b90e9e06d8275f3907d97967d47b6239fe2847b7d49cf16ba69d2862083cf1b"
+        "ccf7afe34fdc90e21998964107b64abe6b89d126",
+        "f9bf909b7973bf0e3dad0e43dcb2d7fa8bda49dbe6e5357f8f0e2bd119be30e6",
+        "04f2a6674d4e86152a527199bed293fa63acde1b4d8a92b62e552210ba45c38792c72565"
+        "c24f0eee6a094af341ddd8579747b865f91c8ed5b44cda8a19cc93776f",
+        "e547791f7185850f03d0c58419648f65b9d29cdc22ed1de2a64280220cfcafba",
+        "4782903d2aaf8b190dab5cae2223388d2d8bd845b3875d37485c54e1ded1d3d8",
+        "dfb40e406bfa074f0bf832771b2b9f186e2211f0bca279644a0ca8559acf39da" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "d5aa8ac9218ca661cd177756af6fbb5a40a3fecfd4eea6d5872fbb9a2884784aa9b5f0c0"
+        "23a6e0da5cf6364754ee6465b4ee2d0ddc745b02994c98427a213c849537da5a4477b3ab"
+        "fe02648be67f26e80b56a33150490d062aaac137aa47f11cfeddba855bab9e4e028532a5"
+        "63326d927f9e6e3292b1fb248ee90b6f429798db",
+        "724567d21ef682dfc6dc4d46853880cfa86fe6fea0efd51fac456f03c3d36ead",
+        "0470b877b5e365fcf08140b1eca119baba662879f38e059d074a2cb60b03ea5d395f56f9"
+        "4d591df40b9f3b8763ac4b3dbe622c956d5bd0c55658b6f46fa3deb201",
+        "79d6c967ed23c763ece9ca4b026218004c84dc2d4ccc86cf05c5d0f791f6279b",
+        "2ba2ea2d316f8937f184ad3028e364574d20a202e4e7513d7af57ac2456804d1",
+        "64fe94968d18c5967c799e0349041b9e40e6c6c92ebb475e80dd82f51cf07320" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "790b06054afc9c3fc4dfe72df19dd5d68d108cfcfca6212804f6d534fd2fbe489bd8f64b"
+        "f205ce04bcb50124a12ce5238fc3fe7dd76e6fa640206af52549f133d593a1bfd423ab73"
+        "7f3326fa79433cde293236f90d4238f0dd38ed69492ddbd9c3eae583b6325a95dec3166f"
+        "e52b21658293d8c137830ef45297d67813b7a508",
+        "29c5d54d7d1f099d50f949bfce8d6073dae059c5a19cc70834722f18a7199edd",
+        "043088d4f45d274cc5f418c8ecc4cbcf96be87491f420250f8cbc01cdf2503ec47634db4"
+        "8198129237ed068c88ff5809f6211921a6258f548f4b64dd125921b78b",
+        "0508ad7774908b5705895fda5c3b7a3032bf85dab7232bf981177019f3d76460",
+        "acd9f3b63626c5f32103e90e1dd1695907b1904aa9b14f2132caef331321971b",
+        "15c04a8bd6c13ed5e9961814b2f406f064670153e4d5465dcef63c1d9dd52a87" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "6d549aa87afdb8bfa60d22a68e2783b27e8db46041e4df04be0c261c4734b608a96f198d"
+        "1cdb8d082ae48579ec9defcf21fbc72803764a58c31e5323d5452b9fb57c8991d3174914"
+        "0da7ef067b18bf0d7dfbae6eefd0d8064f334bf7e9ec1e028daed4e86e17635ec2e409a3"
+        "ed1238048a45882c5c57501b314e636b9bc81cbe",
+        "0d8095da1abba06b0d349c226511f642dabbf1043ad41baa4e14297afe8a3117",
+        "0475a45758ced45ecf55f755cb56ca2601d794ebeaeb2e6107fe2fc443f580e23c5303d4"
+        "7d5a75ec821d51a2ee7548448208c699eca0cd89810ffc1aa4faf81ead",
+        "5165c54def4026ab648f7768c4f1488bcb183f6db7ffe02c7022a529a116482a",
+        "ebc85fc4176b446b3384ccc62fc2526b45665561a0e7e9404ac376c90e450b59",
+        "8b2c09428e62c5109d17ed0cf8f9fd7c370d018a2a73f701effc9b17d04852c6" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "1906e48b7f889ee3ff7ab0807a7aa88f53f4018808870bfed6372a77330c737647961324"
+        "c2b4d46f6ee8b01190474951a701b048ae86579ff8e3fc889fecf926b17f98958ac7534e"
+        "6e781ca2db2baa380dec766cfb2a3eca2a9d5818967d64dfab84f768d24ec122eebacaab"
+        "0a4dc3a75f37331bb1c43dd8966cc09ec4945bbd",
+        "52fe57da3427b1a75cb816f61c4e8e0e0551b94c01382b1a80837940ed579e61",
+        "042177e20a2092a46667debdcc21e7e45d6da72f124adecbc5ada6a7bcc7b401d5550e46"
+        "8f2626070a080afeeb98edd75a721eb773c8e62149f3e903cf9c4d7b61",
+        "0464fe9674b01ff5bd8be21af3399fad66f90ad30f4e8ee6e2eb9bcccfd5185c",
+        "f8250f073f34034c1cde58f69a85e2f5a030703ebdd4dbfb98d3b3690db7d114",
+        "a9e83e05f1d6e0fef782f186bedf43684c825ac480174d48b0e4d31505e27498" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "7b59fef13daf01afec35dea3276541be681c4916767f34d4e874464d20979863ee77ad0f"
+        "d1635bcdf93e9f62ed69ae52ec90aab5bbf87f8951213747ccec9f38c775c1df1e9d7f73"
+        "5c2ce39b42edb3b0c5086247556cfea539995c5d9689765288ec600848ecf085c01ca738"
+        "bbef11f5d12d4457db988b4add90be00781024ad",
+        "003d91611445919f59bfe3ca71fe0bfdeb0e39a7195e83ac03a37c7eceef0df2",
+        "047b9c592f61aae0555855d0b9ebb6fd00fb6746e8842e2523565c858630b9ba00d35b2e"
+        "168b1875bbc563bea5e8d63c4e38957c774a65e762959a349eaf263ba0",
+        "ef9df291ea27a4b45708f7608723c27d7d56b7df0599a54bc2c2fabbff373b40",
+        "66d057fd39958b0e4932bacd70a1769bbadcb62e4470937b45497a3d4500fabb",
+        "6c853b889e18b5a49ee54b54dd1aaedfdd642e30eba171c5cab677f0df9e7318" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "041a6767a935dc3d8985eb4e608b0cbfebe7f93789d4200bcfe595277ac2b0f402889b58"
+        "0b72def5da778a680fd380c955421f626d52dd9a83ea180187b850e1b72a4ec6dd63235e"
+        "598fd15a9b19f8ce9aec1d23f0bd6ea4d92360d50f951152bc9a01354732ba0cf90aaed3"
+        "3c307c1de8fa3d14f9489151b8377b57c7215f0b",
+        "48f13d393899cd835c4193670ec62f28e4c4903e0bbe5817bf0996831a720bb7",
+        "0482a1a96f4648393c5e42633ecdeb1d8245c78c5ea236b5bab460dedcc8924bc0e8cbf0"
+        "3c34b5154f876de19f3bb6fd43cd2eabf6e7c95467bcfa8c8fc42d76fd",
+        "efed736e627899fea944007eea39a4a63c0c2e26491cd12adb546be3e5c68f7d",
+        "cf7fc24bdaa09ac0cca8497e13298b961380668613c7493954048c06385a7044",
+        "f38b1c8306cf82ab76ee3a772b14416b49993fe11f986e9b0f0593c52ec91525" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "7905a9036e022c78b2c9efd40b77b0a194fbc1d45462779b0b76ad30dc52c564e48a493d"
+        "8249a061e62f26f453ba566538a4d43c64fb9fdbd1f36409316433c6f074e1b47b544a84"
+        "7de25fc67d81ac801ed9f7371a43da39001c90766f943e629d74d0436ba1240c3d7fab99"
+        "0d586a6d6ef1771786722df56448815f2feda48f",
+        "95c99cf9ec26480275f23de419e41bb779590f0eab5cf9095d37dd70cb75e870",
+        "0442c292b0fbcc9f457ae361d940a9d45ad9427431a105a6e5cd90a345fe3507f7313b08"
+        "fd2fa351908b3178051ee782cc62b9954ad95d4119aa564900f8ade70c",
+        "4c08dd0f8b72ae9c674e1e448d4e2afe3a1ee69927fa23bbff3716f0b99553b7",
+        "f2bc35eb1b8488b9e8d4a1dbb200e1abcb855458e1557dc1bf988278a174eb3b",
+        "ed9a2ec043a1d578e8eba6f57217976310e8674385ad2da08d6146c629de1cd9" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "cf25e4642d4f39d15afb7aec79469d82fc9aedb8f89964e79b749a852d931d3743650280"
+        "4e39555f5a3c75dd958fd5291ada647c1a5e38fe7b1048f16f2b711fdd5d39acc0812ca6"
+        "5bd50d7f8119f2fd195ab16633503a78ee9102c1f9c4c22568e0b54bd4fa3f5ff7b49160"
+        "bf23e7e2231b1ebebbdaf0e4a7d4484158a87e07",
+        "e15e835d0e2217bc7c6f05a498f20af1cd56f2f165c23d225eb3360aa2c5cbcf",
+        "0489dd22052ec3ab4840206a62f2270c21e7836d1a9109a3407dd0974c7802b9aee91609"
+        "ba35c7008b080c77a9068d97a14ca77b97299e74945217672b2fd5faf0",
+        "c9f621441c235fc47ec34eef4c08625df1ec74918e1f86075b753f2589f4c60b",
+        "a70d1a2d555d599bfb8c9b1f0d43725341151d17a8d0845fa56f3563703528a7",
+        "4e05c45adf41783e394a5312f86e66871c4be4896948c85966879d5c66d54b37" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "7562c445b35883cc937be6349b4cefc3556a80255d70f09e28c3f393daac19442a7eeced"
+        "cdfbe8f7628e30cd8939537ec56d5c9645d43340eb4e78fc5dd4322de8a07966b262770d"
+        "7ff13a071ff3dce560718e60ed3086b7e0003a6abafe91af90af86733ce8689440bf73d2"
+        "aa0acfe9776036e877599acbabfcb03bb3b50faa",
+        "808c08c0d77423a6feaaffc8f98a2948f17726e67c15eeae4e672edbe388f98c",
+        "04b0c0ad5e1f6001d8e9018ec611b2e3b91923e69fa6c98690ab644d650f640c42610539"
+        "c0b9ed21ac0a2f27527c1a61d9b47cbf033187b1a6ada006eb5b2662ed",
+        "1f6d4a905c761a53d54c362976717d0d7fc94d222bb5489e4830080a1a67535d",
+        "83404dcf8320baf206381800071e6a75160342d19743b4f176960d669dd03d07",
+        "3f75dcf102008b2989f81683ae45e9f1d4b67a6ef6fd5c8af44828af80e1cfb5" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "051c2db8e71e44653ea1cb0afc9e0abdf12658e9e761bfb767c20c7ab4adfcb18ed9b5c3"
+        "72a3ac11d8a43c55f7f99b33355437891686d42362abd71db8b6d84dd694d6982f061217"
+        "8a937aa934b9ac3c0794c39027bdd767841c4370666c80dbc0f8132ca27474f553d266de"
+        "efd7c9dbad6d734f9006bb557567701bb7e6a7c9",
+        "f7c6315f0081acd8f09c7a2c3ec1b7ece20180b0a6365a27dcd8f71b729558f9",
+        "04250f7112d381c1751860045d9bcaf20dbeb25a001431f96ac6f19109362ffebb49fba9"
+        "efe73546135a5a31ab3753e247034741ce839d3d94bd73936c4a17e4aa",
+        "68c299be2c0c6d52d208d5d1a9e0ffa2af19b4833271404e5876e0aa93987866",
+        "7b195e92d2ba95911cda7570607e112d02a1c847ddaa33924734b51f5d81adab",
+        "10d9f206755cef70ab5143ac43f3f8d38aea2644f31d52eaf3b472ee816e11e5" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "4dcb7b62ba31b866fce7c1feedf0be1f67bf611dbc2e2e86f004422f67b3bc1839c6958e"
+        "b1dc3ead137c3d7f88aa97244577a775c8021b1642a8647bba82871e3c15d0749ed343ea"
+        "6cad38f123835d8ef66b0719273105e924e8685b65fd5dc430efbc35b05a6097f17ebc59"
+        "43cdcd9abcba752b7f8f37027409bd6e11cd158f",
+        "f547735a9409386dbff719ce2dae03c50cb437d6b30cc7fa3ea20d9aec17e5a5",
+        "044ca87c5845fb04c2f76ae3273073b0523e356a445e4e95737260eba9e2d021db0f8647"
+        "5d07f82655320fdf2cd8db23b21905b1b1f2f9c48e2df87e24119c4880",
+        "91bd7d97f7ed3253cedefc144771bb8acbbda6eb24f9d752bbe1dd018e1384c7",
+        "008c1755d3df81e64e25270dbaa9396641556df7ffc7ac9add6739c382705397",
+        "77df443c729b039aded5b516b1077fecdd9986402d2c4b01734ba91e055e87fc" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "efe55737771070d5ac79236b04e3fbaf4f2e9bed187d1930680fcf1aba769674bf426310"
+        "f21245006f528779347d28b8aeacd2b1d5e3456dcbf188b2be8c07f19219e4067c1e7c97"
+        "14784285d8bac79a76b56f2e2676ea93994f11eb573af1d03fc8ed1118eafc7f07a82f32"
+        "63c33eb85e497e18f435d4076a774f42d276c323",
+        "26a1aa4b927a516b661986895aff58f40b78cc5d0c767eda7eaa3dbb835b5628",
+        "0428afa3b0f81a0e95ad302f487a9b679fcdef8d3f40236ec4d4dbf4bb0cbba8b2bb4ac1"
+        "be8405cbae8a553fbc28e29e2e689fabe7def26d653a1dafc023f3cecf",
+        "f98e1933c7fad4acbe94d95c1b013e1d6931fa8f67e6dbb677b564ef7c3e56ce",
+        "15a9a5412d6a03edd71b84c121ce9a94cdd166e40da9ce4d79f1afff6a395a53",
+        "86bbc2b6c63bad706ec0b093578e3f064736ec69c0dba59b9e3e7f73762a4dc3" },
+    { NID_X9_62_prime256v1, NID_sha512,
+        "ea95859cc13cccb37198d919803be89c2ee10befdcaf5d5afa09dcc529d333ae1e4ffd3b"
+        "d8ba8642203badd7a80a3f77eeee9402eed365d53f05c1a995c536f8236ba6b6ff889739"
+        "3506660cc8ea82b2163aa6a1855251c87d935e23857fe35b889427b449de7274d7754bde"
+        "ace960b4303c5dd5f745a5cfd580293d6548c832",
+        "6a5ca39aae2d45aa331f18a8598a3f2db32781f7c92efd4f64ee3bbe0c4c4e49",
+        "04c62cc4a39ace01006ad48cf49a3e71466955bbeeca5d318d672695df926b3aa4c85ccf"
+        "517bf2ebd9ad6a9e99254def0d74d1d2fd611e328b4a3988d4f045fe6f",
+        "dac00c462bc85bf39c31b5e01df33e2ec1569e6efcb334bf18f0951992ac6160",
+        "6e7ff8ec7a5c48e0877224a9fa8481283de45fcbee23b4c252b0c622442c26ad",
+        "3dfac320b9c873318117da6bd856000a392b815659e5aa2a6a1852ccb2501df3" },
+    { NID_secp384r1, NID_sha224,
+        "39f0b25d4c15b09a0692b22fbacbb5f8aee184cb75887e2ebe0cd3be5d3815d29f9b587e"
+        "10b3168c939054a89df11068e5c3fac21af742bf4c3e9512f5569674e7ad8b39042bcd73"
+        "e4b7ce3e64fbea1c434ed01ad4ad8b5b569f6a0b9a1144f94097925672e59ba97bc4d33b"
+        "e2fa21b46c3dadbfb3a1f89afa199d4b44189938",
+        "0af857beff08046f23b03c4299eda86490393bde88e4f74348886b200555276b93b37d4f"
+        "6fdec17c0ea581a30c59c727",
+        "0400ea9d109dbaa3900461a9236453952b1f1c2a5aa12f6d500ac774acdff84ab7cb71a0"
+        "f91bcd55aaa57cb8b4fbb3087d0fc0e3116c9e94be583b02b21b1eb168d8facf39552793"
+        "60cbcd86e04ee50751054cfaebcf542538ac113d56ccc38b3e",
+        "e2f0ce83c5bbef3a6eccd1744f893bb52952475d2531a2854a88ff0aa9b12c65961e2e51"
+        "7fb334ef40e0c0d7a31ed5f5",
+        "c36e5f0d3de71411e6e519f63e0f56cff432330a04fefef2993fdb56343e49f2f7db5fca"
+        "b7728acc1e33d4692553c02e",
+        "0d4064399d58cd771ab9420d438757f5936c3808e97081e457bc862a0c905295dca60ee9"
+        "4f4537591c6c7d217453909b" },
+    { NID_secp384r1, NID_sha224,
+        "5a3c80e608ed3ac75a6e45f6e94d374271a6d42b67a481860d5d309cc8b37c79cb61f171"
+        "6dc8aa84cb309ef9d68eb7fc6cf4b42333f316a5c30e74198c8b340926e340c5de47674a"
+        "707293c4aa2a1a2274a602f01c26b156e895499c60b38ef53fc2032e7485c168d73700d6"
+        "fa14232596a0e4997854a0b05d02e351b9d3de96",
+        "047dd5baab23f439ec23b58b7e6ff4cc37813cccb4ea73bb2308e6b82b3170edfe0e131e"
+        "ca50841bf1b686e651c57246",
+        "04de92ff09af2950854a70f2178d2ed50cc7042a7188301a1ea81d9629ad3c29795cb7f0"
+        "d56630a401e4d6e5bed0068d1e6135adbd8624130735e64e65ecbd43770dcc12b28e737b"
+        "5ed033666f34c918eb5589508e4a13b9243374a118a628dd0b",
+        "f3922351d14f1e5af84faab12fe57ded30f185afe5547aeb3061104740ecc42a8df0c27f"
+        "3877b4d855642b78938c4e05",
+        "38e181870cb797c1f4e6598cfd032add1cb60447d33473038d06df73919f844eddd16f40"
+        "f911075f8a4bacc0d924e684",
+        "a58dd1ca18aa31277de66c30c3bb7a14b53705ce6c547ed2cb0e336f63c42809422efffc"
+        "c722d1155f2254330a02b278" },
+    { NID_secp384r1, NID_sha224,
+        "e7d974c5dbd3bfb8a2fb92fdd782f997d04be79e9713944ce13c5eb6f75dfdec811b7ee4"
+        "b3859114b07f263846ae13f795eec8f3cb5b7565baff68e0fdd5e09ba8b176d5a71cb03f"
+        "bc5546e6937fba560acb4db24bd42de1851432b96e8ca4078313cb849bce29c9d8052586"
+        "01d67cd0259e255f3048682e8fdbdda3398c3e31",
+        "54ba9c740535574cebc41ca5dc950629674ee94730353ac521aafd1c342d3f8ac52046ed"
+        "804264e1440d7fe409c45c83",
+        "043db95ded500b2506b627270bac75688dd7d44f47029adeff99397ab4b6329a38dbb278"
+        "a0fc58fe4914e6ae31721a6875049288341553a9ac3dc2d9e18e7a92c43dd3c25ca866f0"
+        "cb4c68127bef6b0e4ba85713d27d45c7d0dc57e5782a6bf733",
+        "04324bd078807f6b18507a93ee60da02031717217ee5ce569750737be912be72da087ac0"
+        "0f50e13fdf7249a6ae33f73e",
+        "b2752aa7abc1e5a29421c9c76620bcc3049ecc97e6bc39fcca126f505a9a1bfae3bde89f"
+        "b751a1aa7b66fa8db3891ef0",
+        "f1c69e6d818ca7ae3a477049b46420cebd910c0a9a477fd1a67a38d628d6edaac123aebf"
+        "ca67c53a5c80fe454dba7a9d" },
+    { NID_secp384r1, NID_sha224,
+        "a670fda4d1d56c70de1d8680328043b2b7029633caf0ee59ffe1421c914bb937133d5a0f"
+        "9214846b2e0b350455a74c4ab434c56de65a17139bb8212bf1c76071a37536fa29348f87"
+        "1dbb26baa92eb93d97e923a6d2ffd9be25cbc33075e494e6db657bd8dc053fe4e17148d8"
+        "cf6e2058164f2b5766750eb01bbe7b361cdb848c",
+        "dabe87bbe95499bac23bc83c8b7307fe04be198f00059e2bf67c9611feaffb2c8f274f6a"
+        "a50eb99c3074186d8067d659",
+        "04c2aa0a695125279705917e02a4f258cade4c3ff9140a071414babf87764f426f7f36ff"
+        "da9d5f3394375d24864235476f8f9808da0ce0227cf453f9e456f557db9752e23b45cce4"
+        "baad5fee3844ddd7e1112bcec01ea9d67c7a76f3535bd0cb58",
+        "65a0305854033cbc6fe3ca139c40ca354d45801ecb59f4a923c251dc6b25d12d452d99b5"
+        "d6711fdb5efac812aa464cc4",
+        "c7fc32997d17ac79baf5789e4503f5f1a8863872bc350a91f12dd3ef8cf78c254e829217"
+        "809e8e00b6b8d4d85be3f1fd",
+        "1422e1838a22496df93486bce1142961dbd8478ae844b8dda54e210afdae0d9e930d587c"
+        "91bb600b0bde7237186d94e6" },
+    { NID_secp384r1, NID_sha224,
+        "7843f918fe2588bcfe756e1f05b491d913523255aa006818be20b676c957f4edb8df863c"
+        "6f5f8c15b3b80c7a2aa277b70d53f210bdfb856337980c406ea140e439dd321471407f37"
+        "4f69877b2d82367eed51e3c82c13948616dcb301d0c31f8f0352f2846abd9e72071f446a"
+        "2f1bd3339a09ae41b84e150fd18f4ba5d3c6bfa0",
+        "df43107a1deb24d02e31d479087bd669e2bc3e50f1f44b7db9484a7143cdca6a3391bddf"
+        "ea72dc940dbce8ec5efbd718",
+        "0476bd4be5d520471162cb5c36f80038301b325f845d9642204a84d78b3e721098932827"
+        "bf872bde0a9f86383953667d29415116b8b878f896a5aa4dbbdc21076f27135d8bbcaaca"
+        "02489ef639d742bd63f377da0c8e8ab36ff19b4a7cc5d4ceb4",
+        "798abad5a30d1805794540057388ee05e2422901c6335f985b9d4447b3ef75524751abfe"
+        "ab6409ad6bf77d4ae3014558",
+        "98744e5c6742fa5118a74a70db4957647a3cc12add4e876b45974a6a8707809f871daadb"
+        "fc0b865e01624f706b65f10c",
+        "9e256e8da8eff5a0c83baaa1ef4f7be798eba9543bf97adb0fff8719f5406ea1207a0cf7"
+        "03d99aa8f02169724b492273" },
+    { NID_secp384r1, NID_sha224,
+        "caa83d5ab07febbd2e0fe2d63738b9b7b8752594bea7aaf50345b3d2f316653a8c9222f2"
+        "b7877b64679e9573e81461a426029e45b8873a575094a1d572e0d32a9f0a9c6bcb9a2868"
+        "543b7d8bbe4a69a09e7321f05f8366cced1b72df526f895b60aed2c39c249653c7839538"
+        "770d4e5f47d3926ec0d168ab6a1af15bf1dca1f7",
+        "ea7a563ba2a7f5ab69973dca1f1a0d1572f0c59817cd3b62ad356c2099e2cdca1c553323"
+        "563f9dfbb333b126d84abc7f",
+        "04cf4717c5f5de668b785f06bdc9845df5a09e4edd83f4669756407cbb60807305c632bc"
+        "49f818f4a84b194369aa07736f7391e4982af8a2218f704f627d01f0508bfc8304992a2d"
+        "598a420bf2eb519f33bd7caf79380793733b3dba0cc5e2b9d8",
+        "7b9606b3df7b2a340dbc68d9754de0734e1faeb5a0135578a97628d948702235c60b20c8"
+        "002c8fcf906783e1b389e754",
+        "0d680010bed373287f9767955b5d2850e150b6713b49e453eb280148e45230c853d99ea2"
+        "d2f8fcbd3ddcba19aeec0af1",
+        "64329763a930ab5452afdb0557fef16ff71810d6343dfc9c6ae18905c3d274db6554cdc6"
+        "9d6078a1ca03284474a94f30" },
+    { NID_secp384r1, NID_sha224,
+        "594603458d6534974aeeafba919c4d0f4cb6843a3af41204bbb88aeb2fca2772d305163d"
+        "ba863da050aabedbaf89db521955d1715de95bbcef979ecdc0c976181ece00355385f8a8"
+        "f8cce127c9eac15ce3e958a3ed686184674ec9a50eb63271606ee7fdcb1323da3c3db8e8"
+        "9cad1fb42139a32d08abcfbf0d4ccfca18c89a86",
+        "4cc70cb35b3ddeb0df53a6bd7bd05f8ff4392a2db7344f2d443761484b3a468a4ee3d1a8"
+        "b27113d57283fd18b05f7829",
+        "0440e1fe21df34bb85a642a0abe819ebd128f7e39b84d8dcc4a9a599b372fb9588da1484"
+        "600ec28b1297bb685f9ae77831f3aa69ada57879fdcbe8df19cefabc308add7d03b17b1f"
+        "ac2f7783fece6a8dfe20bc36f518692677d96e3f730a67a671",
+        "8eda401d98f5688c34d8dbebcd3991c87c0442b0379154eaa2e5287dabe9a9e34cfc1305"
+        "d11ff68781df25d5611b331d",
+        "ff2d772786e159448bba26afd8c3281941a4cb0c56fec6f5cccb4c292c4ee0f7af9bd39b"
+        "be2d88148732585e104fdb30",
+        "07a1d890770daa949a17797dca7af3e8163da981ec330c03d63d1a8312c152be6a718163"
+        "205ffa08da7dcc163ba261f4" },
+    { NID_secp384r1, NID_sha224,
+        "733252d2bd35547838be22656cc7aa67eff0af0b13b428f77267a513c6824c3dbae53306"
+        "8b6817e82665f009560affcfe4b2ddb5b667a644fc1a42d24f24e0947e0dc50fb62c919b"
+        "c1fe4e7ded5e28f2e6d80fcf66a081fb2763526f8def5a81a4ddd38be0b59ee839da1643"
+        "eeeaee7b1927cec12cf3da67c02bc5465151e346",
+        "366d15e4cd7605c71560a418bd0f382fd7cd7ad3090ff1b2dfbed74336166a905e1b760c"
+        "f0bccee7a0e66c5ebfb831f1",
+        "04a143f277ab36a10b645ff6c58241ea67ffdc8acf12d60973068390f06b4d8f4d773b10"
+        "c1ebf6889b1cfa73ebb90f6ca17a17cad29bb507b309021f6f92cb5c10ba535f4a3e317f"
+        "cc68cfd02d3ccd269f465169c73d30ff308f5350d881b08aec",
+        "dbe545f920bc3d704c43d834bab21e40df12ec9e16a619a3e6b3f08760c26aae6e4fd91f"
+        "ad00f745194794b74bb1baee",
+        "cdc39b12bba30da66fe9554713c05880ddc27afa4d2d151440f124c351fb9496dc950465"
+        "16b0921083347d64369846ac",
+        "797d0344e49f9ba87a187c50f664e5015d449e346b1a7bd9427c5be559fc58173651880d"
+        "5aadf053f81899d3368d6181" },
+    { NID_secp384r1, NID_sha224,
+        "5a182bd174feb038dfae3346267156bf663167f713dea1ce936b0edb815cd9b8c8e4d411"
+        "c786ba2494a81442617255db7158b142e720d86c9b56680fb9efd4298cdd69079a281534"
+        "94c42a24251c7ad42ecf7e97eabc1b3997529b2a297cbad2474269b87a0b1e385f2d7f8b"
+        "6eb8d1cd75eaf7e91d1acbecd45d7b2bfbbe3216",
+        "e357d869857a52a06e1ece5593d16407022354780eb9a7cb8575cef327f877d22322c006"
+        "b3c8c11e3d7d296a708bdb6d",
+        "04ce9a2185a68d6094aa5849a6efe78b349946f7380f0c79aa9664246cfcc71a879e90ad"
+        "78a0474f58644c6a208168150e8354fa47673cb3e07d446521345706c5515584b2602f92"
+        "1c3b9c44dded9e2c3f90ce47adb36d7e5f9f95a8c5ad8af397",
+        "1e77367ac4e10924854d135ad2f2507f39e2bafdbce33ff256bcbe9a7329b8d27185218b"
+        "cc3550aafbe3390e84c77292",
+        "df3182d49ad70959fb0c95bc7312750ce70fc87f1a328d39d9b29ac05d31305ce7209d6c"
+        "24d13225d9567b489f7a187b",
+        "d812b05abab0e96de13291e1f0da6479444ed5cd9d959b76f6cb43d394769035364f7c83"
+        "1a104dc7b5bd9b4a8e64df64" },
+    { NID_secp384r1, NID_sha224,
+        "aaa99fb1c71340d785a18f6f668e898c25cf7a0ac31d13c5b388b7233408493a5a109af6"
+        "d07065376b96f4903df7aba2b2af671a18772bb0472490d1240cde28967680727dd4acd4"
+        "7e0308920a75da857a6eeedee5b6586d45dff3d8a680599665aa895c89dd7770b824b7de"
+        "e477ac5e7602d409d3cc553090c970b50811dbab",
+        "745a18db47324a3710b993d115b2834339315e84e7006eafd889fb49bd3cc5a8b50c9052"
+        "6e65e6c53bddd2916d14bead",
+        "04f692578c6f77531210aef55c9e004ce3b66cf268c6900dde31a8bbb76e7562e3fb7624"
+        "2de34ca330d2501030aa11946640965833b28de926c46de060aa25beaeda98f8415a6b1e"
+        "3564aa77870cf4c89bd4fde92c8f5d9bf0eb41721586859d8e",
+        "11b9b36720abcac084efdb44c9f5b7d039e3250cb1e9c47850189ba3cfc1489d858b2a44"
+        "df357772b61d919c7e729c0f",
+        "02b252c99820cf50e6ce060ab55bd4f682276e29b4ae4197417432e6a7bfb8cf0bac89df"
+        "e105456af805d822cee77696",
+        "8e248bbf7d7028d63177e565c9d1666ee5be4d1ffbfffc9c7814b0cd38f74b98f3f2cd59"
+        "be42b9f132bfe5ee789cd96c" },
+    { NID_secp384r1, NID_sha224,
+        "1fadfa8254d3a0b82d137cfdd82043d5dc1fef195d5297b09cc5cfb061f59c933451c0dc"
+        "2a11b4037f34f88dacb803251f8880c4b72585c3c196e6fb23484ca43a191f8e41b9b9a3"
+        "7e2e6fcaab6738c3c62d1c98e1c620bb788b7b51a04f998a510efdba0d3418622fe8ce20"
+        "3b3fcd553b9b4206365a39031797ad11e49745ec",
+        "93f20963ea5011ff4f26481e359309e634195f6289134087bd2e83eee008c962780a6797"
+        "84ee7ac6acda03d663ed27e0",
+        "040edcde3533ea019e18f1a3cd97b7962e8823dda36c389f8f9287549f796d11376392b8"
+        "a01c7a80f127a8f75795e04f5463d7c458dccfc02f5148d755d59f9bbc8e3c3ea3490877"
+        "7928440747795955741296abcdd5386676419ed8049fedb489",
+        "3ad308faf04c42ee5ac69d36bc0aa9a96aacf55ea0f27dac4f52e088f023d206340a6324"
+        "874ffad169ff80624de24c96",
+        "209b72f9aae72c4339813573c3a8408a9e0be641ca863d81d9d14c48d0bf4cd44a1a7985"
+        "cff07b5d68f3f9478475645b",
+        "f6292e599b22a76eda95393cf59f4745fa6c472effd1f781879ad9a4437a98080b0b07da"
+        "dad0c249631c682d2836a977" },
+    { NID_secp384r1, NID_sha224,
+        "9ecb6f5ed3ba666a8536a81ef65012c2cb8b433508798d84708abb06dfb75503886f7838"
+        "4fb8c7a4d2d49ef539d9b8a0b60938c7f07471dda91f258b0d99691b38a8403a2bb3f956"
+        "bdfd09baba16d9b6877097a9b6213481b47a06e139d23ec7abad5668d21f912fdb70d31b"
+        "b9adf9b3ce80e308252fa81a51674f88d02db72b",
+        "f175e6ac42fd48ec9d652c10707c039c67c4cc61d8c45a373dcda6e4ca6c53e947e49c24"
+        "e01b48e7cdf92edfe6d316a1",
+        "04a40c64f595491ce15790a5a87fbe64c1800247b42acd08fe5257700719f46afc8acce0"
+        "e4ede0517a312092d5e3d089cdd565df9dc2f381cc0c5d84f382a43a98018524c0b4708a"
+        "44b3e2817f9719f29fbf9c15803591ed9b4790c5adaba9f433",
+        "812dcaa6d4f9a43ccc553288065d13761581485aa903a500a690ccafbd330ba4818c977b"
+        "98c4bb57f8a182a1afacfae9",
+        "d000f18d3e4c162ff0d16f662e6703e7a6f5bff7a333ed266fa4f44c752415946c34945c"
+        "342c20f739677186b1d80ab3",
+        "ae7f1271c89e0aaa238710d039ea73a69110cc28fcf426f2fe6754b63a59e417fa84f903"
+        "cf7dccb5468b43ff083bbfd5" },
+    { NID_secp384r1, NID_sha224,
+        "e55bfca78d98e68d1b63688db12485578f36c489766f4d0bfaa0088433ff12133aaca455"
+        "805095f2e655940860958b3ead111d9070778ee3bbf3e47e43d9eba8b8d9b1fdf72f793f"
+        "cde2bcaa334f3e35fa2cca531ea7cf27fe9ccba741e38ac26129b2d612bf54a34e0ae6c1"
+        "66c0fef07fcd2b9ac253d7e041a500f7be7b8369",
+        "46c4f0b228b28aaa0ec8cfdf1d0ed3408b7ae049312fb9eaf5f3892720e68684cc8ad298"
+        "44a3dc9d110edf6916dfb8bb",
+        "0413ddec844731b7e30c467451df08ca11d6c581cb64abd8a257671cffd26f5ccad4df7b"
+        "9ee8924047a88a5d2d7567609cd74ca94f590fd1d13e190cc1e03c3da6c3faab15c7dda0"
+        "34af3deefee8aeec3628fa8b1978c54cfcd071baa319a46ec0",
+        "2a9dd520207c40a379cd4036adef9ee60fa8bc8c0d39b3ad91850ac93fd543f218b16885"
+        "81f23481a090b0e4c73792ac",
+        "94e08cca20fe3866f643f53ec65faf3f2b4d80cd9bcc8ff8f88bb28da9eada324fc2d048"
+        "908dd3d08a9e0ebb547731bc",
+        "8e6f82c4d3069b14f4c844b4ca133a9503493265c9f77a7d4775eda67de76798a23dd7ea"
+        "48e0ac3c337dd62bf058319d" },
+    { NID_secp384r1, NID_sha224,
+        "02c6b3c83bd34b288d96409162aa4ff114e9d134bf948046eb5ebcc0c7fe9dfceadda83e"
+        "d69da2fac00c8840f6c702a3fc5e6959d70f7e8af923e99e4937232ae3b841ffefd2e62f"
+        "ab3671a7c94a0281b8ea5bc176add57c5c9b6893fe7f5d48ce7256b96510810c4e046168"
+        "a3c5be9843b84d5268a50349b3444341aa5490dd",
+        "1d7b71ef01d0d33a8513a3aed3cabb83829589c8021087a740ca65b570777089be721a61"
+        "172b874a22a1f81aef3f8bb6",
+        "048d2721370df8f097d5a69396249a315f6037dc7045b3da11eacae6d43036f779d5de70"
+        "53d101768b42cc2b1283a3aaeaa046039ae662141f9954d278183eaa2e03917fe58583e3"
+        "2d344074d59d60caa5b0949c53066525d5cca923e2f201502e",
+        "d1b25ad25581cad17e96f1d302251681fee5b2efbb71c3c15ff035b2145d015d18e0e52d"
+        "c3187ab5a560277b3a3929b0",
+        "d836f52b14c7391744868daa2d5cf27eb9380b9b6176195573d5b04842e9f2fc3794d6cf"
+        "877feafee63d11b05f6a6bee",
+        "8b89042fef2c04d4bd6c9d66a06a010514321d623a5f8d57ba5ac3686872eaabca9e0ba2"
+        "d058ae7028e870acf03ca32d" },
+    { NID_secp384r1, NID_sha224,
+        "94f8bfbb9dd6c9b6193e84c2023a27dea00fd48356909faec2161972439686c146184f80"
+        "686bc09e1a698af7df9dea3d24d9e9fd6d7348a146339c839282cf8984345dc6a51096d7"
+        "4ad238c35233012ad729f262481ec7cd6488f13a6ebac3f3d23438c7ccb5a66e2bf820e9"
+        "2b71c730bb12fd64ea1770d1f892e5b1e14a9e5c",
+        "cf53bdd4c91fe5aa4d82f116bd68153c907963fa3c9d478c9462bb03c79039493a8eaeb8"
+        "55773f2df37e4e551d509dcd",
+        "043a65b26c08102b44838f8c2327ea080daf1e4fc45bb279ce03af13a2f9575f0fff9e2e"
+        "4423a58594ce95d1e710b590cefe9dcbcb2ec6e8bd8ed3af3ff0aa619e900cc8bab3f50f"
+        "6e5f79fac09164fb6a2077cc4f1fed3e9ec6899e91db329bf3",
+        "df31908c9289d1fe25e055df199591b23e266433ab8657cc82cb3bca96b88720e229f8df"
+        "d42d8b78af7db69342430bca",
+        "6770eea9369d6718e60dd0b91aee845ff7ed7e0fcc91675f56d32e5227fd3a4612bbcb15"
+        "56fe94a989b9e3bcc25bb20e",
+        "c43072f706c98126d06a82b04251e3ecb0ba66c4bb6cd7c025919b9cc6019cdc635256d2"
+        "a7fa017b806b1e88649d2c0d" },
+    { NID_secp384r1, NID_sha256,
+        "663b12ebf44b7ed3872b385477381f4b11adeb0aec9e0e2478776313d536376dc8fd5f3c"
+        "715bb6ddf32c01ee1d6f8b731785732c0d8441df636d8145577e7b3138e43c32a61bc124"
+        "2e0e73d62d624cdc924856076bdbbf1ec04ad4420732ef0c53d42479a08235fcfc4db4d8"
+        "69c4eb2828c73928cdc3e3758362d1b770809997",
+        "c602bc74a34592c311a6569661e0832c84f7207274676cc42a89f058162630184b52f0d9"
+        "9b855a7783c987476d7f9e6b",
+        "040400193b21f07cd059826e9453d3e96dd145041c97d49ff6b7047f86bb0b0439e90927"
+        "4cb9c282bfab88674c0765bc75f70d89c52acbc70468d2c5ae75c76d7f69b76af62dcf95"
+        "e99eba5dd11adf8f42ec9a425b0c5ec98e2f234a926b82a147",
+        "c10b5c25c4683d0b7827d0d88697cdc0932496b5299b798c0dd1e7af6cc757ccb30fcd3d"
+        "36ead4a804877e24f3a32443",
+        "b11db00cdaf53286d4483f38cd02785948477ed7ebc2ad609054551da0ab0359978c6185"
+        "1788aa2ec3267946d440e878",
+        "16007873c5b0604ce68112a8fee973e8e2b6e3319c683a762ff5065a076512d7c98b27e7"
+        "4b7887671048ac027df8cbf2" },
+    { NID_secp384r1, NID_sha256,
+        "784d7f4686c01bea32cb6cab8c089fb25c341080d9832e04feac6ea63a341079cbd562a7"
+        "5365c63cf7e63e7e1dddc9e99db75ccee59c5295340c2bba36f457690a8f05c62ab001e3"
+        "d6b333780117d1456a9c8b27d6c2504db9c1428dad8ba797a4419914fcc636f0f14ede3f"
+        "ba49b023b12a77a2176b0b8ff55a895dcaf8dbce",
+        "0287f62a5aa8432ff5e95618ec8f9ccaa870dde99c30b51b7673378efe4ccac598f4bbeb"
+        "bfd8993f9abb747b6ad638b9",
+        "04b36418a3014074ec9bbcc6a4b2367a4fb464cca7ec0a324cb68670d5c5e03e7a7eb07d"
+        "a117c5ea50b665ab62bd02a4914ea299c30e7d76e2c5905babada2d3bb4ee5eb35a5a236"
+        "05cdb0d5133471a53eb9e6758e49105a4eaf29d2267ba84ef2",
+        "935eeab3edeb281fbd4eead0d9c0babd4b10ff18a31663ee9de3bfa9ae8f9d266441158e"
+        "a31c889ded9b3c592da77fd7",
+        "738f9cb28f3b991335ef17b62559255faf75cad370a222464a492e27bb173c7f16b22100"
+        "ada6b695875c7e4b1a28f158",
+        "bc998c30e1491cd5d60dc7d1c38333165efe036b2a78db9b8f0e85ee68619cfba654e11a"
+        "e5ca5ee5a87099c27cf22442" },
+    { NID_secp384r1, NID_sha256,
+        "45e47fccc5bd6801f237cdbeac8f66ebc75f8b71a6da556d2e002352bd85bf269b6bc7c9"
+        "28d7bb1b0422601e4dd80b29d5906f8fcac212fe0eaaf52eda552303259cbcbe532e60ab"
+        "d3d38d786a45e39a2875bce675800a3eaeb9e42983d9fd9031180abd9adccc9ba30c6c19"
+        "8b4202c4dd70f241e969a3c412724b9b595bc28a",
+        "d44d3108873977036c9b97e03f914cba2f5775b68c425d550995574081191da764acc501"
+        "96f6d2508082a150af5cd41f",
+        "04c703835d723c85c643260379d8445b0c816fe9534351921e14a8e147fe140ec7b0c4d7"
+        "04f8dc66a232b2333b28f03deec5d0bb054053fd86c26f147c4966757aa04b00513a02d4"
+        "27b8d06c16055c607955efdc518d338abfe7927c195dc28588",
+        "c80f63e080650c8a21e4f63a62ec909adfb7d877f365d11ee1cb260baf112eb4730c161c"
+        "1d99dba98fc0d5bbd00dc97d",
+        "81de2810cde421997013513951a3d537c51a013110d6dbb29251410bcb5ba001a9686b84"
+        "90f1e581e282fd2ed0974b22",
+        "9cab0bbaffe91c7677ec3dd1f17060211a3cc0be574cbca064aa8c4b66ba6e64f3d80e83"
+        "da895042ca32d311c388d950" },
+    { NID_secp384r1, NID_sha256,
+        "c33ff63b4e6891e00b2349b3f2907c417ca355560544a91e24a7a0ee260d6850aeded29f"
+        "c0176b6039ca6187e8333391047cceaf14b1077df8f147dad84d36b2dac5666dc2f69dc9"
+        "b58b88cc73956efdb3b47f91831d5875051c76b0c4e9fc087012a1f03eeee85d6745b46a"
+        "a50bd9cb0110c2c94508765cec162ee1aa841d73",
+        "d5b72cbb6ec68aca46b9c27ad992afd8ffa02cb3067b234fcfa6e272e3b31be760695ff7"
+        "df988b57663057ab19dd65e3",
+        "04135a6542612f1468d8a4d01ff1914e532b1dd64d3627db9d403dc325651d3f82b0f6f0"
+        "fd1dbdeca2be967c4fb3793b5fcbbd40f6d3a38d0dfb64582ff4789d7b268241bc0c36de"
+        "2884bccfaeeff3b7b2b46a30bb35719804e0d11124b4e7f480",
+        "9da6de7c87c101b68db64fea40d97f8ad974ceb88224c6796c690cbf61b8bd8eede8470b"
+        "3caf6e6106b66cf3f0eebd55",
+        "17840911ecdf6ae0428b2634f442163c2c11b8dbf0cc7a5596fbe4d33e3e52f9d99e99ad"
+        "169867b1f39e89c9180cedc2",
+        "dd7ed67e480866d0474379ea4afff72870746f4feef2153be42f13bf472b1613d7faa5c0"
+        "abb7f7464070f94d7cf3f234" },
+    { NID_secp384r1, NID_sha256,
+        "f562f2b9d84b0e96a52532c3b43c39c8018c738bd8dc3797a7de7353971b2729d522d696"
+        "1b1f2e4df3f6a4bd3653e6d72b74fc0dba92ab939c4b542e994e5db6dd8ed4f56f651e69"
+        "9052e791237ae1f552f990ad156226ae8f7bf17fcbfa564f749604f97e9df0879d509857"
+        "47d981422a23040fe52f5ec74caf1d4aaad8a710",
+        "218ee54a71ef2ccf012aca231fee28a2c665fc395ff5cd20bde9b8df598c282664abf915"
+        "9c5b3923132983f945056d93",
+        "0401989ff07a7a452d8084937448be946bfedac4049cea34b3db6f7c91d07d69e926cce0"
+        "af3d6e88855a28120cf3dba8dfeb064e029d7539d4b301aabafe8de8870162deffe6383b"
+        "c63cc005add6ee1d5ced4a5761219c60cd58ad5b2a7c74aaa9",
+        "c5d39b436d851d94691f5f4aa9ef447f7989d984f279ae8b091aef5449ac062bcc056774"
+        "0f914624ad5b99fc32f9af0b",
+        "07d5b1b12877e8cb5e0aa5e71eeeb17bf0aa203064c7e98b3a1798a74dc9717252dc47c7"
+        "f06aaf1d5fe15b868323bbb9",
+        "69428cf101a7af5d08161a9fd7af212e02e33b6062aebdce4c96bf3a0684b5394cb902ca"
+        "7c2dec6e2f01f40c4576009d" },
+    { NID_secp384r1, NID_sha256,
+        "ace953ae851f571d71779aa120915f27450b236da23e9106f8d0756abdd2586193794122"
+        "8d225d5fb1aa1b1ebf759b1e326aeb3b6cd0cd87edd2ab9f6a7ad67b63d2c501d6a550ed"
+        "b2e7c9d216cc8af78dd33546af64d00abed4d0d2cfc5c9a7b5a055dbe8f7547902d185cf"
+        "46937314832bc5c602419a82ab83dbd9d3bd5aff",
+        "e6ab171f6937c000e144950801ad91023ae8e8476856c2592d9f7d5bb7180fd729211803"
+        "d39a412ead6c0be761cfa5d1",
+        "0438bc42b8c9d8866d09b214398d584b1b24a488dfacc3420d1e9506aa825b19fdf1ba74"
+        "e7b8f547f47b571467fe8c4d1f5179d62668d3f6a7ab5c8e3761a685e12008fb87d0529a"
+        "97645f65cfb5364376c1b6682e0ffcddd0bcd995c41d013ad3",
+        "05e9718aea9669c9e434f73866da5f252dec6d24c47a1c4ee3233450b6ec626de9746ebe"
+        "095b285558dfc89fc1b622fe",
+        "df9bab9dd1f22ec6f27116f38831cb2089aa78aa8c073024a0faddd9a48e810a5e8e2cad"
+        "d80fbf8dbd6088c71fe30b5b",
+        "1e0e8718567d12d18558c57f9e87a755c309e4ffb497335a3adfc8d7475ce8fd882d5dc3"
+        "3a8f5a16274b7ad74bb7862a" },
+    { NID_secp384r1, NID_sha256,
+        "9635ab832240be95301bedb94c5aec169eedc198cbbdfedcf41e9b586143d829b4597a6b"
+        "2a81902828332825fd84a785f187a3894e21bd99d22c4f94dcf34453fc052f15ec64d144"
+        "7c932cb38fcdd30b7be851963409c11881438cbaad7e96f9efbde317f2235d66af804477"
+        "a5dfe9f0c51448383830050ecf228889f83631e1",
+        "14acd516c7198798fd42ab0684d18df1cd1c99e304312752b3035bed6535a8975dff8acf"
+        "c2ba1675787c817b5bff6960",
+        "0429909d143cf7ee9c74b11d52f1a8f3ebd4a720c135612ca5618d3f432f03a95602ee75"
+        "a2057e1d7aab51d0648ac0b334404b6c5adffbadfa1b0380ae89fed96ec1ca16cc28661e"
+        "623d0f1c8b130fbaa96dd7257eae2bf03c2d3dcbc3dbc82c58",
+        "7f623c103eaa9099a0462e55f80519c565adaeffcb57a29993f3a8a92e63a560be8f0fb9"
+        "d23dc80bff1064bb41abad79",
+        "932ab291950c16b2b19a8036cd2e905714c6229cb190a73b3ea49c48dd8e76063a453c7c"
+        "3267a57597d2973678216296",
+        "d17d4c5ddbb9c27beebf526f113b416c8abfad53d11c4224813c7f351ba41a77dd4e77d6"
+        "e4a65bef2c9f62cc37a469a5" },
+    { NID_secp384r1, NID_sha256,
+        "d98b9a7d4fe9d0fd95de5056af164a8b7882cd34ab5bde83a2abb32dc361eb56a479a3a6"
+        "119db3b91dcad26a42d2206749567f0d97c34a981a91fc734921821a429f6a53401743a5"
+        "c406ba9d560f956203abc9d1f32f1a13e7d7b290f75c95fdbf857ea597021461c06a3aac"
+        "fa554ede3d69e4ff03bbbee5b7463ec77de2b3b2",
+        "2e780550984f3a00cb1e412429b33493c6eb6cd86d12f9d80588c247dcf567bd04296d2d"
+        "4b24b889d9c54954b7f38f57",
+        "0437dac42ef04663238443ef33e8addee2e78c40d50a1751913a7f5c37d1f23a26c7f86e"
+        "16055c788b8ca9554f06b2f2efbbed1549652904e3d00c39b01cc0460dbaf3185e6190c2"
+        "705677a9701de1fe56dff4f4d8418ee15059ff8fc36800982d",
+        "b788ca82811b0d4e4841765c71eafaa1e575378beedcd3860d8b92db3d070ac5aef7c425"
+        "067860fbee6c50cf0c642bbb",
+        "7292b3851870daeb2555a8a2fb198ead78739fcfb75327e5c32a82c6b77d58983e5ad548"
+        "ccb75dcf9411039c9576d9b9",
+        "a378c61802d9f1dd062b6e18f16416a954018f77df4df95ad1b983570377d5cfce4cc786"
+        "1759e802c52f81abc4f49aac" },
+    { NID_secp384r1, NID_sha256,
+        "1b4c754ac1c28dc415a71eac816bde68de7e8db66409af835838c5bb2c605111108a3bf1"
+        "3606ed5d8ade5ed72e50503e0de664416393d178ea4eec834d8d6f15039847b410080fd5"
+        "529b426e5aadd8451c20ebd92d787921f33e147bcbeb327b104d4aab1157fc1df33e4d76"
+        "8404b5ccb7110055c2508c600f429fd0c21b5784",
+        "a24d0fe90808aecc5d90626d7e6da7c9be5dfd4e1233c7f0f71f1b7c1c6fd318fafe1855"
+        "9c94718f044cf02ed5107cb1",
+        "04ec8ae1fb9bb88589d27d6f27d790392853396f37bc0c381631d85800fc668eea0886bf"
+        "1c6cff801147df19778d5b16041e1a8336c1e2506f8ee388b55cc648ae73b9295ea78467"
+        "979d2affb364536fad28120f51ec62a67cbb6ce7784780389f",
+        "755d025509b73cf1ea8817beb772ad150b4c17a52378be187daffe3db0158921e5e552d1"
+        "ca3c85df28519939f3cb794d",
+        "23ff2ffa62bbd427d49995d9c9950116e0d5a06ef076a4553448bc109e6482c5e87d4c83"
+        "3bc88de0bc722bc98cae2e61",
+        "9aea13d487c3ea6917e16374caafcf0321c12a80d28902dd8cd81909bb04b8c439e2491e"
+        "504756742d0d0bfb15a9c34c" },
+    { NID_secp384r1, NID_sha256,
+        "3cd8c053741dd9f974c6c5dbf8a1e5728e9b5eafb1cbcfc3452f5fbbda32a8c7564dee15"
+        "7e8d902c52514361da6d972934a56b3276e2a9379e328e24282e0db697c5bc29090fc489"
+        "ec46b7b188325dd4e96494c250de0f4a89fe2ccf919eaefcfb50c288113e6df92714feb7"
+        "f46e0822478c796d0f4ff3447a32997e892693ce",
+        "1c172e25732555afee7ded67a496f3f11babc0875898619f4519c29321e201e8ba1149f2"
+        "c20b48e5efba235d58fea7c3",
+        "0413e9e2c8bbcfe26e8f5f43c86268c5980ee693236a6b8777f3a7323718baa21005b482"
+        "d08aafc6fa6e3667d91353544c9ba181b3ee505be030f87ecd249b00670a791489b42af0"
+        "4976013483ff95b630c91c01e95757e906129f2f9b4ce719a8",
+        "08aec9a9e58bdc028805eb5dc86073d05fff1f5fb3fd17f510fc08f9272d84ba7aa66b6f"
+        "77d84fe6360bd538192bf01a",
+        "2b4337c3dfbc886ffad7858ae2480cb62227e12205a70361c42f1a5ca9e658ee30fc3cf4"
+        "030d85bd065edad83b99821f",
+        "2550cef8574bf17fb3d6b0c9d04ab266962bac3621bac233ff2e4989712d2a4a07171c0a"
+        "ebd3040cd6a32c3bd3efb8b5" },
+    { NID_secp384r1, NID_sha256,
+        "ed955dda6d9650124804d3deb6aeef900e520faf98b1ef6f14efcada7ca2433f09329b70"
+        "897305e59c89024d76e466b28fe02cb2a9b12e2478c66470259d7c282137a19e5a04ffad"
+        "ea55245c0f34a681593fedc42931d8b3321b3d82e9cc102cd00540ad311ec7bd8c9d06db"
+        "21bea4ca3dc74d98931ae0d40494aefc2345132c",
+        "5b96555dbd602e71d4d5d3aee19fd1ea084ee23d4f55c10937056762bc2015cbded2e898"
+        "a487f5482ab7e1e971245907",
+        "046e14c17bb831b0112d7f3543c5fd17c78379a516c9e0539b03b8b4bfdead2820343fc8"
+        "4b0382807573ded6c4d97b70037f60021d2de77546db666721c9aec84c3e2ba8de0ba774"
+        "43600dc77e6839bbf9316271adb22d4cb47d08f745ecb1dafd",
+        "7ad6f4ffd2b429ba10c6f112f800cacf1ad508cf8eba880893bb9659c1ddaaec57dcdc09"
+        "3a114500460d457bdde324f2",
+        "faea950ca513806bc59028c638d6302ffc86978c3ff1f06db015dd7c4777050186cb8dd8"
+        "71f5e926e1416539c1939c2f",
+        "2c592240eabb8a1f9878e1b5c9d5d3ced7b3a7ae571f5a86494ed2ca567a36eb72e7bea8"
+        "934bded29594bccf67ca84bd" },
+    { NID_secp384r1, NID_sha256,
+        "ce395b001da2a58e49691605d44af4206306f62f561bf2394060d2a5591a350277166bed"
+        "043819035f1e60b5b3fb5ae113ddd0473f8ef6b2b050c472c2a264e1d8b3ca82a4f158c4"
+        "0f2d78d9ce5e5ea6de243f2e1f13f47f6c6f403b270912c81c636be35b396ca58468b3fb"
+        "60aa83911d61441a0528d973bc31f965d4059080",
+        "8df9c3c710a25192f3dea970910bb3784e3509874cccf4334823eb9f7a8d05b067f2d812"
+        "d61e878e24b093089a0b8245",
+        "0492c9e32b20cbe6d4ed0727c6c942cf804a72031d6dfd69078b5e78ebce2d192268f1f5"
+        "e2abce5aaf1f8d6a35f136837fd5167905fa7689e03b9fb1487c566f62b36f2bc1c4a2bf"
+        "b6a836113b5c8d46f7c1ca51b628b14397fbc06ec9a07f4849",
+        "258dd05919735cd48627c9fe9fac5c252604aa7c2ae0460d7c1149cd96b7bd2ba195ad39"
+        "3bf392a2499f06aead5ba050",
+        "413793bcce52eda0f5b675a8d687cce86d5c9e1659b38a89e96246b5e05f8b0934d17dbb"
+        "a3b2ea44c838aa5fd87125d1",
+        "ce7309fc2d6e3438818a1a29a997410b025b0403de20795b97c86c46034a6b02afeed279"
+        "aeb06522d4de941bfdf50469" },
+    { NID_secp384r1, NID_sha256,
+        "ffefe316455ae4ffdb890bb804bf7d31424ea060ecacff419d0f7134ff76ad434063c0ec"
+        "0f8bb7059584d3a03f3625bb9e9f66ace1a47ac4b8f3e76fc7c420c55edb1427d1fa15b3"
+        "87ad73d02b0595c4e74321be8822752230a0dcfb85d60bfa186da7623a8ec3eb1633f0a2"
+        "94b23ae87216b14ccee9ef56418dcfab9427371e",
+        "6002cb01ad2ce6e7101665d47729c863b6435c3875de57a93f99da834f73e3e6e2b3880e"
+        "06de3e6bd1d51ea1807ab0d7",
+        "04e4216e1a20af8e8e3e74653ac016545001066e53e64af679ad1c85841bb475aed3e00e"
+        "ad052ae9955f48d675ff4ace568804c17641be21d4c6386902c9c5c888af25d97ca38370"
+        "3ea4a85cf93bbab360c0bbd2993374da499a303778650270b9",
+        "6b9507fd2844df0949f8b67b6fde986e50173713ac03df2edf65cb339859321cd3a2b9aa"
+        "b8356f95dec62460ab19c822",
+        "018891f6381ed358b422f79a299cf0789cee783ba388af4d82cbbe17f3709751b7fd9400"
+        "e9702820c28b9afc62fdf489",
+        "aef73bd590802b2fd2a65c4f7fec89f9b24ecc199a69254785925f334cd1977c5e1f858b"
+        "d9830d7d7d243ea707b1af0b" },
+    { NID_secp384r1, NID_sha256,
+        "304bccb718b3a9e12669913490cc5bcc1979287b56c628fad706c354241e88d10e81445a"
+        "2853e3fc32ece094ba1abc3fdcab61da27f9a0fca739371049fed462ee6b08fa31cde127"
+        "20f8144a6f00ce9b1a7a6eadd231f126717074b4efb5c72ce673ca5859000a436f67a338"
+        "d698759f12c461247c45a361fb6cb661fdbe6714",
+        "d8559c3543afc6f7b3dc037a687bad2630283757ba7862fd23ed14e2151a4cf5fed3d249"
+        "268f780e0b96b6b46274a2d5",
+        "045f94223918f2ec9f0a08342cb99e724881c92453957c59672860f69daac01b660331a0"
+        "f5845e50f1f27766b219c89e7ed76d83396130d10d1168d76c7fc83742ffffbe66d9f4da"
+        "4ca3f95f5ad6dac8cc7bb65d16d317d37aa99fdbf30ec7439c",
+        "4ad5a92b5b8e170b71c8a7ed419dc624c7680004562b8d16a37b6e639f581ce81d5f0d98"
+        "cce44d54c4e7136229148340",
+        "f7baa6a5488ab462ea59aa31a36402b15880c68110b6069f51ede0c3b52a7b1e5bf926fd"
+        "be95768931b7d5f87058835c",
+        "28b1c4ef448a432f7c91b98b0c6471691e888211b6af907369a8930859b8cdb2e94f466a"
+        "44f4e52f46df9b0d65e35de6" },
+    { NID_secp384r1, NID_sha256,
+        "64f9f05c2805acf59c047b5f5d2e20c39277b6d6380f70f87b72327a76170b872bfe4b25"
+        "c451602acfb6a631bb885e2655aee8abe44f69c90fb21ffde03cef2a452c468c6369867d"
+        "fd8aa26ac24e16aa53b292375a8d8fbf988e302bf00088e4c061aa12c421d8fe3cbd7273"
+        "b0e8993701df1c59431f436a08b8e15bd123d133",
+        "b9208cbfd186ddfa3efd5b71342ae1efb01a13ebc4c2a992a2cbee7254b7846a4252ece1"
+        "104b89d13d835911f8511224",
+        "04166e6d96cb60d916fd19888a2dd945a3306ff0d7b0a5e30729f47d3dac3de2be3fd5cd"
+        "7437e9a80d6c48cf960d2d36f8e6b2b70f131092ae210f29cc6bad701318bddb31bddf92"
+        "1695855c6208941100d0cee5d10799f8b835afe3ea510e8229",
+        "da706ab5f61531f2378b3c0a2b342108cd119eadaa88b859df64923bccfb0ec2393fd312"
+        "826f65c15a6587d1d460015b",
+        "d9124c42858080c62400e4d4d8136304e03d910cbe9b9b3487f4d27c7e0540a314d34bef"
+        "8c850045c8746ca631c11c42",
+        "bbf6424a3b70166fa799f49e918439d515327039258ef9bd88435a59c9c19659f8ec3c86"
+        "60720b0c08354ff60e0f5a76" },
+    { NID_secp384r1, NID_sha384,
+        "6b45d88037392e1371d9fd1cd174e9c1838d11c3d6133dc17e65fa0c485dcca9f52d41b6"
+        "0161246039e42ec784d49400bffdb51459f5de654091301a09378f93464d52118b48d44b"
+        "30d781eb1dbed09da11fb4c818dbd442d161aba4b9edc79f05e4b7e401651395b53bd8b5"
+        "bd3f2aaa6a00877fa9b45cadb8e648550b4c6cbe",
+        "201b432d8df14324182d6261db3e4b3f46a8284482d52e370da41e6cbdf45ec2952f5db7"
+        "ccbce3bc29449f4fb080ac97",
+        "04c2b47944fb5de342d03285880177ca5f7d0f2fcad7678cce4229d6e1932fcac11bfc3c"
+        "3e97d942a3c56bf34123013dbf37257906a8223866eda0743c519616a76a758ae58aee81"
+        "c5fd35fbf3a855b7754a36d4a0672df95d6c44a81cf7620c2d",
+        "dcedabf85978e090f733c6e16646fa34df9ded6e5ce28c6676a00f58a25283db8885e16c"
+        "e5bf97f917c81e1f25c9c771",
+        "50835a9251bad008106177ef004b091a1e4235cd0da84fff54542b0ed755c1d6f251609d"
+        "14ecf18f9e1ddfe69b946e32",
+        "0475f3d30c6463b646e8d3bf2455830314611cbde404be518b14464fdb195fdcc92eb222"
+        "e61f426a4a592c00a6a89721" },
+    { NID_secp384r1, NID_sha384,
+        "d768f41e6e8ec2125d6cf5786d1ba96668ac6566c5cdbbe407f7f2051f3ad6b1acdbfe13"
+        "edf0d0a86fa110f405406b69085219b5a234ebdb93153241f785d45811b3540d1c37424c"
+        "c7194424787a51b79679266484c787fb1ded6d1a26b9567d5ea68f04be416caf3be9bd2c"
+        "afa208fe2a9e234d3ae557c65d3fe6da4cb48da4",
+        "23d9f4ea6d87b7d6163d64256e3449255db14786401a51daa7847161bf56d494325ad2ac"
+        "8ba928394e01061d882c3528",
+        "045d42d6301c54a438f65970bae2a098cbc567e98840006e356221966c86d82e8eca515b"
+        "ca850eaa3cd41f175f03a0cbfd4aef5a0ceece95d382bd70ab5ce1cb77408bae42b51a08"
+        "816d5e5e1d3da8c18fcc95564a752730b0aabea983ccea4e2e",
+        "67ba379366049008593eac124f59ab017358892ee0c063d38f3758bb849fd25d867c3561"
+        "563cac1532a323b228dc0890",
+        "fb318f4cb1276282bb43f733a7fb7c567ce94f4d02924fc758635ab2d1107108bf159b85"
+        "db080cdc3b30fbb5400016f3",
+        "588e3d7af5da03eae255ecb1813100d95edc243476b724b22db8e85377660d7645ddc1c2"
+        "c2ee4eaea8b683dbe22f86ca" },
+    { NID_secp384r1, NID_sha384,
+        "6af6652e92a17b7898e40b6776fabaf0d74cf88d8f0ebfa6088309cbe09fac472eeac2aa"
+        "8ea96b8c12e993d14c93f8ef4e8b547afe7ae5e4f3973170b35deb3239898918c70c1056"
+        "332c3f894cd643d2d9b93c2561aac069577bbab45803250a31cd62226cab94d8cba7261d"
+        "ce9fe88c210c212b54329d76a273522c8ba91ddf",
+        "b5f670e98d8befc46f6f51fb2997069550c2a52ebfb4e5e25dd905352d9ef89eed5c2ecd"
+        "16521853aadb1b52b8c42ae6",
+        "0444ffb2a3a95e12d87c72b5ea0a8a7cb89f56b3bd46342b2303608d7216301c21b5d292"
+        "1d80b6628dc512ccb84e2fc278e4c1002f1828abaec768cadcb7cf42fbf93b1709ccae6d"
+        "f5b134c41fae2b9a188bfbe1eccff0bd348517d7227f2071a6",
+        "229e67638f712f57bea4c2b02279d5ccad1e7c9e201c77f6f01aeb81ea90e62b44b2d210"
+        "7fd66d35e56608fff65e28e4",
+        "b11db592e4ebc75b6472b879b1d8ce57452c615aef20f67a280f8bca9b11a30ad4ac9d69"
+        "541258c7dd5d0b4ab8dd7d49",
+        "4eb51db8004e46d438359abf060a9444616cb46b4f99c9a05b53ba6df02e914c9c0b6cc3"
+        "a9791d804d2e4c0984dab1cc" },
+    { NID_secp384r1, NID_sha384,
+        "b96d74b2265dd895d94e25092fb9262dc4f2f7a328a3c0c3da134b2d0a4e2058ca994e34"
+        "45c5ff4f812738e1b0c0f7a126486942a12e674a21f22d0886d68df2375f41685d694d48"
+        "7a718024933a7c4306f33f1a4267d469c530b0fed4e7dea520a19dd68bf0203cc87cad65"
+        "2260ed43b7b23f6ed140d3085875190191a0381a",
+        "de5975d8932533f092e76295ed6b23f10fc5fba48bfb82c6cc714826baf0126813247f8b"
+        "d51d5738503654ab22459976",
+        "04f1fabafc01fec7e96d982528d9ef3a2a18b7fe8ae0fa0673977341c7ae4ae8d8d3d674"
+        "20343d013a984f5f61da29ae381a31cf902c46343d01b2ebb614bc789c313b5f91f9302a"
+        "d9418e9c797563e2fa3d44500f47b4e26ad8fdec1a816d1dcf",
+        "fc5940e661542436f9265c34bce407eff6364bd471aa79b90c906d923e15c9ed96eea4e8"
+        "6f3238ea86161d13b7d9359d",
+        "c2fbdd6a56789024082173725d797ef9fd6accb6ae664b7260f9e83cb8ab2490428c8b9c"
+        "52e153612295432fec4d59cd",
+        "8056c5bb57f41f73082888b234fcda320a33250b5da012ba1fdb4924355ae679012d81d2"
+        "c08fc0f8634c708a4833232f" },
+    { NID_secp384r1, NID_sha384,
+        "7cec7480a037ff40c232c1d2d6e8cd4c080bbeecdaf3886fccc9f129bb6d202c316eca76"
+        "c8ad4e76079afe622f833a16f4907e817260c1fa68b10c7a151a37eb8c036b057ed4652c"
+        "353db4b4a34b37c9a2b300fb5f5fcfb8aa8adae13db359160f70a9241546140e550af007"
+        "3468683377e6771b6508327408c245d78911c2cc",
+        "11e0d470dc31fab0f5722f87b74a6c8d7414115e58ceb38bfcdced367beac3adbf1fe9ba"
+        "5a04f72e978b1eb54597eabc",
+        "041950166989164cbfd97968c7e8adb6fbca1873ebef811ea259eb48b7d584627f0e6d6c"
+        "64defe23cbc95236505a252aa141ef424b5cb076d4e32accd9250ea75fcf4ffd81814040"
+        "c050d58c0a29b06be11edf67c911b403e418b7277417e52906",
+        "e56904028226eb04f8d071e3f9cefec91075a81ca0fa87b44cae148fe1ce9827b5d1910d"
+        "b2336d0eb9813ddba3e4d7b5",
+        "c38ef30f55624e8935680c29f8c24824877cf48ffc0ef015e62de1068893353030d1193b"
+        "f9d34237d7ce6ba92c98b0fe",
+        "651b8c3d5c9d5b936d300802a06d82ad54f7b1ba4327b2f031c0c5b0cb215ad4354edc7f"
+        "932d934e877dfa1cf51b13fe" },
+    { NID_secp384r1, NID_sha384,
+        "00ce978603229710345c9ad7c1c2dba3596b196528eea25bd822d43ca8f76a024e292177"
+        "03dd0652c8a615284fc3edcc1c5ad1c8d5a8521c8e104c016a24e50c2e25066dcb56596f"
+        "913b872767e3627aa3e55ec812e9fdac7c2f1beade83aef093e24c9c953982adf431a776"
+        "880ae4583be158e11cdab1cbca3ad3a66900213d",
+        "5c6bbf9fbcbb7b97c9535f57b431ed1ccae1945b7e8a4f1b032016b07810bd24a9e20055"
+        "c0e9306650df59ef7e2cd8c2",
+        "042e01c5b59e619e00b79060a1e8ef695472e23bf9a511fc3d5ed77a334a242557098e40"
+        "972713732c5291c97adf9cf2cf563e3fe4ad807e803b9e961b08da4dde4cea8925649da0"
+        "d93221ce4cdceabc6a1db7612180a8c6bef3579c65539b97e9",
+        "03d23f1277b949cb6380211ad9d338e6f76c3eedac95989b91d0243cfb734a54b19bca45"
+        "a5d13d6a4b9f815d919eea77",
+        "abab65308f0b79c4f3a9ff28dd490acb0c320434094cef93e75adfe17e5820dc1f77544c"
+        "faaacdc8cf9ac8b38e174bef",
+        "11b783d879a6de054b316af7d56e526c3dce96c85289122e3ad927cfa77bfc50b4a96c97"
+        "f85b1b8221be2df083ff58fb" },
+    { NID_secp384r1, NID_sha384,
+        "54a255c18692c6162a46add176a0ae8361dcb8948f092d8d7bac83e160431794d3b98128"
+        "49bf1994bcdcfba56e8540c8a9ee5b93414548f2a653191b6bb28bda8dc70d45cc1b92a4"
+        "89f58a2d54f85766cb3c90de7dd88e690d8ebc9a79987eee1989df35af5e35522f83d85c"
+        "48dda89863171c8b0bf4853ae28c2ac45c764416",
+        "ffc7dedeff8343721f72046bc3c126626c177b0e48e247f44fd61f8469d4d5f0a74147fa"
+        "baa334495cc1f986ebc5f0b1",
+        "0451c78c979452edd53b563f63eb3e854a5b23e87f1b2103942b65f77d024471f75c8ce1"
+        "cc0dfef83292b368112aa5126e313e6aaf09caa3ba30f13072b2134878f14a4a01ee8632"
+        "6cccbff3d079b4df097dc57985e8c8c834a10cb9d766169366",
+        "c3de91dbe4f777698773da70dd610ef1a7efe4dc00d734399c7dd100728006a502822a5a"
+        "7ff9129ffd8adf6c1fc1211a",
+        "f4f477855819ad8b1763f53691b76afbc4a31a638b1e08c293f9bcd55decf797f9913ca1"
+        "28d4b45b2e2ea3e82c6cf565",
+        "7c26be29569ef95480a6d0c1af49dc10a51a0a8931345e48c0c39498bfb94d62962980b5"
+        "6143a7b41a2fddc8794c1b7f" },
+    { NID_secp384r1, NID_sha384,
+        "692a78f90d4f9d5aee5da536314a78d68c1feabbfe5d1ccea7f6059a66c4b310f8051c41"
+        "1c409ccf6e19a0cbd8b8e100c48317fe8c6d4f8a638b9551ce7ee178020f04f7da3001a0"
+        "e6855225fb3c9b375e4ed964588a1a41a095f3f476c42d52ffd23ce1702c93b56d4425d3"
+        "befcf75d0951b6fd5c05b05455bdaf205fe70ca2",
+        "adca364ef144a21df64b163615e8349cf74ee9dbf728104215c532073a7f74e2f6738577"
+        "9f7f74ab344cc3c7da061cf6",
+        "04ef948daae68242330a7358ef73f23b56c07e37126266db3fa6eea233a04a9b3e491523"
+        "3dd6754427cd4b71b75854077d009453ef1828eaff9e17c856d4fc1895ab60051312c3e1"
+        "db1e3766566438b2990cbf9945c2545619e3e0145bc6a79004",
+        "a2da3fae2e6da3cf11b49861afb34fba357fea89f54b35ce5ed7434ae09103fe53e2be75"
+        "b93fc579fedf919f6d5e407e",
+        "dda994b9c428b57e9f8bbaebba0d682e3aac6ed828e3a1e99a7fc4c804bff8df151137f5"
+        "39c7389d80e23d9f3ee497bf",
+        "a0d6b10ceffd0e1b29cf784476f9173ba6ecd2cfc7929725f2d6e24e0db5a4721683640e"
+        "aa2bbe151fb57560f9ce594b" },
+    { NID_secp384r1, NID_sha384,
+        "3b309bb912ab2a51681451ed18ad79e95d968abc35423a67036a02af92f575a0c89f1b66"
+        "8afe22c7037ad1199e757a8f06b281c33e9a40bab69c9874e0bb680b905d909b9dc24a9f"
+        "e89bb3d7f7d47082b25093c59754f8c19d1f81f30334a8cdd50a3cb72f96d4b3c305e60a"
+        "439a7e93aeb640dd3c8de37d63c60fb469c2d3ed",
+        "39bea008ec8a217866dcbdb1b93da34d1d3e851d011df9ef44b7828b3453a54aa70f1df9"
+        "932170804eacd207e4f7e91d",
+        "045709ec4305a9c3271c304face6c148142490b827a73a4c17affcfd01fffd7eaa65d2fd"
+        "edfa2419fc64ed910823513fafb083cda1cf3be6371b6c06e729ea6299213428db571193"
+        "47247ec1fcd44204386cc0bca3f452d9d864b39efbfc89d6b2",
+        "3c90cc7b6984056f570542a51cbe497ce4c11aeae8fc35e8fd6a0d9adeb650e8644f9d1d"
+        "5e4341b5adc81e27f284c08f",
+        "d13646895afb1bfd1953551bb922809c95ad65d6abe94eb3719c899aa1f6dba6b01222c7"
+        "f283900fe98628b7597b6ea6",
+        "4a9a38afda04c0a6b0058943b679bd02205b14d0f3d49b8f31aac289129780cdb1c555de"
+        "f8c3f9106b478729e0c7efaa" },
+    { NID_secp384r1, NID_sha384,
+        "f072b72b8783289463da118613c43824d11441dba364c289de03ff5fab3a6f60e85957d8"
+        "ff211f1cb62fa90216fb727106f692e5ae0844b11b710e5a12c69df3ed895b94e8769ecd"
+        "15ff433762d6e8e94d8e6a72645b213b0231344e2c968056766c5dd6b5a5df41971858b8"
+        "5e99afbf859400f839b42cd129068efabeea4a26",
+        "e849cf948b241362e3e20c458b52df044f2a72deb0f41c1bb0673e7c04cdd70811215059"
+        "032b5ca3cc69c345dcce4cf7",
+        "0406c037a0cbf43fdf335dff33de06d34348405353f9fdf2ce1361efba30fb204aea9dbd"
+        "2e30da0a10fd2d876188371be6360d38f3940e34679204b98fbf70b8a4d97f25443e46d0"
+        "807ab634ed5891ad864dd7703557aa933cd380e26eea662a43",
+        "32386b2593c85e877b70e5e5495936f65dc49553caef1aa6cc14d9cd370c442a0ccfab4c"
+        "0da9ec311b67913b1b575a9d",
+        "5886078d3495767e330c7507b7ca0fa07a50e59912a416d89f0ab1aa4e88153d6eaf0088"
+        "2d1b4aa64153153352d853b5",
+        "2cc10023bf1bf8ccfd14b06b82cc2114449a352389c8ff9f6f78cdc4e32bde69f3869da0"
+        "e17f691b329682ae7a36e1aa" },
+    { NID_secp384r1, NID_sha384,
+        "cf4945350be8133b575c4ad6c9585e0b83ff1ed17989b6cd6c71b41b5264e828b4e11599"
+        "5b1ae77528e7e9002ac1b5669064442645929f9d7dd70927cb93f95edeb73e8624f4bc89"
+        "7ec4c2c7581cb626916f29b2d6e6c2fba8c59a71e30754b459d81b912a12798182bcff40"
+        "19c7bdfe929cc769bcc2414befe7d2906add4271",
+        "d89607475d509ef23dc9f476eae4280c986de741b63560670fa2bd605f5049f1972792c0"
+        "413a5b3b4b34e7a38b70b7ca",
+        "0449a1c631f31cf5c45b2676b1f130cbf9be683d0a50dffae0d147c1e9913ab1090c6529"
+        "a84f47ddc7cf025921b771355a1e207eece62f2bcc6bdabc1113158145170be97469a290"
+        "4eaaa93aad85b86a19719207f3e423051f5b9cbbe2754eefcb",
+        "78613c570c8d33b7dd1bd1561d87e36282e8cf4843e7c344a2b2bb6a0da94756d670eeaf"
+        "fe434f7ae7c780f7cf05ca08",
+        "66f92b39aa3f4aeb9e2dc03ac3855406fa3ebbab0a6c88a78d7a03482f0c9868d7b78bc0"
+        "81ede0947c7f37bf193074ba",
+        "e5c64ed98d7f3701193f25dd237d59c91c0da6e26215e0889d82e6d3e416693f8d58843c"
+        "f30ab10ab8d0edd9170b53ad" },
+    { NID_secp384r1, NID_sha384,
+        "d9b5cf0b50416573ff3c63133275a18394dd4326be2041e8d97e6e4e3855a4a177e9d26d"
+        "fd223fe8aa74564edb49bd72de19916fb6f001f44530d5c18e2c332bce1b7415df5927ec"
+        "e5f3824f34d174b963136b53aef1fb78fb0c06a201a40b2db38e4d8216fc1e392a798c8a"
+        "b4b3a314496b7f1087804ebfa89bf96e9cdb80c0",
+        "083e7152734adf342520ae377087a223688de2899b10cfcb34a0b36bca500a4dfa530e23"
+        "43e6a39da7ae1eb0862b4a0d",
+        "0470a0f16b6c61172659b027ed19b18fd8f57bd28dc0501f207bd6b0bb065b5671cf3dd1"
+        "ed13d388dcf6ccc766597aa6044f845bf01c3c3f6126a7368c3454f51425801ee0b72e63"
+        "fb6799b4420bfdebe3e37c7246db627cc82c09654979c700bb",
+        "28096ababe29a075fbdf894709a20d0fdedb01ed3eeacb642a33a0da6aed726e13caf6cf"
+        "206792ec359f0c9f9b567552",
+        "ee2923f9b9999ea05b5e57f505bed5c6ba0420def42c6fa90eef7a6ef770786525546de2"
+        "7cdeb2f8586f8f29fb4ee67c",
+        "50ef923fb217c4cf65a48b94412fda430fac685f0da7bd574557c6c50f5b22e0c8354d99"
+        "f2c2f2c2691f252f93c7d84a" },
+    { NID_secp384r1, NID_sha384,
+        "9e4042d8438a405475b7dab1cd783eb6ce1d1bffa46ac9dfda622b23ac31057b922eced8"
+        "e2ed7b3241efeafd7c9ab372bf16230f7134647f2956fb793989d3c885a5ae064e85ed97"
+        "1b64f5f561e7ddb79d49aa6ebe727c671c67879b794554c04de0e05d68264855745ef3c9"
+        "567bd646d5c5f8728b797c181b6b6a876e167663",
+        "63578d416215aff2cc78f9b926d4c7740a77c142944e104aa7422b19a616898262d46a8a"
+        "942d5e8d5db135ee8b09a368",
+        "04cadbacef4406099316db2ce3206adc636c2bb0a835847ed7941efb02862472f3150338"
+        "f13f4860d47f39b7e098f0a390752ad0f22c9c264336cde11bbc95d1816ed4d1b1500db6"
+        "b8dce259a42832e613c31178c2c7995206a62e201ba108f570",
+        "7b69c5d5b4d05c9950dc94c27d58403b4c52c004b80a80418ad3a89aabc5d34f21926729"
+        "e76afd280cc8ee88c9805a2a",
+        "db054addb6161ee49c6ce2e4d646d7670754747b6737ca8516e9d1e87859937c3ef9b1d2"
+        "663e10d7e4bd00ec85b7a97a",
+        "fcc504e0f00ef29587e4bc22faada4db30e2cb1ac552680a65785ae87beb666c792513f2"
+        "be7a3180fc544296841a0e27" },
+    { NID_secp384r1, NID_sha384,
+        "0b14a7484a40b68a3ce1273b8a48b8fdb65ba900d98541c4bbd07b97e31bcc4c85545a03"
+        "e9deab3c563f47a036ff60d0361684ba241b5aa68bb46f440da22181ee328a011de98eff"
+        "34ba235ec10612b07bdfa6b3dc4ccc5e82d3a8d057e1862fef3def5a1804696f84699fda"
+        "2ec4175a54a4d08bcb4f0406fdac4eddadf5e29b",
+        "ed4df19971658b74868800b3b81bc877807743b25c65740f1d6377542afe2c6427612c84"
+        "0ada31a8eb794718f37c7283",
+        "0433093a0568757e8b58df5b72ea5fe5bf26e6f7aeb541b4c6a8c189c93721749bcacecc"
+        "f2982a2f0702586a9f812fc66febe320d09e1f0662189d50b85a20403b821ac0d000afdb"
+        "f66a0a33f304726c69e354d81c50b94ba3a5250efc31319cd1",
+        "d9b4cd1bdfa83e608289634dbfcee643f07315baf743fc91922880b55a2feda3b38ddf60"
+        "40d3ba10985cd1285fc690d5",
+        "009c74063e206a4259b53decff5445683a03f44fa67252b76bd3581081c714f882f882df"
+        "915e97dbeab061fa8b3cc4e7",
+        "d40e09d3468b46699948007e8f59845766dbf694b9c62066890dd055c0cb9a0caf0aa611"
+        "fb9f466ad0bbb00dbe29d7eb" },
+    { NID_secp384r1, NID_sha384,
+        "0e646c6c3cc0f9fdedef934b7195fe3837836a9f6f263968af95ef84cd035750f3cdb649"
+        "de745c874a6ef66b3dd83b66068b4335bc0a97184182e3965c722b3b1aee488c3620adb8"
+        "35a8140e199f4fc83a88b02881816b366a09316e25685217f9221157fc05b2d8d2bc8553"
+        "72183da7af3f0a14148a09def37a332f8eb40dc9",
+        "e9c7e9a79618d6ff3274da1abd0ff3ed0ec1ae3b54c3a4fd8d68d98fb04326b7633fc637"
+        "e0b195228d0edba6bb1468fb",
+        "04a39ac353ca787982c577aff1e8601ce192aa90fd0de4c0ed627f66a8b6f02ae5131554"
+        "3f72ffc1c48a7269b25e7c289a9064a507b66b340b6e0e0d5ffaa67dd20e6dafc0ea6a6f"
+        "aee1635177af256f9108a22e9edf736ab4ae8e96dc207b1fa9",
+        "b094cb3a5c1440cfab9dc56d0ec2eff00f2110dea203654c70757254aa5912a7e73972e6"
+        "07459b1f4861e0b08a5cc763",
+        "ee82c0f90501136eb0dc0e459ad17bf3be1b1c8b8d05c60068a9306a346326ff7344776a"
+        "95f1f7e2e2cf9477130e735c",
+        "af10b90f203af23b7500e070536e64629ba19245d6ef39aab57fcdb1b73c4c6bf7070c62"
+        "63544633d3d358c12a178138" },
+    { NID_secp384r1, NID_sha512,
+        "67d9eb88f289454d61def4764d1573db49b875cfb11e139d7eacc4b7a79d3db3bf720819"
+        "1b2b2078cbbcc974ec0da1ed5e0c10ec37f6181bf81c0f32972a125df64e3b3e1d838ec7"
+        "da8dfe0b7fcc911e43159a79c73df5fa252b98790be511d8a732fcbf011aacc7d45d8027"
+        "d50a347703d613ceda09f650c6104c9459537c8f",
+        "217afba406d8ab32ee07b0f27eef789fc201d121ffab76c8fbe3c2d352c594909abe591c"
+        "6f86233992362c9d631baf7c",
+        "04fb937e4a303617b71b6c1a25f2ac786087328a3e26bdef55e52d46ab5e69e5411bf9fc"
+        "55f5df9994d2bf82e8f39a153ea97d9075e92fa5bfe67e6ec18e21cc4d11fde59a68aef7"
+        "2c0e46a28f31a9d60385f41f39da468f4e6c3d3fbac9046765",
+        "90338a7f6ffce541366ca2987c3b3ca527992d1efcf1dd2723fbd241a24cff19990f2af5"
+        "fd6419ed2104b4a59b5ae631",
+        "c269d9c4619aafdf5f4b3100211dddb14693abe25551e04f9499c91152a296d7449c08b3"
+        "6f87d1e16e8e15fee4a7f5c8",
+        "77ffed5c61665152d52161dc13ac3fbae5786928a3d736f42d34a9e4d6d4a70a02d5af90"
+        "fa37a23a318902ae2656c071" },
+    { NID_secp384r1, NID_sha512,
+        "45db86829c363c80160659e3c5c7d7971abb1f6f0d495709bba908d7aa99c9df64b3408a"
+        "51bd69aba8870e2aaff488ef138f3123cf94391d081f357e21906a4e2f311defe527c55e"
+        "0231579957c51def507f835cceb466eb2593a509dcbee2f09e0dde6693b2bfe17697c9e8"
+        "6dd672f5797339cbe9ea8a7c6309b061eca7aef5",
+        "0a3f45a28a355381a919372f60320d6610cfb69c3e318eb1607db3cadfc42b728b77a6a9"
+        "e9e333de9183c58933daf60f",
+        "04832cbb7061a719a316e73dbad348fa67cd17c33f40b9000a3d3b691a2a2cd821052566"
+        "717c3ead01089b56086af1366f1e15a048d1dce642d9ebcbfac7f92b1bcee90fd0240cc7"
+        "9abd29e32e0e655c4ee1fd34fb88178bba92aca100e7794ed0",
+        "2a78e651623ba604c42cf094fc7d046629306f508853427ba091448800d1092c041bb232"
+        "3035fc9d19a8d44950f7dcc3",
+        "0db0cc9a2bda8dd7e565ad36f91b1c5756d78164dc8a72a5bee4b6bc45ea38c7a16b01d0"
+        "5b1893d4e06b62db24c30385",
+        "abd383edaeda7d0b8de1b54fcd3c28874fed62ab266f1f84c8ba796a7b54e5e0695fdb43"
+        "ce7fe90ed00fa468d87bca64" },
+    { NID_secp384r1, NID_sha512,
+        "4672fce0721d37c5be166bffa4b30d753bcf104b9b414db994b3ed33f36af4935ea59a0b"
+        "b92db66448b3f57dad4fc67cef10ce141bf82c536be604b89a0bc0e8bca605b867880049"
+        "d97142d30538fc543bd9d4fab7fdbe2f703815cdb6361beb66acff764bc275f910d16624"
+        "45b07b92830db69a5994857f53657ed5ca282648",
+        "2e408c57921939f0e0fe2e80ce74a4fa4a1b4fa7ab070206298fe894d655be50e2583af9"
+        "e45544b5d69c73dce8a2c8e7",
+        "04a2b24a5ad4a2e91f12199ed7699e3f297e27bf8b8ea8fbe7ed28366f3544cd8e680c23"
+        "8450f8a6422b40829d6647b25c2732be0075536e6519f6a099b975a40f8e0de337fa4d48"
+        "bd0762b43f41cab8deafdef9cfbb9973e457801e3bf9c93304",
+        "b10b6258afdde81f9c971cc1526d942e20cafac02f59fee10f98e99b8674636bff1d84a6"
+        "eaa49c0de8d8cfdc90d8ce84",
+        "be428a8de89a364a134719141ee8d776a3a8338f1132b07e01b28573d8eaf3b9008b6330"
+        "4c48821e53638b6141f9660b",
+        "866181dbef5c147d391bed6adcee408c339982c307adc718c2b9ab9e5642d8dedc36dd64"
+        "02559a3ab614c99c1e56b529" },
+    { NID_secp384r1, NID_sha512,
+        "9ae48fdd9bfc5cb0f4d4761e28b2073bda05a3e3fe82c212e66701dc4573cc67a829b0f8"
+        "2d7520b1bf11db0c6d1743822bbe41bb0adbd7222aa5fae70fbd1a31f2d4453a01c81e06"
+        "4d775388468be96f6063f8673b7b8d4455fe1bd4c801ad5e625a015eaa4a1a18da490d2a"
+        "f8642201eaba3c611cbd65f861d8e19ca82a1ee6",
+        "1c285da72a8eb1c3c38faab8d3bb4e68dc95c797082b9a3991a21c1de54759071ecf2265"
+        "fb1eff504ab24174bc6710cf",
+        "0411acb1b5cc59a4f1df1913a8d6e91cbdafb8206dc44aff7d9da45906b664fc33194d99"
+        "35a82aa4d62f39618897c86025832ed0b9575fff52a3603bfe89f312751b4c396da98324"
+        "117a61b3f525d27b2266f6cfb22be07e50b6874435e380ed62",
+        "2513075e02cc7fb3cff7b7adde46da31c5493749b5cf02758bd5b098a838bfd4d5e4c7fb"
+        "8268bdc37e219c30efebe878",
+        "b3d638b3be45f14f170da5bdc22d2114deac93ab340a25b3af2b5c18584bb9147e00dc6c"
+        "67a2274f79aa4838793eb63f",
+        "876112bdca2c725eb2f6dbd76d07710a31f0c16d38430cb0817f320a25a9ecfec8a66137"
+        "d0304612ae29a6a484fd3319" },
+    { NID_secp384r1, NID_sha512,
+        "817d6a110a8fd0ca7b4d565558f68b59a156744d4c5aac5c6610c95451793de2a756f774"
+        "558c61d21818d3ebeeeb71d132da1c23a02f4b305eccc5cd46bd21dfc173a8a91098354f"
+        "10ffbb21bf63d9f4c3feb231c736504549a78fd76d39f3ad35c36178f5c233742d2917d5"
+        "611d2073124845f1e3615b2ef25199a7a547e882",
+        "9da37e104938019fbdcf247e3df879a282c45f8fb57e6655e36b47723af42bec3b820f66"
+        "0436deb3de123a21de0ca37b",
+        "04722d0ea6891d509b18b85ca56f74deb5c3030d2a30433824123d430d03c99279572c3b"
+        "28ecf01e747b9db8acc55d0ba37e2605ea7092214f366f3639037bffd89fe103c646e990"
+        "839d3a1ced8d78edb5b9bc60d834fd8e2a3c17e920bdae023a",
+        "c8c18e53a9aa5915288c33132bd09323638f7995cd89162073984ed84e72e07a37e18c4c"
+        "023933eace92c35d10e6b1b6",
+        "6512a8a2be731e301dcf4803764297862bbfa0ac8daed64d8e98b34618ecb20520fc5d3c"
+        "f890b7783edf86e7ea407541",
+        "4ff10301f7b4168fae066361376007c1d7aa89a75c87719d0b54711ffef5ef3726f3eef8"
+        "4f7ebc025c110bde511b17f6" },
+    { NID_secp384r1, NID_sha512,
+        "464f10ec6fb229a51db5fd0e122f2cb8a9a022117e2987f4007bf5565b2c16aba0714e2e"
+        "3cdd0c100d55ac3017e36fc7501ad8309ab9572aa65424c9eb2e580a119c55777676ec49"
+        "8df53ef6ae78fd8a988130ee0e6082bf1ef71cd4c946021018a8ca7154d13b174c638912"
+        "613b0bdb9001c302bf7e443ad2124ab2c1cce212",
+        "0661ab3bf9f7bef51bec7dff758de289154557beb9ce18cc4b8cc09a871e8322af259cf1"
+        "88b593dc62f03a19e75f7f69",
+        "04b4f100558043858efa728082d9b99ad5192b59b0947434f5ba7ff2514508a6d71ba54e"
+        "7221c31cb0712103272b3f6fa434f6df4eeb2da11498044635067c2715ed15ae251c78ff"
+        "b9030d87909ea8539b66394e93109ca54c0406cf99960c3e93",
+        "84a87137edb6894f96c5a8e94a3765162034feb84dfea94e1c71411170c285a80321ec79"
+        "99e25861844143209804882c",
+        "4dc9d1b949b36e3c3847ac1c7ed114e1bc9cbe76119cf6fcd3f1b69ee6ee54e3255f1bb2"
+        "88fe2f8bd6d4049a21793c27",
+        "56a561d647b62ccae1e6df818b1a6fbde66c82ef0ff69ee415f183e7daf76be22630c7e0"
+        "2cd3fd729dfa490f26824584" },
+    { NID_secp384r1, NID_sha512,
+        "4e3e0fb96320ddccde8b463c273654c4f7164920b1d63430921d2e808dee403e6420eedd"
+        "a0a557b911d00736a4f8798dd4ef26673efd6d190988ad4929ec64f8685cfb76070a36cd"
+        "6a3a4bf2f54fb08a349d44642b6f614043fef9b2813b63457c76537d23da7b37310334f7"
+        "ba76edf1999dad86f72aa3446445a65952ac4e50",
+        "66e7cfdeb7f264cf786e35210f458c32223c3a12a3bc4b63d53a5776bc9b069928452484"
+        "f6241caa3781fd1a4109d4db",
+        "043c7682de540ab231daf21bf9fc80bda6abf7e17dcc79d476c7b7c3bd4d42d386877fd8"
+        "ba495c1b0333e04fb5fd2a15050a1582e4f4d72abea9d3476aff8369c41261f0c5dddf2c"
+        "a82e10f7a163f73df09473d9e5e2552187104e4cc7c6d83611",
+        "2fa266f5cce190eb77614933ca6a55121ad8bae168ff7a9043d96d13b5ca2fe70101ff9f"
+        "e1e2b2cd7413e6aa8f49abde",
+        "e7ecda9da0c52d0474a9f70094dc8f061d7d6a22210d3b69a7be8f389aa666f256322099"
+        "b87d16ad35357ea856574dba",
+        "ba348eb40a2830ec5a1130264ac0a8675420b1ae243e808a778135809ece21f42c0c8811"
+        "66321102b4f02df4c5c7ed9d" },
+    { NID_secp384r1, NID_sha512,
+        "c466b6b6baf7e6ffa876ec06105e2d43534e0517c07b1c4c9fb67ba81ce09525a7721ec3"
+        "c290f2b1f65b6463d41598e7a25b2238501629953a5ca955b644354fb6856733a2e5bb8f"
+        "5bc21a0c803493f5539f9fb83aab3dba2c982989c2270c61ab244b68bfe1b948d00c2ed9"
+        "75e09c29b5f8a7effcad8652a148cc880d503217",
+        "92c2f7ee64af86d003ab484e12b82fcf245fc330761057fec5b7af8f7e0a2d85b468c21d"
+        "171460fcb829cae7b986316d",
+        "04ca43a306479bf8fb537d4b9ff9d635bbb2a0d60d9e854d5b7e269d09d91f78c6b90b61"
+        "6e4c931629453645a2bb371e14356c4d7f10e690614eaf7f82ba0f9dc1aad98130c0ad9f"
+        "e353deec565cc04bef789a0a4242322e0058b46cd02f2de77d",
+        "6ec81fb74f8725ba225f317264460ee300cfd2f02092000989acbdad4799cf55c244a65c"
+        "557113328fe20282e6badb55",
+        "cd7a4309bcebc25a8e10899fe2eda5f8b2dbcf329cd2f3d65befd67393e83fba2f8a67a1"
+        "5c01a6ac8314f9f5e87a9dca",
+        "6dcfc0426bc148e67e91d4784e3d7e9bc3b7ce3676be62daa7f3f55dfdff6d9dc735b5e3"
+        "e0bbd0785db1f76f7ac065f3" },
+    { NID_secp384r1, NID_sha512,
+        "feac892b7720af80b3c9eede51e923f18d3d0c5de4c31f4aa75e36df7c7c2fd8f4177885"
+        "1a24b69e67dccb65e159dd5c383243bad7cfedcc5e85c8a01c34b0b94ba8e07e4c024c09"
+        "d279b3731e8b62f9562d3c4f5042567efe42a9d0eaaabab28bc6f11232fc8ceaaf4518d9"
+        "f3b2bebf020294496b7f6b879e69503f75fecd3d",
+        "15347caaad1067f1848a676bd0a8c52021ae604b79d02775a0459226e0391a3acd26653c"
+        "916fcfe86149fb0ee0904476",
+        "04e5a0463163964d984f5bad0072d45bc2059939e60a826ccca36c151460ae360f5d6679"
+        "f60fe43e999b6da5841c96e48a30f2dd425a3fa2c95d34124217250b39e3b4a14f3e6e41"
+        "5ae8e5b0409eb72f43f78b64d0ce6f2d49980d6f04cd1391db",
+        "1a2d224db4bb9c241ca5cab18920fad615fa25c1db0de0f024cb3ace0d11ef72b0568854"
+        "46659f67650fdff692517b1c",
+        "87b4de0fb21df38dfc9a4b1e350da67547e307f55b5b9dd6615e408afe7c3553a6e02722"
+        "847367439e636074faa2182b",
+        "375d965753b9ed6c6c08576726f8308c2f8dbd2737824464e71265d47907e26f615bbeb8"
+        "203ec617520d4ecd1851dc44" },
+    { NID_secp384r1, NID_sha512,
+        "cf2982e3bf174ce547741b969403cd11e9553067e6af8177d89511a0eb040db924530bdb"
+        "a65d8b1ff714228db0737c1756f509e1506014a10736e65be2f91980a73891496e90ff27"
+        "14a3601c7565cdcef5a395e2e0e1652f138d90d61eaa9cba993b823245647f6e07cec9b8"
+        "b4449cd68a29741cd1579c66e548ca0d0acf33aa",
+        "ac1cb5e59bda2eff3413a3bab80308f9fb32c595283c795de4c17fdae8d4647b5f108fd0"
+        "801aee22adb7db129283b5aa",
+        "04bc6b1a718284803553c173089c397870aaaecca579bb8e81a8cfa12473cd2057567fa8"
+        "726a19ed427cc035baeec2c55114f82997d1129b669f0015350e47ad561b1b13441af4fb"
+        "44656f15ed0c5706984d66655accc52f2e943eef39cb1cdc21",
+        "8053a46e875f446056b06d4318fa3e8977622de7207cbf0996bf35b0e9b19aaa507f642b"
+        "cf0be9f048f1af09806f6946",
+        "a994eb15b64114ce8a9342d18b5edda96a6d76314a5ac03da723699177d352a4a9f3b712"
+        "1b11a91e43a6af4025da51d6",
+        "8183ae33a888e99aa76882da0a6705ad102f2bbd9572fad0d2e4d6d70151970469e00c52"
+        "20e59c14724d771c1384b302" },
+    { NID_secp384r1, NID_sha512,
+        "bf9fdd4107ef5a6070108771ac9eee4f0c8043bf0d04db772a47294f4137e2439d94b337"
+        "114b074e57e0cb78d0ccf352a2833e9788ee2a1a9ffeacd34f38fcefb86653d70c7dadd4"
+        "cf6548d608e70acdef6c7530974b92c813798add659752a8c72b05e1ad9c65c21834ce6f"
+        "be49d8a1426b5a54270794436d284364fac6ec1a",
+        "205f1eb3dfacff2bdd8590e43e613b92512d6a415c5951bda7a6c37db3aae39b9b7ec6ed"
+        "d256609e75373419087fa71f",
+        "04c9f1f63a18c761b077a1ec35fbb2de635db9b8592c36194a01769b57728c7755d4c79b"
+        "3d5b97a1a4631e30c86d03f13cf8c4a38770054d5cc9bb9182e6d4638242c4fd16e869ac"
+        "22e44c4b9402d594e0c6f5df6a9a7de32a4893d9f6588f1950",
+        "ecd395c5d8b7d6e6b2b19644e0d2e6086c912c6a0f5b8ed4b94b7290b65852c9741ce8ee"
+        "b08d8751ead8a183e17d76c6",
+        "e81331d78b438b0b8d98c1be03385ba5d614af182f1677f259126cc3de7eaac6c19b02be"
+        "955d936b6bf9c27c6796e6f0",
+        "17c2b7a8e0fc93909762aa9f86f9561e759ecb88f02337b2018363be6095d9e4324a6d32"
+        "96046686624b5efad6b52878" },
+    { NID_secp384r1, NID_sha512,
+        "5d634fb39a2239256107dc68db19751540b4badac9ecf2fce644724401d6d632b3ae3b2e"
+        "6d05746b77ddc0c899878032248c263eda08d3d004d35952ad7a9cfe19343d14b37f9f63"
+        "2245e7b7b5fae3cb31c5231f82b9f1884f2de7578fbf156c430257031ba97bc6579843bc"
+        "7f59fcb9a6449a4cd942dffa6adb929cf219f0ad",
+        "e21e3a739e7ded418df5d3e7bc2c4ae8da76266a1fc4c89e5b09923db80a72217f1e9615"
+        "8031be42914cf3ee725748c1",
+        "040f753171922b5334f3dd2778a64ce2da8295121939beae71ad85e5344e893be0fd03cf"
+        "14e1f031adec098e0c4409449c45c10a0ffc0eb2f1cec5c89b698061108313ee7d449ad5"
+        "80efad344f0e7cf35be8a18fca620f112e57bdc746abdace55",
+        "d06bea06b25e6c30e866b1eb0657b45673e37b709013fb28fd7373afc8277cbc861354f8"
+        "21d0bd1927e52ec083a0f41f",
+        "e8d4a31dd0e7d2522be62a32608e744c3775ceb606dc897899f0c73f1a40ce9a8be854cd"
+        "506e65cd81fd7fa2c616cb7b",
+        "8151b681b6b6046d3c36f332d06d9ba7751e740631cdb759f88c50a25a8e950d5023df8a"
+        "15c77243743733c4feaf21d5" },
+    { NID_secp384r1, NID_sha512,
+        "c9b4ff721b3e886f0dc05856ffff0aabb64a8504b1746a47fdd73e6b7ebc068f06ac7ffa"
+        "44c757e4de207fc3cbfaf0469d3ac6795d40630bcafe8c658627e4bc6b86fd6a2135afbc"
+        "18ccc8e6d0e1e86016930ca92edc5aa3fbe2c57de136d0ea5f41642b6a5d0ddeb380f245"
+        "4d76a16639d663687f2a2e29fb9304243900d26d",
+        "93434d3c03ec1da8510b74902c3b3e0cb9e8d7dccad37594d28b93e065b468d9af4892a0"
+        "3763a63eae060c769119c23c",
+        "04a52c25f2af70e5bc6a992ecef4ea54e831ed5b9453747d28aec5cffb2fcfee05be80c5"
+        "cbab21606b5507aa23878adee12cf2a9afeff83f3041dc8a05f016ccae58aa1a0e0dc6be"
+        "9d928e97f2598c9ba5e9718d5eb74c9cfb516fd8c09f55f5b9",
+        "13d047708ae5228d6e3bbada0e385afdb3b735b31123454fdf40afe3c36efed563fd2cce"
+        "84dcc45c553b0993d9ca9ec3",
+        "a0203f6f2c456baac03538ed506a182e57a25151802cf4b2557613b2fb615ebd4c50ddc5"
+        "05f87c048a45bad3b2fc371c",
+        "0eab56457c4080400fa3af124761d5a01fef35f9649edba8b97d22116386f3b8b363e97e"
+        "f3f82616d5d825df1cf865ef" },
+    { NID_secp384r1, NID_sha512,
+        "db2ad659cf21bc9c1f7e6469c5f262b73261d49f7b1755fc137636e8ce0202f929dca446"
+        "6c422284c10be8f351f36333ebc04b1888cba217c0fec872b2dfc3aa0d544e5e06a9518a"
+        "8cfe3df5b20fbcb14a9bf218e3bf6a8e024530a17bab50906be34d9f9bba69af0b11d8ed"
+        "426b9ec75c3bd1f2e5b8756e4a72ff846bc9e498",
+        "e36339ddbe8787062a9bc4e1540690915dd2a2f11b3fe9ee946e281a0a2cbed426df405e"
+        "d9cb0eca42f85443efd09e0c",
+        "04a1ffb4b790d1593e907369b69de10b93cddbb02c6131f787422364d9d692768ef80979"
+        "70306cce16c97f2b10c538efa7d0692028601ea794d2563ffe9facc7273938fab47dd00b"
+        "8960be15549a9c2b3f8552583eb4c6cd212fe486c159c79153",
+        "2226f7329378cecd697f36ae151546643d67760856854661e31d424fae662da910e2157d"
+        "a9bb6dfbe3622296e0b5710c",
+        "20dcc25b67dd997621f437f65d78347fb57f8295b1b14453b1128203cda892bcfe726a2f"
+        "107d30975d63172e56f11d76",
+        "51cff592cbef75ef8321c8fa1e4229c4298b8180e427bee4e91d1e24fc28a729cf296beb"
+        "728960d2a58cf26773d8e2e2" },
+    { NID_secp384r1, NID_sha512,
+        "dbd8ddc02771a5ff7359d5216536b2e524a2d0b6ff180fa29a41a8847b6f45f1b1d52344"
+        "d32aea62a23ea3d8584deaaea38ee92d1314fdb4fbbecdad27ac810f02de0452332939f6"
+        "44aa9fe526d313cea81b9c3f6a8dbbeafc899d0cdaeb1dca05160a8a039662c4c845a3db"
+        "b07be2bc8c9150e344103e404411668c48aa7792",
+        "5da87be7af63fdaf40662bd2ba87597f54d7d52fae4b298308956cddbe5664f1e3c48cc6"
+        "fd3c99291b0ce7a62a99a855",
+        "0454c79da7f8faeeee6f3a1fdc664e405d5c0fb3b904715f3a9d89d6fda7eabe6cee86ef"
+        "82c19fca0d1a29e09c1acfcf18926c17d68778eb066c2078cdb688b17399e54bde5a79ef"
+        "1852352a58967dff02c17a792d39f95c76d146fdc086fe26b0",
+        "1b686b45a31b31f6de9ed5362e18a3f8c8feded3d3b251b134835843b7ae8ede57c61dc6"
+        "1a30993123ac7699de4b6eac",
+        "9dbfa147375767dde81b014f1e3bf579c44dd22486998a9b6f9e0920e53faa11eed29a4e"
+        "2356e393afd1f5c1b060a958",
+        "e4d318391f7cbfe70da78908d42db85225c85f4f2ff413ecad50aad5833abe91bdd5f6d6"
+        "4b0cd281398eab19452087dd" },
+    { NID_secp521r1, NID_sha224,
+        "58ec2b2ceb80207ff51b17688bd5850f9388ce0b4a4f7316f5af6f52cfc4dde4192b6dbd"
+        "97b56f93d1e4073517ac6c6140429b5484e266d07127e28b8e613ddf65888cbd5242b2f0"
+        "eee4d5754eb11f25dfa5c3f87c790de371856c882731a157083a00d8eae29a57884dbbfc"
+        "d98922c12cf5d73066daabe3bf3f42cfbdb9d853",
+        "1d7bb864c5b5ecae019296cf9b5c63a166f5f1113942819b1933d889a96d12245777a994"
+        "28f93de4fc9a18d709bf91889d7f8dddd522b4c364aeae13c983e9fae46",
+        "0401a7596d38aac7868327ddc1ef5e8178cf052b7ebc512828e8a45955d85bef49494d15"
+        "278198bbcc5454358c12a2af9a3874e7002e1a2f02fcb36ff3e3b4bc0c69e70184902e51"
+        "5982bb225b8c84f245e61b327c08e94d41c07d0b4101a963e02fe52f6a9f33e8b1de2394"
+        "e0cb74c40790b4e489b5500e6804cabed0fe8c192443d4027b",
+        "141f679033b27ec29219afd8aa123d5e535c227badbe2c86ff6eafa5116e9778000f5385"
+        "79a80ca4739b1675b8ff8b6245347852aa524fe9aad781f9b672e0bb3ff",
+        "06b973a638bde22d8c1c0d804d94e40538526093705f92c0c4dac2c72e7db013a9c89ffc"
+        "5b12a396886305ddf0cbaa7f10cdd4cd8866334c8abfc800e5cca365391",
+        "0b0a01eca07a3964dd27d9ba6f3750615ea36434979dc73e153cd8ed1dbcde2885ead575"
+        "7ebcabba117a64fcff9b5085d848f107f0c9ecc83dfa2fa09ada3503028" },
+    { NID_secp521r1, NID_sha224,
+        "2449a53e0581f1b56d1e463b1c1686d33b3491efe1f3cc0443ba05d65694597cc7a2595b"
+        "da9cae939166eb03cec624a788c9bbab69a39fb6554649131a56b26295683d8ac1aea969"
+        "040413df405325425146c1e3a138d2f4f772ae2ed917cc36465acd66150058622440d7e7"
+        "7b3ad621e1c43a3f277da88d850d608079d9b911",
+        "17e49b8ea8f9d1b7c0378e378a7a42e68e12cf78779ed41dcd29a090ae7e0f883b0d0f2c"
+        "bc8f0473c0ad6732bea40d371a7f363bc6537d075bd1a4c23e558b0bc73",
+        "0400156cd2c485012ea5d5aadad724fb87558637de37b34485c4cf7c8cbc3e4f106cb1ef"
+        "d3e64f0adf99ddb51e3ac991bdd90785172386cdaf2c582cc46d6c99b0fed101edeeda71"
+        "7554252b9f1e13553d4af028ec9e158dbe12332684fc1676dc731f39138a5d301376505a"
+        "9ab04d562cc1659b0be9cb2b5e03bad8b412f2699c245b0ba2",
+        "1dc3e60a788caa5f62cb079f332d7e5c918974643dca3ab3566a599642cd84964fbef43c"
+        "e94290041fe3d2c8c26104d9c73a57a7d4724613242531083b49e255f33",
+        "12592c0be6cce18efb2b972cd193d036dcb850f2390fa8b9b86b2f876548bc424fb3bc13"
+        "c1e5c415fa09d0ecfcae5bf76fb23e8322d7eecb264a2ae6d20ef50d405",
+        "11bc9713be88e3b9912a3e5f5d7b56f20573e979b1a75d04ce339f724bddffa4665d2599"
+        "5fe24d32507d8a07c5e10169f5338ef2827737f7b0291752b21237217e3" },
+    { NID_secp521r1, NID_sha224,
+        "7ba05797b5b67e1adfafb7fae20c0c0abe1543c94cee92d5021e1abc57720a6107999c70"
+        "eacf3d4a79702cd4e6885fa1b7155398ac729d1ed6b45e51fe114c46caf444b20b406ad9"
+        "cde6b9b2687aa645b46b51ab790b67047219e7290df1a797f35949aaf912a0a8556bb210"
+        "18e7f70427c0fc018e461755378b981d0d9df3a9",
+        "135ea346852f837d10c1b2dfb8012ae8215801a7e85d4446dadd993c68d1e9206e1d8651"
+        "b7ed763b95f707a52410eeef4f21ae9429828289eaea1fd9caadf826ace",
+        "04018d40cc4573892b3e467d314c39c95615ee0510e3e4dbc9fa28f6cd1f73e7acde15ad"
+        "7c8c5339df9a7774f8155130e7d1f8de9139ddd6dfe1841c1e64c38ea98243017021782d"
+        "33dc513716c83afe7ba5e7abef9cb25b31f483661115b8d6b5ae469aaf6f3d54baa3b658"
+        "a9af9b6249fd4d5ea7a07cb8b600f1df72b81dac614cfc384a",
+        "0c24acc1edb3777212e5b0bac744eadf4eda11fa150753b355bf96b189e6f57fc02284bb"
+        "22d8b3cd8bba7a09aae9f4ea955b382063425a6f8da2f99b9647b147172",
+        "183da7b8a9f9d5f08903359c1a2435b085fcf26a2ed09ab71357bb7634054acc569535e6"
+        "fe81d28233e4703005fc4bf83ce794d9463d575795aa0f03398e854cefd",
+        "0b3621145b9866ab7809139795cc30cd0404127a7f0fafa793660491009f6c53724fdb0b"
+        "1ffbf0fd51c131180b8a957fe66e76d2970247c024261c768dee9abbfb9" },
+    { NID_secp521r1, NID_sha224,
+        "716dabdb22a1c854ec60420249905a1d7ca68dd573efaff7542e76f0eae54a1828db69a3"
+        "9a1206cd05e10e681f24881b131e042ed9e19f5995c253840e937b809dfb8027fed71d54"
+        "1860f318691c13a2eb514daa5889410f256305f3b5b47cc16f7a7dad6359589b5f4568de"
+        "4c4aae2357a8ea5e0ebaa5b89063eb3aa44eb952",
+        "1393cb1ee9bfd7f7b9c057ecc66b43e807e12515f66ed7e9c9210ba1514693965988e567"
+        "fbad7c3f17231aacee0e9b9a4b1940504b1cd4fd5edfaa62ba4e3e476fc",
+        "0401e855c935139c8092092cfa733db1292530506eeb2bbb1687f9602c36d97a6714e998"
+        "892d5d3b842d1896a6ece9d549e9792881a256256137b3dff180c96cc5d07b018d83b6e9"
+        "3cd287311f7bf7c1d7f9eeabcf0b69c12f2d8f40e333e81e956d968532a37a4c04d76187"
+        "4df293b484cd7053b03fdbc2fdcd3b4c412d6f272fb7c93fe6",
+        "1d98619bdc04735d30c222fc67da82c069aea5f449af5e8c4db10c1786c0cb9e6f2cc0bb"
+        "66fa6be18c485570d648dafcd0a973c43d5c94e9a9dacbd3170e53fa2a0",
+        "0bf47fabe107ce0ec03e2ad60a79b058e1bebb18568b6a8cdbe86032e71aa30c15766105"
+        "b2ea952cfa79bcab046df601159f96e179bbcf252dc68ac73d31481fdae",
+        "1f918fec69cd07d90f9d892b7117e7519c3224947f4262f1fd97077dd5386a6c78aeddff"
+        "3ee97e59ea353f06029f1336f0d6ef5c0f4b17ca59343a55319b7bfc3db" },
+    { NID_secp521r1, NID_sha224,
+        "9cc9c2f131fe3ac7ea91ae6d832c7788cbbf34f68e839269c336ceef7bef6f20c0a62ea8"
+        "cc340a333a3002145d07eba4cf4026a0c4b26b0217a0046701de92d573d7c87a386a1ea6"
+        "8dc80525b7dcc9be41b451ad9f3d16819e2a0a0b5a0c56736da3709e64761f97cae2399d"
+        "e2a4022dc4c3d73c7a1735c36dbde86c4bc5b6f7",
+        "179fa164e051c5851e8a37d82c181e809a05fea9a3f083299b22684f59aa27e40dc5a33b"
+        "3f7949338764d46bfe1f355134750518b856d98d9167ef07aac3092c549",
+        "0401857cc7bbed20e87b3fd9a104956aa20c6502192910e0e7598410526ebfe1c99397b8"
+        "5189612a60c51fb8f4dd5cb08a8cd2e702563062dcb043410715c5323a004601fce8d135"
+        "284310d2f38c216030634b32cd223222f0d9d8d2b7c55477c4b8b74fc6c96a6092f34b05"
+        "ca44d3633a5037c2166c479a032bb4f949f89fc1ba5236d07d",
+        "16d9704c0cee791f2938bb2a8a595752a3635c2f557efeecefd719414b5f2aaf846080f5"
+        "82c76eae7a8fddf81859b49d0131c212524d55defa67dca1a9a28ca400f",
+        "1c9a4e51774384e8362876a87c572e6463a54413c7c6252c552ebb182f83e45ace436ade"
+        "4ca373d8a7216e83efb62c8b41c4d5132a0afa65078f16d189baca39187",
+        "1e92a7dd5fea29a666398e1df5775cbb5664fe6943fe4c1d2bba516b7543c84df584458e"
+        "53919c4ffab579a26fb3c892a5d1a77b0a07428c89350f8b559e627b014" },
+    { NID_secp521r1, NID_sha224,
+        "14c69f8d660f7a6b37b13a6d9788eff16311b67598ab8368039ea1d9146e54f55a83b3d1"
+        "3d7ac9652135933c68fafd993a582253be0deea282d86046c2fb6fd3a7b2c80874ced28d"
+        "8bed791bd4134c796bb7baf195bdd0dc6fa03fdb7f98755ca063fb1349e56fd0375cf947"
+        "74df4203b34495404ebb86f1c7875b85174c574c",
+        "13dabca37130ba278eae2b3d106b5407711b0d3b437fbf1c952f0773571570764d2c7cb8"
+        "896a8815f3f1975b21adc6697898e5c0a4242092fc1b80db819a4702df4",
+        "0400bc2aebf40cd435bc37d73c09d05f2fd71321111a767c2b0d446f90dd4a186839c694"
+        "ceb734e027e7ee948f0f63e4d3f1656d3d543df23c342a599306909b34710901f4c98ac0"
+        "3f0718e58d5d1762c920445b11dbdd60ec7f60095809204e14965a4ecb0be6fea06adbac"
+        "8ba431d6f144c75c199225df2a619a34be99897125b3a10af8",
+        "0401187c8b89945a1e48cda9ee52167789f4121e67482a7ac797899f5d3d2e623aed31e4"
+        "adae08a8d43e69028fa074d2650317cbc765f6ed191cf0317b4bae57881",
+        "1e572afed754016fba43fc33e352932c4db65efcb84e2bd159b40fc5925893b161effc40"
+        "240be28d8c07154d2615f605c6f0451b976522d95afd37f46602df7a12a",
+        "030370c1c5352c2b663ac1858b42f69545b2f58ed5b2c007f303726977d3c756b5d644ec"
+        "6788f94c886f78269aa190a3d8d1ae10e4fd24d937c4556fb9e1953fd6d" },
+    { NID_secp521r1, NID_sha224,
+        "8d8e75df200c177dbfe61be61567b82177ea5ec58e2781168d2277d2fd42668f01248ca3"
+        "eb29ffa2689b12ae40f9c429532b6d2e1f15891322b825a0a072a1c68fa09e78cfdef3e9"
+        "5ed6fdf7233a43cb68236560d49a3278f0b3f47cb08f475bd9ab2f60755ea4a1767de931"
+        "3b71a1b9ea87ef33f34682efbda263b0f8cc2f52",
+        "198681adbde7840d7ccd9cf1fb82056433fb4dd26bddf909af7b3b99da1ca2c05c8d4560"
+        "ecd80ba68f376f8b487897e374e99a9288ed7e3645cc0d00a478aae8d16",
+        "040057ce3777af7032f1f82308682e71fe09f88bf29dacd5018a725e1caa4b1e2bfdd894"
+        "fe618f9266f31ba089856dc9c1b70e4a2faa08b4b744d1aafcd5ae99e2c7360199bcfef2"
+        "021bc5890d7d39ec5dc0c26956801e84cae742cf6c50386eb289b6e97754dd25a94abf81"
+        "f1cb1b36935b5eb29f4b32a6516d2ff6a7d23064a0daec94b3",
+        "19d2d74ad8ee2d85048f386998a71899ef6c960b4ab324e5fd1c0a076c5a632fd0009500"
+        "076522e052c5c9806eef7056da48df6b16eb71cdf0f1838b0e21715fce0",
+        "18ecacbcffd5414bbb96728e5f2d4c90178e27733d13617e134ec788022db124374bbaa1"
+        "1e2c77fe3f38d1af6e998e1b0266b77380984c423e80ffa6ff2bcafd57a",
+        "1c727f34b6a378f3087721a54e9796499b597ecf6666b8f18312d67e1190a8a66e878efc"
+        "2367b551267494e0245979ef4deed6d2cbf2c3711af6d82ccfeb101a377" },
+    { NID_secp521r1, NID_sha224,
+        "10631c3d438870f311c905e569a58e56d20a2a560e857f0f9bac2bb7233ec40c79de1452"
+        "94da0937e6b5e5c34fff4e6270823e5c8553c07d4adf25f614845b2eac731c5773ebbd71"
+        "6ab45698d156d043859945de57473389954d223522fbafecf560b07ef9ba861bcc1df9a7"
+        "a89cdd6debf4cd9bf2cf28c193393569ccbd0398",
+        "08c4c0fd9696d86e99a6c1c32349a89a0b0c8384f2829d1281730d4e9af1df1ad5a0bcfc"
+        "cc6a03a703b210defd5d49a6fb82536f88b885776f0f7861c6fc010ef37",
+        "040164ac88ed9afe137f648dd89cdd9956682830cac5f7c1a06d19a1b19f82bb1d22dfee"
+        "fea30d35c11202fed93fd5ce64835d27c6564d6e181287fa04a2d20994986b005cb83669"
+        "265f5380ccefe6b4f85fdf0049e6703f6f378a0b2e52ed0fbbcf300afebb722f4ed48e38"
+        "19cb976c1d60e2ba05646b478f6dfecfbae730e9644c297f00",
+        "189801432cba9bf8c0763d43b6ec3b8636e62324587a4e27905b09a58e4aa66d07d096db"
+        "ce87824e837be1c243dd741f983c535a5dd2f077aac8beee9918258d3cb",
+        "0917723f7241e8dc7cd746b699ab621d068dd3a90e906aaf0a4862744b96fd4e5ccdb9c7"
+        "796c27f7196e693d06ec209464c3ea60ad6313e9b77cceaa14767e6651c",
+        "0957b0ecdc3668f6efa5d0957615bcfffd6419c5e57579b74f960f65ae3fb9e8284322ff"
+        "710b066f7e0959ac926d3cf9a594bdb70bbec756c96910b26a2486dee9e" },
+    { NID_secp521r1, NID_sha224,
+        "80aad6d696cbe654faa0d0a24d2f50d46e4f00a1b488ea1a98ed06c44d1d0c568beb4ab3"
+        "674fc2b1d2d3da1053f28940e89ba1244899e8515cabdd66e99a77df31e90d93e37a8a24"
+        "0e803a998209988fc829e239150da058a300489e33bf3dcdaf7d06069e74569fee77f4e3"
+        "875d0a713ccd2b7e9d7be62b34b6e375e84209ef",
+        "1466d14f8fbe25544b209c5e6a000b771ef107867e28ed489a42015119d1aa64bff51d6b"
+        "7a0ac88673bbc3618c917561cff4a41cdb7c2833dab5ebb9d0ddf2ca256",
+        "0401dc8b71d55700573a26af6698b92b66180cf43e153edadb720780321dbb4e71d28e0a"
+        "488e4201d207fc4848fe9dd10dcabec44492656a3ff7a665fe932445c82d0b01920b1633"
+        "1b7abeb3db883a31288ef66f80b7728b008b3cc33e03a68f68d9e653a86e3177bbc00014"
+        "fa5ea4c1608c0d455c2e2ac7bd8ab8519ebf19955edf1baf8d",
+        "160d04420e0d31b0df476f83393b1f9aff68389cc3299e42ef348d97646f7531a722b66d"
+        "dfb9501bbb5c4a41d84c78be7233b11489bceb817d23060e6017433fab8",
+        "08077aabd0a342f03f912007c586cfedfc63f93d1118f720d5b62b3ce141a60f86f111df"
+        "d8fc2e31a6778981f1a5e28f29a7369bd7897bb41240c8d3a9c170e0ee0",
+        "00abc75fc154b93840579457820957e89d1260fee0a4b9bb1946f61ca1e71afd76bb5e10"
+        "77b3e38ceb39d1fac5ef8b217c4110617b3ad118e02b3fcc2a39ef38613" },
+    { NID_secp521r1, NID_sha224,
+        "8a7792a2870d2dd341cd9c4a2a9ec2da753dcb0f692b70b64cef2e22071389c70b3b188d"
+        "ea5f409fb435cbd09082f59de6bc2ff9e65f91b7acc51e6e7f8e513148cb3c7c4664f227"
+        "d5c704626b0fda447aa87b9d47cd99789b88628eb642ed250312de5ba6b25f3d5342a3cb"
+        "b7ebd69b0044ee2b4c9ba5e3f5195afb6bea823d",
+        "01a99fcf54c9b85010f20dc4e48199266c70767e18b2c618044542cd0e23733817776a1a"
+        "45dbd74a8e8244a313d96c779f723013cd88886cb7a08ef7ee8fdd862e7",
+        "0401912d33b01d51e2f777bdbd1ada23f2b1a9faf2be2f2a3b152547db9b149b697dd718"
+        "24ca96547462e347bc4ef9530e7466318c25338c7e04323b1ba5fd25ea716200bbe9b1e3"
+        "a84accd69b76b253f556c63e3f374e3de0d1f5e3600fc19215533b2e40d6b32c3af33314"
+        "d223ea2366a51d1a337af858f69326389276f91be5c466e649",
+        "14fafd60cb026f50c23481867772411bb426ec6b97054e025b35db74fe8ea8f74faa2d36"
+        "e7d40b4652d1f61794878510b49b7b4fe4349afccd24fc45fec2fd9e9e7",
+        "18b1df1b6d7030a23a154cacce4a2e3761cc6251ff8bf6c9f6c89d0a15123baef9b338ad"
+        "a59728349ce685c03109fcde512ed01a40afd2ca34e1bc02ecf2871d45c",
+        "0a399f9b9e21aeddf450429fec2dc5749e4a4c7e4f94cee736004dcc089c47635da22845"
+        "992cd076a4f0a01d2cc1b0af6e17b81a802361699b862157ad6cad8bd1d" },
+    { NID_secp521r1, NID_sha224,
+        "f971bcd396efb8392207b5ca72ac62649b47732fba8feaa8e84f7fb36b3edb5d7b5333fb"
+        "fa39a4f882cb42fe57cd1ace43d06aaad33d0603741a18bc261caa14f29ead389f7c2053"
+        "6d406e9d39c34079812ba26b39baedf5feb1ef1f79990496dd019c87e38c38c486ec1c25"
+        "1da2a8a9a57854b80fcd513285e8dee8c43a9890",
+        "1b6015d898611fbaf0b66a344fa18d1d488564352bf1c2da40f52cd997952f8ccb436b69"
+        "3851f9ccb69c519d8a033cf27035c27233324f10e9969a3b384e1c1dc73",
+        "040110c6177ceb44b0aec814063f297c0c890671220413dbd900e4f037a67d87583eaf4b"
+        "6a9a1d2092472c17641362313c6a96f19829bb982e76e3a993932b848c7a9700f6e566c4"
+        "e49b2ee70a900dc53295640f3a4a66732df80b29f497f4ae2fa61d0949f7f4b12556967b"
+        "b92201a4f5d1384d741120c95b617b99c47a61e11c93a482d6",
+        "1a88667b9bdfe72fb87a6999a59b8b139e18ef9273261549bc394d884db5aa64a0bc7c7d"
+        "38a8ef17333478d2119d826e2540560d65f52b9a6dc91be1340cfd8f8f8",
+        "015f73def52ea47ddb03e0a5d154999642202e06e6734ac930c1dc84756c67bbb1cca9f2"
+        "1f92d61bfdb2052c5dd2833349610f68139393d77250a7662ef7bd17cbe",
+        "155c744a729f83b27d1f325a91e63a0d564fe96ff91eaa1bad3bff17d2abffa065d14a1d"
+        "20a04dd993f6ed3260b60bcc6401e31f6bc75aaafe03e8c1a9cd14d2708" },
+    { NID_secp521r1, NID_sha224,
+        "ec0d468447222506b4ead04ea1a17e2aa96eeb3e5f066367975dbaea426104f2111c45e2"
+        "06752896e5fa7594d74ed184493598783cb8079e0e915b638d5c317fa978d9011b44a76b"
+        "28d752462adf305bde321431f7f34b017c9a35bae8786755a62e746480fa3524d398a6ff"
+        "5fdc6cec54c07221cce61e46fd0a1af932fa8a33",
+        "05e0d47bf37f83bcc9cd834245c42420b68751ac552f8a4aae8c24b6064ae3d33508ecd2"
+        "c17ec391558ec79c8440117ad80e5e22770dac7f2017b755255000c853c",
+        "0401a6effc96a7f23a44bf9988f64e5cfafdae23fa14e4bee530af35d7a4ddf6b80dcd0d"
+        "937be9dd2db3adcda2f5216fecbce867ee67e7e3773082f255156e31358c2f01e7760190"
+        "dfbe07ec2df87067597087de262c1e0a12355456faba91b2e7277050d73b924e14c0e93b"
+        "8457a8b3e1f4207ce6e754274f88ad75c000d1b2977edc9c1a",
+        "18afea9a6a408db1e7a7bb1437a3d276f231eacfc57678bfa229d78681cbe4e800e60653"
+        "32a3128db65d3aa446bb35b517dca26b02e106e1311881a95b0302d15e8",
+        "01c49b3c1d21f1678bdbe1ac12167e95e06617190bdee1a729c1c649210da19e2e210f66"
+        "89e1310513bfe2ac6c0f4ee5f324f344b31b18df341eaadb826d07adc9b",
+        "129d4931ba457443012f6ffecd002f2abc3a4b65a58fee8457917ebcf24b29a1d3055b7f"
+        "c62939a74ebb0c3582172ee7c3c75e0b2fa2367c6e04df63a7a91d593ad" },
+    { NID_secp521r1, NID_sha224,
+        "d891da97d2b612fa6483ee7870e0f10fc12a89f9e33d636f587f72e0049f5888782ccde3"
+        "ea737e2abca41492bac291e20de5b84157a43c5ea900aef761006a4471072ab6ae6d515f"
+        "fe227695d3ff2341355b8398f72a723ae947f9618237c4b6642a36974860b452c0c62026"
+        "88bc0814710cbbff4b8e0d1395e8671ae67ada01",
+        "1804ab8f90ff518b58019a0b30c9ed8e00326d42671b71b067e6f815ac6752fa35016bd3"
+        "3455ab51ad4550424034419db8314a91362c28e29a80fbd193670f56ace",
+        "0400a79529d23a832412825c3c2ad5f121c436af0f29990347ecfa586ce2e57fd3c7e062"
+        "4d8db1f099c53473dbc2578f85416ad2ac958a162051014fb96bf07f9e1d17017c0750f2"
+        "6df0c621d2d243c6c99f195f0086947b1bf0f43731555f5d677e2d4a082fb5fe8da87e15"
+        "92a5fa31777da3299cede5a6f756edf81c85b77853388bb3ab",
+        "042d7c36fec0415bc875deb0fab0c64548554062e618aee3aa6670ffd68ab579fe620d3a"
+        "9316357267fd3111c0ed567dca663acd94b646d2ba0771953cd9690ef42",
+        "0d01dfbef126febbdfa03ef43603fd73bc7d2296dce052216e965fed7bb8cbbc24142bfc"
+        "ddb60c2e0bef185833a225daa0c91a2d9665176d4ad9986da785f4bfcf0",
+        "16627e2614dbcd371693c10bbf579c90c31a46c8d88adf59912c0c529047b053a7c77151"
+        "42f64dcf5945dbc69ff5b706c4b0f5448d04dd1f0b5a4c3765148bf253d" },
+    { NID_secp521r1, NID_sha224,
+        "924e4afc979d1fd1ec8ab17e02b69964a1f025882611d9ba57c772175926944e42c68422"
+        "d15f9326285538a348f9301e593e02c35a9817b160c05e21003d202473db69df695191be"
+        "22db05615561951867f8425f88c29ba8997a41a2f96b5cee791307369671543373ea91d5"
+        "ed9d6a34794d33305db8975b061864e6b0fe775f",
+        "0159bff3a4e42b133e20148950452d99681de6649a56b904ee3358d6dd01fb6c76ea0534"
+        "5cb9ea216e5f5db9ecec201880bdff0ed02ac28a6891c164036c538b8a8",
+        "04012d7f260e570cf548743d0557077139d65245c7b854ca58c85920ac2b290f2abfeccd"
+        "3bb4217ee4a29b92513ddce3b5cbf7488fb65180bb74aeb7575f8682337ef50175601862"
+        "30c7e8bff0bffce1272afcd37534f317b453b40716436a44e4731a3ec90a8f17c53357bc"
+        "54e6ff22fc5b4ca892321aa7891252d140ece88e25258b63d5",
+        "14b8a30f988cefdc0edec59537264edb0b697d8c4f9e8507cf72bc01c761304bd2019da1"
+        "d67e577b84c1c43dd034b7569f16635a771542b0399737025b8d817e1c3",
+        "0fc50939ebca4f4daa83e7eaf6907cb08f330c01d6ea497b86becda43dfcad47cb5c48f5"
+        "eb2cc924228628070bcd144088c449a7873242ba86badf796097dbecd6d",
+        "0ccb6463c4301ba5c043e47ed508d57dd908fd0d533af89fd3b11e76343a1cf2954ce90b"
+        "0eb18cbc36acd6d76b3906612d8a0feec6ebed13d88650ed9c708b28a11" },
+    { NID_secp521r1, NID_sha224,
+        "c64319c8aa1c1ae676630045ae488aedebca19d753704182c4bf3b306b75db98e9be4382"
+        "34233c2f14e3b97c2f55236950629885ac1e0bd015db0f912913ffb6f1361c4cc25c3cd4"
+        "34583b0f7a5a9e1a549aa523614268037973b65eb59c0c16a19a49bfaa13d507b29d5c7a"
+        "146cd8da2917665100ac9de2d75fa48cb708ac79",
+        "17418dfc0fc3d38f02aa06b7df6afa9e0d08540fc40da2b459c727cff052eb0827bdb3d5"
+        "3f61eb3033eb083c224086e48e3eea7e85e31428ffe517328e253f166ad",
+        "04000188366b9419a900ab0ed9633426d51e25e8dc03f4f0e7549904243981ec469c8d6d"
+        "938f6714ee620e63bb0ec536376a73d24d40e58ad9eb44d1e6063f2eb4c51d009889b920"
+        "3d52b9243fd515294a674afd6b81df4637ffdddc43a7414741eda78d8aa862c9cbbb618a"
+        "cec55bb9a29aac59616fc804a52a97a9fc4d03254f4469effe",
+        "1211c8824dcbfa0e1e15a04779c9068aed2431daeac298260795e6a80401f11f6d52d36b"
+        "cee3cfa36627989c49d11475163aa201d2cd4c5394144a6bb500bbaf02b",
+        "1d59401b8ac438855d545a699991142685077a409de2418c7ccfe01a4771b3870e76287a"
+        "9654c209b58a12b0f51e8dc568e33140a6b630324f7ef17caa64bf4c139",
+        "143af360b7971095b3b50679a13cd49217189eaee4713f4201720175216573c68f7ac6f6"
+        "88bfe6eb940a2d971809bf36c0a77decc553b025ed41935a3898685183b" },
+    { NID_secp521r1, NID_sha256,
+        "8ab8176b16278db54f84328ae0b75ef8f0cd18afdf40c04ad0927ed0f6d9e47470396c8e"
+        "87cde7a9be2ffbfe6c9658c88b7de4d582111119c433b2e4a504493f0a1166e3a3ea0d7b"
+        "93358f4a297d63f65a5e752f94e2ee7f49ebcc742fa3eb03a617d00c574245b77a200338"
+        "54d82964b2949e2247637239ab00baf4d170d97c",
+        "1e8c05996b85e6f3f875712a09c1b40672b5e7a78d5852de01585c5fb990bf3812c32455"
+        "34a714389ae9014d677a449efd658254e610da8e6cad33414b9d33e0d7a",
+        "04007d042ca19408524e68b981f1419351e3b84736c77fe58fee7d11317df2e850d960c7"
+        "dd10d10ba714c8a609d163502b79d682e8bbecd4f52591d2748533e45a867a0197ac6416"
+        "111ccf987d290459ebc8ad9ec56e49059c992155539a36a626631f4a2d89164b985154f2"
+        "dddc0281ee5b5178271f3a76a0914c3fcd1f97be8e8376efb3",
+        "0dc8daaacddb8fd2ff5c34a5ce183a42261ad3c64dbfc095e58924364dc47ea1c05e2599"
+        "aae917c2c95f47d6bb37da008af9f55730ddbe4d8ded24f9e8daa46db6a",
+        "09dd1f2a716843eedec7a6645ac834d4336e7b18e35701f06cae9d6b290d41491424735f"
+        "3b57e829ad5de055eaeef1778f051c1ee152bf2131a081e53df2a567a8a",
+        "02148e8428d70a72bc9fa986c38c2c97deda0420f222f9dc99d32c0acba699dc7ba0a2b7"
+        "9ce5999ff61bd0b233c744a893bc105bca5c235423e531612da65d72e62" },
+    { NID_secp521r1, NID_sha256,
+        "c4bc2cec829036469e55acdd277745034e4e3cc4fcd2f50ec8bd89055c19795a1e051ccf"
+        "9aa178e12f9beab6a016a7257e391faa536eaa5c969396d4e1ade36795a82ebc709d9422"
+        "de8497e5b68e7292538d4ccdc6dd66d27a3ece6a2844962b77db073df9489c9710585ba0"
+        "3d53fa430dbc6626dc03b61d53fc180b9af5dea6",
+        "0b65bf33b2f27d52cbfabcadce741e691bf4762089afd37964de1a0deda98331bf8c7402"
+        "0a14b52d44d26e2f6fa7bcddbe83be7db17a0c8a1b376469cf92c6da27c",
+        "04010038bb9a7aea626de68c14c64243150e72c69e2f8a1ab922bfbdaa6f33d24fb4542c"
+        "0324357b0dd640bbcd07632ecd253f64ca2bfbfbf3de9b24fffd0568ab82da00faf867d9"
+        "5308cc36d6f46844a0f535dc70f9768eed011a2464d2f308fa1d8e72c3616aec7e705169"
+        "08183ffce7fdd36984a15f73efaa3858c2edf16a784d40e6c2",
+        "14aeb96c57d99677a1f5e4588064215e7e9af4027bfb8f31ff6126dbf341b8e6f719465e"
+        "4273e91ba32670feca802549808322b7ee108bb20653cf20f93284d365f",
+        "075ead62edf7d86c5d1bc2443d1aeb5dc034fd999e6ea012cef7499d9d050cd97d262095"
+        "884e9fc89a42e15bd3dee80fe3c1ba10f4caabc4aabb86347023028b663",
+        "129a992a6ff66d41948d11fa680f732b1a74315b804c982805190ed9d2fae223f2b14998"
+        "0b9241998cdea0c5672595a8a49d5186a0ef7a46c0a376f925bdda81726" },
+    { NID_secp521r1, NID_sha256,
+        "1c1b641d0511a0625a4b33e7639d7a057e27f3a7f818e67f593286c8a4c827bb1f3e4f39"
+        "9027e57f18a45403a310c785b50e5a03517c72b45ef8c242a57b162debf2e80c1cf6c7b9"
+        "0237aede5f4ab1fcaf8187be3beb524c223cc0ceff24429eb181a5eea364a748c7132148"
+        "80d976c2cd497fd65ab3854ad0d6c2c1913d3a06",
+        "02c4e660609e99becd61c14d043e8b419a663010cc1d8f9469897d7d0a4f076a619a7214"
+        "a2a9d07957b028f7d8539ba7430d0b9a7de08beeeae8452d7bb0eac669d",
+        "0400fb3868238ca840dbb36ecc6cf04f5f773ea0ab8e8b0fdcf779dc4039a8d7146a4175"
+        "04e953c0cb5e7f4e599cc2c168deda8b7f16084b5582f89f2ece4cae5167f701f90b5c15"
+        "eeda48e747cf3ee8183166a49dbfac6161cbd09d29d40a6854f4c495e88a435892a920cd"
+        "aad20d41985890b648badd4f0a858ffcbd9afdfc23134ede18",
+        "1f875bbf882cd6dd034a87916c7b3ba54b41b2ea2ce84ebaf4e393fcf7291fee09dec2b5"
+        "bb8b6490997c9e62f077c34f0947fe14cec99b906dd6bf0b5d301e75ca1",
+        "07aa70425697736b298233249f5d0cf25c99e640c9ff88035ef1804820e1bfe7d043755f"
+        "02d7a079494f7fa6dc26740c4e6b7b430c63f29c67bbd3a5c88d2f0e8d1",
+        "0e0d42e4ff11cf5be37a9fda348514d5097a662f214687cbfb28ff42d635b13029871ca4"
+        "f464bb1fbce02d5da4d5fb61b2a071844259fc863d136197bec3a61e7c7" },
+    { NID_secp521r1, NID_sha256,
+        "adb5f069b2b501a3ebb83d4f1808eb07710ac4a7b12532996855a20bcc54b2f76812915f"
+        "632163c3654ff13d187d007152617cf859200194b59c5e81fc6cc9eb1ceb75d654050f26"
+        "0caa79c265254089270ccd02607fdcf3246119738c496dc3a4bd5d3be15789fc3d29a08d"
+        "6d921febe2f40aef286d5d4330b07198c7f4588e",
+        "17c3522007a90357ff0bda7d3a36e66df88ca9721fb80e8f63f50255d47ee819068d018f"
+        "14c6dd7c6ad176f69a4500e6f63caf5cf780531004f85009c69b9c1230c",
+        "04013a4bea0eed80c66ea973a9d3d4a90b6abbb5dee57d8affaf93390a8783a20982eba6"
+        "44d2e2809f66530adeeee7f9a1da7515447e9ba118999f76f170c375f621f7012f9dfaee"
+        "40a75d8442b39b37a5c19ea124b464236e9b9a31bae6780cfd50f7ea4a700154b5ea0fee"
+        "b64e9b35a1b0e33e46900cca1f34d13bb17e5017769841af27",
+        "18388a49caeda35859ef02702c1fd45ff26991998bd9d5e189c12c36cdae3f642ddd4a79"
+        "561bd1d3e1cd9359de8f5c9e1604a312d207a27b08a6033f2741794ced5",
+        "15c6264795837dfea19f91876455f564f073c5c84a3c9d76e67872ae0447ba0d4850d872"
+        "1302b25bec7ebfedd2721de140b2f3dead547042b24b0876117e7093cc1",
+        "060eb74236c189a28ed20bd0822eb22d75f7d97c9043a3c8e3f6d4c90bc8ca02ac4d37c1"
+        "171c799a1c7dfd2fcbf83406b5e48c051e0fbf0fd937bfe6c3db4e18154" },
+    { NID_secp521r1, NID_sha256,
+        "f253484d121d1ce8a88def6a3e9e78c47f4025ead6f73285bf90647102645b0c32d4d867"
+        "42a50b8b7a42d5f6156a6faf588212b7dc72c3ffd13973bdba732b554d8bffc57d04f816"
+        "7aef21ee941ee6ffb6cce0f49445bd707da8deb35dca650aaf761c3aa66a5ebccddd15ae"
+        "e21293f63061a7f4bfc3787c2cd62c806a1a9985",
+        "0c4dad55871d3bd65b016d143ddd7a195cc868b3048c8bbcb1435622036bdb5e0dec7178"
+        "ca0138c610238e0365968f6ddd191bbfacc91948088044d9966f652ff25",
+        "040014858a3b9bd426b678fdcf93fc53d17e7a9e8fe022442aaaba65399d12fd3a6a3819"
+        "58fb0f07ac6088f4e490506ec0f1ab4d0dbd461126f7eb46ff69cfa8bd88af018c18ce29"
+        "ecc6d79d26a2de0cd31c4b32e84b5e90f6ba748f86c5afbd89618aceb9079460cbd1a826"
+        "1ed5476973e61bf1d17ea78b022387443800c9247d21dde550",
+        "05577108f4187a173e5c29e927a8fc8f5ffd37e184254a6e381ff1018955aec91a35f300"
+        "85e8cee6a7555c10f9efdce26d62f2b4b52dfdbaeafc3a30983e2d50d5b",
+        "0344375ae7c804cbe32ced7a20976efae5d9c19eb88b6e24514d1d0cfb728b0f4601098b"
+        "18b2e98f42b5222dd5237d4d87767007bf5acb185c5526d72047e2cb1a1",
+        "02de4cfa908c73c1102d6fb7062baf54a056a9517701e036c9c51e09899d60051612d593"
+        "48945f845dffebec5aa395b2fac7229929033615788777306ccad96d0a3" },
+    { NID_secp521r1, NID_sha256,
+        "33bab1c369c495db1610965bc0b0546a216e8dd00cd0e602a605d40bc8812bbf1ffa6714"
+        "3f896c436b8f7cf0bed308054f1e1ff77f4d0a13c1e831efbd0e2fcfb3eadab9f755f070"
+        "ba9aeaceb0a5110f2f8b0c1f7b1aa96a7f2d038a1b72e26400819b1f73d925ea4e34d6ac"
+        "af59d0a461a34ce5d65c9c937a80e844e323a16d",
+        "03d4749fadcc2008f098de70545a669133c548ce0e32eec1276ff531bcff535331445557"
+        "28ad8906d17f091cc0514571691107350b6561858e90dbe19633aaf31bf",
+        "04010fe5986b65f6e65d13c88c4d2aed781a91026904f82129d46779bdadaf6b733c845a"
+        "934e941ab4a285efdea9c96ecc9dc784d87e4d937b42c337b3a9cb111a96000077853768"
+        "a2a4d6f596f57414e57ec60b76d3cd5ece8351cd1f335ebcb8801a3d91fb82c65caaeb5c"
+        "31eea9918367bb5906863ff3ccaf7a6cee415e0d75c15ac2e0",
+        "1fbb4de337b09e935a6dc6215ffcfcb85d236cc490585e73251a8b8bac37cfa36c5d1df5"
+        "f4536d33659be1e7a442529a783452f7efda74a4f661b6a127f9248aaf7",
+        "09d8f10eeff6178594c89d6e8184f9502117384813243ddf9ccf3c8eac5dc6502c472dfc"
+        "1487a5caffc569f7dedd14a8ebcb310e9bacdb79fb6655aba026cdf87f2",
+        "0f74236c7915d638708d17c9f10e39dda358faf9bbb821d8dcda0d151aac143bfb165ad0"
+        "a23a65cd3de532e32cad928728f5ae1c16f58fc16577f3ca8e36f9e708b" },
+    { NID_secp521r1, NID_sha256,
+        "08c8b7faaac8e1154042d162dca1df0f66e0001b3c5ecf49b6a4334ce4e8a754a1a8e4da"
+        "f8ec09cf1e521c96547aed5172ef852e82c03cddd851a9f992183ac5199594f288dbcc53"
+        "a9bb6128561ff3236a7b4b0dce8eaf7d45e64e782955ee1b690ce6a73ece47dc4409b690"
+        "de6b7928cbe60c42fc6a5ddf1d729faf1cc3885e",
+        "096a77b591bba65023ba92f8a51029725b555caf6eff129879d28f6400e760439d6e69ce"
+        "662f6f1aecf3869f7b6057b530a3c6ff8ed9e86d5944f583ee0b3fbb570",
+        "0400fdf6aed933dba73913142ef8bdcd4b760db8500831cd11d7707ab852a6372c05d112"
+        "a1e7fbc7b514c42142c7370d9f4129493cd75cc6f2daf83747078f15229db600ef91dffb"
+        "3c43080a59534b95ca585ee87f6145f6a0199b2b82c89f456d8bd8e6ac71c78039c08177"
+        "184484eb2ebd372f189db3a58fab961a75a18afec1ee32764a",
+        "13aa7b0471317a2a139c2f90df1c40d75e5a8a830fbaf87030fffdb2ef6f2c93d1310c9e"
+        "d7fe9d7bcd4fe46537ff2495bc9c4f0aaff11461f5e4bebbfbce9a8740a",
+        "1c7a21800962c91d4651553633b18612d931bb88bff8b743ed595b4e869437e50f8e84fb"
+        "f334c99061db123a1c40b73b07e203790561a37df65a660355ba2017d78",
+        "1301e1782559a38f1ca0eebe9bed0f5c7c33103d506a24f8a688f500ee1fe37f97b66853"
+        "19279e82e6fe43cfd823ccbc123309974cffa76c4f8d41ec02a3cbc45f1" },
+    { NID_secp521r1, NID_sha256,
+        "ba74eed74282811631bd2069e862381e4e2a1e4e9a357b1c159a9ce69786f864b60fe90e"
+        "eb32d8b72b099986fc594965a33285f7185b415df58fead7b8b50fc60d073680881d7435"
+        "609ad1d22fd21e789b6730e232b0d2e888889fb82d6ad0337ab909308676164d4f47df44"
+        "b21190eca8ba0f94995e60ad9bb02938461eee61",
+        "015152382bfd4f7932a8668026e705e9e73daa8bade21e80ea62cf91bd2448ebc4487b50"
+        "8ca2bdaaf072e3706ba87252d64761c6885a65dcafa64c5573c224ae9e6",
+        "04000b8c7c0186a77dc6e9addd2018188a6a40c3e2ba396f30bbd9293dba2841d57d6086"
+        "6b37f587432719b544d8bf7eb06d90a8c0dc9c93b0c53d53b2f667077228ca01dd2e5c73"
+        "ab908ae34f701689f1cd3cf5186d3a2bc941e208bf3ef970e5e429ee9b154d73286b2e5d"
+        "a423e75b7c7b78c7bdf915da92279db43265a0cdefca51f86a",
+        "0d03506999f5cc9ec3304072984a20a9c64a22ad9b418495ca904f4bbddc96e76d34672c"
+        "b52763339d3f3bc5b1701c00a675b972797e3a086314da1a8d338436566",
+        "085406c0ff5ec91f598bb579ad8714ad718c3e133d5dcc2e67c5d2339c146b69919cac07"
+        "f3bc2bda218f4c7c8be04855e2ca6fff7fbdc4fc0fda87c8c3081cad4f5",
+        "1b45f2066e583636215ae135afc202b8bf3f301eccff2e1c0198b9aeddf695fa8179488e"
+        "7b622fc307f601e2f6551815117cc836bb09ef888f8e64a45d9c84ad30c" },
+    { NID_secp521r1, NID_sha256,
+        "dc71f171a28bdc30968c39f08f999b88dc04c550e261ecf1124d67f05edeae7e87fe9b81"
+        "35a96fe2bc3996a4f47213d9d191184a76bd6310e1ee5cb67ea7fc3ef6f641a0ba165198"
+        "040fa668192b75a4754fc02c224bd4a74aade5a8c814adf151c2bfeda65165a04ef359e3"
+        "9847c84e312afb66d4cd1db50d41ef3fe5f31296",
+        "1750ff0ca0c166560b2034bc5760fe0b3915340bc43216e9de0c1d4a76550e8b2036e8b8"
+        "74230f8d29354aed43e183610f24fd4abd4b0be2f111dae942bd7a121f7",
+        "0401b4b8947192a7c0166c0e0b2791e217370836283e805f3ee11cfb78445aba3c5bc39f"
+        "e594e01916617ad59e7c8e740d8f2d07d88905d3f33bd5e51aafd4943c5dc601175d1172"
+        "32836c28e717ce2a55e59f4ec550effde30d18e3d99e42c6aa2283c7b3e7f2f6ff1fca60"
+        "5dde78c3a5bffa689347b4c93f51ba59a1787bb7d5e43861dc",
+        "023645023d6bdf20652cdce1185c4ef225c66d54f18632d99ccf743bf554d04c214c88ce"
+        "52a4f71ec75c899ad1b3c07c34112ca20b55c217ff1d72c9528e2774ce8",
+        "1e933f68ce0f8403cb16822b8e0564b1d39a35f27b53e4ae0bcdff3e051759464afbc349"
+        "98ba7c8a7ee34ef6c1aaa722cffe48356fd0b738058358d4c768b3186c1",
+        "0a67368a305508ce6d25d29c84f552a4a513998990fef4936244f891a2909c30d5fdc9e8"
+        "a267ecbf3c597138f4a08f7e92bee57d5420eadd700fee864bf78b2614b" },
+    { NID_secp521r1, NID_sha256,
+        "b895788d7828aaeace4f6b61a072ffa344d8ea324962ba6dab5efda93f65bf64a0f2ac6d"
+        "5721d03ee70e2aef21cdba69fd29040199160e3a293b772ffb961ed694a8dc82800dab79"
+        "367a4809a864e4aff6bc837aaa868e952b771b76591c0bb82249034e3208e593d85973d3"
+        "fea753a95b16e221b2561644535c0131fe834ae7",
+        "023048bc16e00e58c4a4c7cc62ee80ea57f745bda35715510ed0fc29f62359ff60b0cf85"
+        "b673383b87a6e1a792d93ab8549281515850fa24d6a2d93a20a2fff3d6e",
+        "0400ba3dc98326a15999351a2ec6c59e221d7d9e7ee7152a6f71686c9797f3f330d31501"
+        "23620d547813ba9d7cc6c6d35cc9a087d07dff780e4821e74ad05f3762efd6018b051af9"
+        "824b5f614d23ecadd591e38edbfe910ad6cbebc3e8a6bec11ea90691c17deb3bc5f34a4a"
+        "3acd90b7b10f521f6ee7b3cfbfdc03b72d5a8783a4a77c3e4c",
+        "06099d2667f06c58798757632d07d8b3efbe9c1323efb0c244be6b12b3b163ba1b7cf524"
+        "6c98dcc0771665a66696d687af5f28ed664fd87d5093df6427523d4db84",
+        "10dc80ea853064a2ba5a781f108aca3785c5ec0aa45aa05ba31d4de671170797589e863d"
+        "54a3a986aadf6f670277f50355713dfb27d4ec7e348f787910b3cd668cd",
+        "018572bfad4f62e3694d1f2e6ffd432faed2e2b9d7e3611a07138212f1e79e6c394839f7"
+        "cfae96bc368422630016fb9346681eadc5f9699e7331c3b5fde6d65e4c6" },
+    { NID_secp521r1, NID_sha256,
+        "2c5bd848c476e34b427cfe5676692e588e1957957db7b5704492bd02104a38216535607f"
+        "5d092dc40020130c04a3aaf0f1c52409834926d69a05d3f3188187a71d402a10ba34eac8"
+        "629b4c6359b1095f30f710219298bf06b9f19bfc299981d7e251ca232a0a85338a7e0246"
+        "4731d1b25d4a1f68baf97064516590644820c998",
+        "02b8b866ce4503bb40ffc2c3c990465c72473f901d6ebe6a119ca49fcec8221b3b4fa7ec"
+        "4e8e9a10dbd90c739065ad6a3a0dd98d1d6f6dcb0720f25a99357a40938",
+        "0401b8c7a169d5455f16bfe5df1ba5d6ec9c76e4bad9968d4f5f96be5878a7b6f71d74bf"
+        "ac0076dd278bc4630629f3294646f17d6b6c712b0087e2c4d576039cfdc8b9018faffd54"
+        "22dfd1b61432fa77b9a288b2b7d546656c0dcca3032179e6f45ee3cf61d6a447fc51731c"
+        "b54457343a41569fcf78cef42895f4da5efcb14ea1fc065f8d",
+        "0ac89e813f94042292aa1e77c73773c85cf881a9343b3f50711f13fa17b50f4e5cb04ac5"
+        "f6fc3106a6ef4c9732016c4e08e301eefac19199459129a41a7589e0628",
+        "05bc7a253a028ee8b7253979b8d689d41d8df6fae7736341f22e28b6faf0cbbdebbd2ef4"
+        "d73e56d2021af2c646dc15539a7c1e1c4dc9c7674808bd7968d8a66f947",
+        "0fd71575837a43a4cf1c47d0485cfd503c2cf36ebcea0fdef946ad29acb7fb2e7c6daf6b"
+        "4eb741eb211081aed6207d02569f1518988f275ad94c7fd4735cb18a92e" },
+    { NID_secp521r1, NID_sha256,
+        "65a0b97048067a0c9040acbb5d7f6e2e6ac462e1e0064a8ce5b5bbf8e57059e25a3ef8c8"
+        "0fc9037ae08f63e63f5bdb9378c322ad9b2daf839fad7a75b1027abb6f70f110247da7e9"
+        "71c7c52914e5a4f7761854432fa16b2a521e7bcaee2c735a87cad20c535bf6d04a87340c"
+        "229bf9af8647eedca9e2dc0b5aa90f7fea3cdc0a",
+        "0a43b32ad7327ec92c0a67279f417c8ada6f40d6282fe79d6dc23b8702147a31162e6462"
+        "91e8df460d39d7cdbdd7b2e7c6c89509b7ed3071b68d4a518ba48e63662",
+        "040172fb25a3e22c2a88975d7a814f3e02d5bb74cfb0aaa082c5af580019b429fddd8c7f"
+        "9e09b6938f62e8c31019b25571aaceef3c0d479079db9a9b533ee8e1670abd00ff551622"
+        "3b6cc7c711705f15b91db559014e96d3839249c5c849f2aced228a8998177a1e91177abb"
+        "b24b57a8ea84d944e0c95da860ae0925f1b40c0e1b7c9e0a46",
+        "0383eda042e06c0297fbd279a2ad40559c5c12ad458f73458eebcc92b308d3c4fcec20a5"
+        "b59f698e16fa6ea02dba8661b6955f67c052f67b0a56460869f24cfdf7d",
+        "1b9c35356b9d068f33aa22a61370dae44a6cb030497a34fb52af23c6b684677370268f06"
+        "bb4433be6795a71de570088aec17ce0c9933d2f76c7edce7f406f62fedd",
+        "06f07ea453cfa20ad604ba855332f62834657b0b795684d50c1562a675456e37f4dae45f"
+        "0df47d8e27e47bc9ce9c9cbba1554c5b94b0b17401b73c8d0c0902c6cc4" },
+    { NID_secp521r1, NID_sha256,
+        "d6e366a87808eea5d39fe77cac4b8c754e865a796062e2ec89f72165cd41fe04c4814806"
+        "8c570e0d29afe9011e7e7a2461f4d9897d8c1fa14b4ff88cab40059d17ab724f4039244e"
+        "97fcecb07f9ffeec2fb9d6b1896700fe374104a8c44af01a10e93b268d25367bf2bef488"
+        "b8abcc1ef0e14c3e6e1621b2d58753f21e28b86f",
+        "03c08fdccb089faee91dac3f56f556654a153cebb32f238488d925afd4c7027707118a37"
+        "2f2a2db132516e12ec25f1664953f123ac2ac8f12e0dcbbb61ff40fb721",
+        "040193301fc0791996ca29e2350723bd9aa0991ddbb4a78348ee72bdcd9ed63ce110ba34"
+        "96f2ce0331b5c00d4d674c1b70114e17ce44a73c3e16bab14ed1ee924202e400aea9b288"
+        "cfb2933ec0a40efa8e2108774e09b3863b3193d0dac6cc16ccaa5bd5f9ce133aec5cd3b6"
+        "2cbaeec04703e4b61b19572705db38cfaa1907c3d7c785b0cd",
+        "0d0e90d5ee7b5036655ad5c8f6a112c4b21c9449ca91c5c78421e364a2160bbac4428303"
+        "657bc11ea69f59fb0fe85a41b8f155a362343094456fd2a39f2a79e4804",
+        "1a8c23a2965d365a4c2ffd0802ae8b3a69c6b84a1ba77fd8a5f2f61e8ec3a1dcb336f136"
+        "e2a997252eaa94caf9b5ad6c9ecff5bf33abf547ca84985bb89908a11d7",
+        "1cc42a2dd97aa42b9df5ea430e0d4cb13106dd6da6e8c9315c96ed7b052db365bbde6960"
+        "c9a965954a4398c18ea7db9593bbfc3c3b6b3466ff806fccac3de6424ab" },
+    { NID_secp521r1, NID_sha256,
+        "f99e1d272d0f5fb9c4f986e873d070ec638422bc04b47c715595e2cf1a701cdf88bc6c4b"
+        "20085b357bad12ccba67cac8a5ca07f31ba432f9154ff1fadefd487a83a9c37e49fb70a2"
+        "f170e58889cab0552e0a3806ccfa2a60d96e346851d84b7de6d1a4b8cf37567dc161a84f"
+        "13421e3412457d4bc27f6213453c8519a2d7daa2",
+        "0969b515f356f8bb605ee131e80e8831e340902f3c6257270f7dedb2ba9d876a2ae55b4a"
+        "17f5d9acd46c1b26366c7e4e4e90a0ee5cff69ed9b278e5b1156a435f7e",
+        "0400fc7ae62b05ed6c34077cbcbb869629528a1656e2e6d403884e79a21f5f612e91fc83"
+        "c3a8ac1478d58852f0e8ba120d5855983afd1a719949afa8a21aec407516c300aa705da6"
+        "459a90eaa2c057f2e6614fb72fc730d6fdebe70e968c93dbc9858534768ea2666553cd01"
+        "db132331441823950a17e8d2345a3cab039c22b21bfe7bd3b9",
+        "19029260f88e19360b70c11107a92f06faa64524cfbd9f70fecf02bd5a94f390582a7f4c"
+        "92c5313bb91dc881596768d86f75a0d6f452094adbe11d6643d1a0b2135",
+        "07f2158e9b9fa995199608263969498923cf918fdc736427c72ce27ce4a3540dce2e8e5e"
+        "63a8fc7ba46f7fa42480efbf79c6ed39521f6e6ec056079e453e80a89d9",
+        "08e349eed6f1e28b0dbf0a8aeb1d67e59a95b54a699f083db885f50d702f3c6a4069591a"
+        "faa5b80b3c75efb1674ebd32c7ead0040d115945f9a52ee3a51806cad45" },
+    { NID_secp521r1, NID_sha256,
+        "91f1ca8ce6681f4e1f117b918ae787a888798a9df3afc9d0e922f51cdd6e7f7e55da996f"
+        "7e3615f1d41e4292479859a44fa18a5a006662610f1aaa2884f843c2e73d441753e0ead5"
+        "1dffc366250616c706f07128940dd6312ff3eda6f0e2b4e441b3d74c592b97d9cd910f97"
+        "9d7f39767b379e7f36a7519f2a4a251ef5e8aae1",
+        "013be0bf0cb060dbba02e90e43c6ba6022f201de35160192d33574a67f3f79df969d3ae8"
+        "7850071aac346b5f386fc645ed1977bea2e8446e0c5890784e369124418",
+        "040167d8b8308259c730931db828a5f69697ec0773a79bdedbaaf15114a4937011c5ae36"
+        "ab0503957373fee6b1c4650f91a3b0c92c2d604a3559dd2e856a9a84f551d9019d2c1346"
+        "aadaa3090b5981f5353243300a4ff0ab961c4ee530f4133fe85e6aab5bad42e747eee029"
+        "8c2b8051c8be7049109ad3e1b572dda1cac4a03010f99f206e",
+        "1a363a344996aac9a3ac040066a65856edfb36f10bb687d4821a2e0299b329c6b60e3547"
+        "dde03bdbd1afa98b0b75d79cf5aac0ef7a3116266cadf3dfbd46f8a4bfc",
+        "1ff097485faf32ce9e0c557ee064587c12c4834e7f0988cf181d07ba9ee15ae85a8208b6"
+        "1850080fc4bbedbd82536181d43973459f0d696ac5e6b8f2330b179d180",
+        "0306dc3c382af13c99d44db7a84ed813c8719c6ed3bbe751ead0d487b5a4aa018129862b"
+        "7d282cce0bc2059a56d7722f4b226f9deb85da12d5b40648bf6ec568128" },
+    { NID_secp521r1, NID_sha384,
+        "dbc094402c5b559d53168c6f0c550d827499c6fb2186ae2db15b89b4e6f46220386d6f01"
+        "bebde91b6ceb3ec7b4696e2cbfd14894dd0b7d656d23396ce920044f9ca514bf115cf98e"
+        "caa55b950a9e49365c2f3a05be5020e93db92c37437513044973e792af814d0ffad2c8ec"
+        "c89ae4b35ccb19318f0b988a7d33ec5a4fe85dfe",
+        "095976d387d814e68aeb09abecdbf4228db7232cd3229569ade537f33e07ed0da0abdee8"
+        "4ab057c9a00049f45250e2719d1ecaccf91c0e6fcdd4016b75bdd98a950",
+        "04013b4ab7bc1ddf7fd74ca6f75ac560c94169f435361e74eba1f8e759ac70ab3af138d8"
+        "807aca3d8e73b5c2eb787f6dcca2718122bd94f08943a686b115d869d3f40600f293c1d6"
+        "27b44e7954d0546270665888144a94d437679d074787959d0d944d8223b9d4b5d068b4fb"
+        "bd1176a004b476810475cd2a200b83eccd226d08b444a71e71",
+        "0a8d90686bd1104627836afe698effe22c51aa3b651737a940f2b0f9cd72c594575e550a"
+        "db142e467a3f631f4429514df8296d8f5144df86faa9e3a8f13939ad5b3",
+        "02128f77df66d16a604ffcd1a515e039d49bf6b91a215b814b2a1c88d32039521fbd142f"
+        "717817b838450229025670d99c1fd5ab18bd965f093cae7accff0675aae",
+        "008dc65a243700a84619dce14e44ea8557e36631db1a55de15865497dbfd66e76a7471f7"
+        "8e510c04e613ced332aa563432a1017da8b81c146059ccc7930153103a6" },
+    { NID_secp521r1, NID_sha384,
+        "114187efd1f6d6c46473fed0c1922987c79be2144439c6f61183caf2045bfb419f8cddc8"
+        "2267d14540624975f27232117729ccfeacccc7ecd5b71473c69d128152931865a60e6a10"
+        "4b67afe5ed443bdbcdc45372f1a85012bbc4614d4c0c534aacd9ab78664dda9b1f1e2558"
+        "78e8ac59e23c56a686f567e4b15c66f0e7c0931e",
+        "04ceb9896da32f2df630580de979515d698fbf1dd96bea889b98fc0efd0751ed35e6bcf7"
+        "5bc5d99172b0960ffd3d8b683fbffd4174b379fbdecd7b138bb9025574b",
+        "0400e7a3d30d5bd443549d50e9b297aaa87bc80b5c9e94169602d9d43d6d0c490c0bed8c"
+        "c2170288b106bdbf4c9f1ce53fd699af0b4c64b494b08520e57dc01ab9a8b001d81056d3"
+        "7aec8a75d588f6d05977416e6f24ad0117a7f4450036d695612e7bc2771caed80e580314"
+        "eebc88c8fc51c453f066e752481f212b57165d67f8a44f375a",
+        "046639c5a3ec15afae5e4a7a418ac760846512d880c359bc2c751b199ce43b10887e861b"
+        "14127809754dbea47f6cc0140d2817e3f5b9a80ce01abd81f81b748433a",
+        "0f913de91e19bd8f943d542ae357bacc942a0967abc9be6c06239a379db8cc733fa50013"
+        "e0b0f088bce9d630262feaa33b30d84f91bcf5ce9976e4e740fcb112f84",
+        "08a73a5c9c24235e0d9cecaac653f68ce5a6fb186ce67fa058d6ddbbd4d0a8c4d194e571"
+        "148e8ad6c8882b4e33d2f60fb23dd7d07a1ae60864e8277918f592b3dc6" },
+    { NID_secp521r1, NID_sha384,
+        "6744b69fc2420fe00f2352399bd58719e4ecdd6d602e2c80f194d607e58b27a0854745bf"
+        "d6d504de2eb30b04cee0f44af710dd77e2f816ac3ac5692fad2d1d417893bb0edba2707a"
+        "4c146a486f8728ca696d35cc52e9c7187c82d4bdb92eb954794e5ad15133f6bfea1f025d"
+        "a32ada710a3014cf11095b3ff69a94d087f17753",
+        "00a8db566bd771a9689ea5188c63d586b9c8b576dbe74c06d618576f61365e90b843d003"
+        "47fdd084fec4ba229fe671ccdd5d9a3afee821a84af9560cd455ed72e8f",
+        "04004f5b790cbe2984b71d41af5efed6c6893d15e13f31816d55a9c2926a104eee66f1ad"
+        "a83115d1388551218773b8b9d1138e3e3f027bb4392c90c14fd232580b4a1100660eb160"
+        "e9bfc8c5619e70e948e238c6fd37739bc1bb657b8e8436e63628f91992be7e63d9a73596"
+        "23a1340642777b22026feb51116a6c50c54c3589b9bd39b6cb",
+        "1e7b5e53571a24bd102dd7ad44a4b8d8a4e60e5957bc3c4e5d3c73109f55233f072e572c"
+        "7892f425ba5e64d3cb7966096bb34a47e26cd5b3e3b44108b310d9f681b",
+        "1a88bcd7e2bdff6e497d943dde432fb3f855a7177c466319cb53b701230c299db0302762"
+        "69685857d1e3f28110e690f2f529c8d18115eb381f313bc891d92ad278e",
+        "146f1984ea879274dfd5e86ad92e564a4de081523ddbb1c397b8f9595911ef2e6501bc08"
+        "1584d5340f7aa47e1af036234ac6f27a5ac31f78dd3b0ff1a62693c630d" },
+    { NID_secp521r1, NID_sha384,
+        "16001f4dcf9e76aa134b12b867f252735144e523e40fba9b4811b07448a24ef4ccf3e81f"
+        "e9d7f8097ae1d216a51b6eefc83880885e5b14a5eeee025c4232319c4b8bce26807d1b38"
+        "6ad6a964deb3bdca30ee196cfdd717facfad5c77d9b1d05fdd96875e9675e85029ecbf4f"
+        "94c524624746b7c42870c14a9a1454acf3354474",
+        "1a300b8bf028449344d0e736145d9dd7c4075a783cb749e1ec7988d60440a07021a25a3d"
+        "e74ea5e3d7bd4ab774d8ad6163adae31877ef0b2bd50e26e9e4be8a7b66",
+        "04005055b9ad726ba8a48219b0ecbfffb89f8428de895b231f676705b7de9f2022d9ff4e"
+        "0114ebb52dea342f9bf76b2fb060c020e29d92074ebb1fbfe5290a58c8bc1000415af7f2"
+        "0a6e945315adbf757316bb486c80780a0a3a15b4b9609f126d7341053a2b726ab63cb46f"
+        "eee527b0bf532b32b477e5671aea23d9b3c3e604b9029954b5",
+        "05a2e92717bb4dab3ee76724d4d9c2d58a32b873e491e36127985f0c9960c610962ca1c4"
+        "510dba75c98d83beebdc58b1d8678e054640951d11db1bd2d8a4ab8476b",
+        "104a78ce94f878822daaf00ee527fbdbf6cceb3cbb23a2caa485e4109466de8910252f92"
+        "379ab292cac8d1eda164f880c0067696e733fc8588a27703a3e1f5b8f1f",
+        "1ffe23e8ab5a31668a81161a234ea14879771fe9866f8872eb6edb672e0fe91d2bb75c97"
+        "67a2dfbac7c15c802211236b22ea41ecd055a0b8b311ffc4255f86d5c67" },
+    { NID_secp521r1, NID_sha384,
+        "a9824a7b810aa16690083a00d422842971baf400c3563baa789c5653fc13416111c0236c"
+        "67c68e95a13cec0df50324dcc9ae780ce4232607cb57dd9b2c61b382f0fa51fd4e283e2c"
+        "55ffe272597651659fbd88cd03bfa9652cd54b01a7034c83a602709879e1325c77969beb"
+        "fd93932ce09a23eae607374602201614ff84b141",
+        "06a253acd79912a74270fc0703ed6507ab20a970f2bc2277f782062092cf0e60ae1ca1bb"
+        "44dec003169bc25ef6e7123dd04692f77b181a6d7e692e66b09d35a540c",
+        "0401f15c6b1df156fdd8381cd7446e039435e445f8f36f0247475058da0e371bf72753f6"
+        "e39f98066bc79370b038c39687ba18e16cb118fe6538b7568c5403c251f6b7012d2b4f46"
+        "b854eeae75f1c63f55b76bf0c604d47f870c28a50ecdeb52bba1dd9a0ff12e680804ff86"
+        "4111207652da7dd10b49edf66bb86be00bc06672de91982457",
+        "165faf3727e42fd61345cfa7b93e55fb4bf583b24bdc14ce635b6c99dbd788012f14da9a"
+        "210b677c44acdd851e672f1a48188d6b8946c0efeebfe8a597ba0090a2c",
+        "1ad9463d2759abd568626548578deefdcd8b2d050ce6d9c7ed05feca20167484b86e89bd"
+        "cc936fd647e0f8aedd7b6add2b8cf13ff6ff013c2b5540c6c56fda97a0c",
+        "1645a7d0e11015256cfb034adca198695eea6aedd44d9fbf496850ccfed950f43fffd8db"
+        "f41e113f2d3837d8a5dd62b2ed580112ff05800b1f73196e5576810e15b" },
+    { NID_secp521r1, NID_sha384,
+        "90d8bbf714fd2120d2144022bf29520842d9fbd2dc8bb734b3e892ba0285c6a342d6e1e3"
+        "7cc11a62083566e45b039cc65506d20a7d8b51d763d25f0d9eaf3d38601af612c5798a8a"
+        "2c712d968592b6ed689b88bbab95259ad34da26af9dda80f2f8a02960370bdb7e7595c0a"
+        "4fffb465d7ad0c4665b5ec0e7d50c6a8238c7f53",
+        "0d5a5d3ddfd2170f9d2653b91967efc8a5157f8720d740dd974e272aab000cc1a4e6c630"
+        "348754ab923cafb5056fc584b3706628051c557fce67744ee58ba7a56d0",
+        "040128a4da5fc995678e457ceb3929adee93c280f851abe900fa21f4f809dafad4e33b38"
+        "1e0cd49ce8dd50e2e281cea162bfd60a1d6a1c0ee2228e6a011e171b559ab8006eb0917c"
+        "d72256992c49ea527f6bb0315f13d8047794a0f1da1e93737703b1c2a74a00441ef3b47b"
+        "6a2ff789c49ae32d91cabe7b29247aeec44f6c40a76597a2ca",
+        "03269983a5c2bcc98e9476f5abf82424566b1f08b17204d29e310ece88f99eb677a537f8"
+        "6fe2529e409cfef2c12929644100099e0de2f27c0f0ac11105a4dca935b",
+        "1a5257ae1e8187ba954f535b86ff9b8d6a181a3b95c250d090cb4e9c3bfbd03aa64696a7"
+        "6c569728ef67780d6338d70ce46da40b87a3e49bfe154b93930890dfa93",
+        "05b6ccdfd5c63c7db76d3a0478064a2a376e0e050cb093be795a72a549247c2e4adba918"
+        "3145c63d46479dbbdcf09986a6f64c09c7e16abc4853f6376c9558b014a" },
+    { NID_secp521r1, NID_sha384,
+        "09952b1e09995e95bf0022e911c6ab1a463b0a1fdd0eec69117b34af1103c720b5760021"
+        "7de7cd178fef92de5391e550af72a8dcf7badf25b06dd039417f9a7d0f5be88fcd4e9655"
+        "931d5b605452a667c9d1bae91d3476e7d51cff4108f116a49966fb3a7cff8df1c09734ce"
+        "5620faf2dccb3dc5d94e7e9ac812da31f6d07a38",
+        "1bcedf920fa148361671b43c64e3186e1937eb1bd4b28cbd84c421472394552889bc0550"
+        "9aa732ef69d732b21b750523fdfd811f36467690fe94e01e64c9d5cbbe9",
+        "0400d33c151d202a5d4d831348e940b027ee32e4b0b9b48d823a05c67ff3bdaee0189fc6"
+        "680565f352c062e99968afc643208b4f9c7af185b861658a88c4ad0fcc8ba200e4441ddb"
+        "546468ad8ffa6074f137edfbb81e82e0e7d8f05c4c54598aa996a9cde54cb371f642bfdd"
+        "4ae7eca5b769696030027129a4183da93567ad142a2dff5183",
+        "046e619b83aac868b26d0b3cbfab55e630e0b55c461985b5d00f94ff3a5ce90ff412cebf"
+        "46bbd84550d2031d573ca27d924624428360708c8d8491c29eb01d30f2e",
+        "08427c0f0ac0263472cd423c0fb554bf3c851b9c775c566ab0f6878717bd57665830767b"
+        "05b7789c5c0b078195bd943dc737325552d32877ecb04a7c41bd07cd80c",
+        "10bb6652d6a624c40a7dd06828f15774130d02369ceb1a7d03b553e16e17b7fa5b5401f1"
+        "5885d5e4fc2e55c0c7a1b97871ab02f76386b93a16aa6e7eb65debac6dd" },
+    { NID_secp521r1, NID_sha384,
+        "0bb0f80cff309c65ff7729c59c517d50fc0ed5be405ef70cb910c3f62c328c90853d4473"
+        "530b654dda6156e149bc2222a8a7f9be665240e2fbe9d03f78a2356af0bacd1edb84c480"
+        "1adc8293a8a0bd6123d1cf6ba216aca807a7eb4dca76b493eb6e3dbb69d36f0f00f85622"
+        "2f24d9b93ec34c3b261be2fca0451c00571928e5",
+        "03789e04b3a2a0254ade3380172c150d2fad033885e02ea8bea5b92db3f4adbab190ae42"
+        "3080a1154dfedec694c25eab46ce638be3db4e4cba67bc39f62d6e7db2d",
+        "0401dbc2cf19627bdccf02432b1761f296275230c150cdde823ce3141ec315d7d05e16b2"
+        "c29e2a67491078d5316883e933d85b4b10d4f64c477d3c4e0442dc928983a2007562e720"
+        "807dd118d3d8b265b3abc61a71fce43e3dce0e7b5ae18b7a4cb01ecc00d39c1f22e150a9"
+        "a8728997e502144f5b3f6fa9b4cb8a4136212b082ca394e3f6",
+        "0fbccd8d7804bdd1d1d721b5ec74d4ba37603bc306f9fce2ec241853d8e07334e6b4b12c"
+        "4ecca0c54bd71193dd7146507933a20737c5f3e15085830fab9b30ca57b",
+        "181915a3998d8fa214f9715f4ca928d09c36de168dc15c6970a8a062b5cea2dc969b2437"
+        "ca17b684f78a1fd583aad8e6c762c8f4ab0c91b86a497145e3ca440d307",
+        "15a6c18c5c77f5470b27d061eafdc26b78561941a3b2ab0f5c81d40899fc053c3d9ed12d"
+        "7d61e298abbae470009c7b2157731c58d7b16a66fa5abaf5e8a1b8ed394" },
+    { NID_secp521r1, NID_sha384,
+        "7efacf213382ce30804e78b7256854d759147dba9729c51b2759465715bf2c421034c23d"
+        "c651c13d6cce95f71fe6a84dfbee5768163ac5789ac0474c5ddf4115684683c5f7c204b3"
+        "3b8bcc0c03ac58f66cef2f53b721fe2fac91ad841126101a88f512a7c2ded38549d9f050"
+        "d4b7961dda48a1489f026c5d111701762418cfe3",
+        "124700aa9186353e298edefc57bec0c7d0201cca10c1d80dd408d5d71040592b0ac59fac"
+        "dadfa8712445f5977ef8d4854022720c3f02d60e0732dbb2f171fcf1490",
+        "0400c80fc4cecae5d53348524ddba6a160b735c75b22fdb39af17e2a613d09246e3bb0fd"
+        "3f2978577f6db5d2118e05c7898024808f8eb8e021d7969cdcf7fc981200bb01a880c939"
+        "43fd446d4b3923b574d2221c1bb7b645fb5534dda60e827b497666ff586b77921f7e7f60"
+        "5147947194cffd2fef0678880b89cc0bc7fb74fa96d4b112d7",
+        "01a05238d595ded5c61d3bf6fde257dbf13095af8a5cb3a2e579e8e4c550fe31d12b71cc"
+        "2dbcb295e6c4fd0fb8c22d1b741c097cc59d826ced1a8771f09983143c4",
+        "132762bc81e9922a8d642e3a9d0218affa21fa2331cfcb9e452545c5981c64a8f7e4cc8e"
+        "68056023b2aa78bead59061d19c7f646c931163a91e544b106b3be8de9e",
+        "0c3a1b0b000c3169984132add51d611e2cb7069a262a6983d2ae72b459c36e6469509bdb"
+        "0f473600b8686700b08910779dee9ba83f82e755d4a4ef5f124eb09397f" },
+    { NID_secp521r1, NID_sha384,
+        "28edff8b9d85f5f58499cc11f492abdfab25e8945975bbaeee910afa2b8fc1295ec61406"
+        "309ce4e09f4ab4f462959fc2a2786802466eb26d3b01be6919893ae75d0fdc2dc8a82e66"
+        "2550f9fce9627dd364188aaba5c6faa1b2d8a2235adfa5ad0dc140f88a2b2f103f5690e8"
+        "77d07fe8fd30d02d2b2729bd3d8eb5b23a21f54c",
+        "1f532d01af885cb4ad5c329ca5d421c5c021883bd5404c798d617679bb8b094cbb7e15c8"
+        "32fb436325c5302313ce5e496f9513455e7021ffad75777a19b226acfa1",
+        "0400c0bd76b0027b85bdd879052220da1494d503f6a4bb972105a48ae98e7dda8c2d9fd9"
+        "336f5646385b961ef68e8464e3a95b00f96614b1a408ceaa2c87b077b6a8fb017eb7eb5c"
+        "78db7819af92e8537d110d9f05a5e24f954f4dde21c224d4040f059ec99e051702f39041"
+        "3d2708d18f84d82998c61847475250fb844b20082cbe651a6b",
+        "14e66853e0f7cd3300ebcae06048532e19cbb95bee140edc1c867ce7310637651445b6df"
+        "eb1d99d2e32f2ffb787ebe3fe35032277f185d3dad84f95806924550abe",
+        "0c5b3a57161098e2e8e16e0a5ae8ecf4a14df14927eea18ed4925d11dc429dda14515932"
+        "3ba970174b194b9b4608a8fa2373b7a825c5e8bd80574e49698285c2c82",
+        "1a0c038a51796158b42eb5b0dac37aff9ab93b903a47e06ebbdd15946e4bcc9a3b3875b1"
+        "8cf6294c33fc6c3693cef04ed1a43d08951e664c760e2cf3fb4e47490d2" },
+    { NID_secp521r1, NID_sha384,
+        "bae2a8897c742fd99fbf813351cd009d3f2e18d825ca22e115276484bce8f82f8c7c0c21"
+        "dd2af208404d8ef45bb5a6c41693912b630897d5246801bf0775aa9bbac8be98cb861d17"
+        "2c3563dc59e78a58ed13c66dea496471b3ad0eeae8995293e4ab97373edc1837ffc95ff1"
+        "cc0c1e90e64ea8680b2ca5f1e09bf86b99b343b6",
+        "11abf508bca68a85a54bc0659e77efad3c86112c9db04db2883e76144aa446918bb4bb07"
+        "84b0b6a0e9aa47399fe3de5aaecfd8894a0d130bb0c366c40d9d5050745",
+        "04005c0ea363a3a12633ea39d564587ebdd3a22a175ef32b9ebfc7311304b19cb3a62b5a"
+        "dc36f6afb6a6f7fabbf810ee89fdb72854fefd613e7798e9b9ff5938ea54c600bd06a85e"
+        "47b885c08124b55a3fcc07ca61647cda6efbfdbd21b24d1ea7a4c7300d46cd798e76063a"
+        "a979adef6f0698b15e5b7ae8a2ab39ab4f50b2d20614db6317",
+        "19cadb8c7eb10565aa4567e0709873918720f0e4b42b4817afb0b0547c70cd1100229dea"
+        "e97a276b9c98ea58b01d4839fee86336d749d123b03e8b1a31166acc110",
+        "0667448a8bbef1c810d40646977dc22f3dfb52a4d80928ded5e976e199cbed02fbd5a085"
+        "46756ece14548d721a6eb380d0e1a71ad0660dbcac6163c776eedd3e249",
+        "0ae7f0a238daaddb7fb4a1707fe5132daf653f8e19f732347134c96f1dd798f867c479a4"
+        "a4609a568a15b61afed70790adbde13ac5f68c468d0230852c1a2c22581" },
+    { NID_secp521r1, NID_sha384,
+        "d57a26a9593e72bfc87322524639bcaae5f2252d18b99cdaa03b14445b0b8a4dd53928f6"
+        "6a2e4f202fb25b19cad0eb2f1bfda2ab9b0eb668cdcd0fe72f5d9ef2e45e0218590f7ab9"
+        "d2c9342202610c698bc786cce108a7d4a6730a13e9ea1b470e781f1237d3f84f44abde80"
+        "8516975546bd89075ef9a9732bfd7ee33b6f4399",
+        "18dbf520d58177e4b7a0627674d220137983f486dd2fd3639f19751804e80df0655db6af"
+        "d829cdf75238de525e1a7a9f048049b593dd64b4b96cc013f970c05ea1f",
+        "04018b872690c37995be324ddb5c2bd5462841bb062f8e63da248a853de79c3d6bb9a2eb"
+        "1e6933afda0998ca43491cc807b08ace2d5336a43d0ab50563a2d3d98755f00002ff3122"
+        "1aa32aa6546f35e8fe5b9361f938362a5e89e77ae130ba8bce3729e912dfac35a2fd21ef"
+        "e84b45b8be2a340850e4b574e1885b35c2afbe196b57c6cf4c",
+        "098faeb73054639cb2e4442cd68e7b3a13f4b3f397a7b26f303afa40789f8ddd3d918f1c"
+        "e4f0be53c8cb69c380744e2297d7fc01e2b3daef4ce64dd3a2644234753",
+        "09c0e7649f814f70a8416cb78bc4601472a363fe97f5c587305778169677860dd97f87b5"
+        "ab07c3a953bc4615fc34634509d6a25621bdded33ed42446d059509c190",
+        "120b90e1cfb8a1b5e530df7b17d1128bc051ca4f1a65dd9c9d9d3c59d2f00c7c1e994c52"
+        "b8671d40294b4d574d2c04475d5bebeacd3a0d3870a54dc7a4805614f40" },
+    { NID_secp521r1, NID_sha384,
+        "8fdcf5084b12cfc043dd3416b46274e021bbed95d341d3c500c102a5609d3a34de29f8fa"
+        "9f0adb611a1f47a97ad981f8129d718fc0d6c709eab1a3490db8d550f34eb905b9e00663"
+        "543afc5bc155e368e0bc919a8b8c9fa42093603537a5614927efa6be819ed42ececbf1a8"
+        "0a61e6e0a7f9b5bc43b9238e62d5df0571fea152",
+        "002764f5696aa813cd55d30948585f86288ae05aeb264ca157cd09e1d09a10515a849b07"
+        "91b755ccc656a34707be9e52f5762d290a7d2bcd6de52c600ff862eaf4e",
+        "040127279c88719dc614db387f102e55104ea1c704ac7f57f3bca936f728439b76556730"
+        "dd7cde2ac1ad0a4c2c2f036ab6f00cf34cb87ea36113571f300713044106d20134a0786c"
+        "31f5f2291b83c50fb579ae4c620b95e5a8bdc0c7e1ee6b996c89d764f1b20403e7faa203"
+        "f397425ada297045dd8ba0e4b155d4900da249e934faab7991",
+        "08bffb0778cbb06466cecc114b9e89ca243a2b2b5e2597db920bc73a8bbcbe3f57144ad3"
+        "3409ef7faaab430e13f4c42d304d11347360c84972ca20b1539cce3a288",
+        "1f8f504e64a502e51e7c129517931c3b71f0d8a63b19cfe01ff7c951c6525249608b3ef5"
+        "d00061d77eb6b3d69581adeaa3732c773bbb9b919c3e7c71fdc09f44d06",
+        "058044fc64b340604ffd02a5b2918d76fd6fb59ea895feab7aa218e6f1e8c8f226eb9ee3"
+        "45ef8140183a69272582005077b008006aab11597e808d7ff1e8382c924" },
+    { NID_secp521r1, NID_sha384,
+        "00669f433934992257bed55861df679804107d7fa491672574a7624949c60049b0533383"
+        "c88d6896c8de860704c3e6a6aefce83efa57c4d57e9ab253da5d15e1f53ab6dce218b592"
+        "772ab0bc01fee8e63368e85c0639301456fe2d44cd5396a7f2b22761cd03b80eba7883ee"
+        "de8249a2f5db2183bf00550c5c002f45a5e4fb31",
+        "1b0c9acd3eeb618b4b0de4db402206f0f29adc69d7ad324b6db6601b351f723ac8fe949e"
+        "eacd34228649bf0126276e5aceb0137d00c30dd858aef2d6b6449de2e89",
+        "0401811c8884486aaa083ddee1c51cb6e861cb830bd5eaa929f72efadbbd1286566ae7e7"
+        "ba7fde7e02529900d35ee64591652d28798bfc1bed0d192602a9cf5a7d22e3006d7fc9dd"
+        "494816cfd29613d4689af67f7d0a2e6fbad5d4d6e0130189172a1ab601c5ca71deaa8bfc"
+        "b5a190d49da191672ff6fc048e146cb902acec5eae6d87e60a",
+        "1fdc4f108070af3c66c9ba7b6c1f2603a19ceb4760399df81228cfc7eafde1082b5a0716"
+        "a3ff82fbe84726f14dd0db3376ca184a78c3c60679bab6cd45f77f9b9ce",
+        "1ec310339ff056faeb341c4499c43782078b04be1725ae9a6cdcb6011c46d1a4eb3d75c3"
+        "58225e4ec142fd1cd344186f5eb597f7ba559ddfa954824365d5b6edaec",
+        "005b679a33fdb7e04834f071cd0ac514c04add9f2614ab9bbd9b407b1420fed3f3e02a10"
+        "8e7e279899e43dcf64ae4083c289a87cd7d2103bdc036a95d36800ac7c6" },
+    { NID_secp521r1, NID_sha384,
+        "4be81dcfab39a64d6f00c0d7fff94dabdf3473dc49f0e12900df328d6584b854fbaebaf3"
+        "194c433e9e21743342e2dd056b445c8aa7d30a38504b366a8fa889dc8ecec35b31300707"
+        "87e7bf0f22fab5bea54a07d3a75368605397ba74dbf2923ef20c37a0d9c64caebcc93157"
+        "456b57b98d4becb13fecb7cc7f3740a6057af287",
+        "181e1037bbec7ca2f271343e5f6e9125162c8a8a46ae8baa7ca7296602ae9d56c994b3b9"
+        "4d359f2b3b3a01deb7a123f07d9e0c2e729d37cc5abdec0f5281931308a",
+        "0400cfa5a8a3f15eb8c419095673f1d0bd63b396ff9813c18dfe5aa31f40b50b82481f9e"
+        "d2edd47ae5ea6a48ea01f7e0ad0000edf7b66f8909ee94f141d5a07efe315c018af728f7"
+        "318b96d57f19c1104415c8d5989565465e429bc30cf65ced12a1c5856ac86fca02388bc1"
+        "51cf89959a4f048597a9e728f3034aa39259b59870946187bf",
+        "09078beaba465ba7a8b3624e644ac1e97c654533a58ac755e90bd606e2214f11a48cb51f"
+        "9007865a0f569d967ea0370801421846a89f3d09eb0a481289270919f14",
+        "19cf91a38cc20b9269e7467857b1fc7eabb8cea915a3135f727d471e5bfcfb66d321fabe"
+        "283a2cf38d4c5a6ecb6e8cbee1030474373bb87fcdfcc95cf857a8d25d0",
+        "1cf9acd9449c57589c950f287842f9e2487c5610955b2b5035f6aacfd2402f511998a1a9"
+        "42b39c307fc2bcab2c8d0dae94b5547ddccfb1012ca985b3edf42bbba8b" },
+    { NID_secp521r1, NID_sha512,
+        "9ecd500c60e701404922e58ab20cc002651fdee7cbc9336adda33e4c1088fab1964ecb79"
+        "04dc6856865d6c8e15041ccf2d5ac302e99d346ff2f686531d25521678d4fd3f76bbf2c8"
+        "93d246cb4d7693792fe18172108146853103a51f824acc621cb7311d2463c3361ea70725"
+        "4f2b052bc22cb8012873dcbb95bf1a5cc53ab89f",
+        "0f749d32704bc533ca82cef0acf103d8f4fba67f08d2678e515ed7db886267ffaf02fab0"
+        "080dca2359b72f574ccc29a0f218c8655c0cccf9fee6c5e567aa14cb926",
+        "040061387fd6b95914e885f912edfbb5fb274655027f216c4091ca83e19336740fd81aed"
+        "fe047f51b42bdf68161121013e0d55b117a14e4303f926c8debb77a7fdaad100e7d0c75c"
+        "38626e895ca21526b9f9fdf84dcecb93f2b233390550d2b1463b7ee3f58df7346435ff04"
+        "34199583c97c665a97f12f706f2357da4b40288def888e59e6",
+        "03af5ab6caa29a6de86a5bab9aa83c3b16a17ffcd52b5c60c769be3053cdddeac60812d1"
+        "2fecf46cfe1f3db9ac9dcf881fcec3f0aa733d4ecbb83c7593e864c6df1",
+        "04de826ea704ad10bc0f7538af8a3843f284f55c8b946af9235af5af74f2b76e099e4bc7"
+        "2fd79d28a380f8d4b4c919ac290d248c37983ba05aea42e2dd79fdd33e8",
+        "087488c859a96fea266ea13bf6d114c429b163be97a57559086edb64aed4a18594b46fb9"
+        "efc7fd25d8b2de8f09ca0587f54bd287299f47b2ff124aac566e8ee3b43" },
+    { NID_secp521r1, NID_sha512,
+        "b3c63e5f5a21c4bfe3dbc644354d9a949186d6a9e1dd873828782aa6a0f1df2f64114a43"
+        "0b1c13fe8a2e09099e1ed05ef70de698161039ded73bcb50b312673bb073f8a792ac140a"
+        "78a8b7f3586dffb1fc8be4f54516d57418ccc9945025ce3acf1eb84f69ceee5e9bd10c18"
+        "c251dbc481562cd3aae54b54ab618cb1eeda33cf",
+        "1a4d2623a7d59c55f408331ba8d1523b94d6bf8ac83375ceb57a2b395a5bcf977cfc1623"
+        "4d4a97d6f6ee25a99aa5bff15ff535891bcb7ae849a583e01ac49e0e9b6",
+        "04004d5c8afee038984d2ea96681ec0dccb6b52dfa4ee2e2a77a23c8cf43ef19905a34d6"
+        "f5d8c5cf0981ed804d89d175b17d1a63522ceb1e785c0f5a1d2f3d15e513520014368b8e"
+        "746807b2b68f3615cd78d761a464ddd7918fc8df51d225962fdf1e3dc243e265100ff0ec"
+        "133359e332e44dd49afd8e5f38fe86133573432d33c02fa0a3",
+        "0bc2c0f37155859303de6fa539a39714e195c37c6ea826e224c8218584ae09cd0d1cc14d"
+        "94d93f2d83c96e4ef68517fdb3f383da5404e5a426bfc5d424e253c181b",
+        "1a3c4a6386c4fb614fba2cb9e74201e1aaa0001aa931a2a939c92e04b8344535a20f53c6"
+        "e3c69c75c2e5d2fe3549ed27e6713cb0f4a9a94f6189eb33bff7d453fce",
+        "16a997f81aa0bea2e1469c8c1dab7df02a8b2086ba482c43af04f2174831f2b176165879"
+        "5adfbdd44190a9b06fe10e578987369f3a2eced147cff89d8c2818f7471" },
+    { NID_secp521r1, NID_sha512,
+        "6e0f96d56505ffd2d005d5677dbf926345f0ff0a5da456bbcbcfdc2d33c8d878b0bc8511"
+        "401c73168d161c23a88b04d7a9629a7a6fbcff241071b0d212248fcc2c94fa5c086909ad"
+        "b8f4b9772b4293b4acf5215ea2fc72f8cec57b5a13792d7859b6d40348fc3ba3f5e7062a"
+        "19075a9edb713ddcd391aefc90f46bbd81e2557b",
+        "14787f95fb1057a2f3867b8407e54abb91740c097dac5024be92d5d65666bb16e4879f3d"
+        "3904d6eab269cf5e7b632ab3c5f342108d1d4230c30165fba3a1bf1c66f",
+        "0400c2d540a7557f4530de35bbd94da8a6defbff783f54a65292f8f76341c996cea38795"
+        "805a1b97174a9147a8644282e0d7040a6f83423ef2a0453248156393a1782e0119f746c5"
+        "df8cec24e4849ac1870d0d8594c799d2ceb6c3bdf891dfbd2242e7ea24d6aec316621473"
+        "4acc4cbf4da8f71e2429c5c187b2b3a048527c861f58a9b97f",
+        "186cd803e6e0c9925022e41cb68671adba3ead5548c2b1cd09348ab19612b7af3820fd14"
+        "da5fe1d7b550ed1a3c8d2f30592cd7745a3c09ee7b5dcfa9ed31bdd0f1f",
+        "10ed3ab6d07a15dc3376494501c27ce5f78c8a2b30cc809d3f9c3bf1aef437e590ef66ab"
+        "ae4e49065ead1af5f752ec145acfa98329f17bca9991a199579c41f9229",
+        "08c3457fe1f93d635bb52df9218bf3b49a7a345b8a8a988ac0a254340546752cddf02e6c"
+        "e47eee58ea398fdc9130e55a4c09f5ae548c715f5bcd539f07a34034d78" },
+    { NID_secp521r1, NID_sha512,
+        "3f12ab17af3c3680aad22196337cedb0a9dba22387a7c555b46e84176a6f841800455238"
+        "6ada4deec59fdabb0d25e1c6668a96f100b352f8dabd24b2262bd2a3d0f825602d54150b"
+        "dc4bcbd5b8e0ca52bc8d2c70ff2af9b03e20730d6bd9ec1d091a3e5c877259bcff4fd2c1"
+        "7a12bfc4b08117ec39fe4762be128d0883a37e9d",
+        "15807c101099c8d1d3f24b212af2c0ce525432d7779262eed0709275de9a1d8a8eeeadf2"
+        "f909cf08b4720815bc1205a23ad1f825618cb78bde747acad8049ca9742",
+        "040160d7ea2e128ab3fabd1a3ad5455cb45e2f977c2354a1345d4ae0c7ce4e492fb9ff95"
+        "8eddc2aa61735e5c1971fa6c99beda0f424a20c3ce969380aaa52ef5f5daa8014e4c83f9"
+        "0d196945fb4fe1e41913488aa53e24c1d2142d35a1eed69fed784c0ef44d71bc21afe0a0"
+        "065b3b87069217a5abab4355cf8f4ceae5657cd4b9c8008f1f",
+        "096731f8c52e72ffcc095dd2ee4eec3da13c628f570dba169b4a7460ab471149abdede0b"
+        "63e4f96faf57eab809c7d2f203fd5ab406c7bd79869b7fae9c62f97c794",
+        "1e2bf98d1186d7bd3509f517c220de51c9200981e9b344b9fb0d36f34d969026c80311e7"
+        "e73bb13789a99e0d59e82ebe0e9595d9747204c5f5550c30d934aa30c05",
+        "12fed45cc874dc3ed3a11dd70f7d5c61451fbea497dd63e226e10364e0718d3722c27c7b"
+        "4e5027051d54b8f2a57fc58bc070a55b1a5877b0f388d768837ef2e9cec" },
+    { NID_secp521r1, NID_sha512,
+        "a1eed24b3b7c33296c2491d6ee092ec6124f85cf566bb5bc35bffb5c734e34547242e575"
+        "93e962fb76aee9e800eed2d702cc301499060b76406b347f3d1c86456978950737703c81"
+        "59001e6778f69c734a56e5ce5938bd0e0de0877d55adeee48b0d8dfa4ac65fd2d3ce3e12"
+        "878bac5c7014f9284d161b2a3e7d5c88569a45f6",
+        "18692def0b516edcdd362f42669999cf27a65482f9358fcab312c6869e22ac469b82ca90"
+        "36fe123935b8b9ed064acb347227a6e377fb156ec833dab9f170c2ac697",
+        "0401ceee0be3293d8c0fc3e38a78df55e85e6b4bbce0b9995251f0ac55234140f82ae0a4"
+        "34b2bb41dc0aa5ecf950d4628f82c7f4f67651b804d55d844a02c1da6606f701f775eb6b"
+        "3c5e43fc754052d1f7fc5b99137afc15d231a0199a702fc065c917e628a54e038cbfebe0"
+        "5c90988b65183b368a2061e5b5c1b025bbf2b748fae00ba297",
+        "161cf5d37953e09e12dc0091dc35d5fb3754c5c874e474d2b4a4f1a90b870dff6d99fb15"
+        "6498516e25b9a6a0763170702bb8507fdba4a6131c7258f6ffc3add81fd",
+        "14dfa43046302b81fd9a34a454dea25ccb594ace8df4f9d98556ca5076bcd44b2a9775df"
+        "aca50282b2c8988868e5a31d9eb08e794016996942088d43ad3379eb9a1",
+        "120be63bd97691f6258b5e78817f2dd6bf5a7bf79d01b8b1c3382860c4b00f89894c72f9"
+        "3a69f3119cb74c90b03e9ede27bd298b357b9616a7282d176f3899aaa24" },
+    { NID_secp521r1, NID_sha512,
+        "9aace26837695e6596007a54e4bccdd5ffb16dc6844140e2eeeb584b15acb2bbffd203c7"
+        "4440b6ee8db676fd200b4186a8c3e957c19e74d4d865ada83f80655323dfa3570907ed3c"
+        "e853b6e8cc375ed2d758a2f5ad265dd3b47650517a49b3d02df9e0c60c21576378c2b3a0"
+        "8481eec129b2a75608e13e6420127a3a63c8a3f1",
+        "0a63f9cdefbccdd0d5c9630b309027fa139c31e39ca26686d76c22d4093a2a5e5ec4e230"
+        "8ce43eb8e563187b5bd811cc6b626eace4063047ac0420c3fdcff5bdc04",
+        "04014cab9759d4487987b8a00afd16d7199585b730fb0bfe63796272dde9135e7cb9e27c"
+        "ec51207c876d9214214b8c76f82e7363f5086902a577e1c50b4fbf35ce996601a83f0caa"
+        "01ca2166e1206292342f47f358009e8b891d3cb817aec290e0cf2f47e7fc637e39dca039"
+        "49391839684f76b94d34e5abc7bb750cb44486cce525eb0093",
+        "01e51fd877dbbcd2ab138fd215d508879298d10c7fcbdcc918802407088eb6ca0f18976a"
+        "13f2c0a57867b0298512fc85515b209c4435e9ef30ab01ba649838bc7a0",
+        "11a1323f6132d85482d9b0f73be838d8f9e78647934f2570fededca7c234cc46aa1b97da"
+        "5ac1b27b714f7a171dc4209cbb0d90e4f793c4c192dc039c31310d6d99b",
+        "0386a5a0fc55d36ca7231a9537fee6b9e51c2255363d9c9e7cb7185669b302660e23133e"
+        "b21eb56d305d36e69a79f5b6fa25b46ec61b7f699e1e9e927fb0bceca06" },
+    { NID_secp521r1, NID_sha512,
+        "ac2175940545d4fbab6e2e651c6830aba562e0c11c919e797c43eff9f187a68a9e5a128e"
+        "3e2a330b955a3f4577d3f826529ad1b03d7b60f7ad678f005053b41dc0f8d267f3685c6a"
+        "be1a0e9a733c44b2f3ca48b90806f935141c842e3a6c06a58f5343d75e3585971a734f4a"
+        "e1074ce5b54f74bd9342f4bbca738d260393f43e",
+        "024f7d67dfc0d43a26cc7c19cb511d30a097a1e27e5efe29e9e76e43849af170fd9ad57d"
+        "5b22b1c8840b59ebf562371871e12d2c1baefc1abaedc872ed5d2666ad6",
+        "04009da1536154b46e3169265ccba2b4da9b4b06a7462a067c6909f6c0dd8e19a7bc2ac1"
+        "a47763ec4be06c1bec57d28c55ee936cb19588cc1398fe4ea3bd07e6676b7f014150cdf2"
+        "5da0925926422e1fd4dcfcffb05bdf8682c54d67a9bd438d21de5af43a15d979b320a847"
+        "683b6d12ac1383a7183095e9da491c3b4a7c28874625e70f87",
+        "1c1308f31716d85294b3b5f1dc87d616093b7654907f55289499b419f38ceeb906d2c9fe"
+        "4cc3d80c5a38c53f9739311b0b198111fede72ebde3b0d2bc4c2ef090d2",
+        "00dbf787ce07c453c6c6a67b0bf6850c8d6ca693a3e9818d7453487844c9048a7a2e48ff"
+        "982b64eb9712461b26b5127c4dc57f9a6ad1e15d8cd56d4fd6da7186429",
+        "0c6f1c7774caf198fc189beb7e21ca92ceccc3f9875f0e2d07dc1d15bcc8f210b6dd376b"
+        "f65bb6a454bf563d7f563c1041d62d6078828a57538b25ba54723170665" },
+    { NID_secp521r1, NID_sha512,
+        "6266f09710e2434cb3da3b15396556765db2ddcd221dce257eab7399c7c4901359251129"
+        "32716af1434053b8b9fe340563e57a0b9776f9ac92cbb5fba18b05c0a2fafbed7240b3f9"
+        "3cd1780c980ff5fe92610e36c0177cabe82367c84cee9020cf26c1d74ae3eb9b9b512cb8"
+        "b3cb3d81b17cf20dc76591b2b394ef1c62ac12ee",
+        "0349471460c205d836aa37dcd6c7322809e4e8ef81501e5da87284b267d843897746b330"
+        "16f50a7b702964910361ed51d0afd9d8559a47f0b7c25b2bc952ce8ed9e",
+        "04000bbd4e8a016b0c254e754f68f0f4ed081320d529ecdc7899cfb5a67dd04bc85b3aa6"
+        "891a3ed2c9861ae76c3847d81780c23ad84153ea2042d7fd5d517a26ff3ce400645953af"
+        "c3c1b3b74fdf503e7d3f982d7ee17611d60f8eb42a4bddbec2b67db1f09b54440c30b44e"
+        "8071d404658285cb571462001218fc8c5e5b98b9fae28272e6",
+        "00eb2bd8bb56b9d2e97c51247baf734cc655c39e0bfda35375f0ac2fe82fad699bf19895"
+        "77e24afb33c3868f91111e24fefe7dec802f3323ac013bec6c048fe5568",
+        "14bf63bdbc014aa352544bd1e83ede484807ed760619fa6bc38c4f8640840195e1f2f149"
+        "b29903ca4b6934404fb1f7de5e39b1ea04dba42819c75dbef6a93ebe269",
+        "05d1bcf2295240ce4415042306abd494b4bda7cf36f2ee2931518d2454faa01c606be120"
+        "b057062f2f3a174cb09c14f57ab6ef41cb3802140da22074d0e46f908d4" },
+    { NID_secp521r1, NID_sha512,
+        "3de9e617a6868dca1a1432d503f923535da3f9b34426b2a4822174399c73b1c1ee673114"
+        "10a58c17202ac767844b2024d8aa21a205707d93865693ac25a24fc87034fa3a7a7e27c3"
+        "344cb03b87602c15180a5fe6a9dd90cd11af4a0f150207bf2d83f55b12c088adae99aa8c"
+        "fa659311b3a25beb99056643760d6a282126b9b2",
+        "07788d34758b20efc330c67483be3999d1d1a16fd0da81ed28895ebb35ee21093d37ea1a"
+        "c808946c275c44454a216195eb3eb3aea1b53a329eca4eb82dd48c784f5",
+        "0400157d80bd426f6c3cee903c24b73faa02e758607c3e102d6e643b7269c299684fdaba"
+        "1acddb83ee686a60acca53cddb2fe976149205c8b8ab6ad1458bc00993cc43016e33cbed"
+        "05721b284dacc8c8fbe2d118c347fc2e2670e691d5d53daf6ef2dfec464a5fbf46f8efce"
+        "81ac226915e11d43c11c8229fca2327815e1f8da5fe95021fc",
+        "0a73477264a9cc69d359464abb1ac098a18c0fb3ea35e4f2e6e1b060dab05bef1255d9f9"
+        "c9b9fbb89712e5afe13745ae6fd5917a9aedb0f2860d03a0d8f113ea10c",
+        "07e315d8d958b8ce27eaf4f3782294341d2a46fb1457a60eb9fe93a9ae86f3764716c4f5"
+        "f124bd6b114781ed59c3f24e18aa35c903211b2f2039d85862932987d68",
+        "1bcc1d211ebc120a97d465b603a1bb1e470109e0a55d2f1b5c597803931bd6d7718f010d"
+        "7d289b31533e9fcef3d141974e5955bc7f0ee342b9cad05e29a3dded30e" },
+    { NID_secp521r1, NID_sha512,
+        "aa48851af7ef17abe233163b7185130f4646203c205e22bcc2a5a3697bcab998c73a9ffe"
+        "1d3ea0b7978ce7df937a72586eb5ca60b0d939a7d1c115c820171c89c8116b7e2c7b98cf"
+        "0f14e4c4df3cb2f319ad3ab0ea25ff14526ddc037469f000bf82100acd4cdf94feb4eba4"
+        "ea1726f0569336604a473aee67d71afebb569209",
+        "1f98696772221e6cccd5569ed8aed3c435ee86a04689c7a64d20c30f6fe1c59cc10c6d29"
+        "10261d30c3b96117a669e19cfe5b696b68feeacf61f6a3dea55e6e5837a",
+        "04007002872c200e16d57e8e53f7bce6e9a7832c387f6f9c29c6b75526262c57bc2b56d6"
+        "3e9558c5761c1d62708357f586d3aab41c6a7ca3bf6c32d9c3ca40f9a2796a01fe3e5247"
+        "2ef224fb38d5a0a14875b52c2f50b82b99eea98d826c77e6a9ccf798de5ffa92a0d65965"
+        "f740c702a3027be66b9c844f1b2e96c134eb3fdf3edddcf11c",
+        "1a277cf0414c6adb621d1cc0311ec908401ce040c6687ed45a0cdf2910c42c9f1954a457"
+        "2d8e659733d5e26cbd35e3260be40017b2f5d38ec42315f5c0b056c596d",
+        "0d732ba8b3e9c9e0a495249e152e5bee69d94e9ff012d001b140d4b5d082aa9df77e10b6"
+        "5f115a594a50114722db42fa5fbe457c5bd05e7ac7ee510aa68fe7b1e7f",
+        "134ac5e1ee339727df80c35ff5b2891596dd14d6cfd137bafd50ab98e2c1ab4008a0bd03"
+        "552618d217912a9ec502a902f2353e757c3b5776309f7f2cfebf913e9cd" },
+    { NID_secp521r1, NID_sha512,
+        "b0d5d52259af364eb2d1a5027e5f7d0afe4b999cc5dd2268cfe76f51d2f17b541bdd7867"
+        "e23a1bb897705153d9432a24012108979c6a2c9e2567c9531d012f9e4be764419491a52e"
+        "ae2e127430b0ab58cb8e216515a821b3db206447c235bf44ee304201b483b2a88844abaa"
+        "18bca0147dfff7e502397dd62e15524f67eb2df2",
+        "13c3852a6bc8825b45fd7da1754078913d77f4e586216a6eb08b6f03adce7464f5dbc2be"
+        "a0eb7b12d103870ef045f53d67e3600d7eba07aac5db03f71b64db1cceb",
+        "0400c97a4ebcbbe701c9f7be127e87079edf479b76d3c14bfbee693e1638e5bff8d4705a"
+        "c0c14597529dbe13356ca85eb03a418edfe144ce6cbf3533016d4efc29dbd4011c75b7a8"
+        "894ef64109ac2dea972e7fd5f79b75dab1bf9441a5b8b86f1dc1324426fa6cf4e7b973b4"
+        "4e3d0576c52e5c9edf8ce2fc18cb3c28742d44419f044667f8",
+        "1e25b86db041f21c2503d547e2b1b655f0b99d5b6c0e1cf2bdbd8a8c6a053f5d79d78c55"
+        "b4ef75bff764a74edc920b35536e3c470b6f6b8fd53898f3bbc467539ef",
+        "1dce45ea592b34d016497882c48dc0c7afb1c8e0f81a051800d7ab8da9d237efd892207b"
+        "c9401f1d30650f66af8d5349fc5b19727756270722d5a8adb0a49b72d0a",
+        "0b79ffcdc33e028b1ab894cb751ec792a69e3011b201a76f3b878655bc31efd1c0bf3b98"
+        "aea2b14f262c19d142e008b98e890ebbf464d3b025764dd2f73c4251b1a" },
+    { NID_secp521r1, NID_sha512,
+        "9599788344976779383a7a0812a096943a1f771ee484d586af1a06207478e4c0be9c200d"
+        "42460fe837e24b266c8852d80d3c53cc52ffb1913fc3261145fc6da575611efd16c02605"
+        "9a2e64f802517ffd1b6b34de10ad2909c65c2155e8d939b8115400c1d793d23955b15f5d"
+        "1c13c962ff92b4a815cee0e10f8e14e1f6e6cd38",
+        "1654eaa1f6eec7159ee2d36fb24d15d6d33a128f36c52e2437f7d1b5a44ea4fa965c0a26"
+        "d0066f92c8b82bd136491e929686c8bde61b7c704daab54ed1e1bdf6b77",
+        "0401f269692c47a55242bb08731ff920f4915bfcecf4d4431a8b487c90d08565272c52ca"
+        "90c47397f7604bc643982e34d05178e979c2cff7ea1b9eaec18d69ca7382de00750bdd86"
+        "6fba3e92c29599c002ac6f9e2bf39af8521b7b133f70510e9918a94d3c279edec97ab75e"
+        "cda95e3dd7861af84c543371c055dc74eeeff7061726818327",
+        "1b7519becd00d750459d63a72f13318b6ac61b8c8e7077cf9415c9b4b924f35514c9c28a"
+        "0fae43d06e31c670a873716156aa7bc744577d62476e038b116576a9e53",
+        "183bddb46c249e868ef231a1ebd85d0773bf8105a092ab7d884d677a1e9b7d6014d6358c"
+        "09538a99d9dca8f36f163ac1827df420c3f9360cc66900a9737a7f756f3",
+        "0d05ee3e64bac4e56d9d8bd511c8a43941e953cba4e5d83c0553acb87091ff54f3aad4d6"
+        "9d9f15e520a2551cc14f2c86bb45513fef0295e381a7635486bd3917b50" },
+    { NID_secp521r1, NID_sha512,
+        "fdde51acfd04eb0ad892ce9d6c0f90eb91ce765cbe3ce9d3f2defe8f691324d26b968b8b"
+        "90e77706b068585f2a3ee7bf3e910528f7403c5af745a6f9d7ba6c53abd885c3b1be5834"
+        "15b128f4d3f224daf8563476bd9aa61e9c8518c144335f8f879c03696bddbe3ac37a8fbe"
+        "de29861611feaa87e325e2f60278b4893ed57fb0",
+        "1cba5d561bf18656991eba9a1dde8bde547885ea1f0abe7f2837e569ca52f53df5e64e4a"
+        "547c4f26458b5d9626ed6d702e5ab1dd585cf36a0c84f768fac946cfd4c",
+        "04012857c2244fa04db3b73db4847927db63cce2fa6cb22724466d3e20bc950a9250a15e"
+        "afd99f236a801e5271e8f90d9e8a97f37c12f7da65bce8a2c93bcd2552620500f394e37c"
+        "17d5b8e35b488fa05a607dbc74264965043a1fb60e92edc212296ae72d7d6fe2e3457e67"
+        "be853664e1da64f57e44bd259076b3bb2b06a2c604fea1be9d",
+        "0e790238796fee7b5885dc0784c7041a4cc7ca4ba757d9f7906ad1fcbab5667e3734bc23"
+        "09a48047442535ff89144b518f730ff55c0c67eeb4c880c2dfd2fb60d69",
+        "1d7ce382295a2a109064ea03f0ad8761dd60eefb9c207a20e3c5551e82ac6d2ee5922b3e"
+        "9655a65ba6c359dcbf8fa843fbe87239a5c3e3eaecec0407d2fcdb687c2",
+        "161963a6237b8955a8a756d8df5dbd303140bb90143b1da5f07b32f9cb64733dc6316080"
+        "924733f1e2c81ade9d0be71b5b95b55666026a035a93ab3004d0bc0b19f" },
+    { NID_secp521r1, NID_sha512,
+        "beb34c997f905c77451ac392f7957a0ab8b23325bd5c63ca31c109ac8f655a1e3094240c"
+        "b8a99284f8091de2ab9a7db2504d16251980b86be89ec3a3f41162698bab51848880633e"
+        "0b71a38f8896335853d8e836a2454ecab2acdcc052c8f659be1d703b13ae1b090334ac50"
+        "ab0137ddb5e8b924c0e3d2e5789daaef2fdd4a1e",
+        "0972e7ff25adf8a032535e5b19463cfe306b90803bf27fabc6046ae0807d2312fbab85d1"
+        "da61b80b2d5d48f4e5886f27fca050b84563aee1926ae6b2564cd756d63",
+        "0401d7f1e9e610619daa9d2efa563610a371677fe8b58048fdc55a98a49970f6afa6649c"
+        "516f9c72085ca3722aa595f45f2803402b01c832d28aac63d9941f1a25dfea01571facce"
+        "3fcfe733a8eef4e8305dfe99103a370f82b3f8d75085414f2592ad44969a2ef8196c8b98"
+        "09f0eca2f7ddc71c47879e3f37a40b9fecf97992b97af29721",
+        "0517f6e4002479dc89e8cbb55b7c426d128776ca82cf81be8c1da9557178783f40e3d047"
+        "db7e77867f1af030a51de470ee3128c22e9c2d642d71e4904ab5a76edfa",
+        "1c3262a3a3fb74fa5124b71a6c7f7b7e6d56738eabaf7666b372b299b0c99ee8a16be3df"
+        "88dd955de093fc8c049f76ee83a4138cee41e5fe94755d27a52ee44032f",
+        "072fd88bb1684c4ca9531748dfce4c161037fcd6ae5c2803b7117fb60d3db5df7df38059"
+        "1aaf3073a3031306b76f062dcc547ded23f6690293c34a710e7e9a226c3" },
+    { NID_secp521r1, NID_sha512,
+        "543c374af90c34f50ee195006d5f9d8dd986d09ad182fcbefa085567275eee1e742bfe0a"
+        "f3d058675adeb5b9f87f248b00a9fbd2aa779129123a5b983f2f26fc3caf2ea34277550c"
+        "22fe8c814c739b46972d50232993cddd63a3c99e20f5c5067d9b57e2d5db94317a5a16b5"
+        "c12b5c4cafbc79cbc2f9940f074bbc7d0dc71e90",
+        "1f0ec8da29295394f2f072672db014861be33bfd9f91349dad5566ff396bea055e53b1d6"
+        "1c8c4e5c9f6e129ed75a49f91cce1d5530ad4e78c2b793a63195eb9f0da",
+        "04009ec1a3761fe3958073b9647f34202c5e8ca2428d056facc4f3fedc7077fa87f1d1eb"
+        "30cc74f6e3ff3d3f82df2641cea1eb3ff1529e8a3866ae2055aacec0bf68c400bed0261b"
+        "91f664c3ff53e337d8321cb988c3edc03b46754680097e5a8585245d80d0b7045c75a9c5"
+        "be7f599d3b5eea08d828acb6294ae515a3df57a37f903ef62e",
+        "0ac3b6d61ebda99e23301fa198d686a13c0832af594b289c9a55669ce6d6201138476901"
+        "3748b68465527a597ed6858a06a99d50493562b3a7dbcee975ad34657d8",
+        "0cef3f4babe6f9875e5db28c27d6a197d607c3641a90f10c2cc2cb302ba658aa151dc76c"
+        "507488b99f4b3c8bb404fb5c852f959273f412cbdd5e713c5e3f0e67f94",
+        "0097ed9e005416fc944e26bcc3661a09b35c128fcccdc2742739c8a301a338dd77d9d135"
+        "71612a3b9524a6164b09fe73643bbc31447ee31ef44a490843e4e7db23f" }
+#ifndef OPENSSL_NO_EC2M
     /* binary KATs from NIST CAVP */
-    , {NID_sect233k1, NID_sha224,
-       "f23f784fe136c9fc0d169503d361e9c6148b0f1fbdcae0a97fae1af7033ddef25cb7489c"
-       "9963cfcb009a8cbfe44a8510a64a073eb1deae4c324ceb9302008c92c69b2dafcc9077fd"
-       "3cc3c7c119edc3ced36d176ceaa55ac036bf7f07f6fa215e8bb8196e59a5e1c9af4f98b9"
-       "0ab4970885bd7015fa26a09e03c7cf6b4b23d929",
-       "04c1d414696cc3657dd9df73ace56eda2636769ce7082e064c260be45a5",
-       "0401f228c0a75b057eb07fe7ce8223ed4163148c1fdab61e0f787271f836a900cdfa5655"
-       "d96ffd5ffb6027bfaa04da7b5d8fbdbb6202c8bb79f056ce43",
-       "058f8511089fcd59324469f6736b92693afe26bd4719e198f1f2287dc5f",
-       "016bafefb4933ffd00bd1db6d6c4fac8a06375603adc0aa2a5664083ff4",
-       "03bcb84b8f1990cfc7b88f2b8cc817105cd8e150808e7c87b310cdc47e3"},
-    {NID_sect233k1, NID_sha224,
-     "400bcb297552bb37f2f8135a9314a35f5126788bb6fa4dc74152731ff64c5dab4b902103"
-     "d85443dec20e16b1d6629930cdc2bd183d4099f0e96295a63c2fe266f5e9d050c401a868"
-     "1b4a438efe53cbd8f2f43e2a31e9f88926a9c82917d873f6e8cd5ff5eb8c1ca36126b0bf"
-     "c8c2b0e85a7c9e7a45f1875ca9c82019ebedb729",
-     "027cb1d84865a16992476c9e353283d5d6a40c349a8e9179d1b1f403531",
-     "0401191227d064176f4ab020faea61330df5eb59163ecb4ea59c23e6f1f6c8012dbfbf85"
-     "b3624b9f56446f840602f9b839bab1368295b3ae919cb07c07",
-     "01a41af270269be052a62a9879638e3432a1479b05776ce61f45c0c361b",
-     "041a5f1d28b70bfa2925b9428ab8bac9fa174d88ae27d754824c7d16ead",
-     "044d359065672b3d3dfe8389fbc6fc751ca6a46820626c466174fb9b922"},
-    {NID_sect233k1, NID_sha224,
-     "5f74d4b35c49fa454c97c05fdb6b9f6822cf1a2295f15bd766dbcb413d77c910bd8f4147"
-     "e8f317fac2300fa21cb80134d1b6f8ae8e50518c1f648a28506e419f5a6e8f05abffdb3d"
-     "d2587606c7e9c223ecff4f46b121216730ea13202b59128a7616bb2fd23a7e4a5aa08641"
-     "cc07b669641313febfc88d64d99447353dae3f06",
-     "031b443f46c4b5224237fac1022ee1570173f664aba0c84dbaa4246bdc1",
-     "04005f57b0e5f2e175006f4058cbb4ca9a0cac912c551ef1b94e97498fcc5a00f3a554d0"
-     "77b751478f8a2b7c2a9cf15effed958e0ac1a9e3db1e023c5f",
-     "07ff6ef3026c5a960e632beeb7313b3bca0baec76cea1fd9b82cedc3245",
-     "0099741698549c32a4e86aab6194527cea703ff869849c538a938585a83",
-     "02ad706c6f5dcff512498d84f1877eb997dfbe9b3d13b339917632d3cb1"},
-    {NID_sect233k1, NID_sha224,
-     "8f92096876d9f81bcd992369d42d0b5877ac969004d17c8627c58d8b8b7bbf7a37e8cb6a"
-     "fa962b9b043bbbaa5bef4a5ee38d8bd31cb5866b828265a2f4102a616f87009cd346fcb8"
-     "af5519fb577c60d8792472232f33dc615655e53d2b715b15a2697b492f108b7906e1e359"
-     "7c6911f8cc30c7121ae338a6b747ec368f8e4a36",
-     "048f6ca29f35f253a4962734357c995920967b9eeff1ba5fd2080bfede5",
-     "04012b7ca7c21292f8795b2fbfd63a28c5a4ec8c850d6240f973c903bc817001be9855e5"
-     "c5a5064c27d1862010b2fd0d7be5a0180c861a288ceac89d6d",
-     "07dcb9725323fd7668991ce9a907b7129d53fae9016e253c53d057d195d",
-     "0498c4fca6ed7c2998347b464d3e562a74b0e4f3a6c1dc453aaa61bb710",
-     "03a77a13f011404d5c5341dcd2ca44dc2b08f21f09f524045c281fb221e"},
-    {NID_sect233k1, NID_sha224,
-     "3d275dbde44494c45fc15fe89e2ae32aa26426a17e923e895c7941a5582fb95df4d49873"
-     "ab1bde358017f336b911b886b626b744806ab8113418473c441f1964159ded1b12122d53"
-     "ac56573167588e4b55f36b8bca8c67823883a51fb6e7f204d1c6b07ea49b577bfab9ca6b"
-     "8d51f72268b022e3a4db6f9d265ee8382f9b7b66",
-     "019b940eabbe682f961d9f3d90432e347fef3910e641656825d775705b1",
-     "0401efcc9f4576047c43eab1c13e0547b1c5ec1cd2afd2345fda72b5e1b50f00c7b5968a"
-     "f47e58f4ec15c0cd82ccd0b9f5bfde06c7f86fe5cd0105d693",
-     "03f783a94d1de73e4593f5d6d02238cfa0486e3ddf2bc0b95a528038e3c",
-     "013c467531f3f6508534ad072edb210e4182ce5a798d8a46674e92a0b4d",
-     "0685982aa8e2f3e46ecc03e00e7323f3b891da437235cfe9800139ee8d7"},
-    {NID_sect233k1, NID_sha224,
-     "d2fa68e1f7dad02916b12fa38f1849d6d409dbad0344438520b4dd9b77d62d39ac9ae3cd"
-     "eab03ccbcfd4de703c6e798873671731c108f322b9f2a68145e3e210c9b15b879798e5c5"
-     "3c5022742e9819b99edabb2f44d89ae221f7a99dc84421a6905695ff91928db608f86174"
-     "5f17584d56e34b75c47281435b1b0b34e490692d",
-     "07a884b22e29fa9fe945e9ba13c0df8d786dc87cef0f77f069e182dd56c",
-     "04011e831647d0ffd53d75e44abceda753ab470b3cc93b457590617d925a19003db5bd0a"
-     "ecd6504d904bcf9dcce131abd239aeadb9a64a9811eac823cc",
-     "00241b763c6245b83afe61762b161c41467ef35b7f27a9c1066f02babd3",
-     "0514adca3481ac5f99287e6e966a5c223296b07a9456eb582ec5568688c",
-     "07ff6a2f7cb1d2594a11d8d0adb6fe50b4e740f025e7b4333ee26163d92"},
-    {NID_sect233k1, NID_sha224,
-     "3830f75cf9df4eb2998c7c1b5fe11c1476bcf849c3a8fa7d3d0b5bc2292e5d07465ab8cc"
-     "9381c575d909e509c5dac49c78817c04e4bef18bd51bb09aa5897f21634633a5ce6d20bb"
-     "4638cb6c3927351eaec7b62cf4a33956916045c392f325adafb10a88a5f86d7e41dd7790"
-     "8fa7284210071c22aa40ef40da6339c02da05392",
-     "05da61f881d5a0dc085bb93764f584352882923cd237d878220ec624c1a",
-     "04018d740441eff1f785a14d04da4ba69540cbb469780ffd36e1dfae4f1de2018072ab30"
-     "e999ae26b872ef46a9a0604296d02c08fba9477d9e03f0f75d",
-     "000f95c5678fd08dda790cc60bfa578118f8687228a2ef5f31e71a6884b",
-     "074a6599b8cab75e0cf752e3f41288fbc673d52074950edb14f76524949",
-     "03523804351e3224e816cd4fb7191f332585f68053ddb32a85cc0fadc03"},
-    {NID_sect233k1, NID_sha224,
-     "65b9fe15e6c35d453caa6bad39ee78a720a04b60d8a0a0f049186d2f777e48ae2d657e17"
-     "4df53edb7beb9f7d8f21904ed674add0cda5b62a7308de76c324a144021e8c6d387daaba"
-     "4ce48bf7dfe9c8aeee2c64e434ece1fa5ddcafcf3e5d0013a1eeec1742a00d384cc2ec0d"
-     "7eda83bb4dccfb0e57045ebfc27a4f404d03da37",
-     "03fe9f04647f6d82b13ec1ae5a8c2e49bc66b05649ad778eb16149ad83a",
-     "040158eecc6b8918e7813ef990217c603b28ed1774c740382a8af5c9af613301bbffeccd"
-     "41107c7e6f83e24c822d634a7ec064fae125dc8a3ecc4fc9b3",
-     "07731edfb3ef523a165a1b5817ab2805a5cf88043c98ea2393898e19551",
-     "01fa44fa18ebafee6f419fdb9de0e8365520617558b57e9ee89f2c8fc88",
-     "053f1b2da4cabad04fea1111d525f341417587823fce71e5bfd2353c2f1"},
-    {NID_sect233k1, NID_sha224,
-     "d26521fd41eb5d46ece6836e188bf9cb1b461d011c41e002a935d256654d01725378e845"
-     "920ec4a7fd3f379df54772493df50d312c7c6aa4e909e7b83f2442c3a5e85c37d68aa015"
-     "098ecfb0a5e077370f4576f4bc63bf37e1dee06d780a3b6949af5e21c2a0960fcd20821e"
-     "f5f17bebf5fd5b3bdda260842cbbfad45667287a",
-     "05ebce648ace4cd555413de6a456fc487d14bf4b0b9a72311ef480d2f26",
-     "040020b46ecbdc36b4dc01111932090ba185eab2cdc4fa89775f2a6177c5920104cac1c8"
-     "00103c79642321a216bcfae497b037b29888cf9f70c507114e",
-     "027733120626e564b06ba71c4946c9c8bfae43f88511ec6352d2a52f407",
-     "0592de5184510e6ecb7be8a011f862470b918354a1ad82458cf716137fe",
-     "010a9c5fb6e4b70571a35c56744b57baf0108728bea2bf639af1960d1dc"},
-    {NID_sect233k1, NID_sha224,
-     "b778c021b1a92c41dbd09963da07018075d73e54d62df5c2b7bf8abe137151650d1c1c6a"
-     "bce7eebd8f32e8c3e6d1433773f257bb3ba4a4fb6a02c0db1e47d03c27d3a90898ebd192"
-     "7c21df24c4c5443ca5b81f8ef2cc0f5e8b3d08f472bf07085df737adaedec63d99acd77b"
-     "87ba98225f198b791124ac2d9b191cb9251b4b00",
-     "056653c2f85593f789a926ba49fa3da9d7f946d8f1020508c5a527ce813",
-     "04010d65f6f5415dd86a83bb10118abfc1b1670a1664eb6dae99fb68b85019012c1e673e"
-     "575086ec1e76b90d59c2cbd2727f726f88298552b678ba7e60",
-     "021e26c098c9f9da9c782857fe640ff6abb21caf20a093f2277845bd10d",
-     "01d67cbc8209494dca1a74cee5d9894f98f03728214f7bbdac29b0c0e78",
-     "02215f758fcf0d8dd603e79658a8061ab45bfe6d854e52ea7074fd5654e"},
-    {NID_sect233k1, NID_sha224,
-     "ec14e07f615960015a489ef999e308b42a4c571473b9bd64b433dabd9a1b1ad02e33eee9"
-     "100064405175928a94543a80f440040afa2965b4e5f95f768e7fab6d3c0a5f5e1bf1df78"
-     "22f78384e80f2955ea85f044ac60537d895747979f935bb0cd3673193c4a32dd7803e48d"
-     "7daf70a71bc2aa97236615b6411e28fc9a652145",
-     "049a91d320783cc70a5952c32036cfc75d41f1aa84127db2dc759fb291c",
-     "040190528df8fc3ae4db6e12930f176ec9c833d1668ac5808f1046366445a401f647d55c"
-     "e80b18a9add47fd1a8e4aa725297d9da03246f5c1ce503dd56",
-     "01eb80e2596d6c01431e7a4fd9e22903ea85547a31d675ff157a789a137",
-     "04523776d88199ebac2f96f9faa434bd81bde770ad4458ef126fde9198a",
-     "054665f31f92f8897482d34fcb63141a7539577037c84496167e9d3389f"},
-    {NID_sect233k1, NID_sha224,
-     "89c645339ad0eb850e4e2fe583cee175b35feb02ed7541d7e9aace24cdd3939584f73ad3"
-     "9526de6399c86b36de77a018e2c70b532bd0f032f9137d10480acc30c49f9baaa86f9df0"
-     "033b77e98b485bf7a69cb5c281e527d3ccd1fce2415f0dda4a268ce68a0a34b16afda54e"
-     "d922cd6810ac8dc766df2a3a6c5e55972e9786fc",
-     "016a20016602fc7088a60469843e1d29ad67e3c3cb9500b1e2a00d4050a",
-     "04004f157541dc3a8bc8a2ad4dfb3933039b67e331b7353a2fa9ede322f4ad01348a7b8c"
-     "9495bcbecd556870715faf3d543cb8f2368805473bca17b82e",
-     "01df1ee39217d7f0d838e8b2d30a1159d8003b06e50a00d637edf08d6d1",
-     "045d16826bbc425637e7a05b826bc907f7453c70141d1bbd2cda63dd490",
-     "01ae1703cf179dfd1d5407ba2b7324cc7cac15235ee9c3756177444e122"},
-    {NID_sect233k1, NID_sha224,
-     "ace14c4b101d2d8453c2bc22b756af016b5de537df9c3e639d208ad04ae0bf6232dc90b9"
-     "0c33228dc85de956db771ffde05fb4d0b15e4f218ed2771d703ae5bf981252a5bcd60c16"
-     "f14483131a481cbe04dc0adb1fb8aa32cb48bb5008e8a8e5c7b7465be2fd7afbc811cf5e"
-     "a6293b1a464669b49f55f57b93a8707e6042fda6",
-     "00ba922149bada2551b7be1c3df076f3f97ce93c13c50c285fef3f42363",
-     "04012daff2cfab994b9d1d1ba73bd2f8e7883b2d92f760b0d16351ec125fd40115666f7c"
-     "65b95ec2d713c5ab1a3eeaaf0f931b1859733416c3c778aa2a",
-     "07fc7c9503fabba0972e0e8892ec6331e0812c6452d211c5561fde79048",
-     "06477ec9d8d8d45418b9efe7ae47c0863ff94c43d8f392c079b870a7cf4",
-     "06b5a5d020b3d980b9d7880130802435ddb4e7362e36a70d193f18a7fe6"},
-    {NID_sect233k1, NID_sha224,
-     "cec2ba0d1772c87e87d5bbbd67220692bea4301aa1a66e8dbdd7e651d45c26dc2a0d45cf"
-     "c32c34d76ae3e1c61db7b0fe1863457b93937d929e6ece7462ebd16adfd708353d6f7c27"
-     "aafe06593c76da7149b0cc574a4290b0d8fe219f3eada7082aca38dba3f78ed0d5942d09"
-     "5fa5556fc8bcef331ff0a6d5d1f4e6c51d4ff5af",
-     "02d635e12a58cc6dea44e71e87c37f91e8d08659f0b7955d24f65ab55ba",
-     "0401dd33d8224ffe63a32f2de5d4fcb0e5f1fca7ca2ade5b35ffbe75cdc65800bfbe9dfe"
-     "13f99258c787af82631ce2133dc73207c579b29869c7463943",
-     "04ef333049c575d6688aa04f87a6162185e4a57bb752a7f903e3aff86ff",
-     "01ade04af08ea1c1877779fbf6335156b1a1437f3e449f07458d700c67e",
-     "010fa82467d39e5ad51cda8fcedc72ee6a78dccd0c90544814e53ba9cb4"},
-    {NID_sect233k1, NID_sha224,
-     "ffa13cd0f51ae2643d5d4edecb493ddd653e9faddcffc370e7e958abf726a5d67a2ab36c"
-     "ef42ea8ebe22a6f01b9c31f6ffad01e6894487d979acb5e618f765ac0ec3550ac5dbbced"
-     "e8f9fdbe52fbaba5c087ff382b6d7a09b2b5084227d324d98ff98793040884799b96d2ca"
-     "593201f4414f18c43b51c53c5e5059e0641aca02",
-     "0073883e5064e06814fc4de32e15f7a6cf825d2daf6eb1df8c83e25d80a",
-     "04000d3c79d627ee0d2d88f2de2dd082112c20dbc5ed66089454f7b8fd9f8101a2580e77"
-     "9753bcb023acba1b0852492b989c767f664c7047de8e6689fb",
-     "020231e05166271f47a91dd883c580ee313e9a07195ae511f0ee62173ec",
-     "0303eb4a0df97577c4cff531b3f54aa282e76669c0c5ebf4c9779c9bb82",
-     "0692432a7dfde09db7743f08130b3d3327dd98cbdc323627603518f70d7"},
-    {NID_sect233k1, NID_sha256,
-     "c73e3dbac9513d0361dabe94071faf03a11cba18c06d131a172d5f0125b01a5eeb6055bf"
-     "72c7106fe3f4be3bd2b1771cbe7f85366dccfbc3bac20538510c3f51179cc540ddafb2f3"
-     "b05a0d276899674ab1d7d8fb4f6838f04e4f9e26b8c6af31540f63f4953c85840af4c57d"
-     "fa78c704f637dfc8dd750fe45e2c1e149986d127",
-     "01532271bfae8d4dfe60f69b88d3006d58e28aacfa701861cde8d624db6",
-     "040041c1ca965338976b4c45c28b1cb64836b3b4d3e7ba2b1323ea26fbcca201a177d042"
-     "fba7903007db122eabc459e37c2c7fe82e42752b267fafe4b0",
-     "06a54894825644901baf2ec3681ce5aaf93a18757d93ec9cbce7ccd9d65",
-     "03edb77fc7686b520493604db18fc69edb4cad8195a958e27ef289c4bac",
-     "004337ecfac57abb9271909aa43ff4e32851df7818dcd87216d051189c0"},
-    {NID_sect233k1, NID_sha256,
-     "d00dcd0f3212a3167403abed91c20e76f5e7a7678a4fd970f944d11e6a8cd149d0aa6fd3"
-     "164c5a74c0f55193a4fa3d8ba6f99cabed10544625a7bd92b3e0b46edbd4a269bbc10518"
-     "c5268c3910a2aea567ccd32d4c7a0cbef09ea42c20b636d1f711d220e23dacdb9d1146e0"
-     "494401349749e5ed88e38295232a7effbae3aed6",
-     "0550406c0db882c6aee6cf3b6baf377375208c3e90cc44a067cee43efcf",
-     "040073348eaa8f2885fca3baf31830a2b28bfe983e3046418561f62ac5d24700033de5ae"
-     "e6d0bd4de286f1de1e80bf72e5e17083032bd4dc24577b6d2d",
-     "05c0e7ad0f9bbd522c862326a5734a766423fff7efbe57c51c315fa574c",
-     "02103f1a0200883850b6476c7d7e7d2b3e2f60923d028ee6f8227b1ec48",
-     "007cbbc3c6295ceafb3d9cf8411f85a045b11ef8472c5ed45346d26192a"},
-    {NID_sect233k1, NID_sha256,
-     "3d36221f87157ca4db84884b8666660c4e2b6af330480c516cded9f3bfe132543626a39b"
-     "b6aed1964eb5c33ea0b95b9841665417679fceb95d199d55accfce35dd3f2283c1a7ced5"
-     "7d0c4b9ebe3da6e1ff2f979b6440db27caf9f6a4bbfa47e20d29ae304f4d0551fce9cc40"
-     "97eb2fbedb9b24680bb17d207bdccdbe799d5b0d",
-     "0257dc63752920b6854d6c2d1cca68589a38418c3d036e73760a12214ab",
-     "04011a42e9f66ecf030d0446cfb751136347d4df0ee4e031058ebdcc04df8000fb7161fa"
-     "c8cc5ad7bc4477a39350e419776f76f184e28abce886ae9cc5",
-     "00391d36c4044896ddcd68604d5f677d1df298f46abc00eb12f1165e8a1",
-     "04e19bdc6755a603085b66355256bce98d5fdd49b4f06b628e3e185574a",
-     "07697b29ce5546de969c9c4bbb5ea65f712d6cda3410f3dbfa0cd5b1a8c"},
-    {NID_sect233k1, NID_sha256,
-     "033d82a42d0eddf58fbe3e91ddff7190e3f9fc2b1e2eede977d2c0473b358b5fce1f981c"
-     "a6f88fd61ce2f79e453e3a2b77d1baab2b970ed28d5dcff58873a620e195085e61c4b848"
-     "0d829525a1a944e8a4b63352f0291f0311f1f98ceb262804beec1c74947618f8e3b06786"
-     "6255878c2502966cefcdda4f5fa2b13d92ce7840",
-     "029025352297a7be850f8852411c09259b83219135e0e8949c1bd5b94c1",
-     "040184345e37f07077cc8df5947c1b1fcd8404b3c31586d6ebd91b240cf42b019dbc9091"
-     "a5d282fd6e62c34676a06a425e098567b990c47e61ef14d77e",
-     "02b2663a449ead3f8cce2459e04cf84333376624d994fd9312401ae57f1",
-     "03af223fd3a6b6b240e59dca83ce2477a577494438ddee3fd09632ea67f",
-     "0606576d89f2094572f0bbcb58a15d9a4bf10ae3667d4e35cdd8da32102"},
-    {NID_sect233k1, NID_sha256,
-     "671a7c81b64b2919722d7b258bdbd90165bb757b53106e0af03d0eef27452942f40cf52b"
-     "c95cc7f6567df2613cce795f8bcfc723b2735efc35375c001d37c58480d89343697146b5"
-     "24835df3dbd333f7c06c98e36d3c4592ecd1f34ab57c341bb0f4c785f5b8372775f74b4b"
-     "ce60763fad1788e77ea158d735a64861320b36c6",
-     "02dc82d0e69e498528925c0e62a13fda9af8cefd047c10c3ffc2e41da3e",
-     "0400e5463926235ce53a85b489c3c278320ed986003962a5fc7ad4cbab0d9f01453e6edd"
-     "e95670a4653186ebd8246c28a94dd84f5a669bd3293176f1f0",
-     "034a8dfbbdc98bb1d9b175600bffd866306dffadcc4bbb6f24e7f918da5",
-     "03cf1407445cf1a619a280e139242056c23c58979f0b3f0aa7e1fc074e2",
-     "02e55f27593f2c76fafccb71493f14daf50073b35cc85f002528cc6d691"},
-    {NID_sect233k1, NID_sha256,
-     "0ef677f4799298f4aab73b7393598041f56e902ced1726af49657b6601a06186212e3ee8"
-     "cd4bd33b760dfa2ea3c38884f94358d51dd479f2ccc8b0b352fa4e44fcfdcfbb24919d04"
-     "e6ee1108527b8e8d60e8d1b467c30c18c5455e5835d483161d3fc26b4a67d6df9e3ddd93"
-     "31247cb18450188752a1ca219f3396a872cb13d8",
-     "041535fff5d279bcd744b04e643458ce20b81df8a9e01b1181d52bb14e4",
-     "040021e1227457be78e49db22335139a136ba290d34871f90ab5e6a8db6ac100df43b381"
-     "a4d757864c39ce8d0b64d6a32e9e8be30f92a10a252d46a2e2",
-     "03019bd459b34133dc7331caa8976bee67f76db3a45b1793cb545e26c68",
-     "0025611bd4e3473aaea85228b2bf37eb1b4458d8166012aa098d9c1cab8",
-     "07acd38506e984fb7f1607b50837018f9b4246623dcfc9d7aceb486e76d"},
-    {NID_sect233k1, NID_sha256,
-     "9290df0cc50c3cab6655f3a6de1f4cf613d9bc06ea7c99f38038369ff2fadefa57a3c7ae"
-     "7940c1b98bb1d03503cc271f7a891bf38eec93c31dcec7892dfd2e1ab337bedde3e5325e"
-     "d8d9cb7fa3096f6fafc3beb3a66cba66ba826d1032debfb4908cc9dded8c0099c85072da"
-     "ac4373fbc428fcaa9a6da02181ebc33f0cf926fb",
-     "000ecfe580a624df66c25e87e7689fc3b471d205970ff9ab51a64aa12ed",
-     "04002ca7b9c98bb8106ae14a87d5f9f7ae1f99a5524992116e68af89da6daa00a2fbee76"
-     "9eec313cf3c8519d3f96167477f0f06dcc470408e3f637b6c2",
-     "044f065c49bb7ff0772d628104bc2e222f1fde42aaa8b9345d324d7f936",
-     "046301f3f07922d338d5b7d82104597fc50941e4bc0a15ab5e0408f9fa1",
-     "03495e335905b4842b97f00b344313ca7d6a4ff60cfeaa5d589e0a31782"},
-    {NID_sect233k1, NID_sha256,
-     "855c7be75fda372f062709827f333630acf28954a62a5193ff675f0dfeb63f32bca418f7"
-     "cbdb346bf388d62315b19a592267ca407120db93d4e3d7125b867c4c4670b7a57a76f617"
-     "34cead2caf2425eb9ff0a63293e8cd6defc9648257b401463f4533a2425e0024f1ea9336"
-     "5eeee3c6da20d25928602ec8b426f9b39f97f3fe",
-     "013c72c73358ffa168423149ecdd897f0a5f75a641de008649f00134944",
-     "0401c70e1b6c01477f95e718f193e13c093b101e9f16024082ac699ed6ebb601f8013a88"
-     "264266cb5cc5bd38e477fe0a1aa49ae4a5ff94cb58439a7c1b",
-     "07ad8a117f34bf2fcf7d689b8124e08118e28ebd172f8c220d57d3f0b88",
-     "012bc7d380192f2efe55625e39927ef799993af9451c662b562a239dfe7",
-     "035961b27e88d6731220f70e96d555f63853d14149df7bf6d24fc29441d"},
-    {NID_sect233k1, NID_sha256,
-     "9c896f800281812ed57d31623d563377a5c725cec84313472b90e73f77d400f5d4fb2362"
-     "55741b73d46f7e5254d04099bec274db8a9af5fc7cc220d42cc172cbd3c3595c49ff74bf"
-     "aab7b5e46c90855b611f74753ccdbbabf92e011d52e9ba753b83ed2a251a632e1bd5c6d3"
-     "46e38e743950c8ce0f394a837028575fa44bcc26",
-     "00ac60e2e70b7c4cda64071c7738f68773c94df9456a8ec3bbb468fa7f8",
-     "04000109614a2ca27b7a749e53777e0f3ee2f57013ee83ea539ada6d98d8a9005668f4b2"
-     "7213a8a024455b398de2cd7635cb620d7401f5deb4fa9ab2f4",
-     "00098489f0966e27555268a94378b7b8685ac610fb0964694aae9aa716d",
-     "06d151437a0aac232a472af038b0fac095d224ce0e5487510e30c31d605",
-     "0563dbfd021c1b77f980530d0120e93c9ee4f1f092a268bd8aba7d3110e"},
-    {NID_sect233k1, NID_sha256,
-     "139a14ead998d1a962fa47c47ef2953aa136bd912fe940709b8c560bc2a0c4bf8f3aab30"
-     "a8e21b7d5f487d30b0097e3da723f11b5cb4e8c5724f5a2fe0d68ee4bacbb85e5eacf180"
-     "94d2a8ec4506cf8497836a4a905059a998ea750adc54c27c69cbd0b0c1f9743a62f3d988"
-     "f3fa0a9865a73fc071f526623085a2ef12838888",
-     "060bf720052e8b9508a801340c213cf53bbecf4975faee63d4b44fc647a",
-     "040196e37671def44b35c9e8c719130389b40c7ebc0ed5ae354dc73e0c40c700d3fa0a45"
-     "a3cc5dfb61085290f6d18d710ad5d0d3ab31ce65b0e6915a72",
-     "0729c7e1de10e92634857a65a2ed75103df6bd4bf63b1ad6383c37a0435",
-     "06808491ffebf088476de7daf541bca3fd943d4c2089b848a130abdc0d3",
-     "02c0dcfff06a07e928c15a1fc2aceaa4b4dd6fe8eb67ccd4d01240f249f"},
-    {NID_sect233k1, NID_sha256,
-     "cf4a8e754b23d0fffc1c5c80b0cb11deeaba3064b315bc2cee96db5b9881baf90d30af4b"
-     "69066f757b3020706def77a5fc1632d96bafba22a9c8cd3b52d535d941b3c7cc02b7fe6b"
-     "51639d5e2084478ab3a29d2f5e0e16639fc2833a47b58e2c3fb5b2ea1830fe2ff68e571a"
-     "8f281617a23d9a28db1c64ddfb1083d055030e5a",
-     "07cf3c216592febd8630a478b5b3e3a605084020322adb13ac0a626bc7b",
-     "04008eee2ea13a08d4e4d71ecd2547f6d80b8f88879c9edfab5a675831fef2005117c0d8"
-     "a0442ad7b95cac1a984dfb9efbb7eb3c3866955da60e6cea8a",
-     "038de0be25c23cbde9ed9fb259cd9a06b69bf15dafed723970dfcb91307",
-     "051c9c5fe50eb81a11c8e7b2db145c6b5dbff2c51def56f4981774c357c",
-     "053887c6cc2f21bff461c9182c17f634ee2b301c3cc4af0bb1d3075f74e"},
-    {NID_sect233k1, NID_sha256,
-     "ae64030d4af9b36c8d3a6af0aff34e5ab201df04274691fb420b7d5c40c401ed7f3ade96"
-     "065d34f2490d17943e27156e7bed83cd7222d0d5a73d167855fbe7ff6c3ed87f20986ad8"
-     "bbbd80fed5f9705c6c783b423f641d40ff1f367f9648af5a79ea3cea0236997558bd9dcb"
-     "011ea4dc64d61ea1e1f85b4f696ed586bc7705be",
-     "061eda5999e5a9ed4485d2a0ac5510549b76ca37df858ea5d95aeed571b",
-     "0401642d56359cc0a5f261fdc405030d45b0d6f9c08a182d354bf2687dd9d5011bf0dcbf"
-     "62749a99e4b02b284aa7a6479b59b363d25319a5315423a589",
-     "03094fac5381a1b31e53f43a537d9e22ebe6bd2c149f2f69d792bd56f53",
-     "053c8c4f9a30e0500e01100bb97c00ce98f5cc6578686daa1bdbd679373",
-     "047086a88ea014f06d6345608bd0a6010e650b9f6f984b6efea9a4fb277"},
-    {NID_sect233k1, NID_sha256,
-     "94a9d9cd9efa3e4ccf2a37f904dd9cab5624ec9393cf8816ea591c5e70cccd2f105388ae"
-     "133708fb974998ae61d218c71785f9eb808d1c28d953cc7eed00dd9854b6b4568c5ed5ee"
-     "3df3b58a1e04c64f1c87fee4365ec9aa41b08a6bae234dc43a0bf2f61420acdb891a40f1"
-     "7f246972afee75a4c0b249dee0fc8f9b9c8a243d",
-     "07e7e73171e4d2f2989dc024757c186485435b82544a448f5cfca05f281",
-     "040181c8cf579d9259020461184979757b097d5a94245a2b9a1f8a6931ee0a014baf1b76"
-     "1a0af3dd9c0521c6489f9a778da824283c94087698daa7cf78",
-     "02b57fabe6b866fd25ad8802c6b02b680c137ea9b623457b35a24d5a5f3",
-     "07421dbfa83859354345b9c3f1ce6242605094d924a4d38c7bd952e3910",
-     "05ee48a3a5119bb3433b53a625101492216421ce67fc04dacf947ec600e"},
-    {NID_sect233k1, NID_sha256,
-     "4db998df7b90678b8aa4ec6233c9b4629800ad1f3e2cf8f7afcac62fc6982dcb290e4458"
-     "7015eca8dfe77dbb4a80f9bffe75b11e961e70deed14555db6dae47d49e73004f000eb86"
-     "77c18f7e8234bf0a5a104266167a05ef07152e7acc2f0368b37efe69c0c2feb51eedf733"
-     "8cf9ed398f066cf1f66bacd89ab9376d41da35a2",
-     "05f7270764a0444c7159d2db867930fdb0fb9fa6b8fc80ca02e11753095",
-     "04006806c7164a09e11629e16608b7312d9d988acefa626fe8e34e03203d11019c4200c9"
-     "522618dab8a16e217beb3011599ed6cc09291fe9d451f0cf02",
-     "04a8958c80481a18c6e0893da9ab2d48fa6ae30a0f1d0512196e658eba0",
-     "01d301da51eccd15e09ce0bc2d0bdcb215a43ed13792084e2969260d46f",
-     "031f96a2f322d27d0bef23ba7c457fdc45a6e612f7d13e9277d36c8def3"},
-    {NID_sect233k1, NID_sha256,
-     "dbf9b8a4ae316bd2df0c80db1cb5d7038364a2634925ff957d7c03511b57d486274b2ecf"
-     "191746827c325a14dc94daacd66ad86d369e3f598f176c4f0eadec7e9edd13e34043efbe"
-     "0a801b75b8186b4a6d89ceae4fb250ab570d65b6dd7c04382738fe3f6f6c867a7d84b35b"
-     "20720cb0036a5d81a87126f236833831d9ff00b1",
-     "0179b924afa4acf30ecbe2b3c12de533a1f9675687876a7e5e5ddc8e03b",
-     "040175bf95ac8e768727d3b4a74c2b8a04b221247a3b8386ddf35fc39976ad0122f32f94"
-     "1066150c151b9db92b86f86a10cab0828a77e4f0d5c4026540",
-     "0210c75a63699b424585f65497c6e46988c28eff3e0977e3ade599581dc",
-     "06087e46c0677e3ca64a0cf030236583935d0dc03c896685dc6e446d9e2",
-     "0252e42b8f03b085f38c6849bd420837d985c9fe14750a654b584c4cc5d"},
-    {NID_sect233k1, NID_sha384,
-     "986d9e5d636526f4deb7545c037fe81b09c74496ddb8e42e61650c74b6fe348593f0cf8f"
-     "8eca5e839baf62f17bf6ad96ec0c71dc44fdf11259dbfe7499157e402f6bd50769723541"
-     "50723afb632799a990c44cd0a4fa9609ec4db133e3b4700be3ea4a338e8ba1873d345e80"
-     "163ed60d0de274d7617a8382980bc2138b0a2a01",
-     "02c9eb4d392d7f2eef606e1861183acb1fc753d666225f0f154d9eda147",
-     "0400d58fd7b5aa570b1c4b2190ec413fbcc9ef44d33ef191b6e23abcb386900173e85377"
-     "bdd8dac58222cd1d0f7ed98d73d6fb6c2eaf34819b08ececa9",
-     "064f9fb13784c99185f334700ccfcc4ff60b7f4d613c3de6dc5d1b8dd5a",
-     "03bff54e3610ade656bbe002867168db1b521c49225eb9662950b01955c",
-     "01da3fd8c08d8e17692059c669da3c7c4c146df6d3cbeaf34598d28eaae"},
-    {NID_sect233k1, NID_sha384,
-     "68d0be2883598bfb1433886aff118349157708690380c42b8919859d96db069c7fde6e11"
-     "7a3669f2cff94a0f1b66b27b09e3f1b24d26299e11552a084be428446f3174da2e041465"
-     "5bdceb38e58fcb065b6661190862db39c6545dead34a03584632e988d0459659dc7c7c78"
-     "d4d00fc2aa10465cf24b2410f14e2a62173c9962",
-     "024661c89b77b2c743cc175a6130904461138ddc4ef771ffb9fc2c8679a",
-     "040090383de7ca48f1e71a43845565a9f0c53d2c9f8c2e0f6c4ec7eb6437fc0167658227"
-     "2e7ebc9fd56e1010a570d744ae4fa70eed3e6eeaeb0e0eda7c",
-     "05cc5b36c7300a1cc3f624e9e663861b4e296f7e7a27e8f8f0a2d54eecd",
-     "039c6f5b484411c434ee161ebeda7aa21b7bb26bde0301d9ff92921337e",
-     "02aaae737aedecfd5d53af56ef154ac6430a45ff03a3495a34a5fe0e97e"},
-    {NID_sect233k1, NID_sha384,
-     "f0ba0407485fecd7337f4b22236533a926cc744a5f06dd08276750196f1bf7ea7984278f"
-     "789f92dd07e36895a8bfe297ea43d4a1177c0368900e3b969d3083cbe626f0e27e7ab38e"
-     "185c923dff46d9ba187b2acb9cf4b23ec8eedbb8044b96b5263d956e50cd6240c66d5d96"
-     "517130c743752404ed09473f05d0004dc5971ff5",
-     "0065e20e5ce534576d7c17616cd4ede3bf4f500894850723bcc9f895f4b",
-     "04001413f6dd5349e94311f1d25e400b69c0f0ea446294eba4bbeb10278b850066a05055"
-     "d856621161d4f0e33dac82e5c0cd91ed8aa56e9abba9ec80cb",
-     "07377147b59dba008ed0e6b366e511f94c7f7c9088615c6d46f46736b97",
-     "05515a6bdfde3b4b78489194d39f4bb439f58a6b3c3f9e16c8a71590b14",
-     "00778f79083d11efc8ff959f607c4cee7cc8f38b855028ea248fe291adc"},
-    {NID_sect233k1, NID_sha384,
-     "3827276694e413c886129c452c9a66e7d09dee84f5f09bf34e4baa308b4627e096c7d45c"
-     "f6ef45ba1d9a4019a60399feec10fa80e333e2aff1251c85ca48574d9b9e1affb9666828"
-     "dff5afcef3edaf5e8cae823505a0c73afe76c1bf130399fb06b092ba34ab0ae15ac6c682"
-     "f9ee8479b065ce75b57213b8aae0f55e4e386de5",
-     "014c85f66fbbd653f1e4e590cffe62c343ba6062df4b271fbd02e5d42f7",
-     "04018930b4a59a1c0e92febe650347c49e29a4e83cb8c507e30ad835dbc94b00a237bcd1"
-     "30235e34b4439293f15e7a3913d659089e38e5619fa52e3c0c",
-     "03c1f8d076fb4fbea91a97800607b2db3fb5a45149c0d30dce79f07e963",
-     "04b9d2c66d8cc55b64f3f62dc629ce8e50ae0bad8a4d14e8b6567fc87e4",
-     "00b9dfdbeecb061a455dd052258f3828d4b7174af972c65bd0043a9776f"},
-    {NID_sect233k1, NID_sha384,
-     "d1afb8965b48d66b9acb1ece674d9548f83395275f2d8135554cfcc7ceb96450d850dd87"
-     "4529433883709483d0743798db5e0dee955a4f30ba328c7934b8dd9207f3c336cf89141a"
-     "175ebe23d2faed629eb4236a8aea8300604c3eb7704512f240fda66acedf1494a85058dc"
-     "6a31bf9531958c332b93cfe5545046876c6b99e0",
-     "030ac7a78593b570b29f6d3d267abb6ba7e5870ee1c8ee4f1ab2f141051",
-     "0400a409e90eb4314f95967607ea3de9817a0fdb439cf406135262624e7fac004b1dd719"
-     "434e8dfa5861887736f32ecd635878ed4b9e290c423da09059",
-     "027c4987ff872fe499039b4432dc889960ea8e3f07be42e36a5827b3964",
-     "06829b5e02b5849689d152ceacdddbfa8f68d782b3ae8da23ea48b1acbd",
-     "03dba0d2b4400495ee098325ae4450b32b83689349e82a69b799dac2cbc"},
-    {NID_sect233k1, NID_sha384,
-     "4f95b71669fdfe5dc46d4b951b085e099de349fc740535175337127910acf24e9a0e4b2f"
-     "23196ad23880da47b740d77d74fe9bcfdcc44dd7d8d1a181ac290de5cf4da22d5034cda3"
-     "d8020bcc776dde8cef1786c9ce4d2c2cfb035da61406af745efb7ef1a55f2eccc5000319"
-     "cf1d6380963025dcea641cfd15a3106751fec286",
-     "06d7516aa040f7d559cae248e485834e8d9bb608279ed4d4f7e1dbcd2b3",
-     "040127a92888fdac8d4ba9c0243c9aca516bcb431911254bc2cf51883623a100606c30fb"
-     "b9958fb1140643f32c5dd582c2319f71bff197d58ba3e598bb",
-     "01104b6ad82327b0445e75cff0efa1281d266a9dfe4019ba2ed22dd6976",
-     "01f247b2850463e362ff8879054d3459b2cbae84b9d4bc005a2ccf4736b",
-     "05b3dbdf04758d546e54c43ca5973bd8ceba646a4dd5d17ae5d2f8ec516"},
-    {NID_sect233k1, NID_sha384,
-     "2ad9e17780c824c4f2d1e1cbf19ab85638f2f71cb4fa3518f08085b8b358f54d4f08394a"
-     "5ac29cbb3cab828c5f07f41eec51e6cd61a5f2cf44dbfa46834370cebdeb328fd3bf681e"
-     "61011b5c2ebc8945ac7a2a8467606051008b15c89390e111999255bfe28634ce9bc2850a"
-     "2b55a4af1c4c2f94403c78aba1ebc87386ab7b32",
-     "0137050d7b455f43a8dc2516cfff5a91062c1a2727b27df41488f3dcf18",
-     "04015ccc90a5f3906469e3ecf7a70c429f5b50fd0ce74065d41f1bd6dccc1f00fe5611b8"
-     "b1b35a907bc188ad2b1fb7507d1043d148283911af3ad782e9",
-     "04881e879d7c76eb2ee61fe1844567316d7efaef047b96979e6dceb7858",
-     "03799e90bc64cfd7d0246a7fc89a4d8ed0399277cab2af40fa2ec8196d8",
-     "067e8728f4d8398e4e1c25775620865bcc2d4cfe635a1f4c6b7306f6d9f"},
-    {NID_sect233k1, NID_sha384,
-     "958773c37d3eba003aa5c489f72118b3022c52b93399e9d8001695664918b86893f4922c"
-     "7b6e55b1855ed0fd1d8de5dc61af403ad660fec60d7c44bd0102c069957ed804d0d416fa"
-     "cdc1a95355ef58554606579ef89b1842f1055cfa2ae118abbc485356824cc09dddb77d06"
-     "71cb3011b33bc86cac526e3f6bb3293c7bdca1ff",
-     "001fd447b33a2ee3595b9f885c290d241422afdd74c3dc4981955a7e9ad",
-     "0400e706408803188263cb149428c60de57ac757f0776e5b27a2d5a859f58c0153b5e13f"
-     "17f0178cd90427f7d608a5659b9e03effebc89da65d59698d5",
-     "0339300c00cf7e8c6195ffb71e509613018e6a417782e4f52704026a510",
-     "0227c80e36e3571e1c783358c9ffed237b251332e8ed05a8d3b454c53b5",
-     "0679a32cee8ae001a18d9a9d0ed7e99e5ae67ffcd54de7b48c62e76ac8c"},
-    {NID_sect233k1, NID_sha384,
-     "9cb2c496b1bc7f040228571e005e7e936e48e8f469e295edf914f5648701249a20bff6b9"
-     "8b5e862603dd9f12bb71c160aafe9df02e2e383e9b8a9a9d700f4425ce408feabbf754be"
-     "543f52204c849fed6c9d3e36e03dfbd9e35c18d7bb2295f1c484a66e73440a0a5aece5fe"
-     "80b9ade9321ef18cde3eb2db15e4b18e788b0441",
-     "06a061e10b4a6e7001d95411cb31bdea9c84670a59ed61b14fbbb05c8e7",
-     "04000ad2b726b805919cabc90d058c78896d2dd8a78484c1fec5bd5fb0e07b007e048ddb"
-     "487f667633d6d030338ded21a2ac5f65373ddcfe1e4a3424ae",
-     "013b4a86b70f0e4de6efdafd7ecc993f0d6f231b3d743ee5adf82db1515",
-     "0541c2d3b2c6f0655dd415e327f0ef07b03356f8047117c41e704169698",
-     "00300f45026200b8cc84fd564778281bd1d7e03727c242a249d9ad33338"},
-    {NID_sect233k1, NID_sha384,
-     "9a4bc0a029e97742ed3bca207d5912cb568e4403cda106b00247520ea02008b14c041b8c"
-     "9b976294252da835f4ff27456039d79d90315abcb0b9b6958a22352672e229665457ec79"
-     "571ca80447c8ff2a86e6af3dabe7427c8bdcae65e3c6746a56079ce2cf8d22235180f466"
-     "46a21cd9e86032cfad874cb9c67f882fb037a13f",
-     "027ec31ca31acb4d2fbacb49fc085f1261b0042cc755cc97f9b199e7a37",
-     "0401d521f7abc2fd3b0a10732ed641cc1b7fdd7b49cf61909b215220c5253e0019e9095c"
-     "67af1b89ae6c486c4f9889c3f2994743eafe55bd9eafe438d9",
-     "0151aa44fd97be14578d68f87dbb884c960ab59d950c392e607ecae6bac",
-     "07be427f46958538004186d52aa50a0f83d184a9d2f4da2974163854eec",
-     "029d4ea73ab5b336ed44556f6944e734e531a5c71dc6c929e7253323906"},
-    {NID_sect233k1, NID_sha384,
-     "8d89e22cf802dc68ff22d43c436c79311e705ff6fd845e77c880f399f403e6d5e9e2b355"
-     "11553c978171189e288cb2200fd95f84ec5ee9865c0eb9190aff6dacf783ef200e82027f"
-     "a992741876456472bdf27f2bd8ee55db15408c957a120eb64cd24d299818726a73fbb069"
-     "7eba726a326719765735b37a2dcff0c853c906bd",
-     "04c6f4d88e5a4f4f83196f2dda9dcf2a66eaf94d50c851f59bfcea1d876",
-     "0401e2677c1305f545472e373615d195d1f7a315f592e26fbbf44c4255805001638140f4"
-     "8bad525625a87d0e537db5500f034e71e60e8a8c48eea04108",
-     "02185d8ec6f35d5c3f965cd00597d93caf45bbe186d4128bf877ec304eb",
-     "075199f4d8af090e4666754a7dac0c1599c207735c0f54c9f11e305727c",
-     "008cadf59a224f812d64c2f492e7ad4a923f3463b878dffc75eca5f8fb2"},
-    {NID_sect233k1, NID_sha384,
-     "aa1bf5a79e5339fb9ef6c2817bd95725551d064bc5064d6586c5a879901adf808dc2ef7c"
-     "78ec3b434b84569988db58b5e8e9782b1cbc2cc7c9b68e66f32d4ac4ebe7e75b345f654c"
-     "7b8a5e650acc9f170f75b7aaa3957cce248cc69cf93faf8d72abc6fc1cfa9ae2d18a7b31"
-     "ce720147e88e84f6563b2197882fe302449ac5ce",
-     "01aa169ea84365c22981bb766bfdad27e373440850569957544b0f9332a",
-     "0401f97d91302c70798e2278348e36bbe01587e0031ac3c422141e3d4c150400a95108f6"
-     "b7ff41546c98f4ea4d1b587a3280e49c6cd0d33abdebf9a1e7",
-     "03c9efc0f72d88168c2b1f7fa1c6e275839303c2bddca136dd19ef446c9",
-     "0639d1a1066465b4b2f443cd9677cfe3bf5bb33e3e9b14cab2d37f4a859",
-     "04582792ba78f782f112711ceaf36f5f0774b92a6fcaee327d687658835"},
-    {NID_sect233k1, NID_sha384,
-     "475664d5e22cbe0da0d0289ca9a666a37270dc71c81cffac91f6229fa39315c1d55f7e0a"
-     "89b6a7a07df7d391dbdf8fb7af63d2da46ecc3b60110dbcd842da97f98d2b67f562b0364"
-     "ef8e1c589519024177c8ea079794f271f6d35554c0e9d0a39062383c95721b72f4e74eaa"
-     "fb6fbfbda02cb670a7c4c94f67b8ebc6442e84e3",
-     "04a665b92c0c33a3f8b9eb4b0ec061d40b603de36c87096455102ffe57b",
-     "0400f0ac5238553f0cd74e6f34f7f82563cb01138e5c9bac6d5e7b8b7ad4fe01903e9fd8"
-     "a5a2aa32913b18bddef20667061f919f8d61a5b3c814ba4aab",
-     "070ef25950a795b5e22fe4cf5402f49029c5d97cf9f57f0806c0bbb5855",
-     "01248dcf1993ac2eeacd062f853ebb4b2072357e728f0589258399ea95a",
-     "069800eb2e2b3a9162196dbaaf67cab4ae123ea817f223acb6e889f6d7b"},
-    {NID_sect233k1, NID_sha384,
-     "9e5397d94465390a82a3c07e3ebf21b515776d18b4463aa5810e6b2f96ca61e92d13e034"
-     "fa853c3fa45411f51f79df6f799a2c6906e6a5b7896a4576a4464f9e0be2b529a43e1f50"
-     "3fb640d79db6b68f3a3a7deac1b5832fbe86673784ff6db1f8438f7dd332cdd1e7ad9df8"
-     "b6731aad1b6a72bde52e6bc62d80b8da57822c48",
-     "00531540d94823e19ab2b95cbc6e7492e1effcbabce875de6ba96f53aa9",
-     "040031ba225249916a5380235220b9657162eef43d59ccab507639e19bcd6c0062e85d61"
-     "366a73b62255c741a065708701c8fa024a15401a4cd58640b0",
-     "05375df0a23646e8033ec9e3ad269e7167a663b97b4f52cf18fbb5f50f4",
-     "05bdf7d643ffde5ea191553a9c99eb42fba9a8b6e2013dcc520298d224d",
-     "06cdd9e0d58bd4c5cfe66589ed7c7d15331f3e164dff562b6971af1a41d"},
-    {NID_sect233k1, NID_sha384,
-     "3cc4c4192f317e52df6f8cefba6d4cd823c942aaee11b9a0ef5de5c2d181073b7085a558"
-     "05e9554def8dc13eb978e7396044d4f4a14be2c7605998c062095c929b9c23b2b1b2fa73"
-     "dd19a0c0af44ca4789f9841fa62dee8a5f91b3cc4b3264f5f67334c3f0772b30bd7431c3"
-     "fbbf1f34318ce1889b6e8a76ce6d42079a451e56",
-     "022a89addd8b85809e87e0aa2c038593ec277054842854de1197833a51c",
-     "04008e760b282d0ae4eeb2fcbbfdec851468fd8e04c4dec71fc2d5d3a98a1300849a56b9"
-     "b0b0a1ede6b9f9522685e7ace3baa57f72709aba705814d138",
-     "05515b025d6196ffdc8bf275479d72b29a752eb3e70ebf07d4c4e7bf74d",
-     "041902f9b7bc81d3a88066b03e4111ad8ff4d99dd868d5608d1f43eead4",
-     "059adb96af9f404d2f04d89fb39cf38ba5689f47bda749ae9aa1ecb097a"},
-    {NID_sect233k1, NID_sha512,
-     "72cdef5bdf710978e0aa334b86b8ff4a58630da314eabe98b4d611aab56f55c526983d54"
-     "d19bbbf9ddba30a84b18aa0bae9f9503e9b222f842f084db83aa39625403213ca321cc0d"
-     "9c8a136c826e6ea4ec108b913dd0a9ce9d5b8c7e3af53c3876e56a2037ebd6d99f037a09"
-     "7111c837647bedfe4c494e4288ed6427c15969e3",
-     "01df252a11ff97b4421b3a2361db94e908e8243cd50d9179f9e03e331f1",
-     "040129f011fd5fedf3526f0437ae800a110435db907af60e16912d58523202008026ed86"
-     "afa7ec80277f322dfc8cf693089968ed9ceb8c95c930415a23",
-     "04fce14bc83be6f862f06680a32e9a51d1a569fdf1d9b10a89eb9fef4bf",
-     "04d7b8d19dd9cabc3c2245a9d2c8431c3151eeb6f49676a865e78c26c2f",
-     "0373e69da1fe35ce41ff344447fa7ffe6fc71e28dc68244372745739fc2"},
-    {NID_sect233k1, NID_sha512,
-     "8e4eb88c0b2d525b2c58b8e00f32def90e6dd382301de49e0ac053dbc6b61afe926d8519"
-     "3e2c4948f7402a3d7c614cb2c58e060362b0516a1ba4a7425f1b3d09aa20d4c3c8993a38"
-     "7a3248aeec51e6efa8f558dbdcfcaa13ee08413227c8351e3107e9a3e3ac124224aaea91"
-     "bfe50c11c1c8ae582e718f50bc5d5c06076517d6",
-     "01d7125c299ebd0dbcc050f07de931c7ad0450af590d0a2d0228a66ac5d",
-     "04013ebde8790a113bdde87c11ccdcbc39e354b193d772921b86657f53f74a00aae910b0"
-     "e22f1a2505f55fef2eae47ab6d47db6e49190a5469b4b6dce5",
-     "0113d1737bee59f9f477f71f77a0ac1aea86aa67002c34a1b31c421cd7c",
-     "066f9871da9a22f07c9b2a44fb6c01ac74ba17649cecc33b729afcb488b",
-     "037fad90c288510d0cd8e99e5d930f4fe197df779dfd6088da48986c601"},
-    {NID_sect233k1, NID_sha512,
-     "370fdd80f330311dbb3959666001bba61cdacf20f72f78953d946fa6cba02d24b5003f54"
-     "52d535609e489b9434f192011f99f918defe877d51349870e7e75502f61145f7c261dbd2"
-     "a0840926d824ebe9be3c5a77a3a84340aea930378367ed3615a47e3f792c7773f83f91eb"
-     "ea718a05fc62e9ed1d78629b2c27ae44fe8f8d4e",
-     "021238e66119844b146d40e48341f522f6ac2f9c8a0b33aaf95a3099a41",
-     "0401dc3ac1ecb670f867337b752cdbf48bed9f32589366f7c6ba7424af1d6601e3a38ded"
-     "8148bf45484ab6b77e0beff759812493347e32d2d54a322a2a",
-     "03626adf8e70506e74ea27ce740f7eed1c8b37d50415be6a2681c67ad2b",
-     "07a9c9056b51f1fe3e7733c6f54ed96662aa7f5a08a961f91fd6d0276df",
-     "05e7600e9fda45bb966fbbb5a9404af961058a128824b6d84d9d47ebdbf"},
-    {NID_sect233k1, NID_sha512,
-     "f86c4433787c3ec3cb1663389ccf53d62f9425274ccef05fd14b1b8fef676208867764eb"
-     "98d16d006ee6ebdc27b8d9a8ddd303d941fdd82b630694cdc698bbe6bd52441190783428"
-     "6c94b24ee199fe6d646064277f244b7df3ea2d9d52a9dc6a33d7c8d6dbc919da0fa987a6"
-     "7621ef0829e48310e0ea2bb86fedcf4effc0b94b",
-     "015e1bdfdacd87c42ed439f3e243abf27fd42e54f3ebdfb47f60dbae5fe",
-     "0400fb7fa51c1a96baab65fc85c3b769ac84ca7b63a1fe9f507a2ee0c49395005d450aed"
-     "449f8f1aeaa9df0131f696c2bcd4528808d2f52b6a73f72811",
-     "070ca3f5dc30c70e576e2d2b30935b05b6e68598eeaafa1bfcb9e156e05",
-     "07e3cdc4207456773aa52b44156801b316a7ac850b3a9e717a9ae7fcdb0",
-     "07ad6de3ba8730ac887f045cae80fe2fb5237a8594e7125c4792d478594"},
-    {NID_sect233k1, NID_sha512,
-     "4117d593aa92e3eae1124ec7482737cd3573fe5f0f2a5051a7ce86946a2abb9e47a0c6ea"
-     "75b262689b0b486476d2ab09a20efc2fb921419b1811b51a2e15891ae9e45a17ab4b96c6"
-     "65c6c423fc00e2d66df5804a164f0f3c958df6f25d7da6829b1fe162a0a8cf130858c83f"
-     "3555d6ad627db70cb41303cc6380f7b3fed2563e",
-     "00e09410548c17bbbf28a68c3963a52d39743a4f1ac28e6dfe7a6ede281",
-     "0401f5f36a21a3b7fc5ea37528566da695922d7d9b7e6800af9c1a00f68242003df4e2ba"
-     "0c8648cb1fa19663f31786b850e6b80068b8c007f41de08608",
-     "03c0a2a4bea270eaf66adfb297c0e3213254cd87b11edcd90cfcd6f3104",
-     "07b684e337d6778f84bdb7a6835e91877b41d6af4b76311258fbb8339d8",
-     "064a0c22057a858b153ecdf4d275cf5523dacafdfcb46423b5613c85691"},
-    {NID_sect233k1, NID_sha512,
-     "882ecaff3ec8f4023df5397167f238869f78a5c499be19aea85c7486e73f66f0e08e71cf"
-     "85f3f1b6f6a70796bf46a18e6b555a0a87c2088640ca73051b3dd59ebfef922be0372208"
-     "fce602d8001681297b285701dbbe24ccb42541b5db4aac1a1c7f407e11c83db15b38cdbc"
-     "25e930fdc6558f64d9503e214571a435d890169b",
-     "049f5bea6e72d98579b78cb07d89f64503f8759dd7a73cd73713c120428",
-     "0400974dcd68cd85117f363812a0473e972c89551e31c74c8d99f1073eaafc00f306c905"
-     "1cf3b84803307beb3dc0d34a9758a4f535100e846462a49053",
-     "022a5564b468e706762e3ff934aa22d9aea0bf2b116b61182c9f7be19fe",
-     "02e050afb84e1b0591fb64d46dd7d4a939552d68bdb4213f16c5d7ec5ec",
-     "063225df0057d5368b2e103eb2181ff5760e6b2a9c13c83da042722c3e4"},
-    {NID_sect233k1, NID_sha512,
-     "99b3b8f876f8359bd6369ce84f9261581c52d744b90261a1427ab9e447e6d833b6b3e89a"
-     "f8dc770f1dd55692d01c8bbc4277a729fddfa7cbdb2ec99133201dde44ac691a77904ca8"
-     "16feb0a1aaacbb9fba85048bc63d73506eb908ecd697caf582747051a3a38ac8930c9a43"
-     "65f407ed94ca7f2d26913c53f4c010c7ed9d7ca4",
-     "005eaa818690d1ca4838f0bc667be5721d178c3869884260fb230277c3b",
-     "0401f7b3b50167cb2ff7482240bade95f2850a02805742e6e29eabf7f9ad3400f8038a8c"
-     "ffa0f798a01e333251996662bc3c0ee56d94c392269b63edb7",
-     "064d518f7b8c87325d8edfd42a52793d87ef8db283606dd676be8584562",
-     "07128123004a515e277dd5b571e31bbc877cc966e27ed5b2ab2c16e881b",
-     "051d70485148996ec30f92097e4a12b5edf804e03e312072336bd912268"},
-    {NID_sect233k1, NID_sha512,
-     "8c1a83023930a85c5b2f9930521b8b8963d5523a3323d87f862a17d3505ccee01246ee10"
-     "29b8b8c2b608772c4096d1e914cb398f027d91184a8e94e4feeae121eabb504a2a35c8bc"
-     "9294edd15ddd979946c14c792ad787dc2d4deffa284830fc90b3f8c0ced6a99fc6de7c41"
-     "b9ed261402a6b3d702ff86a9392731ecc37430c0",
-     "0603d89cd2f741d734587e77554fe6bbb1e5739d5ff73084d4de8ed69c4",
-     "040122f2b7802917e4164ac2f54033621c78cbc7040217e5ded6b9217f95bb01f867df74"
-     "3e73806957066c2ab45c04bf1af158e146a9d1eda9e974e0d4",
-     "076850b8ca9e454bdb320da624c0dc63e14ad279185e4f8c9e49905666c",
-     "04bc63bafd5bad022fe5db246680a0a0ccd0b50ff50482d3849c92eec7e",
-     "07b6d8a8446ddfc64392af0aa1763d45877023c0be9ec78db47efd3c366"},
-    {NID_sect233k1, NID_sha512,
-     "f3c9dedd7115339dd3ede7d8d06a44de66bf80b4888ab7bc386cd40a92789042440a13d2"
-     "cc90dbcacca5feeec1e0e3c51724146e2c4904ed6b05c7b4e9b49d7f458ada695c5d2fc3"
-     "6f1193329b87c1268aa38eda9151430aa0bc004e5d2a61b9390accfc699f2efabfec785e"
-     "b34f52b1beff1e4c5492e922acc348667d2a3986",
-     "07977b3aba53616dac27b4d74930da23966a88ad98f1769674789c0be3d",
-     "0400aa61b4bd2fa9c61914ae306d69d3ade7d6cf621399e5791dda8a054dcd012e8d9274"
-     "d5593f5074c49ca34a7e2d64f9d9ccdf42df6087134b811762",
-     "03b8ee56bebb59207e107bb0c16938cab707e425f38b70f0bc918fc1b8a",
-     "068502a3e5e51f5481aad31eb6614152f4957eef1becfe3a297b023a94c",
-     "07b6b43be63aa79c10876179703b69caf9b03c5401b999a3c5be4737999"},
-    {NID_sect233k1, NID_sha512,
-     "d878c4ee0bd6c84652d7f9e68df7b90cc78776d8d1b60f3e4d7465032bf401f1527ca7bf"
-     "d4a3dd916e13e93fadaa5e5f20c9f47d12f8fc922a9a3aaeeeef294c221ca1adf7df85b8"
-     "88faec8002f17ff202da1be837827619904121167bee2d2cd694a263d9a99062cada3399"
-     "dcbfcb283597a96ebec129c65e0850ec4cb4e2d7",
-     "050cd20e7eabd29008cc977d0a17e1195d79587b8f15ac2447e15daafc0",
-     "04001ff23ff4ea1f30663b17d8f1c67ea37b8c5df7009d0c0301db483803a400ec6bde92"
-     "921b83d4d84be8a67a23e1718e575101b93d9a800550a20e7d",
-     "041ba36d2e810e47c3de583772e9b5908c257b2aec232d855669d4dae2e",
-     "079e96ed1dfc4e31774159ef311805b5f8001203cf37a72921efaf5cbe5",
-     "00b8abcd623b17357f65ac365301a8823365ab948ae3f7fc6a4a0b8ab5d"},
-    {NID_sect233k1, NID_sha512,
-     "ac3c118cc9cbc8eb3b74d8ccc9ecbd81d1996fb25ca43c8a43bffeb244f722b93c9e9692"
-     "41d45d5b81fda0b399f1e3623687190e428dae077e54cad1eff75ec2f7fbb9434bf71683"
-     "3421bc2634885677579c237340f76787b2eb19b446d56c0f2206099b81493349f4db0eca"
-     "d0e2dbe85dbff7d7070abb3d3b12ef0cec828af4",
-     "02dbb24fcaf9f3cd5d50d209937f0e2d134fa20ee3c9c2f1fff3dfbf302",
-     "0400a07240c52e385ecf75525201f9810859123bfd8ce04a5e8f4dc4ec88b2009bd81119"
-     "6ca9ac45b28031b9f65f9a5c4ec497d995f7dec6eb06dd2874",
-     "05785beb1ff70c7bea89b1fa14be09332ef94b09eebcc9fb1150bfe0d55",
-     "05279bb1b1ad8174e88bec4c723d65eda768c1d08d1c64c332a240a284f",
-     "015a90383c2c40ddcf721067b3435915a843f9c4708cc133fd1ee53f442"},
-    {NID_sect233k1, NID_sha512,
-     "700313698cdfdcf0044ca07bf9e5f0702ece7cc66e35decb28d5f8cb7e7e5367a95cc172"
-     "8a90cc9a53a2b5fcd4702028b742538e9b386f5d8b4a2411579ed9553021a95bd00a73f0"
-     "3c4184a6145aaa367e3af76659d677fe7a2e98f9ddf4aa20eb8d1a1db72c3f5590598801"
-     "be7ebf44255fd7376d89d998b7068bd1296fdc38",
-     "0047142197d3d43fa46545b547968680ec81688589d1ec8d7c7e90eb969",
-     "040179450d83cd6dd1609830ec78011143eb64d2d1509ed1adfa085a58d786003ee40673"
-     "ac564c6b5732868d0f8a57727150a23c484228890d768dae54",
-     "064f8892245a198c9c819152edc168e69dc7b562ef1f54dcc1960cc7db1",
-     "0293f2f989fb6b6e7cf304faf3f63eef61ab89a626cf8152e15f38bf93b",
-     "04948643075cea6413b1c88a9bf11aa176611f56d027f2b165d00d46e87"},
-    {NID_sect233k1, NID_sha512,
-     "0374673e1a685bdee55504ce3cd333f70084dd4ae685464a16924eccea34531663fda602"
-     "29166478b30193459a3113253cd6494dc26154156252dc6e822552c7c04d790eb9f8fcef"
-     "2ea8dd79e72f881f7f20fff93cd73ad303c0918ec27c6486c4da61f82bcd55422d16650c"
-     "c68bfd4b0132c1e7075bbf17dad919095860d445",
-     "031352b49ecde5434aac05f898e6ce4337304845d748f114c14319fe97f",
-     "040187ae6bc9167d9c69ce5544ad650055cb9a4e69c1772322d5722e68e7e000042187e9"
-     "d11a921adafc694b5cc8da9226ddad1b65f764274954b17333",
-     "0761189e63fc0c3b5db92b281e5a4bc0d6fdb30bd14f8e69ca85a211bc7",
-     "0453560e6e725a2bfe0383884ba3b3dd0816d8522d9e0762f781f6b6340",
-     "01aaec4bd98c765e4830de6593280779d1222918d4acf08c8fc3d0aa351"},
-    {NID_sect233k1, NID_sha512,
-     "8b237085f135d6e94592f8d855ca397c8c1028236a3b412adefdac888245874f586d0695"
-     "0ee18118f751bfe26f4c31465ec34b578caa44cf1b7109ac4f6eab7f97ff9699b34271df"
-     "035d3bf58a2ed4bcbf7577cf8e5792b1945ebb9389b680baeb8518c8fdc5540e192aa4fd"
-     "e0eed0d7c82be2e362b286f582d65752c8db7038",
-     "0176f124c24e4420f6e726a6ca25f09dfa0c5a37e5bf879e7bdd36c3b65",
-     "040098c37cbd44aac5d5c749524b840fd849652349fb3e02cc8f8fd0a237900151a9a88d"
-     "a407ae41e52b3dad1ea6031c7a36bd834007c0cb1e2c2f2f0f",
-     "022e299985cf289f2fbe2b1b270fbf12ba818cd2b506f642e659cd541bf",
-     "0686ac0c09f90a077cb446c910e07fdf23e845487d0333efc65b9b84147",
-     "01688b18cb42082bea69f18511b0fd9fa35da83d738763cf13ef92a119b"},
-    {NID_sect233k1, NID_sha512,
-     "e3a086ec15574f7017b3cd5f5a47ab7a73980f11074333490dfe9f8ad8926f9ea7c82271"
-     "aaa74e77133b1025b0b22a6900fbb71251bb6549341a23d194e79d03462cdad52ee0d1b6"
-     "f5d0d14e1136026961fa3467ccf0864bf7ae3fcc3b68cb35df7324bd9bbe58fc8aa9f63c"
-     "19feedf19d935b71bf5981c74fb2a487f84e453c",
-     "0755c48c3dbaf71042c58cb137f3632e3cf9d90b7b9a58fd378feef3d19",
-     "0400bd9a720553afbfc5349e4a65a21fed0444c30304f7018ec1ff6fc8d1f90109a1d6b9"
-     "cc4fbd0e888d0a2b6883fd06a5da347c0d4f7882fd29eabcf0",
-     "04fedf8785c6648798748504b1c9b6a066ab6606bc9a69534f93e908f4f",
-     "001e71744a1b683858444da0d270f43b0d5644424f2b38ef48a639685b3",
-     "07ff8199ffe723abacf1947a828e8596dc49ce655319087e4aca6ca34ee"},
-    {NID_sect283k1, NID_sha224,
-     "ef90f85fbda05e693006e4c64e1dac56223becaf0890f73b5274e6e289a5a1de2c141b82"
-     "5c24d595b3fd18ca855b5c1aa60dac6b5356275b11be670692cdbe5f282f93ac7b2e410a"
-     "96cb9e9f80defcde98f3449f99e192bfd62040421a0ab8f99acb85369f25e5efbf81439e"
-     "fa8a5e1d9cf781355a0f47b037b09fe4086389a0",
-     "1e846c830a8ec04e8572d1a9d2df044ab47352fb346f67403a3bf87243871b164511c53",
-     "04012e43e20941f2641154bb66a56f2e0428a7ad22d607fb8af658df0b382bedc7d5ae22"
-     "cc022f226cd65052071066963b112aa302973fe2b5fdd7bb827d13da7634dd2fb9e3852d"
-     "db",
-     "03a76f87ede2b5d40a0f10e15e90e29198fc3a03943efea39ddf7afc37ed4e18832af8b",
-     "1be2c776c707098438fbd0561de578e4b9449f955a25626f2fbea257fc578ffa1bbbb70",
-     "1aeef69983da1a535b10a47e66d890c4413c7a8cd6a2511a1a670a4c573d4808f46e23a"},
-    {NID_sect283k1, NID_sha224,
-     "a3ebc17c867cc9c7c28797f6364f6574b80c7ec5b2d8e1542a6f5db8568c15032f92cfbc"
-     "eefa3fe4ee654f690b0455ee5d38dd84bb8665ffc1ff8c849bdbc4aa0ddfdbbca4eb3797"
-     "2fcbcee8cecc1aae21ec736ef61781716b60247b7551ec4e552d0b59a53cec5964c67cf7"
-     "988787cedf769eabcc9cd5243f58034d96f0e43d",
-     "101c5ed48231a56ca0ea85eb45de0e395e6df2efd4987a226ae36489dd8b2dfbf7c465c",
-     "0407011260f504d809baefb54af48c890f94fa5984c8bf228baa4b6ea14d46372390d1a8"
-     "ac02bbfabb680659aa2611435c4058ed773467a41cdda8250f3490e4f491f1bbae452c5c"
-     "36",
-     "12a3c7f0b3d64614ff97133873d75c7c1406e316e8cf60d22139dba462055baffe6c8f5",
-     "0a9933496d60716a39e1c3f3bf22a7da546eafebef80dc6f25d0c109ecbc430fdb3e80a",
-     "0be56197a0098b022a7914c10f40207da58403d6c7d04edaf7efc96de740cd71f67e0de"},
-    {NID_sect283k1, NID_sha224,
-     "60269efa4d0ffafbbc655f6f00578eadce7fc0a7eb7db923dca49b6f2bf3e13f7f829cc6"
-     "133e022c3c92143c075ab9ced0531a91e6e79848194ab98bb852f40c84e7aebe71fb8bc0"
-     "fd1f97ed5bb6bad6783d8dc048df42738e841d978456e055e1b8a781dfecfce2218701c7"
-     "af77e7894ccac5bfff360aab0b6136b978bc39c4",
-     "019679dc589440b11f82b3716e5b2a2bd42c3b1c83e88a28e304cf5148877faf760b4de",
-     "040743ae04e4b07d154ca0749a011c97a31ac68d8e1da3491f331136873598896e5320dd"
-     "cf0776c05891c27fd912267ac166bc9acbaecbf80ccdd887aded2d7b8c2a4a5d139833aa"
-     "d3",
-     "099ad7fba5284e406f6cf200a39e398aa0426448c09b95e691f653d6096a63adbd39965",
-     "0285a82340d9a6d96ed9ad0fd0916216fd20edf979df41a55835ef8fafa00d242ef6f11",
-     "0a8548b405c171d2a428507f7adda4944bade7cda6dc580b1d3f94e15d7e10f0a08e008"},
-    {NID_sect283k1, NID_sha224,
-     "59d704d5b1f3a0605f1497f22f71b8f45b26138bc86371f00a4517554e7f6e7fa5d35189"
-     "fc656ce68bd2cb8510fa3e3c3df815dfdd749b2b6ac997d443f3954c7a927e138b579801"
-     "ffd035cea90840733e7884ccfe43d8d3a4a26b430673274aae312abe4ac1e1d7c67b7358"
-     "0fedf2d8de46572493c9205ebf0e8b4d75ccc88c",
-     "1703c21fb1e09f8947e12fddf166fda6f685221fbd803d75a0ae377a54a1e494e6c5e7b",
-     "040767564e13ae544dab22c3763c5d330a5571e07ff8f2f5ba3fd729379709b1fb184f99"
-     "0c027f9e5efbd1ff6ac53a6174670eb463b12f70a603354e25c577ea292b13b8e5f022ac"
-     "9c",
-     "10d875acb4d0dc211a82e78c0249e74de16768003b53830bf5648cf911fef6a57f8f048",
-     "02af92243b9dadcf21561ce32ca0744810478f8d5be8e0f83d9632ecd8e86ff467268b6",
-     "1f6c50fb3bdea228a6b623be9e2ea2c371dcfeb0e604ef1029b6766c43b193d86c02f27"},
-    {NID_sect283k1, NID_sha224,
-     "12c8fdba3bc5f68e13f7ff8e7bee876fa68a970afc6924314dae0c2482763ced8d4752ce"
-     "c29ea288d350acd8a06c69289ae41ad345a1b88bcccaac903f2bff39015c289a8ad60860"
-     "6bfd65270a7bcdb5fb10c89bbc2d16dcb91fc9735d66103f6b1f3575622cf4d820929031"
-     "5b033ee1f79968939410f465a2d37add46af2d59",
-     "071de8eb14cbfb88e61b908990ce08b81e624ef4f2cd9cdf3dd7ca9097d5ffed9ae9a71",
-     "040136d50e1aa8203a0cd2c2d545b81d00b95c6b43b74b1fba3a6402abf756d38087affd"
-     "49046bec77240de7bde85ca4345f27c6df341c72a4eccd2cd495e86376c183ccb34f271c"
-     "d6",
-     "1d80734927505d8d4818b3bdf1aa2e5c557e5f717a5b3fb856ca9a2161bfd74a130ee38",
-     "07894bf10885a698899b118f57e7da22222e3d187a0aabfb99fac0ce0e134b6b44a5f90",
-     "07b4a87592004d6ef8345415064b4b4672db2943c7e6098a9e6d59ee3324847e753703e"},
-    {NID_sect283k1, NID_sha224,
-     "26013a3ddf687bb2f37d9700923906f118d5cba5d8ed5113a0e3e84cff00918125108f74"
-     "f4b243e351aa5d07fa7c6ece29f5700f23e50286447883d2a058c3258a12e4ed8770cabe"
-     "627ebea7ef6e8c77811ed7d9a19c53287093e39226236587ddbc63b7ad5e7ad9895c64d1"
-     "d03ee432d45a067afe27d4cca920ae88a7a68db1",
-     "1d156eb15762ed00c4021884adbfc2426e910b18a5bc474268196f4b74e593a8f38702b",
-     "0400a99b45860615d7caab2f4e9bc01196a61f52f95c6c7fef615a4746d48553692d5fcf"
-     "13056f81a0088dec1382f8a3a863901d3443c8792cd13ce13a8f63b02d107b66d9d23bc4"
-     "92",
-     "1999524ce9525d85b562fd13634fd9ac50fb76d83b9d72d6976d6fbc47af7e1f354eee7",
-     "067748d49389c9b87a85b518f84f41b18f52569ba531985b8fe5e1f0cf9cffa958da3f0",
-     "00c44a583c704f69160c6258332f3121b022759b163c74c7c96058fa8e3a9928afee948"},
-    {NID_sect283k1, NID_sha224,
-     "c4dbf70b9a2165e7279122460d05ceb8e43e03fbe2ae7c314007fe2b1d8567cac727a10f"
-     "ba5cbead0ddb167d387da8e8f3d6bc0ad851cc32885809d07a776fd4a95a979fe3833610"
-     "af89df0f454d9edfabe12495a118fe83add5eabb2acf54ba7ba7c4be20fc77478c0a0f07"
-     "26c4e60317422a612a234a7567648603b63f1c12",
-     "17d6eb1219cab8577168be86b61f372b27ca70fb1f1a767947895c185344e966db17aea",
-     "04065d8e43a290a6957230501509b95a208a6c37ddcacd1e882d97c73c38b2a256caef5e"
-     "8b002169cefa6ce170ce20a0b5463f5bd146224e0813acff304307da88830b0777b86cd3"
-     "d2",
-     "1519e37a66b4e665b2e3e59b8e836869a886c879aa1ed47901a6c8a8f365efbc67fb410",
-     "1734a8bc9a13f51d921a297bc6b2d38610c20b32b0adfd5efdd01a4db5084f3b0697904",
-     "0f9f00b25a33b166f09e2a819dfda80d87f6a2419a7b4162e435ee02c0fc10a669df6d4"},
-    {NID_sect283k1, NID_sha224,
-     "b1d53b6af1face9b59af11c726b0099111d1adb3666209ba46b1744a528ed0f72be5a1b8"
-     "2423153b896384faebef0362343e2a4599803c08b8513708938aa8a498145fca1c63ba41"
-     "aff06d1a18aa2a045fce7fcd7e5552a2b98d0df97b6876f06a9cf52a7a40fb737996adda"
-     "97c3cedf7fe421235ac6951060eba9c0377e72a2",
-     "10ede9be6615b3b2a294d67da78127ffbf3a15bdba6f4fd78be7a60415b5d1a097c0cff",
-     "0406418eac385ce94c1982c216ffeb0b26f9c061ccdfd785ded75efc6a329385898331fd"
-     "a307d41f9cf1248a37fb8baea7f3545bbca707a903966019ad56e4dc810b6863e243968b"
-     "48",
-     "134ac4de6ed71106d11fa736960eef2873223aa87b1c5bf5c823de6c78092cba4726ec8",
-     "12a37587ddf224faaf8dab61210310792d4ccef650c98155a227bf468b7f323575115cd",
-     "10982c965331cf8529ef6adfe17dc3fde63dc2a557cab451d7c9408a089229e22b73d43"},
-    {NID_sect283k1, NID_sha224,
-     "e78f538b1ac21602b00a09e3db243ef4803b447329c94a1476cd91a88ff790da71421b60"
-     "092c8a6e55327c7982e7655eb1fd6e40fa9b9fd2f10107dfc585994dfc5bc2143d18794a"
-     "39f7f69ae679b27dd11ed22040d5e93aa83f71783525a4db0c3fd7b43e57dafd0033d531"
-     "7680df19c2ecaadcb37ef896c61a758a5e455206",
-     "14f237cface123b64e8578ff33f86bfd2a8181b9c81f36b9ca31e2a446f0d91dbbe2249",
-     "0407aa347c03d8845f1566bbc3fa1d66ecb41ed1dab0a402405d8300591a1f3078f9fa53"
-     "2c063bd10274437c2690ed6df60ea632f3d4faefcc07a72ae8d85c2f999bafd373053265"
-     "dd",
-     "0570bf3b42aa44c11603d94e14b524b8cb1363306196924082ae71021707c3138503031",
-     "10f7f4af1c1e3f9e8e0c95f991c348bce6725f60aa12ee7b398be64728242088a469a58",
-     "17145a39fa4dd237e31a98daf3974138638b9462a31b87ada3eade6bf7f597195eb28b6"},
-    {NID_sect283k1, NID_sha224,
-     "8a6ca8ec436d2c706fcbec6486b5665b21c174edee7ebe108211c388b1219a8224179f74"
-     "38e0bb7d6e41ac4a67337b52d4cd9a069fe6c88960ae20be29c8060efd7c62cb7a9a3713"
-     "6a250e68f253e7f27755df53ce7c570135641ad49b43507e5483e17b919cedffdc0d4913"
-     "b1d5e0ca0629876c0a551841a0fc2090d2857cce",
-     "08dbecb26587cb2ed7df2404e680fcfa5bf8cf6a58e87a350a1600211b3c844ca86daa5",
-     "04066610ce348821a77e8a6eb74a675ad9312b2622ad2e1e6d8dcd0be8b27d8384844a72"
-     "340014c15776bbd144c0c24bf419237db9401fb7f97a7c4c0ef50a9afd27c3964088f796"
-     "43",
-     "0204586a9314bc14bef8ccce8b9ca3874572b375d01c6b4a41c743c16502a27e91a9fb4",
-     "0fabfeb17bb8c1a57af7af81d99cfb7b0ecbf4e5e4a6ed483aee4be8ee4c70c2ef23941",
-     "08071e162dfeb068e3cad256c3603e07ae48b35f1bafdb726cf4ce32844e1a2181f23f9"},
-    {NID_sect283k1, NID_sha224,
-     "95bee02b423d2c6e60252da4632f693a2d8f6597b4f9c6e356f670c3a9e4e80063e92fac"
-     "b6421d0325b99dc150464ed2ec1d0bac72a042b35d56d33d2fda686a75d582d475652221"
-     "8b4ddd25ed45503d90d3d185cba6cf0ac211b22aa4e1318a8316c369186f7130446dafad"
-     "64f7966f5414f43af37a87127534060a23c6165f",
-     "191badec2d28cbbe62c072c6b57eb5d4644d0c0b3283951bb66096cd15edd43a1bbde53",
-     "040020224b00428031056ed370147c51e68ffc02e7fe269ca15b22310a2974d383c6c83f"
-     "cc01686568fc4768158e75b4ef0427d8e262cd0638801ab158311749e0f432d5b69a667f"
-     "0d",
-     "03b1b6ca5e627f00176b599b68fe54e1b5a272c323a06b55e4871875c0e729c4c79326a",
-     "1ade251b9360a6ca1b48c2fce0768a01193a415bd23956fee1e5c4c5076b3571abae082",
-     "0adff25020af4e2b4908a33ce1d75c793934921267b6c4a0542924300fce40fc0031021"},
-    {NID_sect283k1, NID_sha224,
-     "ccd7f7c0e04d1ef9a3c5617d77480bc624beed6582bc28e9e3a369b12144fcd96b735ee4"
-     "1713f4173b64b28c6102d82dcfc7876e06e76fc497d1d238bf6d85bb5feca630bbd0c0f0"
-     "fa7c0c72e28e9259087698973ac66244bc6e69c04deb22eaeaee7b20da239ab6333576f0"
-     "1349c76f594498620933b8969450ac2bae66db8b",
-     "0ff5e3d66eb57fd35ba4472effd6e7a016ca461e39000a7125e99080f6ab6ef4380dd7a",
-     "04019d8c1d9aca39de0e627981d21e35a628c35fd4096aaa86f61625fcd078f0400f615c"
-     "d5052ba2854ccd64407f6779c5e259917b251c9e34ec0d95c05488f30802b82cf4b25b53"
-     "89",
-     "16c9cabed653c57676ee46c8912cbc507b246078834f1667d0708e4c666346299c1fc03",
-     "12ac0ec9501ac91a2b57220e9c00ec6e815399ede94a658c36f9e89bbf1674316d65dc4",
-     "0c9480160c4e9db4e82b4ad26cb79e083e9e2056e68a2ea554aca45802bbb188389bc4f"},
-    {NID_sect283k1, NID_sha224,
-     "65e9124a2606c8784c9489add2999f4cbe6186395df20838d653b263a207ec46995d2685"
-     "b55d1874e7ef05a6a3bb5b60a7be6751ad568cef1bcea2debfc494d1e2ece0dc8028c88f"
-     "1b2c6e4ee26b639c5e81f6448bd25b73ec4608a8e8cf4e0155c29b6f0a62781493b03bb7"
-     "384c9808529d5f87da6564ae196a365bd282f46f",
-     "1f3591eec4a8a3fe6ae6debe230d238a6b73cf3791cb735add1abee64239bb100f15166",
-     "040483e7e2b8f7ff95b86008c3042ab83a4b6a48f15ce1cedbaf3b586b56ab606e6f23a4"
-     "ef0287cbc8c609426f1665976e8120afb8de96b43978762ed44bea5aa1418b9af6922c60"
-     "66",
-     "08165da5f5427b38c447382c8dd0940c3bddf8f048185e6cad260031f7c0a2ffb83027e",
-     "09034633dbd735cec6208bb6f4455b295b7d730c9301bbd1c0e9f101399f2b3425a13fd",
-     "0204ec149b416ca3467e92194449cf2ca0f41ca1fde79145f3af856085b298149a3253b"},
-    {NID_sect283k1, NID_sha224,
-     "e793c60fc725fd537d5fd38e9b4fb52e268722ae6bde5a058de8d20db301f5e8d8e1ad85"
-     "532198835a04b76f27ca3c972be5617a55677cffa8219eb64fe53ced242efe1b88999097"
-     "9227dbaaa15ed39d3b6be8c5a3237ebe12bd96f333d947f80048463d3859e34f865d83fa"
-     "f03894c2243a06cc96788ed952e606c2d8948271",
-     "05af03cdb45961e7ff35fb0146904ddd6c2bfd3cce814073d3aa56eaa9f13b4f7423926",
-     "04070bf676b9b0db558eeb8bb94a1248bcb599d1e8975ee13cd37dcb78af19307d1b7e57"
-     "d506ed9bf30c627062b99ff9d05ca03441b6194c34364cbe7b73b46ec9716ad8a9970cbc"
-     "99",
-     "192c7b1fa8f221edecbeaa51447818474dd9fc89e962e8e87400938ef0dff432a6c4b86",
-     "1df1a4f9578e9cae8102aab5eac70eddbabe4ced99b5bab1b1dee59c41b81e392968c14",
-     "0f2b1319335ee497fe3ebf1891a71cded59704365774e1ed9950f79100e70950783bc7c"},
-    {NID_sect283k1, NID_sha224,
-     "a57682d21cebb48190199e9f57493696eae3a59acd22f64d5ef4729decf6c2615b326817"
-     "a6bc118bb7234bebfc7276dd998838c009a7348e46431574638dadc48538d6048d572e50"
-     "d9c5974d2049ebe1837dd857bcd1447b1514b62808a4e7a88162ae1bb08a0f6d3db6f258"
-     "74c6cd0cd4ca6333f1bd57bd192ef67e4616d182",
-     "1ec9710ada06e6270720692a06d488ae2ba863b905dd2fc323e7ce68dedacb35fc8c7d8",
-     "0405cda72b5b068f70b3c431def41b8ca1d4381e8c2fdf0821cfc17eceadf5e3eabf7987"
-     "b7079ae508354fe31899cda71e01cbc80e5192d24f1f13c954208d2ab8412802407ae376"
-     "3f",
-     "04f7b9372a8fed536396f0b87d4b20494786bdb8db77200c1aac1896486a05d3c940cb5",
-     "072ecde2a8f506f0fef273c8915a9edc29e440d48fc6cefb50e7117492fb4a13e123bed",
-     "0010dbd6229d770c468f5d8bd20edd6928bd8824b7fc2b10dc45fbd3242191e7557b984"},
-    {NID_sect283k1, NID_sha256,
-     "f646e7334e191c2bf0056d3bfd23f03ef7f0777b923f962519a8399d311b8f68414c689c"
-     "a34b96871fae99eb7ea534fcd83e788e56eeef817cbfe33677283c736b99bf6a626f9515"
-     "291e842bf99f694e4e8aa7c9911c591a87d5f112b3d96b064594e2b368e6d1bf1a1cd343"
-     "d54916a66da22c26355266aa2884120fffb8b94d",
-     "0668de088c6913640fbefbe6d2c44ab26e481802dbf957044a4957c3c5d0a0fde331501",
-     "0400d3a50cb9d347cfe45d2a313813fec8b928a9b1defca6ff4b89c4787717f275c6b733"
-     "7f0762e47b0669f625c39c74d50e2b46875ef366b7c3b005c16ede69a2fba161faf6b3d0"
-     "db",
-     "0b24bf54795fa02eb9527f21ead5497a6db2bcc7849a16d206239f830df313dfb7a2716",
-     "0852d8b6fe93b0b36af5d99530eed08669eb9a25972fbea59f32dafe88b722bada98ab5",
-     "0e5b08d410f2252f724dfcecaedb37b92a6c09cde646ff6237007f4199068f945ebebe2"},
-    {NID_sect283k1, NID_sha256,
-     "a2d7e69ea381d3edfde4664c56c4cb140d01cc4425df757975cedc995b89640dc016ab41"
-     "9b137ff25a6a6d64a309b23890439d2ba157262393cf93d15ca1b1ffd19373ef12367f88"
-     "98aaf56d5544c2f019a4854f69b3d8d320e03135bb7b675e588a5c3fe4b703938fa0f964"
-     "916501297cee2fd04af767155c7739419f9dbb7b",
-     "0e6af57cf47de1e6f07041eb5e1a413fb7ddd82f8c7f7ce957eb28a118004930bec4dbd",
-     "04021e31c4e4d412a261e40483b9106bbc1b0d7e7414e53d7b9fd84175229c8cefbbf6de"
-     "fc046ff2dc601dd407883af7dc71a6ef4286cd3b1b6ccee4fd861865bff8fb38ad51b63d"
-     "49",
-     "08f9e2113d0b223c04e678e8ebdd3aab4816681a9ef08b18a38afecc57d79c971421469",
-     "0d2c9113a18bd51008fd327a55c214c9584b6f1b816cf3b95e7346080da2cb07dcef8aa",
-     "19167051872759c36ba9eeb5d620cafd3289e8b7660fc847ff385b5143b3aca38780639"},
-    {NID_sect283k1, NID_sha256,
-     "7088f60e9375ec6a42f705f851fc76cc833c4dcbb3352adcce9f59197c1b7121e7aa661c"
-     "4f8ad9f4ef280af3a2981e90c01291f7d1cf7d3ae2d96b37fe6975e11b7c6c02b8ef044d"
-     "1470b1a26b9c72e8c4e7b1dd83c8acc9542e2fc7d211b87841dcceea2ab8128d0ff7bb62"
-     "2b60faa4a89ea7008f7d55f8f9de675bc4596fd8",
-     "19f9b63fde8c6aa6177f2a38981505d04f8ac62bcc21007b05615d028cfe851ab9cbbc6",
-     "0405a3e567b227869f948180547c2713703c90698dc04864140d22b24bdf81b3996829ac"
-     "a505b2ba535040afed0bf6f9d850713e54013729bc6dcbaa336ebbfb9c461f7ac61af480"
-     "01",
-     "051e20545a0a98dc3fec59e4ebdf101c6aa2768f344c1e19424c1eaae4aaf7ffeb5205f",
-     "05fb3329f63587e8febcdec49f92de88366a9f75d0b9a0f374dadc6e7a62b833753e990",
-     "12edfabf1ce434c850b58804f1f31f8afb20fbb36ee69b68668e231e4c04fa75e658478"},
-    {NID_sect283k1, NID_sha256,
-     "ffd6044ab991849939e8a29184b4d0ac3e07acb63c7e6b886df9e8254073fa800d5910b9"
-     "fe34fceb547565a2344eed4de394ce2251ed51ec882ee9207eb7340464c742d9d140fa09"
-     "64f6bcb1efcc2d13919af4f727953de41b20728ab975c1ae0ce784865f23ed1325c68daa"
-     "95ed5c932893610179be94f13b9a4149f09833b3",
-     "17704c1f436beb52f7ec97192e23e206ec09f9e8986e06bef71467c192bad6f0066b3c2",
-     "040329294a36ceae2b2c56bb6e21e52ec32af11aca9ab7785be9c2d79652e7960c0cf7a8"
-     "ae0658a89a48fb95cb7028252fa9792d91b989d7cef3fda8ba9c8e4ffaf19269f2a69f0a"
-     "24",
-     "0aa8d2e210ae40ba1f9f051ad85d37f7cdea43aad890ef802519cc5773e9a0984fe5d6b",
-     "1908e3a2740fa04ec0b23c964c4c3cca51c4603e7553461dd02f8319a7ca2ca09d0aef5",
-     "12d7860d7b438df4653fe40fb9e986cb035b1384464e061bc4ee3bb29aec74d16b0a694"},
-    {NID_sect283k1, NID_sha256,
-     "c9f81c9ff7d80011fd41f2de97a6c1e6a22cc2da7b2b9e4c50e1354c3e139b44529ac786"
-     "ce795fc501dcbf11a935d4728a7bba44b4e86b5e5990fed4d3e24fa5ab6f303e1842918f"
-     "156e00dccebed6897c852207ae5941c630014a41696882066c2b296d39cd8658cb5830ee"
-     "e78e29a00335a99a0ba90722ceca5a2e9a99a2c6",
-     "0c7d1ac8faa689698f5c6325a3b3f35e7730bdbddabd0693f2bfdc5c838bd62f84508d4",
-     "040095a930071ce56f28a79a66b751283c756c4f2566ebc2a10770ca60cced6914bc9a0d"
-     "77046f70021e7a949c7f55b059d4c8e81ee23b13809a35932d83b8398fc8684c5a90f3ec"
-     "71",
-     "038ae832c25dcd30c1ee3f5fbe84bd8779c876c0641907695aa598132b0e581ea528332",
-     "0eb27c86d3ca86ef53aef0465d257e6b681f891a6357cfbf51260dc6e35a82799de0e97",
-     "0e8207959e8be94e7407543df80d38d9e662106ed68e1456dd1826602c5b73f27ddc901"},
-    {NID_sect283k1, NID_sha256,
-     "a60de761eb32490184dc1d29e21fa33889295ca587b994746874c7289eb9c83e9c7bacbb"
-     "4066c761a06b65ecd78d701bd41f305cd7eb258c630f3febfbb0a367ad16737b146fd793"
-     "dab23562e8001cd113135b1c981d1ca23eb3be0fe3e24fe3fe1089caf9fd8f4f0d1f90dc"
-     "c7dbea4a9e2357793b65daf342b8e6d109c6dd10",
-     "1a173d158866db0ec665ee632b5fc397893f6a44ee17c348e7452800aadd8ce676e7fdc",
-     "0406a9369a93e0b5165ac6e692db035495c5cdd6df243d9756098385ad616374ac1e1efe"
-     "e2032f72a02c36954cd8221126e4eaec02668f454214e4508cf72b6d945e14d9b7c5d404"
-     "c8",
-     "0200713a78f58c755db4897f9b7e52057a087816a07fc388d66d34ea9e0bcf2f47e182a",
-     "11a26ee24610e705a42329f86aaa80d78934b4bbf19314f06eec46067d85c8377e04d91",
-     "077e35add124574e98e0056bbb106cd28ba8c3bc0c47063ceebbbf2684983a2a0061950"},
-    {NID_sect283k1, NID_sha256,
-     "2cd0320cc73120ef13e83c8144b270c9a1f2049a9250ef7ee83ccc7584025140a51e2227"
-     "a5ebb824deff55b3affcda63ecb1fd3f337c67c08054dc82fdace0c4bb9cef1bea9dd792"
-     "635f655363d05903cd6b5ed50ee669bcd8157509366cd85aa40d19593265da26e5641590"
-     "ccf04672a6df52badd4b99964a8643d9687b499d",
-     "05523cfacf4ed3b74ebc30f608292e45173001d80cc801f729c5f71fc213b243f041ad5",
-     "040410751ae7d8bb2295f584ba3d55eda41a80b8520b02bb4e5ca669a1003d6f2829e0a0"
-     "1e05fe16244f76f0c8b24bd3ca3b53c697097e3ab0e2b44962ea534a655d6c7d80b857c2"
-     "1e",
-     "0a634f4cef0ba37c9ab211c57fe6574c67933280c91c8b175fa4164755bcde867fe1772",
-     "0b9f6946a578ee38433e98478a4c31b67e838939cbf128f023090c4848471482fd1dec7",
-     "157159e15a2d16da2e913c5ef00833a8e5513ee4e7d6cdc849fd822c59886d0ca3695ec"},
-    {NID_sect283k1, NID_sha256,
-     "a743d8337bdefc4753f937e869a36439da1f8c75e1278c3f6a4a969d93787dac93293818"
-     "b1cbef5b8636e1a6cb3acaac1e15dbe0841c8001512b689292f3f4805997ae26ff52f7fe"
-     "1842512a020c448ed01af2a061f3638689446ed5f6bed9fc70726ce4104bc11142de6387"
-     "3fa7039830223e8f152996388417c48e0c1fa81b",
-     "09f6bd008c04b8823ccc3ee7d5aca535c211f35e9d9e7cfaec518b98647fbe6d28283de",
-     "04070019957dac0e9be0fce6abdfc00ca737096ba2d2bea9ba570acab6d73eae2132d7eb"
-     "060559545f82741ddd1cbb9dab0cd06454fda8abbd9d1eca752e57ec05498b14e4189f1b"
-     "9e",
-     "0fe407c226fb15bc63d37cc9840a1a1fb0ac4fc2939fbbcb6e1236831379d367669ffd9",
-     "0e96e301bf1193dfdd2815597e016e0a282d6e8f9d1d67a7f7e7d05288594f1ea92584e",
-     "07488687f13c3a2b9ae90536db7868f2bde1529ccdc0c84eb85c53ea979228d1fda7c94"},
-    {NID_sect283k1, NID_sha256,
-     "6a7a3ad614a3a09d2dc5a80204815d0c6471057acc0fa73f3cbbf1801902c3e1cba3c113"
-     "4a79a8ce61994a94a5afa85ae1a44b2cdcf5153f8625713c872da36aba0afcc5c2f26636"
-     "dc3f60e04c256a5b023e20e2e7a3f7305bd5b3033fcf05368589f19021f8c9096a886799"
-     "04b657bbe5b9bee67d6e53d176fce1de9e54c64b",
-     "150d2812505c82584201e93f6e0cb875d29dc7bd99d9c0f98e0ed20128886e67e1f1071",
-     "04012c7750172bea15487a05580891aed51bf81548f4b65c51c6c54b990bae8857a20115"
-     "b003db9e7a17dc8b24ff080d80842f0488f17f7d43a40ce6ffad52c65f5a875b4b33efe3"
-     "fd",
-     "0c5c52dfb50b210ae13c2f664d958b2491bfa91ced638f925941234bcc4d66de1eeeb73",
-     "03887a270eeb515a59a7387d8acbb4e72dcdf13f317a6a93ace5cc98d69a79c64a9e7ea",
-     "0e922b2d021cd71e213bdb36ce3ebf56a34617d4dcca30fc05f238a1c097e38d7cbcf91"},
-    {NID_sect283k1, NID_sha256,
-     "65bcd77a3ab345cc99b9c1300755288102a6ccf140bc7d1ad25df246ef01fd57a8614b35"
-     "2033b88cc6ffffe5b38b99ecf03baa365ab5529d6751a3c020d0198561969aade0909143"
-     "4d84ffe13b46df043d0a61e20a08e9c32b646771fea1b29e202d40aae1c7079873c3af49"
-     "4ecf6ef5eda855736c9338b4a5c29a086a8266fa",
-     "1b3fb9e1ff70f94bc9d7742ea535ca982215af3df381b5ebdf1db40c7c849a7978ceb98",
-     "040769a897a443c41ae7a8c1e45290ef39c40887ab8f4aa3f9ee8f3096921222ed7de457"
-     "39072621bfa30973da61fb6d363d66db25daf818ce79dd3268ac0520fc99ca7917fa3a23"
-     "60",
-     "03fa84ee38587f9c848b65b07c47551e27f15e7a87ed0ab705c99c8b7a4ee9e86a8e4ea",
-     "11b214ebe67eda2bd6e84c33be05c4373d2536e2cccf152e56b1569cc96d261e50910cd",
-     "0e100646cbffa016664bb57c1a67108645238573867c0b595c46e6053f844e5482a993a"},
-    {NID_sect283k1, NID_sha256,
-     "ed1acc360d02ee6c36bbc223d91bc1d2009a3e8f8dfc4c3796cd8555b0d2b46716f4c805"
-     "8bf34c2d4954e098274ab9c2cbacff46a0578a14e77fe104196cbc6d2753e3bb5422b8b7"
-     "9fd004ac0aa920eea94925c016ece16ed4dea916fd92563ec65692a61b28ee84bef00071"
-     "20bb1e31bb75b8ecf68406a71af9a18b4edf5320",
-     "147fa46fccf0805d14c1b84ea59bb8b8283d54ca0ceefb29b5585e7141340c55b7232f7",
-     "0404ace4c65ce07fe5ec22c560bc553bd791434a691c2d865c52b5e38d541ef191ef4190"
-     "67076250c829de137b6549d22a12f196629d9d34cdd83758e5daf45fae41872c9b15190c"
-     "e5",
-     "18c4f89cc022236a0da6105f19c6661a8325d36fa285e3ca71c1a4af3dccb016cac186a",
-     "0271b421fd572de8a71d1b18ad2325bc0fb58cabaabacc1f015ee6b14bec49762f1f8ce",
-     "12e679010ccb143b7de0c3f6c82cf99a961a4f154be6c87abb111cde2d721d864d7a1bf"},
-    {NID_sect283k1, NID_sha256,
-     "2debdb95a21d72b69c545988727366a42b819ca6398a82129c5e3772aea93fac0aae9a27"
-     "b11969ff0ffb9dc0301132ca2452cd863316cf24ae7696422d4dc68e37316161abc146e8"
-     "6f04b72d9a27a350d8545cca245b2be43c33bb822dd813d13e08a718f784845df8a4ef49"
-     "b02529871ec76bb3fc1ba31089359f2ede73e767",
-     "0fae097ea56b35a517be5480802f450eb832b244558d0cc922cd4a5b40b84d02ef11216",
-     "0404f6bda2dcb9560174ffa54f13fa5edf17bebd41399a1dce1fe13e82a2b487eddfe25a"
-     "19076dd375f2c5f24c342a8e2491271cebf5b97ac666aacecc8d693a85ebd2a93eaccd40"
-     "59",
-     "05e3a67091b9e10c7fd20fd70d51162e5d78555059802d0c3b133f49b89f37be6a119ad",
-     "0ddf93ef8797571af3cc9a66660c569445a2b5384f95a12d680c570694bce49bf2264cf",
-     "02f50d68bda006b88798d87c232f5ed1796c841074f063da03a471e0c00f08b10f410b3"},
-    {NID_sect283k1, NID_sha256,
-     "e4e0c6c8fc01244abf81e139c961b6a6e2d95de5dff1083e8a48b40e3e5b9ed909152c92"
-     "b1cf2263179629cdf76ae553b58bb2e9223ce4f9ffb5f170f5f0c5ec97294c34a7529a89"
-     "7e9397f71198cbcd68bb4055cb8cd6b690290761b3b73303f82788379df145358afe28f2"
-     "997d191d968929b7a4b9a0f6228797dfaa17c613",
-     "026cd72e6ae19b3f4c53493fba1e8082a8df1fb7da6dc111b47a41f713f49b33f618d0c",
-     "0401c411f5e298c9b61023fb26765cf4132cc78ed77c07c3e815fd43032cdf0ae8b8920f"
-     "96035647b4c0807b287014043560d70c9b14651cddff4bdf6d44ead5e87720294ff89544"
-     "06",
-     "10e9bc449e8480474afffd20b8acd6dd08344981c4a6cc789c5338ad7e486c526d6c4fa",
-     "0e81594f1064e018aa3504bac75946d77f9e745673043417a47c0c82488e224cc4104d7",
-     "111bf8635b1bc3f6cb7f9b685077b38d67160d143ede2bd8b6ae93327d7f55c5317f00f"},
-    {NID_sect283k1, NID_sha256,
-     "04710947b7c90855ba4e59107b919d4a1df22b503c5c4c33b286b6b08e451e6fbef8ba40"
-     "852f9f0ee62c9217abe6156bed46ad6f0e25f70f528f3a73d099338c578bebd6879d810e"
-     "6e173c2b0af1f7caacb3531ff0e6a7856e4c84db355d110febdb21c683223eb5990ef203"
-     "8d462ddb7962bc0feea5f850954943d53041f66a",
-     "198e13c7d95bbbb6e226688719639bda988867764ffa9b029018b5547850daecf58fe1f",
-     "04030b511d719217c485866273ffe2996a19e0a670b7a3fb077944a21f63ca2f22fe5a52"
-     "4a03a4d9a808e8d77c9dfcec6d033139fc33e67d7c8dfd7329c895bfb77f565391c37c8d"
-     "8f",
-     "1721f1ad4adf3c32614feb7f8df3374e24f76a32e27854a57dcafcbaaa3082b13e461ce",
-     "14b2622432adcfed7c2ecd2b52e43be7f611680ceb4bedbfa9dd9af54532911a07440de",
-     "0ece991128b10399188b18933c0d185e85d111ad401baee5ac376b84c523f130f70fee2"},
-    {NID_sect283k1, NID_sha256,
-     "c62d07bb1ef756b6b2fad355c66b5be086b6dc387b37cbc4a63c841dba3fce65b09d3de8"
-     "f239e3649382d172f065b78f8a53e0283cf345de06b4ee0b4b7d8611bfce92a7d993b193"
-     "8419afe817611bc6df3ef74191e7e39ca2339fcb5b5cfee3166d09cd52a1a7d3779722ae"
-     "c328d326a11bbafb6aa417920225ac453146b9b7",
-     "19098a39956747de24ded56435fa1e6c30cc2b8088fe9a75f5d07b2f5939c7a60db64ad",
-     "04068cf5a2023753717d89d12d6861c8411e6081c3158339573dc5598b1700148d00b39d"
-     "c5076a22dcd4ff4f062eeff83a58d2ce6a1808af8733ae254f5157efa8ea35a85cc74469"
-     "2b",
-     "142e4907ce239cdaba562d1fa7305bacff05a75e2927800c7b7ea322b47c9ea47846e12",
-     "104620d752b73379e1e5d35e5b24a793d7a309685c00f8bdb97bba9876999ed9c763d0b",
-     "059cab3abb0738d8af4ea6dcbfca6d0ef11b6e591ca109b040347d7d4736724953cd9fa"},
-    {NID_sect283k1, NID_sha384,
-     "e4d8d49c9bc566261d9134d5e237d9cbd6b67d2619a9bd06b7c9c139e091aa10682cbede"
-     "114e1d4777d9cd67a16b7d64278e99eed62bbf25ec5a5a8fabcb0a3468b0e73fd02ac653"
-     "3e04b1110d29da3e34f33eaa228b78341b357a5d892a61beb2168c3bd5e66bffe3f2080a"
-     "1e246f55a41ebf9d579e188d16991aa060460d6a",
-     "1636bd2be121e07ee83ac5e880cfdfca6a56f2b9d0badff003e872348368c7c2cd96b6c",
-     "040007acf46ab68744a9baaa33ebf6be20c1c093242b0056bb9885d93a4a9bb4640f17b2"
-     "ef015415c1b671e98f00c1fa364bd69cf998c0ae140485159b0a341994a4e27000e108f4"
-     "fb",
-     "0d0d4886c3500bff68455c41f5840d0313f33ac0155a693d27c66fbdb12791c2b5f8552",
-     "0256b8ff7d37fff7dcc8cc4461984a9bd9661643fd3a68d07fd30d426d10b8c7f4dfa34",
-     "1f516f8ed4372780380a798d2da04d691aec379483bc0d10560ca79edaab453d3e77585"},
-    {NID_sect283k1, NID_sha384,
-     "2d1358fdffc14630fbc421b443d3c22ba10ef34f15c6c5bb3c73a9b8714e4c411de69b9c"
-     "d6628fe2eba5efc4862af66ff916505023e0514f564164b389ea422d0f1beb92adcd65ba"
-     "f43556614eba25e43852ba65af78f62d64b36696519ef8284ef7316ea52c365b99f63a39"
-     "e6701f81ad520d7445cfc0113c38ecdad4bf5b7a",
-     "15e5f555119c19b055b15b0c0d2813068bfc184f864e250b202384f5728bbbda1cb0f5a",
-     "04013cae2f0c3ba04d039c42cae27de4cf5842a3e24be35d7a3cc7f05083f02951cbeaa6"
-     "3b05d69ad5b7d64d6b19772a1794562b1fa5c2fea03909bc509e7d47b0e8144acb3c26fd"
-     "dd",
-     "1b881d95b7de9aed9fb5ff0085ca4da2fbd413b9b947066c98aa0257142c9000bbb30e2",
-     "176f9e3c9e9f98b2f5f352ca74310badf9f598f4d42cd2b26e5ea0999ae31e3c678fad2",
-     "1f2dba4e17470cdf7e1815d30771f352807b38080d44465f86044f5969b017c9059daf3"},
-    {NID_sect283k1, NID_sha384,
-     "d6336faa5c3e838f4fa58626eb353d4cff9ba8f0aa0e6c3d0d850e8b22f5b0f047afc977"
-     "67f1afe2040b85d4e401ba688a4da7a0caca7fac450899092c4fea789231ba9b07782010"
-     "720f45d16d353798867dd7fef4a324520014ad5cb32684ec50cab742b750e05db040ff51"
-     "140e8d740f6774a059feeb493b10d8ac722f23fa",
-     "190c8f17bdd38669e345440d2c7631d67cee9c6548c4e7b9452377adb9303430efeda0e",
-     "0403235a8b7981b3ff376b6b0959a42cb56631fbb9f82f1694b9e273e6b7131e758fa0d3"
-     "700444e5747420d7f5ffd6119ef43b998d4ea4a58da13ff6fe7f241ccdfd4b6fd33aa93e"
-     "3d",
-     "0b2a690793107257d7bdc37c492eca48c4c9650ba0d657e6eb62042b16169fbe27f8984",
-     "168a83fcc67e0c155f1fa2329363729872e254f2e0c3ef85f3b3c84fa3406de4191b6e8",
-     "18c0f8e6b486e6d7d16b4103506d74bb2021232c0b1638858295a63ca35e0d6d26a6266"},
-    {NID_sect283k1, NID_sha384,
-     "07384a3f650bd270b14ca388a441af201b7767a2d47e9033f50cefd3af8257ecb38f5267"
-     "e141cbbb2ab7327d8fc78cf27198ca3543d39553e178390bf1b921618432ad895e4f8153"
-     "783a7ac22f4ca3cad4560e64f1ee4a7bcad05df98ea49a3847dc2143b27c243e48be59c8"
-     "69a547988e2205358e8db98b635ca21b745df4d2",
-     "0dbbc2a0409ca58a9e39e33b95fdd15080443c1dbdb5874bee991bd1b127047f08ec9f3",
-     "0405a687605e54e49e3c40fc5ee8fc014a62d72e8595280a66ce7d367aac2df4d16b98de"
-     "b3030abd03dfc224f459dccd1606287cc30016be317c6207532a0725c957ca5fde692a9c"
-     "43",
-     "16bc5aa29cea64ce3297172f36fe4ce820c943908c21c9967697db0cd93bb8a12e42348",
-     "1b1fdf26a6eb2d736b8c1ab165af2ac31a4c206c5410f61ac7805a68992dbd62b457708",
-     "14e9a22ce703d942a4fe2e84a4c1c1b44538a33fbfe904bfbb17af6490d372acae4668e"},
-    {NID_sect283k1, NID_sha384,
-     "824f26dcb4ce0ca020982814d5c727e629cbeeaa818c49668f8f6d743f0d0ad362b24cba"
-     "c48027898f386889ca5411d7d1f9afc69493b1d9ae4d7b695c9fa0a30bb59e6be2cbff79"
-     "231767e96cd8bba349fa2f97955d56f05430ab4ebd007064e3d5add94dfe255b6deff196"
-     "50883ce9966e1a2affaf84d9540f65c87ab1f936",
-     "05495e6c59ca1873f36b756579632fd47f9fb95b64f52589d70f2739aa6a3bf8cf8c198",
-     "0406df40d8259be64c8ac64a28359290bd52e843f330a68c2b605ba4f777d7bd7a798e93"
-     "440458667cd7021b291c3415d64f9b054db71d3fe20f232f2a2286aede89ddaf1ee8c68a"
-     "a0",
-     "138f05303ea63bad47c4c9a9d43c52c264725a668db5b631d9892daa1b71f62656cbf73",
-     "05e35c1f3b30b43cc9d60bf8779f3b31e053de0a390da50ea676dc9722a17ef00d68aec",
-     "1691ecfb826fef1ea0895242129cc3e9a14e1f84fac49d62ffc0a3455ad9c97becd5980"},
-    {NID_sect283k1, NID_sha384,
-     "07de1e4bb9be15a710a74806d4447b093bc08ed04392d1bd5abb414f5f4b4d9d43520d0e"
-     "46fc81c2a97e71086b28e53242449ed37fd7ed1c5772dbabc430fcf82ad20437b38eac15"
-     "820421e51912325c872894452c3f8a10ddb040b35308e583c155c3707b52df467c4945f4"
-     "e1071126ed46611a3253c297f5cbca9e27f58448",
-     "1724987c9b698519b6c225cf1261b77d0300045e5fd774dcbf13f285e6bd74512cb7edf",
-     "04046adc9bd5f0cc0d8bc64f4ba491eae3b7f6fb4229bf94b804807c6137787adc0fed4b"
-     "2f041375e2c89da41af84529811ce7aef26b983ea8add6e37c32f2b00bd47f23f25e5fe1"
-     "94",
-     "02ea4ed0e87687a50dc3acc7f4c089040ddd367d1a3f470a711501ccaad63c201b87ea6",
-     "1be198a1b6e91453018513902f0a8a085c76a2798a2a0538ede30dab65afb6b9b0496d7",
-     "16342f87a813780aec006ee218a615c4e1c78c0c759d48d4094639b5b4c32a9658c4d9a"},
-    {NID_sect283k1, NID_sha384,
-     "1edbbbe71057bf7d0bfda922be21a3a4dff57b017ebf6fa99651246cd173bdc9b11eefd0"
-     "48ea599c1f98e907932aa04f64ed0a007831f30daf186c88807400970904d6090b2cf181"
-     "e0f65f03b4234aceeb420867812562e47f452152bb1ddaaa48487170d06e47c5e9a7c0fa"
-     "a4fe494663d2fec22f7665ceffffc214b21c6b8f",
-     "1a5489091cfd51a0970508ee3e8449081ed175928ff8386592c83043a7911bbc2f8778b",
-     "0400aa1562c94bd16a3f8a1d6c465908ce3b83ba6711e7d8b0b9353d3c55d13dee213aba"
-     "700103a789854f63a139e31348f1b2608f1e71c88b5d42809f2460642ff46a470ad85735"
-     "43",
-     "18435a6d3bc02b3019e1b156ddd6f3e1bb9c5af70d1a2cd2089e677cbacc21624ec8947",
-     "031f561b668aeeb4df43a3a34716c4e67232f56959104b7237b26e3c95dd40e15eb076b",
-     "0f2ddb6e6d18a7393425c16b3e5a5aa232cc48198d63e46a601cd3ed221a8427178a0bb"},
-    {NID_sect283k1, NID_sha384,
-     "db5cf1de38a5187af11c1f0f19a36db52f8417de997229e83072fb51a3b7152a3b383e99"
-     "19c1b8427582e53d4e7e25433d46cdf01492021c237ea0a87d38c71634743115a6b2aba6"
-     "6d3faa8003158340a5078171e0bd55a6e5d8c7fb2631a31c1204e1479bbfe79ac70d5e58"
-     "23af502922a900576f0088a33e42ec3e26c0089e",
-     "1a45ecda0788fbd7cb7a716dcf4c6e83d4148bf63ed58078690ebd238c00329c462590a",
-     "0407a1e2fb4e8e79e3946086fa65042362418db0dce51541121c73972a435aecb99f6340"
-     "23006bb02df9899ac3f207732fa7cdbc36a60c17592af7ce06b8df4255110e26a02b2318"
-     "00",
-     "1c986f88ba3d5109c0afa2c213dda8df462282f024cc8efc758a5342a0de91c40452443",
-     "1efbd9e0d912e170c9c55bfbdfa6106fea4a4e013e7dc26628a1aea4f6b806a51866003",
-     "0b1347f4f85adef612f5c3a436cfa59eaced5c7cfdbb69444936d71812a2ab2461bbb5b"},
-    {NID_sect283k1, NID_sha384,
-     "4adaa850eec8272d25d76600aacf2cf66e754f6c5efa65c55a2a31b7bc69437d9a7e47c6"
-     "f51c5da93895a45221f5f92c2e20ee6a95eed3cc7249688261a35d82872284900eb54dd1"
-     "df6024ec48963ce43e8ed8b8cca8ed22beee8f0aadeae53726cca05443316537840ab824"
-     "cd1b595f36064e9a19333748d4f4972178e7f5ae",
-     "11461776c33f20b176dc8f2b0cb2446a9b69e55b6c7bc7457a7fb4639116b452b79661a",
-     "040043ba7157559659954ac58b44f19262bef9e3a00829c70af66d07cef08ad899d7f8ec"
-     "2301e8dd9c947b5a6decd1a26fc5d0eecc9605d22abda747fca038571bb37036d9034e80"
-     "61",
-     "18b231de7fc499b461afed9b80f4405bc005011865cdfeb25570b7c0ff79b6ae94b6ce9",
-     "0fb203f47a4e2e9365ce070ee7fd4540f3f7e9ecf69b4400eeded0f5a7bf6e5a5c6d004",
-     "0e635dc65233f27b8350db22b90a3b8611e6fd1b3e0f515e42fe8788b1376079816308e"},
-    {NID_sect283k1, NID_sha384,
-     "11d212a99c39fb5e4ca0096bbe6c81ae1490e1b8e07374b4e773bee4fdd24a3c13d65391"
-     "9db663d2c32aa4db140c4ae2d472d4f878946e527ad33b3dc93012d97458f96cb622ddb5"
-     "6f1ce7c2474ad0d5291dc35545de47b7053d137a8e79dabe06757ab53e26eaf751111bd2"
-     "7690e57ffdab5337eb6f81889e9d1b1ac729012f",
-     "025a65f627db2b4d6cf83c5b0c00265b9b63f7656c5e3382139e4992bcdf3cab502844a",
-     "0405a35e7e0b914a3e01ce3a885192d2ecd27418e09898631de122db0c48e8b58658720f"
-     "cc0009eab47197d5f56927848855b6ff96db7c36f810ee7c89b305ef780ba8c993d65537"
-     "ab",
-     "18516ceafb61cf2c7e7c511a8918bfe394c7fb2fbc40fb3052e156cd4020fc674684f84",
-     "1892ac13b86ad00e38ce2427c8c78c93b08605a75ca22b3658132dcf9d9df7c4b5540a0",
-     "0437b33615c16a85ccb8c4769ee7c5f94122d31e2b5fe66291b401fd90257ebefe33818"},
-    {NID_sect283k1, NID_sha384,
-     "9e4ec74c09528fdf3153a0f6955f20c70915ff524b2e19c991ec4c5b41ea9185e3e876a0"
-     "2ed6f27c9b3479dba951bee8680c4c99be1a626808114408856994be7444ccbd5ef9859f"
-     "a479b1050bb836034e20c531b4d618f5843fe1d4b613a731895b489a2363f3f5397d5ff9"
-     "64cf037e9b11e3ff5e1c3d403e5a46b8387c1241",
-     "173b28fc29f10245221a907778708b3ee62e0480aa9051d4c3eb4e8d552e6aad5509943",
-     "04024bb9bdef975af892ddc1bbd31314926a9c81f8f1864829edafdfe2744e793c100c04"
-     "83028ddde61b4361ced9c391c86c28ece9b902c48d14c61684962007dfd69d0468dfd65e"
-     "7f",
-     "199af64f79ebbc5b789d4676a07c224e4f6fd33285e5a555ac90cf65d0b669bc58ced4f",
-     "137d746d515b90890a413685bd9b26a1c05efee4c11a4b40bb621c9fa2580c46c20a687",
-     "1647f70ab7c68a0f522420893a466940ccf79067b323d940369f8b8694ccc3fc0daccad"},
-    {NID_sect283k1, NID_sha384,
-     "5fe8253d2134c434cb0866796013722e82184638b024a5a30938039929ccd8415c71f71f"
-     "239c5c5a81f7a9cb493dde209f189bcf766c17c6d9589cd0c7de7f07ff9f24d2320669b5"
-     "89d084f8a8ea71127b9760b7355b162616afb34bcdcd416f1a062035102e29b70069b2b4"
-     "dbf70179b8d60bc2ee5a455efd40194533bf560a",
-     "0624616adcd45e1fdc6cfeab2b17230d73d91fe0b39f4664f3c6891554f9b8e238257f7",
-     "04010917ef84bd5c0b36c97cb5586d3057a34f2827f239cab2af2e6081c5bdffd48dccb0"
-     "b2078ab47fe1bd3e28055c688c78e617ddcf6c5060123e9d65c562df2e94cac973ab3b18"
-     "07",
-     "0795e229185bc1b3d6d69b08189fdd7a822cd18ac55971e4b35e51838bf12eacbc50e2e",
-     "185483378a162b8edd6a12f44e3aa4ff829630fe3a1c9ccc66e34775f69bb6a94282489",
-     "01662cde6cd497be7966a0a77b0626ba3c4b82e20bb3f2e839178a31aaf440aa0e059cd"},
-    {NID_sect283k1, NID_sha384,
-     "db49891838fe23f0530abd4a4fbba5ea970afa5747f6a0a10d2cf4d841581ea2178705c1"
-     "203f00cafec91d0a72d25448072c9cf7d7ca5580b39f8589ec63128faa95cb0689574a6b"
-     "ebd515049a1eb9699922cde0366b5cd58aa8f3d3e847706896f7e1cac667fbfe94b2eca9"
-     "e7be79a810806ca4bf53f219bb30532ca2254c11",
-     "199757ffaa2c59e198d66824eaad37cc42d49b2e241b6a60382d05e425e800eaaf32470",
-     "0406ad18bdb3e51cc053f56b9f9c35e2d6eaecbc9749f41a9ffbf54634838d7745ca0648"
-     "9005dd77c42b31aebbbb46277176df08d81919ee0d9ddf14c3e4c0cccb207bf649c48fc8"
-     "b9",
-     "109d6332ceec5ea211f642a746a6ce055986b4a2feeed7e847904f7f411bf8361318d92",
-     "1a49fe690a34151056d290790a6bfa7b70958e69e9baeb30c55efc61dc5dc4934f2fc95",
-     "1710a4ba5b404d65f66a8fca2751a920224db0cc0266f7b0bc054069ea4cc51b1f017bb"},
-    {NID_sect283k1, NID_sha384,
-     "29d385d09c1142a7c181fe4b6e6132e414c15aa8605b44208c0399464613b966edcc2d46"
-     "cf203a3f85d943d8eae658695dac74366224a0d0348083bec0106f5eb8809ae8d07f792f"
-     "dd7c48fb1a25d5ef3bb9acd40b20c61c821024a9acb2ede321bd2d0dda849c22d76f421c"
-     "bd8d51565d3c4266f666455ca1c0c3777aa44107",
-     "06e51381dcf21050aef2e9b97e35303cf3bd91956854ecf9b6b9827871d2efbe8201c5e",
-     "04052fee805d7938b8b97459b9fcb4b80cbe29f20a9aaebc07ac019539a4a966c5ee4175"
-     "1d078aaae02974de6530f285b4bbe87fd5d0c9a2ecfde5fdc9a3303e4b988f673c778004"
-     "bc",
-     "0b426ebda6628125d73efd84e6bbab6c4c8fcf7fa29ffb3c8d6b0a861dbf81cd18d088f",
-     "1270045e963b59e4a4f1237c2240a5b26a7ba8e28ea01326fbec00e5d95d40e859d88b3",
-     "1d721477ee1df1388e1b7f92c048e5759c060ce1291098a2fa647974a62a258a189b4cd"},
-    {NID_sect283k1, NID_sha384,
-     "774c1cb8fb4f69ecfb5c7857d46415568d88f1f9f05a4bf64a1e1ff6d64aec16e1d09292"
-     "010d1f067c68dddbcde06ea49be2ad3838053f0b9c0c2383edc451ef0188565118e7b3c6"
-     "6a4fa372b96633dc8a753106283b02d0322df273d58cc9bd061ec219f1e1a9c8ca1400e5"
-     "e39c1b2c254273377dc98a1a2c44e5c2a5b89167",
-     "018adcc22cb9a2db64bad3d60f1608c353e091637b948914115ebd43679904f955c8732",
-     "0400630bdd8937e961d5396f9ea5310123a340ba316fbb7d79bf8573f27a0065c6fd6f88"
-     "900737a0ac1116e0e2979f973cd705588a71cec5e2a9f22e7e81fc61a4375624f55a6182"
-     "bc",
-     "10a0c04762d02f9d3014bbff287864743426cee14daa43b22149ce73d1ba609c0ba6be6",
-     "0ac29b041a6b95f9ab685470f50445d416df5f7ee06313185794f2b542fcc00606bed69",
-     "00a4241b97b6ccf0dcd533a15867f5889349ec353395d47e31c9eb6b8785736b3e285cf"},
-    {NID_sect283k1, NID_sha512,
-     "c406aa4295f85c854b4db2de5a7a2defae53a319866921a3673af5b48c85ef22f6eb4cef"
-     "892c790d8e64530fc20c729b2821b5f5e515560b1ac764106560c3a6a05657e34cd6dead"
-     "fe2884bd288cef4ca92e1f25adde7d68a30fb0a1b3678156ced62e466718e68e9d67099a"
-     "d82613b8d06bdda1a7b867c2455422818ae9eeac",
-     "1898276f159c10d92d8d4b6ae214d68c72792a4b5f1f79936ca3c063dc8d9a88be439e2",
-     "040394cf9bb273923c88be7a1c49412ab8599e0cc5509926102c122326bc0b34243f7d1c"
-     "f3072330906f47e8fe95f63d0f0aca1115e77fc702a923c32a16505bcd9021da05fd9cf6"
-     "3b",
-     "058772fbb30227a136de616ace4a0334be0996d60e9772ae9bf672b7c38fe3ee1b24f98",
-     "10e0cd3fccd1728e99e2294efd6dd4797b6492ad95a789aab7fbd177475a047f1e5d38f",
-     "0c5e0b2d1991718355be14bc57e2d6ff9fa63e0812b9adae69f64da610cc6cbe36fe4c5"},
-    {NID_sect283k1, NID_sha512,
-     "cb2809152f8258660933472c06ddcdb65f6d5221fa29d5b0efec9c2a7914dbbf9ce0a468"
-     "ce146fb333d26f510a87a6bb01bf8816756a1b5df81c5f65360957cae84ba038e37e8877"
-     "7580e91c34e2f5aef4fb55af7b81ad28aeba05e0b1c64a15381a6719fd2c16e38a441516"
-     "e1b394952d984baf9e051b1dc1bda2e12f8ba5b8",
-     "12ff37c808c3cc029a9cfbb67a5ed21f3bf362b49270d4ed0f1e38fad25ebd79f112a50",
-     "0400cc00fb36bf62e777a9f6048761e53633b92866158200c43900db95aa1342b5760290"
-     "90055d7e57221ad939f5639282cbfc203114ee69baab4fdf194f4d2a937d8a57b70b54a9"
-     "07",
-     "163d8eec726d01a1bbb19995777919f68689f7c2920f3549fef966593c4fb012a5c3a1e",
-     "0cbf5c3bf1ee58869e1d3c15a05c23217f1c252da97f79334bc79efe3f5c62164669ac9",
-     "1fd51644f471ea497b0560b65fdfa2fd0a6cef469021303f97753d22ce1993d1ae5b96f"},
-    {NID_sect283k1, NID_sha512,
-     "e060af96d4a7fe512bbf26be9a27bb6a8ff37547d4a7bbbfa710db24cffcfc760dac120f"
-     "89f642880db2df6307f9ea5441d5932d49762d182b29d8e7fb067a61ab0df622f75cecc9"
-     "17e27d0326085d34581e052c85f50a37713e27518aed7c4434f86970e00a0a4b8503989e"
-     "72614131b7164c1bdc82d2b6aeac0787f9838476",
-     "02b8c1fef9c6def32b5f4127273ce384b6add4aecec957c1662f52334f5ee97f49852d4",
-     "04036a4fe1d77bc431012d25ff49fb5468f975353be70e7507d71966a0ef433df51dc323"
-     "24058d705cc883a690641f0ab85af4959ef4258a7ba9cde36dab77c125a1de1d39536658"
-     "4b",
-     "0865f59502382b324e1dbd75db150f342336fb19145fb43a733971da555ac5828a3457f",
-     "1ccb2e56c02cbe8038bf78dea256704ee6e51054668ba8c2ba11aef4ac6f9320d46ee8d",
-     "030e662c0e7d47cb3b835c63599d0c9c2e77ca47dbecd7ac834c2babeb039eb630cd0ef"},
-    {NID_sect283k1, NID_sha512,
-     "d235c31f0a82957a087c7597673970aa39321d4c2640685a03df8388b5eae4825d1fee29"
-     "926f416d5e62a2e9ca1ea7cefffd31607e750fa9675983608e0f8dc895371b190574d065"
-     "c5c0c23ffdaf49e65362914363a3fffbc2c1bb487cbd4f69ec22dda5c7dc3bbab805c81f"
-     "aa85787cc176bc0e5703924f395d8c9e7e7701e2",
-     "0afb1c45e9a9f02942b8e04da4b815498454dde6643de186625a98b3c1c6993abc8bba4",
-     "04002fed49c59e9d5c09202a5dc29d8dd527a870a180feded66ea6fc94ee094122ae9765"
-     "6b03620820bdd5910037f5877649be38db3571a9c6ac632602d2013d0d5abe1f00133f6c"
-     "de",
-     "1fe749d9916f11100af525ee343b3b74a493f92339e432a482dc8e86ffb5affc4630037",
-     "120f6f13331cd4d1a5b9707483c74dc0722452062cd4534e94cf40840d22ae263244a51",
-     "0bc2e37a481478f879de612cf4a833f7e12b8df33f5b0d6ac5f5aa431678ff053e2bc1a"},
-    {NID_sect283k1, NID_sha512,
-     "1a2559777a5fd8f269048feda82c4d9fceca95803f84a813789d6ed070422240e443789c"
-     "5231d63d5268ddebc060dfb99c4eff2ff115d2984d8bbc5c05314562ea6864fd543e7e0a"
-     "3b8572c017d8ae3563027d79bbe164d40a5bab354720e45094b9b26391ceb55339592fc2"
-     "f10b97dc9c2649f7227648f5cd2fc46d78d31c0e",
-     "0ff537d73a4da0ae3a4894016b71dccef3bc886f3d24a5abb7dd96cf8fdcbdf0fdc5e51",
-     "04001bd0537dfb29f727f91fb469c31164e1bb0ee192a5b89b880f3fa40e3e5437f0d2f9"
-     "e106df9bab2f9198494094a63f2ea091f60108449f0741806400694a93702f61fb0351a8"
-     "1e",
-     "0bbc511c6e1772ca6cd1cd308126c18c5db498055a4b3f1cb0dba3285f6d38b083e647f",
-     "1ba756f3c89b732398b90bfa2f92b2a77159c530a8020b75cdb9697c6d75c18d36040b4",
-     "18207cf326bfe97d657ac4197ee5c20c75431ee552681a92a5815db0d984fe597700bbf"},
-    {NID_sect283k1, NID_sha512,
-     "658c0d3f764bbc952fa55a258bac16a5bb5184bfa76cee06baf9ee6b9ac3f116e08bb240"
-     "6b1dd4be487b057f3b29c2043ebc33019b2017c4deccb86f50ff15fc9248ea5fb6426112"
-     "0b1960525aec3cc18827c23291722c5add8a3761ff8516c61956c62b8cbb13f3d92bf3eb"
-     "45a70704c01bb3625d21c38ffa83a6db086ee968",
-     "16000d2e879906d1040b32eb6ba3caff700e5565871ac75f10c5c15b509964bbe5e14c7",
-     "0402ba89255d1c89e42518662611e2efe3b5e3b8043926ae9c43974ee2986185269246a4"
-     "3302b87762b9ada81bde958d1f9b81246f49098695391ba3b4b3b9ac5727f19fe42fd079"
-     "46",
-     "14e837476e628007b2df21b5035a39c24cd4869bb52dbbe13c9666ddd8a7e3eeae29f65",
-     "1b5091fc755c0f908ee13ef9bee40dd16a5710befd1e265a312e595842d52cc135fd722",
-     "0fa25f43c3c074d702e45d216e3704d942e9d67b3c0728645ac6c53b9be7300061e5fe5"},
-    {NID_sect283k1, NID_sha512,
-     "4f10001e3517c2c1f973b555f4827681e096d860c4db08f1f4aef8000c9c24bebe59f8bf"
-     "3d7d3cac959a1a5477bb0ea43f2e746b5d14ed48a58ef35484b0ac786d2fec669f945e84"
-     "6ad73e6b77a9e47012a951b398941566330d89125eb3c1fbb2f06adb951ff5f047d102fd"
-     "f28b5cadb4a3e1a10412eb3474d2ed5c3fce78f5",
-     "019528d505bf0584628d0214bc857150a929d3f59619bf8f3acab545fff0977c9bcdc97",
-     "0400cc8863e1443e61fedc61abaff87d80450345489728d78c333b36fa28d8754a29cf3b"
-     "a100205ae70c35396c07f9f96aa7c59cf8a28aa2a365b4a1b68e7414d8c4ae5220c8bae9"
-     "ae",
-     "13d555426101fa3c239b7830fe0b6cf08a1c01f9a991f806c84baae20daddf5dec8f868",
-     "0af8bd9856dfd783217cf81b09b464614aa824b0298f35308e6427c679607853eb66c7d",
-     "0e6c1933d6ce25d0a00effbaf1db2cb2542cbe7521330c34286cf3bdffc20c001cd7722"},
-    {NID_sect283k1, NID_sha512,
-     "c43ec3c3232cae59bdea7cfaf18a4672035dbd2b8b6b1b44ede376b36cc2d8baeb921e41"
-     "6aa177f5977da8bf1d713509e5251278b6622790056271715cd5feac58bee5baf50b216e"
-     "8eb886279c5a384cdb696470275b7487fe9ac4c506706f6b0f9809d1ccb102546a4297d2"
-     "017c2a8df9f02f30d3d1bd9aebf6a92a02e0d202",
-     "067795ce117bc0a389397fc22a01cfd9422cfbfb5aa44131938a8c45e48e1d5a718539c",
-     "04007924de08acfae6260009cc2f02daa2fc2a809e6ab4cd8858a9e9c2c15b17e29f1bc5"
-     "ee004f36cc2d36df63474a579b96f6e59b890782ad8fa865efd80abd798ca2938bacbf82"
-     "12",
-     "1bf3242e75f8331fe70113ec8e14ad0814850bb8cb262c7d0a44ca69de52d32dfcabd0c",
-     "145148d59c5be2b6d39dfa33e904c161456822ec0ad64b9dc52befbd6496c9303fc062f",
-     "0b75c3c404d694e086c0f5aafd534e7d8596601f675b2fac9384fca6084711e35149f9c"},
-    {NID_sect283k1, NID_sha512,
-     "9b7d675a3d2cdeb280ea28289b5fc2a3ef6b535ebee8ad242fb031e2e1f364e8ee806568"
-     "b2f8627c5a5b4f51f4f65c71acdc1152c08b9211b81907b551e0ff47f5a6aca45dcfa06f"
-     "09bf195d19d7b165b52111b601fbd97b192f62465f8ba20773b1599c8041e91448eac7a5"
-     "763ca0628f40768324c5304e1119ca6a1fdb0778",
-     "19269dbfe4184249952a651a507584746c5b62c64cb3b17e0158aaf4d086a4afb0330c1",
-     "0406c60a475f2a3635fa523e1b138edc36f51e94a34e75989c2cacdf8949115d96f11ae7"
-     "520494d5e23ba9071b3e52c58b1d0740cf90cee7b084b9ef7a4a7be8aa47ce7b3d97c8c5"
-     "1d",
-     "111f4dc771b6ce5cc2f42172d3d70fe77c73683bdd2ea331ff711b7e9d8c3e4f2d7d6cb",
-     "027f224c01847c52ebc180ae81009923ae3453be1e0d94b5c2934603577f36653ecfccb",
-     "1e7b771631e5e72b7ddfb9c73f684b93270269ba4216cf3926e43b2ceb49756e7e7e0e6"},
-    {NID_sect283k1, NID_sha512,
-     "f4a08daf8f66ce57a986f14b918099bcadcc4308bcde7c169ce8536a40d94a928cfc0968"
-     "180a2c2a242c59df73ff79a03687998c421cf9a0e661630378779a4744ae2a6cd24ff61d"
-     "7fcd6c11a4c8bcaf358075e96f864df0998ee98ee393b37bb38747b70bb7a208740959b4"
-     "5174a60153ee566e0f62528e9a5e4466186fa650",
-     "03835814de0d6441cd80a44e40350cc8bd62ffcc81e939a4410bb9c9259e30463c453b5",
-     "0405ce9f6c979bc1d6bc41f41095b7677cc184da8918265a7f0e5b9dbece2ca9e0667cfb"
-     "ad039a395aeaa04f5168de809164285974d306e474a610d89fd401c375c9b73f0d23dbbc"
-     "f0",
-     "0b714d734d063aa81a389be69c56dcc23bcced3517e330572f79c769645e7dd2fd55c20",
-     "0e4d4494f91e79f2b1d1c0e22ebf744ef448f57c951f1b5f4da3592fe60008ab00f5f7e",
-     "02edaa4d8731b598c24b993dc5bb4888ea3c2dfe2807daf88170982667e69b76a8ecfe0"},
-    {NID_sect283k1, NID_sha512,
-     "864647405c70939fdb4c026bcad53218ba1d438d82c9138f0f0ecac815dbfb242307cca5"
-     "2c84826cf6556c51082a23f14252dfaea43ba229f7493db2bf8ae9cdb0228dab9e25cf38"
-     "5b504b92cca94f813acceaa1f18de851b8936c4dfe9e4e17002f02dded6b4c231ea5e614"
-     "ab46fcdd637b8c6193e8d0c2df1b3d883b97e1e8",
-     "0aee83dbed3b703cb6e60d51e373eb20e298ac005fa6a572d02fa1e6da0345558ad2a46",
-     "0400dc25760af992a8ecc108373281bd0d246f95933ec943f6346c1b2b941a03b33951f6"
-     "2206e35f02d225ba11d2ed7ea392898f78ca0deb2a47871eba6cd2be7440a410d910097d"
-     "e2",
-     "1df142187f8b27f4888075a3784aebe0fb7d80b0b6d3497a7adbb88cb6bd26cb82109c4",
-     "05a530bf1135ea6d599928cb0383f5d391d19be333b1577ee4eb6f2a78b54e4aac0e09b",
-     "06f3033cf392f698d1a1141cabf138c411f4e20687920f2915e17e805e8657a887c7953"},
-    {NID_sect283k1, NID_sha512,
-     "c87c8f3ad5c28a027b28ae5021dbe8d425f74181d519451f1fead7a1f9dd102fa6785b14"
-     "7b610610cb59bfa91fa363bb79ea602a7d7e1439f874c5dce748e5c320560c2d9676f3a9"
-     "48754c72b6db249478b7e19c9829ab4de2e344535d3e0b7c20c272f82556a280ef491524"
-     "b255c4fafb9c8ecb87b0149ddd9d7bf6159e3337",
-     "17b65c66514019ff935e9d571a4e68e9ee4463b7b9a754b93f4f7741693f4399879fa8a",
-     "0405bfb704629596ed05096783e49864a11874f319b4020917f1ba700ddb0606e6e72c17"
-     "93069194592be64c33c2f63771af0e4100d060e9750031048002680541815b311ba8f7ff"
-     "a9",
-     "171b5c698175300b95dfd5ed8d3fd7cf4e19105ed7193b6013103555808743501ee8c46",
-     "13f001f287dd5c7ad9af8d0105b47caed66ede41dc1e121a602610ce20e41af91cbe586",
-     "1433d5263d5233c40c0ca526b3657fcce8cb88ee65105b5f5ec82b26e12bfff11c8812a"},
-    {NID_sect283k1, NID_sha512,
-     "ac7da7611e2ade20aad64b418a16e02e79ab4894d758550210eb10013a9b5533132be701"
-     "f8843c840807c4167c38d21dff168d3baa65d5bcf285b73dcbb75819f8d7a20a849de335"
-     "e19bae2aab2ca560b93d340731f291599a5b28afd7737460d291105cbba6d0290e836f6f"
-     "6c1113d1b2faf90ac5de7c64e25206d79380a4ed",
-     "17d2071f39ba35515a8ec977ddd36ca15983e15bcda626f15af61d87d58114f4c80a8be",
-     "0406f09c255fdaf78d7d341fde4586526fcdec34a28448c7fe65685a67b6c33564ce9249"
-     "a3024ae4483fcbe3f823a7ce53db96ef2f6c68670e107e68cee4f358dfa844112d6b2144"
-     "e1",
-     "1403078da10f55724fe7b56dfc55990507307386ba82ca8f6340d33769ab1f6ca894bdd",
-     "0a54a35767a1cc77b2332b04694404fe5a31ed8851ccc2abfa5542b0f5acd9be9b1f02e",
-     "0577e0a1937172a6d45177c2b328d72f75a08a8a774a31151b89fd451d531348695d870"},
-    {NID_sect283k1, NID_sha512,
-     "5757c472fa2f81430dd920f39b61066a28c870b80e6c96f822f8f19b398c3574d159cc22"
-     "120454dcd7e97be8211916e4bc8db365b2dbb99a6e597d06e6645046a0abdccbd06741e9"
-     "c0eedf33cb78d78a540c2a390719acc498331e694e6b0118cf4f787b51c7b7237458a614"
-     "9d6dbd0a08bae8097e919f970fde920485e9a0ac",
-     "11504659e12235855fe55220287a101e511d39a627f8a0d414446385d4a88f31507fe74",
-     "040192fb9bcd157c7ef385d48470c3173ccf1ef9650da7d680d8473d45ab2064a073232a"
-     "c3014ddf872b711157d121b0a61b88a7eeb7cd260f1f82ec5f62fa2681e28c7f2640e305"
-     "e7",
-     "17e10962721f041946bb5ffcce724c9f284b1c8970f974a069c36dd4391adb8cecb8bde",
-     "1546450d25e2536aa14b8751e3b3e7eeec8a6c1cd967ba0f03e6bfe64c0a59072280636",
-     "0159c8d6499fcfe8ac7b2e84990a714d7888d883c16c016c4b165f36d62c3493afa67f1"},
-    {NID_sect283k1, NID_sha512,
-     "e350383d04af0f4081bf09b95d1d53040e7acc64e56b13b653df31dd119617b800e0cdfe"
-     "b935dfa5d94f1d7814688d8ce41021810958759cec76560e1e5c0581456acd1a02016584"
-     "9b2203f1c11d318d816697f36a86b59f160faeac7dba71682d3c031d0d547725ef69cbaa"
-     "28345512e38b75ab011911d8924b2d17a857a96b",
-     "16e4cbabb03215767249ba2a608708b78d7387be9e77f5efd2462467fa05e8dcde2c036",
-     "040112b7ea5d21df8ce52772a1b76a52ef6f0da62cb7718a467a034618b7ce701a05cd24"
-     "670649e0ad181437b4eeec87e202d8fab1c240f9dd9b31311284c24d89160b1895be5413"
-     "19",
-     "120e4bce412311d3e7adb36dc11d4cc1da8a4b9d6cd5219e772b3dc2b2b8ce08833748f",
-     "1ff2d53a8e6c1c23807eee681156a146e8f2cc1a8c262850dc69dece31860bf094e7f73",
-     "1e8906c0bf2a5f922ca271def90d704a1425e5cacc64bc5761b000c7df0f8f9fab51f2c"},
-    {NID_sect409k1, NID_sha224,
-     "f153cc61981a46d8a47d17d29ec157fa93fcf644beb84558db7c99c57fb131dcbc5b6558"
-     "1ced5ff0b29bfdc66ff703ecdd4290f7c353c02a3e6d6867f33f3dccd1a0b6752b8a35fa"
-     "143f8921a5078af9c85b212564c5b795da9858c7955095938fcd10c21e35e1abe905e84c"
-     "8b4bc05f2a06091ce876d9519b96951d08c7ac9e",
-     "011c6528939672bed3e8c905b7ba594c3ce95f37fb28044f210cccd01dfdb42c10e8e1a0"
-     "b5d6fc757834ca7f08e98cbc52b0edd",
-     "04000b570ec1fd09d7b4d102f83cf37129d94c9cf2f982b702c5d1172bae2df558008518"
-     "493c08dac6f76a6646156f123c4f33e79800e3cfe1aafbf25a5a4536d6c0cfe13a540b4a"
-     "3c97d4e7bc6c0346addb4b0c32dce089a7a5385e8a3e67606b45e2062c642bbbad",
-     "027cecbe83853037cf46aa98e1e1e552a96af0bb24e57756d8239fea5d769b51b83f195b"
-     "7801b562259ee644ab4047764d130a0",
-     "06a1601e07dfdff9d3b4ffdbff124b717403490853099fb4a00ea98f84ddd64e908f99b4"
-     "0a2ba6ab88b2491a8d948fcc2f207db",
-     "0741d27c0dddca3641b56ba1e9bacb0da1fcee46b9e33ecc6990b98cf0db74668ef1009a"
-     "50e5d55f80e6642ea48689a529c8a08"},
-    {NID_sect409k1, NID_sha224,
-     "258c91524423b5c876432b1930c7b07b56eb5e3945f1e2296a4e5bfb9b9123f800ad195d"
-     "6104641b1f1970bca553c2032f83d17252e52403a9381c1fc18eaffdf026f7537aa27d84"
-     "c5e3d6e39e651a92a41139cec5181fe794457f556b390943093be719acd23fa1ddf7ff0a"
-     "af0479484a381a309b4f681af74bf97caef08c22",
-     "07e3b714496dd118d8f3f597961eec5c43d0265bf85723b0b9b0616977e0acc2cf686cb6"
-     "afa6cdc19114e27ab000e762dfe467b",
-     "04007dea0ceb73b9bfaff7147a36436cfa7955eab02ce7fe9b60dcff3e088c5c9281be59"
-     "07de3e06ebb2e21dce8bf3ff85feeed50001cfa9b30af20612666e5df798f91eb4647d8f"
-     "5e1747c1b18adc6b73a848d987434c56d13ad78b775c4096e9f20d4878bbd9572c",
-     "028a8353c05129dcaa7caf0343130bf2e2186b9cb5ed0a27a565e1c24eb882617cc299d4"
-     "86be76fe0f8f3c52678b6992288d7c8",
-     "034299ca2aaaad51f12c90e8205da305523713516ba6e7d245eed8ef94a1b2409b98ae93"
-     "476aed6c9b9aef50406860b4e490db6",
-     "01a1adc76c65d77ea686d769dcd007c0101b4cdd0934402fa47dac22f8ecac28fc05c2f6"
-     "763a6781655ed5e7d84c41157255a4c"},
-    {NID_sect409k1, NID_sha224,
-     "a16a0d6fd57240fe88c7c36b9f7f9040cfcaa9afc4beeb8300818c5f90cce73b819a12c3"
-     "1d42af33146399cdfa4ed4954d068dbb0f1f342269dd29f1fe357e7224304b67b0f924b7"
-     "94780fe7e6aa9dfa3380252fe7177b43e7b1789718949b9ec1b943c83ed4399491482f0f"
-     "59d2cb8050ab6f8b5854d76c50651428cd29c40a",
-     "0182d1e937b037bf7f84144f7d4c94c935269c9aae7d500aa459a7a0ec113b232dcf2829"
-     "08eee4c84b8106cd38cdc41db3f89e1",
-     "0400bd4f1ee6a967123d70d488dbf0fb43aa5e93dee5794b4492277fe559776f74075485"
-     "0477e275cee9f1c375403a4933dc9869200191a544b98ba954cc6e060ba26a52fecbd1f0"
-     "dc7c15381004cccb799a9f7960a3cedd02d36fcaeb0ceb844bb4683998d776dc5b",
-     "07904af733742716366f8ba07086f924697ac8a01bb4895bdb5715081ee89eaeafbff4ce"
-     "c44eb0ce14e774dba71bb9b091d2594",
-     "0723b2068957c4f2ac1df69378fc013797a3b071de30b514c3e610002dc8bfced32bd2f9"
-     "e8f692b653e736696cf818b0ecc1e10",
-     "058455b8f9abd5fcc28a4ef839ac0245c3feda1fdcbc3c171b6928c6abc931e8b0ec3438"
-     "2d63e414657e9319d2965fdc9eb74cc"},
-    {NID_sect409k1, NID_sha224,
-     "d02ff569828fd1add21f6bd1c50cbdcd09222e458ee79fd5dfdba3cbb84e9d926fcf196c"
-     "ccedece77d5aa17f8c8cbf3a9facf0f02c71d5c1c8aeda9d75f6fd7b6f2c5c70dff992ef"
-     "6e02c438fb3c66da5a503b3c39acbe2a069da457595b542190d818015d462670b0807c40"
-     "1e36b1bfe05baff3a8ccf8d1f5f8de7840e87993",
-     "07ed09428f460724c8a5225a31151e031d9949493fff5703369c401762345d002c4ce424"
-     "294baab22d9e71edc4f854510cf0e6a",
-     "04007fcd003a8cde5503f5582a42738738ac7efc6cdb3813a00c072fc114006be9881c0a"
-     "881ca35988dcfb8088f3d07a03943cf23000e7041e666c1bed3b80a691ecff60ad4afe3a"
-     "544ce58030bbbcc130045e2c611d65f322ec78aff6757cb5df8ad54ee8a09616ea",
-     "02828c8c4bb1722b0f03262de32ca8a605c4046badb20d8eb9f19aecc5c69f199aa48d09"
-     "b61f285254425cb4bb5e0763dd471bb",
-     "06c99d796c5d4fa21c5cb7cee0b7570edc9d7e9d7c3604f5ca3766b17e44bc71d8a74ac2"
-     "68b8713cc2ea0adc3dc1971c062b4a1",
-     "075962e0ccbda2280e502559f48c8d37704964f67f8cd3b443b89be740976f1bd929c175"
-     "560fc8cfb282661c0fa792a5b200401"},
-    {NID_sect409k1, NID_sha224,
-     "57befce973b225cfce7f996fa5a1a43acd160681b88a87b7de04544eb7b6a719718f1ca7"
-     "f559b6531bfc18fca3836d2be7f7a6e48387b7579a6845796d30e46f0dda9d82680f8c96"
-     "c5f0989741adef9762c3db763cae2699cb6c112543635e20ed5cfb4b55ca2ccb32d2d139"
-     "36085a8ff95ed658a54be73f80c912ccfe5f0ca0",
-     "0390f05b9619c27b800e99aeaf61ef7f6249367d5cfaeae3c7b523a8b29153eb8a77132f"
-     "6c4412545a842d6deb7b7aea7e2bda5",
-     "0401cbcfc492a2a6bb8a7341df67ef2bcdcd706afabad5e7ed1d63387ad9b0dbc47ed17b"
-     "82de6de936752632e43c393a93fc5cec0e0111768994b2dfe9677d9dbc45d4b55fbbafda"
-     "aa2b2638ba1605c35301fa557d628a87d0a7febcad9f8eb4b51fc9c807652579f6",
-     "00b8d236a9f8edba7b5207b4c7848807b933b214fa25cfc5a0e73f750d30051264bb9f67"
-     "02837b0f65a451d4ef24f047ec4e9dd",
-     "076bd4755427fda22a0f177624477c59de12a12621aac274b980b5e1ce5dc700591eec13"
-     "dc5bb48c5c8643de287a07a48a6a7fd",
-     "065a5b0a00548bcd7f59518f122d79c7552ca6097f3867604b462201add5f326807f0e87"
-     "79f2177f277e5ed25253885ca81220b"},
-    {NID_sect409k1, NID_sha224,
-     "4277ba40cb462860ca722cb4ee71c61836d2ceba18bc91f3fad7dea478972c6da0ebc028"
-     "15eaaada1d1a5e93d7ab353855ccfdfc94a5742fe18daee2328871e06c1ab0a9a989d123"
-     "9df2d2d27f96c415e7ef9a941f06c6790675361173cc229aac7045f49eaca207f59c4976"
-     "19ba32e932b5c1c6576812ee5b146e2cc7de5e62",
-     "007d18652732596add3db31f7a0ce6020d03f3df58131b0c7c633faf619b8210cd309d6c"
-     "0c4083aef1a1b6d2a756adad0bfe344",
-     "04015ad0682962b4dfc8901a0dc77d548ed616286733cd9b3ede937cdf4401ab8b3e3516"
-     "d466ba43b6ab5356c4e72845767d55d27c017e4de3288ed44b48e7c47b16e2afb513c976"
-     "3d5bf4cbf9a357c128c94a758e3ff946957df461531def2b8d8411b81f45f0c2dd",
-     "01a896c30fcfdbe583d6b0119f467f47758ee01d4d601eb698f444ed0f76515c2b8053b1"
-     "1ae7abd0eef7aa61145a53d12d560d7",
-     "053b1cd57dfdd8d1802f3e295e450a155c366bdc2bd222d18a4d08369c25e53f1f633958"
-     "b22d80755ecaf8362d548b28dff1ba8",
-     "069339fc6058762a99576a96e76f75275f848102bcbc281e59fda26c98fc48a3f1061755"
-     "e80740a233e03287f510f4549bb1874"},
-    {NID_sect409k1, NID_sha224,
-     "57ff6792ed4b12220d179bc0ea57ff217f322c85bd3676a681d32d7e4a3e0c8e891fd267"
-     "df17caba5992f68c35ff670b60b4bbdfff82404f6ed996c30539bc395120f97d4d7a652e"
-     "aee82bd8f9360bf8bb73748b8bbda9f9480eb54f7eaf2609d4259329e8a5ea020521e7db"
-     "d3ec56f23c849932cbdf2875f5d5c774a9d6b0c9",
-     "02a91244ea4623b63403dba807d60b914ca3b901a2523244c322f2f11251446d3f15e869"
-     "d086ebecfa1a39ce304e8b5c8de23e2",
-     "0400b7ad8f0a52ec21e54e28ef603d76652dbfecc7dd2427cfaaff3d280f0d1f62187d77"
-     "effcb433b5bd44c3d0c0d26c38d3f5930e0080641bb0163130be4444f79c500ceb8d6a9b"
-     "2cac42d21d31b2fb29da075bd41c6613f278944adfe92d3c99d494be9d4714e9b6",
-     "070125c89a1262a88f22e874c55ed149de6d961d6abaab2d13db9174e3cecb8f49752995"
-     "7058a0afe5361ddf9d3a5a3b923c7ef",
-     "01a28cfad13969c6449e5a0f879e01ef7dc1cdcd0bc77d20f3989c588a9cad12a4b52743"
-     "c12f4f6e2154ad963bf234ec96263f5",
-     "066d7f0b364a640c6c620e3d030448d155cffc9ffd46a6adfa1c13e1b01892463a472446"
-     "5aba3eb07009fa604f3af18109cb72b"},
-    {NID_sect409k1, NID_sha224,
-     "f85113eda64478f460b60f8084220134933de049200a5f37884da7901471542e26690a5f"
-     "abc3cbf9e679ade71b6e54d869bc136c3d34cc4a9efcafb777abf046b5ae5429136112a9"
-     "a36a475121eb1f33f1f43481286fc1ada98a41064a1fa38c89e99a93065bb2a119348a9e"
-     "452497fd5a0d2b83a66b09da9f47a0583732adf4",
-     "0068c56c6b5d50d1d4e13d3837d8c5e8ba2f825e121b63e97603fdfe78bb6899600ff0dc"
-     "87b6b3b6868ad0d2f62b7b7a31603ff",
-     "0400d9a4f5992308013573f97864c23b98d276975d80cd6455e9f0d8a62d6674f3aee3d2"
-     "7dec15903da4e9d5908cebeb765ee02c80001f61189caacb05dfb982bcccd603a769d0e1"
-     "be8f9223288b5426e7f88854356fe825f11a88918085692f33b0f4c61ab09a861f",
-     "02ea7f0d81fbe3d4c865ff5315d1cc38f9e9a8653fc91dbdf445b62fe09b30ccddf50878"
-     "3ad87c8a48a6ccd5c9e817fe2977f90",
-     "02d7847479c16c4cba834ce5962724f185be06cc04a9a8d710cc72e6063a7b64fbf2694f"
-     "5b62de65d3d347d34c0dbfd5a4d93b7",
-     "069e32bb19d20e873d0e62b306db4d5663576e4b2fe75e8ec79b7a63f38c8f1007a817ce"
-     "30612e8578d48c63b04b1d34904010f"},
-    {NID_sect409k1, NID_sha224,
-     "42811e9ee6dc509572e1cddbe5baf00afeb0c5c13e3755b922eee9e210001676082bc9ed"
-     "c3d78db2b5bebea7a2c0cd2b369226c2b8f83b28f33fb513407ab9d287d14b112d6c3be2"
-     "493805ace5cf6fd366d03cfb28f4ce3f0f060880db64d6962e997463ba7c05b6fcd1e66b"
-     "abe4b94afc5c2d38c7050c69571d27b66ef0090b",
-     "03c88084f8b78446db431bd6e240a0c050813d2a763675b0ea869cbe183df697146cf29c"
-     "03479af3d34587a95cd257027fbeed8",
-     "04015a09436de00d8d129e297ea60e04b704c0a8183d64a77d1c527189e25e21d6bb62be"
-     "8ef5eb2dbd833e5f9c7d5c3e69c9c018820001c32ba376d2e9de28fca644b0d567ce1f4e"
-     "f0aaddb2adec6213d03bc8cc99f9140005bed3cb6c3c0f5533275734aaec47404c",
-     "0132f4763959863a32919eb591799ffb8613797bd0b617c73654ec9eb32e2fb86631b66e"
-     "28e1b4cc4aeba65ba8c75aa1cfacd73",
-     "05fe0ccbd430d9459e0093cfe2c1d1d3edff8c1ae7111299d2e04f414c46ed2cc88ce9cc"
-     "9e23e187e87ef551de993f52214d609",
-     "0557acfe6347baafe031dc16032c45559693e2793d9b6d372670b09757c6f4a3e5ae5e55"
-     "264137d1859c8d9f8f03c25de409bf9"},
-    {NID_sect409k1, NID_sha224,
-     "b38f76ede7441ae0887e689d556f43155b38dab7cde487ce9ef9a46f2957c830d4d28006"
-     "873fe2368197a6931f6fcaad755102686a457a7edccc8d344e2d2a9162e3d71d41c09a02"
-     "2539ae6d404955a6ad748231aee1f974d4f159940532fb3b1fa0254bfc5805d2fc686968"
-     "56fadea386c542d3cefd1be3af04ca595e54be25",
-     "051af7b63bf3297ae20517faaa1552f4fde65819dbbff6a52721611e5b7dc1242ed6e697"
-     "68cdc37ea8cdfd1a5971f06b84b5803",
-     "04009cd1280a2a79b182ddbd1712dbfd12cee3345a89636d7673a5fc3e1e51400603176e"
-     "27d538e90005625aacf5cadcc8a8c25532008b5aabedce498476b4c65ab3cdc81f819c2d"
-     "b670a7236c0357a86f9087b83e7568cc6e5139fb92f81975756d7dc4f48be87df2",
-     "00bba308a3eee9e3ab6d2482bb728bf44cde9eedde15af7300c57c2c1e6fed2ee4e404ae"
-     "ee3923e7871a2ff4ba6df64f9d01a87",
-     "07a9e69664b7b81edc5d47c014696d194b2ca4705b2e79af692b285ec476169d041dd9ee"
-     "f20f7d496fc49b8597574d2602757ca",
-     "01521d7cf6aeaf1c8dd54a7776cfac02967983083770346d9768a2629d606be90d58ea82"
-     "377413a0fcc3e4e66f05a0d05d933ef"},
-    {NID_sect409k1, NID_sha224,
-     "356dc86cef7979148e995fc5abe2b14a7d5e4e42c9b3509b4363bb80c581a66f4e7e4aa5"
-     "3a4bfd37f9a7eccf75fdd726f348f6a3f779e6599f61bd1d668517f40453b39bcf35db08"
-     "52a6a6218198f52b7ceda2ec55fca5abe8e5d93af9a42b9ae4de9530c5870211bacc27c3"
-     "9aa094013db703de2fd3121f08d7e97dbd4e8946",
-     "03d65bdec48972d03811b78150a06956eb22d337dbec5416bbd8185a6322cd8c0ff80002"
-     "10dbd1326422289071cab65175f5d10",
-     "04000c9c1bb0a80c4b4863d78003e21ee60fc553ff72968c165f6eb6940250a6cb7d545c"
-     "6aed3760e42370df79b0d37c2d1433c486001a9d994828ac09a86c18b9758b3f6b91a577"
-     "5931a7a6e4d8b052204c972b993a3b420eb8ff7e91df77253a9f5847c5968b5636",
-     "0156d12708324cd30037753c78225d183723d3f15930f23bae854f121094bfffb5d7dece"
-     "1fca93bbe7457a2237760aef3db8e3f",
-     "071466e80e2a7cd8e6cb6dfde259a08619f880a71899c58bd4cd33c29f7b321d26953372"
-     "0101f2ef70f5b8e8f05c9cbe1ebc303",
-     "077330e08712ad709f855d92355cfb7d565efd806c6a853712916f7c943bfc79e496366d"
-     "eba79ef7491abad23086db341f339e5"},
-    {NID_sect409k1, NID_sha224,
-     "06fd39a50bf25e89f1071ff81fec5d1e35b6dd68990414ee403dfdebb792627b6a4ae3d2"
-     "236c159e4441ff90b61ec87b1592c538515f0486b19e58583394a05e6411e69b4285d6d6"
-     "589982ac0eeb2c912c4948789cad741183663fc070943389d4e9a1150b8f6088fc506059"
-     "15e9e24b2d98a1f539024770e4820e14ae42ea8e",
-     "01f1a8b5f35dbbf82c102df550c72216a243f986f0325920f6186a16d1da74228cc02be6"
-     "024c7411160c183c923c743354f9438",
-     "040157ae8d90fe2416f70a7ce0669acdc0b5064ba650cb5416e59e6672e45b591774ebb2"
-     "f793c3a58e953da1ac08272d0b949e7b50006d49b9784f8423812967b857e25dc3af1312"
-     "a6ff29579f6acb6e155b6848ffac6fbce51bd2d41a22ef955f690e2487a4bbff00",
-     "04cc45e00847818397c6abb3d176cb8bd77814abfc253e3b0d799dff2c3e09a5195ed5e6"
-     "232873f2783c8e670b52a839e06bc30",
-     "067b418a5395216b83ab00d5568eeb62ae0693af2b0e4d052c6feb70562dcc06ef852002"
-     "687099dda114477871b924775e8460a",
-     "061d1e4d713689b2036272ad41571759b52a78e0f8a84d1f3a277aaa33ad558f0b71f3c5"
-     "a99d403e49df1afab66059db20f9f32"},
-    {NID_sect409k1, NID_sha224,
-     "6daaa41150ea252a3e966a338377307d909b95080e006f13027f2be5059d9208930c5a32"
-     "9994c0b794ef50eb059bc6c215f68cf42260bd410f9bd86d2ad5ab7179c7c92de4a93a5f"
-     "6aa17de5aefea815e7c0b78a8cc53c21dc4dee037b29c9df4e12343109283ffd5d8a3b81"
-     "fba1b5e95506c7e01ac056c86dd0ee23bc21af0a",
-     "031dc621200cd174193d95e9092ffb86189c52cdbb9ed937593f2cde7c4a0264b9100e1b"
-     "8407336c8dfb5520d28a18dc4e39a89",
-     "0400904bb904d50bff09bae5dd21f425c808b41001ac917b022f7e1cda6e46504781a69b"
-     "aab4a6f0f100c4fff9ced26f871159cd30015cc300b0efbac707635c72bf855de4290f1b"
-     "8b70c16f9bd0cb771ed5c760ada04d0ff648f118d64e0aff6a6de16def15cf7437",
-     "07e32b1fc1cebeec3d84f56a67c8ea2b78723e7010a725ca4745e849e573e8e4a4ce11d1"
-     "af4ee508b80fb5336de3cb53161bf44",
-     "071cd81dfbacbb67be5903cbcbe402c0420adfa9d14148bea600b178fd06278572d34eb4"
-     "6d857085a2a4f48cd4ee9109d607dae",
-     "0347b1029e67a6ea2a45af1f7410dc951db813eabfd3c7f3e2c294b81e1c54fa8c98569e"
-     "fc580b68007bfa316424ac6eb353ac2"},
-    {NID_sect409k1, NID_sha224,
-     "6378dd1c12c5197b57d47dc46a67949bdd1e0809004e94d49b0234126a08ad5bf8723ebf"
-     "d132145813136d8b7dd096f56c34248f09a65c34f60c2f80f9a51b3795f3d2518b11aaea"
-     "f6dd45a323794080b78f85d629e5fa719b6ab0b14c78cd908befeaef0dbfaa08cec9318b"
-     "bcb376d48b11b68735c9554a45293db5e9239ae1",
-     "016e6750245a88340b0f0665b890459f8038e9b1366f2fc1326245a88d4c523ec94429f2"
-     "1869ce3dbf75126e58f77241c99efaa",
-     "04010184fd47e8e1e4d534ca1cf67f15bc8a80921b07e251c22eb88f25395e08d7a92837"
-     "74aed204fb5c14aa13c63a94ee691b4ff401252ad972bb8c0b286c222f42f7d42ca6561b"
-     "ac5e517921bda53e51043f13e711da8a813bb6880678e4d6a16820bab819d62e59",
-     "07f18539d00152f5b9a75d4f114812b87024e8a8f9c9a8d12139d0a74d87986f4305bde6"
-     "0375918ff2dfdb88b6deda640e17364",
-     "0735a15e7bd1f69f4e90739d42ae239a8e9238ad28b63ce291b57cb5b99922fbd5dbb7f7"
-     "4fcc23117243efbd036eded6ee0f28b",
-     "07bb3dc77cdd4138a02e2d5fd4f6ff8516b4c95b8255c629132ea8705c399fc60f8fb660"
-     "ed3aae52db283aabc3626a5559dfe85"},
-    {NID_sect409k1, NID_sha224,
-     "b898d0f9bd80e083fa541f457d14d853bba55b120424a95e1d9511c8833f48444329e034"
-     "9d68204c4b4581ef1c4dee23ed0a4445727a72e1e6cde422f7c10ae132a3fe681f9d741f"
-     "da263e73f7cdf10759467c9d76164086abf6780ad474772771eee22d195339bb8f6235e0"
-     "d992bbe282b13ce4fe01417f507a2c4fa155e108",
-     "0788fabdafeebb72f6385301e30024b56639e629a400f9c50d402cfc9b5817844f06a451"
-     "fbda29c7ece41dc9ffcfc625fe0ff0a",
-     "04009b2c36d221d18189e1617cb2f2ddcd64cdf8a42ba6acc55f04e9722b11588f7fa861"
-     "a3940820d9dabbab631d7fd4106c60f37e00da099cdb10dfe2d7c0a16ed332b459e7be31"
-     "f44b0b2d595dc948f0b073ac4e439f24f215fba5ed50aef3702731d6561eee1986",
-     "00581369aca680beb705f52b6bef075de83ad29034c3d6b2949b551a0bbd100897a079b4"
-     "9d41d5030e1a6950fdb14d70dbbdb41",
-     "04f62415c99c8e6750f9c41c31cf050eb58f61f62eb0b0023d61dfc30e7879d4f5a87e88"
-     "faf55522631a29fb69d16e15c354323",
-     "06df238f34b5ae664860b43ea11defe3120591cfa371367096006c03e83d372bfb70da6f"
-     "789665136b7dd1c59894a2fc5038c4b"},
-    {NID_sect409k1, NID_sha256,
-     "dbe04561ea8579672a2b3afa94426a3cbc274b55263989d41a778bcb082da797d84d930c"
-     "a847a481789524940701cd5f1d11b460bdac0bffb0b3a3abe1ab689c519700de85a0a571"
-     "494ba0cfc3c865450eba7a9e916b7fa9df55e8a1c246c992e6a0b44b78274e008472bed8"
-     "d8411633e6520e1a906c5d0c8aafd572fe6f1f64",
-     "01b8dfd64563dc219d6eeb53f2e3ad1d771140d0960b211dc1f757af5e297dc7548d6133"
-     "ddb574711d466688f80dbd65a7bbcdc",
-     "0401ec530638ea0663cd3a9b237dd66402adf50d3094391f2343d7d6c52c1d14145c2454"
-     "64a3b771e4b1894462fbfaf440e53eef7e018349e244b24c8353811c29a60d8e02caf195"
-     "a424aeafdfd0361846d5ce5eb83da1901700f00fcb85a0c2543b49a8a3ccbac157",
-     "026a26cd09c9329cd45ceb4c798846dd81af67759794f5cadab84de19a835f8a0ae49b12"
-     "853b1e92822477a73891f85acce4216",
-     "04d83a5f9dad246717135bec6e386ec6b73be9ea6d1a17334ea2003a723d510914167d13"
-     "6254d6cb64b16ef7eec5044b8f2ba28",
-     "03e81601d0c66b507a491c530075edc5b09d770633a4c2355b3b1c7df9b200ebc7dcb706"
-     "be1696aab70d4c6e1c4a7e532284670"},
-    {NID_sect409k1, NID_sha256,
-     "48a8300820fea2ad83c83f7d6b24192715329c3f159d56644e11ed25efcbd3d31600a813"
-     "b909812987b97d1087e74a63b4494cc031c63492b6615e9d6e5b36f62cb2ef88b9f73659"
-     "5800de465789f43811165a5fc093ee6d776008739de8de2a84e878748641be8bd52e5b89"
-     "1c4145f52bbd46644852a43108e93d86352b2a3c",
-     "0422131829608ff730c24ddf7e8b4a2600eaa9681eaf45432daa7d41fe2fb488fd0199d4"
-     "31a1ed823801ce21f4f01a4dd4248ca",
-     "04006ff24eb0ab812303bdc9a23719caa789eb75775e686b9511bf6e07d60447d1601a48"
-     "ae7f3041cef5aaf3ed2adb6feb422fbc54009a351fdc9422a81ebef5407d0d74b52a348c"
-     "af3cf6e1c6c2af722c408941de154619a1d54bc23a9dfc0c4964f3936d62daa6a4",
-     "0313ec63c34ed325d770664aed3bfd1a16eb636516eb686e806b0acf6f0d117998b30fd5"
-     "2068a36f03d0db3ec13e6989c6f196a",
-     "0088167f96d807bdd61e65fadaf0c56b623db42b831909d12641e4d00e7bca6077b36cfa"
-     "759fcbbf087c31f294f20a09e0bdc96",
-     "01cbd06232b4c73cdd13208dd254ebf9351745ee6196e3a94b9213e931f141e4cc71f3d3"
-     "18a67e7b8060e11e88783fca0be41cb"},
-    {NID_sect409k1, NID_sha256,
-     "276e3a986ce33256014aaa3e55cc1f4c75fe831746b342eadb017676b0cba7c353b3a2b5"
-     "54522c12e6aeaf1364cd2eb765a404b3d0aa61258194a30219d76d2bfa98ad20e7e91756"
-     "cf65e50d7914157f283f2ba3930c0ad3a97532cc747b1cb9c806fff497f0322025a3d02f"
-     "f407fc7b5808585b91d95523c9d5864efdf7d983",
-     "0095ae8e4c7e55eb5da01acc05ecfe72a4dcd8ec152f1c8dc165014f70eb4e4a7861aeb2"
-     "b96c418b2d4db58659e76184e013a49",
-     "0400a3987d7262dc30e8ec11458ff7091ca993bc61f142ee535d544a2c88a47f96011076"
-     "19617a5e65cdd6d5e1a034aaa22304434201fc8af29d5134ca9baf92041b6d6aefabccac"
-     "a4013c55c1581ac05db6141290235ea09650a289907785d282cef1b9efb381ae66",
-     "066015a77c99015ed6983bb379772bd90e03b9c010e695853ebf8e461a20fc12b20bdda4"
-     "7eef856f162dfbd9fd4fc1ec49105d3",
-     "067c49b96e5bfb6a6d625346c3ecff13b8c8b7e59c764b73b256ac970aa4056460000e59"
-     "9a8195f2d235a75cee8e5634acfa7ed",
-     "03ce25ef1af0784645f0579da381542f5b8aef377e5b79193314f84853e2a07a4f1aaa4d"
-     "8210f3a3c249a879cfa3ea8af43a929"},
-    {NID_sect409k1, NID_sha256,
-     "6a4fc1827c3a7256faa8ec6a0f3d23559d6949f8cc20e7f76111dc4ebd59213951cbf0ea"
-     "dacaeb8862d6baa0cb298645e4314b1c303bd0d5e9893304d4b7fbd36ab05fb6a5edc3fe"
-     "f763e3a4124d61539eb616b359c5cb55b5e2bec50c91dd95fc39ddf521aa854216eb5a70"
-     "7819fa6f067b316a17a3b146e7cc2dd517f7d63f",
-     "006f2075bd730f34df111ebda919167b1d3358ada32cd6747cb3353bcfb814a77ac70cd5"
-     "1b31a0e538539453bf9eaf9d8b384c9",
-     "0400bbc153deaec0bcc36c03d24afd20dacd9e78d104d94c279278d04b597ccccae43cd3"
-     "e64c9e1e58fb5408f376dd7827ede9dc3a015ae0d803acf12d9d3fd41f74357b1c93cec0"
-     "480f2e586d0e18f15e569d27d3d106e192ee0c1c570351eff1f463dc07d3bea933",
-     "0314330098250e38145d11a48f5043190c6b44f8572ae57cf83b1f3c4c03ce38b90ed5e1"
-     "57464c2613c82943d78c938fcde89d7",
-     "0160b20c370ef4b9cca3f7dd3c23f70efe6bd80751ca021731bdfb0f45ae07e5f2144c77"
-     "795aafdb0c3a92ebbef75fb2d334dee",
-     "045188dd2402ad36ae4278a9910648ed5e71d64737651c133aa89850e3bef2207d58ba41"
-     "69e471a4737962f5fafd50a37a28e1b"},
-    {NID_sect409k1, NID_sha256,
-     "4b088199bd8c94775d8ee508377d672dbf50f6d2c7370e99821ec8f9387492fb2eebdbea"
-     "473ea18465565f79e2af418555f10c4a527e05a9e20c9c00b807dc8b350cd4ccc2d87e91"
-     "f66addf02ce4f43597aa258ac6fbe9365cc2c8e8bbe5c884abc929710e8423cd6722a8f4"
-     "73bb55804159a92a3d8b6661a536b4fb9293bb0a",
-     "03887d284e9ad17d38bc6da9d83c192a434c509340a7f233cebb032b09ab7c4c6e8730b4"
-     "a80844898616c9abcd16b753c6bb4c5",
-     "04012a6d5c5690ebf14ecfa54ac97b73e88e16e757c34c6bbfdc9a3a119f298860d330af"
-     "295756dec41eedeadc5257b202451faa06019f40ff28bb72af659d5319286fe21f018199"
-     "52d471ce2433ade745042a47c2dae798199c364ceb99029c2dd5cf57ef5daa2b00",
-     "035945b45221300f83c5fafbaf0645a7386e209d025b3e1dc367819728f630663fb732b2"
-     "51a019e08dde0f64dd3f60a10065c50",
-     "00c323c86e8cc548123d1337936d4be948bd4bce4631a2194c2bf04e1fd714df2c90e368"
-     "1e41a21d58d9567a5df9fc478dca8e8",
-     "0493d3f4d22cf8517c301f15bde52cef17c05fed2482f3ef15cdbe32c5f0975e054d45b1"
-     "3faf906896201942f29e5693bfbb229"},
-    {NID_sect409k1, NID_sha256,
-     "848a13465ddcfb2dc14f7bc0db0756832c22dde1e31e4d8b3ae0dd1aafbdf15e954889e9"
-     "5d3bdfd6e5ebb6171fad62592c23277a89e8ba53978c9b1afedfef7e1c3f6d9f31077530"
-     "460b47834b30bbd84a4da601be988738aa815d3d7e72043243a5288751ee08b4815a017f"
-     "b5d9bd55833698a0d526b1ed79da35ef0fac93da",
-     "02ea5430610864257c9dc393c3addcd0d8d5bc8aab1067643b08857210464428aa85cf1a"
-     "e6c743fd2682255d4c8eaa46ca21e73",
-     "0401e502d3f47823ac7207861855fe6f6aad1fa4f2149bff2643b079da23fb270599f744"
-     "669b3c8ceb4cb0989aabd43d26d93c814600cdcfc138451bb59f34dc82b8128088b5ae0c"
-     "b8a77dce1895d5ffdfc8b4be24a206b9856954508b82b80d0163b276683489074a",
-     "0426b90275d720d19c6ef5c8c74c568a636257740530e3ad10de0d518c4eaad8bc58cf45"
-     "06cf5cdf7f2b03edd1caadb28fa3787",
-     "0123ad87c094c4ccfe4346dadad54a6b1ee1bffaa1b7b9094fe2e6ae785a2b77ce3f5e56"
-     "8e43e8b7fa997206262645f56078657",
-     "00d56cd5cc64736ff7ea0d9840916b1e1c94e11611f93b1b11c2ee98c79d92a8af1a560c"
-     "9938dc4bdd0b84252e259ae5669d1c3"},
-    {NID_sect409k1, NID_sha256,
-     "d1850545c04ea65528849973c220205c35eae98826d169348970d1420b4d872ce233af1d"
-     "aa9e62f6a562544ae3a0633a954a493e9766dd5d87e47486559fdf86229a7c9e1726de21"
-     "895abdcf2422d438f4ad98d88b45c56742694ad5e11894253270997c049f0f419842482f"
-     "21c792fbe5613e2defecd485585f1835b6f4c578",
-     "062c757c92eaef41f5d81169ec4968145b5aa2bc1d2a3a5fd000634777748ecb93677b3d"
-     "a12e3be33272a8f0a52300f4a5a37c4",
-     "040139660fb8bbba59e8f4e95e5ee5b97227220f0e1b293901fedcc6dab86e7c5a9d20c1"
-     "a097ee2e926a934cce679fb8dcd8d2ed6c008ac510ddf735184e8fa9693da264194fb78d"
-     "a5d1cdc0bf5faadb33950ca191fe233eb8dac8adcbfe15b4f7c09d5ddeef6bcd1a",
-     "026868bf1764993d650aaebf117521cd146ea20067cc14a5843f726a3d68e41c3fba82a8"
-     "3d406b2275b3459748b3bd1a8d32f1a",
-     "05b17d13ae4d9535d062a2653bae4d15b9b859a87c33e175adc3ef04781bced888f3e93e"
-     "9804b2251a40b9344c0f8c6bd5be0ba",
-     "01ec3322c5beba4423b13a0528c71739a6b39f7b0e0e58a8274a8386167cadef51e5560a"
-     "3e9d97447e3d3c06288459fe6569345"},
-    {NID_sect409k1, NID_sha256,
-     "421c9784d6fd507c82904e1054edf9bdd1efb58a0b211340086069ad38b7b0dd15c2345f"
-     "a8767ef71254ed1bd5c35f742b1d3f4765ff9007a5477ba9e5d3d5a5cb5fab4efc1cad73"
-     "701d4776c6c4343f42b5d94a9eb78ae428dfe5fbdd8e6ece09d5b75cf4346cf27db85635"
-     "2225ab04e6ea56661554fbc39916accebecb3935",
-     "048a313c0c11489939fc0cffc6ccb9f179093c4e13141b92dbbaac441b7ae878c9d41206"
-     "6e95615174a24692555cbbe904a14cf",
-     "0400677c2d364fa86b8b0c79af754e675ea3e806d5583e62087e01590b824d2730e31326"
-     "591167f02bdd29f8178787c4e1ba9d249600e7f78c423baeebf6defe9feb8ada8874ceca"
-     "b083ca2e71d9d8a3fbe846eda69262a1f5b4a3baccaaa4f2cc87220edb1fa6b6bf",
-     "012b8df87dd935775b80c62ed6c76974fa5772939a9e7372cb74e033fbae4f78d75b8bfb"
-     "b82240cf91009b5bef4d63ded04cbc9",
-     "000590a9e8de60b5cb181a1c11c2f6115c66b05e71e0c558ae203ee18e54de68016f4c7e"
-     "d2f01cb0cbaf1bdc45218c0fe2b1552",
-     "0521844eee9168a501e235de5fd19c84f052445fb0e68bba687ace45d8630070ddd3b730"
-     "34d1d65788a51acf91273fd187a24ed"},
-    {NID_sect409k1, NID_sha256,
-     "7910bab15b6429947655e33a67f41b76f1d7b71534f8904d6a0472c2faded038565272d0"
-     "b5f51aa915e0d624e9ff48d50ebfa2f09324864f26c29ab73eb39b436c5c459c7cff4d2b"
-     "62992e3489cb4ddfc05d7366b161a463aa1b782641d93507de43c8cd0a0a0a9d1c644f45"
-     "54e3edaf7fd794248110ca9387e73ae5d00d299e",
-     "046e2adfe5d3549e1e6fa1fe69a7cbb4ac9b111c8903d544268f8318b0b47d4b78fe3e56"
-     "eb5e639ad5382e7cd5bd4b2c3e70ef6",
-     "04012902439be50c97aae7b40328984934d6c843415f76f3821c8e8323aba96ee41359e2"
-     "ce5ad3179063ea5e2c7deeda4d728d585201eb59fe96b269cc973b1fe1f3720aa9aa6ec4"
-     "cf303c5cccbaaebe6ef7c9f5356ec5e76b26b09479d9831d9f5aa41ae1d61f4c47",
-     "031893aef1baee0e21b50cff7002435b058d73dc4d8301ffdcf1e0c315d18c2b16f282e5"
-     "b294dc88369b25e2a1a19abffb578ab",
-     "039281ef10b9a2664b755a2db67b3c410276a424edf7681a5c97244eaac5826368a8095f"
-     "1b9b76f8e490e2783694d5bcf3565ea",
-     "039edd50721dd35d1704167e8cb609f309b9ed73d3c1eece181f9582aabc647c5ec8bd25"
-     "8e5802fb0647372e4c3929cf59ae2d5"},
-    {NID_sect409k1, NID_sha256,
-     "e6fc96e060b956c25d50ad25443f3c30a12d199a47451a49ce88307201dfb15ed816982e"
-     "8888a28daa92eaf3c5584ca6ab2ca9e14577f84396de2e0ac214b24a2279f5e7b344fb73"
-     "87e9afc8f0a2b77a4d024a20ce6183499b17096947444bbb753d9b39e5c694239d28f9c4"
-     "54bb05468d17ab564ee6cea3741747ccb7f108af",
-     "0480103fd6180a431c837643566706e2b9597de0a1346a224d176a5b2c54aa4d064418ed"
-     "654a5d39f4773fb509f86473ebb373f",
-     "0401d39e2772ff3d26c5936ab347bd5a2940ece42b1964f030c59ab453acd7f44716ba9d"
-     "88f0828de1a4e730ab27fe1859915818c60140b1b66b0a87de29ba2cfa799d944b3b898f"
-     "e7ac43de68b01fb41464506e2f014e0d11bbc0c24996428c93bc1a5ecee5956bb2",
-     "06e9bd0290548d35168f7db7fc292bc161a7710b78ac49ec6a42c9423afea1310597e597"
-     "8b22b4dfa192489323b2317e4714d37",
-     "055dbf88b6221dff098345226d59d396b6773611ca6e747d26d5d758760d830693df0f5c"
-     "602859f9caffd0dc3790dfa08c527c2",
-     "03e679447b622c4b06871f2337f5a24150e76efcef9698c6fd463867508e9d7b803667c3"
-     "2989a881c98a90998944c070aa58b17"},
-    {NID_sect409k1, NID_sha256,
-     "c8a8a0d41f35537e6fd523ee099eb45e1ad6ab54bed4d3e315e20227db03292e39dc1a91"
-     "bab439c0d20e36e7fea6ef08983f390a6b5551ac3b4f1895220b2867fab95552cef9bd87"
-     "02962839bd9b2c72772640e7d3be3c5889d226acbefdcb448432bc503e5a5fe7ae9ae769"
-     "6c720a799f9882c64ae0385f656074dd8a6821f5",
-     "013c489e8311c6bef02c8f58903b2ba2a98a27cb935d75a30d320af9a14fa3cbc6adcce0"
-     "9235a9eaf333dd05f4b2f1694985dc4",
-     "040046a1c0e7753cb499d19b2805df770ba54f1c6e03611c302c73c72902867c51c1cf9e"
-     "d154b8f30f72002421029de7ba2d8fad22002aef9c34c7c8216a805a58dd88185f404930"
-     "86213cb4c85e4d226bb5e892aa37be353d9123e9900f8b0790a43d55a19d78c48a",
-     "0491dcc881731112ad5e9e1df459c27381a7bf8270f97743466e178bf5ca903971b362b7"
-     "3fdbef8a75d4292e63e225396c7b32f",
-     "048425b76147427b8b1969bba3809dd70f0fda24cfb0e92509a7824f027b61cd38441a69"
-     "1efe213f3c331da8c82f94bbde511d9",
-     "00df36683f22e9e86c88097d75409ea297d391550440e4327f67b7af1b09141a0e7a1db4"
-     "0c4b0bf4d60376a6636dbeeff0b6b91"},
-    {NID_sect409k1, NID_sha256,
-     "3407cd6d2845197cd7414a30fc3df7184da204222ffd65c4d16a12cadabf603de8043ea1"
-     "4f5e6ddcc22d3572dc06dec1a23cd924e1847ae285ecf01754e2d1247876431eb98e897e"
-     "47412a2330bb32990f9714122109e94b38f82cfdbbf2eeb4c6f88f5dbf9f0ccb47939df8"
-     "be321dcd9bfd9bb99cac9f94885fee7d443fbd87",
-     "02419bd2200f8e1d87db848b0379741685e680d9affe693eed49d82931030b6cb05d21a4"
-     "965f4e1df2045c8513a8f574ca9f2e7",
-     "0400641a6ac72455ceb142e00d6854acc5f8b86db7bb239a5054c1ed48dffb6d050458ff"
-     "ea8adb68613ad3cf5977ea7330268abaa201a954ab7d62796e5aed370285d3bf91ddd34e"
-     "ff3b995d04967db41c2171cb2157d85032c998795ed476c891702d63ff0108f45a",
-     "02e9928f427a86c4491a47b31454ea7d497435af81c07bc96fa61f4507494fbe4ffc1fff"
-     "a8faadc2a44c7e69c4f976661750f8b",
-     "01e8ff4cb8c58fa48aaf61488cc4118df90e8c06cbd88234cc920e5795597ffdc0ab967f"
-     "a7461082a49de56f02f84cd9d564316",
-     "06e77ac43fc7af3c126f997fe15011fa87a27479fbd5af48e28ccc2c1bedb6c0695291dd"
-     "67beeec3f17cbfecefbea46b6325fdd"},
-    {NID_sect409k1, NID_sha256,
-     "ad43f8440071285d01fd79244907803601aff4bc5d14c77483a87cd742144d41c68269d7"
-     "6c9a83c09d2178bbcbdf99f927b378497ffdc907a75a3b0ad019e69758dfffa480871eb6"
-     "e1e17c8539373de611a557fad120d0bd147f8debe5f09a02e56fb607e9c1253ed592071f"
-     "042e42fee39775b407225a2b86a950d81bb7d7ef",
-     "0722951879a65bfcb414e11712ee9431eeb32319e0ff28601112f89276ffc2b96eb65c7f"
-     "d77d023f09914a53e2aae2c84652bad",
-     "0400a0304caec1b68b34c822a2a031145677fe515dda977f6932ea2a3291c6bb4fe8f297"
-     "b7d3c632f9b3806a8cd26e32403c27fc7a00012d4c3231898a4202f3f251802c690353ae"
-     "9cc28ae5089e259149bce444d31a38927dcb42ed613d4818e235884749057ebd02",
-     "0331611e81d3e6e3a24cc829c1cb9087a8c6f64c286e5f1acfb1ba764eea5ca55be544d3"
-     "cb95fb98407fb6c8f9eb1b3f7ae7386",
-     "056901f11ec69f91b31f7f41f7856752568b7d34ff3af1a2259fe15ae0b01391eeaffb62"
-     "9976525fce5d182663b7b23a8001bb3",
-     "04e89c3155afda2e64c749536392554cc299b70020362e6701e3a649f0a63ae5a5da4efe"
-     "d5c73b5e8098c0cf47d6f4c45c6fab9"},
-    {NID_sect409k1, NID_sha256,
-     "d61a3765229dcd0b4fa6c57280f851ec2bd54d3ee2436935cd6d94e0120d0844adda1639"
-     "95fbc4cd9d7275da859ad8ebf30af9efbdcfc31c7c9ef42bce9011d37cf9d15fb018e117"
-     "bbc102f7d05750e5072f73d02c2f45509a55627a78cbd9082cbf36807759d1fe2ecbb92a"
-     "b30cf28434941712d38bdd100955d611987b5968",
-     "03f5b5a772d24bd5454bf26759dbd433fcc7bae4f5c593664c4d75da0cdf9430d7d9162b"
-     "ce3d7f6e13a344259da5a7d6a1635bb",
-     "0401ca1441b1f6e13138880196e69743206ce09c439a507a11c0fed069d4ed23676b27a3"
-     "a337c976c276809ae725229c9001708742013c47b14e3069af070869c12f0f39e35a6f33"
-     "4d98210d33c9da01ac80057911f5a392fb5c8cafeea01c1953e97d47e744160243",
-     "01484461d02c0337e8113e51aa7d46330f57d423b79b580a544d372524a853db9dac0c0d"
-     "16f733b273bf888271135a5162e70f2",
-     "0256d7ab133904a792987f8cea69e8e3cc674cd3c577f40ef6f12b31f52ac6366a2a3ea2"
-     "b2272c7bab8be00ca0d17989b6801a5",
-     "020d82cb9b3b1f25d993fc18b7303db4cfab91c03a97b249176f9bb2aa5ae7f589c74060"
-     "d25058c7acb6de1e888ff44481185b1"},
-    {NID_sect409k1, NID_sha256,
-     "1f3c23636414ced48fab6763eed5b22537968e6bf08c178b3d31fb1f6ea773c697975970"
-     "1d94bc1bee7c354272811edec58eff50c93331b22723d460e56dbee90466b894354777b2"
-     "3b13a37d15a84c762caca70c01518bf34d0c2f072145d274b3b6c932b48bd815fe81161d"
-     "8507ffbc2f783bd212c29b2887af6d2ffa9d2b4d",
-     "046bb4a141c9099d531dd23ac440eff1f5b10f7cf34920b6b702311d490d25344c665ed5"
-     "211d401def24986c8094165d10f8934",
-     "04013db47ac0e33af0cc7d74f6ce647fd80cdc1849b15c349bf501c95893be5a440f85b9"
-     "b029713339fb888d7a93632ea4e0bd813601f26f7009cede02e054d6499c9280794184e2"
-     "12e3e1091032fe0e3c189de26d04aa8a5909569017cf06ac2a20acf579ca81f3fd",
-     "046e55a908f13441bab63e5327ac346781399d5a9035a72aa21df708b814b67e420b455e"
-     "1410014cb53e6ab00f526ceb396bcf6",
-     "06db7a7b03d6a85069a943fcc332cb8c54ac978810374b12eaed4a5fa5342c8eabaec238"
-     "bfc6107fd03d75dc2c6d258c218a186",
-     "010a4115161765dd0c22a0915a0d8cc01905de91d3f08c6d2d85a6a92e1dc00904f3be67"
-     "fef000ce19f57157deb9afba7582b59"},
-    {NID_sect409k1, NID_sha384,
-     "ec69f2937ec793aaa3486d59d0c960ee50f640a9ce98a3becffc12d6a6c1c6c2f255d37d"
-     "29f9b4d068373a96beadac98fd5203a9f229bfc70bcd449640165ae5128e3f8d057769e2"
-     "8356e73e35d8e9af7876f608390090892c67391ddfcc1c332aa61efbf72d54bc615998b3"
-     "be8ab0a9d372784bea48c9fab244482c75cb2de3",
-     "06f2c6e9ea8109223d9a349fce14927618fc4fa95e05ecf9aba1546619eaeaca7b5815cc"
-     "07e97ae8cd1e9973ac603f84d838393",
-     "0401f5a9824584cbb0d5ed57f677caf62df77933ce19495d2df86855fb16456a50f157d1"
-     "8f35ff79b8a841a44ee821b36ea93b4f4001a88299000c07a9ad0e57c22fa8f15218cd90"
-     "ea1de5b8c56d69506ad0fd12b513ffbd224cb6ad590b79c7677a8eda47a8bdc484",
-     "042325aded3f71fc3ff0c84106f80a10af08d76d5e710a35d462e880e015a36d06359957"
-     "3ce2044537b9f62b51ed4fd2ed8b860",
-     "0667c74ee2d632aed13cad47e0b46a5176940652d7da613e4965876e7e22d89994bdeadd"
-     "6b5d9361c516fd51a4fb6b60b537e9c",
-     "026a01220a1166a4d0172428753e98caf0aaac5b0a09c5a3f11b2645d243991d141f59d6"
-     "cc502ac44b70e7c48d6b0d7b6ec4869"},
-    {NID_sect409k1, NID_sha384,
-     "70e11efc78d7f079ae41ac3c31c96d3220f4abfe23814a2a4a78d9b1a25e838c3408bd41"
-     "6062e4b0a5cdadf0c6e16a11e00f59711b417751f5e4b43ecad99efbdb2a81c91a034e89"
-     "edc94eb552c3eba62808563cdf64453a1db07daff8742aea4a9fa738e1322da316b26dbc"
-     "a2954b2bc0de6da7518d28e6677dec6ba8af4285",
-     "004212b7fd913d794fc6bb33e0276e349c052c969ecbf6afc89b28f75a599a9242acf74d"
-     "ec9f374361ba296ba42a38407f9b7d6",
-     "04019220ebacedc60762877881262c0c3dc0c8a709fe2ea16cdaad3b680d7cc8aae8617f"
-     "0acc9b5c9861ede651481f39927a24ecb2018afd77bc7fe54266275fcadc0fe8d4c0dba7"
-     "a1264c79bc31479f4bcd02245cde991791a7b7e65fbfa907457fb6d450c0985ae4",
-     "04c01ff477786304b24cb9c95ed70ba376ed6e4f6b3ab2f99ac575c92d3801e7f43bab07"
-     "2268705d61d3e2fd881f754b9c84235",
-     "00987cf8ef2b382fb25a6a542e688aa96c098f5d16be0c7d46e961b4a4152c372cc06839"
-     "93843bf5a04f81e6068843582fca48c",
-     "036fba32f80cd2e66bf31baf87616027c5b107f72f11fc766b42e2774e29e10e860577c0"
-     "d3a27a3b49754e6a189680b7a638408"},
-    {NID_sect409k1, NID_sha384,
-     "d922fa515e3bed60b517a2d37cafe4c041e5ab4b5c8d8d4011bf9fc4013dd8abf7add71f"
-     "cfde5e71d6abe76bd0f749e960cbed55711c87b5629a2c39cff48ed7d0feaf5cc4765e57"
-     "6a4959521f9a45fcba0dc65ae618826447e02ce6e1cab5ce8d6c96c3211adbb0660de7df"
-     "7453f3aa726016941d00d8ee536cc106a603d126",
-     "06baeebb5ffc89c94c3e8b37b9b0904e7c4b251d204894655bf3b1235710215c29820b9d"
-     "401c9ca7df1404d2d62d708aafe208a",
-     "0400a0b2a185ad7ddcaa0d8d21b643a14948d3552e25875506d64e236a90d274ad1ca678"
-     "e628acc208bfe6b56c02df9f5a36aa94ec00fef210c7137237da8ecfc2f069cb9390c132"
-     "d1c6ce961f2bb3ca925ee727c967f8a46727c8811c94ef66f20836c661a5cd1c59",
-     "02185be104ad16abfe4fb83de5db067d37ca58510b786b109514debef56cceb4dd6ebe53"
-     "b25127b85faf9c28b56d6586c26d60e",
-     "0404831192b4bd453c0a7e850815ac3fad88c7a2da27d29e83ca6f22213635a366018ac0"
-     "038b1fb1e4c512cac15b614fb69b3e2",
-     "06f677c361547c91428d0e200dd00777262a138afcd828238d132c56b2c232e2b446cc69"
-     "3fdc4013f05ce7021aea5b5b2f1b34f"},
-    {NID_sect409k1, NID_sha384,
-     "4f64d0f6bfc542a0d4347576935bd68ca88524ead03b8d2c494061d0658e6c3e14576b5b"
-     "cea5f2f992f54cfb52b5c7cf1dfc517205e0454510eef1b7054a8cd06ab53ed2468193f9"
-     "8ff0dd62faf076549ab2a270f259276d5729996c120792c6f466a74ab65035bf38ff2c05"
-     "5b43e2a8b8e2449a2375ddbfc18242157bd905f8",
-     "008e5f66ba53e7caad1feda122a80c32c82d2c32a7237b8ee8ead44ea8f2f01d77c7056b"
-     "9dd60b92d051f060da8532c1fd0e8f4",
-     "0401a3d020a0c7e3f3fe5b3d9fa6b6148cd0c481b4f9e14dc85aeffff35e62545654fc31"
-     "3f930ca2e33dced28ec28d0fce6ceaeaa2013c1ac166c3c088e8a4a9d44556e3344e52e8"
-     "741ed1a8b526a45268086e2fe54c24d398553d509439ad4957454eb68af594e683",
-     "0095caaf063abba5073aa7123b2c0e1666d29bfdfdfb0c484e18931d756ed0845ea15dee"
-     "1e9abcbbe4576113a8806aab9476b16",
-     "04d6e33001933221e9eaa78da5874f639749c7396dae90f2da4ccfca15b50ee9e50521cd"
-     "84d78a098e0c383fab0186b3dfe1b3e",
-     "001e17cc7baa3e9ff4d882da970caf7d55b4e0fb7f0cdaaaa8290fe2fc9cc31d51b34b5d"
-     "cc825bf6799ce22fc95382d46f3f98c"},
-    {NID_sect409k1, NID_sha384,
-     "7047d478ec5282d55db8c19c97af10951982d908c759ff590f27d57e2664f08d526cbb2b"
-     "fde39bdbb1aa3dca5a8d3feb50b868be6651f197abccc9d8040b623de367e2ea1d20ecd3"
-     "02afb9e273f4be9f3f64f2c2eb3f92d5e0e375db6549da2a589f0604bc7146562ccefd15"
-     "995a7c4208f640e7a17afbca69cda4e173380523",
-     "04ecb22b44e809f89b16abb10be062c89b41ee34e110403e42a20ce59a99afdc22f6f6dd"
-     "a56e1d9d1b8ce1d057f390db111def3",
-     "0400dbb4a6ed11f36eb78417269c1b1e9725eba1666591afaffb5582c8b4d5bee1d73922"
-     "b0164a05bf21a12052171abbdd3130555201eb385afe8588ceaac9f39a5cb4455e02bca4"
-     "8f3d2242730e0f9e06ff1db24344379f96356531676cd5af234a120f4b61f7e041",
-     "01cc97a718ebeffed4ca7a9a4389d6b0fafb73ab000463b68b5580267aec203b6231cfb5"
-     "afbf7ad8192f0947c7f40d9e060ab32",
-     "021a29f56c31227daf0dc5dc919434978943b80f4b18748bb5f7d6702153b966a0a4af6f"
-     "209ecfa3aae0e4f32a1b7c6ae58a55f",
-     "06921b2e2ab81517a0785c4ac3be3d7d4b4c917d7a1e4313b123ae96056a2a4a66d9e008"
-     "19d8c1cca5bc0d75e4e05477c1fcbff"},
-    {NID_sect409k1, NID_sha384,
-     "1a8384b4771a410663e56eb36c5d9ede8d161a8fb0e31d3f74bcb017b9e31232bb2e2f4c"
-     "65a2d85bcd1cedd93ef08d4bb4af0095731574ab3f2762788a1ba3bf0ee46684da8d9dd3"
-     "84432fee99ed3c69213d790a5d81b351063eaf2bda71ca4868ac36be1b571024a8bf0903"
-     "9b347fa996d5d161078314e24b7d073e05cb3d48",
-     "051f9500c15ae73d6d479b9f3d2caccc2039d8d03820befc2aae3bbaf65d59bd9cb3c4e3"
-     "aa8bed5b3acb70a5566047ffad80729",
-     "0400ee8ca7f55225760c515bae053ebbf4ab23567f95c7091fee2acfff079eda297ec6a7"
-     "e9d526e12e5976431f9d7e52a2318ddcd80185e2c17705a2555fbb8afbe8e41ced8ace95"
-     "c83e198be3c7dcdeac8c2c5bdd988800f1194e553bd0348ebe6c29c16f35d50895",
-     "073f96451cab2d3ca9810e265b3461e0fbe7f32fd6702f06891b97969b133eafd68e53b5"
-     "26b5e32b0d06ab61ecd75e1bbb21b7c",
-     "067d55e709f6966cb2082d8021a313850c53305a3bcc926b6f9a122181665328fdc8e05a"
-     "88de812357be85d22c61c919876fec3",
-     "063d5ee4a63b1fae39f266a9f826754f5bca4d7bd414dedd16858b5c6ac2d4162e28ab57"
-     "215c6713320d3d6960f6b55e3f1897b"},
-    {NID_sect409k1, NID_sha384,
-     "43513d6dd8bb0af7a6f5a2b35f99957d335a48d54f2c4019ce9518b35441d4935518976a"
-     "b1df37110b5b53532cd9e2c66d9f87ae7f683d7efdbe1775a6c15eecee84c6f879999d07"
-     "06f6779dc158c111fe8d7201983883bc8334f51dec60004eb1087347bfdab20f8f2f2605"
-     "56681e05fdbb8a6139857fd3bb2df5bc1f2dc143",
-     "00cf01dc4462cca764f4f8cbef48c51980737b9b98d1384b8de9f4c733829db7718a9b5e"
-     "aa46a8475c2144fe4454cb8eeb0a443",
-     "0400806457fbb7fc577497c937600c5a9c4df2c20cf7dad4510e5ad617fb2849bfe6956c"
-     "3efeab6b805cb7b63bf5d1c94e5ddb456e00915071cee2094efdcc155f893da8d83d9a5c"
-     "234d0f04f738b7af5b8fddaf1d3aa152fc11894a13caee0009bc106a64323e9dda",
-     "024968902b50febf13be11821d0d316f2daaa07737af45ce2e855aea6ed58f226d2279eb"
-     "e4295c5d7674104bff75b899609561a",
-     "0549f18f1d654f26ca134df4707694e5d9b3693bb34ab5123ce4d9e4c2b2d9756ddad957"
-     "a4169fc9bcea29944903080f6f5d01b",
-     "021887355c6360bc4ee59f1badb5325763e9428e60b31a7abed06ef03bff0b1265662d60"
-     "4dd2e0140c355c70fce1b56ab143201"},
-    {NID_sect409k1, NID_sha384,
-     "752300bc5066d0efaf807183a41725e349907b7339d77c79921ead3c685b616b0eb97e70"
-     "8f3880fce0136c510c8cb53b22cb424af6f1c34633600939a0647c02d8f9601f9416f1d2"
-     "4a51657241fb559c25dfba91402cea43bca1a13718b3945b048725f3df560e6717cfc6eb"
-     "d894e29bff1e0c7763f15b8ea93e67385f059598",
-     "063a9a565497974c6dd459bea0d1196d74f263f333c31b7e8591499960e1cd79e2ef4cc8"
-     "709f6d54713f873b16e7b0be42f71c8",
-     "04018872e9d9410dbde671fc050ab88101f01d146a72d62b630b29790b20fc02cb62cd0e"
-     "bb5b453a46c60ec2d2c66de8715c32057801b6af51db1c42b743b89be0900d23f7da80b1"
-     "5f2e7a2a965c7bc13800bf58589560af4697f873b6155194badf5a19a653e63da3",
-     "01d3278e6e78386146fc15006258d7a62a1345db3c2e44fb8d3bf8101727bef254a9fbff"
-     "157072326a85b5ef4e17c5b0212bedd",
-     "07bd5b54d9c6d6f9c87f4a66472be2c4bb7f521ae56c1dd71781d95440b0a151d206ddf6"
-     "27e5ed3f9c7df2fc914a78454e97616",
-     "075e39ff66ab0e0d1b46f9679b95d10b692874d45fd6898c569aac28a53569646bb29f85"
-     "56e529ef83a15c574ad5e1c82878154"},
-    {NID_sect409k1, NID_sha384,
-     "f620603489944769c02e2f902c2299dd5f32b5fb463c841b7e1fc0249a85d2c31684bd3d"
-     "aacd97de8291c5d39e84d6e59d3dde1b30c181bfe8d31b8d8e080bd191690a67fa00024a"
-     "c8c1b10981b40d4f88789ecc58fc69b15417fff34834e23453bb9933a43d08afab74d056"
-     "f366b40ad167b51ee5f008db151a12b467d3eaa2",
-     "041074dc186193d30aac7cc6d269b938ab40b257d095e54ba79967a377a91b8f73671470"
-     "cd07f0a3d1db7cf0a31ba9070625e43",
-     "04018fe9848dc599a759d90530480a6f11d052d2ce21a7275769ba02a61658c3b69ecc54"
-     "6aa6599e6699353ee1d65ce533c69fb2180192b9c41bfeb2af4f29dcd1c43d3fe72a070b"
-     "5d085d070acdb8c02f0dba00c9471df1dcca1006709676bc08b8ddad97310e25bc",
-     "036447681292dc781f7f4ed60126945354ad1df5987266038c5049d698b2ae12965b6fc5"
-     "8f3e944c4751406087859973d8afcd2",
-     "0541c22a6cb984cafddb3269ba3ee56af64cb36d03b7cd1693b112a7df20f0422219f85c"
-     "6820130ad53ef69fb66f3326bb863a9",
-     "00fa66b163ec3582760b048ba9a0fba9443d7e908b67d749d732ac9b6e89c1fcbc6d3ff4"
-     "e02a43ee41414b15ead0cb83749e0a9"},
-    {NID_sect409k1, NID_sha384,
-     "5575f610762b42ce4e98d7bcf45a7a6a0d66ec7f27d6b8b17f1961249d905bc7e58e2ce0"
-     "806d467f106b16285dce4544c72666d08b5e2276cd0c4e13187cbda8aecf57b1855afedf"
-     "8fad39ee4fe009f204e60bdbec79b123456ec2d85631d382b8a2f2c7634af3992e4707f7"
-     "b4215e2c9d3b0aa8fb08267953883a4213669d33",
-     "010820db54ccf0226161aeaee79cfd2797f87702b4ee91adf8543b3c9e79579d0df8a889"
-     "e366ec1e0718e039b87a37c24d620e9",
-     "04002eb4e313f158ba7497130e2d64804ac45a7db207c55d41f39979e0303dd2641c8105"
-     "0fb7f24f2fd2485b90f60985cbb15d56be00a190fb6c81c104164578da6bd4f2b193cd11"
-     "935e1f87f14e824c2bf8c82c39f0be1a6de3dfc6dd68af8cb14f6a78f38773a7ca",
-     "0118e911f676f004fe581d1855e5795e5f4ddb33fb8d409d557aeea87895b7c23a513ca0"
-     "010f98b3a63f2c65da5e3b6c37cf5f0",
-     "060c7f7c47c16b294867cee3e65eac8fc828229a5d3adf8e68e14dee620e9d4e7b78c8b9"
-     "02b5042b5f19c94e621c52836c95ba8",
-     "008d036087b23319553faf835b793c73204cdbe2c1c2463e74de8f404e66ff15ce9384d2"
-     "6149e7300ed1a109afd1f915edef912"},
-    {NID_sect409k1, NID_sha384,
-     "81cf067411dde2d0ab04fe5fa1e28e6975cdcc571588de60a35bd956a535fbbda4affd08"
-     "03d244f3f7e6902a2c9a7ef2488691b6bef7f8ffb33be09ccae4c5285265e4957f7928ea"
-     "5cbabd6823297f59a7cfc9939a49f26bde74c4c69e2d38c1efbacbcfdef0112138431580"
-     "72be84ed3c1781f67a0e2d4e9ba76a585c17fc0a",
-     "059d2a06e8bfd5e14a9bc8777958b85be5e97af892d2cdeb0ecbd2d5017952b5042349db"
-     "5fedba2e26e7b85bbb31ad313d99434",
-     "0400af276952a1216ac88ca7a194f5b27b7c98c78c42f852dfc1a2cd4c1a477ed16eebfd"
-     "c90f613b6e264576a35c45f49aef8a564c00639625074b69346dc6c617d624d63ce415a3"
-     "6154a817f4e18c59a3b09e01589407077b19bbbdd57b04ef8fc2cc23c673d52910",
-     "002728f7e9b4772ab790af0be9ed5b3eab697c4710249169d2a5782ab3797b8fa21bf8c1"
-     "de659e3060af5a286353402ab982320",
-     "02a7027c6f94cc236dc8cbae35f9c38102a663b84f66143e2fbf9a152b1a6478bd803bf3"
-     "171f933f63509d539a54dd348002ef5",
-     "0549ecf85ca1bae6d9f0038dcef90c93121a654552780f5583a7d44a73a9360c6799e76a"
-     "632bc8907ce4626c0439f1518e3a250"},
-    {NID_sect409k1, NID_sha384,
-     "8ea18387940035cff2f37278d321b344231075db43c7fa7fee9bd3fdefe5e8f03e7af9de"
-     "afa1022eb108e19ec11fae34536a4fbac2e8c8139a081a997c080cbe8f3e2d2a72ff26ed"
-     "cc5338b21372fa1498e439e4d9bb12d51cc539f859047957b1b1f1fc30b90231eb06b365"
-     "a4d404a1fd5a0e5cef171fc95b04d0b557d78ebf",
-     "0405590893cbbe18f4ad99df28b5f9d17f8f1882269aff0b7eee9392859d68927a99c942"
-     "a3075269ddec6d69c0df2d76ab9d801",
-     "04006ce67ace45a9cfa0cb45e8e1d0eeb44e94bd7527fed6b563f1069140a3f36e010f85"
-     "e1ae5ef14d626c78465cae43230090baa601a66a58d87621b63ca662130ea342db029acc"
-     "2d99bf76cf6ec4e53ba71bde4b00e508d332081055a65fc6f44a96f4e947d729dd",
-     "0035f09e0c15b41c958596ad3f5c4bd4a3685ac94f19fb97503fb5fa29115cb18fdff4bd"
-     "104535847ff36650b7461550dacf2a3",
-     "051775fe1503ce80b3d581ea3e5ba761665568ce0eb7d6a7163d8d025d76002ca7bcf6d6"
-     "88b6477ae85d09c0d4017aba5ea8019",
-     "035cbe69edfb6fb99c9e45240b7a587c3805ab2ed6b0399c7dd8dd76187363b2ba1def66"
-     "b2c3dae4bc2e40d164bf0f4837798d8"},
-    {NID_sect409k1, NID_sha384,
-     "6a253c1aa17b2b1e6624afc8e7456d366ef5b1bd78e740538260f395481148a64da0b6a5"
-     "8cd53d7e06c691beae1a616547cd95c4d259a371e51c2c0e334c8a5311ae31e4c7af3256"
-     "86ff9f7a36f731010ee1a9b8a29169ceac36a060dd23611dc9713c615424888bb574ad5f"
-     "5755d7311bd169336ae986c977a394bf16487c4e",
-     "062bbb4f565aa0f23b88ab9029d33b995729d10fcfc33ba7c4051e2fbc72f15636a834e3"
-     "ebfe604b927cdfc89f53c57f36890db",
-     "040125242acf14c7e08e9f2f0194f734841758b1eea1e37ba80b9855a14100a5f0b57bc5"
-     "2a0200cb640121d96769e9cabc45362f5600dcf52cb899470943a37d260aa85fe83c3869"
-     "c862001021660ad09b4d73f7739ad331b3566bffad590534207c6db9acf98399b5",
-     "06095b4ed8d51e37f6c723648af4cd4585d9d250d7519139f58a93c75f197c4bbd1142da"
-     "59769a5fe178415c677caed1c3da667",
-     "041b212a54d4396ddea2898dadc363ac3ec5385c9b3b8ef1ea17c3d2f751d4f791372385"
-     "48ad759b5e1700d7d78072df3bf84e3",
-     "0149242afc524b0c3583037da153f539aad85aa0c19c6c70852e3c3923df8c3abd0189a2"
-     "abba872932eee2e6f45e02f98e810bf"},
-    {NID_sect409k1, NID_sha384,
-     "0f91d0f0139faf3b90a3d4bebd7e96ff6bb6f90f6c68321fb392637d8ab2a60d649a7b73"
-     "64ee6e4e274e1a8d342caee36cc11c56c54247fb0a8e8ef81ac4322b454dc9a195dc5456"
-     "7bf47ec8d4fa4cd32e76d78ea2d08bcbce3edbb68fd8597e56d5a9f2df4e47b2701046df"
-     "89615961db601bd8204584a6a6cfbb627e2a1190",
-     "03fad7031cf8810544a3e4bd1382c0a2e22c5a9fe4804ce67b27591fc516ee81dbac841d"
-     "399327168aa6abd79e2b5ef85df1528",
-     "0401ef0f918c683be57eeab95d5d1850bd492ace7f4b37785863647774a028e963ee2c0e"
-     "ea801838aa8217fad75c5780f1c36e8d4c01d5dfc69bcad46bde5539c58ebc89e1db2a3f"
-     "65069ed963280cc2cf228b2568bd53c6e0e164d6b63a5d3c2b8e3be9d5139a62ef",
-     "00eb16d784e2aed724cf1e4b72fe76b00dc80948c07f9c7524eb0e83bc59c12a8ed16fa7"
-     "ff21dffb8bbaa82925848a19c93884b",
-     "04a07e79b4f771363ad4c46cde0aadf3df4a233740a89168c97b54559029c51dc2c79b7c"
-     "c94a0e4e3d2f94e376fe47993da28bb",
-     "0360f559d37a777119b2aeebf00cc17e2edf04a2cbdf74366f5d34368d2eb2c92958e4dc"
-     "2b7453d5a509407a4d4643cc0235f57"},
-    {NID_sect409k1, NID_sha384,
-     "50c17c1fe4dc84648e5c3c3ab8f7c971d4c58d8d56d2b5ddd92e35e6792111ed8dac7644"
-     "ac8a07ca8bb4e38e071aa47b22ffe495e9083f9bf781ac1b5fba571862c909c7aaa7b8d0"
-     "5ddfb7ef61c99700de734d5658f44ae9fc908c85a2dac8e7f854d6d24be805fcd7f873a9"
-     "1252985c5c73129c60177ba8fd99daa87b25a073",
-     "03db41b4f637fe7977c90e4f1a21799baaddd1826c667102414877138436cfae1b995984"
-     "2b8097b5276f15f2b982ee59df263c8",
-     "04018eb25bbdeb41c5d14edc675fcac8a523acbfadd6456632bd593ab5f694a7734b163a"
-     "ceb6e6b3d8ed83fa1cf7b5adb9871a6626014975abca1cb769a243936e65123167e53527"
-     "9197a37d8c92c7b138f31cad4e95c5f62b06f438f94c1a61634b34be7b96f09fbb",
-     "055fce73c9c385f007256253281c6b9d0930d127939026495d0a30f25f77fdb6b334043c"
-     "39fad4223852f7101fce72746ea205c",
-     "01d7c26e0236afeac032fc5f3dbffc8c03b04417b514adc26d6a4f697b4e87a008d5ae97"
-     "544a274c25ff66b98111d7c651c9381",
-     "07954191fad321e7f2de95a87d5a9c4527e658ef85faa6622d5f34f8bc2b84c881ededbe"
-     "0281456e9b70eaf7a207e253d216533"},
-    {NID_sect409k1, NID_sha512,
-     "3583a3226e2dc463a462fefa97024e6e969c1b13bdc1d228e2d7823d9f7c09012390c253"
-     "5baf086588000e908309090daac6e6d2b06d2ede6fae838ed47f30b5b481185f607a3586"
-     "f6dea47c8f84e9d3b96d5b0ebae2462fde1e49d84d36658e87dccf5e30c0937feefd8862"
-     "dcdb1a1ca373f6ae41641502ac54df6633a8cec1",
-     "065b76c6093d9c49591293471286df1a4444e60d9d06cfa114e175afb5f119d2abeb273b"
-     "0596019a0ec5db5b5869f2cc827b364",
-     "0400266321fd15bf6b1af862496f467069819e3860f74a07825e68f3d023985bfbb838a4"
-     "9b6a41b6515cacf404ebf12ce0bd3d6d70001593c7a8e629599e63d3282cbea780235182"
-     "77e6731fe8d88cbe525ded554b51a7f8803ab9e330f210619dd07df8f67e1066a4",
-     "035682af873829e16b72bb86f3ee99b5d9f052e4a631b07f87d3b361c8d8260a877231db"
-     "cb3f4d461b4a1d4467824a26a5a6414",
-     "00a483dc2dc6408c256fdf63b04d71d3c58a08db7167da217f466cbbfb2d68444c10e87a"
-     "9a1bb04efd71135c00226e58414d407",
-     "078acfad2f2492f74b0281d53e4224c7544588ca9ceaeb16bf759b20c2f3d3ed69c64615"
-     "c247213d51800569dc8b00078de68ef"},
-    {NID_sect409k1, NID_sha512,
-     "60ca58462d53d074b370127132f4e59f5eb8d15594dc721a94286afd082a8934e52462c9"
-     "c1c3910f8b50d7aa3671dafa5972958d876d7992467b2fee3795a6f9d8a7bd3003a8582e"
-     "a8c003aa1e02c08ab6804d85bcfa13a815d75c938671f0af0706c68bc70a6155708ca755"
-     "cac2fbb68b2952208d63e0e2e3d816f04c61bc03",
-     "07e9993f3fc1fdc4c376ef77ecded96006ac1159740bd1b2dc6ae3d97e15a67383f1fc93"
-     "1e460b9af3fe14a54e47919667ed06c",
-     "040189b82003b546f94c066963239c7a590e064b88bb4548678853545920e413f2be3212"
-     "5e40efb82d2c9582d2d8269c1d408a7ff0011583b267727ba6c1e17a244ba7acdcd83698"
-     "6089860ee312b6dc2d88a984b1fa232eb0419730db8fb94a5e077009c1d55979bf",
-     "07574dbe04e1ac2bb34e40f32d6f6db364a95cc5770b79888d72b74bd4dbce9fd91136e9"
-     "e1152424d76688dc995bbf2bea34175",
-     "009e42a63b41877e200829356a2191fbb6f2a9a234be58c76b0852e4f348ca61e7492f90"
-     "a37feb8b95a6dd6df9d1a2e61c63b4b",
-     "01499fdcc804fee8193de080b085b7513eb8022503de5f64dc12c04c0ba24af30e30f63f"
-     "0e3eac2c82eb20c6672336f8732ec5a"},
-    {NID_sect409k1, NID_sha512,
-     "c749f9bb92ca9957ca6d0124206ebf65e860ff38a225e241950bf4526cef3f4fa9184ec8"
-     "3f71f813fe852dc08eca6b45b14fc7f2c6a19296529bfda007efe9d0d26492de2a902b45"
-     "ed39603e22f0a763dfa5deadd97ef6feb859d860baa2cfd1d066c0be0f9f4e0e2fafa69c"
-     "c51b12e814ad2e33b0acc0bcbe1df8cf018dcd4f",
-     "00c11e2979498695c660a2bdfd105b115bc4ff8664ea15cfb40c725406c6fc9a13027bd1"
-     "d72ffff6258f29e4e19b845243444a7",
-     "0400904a9bfebc23607c7c89b7aa89315343852cb894f54fe42ba4225285e58c6bc318b5"
-     "5691aa6a6ef22eb11f44cbda89f157d7a8019cc1826280e54832b455f0ce0cf89bdb62e9"
-     "73a8e819fb776b1a202b4f207b8baf9072929c9e3f6a8ff996d6d529de899b024e",
-     "070fe023c9341df9348f08882bef47bd8dd7f13db7215d1cd52cdbe7919031a62455ca96"
-     "9a8cc6db0a05a0b4befb47c142c4f34",
-     "035e7130d59d92ff8c4f264fb2c346e052bc305c7f57549a0fe43cc7cdac6aadf2ce1939"
-     "222decef4e1f900e3c2fb2c52bf53f5",
-     "0008d5ec1ed2091309ac11eb88157ba5122bb9b5c858a46769a130f7a941818445664ac7"
-     "8325e0b6d2a11bc89d08fe0e87a5bcf"},
-    {NID_sect409k1, NID_sha512,
-     "4de8414780ea20f7943b1f1adae5e3962d96e828fee43bdbf2831bd71bd25df2976a3be3"
-     "7a7a667c7fbe1200de578920090d131a750c9bc09bd95b261234ea8cc25423c4ddfff565"
-     "6d6b32da6e2f6f530e6673a8660aeca31273bb9a3a21bbd7031a2fa71ba37c004d3d1c64"
-     "b2c0798783e47b2efe1a208959ac16e35d444245",
-     "068dfc23c6635bd1fa1076dcbd456ad6e8df7ce7c1370fe275803befc4ffad007fd062a6"
-     "1cf1d50b93aeb9afe1aab47a65af82a",
-     "04005591f8cb59ccea17bfbcb74e69f05218d16175f0547ab95f507ef8d7426c077b52b8"
-     "2dcd06baf6eae7a66bc72422236e589e420126a01d5c2331a2d00949e07ea9242ebb50d8"
-     "30b0aaa74bce841d4e43bbaa9e9aaa01ba25db7a8a2f4d72977c0f016f625cdebb",
-     "070682c9659089a703dd9fcdf2f3fa0c1d1ef5fae3f8f1b3dda55d9b611770244f892689"
-     "8c904f6952c1847d287bca21db4dd59",
-     "02734111e3b736ae795929f835701bf290dd50c0fd625738ab2769242c1403197a3f4dc2"
-     "9ca618c2e292c6bec6dccff71adb698",
-     "0755292cc5363fa74e0193a806879d3a275b4beebc97250fb230efbb8364b2a30098c048"
-     "8bcc6e20449622d6a5fd2ae24d7abe0"},
-    {NID_sect409k1, NID_sha512,
-     "a081d54232f84bb19dbd52ec3812748e2e6486f6cf1b177b27929504ca878036547eb435"
-     "31bb5b3edc81bfe105370427e92831d2239cca0106d031d9fa8da9cf89c6fb6401377d59"
-     "36b6329ccad854e5567181b8f16a37c35f333eaa0ffe91d727d183fbab935fdac2d5670d"
-     "afb3fba59e4fa2df1746c58dd8360fa08af7f4e6",
-     "040807fb888e1d9fd33604546656a493629d94d4a0a9de2608962225ed158167f9e2438a"
-     "be2d12a11e2adb6c2b66ed78215b0b1",
-     "0401787c0e6c55acd69bde9b0a84d6022796d5b5c60fe5357bc0fa4386c16f61b38bfead"
-     "b6cfebee7e7701bde24418b8b5642afefa00d9579d271ba3d5e2327eb863cfdca3970700"
-     "55b97714e385ffc2fc23528f696dac1a4d0e535641f6c876f1819f2672a8c31cdb",
-     "010b8f5356d8a029659492c444876f1d274b82681d4f600cdb5fb2afde13598ddb71676d"
-     "9ed86e83351c70678886e8237a865d1",
-     "0304f43f9705d189f47ee09a079494030b0756993a93e4c6ee6b5e664f63431f99e50574"
-     "7c24377e5930f13492483e6cd06ebdc",
-     "0580d4707c97f0330f908042a6cb2a2b313f07bab34774ee03bbee63a4ff881b68def47c"
-     "d300fb49deb49829bf486d1efad39b8"},
-    {NID_sect409k1, NID_sha512,
-     "ea60266f1538565b3ff42fa4bbfe319be070329059c52c8bc04a7da2824f209c1145a05e"
-     "551ea59ded8ca8439c328f6907da4e81d658937df614be98c7b8648818ea80ef40e49aaa"
-     "4431f4a211d62acf2611f5d60c446b2b25745078c643859be1b12b3141a09ab765dd63ea"
-     "1f2a2df015eca0840087a5db378c4c4cce76cba7",
-     "033bda0a02badae08fe40c239b9d59e5bfe1c4d4b9b7a5acda6790bfd77ad08dde5e93a2"
-     "da80ec54a7f88146d72218bbb88aa10",
-     "04002dec536832c8acf007daa66a47e4eeecfb6991a359f8c412299ef56c6ca2faaf18c4"
-     "db708493e84786a7837ab74c5fe0644cee00906c8f603b579cc2384e0803d31d577f7c91"
-     "c55406db3b2db91bbca323fdf3cb6d010617ad1aae7bf414c4d974f22e6f05af53",
-     "051e8d027e62db2397e4a807d98a24455a76eff6dc259ada89e794dec1484b44724894ee"
-     "ba842f60b73287642570460896dbe77",
-     "031769e6777444095d934d05dcdf82405c43ae91ad5fa9201568ae2aba25712717f1af2b"
-     "8f49f6eef373237bd70c34889d0d271",
-     "0023498aa50ee095f33a4081bfd70a9484089c85fc7a4569f560ed67243745c823cc0217"
-     "d29e2938f06ba9c8790650d10fa5b1e"},
-    {NID_sect409k1, NID_sha512,
-     "82f38c9405ef0d26bcdd5b3fce4fb0060c3095f61403418e17c337933f0563c03691fabd"
-     "32ab5e896c593439e7492a9970ae325c67196d9e83fe0f9780409a930326f7e6efae035e"
-     "f8c321cb9ad12461edd5cde66c04739fe079db65406b3c2d22f2d04b1a4335285513d4ce"
-     "b901d2ca2ad10c508302266c2cd6079ff14eff4b",
-     "04ff431769d26b8837d3e1295f5464fe82be29edefba76323e92078a6483ea0daa962215"
-     "49102509a1bdcfd46a5a2e5de10c39f",
-     "0401beb74d427d849705cf26e26312446f27a7c5ff26ea9dc1aadca763254fe53a622de2"
-     "9cba4fa81ee2f9e0319e752f72be46cc7e008dfcda35a00ab77c3c47dbc05b0678cf561f"
-     "575369507097833e86e523dec879e0ae9583b4261f7a73c9dbd417accd4ae6688f",
-     "005aff3ad332af23e0dc38c16853252825076d602ed4c6d947be751af5dff3f59611e616"
-     "6c31740b5e5a167260adf2a5466289f",
-     "035c4e8e1858b9694cfef3e864ed959638ba309ba2066a28fb9d0e02a66cd4c187dc6fd8"
-     "ca5fabe68acbc2074168157b685aa6c",
-     "04ec2db89645018f9845b7ae31b8418a767e3570d401f41db18e424fe861bf09114d7860"
-     "6a056617613447d125a283be5bdb6ae"},
-    {NID_sect409k1, NID_sha512,
-     "d8506fab4f681ba4ae86066aed447571eba4fe04e6585fe3be6af2ab1000a3da68c5b0c7"
-     "11a85ddf3a40cb7c8944eef81f2094650459e14f5b848e6add7e580b0198070f873eb3ed"
-     "5d0728eabd92bc1398764b94cbb4cdd7cc2027b9762dd10782658cd9e8a5022ac062fec5"
-     "35d892198c8a387b3d2b6f7c92b1af6ab7dd9e4a",
-     "03f85ca1169ca7e9df44cbc6bc7d2868c9d94e8f8b699a42ca492dca0914eb5789a90322"
-     "18dcef7f95f959c9554a1cd83360439",
-     "0400aa3c77dd4324258bebe7da5338c772d3496e3fd0e57f455459542f1a1c5b47692f51"
-     "c3815c9549d0c23fdc1ff610fff6847ea8005e626d6aeb86dc51f3b359b10862cd33ac99"
-     "27e38127f7f17426f2369d62132a2a62fb6b8354c5ca0b3e5c7c87117b4f777a0e",
-     "0495099cc73c9930333ae3f9d0b7057d7c70e2bc7c805c0c6a44404739b3fb68f9fafa53"
-     "033b54b7ad7bfaf4bbf7baba0dd5a0f",
-     "005612fe87c6a3a164d269da902aa43c5a4e0333770ea6334f05750be3f31ee758d16929"
-     "1e15b1540d40b60d1bda279599f254e",
-     "011a633bbc058550a597585bbc9f33099eb517795600b019255f649493d4a6dd533be8b0"
-     "965d9f9d9698677491bf929198ff34a"},
-    {NID_sect409k1, NID_sha512,
-     "b3f30d34f252a4c26f396079e773142bf61c0981d912333ade3de4e27cbc72cd8a16b318"
-     "07f0c46116f87accb854487d83ec8c6a61565e6fca145eab70048245db08616779d7047d"
-     "b63aabd90dd15acbb05eaa510072c151c0518f1b34582b95f43ec7b9484b2993c176de79"
-     "e84566764467f72392ef31619426d159c91816d4",
-     "03a97deb36d68f81f50c8829d412ee5de7f9d775633cb69c09dac558182039e275fc2582"
-     "40517a7c4aa592e364765321f27cb12",
-     "04013f0f4c16a47ec3a46e7a088c1b6a63ef61eaea46aa9b2c532d8df84dbf64991bdc2c"
-     "81ced3635e562d1403dbcf6aab2f8aa9da003aaded3b99a454b820fed989dbf6430ddcda"
-     "67db58e356397d06aa137fbdb365ec43994abd9c0a9fadd2887da9539bb4ab3c44",
-     "06620ad14a5835b9e9e104607c317cc599416683a60ed8865acf78ae1e861246567cf9d9"
-     "1f759c2d4c82cec835a4784d3c231f4",
-     "068faabcb7c716fd73f129ebc6625f5b4660a88e47dc7dbcebab321051a61e46b74409e2"
-     "b0af420e1671ef4efe04973c43471ff",
-     "06851e5da033da0f28a89dbbdabe93ef11331c55cc03d5b096c0522370be681241fbe71d"
-     "1349f219ce57761c85fbe208ac36a36"},
-    {NID_sect409k1, NID_sha512,
-     "0fb13b7c09467ad203852738eda5ddd25b17d330e82c279630b0e1f0c86681f67f6e537f"
-     "b00da9419114973c8559306de58b0387d86e52d821d982a60769d2f15fd5ac2ee6dc55d8"
-     "ac04ee247282cb2866b8cb8b4d7b4b6cfb33bfefdff09a73d727193e5fb939ff66ac5fcb"
-     "644a44f9083a790888cc538c5eb435243c6a34a8",
-     "03b1da0ffed24e1a3b5ba22bd684337f6b08053591620541bdad50c761d66201a2cf21a4"
-     "cc636426456525b598e96baf97d9851",
-     "0400116a1790e621272b56cb4579ffe6ab629a2d077b779b73e039d74f58c476283c110b"
-     "b18b9c9ed63de7288dd678064de68b7df60122b43afccb88982f2e07ff35468178572bd7"
-     "2b644322d9e1ee68f78880169a83a5bb88c6c994762a7e8d80e09333487ac30fa4",
-     "06d7a24f0fcad549e9c36dbc70ce264a75eb37b74db98b1f6a824ad1e5635be9818f45c7"
-     "544927807dc0fb3bb5fd38556e8656e",
-     "0232339b50bdb772d15f2cb8973f6dd9397af45cebb69adfc089bb802e9c4029dfb2078a"
-     "8a26d7197de10638ce512e5904ccc5d",
-     "056add03244174966d53105c570e8fa660ae8c5d53316a24cd26f24e29e4b7459f4c9dae"
-     "f07442247b63665f97a3c07d91a8706"},
-    {NID_sect409k1, NID_sha512,
-     "f9b8124281628cf4e1da0cb4f021c8d19d815644cd80c7c8de4cc62722904ec4cddd26cc"
-     "4891f30b15098a25ba6923c6abf4774deb6e1883fbb409862f94467e75a725e7154be860"
-     "fd58347577c83adbf18535c54b102220197afa062cc1c84f6094490ce488af4a08d2c5b8"
-     "08a2572e18a59de96c87162f88413795351cedc1",
-     "040bac7e0d3b54c7753c79d43469e310d876015d948fac4e3a9765444754476af72330e8"
-     "8d79ee6119697aafac8435ab5690754",
-     "0400bd4fe8daffe47bfdfc43deca20b15da7c999084bee8983c62e3dd33740143c38d8f4"
-     "32cbacea51e6f53994265b2d8f4c393f6e006d88c33c31f4e143b13bedd5738bc1191fe6"
-     "815a099fb7b44617fdeb08daa0cb74edab7f9a8c67ac1e9c0f0fb21a9f02ef4b6b",
-     "020f2f6fcb3e471d47f21fb15301784f7cf3632dad3627a9ebfce587c0097871eca580bd"
-     "a051b100f991aa6de5edd3a7684e839",
-     "014f8884b5107e9ee5cf6f5d137ec9d59a85a6fa0431053d58a1400fbf0d518e8910179d"
-     "a1160de2c6cc8ea8ba8f3af8e0e1f6a",
-     "019aa8d55c8d876989f9b9559db0576f91c4610dc9187c74aae2d4f212cd94d90dd81ee4"
-     "483d88d866aec1ed469c5e3eed7d90c"},
-    {NID_sect409k1, NID_sha512,
-     "4e3cd6100520db050af0daa69fe3cfe6603a223d4f2a6318fc5836db8640d4c7fb80bb78"
-     "1302036d2d6fb8e552b4eaef3133b98ba2d36b9ef0b86243b0391413c73d48ecbf1d1917"
-     "0f1b3b781b35ffd316afb1d55d1dda8e91eed5553780cb2714a93e7ece698b832e853e25"
-     "89c5ba2b8a997bbbbf625071ded66762af8cad42",
-     "025b7eb3bdefba3c5134438caf968f615b315204f348006f82e8d61057a8a8a853230cf0"
-     "500f9d0b8c1551a59b9184862dd2ed9",
-     "04017d2029cb711e52df416c54b63a95a66602a1d15c3761d91071964e0128c91ea766b3"
-     "d409f72d9fbb5161a459c3fd7990f87d8801e71a9c66a4d4dcf199aa329e44b99f80640f"
-     "c760fa7326f29c273aa13b153df5277feb3c049e407630173fdc9f735d7aee4e10",
-     "0575aade2692534b5a1a17d36c36973d24dc501c75c3b0b497a3d2fec80c67be7107988e"
-     "47199d4863044fe9176762497b5aff3",
-     "024c6004fa92cad446b8339917f517f04d22db47b3f9bdb83d863dadb5431866ce21b13e"
-     "780495bd66152ab33eeff8830cf8538",
-     "034aa568aca7be851d276d2235e42b6624df1cce2b97f6413dd3fc506f0f18483f95f911"
-     "feb0eb220415ac593f2c93dca0808fb"},
-    {NID_sect409k1, NID_sha512,
-     "5411708381a65bef4381c9e13a04cdd5ba0c15829f7f25ccadf695f635384d8e4704cb56"
-     "2741747831b33852567f42fedbd190d2980f1bc921ce01c17d659d4bdd7eb787b3927fce"
-     "e659dd3b65132496c687f2249272a473d46326e66b3cb78dafbb522390162c168f73bdec"
-     "88adb145e6afecd561979846ea4c8cee38dc1686",
-     "0673b3a2985c95904732632e5d988d8d437a60db13215bb6aa880b348f011c609a1e8604"
-     "61427a8cf0d622abc47f910f5c97ffa",
-     "0400c4f1c0cdc44d867ed38d093eb967bfe285df897868c83ffcc0c53463e3852a1b2039"
-     "506d9508bf01d0d79ae537e42fa2070a5e00c2bd9343041c2c4100c5d795ef355c796a6e"
-     "a7954cd729e11063b14a27fc2c3a9ffdb3647613b44238eee17d9cc49e8c5dfbe0",
-     "019a9509f5f6d947532638a3c80782b556c553edaee9ade91e457f7b5d2c9055572fb116"
-     "f52cf4d3a2a0eca72fcb32b2f58e952",
-     "02def440e968d17d9904c5640619af2f447f74b7c067537db4a15be87df4fe68f4489704"
-     "7fa8af146462ceed4beae36d54e1aaa",
-     "013d5b00fef639c556d66420090c2cab1edc57b7257dc35addd62a5337300e94ea7ee116"
-     "e06b744da1b575d90da81e8ae2cd424"},
-    {NID_sect409k1, NID_sha512,
-     "23757fa60fcabf543e603d8b31ef0cc99b3ed16b4816a84e01dbfc858872fcb79fd03d2f"
-     "8a1d4f28c25dc42a39e20c34f81ebccda1682ee9bd22fe323e7f8ea90cf4a2a6ebb634cd"
-     "1153cdc35f7306f28a2efd822bf23131baa1543d0ed5ab4c8168d3199983fbee117085f9"
-     "0550ec3ffa2b06070d3add1d707fc2593285ff58",
-     "00db7dcac414010b816236cad584dabeaec1da76c97182d1b62f87bb7fe2946a64d10430"
-     "571b2b29ccf2ef72c969a9f045f1f3b",
-     "0401f2a6cbb9c1fabc8db2848c74d918312267888d822b7dfd1634a543dcca4be7c99723"
-     "9f6281d1d8b5da9adc694706b7b19cfb0c01bde57a2ac15f4e6b26a373a624588a3379c8"
-     "eec758f3c68695e2eb1856075d90085f43283d982526c5e57913cca5e2b4169f8f",
-     "05a3d856ad1d6164993cc59e70f8551e2408da92c7e6cd52df51b37dc22e9ebc42fbe6b8"
-     "3c332eedffd4086a382056175ad7009",
-     "0489b0344ae4278a0376dcc64ef9ba8595bc2fd62ad22d42fb431d2863d8ca353cd9e59d"
-     "e4ac10108fc247d6ee9ef643f6bdb3f",
-     "06aa27335e15dc910515385764387798cd4a9b4cd6d99d7c42e07fc04e2bfedf8dfaa7bd"
-     "a396f88253357d3e2545e895d9aa3b8"},
-    {NID_sect409k1, NID_sha512,
-     "b976314d2f066f8893307a726f450dcf2cf865c170e90e6908ce9787eec48e1e2119a731"
-     "b2bec3c12fd4e6282a393774251bcaef91af6ce57c63a8b45bedd72ab862cd169b7c84b8"
-     "f6a72084ff823a96f2f8eff3483a7ebfabdabf0998377c5a6836d88135cf61c65a0ca7ca"
-     "57727da68047dc635c17ad13731035fe9a6402af",
-     "04717efef16e1ae267e155aa1daabafc68515aa391dfeb73c13d01f3132bd22c984228dd"
-     "dc4dff4c39979e7585acd3f730cfcfa",
-     "0401526c58a3de46c95cb0527869f7d637f9441cb5504e6a01f339907c6df3d079361a41"
-     "571cf0a0f11996028a41682dab5decf78601581903be8a19bf8bde1d89bee0d436f061ca"
-     "1a3ddded4b7793fbc32ff852671103f34e16d469eacdbfa457643d1b18dd1c4107",
-     "05c846bf61c068b421efc472469ab1ff8d9f34847ae0065ba6f4a000be53727b3fcf97a7"
-     "80362566e13ebab84b9ed5f0cbbc225",
-     "00aa138e742ae81eafa820632f31e87bdcfce6b909d85805e46d87d1cdb8b968907470c7"
-     "ef5806accbf6245628c70d264fdd95d",
-     "04df507115384327f7b8311dfd1227c19a6124cb9bb5901bed45d8d5ca45db0903f53e7b"
-     "bf136350e66bf2b4f3d978f8bc546a5"},
-    {NID_sect571k1, NID_sha224,
-     "964ad0b5acc1c4db6674e86035139f179a9d5ec711b5bae57d2988456bb136d3aade7ac9"
-     "ef10813e651ae4b9602308b071d75a934a6c012eb90c5eb9b2947b50fc97b1d36c5bf9eb"
-     "13a7b06c94212c3dcdab402a563262298defff62b836ead1f78f9d20713710fb48115cc5"
-     "045ba15140fbb4bdf516e4150d830d02cf30963d",
-     "19cf4f4d06825499949f9e0b442586fe1bfe3459813a2b92cd8de0f775a4735e02655702"
-     "ead8e60824180761808d9e816d60bdb0238e1e8039ca7bb63c92e1cf8433ef447e64ead",
-     "04007b9cb1728cba80367b62872a986e4fc7f90f269453634d9946f79b1fedf42ca67af9"
-     "3e97ee0601bb3166e85357e8b044e39dcc19e608eaaa8a0066ffc48aa480c0e1e8d5569c"
-     "bf0580858ab9223c2b2ea58df506d703d64b387a78ef43846894e7a2e47c02252bd2c1e3"
-     "d21ada7c21d50a08cef0f9a189c4e850c058cc57c37918251b5aaaff2321d7355b6b5556"
-     "44",
-     "0726d5e317f888dddc94c73acb14b320ff509908052868f8c6b14e531ca467c1f7c82874"
-     "76674efd0d636ca94c24a69d15210bb43a368a11d3453d69ca80430cbfb8b6e45d8f21a",
-     "04ec6205bdd8f7eab414110ed620dd3fbbda4cb3ad9e5559a114ca9344782847621961a3"
-     "577cbbe43d94eff6ffc8dd7dd09c049239f026a928301ffcddcc910bf196853edc86d31",
-     "16535b1af98a75b9bc0f122ca3ce23a01800fa33b43584a94fd8a8d6f40077eb739f07c9"
-     "f0e179a157a28023735fc8da2e2ebbee5f7308925900e657fae7c3b321f14fc45346f89"},
-    {NID_sect571k1, NID_sha224,
-     "baddec4794effa668cde267016dda67bc70b847919a9aa595f93ba9dc27354399ef7a607"
-     "fbead31e57a8ce698beabb10f313d393980425e67cf95be45d512f00e950c0c5409573dd"
-     "c3d556f23daf056259ee8914e860562a674311452fed780b3e0317a7fe93baa81fb98df3"
-     "ae4328b28ad0ac8f8ea33efe24faee658ad026f6",
-     "098521a732e72ed945a549afc92318fef7156ed1d1ed9bab93b581478cb2339eb32bcef7"
-     "05c9bf61cf2873ddbadff8ff3806740a2e30ce67d1807a8179dfd5d952e6f8a583baf81",
-     "0401e09410bf4f84d53a2abf8d106fc64e643edefaea263dc98c308aea16ec75f083b3e6"
-     "b442ab261226c59ca5fa622db68f5cb5f2d1d465b01d0048554b0ccbf67c0aaf934d2365"
-     "f60361e5b43d313a62c7b3897c7db8a42116127138a1009f0bf9892981fb4fd6ae231b89"
-     "40e7509f96e2a49285143010dfb4516ff810a91a4d9d2974c522ff343e93e8aad00aaa78"
-     "b9",
-     "128056de96666acd09b93c5db7ba1b8fabf57251ec480d42b702940b5847d2a59b04eb51"
-     "01bb3990c3ae2a41181f19a2afcf08424f8b922a95df6b292b1856dc4a9dbb1c717ba5d",
-     "163483a7e0d1012695ce0c113ec8fae3694bccd40fc038d4038f81bd39e71c969cc7f0af"
-     "8313a9fdd3d028ab24a43279569dcba73fd78ad74897964ae715928b1cf7fcb779b12af",
-     "10aac6929432a6bc7e12ffa86e4d2421e0535fc44a1160fcfbee477c29a987e783a7f753"
-     "eb2278ce08954c7e90284d2ce7c42de103a9c59d8e4c459b457688ad515cf156cfc56f8"},
-    {NID_sect571k1, NID_sha224,
-     "7ef7138fc657492d229054f8a50dcafcfcd1dc06f1c16640af3f658907e2969248b54416"
-     "066eb119adbfa23b8dc578aef18bba79610b9cc109394b900a25e55a779230bb858b2ddd"
-     "9499a7775d392328db9177aa9571c2f61dd52010b48502154e914a0c55a54edcc04a6713"
-     "cf7bda8744a893926118b09df877d1a4f3d95e8c",
-     "0336fb21549e397a190beac38a1ee10f0551952da15f71e11dfda415e5ee08da2356f114"
-     "d450c661f52b2b32cfc7b9be61732672691a079f0927989b7e9f4efe6095a242155b641",
-     "040316800fa2d8f8f3f9aa87ffb628dd7b2f63d4d8389ee86ed41bd4c3eecd3f3836ba92"
-     "e2ff7ee5626213f9ddb41b43561c5dc0bcc3df0a872e4b8026c09c7b52b89b4975a43f60"
-     "b00207f956df58f75286232967dc1d3e6507634f45c0014c48b42868fecce5b9434463ab"
-     "fcd2b3722a7f5ed25607270148466f6ffad6a8c86e538640ece80e84f7368d33c68807fe"
-     "d6",
-     "1517b3524b6d43dcf3964f7c35c89bf14dd1542c37606452e2035ff0bd0cd1edd6d7b801"
-     "ecb1f573e957131c0b3f30d5006f6e4748a11b9db10fad41961f4ae53e848c6dc6e1a52",
-     "1ffd4865dae7387ed797c5ffe58a929cffeab521e48284bd7d4427d5856e9d2582b91363"
-     "f1d353a0ab1aabfc132a778a516d4033c64cbc991d724115d72ff8e94ab4f95a9514843",
-     "10f010aaf1bb714042fb8cf06a9501dfd1ffa598d6b3e68e7addefe00e18f3a5db8414d6"
-     "25e374d9ae70bea43b57c6be4a590c28e50a548cdb2e30dd9d6e3ed1d9cdada9f8b0049"},
-    {NID_sect571k1, NID_sha224,
-     "d58e1ff1d49a471d0567ecf8f29173dab5fe5f6184ab4cdd095c231fa7b82551f99a4829"
-     "94a46c3d8ebc07297fc9e952a5dee7d5f199b119f6f8b250f8fba45701ac252db725e75c"
-     "4da27ad77d59a4eac448e54a277986740dfee6596811e59afc9755e53d24b826c09e497e"
-     "29e69a22bbc85be11763064e9ecad7ae66458ca0",
-     "0e287ebfd9ba294128cbd484fc5121d271cd33e685bb1804f09b40aaacf64b5a9f2cde9b"
-     "30a4a02d3a9bda97d92f46bb8787b3c61f280b1e1a0680f1f0679d3bb34d53725d62e52",
-     "04052903a7afc17cce078b4b658766a67f2f75ac04e296757fd762fc05d6a7b4e4151598"
-     "a872eb4618efcd06c43cdc3e54f437c0ef1b091ab5e4927d3ab4227fb24d4413e0327abb"
-     "840385e808bee8dad1a1b84d644aa29fec324dac2242709421479fa7a712d18b54db5977"
-     "8724ccaf4e51a27da090c6dd0b7967024db0a8684944b77295c9624ce3aba24ff48c86ac"
-     "85",
-     "15e8cb22e371965801d99407d96200015ba58fd7eaea52c03269d8a374fc7aef17fbfd44"
-     "80d29b781292e179936a68ed175802f34043018ed1d6b5a4df667d859cd2ae53ed3cfcf",
-     "0d3a57af73b7504ef18c03ed2c52aefe1d1a3f0e27f78c11d45e9825647d5ff6e97af51a"
-     "5e366e52e01e5e832e4264a1d5b6967cd9debda59c955568e4c8bf804d843a49a0c5401",
-     "064fd7ecf4470f07b4df3b3046041e49f310a463210571606f00a1915c5220a27bb7a28c"
-     "d0bcdbe374651aac06d4d9e017e31879b7819301eabfe3a7afe4b53f75ccc465815b4cb"},
-    {NID_sect571k1, NID_sha224,
-     "4949ba765c14c31f68ee0ca26bb42ba2edee63537de4a6f5c42bbd862c21288d6ff48145"
-     "260365193c6fd2b56dfb014da26b8a483776b717c6874f627c9a622154b824565b23e178"
-     "240f53ee9748c45759ba5c035b584df0f09504e95eb9bce0301653aadb860bb25e6ea6b9"
-     "606e0ec3bdb8089e6aa0d5763d331757490715f9",
-     "149de496fa8f88b2741864d0c35b3df666b87179b7bd06cd426a45f13bc87ea9f50dea85"
-     "e1fd02a532630e0e3a231cc3e7fbb7c7ba85b40cff1124e72c677c6a3ea6aa40ffc64b7",
-     "0400bb610e4308e229e4b4ddddff5c4633ef2ab40bf74514433bd068c7d59a6260ac7936"
-     "6dcdc039d5585e660a4cbee990a2cb55a99ea3d26dd9df856b0f3ee5b968bcc349240a9a"
-     "2d03e3ef4be63fde6ca09f12f8220e1d9b5016f267ca5aa09a2dca8a0e0feda9647fe0e1"
-     "f7ecae7147a10ff893f69a4f74172c6e9a62f0c5bd96d49b47379c9c84f5ef8e59dea104"
-     "bb",
-     "1cffdb963c2c8b8609809e998075299776b44d2808df509773f310124b5f318d7431f1ef"
-     "8b38fac5cd5580348abc41e6e6396767f4780656361dc9a71dcc8e7c9239d6eec5cdb94",
-     "0982b9989c92e1a5d25dce832bd8a3f602f0eaea69abcfda285cb3841fe3f019503e6faf"
-     "8a693712380a48a6af8844b6bd718f0edf3b57662a4fe82ee28d036ecc4cfc7310871c0",
-     "1678bec58d69def3fe35a64810b27fd06bc29d165593990f6f42c4c7676fd5d4a965fc92"
-     "cf20ab8616c7ac7b4b308ce6290c5e8b4edf6859fd6f6f01878f2601e22acaeb5ce1f36"},
-    {NID_sect571k1, NID_sha224,
-     "5bc63e5c50b1650f0ed4a599960f1e4e11f6c151b2123fd71d9e3c44662312a74b685429"
-     "0628e20b30eaba81555acb2fb49b640bdab2528619c7fcad0f2a2880c7ea232d427d7c93"
-     "5fba2313370fda8863a7e7e203d63ea15d0cfa083e716ce6068c63fa616ddc225c9e413e"
-     "694cdf6b355cb1293af5d6cdea51168f5634e878",
-     "17605d7c5873d870462375d741b4bc6375f3d47f7f5e9d998917adf2137a81e63b66917b"
-     "3dda8968930c4b850f2270eb3187fc756e2beeaa67fe0d73053e6cc0ff0004a21250551",
-     "0400d8ac3e76c25cdf4902426569763f4ae0638ebb1fbcee6e12a4e0b89d6d451cf420d1"
-     "0441a0a9984710dcac13bfd7ba70370afdfb58e2d982ac367e178f6834b4cd2d232e7f24"
-     "6e012b5fd5b686e58df08b695fc333937eafad6006be5a7bfb1426206102a79bc32fd9ef"
-     "46e19869448fed0e917fe059b76c8b5a9c403c3921ad07e6c19ca7bbfeff5491b22f8bb9"
-     "61",
-     "09179b3ea906137dcdbb97b27f3690bbe3bc4f1f57c46ed60b8503cae97602717a0724e0"
-     "55a5c52199ae3f08f1586b87fbbe514667d2eef2fe44092f3c916976c7b71eed67e8fb5",
-     "05b28342703c83ec2df898458fea6f71030e4e9c567d140ab09cc95df29ccfe199837cd5"
-     "8ed00d07241988bf3c863504d065ebbeb8ed11cdcb02da0a945ff38ca58d629f76832f1",
-     "01442a5606791569749b5a9f20ba8eaaedd1a2ceaab2ef55d5d41271ba23f6a5b6a33c76"
-     "763fc99b291b07283122596a3331fcc9ac038447f3e0cb54872c140300fea65d7809191"},
-    {NID_sect571k1, NID_sha224,
-     "610f6633718e49d232b3798654095e2efa0de11f41258b27aa01956480c870d901efa77e"
-     "109d5f95f1f5101d3c90fc51312d9b3019d2e42e0067eed7b457dc7fbe5466923b62c83d"
-     "7347e4dada571b57813bb9c21d5e308519b8eedb7a7706508ad04aa69698e03636eb30fd"
-     "9fb363ef3a185756494ee01175b16847f5b68076",
-     "09214dc2da0967912c31995cb8f5bcf4bfa832c5a2d3610f3a9857e5eee7c77100d599d9"
-     "ed003b4106013155dffd6c48859b846e45e0ddbc5fe24f4891c9b2df51407e9cddbd974",
-     "04064376a92c1227c1c479260c7497147760c103bfa5be95ca1593f29a851daf2e5c3a5c"
-     "73c1fe3e6e2506fcea710254ab5eb2daf8aaefc19cbce7b1c4afbaa2fcda1ef85750fc0a"
-     "3e070638482e5c7c17a82980b863cde11294c0df717bfa4b9f884cbbbbf80a64dd2cc7c7"
-     "d89ed21e10561260d372da2fb726de71863f0f60e8ad0fa5e74fb5d29bae0cbe8ad6b32f"
-     "6b",
-     "0621176102c6ebc2c810eabab9f60feb71083c07751c66f719370713ec2de9ee3957bba8"
-     "d768b076885db1f226a9d37588abf1b141d81b70f0af711c52edd30e92e34a1d3ed214f",
-     "1a21d460ae85d0703b4b10a2f77547e45135048ffea590ce86e0a1c049f8a4aa7b395f72"
-     "3b7480cc84e33f4772df8f181f3919f3c0b0b4f276b0f855174103a2f7bd757584425cf",
-     "0b56bbdf6e2be1b9e754f9b48b3ba9a13403c17c5cfcc4910112704aceea9a34209df406"
-     "ee40e0a10cbc26d03839f95e775e80ec5e29b156fa277a5ac68abd99c7005ea6ba2695b"},
-    {NID_sect571k1, NID_sha224,
-     "c548f0546cee0c0400401cd540a0aa9377f27ac64492e6baaf38e794db4df83e64ca3d83"
-     "b67bbb46a6c269c04c2725287cce0dee984a0d468c9ce495a7e554a6835d72c7493bfe88"
-     "dbd5a044a148c89001b8087fb03e57c2b7212d0b175d616333a9affd8a1802dd49ba9be3"
-     "ab6c6d9f99a5578d26cc4707a5860c6c804d69ce",
-     "042f2682e9ac8b76f3c0880e12c292524601dce9ea6982dcf68bfdb0d3fbfb50dc9229e5"
-     "4149ef09b95bbf624eb04ce1427077f30d8536be9f69970ddb449ca22ab8368d2689ed4",
-     "040116135b273ef876453b9c4c39e4be5a815874857f4a72602f0d03b4ecd9a4ad73b906"
-     "00c71111e317df0782fc92e6ce2b194c204340bc11e68cc22ced38e99f90dbaf0f917e97"
-     "0d036dfa65a6e9d0ba521ade7daa2f6b01e1d14fbe7b5abd29ae71c4eff66c390914bf46"
-     "f09f4ab8a06dc0fad6fa257a85f993d6829b5e0add5086b8fe2ecb8027d08eec1bea981c"
-     "c4",
-     "0bf116711b31ca347d41a6cee5aa13a74e042ffbf79d2ae9448598e6950d721b3773ae6f"
-     "25d7b49ca9dbcd62feb011d5d556bb9f8a55a7acc9a3a166a4169351bc31a293db68eed",
-     "11dcb7f4103e814439df22764f776a74aa86ce9717585712b224803f0ff193d5f541d941"
-     "42812c726b75e8c2c37f2a4c33db6af118af73d3ec4fda49cfc911fef1eda9a470ff200",
-     "15fa4ada3a6e95164aa8972f14ab7572a3b898feb6cde160b8f25094f67343d35e6efdfa"
-     "b18793f77e09e5a42f56bae747b2b66fa9fe1e4a97e5e05ca743c058b1024cc848393b8"},
-    {NID_sect571k1, NID_sha224,
-     "9431c6c5237f6b4b35682a0c32f68752035c8b295a1763c5dbdfd73466cea64a00ecc113"
-     "56d02d2a9211dc54548f5db1651e4471898402c887fbf45005a3bda271df0158c98319d4"
-     "d6751b8ca6b07100182957d5fe0d97c4e2294406f83e9afcae4850bb089f2252490417b5"
-     "afd8f07f4c795fa84c9c7cdcce26bd97273c0072",
-     "17ed9a9c75cf66528428e85b0f019e3488af8b893b12023ff1b4ca9c3691b74e594539af"
-     "a0f4d7c3863d15399b862f15e27bb077392d6bbd546ddfd46728c75177338466eb2f4ff",
-     "040760779389124c702686d8d7c25dccfa74fb333317bdb414965d2c271ca5e687c4cca5"
-     "7e6f6149e1714551761abd4d651e7b04451d8be8e58c0c9e361fe0c6771e3d547d6ac3e8"
-     "cd052d5725d14b9aef93b83d638377f5a19e3cd6e3584121fdfc2c3ba1a588491d7e9892"
-     "be081c9e7585a15b37a9cd4c204054dadf06a9f4ebe98f95f6554941982faf109c2af98c"
-     "65",
-     "104ba3049a642d9b49c4302e9173a9efaf215b67e060c5e9673521641c9c2a5b14bad25a"
-     "448e46faf73810979a3a50104ec8c5230a909ae588213161fbc10381d7c75b35c84046e",
-     "1bf3e89fb0beb1ab854a5513278dbd8b9c6b05c94ab67145ceb1ffcd93d1a2aa374db46e"
-     "f327043518a7f272b957dbbf9d6cbd6708f4c89f05865932b7e816b12a59647d972f6e5",
-     "13a8c121c9c170b244ae3a55aa2d53f4ae5af91b1f72c066207e3f52e44723bd4ae419d2"
-     "4821b83648cd64fa70536605912a5a9319dc446a6b2b639cb99ed2485271acafc2bc988"},
-    {NID_sect571k1, NID_sha224,
-     "417cd5f60416f17081d2c70e9a510114e08be83573bf9deae75fbc3095dffc8a7f7325f6"
-     "1f9d6565381710eda871388cb17619e4448836076338ee309a2bba5f737319002e259b4a"
-     "875cce1bb97996101c9a7abe0278dcac203a712f0809eb3c4b85a9c380550ab0bbc5067a"
-     "8edfa78abf03c09b5c08f21714e1022ebfcada4a",
-     "1bcc09b3f2f1d26ab9955bff7e8c0f85c8a61293511a196b53d7963f4a4503849c96fb4d"
-     "aa68c9852ad9185e01a35f0bf298e34a09ec352cb6da34f89a1f23e8ea27712a8f43aa7",
-     "0401326341764a4aea222e7413a4a6f7bdc0c35ba246e3c68728ce06bdb19f2e1b9102ad"
-     "d88a8511130ff48c0cbe4012ab52de93329670a319f6b1e7e7dbf177667d4a98d3891ec1"
-     "4707a4aaa73713bf8fb3907d49e5653cf82a9587518c2f8269cd1e556a3be3589dad4c23"
-     "8e4c80681e141be93c318f0efddee3e378cd46512d778b9033dc8706bb843a3c3546e76e"
-     "4a",
-     "13412a98a2c14a9672ecd42db9c079a689b147ad91869c3d45a7046aa9dfd3f31edb43ce"
-     "6b84e9edcd7e3ac6b96d89f13878cf5befb052a6f8a4e5577bdf916adb10d908d5e99b0",
-     "11c8a92044a30be397007a71d9af3e4222556a10f3a07a1521c1bcef73b4ddb94fefdebb"
-     "a5944d5bd91313560718a8f520bb5cd5666539756a5e9b66a1b2d18fde5ae72e61d584c",
-     "1ea510e23ccc7596db529dfbea78c99fc78ae53da32ad7c7bdb1df01039310988ea60182"
-     "8fdfc59a0cd237110cfee9de8711c073be44dd4d04bca4b1cbec278b1a9ef175d93f70e"},
-    {NID_sect571k1, NID_sha224,
-     "eced8c412a153a643ccd69596389f83b6a36880286f8aeede503452bef8305942d95734f"
-     "b5733f37ffeceb1c2dae7b1396c3323de11089082745c28a1756f784423fa7ad68bbfbf0"
-     "d93ff8b7ad62220500df6d6895788402c1f5c69c06dd9ef55e2401cf297184e411be87c1"
-     "bba657f847208c0e750f94a3df92f253b377b4da",
-     "0ec52fc3d9c272ca80623e06b15c35f349b13548ef7ee400bbfa04196850b3b8cc7b2392"
-     "38c827f9b0a3160cd97969ce21d66752791f5896e0385b0527d4d77e4b9fc70f04d73b2",
-     "0405cd2e63dcd48fc793c18776d030398dfe3f8b6978eec6d23f49240581fe1e141f6674"
-     "98421f4c40a9430587fa282441a78bb641894cb79d929c299f1aede218a0078c247f7402"
-     "5200cd2843ca87d98f6336c0adb97bbb9c5293a03e5b86d5534e2849ebbd73dff837ffa4"
-     "88fad7d134908234d0d7fdac8c7fafb4729ecf0516c42995fc9337f60db2f36eeac69a4e"
-     "42",
-     "1c40a15fca0c959852afcb4ca6cbcc99fb680950c64ba18ae5388bf783052b6ef3730b1f"
-     "b1487189ad983b6a68bcfbb707466092da52ea8893d8bc4898eb133fd771e78379b9c13",
-     "14485cb1caf1527350587d6695ee3df2b21c13084df0c093ca5109d7c192e7e5df2232ed"
-     "e11dbe5ff2f46b13dc2dedb709a0fc1641c1f32857040147599d8f179fea6b2f2417646",
-     "1a16ebf12c11d2d0a64b7ea124623ffdfe2650fc9603ded571e76dbd7e3b27cd32fcb709"
-     "e2ba04aee0e8e1b942a4e829cd0c9683aee67eec27d4244a2cefc36f84f7de209e22a62"},
-    {NID_sect571k1, NID_sha224,
-     "30e83ea39a92036e22b7bed7639eab5e5be1d00c20b4a9b9afa9a0d1653369cbef363c11"
-     "9cc6f921c8f84663949c8b8dc9b743ac2b1861a480476e9b64c8f333f34b6fa0e1ddf09d"
-     "49618ee4f3c1f46751b5595f0aea413d4ca46f3c26b974b112cbe99c813a96a4423764c0"
-     "69454946f213c5f066ec38108f947abeeeb02fb8",
-     "06403de7627de22d1dcf6b8da5af62f9ec59ec065cc1ca1311bb98aa439a6d5985619b17"
-     "c17a70f59e17cf180ea6828ef57f5f1f8ef05680a9fc12ab7faad5af61e4e11fb45d341",
-     "0405575c329d73f261ab6897153d7261f87e9730eb5dad49c05d782cb02e483fac4a9ddf"
-     "f31d2fb695a62cdc44edef6398be8f4f84aea1d63d0b3a771fe91889dfac4780063d2583"
-     "250183e63ee783abbd00547567bb99e9b578ad8ce63d229db41c6877534487568c423d4c"
-     "389154af9627708d8d8f863597bc668e88f9412b21a6696d07bba06fe7aef93b26950c69"
-     "ed",
-     "0e751a4918643ba3e68bd9406a4386e876d0d66342aefb4ef75bc4dcb8cb2e2d9f8378bd"
-     "02c388c776535ba85d24b206f5bef4b2f23a1c99fe2f2e8ea201009ca468e5b2e21dcda",
-     "0ad6792fdff4c621219549834cf03808645171d944088f5a6d3cf1bd826b5588544a32f2"
-     "31e8428a03ec02d6c1c1243fb6b79b1cc6d732be5be8f2cedf03c1e5588822eec559b7c",
-     "178b64bc5f9fcedab17822e831fa52d49ed10afef1c5912893df4bd8dc960b474ed25883"
-     "ddc343341b696fdebd06e177f234ea45553cc83920a8c799ada2deccf1ddf1dd9aed863"},
-    {NID_sect571k1, NID_sha224,
-     "3ed244dc16a5cb292db4b1433b0ca3226913f07377faa20c6c1402cb4d026de808ca74a6"
-     "d4ecdd7c4e662105bff6edb9fae0117c50aa053aef677c0750c7a446edbb879110030758"
-     "912e8fa666489d702d8fceb719963b24a256429bbcc869a1f4ab9de9db89263e3684d4da"
-     "a1df2ed94bb59dde2abba63793e5f82aa2e4db83",
-     "01fb980aef64254aeb9bb613ff2fc6967503db4bc1f337882f1566cbeb57489cf32e34f3"
-     "10549f41cba1b951f487453c29753a184e33330e90d4b973d2e406c99a239a5c3f96233",
-     "04036ea761ccc71ba55aeab229aaf874a7c2d1ec15d821401e2988dccf02798c4e7bea80"
-     "d9fb8d30be213fc80475a17f45d60c53249b66858d29c73e73117162934dd71096d74674"
-     "2e049bc28f4d45d29c3560915698d03271028f56c29f0ead0608cb72dd0b62490f95bbd6"
-     "7145a6c0adff0d6ef396b4deea6a5e2a33f242bf17e907b136c039c127d6012c88b76aab"
-     "3d",
-     "0ed404ee6b59ffc445b16f11b9b1471249443f8a7309ad8a662b7cb44c94866828c906fd"
-     "64784c699cd29d3d972e5db3d42157452630f14536eca23cbbdd1d37e199e5a586fc352",
-     "1056938496df511d745f2cb88acad279ec2d58bb36498fcd8139d426d596de6d145b765a"
-     "5b3e8366845fceae91d14075356a32515134e577937ce2af7e732b4e89a9164d083adaa",
-     "0d5156c776f2184babd69c1f200b8bd94289d45a2f8b7cd8e8afb1455e8901d8c3ed14b7"
-     "a23b0976b85a22b86f3ccff4ae91e286f696f39646188b675895684f33f0368098fa7ca"},
-    {NID_sect571k1, NID_sha224,
-     "40343935d9423ad30f3fb1832bb08a5d20ddb3a55b59057cd275320db4a5835471c96cfb"
-     "7d67f41ef860cf5879897b8dcf307bd1a52a6226847b768ea38ff1858f59e64cd635b51e"
-     "6863773cc6c64b363ec47ca39266422406264668415c189e2f92447ac4c63ee5d74e95d1"
-     "e6af05016917ad237f482ea0b02aecadd370a8bb",
-     "1d96dc09dfaf602789c1dffa5c9ba130832badcf180429660daadf4cf1be5cca92fe9713"
-     "173861670eebfe3a0ba25bcc76aecac60a756f07b69687e05c7e25984a39556469f62b4",
-     "040452b1cd70e3c88bec1fd0e4b8f8e9bd5f844ffc12f3d6769eeb1c9ea90e5996199086"
-     "82eb5e43b1d6eea63ba9353fb64b59d6549d19cd95f2f54156c81fba53aa0dc91244e7ab"
-     "8b020926ca366dc657d133f0ff9149738738ce68f3cc2f61dad590e2502e8fea714b8954"
-     "3f43d97b46b7075c58375efa379cde208ce769a16be9a377a111a8ac51459840a223f346"
-     "95",
-     "1dfd064dbe64c25a832faea1819cd836d22583fc40b2ecbc19b1f5173c25f33ca8cb7f30"
-     "bcd619ef73a4c14c46e610c8996059612728f508bf7db7ab3191ad61955e8b1ba409692",
-     "03cbb0ae5f7c0978ad8c10c4ff099767465ed6fefb7358f3eb58a79366707107cc88b305"
-     "661526f2972bd16923375dd898ae72e81f290b86cf9a4dec086d7ef04d7a7bba5087f8e",
-     "09f77a86f0da4e35c395978603cbb9c4dcccf126b7cc924cf62732593bb1aff0dabb6d58"
-     "321debad4410dbfa1fb8fe249bfc336db7669e4ee13485ccf8dbde01ca4cdb9acfe5e74"},
-    {NID_sect571k1, NID_sha224,
-     "274567f8841183e68c4f6c6b36c5a52fb0e88492e4076b9cd768bf571facf39dad6affeb"
-     "68941ee326ee461ce1f33c26e4bfb3c9e0cae8241fbcc14cc69c1af68701fd0be3def1e8"
-     "7b7d52b682ebbe1cc225c1bd177b0886e3698a06d0e410a1f92c9bdf7239189f6acde0d0"
-     "653815a72987671b415d1e8a70e685d6e5b14c33",
-     "09d98b32c8eacd135ffb8e13223690ef02c0c1f29ea8b4da193502c8cb3f39f9eed608c0"
-     "2fd457f2fb685ec4595e8fc8f388d26778d225d2b18c9bc8b199d8b65c0d1a6af33854a",
-     "040775560724ab7d98407e20af12b03634a757037f8b3854957e11900d58460ca20d93ef"
-     "06436921f8d4481ff9123a9eff3973e17d441511df3cd88d0d6dfc8016d2cbfb89633784"
-     "6303082aa4a81d4e6f0ffc94511327202f2baed72c08026e05a288eaaeaa36a1a4961f40"
-     "0b4712ce68778ff38be43adc2222a986ef0fecde62f861575842429816c8fc77797af018"
-     "c6",
-     "1f4acd3430931ecba5e9d986c6712467526ed94a0bfff36135da3ba7dd9870ceb38fa0b6"
-     "58dd391ce658774c6725360dc20e5ef41daa9cf52fa863840ca91053e7287ed29ac69f5",
-     "0502abe544fc3262663524cf88a5bc256b20829b7bed3e2779f559506adce3c4f3a89e18"
-     "bfd31819f78ae3809d9d0710c6591b2fc90039328678aed9df2fae38a74b66f69295d82",
-     "0b2f055248d9633cafa4db3b3cef0b76ee02f6bda3d508e19c68870e76a02c69dd1013a0"
-     "3fd741e854cb34f815432bf48138203177141be7209e957f4db1a958fcd45421a213c98"},
-    {NID_sect571k1, NID_sha256,
-     "d9c99b8da92d3c2e40dea3c4025dc37770e867c4d2746c4d726b6de24250591a586c166c"
-     "88acb8ed340e161d4c81b9d14c919a1b06f1feb22c5ce5fca2693bdaf4994ac72c8983c8"
-     "7f331473fd094eccb3d5f3528e69d487562fb5a65c150a8217192f8aabfa7adcfd0b6916"
-     "d5000248fbbddf1ca2f38e3d9ed2b388998b7cfc",
-     "04d873ac744c4f68bb044783ad69e1a733cb8b8f483f2695bbd90c4211282036ad7914a5"
-     "3b25c3e890c6824643cffbdc4138d7ff457e3fbb99387494eb5cf2bdf1ad243a3a1e644",
-     "0404644456a4e5c543af7a086640fa9ff6627c2d9f17066d255c3e805db31fb1ba895682"
-     "e94f6ab96d6ca449b0c3f76bfd6593d182f422689b31d9dc3bc0b70df210a96d19af9ec2"
-     "ac01d38f8572a06ce22c1586a8329f9421414b334352f1e8b961f7e0732ee01e838eb975"
-     "bfb2f62132bbfd9acc6ef8899b4fd388c2b59e564fc3670da7a008ca016de678d6dded13"
-     "7c",
-     "0b050aa7266201a42dbee063ae2a21398ee1d2a190de9fbbce2468836e416b3ec18d7340"
-     "c81fd2a5283713f9aba33e8cbb105eaa2abbf0b687fe2713921bcbc02a4b77df21f762f",
-     "08351115714bc8f29b84a6e3f0a23bdc219d4271a9ee18bdab54c3acc9cb3468beb1f89b"
-     "0f981da5aa7d7ec7ad451bc5e91bc98440fe20f5877a4e73614820b9ab6f2bad3e2e609",
-     "0c64baaeed68178f5a1d8f095b0932fb73f9a02462df5e8378746ecf17d05971a0a287d5"
-     "a8e0317db055b02d4f4b5864597d0f9a9cb1ae68577dcaf7db09c55bf3d3575197295c9"},
-    {NID_sect571k1, NID_sha256,
-     "d2b88a01fa17703c99e5b867c645e98feec0d6d1afaa20a97b5fce9c23f0594460142af4"
-     "e36a5739b8d26d3ba35a0263caa5429b4abba157f359fce701c43372500fd2ae1bc2ed80"
-     "bfcaf8cab7016ff93d4a27f565b7e67fe7dde22bf02c48be12114fbff2421517c825019c"
-     "0ccc72d927bef156140d7f0e9b6ee37af78c3efa",
-     "18d2eb947297a054f8a789771dd875b12b26ef057fb91235dff3b062916f85aab3365609"
-     "bd2a38a861439c8514e33f174c198139354e63766942f605107cb1b9709b782622b295a",
-     "0403f6454f1dd032a925c6bc3e1c62892c1dfaa700d3badf83f07c1185c31ea817641865"
-     "a129572f3351340fec331f5ed466db7bea3ffa9723c951b518ce6f3c9263a7bd6866c8b0"
-     "b40188877b68c10cd6ee543cc5638bf0f82db25b9327b2d81269dc61250eecb976d6568a"
-     "9df29277836b97973e3615e0a4345e610b33909c2340a23c61dcc6e2baf2bc363a333818"
-     "02",
-     "0ec6af799d92ab52c51cebda61ab642d4876f374edb17253a1de3e880048355e58367096"
-     "d3bc0402e4b93fa6a6c8d55c529b9fd68a27962c19274393ebe1bd0b1197a28125275bf",
-     "095c42b3ef01c0f9ab96693526e903ef3ccf0d843776089d15e77093fa9d010872d65cee"
-     "1801f821bcce747ddc5875eaa462b00424e6cdf0995b87c6cf33c37d4463848a6ad7fee",
-     "0c4f0edd4b2dff4f9fd1fea5addef6d483bb51c27bf5c7aa13f9482243e5ed5571bbe0a6"
-     "58543c69b731de56b6b34de27795095b3676375cb4686b45d48010fe8c941208cffded3"},
-    {NID_sect571k1, NID_sha256,
-     "a704a1428cc894f958774368979fe075353b56790555386e3b043dc6a2919b94a11c7f85"
-     "883f46b4d47b324d349c28c667bf9a000daaca1d7191f2a0fd97a4867aa9f72422134a69"
-     "0625408a9ea4b723704690b69152655f9e9dd5fa3dd94814d97dd4f13e85c3f9bca76949"
-     "1c2461fbd17e28afac00bfa81371d5039013da8c",
-     "0594fc0b7a5cc0216d2e78eeeb6394c8225de795f4b73bec48b2f4ede185ba622b59a16d"
-     "d3eedf8cf2c94f2ccd6dcd205f64c97cf1b7f1e34129e94b5129502909f43940dba0746",
-     "040271cbd3e0d73ac19b975559450d686ed67eeaab4175435b2801e8989966d7c5ba81ee"
-     "7d749e43dffa12efba820462bdb274a57d04cd7e92c180cdf555686c78aad58444d5f171"
-     "2907c407b46e93d4c2b12c967cd3e41320ea8535a2ff24372a5791fac9e95865e14d545d"
-     "d3627dcb4aad2350db248ef49469ff4d59a879a84a19d1c0e5d7ad3db432af927c88aa5d"
-     "48",
-     "1e730d50a9747c7c1ce2918fda7575bb81a74757cf9625d0f0619aab7f1eb6954dbaab74"
-     "9e573290406e599eddd7d3376dcb3fb98c116ed7b65729dd04ece3eab1d7b4bed52326c",
-     "00d59ebcfb30d7b27c87d56ec2fc9286b04b39e68dc49b395f374e19647bcc58f2fdce1c"
-     "0dc815cb2aad55cf863a4786efd6c3a0ce56c1d92aa20a19245e74550c17fdaf7a08340",
-     "134e80d63c9b328e02ebafb75eabf0fafba886f48b25206cca9086e03658ce2047c94a52"
-     "22a206c6c5a57ddb8f59c5ba1408fc56668066fef4557124c430cbd1267455e0b31a8bb"},
-    {NID_sect571k1, NID_sha256,
-     "f8a87c4acadee27a908718461e3b45060ae4ebb009b10a15926460bf219cb7e75dc3a993"
-     "fb9a741b94e2fd71615c50f6df958568f452b2cc284f0516816bc0d2e2d45f663155660a"
-     "26326f63f4aa42a6e1cc8462a2ec620a365257ec042f55e4047b62af689592a1a072553f"
-     "f174dd629a4f51837780ca232cf479a68c1ebdda",
-     "0f000631106c5851e8ae0802b01e7a8a8540b427a8a3956a1d36f0600be89318032320cc"
-     "420931d825cc964e823745c60aad3437ebc1c91d32004472e9677605fb708e5a71a0d83",
-     "04034136cc7b8e2dcade5cbb9b3d0e0857c485ee791f862273749b5d3757d072bbeccdd8"
-     "eb81c67fa6927c1aa54d823193c370fc596d0d903214d7967b905292f4b96549b3dbc9b4"
-     "7d056f69b42b29ea82b9f2fc377e874b58ee785010bb7f5814907fb5531789606810b716"
-     "13a36035cd257864e414fe0e6ea353f398745df87ccf25b3a25cce1c78f61f5039d66241"
-     "e6",
-     "009781f5d960870a289cc20f6b1af56602e5e12d9a7353e81b89a90b0a9675686f155111"
-     "57d9fb70b82e8b2e25534f8ad22e14ed518e62a88f1ae21c56d4ab7763808851762d3ec",
-     "0f3eba5ddbb8c127419fe5e8cc1aae2239bfbcd2ab43a006020b96c9e7db832fb09e0bc8"
-     "87aaf24848491d4de935b78141f426875f7dcf2937748afb303ec5eebd01b6a82a8c4df",
-     "17acc35bd81cf24f983072585ee1e096459b408da909fd82b5ea86b77154ecfbffa7fe97"
-     "271f50b67ca3c29ce704b28186b831300db0aa0dd6147d2d160e4aff14348ba76e6f711"},
-    {NID_sect571k1, NID_sha256,
-     "10b5438294a77c7e517ecfe8f8cd58d75297b14116aa93e574996ec4acb21837e6297cc0"
-     "e7e7b5861e862062f192f2206a01b1caf42c6d7181d02c7d62b76c2881f8479449b02d32"
-     "c6f792714d8f70f0c75e81c7d9abb996be87f5ad9a01fe42b75855558d5f00df392b62ae"
-     "0d258f3f67dbeaf07208952e679a2c573aca941b",
-     "1023997206341c6147c536d034a9c38b4012035dc2c9b7ef0bb9cfe65e7d788296f055d5"
-     "08a1fd957b2dc7f9eb10c27790f15f30d81670945e54a508c57b70b46b4a09f4c769289",
-     "04066bd3f503cf42a20cea4a55cab75940907f38fac7fb024c55245f02d72d80336574a7"
-     "2fb248b1b61e3205b31489ed789ee78d88e487db3f5a1cd48efa1487916b8707e72e4be7"
-     "e6010b6e4330af0270abeccf0901dad2f8f64f4993ca93a7c5281dfd71c6ec405f9a9bd7"
-     "8008fd22fef76fb79e20a571df16c4d97244c7356e3ad16cc489d3a9b2e3fdcd5f23b48e"
-     "26",
-     "09137bd8436dd126924943e8599c87f64564297117766580e6344aa3c02056c811fb996f"
-     "264ac4f8f0cb33eaed5ef8f120d43a1d2b3e5e34697765ff9db4b4683ce5c1596d74723",
-     "03b684a66e92d352847f63196181160db3de7a304b6e43679340eaa9fc828322b5b9c16a"
-     "1772c981ff0febb474488daf998d4acd867e78019b61804bb675a98cef24fdad088afcb",
-     "02649a94d2bc243e997bdf27be7d6364459c38845c3bc8d1c8b549ad4689c8a4b4fd5519"
-     "3ac769b1da607dc96458e2f6abc602bb4048cf6b0933da6785795d04d10f22e439748a8"},
-    {NID_sect571k1, NID_sha256,
-     "d83a52d43216fdb16b1b40469863ca8eff4df9fa358deccb5ffd18b3e22a9d654aedc98f"
-     "3dbdc4f5b4e56b4299e25d8a5a38d01b34eb93de382df1ae4d1c7f966e84b84c393d167a"
-     "ecc6f1192c4b42cae83748b1ee3d9147ce7de74cebd122695b455e8082f86e3e488fb0f5"
-     "1b3b7edcd579940d1cb9d045296e5e38f201b7ef",
-     "11ebf320ecf6a908ea5b868afb8e22246ce84e743e1076d6185ec65dd79043380708bf8d"
-     "a4ba802c3b93b8d15509bb7d7de9dc29f1e9fb0f0f2cb97a26698f955b1f7ef668122be",
-     "04038b2760315b0999f9629922bcdff65cfdee4938d4aab8cc3d200aa9c1db843fcbfeb9"
-     "da10afbf10280110c49f0c18f15c2aac4f39af35a79557c68eb6cf6afaab973538b98b0a"
-     "6c07da55796396e919f9b5967608af06bd01e8870354317e76bcb8597a379129e35bcb69"
-     "bbf6b38911a03c3076f7fbbe9b179e078b442c604519e330282f6f6c21aba515d6d73c02"
-     "57",
-     "1c219274e54a4c5e1e1aee3bf805a7002bbfe1c030cd4c8a1617dcea2a14b1d537a64cb0"
-     "7c5a1385edd76f3e4ea9a38e38b458d2c7bf8eb56a57fd33166bf59a8af2e9639106929",
-     "08677167a7ea1aec4de76d1c5effdb5a1655965850bd6498aaa4fb3fa50f213fa4d99caf"
-     "4145b4ba87e34797babfe614dce6ac21d9c13dd0fcd9802b1414aa92dfa18318c7e57eb",
-     "048d6161a3739fbb3ee1c223bc82a46255d10a86a605f6c8e1934b13f1a8662f30f8e95f"
-     "53848119c61f08037ee5a2440c8faa11a6b1800078ed476b2a3f4cfdb25367c8dc2989f"},
-    {NID_sect571k1, NID_sha256,
-     "eddf5553ed4db6e8ce72cbcb59fb1eb80671c884ebd68e24bd7abe98bb1f40806de646f4"
-     "d509be50a3fabfa85c5630905ce81abfad8a55f4cd80208afffb9056bc67d9dd7f4660a5"
-     "f924af2a3745eec2daec39a3fe36131fe9eea444b92d31f6a125f12125159ba095f89968"
-     "a7028549466f41ad45668a861f671050d2a6f343",
-     "0746d5c824d78f42a1fd63d8fcca61f154ba3e75788b7a0b87f53e5420e23a935b02eaf6"
-     "7bace8dd8a8e7c1caee30154c2428e0a437cf12e235f41c416f92fb54528865fd4766d1",
-     "04063645fd3810e2458d15b43287f329c354b07324c0707f19847c544f129e4de1799996"
-     "f805fab7dd356567970e10eb21d875e8ee7bbce56c666511f9b4a4cca986683e937d6f0b"
-     "3e0595485c9a7f2a97fa7f8453df13b75682931fae10f3441042199fedba91a58c105df5"
-     "7b83d2a3911a2d34a2d41e451d0d2549b0a0a65b42aca40aaa618c252baec171da7937d8"
-     "12",
-     "0674788e75eb9d5ceaadad9fae036f129178fde1a584d73cf284acae3b4cbcc208ae7a5d"
-     "35aa473f4e1201c19ee5bbe685ff9218a8e2188f3428ab45bf09b6b600fcf81fadd8d69",
-     "060d6dc42329687012a93ffc5b846b4dce3df46ad12eb61437832f81f4fcdea7392582fd"
-     "75e701e106e5b83521759da6a22a21addb63b73783592d3f29347f3d484e05c19db148e",
-     "197f3b2d4f3e10425f4cb60dd1ae84fd8c87f62a2cc822342d5f0be4f0841623227c5cb0"
-     "f8bf83fef483a061e30ecac86cea0210036083a99fa1247b49e19a7f401a815cb68ab3b"},
-    {NID_sect571k1, NID_sha256,
-     "3db94335f6d1a125309622c0a9d71bde1da09371f0285a93bd0aac255fa8f10a56074e0f"
-     "6057f1b1aecf2d86a2319590ead96a2ad1336fe844e09339b456be32374ba2e659fbe9d0"
-     "f2cdd83444d117d2ce3204ce4b4294dd05405634b84747ffb4227160c4e5c2c9da9815b0"
-     "c6d20f55705f16cdbaa13d107ae666d707ccbe6c",
-     "00670e72ac2de50dd2cdd975a6cdab10ac45e37ef7a28c685d77447051496b5e161f8b1b"
-     "93f6c7f32fce8ea05e94ed35fd7cb28c44bf51ea29cbaf5aaa31d6abca30a89430323dc",
-     "04054db4acd0815aa7ebec4f7661d80465c64f1fd4147507549352bc07dfcc6041ad309b"
-     "fb1434b60f73b3d61ebde91f849004d55257e98b6ebbbeeabe960f9429a55a36ff75c112"
-     "4e05b6f36f76b3b3c780b6a70bb8ea150e9cd6895ff6a6765a3516acbb4f5efa91434def"
-     "52dd0ab81f618ff28db10fcf39264be8e7ea76e06516335ac5ae33ba5393080f11418911"
-     "0c",
-     "0f74a0ec1a7496043d78891e308c82b4660606642ea669e4406683d44b79dd6e6a1b8102"
-     "92bcd6a9f59bcc2e590518bdf2e9224755654026d85cf2a3d9768d909278448f0d63fe3",
-     "047d808febc1065646e6a5608d62d1445d922084487a64e9ced5fafff2977eb3a7e29984"
-     "230946e3fc77a766820747122fdbbb9100c591ad7c9dd29d07efa2e8a43357e3c47762d",
-     "04dd6c8ce75bf2792ef227cd5a3102d30a9a31690ff5c21354f8dac9f826c86ebfaa0465"
-     "3f0ead103b1c8ea59f0a78f5d4e8eab597ec6c028ebcc57f4ce4103ac14579bd6e15166"},
-    {NID_sect571k1, NID_sha256,
-     "69166ba40768d0a3930325405edfd85f3272f7b8e600b0b319f070274c91f9f03d0e6ec4"
-     "bfc7b4445e91b87cecabfecf5e77c7301ee3c6b0affca2fa02c92216698705eb75443eec"
-     "c25438db2d2fb4b24f4195d6b9c05c53e0868d3e58477100607ffdc31b18c40b4ad7202b"
-     "b034e58653daec0f6b33c024d42a3fc84bd8f86b",
-     "0369a3bb96f884983c23281bcd04e24a3e5f6359f81e3c8e46f3f6b865eb6bdf98a630e9"
-     "0646275c587e41b546d3ca7688cc207afda15cf9b25cf83bd6ad27908647f3f9de59de7",
-     "0400eb02f6e741b3f83a9dc50853828b8a6e0861ffc644162515a264730c662ba388ac0d"
-     "705f8b36f5388894df5c1bbc3582c85de141abb7712caadd2d616da589bdffdd9258808a"
-     "4105dbf831f450da6f8e503c19a7788c1317ebe556a458e2bfbf3137f986c9c966a14ca9"
-     "0344be1b76457159c9d70f13af7fe0013cf605010a8a3b84bc0fe187c7d93e4cfb2639de"
-     "57",
-     "0ce22f7f2f01355280ba2d2cda06a55771e66f598bf79c65171e08a98f1d954e4beb3ec7"
-     "7ab06ee60c5fd156a7098023558e3d630641579cc179739bda6d860f8ba1d5ef717ebb2",
-     "0ae86b40d10ca45c20bdb3db55a6dc12e9b75754679eccb44c40fa57351c23c062282e1d"
-     "a9e1703176e4b8f7f224982f2474494772a20269c43a18a7a03fd12d8ebb975b83ade0f",
-     "15ff7b34c3316d9e7ee3d7b48ebf97d98453ca32f3fc67fd08761d93cf34cfa5a2314fd0"
-     "752d263c3eb7cf842aeac395d41ad3c04c1a9d3808b4fb7489e880d130c35a26b702952"},
-    {NID_sect571k1, NID_sha256,
-     "f64cb668b72f1e6dd026a478505c0eb33446ae9a2993bc7648aaed02e172fa9a0e05eeec"
-     "61e756ba246c1dad7e85d3f01baf734b1905c5bbd1b08d833c2cf1e079eca75b866d705c"
-     "407eea8618d23ebbaf269c7185984b3bd4117ecfb295ee6b47eecc8d3a78bb96552f6be3"
-     "14656f91caff793838226662c75cd7804b6bef79",
-     "026717b039df834855511815d5665ff9b654facab469390ae257b7f0eb4dfe66ea0dc037"
-     "242ed0c13bf229b8f7ff26da9b55fe4750d3451c62804aad493c179ae45d08ece5af085",
-     "040191a6d1ab9cdda2d593d5598a966efff829c04c421804c2297e658adc5c9a6092e146"
-     "b25c730ff7ee65cb9812ac9ea0c18dc6b60deda948b4b7568e8b8e14411a6969d7764652"
-     "ae03744af98387421d958b26971d21928b73bbf5b0f0ef183e9f606d0348fa715f153a60"
-     "b6c7991dcefead2ebb875d0c1dbd3665dc42a241c565ea0fb0e6349b4319c3de633883a5"
-     "16",
-     "0dcd28cdfe9028a4a6df1d41019bc58e4a1540ca94b717d258f2afe8bec560f3028e15ec"
-     "1e8bfd422415961516659fa2b006256745e85e488c359e8cbc94cd2592bbb892a19c45e",
-     "07ba5911415a3d21a3d98b400f61eb63ddda689bfff0c8c3ab83668b1e4bf8a703c853d3"
-     "585b8bdc29aa2fdc41d5e7534850f4656ec949f0a13fd18295b662c9829723e5a7fe3a1",
-     "1b027e38283d74c962fe0e7b58dfbf5e21ce1d9c91651bc98284008f44fddfe4cec94419"
-     "94e690d72a8ff3ba2b538718aa678e7de046b653403f3b7c064ee07c9c3c6d23e1b068f"},
-    {NID_sect571k1, NID_sha256,
-     "51ee0b98eb6a3e3c1afcb35a33697c048dbf61374629ac5702a57801fafbea4d6fa5a26c"
-     "9d1b79d1c58257ac0106387fab2d4a1b7f8c0dadcbe7c830613531b3c209bc17f792bdba"
-     "1c1fae1b7528aac53dc86c2094b40194577325c05d2258303a2d17c854e7449489c43991"
-     "b6877a50692a6340a528a6b188440ac0cddd4c4b",
-     "1d642f2d393ed4abea37173e4a79534af87adf534ead4a0a1c46fb047619221e3577e6b8"
-     "bcc776114d01159c736ab78af3e53feac339d7afe58be8e7a8ed290f1dad960f1b5de94",
-     "04023d1ea50229b70b46578df6904fd528e9930985426eb2f1ce10eecbc0c16583959483"
-     "80c4047d67bc4072be2a2624d62a301da41a5265f040642d1937fbbb7cbd205e1db85b86"
-     "850625c82ccff6047b1ef4b08f1913f7366c4f6c0312c21e5ab01b598d1a9618cf5c22cd"
-     "dc64a4732b477dd5c06e332b846c8015a2e5a195326bca46c29cedcc2f24d37ebdb7c2ea"
-     "ee",
-     "0c9066831d61a4192ad9de23efcaf578a5d5774960a2b3e3e292e0decaef62d1701b86ec"
-     "6183d8e17a699d418ef9d084b982c97a55bd76c8b038ac5c639451096ca4d331f070ad8",
-     "005778acb38b1961195d38463abd9c19d9e07dcd997f19676633fa3c44caa44ad1a9bd63"
-     "435f3138ad8f22a731e749a81161c5448eb462fcbcd69ec2255cc2923ac697ed319316c",
-     "1a1aa90113952608dd17dbf391ed56231ecfa7d649f3274774ed2b6034a2207c05c6d8b6"
-     "cec480ae27b58495a50b1e5b74a17ce6cf2e43aa273c2b813c0e6c79976882b7e4b1c93"},
-    {NID_sect571k1, NID_sha256,
-     "feee50aeacaccb6b1c3d95c6524044edb78322ee836d8159c4a4c2cc6982480567c4c6cc"
-     "4806a564876622266e1ebd45f2f4be851b79da025bd57d0e6acce1ec1c8c255eb89713a1"
-     "e4897d4ee0f7a248b9d4bd3ad5dc0e57f60ebfb65691e164bc908956a019083e923cfd33"
-     "dcf37c735af3462768a1e14a8051d7aee74d5228",
-     "08cb70be29e83f697a3e2f67d86f1c1ec9a163b5335cb4a06004b6634948bf60b8ad9df9"
-     "b27d2bedc4975265ce44a7884e57082d521320ca4372d38fc77b18d3fa05ad8aa5c43d6",
-     "0404c042bde9e90b38b48e60551d832a7c80377a81e8c5b010d0e491cf765c432b5edb07"
-     "71aaa5f672edf3ba108dc71459d245ad60f3884b8cf33f8cf797f36b20e4be39c8389e66"
-     "b4075f2454c41c0323ee1a640755077d36a65be7c2a014db36719ec217e21a9c004bae5b"
-     "efb499bf6be67e82d3da70475abf9dfb751c84c409fe838cf1c6ae109d27f24d75c02cc5"
-     "b3",
-     "186f16dfdd7a71f20a5e634ffc465356914bb52286d3d5ac00f3ebc02497112fcd592e1e"
-     "cb2ebbc819e07ea092e465e66f3e58da7a2ddd41c8787f57c135ba4c168539b4743c3a5",
-     "1c2140d294fafe3d9effb33ce73bb7e5485c93c7aa9d33b7535c7053831a1dbe79075713"
-     "794c87e52bc887ded969d2dfa6a1e2630cff96760310e04cd2a75be6fa020a12fc84d3b",
-     "110aa165707b7de1b3a8e05e4502701abb5ade0a27deb04fd93c6eb24ed2b67ade6c49d7"
-     "8e874d25247e948f704d3c5b925f84c5b07c9b289c4f8507e75d0f8927c6dad6dbce885"},
-    {NID_sect571k1, NID_sha256,
-     "b115f7370d6a93a90fd9dfdfb292956be34b61992ce1fa5627c5e928d74bcdeea66d4040"
-     "c473306a0070fa8363c4303bea32f73ea3639b5c6676fa5a1d68a2cc1f91f00580d7453a"
-     "23ae70af4cb1f1657aa82c5b305374effe5d67d559e46a6cee6360503d21070506f1af30"
-     "bb000d2f2f85caa6465810f89968f33abae81cb3",
-     "1eef463771f9c6285f3257691dea0844687606d4dd00b6020517f190891cc1be97cfad21"
-     "d147ed8881b5a6e19b22ceeae30e1132476325f2de0e9af2e14c80b8c780a9d2d6c96de",
-     "04024de3ebe03d2d91b88794a77635aae6743e597410ae10c356a51e3af88fa7f9c4d648"
-     "c7d1fdb887c8313914ed554eede282b24a2e66aeafcc0cc96907bb2f3877eeb97df491be"
-     "f301ce1f9fd4d7d3870997f34f54f2ba8f08ac94ea94f74a766f2dbc02e4d5149802e313"
-     "5a2d762e3b8abb01461968f1e88cfc8c7fda49c099e392e80d57f0c14de9c4fa1eea2573"
-     "2b",
-     "026b545702baa340fb6d1bc2bb96f7fb1a77a2428cc122ea380a258c747d4e0625bbf4e3"
-     "dbc2ca2f15bcfea92f2417cd5d22f2bb5f38a9ba313b3bded506d3e570dcbcb86c2debd",
-     "091c162d040a12f08a416296a43501d92e2ecd6be302b5e1754b9ec119fb8a572626c509"
-     "855c7c868a07b263f66070ac986f95e4c83150a5a492d5ea8a7f8ebf556c17ad2bcc996",
-     "00c217fee7bb202d6399f6b1ae4e5811d9361573ed4fe1b3fe5d474cf06d0236d59dd358"
-     "0145dc0bc7632c721b6463c69490a67d1be1fae99e34318af6df939f9f7f36a9bb8d5e9"},
-    {NID_sect571k1, NID_sha256,
-     "726782eb0d9720daa64e4a77b5d8dd67a1a193f15eb6b5162e3d89c925ba63b7c7e1c4bf"
-     "c8d6f11915b0e14d16ab53ab015317bd5958b0beb6074199e05181915496575768d026c2"
-     "3e92e06016598de008c3718aaabcda8b68bebca0a73ecfc7327e8d3646106b7d114dabc4"
-     "6cfe56265c326ee56fd2ca87abb5bed8f997c735",
-     "13bd452b0880b101df1aa65724fb60d5d85b37ed5419027481661a3617e0fb37bda1151b"
-     "9b5b41f908ba832011f7850b75a07b678e5b8cb35c5fc8b94a625e4398cd5ada2b04cc9",
-     "04031d88b62d2edd5f6ed29258c143bbcb3d29413afd8f86873698a9efb8d2021186415d"
-     "301599232989a0df5ea91ca222c5781314f200c708de30751feadc277d50e64842dd355b"
-     "a501c76f19ceb1be48f5540265b8b018da62fc225cc0d2d1675bf7df71456cc8e35b002a"
-     "220e2e80691600a2c1ae31e980d0cd22b4741c25bfbd413f10b375a4d8adf70a65c48ff0"
-     "06",
-     "1b9235221a6df49e39b4cde6650e994f624fcb5084daaa62aef54bc154949f4da9074636"
-     "c44f50ea40da1a3f01bf67e9b62a725ac0537a4e37ba33fdea8ba8b2286bf82901a933b",
-     "01dffcb5b5eb23694da4978419110ed2bc7961c571a2e68daebe21e598c8b483b34f3178"
-     "978708db6d78455cc1fb4f73c5ab7607cbb4f05d4d008c7bbeac88562fdaf7a370ba394",
-     "057018fc97d7b16d69af2b7dd4a859f09dc178a6025e1bd6839ec7c75c0383c59eee7079"
-     "fe61aa6bfb3e2c780d4ac0ee074e6b13223c239aa60ea1187ca4937864f89e2c65056b9"},
-    {NID_sect571k1, NID_sha256,
-     "1c2418243fcd89c6382b7c3b2a8c341f26d08174a9e9296c4a5c98c5793a0fa48dce51e3"
-     "0811a96b515aa22bf9af89a43de06d696be1e531c5dece1f69fa6ecb7f20be063c602a16"
-     "454ddafb14385ae3f8246c3f989d0566e06e7ed1864502896ea19df8393259c4dab3b338"
-     "0a4a80b4103cbef4f38cb69198b7cf74ce94883b",
-     "1288141ec2244e4bb3f62daf4ee588aed09ce22be55e3d42e9085a947c1f8cd16533635d"
-     "170bd64ae0b417346fa4670c25d41387acb2a8e14407a1931d9f7c5358a14eca40974bb",
-     "0407ccb7b12a7d6997ed2a11eead3278a3f45ea284dfda8e17f6d926ddd6881a44d02a0f"
-     "7504dadbbcb0cbd6b85c113aa0d3b4efef1ca151cc38cab1aa8360a6d22e3d6fbc0ed980"
-     "d3031b85dc2d2096bbba6c465629ea09ae3421cacc5581770ce3479070f23b3aa938333c"
-     "7c691d9cb93a4533b2ce389ae34dbebe8f333cef530abe17cd21448f701608febd42d9bd"
-     "c0",
-     "1e411ab53c48cfc1ef9eda97002dc9181a78352de13fbee3bed86cb00c10e7406033fa0e"
-     "a97b50764b0eb2dc6eb8ea83e47bb3150ecb9437179c124f15fac6ac19b0c8bc324f171",
-     "14420d78f2f9f1010018848b0442ff6e6203c1dc06a4d523802190f462ed3c11c7aa7678"
-     "bd03ba27df01cacf4121309551877d3a2bbcfee116c59926daafce55a4e0a7d69c5c938",
-     "16de0b369c28ffa0bd6ed8802a503929cebb5c0a4bf0c0e99b14659b48aabfd08bcb64bc"
-     "2e39855d7d514d7525b3c4dfd2244f37019b5f86254cdda599bb144c8fdbaad5525cfad"},
-    {NID_sect571k1, NID_sha384,
-     "1de4b642ec7220c64b91561caed7832044d6e811ac909f3b199cceb0d8a7db91bcdc8014"
-     "12044f5c34b355b95a2c6170fe497f6d5259bc20715a38cb0341c88e93029137e94d895b"
-     "ab464bca6568b852340a5c5d6a225475f6eefe2fc71ffa42f857d9bab768ccaf4793c80c"
-     "4751a5583269ddcfccf8283c46a1b34d84463e61",
-     "01fe06b94a27d551d409b0eb9db0b163fadcf0486e2a6074bafe167f9a3b4ce8ac11f42c"
-     "f72f9a1833a126b9473163d29bca2ad139dd1a5e7fedf54798bf56507326fae73a3e9a2",
-     "04038d4dce42bf8fffc39a5b6583a1a1864de288ef8479449d599115bfa35b37954ab288"
-     "ffbe81e69d58693e2c8c81639df12e4b36f62b2ab042e92a0715b518c63d0ec630051d4b"
-     "e1059c72c0bfb0ea1ac5e2fdd4fc380d08037a3d0eeed4990ff02e6cf5a16817ea598085"
-     "e28f8269da86c547e7b34e16a06724ee73776529c5b5dea4ce3321fb168827ca1cbdf885"
-     "6d",
-     "0a3b18c8c9f17badd123c674869ff428d533d2ecb8c74f9784220be7a90dda591003df52"
-     "59c5dfb612ac7398aa04cc9e82863eb0cbe66b6e7f45dd15dad252f74a538d5f4354c96",
-     "09c368c80f697c1718c55482b2c6c5c0edd7257a3a53f7193515629aa40a9716cc889d41"
-     "c120516b54f3a106a171082364886e5d3a1e9482a103f072988f61de68f034d658bd976",
-     "0e782ef47b250f40c56e3ac4de112347174bd59fd4cc991a2b538ca90cdb222d048fec62"
-     "e2773492a1d327152d1d6591740706fe2f8e1d65de888d47fdf173b2645813ac0fc3078"},
-    {NID_sect571k1, NID_sha384,
-     "70279be7d7ac72a32606642ecd81b5d4d0f95fbc3c0b07d85c16adf2788601e44dedb8e5"
-     "5e0f9e0b4ca3ca35f5be7511b0e69224a05204af67aae11ce154af6d594d47f6e3142ad1"
-     "83969544aa95cae1edf42bc699137f60178c12b10a67698e37ab9f3edbfb3acdf1b3513d"
-     "62fe3db33b16cbb4e1f9dfe732c107f9d0c953f6",
-     "09cdc7e4945c485a41728f83d5188f539e372ff4fe38fffcaacbcb4522428e4f93ef4972"
-     "556f4398fe17bdd885768f0fb5590df495badc794d4d274e22f2f4a2535555922fa43f9",
-     "0403c6f046aa3007ba7f883bc1e0bb43a9a0a1daecdea3e2b6c10b2481d11a834af241d6"
-     "0cad7cab27b677c9ac11f2e5b5226c0a3de13029229af00e5a092340af9b230e0ed992ac"
-     "f406326ffcd62e1a68b63ac680a743130b1440bbcd3966207dbc8a8f4336eb6a7986aa53"
-     "cfa4fd7bf363b30706b4fae01568020b41caa70ee3d51db982de66b0ee39777da3fecf5b"
-     "01",
-     "0c717523a308418eeb2aeb816346b74149d56b9620774cab582f01681bec73adb779bcc7"
-     "462fff35685a4e1e114c8fba474c68fe2650344fc9cf610908966a9dd1779f76bce0cdd",
-     "0061067f377bff6a9be30c9c79d8abb7f54cc8f09eaacdc190beb27b1e6d297cd32b043b"
-     "31feb49958745b78e42ac074b8722e1a7653bf03611d87c44fd3891ae410b23a2140b83",
-     "00edbe756a5dc78c8a29baac9e2059154294e3adac9a5adeb7b27ac6e4d4086821cbd554"
-     "67266946ed8f6f03abff35b59434afe84067c1daa1e0bb62ee7c56b85e7f831eea99047"},
-    {NID_sect571k1, NID_sha384,
-     "4d7e0ad520445b6a5cb46b7c77fbd367614044ae6004494c2b3a89089287e2836c73b799"
-     "cd8c90139eac427ebe335804c3788f3728ffb8edd7f49a4bcc76a9e24ce3c2299cea88c0"
-     "4645b82033115380f81b0c1d823e470631008d350cf0c0dba1915519985b8a389ccd8c80"
-     "9dbd5bb5051a79e631916e0d052d9b6cca18e0ef",
-     "02bc753d007c4491cfb8ce0a6c96455acd16d37e02c982db216b8cc1afd6d10c6be4e15a"
-     "3988b8b8b86b2b5b59a5c1939889024849317f27ee08a06bd8e7524d4ad83a1de208564",
-     "0400ea922b09e902ce3847f14d3b3afc5562dddf15811cb2e7b9e06e1b919d795f8451a3"
-     "dffcb92b418d30bbbd1a7ccf827ea0f1f6554387fa2fc51755799040133d7a655c7800b7"
-     "1301f12439a0c0df9f6ef08e89eb1a62e2cedafc0460030810b2483ad9427c48dc061e46"
-     "40ebbd9b4a398841c863a6e3d510e5c66934d66b317b1640bd05018a35677c6ac2c78397"
-     "06",
-     "0385f9caee4731627276875dd8d725fe79626c18841562e8a13fa7531c7be9adca565c22"
-     "459d519d643ea22478d7c51b4c286920b050bfa54ab7d42966e389c485b52cdb4fa1a0e",
-     "02ac84262fd121bbec43e81021c0f0610fd2fc0b26d66581ddaa78714ce58be469652838"
-     "51241d792ad6bc79af39f09d2d4bda83996ab41f1fd206b8293cdb6c4eb9d96f39efa25",
-     "1d9c9bc330adeee8f58ebfe8c1ba401d4433efa04a44185b0e8e20b634691bfe058770d0"
-     "74289e636af3e96c118edf31d72b5766c30f6fe84ade42f284fc7f2707bf27b3a309638"},
-    {NID_sect571k1, NID_sha384,
-     "d49903f38b5c9b17542310425e59377f61f5b4f4740cd97371ee2116083f7758e69e7e2c"
-     "1b0950ec6b76f96e3c91c721d6f2843afde8c7505a559c8a64bca2e665aa1131b75bdf86"
-     "fb5b90581c7d3b61c2cff88f3fccf356ddf5ed282e27727be061b6925c51ea7f1a495f47"
-     "1dc8a5ca1a88bbe29e92338d3c9361460398965a",
-     "02082c6e61d0d72f040905d8c1c20d47b029f41ec68d6cbf43ce97c3b2a0a770557a33cb"
-     "803c432cfbd3958fda30ec1bba77a6613c318597a85ad02b26c44bb77ca96d9cc1194ea",
-     "04059ff339d505b307e05adb45aa314d47f2450e1b1aad840b5550a67c11940d0e786547"
-     "55a8e28fb651e12e48c66cc1ce0338114bc1ffb00965b342ef3a3caf495f1d73a69c3f3d"
-     "170724e9474e6de57b9f8cbf6f6bb4f73f5769e6cb0e006a34c2510b379995c9e054cc49"
-     "81c709ca85a3aebdf29090ca07dce5bd3c313c6153b551012d72a8f84600350e8754bc4a"
-     "bd",
-     "18d65ca6c2ef1fb32dddfb9ad4603e03c7cb1791a9ec7b41266cb68b6048aa111f5971f3"
-     "cbef3f0dbb9ce409b59c31cc59bd6f100ee5247f8c36f26ca77cb252331fc3be7346b5b",
-     "12853f9d695b8ac4431c1ccc8498f3fc4916eb6a5e66b3795a3693f3f5a29ad13e58dcda"
-     "ca5774f1f295e2d2d3c63c69abbcd9f388a3383371028fdcc8bd77f7554d6aa3f0431e8",
-     "0d1c324afdf01ea19e9453d2b7397584d773716d6a08b6e38f9a9fb104122ecfcc9de7bf"
-     "1e5a6cfd52a08b7cecb002ebc21798d474f035fe7d4554bf632f237bce14aad88b47d4d"},
-    {NID_sect571k1, NID_sha384,
-     "0e3f4afc3e7b25c1bf2d98098a5a87db1224d9bb45adc6e434732b8722a708ab80a1f3f6"
-     "ef3c5aa70d2e1dad3e4416b12cc59171f05736c4b58bd084602c344f2f0bf3cfdcfe04c6"
-     "4e87597a99de23ded64b33607f7c273ec321f6462518715b11e91361e89ce5415bfc2ef5"
-     "20bfec378244a3bd2a4b9b6b3d68815f2f75baf6",
-     "0e298c93351323e2c5304015a4878997ae4e79d1c32f1dc64262e534d4f2c4b3e222356f"
-     "fce746763373fdfb936fd330d3214a18c07f1205b20c9a941331cd676040ba1fe3dbce7",
-     "0406ee4952a83477d89ea05ae63d5169cb0f7c7ff22f15728c6d69dfb30d1f28158e2667"
-     "f9342cfd9b32f2fd537dad47c190d82f72c03043f2a9c5d97cd09d07ed4c35b961040425"
-     "54026d5935dcebc0ed5a07b7ffa50de3c8aac309dddb61b8c560230379696d81d72bda3c"
-     "819c46387e7f026b384bb0f7b2ca90c402bb67b5e37d343cc21a8d1a0f822dbb2766030d"
-     "73",
-     "12d23969d230e0e2712f96b11e196202dd3e6ac755c824f92b9c765e3fc808d4e7236c8a"
-     "3c06ca2c8272c7ac953fdb936db30d892246cbdcb7f98c43177e1c30afcc162af511364",
-     "022f6dff5bc1eac1ef568588e2e512103cf56ebcb610e124a125fb004064a28291c19e83"
-     "ea08171bd1b14ac729392c7c46354e795d63e3bb087fd100642465efd817b79924408a1",
-     "1785e1fd773446e3b90b8704cc2723b8da2f99d1d699e817c3c4622015d178b0cebc19b3"
-     "a6dd972f75eb3828a386973c0a5e67ca192d69f1a84c825d1253f1062a990c3f1a947c7"},
-    {NID_sect571k1, NID_sha384,
-     "8fe32671f6927272fd3cd8dd4e34d44d27fac8c88b41bf9a48039e914990bf06d1633b38"
-     "b9200ce1c2a275b9c55498e5da2d0707322c3ea0a0fd7aff598fb801628264e13047c800"
-     "8153e8595a0dc95d54e70b882ac2ac9314d2b78e7b93922da818d7075215e354708994af"
-     "66958954c92c074d132dbb2488e5a531c755a8e2",
-     "104f4ad56594c5cec2a988c5596d73adaa5a81802b40110dbae698ddb1f0b271fd1479c3"
-     "8abcdb9b234e69cd0da8a0328d2135c287d5b130a09fa0b899058e7800eb2dfcee95c1a",
-     "0404e8151aaf2aa6a6159622baad134be41c404982bb0101e820eac8f0a52166546c5392"
-     "7d9b419604e9b025757eaffac526d4fbebde5fba0841c6812dff2e9bab5054d4074a125f"
-     "fa04413639ad72d6eba870e1760c71966544f3f881f88880fdef1edeff47cf6c235e8dfe"
-     "f1eb1d8df51f9c48b985912f1f70b61fd3d4b859e052887560872fe6e95db0f435778d5c"
-     "4c",
-     "0cccd1bf3424d8bb0513fda3db93e81bd34175d84aefafd26b37eda9e767618247bdc94e"
-     "d2b1882bcae4c83eafc30a7a4a80806fda10a5e70b8827287eed8eac2721939a63c2175",
-     "05b1460e856548287683dfbb93efc869e80333a9ddcf292e2fa3b3c8d430563a01340685"
-     "c6db1059aaa8b298c8db9e8281f36e3a9664faa17f413cb439ef24cbdc1a4d58872ff6b",
-     "0c6faac191c95738f7c6ad0eceb035e5d22ae85e4bd0e27f2e65ab293717c0491be3d1b5"
-     "ace80f4cb4bac7e33258706010c2aa48d84c9e39c95e30805fa7669c42bad84386f7754"},
-    {NID_sect571k1, NID_sha384,
-     "a8fa01136a0a78313a5d160c32fe5d1805eeb3730c18ca0c47818e82c48eb4c9e5b2dfe3"
-     "ee5facef9ec59b68f4e6f3213f77fba9f8ba06dcde546ae348d343233883894f4423331b"
-     "536f62373a495852977a51cb192cfbec04b5582b4ece69f345979e234de32da7a120138a"
-     "057a7119735c4cb19099bf48bb202e7ffac04def",
-     "0c4989bf33b3136bcb4ba67906eaff2bcbc6567635aa4b057acb7353ee87ba3cb4cb9838"
-     "f8f679729d5c6ed98e6c4199cf58605f009c6873a1b8321f83cd3c0973b7a3cfd9dbaa5",
-     "0403871c7781f2b4f653f0d49a224576bd1e5363d5171bd21da89f590f49fc212d8a57ac"
-     "8a140d923c2949ca287bea803afd763f15f909c099a07297e8ba1b37c70e1e8f0fd1fe9d"
-     "1c05806bd5b4858ba0814da2167d232d55bb5c41ea0a36fb28a0a151c1b79b22cb16613c"
-     "cd9dbf92174e42578ef88f4da6eb44918acf427fb7e4022da3376243e75410ba6ae012dd"
-     "fe",
-     "0a9eb767077886c48bc54503a0d2d62f0192d3581bd9ec253107092c22f68a15293d7c3e"
-     "7aff56282f0cd35e86a2b3c55c9eec079201d99b5f49946780ce6aa18b225c2dfd72cf8",
-     "03eec6ffb390ecb2af4f5ca17fa8a7fd6938667b319f0f61e5c7523efb77afccddddb511"
-     "4ca8c461b1c28dfe7eb85ab156e24e891cc6f9511d703e8b3c8443d04fd8de80f5d65f9",
-     "10cf3156cf71dafea6a0d6abbd503d72b13e6a684076ac900f390059cf3fc325966b3548"
-     "b58e14a82bf291d9689783b899db7d4baba524b0b63d31f9900a84fbabc2ccad95742f3"},
-    {NID_sect571k1, NID_sha384,
-     "ba2d83b21c783d6ef2f3b7b10e910a418a9b9f49ae0fd37990335b3a3d15627846c9a12a"
-     "1f31a3d0e062ad1bec5650606ed4dd06c30e50c1e8761a29f4ea1a20f74635d5dac22e5b"
-     "787ac10f4ee82b338a641484f91771c128c84d31cdab0a6b9616078c898665655ee9dd4a"
-     "e73d33b94bf091b064928b959623aa71ff73b4db",
-     "1a96f2ad56e31397e236cafc108087479c9823589a5fbc3dc7488d0e5d1199cf245d7f21"
-     "f524cc0e8b47feca14c93fb760e631434a91188b32965053942f3bd39b3714f9d6f1a11",
-     "0400195bfb66e20ae295cd22d59b27b3880a890fc44ef5c720b568bf7f72266293841dcf"
-     "0572063a96c62736d9d4a9cce31b10c03016305a409858a79070477d3e989481ec555c81"
-     "460491122a199176e2492e07fae4ddbf02d2a40a21bbd99b8f742b546db2018cac27fb4b"
-     "1c03cff55f61b7caf13b0f3b097ffc8e1549eacab89225e0cf1e96b268eab7f9a1a69258"
-     "f1",
-     "097e28225aee5bc9a970a150502dd14bee900d3b040b0da9cb52f5824e66af46a991bbf6"
-     "423fe1e089cba47593af555b07b45e47b0f4141b0412ddf6e91153213c5b8645ae7bab2",
-     "1439928b55917e93d59341532cd1f9d09de1f6e0d9a04514bd4b692603f2cfb75a579301"
-     "b39b8cd92fbfc8832839691c23e0ad3efd3b4c7c3e9a366c1554c6dd13c50dd087b3055",
-     "1fb432e72be6fc524a7106b21d03fa71852c18c67edcb8b265db3b144214e7e6d10caad9"
-     "1f81616e03ae7913fea1e8d11e90d54b17705e8d04c8c20f0f4f46f117cc423ca178ff5"},
-    {NID_sect571k1, NID_sha384,
-     "ea2d5f4e9797bfc2f33f0fccaf530db2bdf8abcec00f09a0338eefdba318221ec0e050ca"
-     "d1a85c3f76b784c6e8c18da2b062f333eeff18b7b781e67d6d0a4368b8231a892e0f4103"
-     "012348e5df53ac745e4d34e2cd1ee9369f97d4801ff485fc144b2007008036bbc07cb1c3"
-     "02a00054b54f3713919191e1d5052978c9c2895e",
-     "0c08ed8e0e0f8b0d0714b46a2164b933f8147692f18da97e5a108c44d5a5cf221cb50536"
-     "e41832b83bff4026c6df156386235cf5e3e9a67b7cf9b2fa7707c5e0ff33a91601b8e34",
-     "0402d516bdd1914c83aec1cb242710ed79efa61cbb31dcf8d238d8f5e089158b2ee2bab4"
-     "07e01996a1621b1a869a98227c12296cc2a71c1ef2d0f26bd6614f2ac77008048abeedaf"
-     "cf0151474bef5965c455eb95ca2ffe1d589107dc251d22635f4a9fc7270358b64e4d2b81"
-     "666b60c4a5c49902b0fa9963197b22f90a09cab97007842816f64fc49e351710db849800"
-     "32",
-     "01125bde6086753b3bcf29b7d5a4fb0a8abffa6503b4f0b39960eba226062bdade57e4d7"
-     "3e8c1621792626203e83fd5c231a53b0ce10890881460802788d481f233466060f73359",
-     "199a1e40229786b966592ae6e275874ace23d5605d0c3371a4f9eca7ce4858927958bc1c"
-     "2780e9f2f79767c1c72117c79c408f972006841cb621837ac002cc6510e0432d99a1f64",
-     "17f4e5e23e494ef149e4abce2d8a1ab10e3e6c2cc93998fc63baed6565ed350b220b2828"
-     "55e2824f398ae76b8679201b43450f62237f6fec643ea659e6c86abc24a63d82d9bf219"},
-    {NID_sect571k1, NID_sha384,
-     "b2293b0a09f41decd9d8e637b1b08c2efe612f33c9c0beebb6e05033c6103b958f8aacd1"
-     "25d7c810b4c287349f5f922d2c6ed554be597fb8b3ba0e5a8c385ed8ae70d5ae19685298"
-     "f20e8d844fb5ad98db12ba7e5f45baed9045c3e86b3cac9bd55b614b82fd075954fc59bf"
-     "c6124cbd68edae988596575f379d8921b594c75d",
-     "144090a0ee38cfa21fabcc24d35139a99656911ad4f6dbffb77dbe74e7993edfa9fd63d2"
-     "c4f6bbdbc8ec21ba13c9f4a3576b5d6e3abeab5af5ac81b1f2bb6d4c42dde645d854d9c",
-     "040208729b3c7abadfc221cfad8be642588d5d1c20989fea731cfccef25886905e4b1e61"
-     "cf9548d89c24f5706f5243dc8aa7d5b2675c2c6d2755ce6a12e5b12c28a2cd9c597b7dac"
-     "b303db73ee445ffc0f6c77467f3add3b1e97061117e221687f5589a030f5248bb959bc2e"
-     "d98c9fb66da8679dea3949b77652dcf83ab9c50a00f6a9c22bd8d16e093b2deca4b0c759"
-     "6a",
-     "0adcadb26626eb9f8db9ae98c6808840b65d6f886a3f0c45f0b993a8bc62bb5c08dcd879"
-     "40dfef4f220f5e50234fba3a55e7127fcbb967ff78ce4fd6938a9bb653747116541cb85",
-     "18f7fb6ee028c3dd754d6e7b687560fa269b5a5fabb1d98529e0a27dc66bdb1ed79b7b5c"
-     "64fb71e767d9497b9255f26b8150b9903caedb25f51594f5b7ec2870515f701bd68faf5",
-     "09ca9519388402d5d96dd9ef2d4ebfd0ebcfa58bf8c1970d04851b2409671c9d5e4aa833"
-     "555df374469a4d277aab93b8df8d553399908c930f81c2d9769f1b30a13f61c02b16852"},
-    {NID_sect571k1, NID_sha384,
-     "acce54270252e7d9e983c08c993cd6b7e3caf482a9149036afe4665bd3d0662a68180471"
-     "87872862d5718b8ac063477f693caf1a9baa8bdf2f36d411a796f2b46ab56f66bc949242"
-     "29f8264016d6769c85d9bbb7d6bb042fefdb8fde1be026b86af2017aacfe38c97309b468"
-     "9b23fff94f1de880064f1d3ad9d74dc804c41f41",
-     "1df26b672b2e3617b6b6c631d3c6be0cb49c0a690de49643e0f416215bcdaefc03fa9c70"
-     "8471f1d87476d58c8f147517ec8a14aa945ef001fa01984d5c3d81f7083ea500558fef4",
-     "040767ca8fe8f3a7addf01b230b99499b33c83db95db05e1956fb1891fed60406865291d"
-     "79b0daca0c307a3ec8b1bf2ac2cbab728c6ec65c013e01775ee21a29305e9403f72883a1"
-     "3800acfb786b09e5185dbd8abf831d12967107dc57a040d7c800d904b530eed1e19a8e52"
-     "e653fe8bb824cc424d7254532d0fee62e8ee7ce8e871cbf6e4ca3bc040444585b9a4e397"
-     "cc",
-     "13e5e47048122c8301258c638bc0f00f8f9646cba927335535f68f4f4f51f23ac5398ecc"
-     "21eb0bfe8fa6a2084e11fe67587bfa791cfbe2527797a4d98046f9df37662cb7e86a5a7",
-     "164b3500ad14063101b6c5ebabba53dc5acb4d6771d3b05a505e6a67727ca8ff73d996e1"
-     "329c0f6d8f738237ee0f0be415003e2db515ef93931e09bdd853b9497826929eac9e9a8",
-     "06b65511990c061a6d2a97fe2a5053c775ce2bc5471865abb7261d0436a04b79baf41a0a"
-     "852a57600cd4c6a114b3a8466f721a684aac2592640bc149980545daa271fa9b146f2fd"},
-    {NID_sect571k1, NID_sha384,
-     "e25274ded4840df0d71d3369007118f002b83e2d375c78f7e29ade067db15cce21842611"
-     "f3f015db2efec57da77cb9d16eb1e00a8c1444d48dfda569e29fca1ebf40a22fc646a9fd"
-     "44460f0e473bde487634bfbdac2c312f66a1c2982c6fe76c54ac72b6c8cc9345e47cb319"
-     "a974b3cc4bb40634df74b4ad7e18adfa9a71ddd5",
-     "189918b832e9fa30161fdd927bfc267f6405335df3d66d225e17173af52a671138883bcb"
-     "94c4403ca3e001fcf09ef4c6488934d6775af2b1da30a8f331579af2d0fbb530298d8f9",
-     "04053e6b43c0551f32b7b34467d188985600c5c0ed12448f2e763609f40039f92002bc8e"
-     "70d8dd3e337c3507fc996a1557d5f2fb3132507e49ce653482cdc86f6ca5903b77fa1619"
-     "d904a9ac78a2c23be0841b96cdb1d55862e4854b530f1fa3f469ba9f7185e3f91c28d03c"
-     "27d9666345bdbc7a44764595b303f49cc43bc2d0e944862913d280273cfd00e15b6b55f8"
-     "5b",
-     "0b47a185140b583c330c64a10d50748e019134bacf153cb4a23753f140a4d607d5771a8f"
-     "0f535f9c35baae5ab6c37a55f38acd12f15be18d5bd9662383b30e4d0ce487e8cb553e9",
-     "1a2ae62cc9560590177aa544945377ff6ab1b34e7e32a25140f99996c130e17001563664"
-     "7756a5e8522c936eb1389c206ac74c012941269165f3772373047521f69510c7f3e6acf",
-     "1d86f4a6ab2bba7f6305c2df754652bad40d7c273ba2aadfbbe65c07ede4ac0e65fc0a37"
-     "a0139a6ecab296f58c6c2532701bb008bd9e1ecac2771d9384aca094537fcab47f3ef06"},
-    {NID_sect571k1, NID_sha384,
-     "d8a4aed87c316012482819b03a1d91691f2ad11a2f46082497ea8f64880d686891f7da55"
-     "0b2ac17199c657d4eb9d04d5cb8eaa180f743b87d23b1c86103f9e9bb60f4e19f0ff9d16"
-     "0f180aed7735130c03adb62502e69be5c624ed7bda2301f30580ae0921b02e103a638f56"
-     "23c02c186e3bfe6ff134c762a2bcac1f879a9353",
-     "0bdcc175eca3a399b944eb0334ff33c4fd130999c8ac0e7b52ac5b774fbad53ccc3a3102"
-     "4f5262b2eecfeb2104b14bb244307effe3dbe8ed25686dbf46a42c4b6f8e34010ad826a",
-     "0407ab1a9279a8408828c2bd21ae6c643ad82633d636d36fd91498cfee49c8a635313f56"
-     "993d02cc46da3f5b78fd243516cd23c14a4c8d79cf27dfcb05f52f0cee59cad5646a9389"
-     "b80799beb1ada93a48819ab70b74c36d2dcc3c5cca1f7a57ec58e643924c3ceb7a90c9cd"
-     "9bf7ec762a2c428d16ef431a45cd5d069cd828601f903cb0a28182af2392b5ad12ac3a24"
-     "c6",
-     "04ad8d2759df82dd70ebe9f3402d3d533a1b4635dfd0024deeee52b32373550f550b9fd4"
-     "126aaa6c3a9b1f352c40c86e13f78e259abb17f85f0041e0cca9e2ae59f4ee3ba2fbc83",
-     "1cf9ce41dd5dbc3bee9f46f82e4bef10cefe79a87e8e00d002097045b9acd46364560e0f"
-     "d27b0be6655e73b5cff272c8764b4c80ce0e1c91a94b8d05209a28b553f589ee2fa1b11",
-     "149fe587b144c37df2c48c2b7749c509421cfebab734003e51383cfb773c3ef5a24fbac0"
-     "255cb807f5b95607121c5848d3f9656227b61d5a14042351de084d9b88745be242b6158"},
-    {NID_sect571k1, NID_sha384,
-     "acbaa5ffc4eee0850075c0e502a70cc7a897a919f5e7bca4e798385601a26f411fdae546"
-     "6ba9f6b6d8d7f819a749b799fbf4a3bda9105063e74914e8583ed8b31ea4d22164bee6f1"
-     "4bf53afca269b901c80cb3265be32ffd4ca4bc4ddb83e11eff82ead6d75dc4aec8e5c67f"
-     "35d58a8a156cd1c0351abdccc0c5396c8fbe6920",
-     "007ab5a55a1d8ecb7f5dca2afdf9ef465569a4b0374716f604ad42a6e0271e934b09655e"
-     "8e2529784b69b2894bb399b02aeeae30e9e7ae70a2a8e56b9e775bd978a04c728e3951e",
-     "0402df88e368c8162c1dcea5ceee3a4c52cfc8d6121eb81c31236ba26dfd1874c61586d2"
-     "daacd96cb5ebc7053be57641bf53bf2651cfacf370cf470db86e1470bf285c7166c197e0"
-     "94030067763f9fa6a9082ea16dcbf53c2b6f11c9ba1817198e5a4e189dd98141ab682ba4"
-     "de0b3f873ae54efc080a2a03f755efeba3c0ade8ea67228b1a5a11d730302f1eb7c6bc37"
-     "37",
-     "0d3dd75ec61e0f87737812fe1ac86ba336b1512bb9f7ceac2c7d1a5b4d5dbafca57a5209"
-     "028cef9468ebdacb2a35988531baa094a1c901d9650f2c5d8e03a1621fb33ea85e2b506",
-     "184a98dec91b9afe52d4dd6b2d9f2d7e3c42e8e614332080aafd2621136ac7965beb4e8f"
-     "97b222c1b2e5448b79534db4e710331a2f877f8fc2a9259129f0b24d24289495da22542",
-     "0fa384a04c4b0b0745abea373aabc09404a6037f302e234e7a2840ff39c2b86ae37c814e"
-     "8bf3f3f7cf743748f2b88d02d66a3adef2028de94013c07075fb73f00555aa900337149"},
-    {NID_sect571k1, NID_sha384,
-     "9a57b63a4f418404e8f5dcf3052b9bc04a4f6d2c33bde8651506d9cbc5542ffb9023292d"
-     "ea463111fb78913ccdcd182faabbff9164219b8900c7f9fb394f7d9678f77b18f8d58526"
-     "ec64d7c1328953b983a7c416583e05a069cd76aefe26e5f5687b70abfbf9f58f052dc086"
-     "3b4fc3bef805cc3bb05bf76a83235af9d6adfe66",
-     "1e7d4da72b1d82e17a066fe387f2a0a7fa4c60ab993ee09710531789186077f2f32b42dd"
-     "da497d5fb57356383e1f96973df043307f0b6519430c3f0d40d62954032872fceb7dce9",
-     "04037c59e95132f0027f661511d1bedc3018bffa62aad7f44d7370f5b169d683882fca3d"
-     "d0c4260fa8f72a47a44fb0fdcf0d7776ff0632378022bdd223753c66f98dc04904344ac7"
-     "4102d7f19468b8e4f32eeeaabd6e402a35f38dbb9f2476cf07881d8bcff170b0a6e1ff8c"
-     "b1bfdcaff734a32ae9bf34a909ae7fee689e3f1ae777812a45dd46ce13fe648016353c6b"
-     "b7",
-     "18ad70fb9c5673e5a39b3a1655ff76eb84519555a6cd88e86a26f9448a54f04516c2449b"
-     "ab3f75e74a8d15c69926ac43fe01ebbe7e1c97e73870e3cc4c0ca431cf614f35659e3eb",
-     "12abdbfb2eb08e326289fdf5615057d912749db4f17848c1ac73bf6a51fbe3e1b2732d4e"
-     "b656715a6c459c6c3065b67b577f21b8eaca7d657c3b3171e8a4849f55024c69487e50d",
-     "09609da5049092e0aa8ebcf10c204de54c968b09b9bfb3eff90b80bc675d557967b35f52"
-     "e459f37fd198a83a858e5d7f9f5aff8b2ef7272b236dba5857e88515ed471a60bf6da49"},
-    {NID_sect571k1, NID_sha512,
-     "97b79c76d9c637f51294369e0bb52c4189f2fd3bd0607f91834aa71b3555605a89ff68e8"
-     "4fb5bda603f502f620e14e8b0c7affefafa2f0b303009ee99653ae4550a05315e551dd12"
-     "a4d8328279b8150d030b03c5650ed4f8d3ba7c3a5361f472f436b200b321e7863c771e20"
-     "ddd7bdf739c51de3676f953a5501e4477aed1bd8",
-     "15b7271d4319db5743119c8103a7d4c6d57e9c62f3eb93762156d2ebd159980aa57cea94"
-     "8e416717d715a2e458851f1b2e9ad4172bbcc53861db29c3ee0ba8e82617a5866170847",
-     "04003a5b9559b2058299161770166766aa65e151ac6a22a90205afd27de5eb99c5b1db36"
-     "9ad52f09141d3bf08884b96414c283b2669ec2a2a60c960a2f03d425dc4c229c0bb369d9"
-     "0f0024f3a9cf3dd257043dceefe6617a98e222e1cc820f3e19e63c64fdcf7ce8d9c7af73"
-     "23c9aaaef4df02e498597581082fa3767c8a38f508f4ca2c1eed6f298dc8142668a00274"
-     "90",
-     "0c585e425ae4a34f9b7b9205f095ea07599716f1eab1a8bbd934219ad760c4606ebbeb06"
-     "cbfd3952e045a040b8ce20603aea4f965d1b6e87eac7a61672823fb2de7767e3466c730",
-     "129162cce6fb05e1fc8630ec6c3a16d108bcd251719d89631497177e6fe6d1373f114ad9"
-     "dde6e04a4ee0b4747f91c78703012e5a058c132d54f2ccccfc0f9326b27d60322b497e4",
-     "140163edb5f3c4b49228e4614bfc6da9f73674eab82678ad9947b2a635f733dbce99ce32"
-     "09f613e2a75e62ed84db4d7d13de6d789b7cfedc0cb6a028d8316db8831db66c91791c5"},
-    {NID_sect571k1, NID_sha512,
-     "564ad0e37c9c37a60872a4780a723d08d1159ddc77bd834d74c1025cdf3cbd5338c3fc07"
-     "a904fcad9b979b2a2ceb1a0139af35e5112305fd662a57af6312624b9bdd3a64849f95f5"
-     "9a46ca8feb2ed56f87f258518947474c1729275c4d89b7dd286ed65f286cbac76002cc63"
-     "b92a73ab6bd13c4adef282f32297e441bdd8fd36",
-     "07219ea7917d174a5386df985d0dca798ac9f8e215ab2f0003aee929a2dbd91e37fedead"
-     "0ed95b1e8aabcf516bdf54337b4aff7ace4c6b3179f2e919a49db50a41c9d4d58d4f636",
-     "0402fd7f6ea770e0a6f1eeb3318b6b609c0e76ffeaa34e75f56910e8f658b70940cd7a59"
-     "18328473b279f882816955b2e3702c22e0b3e03863f8d99c64f3a2c9d1c68f59a28eaf25"
-     "ad06c2cca84218aa019326cadae9639069dd27df4d1e95a4c8e7d7cb426e70e2d38650b3"
-     "82e325dc3835afa719145d16a29e4ff67de37ac8949641f0d140072f59718450a6699732"
-     "06",
-     "03413376b32f18385cced4549e231e514eadfe05fffa0b252732f5c88d13d9c6e0c35be3"
-     "dbf72029be5e4573b8f8829f6efbf58a12b5c161bb7055d1944eecc93f82c12c5c56d9e",
-     "1c45c25f3e8eef9b92142f12e4119842122ed7672fdd82c14b3c34ade3243a4c50495c06"
-     "b5984d0260376c4fa44c60b2e34b0084066d693943071bb663a44884927352668efcc62",
-     "08cdac0f4498173bf4e59de98ac9a26fc2c752cfea7a5b75141d4e1d019e25d70a717ac3"
-     "ebb82884436ebe1007b0488c4ff29fa31fdf02f77fd99535c99b69c9d4e5f432516da77"},
-    {NID_sect571k1, NID_sha512,
-     "072ed5b14754fddaf54e20da42432df49bef38f4a3b1841b2db457ff86c44880727aca94"
-     "5770adb41269df41fc17f6a687bcaffaa45a3e59070526ed53b8dc3b78cf9a80a85461ea"
-     "f4b477e44d5ec4c2bab9c05aa747a5a520b35fd09e8b44539d060ba1c3470267e0dda111"
-     "b15dbb587614a46e1e477127f963a16cf3a43ee5",
-     "0bc623152253da24bf8d752bd78aedf7d5f6a2f889453ccdec14e10753335ea8bea83fd1"
-     "81a1f3680ed50f2324fbeaadae160cc85831750e021f3e44121ea1b1efc29a7d0069479",
-     "040003f3a6cc6964ab2f6da95c0a2a7b75afe4f77faff16fa28aa67809afd9495cde1f5d"
-     "ce079ec4e15ec8c1a2095a12e8adc409fe8729d865f50ff31ee75d7d807afd2c15cb142b"
-     "e9076b15c1ce931ba06dd56dd8e4f544425fba4f37f951a188c8e7eb13a2850c93b8ce60"
-     "f10b3783647a2d053e2764a957656a184a385e95c2013685d4954a2b2aa20e4a15dbc43b"
-     "78",
-     "1e091f4febd694879f78e83842572280daa48db65c463e66d9a7ea57b82fda531f116800"
-     "530a03cef2cf7e5be5eeb6e420213ff757c27b8e8a94513e417f4acc62adc02a76a4fdd",
-     "0264c499f7daa6ccaaf191d3502e86458ef088c9bf2ad989851c221364b24a1a3f4404fb"
-     "d0eb44a41938ac6ab67002faba0bdde7f44ffe6bc10def8317c4e2807c3ca711cb6cd33",
-     "1b91c18fc55635c5e3cff70503e7a49572ba52b11bac193230c88d6eb65eff6b2d9a01f5"
-     "3ab0eb34f5e208538136811157f872a8255b4d249b6ffe021b0c0763cde4d7a7e72b0b3"},
-    {NID_sect571k1, NID_sha512,
-     "e660dbdf3e61af39b83b95d3f1970f66d616f03273f7dddb98f768452b21cd39604a31cf"
-     "80590d4a5e4b0d4917519e10fd325dd4ab7a52d70d154506329baefe0d5816f514ae1094"
-     "83122b4fa8fa1ebd7fdf1fc4e21e8d278a50c05d81c8f489596633d949c6c8fea96fe914"
-     "30c01522a5afbd5042be8aa47da04581b2bd21cc",
-     "0645947d981d258f2954558c31022a3b6ba5fa7b675312f794cb61bfff1d9ce87267e4a1"
-     "dacb7c8fc58624d31c85ebe22f80d26a620fed5df5bf38515e0903f0b69a606048197d8",
-     "0402d03e05c4b555943fd69a299249e7148e99633b286da69bbcda64e7b06ce9321d62be"
-     "ad7b8d095a68d9a3ab9e9cf1aeb1d8c4904a073c21806830451a79fe7a907b32df15ea45"
-     "67023cba4f6f1815cbe1934734a901206596c6f482011f6cb6d452329f9412d2ef456642"
-     "9e7d35f2d247eaa7849ee141bb16914b64920fffe6b7923cfb19759fed6e1f80d6c40a0a"
-     "e5",
-     "18955bb752f0af7d7aaccd0628dcf1f52d836fb91dc78b0fecf21ff5992d9c1f891f0eb3"
-     "c139803b88736ce10ba4733a523854c4ae9ac35421beff9b20e0c8daf90bece46737579",
-     "110a428aa96277c9a13d4529f58ecc57cd7209a7340b4a78694dd9ec800f36c9c306221f"
-     "a110e0b3fd65b9dcb67307b7d7678997a3143c04ba96d72be83a1cd6b01ef22acd0f82c",
-     "0b7ae2da5cd36006a92a5b2e6369afc2728a93edc845ccb1500e551be361f8658819f7d3"
-     "eb82ad41d7f2beea1a1cab6f103238a6025acbf03a2b08339841694022c17db8c6c6886"},
-    {NID_sect571k1, NID_sha512,
-     "8c9acbdc431565feae60e08bc7da113e12372ed373f1e1fdd581f98c8a7b0c79ac4aa42c"
-     "7ffbc963fb4970fe26c5b5dd314b7051fe971c1186ebcb5650f7f7011a924de893f06961"
-     "b8c75da7bff331847feead4abd2e8b9d6ecbedac18f4eac207b948e6e4215e4d5cb483e5"
-     "c66ce7ad788cb89604d3a3e051539094079e7bdb",
-     "14cf93ca69d94ee8fbea0c8da9d76aea092b73073d8f5385b65c6dd4d567fe86bc2cfb8e"
-     "8be890c3c6cd9abf7dc3a17eaecee3d7a9455887863e496c48dc3e47821bd3d825b6bed",
-     "0403dfd1fac02ac4bd3e3017a3d94f29575238937824f80ba0b2eec185ce8c641e9fc721"
-     "94323c779dde8c4fd6e748e09d66e82c82add75106a0e1739f2b977d40ecd3cb15a1eca4"
-     "2006a73dd31226adba7ed8d08476b5af10a806fe8de72251400a83f6c9f6edf5e0cd6bd1"
-     "fa8f3595c3ab32b4c4548729c455e4eaf83230e1335cf181cfea6b6bfa6cd4ad75ac3278"
-     "cf",
-     "176972d9402d5d6c9753532e5ea907f256a872c100f87bd390c4d610bc00c408a97bd55d"
-     "ff2de1ef2fa8b9716e33a5a39bb6ed2ab541848685040656ad0468b360f42c3742c1fd0",
-     "00be28427524a3b0979cd82fea407463647a77ac45c489744a9998b545a13516abb9213a"
-     "b0d89a2f5f872d927ad48dfa502de95524f94f34b174933f3faa7b554a1c2c3a688a0ed",
-     "1d49594454516c1876f23f2ba0b1fa4dd8bee028bed5524b7635a2df5b8459f4832b3db5"
-     "f6074cf07c169cbfd9099a85ec2f5c42043c5b851c81a71c87affba34b11eda67e0ab69"},
-    {NID_sect571k1, NID_sha512,
-     "53ef87d6ac7b9698f40b3ea9f3442e7b64207b140b7f66f73fb7d5f8f98452d30a4e493b"
-     "6c0e3268371e88e612b818d4d847f032ed4983817d020411a52d81fd2a17b58ebdec199d"
-     "817c2a8ba77042bbd747a6fd4bcc7e844ea829fd8461b389aa0b5957d92962b6d4e86385"
-     "a8fbca90b8fac40944607117e9a4ef6dccb8fc1e",
-     "033feeaaaa28f16bfaf5ea9c7319cf4561ba4fc55327a8477b6cd58ef6ccad3962ee1f3e"
-     "db243f3a04e7e49c8e23509fa2d63252adb186b8bc7e9255cd61fa9bc45242d42da3a68",
-     "0406fc62c39bdd41ef7083ae10dad59e38dad217c55864a55a6a80bffe2f5e7da977d79d"
-     "b9ed8c9ac22d6f096129a0c680ac93fd77da4ad96e292a19b48454f91c93a3132559fecf"
-     "07066f1f737ad3af3df674637aa5efbb844bbc441966bae73973481628e5c2c67cb74553"
-     "a7c8f2c5fc478edd8265bd6c99d6ce122a245e46fbfc21992b950f04cbda5eb220261316"
-     "c5",
-     "0a5b86b76f98310a25111cc3d1b0b70fd0c20208cd0bfd8007cb569a187c3a97edd8e716"
-     "aac938900c3ad8ed3a0d091a18555ab532b50f25184454d84af2beafadf754862b8ec74",
-     "0de2eade32f537727eeb82dce610b48106b277d15d8fbdb77cd312ab9983ab21bed05f05"
-     "186a5cb2b530ba72c8c68b768c26d942f9224c6e6b9e7827c48e129833cb679c70aeb29",
-     "15e4fb92190bbf8dcf7548057d1bd5e5ec54a6edf54f6b88f50e96ac87ed7a7b7c0fe1e1"
-     "174ba3e822fb7e7c083948296cdcdcfbdc4bde036a07f84d210001ded91c554ace71efe"},
-    {NID_sect571k1, NID_sha512,
-     "dca1b7a9a313ead11c2d54739d9017ae27f9d08b3544e418aee862bb57e427636cb6aedd"
-     "a28e10f12aa15d2355f4f8ef112a86fec5dc46e6acef693cb8fc37c3e4885f3be3d3ab31"
-     "ea4d73a0de904e95c7135a149f77b621d642f9bd8ba192d39cfc58b6f19a797c4f3b4f3a"
-     "87054298e3ce5eda0ff7f44f8134c9a108285dfa",
-     "05613dfb53149bf5fdc4e08ccc1c752b0b66ab43aef2d008ed40f3df40fcbb2938d2c41e"
-     "3ea2dd4428aeba9059a97efe5593119673866a19d27a2ee37dd357e22b6bc849e7e22cc",
-     "0407ef12ccf6b64c7ca64b5da45937281ec770ede572b9a8eb685f3614bc358ce550195e"
-     "74666af9bb54379c1fe1304b76430d1e51a9976bba02e5781154c9bc187a31201ad99cb4"
-     "8e043d4ca20f06b26d75be1454e96f0568bd740165a2bc6e5b8429d557a79666bb7b9cfa"
-     "597d392cc5b8ecd180c37f9fe2088d7908e59ff644ab05568d974ab42ec9e01676e1b241"
-     "69",
-     "10b4b67007af35942216e9aab1d6561bf7684f334a80c7d909a6154cfde8ef06a148af10"
-     "4d534d7dda59b5cec7949de4086ae669edcc4d68b88347d2445edd3037525c97564ce78",
-     "15bfb47a27c6970fbb3256410d5c2f6c04eb308569a966790636899fdb3122f9e3015455"
-     "c4b50a6bd8cf519afc22ea845794f51e6994214feacf48322af48590d02cc9812960917",
-     "090c61f6c64381845491dac81d5273d58c59d9cfeed214527a52c8f23b0146431692a25c"
-     "bfd77abba22d4bc61ef24093c593c827ef645853bc8deef7c3b07bae919152b90c17f4d"},
-    {NID_sect571k1, NID_sha512,
-     "aff61d62c8f5c31bbb7d0a64a6ac589e918bbf2f13e7ad13abb9ac26405e267249a7c992"
-     "2139bc28140833e10976b87e91cf28285274b2b48b63d24ac94c85c70fafa78f8ad05955"
-     "c0ce6c02b841ee196dab12306e3e3d6138371217e2b474f7e67a80bbb78a47e374ffe2c9"
-     "f86292e471c551da50d46e7b5c8331029f369767",
-     "11b92c8b72b86c51903387a65aa206988d443d1988253329ad3a89c902ff1ef8cf73b7f2"
-     "e4aaa352443bcb833712d94c3e637ec12cbe4c2d4606878576b17fae1512fc77785b737",
-     "04022440b63bb4557996b63faf19d9f391c5085cdc2cda3755622a6cedc676222ceb5a56"
-     "ec36e220e507973c0f07e4b2e2d565a69967804ad311f0658a9854b1eddfb5270f4a86b7"
-     "69050199c9e443555123f153249cf7256dc3e82c5d8cb611adca0cd4fbb0a9a90296bfa7"
-     "70c1b0c0b43e4363b0227273a9ec9f00ecf83afc605b0dd2e5e24f739dd0b4ef6bb11950"
-     "a0",
-     "0e5ebd85f5fd9a9a81067fdf51b1906023e68672d160ddcedeb35787688dcdc314359ff5"
-     "347907b685a718ce38a69be17de292eaef189fb9ee8c63271bd6818904cd246503dd227",
-     "051387b0d057985dce86cb962bbca7d9a047f70d96c20539ae7d6b7cb8bffff606f03b83"
-     "15f15a53049c6c1c227f86d395c2217d32aec32bbd406c790a6cd2706775ed8a0ba1ebe",
-     "0c7f3b7e4a8b65a58c1280110f6c2486cd2d2df7d48b49074e98accdfca4a72fa7d43bc2"
-     "5c6576279f4a70f22c98135ba79158bcc3452940963b556304da8e1ae88973d827bee32"},
-    {NID_sect571k1, NID_sha512,
-     "721017294f17ef351e41256b57a64a79f3636628c4bcbe676ac9a2d96076b913dc4b246c"
-     "9945183ec9bd2d251441b5101eac44e2fa1bef59dec03ccd7fa5accf3b7d094d68dcf78c"
-     "8de4e2f19f56bf0dcb3b66b9421ec3f8b353b9fd74feb2e9affe0bf9aa421b6f03eeba3f"
-     "fd58fba56b3ebd094880e50de01ee62a108a24cf",
-     "0c3c90d5ce4375a08b85575faa78ee6bbd9e5571ce5a90582042617b807339c282cdc3b0"
-     "03d82006264b1c08c20af4ad4549fbde53d262facb98d923d81b8eb6093374b6a1e84cb",
-     "0401d900b4f64c07cb959049f2bfa18012f9bc2dccec5a73e9a48a9d5d65499e31ec4a16"
-     "15c4c50177c032d388263eba1a90e07ea68f081e10272e88a41389bd2626961b646c76ed"
-     "8e05c094fedfb5b118accd64d5d46ca2ed92b3123a62042a556ffee9e3bf709092fff882"
-     "31a26917d368db51d1959ad3285c7faac16ca57677651b070aa0abad96f07d35c5fb8a0e"
-     "e0",
-     "14d4070307cd269cc1a3c048ec0847edbff46f64c1ba5b734d8a800e50a0a02af57cf247"
-     "50d292e2c247ef1b860a9d7b5069a32f5b0546fe9e019e04af62316eb79507281fbef6d",
-     "1cda7f743c47ae93a9fa533145feab4c46252afabe3d54990663b5891b4979c645ccaa05"
-     "c744420ed6fa235952f370f5aa187250d7b069aea1123f19f0f18da18fde98100ff6ff0",
-     "180b4163f2eba6e3769d8345dd8cb003ea120164442efa885eda5bacd75f8d705b7f1bae"
-     "2976f67cdfe984430e36f93455ee7528fa6febfe92e42a002da165c63dba8fc589e7851"},
-    {NID_sect571k1, NID_sha512,
-     "e2d1f33681759adb7954bb5248b0db3c3885fea0d4c1c0c226eb1e6d2d3ef1b9ac281a0f"
-     "1c2fe5175b67114b6a501e2426d1454bd5790dcbc4c232cf06b017de8a9bb39e6033f1ed"
-     "b5003e8de3b44cc3d6150c3c952afb442952483cc688908337b7c1a8b5c9da70937ccfa9"
-     "8b2b0098c530ff848010b8e8ee0a8d65283481a8",
-     "10f184c16228d9034271332178ed485d10b6aa76003efc160d63fea26fbbdf5552205ac7"
-     "df0d8c852a1210cf0ba512f20b798827b36ad56b12a826fa7dc1db45aed264ca6822659",
-     "0402637543ed8a11271bbbabb2cf72999f65df0104758c2fd6fbf3e1c5132ff1c1111fa5"
-     "504ee86bed8f219d5025f8ae07055a7849314d2d439408ea2b2ddc40320c57f5d41255d0"
-     "a6014e360137ae33ce6930b844d42bcda4050b25f349e9e19fc4fe82f5e4f73cf9bb5021"
-     "2ea875a5735faaa1d5494f1685d6c8177448dbf356b408ffc2ba0726c9befb9de9f0cebe"
-     "32",
-     "1146574a96394c82972eed1ab7ec98bd08f27653c565f0626fecb431ee4fc6f830554df3"
-     "5fa62b5f82eaad49524d3d4b0598cc7a2181ce9860e271812373d21be9536fc181c3f12",
-     "0dbf465de2c5242fb527f6e4a4188adb96a2030ed8417cd9431365173f569bfdd3e420f8"
-     "6947da10a703370d7f38dc43e2249a2476690829545992645c9c83d82af8adae893780d",
-     "1499782e0163f80de68e3a580ed08fdec8d6552ec69f186a74be89480be28a0df6acdf7c"
-     "65a72f115f8a59fbc28bb94af64cb3bb3cab20bd25265237a010370d9a5c781c1e26f3c"},
-    {NID_sect571k1, NID_sha512,
-     "414fc5d2bd56b30040e105cb891788792da595583b11b8fcc7320f40dbf64d9263532dc5"
-     "7344dd17573c95eedf851668b5d552e8796af205f3a0043af1a829fabc2e93d9af9091fd"
-     "d9e0fcbcc9d6d9ec960aa60e4e2964c29a2f375400366480e513f63d124db7745847310e"
-     "69a38c8455e4e602056a6a4a14a8694155e0a9bf",
-     "181baf9d497159f837cba58a11ca435c442e5ca792ea559bff9f6a1f562c05bf6bb5914a"
-     "fbd1bcaea75b35f88bdd832314b249a5298622c89462344d3f28a44ba3d059df432fc71",
-     "0406f3915f884e250034db97327470197d13f0716d1d810e43055757460dc252f5281717"
-     "b3ef3fdd51085e65a0e073e78b697a21bc33137213981fc05d9b34caf7dca7a4f99be785"
-     "96047a96ab5ebec6201b7c65ce7a6e70effeaeea1c095a0172e9e2c7bfc88f7b05ea5750"
-     "76caeab189f810258373cff2484f4fb9c8167989f61aa61ae27113b5140c95f7faa505d2"
-     "d0",
-     "10e9e6047651362accc816389b26ea6befb0e34fe7363126f8c4ff9333266f46d63c4d45"
-     "075480da9ebdd0f8da7224b470d914ea1d68cd821f563b574bdeffdd0b3ed73ecb9133a",
-     "00e36644cf0861f45b333092d44fdd99f56e89bf3607f75a06920dfab0ccb1831208296a"
-     "a2431bdb75c5d50f15bbea2e13d185db6d7175c221858fd2b22afbeca7431c290b15d3f",
-     "023ee3b9ce817eb0a6733c85062cc3bc5f1ae62bdf3a74e3ec704baab05784dbb5ed01a6"
-     "a2a73c80a3e754c013ba886108d9eed2bc210f29a4774bfe5508ecd876ab47a8527c530"},
-    {NID_sect571k1, NID_sha512,
-     "3b592cc8972a4782870e079b82a50f84b4c2d8ca90bd500d1ce5678982e266c391c556d8"
-     "162ac3aab967154d072dbc0ba1dab5545cf2651753dee2881eca5abd412fe624bf3f9d17"
-     "d33692d21ce23ad15ccffdfd250cb1949e73c9e40a64ebebb03852e92692dad1d7baef97"
-     "fe109f35b7a492b343d4b643a4a7b1723eaecb64",
-     "083fae86ab96bce99a53e50b7eecff38e4e25b21c4b0f6a4986915de245eae24f16b6a00"
-     "a4db159ebc27f5a6a072da94ab6be5bf75f5eb3f75c4452bf4ea7014392eb1e02706fb4",
-     "04078003779e0287bee54df31f64c58951df7999b48b647a6bac416f844485a4cd7a53a6"
-     "4170f9d2d31fdef0194a0c262b90e5bd33a1782d2ad56c210cf80abb5fb118cffd71ad79"
-     "c1073f89ebdf0e255205a7525cc12b7e1c58303ac3b3417183179c216ab8e47f33d0af32"
-     "38e3ae64d418ee89ef3a2cb4bc67a1d2fb1923947b9dbf3f4fa39ff82327d0ce3db24d23"
-     "24",
-     "13d126fc4033f537b00a81372031026f6a7a2062863a68e36c6909c548833d1a8f5fb5fe"
-     "25c7d9f2c65b1dfa974630204f71e96d657095b93cb54b00cb88f32adc08eeff4036654",
-     "09be9f4bcd7b8ef111337fb665379509b8b17a2212a80d5fecc685f1f362c45f930acaef"
-     "9df47c33c6028cf7aae424264575b4635a11edd6b005ad26cf2021051501fdd1b77d2dd",
-     "0dd196343ef76bec527c5929e02fbd5d02d5b0a4b5f2c8561978e600856de56d42943f1d"
-     "74cb81b67010bae98de0efddfcddea5d354c60c1fa76138801f6cdc5bc932c136309b6c"},
-    {NID_sect571k1, NID_sha512,
-     "0079a02cbab3dc02601fcb5c8607d555beef7cd71a66911ab6514a4ae21c5a9c0e166f8c"
-     "f5fb198ec5a49a96e17cf041f35f00406b79270ebfe56dc6b8417d2529fd625686ffbc8f"
-     "69685aefa2fd30a937c02f25b48be4679e6fde821de928b33b12470867def874bb8c7c80"
-     "38ab6594346a2c44b39210d3610994ba60a05e06",
-     "1a663efa7bf4d8479bc535fad71e9b5e4f4281aec55967baa008ba17ac2f89cc3398d305"
-     "73edef29d590fddce8cb157f655e92779f59e7a18d0327d02e7daf4c1216143b3688fed",
-     "0406b4bb31856dc516be60a0d2d9f42508738edd4f925eca9c72a13cf136720867babb38"
-     "622fe97df70a1edb35735365f34c74baef9aca539aa1dfdead3324f41a16ca69bdf86b43"
-     "f706c4a91d3fac9e7647a6aec6e4369158bdcca2275866bcdc5a09b2f0f1eba10551da96"
-     "13eeb1e8d3233316b62a5f4641d6aaf669b975dfc511f2437d43c9eebe53c5115fb4741b"
-     "80",
-     "0a843d0cf776878fa9ceb163d7aaebd29ba3aea0808c3459036b258b99ccae4e2444bc32"
-     "11b5898c0769b7d7e036c07803497e13803132b3c6301412af3be8eb4a853e939a247a7",
-     "00356e282c096fe1690fdac4c0c66eda155ec42356dfc4783cff0160e1d76b33a99442d4"
-     "ee0e3f6e1c5bde4a16c8e18bd18f98a178c3fa4a560d8fb8b4b1d72663576f8baf8672f",
-     "0c5018c1383fc3847819726e1e940028892e1abd164b413293fe50f219f2059105218e4e"
-     "3b952b912a3258c4ae52dcc03ac5f027fdfa448a8d58e3aa5c21e790b3b47bdfbf21175"},
-    {NID_sect571k1, NID_sha512,
-     "88573bd94ef50459814806efa868ebf92b066fbc2f7a4be9d2fa06b9dc1a72f72d783a6b"
-     "cbc107b18a6314511bff217037a2252e7a5cd34cf9d5b2fe9c7846931f0133b2e95876cb"
-     "800dc4ed7c4a4e4cc4f1195acf99fb0ec224b1f8fa8af71f72d390eca9d6be3879032a31"
-     "8734a63fec336c79035a43f70271def10c4955d3",
-     "0088d1a2c0219696a94337cd56516252b74139ea0733b17fdcbf7692c3e5f6c3989e5da2"
-     "aaed7468e65a5d578571928ca273ec3b6aa72cd196f560f05095cdc8346e5d31c4c2e0c",
-     "040357801cec0888461ffde22d83afa9ca008ac88518f4b09074d29a846f5900e024a8e5"
-     "947bc25ed0e5c980a58fd5e9aadfbfab31db8bec575fe886deda80134d91b3de96254653"
-     "020710806c7ed33f6879374c59ea144326f5948980c8013144345c5070122c0ddb7e18e9"
-     "f752eadf2a9b0854dfb7d9b2f0d80ff0ba46197ce6017885939e9f59b642a8fa41639ea7"
-     "5e",
-     "16940f69013026bafb6f400c037272176b04e35e9f1563d382dc9982968a186e3e152577"
-     "5d27150b34b8ce5e70b537f0149ce1a521d056b52e75da7e39ee8a529ed987c70b8234d",
-     "199058e36449ee1a3388d7357c9c1020b2e4c02144aea14b041bc584a752c94fb6e47495"
-     "9b24bd2c0c104f5ecfe223ebdede672298c29195033aaad5db1852ce4dc3185ba2409a6",
-     "11f3defd9b442378c461e2c68b239d2e4afaed691238c5ac4e0be46ebd461639a60176f9"
-     "884133900f988e2d730d34df5e2bd8a14681014c0a213f8d233b3c50ae3064fc38d1a19"},
-    {NID_sect571k1, NID_sha512,
-     "d0e02045ece6e338cc8ab41d4a064c982ccb1748c48fc2fe0a6f10bdc876094358a6a90a"
-     "45facec798a83cc95c6795cf0f0d7c66b77e22cb114c1432bfdaa1485ff35b6a58107cac"
-     "3b7e58cb4f6c87c68db60b751e78f1fdfa54b8923b98caad0a4f31226956d065c083ace5"
-     "f1e9e91944dcca51879d782e40358d58ca758750",
-     "16cc8a0fd59455ed8d4de561fd518df2e008f7dfaa5f7f29ac2489a411e233917b43eb3e"
-     "be2596fc824be58871949545e667dbcf240dfb5e0c615ade0179d9ea2a1b1ebb8ab9384",
-     "0402477e678793593e2abe837961895c7ecef71af1feb882ff27cfbabfa0ba3ed771b792"
-     "23e7b2d2388efd371d5c325854cd60e48484f818e1a8146fbb780cd6ce06ba63c0db67df"
-     "8a001b696114838bb972ec6d536abd809d3a436650191c43b2bfeefab2b400d5921a7eb7"
-     "8e307266acc190e05f3869017f0a66f886bd6556c58aafb1042478cc768a4f86758e9f4c"
-     "32",
-     "1e1b851bb95d2913d6d35b756d49fba6f4c127dbed80fe4068260cab89c1d42f7a6843f7"
-     "31e83b379ccd8a4915d2e29550f3f6ccde607cd0b066dd5fa41ac2bf37bdcfc26cd4d04",
-     "10d4291346685fe070b267edad91154df83664dc115f058ea036c712929634d53662586b"
-     "b50cb6473c2170db5d4ee43be0c50532015937202e193d15d5189870691ba65aead7f3e",
-     "0b2a15f1ef00204bcfb5108d8f1da96ac3297aa041074b68989ff5b6b276380de7887753"
-     "fe3d416ba691ba0b2ad7fc065ace02815b2323fe17f6445b0fa66dba5d99d8e7d557cd5"},
-    {NID_sect233r1, NID_sha224,
-     "f1b67fde01e60e4bb7904d906e9436a330c5cb5721fd4e0a3c75b83dade868736bb1d21c"
-     "fb1b5c6407c373e386ee68ec2239b700e763728eb675a153b8ac44cf2a87be85fe8ed668"
-     "3430cf4b7d718891cbf8d583d0a37cc952cc25fe803a7aa4fda80f05541a2f1f2601cdd0"
-     "c095f7110f2a84f7d641b8531572269b21cbe77b",
-     "056673197bfeea9bd7a8b820b4ae51a50411bf118a692bb9ed3d304da53",
-     "04003489be62e53910c20cb508de019c3e326f65051f26749944b4454f156a00f775ac38"
-     "baf19499675725e8190aeea16f52346b1c890d9583b38c7521",
-     "0a6c9914a55ef763913273b062475fd0188eb2d5af9c8c1dd97cb3cefc3",
-     "08601a42d7f7eb047e8ed9820ddce665c7277f8ef38c880b57109b7160d",
-     "026d6f50f0508953657df5d753c595ffb8e1c19f8d092f8ce8db54f76d0"},
-    {NID_sect233r1, NID_sha224,
-     "1d496d96b533c632ed6a91f6e3653cdffaa5b8cc0008b35e49b2dd52fe261105c2ec7ee7"
-     "1a4ad5d51fdc3d36d688a3b7ccb3b3b0c3a65be17b8d8aa172e3005cfbf37a2d1b1a6e26"
-     "8c090c6f318e7e96f9ec9b9f5a8fbcc7558d89e840f7e76e44bed91c26ca48e6f5cbc253"
-     "ca2fe8cb81c484cabd24070e488f9c00cd96ad4f",
-     "0468f01d483144e514ec257f2e5fdee28a927f2adb19714c1f3524dd0d3",
-     "04016b3cad89cc42b80bb730431963526e26ae3b415b421575dfb6ed973e1701acaf7de0"
-     "6e20262efae01fc80969cdc1a281f68e8c8bc0d2d4fbba3a3d",
-     "04d261304678301985f5bb3f6ae465f11c9fe0e5031b31f194969252703",
-     "0878a87b2867c03f55726ea2a6db822788f4aa4e9ef609997940ee8c8b6",
-     "03545153f0554a8f55301d4b948043de3057cace62c8032c8ef8a11dbf8"},
-    {NID_sect233r1, NID_sha224,
-     "723400655027f474446843645757f7e2cd466bf97275067b4bc4c9d79bb3b19b2421835d"
-     "69db916f24b77c381fa771fc1e7a19d2b4d09411ae55acccc615b16fd24705762b441ab6"
-     "7083a921fd4ae569ce0de69449aa96f5b977ac7dc022fdc8335656853796f54b3fbd1185"
-     "77f98920624eb0a00204f1ef83827245c06646cc",
-     "074052d027f05465a8083a59cdbf32600224e1f563f653b34314651517f",
-     "04006999290db440eb5b3291bd4bb4a1af6386654fc4d275ef136c0e03dbca01fed0b1f9"
-     "284e488c7fa2a010766c340bc25dc132c7679c2598e423c3c6",
-     "06e38460379ac3fb13f64d4de654d4fa30bd8178da0bfc29fab2a1e2e39",
-     "01b18bafe55e5c24fa2df4c09112b44d24e78dd09557349ceb1b916d280",
-     "0ad7cfa003267a6b7a99894f75720cedc9cbf820d355a6b840709f42f62"},
-    {NID_sect233r1, NID_sha224,
-     "155860cb31a142082bcc0bad828d747e916392d21f1873b3a3c1d28ca3ff9d45ddb66a71"
-     "2e3856b6afd07c8d2b2a7badab296a9775b03f6fec0befa2d8d6d00fe3938df244ab46e8"
-     "36a3e686c8b4f918da49f0bb3940bba34a9aa22c7caf02df7758b0de01d9f47af6146344"
-     "b9be3842d9c055eaf0fb399cd8db95c544a62d8a",
-     "01856e7544223f55f80de72a6ef3822fa8fbd68eb397d06e2d76ddd35e0",
-     "0401a117e52f09080625f85fbaad8ebe0d3ad410f034242bf48365e88ff7350008b8bb79"
-     "58d191265901a3f15b2919142505efeea13df6e42da8b0dc1d",
-     "0aa106ad1461353865706bee9aa092b00fcf1b0108ecc1266ad5d8b6579",
-     "0bd6fcf49029df32fe0fa47f39cb9428d95d00a84a5afb392d7b4b365e0",
-     "0b17734befefebf03d1c79e59c12ed3c57e7d120dfd993bf276de559588"},
-    {NID_sect233r1, NID_sha224,
-     "cbd6e305cc9f0dc90caee6e65a74582e9357bd25c78e33a7b14e1ac7e9397ff4466f192f"
-     "b432143e6df6d61a0ab808ec0a361a6d95a357a38cd3e241fe03ed883ccc364b248ee2a0"
-     "8702110745c2688bdcefa33c1a45b9c8b200e45cddf3e3f66b8d37eff07fbb3366ea1558"
-     "ef304085613c56707095724b3e134c7a7d3f8dbf",
-     "0860aa2b589f2defc617be73e191502e5d9952bf60547fef19eeccbca26",
-     "04006abc5619422b7d548c612e54df0385c293632d4d97c21e2e15ad98d0c5006c36c072"
-     "603681c1b03f6a023c8e987f39d931bc2a200eff82239ee38f",
-     "084fb252dae9a96a44212d18e15cc52d179cd5e3392ab9da57d04cd5a9d",
-     "037cd554e7815699f033ca9187ddb116777ef847b92353f613152c4216b",
-     "05f806dd062043420dd056998bdb9822b3177406a536d766c4aacdeee81"},
-    {NID_sect233r1, NID_sha224,
-     "812a218ff1ee1472c189f63386e5b8ab341671c3a4dad27a8c6249d1c0f9a29338b471b6"
-     "179f17a078b6504e804ac55ca3b13e68a623041bc1a092ea2adf3fa1124bbfeb161e6d7c"
-     "483433f1548763b84da00352a6386e1339f674d45dab13898147ede468e0e01d2c4e0ed6"
-     "6b395a16cc3ded3e952ac739205f35a83376cbce",
-     "0d0dec052a00ccebd0c0c5d9a08272f75744a2582cec7ddd924a2b022b2",
-     "04016bb8c3d319b93731f1055756e57bd56d50b6b9ffbe42735925cf6f7675009dad7b87"
-     "a749df130b45d9cac8011101c15abb7e64bd4fbdd94107fa31",
-     "04098547601430c723ebcb04b23e0f1ce8b1f79ff7ed3d05ba130922b01",
-     "070ea6221c0d62930b019faaa856ad2c84c3989ec54040bffc42d8dadb8",
-     "0aa20fc58beae8ccc880e7fcb48a471faa5baeb36bbe5aee71ed9f8adb9"},
-    {NID_sect233r1, NID_sha224,
-     "0204b1fca831919e89e108cf140b3770f531a696b1d9a4d1fb68809eb10afccc257cc90c"
-     "d36717c02b2f3d6d3d1d8a93cc5c48aa7ab9f9fddfe121ce9143376535a0c65e247c6558"
-     "eac49fd1d6d1bf431ba918c471cb3d536ad485ec51f6471a340ac75f160c4c54cd3ffb9d"
-     "cc123124b42df1fd2eaa005e3377c5d2d55938c6",
-     "08a017d717d6d1213f2b74c53281b07258738c0c7db649ea1ac46b9a3b6",
-     "0401eb379e27de6c04c5320cbc18e79ed9e8993710ac70ce823f1ab5762b6700f5521926"
-     "45d350361762aae79ffba39c33c2c5c0df208219f1b339016a",
-     "00e4822b2cffa327a8396301b21554da6fa52f418d67114bd58e850d935",
-     "0d64dbdadb4ada2d3a8892049f7fda3c733030522b44cd72ab850b77bd0",
-     "06fbae2d8e4fc04abd8a6e9cb011974ac851ec108e38f9c72603f7a04fc"},
-    {NID_sect233r1, NID_sha224,
-     "2033eb48756638cb56e2cc39a3e775cfa11fce86cf71f04487dcdbc7f262bc8350a30ced"
-     "54d1fcb697b28a6e96f88f782947c997872307ed963e1d68985f756435af77f57755cacb"
-     "b4c6b50ed419deec9f39f0a549a13e54254fa0a5832dba2d943ad4aed8688889a2dd29dc"
-     "b4ea12abd6a6c50eabcb3981c3a0c1ca5f0b9629",
-     "01b56c14442b084cfd22aeef0f8028ec57c8b571c9fc1e43de05c45e47f",
-     "0400d450c533b13b211b8c91dad0738402a5c811460426ee2f35ae068f2c12015e1c9f9d"
-     "398925c619f8aa0bac746eb7907d3d510814cea185a7efe771",
-     "0dca09773730a2758b7f4d9257a8e6bd942c141e46bde5ca54a79468c4f",
-     "0379773ebb7a2860f3422d8f8f714b234e5abd8860defb19c659c9c6179",
-     "0cb9272a27661604425ab84632f586048483b9f9cb80b9697898e745117"},
-    {NID_sect233r1, NID_sha224,
-     "2986ab1cfe8873009e932dc68d4727d77ccbbf378e43fe4aa7c54416346b036b89c0aad1"
-     "b82977c9fbc39a00f1dc916c0561d8dd70298c02b6cbfe572e0ef2058641e841c6875e85"
-     "15f3c1082765e046c90c956d984b76e0e8e6eb433ce26c1757ac5b13422479141971c201"
-     "02e9621d18f51096ae3173c2753facee2862d66e",
-     "05afce37c5594586ac46a34ae291f591eacb9880a7de92701977f447fbf",
-     "04002a069ef14f2989d2b715c5006642ba966cc84df88bbc27e713e15c47bd00f001f60b"
-     "8a8102a971faa2c42d3ea9cec37b49c7e6ec0cae9f7fb35713",
-     "09756db630ed9b708bf1ab8aae6a7559bc235c4e9f4002ed26e2f019aa1",
-     "06b9b2c1d214373647d9a2d24ba69741218064004614368915d5cfaacaf",
-     "090dd607329c27483fe43b7be137c3f51c23217c939baae40b53e65af2f"},
-    {NID_sect233r1, NID_sha224,
-     "aabf5aa90ceef91c2155f90660adbcb0eedb996f5242cee15468ae217058ebeaad8cd4ff"
-     "8cdc754a8ab85ba43c59fbab6386686fad5e27ad3848fe52191c7e4b203720841501792a"
-     "625aef2acb6e36493b792fa55f253effca682946ad8c77e01f44e92ec3c258d0dd98d318"
-     "3f4dc4a0bd3eca183794abd6232a6f9e4add8f57",
-     "00696df05dc7a54a9908a73eb18416a155cc8df4ab26032539d86eae537",
-     "04008f9f494ddf8d0030746a8c0b8d215dda6cc2724f411a7ea407629294c301ea2e9f85"
-     "f06412d29c677aecf624a83c2fbd86482dc0d564906a91d97d",
-     "0d62b06628d3884f0a329a7b6b4f832fabea4ebc85ee03e63f2967e7810",
-     "02e39824f272d4b74810594810957963c777207217e53a672010605b9de",
-     "0e64bc44af64b6f879f0d32f814acfbb98795ef7b2f246b3f91cacb55cc"},
-    {NID_sect233r1, NID_sha224,
-     "29ff209eabbde02b10b3fd559671fa53e418750c32c4a18d31cc0186d1077581bbefb877"
-     "0ed079f536e866414a07431ae6633955bf42a2389b6f8a565d6e4ffb4444336e00300938"
-     "76a26d4e3106e9ac697788e41f8a21c755eeb86a7c60f18e5e1069f16408a4c375a6a68d"
-     "42959f2fab7ac09736c7b37c80c05897d8566ce8",
-     "05ca31e88c5b2e96e433af2023a66095161710628e7bfa428944d6676b8",
-     "04008232d4bbe25536ea7f83c145a8d2b1cd72c383eefc2adaa1ce72c7dd9a0100b738c6"
-     "f1551b3240293ee8e8ec29fad0cc485ffc2cfded96b68162bb",
-     "0df9e1b418ca1d41d749ee998446ba1cc54bc8bf72eac6f30929b40b5c9",
-     "0d4248e0bb60fe46abf7bdb2effe804b9d394d8a5514a5791e149d435d3",
-     "0b89a459fb99cccebda754c4b2ae264c9aef7b5b610427f42c35dbe7d3a"},
-    {NID_sect233r1, NID_sha224,
-     "97765d876c80819f4004a36d09ccba78e600efc71eb7e869d3a00f658d2ace6769c7ab1e"
-     "f590f41fb070aa8e08615e138df45ffbb6473d4a86ba5fdf17dd6dc9ea9ee19c0332563c"
-     "99e6a3451c211d286d69102b47bfa6e07d468d9bde82e5c2063fb1ebbbed6086f542cf68"
-     "ba46d4f214634afb1146dd5a6f3d50912ef5b824",
-     "0ef8fe84727a2ad8bf4e646ef28a492adfaf785a3a2ba6e6f985c649a8c",
-     "04003435eb25ce9891a78c120098992c666940103eefd80d9bd64f1d4ba37b00ddd6a4a0"
-     "1e443c92afbc247f634b85f1c858a2aaad35a26f57ad4c9126",
-     "09753a236759eb32e13f19b9d2ad06f7b4db4ac7b1df96813463d0cd557",
-     "08408fc46149dcce0753d7cae0f50c8c5fcc97acf7a1a02a9f68c0b80c7",
-     "0b5ffba104acc6d0cba87523382ff928859718122c4d0d2298e74985d89"},
-    {NID_sect233r1, NID_sha224,
-     "21cf768d087d1e4eaa8a05e2008020e243116206d675c09be42ef2bc93617ecbb0575c87"
-     "3c6510ede9979215531b62126552738862fc4323d487992754e39d8f0d7e111e165ff254"
-     "200e05082f59a57ef649bccaef6f980094fad3b7ef93bceb161760e200f0a2e396fbb6b6"
-     "142dc84d872311bf932b84616b22231747937d58",
-     "03edb94b8c62f9af30c14a790c0f5d65e362a21cd8569b9725916d534c0",
-     "040065133691b888cd2513964b5a905ed9334cff6367e25c09db1743045d5801408e1ac7"
-     "21bfe2198086c1834d484b6e5692c037e09928cff87f4b5a88",
-     "01d8f800ba05d8173b0f1bb3aac0aff68c6b24cf98c28f5a69b0b5a52cf",
-     "097c07d4352e39e1878c42fe97ebd4c3ba5098706879fad9be4bb2dc2f7",
-     "0bc669db3a488e613665cd26da7927c6b6a073ba6b0951c00d22ab1ffd1"},
-    {NID_sect233r1, NID_sha224,
-     "7b8e58eecdab3e40212bba6bf284f9379265b3d2baec3e4625aa08d0ced851da193c292e"
-     "c793dab42732c07b4e94d8b19c83aed796a7e3a6c2b954a7a9a1ff9b2bd4ca62592c8b68"
-     "f709f1ad38a5c8033ebb3f33d176945bfc68e9ef2b0cee2d45a13ce89d238a33c09ce2c0"
-     "c63c4233aba5717b85c4c161dd7648a41a5e39d8",
-     "00a7519be62562318da1b67d22cf8e720353d22641e0cee11c7a352bb93",
-     "04013b63dd8ca9044a3e518a67999a781a5b62994b6e20454003a9bdb8715c01a2f9bfaf"
-     "528b7f5bc8c3b02eccb71666c83e4a598b4077de999d90fe27",
-     "0992ba1a8331bc4d88be7dee06f96098bc2ea56668f345e187f32f38171",
-     "0c55b45bc7bc3092ffa82234b06ad45525b45f8904011f1bd6cd356f0cc",
-     "0e6163e70ab56d43fa27211b98b48f1cade127237bec1c6556020d39990"},
-    {NID_sect233r1, NID_sha224,
-     "f8f268d2b04fe47e5052c8d0d653787384b9654f0bd2138a6f52b80713feeed452b976a9"
-     "0eea4edcfbb62d04f3eafe172ddebd7cdc3701ecd6008e3d82e8eb217b13b5228839f610"
-     "75159f3bd1e1409c08903874b6dfee2789dd72c208ae769ec8c7d52552a2b1fd73dad24d"
-     "e8b571f88e2184d0ee7d063a121187f97e746f2f",
-     "0264022fd7dc2328a6436b522793ad9406d7a586667a0daaf1bce927338",
-     "04012d7e7f8519a7e357510adfca2f50182dc5fa12fb2a77409fb781ed500d00ceaa9a22"
-     "b7ef9febd8a9962ce21d83fd2a2a938b9d7a78d669dd233974",
-     "026fb8fa6e746106500dd29ee32bbd03b94302ec3a123356b23b3055e51",
-     "0f416418f7aa4d437e7606afedf961b968a67d9a1524d60fe3f6df4d3d0",
-     "08d3afc975a8147fa8230fef4b16e3024180a9768702038f955357ce8df"},
-    {NID_sect233r1, NID_sha256,
-     "d288768cbd066fad4bb2500b5683fa9e4eaedfb3dbb519b083f6b802efda0a022355565c"
-     "5fc6babeccb22f3adbbda450ce5d633193d1431e40c0fe631a295cf85965cd3f5937b318"
-     "66bd6a5300eaef9941daf54d49832acfceed90e572ef34ccc94eacd0fd6b903fee3c572b"
-     "963d21e2881656a214d2a4c125778dbe3bbeebca",
-     "0da43214e2efb7892cc1ccde6723946d2a8248a6b4d6c8872fad525ec3b",
-     "0400db09738bf0a0dd777f67e82be50dc8c2d8e91598bc0b8d4486f67c04a5008ef463e2"
-     "f37ac7c3d276676cbedf17ae11e767ec577da7ccd90cde3b74",
-     "0249cbd55e307a0fd10a0c70b1c0d5e2416f4d7f144779ddc11911f4a08",
-     "04d1c99f9d486fb92b132d68c0173df891ca757572f7acc03cb41d46bbf",
-     "07de2deeb58d55d65fb37f600d916cfa49f889f02ef53dcce412703d1c9"},
-    {NID_sect233r1, NID_sha256,
-     "bf0ab46e0a756c11229b0ea961f8d57218be5b00ab8b0e91d7664cdf5e0341c412c0e992"
-     "d26ab12115197db39df2d1a6e18ed26a91be461432a2dfc21d98cb16003e339b0b0b1f10"
-     "0e4e6f4824ddac5442f22a1fac26326ed8a89cc91343d7223986d485cc8c64424e84d56b"
-     "e536c57e4dc5faee459b1958efd79e07e90a9811",
-     "0aeafa49d776b61f6a30d66ff64bd40dd8d79891dd5293c1b5cd3b46a7c",
-     "0401ba1b87b16122e6939da5dcadb8902177a9f9ef09194c8695008b80b588008f51ee5c"
-     "ea1f4fc9c44c70df57326ff121268bf4e02cd9b2626fe7c1ed",
-     "09d640ede5bb60b9aa78e393ed453b1643f6dade4aa20e994db53e81fac",
-     "0277bbfb7479077d5fb6813670fbc7f46055718199550130b122a7cb8b3",
-     "0f8dd350bc0bd2d84cdd374c56ff2341de4102269a1e80df7e35969d4cf"},
-    {NID_sect233r1, NID_sha256,
-     "c7b1eeb7c19eb16e7f42b61d79e421b71de797a6cab4e0baee522fee7acdb533f7bbf585"
-     "5316544e1b82b4f2a18ad0a2311e7622549332122171f32fc62a90e408207e0fb90d1b05"
-     "2821dede9c41b15b6e07d84d5d7b9e31e6396a8ed229fb6232b3051298dc5321aa589f4e"
-     "289d27169f14c8cc93644916d9b72dbc92c43488",
-     "0e95db309f4305b621f51f93588a2678cb19aad0932f365fa0aaa3a3895",
-     "0401177eefc44b6070e2c41537e75c91e2f08908c0d950bc90cd2f4720b33500f751312d"
-     "de55b1bcabf31665deb6c12d043d5ccc89800622a557a7ed37",
-     "00015798ef57a771d62d194389817c93de1b225398fcc0d2b81d94054a0",
-     "0eef7161a167f69a6c89b0f173db2c4a7033b5d801c0d89642ce65e377b",
-     "04043f8985bbe0221fd595f9355c33e1930b5e10a1452e81c31259e1e3d"},
-    {NID_sect233r1, NID_sha256,
-     "a738eb074e1f277dc665118ca055e6328059ab26da188c16f56384c566e43df8cff3d2a1"
-     "0d2d15c3c1406de8f734b20be5dd1ce937a4289f0ddfd7bddabd03586556eb8233b8feef"
-     "edaa1f49bdec6d45fd562c2a83fa9fcfc2013bdd77900857199e51fa9c7cbeab925ba8f6"
-     "c3c5fae46bf8e9c574b302f1e5f9c44400152a78",
-     "0d4319cc8e409b8755880827f3200d3f0f1c64d6356fe74eb1f5aa42499",
-     "0400bf65953f2d08477f7fd0428c31125184e3bad4d5da00c91991949e056200f1669d0d"
-     "116817d625128ae764b3fde956432552d24d98f08a12925afc",
-     "05e8704febc38bb8ea76f3c6433c1f0421dc5e5af959723a5a2f0e9a970",
-     "0307c0b838c65d1a47792cb367253bf7c9f627435f1c7ed74494b318446",
-     "00031a9b35e935be6620243f4878a38d4e617fb25f7a4883893366f39cd"},
-    {NID_sect233r1, NID_sha256,
-     "b28103d77e5457c42e026e713ea6ff03722a36512da17197140117442a976f9e2139c54a"
-     "759fc26af5811b455e5a0d3a95362d9939c1e738045be9237b469ae2106ceed7e7842b44"
-     "cc0a475d5af6d781e32ff1dd1f4e1833dbc7f82b27dc7e1562d0e29213fd8911105104a7"
-     "a16f665b926aa137f70d868c90e72f8ee2c95b64",
-     "09e556c945052e5954915c773b2d47970c521fcc99139269c3ef46093b7",
-     "0400db68c16ffe64bede4a849812df0b8e202f74500cb7d5349aacf7f3f0260084b5892e"
-     "a74835e96e9dfb1bb201a4dcaf32da25dc00dca019d806f5c9",
-     "0d0c9e0b6d4526d5f6494d2c72f812fb8d26e17c7a44f6b5e3f9e684cad",
-     "0a379ac253f3aaf94cc49e91fe3f2908107a9e1a4d102e02395eb18cf08",
-     "0854c2f6ecbfe95cfd14045faf71ad47561e365c1dd5f515d8817c3198e"},
-    {NID_sect233r1, NID_sha256,
-     "463d04c84521ae671bb35c0a7acb3ae509b1b0470f39b8fe7ae5f3c9fbadbeb2bcc3a87e"
-     "284cbdff07407a351f7ba743aeac50c4a1fef7375b90eb4af8ea2df040776bbf3e4389e7"
-     "a80bea40530842642b9895ab9ef5ac8ed6c9ce7917d7b3ebcf80b801da845943313988c1"
-     "970e7748cc306f914c37414f8247d648b580000f",
-     "0becc76f8a77615c4f92ae1f91645bf5bb908e75ef22fd544aae63a3c8e",
-     "04018cd93bfe8fc8ceef2b9be14fa947b60fb122f5099cb5bcfad0cdc601e8016de11e67"
-     "3011e30f6fd92025a60d7938412ac63b19d23e45bbf53c6c4a",
-     "04e75a7b92c42ba0581eb1201fa5b3fb2ac82460e953c26ce6bc60e145f",
-     "067bad23ecac0883d218b1368d822b3bf9b82453c0e5f3e336777c6a507",
-     "03788a331249463533384a61c47232aee6f057634c37560ee25895b2a03"},
-    {NID_sect233r1, NID_sha256,
-     "8b2379b5553ae7db6023cb010e26ae91322bc3f94dbaa369481936f90a886e5d3827d995"
-     "ccf03ca59f46805fbac0337d31a8f117cc7044218a934d5bf507090e7e21178a7162c8fc"
-     "b39111e6967803dbf9d752f3ae737ba024d0f4f7627e08be58efbe997a164106bfe37f67"
-     "d2f19c0fcc7a6c7eebd96a72582a9c7bdf881896",
-     "020572c2a3dc3ea430cd8cde9d642081c21658e8bda165550cd9a5d37d9",
-     "04016117486794f14d171dfc3ccffef0396cc9fe5aa45d6d39ce0f252c416801b6a12fe2"
-     "adb279dbbefa4eafa273a2ddbafb2c6401067a5ef5e859fdcc",
-     "0edc8d0b64496da309b10630e9e5917c9a807ccd7cc7bab14360873eeab",
-     "0e1fdd3b7849806fe587ad93aef737ba0472409b7239981f0d325785fa2",
-     "0829449a0c39071a832664e8148e762efc36fda9e030e0d062458728273"},
-    {NID_sect233r1, NID_sha256,
-     "3090bf7373731cc44c00372c1ac59280b0f36e627ccf763fa68a7be37bb0ac8cbd4f70db"
-     "54fc652566c78ad268f78f015e4bb1e41516fa56ac303a3bb4a52e1fe897d8338db5a6e3"
-     "7cad685e704b994504bd231c7dec0002dbd907a7ebfa809833e32eb23fffdb44fe4a18e1"
-     "1fa19d67356cfd703cf39a75b1a290b8a7c73afb",
-     "0769cfbf2dd8248ea1e0ac9b275c9d6ddcf923fe762079b9ed62ccbaa89",
-     "0401aadeee0e31ba9505da3e195d883643d260dac9fe5e86102c8ed7f88eef00d925bd5f"
-     "d700fcdec60cef9c9fdd304faa102d9d721b4f21291f8c96a4",
-     "0f2e203410107c075e25c4adc2f55dcc277883d679ea307df7d52060fa3",
-     "02fc0975c2e70328da4a0ad2b8bd344a8171c2c500c55b1c92270230c27",
-     "08871b6791f7d03796a3aa537fa820f0eac8f2463c9f918468e7588b784"},
-    {NID_sect233r1, NID_sha256,
-     "c37389cbe3f46eeebdda343e354ccd543e96b0c2a87e057aa6b9c4895a403de706d658bb"
-     "c9066c140e50fef4b56af2db1f42efb70b8021254649983f1e11d04d6b10169d5a1c2093"
-     "b6ab89227b88a30537c776bb7575749c3ed87bcb29effd8e4f17915b4d5dff6cab9678d8"
-     "8f33abead1e73dbdc5c3307ff3d3b2d5fd7bfa83",
-     "040ea4a37b388f0cc464f7e2bf92173107b268ff77a8acf5f517b4ec0e4",
-     "04008acee84d29638a7285654d20f8e0653c7386140aba0bd2fc157d51764301482ba5eb"
-     "b82ba46654aa1eaa6a5f01e030177318921a0c99fa3f6eee9f",
-     "0a6fbf938e9cdd009c838196ffeb61f7f545f7e7e9a6cb18d1f595a87b1",
-     "096a80172a7b3b65c0a8acfa8b89cedf9cb19f6eaa5d38436c300b7c0f4",
-     "0b7bb96ddfc9d1324bea96836c557cf88d6ede9a93ada8fbfdfcfe56244"},
-    {NID_sect233r1, NID_sha256,
-     "8884def8c3b9c5f856b9c2352c85ea71aae3c8d0e84ca74e70e404a21467159fc9826548"
-     "d16dd1ec5a75dc2c23ca37b30312f25e1194e0f9385a0499db34c855412bbf58979ffce7"
-     "fc3afeb7b8dbf9898df44023200d809f520db99eae315b5cf85674fab008a20340fae8f6"
-     "974034fd3e55bf08c5522a460680218f9757e368",
-     "037fc7898df9b37b5390537352f5c0b8de22659166c19d7d4df31c3938d",
-     "040198674b40d2a68ed94d5b2c51102393d1332404f75187130669b9de0df9013ee77d85"
-     "4a60f1aa74041ef1fb58727c09f13039bb4b33a818dfe9af2a",
-     "0cf92eebec59605b1d45848f5d06e93ff2767dfa282929208ba801a9fec",
-     "0f7bd93dd4df06219fb974a4e85030840c7d4877f131adccbd98cbd25de",
-     "0c2c4a864459488eb5498a06b0b56ce7fc98fb29b1eb9b6238da8cc8f52"},
-    {NID_sect233r1, NID_sha256,
-     "f1fc154d469433f56c2bd42aa52237a4a4bfc08fb6d2f3f0da70a62f54e94e3f29c629c8"
-     "37e7adf0474fa8f23251b9b349a16848942c0d9cf5db1d0fd99527020dbe21cf0b94a9aa"
-     "21f376bf74da72d36f87b306b0696771efa7250c6182b426a4500ac14de4a1804b38db8d"
-     "4f3beefb8c9bb619ac82cb63fb37c2e1d22951f7",
-     "05d5069425e7a9925d2cfc6360a708147b2c1b55ede243591885147ef3b",
-     "0401f35f161ce0963dca70066b3a6de2a74ea1941a27cdfabd9e433d8084c701d5d9cca5"
-     "b741b2321d8511a777fcc2515c99ff8d13ff20266a163c94b9",
-     "01b9c83d36ada7e9367790ee850163ef4420104e0dd3299ef6d65191d7c",
-     "0dca4e804bf74aa496c15025acb4232c637c9b81e9e26d6f2065d6be21d",
-     "012014f77a4ddb7b266abf2c65a653988ee6f913e700f3f83f3e78c88ab"},
-    {NID_sect233r1, NID_sha256,
-     "885cd348f7983a0721f96c0e866821223d3e5a95178b16d18652b4062b1b2278aed6f54a"
-     "b06f7e37ae6ce1020aa3eb812d215194bcd212302da5b971fd86aee1dcb23057dbedb569"
-     "bd0bbef80df538da69ae2358cb03bb77c64d3ead475c8c5ae5bfbdd75684b421a26f1a7b"
-     "0c37548fa32d805acdc91230dd70a48232a12846",
-     "0ffe3e7b82ca62b96e057ee072a4718ca20a6cc9a3e51e4fe8ed7b4b9f9",
-     "04010f774adc83c1893894855366f1db1962bc697b8e1d047a01a08b12da4a0078c6ff63"
-     "4d5dc8ffc4d8b1a53bbf94046023095a8c2b41618c4330a4de",
-     "005a4a50de4e97280d6ed1324214d91b271deb649a2dae18d21a0182022",
-     "04bc8ba9ffbca81b5f19f0d8b1306900ee642bc5cd9a9dc9867a4531b04",
-     "0353567acc062b83459017c70cff4f3b8ef0925032b51d7300261408549"},
-    {NID_sect233r1, NID_sha256,
-     "ca3b0e2f1c7db4e73c699f06e432bb0f63705ba66954bec4a259bf31c161bb4861476e2f"
-     "2f7dde9d841d1ea6bd0990cc793cd7a10432e38735c3eeda7a0d786e8821239bdd6c4972"
-     "c96c2cf68ec5b935391f963a50fe16af2719c9029943b539ff0f1f5645962a6ac46c75d2"
-     "037fa0c7cd46deadcdfc66e1ddcaada3a376acbf",
-     "007a9cb5ce27c763646de414ca2a4dcdb774d69ed2bde7a817baddbc9de",
-     "040086d4ac1e3d54f7c154c5370f5c9a2d22cbe8f794df68974706bdc9172c017770a2cc"
-     "ac923423137731a14e97f6ca65a8cb3642eceb4e70c78ee929",
-     "0538b86e0a899281ab56d28f40bf3b7435f9a57e334a3269233766049a6",
-     "007ceaac3aa0e260c371843104f5cb91a057741b38889ee796e69f920e9",
-     "035eedd44b036b843deadb8e8df9d96b16e719ba350a634553457ae71a1"},
-    {NID_sect233r1, NID_sha256,
-     "4b0a31b746763beee77cecd318b90acf50fac4172cf4bfb354e5a440f651cb89d7a515e0"
-     "9ab19e9850803ab9167c2aee3b395a5da10dc9aff799d73756dfb0a9961d93bc32f15a96"
-     "bf13962a03d5bd42ddc8b5928def7fc48fb063f42866fc5f96cf88fe0eb125b7c01906ad"
-     "6a7fdade28ccb0a421ceff50ae03a974671b2c27",
-     "0c03fa9e38dc1c697f70bc6381f2bacaf860bb5632fc837f728da959ac9",
-     "040195f386c7efe108fd1d580f0a77031e180e45a23911ba983217207a904b01a6837095"
-     "a64f71ec53ab1c0d9a3a39d69a514065d83f1af26870e41741",
-     "0d4f48085b367787a614b57c06ee8018b2e95e989c2e8cf355e71db1091",
-     "0391710f815babf07b6287b7aab8b9d2ce04bee2a144f4d4a46fd17cf77",
-     "0ef29cbd771b8a6f414ecb73b7937ffe0a108593ffc6899f28d4030a9eb"},
-    {NID_sect233r1, NID_sha256,
-     "3011d42792b21c0f1719faf6f744d576f72c5fdfd22b1a520d0e8d47e8c2b06823d853b1"
-     "3c9fa039fa30a6f2e3e27bb2100c6a35f55703806bbf0f79b09d0f629f8042ec63fa0406"
-     "2f15f2edb92b19237980005566f02bb12a40b4ec66e4ba6c599d928b33f72d7437c0e399"
-     "a8e6a9068d1fef24917fc4f9ab5464ea6684dde9",
-     "087dba00e3fe4802e01718017510094924496bd2785d4ac1a352c530473",
-     "0401198518db2d1255aef955b9b80471aba60cf6d8fd1feae6d8e048ab140301833332a1"
-     "16214e4d9fb37c8e0ab7552b87348434a67a0c41f73972dc9c",
-     "0378578acdfa572b1de4e032158b28bcf00ab7dbaf07b0e772c39603216",
-     "0be2cb45d527a7685139290f1098de975b69957fff2c5c29059ce417950",
-     "06abf4afdcd2990121723b94ab8145d01cc4917cd70416620ef100c67bd"},
-    {NID_sect233r1, NID_sha384,
-     "05a5d3a3b79f4e51b722e513620c88092a9bb02408f5f52a32e782fd4923f4fd3094fc55"
-     "36caf4b645d830260eba91b5173f3833dd65600fb9e246aec968b1f6ebdfddb4059fb2de"
-     "7e636ed60bb7affdb74aefd158e54485d5f26be373cf944c6570daf8fd7e4b77fad57300"
-     "667d6decf5c65db99ab8763bb4ecbb09fdf47e3a",
-     "05a387e7affc54a8fbb9157b5ebd400c98e2d7bd5c3e095538987d4f8d9",
-     "0401a97224cafc063967b25cd1a43283daa5411f3eabe9386b8b14c9768c29002cefaec5"
-     "141bcb084cbc9aebf28fc59780897ad1424fd439eb43eb911e",
-     "0fb7ec3804654b9c3675f7b3c427f6d01f83872e96de2742e59c93151fd",
-     "0808d829d78e65eea47122c92f8c2cbf5a8d6717a057ef1659fb6f8cd3c",
-     "0ef338e09dac0b12fa6109d15924efb694a0b672afb4ef05f4e6f2f7b88"},
-    {NID_sect233r1, NID_sha384,
-     "247a101c8196eb93a440280650ad463795690bc620e46e8118db6900a71eb493d03fbcf2"
-     "f73a79bb47aa8e2d8c87ef70e4cfae36fae5c45fe247d8cd0f7d0718dad106526945014b"
-     "4f3bec324897d8e1fa2f457b8a68e61873b7fa0350fde3b87b7b001c13953c2050a24f71"
-     "fb77eb455053e49200ebcbba7299485c0f1a40db",
-     "0adae709a930d6f5a5c0e3d8ef4aab004d741d23f0ffb8287f7059890c0",
-     "0401541eaf3dca942957c48d693d2eaf2a456646d2fb3eb8df1779b917a9b00097379582"
-     "76dc31852e57063119f1d2d061616b6a2fd35b4a1a3f046954",
-     "0390d5ed395f8ee3478c2765525c235587dbf5bb2316df3a1e8c664185b",
-     "0ebcc4f84bf2deb9b3d669158998fc96d7516580675e24348ca58d70d2c",
-     "0b99462b85e6ce6b46e5aca221250ac9de7ccf3e63b38919b61700be866"},
-    {NID_sect233r1, NID_sha384,
-     "a16678c71976a3ce3362ca379b3272b92e8ca7085b43752473db34e4d6b61eeed3875f49"
-     "f3328366fc9d0644824e0104817de458e4c1036636b18b83dbaf063f2f99818959224906"
-     "571c7b28873d9c702360888df151e9ad1a7003e6130033203acf8a69889be6ebd90816f2"
-     "abf0764f10be68653b1e56766ecc3150bef8b042",
-     "035d391411e6d679751092c4ea5a079c591e77ebdcb57c1d9006ae70d90",
-     "04001298e6f1612f90dbd2eedadfa8ecce22dff1da2d1cf057c41bd37d4b060073136a1c"
-     "af7dae2aaaac571a900135a51ef031643e9d5f01934333b864",
-     "09e343003670f61db85aedc0249db21953d232bc45488c3d6ceaa6072bb",
-     "04ac435e88f8e487b9b217e7d68fbba9bdea0b9685769878818f25e661c",
-     "074d8f4dd58c922d7e79f30950bd54c10c1cc52ae3b8d00b675c8e501a4"},
-    {NID_sect233r1, NID_sha384,
-     "bc2f080a7f0b69a6b142b8f3fb481a43bd71d07418df4f3b802568073c1a8d35729ad197"
-     "f34a4e941a6dd511c63f201d1f6c34a1b66545bd5f43508c10bda1d6ef60ee5bdd25dde9"
-     "75e50c61f76cd36d50ee3bd8dfa2dff59524db9ef12f1e28d109b552cb42f021963f559c"
-     "843476b5c889fc567b7840297c5a480e18c221dc",
-     "084e79093f1947d6ab9cf399782436e36ef87c59a4c090930c9a74ddb10",
-     "04008e756774def210e2d6f76d6e4b0b43d86adca0880f017abfc911bafb5a0147e6a20c"
-     "1aad897829339630c5edd327ef9a7e40795630504318cb71d6",
-     "0ce780ea99a344d67de7921feba6ae062817101068266d5d1a140d2b49e",
-     "0fb2474b854b8e5d6920ed90e69b5b386a1b26a947b1cf28a13f7c5d3ac",
-     "072722017a67ea6754873f833fc51318d41d6ef598d3ec2d3e0eb5bf41d"},
-    {NID_sect233r1, NID_sha384,
-     "ea71cede8b63ddc5648eb244184bae265cd65d50f77a9e25ff93f02b132487c08732544c"
-     "b88936d4fff7c0fedb39685822dd1c9be1158f647c605c9bb5f6a1ae34722fa08882c14b"
-     "36b6c93cab33c9a269c7c10f755b6453ed045ea3e56f29e95a9404ba189a0b4884812039"
-     "2b4dcac43148b706c3d9e4c03db410cbe5dca3da",
-     "079b6be015b8006f86fd81c2792bec6b42c08bee2d295cf9dc214c326ab",
-     "0400e24338d5e33ad12d41eb623ad0905f64d5b75835fec4e693eebf9bba100101b4297b"
-     "5b62fcca7c61637a2a57365e911d3bc7eb0fc7adb0a9dc7bad",
-     "0f06b001e5f874d16632e3c8d49f13d70f48ed4eecaff9d3b741f9d02e6",
-     "0de16d8fd7bb1783a2cc4b9ac1563eff3f87e4e6d75e6a32a4aed1ecb02",
-     "040bdb1197ee8ee51e4ecccb8d42dd985913809c131aa9224049425a052"},
-    {NID_sect233r1, NID_sha384,
-     "319b41d16e18059a1324c37161c937e882192cd949c420ce9c59208a0ac208ebb06f894a"
-     "7fd78df2a3c5f23f25dee6595d3dacb25a699f115dd482ccd36fc54ba29dda279335424c"
-     "86b07a1b1fa76a5411bcecaf4d37065b229cdce0bac75b666c6626ec37a716e9841be93c"
-     "907f87453ad91d36846561f284421a89013b88c3",
-     "0ca9d751a060fde64336cdc88122819f4b3cd1b4e7df42d495197787894",
-     "04009549785f4f9c71f20133f5a1d409b244df55445beec404cf8cd4d2cadb01b246647d"
-     "7570f052840d4cc01182d1dc3bf357b25e5966434e1c3c2a30",
-     "09e99fe741cb23f7eb039f5df8414d069b5c2e3c144dcd6cbc6da56ef43",
-     "0cf00f519c18e7a0fcc84c1e338158399f16929ad89842ba97a4afb5bf2",
-     "05854ee1a6aa5a6a74bec0b4696e80aa275210183c86f45dde7002d7ae3"},
-    {NID_sect233r1, NID_sha384,
-     "aebeee215e7b3d4c3b82db243a47506ffbf2263f6fe9de5b69286e8649d9218367c36ba9"
-     "5f55e48eebcbc99de3e652b0fecc4099714ee147d71b393de14a13e5044b1251e40c6791"
-     "f533b310df9e70a746f4c68c604b41752eca9ce5ce67cdc574a742c694ada8f20b34d0eb"
-     "467dce5566023f8533abfa9688d782646420c77b",
-     "01dde4b2d49338a10c8ebf475b3697e8480227b39bc04253a0055839e9e",
-     "0400504bd3a97baf9852d6d46ef3db78ee7555db752120d020cd056b1b4e50018dd305f6"
-     "a15e91fa46d2a6d30f2ec8fbe2baec491e26d9a2ac81155c85",
-     "03b78d2772b8ce01a00ffe2e6be2f9e2ca2c89ea3b29bec6d6cf31afe33",
-     "0c0c51fba155f98900eaa2d2935acd615e917f9dd979dc8d92f1d6e00c9",
-     "08c8354f95e24ed13d8ff3755e1122dbb4117c76b21b3bdc7f4dd856f8d"},
-    {NID_sect233r1, NID_sha384,
-     "8d353a6b6f35590baef59b638914d3e934d0145b045d221d846517ceddc8ff5e3d28826d"
-     "3459f8ce1260f705e80923f39abc73d5949aa7aa8ad1734be0e992bff0c9a8f4cc9bdfa4"
-     "30d4cf52e29d3737b0cd3231b72b16e15e1a9040b832e4a920b4a1d94c4964ac6c8abb75"
-     "bbbdb10825f882ae44c534c7154c446421a04d87",
-     "02c8bea2803fd746c874fa110a716538c179c82712f38d33d0f6d037e7a",
-     "0400a034560353561cde19db89dbcad5c9dcb74e239efc604e86ff38a0577e0185e0b02c"
-     "48be2e90c916a7c8ef2b41a57ea8d4f21d8cd3a0878a03875b",
-     "02e39f851c57643bd799c4f3b2fcc5eec8ff7f9e9e279efa647f969cc6a",
-     "09b2ad7efc7ed60d9cd3dedbd4159b1e05f05ce5ec2d2cdf7a0e0657482",
-     "03fcbd4ace6a140c8bfebe36ff30848966bb0d3eec323cc8ddda55faf00"},
-    {NID_sect233r1, NID_sha384,
-     "847f134b90f10ba3636ec24f36a94111f26d58428fda5bba4501e58c7bb55809f52320cb"
-     "e9e0df55af1e40bbac9f3eaa26a55d78b60621d4356d090d98363662f406367601eaa9eb"
-     "9568b1a1b319730bad7bf6a7ddf1b45eb6922faf8d065c540b671c50df758ebf8c4aca6f"
-     "01878e5e0012dd038c58833e2b13ebdb9a9f3fc3",
-     "0b9119b3b4b30cbfb98ddf0a4f6953417e515fcf0e5a94e83ebc1d1d14d",
-     "0401be65d340f7e99067bbbf961c2b357e1fd47a74393cae5f93a40c5dc28000c04cd8ca"
-     "3ee253b99e44ee6bc0e52d2f016b16f59c738b9f2bd8c1b9d8",
-     "02c851ba0123ff0543808931ab3857b5c15d7c10c343f232913f6e0c92e",
-     "0ba2b33550878e223cacb80e45e382dae84e76bca5a2ef8371b84d08572",
-     "08c370f82506e97cc15837f59e9779448decbd87bde0a463bc14b18edca"},
-    {NID_sect233r1, NID_sha384,
-     "99d23950493bdd931915e9f9b65e4cd1329866c0071a19d4f7d6fd190689275b7b10fc07"
-     "503dd1c27a4da274dbeb3aa5cb0e71e9b7b03fc2697729b7be913756e6760098951d7015"
-     "df181cf14b1e0b954e6260276af553e3e59907794b863e941950718ef154669c5c262946"
-     "ba120892e0239e05910c2194f712db46e37e53b7",
-     "0f4ab2a573f3771d1e4222e251faf14e06cefed544e804c299c9a8395f5",
-     "0400b1f973d6495d277e24320622b9b99fccef8eb5c1c6952f35b82d4479ef0161dceea4"
-     "d3c9caa4f640f51b37fcbd5b8932642a94c8e7aaed5db17fdd",
-     "034ff28a5ed6958514c603b3af5a991e2e9b4cc2c0a7aa73ab2d70bd05d",
-     "01abe4a7b27395a37089f91eab27ccf29001ced1bb3348a6f919d466477",
-     "057449e55d3f2a4004d647ad6e8fbbd516adbb4de40b1a872ad8ecf67e2"},
-    {NID_sect233r1, NID_sha384,
-     "7bef2487bc2bbbcbcc1570bbd4ed437c0dbcbbf63f666a3355aec49ea6ef593da25aefe9"
-     "ae0d94db50692475425dee3c88cdea975794ac69142c25732f3541457d68d9101c8be069"
-     "f2b515aadadea2019dc7abefa6c12cb3f76d9f4b5e46546f77eaf636aa8f232913092211"
-     "1151a4df913d18b7cf9d0308f01ad84d878adde7",
-     "0f4649cf30d4a5269296a45977de2652cb06d3ca2aff4475bb24517b927",
-     "040100ddcc8e09ba2122a6535c6a0a2dae83abf9e17687b5f6aae7ec6a2df10048f55873"
-     "60ee251925b7ed02de82307ba219a707705623727f98346a26",
-     "0a38b2bd0e9a5044db19d4312ec88d19ce1a9bf0eede8c357f898b0bc67",
-     "0d0ebabc8761ea215808a2c3035b14b614f64be0c2741b3d7789a8659ff",
-     "0f9e742bdca44c11bcab196f910c0d887e90f250817ee7027f6df8207a0"},
-    {NID_sect233r1, NID_sha384,
-     "87c717eef6dd3c7434b2c91de05723783bef603d170f654b49a04b067b077c405d2d757c"
-     "e780101b930196ca4261efcfbd3fc1ebb762cc0eecf101072988aca508c41581936526d3"
-     "f337053000dcf77b16172492c5d654c6612bbd2523a6ad5966d7091697a29ce882fe331f"
-     "79a7eb59e5a3fe536263083cc59b8133bfd33c1d",
-     "0cca24ad914c24c011f41f80d27ea41caf41fcc8dc9dc6dff5248b2b474",
-     "0400175b73db13324a678b8afe086944a7ad257cd33fe9538c59b9177d1064016a98ac9e"
-     "0ff59de1ad94b50f8c709ccf4342f983c7530be64c3f1548fc",
-     "029c83def3a5c386b0bc3cf2663b8f4b02f26c6e3e14fcb17e9460087f3",
-     "061df783609ceb355aba3b1753d38f42434bd75c8354029966e7a788be0",
-     "01e8a093f53a1d73d5a994b97f2b2f210125ecd3dcdf77c68ea3199856c"},
-    {NID_sect233r1, NID_sha384,
-     "9bf48c2aebf473b3a4a928b3b6a4d2fb7e9193c9e60bc2067f9f03083a8cc7b892bdbf05"
-     "601118bcc34dd283e7be996bf19b0bd36727eb9d65276b6517bf0c77ae0a9091e7a9e461"
-     "82a2586eb22324939801034e5ba94ba30d1bde7d8fed51eb71036fab6224f8ff30a00842"
-     "2efcff7ea239ff23b9f462777e62b41b396c5dc5",
-     "0f5e12d536ef327e3b0ba65ac5fc3f7f4880f5968f3340eb8868c1d47da",
-     "0400b2910f5de9475486b3975ce91c02187e8803e68586f3a1df14df67648e00f28af536"
-     "3ed851c42daaa810afa1fd0d2e001da7764671fd44fb6737c5",
-     "02a018753965bdfda98512c7f9da3e9235a4a77aab9804437b652182347",
-     "0b6fd02b2d84b7baf1a5eb592cde667ed6d4c2c821ca336027a72d9abdf",
-     "02253faa5935885945121a374010b2257123cd5db4c54a2aa0e08c8197b"},
-    {NID_sect233r1, NID_sha384,
-     "716d25519ae8f3717da269902be4a7566d6f62b68cd0faae94bce98c8a4ac6f66215ebac"
-     "5407d6f64adf9d53f79f02e50921b6f0e8c805926a839443d30d9294eaa802faa7c5471d"
-     "81fd1db148cdc621a8dd0c096e06fb0b71943337d5325e1bca77062684873fe904ed9012"
-     "474ceae5b138e079f941a665a995026d13d7eed9",
-     "08c30d93536b8cb132277645021775d86c2ba8f199816c7539d560ac6de",
-     "0400d69332763cf533d48e56065e1b5255790f8c0eb23471fac9b945e6219500292df8c7"
-     "7d9a6803f60bf0722ed57ae2aa3bc816403b000fe2940e02dd",
-     "050967928d6089da5b16c88b7927de210325c8d8f5e727fa1ba3bd95b5e",
-     "02434697cb5c2ad95721943154bc81e2ae16332fa6629788f505bbc1522",
-     "09a5a6792b1b9c2e200ace5a3d50c04f69084dd9222c021ef5fce14d4b6"},
-    {NID_sect233r1, NID_sha384,
-     "01e76755007b2ee5ac9e1d4c8adabad6d0f9c1c08ac6e2622b7c1ead89bd3ad0921b9525"
-     "b49a780a262fe8fc0904a80391717ad7cac9607de55f7c744af8a132ec45ce79723f4a4a"
-     "8c8b9ef658b360bd3890df164c9f1cd74eafb74feea251a34514ff2a57ae7a6d4bec2067"
-     "cbf6ee4fdaabf13721bf9ae178b9034ac5e9665b",
-     "0fa3f15a506ccf7b50bbbad0a54d3223f5a95eb54f0d1f4e5d0cc21469b",
-     "0400e797527d57fb3a18c71d1e82e7935e37e719439952d4b972f0c1e0c83500a345bef4"
-     "c5015e97a148b8991bed4b7ef48947b12f316b5621e94d49d5",
-     "075afdc12d4d50a7495f5a7d309696dca23e9356a0cab11c3b3d7b8c54d",
-     "0960ef460000fe8c761038bab7e29d665100494d0874b6556862c2808aa",
-     "08d3c004426dde6c18b1c9ae00a44ac947e36755d8c40eecf47bfa963fe"},
-    {NID_sect233r1, NID_sha512,
-     "e95abeeb2c51a8cb75ab74253dbe130b5560cd52e2a63d501d26e1458aa568aca6694be9"
-     "1eee5fdfcf582c47c1c727084ee2b2c810281cf9b095808bf7e7c668eff00a6e48b06df3"
-     "fe6a445e092c24d5687d7d89acc8063275caac186c441bc697b2f67aa71b03294e1adeb7"
-     "e557c296dd91304ba0587cda3c984619f1eb4f2b",
-     "06400a4830889115aa88b860b3fb65905b01fd126c4aec2785518c2543a",
-     "0401a2051662c1681bbbf6bccbd33c44c7c7fc80b81a1bce14caa36a73f7a8011583d3ba"
-     "8f22080488471d8103f868100a97af94809b58bff1435b16a9",
-     "0ceac6e5d10c55888b9ecab8d3f6ada7f4d0bde2f109699157d194efa42",
-     "0c148f2337008ccc3e61501dc5df3ec95d3596d97eae96a7ab085a915d8",
-     "036d1debebaaef50243005e25c791b9674cd6fa986dc3d32e089fbfb2ec"},
-    {NID_sect233r1, NID_sha512,
-     "bb8d8515365d240b2071daef0d80558fd3d0e059be9f6abb7b7a0a5f47e2ddca7d1b3b51"
-     "01d5c583143258520ce8db0a87f877a395615c9bf879ef46f2f20f68bbc9706f82781fad"
-     "69019396b27f292cdc70fff1772e90205a2225f80889f9daece1d03914d8776ac5bad24d"
-     "8fb190ba10a2ca17768b918c2e079d83734eb372",
-     "0c7b73c324250f14fac0edc941f79bdbc6933ee8f64bf94b847bee5eef6",
-     "0401af7266ee56bf0518f2875d4f4d9ec508a01769d9c1fd0a885a48bbd80c0084167ada"
-     "99502475478465315bf8163870a9ec1b43f15d68f0304ab03c",
-     "03badc9b8098c3b4d7e943a2365093028b579519031a8643b50c0f81eec",
-     "07ad4fc96c21963395f56eb63e1b0b4d2c93d827626e7bd4448697ded97",
-     "0e7504e6a9f662472e3e6f18a40f7645922fad2ef7313d600a5a6ee314d"},
-    {NID_sect233r1, NID_sha512,
-     "cd8b2403435fac9caeffa21b55eaba52d7efee0f89df7142340cdffeb89556303ca01a80"
-     "0429397e2ff6c746743b6bc60a87133274282d4cac02e4ca90ad95d80c93b84163b96296"
-     "f67d40b2a1124b2b6534ab6b60fdee312fbcdf468d0e84eb85fce4ff360136bb31ced399"
-     "8d29cfaa3ae685e638ee272058f123c4f35f8b6b",
-     "03db7f28e161abf52ab0adc8c4c8544fc989af081303b8688f22b7b2eb7",
-     "0400ab94312e53832265b929f3d529bec33dbcc5c17b969e0afbe2d559ec3901d53b2c1b"
-     "e229e2c224e6e9fcb8bb0f044f3f9f5677c60bc9454f36eb06",
-     "034a8f980896284fe6d28b0b49703f1384d799e3f11a04b1e62da12965c",
-     "0e374fb355f30d7e427bc5db99ed76a914d6e286099c72f28c07302c741",
-     "08d5ffd41f8a1fd3de6c433635fddcfc2b21809d91496ac17571afbb856"},
-    {NID_sect233r1, NID_sha512,
-     "4bb08eeb202564efb5bda40777d71f1bcc4c7c10b611e803e5c570876f3e319e9e2bc2d3"
-     "2031c56a32fc0d1fcf620d4e4377d881e9e1695bcdb78acba370b849115b86c1c4b83edf"
-     "a03299da8e7fd14c7cadb81a8e4911c8e427e32c8c9b67e317575331967cf58085cff0c0"
-     "d48ee0b8e7dc0b49687bb1c70c703a5dad08ec81",
-     "07e9d2fdd017d6da6029e88f78927d9ac9437f542db1f1fa99e32bfcf1a",
-     "04018429bf08752aa470a8f0801170a7ab96adfb168ee8212d76ab0b994e460072a5071c"
-     "e308d7daefb3e8f4da4681842ffe0f35dd8b071f0775c83f82",
-     "0a0f330e011d34714875500b70c881ff6b1c9e96da930eef75ec78ac120",
-     "0439bcdb86d40e8f64db5dbead95d85d6a771d811480c5765ffcbf75422",
-     "06c01f64e2812d18b0946ea4e6599e8cfca0a2b606c3c35c803ef2cfed3"},
-    {NID_sect233r1, NID_sha512,
-     "0bce683d835fe64e6484328aa13e18b0956f6887b5e4442fce36ff09aed015889794e79d"
-     "a8aa60b4be565c78685674c51e1e7ac60db6a763c777198a56e382a03aff8b40862f961a"
-     "e23e8b8683b76a5577769422418972ab0049119382edde9e752b42e8b93f403c1ef8665d"
-     "7ce8530ce4ed9ebf6d397827cba6b7645e177231",
-     "0c94052760fc74c2b405ee4dd5dd2a7d38ebc16df9cc32df706075450b5",
-     "0401d2a5ee02d97f82ea9c8833b825cc57b0cb51d3f2a2cfa7577eba676eca0149c68d98"
-     "d0e9cb242962326a26164f3e3cb6d81b51f281474b0f8d333b",
-     "0fdd3ade90da682676d40008cebeadb9b2378d8a821e9e9428018cdc768",
-     "0f6d244daea95002daff2ff6513da694eee58f8b6c2d47ad121be87559a",
-     "0b04788fbb5655a053d0fb7a38c39e1fef68ff17860442ec8b8ad049842"},
-    {NID_sect233r1, NID_sha512,
-     "a6defc770426daad4dafba3bbd2a69881334f7c31269b297e440926db54cdad3fd7ad200"
-     "f5ada2b72ad221ad99a06ecac9c2563a8deed89f0d0896991d1a652f6fa282affefbdb1c"
-     "1985652300d1792725071631d75a182b683a48448063c7d2563ec3d430e0fd3acea33a35"
-     "cd38ec0b5b07af96af71d0bfcd879d9864ededf3",
-     "04076b93487c2da8aeaeb4725fb53b7b41b465315335c18c6ca041175b4",
-     "040158755fd290910498f6c8eed83bcebcd1fcafef4878c860da118efa250c01781fdae5"
-     "01c2c147eca2c6c809d9428fff2f853b57c7d6add70fcfaa0e",
-     "07debe933553ba3420aa06e1bc52a1653f8a19b59c0bc9c47212389442e",
-     "09e09c6d96e33c845535468ec7f5b79cf30123538011d0b5ffd935d168f",
-     "0963bbae921317666f5852759e9ebf05cd026a5d9f026942835ff0daeb2"},
-    {NID_sect233r1, NID_sha512,
-     "7803cdf4758c199962b62943f475c6c31356f5d9b997a12e21146a2399cd0dd3b97a860b"
-     "2ce639e2801571599136d4a8cdbfb12fd1a5ce22374991e090533ff42823a2c58d2076b7"
-     "72814eea7fd7a1fde68263ef912681c72c7aa3e5a7cc44ee8c65e72228b7631e600121ea"
-     "35bfbbc783b6ae3c0c8f80198ada218be533760b",
-     "076ddd73ee4fc1f5e6766e229cc7236cdfce312417ea291f7c3328d5ab1",
-     "04015185e029c0d4eb5102e0fe900ef3c921acc744feb44570a288015d090800ed56bf93"
-     "394a434cd84b521040d40452bb39755da5e273a05e8c0ba792",
-     "084e9e4a9c84a602c18bbb6b183d06969c8b8538e2ff901f1c2794d5eb5",
-     "0fde8e9b1959477ddb3423661df1e7182e4b583849d6d17fafd7dc5406c",
-     "01a12bd30e9c8b74912c670c0845ff5ecc77f29797160bd4992efa61f4c"},
-    {NID_sect233r1, NID_sha512,
-     "e789461e1dad0b6e21abeb6ae2e96385549d1bae39415188c8f833233da6a3328144c97d"
-     "db36e0ff4d9e19d84f869e79e609c51b32de59892fb0446dd28cc164a3e53534c950d26f"
-     "87fb74e682db2038cde778bde06c3ee2eca2a077d8fcc2b0332e352e0e7e6487444a8ad6"
-     "0e78ff213b16fda9faf374dc6d27b7a3c4c6d196",
-     "07e1f8988ad804aae7d09a99be19384cc599e7652c02c391542be74b17b",
-     "0401fa4751e507740a7345e06a8964022fc6caa901cf0c2077a2c0fb86be8a00683c593a"
-     "0bcd123d958deb6b430d49d5a2386d44706f4149dc526ad896",
-     "01d288de55b90dbe72cd8f1f86a3ffbc2902f4b5f0cf4e641d32aec6f20",
-     "0048d16d87dbf4fb8e994dd874c10d5d16846b9ce2cbd43d09df62ca970",
-     "0e2ee47f422095d629c188df97e2839fc6239b9e2dc26baf8161b037236"},
-    {NID_sect233r1, NID_sha512,
-     "9b58c145d1b6c887f2b25fb672cd49c3a1117224be697c15182d4048be92968a6500f8bc"
-     "f747fcf33145c13a8d72e891a6e0c4c7310c2b62f3181bf586fe32f1ecf4feee8c2c8bf6"
-     "c2bfdf9d5f88981ce080095c93e49a772d8e7b59f9cffccec3ca2f212ef4c6748f64e224"
-     "f4f098334d83108bf6f8c7b43c5eb549f1526897",
-     "09b2292b0244c2aabe8b43d95039984d504ebe05eaff318760e4dee739f",
-     "04012618d89f50b7f83ac470705dbe9ed81beb03929732a3f2aa7a636eaf59015f0f70c8"
-     "08e053b112a8c32ee422aac2b926c5b6a279a787fddf819990",
-     "0fb38174a83ceb9236fec8ea39be2b3c77c3dd2cf42d140e27838202d08",
-     "084941856a387a56022727f81a939d77d12b01dab603ea0cdef6d9cd6c0",
-     "0bb9fc30595f94d664a590ed4f163e4526809819baf96bbee629ff86bd9"},
-    {NID_sect233r1, NID_sha512,
-     "52310a901fe9681a23dd6e02f12974d57f2c4f653322d9a0ff8b338cc6c2bd9f4765c90c"
-     "6b3c9fb17df3f492e67d204e39d81a8fdeb92c852a1dcc6151ed6c63049037235c6751c9"
-     "a902748163a567b714725b4d3995e0edbde03215c645b1a1da3147f7406245432800c50f"
-     "823a1f991c863427ff4c68e4e16d1b106ee40dd9",
-     "07ca463b50fdd92d9163f1c2bdfce2ee45ba1437b79162e3e959b814cab",
-     "04008eeeb146216c73ccff0096e1100008f8b1f3f0c5754c0abc4ed39f7f63018c9228b1"
-     "1888edd66b2e661284f583a0e8d3c3e922932cd9fc1568f959",
-     "0025291ec0dc2b0c709c5e69695980564552545c2497636b814aa049ccd",
-     "098dc98457ce6e69f77123d5d2460ff569786dd60fe07e847ed5bc14da9",
-     "0cd320afad2a4247fea5b74d78dc3df8967ab3159b4c8b191814d368dc2"},
-    {NID_sect233r1, NID_sha512,
-     "ff419c011601cfaf833067cf28dbe6e935ebeddf8b5111a97f6eebf3bb28376334f329cd"
-     "877a134b074790a073db766efe018fce666a34650cbac285ae856fb6b3b8b96877282bc1"
-     "1cd9f9c8e510ed1f69bc2725a44a1d2b35de1edfd8bc9d20c7525ab0bbc27662a7cfc1bb"
-     "d1e0f4fce5b88411521e3893e027cc8c73acdabd",
-     "0c3844750f63fe0c2e930bc38fe88522f4e72a2fd0db9778ade20e939b3",
-     "040075acb00b5999f8b272a15a2cbdf8cb630dc3eeb1e78e58f58e467396f2016711aca4"
-     "24ca335878d273eca75d804d3f009a1f3628568530ef265eaa",
-     "0a63e7a20d100f14b8b709f0a6c383166c2151a36dc471f061b0f20dac6",
-     "04063be9d8e4f0f9afe0c79374c69b36910b5d2b1010e0f4db2e4cd23da",
-     "06a6eb90659aa79e4a2360ea9ffb99a415175dac6c3efef104bef6fd57e"},
-    {NID_sect233r1, NID_sha512,
-     "05a89c4824c5de66587875011e704bc6e06e991ba8f3aed331cfffe55aa266a08c729f77"
-     "b8d082dca4d286b2d451ea838d726cc2cf298fddf2d7376714c5e37b64506f353917caec"
-     "525a1209391449c078c5197a371feade74f8fc8a1a1d67576edfda13c14ad324342fc0b0"
-     "9277941dc072ec0d39434ff1cb91fc59478fcde7",
-     "0a3bea235dea86506be4476eb7999dcb8e584a34238c4a894ad6823b93f",
-     "04014093a072c21c44d1c4beddc5c8dd9a2845db0935bbb4e1c4edb0aee032013286ed58"
-     "4deb744c9c35d7ae7eb9cad1c7ba2b670642de0399b230716d",
-     "078eda19f0cced2f84c1a7b354e5a79bec035b8bb279473f32d60f5d17f",
-     "0964e817f0cdc251eede4157a9bd830c476627c3f27d2931b4f593b0178",
-     "08dbf34e597ae06ad92b13900a4944e54a5bf0f16f586baad157da6dc96"},
-    {NID_sect233r1, NID_sha512,
-     "13e6b5241365d9d0ef9e8b05cabb3248afd221ec02eab92284b98bda3d9272184bfe5251"
-     "d35705defba5085381430e99b33a3ab77d7870e5102757d065862372df2434a25556b76e"
-     "54ebc39d4e6c3aba5cd6acf0c335756f7d9385c1068d4cfa37526a9a58c0ccc7f87a8189"
-     "176c5d4f201499236058ec061357dcdb5acdba40",
-     "09a367cd1cffd8dfcca179e167ea437ee48e9b6f42559dda9224701d3f6",
-     "0401052d751901f6f8e61858d3b15eb59dedd21e4e997531ef65622d5750290112737be6"
-     "7ec621509d73cd613d7b448035397fa66eb881f90a6d531ea4",
-     "0d8dd8f1cab623ba6a4e840962fb31de97a4d14aa6dd34dd21154105030",
-     "0a8276d0f069f34c60b26a55d47df69e4c9ae2981afc59e14b5bfcaa498",
-     "09351c4b3a06b839eb2e9f450d9c3d15efa45509886ea3f2610ee1dd156"},
-    {NID_sect233r1, NID_sha512,
-     "139a1a5090b97afb8fecfff8745efacf7dcf91a4393a7b629564e598d58d5be39c05c583"
-     "0d4c8ca85d29e9e2c31ad0447864e867d0ef4788ac734f8d871daebceda98d449308c2af"
-     "be97724c3af8a468f1925065f39e52ba4b7d15728a744b1252a20476dcfff7bcb82aa72c"
-     "209e72abb3c24419bc26191390ffed340c1b9c6f",
-     "046f4ad2522e78b9b35297d28f361fb0ce82306322aedc119251d8241be",
-     "0400b976c53a966e0834d5f6bc3af10a5f12cb6d16cb2303a3c6cee7d35f2201a1097cb5"
-     "6662265f4f2f52df375d70af086264752477c34c6af522f1ec",
-     "06a0d21e5aadcb0c9e3f9fedd2d896b0236dc90e33778fb114e970122bc",
-     "068063fe0a31b7e7925cf8959c3486985d98f58224d5f67cd0218af192b",
-     "0f11a22ced98173040062ff9e69d1b2a1b5a939eda0a6944e96fc62fa4a"},
-    {NID_sect233r1, NID_sha512,
-     "3315e5cda5f252e3291b61e493ab919c20a8af1286d9660cfa2f5ca38b6defe19ebecf82"
-     "0787fe692d04eae8a5f5d37abfb593309569cedf45efd0cecef6951b718924c8380ba52e"
-     "8ab8c9bfb2261ed5f01cc5a5f9fc5fcdd269a0f122c597afdd9a836cf8f96838c3e8962c"
-     "1788c3ce4128719b3ef4fc88569643dcad6da16f",
-     "0ac82137e9c7a5ecfb8b1a7df9ab50732934566a392a6c8915ee8ca8144",
-     "04000f7f835f8223fa6c49eaf6650e33dc9d09e1d2bb098925d908606570b2006e659ce8"
-     "623767e8214b076d7588746bfdcbbed59b75bb19477366cc78",
-     "080655784e3e31c6a498a63d4d84f7e5a353a66641ca17d4e223441bb1d",
-     "07faf31d1d31ef4edac1c63072350536df84c417e0ef808c6be39617e74",
-     "089023aeb53ddd3e475d11c53479863739e62dd64348646581012784689"},
-    {NID_sect283r1, NID_sha224,
-     "067f27bbcecbad85277fa3629da11a24b2f19ba1e65a69d827fad430346c9d102e1b4452"
-     "d04147c8133acc1e268490cd342a54065a1bd6470aabbad42fbddc54a9a76c68aceba397"
-     "cb350327c5e6f5a6df0b5b5560f04700d536b384dd4b412e74fd1b8f782611e9426bf8ca"
-     "77b2448d9a9f415bcfee30dda1ccb49737994f2d",
-     "299ff06e019b5f78a1aec39706b22213abb601bd62b9979bf9bc89fb702e724e3ada994",
-     "040405030ce5c073702cffd2d273a3799a91ef916fcd35dfadcdcd7111c2315eba8ca4c5"
-     "e3075988c6602a132fa0541c5fda62617c65cfa17062a1c72b17c975199ca05ab72e5fe9"
-     "c6",
-     "2af633ac1aee8993fc951712866d629b43ed4d568afa70287f971e8320fe17b69b34b5d",
-     "165ce308157f6ed7b5de4e2ffcaf5f7eff6cc2264f9234c61950ad7ac9e9d53b32f5b40",
-     "06e30c3406781f63d0fc5596331d476da0c038904a0aa181208052dc2ffbdb298568565"},
-    {NID_sect283r1, NID_sha224,
-     "44adcb7e2462247b44c59608cbe228ada574ecb9f6f38baf30e42b589fb9b157bb0560e5"
-     "a2aa5523b71cc0d7f583b502bec45d9b8352f29ee1842f42a17a5b16136feaa2efa4a0ae"
-     "306402940ecd6b71e57d1467c98e7960de2a97f88b43487e4f4016af1292381d70c18c7e"
-     "6eed99a14cdeb5b3caf73688658e4c5b54c81e08",
-     "09c2804f8cab768248fb3fff8a055b3f4585c00de5c1615a19f9425b9432ea09afba8f2",
-     "0402570ff62b03a5124f08f752aa71ddc57944cd94197fd286d5a2a107b116d7b8ff1b04"
-     "21037714d9abe9aa0a9668fce89a3fcd5cf2e4548102a181a777c9b3f1008ac6e8d3a31a"
-     "2f",
-     "0dab5ef658ae3e2ce2bc5c88a8b8022a0ca5eb8524815ffae414327e3afaea5fcb8a7cf",
-     "2d99f82d92c9554722bb793988af0fd0bea776c5608f5939db7c8634eeb24ffd381dbef",
-     "27ceb1d01ec9a3ec0e74d79e08024359e117488020de6458fbbcad28b173918fc7d129c"},
-    {NID_sect283r1, NID_sha224,
-     "cffee6252c7eb6d91d8fe100a1e62f0ad9f862d78ca2b747a6c17b8c9ea8980dc239b3b6"
-     "73310e6e7483582399163e39d889abc1a613fe77849ebc09b4f7f4fe0688b8a9869ae918"
-     "a88294c7ee199be50ee9460db14725ae70b449d0cb48f30e7d817ec02c0cd586119341db"
-     "a0b74f0279330807cfccc99c8c340b72c1764a45",
-     "2e625a6bc6d0ce7c06231de827068bdb0abc8ffb57c82b35ee3a0f873b9473905974d34",
-     "0400458bf39974812a4e0964c31f40083300454104c0d65f22c5688bfff3c256b7ea9589"
-     "000738dd33e32b9af93ade2dddf4147187a9270543afdfd66a0f2a53d6d3d815ef59795f"
-     "60",
-     "0a9388815c528fdadcc5d3b125c7a38db57fa8c163ba795ee00e8e307bf760619e705c9",
-     "2481571400ecf9dd31dbd9c905fa1006cd5bc7afae759da3312ead8d5a7dd0c25a37ab9",
-     "13952fa427d348b6347b9e93d4cb2c4cae3429dbea6aafd1e58d5a34805098722b3b8da"},
-    {NID_sect283r1, NID_sha224,
-     "d058ab5dc07228253707ef224897ea0fcd09c3d5cc91fdce9e03c1c59c53fb4596be2ed9"
-     "29c7455e67ac7f4891aed3eb06ad88f2c4aaaabff045b959f900d1019d706b6052637585"
-     "1bb891494e99995928e4cd51c9616aa651ec77bd7e398916bb9ed3156391bf7fb1e29181"
-     "e2b011dae2edaf803607def2ac6b194929a57f45",
-     "376ac24e1b86f8a55c052d92a0bdc6472fa03acdcdbccbf7c321ec0ccd97aa0a66b4181",
-     "0407247c755b23bddf944e29348da82495b4f61d02a482c6111d8698cc77e8dda4c341f2"
-     "0b00f8c199138e1f4f8344facd90ac62d55f3c9a15ba7a672ce40241aa26419af790cf7d"
-     "d6",
-     "25d07c7afc5a335c2bd7863c1965a48c12f2687b2a365a7c2700b008ee8a0e8e35a68a1",
-     "23fc2837a879b79e470305088acf596eb0159edc2008478cc4c3841a1bd66fab34bbb5e",
-     "0a909b83bf77e74511063366ea1d1308a8a544864783459a60fb2669785ab1af8f4cb06"},
-    {NID_sect283r1, NID_sha224,
-     "c86f2cc7ab5df5cf1a236fd83792769474cef464032800ffe98a44cf29dbfb6f24088160"
-     "eb31a11a382ff2a49f3e05e983462f5304272f96c0a002b69af3d233aebe867ee63fa466"
-     "66760a6889d022c18645b491f8d71b6a3b6b4ef058e280cf625198715b64b025bf044944"
-     "5d3dd7e1f27153926e617bd2c96638345431d1ed",
-     "2b50a6395fc02b9ac1841323de4520292f913519bc0d6a471aa28021322fc4dbcd7b802",
-     "040696d5ac4bc40e679524e246210b7bb0f93ccfe7dc506ba87be3fd018f829c93e62ad1"
-     "d8065953e01d9db8fc5d64516d864a33aa14af023e601d69875ac0f7af92a1e78aff0e47"
-     "5d",
-     "0aa25b43329de4e7739fd9134e4f4b3d68a64e55af47a2f6ccf71f518f19059b68d34cc",
-     "1338a5dda5fa09667604a6a7666b0e54e6b688b98b31c25d037ddf55ee6bee7565dad09",
-     "00aec025232c16e778f90785ded5348f3d5345b8344b2a762480383777328e0a0b11cb3"},
-    {NID_sect283r1, NID_sha224,
-     "c1328d8d2e5b6ffc850a9600bd6482518ddd9cee3fc9140febb72bcd444b0cd7e8074587"
-     "d51b62cce4b3d4f34ad3355353fabe363369cf790db2df9fdac3a0ec4757e2dfb3b683ea"
-     "a3e26531691ce765742e1c0bdc0e1028d347b6085fc459df0989c6a144271454eaffe413"
-     "cae2ad7c8b2371fd2df1afffe56df727009765a2",
-     "24e5889722f6c35e18ca47effa9e415b1ba790066a91fb3c9f7b001ce28fc732b09bc23",
-     "0407d4a57e6aaec6b51dce5408f6a7fbe9ba9d55f5abe2da55fcf015ca25dd74eb61c155"
-     "6c02123390178b2992059151afb51ac652b364f562c65451eccc65d968e9e7210921c93c"
-     "9c",
-     "320d2a7f48cf3583e8d7e712b330d40ddbe4b6c128be5a43d72bf57d4227603762de7f0",
-     "09806a8e70742c6c4a9ee6f77fe7a36489e1fe8c442ddf9cdcfa61f019ab9b41241d949",
-     "061fda247ba7c198aa532906bc01d509088d6c2ba0f14ca3ecc5ba36f3595db1df3e64c"},
-    {NID_sect283r1, NID_sha224,
-     "7176b7013ea27e94281977eacb976bb31c753bf80fa09680a29128a6fc15234f79f0e990"
-     "0aff3217ce9be72c378042c6c34fced0158740073d1a985fa25987fb218002e425868fda"
-     "5a47de51abfd04de34e2b8634cebfbdc98e80f93d94096193eaa82dc8778fc23f3765c7a"
-     "cdad94fdaa272df0ff0f28190c10a462ee78ac92",
-     "056d15b81f40b6378588a5efe43e21b95e18120d514bfdda0e7759a1d0766a8a35ce5ac",
-     "040306cb78fa576bdd2f43cf7b71d7e66a98b850d87ac087dd2e1ff62596a2e8d4cfff13"
-     "4403b1e3b12db842e00c2faef04d3e39cdb71546e4e3ecf21eacb6131c3501fa30edcc0b"
-     "70",
-     "1e8969d6cad41a40d8306d2a8db3290d547106eb59f661e0d0eeb163044a92aee4483fc",
-     "06786637c3bd5a95eba5ce015f151d99845255175ebb9e593d912c75cc45723612c4ed5",
-     "384471c17c45ddcf62b588993835bb913be88f7a8e46e52e211972ffb3b7768410bcb7a"},
-    {NID_sect283r1, NID_sha224,
-     "4c3642ba040a9955b9d50dcd1c936688c17c363854358afa8ca49c6abd906dfdc4d89bb4"
-     "cab0bbc363fb5b74e1f004d4b09ec9dfeed4c0bfb482a9061a1f487a3d79195ff7b65a05"
-     "04bced3a28db0ebe8fcf8ab1ee4a3ae91324d15d890ac4c479144dd5538d2e36d3a58776"
-     "9ee9cd2d5c6f85a03362a022fe0efc4a3902b71a",
-     "12fb2fb5bf5f7e42a500154823a174ba2d05af71e3b0cf47fab46e673ea1822f1563def",
-     "0402414d172d74a6281169835d18bfaae91f1f1cdfa9ed451884466e63160ecdd4a2c790"
-     "6f02d892bb19b47a4fd9d851d3b101ba99acf6d11345596635cedd5d7557427a2896a913"
-     "c9",
-     "20786f42d77195bea5761f86dbed8b452f858b447d2f3775ba2a4865d738122363b50e3",
-     "334507412368f08bd0992a5d56581ea7139e8adc88abe4bd80dfeefdc7a37a481b18609",
-     "0fd8404df06a02618cdbf6c28610d5dfac9907635d9e5f2887f11a7f18cb8b7ac95b5d5"},
-    {NID_sect283r1, NID_sha224,
-     "e471f39c18b081362adc7da47dec254dab8d765f005ac574640d78c14222639245563912"
-     "d942f3be212ee3cef134407334c8fe3602fa0e1629de5331643d76715dc1b0ffcebd484d"
-     "86c5211be4b285a31688b205fa988e6c15b36daf396ccdcc209c7dde2a732f5c31c84c7e"
-     "a041408ebf15e56632583af0131bd7f531b5fc45",
-     "30096c54fd480647e017f8cdbbdef292e799f054e3279d228b09816a757566a744a8266",
-     "0402d4b28fec18cd888017fd5a27a375131bec3aa7195c0a4f255eeb3616437079e356a6"
-     "cc027c607dcf0b068418eaa7de8da6f9707650e8d95aec571f7ec794415fc175061b4515"
-     "19",
-     "36880905a376faa594978713c2de1a90c8e27baee65bc60b1fa6508fab5abf843f66ecf",
-     "295193f1c64181bdf749987bbc8ff2a188126131f8f932bb8ca952ffa201f109762e18a",
-     "381c496b4035bba880225dcfe74fcf101103e38f9518d9427c74a5ec86ebf8f7183694e"},
-    {NID_sect283r1, NID_sha224,
-     "8a93fe53e83075c4025228540af7e96a588520da34e3eadeb99a4ab2f3dbbb8f85fe63a3"
-     "b86c1f4ec912e665ca05b43e869985eae3791b91205afb1380e16c25b74e6793fa63e4a5"
-     "5dcf25dc22d03f09deddeb9042b620434111afe08c5657c7d754af66ad91a1b5423301b1"
-     "e8e6389a1404060d1b6a99fe0f89598482979e42",
-     "0a1b7e9c8c2dc25b494b5ef3195b294e41cd3c2c35235ab42542bd3e2a52d5826662bf9",
-     "0406232063dbb66a56e2a92dbdfd9b3c136eade9c214d831691d9b49c56a3962d20f14b8"
-     "a901b47b85bc223fde1918abf6308b74dff7f3e686af9c9d7a1855a1b77984d258c1f9ae"
-     "da",
-     "29b4221eebe151fe758218138535d81182c991c3b7fed93f9a6117e98c1c2f97e546937",
-     "1f8040fad671e2f32a1094413ee955ea5426bc906b8e034d87d7408e63db173b05afbfa",
-     "22a353c431a9e9315ff69facfa4e15f6e6ee1be2750472823db31b49b17fc759e6b94db"},
-    {NID_sect283r1, NID_sha224,
-     "e193a8ef6f454ca1aed38bb67aca6d08280d421b196d89938c0582b7cde74dafd71716f3"
-     "818940af412d4a7ff3960a8517aee108ae03576b68ee7557d35e6f1ab823d124de7243dd"
-     "02b542591f62c80d822608572889573e4c9dc62f99d68e07800da6f83cb6f5e03d1f2ac1"
-     "5f90e38b4f25e0a75e354e4b60cc81c0bbe81d39",
-     "059b1a8fb84530bba7a607ee88310e31bc6ea6a6881603567a1081a05a3a9ff87e719ef",
-     "0400b9a71aa3cb4cff37586b1e522b0e332ad5962eec3dfeffcef3851976baadf611ae52"
-     "2606b1bf0b43b406b5edc6782fd391d9fb070fa3570d3cd5b2b66d7a95dbc45ccb162617"
-     "2c",
-     "00a77307da9845ec4572a24c9e74a17b76b6393da87a9d7b1b8456235473ff39d243ec7",
-     "36721835be490b5ffc4a42bee3c6d231417f7038c367efd9ecaf7fb3618ae8492906de0",
-     "237833bcc3e4a721e2079e579d1aaf2519c01cc238056fe0c0990dac7fe50e75eaf6f96"},
-    {NID_sect283r1, NID_sha224,
-     "8a99b9db191f6cabc88b430bc2293e6774d5180f019d871839289e25aec29379f14606e7"
-     "42190b7aa062e3b29fe0254146d9614856c5140c7315015abb98ac00da2c7e33cbcc82c2"
-     "4b797366f12767322c4381454d9d1eeaedb616b0ea5c66d1422da459f18081f4f966d05c"
-     "e279c6ee69b1bf94b8388d38d4b770d9ed69025f",
-     "30ddc2c7a4ce300cc2b75f0f977033f16c1f8bb13aae3d494c381f9a6dc8622499ae4df",
-     "04047bdfd7c77ae0c53e327c15c30d90ab1c9b670fe2241dc0ffa939fec3cf6d3c1f493f"
-     "3a06a286aa2310a4d0468b62f3144a9da2e66d15bf86f60045824278e8986ff87a276119"
-     "20",
-     "38afc3d11c66eba3441a5ea298fa593eec57b84ea29973c306ac9d46bb8d8e2f4c8b049",
-     "06c830f6c0be99fea4712f1c75f5a4e439800dcf062a16d93135c3255d3cd04bef5bc7b",
-     "1eddfda0d0e02d382ae243e604f76939dc21f3ce106243b2d20aa562b78e620fb456428"},
-    {NID_sect283r1, NID_sha224,
-     "5c437b331831530aa94623b1736f00b986172699f0a02a5e5df0008bf25341787e2e6604"
-     "6f2c929dfe0058c3cb89fc5bebbe1025bb1edd1ee31522ed568e7b5b4ca3991afdc76a68"
-     "cbc2c4f81863e27fdaf6a564fab2c6354e5c657de81390f8a4132669fd24a48580c716b5"
-     "b7961a9c091f614d11cf45dfdaec8946a54a11d8",
-     "07899928922fbfdb5407517725edf231d15a8b62d90b7fb6d8c8d20424850dc44f797ed",
-     "040614257f54514cf37df2cd78850658a85ee362764ab8186423aa0f9a1ff486557f8f16"
-     "7f03ceae9d1370df045d20f576931ca63bdba8885f463d5c82e5edca5116ed3d2c2b0c48"
-     "61",
-     "3395493478e69e6e1088166f622a4f9ec7feb998aa552b54bcf0fc67c06079f45a14993",
-     "3f31ad171dd59c9deb21851e631f223584b17f72a6807d5239ae31373512def954d5ebe",
-     "28f095ae43ba5bdd899573ce6823eccd8e127c6c03cb59dff43c087ca24e1ce5504d1ed"},
-    {NID_sect283r1, NID_sha224,
-     "91aa08567d8da4c90684dc06068f69deae240212842ff1786f04ec41b40d9187aa92c764"
-     "01f9fcedced62876a34df82ad7c1e63b68bb2a972257ea8542bda6a7f1a020c9b122943b"
-     "6d651abda8b8d322a8fb762eee376daa2d3637a71ed6c4f5cf96f61c0da2d6e1dda3370d"
-     "80e51da2cbd8aef3267168c67359523faf910dfb",
-     "2a2af63d1171930758bd3e5bfdac62cca1a83a3b55a49b3f80cf0d9ee4b2082757beac0",
-     "0407dd6fd0868ec478e7e5c08965fa4f1efe8db4d0c04f0b6c63b5dfa397607a0d9d5ce9"
-     "09054ff4fba9058179a2c61951fb4955cb637b01267f8f08b3aad614738c562f602d498f"
-     "04",
-     "179482dddd033e8849abfd4991304137044d7433d7bf858a794340ea1cd66e736b821fb",
-     "071f4cb000ca1c51c698c867a78961e6d7defbd60109f79d1d165ed045a653ddebabd10",
-     "1e2975f4a1fce0b3b0e13c3f50005fa664ee9319cf774d2e107c406d36158bcecb0e5bc"},
-    {NID_sect283r1, NID_sha224,
-     "eb5297bf408c1a55e400a20a3c10acbc5c2bc6d6ccfcc0941fb7a6fd4d2834415a6df86c"
-     "3a6c4b867d1215aeb8222153da8cbbb1576c92c07ca2c36d8f243fd911f9a057e39ee258"
-     "32454e28d7ed52a8d04169b9b9677a16b32d5d211b8573a8986e9bf36d7206417ad2771d"
-     "aa11bc21fd7ee1029b65ff7c9b2705a6dc9cf9cb",
-     "35994e89e13916ad82608f74a639e6aceb756ff913aec440519946d6434af9a60a6af49",
-     "0401f7805dfc9f90d4f8a1b241dc9d68aa41cb77b63d530cb3733cede23bb87ee5118e5b"
-     "be01c3f1aa3a1218de78a94ee8f88d3f787fdc68674e31792d919dbca681a6db1dabe89b"
-     "61",
-     "2116684a4307c67a3d8c1014b33b928a962a8daf86c4031b0c1d47315d74bad7dab2aad",
-     "33cab952e9382dc074d666f1f2ab2bd72ba394a404ce2fd02a6f7a4dc096d713827c94b",
-     "33b2886738d882146c0cd715701fe4e8b94b0d28c73a6b79d2899391119ba910bcbe3be"},
-    {NID_sect283r1, NID_sha256,
-     "f415d0adcd533dd8318b94560f86732c262ad2c6dff9dc83e2435543f429a2158cd2fbab"
-     "0d96c027f71008c4895ecc644c2ceaefa80937f6cc6338d15d36e459a16bd9387a361a6d"
-     "800acfd834ad5aecf442e30b70f5bfa164747cf9f89325b80976052a83a5e896c00c54f8"
-     "1472b14329cf23bec10a8e693005de2a506ba83d",
-     "29639da33f48e4fb0d9efdf50bba550e739f0d2476385cba09d926e789191b6fb0a73ff",
-     "040770f9693777e261db9c700eb1af0b9e9d837ce5eabd8ed7864580bfb7672ced8ffca5"
-     "98068aef01c8126889204aaca8f3ccb089596f85e2aca773634bc5775ee4d27c77f2af83"
-     "e7",
-     "32a930fdb1ba2338554a252d1bf7f0169d18750a4ec4878d2968c5e735f98b9d0c25edb",
-     "30cd65f1097d3fa0d05e1d6072675f1377a883b683c54b8a1f4960f90d68f3ee8c7bd98",
-     "15c61ddf43386a2b8cf557760200ac06a480797e21c92e45e6a311e1a508b03c4d9632e"},
-    {NID_sect283r1, NID_sha256,
-     "b178d86c9335b85e02178fc4551769db589ab91d823fac219c7e14e2f029753b20396238"
-     "9476723832f8d9631dd7764e6dd35da290afa42a794476f5c7727b3688aced848dabc995"
-     "4201578cc7b25801710931f45cba1199d3788d64dc0188412e70723fb25b8ecb67183581"
-     "50c4037b5b81466dac1686cb5270bb1c72d34bb1",
-     "0583a7ecbf2a975a32d07428d27ac82e5dc13d1466c4fdfc1e6a05a8d9a289f1010617d",
-     "0403775ec793ee4bff15027c70d9bb5dedfb7d2e41af8895faddddd4589cc5a00bd222b3"
-     "bb0300f7cd572d82f2f0a2d99a83977ed2034e03fdd76a0267455a524bd8199424ae5b81"
-     "ca",
-     "1e58b1f66c927f4ae16143856d67193d889debdac8eb03936f1b36d550c2f2639e13f8f",
-     "0f897dbc8ea12f4370fcd08e8700e5e4c68dff97495f401d01b782f2ebbe259bc0dcf25",
-     "3c32424fdcca39f411663284658b8f0c1f950f0cea4354f02f4b359f18e3fefac0976e1"},
-    {NID_sect283r1, NID_sha256,
-     "c8bfe9fa7c848531aa2762d48c153cd091100858aa0d79f994fd0e31b495ec662209a9c8"
-     "761cd1d40c3d8c4262cf4dc83c4a2549a5cd477726ab6268b4b94a78b1c4a7e700812872"
-     "d7f41912a723dd9abc305420ea1e1fb1fee41bf643f3a24abd6e8fbf6fde2475e2905277"
-     "24a6f99fd75374bf7cb01b34d3e60d8db33c4de1",
-     "0f817ab1b49131fb9bbe8c112c25a36f064efa85de7506fb9cd29d81b326bf276277f7f",
-     "0402b3a06e07fce1848494d3227ff77d1c43f4ec3c037ad73ffebfebeeae87d3bff7f7e5"
-     "9a075df52e6a34229266ff28b1c217538ae23b3912e4bae8de5cad9b57b7c1c9ca8aabb2"
-     "e8",
-     "0ac57fbb899193b88fbf4ff2c502af72943b133e8d40459a833275212f6644f566f5c58",
-     "3e13307d5fc2b7ad24e9422355150578c78e1c99a6f9a24f9ca2e8bc6856936c5c4af2d",
-     "05e8b77b580cdacc2660e6f8a1877d93c5983d135d63ca0e0b06aa8daedf855c9f661fa"},
-    {NID_sect283r1, NID_sha256,
-     "9a5f563d0f9fd1f31f3a822de628ae970954f4e71292492d727109036491c29e66b9b0f2"
-     "c90c26abe94c08502f5e923a9ddaf6a7d91e9541ce90d0a49f03ce4e4769753d5b7d922e"
-     "1ceaac4b4cfa4262732a09550aa076b8ff9d46a50fa17de17e3b6bd606698464d116fcd5"
-     "f1ae11bf45b0c48d3b738427cb47b0d1272b03cc",
-     "2782af76ffebf3e2bfc0576b70e4f4bb87c762e2bb230d278ce776310a14f5b678f29af",
-     "04000dc21b3be7efaba5c7f9f22591327f0f97083d4d844415d3148d227931256d026ec9"
-     "d401276f1d9e131f13bb129a1192fa24602fb508c9679ad2124e49c70a891777cd601955"
-     "fe",
-     "0255972b5329863f380de945574793beb0430dc416a8f2543330a125ce8d69f72dbdddf",
-     "25bcb54e188aef6e362a62fd88daaacc8e697dceadc8a6b6f804ce4a36856c8da6de97b",
-     "1e12e18e1e281606c16ed1f49804f8cfb33c29b0ae92c072d5c41ee3e6836cf1813d722"},
-    {NID_sect283r1, NID_sha256,
-     "3d6b065721da9de82cb33ec2c27107eb399b1e69ac8fa51145ed4147e20d72e27434104e"
-     "76af988a3bc94f55e36677a05182fe2376dbe38195fc6a30673a4dca87336c7304f3f31d"
-     "49216fbdfea00fd1e105d8b0c13ab11f8892e0045e915c17dfaab07b24ed21b06af5a8ca"
-     "d4f45fbee5a25bb6e87466a7bc422c0bb896440b",
-     "31b827b88f14d3822244809096157df3c0aa99da90c00cd9f0b18dfe306f6881834e6b6",
-     "0407b3ed076a2901ab2625bf05fa6db10a8c156412fd2d26741738f5eeb6a91891575269"
-     "4606a8cc2061352c36f264d23dc2857fbe02af34397ae5130c582e885f50f2c112f141c0"
-     "7f",
-     "0b36f5d6da409c4a27f38ff9686cbf5f4714f4e17234fbee6e6deec97c9f0d4c585d42d",
-     "356911114c9ff9ae4f3a4fcc5379c987b9d298554cdd39ce124f04707e7fd1ea25231e9",
-     "13c0a321c4c5a1e89dacddae38a9b3dda32a20627e53dcdf28ee26a550797c255eefe6c"},
-    {NID_sect283r1, NID_sha256,
-     "d125f0e2e6135567adec9e77da2afc6862e28d618416632ced829d14ee8b61116da59dfb"
-     "44098a40a0b927731125617e3d2f32cfbd1546a6e758c1ab6597e75db07add52ecb61d37"
-     "da2e9ed04df95b36ac249f4cbd794cb561655cbbe4b34834c497b3d392d78ed0db8db683"
-     "aff0076fb6e43acba3fa2b91210cc6cf3fa594b0",
-     "27da4916f1c471cff80bfa14d12aa10270fc3b26caed010c0111f6e5a40d914a3927763",
-     "0407d8202c88fb915446c521884fb756375a2b8d178f6a87306c1c8b67b926e830c8285c"
-     "150224dcebb8a7c46902532870ff855c780b2884dbce2956cd34dd6ffef8dc365b967534"
-     "49",
-     "3fcb1e759418e4539f9be76354cc1914ccf9a111338890eef723431925fa132ebad8695",
-     "0d4d4f23408db58a72495aaec6dc335ce85309fedccb6ade053c23347abdc9e77a81aa1",
-     "129b6b322573dcc79704d08921cb54f31c571573da78cb09d0aab40c4036ee8f195d88a"},
-    {NID_sect283r1, NID_sha256,
-     "b380f97687ba24d617a42df1b14e5506edc4b62dfec35ed9fd886bb769832cec7f9adae1"
-     "0c21b7cd9152588797b4efc6b2b30a873d3f25e683ea9be070dd69731949a51121e534fa"
-     "bfa3a2eae0ee90a454182248bedf2595cd47ad08614177d58f7a773f5023b538f5f56868"
-     "2c83fb60e3fb1aa859948d01bf7b214e7f2dc719",
-     "10608eb51dc0ee97d6e488a23c582ecf0ea1df9a24db77094d87b3fb6ca98507280a934",
-     "040399b3e571caecdfa1efb243323159a45618702600b870954cd614e494bccd70e381f6"
-     "8a02e2fc57721a500611badf48fb435a6e399cea356d281e853f55ef2cf9fc5f70dc8b3d"
-     "a2",
-     "0a8045b4f55115dedd8d742545f9f2bd6e5ab81cdbd318747aebfe9f74b0cbc964b6040",
-     "2d022631bb7e05d316a1b130faaca5af5eac67dd25ad609e6e2a067ff74fd4ba534db2b",
-     "04595f184068433962d250394680701fbd2e2bd613a47e5de68fa1eb83cb08fb425571f"},
-    {NID_sect283r1, NID_sha256,
-     "3f9ec57e4228e1a6ec49df02c58d756515305e48763ba1dc67298be9a1548576c28c82b4"
-     "e9b3f62357d9b3c522b16d5c496a39effbdc8290edd2cadc0019e6b9fae1e61238b13b62"
-     "65ad2ff413a5a0684babdb0013e7632051455e6fd943815213c555dba96cba8911e006bf"
-     "ddec6c3353065004538f37e48df9e339498d85c6",
-     "123f9eb8babed548df08cc3afc1d3b3bbed52b538d4654f2088fe76062fbea75b85a560",
-     "0403b2e980ae7a847394720a9cb982fc1e41f9381b0f2e08b87fdff1bf891b9637cb2248"
-     "5e04a367d593edfaa4e17113b6b1ea3ad185b3155b1bcbd9f00f4482e509b43bf7eb67a4"
-     "48",
-     "2adaba166d703d4d2d431a26200acea7fb47216fd04882f91c5730a55c349770d58a452",
-     "2c83e6a7b4fd48e1ba4fda8ed7891425213764078926d8862d0eb64765ee2900b3deccd",
-     "3561a949d583b7de9263d07ac427bc175b75dc52f43f3ebedf996218c94e51684ed5f9f"},
-    {NID_sect283r1, NID_sha256,
-     "bdbd7b7bf3337bd9d21a3c6db379f95408c17e49dd394e94737ceae889f45dc0ff5d48ca"
-     "dc53703a16b5589939506b548f8dfd34c577c084f372166cbea320c8fd07c809b211e074"
-     "9ea639e68f890affa1569b66bd763c7c710989e491011371eb1d93ed9479ff0216b7f79c"
-     "901a2023e2cf80b565d1c0517e73117190cd2f02",
-     "06a18e626452111922e02e31d662f4301319946a204ae8a34f06b91dd1b5b96456365e3",
-     "04077c1fbe6a645b85fa0316ae412e8dc558c7c066d9aba900650749eb7b14a149ee57a2"
-     "5901b2f3002ff4936653412c8ccb8a67dcae18d78dcf6dcaaa75061013d2134af2c3fa0e"
-     "69",
-     "21bf4ca10d03a93d4675baa26285aaa554836bd0bab6e7fe42600ffe9137d5e304847e1",
-     "20702aa5b5cb45cbe8025b4ddda0a42a1ab746117d45382d018b2055b62791ad91abf54",
-     "12c31f9bdc096236d3ec46c4e6cdbcea47e4fba0e28d4df0fbc19e8740ce6dc0577b242"},
-    {NID_sect283r1, NID_sha256,
-     "436b288512ea57bc24f84fdd117da9dc1858bae8c11637f99295d88fa9d05e3c053a2584"
-     "a6fe200ad190b3077d9a1608f660349dda405066c1562f6897ef69b6b674d6bc11fa470d"
-     "0b96a7cf8f6e098c9ac03b0ef415aa045867ac7c11d16cee78ecf08850ccabf70f761682"
-     "b561d0d0e4a889d840dc74932648ca2fb58259f7",
-     "3307fd717015b12a2dc76ada21442ac1d97519f66898b214c2ea317ab0f0905e819e4e9",
-     "0404ff9b8d60ed177df635a3953c0f5f5c0254224bc48d34329136706d6e8fa1b16ba091"
-     "6a02e50ef73f43ea9a5ad07c6bd68a82b7239534e195ee929aae7788c073dbe9e968c282"
-     "8b",
-     "14d8339f610b348f4639ac20dfe2b525517218f0c71b1908d407603b25f19971a1b5b4d",
-     "2acf3dc4e3569e5038fe97920de626ddb36bf213afa0f939785dec8319eb8321234c574",
-     "01db40fa416527266a3949211fd9fec158412c447c392ed6a7c7f159a1129da864d33be"},
-    {NID_sect283r1, NID_sha256,
-     "672faa156dc188bf16bf8933d65e091c633f294486049ce96a4a403dca28a149f4f840e8"
-     "bef47412285363e9e89006614b013a41baad9885f1d9980cc897ffbd5f8a7d0e63feaeb4"
-     "2c07776efb307ed680ba1cebf470dd9bd8a2a9efc2b1daa569524394f9a50398add1a5bd"
-     "2f7c263f9e63c2d49461acf98444fd23341ce78d",
-     "14f9f412e3c7d770626e800d43cfcbba3ae6aec8563af748e8a97b67d244334b6e6d2b3",
-     "0402293b37c84e7514564635e517bbdb9bda0b4a41217ca64c38e94a4bd00753255b4cc3"
-     "890088c10bd909964ecfe10c373214544c6f60ab85b8f5545afb0fd2ac03d036db7ea9e6"
-     "7a",
-     "19b21a4d73012dd2a2ec3ee280a9b855b89e6ad53438431cdb5d2cec0e5ba21300e9bd6",
-     "3baaac69d182bf1a12a024dbc9a52ba244a654716e2756c36ddf8ca634129cf9d2b23b2",
-     "13ed92730d0a6d75f2a4a56b39f82d063e1be988dc58f0ba5f553fa88b6510116005727"},
-    {NID_sect283r1, NID_sha256,
-     "4321334cc8ee44f1cb392a4b280a95561809dd3639ddf43b6e11cb73067597988d95b864"
-     "3d86c76c3c6b932d9262b9b8b55a04fba0666dd8b8ff1e8fdf799ae3945b6e30d3af3966"
-     "f1a6d634d5e012710d66cb447fc3375130968a2e1e647780aada2609d87247c90338dd71"
-     "c3bcc3902311caba27d5d4ea4d73ccea960d4bfa",
-     "3091a6a8bdac1e43542dce752694972e734dca31c061c7d1000754296d0748055db3f09",
-     "0405c0761d01020a30c478617313c67008a1332a0e6f295c5a9f01b3411eef585a9dafc6"
-     "9300eadfc6f7bb9986b0dd221b77b54287042ae8d1ae5788706b79a354fe785c66145bfe"
-     "81",
-     "0afb2e2e29b26a686368b127e38c2f5726fd55a13e9f87cf00e831d3fe19d9511d07e81",
-     "2685f634a8c16ee79acf62b7a1fb3acaec0db47c6ff5f2c97a804e9550494b128b2287b",
-     "12b545bd76b8d2cdfc5452291d5e4748a5e981c400daeb65c20812a65bbe936bc613219"},
-    {NID_sect283r1, NID_sha256,
-     "2087e22094570d39fa937f15a3ef0601709a66666344186a33b487d041793fbb9709a95a"
-     "f250b1df0762ea98e911aeb3ff1fa19f0aca53fd4179e454e0e91636e55cc5b17cad9e15"
-     "75c82ad265dc34c4a66b7a31ecb9ef9dc756f2ac1d9dab35369a6bad4a0f47e629daab91"
-     "addc6d297d1e5d81477b3966d8c3b607ed194d88",
-     "1195921b91353db9bcd00510efffe009c94f6bd8d790f5fb3e5a0101c9ca5d21c6ef2eb",
-     "0405dd8aa95e24c054d508bc5081546677b9a8e8dad40d3f8a184af7cf07cdb09ffa2e04"
-     "9805032f208dc3bbad6aaab63211e13e17656c750c6c2a6e3caaf55a7c30ae5ba241d864"
-     "1b",
-     "3223c6439db7255e89c28aeb046e906ba79f4e9b8222ba5ec201b964d3666301f74967b",
-     "0fb7e194dae6420ac447e7d4f882da3c4859f53a948833a0a08f918acbe03c2e915d1eb",
-     "2336f1206b46b3166b28918bdc1c817b22ab16b355030cfd635ab3dade20d2dbde08b6a"},
-    {NID_sect283r1, NID_sha256,
-     "15c7bca449a73b03bbfa783f5a91ca0b7916889a5d99d541e2e8593c3b176a5b634ba20b"
-     "34407fbd94ae1c1398f5313cab7402f3bcd7ad277a8c66d09a6df5dd086b20a0a3823fbb"
-     "b80980cd86bd13e527eee15656cc977103e80113539e26695addd9eef6a1f56986168d9a"
-     "53f8b5de833f8962c3826cca106ae9e8c00208d2",
-     "29dc20446e9abacb43823e12a83737b46e6e577466b5a3925e0f9d496824dadb4d4b50c",
-     "0404b3c1d41d8172ba15fc92d9586f29716821ea82274ac8e4fb3452ccca3e34925f1e73"
-     "6c023e22cec962d759bc659841f259de954911aa289e9994bd76a30149a73711bc41b299"
-     "04",
-     "0931ef56f08c379d1ddce0649f45ec21eccf3dcfa178616f45b200a06f82172b91bffe1",
-     "178348d533217543af694c8d3cee8177e22740b657bc6ce6df9e57f0c1f14fc9407c440",
-     "3eb25dc4ed42495b54679653ab1cd4d61c854207994a7318026afdfd44c89cda9247388"},
-    {NID_sect283r1, NID_sha256,
-     "d12fbb82ee7a57eaf76b63fd6bc6c0a65c85f135f019d43ff7bc295cad15d53729d904fe"
-     "d63d69d3ffe8b82c0ebaf0399e2717ece40e011f710b5db46aa457c23b85545953398b81"
-     "4816a1e7a8ab5b0b14c4a0451b0bda9d0d2ec4a374bcaae208b7fe8056bfa17d6b7ffd4b"
-     "a2e9179f49b9cd781b0c06f6ce3eec26cd428cb6",
-     "3b9b77d19a42e9a555da8ab70aa5638890b2ed21daefa28ca6323fc658662dabcbfaf52",
-     "040632fdf8ebbb755c960ebf8fa5d6b679416e488faeeb021c0782352279a7ae00eed330"
-     "94041aa517eff6854ba04e2de6794848823e53ca580353f2b25e45fd4efd3a369cf80fbe"
-     "57",
-     "2450beeca6f1ebac3e82e3aa3239a5031f54ffe65fa6a45e2bf2ccbda448a2cf6988141",
-     "28664212774e23b6513f73a9b2da97f5eeafd10efe742e314f6913a6d0c0e3e581cc6cb",
-     "025bc733edffbc1330689e7aee0dc121b64a72dff19e1d7c5990206d6daae5bae75d0b9"},
-    {NID_sect283r1, NID_sha384,
-     "eab0a37915c6b43b0d1e3ef92e6317b3afc8b8301b22f6059da8271fc5fe0e419ca6097d"
-     "aba213915855631af64e10d8382d70599d903d1535e25cbf74da3a12ba2f13c33a8562e0"
-     "db03edce791f1d39af8850fd1feff0eb25f9ad0a86dfab627b96e65831bffc5f6d9693d2"
-     "0493bc9dd6eb3e9325dea50b055768e8aa30d49c",
-     "0b9f8f3e89e9c1ef835390612bfe26d714e878c1c864f0a50190e5d2281081c5083923b",
-     "040542ea231974c079be966cf320073b0c045a2181698ae0d36a90f206ce37fa10fb9051"
-     "8607e6eccfe1303e218b26a9f008b8b7d0c755b3c6e0892a5f572cdc16897dcf18433f9a"
-     "10",
-     "31789e96e2ae53de7a7dbc3e46e9252015306d88af6bd62508554f89bb390a78fdbaf6b",
-     "0fba3bd1953a9c4cf7ce37b0cd32c0f4da0396c9f347ee2dba18d636f5c3ab058907e3e",
-     "15d1c9f7302731f8fcdc363ed2285be492cc03dd642335139ba71fbf962991bc7e45369"},
-    {NID_sect283r1, NID_sha384,
-     "fdb93afd5dd1e3eaf72c7ea9a6cddb07fc2054499ffe152cb2870163eee71ace5bd420b8"
-     "98cb4fa80ea53fbbaece2a1eef6427b632320e9c97e38acb16b62fdbf6585b54fabf0a70"
-     "3307ca50f86387bed1815a05b0c8991e0743d10cdf49c8facfd7ddeb8d4a7b706b5a29e1"
-     "d00ac88b0ee88b3153185495ac8388cc70104154",
-     "3a30a1c15b9ed71e102341f97c223a9b5ea3e6a335861c3cf407ef691a18cc639dbe74c",
-     "04040937b263c87461eb5d409008255d4e14c54d7a86d6e3eaf2ad9c559f7a6b9d258254"
-     "2b07562e3a04f22ad37a1df0250215c163b45a6bd04a4b96c30fe2e2b7ded5486b172ef0"
-     "9d",
-     "13e745c76b33e6e91f47f8423653b0056014841f4df890121655ac2044f3a6d58b9e213",
-     "22467497bf1b5d29476f24aaf5f88d905be7900406c64033913fc88601c62063a924456",
-     "19cb024c7d6be51d15337a207e66fb0e473956932faf6d755393dd5a899bf63610ff887"},
-    {NID_sect283r1, NID_sha384,
-     "c78e35d1a5b1bbb0ec21e7ba7b7c74c859d88f3e100e40ae34128cf093885dae4e87cd09"
-     "f3239dd8e79e25305220880dd352a650225d9bd193b9b84e488c458b0b5fde1af941c0c9"
-     "fdf952d2fa41f665918dccae27ab7923da4710f8c27ac8ed424992568dd6f0a6c3ecead2"
-     "1650ed162e0292104eef3c2d8551be866a88d279",
-     "083330123cc64c11888c1fd388629d0b329a50ef31a476b909a182c930ff02d0c389b93",
-     "0402e3a3e712676bede22893a8911ad6a683306e86487d24585bd6fe4f2657281f0bae2d"
-     "c80773889a95e9bd579be379fbf84dc8d26d47335253356e5b01c09eb8ed57474d6c0b04"
-     "91",
-     "0d630f20623e93c274239200393cc552d03da6bb9e74f4a44a518e2642e84e761dff7a9",
-     "27b8997fb98ad04488f5dc8ae5dc88b2a3231fca76d7320550c74cc540110c0cee5d8fc",
-     "1824f1050e85d527847faff236b7195965e7b93343ebac889b23425dc27226d50a5266c"},
-    {NID_sect283r1, NID_sha384,
-     "e05435f695997229cce314e50065f3c5f71981988dddccaae6efb81f936b22cb48813f50"
-     "6d1edf5ebd69b0be34f278592c5935f0f6db0cca1ef9d62834fbf3c4c03f4da0596cb4d6"
-     "7b7b767e85dde7b7c6fbef7d89babe6f97b876b33594a9e36ab87079861ee556fb03274a"
-     "d4af527342a4794192b8933f28c6220f954c77de",
-     "1dc2b656c207eabc9e0d6272099babca8d149c9c4258b779c2f06de75f76d77505271c0",
-     "0402b03407b65809825a32ab50f1b556a65c3bbbd65cfcec898514637ce606182517fa1a"
-     "4d021c97e293ec74dee17c89b962356b7bd50c7b23fcc30ec7fdd0a629d11373e28380a8"
-     "c8",
-     "2d0dc9317a2af5a7d0a23c00d126b7fae4c06bda0a5c50462ba26bddf575adb091d0e50",
-     "211c396875b5dc71ba87ff2483b0ffbff60cc3656132fda7422a81964f1bfbcb5ecca23",
-     "0a0ed7bf1ca853b9b19924c706eff373b97585b692b4b535ad71cc4362073caf8f61a3f"},
-    {NID_sect283r1, NID_sha384,
-     "0f9f36477076c4b5a7d1ceb314a397fb14646695b0803e36e98908c8a978770269f165a1"
-     "fed8f4b655d4efd6ad283d7f5d51b6e1e302d360e8ebf4e887c7523a757ffd55384e114b"
-     "bfc6b7a0ec8511079507b919065ca018573418f9e394854c5704227772161707b4d0246e"
-     "bceb91192f0eb2ea994ce61fd98a6d14cc8246c5",
-     "0081772348ff2d7a3fd57fe703555ab2e14f5d203c4cf0292f944e827e884d95f3b1d83",
-     "0403f7174e88ffa8bc0a770fffa4bc30a436fce331dbe7154f6e2fc0cdd09e76840f089b"
-     "3f0561e6aa3feffb2033ea716ae94b9a7402bccfed1fc4a137cb96fcdfe4685314f73a8b"
-     "b5",
-     "3a8c40754ef7ddd0e289b2cdac5e06c72dc3d6ae9d0351d9295aedfd6f0e88809674bae",
-     "1443b46c0e6bce31642dcf3037e25b6ba2b42daa9a83f5c0bbfb2487ce717c37b91f46b",
-     "3f59d5a925fe19c795b4992c265a3c61b2452237eb34efb9aba30208ce07d1ad47e2279"},
-    {NID_sect283r1, NID_sha384,
-     "1d38b1c342b6611dbaf412a66c1c0b8397692755f576df33b31c2bd12b7f0707cc423376"
-     "391f7b00aa4e7b7fe54532e2b39c3c5284b9c8ccce48eaf9308ed338992f1d4ecde6cbe3"
-     "52e46339d7d602942158387881d9b493fd40cc59d4f9b53ee4191d42352c6f7bf32c331f"
-     "0c5afbd44a92901a4b713c7cf6ccddf7de4cc6e4",
-     "1eb6bf2ca1b5ffe6f6a795733eaeed12de6e87c53571e702635b9dbd0d96b47df4a005b",
-     "0400e64dbc1a08acf6ff0e820593cad79a46e3bd818ddef5ca0960fde799abacc7b840ed"
-     "db06115d3de2bdd011ad053550471368581a5f125eb0d32090646fe4407980a42988e551"
-     "aa",
-     "3b28fc6d0e4a7fc449b811b78900fb9f89885f4d4f70cb5a2b3d4f8ab87bd5448f4bfd2",
-     "2601923909c8c953087b0c0acda57d8c01f814dc9722171d8409d0acd2fa4d9c1314693",
-     "3eb316cacba93bd473a4b4acae4f2b5a5b2ac9856519032e63a0c718698956e8f35673b"},
-    {NID_sect283r1, NID_sha384,
-     "3353ad05ef90e9762bcfedd6ef44a1e8ea0392ebef30cffd48ae620f3e567e1cd44882d5"
-     "14e7c6759200d4bcab18afd3038c3d3f8c50f7bba32a04eee5a4b1cfb8c349939e4efe0a"
-     "46fd047d02ed000d8fa1b98b0af5586f120d9ad174b3aea33905b979ece1eb3660b1e070"
-     "c8821b32df41904ad68bbd8ed247aabd94066f16",
-     "3b2a3e65e5a306bf8e3955b60e856dfa9bf68c1275a678ca056207a0ec67c96eb3f8309",
-     "0402c542cef892b06372af7d9c321ed5309995c1cbbf1a466e70bd30f3856ab7c5d18f4e"
-     "3d02a8acdc12a7cc0b54f4dec9cf61c484a5cf86c4cf6cb5ed615479123ef1c6ecbb6c7a"
-     "e4",
-     "09bb5e49188621466440a0841b007525000c2203d9821f4c6afab63ac2b97cb5e2e3dcf",
-     "00a09da1c4bedff47945898f4f4ee9a0857bb56be535544aff9d729ae44e23d678fc71f",
-     "2390be08ba0861b32ca35ba27a0c8dd1a4e96d28cb007133a096b52afa0126bf2a2abee"},
-    {NID_sect283r1, NID_sha384,
-     "e7ec162185fe9a5803c6b03d98041422315ccdac67e48fbd07a1ef3c5661158710abc679"
-     "1bd0a75d56791b4ac0e7695d53c5989d9fa6a3b037583b2a80d2b154b024f1c36b63548b"
-     "e9afe1d51f2f68b2ba94d4ca1e69a35ac10e15ba72242aac20f7526b12ff9d3cde9a9bfd"
-     "70d55adf9bd92c66d092d7d08e9764c84bf7f329",
-     "1fd4d1af0bb7c79ed5fea7bb45574e46534387bd916649485ef15207352d7302e81dc01",
-     "04077057d3f93011440a78718a3cfded73e4196e7fde96e794465c51be8b679f912c10ed"
-     "cf059873441c590c43e0f00f80afad5b0166f94b62214ea45da29174874e44356b29eda6"
-     "b9",
-     "3f224b35737e78ec5bc9b081a601d8fe19e33b4787449d3353d2ad225358211cf9f7f0c",
-     "1a7bfe92c30ed1af478282786bdf7b5b89cd0fdba5e534bdf13899dab5af108803d73f6",
-     "2ba14810de4f5cf48b56e94bd6c439d230dfced3cb698c77627f59faff0ac5a42c43067"},
-    {NID_sect283r1, NID_sha384,
-     "87c8f2e3f4fdebce0ca9300fc1ebcaa934f51a12b6b8f2cb6bb6eb77965468663044afeb"
-     "2a1334cb5a81e74b8427267f8b34b5e9ff0cf157a9f18be2b1942e32ca61dc23ea13c3f9"
-     "fcfa16df8fe05e067938b6994982676463fb12842d4ec532cb904cf222aa805dd0d86ab9"
-     "a33a83e294c6d81e8dfa273835e62e9041dc8ff6",
-     "20380b1136b5283e9b7f54b7535ebda33b129ceb177bf5d3d07b1daed5edd9fb3862530",
-     "0405e7d0931db006c6abe04671d1aede760f2b1ac5c866570f8e5a24ed356fdab49cc5cd"
-     "ea07004920fdb0a744cc545068bf82bc5d7a46edf9265fd7c5979b9559f5421c9a98f6db"
-     "89",
-     "3cfbb1204caf6011fceb8d4be987d9a41b81bcdd95b94919b220647d0e7a18feef4cd01",
-     "07096beda28c20d2e62d9b0750142d3d21b54c38c7fad1ed65e4f9b386f3dcfcc43a3c2",
-     "3d0af02aa39e329e4c39f2a1d6797f0e3d14554dedbcab9abbd158273a3c7116225abab"},
-    {NID_sect283r1, NID_sha384,
-     "2ac53e8a50c4afe3b38904255b7cbf150c5f79dc15932dc0ac9aa631521f68a0d4b6bc5a"
-     "04d55c99a36531fd4886a23a8d99f262ecd2a9feea925d7a96ebe9b6979a207b7f9378af"
-     "be404fc8e959b0333572a2c911f8743c0ba64eebc7ef12fe5435d2cb0e5091ae518b6e42"
-     "33489efe3c16c6f21abf4e2c6808b733914e5a7d",
-     "19f815b98836948e0a0dc9c30828c31b13e175f1e79f23d084ae1bbe64823f4866214b5",
-     "0405109d8ce934972f5520101730d0a14b99213ea17772e3e7637d622a5de13fd2ffe3bf"
-     "fa0502927e0c7baedc4bb3ed2bd1b15fd2d06dd43424393b246dd530d5d8598b56dfcb3c"
-     "b7",
-     "10359d5cd8a9b7532c9902bbf1cb83d0d34bf37e73e7c0f5729b62a10bd4d8faa0f53a3",
-     "3503410a6feec71fde2feb14375d50f99ff9a2c8bef47e676bcc6c3045efa9948891ab4",
-     "159b1f65fd566ecfdc08b87e4ecf99ceea3088a750e2c3c9d868bb432de6a61f289d06f"},
-    {NID_sect283r1, NID_sha384,
-     "0b201469cac4c078f587edecdcdb6efd5752cb4a3f43ab540463c4d908c27527aa3592f2"
-     "f9acad85dd94a3c056bd28618317ebdf2e7dd6c5ad26fa3c31dd8e5c50c60418d91c93bc"
-     "bb59ec1adb1db791f485ded78a5cdcddd23dd1cfa4f13443468d8a5f2d648059b9c4470d"
-     "0f4fe7733d56a28a2c24456b6923703ef32cf0b8",
-     "01854e954654e726cf4bebc0e5a840e8809fd716059211c6ffeaed36829808363164684",
-     "0407a6e7c542860e815d3fa24fbaf99989e8b9c812b08399056ae4f9a850a6711a7385b6"
-     "2200dde6bff33891a64744dce6456600f5a6a11049906608e77f8afc38b922972c805af2"
-     "58",
-     "2c9cfd376903122625c7fdca50e93d4c216f0c7d07f33b3b51e54e666e13b67dc89d290",
-     "18321f9ee35d47648060213df1275ae89c2ec7d17abe8093d8a431ced23aa61d3f8df4f",
-     "09e5a05a62b006a7787c97be38df6fb9fbc1433aa2241b5a788fa727229a18e07d7a8aa"},
-    {NID_sect283r1, NID_sha384,
-     "fc5e4dddf4c4a328b685035ee79069770fbebcc56c14e31afb4bbcdd5220e025f31eba79"
-     "4fd6c05e64f19678dab33ce4f084bc32790392f14bf35669d75b6466b4214ec30d58ca90"
-     "ae285c9058f5804a1fc9d7a995958f2a0e84ee52e8a78b601bec04ab607ffc2091749cc5"
-     "48c6754ed14e2e5f92315bdacaa7a12823ef76bf",
-     "3548f8020819588b3202f4c1ac62eaec6a47c2a19b2900c5a3cf5b4ba5804231141c647",
-     "04038563f2482a399bf1c13f42f8b85ef64a3599c22da9688b97530718bfefdabca3ae86"
-     "3705c4aabf6d8a90af345008d5a244d0671cbe1afd08000c4eb37702a9bcba6dbc058ba6"
-     "da",
-     "32649876d776117003305f0ec9cdab5cd84bbdc747d3dad5d8d54a8fdc84d519d50df45",
-     "1f5160851981772c502088eef209f7f89a7c8ab35e630d16330bec7723e398fb37c84b1",
-     "073a7333a7037e1257d4d70be87c30bef770f9d728dd7e2615d47b399ec650aedc867c4"},
-    {NID_sect283r1, NID_sha384,
-     "284cad790e6207e451a6a469cee3befc3ec43e047cf91b9dff1485718aa29de36a43f7c5"
-     "1eacd8589f0c3a96ec18e8ccfa92941b50b2132e3612d5b45e16f60d411d1c53e373e1ba"
-     "451352e28970ada9dcb9802102518a385dc571dcf6900971b00346098a58042e0d1d129b"
-     "d6801fa640a895a458a45b31318fe63ebb30c6e3",
-     "3cc4505005c41142308f1489226b7b542e2e7f24f1d3089ff6b92a4b0013f490ad52e60",
-     "040280b77ddc6648d9cc3f5557d406ea2a089c8179d4320781b2eb76ab07fcafd2535b91"
-     "de005f23bf4171aabbf0fd50049aa017c0dae70b065964c685bc03b958cee2fc3249149d"
-     "31",
-     "2ef488215648524f6caf85233736eddcd9d1d838c6a2799c3a68580492d40f9800bd119",
-     "3e8e13db22c97281307edd4037f0a75d2c70a070614e94e02c860f36a53aa738fa0db2f",
-     "356f2651b51a6be0c697300a8c2641bfaa1795397eac208385c3729248e36baefc173ae"},
-    {NID_sect283r1, NID_sha384,
-     "6d46e57abea9d115deda48b69fe8e0b36144df2f6a659509ce1b514c8cc4769d46e5f71d"
-     "f2a084f1db4a22fdd3ef0c2f90394f2898ce291b9f279c0664aa01419f5f6bee1fc12998"
-     "71b27ecd57a5ac548f99d01871b8c238a6b46044c953b2e78e22346a0c7663af4db62799"
-     "038ffb5c21ee512e26d01e70a4ed967377ab8405",
-     "144a2fc8e0aa63506e14e4307df36416f963dd9da78655832f5b991af8c3eb97df78efc",
-     "0403fe8867b560bfb21dda517b8f4d50578a11e1d0ab7ed4ab3796580d31bdf710e8e222"
-     "8405a302baa3795e2d132c55d90858d14d4b17aea0ab70632b135f94bb23112d163357f8"
-     "ca",
-     "0b5225132f19419715170f5a3f26919b4127a05b4f0406f895af1e4bba95786daf95259",
-     "0651d17b00ed9a06bfc6a913883b5cdf51bd5f2dd22307cc5ad3bb545f623516232bb6e",
-     "01128d4784fc0fc050af0b97f859616d764b22f40734ba65aa15e2cf80e7bba3d15f42f"},
-    {NID_sect283r1, NID_sha384,
-     "dd750b39bd8753f4e473c4484e2b36ce2da7576813ebe05861c339ffae1d029bc793173e"
-     "d394091c00685ad82f0550cb21ed1c68f0c27cb7396922239cfb886647af204e88a9101b"
-     "7453a8ab662e270b87a8a13f2fe61d695597382cabeb781933bebfd7d0dcd33f77266e43"
-     "e32d937f2dc89f67525e522977ce73e9ad36c8e1",
-     "24ffeaf139043ff25a395e4c560c7680c1c2155191378917eb25194136b4a69597dc277",
-     "0400402bf61c0e36385e5fa8371a553ed8652466fdc3ed9d4a3ce1bcc567d1f451f6703d"
-     "d104dbea6f67e1117116f30fe42e84383768b0da770f8a2b4cd8a4fec330a0034554a138"
-     "08",
-     "3e4e78f012eaf1778c086a3bbd9e996da0ddde651236ebdb6348062f56b36f63a901561",
-     "1e2312720f6fbf44d7a6449a7f30019c38e69f2e6424d4bd1054f40798e9fe58d080b86",
-     "379d1b610a976730dfdf3300280f1c61109ad13c788e8f8f9a8d5e0130ca9482ee417da"},
-    {NID_sect283r1, NID_sha512,
-     "4736e59fe5812f63737eed57a570182c065538abd9fb0a1c9c2059199e7052ba57d84b5f"
-     "a1cda2ad9f216610361ce1dfb9334816b6bea509283756a03aaae2e5b0597f492d078b6b"
-     "015a40c9785dcc5d2ae266176980db04f5cffef40e16661a50ef871c5f531d73fd5d114f"
-     "a19bae9dd2da4267a131fc31849da38c2b78d1af",
-     "1d1f2e0f044a416e1087d645f60c53cb67be2efe7944b29ac832142f13d39b08ac52931",
-     "04010b2d7b00182ee9666a6a2bf039c4358683f234ae41a9e5485fd6594e3daa880c0dfe"
-     "0f00a419b2f40e573dc2dae4b22e6f56e842e50d631b6126153178585bd05a8b9e6e87e4"
-     "c8",
-     "3e4d36b479773e7a01e57c88306404a46b6e62bf494b0966b4ed57e8a16169b9a1bbfe3",
-     "30513169c8874141cdf05a51f20273ac6b55fe12fa345609a2fede6acbeb110f98471af",
-     "33fd50b214f402deed1e20bd22eba71b156305e4f5a41ab9374b481ee344ab3f27f4bcd"},
-    {NID_sect283r1, NID_sha512,
-     "e573fa7d4bf5a5601e320130de91f4ad87eb7ca6b8998488afcef69c215b0cccd221b8b6"
-     "6eb0af9d699af9ad6c4b4a580e82941f31e4c0a9bd83995dd076c5ac9bebb34481061e7c"
-     "b1b26f6e8c6b26ee4bdf9887f7ae2eb9fad3115a21dcc96acce85d23a040c0ebbe0a56e7"
-     "5714dbfa803d6e279b2f4280bcb993f96ba321e1",
-     "1337362609df74d25f7adee382225e6a04dd6ee4c6b45fa31499ce9edb0ec046325caf9",
-     "040287b288ce6f65fed9f95c99fa4b8c1aaf6de65ca563df30ac67c1066d2ba2f5a554e0"
-     "9c025567fe183dd400d256c333da92dda2e364afe84492ede9fa0e913ca7f12069b5a44b"
-     "48",
-     "31b84ec438302155f2e84dd118c0d8479267f8d19c8c5d96d21177e20b23e0180dd6d33",
-     "08133e49644044bf9ba3b4c8bdc3973647d650c58fae4a7ea5a5fffabafed56e759010a",
-     "1d8cc410cd04b188418b20cebc8f66ab0dc29a42f9067aa2926dbadee39abce79deb396"},
-    {NID_sect283r1, NID_sha512,
-     "7862864d0d78b44e2a28af44a0a16d8e9b1b8c4b794db0410c0a863ba011018ef43e1e11"
-     "f2fcda2f56fdb2a69cc817df425c9cb3b458922ba00d710190cae16d61af3c304a42fbb3"
-     "d0c4a74a297253fccd70aca414865b41f68b01c561be281265fa89f63f975d3101334886"
-     "e85929a5a47fa8dc459b663548faf8ed7484958d",
-     "1be00aa0afdfe92e24a2536594d4b41701ad4dfb223aab35ff49310bdba7566057fe8ac",
-     "04013583d8cd163fdef7c11e91f36c1d3eb2f7957d219244db883708a7c5777611b00668"
-     "1207a1f4df45073b838277d8da7daa7147b0f10aa98b5ec02fbbf97c89ee17f3a7ab4f3f"
-     "27",
-     "26b42f369ff9b2740147914a2698cf1ec9bab44caa3b5f05957ceb9a32073729aef0fc3",
-     "37640dcfa11483b3754ea027f5f239500894dda4f4c8308f0623db256eba2113c41ae61",
-     "2096767a1f8210b175334fad61b4c7fb4e2d6c7811b5d22521af7750f101077e2fd4e44"},
-    {NID_sect283r1, NID_sha512,
-     "e73c96d1a84cf7cc96065b3c6a45db9531cd86a397e434072a38d5eeb9a90f62bf5d20ba"
-     "e22b926cfe967647d2bbb5dd1f59d6d58183f2cf8d06f4ac002ead026409ca6a1f868b40"
-     "6c84ff8887d737f65f9664f94801b2cd1f11aec336c0dbd4ec236d1cc4fc257489dc9709"
-     "dfa64eae3653ac66ab32344936c03eeb06d5852d",
-     "12ad0aa248db4fbc649f503e93f86104cb705d88c58e01d3ae0099590a69aa006aa7efb",
-     "04008d262f57f9528d55cc03c10bd63ded536bee9ecc617221d9892ae1a75b7cdee175cb"
-     "330754e40e8823e89fe23dd2748fb74e9e93c3b33f188f80377a32bc66f6a92da1804c04"
-     "cd",
-     "2405a351a3bf9a6dd548e8477452c4d9d719e32762754cd807a90abddd3ad380e197137",
-     "28c5d807ea1c3ddb7f2c90f3af644c5d6a2757336ae46c2c148752a2fc150e8183cfd83",
-     "397c8c52fd67b99792229194a787518db5be8e8c291b1a30e105b00f108ce41f8ec8fa9"},
-    {NID_sect283r1, NID_sha512,
-     "a73fb0aaec838d011110d49c5e94395ce07408917bacf7689d2cfe0948c582214b263c6b"
-     "80e0a55f1e159086817605723740569eeaa1bae96b979679165c5c35ef2142525e943e59"
-     "5e6b4b160acd7ebe41de19775346363f779b1f80b6d5f0785b92a648028e456af8496102"
-     "d19dc6526247a654bdae3368f075fa9ee92b2f4a",
-     "2cfbb8f340cae8e2e2322829148981cd9e509b0c65497fd8d9da5dee9dcfd39b0f7556c",
-     "040260bb17da74429f049f3a7eb73fea9cbeb5b14ce553d7772a365376d0114ed2ef3087"
-     "d005889e41bca54c09be20dd406a6e1f11f9d31d720e0c4e2e88f381ba89a97f12fa9faf"
-     "f0",
-     "3fd7cb455cd97f7f9cb888444f39569114589612b108657ac59178ffe31a33569c9f0bb",
-     "048a10915fd3bf9ffab1cb13632359466ccc539128cd98c6273d5d8d26c64d57520394a",
-     "2d0f67f9baffbb34094c5fce36f47cb73a537ff984c89e38d073678c21148056bdd6893"},
-    {NID_sect283r1, NID_sha512,
-     "eda775984c7c9f7db47af30dab314d070fb77e9b623baa6b73e2cbda800f167b20fdc2e7"
-     "219391efacf908f4ceed9b9b6bd3541b52ea087177e18c97391214758cf6455311fad336"
-     "ab56cfdce57a18add8cf85b0a0bd6fa7297dbaa34bfc8585b0f06a0aae055186658c227e"
-     "19cddb65de88d260f09f805c2e8854dcc524189d",
-     "070e82a1f3fa6158d15b7346dd56150faee5c98c9d07c996e01a06dc9b211b12ff62d60",
-     "0403d3ca5fe316a0820e84a8bb5d231bb14c810a87c7392d7f960e7cecacc56c337f88b0"
-     "ea027ac0ded5633a98ec5734db9de1399c83a181d522037266d856c83e5c8047c4eff2c4"
-     "e3",
-     "311b23487750c3c4b23b28424c33328c39d6f594d2a9b459a883508b985d8aca039a2b5",
-     "1465736c3c9e30e895b1544690e05108ca221cf2352ee4af1b5ee4130029a82b277b076",
-     "2819b94dca3a58cc5a96790871640fe0fae38883de6fb4712126c1c1cbfcb0c005c5af0"},
-    {NID_sect283r1, NID_sha512,
-     "a4a13e0bfa761b9bf37fade6570d41c161e20558874911ff3bee38e5649849b159beccf3"
-     "21c6bc7243f99c01a2fadbab9e157e9952ca65d8ea676c74fdc976d00501c626b8465c6c"
-     "f0e4fd1a7d1260aea987161b821528b0b423e62ecc5193a0a49442b0c3e4ec9c4786a3a8"
-     "6b199c07dd3a17033d430d2c83c100f54e0a7c31",
-     "0b471bbc5f7a07996e370da4a09e71e2119ab3a562a273f079401951fbe4df39a4493da",
-     "040333e9d5e077bc64d022e49d5d207385a19282aff1b73b307523b0f861b4ce4219308c"
-     "8205414e431f3b90a2d4a454d073cdd81f8b224180ac4139104166ec33ab33d079dd147e"
-     "bf",
-     "3e431c39ef6f4b7674a1bf414460b58998ed7aa5b1af7ddab746cbcd2ed9f42ae3827d8",
-     "151df78c0f453d396d71528032933566e176eb7f6910fa9df2e9b2f5ebb6038777ef209",
-     "08a1c4a1e21cc63fc15a78f0a11a1bc7a59a5a31f57091a12896fa670dfdc05c04053b7"},
-    {NID_sect283r1, NID_sha512,
-     "7ceda7a7248640f7055309ae712c19d741375d6a7e0608e07f0135bb830dc3e8863ee9e7"
-     "a75331a5e1bd38c42cdd484d4f45a26c2c1d4e05ce0d0ca941f4e94ecc6b371102f31633"
-     "629e9861de558bcb6407d66eb91f1062ac0e0409db68b9f2855296a7f42fc92359a7dae1"
-     "6c73fd2dddea52bd866a4d501aedd8fe3b3ea733",
-     "3c65cf80bfb507dff52f9bf2f93df0642020d41619b3990009409e7210fd7130ac44ffe",
-     "0403beb5b9b8785c5601093086b709c0a05955be42eca3d217e625349e5a875efa82d75e"
-     "d4007cd4e64475d628e6f562f0ac9c3f91075626063a52c2b621796e557799ab2f1ebf8d"
-     "bb",
-     "16212ce91eed7153fef806d2561912be1d988410641d5eb72d586cd4e6782deae4538a0",
-     "26ea04dded2cbeca81e75503932982c7fb5cc7d38a45a3fff8c4ed7f844dc759d8da302",
-     "061d3756e3da1c7816f0d72a8c84dd1f3b93624b631f5051c801af4e472fcf82d896c18"},
-    {NID_sect283r1, NID_sha512,
-     "609815edfd58c0e26a4b06dded831d2f33466a130754b96d8d7c3b4d99fd4b0789ec719b"
-     "c25338d0ae8c5880560c02687d352d77c291e406eae865c3b26d00f2e63dc644ce7e01d6"
-     "e96ceeac8bc1eeb257d36cbb25d89b5fff6e30b6051506a0ae54cfaf6214f30985d54cab"
-     "78f708029c1fc0175bc58e888db89dea8d300abc",
-     "0f4d33a9c7e6744ab3c441828bf0f1866ae1c042cc54abc754e3801263a96cbb3955dfc",
-     "0404b925b97bbe67adbb6e918acbcae0ced8dcf11d012e1a97875b750bbb7d01945bd64d"
-     "f304591cc9caabc0db8fe9047e6b1f8d850ac4389fe67bb84f6846b631dc3524c8dbe6a0"
-     "6d",
-     "0483aefcad5e382351125b333dcede8ef50914b1d1f1843b075f242acba18c290c742cb",
-     "1fb791c288e2cd52d3837c56b02fc99f53a6ee27ad6dd9c0a31ca08d8fa64eefccc5c87",
-     "0a041ca35422d8985c1c706dcb0b8ece64b65285bd0a934cdb41fc08223885147281869"},
-    {NID_sect283r1, NID_sha512,
-     "82d8ebba707b72655497320200ce719520c1ae7f46f38122958fd99322c25c9f4d4344bc"
-     "b77a6658df0eece5df163412ecdca58475d56b0c2d14a0361e4cef458df146925d473a43"
-     "692b15e9bbec550f1bde3444f2a5b2ecb55d2abd273ae999f16a32333529d94455e485ca"
-     "4585e6b07bedbfc2bd1eb766abf0d28bdb1ae6ec",
-     "3a4824bdcea6a144d85f1b194431724cc49849b6cb949b4766d641ae95477d1ec3d1464",
-     "0402c9eb36eca01dc2fe921933f4cebe8046b3679abed80d2f8fbcf8f254bf17be3d551a"
-     "56034c836aa4e946425fc9f49f3f62e33d8a0afd320292a34d0ef8bde8ad79a10e3f95f2"
-     "f1",
-     "23d8725af57d835018e8737fb4e8b2eed3ec5a83fda137c710fc1df875416ff82fba90a",
-     "0d9f57ba8b6a9a1cbba67adfbb938211ed2d267468f79ad39ea1eca7271d135bb67c18c",
-     "0f09a600d97c69ab521bd1ed6bcf0c0f69255c334e0aea06c68bba81d53e810cc553c9d"},
-    {NID_sect283r1, NID_sha512,
-     "9c6fce18a6a96349b10c9f2f5f1505c8ab727a650b44bc0782a5f39fcb48b45fc7c1b821"
-     "80d5f229b8abfc807071f931d333d265fc940c93fae7520d8d40ef59d7c6e3678c6a2ecd"
-     "e52b6a8827b1ffc6ed269cb9832feb20e593a7e3d4708309342875199eb2ffceba7ecd70"
-     "7b122516c815e83e27872eda812e3ea52ee3c4a8",
-     "27ba543ea785df1d53d4ae4c1bd0a3a994cddf0c25d2b4e8ff17ea7aa00619e858da1a5",
-     "0407d375a9e78ccee85fd795e3fe6bc07f50af3456edda1ab00303f6de6b5b02fe09859c"
-     "63008d0d54ab9a239b5ff955452b32bfd2372fe095751bea4b56d52f79b4fda0fa635f57"
-     "f9",
-     "00ee7010af4a517502cc5d5433d98916f6750e8a9009ea04b8132268673d4a02a3e2031",
-     "3c147b66efa47a842eb90371eeae907f0c813ca0937e488da95ff8ee16d389f3ab902ff",
-     "01469d005eacd9ac84a140c93ed0aee09083a4822730a28df35058cad29267eacf03968"},
-    {NID_sect283r1, NID_sha512,
-     "5eac15a64c7653d125605869012b8f036804817aedacbb5a5248a595ee0c12329f91e817"
-     "9c187192d3ed0d4ca2e202d8d4d9c93ad3f3ed931121c193af5b47a8a5dc39775b6c2d70"
-     "2708e5134f77a31bd62eaf87e39e6fd3f2b9f782c3057e162dd53b3addf92bf0ab99835c"
-     "7f6649abd1c5322a1ebb2ba313df9464a74c14d3",
-     "0708d0907d14dcd5f40e2903e1e90e48a0ffaa6d4d9b84ca14df4e985c294f74eb9f2d2",
-     "0406fb0fe1c3d5bfee5399c98518bc3ff135e0c351243fa0540717a9b1f7990eb8cf4359"
-     "7f05212fd4d6a50c08cd99ee5988103fa639b1123c878d416cc553639bdcee1f8e927bdc"
-     "8f",
-     "151465f40204d76f3bfc2e4052549869c19da82c678c332f536ef24567ea034358866c8",
-     "0803d3e8c876d46a9198f2f769faa76c4f66bc5ff4298b9640ccb8e67ff8d10f86342c4",
-     "00da3344354114d163d14d4c288785adbf9a8b31371c6e4420383c80ba0a430019c6acf"},
-    {NID_sect283r1, NID_sha512,
-     "df735a7e60bc267b18f313ad56bff830be5ef119baf43ce27c6368ff1dd89f010afd4f48"
-     "740b11c12101c5903bfa71d6cb3d6462cf875bbd55a570ffedf3564088dfe8c8d3148231"
-     "b78b5adaa6c53696737d4704daa59eab8d986fc6e519e81540f201e77b923a6a4af65d71"
-     "73635b3b19b2023022186a7b8e869e1ed51717ab",
-     "21fb0a6b94080da8b8299b87457dc09d21bc430ba5f3359d92aacc1151be9941739567e",
-     "040179831c55ead3d11844fea2e18d25cd4d658822e626550aef1afe37d88aadbcc9bfd6"
-     "66075f8087d759ede340157667c1bb12be272b8318aedf2e8f8b487f4bcd12a50ca66f92"
-     "81",
-     "37833e9aab843a6b967264fdb705b419ed63fbb09c12170491019acc7c21b9ee28a00ba",
-     "1c9601440d109a3f4eb69a1a669bdaab9f4222a34a04ace8ae313b10bbb66811bea7d5b",
-     "3d2f9ad7595dcff69b65f035ce600f2667f8499d3bd25f789d3f3c1bf83d2855f68eafc"},
-    {NID_sect283r1, NID_sha512,
-     "bb107b0eeaf175a786a61db923bc6d51dad5e922e85e57536118e032167b197b1a1f62d9"
-     "bbcde04922fde781665c1094181c16ac914cf6fbbfb27bb8346b2134f05c55a8c6b9b481"
-     "273758e380666d6e22c28577c29446cecc5c3df9ed9f1be060ca55ab2b7fda36a147aeb4"
-     "6df0275bb923e0876b703452fab42f6b7ad2ceb0",
-     "2c80151f91301fb6b0c7685bd172f20515b46bf94dbc4160d0720fbaedd40ec00084447",
-     "0404a62b0c9749ae9ff00dc1d50d2b4a4941741abfdf13c8e416549ea27fc26b14f191f2"
-     "4302c9cdab7c6512c322bd200167eb9657f8e8c84864b57480a80a3c6efbaa289ab8cbe4"
-     "d8",
-     "3df951f8c4490fc7c2d50a72a93e0e82c5a20be8d91afd890d6846bfd146169ab58b382",
-     "1f2accc7f7c4b5f877e12cc17b227e1ba110577c9f4e1785e6dacd8491bc6017129d798",
-     "27a167e6f2b43ce9663b810ed4f8ef15029fb6f2be2ddf25c014d844953f501d1dcf6d6"},
-    {NID_sect283r1, NID_sha512,
-     "f47e49ae30b09b7666600b7a95e81b0afa1553da5e01fd917e4ce1b58dfaddb8dc8c03c0"
-     "f5591f533610deb6a7bb5faf5dd1ec4103a587a1a4c58a110a706b0f301a5c408b3d984c"
-     "210d5b4a0b347d2b5447271f25b527b3c7864f7cdfa735dfded47c63b723fa0f0413c57a"
-     "24ffde9a95c35f743f892ab1ed1df704cde82d9c",
-     "1538abd7ce8a6028d01604b1b87db3aaf720e04220edf4d1d28c2d731aa25f509e58f2f",
-     "0403076b5c3a12b8a2e1368c7e3458458dd7ba6c5a6dda8c82cc6b30d1ef767d36e01520"
-     "7f0369c7a80cf01e9f32c08f9924db08a7d0dfa5e9a8e0e29b57f5eea8506841e6e3da04"
-     "f0",
-     "3f0052ba6ae6bd7a7aeb077a764d21caced6b241f63616ae4e4f0d98d2bfc0e44dca592",
-     "01281bc0bd36ba1f3e1c262d98ddf4e9bf1d80dbf97db02089fdf1d2e625abb5733ec3d",
-     "076db2215d9f33054efb397c449f05db198d38a24749f046ee20032f5899dc142052e37"},
-    {NID_sect409r1, NID_sha224,
-     "f2380acb0d869d1cf2e25a6bd46ebe49d1c9270624c5507be4299fe773749596d07d10f7"
-     "c2be1c0b27e86f27b4a6f8dff68cfe5c0b4c58dad1b4ebec7bd00ab195fdd635d9fa8a15"
-     "acf81816868d737b8922379648ed70022b98c388ede5355e4d50e6bc9ec57737d8843fab"
-     "da78054e92777c4b90466a5af35dd79e5d7a81ce",
-     "0beb0df3b0e05a4b5cf67abef2b1827f5f3ada4a0e6c3f23d698f15a3176cb40e85bf741"
-     "c9fbc78c9e207fa7302657527fd92fb",
-     "0401da1761981a65cb5c77ec50ebf7acc11eaf44bdd2f70242340ec26ffada7a4b5f661e"
-     "13d6e7ad341cd7dd1ca491cb7a0b580be3019ba11e4c4f2f5507d6bd2aa2f96b03510a03"
-     "d5f8c38bcc8acd08080d9effd1f8ae5a5586603b2e112964514c831bf786b2fcb2",
-     "091e575fc79444fd2d9021bc267a1a076438d73464726bd0fe4ac2884a374e71bd462b15"
-     "16b3e97c3202854bd0a286214b9e92c",
-     "057ab9d5cf4d18f05eaf17d3b5a4af96c3eda8ee48acf5e02eefdfe2f542cde32a37c04f"
-     "285794ddccbb14383a645db040bda81",
-     "05275de4157b32723366a0d63831e6512241e3e4416f3af02e22da8faeabbddd76116030"
-     "4927a71cfff4d6e8937347c9b78cd3b"},
-    {NID_sect409r1, NID_sha224,
-     "22a97fc0a9694dabc6f274ab52eb592dbbe8beeb646ebe6cef60eff341a13017eef980ab"
-     "a6d24ab3afd976e2f6a84cf652654d4a54a36b2f2f62fab8858f8b0479a48fe9f47f8fd5"
-     "a4a1f3141a91cbca186507b2bbfef5e4c4d2df525f04ef7c4720fb443ccad540f03a2be4"
-     "68d88c9545d1dad579fd7cbcd103bbebc9e9f961",
-     "0504865a30984a9b273d1bc289d734d10e0aa56e93ab14720f1a42a27d8cc932cb8804b9"
-     "63175de6fe57d8eafa8ab7ea0592dfa",
-     "04002de5872c40a79d5238722fcb94d5158009e28fb41ea012e92028dc3c87855fba71f5"
-     "0e6d0dff709867de185f9a9671e7a91e2f00fbf607f69609ae96982bda3f0317fe46ad1e"
-     "0207030fdca702cd97fb5d5732f3abab24b10669875a64bd2a74c8603897c78d22",
-     "032d0f950d10d028db6e9115e9944e7c768e2da731df49dc9128bf145a747662de08cbe0"
-     "517fca6fa185abdfcc4e3ab604e196f",
-     "0e7d16daa689ddeb08074285f5293bd9f1c051ca5589e69e4b62c32af110b6f3981d9624"
-     "df15c7cac0ddd62aee9c41c7b6d690b",
-     "02f6bdcc551aef0e4e8da2df38288dcc29fe600de2f8b6cd8149f88146150790915148f0"
-     "69372151c3bdc4d719526eff252e610"},
-    {NID_sect409r1, NID_sha224,
-     "af36c04af0e3fd64bf52dedf52fb788d2d1bd67fe05d98880cc7ad3c20436abf02f637fc"
-     "ec209fbf888903fdec8682717299f8a4386768153b7faeb6581db57fb9aaf4615b4ea8d9"
-     "24198fdd158363a1f40312527d6bd14c13d19985b668c6b88a7548104b1ff057d07082ee"
-     "a421f50062a315bc3866378f2d2d634f03fbc0cf",
-     "0cc08a4ea5ebe32027885a8c212870e7c45b6c610117994d6a42a284c05199414a3a0e8e"
-     "6645ac5c2ebf21c505a601f69c62b85",
-     "04009d2beb607f2bab64451327e1dc67f04f7569ffc0c67b410c6db06dc04edddb1362ce"
-     "8d8b8220be77c447640e7d0c676e5ad1d500ab813e800e75b6012faea43be56fe9d5a22c"
-     "d46fb1f4f1ba65eab19f75f2ce9d8187e4940fddc485c42cd18d40d47415a80b02",
-     "0cfcc307f847eb696f16af32502690711ffbaa2e60e75f80cbcf7704152d5eeb9ddeb701"
-     "952dd58fefb159926a83245fefa6196",
-     "068d1c646dca56393caf3239d9fb30d1dc56f991a8dfdbc0a7b69d273aec69a53056d955"
-     "3e105c7917e522ffe446cbea23227c8",
-     "01db30aceed2b126cf45163b9d878a6590e9ac8284a31ccb0faeba2202679f181eaebb66"
-     "4b5537f408b693800f24da590082dfe"},
-    {NID_sect409r1, NID_sha224,
-     "6bd6f52a6204b60f37929aeff28c87ef61ddeecc231e52a7772275f9329add899c130956"
-     "f8c50ac2698aad3654fdb49b74a6427a62a11eca0a8ee8b719b8c0df7b9f0bb0af5fef49"
-     "18a8c83367d29fddd04b6a1ecad904471e5b59c8fe3cdb06b4f8f96419518dda960845d8"
-     "3c49a49f1b1f2fd1d2682a9d60c25fe3ce982cf7",
-     "07156ef0a74ee1119532a2a7e8c02be1559c3c21897af9d5b34553c3d0feca4a8d5929d1"
-     "945df824478e0c0b92a6fac8c84f639",
-     "04001df419310cf133408e9bdb32fd85f8f0950263e1886f2e2e108a596e7e76153ec47b"
-     "f9b33f69c1128dfbf52557f3c382de85f1016a15517a811c77cc67ec4fe2bcba1290e498"
-     "1880c071318aee28e30854692ed2d6bfb71e6e74fa97af750889ae8d010189733c",
-     "063f127c38160e85acdd4d5dee1db1c32cd9da6075b2d2f46b010636e374e0262a045339"
-     "4aaa8bbb5fe7b2dbcbcd62ad601cf51",
-     "0250cf50d52a5950999b9c0ddef219218f76dd9f22a2213def9ba98d258c2f8359d08d0e"
-     "fc208e23ea3614c9e27b2e4576b9c12",
-     "063479550873dea8a3ec0306ffa9252739c34c87bbac56d3d9138764347d5220bea9c27d"
-     "6a308dc2ec53724d6d3ac4862d1735a"},
-    {NID_sect409r1, NID_sha224,
-     "0eb8de25f63abc9cba16823270e9b6f3fdedf0fb90f6652a34688970932e3ae98f6d3bf0"
-     "fefc5f247f72960a6975bff1f1acc2188a1775fe8974b2bb2b4c8d226ceb735113a14009"
-     "e8ce66d58808fada4e6f697fd016829913352c0f659b6be354a067df00cf74919580750a"
-     "a6064f21264d89dcb28b3b2d4d699115c36d1310",
-     "0a95c7abffa92e2c637611ccba66ff9d2ab121b40a85c5b71454cb0dca1f098ce1be8d9e"
-     "a4933d1a91bcd270c5a33687835d6e4",
-     "040048e6b8614c0c7156dc41884e17e36ef528a493c28c9e6275c3454d83beb939ccc749"
-     "52732c18424ba21b8ea9c528966c692141000ef9efe1145029d8d60d14dcf079d43e3cea"
-     "0e18010f680bddc2729ffbff9a981cef2cb595a69142b25a0a39863a929adb635a",
-     "0f43af45b0dd631bfe38d85979ff1612140b9cf80b4504857df17279d9d8ea12d5bcd292"
-     "0fcec81326f15832df6774b9c4bf5b9",
-     "099f403ced566fde4d9755258445b6d6c2a4e234f99425aaa78ef118321f8579fb513ccb"
-     "b71cc2732e31668a6a6bb0fdc7f4018",
-     "0d8568971a4f219d6d3d8bea6aecb4bf7de53886d2e6bbb0f71d054c63768c34d4d18830"
-     "00019c59168fbb32f4317330084f979"},
-    {NID_sect409r1, NID_sha224,
-     "cad58ca7a3b9967dc0ab62a43037764f8074ef9177d60bd98f623d693333971c24a575ed"
-     "03cb61f4dc2e3d6285fb1204502a540f3c0bbbf23f5bbbd1544f322ce35d949d8b1d8ede"
-     "b82e90927ac67ad49c91007056bf5096bd690d15ac00e1874fe33293d8003a4a2b094078"
-     "cf09af799dde384143350c54a99e1f99cc31f2d1",
-     "02c438b07c6e0685d1f94a4bbafc013f8f21265d893f54e54c3ac2071606ad1ffacace0b"
-     "8367aad724b1d9508c65ce52282e397",
-     "0401fca66bdddefcc3c2072ea32f026c975a2c392dd7ed7e93e94a810e1125ec161bed69"
-     "8d8305830eb66fca5eeb71934ab3fd79b10189c22a2c9f1fd7624f805fdf4faeeb931709"
-     "d745a3feaa3cf04824f5fa58bbda144d4e96d83ce1e3282bd5fc9c50bcd68f5408",
-     "09230aa7b58505e2dc2f205b70a09cb9f4d8272f465b7380195ede0f7770af2a33f7623c"
-     "310a0520e7436835cfcaf32467f154e",
-     "013d0e70d8f4b1563efbd3c46feee15b88358562f769046f39df6d00477815e6b8763c02"
-     "3807eda87a86338c7b64214784fa2cb",
-     "0662f43fabd03a0c05ebba700203fa2188e16504f8655bfd0fd090b109e68220122dff7a"
-     "6cbb8bae08612e0d516e9f95ac15368"},
-    {NID_sect409r1, NID_sha224,
-     "281ce2643799bbfacc7d5993683a4fa656040517854f3c2dc7c4f8848dc305382e34e894"
-     "d433caf12d8b493020a6a08d1fa05b08bf6c53127ad5f33bbe75b9db0615e3dd94408d02"
-     "8dcf3cb7598f6e7cb4c787681dabac7cba2cc06fccb7506fece6c7c1c1bf622d525ae973"
-     "7085ab4ac578905950002024f30159cf0d99f50c",
-     "09e8658f8f9e6cd98c0f4f0fd20d64d725653aeba339504def17f3ad12a63dc6157d8080"
-     "4e5f43f4ff48fc5573fde2c615ed31b",
-     "04015088531d914113a25f1598ba1d3cc611e27ea92ce8dc807fe8d446db14ef62ae2f06"
-     "c293bcdd739f916cfedfc481fd941b4feb00a9135dc1b0384e7169fb4648973559e50831"
-     "9235a3f41ba174d5f58307448671cf22a3649168495c36b0bced09ac6df98f14db",
-     "0d398fbed52228fe16d32a6ef539e4ee3858a1df327bec999ca25cdbc357de5a75903909"
-     "973bbb0a5d0269862a74623a38da515",
-     "0e38910abb3d84b2b26ed17d2124f4787dc5612942e98521d9f94baac3d14159eeef9e09"
-     "b9b20c807b479ba84640730a4ced4c8",
-     "0e370e575302ab0d8d08d5270fe89ba524b5bf21e43e70c4d335ec1525ff5696ced37f0d"
-     "e17e109fd833e5d179bcd4df42d7882"},
-    {NID_sect409r1, NID_sha224,
-     "0c061da1a16f2be130ae3b20b89745e840bee09633fb49671db28ec9a051545f57ee07e2"
-     "410ae7ebc61c9af79868d3047705bfc64ac0c04ef0b286e579b650c7165443631e49e6a5"
-     "3c84cefa5625b1e1035a6ed89b8e839540040151132a937666524265e099272c1849f806"
-     "db0fdf2be64960d5b5853965099459968e5beb32",
-     "0c4c13f65eacce85a51881caa6f82d9e48ec2ac574947d2751823a7f072d38bd9da0cdf3"
-     "0b6f19084a6d291052e7bbc2e1349e1",
-     "0400af93430dd77e6016d1b076a52126a729f77e34bb3db11328d9edd56e29a7a09a7b6a"
-     "54f72076fcba886ea78ab6ad81de43a82101419e1bc339c03a8b4413ff009d76f9a19e20"
-     "1876ebbfbb3dc771b7df07bc19eb893ce23e40c679d7909c33af2bcd7d6306c0bc",
-     "0889be0918e7ef34d3ed226f967301a10fc30111b3559e37f5fa5a57dd5c73ff672c5279"
-     "d096c5b04c68b71d55e549d019281a5",
-     "0a4bddba9b7a402b584ceb82a54baab61e81973b7347e6dc9e3ce0f1e50dc21c9569d8ec"
-     "f8a7da97c38e92e52636eb13d3b4c02",
-     "063c7291656466f7bd647073a50f410a2cd9e8c938aa1fd3b28ddc1cbdd7b78b757689dd"
-     "661f5173f79896780ac3fdd4f3171ac"},
-    {NID_sect409r1, NID_sha224,
-     "74ac2e1303297efc3ed8e624722df505df55b7f33964cc0d270604cc48b58205d8a11952"
-     "232a8feb0079baa30d7d33660268b56a5a3dd90105f0703abef8f6636a99bc63bd47d9df"
-     "100351bee32d8205dab0dbd2af36fd173409ff8d1fb7b24570f3c1e968458f58aea5aa2f"
-     "46731ee91ffd6d3a060af6b3d5020daf1362af3e",
-     "0da591461791ae7847e6d8dd8df46a63d3021644abe9520e158406c96540d8fd82ecfb1c"
-     "3f6f5cfd7688c7656cc3e3dc94e586e",
-     "0401f48c95301956c62e2fd931df49953519b88ec3915c8de495dcb4ccba97bee023b1a6"
-     "cd9a66dca29aeef8f4f1117eb954e47cdb010db6bf78cfeb92d29a922c4b05daa3cdff39"
-     "17ba6978fe738296956ed141c749a938ca9f8f13f711aec930e0f1948ce7daf9f6",
-     "00576a91862cd63acc067563626977fee6f074d5726cf4f68e80d25029d4b8efe5ea8457"
-     "45c45e4cd42879e52854c3f385a10b1",
-     "0806435400248ec38a6d362e8b2cafc3f3bd46ba5baf538cd97683f76a733ba2b4ca85fa"
-     "7d13b99f4076e7616e68d66f05ebd8b",
-     "00ecae395fb324b4366f238f0df22d011bde5db6b0cf4189e3ad47101067ba87336ca47d"
-     "637f09f7a40a1bc64de8c4aef7f497c"},
-    {NID_sect409r1, NID_sha224,
-     "2afd17344552ccc577b0118caeb7dd56a0766e25f84df17c0505f9798931374b48df89a4"
-     "8c64e199108c36e00c0bf00a97ccde55787bb97c6765601765ab5417f3e75e35a9fe5e0f"
-     "85a721d9f08440ed617afcdc200b318940a1e496040a6ad9090476b0fb4fcceee77b3fea"
-     "11de09e7fb14853d1fff8ab12d66c101257e2d4f",
-     "0b5eb943f0dd390b737510e2bb703a67f2dd89dc9f6dca6790bc7a260cb2d0fb8e1a81ad"
-     "6009ed51010e7686d5b48233c6c1686",
-     "04001ac00da454bc329f7c13950c848392cb4f31594fb7837f0986f61601fe244eca3db6"
-     "c4f92accc2fbd1a4b8597b70e72d88b103009a364065a9f67a0aa7518b75a0b4a9140787"
-     "a67f852fa31342d6275c14713d484dec3116b9dbbb8af1d4945639997ded09cbc7",
-     "049176093dcde8549f95a8f1d1c87230046fd4b18a73243c3599815d4df8387a843bc8fe"
-     "1fd67f3c6bbe394547e11866f41acaf",
-     "09d7c4ddee55f61c5c4c2ac6efbba6164900344004976381c7b18c1de541a97cb58e14d1"
-     "4b6e433c4eb6d4bfe6d3e0a4e457469",
-     "0a9acf355bad544b3b120522365bcaa1e1dc6f1d3df1e30d3beb94f639e26147a81d154a"
-     "684bbafac965bc39974c505fd0f811d"},
-    {NID_sect409r1, NID_sha224,
-     "174b2b083541f8284645a810801e72631a11bd7bb805f684a7159e055afc44357f2c80df"
-     "2b7853678d34a04144e0ede2327d03db6df23769ec41194a8d9d86af74d51c5bc11ea878"
-     "c6a80689af71d3fdaf1c651003385332a512e03dd040c33d9c328ca89ec7ee9026bbacf3"
-     "0a7f3a68e0d894fb9f7100ffbc64bf17679dedd1",
-     "09cc63f32152284fca27ab2837bf1343144336a1fdf15b9727c47e877ac69ac9cf4c97b4"
-     "bf42f1ab10d73de8597a554ed099efa",
-     "040044e655ad66ca9af330c33bc6d00ccbe4533a4c6a44a3f23c921b62eeec8cc1918e19"
-     "956f3ed848fed93a7fd7ddea57096d1f23003a71b221c85607821cd864af6f533f216b64"
-     "1ceae104b8e16dbfdfe7edcb2cf9ee0dc1679b696149ff42a051c51c861a3c7530",
-     "0db9bfe4c2e659006d31a7b44eb7bcd6dd23810f27c74dd587ab9af23aa5962dd18aef1e"
-     "95da4ebf4aabfd558cbf72d2951bd44",
-     "0c3b91bf0794eca7faf227c4ee4085eac6d6918803242bff4da9c5dbac2e23fc32a4d4a1"
-     "92d7737be22810812558f820b0a2c13",
-     "03120a558c0edb58ae7ba36e886084801e7604558238c85a199af6c9e7506ea4e748791b"
-     "04f3a92354a4f1407837d87faab66ad"},
-    {NID_sect409r1, NID_sha224,
-     "758df71a952cdcffdc417b9fffdfb57582ab5c5473a8bdf0c2101953b023b77824263353"
-     "dea0e2ede1f800a5757ec6ac0e1e4e3ab5a4cd85567d2d19acc6b7069a6e7368401cba2b"
-     "6e642373654bec0ddd19fbf032794c15b7ef7e714e13e36875262c01e77766ed53cbcf73"
-     "5936dc9b33eaf2152a396349c82ca0297dbae4a5",
-     "09950355e8667bea8bbe3a2c4988436ab5394551b375e27fdc0c1a1d1b07ae957932f428"
-     "f1aca0a486e54cd0b5bb0a5c5650641",
-     "04002f623f81fb9a299b71ea8c58d5bd7d89e7be66ed8cfd7370de515eaceac903644383"
-     "38a3fcf9981f1b6f0b30bc61c4b7c15791016130b7c4061422d70b21251fa9c3d4e9636f"
-     "5a08cea794a0fddf74ff5ab1b750cce0f2768d54fb2fb75e2851c2296b39c0ddd2",
-     "038e8c70cd35591012f45f27980095c4bcbb3bd36bec594927968d3747618c7f5810ea9e"
-     "0a126e4d3e1e08185b031dbe0b37e5c",
-     "0cf957d59b03aed0e48189d2b9256b5472c8a48b4911f9cec14adce5c6b4aa22d093a116"
-     "364bcae01c1a739a4023da12a29c058",
-     "04cc2c22b243064758f52264ed84e757ff67c4f6596edcfe956b70f777d865d01e529f0a"
-     "8a9a6e1895168780ab60950a62d2d2c"},
-    {NID_sect409r1, NID_sha224,
-     "b96d9f66b2000e9408d602096f032b112f0e05ea874229ab9daf6e05bee49b4722e4f2d8"
-     "bf2eeaab9dad94438c76b7cc64dcbb59cb4e03f9ac70487a1d24d8d6b72d7462fe738a17"
-     "edf381d52179b3acc0c0177c113eb4d10e8e78041deac1d56abda0ddf892edb8be956d28"
-     "5e7236bc6794168f8a180f622dd5f2b9e690c275",
-     "0a995493d6971c2d7e8fac3da9f8c0b5afd877cfb94924cfecc167f9d87002136ab253e3"
-     "a4f9ddf5c9c99bb1dc1af0c6a3a3c4c",
-     "0400ac0e558dbca0fa6f013b7282e02717e91eb73304b4f7ac5e04f12f55824c441faebe"
-     "5bb5af82189044827007bffb1e2655794101178bb726242c718b416b21cdc9fd90b31ba6"
-     "a8350f9b4ce3a188b1b5dffd0e8894ae6a417c4d74c920fda585624eed4c1d3f99",
-     "0d581293ab1e509baa50852bd3f21f6493cc524a2c16206e461e320c7f2c1c201b9d2a1d"
-     "d4207227592a6457670a67cb72eeb58",
-     "022624cbbae5214d2c29e273c334b9ea78e10c7efff3611574d5fdf6f67a81472b606e02"
-     "36aa47106097b9147fc1b56d062966e",
-     "08895d107ba789d88a17c30a537402591ed788206487697a72f69285ee5eb4f03cdad6c2"
-     "604e174ef4b9bb919d8b39bee6231c7"},
-    {NID_sect409r1, NID_sha224,
-     "e7ae60ac55e6ba62a75d5328bbc15269d4638764169de0bf0df043d15f9152bed909b1fb"
-     "8c7a8d8e88ac4f552c1092b62db00958a3a827f64896f6de4bbd8fa5258d6c36e3904d82"
-     "d3eacf6eedba50b0242eb6b01212288448c3a9821c4fa493869c01149ff1850e8115cf9d"
-     "e1618cb8744626b1951d1de305745507c8b21045",
-     "070daf435cdc26ad66c3186267ad12d10f28d32d863f950cbfcf042fe9dfce553750ad09"
-     "8f82f7f1650c1126b3e4451bee6e11f",
-     "04019b41af3b557c274cf117d501ce7ccd04d8bff2dfc737d7efcd7888f2dda24737a678"
-     "8f16b3b6cd589d3f65bd95194799d65659011983077a2c371fcadbf47b10494f6ffc7ca8"
-     "873b3d812c45a87c48e1b49edacc0ac37e5038cf1aba20360b74c0903c23a62331",
-     "043fb8cb87591747d12f4897dfbbc79644b87907bdefdbd7ff0f6f2e7970c7d40bb2fc08"
-     "c17443d029a92487869f640607af460",
-     "05ea3493a8c04723de9de2cbd523481e3a8593ae8f010ecbd5add6db5a82d9b13ee7d24e"
-     "cb417419639d0e9f4e68d14f6799829",
-     "0a9bbaded0a2894e384184e166bc06e1b2fabdc70536caeb3d0cd46b955743cfa8ac6edd"
-     "03760d1b613fb445367734fa4270139"},
-    {NID_sect409r1, NID_sha224,
-     "666b0dc2ddffaa7ffd57ea3b2768f02d4b77c16fa007c6d1918400d195f068cae2dcaa69"
-     "817e6e4c70d5b29c5598efe2d957bd12d0fafdcf5ac52dee80a2d46e77fc18cce2a49bfd"
-     "787ff77b942c753974d22434742bdb494590d17c42af725b1309e54566276af3bcfbf5e1"
-     "74d3cf191b85903faafa1583282c97e66c5da6c4",
-     "0f8121980dfbe9ad0bf92383c7cab95fb72d5caba96e1de7772c6a179e85414802fbb86d"
-     "725401451329287305570ec7fdd873a",
-     "0400c62f4e7eaf3f1bbae71734c86b8a40ed1297b9ba1151729f9363824425193e8605c2"
-     "bcd6094aecc9d7ef2a41aa6b12877291cd01882a45555b68596dbc8bb093dbf1aab9900c"
-     "f46653c58f5656f3688fbc72c5236297be2f0586a4031279b9014f2d3655adef41",
-     "0b4b5b19922bf6a34a00454374589f9c89745eb194b0352061a79401e23c0c0e1fecd759"
-     "7b5a7cc1c463b76cce7ab921867de00",
-     "0f1fcb80a4fb49348fb326e808d8ed8c21c376f0713429a22bfe16d68cab0295b21d4402"
-     "9083769761c4fb853662d440eba4cfa",
-     "0252a94a40008cc2c1a69113d8e14e989e7fe13918a2852de6930973a91784eb35e20d8a"
-     "e150a88c459167f8ece998cbf6c5eb7"},
-    {NID_sect409r1, NID_sha256,
-     "3e967cbc2bd936e0b6125dc5cf885735bdcd2d95b2f764de6931c4578ac8e0e87abdf963"
-     "75481df67dbe1b6c43537e84ec62bfca6672cc5f3ea4125abd4a4119edffe04e42411d33"
-     "8e8b10abb1f1f818c50a9631a3f89feb5be5367bdcb0a8a82c96a427ba6ce99f9631d441"
-     "1a2b7f5b14d32cb3901dc9d285e4cf5508940942",
-     "047682b2e3bcb5800a531858e8137692a9b1ee98ea74e929ce4c919c26ae3b3f1d4122d0"
-     "7fd9a70d8315fab727ccb67004187a3",
-     "04017ffffc1d2009e844f8e625a3bf11749a8b4ea0b0fe3532d124112edddf72d518ef57"
-     "7f160962b88ee38b11445fdd356a26bcc500ca356fa8e90325aafb1826a694a55a80b2af"
-     "52e70ad8d507d48946392da8b9fa27b8ff6927fe5130c69809d9a2c4b1d7eff309",
-     "058edc8f3665ff9166af55e69aab9d468f576bcc8f652e950082a48224b4923cb9396ed4"
-     "ae06f05bcf7797352035484fdc501fe",
-     "09b46600fb3b8204d4cb63ddfaad1482dd8cf8652f63c926895b8b8ebfe27295c052b3bb"
-     "81dddd8687f4864f258a433010c89d0",
-     "0832f7674eea791b5f17db7cf9e2ab13253d870c6ab46ad01cdda30e78db8b8f51fd377d"
-     "d55ec7786ccc92b17364a3c17ad5be4"},
-    {NID_sect409r1, NID_sha256,
-     "ca1c90012eba4e7c5f01d8cb3814c58f48c03a16be6ed86934014365eee547070b870d1d"
-     "26a872cfd28b60d9ee0a66dea223e9eaa90ee28076188d6091f26f665684f4b486af7066"
-     "9555db9058d485c677b2a34d4a98aa8d6f43bf6f44aff2a23c5d765e98f0438ab81be058"
-     "5a5be29daece5d4116f44ce6062753a3ddc505f3",
-     "040cd1a06233ac27f3ddd108de7c6c0982793ee620d71982697713be9fd5143658929924"
-     "cc88747a680779bb00da8a44e1e7d3f",
-     "040164e518a6719b1ad61a38a214ebb06dfb0553bc760799e668b1d0d098ae3f06dffd9b"
-     "84c16de90db19043d72bed2601fda14b1d018e022ceb850eb1db59e6cf63c4a7c73bea0b"
-     "70448a7dea77d5ee8a2e1a36cbc46454bacd5954792de82f3ec21ca6a509b0c7aa",
-     "04a936fccec003bd9e8eb45d27c0eaedbd452e6fe99abaa62cbd0739bcf259cfb6884d1e"
-     "60b82522c6146f081663f6f863576c9",
-     "0dec1635f2698d4666df2c217fbe3e644d27592c5607a5549c877257cba7bee29a8cac75"
-     "a044e72d039747d0d18de1c34acf072",
-     "0138493216ffc3b8aa2e0c26f4fafaccd6609e6b15f767da7c907db64b5181bfdb447d73"
-     "ede786144c70ddce7df7eff46dee4f2"},
-    {NID_sect409r1, NID_sha256,
-     "a54c4351ebdb075d6a42a787647390f864b2bbfd8bb3d0e0ea9d767200fa344d1a9ff091"
-     "bddb186acd69bcaecd767068efe4d752d185bfe63f6674279d0e7192d2077c400bbc0d55"
-     "99ee28507c1253f05eae0687b965a015e1f3a292b4650106765266f5c95b77ad2d82a6a6"
-     "e012f233169eb6b8d83576901cfd4a927c54d7f4",
-     "01ca6f752aae4eb7fc9c73a08d6fbd96bfde5030d759a2507bd45b6e1d1487e53abbe98f"
-     "ad4f41976364e0a1d830910ccf97abc",
-     "0400f6b7220bd24652572b37a0ff25e75f72d583c71c159857482ca9944b956a117a6b2f"
-     "f96614898757b8a587e3c2b78d9943003d0118fe425768bbf3a4acade281c41c745c9ac9"
-     "46c2f8b95d65787fb6b64deb71e6b38fd8c721e01c87efc7c2a6d8066fe3b35a0c",
-     "04963aa161b5ffbe5d7e5058f0b1457ca1b9cd61d731a0470beefe5f8998904cf4594f98"
-     "dcb41283f66e2b07c5c5d6a6c587826",
-     "0abf824d43d993107b552d7ded13f49ea0ae7bb845e56ad7e53cc5f9d64f99f9f250e430"
-     "5ccd9f6594c92defa7f6860fab1c349",
-     "090a541f1844357f618e5ea34c0398ccbdab0cb363e266980ad304dfd675bc81c0345a4d"
-     "723fbcc76ab5ed4cb0ba0af1b71bcd9"},
-    {NID_sect409r1, NID_sha256,
-     "6723dbddc8720feeb75e2a061b7fc49079f999fbc79ec8a8e01ab8d35b438b7049da5a23"
-     "c49a58101742791f84f45d5f5cf551cd7de6926a0e2c4ffa1e378f038da597368c62df8c"
-     "d8349bf046de46d02183dc05b3a3575f5f232dd2970057200e2c9cb60eaa6b4d72f8b73d"
-     "4d40b98d1cc801d1a69cb5ed780a75a4064623b2",
-     "0fb9b1a9597d216028902abf743d25944258b48c9762d4589fe660396130b75f6006cacf"
-     "de60f6204463cb8c18b032de1dd68d2",
-     "04019b07f7f4ba100aa9e749bcf93a2c9955c442730c5e1f6f72c1b1d132b780d92f414a"
-     "533282f7b66677c8cc8a3d5ba8b3cd3cf7006ec6e9c495ccf600f8c19597e9cfdb639406"
-     "b04f57a29dcd1a7a843c2c44e8321bb8508953e9c0503f77d36bdef24d5d39f85b",
-     "0757f6acf74eb02b7ff3161b476dfd8349854154186c959179f11b9a15da3dface40ae6e"
-     "d771096e053976866433382e640283a",
-     "08fe276e7f63ce5f85fce19d1739a8a9986cd3c3fbe26fd59324efd98826f9db3b228321"
-     "b3ad1d96145ca23cc02616d9e9d7aa6",
-     "016e06de8e3e0abf4a4f52bd2f827ca4c57412adcce3271fb4014069713f3723a038bf56"
-     "0788d8dd48430d3b30faf15ad9c0d69"},
-    {NID_sect409r1, NID_sha256,
-     "ed53cec5e5500d62d38c829002916c657674ede4439c6f405ba672327ec677490e656bdd"
-     "698f114c2ab5e6a1fc94a1a8d64466cfe9eaabd23a8b5c37f76a3c0decdef73b3e7b751c"
-     "bf3b0817f4079560b5ea34cead88ba374201236bffc48eaf289bbaa4e828afa7d732473c"
-     "228ad00588c9b443d65b998f21c3d7a9e9196c08",
-     "032109202d754da290c266f74f47805a06e6b5c3f721a72fc97a3bffeb8887e0c642d49a"
-     "6bd034847d0a5ba09239c5dfdf0772d",
-     "0400f4dc8b94dfe0a27d4d41399005b242c3e5b14bc7cec55ff3a1561c894d73f365fa8f"
-     "a2ccde1fd7bf3760b96ab2db78d2d50b03013ac66e95c335b71fd1a98f101a392dd4696a"
-     "806239fbdd0708acc69333febb48d4b649f14f42841d66ce03f1fb557a361c12c1",
-     "0b010ef786c13ece3a10eaff79b93ef3899aa385dcc1914e16abba90de0ca6389d664082"
-     "fa727fa7c7907dc4c88bd621e6124c1",
-     "0488b8956c5999c317830206fc8b9f6760845c31bc4ba77584925dfe25c05a1e7d298a62"
-     "e9748c7278eba622713df59accdd78c",
-     "082701053ddfaa376c99cc42ad4587d84a358d9d8a9533888cc382623114aef51170de77"
-     "ecf64af02e09bee203851abb22f5d11"},
-    {NID_sect409r1, NID_sha256,
-     "13829401bd41e9fe01329e9f5a002f90f1a6ecbf25fc63e7c1345f265ff02e496230f706"
-     "c6ab377ea52d8707b54f8fc5c7f089044e2bec1dfc66a07da76ee12fb9ea0697d87706b0"
-     "ebf677600bd2fe117f6cdefb8bd636a1b6b97549ee78f992c24acdf3a946053f06fd012a"
-     "9c703efb8bd929a66aa74b05d61bff0395232b00",
-     "080536e820fac59b3203aea928475043b2576446619001647e35693a9e65d15236c3cbc1"
-     "2e1bbe0eb305973535c882b70197a92",
-     "04016d7448c0afe992f8c59b19d6cec64d8fc5b10026a806760bbdbbf0012063f46d31e5"
-     "21a34771f826669c4d1ddd58d3aa13ebc901a3742a6f231546f0704345b9b83c72d50365"
-     "22449cf60c1b3bdfa4c8d36e499d4ce62e6e7bb05c6132bed1ae44eed17414d2da",
-     "042753a515e607cf9992dd1f249820dafe53993b59b1e57d8f2f9100f609cc15713d27f5"
-     "dff4007e078d6da1061ddd36c169c21",
-     "07eeb1cc19ac45f52c0b63ff8ecf4f4f35958e86cc3e3a071a35446d490a426b48b6c287"
-     "027b003488573a4834a06dad48520c3",
-     "01410d85f3f2adf065b60a126170c43e34e0883338118cd33b0b3eafea1d142480b236ce"
-     "49d35fefd1ce4ad3d25e0cc9268b1d2"},
-    {NID_sect409r1, NID_sha256,
-     "e696acdfcc96a6c088069b7595ea9516a36d8fe04dedeb789fbd965db0cc64b7017a8210"
-     "15f6210b6989e515def5a9605fec0d337e4ac59f3101a505168bf72ab6d98ec62a71d2f9"
-     "4071fc05b95e98d4efc59fedc138e3e49c5d0b44d1f48f7b1e7c1944ee189b242950d2bc"
-     "804d31c7eeb45283c84638f043ab9533976433a4",
-     "0b05e5f0dad9583ea18fb8fc4d8c75fd2e3cf9e92cdd9b737485c953620d345006c31c28"
-     "8b380258b6500b84f729ce6730e5303",
-     "040157c083ad9789966905c212dcfd7c049a8ba3863fd4886e4b118b3f06445fb0d4745c"
-     "2a8a1193dc68915722089d0d382253b67500867e8efb575800f834c978ee2ecf0f84f72e"
-     "75dbbac86926b73fab8b47f38eee17a63baa02e3edb9d4f6b2fd2afc88b6de36bb",
-     "0c72eb08acb1d422999ee8d51f9ddef9f897dccfafd886998edd3ddf30a638dbd0ed59d6"
-     "8885ce242fb838f022bccd4f3b5f854",
-     "01f4dddcacb088f6e24d331e8b111e390735a41e1fc29da8f5ffdbf7342f4b9056786f2a"
-     "67159d1e57570bd69d69235ec562416",
-     "0809840df1ef8fce9b2edf8f970c07bdb5fb755e9d5bacd7996275c4f890173142c39299"
-     "ce9eeb51d21a32acfc7761d5a2cd7ef"},
-    {NID_sect409r1, NID_sha256,
-     "4058b9a8cc15ac148909eb97fa32aafbb6077b168dde91a411dbc973df7db056dc57ff78"
-     "f0abcb70f70f800bd752197d681f44df4a7817c0e7f60f8f65489ecb6167c14b525e91fd"
-     "2cc5d8b80ba380a83d031d5827c8b1262c687c90ef0e62723d9b565557f9f6fed0db48f3"
-     "799274c2cd60a14303406c35802cba6261121296",
-     "0be1d277813e79051ca1611c783d66003ef759b9e104f32298017fb97667b94dcee1ce80"
-     "7dc6b4d62416e65d4120523bf6a4edc",
-     "0401fed0171b5b3c6d9092a6592944680a08a0d4f99f08a3ad1c22b5bbf11c0e4ab3cdae"
-     "9526b0ca2b1bbd961362faccd5caeb1d3701ae7d57db848e5c86c31f542f1995c76e916d"
-     "ea9aba882865febca630bc6a10ceb6732bd5f07f51bf2f37ecae7b7fbbca618ae0",
-     "09e3585213c6d6706524e3c8e753a2eb0edced626498eacd842d44a73c602d801a079f94"
-     "b781ae1ac5d44209e8e3c729ed4e820",
-     "01098d98cf83c705515494cdef8c3f50ea8316d95b3ca5f9a1296f09021de57930184ee4"
-     "b9f563aebf5fd0d5abc0885cd24c0f2",
-     "0d9706f4474a8fb0c701505516699025fde546a21a3fe519a173a3ac01f683d40b4db264"
-     "2330bcdfe188693b15a476cd9339ae7"},
-    {NID_sect409r1, NID_sha256,
-     "e793237d46e265ab84ba9929b196405faa3b0e4686e8693567e53f68e6991e5767797467"
-     "7682a2510c4c35b1968a90b32c4941af7813775c061c008a60f9f671cf7419c94253d610"
-     "6b61e65034497f2d273a5058379bd986e3d917f708f0a2bebdba150f6d78a3af9c722a24"
-     "30ab0f4bad602e91e18aaf258e3785fee78e4502",
-     "073c807bd7e07379782ab790720de4ae5106f16d34e80ed70da5b1594e660c9b775db940"
-     "66b93e74f855f57d88b6ecc6228aace",
-     "0400301526b630ac3fca5085f633deadec27af353233e6f241772c7fdbfa42e47a04b0d3"
-     "ae38c04eef2109390a71fa9fda652343cf0137eacd97a8449ce83f19a13a248af52e512c"
-     "fab3e2ce1ceb789874cb08757dd9e47ac21b5c0846498d8d7cd90122c437602d52",
-     "09245ba1873114ee2a3e642c5b15049a3566a2f003cb3d25250028655fba98203feef5f3"
-     "07a9f4c77f232976d83723f2621eaa6",
-     "0c8136d4b998ca0544ca1430abf55601f259aac7756c75d1371de63d1471053c789833c5"
-     "cc257e323a71f80e21783df4efa169a",
-     "0e2ecc6f0a418bee5de7c2418c4ad85d981b18048f94865821de696488ee19291912ae7d"
-     "a1cf5fe9708e2beb18e6cad4e3f7849"},
-    {NID_sect409r1, NID_sha256,
-     "ffb8bc80e7619a562d8506eba7658bef0c25ace3dc1d01bdc2ef00933d4fa07b80364e5e"
-     "5826074edd46a707dbc3b0ab19eec7ea8990839d7fc0a80b70661204c52bcbef57c1a7bd"
-     "c861c10766033a82dafbead283d911a9502d5f9ef0a39d35ef26f3616212d4bafcd413ff"
-     "d18b424fe09b48ba02ca5d97ec996205cd49d22e",
-     "0a68379b2296a6c944ad5dacb593b302d8ef0b05873ce12bbc371d705f308c739d21f343"
-     "349524aa72f05341e64f7435daef112",
-     "04007fa0f698535b011833dac1ac96f3739ecf0c29f7fc1f8bd635f4f98daa70a3931061"
-     "1ef51b2fdc8b37eee3573dc34cd2528d3900be1a9dc30dabee3403da4f2dac6622e6fb84"
-     "96e72f3f17c169e7b554efd84ac655e727ae9520feaecc752601d5391270cf0cfc",
-     "0630547017103c3f97de48ab6b942db94b2db9ed7dab0391ea9e71c1b788c547abc90088"
-     "de5b3e36c9ee4280bb454c7c3710999",
-     "0916aac91ad329d6f330cb051941c781b9e59bfbfe45c4d4f6ce0d1aca982e1c612952bc"
-     "ea06784c57c121b14cc0dcca783d0c2",
-     "06a83d93f9bb81c61ac290906d74e2d3b964c39b4e96370f19cfb4a55a3f7901bca3deef"
-     "4bb79ca6a798fb9b3a9b0137c5a9324"},
-    {NID_sect409r1, NID_sha256,
-     "946bde90a5b903dd281a51d7fa93d80f3fed07eaf50c18fe9fac5acf67326bb18effa314"
-     "4e25c151efc006a50a274ec6c6a5d573051c4e2d117ceb0fa125acad07a10fb6534a8e5f"
-     "5b3da2a1136779c51377bf76c3a4a93c0c6158f729f2293e414fcb952c9509f228c804f0"
-     "adc1daa327a8991d48ccf4f3957c5f8ccbe3ad4a",
-     "026046bbb269ddb1ec14ade56175482343a21b7c265026cef3c7d6a1ae0f6a68166b9e6c"
-     "49a6e733ad2ad64df7137ef230038fb",
-     "0400d09d8118519f9d00df7514d2ff99483473f680b750604580b61017513870a3cf1c40"
-     "3495cba488309e2c084079d53139a3695300d25e41038c18e4ba6f4e9d14f210b71f27b8"
-     "ef2c1d4cdd5f63edf8fe11d548d070177e9ddae382fed2b163ff2b58546f10a99a",
-     "0d6b0e5d83155a035248ccea95feb0b4d1af818e5ac6d5f41f1a255dd8b482a94de0f4e0"
-     "37b10339d1805dbb6b22af6ba834219",
-     "08059524790304a37f2a0d57bb2b93cec79a827b1fdc9ce2d7dfd4d277e0f71844d33531"
-     "4a30bbec5598a399e197a852b5528dd",
-     "0e7870e2a0ed16cf340a04fed4d2048e4e231cb8918345e1852bcd3e30413a2219864851"
-     "121a34fc98dd99976e2b20cf1d1bf2e"},
-    {NID_sect409r1, NID_sha256,
-     "07f3fe1369ebfcbcacd66675bd4ab22edbbff72e68709cb57d4f590e49440f01691f490c"
-     "58b5117bd24aa2fe2101b59c61c417c918ea08ea34bbb9b8aa17491ae5d9329affe894f4"
-     "2d7586017877fae3ce35bb80c97f92a004380374ec91e151995166e14ac00505fd1fa810"
-     "cf02981bacbcebf5f81b2e633d3a3db6737890f4",
-     "0bbcda66978ea526f7bd867c3303b625f11b94dd9ee6e2c2f8688ff07f2bba83c662949d"
-     "47ad47fa882cb7d203a7f0ef5dbc52a",
-     "04004cf5bc624553e833ffbee05ab863e5def062e0d57c28e71d758d6ffd3839504d7ed9"
-     "d3b1a040bdce8e187ae0b4ca23aa565b0100fc1a15b4f273737eb92a56928395f6518e05"
-     "bf946afb65ebca3787f7f8bb3d946dfd26c4831cfd171b4c66c2237409ebf224d9",
-     "0a2cd205d957a20c79699e91684cd22746c476a79245f11e7cdf7e6b74f07cf2fd9eea65"
-     "eda97e8994aaf51942e15695545abc3",
-     "0aa1da120fc19523e8162e6018e4ee053eb680ebc7e31d00db34f7b177c74c5e6ea344bb"
-     "a3c39ab7ebcd92996a1c156180b7dc9",
-     "071aa4588741208344b323642fe03f1cea73865ba645169df9c84bdbf7488829b83b8da1"
-     "72f1927de1c8cc318ede545c748c782"},
-    {NID_sect409r1, NID_sha256,
-     "3a1cb13438e3bac9ad4ab1d319e90e2c9f118dcf1eb54d6333c674a665d41451f93cd4a9"
-     "334cd057a44c010edb668254517a63700a31eb0ca474c84873e486f2f8e158a1a7735362"
-     "ea0cff8ef17d959ffd851b21a91412709b3c729474d2cb40f6ca0e397030eb2611b40291"
-     "6e4b656f0fd868247d80be3ce33d52054b7661f0",
-     "09be3dd3442e0330750f0a6252bf9cb317f32f942ae516a4038dea2c40ca6484fb33611b"
-     "ef016cc64baf166c122e87c15466fd8",
-     "0400f05a6fdbe6f80c0f5ef3322d8accda4b9ae28c91b6198b888be713afa5e652e907e5"
-     "ca9aff5fe77b6546115b4c732bbd4010fd000923d07aeb8c947688e7d3dcb16ca69440e2"
-     "a89539a41b8fbb797523d3b766b46d257b87472f5084992422cebdc4e45556f5e4",
-     "094fe051a13ea8dbc89c4cc5511881a48ef5554de265f0badf8741ae5027eef25c617bb6"
-     "a3f454a992fc68f5a548903809de09f",
-     "0162687730f0ab2f57e348476d1fa4eaf13199ee44f44dad5807bbea4e5ba79e92556f28"
-     "7cacbbf1fdec9a8b78f37e78e52dc1c",
-     "01acc734e2d0c81a56ee8c0465661c365edae56228ca43184ea1d7503da3d38e7607b159"
-     "0f59f5190e5c7264cd0d7a39be71069"},
-    {NID_sect409r1, NID_sha256,
-     "e58e7b881a563d54772125b2863718690a5276c93d9e1c5feabbdb5d6f7c7293ff0f8980"
-     "5b53663bb417fdd46874b8e6a466e7e3ff6737930a0662af1d5879b071b0dc4d014778df"
-     "f26a2eca5992e763bf4c4698c382ac947215aa116515876008a56e5bf547857049c38a2d"
-     "3737ed3393705fd346897c3beb80caab88e5b8cf",
-     "0ed321fa283c662e87eaab99b7715e6cdc9b42e14fa5bbe2c56fdfb381369191a42da7e5"
-     "74839f90a85577485f19446fccaf6cd",
-     "0401bbb34e6bfb1c1335c48e8b44cddd8a46486fad4313581df216002b382db1d58adcae"
-     "74af0d38445cac2f6cd9e2b439d106f5950084473a5da9f910b4807ec5ff450be353a187"
-     "af6ace821b18e096c47752b6336dbedfc4b481e356e689fd9c03ffcdbf3e4ea39f",
-     "06ae69e55ac1f7b0f844f5ee0b583e652e0e5bbfa4eae85c59eea1485148e34f4d33c9dd"
-     "d7ac071a28ac0a6191d5ed03e88bb86",
-     "0c3509b6c0356e4a30a82fa7411d1fe17ed190b7eebf9310c44fd568494c894a4f4a1a09"
-     "e58a4d030d47227e54f7220f3f79f4d",
-     "0d44ccff47d9fe82627393c03f882d4b98633961a897381ce8b2cd18f38d69742802d18e"
-     "6c988a23eb425b294f2c1b84cf42cd1"},
-    {NID_sect409r1, NID_sha256,
-     "8889ea1da1cbed98963941f6ac24f47253ff6af52de920765214f2024aeb04f7ad469368"
-     "30a8eb04d95aba64ed7cda6ef242f454b67bc2de38a46b6524bd5c96739c4b580e89829a"
-     "61a8249ec8dc27a50f43b8554cfb6f4fa4ca6875983d4b60a1c6b49f32ddff6fac0cafb6"
-     "4d55c6f594b195c207a9bd920dcf20e0080920bf",
-     "0396b805073f3c3b552b1024dcf35559ac44f255b688871a3c6657f727a4b09f3806cbb7"
-     "5d26a00ae1728be632387e804775a8c",
-     "04009957f897a17241eec5b8415ed7ec1bde5df11583255e0a8136d076d72ef377ab3f55"
-     "3d6f56c054332a24098aed6d12878abbd301f58eee295765e8a55e388e235e833bc5cdc5"
-     "d51a1d98e13429bcb7891b25487b7fd8ed804b1856cb6071cc28756bf00924bf1e",
-     "021959970a6ad070d1ac518493e309289f3d9d6e2a8933bca715f53cee4ab9000ba2d014"
-     "7282495e15e63f258dca87a5db7eaca",
-     "0d1ca34413341c115f780e647519547602e0361ed4d70402f42d735353696eac6e4024ed"
-     "2eacf9577252d40c27297e9389d1f7e",
-     "08cd5bd43794b32d5bd2ccf7ae4deafffa0e0deb92b1eef9d3ef807d456e459f92e9f106"
-     "27b7e7574ebe3c2faa858bd3e62e187"},
-    {NID_sect409r1, NID_sha384,
-     "55053af9370901e38622734a5bc5589f6a20e258627f381fb0c366f3dbe58394e5997e97"
-     "8eb7ebbc530f6e6186f48294149b8594fb551c31c50521a8c4d67e5862921695604afb23"
-     "977b6a69b21abe75966fdd11bfbdb6b51ab0a474c5fa07c4de7872a3bd81acc417655090"
-     "558dfcd5af449b3347e61fa9e839bb9457de64c1",
-     "0a8fe323f6736bcabe971c7d964e75dece70cb54561da48a11c40027ebddb23e41c7b486"
-     "00f569500fe8ea2abebdf480171dde4",
-     "040020f2dfee967949643b6cb8a3810524044a4b873a4984e9795e4dd7976536a2d748b8"
-     "cc636ef5c8fc92aba5677c4a0951a3332700956ec5433d73162c9683558f0dfe8870cfe6"
-     "6575f2c34c765372c7c3bc3b291e95c4e3665e4ec5e72131975f0b1f5f30b0c844",
-     "013f26e13d43ba05e01f92457374fe2ad1ccf94ebf22334447f9360f7f9748bf3665ec30"
-     "58ff6184fbfdbf7de9e1e2131cd3991",
-     "013c4c290cf89789bd6dc523deffa20c94e92e88a76eebe88457e30cddb066c7a43aadeb"
-     "0493b264cdae67532db7dadf879d991",
-     "043bb7a8db3d79938beedcd6ce02f375e26ce807a2afd4fc446f372fb09a69fb34734df5"
-     "dc8f6393f86577a8d29014494379624"},
-    {NID_sect409r1, NID_sha384,
-     "c4264330534a6c2bbd8a3b757e0912558302ce302f835ad8c5474993832fd30036fdef40"
-     "b10ee37293e871db5b0b149654f9e543e22111f9709ef45732125f713c031ccfbc9a2f3a"
-     "ba160c241d27be4dab87ab2fa9a795752ab2daf20f9d06a98d90d01c07133adfe83cb11d"
-     "5176525e1bba6a9ba70ea48b224d46ddd8103f65",
-     "0105938ba9f25034da3e032dee121bdb192ac2128b50a2ed4bca042e96cfaf4660c9d35f"
-     "3e67bafd4c99f9447e6dc408e0c4471",
-     "0400f1a9243920d7cc26741eb828bb55e34c140b0e52837792ed6274a9aa6b5534cdc5c5"
-     "96a1141a746dee380c0d9c2f77094c36ef01393ed8c609751550ffd077347712f3b27a86"
-     "9cfb1b532c5b19c381365ae5dc8fbffcb2182777a17690616d71c66524017d861b",
-     "0fc52aa8c590aa28c5353568c9dc69734adfae840f1e0642b57863dc7f4faa37bf3ca789"
-     "a3d7afb32c57f66a61780e253f50af4",
-     "0c45b1629bbf3273c0e785a28cb8187ef387502ac4438a3372a5c72206a15d7c5ecf9203"
-     "ecfd7e0ac910b6ceee3be50c6664f81",
-     "0a0c2d31a47ad5f9dc2d42dc36714cdce47666f6e2f05ce0e7136f166647540d1e5fbdc7"
-     "c9fa0def8962f44f2f8bc9addc10057"},
-    {NID_sect409r1, NID_sha384,
-     "3236f1ad164e1b25d828f5202e3513c80c72a577aa9af56f041fd96cf5a3363f4b827723"
-     "b1511a2f16360e32eac90ac55f4ee1146791420ef9e2af333c17d157b00e43992ef6f2be"
-     "2d2f211361e468413dd93fb69232f0a0d110bc5fff361c0410344aa0636bf809062c73a7"
-     "ac7c142063912b6ad7e1626fd2a384f35faffaad",
-     "0ce11677ca818537dbaeb880fc967dc8bead203a2538a55e756679c4a9e7975b9b3e6aba"
-     "4e6c6eab4152d0c0939027e9b0bd92a",
-     "040023c78eda396efa28c92b120c4ca1e19dc6c467234f9f73701d8966bd0826c20122af"
-     "5f7c9ad5a5b855b6dc517c22131fb0b5af01ea47619f91ed4a010dd49ece7ec78c5e9829"
-     "7220b4c239ff4a8c29aaec008011acbf7e4f985c02311ca703bf4ce4ba43412ecd",
-     "0dae763fced0e498e3efa1c6c412a25774c9bd6cd4bce25ab0a7266705cdd54040ec55bd"
-     "7e6708e71b09ffe9c19af9a1ed9c878",
-     "0a70694fe5da7646184b23b4b434bca1b754257b8e7fa9994dce4a7a92b7ec8c7f8cc69f"
-     "18d17915c6bbca24f6621f9563f7c35",
-     "009e6ba97ac2be8537afe7f8f8b9cde8841323b5cc63cf2ed46a7913096ff8d96040296a"
-     "1bf9aad691b60e1f18233964a421fe1"},
-    {NID_sect409r1, NID_sha384,
-     "6c400ed098d8369dab6fde3553afbbd4d47836d0d12dd16015f15cb8d067a39391c85ca4"
-     "e78c62b8b72c1592349ff8dc52db8ccb7fd80c085fae456dba6f4a2378e184dd59238c92"
-     "cf04e40d43a66b342d2a1325a0bab12b1ac857f0564c27b35e6abed02ff5bbbdc3770ddb"
-     "b2ee0513df48bcba925da6d61583076cd3129603",
-     "05a239ae0f40d76d8d3589f1662b5ca12176a4b2784faa8339b54e96a1e1294433a4d83b"
-     "f904196f939bd8b33bdb4be340ec703",
-     "04009d03b7985647027a17c06b30ce9fa1b43d0484195f584fc347f7003802613b524cb5"
-     "641db3425ab4b3839e12c012853ea8384300818f5e270baf5a771627b098a6f9ad8a8262"
-     "e331c299fa0722a0df6ca09bdb9c92d22d72a73567cd5497d06639aa47349df207",
-     "0c22251c73998a3a49b3fc65acf01438941a8885d1c5072a5d41d779af70c044153fed40"
-     "80151b524af402a4e8ede4448b717d4",
-     "02d3a7ebe5de23e0e601c6e41616bf2a9a7fb6193fef8e3f0a7fb8128a925f7bec383366"
-     "9d1a304652b7bb1af5186b2f612da1e",
-     "0b7bb17155068a8d9b3412d04d407556ee133e1a704ec5da87ed19dfde60517501af345e"
-     "2e744d35d844f8ac8ad08b13b17c498"},
-    {NID_sect409r1, NID_sha384,
-     "039a149eaef2de30b0ae457b376ce6fbf88afd4cfdec02d3c5e00400d3b0484c1cd6ba74"
-     "db5de65d6f2fe39871349b30fdf1ef29bcbb9e182eb3ec5629d07d98354a5dfa82d7f0db"
-     "3dd10d1510c0dce086848a198893ca5ad24a663494f0596b4eee86199ea85e7e8f2f76e7"
-     "a6bd4a052c54287f61b391f1e52f96b606151c34",
-     "0077390c62ac41aca995640fde0c79c76f4ea8a8dbb22323ed812bee837ab8798c5d0ba9"
-     "76c7aa634d4b1c2c155de2709e7352c",
-     "0401a9357770270c528f2af991c447bed86194d458f693a871ca38f271a9e6a566f5b9ba"
-     "3ef3d2f9bde959e42934c95867b280e9d1001f3a0516fed36d3622fae3f44d87c4bc67ce"
-     "e0a995cea242e530451d43781f2ebd163f6f521497fd7a1a6c7b93d33b77083a5c",
-     "02555cc113c8516d741b47ca41f53ed07d509845f140dfe7dffbd01a3f751ea9f22e12c9"
-     "39a2ecb1827c0e56b1b1c5459b66aa2",
-     "0e88333875a507520d0b62b35146e37e7ce4e2f2478a61adfcbc6e1aa9fd0195a4960c63"
-     "3d9d6aa9a79323b7ee00ab802768436",
-     "094595255e8862d14980893c095608113737f42b05b561771f56ac1d54eb521bcefeb392"
-     "8917c07c1bae74cb9aa80dbd34962d0"},
-    {NID_sect409r1, NID_sha384,
-     "08617d04fffd6644c40f7dd57919f7dcf3c888f4147535d12ca658302305bb8e220bb17c"
-     "cdc480254004b9035b357120580882ef86aa5a061b2850100285b7d61588a664dd4f5394"
-     "f5478e68a80f610c9204d056009c1c9e902161eda33ef61aa902e96b6f094a9f05313569"
-     "2182943d38b9763055a38739a2a2d133c5dbee89",
-     "08bf23b09fbbed1b55769907aafb97f4759cec98649b2c9da5157517d4f85bb70157076b"
-     "5e4aaa7a940af042302f8be06a84ab6",
-     "0400883c31c474333f74ab2b86f3eac865c4b2b54975ce19c5cfd23682d041ef3deaa43c"
-     "9f9e2c194ccd3add6677de31fc9e07dfad00a5a36b54f4eea6b300491ca22054280b3f09"
-     "b202b2a6b55df9e3271c763b6d8360a330c16f936d69fa463bc0c4071707c9cf95",
-     "0812c83aa9dc4139f8c3f7c55509f9e10e6cceed30e16afc028b1904b4d260ed0e77acc2"
-     "6e711a7a8e24c75fd780ed893c0bbca",
-     "0fce07c6f791a05de29609b59d55b7062e82fb554341b2b2a8187baecb9c95b01ca5dbf8"
-     "ac88c60babe10af2edf5985b35e10db",
-     "02bd026a3e45ac439647a483261107829411c1b4a9ab603c080b92f605cf742754b65498"
-     "1460cf7aa72b5186b59d224dd015314"},
-    {NID_sect409r1, NID_sha384,
-     "34c959f549a307f21b850ae105f41299b8bc94fc292aefc61aefbe0a1bf57576ba8d9b80"
-     "caac635e4edeb22530163fa9629665fcd43959f68eee32482f1845a78ed7278e6e43d09e"
-     "d6fedf465001afc0d61f1d2e1d747623e82a762576b879c7024e34f43104593cdd691d53"
-     "bccaeb8f212dc29bec6bc94cf69d0a8491db124a",
-     "0082ad05d19b8e16f80e53a4cccf6869ab5128c5e622ed146fa8555985ccd2aa3b9957dd"
-     "374586115d4d75b1c01cf98ecfc3646",
-     "04004428d05366b0a46e6578fc7528d185a3f85da06c4179e9c9055dc0a7fb4afbc53c94"
-     "954f268e36d2ba8731882bdd27d9684c810136ba6048ec672601987e9b7402fea24f88c1"
-     "a94717ed5a83794add0f31680592d6cafdec147dfbc400e73a6ba1d23d4cb0d707",
-     "0c00c897edea7bbfe1913e3da303d64d0d657a83c1eac9c111722b17c65391f2cf67b782"
-     "19e748ceb269d6c65f01e92e6952979",
-     "0624c5bcfd8e0ef22ee6b34a8b26bc051912cabac102cbf56c364a743e8150195fc55a3f"
-     "ec90a8fabed5eacc1799b565745bfd1",
-     "0cddd4937da8176ddf0de7f52a4babb1f6fccf861533f796a487f35d060ad9ed4435e5a6"
-     "7166782b53c20bc06fd1b36c265c1b0"},
-    {NID_sect409r1, NID_sha384,
-     "514f4de08a6f49edbb6797c9dad6d33bfa367cc1a1b58a5becfe646c7f3352d5c5d95f74"
-     "56e7112c4ddc746b9076b9756ae3916c07bbe6d3823895774a42d25d44b3309d18bfe7e3"
-     "ccb1f85dacfec1654778c19e2981a853c1f40a7eafd16d331093110698c957fe9f1d8658"
-     "2706a6885543248b944bb70cdf9d2ea89190cb02",
-     "0af7e581aa4f9be5815f0c447e39de00da9194eee5e5f609668b9b69930b5b48a948614c"
-     "2250260d1917f0ebcb00ebda4bb52f8",
-     "040044703e0b49437315a64e397085ea2ba3f2e2c383b168f31a922e5916d590344906bd"
-     "2a911074b7481aae7f3f8f4807b110f2e1005a13607a3bb89a2a88e27d5eb5cac4eb498d"
-     "34e6ea861c80271ed0c73e1fa893adce0c1982b8a8af6a0249796e5276d369c3f7",
-     "08e7fcadc844456f14ce9354b218d519d86c0c5211d62904c937d6fbe8cb16264d7d41d9"
-     "8a15e9f73a636ac3739770738d6b46d",
-     "07aebfd1681bd5a2f995ad4a709e8681da742649c0530684fac251494263e98d67247e1e"
-     "4fc174b409e7e24a7b055500920cc82",
-     "07b83b9b5133aec165316021472307b8b481e6381754a9d0b4f9d683c2ee7cac94ed4d8a"
-     "72cef61fa1f6349b6c4a54ec38975cf"},
-    {NID_sect409r1, NID_sha384,
-     "4e5d16cb1dcaa1abab1e371e1de02f31ef4e0944dfe1fdec45ab64326435b2af9aaf1a6e"
-     "d8fdf1a6ab1182bb53a844c7cfd66da30aec0d41757f5988ada0017c4ca752597a9fd363"
-     "7668bc1a92bb1556553f28d66805bb47f1ef91908ce098d452872da9800e77e1fbd43ffb"
-     "0ed6fe6a62185d4be73ae96c9241b82cefb2da22",
-     "06d14107b08354e6a41d7d7d50c004419db8bdc50db43428df5e86084551237223c498bc"
-     "e71a17e25695bc438c5c09e009c60e2",
-     "040088c1517355cd417a698b648508fd07a457ac13a49d1bad17dbfbc9735ee58343316e"
-     "3eca570bca130c753e17a69fe5bd7baff301397a697d2113d94daefe6be491ed3edce944"
-     "9c707a57af3a164d172cafece564d686fe0d25725c2919c60889af4d0354b05117",
-     "0f3bb2dd9eece25c56159f501af8b619a8c279d7ecbc08ee2af6b82ead80375e9c07227b"
-     "73a10918d8c89d1a2b12cb76427a7b4",
-     "0407b224d8d9c0f11a8e09ac8d654dc6e1119e2c2804510a84ec61f9017899f9613e37d8"
-     "166e0fcaae16c3cc11e9f739968c687",
-     "08c2bd7d02c4c537a308fa40db786ec64fbc2dd4c142b18cf9bcad66199afd4f44cbf221"
-     "adb3837e84173d174e9c0d534720ad3"},
-    {NID_sect409r1, NID_sha384,
-     "e29e75269754ec1194270f5c9e8267dfdd8c696008b5ebc92bb840981fd065672f07f6a0"
-     "f1b19841adfc51b478371e1a0db9c3346a9f0a4ccbdecb7040191a00ddfd0a8faa0e69fc"
-     "f544319c0155d02797eeef99fabbc55078f9d852927c23fd931685424249b87ed0c70a4a"
-     "3e2d3b9a2f92830e7d8f7650c0bffa8f8986b7d5",
-     "099d96d2dc9c79549f031bd5346cf6a8544c312a3fbfc560dc8e378efdfe025b0e6e61e0"
-     "9c04c8bf4133396f993b0906c33dd30",
-     "0400883e00d72c60f22ab085a90901ba3e8a510f19c3d62dcb3ee5066e0be094cceb30bf"
-     "bed7068d0bfdf634a53e2fd002dc9e454d0194baa5d7ae2399965fc4009ea83273676e66"
-     "a56fd35a5939c26ccaf85633adf78b33dbed6da305979077418c625354c7fb6283",
-     "0c213540a452c4f2ef275dd844402dd5ea590f7df41ad35523edff09b7fbb096f8ae8a4b"
-     "aee95428fee03a9e6f6a14ceb90e289",
-     "071779b477245007ba1ef5f05446c4a08d1c2eab550db9c053e4588c9935f07ba87764f0"
-     "fce14d4a7b982ebba89cb056aad8cec",
-     "08174bb56cc85ebe7bca1de1f44cf93cf478d7fe59001c5947c66b837bd3a6d116f99dc4"
-     "f9acb4f378b0321228518e1ba0057e2"},
-    {NID_sect409r1, NID_sha384,
-     "1a538eb447c18494ad5a5ad27be67fa60eb2c5cb2404eec1dbd7244cd802b17ca5497e77"
-     "9d5f779b981b165dab53ad19fd7bf2ea7dbb9b4baea782a43d758202f147e59d6b6b8ed5"
-     "4f4ea084bc18519943f6894d603e253ba3e8e339a6933bc3a0a47126087038e1c813c3f2"
-     "997aae321b7c95a802b4b73fc7db95897b7c91e3",
-     "049f347dfd361a65910e97fcefbf60013a54837f2ae657d65e02397f59dc6bca27704fed"
-     "3affdc3d833fdc621cc5e5f99b92a63",
-     "04017942b58d42da750a366d7e4cf4cf465c856cd911e5352b50bc8a12704c1ac6ad54f9"
-     "465e4fc5402b373d8bd4e4f8519341f133010abcea49c66730ddad7734eb1311b2626b75"
-     "ebbb299a28c9d60937e6833a9b3dda052379fbcf7875f18680924274fa1764158c",
-     "0134c70f031648bf470ccca4ec19c837051bf700c851df564ef3ceb99d7d41439293bcea"
-     "0c656c0e5361db92a03def51d7e4f26",
-     "06c0f9935abc5034a8b0a05e8d04de699b5916cb367e834f13642f0003510bfb68714be7"
-     "5c9e35b5e593eba45fe151d1df56d40",
-     "0930baf426b33eb4afbed64869a22712591db11acee7c4d3a221a1e98048f05900fe1481"
-     "6006854cb90631de5797f91176fdcd7"},
-    {NID_sect409r1, NID_sha384,
-     "7502c755bbd385079a4001b8cd653287dc3054f3b57de19d0ff8f63c0308c64c56f03511"
-     "7a8971d43654f89b52e923947e4760ac72be073136da70c5ad7ca1658cc0a2d2a880d3a0"
-     "c0fe636fdb27b77ff260c4c1ef8a18da8e9fd777d732a37ae9906e6c4f381f0a3d941048"
-     "d5a1f6f2cb8593873fa4bb1621a44bc2bebfbcd1",
-     "0dd226de602af4e9f8e25784bd1bbd4cadb0a8aef525d5e2d57b9f3555feb698765672c5"
-     "099a7d6dd5faaded69d8d68b4804f26",
-     "04007ee34cc7a24e2e693f9409f52796427ed86fa71bf88c923db305ebd5a83bf3b6f761"
-     "2847f16d00f4a25614299a2df92bb693c301f63f177b54f8dd5c907ff318b66c2bfc1cee"
-     "09348c035a4413fa3cf5acde0db1c8af4fb8deaaf8a3a6f8f06b0acfd20c6f0049",
-     "0e19c21b05c82dd8c873e5f30c1e3aa9348327f959a4dbd9c741e233c649a426cf7bd9d8"
-     "e93232e496d0b93ce835f80fbcfdb2d",
-     "042a3907a480329a6169b439a6945cdbe8e4572779c43fa6cd1f15062559dae9eda27124"
-     "02ccbdf03d88a8a68b691f1f16f8f52",
-     "0d09fa4966d171a662a9ba6827fda830b5404f96f635edd8482ee009ec5c7b64a2a6c177"
-     "93993610ae8297efa9fe4c35ceb5001"},
-    {NID_sect409r1, NID_sha384,
-     "95eca932d03f1df2e8bc90a27b9a1846963437cdafc49116ccf52e71e5a434cdb0aad5ec"
-     "cb2b692ca76e94f43a9f11fa2bdf94fe74af5c40e6bfd067a719523eea6b4e65730365ee"
-     "498ac84c46e1588b9b954f1c218920cbf71b167fc977ee2a89429590f43bf637eecd91b0"
-     "ce3be2d66bac5847205f76c06b914a970f543e59",
-     "0b6fdbc9c8c76cb2b822a940d8675889ca6f5132429da795462381ce29313a23bc132976"
-     "fbeb346ed4c691e651028f873ce7971",
-     "040147647d267afb4bdadf54baa3f5131e79dae8103f5b2ddf70e4652f9fc5495123be97"
-     "215b811554241c53023a247936053288bd015205cd5bf0c5154b2dad8367e1b487689b89"
-     "8acbbf44f9ed67a37babbec739804dfe737b324ad663cd2cad79274344397099e7",
-     "07321d12d616dd2ee5f843d6ed7e92d18968b3a76c0e4ccc167790afabad1b7c0dd53d82"
-     "aacac93d98679b203bad88d5ef0cd75",
-     "0672c5607acc646c67456ee77f2c02117cabd241f728ace5117626bdf91662323e756543"
-     "8f46a3e25c048a8e2130e27fa1fa2d3",
-     "064aaebf9f2fcbc843ae1128eb6c7e7d1fce2b9901dae0f60afbcb08c7f2ea1b550e1599"
-     "47deb87dd8959921846e2923880db6c"},
-    {NID_sect409r1, NID_sha384,
-     "8ff68cb00d03e730dddb05fe0b2344689529096c3da6eeecaf097f22c7fa340593106b1f"
-     "6726f06b7ce7358edbcf801ead959438a42f94cdb467b3cd5b17fbbcf75739805f9eadc8"
-     "69c33c604cc58f81591b0b8bf4d42bd53a801f0f829a31af6c129fb4f20f1250f959754e"
-     "ff8c629b85a716b6a18465b6495798c0c5166c8c",
-     "0203d77fac64591eb9a18de20a9d5eacaa1c3ec58a5ecdb3008c2d642e197141d16b3a9f"
-     "dffe61429264f5b420f5e9926659a4c",
-     "04000f66ca09d15d0991b48ce7afde9a148565b73807e435ae0f16c14cd439454745f8ae"
-     "153786d7c40cce3f43a8aa4f0564cdcbc3000f4c919b7a97beba2559a8ad0f85dee40e8d"
-     "f28e23732d7de655262209a5170f94791e255e77e8c8cd64c8c9900092e0ff9d5c",
-     "0859bc752300d4ba5014e302aa4cd2a979b3097dcfde5c59f4bafc5bc8a99411174d2ef3"
-     "f7377df5a09269e3d9461be61801942",
-     "0691ea76acbd5e8137924bee13326ceac8231688af8595718e210bb857d6619c152e1fb4"
-     "6e03fa83bd6b5d81e2463f9260407eb",
-     "054df52eb86c679d8f8514a09f5a3062d2424cdc19fbf6927f744aaa8c444223f1c28ddc"
-     "84b1d135a886eb7ac7eab3c7b0a42e7"},
-    {NID_sect409r1, NID_sha384,
-     "01451c4f09720cd53377a5ed04c907a735477378ed960235a833049d6bad6e6e89958b4c"
-     "4249bf0f6d4f043530c9e5426deb0ec3a12b7feb4860757b41bf602ca95655155356ec35"
-     "a2db8e2657998f56529be4b714364f83a140846308a2973907ed7b08e935173ebbce5e29"
-     "afe1444cd51c92824ede960056439555e7e74450",
-     "057a2e6a59d4871c3d547690237dd9846d6d5dc4ec0678aafc9c8669af8a641eed67bfea"
-     "4b05fd6b3b5357ec4d0caf352691ea4",
-     "0400351aaee4207bdac826ba17e3b08dd7f94c0c8ba0d9829d7bf0eeee7e6375458b5457"
-     "bd787f0ff38564734b3a0412bbddd7c37100e09c4dfbc33d61d69b5a8517baf5e4e16149"
-     "20cbdd89bb05f0420be757253fb92308dfe1de8db822f57b67b393d8a70d989b26",
-     "0fbe560003dc220e4c966b21c874b828874a33a93bb69c49909376df67e5df1652fd91a1"
-     "d73c7733f26c121e7a3b2d1246c9a61",
-     "08b85cf3a14fdfc69cd42750baf362286940994479f6ed7ce1d87af12c5ae075b311754f"
-     "1d37d8ed10bea092bd3d9f7afd2f1e2",
-     "02360bc1f7a98cc87ee2a4feadb98554cce59aa0fbfc087747c7253e54c38815cf91c851"
-     "7f5692f95bc7c3a713fb6ac43a34f7d"},
-    {NID_sect409r1, NID_sha512,
-     "ccd494ca005ad706db03a3df6d5c6e876ef859ec77a54de11fe20d104377df1900b6b192"
-     "126c598944d19a2364b2ae87ad7fd32265d59e1f22be5833f20767793677b628f18e9619"
-     "f8ca32f3af3b41c31e87a98d1527e5e781bff33c1a8be3a82ea503e76afec5768d7f7dd1"
-     "f17dc98a9e7f92fd8c96fca0db518bd143d82e6d",
-     "00a3da7a6633608fcee9ce4253bbcec08d41ee6b00178ceb017de74e24d48fd89107c9f2"
-     "db3556063abe3cb011938f4b4871795",
-     "0400a6123b122d7d0d766897b15ba6b18b3a975d3d8058c9d359c6c6594cc0dc07d9ef60"
-     "33224b4aed63d319cc2747c0660e38897b01ab5fad5e78f380aeffca8d15e60731720184"
-     "ed456800967b2ca47d482957d38409ca07ea798bd892b529774e44080eb8510e6a",
-     "0da042642b3117f30ea5f4b354047b164bd128696b8c00cc6fcc767246daf7483284e411"
-     "009e05218246830940178cb4ebabf1b",
-     "0e4ce613e6976e9e1c30c0c93214a0a37f0632de85eaa25464b69a251d592560b2039fc5"
-     "9b15ed7045c29c268693d7c9e06d8ce",
-     "0ff3ad5ca70aac94facd842fecdf6a28afbceab80b549507954b7dea6da06d1facd11e0a"
-     "88e9c2a549e6971a08d1af75aba8363"},
-    {NID_sect409r1, NID_sha512,
-     "5719e50d939a8d74efb444eb5a77cda48cbb59e7f976cdb2ea2848bfc558718b39ce27b8"
-     "93c229db94bf77992222d1746f8f52f858f85124a28193ae0da039c53d484681785f3367"
-     "f6516fbb8a86560aea9e3428551facc98cdb1e9df8e2f37db823a7abc589f667b5c93c4c"
-     "47061400220a2014197d514217fc252cef5a2433",
-     "0384723c8b4a316b450d1fce0b2645912b8acaeb3cad50860cca43bdc0206ed5b3b60ebd"
-     "c29b3eda305d0d60eeaec261edc24d5",
-     "0400fb89d87ca4282ccd048606e4d321e7ca73244b4d0c9d3df87d54e038a14939138bff"
-     "33c81a9ddd64abdfd698bf103e45c96f97004ff7e1706688a53a5544f4ed0f3f5e1f0fbd"
-     "6f21174166d25a690f260766646cc6fb39020de9327199225e44f3d95c5984fda9",
-     "03a9f5f26eac81dc8ca0a17acc44322d43bfd18edcbafe24113f5e5fad0ef0a3db75ad1b"
-     "2422c7321593e41e76eb2a767a14268",
-     "0c311000c27539247059e4a8d789ed4db93fbaea021272a90045bf6fdd70f4f32cd1e195"
-     "b99ee6f03f4fb57c3a115ffeb459af1",
-     "00db8bb46fe0f99b4e6e1394a5db283e310b24d6006319986dd2c4cc169c775c89d4ad98"
-     "d0fdbc3c0bef6b7fb6b43ef21049bd8"},
-    {NID_sect409r1, NID_sha512,
-     "c84e5702a339259a61b5ba8ec1957f23ffc4f1eeef3a58f383d3731bbaabfcf49ce2ebb5"
-     "97960ac5115a2af1c62b193d4ab6c24433d5f168a1752e40145f19aeb6dee889a53a4fad"
-     "d13eef60e28fcc7ed6a9b8b0ca286c1b3d66a4b2c327a629d15c148049e3a0ccdccf05cf"
-     "22c31956014595e417060627c8125bd7c00f8850",
-     "0bd3136647572fef3de51b12e64b36460bd3a27dc660c164fc705417339cab21f9e1f9be"
-     "0f3da926df459c5ba58b701d306e67a",
-     "0400f45e18834d1933a2a26e95467b6db85d8c3da372e607907798745cd9847bb8f8b51f"
-     "996c7293b51550144f227933ba26722685005d8b108eb3591b164745d116c80afdd48701"
-     "87061c75af9b0c3e87dc8262586af14f4d6b1504d274c07c8e89247196d8ce8166",
-     "047a494645b99a3469369b72cc918708ebf453957b49ac4e209f2edd7a4861d014543754"
-     "e37e1d1a0f477951a0ac2b5826a470a",
-     "09de9e0147e1a268f80836d7db43779ce12e7947caa851d109273ba7e7dc7fc52c601f5b"
-     "f69cffd5adf0695cd7db8de2a64781f",
-     "0561aa76e1e9f2c1d4aaf6e2da143f67166f09199e1705b631d650528e94d643768cd611"
-     "467284a9f543e50520e3e738e5d56b9"},
-    {NID_sect409r1, NID_sha512,
-     "c90bf11d04a708e64b6f94d4cca64b92463eae878c377b188c82c1c5f05a038be20eca2e"
-     "18034d46f00d9a6fc73c4084981748ee9d2915d87aee4e2321f4f9e11c176f01281913e3"
-     "24700d9cb474b7134fcc408fb4a7006acd9e63d4578ed4c2729d8e0d01b1e6174a43a024"
-     "ad261eb644ae98979c3cdab75af357f6dbdf5db1",
-     "0495be0b0a9d357f6155fac008cec90442200bb842d89292fde38b7256e4117284a60249"
-     "b3101b3f19f778b680c0d1d7422b84a",
-     "04011119cd910d4e962f54c9776c9180e7eac2f71cb9748ace4b7dfd2d2b3caef4964c7a"
-     "55caa9763e008de600b727068eda9b98650000b48246cfb7c86e9dff4ba77a3a53dbb1ce"
-     "fa168026b8929c42c3b0251fee5746897916e50f07dfe8b57baab7964447a2fea9",
-     "0ad4ab5ecb84118c33a4b06d1a9f5d2c4f1f3dd1cf71af596eea771f851d0371d2d72593"
-     "c926d7b69b39cdf72931f6bb11d10cb",
-     "0e959201622673d81ca16ed94e9e5be3f38bb8db48f9c09a585aa31ff39f14128d79d604"
-     "a5f93c80aa961c85bbf99e276937f4d",
-     "083099697856c780936ac01aea5e3a4d9b6e183639cd200464a5cc05232df30ff5220dce"
-     "4e2af714c580d561b72dc4969166a6a"},
-    {NID_sect409r1, NID_sha512,
-     "e9b2a33906a1079280100039787377c2971c378b92e70a38ab41dc23979d6fb0c41e53a2"
-     "1b37632407adac6f212341cf6af8605b4978c85c9c16960e1674247f1795cd73b99ff28c"
-     "dca024f5078490513c77114c2f52288f5376872c331151d7b2c08f7794f2c1f9e0d849d3"
-     "2d73636f0aa899988ca561a76f74543b37cbf3a3",
-     "079626354dfc4eeeb51fcf232ee9e6b0130c9bd40f15ed45606bb7faeca8f359e0c3e18b"
-     "f12769254522fd4077eb24bd5454871",
-     "04007ad047bb38bde6ae2593e1e41c36b7efbce1e0ad08def9b23d25b7ea9aa336eaf102"
-     "17df16d32ada4af03dc193d44e6c77e67700d2b9466ecf321605b9f4f952812410800720"
-     "3ac32cfdc7cb87e1790ebf4bae497fb87011e0a81068e66a840d29583bb970e24c",
-     "0074548d1a3df580e45babda6096f4c78cd70945ff190d9da463fbb03a511c45d45dd1c4"
-     "6dc0b9521579fb506bf015f8b835680",
-     "09e04e9ffc2cafdefb600cf61e803eb78cb416304210165fa7c93c1bfefb02cd4a255512"
-     "622d524141de02c2cbd193991dcef67",
-     "01a7960232455f27768acd825b8ef91d4efacc38684d05a900a8512682ce19787033cd08"
-     "c1f2412b481b88ad02dacc0ddaa0ec2"},
-    {NID_sect409r1, NID_sha512,
-     "672db3fb8cc8e5f831be700498d3ab3aef14b7548e8011b21351215fb6dfa09460d18f52"
-     "c02c8815baf396d856a429bb9afd602a10c213af34db80447f4c06ab4bd28873c88eb963"
-     "9b199042d4b2cb13cc364f734fd4ab7bebede7dd4da63decc0cc1f84e34d760013f66d71"
-     "641073f16c08078880b67230f2d6c6bfe17d206b",
-     "0ab42bc7d0e3c23f8bcf928e25f9f027b56f270398a1d37bea0ee5426b944a9c9ba6d0d7"
-     "796899543feedb470f70b2ab148234f",
-     "0401415fe81100f208ec8afd5e882e5773a0c1d46e44627732900c7e1722cd77b3ae2443"
-     "8a8463bf571fd6bb422d7c583439c07cff019c3ef3688ed397640e873dcb20cee9755437"
-     "d0023646d05612e8c360717a2e80e80f2b85860d71f9876f3a68548da7099f601d",
-     "08b44ec25214602de46046b2c94a45f64e9d0903f6148dfedb76a80b8e6314e87bf7dce8"
-     "e73b14bb274a88fa39136a00537779b",
-     "00ec4c5bc88a959a1234413026700bf5d4287a0263fe75daa16693bf74cb5071a64eb187"
-     "78da0a31210347aaa33130602f6b597",
-     "0b6c29b9177e89880f3eee3aff204b866020b3bf77d7c31204af383d9770804660711a85"
-     "79a3f1ffe325f225fc7e7894ecc601f"},
-    {NID_sect409r1, NID_sha512,
-     "d7fd06b89226cfd66671ce5b4b656228c52d986afa7f6f30161680eb0c9cca177992a8a8"
-     "c40167a64165c518c55f678702125709361b536bd928567c97737bd750d0e2e6e0c00296"
-     "a6ca565f7c05cc8c54ae7a4e0c334c6a968fc18a959c18ebbd924457701316a4e999fb11"
-     "084520dac68dc2d69187134c40891af0355ba89b",
-     "07f7aa2216164ba689459ee5d5ca29e70ef75a5b2a4416ab588df1dcb9164330c0b405a9"
-     "d80c3acc41c19f58e24e17ecbc0fa7b",
-     "0401decae837c7258ea9d90314ac87c57aa6d49828787054cc068edc1955245271acae72"
-     "dce5c9cba422bee54f22e11810721c1ed50024cdc9e1b27e5d4bd024654df000bc9a0181"
-     "f7c0f4a90572c75e16b679f4362446993f9920e2244527801e8f6b1e9398bd8382",
-     "0463202dff25e6b9c633b60a3edcffc1a22031cff44dc1b0a5769214693ba02038fe5dcf"
-     "b4a48db7ec49b33068061616daf2fa9",
-     "08c06b72b73dc2655645892447fc0c0f8055838b194e8fad99fc6bd50774e1ed08313eba"
-     "4141018af33af95a3faa20b69bcc0bb",
-     "0958f104326df6008135bfbaf5c2980cba2833af1b4f04b5918bb51ab0a0df637d6a4af9"
-     "02a5e07db3022c134c72315f25972c2"},
-    {NID_sect409r1, NID_sha512,
-     "83b7e9d3ec638fef51d2885fff5490c94e2509c126608f82660e5fc523032f3e85d69d9b"
-     "76af145f6bd916dda35775abbb6d1902bf38880f8b9259822055c5b1bc726c51029972cf"
-     "7474cf2a812f3251aa71813476bff55598d079f075a40c6c41498bd865ce960c518bef75"
-     "a873b9d010965f342dc4b35ef5c5972efe6fdd18",
-     "021d84f070c6823a70f1a74225a472118c93ce9dc509aa6064051ca4574939dcfa96be86"
-     "2069424bdf1a23f62f2868326422e64",
-     "0400f568f018b0dc4400bca3e9e4b0e5bd5245f15dc7acbcf4360b0be2ea5abbb87a3cd7"
-     "6aa653d32858438051cbefbcc4feee6f6b01fdf1e1bd7a2d3825df14f8bf8d5de8250956"
-     "63c3014f2eeedb9bed3c3416d56f805b623f40b847090d6b4b3bd5abc98ea55e48",
-     "03344dc1cd950a9c3d039b6fb6af8c5745395d2a3343d86dc6670580e331d59f6c003436"
-     "7a6df52423a625d70292893961ceddc",
-     "0fb010ba41d651fcc854762fa1437262eadfcabb95b9502a40b50f20cb34fa19ec570dad"
-     "2e0521809ecdb2bff3f4e7055c02bec",
-     "05a9c2dc0c1f946ce33f2f434c156c236b09098365a7f31e238b4685e7cd8c86a0b2455e"
-     "5c83907167c1324bbb37e66e0b2768d"},
-    {NID_sect409r1, NID_sha512,
-     "c62c7bcc860f0e175128e1127dacf935ce62ae794cc4a0ce7966bceb023ac0498641d728"
-     "1fbc86f9ef470bbc77f608f83f8d0dd6299cf08f2cdacc7a9642e4246df131820220e5c0"
-     "5d0dbfceda7f16b86add4793e9b6244d96b5c07cfa23574ceb43e8e8b5483192a92b301a"
-     "a3b37702b8f94f0129d8af1617896b34990c9b02",
-     "0b6645344d17528968c719091b6e2072388881dc10bdb4c7fbf41906cadf3699b30f9c1d"
-     "bfb4796d009480664e6276c0359e5db",
-     "0400b164b075b80fc8b8ec785d5c2ef84d49f2f4d276546c9cf2e17ea4d367828e9aaab9"
-     "85c5cd0882204e293dba0359d47d9bdc0500a0c61f181d5d06ff20d0c41cf6d6cf7fea86"
-     "0075cdcbbab2efa0950e2276dafd4258a39c0fe4c45f3c04f76efa7d41392b4d34",
-     "0c497c621c5cd230fb1e4a4cb3af1cc9d8edf4af5c4af7f15c4ad0a8835b54de52d83bdb"
-     "3433808a67628912a85c5d00aa222c9",
-     "00b22e5773aca4d97d2da846c3947bf9cf2474101a6f0d39d31629a6aa2a4c3a77076a67"
-     "1e37aeb4cee0a94e82e914c8c553e04",
-     "06ccd79ab93e344e6f112c1e4a39e8505a2aaf5cf85595cadc6ddd1afb0b1583d9334cf1"
-     "c48f26e5baa38e05b6b52f9f12c141f"},
-    {NID_sect409r1, NID_sha512,
-     "b5bf38fd9e822925254418475a1ce762a94e336f12b156b1625a4574fee11ee472d537ef"
-     "94b4a4b1c0a73b0140d0b818cd06636653e6c07f0f100118242a7703756f1cb1119b3477"
-     "c4ced99cf45e07e83b7f2749c1a5f8d8c9272d221fe17f7c6a5fb0f8a16af46f232ce406"
-     "aaf565c6b2766a2f6528c82e74fa1c0a7fcfd49e",
-     "0f8c2f770cf5f8e1f900e996ecdcd84fcff5cd959777fd005d721a419123221a3237e398"
-     "34b270d37752470deaa6cea023c5058",
-     "0401f861984fa06f15b801216a1c33672cff43740f0f736b4f4abed5656a1bee33a2aec4"
-     "31680942f2b0b0dce9a9196b49263fe183018633f4e057bb6d70a434f919b9ce4b7d9e61"
-     "fbf46c1d9638100d77881755fe9829a69d696d555b1a26e25ac1a1c27b40f909a2",
-     "0bdd99022dd964306955c57b226aef036527eca481622618fa7395f53e60aa95a275f1f2"
-     "d6e7354d8b55d3e83c85819e818199d",
-     "02f1330f41a86c09205004215c24f42fe582da189906fb23fbcc52136fcb4970a33b8961"
-     "13eeabcec8151cf3b150eaf1ec2dd88",
-     "0439507edbd36ebe4fa5df34d220c1441e1a4175c9b0373fc85669facebb5bda7a4b415c"
-     "269a7add207b461525c6cc94b7f7b22"},
-    {NID_sect409r1, NID_sha512,
-     "6d3474770933ec01b76be789304b6fda423b12a0ae8c87a5ea8d7ee9f71300f39440e1c7"
-     "f5aa4b47c1a8628cfc3a490b15ef292a741344f40a8fcdd02cf3863bf3e32d53031f5037"
-     "03deab17fc52b3d4032f4e237dcc27231b85d3fd60b49ed7ee40c3344948d87c3f47564d"
-     "20a11d50e4e520bd16c8701694fc70901a5da625",
-     "0144adae951fe897d5812ee4a16c0be4c86c5e57e615c398f5768a1223a9be20fa82cecc"
-     "f8a16a31432bbfd17e594a4cd8a6a07",
-     "0400bce072255f7cbaf565f82db122e9c582ffcfbefadab6d79680b2506792028b200ca7"
-     "732a98322c290916c66c8a8ef77df6a2e501b4b6f65e678223bdbe5f8ecb68573ae3d7f1"
-     "11dac37d4fe3c0eb768c461187fc5859b13452381fe676257aa445bc7f38b4919d",
-     "0128c12479b7f0630374880b214aa26e4e8626deca57148a6c6a0e37a97e89da8acbadbb"
-     "fe7db28a0c5bd17303e1342af711f25",
-     "0a95124ec95e35747fb568e6659ff31867a4cb7c00985b36584201d1bac0775653e0a8b5"
-     "4cd9a9067ab3de434bc2cdf29ae287b",
-     "0257e5410a6f0bd94fb3b5b10500fb45b501a3734f0c718035a9a1516d2f88e10d1e38b7"
-     "0c791028e262e0c3128cb84e6064ea3"},
-    {NID_sect409r1, NID_sha512,
-     "92ba7aaf71f625f7a2e024058dc8739da3567c306da4a812ed9e1542b7d1e982c1608216"
-     "6a59720203f4524c3bd463a662c26a82ec7b4376545206e650eed0d3dd7909dfe3810981"
-     "393070d15c45dc4a75a8c5bdeba533cad1ec34fd20466a61e4cde3b25af9a80a9a54afdd"
-     "7de1cf2a74ba32d4ea0082a037775413c61a8d1f",
-     "0a51f065fb32c55bf4ff6f18ba9d488d35d9f8da593adb0ab1632533284e0adc43ccdbda"
-     "9d9507b9862ac63b5ae7b0f78b479bb",
-     "040080e2f7ef17a11ae66172cf1c18eab12aca4c2ae06b8106aa1066677a93538e3dca06"
-     "26e836249eb884a382c3b726736565c3c301e98d37a17ea736ae58eab093fa7dce3f1079"
-     "1ee9ef5ec00bfb27bf3c705dd633badc94642c385dcc276f9b1fd5e01dd76ce944",
-     "0d5cf7b3d28459db8dd69c314f6464f770c31f239a12656368c84c64693f23733661081d"
-     "20dca9bec9c9659a8124b57a71ffd55",
-     "072ba8c1b4bfeca62e96a5649e851e9a311d7685603a11c1c299f5ed8605adaf27cae656"
-     "cd31335a7ae363cbae5dc7a39512c1b",
-     "01bb9819d25a211548461de4ff973ffbf475230baa161558d9cb7ee6f2e682dad21a465f"
-     "c2ae058121224f8680296d30e3692cc"},
-    {NID_sect409r1, NID_sha512,
-     "b3fb9e48c333201324755a81f3ae5d4f0e2ae7cd24238fcc66d858e3aeb1ee03328660d6"
-     "399676eb1b7d8285ba571e214d935bb45516fccfab57b8eb4c3d5f1d7357c768eb7b5e7b"
-     "5710f599614bd4e92706eaba31f8a5e7e57af7ed13066af50b4540ccdc126b677789920c"
-     "ef8543907f0ba9dc92aae343d3425bd784ef483d",
-     "095351c0bc07acfabe6477fe85f97eab520dc96bdd58b44b036328ceadaa56a1904d2217"
-     "c5fd25155ff2aaf9005a3e2687fec81",
-     "0401c1311230cfdf5824323448c68ead5e5885ba540a21ff90b951f85d84d78e26da035b"
-     "fd99341b5901e1ebb18648a8dbb996fc9d0017a037929496e560cd1c936d9eb15f79fbff"
-     "737201dd880a69dfec31209faf5bd2846e3e664c668ad3d6500c5ed620f1bcc970",
-     "02234bafb54cad0d0d51f4b8508dbc8d014c303d90d21bc3f749ed7acc42f0335c5ab6d6"
-     "0002d3bb57cf07018e9c13b92c0a39f",
-     "04d0609f06320d69870a3e66f19cd46a2e0e3e13fb8b7785163a7b567bf2c0f437b4e30c"
-     "c67da288a3b34ce3110f6d87affe0f5",
-     "06c46d0248f7c309c1e5b80ac4b1459bf897e42f8f037031f5bbce0fde50af50cfdc4f60"
-     "d5ad3d1af152298cfe77dcab287874d"},
-    {NID_sect409r1, NID_sha512,
-     "9ec5f7d65082264b8a50be772c44277a73ed19199eb275fe5976f9799d8629fcb4a59a8d"
-     "55074cd2eb2a0e02062d3f7cdeb05e62931a24fd1aaf14c257944d1b42eebd52726d6fe2"
-     "81211b39038e52baae077ea4df89675d860d6ba5a0f998d049614201b872e134367acc90"
-     "066ac602e478ac3e43c3ddf4b0ca0aac1a68591a",
-     "050245c1682344fef23bd549ac8d1e8e44b2840c43eec1cecd33daa4e9ef6b53f496104d"
-     "7432e14248682cfd6f5b4853b65adac",
-     "0400d2f8fe524b2108e375c9603598b555d6c4c7724c7d11039178037b3a4dc82b66c3ae"
-     "ffcccd89cc34dc2b2f6695892323bdd80501f98df95fc1837ec4d5239cf55e97d6b489b0"
-     "a8d7bf12c1ccf95f689ad23e46dcf20dbb531f5179e754f0c29c8757a1dc67493b",
-     "0c683f98253406c6587d87c57991fe5caa3f43b451875859feeb81176b732f1c1eed0ee4"
-     "4d1905d41922878617e03dac53562a7",
-     "00cdc9bc7d670a1b6794fd7da82d2ad1a0e92b82ae32656ddec3aca4de75f407f20fe782"
-     "daa0004317fa3f12cefc48518298d5d",
-     "03ee7c75810c2c05946b53e2f24feaa697af35174402c069b9fb03d89d73964c997eca4a"
-     "5d6f9482cb23c8ce337a374ffc3e186"},
-    {NID_sect409r1, NID_sha512,
-     "61d657bf472676301503f6784b7286fb39fb4186bb88abf1edacb4a2693d0a1e2b77bbf2"
-     "758c84f2cbfd1753e20841b1cd4b456400d53f4d686e666943f9b6ffcdb77f510be97536"
-     "e9698fc84ae347d483bc8984548d1cf86b9b40d360f9c0dc5bd1c55868e26fce1460ba94"
-     "ef5e94eb63c9f0776a0f446c0cfd4106d9f36352",
-     "08d3b0277f0e9fe54581d3a9499ccd7f015c08339591326859af969d2a26284e3b3beac4"
-     "a0b74d324ce5cb5f38c7995e4e3a41f",
-     "0400ae18564ac04b54769e17df84aa54903df58decb870591dad73dbd712693d901f3f9a"
-     "d43a71f23b77705de2b4ec1c3bc616356f019810f92e80560979ac6e72bee505dcdef15b"
-     "4146185d2f8f5a955a4555523d982c34bbfc1326024410dbad3349e4c4e01c242d",
-     "0e52dea77fc59298cb06fb1401d11c662a04500f0470965c4cfaded13b339bde52f4fa04"
-     "c76a955faac16784f443b1ad9dfa0bc",
-     "00c917d487d2aae1651d76147de2a706a01c8b3d223afde7d20c9dd77cc2329bd3e0e4fc"
-     "01255b7c4ed1baae7d26667bc2e9ec6",
-     "0058c766fd514a405de91a4b9e99fc0b0146d954dc2e2decc2f3f066d0fe192832ad37a9"
-     "40949ca4e9abae0602248b3b56100ce"},
-    {NID_sect571r1, NID_sha224,
-     "8e14f713a2c427b1f79491033994f76acbead614d12e73ac6f3f518f2052a10c1273aabe"
-     "628ab38e0d3d5f8ff254802e9f44a51367bf80325b6fc39d907a37f731372864747b1074"
-     "9ea5cb3d3a83da39c21a7b02885a8c1770e4397cedc958e4baa21d5007569dc9dd1e45d2"
-     "181709d900a394454090badbd0cd9c2cd2369aad",
-     "0f42afce7f7b3d45f3f925ab29fc3882a89c9f585177887584703cf8bd8fc572e677adfa"
-     "55b402446fe1e90dc855358d92c3267c35be9674b40c2ad5ce8dbe6a533c44b0ad8d2b2",
-     "04063dbcfc2d9171a7cc1835c1f56ecadcb59aa6d5852fde264ab25603f06817a20f2787"
-     "446445be8b2ba05c70fa25d9b9e34d5374febffeb536facd3da52d43d69fa7af4d4792c7"
-     "9207686e0629de47916af19f9013f65fa3b5f9d196916cab2f765aff31adb5a959515e83"
-     "fe3e00e91843c532041ba15f047e978bf2fc69627bb5cd7f3ecd74cdf1a8d623c1efd23f"
-     "c0",
-     "3fae665eb7a54f51c522ad5721d9e2648f13f3d84e3d64c8148d59c662872b5cb7d911c2"
-     "7bf45884f2ef717d72bd0569d9901f2308d9a68d128c042effea148cc963a8252f1426e",
-     "1df705ef13ce900ed61babed02e121dacd55a881ae32bd4f834fa8e362d059223b29ff3d"
-     "b835fa2b2db8fdb98c21dda5ef744cf24d0a798f501afa3a720a238ebd4fe3976a179b8",
-     "1b1e98db422fd48f1dfa049f38865f8bf9ec5618fdbfb50f21cc838051a1493e4b1e4f9e"
-     "a81156481e5fd84124fbab740421173862c63920e3a833aebf0762e7b5b39a1591d27c8"},
-    {NID_sect571r1, NID_sha224,
-     "38b60d27ff08fb191811036dbfd5b39e1cc3427ff70efb67c851e9cb407f9fac6f348d28"
-     "9df98d055eec73299fcac068bd0fd9ffa3c5d244659e4f714a58d79f6727f323a7ee2636"
-     "9000e90e34e106f99f5ae2ae1b64ee89e5a1d304ef20c071a7773e9b977ed3d49f467d30"
-     "0a881c8371041394910f9c366942449045568f01",
-     "2f36613043cbf53ad36e2b38998bb867503359ae082d07d040e5a10a43e06ba9c91e7c73"
-     "308e41e2391b65e634f83b162cbdf4e7a44ad818fb93a978af00f06be06731d8c5886c6",
-     "0400fe1afd356670e1dc6bc195f9513f1dc6b03017416b5252c7b56153da538422e557d9"
-     "918298ba6c78283efa0288c0ac61298846a6f8adf74df21747cbe7c18a2b825a330e843c"
-     "d8018b7659f0a7e8e7ae5d636ea4d1d5f3a1f846d4bf3dfbd96c6ae874354db6faedf02f"
-     "75c4d1d8bd6a3b61e70ce58e38ea5de8cc16828f87a0667614f6640a3023b7f4aa93fba5"
-     "77",
-     "3fe351ff6ddf50752f7dfd8e5a72c9faad77dbea303fd97dc939eaad3aa7fed466fc8939"
-     "a7a6bb7abee63455284a5338e59dc067236dd699bdeeae1424d993a9c76fb2fe9595423",
-     "04a0e13a9fde9f2fef417199f8584d0f60b2f04aa6b7524cd2a2826d63043b2188ca977c"
-     "9567fc1ff292ed480dabc01589db8734c15aadb4ff54a552a7d9e66829fec1dc919dae6",
-     "01bc7d2c4ca9300d7a3001755ef25231d2852a7b9a3e91baf21f2a2bd2ff305be8a9de1d"
-     "1bcd7bd9eac4ce12ecf8a91c0a409726085382fb8d2428adf1b42b37b50c9e8e0535d7e"},
-    {NID_sect571r1, NID_sha224,
-     "21709eeaf9e1953822294a478dfacfb205fc25f447a73a76a32601c00784cbf2f9ebd41c"
-     "22721d70cdb3842dcaff4a4f208d41c0816990e421cc4b8538ac2f347cdd0aa2a39f1aa2"
-     "6ace8cb6a606b23f6244894d4594a0f6a5b8f6a695fd66e1a41e2eb6a377017177fec56b"
-     "b58c837e311cd04c5b50575faee32606b9636ec1",
-     "2e74948c46930cbcd9dbe2325539c7dfdd910f309fd610e6599d425aad9ae230a8d46819"
-     "70a14f2a71fd08030d0a40ff40dade7de1b06a80441bbf7e2fcf1809cff39c7ef88bf9f",
-     "0401b75f2d281592c288fe6d5479a4e21ef626471819850cbbdf814593bae7e6ce2a35a9"
-     "78aea354649d979f161543fd4c12dae0efcdc2d95e82ae5874b9c04a2143535097b8a17c"
-     "6800c7160c2efa3aea1d18afc1a00b47209dfc750a5317ddebff04bc4d181f238d339a76"
-     "90c24e55be2cb0c01719d34ec986a07727f2e412aa72434efef4d64ecf7c16e2e75ebd7a"
-     "d8",
-     "0d3ae3d8e5e01ad838a7cc9a4d9b3e41eaf9894aed1d1ba597458391d4a2ae38c5d6efdb"
-     "4d91761a415812d77fd9ceaebbf1ad49c282e693d71d89f0e2d1bbd94698a47f1f30890",
-     "1e2e9e2633885c85f70208de30ae9b7f72950e2de980607f6d0e73fc1fb2a4a8afc63882"
-     "06c11b081540bb528a94e5386ce77a2d5c7830fca19223d57c1efe7ac488e69ae07e660",
-     "1250d1b920324919ef81865513db461409f6f8ad82f658dbfccfae4425906da306ba10ca"
-     "c84cf5379b6c1d8b252f3c6f86439413c617deadfad38a234bf2b0050fdabf7719bcc9e"},
-    {NID_sect571r1, NID_sha224,
-     "3a131fabf3dc97334f212fce41c44300440d16de1d6060450875f7276f53c026e2a51168"
-     "1b5a8d75fc0d578546339542833145f7ee13c708df33e584445a75a5538829286480d339"
-     "be7c777c03c998a6d3f037b25799ab2d541021502a0b02a9b9c337a8b176c4f30e5b1864"
-     "85a6103b1d1563ad4ae73ca806a5e4daa92e9100",
-     "1b5fab1d36f6f6d559f65d8b01edba610620fc3a38307b1fb1c5bd63e7ffbd4a9098cb8b"
-     "df50975a873f5d047ee2b627b090897a7fb5f56d3f4a0f3528179e7c969926fc0d3b0e5",
-     "0405eb8c5a2bfc86aa9a82830d665296f74aeffa9c5b38750d0ff51d01c2dd0fb6f2209f"
-     "8ba89ff07297ab9b1b06168757f48cb6eee618a7b44f1b3902187c33208288f35a066659"
-     "2005334c203f4ee44fdfd5f99686b18696b3433f203dd148324dcfaa03a0a250cf606486"
-     "ef11ebcc1ed1839a76ad70909d835a4b30a014104a6ecbb284b33f50bfec33d8b5ede85a"
-     "c5",
-     "243889e7ad32076a3ea436356eb572c1b4ae402d0218d3ee43927eca0b4fc21a19926eea"
-     "35c37f09de4766f54e6079c34fb3c174afb953be1aac46d675bd300e717dfc2d0c3fae7",
-     "1d87b52dde9f502f02a502e7a331ca6dfc6204922fb94886efbe3013446d08240f6dba12"
-     "10a76eaf804562aa92a14d220d59b6310d6caea0274a5e1e8aa3c6b57f239191a71fe3d",
-     "2a5342df6908841b719f80ff905cee0ec3fd8be46396922c3f2f142393714b97128e0839"
-     "07a3a2343f0cf9aac73313279ed29eb44017e2a1cdd0fc86e4b7c536e9f7eb1bbd192a7"},
-    {NID_sect571r1, NID_sha224,
-     "679d85a762f2574b0b31b516270b7d33d5e166c83e91a0f48e0f3db20b52f42f9e6ee964"
-     "8cf58267ffe3b713723cf3df52b5fab5c14db1e7189f7cb7170bc6ec7cc71946745e152b"
-     "39180f828688a5b6c0b2957ab94283b90052a3c6e36843c391aa8810f9253b639a8d5a69"
-     "aec10070603ad7a99dcedb544858d057a1d66b89",
-     "383e70c71b431eedd4574f65d01fb0304f7744d668408c847f7899eae44770a7f3243109"
-     "740f177d7146a27748886b7b77ecf3792b512e8d8e37c3bf4ecef2b1253df7066498f01",
-     "040769dd91fad550980225877d98f7c86963c88be141f91f7a3f1607e0cc6dab767aaa6c"
-     "eabaf46b65a7c80b6a494b0dac1da5d2fc8c5b07ef7085ed1bbdf4273da3665a6517ea1e"
-     "5a0282fb94b4726472248f01ee43607f7ef969446313e849998fbf0058c8ad5e24457006"
-     "b84fc0460b74d86ca281caa174e69fbb68673e1d28ccba17eae045eabc1839870831246a"
-     "14",
-     "336909099a1540e6f69172d55e0c88a1afa99808005bf09cc803ae1e4e4fbeac2f77f984"
-     "bddb482f1f13e4430e25e36962b1a4cae00f1fcd7f2c7a17372c91673d8286f9829bbdc",
-     "290055d578012a5b7d88fe2f70581a0fff976756b4581875cf5db07e01f09c0bdf6ab70f"
-     "fb5839567583d53c68e31a27c3fde12bd4f1e1315af2f742746277b1fb1349141ed3043",
-     "1480c63c8b90c7b51e092597fd8391a237b07f0ff7dbf615e6bdddd5aa880db29c9b9add"
-     "5bde7e0e81d9a37f852c26f21d750cd2f95520d16da7404c2c3feee1489aff09f298d7f"},
-    {NID_sect571r1, NID_sha224,
-     "236152ad31ce2ffc0dead3c142cf6c770672cd2e75af4a82fda1a72e1c775cec9b481c6f"
-     "3e411644df7e7ee901c501405620af4b6e9667dfd46091788daa95ef2c6c9f5c240c06b1"
-     "5cb0df51f5f058d8a7934bd7845f007a35f99fa97200b20f3b5b14fbf1e372507f3b2f37"
-     "7e8d07d30fd3e222f398f26d8f428e320327f901",
-     "02261d4ead21f02fab19bbb0da8c272286704c8f0c6842ba47ded121e5cddef79fb34e6b"
-     "9694f725ca502949faecfb21e3cc062a2b4c654bd542d9a1fe8d97bdd0905c510aa0999",
-     "0403ef03980ea9b754b655948da63469fe526ff0ba2c0f572981d02f5693bff620b55b8e"
-     "9e9f9d553a78a0138072369775c7976f028631e65887cbed62fb447c9f41da86022f4b41"
-     "ef04446eed90f2716a7aedefa1385db9f5f803434517fcd80571adc9b7f086c9787b7630"
-     "6380a375668b05fbed30922746fecc0cc16f189dddab676516ed1fe4d02855a34a909753"
-     "89",
-     "0b309f6c53dee8a8956358df45e72126ec76266d38babff185d4db1d449c8fa9baa4b065"
-     "1af5f5b0aa70dee3dd55623060097e2f94ed12636961a7c0744b38f2f137bca239f974b",
-     "2b42395206ae79bd9df1c729856101ec3c4a719616701f836c9d69b542b59ce973d91951"
-     "853f89a0717abd4b929bc69e59cc379c941349dfb4f98d49f9dff572c614242fd370e56",
-     "1ecad482a8eadec6800a9d876a382125eafaa7bbd950fe5f0588126764126eb1b3844240"
-     "15c52ed6a335668506f25124aa78d98ec5739fe282af0c143c07da0fca53b9733e159b8"},
-    {NID_sect571r1, NID_sha224,
-     "ba3f02c4847fae035d747db246fe4e82fb9224ff9cf568a6ae548f5dc2befb2079541d2c"
-     "f9aaa6b18c281a05e7ddfcdbcefb25f41dd91cb3092b3343e16985e91c912215cd99ae4a"
-     "099baf628e33a7b277e3c36a13aaef85418fca99f64d73b789f23ecbb76c3095ade0a5f7"
-     "f34836a98c5be933b44a94a2eaa3f99b1d8e7937",
-     "316c78f289e1860bb623082be9d9238b88e38c5e978a868bb90f776235bdff4eff591877"
-     "b7f350cf14c40356922b2b6aa51d64990360b2b0e44d6941b5dd9492b4f4e1f42ca163a",
-     "0406f4137a2c63b6b79138027464135021b034f97bcb2493943df6be844f1657a97632ac"
-     "80541a3b43ccc828789517efdd9f86ba171c1262a07a6b337bdb0c8d5f018302a8046a1a"
-     "8c0425cf553554d18f6cc97f0caca2a7eebbf266d57030014273f701562d5b1444240b9d"
-     "22060ac9bebb37deec393cebdad21ec7f13fe5c7f1752b4261cc2feddeb737284a6eec36"
-     "63",
-     "1e0321344bf364f1ede39a49c8051f36875ad78e4b080ece9088111739041b121f3f334c"
-     "6e923777fd716a52be669d6e45f381da11262fb4d09ad66dea74ca115838e19fe94b7f9",
-     "04f24ec978c52ffc7675a09334a895e044eb8eaf04d26c094d7607b77ac4168a02a972f5"
-     "77880a0d0c73f218815e3a7a70c91c50734c08d374a15fb42fd13367dbbe08fe9c2d4b5",
-     "060740270df0e1fdfb8e829c9601b9901223b19d07e9d7d422b9bade88a50fd6d4ec9684"
-     "2afc45900a0107ce85ea6d083d66ae202dba3a32e50c7c3af951cac7acdc6f4c406740b"},
-    {NID_sect571r1, NID_sha224,
-     "6d0372b40559e075af56af853cbe18ba2d471b0fc8917764abcc69102b03d5bbe1fc1245"
-     "8215be66409c26c89f67c72a8933677a07f88993af6918acb074fa915fe883b24bc3d191"
-     "ff1b08852f07eda98977e70eba072d8bf189cd545230f59559ac05f1fa3f4e65886d0bc2"
-     "74a6e02e2399812b2bf91abae81e21279c5de996",
-     "2c1bc13f8320d97a82f3d9354e195481902214e16a4fd89332a0499208e91d50e5cabeb4"
-     "927ba030cb42f5bc53b10f500fa646a8c88508cb0d63ebfce5c4bd574c527d686c735ce",
-     "0402210791ca48aafed20de84ef9896a9c7584081f850b75884908c7b3dccc94e221401a"
-     "6ffd982f292a9d5f9c1d066ed493da948ac7e93977dabd7b820bfc0fd21cd8d99c072bb6"
-     "9c033574c6ce7da749ceb480b4e00bb1a58203bbbca5c16923992cc9767aba5483e4d46e"
-     "d39e71000a1fe920a4c1c211a14e63ace03635a2d77e72808e0664334890b819b3caff64"
-     "a3",
-     "2e3db2d82c4b9de2bc0dd0a93c1c5b385f75ad03d0da527a034da2876b42e43cd88dc648"
-     "33efef54af902d85c568bb8e71684bb16b28c32d80bb3e9911cb1b74be6ec520d99b381",
-     "065f4715e87ca3541ea695878ed5ccb7d2ea6eed5d6fc5ec29f9aa8deb4001cc7c06185d"
-     "6ab2dde4347344d44f8300a1e92513af4690d713762336d2e6a94d3324a224f06eeadeb",
-     "20104e0767530ce2f4351af4977b52339f34d13e458de0482bcd58ab38ee041c9adc7b05"
-     "650260d919b2648e2f820407fd60a8d6b4b991b86eaf29c2c4d12d3b0b45cac2ab22c5a"},
-    {NID_sect571r1, NID_sha224,
-     "bbfe66c82bc060bd14fd0e40769d9b3a026eb447550dd9f118c30d8448f725f8366edef0"
-     "42447962ba7f7f833b9e9094d0ff600714697e632626e7d12a592e040bdcee166dcda939"
-     "52323191021bd12f3b1647d0f25a41739994659dcbb19333ca30f46f539c6f0a5c354cda"
-     "8969a1eda572a309950c84c7607eb8ac20163912",
-     "13bd80eafa67663e75d7ae139bf285d2b9f1e03d8e32153c73e26d06e86d7acad22bde9f"
-     "121a3f1ea674dcc1fe67bc7f5398d5e92555056bc046a02b0ba86c2a0dfe32e91add5b6",
-     "0404c01fef7f2fd8ee61726af1a2d046c7ac67716403b99e021082e96d733368c6c64d04"
-     "6986fb01a6b55cc930517762387eb2fa4a8eda23c700d88065bced8595188760170881a3"
-     "290189bfdc8e7a710522ab5416182c9579ca255c5009e6ee6604ab033c1388639c0f7aad"
-     "84642290954db9f4f7fbffd17481eabed38151160457d68ebdfd8695b5035e4e6e06532c"
-     "0d",
-     "3c5868345c5314aad5ed3a74488a85b2f049396022cdd1de855a0b33c2877f72e871805a"
-     "f3ed8fd7e7a392c4ff63acac6a6f0c431ce7af680984e8c81d0350abe491a01f0f9268f",
-     "0c7e96b9e9a5935ccd51b901aadab6e01ebde44f57e6f0b84e7b58ab4f62ffc0f3f3f980"
-     "665c581ee3de233ee49d11599529348f1ad3d362837c041cf98192bb324f577e973e1c7",
-     "2226922271fe8307bf597742618ea9c1c271c22c25b49aaa7c9292a81ecce2a55250415e"
-     "a2ec8ffec54bf0508e64426cb9cd7177265fecc40e056e96cab661485e789f0c435b72b"},
-    {NID_sect571r1, NID_sha224,
-     "b35e9bf686717ce3b16a59963a32a2116130453b161a4e7ceb27b755856add836d779696"
-     "edcaee3b5c986523891c8836109d431e55c23afbca022437ad19e6777efabb6da3bba1f5"
-     "f44f905395b4cc7c9210590fd38da621582d059598e5e4569e904358e0dfc0dbfda4ce75"
-     "538aa97480912852bccd433a9b96c9c66e9597d2",
-     "30834b0a4284097cdda2ada6947c6c281f7290a49b56becefea1e2788ea3ef78fb968076"
-     "33c47c25138341768b241164ce0d42f7301728b928be2c047f2eb60fc2f844ab77306d2",
-     "04003a21f0d8e01a64b235cc455c291e3fec8de12682f05544de207d910c7c24c4cd56f3"
-     "354500d994380ebaa0b49a7604c6233a9aa24934c550c0e609f65fd4073cd6c1ee4170d7"
-     "7e067c83513e4acbdeb8343b3add40261edbf7c8fe0af7417264830edabfc40200283b92"
-     "484630741378b997c3f8bed7285decc6ef8633aa804b3846d3b4517e5ad836dbb1df4758"
-     "18",
-     "0031afb24fbc52b01480754837cd84a5165d5f2ad1a1d572b92ab546c049413806f0f523"
-     "9a77c751af4d57a84786ed1c11bc76123a82e7db3c0495b2fdc5fb9c8720eb7afb640c1",
-     "07a222cddfaea617f1190a0bd88af4d1983d2543dfba25c5036fe24529bbe2e382de89dc"
-     "1e36c1f6df59c8291d1c4277198084902e5619b64128c265bcf03b7d8cd6b663c225f11",
-     "1ca84c146ebbd16300b813621d503d8c754e4b11446d5ee31cbebc71f4b85ed09c5c94bb"
-     "dfc3570e8882ef790393234c5ee9e52f7d5b74ff4171d930af817eafc40ef203a1ce613"},
-    {NID_sect571r1, NID_sha224,
-     "57b5ae7e95c638b258d1e09b3fcb4341e203f5706862e199b103c8fdac72cbc5155e5cf8"
-     "b300a0b3fb0ce1f897c45f7aefcc528182f73dd450cd84d5fe9eadff3f704dc2a01b4e84"
-     "7c22df430efd1c66b0199f3e5b59348af5386962a5ef25204fd230b54d58d7fae801c086"
-     "f8f405d3d0aa7a9a9da15c22b868817cd897d853",
-     "0c81a79ced1eaaafc31b69a40d9939f4e484d625db6364a8e589b6b4d336d458b44287ea"
-     "6c6aa7661113fc07806b147ff98216fa0c08708dc9d651821b922741deda522b4e436ad",
-     "04025f9b767b8796466c1cc8a1fe6286d591c04a0d115133fc7910640032b898a5c86547"
-     "f57794e5aac0148996151d3ecbe0d5939dbff5722679ecff378e3f21bbf1354b1eb294d1"
-     "a30074c2b91ef3472e60426d2fe182ccc678aa0abb8dda15a428e4f6f1ac401b015b2b7d"
-     "83535a0a92770cff7666659e1cd33941bea1168cffde82db0ea83668c2d387e6f4bdf28c"
-     "c5",
-     "27b407a29553203b829a87eb25d6d140e41184634ae1c64c6ec38e9012d0b06a1f4ad987"
-     "7d7ac4236a22145095990233e6c102a0052ba18cf6e47e289cce4f2ca21514d8868bd68",
-     "02416e11fe2f8e4738ecff1710dc827f4e03c8e7f04a4f52e755f0c1676abbd122eb9751"
-     "ec1fdf6c7ba04b4e29f8dee52bff7e9e726e28cb3de6f9abf2dbf58c0519ccc7d70f076",
-     "0b96f107a26097a468c1d410bf90e223cd72c5ec98d4ee4ec2e32259d7670d7e7689e62d"
-     "36549086139f6111884530e20f908d7be1edab75180c81a70ece341f7eda6e4a43a5ad3"},
-    {NID_sect571r1, NID_sha224,
-     "daebfef74b452f039c999ba0528be3bd9e16deb5f46f6eae87b63db8b89952c949fd7db0"
-     "8311871eb2596865eed107aa065f030226ea675ee3256c31a3f85ddf4c21760582144e07"
-     "af208f33c5f47cc026db5403186a65a47940691ea2d74ffb1245676260ef5717dd879d8b"
-     "5b72d96f87fef5f762d4fd17454cb5ed83d8a11f",
-     "2f24670c0f77d2ca0266a743023d2c7413d56d0b5ec77b454ac59087efc4ea4d46179e10"
-     "278e4ba416ffd8c3f9786ed202faf8251c0ef5a9ea5371fbb35b7afe3d15a9cb4bad975",
-     "0402da72b8ae64c5ee717c33758ec26153a342936f9d41dcbb136590e1303b0e220ee84c"
-     "8a06b83d4d9fc924b8808de94dbd780cc8243bc4448efd27dfaa1572aae6abe574be6649"
-     "3903b3a95d962c48a81c48713247801e4ee630ec7956c9989023ba16f02f5bd1ef2edcdd"
-     "1c8d314be933225c64b7f8a80542b209b944e1f3fab95795ffa134e7e28e82307dc62c29"
-     "62",
-     "2bbb9abd2732994011c8d294c5342e8b1f7f3c1f5718187e9f75832604b43bf75abad5dd"
-     "c85e8d92cdc42656cc9f3349afad3f9022ccbb4937d9ffa9cf48314b604e82bda13475e",
-     "3986059f2e096a3675215698e23b53f471c578891f6d721a34a0d231d16348d5bf9853c7"
-     "9c4f4aa94642ad06cb7bfd11f724800cb5477636b6fc0586fb6efb8eb9bbef62329a884",
-     "2beda064eb3ffa1c3b5336613704b3bc3d4ff7b0e977df16477c7e33d480d678804bbdc0"
-     "8088186fbc4764be398a26c13f88bdd23e844be0d7ce598bb87c1b3430da02ae96b3767"},
-    {NID_sect571r1, NID_sha224,
-     "62af0493ae79d71b552c4647d1fb7ab2f282a91cd44aebd8ef344dfd77b521b0c0a3f72e"
-     "4513c8ecc0e4b84efef3df9482a07ccc1b740c571c5e69cb913740a792aa231b9dc87edf"
-     "b72bac188293c6c6e788cb3dff32e8f483f8f34e21ee7efec71302cc3bdbfa47908a135f"
-     "6ef3ff179dcef26d1a3987f7be967a6c0f799b0c",
-     "20985f2c6fe3ea04bdbab66a8b6167e5969c073b9d53cf3c77cebbf73f4dbf75e601620e"
-     "c9c3107bf3fbfc6c79f8f063409bf8fe1d14b19e323d857e23dc05157d270c7514137e4",
-     "040010712d50ba7752962b140cfb943d9e8dc3bfa497bfe81c42606f4da5157656fe2ba5"
-     "cfd33ddffa0f27fabef8e267688943514df45e642ee0454e05b49f7c00f5785777897d22"
-     "5b01a2c7db6595c6d4c55110210c564cf102739760e7f5a29706fcb2515d99ca00949d5b"
-     "4f291716d0aa1e3a47efb9632410f60e2fee1ada47171f902f632bee85da75c7f3c895c2"
-     "4e",
-     "2f26eaba6452e687af452d5e1208fa011e4c84ada92a38f0a204a254641c23ffe1c184fa"
-     "8bfaff047db590ab40accda408717e4f30811b75cf3a5877ef99279476ab924d92565bf",
-     "1280adcac1c79352635f4165f9c5c1b6e1e6e33bd74d781773f483f637462f80340f8d22"
-     "cb24c9db5e49ace95a676df3dde53c8721f672006382ff806410bfcdbceda50e53285e6",
-     "07dd52973ef30dbd480047732622fb1b695fe3cfd080264d2aa30a6ff3dab4ab362518c4"
-     "f3de4fae042fce78c0c8fa0e763eb187eae2ff8f2e79b3f38cc3c1aea897e1f28b71a19"},
-    {NID_sect571r1, NID_sha224,
-     "566f17851951777ebea3f8285610cd8ee5f882a68e7a4205e6fc9e2d66d210ee2505ee73"
-     "d6503169f7b903012d43e7e99efa493a8e6ef926b16b9ad8f52156840ab561fc6b680120"
-     "a88714fd66d1d0742189bf06c155e1138ee5314707173f7352e2cea0fc26e1553643f249"
-     "0428718e44afd8372cbb7bf5b88234318ebf4355",
-     "2b3d641607b8a141f876f6d285ee46aea543880e772dadd5dd83d595b9643191d9597218"
-     "e1d6adb081df133304037bcd2c05c24a54e6c4cca64fb2cc4569d6882315360059496d8",
-     "04042f2bffe25142ac6c1af26643b0f1c317b34950a8a0f112a0cd4ea4131303674328e0"
-     "bed5d9bc7ffcbb9712387cf67129365b4fa8a9e785b787c170463b24f6a7962c1e003c87"
-     "320070962ac4d3220f367f18caa7ceaadcb82fdba45cd2c034a97aab71f7f7546c09736c"
-     "b080c10d9a95a5f984aa4a3ed32d22636a7b3d5ab29c86d85db59f6f17ba29eb220bb141"
-     "b5",
-     "23d7021f5376e7b11be07288a0e47b4326c026df80d7e08c9a0fff11deccdadd479dad50"
-     "3ef2d4fa3f0ab2aada604b57fa7e09dbf5c8d493070b5faebb27cf68ad0b78bb6f3a9aa",
-     "3059720e7a2dfff03789e7a514f75f2af5ed18cf1568fa2a5354dcddc9d3c7a90605e9b9"
-     "a3d0d6fbfebddd615cdd52845ff922873079e06c4f349f7798410ee18e0c69045193668",
-     "1cc40209692cf5f8ed8b82372c95033e4199d378a28b9edcba516820ba21af1bcf5c5df2"
-     "ef4146b91fd37dff89ec8f9962eecce5c5e285d76a5f03eaf99fa132e98cc40ad66c296"},
-    {NID_sect571r1, NID_sha224,
-     "25155825fc4f9a1c4dd1db837008e7e2594a879052431f5bfc76d0d2565b8fa726008bef"
-     "aeddceef73f3c60fa2cdf6d9a70e56d27210bd013034b38861ae49640ef208d3fe294ac4"
-     "362f8eea44f58af3af8a9167a36b5acafb7ec95652d5885a0e08067ce1dfbb45a0c89ad1"
-     "acb53eb404bf88fa5c3c463a0f912b5a2522a0d9",
-     "1afeb5ca87c81025ddf09c2b2c5ee22ba0105c0e619b67a324467485bd839030d149fee4"
-     "4d8bac6f5902a1245a50c3437046b7c89a84116b2147cddc645b6d2fd24d68e8d53bf5b",
-     "040119c46988a79e3ae8833ef096b0a1e2886c4b114ccfe881886859abc031df2b1e7581"
-     "8c82be8c5abafcbc5d7b3b8344e98e3f413d737938845e6eab5aec7e507f7baf0d339a36"
-     "2f03190912dfb5a1a31fbbbb50784b18051489a3cc0f44c42c71d3a54886ecf40507c324"
-     "0395e8ced37b5253b915fdedd38f75bb26df2a0a8edba865f898a15f2d96f632f7f06388"
-     "64",
-     "1facccc127c856db1994c4d9e9c76de6bffff81a88d7aa0ca1645e250e07674fba734479"
-     "11c5b47a1aae815d5e96164854636d3168d0344b2d2d913127011b6434d5a5e545d3bcd",
-     "21da49326f39577ee9f65cee64006525de88a834365a00f4f8cfb9a01dcfd6349a3d06bf"
-     "95990a2c17b7e95cc0589714b7a795c7016b29bc844ae9031488ca354548976eed68415",
-     "3364def38a8ee3116cbd971794c859776107154234d8b198efb19655647bb9228c7c6be2"
-     "e703672f795ed37481e994b6764d0b7c1bbeb2bd1db90b34f460278a54bd480bf4e9adf"},
-    {NID_sect571r1, NID_sha256,
-     "29acb0fca27e2a10d7b9e7e84a79af73e420abdb0f80dd2665696638951b52dd39ca0281"
-     "66b47a3b6a2eaeceb1a11c152383f0bec64e862db1c249672b3770909f775b794e0b9b28"
-     "a5ec8635a996d912d837a5f22471b40ec2e84701a8804127a9f1a0b3c96ff654700bad31"
-     "67240c2518fb5dedcc1be9f56a807083e587bc56",
-     "32c97639b69c7cdbf419286d0a1b406d9b1f2886521a8b979a36118d2a368aace5b02dd8"
-     "c515f2041e6fb9f026d1e82e789dc826a56d2ef732b1bb0f49be2b696ab5d3d5694a2de",
-     "0400087ff1d8a4644edebd43c2d43d49e140940d215f272676fdfb72ccf58a12021de3d6"
-     "68f2766848044ac404fb45cf6e18fc6700f87aa53b4fac1e35e1731814f8a9d0233e2942"
-     "d7029fad3638177541d8392111064837bfa77b4455c21c5f7652e3fb302f4bff4a35b74d"
-     "e8aff3806538ef9ac86964cff755a81cb3002b6fb241ffcae8ac9621b8e034967d650836"
-     "ee",
-     "16a06e3d25873f6dae16bb2e569720ee9c6ae7b5ba36854c321a80be8b4be502b895e1a3"
-     "d161b001f6cbcf53d164b5485d8a5efa0476f581f9c79b3a291025be01a435e2fc5ded3",
-     "347138a43f3ed1a1a26f5f11549eb8a41f64aad302b6383879886216ebb6d08a4ce270d0"
-     "7a5bec6018eb313430ff017c1bbf78556436d9255e97aba1481f0f16b85e7320df79d69",
-     "28f35e1aeae288122b043deff9ac87d39478607da60cc33d999b6add6209f452f631c6ce"
-     "896afd92ab871387f5ea0eae5f6d5cf532e7a6ab44dcf44acb1fd1daafaf1ad5423d8e8"},
-    {NID_sect571r1, NID_sha256,
-     "c92d67cf6536f5046e15b02158da698bcbba4ff1e4e9e9c882cda67f817210402ef917ae"
-     "93682c9c3dd817b21b73c6c00b7bf92ea80ecbbef2e67f4f4379d078a2b0f297742b2bb9"
-     "c3fa3297a7e8079f488555bd37715eec92b4b1cbf897640ae8a1d2a0fbcee5423ab31a37"
-     "629f98630275e35094a896cc574be0a449bb1bc3",
-     "0f93672159276c5a293582b9f49607bbdb970112f6c63b2b3b5d32ad3c8240c86b1af13a"
-     "8dff6502c6b6a17712cfd988f8cd23a60693d64104143b3f91adb37f852e9e11a0ef110",
-     "04019dda59a839aa2ed28f69a62a3e3a753c6fc789fe0d8551bf59095f009d0327386e6d"
-     "f5437846c6803df2442e0359a367d04f117e3965397576d4287398b4b8c92ad278df4a44"
-     "7f04159ced60503f7cfcfcd587bb3608699f54693068101a838d575715de02fff81058d0"
-     "25dbdda430e176f60e423e6fcbba889914f6409ce51d51e89e4cd7bbde6d24404e5b043e"
-     "79",
-     "10dd216d4b3da2fa6a75de60f722f1f128776741cba002c055d1445581242a175318291f"
-     "ae313eea11fd905b20d26cec845f57a3d5bf23ae4dc93d886c0594f1cf7be4f59f3e3eb",
-     "128d5c00a48c7352eb980d9c80781f8abcfdc1ddae415b7ac94b4d85c3d7d4f7316e2b33"
-     "44ca50c6ae82938bc728e640e59e2d733f0c7f7025e66c15c81e98a845c1ed4843b589d",
-     "1ab59ce5e54bffc68fda96c920b839fe03d1976ab36978bedd973715ed631bfc8e3edd10"
-     "0043ac527aeb5ca121da848bce4ec9799f55b22454e9af32848943058b257e815b04056"},
-    {NID_sect571r1, NID_sha256,
-     "15413f614c4551e3b138b64f66d15f8964c40326a42b0afce820778eee4a88edb127fbf5"
-     "75da5263e5a2627b5461d311813ea868e6417615e7c4938313675009caac28bc7a2f4c0b"
-     "c37572d9bf36a3b1794294e09c0121ceecaa4b916df45b0dd31225415e6c87cfeeb092a0"
-     "08fce2c543cd62365779ae28f29fa02a15d9dcd5",
-     "3db080bc99c5fe7e06d5032167af56783cb423fae59fb5b3c6bce5fbedf56b7b39b17810"
-     "e48ea9a172881aa1f42f5e267349b60294d4a208b4437666b44abcfee5a1829e9467908",
-     "04059d1b3f680da784b49dde3b361eee819d67339447d7bdf7965550264eb63bcc7674b0"
-     "921f02e15d45466dee52b4c0a50c2bbbdf226af1662086476a9eb1236e3d4c2b6219af1b"
-     "db04e3466200dd6ecbc268cdc1937ac5123cbe33f32110cfdb8b7536987ddf5c9ef2464d"
-     "2334f315b9b489cf227a6300b6e054fe40d36c057a692f2fd3e762624069e2adefb65d24"
-     "d7",
-     "37fb32a902eae0c5d7cc9f9018a5d1a906a3d1b9adf5bfb696ff63f105cb2e736d9bc196"
-     "1677fc897fd3a9e9bedd370be6f25a03fad425b5a293c66180df78db33aec4a188d3db6",
-     "3aa8ab9fc9073429e52469088aea91f00cfba271b9dbb84818460883effa0c51d6a48c19"
-     "05d6f58d1312af073dc8735c29957f30324b467797acf86e028410de016338b972013ab",
-     "198a746411333172daef76359e7ad23035a0f5d14c283cb268828bd876b96b5f767e0c1e"
-     "2796def7a51429f39ab2332ac25d8e4f263f8dfb9c4c98da2ccc398fb3bb9a6b28ca28b"},
-    {NID_sect571r1, NID_sha256,
-     "9f901557451ae2f8ec79b6d4adc794cbfd9b2e6d28f19409532d91682820205308b41498"
-     "a4e1ca247a2baa8da93de95e3c0f7afd6ca46bafdbdcc6d3374a12684676a50988b86a96"
-     "0a82180648c8c1e38f8fd9af604c7be3be4b24799f4544ac96d6360cdb83d1d0847fda21"
-     "642934fd6cf65385b50d86d4656987901fb88d0c",
-     "06ee767f6f36bb8f364f324d8346455c899a49237d759003dd52cfa13b9baa4c71347b13"
-     "4b24ecaee32d247c34e3787a0c64bc5d299b55c86f64b47521d22f2c09db225b0c84cc6",
-     "0403f971125860f4598fa310eb7a8c6b4e0c31bb721fdc17ce6df9af557beded6006b8ea"
-     "b10ebe7f3c4f3d759d4a87dcfc1fb767ef87beb1f5c845e3f41503a33b28b2b5aa1644dd"
-     "1a03296062514d4e89d2105dda5bd65a315b9770c45afe4050d8c3d15001405b1e32be58"
-     "67ee90cafbe4e239dd44d030b4fda855182f1fcf80963c1300cb842459aaa8c282737187"
-     "6c",
-     "2b247e2dd0024f534ed2797110df6ea4ba166c34d91c94e43b045c0ff80f124bfec1cf3b"
-     "e3da7c58389d352c8c5c1bc2a2e876a7e56301b1e688a085ea0222697fc63141564365c",
-     "2858eadd14373aeca65ee5a2cbbaceae4b54a50e0941a696406dd86d05c07c5599379c06"
-     "6b2288d01b2a43c9ae34bcb8c36f59d490aa8d066fd3d7e539ebc620a7176507ccfb232",
-     "33c20d26dca20af2c56982fcfa6f085bc5c317d01f3b1dfe0ade1ef6e3e960b18b626d17"
-     "d6696c936f04090ecd9606c2a6ecea1cd1883bbbca8b3dce3b0acb2688fb2834aaf922a"},
-    {NID_sect571r1, NID_sha256,
-     "959fe5a19d7aea2ba611c7203e19f8e3f3cc101e03a98f91adfef602c424c580d5a86865"
-     "9368a930f9883d699fc633bd07f6cf8de474937db0bea86fa7cd140ec2f202663813033a"
-     "757b93bd72afba15be5e47a4eb93e8a666aa1c72c241ca3922547d63fa3732fec54afea7"
-     "ade84302e2f044275bb67433fb6b125b7913143c",
-     "38e2571d9f22309a636586d62863ed67a70538287f3ef88b88c3c2fa1a2900d48c342b6f"
-     "15c26b8e7fb4875cda4093b7de7ceda48fe1e2cc2975afe958040881de61f309931e48d",
-     "0405a221634ca85059543e2caf8bdf79c43bb78deb35e9c89e07d553bafb6b31750a1d85"
-     "ffa7689e528c11d8a3dae442b4fb2a4a21238d636eb04ccc04c8b5d794b0a213fe0480b1"
-     "d20225ff457b6cbc12d152b08025cdb7e1e921ee553add9cbf83228d678d5a9f5d3d1fb4"
-     "327a74c1dcb5d69a5b98f3ed1aebef0af09bd49d253a903636ef5a66844c500fa221470f"
-     "2f",
-     "3b4de49d57040141f3584ff596eda457e2835085d350b75391d90abe728723e1d1ac6413"
-     "979d4fc3eba98d72a01248e6510c722df15df876da881ad50539e4248facafcf311b464",
-     "00f259038b4d3d036bde101aab29f4558e88e604c62f967bc7a35eeacc6a56294268f8ab"
-     "00a34f9a0319b07754f502c98718e8b5c91093cdbff2c8496fd63d6fc2c50a35f87f423",
-     "2350d5406922e8822a91f7c95cfe8524f017a14cf7174ce534c60aeb351510d06ac20dc1"
-     "249129247b21c72c14b02b710c26c10899bcf995143aee632e294176e903645b660e998"},
-    {NID_sect571r1, NID_sha256,
-     "97b9688d9ed5101b8cfb19e84b89cd644262ca1c7ee18944e29ddd3b4cca78e06338b270"
-     "385b00a5e8b91ca5e628de3bba50e36ecc695b3ea737a9cf8b36871c473a54ba17819f49"
-     "e730c0f253b0c769aefa6c16366fd2dd612f330e95fb119fcf3bf7f3e254438c0ab635ec"
-     "04a8b2424a05b483ecf65b74a93636fbab7bf1d8",
-     "0c8f5736f1ae65592f3ca850f43d06441aaad8c03820f3b08d8a6db46488dcfb828459f8"
-     "b3f34af73cce8dc7a5e3834e085a64523d890028e194214cef4003210e6eb530005b01a",
-     "040667ce3db45b8772f717ce20755ffaba968aa1314d75c84073042436823fb54bf8dda3"
-     "4a6bb45a61d610745b1fc10eb0eef71c4f55b26acceb442d822d6e2a27761c73b740f472"
-     "89056035da1adaae894e361f5283b3ea07b7d9f64a298be11de9fb487c2479b120381f1c"
-     "60cefe5d32d37e4644ac86a170f82b1c4443eb71b940b21c7a016b559c6c79835532c276"
-     "fd",
-     "190468668989a607a3aa966cad071ca8e8eb152b0dfca9205bc9417a3d612ca1105c7b90"
-     "340b04acd96a5223658adda16bf6b598ea9f32a2f8d1b61c2c2bdc08d6a49de246240b3",
-     "291e1fb18edb7a93badd6fab6f56ee0d390f3b6d298e97312d5277358511fc7621534ac0"
-     "35f3518cb140fa4ad5ef7d889c0d5f3f52a4e4d06bc9f647f99695531f85a4b76cb1184",
-     "2d916734e02b0a98406bb5a9723486a7ed40bdd0b39c4cb802af4bafd519803d23c6bed5"
-     "9a80c256a14eb878229942f67e0b8159d5cbf24b719043171b3958fd669adfc72eb7289"},
-    {NID_sect571r1, NID_sha256,
-     "f08b250bf4a3980cb455338b3f4173723b3f44c97bacc9cf550149794a71426e398cb4a7"
-     "4bde141d8b7b4a72942f1c069676a9918e27792cb8f085ee037c78e3c468adea5123c4c6"
-     "4d8ca6a39f2f90140c5d2d80b669cbf0d1ccb466b18ded83a1d5f042c36188a04111c34f"
-     "f769abba9aedda40a87be1e24b700225e2078056",
-     "1ee68c3994adaaa9e0d61bfcd3bc1cdf198d3fbfe28a44e5dd518867ea04b20e795eadac"
-     "c48bfcf8e8216dceeaa069b756e8e99ed87b6b1d31154cc9310bc3b4555162a890b0c6c",
-     "0403efc83ad15d9bf889c9afbd769bdd1dc8925b0462c93868d85ca7554b540d8c3ef7b9"
-     "a63becc85981972eee8a70b7f948098ac050ad594ef2ec249cc3b557844bae9cb2cacbf3"
-     "97042a012b3a1d9e46cece4fc3460a2bedc9af4ce0289e95f69550eb3544f7c105b5769f"
-     "a52234ac88f9045ea5cdd4937664846d26deecf511ba6996ce4072e763e8ebdfe7096608"
-     "88",
-     "031df03a6cec2346b92d9ae7d3d983edf577d9a1bb88098f886f38536d8d8cf25def5772"
-     "6790604e674d036cbcb864bdedf8475ba9c850d510ef93b844c037e04348d5f48098c20",
-     "112dcafb63bb125d9610e59883df481bfde43589e46656b5952cdd72238cfbcfee79e916"
-     "5e3c9b89c9ffed12d303225ba2af19e00048e20e4edd3968807e4885003d148403321ef",
-     "2ded1456df54a24214d8c1d3fb314db52b046ca31458bed69bb3aeb6a9ece509ee521fb8"
-     "046ed43accc7e605440a09fd96db659c98a7dd606758c0c47e47acfa326b9ed73ba4b28"},
-    {NID_sect571r1, NID_sha256,
-     "1cabd16fc29d7d919622810dc8b23c770b790b98b119eeab1b20900fa94fc2ebaf76be4f"
-     "5eea91fc5276c5621c8677d4d117c4a5a782ee2ca1d5b0db997fdc8a05b6b3fbb833d7a7"
-     "b81c3c615c2a662929760a96feefcf89e46b563314c9b77c86bf34438458b43b694ceba7"
-     "41b97dfcdacc0ed57652ae62856ce10ed2690770",
-     "3a6fbf66ebc1365ea7699c72cdac2dd85907ec59cd26e2d18713354b619ccb83b7fc0db9"
-     "193aa8493c1855f1a83fd987cbbb65de17c59fbe79256aa5392f4eba045346e9ba26592",
-     "040559dd556241f9b11d0f91c5458ef6adb783f9f5051bc12cac9f0b214f836f7b149d00"
-     "ba8218e873410a50445da9fbf68673f3282d783988981fb221d0579341892ba6824e0cf4"
-     "a5005dd0e594ce41122882538e51e9bf29d159fcbb8b29b97c5546582390ad5c59c97527"
-     "1c58ba1e75d70c3898fea929ef7316ee830eeefbdc69bd80d7b0e8133b977cd573a3b422"
-     "ee",
-     "1c5a193179ab859ec1166575007c3cacb30d31f341a0e82ed6d4ddb32da909dce08acfa1"
-     "0fb14183258caa743010fac6f7d0fb1f8c8f55c246e49a97f2bf571129144c23de8d68c",
-     "2625d0bdf37396585d22811a12ae7e0c3f512ffdd0bf4d048379434af46c03c6067dbe7c"
-     "271c417ac5307123bf58a9f2064bd2b3a2d4b4efa3027959bfe63e13a851f46a21da6e6",
-     "13f16b211b314a7e9918f3254da2f1aceb5340713985610f03ec1d0a33ecf9217d61076e"
-     "b153d8f27aa31aed3c9b165be52f8d857de362b2c88db5dccfd708a996a46b76b4ebd09"},
-    {NID_sect571r1, NID_sha256,
-     "7bc8bbf5ebeacf40b3c82eb6eba5d994dcc6a3f2e12ef741f90f90e176d20c21e006ecda"
-     "f14cb5beef35bff46b2c374d9ee224516679b1a9e9255cd8ad8e60ed234f8ee7e0fc53c9"
-     "021488158217d4b4369cc597d6053746efa1e73340bdd73c1bd2eed57b92426fd4d278d6"
-     "a86e8be0f0a66ab3dfadefca8831b2f488636251",
-     "145748871a0b5c1cee628de04a12fd68ff2b154fda96e47afaa96389d66d22802968584f"
-     "6753d36618d49ed205260f09d3f5ccc2b27a34390ce58179b9834ff92a86d66ea0a97ca",
-     "0406cc7ce2782dd67cf1fc16f1b24ae46fd085b969d936fefc409a9bde354cfd33a154a3"
-     "113e837cfb88284d75a96f5fbe85274fdd0990af4a033a6c40b904a5e0f666e4d8b8bc35"
-     "3207adfea166087502657bf9e2c437beb2f62dab041553a06411f6c9dae83a2a2749a4e5"
-     "a2a36fbe23d40816b1b8d206b9f5cea20ef200b9150061ca22fee2076e31c88d60a006ef"
-     "4c",
-     "26c820dc92f97dbf545f51db7d5ba649333dde38eaa47d8a7edad9a3cf3e6780442db234"
-     "632458ff17e1d7b70019916708c128601ff547ac84dfb0173cf0a3c5d69ac96c3d7d395",
-     "338c88d1bbd0b93f3f1fe1ccfcbda65fa1667ec471730a40eda87f57b3eb63d979d8d6d8"
-     "19b974619799c90b09f33c051b8b522c3a1acede101857265ce1b58cc7eb5698049f494",
-     "3637bf89f9b66c7ebd8f91a8324eb70a510284b39f0f2e45578f26f5f1e4504ad70a3894"
-     "27f4d58960cbd918c2f8279de52096e25a1b0b0c3929fd5ef56bab6cde7c0d8e9d2fb30"},
-    {NID_sect571r1, NID_sha256,
-     "0cd2a45392871c0c262e7e6f036946354bb41f9c2187b8c4d399231280682f3e0a09731f"
-     "bfd52c76ee63b9828c2d731f4cefee0a8c46419c398205b2ff80c67d7756db300a0a8385"
-     "fa287dd37d9126f75998ae1cbab5136560592118db52fbf102b7ff0a1ed45b8a91a7d99d"
-     "13a0f7fd4366392264aa1248d7324901467457ca",
-     "3c71911d24ad19c20fc1d8a044d63c9bb417abc3778d7e6234c6af79b898cbfc2f278724"
-     "4708d2fe203be786edbdc4c9b12b413156b7b0bab0be8af895d191d853cd58aafe1ccce",
-     "0406cc47aa586a73acddbc91398ff5782457e6da2b10e265153c678789d3d7fcfc485b03"
-     "b089eb67e6d6955d5c8c7ed5f933d84853576e76fc60332e5f0a62c3ab23690317bf1b42"
-     "3e015604d94ab9f2ae1d74fe46b1a070160513709de2ba8e74fbf9922e9bbe7f6e743b25"
-     "701a13f73eae0db0c98dc80c5f8528e16610fcf18f60eda3357ad5878add2554a6befc9d"
-     "39",
-     "3681fcc5fc1f0d7d413abf2e44cb5cce9a4a252ec449ec4f550df4a172305eecc072454e"
-     "fe2040aabaf4fee58ed19c9090061d3c4835c5fec38996f013e5512c0147cb14a4f0fe7",
-     "0d3c26796bb86b1a20ed4935bc3824bcb9742513ce91a66dd523a3c0d8a5abe63488aabb"
-     "806b5b113e90d3f3c80e3ffa01ad051e6b0d4edfc641689953ed65fafbaf3e554be31ff",
-     "2e3129ff95b06c274f7ac08882dc1da6660269f3dbd21a3e48377a628f6d81326084bbb8"
-     "d32b794fcbde8e574f853636fbbaba480fb36960b0994210bea319a99a46e29b79217b3"},
-    {NID_sect571r1, NID_sha256,
-     "e97092625b09c9ae6e152e1cbee207d83361f34cb9b0e727c816a5ed851f12f91fbf88ad"
-     "9d4c8f9d07350f5d828fd8574eafc768bc72a2b18aaf4d2b48fb10f7c3431137b5185015"
-     "4de9706487d69a40a8f4cb2c799f48c5d8f518aff752500de93cbb94ab04ae1e0c7183a3"
-     "2d79a27291dd07b5fb6e6a4fab76e85c3a8607e2",
-     "18bd74698bac36ef11add6b3e3fad227ecd868f370ec04569462565d2f0af2340bf79348"
-     "6953a7b79ab04f0ab1f0e4fd16bf6b576cce677d543e73aa8edb0e50372f24ddfbff966",
-     "040231f891e63bc1c43377faa56c5799eb1c877954ca2cafdeb4883ae40bd78816ca5634"
-     "f48f5ef5c22dc7d3d0df208bab4149815274d7b134cadb700d166a5e3fc73e9be1bab725"
-     "220469ea29ef860adf24afdd386347763008ef6fe2488d902c4d513bc0183fc52742782a"
-     "6fe500d6b581902ccd4f9bf077f975bd5fa89bf240723b99f726c9fab4f953380745ff9e"
-     "17",
-     "1590570de563ea96eddd900e4a0a7efa2e4a0b389854e96af32bb7555f098a8cb52d160a"
-     "bcfbde65998c34f91338a40d40cc03e4a9a241d3b16b0e893d3f7ffdbf8912f35c7f538",
-     "32402fbee4831b16d762ea2cb218279f4db5e20bc8b6e2e53e89a2ef3646cfb0abbac361"
-     "16c8c708a1342db2fa0abd39d149e09db57aef65ad8092f37f7962f98c28331f0f20b64",
-     "2d1e38f40965e2697abc7df5896cf051ce5646f135d1ea0bb470a43250af8df0abf2a04c"
-     "a1e0f1f31013025b4136a8a6bdaa474bf50752c571f883829bc3a5482ec20e2b4a72c90"},
-    {NID_sect571r1, NID_sha256,
-     "ae6723b8df5d6ab5fcfaa22d32fdf106d211514cb1892c7c43ca6cd85c2532f85929c8a2"
-     "59ed251215063cf92e1502528d1e22d5cf67efa0b8ef21e8eb2f5dff881ba1433e8bcf2b"
-     "6af8742ecb2bccde081e534615a305562cc22d3398f61f277d8ca785842bda85d8a40438"
-     "d9bf1aceaedcfc22c85533794a69cfc320931d3f",
-     "335699bfd058ee2e6163f55d1816bf3669acea8b73be9c4ddfe775230925e6093cff7a66"
-     "813adf22222c8376faa106d85ac9f3c67929bc58d8986795b6d35d5b9fa546dceabbedc",
-     "0407995e02dd3d40f9bc2e6f4cb1c0d29923c9022169e64532d1b357f36264d18059c44a"
-     "8617a6f1136e72648c9051a27714a0dc833428762275a1b5635a3ad91e65d2713236c20f"
-     "5006167d5839cd4476a638c50db218979a93da44dbf97281d90daa8b9b530960c689279f"
-     "ff6c342af97880db1e9c5ae57b91d7be727fd1c6210ec59416d1b675f4dd666e0b121d14"
-     "4b",
-     "3f037ebe0e4c3910953e123becc09c0862490e7f590245c4cdf9ea5fce930a7d7ca5d17f"
-     "5689edae1ce706b90efdf84cd82e06e4ab95e9e2368db91d50110eb91cf44e50cdce2cc",
-     "2baaf025290897a5d68c5e63543256523fb086a6f1166ddfd3d50fb307e0f0cf78b5fa89"
-     "5f8b71944a7b67b8afe5f3e10f2d248aedf573860c42cd7aff258055ee7cce472e8efb1",
-     "0f4d239f5af023ff6c94ad7f66d43201c7e40262cd92467c4ab54be8d2b8e6577d143750"
-     "64fbd00a6327da62f03f75262392add0ec119d820205065aa6238433fadc8d1734b8481"},
-    {NID_sect571r1, NID_sha256,
-     "ee20c6b61886e02ed94359dff3559522ff550ca126fed4b2240ea7d999a182b7bb618c50"
-     "528fcbd261d5e497a991fbac0cf4c105c0f664d6a00a9001c1ed522962fb44dd4159677c"
-     "e8f1531019f86457c055c9cea6247086cdfe0442485cbbc4386ad002b4bd39a1a1877524"
-     "37f04569705cb7adc0c68f0fd059d946deb63f0b",
-     "2c3eaf801330b3f1b0504f2399f1d24455db29911f750c246ba0a134c3b59da8b3562911"
-     "197764699a92ea1d95a2aac587e24f743df1dad3e1cf7edf955203e24a0225717f8d2df",
-     "040703d69e2dfb13fb6e695b0b30b31d89c8789e8523a7eea15673aeb4f1909192c06c27"
-     "558eb55f0315f395b1f3ce84d9c304905cfda1d119bec33af9ade4420de2edbe75cc5460"
-     "e3075e35b2d6a8550969d49ac5d656afacf68d3a1dc6d17666f46ce3413c855b627f0891"
-     "912e373af2ba91211c20f067d66056e6bbc0814ff3921d944008b25d8772cc8d696bfe1d"
-     "09",
-     "0a9ebaea478893aa0e3bbfd5d007bcec5ad787d9bb5a8e9b8b79865c584966f0bf040d36"
-     "f62a8e97c123d2adb7f38eb49a86e9c2ce1294d04fef1b6fec7908c4ca1a70bd1699a9e",
-     "2d495eb5f6fb187a0ee1fa772ccefbb969e854abb445ec19ac3860f40ee65f53b92f6a79"
-     "7003574bccf0b9de8014ad4e5745ed264eb3ae88040ef6518809b4c66f691d496a85d51",
-     "1840b2977ff137f2a8f2f7c25e347cf1262fd128e008e30e4752315deb5231098c65e9a5"
-     "85496a9d6b5b56cd0b6d7dcb7150a077fd199be2d2de0262aa84dad414e100ac6162346"},
-    {NID_sect571r1, NID_sha256,
-     "734a9eb8288e32f5a67cc1d88704523ca2c68b798d90e188d871d9f50d2da2063baf1ee6"
-     "685c45832a1818aabc9afc0bc935e97969dc983a484f16d2bedb3c7c0b8221408be2480a"
-     "5562d5d1e5d8763d1e474bf2826aa93a68c3b870e3bf34f4941cf590d88e1f5a8cd782a3"
-     "3992213f3f6b4b4f6dbfb3c3c8f21f5eaf4ef609",
-     "1c3ff067497e5d387f31f0ecc9c67b3c0dd6ec8c81318c492aad83c9dec6c99e4fa47447"
-     "f6f7082d636c2591d0df940b947d0a4ae3778e2b7cc8fb92214638399def894ada276b8",
-     "0402e56655e37b3e753f35eedca95f8ec07b7a3d3e14e365ec041cd9003bdb78a7a8b8ad"
-     "277a67da5d63dcdeb0ee8d8efb68fe61aad9b1fbef4373ab13c44efacf68cc499faf5b5d"
-     "be047bbec643d74874b77f0fdbbd2df3f3ff0d35f4b3e1534b2c4d5c76b8cc51693a70e1"
-     "7d1d4cd64713c5c05966c826458fb5411ac840ab5998bf3cd64a0769c3e075259a70aaf9"
-     "4d",
-     "149848f4534eeeb45fc38ddeace59e8f83f0bfb4cfcd2b8b7acd0bf19303051a6a8fe75d"
-     "4cdec1be036645beb075c772aef4a58785c16d984eb43b9b0317446bc3b3abfe7ec2cb7",
-     "17eb68556224f995733077501ed295088cc1184fa3872f5f11e97cf67c7bc1febebd3120"
-     "6a406c4479b60246a517cada5859d4f1aeb98dfc108e96e9898c6e71e59e39b6284895e",
-     "22904497dc7a98fbe117e4427d74f4ecfc4e14d4467c99227427e3abb8d3dcc406f3704a"
-     "7783d822ec1118a1d91d5945d5b902a2ad325bcc9c17c68ddf8b5323df9c2bde392710d"},
-    {NID_sect571r1, NID_sha256,
-     "68e27cc72fec8f3f1f3882c6efa08efdf21d74d13be5171da35ef2855666ad2ea6919d21"
-     "dbc1cb6d296663dcbceeba2fe47a2c6507d3d4a67a61b55b0f81c93412d7e1fbe15a590e"
-     "342a05f55daa55f8591171303154e615e81189a523b855829a5c96621ad118f522e397e2"
-     "eea05c2603eeae6e3591215e29b2289bc384d8d4",
-     "04b4e04281b210fe78d516a5b69f878b7fa058941ee9ae8cc63b061d1eb9e12c3e0ecb87"
-     "17ff4623ff5bbbcdb53c48adbd9c69636506ab929c5507d7ebafae5654aad65a263e48d",
-     "040538049d071158c62f0102fb664a47431afe320474a173463819d5f83f6737b43880ed"
-     "378470d774d32ad59cd9d75e5bb06b118f1297af3f6fa910f40aaffe11e46cd56cbd29aa"
-     "5100a4a843af9841e2427357bdf26817656637bf4650e443ef303dd458ed092dca3cacf2"
-     "857d10aa190c256467ff834bc804f8557f6c3bdde89927a5f2bd55bb9d9f1f08a044cbc2"
-     "08",
-     "1191110485f56335f0e65fe04b9ad8fac1c3573cb4690db3e9f62086312d394b0e354890"
-     "c0f74e3df7c43e718ecf18caf6904e03bd6c0912f906de1d2bb4c49823bc6c0dbfe37f4",
-     "0dff371ac365cb7de248ddb2b2fdee624c527c6c1908dd287a294bb43a4be94c130bfa83"
-     "710b0655f21695dd91703acca64fe2e7927eaf9c2b9b230de8002798224f9505379bf34",
-     "2f30f31c863bdd68fae16f97fba756e033eada18cb0a23d7d4b2c9ea3c832e61b52185fc"
-     "d654d9eb281b92a9b102c3b17ebf02422a0e4a7a56a73974208371ef65434c38f4d7d1d"},
-    {NID_sect571r1, NID_sha384,
-     "e67cecedf35058b80787589514a9c81c6b9f4bced4260411d2af75bc46b8b2c962dc9d26"
-     "0dc99ebbf8ee64950766efc0e394184bdc8e2891d66bd3300ecc880e9d6a3d0eb6153223"
-     "78afc3dba89938704e9a8d0c949d4bae9838805c00377e3fe5ec6a1a98ad7eaaba6b5009"
-     "73dac48b26b7fb2e1b9889f8c387de535d4b2363",
-     "30f2849a713aeac95fde5ce3af853e9d070ee60709eccf35a076567be2c43f0fa34420b0"
-     "fc097ff577221275a3a56e759efc32183be2d76058a7d20e5dd59f00415114d73a15b8f",
-     "0406d4ed3cf180e0e307745faa49247f269c3fa0a69042b3b78ad645f43eaa50d479622e"
-     "27429a6b6b1889944f85975fec8018d3321ed38f6c7d91f2efc98467a027ba4a02c7f231"
-     "b405f2ebf6abf7d53fa32865a9b6ada9bee51c1fe26cad74dd6ef78f13872f340d641700"
-     "31becb5073001fbca373be4e32ac3425d705ee942e6c4e639bf72379e34776680a387a0c"
-     "6d",
-     "0da9d8647d0950f558a3831b47858168b3379656e603f2bd44046ac7546892d1a7318c5a"
-     "9873c6ff85683edd3881a0f1af5501d17939f0825ed37bfc9a2d95faf43d3be92b237ef",
-     "0fc7eaeef74806606fe51882c6928a06bf552d18dcc4d326d44a540abb728146657048b2"
-     "0e5fe2868beb5f04f32d43e9ac23a7f22c6bf325bca24f5e3161c868911ee61baa8a3c6",
-     "33d63693268f3762635373fc901fd72e525965ac17e2cc009177f03bd3524107b30e4c6d"
-     "80bbc4f87fb1f288ed56812994541fe063f1d91afa7213bed8be5693dc6c17ec9a0714f"},
-    {NID_sect571r1, NID_sha384,
-     "2baa1ac3f07e34b67b6af087400f261e138b070c8475378063286c16fa73578303380236"
-     "a4af2484ea01ba56c1c619f6ae4e5e6ac2594c8e5aae7e7f196f96fc5d0f507bebedd4d8"
-     "18e77b9120e5b4bc01c7ab6339e88b71d0886631cc7fd89659bf513faf149c61eb14d550"
-     "60c8dfc7e6e4c2b4ec8edaaa6bc36eca50a6feef",
-     "2ebb73d04e6e5361e20629e3ad119b33db5163ed91fd9a8aec4b774898784b6822a08992"
-     "118a8fe6013094bad0be1e9bf01b27c069e4335bff7e0abd28a10443818f6b825e9cef1",
-     "04001710eb0167e8c948d381e3a75aa1e036b70c414f69260aab434ee20b6724dd7393fc"
-     "487b5b3822e5e8065b06d0785a4a7be7193352d5b9eee66755ba106ba6e40f98a08c730a"
-     "0c06006f98fc25a641a7c6e67fedd37aaad77a9102be3e1e7d32dcb4c68029e623a42f4c"
-     "a7d1ea725bfd475756b80e18904107c460fc03b9bd68aa46f9dfbd60618670c4d9a68a32"
-     "87",
-     "1861e2a356a6fa8096418cde7fa17f1b893a7b63810f3fd807a82bf4c745aafdc4963eb7"
-     "a0ad0488a776e915b64d2b684e46d244703eb63b77835167908f2d6b06a2ed7b53f0717",
-     "046688e12d26cd96bb05d3f418d8ec34f4426f594acd2bfd8e9abd79405e612d60737007"
-     "440424bc4f546c54b7402d11880f68edd996f49277b729450f7dda5d05986b014b5244f",
-     "341a80e74f3a69b966ef81ae95dbdd60ed5a0446416653c4df431ff7c4b4272665a52337"
-     "9d76725e9fbe196018f0e747100084c823b95d7c7b1785d3623e52e9adbe773b81b49d3"},
-    {NID_sect571r1, NID_sha384,
-     "0e640581f573068d8ebd2899a6aaeed0bf987ee11e22b05d25e88e9a1c3451f45ee3800d"
-     "976f4603c18a041febef07a01086832a6f7ecd5d498d52e796a9d90758c87c36f4a5b704"
-     "a39c456aaee2d5278183d5815d619c193da9fbc427d701bab0874bded848cb4bb066f56e"
-     "119b637c78aeb6eaa387c41bec6cdd4bf7b2061a",
-     "1bfab717d6f6e16d9bc6e89d2ffac7cbe0f808cc8ca2eb515af7ecce5f3b230303775710"
-     "a21bd25c2cc4566bb53c78c78e3774a9f306c751cc6e149929e45eef60f56c1d2388c6d",
-     "0406935c3e8b58f7bacd045e745054c227687800ddd86d6e0c8b1e426f4df0e4b71feede"
-     "fa9172c43becebbeee8ee382a75396fc5f29ef3d2cc55f8afa9232038609b5034513b222"
-     "cf0138463efe3b32259dd90b759062f848deda84f2bcc0d687c410f1ad2dd745517c96c3"
-     "451432b1e490902208cabb68bb872ec493eabdf1f3b07595d23a54c53e512777abffb7fc"
-     "65",
-     "00025bd48e2dbbf1ed8bd9c1514303dc503dd0799c7815870b902249cd1d7368380853d3"
-     "6f7fdefad973700ded1e0d66950181b0aeac73eb622c880571315f09504ed26e28e85a1",
-     "1b9d6ccb19b208022d3a579a66957429682517e84a71be42fd571fbbd0247609d0b5b338"
-     "08189efb52d21e6421d3b08821d82900577791b1c54e239b0d908bfbcdc060cfedaefb2",
-     "3356320389ffde577496c5b46a0de6d53005f5ae3489c0d292c5f460a3b7adc5bd204bc5"
-     "0a3bcc8538e0f8319c79b9024b065223b7ed9b0f211c5c224d363f5bdfe04db97f99e19"},
-    {NID_sect571r1, NID_sha384,
-     "51a2a560ba226d629127ce1ea7e812219ceaddd23561256331458c9f11fe73990f21d0dc"
-     "d974a3773040090cfdc8e0f01692d951a0cbb60f8448a016c67abf46a9c150466ac77e65"
-     "6ea827b0ea7d1e77ea32071ba8314fc8a2edf69008f498bd1c18061d7d00f3340a7e2cd7"
-     "3e9766862378d8702e804a1870b442beb2d0aa14",
-     "00cc53bf7f1cad5e3dede4b4f4b082831604c92dd2b147869cdf1107259305b1d5035964"
-     "7f9f3d7d4e1e608865c65dc7c9ea46bc324dcb8423b554dc369d621743cbfb592b70eb5",
-     "04020187d7de90652caf1210703ef65cada3b88f978e14ce6055847be7127602ba7a5391"
-     "cef0fc9b009134105da7b09b49beb7ba2f961b84e6d66bd818ea99ec106c6e8428b17394"
-     "a60197aef36e47b571ccc0b41f948392d6061060063137d8c3b999ae507b76132fea1563"
-     "775be555616cb5816b9b19e42b34f9673aab833f4beb9d1a0848a4bbf2f6f44cd0398274"
-     "8c",
-     "08acd0f8f9660d21d62f391112908be73a4342767328d3375a8806dffd2598b6d77fcb47"
-     "93e69f2390389a78c2b11866cf0f03666a60ad088d2c77bbc49fff6efc5b7283d02bf36",
-     "1004bfb78dc0e4fc0f2624bec6893d717a476fc76bb5c1d94c1dbf157aab5d1dc80f98a3"
-     "aeabaac94d9cf9e26e1dd172f5d8fcd5b2d48cb3b7f0a4863813357b5cf8eae84478e44",
-     "30b1c8857977181d12c53cc2efc53a427801cde2890cf2ea2c99c6958b6869d0ac78ee2c"
-     "846c241362c885835af49c47d20c30f3cbfab27d9cfeaa6d858694bab059229e30bf845"},
-    {NID_sect571r1, NID_sha384,
-     "90eeecff0a2e37df318c441df220dfea013ef29774ee92a56b213e13a798858f31e52b6c"
-     "cb7599e7314f12b48a89884b113c1ba0526a54f3e9a33c940944319e084bff320cf5f391"
-     "c02c731c4c4f8b05afa273374a1705d6c85337782ba7d36b9c00767180cad6422c11c581"
-     "672ff631fa4c49d41b02481568ec87ea97220400",
-     "2b009530cb9d586e35dd8951ccb686833afb7a37ec253e547e85b253ba999f0f186b6d4b"
-     "a41091615fe57678e9801b4dc94fa683511da25637b2acc9fe60936be15af16234c4ee7",
-     "0405913ab6a2287d946b5b6d1e6c3d64117e085da7cf6388e333cf58d22494f4b067c684"
-     "dca770ddbcea5db73f048b296e9c17284a8912b3cb722d9eaa17b6b1209311fb8e8757cb"
-     "f50007124ac6c48ac56746563db247bcfe6b20215ccc5cfb1d43c923daa07d429c8f0513"
-     "bd1ff1180ef0f7927fa23fda1af25d20b22c935c426f9ccb402c358b57b812516c431117"
-     "79",
-     "27a80a19e9c320b57146845fcf97d6debcffbcae877c33c62aec62a3351ef40bd90ef4c2"
-     "ca39f9e51086931d82eec4ee7870365cb14e9c54ae735069801ef12c571bf1c7c1cf6e6",
-     "1de22c8984c593a0948164e6cc8631489133972482f6a7fb1c3c13f97e4584604930d369"
-     "224850a1d24f267f41bc6fca04ad79326aef61f0d429e0e1b9e9d9686ee10f2bc52b104",
-     "085c6b34687081e280a180cd0c4ffe95cebbb0ad6d3b20a7341e467812f88c23973701cb"
-     "f3cd2bcd2811415d0bf0cd9df229a88754f4cb0c225a2d11f57369a29edfd7b04639055"},
-    {NID_sect571r1, NID_sha384,
-     "d3740cad41e2e365d80ae81da97fdf06d8b6c278b505e34cb683fb55ddc5189da5435409"
-     "14c0accd405dbf0063f6222885fda4b316dad4a83fd03e8d7b7e936f87fc0a5b095defc8"
-     "a4b22fa97f00b394e672d5efd3e0a230c7e44dfeebda88641143502a400ed62e2a51f956"
-     "1e5d652a43d616f16699e875deb9610c77de8e1c",
-     "2cc2d0d7189cc8fb3565a039aee7633ddc00ff427cafad32fd2010b10fe249c9724d9178"
-     "5e7080203626038109158e3a61a3970aa3e51688aa7f5184b22f63af63f80d3540ec023",
-     "0405fe95a030efac2e5d9522680da58606e3e7544a317a3f24d726b69238367d30fa5868"
-     "64d8c143c3695126ce8dffbc7e7fb789f956dbf53aabbc38af988ce50f1fb30294ea3e2d"
-     "480193d1e745d82781ae5c3b3d2233e502959d6862fa7987c6416584504f65639ca76557"
-     "8378b75d3844df179cefdeccff3c4c43aeb8865063e176fd43a27c93e329f8d4f6fd5bad"
-     "21",
-     "02df3920fe4d328315353ff11b0264045248b32f48e860dc59d931ad65f39e97e3a683c7"
-     "b5c64b21c3fa50a9685fa11f49df9b14ddaae03eb02754b01e03f60fc6aef1e5d6d7d3c",
-     "1b91c4217b1580cfab56812c16bb5aefc1534ee8d049aa2e1d52a5bfc11519ff89f0d36e"
-     "a2bfdfce8b5d3cf1527dcf700c0208a70595e9ebe4feafd0eb597e05df54212fd6eca3e",
-     "21ce52440267fb16e713eabb8bf2d502c81939799f9d09cf48a50dce5da999f3b457dcd7"
-     "3c212d5d070056b1f373b07ad06e90d96febb7f8cdb4c423ef946f0799c038a3ee68ff4"},
-    {NID_sect571r1, NID_sha384,
-     "5eb53b5f92121396c5ff30e0c92da48db4fbbdbf27297f9bc82614ab78f7fd863e34096c"
-     "615a02e349d8bc7ae4b0700130704bedf32756b5ee6af10da1cd717d624fadc57a9aa6db"
-     "4a6c5d6254c0e8f8c3c0d4d03c264eeeafd52cac2c1968d9d85b106167a49d0ccdbefb20"
-     "bdc10a2555f8149203af52853169a02db94e5e2a",
-     "3d8936c00c131e38c6566d2464c4e207c878070bbf681695a6cd98cab2c6e80fe98cda80"
-     "c66a5cf584e90a071144dda59c07b8fc7bb42464dbee5b6f739b0f2ee5fdff7e5a4e7cf",
-     "0400fc3a8a320e816305772bd5116cec2795d58633a9f490be8a1a360f21d2aebed6038c"
-     "a4a5081288b6bdb1066307c26897ce38c24f8ccc98a63e371ff6b54f6016917b430c267a"
-     "f7069719c868d8fd25a38a7338811904e3330a7b2289a8384bf24f6dad5312160f0093bf"
-     "556fa061ca5e52d6676a8f1a3e4656740c82d3cddf0ac4f903ea885d42610bf1b45d9e57"
-     "a1",
-     "050da632cd7aa58340adeb20389a2cb9897b8ec944c47e7177da65d9386a9dec5d63be7b"
-     "b2d0f5b4943932e1fd7d87d5d7a80bc50a63dfd101a6a28005c894c6a6fa4c652dc519c",
-     "0e6152b9050127bf306662f6beee81d024492b91efe87a56e70596a4a72cd02dd2f10b97"
-     "0c9a69909f85bf4783dcd3c32505d7c148166ab43b503ab098b6d95ef09a7932359f60e",
-     "1f7d68d53ba161b61eeb17139eeae1587a6bd148e288c1f73a6bfb3a0d1f6dd8f9cdc27f"
-     "a9e8c7a681410500c097ad01f320303421f1239b4a9c4d5446562b5b3cb2fc45a6fe239"},
-    {NID_sect571r1, NID_sha384,
-     "5aced64f702a57ed7fabd045a40c967a485d2a70b0a5e82561d5141ef329469b2da5964a"
-     "34df203a980111a77adca376c643b9030aa74516f054648c1534d912ea66582adf3c655d"
-     "bd71ca55e47412315df5e2893e43b2e2dfe6e4dedf426f11846ebef34a99f5615460ce04"
-     "75f7bc54b4a4fd99e83c982097c3136ac6188a5c",
-     "3dc7de970bce28a943d7599f2a9010fc99435b93bc4ba884d42503ac2941aa63fd07db34"
-     "bcbb1127d56d6a4e277d6ca32051ea3467e376f74f98c3999d2f276b282ef8a28cf0cbc",
-     "0402066a50b9f961a58620f473fcf7d5eb635da47f4ce362f428669ea578d50d1c1513c1"
-     "45adcc03ba98f3d67bb422141c73e2f94ef9559ccfdc0be20eb206d3d114a5db302bd075"
-     "1f04437e655bd255e7f013d197210bed70c5c1a6cc1daccb96145c9c438c8a44b4074629"
-     "830d8df9914166c9378b33040d71918cdd0f47fa64b7c69f43eee0f34414b8f64882f90a"
-     "c3",
-     "3b2e20f4e258b7f0cf69a460fece9b4794a12a37c0f8e7aa6f4f51dbfaf508f6f1e0160a"
-     "b4388891efb09f0ca1f73178f0e8598750c9debd3ff856cb3a2872762ef9e16487a9513",
-     "2f265aa99ff806ffeacbf9ef7be575ce5300d3cfd4225b1835774ee075d7e530c9fdcd68"
-     "1584223f84a497119b4eb1fe34cd31d654c2fa262d7549acc251cece9530b26cfa3ab35",
-     "2c05ce4b35544bd1f20a68eae7f3483e0a0628dbb53f0466166257f69a7a110d2838a76d"
-     "204e7a955a8977508e65f2ef6d7deee13e4e2ec0f2b9a8b4bedc26b3502813b0334a1b0"},
-    {NID_sect571r1, NID_sha384,
-     "43c24aea343d4e088bea25be69a332c631275c36677093e057de69cc83a4c5e70ab270e5"
-     "a8930f55846f1a22ec10e03007dcf0942c6761e89c65c6a4f032eed97dc3a2c7f7ed1e82"
-     "552fe48828a132ba16c41f6bd82a49335428a24fa1679522000e6a1d12c646e0e4b4c584"
-     "398577ea9493bb334fa3cee8bfdb6c2e66f46436",
-     "2de6ee12eefa7a4a736484b19b42a513dfc059a060976edc3b0aa4b50e98d72df6506fed"
-     "0499ff8480986748e938289e54a5e86c0c29733a9bcf5985aa63d8a2b57933a04a8e8e0",
-     "040073fa1b62d469f2991d54f1472b60da87ba51be0a9dea361d417b91a4a75373695e9f"
-     "27b3c672322315d7b566b1f22b96c54adce3e958080fa8a02836955f6264dad3a87fd11f"
-     "060452c0a07ff65fff741c96851657a5afc7eeca239622e1260414ed736a04e487157c52"
-     "da98a7845bcf6f311e0f2e59bb92248b6d47dcb93da6f7e0af644b7aec7603a01950293d"
-     "8c",
-     "1c87653066057636f9a98a7c69a84e103df480a92739abc4d5ba53891591e3aaaef6ef3e"
-     "f5e89213abbf71af9c84d3b30898580e782f557a03694446492afb05ab801d7dd631c8c",
-     "086d539546c61e82d74319f0180411172acaf08b5296dc6435d4ed7bd50cf23d3a071deb"
-     "3be01f74408e64ad244f069cd41227ba127145df5a357489f944b61606ec75e8377db81",
-     "0a34d9975fbd601614d04aa41506b03fc15189ee8102c0431272d691a322f3e77bcfd19d"
-     "8bddd19b307012b6c6349f5ecf88b5a69e83588b0e18096117f207304b38c16a9a8592b"},
-    {NID_sect571r1, NID_sha384,
-     "e89210565959d93b483659e62cf41f0a0147ea23890c2f1a694c377a826165e363860e4b"
-     "084016cda878a43eb68465f81f397ecd50087a25215ce7c4ededa3552218071fa3acd7ae"
-     "380655fc8fa884998209ffc8a2c26f1ca19dfcfee455dad35a4e72caecd8da47eb9ee21b"
-     "889162f5d3032724abfd1a31e68612e18bfa9006",
-     "05468f0df2c9854f5f655743e79c750fd8812db28b096d97207bae7f5aafc6b6090c9c63"
-     "6ead9e0fde32a1ff8d539b53813733ca812b41b58ff85a941abe4f128d59fdf9847baa4",
-     "0406591750fbc104f82c213fe88aa620e8a960fd6140598e2e6282e0d5c5ecffd09d22ed"
-     "94166109561a7f4f694e171189056d8b300b54c8134485500effc7123aaa23862e897912"
-     "42005bf8ec10a9ac6a92c54e7fb2135e2aa4f84da571d33227bde0aa2e6c153207488223"
-     "5f3103d9a51e80b7a9a19067f35047ddc52462db7c634c291e8fc5eb2154f6913bd0846b"
-     "88",
-     "242308c430de514be1b9084a7e6c96894cd5615a7c71ea22316e539986e9702080ff6cee"
-     "f2980144c55d9749830c20c9ea90b93dfcdd28fd862b6a15748dbb3d982e4a275129c75",
-     "361e1b7a0f981bcc65480b370c5e09b1c2e2a67cf41646f6a3d829f663c0911589223740"
-     "0317601fcee78a04269411d267dad3e8fc6f069529fbdf0bcf9b5f13c9c6de1681e8b0a",
-     "2620c29f86cbf698cca5f79de364ae131345a802c0cccfaefdd7375dcc9ba6ccac91f709"
-     "43eb606506e51e2ced50491eb8f48769810b6dc178d56702838f1c2f0930f2a9e4f1db6"},
-    {NID_sect571r1, NID_sha384,
-     "48629ec97f56273599cd9903f8a84ac2ba74275b40e1e42fa47649568babe05cf63c8417"
-     "d828251acc2eec525b56dc9082b68d51b0c2bbaa7389fbee15d058cf482993b2bedc5a91"
-     "01f1afdc79989a812478245d191550109fc17215679553c508c84e3d4cfdea377088d09e"
-     "b214e6f92410facee4790beeecafe72b2e3ed192",
-     "3d3c6a7ab9450c94aa3b8a1ffb678e5b647af24cbfd66ee3944e6f264f406295b8037674"
-     "71fc67936fdfed1714b4b8761a07eec86543b7c4da6bd2fcb33fa8cda4077737f398e18",
-     "04042d536f1b15a22f4ba80066798d8d1c2704988eeb9423319c1850a1ae6bba4097307b"
-     "515640ed3112e93f1f6ae67c60a4b0d2b6634aa7038a60b52b2b447fd1651857b71711c9"
-     "75079eb18cc7493a1c7f2f9b621969b9ce9ee37fc0701f6cf56f5d5dc6efb13a384517a3"
-     "87f253aae1e93bb0a919b0c22e4d6cbc79b449b268a068b7eb2853324b96715d75b8c26f"
-     "27",
-     "23ce112d60a2f7c29d77d64acd9f587e0eb75ef8e739b8548e154681efc24243594eef5e"
-     "33d845b1e4e89bac56f2e9586e042e0fff38bcf79c73fc9aa5fc908261df5cd2c6cb821",
-     "3a770df8a2bc35e122c1bd551c38400be47f2499ff57618ccd01e14a2e35e87a67b0e40f"
-     "9a10eee7efcc3d37b474f2840fb8c24a9adf93734680ae6b25818369c8608a2f8f338f1",
-     "0728a4eae5f5638a51579e224a24ecd4c997001bb8681e23a7476fbf78b4fab84497000f"
-     "20c1e67e8a4e4116498bcee49ff00026009af31c1037172188aacd264fde8db15c97167"},
-    {NID_sect571r1, NID_sha384,
-     "aa3a9fe467b1ca638dd0622c9ea235a418b39b2e15ad81fee01b6892b240783d8db3c72e"
-     "16c13df8016dac6addbfb85232158325bd7432fca3b8bf5db3abd0b4c5ccd0999609dc42"
-     "199ca4680692a0805cdd68108bcb493a558ab507cec0a2782a9e976928985352edb2abc0"
-     "c07078b59d2fd86fda7fc76cfe573181d934c46c",
-     "01ce010ea8e6e1a0c26ab22eb90f0700dc73b232c429d36371e68e429792afb7223f1032"
-     "7708bcff779ea55fb5f22ad87aa054e84d10f5450f1bc9a89279062ea2173f55ab0f76c",
-     "0404b2b5acef5921e691f10ade81b91ba8e68e73b33a2494cf4ca6617707861f334eb07c"
-     "a96dfd681dd63f78102f8d792d66102117b739d477e431d9a3efd79bfcc18cea156db58a"
-     "0e07e421337d4cb7a98cf9c9c6fdf9fa242904d9906d8a6759ef64a82cbf923b2a57073e"
-     "a0eabd14aa4295bec84d50a1722fecad3e5f064bd3171facdfff45b170e49f185a3c193f"
-     "2a",
-     "326b62065b7c779dc398ee03a8332cfb940b0f24a7d3de4a90323d9e390ad3fb1f0036ab"
-     "f6f525d8d88ab6641302d10db447b78780d366f32ce36ae571e323124b21984c48aea7d",
-     "3d2b207b428829ed5100a92f7276e16978e374c734834b0d627cddf6aff5cab72dafefc6"
-     "c038a91426e35ee0f2c1acc11c55a34a89874100b89588aba7b02e19490e66eb49ef6ed",
-     "3259fef5c2a0779ae408b26e6c7d581fa973156cdb07c329dde0c12b6c498e7a94577719"
-     "865b7fcc0db078ba72a27bf338ec6b8aa41c15963538c329c55dee67833faebe3b643ad"},
-    {NID_sect571r1, NID_sha384,
-     "6c3937014361799f1461f652841b5137eb0dcaf01dd293298d002f27e9a770b9e1a30367"
-     "e35c04603881f0c814cf8ecfbe1619cc49cd516b1d60d27de37ed52a5e1cc300e2face46"
-     "69f308ebe6747255a3d386f16778e494a7cdd10b45171b2bfcdabd91b805bf24857708c1"
-     "b75e368edb2874321324f83a19154d3a1578c767",
-     "1e7410d012aeef02b3723346d24ebafd684c99087ecccaea1cf3735d52c4c81dda41812c"
-     "09f1e874dc964d858ca240a19963d5dc89451f5dd6764426ae41cb23f19cbfdca0fc562",
-     "040400a3bb3ff07a339ff98f7c45fe032cf42c0e25de8dee2934ce42dfb0c9894f4fce27"
-     "fef299b41beb8579270efc7b01c0663c3f72d7bdd9f6ff5186eca9c42d15faaef8784211"
-     "a5006fe998f7a0db06efed050d178865a2b7de6ca7c789cedff7f2158a5e07ac1d335ec0"
-     "dbd213fc9465399028fad8b7f4d2cd16fb8ceae4d3d53abefd2b4037efd7f7245296bfdf"
-     "9d",
-     "2bb0fb9c428e42482d5dbdb35157ad0fa713fe732dac8604c0194e3f9738fac5cf3874bd"
-     "863718712a3da45b7c4612c8685465ecaec0930d9fec32ab25818d2f25fad580009b698",
-     "1062386d3e77043298eb88be46bd4e6f33c83a7358926b30ca06a6b7139815f6e1630f73"
-     "d352a2cb9bc0619d08a89d4bde1636c74b6580543ed743073eec2ae0037bea2b3c9228e",
-     "1ceef759d804ff7de526559636d0bc7930c096c7b959f04f8fec5d7e96129fba14c8341b"
-     "0ed84a64c6cce7cd5b058fab7f44dcf3e714544c9b6f9c1d46ce512870deb51856e9dec"},
-    {NID_sect571r1, NID_sha384,
-     "12fea55ffda15db902aa6a4388b9807c89c193cbf75b5d2a4c95206fa43dedc45974c800"
-     "79933451bdc5b3ea015ed3ca2c54156dc61afb1bc82adefed1491302a48b9d3d2f474ab4"
-     "5343c611677d360515b93fb36da7a1c1b2341c9cce185c881c0beef33d43967134a190c0"
-     "9034ae3261f3295b79aebd3fe123616f73cf2089",
-     "2139839ce38eb879d266065dde5e5ea227244323b330e3ad5a0bc690f3c210f794cf18f0"
-     "d730693887548bfbc434f48ee10ed34cb41d52172b06e448df938170a5e17311cab8e88",
-     "0402ecf46b90616b534ea25cc9993942fd7576a1c4f2f443d3b1f56d4490bf0af669c9eb"
-     "9d110fe2a65609875e1a924bc4b9ed2ed2315047bbaeadaa1029b38a7a87dd8751d4128e"
-     "8002aec3a2f2557c7152a4907af68aa39485274f20927b2da70823440fbd09cbc308d46e"
-     "30bd6b705f615b7074fe5421ca36b4aa53861983eceae9a69649495952e75b0f060b5d26"
-     "e4",
-     "2e3412b61eb23d33ca2910dc25dd14c04d2c8b403d8077a72b9511d71ee9da6d7e1db093"
-     "b92287f8fb00aea0576f6712c56d80cc4e3554e0faa9c7d911e3d17682de831bf649bd9",
-     "06a3075efec81a86175cd1dc2bfe82e83aff1db640184a6a3ed7a0dcdef51aa0be0005c5"
-     "4ac05f9b65af265af7f2ec3d1d7c137184b0d695d701ff1aed194faf2efa98ce6c5e502",
-     "237d7ff92480fa7d6d1f5a0564a2608afe5e95ce2c29dd88853d1ad9d4d2beb8d1f0423e"
-     "db883faadd592394f52048bf2dc26d2dc19279477ed86621c7a5960ee3c3e2d345fda29"},
-    {NID_sect571r1, NID_sha384,
-     "c8395546842ddb545d8ea3db4efe970453dcb06025ac3b7a25aa5ef62070f3021b9a1fea"
-     "91ff7055b6c398073e7886a6f71afe53c82c47b71377dfe291972503bbeb25bd477bf0e7"
-     "adc8a5d3f8b34ccd0080d61e121214e1b29802b711cdd8a6bb2275a2395c467ec2c15719"
-     "52992e448d736d8bd70ee629c75b5e32b8323a00",
-     "274f70fe69e4dbb55c5d404e39f5196335047113087f8711f2f67f2be4964e4fbcb86568"
-     "0758df1c401cd677b0971654b7a6aeb7bee0d6d80ac0de14d4f46f356b2d5545c185aa6",
-     "0402b2321e0a1df083919628dd8b4c318b9ded8a3e660ce5585b21e46843228b4d32da76"
-     "5a3776c181654aad0ce90724bf85b01b051d236342b48d41a1dbda1e9904d659c98a039a"
-     "97020227182fcf099d46d9882c0b0f26b0595a2a3166248898df2f3fd27c78e7c0b8b59e"
-     "f0ed6745660c0dea1acb567f9d943928864dd1e94f8eb6b5b8473c0c91485643189cf679"
-     "d2",
-     "2f234066c936625fca10dd080cbbb1228c4d2054cbdeafc8a0a248c0d22807fc92c661b4"
-     "f69586ecf9469bc4c22895cc73ecf492fb2165a12b027194d409677e7185de24f6870a3",
-     "3a48daa8e379b3b2f377049a4d462530c9ea67019752f4af4b4192b02d6e028386dcb9ef"
-     "95c8019e90e09dfc8dff5e6f6812df491906ced39befedf16caef614d8c174e7ea95fc1",
-     "33f18738cb26d88c8c048c58a210c7be70c71636dc62c022df1bd7747d8c67bfcf5ff2fb"
-     "3990ed35becf6c77755ac62aed480df55efea578671bd8d50536a10e2c0192bd42d78e2"},
-    {NID_sect571r1, NID_sha512,
-     "10d2e00ae57176c79cdfc746c0c887abe799ee445b151b008e3d9f81eb69be40298ddf37"
-     "b5c45a9b6e5ff83785d8c140cf11e6a4c3879a2845796872363da24b10f1f8d9cc48f8af"
-     "20681dceb60dd62095d6d3b1779a4a805de3d74e38983b24c0748618e2f92ef7cac257ff"
-     "4bd1f41113f2891eb13c47930e69ddbe91f270fb",
-     "03e1b03ffca4399d5b439fac8f87a5cb06930f00d304193d7daf83d5947d0c1e293f74ae"
-     "f8e56849f16147133c37a6b3d1b1883e5d61d6b871ea036c5291d9a74541f28878cb986",
-     "0403b236fc135d849d50140fdaae1045e6ae35ef61091e98f5059b30eb16acdd0deb2bc0"
-     "d3544bc3a666e0014e50030134fe5466a9e4d3911ed580e28851f3747c0010888e819d3d"
-     "1f03a8b6627a587d289032bd76374d16771188d7ff281c39542c8977f6872fa932e5daa1"
-     "4e13792dea9ffe8e9f68d6b525ec99b81a5a60cfb0590cc6f297cfff8d7ba1a8bb81fe2e"
-     "16",
-     "2e56a94cfbbcd293e242f0c2a2e9df289a9480e6ba52e0f00fa19bcf2a7769bd155e6b79"
-     "ddbd6a8646b0e69c8baea27f8034a18796e8eb4fe6e0e2358c383521d9375d2b6b437f9",
-     "2eb1c5c1fc93cf3c8babed12c031cf1504e094174fd335104cbe4a2abd210b5a14b1c3a4"
-     "55579f1ed0517c31822340e4dd3c1f967e1b4b9d071a1072afc1a199f8c548cd449a634",
-     "22f97bb48641235826cf4e597fa8de849402d6bd6114ad2d7fbcf53a08247e5ee921f1bd"
-     "5994dffee36eedff5592bb93b8bb148214da3b7baebffbd96b4f86c55b3f6bbac142442"},
-    {NID_sect571r1, NID_sha512,
-     "b61a0849a28672cb536fcf61ea2eb389d02ff7a09aa391744cae6597bd56703c40c50ca2"
-     "dee5f7ee796acfd47322f03d8dbe4d99dc8eec588b4e5467f123075b2d74b2a0b0bbfd3a"
-     "c5487a905fad6d6ac1421c2e564c0cf15e1f0f10bc31c249b7b46edd2462a55f85560d99"
-     "bde9d5b06b97817d1dbe0a67c701d6e6e7878272",
-     "2e09ffd8b434bb7f67d1d3ccf482164f1653c6e4ec64dec2517aa21b7a93b2b21ea1eebb"
-     "54734882f29303e489f02e3b741a87287e2dcdf3858eb6d2ec668f8b5b26f442ce513a2",
-     "04036f1be8738dd7dae4486b86a08fe90424f3673e76b10e739442e15f3bfafaf841842a"
-     "c98e490521b7e7bb94c127529f6ec6a42cc6f06fc80606f1210fe020ff508148f93301c9"
-     "d304d39666ebe99fe214336ad440d776c88eb916f2f4a3433548b87d2aebed840b424d15"
-     "c8341b4a0a657bf6a234d4fe78631c8e07ac1f4dc7474cd6b4545d536b7b17c160db4562"
-     "d9",
-     "378e7801566d7b77db7a474717ab2195b02957cc264a9449d4126a7cc574728ed5a4769a"
-     "bd5dde987ca66cfe3d45b5fc52ffd266acb8a8bb3fcb4b60f7febbf48aebe33bd3efbdd",
-     "3d8105f87fe3166046c08e80a28acc98a80b8b7a729623053c2a9e80afd06756edfe09bd"
-     "cf3035f6829ede041b745955d219dc5d30ddd8b37f6ba0f6d2857504cdc68a1ed812a10",
-     "34db9998dc53527114518a7ce3783d674ca8cced823fa05e2942e7a0a20b3cc583dcd930"
-     "c43f9b93079c5ee18a1f5a66e7c3527c18610f9b47a4da7e245ef803e0662e4d2ad721c"},
-    {NID_sect571r1, NID_sha512,
-     "ba6be551bc60653192401ed8ff9e1acd9013d8811a7a1389528bf07438366f5772cd7aed"
-     "ad010c19c47622cec03a4d35b8003b39ed901b720629ab59de55a03c1ca50a62987f8da1"
-     "59e356245df58d5ae1936e65f3cd3acbe03ad1d0fcab4aaf2a7a947549ae776772201efb"
-     "c6fab1aebfa1d99994d4f43dc28f39c0f279b992",
-     "2a69bc1df069c6e89722521a63675f318252be629e7558f3716917998e660ac960b0b750"
-     "562846fe6c12ef492951e51e224754bab84a6eacd4147a5f26ae85ee4381bb14ec2a8c7",
-     "0404685c0358ca31883cdfd7d609afa8b1e47540a97f473e0ebe98b0aaaab9418877aeea"
-     "d3a26fb01a4725fda20e7223a4fe7de0df6891c0812555b8b146918d3b80edd11615d95b"
-     "77067c92736447946c7577965b613e18950d813a4df049a6000895f9dac34d73ea46a83c"
-     "6a4e7c83831af0d33026825664c44090953521175b9da2a7ac563a0fc5e13c85d34aaf49"
-     "f2",
-     "1700d9ac00a987ff3a1d0be4290979317fe60f4f8ce1e0e72a026fc89e28c0070b76ada1"
-     "4f7a1a66ac2e8aef17eec18b568ada4fd59c05414e55356fc17d9e5079e6cabfc1f220d",
-     "23a279662efec48f6cf8c7334862525b52ac37a9b03da6a063da2849f878015632427834"
-     "34fca02fa23e32249666ddc6f596e07750ed21de303f4f10de56f1d37101cb0826bb8bf",
-     "3b449467b150cba0d7c2b44280c5ac452f1217384ce121c979625d313394f6cef501b819"
-     "80a02567ca55da2bc313dc0754b5256b08d8e3b63ea033253b205cc5dcb014574b8e9a0"},
-    {NID_sect571r1, NID_sha512,
-     "295720a79ac8201f40a66b06ae5d970afb15f36582897eed25cd92edcd00f70ac8e31c55"
-     "6eed4375ea044c2e8b227a8e02c0a3e996c9272d52ac7b3ad43b80f217295dddc84b177c"
-     "f1e800ad08bf7fdd021fb2f49b54162092f8d628679c4ee335abbc90c027264c8b288c6e"
-     "16eca3172eaa297ba50626b00fe0a0ad3a9dbeeb",
-     "0d11ed1b78b22b3420df4ddc4acc7c2286d9569dd6dd88e0fa3ecae69bcced68bb81bbb4"
-     "ca6e9b54e67856e7fdf39155aa27aecb9cc827ccb9cdcf9ac633561b27d8eebfc261aee",
-     "0401868a1335058a69e3ce24ea4e6e8dc25851777bb28d3a5da67b741ec9c46e26f2d2ae"
-     "70a48c3e4feabb3b15b3c3ebd561f667ef3b95a587621de6073b9c8a904755566c5f7a3b"
-     "4206365a03c3f3066eca1af17bbbd08cd52e89f8095075b415cd4b82f3364cbff008fe36"
-     "42fe71e8a8c634ad0e5d9979251e6cedd42cb97c2203f743210051f5ee1b70c861d2a72c"
-     "00",
-     "075e49d2ff6f2aa8b44fad90446474ee0e72323a3c39e731b6c2b075cce0cb9d193bc335"
-     "6f8fdae0e0143603a57028836ee6451cab101a6eb550042cb41b5c4233d3ad3e87034d1",
-     "207a8eed0b87efe65ec558a0ccbecb13b9215e176abd93c1a4803fcae713927ece70ec6c"
-     "41c621357d78a13a950958871a52621f1de7ab74befd964a0e8f4820b84af3e0811bc67",
-     "2f02017714f54089652e02af36ac5165e44ac4a83747c805a9e003fde4bdb29561dcead2"
-     "c76b02c195074396a2dcc1b93a256c721716f8eeda8dae443c3eea446118fec3cebc4dc"},
-    {NID_sect571r1, NID_sha512,
-     "a9cff41c6dfdc4a12f31dc375a5455950077ae323d0b7a3d9a8dde73b76e9d7b94ddf9c8"
-     "8ae8e6c262d704052ac47681fc35adfc56c904baaa6e146eb653984369d76a85596cb744"
-     "941aa7b558c945ff2e81bd5ef7f00ecb4f43af23b4cea3bd4ba7b1899f1868a0c0ecfc62"
-     "ccb1d588955597ffbbaf34cab2838efc2b866669",
-     "2c36ef754b5bd065e9eadde684750acc52795be80f54dd3d7a7d743d968a18f7e404bd71"
-     "f8a76eb0395f396df5a7c2ff7e0ab6de35df34282fda6ee01fe5b9b68ecb4e378dbe32e",
-     "0404805e1a23b6eadcf91647b40903bc1fd3b9921861c942fc24d2c03d0544e7c01f004c"
-     "aeed04b5c4ebbce366a098a878c322cbebe7910bfb0f91b284ac1aef344152fc5831669b"
-     "7904f589ddb4da482ba1e9a59241b1dfbc7e9b9b69e8f69f8e90460ad58fdecc48a56842"
-     "ea6aa0537abec0a605ebfb713e588685a98f62e05a7d52082bfd57e3d68fb7851b37ec55"
-     "67",
-     "2f2002bdde0c0b0fd92e96abe76c0858e42fd7d94a181c711fc6753572539e18effa8155"
-     "cde7b1e9ceab2394f9eba874b7ea257d7c308c8ac08500f4944af5f33057650608db8fe",
-     "27f9109799bced42730faecdeea68259383a45033c6d5dc8d87adf994b46beb34177e013"
-     "700b13f1253cf756a8866218e9c8adc180f3c242c56b3de28405b36940d53c2aab24f1a",
-     "20a762ffb2f5a88b0e1356964fb558b555c424946109d16c7548f41a33cfe41da1f48327"
-     "6a27b188faf948a56670716ddf3b187570c9f514869c4492d7773d6ce453a075f9bc64f"},
-    {NID_sect571r1, NID_sha512,
-     "efa6c582d7fcf5e431aa89b3b00180c0e78efd7ccb0384d90b80e59a115a13e55001d951"
-     "528c42860132531c9b8ab29dda7a657c53c2ce96fd85549f6f1810e121eb89961295335e"
-     "aa0e40532d85814a4206e6fffdf9bff76599da9b2e71a22ed572910b0e3bae38ad72c704"
-     "2579f106739a8628dea5a745168bd918736e488a",
-     "19ffee50be5496507e3ef5c40ee88a49625e46d1dd1686a52b09ad4a8e3ee9ef364f953b"
-     "fcd97c52104eecb6138067192997cd4ebadaccb73c7b2560879289a46353a756b73cc43",
-     "04077dca410e722009ef11b37742c2c003ab3015d0ca0328a70d9d41aae04cb64f7746f1"
-     "c348b08458eb3bb1788f9ffe7d0570a9b689a9b7aca43e05400bace7630d598f5b484d13"
-     "c407291f74cddd9ff69470cf0d92afaaddcc4c8c274d4a7a64fd94292ddc8bf080606795"
-     "376bb725ab4d32c72ef77dff34cfedd34aff2f463d635bfcd7e1fd002d84383dc5bf8d5d"
-     "23",
-     "2ea37750fc3bbdeec100694068d55f92fdf35bff9ed49251c4b8bbfb2dec2dd4446999af"
-     "8848e05c7b819aeb1864430ab4e8c1d684e1cf78947a71b04d5ab8ad61cc7e3e4e24205",
-     "12ff1852eaff37fee997531039adb1fb2f9b4f4199670c022e8534625fff1fa93390ee9b"
-     "c7204ad2ba3efc2233260943f1d2381a3cc025b78c6d1f660a7bd6f42e5ed3c123055a9",
-     "1b4d8abb28ef1a9d77066921ed50eba64b8433cf00c66b8467269a4a914f568cdb86c766"
-     "a7a6a52437c5d98cfc9a2130dfaba20f3c2001f31bba7071647d51fb9fbd5fc67ee120f"},
-    {NID_sect571r1, NID_sha512,
-     "211acebfaf13bba33a9dd16722ec53baab92a140127d61372cbf1850f2fc894e942e25d7"
-     "80778235f880743953d04eca7a9205602e388172aec2abf35412b483490751f93b51239b"
-     "6701cb0aab14e5179b0d7f55d8586358381dd83e3e436bf69a6820317d1701750cb1fea1"
-     "293467ba589eec5f5779c2dbf2a9b8f28c4dc239",
-     "3129e96fd28c4198cc5242c1e3531a3979fae643d527044e98d7721aa56b5b4b45dfddfa"
-     "17a4115e10a2b4f46d92f81cbdd7e86e588a4c6d8c2b3a83f54cebcee1d1dd33e85d81a",
-     "04073a92abcc991e3f89d82c47fa0fec48e3e7c4d97e2525f8dc2d24da39f616af4a5a80"
-     "4d2603703f6db7cc9324c5b56a21009373f6605f561c8503394e7746e51273b5722ffbc2"
-     "3d00684c842f03a53a60cce087f4fcdbf23b7a28c48b6b6544f583342a65d97dd87037c6"
-     "fef176a1f00513713468273494a5be683b68c5e75bc08995fde763bb6f965da1acb7e894"
-     "f1",
-     "0165e52640fcaf8cbdbfe73cb8058c53045e7670aafb2def28d2c9eceb5ed1634b5339cc"
-     "47ba981eb6eb03ba714c7717e9ed5acc15c8f304702a0409bd4508015d4626cfc5484b1",
-     "27dcdf16b7156a7a05a752da28b5bd6b233e8a7c16eb7f9030f29c4352e6508f8424d1b5"
-     "ba789dac4152ac4812ff7975cce69908371a81a4d7d9dd70a8dabebdc4e3af27234f0d0",
-     "32a654a31f09a9803e502a1440c2bcf122780f4f47aa37e15991d9a548583fdca4880080"
-     "4712816b212cd3c657e6bd4cb7443a0288592541473c5086e1277250612c21346538374"},
-    {NID_sect571r1, NID_sha512,
-     "ee592e20e0a45c18089c2e41460e65a7d22ed9714379f095d43a308bdd383128aaa6fb24"
-     "e9d35fd28fc95c5b792ad75c980d2cdf0f460ac60b12c5919d3cb28dac4d488196be6c2d"
-     "fe462b1b0ce59f8501692255840f5215c0fd8b74b1996a267a5e3b22d2841cf0a0b6315e"
-     "f4ec7180f1c8494f4c07d5869c01fa2711739efc",
-     "3d723d2697cd07dd8444f992f2ab4a063db334034c25ea9be99fd7a1f495e3a644e5ea03"
-     "3a41264e0d24a911e55741d0cab80a0bd678eaec2bd1e60424d4491eb86d664900d907e",
-     "0400c7a229b5fb9fc774c1b6250f3bba2f0972d1aada7080641c014d012db0637a0656a4"
-     "3024ec0ea25ff70012646dc19eeb1033aebcc96a001ba876b2f5def6e198b8d4a53f7c7f"
-     "4a009228a68eafaac214fdfa19923a0c19629de31ac0967c9d02c53dbf221f9affb735d3"
-     "bad732f381f1ca414d70920231a78f742254d895a33ffab492f8e6094a542e77962a324b"
-     "a4",
-     "3b3724a5933353bb9ff5f742f59385e780caa517a963590b7fc89882bed95cf90ca6365c"
-     "e8b882f2d96e56bd866a5c437733b681308c570c51ec893ea95fede66c7aaf4561173f7",
-     "2a487c1fc29426e8e85f0a35c177cd168a444959b2f5cd4519b9edd52af3ea829cfe964a"
-     "c2b59198af8e2d3859ebdf9885ebf57bdf5767da1611d3958de286f91ef397230d65599",
-     "10fc01efcb22b982f992efb71887bc79c3f32a9088bc2011c269924cee0f47c36452399d"
-     "499f2933587081b872e9fd2191c20cd5cd94927839228ebcf22cf7acdf4608a2fa66310"},
-    {NID_sect571r1, NID_sha512,
-     "fffca41927debbd53455821441d9115db99fb31bfc69752a382f57bc7abe021f148346ee"
-     "29e17512c64b4918ab2391d12d6e5643bee6b5682885dc28177b292e23a37ff99b359b9c"
-     "f7578432af56e0ad1028a6cce7428980654c145af8daf09addbb3be11228d3c742defca9"
-     "d3b1667f48c63091fe3307ecf72667b02e008f24",
-     "1999ab45d66cd1d3a0fe6aa43bf5ef1e2a67637d53674f6fbbfb9b582be91fc42a12cdca"
-     "d94b50b0fc7ac55030de24a0b99fbc4314fa743ef4b5198bcc5f54d8b669fbed78e2e91",
-     "0400cbf3b0bb4a2e6c225aa922bea3b233da4661df5da7e0a1cd343a9b6655ee87fc60cd"
-     "763dee21eaa2b81c4dd5af6f4fadc3ceea643b37a6b17a6501e1b9b689fb0c4716911c1f"
-     "10014b5a9ae025f09066fffa6797ddf95f27eeade06b8ca5be5738f770362d5213c46ecf"
-     "ca58e3c60cb2bae1f8ab1bf0577c80b4fdad02819fc174cafb33df64fc0ec79713f7b252"
-     "09",
-     "253b533d3ad1c7095363e3fc80cb32471061e44dab3f9ae0ea6252f6ef169cee8badd3ec"
-     "cb77096ae9224f89baeee7e183058579680661655fb689419e36a61e8573de5ecb4cd09",
-     "3ba94f7682fb61de725a35caf1d4d799c4b05a1d1c44eb1c251dd8efab6b7d713c3fb917"
-     "776902a1bb202f9226558f4c1e75964349717e6dff938d0befea07a9ca1bbd429dd6318",
-     "226f43be8e24062180c726b5cb721cc04ffd3acd82183925523ff9e8631aecbec2c224d5"
-     "a291bb225f0da726d256aa822ee7cc2c7d69df3f2a5beb21132d91bea22e4c5db900cec"},
-    {NID_sect571r1, NID_sha512,
-     "a2f71619ea04f7057e6943c2cece8594b341ec3b96c3915d924f94ba13fd7aaeed41ffa0"
-     "e842ade414784f1ef825fcf2dbcf7bd8263b802def45f94de596aec0c121fc06558c7bb0"
-     "6b9f27a9bf56c42090b5dc344e82b69c4f528d33be166764a593483f6fda0cf56e6000ff"
-     "363ba220f5ea0ea2c3191615c7ae3bb4fa575324",
-     "2ce1cae0716205330d730e6bc6dbfb6b951dc83ee3b4a7dae75d057e32e8a46e22be75b5"
-     "f09135452b29c34dfe81a9be2e8dcd243fbd946a0ed14a832a7802e20cfe1abfd3d6e4b",
-     "04075971399fa621ce535144ec1d57f544d798a0a59207166c3d657e5a80ac00e8f5b643"
-     "448e3546064d68ae624aaabf36face3016561a248256ff9131950ab8b04710551e12222d"
-     "0c0224a50f321647f47de3db4fbe1bf1e3a3dce8a834312779f66037315e3326721e3fd6"
-     "3d4d6ef92b7ba1fa9aeb70f92e2a6701458ac8da49ac386491f2306adcd8dd781fe75e99"
-     "e1",
-     "0ad95aa69cf9f40e13f8a72ed6d93388168abc8001670ee4d95fb4b726b1f958205ab2f4"
-     "58df8bb9ccf2405680d0e6951abbb922cc11d47cfded93c0efdb70caf0c54e7ae96d7e5",
-     "09ce019161bf29eeaf323933045f59d2efc372904ba50c4a6602b8305234a851d95f06a5"
-     "b56193ad5d28488102ec25e3f421a5f5c4626b435b423d612e6ab60e0a4fe5d4952e2c5",
-     "04f7b7ac787b361c2bdfa767da9c22152e402184a7ac133f651fdcd928239215dc917401"
-     "122a6d41e78299b4235e085399e594465b7f8dbfaae9bf302d83470b4295ea06bb9bd1e"},
-    {NID_sect571r1, NID_sha512,
-     "b60415a831eca2cf60c79a334ef2f327a76d290846ee588d5d33d0a826bb0c7ec3e11dbb"
-     "384a7f89c8d180425dfae7463e0ea6497d2eec1dde112f1c1efccb532a2e2b66a28e2d36"
-     "d4252a4c3b12850d465fe21bddc441b92e6a7b0f67744f7f6e7812a0603211a26518b311"
-     "a5b190ed890ad852bed4f6ed13377cab3eebedf4",
-     "2c9d0fcfcee7e75c3245ba955ae04188b1033c55ec9c821d8de7685276bda3e9a93c3ae1"
-     "b003e5ea722913e7b169d67b1aa2dc8cd42adbd9368672a3f81a6817bf3e5529dcb0c8b",
-     "04019cba4c8ddadb596d7303331f2a22461849ebfbc78ea69277f72dcfe23d08397025ff"
-     "6691c61ed9958d68a9c5dd8a32048a89a2553afb9077ec43358763756b1473ab2cd8f25b"
-     "530319eeaa78444b7cc5d8cff4e9199ddd2c6dc7bd935a1be1d8b1c657dd5ac49bc92b0c"
-     "d91304ef44ddb7ecac05518301bfa0e533402043533f99549621e31dcc282a52186478df"
-     "2b",
-     "385e12170ed0b23c9c65ff7edd413145fd343dd841e85c498fae5f36e577641688999028"
-     "17d4dc39127010faa1da68000a511ac69f80708be5afe1631432f3bab7aaec2bdeb11b4",
-     "231ef400c6a3a0c7b26ba1b92341b72e138ca62d04ea2172854631c40c48081a18a57e9f"
-     "055748245d3e83d10d21af39935b0e50c9c86956ac46c1ea03ac4ae023d84b24f830973",
-     "24d37d67afafb0676cd7b5da2960cabfc804b0b3244b5e6739f8fe43d0841693d28c61b8"
-     "e76181f8aa24940d76fc5ea8ef3a95f72f67303e1ed85ad6e83cd2c44fd0e0f3f2f44f4"},
-    {NID_sect571r1, NID_sha512,
-     "5d15a08226cc74cf495be681b795d0bde26b19f29aca1a8c6ef77d50271ebdcb4e5fa2df"
-     "23961fe11620b1c6580183f6ebdceb2c09516c8127be576496fb71449bbbf0a9d3d1c48a"
-     "25024619b97c3e0d8b165897db96ae9758d13ac28441d7cbfb75b23cb423e0002046358b"
-     "b6d64779974a5995dfe54b398f95f7d64fc52d96",
-     "10c057bbaa44ef0f565edc288bfe66d4f6acd8686899359bca418ba89fb690429489a37b"
-     "d3c6c9f3a8714b2ca225868c6a45fee360e378a676f7ea39321790f32a4b005b81dce43",
-     "04043b1e7d7b2aee3563813a6692f0b4b61ba82b801697c3e23724a2fbab2af80a2c56be"
-     "55af41def0a90cbfce7a45ec61629906055a8b2a5013740e96859e580c444ae9f0ddf73a"
-     "fe06742f13244f1bf156d321eab2c3095ca548c3182c405187c3de2fbcb01d0e16e1fef2"
-     "46012c87d4d32378629a75b694572ec8583ae0cc813ac64f10bb05a9e52e4805590482f2"
-     "89",
-     "2b8076102a6448bd4c4e192e93cdb96ea9a6c7f6753818267ee9e67644df1a4a6c9ff64b"
-     "be9f64904648cc640fb7f0cce69f9e02878ee950b91ad559a9ec0ae15b676d933f1620f",
-     "1ad97f4997037adfe306f3859d550f9fd89bce8b566e657d5742feb17466b6b8d507d581"
-     "0a8cbba44d671b043ddb557df084bf5d1de74ef8bbd6a93690459fc16a17b80dd6c0f28",
-     "3262ef6e4175e7afe095d18157f67b3d12564d54954e9964e991c31bcfe1dee7e86b3549"
-     "1ce818400cc0f83b819f478f2f2c2d21c6c7a6be43938841559e09bce70b0d61fe51245"},
-    {NID_sect571r1, NID_sha512,
-     "9eca4bd88200baf61b901fca53dc1f1e7e3f83b94d58a6cc6a2adbc9b1a35fe3f8ec6178"
-     "7c76ed9a0d696167cd4fe46e1a0883fda564666131753c576a720125e0b712db1da02780"
-     "67cb899bdb14eec08737e864544663abb1d62f34a2114be07e8e3cf56e2d17099299ce6b"
-     "6d83b1a34e6153d7c6a32a72c7b1bf4583fcbcf7",
-     "2c182df7976ea93d996f3ba5d2221f3cb755cc7847bc3fe9e022fa4285046f5bfb426baf"
-     "a3580beea206de36f87593ae561b4b74a03fcd61fbd0e8d6fd5668f2148819a88a650aa",
-     "0406004b26a184ed710a5fb67e9d042f7fb9c8f5584b1f70a91b0b3be41c3fd2cd1a537e"
-     "962fdac8756df33f80fce2bb1bc7241d325bfc36dbaef7cf625918d589b6352fa7447189"
-     "10036a29b04a494abfe809d956c3cd6f84ea51a7fa28cb39a52f16137a13f72f0726a84f"
-     "6ae53ae24f5b468733f4cbfa0ce5bbbc1cc7b348fb996d33a45ff656a6a7557619f598a6"
-     "b7",
-     "2ab349232bcb4f4816b26bd0049e130fffc90ca0b9308edd50fb9055358a87fe798d0014"
-     "0b0ae01ed8b1f6bb9bfb726b253c3d4949ce9eecaa6c7fa84d1ef812669fa929f26be0f",
-     "0bbf2f9765b12742224ba7d064358c0305fb63e9b54a831e302a4546aa02cace798d82a1"
-     "88d2f536d78544c1571f481289d6ec69d117648026490e781f1eb9fca59bee05234ba7e",
-     "27e07ee0a1a99c90753cdc8c0291da25a82c116e62ec58b93f91086ac1cc039b35ce7d8b"
-     "53cdaa92a5ade65a7684b6e7ab79873dce33dcd467c39d0c764ee390b7fb25ca18912c3"},
-    {NID_sect571r1, NID_sha512,
-     "707450bd84141f3b61beb12ffa5ae89d812dd11badcdf6a88a2d50fc70e23f6d822ff447"
-     "7047abc58cdfa28f97ad7f4911ae0773c04ebed1f51bb2308cf6e5712c4aaed461edd698"
-     "7fdd1796aab70198276b601241f6a14225dce575830ff60f935fd9f567d1d210652e4710"
-     "922fa793da78c8fdc30c273cb08365c9fc887f50",
-     "2d3a65bbe133cc98cf0eb56ee1362195968b4eab960a1d55d8b762f1361fc21348d6f275"
-     "d4bea1de7158fb97c995e20b92a9c887a3e332d154667ad167acc632eb88a0ead6113a2",
-     "04034355b54d00c3df7c2762ee2982cb777491aaf78e550c4d2ff5d5a893416eb3517671"
-     "dbe522b8c553fd71edfe0306cd7628324f4f748091fc5d84ad8af33b896985674649a6f4"
-     "e507e322a04eb600a3faf3e045959f1e9f798e1c965ced40fd4c0383c0d4e79a96bf693a"
-     "91d7662780990d0c9dfca77a9bc0e13551d2ab35af8a153fa34ea903961fe66996ca053b"
-     "64",
-     "0a59ac1240bcefc52456486ce23b780cc92c8b89314b8442a6898c373bd0adc3725e3eba"
-     "c580546d1ec82ebfb2e04c608441d962d759ab5f5af1596c6623487e1347537a3c35bf4",
-     "0c47ef55d93ac36cee537160bbe39c3d4504184188533edfe589a5ab6e5a3e06ef413aa4"
-     "8710d304f0b2bc380fd69a34aa0b8e2e9466fd8a131cb056dffe4b809a59fd83e594483",
-     "2d8de1e8e2a52dd1be08435cda69e673b328573edeb1767849536e6f2d5fc8f18f7bfde9"
-     "36d8c32ecbfa97bf976133d65641320ca1c41e81c388fd6088884bbd89274b1976470fc"},
-    {NID_sect571r1, NID_sha512,
-     "d5ce9d59391cdc47ef942dd2a818d024ae3917deea8a5a4214e4db6a0c5e6b0936f3e632"
-     "fdb68a3f0006e05c44b7232013e1da5f877cd197f44fd6f60c1fd2378995e9a47534948c"
-     "5a09e33750f07a7165072ab38095373b07a50bc1391eb6b650ee13acd63d0352e7d9c316"
-     "95ea1ec6323f9b5f57b426ace56aa7fdbf419be0",
-     "2a920e8dc928acdd56e3655b2340d4371c793e66f67405fb7a90f31e9c4ef466cc44331d"
-     "1d2fe3ff7391d2576dc6640772166ef8c154a5ff1808f5dab2f03061070ec8b3f786c36",
-     "0405edc0fb974314e21ad40d73524d5620b7279084e3ecb9e58b06340ae53d2383efd206"
-     "b8b1eb3dd60c38f593efc05e2ba5fb8989472bac7db60fcada2d18d4108ab36e8c20cc71"
-     "0d00444cf65175f6bbaf647739cfd8407e7036fc6cc6208ccb9d776eb13e13b377136c68"
-     "3e108775d85b6bc5638926432a17344de965d45e042a0a8e0b63c7fc3a36fc15cf718f3b"
-     "af",
-     "35a0215892d0c52ece29559ebfa061011da8d597af6b3d1ee988ea4819be194c79a42681"
-     "476140738b1b5dc191485bd20c96c282ab38ddbc3987343155366b6a5d1ce7053efcd83",
-     "1a69a9a51f6b0dc196b2a8db2e8bf61764d4c65b038f43b5ed6b5dc2673971c32928606f"
-     "92b7caafb4dab3cd61ee724bba71a0d5c788cde4b96ef6b453f2a69126dafc20dbc7c82",
-     "13b5463636b8462cd9f479de8d114e29e7011489bcb9735ffe9ca0707a07df3c0aba0504"
-     "3eab387bfedd9fe982fbf04968f2be200e9e052cb4b02223b8579913d713acf94e7dc80"},
+    ,
+    { NID_sect233k1, NID_sha224,
+        "f23f784fe136c9fc0d169503d361e9c6148b0f1fbdcae0a97fae1af7033ddef25cb7489c"
+        "9963cfcb009a8cbfe44a8510a64a073eb1deae4c324ceb9302008c92c69b2dafcc9077fd"
+        "3cc3c7c119edc3ced36d176ceaa55ac036bf7f07f6fa215e8bb8196e59a5e1c9af4f98b9"
+        "0ab4970885bd7015fa26a09e03c7cf6b4b23d929",
+        "04c1d414696cc3657dd9df73ace56eda2636769ce7082e064c260be45a5",
+        "0401f228c0a75b057eb07fe7ce8223ed4163148c1fdab61e0f787271f836a900cdfa5655"
+        "d96ffd5ffb6027bfaa04da7b5d8fbdbb6202c8bb79f056ce43",
+        "058f8511089fcd59324469f6736b92693afe26bd4719e198f1f2287dc5f",
+        "016bafefb4933ffd00bd1db6d6c4fac8a06375603adc0aa2a5664083ff4",
+        "03bcb84b8f1990cfc7b88f2b8cc817105cd8e150808e7c87b310cdc47e3" },
+    { NID_sect233k1, NID_sha224,
+        "400bcb297552bb37f2f8135a9314a35f5126788bb6fa4dc74152731ff64c5dab4b902103"
+        "d85443dec20e16b1d6629930cdc2bd183d4099f0e96295a63c2fe266f5e9d050c401a868"
+        "1b4a438efe53cbd8f2f43e2a31e9f88926a9c82917d873f6e8cd5ff5eb8c1ca36126b0bf"
+        "c8c2b0e85a7c9e7a45f1875ca9c82019ebedb729",
+        "027cb1d84865a16992476c9e353283d5d6a40c349a8e9179d1b1f403531",
+        "0401191227d064176f4ab020faea61330df5eb59163ecb4ea59c23e6f1f6c8012dbfbf85"
+        "b3624b9f56446f840602f9b839bab1368295b3ae919cb07c07",
+        "01a41af270269be052a62a9879638e3432a1479b05776ce61f45c0c361b",
+        "041a5f1d28b70bfa2925b9428ab8bac9fa174d88ae27d754824c7d16ead",
+        "044d359065672b3d3dfe8389fbc6fc751ca6a46820626c466174fb9b922" },
+    { NID_sect233k1, NID_sha224,
+        "5f74d4b35c49fa454c97c05fdb6b9f6822cf1a2295f15bd766dbcb413d77c910bd8f4147"
+        "e8f317fac2300fa21cb80134d1b6f8ae8e50518c1f648a28506e419f5a6e8f05abffdb3d"
+        "d2587606c7e9c223ecff4f46b121216730ea13202b59128a7616bb2fd23a7e4a5aa08641"
+        "cc07b669641313febfc88d64d99447353dae3f06",
+        "031b443f46c4b5224237fac1022ee1570173f664aba0c84dbaa4246bdc1",
+        "04005f57b0e5f2e175006f4058cbb4ca9a0cac912c551ef1b94e97498fcc5a00f3a554d0"
+        "77b751478f8a2b7c2a9cf15effed958e0ac1a9e3db1e023c5f",
+        "07ff6ef3026c5a960e632beeb7313b3bca0baec76cea1fd9b82cedc3245",
+        "0099741698549c32a4e86aab6194527cea703ff869849c538a938585a83",
+        "02ad706c6f5dcff512498d84f1877eb997dfbe9b3d13b339917632d3cb1" },
+    { NID_sect233k1, NID_sha224,
+        "8f92096876d9f81bcd992369d42d0b5877ac969004d17c8627c58d8b8b7bbf7a37e8cb6a"
+        "fa962b9b043bbbaa5bef4a5ee38d8bd31cb5866b828265a2f4102a616f87009cd346fcb8"
+        "af5519fb577c60d8792472232f33dc615655e53d2b715b15a2697b492f108b7906e1e359"
+        "7c6911f8cc30c7121ae338a6b747ec368f8e4a36",
+        "048f6ca29f35f253a4962734357c995920967b9eeff1ba5fd2080bfede5",
+        "04012b7ca7c21292f8795b2fbfd63a28c5a4ec8c850d6240f973c903bc817001be9855e5"
+        "c5a5064c27d1862010b2fd0d7be5a0180c861a288ceac89d6d",
+        "07dcb9725323fd7668991ce9a907b7129d53fae9016e253c53d057d195d",
+        "0498c4fca6ed7c2998347b464d3e562a74b0e4f3a6c1dc453aaa61bb710",
+        "03a77a13f011404d5c5341dcd2ca44dc2b08f21f09f524045c281fb221e" },
+    { NID_sect233k1, NID_sha224,
+        "3d275dbde44494c45fc15fe89e2ae32aa26426a17e923e895c7941a5582fb95df4d49873"
+        "ab1bde358017f336b911b886b626b744806ab8113418473c441f1964159ded1b12122d53"
+        "ac56573167588e4b55f36b8bca8c67823883a51fb6e7f204d1c6b07ea49b577bfab9ca6b"
+        "8d51f72268b022e3a4db6f9d265ee8382f9b7b66",
+        "019b940eabbe682f961d9f3d90432e347fef3910e641656825d775705b1",
+        "0401efcc9f4576047c43eab1c13e0547b1c5ec1cd2afd2345fda72b5e1b50f00c7b5968a"
+        "f47e58f4ec15c0cd82ccd0b9f5bfde06c7f86fe5cd0105d693",
+        "03f783a94d1de73e4593f5d6d02238cfa0486e3ddf2bc0b95a528038e3c",
+        "013c467531f3f6508534ad072edb210e4182ce5a798d8a46674e92a0b4d",
+        "0685982aa8e2f3e46ecc03e00e7323f3b891da437235cfe9800139ee8d7" },
+    { NID_sect233k1, NID_sha224,
+        "d2fa68e1f7dad02916b12fa38f1849d6d409dbad0344438520b4dd9b77d62d39ac9ae3cd"
+        "eab03ccbcfd4de703c6e798873671731c108f322b9f2a68145e3e210c9b15b879798e5c5"
+        "3c5022742e9819b99edabb2f44d89ae221f7a99dc84421a6905695ff91928db608f86174"
+        "5f17584d56e34b75c47281435b1b0b34e490692d",
+        "07a884b22e29fa9fe945e9ba13c0df8d786dc87cef0f77f069e182dd56c",
+        "04011e831647d0ffd53d75e44abceda753ab470b3cc93b457590617d925a19003db5bd0a"
+        "ecd6504d904bcf9dcce131abd239aeadb9a64a9811eac823cc",
+        "00241b763c6245b83afe61762b161c41467ef35b7f27a9c1066f02babd3",
+        "0514adca3481ac5f99287e6e966a5c223296b07a9456eb582ec5568688c",
+        "07ff6a2f7cb1d2594a11d8d0adb6fe50b4e740f025e7b4333ee26163d92" },
+    { NID_sect233k1, NID_sha224,
+        "3830f75cf9df4eb2998c7c1b5fe11c1476bcf849c3a8fa7d3d0b5bc2292e5d07465ab8cc"
+        "9381c575d909e509c5dac49c78817c04e4bef18bd51bb09aa5897f21634633a5ce6d20bb"
+        "4638cb6c3927351eaec7b62cf4a33956916045c392f325adafb10a88a5f86d7e41dd7790"
+        "8fa7284210071c22aa40ef40da6339c02da05392",
+        "05da61f881d5a0dc085bb93764f584352882923cd237d878220ec624c1a",
+        "04018d740441eff1f785a14d04da4ba69540cbb469780ffd36e1dfae4f1de2018072ab30"
+        "e999ae26b872ef46a9a0604296d02c08fba9477d9e03f0f75d",
+        "000f95c5678fd08dda790cc60bfa578118f8687228a2ef5f31e71a6884b",
+        "074a6599b8cab75e0cf752e3f41288fbc673d52074950edb14f76524949",
+        "03523804351e3224e816cd4fb7191f332585f68053ddb32a85cc0fadc03" },
+    { NID_sect233k1, NID_sha224,
+        "65b9fe15e6c35d453caa6bad39ee78a720a04b60d8a0a0f049186d2f777e48ae2d657e17"
+        "4df53edb7beb9f7d8f21904ed674add0cda5b62a7308de76c324a144021e8c6d387daaba"
+        "4ce48bf7dfe9c8aeee2c64e434ece1fa5ddcafcf3e5d0013a1eeec1742a00d384cc2ec0d"
+        "7eda83bb4dccfb0e57045ebfc27a4f404d03da37",
+        "03fe9f04647f6d82b13ec1ae5a8c2e49bc66b05649ad778eb16149ad83a",
+        "040158eecc6b8918e7813ef990217c603b28ed1774c740382a8af5c9af613301bbffeccd"
+        "41107c7e6f83e24c822d634a7ec064fae125dc8a3ecc4fc9b3",
+        "07731edfb3ef523a165a1b5817ab2805a5cf88043c98ea2393898e19551",
+        "01fa44fa18ebafee6f419fdb9de0e8365520617558b57e9ee89f2c8fc88",
+        "053f1b2da4cabad04fea1111d525f341417587823fce71e5bfd2353c2f1" },
+    { NID_sect233k1, NID_sha224,
+        "d26521fd41eb5d46ece6836e188bf9cb1b461d011c41e002a935d256654d01725378e845"
+        "920ec4a7fd3f379df54772493df50d312c7c6aa4e909e7b83f2442c3a5e85c37d68aa015"
+        "098ecfb0a5e077370f4576f4bc63bf37e1dee06d780a3b6949af5e21c2a0960fcd20821e"
+        "f5f17bebf5fd5b3bdda260842cbbfad45667287a",
+        "05ebce648ace4cd555413de6a456fc487d14bf4b0b9a72311ef480d2f26",
+        "040020b46ecbdc36b4dc01111932090ba185eab2cdc4fa89775f2a6177c5920104cac1c8"
+        "00103c79642321a216bcfae497b037b29888cf9f70c507114e",
+        "027733120626e564b06ba71c4946c9c8bfae43f88511ec6352d2a52f407",
+        "0592de5184510e6ecb7be8a011f862470b918354a1ad82458cf716137fe",
+        "010a9c5fb6e4b70571a35c56744b57baf0108728bea2bf639af1960d1dc" },
+    { NID_sect233k1, NID_sha224,
+        "b778c021b1a92c41dbd09963da07018075d73e54d62df5c2b7bf8abe137151650d1c1c6a"
+        "bce7eebd8f32e8c3e6d1433773f257bb3ba4a4fb6a02c0db1e47d03c27d3a90898ebd192"
+        "7c21df24c4c5443ca5b81f8ef2cc0f5e8b3d08f472bf07085df737adaedec63d99acd77b"
+        "87ba98225f198b791124ac2d9b191cb9251b4b00",
+        "056653c2f85593f789a926ba49fa3da9d7f946d8f1020508c5a527ce813",
+        "04010d65f6f5415dd86a83bb10118abfc1b1670a1664eb6dae99fb68b85019012c1e673e"
+        "575086ec1e76b90d59c2cbd2727f726f88298552b678ba7e60",
+        "021e26c098c9f9da9c782857fe640ff6abb21caf20a093f2277845bd10d",
+        "01d67cbc8209494dca1a74cee5d9894f98f03728214f7bbdac29b0c0e78",
+        "02215f758fcf0d8dd603e79658a8061ab45bfe6d854e52ea7074fd5654e" },
+    { NID_sect233k1, NID_sha224,
+        "ec14e07f615960015a489ef999e308b42a4c571473b9bd64b433dabd9a1b1ad02e33eee9"
+        "100064405175928a94543a80f440040afa2965b4e5f95f768e7fab6d3c0a5f5e1bf1df78"
+        "22f78384e80f2955ea85f044ac60537d895747979f935bb0cd3673193c4a32dd7803e48d"
+        "7daf70a71bc2aa97236615b6411e28fc9a652145",
+        "049a91d320783cc70a5952c32036cfc75d41f1aa84127db2dc759fb291c",
+        "040190528df8fc3ae4db6e12930f176ec9c833d1668ac5808f1046366445a401f647d55c"
+        "e80b18a9add47fd1a8e4aa725297d9da03246f5c1ce503dd56",
+        "01eb80e2596d6c01431e7a4fd9e22903ea85547a31d675ff157a789a137",
+        "04523776d88199ebac2f96f9faa434bd81bde770ad4458ef126fde9198a",
+        "054665f31f92f8897482d34fcb63141a7539577037c84496167e9d3389f" },
+    { NID_sect233k1, NID_sha224,
+        "89c645339ad0eb850e4e2fe583cee175b35feb02ed7541d7e9aace24cdd3939584f73ad3"
+        "9526de6399c86b36de77a018e2c70b532bd0f032f9137d10480acc30c49f9baaa86f9df0"
+        "033b77e98b485bf7a69cb5c281e527d3ccd1fce2415f0dda4a268ce68a0a34b16afda54e"
+        "d922cd6810ac8dc766df2a3a6c5e55972e9786fc",
+        "016a20016602fc7088a60469843e1d29ad67e3c3cb9500b1e2a00d4050a",
+        "04004f157541dc3a8bc8a2ad4dfb3933039b67e331b7353a2fa9ede322f4ad01348a7b8c"
+        "9495bcbecd556870715faf3d543cb8f2368805473bca17b82e",
+        "01df1ee39217d7f0d838e8b2d30a1159d8003b06e50a00d637edf08d6d1",
+        "045d16826bbc425637e7a05b826bc907f7453c70141d1bbd2cda63dd490",
+        "01ae1703cf179dfd1d5407ba2b7324cc7cac15235ee9c3756177444e122" },
+    { NID_sect233k1, NID_sha224,
+        "ace14c4b101d2d8453c2bc22b756af016b5de537df9c3e639d208ad04ae0bf6232dc90b9"
+        "0c33228dc85de956db771ffde05fb4d0b15e4f218ed2771d703ae5bf981252a5bcd60c16"
+        "f14483131a481cbe04dc0adb1fb8aa32cb48bb5008e8a8e5c7b7465be2fd7afbc811cf5e"
+        "a6293b1a464669b49f55f57b93a8707e6042fda6",
+        "00ba922149bada2551b7be1c3df076f3f97ce93c13c50c285fef3f42363",
+        "04012daff2cfab994b9d1d1ba73bd2f8e7883b2d92f760b0d16351ec125fd40115666f7c"
+        "65b95ec2d713c5ab1a3eeaaf0f931b1859733416c3c778aa2a",
+        "07fc7c9503fabba0972e0e8892ec6331e0812c6452d211c5561fde79048",
+        "06477ec9d8d8d45418b9efe7ae47c0863ff94c43d8f392c079b870a7cf4",
+        "06b5a5d020b3d980b9d7880130802435ddb4e7362e36a70d193f18a7fe6" },
+    { NID_sect233k1, NID_sha224,
+        "cec2ba0d1772c87e87d5bbbd67220692bea4301aa1a66e8dbdd7e651d45c26dc2a0d45cf"
+        "c32c34d76ae3e1c61db7b0fe1863457b93937d929e6ece7462ebd16adfd708353d6f7c27"
+        "aafe06593c76da7149b0cc574a4290b0d8fe219f3eada7082aca38dba3f78ed0d5942d09"
+        "5fa5556fc8bcef331ff0a6d5d1f4e6c51d4ff5af",
+        "02d635e12a58cc6dea44e71e87c37f91e8d08659f0b7955d24f65ab55ba",
+        "0401dd33d8224ffe63a32f2de5d4fcb0e5f1fca7ca2ade5b35ffbe75cdc65800bfbe9dfe"
+        "13f99258c787af82631ce2133dc73207c579b29869c7463943",
+        "04ef333049c575d6688aa04f87a6162185e4a57bb752a7f903e3aff86ff",
+        "01ade04af08ea1c1877779fbf6335156b1a1437f3e449f07458d700c67e",
+        "010fa82467d39e5ad51cda8fcedc72ee6a78dccd0c90544814e53ba9cb4" },
+    { NID_sect233k1, NID_sha224,
+        "ffa13cd0f51ae2643d5d4edecb493ddd653e9faddcffc370e7e958abf726a5d67a2ab36c"
+        "ef42ea8ebe22a6f01b9c31f6ffad01e6894487d979acb5e618f765ac0ec3550ac5dbbced"
+        "e8f9fdbe52fbaba5c087ff382b6d7a09b2b5084227d324d98ff98793040884799b96d2ca"
+        "593201f4414f18c43b51c53c5e5059e0641aca02",
+        "0073883e5064e06814fc4de32e15f7a6cf825d2daf6eb1df8c83e25d80a",
+        "04000d3c79d627ee0d2d88f2de2dd082112c20dbc5ed66089454f7b8fd9f8101a2580e77"
+        "9753bcb023acba1b0852492b989c767f664c7047de8e6689fb",
+        "020231e05166271f47a91dd883c580ee313e9a07195ae511f0ee62173ec",
+        "0303eb4a0df97577c4cff531b3f54aa282e76669c0c5ebf4c9779c9bb82",
+        "0692432a7dfde09db7743f08130b3d3327dd98cbdc323627603518f70d7" },
+    { NID_sect233k1, NID_sha256,
+        "c73e3dbac9513d0361dabe94071faf03a11cba18c06d131a172d5f0125b01a5eeb6055bf"
+        "72c7106fe3f4be3bd2b1771cbe7f85366dccfbc3bac20538510c3f51179cc540ddafb2f3"
+        "b05a0d276899674ab1d7d8fb4f6838f04e4f9e26b8c6af31540f63f4953c85840af4c57d"
+        "fa78c704f637dfc8dd750fe45e2c1e149986d127",
+        "01532271bfae8d4dfe60f69b88d3006d58e28aacfa701861cde8d624db6",
+        "040041c1ca965338976b4c45c28b1cb64836b3b4d3e7ba2b1323ea26fbcca201a177d042"
+        "fba7903007db122eabc459e37c2c7fe82e42752b267fafe4b0",
+        "06a54894825644901baf2ec3681ce5aaf93a18757d93ec9cbce7ccd9d65",
+        "03edb77fc7686b520493604db18fc69edb4cad8195a958e27ef289c4bac",
+        "004337ecfac57abb9271909aa43ff4e32851df7818dcd87216d051189c0" },
+    { NID_sect233k1, NID_sha256,
+        "d00dcd0f3212a3167403abed91c20e76f5e7a7678a4fd970f944d11e6a8cd149d0aa6fd3"
+        "164c5a74c0f55193a4fa3d8ba6f99cabed10544625a7bd92b3e0b46edbd4a269bbc10518"
+        "c5268c3910a2aea567ccd32d4c7a0cbef09ea42c20b636d1f711d220e23dacdb9d1146e0"
+        "494401349749e5ed88e38295232a7effbae3aed6",
+        "0550406c0db882c6aee6cf3b6baf377375208c3e90cc44a067cee43efcf",
+        "040073348eaa8f2885fca3baf31830a2b28bfe983e3046418561f62ac5d24700033de5ae"
+        "e6d0bd4de286f1de1e80bf72e5e17083032bd4dc24577b6d2d",
+        "05c0e7ad0f9bbd522c862326a5734a766423fff7efbe57c51c315fa574c",
+        "02103f1a0200883850b6476c7d7e7d2b3e2f60923d028ee6f8227b1ec48",
+        "007cbbc3c6295ceafb3d9cf8411f85a045b11ef8472c5ed45346d26192a" },
+    { NID_sect233k1, NID_sha256,
+        "3d36221f87157ca4db84884b8666660c4e2b6af330480c516cded9f3bfe132543626a39b"
+        "b6aed1964eb5c33ea0b95b9841665417679fceb95d199d55accfce35dd3f2283c1a7ced5"
+        "7d0c4b9ebe3da6e1ff2f979b6440db27caf9f6a4bbfa47e20d29ae304f4d0551fce9cc40"
+        "97eb2fbedb9b24680bb17d207bdccdbe799d5b0d",
+        "0257dc63752920b6854d6c2d1cca68589a38418c3d036e73760a12214ab",
+        "04011a42e9f66ecf030d0446cfb751136347d4df0ee4e031058ebdcc04df8000fb7161fa"
+        "c8cc5ad7bc4477a39350e419776f76f184e28abce886ae9cc5",
+        "00391d36c4044896ddcd68604d5f677d1df298f46abc00eb12f1165e8a1",
+        "04e19bdc6755a603085b66355256bce98d5fdd49b4f06b628e3e185574a",
+        "07697b29ce5546de969c9c4bbb5ea65f712d6cda3410f3dbfa0cd5b1a8c" },
+    { NID_sect233k1, NID_sha256,
+        "033d82a42d0eddf58fbe3e91ddff7190e3f9fc2b1e2eede977d2c0473b358b5fce1f981c"
+        "a6f88fd61ce2f79e453e3a2b77d1baab2b970ed28d5dcff58873a620e195085e61c4b848"
+        "0d829525a1a944e8a4b63352f0291f0311f1f98ceb262804beec1c74947618f8e3b06786"
+        "6255878c2502966cefcdda4f5fa2b13d92ce7840",
+        "029025352297a7be850f8852411c09259b83219135e0e8949c1bd5b94c1",
+        "040184345e37f07077cc8df5947c1b1fcd8404b3c31586d6ebd91b240cf42b019dbc9091"
+        "a5d282fd6e62c34676a06a425e098567b990c47e61ef14d77e",
+        "02b2663a449ead3f8cce2459e04cf84333376624d994fd9312401ae57f1",
+        "03af223fd3a6b6b240e59dca83ce2477a577494438ddee3fd09632ea67f",
+        "0606576d89f2094572f0bbcb58a15d9a4bf10ae3667d4e35cdd8da32102" },
+    { NID_sect233k1, NID_sha256,
+        "671a7c81b64b2919722d7b258bdbd90165bb757b53106e0af03d0eef27452942f40cf52b"
+        "c95cc7f6567df2613cce795f8bcfc723b2735efc35375c001d37c58480d89343697146b5"
+        "24835df3dbd333f7c06c98e36d3c4592ecd1f34ab57c341bb0f4c785f5b8372775f74b4b"
+        "ce60763fad1788e77ea158d735a64861320b36c6",
+        "02dc82d0e69e498528925c0e62a13fda9af8cefd047c10c3ffc2e41da3e",
+        "0400e5463926235ce53a85b489c3c278320ed986003962a5fc7ad4cbab0d9f01453e6edd"
+        "e95670a4653186ebd8246c28a94dd84f5a669bd3293176f1f0",
+        "034a8dfbbdc98bb1d9b175600bffd866306dffadcc4bbb6f24e7f918da5",
+        "03cf1407445cf1a619a280e139242056c23c58979f0b3f0aa7e1fc074e2",
+        "02e55f27593f2c76fafccb71493f14daf50073b35cc85f002528cc6d691" },
+    { NID_sect233k1, NID_sha256,
+        "0ef677f4799298f4aab73b7393598041f56e902ced1726af49657b6601a06186212e3ee8"
+        "cd4bd33b760dfa2ea3c38884f94358d51dd479f2ccc8b0b352fa4e44fcfdcfbb24919d04"
+        "e6ee1108527b8e8d60e8d1b467c30c18c5455e5835d483161d3fc26b4a67d6df9e3ddd93"
+        "31247cb18450188752a1ca219f3396a872cb13d8",
+        "041535fff5d279bcd744b04e643458ce20b81df8a9e01b1181d52bb14e4",
+        "040021e1227457be78e49db22335139a136ba290d34871f90ab5e6a8db6ac100df43b381"
+        "a4d757864c39ce8d0b64d6a32e9e8be30f92a10a252d46a2e2",
+        "03019bd459b34133dc7331caa8976bee67f76db3a45b1793cb545e26c68",
+        "0025611bd4e3473aaea85228b2bf37eb1b4458d8166012aa098d9c1cab8",
+        "07acd38506e984fb7f1607b50837018f9b4246623dcfc9d7aceb486e76d" },
+    { NID_sect233k1, NID_sha256,
+        "9290df0cc50c3cab6655f3a6de1f4cf613d9bc06ea7c99f38038369ff2fadefa57a3c7ae"
+        "7940c1b98bb1d03503cc271f7a891bf38eec93c31dcec7892dfd2e1ab337bedde3e5325e"
+        "d8d9cb7fa3096f6fafc3beb3a66cba66ba826d1032debfb4908cc9dded8c0099c85072da"
+        "ac4373fbc428fcaa9a6da02181ebc33f0cf926fb",
+        "000ecfe580a624df66c25e87e7689fc3b471d205970ff9ab51a64aa12ed",
+        "04002ca7b9c98bb8106ae14a87d5f9f7ae1f99a5524992116e68af89da6daa00a2fbee76"
+        "9eec313cf3c8519d3f96167477f0f06dcc470408e3f637b6c2",
+        "044f065c49bb7ff0772d628104bc2e222f1fde42aaa8b9345d324d7f936",
+        "046301f3f07922d338d5b7d82104597fc50941e4bc0a15ab5e0408f9fa1",
+        "03495e335905b4842b97f00b344313ca7d6a4ff60cfeaa5d589e0a31782" },
+    { NID_sect233k1, NID_sha256,
+        "855c7be75fda372f062709827f333630acf28954a62a5193ff675f0dfeb63f32bca418f7"
+        "cbdb346bf388d62315b19a592267ca407120db93d4e3d7125b867c4c4670b7a57a76f617"
+        "34cead2caf2425eb9ff0a63293e8cd6defc9648257b401463f4533a2425e0024f1ea9336"
+        "5eeee3c6da20d25928602ec8b426f9b39f97f3fe",
+        "013c72c73358ffa168423149ecdd897f0a5f75a641de008649f00134944",
+        "0401c70e1b6c01477f95e718f193e13c093b101e9f16024082ac699ed6ebb601f8013a88"
+        "264266cb5cc5bd38e477fe0a1aa49ae4a5ff94cb58439a7c1b",
+        "07ad8a117f34bf2fcf7d689b8124e08118e28ebd172f8c220d57d3f0b88",
+        "012bc7d380192f2efe55625e39927ef799993af9451c662b562a239dfe7",
+        "035961b27e88d6731220f70e96d555f63853d14149df7bf6d24fc29441d" },
+    { NID_sect233k1, NID_sha256,
+        "9c896f800281812ed57d31623d563377a5c725cec84313472b90e73f77d400f5d4fb2362"
+        "55741b73d46f7e5254d04099bec274db8a9af5fc7cc220d42cc172cbd3c3595c49ff74bf"
+        "aab7b5e46c90855b611f74753ccdbbabf92e011d52e9ba753b83ed2a251a632e1bd5c6d3"
+        "46e38e743950c8ce0f394a837028575fa44bcc26",
+        "00ac60e2e70b7c4cda64071c7738f68773c94df9456a8ec3bbb468fa7f8",
+        "04000109614a2ca27b7a749e53777e0f3ee2f57013ee83ea539ada6d98d8a9005668f4b2"
+        "7213a8a024455b398de2cd7635cb620d7401f5deb4fa9ab2f4",
+        "00098489f0966e27555268a94378b7b8685ac610fb0964694aae9aa716d",
+        "06d151437a0aac232a472af038b0fac095d224ce0e5487510e30c31d605",
+        "0563dbfd021c1b77f980530d0120e93c9ee4f1f092a268bd8aba7d3110e" },
+    { NID_sect233k1, NID_sha256,
+        "139a14ead998d1a962fa47c47ef2953aa136bd912fe940709b8c560bc2a0c4bf8f3aab30"
+        "a8e21b7d5f487d30b0097e3da723f11b5cb4e8c5724f5a2fe0d68ee4bacbb85e5eacf180"
+        "94d2a8ec4506cf8497836a4a905059a998ea750adc54c27c69cbd0b0c1f9743a62f3d988"
+        "f3fa0a9865a73fc071f526623085a2ef12838888",
+        "060bf720052e8b9508a801340c213cf53bbecf4975faee63d4b44fc647a",
+        "040196e37671def44b35c9e8c719130389b40c7ebc0ed5ae354dc73e0c40c700d3fa0a45"
+        "a3cc5dfb61085290f6d18d710ad5d0d3ab31ce65b0e6915a72",
+        "0729c7e1de10e92634857a65a2ed75103df6bd4bf63b1ad6383c37a0435",
+        "06808491ffebf088476de7daf541bca3fd943d4c2089b848a130abdc0d3",
+        "02c0dcfff06a07e928c15a1fc2aceaa4b4dd6fe8eb67ccd4d01240f249f" },
+    { NID_sect233k1, NID_sha256,
+        "cf4a8e754b23d0fffc1c5c80b0cb11deeaba3064b315bc2cee96db5b9881baf90d30af4b"
+        "69066f757b3020706def77a5fc1632d96bafba22a9c8cd3b52d535d941b3c7cc02b7fe6b"
+        "51639d5e2084478ab3a29d2f5e0e16639fc2833a47b58e2c3fb5b2ea1830fe2ff68e571a"
+        "8f281617a23d9a28db1c64ddfb1083d055030e5a",
+        "07cf3c216592febd8630a478b5b3e3a605084020322adb13ac0a626bc7b",
+        "04008eee2ea13a08d4e4d71ecd2547f6d80b8f88879c9edfab5a675831fef2005117c0d8"
+        "a0442ad7b95cac1a984dfb9efbb7eb3c3866955da60e6cea8a",
+        "038de0be25c23cbde9ed9fb259cd9a06b69bf15dafed723970dfcb91307",
+        "051c9c5fe50eb81a11c8e7b2db145c6b5dbff2c51def56f4981774c357c",
+        "053887c6cc2f21bff461c9182c17f634ee2b301c3cc4af0bb1d3075f74e" },
+    { NID_sect233k1, NID_sha256,
+        "ae64030d4af9b36c8d3a6af0aff34e5ab201df04274691fb420b7d5c40c401ed7f3ade96"
+        "065d34f2490d17943e27156e7bed83cd7222d0d5a73d167855fbe7ff6c3ed87f20986ad8"
+        "bbbd80fed5f9705c6c783b423f641d40ff1f367f9648af5a79ea3cea0236997558bd9dcb"
+        "011ea4dc64d61ea1e1f85b4f696ed586bc7705be",
+        "061eda5999e5a9ed4485d2a0ac5510549b76ca37df858ea5d95aeed571b",
+        "0401642d56359cc0a5f261fdc405030d45b0d6f9c08a182d354bf2687dd9d5011bf0dcbf"
+        "62749a99e4b02b284aa7a6479b59b363d25319a5315423a589",
+        "03094fac5381a1b31e53f43a537d9e22ebe6bd2c149f2f69d792bd56f53",
+        "053c8c4f9a30e0500e01100bb97c00ce98f5cc6578686daa1bdbd679373",
+        "047086a88ea014f06d6345608bd0a6010e650b9f6f984b6efea9a4fb277" },
+    { NID_sect233k1, NID_sha256,
+        "94a9d9cd9efa3e4ccf2a37f904dd9cab5624ec9393cf8816ea591c5e70cccd2f105388ae"
+        "133708fb974998ae61d218c71785f9eb808d1c28d953cc7eed00dd9854b6b4568c5ed5ee"
+        "3df3b58a1e04c64f1c87fee4365ec9aa41b08a6bae234dc43a0bf2f61420acdb891a40f1"
+        "7f246972afee75a4c0b249dee0fc8f9b9c8a243d",
+        "07e7e73171e4d2f2989dc024757c186485435b82544a448f5cfca05f281",
+        "040181c8cf579d9259020461184979757b097d5a94245a2b9a1f8a6931ee0a014baf1b76"
+        "1a0af3dd9c0521c6489f9a778da824283c94087698daa7cf78",
+        "02b57fabe6b866fd25ad8802c6b02b680c137ea9b623457b35a24d5a5f3",
+        "07421dbfa83859354345b9c3f1ce6242605094d924a4d38c7bd952e3910",
+        "05ee48a3a5119bb3433b53a625101492216421ce67fc04dacf947ec600e" },
+    { NID_sect233k1, NID_sha256,
+        "4db998df7b90678b8aa4ec6233c9b4629800ad1f3e2cf8f7afcac62fc6982dcb290e4458"
+        "7015eca8dfe77dbb4a80f9bffe75b11e961e70deed14555db6dae47d49e73004f000eb86"
+        "77c18f7e8234bf0a5a104266167a05ef07152e7acc2f0368b37efe69c0c2feb51eedf733"
+        "8cf9ed398f066cf1f66bacd89ab9376d41da35a2",
+        "05f7270764a0444c7159d2db867930fdb0fb9fa6b8fc80ca02e11753095",
+        "04006806c7164a09e11629e16608b7312d9d988acefa626fe8e34e03203d11019c4200c9"
+        "522618dab8a16e217beb3011599ed6cc09291fe9d451f0cf02",
+        "04a8958c80481a18c6e0893da9ab2d48fa6ae30a0f1d0512196e658eba0",
+        "01d301da51eccd15e09ce0bc2d0bdcb215a43ed13792084e2969260d46f",
+        "031f96a2f322d27d0bef23ba7c457fdc45a6e612f7d13e9277d36c8def3" },
+    { NID_sect233k1, NID_sha256,
+        "dbf9b8a4ae316bd2df0c80db1cb5d7038364a2634925ff957d7c03511b57d486274b2ecf"
+        "191746827c325a14dc94daacd66ad86d369e3f598f176c4f0eadec7e9edd13e34043efbe"
+        "0a801b75b8186b4a6d89ceae4fb250ab570d65b6dd7c04382738fe3f6f6c867a7d84b35b"
+        "20720cb0036a5d81a87126f236833831d9ff00b1",
+        "0179b924afa4acf30ecbe2b3c12de533a1f9675687876a7e5e5ddc8e03b",
+        "040175bf95ac8e768727d3b4a74c2b8a04b221247a3b8386ddf35fc39976ad0122f32f94"
+        "1066150c151b9db92b86f86a10cab0828a77e4f0d5c4026540",
+        "0210c75a63699b424585f65497c6e46988c28eff3e0977e3ade599581dc",
+        "06087e46c0677e3ca64a0cf030236583935d0dc03c896685dc6e446d9e2",
+        "0252e42b8f03b085f38c6849bd420837d985c9fe14750a654b584c4cc5d" },
+    { NID_sect233k1, NID_sha384,
+        "986d9e5d636526f4deb7545c037fe81b09c74496ddb8e42e61650c74b6fe348593f0cf8f"
+        "8eca5e839baf62f17bf6ad96ec0c71dc44fdf11259dbfe7499157e402f6bd50769723541"
+        "50723afb632799a990c44cd0a4fa9609ec4db133e3b4700be3ea4a338e8ba1873d345e80"
+        "163ed60d0de274d7617a8382980bc2138b0a2a01",
+        "02c9eb4d392d7f2eef606e1861183acb1fc753d666225f0f154d9eda147",
+        "0400d58fd7b5aa570b1c4b2190ec413fbcc9ef44d33ef191b6e23abcb386900173e85377"
+        "bdd8dac58222cd1d0f7ed98d73d6fb6c2eaf34819b08ececa9",
+        "064f9fb13784c99185f334700ccfcc4ff60b7f4d613c3de6dc5d1b8dd5a",
+        "03bff54e3610ade656bbe002867168db1b521c49225eb9662950b01955c",
+        "01da3fd8c08d8e17692059c669da3c7c4c146df6d3cbeaf34598d28eaae" },
+    { NID_sect233k1, NID_sha384,
+        "68d0be2883598bfb1433886aff118349157708690380c42b8919859d96db069c7fde6e11"
+        "7a3669f2cff94a0f1b66b27b09e3f1b24d26299e11552a084be428446f3174da2e041465"
+        "5bdceb38e58fcb065b6661190862db39c6545dead34a03584632e988d0459659dc7c7c78"
+        "d4d00fc2aa10465cf24b2410f14e2a62173c9962",
+        "024661c89b77b2c743cc175a6130904461138ddc4ef771ffb9fc2c8679a",
+        "040090383de7ca48f1e71a43845565a9f0c53d2c9f8c2e0f6c4ec7eb6437fc0167658227"
+        "2e7ebc9fd56e1010a570d744ae4fa70eed3e6eeaeb0e0eda7c",
+        "05cc5b36c7300a1cc3f624e9e663861b4e296f7e7a27e8f8f0a2d54eecd",
+        "039c6f5b484411c434ee161ebeda7aa21b7bb26bde0301d9ff92921337e",
+        "02aaae737aedecfd5d53af56ef154ac6430a45ff03a3495a34a5fe0e97e" },
+    { NID_sect233k1, NID_sha384,
+        "f0ba0407485fecd7337f4b22236533a926cc744a5f06dd08276750196f1bf7ea7984278f"
+        "789f92dd07e36895a8bfe297ea43d4a1177c0368900e3b969d3083cbe626f0e27e7ab38e"
+        "185c923dff46d9ba187b2acb9cf4b23ec8eedbb8044b96b5263d956e50cd6240c66d5d96"
+        "517130c743752404ed09473f05d0004dc5971ff5",
+        "0065e20e5ce534576d7c17616cd4ede3bf4f500894850723bcc9f895f4b",
+        "04001413f6dd5349e94311f1d25e400b69c0f0ea446294eba4bbeb10278b850066a05055"
+        "d856621161d4f0e33dac82e5c0cd91ed8aa56e9abba9ec80cb",
+        "07377147b59dba008ed0e6b366e511f94c7f7c9088615c6d46f46736b97",
+        "05515a6bdfde3b4b78489194d39f4bb439f58a6b3c3f9e16c8a71590b14",
+        "00778f79083d11efc8ff959f607c4cee7cc8f38b855028ea248fe291adc" },
+    { NID_sect233k1, NID_sha384,
+        "3827276694e413c886129c452c9a66e7d09dee84f5f09bf34e4baa308b4627e096c7d45c"
+        "f6ef45ba1d9a4019a60399feec10fa80e333e2aff1251c85ca48574d9b9e1affb9666828"
+        "dff5afcef3edaf5e8cae823505a0c73afe76c1bf130399fb06b092ba34ab0ae15ac6c682"
+        "f9ee8479b065ce75b57213b8aae0f55e4e386de5",
+        "014c85f66fbbd653f1e4e590cffe62c343ba6062df4b271fbd02e5d42f7",
+        "04018930b4a59a1c0e92febe650347c49e29a4e83cb8c507e30ad835dbc94b00a237bcd1"
+        "30235e34b4439293f15e7a3913d659089e38e5619fa52e3c0c",
+        "03c1f8d076fb4fbea91a97800607b2db3fb5a45149c0d30dce79f07e963",
+        "04b9d2c66d8cc55b64f3f62dc629ce8e50ae0bad8a4d14e8b6567fc87e4",
+        "00b9dfdbeecb061a455dd052258f3828d4b7174af972c65bd0043a9776f" },
+    { NID_sect233k1, NID_sha384,
+        "d1afb8965b48d66b9acb1ece674d9548f83395275f2d8135554cfcc7ceb96450d850dd87"
+        "4529433883709483d0743798db5e0dee955a4f30ba328c7934b8dd9207f3c336cf89141a"
+        "175ebe23d2faed629eb4236a8aea8300604c3eb7704512f240fda66acedf1494a85058dc"
+        "6a31bf9531958c332b93cfe5545046876c6b99e0",
+        "030ac7a78593b570b29f6d3d267abb6ba7e5870ee1c8ee4f1ab2f141051",
+        "0400a409e90eb4314f95967607ea3de9817a0fdb439cf406135262624e7fac004b1dd719"
+        "434e8dfa5861887736f32ecd635878ed4b9e290c423da09059",
+        "027c4987ff872fe499039b4432dc889960ea8e3f07be42e36a5827b3964",
+        "06829b5e02b5849689d152ceacdddbfa8f68d782b3ae8da23ea48b1acbd",
+        "03dba0d2b4400495ee098325ae4450b32b83689349e82a69b799dac2cbc" },
+    { NID_sect233k1, NID_sha384,
+        "4f95b71669fdfe5dc46d4b951b085e099de349fc740535175337127910acf24e9a0e4b2f"
+        "23196ad23880da47b740d77d74fe9bcfdcc44dd7d8d1a181ac290de5cf4da22d5034cda3"
+        "d8020bcc776dde8cef1786c9ce4d2c2cfb035da61406af745efb7ef1a55f2eccc5000319"
+        "cf1d6380963025dcea641cfd15a3106751fec286",
+        "06d7516aa040f7d559cae248e485834e8d9bb608279ed4d4f7e1dbcd2b3",
+        "040127a92888fdac8d4ba9c0243c9aca516bcb431911254bc2cf51883623a100606c30fb"
+        "b9958fb1140643f32c5dd582c2319f71bff197d58ba3e598bb",
+        "01104b6ad82327b0445e75cff0efa1281d266a9dfe4019ba2ed22dd6976",
+        "01f247b2850463e362ff8879054d3459b2cbae84b9d4bc005a2ccf4736b",
+        "05b3dbdf04758d546e54c43ca5973bd8ceba646a4dd5d17ae5d2f8ec516" },
+    { NID_sect233k1, NID_sha384,
+        "2ad9e17780c824c4f2d1e1cbf19ab85638f2f71cb4fa3518f08085b8b358f54d4f08394a"
+        "5ac29cbb3cab828c5f07f41eec51e6cd61a5f2cf44dbfa46834370cebdeb328fd3bf681e"
+        "61011b5c2ebc8945ac7a2a8467606051008b15c89390e111999255bfe28634ce9bc2850a"
+        "2b55a4af1c4c2f94403c78aba1ebc87386ab7b32",
+        "0137050d7b455f43a8dc2516cfff5a91062c1a2727b27df41488f3dcf18",
+        "04015ccc90a5f3906469e3ecf7a70c429f5b50fd0ce74065d41f1bd6dccc1f00fe5611b8"
+        "b1b35a907bc188ad2b1fb7507d1043d148283911af3ad782e9",
+        "04881e879d7c76eb2ee61fe1844567316d7efaef047b96979e6dceb7858",
+        "03799e90bc64cfd7d0246a7fc89a4d8ed0399277cab2af40fa2ec8196d8",
+        "067e8728f4d8398e4e1c25775620865bcc2d4cfe635a1f4c6b7306f6d9f" },
+    { NID_sect233k1, NID_sha384,
+        "958773c37d3eba003aa5c489f72118b3022c52b93399e9d8001695664918b86893f4922c"
+        "7b6e55b1855ed0fd1d8de5dc61af403ad660fec60d7c44bd0102c069957ed804d0d416fa"
+        "cdc1a95355ef58554606579ef89b1842f1055cfa2ae118abbc485356824cc09dddb77d06"
+        "71cb3011b33bc86cac526e3f6bb3293c7bdca1ff",
+        "001fd447b33a2ee3595b9f885c290d241422afdd74c3dc4981955a7e9ad",
+        "0400e706408803188263cb149428c60de57ac757f0776e5b27a2d5a859f58c0153b5e13f"
+        "17f0178cd90427f7d608a5659b9e03effebc89da65d59698d5",
+        "0339300c00cf7e8c6195ffb71e509613018e6a417782e4f52704026a510",
+        "0227c80e36e3571e1c783358c9ffed237b251332e8ed05a8d3b454c53b5",
+        "0679a32cee8ae001a18d9a9d0ed7e99e5ae67ffcd54de7b48c62e76ac8c" },
+    { NID_sect233k1, NID_sha384,
+        "9cb2c496b1bc7f040228571e005e7e936e48e8f469e295edf914f5648701249a20bff6b9"
+        "8b5e862603dd9f12bb71c160aafe9df02e2e383e9b8a9a9d700f4425ce408feabbf754be"
+        "543f52204c849fed6c9d3e36e03dfbd9e35c18d7bb2295f1c484a66e73440a0a5aece5fe"
+        "80b9ade9321ef18cde3eb2db15e4b18e788b0441",
+        "06a061e10b4a6e7001d95411cb31bdea9c84670a59ed61b14fbbb05c8e7",
+        "04000ad2b726b805919cabc90d058c78896d2dd8a78484c1fec5bd5fb0e07b007e048ddb"
+        "487f667633d6d030338ded21a2ac5f65373ddcfe1e4a3424ae",
+        "013b4a86b70f0e4de6efdafd7ecc993f0d6f231b3d743ee5adf82db1515",
+        "0541c2d3b2c6f0655dd415e327f0ef07b03356f8047117c41e704169698",
+        "00300f45026200b8cc84fd564778281bd1d7e03727c242a249d9ad33338" },
+    { NID_sect233k1, NID_sha384,
+        "9a4bc0a029e97742ed3bca207d5912cb568e4403cda106b00247520ea02008b14c041b8c"
+        "9b976294252da835f4ff27456039d79d90315abcb0b9b6958a22352672e229665457ec79"
+        "571ca80447c8ff2a86e6af3dabe7427c8bdcae65e3c6746a56079ce2cf8d22235180f466"
+        "46a21cd9e86032cfad874cb9c67f882fb037a13f",
+        "027ec31ca31acb4d2fbacb49fc085f1261b0042cc755cc97f9b199e7a37",
+        "0401d521f7abc2fd3b0a10732ed641cc1b7fdd7b49cf61909b215220c5253e0019e9095c"
+        "67af1b89ae6c486c4f9889c3f2994743eafe55bd9eafe438d9",
+        "0151aa44fd97be14578d68f87dbb884c960ab59d950c392e607ecae6bac",
+        "07be427f46958538004186d52aa50a0f83d184a9d2f4da2974163854eec",
+        "029d4ea73ab5b336ed44556f6944e734e531a5c71dc6c929e7253323906" },
+    { NID_sect233k1, NID_sha384,
+        "8d89e22cf802dc68ff22d43c436c79311e705ff6fd845e77c880f399f403e6d5e9e2b355"
+        "11553c978171189e288cb2200fd95f84ec5ee9865c0eb9190aff6dacf783ef200e82027f"
+        "a992741876456472bdf27f2bd8ee55db15408c957a120eb64cd24d299818726a73fbb069"
+        "7eba726a326719765735b37a2dcff0c853c906bd",
+        "04c6f4d88e5a4f4f83196f2dda9dcf2a66eaf94d50c851f59bfcea1d876",
+        "0401e2677c1305f545472e373615d195d1f7a315f592e26fbbf44c4255805001638140f4"
+        "8bad525625a87d0e537db5500f034e71e60e8a8c48eea04108",
+        "02185d8ec6f35d5c3f965cd00597d93caf45bbe186d4128bf877ec304eb",
+        "075199f4d8af090e4666754a7dac0c1599c207735c0f54c9f11e305727c",
+        "008cadf59a224f812d64c2f492e7ad4a923f3463b878dffc75eca5f8fb2" },
+    { NID_sect233k1, NID_sha384,
+        "aa1bf5a79e5339fb9ef6c2817bd95725551d064bc5064d6586c5a879901adf808dc2ef7c"
+        "78ec3b434b84569988db58b5e8e9782b1cbc2cc7c9b68e66f32d4ac4ebe7e75b345f654c"
+        "7b8a5e650acc9f170f75b7aaa3957cce248cc69cf93faf8d72abc6fc1cfa9ae2d18a7b31"
+        "ce720147e88e84f6563b2197882fe302449ac5ce",
+        "01aa169ea84365c22981bb766bfdad27e373440850569957544b0f9332a",
+        "0401f97d91302c70798e2278348e36bbe01587e0031ac3c422141e3d4c150400a95108f6"
+        "b7ff41546c98f4ea4d1b587a3280e49c6cd0d33abdebf9a1e7",
+        "03c9efc0f72d88168c2b1f7fa1c6e275839303c2bddca136dd19ef446c9",
+        "0639d1a1066465b4b2f443cd9677cfe3bf5bb33e3e9b14cab2d37f4a859",
+        "04582792ba78f782f112711ceaf36f5f0774b92a6fcaee327d687658835" },
+    { NID_sect233k1, NID_sha384,
+        "475664d5e22cbe0da0d0289ca9a666a37270dc71c81cffac91f6229fa39315c1d55f7e0a"
+        "89b6a7a07df7d391dbdf8fb7af63d2da46ecc3b60110dbcd842da97f98d2b67f562b0364"
+        "ef8e1c589519024177c8ea079794f271f6d35554c0e9d0a39062383c95721b72f4e74eaa"
+        "fb6fbfbda02cb670a7c4c94f67b8ebc6442e84e3",
+        "04a665b92c0c33a3f8b9eb4b0ec061d40b603de36c87096455102ffe57b",
+        "0400f0ac5238553f0cd74e6f34f7f82563cb01138e5c9bac6d5e7b8b7ad4fe01903e9fd8"
+        "a5a2aa32913b18bddef20667061f919f8d61a5b3c814ba4aab",
+        "070ef25950a795b5e22fe4cf5402f49029c5d97cf9f57f0806c0bbb5855",
+        "01248dcf1993ac2eeacd062f853ebb4b2072357e728f0589258399ea95a",
+        "069800eb2e2b3a9162196dbaaf67cab4ae123ea817f223acb6e889f6d7b" },
+    { NID_sect233k1, NID_sha384,
+        "9e5397d94465390a82a3c07e3ebf21b515776d18b4463aa5810e6b2f96ca61e92d13e034"
+        "fa853c3fa45411f51f79df6f799a2c6906e6a5b7896a4576a4464f9e0be2b529a43e1f50"
+        "3fb640d79db6b68f3a3a7deac1b5832fbe86673784ff6db1f8438f7dd332cdd1e7ad9df8"
+        "b6731aad1b6a72bde52e6bc62d80b8da57822c48",
+        "00531540d94823e19ab2b95cbc6e7492e1effcbabce875de6ba96f53aa9",
+        "040031ba225249916a5380235220b9657162eef43d59ccab507639e19bcd6c0062e85d61"
+        "366a73b62255c741a065708701c8fa024a15401a4cd58640b0",
+        "05375df0a23646e8033ec9e3ad269e7167a663b97b4f52cf18fbb5f50f4",
+        "05bdf7d643ffde5ea191553a9c99eb42fba9a8b6e2013dcc520298d224d",
+        "06cdd9e0d58bd4c5cfe66589ed7c7d15331f3e164dff562b6971af1a41d" },
+    { NID_sect233k1, NID_sha384,
+        "3cc4c4192f317e52df6f8cefba6d4cd823c942aaee11b9a0ef5de5c2d181073b7085a558"
+        "05e9554def8dc13eb978e7396044d4f4a14be2c7605998c062095c929b9c23b2b1b2fa73"
+        "dd19a0c0af44ca4789f9841fa62dee8a5f91b3cc4b3264f5f67334c3f0772b30bd7431c3"
+        "fbbf1f34318ce1889b6e8a76ce6d42079a451e56",
+        "022a89addd8b85809e87e0aa2c038593ec277054842854de1197833a51c",
+        "04008e760b282d0ae4eeb2fcbbfdec851468fd8e04c4dec71fc2d5d3a98a1300849a56b9"
+        "b0b0a1ede6b9f9522685e7ace3baa57f72709aba705814d138",
+        "05515b025d6196ffdc8bf275479d72b29a752eb3e70ebf07d4c4e7bf74d",
+        "041902f9b7bc81d3a88066b03e4111ad8ff4d99dd868d5608d1f43eead4",
+        "059adb96af9f404d2f04d89fb39cf38ba5689f47bda749ae9aa1ecb097a" },
+    { NID_sect233k1, NID_sha512,
+        "72cdef5bdf710978e0aa334b86b8ff4a58630da314eabe98b4d611aab56f55c526983d54"
+        "d19bbbf9ddba30a84b18aa0bae9f9503e9b222f842f084db83aa39625403213ca321cc0d"
+        "9c8a136c826e6ea4ec108b913dd0a9ce9d5b8c7e3af53c3876e56a2037ebd6d99f037a09"
+        "7111c837647bedfe4c494e4288ed6427c15969e3",
+        "01df252a11ff97b4421b3a2361db94e908e8243cd50d9179f9e03e331f1",
+        "040129f011fd5fedf3526f0437ae800a110435db907af60e16912d58523202008026ed86"
+        "afa7ec80277f322dfc8cf693089968ed9ceb8c95c930415a23",
+        "04fce14bc83be6f862f06680a32e9a51d1a569fdf1d9b10a89eb9fef4bf",
+        "04d7b8d19dd9cabc3c2245a9d2c8431c3151eeb6f49676a865e78c26c2f",
+        "0373e69da1fe35ce41ff344447fa7ffe6fc71e28dc68244372745739fc2" },
+    { NID_sect233k1, NID_sha512,
+        "8e4eb88c0b2d525b2c58b8e00f32def90e6dd382301de49e0ac053dbc6b61afe926d8519"
+        "3e2c4948f7402a3d7c614cb2c58e060362b0516a1ba4a7425f1b3d09aa20d4c3c8993a38"
+        "7a3248aeec51e6efa8f558dbdcfcaa13ee08413227c8351e3107e9a3e3ac124224aaea91"
+        "bfe50c11c1c8ae582e718f50bc5d5c06076517d6",
+        "01d7125c299ebd0dbcc050f07de931c7ad0450af590d0a2d0228a66ac5d",
+        "04013ebde8790a113bdde87c11ccdcbc39e354b193d772921b86657f53f74a00aae910b0"
+        "e22f1a2505f55fef2eae47ab6d47db6e49190a5469b4b6dce5",
+        "0113d1737bee59f9f477f71f77a0ac1aea86aa67002c34a1b31c421cd7c",
+        "066f9871da9a22f07c9b2a44fb6c01ac74ba17649cecc33b729afcb488b",
+        "037fad90c288510d0cd8e99e5d930f4fe197df779dfd6088da48986c601" },
+    { NID_sect233k1, NID_sha512,
+        "370fdd80f330311dbb3959666001bba61cdacf20f72f78953d946fa6cba02d24b5003f54"
+        "52d535609e489b9434f192011f99f918defe877d51349870e7e75502f61145f7c261dbd2"
+        "a0840926d824ebe9be3c5a77a3a84340aea930378367ed3615a47e3f792c7773f83f91eb"
+        "ea718a05fc62e9ed1d78629b2c27ae44fe8f8d4e",
+        "021238e66119844b146d40e48341f522f6ac2f9c8a0b33aaf95a3099a41",
+        "0401dc3ac1ecb670f867337b752cdbf48bed9f32589366f7c6ba7424af1d6601e3a38ded"
+        "8148bf45484ab6b77e0beff759812493347e32d2d54a322a2a",
+        "03626adf8e70506e74ea27ce740f7eed1c8b37d50415be6a2681c67ad2b",
+        "07a9c9056b51f1fe3e7733c6f54ed96662aa7f5a08a961f91fd6d0276df",
+        "05e7600e9fda45bb966fbbb5a9404af961058a128824b6d84d9d47ebdbf" },
+    { NID_sect233k1, NID_sha512,
+        "f86c4433787c3ec3cb1663389ccf53d62f9425274ccef05fd14b1b8fef676208867764eb"
+        "98d16d006ee6ebdc27b8d9a8ddd303d941fdd82b630694cdc698bbe6bd52441190783428"
+        "6c94b24ee199fe6d646064277f244b7df3ea2d9d52a9dc6a33d7c8d6dbc919da0fa987a6"
+        "7621ef0829e48310e0ea2bb86fedcf4effc0b94b",
+        "015e1bdfdacd87c42ed439f3e243abf27fd42e54f3ebdfb47f60dbae5fe",
+        "0400fb7fa51c1a96baab65fc85c3b769ac84ca7b63a1fe9f507a2ee0c49395005d450aed"
+        "449f8f1aeaa9df0131f696c2bcd4528808d2f52b6a73f72811",
+        "070ca3f5dc30c70e576e2d2b30935b05b6e68598eeaafa1bfcb9e156e05",
+        "07e3cdc4207456773aa52b44156801b316a7ac850b3a9e717a9ae7fcdb0",
+        "07ad6de3ba8730ac887f045cae80fe2fb5237a8594e7125c4792d478594" },
+    { NID_sect233k1, NID_sha512,
+        "4117d593aa92e3eae1124ec7482737cd3573fe5f0f2a5051a7ce86946a2abb9e47a0c6ea"
+        "75b262689b0b486476d2ab09a20efc2fb921419b1811b51a2e15891ae9e45a17ab4b96c6"
+        "65c6c423fc00e2d66df5804a164f0f3c958df6f25d7da6829b1fe162a0a8cf130858c83f"
+        "3555d6ad627db70cb41303cc6380f7b3fed2563e",
+        "00e09410548c17bbbf28a68c3963a52d39743a4f1ac28e6dfe7a6ede281",
+        "0401f5f36a21a3b7fc5ea37528566da695922d7d9b7e6800af9c1a00f68242003df4e2ba"
+        "0c8648cb1fa19663f31786b850e6b80068b8c007f41de08608",
+        "03c0a2a4bea270eaf66adfb297c0e3213254cd87b11edcd90cfcd6f3104",
+        "07b684e337d6778f84bdb7a6835e91877b41d6af4b76311258fbb8339d8",
+        "064a0c22057a858b153ecdf4d275cf5523dacafdfcb46423b5613c85691" },
+    { NID_sect233k1, NID_sha512,
+        "882ecaff3ec8f4023df5397167f238869f78a5c499be19aea85c7486e73f66f0e08e71cf"
+        "85f3f1b6f6a70796bf46a18e6b555a0a87c2088640ca73051b3dd59ebfef922be0372208"
+        "fce602d8001681297b285701dbbe24ccb42541b5db4aac1a1c7f407e11c83db15b38cdbc"
+        "25e930fdc6558f64d9503e214571a435d890169b",
+        "049f5bea6e72d98579b78cb07d89f64503f8759dd7a73cd73713c120428",
+        "0400974dcd68cd85117f363812a0473e972c89551e31c74c8d99f1073eaafc00f306c905"
+        "1cf3b84803307beb3dc0d34a9758a4f535100e846462a49053",
+        "022a5564b468e706762e3ff934aa22d9aea0bf2b116b61182c9f7be19fe",
+        "02e050afb84e1b0591fb64d46dd7d4a939552d68bdb4213f16c5d7ec5ec",
+        "063225df0057d5368b2e103eb2181ff5760e6b2a9c13c83da042722c3e4" },
+    { NID_sect233k1, NID_sha512,
+        "99b3b8f876f8359bd6369ce84f9261581c52d744b90261a1427ab9e447e6d833b6b3e89a"
+        "f8dc770f1dd55692d01c8bbc4277a729fddfa7cbdb2ec99133201dde44ac691a77904ca8"
+        "16feb0a1aaacbb9fba85048bc63d73506eb908ecd697caf582747051a3a38ac8930c9a43"
+        "65f407ed94ca7f2d26913c53f4c010c7ed9d7ca4",
+        "005eaa818690d1ca4838f0bc667be5721d178c3869884260fb230277c3b",
+        "0401f7b3b50167cb2ff7482240bade95f2850a02805742e6e29eabf7f9ad3400f8038a8c"
+        "ffa0f798a01e333251996662bc3c0ee56d94c392269b63edb7",
+        "064d518f7b8c87325d8edfd42a52793d87ef8db283606dd676be8584562",
+        "07128123004a515e277dd5b571e31bbc877cc966e27ed5b2ab2c16e881b",
+        "051d70485148996ec30f92097e4a12b5edf804e03e312072336bd912268" },
+    { NID_sect233k1, NID_sha512,
+        "8c1a83023930a85c5b2f9930521b8b8963d5523a3323d87f862a17d3505ccee01246ee10"
+        "29b8b8c2b608772c4096d1e914cb398f027d91184a8e94e4feeae121eabb504a2a35c8bc"
+        "9294edd15ddd979946c14c792ad787dc2d4deffa284830fc90b3f8c0ced6a99fc6de7c41"
+        "b9ed261402a6b3d702ff86a9392731ecc37430c0",
+        "0603d89cd2f741d734587e77554fe6bbb1e5739d5ff73084d4de8ed69c4",
+        "040122f2b7802917e4164ac2f54033621c78cbc7040217e5ded6b9217f95bb01f867df74"
+        "3e73806957066c2ab45c04bf1af158e146a9d1eda9e974e0d4",
+        "076850b8ca9e454bdb320da624c0dc63e14ad279185e4f8c9e49905666c",
+        "04bc63bafd5bad022fe5db246680a0a0ccd0b50ff50482d3849c92eec7e",
+        "07b6d8a8446ddfc64392af0aa1763d45877023c0be9ec78db47efd3c366" },
+    { NID_sect233k1, NID_sha512,
+        "f3c9dedd7115339dd3ede7d8d06a44de66bf80b4888ab7bc386cd40a92789042440a13d2"
+        "cc90dbcacca5feeec1e0e3c51724146e2c4904ed6b05c7b4e9b49d7f458ada695c5d2fc3"
+        "6f1193329b87c1268aa38eda9151430aa0bc004e5d2a61b9390accfc699f2efabfec785e"
+        "b34f52b1beff1e4c5492e922acc348667d2a3986",
+        "07977b3aba53616dac27b4d74930da23966a88ad98f1769674789c0be3d",
+        "0400aa61b4bd2fa9c61914ae306d69d3ade7d6cf621399e5791dda8a054dcd012e8d9274"
+        "d5593f5074c49ca34a7e2d64f9d9ccdf42df6087134b811762",
+        "03b8ee56bebb59207e107bb0c16938cab707e425f38b70f0bc918fc1b8a",
+        "068502a3e5e51f5481aad31eb6614152f4957eef1becfe3a297b023a94c",
+        "07b6b43be63aa79c10876179703b69caf9b03c5401b999a3c5be4737999" },
+    { NID_sect233k1, NID_sha512,
+        "d878c4ee0bd6c84652d7f9e68df7b90cc78776d8d1b60f3e4d7465032bf401f1527ca7bf"
+        "d4a3dd916e13e93fadaa5e5f20c9f47d12f8fc922a9a3aaeeeef294c221ca1adf7df85b8"
+        "88faec8002f17ff202da1be837827619904121167bee2d2cd694a263d9a99062cada3399"
+        "dcbfcb283597a96ebec129c65e0850ec4cb4e2d7",
+        "050cd20e7eabd29008cc977d0a17e1195d79587b8f15ac2447e15daafc0",
+        "04001ff23ff4ea1f30663b17d8f1c67ea37b8c5df7009d0c0301db483803a400ec6bde92"
+        "921b83d4d84be8a67a23e1718e575101b93d9a800550a20e7d",
+        "041ba36d2e810e47c3de583772e9b5908c257b2aec232d855669d4dae2e",
+        "079e96ed1dfc4e31774159ef311805b5f8001203cf37a72921efaf5cbe5",
+        "00b8abcd623b17357f65ac365301a8823365ab948ae3f7fc6a4a0b8ab5d" },
+    { NID_sect233k1, NID_sha512,
+        "ac3c118cc9cbc8eb3b74d8ccc9ecbd81d1996fb25ca43c8a43bffeb244f722b93c9e9692"
+        "41d45d5b81fda0b399f1e3623687190e428dae077e54cad1eff75ec2f7fbb9434bf71683"
+        "3421bc2634885677579c237340f76787b2eb19b446d56c0f2206099b81493349f4db0eca"
+        "d0e2dbe85dbff7d7070abb3d3b12ef0cec828af4",
+        "02dbb24fcaf9f3cd5d50d209937f0e2d134fa20ee3c9c2f1fff3dfbf302",
+        "0400a07240c52e385ecf75525201f9810859123bfd8ce04a5e8f4dc4ec88b2009bd81119"
+        "6ca9ac45b28031b9f65f9a5c4ec497d995f7dec6eb06dd2874",
+        "05785beb1ff70c7bea89b1fa14be09332ef94b09eebcc9fb1150bfe0d55",
+        "05279bb1b1ad8174e88bec4c723d65eda768c1d08d1c64c332a240a284f",
+        "015a90383c2c40ddcf721067b3435915a843f9c4708cc133fd1ee53f442" },
+    { NID_sect233k1, NID_sha512,
+        "700313698cdfdcf0044ca07bf9e5f0702ece7cc66e35decb28d5f8cb7e7e5367a95cc172"
+        "8a90cc9a53a2b5fcd4702028b742538e9b386f5d8b4a2411579ed9553021a95bd00a73f0"
+        "3c4184a6145aaa367e3af76659d677fe7a2e98f9ddf4aa20eb8d1a1db72c3f5590598801"
+        "be7ebf44255fd7376d89d998b7068bd1296fdc38",
+        "0047142197d3d43fa46545b547968680ec81688589d1ec8d7c7e90eb969",
+        "040179450d83cd6dd1609830ec78011143eb64d2d1509ed1adfa085a58d786003ee40673"
+        "ac564c6b5732868d0f8a57727150a23c484228890d768dae54",
+        "064f8892245a198c9c819152edc168e69dc7b562ef1f54dcc1960cc7db1",
+        "0293f2f989fb6b6e7cf304faf3f63eef61ab89a626cf8152e15f38bf93b",
+        "04948643075cea6413b1c88a9bf11aa176611f56d027f2b165d00d46e87" },
+    { NID_sect233k1, NID_sha512,
+        "0374673e1a685bdee55504ce3cd333f70084dd4ae685464a16924eccea34531663fda602"
+        "29166478b30193459a3113253cd6494dc26154156252dc6e822552c7c04d790eb9f8fcef"
+        "2ea8dd79e72f881f7f20fff93cd73ad303c0918ec27c6486c4da61f82bcd55422d16650c"
+        "c68bfd4b0132c1e7075bbf17dad919095860d445",
+        "031352b49ecde5434aac05f898e6ce4337304845d748f114c14319fe97f",
+        "040187ae6bc9167d9c69ce5544ad650055cb9a4e69c1772322d5722e68e7e000042187e9"
+        "d11a921adafc694b5cc8da9226ddad1b65f764274954b17333",
+        "0761189e63fc0c3b5db92b281e5a4bc0d6fdb30bd14f8e69ca85a211bc7",
+        "0453560e6e725a2bfe0383884ba3b3dd0816d8522d9e0762f781f6b6340",
+        "01aaec4bd98c765e4830de6593280779d1222918d4acf08c8fc3d0aa351" },
+    { NID_sect233k1, NID_sha512,
+        "8b237085f135d6e94592f8d855ca397c8c1028236a3b412adefdac888245874f586d0695"
+        "0ee18118f751bfe26f4c31465ec34b578caa44cf1b7109ac4f6eab7f97ff9699b34271df"
+        "035d3bf58a2ed4bcbf7577cf8e5792b1945ebb9389b680baeb8518c8fdc5540e192aa4fd"
+        "e0eed0d7c82be2e362b286f582d65752c8db7038",
+        "0176f124c24e4420f6e726a6ca25f09dfa0c5a37e5bf879e7bdd36c3b65",
+        "040098c37cbd44aac5d5c749524b840fd849652349fb3e02cc8f8fd0a237900151a9a88d"
+        "a407ae41e52b3dad1ea6031c7a36bd834007c0cb1e2c2f2f0f",
+        "022e299985cf289f2fbe2b1b270fbf12ba818cd2b506f642e659cd541bf",
+        "0686ac0c09f90a077cb446c910e07fdf23e845487d0333efc65b9b84147",
+        "01688b18cb42082bea69f18511b0fd9fa35da83d738763cf13ef92a119b" },
+    { NID_sect233k1, NID_sha512,
+        "e3a086ec15574f7017b3cd5f5a47ab7a73980f11074333490dfe9f8ad8926f9ea7c82271"
+        "aaa74e77133b1025b0b22a6900fbb71251bb6549341a23d194e79d03462cdad52ee0d1b6"
+        "f5d0d14e1136026961fa3467ccf0864bf7ae3fcc3b68cb35df7324bd9bbe58fc8aa9f63c"
+        "19feedf19d935b71bf5981c74fb2a487f84e453c",
+        "0755c48c3dbaf71042c58cb137f3632e3cf9d90b7b9a58fd378feef3d19",
+        "0400bd9a720553afbfc5349e4a65a21fed0444c30304f7018ec1ff6fc8d1f90109a1d6b9"
+        "cc4fbd0e888d0a2b6883fd06a5da347c0d4f7882fd29eabcf0",
+        "04fedf8785c6648798748504b1c9b6a066ab6606bc9a69534f93e908f4f",
+        "001e71744a1b683858444da0d270f43b0d5644424f2b38ef48a639685b3",
+        "07ff8199ffe723abacf1947a828e8596dc49ce655319087e4aca6ca34ee" },
+    { NID_sect283k1, NID_sha224,
+        "ef90f85fbda05e693006e4c64e1dac56223becaf0890f73b5274e6e289a5a1de2c141b82"
+        "5c24d595b3fd18ca855b5c1aa60dac6b5356275b11be670692cdbe5f282f93ac7b2e410a"
+        "96cb9e9f80defcde98f3449f99e192bfd62040421a0ab8f99acb85369f25e5efbf81439e"
+        "fa8a5e1d9cf781355a0f47b037b09fe4086389a0",
+        "1e846c830a8ec04e8572d1a9d2df044ab47352fb346f67403a3bf87243871b164511c53",
+        "04012e43e20941f2641154bb66a56f2e0428a7ad22d607fb8af658df0b382bedc7d5ae22"
+        "cc022f226cd65052071066963b112aa302973fe2b5fdd7bb827d13da7634dd2fb9e3852d"
+        "db",
+        "03a76f87ede2b5d40a0f10e15e90e29198fc3a03943efea39ddf7afc37ed4e18832af8b",
+        "1be2c776c707098438fbd0561de578e4b9449f955a25626f2fbea257fc578ffa1bbbb70",
+        "1aeef69983da1a535b10a47e66d890c4413c7a8cd6a2511a1a670a4c573d4808f46e23a" },
+    { NID_sect283k1, NID_sha224,
+        "a3ebc17c867cc9c7c28797f6364f6574b80c7ec5b2d8e1542a6f5db8568c15032f92cfbc"
+        "eefa3fe4ee654f690b0455ee5d38dd84bb8665ffc1ff8c849bdbc4aa0ddfdbbca4eb3797"
+        "2fcbcee8cecc1aae21ec736ef61781716b60247b7551ec4e552d0b59a53cec5964c67cf7"
+        "988787cedf769eabcc9cd5243f58034d96f0e43d",
+        "101c5ed48231a56ca0ea85eb45de0e395e6df2efd4987a226ae36489dd8b2dfbf7c465c",
+        "0407011260f504d809baefb54af48c890f94fa5984c8bf228baa4b6ea14d46372390d1a8"
+        "ac02bbfabb680659aa2611435c4058ed773467a41cdda8250f3490e4f491f1bbae452c5c"
+        "36",
+        "12a3c7f0b3d64614ff97133873d75c7c1406e316e8cf60d22139dba462055baffe6c8f5",
+        "0a9933496d60716a39e1c3f3bf22a7da546eafebef80dc6f25d0c109ecbc430fdb3e80a",
+        "0be56197a0098b022a7914c10f40207da58403d6c7d04edaf7efc96de740cd71f67e0de" },
+    { NID_sect283k1, NID_sha224,
+        "60269efa4d0ffafbbc655f6f00578eadce7fc0a7eb7db923dca49b6f2bf3e13f7f829cc6"
+        "133e022c3c92143c075ab9ced0531a91e6e79848194ab98bb852f40c84e7aebe71fb8bc0"
+        "fd1f97ed5bb6bad6783d8dc048df42738e841d978456e055e1b8a781dfecfce2218701c7"
+        "af77e7894ccac5bfff360aab0b6136b978bc39c4",
+        "019679dc589440b11f82b3716e5b2a2bd42c3b1c83e88a28e304cf5148877faf760b4de",
+        "040743ae04e4b07d154ca0749a011c97a31ac68d8e1da3491f331136873598896e5320dd"
+        "cf0776c05891c27fd912267ac166bc9acbaecbf80ccdd887aded2d7b8c2a4a5d139833aa"
+        "d3",
+        "099ad7fba5284e406f6cf200a39e398aa0426448c09b95e691f653d6096a63adbd39965",
+        "0285a82340d9a6d96ed9ad0fd0916216fd20edf979df41a55835ef8fafa00d242ef6f11",
+        "0a8548b405c171d2a428507f7adda4944bade7cda6dc580b1d3f94e15d7e10f0a08e008" },
+    { NID_sect283k1, NID_sha224,
+        "59d704d5b1f3a0605f1497f22f71b8f45b26138bc86371f00a4517554e7f6e7fa5d35189"
+        "fc656ce68bd2cb8510fa3e3c3df815dfdd749b2b6ac997d443f3954c7a927e138b579801"
+        "ffd035cea90840733e7884ccfe43d8d3a4a26b430673274aae312abe4ac1e1d7c67b7358"
+        "0fedf2d8de46572493c9205ebf0e8b4d75ccc88c",
+        "1703c21fb1e09f8947e12fddf166fda6f685221fbd803d75a0ae377a54a1e494e6c5e7b",
+        "040767564e13ae544dab22c3763c5d330a5571e07ff8f2f5ba3fd729379709b1fb184f99"
+        "0c027f9e5efbd1ff6ac53a6174670eb463b12f70a603354e25c577ea292b13b8e5f022ac"
+        "9c",
+        "10d875acb4d0dc211a82e78c0249e74de16768003b53830bf5648cf911fef6a57f8f048",
+        "02af92243b9dadcf21561ce32ca0744810478f8d5be8e0f83d9632ecd8e86ff467268b6",
+        "1f6c50fb3bdea228a6b623be9e2ea2c371dcfeb0e604ef1029b6766c43b193d86c02f27" },
+    { NID_sect283k1, NID_sha224,
+        "12c8fdba3bc5f68e13f7ff8e7bee876fa68a970afc6924314dae0c2482763ced8d4752ce"
+        "c29ea288d350acd8a06c69289ae41ad345a1b88bcccaac903f2bff39015c289a8ad60860"
+        "6bfd65270a7bcdb5fb10c89bbc2d16dcb91fc9735d66103f6b1f3575622cf4d820929031"
+        "5b033ee1f79968939410f465a2d37add46af2d59",
+        "071de8eb14cbfb88e61b908990ce08b81e624ef4f2cd9cdf3dd7ca9097d5ffed9ae9a71",
+        "040136d50e1aa8203a0cd2c2d545b81d00b95c6b43b74b1fba3a6402abf756d38087affd"
+        "49046bec77240de7bde85ca4345f27c6df341c72a4eccd2cd495e86376c183ccb34f271c"
+        "d6",
+        "1d80734927505d8d4818b3bdf1aa2e5c557e5f717a5b3fb856ca9a2161bfd74a130ee38",
+        "07894bf10885a698899b118f57e7da22222e3d187a0aabfb99fac0ce0e134b6b44a5f90",
+        "07b4a87592004d6ef8345415064b4b4672db2943c7e6098a9e6d59ee3324847e753703e" },
+    { NID_sect283k1, NID_sha224,
+        "26013a3ddf687bb2f37d9700923906f118d5cba5d8ed5113a0e3e84cff00918125108f74"
+        "f4b243e351aa5d07fa7c6ece29f5700f23e50286447883d2a058c3258a12e4ed8770cabe"
+        "627ebea7ef6e8c77811ed7d9a19c53287093e39226236587ddbc63b7ad5e7ad9895c64d1"
+        "d03ee432d45a067afe27d4cca920ae88a7a68db1",
+        "1d156eb15762ed00c4021884adbfc2426e910b18a5bc474268196f4b74e593a8f38702b",
+        "0400a99b45860615d7caab2f4e9bc01196a61f52f95c6c7fef615a4746d48553692d5fcf"
+        "13056f81a0088dec1382f8a3a863901d3443c8792cd13ce13a8f63b02d107b66d9d23bc4"
+        "92",
+        "1999524ce9525d85b562fd13634fd9ac50fb76d83b9d72d6976d6fbc47af7e1f354eee7",
+        "067748d49389c9b87a85b518f84f41b18f52569ba531985b8fe5e1f0cf9cffa958da3f0",
+        "00c44a583c704f69160c6258332f3121b022759b163c74c7c96058fa8e3a9928afee948" },
+    { NID_sect283k1, NID_sha224,
+        "c4dbf70b9a2165e7279122460d05ceb8e43e03fbe2ae7c314007fe2b1d8567cac727a10f"
+        "ba5cbead0ddb167d387da8e8f3d6bc0ad851cc32885809d07a776fd4a95a979fe3833610"
+        "af89df0f454d9edfabe12495a118fe83add5eabb2acf54ba7ba7c4be20fc77478c0a0f07"
+        "26c4e60317422a612a234a7567648603b63f1c12",
+        "17d6eb1219cab8577168be86b61f372b27ca70fb1f1a767947895c185344e966db17aea",
+        "04065d8e43a290a6957230501509b95a208a6c37ddcacd1e882d97c73c38b2a256caef5e"
+        "8b002169cefa6ce170ce20a0b5463f5bd146224e0813acff304307da88830b0777b86cd3"
+        "d2",
+        "1519e37a66b4e665b2e3e59b8e836869a886c879aa1ed47901a6c8a8f365efbc67fb410",
+        "1734a8bc9a13f51d921a297bc6b2d38610c20b32b0adfd5efdd01a4db5084f3b0697904",
+        "0f9f00b25a33b166f09e2a819dfda80d87f6a2419a7b4162e435ee02c0fc10a669df6d4" },
+    { NID_sect283k1, NID_sha224,
+        "b1d53b6af1face9b59af11c726b0099111d1adb3666209ba46b1744a528ed0f72be5a1b8"
+        "2423153b896384faebef0362343e2a4599803c08b8513708938aa8a498145fca1c63ba41"
+        "aff06d1a18aa2a045fce7fcd7e5552a2b98d0df97b6876f06a9cf52a7a40fb737996adda"
+        "97c3cedf7fe421235ac6951060eba9c0377e72a2",
+        "10ede9be6615b3b2a294d67da78127ffbf3a15bdba6f4fd78be7a60415b5d1a097c0cff",
+        "0406418eac385ce94c1982c216ffeb0b26f9c061ccdfd785ded75efc6a329385898331fd"
+        "a307d41f9cf1248a37fb8baea7f3545bbca707a903966019ad56e4dc810b6863e243968b"
+        "48",
+        "134ac4de6ed71106d11fa736960eef2873223aa87b1c5bf5c823de6c78092cba4726ec8",
+        "12a37587ddf224faaf8dab61210310792d4ccef650c98155a227bf468b7f323575115cd",
+        "10982c965331cf8529ef6adfe17dc3fde63dc2a557cab451d7c9408a089229e22b73d43" },
+    { NID_sect283k1, NID_sha224,
+        "e78f538b1ac21602b00a09e3db243ef4803b447329c94a1476cd91a88ff790da71421b60"
+        "092c8a6e55327c7982e7655eb1fd6e40fa9b9fd2f10107dfc585994dfc5bc2143d18794a"
+        "39f7f69ae679b27dd11ed22040d5e93aa83f71783525a4db0c3fd7b43e57dafd0033d531"
+        "7680df19c2ecaadcb37ef896c61a758a5e455206",
+        "14f237cface123b64e8578ff33f86bfd2a8181b9c81f36b9ca31e2a446f0d91dbbe2249",
+        "0407aa347c03d8845f1566bbc3fa1d66ecb41ed1dab0a402405d8300591a1f3078f9fa53"
+        "2c063bd10274437c2690ed6df60ea632f3d4faefcc07a72ae8d85c2f999bafd373053265"
+        "dd",
+        "0570bf3b42aa44c11603d94e14b524b8cb1363306196924082ae71021707c3138503031",
+        "10f7f4af1c1e3f9e8e0c95f991c348bce6725f60aa12ee7b398be64728242088a469a58",
+        "17145a39fa4dd237e31a98daf3974138638b9462a31b87ada3eade6bf7f597195eb28b6" },
+    { NID_sect283k1, NID_sha224,
+        "8a6ca8ec436d2c706fcbec6486b5665b21c174edee7ebe108211c388b1219a8224179f74"
+        "38e0bb7d6e41ac4a67337b52d4cd9a069fe6c88960ae20be29c8060efd7c62cb7a9a3713"
+        "6a250e68f253e7f27755df53ce7c570135641ad49b43507e5483e17b919cedffdc0d4913"
+        "b1d5e0ca0629876c0a551841a0fc2090d2857cce",
+        "08dbecb26587cb2ed7df2404e680fcfa5bf8cf6a58e87a350a1600211b3c844ca86daa5",
+        "04066610ce348821a77e8a6eb74a675ad9312b2622ad2e1e6d8dcd0be8b27d8384844a72"
+        "340014c15776bbd144c0c24bf419237db9401fb7f97a7c4c0ef50a9afd27c3964088f796"
+        "43",
+        "0204586a9314bc14bef8ccce8b9ca3874572b375d01c6b4a41c743c16502a27e91a9fb4",
+        "0fabfeb17bb8c1a57af7af81d99cfb7b0ecbf4e5e4a6ed483aee4be8ee4c70c2ef23941",
+        "08071e162dfeb068e3cad256c3603e07ae48b35f1bafdb726cf4ce32844e1a2181f23f9" },
+    { NID_sect283k1, NID_sha224,
+        "95bee02b423d2c6e60252da4632f693a2d8f6597b4f9c6e356f670c3a9e4e80063e92fac"
+        "b6421d0325b99dc150464ed2ec1d0bac72a042b35d56d33d2fda686a75d582d475652221"
+        "8b4ddd25ed45503d90d3d185cba6cf0ac211b22aa4e1318a8316c369186f7130446dafad"
+        "64f7966f5414f43af37a87127534060a23c6165f",
+        "191badec2d28cbbe62c072c6b57eb5d4644d0c0b3283951bb66096cd15edd43a1bbde53",
+        "040020224b00428031056ed370147c51e68ffc02e7fe269ca15b22310a2974d383c6c83f"
+        "cc01686568fc4768158e75b4ef0427d8e262cd0638801ab158311749e0f432d5b69a667f"
+        "0d",
+        "03b1b6ca5e627f00176b599b68fe54e1b5a272c323a06b55e4871875c0e729c4c79326a",
+        "1ade251b9360a6ca1b48c2fce0768a01193a415bd23956fee1e5c4c5076b3571abae082",
+        "0adff25020af4e2b4908a33ce1d75c793934921267b6c4a0542924300fce40fc0031021" },
+    { NID_sect283k1, NID_sha224,
+        "ccd7f7c0e04d1ef9a3c5617d77480bc624beed6582bc28e9e3a369b12144fcd96b735ee4"
+        "1713f4173b64b28c6102d82dcfc7876e06e76fc497d1d238bf6d85bb5feca630bbd0c0f0"
+        "fa7c0c72e28e9259087698973ac66244bc6e69c04deb22eaeaee7b20da239ab6333576f0"
+        "1349c76f594498620933b8969450ac2bae66db8b",
+        "0ff5e3d66eb57fd35ba4472effd6e7a016ca461e39000a7125e99080f6ab6ef4380dd7a",
+        "04019d8c1d9aca39de0e627981d21e35a628c35fd4096aaa86f61625fcd078f0400f615c"
+        "d5052ba2854ccd64407f6779c5e259917b251c9e34ec0d95c05488f30802b82cf4b25b53"
+        "89",
+        "16c9cabed653c57676ee46c8912cbc507b246078834f1667d0708e4c666346299c1fc03",
+        "12ac0ec9501ac91a2b57220e9c00ec6e815399ede94a658c36f9e89bbf1674316d65dc4",
+        "0c9480160c4e9db4e82b4ad26cb79e083e9e2056e68a2ea554aca45802bbb188389bc4f" },
+    { NID_sect283k1, NID_sha224,
+        "65e9124a2606c8784c9489add2999f4cbe6186395df20838d653b263a207ec46995d2685"
+        "b55d1874e7ef05a6a3bb5b60a7be6751ad568cef1bcea2debfc494d1e2ece0dc8028c88f"
+        "1b2c6e4ee26b639c5e81f6448bd25b73ec4608a8e8cf4e0155c29b6f0a62781493b03bb7"
+        "384c9808529d5f87da6564ae196a365bd282f46f",
+        "1f3591eec4a8a3fe6ae6debe230d238a6b73cf3791cb735add1abee64239bb100f15166",
+        "040483e7e2b8f7ff95b86008c3042ab83a4b6a48f15ce1cedbaf3b586b56ab606e6f23a4"
+        "ef0287cbc8c609426f1665976e8120afb8de96b43978762ed44bea5aa1418b9af6922c60"
+        "66",
+        "08165da5f5427b38c447382c8dd0940c3bddf8f048185e6cad260031f7c0a2ffb83027e",
+        "09034633dbd735cec6208bb6f4455b295b7d730c9301bbd1c0e9f101399f2b3425a13fd",
+        "0204ec149b416ca3467e92194449cf2ca0f41ca1fde79145f3af856085b298149a3253b" },
+    { NID_sect283k1, NID_sha224,
+        "e793c60fc725fd537d5fd38e9b4fb52e268722ae6bde5a058de8d20db301f5e8d8e1ad85"
+        "532198835a04b76f27ca3c972be5617a55677cffa8219eb64fe53ced242efe1b88999097"
+        "9227dbaaa15ed39d3b6be8c5a3237ebe12bd96f333d947f80048463d3859e34f865d83fa"
+        "f03894c2243a06cc96788ed952e606c2d8948271",
+        "05af03cdb45961e7ff35fb0146904ddd6c2bfd3cce814073d3aa56eaa9f13b4f7423926",
+        "04070bf676b9b0db558eeb8bb94a1248bcb599d1e8975ee13cd37dcb78af19307d1b7e57"
+        "d506ed9bf30c627062b99ff9d05ca03441b6194c34364cbe7b73b46ec9716ad8a9970cbc"
+        "99",
+        "192c7b1fa8f221edecbeaa51447818474dd9fc89e962e8e87400938ef0dff432a6c4b86",
+        "1df1a4f9578e9cae8102aab5eac70eddbabe4ced99b5bab1b1dee59c41b81e392968c14",
+        "0f2b1319335ee497fe3ebf1891a71cded59704365774e1ed9950f79100e70950783bc7c" },
+    { NID_sect283k1, NID_sha224,
+        "a57682d21cebb48190199e9f57493696eae3a59acd22f64d5ef4729decf6c2615b326817"
+        "a6bc118bb7234bebfc7276dd998838c009a7348e46431574638dadc48538d6048d572e50"
+        "d9c5974d2049ebe1837dd857bcd1447b1514b62808a4e7a88162ae1bb08a0f6d3db6f258"
+        "74c6cd0cd4ca6333f1bd57bd192ef67e4616d182",
+        "1ec9710ada06e6270720692a06d488ae2ba863b905dd2fc323e7ce68dedacb35fc8c7d8",
+        "0405cda72b5b068f70b3c431def41b8ca1d4381e8c2fdf0821cfc17eceadf5e3eabf7987"
+        "b7079ae508354fe31899cda71e01cbc80e5192d24f1f13c954208d2ab8412802407ae376"
+        "3f",
+        "04f7b9372a8fed536396f0b87d4b20494786bdb8db77200c1aac1896486a05d3c940cb5",
+        "072ecde2a8f506f0fef273c8915a9edc29e440d48fc6cefb50e7117492fb4a13e123bed",
+        "0010dbd6229d770c468f5d8bd20edd6928bd8824b7fc2b10dc45fbd3242191e7557b984" },
+    { NID_sect283k1, NID_sha256,
+        "f646e7334e191c2bf0056d3bfd23f03ef7f0777b923f962519a8399d311b8f68414c689c"
+        "a34b96871fae99eb7ea534fcd83e788e56eeef817cbfe33677283c736b99bf6a626f9515"
+        "291e842bf99f694e4e8aa7c9911c591a87d5f112b3d96b064594e2b368e6d1bf1a1cd343"
+        "d54916a66da22c26355266aa2884120fffb8b94d",
+        "0668de088c6913640fbefbe6d2c44ab26e481802dbf957044a4957c3c5d0a0fde331501",
+        "0400d3a50cb9d347cfe45d2a313813fec8b928a9b1defca6ff4b89c4787717f275c6b733"
+        "7f0762e47b0669f625c39c74d50e2b46875ef366b7c3b005c16ede69a2fba161faf6b3d0"
+        "db",
+        "0b24bf54795fa02eb9527f21ead5497a6db2bcc7849a16d206239f830df313dfb7a2716",
+        "0852d8b6fe93b0b36af5d99530eed08669eb9a25972fbea59f32dafe88b722bada98ab5",
+        "0e5b08d410f2252f724dfcecaedb37b92a6c09cde646ff6237007f4199068f945ebebe2" },
+    { NID_sect283k1, NID_sha256,
+        "a2d7e69ea381d3edfde4664c56c4cb140d01cc4425df757975cedc995b89640dc016ab41"
+        "9b137ff25a6a6d64a309b23890439d2ba157262393cf93d15ca1b1ffd19373ef12367f88"
+        "98aaf56d5544c2f019a4854f69b3d8d320e03135bb7b675e588a5c3fe4b703938fa0f964"
+        "916501297cee2fd04af767155c7739419f9dbb7b",
+        "0e6af57cf47de1e6f07041eb5e1a413fb7ddd82f8c7f7ce957eb28a118004930bec4dbd",
+        "04021e31c4e4d412a261e40483b9106bbc1b0d7e7414e53d7b9fd84175229c8cefbbf6de"
+        "fc046ff2dc601dd407883af7dc71a6ef4286cd3b1b6ccee4fd861865bff8fb38ad51b63d"
+        "49",
+        "08f9e2113d0b223c04e678e8ebdd3aab4816681a9ef08b18a38afecc57d79c971421469",
+        "0d2c9113a18bd51008fd327a55c214c9584b6f1b816cf3b95e7346080da2cb07dcef8aa",
+        "19167051872759c36ba9eeb5d620cafd3289e8b7660fc847ff385b5143b3aca38780639" },
+    { NID_sect283k1, NID_sha256,
+        "7088f60e9375ec6a42f705f851fc76cc833c4dcbb3352adcce9f59197c1b7121e7aa661c"
+        "4f8ad9f4ef280af3a2981e90c01291f7d1cf7d3ae2d96b37fe6975e11b7c6c02b8ef044d"
+        "1470b1a26b9c72e8c4e7b1dd83c8acc9542e2fc7d211b87841dcceea2ab8128d0ff7bb62"
+        "2b60faa4a89ea7008f7d55f8f9de675bc4596fd8",
+        "19f9b63fde8c6aa6177f2a38981505d04f8ac62bcc21007b05615d028cfe851ab9cbbc6",
+        "0405a3e567b227869f948180547c2713703c90698dc04864140d22b24bdf81b3996829ac"
+        "a505b2ba535040afed0bf6f9d850713e54013729bc6dcbaa336ebbfb9c461f7ac61af480"
+        "01",
+        "051e20545a0a98dc3fec59e4ebdf101c6aa2768f344c1e19424c1eaae4aaf7ffeb5205f",
+        "05fb3329f63587e8febcdec49f92de88366a9f75d0b9a0f374dadc6e7a62b833753e990",
+        "12edfabf1ce434c850b58804f1f31f8afb20fbb36ee69b68668e231e4c04fa75e658478" },
+    { NID_sect283k1, NID_sha256,
+        "ffd6044ab991849939e8a29184b4d0ac3e07acb63c7e6b886df9e8254073fa800d5910b9"
+        "fe34fceb547565a2344eed4de394ce2251ed51ec882ee9207eb7340464c742d9d140fa09"
+        "64f6bcb1efcc2d13919af4f727953de41b20728ab975c1ae0ce784865f23ed1325c68daa"
+        "95ed5c932893610179be94f13b9a4149f09833b3",
+        "17704c1f436beb52f7ec97192e23e206ec09f9e8986e06bef71467c192bad6f0066b3c2",
+        "040329294a36ceae2b2c56bb6e21e52ec32af11aca9ab7785be9c2d79652e7960c0cf7a8"
+        "ae0658a89a48fb95cb7028252fa9792d91b989d7cef3fda8ba9c8e4ffaf19269f2a69f0a"
+        "24",
+        "0aa8d2e210ae40ba1f9f051ad85d37f7cdea43aad890ef802519cc5773e9a0984fe5d6b",
+        "1908e3a2740fa04ec0b23c964c4c3cca51c4603e7553461dd02f8319a7ca2ca09d0aef5",
+        "12d7860d7b438df4653fe40fb9e986cb035b1384464e061bc4ee3bb29aec74d16b0a694" },
+    { NID_sect283k1, NID_sha256,
+        "c9f81c9ff7d80011fd41f2de97a6c1e6a22cc2da7b2b9e4c50e1354c3e139b44529ac786"
+        "ce795fc501dcbf11a935d4728a7bba44b4e86b5e5990fed4d3e24fa5ab6f303e1842918f"
+        "156e00dccebed6897c852207ae5941c630014a41696882066c2b296d39cd8658cb5830ee"
+        "e78e29a00335a99a0ba90722ceca5a2e9a99a2c6",
+        "0c7d1ac8faa689698f5c6325a3b3f35e7730bdbddabd0693f2bfdc5c838bd62f84508d4",
+        "040095a930071ce56f28a79a66b751283c756c4f2566ebc2a10770ca60cced6914bc9a0d"
+        "77046f70021e7a949c7f55b059d4c8e81ee23b13809a35932d83b8398fc8684c5a90f3ec"
+        "71",
+        "038ae832c25dcd30c1ee3f5fbe84bd8779c876c0641907695aa598132b0e581ea528332",
+        "0eb27c86d3ca86ef53aef0465d257e6b681f891a6357cfbf51260dc6e35a82799de0e97",
+        "0e8207959e8be94e7407543df80d38d9e662106ed68e1456dd1826602c5b73f27ddc901" },
+    { NID_sect283k1, NID_sha256,
+        "a60de761eb32490184dc1d29e21fa33889295ca587b994746874c7289eb9c83e9c7bacbb"
+        "4066c761a06b65ecd78d701bd41f305cd7eb258c630f3febfbb0a367ad16737b146fd793"
+        "dab23562e8001cd113135b1c981d1ca23eb3be0fe3e24fe3fe1089caf9fd8f4f0d1f90dc"
+        "c7dbea4a9e2357793b65daf342b8e6d109c6dd10",
+        "1a173d158866db0ec665ee632b5fc397893f6a44ee17c348e7452800aadd8ce676e7fdc",
+        "0406a9369a93e0b5165ac6e692db035495c5cdd6df243d9756098385ad616374ac1e1efe"
+        "e2032f72a02c36954cd8221126e4eaec02668f454214e4508cf72b6d945e14d9b7c5d404"
+        "c8",
+        "0200713a78f58c755db4897f9b7e52057a087816a07fc388d66d34ea9e0bcf2f47e182a",
+        "11a26ee24610e705a42329f86aaa80d78934b4bbf19314f06eec46067d85c8377e04d91",
+        "077e35add124574e98e0056bbb106cd28ba8c3bc0c47063ceebbbf2684983a2a0061950" },
+    { NID_sect283k1, NID_sha256,
+        "2cd0320cc73120ef13e83c8144b270c9a1f2049a9250ef7ee83ccc7584025140a51e2227"
+        "a5ebb824deff55b3affcda63ecb1fd3f337c67c08054dc82fdace0c4bb9cef1bea9dd792"
+        "635f655363d05903cd6b5ed50ee669bcd8157509366cd85aa40d19593265da26e5641590"
+        "ccf04672a6df52badd4b99964a8643d9687b499d",
+        "05523cfacf4ed3b74ebc30f608292e45173001d80cc801f729c5f71fc213b243f041ad5",
+        "040410751ae7d8bb2295f584ba3d55eda41a80b8520b02bb4e5ca669a1003d6f2829e0a0"
+        "1e05fe16244f76f0c8b24bd3ca3b53c697097e3ab0e2b44962ea534a655d6c7d80b857c2"
+        "1e",
+        "0a634f4cef0ba37c9ab211c57fe6574c67933280c91c8b175fa4164755bcde867fe1772",
+        "0b9f6946a578ee38433e98478a4c31b67e838939cbf128f023090c4848471482fd1dec7",
+        "157159e15a2d16da2e913c5ef00833a8e5513ee4e7d6cdc849fd822c59886d0ca3695ec" },
+    { NID_sect283k1, NID_sha256,
+        "a743d8337bdefc4753f937e869a36439da1f8c75e1278c3f6a4a969d93787dac93293818"
+        "b1cbef5b8636e1a6cb3acaac1e15dbe0841c8001512b689292f3f4805997ae26ff52f7fe"
+        "1842512a020c448ed01af2a061f3638689446ed5f6bed9fc70726ce4104bc11142de6387"
+        "3fa7039830223e8f152996388417c48e0c1fa81b",
+        "09f6bd008c04b8823ccc3ee7d5aca535c211f35e9d9e7cfaec518b98647fbe6d28283de",
+        "04070019957dac0e9be0fce6abdfc00ca737096ba2d2bea9ba570acab6d73eae2132d7eb"
+        "060559545f82741ddd1cbb9dab0cd06454fda8abbd9d1eca752e57ec05498b14e4189f1b"
+        "9e",
+        "0fe407c226fb15bc63d37cc9840a1a1fb0ac4fc2939fbbcb6e1236831379d367669ffd9",
+        "0e96e301bf1193dfdd2815597e016e0a282d6e8f9d1d67a7f7e7d05288594f1ea92584e",
+        "07488687f13c3a2b9ae90536db7868f2bde1529ccdc0c84eb85c53ea979228d1fda7c94" },
+    { NID_sect283k1, NID_sha256,
+        "6a7a3ad614a3a09d2dc5a80204815d0c6471057acc0fa73f3cbbf1801902c3e1cba3c113"
+        "4a79a8ce61994a94a5afa85ae1a44b2cdcf5153f8625713c872da36aba0afcc5c2f26636"
+        "dc3f60e04c256a5b023e20e2e7a3f7305bd5b3033fcf05368589f19021f8c9096a886799"
+        "04b657bbe5b9bee67d6e53d176fce1de9e54c64b",
+        "150d2812505c82584201e93f6e0cb875d29dc7bd99d9c0f98e0ed20128886e67e1f1071",
+        "04012c7750172bea15487a05580891aed51bf81548f4b65c51c6c54b990bae8857a20115"
+        "b003db9e7a17dc8b24ff080d80842f0488f17f7d43a40ce6ffad52c65f5a875b4b33efe3"
+        "fd",
+        "0c5c52dfb50b210ae13c2f664d958b2491bfa91ced638f925941234bcc4d66de1eeeb73",
+        "03887a270eeb515a59a7387d8acbb4e72dcdf13f317a6a93ace5cc98d69a79c64a9e7ea",
+        "0e922b2d021cd71e213bdb36ce3ebf56a34617d4dcca30fc05f238a1c097e38d7cbcf91" },
+    { NID_sect283k1, NID_sha256,
+        "65bcd77a3ab345cc99b9c1300755288102a6ccf140bc7d1ad25df246ef01fd57a8614b35"
+        "2033b88cc6ffffe5b38b99ecf03baa365ab5529d6751a3c020d0198561969aade0909143"
+        "4d84ffe13b46df043d0a61e20a08e9c32b646771fea1b29e202d40aae1c7079873c3af49"
+        "4ecf6ef5eda855736c9338b4a5c29a086a8266fa",
+        "1b3fb9e1ff70f94bc9d7742ea535ca982215af3df381b5ebdf1db40c7c849a7978ceb98",
+        "040769a897a443c41ae7a8c1e45290ef39c40887ab8f4aa3f9ee8f3096921222ed7de457"
+        "39072621bfa30973da61fb6d363d66db25daf818ce79dd3268ac0520fc99ca7917fa3a23"
+        "60",
+        "03fa84ee38587f9c848b65b07c47551e27f15e7a87ed0ab705c99c8b7a4ee9e86a8e4ea",
+        "11b214ebe67eda2bd6e84c33be05c4373d2536e2cccf152e56b1569cc96d261e50910cd",
+        "0e100646cbffa016664bb57c1a67108645238573867c0b595c46e6053f844e5482a993a" },
+    { NID_sect283k1, NID_sha256,
+        "ed1acc360d02ee6c36bbc223d91bc1d2009a3e8f8dfc4c3796cd8555b0d2b46716f4c805"
+        "8bf34c2d4954e098274ab9c2cbacff46a0578a14e77fe104196cbc6d2753e3bb5422b8b7"
+        "9fd004ac0aa920eea94925c016ece16ed4dea916fd92563ec65692a61b28ee84bef00071"
+        "20bb1e31bb75b8ecf68406a71af9a18b4edf5320",
+        "147fa46fccf0805d14c1b84ea59bb8b8283d54ca0ceefb29b5585e7141340c55b7232f7",
+        "0404ace4c65ce07fe5ec22c560bc553bd791434a691c2d865c52b5e38d541ef191ef4190"
+        "67076250c829de137b6549d22a12f196629d9d34cdd83758e5daf45fae41872c9b15190c"
+        "e5",
+        "18c4f89cc022236a0da6105f19c6661a8325d36fa285e3ca71c1a4af3dccb016cac186a",
+        "0271b421fd572de8a71d1b18ad2325bc0fb58cabaabacc1f015ee6b14bec49762f1f8ce",
+        "12e679010ccb143b7de0c3f6c82cf99a961a4f154be6c87abb111cde2d721d864d7a1bf" },
+    { NID_sect283k1, NID_sha256,
+        "2debdb95a21d72b69c545988727366a42b819ca6398a82129c5e3772aea93fac0aae9a27"
+        "b11969ff0ffb9dc0301132ca2452cd863316cf24ae7696422d4dc68e37316161abc146e8"
+        "6f04b72d9a27a350d8545cca245b2be43c33bb822dd813d13e08a718f784845df8a4ef49"
+        "b02529871ec76bb3fc1ba31089359f2ede73e767",
+        "0fae097ea56b35a517be5480802f450eb832b244558d0cc922cd4a5b40b84d02ef11216",
+        "0404f6bda2dcb9560174ffa54f13fa5edf17bebd41399a1dce1fe13e82a2b487eddfe25a"
+        "19076dd375f2c5f24c342a8e2491271cebf5b97ac666aacecc8d693a85ebd2a93eaccd40"
+        "59",
+        "05e3a67091b9e10c7fd20fd70d51162e5d78555059802d0c3b133f49b89f37be6a119ad",
+        "0ddf93ef8797571af3cc9a66660c569445a2b5384f95a12d680c570694bce49bf2264cf",
+        "02f50d68bda006b88798d87c232f5ed1796c841074f063da03a471e0c00f08b10f410b3" },
+    { NID_sect283k1, NID_sha256,
+        "e4e0c6c8fc01244abf81e139c961b6a6e2d95de5dff1083e8a48b40e3e5b9ed909152c92"
+        "b1cf2263179629cdf76ae553b58bb2e9223ce4f9ffb5f170f5f0c5ec97294c34a7529a89"
+        "7e9397f71198cbcd68bb4055cb8cd6b690290761b3b73303f82788379df145358afe28f2"
+        "997d191d968929b7a4b9a0f6228797dfaa17c613",
+        "026cd72e6ae19b3f4c53493fba1e8082a8df1fb7da6dc111b47a41f713f49b33f618d0c",
+        "0401c411f5e298c9b61023fb26765cf4132cc78ed77c07c3e815fd43032cdf0ae8b8920f"
+        "96035647b4c0807b287014043560d70c9b14651cddff4bdf6d44ead5e87720294ff89544"
+        "06",
+        "10e9bc449e8480474afffd20b8acd6dd08344981c4a6cc789c5338ad7e486c526d6c4fa",
+        "0e81594f1064e018aa3504bac75946d77f9e745673043417a47c0c82488e224cc4104d7",
+        "111bf8635b1bc3f6cb7f9b685077b38d67160d143ede2bd8b6ae93327d7f55c5317f00f" },
+    { NID_sect283k1, NID_sha256,
+        "04710947b7c90855ba4e59107b919d4a1df22b503c5c4c33b286b6b08e451e6fbef8ba40"
+        "852f9f0ee62c9217abe6156bed46ad6f0e25f70f528f3a73d099338c578bebd6879d810e"
+        "6e173c2b0af1f7caacb3531ff0e6a7856e4c84db355d110febdb21c683223eb5990ef203"
+        "8d462ddb7962bc0feea5f850954943d53041f66a",
+        "198e13c7d95bbbb6e226688719639bda988867764ffa9b029018b5547850daecf58fe1f",
+        "04030b511d719217c485866273ffe2996a19e0a670b7a3fb077944a21f63ca2f22fe5a52"
+        "4a03a4d9a808e8d77c9dfcec6d033139fc33e67d7c8dfd7329c895bfb77f565391c37c8d"
+        "8f",
+        "1721f1ad4adf3c32614feb7f8df3374e24f76a32e27854a57dcafcbaaa3082b13e461ce",
+        "14b2622432adcfed7c2ecd2b52e43be7f611680ceb4bedbfa9dd9af54532911a07440de",
+        "0ece991128b10399188b18933c0d185e85d111ad401baee5ac376b84c523f130f70fee2" },
+    { NID_sect283k1, NID_sha256,
+        "c62d07bb1ef756b6b2fad355c66b5be086b6dc387b37cbc4a63c841dba3fce65b09d3de8"
+        "f239e3649382d172f065b78f8a53e0283cf345de06b4ee0b4b7d8611bfce92a7d993b193"
+        "8419afe817611bc6df3ef74191e7e39ca2339fcb5b5cfee3166d09cd52a1a7d3779722ae"
+        "c328d326a11bbafb6aa417920225ac453146b9b7",
+        "19098a39956747de24ded56435fa1e6c30cc2b8088fe9a75f5d07b2f5939c7a60db64ad",
+        "04068cf5a2023753717d89d12d6861c8411e6081c3158339573dc5598b1700148d00b39d"
+        "c5076a22dcd4ff4f062eeff83a58d2ce6a1808af8733ae254f5157efa8ea35a85cc74469"
+        "2b",
+        "142e4907ce239cdaba562d1fa7305bacff05a75e2927800c7b7ea322b47c9ea47846e12",
+        "104620d752b73379e1e5d35e5b24a793d7a309685c00f8bdb97bba9876999ed9c763d0b",
+        "059cab3abb0738d8af4ea6dcbfca6d0ef11b6e591ca109b040347d7d4736724953cd9fa" },
+    { NID_sect283k1, NID_sha384,
+        "e4d8d49c9bc566261d9134d5e237d9cbd6b67d2619a9bd06b7c9c139e091aa10682cbede"
+        "114e1d4777d9cd67a16b7d64278e99eed62bbf25ec5a5a8fabcb0a3468b0e73fd02ac653"
+        "3e04b1110d29da3e34f33eaa228b78341b357a5d892a61beb2168c3bd5e66bffe3f2080a"
+        "1e246f55a41ebf9d579e188d16991aa060460d6a",
+        "1636bd2be121e07ee83ac5e880cfdfca6a56f2b9d0badff003e872348368c7c2cd96b6c",
+        "040007acf46ab68744a9baaa33ebf6be20c1c093242b0056bb9885d93a4a9bb4640f17b2"
+        "ef015415c1b671e98f00c1fa364bd69cf998c0ae140485159b0a341994a4e27000e108f4"
+        "fb",
+        "0d0d4886c3500bff68455c41f5840d0313f33ac0155a693d27c66fbdb12791c2b5f8552",
+        "0256b8ff7d37fff7dcc8cc4461984a9bd9661643fd3a68d07fd30d426d10b8c7f4dfa34",
+        "1f516f8ed4372780380a798d2da04d691aec379483bc0d10560ca79edaab453d3e77585" },
+    { NID_sect283k1, NID_sha384,
+        "2d1358fdffc14630fbc421b443d3c22ba10ef34f15c6c5bb3c73a9b8714e4c411de69b9c"
+        "d6628fe2eba5efc4862af66ff916505023e0514f564164b389ea422d0f1beb92adcd65ba"
+        "f43556614eba25e43852ba65af78f62d64b36696519ef8284ef7316ea52c365b99f63a39"
+        "e6701f81ad520d7445cfc0113c38ecdad4bf5b7a",
+        "15e5f555119c19b055b15b0c0d2813068bfc184f864e250b202384f5728bbbda1cb0f5a",
+        "04013cae2f0c3ba04d039c42cae27de4cf5842a3e24be35d7a3cc7f05083f02951cbeaa6"
+        "3b05d69ad5b7d64d6b19772a1794562b1fa5c2fea03909bc509e7d47b0e8144acb3c26fd"
+        "dd",
+        "1b881d95b7de9aed9fb5ff0085ca4da2fbd413b9b947066c98aa0257142c9000bbb30e2",
+        "176f9e3c9e9f98b2f5f352ca74310badf9f598f4d42cd2b26e5ea0999ae31e3c678fad2",
+        "1f2dba4e17470cdf7e1815d30771f352807b38080d44465f86044f5969b017c9059daf3" },
+    { NID_sect283k1, NID_sha384,
+        "d6336faa5c3e838f4fa58626eb353d4cff9ba8f0aa0e6c3d0d850e8b22f5b0f047afc977"
+        "67f1afe2040b85d4e401ba688a4da7a0caca7fac450899092c4fea789231ba9b07782010"
+        "720f45d16d353798867dd7fef4a324520014ad5cb32684ec50cab742b750e05db040ff51"
+        "140e8d740f6774a059feeb493b10d8ac722f23fa",
+        "190c8f17bdd38669e345440d2c7631d67cee9c6548c4e7b9452377adb9303430efeda0e",
+        "0403235a8b7981b3ff376b6b0959a42cb56631fbb9f82f1694b9e273e6b7131e758fa0d3"
+        "700444e5747420d7f5ffd6119ef43b998d4ea4a58da13ff6fe7f241ccdfd4b6fd33aa93e"
+        "3d",
+        "0b2a690793107257d7bdc37c492eca48c4c9650ba0d657e6eb62042b16169fbe27f8984",
+        "168a83fcc67e0c155f1fa2329363729872e254f2e0c3ef85f3b3c84fa3406de4191b6e8",
+        "18c0f8e6b486e6d7d16b4103506d74bb2021232c0b1638858295a63ca35e0d6d26a6266" },
+    { NID_sect283k1, NID_sha384,
+        "07384a3f650bd270b14ca388a441af201b7767a2d47e9033f50cefd3af8257ecb38f5267"
+        "e141cbbb2ab7327d8fc78cf27198ca3543d39553e178390bf1b921618432ad895e4f8153"
+        "783a7ac22f4ca3cad4560e64f1ee4a7bcad05df98ea49a3847dc2143b27c243e48be59c8"
+        "69a547988e2205358e8db98b635ca21b745df4d2",
+        "0dbbc2a0409ca58a9e39e33b95fdd15080443c1dbdb5874bee991bd1b127047f08ec9f3",
+        "0405a687605e54e49e3c40fc5ee8fc014a62d72e8595280a66ce7d367aac2df4d16b98de"
+        "b3030abd03dfc224f459dccd1606287cc30016be317c6207532a0725c957ca5fde692a9c"
+        "43",
+        "16bc5aa29cea64ce3297172f36fe4ce820c943908c21c9967697db0cd93bb8a12e42348",
+        "1b1fdf26a6eb2d736b8c1ab165af2ac31a4c206c5410f61ac7805a68992dbd62b457708",
+        "14e9a22ce703d942a4fe2e84a4c1c1b44538a33fbfe904bfbb17af6490d372acae4668e" },
+    { NID_sect283k1, NID_sha384,
+        "824f26dcb4ce0ca020982814d5c727e629cbeeaa818c49668f8f6d743f0d0ad362b24cba"
+        "c48027898f386889ca5411d7d1f9afc69493b1d9ae4d7b695c9fa0a30bb59e6be2cbff79"
+        "231767e96cd8bba349fa2f97955d56f05430ab4ebd007064e3d5add94dfe255b6deff196"
+        "50883ce9966e1a2affaf84d9540f65c87ab1f936",
+        "05495e6c59ca1873f36b756579632fd47f9fb95b64f52589d70f2739aa6a3bf8cf8c198",
+        "0406df40d8259be64c8ac64a28359290bd52e843f330a68c2b605ba4f777d7bd7a798e93"
+        "440458667cd7021b291c3415d64f9b054db71d3fe20f232f2a2286aede89ddaf1ee8c68a"
+        "a0",
+        "138f05303ea63bad47c4c9a9d43c52c264725a668db5b631d9892daa1b71f62656cbf73",
+        "05e35c1f3b30b43cc9d60bf8779f3b31e053de0a390da50ea676dc9722a17ef00d68aec",
+        "1691ecfb826fef1ea0895242129cc3e9a14e1f84fac49d62ffc0a3455ad9c97becd5980" },
+    { NID_sect283k1, NID_sha384,
+        "07de1e4bb9be15a710a74806d4447b093bc08ed04392d1bd5abb414f5f4b4d9d43520d0e"
+        "46fc81c2a97e71086b28e53242449ed37fd7ed1c5772dbabc430fcf82ad20437b38eac15"
+        "820421e51912325c872894452c3f8a10ddb040b35308e583c155c3707b52df467c4945f4"
+        "e1071126ed46611a3253c297f5cbca9e27f58448",
+        "1724987c9b698519b6c225cf1261b77d0300045e5fd774dcbf13f285e6bd74512cb7edf",
+        "04046adc9bd5f0cc0d8bc64f4ba491eae3b7f6fb4229bf94b804807c6137787adc0fed4b"
+        "2f041375e2c89da41af84529811ce7aef26b983ea8add6e37c32f2b00bd47f23f25e5fe1"
+        "94",
+        "02ea4ed0e87687a50dc3acc7f4c089040ddd367d1a3f470a711501ccaad63c201b87ea6",
+        "1be198a1b6e91453018513902f0a8a085c76a2798a2a0538ede30dab65afb6b9b0496d7",
+        "16342f87a813780aec006ee218a615c4e1c78c0c759d48d4094639b5b4c32a9658c4d9a" },
+    { NID_sect283k1, NID_sha384,
+        "1edbbbe71057bf7d0bfda922be21a3a4dff57b017ebf6fa99651246cd173bdc9b11eefd0"
+        "48ea599c1f98e907932aa04f64ed0a007831f30daf186c88807400970904d6090b2cf181"
+        "e0f65f03b4234aceeb420867812562e47f452152bb1ddaaa48487170d06e47c5e9a7c0fa"
+        "a4fe494663d2fec22f7665ceffffc214b21c6b8f",
+        "1a5489091cfd51a0970508ee3e8449081ed175928ff8386592c83043a7911bbc2f8778b",
+        "0400aa1562c94bd16a3f8a1d6c465908ce3b83ba6711e7d8b0b9353d3c55d13dee213aba"
+        "700103a789854f63a139e31348f1b2608f1e71c88b5d42809f2460642ff46a470ad85735"
+        "43",
+        "18435a6d3bc02b3019e1b156ddd6f3e1bb9c5af70d1a2cd2089e677cbacc21624ec8947",
+        "031f561b668aeeb4df43a3a34716c4e67232f56959104b7237b26e3c95dd40e15eb076b",
+        "0f2ddb6e6d18a7393425c16b3e5a5aa232cc48198d63e46a601cd3ed221a8427178a0bb" },
+    { NID_sect283k1, NID_sha384,
+        "db5cf1de38a5187af11c1f0f19a36db52f8417de997229e83072fb51a3b7152a3b383e99"
+        "19c1b8427582e53d4e7e25433d46cdf01492021c237ea0a87d38c71634743115a6b2aba6"
+        "6d3faa8003158340a5078171e0bd55a6e5d8c7fb2631a31c1204e1479bbfe79ac70d5e58"
+        "23af502922a900576f0088a33e42ec3e26c0089e",
+        "1a45ecda0788fbd7cb7a716dcf4c6e83d4148bf63ed58078690ebd238c00329c462590a",
+        "0407a1e2fb4e8e79e3946086fa65042362418db0dce51541121c73972a435aecb99f6340"
+        "23006bb02df9899ac3f207732fa7cdbc36a60c17592af7ce06b8df4255110e26a02b2318"
+        "00",
+        "1c986f88ba3d5109c0afa2c213dda8df462282f024cc8efc758a5342a0de91c40452443",
+        "1efbd9e0d912e170c9c55bfbdfa6106fea4a4e013e7dc26628a1aea4f6b806a51866003",
+        "0b1347f4f85adef612f5c3a436cfa59eaced5c7cfdbb69444936d71812a2ab2461bbb5b" },
+    { NID_sect283k1, NID_sha384,
+        "4adaa850eec8272d25d76600aacf2cf66e754f6c5efa65c55a2a31b7bc69437d9a7e47c6"
+        "f51c5da93895a45221f5f92c2e20ee6a95eed3cc7249688261a35d82872284900eb54dd1"
+        "df6024ec48963ce43e8ed8b8cca8ed22beee8f0aadeae53726cca05443316537840ab824"
+        "cd1b595f36064e9a19333748d4f4972178e7f5ae",
+        "11461776c33f20b176dc8f2b0cb2446a9b69e55b6c7bc7457a7fb4639116b452b79661a",
+        "040043ba7157559659954ac58b44f19262bef9e3a00829c70af66d07cef08ad899d7f8ec"
+        "2301e8dd9c947b5a6decd1a26fc5d0eecc9605d22abda747fca038571bb37036d9034e80"
+        "61",
+        "18b231de7fc499b461afed9b80f4405bc005011865cdfeb25570b7c0ff79b6ae94b6ce9",
+        "0fb203f47a4e2e9365ce070ee7fd4540f3f7e9ecf69b4400eeded0f5a7bf6e5a5c6d004",
+        "0e635dc65233f27b8350db22b90a3b8611e6fd1b3e0f515e42fe8788b1376079816308e" },
+    { NID_sect283k1, NID_sha384,
+        "11d212a99c39fb5e4ca0096bbe6c81ae1490e1b8e07374b4e773bee4fdd24a3c13d65391"
+        "9db663d2c32aa4db140c4ae2d472d4f878946e527ad33b3dc93012d97458f96cb622ddb5"
+        "6f1ce7c2474ad0d5291dc35545de47b7053d137a8e79dabe06757ab53e26eaf751111bd2"
+        "7690e57ffdab5337eb6f81889e9d1b1ac729012f",
+        "025a65f627db2b4d6cf83c5b0c00265b9b63f7656c5e3382139e4992bcdf3cab502844a",
+        "0405a35e7e0b914a3e01ce3a885192d2ecd27418e09898631de122db0c48e8b58658720f"
+        "cc0009eab47197d5f56927848855b6ff96db7c36f810ee7c89b305ef780ba8c993d65537"
+        "ab",
+        "18516ceafb61cf2c7e7c511a8918bfe394c7fb2fbc40fb3052e156cd4020fc674684f84",
+        "1892ac13b86ad00e38ce2427c8c78c93b08605a75ca22b3658132dcf9d9df7c4b5540a0",
+        "0437b33615c16a85ccb8c4769ee7c5f94122d31e2b5fe66291b401fd90257ebefe33818" },
+    { NID_sect283k1, NID_sha384,
+        "9e4ec74c09528fdf3153a0f6955f20c70915ff524b2e19c991ec4c5b41ea9185e3e876a0"
+        "2ed6f27c9b3479dba951bee8680c4c99be1a626808114408856994be7444ccbd5ef9859f"
+        "a479b1050bb836034e20c531b4d618f5843fe1d4b613a731895b489a2363f3f5397d5ff9"
+        "64cf037e9b11e3ff5e1c3d403e5a46b8387c1241",
+        "173b28fc29f10245221a907778708b3ee62e0480aa9051d4c3eb4e8d552e6aad5509943",
+        "04024bb9bdef975af892ddc1bbd31314926a9c81f8f1864829edafdfe2744e793c100c04"
+        "83028ddde61b4361ced9c391c86c28ece9b902c48d14c61684962007dfd69d0468dfd65e"
+        "7f",
+        "199af64f79ebbc5b789d4676a07c224e4f6fd33285e5a555ac90cf65d0b669bc58ced4f",
+        "137d746d515b90890a413685bd9b26a1c05efee4c11a4b40bb621c9fa2580c46c20a687",
+        "1647f70ab7c68a0f522420893a466940ccf79067b323d940369f8b8694ccc3fc0daccad" },
+    { NID_sect283k1, NID_sha384,
+        "5fe8253d2134c434cb0866796013722e82184638b024a5a30938039929ccd8415c71f71f"
+        "239c5c5a81f7a9cb493dde209f189bcf766c17c6d9589cd0c7de7f07ff9f24d2320669b5"
+        "89d084f8a8ea71127b9760b7355b162616afb34bcdcd416f1a062035102e29b70069b2b4"
+        "dbf70179b8d60bc2ee5a455efd40194533bf560a",
+        "0624616adcd45e1fdc6cfeab2b17230d73d91fe0b39f4664f3c6891554f9b8e238257f7",
+        "04010917ef84bd5c0b36c97cb5586d3057a34f2827f239cab2af2e6081c5bdffd48dccb0"
+        "b2078ab47fe1bd3e28055c688c78e617ddcf6c5060123e9d65c562df2e94cac973ab3b18"
+        "07",
+        "0795e229185bc1b3d6d69b08189fdd7a822cd18ac55971e4b35e51838bf12eacbc50e2e",
+        "185483378a162b8edd6a12f44e3aa4ff829630fe3a1c9ccc66e34775f69bb6a94282489",
+        "01662cde6cd497be7966a0a77b0626ba3c4b82e20bb3f2e839178a31aaf440aa0e059cd" },
+    { NID_sect283k1, NID_sha384,
+        "db49891838fe23f0530abd4a4fbba5ea970afa5747f6a0a10d2cf4d841581ea2178705c1"
+        "203f00cafec91d0a72d25448072c9cf7d7ca5580b39f8589ec63128faa95cb0689574a6b"
+        "ebd515049a1eb9699922cde0366b5cd58aa8f3d3e847706896f7e1cac667fbfe94b2eca9"
+        "e7be79a810806ca4bf53f219bb30532ca2254c11",
+        "199757ffaa2c59e198d66824eaad37cc42d49b2e241b6a60382d05e425e800eaaf32470",
+        "0406ad18bdb3e51cc053f56b9f9c35e2d6eaecbc9749f41a9ffbf54634838d7745ca0648"
+        "9005dd77c42b31aebbbb46277176df08d81919ee0d9ddf14c3e4c0cccb207bf649c48fc8"
+        "b9",
+        "109d6332ceec5ea211f642a746a6ce055986b4a2feeed7e847904f7f411bf8361318d92",
+        "1a49fe690a34151056d290790a6bfa7b70958e69e9baeb30c55efc61dc5dc4934f2fc95",
+        "1710a4ba5b404d65f66a8fca2751a920224db0cc0266f7b0bc054069ea4cc51b1f017bb" },
+    { NID_sect283k1, NID_sha384,
+        "29d385d09c1142a7c181fe4b6e6132e414c15aa8605b44208c0399464613b966edcc2d46"
+        "cf203a3f85d943d8eae658695dac74366224a0d0348083bec0106f5eb8809ae8d07f792f"
+        "dd7c48fb1a25d5ef3bb9acd40b20c61c821024a9acb2ede321bd2d0dda849c22d76f421c"
+        "bd8d51565d3c4266f666455ca1c0c3777aa44107",
+        "06e51381dcf21050aef2e9b97e35303cf3bd91956854ecf9b6b9827871d2efbe8201c5e",
+        "04052fee805d7938b8b97459b9fcb4b80cbe29f20a9aaebc07ac019539a4a966c5ee4175"
+        "1d078aaae02974de6530f285b4bbe87fd5d0c9a2ecfde5fdc9a3303e4b988f673c778004"
+        "bc",
+        "0b426ebda6628125d73efd84e6bbab6c4c8fcf7fa29ffb3c8d6b0a861dbf81cd18d088f",
+        "1270045e963b59e4a4f1237c2240a5b26a7ba8e28ea01326fbec00e5d95d40e859d88b3",
+        "1d721477ee1df1388e1b7f92c048e5759c060ce1291098a2fa647974a62a258a189b4cd" },
+    { NID_sect283k1, NID_sha384,
+        "774c1cb8fb4f69ecfb5c7857d46415568d88f1f9f05a4bf64a1e1ff6d64aec16e1d09292"
+        "010d1f067c68dddbcde06ea49be2ad3838053f0b9c0c2383edc451ef0188565118e7b3c6"
+        "6a4fa372b96633dc8a753106283b02d0322df273d58cc9bd061ec219f1e1a9c8ca1400e5"
+        "e39c1b2c254273377dc98a1a2c44e5c2a5b89167",
+        "018adcc22cb9a2db64bad3d60f1608c353e091637b948914115ebd43679904f955c8732",
+        "0400630bdd8937e961d5396f9ea5310123a340ba316fbb7d79bf8573f27a0065c6fd6f88"
+        "900737a0ac1116e0e2979f973cd705588a71cec5e2a9f22e7e81fc61a4375624f55a6182"
+        "bc",
+        "10a0c04762d02f9d3014bbff287864743426cee14daa43b22149ce73d1ba609c0ba6be6",
+        "0ac29b041a6b95f9ab685470f50445d416df5f7ee06313185794f2b542fcc00606bed69",
+        "00a4241b97b6ccf0dcd533a15867f5889349ec353395d47e31c9eb6b8785736b3e285cf" },
+    { NID_sect283k1, NID_sha512,
+        "c406aa4295f85c854b4db2de5a7a2defae53a319866921a3673af5b48c85ef22f6eb4cef"
+        "892c790d8e64530fc20c729b2821b5f5e515560b1ac764106560c3a6a05657e34cd6dead"
+        "fe2884bd288cef4ca92e1f25adde7d68a30fb0a1b3678156ced62e466718e68e9d67099a"
+        "d82613b8d06bdda1a7b867c2455422818ae9eeac",
+        "1898276f159c10d92d8d4b6ae214d68c72792a4b5f1f79936ca3c063dc8d9a88be439e2",
+        "040394cf9bb273923c88be7a1c49412ab8599e0cc5509926102c122326bc0b34243f7d1c"
+        "f3072330906f47e8fe95f63d0f0aca1115e77fc702a923c32a16505bcd9021da05fd9cf6"
+        "3b",
+        "058772fbb30227a136de616ace4a0334be0996d60e9772ae9bf672b7c38fe3ee1b24f98",
+        "10e0cd3fccd1728e99e2294efd6dd4797b6492ad95a789aab7fbd177475a047f1e5d38f",
+        "0c5e0b2d1991718355be14bc57e2d6ff9fa63e0812b9adae69f64da610cc6cbe36fe4c5" },
+    { NID_sect283k1, NID_sha512,
+        "cb2809152f8258660933472c06ddcdb65f6d5221fa29d5b0efec9c2a7914dbbf9ce0a468"
+        "ce146fb333d26f510a87a6bb01bf8816756a1b5df81c5f65360957cae84ba038e37e8877"
+        "7580e91c34e2f5aef4fb55af7b81ad28aeba05e0b1c64a15381a6719fd2c16e38a441516"
+        "e1b394952d984baf9e051b1dc1bda2e12f8ba5b8",
+        "12ff37c808c3cc029a9cfbb67a5ed21f3bf362b49270d4ed0f1e38fad25ebd79f112a50",
+        "0400cc00fb36bf62e777a9f6048761e53633b92866158200c43900db95aa1342b5760290"
+        "90055d7e57221ad939f5639282cbfc203114ee69baab4fdf194f4d2a937d8a57b70b54a9"
+        "07",
+        "163d8eec726d01a1bbb19995777919f68689f7c2920f3549fef966593c4fb012a5c3a1e",
+        "0cbf5c3bf1ee58869e1d3c15a05c23217f1c252da97f79334bc79efe3f5c62164669ac9",
+        "1fd51644f471ea497b0560b65fdfa2fd0a6cef469021303f97753d22ce1993d1ae5b96f" },
+    { NID_sect283k1, NID_sha512,
+        "e060af96d4a7fe512bbf26be9a27bb6a8ff37547d4a7bbbfa710db24cffcfc760dac120f"
+        "89f642880db2df6307f9ea5441d5932d49762d182b29d8e7fb067a61ab0df622f75cecc9"
+        "17e27d0326085d34581e052c85f50a37713e27518aed7c4434f86970e00a0a4b8503989e"
+        "72614131b7164c1bdc82d2b6aeac0787f9838476",
+        "02b8c1fef9c6def32b5f4127273ce384b6add4aecec957c1662f52334f5ee97f49852d4",
+        "04036a4fe1d77bc431012d25ff49fb5468f975353be70e7507d71966a0ef433df51dc323"
+        "24058d705cc883a690641f0ab85af4959ef4258a7ba9cde36dab77c125a1de1d39536658"
+        "4b",
+        "0865f59502382b324e1dbd75db150f342336fb19145fb43a733971da555ac5828a3457f",
+        "1ccb2e56c02cbe8038bf78dea256704ee6e51054668ba8c2ba11aef4ac6f9320d46ee8d",
+        "030e662c0e7d47cb3b835c63599d0c9c2e77ca47dbecd7ac834c2babeb039eb630cd0ef" },
+    { NID_sect283k1, NID_sha512,
+        "d235c31f0a82957a087c7597673970aa39321d4c2640685a03df8388b5eae4825d1fee29"
+        "926f416d5e62a2e9ca1ea7cefffd31607e750fa9675983608e0f8dc895371b190574d065"
+        "c5c0c23ffdaf49e65362914363a3fffbc2c1bb487cbd4f69ec22dda5c7dc3bbab805c81f"
+        "aa85787cc176bc0e5703924f395d8c9e7e7701e2",
+        "0afb1c45e9a9f02942b8e04da4b815498454dde6643de186625a98b3c1c6993abc8bba4",
+        "04002fed49c59e9d5c09202a5dc29d8dd527a870a180feded66ea6fc94ee094122ae9765"
+        "6b03620820bdd5910037f5877649be38db3571a9c6ac632602d2013d0d5abe1f00133f6c"
+        "de",
+        "1fe749d9916f11100af525ee343b3b74a493f92339e432a482dc8e86ffb5affc4630037",
+        "120f6f13331cd4d1a5b9707483c74dc0722452062cd4534e94cf40840d22ae263244a51",
+        "0bc2e37a481478f879de612cf4a833f7e12b8df33f5b0d6ac5f5aa431678ff053e2bc1a" },
+    { NID_sect283k1, NID_sha512,
+        "1a2559777a5fd8f269048feda82c4d9fceca95803f84a813789d6ed070422240e443789c"
+        "5231d63d5268ddebc060dfb99c4eff2ff115d2984d8bbc5c05314562ea6864fd543e7e0a"
+        "3b8572c017d8ae3563027d79bbe164d40a5bab354720e45094b9b26391ceb55339592fc2"
+        "f10b97dc9c2649f7227648f5cd2fc46d78d31c0e",
+        "0ff537d73a4da0ae3a4894016b71dccef3bc886f3d24a5abb7dd96cf8fdcbdf0fdc5e51",
+        "04001bd0537dfb29f727f91fb469c31164e1bb0ee192a5b89b880f3fa40e3e5437f0d2f9"
+        "e106df9bab2f9198494094a63f2ea091f60108449f0741806400694a93702f61fb0351a8"
+        "1e",
+        "0bbc511c6e1772ca6cd1cd308126c18c5db498055a4b3f1cb0dba3285f6d38b083e647f",
+        "1ba756f3c89b732398b90bfa2f92b2a77159c530a8020b75cdb9697c6d75c18d36040b4",
+        "18207cf326bfe97d657ac4197ee5c20c75431ee552681a92a5815db0d984fe597700bbf" },
+    { NID_sect283k1, NID_sha512,
+        "658c0d3f764bbc952fa55a258bac16a5bb5184bfa76cee06baf9ee6b9ac3f116e08bb240"
+        "6b1dd4be487b057f3b29c2043ebc33019b2017c4deccb86f50ff15fc9248ea5fb6426112"
+        "0b1960525aec3cc18827c23291722c5add8a3761ff8516c61956c62b8cbb13f3d92bf3eb"
+        "45a70704c01bb3625d21c38ffa83a6db086ee968",
+        "16000d2e879906d1040b32eb6ba3caff700e5565871ac75f10c5c15b509964bbe5e14c7",
+        "0402ba89255d1c89e42518662611e2efe3b5e3b8043926ae9c43974ee2986185269246a4"
+        "3302b87762b9ada81bde958d1f9b81246f49098695391ba3b4b3b9ac5727f19fe42fd079"
+        "46",
+        "14e837476e628007b2df21b5035a39c24cd4869bb52dbbe13c9666ddd8a7e3eeae29f65",
+        "1b5091fc755c0f908ee13ef9bee40dd16a5710befd1e265a312e595842d52cc135fd722",
+        "0fa25f43c3c074d702e45d216e3704d942e9d67b3c0728645ac6c53b9be7300061e5fe5" },
+    { NID_sect283k1, NID_sha512,
+        "4f10001e3517c2c1f973b555f4827681e096d860c4db08f1f4aef8000c9c24bebe59f8bf"
+        "3d7d3cac959a1a5477bb0ea43f2e746b5d14ed48a58ef35484b0ac786d2fec669f945e84"
+        "6ad73e6b77a9e47012a951b398941566330d89125eb3c1fbb2f06adb951ff5f047d102fd"
+        "f28b5cadb4a3e1a10412eb3474d2ed5c3fce78f5",
+        "019528d505bf0584628d0214bc857150a929d3f59619bf8f3acab545fff0977c9bcdc97",
+        "0400cc8863e1443e61fedc61abaff87d80450345489728d78c333b36fa28d8754a29cf3b"
+        "a100205ae70c35396c07f9f96aa7c59cf8a28aa2a365b4a1b68e7414d8c4ae5220c8bae9"
+        "ae",
+        "13d555426101fa3c239b7830fe0b6cf08a1c01f9a991f806c84baae20daddf5dec8f868",
+        "0af8bd9856dfd783217cf81b09b464614aa824b0298f35308e6427c679607853eb66c7d",
+        "0e6c1933d6ce25d0a00effbaf1db2cb2542cbe7521330c34286cf3bdffc20c001cd7722" },
+    { NID_sect283k1, NID_sha512,
+        "c43ec3c3232cae59bdea7cfaf18a4672035dbd2b8b6b1b44ede376b36cc2d8baeb921e41"
+        "6aa177f5977da8bf1d713509e5251278b6622790056271715cd5feac58bee5baf50b216e"
+        "8eb886279c5a384cdb696470275b7487fe9ac4c506706f6b0f9809d1ccb102546a4297d2"
+        "017c2a8df9f02f30d3d1bd9aebf6a92a02e0d202",
+        "067795ce117bc0a389397fc22a01cfd9422cfbfb5aa44131938a8c45e48e1d5a718539c",
+        "04007924de08acfae6260009cc2f02daa2fc2a809e6ab4cd8858a9e9c2c15b17e29f1bc5"
+        "ee004f36cc2d36df63474a579b96f6e59b890782ad8fa865efd80abd798ca2938bacbf82"
+        "12",
+        "1bf3242e75f8331fe70113ec8e14ad0814850bb8cb262c7d0a44ca69de52d32dfcabd0c",
+        "145148d59c5be2b6d39dfa33e904c161456822ec0ad64b9dc52befbd6496c9303fc062f",
+        "0b75c3c404d694e086c0f5aafd534e7d8596601f675b2fac9384fca6084711e35149f9c" },
+    { NID_sect283k1, NID_sha512,
+        "9b7d675a3d2cdeb280ea28289b5fc2a3ef6b535ebee8ad242fb031e2e1f364e8ee806568"
+        "b2f8627c5a5b4f51f4f65c71acdc1152c08b9211b81907b551e0ff47f5a6aca45dcfa06f"
+        "09bf195d19d7b165b52111b601fbd97b192f62465f8ba20773b1599c8041e91448eac7a5"
+        "763ca0628f40768324c5304e1119ca6a1fdb0778",
+        "19269dbfe4184249952a651a507584746c5b62c64cb3b17e0158aaf4d086a4afb0330c1",
+        "0406c60a475f2a3635fa523e1b138edc36f51e94a34e75989c2cacdf8949115d96f11ae7"
+        "520494d5e23ba9071b3e52c58b1d0740cf90cee7b084b9ef7a4a7be8aa47ce7b3d97c8c5"
+        "1d",
+        "111f4dc771b6ce5cc2f42172d3d70fe77c73683bdd2ea331ff711b7e9d8c3e4f2d7d6cb",
+        "027f224c01847c52ebc180ae81009923ae3453be1e0d94b5c2934603577f36653ecfccb",
+        "1e7b771631e5e72b7ddfb9c73f684b93270269ba4216cf3926e43b2ceb49756e7e7e0e6" },
+    { NID_sect283k1, NID_sha512,
+        "f4a08daf8f66ce57a986f14b918099bcadcc4308bcde7c169ce8536a40d94a928cfc0968"
+        "180a2c2a242c59df73ff79a03687998c421cf9a0e661630378779a4744ae2a6cd24ff61d"
+        "7fcd6c11a4c8bcaf358075e96f864df0998ee98ee393b37bb38747b70bb7a208740959b4"
+        "5174a60153ee566e0f62528e9a5e4466186fa650",
+        "03835814de0d6441cd80a44e40350cc8bd62ffcc81e939a4410bb9c9259e30463c453b5",
+        "0405ce9f6c979bc1d6bc41f41095b7677cc184da8918265a7f0e5b9dbece2ca9e0667cfb"
+        "ad039a395aeaa04f5168de809164285974d306e474a610d89fd401c375c9b73f0d23dbbc"
+        "f0",
+        "0b714d734d063aa81a389be69c56dcc23bcced3517e330572f79c769645e7dd2fd55c20",
+        "0e4d4494f91e79f2b1d1c0e22ebf744ef448f57c951f1b5f4da3592fe60008ab00f5f7e",
+        "02edaa4d8731b598c24b993dc5bb4888ea3c2dfe2807daf88170982667e69b76a8ecfe0" },
+    { NID_sect283k1, NID_sha512,
+        "864647405c70939fdb4c026bcad53218ba1d438d82c9138f0f0ecac815dbfb242307cca5"
+        "2c84826cf6556c51082a23f14252dfaea43ba229f7493db2bf8ae9cdb0228dab9e25cf38"
+        "5b504b92cca94f813acceaa1f18de851b8936c4dfe9e4e17002f02dded6b4c231ea5e614"
+        "ab46fcdd637b8c6193e8d0c2df1b3d883b97e1e8",
+        "0aee83dbed3b703cb6e60d51e373eb20e298ac005fa6a572d02fa1e6da0345558ad2a46",
+        "0400dc25760af992a8ecc108373281bd0d246f95933ec943f6346c1b2b941a03b33951f6"
+        "2206e35f02d225ba11d2ed7ea392898f78ca0deb2a47871eba6cd2be7440a410d910097d"
+        "e2",
+        "1df142187f8b27f4888075a3784aebe0fb7d80b0b6d3497a7adbb88cb6bd26cb82109c4",
+        "05a530bf1135ea6d599928cb0383f5d391d19be333b1577ee4eb6f2a78b54e4aac0e09b",
+        "06f3033cf392f698d1a1141cabf138c411f4e20687920f2915e17e805e8657a887c7953" },
+    { NID_sect283k1, NID_sha512,
+        "c87c8f3ad5c28a027b28ae5021dbe8d425f74181d519451f1fead7a1f9dd102fa6785b14"
+        "7b610610cb59bfa91fa363bb79ea602a7d7e1439f874c5dce748e5c320560c2d9676f3a9"
+        "48754c72b6db249478b7e19c9829ab4de2e344535d3e0b7c20c272f82556a280ef491524"
+        "b255c4fafb9c8ecb87b0149ddd9d7bf6159e3337",
+        "17b65c66514019ff935e9d571a4e68e9ee4463b7b9a754b93f4f7741693f4399879fa8a",
+        "0405bfb704629596ed05096783e49864a11874f319b4020917f1ba700ddb0606e6e72c17"
+        "93069194592be64c33c2f63771af0e4100d060e9750031048002680541815b311ba8f7ff"
+        "a9",
+        "171b5c698175300b95dfd5ed8d3fd7cf4e19105ed7193b6013103555808743501ee8c46",
+        "13f001f287dd5c7ad9af8d0105b47caed66ede41dc1e121a602610ce20e41af91cbe586",
+        "1433d5263d5233c40c0ca526b3657fcce8cb88ee65105b5f5ec82b26e12bfff11c8812a" },
+    { NID_sect283k1, NID_sha512,
+        "ac7da7611e2ade20aad64b418a16e02e79ab4894d758550210eb10013a9b5533132be701"
+        "f8843c840807c4167c38d21dff168d3baa65d5bcf285b73dcbb75819f8d7a20a849de335"
+        "e19bae2aab2ca560b93d340731f291599a5b28afd7737460d291105cbba6d0290e836f6f"
+        "6c1113d1b2faf90ac5de7c64e25206d79380a4ed",
+        "17d2071f39ba35515a8ec977ddd36ca15983e15bcda626f15af61d87d58114f4c80a8be",
+        "0406f09c255fdaf78d7d341fde4586526fcdec34a28448c7fe65685a67b6c33564ce9249"
+        "a3024ae4483fcbe3f823a7ce53db96ef2f6c68670e107e68cee4f358dfa844112d6b2144"
+        "e1",
+        "1403078da10f55724fe7b56dfc55990507307386ba82ca8f6340d33769ab1f6ca894bdd",
+        "0a54a35767a1cc77b2332b04694404fe5a31ed8851ccc2abfa5542b0f5acd9be9b1f02e",
+        "0577e0a1937172a6d45177c2b328d72f75a08a8a774a31151b89fd451d531348695d870" },
+    { NID_sect283k1, NID_sha512,
+        "5757c472fa2f81430dd920f39b61066a28c870b80e6c96f822f8f19b398c3574d159cc22"
+        "120454dcd7e97be8211916e4bc8db365b2dbb99a6e597d06e6645046a0abdccbd06741e9"
+        "c0eedf33cb78d78a540c2a390719acc498331e694e6b0118cf4f787b51c7b7237458a614"
+        "9d6dbd0a08bae8097e919f970fde920485e9a0ac",
+        "11504659e12235855fe55220287a101e511d39a627f8a0d414446385d4a88f31507fe74",
+        "040192fb9bcd157c7ef385d48470c3173ccf1ef9650da7d680d8473d45ab2064a073232a"
+        "c3014ddf872b711157d121b0a61b88a7eeb7cd260f1f82ec5f62fa2681e28c7f2640e305"
+        "e7",
+        "17e10962721f041946bb5ffcce724c9f284b1c8970f974a069c36dd4391adb8cecb8bde",
+        "1546450d25e2536aa14b8751e3b3e7eeec8a6c1cd967ba0f03e6bfe64c0a59072280636",
+        "0159c8d6499fcfe8ac7b2e84990a714d7888d883c16c016c4b165f36d62c3493afa67f1" },
+    { NID_sect283k1, NID_sha512,
+        "e350383d04af0f4081bf09b95d1d53040e7acc64e56b13b653df31dd119617b800e0cdfe"
+        "b935dfa5d94f1d7814688d8ce41021810958759cec76560e1e5c0581456acd1a02016584"
+        "9b2203f1c11d318d816697f36a86b59f160faeac7dba71682d3c031d0d547725ef69cbaa"
+        "28345512e38b75ab011911d8924b2d17a857a96b",
+        "16e4cbabb03215767249ba2a608708b78d7387be9e77f5efd2462467fa05e8dcde2c036",
+        "040112b7ea5d21df8ce52772a1b76a52ef6f0da62cb7718a467a034618b7ce701a05cd24"
+        "670649e0ad181437b4eeec87e202d8fab1c240f9dd9b31311284c24d89160b1895be5413"
+        "19",
+        "120e4bce412311d3e7adb36dc11d4cc1da8a4b9d6cd5219e772b3dc2b2b8ce08833748f",
+        "1ff2d53a8e6c1c23807eee681156a146e8f2cc1a8c262850dc69dece31860bf094e7f73",
+        "1e8906c0bf2a5f922ca271def90d704a1425e5cacc64bc5761b000c7df0f8f9fab51f2c" },
+    { NID_sect409k1, NID_sha224,
+        "f153cc61981a46d8a47d17d29ec157fa93fcf644beb84558db7c99c57fb131dcbc5b6558"
+        "1ced5ff0b29bfdc66ff703ecdd4290f7c353c02a3e6d6867f33f3dccd1a0b6752b8a35fa"
+        "143f8921a5078af9c85b212564c5b795da9858c7955095938fcd10c21e35e1abe905e84c"
+        "8b4bc05f2a06091ce876d9519b96951d08c7ac9e",
+        "011c6528939672bed3e8c905b7ba594c3ce95f37fb28044f210cccd01dfdb42c10e8e1a0"
+        "b5d6fc757834ca7f08e98cbc52b0edd",
+        "04000b570ec1fd09d7b4d102f83cf37129d94c9cf2f982b702c5d1172bae2df558008518"
+        "493c08dac6f76a6646156f123c4f33e79800e3cfe1aafbf25a5a4536d6c0cfe13a540b4a"
+        "3c97d4e7bc6c0346addb4b0c32dce089a7a5385e8a3e67606b45e2062c642bbbad",
+        "027cecbe83853037cf46aa98e1e1e552a96af0bb24e57756d8239fea5d769b51b83f195b"
+        "7801b562259ee644ab4047764d130a0",
+        "06a1601e07dfdff9d3b4ffdbff124b717403490853099fb4a00ea98f84ddd64e908f99b4"
+        "0a2ba6ab88b2491a8d948fcc2f207db",
+        "0741d27c0dddca3641b56ba1e9bacb0da1fcee46b9e33ecc6990b98cf0db74668ef1009a"
+        "50e5d55f80e6642ea48689a529c8a08" },
+    { NID_sect409k1, NID_sha224,
+        "258c91524423b5c876432b1930c7b07b56eb5e3945f1e2296a4e5bfb9b9123f800ad195d"
+        "6104641b1f1970bca553c2032f83d17252e52403a9381c1fc18eaffdf026f7537aa27d84"
+        "c5e3d6e39e651a92a41139cec5181fe794457f556b390943093be719acd23fa1ddf7ff0a"
+        "af0479484a381a309b4f681af74bf97caef08c22",
+        "07e3b714496dd118d8f3f597961eec5c43d0265bf85723b0b9b0616977e0acc2cf686cb6"
+        "afa6cdc19114e27ab000e762dfe467b",
+        "04007dea0ceb73b9bfaff7147a36436cfa7955eab02ce7fe9b60dcff3e088c5c9281be59"
+        "07de3e06ebb2e21dce8bf3ff85feeed50001cfa9b30af20612666e5df798f91eb4647d8f"
+        "5e1747c1b18adc6b73a848d987434c56d13ad78b775c4096e9f20d4878bbd9572c",
+        "028a8353c05129dcaa7caf0343130bf2e2186b9cb5ed0a27a565e1c24eb882617cc299d4"
+        "86be76fe0f8f3c52678b6992288d7c8",
+        "034299ca2aaaad51f12c90e8205da305523713516ba6e7d245eed8ef94a1b2409b98ae93"
+        "476aed6c9b9aef50406860b4e490db6",
+        "01a1adc76c65d77ea686d769dcd007c0101b4cdd0934402fa47dac22f8ecac28fc05c2f6"
+        "763a6781655ed5e7d84c41157255a4c" },
+    { NID_sect409k1, NID_sha224,
+        "a16a0d6fd57240fe88c7c36b9f7f9040cfcaa9afc4beeb8300818c5f90cce73b819a12c3"
+        "1d42af33146399cdfa4ed4954d068dbb0f1f342269dd29f1fe357e7224304b67b0f924b7"
+        "94780fe7e6aa9dfa3380252fe7177b43e7b1789718949b9ec1b943c83ed4399491482f0f"
+        "59d2cb8050ab6f8b5854d76c50651428cd29c40a",
+        "0182d1e937b037bf7f84144f7d4c94c935269c9aae7d500aa459a7a0ec113b232dcf2829"
+        "08eee4c84b8106cd38cdc41db3f89e1",
+        "0400bd4f1ee6a967123d70d488dbf0fb43aa5e93dee5794b4492277fe559776f74075485"
+        "0477e275cee9f1c375403a4933dc9869200191a544b98ba954cc6e060ba26a52fecbd1f0"
+        "dc7c15381004cccb799a9f7960a3cedd02d36fcaeb0ceb844bb4683998d776dc5b",
+        "07904af733742716366f8ba07086f924697ac8a01bb4895bdb5715081ee89eaeafbff4ce"
+        "c44eb0ce14e774dba71bb9b091d2594",
+        "0723b2068957c4f2ac1df69378fc013797a3b071de30b514c3e610002dc8bfced32bd2f9"
+        "e8f692b653e736696cf818b0ecc1e10",
+        "058455b8f9abd5fcc28a4ef839ac0245c3feda1fdcbc3c171b6928c6abc931e8b0ec3438"
+        "2d63e414657e9319d2965fdc9eb74cc" },
+    { NID_sect409k1, NID_sha224,
+        "d02ff569828fd1add21f6bd1c50cbdcd09222e458ee79fd5dfdba3cbb84e9d926fcf196c"
+        "ccedece77d5aa17f8c8cbf3a9facf0f02c71d5c1c8aeda9d75f6fd7b6f2c5c70dff992ef"
+        "6e02c438fb3c66da5a503b3c39acbe2a069da457595b542190d818015d462670b0807c40"
+        "1e36b1bfe05baff3a8ccf8d1f5f8de7840e87993",
+        "07ed09428f460724c8a5225a31151e031d9949493fff5703369c401762345d002c4ce424"
+        "294baab22d9e71edc4f854510cf0e6a",
+        "04007fcd003a8cde5503f5582a42738738ac7efc6cdb3813a00c072fc114006be9881c0a"
+        "881ca35988dcfb8088f3d07a03943cf23000e7041e666c1bed3b80a691ecff60ad4afe3a"
+        "544ce58030bbbcc130045e2c611d65f322ec78aff6757cb5df8ad54ee8a09616ea",
+        "02828c8c4bb1722b0f03262de32ca8a605c4046badb20d8eb9f19aecc5c69f199aa48d09"
+        "b61f285254425cb4bb5e0763dd471bb",
+        "06c99d796c5d4fa21c5cb7cee0b7570edc9d7e9d7c3604f5ca3766b17e44bc71d8a74ac2"
+        "68b8713cc2ea0adc3dc1971c062b4a1",
+        "075962e0ccbda2280e502559f48c8d37704964f67f8cd3b443b89be740976f1bd929c175"
+        "560fc8cfb282661c0fa792a5b200401" },
+    { NID_sect409k1, NID_sha224,
+        "57befce973b225cfce7f996fa5a1a43acd160681b88a87b7de04544eb7b6a719718f1ca7"
+        "f559b6531bfc18fca3836d2be7f7a6e48387b7579a6845796d30e46f0dda9d82680f8c96"
+        "c5f0989741adef9762c3db763cae2699cb6c112543635e20ed5cfb4b55ca2ccb32d2d139"
+        "36085a8ff95ed658a54be73f80c912ccfe5f0ca0",
+        "0390f05b9619c27b800e99aeaf61ef7f6249367d5cfaeae3c7b523a8b29153eb8a77132f"
+        "6c4412545a842d6deb7b7aea7e2bda5",
+        "0401cbcfc492a2a6bb8a7341df67ef2bcdcd706afabad5e7ed1d63387ad9b0dbc47ed17b"
+        "82de6de936752632e43c393a93fc5cec0e0111768994b2dfe9677d9dbc45d4b55fbbafda"
+        "aa2b2638ba1605c35301fa557d628a87d0a7febcad9f8eb4b51fc9c807652579f6",
+        "00b8d236a9f8edba7b5207b4c7848807b933b214fa25cfc5a0e73f750d30051264bb9f67"
+        "02837b0f65a451d4ef24f047ec4e9dd",
+        "076bd4755427fda22a0f177624477c59de12a12621aac274b980b5e1ce5dc700591eec13"
+        "dc5bb48c5c8643de287a07a48a6a7fd",
+        "065a5b0a00548bcd7f59518f122d79c7552ca6097f3867604b462201add5f326807f0e87"
+        "79f2177f277e5ed25253885ca81220b" },
+    { NID_sect409k1, NID_sha224,
+        "4277ba40cb462860ca722cb4ee71c61836d2ceba18bc91f3fad7dea478972c6da0ebc028"
+        "15eaaada1d1a5e93d7ab353855ccfdfc94a5742fe18daee2328871e06c1ab0a9a989d123"
+        "9df2d2d27f96c415e7ef9a941f06c6790675361173cc229aac7045f49eaca207f59c4976"
+        "19ba32e932b5c1c6576812ee5b146e2cc7de5e62",
+        "007d18652732596add3db31f7a0ce6020d03f3df58131b0c7c633faf619b8210cd309d6c"
+        "0c4083aef1a1b6d2a756adad0bfe344",
+        "04015ad0682962b4dfc8901a0dc77d548ed616286733cd9b3ede937cdf4401ab8b3e3516"
+        "d466ba43b6ab5356c4e72845767d55d27c017e4de3288ed44b48e7c47b16e2afb513c976"
+        "3d5bf4cbf9a357c128c94a758e3ff946957df461531def2b8d8411b81f45f0c2dd",
+        "01a896c30fcfdbe583d6b0119f467f47758ee01d4d601eb698f444ed0f76515c2b8053b1"
+        "1ae7abd0eef7aa61145a53d12d560d7",
+        "053b1cd57dfdd8d1802f3e295e450a155c366bdc2bd222d18a4d08369c25e53f1f633958"
+        "b22d80755ecaf8362d548b28dff1ba8",
+        "069339fc6058762a99576a96e76f75275f848102bcbc281e59fda26c98fc48a3f1061755"
+        "e80740a233e03287f510f4549bb1874" },
+    { NID_sect409k1, NID_sha224,
+        "57ff6792ed4b12220d179bc0ea57ff217f322c85bd3676a681d32d7e4a3e0c8e891fd267"
+        "df17caba5992f68c35ff670b60b4bbdfff82404f6ed996c30539bc395120f97d4d7a652e"
+        "aee82bd8f9360bf8bb73748b8bbda9f9480eb54f7eaf2609d4259329e8a5ea020521e7db"
+        "d3ec56f23c849932cbdf2875f5d5c774a9d6b0c9",
+        "02a91244ea4623b63403dba807d60b914ca3b901a2523244c322f2f11251446d3f15e869"
+        "d086ebecfa1a39ce304e8b5c8de23e2",
+        "0400b7ad8f0a52ec21e54e28ef603d76652dbfecc7dd2427cfaaff3d280f0d1f62187d77"
+        "effcb433b5bd44c3d0c0d26c38d3f5930e0080641bb0163130be4444f79c500ceb8d6a9b"
+        "2cac42d21d31b2fb29da075bd41c6613f278944adfe92d3c99d494be9d4714e9b6",
+        "070125c89a1262a88f22e874c55ed149de6d961d6abaab2d13db9174e3cecb8f49752995"
+        "7058a0afe5361ddf9d3a5a3b923c7ef",
+        "01a28cfad13969c6449e5a0f879e01ef7dc1cdcd0bc77d20f3989c588a9cad12a4b52743"
+        "c12f4f6e2154ad963bf234ec96263f5",
+        "066d7f0b364a640c6c620e3d030448d155cffc9ffd46a6adfa1c13e1b01892463a472446"
+        "5aba3eb07009fa604f3af18109cb72b" },
+    { NID_sect409k1, NID_sha224,
+        "f85113eda64478f460b60f8084220134933de049200a5f37884da7901471542e26690a5f"
+        "abc3cbf9e679ade71b6e54d869bc136c3d34cc4a9efcafb777abf046b5ae5429136112a9"
+        "a36a475121eb1f33f1f43481286fc1ada98a41064a1fa38c89e99a93065bb2a119348a9e"
+        "452497fd5a0d2b83a66b09da9f47a0583732adf4",
+        "0068c56c6b5d50d1d4e13d3837d8c5e8ba2f825e121b63e97603fdfe78bb6899600ff0dc"
+        "87b6b3b6868ad0d2f62b7b7a31603ff",
+        "0400d9a4f5992308013573f97864c23b98d276975d80cd6455e9f0d8a62d6674f3aee3d2"
+        "7dec15903da4e9d5908cebeb765ee02c80001f61189caacb05dfb982bcccd603a769d0e1"
+        "be8f9223288b5426e7f88854356fe825f11a88918085692f33b0f4c61ab09a861f",
+        "02ea7f0d81fbe3d4c865ff5315d1cc38f9e9a8653fc91dbdf445b62fe09b30ccddf50878"
+        "3ad87c8a48a6ccd5c9e817fe2977f90",
+        "02d7847479c16c4cba834ce5962724f185be06cc04a9a8d710cc72e6063a7b64fbf2694f"
+        "5b62de65d3d347d34c0dbfd5a4d93b7",
+        "069e32bb19d20e873d0e62b306db4d5663576e4b2fe75e8ec79b7a63f38c8f1007a817ce"
+        "30612e8578d48c63b04b1d34904010f" },
+    { NID_sect409k1, NID_sha224,
+        "42811e9ee6dc509572e1cddbe5baf00afeb0c5c13e3755b922eee9e210001676082bc9ed"
+        "c3d78db2b5bebea7a2c0cd2b369226c2b8f83b28f33fb513407ab9d287d14b112d6c3be2"
+        "493805ace5cf6fd366d03cfb28f4ce3f0f060880db64d6962e997463ba7c05b6fcd1e66b"
+        "abe4b94afc5c2d38c7050c69571d27b66ef0090b",
+        "03c88084f8b78446db431bd6e240a0c050813d2a763675b0ea869cbe183df697146cf29c"
+        "03479af3d34587a95cd257027fbeed8",
+        "04015a09436de00d8d129e297ea60e04b704c0a8183d64a77d1c527189e25e21d6bb62be"
+        "8ef5eb2dbd833e5f9c7d5c3e69c9c018820001c32ba376d2e9de28fca644b0d567ce1f4e"
+        "f0aaddb2adec6213d03bc8cc99f9140005bed3cb6c3c0f5533275734aaec47404c",
+        "0132f4763959863a32919eb591799ffb8613797bd0b617c73654ec9eb32e2fb86631b66e"
+        "28e1b4cc4aeba65ba8c75aa1cfacd73",
+        "05fe0ccbd430d9459e0093cfe2c1d1d3edff8c1ae7111299d2e04f414c46ed2cc88ce9cc"
+        "9e23e187e87ef551de993f52214d609",
+        "0557acfe6347baafe031dc16032c45559693e2793d9b6d372670b09757c6f4a3e5ae5e55"
+        "264137d1859c8d9f8f03c25de409bf9" },
+    { NID_sect409k1, NID_sha224,
+        "b38f76ede7441ae0887e689d556f43155b38dab7cde487ce9ef9a46f2957c830d4d28006"
+        "873fe2368197a6931f6fcaad755102686a457a7edccc8d344e2d2a9162e3d71d41c09a02"
+        "2539ae6d404955a6ad748231aee1f974d4f159940532fb3b1fa0254bfc5805d2fc686968"
+        "56fadea386c542d3cefd1be3af04ca595e54be25",
+        "051af7b63bf3297ae20517faaa1552f4fde65819dbbff6a52721611e5b7dc1242ed6e697"
+        "68cdc37ea8cdfd1a5971f06b84b5803",
+        "04009cd1280a2a79b182ddbd1712dbfd12cee3345a89636d7673a5fc3e1e51400603176e"
+        "27d538e90005625aacf5cadcc8a8c25532008b5aabedce498476b4c65ab3cdc81f819c2d"
+        "b670a7236c0357a86f9087b83e7568cc6e5139fb92f81975756d7dc4f48be87df2",
+        "00bba308a3eee9e3ab6d2482bb728bf44cde9eedde15af7300c57c2c1e6fed2ee4e404ae"
+        "ee3923e7871a2ff4ba6df64f9d01a87",
+        "07a9e69664b7b81edc5d47c014696d194b2ca4705b2e79af692b285ec476169d041dd9ee"
+        "f20f7d496fc49b8597574d2602757ca",
+        "01521d7cf6aeaf1c8dd54a7776cfac02967983083770346d9768a2629d606be90d58ea82"
+        "377413a0fcc3e4e66f05a0d05d933ef" },
+    { NID_sect409k1, NID_sha224,
+        "356dc86cef7979148e995fc5abe2b14a7d5e4e42c9b3509b4363bb80c581a66f4e7e4aa5"
+        "3a4bfd37f9a7eccf75fdd726f348f6a3f779e6599f61bd1d668517f40453b39bcf35db08"
+        "52a6a6218198f52b7ceda2ec55fca5abe8e5d93af9a42b9ae4de9530c5870211bacc27c3"
+        "9aa094013db703de2fd3121f08d7e97dbd4e8946",
+        "03d65bdec48972d03811b78150a06956eb22d337dbec5416bbd8185a6322cd8c0ff80002"
+        "10dbd1326422289071cab65175f5d10",
+        "04000c9c1bb0a80c4b4863d78003e21ee60fc553ff72968c165f6eb6940250a6cb7d545c"
+        "6aed3760e42370df79b0d37c2d1433c486001a9d994828ac09a86c18b9758b3f6b91a577"
+        "5931a7a6e4d8b052204c972b993a3b420eb8ff7e91df77253a9f5847c5968b5636",
+        "0156d12708324cd30037753c78225d183723d3f15930f23bae854f121094bfffb5d7dece"
+        "1fca93bbe7457a2237760aef3db8e3f",
+        "071466e80e2a7cd8e6cb6dfde259a08619f880a71899c58bd4cd33c29f7b321d26953372"
+        "0101f2ef70f5b8e8f05c9cbe1ebc303",
+        "077330e08712ad709f855d92355cfb7d565efd806c6a853712916f7c943bfc79e496366d"
+        "eba79ef7491abad23086db341f339e5" },
+    { NID_sect409k1, NID_sha224,
+        "06fd39a50bf25e89f1071ff81fec5d1e35b6dd68990414ee403dfdebb792627b6a4ae3d2"
+        "236c159e4441ff90b61ec87b1592c538515f0486b19e58583394a05e6411e69b4285d6d6"
+        "589982ac0eeb2c912c4948789cad741183663fc070943389d4e9a1150b8f6088fc506059"
+        "15e9e24b2d98a1f539024770e4820e14ae42ea8e",
+        "01f1a8b5f35dbbf82c102df550c72216a243f986f0325920f6186a16d1da74228cc02be6"
+        "024c7411160c183c923c743354f9438",
+        "040157ae8d90fe2416f70a7ce0669acdc0b5064ba650cb5416e59e6672e45b591774ebb2"
+        "f793c3a58e953da1ac08272d0b949e7b50006d49b9784f8423812967b857e25dc3af1312"
+        "a6ff29579f6acb6e155b6848ffac6fbce51bd2d41a22ef955f690e2487a4bbff00",
+        "04cc45e00847818397c6abb3d176cb8bd77814abfc253e3b0d799dff2c3e09a5195ed5e6"
+        "232873f2783c8e670b52a839e06bc30",
+        "067b418a5395216b83ab00d5568eeb62ae0693af2b0e4d052c6feb70562dcc06ef852002"
+        "687099dda114477871b924775e8460a",
+        "061d1e4d713689b2036272ad41571759b52a78e0f8a84d1f3a277aaa33ad558f0b71f3c5"
+        "a99d403e49df1afab66059db20f9f32" },
+    { NID_sect409k1, NID_sha224,
+        "6daaa41150ea252a3e966a338377307d909b95080e006f13027f2be5059d9208930c5a32"
+        "9994c0b794ef50eb059bc6c215f68cf42260bd410f9bd86d2ad5ab7179c7c92de4a93a5f"
+        "6aa17de5aefea815e7c0b78a8cc53c21dc4dee037b29c9df4e12343109283ffd5d8a3b81"
+        "fba1b5e95506c7e01ac056c86dd0ee23bc21af0a",
+        "031dc621200cd174193d95e9092ffb86189c52cdbb9ed937593f2cde7c4a0264b9100e1b"
+        "8407336c8dfb5520d28a18dc4e39a89",
+        "0400904bb904d50bff09bae5dd21f425c808b41001ac917b022f7e1cda6e46504781a69b"
+        "aab4a6f0f100c4fff9ced26f871159cd30015cc300b0efbac707635c72bf855de4290f1b"
+        "8b70c16f9bd0cb771ed5c760ada04d0ff648f118d64e0aff6a6de16def15cf7437",
+        "07e32b1fc1cebeec3d84f56a67c8ea2b78723e7010a725ca4745e849e573e8e4a4ce11d1"
+        "af4ee508b80fb5336de3cb53161bf44",
+        "071cd81dfbacbb67be5903cbcbe402c0420adfa9d14148bea600b178fd06278572d34eb4"
+        "6d857085a2a4f48cd4ee9109d607dae",
+        "0347b1029e67a6ea2a45af1f7410dc951db813eabfd3c7f3e2c294b81e1c54fa8c98569e"
+        "fc580b68007bfa316424ac6eb353ac2" },
+    { NID_sect409k1, NID_sha224,
+        "6378dd1c12c5197b57d47dc46a67949bdd1e0809004e94d49b0234126a08ad5bf8723ebf"
+        "d132145813136d8b7dd096f56c34248f09a65c34f60c2f80f9a51b3795f3d2518b11aaea"
+        "f6dd45a323794080b78f85d629e5fa719b6ab0b14c78cd908befeaef0dbfaa08cec9318b"
+        "bcb376d48b11b68735c9554a45293db5e9239ae1",
+        "016e6750245a88340b0f0665b890459f8038e9b1366f2fc1326245a88d4c523ec94429f2"
+        "1869ce3dbf75126e58f77241c99efaa",
+        "04010184fd47e8e1e4d534ca1cf67f15bc8a80921b07e251c22eb88f25395e08d7a92837"
+        "74aed204fb5c14aa13c63a94ee691b4ff401252ad972bb8c0b286c222f42f7d42ca6561b"
+        "ac5e517921bda53e51043f13e711da8a813bb6880678e4d6a16820bab819d62e59",
+        "07f18539d00152f5b9a75d4f114812b87024e8a8f9c9a8d12139d0a74d87986f4305bde6"
+        "0375918ff2dfdb88b6deda640e17364",
+        "0735a15e7bd1f69f4e90739d42ae239a8e9238ad28b63ce291b57cb5b99922fbd5dbb7f7"
+        "4fcc23117243efbd036eded6ee0f28b",
+        "07bb3dc77cdd4138a02e2d5fd4f6ff8516b4c95b8255c629132ea8705c399fc60f8fb660"
+        "ed3aae52db283aabc3626a5559dfe85" },
+    { NID_sect409k1, NID_sha224,
+        "b898d0f9bd80e083fa541f457d14d853bba55b120424a95e1d9511c8833f48444329e034"
+        "9d68204c4b4581ef1c4dee23ed0a4445727a72e1e6cde422f7c10ae132a3fe681f9d741f"
+        "da263e73f7cdf10759467c9d76164086abf6780ad474772771eee22d195339bb8f6235e0"
+        "d992bbe282b13ce4fe01417f507a2c4fa155e108",
+        "0788fabdafeebb72f6385301e30024b56639e629a400f9c50d402cfc9b5817844f06a451"
+        "fbda29c7ece41dc9ffcfc625fe0ff0a",
+        "04009b2c36d221d18189e1617cb2f2ddcd64cdf8a42ba6acc55f04e9722b11588f7fa861"
+        "a3940820d9dabbab631d7fd4106c60f37e00da099cdb10dfe2d7c0a16ed332b459e7be31"
+        "f44b0b2d595dc948f0b073ac4e439f24f215fba5ed50aef3702731d6561eee1986",
+        "00581369aca680beb705f52b6bef075de83ad29034c3d6b2949b551a0bbd100897a079b4"
+        "9d41d5030e1a6950fdb14d70dbbdb41",
+        "04f62415c99c8e6750f9c41c31cf050eb58f61f62eb0b0023d61dfc30e7879d4f5a87e88"
+        "faf55522631a29fb69d16e15c354323",
+        "06df238f34b5ae664860b43ea11defe3120591cfa371367096006c03e83d372bfb70da6f"
+        "789665136b7dd1c59894a2fc5038c4b" },
+    { NID_sect409k1, NID_sha256,
+        "dbe04561ea8579672a2b3afa94426a3cbc274b55263989d41a778bcb082da797d84d930c"
+        "a847a481789524940701cd5f1d11b460bdac0bffb0b3a3abe1ab689c519700de85a0a571"
+        "494ba0cfc3c865450eba7a9e916b7fa9df55e8a1c246c992e6a0b44b78274e008472bed8"
+        "d8411633e6520e1a906c5d0c8aafd572fe6f1f64",
+        "01b8dfd64563dc219d6eeb53f2e3ad1d771140d0960b211dc1f757af5e297dc7548d6133"
+        "ddb574711d466688f80dbd65a7bbcdc",
+        "0401ec530638ea0663cd3a9b237dd66402adf50d3094391f2343d7d6c52c1d14145c2454"
+        "64a3b771e4b1894462fbfaf440e53eef7e018349e244b24c8353811c29a60d8e02caf195"
+        "a424aeafdfd0361846d5ce5eb83da1901700f00fcb85a0c2543b49a8a3ccbac157",
+        "026a26cd09c9329cd45ceb4c798846dd81af67759794f5cadab84de19a835f8a0ae49b12"
+        "853b1e92822477a73891f85acce4216",
+        "04d83a5f9dad246717135bec6e386ec6b73be9ea6d1a17334ea2003a723d510914167d13"
+        "6254d6cb64b16ef7eec5044b8f2ba28",
+        "03e81601d0c66b507a491c530075edc5b09d770633a4c2355b3b1c7df9b200ebc7dcb706"
+        "be1696aab70d4c6e1c4a7e532284670" },
+    { NID_sect409k1, NID_sha256,
+        "48a8300820fea2ad83c83f7d6b24192715329c3f159d56644e11ed25efcbd3d31600a813"
+        "b909812987b97d1087e74a63b4494cc031c63492b6615e9d6e5b36f62cb2ef88b9f73659"
+        "5800de465789f43811165a5fc093ee6d776008739de8de2a84e878748641be8bd52e5b89"
+        "1c4145f52bbd46644852a43108e93d86352b2a3c",
+        "0422131829608ff730c24ddf7e8b4a2600eaa9681eaf45432daa7d41fe2fb488fd0199d4"
+        "31a1ed823801ce21f4f01a4dd4248ca",
+        "04006ff24eb0ab812303bdc9a23719caa789eb75775e686b9511bf6e07d60447d1601a48"
+        "ae7f3041cef5aaf3ed2adb6feb422fbc54009a351fdc9422a81ebef5407d0d74b52a348c"
+        "af3cf6e1c6c2af722c408941de154619a1d54bc23a9dfc0c4964f3936d62daa6a4",
+        "0313ec63c34ed325d770664aed3bfd1a16eb636516eb686e806b0acf6f0d117998b30fd5"
+        "2068a36f03d0db3ec13e6989c6f196a",
+        "0088167f96d807bdd61e65fadaf0c56b623db42b831909d12641e4d00e7bca6077b36cfa"
+        "759fcbbf087c31f294f20a09e0bdc96",
+        "01cbd06232b4c73cdd13208dd254ebf9351745ee6196e3a94b9213e931f141e4cc71f3d3"
+        "18a67e7b8060e11e88783fca0be41cb" },
+    { NID_sect409k1, NID_sha256,
+        "276e3a986ce33256014aaa3e55cc1f4c75fe831746b342eadb017676b0cba7c353b3a2b5"
+        "54522c12e6aeaf1364cd2eb765a404b3d0aa61258194a30219d76d2bfa98ad20e7e91756"
+        "cf65e50d7914157f283f2ba3930c0ad3a97532cc747b1cb9c806fff497f0322025a3d02f"
+        "f407fc7b5808585b91d95523c9d5864efdf7d983",
+        "0095ae8e4c7e55eb5da01acc05ecfe72a4dcd8ec152f1c8dc165014f70eb4e4a7861aeb2"
+        "b96c418b2d4db58659e76184e013a49",
+        "0400a3987d7262dc30e8ec11458ff7091ca993bc61f142ee535d544a2c88a47f96011076"
+        "19617a5e65cdd6d5e1a034aaa22304434201fc8af29d5134ca9baf92041b6d6aefabccac"
+        "a4013c55c1581ac05db6141290235ea09650a289907785d282cef1b9efb381ae66",
+        "066015a77c99015ed6983bb379772bd90e03b9c010e695853ebf8e461a20fc12b20bdda4"
+        "7eef856f162dfbd9fd4fc1ec49105d3",
+        "067c49b96e5bfb6a6d625346c3ecff13b8c8b7e59c764b73b256ac970aa4056460000e59"
+        "9a8195f2d235a75cee8e5634acfa7ed",
+        "03ce25ef1af0784645f0579da381542f5b8aef377e5b79193314f84853e2a07a4f1aaa4d"
+        "8210f3a3c249a879cfa3ea8af43a929" },
+    { NID_sect409k1, NID_sha256,
+        "6a4fc1827c3a7256faa8ec6a0f3d23559d6949f8cc20e7f76111dc4ebd59213951cbf0ea"
+        "dacaeb8862d6baa0cb298645e4314b1c303bd0d5e9893304d4b7fbd36ab05fb6a5edc3fe"
+        "f763e3a4124d61539eb616b359c5cb55b5e2bec50c91dd95fc39ddf521aa854216eb5a70"
+        "7819fa6f067b316a17a3b146e7cc2dd517f7d63f",
+        "006f2075bd730f34df111ebda919167b1d3358ada32cd6747cb3353bcfb814a77ac70cd5"
+        "1b31a0e538539453bf9eaf9d8b384c9",
+        "0400bbc153deaec0bcc36c03d24afd20dacd9e78d104d94c279278d04b597ccccae43cd3"
+        "e64c9e1e58fb5408f376dd7827ede9dc3a015ae0d803acf12d9d3fd41f74357b1c93cec0"
+        "480f2e586d0e18f15e569d27d3d106e192ee0c1c570351eff1f463dc07d3bea933",
+        "0314330098250e38145d11a48f5043190c6b44f8572ae57cf83b1f3c4c03ce38b90ed5e1"
+        "57464c2613c82943d78c938fcde89d7",
+        "0160b20c370ef4b9cca3f7dd3c23f70efe6bd80751ca021731bdfb0f45ae07e5f2144c77"
+        "795aafdb0c3a92ebbef75fb2d334dee",
+        "045188dd2402ad36ae4278a9910648ed5e71d64737651c133aa89850e3bef2207d58ba41"
+        "69e471a4737962f5fafd50a37a28e1b" },
+    { NID_sect409k1, NID_sha256,
+        "4b088199bd8c94775d8ee508377d672dbf50f6d2c7370e99821ec8f9387492fb2eebdbea"
+        "473ea18465565f79e2af418555f10c4a527e05a9e20c9c00b807dc8b350cd4ccc2d87e91"
+        "f66addf02ce4f43597aa258ac6fbe9365cc2c8e8bbe5c884abc929710e8423cd6722a8f4"
+        "73bb55804159a92a3d8b6661a536b4fb9293bb0a",
+        "03887d284e9ad17d38bc6da9d83c192a434c509340a7f233cebb032b09ab7c4c6e8730b4"
+        "a80844898616c9abcd16b753c6bb4c5",
+        "04012a6d5c5690ebf14ecfa54ac97b73e88e16e757c34c6bbfdc9a3a119f298860d330af"
+        "295756dec41eedeadc5257b202451faa06019f40ff28bb72af659d5319286fe21f018199"
+        "52d471ce2433ade745042a47c2dae798199c364ceb99029c2dd5cf57ef5daa2b00",
+        "035945b45221300f83c5fafbaf0645a7386e209d025b3e1dc367819728f630663fb732b2"
+        "51a019e08dde0f64dd3f60a10065c50",
+        "00c323c86e8cc548123d1337936d4be948bd4bce4631a2194c2bf04e1fd714df2c90e368"
+        "1e41a21d58d9567a5df9fc478dca8e8",
+        "0493d3f4d22cf8517c301f15bde52cef17c05fed2482f3ef15cdbe32c5f0975e054d45b1"
+        "3faf906896201942f29e5693bfbb229" },
+    { NID_sect409k1, NID_sha256,
+        "848a13465ddcfb2dc14f7bc0db0756832c22dde1e31e4d8b3ae0dd1aafbdf15e954889e9"
+        "5d3bdfd6e5ebb6171fad62592c23277a89e8ba53978c9b1afedfef7e1c3f6d9f31077530"
+        "460b47834b30bbd84a4da601be988738aa815d3d7e72043243a5288751ee08b4815a017f"
+        "b5d9bd55833698a0d526b1ed79da35ef0fac93da",
+        "02ea5430610864257c9dc393c3addcd0d8d5bc8aab1067643b08857210464428aa85cf1a"
+        "e6c743fd2682255d4c8eaa46ca21e73",
+        "0401e502d3f47823ac7207861855fe6f6aad1fa4f2149bff2643b079da23fb270599f744"
+        "669b3c8ceb4cb0989aabd43d26d93c814600cdcfc138451bb59f34dc82b8128088b5ae0c"
+        "b8a77dce1895d5ffdfc8b4be24a206b9856954508b82b80d0163b276683489074a",
+        "0426b90275d720d19c6ef5c8c74c568a636257740530e3ad10de0d518c4eaad8bc58cf45"
+        "06cf5cdf7f2b03edd1caadb28fa3787",
+        "0123ad87c094c4ccfe4346dadad54a6b1ee1bffaa1b7b9094fe2e6ae785a2b77ce3f5e56"
+        "8e43e8b7fa997206262645f56078657",
+        "00d56cd5cc64736ff7ea0d9840916b1e1c94e11611f93b1b11c2ee98c79d92a8af1a560c"
+        "9938dc4bdd0b84252e259ae5669d1c3" },
+    { NID_sect409k1, NID_sha256,
+        "d1850545c04ea65528849973c220205c35eae98826d169348970d1420b4d872ce233af1d"
+        "aa9e62f6a562544ae3a0633a954a493e9766dd5d87e47486559fdf86229a7c9e1726de21"
+        "895abdcf2422d438f4ad98d88b45c56742694ad5e11894253270997c049f0f419842482f"
+        "21c792fbe5613e2defecd485585f1835b6f4c578",
+        "062c757c92eaef41f5d81169ec4968145b5aa2bc1d2a3a5fd000634777748ecb93677b3d"
+        "a12e3be33272a8f0a52300f4a5a37c4",
+        "040139660fb8bbba59e8f4e95e5ee5b97227220f0e1b293901fedcc6dab86e7c5a9d20c1"
+        "a097ee2e926a934cce679fb8dcd8d2ed6c008ac510ddf735184e8fa9693da264194fb78d"
+        "a5d1cdc0bf5faadb33950ca191fe233eb8dac8adcbfe15b4f7c09d5ddeef6bcd1a",
+        "026868bf1764993d650aaebf117521cd146ea20067cc14a5843f726a3d68e41c3fba82a8"
+        "3d406b2275b3459748b3bd1a8d32f1a",
+        "05b17d13ae4d9535d062a2653bae4d15b9b859a87c33e175adc3ef04781bced888f3e93e"
+        "9804b2251a40b9344c0f8c6bd5be0ba",
+        "01ec3322c5beba4423b13a0528c71739a6b39f7b0e0e58a8274a8386167cadef51e5560a"
+        "3e9d97447e3d3c06288459fe6569345" },
+    { NID_sect409k1, NID_sha256,
+        "421c9784d6fd507c82904e1054edf9bdd1efb58a0b211340086069ad38b7b0dd15c2345f"
+        "a8767ef71254ed1bd5c35f742b1d3f4765ff9007a5477ba9e5d3d5a5cb5fab4efc1cad73"
+        "701d4776c6c4343f42b5d94a9eb78ae428dfe5fbdd8e6ece09d5b75cf4346cf27db85635"
+        "2225ab04e6ea56661554fbc39916accebecb3935",
+        "048a313c0c11489939fc0cffc6ccb9f179093c4e13141b92dbbaac441b7ae878c9d41206"
+        "6e95615174a24692555cbbe904a14cf",
+        "0400677c2d364fa86b8b0c79af754e675ea3e806d5583e62087e01590b824d2730e31326"
+        "591167f02bdd29f8178787c4e1ba9d249600e7f78c423baeebf6defe9feb8ada8874ceca"
+        "b083ca2e71d9d8a3fbe846eda69262a1f5b4a3baccaaa4f2cc87220edb1fa6b6bf",
+        "012b8df87dd935775b80c62ed6c76974fa5772939a9e7372cb74e033fbae4f78d75b8bfb"
+        "b82240cf91009b5bef4d63ded04cbc9",
+        "000590a9e8de60b5cb181a1c11c2f6115c66b05e71e0c558ae203ee18e54de68016f4c7e"
+        "d2f01cb0cbaf1bdc45218c0fe2b1552",
+        "0521844eee9168a501e235de5fd19c84f052445fb0e68bba687ace45d8630070ddd3b730"
+        "34d1d65788a51acf91273fd187a24ed" },
+    { NID_sect409k1, NID_sha256,
+        "7910bab15b6429947655e33a67f41b76f1d7b71534f8904d6a0472c2faded038565272d0"
+        "b5f51aa915e0d624e9ff48d50ebfa2f09324864f26c29ab73eb39b436c5c459c7cff4d2b"
+        "62992e3489cb4ddfc05d7366b161a463aa1b782641d93507de43c8cd0a0a0a9d1c644f45"
+        "54e3edaf7fd794248110ca9387e73ae5d00d299e",
+        "046e2adfe5d3549e1e6fa1fe69a7cbb4ac9b111c8903d544268f8318b0b47d4b78fe3e56"
+        "eb5e639ad5382e7cd5bd4b2c3e70ef6",
+        "04012902439be50c97aae7b40328984934d6c843415f76f3821c8e8323aba96ee41359e2"
+        "ce5ad3179063ea5e2c7deeda4d728d585201eb59fe96b269cc973b1fe1f3720aa9aa6ec4"
+        "cf303c5cccbaaebe6ef7c9f5356ec5e76b26b09479d9831d9f5aa41ae1d61f4c47",
+        "031893aef1baee0e21b50cff7002435b058d73dc4d8301ffdcf1e0c315d18c2b16f282e5"
+        "b294dc88369b25e2a1a19abffb578ab",
+        "039281ef10b9a2664b755a2db67b3c410276a424edf7681a5c97244eaac5826368a8095f"
+        "1b9b76f8e490e2783694d5bcf3565ea",
+        "039edd50721dd35d1704167e8cb609f309b9ed73d3c1eece181f9582aabc647c5ec8bd25"
+        "8e5802fb0647372e4c3929cf59ae2d5" },
+    { NID_sect409k1, NID_sha256,
+        "e6fc96e060b956c25d50ad25443f3c30a12d199a47451a49ce88307201dfb15ed816982e"
+        "8888a28daa92eaf3c5584ca6ab2ca9e14577f84396de2e0ac214b24a2279f5e7b344fb73"
+        "87e9afc8f0a2b77a4d024a20ce6183499b17096947444bbb753d9b39e5c694239d28f9c4"
+        "54bb05468d17ab564ee6cea3741747ccb7f108af",
+        "0480103fd6180a431c837643566706e2b9597de0a1346a224d176a5b2c54aa4d064418ed"
+        "654a5d39f4773fb509f86473ebb373f",
+        "0401d39e2772ff3d26c5936ab347bd5a2940ece42b1964f030c59ab453acd7f44716ba9d"
+        "88f0828de1a4e730ab27fe1859915818c60140b1b66b0a87de29ba2cfa799d944b3b898f"
+        "e7ac43de68b01fb41464506e2f014e0d11bbc0c24996428c93bc1a5ecee5956bb2",
+        "06e9bd0290548d35168f7db7fc292bc161a7710b78ac49ec6a42c9423afea1310597e597"
+        "8b22b4dfa192489323b2317e4714d37",
+        "055dbf88b6221dff098345226d59d396b6773611ca6e747d26d5d758760d830693df0f5c"
+        "602859f9caffd0dc3790dfa08c527c2",
+        "03e679447b622c4b06871f2337f5a24150e76efcef9698c6fd463867508e9d7b803667c3"
+        "2989a881c98a90998944c070aa58b17" },
+    { NID_sect409k1, NID_sha256,
+        "c8a8a0d41f35537e6fd523ee099eb45e1ad6ab54bed4d3e315e20227db03292e39dc1a91"
+        "bab439c0d20e36e7fea6ef08983f390a6b5551ac3b4f1895220b2867fab95552cef9bd87"
+        "02962839bd9b2c72772640e7d3be3c5889d226acbefdcb448432bc503e5a5fe7ae9ae769"
+        "6c720a799f9882c64ae0385f656074dd8a6821f5",
+        "013c489e8311c6bef02c8f58903b2ba2a98a27cb935d75a30d320af9a14fa3cbc6adcce0"
+        "9235a9eaf333dd05f4b2f1694985dc4",
+        "040046a1c0e7753cb499d19b2805df770ba54f1c6e03611c302c73c72902867c51c1cf9e"
+        "d154b8f30f72002421029de7ba2d8fad22002aef9c34c7c8216a805a58dd88185f404930"
+        "86213cb4c85e4d226bb5e892aa37be353d9123e9900f8b0790a43d55a19d78c48a",
+        "0491dcc881731112ad5e9e1df459c27381a7bf8270f97743466e178bf5ca903971b362b7"
+        "3fdbef8a75d4292e63e225396c7b32f",
+        "048425b76147427b8b1969bba3809dd70f0fda24cfb0e92509a7824f027b61cd38441a69"
+        "1efe213f3c331da8c82f94bbde511d9",
+        "00df36683f22e9e86c88097d75409ea297d391550440e4327f67b7af1b09141a0e7a1db4"
+        "0c4b0bf4d60376a6636dbeeff0b6b91" },
+    { NID_sect409k1, NID_sha256,
+        "3407cd6d2845197cd7414a30fc3df7184da204222ffd65c4d16a12cadabf603de8043ea1"
+        "4f5e6ddcc22d3572dc06dec1a23cd924e1847ae285ecf01754e2d1247876431eb98e897e"
+        "47412a2330bb32990f9714122109e94b38f82cfdbbf2eeb4c6f88f5dbf9f0ccb47939df8"
+        "be321dcd9bfd9bb99cac9f94885fee7d443fbd87",
+        "02419bd2200f8e1d87db848b0379741685e680d9affe693eed49d82931030b6cb05d21a4"
+        "965f4e1df2045c8513a8f574ca9f2e7",
+        "0400641a6ac72455ceb142e00d6854acc5f8b86db7bb239a5054c1ed48dffb6d050458ff"
+        "ea8adb68613ad3cf5977ea7330268abaa201a954ab7d62796e5aed370285d3bf91ddd34e"
+        "ff3b995d04967db41c2171cb2157d85032c998795ed476c891702d63ff0108f45a",
+        "02e9928f427a86c4491a47b31454ea7d497435af81c07bc96fa61f4507494fbe4ffc1fff"
+        "a8faadc2a44c7e69c4f976661750f8b",
+        "01e8ff4cb8c58fa48aaf61488cc4118df90e8c06cbd88234cc920e5795597ffdc0ab967f"
+        "a7461082a49de56f02f84cd9d564316",
+        "06e77ac43fc7af3c126f997fe15011fa87a27479fbd5af48e28ccc2c1bedb6c0695291dd"
+        "67beeec3f17cbfecefbea46b6325fdd" },
+    { NID_sect409k1, NID_sha256,
+        "ad43f8440071285d01fd79244907803601aff4bc5d14c77483a87cd742144d41c68269d7"
+        "6c9a83c09d2178bbcbdf99f927b378497ffdc907a75a3b0ad019e69758dfffa480871eb6"
+        "e1e17c8539373de611a557fad120d0bd147f8debe5f09a02e56fb607e9c1253ed592071f"
+        "042e42fee39775b407225a2b86a950d81bb7d7ef",
+        "0722951879a65bfcb414e11712ee9431eeb32319e0ff28601112f89276ffc2b96eb65c7f"
+        "d77d023f09914a53e2aae2c84652bad",
+        "0400a0304caec1b68b34c822a2a031145677fe515dda977f6932ea2a3291c6bb4fe8f297"
+        "b7d3c632f9b3806a8cd26e32403c27fc7a00012d4c3231898a4202f3f251802c690353ae"
+        "9cc28ae5089e259149bce444d31a38927dcb42ed613d4818e235884749057ebd02",
+        "0331611e81d3e6e3a24cc829c1cb9087a8c6f64c286e5f1acfb1ba764eea5ca55be544d3"
+        "cb95fb98407fb6c8f9eb1b3f7ae7386",
+        "056901f11ec69f91b31f7f41f7856752568b7d34ff3af1a2259fe15ae0b01391eeaffb62"
+        "9976525fce5d182663b7b23a8001bb3",
+        "04e89c3155afda2e64c749536392554cc299b70020362e6701e3a649f0a63ae5a5da4efe"
+        "d5c73b5e8098c0cf47d6f4c45c6fab9" },
+    { NID_sect409k1, NID_sha256,
+        "d61a3765229dcd0b4fa6c57280f851ec2bd54d3ee2436935cd6d94e0120d0844adda1639"
+        "95fbc4cd9d7275da859ad8ebf30af9efbdcfc31c7c9ef42bce9011d37cf9d15fb018e117"
+        "bbc102f7d05750e5072f73d02c2f45509a55627a78cbd9082cbf36807759d1fe2ecbb92a"
+        "b30cf28434941712d38bdd100955d611987b5968",
+        "03f5b5a772d24bd5454bf26759dbd433fcc7bae4f5c593664c4d75da0cdf9430d7d9162b"
+        "ce3d7f6e13a344259da5a7d6a1635bb",
+        "0401ca1441b1f6e13138880196e69743206ce09c439a507a11c0fed069d4ed23676b27a3"
+        "a337c976c276809ae725229c9001708742013c47b14e3069af070869c12f0f39e35a6f33"
+        "4d98210d33c9da01ac80057911f5a392fb5c8cafeea01c1953e97d47e744160243",
+        "01484461d02c0337e8113e51aa7d46330f57d423b79b580a544d372524a853db9dac0c0d"
+        "16f733b273bf888271135a5162e70f2",
+        "0256d7ab133904a792987f8cea69e8e3cc674cd3c577f40ef6f12b31f52ac6366a2a3ea2"
+        "b2272c7bab8be00ca0d17989b6801a5",
+        "020d82cb9b3b1f25d993fc18b7303db4cfab91c03a97b249176f9bb2aa5ae7f589c74060"
+        "d25058c7acb6de1e888ff44481185b1" },
+    { NID_sect409k1, NID_sha256,
+        "1f3c23636414ced48fab6763eed5b22537968e6bf08c178b3d31fb1f6ea773c697975970"
+        "1d94bc1bee7c354272811edec58eff50c93331b22723d460e56dbee90466b894354777b2"
+        "3b13a37d15a84c762caca70c01518bf34d0c2f072145d274b3b6c932b48bd815fe81161d"
+        "8507ffbc2f783bd212c29b2887af6d2ffa9d2b4d",
+        "046bb4a141c9099d531dd23ac440eff1f5b10f7cf34920b6b702311d490d25344c665ed5"
+        "211d401def24986c8094165d10f8934",
+        "04013db47ac0e33af0cc7d74f6ce647fd80cdc1849b15c349bf501c95893be5a440f85b9"
+        "b029713339fb888d7a93632ea4e0bd813601f26f7009cede02e054d6499c9280794184e2"
+        "12e3e1091032fe0e3c189de26d04aa8a5909569017cf06ac2a20acf579ca81f3fd",
+        "046e55a908f13441bab63e5327ac346781399d5a9035a72aa21df708b814b67e420b455e"
+        "1410014cb53e6ab00f526ceb396bcf6",
+        "06db7a7b03d6a85069a943fcc332cb8c54ac978810374b12eaed4a5fa5342c8eabaec238"
+        "bfc6107fd03d75dc2c6d258c218a186",
+        "010a4115161765dd0c22a0915a0d8cc01905de91d3f08c6d2d85a6a92e1dc00904f3be67"
+        "fef000ce19f57157deb9afba7582b59" },
+    { NID_sect409k1, NID_sha384,
+        "ec69f2937ec793aaa3486d59d0c960ee50f640a9ce98a3becffc12d6a6c1c6c2f255d37d"
+        "29f9b4d068373a96beadac98fd5203a9f229bfc70bcd449640165ae5128e3f8d057769e2"
+        "8356e73e35d8e9af7876f608390090892c67391ddfcc1c332aa61efbf72d54bc615998b3"
+        "be8ab0a9d372784bea48c9fab244482c75cb2de3",
+        "06f2c6e9ea8109223d9a349fce14927618fc4fa95e05ecf9aba1546619eaeaca7b5815cc"
+        "07e97ae8cd1e9973ac603f84d838393",
+        "0401f5a9824584cbb0d5ed57f677caf62df77933ce19495d2df86855fb16456a50f157d1"
+        "8f35ff79b8a841a44ee821b36ea93b4f4001a88299000c07a9ad0e57c22fa8f15218cd90"
+        "ea1de5b8c56d69506ad0fd12b513ffbd224cb6ad590b79c7677a8eda47a8bdc484",
+        "042325aded3f71fc3ff0c84106f80a10af08d76d5e710a35d462e880e015a36d06359957"
+        "3ce2044537b9f62b51ed4fd2ed8b860",
+        "0667c74ee2d632aed13cad47e0b46a5176940652d7da613e4965876e7e22d89994bdeadd"
+        "6b5d9361c516fd51a4fb6b60b537e9c",
+        "026a01220a1166a4d0172428753e98caf0aaac5b0a09c5a3f11b2645d243991d141f59d6"
+        "cc502ac44b70e7c48d6b0d7b6ec4869" },
+    { NID_sect409k1, NID_sha384,
+        "70e11efc78d7f079ae41ac3c31c96d3220f4abfe23814a2a4a78d9b1a25e838c3408bd41"
+        "6062e4b0a5cdadf0c6e16a11e00f59711b417751f5e4b43ecad99efbdb2a81c91a034e89"
+        "edc94eb552c3eba62808563cdf64453a1db07daff8742aea4a9fa738e1322da316b26dbc"
+        "a2954b2bc0de6da7518d28e6677dec6ba8af4285",
+        "004212b7fd913d794fc6bb33e0276e349c052c969ecbf6afc89b28f75a599a9242acf74d"
+        "ec9f374361ba296ba42a38407f9b7d6",
+        "04019220ebacedc60762877881262c0c3dc0c8a709fe2ea16cdaad3b680d7cc8aae8617f"
+        "0acc9b5c9861ede651481f39927a24ecb2018afd77bc7fe54266275fcadc0fe8d4c0dba7"
+        "a1264c79bc31479f4bcd02245cde991791a7b7e65fbfa907457fb6d450c0985ae4",
+        "04c01ff477786304b24cb9c95ed70ba376ed6e4f6b3ab2f99ac575c92d3801e7f43bab07"
+        "2268705d61d3e2fd881f754b9c84235",
+        "00987cf8ef2b382fb25a6a542e688aa96c098f5d16be0c7d46e961b4a4152c372cc06839"
+        "93843bf5a04f81e6068843582fca48c",
+        "036fba32f80cd2e66bf31baf87616027c5b107f72f11fc766b42e2774e29e10e860577c0"
+        "d3a27a3b49754e6a189680b7a638408" },
+    { NID_sect409k1, NID_sha384,
+        "d922fa515e3bed60b517a2d37cafe4c041e5ab4b5c8d8d4011bf9fc4013dd8abf7add71f"
+        "cfde5e71d6abe76bd0f749e960cbed55711c87b5629a2c39cff48ed7d0feaf5cc4765e57"
+        "6a4959521f9a45fcba0dc65ae618826447e02ce6e1cab5ce8d6c96c3211adbb0660de7df"
+        "7453f3aa726016941d00d8ee536cc106a603d126",
+        "06baeebb5ffc89c94c3e8b37b9b0904e7c4b251d204894655bf3b1235710215c29820b9d"
+        "401c9ca7df1404d2d62d708aafe208a",
+        "0400a0b2a185ad7ddcaa0d8d21b643a14948d3552e25875506d64e236a90d274ad1ca678"
+        "e628acc208bfe6b56c02df9f5a36aa94ec00fef210c7137237da8ecfc2f069cb9390c132"
+        "d1c6ce961f2bb3ca925ee727c967f8a46727c8811c94ef66f20836c661a5cd1c59",
+        "02185be104ad16abfe4fb83de5db067d37ca58510b786b109514debef56cceb4dd6ebe53"
+        "b25127b85faf9c28b56d6586c26d60e",
+        "0404831192b4bd453c0a7e850815ac3fad88c7a2da27d29e83ca6f22213635a366018ac0"
+        "038b1fb1e4c512cac15b614fb69b3e2",
+        "06f677c361547c91428d0e200dd00777262a138afcd828238d132c56b2c232e2b446cc69"
+        "3fdc4013f05ce7021aea5b5b2f1b34f" },
+    { NID_sect409k1, NID_sha384,
+        "4f64d0f6bfc542a0d4347576935bd68ca88524ead03b8d2c494061d0658e6c3e14576b5b"
+        "cea5f2f992f54cfb52b5c7cf1dfc517205e0454510eef1b7054a8cd06ab53ed2468193f9"
+        "8ff0dd62faf076549ab2a270f259276d5729996c120792c6f466a74ab65035bf38ff2c05"
+        "5b43e2a8b8e2449a2375ddbfc18242157bd905f8",
+        "008e5f66ba53e7caad1feda122a80c32c82d2c32a7237b8ee8ead44ea8f2f01d77c7056b"
+        "9dd60b92d051f060da8532c1fd0e8f4",
+        "0401a3d020a0c7e3f3fe5b3d9fa6b6148cd0c481b4f9e14dc85aeffff35e62545654fc31"
+        "3f930ca2e33dced28ec28d0fce6ceaeaa2013c1ac166c3c088e8a4a9d44556e3344e52e8"
+        "741ed1a8b526a45268086e2fe54c24d398553d509439ad4957454eb68af594e683",
+        "0095caaf063abba5073aa7123b2c0e1666d29bfdfdfb0c484e18931d756ed0845ea15dee"
+        "1e9abcbbe4576113a8806aab9476b16",
+        "04d6e33001933221e9eaa78da5874f639749c7396dae90f2da4ccfca15b50ee9e50521cd"
+        "84d78a098e0c383fab0186b3dfe1b3e",
+        "001e17cc7baa3e9ff4d882da970caf7d55b4e0fb7f0cdaaaa8290fe2fc9cc31d51b34b5d"
+        "cc825bf6799ce22fc95382d46f3f98c" },
+    { NID_sect409k1, NID_sha384,
+        "7047d478ec5282d55db8c19c97af10951982d908c759ff590f27d57e2664f08d526cbb2b"
+        "fde39bdbb1aa3dca5a8d3feb50b868be6651f197abccc9d8040b623de367e2ea1d20ecd3"
+        "02afb9e273f4be9f3f64f2c2eb3f92d5e0e375db6549da2a589f0604bc7146562ccefd15"
+        "995a7c4208f640e7a17afbca69cda4e173380523",
+        "04ecb22b44e809f89b16abb10be062c89b41ee34e110403e42a20ce59a99afdc22f6f6dd"
+        "a56e1d9d1b8ce1d057f390db111def3",
+        "0400dbb4a6ed11f36eb78417269c1b1e9725eba1666591afaffb5582c8b4d5bee1d73922"
+        "b0164a05bf21a12052171abbdd3130555201eb385afe8588ceaac9f39a5cb4455e02bca4"
+        "8f3d2242730e0f9e06ff1db24344379f96356531676cd5af234a120f4b61f7e041",
+        "01cc97a718ebeffed4ca7a9a4389d6b0fafb73ab000463b68b5580267aec203b6231cfb5"
+        "afbf7ad8192f0947c7f40d9e060ab32",
+        "021a29f56c31227daf0dc5dc919434978943b80f4b18748bb5f7d6702153b966a0a4af6f"
+        "209ecfa3aae0e4f32a1b7c6ae58a55f",
+        "06921b2e2ab81517a0785c4ac3be3d7d4b4c917d7a1e4313b123ae96056a2a4a66d9e008"
+        "19d8c1cca5bc0d75e4e05477c1fcbff" },
+    { NID_sect409k1, NID_sha384,
+        "1a8384b4771a410663e56eb36c5d9ede8d161a8fb0e31d3f74bcb017b9e31232bb2e2f4c"
+        "65a2d85bcd1cedd93ef08d4bb4af0095731574ab3f2762788a1ba3bf0ee46684da8d9dd3"
+        "84432fee99ed3c69213d790a5d81b351063eaf2bda71ca4868ac36be1b571024a8bf0903"
+        "9b347fa996d5d161078314e24b7d073e05cb3d48",
+        "051f9500c15ae73d6d479b9f3d2caccc2039d8d03820befc2aae3bbaf65d59bd9cb3c4e3"
+        "aa8bed5b3acb70a5566047ffad80729",
+        "0400ee8ca7f55225760c515bae053ebbf4ab23567f95c7091fee2acfff079eda297ec6a7"
+        "e9d526e12e5976431f9d7e52a2318ddcd80185e2c17705a2555fbb8afbe8e41ced8ace95"
+        "c83e198be3c7dcdeac8c2c5bdd988800f1194e553bd0348ebe6c29c16f35d50895",
+        "073f96451cab2d3ca9810e265b3461e0fbe7f32fd6702f06891b97969b133eafd68e53b5"
+        "26b5e32b0d06ab61ecd75e1bbb21b7c",
+        "067d55e709f6966cb2082d8021a313850c53305a3bcc926b6f9a122181665328fdc8e05a"
+        "88de812357be85d22c61c919876fec3",
+        "063d5ee4a63b1fae39f266a9f826754f5bca4d7bd414dedd16858b5c6ac2d4162e28ab57"
+        "215c6713320d3d6960f6b55e3f1897b" },
+    { NID_sect409k1, NID_sha384,
+        "43513d6dd8bb0af7a6f5a2b35f99957d335a48d54f2c4019ce9518b35441d4935518976a"
+        "b1df37110b5b53532cd9e2c66d9f87ae7f683d7efdbe1775a6c15eecee84c6f879999d07"
+        "06f6779dc158c111fe8d7201983883bc8334f51dec60004eb1087347bfdab20f8f2f2605"
+        "56681e05fdbb8a6139857fd3bb2df5bc1f2dc143",
+        "00cf01dc4462cca764f4f8cbef48c51980737b9b98d1384b8de9f4c733829db7718a9b5e"
+        "aa46a8475c2144fe4454cb8eeb0a443",
+        "0400806457fbb7fc577497c937600c5a9c4df2c20cf7dad4510e5ad617fb2849bfe6956c"
+        "3efeab6b805cb7b63bf5d1c94e5ddb456e00915071cee2094efdcc155f893da8d83d9a5c"
+        "234d0f04f738b7af5b8fddaf1d3aa152fc11894a13caee0009bc106a64323e9dda",
+        "024968902b50febf13be11821d0d316f2daaa07737af45ce2e855aea6ed58f226d2279eb"
+        "e4295c5d7674104bff75b899609561a",
+        "0549f18f1d654f26ca134df4707694e5d9b3693bb34ab5123ce4d9e4c2b2d9756ddad957"
+        "a4169fc9bcea29944903080f6f5d01b",
+        "021887355c6360bc4ee59f1badb5325763e9428e60b31a7abed06ef03bff0b1265662d60"
+        "4dd2e0140c355c70fce1b56ab143201" },
+    { NID_sect409k1, NID_sha384,
+        "752300bc5066d0efaf807183a41725e349907b7339d77c79921ead3c685b616b0eb97e70"
+        "8f3880fce0136c510c8cb53b22cb424af6f1c34633600939a0647c02d8f9601f9416f1d2"
+        "4a51657241fb559c25dfba91402cea43bca1a13718b3945b048725f3df560e6717cfc6eb"
+        "d894e29bff1e0c7763f15b8ea93e67385f059598",
+        "063a9a565497974c6dd459bea0d1196d74f263f333c31b7e8591499960e1cd79e2ef4cc8"
+        "709f6d54713f873b16e7b0be42f71c8",
+        "04018872e9d9410dbde671fc050ab88101f01d146a72d62b630b29790b20fc02cb62cd0e"
+        "bb5b453a46c60ec2d2c66de8715c32057801b6af51db1c42b743b89be0900d23f7da80b1"
+        "5f2e7a2a965c7bc13800bf58589560af4697f873b6155194badf5a19a653e63da3",
+        "01d3278e6e78386146fc15006258d7a62a1345db3c2e44fb8d3bf8101727bef254a9fbff"
+        "157072326a85b5ef4e17c5b0212bedd",
+        "07bd5b54d9c6d6f9c87f4a66472be2c4bb7f521ae56c1dd71781d95440b0a151d206ddf6"
+        "27e5ed3f9c7df2fc914a78454e97616",
+        "075e39ff66ab0e0d1b46f9679b95d10b692874d45fd6898c569aac28a53569646bb29f85"
+        "56e529ef83a15c574ad5e1c82878154" },
+    { NID_sect409k1, NID_sha384,
+        "f620603489944769c02e2f902c2299dd5f32b5fb463c841b7e1fc0249a85d2c31684bd3d"
+        "aacd97de8291c5d39e84d6e59d3dde1b30c181bfe8d31b8d8e080bd191690a67fa00024a"
+        "c8c1b10981b40d4f88789ecc58fc69b15417fff34834e23453bb9933a43d08afab74d056"
+        "f366b40ad167b51ee5f008db151a12b467d3eaa2",
+        "041074dc186193d30aac7cc6d269b938ab40b257d095e54ba79967a377a91b8f73671470"
+        "cd07f0a3d1db7cf0a31ba9070625e43",
+        "04018fe9848dc599a759d90530480a6f11d052d2ce21a7275769ba02a61658c3b69ecc54"
+        "6aa6599e6699353ee1d65ce533c69fb2180192b9c41bfeb2af4f29dcd1c43d3fe72a070b"
+        "5d085d070acdb8c02f0dba00c9471df1dcca1006709676bc08b8ddad97310e25bc",
+        "036447681292dc781f7f4ed60126945354ad1df5987266038c5049d698b2ae12965b6fc5"
+        "8f3e944c4751406087859973d8afcd2",
+        "0541c22a6cb984cafddb3269ba3ee56af64cb36d03b7cd1693b112a7df20f0422219f85c"
+        "6820130ad53ef69fb66f3326bb863a9",
+        "00fa66b163ec3582760b048ba9a0fba9443d7e908b67d749d732ac9b6e89c1fcbc6d3ff4"
+        "e02a43ee41414b15ead0cb83749e0a9" },
+    { NID_sect409k1, NID_sha384,
+        "5575f610762b42ce4e98d7bcf45a7a6a0d66ec7f27d6b8b17f1961249d905bc7e58e2ce0"
+        "806d467f106b16285dce4544c72666d08b5e2276cd0c4e13187cbda8aecf57b1855afedf"
+        "8fad39ee4fe009f204e60bdbec79b123456ec2d85631d382b8a2f2c7634af3992e4707f7"
+        "b4215e2c9d3b0aa8fb08267953883a4213669d33",
+        "010820db54ccf0226161aeaee79cfd2797f87702b4ee91adf8543b3c9e79579d0df8a889"
+        "e366ec1e0718e039b87a37c24d620e9",
+        "04002eb4e313f158ba7497130e2d64804ac45a7db207c55d41f39979e0303dd2641c8105"
+        "0fb7f24f2fd2485b90f60985cbb15d56be00a190fb6c81c104164578da6bd4f2b193cd11"
+        "935e1f87f14e824c2bf8c82c39f0be1a6de3dfc6dd68af8cb14f6a78f38773a7ca",
+        "0118e911f676f004fe581d1855e5795e5f4ddb33fb8d409d557aeea87895b7c23a513ca0"
+        "010f98b3a63f2c65da5e3b6c37cf5f0",
+        "060c7f7c47c16b294867cee3e65eac8fc828229a5d3adf8e68e14dee620e9d4e7b78c8b9"
+        "02b5042b5f19c94e621c52836c95ba8",
+        "008d036087b23319553faf835b793c73204cdbe2c1c2463e74de8f404e66ff15ce9384d2"
+        "6149e7300ed1a109afd1f915edef912" },
+    { NID_sect409k1, NID_sha384,
+        "81cf067411dde2d0ab04fe5fa1e28e6975cdcc571588de60a35bd956a535fbbda4affd08"
+        "03d244f3f7e6902a2c9a7ef2488691b6bef7f8ffb33be09ccae4c5285265e4957f7928ea"
+        "5cbabd6823297f59a7cfc9939a49f26bde74c4c69e2d38c1efbacbcfdef0112138431580"
+        "72be84ed3c1781f67a0e2d4e9ba76a585c17fc0a",
+        "059d2a06e8bfd5e14a9bc8777958b85be5e97af892d2cdeb0ecbd2d5017952b5042349db"
+        "5fedba2e26e7b85bbb31ad313d99434",
+        "0400af276952a1216ac88ca7a194f5b27b7c98c78c42f852dfc1a2cd4c1a477ed16eebfd"
+        "c90f613b6e264576a35c45f49aef8a564c00639625074b69346dc6c617d624d63ce415a3"
+        "6154a817f4e18c59a3b09e01589407077b19bbbdd57b04ef8fc2cc23c673d52910",
+        "002728f7e9b4772ab790af0be9ed5b3eab697c4710249169d2a5782ab3797b8fa21bf8c1"
+        "de659e3060af5a286353402ab982320",
+        "02a7027c6f94cc236dc8cbae35f9c38102a663b84f66143e2fbf9a152b1a6478bd803bf3"
+        "171f933f63509d539a54dd348002ef5",
+        "0549ecf85ca1bae6d9f0038dcef90c93121a654552780f5583a7d44a73a9360c6799e76a"
+        "632bc8907ce4626c0439f1518e3a250" },
+    { NID_sect409k1, NID_sha384,
+        "8ea18387940035cff2f37278d321b344231075db43c7fa7fee9bd3fdefe5e8f03e7af9de"
+        "afa1022eb108e19ec11fae34536a4fbac2e8c8139a081a997c080cbe8f3e2d2a72ff26ed"
+        "cc5338b21372fa1498e439e4d9bb12d51cc539f859047957b1b1f1fc30b90231eb06b365"
+        "a4d404a1fd5a0e5cef171fc95b04d0b557d78ebf",
+        "0405590893cbbe18f4ad99df28b5f9d17f8f1882269aff0b7eee9392859d68927a99c942"
+        "a3075269ddec6d69c0df2d76ab9d801",
+        "04006ce67ace45a9cfa0cb45e8e1d0eeb44e94bd7527fed6b563f1069140a3f36e010f85"
+        "e1ae5ef14d626c78465cae43230090baa601a66a58d87621b63ca662130ea342db029acc"
+        "2d99bf76cf6ec4e53ba71bde4b00e508d332081055a65fc6f44a96f4e947d729dd",
+        "0035f09e0c15b41c958596ad3f5c4bd4a3685ac94f19fb97503fb5fa29115cb18fdff4bd"
+        "104535847ff36650b7461550dacf2a3",
+        "051775fe1503ce80b3d581ea3e5ba761665568ce0eb7d6a7163d8d025d76002ca7bcf6d6"
+        "88b6477ae85d09c0d4017aba5ea8019",
+        "035cbe69edfb6fb99c9e45240b7a587c3805ab2ed6b0399c7dd8dd76187363b2ba1def66"
+        "b2c3dae4bc2e40d164bf0f4837798d8" },
+    { NID_sect409k1, NID_sha384,
+        "6a253c1aa17b2b1e6624afc8e7456d366ef5b1bd78e740538260f395481148a64da0b6a5"
+        "8cd53d7e06c691beae1a616547cd95c4d259a371e51c2c0e334c8a5311ae31e4c7af3256"
+        "86ff9f7a36f731010ee1a9b8a29169ceac36a060dd23611dc9713c615424888bb574ad5f"
+        "5755d7311bd169336ae986c977a394bf16487c4e",
+        "062bbb4f565aa0f23b88ab9029d33b995729d10fcfc33ba7c4051e2fbc72f15636a834e3"
+        "ebfe604b927cdfc89f53c57f36890db",
+        "040125242acf14c7e08e9f2f0194f734841758b1eea1e37ba80b9855a14100a5f0b57bc5"
+        "2a0200cb640121d96769e9cabc45362f5600dcf52cb899470943a37d260aa85fe83c3869"
+        "c862001021660ad09b4d73f7739ad331b3566bffad590534207c6db9acf98399b5",
+        "06095b4ed8d51e37f6c723648af4cd4585d9d250d7519139f58a93c75f197c4bbd1142da"
+        "59769a5fe178415c677caed1c3da667",
+        "041b212a54d4396ddea2898dadc363ac3ec5385c9b3b8ef1ea17c3d2f751d4f791372385"
+        "48ad759b5e1700d7d78072df3bf84e3",
+        "0149242afc524b0c3583037da153f539aad85aa0c19c6c70852e3c3923df8c3abd0189a2"
+        "abba872932eee2e6f45e02f98e810bf" },
+    { NID_sect409k1, NID_sha384,
+        "0f91d0f0139faf3b90a3d4bebd7e96ff6bb6f90f6c68321fb392637d8ab2a60d649a7b73"
+        "64ee6e4e274e1a8d342caee36cc11c56c54247fb0a8e8ef81ac4322b454dc9a195dc5456"
+        "7bf47ec8d4fa4cd32e76d78ea2d08bcbce3edbb68fd8597e56d5a9f2df4e47b2701046df"
+        "89615961db601bd8204584a6a6cfbb627e2a1190",
+        "03fad7031cf8810544a3e4bd1382c0a2e22c5a9fe4804ce67b27591fc516ee81dbac841d"
+        "399327168aa6abd79e2b5ef85df1528",
+        "0401ef0f918c683be57eeab95d5d1850bd492ace7f4b37785863647774a028e963ee2c0e"
+        "ea801838aa8217fad75c5780f1c36e8d4c01d5dfc69bcad46bde5539c58ebc89e1db2a3f"
+        "65069ed963280cc2cf228b2568bd53c6e0e164d6b63a5d3c2b8e3be9d5139a62ef",
+        "00eb16d784e2aed724cf1e4b72fe76b00dc80948c07f9c7524eb0e83bc59c12a8ed16fa7"
+        "ff21dffb8bbaa82925848a19c93884b",
+        "04a07e79b4f771363ad4c46cde0aadf3df4a233740a89168c97b54559029c51dc2c79b7c"
+        "c94a0e4e3d2f94e376fe47993da28bb",
+        "0360f559d37a777119b2aeebf00cc17e2edf04a2cbdf74366f5d34368d2eb2c92958e4dc"
+        "2b7453d5a509407a4d4643cc0235f57" },
+    { NID_sect409k1, NID_sha384,
+        "50c17c1fe4dc84648e5c3c3ab8f7c971d4c58d8d56d2b5ddd92e35e6792111ed8dac7644"
+        "ac8a07ca8bb4e38e071aa47b22ffe495e9083f9bf781ac1b5fba571862c909c7aaa7b8d0"
+        "5ddfb7ef61c99700de734d5658f44ae9fc908c85a2dac8e7f854d6d24be805fcd7f873a9"
+        "1252985c5c73129c60177ba8fd99daa87b25a073",
+        "03db41b4f637fe7977c90e4f1a21799baaddd1826c667102414877138436cfae1b995984"
+        "2b8097b5276f15f2b982ee59df263c8",
+        "04018eb25bbdeb41c5d14edc675fcac8a523acbfadd6456632bd593ab5f694a7734b163a"
+        "ceb6e6b3d8ed83fa1cf7b5adb9871a6626014975abca1cb769a243936e65123167e53527"
+        "9197a37d8c92c7b138f31cad4e95c5f62b06f438f94c1a61634b34be7b96f09fbb",
+        "055fce73c9c385f007256253281c6b9d0930d127939026495d0a30f25f77fdb6b334043c"
+        "39fad4223852f7101fce72746ea205c",
+        "01d7c26e0236afeac032fc5f3dbffc8c03b04417b514adc26d6a4f697b4e87a008d5ae97"
+        "544a274c25ff66b98111d7c651c9381",
+        "07954191fad321e7f2de95a87d5a9c4527e658ef85faa6622d5f34f8bc2b84c881ededbe"
+        "0281456e9b70eaf7a207e253d216533" },
+    { NID_sect409k1, NID_sha512,
+        "3583a3226e2dc463a462fefa97024e6e969c1b13bdc1d228e2d7823d9f7c09012390c253"
+        "5baf086588000e908309090daac6e6d2b06d2ede6fae838ed47f30b5b481185f607a3586"
+        "f6dea47c8f84e9d3b96d5b0ebae2462fde1e49d84d36658e87dccf5e30c0937feefd8862"
+        "dcdb1a1ca373f6ae41641502ac54df6633a8cec1",
+        "065b76c6093d9c49591293471286df1a4444e60d9d06cfa114e175afb5f119d2abeb273b"
+        "0596019a0ec5db5b5869f2cc827b364",
+        "0400266321fd15bf6b1af862496f467069819e3860f74a07825e68f3d023985bfbb838a4"
+        "9b6a41b6515cacf404ebf12ce0bd3d6d70001593c7a8e629599e63d3282cbea780235182"
+        "77e6731fe8d88cbe525ded554b51a7f8803ab9e330f210619dd07df8f67e1066a4",
+        "035682af873829e16b72bb86f3ee99b5d9f052e4a631b07f87d3b361c8d8260a877231db"
+        "cb3f4d461b4a1d4467824a26a5a6414",
+        "00a483dc2dc6408c256fdf63b04d71d3c58a08db7167da217f466cbbfb2d68444c10e87a"
+        "9a1bb04efd71135c00226e58414d407",
+        "078acfad2f2492f74b0281d53e4224c7544588ca9ceaeb16bf759b20c2f3d3ed69c64615"
+        "c247213d51800569dc8b00078de68ef" },
+    { NID_sect409k1, NID_sha512,
+        "60ca58462d53d074b370127132f4e59f5eb8d15594dc721a94286afd082a8934e52462c9"
+        "c1c3910f8b50d7aa3671dafa5972958d876d7992467b2fee3795a6f9d8a7bd3003a8582e"
+        "a8c003aa1e02c08ab6804d85bcfa13a815d75c938671f0af0706c68bc70a6155708ca755"
+        "cac2fbb68b2952208d63e0e2e3d816f04c61bc03",
+        "07e9993f3fc1fdc4c376ef77ecded96006ac1159740bd1b2dc6ae3d97e15a67383f1fc93"
+        "1e460b9af3fe14a54e47919667ed06c",
+        "040189b82003b546f94c066963239c7a590e064b88bb4548678853545920e413f2be3212"
+        "5e40efb82d2c9582d2d8269c1d408a7ff0011583b267727ba6c1e17a244ba7acdcd83698"
+        "6089860ee312b6dc2d88a984b1fa232eb0419730db8fb94a5e077009c1d55979bf",
+        "07574dbe04e1ac2bb34e40f32d6f6db364a95cc5770b79888d72b74bd4dbce9fd91136e9"
+        "e1152424d76688dc995bbf2bea34175",
+        "009e42a63b41877e200829356a2191fbb6f2a9a234be58c76b0852e4f348ca61e7492f90"
+        "a37feb8b95a6dd6df9d1a2e61c63b4b",
+        "01499fdcc804fee8193de080b085b7513eb8022503de5f64dc12c04c0ba24af30e30f63f"
+        "0e3eac2c82eb20c6672336f8732ec5a" },
+    { NID_sect409k1, NID_sha512,
+        "c749f9bb92ca9957ca6d0124206ebf65e860ff38a225e241950bf4526cef3f4fa9184ec8"
+        "3f71f813fe852dc08eca6b45b14fc7f2c6a19296529bfda007efe9d0d26492de2a902b45"
+        "ed39603e22f0a763dfa5deadd97ef6feb859d860baa2cfd1d066c0be0f9f4e0e2fafa69c"
+        "c51b12e814ad2e33b0acc0bcbe1df8cf018dcd4f",
+        "00c11e2979498695c660a2bdfd105b115bc4ff8664ea15cfb40c725406c6fc9a13027bd1"
+        "d72ffff6258f29e4e19b845243444a7",
+        "0400904a9bfebc23607c7c89b7aa89315343852cb894f54fe42ba4225285e58c6bc318b5"
+        "5691aa6a6ef22eb11f44cbda89f157d7a8019cc1826280e54832b455f0ce0cf89bdb62e9"
+        "73a8e819fb776b1a202b4f207b8baf9072929c9e3f6a8ff996d6d529de899b024e",
+        "070fe023c9341df9348f08882bef47bd8dd7f13db7215d1cd52cdbe7919031a62455ca96"
+        "9a8cc6db0a05a0b4befb47c142c4f34",
+        "035e7130d59d92ff8c4f264fb2c346e052bc305c7f57549a0fe43cc7cdac6aadf2ce1939"
+        "222decef4e1f900e3c2fb2c52bf53f5",
+        "0008d5ec1ed2091309ac11eb88157ba5122bb9b5c858a46769a130f7a941818445664ac7"
+        "8325e0b6d2a11bc89d08fe0e87a5bcf" },
+    { NID_sect409k1, NID_sha512,
+        "4de8414780ea20f7943b1f1adae5e3962d96e828fee43bdbf2831bd71bd25df2976a3be3"
+        "7a7a667c7fbe1200de578920090d131a750c9bc09bd95b261234ea8cc25423c4ddfff565"
+        "6d6b32da6e2f6f530e6673a8660aeca31273bb9a3a21bbd7031a2fa71ba37c004d3d1c64"
+        "b2c0798783e47b2efe1a208959ac16e35d444245",
+        "068dfc23c6635bd1fa1076dcbd456ad6e8df7ce7c1370fe275803befc4ffad007fd062a6"
+        "1cf1d50b93aeb9afe1aab47a65af82a",
+        "04005591f8cb59ccea17bfbcb74e69f05218d16175f0547ab95f507ef8d7426c077b52b8"
+        "2dcd06baf6eae7a66bc72422236e589e420126a01d5c2331a2d00949e07ea9242ebb50d8"
+        "30b0aaa74bce841d4e43bbaa9e9aaa01ba25db7a8a2f4d72977c0f016f625cdebb",
+        "070682c9659089a703dd9fcdf2f3fa0c1d1ef5fae3f8f1b3dda55d9b611770244f892689"
+        "8c904f6952c1847d287bca21db4dd59",
+        "02734111e3b736ae795929f835701bf290dd50c0fd625738ab2769242c1403197a3f4dc2"
+        "9ca618c2e292c6bec6dccff71adb698",
+        "0755292cc5363fa74e0193a806879d3a275b4beebc97250fb230efbb8364b2a30098c048"
+        "8bcc6e20449622d6a5fd2ae24d7abe0" },
+    { NID_sect409k1, NID_sha512,
+        "a081d54232f84bb19dbd52ec3812748e2e6486f6cf1b177b27929504ca878036547eb435"
+        "31bb5b3edc81bfe105370427e92831d2239cca0106d031d9fa8da9cf89c6fb6401377d59"
+        "36b6329ccad854e5567181b8f16a37c35f333eaa0ffe91d727d183fbab935fdac2d5670d"
+        "afb3fba59e4fa2df1746c58dd8360fa08af7f4e6",
+        "040807fb888e1d9fd33604546656a493629d94d4a0a9de2608962225ed158167f9e2438a"
+        "be2d12a11e2adb6c2b66ed78215b0b1",
+        "0401787c0e6c55acd69bde9b0a84d6022796d5b5c60fe5357bc0fa4386c16f61b38bfead"
+        "b6cfebee7e7701bde24418b8b5642afefa00d9579d271ba3d5e2327eb863cfdca3970700"
+        "55b97714e385ffc2fc23528f696dac1a4d0e535641f6c876f1819f2672a8c31cdb",
+        "010b8f5356d8a029659492c444876f1d274b82681d4f600cdb5fb2afde13598ddb71676d"
+        "9ed86e83351c70678886e8237a865d1",
+        "0304f43f9705d189f47ee09a079494030b0756993a93e4c6ee6b5e664f63431f99e50574"
+        "7c24377e5930f13492483e6cd06ebdc",
+        "0580d4707c97f0330f908042a6cb2a2b313f07bab34774ee03bbee63a4ff881b68def47c"
+        "d300fb49deb49829bf486d1efad39b8" },
+    { NID_sect409k1, NID_sha512,
+        "ea60266f1538565b3ff42fa4bbfe319be070329059c52c8bc04a7da2824f209c1145a05e"
+        "551ea59ded8ca8439c328f6907da4e81d658937df614be98c7b8648818ea80ef40e49aaa"
+        "4431f4a211d62acf2611f5d60c446b2b25745078c643859be1b12b3141a09ab765dd63ea"
+        "1f2a2df015eca0840087a5db378c4c4cce76cba7",
+        "033bda0a02badae08fe40c239b9d59e5bfe1c4d4b9b7a5acda6790bfd77ad08dde5e93a2"
+        "da80ec54a7f88146d72218bbb88aa10",
+        "04002dec536832c8acf007daa66a47e4eeecfb6991a359f8c412299ef56c6ca2faaf18c4"
+        "db708493e84786a7837ab74c5fe0644cee00906c8f603b579cc2384e0803d31d577f7c91"
+        "c55406db3b2db91bbca323fdf3cb6d010617ad1aae7bf414c4d974f22e6f05af53",
+        "051e8d027e62db2397e4a807d98a24455a76eff6dc259ada89e794dec1484b44724894ee"
+        "ba842f60b73287642570460896dbe77",
+        "031769e6777444095d934d05dcdf82405c43ae91ad5fa9201568ae2aba25712717f1af2b"
+        "8f49f6eef373237bd70c34889d0d271",
+        "0023498aa50ee095f33a4081bfd70a9484089c85fc7a4569f560ed67243745c823cc0217"
+        "d29e2938f06ba9c8790650d10fa5b1e" },
+    { NID_sect409k1, NID_sha512,
+        "82f38c9405ef0d26bcdd5b3fce4fb0060c3095f61403418e17c337933f0563c03691fabd"
+        "32ab5e896c593439e7492a9970ae325c67196d9e83fe0f9780409a930326f7e6efae035e"
+        "f8c321cb9ad12461edd5cde66c04739fe079db65406b3c2d22f2d04b1a4335285513d4ce"
+        "b901d2ca2ad10c508302266c2cd6079ff14eff4b",
+        "04ff431769d26b8837d3e1295f5464fe82be29edefba76323e92078a6483ea0daa962215"
+        "49102509a1bdcfd46a5a2e5de10c39f",
+        "0401beb74d427d849705cf26e26312446f27a7c5ff26ea9dc1aadca763254fe53a622de2"
+        "9cba4fa81ee2f9e0319e752f72be46cc7e008dfcda35a00ab77c3c47dbc05b0678cf561f"
+        "575369507097833e86e523dec879e0ae9583b4261f7a73c9dbd417accd4ae6688f",
+        "005aff3ad332af23e0dc38c16853252825076d602ed4c6d947be751af5dff3f59611e616"
+        "6c31740b5e5a167260adf2a5466289f",
+        "035c4e8e1858b9694cfef3e864ed959638ba309ba2066a28fb9d0e02a66cd4c187dc6fd8"
+        "ca5fabe68acbc2074168157b685aa6c",
+        "04ec2db89645018f9845b7ae31b8418a767e3570d401f41db18e424fe861bf09114d7860"
+        "6a056617613447d125a283be5bdb6ae" },
+    { NID_sect409k1, NID_sha512,
+        "d8506fab4f681ba4ae86066aed447571eba4fe04e6585fe3be6af2ab1000a3da68c5b0c7"
+        "11a85ddf3a40cb7c8944eef81f2094650459e14f5b848e6add7e580b0198070f873eb3ed"
+        "5d0728eabd92bc1398764b94cbb4cdd7cc2027b9762dd10782658cd9e8a5022ac062fec5"
+        "35d892198c8a387b3d2b6f7c92b1af6ab7dd9e4a",
+        "03f85ca1169ca7e9df44cbc6bc7d2868c9d94e8f8b699a42ca492dca0914eb5789a90322"
+        "18dcef7f95f959c9554a1cd83360439",
+        "0400aa3c77dd4324258bebe7da5338c772d3496e3fd0e57f455459542f1a1c5b47692f51"
+        "c3815c9549d0c23fdc1ff610fff6847ea8005e626d6aeb86dc51f3b359b10862cd33ac99"
+        "27e38127f7f17426f2369d62132a2a62fb6b8354c5ca0b3e5c7c87117b4f777a0e",
+        "0495099cc73c9930333ae3f9d0b7057d7c70e2bc7c805c0c6a44404739b3fb68f9fafa53"
+        "033b54b7ad7bfaf4bbf7baba0dd5a0f",
+        "005612fe87c6a3a164d269da902aa43c5a4e0333770ea6334f05750be3f31ee758d16929"
+        "1e15b1540d40b60d1bda279599f254e",
+        "011a633bbc058550a597585bbc9f33099eb517795600b019255f649493d4a6dd533be8b0"
+        "965d9f9d9698677491bf929198ff34a" },
+    { NID_sect409k1, NID_sha512,
+        "b3f30d34f252a4c26f396079e773142bf61c0981d912333ade3de4e27cbc72cd8a16b318"
+        "07f0c46116f87accb854487d83ec8c6a61565e6fca145eab70048245db08616779d7047d"
+        "b63aabd90dd15acbb05eaa510072c151c0518f1b34582b95f43ec7b9484b2993c176de79"
+        "e84566764467f72392ef31619426d159c91816d4",
+        "03a97deb36d68f81f50c8829d412ee5de7f9d775633cb69c09dac558182039e275fc2582"
+        "40517a7c4aa592e364765321f27cb12",
+        "04013f0f4c16a47ec3a46e7a088c1b6a63ef61eaea46aa9b2c532d8df84dbf64991bdc2c"
+        "81ced3635e562d1403dbcf6aab2f8aa9da003aaded3b99a454b820fed989dbf6430ddcda"
+        "67db58e356397d06aa137fbdb365ec43994abd9c0a9fadd2887da9539bb4ab3c44",
+        "06620ad14a5835b9e9e104607c317cc599416683a60ed8865acf78ae1e861246567cf9d9"
+        "1f759c2d4c82cec835a4784d3c231f4",
+        "068faabcb7c716fd73f129ebc6625f5b4660a88e47dc7dbcebab321051a61e46b74409e2"
+        "b0af420e1671ef4efe04973c43471ff",
+        "06851e5da033da0f28a89dbbdabe93ef11331c55cc03d5b096c0522370be681241fbe71d"
+        "1349f219ce57761c85fbe208ac36a36" },
+    { NID_sect409k1, NID_sha512,
+        "0fb13b7c09467ad203852738eda5ddd25b17d330e82c279630b0e1f0c86681f67f6e537f"
+        "b00da9419114973c8559306de58b0387d86e52d821d982a60769d2f15fd5ac2ee6dc55d8"
+        "ac04ee247282cb2866b8cb8b4d7b4b6cfb33bfefdff09a73d727193e5fb939ff66ac5fcb"
+        "644a44f9083a790888cc538c5eb435243c6a34a8",
+        "03b1da0ffed24e1a3b5ba22bd684337f6b08053591620541bdad50c761d66201a2cf21a4"
+        "cc636426456525b598e96baf97d9851",
+        "0400116a1790e621272b56cb4579ffe6ab629a2d077b779b73e039d74f58c476283c110b"
+        "b18b9c9ed63de7288dd678064de68b7df60122b43afccb88982f2e07ff35468178572bd7"
+        "2b644322d9e1ee68f78880169a83a5bb88c6c994762a7e8d80e09333487ac30fa4",
+        "06d7a24f0fcad549e9c36dbc70ce264a75eb37b74db98b1f6a824ad1e5635be9818f45c7"
+        "544927807dc0fb3bb5fd38556e8656e",
+        "0232339b50bdb772d15f2cb8973f6dd9397af45cebb69adfc089bb802e9c4029dfb2078a"
+        "8a26d7197de10638ce512e5904ccc5d",
+        "056add03244174966d53105c570e8fa660ae8c5d53316a24cd26f24e29e4b7459f4c9dae"
+        "f07442247b63665f97a3c07d91a8706" },
+    { NID_sect409k1, NID_sha512,
+        "f9b8124281628cf4e1da0cb4f021c8d19d815644cd80c7c8de4cc62722904ec4cddd26cc"
+        "4891f30b15098a25ba6923c6abf4774deb6e1883fbb409862f94467e75a725e7154be860"
+        "fd58347577c83adbf18535c54b102220197afa062cc1c84f6094490ce488af4a08d2c5b8"
+        "08a2572e18a59de96c87162f88413795351cedc1",
+        "040bac7e0d3b54c7753c79d43469e310d876015d948fac4e3a9765444754476af72330e8"
+        "8d79ee6119697aafac8435ab5690754",
+        "0400bd4fe8daffe47bfdfc43deca20b15da7c999084bee8983c62e3dd33740143c38d8f4"
+        "32cbacea51e6f53994265b2d8f4c393f6e006d88c33c31f4e143b13bedd5738bc1191fe6"
+        "815a099fb7b44617fdeb08daa0cb74edab7f9a8c67ac1e9c0f0fb21a9f02ef4b6b",
+        "020f2f6fcb3e471d47f21fb15301784f7cf3632dad3627a9ebfce587c0097871eca580bd"
+        "a051b100f991aa6de5edd3a7684e839",
+        "014f8884b5107e9ee5cf6f5d137ec9d59a85a6fa0431053d58a1400fbf0d518e8910179d"
+        "a1160de2c6cc8ea8ba8f3af8e0e1f6a",
+        "019aa8d55c8d876989f9b9559db0576f91c4610dc9187c74aae2d4f212cd94d90dd81ee4"
+        "483d88d866aec1ed469c5e3eed7d90c" },
+    { NID_sect409k1, NID_sha512,
+        "4e3cd6100520db050af0daa69fe3cfe6603a223d4f2a6318fc5836db8640d4c7fb80bb78"
+        "1302036d2d6fb8e552b4eaef3133b98ba2d36b9ef0b86243b0391413c73d48ecbf1d1917"
+        "0f1b3b781b35ffd316afb1d55d1dda8e91eed5553780cb2714a93e7ece698b832e853e25"
+        "89c5ba2b8a997bbbbf625071ded66762af8cad42",
+        "025b7eb3bdefba3c5134438caf968f615b315204f348006f82e8d61057a8a8a853230cf0"
+        "500f9d0b8c1551a59b9184862dd2ed9",
+        "04017d2029cb711e52df416c54b63a95a66602a1d15c3761d91071964e0128c91ea766b3"
+        "d409f72d9fbb5161a459c3fd7990f87d8801e71a9c66a4d4dcf199aa329e44b99f80640f"
+        "c760fa7326f29c273aa13b153df5277feb3c049e407630173fdc9f735d7aee4e10",
+        "0575aade2692534b5a1a17d36c36973d24dc501c75c3b0b497a3d2fec80c67be7107988e"
+        "47199d4863044fe9176762497b5aff3",
+        "024c6004fa92cad446b8339917f517f04d22db47b3f9bdb83d863dadb5431866ce21b13e"
+        "780495bd66152ab33eeff8830cf8538",
+        "034aa568aca7be851d276d2235e42b6624df1cce2b97f6413dd3fc506f0f18483f95f911"
+        "feb0eb220415ac593f2c93dca0808fb" },
+    { NID_sect409k1, NID_sha512,
+        "5411708381a65bef4381c9e13a04cdd5ba0c15829f7f25ccadf695f635384d8e4704cb56"
+        "2741747831b33852567f42fedbd190d2980f1bc921ce01c17d659d4bdd7eb787b3927fce"
+        "e659dd3b65132496c687f2249272a473d46326e66b3cb78dafbb522390162c168f73bdec"
+        "88adb145e6afecd561979846ea4c8cee38dc1686",
+        "0673b3a2985c95904732632e5d988d8d437a60db13215bb6aa880b348f011c609a1e8604"
+        "61427a8cf0d622abc47f910f5c97ffa",
+        "0400c4f1c0cdc44d867ed38d093eb967bfe285df897868c83ffcc0c53463e3852a1b2039"
+        "506d9508bf01d0d79ae537e42fa2070a5e00c2bd9343041c2c4100c5d795ef355c796a6e"
+        "a7954cd729e11063b14a27fc2c3a9ffdb3647613b44238eee17d9cc49e8c5dfbe0",
+        "019a9509f5f6d947532638a3c80782b556c553edaee9ade91e457f7b5d2c9055572fb116"
+        "f52cf4d3a2a0eca72fcb32b2f58e952",
+        "02def440e968d17d9904c5640619af2f447f74b7c067537db4a15be87df4fe68f4489704"
+        "7fa8af146462ceed4beae36d54e1aaa",
+        "013d5b00fef639c556d66420090c2cab1edc57b7257dc35addd62a5337300e94ea7ee116"
+        "e06b744da1b575d90da81e8ae2cd424" },
+    { NID_sect409k1, NID_sha512,
+        "23757fa60fcabf543e603d8b31ef0cc99b3ed16b4816a84e01dbfc858872fcb79fd03d2f"
+        "8a1d4f28c25dc42a39e20c34f81ebccda1682ee9bd22fe323e7f8ea90cf4a2a6ebb634cd"
+        "1153cdc35f7306f28a2efd822bf23131baa1543d0ed5ab4c8168d3199983fbee117085f9"
+        "0550ec3ffa2b06070d3add1d707fc2593285ff58",
+        "00db7dcac414010b816236cad584dabeaec1da76c97182d1b62f87bb7fe2946a64d10430"
+        "571b2b29ccf2ef72c969a9f045f1f3b",
+        "0401f2a6cbb9c1fabc8db2848c74d918312267888d822b7dfd1634a543dcca4be7c99723"
+        "9f6281d1d8b5da9adc694706b7b19cfb0c01bde57a2ac15f4e6b26a373a624588a3379c8"
+        "eec758f3c68695e2eb1856075d90085f43283d982526c5e57913cca5e2b4169f8f",
+        "05a3d856ad1d6164993cc59e70f8551e2408da92c7e6cd52df51b37dc22e9ebc42fbe6b8"
+        "3c332eedffd4086a382056175ad7009",
+        "0489b0344ae4278a0376dcc64ef9ba8595bc2fd62ad22d42fb431d2863d8ca353cd9e59d"
+        "e4ac10108fc247d6ee9ef643f6bdb3f",
+        "06aa27335e15dc910515385764387798cd4a9b4cd6d99d7c42e07fc04e2bfedf8dfaa7bd"
+        "a396f88253357d3e2545e895d9aa3b8" },
+    { NID_sect409k1, NID_sha512,
+        "b976314d2f066f8893307a726f450dcf2cf865c170e90e6908ce9787eec48e1e2119a731"
+        "b2bec3c12fd4e6282a393774251bcaef91af6ce57c63a8b45bedd72ab862cd169b7c84b8"
+        "f6a72084ff823a96f2f8eff3483a7ebfabdabf0998377c5a6836d88135cf61c65a0ca7ca"
+        "57727da68047dc635c17ad13731035fe9a6402af",
+        "04717efef16e1ae267e155aa1daabafc68515aa391dfeb73c13d01f3132bd22c984228dd"
+        "dc4dff4c39979e7585acd3f730cfcfa",
+        "0401526c58a3de46c95cb0527869f7d637f9441cb5504e6a01f339907c6df3d079361a41"
+        "571cf0a0f11996028a41682dab5decf78601581903be8a19bf8bde1d89bee0d436f061ca"
+        "1a3ddded4b7793fbc32ff852671103f34e16d469eacdbfa457643d1b18dd1c4107",
+        "05c846bf61c068b421efc472469ab1ff8d9f34847ae0065ba6f4a000be53727b3fcf97a7"
+        "80362566e13ebab84b9ed5f0cbbc225",
+        "00aa138e742ae81eafa820632f31e87bdcfce6b909d85805e46d87d1cdb8b968907470c7"
+        "ef5806accbf6245628c70d264fdd95d",
+        "04df507115384327f7b8311dfd1227c19a6124cb9bb5901bed45d8d5ca45db0903f53e7b"
+        "bf136350e66bf2b4f3d978f8bc546a5" },
+    { NID_sect571k1, NID_sha224,
+        "964ad0b5acc1c4db6674e86035139f179a9d5ec711b5bae57d2988456bb136d3aade7ac9"
+        "ef10813e651ae4b9602308b071d75a934a6c012eb90c5eb9b2947b50fc97b1d36c5bf9eb"
+        "13a7b06c94212c3dcdab402a563262298defff62b836ead1f78f9d20713710fb48115cc5"
+        "045ba15140fbb4bdf516e4150d830d02cf30963d",
+        "19cf4f4d06825499949f9e0b442586fe1bfe3459813a2b92cd8de0f775a4735e02655702"
+        "ead8e60824180761808d9e816d60bdb0238e1e8039ca7bb63c92e1cf8433ef447e64ead",
+        "04007b9cb1728cba80367b62872a986e4fc7f90f269453634d9946f79b1fedf42ca67af9"
+        "3e97ee0601bb3166e85357e8b044e39dcc19e608eaaa8a0066ffc48aa480c0e1e8d5569c"
+        "bf0580858ab9223c2b2ea58df506d703d64b387a78ef43846894e7a2e47c02252bd2c1e3"
+        "d21ada7c21d50a08cef0f9a189c4e850c058cc57c37918251b5aaaff2321d7355b6b5556"
+        "44",
+        "0726d5e317f888dddc94c73acb14b320ff509908052868f8c6b14e531ca467c1f7c82874"
+        "76674efd0d636ca94c24a69d15210bb43a368a11d3453d69ca80430cbfb8b6e45d8f21a",
+        "04ec6205bdd8f7eab414110ed620dd3fbbda4cb3ad9e5559a114ca9344782847621961a3"
+        "577cbbe43d94eff6ffc8dd7dd09c049239f026a928301ffcddcc910bf196853edc86d31",
+        "16535b1af98a75b9bc0f122ca3ce23a01800fa33b43584a94fd8a8d6f40077eb739f07c9"
+        "f0e179a157a28023735fc8da2e2ebbee5f7308925900e657fae7c3b321f14fc45346f89" },
+    { NID_sect571k1, NID_sha224,
+        "baddec4794effa668cde267016dda67bc70b847919a9aa595f93ba9dc27354399ef7a607"
+        "fbead31e57a8ce698beabb10f313d393980425e67cf95be45d512f00e950c0c5409573dd"
+        "c3d556f23daf056259ee8914e860562a674311452fed780b3e0317a7fe93baa81fb98df3"
+        "ae4328b28ad0ac8f8ea33efe24faee658ad026f6",
+        "098521a732e72ed945a549afc92318fef7156ed1d1ed9bab93b581478cb2339eb32bcef7"
+        "05c9bf61cf2873ddbadff8ff3806740a2e30ce67d1807a8179dfd5d952e6f8a583baf81",
+        "0401e09410bf4f84d53a2abf8d106fc64e643edefaea263dc98c308aea16ec75f083b3e6"
+        "b442ab261226c59ca5fa622db68f5cb5f2d1d465b01d0048554b0ccbf67c0aaf934d2365"
+        "f60361e5b43d313a62c7b3897c7db8a42116127138a1009f0bf9892981fb4fd6ae231b89"
+        "40e7509f96e2a49285143010dfb4516ff810a91a4d9d2974c522ff343e93e8aad00aaa78"
+        "b9",
+        "128056de96666acd09b93c5db7ba1b8fabf57251ec480d42b702940b5847d2a59b04eb51"
+        "01bb3990c3ae2a41181f19a2afcf08424f8b922a95df6b292b1856dc4a9dbb1c717ba5d",
+        "163483a7e0d1012695ce0c113ec8fae3694bccd40fc038d4038f81bd39e71c969cc7f0af"
+        "8313a9fdd3d028ab24a43279569dcba73fd78ad74897964ae715928b1cf7fcb779b12af",
+        "10aac6929432a6bc7e12ffa86e4d2421e0535fc44a1160fcfbee477c29a987e783a7f753"
+        "eb2278ce08954c7e90284d2ce7c42de103a9c59d8e4c459b457688ad515cf156cfc56f8" },
+    { NID_sect571k1, NID_sha224,
+        "7ef7138fc657492d229054f8a50dcafcfcd1dc06f1c16640af3f658907e2969248b54416"
+        "066eb119adbfa23b8dc578aef18bba79610b9cc109394b900a25e55a779230bb858b2ddd"
+        "9499a7775d392328db9177aa9571c2f61dd52010b48502154e914a0c55a54edcc04a6713"
+        "cf7bda8744a893926118b09df877d1a4f3d95e8c",
+        "0336fb21549e397a190beac38a1ee10f0551952da15f71e11dfda415e5ee08da2356f114"
+        "d450c661f52b2b32cfc7b9be61732672691a079f0927989b7e9f4efe6095a242155b641",
+        "040316800fa2d8f8f3f9aa87ffb628dd7b2f63d4d8389ee86ed41bd4c3eecd3f3836ba92"
+        "e2ff7ee5626213f9ddb41b43561c5dc0bcc3df0a872e4b8026c09c7b52b89b4975a43f60"
+        "b00207f956df58f75286232967dc1d3e6507634f45c0014c48b42868fecce5b9434463ab"
+        "fcd2b3722a7f5ed25607270148466f6ffad6a8c86e538640ece80e84f7368d33c68807fe"
+        "d6",
+        "1517b3524b6d43dcf3964f7c35c89bf14dd1542c37606452e2035ff0bd0cd1edd6d7b801"
+        "ecb1f573e957131c0b3f30d5006f6e4748a11b9db10fad41961f4ae53e848c6dc6e1a52",
+        "1ffd4865dae7387ed797c5ffe58a929cffeab521e48284bd7d4427d5856e9d2582b91363"
+        "f1d353a0ab1aabfc132a778a516d4033c64cbc991d724115d72ff8e94ab4f95a9514843",
+        "10f010aaf1bb714042fb8cf06a9501dfd1ffa598d6b3e68e7addefe00e18f3a5db8414d6"
+        "25e374d9ae70bea43b57c6be4a590c28e50a548cdb2e30dd9d6e3ed1d9cdada9f8b0049" },
+    { NID_sect571k1, NID_sha224,
+        "d58e1ff1d49a471d0567ecf8f29173dab5fe5f6184ab4cdd095c231fa7b82551f99a4829"
+        "94a46c3d8ebc07297fc9e952a5dee7d5f199b119f6f8b250f8fba45701ac252db725e75c"
+        "4da27ad77d59a4eac448e54a277986740dfee6596811e59afc9755e53d24b826c09e497e"
+        "29e69a22bbc85be11763064e9ecad7ae66458ca0",
+        "0e287ebfd9ba294128cbd484fc5121d271cd33e685bb1804f09b40aaacf64b5a9f2cde9b"
+        "30a4a02d3a9bda97d92f46bb8787b3c61f280b1e1a0680f1f0679d3bb34d53725d62e52",
+        "04052903a7afc17cce078b4b658766a67f2f75ac04e296757fd762fc05d6a7b4e4151598"
+        "a872eb4618efcd06c43cdc3e54f437c0ef1b091ab5e4927d3ab4227fb24d4413e0327abb"
+        "840385e808bee8dad1a1b84d644aa29fec324dac2242709421479fa7a712d18b54db5977"
+        "8724ccaf4e51a27da090c6dd0b7967024db0a8684944b77295c9624ce3aba24ff48c86ac"
+        "85",
+        "15e8cb22e371965801d99407d96200015ba58fd7eaea52c03269d8a374fc7aef17fbfd44"
+        "80d29b781292e179936a68ed175802f34043018ed1d6b5a4df667d859cd2ae53ed3cfcf",
+        "0d3a57af73b7504ef18c03ed2c52aefe1d1a3f0e27f78c11d45e9825647d5ff6e97af51a"
+        "5e366e52e01e5e832e4264a1d5b6967cd9debda59c955568e4c8bf804d843a49a0c5401",
+        "064fd7ecf4470f07b4df3b3046041e49f310a463210571606f00a1915c5220a27bb7a28c"
+        "d0bcdbe374651aac06d4d9e017e31879b7819301eabfe3a7afe4b53f75ccc465815b4cb" },
+    { NID_sect571k1, NID_sha224,
+        "4949ba765c14c31f68ee0ca26bb42ba2edee63537de4a6f5c42bbd862c21288d6ff48145"
+        "260365193c6fd2b56dfb014da26b8a483776b717c6874f627c9a622154b824565b23e178"
+        "240f53ee9748c45759ba5c035b584df0f09504e95eb9bce0301653aadb860bb25e6ea6b9"
+        "606e0ec3bdb8089e6aa0d5763d331757490715f9",
+        "149de496fa8f88b2741864d0c35b3df666b87179b7bd06cd426a45f13bc87ea9f50dea85"
+        "e1fd02a532630e0e3a231cc3e7fbb7c7ba85b40cff1124e72c677c6a3ea6aa40ffc64b7",
+        "0400bb610e4308e229e4b4ddddff5c4633ef2ab40bf74514433bd068c7d59a6260ac7936"
+        "6dcdc039d5585e660a4cbee990a2cb55a99ea3d26dd9df856b0f3ee5b968bcc349240a9a"
+        "2d03e3ef4be63fde6ca09f12f8220e1d9b5016f267ca5aa09a2dca8a0e0feda9647fe0e1"
+        "f7ecae7147a10ff893f69a4f74172c6e9a62f0c5bd96d49b47379c9c84f5ef8e59dea104"
+        "bb",
+        "1cffdb963c2c8b8609809e998075299776b44d2808df509773f310124b5f318d7431f1ef"
+        "8b38fac5cd5580348abc41e6e6396767f4780656361dc9a71dcc8e7c9239d6eec5cdb94",
+        "0982b9989c92e1a5d25dce832bd8a3f602f0eaea69abcfda285cb3841fe3f019503e6faf"
+        "8a693712380a48a6af8844b6bd718f0edf3b57662a4fe82ee28d036ecc4cfc7310871c0",
+        "1678bec58d69def3fe35a64810b27fd06bc29d165593990f6f42c4c7676fd5d4a965fc92"
+        "cf20ab8616c7ac7b4b308ce6290c5e8b4edf6859fd6f6f01878f2601e22acaeb5ce1f36" },
+    { NID_sect571k1, NID_sha224,
+        "5bc63e5c50b1650f0ed4a599960f1e4e11f6c151b2123fd71d9e3c44662312a74b685429"
+        "0628e20b30eaba81555acb2fb49b640bdab2528619c7fcad0f2a2880c7ea232d427d7c93"
+        "5fba2313370fda8863a7e7e203d63ea15d0cfa083e716ce6068c63fa616ddc225c9e413e"
+        "694cdf6b355cb1293af5d6cdea51168f5634e878",
+        "17605d7c5873d870462375d741b4bc6375f3d47f7f5e9d998917adf2137a81e63b66917b"
+        "3dda8968930c4b850f2270eb3187fc756e2beeaa67fe0d73053e6cc0ff0004a21250551",
+        "0400d8ac3e76c25cdf4902426569763f4ae0638ebb1fbcee6e12a4e0b89d6d451cf420d1"
+        "0441a0a9984710dcac13bfd7ba70370afdfb58e2d982ac367e178f6834b4cd2d232e7f24"
+        "6e012b5fd5b686e58df08b695fc333937eafad6006be5a7bfb1426206102a79bc32fd9ef"
+        "46e19869448fed0e917fe059b76c8b5a9c403c3921ad07e6c19ca7bbfeff5491b22f8bb9"
+        "61",
+        "09179b3ea906137dcdbb97b27f3690bbe3bc4f1f57c46ed60b8503cae97602717a0724e0"
+        "55a5c52199ae3f08f1586b87fbbe514667d2eef2fe44092f3c916976c7b71eed67e8fb5",
+        "05b28342703c83ec2df898458fea6f71030e4e9c567d140ab09cc95df29ccfe199837cd5"
+        "8ed00d07241988bf3c863504d065ebbeb8ed11cdcb02da0a945ff38ca58d629f76832f1",
+        "01442a5606791569749b5a9f20ba8eaaedd1a2ceaab2ef55d5d41271ba23f6a5b6a33c76"
+        "763fc99b291b07283122596a3331fcc9ac038447f3e0cb54872c140300fea65d7809191" },
+    { NID_sect571k1, NID_sha224,
+        "610f6633718e49d232b3798654095e2efa0de11f41258b27aa01956480c870d901efa77e"
+        "109d5f95f1f5101d3c90fc51312d9b3019d2e42e0067eed7b457dc7fbe5466923b62c83d"
+        "7347e4dada571b57813bb9c21d5e308519b8eedb7a7706508ad04aa69698e03636eb30fd"
+        "9fb363ef3a185756494ee01175b16847f5b68076",
+        "09214dc2da0967912c31995cb8f5bcf4bfa832c5a2d3610f3a9857e5eee7c77100d599d9"
+        "ed003b4106013155dffd6c48859b846e45e0ddbc5fe24f4891c9b2df51407e9cddbd974",
+        "04064376a92c1227c1c479260c7497147760c103bfa5be95ca1593f29a851daf2e5c3a5c"
+        "73c1fe3e6e2506fcea710254ab5eb2daf8aaefc19cbce7b1c4afbaa2fcda1ef85750fc0a"
+        "3e070638482e5c7c17a82980b863cde11294c0df717bfa4b9f884cbbbbf80a64dd2cc7c7"
+        "d89ed21e10561260d372da2fb726de71863f0f60e8ad0fa5e74fb5d29bae0cbe8ad6b32f"
+        "6b",
+        "0621176102c6ebc2c810eabab9f60feb71083c07751c66f719370713ec2de9ee3957bba8"
+        "d768b076885db1f226a9d37588abf1b141d81b70f0af711c52edd30e92e34a1d3ed214f",
+        "1a21d460ae85d0703b4b10a2f77547e45135048ffea590ce86e0a1c049f8a4aa7b395f72"
+        "3b7480cc84e33f4772df8f181f3919f3c0b0b4f276b0f855174103a2f7bd757584425cf",
+        "0b56bbdf6e2be1b9e754f9b48b3ba9a13403c17c5cfcc4910112704aceea9a34209df406"
+        "ee40e0a10cbc26d03839f95e775e80ec5e29b156fa277a5ac68abd99c7005ea6ba2695b" },
+    { NID_sect571k1, NID_sha224,
+        "c548f0546cee0c0400401cd540a0aa9377f27ac64492e6baaf38e794db4df83e64ca3d83"
+        "b67bbb46a6c269c04c2725287cce0dee984a0d468c9ce495a7e554a6835d72c7493bfe88"
+        "dbd5a044a148c89001b8087fb03e57c2b7212d0b175d616333a9affd8a1802dd49ba9be3"
+        "ab6c6d9f99a5578d26cc4707a5860c6c804d69ce",
+        "042f2682e9ac8b76f3c0880e12c292524601dce9ea6982dcf68bfdb0d3fbfb50dc9229e5"
+        "4149ef09b95bbf624eb04ce1427077f30d8536be9f69970ddb449ca22ab8368d2689ed4",
+        "040116135b273ef876453b9c4c39e4be5a815874857f4a72602f0d03b4ecd9a4ad73b906"
+        "00c71111e317df0782fc92e6ce2b194c204340bc11e68cc22ced38e99f90dbaf0f917e97"
+        "0d036dfa65a6e9d0ba521ade7daa2f6b01e1d14fbe7b5abd29ae71c4eff66c390914bf46"
+        "f09f4ab8a06dc0fad6fa257a85f993d6829b5e0add5086b8fe2ecb8027d08eec1bea981c"
+        "c4",
+        "0bf116711b31ca347d41a6cee5aa13a74e042ffbf79d2ae9448598e6950d721b3773ae6f"
+        "25d7b49ca9dbcd62feb011d5d556bb9f8a55a7acc9a3a166a4169351bc31a293db68eed",
+        "11dcb7f4103e814439df22764f776a74aa86ce9717585712b224803f0ff193d5f541d941"
+        "42812c726b75e8c2c37f2a4c33db6af118af73d3ec4fda49cfc911fef1eda9a470ff200",
+        "15fa4ada3a6e95164aa8972f14ab7572a3b898feb6cde160b8f25094f67343d35e6efdfa"
+        "b18793f77e09e5a42f56bae747b2b66fa9fe1e4a97e5e05ca743c058b1024cc848393b8" },
+    { NID_sect571k1, NID_sha224,
+        "9431c6c5237f6b4b35682a0c32f68752035c8b295a1763c5dbdfd73466cea64a00ecc113"
+        "56d02d2a9211dc54548f5db1651e4471898402c887fbf45005a3bda271df0158c98319d4"
+        "d6751b8ca6b07100182957d5fe0d97c4e2294406f83e9afcae4850bb089f2252490417b5"
+        "afd8f07f4c795fa84c9c7cdcce26bd97273c0072",
+        "17ed9a9c75cf66528428e85b0f019e3488af8b893b12023ff1b4ca9c3691b74e594539af"
+        "a0f4d7c3863d15399b862f15e27bb077392d6bbd546ddfd46728c75177338466eb2f4ff",
+        "040760779389124c702686d8d7c25dccfa74fb333317bdb414965d2c271ca5e687c4cca5"
+        "7e6f6149e1714551761abd4d651e7b04451d8be8e58c0c9e361fe0c6771e3d547d6ac3e8"
+        "cd052d5725d14b9aef93b83d638377f5a19e3cd6e3584121fdfc2c3ba1a588491d7e9892"
+        "be081c9e7585a15b37a9cd4c204054dadf06a9f4ebe98f95f6554941982faf109c2af98c"
+        "65",
+        "104ba3049a642d9b49c4302e9173a9efaf215b67e060c5e9673521641c9c2a5b14bad25a"
+        "448e46faf73810979a3a50104ec8c5230a909ae588213161fbc10381d7c75b35c84046e",
+        "1bf3e89fb0beb1ab854a5513278dbd8b9c6b05c94ab67145ceb1ffcd93d1a2aa374db46e"
+        "f327043518a7f272b957dbbf9d6cbd6708f4c89f05865932b7e816b12a59647d972f6e5",
+        "13a8c121c9c170b244ae3a55aa2d53f4ae5af91b1f72c066207e3f52e44723bd4ae419d2"
+        "4821b83648cd64fa70536605912a5a9319dc446a6b2b639cb99ed2485271acafc2bc988" },
+    { NID_sect571k1, NID_sha224,
+        "417cd5f60416f17081d2c70e9a510114e08be83573bf9deae75fbc3095dffc8a7f7325f6"
+        "1f9d6565381710eda871388cb17619e4448836076338ee309a2bba5f737319002e259b4a"
+        "875cce1bb97996101c9a7abe0278dcac203a712f0809eb3c4b85a9c380550ab0bbc5067a"
+        "8edfa78abf03c09b5c08f21714e1022ebfcada4a",
+        "1bcc09b3f2f1d26ab9955bff7e8c0f85c8a61293511a196b53d7963f4a4503849c96fb4d"
+        "aa68c9852ad9185e01a35f0bf298e34a09ec352cb6da34f89a1f23e8ea27712a8f43aa7",
+        "0401326341764a4aea222e7413a4a6f7bdc0c35ba246e3c68728ce06bdb19f2e1b9102ad"
+        "d88a8511130ff48c0cbe4012ab52de93329670a319f6b1e7e7dbf177667d4a98d3891ec1"
+        "4707a4aaa73713bf8fb3907d49e5653cf82a9587518c2f8269cd1e556a3be3589dad4c23"
+        "8e4c80681e141be93c318f0efddee3e378cd46512d778b9033dc8706bb843a3c3546e76e"
+        "4a",
+        "13412a98a2c14a9672ecd42db9c079a689b147ad91869c3d45a7046aa9dfd3f31edb43ce"
+        "6b84e9edcd7e3ac6b96d89f13878cf5befb052a6f8a4e5577bdf916adb10d908d5e99b0",
+        "11c8a92044a30be397007a71d9af3e4222556a10f3a07a1521c1bcef73b4ddb94fefdebb"
+        "a5944d5bd91313560718a8f520bb5cd5666539756a5e9b66a1b2d18fde5ae72e61d584c",
+        "1ea510e23ccc7596db529dfbea78c99fc78ae53da32ad7c7bdb1df01039310988ea60182"
+        "8fdfc59a0cd237110cfee9de8711c073be44dd4d04bca4b1cbec278b1a9ef175d93f70e" },
+    { NID_sect571k1, NID_sha224,
+        "eced8c412a153a643ccd69596389f83b6a36880286f8aeede503452bef8305942d95734f"
+        "b5733f37ffeceb1c2dae7b1396c3323de11089082745c28a1756f784423fa7ad68bbfbf0"
+        "d93ff8b7ad62220500df6d6895788402c1f5c69c06dd9ef55e2401cf297184e411be87c1"
+        "bba657f847208c0e750f94a3df92f253b377b4da",
+        "0ec52fc3d9c272ca80623e06b15c35f349b13548ef7ee400bbfa04196850b3b8cc7b2392"
+        "38c827f9b0a3160cd97969ce21d66752791f5896e0385b0527d4d77e4b9fc70f04d73b2",
+        "0405cd2e63dcd48fc793c18776d030398dfe3f8b6978eec6d23f49240581fe1e141f6674"
+        "98421f4c40a9430587fa282441a78bb641894cb79d929c299f1aede218a0078c247f7402"
+        "5200cd2843ca87d98f6336c0adb97bbb9c5293a03e5b86d5534e2849ebbd73dff837ffa4"
+        "88fad7d134908234d0d7fdac8c7fafb4729ecf0516c42995fc9337f60db2f36eeac69a4e"
+        "42",
+        "1c40a15fca0c959852afcb4ca6cbcc99fb680950c64ba18ae5388bf783052b6ef3730b1f"
+        "b1487189ad983b6a68bcfbb707466092da52ea8893d8bc4898eb133fd771e78379b9c13",
+        "14485cb1caf1527350587d6695ee3df2b21c13084df0c093ca5109d7c192e7e5df2232ed"
+        "e11dbe5ff2f46b13dc2dedb709a0fc1641c1f32857040147599d8f179fea6b2f2417646",
+        "1a16ebf12c11d2d0a64b7ea124623ffdfe2650fc9603ded571e76dbd7e3b27cd32fcb709"
+        "e2ba04aee0e8e1b942a4e829cd0c9683aee67eec27d4244a2cefc36f84f7de209e22a62" },
+    { NID_sect571k1, NID_sha224,
+        "30e83ea39a92036e22b7bed7639eab5e5be1d00c20b4a9b9afa9a0d1653369cbef363c11"
+        "9cc6f921c8f84663949c8b8dc9b743ac2b1861a480476e9b64c8f333f34b6fa0e1ddf09d"
+        "49618ee4f3c1f46751b5595f0aea413d4ca46f3c26b974b112cbe99c813a96a4423764c0"
+        "69454946f213c5f066ec38108f947abeeeb02fb8",
+        "06403de7627de22d1dcf6b8da5af62f9ec59ec065cc1ca1311bb98aa439a6d5985619b17"
+        "c17a70f59e17cf180ea6828ef57f5f1f8ef05680a9fc12ab7faad5af61e4e11fb45d341",
+        "0405575c329d73f261ab6897153d7261f87e9730eb5dad49c05d782cb02e483fac4a9ddf"
+        "f31d2fb695a62cdc44edef6398be8f4f84aea1d63d0b3a771fe91889dfac4780063d2583"
+        "250183e63ee783abbd00547567bb99e9b578ad8ce63d229db41c6877534487568c423d4c"
+        "389154af9627708d8d8f863597bc668e88f9412b21a6696d07bba06fe7aef93b26950c69"
+        "ed",
+        "0e751a4918643ba3e68bd9406a4386e876d0d66342aefb4ef75bc4dcb8cb2e2d9f8378bd"
+        "02c388c776535ba85d24b206f5bef4b2f23a1c99fe2f2e8ea201009ca468e5b2e21dcda",
+        "0ad6792fdff4c621219549834cf03808645171d944088f5a6d3cf1bd826b5588544a32f2"
+        "31e8428a03ec02d6c1c1243fb6b79b1cc6d732be5be8f2cedf03c1e5588822eec559b7c",
+        "178b64bc5f9fcedab17822e831fa52d49ed10afef1c5912893df4bd8dc960b474ed25883"
+        "ddc343341b696fdebd06e177f234ea45553cc83920a8c799ada2deccf1ddf1dd9aed863" },
+    { NID_sect571k1, NID_sha224,
+        "3ed244dc16a5cb292db4b1433b0ca3226913f07377faa20c6c1402cb4d026de808ca74a6"
+        "d4ecdd7c4e662105bff6edb9fae0117c50aa053aef677c0750c7a446edbb879110030758"
+        "912e8fa666489d702d8fceb719963b24a256429bbcc869a1f4ab9de9db89263e3684d4da"
+        "a1df2ed94bb59dde2abba63793e5f82aa2e4db83",
+        "01fb980aef64254aeb9bb613ff2fc6967503db4bc1f337882f1566cbeb57489cf32e34f3"
+        "10549f41cba1b951f487453c29753a184e33330e90d4b973d2e406c99a239a5c3f96233",
+        "04036ea761ccc71ba55aeab229aaf874a7c2d1ec15d821401e2988dccf02798c4e7bea80"
+        "d9fb8d30be213fc80475a17f45d60c53249b66858d29c73e73117162934dd71096d74674"
+        "2e049bc28f4d45d29c3560915698d03271028f56c29f0ead0608cb72dd0b62490f95bbd6"
+        "7145a6c0adff0d6ef396b4deea6a5e2a33f242bf17e907b136c039c127d6012c88b76aab"
+        "3d",
+        "0ed404ee6b59ffc445b16f11b9b1471249443f8a7309ad8a662b7cb44c94866828c906fd"
+        "64784c699cd29d3d972e5db3d42157452630f14536eca23cbbdd1d37e199e5a586fc352",
+        "1056938496df511d745f2cb88acad279ec2d58bb36498fcd8139d426d596de6d145b765a"
+        "5b3e8366845fceae91d14075356a32515134e577937ce2af7e732b4e89a9164d083adaa",
+        "0d5156c776f2184babd69c1f200b8bd94289d45a2f8b7cd8e8afb1455e8901d8c3ed14b7"
+        "a23b0976b85a22b86f3ccff4ae91e286f696f39646188b675895684f33f0368098fa7ca" },
+    { NID_sect571k1, NID_sha224,
+        "40343935d9423ad30f3fb1832bb08a5d20ddb3a55b59057cd275320db4a5835471c96cfb"
+        "7d67f41ef860cf5879897b8dcf307bd1a52a6226847b768ea38ff1858f59e64cd635b51e"
+        "6863773cc6c64b363ec47ca39266422406264668415c189e2f92447ac4c63ee5d74e95d1"
+        "e6af05016917ad237f482ea0b02aecadd370a8bb",
+        "1d96dc09dfaf602789c1dffa5c9ba130832badcf180429660daadf4cf1be5cca92fe9713"
+        "173861670eebfe3a0ba25bcc76aecac60a756f07b69687e05c7e25984a39556469f62b4",
+        "040452b1cd70e3c88bec1fd0e4b8f8e9bd5f844ffc12f3d6769eeb1c9ea90e5996199086"
+        "82eb5e43b1d6eea63ba9353fb64b59d6549d19cd95f2f54156c81fba53aa0dc91244e7ab"
+        "8b020926ca366dc657d133f0ff9149738738ce68f3cc2f61dad590e2502e8fea714b8954"
+        "3f43d97b46b7075c58375efa379cde208ce769a16be9a377a111a8ac51459840a223f346"
+        "95",
+        "1dfd064dbe64c25a832faea1819cd836d22583fc40b2ecbc19b1f5173c25f33ca8cb7f30"
+        "bcd619ef73a4c14c46e610c8996059612728f508bf7db7ab3191ad61955e8b1ba409692",
+        "03cbb0ae5f7c0978ad8c10c4ff099767465ed6fefb7358f3eb58a79366707107cc88b305"
+        "661526f2972bd16923375dd898ae72e81f290b86cf9a4dec086d7ef04d7a7bba5087f8e",
+        "09f77a86f0da4e35c395978603cbb9c4dcccf126b7cc924cf62732593bb1aff0dabb6d58"
+        "321debad4410dbfa1fb8fe249bfc336db7669e4ee13485ccf8dbde01ca4cdb9acfe5e74" },
+    { NID_sect571k1, NID_sha224,
+        "274567f8841183e68c4f6c6b36c5a52fb0e88492e4076b9cd768bf571facf39dad6affeb"
+        "68941ee326ee461ce1f33c26e4bfb3c9e0cae8241fbcc14cc69c1af68701fd0be3def1e8"
+        "7b7d52b682ebbe1cc225c1bd177b0886e3698a06d0e410a1f92c9bdf7239189f6acde0d0"
+        "653815a72987671b415d1e8a70e685d6e5b14c33",
+        "09d98b32c8eacd135ffb8e13223690ef02c0c1f29ea8b4da193502c8cb3f39f9eed608c0"
+        "2fd457f2fb685ec4595e8fc8f388d26778d225d2b18c9bc8b199d8b65c0d1a6af33854a",
+        "040775560724ab7d98407e20af12b03634a757037f8b3854957e11900d58460ca20d93ef"
+        "06436921f8d4481ff9123a9eff3973e17d441511df3cd88d0d6dfc8016d2cbfb89633784"
+        "6303082aa4a81d4e6f0ffc94511327202f2baed72c08026e05a288eaaeaa36a1a4961f40"
+        "0b4712ce68778ff38be43adc2222a986ef0fecde62f861575842429816c8fc77797af018"
+        "c6",
+        "1f4acd3430931ecba5e9d986c6712467526ed94a0bfff36135da3ba7dd9870ceb38fa0b6"
+        "58dd391ce658774c6725360dc20e5ef41daa9cf52fa863840ca91053e7287ed29ac69f5",
+        "0502abe544fc3262663524cf88a5bc256b20829b7bed3e2779f559506adce3c4f3a89e18"
+        "bfd31819f78ae3809d9d0710c6591b2fc90039328678aed9df2fae38a74b66f69295d82",
+        "0b2f055248d9633cafa4db3b3cef0b76ee02f6bda3d508e19c68870e76a02c69dd1013a0"
+        "3fd741e854cb34f815432bf48138203177141be7209e957f4db1a958fcd45421a213c98" },
+    { NID_sect571k1, NID_sha256,
+        "d9c99b8da92d3c2e40dea3c4025dc37770e867c4d2746c4d726b6de24250591a586c166c"
+        "88acb8ed340e161d4c81b9d14c919a1b06f1feb22c5ce5fca2693bdaf4994ac72c8983c8"
+        "7f331473fd094eccb3d5f3528e69d487562fb5a65c150a8217192f8aabfa7adcfd0b6916"
+        "d5000248fbbddf1ca2f38e3d9ed2b388998b7cfc",
+        "04d873ac744c4f68bb044783ad69e1a733cb8b8f483f2695bbd90c4211282036ad7914a5"
+        "3b25c3e890c6824643cffbdc4138d7ff457e3fbb99387494eb5cf2bdf1ad243a3a1e644",
+        "0404644456a4e5c543af7a086640fa9ff6627c2d9f17066d255c3e805db31fb1ba895682"
+        "e94f6ab96d6ca449b0c3f76bfd6593d182f422689b31d9dc3bc0b70df210a96d19af9ec2"
+        "ac01d38f8572a06ce22c1586a8329f9421414b334352f1e8b961f7e0732ee01e838eb975"
+        "bfb2f62132bbfd9acc6ef8899b4fd388c2b59e564fc3670da7a008ca016de678d6dded13"
+        "7c",
+        "0b050aa7266201a42dbee063ae2a21398ee1d2a190de9fbbce2468836e416b3ec18d7340"
+        "c81fd2a5283713f9aba33e8cbb105eaa2abbf0b687fe2713921bcbc02a4b77df21f762f",
+        "08351115714bc8f29b84a6e3f0a23bdc219d4271a9ee18bdab54c3acc9cb3468beb1f89b"
+        "0f981da5aa7d7ec7ad451bc5e91bc98440fe20f5877a4e73614820b9ab6f2bad3e2e609",
+        "0c64baaeed68178f5a1d8f095b0932fb73f9a02462df5e8378746ecf17d05971a0a287d5"
+        "a8e0317db055b02d4f4b5864597d0f9a9cb1ae68577dcaf7db09c55bf3d3575197295c9" },
+    { NID_sect571k1, NID_sha256,
+        "d2b88a01fa17703c99e5b867c645e98feec0d6d1afaa20a97b5fce9c23f0594460142af4"
+        "e36a5739b8d26d3ba35a0263caa5429b4abba157f359fce701c43372500fd2ae1bc2ed80"
+        "bfcaf8cab7016ff93d4a27f565b7e67fe7dde22bf02c48be12114fbff2421517c825019c"
+        "0ccc72d927bef156140d7f0e9b6ee37af78c3efa",
+        "18d2eb947297a054f8a789771dd875b12b26ef057fb91235dff3b062916f85aab3365609"
+        "bd2a38a861439c8514e33f174c198139354e63766942f605107cb1b9709b782622b295a",
+        "0403f6454f1dd032a925c6bc3e1c62892c1dfaa700d3badf83f07c1185c31ea817641865"
+        "a129572f3351340fec331f5ed466db7bea3ffa9723c951b518ce6f3c9263a7bd6866c8b0"
+        "b40188877b68c10cd6ee543cc5638bf0f82db25b9327b2d81269dc61250eecb976d6568a"
+        "9df29277836b97973e3615e0a4345e610b33909c2340a23c61dcc6e2baf2bc363a333818"
+        "02",
+        "0ec6af799d92ab52c51cebda61ab642d4876f374edb17253a1de3e880048355e58367096"
+        "d3bc0402e4b93fa6a6c8d55c529b9fd68a27962c19274393ebe1bd0b1197a28125275bf",
+        "095c42b3ef01c0f9ab96693526e903ef3ccf0d843776089d15e77093fa9d010872d65cee"
+        "1801f821bcce747ddc5875eaa462b00424e6cdf0995b87c6cf33c37d4463848a6ad7fee",
+        "0c4f0edd4b2dff4f9fd1fea5addef6d483bb51c27bf5c7aa13f9482243e5ed5571bbe0a6"
+        "58543c69b731de56b6b34de27795095b3676375cb4686b45d48010fe8c941208cffded3" },
+    { NID_sect571k1, NID_sha256,
+        "a704a1428cc894f958774368979fe075353b56790555386e3b043dc6a2919b94a11c7f85"
+        "883f46b4d47b324d349c28c667bf9a000daaca1d7191f2a0fd97a4867aa9f72422134a69"
+        "0625408a9ea4b723704690b69152655f9e9dd5fa3dd94814d97dd4f13e85c3f9bca76949"
+        "1c2461fbd17e28afac00bfa81371d5039013da8c",
+        "0594fc0b7a5cc0216d2e78eeeb6394c8225de795f4b73bec48b2f4ede185ba622b59a16d"
+        "d3eedf8cf2c94f2ccd6dcd205f64c97cf1b7f1e34129e94b5129502909f43940dba0746",
+        "040271cbd3e0d73ac19b975559450d686ed67eeaab4175435b2801e8989966d7c5ba81ee"
+        "7d749e43dffa12efba820462bdb274a57d04cd7e92c180cdf555686c78aad58444d5f171"
+        "2907c407b46e93d4c2b12c967cd3e41320ea8535a2ff24372a5791fac9e95865e14d545d"
+        "d3627dcb4aad2350db248ef49469ff4d59a879a84a19d1c0e5d7ad3db432af927c88aa5d"
+        "48",
+        "1e730d50a9747c7c1ce2918fda7575bb81a74757cf9625d0f0619aab7f1eb6954dbaab74"
+        "9e573290406e599eddd7d3376dcb3fb98c116ed7b65729dd04ece3eab1d7b4bed52326c",
+        "00d59ebcfb30d7b27c87d56ec2fc9286b04b39e68dc49b395f374e19647bcc58f2fdce1c"
+        "0dc815cb2aad55cf863a4786efd6c3a0ce56c1d92aa20a19245e74550c17fdaf7a08340",
+        "134e80d63c9b328e02ebafb75eabf0fafba886f48b25206cca9086e03658ce2047c94a52"
+        "22a206c6c5a57ddb8f59c5ba1408fc56668066fef4557124c430cbd1267455e0b31a8bb" },
+    { NID_sect571k1, NID_sha256,
+        "f8a87c4acadee27a908718461e3b45060ae4ebb009b10a15926460bf219cb7e75dc3a993"
+        "fb9a741b94e2fd71615c50f6df958568f452b2cc284f0516816bc0d2e2d45f663155660a"
+        "26326f63f4aa42a6e1cc8462a2ec620a365257ec042f55e4047b62af689592a1a072553f"
+        "f174dd629a4f51837780ca232cf479a68c1ebdda",
+        "0f000631106c5851e8ae0802b01e7a8a8540b427a8a3956a1d36f0600be89318032320cc"
+        "420931d825cc964e823745c60aad3437ebc1c91d32004472e9677605fb708e5a71a0d83",
+        "04034136cc7b8e2dcade5cbb9b3d0e0857c485ee791f862273749b5d3757d072bbeccdd8"
+        "eb81c67fa6927c1aa54d823193c370fc596d0d903214d7967b905292f4b96549b3dbc9b4"
+        "7d056f69b42b29ea82b9f2fc377e874b58ee785010bb7f5814907fb5531789606810b716"
+        "13a36035cd257864e414fe0e6ea353f398745df87ccf25b3a25cce1c78f61f5039d66241"
+        "e6",
+        "009781f5d960870a289cc20f6b1af56602e5e12d9a7353e81b89a90b0a9675686f155111"
+        "57d9fb70b82e8b2e25534f8ad22e14ed518e62a88f1ae21c56d4ab7763808851762d3ec",
+        "0f3eba5ddbb8c127419fe5e8cc1aae2239bfbcd2ab43a006020b96c9e7db832fb09e0bc8"
+        "87aaf24848491d4de935b78141f426875f7dcf2937748afb303ec5eebd01b6a82a8c4df",
+        "17acc35bd81cf24f983072585ee1e096459b408da909fd82b5ea86b77154ecfbffa7fe97"
+        "271f50b67ca3c29ce704b28186b831300db0aa0dd6147d2d160e4aff14348ba76e6f711" },
+    { NID_sect571k1, NID_sha256,
+        "10b5438294a77c7e517ecfe8f8cd58d75297b14116aa93e574996ec4acb21837e6297cc0"
+        "e7e7b5861e862062f192f2206a01b1caf42c6d7181d02c7d62b76c2881f8479449b02d32"
+        "c6f792714d8f70f0c75e81c7d9abb996be87f5ad9a01fe42b75855558d5f00df392b62ae"
+        "0d258f3f67dbeaf07208952e679a2c573aca941b",
+        "1023997206341c6147c536d034a9c38b4012035dc2c9b7ef0bb9cfe65e7d788296f055d5"
+        "08a1fd957b2dc7f9eb10c27790f15f30d81670945e54a508c57b70b46b4a09f4c769289",
+        "04066bd3f503cf42a20cea4a55cab75940907f38fac7fb024c55245f02d72d80336574a7"
+        "2fb248b1b61e3205b31489ed789ee78d88e487db3f5a1cd48efa1487916b8707e72e4be7"
+        "e6010b6e4330af0270abeccf0901dad2f8f64f4993ca93a7c5281dfd71c6ec405f9a9bd7"
+        "8008fd22fef76fb79e20a571df16c4d97244c7356e3ad16cc489d3a9b2e3fdcd5f23b48e"
+        "26",
+        "09137bd8436dd126924943e8599c87f64564297117766580e6344aa3c02056c811fb996f"
+        "264ac4f8f0cb33eaed5ef8f120d43a1d2b3e5e34697765ff9db4b4683ce5c1596d74723",
+        "03b684a66e92d352847f63196181160db3de7a304b6e43679340eaa9fc828322b5b9c16a"
+        "1772c981ff0febb474488daf998d4acd867e78019b61804bb675a98cef24fdad088afcb",
+        "02649a94d2bc243e997bdf27be7d6364459c38845c3bc8d1c8b549ad4689c8a4b4fd5519"
+        "3ac769b1da607dc96458e2f6abc602bb4048cf6b0933da6785795d04d10f22e439748a8" },
+    { NID_sect571k1, NID_sha256,
+        "d83a52d43216fdb16b1b40469863ca8eff4df9fa358deccb5ffd18b3e22a9d654aedc98f"
+        "3dbdc4f5b4e56b4299e25d8a5a38d01b34eb93de382df1ae4d1c7f966e84b84c393d167a"
+        "ecc6f1192c4b42cae83748b1ee3d9147ce7de74cebd122695b455e8082f86e3e488fb0f5"
+        "1b3b7edcd579940d1cb9d045296e5e38f201b7ef",
+        "11ebf320ecf6a908ea5b868afb8e22246ce84e743e1076d6185ec65dd79043380708bf8d"
+        "a4ba802c3b93b8d15509bb7d7de9dc29f1e9fb0f0f2cb97a26698f955b1f7ef668122be",
+        "04038b2760315b0999f9629922bcdff65cfdee4938d4aab8cc3d200aa9c1db843fcbfeb9"
+        "da10afbf10280110c49f0c18f15c2aac4f39af35a79557c68eb6cf6afaab973538b98b0a"
+        "6c07da55796396e919f9b5967608af06bd01e8870354317e76bcb8597a379129e35bcb69"
+        "bbf6b38911a03c3076f7fbbe9b179e078b442c604519e330282f6f6c21aba515d6d73c02"
+        "57",
+        "1c219274e54a4c5e1e1aee3bf805a7002bbfe1c030cd4c8a1617dcea2a14b1d537a64cb0"
+        "7c5a1385edd76f3e4ea9a38e38b458d2c7bf8eb56a57fd33166bf59a8af2e9639106929",
+        "08677167a7ea1aec4de76d1c5effdb5a1655965850bd6498aaa4fb3fa50f213fa4d99caf"
+        "4145b4ba87e34797babfe614dce6ac21d9c13dd0fcd9802b1414aa92dfa18318c7e57eb",
+        "048d6161a3739fbb3ee1c223bc82a46255d10a86a605f6c8e1934b13f1a8662f30f8e95f"
+        "53848119c61f08037ee5a2440c8faa11a6b1800078ed476b2a3f4cfdb25367c8dc2989f" },
+    { NID_sect571k1, NID_sha256,
+        "eddf5553ed4db6e8ce72cbcb59fb1eb80671c884ebd68e24bd7abe98bb1f40806de646f4"
+        "d509be50a3fabfa85c5630905ce81abfad8a55f4cd80208afffb9056bc67d9dd7f4660a5"
+        "f924af2a3745eec2daec39a3fe36131fe9eea444b92d31f6a125f12125159ba095f89968"
+        "a7028549466f41ad45668a861f671050d2a6f343",
+        "0746d5c824d78f42a1fd63d8fcca61f154ba3e75788b7a0b87f53e5420e23a935b02eaf6"
+        "7bace8dd8a8e7c1caee30154c2428e0a437cf12e235f41c416f92fb54528865fd4766d1",
+        "04063645fd3810e2458d15b43287f329c354b07324c0707f19847c544f129e4de1799996"
+        "f805fab7dd356567970e10eb21d875e8ee7bbce56c666511f9b4a4cca986683e937d6f0b"
+        "3e0595485c9a7f2a97fa7f8453df13b75682931fae10f3441042199fedba91a58c105df5"
+        "7b83d2a3911a2d34a2d41e451d0d2549b0a0a65b42aca40aaa618c252baec171da7937d8"
+        "12",
+        "0674788e75eb9d5ceaadad9fae036f129178fde1a584d73cf284acae3b4cbcc208ae7a5d"
+        "35aa473f4e1201c19ee5bbe685ff9218a8e2188f3428ab45bf09b6b600fcf81fadd8d69",
+        "060d6dc42329687012a93ffc5b846b4dce3df46ad12eb61437832f81f4fcdea7392582fd"
+        "75e701e106e5b83521759da6a22a21addb63b73783592d3f29347f3d484e05c19db148e",
+        "197f3b2d4f3e10425f4cb60dd1ae84fd8c87f62a2cc822342d5f0be4f0841623227c5cb0"
+        "f8bf83fef483a061e30ecac86cea0210036083a99fa1247b49e19a7f401a815cb68ab3b" },
+    { NID_sect571k1, NID_sha256,
+        "3db94335f6d1a125309622c0a9d71bde1da09371f0285a93bd0aac255fa8f10a56074e0f"
+        "6057f1b1aecf2d86a2319590ead96a2ad1336fe844e09339b456be32374ba2e659fbe9d0"
+        "f2cdd83444d117d2ce3204ce4b4294dd05405634b84747ffb4227160c4e5c2c9da9815b0"
+        "c6d20f55705f16cdbaa13d107ae666d707ccbe6c",
+        "00670e72ac2de50dd2cdd975a6cdab10ac45e37ef7a28c685d77447051496b5e161f8b1b"
+        "93f6c7f32fce8ea05e94ed35fd7cb28c44bf51ea29cbaf5aaa31d6abca30a89430323dc",
+        "04054db4acd0815aa7ebec4f7661d80465c64f1fd4147507549352bc07dfcc6041ad309b"
+        "fb1434b60f73b3d61ebde91f849004d55257e98b6ebbbeeabe960f9429a55a36ff75c112"
+        "4e05b6f36f76b3b3c780b6a70bb8ea150e9cd6895ff6a6765a3516acbb4f5efa91434def"
+        "52dd0ab81f618ff28db10fcf39264be8e7ea76e06516335ac5ae33ba5393080f11418911"
+        "0c",
+        "0f74a0ec1a7496043d78891e308c82b4660606642ea669e4406683d44b79dd6e6a1b8102"
+        "92bcd6a9f59bcc2e590518bdf2e9224755654026d85cf2a3d9768d909278448f0d63fe3",
+        "047d808febc1065646e6a5608d62d1445d922084487a64e9ced5fafff2977eb3a7e29984"
+        "230946e3fc77a766820747122fdbbb9100c591ad7c9dd29d07efa2e8a43357e3c47762d",
+        "04dd6c8ce75bf2792ef227cd5a3102d30a9a31690ff5c21354f8dac9f826c86ebfaa0465"
+        "3f0ead103b1c8ea59f0a78f5d4e8eab597ec6c028ebcc57f4ce4103ac14579bd6e15166" },
+    { NID_sect571k1, NID_sha256,
+        "69166ba40768d0a3930325405edfd85f3272f7b8e600b0b319f070274c91f9f03d0e6ec4"
+        "bfc7b4445e91b87cecabfecf5e77c7301ee3c6b0affca2fa02c92216698705eb75443eec"
+        "c25438db2d2fb4b24f4195d6b9c05c53e0868d3e58477100607ffdc31b18c40b4ad7202b"
+        "b034e58653daec0f6b33c024d42a3fc84bd8f86b",
+        "0369a3bb96f884983c23281bcd04e24a3e5f6359f81e3c8e46f3f6b865eb6bdf98a630e9"
+        "0646275c587e41b546d3ca7688cc207afda15cf9b25cf83bd6ad27908647f3f9de59de7",
+        "0400eb02f6e741b3f83a9dc50853828b8a6e0861ffc644162515a264730c662ba388ac0d"
+        "705f8b36f5388894df5c1bbc3582c85de141abb7712caadd2d616da589bdffdd9258808a"
+        "4105dbf831f450da6f8e503c19a7788c1317ebe556a458e2bfbf3137f986c9c966a14ca9"
+        "0344be1b76457159c9d70f13af7fe0013cf605010a8a3b84bc0fe187c7d93e4cfb2639de"
+        "57",
+        "0ce22f7f2f01355280ba2d2cda06a55771e66f598bf79c65171e08a98f1d954e4beb3ec7"
+        "7ab06ee60c5fd156a7098023558e3d630641579cc179739bda6d860f8ba1d5ef717ebb2",
+        "0ae86b40d10ca45c20bdb3db55a6dc12e9b75754679eccb44c40fa57351c23c062282e1d"
+        "a9e1703176e4b8f7f224982f2474494772a20269c43a18a7a03fd12d8ebb975b83ade0f",
+        "15ff7b34c3316d9e7ee3d7b48ebf97d98453ca32f3fc67fd08761d93cf34cfa5a2314fd0"
+        "752d263c3eb7cf842aeac395d41ad3c04c1a9d3808b4fb7489e880d130c35a26b702952" },
+    { NID_sect571k1, NID_sha256,
+        "f64cb668b72f1e6dd026a478505c0eb33446ae9a2993bc7648aaed02e172fa9a0e05eeec"
+        "61e756ba246c1dad7e85d3f01baf734b1905c5bbd1b08d833c2cf1e079eca75b866d705c"
+        "407eea8618d23ebbaf269c7185984b3bd4117ecfb295ee6b47eecc8d3a78bb96552f6be3"
+        "14656f91caff793838226662c75cd7804b6bef79",
+        "026717b039df834855511815d5665ff9b654facab469390ae257b7f0eb4dfe66ea0dc037"
+        "242ed0c13bf229b8f7ff26da9b55fe4750d3451c62804aad493c179ae45d08ece5af085",
+        "040191a6d1ab9cdda2d593d5598a966efff829c04c421804c2297e658adc5c9a6092e146"
+        "b25c730ff7ee65cb9812ac9ea0c18dc6b60deda948b4b7568e8b8e14411a6969d7764652"
+        "ae03744af98387421d958b26971d21928b73bbf5b0f0ef183e9f606d0348fa715f153a60"
+        "b6c7991dcefead2ebb875d0c1dbd3665dc42a241c565ea0fb0e6349b4319c3de633883a5"
+        "16",
+        "0dcd28cdfe9028a4a6df1d41019bc58e4a1540ca94b717d258f2afe8bec560f3028e15ec"
+        "1e8bfd422415961516659fa2b006256745e85e488c359e8cbc94cd2592bbb892a19c45e",
+        "07ba5911415a3d21a3d98b400f61eb63ddda689bfff0c8c3ab83668b1e4bf8a703c853d3"
+        "585b8bdc29aa2fdc41d5e7534850f4656ec949f0a13fd18295b662c9829723e5a7fe3a1",
+        "1b027e38283d74c962fe0e7b58dfbf5e21ce1d9c91651bc98284008f44fddfe4cec94419"
+        "94e690d72a8ff3ba2b538718aa678e7de046b653403f3b7c064ee07c9c3c6d23e1b068f" },
+    { NID_sect571k1, NID_sha256,
+        "51ee0b98eb6a3e3c1afcb35a33697c048dbf61374629ac5702a57801fafbea4d6fa5a26c"
+        "9d1b79d1c58257ac0106387fab2d4a1b7f8c0dadcbe7c830613531b3c209bc17f792bdba"
+        "1c1fae1b7528aac53dc86c2094b40194577325c05d2258303a2d17c854e7449489c43991"
+        "b6877a50692a6340a528a6b188440ac0cddd4c4b",
+        "1d642f2d393ed4abea37173e4a79534af87adf534ead4a0a1c46fb047619221e3577e6b8"
+        "bcc776114d01159c736ab78af3e53feac339d7afe58be8e7a8ed290f1dad960f1b5de94",
+        "04023d1ea50229b70b46578df6904fd528e9930985426eb2f1ce10eecbc0c16583959483"
+        "80c4047d67bc4072be2a2624d62a301da41a5265f040642d1937fbbb7cbd205e1db85b86"
+        "850625c82ccff6047b1ef4b08f1913f7366c4f6c0312c21e5ab01b598d1a9618cf5c22cd"
+        "dc64a4732b477dd5c06e332b846c8015a2e5a195326bca46c29cedcc2f24d37ebdb7c2ea"
+        "ee",
+        "0c9066831d61a4192ad9de23efcaf578a5d5774960a2b3e3e292e0decaef62d1701b86ec"
+        "6183d8e17a699d418ef9d084b982c97a55bd76c8b038ac5c639451096ca4d331f070ad8",
+        "005778acb38b1961195d38463abd9c19d9e07dcd997f19676633fa3c44caa44ad1a9bd63"
+        "435f3138ad8f22a731e749a81161c5448eb462fcbcd69ec2255cc2923ac697ed319316c",
+        "1a1aa90113952608dd17dbf391ed56231ecfa7d649f3274774ed2b6034a2207c05c6d8b6"
+        "cec480ae27b58495a50b1e5b74a17ce6cf2e43aa273c2b813c0e6c79976882b7e4b1c93" },
+    { NID_sect571k1, NID_sha256,
+        "feee50aeacaccb6b1c3d95c6524044edb78322ee836d8159c4a4c2cc6982480567c4c6cc"
+        "4806a564876622266e1ebd45f2f4be851b79da025bd57d0e6acce1ec1c8c255eb89713a1"
+        "e4897d4ee0f7a248b9d4bd3ad5dc0e57f60ebfb65691e164bc908956a019083e923cfd33"
+        "dcf37c735af3462768a1e14a8051d7aee74d5228",
+        "08cb70be29e83f697a3e2f67d86f1c1ec9a163b5335cb4a06004b6634948bf60b8ad9df9"
+        "b27d2bedc4975265ce44a7884e57082d521320ca4372d38fc77b18d3fa05ad8aa5c43d6",
+        "0404c042bde9e90b38b48e60551d832a7c80377a81e8c5b010d0e491cf765c432b5edb07"
+        "71aaa5f672edf3ba108dc71459d245ad60f3884b8cf33f8cf797f36b20e4be39c8389e66"
+        "b4075f2454c41c0323ee1a640755077d36a65be7c2a014db36719ec217e21a9c004bae5b"
+        "efb499bf6be67e82d3da70475abf9dfb751c84c409fe838cf1c6ae109d27f24d75c02cc5"
+        "b3",
+        "186f16dfdd7a71f20a5e634ffc465356914bb52286d3d5ac00f3ebc02497112fcd592e1e"
+        "cb2ebbc819e07ea092e465e66f3e58da7a2ddd41c8787f57c135ba4c168539b4743c3a5",
+        "1c2140d294fafe3d9effb33ce73bb7e5485c93c7aa9d33b7535c7053831a1dbe79075713"
+        "794c87e52bc887ded969d2dfa6a1e2630cff96760310e04cd2a75be6fa020a12fc84d3b",
+        "110aa165707b7de1b3a8e05e4502701abb5ade0a27deb04fd93c6eb24ed2b67ade6c49d7"
+        "8e874d25247e948f704d3c5b925f84c5b07c9b289c4f8507e75d0f8927c6dad6dbce885" },
+    { NID_sect571k1, NID_sha256,
+        "b115f7370d6a93a90fd9dfdfb292956be34b61992ce1fa5627c5e928d74bcdeea66d4040"
+        "c473306a0070fa8363c4303bea32f73ea3639b5c6676fa5a1d68a2cc1f91f00580d7453a"
+        "23ae70af4cb1f1657aa82c5b305374effe5d67d559e46a6cee6360503d21070506f1af30"
+        "bb000d2f2f85caa6465810f89968f33abae81cb3",
+        "1eef463771f9c6285f3257691dea0844687606d4dd00b6020517f190891cc1be97cfad21"
+        "d147ed8881b5a6e19b22ceeae30e1132476325f2de0e9af2e14c80b8c780a9d2d6c96de",
+        "04024de3ebe03d2d91b88794a77635aae6743e597410ae10c356a51e3af88fa7f9c4d648"
+        "c7d1fdb887c8313914ed554eede282b24a2e66aeafcc0cc96907bb2f3877eeb97df491be"
+        "f301ce1f9fd4d7d3870997f34f54f2ba8f08ac94ea94f74a766f2dbc02e4d5149802e313"
+        "5a2d762e3b8abb01461968f1e88cfc8c7fda49c099e392e80d57f0c14de9c4fa1eea2573"
+        "2b",
+        "026b545702baa340fb6d1bc2bb96f7fb1a77a2428cc122ea380a258c747d4e0625bbf4e3"
+        "dbc2ca2f15bcfea92f2417cd5d22f2bb5f38a9ba313b3bded506d3e570dcbcb86c2debd",
+        "091c162d040a12f08a416296a43501d92e2ecd6be302b5e1754b9ec119fb8a572626c509"
+        "855c7c868a07b263f66070ac986f95e4c83150a5a492d5ea8a7f8ebf556c17ad2bcc996",
+        "00c217fee7bb202d6399f6b1ae4e5811d9361573ed4fe1b3fe5d474cf06d0236d59dd358"
+        "0145dc0bc7632c721b6463c69490a67d1be1fae99e34318af6df939f9f7f36a9bb8d5e9" },
+    { NID_sect571k1, NID_sha256,
+        "726782eb0d9720daa64e4a77b5d8dd67a1a193f15eb6b5162e3d89c925ba63b7c7e1c4bf"
+        "c8d6f11915b0e14d16ab53ab015317bd5958b0beb6074199e05181915496575768d026c2"
+        "3e92e06016598de008c3718aaabcda8b68bebca0a73ecfc7327e8d3646106b7d114dabc4"
+        "6cfe56265c326ee56fd2ca87abb5bed8f997c735",
+        "13bd452b0880b101df1aa65724fb60d5d85b37ed5419027481661a3617e0fb37bda1151b"
+        "9b5b41f908ba832011f7850b75a07b678e5b8cb35c5fc8b94a625e4398cd5ada2b04cc9",
+        "04031d88b62d2edd5f6ed29258c143bbcb3d29413afd8f86873698a9efb8d2021186415d"
+        "301599232989a0df5ea91ca222c5781314f200c708de30751feadc277d50e64842dd355b"
+        "a501c76f19ceb1be48f5540265b8b018da62fc225cc0d2d1675bf7df71456cc8e35b002a"
+        "220e2e80691600a2c1ae31e980d0cd22b4741c25bfbd413f10b375a4d8adf70a65c48ff0"
+        "06",
+        "1b9235221a6df49e39b4cde6650e994f624fcb5084daaa62aef54bc154949f4da9074636"
+        "c44f50ea40da1a3f01bf67e9b62a725ac0537a4e37ba33fdea8ba8b2286bf82901a933b",
+        "01dffcb5b5eb23694da4978419110ed2bc7961c571a2e68daebe21e598c8b483b34f3178"
+        "978708db6d78455cc1fb4f73c5ab7607cbb4f05d4d008c7bbeac88562fdaf7a370ba394",
+        "057018fc97d7b16d69af2b7dd4a859f09dc178a6025e1bd6839ec7c75c0383c59eee7079"
+        "fe61aa6bfb3e2c780d4ac0ee074e6b13223c239aa60ea1187ca4937864f89e2c65056b9" },
+    { NID_sect571k1, NID_sha256,
+        "1c2418243fcd89c6382b7c3b2a8c341f26d08174a9e9296c4a5c98c5793a0fa48dce51e3"
+        "0811a96b515aa22bf9af89a43de06d696be1e531c5dece1f69fa6ecb7f20be063c602a16"
+        "454ddafb14385ae3f8246c3f989d0566e06e7ed1864502896ea19df8393259c4dab3b338"
+        "0a4a80b4103cbef4f38cb69198b7cf74ce94883b",
+        "1288141ec2244e4bb3f62daf4ee588aed09ce22be55e3d42e9085a947c1f8cd16533635d"
+        "170bd64ae0b417346fa4670c25d41387acb2a8e14407a1931d9f7c5358a14eca40974bb",
+        "0407ccb7b12a7d6997ed2a11eead3278a3f45ea284dfda8e17f6d926ddd6881a44d02a0f"
+        "7504dadbbcb0cbd6b85c113aa0d3b4efef1ca151cc38cab1aa8360a6d22e3d6fbc0ed980"
+        "d3031b85dc2d2096bbba6c465629ea09ae3421cacc5581770ce3479070f23b3aa938333c"
+        "7c691d9cb93a4533b2ce389ae34dbebe8f333cef530abe17cd21448f701608febd42d9bd"
+        "c0",
+        "1e411ab53c48cfc1ef9eda97002dc9181a78352de13fbee3bed86cb00c10e7406033fa0e"
+        "a97b50764b0eb2dc6eb8ea83e47bb3150ecb9437179c124f15fac6ac19b0c8bc324f171",
+        "14420d78f2f9f1010018848b0442ff6e6203c1dc06a4d523802190f462ed3c11c7aa7678"
+        "bd03ba27df01cacf4121309551877d3a2bbcfee116c59926daafce55a4e0a7d69c5c938",
+        "16de0b369c28ffa0bd6ed8802a503929cebb5c0a4bf0c0e99b14659b48aabfd08bcb64bc"
+        "2e39855d7d514d7525b3c4dfd2244f37019b5f86254cdda599bb144c8fdbaad5525cfad" },
+    { NID_sect571k1, NID_sha384,
+        "1de4b642ec7220c64b91561caed7832044d6e811ac909f3b199cceb0d8a7db91bcdc8014"
+        "12044f5c34b355b95a2c6170fe497f6d5259bc20715a38cb0341c88e93029137e94d895b"
+        "ab464bca6568b852340a5c5d6a225475f6eefe2fc71ffa42f857d9bab768ccaf4793c80c"
+        "4751a5583269ddcfccf8283c46a1b34d84463e61",
+        "01fe06b94a27d551d409b0eb9db0b163fadcf0486e2a6074bafe167f9a3b4ce8ac11f42c"
+        "f72f9a1833a126b9473163d29bca2ad139dd1a5e7fedf54798bf56507326fae73a3e9a2",
+        "04038d4dce42bf8fffc39a5b6583a1a1864de288ef8479449d599115bfa35b37954ab288"
+        "ffbe81e69d58693e2c8c81639df12e4b36f62b2ab042e92a0715b518c63d0ec630051d4b"
+        "e1059c72c0bfb0ea1ac5e2fdd4fc380d08037a3d0eeed4990ff02e6cf5a16817ea598085"
+        "e28f8269da86c547e7b34e16a06724ee73776529c5b5dea4ce3321fb168827ca1cbdf885"
+        "6d",
+        "0a3b18c8c9f17badd123c674869ff428d533d2ecb8c74f9784220be7a90dda591003df52"
+        "59c5dfb612ac7398aa04cc9e82863eb0cbe66b6e7f45dd15dad252f74a538d5f4354c96",
+        "09c368c80f697c1718c55482b2c6c5c0edd7257a3a53f7193515629aa40a9716cc889d41"
+        "c120516b54f3a106a171082364886e5d3a1e9482a103f072988f61de68f034d658bd976",
+        "0e782ef47b250f40c56e3ac4de112347174bd59fd4cc991a2b538ca90cdb222d048fec62"
+        "e2773492a1d327152d1d6591740706fe2f8e1d65de888d47fdf173b2645813ac0fc3078" },
+    { NID_sect571k1, NID_sha384,
+        "70279be7d7ac72a32606642ecd81b5d4d0f95fbc3c0b07d85c16adf2788601e44dedb8e5"
+        "5e0f9e0b4ca3ca35f5be7511b0e69224a05204af67aae11ce154af6d594d47f6e3142ad1"
+        "83969544aa95cae1edf42bc699137f60178c12b10a67698e37ab9f3edbfb3acdf1b3513d"
+        "62fe3db33b16cbb4e1f9dfe732c107f9d0c953f6",
+        "09cdc7e4945c485a41728f83d5188f539e372ff4fe38fffcaacbcb4522428e4f93ef4972"
+        "556f4398fe17bdd885768f0fb5590df495badc794d4d274e22f2f4a2535555922fa43f9",
+        "0403c6f046aa3007ba7f883bc1e0bb43a9a0a1daecdea3e2b6c10b2481d11a834af241d6"
+        "0cad7cab27b677c9ac11f2e5b5226c0a3de13029229af00e5a092340af9b230e0ed992ac"
+        "f406326ffcd62e1a68b63ac680a743130b1440bbcd3966207dbc8a8f4336eb6a7986aa53"
+        "cfa4fd7bf363b30706b4fae01568020b41caa70ee3d51db982de66b0ee39777da3fecf5b"
+        "01",
+        "0c717523a308418eeb2aeb816346b74149d56b9620774cab582f01681bec73adb779bcc7"
+        "462fff35685a4e1e114c8fba474c68fe2650344fc9cf610908966a9dd1779f76bce0cdd",
+        "0061067f377bff6a9be30c9c79d8abb7f54cc8f09eaacdc190beb27b1e6d297cd32b043b"
+        "31feb49958745b78e42ac074b8722e1a7653bf03611d87c44fd3891ae410b23a2140b83",
+        "00edbe756a5dc78c8a29baac9e2059154294e3adac9a5adeb7b27ac6e4d4086821cbd554"
+        "67266946ed8f6f03abff35b59434afe84067c1daa1e0bb62ee7c56b85e7f831eea99047" },
+    { NID_sect571k1, NID_sha384,
+        "4d7e0ad520445b6a5cb46b7c77fbd367614044ae6004494c2b3a89089287e2836c73b799"
+        "cd8c90139eac427ebe335804c3788f3728ffb8edd7f49a4bcc76a9e24ce3c2299cea88c0"
+        "4645b82033115380f81b0c1d823e470631008d350cf0c0dba1915519985b8a389ccd8c80"
+        "9dbd5bb5051a79e631916e0d052d9b6cca18e0ef",
+        "02bc753d007c4491cfb8ce0a6c96455acd16d37e02c982db216b8cc1afd6d10c6be4e15a"
+        "3988b8b8b86b2b5b59a5c1939889024849317f27ee08a06bd8e7524d4ad83a1de208564",
+        "0400ea922b09e902ce3847f14d3b3afc5562dddf15811cb2e7b9e06e1b919d795f8451a3"
+        "dffcb92b418d30bbbd1a7ccf827ea0f1f6554387fa2fc51755799040133d7a655c7800b7"
+        "1301f12439a0c0df9f6ef08e89eb1a62e2cedafc0460030810b2483ad9427c48dc061e46"
+        "40ebbd9b4a398841c863a6e3d510e5c66934d66b317b1640bd05018a35677c6ac2c78397"
+        "06",
+        "0385f9caee4731627276875dd8d725fe79626c18841562e8a13fa7531c7be9adca565c22"
+        "459d519d643ea22478d7c51b4c286920b050bfa54ab7d42966e389c485b52cdb4fa1a0e",
+        "02ac84262fd121bbec43e81021c0f0610fd2fc0b26d66581ddaa78714ce58be469652838"
+        "51241d792ad6bc79af39f09d2d4bda83996ab41f1fd206b8293cdb6c4eb9d96f39efa25",
+        "1d9c9bc330adeee8f58ebfe8c1ba401d4433efa04a44185b0e8e20b634691bfe058770d0"
+        "74289e636af3e96c118edf31d72b5766c30f6fe84ade42f284fc7f2707bf27b3a309638" },
+    { NID_sect571k1, NID_sha384,
+        "d49903f38b5c9b17542310425e59377f61f5b4f4740cd97371ee2116083f7758e69e7e2c"
+        "1b0950ec6b76f96e3c91c721d6f2843afde8c7505a559c8a64bca2e665aa1131b75bdf86"
+        "fb5b90581c7d3b61c2cff88f3fccf356ddf5ed282e27727be061b6925c51ea7f1a495f47"
+        "1dc8a5ca1a88bbe29e92338d3c9361460398965a",
+        "02082c6e61d0d72f040905d8c1c20d47b029f41ec68d6cbf43ce97c3b2a0a770557a33cb"
+        "803c432cfbd3958fda30ec1bba77a6613c318597a85ad02b26c44bb77ca96d9cc1194ea",
+        "04059ff339d505b307e05adb45aa314d47f2450e1b1aad840b5550a67c11940d0e786547"
+        "55a8e28fb651e12e48c66cc1ce0338114bc1ffb00965b342ef3a3caf495f1d73a69c3f3d"
+        "170724e9474e6de57b9f8cbf6f6bb4f73f5769e6cb0e006a34c2510b379995c9e054cc49"
+        "81c709ca85a3aebdf29090ca07dce5bd3c313c6153b551012d72a8f84600350e8754bc4a"
+        "bd",
+        "18d65ca6c2ef1fb32dddfb9ad4603e03c7cb1791a9ec7b41266cb68b6048aa111f5971f3"
+        "cbef3f0dbb9ce409b59c31cc59bd6f100ee5247f8c36f26ca77cb252331fc3be7346b5b",
+        "12853f9d695b8ac4431c1ccc8498f3fc4916eb6a5e66b3795a3693f3f5a29ad13e58dcda"
+        "ca5774f1f295e2d2d3c63c69abbcd9f388a3383371028fdcc8bd77f7554d6aa3f0431e8",
+        "0d1c324afdf01ea19e9453d2b7397584d773716d6a08b6e38f9a9fb104122ecfcc9de7bf"
+        "1e5a6cfd52a08b7cecb002ebc21798d474f035fe7d4554bf632f237bce14aad88b47d4d" },
+    { NID_sect571k1, NID_sha384,
+        "0e3f4afc3e7b25c1bf2d98098a5a87db1224d9bb45adc6e434732b8722a708ab80a1f3f6"
+        "ef3c5aa70d2e1dad3e4416b12cc59171f05736c4b58bd084602c344f2f0bf3cfdcfe04c6"
+        "4e87597a99de23ded64b33607f7c273ec321f6462518715b11e91361e89ce5415bfc2ef5"
+        "20bfec378244a3bd2a4b9b6b3d68815f2f75baf6",
+        "0e298c93351323e2c5304015a4878997ae4e79d1c32f1dc64262e534d4f2c4b3e222356f"
+        "fce746763373fdfb936fd330d3214a18c07f1205b20c9a941331cd676040ba1fe3dbce7",
+        "0406ee4952a83477d89ea05ae63d5169cb0f7c7ff22f15728c6d69dfb30d1f28158e2667"
+        "f9342cfd9b32f2fd537dad47c190d82f72c03043f2a9c5d97cd09d07ed4c35b961040425"
+        "54026d5935dcebc0ed5a07b7ffa50de3c8aac309dddb61b8c560230379696d81d72bda3c"
+        "819c46387e7f026b384bb0f7b2ca90c402bb67b5e37d343cc21a8d1a0f822dbb2766030d"
+        "73",
+        "12d23969d230e0e2712f96b11e196202dd3e6ac755c824f92b9c765e3fc808d4e7236c8a"
+        "3c06ca2c8272c7ac953fdb936db30d892246cbdcb7f98c43177e1c30afcc162af511364",
+        "022f6dff5bc1eac1ef568588e2e512103cf56ebcb610e124a125fb004064a28291c19e83"
+        "ea08171bd1b14ac729392c7c46354e795d63e3bb087fd100642465efd817b79924408a1",
+        "1785e1fd773446e3b90b8704cc2723b8da2f99d1d699e817c3c4622015d178b0cebc19b3"
+        "a6dd972f75eb3828a386973c0a5e67ca192d69f1a84c825d1253f1062a990c3f1a947c7" },
+    { NID_sect571k1, NID_sha384,
+        "8fe32671f6927272fd3cd8dd4e34d44d27fac8c88b41bf9a48039e914990bf06d1633b38"
+        "b9200ce1c2a275b9c55498e5da2d0707322c3ea0a0fd7aff598fb801628264e13047c800"
+        "8153e8595a0dc95d54e70b882ac2ac9314d2b78e7b93922da818d7075215e354708994af"
+        "66958954c92c074d132dbb2488e5a531c755a8e2",
+        "104f4ad56594c5cec2a988c5596d73adaa5a81802b40110dbae698ddb1f0b271fd1479c3"
+        "8abcdb9b234e69cd0da8a0328d2135c287d5b130a09fa0b899058e7800eb2dfcee95c1a",
+        "0404e8151aaf2aa6a6159622baad134be41c404982bb0101e820eac8f0a52166546c5392"
+        "7d9b419604e9b025757eaffac526d4fbebde5fba0841c6812dff2e9bab5054d4074a125f"
+        "fa04413639ad72d6eba870e1760c71966544f3f881f88880fdef1edeff47cf6c235e8dfe"
+        "f1eb1d8df51f9c48b985912f1f70b61fd3d4b859e052887560872fe6e95db0f435778d5c"
+        "4c",
+        "0cccd1bf3424d8bb0513fda3db93e81bd34175d84aefafd26b37eda9e767618247bdc94e"
+        "d2b1882bcae4c83eafc30a7a4a80806fda10a5e70b8827287eed8eac2721939a63c2175",
+        "05b1460e856548287683dfbb93efc869e80333a9ddcf292e2fa3b3c8d430563a01340685"
+        "c6db1059aaa8b298c8db9e8281f36e3a9664faa17f413cb439ef24cbdc1a4d58872ff6b",
+        "0c6faac191c95738f7c6ad0eceb035e5d22ae85e4bd0e27f2e65ab293717c0491be3d1b5"
+        "ace80f4cb4bac7e33258706010c2aa48d84c9e39c95e30805fa7669c42bad84386f7754" },
+    { NID_sect571k1, NID_sha384,
+        "a8fa01136a0a78313a5d160c32fe5d1805eeb3730c18ca0c47818e82c48eb4c9e5b2dfe3"
+        "ee5facef9ec59b68f4e6f3213f77fba9f8ba06dcde546ae348d343233883894f4423331b"
+        "536f62373a495852977a51cb192cfbec04b5582b4ece69f345979e234de32da7a120138a"
+        "057a7119735c4cb19099bf48bb202e7ffac04def",
+        "0c4989bf33b3136bcb4ba67906eaff2bcbc6567635aa4b057acb7353ee87ba3cb4cb9838"
+        "f8f679729d5c6ed98e6c4199cf58605f009c6873a1b8321f83cd3c0973b7a3cfd9dbaa5",
+        "0403871c7781f2b4f653f0d49a224576bd1e5363d5171bd21da89f590f49fc212d8a57ac"
+        "8a140d923c2949ca287bea803afd763f15f909c099a07297e8ba1b37c70e1e8f0fd1fe9d"
+        "1c05806bd5b4858ba0814da2167d232d55bb5c41ea0a36fb28a0a151c1b79b22cb16613c"
+        "cd9dbf92174e42578ef88f4da6eb44918acf427fb7e4022da3376243e75410ba6ae012dd"
+        "fe",
+        "0a9eb767077886c48bc54503a0d2d62f0192d3581bd9ec253107092c22f68a15293d7c3e"
+        "7aff56282f0cd35e86a2b3c55c9eec079201d99b5f49946780ce6aa18b225c2dfd72cf8",
+        "03eec6ffb390ecb2af4f5ca17fa8a7fd6938667b319f0f61e5c7523efb77afccddddb511"
+        "4ca8c461b1c28dfe7eb85ab156e24e891cc6f9511d703e8b3c8443d04fd8de80f5d65f9",
+        "10cf3156cf71dafea6a0d6abbd503d72b13e6a684076ac900f390059cf3fc325966b3548"
+        "b58e14a82bf291d9689783b899db7d4baba524b0b63d31f9900a84fbabc2ccad95742f3" },
+    { NID_sect571k1, NID_sha384,
+        "ba2d83b21c783d6ef2f3b7b10e910a418a9b9f49ae0fd37990335b3a3d15627846c9a12a"
+        "1f31a3d0e062ad1bec5650606ed4dd06c30e50c1e8761a29f4ea1a20f74635d5dac22e5b"
+        "787ac10f4ee82b338a641484f91771c128c84d31cdab0a6b9616078c898665655ee9dd4a"
+        "e73d33b94bf091b064928b959623aa71ff73b4db",
+        "1a96f2ad56e31397e236cafc108087479c9823589a5fbc3dc7488d0e5d1199cf245d7f21"
+        "f524cc0e8b47feca14c93fb760e631434a91188b32965053942f3bd39b3714f9d6f1a11",
+        "0400195bfb66e20ae295cd22d59b27b3880a890fc44ef5c720b568bf7f72266293841dcf"
+        "0572063a96c62736d9d4a9cce31b10c03016305a409858a79070477d3e989481ec555c81"
+        "460491122a199176e2492e07fae4ddbf02d2a40a21bbd99b8f742b546db2018cac27fb4b"
+        "1c03cff55f61b7caf13b0f3b097ffc8e1549eacab89225e0cf1e96b268eab7f9a1a69258"
+        "f1",
+        "097e28225aee5bc9a970a150502dd14bee900d3b040b0da9cb52f5824e66af46a991bbf6"
+        "423fe1e089cba47593af555b07b45e47b0f4141b0412ddf6e91153213c5b8645ae7bab2",
+        "1439928b55917e93d59341532cd1f9d09de1f6e0d9a04514bd4b692603f2cfb75a579301"
+        "b39b8cd92fbfc8832839691c23e0ad3efd3b4c7c3e9a366c1554c6dd13c50dd087b3055",
+        "1fb432e72be6fc524a7106b21d03fa71852c18c67edcb8b265db3b144214e7e6d10caad9"
+        "1f81616e03ae7913fea1e8d11e90d54b17705e8d04c8c20f0f4f46f117cc423ca178ff5" },
+    { NID_sect571k1, NID_sha384,
+        "ea2d5f4e9797bfc2f33f0fccaf530db2bdf8abcec00f09a0338eefdba318221ec0e050ca"
+        "d1a85c3f76b784c6e8c18da2b062f333eeff18b7b781e67d6d0a4368b8231a892e0f4103"
+        "012348e5df53ac745e4d34e2cd1ee9369f97d4801ff485fc144b2007008036bbc07cb1c3"
+        "02a00054b54f3713919191e1d5052978c9c2895e",
+        "0c08ed8e0e0f8b0d0714b46a2164b933f8147692f18da97e5a108c44d5a5cf221cb50536"
+        "e41832b83bff4026c6df156386235cf5e3e9a67b7cf9b2fa7707c5e0ff33a91601b8e34",
+        "0402d516bdd1914c83aec1cb242710ed79efa61cbb31dcf8d238d8f5e089158b2ee2bab4"
+        "07e01996a1621b1a869a98227c12296cc2a71c1ef2d0f26bd6614f2ac77008048abeedaf"
+        "cf0151474bef5965c455eb95ca2ffe1d589107dc251d22635f4a9fc7270358b64e4d2b81"
+        "666b60c4a5c49902b0fa9963197b22f90a09cab97007842816f64fc49e351710db849800"
+        "32",
+        "01125bde6086753b3bcf29b7d5a4fb0a8abffa6503b4f0b39960eba226062bdade57e4d7"
+        "3e8c1621792626203e83fd5c231a53b0ce10890881460802788d481f233466060f73359",
+        "199a1e40229786b966592ae6e275874ace23d5605d0c3371a4f9eca7ce4858927958bc1c"
+        "2780e9f2f79767c1c72117c79c408f972006841cb621837ac002cc6510e0432d99a1f64",
+        "17f4e5e23e494ef149e4abce2d8a1ab10e3e6c2cc93998fc63baed6565ed350b220b2828"
+        "55e2824f398ae76b8679201b43450f62237f6fec643ea659e6c86abc24a63d82d9bf219" },
+    { NID_sect571k1, NID_sha384,
+        "b2293b0a09f41decd9d8e637b1b08c2efe612f33c9c0beebb6e05033c6103b958f8aacd1"
+        "25d7c810b4c287349f5f922d2c6ed554be597fb8b3ba0e5a8c385ed8ae70d5ae19685298"
+        "f20e8d844fb5ad98db12ba7e5f45baed9045c3e86b3cac9bd55b614b82fd075954fc59bf"
+        "c6124cbd68edae988596575f379d8921b594c75d",
+        "144090a0ee38cfa21fabcc24d35139a99656911ad4f6dbffb77dbe74e7993edfa9fd63d2"
+        "c4f6bbdbc8ec21ba13c9f4a3576b5d6e3abeab5af5ac81b1f2bb6d4c42dde645d854d9c",
+        "040208729b3c7abadfc221cfad8be642588d5d1c20989fea731cfccef25886905e4b1e61"
+        "cf9548d89c24f5706f5243dc8aa7d5b2675c2c6d2755ce6a12e5b12c28a2cd9c597b7dac"
+        "b303db73ee445ffc0f6c77467f3add3b1e97061117e221687f5589a030f5248bb959bc2e"
+        "d98c9fb66da8679dea3949b77652dcf83ab9c50a00f6a9c22bd8d16e093b2deca4b0c759"
+        "6a",
+        "0adcadb26626eb9f8db9ae98c6808840b65d6f886a3f0c45f0b993a8bc62bb5c08dcd879"
+        "40dfef4f220f5e50234fba3a55e7127fcbb967ff78ce4fd6938a9bb653747116541cb85",
+        "18f7fb6ee028c3dd754d6e7b687560fa269b5a5fabb1d98529e0a27dc66bdb1ed79b7b5c"
+        "64fb71e767d9497b9255f26b8150b9903caedb25f51594f5b7ec2870515f701bd68faf5",
+        "09ca9519388402d5d96dd9ef2d4ebfd0ebcfa58bf8c1970d04851b2409671c9d5e4aa833"
+        "555df374469a4d277aab93b8df8d553399908c930f81c2d9769f1b30a13f61c02b16852" },
+    { NID_sect571k1, NID_sha384,
+        "acce54270252e7d9e983c08c993cd6b7e3caf482a9149036afe4665bd3d0662a68180471"
+        "87872862d5718b8ac063477f693caf1a9baa8bdf2f36d411a796f2b46ab56f66bc949242"
+        "29f8264016d6769c85d9bbb7d6bb042fefdb8fde1be026b86af2017aacfe38c97309b468"
+        "9b23fff94f1de880064f1d3ad9d74dc804c41f41",
+        "1df26b672b2e3617b6b6c631d3c6be0cb49c0a690de49643e0f416215bcdaefc03fa9c70"
+        "8471f1d87476d58c8f147517ec8a14aa945ef001fa01984d5c3d81f7083ea500558fef4",
+        "040767ca8fe8f3a7addf01b230b99499b33c83db95db05e1956fb1891fed60406865291d"
+        "79b0daca0c307a3ec8b1bf2ac2cbab728c6ec65c013e01775ee21a29305e9403f72883a1"
+        "3800acfb786b09e5185dbd8abf831d12967107dc57a040d7c800d904b530eed1e19a8e52"
+        "e653fe8bb824cc424d7254532d0fee62e8ee7ce8e871cbf6e4ca3bc040444585b9a4e397"
+        "cc",
+        "13e5e47048122c8301258c638bc0f00f8f9646cba927335535f68f4f4f51f23ac5398ecc"
+        "21eb0bfe8fa6a2084e11fe67587bfa791cfbe2527797a4d98046f9df37662cb7e86a5a7",
+        "164b3500ad14063101b6c5ebabba53dc5acb4d6771d3b05a505e6a67727ca8ff73d996e1"
+        "329c0f6d8f738237ee0f0be415003e2db515ef93931e09bdd853b9497826929eac9e9a8",
+        "06b65511990c061a6d2a97fe2a5053c775ce2bc5471865abb7261d0436a04b79baf41a0a"
+        "852a57600cd4c6a114b3a8466f721a684aac2592640bc149980545daa271fa9b146f2fd" },
+    { NID_sect571k1, NID_sha384,
+        "e25274ded4840df0d71d3369007118f002b83e2d375c78f7e29ade067db15cce21842611"
+        "f3f015db2efec57da77cb9d16eb1e00a8c1444d48dfda569e29fca1ebf40a22fc646a9fd"
+        "44460f0e473bde487634bfbdac2c312f66a1c2982c6fe76c54ac72b6c8cc9345e47cb319"
+        "a974b3cc4bb40634df74b4ad7e18adfa9a71ddd5",
+        "189918b832e9fa30161fdd927bfc267f6405335df3d66d225e17173af52a671138883bcb"
+        "94c4403ca3e001fcf09ef4c6488934d6775af2b1da30a8f331579af2d0fbb530298d8f9",
+        "04053e6b43c0551f32b7b34467d188985600c5c0ed12448f2e763609f40039f92002bc8e"
+        "70d8dd3e337c3507fc996a1557d5f2fb3132507e49ce653482cdc86f6ca5903b77fa1619"
+        "d904a9ac78a2c23be0841b96cdb1d55862e4854b530f1fa3f469ba9f7185e3f91c28d03c"
+        "27d9666345bdbc7a44764595b303f49cc43bc2d0e944862913d280273cfd00e15b6b55f8"
+        "5b",
+        "0b47a185140b583c330c64a10d50748e019134bacf153cb4a23753f140a4d607d5771a8f"
+        "0f535f9c35baae5ab6c37a55f38acd12f15be18d5bd9662383b30e4d0ce487e8cb553e9",
+        "1a2ae62cc9560590177aa544945377ff6ab1b34e7e32a25140f99996c130e17001563664"
+        "7756a5e8522c936eb1389c206ac74c012941269165f3772373047521f69510c7f3e6acf",
+        "1d86f4a6ab2bba7f6305c2df754652bad40d7c273ba2aadfbbe65c07ede4ac0e65fc0a37"
+        "a0139a6ecab296f58c6c2532701bb008bd9e1ecac2771d9384aca094537fcab47f3ef06" },
+    { NID_sect571k1, NID_sha384,
+        "d8a4aed87c316012482819b03a1d91691f2ad11a2f46082497ea8f64880d686891f7da55"
+        "0b2ac17199c657d4eb9d04d5cb8eaa180f743b87d23b1c86103f9e9bb60f4e19f0ff9d16"
+        "0f180aed7735130c03adb62502e69be5c624ed7bda2301f30580ae0921b02e103a638f56"
+        "23c02c186e3bfe6ff134c762a2bcac1f879a9353",
+        "0bdcc175eca3a399b944eb0334ff33c4fd130999c8ac0e7b52ac5b774fbad53ccc3a3102"
+        "4f5262b2eecfeb2104b14bb244307effe3dbe8ed25686dbf46a42c4b6f8e34010ad826a",
+        "0407ab1a9279a8408828c2bd21ae6c643ad82633d636d36fd91498cfee49c8a635313f56"
+        "993d02cc46da3f5b78fd243516cd23c14a4c8d79cf27dfcb05f52f0cee59cad5646a9389"
+        "b80799beb1ada93a48819ab70b74c36d2dcc3c5cca1f7a57ec58e643924c3ceb7a90c9cd"
+        "9bf7ec762a2c428d16ef431a45cd5d069cd828601f903cb0a28182af2392b5ad12ac3a24"
+        "c6",
+        "04ad8d2759df82dd70ebe9f3402d3d533a1b4635dfd0024deeee52b32373550f550b9fd4"
+        "126aaa6c3a9b1f352c40c86e13f78e259abb17f85f0041e0cca9e2ae59f4ee3ba2fbc83",
+        "1cf9ce41dd5dbc3bee9f46f82e4bef10cefe79a87e8e00d002097045b9acd46364560e0f"
+        "d27b0be6655e73b5cff272c8764b4c80ce0e1c91a94b8d05209a28b553f589ee2fa1b11",
+        "149fe587b144c37df2c48c2b7749c509421cfebab734003e51383cfb773c3ef5a24fbac0"
+        "255cb807f5b95607121c5848d3f9656227b61d5a14042351de084d9b88745be242b6158" },
+    { NID_sect571k1, NID_sha384,
+        "acbaa5ffc4eee0850075c0e502a70cc7a897a919f5e7bca4e798385601a26f411fdae546"
+        "6ba9f6b6d8d7f819a749b799fbf4a3bda9105063e74914e8583ed8b31ea4d22164bee6f1"
+        "4bf53afca269b901c80cb3265be32ffd4ca4bc4ddb83e11eff82ead6d75dc4aec8e5c67f"
+        "35d58a8a156cd1c0351abdccc0c5396c8fbe6920",
+        "007ab5a55a1d8ecb7f5dca2afdf9ef465569a4b0374716f604ad42a6e0271e934b09655e"
+        "8e2529784b69b2894bb399b02aeeae30e9e7ae70a2a8e56b9e775bd978a04c728e3951e",
+        "0402df88e368c8162c1dcea5ceee3a4c52cfc8d6121eb81c31236ba26dfd1874c61586d2"
+        "daacd96cb5ebc7053be57641bf53bf2651cfacf370cf470db86e1470bf285c7166c197e0"
+        "94030067763f9fa6a9082ea16dcbf53c2b6f11c9ba1817198e5a4e189dd98141ab682ba4"
+        "de0b3f873ae54efc080a2a03f755efeba3c0ade8ea67228b1a5a11d730302f1eb7c6bc37"
+        "37",
+        "0d3dd75ec61e0f87737812fe1ac86ba336b1512bb9f7ceac2c7d1a5b4d5dbafca57a5209"
+        "028cef9468ebdacb2a35988531baa094a1c901d9650f2c5d8e03a1621fb33ea85e2b506",
+        "184a98dec91b9afe52d4dd6b2d9f2d7e3c42e8e614332080aafd2621136ac7965beb4e8f"
+        "97b222c1b2e5448b79534db4e710331a2f877f8fc2a9259129f0b24d24289495da22542",
+        "0fa384a04c4b0b0745abea373aabc09404a6037f302e234e7a2840ff39c2b86ae37c814e"
+        "8bf3f3f7cf743748f2b88d02d66a3adef2028de94013c07075fb73f00555aa900337149" },
+    { NID_sect571k1, NID_sha384,
+        "9a57b63a4f418404e8f5dcf3052b9bc04a4f6d2c33bde8651506d9cbc5542ffb9023292d"
+        "ea463111fb78913ccdcd182faabbff9164219b8900c7f9fb394f7d9678f77b18f8d58526"
+        "ec64d7c1328953b983a7c416583e05a069cd76aefe26e5f5687b70abfbf9f58f052dc086"
+        "3b4fc3bef805cc3bb05bf76a83235af9d6adfe66",
+        "1e7d4da72b1d82e17a066fe387f2a0a7fa4c60ab993ee09710531789186077f2f32b42dd"
+        "da497d5fb57356383e1f96973df043307f0b6519430c3f0d40d62954032872fceb7dce9",
+        "04037c59e95132f0027f661511d1bedc3018bffa62aad7f44d7370f5b169d683882fca3d"
+        "d0c4260fa8f72a47a44fb0fdcf0d7776ff0632378022bdd223753c66f98dc04904344ac7"
+        "4102d7f19468b8e4f32eeeaabd6e402a35f38dbb9f2476cf07881d8bcff170b0a6e1ff8c"
+        "b1bfdcaff734a32ae9bf34a909ae7fee689e3f1ae777812a45dd46ce13fe648016353c6b"
+        "b7",
+        "18ad70fb9c5673e5a39b3a1655ff76eb84519555a6cd88e86a26f9448a54f04516c2449b"
+        "ab3f75e74a8d15c69926ac43fe01ebbe7e1c97e73870e3cc4c0ca431cf614f35659e3eb",
+        "12abdbfb2eb08e326289fdf5615057d912749db4f17848c1ac73bf6a51fbe3e1b2732d4e"
+        "b656715a6c459c6c3065b67b577f21b8eaca7d657c3b3171e8a4849f55024c69487e50d",
+        "09609da5049092e0aa8ebcf10c204de54c968b09b9bfb3eff90b80bc675d557967b35f52"
+        "e459f37fd198a83a858e5d7f9f5aff8b2ef7272b236dba5857e88515ed471a60bf6da49" },
+    { NID_sect571k1, NID_sha512,
+        "97b79c76d9c637f51294369e0bb52c4189f2fd3bd0607f91834aa71b3555605a89ff68e8"
+        "4fb5bda603f502f620e14e8b0c7affefafa2f0b303009ee99653ae4550a05315e551dd12"
+        "a4d8328279b8150d030b03c5650ed4f8d3ba7c3a5361f472f436b200b321e7863c771e20"
+        "ddd7bdf739c51de3676f953a5501e4477aed1bd8",
+        "15b7271d4319db5743119c8103a7d4c6d57e9c62f3eb93762156d2ebd159980aa57cea94"
+        "8e416717d715a2e458851f1b2e9ad4172bbcc53861db29c3ee0ba8e82617a5866170847",
+        "04003a5b9559b2058299161770166766aa65e151ac6a22a90205afd27de5eb99c5b1db36"
+        "9ad52f09141d3bf08884b96414c283b2669ec2a2a60c960a2f03d425dc4c229c0bb369d9"
+        "0f0024f3a9cf3dd257043dceefe6617a98e222e1cc820f3e19e63c64fdcf7ce8d9c7af73"
+        "23c9aaaef4df02e498597581082fa3767c8a38f508f4ca2c1eed6f298dc8142668a00274"
+        "90",
+        "0c585e425ae4a34f9b7b9205f095ea07599716f1eab1a8bbd934219ad760c4606ebbeb06"
+        "cbfd3952e045a040b8ce20603aea4f965d1b6e87eac7a61672823fb2de7767e3466c730",
+        "129162cce6fb05e1fc8630ec6c3a16d108bcd251719d89631497177e6fe6d1373f114ad9"
+        "dde6e04a4ee0b4747f91c78703012e5a058c132d54f2ccccfc0f9326b27d60322b497e4",
+        "140163edb5f3c4b49228e4614bfc6da9f73674eab82678ad9947b2a635f733dbce99ce32"
+        "09f613e2a75e62ed84db4d7d13de6d789b7cfedc0cb6a028d8316db8831db66c91791c5" },
+    { NID_sect571k1, NID_sha512,
+        "564ad0e37c9c37a60872a4780a723d08d1159ddc77bd834d74c1025cdf3cbd5338c3fc07"
+        "a904fcad9b979b2a2ceb1a0139af35e5112305fd662a57af6312624b9bdd3a64849f95f5"
+        "9a46ca8feb2ed56f87f258518947474c1729275c4d89b7dd286ed65f286cbac76002cc63"
+        "b92a73ab6bd13c4adef282f32297e441bdd8fd36",
+        "07219ea7917d174a5386df985d0dca798ac9f8e215ab2f0003aee929a2dbd91e37fedead"
+        "0ed95b1e8aabcf516bdf54337b4aff7ace4c6b3179f2e919a49db50a41c9d4d58d4f636",
+        "0402fd7f6ea770e0a6f1eeb3318b6b609c0e76ffeaa34e75f56910e8f658b70940cd7a59"
+        "18328473b279f882816955b2e3702c22e0b3e03863f8d99c64f3a2c9d1c68f59a28eaf25"
+        "ad06c2cca84218aa019326cadae9639069dd27df4d1e95a4c8e7d7cb426e70e2d38650b3"
+        "82e325dc3835afa719145d16a29e4ff67de37ac8949641f0d140072f59718450a6699732"
+        "06",
+        "03413376b32f18385cced4549e231e514eadfe05fffa0b252732f5c88d13d9c6e0c35be3"
+        "dbf72029be5e4573b8f8829f6efbf58a12b5c161bb7055d1944eecc93f82c12c5c56d9e",
+        "1c45c25f3e8eef9b92142f12e4119842122ed7672fdd82c14b3c34ade3243a4c50495c06"
+        "b5984d0260376c4fa44c60b2e34b0084066d693943071bb663a44884927352668efcc62",
+        "08cdac0f4498173bf4e59de98ac9a26fc2c752cfea7a5b75141d4e1d019e25d70a717ac3"
+        "ebb82884436ebe1007b0488c4ff29fa31fdf02f77fd99535c99b69c9d4e5f432516da77" },
+    { NID_sect571k1, NID_sha512,
+        "072ed5b14754fddaf54e20da42432df49bef38f4a3b1841b2db457ff86c44880727aca94"
+        "5770adb41269df41fc17f6a687bcaffaa45a3e59070526ed53b8dc3b78cf9a80a85461ea"
+        "f4b477e44d5ec4c2bab9c05aa747a5a520b35fd09e8b44539d060ba1c3470267e0dda111"
+        "b15dbb587614a46e1e477127f963a16cf3a43ee5",
+        "0bc623152253da24bf8d752bd78aedf7d5f6a2f889453ccdec14e10753335ea8bea83fd1"
+        "81a1f3680ed50f2324fbeaadae160cc85831750e021f3e44121ea1b1efc29a7d0069479",
+        "040003f3a6cc6964ab2f6da95c0a2a7b75afe4f77faff16fa28aa67809afd9495cde1f5d"
+        "ce079ec4e15ec8c1a2095a12e8adc409fe8729d865f50ff31ee75d7d807afd2c15cb142b"
+        "e9076b15c1ce931ba06dd56dd8e4f544425fba4f37f951a188c8e7eb13a2850c93b8ce60"
+        "f10b3783647a2d053e2764a957656a184a385e95c2013685d4954a2b2aa20e4a15dbc43b"
+        "78",
+        "1e091f4febd694879f78e83842572280daa48db65c463e66d9a7ea57b82fda531f116800"
+        "530a03cef2cf7e5be5eeb6e420213ff757c27b8e8a94513e417f4acc62adc02a76a4fdd",
+        "0264c499f7daa6ccaaf191d3502e86458ef088c9bf2ad989851c221364b24a1a3f4404fb"
+        "d0eb44a41938ac6ab67002faba0bdde7f44ffe6bc10def8317c4e2807c3ca711cb6cd33",
+        "1b91c18fc55635c5e3cff70503e7a49572ba52b11bac193230c88d6eb65eff6b2d9a01f5"
+        "3ab0eb34f5e208538136811157f872a8255b4d249b6ffe021b0c0763cde4d7a7e72b0b3" },
+    { NID_sect571k1, NID_sha512,
+        "e660dbdf3e61af39b83b95d3f1970f66d616f03273f7dddb98f768452b21cd39604a31cf"
+        "80590d4a5e4b0d4917519e10fd325dd4ab7a52d70d154506329baefe0d5816f514ae1094"
+        "83122b4fa8fa1ebd7fdf1fc4e21e8d278a50c05d81c8f489596633d949c6c8fea96fe914"
+        "30c01522a5afbd5042be8aa47da04581b2bd21cc",
+        "0645947d981d258f2954558c31022a3b6ba5fa7b675312f794cb61bfff1d9ce87267e4a1"
+        "dacb7c8fc58624d31c85ebe22f80d26a620fed5df5bf38515e0903f0b69a606048197d8",
+        "0402d03e05c4b555943fd69a299249e7148e99633b286da69bbcda64e7b06ce9321d62be"
+        "ad7b8d095a68d9a3ab9e9cf1aeb1d8c4904a073c21806830451a79fe7a907b32df15ea45"
+        "67023cba4f6f1815cbe1934734a901206596c6f482011f6cb6d452329f9412d2ef456642"
+        "9e7d35f2d247eaa7849ee141bb16914b64920fffe6b7923cfb19759fed6e1f80d6c40a0a"
+        "e5",
+        "18955bb752f0af7d7aaccd0628dcf1f52d836fb91dc78b0fecf21ff5992d9c1f891f0eb3"
+        "c139803b88736ce10ba4733a523854c4ae9ac35421beff9b20e0c8daf90bece46737579",
+        "110a428aa96277c9a13d4529f58ecc57cd7209a7340b4a78694dd9ec800f36c9c306221f"
+        "a110e0b3fd65b9dcb67307b7d7678997a3143c04ba96d72be83a1cd6b01ef22acd0f82c",
+        "0b7ae2da5cd36006a92a5b2e6369afc2728a93edc845ccb1500e551be361f8658819f7d3"
+        "eb82ad41d7f2beea1a1cab6f103238a6025acbf03a2b08339841694022c17db8c6c6886" },
+    { NID_sect571k1, NID_sha512,
+        "8c9acbdc431565feae60e08bc7da113e12372ed373f1e1fdd581f98c8a7b0c79ac4aa42c"
+        "7ffbc963fb4970fe26c5b5dd314b7051fe971c1186ebcb5650f7f7011a924de893f06961"
+        "b8c75da7bff331847feead4abd2e8b9d6ecbedac18f4eac207b948e6e4215e4d5cb483e5"
+        "c66ce7ad788cb89604d3a3e051539094079e7bdb",
+        "14cf93ca69d94ee8fbea0c8da9d76aea092b73073d8f5385b65c6dd4d567fe86bc2cfb8e"
+        "8be890c3c6cd9abf7dc3a17eaecee3d7a9455887863e496c48dc3e47821bd3d825b6bed",
+        "0403dfd1fac02ac4bd3e3017a3d94f29575238937824f80ba0b2eec185ce8c641e9fc721"
+        "94323c779dde8c4fd6e748e09d66e82c82add75106a0e1739f2b977d40ecd3cb15a1eca4"
+        "2006a73dd31226adba7ed8d08476b5af10a806fe8de72251400a83f6c9f6edf5e0cd6bd1"
+        "fa8f3595c3ab32b4c4548729c455e4eaf83230e1335cf181cfea6b6bfa6cd4ad75ac3278"
+        "cf",
+        "176972d9402d5d6c9753532e5ea907f256a872c100f87bd390c4d610bc00c408a97bd55d"
+        "ff2de1ef2fa8b9716e33a5a39bb6ed2ab541848685040656ad0468b360f42c3742c1fd0",
+        "00be28427524a3b0979cd82fea407463647a77ac45c489744a9998b545a13516abb9213a"
+        "b0d89a2f5f872d927ad48dfa502de95524f94f34b174933f3faa7b554a1c2c3a688a0ed",
+        "1d49594454516c1876f23f2ba0b1fa4dd8bee028bed5524b7635a2df5b8459f4832b3db5"
+        "f6074cf07c169cbfd9099a85ec2f5c42043c5b851c81a71c87affba34b11eda67e0ab69" },
+    { NID_sect571k1, NID_sha512,
+        "53ef87d6ac7b9698f40b3ea9f3442e7b64207b140b7f66f73fb7d5f8f98452d30a4e493b"
+        "6c0e3268371e88e612b818d4d847f032ed4983817d020411a52d81fd2a17b58ebdec199d"
+        "817c2a8ba77042bbd747a6fd4bcc7e844ea829fd8461b389aa0b5957d92962b6d4e86385"
+        "a8fbca90b8fac40944607117e9a4ef6dccb8fc1e",
+        "033feeaaaa28f16bfaf5ea9c7319cf4561ba4fc55327a8477b6cd58ef6ccad3962ee1f3e"
+        "db243f3a04e7e49c8e23509fa2d63252adb186b8bc7e9255cd61fa9bc45242d42da3a68",
+        "0406fc62c39bdd41ef7083ae10dad59e38dad217c55864a55a6a80bffe2f5e7da977d79d"
+        "b9ed8c9ac22d6f096129a0c680ac93fd77da4ad96e292a19b48454f91c93a3132559fecf"
+        "07066f1f737ad3af3df674637aa5efbb844bbc441966bae73973481628e5c2c67cb74553"
+        "a7c8f2c5fc478edd8265bd6c99d6ce122a245e46fbfc21992b950f04cbda5eb220261316"
+        "c5",
+        "0a5b86b76f98310a25111cc3d1b0b70fd0c20208cd0bfd8007cb569a187c3a97edd8e716"
+        "aac938900c3ad8ed3a0d091a18555ab532b50f25184454d84af2beafadf754862b8ec74",
+        "0de2eade32f537727eeb82dce610b48106b277d15d8fbdb77cd312ab9983ab21bed05f05"
+        "186a5cb2b530ba72c8c68b768c26d942f9224c6e6b9e7827c48e129833cb679c70aeb29",
+        "15e4fb92190bbf8dcf7548057d1bd5e5ec54a6edf54f6b88f50e96ac87ed7a7b7c0fe1e1"
+        "174ba3e822fb7e7c083948296cdcdcfbdc4bde036a07f84d210001ded91c554ace71efe" },
+    { NID_sect571k1, NID_sha512,
+        "dca1b7a9a313ead11c2d54739d9017ae27f9d08b3544e418aee862bb57e427636cb6aedd"
+        "a28e10f12aa15d2355f4f8ef112a86fec5dc46e6acef693cb8fc37c3e4885f3be3d3ab31"
+        "ea4d73a0de904e95c7135a149f77b621d642f9bd8ba192d39cfc58b6f19a797c4f3b4f3a"
+        "87054298e3ce5eda0ff7f44f8134c9a108285dfa",
+        "05613dfb53149bf5fdc4e08ccc1c752b0b66ab43aef2d008ed40f3df40fcbb2938d2c41e"
+        "3ea2dd4428aeba9059a97efe5593119673866a19d27a2ee37dd357e22b6bc849e7e22cc",
+        "0407ef12ccf6b64c7ca64b5da45937281ec770ede572b9a8eb685f3614bc358ce550195e"
+        "74666af9bb54379c1fe1304b76430d1e51a9976bba02e5781154c9bc187a31201ad99cb4"
+        "8e043d4ca20f06b26d75be1454e96f0568bd740165a2bc6e5b8429d557a79666bb7b9cfa"
+        "597d392cc5b8ecd180c37f9fe2088d7908e59ff644ab05568d974ab42ec9e01676e1b241"
+        "69",
+        "10b4b67007af35942216e9aab1d6561bf7684f334a80c7d909a6154cfde8ef06a148af10"
+        "4d534d7dda59b5cec7949de4086ae669edcc4d68b88347d2445edd3037525c97564ce78",
+        "15bfb47a27c6970fbb3256410d5c2f6c04eb308569a966790636899fdb3122f9e3015455"
+        "c4b50a6bd8cf519afc22ea845794f51e6994214feacf48322af48590d02cc9812960917",
+        "090c61f6c64381845491dac81d5273d58c59d9cfeed214527a52c8f23b0146431692a25c"
+        "bfd77abba22d4bc61ef24093c593c827ef645853bc8deef7c3b07bae919152b90c17f4d" },
+    { NID_sect571k1, NID_sha512,
+        "aff61d62c8f5c31bbb7d0a64a6ac589e918bbf2f13e7ad13abb9ac26405e267249a7c992"
+        "2139bc28140833e10976b87e91cf28285274b2b48b63d24ac94c85c70fafa78f8ad05955"
+        "c0ce6c02b841ee196dab12306e3e3d6138371217e2b474f7e67a80bbb78a47e374ffe2c9"
+        "f86292e471c551da50d46e7b5c8331029f369767",
+        "11b92c8b72b86c51903387a65aa206988d443d1988253329ad3a89c902ff1ef8cf73b7f2"
+        "e4aaa352443bcb833712d94c3e637ec12cbe4c2d4606878576b17fae1512fc77785b737",
+        "04022440b63bb4557996b63faf19d9f391c5085cdc2cda3755622a6cedc676222ceb5a56"
+        "ec36e220e507973c0f07e4b2e2d565a69967804ad311f0658a9854b1eddfb5270f4a86b7"
+        "69050199c9e443555123f153249cf7256dc3e82c5d8cb611adca0cd4fbb0a9a90296bfa7"
+        "70c1b0c0b43e4363b0227273a9ec9f00ecf83afc605b0dd2e5e24f739dd0b4ef6bb11950"
+        "a0",
+        "0e5ebd85f5fd9a9a81067fdf51b1906023e68672d160ddcedeb35787688dcdc314359ff5"
+        "347907b685a718ce38a69be17de292eaef189fb9ee8c63271bd6818904cd246503dd227",
+        "051387b0d057985dce86cb962bbca7d9a047f70d96c20539ae7d6b7cb8bffff606f03b83"
+        "15f15a53049c6c1c227f86d395c2217d32aec32bbd406c790a6cd2706775ed8a0ba1ebe",
+        "0c7f3b7e4a8b65a58c1280110f6c2486cd2d2df7d48b49074e98accdfca4a72fa7d43bc2"
+        "5c6576279f4a70f22c98135ba79158bcc3452940963b556304da8e1ae88973d827bee32" },
+    { NID_sect571k1, NID_sha512,
+        "721017294f17ef351e41256b57a64a79f3636628c4bcbe676ac9a2d96076b913dc4b246c"
+        "9945183ec9bd2d251441b5101eac44e2fa1bef59dec03ccd7fa5accf3b7d094d68dcf78c"
+        "8de4e2f19f56bf0dcb3b66b9421ec3f8b353b9fd74feb2e9affe0bf9aa421b6f03eeba3f"
+        "fd58fba56b3ebd094880e50de01ee62a108a24cf",
+        "0c3c90d5ce4375a08b85575faa78ee6bbd9e5571ce5a90582042617b807339c282cdc3b0"
+        "03d82006264b1c08c20af4ad4549fbde53d262facb98d923d81b8eb6093374b6a1e84cb",
+        "0401d900b4f64c07cb959049f2bfa18012f9bc2dccec5a73e9a48a9d5d65499e31ec4a16"
+        "15c4c50177c032d388263eba1a90e07ea68f081e10272e88a41389bd2626961b646c76ed"
+        "8e05c094fedfb5b118accd64d5d46ca2ed92b3123a62042a556ffee9e3bf709092fff882"
+        "31a26917d368db51d1959ad3285c7faac16ca57677651b070aa0abad96f07d35c5fb8a0e"
+        "e0",
+        "14d4070307cd269cc1a3c048ec0847edbff46f64c1ba5b734d8a800e50a0a02af57cf247"
+        "50d292e2c247ef1b860a9d7b5069a32f5b0546fe9e019e04af62316eb79507281fbef6d",
+        "1cda7f743c47ae93a9fa533145feab4c46252afabe3d54990663b5891b4979c645ccaa05"
+        "c744420ed6fa235952f370f5aa187250d7b069aea1123f19f0f18da18fde98100ff6ff0",
+        "180b4163f2eba6e3769d8345dd8cb003ea120164442efa885eda5bacd75f8d705b7f1bae"
+        "2976f67cdfe984430e36f93455ee7528fa6febfe92e42a002da165c63dba8fc589e7851" },
+    { NID_sect571k1, NID_sha512,
+        "e2d1f33681759adb7954bb5248b0db3c3885fea0d4c1c0c226eb1e6d2d3ef1b9ac281a0f"
+        "1c2fe5175b67114b6a501e2426d1454bd5790dcbc4c232cf06b017de8a9bb39e6033f1ed"
+        "b5003e8de3b44cc3d6150c3c952afb442952483cc688908337b7c1a8b5c9da70937ccfa9"
+        "8b2b0098c530ff848010b8e8ee0a8d65283481a8",
+        "10f184c16228d9034271332178ed485d10b6aa76003efc160d63fea26fbbdf5552205ac7"
+        "df0d8c852a1210cf0ba512f20b798827b36ad56b12a826fa7dc1db45aed264ca6822659",
+        "0402637543ed8a11271bbbabb2cf72999f65df0104758c2fd6fbf3e1c5132ff1c1111fa5"
+        "504ee86bed8f219d5025f8ae07055a7849314d2d439408ea2b2ddc40320c57f5d41255d0"
+        "a6014e360137ae33ce6930b844d42bcda4050b25f349e9e19fc4fe82f5e4f73cf9bb5021"
+        "2ea875a5735faaa1d5494f1685d6c8177448dbf356b408ffc2ba0726c9befb9de9f0cebe"
+        "32",
+        "1146574a96394c82972eed1ab7ec98bd08f27653c565f0626fecb431ee4fc6f830554df3"
+        "5fa62b5f82eaad49524d3d4b0598cc7a2181ce9860e271812373d21be9536fc181c3f12",
+        "0dbf465de2c5242fb527f6e4a4188adb96a2030ed8417cd9431365173f569bfdd3e420f8"
+        "6947da10a703370d7f38dc43e2249a2476690829545992645c9c83d82af8adae893780d",
+        "1499782e0163f80de68e3a580ed08fdec8d6552ec69f186a74be89480be28a0df6acdf7c"
+        "65a72f115f8a59fbc28bb94af64cb3bb3cab20bd25265237a010370d9a5c781c1e26f3c" },
+    { NID_sect571k1, NID_sha512,
+        "414fc5d2bd56b30040e105cb891788792da595583b11b8fcc7320f40dbf64d9263532dc5"
+        "7344dd17573c95eedf851668b5d552e8796af205f3a0043af1a829fabc2e93d9af9091fd"
+        "d9e0fcbcc9d6d9ec960aa60e4e2964c29a2f375400366480e513f63d124db7745847310e"
+        "69a38c8455e4e602056a6a4a14a8694155e0a9bf",
+        "181baf9d497159f837cba58a11ca435c442e5ca792ea559bff9f6a1f562c05bf6bb5914a"
+        "fbd1bcaea75b35f88bdd832314b249a5298622c89462344d3f28a44ba3d059df432fc71",
+        "0406f3915f884e250034db97327470197d13f0716d1d810e43055757460dc252f5281717"
+        "b3ef3fdd51085e65a0e073e78b697a21bc33137213981fc05d9b34caf7dca7a4f99be785"
+        "96047a96ab5ebec6201b7c65ce7a6e70effeaeea1c095a0172e9e2c7bfc88f7b05ea5750"
+        "76caeab189f810258373cff2484f4fb9c8167989f61aa61ae27113b5140c95f7faa505d2"
+        "d0",
+        "10e9e6047651362accc816389b26ea6befb0e34fe7363126f8c4ff9333266f46d63c4d45"
+        "075480da9ebdd0f8da7224b470d914ea1d68cd821f563b574bdeffdd0b3ed73ecb9133a",
+        "00e36644cf0861f45b333092d44fdd99f56e89bf3607f75a06920dfab0ccb1831208296a"
+        "a2431bdb75c5d50f15bbea2e13d185db6d7175c221858fd2b22afbeca7431c290b15d3f",
+        "023ee3b9ce817eb0a6733c85062cc3bc5f1ae62bdf3a74e3ec704baab05784dbb5ed01a6"
+        "a2a73c80a3e754c013ba886108d9eed2bc210f29a4774bfe5508ecd876ab47a8527c530" },
+    { NID_sect571k1, NID_sha512,
+        "3b592cc8972a4782870e079b82a50f84b4c2d8ca90bd500d1ce5678982e266c391c556d8"
+        "162ac3aab967154d072dbc0ba1dab5545cf2651753dee2881eca5abd412fe624bf3f9d17"
+        "d33692d21ce23ad15ccffdfd250cb1949e73c9e40a64ebebb03852e92692dad1d7baef97"
+        "fe109f35b7a492b343d4b643a4a7b1723eaecb64",
+        "083fae86ab96bce99a53e50b7eecff38e4e25b21c4b0f6a4986915de245eae24f16b6a00"
+        "a4db159ebc27f5a6a072da94ab6be5bf75f5eb3f75c4452bf4ea7014392eb1e02706fb4",
+        "04078003779e0287bee54df31f64c58951df7999b48b647a6bac416f844485a4cd7a53a6"
+        "4170f9d2d31fdef0194a0c262b90e5bd33a1782d2ad56c210cf80abb5fb118cffd71ad79"
+        "c1073f89ebdf0e255205a7525cc12b7e1c58303ac3b3417183179c216ab8e47f33d0af32"
+        "38e3ae64d418ee89ef3a2cb4bc67a1d2fb1923947b9dbf3f4fa39ff82327d0ce3db24d23"
+        "24",
+        "13d126fc4033f537b00a81372031026f6a7a2062863a68e36c6909c548833d1a8f5fb5fe"
+        "25c7d9f2c65b1dfa974630204f71e96d657095b93cb54b00cb88f32adc08eeff4036654",
+        "09be9f4bcd7b8ef111337fb665379509b8b17a2212a80d5fecc685f1f362c45f930acaef"
+        "9df47c33c6028cf7aae424264575b4635a11edd6b005ad26cf2021051501fdd1b77d2dd",
+        "0dd196343ef76bec527c5929e02fbd5d02d5b0a4b5f2c8561978e600856de56d42943f1d"
+        "74cb81b67010bae98de0efddfcddea5d354c60c1fa76138801f6cdc5bc932c136309b6c" },
+    { NID_sect571k1, NID_sha512,
+        "0079a02cbab3dc02601fcb5c8607d555beef7cd71a66911ab6514a4ae21c5a9c0e166f8c"
+        "f5fb198ec5a49a96e17cf041f35f00406b79270ebfe56dc6b8417d2529fd625686ffbc8f"
+        "69685aefa2fd30a937c02f25b48be4679e6fde821de928b33b12470867def874bb8c7c80"
+        "38ab6594346a2c44b39210d3610994ba60a05e06",
+        "1a663efa7bf4d8479bc535fad71e9b5e4f4281aec55967baa008ba17ac2f89cc3398d305"
+        "73edef29d590fddce8cb157f655e92779f59e7a18d0327d02e7daf4c1216143b3688fed",
+        "0406b4bb31856dc516be60a0d2d9f42508738edd4f925eca9c72a13cf136720867babb38"
+        "622fe97df70a1edb35735365f34c74baef9aca539aa1dfdead3324f41a16ca69bdf86b43"
+        "f706c4a91d3fac9e7647a6aec6e4369158bdcca2275866bcdc5a09b2f0f1eba10551da96"
+        "13eeb1e8d3233316b62a5f4641d6aaf669b975dfc511f2437d43c9eebe53c5115fb4741b"
+        "80",
+        "0a843d0cf776878fa9ceb163d7aaebd29ba3aea0808c3459036b258b99ccae4e2444bc32"
+        "11b5898c0769b7d7e036c07803497e13803132b3c6301412af3be8eb4a853e939a247a7",
+        "00356e282c096fe1690fdac4c0c66eda155ec42356dfc4783cff0160e1d76b33a99442d4"
+        "ee0e3f6e1c5bde4a16c8e18bd18f98a178c3fa4a560d8fb8b4b1d72663576f8baf8672f",
+        "0c5018c1383fc3847819726e1e940028892e1abd164b413293fe50f219f2059105218e4e"
+        "3b952b912a3258c4ae52dcc03ac5f027fdfa448a8d58e3aa5c21e790b3b47bdfbf21175" },
+    { NID_sect571k1, NID_sha512,
+        "88573bd94ef50459814806efa868ebf92b066fbc2f7a4be9d2fa06b9dc1a72f72d783a6b"
+        "cbc107b18a6314511bff217037a2252e7a5cd34cf9d5b2fe9c7846931f0133b2e95876cb"
+        "800dc4ed7c4a4e4cc4f1195acf99fb0ec224b1f8fa8af71f72d390eca9d6be3879032a31"
+        "8734a63fec336c79035a43f70271def10c4955d3",
+        "0088d1a2c0219696a94337cd56516252b74139ea0733b17fdcbf7692c3e5f6c3989e5da2"
+        "aaed7468e65a5d578571928ca273ec3b6aa72cd196f560f05095cdc8346e5d31c4c2e0c",
+        "040357801cec0888461ffde22d83afa9ca008ac88518f4b09074d29a846f5900e024a8e5"
+        "947bc25ed0e5c980a58fd5e9aadfbfab31db8bec575fe886deda80134d91b3de96254653"
+        "020710806c7ed33f6879374c59ea144326f5948980c8013144345c5070122c0ddb7e18e9"
+        "f752eadf2a9b0854dfb7d9b2f0d80ff0ba46197ce6017885939e9f59b642a8fa41639ea7"
+        "5e",
+        "16940f69013026bafb6f400c037272176b04e35e9f1563d382dc9982968a186e3e152577"
+        "5d27150b34b8ce5e70b537f0149ce1a521d056b52e75da7e39ee8a529ed987c70b8234d",
+        "199058e36449ee1a3388d7357c9c1020b2e4c02144aea14b041bc584a752c94fb6e47495"
+        "9b24bd2c0c104f5ecfe223ebdede672298c29195033aaad5db1852ce4dc3185ba2409a6",
+        "11f3defd9b442378c461e2c68b239d2e4afaed691238c5ac4e0be46ebd461639a60176f9"
+        "884133900f988e2d730d34df5e2bd8a14681014c0a213f8d233b3c50ae3064fc38d1a19" },
+    { NID_sect571k1, NID_sha512,
+        "d0e02045ece6e338cc8ab41d4a064c982ccb1748c48fc2fe0a6f10bdc876094358a6a90a"
+        "45facec798a83cc95c6795cf0f0d7c66b77e22cb114c1432bfdaa1485ff35b6a58107cac"
+        "3b7e58cb4f6c87c68db60b751e78f1fdfa54b8923b98caad0a4f31226956d065c083ace5"
+        "f1e9e91944dcca51879d782e40358d58ca758750",
+        "16cc8a0fd59455ed8d4de561fd518df2e008f7dfaa5f7f29ac2489a411e233917b43eb3e"
+        "be2596fc824be58871949545e667dbcf240dfb5e0c615ade0179d9ea2a1b1ebb8ab9384",
+        "0402477e678793593e2abe837961895c7ecef71af1feb882ff27cfbabfa0ba3ed771b792"
+        "23e7b2d2388efd371d5c325854cd60e48484f818e1a8146fbb780cd6ce06ba63c0db67df"
+        "8a001b696114838bb972ec6d536abd809d3a436650191c43b2bfeefab2b400d5921a7eb7"
+        "8e307266acc190e05f3869017f0a66f886bd6556c58aafb1042478cc768a4f86758e9f4c"
+        "32",
+        "1e1b851bb95d2913d6d35b756d49fba6f4c127dbed80fe4068260cab89c1d42f7a6843f7"
+        "31e83b379ccd8a4915d2e29550f3f6ccde607cd0b066dd5fa41ac2bf37bdcfc26cd4d04",
+        "10d4291346685fe070b267edad91154df83664dc115f058ea036c712929634d53662586b"
+        "b50cb6473c2170db5d4ee43be0c50532015937202e193d15d5189870691ba65aead7f3e",
+        "0b2a15f1ef00204bcfb5108d8f1da96ac3297aa041074b68989ff5b6b276380de7887753"
+        "fe3d416ba691ba0b2ad7fc065ace02815b2323fe17f6445b0fa66dba5d99d8e7d557cd5" },
+    { NID_sect233r1, NID_sha224,
+        "f1b67fde01e60e4bb7904d906e9436a330c5cb5721fd4e0a3c75b83dade868736bb1d21c"
+        "fb1b5c6407c373e386ee68ec2239b700e763728eb675a153b8ac44cf2a87be85fe8ed668"
+        "3430cf4b7d718891cbf8d583d0a37cc952cc25fe803a7aa4fda80f05541a2f1f2601cdd0"
+        "c095f7110f2a84f7d641b8531572269b21cbe77b",
+        "056673197bfeea9bd7a8b820b4ae51a50411bf118a692bb9ed3d304da53",
+        "04003489be62e53910c20cb508de019c3e326f65051f26749944b4454f156a00f775ac38"
+        "baf19499675725e8190aeea16f52346b1c890d9583b38c7521",
+        "0a6c9914a55ef763913273b062475fd0188eb2d5af9c8c1dd97cb3cefc3",
+        "08601a42d7f7eb047e8ed9820ddce665c7277f8ef38c880b57109b7160d",
+        "026d6f50f0508953657df5d753c595ffb8e1c19f8d092f8ce8db54f76d0" },
+    { NID_sect233r1, NID_sha224,
+        "1d496d96b533c632ed6a91f6e3653cdffaa5b8cc0008b35e49b2dd52fe261105c2ec7ee7"
+        "1a4ad5d51fdc3d36d688a3b7ccb3b3b0c3a65be17b8d8aa172e3005cfbf37a2d1b1a6e26"
+        "8c090c6f318e7e96f9ec9b9f5a8fbcc7558d89e840f7e76e44bed91c26ca48e6f5cbc253"
+        "ca2fe8cb81c484cabd24070e488f9c00cd96ad4f",
+        "0468f01d483144e514ec257f2e5fdee28a927f2adb19714c1f3524dd0d3",
+        "04016b3cad89cc42b80bb730431963526e26ae3b415b421575dfb6ed973e1701acaf7de0"
+        "6e20262efae01fc80969cdc1a281f68e8c8bc0d2d4fbba3a3d",
+        "04d261304678301985f5bb3f6ae465f11c9fe0e5031b31f194969252703",
+        "0878a87b2867c03f55726ea2a6db822788f4aa4e9ef609997940ee8c8b6",
+        "03545153f0554a8f55301d4b948043de3057cace62c8032c8ef8a11dbf8" },
+    { NID_sect233r1, NID_sha224,
+        "723400655027f474446843645757f7e2cd466bf97275067b4bc4c9d79bb3b19b2421835d"
+        "69db916f24b77c381fa771fc1e7a19d2b4d09411ae55acccc615b16fd24705762b441ab6"
+        "7083a921fd4ae569ce0de69449aa96f5b977ac7dc022fdc8335656853796f54b3fbd1185"
+        "77f98920624eb0a00204f1ef83827245c06646cc",
+        "074052d027f05465a8083a59cdbf32600224e1f563f653b34314651517f",
+        "04006999290db440eb5b3291bd4bb4a1af6386654fc4d275ef136c0e03dbca01fed0b1f9"
+        "284e488c7fa2a010766c340bc25dc132c7679c2598e423c3c6",
+        "06e38460379ac3fb13f64d4de654d4fa30bd8178da0bfc29fab2a1e2e39",
+        "01b18bafe55e5c24fa2df4c09112b44d24e78dd09557349ceb1b916d280",
+        "0ad7cfa003267a6b7a99894f75720cedc9cbf820d355a6b840709f42f62" },
+    { NID_sect233r1, NID_sha224,
+        "155860cb31a142082bcc0bad828d747e916392d21f1873b3a3c1d28ca3ff9d45ddb66a71"
+        "2e3856b6afd07c8d2b2a7badab296a9775b03f6fec0befa2d8d6d00fe3938df244ab46e8"
+        "36a3e686c8b4f918da49f0bb3940bba34a9aa22c7caf02df7758b0de01d9f47af6146344"
+        "b9be3842d9c055eaf0fb399cd8db95c544a62d8a",
+        "01856e7544223f55f80de72a6ef3822fa8fbd68eb397d06e2d76ddd35e0",
+        "0401a117e52f09080625f85fbaad8ebe0d3ad410f034242bf48365e88ff7350008b8bb79"
+        "58d191265901a3f15b2919142505efeea13df6e42da8b0dc1d",
+        "0aa106ad1461353865706bee9aa092b00fcf1b0108ecc1266ad5d8b6579",
+        "0bd6fcf49029df32fe0fa47f39cb9428d95d00a84a5afb392d7b4b365e0",
+        "0b17734befefebf03d1c79e59c12ed3c57e7d120dfd993bf276de559588" },
+    { NID_sect233r1, NID_sha224,
+        "cbd6e305cc9f0dc90caee6e65a74582e9357bd25c78e33a7b14e1ac7e9397ff4466f192f"
+        "b432143e6df6d61a0ab808ec0a361a6d95a357a38cd3e241fe03ed883ccc364b248ee2a0"
+        "8702110745c2688bdcefa33c1a45b9c8b200e45cddf3e3f66b8d37eff07fbb3366ea1558"
+        "ef304085613c56707095724b3e134c7a7d3f8dbf",
+        "0860aa2b589f2defc617be73e191502e5d9952bf60547fef19eeccbca26",
+        "04006abc5619422b7d548c612e54df0385c293632d4d97c21e2e15ad98d0c5006c36c072"
+        "603681c1b03f6a023c8e987f39d931bc2a200eff82239ee38f",
+        "084fb252dae9a96a44212d18e15cc52d179cd5e3392ab9da57d04cd5a9d",
+        "037cd554e7815699f033ca9187ddb116777ef847b92353f613152c4216b",
+        "05f806dd062043420dd056998bdb9822b3177406a536d766c4aacdeee81" },
+    { NID_sect233r1, NID_sha224,
+        "812a218ff1ee1472c189f63386e5b8ab341671c3a4dad27a8c6249d1c0f9a29338b471b6"
+        "179f17a078b6504e804ac55ca3b13e68a623041bc1a092ea2adf3fa1124bbfeb161e6d7c"
+        "483433f1548763b84da00352a6386e1339f674d45dab13898147ede468e0e01d2c4e0ed6"
+        "6b395a16cc3ded3e952ac739205f35a83376cbce",
+        "0d0dec052a00ccebd0c0c5d9a08272f75744a2582cec7ddd924a2b022b2",
+        "04016bb8c3d319b93731f1055756e57bd56d50b6b9ffbe42735925cf6f7675009dad7b87"
+        "a749df130b45d9cac8011101c15abb7e64bd4fbdd94107fa31",
+        "04098547601430c723ebcb04b23e0f1ce8b1f79ff7ed3d05ba130922b01",
+        "070ea6221c0d62930b019faaa856ad2c84c3989ec54040bffc42d8dadb8",
+        "0aa20fc58beae8ccc880e7fcb48a471faa5baeb36bbe5aee71ed9f8adb9" },
+    { NID_sect233r1, NID_sha224,
+        "0204b1fca831919e89e108cf140b3770f531a696b1d9a4d1fb68809eb10afccc257cc90c"
+        "d36717c02b2f3d6d3d1d8a93cc5c48aa7ab9f9fddfe121ce9143376535a0c65e247c6558"
+        "eac49fd1d6d1bf431ba918c471cb3d536ad485ec51f6471a340ac75f160c4c54cd3ffb9d"
+        "cc123124b42df1fd2eaa005e3377c5d2d55938c6",
+        "08a017d717d6d1213f2b74c53281b07258738c0c7db649ea1ac46b9a3b6",
+        "0401eb379e27de6c04c5320cbc18e79ed9e8993710ac70ce823f1ab5762b6700f5521926"
+        "45d350361762aae79ffba39c33c2c5c0df208219f1b339016a",
+        "00e4822b2cffa327a8396301b21554da6fa52f418d67114bd58e850d935",
+        "0d64dbdadb4ada2d3a8892049f7fda3c733030522b44cd72ab850b77bd0",
+        "06fbae2d8e4fc04abd8a6e9cb011974ac851ec108e38f9c72603f7a04fc" },
+    { NID_sect233r1, NID_sha224,
+        "2033eb48756638cb56e2cc39a3e775cfa11fce86cf71f04487dcdbc7f262bc8350a30ced"
+        "54d1fcb697b28a6e96f88f782947c997872307ed963e1d68985f756435af77f57755cacb"
+        "b4c6b50ed419deec9f39f0a549a13e54254fa0a5832dba2d943ad4aed8688889a2dd29dc"
+        "b4ea12abd6a6c50eabcb3981c3a0c1ca5f0b9629",
+        "01b56c14442b084cfd22aeef0f8028ec57c8b571c9fc1e43de05c45e47f",
+        "0400d450c533b13b211b8c91dad0738402a5c811460426ee2f35ae068f2c12015e1c9f9d"
+        "398925c619f8aa0bac746eb7907d3d510814cea185a7efe771",
+        "0dca09773730a2758b7f4d9257a8e6bd942c141e46bde5ca54a79468c4f",
+        "0379773ebb7a2860f3422d8f8f714b234e5abd8860defb19c659c9c6179",
+        "0cb9272a27661604425ab84632f586048483b9f9cb80b9697898e745117" },
+    { NID_sect233r1, NID_sha224,
+        "2986ab1cfe8873009e932dc68d4727d77ccbbf378e43fe4aa7c54416346b036b89c0aad1"
+        "b82977c9fbc39a00f1dc916c0561d8dd70298c02b6cbfe572e0ef2058641e841c6875e85"
+        "15f3c1082765e046c90c956d984b76e0e8e6eb433ce26c1757ac5b13422479141971c201"
+        "02e9621d18f51096ae3173c2753facee2862d66e",
+        "05afce37c5594586ac46a34ae291f591eacb9880a7de92701977f447fbf",
+        "04002a069ef14f2989d2b715c5006642ba966cc84df88bbc27e713e15c47bd00f001f60b"
+        "8a8102a971faa2c42d3ea9cec37b49c7e6ec0cae9f7fb35713",
+        "09756db630ed9b708bf1ab8aae6a7559bc235c4e9f4002ed26e2f019aa1",
+        "06b9b2c1d214373647d9a2d24ba69741218064004614368915d5cfaacaf",
+        "090dd607329c27483fe43b7be137c3f51c23217c939baae40b53e65af2f" },
+    { NID_sect233r1, NID_sha224,
+        "aabf5aa90ceef91c2155f90660adbcb0eedb996f5242cee15468ae217058ebeaad8cd4ff"
+        "8cdc754a8ab85ba43c59fbab6386686fad5e27ad3848fe52191c7e4b203720841501792a"
+        "625aef2acb6e36493b792fa55f253effca682946ad8c77e01f44e92ec3c258d0dd98d318"
+        "3f4dc4a0bd3eca183794abd6232a6f9e4add8f57",
+        "00696df05dc7a54a9908a73eb18416a155cc8df4ab26032539d86eae537",
+        "04008f9f494ddf8d0030746a8c0b8d215dda6cc2724f411a7ea407629294c301ea2e9f85"
+        "f06412d29c677aecf624a83c2fbd86482dc0d564906a91d97d",
+        "0d62b06628d3884f0a329a7b6b4f832fabea4ebc85ee03e63f2967e7810",
+        "02e39824f272d4b74810594810957963c777207217e53a672010605b9de",
+        "0e64bc44af64b6f879f0d32f814acfbb98795ef7b2f246b3f91cacb55cc" },
+    { NID_sect233r1, NID_sha224,
+        "29ff209eabbde02b10b3fd559671fa53e418750c32c4a18d31cc0186d1077581bbefb877"
+        "0ed079f536e866414a07431ae6633955bf42a2389b6f8a565d6e4ffb4444336e00300938"
+        "76a26d4e3106e9ac697788e41f8a21c755eeb86a7c60f18e5e1069f16408a4c375a6a68d"
+        "42959f2fab7ac09736c7b37c80c05897d8566ce8",
+        "05ca31e88c5b2e96e433af2023a66095161710628e7bfa428944d6676b8",
+        "04008232d4bbe25536ea7f83c145a8d2b1cd72c383eefc2adaa1ce72c7dd9a0100b738c6"
+        "f1551b3240293ee8e8ec29fad0cc485ffc2cfded96b68162bb",
+        "0df9e1b418ca1d41d749ee998446ba1cc54bc8bf72eac6f30929b40b5c9",
+        "0d4248e0bb60fe46abf7bdb2effe804b9d394d8a5514a5791e149d435d3",
+        "0b89a459fb99cccebda754c4b2ae264c9aef7b5b610427f42c35dbe7d3a" },
+    { NID_sect233r1, NID_sha224,
+        "97765d876c80819f4004a36d09ccba78e600efc71eb7e869d3a00f658d2ace6769c7ab1e"
+        "f590f41fb070aa8e08615e138df45ffbb6473d4a86ba5fdf17dd6dc9ea9ee19c0332563c"
+        "99e6a3451c211d286d69102b47bfa6e07d468d9bde82e5c2063fb1ebbbed6086f542cf68"
+        "ba46d4f214634afb1146dd5a6f3d50912ef5b824",
+        "0ef8fe84727a2ad8bf4e646ef28a492adfaf785a3a2ba6e6f985c649a8c",
+        "04003435eb25ce9891a78c120098992c666940103eefd80d9bd64f1d4ba37b00ddd6a4a0"
+        "1e443c92afbc247f634b85f1c858a2aaad35a26f57ad4c9126",
+        "09753a236759eb32e13f19b9d2ad06f7b4db4ac7b1df96813463d0cd557",
+        "08408fc46149dcce0753d7cae0f50c8c5fcc97acf7a1a02a9f68c0b80c7",
+        "0b5ffba104acc6d0cba87523382ff928859718122c4d0d2298e74985d89" },
+    { NID_sect233r1, NID_sha224,
+        "21cf768d087d1e4eaa8a05e2008020e243116206d675c09be42ef2bc93617ecbb0575c87"
+        "3c6510ede9979215531b62126552738862fc4323d487992754e39d8f0d7e111e165ff254"
+        "200e05082f59a57ef649bccaef6f980094fad3b7ef93bceb161760e200f0a2e396fbb6b6"
+        "142dc84d872311bf932b84616b22231747937d58",
+        "03edb94b8c62f9af30c14a790c0f5d65e362a21cd8569b9725916d534c0",
+        "040065133691b888cd2513964b5a905ed9334cff6367e25c09db1743045d5801408e1ac7"
+        "21bfe2198086c1834d484b6e5692c037e09928cff87f4b5a88",
+        "01d8f800ba05d8173b0f1bb3aac0aff68c6b24cf98c28f5a69b0b5a52cf",
+        "097c07d4352e39e1878c42fe97ebd4c3ba5098706879fad9be4bb2dc2f7",
+        "0bc669db3a488e613665cd26da7927c6b6a073ba6b0951c00d22ab1ffd1" },
+    { NID_sect233r1, NID_sha224,
+        "7b8e58eecdab3e40212bba6bf284f9379265b3d2baec3e4625aa08d0ced851da193c292e"
+        "c793dab42732c07b4e94d8b19c83aed796a7e3a6c2b954a7a9a1ff9b2bd4ca62592c8b68"
+        "f709f1ad38a5c8033ebb3f33d176945bfc68e9ef2b0cee2d45a13ce89d238a33c09ce2c0"
+        "c63c4233aba5717b85c4c161dd7648a41a5e39d8",
+        "00a7519be62562318da1b67d22cf8e720353d22641e0cee11c7a352bb93",
+        "04013b63dd8ca9044a3e518a67999a781a5b62994b6e20454003a9bdb8715c01a2f9bfaf"
+        "528b7f5bc8c3b02eccb71666c83e4a598b4077de999d90fe27",
+        "0992ba1a8331bc4d88be7dee06f96098bc2ea56668f345e187f32f38171",
+        "0c55b45bc7bc3092ffa82234b06ad45525b45f8904011f1bd6cd356f0cc",
+        "0e6163e70ab56d43fa27211b98b48f1cade127237bec1c6556020d39990" },
+    { NID_sect233r1, NID_sha224,
+        "f8f268d2b04fe47e5052c8d0d653787384b9654f0bd2138a6f52b80713feeed452b976a9"
+        "0eea4edcfbb62d04f3eafe172ddebd7cdc3701ecd6008e3d82e8eb217b13b5228839f610"
+        "75159f3bd1e1409c08903874b6dfee2789dd72c208ae769ec8c7d52552a2b1fd73dad24d"
+        "e8b571f88e2184d0ee7d063a121187f97e746f2f",
+        "0264022fd7dc2328a6436b522793ad9406d7a586667a0daaf1bce927338",
+        "04012d7e7f8519a7e357510adfca2f50182dc5fa12fb2a77409fb781ed500d00ceaa9a22"
+        "b7ef9febd8a9962ce21d83fd2a2a938b9d7a78d669dd233974",
+        "026fb8fa6e746106500dd29ee32bbd03b94302ec3a123356b23b3055e51",
+        "0f416418f7aa4d437e7606afedf961b968a67d9a1524d60fe3f6df4d3d0",
+        "08d3afc975a8147fa8230fef4b16e3024180a9768702038f955357ce8df" },
+    { NID_sect233r1, NID_sha256,
+        "d288768cbd066fad4bb2500b5683fa9e4eaedfb3dbb519b083f6b802efda0a022355565c"
+        "5fc6babeccb22f3adbbda450ce5d633193d1431e40c0fe631a295cf85965cd3f5937b318"
+        "66bd6a5300eaef9941daf54d49832acfceed90e572ef34ccc94eacd0fd6b903fee3c572b"
+        "963d21e2881656a214d2a4c125778dbe3bbeebca",
+        "0da43214e2efb7892cc1ccde6723946d2a8248a6b4d6c8872fad525ec3b",
+        "0400db09738bf0a0dd777f67e82be50dc8c2d8e91598bc0b8d4486f67c04a5008ef463e2"
+        "f37ac7c3d276676cbedf17ae11e767ec577da7ccd90cde3b74",
+        "0249cbd55e307a0fd10a0c70b1c0d5e2416f4d7f144779ddc11911f4a08",
+        "04d1c99f9d486fb92b132d68c0173df891ca757572f7acc03cb41d46bbf",
+        "07de2deeb58d55d65fb37f600d916cfa49f889f02ef53dcce412703d1c9" },
+    { NID_sect233r1, NID_sha256,
+        "bf0ab46e0a756c11229b0ea961f8d57218be5b00ab8b0e91d7664cdf5e0341c412c0e992"
+        "d26ab12115197db39df2d1a6e18ed26a91be461432a2dfc21d98cb16003e339b0b0b1f10"
+        "0e4e6f4824ddac5442f22a1fac26326ed8a89cc91343d7223986d485cc8c64424e84d56b"
+        "e536c57e4dc5faee459b1958efd79e07e90a9811",
+        "0aeafa49d776b61f6a30d66ff64bd40dd8d79891dd5293c1b5cd3b46a7c",
+        "0401ba1b87b16122e6939da5dcadb8902177a9f9ef09194c8695008b80b588008f51ee5c"
+        "ea1f4fc9c44c70df57326ff121268bf4e02cd9b2626fe7c1ed",
+        "09d640ede5bb60b9aa78e393ed453b1643f6dade4aa20e994db53e81fac",
+        "0277bbfb7479077d5fb6813670fbc7f46055718199550130b122a7cb8b3",
+        "0f8dd350bc0bd2d84cdd374c56ff2341de4102269a1e80df7e35969d4cf" },
+    { NID_sect233r1, NID_sha256,
+        "c7b1eeb7c19eb16e7f42b61d79e421b71de797a6cab4e0baee522fee7acdb533f7bbf585"
+        "5316544e1b82b4f2a18ad0a2311e7622549332122171f32fc62a90e408207e0fb90d1b05"
+        "2821dede9c41b15b6e07d84d5d7b9e31e6396a8ed229fb6232b3051298dc5321aa589f4e"
+        "289d27169f14c8cc93644916d9b72dbc92c43488",
+        "0e95db309f4305b621f51f93588a2678cb19aad0932f365fa0aaa3a3895",
+        "0401177eefc44b6070e2c41537e75c91e2f08908c0d950bc90cd2f4720b33500f751312d"
+        "de55b1bcabf31665deb6c12d043d5ccc89800622a557a7ed37",
+        "00015798ef57a771d62d194389817c93de1b225398fcc0d2b81d94054a0",
+        "0eef7161a167f69a6c89b0f173db2c4a7033b5d801c0d89642ce65e377b",
+        "04043f8985bbe0221fd595f9355c33e1930b5e10a1452e81c31259e1e3d" },
+    { NID_sect233r1, NID_sha256,
+        "a738eb074e1f277dc665118ca055e6328059ab26da188c16f56384c566e43df8cff3d2a1"
+        "0d2d15c3c1406de8f734b20be5dd1ce937a4289f0ddfd7bddabd03586556eb8233b8feef"
+        "edaa1f49bdec6d45fd562c2a83fa9fcfc2013bdd77900857199e51fa9c7cbeab925ba8f6"
+        "c3c5fae46bf8e9c574b302f1e5f9c44400152a78",
+        "0d4319cc8e409b8755880827f3200d3f0f1c64d6356fe74eb1f5aa42499",
+        "0400bf65953f2d08477f7fd0428c31125184e3bad4d5da00c91991949e056200f1669d0d"
+        "116817d625128ae764b3fde956432552d24d98f08a12925afc",
+        "05e8704febc38bb8ea76f3c6433c1f0421dc5e5af959723a5a2f0e9a970",
+        "0307c0b838c65d1a47792cb367253bf7c9f627435f1c7ed74494b318446",
+        "00031a9b35e935be6620243f4878a38d4e617fb25f7a4883893366f39cd" },
+    { NID_sect233r1, NID_sha256,
+        "b28103d77e5457c42e026e713ea6ff03722a36512da17197140117442a976f9e2139c54a"
+        "759fc26af5811b455e5a0d3a95362d9939c1e738045be9237b469ae2106ceed7e7842b44"
+        "cc0a475d5af6d781e32ff1dd1f4e1833dbc7f82b27dc7e1562d0e29213fd8911105104a7"
+        "a16f665b926aa137f70d868c90e72f8ee2c95b64",
+        "09e556c945052e5954915c773b2d47970c521fcc99139269c3ef46093b7",
+        "0400db68c16ffe64bede4a849812df0b8e202f74500cb7d5349aacf7f3f0260084b5892e"
+        "a74835e96e9dfb1bb201a4dcaf32da25dc00dca019d806f5c9",
+        "0d0c9e0b6d4526d5f6494d2c72f812fb8d26e17c7a44f6b5e3f9e684cad",
+        "0a379ac253f3aaf94cc49e91fe3f2908107a9e1a4d102e02395eb18cf08",
+        "0854c2f6ecbfe95cfd14045faf71ad47561e365c1dd5f515d8817c3198e" },
+    { NID_sect233r1, NID_sha256,
+        "463d04c84521ae671bb35c0a7acb3ae509b1b0470f39b8fe7ae5f3c9fbadbeb2bcc3a87e"
+        "284cbdff07407a351f7ba743aeac50c4a1fef7375b90eb4af8ea2df040776bbf3e4389e7"
+        "a80bea40530842642b9895ab9ef5ac8ed6c9ce7917d7b3ebcf80b801da845943313988c1"
+        "970e7748cc306f914c37414f8247d648b580000f",
+        "0becc76f8a77615c4f92ae1f91645bf5bb908e75ef22fd544aae63a3c8e",
+        "04018cd93bfe8fc8ceef2b9be14fa947b60fb122f5099cb5bcfad0cdc601e8016de11e67"
+        "3011e30f6fd92025a60d7938412ac63b19d23e45bbf53c6c4a",
+        "04e75a7b92c42ba0581eb1201fa5b3fb2ac82460e953c26ce6bc60e145f",
+        "067bad23ecac0883d218b1368d822b3bf9b82453c0e5f3e336777c6a507",
+        "03788a331249463533384a61c47232aee6f057634c37560ee25895b2a03" },
+    { NID_sect233r1, NID_sha256,
+        "8b2379b5553ae7db6023cb010e26ae91322bc3f94dbaa369481936f90a886e5d3827d995"
+        "ccf03ca59f46805fbac0337d31a8f117cc7044218a934d5bf507090e7e21178a7162c8fc"
+        "b39111e6967803dbf9d752f3ae737ba024d0f4f7627e08be58efbe997a164106bfe37f67"
+        "d2f19c0fcc7a6c7eebd96a72582a9c7bdf881896",
+        "020572c2a3dc3ea430cd8cde9d642081c21658e8bda165550cd9a5d37d9",
+        "04016117486794f14d171dfc3ccffef0396cc9fe5aa45d6d39ce0f252c416801b6a12fe2"
+        "adb279dbbefa4eafa273a2ddbafb2c6401067a5ef5e859fdcc",
+        "0edc8d0b64496da309b10630e9e5917c9a807ccd7cc7bab14360873eeab",
+        "0e1fdd3b7849806fe587ad93aef737ba0472409b7239981f0d325785fa2",
+        "0829449a0c39071a832664e8148e762efc36fda9e030e0d062458728273" },
+    { NID_sect233r1, NID_sha256,
+        "3090bf7373731cc44c00372c1ac59280b0f36e627ccf763fa68a7be37bb0ac8cbd4f70db"
+        "54fc652566c78ad268f78f015e4bb1e41516fa56ac303a3bb4a52e1fe897d8338db5a6e3"
+        "7cad685e704b994504bd231c7dec0002dbd907a7ebfa809833e32eb23fffdb44fe4a18e1"
+        "1fa19d67356cfd703cf39a75b1a290b8a7c73afb",
+        "0769cfbf2dd8248ea1e0ac9b275c9d6ddcf923fe762079b9ed62ccbaa89",
+        "0401aadeee0e31ba9505da3e195d883643d260dac9fe5e86102c8ed7f88eef00d925bd5f"
+        "d700fcdec60cef9c9fdd304faa102d9d721b4f21291f8c96a4",
+        "0f2e203410107c075e25c4adc2f55dcc277883d679ea307df7d52060fa3",
+        "02fc0975c2e70328da4a0ad2b8bd344a8171c2c500c55b1c92270230c27",
+        "08871b6791f7d03796a3aa537fa820f0eac8f2463c9f918468e7588b784" },
+    { NID_sect233r1, NID_sha256,
+        "c37389cbe3f46eeebdda343e354ccd543e96b0c2a87e057aa6b9c4895a403de706d658bb"
+        "c9066c140e50fef4b56af2db1f42efb70b8021254649983f1e11d04d6b10169d5a1c2093"
+        "b6ab89227b88a30537c776bb7575749c3ed87bcb29effd8e4f17915b4d5dff6cab9678d8"
+        "8f33abead1e73dbdc5c3307ff3d3b2d5fd7bfa83",
+        "040ea4a37b388f0cc464f7e2bf92173107b268ff77a8acf5f517b4ec0e4",
+        "04008acee84d29638a7285654d20f8e0653c7386140aba0bd2fc157d51764301482ba5eb"
+        "b82ba46654aa1eaa6a5f01e030177318921a0c99fa3f6eee9f",
+        "0a6fbf938e9cdd009c838196ffeb61f7f545f7e7e9a6cb18d1f595a87b1",
+        "096a80172a7b3b65c0a8acfa8b89cedf9cb19f6eaa5d38436c300b7c0f4",
+        "0b7bb96ddfc9d1324bea96836c557cf88d6ede9a93ada8fbfdfcfe56244" },
+    { NID_sect233r1, NID_sha256,
+        "8884def8c3b9c5f856b9c2352c85ea71aae3c8d0e84ca74e70e404a21467159fc9826548"
+        "d16dd1ec5a75dc2c23ca37b30312f25e1194e0f9385a0499db34c855412bbf58979ffce7"
+        "fc3afeb7b8dbf9898df44023200d809f520db99eae315b5cf85674fab008a20340fae8f6"
+        "974034fd3e55bf08c5522a460680218f9757e368",
+        "037fc7898df9b37b5390537352f5c0b8de22659166c19d7d4df31c3938d",
+        "040198674b40d2a68ed94d5b2c51102393d1332404f75187130669b9de0df9013ee77d85"
+        "4a60f1aa74041ef1fb58727c09f13039bb4b33a818dfe9af2a",
+        "0cf92eebec59605b1d45848f5d06e93ff2767dfa282929208ba801a9fec",
+        "0f7bd93dd4df06219fb974a4e85030840c7d4877f131adccbd98cbd25de",
+        "0c2c4a864459488eb5498a06b0b56ce7fc98fb29b1eb9b6238da8cc8f52" },
+    { NID_sect233r1, NID_sha256,
+        "f1fc154d469433f56c2bd42aa52237a4a4bfc08fb6d2f3f0da70a62f54e94e3f29c629c8"
+        "37e7adf0474fa8f23251b9b349a16848942c0d9cf5db1d0fd99527020dbe21cf0b94a9aa"
+        "21f376bf74da72d36f87b306b0696771efa7250c6182b426a4500ac14de4a1804b38db8d"
+        "4f3beefb8c9bb619ac82cb63fb37c2e1d22951f7",
+        "05d5069425e7a9925d2cfc6360a708147b2c1b55ede243591885147ef3b",
+        "0401f35f161ce0963dca70066b3a6de2a74ea1941a27cdfabd9e433d8084c701d5d9cca5"
+        "b741b2321d8511a777fcc2515c99ff8d13ff20266a163c94b9",
+        "01b9c83d36ada7e9367790ee850163ef4420104e0dd3299ef6d65191d7c",
+        "0dca4e804bf74aa496c15025acb4232c637c9b81e9e26d6f2065d6be21d",
+        "012014f77a4ddb7b266abf2c65a653988ee6f913e700f3f83f3e78c88ab" },
+    { NID_sect233r1, NID_sha256,
+        "885cd348f7983a0721f96c0e866821223d3e5a95178b16d18652b4062b1b2278aed6f54a"
+        "b06f7e37ae6ce1020aa3eb812d215194bcd212302da5b971fd86aee1dcb23057dbedb569"
+        "bd0bbef80df538da69ae2358cb03bb77c64d3ead475c8c5ae5bfbdd75684b421a26f1a7b"
+        "0c37548fa32d805acdc91230dd70a48232a12846",
+        "0ffe3e7b82ca62b96e057ee072a4718ca20a6cc9a3e51e4fe8ed7b4b9f9",
+        "04010f774adc83c1893894855366f1db1962bc697b8e1d047a01a08b12da4a0078c6ff63"
+        "4d5dc8ffc4d8b1a53bbf94046023095a8c2b41618c4330a4de",
+        "005a4a50de4e97280d6ed1324214d91b271deb649a2dae18d21a0182022",
+        "04bc8ba9ffbca81b5f19f0d8b1306900ee642bc5cd9a9dc9867a4531b04",
+        "0353567acc062b83459017c70cff4f3b8ef0925032b51d7300261408549" },
+    { NID_sect233r1, NID_sha256,
+        "ca3b0e2f1c7db4e73c699f06e432bb0f63705ba66954bec4a259bf31c161bb4861476e2f"
+        "2f7dde9d841d1ea6bd0990cc793cd7a10432e38735c3eeda7a0d786e8821239bdd6c4972"
+        "c96c2cf68ec5b935391f963a50fe16af2719c9029943b539ff0f1f5645962a6ac46c75d2"
+        "037fa0c7cd46deadcdfc66e1ddcaada3a376acbf",
+        "007a9cb5ce27c763646de414ca2a4dcdb774d69ed2bde7a817baddbc9de",
+        "040086d4ac1e3d54f7c154c5370f5c9a2d22cbe8f794df68974706bdc9172c017770a2cc"
+        "ac923423137731a14e97f6ca65a8cb3642eceb4e70c78ee929",
+        "0538b86e0a899281ab56d28f40bf3b7435f9a57e334a3269233766049a6",
+        "007ceaac3aa0e260c371843104f5cb91a057741b38889ee796e69f920e9",
+        "035eedd44b036b843deadb8e8df9d96b16e719ba350a634553457ae71a1" },
+    { NID_sect233r1, NID_sha256,
+        "4b0a31b746763beee77cecd318b90acf50fac4172cf4bfb354e5a440f651cb89d7a515e0"
+        "9ab19e9850803ab9167c2aee3b395a5da10dc9aff799d73756dfb0a9961d93bc32f15a96"
+        "bf13962a03d5bd42ddc8b5928def7fc48fb063f42866fc5f96cf88fe0eb125b7c01906ad"
+        "6a7fdade28ccb0a421ceff50ae03a974671b2c27",
+        "0c03fa9e38dc1c697f70bc6381f2bacaf860bb5632fc837f728da959ac9",
+        "040195f386c7efe108fd1d580f0a77031e180e45a23911ba983217207a904b01a6837095"
+        "a64f71ec53ab1c0d9a3a39d69a514065d83f1af26870e41741",
+        "0d4f48085b367787a614b57c06ee8018b2e95e989c2e8cf355e71db1091",
+        "0391710f815babf07b6287b7aab8b9d2ce04bee2a144f4d4a46fd17cf77",
+        "0ef29cbd771b8a6f414ecb73b7937ffe0a108593ffc6899f28d4030a9eb" },
+    { NID_sect233r1, NID_sha256,
+        "3011d42792b21c0f1719faf6f744d576f72c5fdfd22b1a520d0e8d47e8c2b06823d853b1"
+        "3c9fa039fa30a6f2e3e27bb2100c6a35f55703806bbf0f79b09d0f629f8042ec63fa0406"
+        "2f15f2edb92b19237980005566f02bb12a40b4ec66e4ba6c599d928b33f72d7437c0e399"
+        "a8e6a9068d1fef24917fc4f9ab5464ea6684dde9",
+        "087dba00e3fe4802e01718017510094924496bd2785d4ac1a352c530473",
+        "0401198518db2d1255aef955b9b80471aba60cf6d8fd1feae6d8e048ab140301833332a1"
+        "16214e4d9fb37c8e0ab7552b87348434a67a0c41f73972dc9c",
+        "0378578acdfa572b1de4e032158b28bcf00ab7dbaf07b0e772c39603216",
+        "0be2cb45d527a7685139290f1098de975b69957fff2c5c29059ce417950",
+        "06abf4afdcd2990121723b94ab8145d01cc4917cd70416620ef100c67bd" },
+    { NID_sect233r1, NID_sha384,
+        "05a5d3a3b79f4e51b722e513620c88092a9bb02408f5f52a32e782fd4923f4fd3094fc55"
+        "36caf4b645d830260eba91b5173f3833dd65600fb9e246aec968b1f6ebdfddb4059fb2de"
+        "7e636ed60bb7affdb74aefd158e54485d5f26be373cf944c6570daf8fd7e4b77fad57300"
+        "667d6decf5c65db99ab8763bb4ecbb09fdf47e3a",
+        "05a387e7affc54a8fbb9157b5ebd400c98e2d7bd5c3e095538987d4f8d9",
+        "0401a97224cafc063967b25cd1a43283daa5411f3eabe9386b8b14c9768c29002cefaec5"
+        "141bcb084cbc9aebf28fc59780897ad1424fd439eb43eb911e",
+        "0fb7ec3804654b9c3675f7b3c427f6d01f83872e96de2742e59c93151fd",
+        "0808d829d78e65eea47122c92f8c2cbf5a8d6717a057ef1659fb6f8cd3c",
+        "0ef338e09dac0b12fa6109d15924efb694a0b672afb4ef05f4e6f2f7b88" },
+    { NID_sect233r1, NID_sha384,
+        "247a101c8196eb93a440280650ad463795690bc620e46e8118db6900a71eb493d03fbcf2"
+        "f73a79bb47aa8e2d8c87ef70e4cfae36fae5c45fe247d8cd0f7d0718dad106526945014b"
+        "4f3bec324897d8e1fa2f457b8a68e61873b7fa0350fde3b87b7b001c13953c2050a24f71"
+        "fb77eb455053e49200ebcbba7299485c0f1a40db",
+        "0adae709a930d6f5a5c0e3d8ef4aab004d741d23f0ffb8287f7059890c0",
+        "0401541eaf3dca942957c48d693d2eaf2a456646d2fb3eb8df1779b917a9b00097379582"
+        "76dc31852e57063119f1d2d061616b6a2fd35b4a1a3f046954",
+        "0390d5ed395f8ee3478c2765525c235587dbf5bb2316df3a1e8c664185b",
+        "0ebcc4f84bf2deb9b3d669158998fc96d7516580675e24348ca58d70d2c",
+        "0b99462b85e6ce6b46e5aca221250ac9de7ccf3e63b38919b61700be866" },
+    { NID_sect233r1, NID_sha384,
+        "a16678c71976a3ce3362ca379b3272b92e8ca7085b43752473db34e4d6b61eeed3875f49"
+        "f3328366fc9d0644824e0104817de458e4c1036636b18b83dbaf063f2f99818959224906"
+        "571c7b28873d9c702360888df151e9ad1a7003e6130033203acf8a69889be6ebd90816f2"
+        "abf0764f10be68653b1e56766ecc3150bef8b042",
+        "035d391411e6d679751092c4ea5a079c591e77ebdcb57c1d9006ae70d90",
+        "04001298e6f1612f90dbd2eedadfa8ecce22dff1da2d1cf057c41bd37d4b060073136a1c"
+        "af7dae2aaaac571a900135a51ef031643e9d5f01934333b864",
+        "09e343003670f61db85aedc0249db21953d232bc45488c3d6ceaa6072bb",
+        "04ac435e88f8e487b9b217e7d68fbba9bdea0b9685769878818f25e661c",
+        "074d8f4dd58c922d7e79f30950bd54c10c1cc52ae3b8d00b675c8e501a4" },
+    { NID_sect233r1, NID_sha384,
+        "bc2f080a7f0b69a6b142b8f3fb481a43bd71d07418df4f3b802568073c1a8d35729ad197"
+        "f34a4e941a6dd511c63f201d1f6c34a1b66545bd5f43508c10bda1d6ef60ee5bdd25dde9"
+        "75e50c61f76cd36d50ee3bd8dfa2dff59524db9ef12f1e28d109b552cb42f021963f559c"
+        "843476b5c889fc567b7840297c5a480e18c221dc",
+        "084e79093f1947d6ab9cf399782436e36ef87c59a4c090930c9a74ddb10",
+        "04008e756774def210e2d6f76d6e4b0b43d86adca0880f017abfc911bafb5a0147e6a20c"
+        "1aad897829339630c5edd327ef9a7e40795630504318cb71d6",
+        "0ce780ea99a344d67de7921feba6ae062817101068266d5d1a140d2b49e",
+        "0fb2474b854b8e5d6920ed90e69b5b386a1b26a947b1cf28a13f7c5d3ac",
+        "072722017a67ea6754873f833fc51318d41d6ef598d3ec2d3e0eb5bf41d" },
+    { NID_sect233r1, NID_sha384,
+        "ea71cede8b63ddc5648eb244184bae265cd65d50f77a9e25ff93f02b132487c08732544c"
+        "b88936d4fff7c0fedb39685822dd1c9be1158f647c605c9bb5f6a1ae34722fa08882c14b"
+        "36b6c93cab33c9a269c7c10f755b6453ed045ea3e56f29e95a9404ba189a0b4884812039"
+        "2b4dcac43148b706c3d9e4c03db410cbe5dca3da",
+        "079b6be015b8006f86fd81c2792bec6b42c08bee2d295cf9dc214c326ab",
+        "0400e24338d5e33ad12d41eb623ad0905f64d5b75835fec4e693eebf9bba100101b4297b"
+        "5b62fcca7c61637a2a57365e911d3bc7eb0fc7adb0a9dc7bad",
+        "0f06b001e5f874d16632e3c8d49f13d70f48ed4eecaff9d3b741f9d02e6",
+        "0de16d8fd7bb1783a2cc4b9ac1563eff3f87e4e6d75e6a32a4aed1ecb02",
+        "040bdb1197ee8ee51e4ecccb8d42dd985913809c131aa9224049425a052" },
+    { NID_sect233r1, NID_sha384,
+        "319b41d16e18059a1324c37161c937e882192cd949c420ce9c59208a0ac208ebb06f894a"
+        "7fd78df2a3c5f23f25dee6595d3dacb25a699f115dd482ccd36fc54ba29dda279335424c"
+        "86b07a1b1fa76a5411bcecaf4d37065b229cdce0bac75b666c6626ec37a716e9841be93c"
+        "907f87453ad91d36846561f284421a89013b88c3",
+        "0ca9d751a060fde64336cdc88122819f4b3cd1b4e7df42d495197787894",
+        "04009549785f4f9c71f20133f5a1d409b244df55445beec404cf8cd4d2cadb01b246647d"
+        "7570f052840d4cc01182d1dc3bf357b25e5966434e1c3c2a30",
+        "09e99fe741cb23f7eb039f5df8414d069b5c2e3c144dcd6cbc6da56ef43",
+        "0cf00f519c18e7a0fcc84c1e338158399f16929ad89842ba97a4afb5bf2",
+        "05854ee1a6aa5a6a74bec0b4696e80aa275210183c86f45dde7002d7ae3" },
+    { NID_sect233r1, NID_sha384,
+        "aebeee215e7b3d4c3b82db243a47506ffbf2263f6fe9de5b69286e8649d9218367c36ba9"
+        "5f55e48eebcbc99de3e652b0fecc4099714ee147d71b393de14a13e5044b1251e40c6791"
+        "f533b310df9e70a746f4c68c604b41752eca9ce5ce67cdc574a742c694ada8f20b34d0eb"
+        "467dce5566023f8533abfa9688d782646420c77b",
+        "01dde4b2d49338a10c8ebf475b3697e8480227b39bc04253a0055839e9e",
+        "0400504bd3a97baf9852d6d46ef3db78ee7555db752120d020cd056b1b4e50018dd305f6"
+        "a15e91fa46d2a6d30f2ec8fbe2baec491e26d9a2ac81155c85",
+        "03b78d2772b8ce01a00ffe2e6be2f9e2ca2c89ea3b29bec6d6cf31afe33",
+        "0c0c51fba155f98900eaa2d2935acd615e917f9dd979dc8d92f1d6e00c9",
+        "08c8354f95e24ed13d8ff3755e1122dbb4117c76b21b3bdc7f4dd856f8d" },
+    { NID_sect233r1, NID_sha384,
+        "8d353a6b6f35590baef59b638914d3e934d0145b045d221d846517ceddc8ff5e3d28826d"
+        "3459f8ce1260f705e80923f39abc73d5949aa7aa8ad1734be0e992bff0c9a8f4cc9bdfa4"
+        "30d4cf52e29d3737b0cd3231b72b16e15e1a9040b832e4a920b4a1d94c4964ac6c8abb75"
+        "bbbdb10825f882ae44c534c7154c446421a04d87",
+        "02c8bea2803fd746c874fa110a716538c179c82712f38d33d0f6d037e7a",
+        "0400a034560353561cde19db89dbcad5c9dcb74e239efc604e86ff38a0577e0185e0b02c"
+        "48be2e90c916a7c8ef2b41a57ea8d4f21d8cd3a0878a03875b",
+        "02e39f851c57643bd799c4f3b2fcc5eec8ff7f9e9e279efa647f969cc6a",
+        "09b2ad7efc7ed60d9cd3dedbd4159b1e05f05ce5ec2d2cdf7a0e0657482",
+        "03fcbd4ace6a140c8bfebe36ff30848966bb0d3eec323cc8ddda55faf00" },
+    { NID_sect233r1, NID_sha384,
+        "847f134b90f10ba3636ec24f36a94111f26d58428fda5bba4501e58c7bb55809f52320cb"
+        "e9e0df55af1e40bbac9f3eaa26a55d78b60621d4356d090d98363662f406367601eaa9eb"
+        "9568b1a1b319730bad7bf6a7ddf1b45eb6922faf8d065c540b671c50df758ebf8c4aca6f"
+        "01878e5e0012dd038c58833e2b13ebdb9a9f3fc3",
+        "0b9119b3b4b30cbfb98ddf0a4f6953417e515fcf0e5a94e83ebc1d1d14d",
+        "0401be65d340f7e99067bbbf961c2b357e1fd47a74393cae5f93a40c5dc28000c04cd8ca"
+        "3ee253b99e44ee6bc0e52d2f016b16f59c738b9f2bd8c1b9d8",
+        "02c851ba0123ff0543808931ab3857b5c15d7c10c343f232913f6e0c92e",
+        "0ba2b33550878e223cacb80e45e382dae84e76bca5a2ef8371b84d08572",
+        "08c370f82506e97cc15837f59e9779448decbd87bde0a463bc14b18edca" },
+    { NID_sect233r1, NID_sha384,
+        "99d23950493bdd931915e9f9b65e4cd1329866c0071a19d4f7d6fd190689275b7b10fc07"
+        "503dd1c27a4da274dbeb3aa5cb0e71e9b7b03fc2697729b7be913756e6760098951d7015"
+        "df181cf14b1e0b954e6260276af553e3e59907794b863e941950718ef154669c5c262946"
+        "ba120892e0239e05910c2194f712db46e37e53b7",
+        "0f4ab2a573f3771d1e4222e251faf14e06cefed544e804c299c9a8395f5",
+        "0400b1f973d6495d277e24320622b9b99fccef8eb5c1c6952f35b82d4479ef0161dceea4"
+        "d3c9caa4f640f51b37fcbd5b8932642a94c8e7aaed5db17fdd",
+        "034ff28a5ed6958514c603b3af5a991e2e9b4cc2c0a7aa73ab2d70bd05d",
+        "01abe4a7b27395a37089f91eab27ccf29001ced1bb3348a6f919d466477",
+        "057449e55d3f2a4004d647ad6e8fbbd516adbb4de40b1a872ad8ecf67e2" },
+    { NID_sect233r1, NID_sha384,
+        "7bef2487bc2bbbcbcc1570bbd4ed437c0dbcbbf63f666a3355aec49ea6ef593da25aefe9"
+        "ae0d94db50692475425dee3c88cdea975794ac69142c25732f3541457d68d9101c8be069"
+        "f2b515aadadea2019dc7abefa6c12cb3f76d9f4b5e46546f77eaf636aa8f232913092211"
+        "1151a4df913d18b7cf9d0308f01ad84d878adde7",
+        "0f4649cf30d4a5269296a45977de2652cb06d3ca2aff4475bb24517b927",
+        "040100ddcc8e09ba2122a6535c6a0a2dae83abf9e17687b5f6aae7ec6a2df10048f55873"
+        "60ee251925b7ed02de82307ba219a707705623727f98346a26",
+        "0a38b2bd0e9a5044db19d4312ec88d19ce1a9bf0eede8c357f898b0bc67",
+        "0d0ebabc8761ea215808a2c3035b14b614f64be0c2741b3d7789a8659ff",
+        "0f9e742bdca44c11bcab196f910c0d887e90f250817ee7027f6df8207a0" },
+    { NID_sect233r1, NID_sha384,
+        "87c717eef6dd3c7434b2c91de05723783bef603d170f654b49a04b067b077c405d2d757c"
+        "e780101b930196ca4261efcfbd3fc1ebb762cc0eecf101072988aca508c41581936526d3"
+        "f337053000dcf77b16172492c5d654c6612bbd2523a6ad5966d7091697a29ce882fe331f"
+        "79a7eb59e5a3fe536263083cc59b8133bfd33c1d",
+        "0cca24ad914c24c011f41f80d27ea41caf41fcc8dc9dc6dff5248b2b474",
+        "0400175b73db13324a678b8afe086944a7ad257cd33fe9538c59b9177d1064016a98ac9e"
+        "0ff59de1ad94b50f8c709ccf4342f983c7530be64c3f1548fc",
+        "029c83def3a5c386b0bc3cf2663b8f4b02f26c6e3e14fcb17e9460087f3",
+        "061df783609ceb355aba3b1753d38f42434bd75c8354029966e7a788be0",
+        "01e8a093f53a1d73d5a994b97f2b2f210125ecd3dcdf77c68ea3199856c" },
+    { NID_sect233r1, NID_sha384,
+        "9bf48c2aebf473b3a4a928b3b6a4d2fb7e9193c9e60bc2067f9f03083a8cc7b892bdbf05"
+        "601118bcc34dd283e7be996bf19b0bd36727eb9d65276b6517bf0c77ae0a9091e7a9e461"
+        "82a2586eb22324939801034e5ba94ba30d1bde7d8fed51eb71036fab6224f8ff30a00842"
+        "2efcff7ea239ff23b9f462777e62b41b396c5dc5",
+        "0f5e12d536ef327e3b0ba65ac5fc3f7f4880f5968f3340eb8868c1d47da",
+        "0400b2910f5de9475486b3975ce91c02187e8803e68586f3a1df14df67648e00f28af536"
+        "3ed851c42daaa810afa1fd0d2e001da7764671fd44fb6737c5",
+        "02a018753965bdfda98512c7f9da3e9235a4a77aab9804437b652182347",
+        "0b6fd02b2d84b7baf1a5eb592cde667ed6d4c2c821ca336027a72d9abdf",
+        "02253faa5935885945121a374010b2257123cd5db4c54a2aa0e08c8197b" },
+    { NID_sect233r1, NID_sha384,
+        "716d25519ae8f3717da269902be4a7566d6f62b68cd0faae94bce98c8a4ac6f66215ebac"
+        "5407d6f64adf9d53f79f02e50921b6f0e8c805926a839443d30d9294eaa802faa7c5471d"
+        "81fd1db148cdc621a8dd0c096e06fb0b71943337d5325e1bca77062684873fe904ed9012"
+        "474ceae5b138e079f941a665a995026d13d7eed9",
+        "08c30d93536b8cb132277645021775d86c2ba8f199816c7539d560ac6de",
+        "0400d69332763cf533d48e56065e1b5255790f8c0eb23471fac9b945e6219500292df8c7"
+        "7d9a6803f60bf0722ed57ae2aa3bc816403b000fe2940e02dd",
+        "050967928d6089da5b16c88b7927de210325c8d8f5e727fa1ba3bd95b5e",
+        "02434697cb5c2ad95721943154bc81e2ae16332fa6629788f505bbc1522",
+        "09a5a6792b1b9c2e200ace5a3d50c04f69084dd9222c021ef5fce14d4b6" },
+    { NID_sect233r1, NID_sha384,
+        "01e76755007b2ee5ac9e1d4c8adabad6d0f9c1c08ac6e2622b7c1ead89bd3ad0921b9525"
+        "b49a780a262fe8fc0904a80391717ad7cac9607de55f7c744af8a132ec45ce79723f4a4a"
+        "8c8b9ef658b360bd3890df164c9f1cd74eafb74feea251a34514ff2a57ae7a6d4bec2067"
+        "cbf6ee4fdaabf13721bf9ae178b9034ac5e9665b",
+        "0fa3f15a506ccf7b50bbbad0a54d3223f5a95eb54f0d1f4e5d0cc21469b",
+        "0400e797527d57fb3a18c71d1e82e7935e37e719439952d4b972f0c1e0c83500a345bef4"
+        "c5015e97a148b8991bed4b7ef48947b12f316b5621e94d49d5",
+        "075afdc12d4d50a7495f5a7d309696dca23e9356a0cab11c3b3d7b8c54d",
+        "0960ef460000fe8c761038bab7e29d665100494d0874b6556862c2808aa",
+        "08d3c004426dde6c18b1c9ae00a44ac947e36755d8c40eecf47bfa963fe" },
+    { NID_sect233r1, NID_sha512,
+        "e95abeeb2c51a8cb75ab74253dbe130b5560cd52e2a63d501d26e1458aa568aca6694be9"
+        "1eee5fdfcf582c47c1c727084ee2b2c810281cf9b095808bf7e7c668eff00a6e48b06df3"
+        "fe6a445e092c24d5687d7d89acc8063275caac186c441bc697b2f67aa71b03294e1adeb7"
+        "e557c296dd91304ba0587cda3c984619f1eb4f2b",
+        "06400a4830889115aa88b860b3fb65905b01fd126c4aec2785518c2543a",
+        "0401a2051662c1681bbbf6bccbd33c44c7c7fc80b81a1bce14caa36a73f7a8011583d3ba"
+        "8f22080488471d8103f868100a97af94809b58bff1435b16a9",
+        "0ceac6e5d10c55888b9ecab8d3f6ada7f4d0bde2f109699157d194efa42",
+        "0c148f2337008ccc3e61501dc5df3ec95d3596d97eae96a7ab085a915d8",
+        "036d1debebaaef50243005e25c791b9674cd6fa986dc3d32e089fbfb2ec" },
+    { NID_sect233r1, NID_sha512,
+        "bb8d8515365d240b2071daef0d80558fd3d0e059be9f6abb7b7a0a5f47e2ddca7d1b3b51"
+        "01d5c583143258520ce8db0a87f877a395615c9bf879ef46f2f20f68bbc9706f82781fad"
+        "69019396b27f292cdc70fff1772e90205a2225f80889f9daece1d03914d8776ac5bad24d"
+        "8fb190ba10a2ca17768b918c2e079d83734eb372",
+        "0c7b73c324250f14fac0edc941f79bdbc6933ee8f64bf94b847bee5eef6",
+        "0401af7266ee56bf0518f2875d4f4d9ec508a01769d9c1fd0a885a48bbd80c0084167ada"
+        "99502475478465315bf8163870a9ec1b43f15d68f0304ab03c",
+        "03badc9b8098c3b4d7e943a2365093028b579519031a8643b50c0f81eec",
+        "07ad4fc96c21963395f56eb63e1b0b4d2c93d827626e7bd4448697ded97",
+        "0e7504e6a9f662472e3e6f18a40f7645922fad2ef7313d600a5a6ee314d" },
+    { NID_sect233r1, NID_sha512,
+        "cd8b2403435fac9caeffa21b55eaba52d7efee0f89df7142340cdffeb89556303ca01a80"
+        "0429397e2ff6c746743b6bc60a87133274282d4cac02e4ca90ad95d80c93b84163b96296"
+        "f67d40b2a1124b2b6534ab6b60fdee312fbcdf468d0e84eb85fce4ff360136bb31ced399"
+        "8d29cfaa3ae685e638ee272058f123c4f35f8b6b",
+        "03db7f28e161abf52ab0adc8c4c8544fc989af081303b8688f22b7b2eb7",
+        "0400ab94312e53832265b929f3d529bec33dbcc5c17b969e0afbe2d559ec3901d53b2c1b"
+        "e229e2c224e6e9fcb8bb0f044f3f9f5677c60bc9454f36eb06",
+        "034a8f980896284fe6d28b0b49703f1384d799e3f11a04b1e62da12965c",
+        "0e374fb355f30d7e427bc5db99ed76a914d6e286099c72f28c07302c741",
+        "08d5ffd41f8a1fd3de6c433635fddcfc2b21809d91496ac17571afbb856" },
+    { NID_sect233r1, NID_sha512,
+        "4bb08eeb202564efb5bda40777d71f1bcc4c7c10b611e803e5c570876f3e319e9e2bc2d3"
+        "2031c56a32fc0d1fcf620d4e4377d881e9e1695bcdb78acba370b849115b86c1c4b83edf"
+        "a03299da8e7fd14c7cadb81a8e4911c8e427e32c8c9b67e317575331967cf58085cff0c0"
+        "d48ee0b8e7dc0b49687bb1c70c703a5dad08ec81",
+        "07e9d2fdd017d6da6029e88f78927d9ac9437f542db1f1fa99e32bfcf1a",
+        "04018429bf08752aa470a8f0801170a7ab96adfb168ee8212d76ab0b994e460072a5071c"
+        "e308d7daefb3e8f4da4681842ffe0f35dd8b071f0775c83f82",
+        "0a0f330e011d34714875500b70c881ff6b1c9e96da930eef75ec78ac120",
+        "0439bcdb86d40e8f64db5dbead95d85d6a771d811480c5765ffcbf75422",
+        "06c01f64e2812d18b0946ea4e6599e8cfca0a2b606c3c35c803ef2cfed3" },
+    { NID_sect233r1, NID_sha512,
+        "0bce683d835fe64e6484328aa13e18b0956f6887b5e4442fce36ff09aed015889794e79d"
+        "a8aa60b4be565c78685674c51e1e7ac60db6a763c777198a56e382a03aff8b40862f961a"
+        "e23e8b8683b76a5577769422418972ab0049119382edde9e752b42e8b93f403c1ef8665d"
+        "7ce8530ce4ed9ebf6d397827cba6b7645e177231",
+        "0c94052760fc74c2b405ee4dd5dd2a7d38ebc16df9cc32df706075450b5",
+        "0401d2a5ee02d97f82ea9c8833b825cc57b0cb51d3f2a2cfa7577eba676eca0149c68d98"
+        "d0e9cb242962326a26164f3e3cb6d81b51f281474b0f8d333b",
+        "0fdd3ade90da682676d40008cebeadb9b2378d8a821e9e9428018cdc768",
+        "0f6d244daea95002daff2ff6513da694eee58f8b6c2d47ad121be87559a",
+        "0b04788fbb5655a053d0fb7a38c39e1fef68ff17860442ec8b8ad049842" },
+    { NID_sect233r1, NID_sha512,
+        "a6defc770426daad4dafba3bbd2a69881334f7c31269b297e440926db54cdad3fd7ad200"
+        "f5ada2b72ad221ad99a06ecac9c2563a8deed89f0d0896991d1a652f6fa282affefbdb1c"
+        "1985652300d1792725071631d75a182b683a48448063c7d2563ec3d430e0fd3acea33a35"
+        "cd38ec0b5b07af96af71d0bfcd879d9864ededf3",
+        "04076b93487c2da8aeaeb4725fb53b7b41b465315335c18c6ca041175b4",
+        "040158755fd290910498f6c8eed83bcebcd1fcafef4878c860da118efa250c01781fdae5"
+        "01c2c147eca2c6c809d9428fff2f853b57c7d6add70fcfaa0e",
+        "07debe933553ba3420aa06e1bc52a1653f8a19b59c0bc9c47212389442e",
+        "09e09c6d96e33c845535468ec7f5b79cf30123538011d0b5ffd935d168f",
+        "0963bbae921317666f5852759e9ebf05cd026a5d9f026942835ff0daeb2" },
+    { NID_sect233r1, NID_sha512,
+        "7803cdf4758c199962b62943f475c6c31356f5d9b997a12e21146a2399cd0dd3b97a860b"
+        "2ce639e2801571599136d4a8cdbfb12fd1a5ce22374991e090533ff42823a2c58d2076b7"
+        "72814eea7fd7a1fde68263ef912681c72c7aa3e5a7cc44ee8c65e72228b7631e600121ea"
+        "35bfbbc783b6ae3c0c8f80198ada218be533760b",
+        "076ddd73ee4fc1f5e6766e229cc7236cdfce312417ea291f7c3328d5ab1",
+        "04015185e029c0d4eb5102e0fe900ef3c921acc744feb44570a288015d090800ed56bf93"
+        "394a434cd84b521040d40452bb39755da5e273a05e8c0ba792",
+        "084e9e4a9c84a602c18bbb6b183d06969c8b8538e2ff901f1c2794d5eb5",
+        "0fde8e9b1959477ddb3423661df1e7182e4b583849d6d17fafd7dc5406c",
+        "01a12bd30e9c8b74912c670c0845ff5ecc77f29797160bd4992efa61f4c" },
+    { NID_sect233r1, NID_sha512,
+        "e789461e1dad0b6e21abeb6ae2e96385549d1bae39415188c8f833233da6a3328144c97d"
+        "db36e0ff4d9e19d84f869e79e609c51b32de59892fb0446dd28cc164a3e53534c950d26f"
+        "87fb74e682db2038cde778bde06c3ee2eca2a077d8fcc2b0332e352e0e7e6487444a8ad6"
+        "0e78ff213b16fda9faf374dc6d27b7a3c4c6d196",
+        "07e1f8988ad804aae7d09a99be19384cc599e7652c02c391542be74b17b",
+        "0401fa4751e507740a7345e06a8964022fc6caa901cf0c2077a2c0fb86be8a00683c593a"
+        "0bcd123d958deb6b430d49d5a2386d44706f4149dc526ad896",
+        "01d288de55b90dbe72cd8f1f86a3ffbc2902f4b5f0cf4e641d32aec6f20",
+        "0048d16d87dbf4fb8e994dd874c10d5d16846b9ce2cbd43d09df62ca970",
+        "0e2ee47f422095d629c188df97e2839fc6239b9e2dc26baf8161b037236" },
+    { NID_sect233r1, NID_sha512,
+        "9b58c145d1b6c887f2b25fb672cd49c3a1117224be697c15182d4048be92968a6500f8bc"
+        "f747fcf33145c13a8d72e891a6e0c4c7310c2b62f3181bf586fe32f1ecf4feee8c2c8bf6"
+        "c2bfdf9d5f88981ce080095c93e49a772d8e7b59f9cffccec3ca2f212ef4c6748f64e224"
+        "f4f098334d83108bf6f8c7b43c5eb549f1526897",
+        "09b2292b0244c2aabe8b43d95039984d504ebe05eaff318760e4dee739f",
+        "04012618d89f50b7f83ac470705dbe9ed81beb03929732a3f2aa7a636eaf59015f0f70c8"
+        "08e053b112a8c32ee422aac2b926c5b6a279a787fddf819990",
+        "0fb38174a83ceb9236fec8ea39be2b3c77c3dd2cf42d140e27838202d08",
+        "084941856a387a56022727f81a939d77d12b01dab603ea0cdef6d9cd6c0",
+        "0bb9fc30595f94d664a590ed4f163e4526809819baf96bbee629ff86bd9" },
+    { NID_sect233r1, NID_sha512,
+        "52310a901fe9681a23dd6e02f12974d57f2c4f653322d9a0ff8b338cc6c2bd9f4765c90c"
+        "6b3c9fb17df3f492e67d204e39d81a8fdeb92c852a1dcc6151ed6c63049037235c6751c9"
+        "a902748163a567b714725b4d3995e0edbde03215c645b1a1da3147f7406245432800c50f"
+        "823a1f991c863427ff4c68e4e16d1b106ee40dd9",
+        "07ca463b50fdd92d9163f1c2bdfce2ee45ba1437b79162e3e959b814cab",
+        "04008eeeb146216c73ccff0096e1100008f8b1f3f0c5754c0abc4ed39f7f63018c9228b1"
+        "1888edd66b2e661284f583a0e8d3c3e922932cd9fc1568f959",
+        "0025291ec0dc2b0c709c5e69695980564552545c2497636b814aa049ccd",
+        "098dc98457ce6e69f77123d5d2460ff569786dd60fe07e847ed5bc14da9",
+        "0cd320afad2a4247fea5b74d78dc3df8967ab3159b4c8b191814d368dc2" },
+    { NID_sect233r1, NID_sha512,
+        "ff419c011601cfaf833067cf28dbe6e935ebeddf8b5111a97f6eebf3bb28376334f329cd"
+        "877a134b074790a073db766efe018fce666a34650cbac285ae856fb6b3b8b96877282bc1"
+        "1cd9f9c8e510ed1f69bc2725a44a1d2b35de1edfd8bc9d20c7525ab0bbc27662a7cfc1bb"
+        "d1e0f4fce5b88411521e3893e027cc8c73acdabd",
+        "0c3844750f63fe0c2e930bc38fe88522f4e72a2fd0db9778ade20e939b3",
+        "040075acb00b5999f8b272a15a2cbdf8cb630dc3eeb1e78e58f58e467396f2016711aca4"
+        "24ca335878d273eca75d804d3f009a1f3628568530ef265eaa",
+        "0a63e7a20d100f14b8b709f0a6c383166c2151a36dc471f061b0f20dac6",
+        "04063be9d8e4f0f9afe0c79374c69b36910b5d2b1010e0f4db2e4cd23da",
+        "06a6eb90659aa79e4a2360ea9ffb99a415175dac6c3efef104bef6fd57e" },
+    { NID_sect233r1, NID_sha512,
+        "05a89c4824c5de66587875011e704bc6e06e991ba8f3aed331cfffe55aa266a08c729f77"
+        "b8d082dca4d286b2d451ea838d726cc2cf298fddf2d7376714c5e37b64506f353917caec"
+        "525a1209391449c078c5197a371feade74f8fc8a1a1d67576edfda13c14ad324342fc0b0"
+        "9277941dc072ec0d39434ff1cb91fc59478fcde7",
+        "0a3bea235dea86506be4476eb7999dcb8e584a34238c4a894ad6823b93f",
+        "04014093a072c21c44d1c4beddc5c8dd9a2845db0935bbb4e1c4edb0aee032013286ed58"
+        "4deb744c9c35d7ae7eb9cad1c7ba2b670642de0399b230716d",
+        "078eda19f0cced2f84c1a7b354e5a79bec035b8bb279473f32d60f5d17f",
+        "0964e817f0cdc251eede4157a9bd830c476627c3f27d2931b4f593b0178",
+        "08dbf34e597ae06ad92b13900a4944e54a5bf0f16f586baad157da6dc96" },
+    { NID_sect233r1, NID_sha512,
+        "13e6b5241365d9d0ef9e8b05cabb3248afd221ec02eab92284b98bda3d9272184bfe5251"
+        "d35705defba5085381430e99b33a3ab77d7870e5102757d065862372df2434a25556b76e"
+        "54ebc39d4e6c3aba5cd6acf0c335756f7d9385c1068d4cfa37526a9a58c0ccc7f87a8189"
+        "176c5d4f201499236058ec061357dcdb5acdba40",
+        "09a367cd1cffd8dfcca179e167ea437ee48e9b6f42559dda9224701d3f6",
+        "0401052d751901f6f8e61858d3b15eb59dedd21e4e997531ef65622d5750290112737be6"
+        "7ec621509d73cd613d7b448035397fa66eb881f90a6d531ea4",
+        "0d8dd8f1cab623ba6a4e840962fb31de97a4d14aa6dd34dd21154105030",
+        "0a8276d0f069f34c60b26a55d47df69e4c9ae2981afc59e14b5bfcaa498",
+        "09351c4b3a06b839eb2e9f450d9c3d15efa45509886ea3f2610ee1dd156" },
+    { NID_sect233r1, NID_sha512,
+        "139a1a5090b97afb8fecfff8745efacf7dcf91a4393a7b629564e598d58d5be39c05c583"
+        "0d4c8ca85d29e9e2c31ad0447864e867d0ef4788ac734f8d871daebceda98d449308c2af"
+        "be97724c3af8a468f1925065f39e52ba4b7d15728a744b1252a20476dcfff7bcb82aa72c"
+        "209e72abb3c24419bc26191390ffed340c1b9c6f",
+        "046f4ad2522e78b9b35297d28f361fb0ce82306322aedc119251d8241be",
+        "0400b976c53a966e0834d5f6bc3af10a5f12cb6d16cb2303a3c6cee7d35f2201a1097cb5"
+        "6662265f4f2f52df375d70af086264752477c34c6af522f1ec",
+        "06a0d21e5aadcb0c9e3f9fedd2d896b0236dc90e33778fb114e970122bc",
+        "068063fe0a31b7e7925cf8959c3486985d98f58224d5f67cd0218af192b",
+        "0f11a22ced98173040062ff9e69d1b2a1b5a939eda0a6944e96fc62fa4a" },
+    { NID_sect233r1, NID_sha512,
+        "3315e5cda5f252e3291b61e493ab919c20a8af1286d9660cfa2f5ca38b6defe19ebecf82"
+        "0787fe692d04eae8a5f5d37abfb593309569cedf45efd0cecef6951b718924c8380ba52e"
+        "8ab8c9bfb2261ed5f01cc5a5f9fc5fcdd269a0f122c597afdd9a836cf8f96838c3e8962c"
+        "1788c3ce4128719b3ef4fc88569643dcad6da16f",
+        "0ac82137e9c7a5ecfb8b1a7df9ab50732934566a392a6c8915ee8ca8144",
+        "04000f7f835f8223fa6c49eaf6650e33dc9d09e1d2bb098925d908606570b2006e659ce8"
+        "623767e8214b076d7588746bfdcbbed59b75bb19477366cc78",
+        "080655784e3e31c6a498a63d4d84f7e5a353a66641ca17d4e223441bb1d",
+        "07faf31d1d31ef4edac1c63072350536df84c417e0ef808c6be39617e74",
+        "089023aeb53ddd3e475d11c53479863739e62dd64348646581012784689" },
+    { NID_sect283r1, NID_sha224,
+        "067f27bbcecbad85277fa3629da11a24b2f19ba1e65a69d827fad430346c9d102e1b4452"
+        "d04147c8133acc1e268490cd342a54065a1bd6470aabbad42fbddc54a9a76c68aceba397"
+        "cb350327c5e6f5a6df0b5b5560f04700d536b384dd4b412e74fd1b8f782611e9426bf8ca"
+        "77b2448d9a9f415bcfee30dda1ccb49737994f2d",
+        "299ff06e019b5f78a1aec39706b22213abb601bd62b9979bf9bc89fb702e724e3ada994",
+        "040405030ce5c073702cffd2d273a3799a91ef916fcd35dfadcdcd7111c2315eba8ca4c5"
+        "e3075988c6602a132fa0541c5fda62617c65cfa17062a1c72b17c975199ca05ab72e5fe9"
+        "c6",
+        "2af633ac1aee8993fc951712866d629b43ed4d568afa70287f971e8320fe17b69b34b5d",
+        "165ce308157f6ed7b5de4e2ffcaf5f7eff6cc2264f9234c61950ad7ac9e9d53b32f5b40",
+        "06e30c3406781f63d0fc5596331d476da0c038904a0aa181208052dc2ffbdb298568565" },
+    { NID_sect283r1, NID_sha224,
+        "44adcb7e2462247b44c59608cbe228ada574ecb9f6f38baf30e42b589fb9b157bb0560e5"
+        "a2aa5523b71cc0d7f583b502bec45d9b8352f29ee1842f42a17a5b16136feaa2efa4a0ae"
+        "306402940ecd6b71e57d1467c98e7960de2a97f88b43487e4f4016af1292381d70c18c7e"
+        "6eed99a14cdeb5b3caf73688658e4c5b54c81e08",
+        "09c2804f8cab768248fb3fff8a055b3f4585c00de5c1615a19f9425b9432ea09afba8f2",
+        "0402570ff62b03a5124f08f752aa71ddc57944cd94197fd286d5a2a107b116d7b8ff1b04"
+        "21037714d9abe9aa0a9668fce89a3fcd5cf2e4548102a181a777c9b3f1008ac6e8d3a31a"
+        "2f",
+        "0dab5ef658ae3e2ce2bc5c88a8b8022a0ca5eb8524815ffae414327e3afaea5fcb8a7cf",
+        "2d99f82d92c9554722bb793988af0fd0bea776c5608f5939db7c8634eeb24ffd381dbef",
+        "27ceb1d01ec9a3ec0e74d79e08024359e117488020de6458fbbcad28b173918fc7d129c" },
+    { NID_sect283r1, NID_sha224,
+        "cffee6252c7eb6d91d8fe100a1e62f0ad9f862d78ca2b747a6c17b8c9ea8980dc239b3b6"
+        "73310e6e7483582399163e39d889abc1a613fe77849ebc09b4f7f4fe0688b8a9869ae918"
+        "a88294c7ee199be50ee9460db14725ae70b449d0cb48f30e7d817ec02c0cd586119341db"
+        "a0b74f0279330807cfccc99c8c340b72c1764a45",
+        "2e625a6bc6d0ce7c06231de827068bdb0abc8ffb57c82b35ee3a0f873b9473905974d34",
+        "0400458bf39974812a4e0964c31f40083300454104c0d65f22c5688bfff3c256b7ea9589"
+        "000738dd33e32b9af93ade2dddf4147187a9270543afdfd66a0f2a53d6d3d815ef59795f"
+        "60",
+        "0a9388815c528fdadcc5d3b125c7a38db57fa8c163ba795ee00e8e307bf760619e705c9",
+        "2481571400ecf9dd31dbd9c905fa1006cd5bc7afae759da3312ead8d5a7dd0c25a37ab9",
+        "13952fa427d348b6347b9e93d4cb2c4cae3429dbea6aafd1e58d5a34805098722b3b8da" },
+    { NID_sect283r1, NID_sha224,
+        "d058ab5dc07228253707ef224897ea0fcd09c3d5cc91fdce9e03c1c59c53fb4596be2ed9"
+        "29c7455e67ac7f4891aed3eb06ad88f2c4aaaabff045b959f900d1019d706b6052637585"
+        "1bb891494e99995928e4cd51c9616aa651ec77bd7e398916bb9ed3156391bf7fb1e29181"
+        "e2b011dae2edaf803607def2ac6b194929a57f45",
+        "376ac24e1b86f8a55c052d92a0bdc6472fa03acdcdbccbf7c321ec0ccd97aa0a66b4181",
+        "0407247c755b23bddf944e29348da82495b4f61d02a482c6111d8698cc77e8dda4c341f2"
+        "0b00f8c199138e1f4f8344facd90ac62d55f3c9a15ba7a672ce40241aa26419af790cf7d"
+        "d6",
+        "25d07c7afc5a335c2bd7863c1965a48c12f2687b2a365a7c2700b008ee8a0e8e35a68a1",
+        "23fc2837a879b79e470305088acf596eb0159edc2008478cc4c3841a1bd66fab34bbb5e",
+        "0a909b83bf77e74511063366ea1d1308a8a544864783459a60fb2669785ab1af8f4cb06" },
+    { NID_sect283r1, NID_sha224,
+        "c86f2cc7ab5df5cf1a236fd83792769474cef464032800ffe98a44cf29dbfb6f24088160"
+        "eb31a11a382ff2a49f3e05e983462f5304272f96c0a002b69af3d233aebe867ee63fa466"
+        "66760a6889d022c18645b491f8d71b6a3b6b4ef058e280cf625198715b64b025bf044944"
+        "5d3dd7e1f27153926e617bd2c96638345431d1ed",
+        "2b50a6395fc02b9ac1841323de4520292f913519bc0d6a471aa28021322fc4dbcd7b802",
+        "040696d5ac4bc40e679524e246210b7bb0f93ccfe7dc506ba87be3fd018f829c93e62ad1"
+        "d8065953e01d9db8fc5d64516d864a33aa14af023e601d69875ac0f7af92a1e78aff0e47"
+        "5d",
+        "0aa25b43329de4e7739fd9134e4f4b3d68a64e55af47a2f6ccf71f518f19059b68d34cc",
+        "1338a5dda5fa09667604a6a7666b0e54e6b688b98b31c25d037ddf55ee6bee7565dad09",
+        "00aec025232c16e778f90785ded5348f3d5345b8344b2a762480383777328e0a0b11cb3" },
+    { NID_sect283r1, NID_sha224,
+        "c1328d8d2e5b6ffc850a9600bd6482518ddd9cee3fc9140febb72bcd444b0cd7e8074587"
+        "d51b62cce4b3d4f34ad3355353fabe363369cf790db2df9fdac3a0ec4757e2dfb3b683ea"
+        "a3e26531691ce765742e1c0bdc0e1028d347b6085fc459df0989c6a144271454eaffe413"
+        "cae2ad7c8b2371fd2df1afffe56df727009765a2",
+        "24e5889722f6c35e18ca47effa9e415b1ba790066a91fb3c9f7b001ce28fc732b09bc23",
+        "0407d4a57e6aaec6b51dce5408f6a7fbe9ba9d55f5abe2da55fcf015ca25dd74eb61c155"
+        "6c02123390178b2992059151afb51ac652b364f562c65451eccc65d968e9e7210921c93c"
+        "9c",
+        "320d2a7f48cf3583e8d7e712b330d40ddbe4b6c128be5a43d72bf57d4227603762de7f0",
+        "09806a8e70742c6c4a9ee6f77fe7a36489e1fe8c442ddf9cdcfa61f019ab9b41241d949",
+        "061fda247ba7c198aa532906bc01d509088d6c2ba0f14ca3ecc5ba36f3595db1df3e64c" },
+    { NID_sect283r1, NID_sha224,
+        "7176b7013ea27e94281977eacb976bb31c753bf80fa09680a29128a6fc15234f79f0e990"
+        "0aff3217ce9be72c378042c6c34fced0158740073d1a985fa25987fb218002e425868fda"
+        "5a47de51abfd04de34e2b8634cebfbdc98e80f93d94096193eaa82dc8778fc23f3765c7a"
+        "cdad94fdaa272df0ff0f28190c10a462ee78ac92",
+        "056d15b81f40b6378588a5efe43e21b95e18120d514bfdda0e7759a1d0766a8a35ce5ac",
+        "040306cb78fa576bdd2f43cf7b71d7e66a98b850d87ac087dd2e1ff62596a2e8d4cfff13"
+        "4403b1e3b12db842e00c2faef04d3e39cdb71546e4e3ecf21eacb6131c3501fa30edcc0b"
+        "70",
+        "1e8969d6cad41a40d8306d2a8db3290d547106eb59f661e0d0eeb163044a92aee4483fc",
+        "06786637c3bd5a95eba5ce015f151d99845255175ebb9e593d912c75cc45723612c4ed5",
+        "384471c17c45ddcf62b588993835bb913be88f7a8e46e52e211972ffb3b7768410bcb7a" },
+    { NID_sect283r1, NID_sha224,
+        "4c3642ba040a9955b9d50dcd1c936688c17c363854358afa8ca49c6abd906dfdc4d89bb4"
+        "cab0bbc363fb5b74e1f004d4b09ec9dfeed4c0bfb482a9061a1f487a3d79195ff7b65a05"
+        "04bced3a28db0ebe8fcf8ab1ee4a3ae91324d15d890ac4c479144dd5538d2e36d3a58776"
+        "9ee9cd2d5c6f85a03362a022fe0efc4a3902b71a",
+        "12fb2fb5bf5f7e42a500154823a174ba2d05af71e3b0cf47fab46e673ea1822f1563def",
+        "0402414d172d74a6281169835d18bfaae91f1f1cdfa9ed451884466e63160ecdd4a2c790"
+        "6f02d892bb19b47a4fd9d851d3b101ba99acf6d11345596635cedd5d7557427a2896a913"
+        "c9",
+        "20786f42d77195bea5761f86dbed8b452f858b447d2f3775ba2a4865d738122363b50e3",
+        "334507412368f08bd0992a5d56581ea7139e8adc88abe4bd80dfeefdc7a37a481b18609",
+        "0fd8404df06a02618cdbf6c28610d5dfac9907635d9e5f2887f11a7f18cb8b7ac95b5d5" },
+    { NID_sect283r1, NID_sha224,
+        "e471f39c18b081362adc7da47dec254dab8d765f005ac574640d78c14222639245563912"
+        "d942f3be212ee3cef134407334c8fe3602fa0e1629de5331643d76715dc1b0ffcebd484d"
+        "86c5211be4b285a31688b205fa988e6c15b36daf396ccdcc209c7dde2a732f5c31c84c7e"
+        "a041408ebf15e56632583af0131bd7f531b5fc45",
+        "30096c54fd480647e017f8cdbbdef292e799f054e3279d228b09816a757566a744a8266",
+        "0402d4b28fec18cd888017fd5a27a375131bec3aa7195c0a4f255eeb3616437079e356a6"
+        "cc027c607dcf0b068418eaa7de8da6f9707650e8d95aec571f7ec794415fc175061b4515"
+        "19",
+        "36880905a376faa594978713c2de1a90c8e27baee65bc60b1fa6508fab5abf843f66ecf",
+        "295193f1c64181bdf749987bbc8ff2a188126131f8f932bb8ca952ffa201f109762e18a",
+        "381c496b4035bba880225dcfe74fcf101103e38f9518d9427c74a5ec86ebf8f7183694e" },
+    { NID_sect283r1, NID_sha224,
+        "8a93fe53e83075c4025228540af7e96a588520da34e3eadeb99a4ab2f3dbbb8f85fe63a3"
+        "b86c1f4ec912e665ca05b43e869985eae3791b91205afb1380e16c25b74e6793fa63e4a5"
+        "5dcf25dc22d03f09deddeb9042b620434111afe08c5657c7d754af66ad91a1b5423301b1"
+        "e8e6389a1404060d1b6a99fe0f89598482979e42",
+        "0a1b7e9c8c2dc25b494b5ef3195b294e41cd3c2c35235ab42542bd3e2a52d5826662bf9",
+        "0406232063dbb66a56e2a92dbdfd9b3c136eade9c214d831691d9b49c56a3962d20f14b8"
+        "a901b47b85bc223fde1918abf6308b74dff7f3e686af9c9d7a1855a1b77984d258c1f9ae"
+        "da",
+        "29b4221eebe151fe758218138535d81182c991c3b7fed93f9a6117e98c1c2f97e546937",
+        "1f8040fad671e2f32a1094413ee955ea5426bc906b8e034d87d7408e63db173b05afbfa",
+        "22a353c431a9e9315ff69facfa4e15f6e6ee1be2750472823db31b49b17fc759e6b94db" },
+    { NID_sect283r1, NID_sha224,
+        "e193a8ef6f454ca1aed38bb67aca6d08280d421b196d89938c0582b7cde74dafd71716f3"
+        "818940af412d4a7ff3960a8517aee108ae03576b68ee7557d35e6f1ab823d124de7243dd"
+        "02b542591f62c80d822608572889573e4c9dc62f99d68e07800da6f83cb6f5e03d1f2ac1"
+        "5f90e38b4f25e0a75e354e4b60cc81c0bbe81d39",
+        "059b1a8fb84530bba7a607ee88310e31bc6ea6a6881603567a1081a05a3a9ff87e719ef",
+        "0400b9a71aa3cb4cff37586b1e522b0e332ad5962eec3dfeffcef3851976baadf611ae52"
+        "2606b1bf0b43b406b5edc6782fd391d9fb070fa3570d3cd5b2b66d7a95dbc45ccb162617"
+        "2c",
+        "00a77307da9845ec4572a24c9e74a17b76b6393da87a9d7b1b8456235473ff39d243ec7",
+        "36721835be490b5ffc4a42bee3c6d231417f7038c367efd9ecaf7fb3618ae8492906de0",
+        "237833bcc3e4a721e2079e579d1aaf2519c01cc238056fe0c0990dac7fe50e75eaf6f96" },
+    { NID_sect283r1, NID_sha224,
+        "8a99b9db191f6cabc88b430bc2293e6774d5180f019d871839289e25aec29379f14606e7"
+        "42190b7aa062e3b29fe0254146d9614856c5140c7315015abb98ac00da2c7e33cbcc82c2"
+        "4b797366f12767322c4381454d9d1eeaedb616b0ea5c66d1422da459f18081f4f966d05c"
+        "e279c6ee69b1bf94b8388d38d4b770d9ed69025f",
+        "30ddc2c7a4ce300cc2b75f0f977033f16c1f8bb13aae3d494c381f9a6dc8622499ae4df",
+        "04047bdfd7c77ae0c53e327c15c30d90ab1c9b670fe2241dc0ffa939fec3cf6d3c1f493f"
+        "3a06a286aa2310a4d0468b62f3144a9da2e66d15bf86f60045824278e8986ff87a276119"
+        "20",
+        "38afc3d11c66eba3441a5ea298fa593eec57b84ea29973c306ac9d46bb8d8e2f4c8b049",
+        "06c830f6c0be99fea4712f1c75f5a4e439800dcf062a16d93135c3255d3cd04bef5bc7b",
+        "1eddfda0d0e02d382ae243e604f76939dc21f3ce106243b2d20aa562b78e620fb456428" },
+    { NID_sect283r1, NID_sha224,
+        "5c437b331831530aa94623b1736f00b986172699f0a02a5e5df0008bf25341787e2e6604"
+        "6f2c929dfe0058c3cb89fc5bebbe1025bb1edd1ee31522ed568e7b5b4ca3991afdc76a68"
+        "cbc2c4f81863e27fdaf6a564fab2c6354e5c657de81390f8a4132669fd24a48580c716b5"
+        "b7961a9c091f614d11cf45dfdaec8946a54a11d8",
+        "07899928922fbfdb5407517725edf231d15a8b62d90b7fb6d8c8d20424850dc44f797ed",
+        "040614257f54514cf37df2cd78850658a85ee362764ab8186423aa0f9a1ff486557f8f16"
+        "7f03ceae9d1370df045d20f576931ca63bdba8885f463d5c82e5edca5116ed3d2c2b0c48"
+        "61",
+        "3395493478e69e6e1088166f622a4f9ec7feb998aa552b54bcf0fc67c06079f45a14993",
+        "3f31ad171dd59c9deb21851e631f223584b17f72a6807d5239ae31373512def954d5ebe",
+        "28f095ae43ba5bdd899573ce6823eccd8e127c6c03cb59dff43c087ca24e1ce5504d1ed" },
+    { NID_sect283r1, NID_sha224,
+        "91aa08567d8da4c90684dc06068f69deae240212842ff1786f04ec41b40d9187aa92c764"
+        "01f9fcedced62876a34df82ad7c1e63b68bb2a972257ea8542bda6a7f1a020c9b122943b"
+        "6d651abda8b8d322a8fb762eee376daa2d3637a71ed6c4f5cf96f61c0da2d6e1dda3370d"
+        "80e51da2cbd8aef3267168c67359523faf910dfb",
+        "2a2af63d1171930758bd3e5bfdac62cca1a83a3b55a49b3f80cf0d9ee4b2082757beac0",
+        "0407dd6fd0868ec478e7e5c08965fa4f1efe8db4d0c04f0b6c63b5dfa397607a0d9d5ce9"
+        "09054ff4fba9058179a2c61951fb4955cb637b01267f8f08b3aad614738c562f602d498f"
+        "04",
+        "179482dddd033e8849abfd4991304137044d7433d7bf858a794340ea1cd66e736b821fb",
+        "071f4cb000ca1c51c698c867a78961e6d7defbd60109f79d1d165ed045a653ddebabd10",
+        "1e2975f4a1fce0b3b0e13c3f50005fa664ee9319cf774d2e107c406d36158bcecb0e5bc" },
+    { NID_sect283r1, NID_sha224,
+        "eb5297bf408c1a55e400a20a3c10acbc5c2bc6d6ccfcc0941fb7a6fd4d2834415a6df86c"
+        "3a6c4b867d1215aeb8222153da8cbbb1576c92c07ca2c36d8f243fd911f9a057e39ee258"
+        "32454e28d7ed52a8d04169b9b9677a16b32d5d211b8573a8986e9bf36d7206417ad2771d"
+        "aa11bc21fd7ee1029b65ff7c9b2705a6dc9cf9cb",
+        "35994e89e13916ad82608f74a639e6aceb756ff913aec440519946d6434af9a60a6af49",
+        "0401f7805dfc9f90d4f8a1b241dc9d68aa41cb77b63d530cb3733cede23bb87ee5118e5b"
+        "be01c3f1aa3a1218de78a94ee8f88d3f787fdc68674e31792d919dbca681a6db1dabe89b"
+        "61",
+        "2116684a4307c67a3d8c1014b33b928a962a8daf86c4031b0c1d47315d74bad7dab2aad",
+        "33cab952e9382dc074d666f1f2ab2bd72ba394a404ce2fd02a6f7a4dc096d713827c94b",
+        "33b2886738d882146c0cd715701fe4e8b94b0d28c73a6b79d2899391119ba910bcbe3be" },
+    { NID_sect283r1, NID_sha256,
+        "f415d0adcd533dd8318b94560f86732c262ad2c6dff9dc83e2435543f429a2158cd2fbab"
+        "0d96c027f71008c4895ecc644c2ceaefa80937f6cc6338d15d36e459a16bd9387a361a6d"
+        "800acfd834ad5aecf442e30b70f5bfa164747cf9f89325b80976052a83a5e896c00c54f8"
+        "1472b14329cf23bec10a8e693005de2a506ba83d",
+        "29639da33f48e4fb0d9efdf50bba550e739f0d2476385cba09d926e789191b6fb0a73ff",
+        "040770f9693777e261db9c700eb1af0b9e9d837ce5eabd8ed7864580bfb7672ced8ffca5"
+        "98068aef01c8126889204aaca8f3ccb089596f85e2aca773634bc5775ee4d27c77f2af83"
+        "e7",
+        "32a930fdb1ba2338554a252d1bf7f0169d18750a4ec4878d2968c5e735f98b9d0c25edb",
+        "30cd65f1097d3fa0d05e1d6072675f1377a883b683c54b8a1f4960f90d68f3ee8c7bd98",
+        "15c61ddf43386a2b8cf557760200ac06a480797e21c92e45e6a311e1a508b03c4d9632e" },
+    { NID_sect283r1, NID_sha256,
+        "b178d86c9335b85e02178fc4551769db589ab91d823fac219c7e14e2f029753b20396238"
+        "9476723832f8d9631dd7764e6dd35da290afa42a794476f5c7727b3688aced848dabc995"
+        "4201578cc7b25801710931f45cba1199d3788d64dc0188412e70723fb25b8ecb67183581"
+        "50c4037b5b81466dac1686cb5270bb1c72d34bb1",
+        "0583a7ecbf2a975a32d07428d27ac82e5dc13d1466c4fdfc1e6a05a8d9a289f1010617d",
+        "0403775ec793ee4bff15027c70d9bb5dedfb7d2e41af8895faddddd4589cc5a00bd222b3"
+        "bb0300f7cd572d82f2f0a2d99a83977ed2034e03fdd76a0267455a524bd8199424ae5b81"
+        "ca",
+        "1e58b1f66c927f4ae16143856d67193d889debdac8eb03936f1b36d550c2f2639e13f8f",
+        "0f897dbc8ea12f4370fcd08e8700e5e4c68dff97495f401d01b782f2ebbe259bc0dcf25",
+        "3c32424fdcca39f411663284658b8f0c1f950f0cea4354f02f4b359f18e3fefac0976e1" },
+    { NID_sect283r1, NID_sha256,
+        "c8bfe9fa7c848531aa2762d48c153cd091100858aa0d79f994fd0e31b495ec662209a9c8"
+        "761cd1d40c3d8c4262cf4dc83c4a2549a5cd477726ab6268b4b94a78b1c4a7e700812872"
+        "d7f41912a723dd9abc305420ea1e1fb1fee41bf643f3a24abd6e8fbf6fde2475e2905277"
+        "24a6f99fd75374bf7cb01b34d3e60d8db33c4de1",
+        "0f817ab1b49131fb9bbe8c112c25a36f064efa85de7506fb9cd29d81b326bf276277f7f",
+        "0402b3a06e07fce1848494d3227ff77d1c43f4ec3c037ad73ffebfebeeae87d3bff7f7e5"
+        "9a075df52e6a34229266ff28b1c217538ae23b3912e4bae8de5cad9b57b7c1c9ca8aabb2"
+        "e8",
+        "0ac57fbb899193b88fbf4ff2c502af72943b133e8d40459a833275212f6644f566f5c58",
+        "3e13307d5fc2b7ad24e9422355150578c78e1c99a6f9a24f9ca2e8bc6856936c5c4af2d",
+        "05e8b77b580cdacc2660e6f8a1877d93c5983d135d63ca0e0b06aa8daedf855c9f661fa" },
+    { NID_sect283r1, NID_sha256,
+        "9a5f563d0f9fd1f31f3a822de628ae970954f4e71292492d727109036491c29e66b9b0f2"
+        "c90c26abe94c08502f5e923a9ddaf6a7d91e9541ce90d0a49f03ce4e4769753d5b7d922e"
+        "1ceaac4b4cfa4262732a09550aa076b8ff9d46a50fa17de17e3b6bd606698464d116fcd5"
+        "f1ae11bf45b0c48d3b738427cb47b0d1272b03cc",
+        "2782af76ffebf3e2bfc0576b70e4f4bb87c762e2bb230d278ce776310a14f5b678f29af",
+        "04000dc21b3be7efaba5c7f9f22591327f0f97083d4d844415d3148d227931256d026ec9"
+        "d401276f1d9e131f13bb129a1192fa24602fb508c9679ad2124e49c70a891777cd601955"
+        "fe",
+        "0255972b5329863f380de945574793beb0430dc416a8f2543330a125ce8d69f72dbdddf",
+        "25bcb54e188aef6e362a62fd88daaacc8e697dceadc8a6b6f804ce4a36856c8da6de97b",
+        "1e12e18e1e281606c16ed1f49804f8cfb33c29b0ae92c072d5c41ee3e6836cf1813d722" },
+    { NID_sect283r1, NID_sha256,
+        "3d6b065721da9de82cb33ec2c27107eb399b1e69ac8fa51145ed4147e20d72e27434104e"
+        "76af988a3bc94f55e36677a05182fe2376dbe38195fc6a30673a4dca87336c7304f3f31d"
+        "49216fbdfea00fd1e105d8b0c13ab11f8892e0045e915c17dfaab07b24ed21b06af5a8ca"
+        "d4f45fbee5a25bb6e87466a7bc422c0bb896440b",
+        "31b827b88f14d3822244809096157df3c0aa99da90c00cd9f0b18dfe306f6881834e6b6",
+        "0407b3ed076a2901ab2625bf05fa6db10a8c156412fd2d26741738f5eeb6a91891575269"
+        "4606a8cc2061352c36f264d23dc2857fbe02af34397ae5130c582e885f50f2c112f141c0"
+        "7f",
+        "0b36f5d6da409c4a27f38ff9686cbf5f4714f4e17234fbee6e6deec97c9f0d4c585d42d",
+        "356911114c9ff9ae4f3a4fcc5379c987b9d298554cdd39ce124f04707e7fd1ea25231e9",
+        "13c0a321c4c5a1e89dacddae38a9b3dda32a20627e53dcdf28ee26a550797c255eefe6c" },
+    { NID_sect283r1, NID_sha256,
+        "d125f0e2e6135567adec9e77da2afc6862e28d618416632ced829d14ee8b61116da59dfb"
+        "44098a40a0b927731125617e3d2f32cfbd1546a6e758c1ab6597e75db07add52ecb61d37"
+        "da2e9ed04df95b36ac249f4cbd794cb561655cbbe4b34834c497b3d392d78ed0db8db683"
+        "aff0076fb6e43acba3fa2b91210cc6cf3fa594b0",
+        "27da4916f1c471cff80bfa14d12aa10270fc3b26caed010c0111f6e5a40d914a3927763",
+        "0407d8202c88fb915446c521884fb756375a2b8d178f6a87306c1c8b67b926e830c8285c"
+        "150224dcebb8a7c46902532870ff855c780b2884dbce2956cd34dd6ffef8dc365b967534"
+        "49",
+        "3fcb1e759418e4539f9be76354cc1914ccf9a111338890eef723431925fa132ebad8695",
+        "0d4d4f23408db58a72495aaec6dc335ce85309fedccb6ade053c23347abdc9e77a81aa1",
+        "129b6b322573dcc79704d08921cb54f31c571573da78cb09d0aab40c4036ee8f195d88a" },
+    { NID_sect283r1, NID_sha256,
+        "b380f97687ba24d617a42df1b14e5506edc4b62dfec35ed9fd886bb769832cec7f9adae1"
+        "0c21b7cd9152588797b4efc6b2b30a873d3f25e683ea9be070dd69731949a51121e534fa"
+        "bfa3a2eae0ee90a454182248bedf2595cd47ad08614177d58f7a773f5023b538f5f56868"
+        "2c83fb60e3fb1aa859948d01bf7b214e7f2dc719",
+        "10608eb51dc0ee97d6e488a23c582ecf0ea1df9a24db77094d87b3fb6ca98507280a934",
+        "040399b3e571caecdfa1efb243323159a45618702600b870954cd614e494bccd70e381f6"
+        "8a02e2fc57721a500611badf48fb435a6e399cea356d281e853f55ef2cf9fc5f70dc8b3d"
+        "a2",
+        "0a8045b4f55115dedd8d742545f9f2bd6e5ab81cdbd318747aebfe9f74b0cbc964b6040",
+        "2d022631bb7e05d316a1b130faaca5af5eac67dd25ad609e6e2a067ff74fd4ba534db2b",
+        "04595f184068433962d250394680701fbd2e2bd613a47e5de68fa1eb83cb08fb425571f" },
+    { NID_sect283r1, NID_sha256,
+        "3f9ec57e4228e1a6ec49df02c58d756515305e48763ba1dc67298be9a1548576c28c82b4"
+        "e9b3f62357d9b3c522b16d5c496a39effbdc8290edd2cadc0019e6b9fae1e61238b13b62"
+        "65ad2ff413a5a0684babdb0013e7632051455e6fd943815213c555dba96cba8911e006bf"
+        "ddec6c3353065004538f37e48df9e339498d85c6",
+        "123f9eb8babed548df08cc3afc1d3b3bbed52b538d4654f2088fe76062fbea75b85a560",
+        "0403b2e980ae7a847394720a9cb982fc1e41f9381b0f2e08b87fdff1bf891b9637cb2248"
+        "5e04a367d593edfaa4e17113b6b1ea3ad185b3155b1bcbd9f00f4482e509b43bf7eb67a4"
+        "48",
+        "2adaba166d703d4d2d431a26200acea7fb47216fd04882f91c5730a55c349770d58a452",
+        "2c83e6a7b4fd48e1ba4fda8ed7891425213764078926d8862d0eb64765ee2900b3deccd",
+        "3561a949d583b7de9263d07ac427bc175b75dc52f43f3ebedf996218c94e51684ed5f9f" },
+    { NID_sect283r1, NID_sha256,
+        "bdbd7b7bf3337bd9d21a3c6db379f95408c17e49dd394e94737ceae889f45dc0ff5d48ca"
+        "dc53703a16b5589939506b548f8dfd34c577c084f372166cbea320c8fd07c809b211e074"
+        "9ea639e68f890affa1569b66bd763c7c710989e491011371eb1d93ed9479ff0216b7f79c"
+        "901a2023e2cf80b565d1c0517e73117190cd2f02",
+        "06a18e626452111922e02e31d662f4301319946a204ae8a34f06b91dd1b5b96456365e3",
+        "04077c1fbe6a645b85fa0316ae412e8dc558c7c066d9aba900650749eb7b14a149ee57a2"
+        "5901b2f3002ff4936653412c8ccb8a67dcae18d78dcf6dcaaa75061013d2134af2c3fa0e"
+        "69",
+        "21bf4ca10d03a93d4675baa26285aaa554836bd0bab6e7fe42600ffe9137d5e304847e1",
+        "20702aa5b5cb45cbe8025b4ddda0a42a1ab746117d45382d018b2055b62791ad91abf54",
+        "12c31f9bdc096236d3ec46c4e6cdbcea47e4fba0e28d4df0fbc19e8740ce6dc0577b242" },
+    { NID_sect283r1, NID_sha256,
+        "436b288512ea57bc24f84fdd117da9dc1858bae8c11637f99295d88fa9d05e3c053a2584"
+        "a6fe200ad190b3077d9a1608f660349dda405066c1562f6897ef69b6b674d6bc11fa470d"
+        "0b96a7cf8f6e098c9ac03b0ef415aa045867ac7c11d16cee78ecf08850ccabf70f761682"
+        "b561d0d0e4a889d840dc74932648ca2fb58259f7",
+        "3307fd717015b12a2dc76ada21442ac1d97519f66898b214c2ea317ab0f0905e819e4e9",
+        "0404ff9b8d60ed177df635a3953c0f5f5c0254224bc48d34329136706d6e8fa1b16ba091"
+        "6a02e50ef73f43ea9a5ad07c6bd68a82b7239534e195ee929aae7788c073dbe9e968c282"
+        "8b",
+        "14d8339f610b348f4639ac20dfe2b525517218f0c71b1908d407603b25f19971a1b5b4d",
+        "2acf3dc4e3569e5038fe97920de626ddb36bf213afa0f939785dec8319eb8321234c574",
+        "01db40fa416527266a3949211fd9fec158412c447c392ed6a7c7f159a1129da864d33be" },
+    { NID_sect283r1, NID_sha256,
+        "672faa156dc188bf16bf8933d65e091c633f294486049ce96a4a403dca28a149f4f840e8"
+        "bef47412285363e9e89006614b013a41baad9885f1d9980cc897ffbd5f8a7d0e63feaeb4"
+        "2c07776efb307ed680ba1cebf470dd9bd8a2a9efc2b1daa569524394f9a50398add1a5bd"
+        "2f7c263f9e63c2d49461acf98444fd23341ce78d",
+        "14f9f412e3c7d770626e800d43cfcbba3ae6aec8563af748e8a97b67d244334b6e6d2b3",
+        "0402293b37c84e7514564635e517bbdb9bda0b4a41217ca64c38e94a4bd00753255b4cc3"
+        "890088c10bd909964ecfe10c373214544c6f60ab85b8f5545afb0fd2ac03d036db7ea9e6"
+        "7a",
+        "19b21a4d73012dd2a2ec3ee280a9b855b89e6ad53438431cdb5d2cec0e5ba21300e9bd6",
+        "3baaac69d182bf1a12a024dbc9a52ba244a654716e2756c36ddf8ca634129cf9d2b23b2",
+        "13ed92730d0a6d75f2a4a56b39f82d063e1be988dc58f0ba5f553fa88b6510116005727" },
+    { NID_sect283r1, NID_sha256,
+        "4321334cc8ee44f1cb392a4b280a95561809dd3639ddf43b6e11cb73067597988d95b864"
+        "3d86c76c3c6b932d9262b9b8b55a04fba0666dd8b8ff1e8fdf799ae3945b6e30d3af3966"
+        "f1a6d634d5e012710d66cb447fc3375130968a2e1e647780aada2609d87247c90338dd71"
+        "c3bcc3902311caba27d5d4ea4d73ccea960d4bfa",
+        "3091a6a8bdac1e43542dce752694972e734dca31c061c7d1000754296d0748055db3f09",
+        "0405c0761d01020a30c478617313c67008a1332a0e6f295c5a9f01b3411eef585a9dafc6"
+        "9300eadfc6f7bb9986b0dd221b77b54287042ae8d1ae5788706b79a354fe785c66145bfe"
+        "81",
+        "0afb2e2e29b26a686368b127e38c2f5726fd55a13e9f87cf00e831d3fe19d9511d07e81",
+        "2685f634a8c16ee79acf62b7a1fb3acaec0db47c6ff5f2c97a804e9550494b128b2287b",
+        "12b545bd76b8d2cdfc5452291d5e4748a5e981c400daeb65c20812a65bbe936bc613219" },
+    { NID_sect283r1, NID_sha256,
+        "2087e22094570d39fa937f15a3ef0601709a66666344186a33b487d041793fbb9709a95a"
+        "f250b1df0762ea98e911aeb3ff1fa19f0aca53fd4179e454e0e91636e55cc5b17cad9e15"
+        "75c82ad265dc34c4a66b7a31ecb9ef9dc756f2ac1d9dab35369a6bad4a0f47e629daab91"
+        "addc6d297d1e5d81477b3966d8c3b607ed194d88",
+        "1195921b91353db9bcd00510efffe009c94f6bd8d790f5fb3e5a0101c9ca5d21c6ef2eb",
+        "0405dd8aa95e24c054d508bc5081546677b9a8e8dad40d3f8a184af7cf07cdb09ffa2e04"
+        "9805032f208dc3bbad6aaab63211e13e17656c750c6c2a6e3caaf55a7c30ae5ba241d864"
+        "1b",
+        "3223c6439db7255e89c28aeb046e906ba79f4e9b8222ba5ec201b964d3666301f74967b",
+        "0fb7e194dae6420ac447e7d4f882da3c4859f53a948833a0a08f918acbe03c2e915d1eb",
+        "2336f1206b46b3166b28918bdc1c817b22ab16b355030cfd635ab3dade20d2dbde08b6a" },
+    { NID_sect283r1, NID_sha256,
+        "15c7bca449a73b03bbfa783f5a91ca0b7916889a5d99d541e2e8593c3b176a5b634ba20b"
+        "34407fbd94ae1c1398f5313cab7402f3bcd7ad277a8c66d09a6df5dd086b20a0a3823fbb"
+        "b80980cd86bd13e527eee15656cc977103e80113539e26695addd9eef6a1f56986168d9a"
+        "53f8b5de833f8962c3826cca106ae9e8c00208d2",
+        "29dc20446e9abacb43823e12a83737b46e6e577466b5a3925e0f9d496824dadb4d4b50c",
+        "0404b3c1d41d8172ba15fc92d9586f29716821ea82274ac8e4fb3452ccca3e34925f1e73"
+        "6c023e22cec962d759bc659841f259de954911aa289e9994bd76a30149a73711bc41b299"
+        "04",
+        "0931ef56f08c379d1ddce0649f45ec21eccf3dcfa178616f45b200a06f82172b91bffe1",
+        "178348d533217543af694c8d3cee8177e22740b657bc6ce6df9e57f0c1f14fc9407c440",
+        "3eb25dc4ed42495b54679653ab1cd4d61c854207994a7318026afdfd44c89cda9247388" },
+    { NID_sect283r1, NID_sha256,
+        "d12fbb82ee7a57eaf76b63fd6bc6c0a65c85f135f019d43ff7bc295cad15d53729d904fe"
+        "d63d69d3ffe8b82c0ebaf0399e2717ece40e011f710b5db46aa457c23b85545953398b81"
+        "4816a1e7a8ab5b0b14c4a0451b0bda9d0d2ec4a374bcaae208b7fe8056bfa17d6b7ffd4b"
+        "a2e9179f49b9cd781b0c06f6ce3eec26cd428cb6",
+        "3b9b77d19a42e9a555da8ab70aa5638890b2ed21daefa28ca6323fc658662dabcbfaf52",
+        "040632fdf8ebbb755c960ebf8fa5d6b679416e488faeeb021c0782352279a7ae00eed330"
+        "94041aa517eff6854ba04e2de6794848823e53ca580353f2b25e45fd4efd3a369cf80fbe"
+        "57",
+        "2450beeca6f1ebac3e82e3aa3239a5031f54ffe65fa6a45e2bf2ccbda448a2cf6988141",
+        "28664212774e23b6513f73a9b2da97f5eeafd10efe742e314f6913a6d0c0e3e581cc6cb",
+        "025bc733edffbc1330689e7aee0dc121b64a72dff19e1d7c5990206d6daae5bae75d0b9" },
+    { NID_sect283r1, NID_sha384,
+        "eab0a37915c6b43b0d1e3ef92e6317b3afc8b8301b22f6059da8271fc5fe0e419ca6097d"
+        "aba213915855631af64e10d8382d70599d903d1535e25cbf74da3a12ba2f13c33a8562e0"
+        "db03edce791f1d39af8850fd1feff0eb25f9ad0a86dfab627b96e65831bffc5f6d9693d2"
+        "0493bc9dd6eb3e9325dea50b055768e8aa30d49c",
+        "0b9f8f3e89e9c1ef835390612bfe26d714e878c1c864f0a50190e5d2281081c5083923b",
+        "040542ea231974c079be966cf320073b0c045a2181698ae0d36a90f206ce37fa10fb9051"
+        "8607e6eccfe1303e218b26a9f008b8b7d0c755b3c6e0892a5f572cdc16897dcf18433f9a"
+        "10",
+        "31789e96e2ae53de7a7dbc3e46e9252015306d88af6bd62508554f89bb390a78fdbaf6b",
+        "0fba3bd1953a9c4cf7ce37b0cd32c0f4da0396c9f347ee2dba18d636f5c3ab058907e3e",
+        "15d1c9f7302731f8fcdc363ed2285be492cc03dd642335139ba71fbf962991bc7e45369" },
+    { NID_sect283r1, NID_sha384,
+        "fdb93afd5dd1e3eaf72c7ea9a6cddb07fc2054499ffe152cb2870163eee71ace5bd420b8"
+        "98cb4fa80ea53fbbaece2a1eef6427b632320e9c97e38acb16b62fdbf6585b54fabf0a70"
+        "3307ca50f86387bed1815a05b0c8991e0743d10cdf49c8facfd7ddeb8d4a7b706b5a29e1"
+        "d00ac88b0ee88b3153185495ac8388cc70104154",
+        "3a30a1c15b9ed71e102341f97c223a9b5ea3e6a335861c3cf407ef691a18cc639dbe74c",
+        "04040937b263c87461eb5d409008255d4e14c54d7a86d6e3eaf2ad9c559f7a6b9d258254"
+        "2b07562e3a04f22ad37a1df0250215c163b45a6bd04a4b96c30fe2e2b7ded5486b172ef0"
+        "9d",
+        "13e745c76b33e6e91f47f8423653b0056014841f4df890121655ac2044f3a6d58b9e213",
+        "22467497bf1b5d29476f24aaf5f88d905be7900406c64033913fc88601c62063a924456",
+        "19cb024c7d6be51d15337a207e66fb0e473956932faf6d755393dd5a899bf63610ff887" },
+    { NID_sect283r1, NID_sha384,
+        "c78e35d1a5b1bbb0ec21e7ba7b7c74c859d88f3e100e40ae34128cf093885dae4e87cd09"
+        "f3239dd8e79e25305220880dd352a650225d9bd193b9b84e488c458b0b5fde1af941c0c9"
+        "fdf952d2fa41f665918dccae27ab7923da4710f8c27ac8ed424992568dd6f0a6c3ecead2"
+        "1650ed162e0292104eef3c2d8551be866a88d279",
+        "083330123cc64c11888c1fd388629d0b329a50ef31a476b909a182c930ff02d0c389b93",
+        "0402e3a3e712676bede22893a8911ad6a683306e86487d24585bd6fe4f2657281f0bae2d"
+        "c80773889a95e9bd579be379fbf84dc8d26d47335253356e5b01c09eb8ed57474d6c0b04"
+        "91",
+        "0d630f20623e93c274239200393cc552d03da6bb9e74f4a44a518e2642e84e761dff7a9",
+        "27b8997fb98ad04488f5dc8ae5dc88b2a3231fca76d7320550c74cc540110c0cee5d8fc",
+        "1824f1050e85d527847faff236b7195965e7b93343ebac889b23425dc27226d50a5266c" },
+    { NID_sect283r1, NID_sha384,
+        "e05435f695997229cce314e50065f3c5f71981988dddccaae6efb81f936b22cb48813f50"
+        "6d1edf5ebd69b0be34f278592c5935f0f6db0cca1ef9d62834fbf3c4c03f4da0596cb4d6"
+        "7b7b767e85dde7b7c6fbef7d89babe6f97b876b33594a9e36ab87079861ee556fb03274a"
+        "d4af527342a4794192b8933f28c6220f954c77de",
+        "1dc2b656c207eabc9e0d6272099babca8d149c9c4258b779c2f06de75f76d77505271c0",
+        "0402b03407b65809825a32ab50f1b556a65c3bbbd65cfcec898514637ce606182517fa1a"
+        "4d021c97e293ec74dee17c89b962356b7bd50c7b23fcc30ec7fdd0a629d11373e28380a8"
+        "c8",
+        "2d0dc9317a2af5a7d0a23c00d126b7fae4c06bda0a5c50462ba26bddf575adb091d0e50",
+        "211c396875b5dc71ba87ff2483b0ffbff60cc3656132fda7422a81964f1bfbcb5ecca23",
+        "0a0ed7bf1ca853b9b19924c706eff373b97585b692b4b535ad71cc4362073caf8f61a3f" },
+    { NID_sect283r1, NID_sha384,
+        "0f9f36477076c4b5a7d1ceb314a397fb14646695b0803e36e98908c8a978770269f165a1"
+        "fed8f4b655d4efd6ad283d7f5d51b6e1e302d360e8ebf4e887c7523a757ffd55384e114b"
+        "bfc6b7a0ec8511079507b919065ca018573418f9e394854c5704227772161707b4d0246e"
+        "bceb91192f0eb2ea994ce61fd98a6d14cc8246c5",
+        "0081772348ff2d7a3fd57fe703555ab2e14f5d203c4cf0292f944e827e884d95f3b1d83",
+        "0403f7174e88ffa8bc0a770fffa4bc30a436fce331dbe7154f6e2fc0cdd09e76840f089b"
+        "3f0561e6aa3feffb2033ea716ae94b9a7402bccfed1fc4a137cb96fcdfe4685314f73a8b"
+        "b5",
+        "3a8c40754ef7ddd0e289b2cdac5e06c72dc3d6ae9d0351d9295aedfd6f0e88809674bae",
+        "1443b46c0e6bce31642dcf3037e25b6ba2b42daa9a83f5c0bbfb2487ce717c37b91f46b",
+        "3f59d5a925fe19c795b4992c265a3c61b2452237eb34efb9aba30208ce07d1ad47e2279" },
+    { NID_sect283r1, NID_sha384,
+        "1d38b1c342b6611dbaf412a66c1c0b8397692755f576df33b31c2bd12b7f0707cc423376"
+        "391f7b00aa4e7b7fe54532e2b39c3c5284b9c8ccce48eaf9308ed338992f1d4ecde6cbe3"
+        "52e46339d7d602942158387881d9b493fd40cc59d4f9b53ee4191d42352c6f7bf32c331f"
+        "0c5afbd44a92901a4b713c7cf6ccddf7de4cc6e4",
+        "1eb6bf2ca1b5ffe6f6a795733eaeed12de6e87c53571e702635b9dbd0d96b47df4a005b",
+        "0400e64dbc1a08acf6ff0e820593cad79a46e3bd818ddef5ca0960fde799abacc7b840ed"
+        "db06115d3de2bdd011ad053550471368581a5f125eb0d32090646fe4407980a42988e551"
+        "aa",
+        "3b28fc6d0e4a7fc449b811b78900fb9f89885f4d4f70cb5a2b3d4f8ab87bd5448f4bfd2",
+        "2601923909c8c953087b0c0acda57d8c01f814dc9722171d8409d0acd2fa4d9c1314693",
+        "3eb316cacba93bd473a4b4acae4f2b5a5b2ac9856519032e63a0c718698956e8f35673b" },
+    { NID_sect283r1, NID_sha384,
+        "3353ad05ef90e9762bcfedd6ef44a1e8ea0392ebef30cffd48ae620f3e567e1cd44882d5"
+        "14e7c6759200d4bcab18afd3038c3d3f8c50f7bba32a04eee5a4b1cfb8c349939e4efe0a"
+        "46fd047d02ed000d8fa1b98b0af5586f120d9ad174b3aea33905b979ece1eb3660b1e070"
+        "c8821b32df41904ad68bbd8ed247aabd94066f16",
+        "3b2a3e65e5a306bf8e3955b60e856dfa9bf68c1275a678ca056207a0ec67c96eb3f8309",
+        "0402c542cef892b06372af7d9c321ed5309995c1cbbf1a466e70bd30f3856ab7c5d18f4e"
+        "3d02a8acdc12a7cc0b54f4dec9cf61c484a5cf86c4cf6cb5ed615479123ef1c6ecbb6c7a"
+        "e4",
+        "09bb5e49188621466440a0841b007525000c2203d9821f4c6afab63ac2b97cb5e2e3dcf",
+        "00a09da1c4bedff47945898f4f4ee9a0857bb56be535544aff9d729ae44e23d678fc71f",
+        "2390be08ba0861b32ca35ba27a0c8dd1a4e96d28cb007133a096b52afa0126bf2a2abee" },
+    { NID_sect283r1, NID_sha384,
+        "e7ec162185fe9a5803c6b03d98041422315ccdac67e48fbd07a1ef3c5661158710abc679"
+        "1bd0a75d56791b4ac0e7695d53c5989d9fa6a3b037583b2a80d2b154b024f1c36b63548b"
+        "e9afe1d51f2f68b2ba94d4ca1e69a35ac10e15ba72242aac20f7526b12ff9d3cde9a9bfd"
+        "70d55adf9bd92c66d092d7d08e9764c84bf7f329",
+        "1fd4d1af0bb7c79ed5fea7bb45574e46534387bd916649485ef15207352d7302e81dc01",
+        "04077057d3f93011440a78718a3cfded73e4196e7fde96e794465c51be8b679f912c10ed"
+        "cf059873441c590c43e0f00f80afad5b0166f94b62214ea45da29174874e44356b29eda6"
+        "b9",
+        "3f224b35737e78ec5bc9b081a601d8fe19e33b4787449d3353d2ad225358211cf9f7f0c",
+        "1a7bfe92c30ed1af478282786bdf7b5b89cd0fdba5e534bdf13899dab5af108803d73f6",
+        "2ba14810de4f5cf48b56e94bd6c439d230dfced3cb698c77627f59faff0ac5a42c43067" },
+    { NID_sect283r1, NID_sha384,
+        "87c8f2e3f4fdebce0ca9300fc1ebcaa934f51a12b6b8f2cb6bb6eb77965468663044afeb"
+        "2a1334cb5a81e74b8427267f8b34b5e9ff0cf157a9f18be2b1942e32ca61dc23ea13c3f9"
+        "fcfa16df8fe05e067938b6994982676463fb12842d4ec532cb904cf222aa805dd0d86ab9"
+        "a33a83e294c6d81e8dfa273835e62e9041dc8ff6",
+        "20380b1136b5283e9b7f54b7535ebda33b129ceb177bf5d3d07b1daed5edd9fb3862530",
+        "0405e7d0931db006c6abe04671d1aede760f2b1ac5c866570f8e5a24ed356fdab49cc5cd"
+        "ea07004920fdb0a744cc545068bf82bc5d7a46edf9265fd7c5979b9559f5421c9a98f6db"
+        "89",
+        "3cfbb1204caf6011fceb8d4be987d9a41b81bcdd95b94919b220647d0e7a18feef4cd01",
+        "07096beda28c20d2e62d9b0750142d3d21b54c38c7fad1ed65e4f9b386f3dcfcc43a3c2",
+        "3d0af02aa39e329e4c39f2a1d6797f0e3d14554dedbcab9abbd158273a3c7116225abab" },
+    { NID_sect283r1, NID_sha384,
+        "2ac53e8a50c4afe3b38904255b7cbf150c5f79dc15932dc0ac9aa631521f68a0d4b6bc5a"
+        "04d55c99a36531fd4886a23a8d99f262ecd2a9feea925d7a96ebe9b6979a207b7f9378af"
+        "be404fc8e959b0333572a2c911f8743c0ba64eebc7ef12fe5435d2cb0e5091ae518b6e42"
+        "33489efe3c16c6f21abf4e2c6808b733914e5a7d",
+        "19f815b98836948e0a0dc9c30828c31b13e175f1e79f23d084ae1bbe64823f4866214b5",
+        "0405109d8ce934972f5520101730d0a14b99213ea17772e3e7637d622a5de13fd2ffe3bf"
+        "fa0502927e0c7baedc4bb3ed2bd1b15fd2d06dd43424393b246dd530d5d8598b56dfcb3c"
+        "b7",
+        "10359d5cd8a9b7532c9902bbf1cb83d0d34bf37e73e7c0f5729b62a10bd4d8faa0f53a3",
+        "3503410a6feec71fde2feb14375d50f99ff9a2c8bef47e676bcc6c3045efa9948891ab4",
+        "159b1f65fd566ecfdc08b87e4ecf99ceea3088a750e2c3c9d868bb432de6a61f289d06f" },
+    { NID_sect283r1, NID_sha384,
+        "0b201469cac4c078f587edecdcdb6efd5752cb4a3f43ab540463c4d908c27527aa3592f2"
+        "f9acad85dd94a3c056bd28618317ebdf2e7dd6c5ad26fa3c31dd8e5c50c60418d91c93bc"
+        "bb59ec1adb1db791f485ded78a5cdcddd23dd1cfa4f13443468d8a5f2d648059b9c4470d"
+        "0f4fe7733d56a28a2c24456b6923703ef32cf0b8",
+        "01854e954654e726cf4bebc0e5a840e8809fd716059211c6ffeaed36829808363164684",
+        "0407a6e7c542860e815d3fa24fbaf99989e8b9c812b08399056ae4f9a850a6711a7385b6"
+        "2200dde6bff33891a64744dce6456600f5a6a11049906608e77f8afc38b922972c805af2"
+        "58",
+        "2c9cfd376903122625c7fdca50e93d4c216f0c7d07f33b3b51e54e666e13b67dc89d290",
+        "18321f9ee35d47648060213df1275ae89c2ec7d17abe8093d8a431ced23aa61d3f8df4f",
+        "09e5a05a62b006a7787c97be38df6fb9fbc1433aa2241b5a788fa727229a18e07d7a8aa" },
+    { NID_sect283r1, NID_sha384,
+        "fc5e4dddf4c4a328b685035ee79069770fbebcc56c14e31afb4bbcdd5220e025f31eba79"
+        "4fd6c05e64f19678dab33ce4f084bc32790392f14bf35669d75b6466b4214ec30d58ca90"
+        "ae285c9058f5804a1fc9d7a995958f2a0e84ee52e8a78b601bec04ab607ffc2091749cc5"
+        "48c6754ed14e2e5f92315bdacaa7a12823ef76bf",
+        "3548f8020819588b3202f4c1ac62eaec6a47c2a19b2900c5a3cf5b4ba5804231141c647",
+        "04038563f2482a399bf1c13f42f8b85ef64a3599c22da9688b97530718bfefdabca3ae86"
+        "3705c4aabf6d8a90af345008d5a244d0671cbe1afd08000c4eb37702a9bcba6dbc058ba6"
+        "da",
+        "32649876d776117003305f0ec9cdab5cd84bbdc747d3dad5d8d54a8fdc84d519d50df45",
+        "1f5160851981772c502088eef209f7f89a7c8ab35e630d16330bec7723e398fb37c84b1",
+        "073a7333a7037e1257d4d70be87c30bef770f9d728dd7e2615d47b399ec650aedc867c4" },
+    { NID_sect283r1, NID_sha384,
+        "284cad790e6207e451a6a469cee3befc3ec43e047cf91b9dff1485718aa29de36a43f7c5"
+        "1eacd8589f0c3a96ec18e8ccfa92941b50b2132e3612d5b45e16f60d411d1c53e373e1ba"
+        "451352e28970ada9dcb9802102518a385dc571dcf6900971b00346098a58042e0d1d129b"
+        "d6801fa640a895a458a45b31318fe63ebb30c6e3",
+        "3cc4505005c41142308f1489226b7b542e2e7f24f1d3089ff6b92a4b0013f490ad52e60",
+        "040280b77ddc6648d9cc3f5557d406ea2a089c8179d4320781b2eb76ab07fcafd2535b91"
+        "de005f23bf4171aabbf0fd50049aa017c0dae70b065964c685bc03b958cee2fc3249149d"
+        "31",
+        "2ef488215648524f6caf85233736eddcd9d1d838c6a2799c3a68580492d40f9800bd119",
+        "3e8e13db22c97281307edd4037f0a75d2c70a070614e94e02c860f36a53aa738fa0db2f",
+        "356f2651b51a6be0c697300a8c2641bfaa1795397eac208385c3729248e36baefc173ae" },
+    { NID_sect283r1, NID_sha384,
+        "6d46e57abea9d115deda48b69fe8e0b36144df2f6a659509ce1b514c8cc4769d46e5f71d"
+        "f2a084f1db4a22fdd3ef0c2f90394f2898ce291b9f279c0664aa01419f5f6bee1fc12998"
+        "71b27ecd57a5ac548f99d01871b8c238a6b46044c953b2e78e22346a0c7663af4db62799"
+        "038ffb5c21ee512e26d01e70a4ed967377ab8405",
+        "144a2fc8e0aa63506e14e4307df36416f963dd9da78655832f5b991af8c3eb97df78efc",
+        "0403fe8867b560bfb21dda517b8f4d50578a11e1d0ab7ed4ab3796580d31bdf710e8e222"
+        "8405a302baa3795e2d132c55d90858d14d4b17aea0ab70632b135f94bb23112d163357f8"
+        "ca",
+        "0b5225132f19419715170f5a3f26919b4127a05b4f0406f895af1e4bba95786daf95259",
+        "0651d17b00ed9a06bfc6a913883b5cdf51bd5f2dd22307cc5ad3bb545f623516232bb6e",
+        "01128d4784fc0fc050af0b97f859616d764b22f40734ba65aa15e2cf80e7bba3d15f42f" },
+    { NID_sect283r1, NID_sha384,
+        "dd750b39bd8753f4e473c4484e2b36ce2da7576813ebe05861c339ffae1d029bc793173e"
+        "d394091c00685ad82f0550cb21ed1c68f0c27cb7396922239cfb886647af204e88a9101b"
+        "7453a8ab662e270b87a8a13f2fe61d695597382cabeb781933bebfd7d0dcd33f77266e43"
+        "e32d937f2dc89f67525e522977ce73e9ad36c8e1",
+        "24ffeaf139043ff25a395e4c560c7680c1c2155191378917eb25194136b4a69597dc277",
+        "0400402bf61c0e36385e5fa8371a553ed8652466fdc3ed9d4a3ce1bcc567d1f451f6703d"
+        "d104dbea6f67e1117116f30fe42e84383768b0da770f8a2b4cd8a4fec330a0034554a138"
+        "08",
+        "3e4e78f012eaf1778c086a3bbd9e996da0ddde651236ebdb6348062f56b36f63a901561",
+        "1e2312720f6fbf44d7a6449a7f30019c38e69f2e6424d4bd1054f40798e9fe58d080b86",
+        "379d1b610a976730dfdf3300280f1c61109ad13c788e8f8f9a8d5e0130ca9482ee417da" },
+    { NID_sect283r1, NID_sha512,
+        "4736e59fe5812f63737eed57a570182c065538abd9fb0a1c9c2059199e7052ba57d84b5f"
+        "a1cda2ad9f216610361ce1dfb9334816b6bea509283756a03aaae2e5b0597f492d078b6b"
+        "015a40c9785dcc5d2ae266176980db04f5cffef40e16661a50ef871c5f531d73fd5d114f"
+        "a19bae9dd2da4267a131fc31849da38c2b78d1af",
+        "1d1f2e0f044a416e1087d645f60c53cb67be2efe7944b29ac832142f13d39b08ac52931",
+        "04010b2d7b00182ee9666a6a2bf039c4358683f234ae41a9e5485fd6594e3daa880c0dfe"
+        "0f00a419b2f40e573dc2dae4b22e6f56e842e50d631b6126153178585bd05a8b9e6e87e4"
+        "c8",
+        "3e4d36b479773e7a01e57c88306404a46b6e62bf494b0966b4ed57e8a16169b9a1bbfe3",
+        "30513169c8874141cdf05a51f20273ac6b55fe12fa345609a2fede6acbeb110f98471af",
+        "33fd50b214f402deed1e20bd22eba71b156305e4f5a41ab9374b481ee344ab3f27f4bcd" },
+    { NID_sect283r1, NID_sha512,
+        "e573fa7d4bf5a5601e320130de91f4ad87eb7ca6b8998488afcef69c215b0cccd221b8b6"
+        "6eb0af9d699af9ad6c4b4a580e82941f31e4c0a9bd83995dd076c5ac9bebb34481061e7c"
+        "b1b26f6e8c6b26ee4bdf9887f7ae2eb9fad3115a21dcc96acce85d23a040c0ebbe0a56e7"
+        "5714dbfa803d6e279b2f4280bcb993f96ba321e1",
+        "1337362609df74d25f7adee382225e6a04dd6ee4c6b45fa31499ce9edb0ec046325caf9",
+        "040287b288ce6f65fed9f95c99fa4b8c1aaf6de65ca563df30ac67c1066d2ba2f5a554e0"
+        "9c025567fe183dd400d256c333da92dda2e364afe84492ede9fa0e913ca7f12069b5a44b"
+        "48",
+        "31b84ec438302155f2e84dd118c0d8479267f8d19c8c5d96d21177e20b23e0180dd6d33",
+        "08133e49644044bf9ba3b4c8bdc3973647d650c58fae4a7ea5a5fffabafed56e759010a",
+        "1d8cc410cd04b188418b20cebc8f66ab0dc29a42f9067aa2926dbadee39abce79deb396" },
+    { NID_sect283r1, NID_sha512,
+        "7862864d0d78b44e2a28af44a0a16d8e9b1b8c4b794db0410c0a863ba011018ef43e1e11"
+        "f2fcda2f56fdb2a69cc817df425c9cb3b458922ba00d710190cae16d61af3c304a42fbb3"
+        "d0c4a74a297253fccd70aca414865b41f68b01c561be281265fa89f63f975d3101334886"
+        "e85929a5a47fa8dc459b663548faf8ed7484958d",
+        "1be00aa0afdfe92e24a2536594d4b41701ad4dfb223aab35ff49310bdba7566057fe8ac",
+        "04013583d8cd163fdef7c11e91f36c1d3eb2f7957d219244db883708a7c5777611b00668"
+        "1207a1f4df45073b838277d8da7daa7147b0f10aa98b5ec02fbbf97c89ee17f3a7ab4f3f"
+        "27",
+        "26b42f369ff9b2740147914a2698cf1ec9bab44caa3b5f05957ceb9a32073729aef0fc3",
+        "37640dcfa11483b3754ea027f5f239500894dda4f4c8308f0623db256eba2113c41ae61",
+        "2096767a1f8210b175334fad61b4c7fb4e2d6c7811b5d22521af7750f101077e2fd4e44" },
+    { NID_sect283r1, NID_sha512,
+        "e73c96d1a84cf7cc96065b3c6a45db9531cd86a397e434072a38d5eeb9a90f62bf5d20ba"
+        "e22b926cfe967647d2bbb5dd1f59d6d58183f2cf8d06f4ac002ead026409ca6a1f868b40"
+        "6c84ff8887d737f65f9664f94801b2cd1f11aec336c0dbd4ec236d1cc4fc257489dc9709"
+        "dfa64eae3653ac66ab32344936c03eeb06d5852d",
+        "12ad0aa248db4fbc649f503e93f86104cb705d88c58e01d3ae0099590a69aa006aa7efb",
+        "04008d262f57f9528d55cc03c10bd63ded536bee9ecc617221d9892ae1a75b7cdee175cb"
+        "330754e40e8823e89fe23dd2748fb74e9e93c3b33f188f80377a32bc66f6a92da1804c04"
+        "cd",
+        "2405a351a3bf9a6dd548e8477452c4d9d719e32762754cd807a90abddd3ad380e197137",
+        "28c5d807ea1c3ddb7f2c90f3af644c5d6a2757336ae46c2c148752a2fc150e8183cfd83",
+        "397c8c52fd67b99792229194a787518db5be8e8c291b1a30e105b00f108ce41f8ec8fa9" },
+    { NID_sect283r1, NID_sha512,
+        "a73fb0aaec838d011110d49c5e94395ce07408917bacf7689d2cfe0948c582214b263c6b"
+        "80e0a55f1e159086817605723740569eeaa1bae96b979679165c5c35ef2142525e943e59"
+        "5e6b4b160acd7ebe41de19775346363f779b1f80b6d5f0785b92a648028e456af8496102"
+        "d19dc6526247a654bdae3368f075fa9ee92b2f4a",
+        "2cfbb8f340cae8e2e2322829148981cd9e509b0c65497fd8d9da5dee9dcfd39b0f7556c",
+        "040260bb17da74429f049f3a7eb73fea9cbeb5b14ce553d7772a365376d0114ed2ef3087"
+        "d005889e41bca54c09be20dd406a6e1f11f9d31d720e0c4e2e88f381ba89a97f12fa9faf"
+        "f0",
+        "3fd7cb455cd97f7f9cb888444f39569114589612b108657ac59178ffe31a33569c9f0bb",
+        "048a10915fd3bf9ffab1cb13632359466ccc539128cd98c6273d5d8d26c64d57520394a",
+        "2d0f67f9baffbb34094c5fce36f47cb73a537ff984c89e38d073678c21148056bdd6893" },
+    { NID_sect283r1, NID_sha512,
+        "eda775984c7c9f7db47af30dab314d070fb77e9b623baa6b73e2cbda800f167b20fdc2e7"
+        "219391efacf908f4ceed9b9b6bd3541b52ea087177e18c97391214758cf6455311fad336"
+        "ab56cfdce57a18add8cf85b0a0bd6fa7297dbaa34bfc8585b0f06a0aae055186658c227e"
+        "19cddb65de88d260f09f805c2e8854dcc524189d",
+        "070e82a1f3fa6158d15b7346dd56150faee5c98c9d07c996e01a06dc9b211b12ff62d60",
+        "0403d3ca5fe316a0820e84a8bb5d231bb14c810a87c7392d7f960e7cecacc56c337f88b0"
+        "ea027ac0ded5633a98ec5734db9de1399c83a181d522037266d856c83e5c8047c4eff2c4"
+        "e3",
+        "311b23487750c3c4b23b28424c33328c39d6f594d2a9b459a883508b985d8aca039a2b5",
+        "1465736c3c9e30e895b1544690e05108ca221cf2352ee4af1b5ee4130029a82b277b076",
+        "2819b94dca3a58cc5a96790871640fe0fae38883de6fb4712126c1c1cbfcb0c005c5af0" },
+    { NID_sect283r1, NID_sha512,
+        "a4a13e0bfa761b9bf37fade6570d41c161e20558874911ff3bee38e5649849b159beccf3"
+        "21c6bc7243f99c01a2fadbab9e157e9952ca65d8ea676c74fdc976d00501c626b8465c6c"
+        "f0e4fd1a7d1260aea987161b821528b0b423e62ecc5193a0a49442b0c3e4ec9c4786a3a8"
+        "6b199c07dd3a17033d430d2c83c100f54e0a7c31",
+        "0b471bbc5f7a07996e370da4a09e71e2119ab3a562a273f079401951fbe4df39a4493da",
+        "040333e9d5e077bc64d022e49d5d207385a19282aff1b73b307523b0f861b4ce4219308c"
+        "8205414e431f3b90a2d4a454d073cdd81f8b224180ac4139104166ec33ab33d079dd147e"
+        "bf",
+        "3e431c39ef6f4b7674a1bf414460b58998ed7aa5b1af7ddab746cbcd2ed9f42ae3827d8",
+        "151df78c0f453d396d71528032933566e176eb7f6910fa9df2e9b2f5ebb6038777ef209",
+        "08a1c4a1e21cc63fc15a78f0a11a1bc7a59a5a31f57091a12896fa670dfdc05c04053b7" },
+    { NID_sect283r1, NID_sha512,
+        "7ceda7a7248640f7055309ae712c19d741375d6a7e0608e07f0135bb830dc3e8863ee9e7"
+        "a75331a5e1bd38c42cdd484d4f45a26c2c1d4e05ce0d0ca941f4e94ecc6b371102f31633"
+        "629e9861de558bcb6407d66eb91f1062ac0e0409db68b9f2855296a7f42fc92359a7dae1"
+        "6c73fd2dddea52bd866a4d501aedd8fe3b3ea733",
+        "3c65cf80bfb507dff52f9bf2f93df0642020d41619b3990009409e7210fd7130ac44ffe",
+        "0403beb5b9b8785c5601093086b709c0a05955be42eca3d217e625349e5a875efa82d75e"
+        "d4007cd4e64475d628e6f562f0ac9c3f91075626063a52c2b621796e557799ab2f1ebf8d"
+        "bb",
+        "16212ce91eed7153fef806d2561912be1d988410641d5eb72d586cd4e6782deae4538a0",
+        "26ea04dded2cbeca81e75503932982c7fb5cc7d38a45a3fff8c4ed7f844dc759d8da302",
+        "061d3756e3da1c7816f0d72a8c84dd1f3b93624b631f5051c801af4e472fcf82d896c18" },
+    { NID_sect283r1, NID_sha512,
+        "609815edfd58c0e26a4b06dded831d2f33466a130754b96d8d7c3b4d99fd4b0789ec719b"
+        "c25338d0ae8c5880560c02687d352d77c291e406eae865c3b26d00f2e63dc644ce7e01d6"
+        "e96ceeac8bc1eeb257d36cbb25d89b5fff6e30b6051506a0ae54cfaf6214f30985d54cab"
+        "78f708029c1fc0175bc58e888db89dea8d300abc",
+        "0f4d33a9c7e6744ab3c441828bf0f1866ae1c042cc54abc754e3801263a96cbb3955dfc",
+        "0404b925b97bbe67adbb6e918acbcae0ced8dcf11d012e1a97875b750bbb7d01945bd64d"
+        "f304591cc9caabc0db8fe9047e6b1f8d850ac4389fe67bb84f6846b631dc3524c8dbe6a0"
+        "6d",
+        "0483aefcad5e382351125b333dcede8ef50914b1d1f1843b075f242acba18c290c742cb",
+        "1fb791c288e2cd52d3837c56b02fc99f53a6ee27ad6dd9c0a31ca08d8fa64eefccc5c87",
+        "0a041ca35422d8985c1c706dcb0b8ece64b65285bd0a934cdb41fc08223885147281869" },
+    { NID_sect283r1, NID_sha512,
+        "82d8ebba707b72655497320200ce719520c1ae7f46f38122958fd99322c25c9f4d4344bc"
+        "b77a6658df0eece5df163412ecdca58475d56b0c2d14a0361e4cef458df146925d473a43"
+        "692b15e9bbec550f1bde3444f2a5b2ecb55d2abd273ae999f16a32333529d94455e485ca"
+        "4585e6b07bedbfc2bd1eb766abf0d28bdb1ae6ec",
+        "3a4824bdcea6a144d85f1b194431724cc49849b6cb949b4766d641ae95477d1ec3d1464",
+        "0402c9eb36eca01dc2fe921933f4cebe8046b3679abed80d2f8fbcf8f254bf17be3d551a"
+        "56034c836aa4e946425fc9f49f3f62e33d8a0afd320292a34d0ef8bde8ad79a10e3f95f2"
+        "f1",
+        "23d8725af57d835018e8737fb4e8b2eed3ec5a83fda137c710fc1df875416ff82fba90a",
+        "0d9f57ba8b6a9a1cbba67adfbb938211ed2d267468f79ad39ea1eca7271d135bb67c18c",
+        "0f09a600d97c69ab521bd1ed6bcf0c0f69255c334e0aea06c68bba81d53e810cc553c9d" },
+    { NID_sect283r1, NID_sha512,
+        "9c6fce18a6a96349b10c9f2f5f1505c8ab727a650b44bc0782a5f39fcb48b45fc7c1b821"
+        "80d5f229b8abfc807071f931d333d265fc940c93fae7520d8d40ef59d7c6e3678c6a2ecd"
+        "e52b6a8827b1ffc6ed269cb9832feb20e593a7e3d4708309342875199eb2ffceba7ecd70"
+        "7b122516c815e83e27872eda812e3ea52ee3c4a8",
+        "27ba543ea785df1d53d4ae4c1bd0a3a994cddf0c25d2b4e8ff17ea7aa00619e858da1a5",
+        "0407d375a9e78ccee85fd795e3fe6bc07f50af3456edda1ab00303f6de6b5b02fe09859c"
+        "63008d0d54ab9a239b5ff955452b32bfd2372fe095751bea4b56d52f79b4fda0fa635f57"
+        "f9",
+        "00ee7010af4a517502cc5d5433d98916f6750e8a9009ea04b8132268673d4a02a3e2031",
+        "3c147b66efa47a842eb90371eeae907f0c813ca0937e488da95ff8ee16d389f3ab902ff",
+        "01469d005eacd9ac84a140c93ed0aee09083a4822730a28df35058cad29267eacf03968" },
+    { NID_sect283r1, NID_sha512,
+        "5eac15a64c7653d125605869012b8f036804817aedacbb5a5248a595ee0c12329f91e817"
+        "9c187192d3ed0d4ca2e202d8d4d9c93ad3f3ed931121c193af5b47a8a5dc39775b6c2d70"
+        "2708e5134f77a31bd62eaf87e39e6fd3f2b9f782c3057e162dd53b3addf92bf0ab99835c"
+        "7f6649abd1c5322a1ebb2ba313df9464a74c14d3",
+        "0708d0907d14dcd5f40e2903e1e90e48a0ffaa6d4d9b84ca14df4e985c294f74eb9f2d2",
+        "0406fb0fe1c3d5bfee5399c98518bc3ff135e0c351243fa0540717a9b1f7990eb8cf4359"
+        "7f05212fd4d6a50c08cd99ee5988103fa639b1123c878d416cc553639bdcee1f8e927bdc"
+        "8f",
+        "151465f40204d76f3bfc2e4052549869c19da82c678c332f536ef24567ea034358866c8",
+        "0803d3e8c876d46a9198f2f769faa76c4f66bc5ff4298b9640ccb8e67ff8d10f86342c4",
+        "00da3344354114d163d14d4c288785adbf9a8b31371c6e4420383c80ba0a430019c6acf" },
+    { NID_sect283r1, NID_sha512,
+        "df735a7e60bc267b18f313ad56bff830be5ef119baf43ce27c6368ff1dd89f010afd4f48"
+        "740b11c12101c5903bfa71d6cb3d6462cf875bbd55a570ffedf3564088dfe8c8d3148231"
+        "b78b5adaa6c53696737d4704daa59eab8d986fc6e519e81540f201e77b923a6a4af65d71"
+        "73635b3b19b2023022186a7b8e869e1ed51717ab",
+        "21fb0a6b94080da8b8299b87457dc09d21bc430ba5f3359d92aacc1151be9941739567e",
+        "040179831c55ead3d11844fea2e18d25cd4d658822e626550aef1afe37d88aadbcc9bfd6"
+        "66075f8087d759ede340157667c1bb12be272b8318aedf2e8f8b487f4bcd12a50ca66f92"
+        "81",
+        "37833e9aab843a6b967264fdb705b419ed63fbb09c12170491019acc7c21b9ee28a00ba",
+        "1c9601440d109a3f4eb69a1a669bdaab9f4222a34a04ace8ae313b10bbb66811bea7d5b",
+        "3d2f9ad7595dcff69b65f035ce600f2667f8499d3bd25f789d3f3c1bf83d2855f68eafc" },
+    { NID_sect283r1, NID_sha512,
+        "bb107b0eeaf175a786a61db923bc6d51dad5e922e85e57536118e032167b197b1a1f62d9"
+        "bbcde04922fde781665c1094181c16ac914cf6fbbfb27bb8346b2134f05c55a8c6b9b481"
+        "273758e380666d6e22c28577c29446cecc5c3df9ed9f1be060ca55ab2b7fda36a147aeb4"
+        "6df0275bb923e0876b703452fab42f6b7ad2ceb0",
+        "2c80151f91301fb6b0c7685bd172f20515b46bf94dbc4160d0720fbaedd40ec00084447",
+        "0404a62b0c9749ae9ff00dc1d50d2b4a4941741abfdf13c8e416549ea27fc26b14f191f2"
+        "4302c9cdab7c6512c322bd200167eb9657f8e8c84864b57480a80a3c6efbaa289ab8cbe4"
+        "d8",
+        "3df951f8c4490fc7c2d50a72a93e0e82c5a20be8d91afd890d6846bfd146169ab58b382",
+        "1f2accc7f7c4b5f877e12cc17b227e1ba110577c9f4e1785e6dacd8491bc6017129d798",
+        "27a167e6f2b43ce9663b810ed4f8ef15029fb6f2be2ddf25c014d844953f501d1dcf6d6" },
+    { NID_sect283r1, NID_sha512,
+        "f47e49ae30b09b7666600b7a95e81b0afa1553da5e01fd917e4ce1b58dfaddb8dc8c03c0"
+        "f5591f533610deb6a7bb5faf5dd1ec4103a587a1a4c58a110a706b0f301a5c408b3d984c"
+        "210d5b4a0b347d2b5447271f25b527b3c7864f7cdfa735dfded47c63b723fa0f0413c57a"
+        "24ffde9a95c35f743f892ab1ed1df704cde82d9c",
+        "1538abd7ce8a6028d01604b1b87db3aaf720e04220edf4d1d28c2d731aa25f509e58f2f",
+        "0403076b5c3a12b8a2e1368c7e3458458dd7ba6c5a6dda8c82cc6b30d1ef767d36e01520"
+        "7f0369c7a80cf01e9f32c08f9924db08a7d0dfa5e9a8e0e29b57f5eea8506841e6e3da04"
+        "f0",
+        "3f0052ba6ae6bd7a7aeb077a764d21caced6b241f63616ae4e4f0d98d2bfc0e44dca592",
+        "01281bc0bd36ba1f3e1c262d98ddf4e9bf1d80dbf97db02089fdf1d2e625abb5733ec3d",
+        "076db2215d9f33054efb397c449f05db198d38a24749f046ee20032f5899dc142052e37" },
+    { NID_sect409r1, NID_sha224,
+        "f2380acb0d869d1cf2e25a6bd46ebe49d1c9270624c5507be4299fe773749596d07d10f7"
+        "c2be1c0b27e86f27b4a6f8dff68cfe5c0b4c58dad1b4ebec7bd00ab195fdd635d9fa8a15"
+        "acf81816868d737b8922379648ed70022b98c388ede5355e4d50e6bc9ec57737d8843fab"
+        "da78054e92777c4b90466a5af35dd79e5d7a81ce",
+        "0beb0df3b0e05a4b5cf67abef2b1827f5f3ada4a0e6c3f23d698f15a3176cb40e85bf741"
+        "c9fbc78c9e207fa7302657527fd92fb",
+        "0401da1761981a65cb5c77ec50ebf7acc11eaf44bdd2f70242340ec26ffada7a4b5f661e"
+        "13d6e7ad341cd7dd1ca491cb7a0b580be3019ba11e4c4f2f5507d6bd2aa2f96b03510a03"
+        "d5f8c38bcc8acd08080d9effd1f8ae5a5586603b2e112964514c831bf786b2fcb2",
+        "091e575fc79444fd2d9021bc267a1a076438d73464726bd0fe4ac2884a374e71bd462b15"
+        "16b3e97c3202854bd0a286214b9e92c",
+        "057ab9d5cf4d18f05eaf17d3b5a4af96c3eda8ee48acf5e02eefdfe2f542cde32a37c04f"
+        "285794ddccbb14383a645db040bda81",
+        "05275de4157b32723366a0d63831e6512241e3e4416f3af02e22da8faeabbddd76116030"
+        "4927a71cfff4d6e8937347c9b78cd3b" },
+    { NID_sect409r1, NID_sha224,
+        "22a97fc0a9694dabc6f274ab52eb592dbbe8beeb646ebe6cef60eff341a13017eef980ab"
+        "a6d24ab3afd976e2f6a84cf652654d4a54a36b2f2f62fab8858f8b0479a48fe9f47f8fd5"
+        "a4a1f3141a91cbca186507b2bbfef5e4c4d2df525f04ef7c4720fb443ccad540f03a2be4"
+        "68d88c9545d1dad579fd7cbcd103bbebc9e9f961",
+        "0504865a30984a9b273d1bc289d734d10e0aa56e93ab14720f1a42a27d8cc932cb8804b9"
+        "63175de6fe57d8eafa8ab7ea0592dfa",
+        "04002de5872c40a79d5238722fcb94d5158009e28fb41ea012e92028dc3c87855fba71f5"
+        "0e6d0dff709867de185f9a9671e7a91e2f00fbf607f69609ae96982bda3f0317fe46ad1e"
+        "0207030fdca702cd97fb5d5732f3abab24b10669875a64bd2a74c8603897c78d22",
+        "032d0f950d10d028db6e9115e9944e7c768e2da731df49dc9128bf145a747662de08cbe0"
+        "517fca6fa185abdfcc4e3ab604e196f",
+        "0e7d16daa689ddeb08074285f5293bd9f1c051ca5589e69e4b62c32af110b6f3981d9624"
+        "df15c7cac0ddd62aee9c41c7b6d690b",
+        "02f6bdcc551aef0e4e8da2df38288dcc29fe600de2f8b6cd8149f88146150790915148f0"
+        "69372151c3bdc4d719526eff252e610" },
+    { NID_sect409r1, NID_sha224,
+        "af36c04af0e3fd64bf52dedf52fb788d2d1bd67fe05d98880cc7ad3c20436abf02f637fc"
+        "ec209fbf888903fdec8682717299f8a4386768153b7faeb6581db57fb9aaf4615b4ea8d9"
+        "24198fdd158363a1f40312527d6bd14c13d19985b668c6b88a7548104b1ff057d07082ee"
+        "a421f50062a315bc3866378f2d2d634f03fbc0cf",
+        "0cc08a4ea5ebe32027885a8c212870e7c45b6c610117994d6a42a284c05199414a3a0e8e"
+        "6645ac5c2ebf21c505a601f69c62b85",
+        "04009d2beb607f2bab64451327e1dc67f04f7569ffc0c67b410c6db06dc04edddb1362ce"
+        "8d8b8220be77c447640e7d0c676e5ad1d500ab813e800e75b6012faea43be56fe9d5a22c"
+        "d46fb1f4f1ba65eab19f75f2ce9d8187e4940fddc485c42cd18d40d47415a80b02",
+        "0cfcc307f847eb696f16af32502690711ffbaa2e60e75f80cbcf7704152d5eeb9ddeb701"
+        "952dd58fefb159926a83245fefa6196",
+        "068d1c646dca56393caf3239d9fb30d1dc56f991a8dfdbc0a7b69d273aec69a53056d955"
+        "3e105c7917e522ffe446cbea23227c8",
+        "01db30aceed2b126cf45163b9d878a6590e9ac8284a31ccb0faeba2202679f181eaebb66"
+        "4b5537f408b693800f24da590082dfe" },
+    { NID_sect409r1, NID_sha224,
+        "6bd6f52a6204b60f37929aeff28c87ef61ddeecc231e52a7772275f9329add899c130956"
+        "f8c50ac2698aad3654fdb49b74a6427a62a11eca0a8ee8b719b8c0df7b9f0bb0af5fef49"
+        "18a8c83367d29fddd04b6a1ecad904471e5b59c8fe3cdb06b4f8f96419518dda960845d8"
+        "3c49a49f1b1f2fd1d2682a9d60c25fe3ce982cf7",
+        "07156ef0a74ee1119532a2a7e8c02be1559c3c21897af9d5b34553c3d0feca4a8d5929d1"
+        "945df824478e0c0b92a6fac8c84f639",
+        "04001df419310cf133408e9bdb32fd85f8f0950263e1886f2e2e108a596e7e76153ec47b"
+        "f9b33f69c1128dfbf52557f3c382de85f1016a15517a811c77cc67ec4fe2bcba1290e498"
+        "1880c071318aee28e30854692ed2d6bfb71e6e74fa97af750889ae8d010189733c",
+        "063f127c38160e85acdd4d5dee1db1c32cd9da6075b2d2f46b010636e374e0262a045339"
+        "4aaa8bbb5fe7b2dbcbcd62ad601cf51",
+        "0250cf50d52a5950999b9c0ddef219218f76dd9f22a2213def9ba98d258c2f8359d08d0e"
+        "fc208e23ea3614c9e27b2e4576b9c12",
+        "063479550873dea8a3ec0306ffa9252739c34c87bbac56d3d9138764347d5220bea9c27d"
+        "6a308dc2ec53724d6d3ac4862d1735a" },
+    { NID_sect409r1, NID_sha224,
+        "0eb8de25f63abc9cba16823270e9b6f3fdedf0fb90f6652a34688970932e3ae98f6d3bf0"
+        "fefc5f247f72960a6975bff1f1acc2188a1775fe8974b2bb2b4c8d226ceb735113a14009"
+        "e8ce66d58808fada4e6f697fd016829913352c0f659b6be354a067df00cf74919580750a"
+        "a6064f21264d89dcb28b3b2d4d699115c36d1310",
+        "0a95c7abffa92e2c637611ccba66ff9d2ab121b40a85c5b71454cb0dca1f098ce1be8d9e"
+        "a4933d1a91bcd270c5a33687835d6e4",
+        "040048e6b8614c0c7156dc41884e17e36ef528a493c28c9e6275c3454d83beb939ccc749"
+        "52732c18424ba21b8ea9c528966c692141000ef9efe1145029d8d60d14dcf079d43e3cea"
+        "0e18010f680bddc2729ffbff9a981cef2cb595a69142b25a0a39863a929adb635a",
+        "0f43af45b0dd631bfe38d85979ff1612140b9cf80b4504857df17279d9d8ea12d5bcd292"
+        "0fcec81326f15832df6774b9c4bf5b9",
+        "099f403ced566fde4d9755258445b6d6c2a4e234f99425aaa78ef118321f8579fb513ccb"
+        "b71cc2732e31668a6a6bb0fdc7f4018",
+        "0d8568971a4f219d6d3d8bea6aecb4bf7de53886d2e6bbb0f71d054c63768c34d4d18830"
+        "00019c59168fbb32f4317330084f979" },
+    { NID_sect409r1, NID_sha224,
+        "cad58ca7a3b9967dc0ab62a43037764f8074ef9177d60bd98f623d693333971c24a575ed"
+        "03cb61f4dc2e3d6285fb1204502a540f3c0bbbf23f5bbbd1544f322ce35d949d8b1d8ede"
+        "b82e90927ac67ad49c91007056bf5096bd690d15ac00e1874fe33293d8003a4a2b094078"
+        "cf09af799dde384143350c54a99e1f99cc31f2d1",
+        "02c438b07c6e0685d1f94a4bbafc013f8f21265d893f54e54c3ac2071606ad1ffacace0b"
+        "8367aad724b1d9508c65ce52282e397",
+        "0401fca66bdddefcc3c2072ea32f026c975a2c392dd7ed7e93e94a810e1125ec161bed69"
+        "8d8305830eb66fca5eeb71934ab3fd79b10189c22a2c9f1fd7624f805fdf4faeeb931709"
+        "d745a3feaa3cf04824f5fa58bbda144d4e96d83ce1e3282bd5fc9c50bcd68f5408",
+        "09230aa7b58505e2dc2f205b70a09cb9f4d8272f465b7380195ede0f7770af2a33f7623c"
+        "310a0520e7436835cfcaf32467f154e",
+        "013d0e70d8f4b1563efbd3c46feee15b88358562f769046f39df6d00477815e6b8763c02"
+        "3807eda87a86338c7b64214784fa2cb",
+        "0662f43fabd03a0c05ebba700203fa2188e16504f8655bfd0fd090b109e68220122dff7a"
+        "6cbb8bae08612e0d516e9f95ac15368" },
+    { NID_sect409r1, NID_sha224,
+        "281ce2643799bbfacc7d5993683a4fa656040517854f3c2dc7c4f8848dc305382e34e894"
+        "d433caf12d8b493020a6a08d1fa05b08bf6c53127ad5f33bbe75b9db0615e3dd94408d02"
+        "8dcf3cb7598f6e7cb4c787681dabac7cba2cc06fccb7506fece6c7c1c1bf622d525ae973"
+        "7085ab4ac578905950002024f30159cf0d99f50c",
+        "09e8658f8f9e6cd98c0f4f0fd20d64d725653aeba339504def17f3ad12a63dc6157d8080"
+        "4e5f43f4ff48fc5573fde2c615ed31b",
+        "04015088531d914113a25f1598ba1d3cc611e27ea92ce8dc807fe8d446db14ef62ae2f06"
+        "c293bcdd739f916cfedfc481fd941b4feb00a9135dc1b0384e7169fb4648973559e50831"
+        "9235a3f41ba174d5f58307448671cf22a3649168495c36b0bced09ac6df98f14db",
+        "0d398fbed52228fe16d32a6ef539e4ee3858a1df327bec999ca25cdbc357de5a75903909"
+        "973bbb0a5d0269862a74623a38da515",
+        "0e38910abb3d84b2b26ed17d2124f4787dc5612942e98521d9f94baac3d14159eeef9e09"
+        "b9b20c807b479ba84640730a4ced4c8",
+        "0e370e575302ab0d8d08d5270fe89ba524b5bf21e43e70c4d335ec1525ff5696ced37f0d"
+        "e17e109fd833e5d179bcd4df42d7882" },
+    { NID_sect409r1, NID_sha224,
+        "0c061da1a16f2be130ae3b20b89745e840bee09633fb49671db28ec9a051545f57ee07e2"
+        "410ae7ebc61c9af79868d3047705bfc64ac0c04ef0b286e579b650c7165443631e49e6a5"
+        "3c84cefa5625b1e1035a6ed89b8e839540040151132a937666524265e099272c1849f806"
+        "db0fdf2be64960d5b5853965099459968e5beb32",
+        "0c4c13f65eacce85a51881caa6f82d9e48ec2ac574947d2751823a7f072d38bd9da0cdf3"
+        "0b6f19084a6d291052e7bbc2e1349e1",
+        "0400af93430dd77e6016d1b076a52126a729f77e34bb3db11328d9edd56e29a7a09a7b6a"
+        "54f72076fcba886ea78ab6ad81de43a82101419e1bc339c03a8b4413ff009d76f9a19e20"
+        "1876ebbfbb3dc771b7df07bc19eb893ce23e40c679d7909c33af2bcd7d6306c0bc",
+        "0889be0918e7ef34d3ed226f967301a10fc30111b3559e37f5fa5a57dd5c73ff672c5279"
+        "d096c5b04c68b71d55e549d019281a5",
+        "0a4bddba9b7a402b584ceb82a54baab61e81973b7347e6dc9e3ce0f1e50dc21c9569d8ec"
+        "f8a7da97c38e92e52636eb13d3b4c02",
+        "063c7291656466f7bd647073a50f410a2cd9e8c938aa1fd3b28ddc1cbdd7b78b757689dd"
+        "661f5173f79896780ac3fdd4f3171ac" },
+    { NID_sect409r1, NID_sha224,
+        "74ac2e1303297efc3ed8e624722df505df55b7f33964cc0d270604cc48b58205d8a11952"
+        "232a8feb0079baa30d7d33660268b56a5a3dd90105f0703abef8f6636a99bc63bd47d9df"
+        "100351bee32d8205dab0dbd2af36fd173409ff8d1fb7b24570f3c1e968458f58aea5aa2f"
+        "46731ee91ffd6d3a060af6b3d5020daf1362af3e",
+        "0da591461791ae7847e6d8dd8df46a63d3021644abe9520e158406c96540d8fd82ecfb1c"
+        "3f6f5cfd7688c7656cc3e3dc94e586e",
+        "0401f48c95301956c62e2fd931df49953519b88ec3915c8de495dcb4ccba97bee023b1a6"
+        "cd9a66dca29aeef8f4f1117eb954e47cdb010db6bf78cfeb92d29a922c4b05daa3cdff39"
+        "17ba6978fe738296956ed141c749a938ca9f8f13f711aec930e0f1948ce7daf9f6",
+        "00576a91862cd63acc067563626977fee6f074d5726cf4f68e80d25029d4b8efe5ea8457"
+        "45c45e4cd42879e52854c3f385a10b1",
+        "0806435400248ec38a6d362e8b2cafc3f3bd46ba5baf538cd97683f76a733ba2b4ca85fa"
+        "7d13b99f4076e7616e68d66f05ebd8b",
+        "00ecae395fb324b4366f238f0df22d011bde5db6b0cf4189e3ad47101067ba87336ca47d"
+        "637f09f7a40a1bc64de8c4aef7f497c" },
+    { NID_sect409r1, NID_sha224,
+        "2afd17344552ccc577b0118caeb7dd56a0766e25f84df17c0505f9798931374b48df89a4"
+        "8c64e199108c36e00c0bf00a97ccde55787bb97c6765601765ab5417f3e75e35a9fe5e0f"
+        "85a721d9f08440ed617afcdc200b318940a1e496040a6ad9090476b0fb4fcceee77b3fea"
+        "11de09e7fb14853d1fff8ab12d66c101257e2d4f",
+        "0b5eb943f0dd390b737510e2bb703a67f2dd89dc9f6dca6790bc7a260cb2d0fb8e1a81ad"
+        "6009ed51010e7686d5b48233c6c1686",
+        "04001ac00da454bc329f7c13950c848392cb4f31594fb7837f0986f61601fe244eca3db6"
+        "c4f92accc2fbd1a4b8597b70e72d88b103009a364065a9f67a0aa7518b75a0b4a9140787"
+        "a67f852fa31342d6275c14713d484dec3116b9dbbb8af1d4945639997ded09cbc7",
+        "049176093dcde8549f95a8f1d1c87230046fd4b18a73243c3599815d4df8387a843bc8fe"
+        "1fd67f3c6bbe394547e11866f41acaf",
+        "09d7c4ddee55f61c5c4c2ac6efbba6164900344004976381c7b18c1de541a97cb58e14d1"
+        "4b6e433c4eb6d4bfe6d3e0a4e457469",
+        "0a9acf355bad544b3b120522365bcaa1e1dc6f1d3df1e30d3beb94f639e26147a81d154a"
+        "684bbafac965bc39974c505fd0f811d" },
+    { NID_sect409r1, NID_sha224,
+        "174b2b083541f8284645a810801e72631a11bd7bb805f684a7159e055afc44357f2c80df"
+        "2b7853678d34a04144e0ede2327d03db6df23769ec41194a8d9d86af74d51c5bc11ea878"
+        "c6a80689af71d3fdaf1c651003385332a512e03dd040c33d9c328ca89ec7ee9026bbacf3"
+        "0a7f3a68e0d894fb9f7100ffbc64bf17679dedd1",
+        "09cc63f32152284fca27ab2837bf1343144336a1fdf15b9727c47e877ac69ac9cf4c97b4"
+        "bf42f1ab10d73de8597a554ed099efa",
+        "040044e655ad66ca9af330c33bc6d00ccbe4533a4c6a44a3f23c921b62eeec8cc1918e19"
+        "956f3ed848fed93a7fd7ddea57096d1f23003a71b221c85607821cd864af6f533f216b64"
+        "1ceae104b8e16dbfdfe7edcb2cf9ee0dc1679b696149ff42a051c51c861a3c7530",
+        "0db9bfe4c2e659006d31a7b44eb7bcd6dd23810f27c74dd587ab9af23aa5962dd18aef1e"
+        "95da4ebf4aabfd558cbf72d2951bd44",
+        "0c3b91bf0794eca7faf227c4ee4085eac6d6918803242bff4da9c5dbac2e23fc32a4d4a1"
+        "92d7737be22810812558f820b0a2c13",
+        "03120a558c0edb58ae7ba36e886084801e7604558238c85a199af6c9e7506ea4e748791b"
+        "04f3a92354a4f1407837d87faab66ad" },
+    { NID_sect409r1, NID_sha224,
+        "758df71a952cdcffdc417b9fffdfb57582ab5c5473a8bdf0c2101953b023b77824263353"
+        "dea0e2ede1f800a5757ec6ac0e1e4e3ab5a4cd85567d2d19acc6b7069a6e7368401cba2b"
+        "6e642373654bec0ddd19fbf032794c15b7ef7e714e13e36875262c01e77766ed53cbcf73"
+        "5936dc9b33eaf2152a396349c82ca0297dbae4a5",
+        "09950355e8667bea8bbe3a2c4988436ab5394551b375e27fdc0c1a1d1b07ae957932f428"
+        "f1aca0a486e54cd0b5bb0a5c5650641",
+        "04002f623f81fb9a299b71ea8c58d5bd7d89e7be66ed8cfd7370de515eaceac903644383"
+        "38a3fcf9981f1b6f0b30bc61c4b7c15791016130b7c4061422d70b21251fa9c3d4e9636f"
+        "5a08cea794a0fddf74ff5ab1b750cce0f2768d54fb2fb75e2851c2296b39c0ddd2",
+        "038e8c70cd35591012f45f27980095c4bcbb3bd36bec594927968d3747618c7f5810ea9e"
+        "0a126e4d3e1e08185b031dbe0b37e5c",
+        "0cf957d59b03aed0e48189d2b9256b5472c8a48b4911f9cec14adce5c6b4aa22d093a116"
+        "364bcae01c1a739a4023da12a29c058",
+        "04cc2c22b243064758f52264ed84e757ff67c4f6596edcfe956b70f777d865d01e529f0a"
+        "8a9a6e1895168780ab60950a62d2d2c" },
+    { NID_sect409r1, NID_sha224,
+        "b96d9f66b2000e9408d602096f032b112f0e05ea874229ab9daf6e05bee49b4722e4f2d8"
+        "bf2eeaab9dad94438c76b7cc64dcbb59cb4e03f9ac70487a1d24d8d6b72d7462fe738a17"
+        "edf381d52179b3acc0c0177c113eb4d10e8e78041deac1d56abda0ddf892edb8be956d28"
+        "5e7236bc6794168f8a180f622dd5f2b9e690c275",
+        "0a995493d6971c2d7e8fac3da9f8c0b5afd877cfb94924cfecc167f9d87002136ab253e3"
+        "a4f9ddf5c9c99bb1dc1af0c6a3a3c4c",
+        "0400ac0e558dbca0fa6f013b7282e02717e91eb73304b4f7ac5e04f12f55824c441faebe"
+        "5bb5af82189044827007bffb1e2655794101178bb726242c718b416b21cdc9fd90b31ba6"
+        "a8350f9b4ce3a188b1b5dffd0e8894ae6a417c4d74c920fda585624eed4c1d3f99",
+        "0d581293ab1e509baa50852bd3f21f6493cc524a2c16206e461e320c7f2c1c201b9d2a1d"
+        "d4207227592a6457670a67cb72eeb58",
+        "022624cbbae5214d2c29e273c334b9ea78e10c7efff3611574d5fdf6f67a81472b606e02"
+        "36aa47106097b9147fc1b56d062966e",
+        "08895d107ba789d88a17c30a537402591ed788206487697a72f69285ee5eb4f03cdad6c2"
+        "604e174ef4b9bb919d8b39bee6231c7" },
+    { NID_sect409r1, NID_sha224,
+        "e7ae60ac55e6ba62a75d5328bbc15269d4638764169de0bf0df043d15f9152bed909b1fb"
+        "8c7a8d8e88ac4f552c1092b62db00958a3a827f64896f6de4bbd8fa5258d6c36e3904d82"
+        "d3eacf6eedba50b0242eb6b01212288448c3a9821c4fa493869c01149ff1850e8115cf9d"
+        "e1618cb8744626b1951d1de305745507c8b21045",
+        "070daf435cdc26ad66c3186267ad12d10f28d32d863f950cbfcf042fe9dfce553750ad09"
+        "8f82f7f1650c1126b3e4451bee6e11f",
+        "04019b41af3b557c274cf117d501ce7ccd04d8bff2dfc737d7efcd7888f2dda24737a678"
+        "8f16b3b6cd589d3f65bd95194799d65659011983077a2c371fcadbf47b10494f6ffc7ca8"
+        "873b3d812c45a87c48e1b49edacc0ac37e5038cf1aba20360b74c0903c23a62331",
+        "043fb8cb87591747d12f4897dfbbc79644b87907bdefdbd7ff0f6f2e7970c7d40bb2fc08"
+        "c17443d029a92487869f640607af460",
+        "05ea3493a8c04723de9de2cbd523481e3a8593ae8f010ecbd5add6db5a82d9b13ee7d24e"
+        "cb417419639d0e9f4e68d14f6799829",
+        "0a9bbaded0a2894e384184e166bc06e1b2fabdc70536caeb3d0cd46b955743cfa8ac6edd"
+        "03760d1b613fb445367734fa4270139" },
+    { NID_sect409r1, NID_sha224,
+        "666b0dc2ddffaa7ffd57ea3b2768f02d4b77c16fa007c6d1918400d195f068cae2dcaa69"
+        "817e6e4c70d5b29c5598efe2d957bd12d0fafdcf5ac52dee80a2d46e77fc18cce2a49bfd"
+        "787ff77b942c753974d22434742bdb494590d17c42af725b1309e54566276af3bcfbf5e1"
+        "74d3cf191b85903faafa1583282c97e66c5da6c4",
+        "0f8121980dfbe9ad0bf92383c7cab95fb72d5caba96e1de7772c6a179e85414802fbb86d"
+        "725401451329287305570ec7fdd873a",
+        "0400c62f4e7eaf3f1bbae71734c86b8a40ed1297b9ba1151729f9363824425193e8605c2"
+        "bcd6094aecc9d7ef2a41aa6b12877291cd01882a45555b68596dbc8bb093dbf1aab9900c"
+        "f46653c58f5656f3688fbc72c5236297be2f0586a4031279b9014f2d3655adef41",
+        "0b4b5b19922bf6a34a00454374589f9c89745eb194b0352061a79401e23c0c0e1fecd759"
+        "7b5a7cc1c463b76cce7ab921867de00",
+        "0f1fcb80a4fb49348fb326e808d8ed8c21c376f0713429a22bfe16d68cab0295b21d4402"
+        "9083769761c4fb853662d440eba4cfa",
+        "0252a94a40008cc2c1a69113d8e14e989e7fe13918a2852de6930973a91784eb35e20d8a"
+        "e150a88c459167f8ece998cbf6c5eb7" },
+    { NID_sect409r1, NID_sha256,
+        "3e967cbc2bd936e0b6125dc5cf885735bdcd2d95b2f764de6931c4578ac8e0e87abdf963"
+        "75481df67dbe1b6c43537e84ec62bfca6672cc5f3ea4125abd4a4119edffe04e42411d33"
+        "8e8b10abb1f1f818c50a9631a3f89feb5be5367bdcb0a8a82c96a427ba6ce99f9631d441"
+        "1a2b7f5b14d32cb3901dc9d285e4cf5508940942",
+        "047682b2e3bcb5800a531858e8137692a9b1ee98ea74e929ce4c919c26ae3b3f1d4122d0"
+        "7fd9a70d8315fab727ccb67004187a3",
+        "04017ffffc1d2009e844f8e625a3bf11749a8b4ea0b0fe3532d124112edddf72d518ef57"
+        "7f160962b88ee38b11445fdd356a26bcc500ca356fa8e90325aafb1826a694a55a80b2af"
+        "52e70ad8d507d48946392da8b9fa27b8ff6927fe5130c69809d9a2c4b1d7eff309",
+        "058edc8f3665ff9166af55e69aab9d468f576bcc8f652e950082a48224b4923cb9396ed4"
+        "ae06f05bcf7797352035484fdc501fe",
+        "09b46600fb3b8204d4cb63ddfaad1482dd8cf8652f63c926895b8b8ebfe27295c052b3bb"
+        "81dddd8687f4864f258a433010c89d0",
+        "0832f7674eea791b5f17db7cf9e2ab13253d870c6ab46ad01cdda30e78db8b8f51fd377d"
+        "d55ec7786ccc92b17364a3c17ad5be4" },
+    { NID_sect409r1, NID_sha256,
+        "ca1c90012eba4e7c5f01d8cb3814c58f48c03a16be6ed86934014365eee547070b870d1d"
+        "26a872cfd28b60d9ee0a66dea223e9eaa90ee28076188d6091f26f665684f4b486af7066"
+        "9555db9058d485c677b2a34d4a98aa8d6f43bf6f44aff2a23c5d765e98f0438ab81be058"
+        "5a5be29daece5d4116f44ce6062753a3ddc505f3",
+        "040cd1a06233ac27f3ddd108de7c6c0982793ee620d71982697713be9fd5143658929924"
+        "cc88747a680779bb00da8a44e1e7d3f",
+        "040164e518a6719b1ad61a38a214ebb06dfb0553bc760799e668b1d0d098ae3f06dffd9b"
+        "84c16de90db19043d72bed2601fda14b1d018e022ceb850eb1db59e6cf63c4a7c73bea0b"
+        "70448a7dea77d5ee8a2e1a36cbc46454bacd5954792de82f3ec21ca6a509b0c7aa",
+        "04a936fccec003bd9e8eb45d27c0eaedbd452e6fe99abaa62cbd0739bcf259cfb6884d1e"
+        "60b82522c6146f081663f6f863576c9",
+        "0dec1635f2698d4666df2c217fbe3e644d27592c5607a5549c877257cba7bee29a8cac75"
+        "a044e72d039747d0d18de1c34acf072",
+        "0138493216ffc3b8aa2e0c26f4fafaccd6609e6b15f767da7c907db64b5181bfdb447d73"
+        "ede786144c70ddce7df7eff46dee4f2" },
+    { NID_sect409r1, NID_sha256,
+        "a54c4351ebdb075d6a42a787647390f864b2bbfd8bb3d0e0ea9d767200fa344d1a9ff091"
+        "bddb186acd69bcaecd767068efe4d752d185bfe63f6674279d0e7192d2077c400bbc0d55"
+        "99ee28507c1253f05eae0687b965a015e1f3a292b4650106765266f5c95b77ad2d82a6a6"
+        "e012f233169eb6b8d83576901cfd4a927c54d7f4",
+        "01ca6f752aae4eb7fc9c73a08d6fbd96bfde5030d759a2507bd45b6e1d1487e53abbe98f"
+        "ad4f41976364e0a1d830910ccf97abc",
+        "0400f6b7220bd24652572b37a0ff25e75f72d583c71c159857482ca9944b956a117a6b2f"
+        "f96614898757b8a587e3c2b78d9943003d0118fe425768bbf3a4acade281c41c745c9ac9"
+        "46c2f8b95d65787fb6b64deb71e6b38fd8c721e01c87efc7c2a6d8066fe3b35a0c",
+        "04963aa161b5ffbe5d7e5058f0b1457ca1b9cd61d731a0470beefe5f8998904cf4594f98"
+        "dcb41283f66e2b07c5c5d6a6c587826",
+        "0abf824d43d993107b552d7ded13f49ea0ae7bb845e56ad7e53cc5f9d64f99f9f250e430"
+        "5ccd9f6594c92defa7f6860fab1c349",
+        "090a541f1844357f618e5ea34c0398ccbdab0cb363e266980ad304dfd675bc81c0345a4d"
+        "723fbcc76ab5ed4cb0ba0af1b71bcd9" },
+    { NID_sect409r1, NID_sha256,
+        "6723dbddc8720feeb75e2a061b7fc49079f999fbc79ec8a8e01ab8d35b438b7049da5a23"
+        "c49a58101742791f84f45d5f5cf551cd7de6926a0e2c4ffa1e378f038da597368c62df8c"
+        "d8349bf046de46d02183dc05b3a3575f5f232dd2970057200e2c9cb60eaa6b4d72f8b73d"
+        "4d40b98d1cc801d1a69cb5ed780a75a4064623b2",
+        "0fb9b1a9597d216028902abf743d25944258b48c9762d4589fe660396130b75f6006cacf"
+        "de60f6204463cb8c18b032de1dd68d2",
+        "04019b07f7f4ba100aa9e749bcf93a2c9955c442730c5e1f6f72c1b1d132b780d92f414a"
+        "533282f7b66677c8cc8a3d5ba8b3cd3cf7006ec6e9c495ccf600f8c19597e9cfdb639406"
+        "b04f57a29dcd1a7a843c2c44e8321bb8508953e9c0503f77d36bdef24d5d39f85b",
+        "0757f6acf74eb02b7ff3161b476dfd8349854154186c959179f11b9a15da3dface40ae6e"
+        "d771096e053976866433382e640283a",
+        "08fe276e7f63ce5f85fce19d1739a8a9986cd3c3fbe26fd59324efd98826f9db3b228321"
+        "b3ad1d96145ca23cc02616d9e9d7aa6",
+        "016e06de8e3e0abf4a4f52bd2f827ca4c57412adcce3271fb4014069713f3723a038bf56"
+        "0788d8dd48430d3b30faf15ad9c0d69" },
+    { NID_sect409r1, NID_sha256,
+        "ed53cec5e5500d62d38c829002916c657674ede4439c6f405ba672327ec677490e656bdd"
+        "698f114c2ab5e6a1fc94a1a8d64466cfe9eaabd23a8b5c37f76a3c0decdef73b3e7b751c"
+        "bf3b0817f4079560b5ea34cead88ba374201236bffc48eaf289bbaa4e828afa7d732473c"
+        "228ad00588c9b443d65b998f21c3d7a9e9196c08",
+        "032109202d754da290c266f74f47805a06e6b5c3f721a72fc97a3bffeb8887e0c642d49a"
+        "6bd034847d0a5ba09239c5dfdf0772d",
+        "0400f4dc8b94dfe0a27d4d41399005b242c3e5b14bc7cec55ff3a1561c894d73f365fa8f"
+        "a2ccde1fd7bf3760b96ab2db78d2d50b03013ac66e95c335b71fd1a98f101a392dd4696a"
+        "806239fbdd0708acc69333febb48d4b649f14f42841d66ce03f1fb557a361c12c1",
+        "0b010ef786c13ece3a10eaff79b93ef3899aa385dcc1914e16abba90de0ca6389d664082"
+        "fa727fa7c7907dc4c88bd621e6124c1",
+        "0488b8956c5999c317830206fc8b9f6760845c31bc4ba77584925dfe25c05a1e7d298a62"
+        "e9748c7278eba622713df59accdd78c",
+        "082701053ddfaa376c99cc42ad4587d84a358d9d8a9533888cc382623114aef51170de77"
+        "ecf64af02e09bee203851abb22f5d11" },
+    { NID_sect409r1, NID_sha256,
+        "13829401bd41e9fe01329e9f5a002f90f1a6ecbf25fc63e7c1345f265ff02e496230f706"
+        "c6ab377ea52d8707b54f8fc5c7f089044e2bec1dfc66a07da76ee12fb9ea0697d87706b0"
+        "ebf677600bd2fe117f6cdefb8bd636a1b6b97549ee78f992c24acdf3a946053f06fd012a"
+        "9c703efb8bd929a66aa74b05d61bff0395232b00",
+        "080536e820fac59b3203aea928475043b2576446619001647e35693a9e65d15236c3cbc1"
+        "2e1bbe0eb305973535c882b70197a92",
+        "04016d7448c0afe992f8c59b19d6cec64d8fc5b10026a806760bbdbbf0012063f46d31e5"
+        "21a34771f826669c4d1ddd58d3aa13ebc901a3742a6f231546f0704345b9b83c72d50365"
+        "22449cf60c1b3bdfa4c8d36e499d4ce62e6e7bb05c6132bed1ae44eed17414d2da",
+        "042753a515e607cf9992dd1f249820dafe53993b59b1e57d8f2f9100f609cc15713d27f5"
+        "dff4007e078d6da1061ddd36c169c21",
+        "07eeb1cc19ac45f52c0b63ff8ecf4f4f35958e86cc3e3a071a35446d490a426b48b6c287"
+        "027b003488573a4834a06dad48520c3",
+        "01410d85f3f2adf065b60a126170c43e34e0883338118cd33b0b3eafea1d142480b236ce"
+        "49d35fefd1ce4ad3d25e0cc9268b1d2" },
+    { NID_sect409r1, NID_sha256,
+        "e696acdfcc96a6c088069b7595ea9516a36d8fe04dedeb789fbd965db0cc64b7017a8210"
+        "15f6210b6989e515def5a9605fec0d337e4ac59f3101a505168bf72ab6d98ec62a71d2f9"
+        "4071fc05b95e98d4efc59fedc138e3e49c5d0b44d1f48f7b1e7c1944ee189b242950d2bc"
+        "804d31c7eeb45283c84638f043ab9533976433a4",
+        "0b05e5f0dad9583ea18fb8fc4d8c75fd2e3cf9e92cdd9b737485c953620d345006c31c28"
+        "8b380258b6500b84f729ce6730e5303",
+        "040157c083ad9789966905c212dcfd7c049a8ba3863fd4886e4b118b3f06445fb0d4745c"
+        "2a8a1193dc68915722089d0d382253b67500867e8efb575800f834c978ee2ecf0f84f72e"
+        "75dbbac86926b73fab8b47f38eee17a63baa02e3edb9d4f6b2fd2afc88b6de36bb",
+        "0c72eb08acb1d422999ee8d51f9ddef9f897dccfafd886998edd3ddf30a638dbd0ed59d6"
+        "8885ce242fb838f022bccd4f3b5f854",
+        "01f4dddcacb088f6e24d331e8b111e390735a41e1fc29da8f5ffdbf7342f4b9056786f2a"
+        "67159d1e57570bd69d69235ec562416",
+        "0809840df1ef8fce9b2edf8f970c07bdb5fb755e9d5bacd7996275c4f890173142c39299"
+        "ce9eeb51d21a32acfc7761d5a2cd7ef" },
+    { NID_sect409r1, NID_sha256,
+        "4058b9a8cc15ac148909eb97fa32aafbb6077b168dde91a411dbc973df7db056dc57ff78"
+        "f0abcb70f70f800bd752197d681f44df4a7817c0e7f60f8f65489ecb6167c14b525e91fd"
+        "2cc5d8b80ba380a83d031d5827c8b1262c687c90ef0e62723d9b565557f9f6fed0db48f3"
+        "799274c2cd60a14303406c35802cba6261121296",
+        "0be1d277813e79051ca1611c783d66003ef759b9e104f32298017fb97667b94dcee1ce80"
+        "7dc6b4d62416e65d4120523bf6a4edc",
+        "0401fed0171b5b3c6d9092a6592944680a08a0d4f99f08a3ad1c22b5bbf11c0e4ab3cdae"
+        "9526b0ca2b1bbd961362faccd5caeb1d3701ae7d57db848e5c86c31f542f1995c76e916d"
+        "ea9aba882865febca630bc6a10ceb6732bd5f07f51bf2f37ecae7b7fbbca618ae0",
+        "09e3585213c6d6706524e3c8e753a2eb0edced626498eacd842d44a73c602d801a079f94"
+        "b781ae1ac5d44209e8e3c729ed4e820",
+        "01098d98cf83c705515494cdef8c3f50ea8316d95b3ca5f9a1296f09021de57930184ee4"
+        "b9f563aebf5fd0d5abc0885cd24c0f2",
+        "0d9706f4474a8fb0c701505516699025fde546a21a3fe519a173a3ac01f683d40b4db264"
+        "2330bcdfe188693b15a476cd9339ae7" },
+    { NID_sect409r1, NID_sha256,
+        "e793237d46e265ab84ba9929b196405faa3b0e4686e8693567e53f68e6991e5767797467"
+        "7682a2510c4c35b1968a90b32c4941af7813775c061c008a60f9f671cf7419c94253d610"
+        "6b61e65034497f2d273a5058379bd986e3d917f708f0a2bebdba150f6d78a3af9c722a24"
+        "30ab0f4bad602e91e18aaf258e3785fee78e4502",
+        "073c807bd7e07379782ab790720de4ae5106f16d34e80ed70da5b1594e660c9b775db940"
+        "66b93e74f855f57d88b6ecc6228aace",
+        "0400301526b630ac3fca5085f633deadec27af353233e6f241772c7fdbfa42e47a04b0d3"
+        "ae38c04eef2109390a71fa9fda652343cf0137eacd97a8449ce83f19a13a248af52e512c"
+        "fab3e2ce1ceb789874cb08757dd9e47ac21b5c0846498d8d7cd90122c437602d52",
+        "09245ba1873114ee2a3e642c5b15049a3566a2f003cb3d25250028655fba98203feef5f3"
+        "07a9f4c77f232976d83723f2621eaa6",
+        "0c8136d4b998ca0544ca1430abf55601f259aac7756c75d1371de63d1471053c789833c5"
+        "cc257e323a71f80e21783df4efa169a",
+        "0e2ecc6f0a418bee5de7c2418c4ad85d981b18048f94865821de696488ee19291912ae7d"
+        "a1cf5fe9708e2beb18e6cad4e3f7849" },
+    { NID_sect409r1, NID_sha256,
+        "ffb8bc80e7619a562d8506eba7658bef0c25ace3dc1d01bdc2ef00933d4fa07b80364e5e"
+        "5826074edd46a707dbc3b0ab19eec7ea8990839d7fc0a80b70661204c52bcbef57c1a7bd"
+        "c861c10766033a82dafbead283d911a9502d5f9ef0a39d35ef26f3616212d4bafcd413ff"
+        "d18b424fe09b48ba02ca5d97ec996205cd49d22e",
+        "0a68379b2296a6c944ad5dacb593b302d8ef0b05873ce12bbc371d705f308c739d21f343"
+        "349524aa72f05341e64f7435daef112",
+        "04007fa0f698535b011833dac1ac96f3739ecf0c29f7fc1f8bd635f4f98daa70a3931061"
+        "1ef51b2fdc8b37eee3573dc34cd2528d3900be1a9dc30dabee3403da4f2dac6622e6fb84"
+        "96e72f3f17c169e7b554efd84ac655e727ae9520feaecc752601d5391270cf0cfc",
+        "0630547017103c3f97de48ab6b942db94b2db9ed7dab0391ea9e71c1b788c547abc90088"
+        "de5b3e36c9ee4280bb454c7c3710999",
+        "0916aac91ad329d6f330cb051941c781b9e59bfbfe45c4d4f6ce0d1aca982e1c612952bc"
+        "ea06784c57c121b14cc0dcca783d0c2",
+        "06a83d93f9bb81c61ac290906d74e2d3b964c39b4e96370f19cfb4a55a3f7901bca3deef"
+        "4bb79ca6a798fb9b3a9b0137c5a9324" },
+    { NID_sect409r1, NID_sha256,
+        "946bde90a5b903dd281a51d7fa93d80f3fed07eaf50c18fe9fac5acf67326bb18effa314"
+        "4e25c151efc006a50a274ec6c6a5d573051c4e2d117ceb0fa125acad07a10fb6534a8e5f"
+        "5b3da2a1136779c51377bf76c3a4a93c0c6158f729f2293e414fcb952c9509f228c804f0"
+        "adc1daa327a8991d48ccf4f3957c5f8ccbe3ad4a",
+        "026046bbb269ddb1ec14ade56175482343a21b7c265026cef3c7d6a1ae0f6a68166b9e6c"
+        "49a6e733ad2ad64df7137ef230038fb",
+        "0400d09d8118519f9d00df7514d2ff99483473f680b750604580b61017513870a3cf1c40"
+        "3495cba488309e2c084079d53139a3695300d25e41038c18e4ba6f4e9d14f210b71f27b8"
+        "ef2c1d4cdd5f63edf8fe11d548d070177e9ddae382fed2b163ff2b58546f10a99a",
+        "0d6b0e5d83155a035248ccea95feb0b4d1af818e5ac6d5f41f1a255dd8b482a94de0f4e0"
+        "37b10339d1805dbb6b22af6ba834219",
+        "08059524790304a37f2a0d57bb2b93cec79a827b1fdc9ce2d7dfd4d277e0f71844d33531"
+        "4a30bbec5598a399e197a852b5528dd",
+        "0e7870e2a0ed16cf340a04fed4d2048e4e231cb8918345e1852bcd3e30413a2219864851"
+        "121a34fc98dd99976e2b20cf1d1bf2e" },
+    { NID_sect409r1, NID_sha256,
+        "07f3fe1369ebfcbcacd66675bd4ab22edbbff72e68709cb57d4f590e49440f01691f490c"
+        "58b5117bd24aa2fe2101b59c61c417c918ea08ea34bbb9b8aa17491ae5d9329affe894f4"
+        "2d7586017877fae3ce35bb80c97f92a004380374ec91e151995166e14ac00505fd1fa810"
+        "cf02981bacbcebf5f81b2e633d3a3db6737890f4",
+        "0bbcda66978ea526f7bd867c3303b625f11b94dd9ee6e2c2f8688ff07f2bba83c662949d"
+        "47ad47fa882cb7d203a7f0ef5dbc52a",
+        "04004cf5bc624553e833ffbee05ab863e5def062e0d57c28e71d758d6ffd3839504d7ed9"
+        "d3b1a040bdce8e187ae0b4ca23aa565b0100fc1a15b4f273737eb92a56928395f6518e05"
+        "bf946afb65ebca3787f7f8bb3d946dfd26c4831cfd171b4c66c2237409ebf224d9",
+        "0a2cd205d957a20c79699e91684cd22746c476a79245f11e7cdf7e6b74f07cf2fd9eea65"
+        "eda97e8994aaf51942e15695545abc3",
+        "0aa1da120fc19523e8162e6018e4ee053eb680ebc7e31d00db34f7b177c74c5e6ea344bb"
+        "a3c39ab7ebcd92996a1c156180b7dc9",
+        "071aa4588741208344b323642fe03f1cea73865ba645169df9c84bdbf7488829b83b8da1"
+        "72f1927de1c8cc318ede545c748c782" },
+    { NID_sect409r1, NID_sha256,
+        "3a1cb13438e3bac9ad4ab1d319e90e2c9f118dcf1eb54d6333c674a665d41451f93cd4a9"
+        "334cd057a44c010edb668254517a63700a31eb0ca474c84873e486f2f8e158a1a7735362"
+        "ea0cff8ef17d959ffd851b21a91412709b3c729474d2cb40f6ca0e397030eb2611b40291"
+        "6e4b656f0fd868247d80be3ce33d52054b7661f0",
+        "09be3dd3442e0330750f0a6252bf9cb317f32f942ae516a4038dea2c40ca6484fb33611b"
+        "ef016cc64baf166c122e87c15466fd8",
+        "0400f05a6fdbe6f80c0f5ef3322d8accda4b9ae28c91b6198b888be713afa5e652e907e5"
+        "ca9aff5fe77b6546115b4c732bbd4010fd000923d07aeb8c947688e7d3dcb16ca69440e2"
+        "a89539a41b8fbb797523d3b766b46d257b87472f5084992422cebdc4e45556f5e4",
+        "094fe051a13ea8dbc89c4cc5511881a48ef5554de265f0badf8741ae5027eef25c617bb6"
+        "a3f454a992fc68f5a548903809de09f",
+        "0162687730f0ab2f57e348476d1fa4eaf13199ee44f44dad5807bbea4e5ba79e92556f28"
+        "7cacbbf1fdec9a8b78f37e78e52dc1c",
+        "01acc734e2d0c81a56ee8c0465661c365edae56228ca43184ea1d7503da3d38e7607b159"
+        "0f59f5190e5c7264cd0d7a39be71069" },
+    { NID_sect409r1, NID_sha256,
+        "e58e7b881a563d54772125b2863718690a5276c93d9e1c5feabbdb5d6f7c7293ff0f8980"
+        "5b53663bb417fdd46874b8e6a466e7e3ff6737930a0662af1d5879b071b0dc4d014778df"
+        "f26a2eca5992e763bf4c4698c382ac947215aa116515876008a56e5bf547857049c38a2d"
+        "3737ed3393705fd346897c3beb80caab88e5b8cf",
+        "0ed321fa283c662e87eaab99b7715e6cdc9b42e14fa5bbe2c56fdfb381369191a42da7e5"
+        "74839f90a85577485f19446fccaf6cd",
+        "0401bbb34e6bfb1c1335c48e8b44cddd8a46486fad4313581df216002b382db1d58adcae"
+        "74af0d38445cac2f6cd9e2b439d106f5950084473a5da9f910b4807ec5ff450be353a187"
+        "af6ace821b18e096c47752b6336dbedfc4b481e356e689fd9c03ffcdbf3e4ea39f",
+        "06ae69e55ac1f7b0f844f5ee0b583e652e0e5bbfa4eae85c59eea1485148e34f4d33c9dd"
+        "d7ac071a28ac0a6191d5ed03e88bb86",
+        "0c3509b6c0356e4a30a82fa7411d1fe17ed190b7eebf9310c44fd568494c894a4f4a1a09"
+        "e58a4d030d47227e54f7220f3f79f4d",
+        "0d44ccff47d9fe82627393c03f882d4b98633961a897381ce8b2cd18f38d69742802d18e"
+        "6c988a23eb425b294f2c1b84cf42cd1" },
+    { NID_sect409r1, NID_sha256,
+        "8889ea1da1cbed98963941f6ac24f47253ff6af52de920765214f2024aeb04f7ad469368"
+        "30a8eb04d95aba64ed7cda6ef242f454b67bc2de38a46b6524bd5c96739c4b580e89829a"
+        "61a8249ec8dc27a50f43b8554cfb6f4fa4ca6875983d4b60a1c6b49f32ddff6fac0cafb6"
+        "4d55c6f594b195c207a9bd920dcf20e0080920bf",
+        "0396b805073f3c3b552b1024dcf35559ac44f255b688871a3c6657f727a4b09f3806cbb7"
+        "5d26a00ae1728be632387e804775a8c",
+        "04009957f897a17241eec5b8415ed7ec1bde5df11583255e0a8136d076d72ef377ab3f55"
+        "3d6f56c054332a24098aed6d12878abbd301f58eee295765e8a55e388e235e833bc5cdc5"
+        "d51a1d98e13429bcb7891b25487b7fd8ed804b1856cb6071cc28756bf00924bf1e",
+        "021959970a6ad070d1ac518493e309289f3d9d6e2a8933bca715f53cee4ab9000ba2d014"
+        "7282495e15e63f258dca87a5db7eaca",
+        "0d1ca34413341c115f780e647519547602e0361ed4d70402f42d735353696eac6e4024ed"
+        "2eacf9577252d40c27297e9389d1f7e",
+        "08cd5bd43794b32d5bd2ccf7ae4deafffa0e0deb92b1eef9d3ef807d456e459f92e9f106"
+        "27b7e7574ebe3c2faa858bd3e62e187" },
+    { NID_sect409r1, NID_sha384,
+        "55053af9370901e38622734a5bc5589f6a20e258627f381fb0c366f3dbe58394e5997e97"
+        "8eb7ebbc530f6e6186f48294149b8594fb551c31c50521a8c4d67e5862921695604afb23"
+        "977b6a69b21abe75966fdd11bfbdb6b51ab0a474c5fa07c4de7872a3bd81acc417655090"
+        "558dfcd5af449b3347e61fa9e839bb9457de64c1",
+        "0a8fe323f6736bcabe971c7d964e75dece70cb54561da48a11c40027ebddb23e41c7b486"
+        "00f569500fe8ea2abebdf480171dde4",
+        "040020f2dfee967949643b6cb8a3810524044a4b873a4984e9795e4dd7976536a2d748b8"
+        "cc636ef5c8fc92aba5677c4a0951a3332700956ec5433d73162c9683558f0dfe8870cfe6"
+        "6575f2c34c765372c7c3bc3b291e95c4e3665e4ec5e72131975f0b1f5f30b0c844",
+        "013f26e13d43ba05e01f92457374fe2ad1ccf94ebf22334447f9360f7f9748bf3665ec30"
+        "58ff6184fbfdbf7de9e1e2131cd3991",
+        "013c4c290cf89789bd6dc523deffa20c94e92e88a76eebe88457e30cddb066c7a43aadeb"
+        "0493b264cdae67532db7dadf879d991",
+        "043bb7a8db3d79938beedcd6ce02f375e26ce807a2afd4fc446f372fb09a69fb34734df5"
+        "dc8f6393f86577a8d29014494379624" },
+    { NID_sect409r1, NID_sha384,
+        "c4264330534a6c2bbd8a3b757e0912558302ce302f835ad8c5474993832fd30036fdef40"
+        "b10ee37293e871db5b0b149654f9e543e22111f9709ef45732125f713c031ccfbc9a2f3a"
+        "ba160c241d27be4dab87ab2fa9a795752ab2daf20f9d06a98d90d01c07133adfe83cb11d"
+        "5176525e1bba6a9ba70ea48b224d46ddd8103f65",
+        "0105938ba9f25034da3e032dee121bdb192ac2128b50a2ed4bca042e96cfaf4660c9d35f"
+        "3e67bafd4c99f9447e6dc408e0c4471",
+        "0400f1a9243920d7cc26741eb828bb55e34c140b0e52837792ed6274a9aa6b5534cdc5c5"
+        "96a1141a746dee380c0d9c2f77094c36ef01393ed8c609751550ffd077347712f3b27a86"
+        "9cfb1b532c5b19c381365ae5dc8fbffcb2182777a17690616d71c66524017d861b",
+        "0fc52aa8c590aa28c5353568c9dc69734adfae840f1e0642b57863dc7f4faa37bf3ca789"
+        "a3d7afb32c57f66a61780e253f50af4",
+        "0c45b1629bbf3273c0e785a28cb8187ef387502ac4438a3372a5c72206a15d7c5ecf9203"
+        "ecfd7e0ac910b6ceee3be50c6664f81",
+        "0a0c2d31a47ad5f9dc2d42dc36714cdce47666f6e2f05ce0e7136f166647540d1e5fbdc7"
+        "c9fa0def8962f44f2f8bc9addc10057" },
+    { NID_sect409r1, NID_sha384,
+        "3236f1ad164e1b25d828f5202e3513c80c72a577aa9af56f041fd96cf5a3363f4b827723"
+        "b1511a2f16360e32eac90ac55f4ee1146791420ef9e2af333c17d157b00e43992ef6f2be"
+        "2d2f211361e468413dd93fb69232f0a0d110bc5fff361c0410344aa0636bf809062c73a7"
+        "ac7c142063912b6ad7e1626fd2a384f35faffaad",
+        "0ce11677ca818537dbaeb880fc967dc8bead203a2538a55e756679c4a9e7975b9b3e6aba"
+        "4e6c6eab4152d0c0939027e9b0bd92a",
+        "040023c78eda396efa28c92b120c4ca1e19dc6c467234f9f73701d8966bd0826c20122af"
+        "5f7c9ad5a5b855b6dc517c22131fb0b5af01ea47619f91ed4a010dd49ece7ec78c5e9829"
+        "7220b4c239ff4a8c29aaec008011acbf7e4f985c02311ca703bf4ce4ba43412ecd",
+        "0dae763fced0e498e3efa1c6c412a25774c9bd6cd4bce25ab0a7266705cdd54040ec55bd"
+        "7e6708e71b09ffe9c19af9a1ed9c878",
+        "0a70694fe5da7646184b23b4b434bca1b754257b8e7fa9994dce4a7a92b7ec8c7f8cc69f"
+        "18d17915c6bbca24f6621f9563f7c35",
+        "009e6ba97ac2be8537afe7f8f8b9cde8841323b5cc63cf2ed46a7913096ff8d96040296a"
+        "1bf9aad691b60e1f18233964a421fe1" },
+    { NID_sect409r1, NID_sha384,
+        "6c400ed098d8369dab6fde3553afbbd4d47836d0d12dd16015f15cb8d067a39391c85ca4"
+        "e78c62b8b72c1592349ff8dc52db8ccb7fd80c085fae456dba6f4a2378e184dd59238c92"
+        "cf04e40d43a66b342d2a1325a0bab12b1ac857f0564c27b35e6abed02ff5bbbdc3770ddb"
+        "b2ee0513df48bcba925da6d61583076cd3129603",
+        "05a239ae0f40d76d8d3589f1662b5ca12176a4b2784faa8339b54e96a1e1294433a4d83b"
+        "f904196f939bd8b33bdb4be340ec703",
+        "04009d03b7985647027a17c06b30ce9fa1b43d0484195f584fc347f7003802613b524cb5"
+        "641db3425ab4b3839e12c012853ea8384300818f5e270baf5a771627b098a6f9ad8a8262"
+        "e331c299fa0722a0df6ca09bdb9c92d22d72a73567cd5497d06639aa47349df207",
+        "0c22251c73998a3a49b3fc65acf01438941a8885d1c5072a5d41d779af70c044153fed40"
+        "80151b524af402a4e8ede4448b717d4",
+        "02d3a7ebe5de23e0e601c6e41616bf2a9a7fb6193fef8e3f0a7fb8128a925f7bec383366"
+        "9d1a304652b7bb1af5186b2f612da1e",
+        "0b7bb17155068a8d9b3412d04d407556ee133e1a704ec5da87ed19dfde60517501af345e"
+        "2e744d35d844f8ac8ad08b13b17c498" },
+    { NID_sect409r1, NID_sha384,
+        "039a149eaef2de30b0ae457b376ce6fbf88afd4cfdec02d3c5e00400d3b0484c1cd6ba74"
+        "db5de65d6f2fe39871349b30fdf1ef29bcbb9e182eb3ec5629d07d98354a5dfa82d7f0db"
+        "3dd10d1510c0dce086848a198893ca5ad24a663494f0596b4eee86199ea85e7e8f2f76e7"
+        "a6bd4a052c54287f61b391f1e52f96b606151c34",
+        "0077390c62ac41aca995640fde0c79c76f4ea8a8dbb22323ed812bee837ab8798c5d0ba9"
+        "76c7aa634d4b1c2c155de2709e7352c",
+        "0401a9357770270c528f2af991c447bed86194d458f693a871ca38f271a9e6a566f5b9ba"
+        "3ef3d2f9bde959e42934c95867b280e9d1001f3a0516fed36d3622fae3f44d87c4bc67ce"
+        "e0a995cea242e530451d43781f2ebd163f6f521497fd7a1a6c7b93d33b77083a5c",
+        "02555cc113c8516d741b47ca41f53ed07d509845f140dfe7dffbd01a3f751ea9f22e12c9"
+        "39a2ecb1827c0e56b1b1c5459b66aa2",
+        "0e88333875a507520d0b62b35146e37e7ce4e2f2478a61adfcbc6e1aa9fd0195a4960c63"
+        "3d9d6aa9a79323b7ee00ab802768436",
+        "094595255e8862d14980893c095608113737f42b05b561771f56ac1d54eb521bcefeb392"
+        "8917c07c1bae74cb9aa80dbd34962d0" },
+    { NID_sect409r1, NID_sha384,
+        "08617d04fffd6644c40f7dd57919f7dcf3c888f4147535d12ca658302305bb8e220bb17c"
+        "cdc480254004b9035b357120580882ef86aa5a061b2850100285b7d61588a664dd4f5394"
+        "f5478e68a80f610c9204d056009c1c9e902161eda33ef61aa902e96b6f094a9f05313569"
+        "2182943d38b9763055a38739a2a2d133c5dbee89",
+        "08bf23b09fbbed1b55769907aafb97f4759cec98649b2c9da5157517d4f85bb70157076b"
+        "5e4aaa7a940af042302f8be06a84ab6",
+        "0400883c31c474333f74ab2b86f3eac865c4b2b54975ce19c5cfd23682d041ef3deaa43c"
+        "9f9e2c194ccd3add6677de31fc9e07dfad00a5a36b54f4eea6b300491ca22054280b3f09"
+        "b202b2a6b55df9e3271c763b6d8360a330c16f936d69fa463bc0c4071707c9cf95",
+        "0812c83aa9dc4139f8c3f7c55509f9e10e6cceed30e16afc028b1904b4d260ed0e77acc2"
+        "6e711a7a8e24c75fd780ed893c0bbca",
+        "0fce07c6f791a05de29609b59d55b7062e82fb554341b2b2a8187baecb9c95b01ca5dbf8"
+        "ac88c60babe10af2edf5985b35e10db",
+        "02bd026a3e45ac439647a483261107829411c1b4a9ab603c080b92f605cf742754b65498"
+        "1460cf7aa72b5186b59d224dd015314" },
+    { NID_sect409r1, NID_sha384,
+        "34c959f549a307f21b850ae105f41299b8bc94fc292aefc61aefbe0a1bf57576ba8d9b80"
+        "caac635e4edeb22530163fa9629665fcd43959f68eee32482f1845a78ed7278e6e43d09e"
+        "d6fedf465001afc0d61f1d2e1d747623e82a762576b879c7024e34f43104593cdd691d53"
+        "bccaeb8f212dc29bec6bc94cf69d0a8491db124a",
+        "0082ad05d19b8e16f80e53a4cccf6869ab5128c5e622ed146fa8555985ccd2aa3b9957dd"
+        "374586115d4d75b1c01cf98ecfc3646",
+        "04004428d05366b0a46e6578fc7528d185a3f85da06c4179e9c9055dc0a7fb4afbc53c94"
+        "954f268e36d2ba8731882bdd27d9684c810136ba6048ec672601987e9b7402fea24f88c1"
+        "a94717ed5a83794add0f31680592d6cafdec147dfbc400e73a6ba1d23d4cb0d707",
+        "0c00c897edea7bbfe1913e3da303d64d0d657a83c1eac9c111722b17c65391f2cf67b782"
+        "19e748ceb269d6c65f01e92e6952979",
+        "0624c5bcfd8e0ef22ee6b34a8b26bc051912cabac102cbf56c364a743e8150195fc55a3f"
+        "ec90a8fabed5eacc1799b565745bfd1",
+        "0cddd4937da8176ddf0de7f52a4babb1f6fccf861533f796a487f35d060ad9ed4435e5a6"
+        "7166782b53c20bc06fd1b36c265c1b0" },
+    { NID_sect409r1, NID_sha384,
+        "514f4de08a6f49edbb6797c9dad6d33bfa367cc1a1b58a5becfe646c7f3352d5c5d95f74"
+        "56e7112c4ddc746b9076b9756ae3916c07bbe6d3823895774a42d25d44b3309d18bfe7e3"
+        "ccb1f85dacfec1654778c19e2981a853c1f40a7eafd16d331093110698c957fe9f1d8658"
+        "2706a6885543248b944bb70cdf9d2ea89190cb02",
+        "0af7e581aa4f9be5815f0c447e39de00da9194eee5e5f609668b9b69930b5b48a948614c"
+        "2250260d1917f0ebcb00ebda4bb52f8",
+        "040044703e0b49437315a64e397085ea2ba3f2e2c383b168f31a922e5916d590344906bd"
+        "2a911074b7481aae7f3f8f4807b110f2e1005a13607a3bb89a2a88e27d5eb5cac4eb498d"
+        "34e6ea861c80271ed0c73e1fa893adce0c1982b8a8af6a0249796e5276d369c3f7",
+        "08e7fcadc844456f14ce9354b218d519d86c0c5211d62904c937d6fbe8cb16264d7d41d9"
+        "8a15e9f73a636ac3739770738d6b46d",
+        "07aebfd1681bd5a2f995ad4a709e8681da742649c0530684fac251494263e98d67247e1e"
+        "4fc174b409e7e24a7b055500920cc82",
+        "07b83b9b5133aec165316021472307b8b481e6381754a9d0b4f9d683c2ee7cac94ed4d8a"
+        "72cef61fa1f6349b6c4a54ec38975cf" },
+    { NID_sect409r1, NID_sha384,
+        "4e5d16cb1dcaa1abab1e371e1de02f31ef4e0944dfe1fdec45ab64326435b2af9aaf1a6e"
+        "d8fdf1a6ab1182bb53a844c7cfd66da30aec0d41757f5988ada0017c4ca752597a9fd363"
+        "7668bc1a92bb1556553f28d66805bb47f1ef91908ce098d452872da9800e77e1fbd43ffb"
+        "0ed6fe6a62185d4be73ae96c9241b82cefb2da22",
+        "06d14107b08354e6a41d7d7d50c004419db8bdc50db43428df5e86084551237223c498bc"
+        "e71a17e25695bc438c5c09e009c60e2",
+        "040088c1517355cd417a698b648508fd07a457ac13a49d1bad17dbfbc9735ee58343316e"
+        "3eca570bca130c753e17a69fe5bd7baff301397a697d2113d94daefe6be491ed3edce944"
+        "9c707a57af3a164d172cafece564d686fe0d25725c2919c60889af4d0354b05117",
+        "0f3bb2dd9eece25c56159f501af8b619a8c279d7ecbc08ee2af6b82ead80375e9c07227b"
+        "73a10918d8c89d1a2b12cb76427a7b4",
+        "0407b224d8d9c0f11a8e09ac8d654dc6e1119e2c2804510a84ec61f9017899f9613e37d8"
+        "166e0fcaae16c3cc11e9f739968c687",
+        "08c2bd7d02c4c537a308fa40db786ec64fbc2dd4c142b18cf9bcad66199afd4f44cbf221"
+        "adb3837e84173d174e9c0d534720ad3" },
+    { NID_sect409r1, NID_sha384,
+        "e29e75269754ec1194270f5c9e8267dfdd8c696008b5ebc92bb840981fd065672f07f6a0"
+        "f1b19841adfc51b478371e1a0db9c3346a9f0a4ccbdecb7040191a00ddfd0a8faa0e69fc"
+        "f544319c0155d02797eeef99fabbc55078f9d852927c23fd931685424249b87ed0c70a4a"
+        "3e2d3b9a2f92830e7d8f7650c0bffa8f8986b7d5",
+        "099d96d2dc9c79549f031bd5346cf6a8544c312a3fbfc560dc8e378efdfe025b0e6e61e0"
+        "9c04c8bf4133396f993b0906c33dd30",
+        "0400883e00d72c60f22ab085a90901ba3e8a510f19c3d62dcb3ee5066e0be094cceb30bf"
+        "bed7068d0bfdf634a53e2fd002dc9e454d0194baa5d7ae2399965fc4009ea83273676e66"
+        "a56fd35a5939c26ccaf85633adf78b33dbed6da305979077418c625354c7fb6283",
+        "0c213540a452c4f2ef275dd844402dd5ea590f7df41ad35523edff09b7fbb096f8ae8a4b"
+        "aee95428fee03a9e6f6a14ceb90e289",
+        "071779b477245007ba1ef5f05446c4a08d1c2eab550db9c053e4588c9935f07ba87764f0"
+        "fce14d4a7b982ebba89cb056aad8cec",
+        "08174bb56cc85ebe7bca1de1f44cf93cf478d7fe59001c5947c66b837bd3a6d116f99dc4"
+        "f9acb4f378b0321228518e1ba0057e2" },
+    { NID_sect409r1, NID_sha384,
+        "1a538eb447c18494ad5a5ad27be67fa60eb2c5cb2404eec1dbd7244cd802b17ca5497e77"
+        "9d5f779b981b165dab53ad19fd7bf2ea7dbb9b4baea782a43d758202f147e59d6b6b8ed5"
+        "4f4ea084bc18519943f6894d603e253ba3e8e339a6933bc3a0a47126087038e1c813c3f2"
+        "997aae321b7c95a802b4b73fc7db95897b7c91e3",
+        "049f347dfd361a65910e97fcefbf60013a54837f2ae657d65e02397f59dc6bca27704fed"
+        "3affdc3d833fdc621cc5e5f99b92a63",
+        "04017942b58d42da750a366d7e4cf4cf465c856cd911e5352b50bc8a12704c1ac6ad54f9"
+        "465e4fc5402b373d8bd4e4f8519341f133010abcea49c66730ddad7734eb1311b2626b75"
+        "ebbb299a28c9d60937e6833a9b3dda052379fbcf7875f18680924274fa1764158c",
+        "0134c70f031648bf470ccca4ec19c837051bf700c851df564ef3ceb99d7d41439293bcea"
+        "0c656c0e5361db92a03def51d7e4f26",
+        "06c0f9935abc5034a8b0a05e8d04de699b5916cb367e834f13642f0003510bfb68714be7"
+        "5c9e35b5e593eba45fe151d1df56d40",
+        "0930baf426b33eb4afbed64869a22712591db11acee7c4d3a221a1e98048f05900fe1481"
+        "6006854cb90631de5797f91176fdcd7" },
+    { NID_sect409r1, NID_sha384,
+        "7502c755bbd385079a4001b8cd653287dc3054f3b57de19d0ff8f63c0308c64c56f03511"
+        "7a8971d43654f89b52e923947e4760ac72be073136da70c5ad7ca1658cc0a2d2a880d3a0"
+        "c0fe636fdb27b77ff260c4c1ef8a18da8e9fd777d732a37ae9906e6c4f381f0a3d941048"
+        "d5a1f6f2cb8593873fa4bb1621a44bc2bebfbcd1",
+        "0dd226de602af4e9f8e25784bd1bbd4cadb0a8aef525d5e2d57b9f3555feb698765672c5"
+        "099a7d6dd5faaded69d8d68b4804f26",
+        "04007ee34cc7a24e2e693f9409f52796427ed86fa71bf88c923db305ebd5a83bf3b6f761"
+        "2847f16d00f4a25614299a2df92bb693c301f63f177b54f8dd5c907ff318b66c2bfc1cee"
+        "09348c035a4413fa3cf5acde0db1c8af4fb8deaaf8a3a6f8f06b0acfd20c6f0049",
+        "0e19c21b05c82dd8c873e5f30c1e3aa9348327f959a4dbd9c741e233c649a426cf7bd9d8"
+        "e93232e496d0b93ce835f80fbcfdb2d",
+        "042a3907a480329a6169b439a6945cdbe8e4572779c43fa6cd1f15062559dae9eda27124"
+        "02ccbdf03d88a8a68b691f1f16f8f52",
+        "0d09fa4966d171a662a9ba6827fda830b5404f96f635edd8482ee009ec5c7b64a2a6c177"
+        "93993610ae8297efa9fe4c35ceb5001" },
+    { NID_sect409r1, NID_sha384,
+        "95eca932d03f1df2e8bc90a27b9a1846963437cdafc49116ccf52e71e5a434cdb0aad5ec"
+        "cb2b692ca76e94f43a9f11fa2bdf94fe74af5c40e6bfd067a719523eea6b4e65730365ee"
+        "498ac84c46e1588b9b954f1c218920cbf71b167fc977ee2a89429590f43bf637eecd91b0"
+        "ce3be2d66bac5847205f76c06b914a970f543e59",
+        "0b6fdbc9c8c76cb2b822a940d8675889ca6f5132429da795462381ce29313a23bc132976"
+        "fbeb346ed4c691e651028f873ce7971",
+        "040147647d267afb4bdadf54baa3f5131e79dae8103f5b2ddf70e4652f9fc5495123be97"
+        "215b811554241c53023a247936053288bd015205cd5bf0c5154b2dad8367e1b487689b89"
+        "8acbbf44f9ed67a37babbec739804dfe737b324ad663cd2cad79274344397099e7",
+        "07321d12d616dd2ee5f843d6ed7e92d18968b3a76c0e4ccc167790afabad1b7c0dd53d82"
+        "aacac93d98679b203bad88d5ef0cd75",
+        "0672c5607acc646c67456ee77f2c02117cabd241f728ace5117626bdf91662323e756543"
+        "8f46a3e25c048a8e2130e27fa1fa2d3",
+        "064aaebf9f2fcbc843ae1128eb6c7e7d1fce2b9901dae0f60afbcb08c7f2ea1b550e1599"
+        "47deb87dd8959921846e2923880db6c" },
+    { NID_sect409r1, NID_sha384,
+        "8ff68cb00d03e730dddb05fe0b2344689529096c3da6eeecaf097f22c7fa340593106b1f"
+        "6726f06b7ce7358edbcf801ead959438a42f94cdb467b3cd5b17fbbcf75739805f9eadc8"
+        "69c33c604cc58f81591b0b8bf4d42bd53a801f0f829a31af6c129fb4f20f1250f959754e"
+        "ff8c629b85a716b6a18465b6495798c0c5166c8c",
+        "0203d77fac64591eb9a18de20a9d5eacaa1c3ec58a5ecdb3008c2d642e197141d16b3a9f"
+        "dffe61429264f5b420f5e9926659a4c",
+        "04000f66ca09d15d0991b48ce7afde9a148565b73807e435ae0f16c14cd439454745f8ae"
+        "153786d7c40cce3f43a8aa4f0564cdcbc3000f4c919b7a97beba2559a8ad0f85dee40e8d"
+        "f28e23732d7de655262209a5170f94791e255e77e8c8cd64c8c9900092e0ff9d5c",
+        "0859bc752300d4ba5014e302aa4cd2a979b3097dcfde5c59f4bafc5bc8a99411174d2ef3"
+        "f7377df5a09269e3d9461be61801942",
+        "0691ea76acbd5e8137924bee13326ceac8231688af8595718e210bb857d6619c152e1fb4"
+        "6e03fa83bd6b5d81e2463f9260407eb",
+        "054df52eb86c679d8f8514a09f5a3062d2424cdc19fbf6927f744aaa8c444223f1c28ddc"
+        "84b1d135a886eb7ac7eab3c7b0a42e7" },
+    { NID_sect409r1, NID_sha384,
+        "01451c4f09720cd53377a5ed04c907a735477378ed960235a833049d6bad6e6e89958b4c"
+        "4249bf0f6d4f043530c9e5426deb0ec3a12b7feb4860757b41bf602ca95655155356ec35"
+        "a2db8e2657998f56529be4b714364f83a140846308a2973907ed7b08e935173ebbce5e29"
+        "afe1444cd51c92824ede960056439555e7e74450",
+        "057a2e6a59d4871c3d547690237dd9846d6d5dc4ec0678aafc9c8669af8a641eed67bfea"
+        "4b05fd6b3b5357ec4d0caf352691ea4",
+        "0400351aaee4207bdac826ba17e3b08dd7f94c0c8ba0d9829d7bf0eeee7e6375458b5457"
+        "bd787f0ff38564734b3a0412bbddd7c37100e09c4dfbc33d61d69b5a8517baf5e4e16149"
+        "20cbdd89bb05f0420be757253fb92308dfe1de8db822f57b67b393d8a70d989b26",
+        "0fbe560003dc220e4c966b21c874b828874a33a93bb69c49909376df67e5df1652fd91a1"
+        "d73c7733f26c121e7a3b2d1246c9a61",
+        "08b85cf3a14fdfc69cd42750baf362286940994479f6ed7ce1d87af12c5ae075b311754f"
+        "1d37d8ed10bea092bd3d9f7afd2f1e2",
+        "02360bc1f7a98cc87ee2a4feadb98554cce59aa0fbfc087747c7253e54c38815cf91c851"
+        "7f5692f95bc7c3a713fb6ac43a34f7d" },
+    { NID_sect409r1, NID_sha512,
+        "ccd494ca005ad706db03a3df6d5c6e876ef859ec77a54de11fe20d104377df1900b6b192"
+        "126c598944d19a2364b2ae87ad7fd32265d59e1f22be5833f20767793677b628f18e9619"
+        "f8ca32f3af3b41c31e87a98d1527e5e781bff33c1a8be3a82ea503e76afec5768d7f7dd1"
+        "f17dc98a9e7f92fd8c96fca0db518bd143d82e6d",
+        "00a3da7a6633608fcee9ce4253bbcec08d41ee6b00178ceb017de74e24d48fd89107c9f2"
+        "db3556063abe3cb011938f4b4871795",
+        "0400a6123b122d7d0d766897b15ba6b18b3a975d3d8058c9d359c6c6594cc0dc07d9ef60"
+        "33224b4aed63d319cc2747c0660e38897b01ab5fad5e78f380aeffca8d15e60731720184"
+        "ed456800967b2ca47d482957d38409ca07ea798bd892b529774e44080eb8510e6a",
+        "0da042642b3117f30ea5f4b354047b164bd128696b8c00cc6fcc767246daf7483284e411"
+        "009e05218246830940178cb4ebabf1b",
+        "0e4ce613e6976e9e1c30c0c93214a0a37f0632de85eaa25464b69a251d592560b2039fc5"
+        "9b15ed7045c29c268693d7c9e06d8ce",
+        "0ff3ad5ca70aac94facd842fecdf6a28afbceab80b549507954b7dea6da06d1facd11e0a"
+        "88e9c2a549e6971a08d1af75aba8363" },
+    { NID_sect409r1, NID_sha512,
+        "5719e50d939a8d74efb444eb5a77cda48cbb59e7f976cdb2ea2848bfc558718b39ce27b8"
+        "93c229db94bf77992222d1746f8f52f858f85124a28193ae0da039c53d484681785f3367"
+        "f6516fbb8a86560aea9e3428551facc98cdb1e9df8e2f37db823a7abc589f667b5c93c4c"
+        "47061400220a2014197d514217fc252cef5a2433",
+        "0384723c8b4a316b450d1fce0b2645912b8acaeb3cad50860cca43bdc0206ed5b3b60ebd"
+        "c29b3eda305d0d60eeaec261edc24d5",
+        "0400fb89d87ca4282ccd048606e4d321e7ca73244b4d0c9d3df87d54e038a14939138bff"
+        "33c81a9ddd64abdfd698bf103e45c96f97004ff7e1706688a53a5544f4ed0f3f5e1f0fbd"
+        "6f21174166d25a690f260766646cc6fb39020de9327199225e44f3d95c5984fda9",
+        "03a9f5f26eac81dc8ca0a17acc44322d43bfd18edcbafe24113f5e5fad0ef0a3db75ad1b"
+        "2422c7321593e41e76eb2a767a14268",
+        "0c311000c27539247059e4a8d789ed4db93fbaea021272a90045bf6fdd70f4f32cd1e195"
+        "b99ee6f03f4fb57c3a115ffeb459af1",
+        "00db8bb46fe0f99b4e6e1394a5db283e310b24d6006319986dd2c4cc169c775c89d4ad98"
+        "d0fdbc3c0bef6b7fb6b43ef21049bd8" },
+    { NID_sect409r1, NID_sha512,
+        "c84e5702a339259a61b5ba8ec1957f23ffc4f1eeef3a58f383d3731bbaabfcf49ce2ebb5"
+        "97960ac5115a2af1c62b193d4ab6c24433d5f168a1752e40145f19aeb6dee889a53a4fad"
+        "d13eef60e28fcc7ed6a9b8b0ca286c1b3d66a4b2c327a629d15c148049e3a0ccdccf05cf"
+        "22c31956014595e417060627c8125bd7c00f8850",
+        "0bd3136647572fef3de51b12e64b36460bd3a27dc660c164fc705417339cab21f9e1f9be"
+        "0f3da926df459c5ba58b701d306e67a",
+        "0400f45e18834d1933a2a26e95467b6db85d8c3da372e607907798745cd9847bb8f8b51f"
+        "996c7293b51550144f227933ba26722685005d8b108eb3591b164745d116c80afdd48701"
+        "87061c75af9b0c3e87dc8262586af14f4d6b1504d274c07c8e89247196d8ce8166",
+        "047a494645b99a3469369b72cc918708ebf453957b49ac4e209f2edd7a4861d014543754"
+        "e37e1d1a0f477951a0ac2b5826a470a",
+        "09de9e0147e1a268f80836d7db43779ce12e7947caa851d109273ba7e7dc7fc52c601f5b"
+        "f69cffd5adf0695cd7db8de2a64781f",
+        "0561aa76e1e9f2c1d4aaf6e2da143f67166f09199e1705b631d650528e94d643768cd611"
+        "467284a9f543e50520e3e738e5d56b9" },
+    { NID_sect409r1, NID_sha512,
+        "c90bf11d04a708e64b6f94d4cca64b92463eae878c377b188c82c1c5f05a038be20eca2e"
+        "18034d46f00d9a6fc73c4084981748ee9d2915d87aee4e2321f4f9e11c176f01281913e3"
+        "24700d9cb474b7134fcc408fb4a7006acd9e63d4578ed4c2729d8e0d01b1e6174a43a024"
+        "ad261eb644ae98979c3cdab75af357f6dbdf5db1",
+        "0495be0b0a9d357f6155fac008cec90442200bb842d89292fde38b7256e4117284a60249"
+        "b3101b3f19f778b680c0d1d7422b84a",
+        "04011119cd910d4e962f54c9776c9180e7eac2f71cb9748ace4b7dfd2d2b3caef4964c7a"
+        "55caa9763e008de600b727068eda9b98650000b48246cfb7c86e9dff4ba77a3a53dbb1ce"
+        "fa168026b8929c42c3b0251fee5746897916e50f07dfe8b57baab7964447a2fea9",
+        "0ad4ab5ecb84118c33a4b06d1a9f5d2c4f1f3dd1cf71af596eea771f851d0371d2d72593"
+        "c926d7b69b39cdf72931f6bb11d10cb",
+        "0e959201622673d81ca16ed94e9e5be3f38bb8db48f9c09a585aa31ff39f14128d79d604"
+        "a5f93c80aa961c85bbf99e276937f4d",
+        "083099697856c780936ac01aea5e3a4d9b6e183639cd200464a5cc05232df30ff5220dce"
+        "4e2af714c580d561b72dc4969166a6a" },
+    { NID_sect409r1, NID_sha512,
+        "e9b2a33906a1079280100039787377c2971c378b92e70a38ab41dc23979d6fb0c41e53a2"
+        "1b37632407adac6f212341cf6af8605b4978c85c9c16960e1674247f1795cd73b99ff28c"
+        "dca024f5078490513c77114c2f52288f5376872c331151d7b2c08f7794f2c1f9e0d849d3"
+        "2d73636f0aa899988ca561a76f74543b37cbf3a3",
+        "079626354dfc4eeeb51fcf232ee9e6b0130c9bd40f15ed45606bb7faeca8f359e0c3e18b"
+        "f12769254522fd4077eb24bd5454871",
+        "04007ad047bb38bde6ae2593e1e41c36b7efbce1e0ad08def9b23d25b7ea9aa336eaf102"
+        "17df16d32ada4af03dc193d44e6c77e67700d2b9466ecf321605b9f4f952812410800720"
+        "3ac32cfdc7cb87e1790ebf4bae497fb87011e0a81068e66a840d29583bb970e24c",
+        "0074548d1a3df580e45babda6096f4c78cd70945ff190d9da463fbb03a511c45d45dd1c4"
+        "6dc0b9521579fb506bf015f8b835680",
+        "09e04e9ffc2cafdefb600cf61e803eb78cb416304210165fa7c93c1bfefb02cd4a255512"
+        "622d524141de02c2cbd193991dcef67",
+        "01a7960232455f27768acd825b8ef91d4efacc38684d05a900a8512682ce19787033cd08"
+        "c1f2412b481b88ad02dacc0ddaa0ec2" },
+    { NID_sect409r1, NID_sha512,
+        "672db3fb8cc8e5f831be700498d3ab3aef14b7548e8011b21351215fb6dfa09460d18f52"
+        "c02c8815baf396d856a429bb9afd602a10c213af34db80447f4c06ab4bd28873c88eb963"
+        "9b199042d4b2cb13cc364f734fd4ab7bebede7dd4da63decc0cc1f84e34d760013f66d71"
+        "641073f16c08078880b67230f2d6c6bfe17d206b",
+        "0ab42bc7d0e3c23f8bcf928e25f9f027b56f270398a1d37bea0ee5426b944a9c9ba6d0d7"
+        "796899543feedb470f70b2ab148234f",
+        "0401415fe81100f208ec8afd5e882e5773a0c1d46e44627732900c7e1722cd77b3ae2443"
+        "8a8463bf571fd6bb422d7c583439c07cff019c3ef3688ed397640e873dcb20cee9755437"
+        "d0023646d05612e8c360717a2e80e80f2b85860d71f9876f3a68548da7099f601d",
+        "08b44ec25214602de46046b2c94a45f64e9d0903f6148dfedb76a80b8e6314e87bf7dce8"
+        "e73b14bb274a88fa39136a00537779b",
+        "00ec4c5bc88a959a1234413026700bf5d4287a0263fe75daa16693bf74cb5071a64eb187"
+        "78da0a31210347aaa33130602f6b597",
+        "0b6c29b9177e89880f3eee3aff204b866020b3bf77d7c31204af383d9770804660711a85"
+        "79a3f1ffe325f225fc7e7894ecc601f" },
+    { NID_sect409r1, NID_sha512,
+        "d7fd06b89226cfd66671ce5b4b656228c52d986afa7f6f30161680eb0c9cca177992a8a8"
+        "c40167a64165c518c55f678702125709361b536bd928567c97737bd750d0e2e6e0c00296"
+        "a6ca565f7c05cc8c54ae7a4e0c334c6a968fc18a959c18ebbd924457701316a4e999fb11"
+        "084520dac68dc2d69187134c40891af0355ba89b",
+        "07f7aa2216164ba689459ee5d5ca29e70ef75a5b2a4416ab588df1dcb9164330c0b405a9"
+        "d80c3acc41c19f58e24e17ecbc0fa7b",
+        "0401decae837c7258ea9d90314ac87c57aa6d49828787054cc068edc1955245271acae72"
+        "dce5c9cba422bee54f22e11810721c1ed50024cdc9e1b27e5d4bd024654df000bc9a0181"
+        "f7c0f4a90572c75e16b679f4362446993f9920e2244527801e8f6b1e9398bd8382",
+        "0463202dff25e6b9c633b60a3edcffc1a22031cff44dc1b0a5769214693ba02038fe5dcf"
+        "b4a48db7ec49b33068061616daf2fa9",
+        "08c06b72b73dc2655645892447fc0c0f8055838b194e8fad99fc6bd50774e1ed08313eba"
+        "4141018af33af95a3faa20b69bcc0bb",
+        "0958f104326df6008135bfbaf5c2980cba2833af1b4f04b5918bb51ab0a0df637d6a4af9"
+        "02a5e07db3022c134c72315f25972c2" },
+    { NID_sect409r1, NID_sha512,
+        "83b7e9d3ec638fef51d2885fff5490c94e2509c126608f82660e5fc523032f3e85d69d9b"
+        "76af145f6bd916dda35775abbb6d1902bf38880f8b9259822055c5b1bc726c51029972cf"
+        "7474cf2a812f3251aa71813476bff55598d079f075a40c6c41498bd865ce960c518bef75"
+        "a873b9d010965f342dc4b35ef5c5972efe6fdd18",
+        "021d84f070c6823a70f1a74225a472118c93ce9dc509aa6064051ca4574939dcfa96be86"
+        "2069424bdf1a23f62f2868326422e64",
+        "0400f568f018b0dc4400bca3e9e4b0e5bd5245f15dc7acbcf4360b0be2ea5abbb87a3cd7"
+        "6aa653d32858438051cbefbcc4feee6f6b01fdf1e1bd7a2d3825df14f8bf8d5de8250956"
+        "63c3014f2eeedb9bed3c3416d56f805b623f40b847090d6b4b3bd5abc98ea55e48",
+        "03344dc1cd950a9c3d039b6fb6af8c5745395d2a3343d86dc6670580e331d59f6c003436"
+        "7a6df52423a625d70292893961ceddc",
+        "0fb010ba41d651fcc854762fa1437262eadfcabb95b9502a40b50f20cb34fa19ec570dad"
+        "2e0521809ecdb2bff3f4e7055c02bec",
+        "05a9c2dc0c1f946ce33f2f434c156c236b09098365a7f31e238b4685e7cd8c86a0b2455e"
+        "5c83907167c1324bbb37e66e0b2768d" },
+    { NID_sect409r1, NID_sha512,
+        "c62c7bcc860f0e175128e1127dacf935ce62ae794cc4a0ce7966bceb023ac0498641d728"
+        "1fbc86f9ef470bbc77f608f83f8d0dd6299cf08f2cdacc7a9642e4246df131820220e5c0"
+        "5d0dbfceda7f16b86add4793e9b6244d96b5c07cfa23574ceb43e8e8b5483192a92b301a"
+        "a3b37702b8f94f0129d8af1617896b34990c9b02",
+        "0b6645344d17528968c719091b6e2072388881dc10bdb4c7fbf41906cadf3699b30f9c1d"
+        "bfb4796d009480664e6276c0359e5db",
+        "0400b164b075b80fc8b8ec785d5c2ef84d49f2f4d276546c9cf2e17ea4d367828e9aaab9"
+        "85c5cd0882204e293dba0359d47d9bdc0500a0c61f181d5d06ff20d0c41cf6d6cf7fea86"
+        "0075cdcbbab2efa0950e2276dafd4258a39c0fe4c45f3c04f76efa7d41392b4d34",
+        "0c497c621c5cd230fb1e4a4cb3af1cc9d8edf4af5c4af7f15c4ad0a8835b54de52d83bdb"
+        "3433808a67628912a85c5d00aa222c9",
+        "00b22e5773aca4d97d2da846c3947bf9cf2474101a6f0d39d31629a6aa2a4c3a77076a67"
+        "1e37aeb4cee0a94e82e914c8c553e04",
+        "06ccd79ab93e344e6f112c1e4a39e8505a2aaf5cf85595cadc6ddd1afb0b1583d9334cf1"
+        "c48f26e5baa38e05b6b52f9f12c141f" },
+    { NID_sect409r1, NID_sha512,
+        "b5bf38fd9e822925254418475a1ce762a94e336f12b156b1625a4574fee11ee472d537ef"
+        "94b4a4b1c0a73b0140d0b818cd06636653e6c07f0f100118242a7703756f1cb1119b3477"
+        "c4ced99cf45e07e83b7f2749c1a5f8d8c9272d221fe17f7c6a5fb0f8a16af46f232ce406"
+        "aaf565c6b2766a2f6528c82e74fa1c0a7fcfd49e",
+        "0f8c2f770cf5f8e1f900e996ecdcd84fcff5cd959777fd005d721a419123221a3237e398"
+        "34b270d37752470deaa6cea023c5058",
+        "0401f861984fa06f15b801216a1c33672cff43740f0f736b4f4abed5656a1bee33a2aec4"
+        "31680942f2b0b0dce9a9196b49263fe183018633f4e057bb6d70a434f919b9ce4b7d9e61"
+        "fbf46c1d9638100d77881755fe9829a69d696d555b1a26e25ac1a1c27b40f909a2",
+        "0bdd99022dd964306955c57b226aef036527eca481622618fa7395f53e60aa95a275f1f2"
+        "d6e7354d8b55d3e83c85819e818199d",
+        "02f1330f41a86c09205004215c24f42fe582da189906fb23fbcc52136fcb4970a33b8961"
+        "13eeabcec8151cf3b150eaf1ec2dd88",
+        "0439507edbd36ebe4fa5df34d220c1441e1a4175c9b0373fc85669facebb5bda7a4b415c"
+        "269a7add207b461525c6cc94b7f7b22" },
+    { NID_sect409r1, NID_sha512,
+        "6d3474770933ec01b76be789304b6fda423b12a0ae8c87a5ea8d7ee9f71300f39440e1c7"
+        "f5aa4b47c1a8628cfc3a490b15ef292a741344f40a8fcdd02cf3863bf3e32d53031f5037"
+        "03deab17fc52b3d4032f4e237dcc27231b85d3fd60b49ed7ee40c3344948d87c3f47564d"
+        "20a11d50e4e520bd16c8701694fc70901a5da625",
+        "0144adae951fe897d5812ee4a16c0be4c86c5e57e615c398f5768a1223a9be20fa82cecc"
+        "f8a16a31432bbfd17e594a4cd8a6a07",
+        "0400bce072255f7cbaf565f82db122e9c582ffcfbefadab6d79680b2506792028b200ca7"
+        "732a98322c290916c66c8a8ef77df6a2e501b4b6f65e678223bdbe5f8ecb68573ae3d7f1"
+        "11dac37d4fe3c0eb768c461187fc5859b13452381fe676257aa445bc7f38b4919d",
+        "0128c12479b7f0630374880b214aa26e4e8626deca57148a6c6a0e37a97e89da8acbadbb"
+        "fe7db28a0c5bd17303e1342af711f25",
+        "0a95124ec95e35747fb568e6659ff31867a4cb7c00985b36584201d1bac0775653e0a8b5"
+        "4cd9a9067ab3de434bc2cdf29ae287b",
+        "0257e5410a6f0bd94fb3b5b10500fb45b501a3734f0c718035a9a1516d2f88e10d1e38b7"
+        "0c791028e262e0c3128cb84e6064ea3" },
+    { NID_sect409r1, NID_sha512,
+        "92ba7aaf71f625f7a2e024058dc8739da3567c306da4a812ed9e1542b7d1e982c1608216"
+        "6a59720203f4524c3bd463a662c26a82ec7b4376545206e650eed0d3dd7909dfe3810981"
+        "393070d15c45dc4a75a8c5bdeba533cad1ec34fd20466a61e4cde3b25af9a80a9a54afdd"
+        "7de1cf2a74ba32d4ea0082a037775413c61a8d1f",
+        "0a51f065fb32c55bf4ff6f18ba9d488d35d9f8da593adb0ab1632533284e0adc43ccdbda"
+        "9d9507b9862ac63b5ae7b0f78b479bb",
+        "040080e2f7ef17a11ae66172cf1c18eab12aca4c2ae06b8106aa1066677a93538e3dca06"
+        "26e836249eb884a382c3b726736565c3c301e98d37a17ea736ae58eab093fa7dce3f1079"
+        "1ee9ef5ec00bfb27bf3c705dd633badc94642c385dcc276f9b1fd5e01dd76ce944",
+        "0d5cf7b3d28459db8dd69c314f6464f770c31f239a12656368c84c64693f23733661081d"
+        "20dca9bec9c9659a8124b57a71ffd55",
+        "072ba8c1b4bfeca62e96a5649e851e9a311d7685603a11c1c299f5ed8605adaf27cae656"
+        "cd31335a7ae363cbae5dc7a39512c1b",
+        "01bb9819d25a211548461de4ff973ffbf475230baa161558d9cb7ee6f2e682dad21a465f"
+        "c2ae058121224f8680296d30e3692cc" },
+    { NID_sect409r1, NID_sha512,
+        "b3fb9e48c333201324755a81f3ae5d4f0e2ae7cd24238fcc66d858e3aeb1ee03328660d6"
+        "399676eb1b7d8285ba571e214d935bb45516fccfab57b8eb4c3d5f1d7357c768eb7b5e7b"
+        "5710f599614bd4e92706eaba31f8a5e7e57af7ed13066af50b4540ccdc126b677789920c"
+        "ef8543907f0ba9dc92aae343d3425bd784ef483d",
+        "095351c0bc07acfabe6477fe85f97eab520dc96bdd58b44b036328ceadaa56a1904d2217"
+        "c5fd25155ff2aaf9005a3e2687fec81",
+        "0401c1311230cfdf5824323448c68ead5e5885ba540a21ff90b951f85d84d78e26da035b"
+        "fd99341b5901e1ebb18648a8dbb996fc9d0017a037929496e560cd1c936d9eb15f79fbff"
+        "737201dd880a69dfec31209faf5bd2846e3e664c668ad3d6500c5ed620f1bcc970",
+        "02234bafb54cad0d0d51f4b8508dbc8d014c303d90d21bc3f749ed7acc42f0335c5ab6d6"
+        "0002d3bb57cf07018e9c13b92c0a39f",
+        "04d0609f06320d69870a3e66f19cd46a2e0e3e13fb8b7785163a7b567bf2c0f437b4e30c"
+        "c67da288a3b34ce3110f6d87affe0f5",
+        "06c46d0248f7c309c1e5b80ac4b1459bf897e42f8f037031f5bbce0fde50af50cfdc4f60"
+        "d5ad3d1af152298cfe77dcab287874d" },
+    { NID_sect409r1, NID_sha512,
+        "9ec5f7d65082264b8a50be772c44277a73ed19199eb275fe5976f9799d8629fcb4a59a8d"
+        "55074cd2eb2a0e02062d3f7cdeb05e62931a24fd1aaf14c257944d1b42eebd52726d6fe2"
+        "81211b39038e52baae077ea4df89675d860d6ba5a0f998d049614201b872e134367acc90"
+        "066ac602e478ac3e43c3ddf4b0ca0aac1a68591a",
+        "050245c1682344fef23bd549ac8d1e8e44b2840c43eec1cecd33daa4e9ef6b53f496104d"
+        "7432e14248682cfd6f5b4853b65adac",
+        "0400d2f8fe524b2108e375c9603598b555d6c4c7724c7d11039178037b3a4dc82b66c3ae"
+        "ffcccd89cc34dc2b2f6695892323bdd80501f98df95fc1837ec4d5239cf55e97d6b489b0"
+        "a8d7bf12c1ccf95f689ad23e46dcf20dbb531f5179e754f0c29c8757a1dc67493b",
+        "0c683f98253406c6587d87c57991fe5caa3f43b451875859feeb81176b732f1c1eed0ee4"
+        "4d1905d41922878617e03dac53562a7",
+        "00cdc9bc7d670a1b6794fd7da82d2ad1a0e92b82ae32656ddec3aca4de75f407f20fe782"
+        "daa0004317fa3f12cefc48518298d5d",
+        "03ee7c75810c2c05946b53e2f24feaa697af35174402c069b9fb03d89d73964c997eca4a"
+        "5d6f9482cb23c8ce337a374ffc3e186" },
+    { NID_sect409r1, NID_sha512,
+        "61d657bf472676301503f6784b7286fb39fb4186bb88abf1edacb4a2693d0a1e2b77bbf2"
+        "758c84f2cbfd1753e20841b1cd4b456400d53f4d686e666943f9b6ffcdb77f510be97536"
+        "e9698fc84ae347d483bc8984548d1cf86b9b40d360f9c0dc5bd1c55868e26fce1460ba94"
+        "ef5e94eb63c9f0776a0f446c0cfd4106d9f36352",
+        "08d3b0277f0e9fe54581d3a9499ccd7f015c08339591326859af969d2a26284e3b3beac4"
+        "a0b74d324ce5cb5f38c7995e4e3a41f",
+        "0400ae18564ac04b54769e17df84aa54903df58decb870591dad73dbd712693d901f3f9a"
+        "d43a71f23b77705de2b4ec1c3bc616356f019810f92e80560979ac6e72bee505dcdef15b"
+        "4146185d2f8f5a955a4555523d982c34bbfc1326024410dbad3349e4c4e01c242d",
+        "0e52dea77fc59298cb06fb1401d11c662a04500f0470965c4cfaded13b339bde52f4fa04"
+        "c76a955faac16784f443b1ad9dfa0bc",
+        "00c917d487d2aae1651d76147de2a706a01c8b3d223afde7d20c9dd77cc2329bd3e0e4fc"
+        "01255b7c4ed1baae7d26667bc2e9ec6",
+        "0058c766fd514a405de91a4b9e99fc0b0146d954dc2e2decc2f3f066d0fe192832ad37a9"
+        "40949ca4e9abae0602248b3b56100ce" },
+    { NID_sect571r1, NID_sha224,
+        "8e14f713a2c427b1f79491033994f76acbead614d12e73ac6f3f518f2052a10c1273aabe"
+        "628ab38e0d3d5f8ff254802e9f44a51367bf80325b6fc39d907a37f731372864747b1074"
+        "9ea5cb3d3a83da39c21a7b02885a8c1770e4397cedc958e4baa21d5007569dc9dd1e45d2"
+        "181709d900a394454090badbd0cd9c2cd2369aad",
+        "0f42afce7f7b3d45f3f925ab29fc3882a89c9f585177887584703cf8bd8fc572e677adfa"
+        "55b402446fe1e90dc855358d92c3267c35be9674b40c2ad5ce8dbe6a533c44b0ad8d2b2",
+        "04063dbcfc2d9171a7cc1835c1f56ecadcb59aa6d5852fde264ab25603f06817a20f2787"
+        "446445be8b2ba05c70fa25d9b9e34d5374febffeb536facd3da52d43d69fa7af4d4792c7"
+        "9207686e0629de47916af19f9013f65fa3b5f9d196916cab2f765aff31adb5a959515e83"
+        "fe3e00e91843c532041ba15f047e978bf2fc69627bb5cd7f3ecd74cdf1a8d623c1efd23f"
+        "c0",
+        "3fae665eb7a54f51c522ad5721d9e2648f13f3d84e3d64c8148d59c662872b5cb7d911c2"
+        "7bf45884f2ef717d72bd0569d9901f2308d9a68d128c042effea148cc963a8252f1426e",
+        "1df705ef13ce900ed61babed02e121dacd55a881ae32bd4f834fa8e362d059223b29ff3d"
+        "b835fa2b2db8fdb98c21dda5ef744cf24d0a798f501afa3a720a238ebd4fe3976a179b8",
+        "1b1e98db422fd48f1dfa049f38865f8bf9ec5618fdbfb50f21cc838051a1493e4b1e4f9e"
+        "a81156481e5fd84124fbab740421173862c63920e3a833aebf0762e7b5b39a1591d27c8" },
+    { NID_sect571r1, NID_sha224,
+        "38b60d27ff08fb191811036dbfd5b39e1cc3427ff70efb67c851e9cb407f9fac6f348d28"
+        "9df98d055eec73299fcac068bd0fd9ffa3c5d244659e4f714a58d79f6727f323a7ee2636"
+        "9000e90e34e106f99f5ae2ae1b64ee89e5a1d304ef20c071a7773e9b977ed3d49f467d30"
+        "0a881c8371041394910f9c366942449045568f01",
+        "2f36613043cbf53ad36e2b38998bb867503359ae082d07d040e5a10a43e06ba9c91e7c73"
+        "308e41e2391b65e634f83b162cbdf4e7a44ad818fb93a978af00f06be06731d8c5886c6",
+        "0400fe1afd356670e1dc6bc195f9513f1dc6b03017416b5252c7b56153da538422e557d9"
+        "918298ba6c78283efa0288c0ac61298846a6f8adf74df21747cbe7c18a2b825a330e843c"
+        "d8018b7659f0a7e8e7ae5d636ea4d1d5f3a1f846d4bf3dfbd96c6ae874354db6faedf02f"
+        "75c4d1d8bd6a3b61e70ce58e38ea5de8cc16828f87a0667614f6640a3023b7f4aa93fba5"
+        "77",
+        "3fe351ff6ddf50752f7dfd8e5a72c9faad77dbea303fd97dc939eaad3aa7fed466fc8939"
+        "a7a6bb7abee63455284a5338e59dc067236dd699bdeeae1424d993a9c76fb2fe9595423",
+        "04a0e13a9fde9f2fef417199f8584d0f60b2f04aa6b7524cd2a2826d63043b2188ca977c"
+        "9567fc1ff292ed480dabc01589db8734c15aadb4ff54a552a7d9e66829fec1dc919dae6",
+        "01bc7d2c4ca9300d7a3001755ef25231d2852a7b9a3e91baf21f2a2bd2ff305be8a9de1d"
+        "1bcd7bd9eac4ce12ecf8a91c0a409726085382fb8d2428adf1b42b37b50c9e8e0535d7e" },
+    { NID_sect571r1, NID_sha224,
+        "21709eeaf9e1953822294a478dfacfb205fc25f447a73a76a32601c00784cbf2f9ebd41c"
+        "22721d70cdb3842dcaff4a4f208d41c0816990e421cc4b8538ac2f347cdd0aa2a39f1aa2"
+        "6ace8cb6a606b23f6244894d4594a0f6a5b8f6a695fd66e1a41e2eb6a377017177fec56b"
+        "b58c837e311cd04c5b50575faee32606b9636ec1",
+        "2e74948c46930cbcd9dbe2325539c7dfdd910f309fd610e6599d425aad9ae230a8d46819"
+        "70a14f2a71fd08030d0a40ff40dade7de1b06a80441bbf7e2fcf1809cff39c7ef88bf9f",
+        "0401b75f2d281592c288fe6d5479a4e21ef626471819850cbbdf814593bae7e6ce2a35a9"
+        "78aea354649d979f161543fd4c12dae0efcdc2d95e82ae5874b9c04a2143535097b8a17c"
+        "6800c7160c2efa3aea1d18afc1a00b47209dfc750a5317ddebff04bc4d181f238d339a76"
+        "90c24e55be2cb0c01719d34ec986a07727f2e412aa72434efef4d64ecf7c16e2e75ebd7a"
+        "d8",
+        "0d3ae3d8e5e01ad838a7cc9a4d9b3e41eaf9894aed1d1ba597458391d4a2ae38c5d6efdb"
+        "4d91761a415812d77fd9ceaebbf1ad49c282e693d71d89f0e2d1bbd94698a47f1f30890",
+        "1e2e9e2633885c85f70208de30ae9b7f72950e2de980607f6d0e73fc1fb2a4a8afc63882"
+        "06c11b081540bb528a94e5386ce77a2d5c7830fca19223d57c1efe7ac488e69ae07e660",
+        "1250d1b920324919ef81865513db461409f6f8ad82f658dbfccfae4425906da306ba10ca"
+        "c84cf5379b6c1d8b252f3c6f86439413c617deadfad38a234bf2b0050fdabf7719bcc9e" },
+    { NID_sect571r1, NID_sha224,
+        "3a131fabf3dc97334f212fce41c44300440d16de1d6060450875f7276f53c026e2a51168"
+        "1b5a8d75fc0d578546339542833145f7ee13c708df33e584445a75a5538829286480d339"
+        "be7c777c03c998a6d3f037b25799ab2d541021502a0b02a9b9c337a8b176c4f30e5b1864"
+        "85a6103b1d1563ad4ae73ca806a5e4daa92e9100",
+        "1b5fab1d36f6f6d559f65d8b01edba610620fc3a38307b1fb1c5bd63e7ffbd4a9098cb8b"
+        "df50975a873f5d047ee2b627b090897a7fb5f56d3f4a0f3528179e7c969926fc0d3b0e5",
+        "0405eb8c5a2bfc86aa9a82830d665296f74aeffa9c5b38750d0ff51d01c2dd0fb6f2209f"
+        "8ba89ff07297ab9b1b06168757f48cb6eee618a7b44f1b3902187c33208288f35a066659"
+        "2005334c203f4ee44fdfd5f99686b18696b3433f203dd148324dcfaa03a0a250cf606486"
+        "ef11ebcc1ed1839a76ad70909d835a4b30a014104a6ecbb284b33f50bfec33d8b5ede85a"
+        "c5",
+        "243889e7ad32076a3ea436356eb572c1b4ae402d0218d3ee43927eca0b4fc21a19926eea"
+        "35c37f09de4766f54e6079c34fb3c174afb953be1aac46d675bd300e717dfc2d0c3fae7",
+        "1d87b52dde9f502f02a502e7a331ca6dfc6204922fb94886efbe3013446d08240f6dba12"
+        "10a76eaf804562aa92a14d220d59b6310d6caea0274a5e1e8aa3c6b57f239191a71fe3d",
+        "2a5342df6908841b719f80ff905cee0ec3fd8be46396922c3f2f142393714b97128e0839"
+        "07a3a2343f0cf9aac73313279ed29eb44017e2a1cdd0fc86e4b7c536e9f7eb1bbd192a7" },
+    { NID_sect571r1, NID_sha224,
+        "679d85a762f2574b0b31b516270b7d33d5e166c83e91a0f48e0f3db20b52f42f9e6ee964"
+        "8cf58267ffe3b713723cf3df52b5fab5c14db1e7189f7cb7170bc6ec7cc71946745e152b"
+        "39180f828688a5b6c0b2957ab94283b90052a3c6e36843c391aa8810f9253b639a8d5a69"
+        "aec10070603ad7a99dcedb544858d057a1d66b89",
+        "383e70c71b431eedd4574f65d01fb0304f7744d668408c847f7899eae44770a7f3243109"
+        "740f177d7146a27748886b7b77ecf3792b512e8d8e37c3bf4ecef2b1253df7066498f01",
+        "040769dd91fad550980225877d98f7c86963c88be141f91f7a3f1607e0cc6dab767aaa6c"
+        "eabaf46b65a7c80b6a494b0dac1da5d2fc8c5b07ef7085ed1bbdf4273da3665a6517ea1e"
+        "5a0282fb94b4726472248f01ee43607f7ef969446313e849998fbf0058c8ad5e24457006"
+        "b84fc0460b74d86ca281caa174e69fbb68673e1d28ccba17eae045eabc1839870831246a"
+        "14",
+        "336909099a1540e6f69172d55e0c88a1afa99808005bf09cc803ae1e4e4fbeac2f77f984"
+        "bddb482f1f13e4430e25e36962b1a4cae00f1fcd7f2c7a17372c91673d8286f9829bbdc",
+        "290055d578012a5b7d88fe2f70581a0fff976756b4581875cf5db07e01f09c0bdf6ab70f"
+        "fb5839567583d53c68e31a27c3fde12bd4f1e1315af2f742746277b1fb1349141ed3043",
+        "1480c63c8b90c7b51e092597fd8391a237b07f0ff7dbf615e6bdddd5aa880db29c9b9add"
+        "5bde7e0e81d9a37f852c26f21d750cd2f95520d16da7404c2c3feee1489aff09f298d7f" },
+    { NID_sect571r1, NID_sha224,
+        "236152ad31ce2ffc0dead3c142cf6c770672cd2e75af4a82fda1a72e1c775cec9b481c6f"
+        "3e411644df7e7ee901c501405620af4b6e9667dfd46091788daa95ef2c6c9f5c240c06b1"
+        "5cb0df51f5f058d8a7934bd7845f007a35f99fa97200b20f3b5b14fbf1e372507f3b2f37"
+        "7e8d07d30fd3e222f398f26d8f428e320327f901",
+        "02261d4ead21f02fab19bbb0da8c272286704c8f0c6842ba47ded121e5cddef79fb34e6b"
+        "9694f725ca502949faecfb21e3cc062a2b4c654bd542d9a1fe8d97bdd0905c510aa0999",
+        "0403ef03980ea9b754b655948da63469fe526ff0ba2c0f572981d02f5693bff620b55b8e"
+        "9e9f9d553a78a0138072369775c7976f028631e65887cbed62fb447c9f41da86022f4b41"
+        "ef04446eed90f2716a7aedefa1385db9f5f803434517fcd80571adc9b7f086c9787b7630"
+        "6380a375668b05fbed30922746fecc0cc16f189dddab676516ed1fe4d02855a34a909753"
+        "89",
+        "0b309f6c53dee8a8956358df45e72126ec76266d38babff185d4db1d449c8fa9baa4b065"
+        "1af5f5b0aa70dee3dd55623060097e2f94ed12636961a7c0744b38f2f137bca239f974b",
+        "2b42395206ae79bd9df1c729856101ec3c4a719616701f836c9d69b542b59ce973d91951"
+        "853f89a0717abd4b929bc69e59cc379c941349dfb4f98d49f9dff572c614242fd370e56",
+        "1ecad482a8eadec6800a9d876a382125eafaa7bbd950fe5f0588126764126eb1b3844240"
+        "15c52ed6a335668506f25124aa78d98ec5739fe282af0c143c07da0fca53b9733e159b8" },
+    { NID_sect571r1, NID_sha224,
+        "ba3f02c4847fae035d747db246fe4e82fb9224ff9cf568a6ae548f5dc2befb2079541d2c"
+        "f9aaa6b18c281a05e7ddfcdbcefb25f41dd91cb3092b3343e16985e91c912215cd99ae4a"
+        "099baf628e33a7b277e3c36a13aaef85418fca99f64d73b789f23ecbb76c3095ade0a5f7"
+        "f34836a98c5be933b44a94a2eaa3f99b1d8e7937",
+        "316c78f289e1860bb623082be9d9238b88e38c5e978a868bb90f776235bdff4eff591877"
+        "b7f350cf14c40356922b2b6aa51d64990360b2b0e44d6941b5dd9492b4f4e1f42ca163a",
+        "0406f4137a2c63b6b79138027464135021b034f97bcb2493943df6be844f1657a97632ac"
+        "80541a3b43ccc828789517efdd9f86ba171c1262a07a6b337bdb0c8d5f018302a8046a1a"
+        "8c0425cf553554d18f6cc97f0caca2a7eebbf266d57030014273f701562d5b1444240b9d"
+        "22060ac9bebb37deec393cebdad21ec7f13fe5c7f1752b4261cc2feddeb737284a6eec36"
+        "63",
+        "1e0321344bf364f1ede39a49c8051f36875ad78e4b080ece9088111739041b121f3f334c"
+        "6e923777fd716a52be669d6e45f381da11262fb4d09ad66dea74ca115838e19fe94b7f9",
+        "04f24ec978c52ffc7675a09334a895e044eb8eaf04d26c094d7607b77ac4168a02a972f5"
+        "77880a0d0c73f218815e3a7a70c91c50734c08d374a15fb42fd13367dbbe08fe9c2d4b5",
+        "060740270df0e1fdfb8e829c9601b9901223b19d07e9d7d422b9bade88a50fd6d4ec9684"
+        "2afc45900a0107ce85ea6d083d66ae202dba3a32e50c7c3af951cac7acdc6f4c406740b" },
+    { NID_sect571r1, NID_sha224,
+        "6d0372b40559e075af56af853cbe18ba2d471b0fc8917764abcc69102b03d5bbe1fc1245"
+        "8215be66409c26c89f67c72a8933677a07f88993af6918acb074fa915fe883b24bc3d191"
+        "ff1b08852f07eda98977e70eba072d8bf189cd545230f59559ac05f1fa3f4e65886d0bc2"
+        "74a6e02e2399812b2bf91abae81e21279c5de996",
+        "2c1bc13f8320d97a82f3d9354e195481902214e16a4fd89332a0499208e91d50e5cabeb4"
+        "927ba030cb42f5bc53b10f500fa646a8c88508cb0d63ebfce5c4bd574c527d686c735ce",
+        "0402210791ca48aafed20de84ef9896a9c7584081f850b75884908c7b3dccc94e221401a"
+        "6ffd982f292a9d5f9c1d066ed493da948ac7e93977dabd7b820bfc0fd21cd8d99c072bb6"
+        "9c033574c6ce7da749ceb480b4e00bb1a58203bbbca5c16923992cc9767aba5483e4d46e"
+        "d39e71000a1fe920a4c1c211a14e63ace03635a2d77e72808e0664334890b819b3caff64"
+        "a3",
+        "2e3db2d82c4b9de2bc0dd0a93c1c5b385f75ad03d0da527a034da2876b42e43cd88dc648"
+        "33efef54af902d85c568bb8e71684bb16b28c32d80bb3e9911cb1b74be6ec520d99b381",
+        "065f4715e87ca3541ea695878ed5ccb7d2ea6eed5d6fc5ec29f9aa8deb4001cc7c06185d"
+        "6ab2dde4347344d44f8300a1e92513af4690d713762336d2e6a94d3324a224f06eeadeb",
+        "20104e0767530ce2f4351af4977b52339f34d13e458de0482bcd58ab38ee041c9adc7b05"
+        "650260d919b2648e2f820407fd60a8d6b4b991b86eaf29c2c4d12d3b0b45cac2ab22c5a" },
+    { NID_sect571r1, NID_sha224,
+        "bbfe66c82bc060bd14fd0e40769d9b3a026eb447550dd9f118c30d8448f725f8366edef0"
+        "42447962ba7f7f833b9e9094d0ff600714697e632626e7d12a592e040bdcee166dcda939"
+        "52323191021bd12f3b1647d0f25a41739994659dcbb19333ca30f46f539c6f0a5c354cda"
+        "8969a1eda572a309950c84c7607eb8ac20163912",
+        "13bd80eafa67663e75d7ae139bf285d2b9f1e03d8e32153c73e26d06e86d7acad22bde9f"
+        "121a3f1ea674dcc1fe67bc7f5398d5e92555056bc046a02b0ba86c2a0dfe32e91add5b6",
+        "0404c01fef7f2fd8ee61726af1a2d046c7ac67716403b99e021082e96d733368c6c64d04"
+        "6986fb01a6b55cc930517762387eb2fa4a8eda23c700d88065bced8595188760170881a3"
+        "290189bfdc8e7a710522ab5416182c9579ca255c5009e6ee6604ab033c1388639c0f7aad"
+        "84642290954db9f4f7fbffd17481eabed38151160457d68ebdfd8695b5035e4e6e06532c"
+        "0d",
+        "3c5868345c5314aad5ed3a74488a85b2f049396022cdd1de855a0b33c2877f72e871805a"
+        "f3ed8fd7e7a392c4ff63acac6a6f0c431ce7af680984e8c81d0350abe491a01f0f9268f",
+        "0c7e96b9e9a5935ccd51b901aadab6e01ebde44f57e6f0b84e7b58ab4f62ffc0f3f3f980"
+        "665c581ee3de233ee49d11599529348f1ad3d362837c041cf98192bb324f577e973e1c7",
+        "2226922271fe8307bf597742618ea9c1c271c22c25b49aaa7c9292a81ecce2a55250415e"
+        "a2ec8ffec54bf0508e64426cb9cd7177265fecc40e056e96cab661485e789f0c435b72b" },
+    { NID_sect571r1, NID_sha224,
+        "b35e9bf686717ce3b16a59963a32a2116130453b161a4e7ceb27b755856add836d779696"
+        "edcaee3b5c986523891c8836109d431e55c23afbca022437ad19e6777efabb6da3bba1f5"
+        "f44f905395b4cc7c9210590fd38da621582d059598e5e4569e904358e0dfc0dbfda4ce75"
+        "538aa97480912852bccd433a9b96c9c66e9597d2",
+        "30834b0a4284097cdda2ada6947c6c281f7290a49b56becefea1e2788ea3ef78fb968076"
+        "33c47c25138341768b241164ce0d42f7301728b928be2c047f2eb60fc2f844ab77306d2",
+        "04003a21f0d8e01a64b235cc455c291e3fec8de12682f05544de207d910c7c24c4cd56f3"
+        "354500d994380ebaa0b49a7604c6233a9aa24934c550c0e609f65fd4073cd6c1ee4170d7"
+        "7e067c83513e4acbdeb8343b3add40261edbf7c8fe0af7417264830edabfc40200283b92"
+        "484630741378b997c3f8bed7285decc6ef8633aa804b3846d3b4517e5ad836dbb1df4758"
+        "18",
+        "0031afb24fbc52b01480754837cd84a5165d5f2ad1a1d572b92ab546c049413806f0f523"
+        "9a77c751af4d57a84786ed1c11bc76123a82e7db3c0495b2fdc5fb9c8720eb7afb640c1",
+        "07a222cddfaea617f1190a0bd88af4d1983d2543dfba25c5036fe24529bbe2e382de89dc"
+        "1e36c1f6df59c8291d1c4277198084902e5619b64128c265bcf03b7d8cd6b663c225f11",
+        "1ca84c146ebbd16300b813621d503d8c754e4b11446d5ee31cbebc71f4b85ed09c5c94bb"
+        "dfc3570e8882ef790393234c5ee9e52f7d5b74ff4171d930af817eafc40ef203a1ce613" },
+    { NID_sect571r1, NID_sha224,
+        "57b5ae7e95c638b258d1e09b3fcb4341e203f5706862e199b103c8fdac72cbc5155e5cf8"
+        "b300a0b3fb0ce1f897c45f7aefcc528182f73dd450cd84d5fe9eadff3f704dc2a01b4e84"
+        "7c22df430efd1c66b0199f3e5b59348af5386962a5ef25204fd230b54d58d7fae801c086"
+        "f8f405d3d0aa7a9a9da15c22b868817cd897d853",
+        "0c81a79ced1eaaafc31b69a40d9939f4e484d625db6364a8e589b6b4d336d458b44287ea"
+        "6c6aa7661113fc07806b147ff98216fa0c08708dc9d651821b922741deda522b4e436ad",
+        "04025f9b767b8796466c1cc8a1fe6286d591c04a0d115133fc7910640032b898a5c86547"
+        "f57794e5aac0148996151d3ecbe0d5939dbff5722679ecff378e3f21bbf1354b1eb294d1"
+        "a30074c2b91ef3472e60426d2fe182ccc678aa0abb8dda15a428e4f6f1ac401b015b2b7d"
+        "83535a0a92770cff7666659e1cd33941bea1168cffde82db0ea83668c2d387e6f4bdf28c"
+        "c5",
+        "27b407a29553203b829a87eb25d6d140e41184634ae1c64c6ec38e9012d0b06a1f4ad987"
+        "7d7ac4236a22145095990233e6c102a0052ba18cf6e47e289cce4f2ca21514d8868bd68",
+        "02416e11fe2f8e4738ecff1710dc827f4e03c8e7f04a4f52e755f0c1676abbd122eb9751"
+        "ec1fdf6c7ba04b4e29f8dee52bff7e9e726e28cb3de6f9abf2dbf58c0519ccc7d70f076",
+        "0b96f107a26097a468c1d410bf90e223cd72c5ec98d4ee4ec2e32259d7670d7e7689e62d"
+        "36549086139f6111884530e20f908d7be1edab75180c81a70ece341f7eda6e4a43a5ad3" },
+    { NID_sect571r1, NID_sha224,
+        "daebfef74b452f039c999ba0528be3bd9e16deb5f46f6eae87b63db8b89952c949fd7db0"
+        "8311871eb2596865eed107aa065f030226ea675ee3256c31a3f85ddf4c21760582144e07"
+        "af208f33c5f47cc026db5403186a65a47940691ea2d74ffb1245676260ef5717dd879d8b"
+        "5b72d96f87fef5f762d4fd17454cb5ed83d8a11f",
+        "2f24670c0f77d2ca0266a743023d2c7413d56d0b5ec77b454ac59087efc4ea4d46179e10"
+        "278e4ba416ffd8c3f9786ed202faf8251c0ef5a9ea5371fbb35b7afe3d15a9cb4bad975",
+        "0402da72b8ae64c5ee717c33758ec26153a342936f9d41dcbb136590e1303b0e220ee84c"
+        "8a06b83d4d9fc924b8808de94dbd780cc8243bc4448efd27dfaa1572aae6abe574be6649"
+        "3903b3a95d962c48a81c48713247801e4ee630ec7956c9989023ba16f02f5bd1ef2edcdd"
+        "1c8d314be933225c64b7f8a80542b209b944e1f3fab95795ffa134e7e28e82307dc62c29"
+        "62",
+        "2bbb9abd2732994011c8d294c5342e8b1f7f3c1f5718187e9f75832604b43bf75abad5dd"
+        "c85e8d92cdc42656cc9f3349afad3f9022ccbb4937d9ffa9cf48314b604e82bda13475e",
+        "3986059f2e096a3675215698e23b53f471c578891f6d721a34a0d231d16348d5bf9853c7"
+        "9c4f4aa94642ad06cb7bfd11f724800cb5477636b6fc0586fb6efb8eb9bbef62329a884",
+        "2beda064eb3ffa1c3b5336613704b3bc3d4ff7b0e977df16477c7e33d480d678804bbdc0"
+        "8088186fbc4764be398a26c13f88bdd23e844be0d7ce598bb87c1b3430da02ae96b3767" },
+    { NID_sect571r1, NID_sha224,
+        "62af0493ae79d71b552c4647d1fb7ab2f282a91cd44aebd8ef344dfd77b521b0c0a3f72e"
+        "4513c8ecc0e4b84efef3df9482a07ccc1b740c571c5e69cb913740a792aa231b9dc87edf"
+        "b72bac188293c6c6e788cb3dff32e8f483f8f34e21ee7efec71302cc3bdbfa47908a135f"
+        "6ef3ff179dcef26d1a3987f7be967a6c0f799b0c",
+        "20985f2c6fe3ea04bdbab66a8b6167e5969c073b9d53cf3c77cebbf73f4dbf75e601620e"
+        "c9c3107bf3fbfc6c79f8f063409bf8fe1d14b19e323d857e23dc05157d270c7514137e4",
+        "040010712d50ba7752962b140cfb943d9e8dc3bfa497bfe81c42606f4da5157656fe2ba5"
+        "cfd33ddffa0f27fabef8e267688943514df45e642ee0454e05b49f7c00f5785777897d22"
+        "5b01a2c7db6595c6d4c55110210c564cf102739760e7f5a29706fcb2515d99ca00949d5b"
+        "4f291716d0aa1e3a47efb9632410f60e2fee1ada47171f902f632bee85da75c7f3c895c2"
+        "4e",
+        "2f26eaba6452e687af452d5e1208fa011e4c84ada92a38f0a204a254641c23ffe1c184fa"
+        "8bfaff047db590ab40accda408717e4f30811b75cf3a5877ef99279476ab924d92565bf",
+        "1280adcac1c79352635f4165f9c5c1b6e1e6e33bd74d781773f483f637462f80340f8d22"
+        "cb24c9db5e49ace95a676df3dde53c8721f672006382ff806410bfcdbceda50e53285e6",
+        "07dd52973ef30dbd480047732622fb1b695fe3cfd080264d2aa30a6ff3dab4ab362518c4"
+        "f3de4fae042fce78c0c8fa0e763eb187eae2ff8f2e79b3f38cc3c1aea897e1f28b71a19" },
+    { NID_sect571r1, NID_sha224,
+        "566f17851951777ebea3f8285610cd8ee5f882a68e7a4205e6fc9e2d66d210ee2505ee73"
+        "d6503169f7b903012d43e7e99efa493a8e6ef926b16b9ad8f52156840ab561fc6b680120"
+        "a88714fd66d1d0742189bf06c155e1138ee5314707173f7352e2cea0fc26e1553643f249"
+        "0428718e44afd8372cbb7bf5b88234318ebf4355",
+        "2b3d641607b8a141f876f6d285ee46aea543880e772dadd5dd83d595b9643191d9597218"
+        "e1d6adb081df133304037bcd2c05c24a54e6c4cca64fb2cc4569d6882315360059496d8",
+        "04042f2bffe25142ac6c1af26643b0f1c317b34950a8a0f112a0cd4ea4131303674328e0"
+        "bed5d9bc7ffcbb9712387cf67129365b4fa8a9e785b787c170463b24f6a7962c1e003c87"
+        "320070962ac4d3220f367f18caa7ceaadcb82fdba45cd2c034a97aab71f7f7546c09736c"
+        "b080c10d9a95a5f984aa4a3ed32d22636a7b3d5ab29c86d85db59f6f17ba29eb220bb141"
+        "b5",
+        "23d7021f5376e7b11be07288a0e47b4326c026df80d7e08c9a0fff11deccdadd479dad50"
+        "3ef2d4fa3f0ab2aada604b57fa7e09dbf5c8d493070b5faebb27cf68ad0b78bb6f3a9aa",
+        "3059720e7a2dfff03789e7a514f75f2af5ed18cf1568fa2a5354dcddc9d3c7a90605e9b9"
+        "a3d0d6fbfebddd615cdd52845ff922873079e06c4f349f7798410ee18e0c69045193668",
+        "1cc40209692cf5f8ed8b82372c95033e4199d378a28b9edcba516820ba21af1bcf5c5df2"
+        "ef4146b91fd37dff89ec8f9962eecce5c5e285d76a5f03eaf99fa132e98cc40ad66c296" },
+    { NID_sect571r1, NID_sha224,
+        "25155825fc4f9a1c4dd1db837008e7e2594a879052431f5bfc76d0d2565b8fa726008bef"
+        "aeddceef73f3c60fa2cdf6d9a70e56d27210bd013034b38861ae49640ef208d3fe294ac4"
+        "362f8eea44f58af3af8a9167a36b5acafb7ec95652d5885a0e08067ce1dfbb45a0c89ad1"
+        "acb53eb404bf88fa5c3c463a0f912b5a2522a0d9",
+        "1afeb5ca87c81025ddf09c2b2c5ee22ba0105c0e619b67a324467485bd839030d149fee4"
+        "4d8bac6f5902a1245a50c3437046b7c89a84116b2147cddc645b6d2fd24d68e8d53bf5b",
+        "040119c46988a79e3ae8833ef096b0a1e2886c4b114ccfe881886859abc031df2b1e7581"
+        "8c82be8c5abafcbc5d7b3b8344e98e3f413d737938845e6eab5aec7e507f7baf0d339a36"
+        "2f03190912dfb5a1a31fbbbb50784b18051489a3cc0f44c42c71d3a54886ecf40507c324"
+        "0395e8ced37b5253b915fdedd38f75bb26df2a0a8edba865f898a15f2d96f632f7f06388"
+        "64",
+        "1facccc127c856db1994c4d9e9c76de6bffff81a88d7aa0ca1645e250e07674fba734479"
+        "11c5b47a1aae815d5e96164854636d3168d0344b2d2d913127011b6434d5a5e545d3bcd",
+        "21da49326f39577ee9f65cee64006525de88a834365a00f4f8cfb9a01dcfd6349a3d06bf"
+        "95990a2c17b7e95cc0589714b7a795c7016b29bc844ae9031488ca354548976eed68415",
+        "3364def38a8ee3116cbd971794c859776107154234d8b198efb19655647bb9228c7c6be2"
+        "e703672f795ed37481e994b6764d0b7c1bbeb2bd1db90b34f460278a54bd480bf4e9adf" },
+    { NID_sect571r1, NID_sha256,
+        "29acb0fca27e2a10d7b9e7e84a79af73e420abdb0f80dd2665696638951b52dd39ca0281"
+        "66b47a3b6a2eaeceb1a11c152383f0bec64e862db1c249672b3770909f775b794e0b9b28"
+        "a5ec8635a996d912d837a5f22471b40ec2e84701a8804127a9f1a0b3c96ff654700bad31"
+        "67240c2518fb5dedcc1be9f56a807083e587bc56",
+        "32c97639b69c7cdbf419286d0a1b406d9b1f2886521a8b979a36118d2a368aace5b02dd8"
+        "c515f2041e6fb9f026d1e82e789dc826a56d2ef732b1bb0f49be2b696ab5d3d5694a2de",
+        "0400087ff1d8a4644edebd43c2d43d49e140940d215f272676fdfb72ccf58a12021de3d6"
+        "68f2766848044ac404fb45cf6e18fc6700f87aa53b4fac1e35e1731814f8a9d0233e2942"
+        "d7029fad3638177541d8392111064837bfa77b4455c21c5f7652e3fb302f4bff4a35b74d"
+        "e8aff3806538ef9ac86964cff755a81cb3002b6fb241ffcae8ac9621b8e034967d650836"
+        "ee",
+        "16a06e3d25873f6dae16bb2e569720ee9c6ae7b5ba36854c321a80be8b4be502b895e1a3"
+        "d161b001f6cbcf53d164b5485d8a5efa0476f581f9c79b3a291025be01a435e2fc5ded3",
+        "347138a43f3ed1a1a26f5f11549eb8a41f64aad302b6383879886216ebb6d08a4ce270d0"
+        "7a5bec6018eb313430ff017c1bbf78556436d9255e97aba1481f0f16b85e7320df79d69",
+        "28f35e1aeae288122b043deff9ac87d39478607da60cc33d999b6add6209f452f631c6ce"
+        "896afd92ab871387f5ea0eae5f6d5cf532e7a6ab44dcf44acb1fd1daafaf1ad5423d8e8" },
+    { NID_sect571r1, NID_sha256,
+        "c92d67cf6536f5046e15b02158da698bcbba4ff1e4e9e9c882cda67f817210402ef917ae"
+        "93682c9c3dd817b21b73c6c00b7bf92ea80ecbbef2e67f4f4379d078a2b0f297742b2bb9"
+        "c3fa3297a7e8079f488555bd37715eec92b4b1cbf897640ae8a1d2a0fbcee5423ab31a37"
+        "629f98630275e35094a896cc574be0a449bb1bc3",
+        "0f93672159276c5a293582b9f49607bbdb970112f6c63b2b3b5d32ad3c8240c86b1af13a"
+        "8dff6502c6b6a17712cfd988f8cd23a60693d64104143b3f91adb37f852e9e11a0ef110",
+        "04019dda59a839aa2ed28f69a62a3e3a753c6fc789fe0d8551bf59095f009d0327386e6d"
+        "f5437846c6803df2442e0359a367d04f117e3965397576d4287398b4b8c92ad278df4a44"
+        "7f04159ced60503f7cfcfcd587bb3608699f54693068101a838d575715de02fff81058d0"
+        "25dbdda430e176f60e423e6fcbba889914f6409ce51d51e89e4cd7bbde6d24404e5b043e"
+        "79",
+        "10dd216d4b3da2fa6a75de60f722f1f128776741cba002c055d1445581242a175318291f"
+        "ae313eea11fd905b20d26cec845f57a3d5bf23ae4dc93d886c0594f1cf7be4f59f3e3eb",
+        "128d5c00a48c7352eb980d9c80781f8abcfdc1ddae415b7ac94b4d85c3d7d4f7316e2b33"
+        "44ca50c6ae82938bc728e640e59e2d733f0c7f7025e66c15c81e98a845c1ed4843b589d",
+        "1ab59ce5e54bffc68fda96c920b839fe03d1976ab36978bedd973715ed631bfc8e3edd10"
+        "0043ac527aeb5ca121da848bce4ec9799f55b22454e9af32848943058b257e815b04056" },
+    { NID_sect571r1, NID_sha256,
+        "15413f614c4551e3b138b64f66d15f8964c40326a42b0afce820778eee4a88edb127fbf5"
+        "75da5263e5a2627b5461d311813ea868e6417615e7c4938313675009caac28bc7a2f4c0b"
+        "c37572d9bf36a3b1794294e09c0121ceecaa4b916df45b0dd31225415e6c87cfeeb092a0"
+        "08fce2c543cd62365779ae28f29fa02a15d9dcd5",
+        "3db080bc99c5fe7e06d5032167af56783cb423fae59fb5b3c6bce5fbedf56b7b39b17810"
+        "e48ea9a172881aa1f42f5e267349b60294d4a208b4437666b44abcfee5a1829e9467908",
+        "04059d1b3f680da784b49dde3b361eee819d67339447d7bdf7965550264eb63bcc7674b0"
+        "921f02e15d45466dee52b4c0a50c2bbbdf226af1662086476a9eb1236e3d4c2b6219af1b"
+        "db04e3466200dd6ecbc268cdc1937ac5123cbe33f32110cfdb8b7536987ddf5c9ef2464d"
+        "2334f315b9b489cf227a6300b6e054fe40d36c057a692f2fd3e762624069e2adefb65d24"
+        "d7",
+        "37fb32a902eae0c5d7cc9f9018a5d1a906a3d1b9adf5bfb696ff63f105cb2e736d9bc196"
+        "1677fc897fd3a9e9bedd370be6f25a03fad425b5a293c66180df78db33aec4a188d3db6",
+        "3aa8ab9fc9073429e52469088aea91f00cfba271b9dbb84818460883effa0c51d6a48c19"
+        "05d6f58d1312af073dc8735c29957f30324b467797acf86e028410de016338b972013ab",
+        "198a746411333172daef76359e7ad23035a0f5d14c283cb268828bd876b96b5f767e0c1e"
+        "2796def7a51429f39ab2332ac25d8e4f263f8dfb9c4c98da2ccc398fb3bb9a6b28ca28b" },
+    { NID_sect571r1, NID_sha256,
+        "9f901557451ae2f8ec79b6d4adc794cbfd9b2e6d28f19409532d91682820205308b41498"
+        "a4e1ca247a2baa8da93de95e3c0f7afd6ca46bafdbdcc6d3374a12684676a50988b86a96"
+        "0a82180648c8c1e38f8fd9af604c7be3be4b24799f4544ac96d6360cdb83d1d0847fda21"
+        "642934fd6cf65385b50d86d4656987901fb88d0c",
+        "06ee767f6f36bb8f364f324d8346455c899a49237d759003dd52cfa13b9baa4c71347b13"
+        "4b24ecaee32d247c34e3787a0c64bc5d299b55c86f64b47521d22f2c09db225b0c84cc6",
+        "0403f971125860f4598fa310eb7a8c6b4e0c31bb721fdc17ce6df9af557beded6006b8ea"
+        "b10ebe7f3c4f3d759d4a87dcfc1fb767ef87beb1f5c845e3f41503a33b28b2b5aa1644dd"
+        "1a03296062514d4e89d2105dda5bd65a315b9770c45afe4050d8c3d15001405b1e32be58"
+        "67ee90cafbe4e239dd44d030b4fda855182f1fcf80963c1300cb842459aaa8c282737187"
+        "6c",
+        "2b247e2dd0024f534ed2797110df6ea4ba166c34d91c94e43b045c0ff80f124bfec1cf3b"
+        "e3da7c58389d352c8c5c1bc2a2e876a7e56301b1e688a085ea0222697fc63141564365c",
+        "2858eadd14373aeca65ee5a2cbbaceae4b54a50e0941a696406dd86d05c07c5599379c06"
+        "6b2288d01b2a43c9ae34bcb8c36f59d490aa8d066fd3d7e539ebc620a7176507ccfb232",
+        "33c20d26dca20af2c56982fcfa6f085bc5c317d01f3b1dfe0ade1ef6e3e960b18b626d17"
+        "d6696c936f04090ecd9606c2a6ecea1cd1883bbbca8b3dce3b0acb2688fb2834aaf922a" },
+    { NID_sect571r1, NID_sha256,
+        "959fe5a19d7aea2ba611c7203e19f8e3f3cc101e03a98f91adfef602c424c580d5a86865"
+        "9368a930f9883d699fc633bd07f6cf8de474937db0bea86fa7cd140ec2f202663813033a"
+        "757b93bd72afba15be5e47a4eb93e8a666aa1c72c241ca3922547d63fa3732fec54afea7"
+        "ade84302e2f044275bb67433fb6b125b7913143c",
+        "38e2571d9f22309a636586d62863ed67a70538287f3ef88b88c3c2fa1a2900d48c342b6f"
+        "15c26b8e7fb4875cda4093b7de7ceda48fe1e2cc2975afe958040881de61f309931e48d",
+        "0405a221634ca85059543e2caf8bdf79c43bb78deb35e9c89e07d553bafb6b31750a1d85"
+        "ffa7689e528c11d8a3dae442b4fb2a4a21238d636eb04ccc04c8b5d794b0a213fe0480b1"
+        "d20225ff457b6cbc12d152b08025cdb7e1e921ee553add9cbf83228d678d5a9f5d3d1fb4"
+        "327a74c1dcb5d69a5b98f3ed1aebef0af09bd49d253a903636ef5a66844c500fa221470f"
+        "2f",
+        "3b4de49d57040141f3584ff596eda457e2835085d350b75391d90abe728723e1d1ac6413"
+        "979d4fc3eba98d72a01248e6510c722df15df876da881ad50539e4248facafcf311b464",
+        "00f259038b4d3d036bde101aab29f4558e88e604c62f967bc7a35eeacc6a56294268f8ab"
+        "00a34f9a0319b07754f502c98718e8b5c91093cdbff2c8496fd63d6fc2c50a35f87f423",
+        "2350d5406922e8822a91f7c95cfe8524f017a14cf7174ce534c60aeb351510d06ac20dc1"
+        "249129247b21c72c14b02b710c26c10899bcf995143aee632e294176e903645b660e998" },
+    { NID_sect571r1, NID_sha256,
+        "97b9688d9ed5101b8cfb19e84b89cd644262ca1c7ee18944e29ddd3b4cca78e06338b270"
+        "385b00a5e8b91ca5e628de3bba50e36ecc695b3ea737a9cf8b36871c473a54ba17819f49"
+        "e730c0f253b0c769aefa6c16366fd2dd612f330e95fb119fcf3bf7f3e254438c0ab635ec"
+        "04a8b2424a05b483ecf65b74a93636fbab7bf1d8",
+        "0c8f5736f1ae65592f3ca850f43d06441aaad8c03820f3b08d8a6db46488dcfb828459f8"
+        "b3f34af73cce8dc7a5e3834e085a64523d890028e194214cef4003210e6eb530005b01a",
+        "040667ce3db45b8772f717ce20755ffaba968aa1314d75c84073042436823fb54bf8dda3"
+        "4a6bb45a61d610745b1fc10eb0eef71c4f55b26acceb442d822d6e2a27761c73b740f472"
+        "89056035da1adaae894e361f5283b3ea07b7d9f64a298be11de9fb487c2479b120381f1c"
+        "60cefe5d32d37e4644ac86a170f82b1c4443eb71b940b21c7a016b559c6c79835532c276"
+        "fd",
+        "190468668989a607a3aa966cad071ca8e8eb152b0dfca9205bc9417a3d612ca1105c7b90"
+        "340b04acd96a5223658adda16bf6b598ea9f32a2f8d1b61c2c2bdc08d6a49de246240b3",
+        "291e1fb18edb7a93badd6fab6f56ee0d390f3b6d298e97312d5277358511fc7621534ac0"
+        "35f3518cb140fa4ad5ef7d889c0d5f3f52a4e4d06bc9f647f99695531f85a4b76cb1184",
+        "2d916734e02b0a98406bb5a9723486a7ed40bdd0b39c4cb802af4bafd519803d23c6bed5"
+        "9a80c256a14eb878229942f67e0b8159d5cbf24b719043171b3958fd669adfc72eb7289" },
+    { NID_sect571r1, NID_sha256,
+        "f08b250bf4a3980cb455338b3f4173723b3f44c97bacc9cf550149794a71426e398cb4a7"
+        "4bde141d8b7b4a72942f1c069676a9918e27792cb8f085ee037c78e3c468adea5123c4c6"
+        "4d8ca6a39f2f90140c5d2d80b669cbf0d1ccb466b18ded83a1d5f042c36188a04111c34f"
+        "f769abba9aedda40a87be1e24b700225e2078056",
+        "1ee68c3994adaaa9e0d61bfcd3bc1cdf198d3fbfe28a44e5dd518867ea04b20e795eadac"
+        "c48bfcf8e8216dceeaa069b756e8e99ed87b6b1d31154cc9310bc3b4555162a890b0c6c",
+        "0403efc83ad15d9bf889c9afbd769bdd1dc8925b0462c93868d85ca7554b540d8c3ef7b9"
+        "a63becc85981972eee8a70b7f948098ac050ad594ef2ec249cc3b557844bae9cb2cacbf3"
+        "97042a012b3a1d9e46cece4fc3460a2bedc9af4ce0289e95f69550eb3544f7c105b5769f"
+        "a52234ac88f9045ea5cdd4937664846d26deecf511ba6996ce4072e763e8ebdfe7096608"
+        "88",
+        "031df03a6cec2346b92d9ae7d3d983edf577d9a1bb88098f886f38536d8d8cf25def5772"
+        "6790604e674d036cbcb864bdedf8475ba9c850d510ef93b844c037e04348d5f48098c20",
+        "112dcafb63bb125d9610e59883df481bfde43589e46656b5952cdd72238cfbcfee79e916"
+        "5e3c9b89c9ffed12d303225ba2af19e00048e20e4edd3968807e4885003d148403321ef",
+        "2ded1456df54a24214d8c1d3fb314db52b046ca31458bed69bb3aeb6a9ece509ee521fb8"
+        "046ed43accc7e605440a09fd96db659c98a7dd606758c0c47e47acfa326b9ed73ba4b28" },
+    { NID_sect571r1, NID_sha256,
+        "1cabd16fc29d7d919622810dc8b23c770b790b98b119eeab1b20900fa94fc2ebaf76be4f"
+        "5eea91fc5276c5621c8677d4d117c4a5a782ee2ca1d5b0db997fdc8a05b6b3fbb833d7a7"
+        "b81c3c615c2a662929760a96feefcf89e46b563314c9b77c86bf34438458b43b694ceba7"
+        "41b97dfcdacc0ed57652ae62856ce10ed2690770",
+        "3a6fbf66ebc1365ea7699c72cdac2dd85907ec59cd26e2d18713354b619ccb83b7fc0db9"
+        "193aa8493c1855f1a83fd987cbbb65de17c59fbe79256aa5392f4eba045346e9ba26592",
+        "040559dd556241f9b11d0f91c5458ef6adb783f9f5051bc12cac9f0b214f836f7b149d00"
+        "ba8218e873410a50445da9fbf68673f3282d783988981fb221d0579341892ba6824e0cf4"
+        "a5005dd0e594ce41122882538e51e9bf29d159fcbb8b29b97c5546582390ad5c59c97527"
+        "1c58ba1e75d70c3898fea929ef7316ee830eeefbdc69bd80d7b0e8133b977cd573a3b422"
+        "ee",
+        "1c5a193179ab859ec1166575007c3cacb30d31f341a0e82ed6d4ddb32da909dce08acfa1"
+        "0fb14183258caa743010fac6f7d0fb1f8c8f55c246e49a97f2bf571129144c23de8d68c",
+        "2625d0bdf37396585d22811a12ae7e0c3f512ffdd0bf4d048379434af46c03c6067dbe7c"
+        "271c417ac5307123bf58a9f2064bd2b3a2d4b4efa3027959bfe63e13a851f46a21da6e6",
+        "13f16b211b314a7e9918f3254da2f1aceb5340713985610f03ec1d0a33ecf9217d61076e"
+        "b153d8f27aa31aed3c9b165be52f8d857de362b2c88db5dccfd708a996a46b76b4ebd09" },
+    { NID_sect571r1, NID_sha256,
+        "7bc8bbf5ebeacf40b3c82eb6eba5d994dcc6a3f2e12ef741f90f90e176d20c21e006ecda"
+        "f14cb5beef35bff46b2c374d9ee224516679b1a9e9255cd8ad8e60ed234f8ee7e0fc53c9"
+        "021488158217d4b4369cc597d6053746efa1e73340bdd73c1bd2eed57b92426fd4d278d6"
+        "a86e8be0f0a66ab3dfadefca8831b2f488636251",
+        "145748871a0b5c1cee628de04a12fd68ff2b154fda96e47afaa96389d66d22802968584f"
+        "6753d36618d49ed205260f09d3f5ccc2b27a34390ce58179b9834ff92a86d66ea0a97ca",
+        "0406cc7ce2782dd67cf1fc16f1b24ae46fd085b969d936fefc409a9bde354cfd33a154a3"
+        "113e837cfb88284d75a96f5fbe85274fdd0990af4a033a6c40b904a5e0f666e4d8b8bc35"
+        "3207adfea166087502657bf9e2c437beb2f62dab041553a06411f6c9dae83a2a2749a4e5"
+        "a2a36fbe23d40816b1b8d206b9f5cea20ef200b9150061ca22fee2076e31c88d60a006ef"
+        "4c",
+        "26c820dc92f97dbf545f51db7d5ba649333dde38eaa47d8a7edad9a3cf3e6780442db234"
+        "632458ff17e1d7b70019916708c128601ff547ac84dfb0173cf0a3c5d69ac96c3d7d395",
+        "338c88d1bbd0b93f3f1fe1ccfcbda65fa1667ec471730a40eda87f57b3eb63d979d8d6d8"
+        "19b974619799c90b09f33c051b8b522c3a1acede101857265ce1b58cc7eb5698049f494",
+        "3637bf89f9b66c7ebd8f91a8324eb70a510284b39f0f2e45578f26f5f1e4504ad70a3894"
+        "27f4d58960cbd918c2f8279de52096e25a1b0b0c3929fd5ef56bab6cde7c0d8e9d2fb30" },
+    { NID_sect571r1, NID_sha256,
+        "0cd2a45392871c0c262e7e6f036946354bb41f9c2187b8c4d399231280682f3e0a09731f"
+        "bfd52c76ee63b9828c2d731f4cefee0a8c46419c398205b2ff80c67d7756db300a0a8385"
+        "fa287dd37d9126f75998ae1cbab5136560592118db52fbf102b7ff0a1ed45b8a91a7d99d"
+        "13a0f7fd4366392264aa1248d7324901467457ca",
+        "3c71911d24ad19c20fc1d8a044d63c9bb417abc3778d7e6234c6af79b898cbfc2f278724"
+        "4708d2fe203be786edbdc4c9b12b413156b7b0bab0be8af895d191d853cd58aafe1ccce",
+        "0406cc47aa586a73acddbc91398ff5782457e6da2b10e265153c678789d3d7fcfc485b03"
+        "b089eb67e6d6955d5c8c7ed5f933d84853576e76fc60332e5f0a62c3ab23690317bf1b42"
+        "3e015604d94ab9f2ae1d74fe46b1a070160513709de2ba8e74fbf9922e9bbe7f6e743b25"
+        "701a13f73eae0db0c98dc80c5f8528e16610fcf18f60eda3357ad5878add2554a6befc9d"
+        "39",
+        "3681fcc5fc1f0d7d413abf2e44cb5cce9a4a252ec449ec4f550df4a172305eecc072454e"
+        "fe2040aabaf4fee58ed19c9090061d3c4835c5fec38996f013e5512c0147cb14a4f0fe7",
+        "0d3c26796bb86b1a20ed4935bc3824bcb9742513ce91a66dd523a3c0d8a5abe63488aabb"
+        "806b5b113e90d3f3c80e3ffa01ad051e6b0d4edfc641689953ed65fafbaf3e554be31ff",
+        "2e3129ff95b06c274f7ac08882dc1da6660269f3dbd21a3e48377a628f6d81326084bbb8"
+        "d32b794fcbde8e574f853636fbbaba480fb36960b0994210bea319a99a46e29b79217b3" },
+    { NID_sect571r1, NID_sha256,
+        "e97092625b09c9ae6e152e1cbee207d83361f34cb9b0e727c816a5ed851f12f91fbf88ad"
+        "9d4c8f9d07350f5d828fd8574eafc768bc72a2b18aaf4d2b48fb10f7c3431137b5185015"
+        "4de9706487d69a40a8f4cb2c799f48c5d8f518aff752500de93cbb94ab04ae1e0c7183a3"
+        "2d79a27291dd07b5fb6e6a4fab76e85c3a8607e2",
+        "18bd74698bac36ef11add6b3e3fad227ecd868f370ec04569462565d2f0af2340bf79348"
+        "6953a7b79ab04f0ab1f0e4fd16bf6b576cce677d543e73aa8edb0e50372f24ddfbff966",
+        "040231f891e63bc1c43377faa56c5799eb1c877954ca2cafdeb4883ae40bd78816ca5634"
+        "f48f5ef5c22dc7d3d0df208bab4149815274d7b134cadb700d166a5e3fc73e9be1bab725"
+        "220469ea29ef860adf24afdd386347763008ef6fe2488d902c4d513bc0183fc52742782a"
+        "6fe500d6b581902ccd4f9bf077f975bd5fa89bf240723b99f726c9fab4f953380745ff9e"
+        "17",
+        "1590570de563ea96eddd900e4a0a7efa2e4a0b389854e96af32bb7555f098a8cb52d160a"
+        "bcfbde65998c34f91338a40d40cc03e4a9a241d3b16b0e893d3f7ffdbf8912f35c7f538",
+        "32402fbee4831b16d762ea2cb218279f4db5e20bc8b6e2e53e89a2ef3646cfb0abbac361"
+        "16c8c708a1342db2fa0abd39d149e09db57aef65ad8092f37f7962f98c28331f0f20b64",
+        "2d1e38f40965e2697abc7df5896cf051ce5646f135d1ea0bb470a43250af8df0abf2a04c"
+        "a1e0f1f31013025b4136a8a6bdaa474bf50752c571f883829bc3a5482ec20e2b4a72c90" },
+    { NID_sect571r1, NID_sha256,
+        "ae6723b8df5d6ab5fcfaa22d32fdf106d211514cb1892c7c43ca6cd85c2532f85929c8a2"
+        "59ed251215063cf92e1502528d1e22d5cf67efa0b8ef21e8eb2f5dff881ba1433e8bcf2b"
+        "6af8742ecb2bccde081e534615a305562cc22d3398f61f277d8ca785842bda85d8a40438"
+        "d9bf1aceaedcfc22c85533794a69cfc320931d3f",
+        "335699bfd058ee2e6163f55d1816bf3669acea8b73be9c4ddfe775230925e6093cff7a66"
+        "813adf22222c8376faa106d85ac9f3c67929bc58d8986795b6d35d5b9fa546dceabbedc",
+        "0407995e02dd3d40f9bc2e6f4cb1c0d29923c9022169e64532d1b357f36264d18059c44a"
+        "8617a6f1136e72648c9051a27714a0dc833428762275a1b5635a3ad91e65d2713236c20f"
+        "5006167d5839cd4476a638c50db218979a93da44dbf97281d90daa8b9b530960c689279f"
+        "ff6c342af97880db1e9c5ae57b91d7be727fd1c6210ec59416d1b675f4dd666e0b121d14"
+        "4b",
+        "3f037ebe0e4c3910953e123becc09c0862490e7f590245c4cdf9ea5fce930a7d7ca5d17f"
+        "5689edae1ce706b90efdf84cd82e06e4ab95e9e2368db91d50110eb91cf44e50cdce2cc",
+        "2baaf025290897a5d68c5e63543256523fb086a6f1166ddfd3d50fb307e0f0cf78b5fa89"
+        "5f8b71944a7b67b8afe5f3e10f2d248aedf573860c42cd7aff258055ee7cce472e8efb1",
+        "0f4d239f5af023ff6c94ad7f66d43201c7e40262cd92467c4ab54be8d2b8e6577d143750"
+        "64fbd00a6327da62f03f75262392add0ec119d820205065aa6238433fadc8d1734b8481" },
+    { NID_sect571r1, NID_sha256,
+        "ee20c6b61886e02ed94359dff3559522ff550ca126fed4b2240ea7d999a182b7bb618c50"
+        "528fcbd261d5e497a991fbac0cf4c105c0f664d6a00a9001c1ed522962fb44dd4159677c"
+        "e8f1531019f86457c055c9cea6247086cdfe0442485cbbc4386ad002b4bd39a1a1877524"
+        "37f04569705cb7adc0c68f0fd059d946deb63f0b",
+        "2c3eaf801330b3f1b0504f2399f1d24455db29911f750c246ba0a134c3b59da8b3562911"
+        "197764699a92ea1d95a2aac587e24f743df1dad3e1cf7edf955203e24a0225717f8d2df",
+        "040703d69e2dfb13fb6e695b0b30b31d89c8789e8523a7eea15673aeb4f1909192c06c27"
+        "558eb55f0315f395b1f3ce84d9c304905cfda1d119bec33af9ade4420de2edbe75cc5460"
+        "e3075e35b2d6a8550969d49ac5d656afacf68d3a1dc6d17666f46ce3413c855b627f0891"
+        "912e373af2ba91211c20f067d66056e6bbc0814ff3921d944008b25d8772cc8d696bfe1d"
+        "09",
+        "0a9ebaea478893aa0e3bbfd5d007bcec5ad787d9bb5a8e9b8b79865c584966f0bf040d36"
+        "f62a8e97c123d2adb7f38eb49a86e9c2ce1294d04fef1b6fec7908c4ca1a70bd1699a9e",
+        "2d495eb5f6fb187a0ee1fa772ccefbb969e854abb445ec19ac3860f40ee65f53b92f6a79"
+        "7003574bccf0b9de8014ad4e5745ed264eb3ae88040ef6518809b4c66f691d496a85d51",
+        "1840b2977ff137f2a8f2f7c25e347cf1262fd128e008e30e4752315deb5231098c65e9a5"
+        "85496a9d6b5b56cd0b6d7dcb7150a077fd199be2d2de0262aa84dad414e100ac6162346" },
+    { NID_sect571r1, NID_sha256,
+        "734a9eb8288e32f5a67cc1d88704523ca2c68b798d90e188d871d9f50d2da2063baf1ee6"
+        "685c45832a1818aabc9afc0bc935e97969dc983a484f16d2bedb3c7c0b8221408be2480a"
+        "5562d5d1e5d8763d1e474bf2826aa93a68c3b870e3bf34f4941cf590d88e1f5a8cd782a3"
+        "3992213f3f6b4b4f6dbfb3c3c8f21f5eaf4ef609",
+        "1c3ff067497e5d387f31f0ecc9c67b3c0dd6ec8c81318c492aad83c9dec6c99e4fa47447"
+        "f6f7082d636c2591d0df940b947d0a4ae3778e2b7cc8fb92214638399def894ada276b8",
+        "0402e56655e37b3e753f35eedca95f8ec07b7a3d3e14e365ec041cd9003bdb78a7a8b8ad"
+        "277a67da5d63dcdeb0ee8d8efb68fe61aad9b1fbef4373ab13c44efacf68cc499faf5b5d"
+        "be047bbec643d74874b77f0fdbbd2df3f3ff0d35f4b3e1534b2c4d5c76b8cc51693a70e1"
+        "7d1d4cd64713c5c05966c826458fb5411ac840ab5998bf3cd64a0769c3e075259a70aaf9"
+        "4d",
+        "149848f4534eeeb45fc38ddeace59e8f83f0bfb4cfcd2b8b7acd0bf19303051a6a8fe75d"
+        "4cdec1be036645beb075c772aef4a58785c16d984eb43b9b0317446bc3b3abfe7ec2cb7",
+        "17eb68556224f995733077501ed295088cc1184fa3872f5f11e97cf67c7bc1febebd3120"
+        "6a406c4479b60246a517cada5859d4f1aeb98dfc108e96e9898c6e71e59e39b6284895e",
+        "22904497dc7a98fbe117e4427d74f4ecfc4e14d4467c99227427e3abb8d3dcc406f3704a"
+        "7783d822ec1118a1d91d5945d5b902a2ad325bcc9c17c68ddf8b5323df9c2bde392710d" },
+    { NID_sect571r1, NID_sha256,
+        "68e27cc72fec8f3f1f3882c6efa08efdf21d74d13be5171da35ef2855666ad2ea6919d21"
+        "dbc1cb6d296663dcbceeba2fe47a2c6507d3d4a67a61b55b0f81c93412d7e1fbe15a590e"
+        "342a05f55daa55f8591171303154e615e81189a523b855829a5c96621ad118f522e397e2"
+        "eea05c2603eeae6e3591215e29b2289bc384d8d4",
+        "04b4e04281b210fe78d516a5b69f878b7fa058941ee9ae8cc63b061d1eb9e12c3e0ecb87"
+        "17ff4623ff5bbbcdb53c48adbd9c69636506ab929c5507d7ebafae5654aad65a263e48d",
+        "040538049d071158c62f0102fb664a47431afe320474a173463819d5f83f6737b43880ed"
+        "378470d774d32ad59cd9d75e5bb06b118f1297af3f6fa910f40aaffe11e46cd56cbd29aa"
+        "5100a4a843af9841e2427357bdf26817656637bf4650e443ef303dd458ed092dca3cacf2"
+        "857d10aa190c256467ff834bc804f8557f6c3bdde89927a5f2bd55bb9d9f1f08a044cbc2"
+        "08",
+        "1191110485f56335f0e65fe04b9ad8fac1c3573cb4690db3e9f62086312d394b0e354890"
+        "c0f74e3df7c43e718ecf18caf6904e03bd6c0912f906de1d2bb4c49823bc6c0dbfe37f4",
+        "0dff371ac365cb7de248ddb2b2fdee624c527c6c1908dd287a294bb43a4be94c130bfa83"
+        "710b0655f21695dd91703acca64fe2e7927eaf9c2b9b230de8002798224f9505379bf34",
+        "2f30f31c863bdd68fae16f97fba756e033eada18cb0a23d7d4b2c9ea3c832e61b52185fc"
+        "d654d9eb281b92a9b102c3b17ebf02422a0e4a7a56a73974208371ef65434c38f4d7d1d" },
+    { NID_sect571r1, NID_sha384,
+        "e67cecedf35058b80787589514a9c81c6b9f4bced4260411d2af75bc46b8b2c962dc9d26"
+        "0dc99ebbf8ee64950766efc0e394184bdc8e2891d66bd3300ecc880e9d6a3d0eb6153223"
+        "78afc3dba89938704e9a8d0c949d4bae9838805c00377e3fe5ec6a1a98ad7eaaba6b5009"
+        "73dac48b26b7fb2e1b9889f8c387de535d4b2363",
+        "30f2849a713aeac95fde5ce3af853e9d070ee60709eccf35a076567be2c43f0fa34420b0"
+        "fc097ff577221275a3a56e759efc32183be2d76058a7d20e5dd59f00415114d73a15b8f",
+        "0406d4ed3cf180e0e307745faa49247f269c3fa0a69042b3b78ad645f43eaa50d479622e"
+        "27429a6b6b1889944f85975fec8018d3321ed38f6c7d91f2efc98467a027ba4a02c7f231"
+        "b405f2ebf6abf7d53fa32865a9b6ada9bee51c1fe26cad74dd6ef78f13872f340d641700"
+        "31becb5073001fbca373be4e32ac3425d705ee942e6c4e639bf72379e34776680a387a0c"
+        "6d",
+        "0da9d8647d0950f558a3831b47858168b3379656e603f2bd44046ac7546892d1a7318c5a"
+        "9873c6ff85683edd3881a0f1af5501d17939f0825ed37bfc9a2d95faf43d3be92b237ef",
+        "0fc7eaeef74806606fe51882c6928a06bf552d18dcc4d326d44a540abb728146657048b2"
+        "0e5fe2868beb5f04f32d43e9ac23a7f22c6bf325bca24f5e3161c868911ee61baa8a3c6",
+        "33d63693268f3762635373fc901fd72e525965ac17e2cc009177f03bd3524107b30e4c6d"
+        "80bbc4f87fb1f288ed56812994541fe063f1d91afa7213bed8be5693dc6c17ec9a0714f" },
+    { NID_sect571r1, NID_sha384,
+        "2baa1ac3f07e34b67b6af087400f261e138b070c8475378063286c16fa73578303380236"
+        "a4af2484ea01ba56c1c619f6ae4e5e6ac2594c8e5aae7e7f196f96fc5d0f507bebedd4d8"
+        "18e77b9120e5b4bc01c7ab6339e88b71d0886631cc7fd89659bf513faf149c61eb14d550"
+        "60c8dfc7e6e4c2b4ec8edaaa6bc36eca50a6feef",
+        "2ebb73d04e6e5361e20629e3ad119b33db5163ed91fd9a8aec4b774898784b6822a08992"
+        "118a8fe6013094bad0be1e9bf01b27c069e4335bff7e0abd28a10443818f6b825e9cef1",
+        "04001710eb0167e8c948d381e3a75aa1e036b70c414f69260aab434ee20b6724dd7393fc"
+        "487b5b3822e5e8065b06d0785a4a7be7193352d5b9eee66755ba106ba6e40f98a08c730a"
+        "0c06006f98fc25a641a7c6e67fedd37aaad77a9102be3e1e7d32dcb4c68029e623a42f4c"
+        "a7d1ea725bfd475756b80e18904107c460fc03b9bd68aa46f9dfbd60618670c4d9a68a32"
+        "87",
+        "1861e2a356a6fa8096418cde7fa17f1b893a7b63810f3fd807a82bf4c745aafdc4963eb7"
+        "a0ad0488a776e915b64d2b684e46d244703eb63b77835167908f2d6b06a2ed7b53f0717",
+        "046688e12d26cd96bb05d3f418d8ec34f4426f594acd2bfd8e9abd79405e612d60737007"
+        "440424bc4f546c54b7402d11880f68edd996f49277b729450f7dda5d05986b014b5244f",
+        "341a80e74f3a69b966ef81ae95dbdd60ed5a0446416653c4df431ff7c4b4272665a52337"
+        "9d76725e9fbe196018f0e747100084c823b95d7c7b1785d3623e52e9adbe773b81b49d3" },
+    { NID_sect571r1, NID_sha384,
+        "0e640581f573068d8ebd2899a6aaeed0bf987ee11e22b05d25e88e9a1c3451f45ee3800d"
+        "976f4603c18a041febef07a01086832a6f7ecd5d498d52e796a9d90758c87c36f4a5b704"
+        "a39c456aaee2d5278183d5815d619c193da9fbc427d701bab0874bded848cb4bb066f56e"
+        "119b637c78aeb6eaa387c41bec6cdd4bf7b2061a",
+        "1bfab717d6f6e16d9bc6e89d2ffac7cbe0f808cc8ca2eb515af7ecce5f3b230303775710"
+        "a21bd25c2cc4566bb53c78c78e3774a9f306c751cc6e149929e45eef60f56c1d2388c6d",
+        "0406935c3e8b58f7bacd045e745054c227687800ddd86d6e0c8b1e426f4df0e4b71feede"
+        "fa9172c43becebbeee8ee382a75396fc5f29ef3d2cc55f8afa9232038609b5034513b222"
+        "cf0138463efe3b32259dd90b759062f848deda84f2bcc0d687c410f1ad2dd745517c96c3"
+        "451432b1e490902208cabb68bb872ec493eabdf1f3b07595d23a54c53e512777abffb7fc"
+        "65",
+        "00025bd48e2dbbf1ed8bd9c1514303dc503dd0799c7815870b902249cd1d7368380853d3"
+        "6f7fdefad973700ded1e0d66950181b0aeac73eb622c880571315f09504ed26e28e85a1",
+        "1b9d6ccb19b208022d3a579a66957429682517e84a71be42fd571fbbd0247609d0b5b338"
+        "08189efb52d21e6421d3b08821d82900577791b1c54e239b0d908bfbcdc060cfedaefb2",
+        "3356320389ffde577496c5b46a0de6d53005f5ae3489c0d292c5f460a3b7adc5bd204bc5"
+        "0a3bcc8538e0f8319c79b9024b065223b7ed9b0f211c5c224d363f5bdfe04db97f99e19" },
+    { NID_sect571r1, NID_sha384,
+        "51a2a560ba226d629127ce1ea7e812219ceaddd23561256331458c9f11fe73990f21d0dc"
+        "d974a3773040090cfdc8e0f01692d951a0cbb60f8448a016c67abf46a9c150466ac77e65"
+        "6ea827b0ea7d1e77ea32071ba8314fc8a2edf69008f498bd1c18061d7d00f3340a7e2cd7"
+        "3e9766862378d8702e804a1870b442beb2d0aa14",
+        "00cc53bf7f1cad5e3dede4b4f4b082831604c92dd2b147869cdf1107259305b1d5035964"
+        "7f9f3d7d4e1e608865c65dc7c9ea46bc324dcb8423b554dc369d621743cbfb592b70eb5",
+        "04020187d7de90652caf1210703ef65cada3b88f978e14ce6055847be7127602ba7a5391"
+        "cef0fc9b009134105da7b09b49beb7ba2f961b84e6d66bd818ea99ec106c6e8428b17394"
+        "a60197aef36e47b571ccc0b41f948392d6061060063137d8c3b999ae507b76132fea1563"
+        "775be555616cb5816b9b19e42b34f9673aab833f4beb9d1a0848a4bbf2f6f44cd0398274"
+        "8c",
+        "08acd0f8f9660d21d62f391112908be73a4342767328d3375a8806dffd2598b6d77fcb47"
+        "93e69f2390389a78c2b11866cf0f03666a60ad088d2c77bbc49fff6efc5b7283d02bf36",
+        "1004bfb78dc0e4fc0f2624bec6893d717a476fc76bb5c1d94c1dbf157aab5d1dc80f98a3"
+        "aeabaac94d9cf9e26e1dd172f5d8fcd5b2d48cb3b7f0a4863813357b5cf8eae84478e44",
+        "30b1c8857977181d12c53cc2efc53a427801cde2890cf2ea2c99c6958b6869d0ac78ee2c"
+        "846c241362c885835af49c47d20c30f3cbfab27d9cfeaa6d858694bab059229e30bf845" },
+    { NID_sect571r1, NID_sha384,
+        "90eeecff0a2e37df318c441df220dfea013ef29774ee92a56b213e13a798858f31e52b6c"
+        "cb7599e7314f12b48a89884b113c1ba0526a54f3e9a33c940944319e084bff320cf5f391"
+        "c02c731c4c4f8b05afa273374a1705d6c85337782ba7d36b9c00767180cad6422c11c581"
+        "672ff631fa4c49d41b02481568ec87ea97220400",
+        "2b009530cb9d586e35dd8951ccb686833afb7a37ec253e547e85b253ba999f0f186b6d4b"
+        "a41091615fe57678e9801b4dc94fa683511da25637b2acc9fe60936be15af16234c4ee7",
+        "0405913ab6a2287d946b5b6d1e6c3d64117e085da7cf6388e333cf58d22494f4b067c684"
+        "dca770ddbcea5db73f048b296e9c17284a8912b3cb722d9eaa17b6b1209311fb8e8757cb"
+        "f50007124ac6c48ac56746563db247bcfe6b20215ccc5cfb1d43c923daa07d429c8f0513"
+        "bd1ff1180ef0f7927fa23fda1af25d20b22c935c426f9ccb402c358b57b812516c431117"
+        "79",
+        "27a80a19e9c320b57146845fcf97d6debcffbcae877c33c62aec62a3351ef40bd90ef4c2"
+        "ca39f9e51086931d82eec4ee7870365cb14e9c54ae735069801ef12c571bf1c7c1cf6e6",
+        "1de22c8984c593a0948164e6cc8631489133972482f6a7fb1c3c13f97e4584604930d369"
+        "224850a1d24f267f41bc6fca04ad79326aef61f0d429e0e1b9e9d9686ee10f2bc52b104",
+        "085c6b34687081e280a180cd0c4ffe95cebbb0ad6d3b20a7341e467812f88c23973701cb"
+        "f3cd2bcd2811415d0bf0cd9df229a88754f4cb0c225a2d11f57369a29edfd7b04639055" },
+    { NID_sect571r1, NID_sha384,
+        "d3740cad41e2e365d80ae81da97fdf06d8b6c278b505e34cb683fb55ddc5189da5435409"
+        "14c0accd405dbf0063f6222885fda4b316dad4a83fd03e8d7b7e936f87fc0a5b095defc8"
+        "a4b22fa97f00b394e672d5efd3e0a230c7e44dfeebda88641143502a400ed62e2a51f956"
+        "1e5d652a43d616f16699e875deb9610c77de8e1c",
+        "2cc2d0d7189cc8fb3565a039aee7633ddc00ff427cafad32fd2010b10fe249c9724d9178"
+        "5e7080203626038109158e3a61a3970aa3e51688aa7f5184b22f63af63f80d3540ec023",
+        "0405fe95a030efac2e5d9522680da58606e3e7544a317a3f24d726b69238367d30fa5868"
+        "64d8c143c3695126ce8dffbc7e7fb789f956dbf53aabbc38af988ce50f1fb30294ea3e2d"
+        "480193d1e745d82781ae5c3b3d2233e502959d6862fa7987c6416584504f65639ca76557"
+        "8378b75d3844df179cefdeccff3c4c43aeb8865063e176fd43a27c93e329f8d4f6fd5bad"
+        "21",
+        "02df3920fe4d328315353ff11b0264045248b32f48e860dc59d931ad65f39e97e3a683c7"
+        "b5c64b21c3fa50a9685fa11f49df9b14ddaae03eb02754b01e03f60fc6aef1e5d6d7d3c",
+        "1b91c4217b1580cfab56812c16bb5aefc1534ee8d049aa2e1d52a5bfc11519ff89f0d36e"
+        "a2bfdfce8b5d3cf1527dcf700c0208a70595e9ebe4feafd0eb597e05df54212fd6eca3e",
+        "21ce52440267fb16e713eabb8bf2d502c81939799f9d09cf48a50dce5da999f3b457dcd7"
+        "3c212d5d070056b1f373b07ad06e90d96febb7f8cdb4c423ef946f0799c038a3ee68ff4" },
+    { NID_sect571r1, NID_sha384,
+        "5eb53b5f92121396c5ff30e0c92da48db4fbbdbf27297f9bc82614ab78f7fd863e34096c"
+        "615a02e349d8bc7ae4b0700130704bedf32756b5ee6af10da1cd717d624fadc57a9aa6db"
+        "4a6c5d6254c0e8f8c3c0d4d03c264eeeafd52cac2c1968d9d85b106167a49d0ccdbefb20"
+        "bdc10a2555f8149203af52853169a02db94e5e2a",
+        "3d8936c00c131e38c6566d2464c4e207c878070bbf681695a6cd98cab2c6e80fe98cda80"
+        "c66a5cf584e90a071144dda59c07b8fc7bb42464dbee5b6f739b0f2ee5fdff7e5a4e7cf",
+        "0400fc3a8a320e816305772bd5116cec2795d58633a9f490be8a1a360f21d2aebed6038c"
+        "a4a5081288b6bdb1066307c26897ce38c24f8ccc98a63e371ff6b54f6016917b430c267a"
+        "f7069719c868d8fd25a38a7338811904e3330a7b2289a8384bf24f6dad5312160f0093bf"
+        "556fa061ca5e52d6676a8f1a3e4656740c82d3cddf0ac4f903ea885d42610bf1b45d9e57"
+        "a1",
+        "050da632cd7aa58340adeb20389a2cb9897b8ec944c47e7177da65d9386a9dec5d63be7b"
+        "b2d0f5b4943932e1fd7d87d5d7a80bc50a63dfd101a6a28005c894c6a6fa4c652dc519c",
+        "0e6152b9050127bf306662f6beee81d024492b91efe87a56e70596a4a72cd02dd2f10b97"
+        "0c9a69909f85bf4783dcd3c32505d7c148166ab43b503ab098b6d95ef09a7932359f60e",
+        "1f7d68d53ba161b61eeb17139eeae1587a6bd148e288c1f73a6bfb3a0d1f6dd8f9cdc27f"
+        "a9e8c7a681410500c097ad01f320303421f1239b4a9c4d5446562b5b3cb2fc45a6fe239" },
+    { NID_sect571r1, NID_sha384,
+        "5aced64f702a57ed7fabd045a40c967a485d2a70b0a5e82561d5141ef329469b2da5964a"
+        "34df203a980111a77adca376c643b9030aa74516f054648c1534d912ea66582adf3c655d"
+        "bd71ca55e47412315df5e2893e43b2e2dfe6e4dedf426f11846ebef34a99f5615460ce04"
+        "75f7bc54b4a4fd99e83c982097c3136ac6188a5c",
+        "3dc7de970bce28a943d7599f2a9010fc99435b93bc4ba884d42503ac2941aa63fd07db34"
+        "bcbb1127d56d6a4e277d6ca32051ea3467e376f74f98c3999d2f276b282ef8a28cf0cbc",
+        "0402066a50b9f961a58620f473fcf7d5eb635da47f4ce362f428669ea578d50d1c1513c1"
+        "45adcc03ba98f3d67bb422141c73e2f94ef9559ccfdc0be20eb206d3d114a5db302bd075"
+        "1f04437e655bd255e7f013d197210bed70c5c1a6cc1daccb96145c9c438c8a44b4074629"
+        "830d8df9914166c9378b33040d71918cdd0f47fa64b7c69f43eee0f34414b8f64882f90a"
+        "c3",
+        "3b2e20f4e258b7f0cf69a460fece9b4794a12a37c0f8e7aa6f4f51dbfaf508f6f1e0160a"
+        "b4388891efb09f0ca1f73178f0e8598750c9debd3ff856cb3a2872762ef9e16487a9513",
+        "2f265aa99ff806ffeacbf9ef7be575ce5300d3cfd4225b1835774ee075d7e530c9fdcd68"
+        "1584223f84a497119b4eb1fe34cd31d654c2fa262d7549acc251cece9530b26cfa3ab35",
+        "2c05ce4b35544bd1f20a68eae7f3483e0a0628dbb53f0466166257f69a7a110d2838a76d"
+        "204e7a955a8977508e65f2ef6d7deee13e4e2ec0f2b9a8b4bedc26b3502813b0334a1b0" },
+    { NID_sect571r1, NID_sha384,
+        "43c24aea343d4e088bea25be69a332c631275c36677093e057de69cc83a4c5e70ab270e5"
+        "a8930f55846f1a22ec10e03007dcf0942c6761e89c65c6a4f032eed97dc3a2c7f7ed1e82"
+        "552fe48828a132ba16c41f6bd82a49335428a24fa1679522000e6a1d12c646e0e4b4c584"
+        "398577ea9493bb334fa3cee8bfdb6c2e66f46436",
+        "2de6ee12eefa7a4a736484b19b42a513dfc059a060976edc3b0aa4b50e98d72df6506fed"
+        "0499ff8480986748e938289e54a5e86c0c29733a9bcf5985aa63d8a2b57933a04a8e8e0",
+        "040073fa1b62d469f2991d54f1472b60da87ba51be0a9dea361d417b91a4a75373695e9f"
+        "27b3c672322315d7b566b1f22b96c54adce3e958080fa8a02836955f6264dad3a87fd11f"
+        "060452c0a07ff65fff741c96851657a5afc7eeca239622e1260414ed736a04e487157c52"
+        "da98a7845bcf6f311e0f2e59bb92248b6d47dcb93da6f7e0af644b7aec7603a01950293d"
+        "8c",
+        "1c87653066057636f9a98a7c69a84e103df480a92739abc4d5ba53891591e3aaaef6ef3e"
+        "f5e89213abbf71af9c84d3b30898580e782f557a03694446492afb05ab801d7dd631c8c",
+        "086d539546c61e82d74319f0180411172acaf08b5296dc6435d4ed7bd50cf23d3a071deb"
+        "3be01f74408e64ad244f069cd41227ba127145df5a357489f944b61606ec75e8377db81",
+        "0a34d9975fbd601614d04aa41506b03fc15189ee8102c0431272d691a322f3e77bcfd19d"
+        "8bddd19b307012b6c6349f5ecf88b5a69e83588b0e18096117f207304b38c16a9a8592b" },
+    { NID_sect571r1, NID_sha384,
+        "e89210565959d93b483659e62cf41f0a0147ea23890c2f1a694c377a826165e363860e4b"
+        "084016cda878a43eb68465f81f397ecd50087a25215ce7c4ededa3552218071fa3acd7ae"
+        "380655fc8fa884998209ffc8a2c26f1ca19dfcfee455dad35a4e72caecd8da47eb9ee21b"
+        "889162f5d3032724abfd1a31e68612e18bfa9006",
+        "05468f0df2c9854f5f655743e79c750fd8812db28b096d97207bae7f5aafc6b6090c9c63"
+        "6ead9e0fde32a1ff8d539b53813733ca812b41b58ff85a941abe4f128d59fdf9847baa4",
+        "0406591750fbc104f82c213fe88aa620e8a960fd6140598e2e6282e0d5c5ecffd09d22ed"
+        "94166109561a7f4f694e171189056d8b300b54c8134485500effc7123aaa23862e897912"
+        "42005bf8ec10a9ac6a92c54e7fb2135e2aa4f84da571d33227bde0aa2e6c153207488223"
+        "5f3103d9a51e80b7a9a19067f35047ddc52462db7c634c291e8fc5eb2154f6913bd0846b"
+        "88",
+        "242308c430de514be1b9084a7e6c96894cd5615a7c71ea22316e539986e9702080ff6cee"
+        "f2980144c55d9749830c20c9ea90b93dfcdd28fd862b6a15748dbb3d982e4a275129c75",
+        "361e1b7a0f981bcc65480b370c5e09b1c2e2a67cf41646f6a3d829f663c0911589223740"
+        "0317601fcee78a04269411d267dad3e8fc6f069529fbdf0bcf9b5f13c9c6de1681e8b0a",
+        "2620c29f86cbf698cca5f79de364ae131345a802c0cccfaefdd7375dcc9ba6ccac91f709"
+        "43eb606506e51e2ced50491eb8f48769810b6dc178d56702838f1c2f0930f2a9e4f1db6" },
+    { NID_sect571r1, NID_sha384,
+        "48629ec97f56273599cd9903f8a84ac2ba74275b40e1e42fa47649568babe05cf63c8417"
+        "d828251acc2eec525b56dc9082b68d51b0c2bbaa7389fbee15d058cf482993b2bedc5a91"
+        "01f1afdc79989a812478245d191550109fc17215679553c508c84e3d4cfdea377088d09e"
+        "b214e6f92410facee4790beeecafe72b2e3ed192",
+        "3d3c6a7ab9450c94aa3b8a1ffb678e5b647af24cbfd66ee3944e6f264f406295b8037674"
+        "71fc67936fdfed1714b4b8761a07eec86543b7c4da6bd2fcb33fa8cda4077737f398e18",
+        "04042d536f1b15a22f4ba80066798d8d1c2704988eeb9423319c1850a1ae6bba4097307b"
+        "515640ed3112e93f1f6ae67c60a4b0d2b6634aa7038a60b52b2b447fd1651857b71711c9"
+        "75079eb18cc7493a1c7f2f9b621969b9ce9ee37fc0701f6cf56f5d5dc6efb13a384517a3"
+        "87f253aae1e93bb0a919b0c22e4d6cbc79b449b268a068b7eb2853324b96715d75b8c26f"
+        "27",
+        "23ce112d60a2f7c29d77d64acd9f587e0eb75ef8e739b8548e154681efc24243594eef5e"
+        "33d845b1e4e89bac56f2e9586e042e0fff38bcf79c73fc9aa5fc908261df5cd2c6cb821",
+        "3a770df8a2bc35e122c1bd551c38400be47f2499ff57618ccd01e14a2e35e87a67b0e40f"
+        "9a10eee7efcc3d37b474f2840fb8c24a9adf93734680ae6b25818369c8608a2f8f338f1",
+        "0728a4eae5f5638a51579e224a24ecd4c997001bb8681e23a7476fbf78b4fab84497000f"
+        "20c1e67e8a4e4116498bcee49ff00026009af31c1037172188aacd264fde8db15c97167" },
+    { NID_sect571r1, NID_sha384,
+        "aa3a9fe467b1ca638dd0622c9ea235a418b39b2e15ad81fee01b6892b240783d8db3c72e"
+        "16c13df8016dac6addbfb85232158325bd7432fca3b8bf5db3abd0b4c5ccd0999609dc42"
+        "199ca4680692a0805cdd68108bcb493a558ab507cec0a2782a9e976928985352edb2abc0"
+        "c07078b59d2fd86fda7fc76cfe573181d934c46c",
+        "01ce010ea8e6e1a0c26ab22eb90f0700dc73b232c429d36371e68e429792afb7223f1032"
+        "7708bcff779ea55fb5f22ad87aa054e84d10f5450f1bc9a89279062ea2173f55ab0f76c",
+        "0404b2b5acef5921e691f10ade81b91ba8e68e73b33a2494cf4ca6617707861f334eb07c"
+        "a96dfd681dd63f78102f8d792d66102117b739d477e431d9a3efd79bfcc18cea156db58a"
+        "0e07e421337d4cb7a98cf9c9c6fdf9fa242904d9906d8a6759ef64a82cbf923b2a57073e"
+        "a0eabd14aa4295bec84d50a1722fecad3e5f064bd3171facdfff45b170e49f185a3c193f"
+        "2a",
+        "326b62065b7c779dc398ee03a8332cfb940b0f24a7d3de4a90323d9e390ad3fb1f0036ab"
+        "f6f525d8d88ab6641302d10db447b78780d366f32ce36ae571e323124b21984c48aea7d",
+        "3d2b207b428829ed5100a92f7276e16978e374c734834b0d627cddf6aff5cab72dafefc6"
+        "c038a91426e35ee0f2c1acc11c55a34a89874100b89588aba7b02e19490e66eb49ef6ed",
+        "3259fef5c2a0779ae408b26e6c7d581fa973156cdb07c329dde0c12b6c498e7a94577719"
+        "865b7fcc0db078ba72a27bf338ec6b8aa41c15963538c329c55dee67833faebe3b643ad" },
+    { NID_sect571r1, NID_sha384,
+        "6c3937014361799f1461f652841b5137eb0dcaf01dd293298d002f27e9a770b9e1a30367"
+        "e35c04603881f0c814cf8ecfbe1619cc49cd516b1d60d27de37ed52a5e1cc300e2face46"
+        "69f308ebe6747255a3d386f16778e494a7cdd10b45171b2bfcdabd91b805bf24857708c1"
+        "b75e368edb2874321324f83a19154d3a1578c767",
+        "1e7410d012aeef02b3723346d24ebafd684c99087ecccaea1cf3735d52c4c81dda41812c"
+        "09f1e874dc964d858ca240a19963d5dc89451f5dd6764426ae41cb23f19cbfdca0fc562",
+        "040400a3bb3ff07a339ff98f7c45fe032cf42c0e25de8dee2934ce42dfb0c9894f4fce27"
+        "fef299b41beb8579270efc7b01c0663c3f72d7bdd9f6ff5186eca9c42d15faaef8784211"
+        "a5006fe998f7a0db06efed050d178865a2b7de6ca7c789cedff7f2158a5e07ac1d335ec0"
+        "dbd213fc9465399028fad8b7f4d2cd16fb8ceae4d3d53abefd2b4037efd7f7245296bfdf"
+        "9d",
+        "2bb0fb9c428e42482d5dbdb35157ad0fa713fe732dac8604c0194e3f9738fac5cf3874bd"
+        "863718712a3da45b7c4612c8685465ecaec0930d9fec32ab25818d2f25fad580009b698",
+        "1062386d3e77043298eb88be46bd4e6f33c83a7358926b30ca06a6b7139815f6e1630f73"
+        "d352a2cb9bc0619d08a89d4bde1636c74b6580543ed743073eec2ae0037bea2b3c9228e",
+        "1ceef759d804ff7de526559636d0bc7930c096c7b959f04f8fec5d7e96129fba14c8341b"
+        "0ed84a64c6cce7cd5b058fab7f44dcf3e714544c9b6f9c1d46ce512870deb51856e9dec" },
+    { NID_sect571r1, NID_sha384,
+        "12fea55ffda15db902aa6a4388b9807c89c193cbf75b5d2a4c95206fa43dedc45974c800"
+        "79933451bdc5b3ea015ed3ca2c54156dc61afb1bc82adefed1491302a48b9d3d2f474ab4"
+        "5343c611677d360515b93fb36da7a1c1b2341c9cce185c881c0beef33d43967134a190c0"
+        "9034ae3261f3295b79aebd3fe123616f73cf2089",
+        "2139839ce38eb879d266065dde5e5ea227244323b330e3ad5a0bc690f3c210f794cf18f0"
+        "d730693887548bfbc434f48ee10ed34cb41d52172b06e448df938170a5e17311cab8e88",
+        "0402ecf46b90616b534ea25cc9993942fd7576a1c4f2f443d3b1f56d4490bf0af669c9eb"
+        "9d110fe2a65609875e1a924bc4b9ed2ed2315047bbaeadaa1029b38a7a87dd8751d4128e"
+        "8002aec3a2f2557c7152a4907af68aa39485274f20927b2da70823440fbd09cbc308d46e"
+        "30bd6b705f615b7074fe5421ca36b4aa53861983eceae9a69649495952e75b0f060b5d26"
+        "e4",
+        "2e3412b61eb23d33ca2910dc25dd14c04d2c8b403d8077a72b9511d71ee9da6d7e1db093"
+        "b92287f8fb00aea0576f6712c56d80cc4e3554e0faa9c7d911e3d17682de831bf649bd9",
+        "06a3075efec81a86175cd1dc2bfe82e83aff1db640184a6a3ed7a0dcdef51aa0be0005c5"
+        "4ac05f9b65af265af7f2ec3d1d7c137184b0d695d701ff1aed194faf2efa98ce6c5e502",
+        "237d7ff92480fa7d6d1f5a0564a2608afe5e95ce2c29dd88853d1ad9d4d2beb8d1f0423e"
+        "db883faadd592394f52048bf2dc26d2dc19279477ed86621c7a5960ee3c3e2d345fda29" },
+    { NID_sect571r1, NID_sha384,
+        "c8395546842ddb545d8ea3db4efe970453dcb06025ac3b7a25aa5ef62070f3021b9a1fea"
+        "91ff7055b6c398073e7886a6f71afe53c82c47b71377dfe291972503bbeb25bd477bf0e7"
+        "adc8a5d3f8b34ccd0080d61e121214e1b29802b711cdd8a6bb2275a2395c467ec2c15719"
+        "52992e448d736d8bd70ee629c75b5e32b8323a00",
+        "274f70fe69e4dbb55c5d404e39f5196335047113087f8711f2f67f2be4964e4fbcb86568"
+        "0758df1c401cd677b0971654b7a6aeb7bee0d6d80ac0de14d4f46f356b2d5545c185aa6",
+        "0402b2321e0a1df083919628dd8b4c318b9ded8a3e660ce5585b21e46843228b4d32da76"
+        "5a3776c181654aad0ce90724bf85b01b051d236342b48d41a1dbda1e9904d659c98a039a"
+        "97020227182fcf099d46d9882c0b0f26b0595a2a3166248898df2f3fd27c78e7c0b8b59e"
+        "f0ed6745660c0dea1acb567f9d943928864dd1e94f8eb6b5b8473c0c91485643189cf679"
+        "d2",
+        "2f234066c936625fca10dd080cbbb1228c4d2054cbdeafc8a0a248c0d22807fc92c661b4"
+        "f69586ecf9469bc4c22895cc73ecf492fb2165a12b027194d409677e7185de24f6870a3",
+        "3a48daa8e379b3b2f377049a4d462530c9ea67019752f4af4b4192b02d6e028386dcb9ef"
+        "95c8019e90e09dfc8dff5e6f6812df491906ced39befedf16caef614d8c174e7ea95fc1",
+        "33f18738cb26d88c8c048c58a210c7be70c71636dc62c022df1bd7747d8c67bfcf5ff2fb"
+        "3990ed35becf6c77755ac62aed480df55efea578671bd8d50536a10e2c0192bd42d78e2" },
+    { NID_sect571r1, NID_sha512,
+        "10d2e00ae57176c79cdfc746c0c887abe799ee445b151b008e3d9f81eb69be40298ddf37"
+        "b5c45a9b6e5ff83785d8c140cf11e6a4c3879a2845796872363da24b10f1f8d9cc48f8af"
+        "20681dceb60dd62095d6d3b1779a4a805de3d74e38983b24c0748618e2f92ef7cac257ff"
+        "4bd1f41113f2891eb13c47930e69ddbe91f270fb",
+        "03e1b03ffca4399d5b439fac8f87a5cb06930f00d304193d7daf83d5947d0c1e293f74ae"
+        "f8e56849f16147133c37a6b3d1b1883e5d61d6b871ea036c5291d9a74541f28878cb986",
+        "0403b236fc135d849d50140fdaae1045e6ae35ef61091e98f5059b30eb16acdd0deb2bc0"
+        "d3544bc3a666e0014e50030134fe5466a9e4d3911ed580e28851f3747c0010888e819d3d"
+        "1f03a8b6627a587d289032bd76374d16771188d7ff281c39542c8977f6872fa932e5daa1"
+        "4e13792dea9ffe8e9f68d6b525ec99b81a5a60cfb0590cc6f297cfff8d7ba1a8bb81fe2e"
+        "16",
+        "2e56a94cfbbcd293e242f0c2a2e9df289a9480e6ba52e0f00fa19bcf2a7769bd155e6b79"
+        "ddbd6a8646b0e69c8baea27f8034a18796e8eb4fe6e0e2358c383521d9375d2b6b437f9",
+        "2eb1c5c1fc93cf3c8babed12c031cf1504e094174fd335104cbe4a2abd210b5a14b1c3a4"
+        "55579f1ed0517c31822340e4dd3c1f967e1b4b9d071a1072afc1a199f8c548cd449a634",
+        "22f97bb48641235826cf4e597fa8de849402d6bd6114ad2d7fbcf53a08247e5ee921f1bd"
+        "5994dffee36eedff5592bb93b8bb148214da3b7baebffbd96b4f86c55b3f6bbac142442" },
+    { NID_sect571r1, NID_sha512,
+        "b61a0849a28672cb536fcf61ea2eb389d02ff7a09aa391744cae6597bd56703c40c50ca2"
+        "dee5f7ee796acfd47322f03d8dbe4d99dc8eec588b4e5467f123075b2d74b2a0b0bbfd3a"
+        "c5487a905fad6d6ac1421c2e564c0cf15e1f0f10bc31c249b7b46edd2462a55f85560d99"
+        "bde9d5b06b97817d1dbe0a67c701d6e6e7878272",
+        "2e09ffd8b434bb7f67d1d3ccf482164f1653c6e4ec64dec2517aa21b7a93b2b21ea1eebb"
+        "54734882f29303e489f02e3b741a87287e2dcdf3858eb6d2ec668f8b5b26f442ce513a2",
+        "04036f1be8738dd7dae4486b86a08fe90424f3673e76b10e739442e15f3bfafaf841842a"
+        "c98e490521b7e7bb94c127529f6ec6a42cc6f06fc80606f1210fe020ff508148f93301c9"
+        "d304d39666ebe99fe214336ad440d776c88eb916f2f4a3433548b87d2aebed840b424d15"
+        "c8341b4a0a657bf6a234d4fe78631c8e07ac1f4dc7474cd6b4545d536b7b17c160db4562"
+        "d9",
+        "378e7801566d7b77db7a474717ab2195b02957cc264a9449d4126a7cc574728ed5a4769a"
+        "bd5dde987ca66cfe3d45b5fc52ffd266acb8a8bb3fcb4b60f7febbf48aebe33bd3efbdd",
+        "3d8105f87fe3166046c08e80a28acc98a80b8b7a729623053c2a9e80afd06756edfe09bd"
+        "cf3035f6829ede041b745955d219dc5d30ddd8b37f6ba0f6d2857504cdc68a1ed812a10",
+        "34db9998dc53527114518a7ce3783d674ca8cced823fa05e2942e7a0a20b3cc583dcd930"
+        "c43f9b93079c5ee18a1f5a66e7c3527c18610f9b47a4da7e245ef803e0662e4d2ad721c" },
+    { NID_sect571r1, NID_sha512,
+        "ba6be551bc60653192401ed8ff9e1acd9013d8811a7a1389528bf07438366f5772cd7aed"
+        "ad010c19c47622cec03a4d35b8003b39ed901b720629ab59de55a03c1ca50a62987f8da1"
+        "59e356245df58d5ae1936e65f3cd3acbe03ad1d0fcab4aaf2a7a947549ae776772201efb"
+        "c6fab1aebfa1d99994d4f43dc28f39c0f279b992",
+        "2a69bc1df069c6e89722521a63675f318252be629e7558f3716917998e660ac960b0b750"
+        "562846fe6c12ef492951e51e224754bab84a6eacd4147a5f26ae85ee4381bb14ec2a8c7",
+        "0404685c0358ca31883cdfd7d609afa8b1e47540a97f473e0ebe98b0aaaab9418877aeea"
+        "d3a26fb01a4725fda20e7223a4fe7de0df6891c0812555b8b146918d3b80edd11615d95b"
+        "77067c92736447946c7577965b613e18950d813a4df049a6000895f9dac34d73ea46a83c"
+        "6a4e7c83831af0d33026825664c44090953521175b9da2a7ac563a0fc5e13c85d34aaf49"
+        "f2",
+        "1700d9ac00a987ff3a1d0be4290979317fe60f4f8ce1e0e72a026fc89e28c0070b76ada1"
+        "4f7a1a66ac2e8aef17eec18b568ada4fd59c05414e55356fc17d9e5079e6cabfc1f220d",
+        "23a279662efec48f6cf8c7334862525b52ac37a9b03da6a063da2849f878015632427834"
+        "34fca02fa23e32249666ddc6f596e07750ed21de303f4f10de56f1d37101cb0826bb8bf",
+        "3b449467b150cba0d7c2b44280c5ac452f1217384ce121c979625d313394f6cef501b819"
+        "80a02567ca55da2bc313dc0754b5256b08d8e3b63ea033253b205cc5dcb014574b8e9a0" },
+    { NID_sect571r1, NID_sha512,
+        "295720a79ac8201f40a66b06ae5d970afb15f36582897eed25cd92edcd00f70ac8e31c55"
+        "6eed4375ea044c2e8b227a8e02c0a3e996c9272d52ac7b3ad43b80f217295dddc84b177c"
+        "f1e800ad08bf7fdd021fb2f49b54162092f8d628679c4ee335abbc90c027264c8b288c6e"
+        "16eca3172eaa297ba50626b00fe0a0ad3a9dbeeb",
+        "0d11ed1b78b22b3420df4ddc4acc7c2286d9569dd6dd88e0fa3ecae69bcced68bb81bbb4"
+        "ca6e9b54e67856e7fdf39155aa27aecb9cc827ccb9cdcf9ac633561b27d8eebfc261aee",
+        "0401868a1335058a69e3ce24ea4e6e8dc25851777bb28d3a5da67b741ec9c46e26f2d2ae"
+        "70a48c3e4feabb3b15b3c3ebd561f667ef3b95a587621de6073b9c8a904755566c5f7a3b"
+        "4206365a03c3f3066eca1af17bbbd08cd52e89f8095075b415cd4b82f3364cbff008fe36"
+        "42fe71e8a8c634ad0e5d9979251e6cedd42cb97c2203f743210051f5ee1b70c861d2a72c"
+        "00",
+        "075e49d2ff6f2aa8b44fad90446474ee0e72323a3c39e731b6c2b075cce0cb9d193bc335"
+        "6f8fdae0e0143603a57028836ee6451cab101a6eb550042cb41b5c4233d3ad3e87034d1",
+        "207a8eed0b87efe65ec558a0ccbecb13b9215e176abd93c1a4803fcae713927ece70ec6c"
+        "41c621357d78a13a950958871a52621f1de7ab74befd964a0e8f4820b84af3e0811bc67",
+        "2f02017714f54089652e02af36ac5165e44ac4a83747c805a9e003fde4bdb29561dcead2"
+        "c76b02c195074396a2dcc1b93a256c721716f8eeda8dae443c3eea446118fec3cebc4dc" },
+    { NID_sect571r1, NID_sha512,
+        "a9cff41c6dfdc4a12f31dc375a5455950077ae323d0b7a3d9a8dde73b76e9d7b94ddf9c8"
+        "8ae8e6c262d704052ac47681fc35adfc56c904baaa6e146eb653984369d76a85596cb744"
+        "941aa7b558c945ff2e81bd5ef7f00ecb4f43af23b4cea3bd4ba7b1899f1868a0c0ecfc62"
+        "ccb1d588955597ffbbaf34cab2838efc2b866669",
+        "2c36ef754b5bd065e9eadde684750acc52795be80f54dd3d7a7d743d968a18f7e404bd71"
+        "f8a76eb0395f396df5a7c2ff7e0ab6de35df34282fda6ee01fe5b9b68ecb4e378dbe32e",
+        "0404805e1a23b6eadcf91647b40903bc1fd3b9921861c942fc24d2c03d0544e7c01f004c"
+        "aeed04b5c4ebbce366a098a878c322cbebe7910bfb0f91b284ac1aef344152fc5831669b"
+        "7904f589ddb4da482ba1e9a59241b1dfbc7e9b9b69e8f69f8e90460ad58fdecc48a56842"
+        "ea6aa0537abec0a605ebfb713e588685a98f62e05a7d52082bfd57e3d68fb7851b37ec55"
+        "67",
+        "2f2002bdde0c0b0fd92e96abe76c0858e42fd7d94a181c711fc6753572539e18effa8155"
+        "cde7b1e9ceab2394f9eba874b7ea257d7c308c8ac08500f4944af5f33057650608db8fe",
+        "27f9109799bced42730faecdeea68259383a45033c6d5dc8d87adf994b46beb34177e013"
+        "700b13f1253cf756a8866218e9c8adc180f3c242c56b3de28405b36940d53c2aab24f1a",
+        "20a762ffb2f5a88b0e1356964fb558b555c424946109d16c7548f41a33cfe41da1f48327"
+        "6a27b188faf948a56670716ddf3b187570c9f514869c4492d7773d6ce453a075f9bc64f" },
+    { NID_sect571r1, NID_sha512,
+        "efa6c582d7fcf5e431aa89b3b00180c0e78efd7ccb0384d90b80e59a115a13e55001d951"
+        "528c42860132531c9b8ab29dda7a657c53c2ce96fd85549f6f1810e121eb89961295335e"
+        "aa0e40532d85814a4206e6fffdf9bff76599da9b2e71a22ed572910b0e3bae38ad72c704"
+        "2579f106739a8628dea5a745168bd918736e488a",
+        "19ffee50be5496507e3ef5c40ee88a49625e46d1dd1686a52b09ad4a8e3ee9ef364f953b"
+        "fcd97c52104eecb6138067192997cd4ebadaccb73c7b2560879289a46353a756b73cc43",
+        "04077dca410e722009ef11b37742c2c003ab3015d0ca0328a70d9d41aae04cb64f7746f1"
+        "c348b08458eb3bb1788f9ffe7d0570a9b689a9b7aca43e05400bace7630d598f5b484d13"
+        "c407291f74cddd9ff69470cf0d92afaaddcc4c8c274d4a7a64fd94292ddc8bf080606795"
+        "376bb725ab4d32c72ef77dff34cfedd34aff2f463d635bfcd7e1fd002d84383dc5bf8d5d"
+        "23",
+        "2ea37750fc3bbdeec100694068d55f92fdf35bff9ed49251c4b8bbfb2dec2dd4446999af"
+        "8848e05c7b819aeb1864430ab4e8c1d684e1cf78947a71b04d5ab8ad61cc7e3e4e24205",
+        "12ff1852eaff37fee997531039adb1fb2f9b4f4199670c022e8534625fff1fa93390ee9b"
+        "c7204ad2ba3efc2233260943f1d2381a3cc025b78c6d1f660a7bd6f42e5ed3c123055a9",
+        "1b4d8abb28ef1a9d77066921ed50eba64b8433cf00c66b8467269a4a914f568cdb86c766"
+        "a7a6a52437c5d98cfc9a2130dfaba20f3c2001f31bba7071647d51fb9fbd5fc67ee120f" },
+    { NID_sect571r1, NID_sha512,
+        "211acebfaf13bba33a9dd16722ec53baab92a140127d61372cbf1850f2fc894e942e25d7"
+        "80778235f880743953d04eca7a9205602e388172aec2abf35412b483490751f93b51239b"
+        "6701cb0aab14e5179b0d7f55d8586358381dd83e3e436bf69a6820317d1701750cb1fea1"
+        "293467ba589eec5f5779c2dbf2a9b8f28c4dc239",
+        "3129e96fd28c4198cc5242c1e3531a3979fae643d527044e98d7721aa56b5b4b45dfddfa"
+        "17a4115e10a2b4f46d92f81cbdd7e86e588a4c6d8c2b3a83f54cebcee1d1dd33e85d81a",
+        "04073a92abcc991e3f89d82c47fa0fec48e3e7c4d97e2525f8dc2d24da39f616af4a5a80"
+        "4d2603703f6db7cc9324c5b56a21009373f6605f561c8503394e7746e51273b5722ffbc2"
+        "3d00684c842f03a53a60cce087f4fcdbf23b7a28c48b6b6544f583342a65d97dd87037c6"
+        "fef176a1f00513713468273494a5be683b68c5e75bc08995fde763bb6f965da1acb7e894"
+        "f1",
+        "0165e52640fcaf8cbdbfe73cb8058c53045e7670aafb2def28d2c9eceb5ed1634b5339cc"
+        "47ba981eb6eb03ba714c7717e9ed5acc15c8f304702a0409bd4508015d4626cfc5484b1",
+        "27dcdf16b7156a7a05a752da28b5bd6b233e8a7c16eb7f9030f29c4352e6508f8424d1b5"
+        "ba789dac4152ac4812ff7975cce69908371a81a4d7d9dd70a8dabebdc4e3af27234f0d0",
+        "32a654a31f09a9803e502a1440c2bcf122780f4f47aa37e15991d9a548583fdca4880080"
+        "4712816b212cd3c657e6bd4cb7443a0288592541473c5086e1277250612c21346538374" },
+    { NID_sect571r1, NID_sha512,
+        "ee592e20e0a45c18089c2e41460e65a7d22ed9714379f095d43a308bdd383128aaa6fb24"
+        "e9d35fd28fc95c5b792ad75c980d2cdf0f460ac60b12c5919d3cb28dac4d488196be6c2d"
+        "fe462b1b0ce59f8501692255840f5215c0fd8b74b1996a267a5e3b22d2841cf0a0b6315e"
+        "f4ec7180f1c8494f4c07d5869c01fa2711739efc",
+        "3d723d2697cd07dd8444f992f2ab4a063db334034c25ea9be99fd7a1f495e3a644e5ea03"
+        "3a41264e0d24a911e55741d0cab80a0bd678eaec2bd1e60424d4491eb86d664900d907e",
+        "0400c7a229b5fb9fc774c1b6250f3bba2f0972d1aada7080641c014d012db0637a0656a4"
+        "3024ec0ea25ff70012646dc19eeb1033aebcc96a001ba876b2f5def6e198b8d4a53f7c7f"
+        "4a009228a68eafaac214fdfa19923a0c19629de31ac0967c9d02c53dbf221f9affb735d3"
+        "bad732f381f1ca414d70920231a78f742254d895a33ffab492f8e6094a542e77962a324b"
+        "a4",
+        "3b3724a5933353bb9ff5f742f59385e780caa517a963590b7fc89882bed95cf90ca6365c"
+        "e8b882f2d96e56bd866a5c437733b681308c570c51ec893ea95fede66c7aaf4561173f7",
+        "2a487c1fc29426e8e85f0a35c177cd168a444959b2f5cd4519b9edd52af3ea829cfe964a"
+        "c2b59198af8e2d3859ebdf9885ebf57bdf5767da1611d3958de286f91ef397230d65599",
+        "10fc01efcb22b982f992efb71887bc79c3f32a9088bc2011c269924cee0f47c36452399d"
+        "499f2933587081b872e9fd2191c20cd5cd94927839228ebcf22cf7acdf4608a2fa66310" },
+    { NID_sect571r1, NID_sha512,
+        "fffca41927debbd53455821441d9115db99fb31bfc69752a382f57bc7abe021f148346ee"
+        "29e17512c64b4918ab2391d12d6e5643bee6b5682885dc28177b292e23a37ff99b359b9c"
+        "f7578432af56e0ad1028a6cce7428980654c145af8daf09addbb3be11228d3c742defca9"
+        "d3b1667f48c63091fe3307ecf72667b02e008f24",
+        "1999ab45d66cd1d3a0fe6aa43bf5ef1e2a67637d53674f6fbbfb9b582be91fc42a12cdca"
+        "d94b50b0fc7ac55030de24a0b99fbc4314fa743ef4b5198bcc5f54d8b669fbed78e2e91",
+        "0400cbf3b0bb4a2e6c225aa922bea3b233da4661df5da7e0a1cd343a9b6655ee87fc60cd"
+        "763dee21eaa2b81c4dd5af6f4fadc3ceea643b37a6b17a6501e1b9b689fb0c4716911c1f"
+        "10014b5a9ae025f09066fffa6797ddf95f27eeade06b8ca5be5738f770362d5213c46ecf"
+        "ca58e3c60cb2bae1f8ab1bf0577c80b4fdad02819fc174cafb33df64fc0ec79713f7b252"
+        "09",
+        "253b533d3ad1c7095363e3fc80cb32471061e44dab3f9ae0ea6252f6ef169cee8badd3ec"
+        "cb77096ae9224f89baeee7e183058579680661655fb689419e36a61e8573de5ecb4cd09",
+        "3ba94f7682fb61de725a35caf1d4d799c4b05a1d1c44eb1c251dd8efab6b7d713c3fb917"
+        "776902a1bb202f9226558f4c1e75964349717e6dff938d0befea07a9ca1bbd429dd6318",
+        "226f43be8e24062180c726b5cb721cc04ffd3acd82183925523ff9e8631aecbec2c224d5"
+        "a291bb225f0da726d256aa822ee7cc2c7d69df3f2a5beb21132d91bea22e4c5db900cec" },
+    { NID_sect571r1, NID_sha512,
+        "a2f71619ea04f7057e6943c2cece8594b341ec3b96c3915d924f94ba13fd7aaeed41ffa0"
+        "e842ade414784f1ef825fcf2dbcf7bd8263b802def45f94de596aec0c121fc06558c7bb0"
+        "6b9f27a9bf56c42090b5dc344e82b69c4f528d33be166764a593483f6fda0cf56e6000ff"
+        "363ba220f5ea0ea2c3191615c7ae3bb4fa575324",
+        "2ce1cae0716205330d730e6bc6dbfb6b951dc83ee3b4a7dae75d057e32e8a46e22be75b5"
+        "f09135452b29c34dfe81a9be2e8dcd243fbd946a0ed14a832a7802e20cfe1abfd3d6e4b",
+        "04075971399fa621ce535144ec1d57f544d798a0a59207166c3d657e5a80ac00e8f5b643"
+        "448e3546064d68ae624aaabf36face3016561a248256ff9131950ab8b04710551e12222d"
+        "0c0224a50f321647f47de3db4fbe1bf1e3a3dce8a834312779f66037315e3326721e3fd6"
+        "3d4d6ef92b7ba1fa9aeb70f92e2a6701458ac8da49ac386491f2306adcd8dd781fe75e99"
+        "e1",
+        "0ad95aa69cf9f40e13f8a72ed6d93388168abc8001670ee4d95fb4b726b1f958205ab2f4"
+        "58df8bb9ccf2405680d0e6951abbb922cc11d47cfded93c0efdb70caf0c54e7ae96d7e5",
+        "09ce019161bf29eeaf323933045f59d2efc372904ba50c4a6602b8305234a851d95f06a5"
+        "b56193ad5d28488102ec25e3f421a5f5c4626b435b423d612e6ab60e0a4fe5d4952e2c5",
+        "04f7b7ac787b361c2bdfa767da9c22152e402184a7ac133f651fdcd928239215dc917401"
+        "122a6d41e78299b4235e085399e594465b7f8dbfaae9bf302d83470b4295ea06bb9bd1e" },
+    { NID_sect571r1, NID_sha512,
+        "b60415a831eca2cf60c79a334ef2f327a76d290846ee588d5d33d0a826bb0c7ec3e11dbb"
+        "384a7f89c8d180425dfae7463e0ea6497d2eec1dde112f1c1efccb532a2e2b66a28e2d36"
+        "d4252a4c3b12850d465fe21bddc441b92e6a7b0f67744f7f6e7812a0603211a26518b311"
+        "a5b190ed890ad852bed4f6ed13377cab3eebedf4",
+        "2c9d0fcfcee7e75c3245ba955ae04188b1033c55ec9c821d8de7685276bda3e9a93c3ae1"
+        "b003e5ea722913e7b169d67b1aa2dc8cd42adbd9368672a3f81a6817bf3e5529dcb0c8b",
+        "04019cba4c8ddadb596d7303331f2a22461849ebfbc78ea69277f72dcfe23d08397025ff"
+        "6691c61ed9958d68a9c5dd8a32048a89a2553afb9077ec43358763756b1473ab2cd8f25b"
+        "530319eeaa78444b7cc5d8cff4e9199ddd2c6dc7bd935a1be1d8b1c657dd5ac49bc92b0c"
+        "d91304ef44ddb7ecac05518301bfa0e533402043533f99549621e31dcc282a52186478df"
+        "2b",
+        "385e12170ed0b23c9c65ff7edd413145fd343dd841e85c498fae5f36e577641688999028"
+        "17d4dc39127010faa1da68000a511ac69f80708be5afe1631432f3bab7aaec2bdeb11b4",
+        "231ef400c6a3a0c7b26ba1b92341b72e138ca62d04ea2172854631c40c48081a18a57e9f"
+        "055748245d3e83d10d21af39935b0e50c9c86956ac46c1ea03ac4ae023d84b24f830973",
+        "24d37d67afafb0676cd7b5da2960cabfc804b0b3244b5e6739f8fe43d0841693d28c61b8"
+        "e76181f8aa24940d76fc5ea8ef3a95f72f67303e1ed85ad6e83cd2c44fd0e0f3f2f44f4" },
+    { NID_sect571r1, NID_sha512,
+        "5d15a08226cc74cf495be681b795d0bde26b19f29aca1a8c6ef77d50271ebdcb4e5fa2df"
+        "23961fe11620b1c6580183f6ebdceb2c09516c8127be576496fb71449bbbf0a9d3d1c48a"
+        "25024619b97c3e0d8b165897db96ae9758d13ac28441d7cbfb75b23cb423e0002046358b"
+        "b6d64779974a5995dfe54b398f95f7d64fc52d96",
+        "10c057bbaa44ef0f565edc288bfe66d4f6acd8686899359bca418ba89fb690429489a37b"
+        "d3c6c9f3a8714b2ca225868c6a45fee360e378a676f7ea39321790f32a4b005b81dce43",
+        "04043b1e7d7b2aee3563813a6692f0b4b61ba82b801697c3e23724a2fbab2af80a2c56be"
+        "55af41def0a90cbfce7a45ec61629906055a8b2a5013740e96859e580c444ae9f0ddf73a"
+        "fe06742f13244f1bf156d321eab2c3095ca548c3182c405187c3de2fbcb01d0e16e1fef2"
+        "46012c87d4d32378629a75b694572ec8583ae0cc813ac64f10bb05a9e52e4805590482f2"
+        "89",
+        "2b8076102a6448bd4c4e192e93cdb96ea9a6c7f6753818267ee9e67644df1a4a6c9ff64b"
+        "be9f64904648cc640fb7f0cce69f9e02878ee950b91ad559a9ec0ae15b676d933f1620f",
+        "1ad97f4997037adfe306f3859d550f9fd89bce8b566e657d5742feb17466b6b8d507d581"
+        "0a8cbba44d671b043ddb557df084bf5d1de74ef8bbd6a93690459fc16a17b80dd6c0f28",
+        "3262ef6e4175e7afe095d18157f67b3d12564d54954e9964e991c31bcfe1dee7e86b3549"
+        "1ce818400cc0f83b819f478f2f2c2d21c6c7a6be43938841559e09bce70b0d61fe51245" },
+    { NID_sect571r1, NID_sha512,
+        "9eca4bd88200baf61b901fca53dc1f1e7e3f83b94d58a6cc6a2adbc9b1a35fe3f8ec6178"
+        "7c76ed9a0d696167cd4fe46e1a0883fda564666131753c576a720125e0b712db1da02780"
+        "67cb899bdb14eec08737e864544663abb1d62f34a2114be07e8e3cf56e2d17099299ce6b"
+        "6d83b1a34e6153d7c6a32a72c7b1bf4583fcbcf7",
+        "2c182df7976ea93d996f3ba5d2221f3cb755cc7847bc3fe9e022fa4285046f5bfb426baf"
+        "a3580beea206de36f87593ae561b4b74a03fcd61fbd0e8d6fd5668f2148819a88a650aa",
+        "0406004b26a184ed710a5fb67e9d042f7fb9c8f5584b1f70a91b0b3be41c3fd2cd1a537e"
+        "962fdac8756df33f80fce2bb1bc7241d325bfc36dbaef7cf625918d589b6352fa7447189"
+        "10036a29b04a494abfe809d956c3cd6f84ea51a7fa28cb39a52f16137a13f72f0726a84f"
+        "6ae53ae24f5b468733f4cbfa0ce5bbbc1cc7b348fb996d33a45ff656a6a7557619f598a6"
+        "b7",
+        "2ab349232bcb4f4816b26bd0049e130fffc90ca0b9308edd50fb9055358a87fe798d0014"
+        "0b0ae01ed8b1f6bb9bfb726b253c3d4949ce9eecaa6c7fa84d1ef812669fa929f26be0f",
+        "0bbf2f9765b12742224ba7d064358c0305fb63e9b54a831e302a4546aa02cace798d82a1"
+        "88d2f536d78544c1571f481289d6ec69d117648026490e781f1eb9fca59bee05234ba7e",
+        "27e07ee0a1a99c90753cdc8c0291da25a82c116e62ec58b93f91086ac1cc039b35ce7d8b"
+        "53cdaa92a5ade65a7684b6e7ab79873dce33dcd467c39d0c764ee390b7fb25ca18912c3" },
+    { NID_sect571r1, NID_sha512,
+        "707450bd84141f3b61beb12ffa5ae89d812dd11badcdf6a88a2d50fc70e23f6d822ff447"
+        "7047abc58cdfa28f97ad7f4911ae0773c04ebed1f51bb2308cf6e5712c4aaed461edd698"
+        "7fdd1796aab70198276b601241f6a14225dce575830ff60f935fd9f567d1d210652e4710"
+        "922fa793da78c8fdc30c273cb08365c9fc887f50",
+        "2d3a65bbe133cc98cf0eb56ee1362195968b4eab960a1d55d8b762f1361fc21348d6f275"
+        "d4bea1de7158fb97c995e20b92a9c887a3e332d154667ad167acc632eb88a0ead6113a2",
+        "04034355b54d00c3df7c2762ee2982cb777491aaf78e550c4d2ff5d5a893416eb3517671"
+        "dbe522b8c553fd71edfe0306cd7628324f4f748091fc5d84ad8af33b896985674649a6f4"
+        "e507e322a04eb600a3faf3e045959f1e9f798e1c965ced40fd4c0383c0d4e79a96bf693a"
+        "91d7662780990d0c9dfca77a9bc0e13551d2ab35af8a153fa34ea903961fe66996ca053b"
+        "64",
+        "0a59ac1240bcefc52456486ce23b780cc92c8b89314b8442a6898c373bd0adc3725e3eba"
+        "c580546d1ec82ebfb2e04c608441d962d759ab5f5af1596c6623487e1347537a3c35bf4",
+        "0c47ef55d93ac36cee537160bbe39c3d4504184188533edfe589a5ab6e5a3e06ef413aa4"
+        "8710d304f0b2bc380fd69a34aa0b8e2e9466fd8a131cb056dffe4b809a59fd83e594483",
+        "2d8de1e8e2a52dd1be08435cda69e673b328573edeb1767849536e6f2d5fc8f18f7bfde9"
+        "36d8c32ecbfa97bf976133d65641320ca1c41e81c388fd6088884bbd89274b1976470fc" },
+    { NID_sect571r1, NID_sha512,
+        "d5ce9d59391cdc47ef942dd2a818d024ae3917deea8a5a4214e4db6a0c5e6b0936f3e632"
+        "fdb68a3f0006e05c44b7232013e1da5f877cd197f44fd6f60c1fd2378995e9a47534948c"
+        "5a09e33750f07a7165072ab38095373b07a50bc1391eb6b650ee13acd63d0352e7d9c316"
+        "95ea1ec6323f9b5f57b426ace56aa7fdbf419be0",
+        "2a920e8dc928acdd56e3655b2340d4371c793e66f67405fb7a90f31e9c4ef466cc44331d"
+        "1d2fe3ff7391d2576dc6640772166ef8c154a5ff1808f5dab2f03061070ec8b3f786c36",
+        "0405edc0fb974314e21ad40d73524d5620b7279084e3ecb9e58b06340ae53d2383efd206"
+        "b8b1eb3dd60c38f593efc05e2ba5fb8989472bac7db60fcada2d18d4108ab36e8c20cc71"
+        "0d00444cf65175f6bbaf647739cfd8407e7036fc6cc6208ccb9d776eb13e13b377136c68"
+        "3e108775d85b6bc5638926432a17344de965d45e042a0a8e0b63c7fc3a36fc15cf718f3b"
+        "af",
+        "35a0215892d0c52ece29559ebfa061011da8d597af6b3d1ee988ea4819be194c79a42681"
+        "476140738b1b5dc191485bd20c96c282ab38ddbc3987343155366b6a5d1ce7053efcd83",
+        "1a69a9a51f6b0dc196b2a8db2e8bf61764d4c65b038f43b5ed6b5dc2673971c32928606f"
+        "92b7caafb4dab3cd61ee724bba71a0d5c788cde4b96ef6b453f2a69126dafc20dbc7c82",
+        "13b5463636b8462cd9f479de8d114e29e7011489bcb9735ffe9ca0707a07df3c0aba0504"
+        "3eab387bfedd9fe982fbf04968f2be200e9e052cb4b02223b8579913d713acf94e7dc80" },
     /* binary KATs from X9.62 */
-    {NID_X9_62_c2tnb191v1, NID_sha1,
-     "616263",                  /* "abc" */
-     "340562e1dda332f9d2aec168249b5696ee39d0ed4d03760f",
-     "045de37e756bd55d72e3768cb396ffeb962614dea4ce28a2e755c0e0e02f5fb132caf416"
-     "ef85b229bbb8e1352003125ba1",
-     "3eeace72b4919d991738d521879f787cb590aff8189d2b69",
-     "038e5a11fb55e4c65471dcd4998452b1e02d8af7099bb930",
-     "0c9a08c34468c244b4e5d6b21b3c68362807416020328b6e"},
-    {NID_X9_62_c2tnb239v1, NID_sha1,
-     "616263",                  /* "abc" */
-     "151a30a6d843db3b25063c5108255cc4448ec0f4d426d4ec884502229c96",
-     "045894609ccecf9a92533f630de713a958e96c97ccb8f5abb5a688a238deed6dc2d9d0c9"
-     "4ebfb7d526ba6a61764175b99cb6011e2047f9f067293f57f5",
-     "18d114bdf47e2913463e50375dc92784a14934a124f83d28caf97c5d8aab",
-     "03210d71ef6c10157c0d1053dff93e8b085f1e9bc22401f7a24798a63c00",
-     "1c8c4343a8ecbf7c4d4e48f7d76d5658bc027c77086ec8b10097deb307d6"}
-# endif                         /* OPENSSL_NO_EC2M */
+    { NID_X9_62_c2tnb191v1, NID_sha1,
+        "616263", /* "abc" */
+        "340562e1dda332f9d2aec168249b5696ee39d0ed4d03760f",
+        "045de37e756bd55d72e3768cb396ffeb962614dea4ce28a2e755c0e0e02f5fb132caf416"
+        "ef85b229bbb8e1352003125ba1",
+        "3eeace72b4919d991738d521879f787cb590aff8189d2b69",
+        "038e5a11fb55e4c65471dcd4998452b1e02d8af7099bb930",
+        "0c9a08c34468c244b4e5d6b21b3c68362807416020328b6e" },
+    { NID_X9_62_c2tnb239v1, NID_sha1,
+        "616263", /* "abc" */
+        "151a30a6d843db3b25063c5108255cc4448ec0f4d426d4ec884502229c96",
+        "045894609ccecf9a92533f630de713a958e96c97ccb8f5abb5a688a238deed6dc2d9d0c9"
+        "4ebfb7d526ba6a61764175b99cb6011e2047f9f067293f57f5",
+        "18d114bdf47e2913463e50375dc92784a14934a124f83d28caf97c5d8aab",
+        "03210d71ef6c10157c0d1053dff93e8b085f1e9bc22401f7a24798a63c00",
+        "1c8c4343a8ecbf7c4d4e48f7d76d5658bc027c77086ec8b10097deb307d6" }
+#endif /* OPENSSL_NO_EC2M */
 };
-#endif                          /* OSSL_TEST_ECDSATEST_H */
+#endif /* OSSL_TEST_ECDSATEST_H */
diff --git a/test/ecstresstest.c b/test/ecstresstest.c
index 237def095c7e2..fb291629ca207 100644
--- a/test/ecstresstest.c
+++ b/test/ecstresstest.c
@@ -22,16 +22,15 @@ static ossl_intmax_t num_repeats;
 static int print_mode = 0;
 
 #ifndef OPENSSL_NO_EC
-# include <openssl/ec.h>
-# include <openssl/err.h>
-# include <openssl/obj_mac.h>
-# include <openssl/objects.h>
-# include <openssl/rand.h>
-# include <openssl/bn.h>
-# include <openssl/opensslconf.h>
+#include <openssl/ec.h>
+#include <openssl/err.h>
+#include <openssl/obj_mac.h>
+#include <openssl/objects.h>
+#include <openssl/rand.h>
+#include <openssl/bn.h>
+#include <openssl/opensslconf.h>
 
-static const char *kP256DefaultResult =
-    "A1E24B223B8E81BC1FFF99BAFB909EDB895FACDE7D6DA5EF5E7B3255FB378E0F";
+static const char *kP256DefaultResult = "A1E24B223B8E81BC1FFF99BAFB909EDB895FACDE7D6DA5EF5E7B3255FB378E0F";
 
 /*
  * Perform a deterministic walk on the curve, by starting from |point| and
@@ -40,21 +39,21 @@ static const char *kP256DefaultResult =
  * Returns the X-coordinate of the end result or NULL on error.
  */
 static BIGNUM *walk_curve(const EC_GROUP *group, EC_POINT *point,
-                          ossl_intmax_t num)
+    ossl_intmax_t num)
 {
     BIGNUM *scalar = NULL;
     ossl_intmax_t i;
 
     if (!TEST_ptr(scalar = BN_new())
-            || !TEST_true(EC_POINT_get_affine_coordinates(group, point, scalar,
-                                                          NULL, NULL)))
+        || !TEST_true(EC_POINT_get_affine_coordinates(group, point, scalar,
+            NULL, NULL)))
         goto err;
 
     for (i = 0; i < num; i++) {
         if (!TEST_true(EC_POINT_mul(group, point, NULL, point, scalar, NULL))
-                || !TEST_true(EC_POINT_get_affine_coordinates(group, point,
-                                                              scalar,
-                                                              NULL, NULL)))
+            || !TEST_true(EC_POINT_get_affine_coordinates(group, point,
+                scalar,
+                NULL, NULL)))
             goto err;
     }
     return scalar;
@@ -76,9 +75,9 @@ static int test_curve(void)
      * would be straightforward.
      */
     if (!TEST_ptr(group = EC_GROUP_new_by_curve_name(NID_X9_62_prime256v1))
-            || !TEST_ptr(point = EC_POINT_dup(EC_GROUP_get0_generator(group),
-                                              group))
-            || !TEST_ptr(result = walk_curve(group, point, num_repeats)))
+        || !TEST_ptr(point = EC_POINT_dup(EC_GROUP_get0_generator(group),
+                         group))
+        || !TEST_ptr(result = walk_curve(group, point, num_repeats)))
         goto err;
 
     if (print_mode) {
@@ -87,8 +86,8 @@ static int test_curve(void)
         ret = 1;
     } else {
         if (!TEST_true(BN_hex2bn(&expected_result, kP256DefaultResult))
-                || !TEST_ptr(expected_result)
-                || !TEST_BN_eq(result, expected_result))
+            || !TEST_ptr(expected_result)
+            || !TEST_BN_eq(result, expected_result))
             goto err;
         ret = 1;
     }
@@ -137,12 +136,12 @@ int setup_tests(void)
         switch (o) {
         case OPT_NUM_REPEATS:
             if (!opt_intmax(opt_arg(), &num_repeats)
-                    || num_repeats < 0)
+                || num_repeats < 0)
                 return 0;
             print_mode = 1;
             break;
         case OPT_TEST_CASES:
-           break;
+            break;
         default:
         case OPT_ERR:
             return 0;
diff --git a/test/ectest.c b/test/ectest.c
index 70df89ee2f877..0233f870b6f08 100644
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-2025 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -20,7 +20,7 @@
 
 #include <openssl/ec.h>
 #ifndef OPENSSL_NO_ENGINE
-# include <openssl/engine.h>
+#include <openssl/engine.h>
 #endif
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
@@ -115,7 +115,7 @@ static int group_order_tests(EC_GROUP *group)
 #ifndef OPENSSL_NO_DEPRECATED_3_0
         /* Exercise EC_POINTs_mul, including corner cases. */
         scalars[0] = scalars[1] = BN_value_one();
-        points[0]  = points[1]  = P;
+        points[0] = points[1] = P;
 
         if (!TEST_true(EC_POINTs_mul(group, R, NULL, 2, points, scalars, ctx))
             || !TEST_true(EC_POINT_dbl(group, S, points[0], ctx))
@@ -123,17 +123,17 @@ static int group_order_tests(EC_GROUP *group)
             goto err;
 
         scalars[0] = n1;
-        points[0] = Q;          /* => infinity */
+        points[0] = Q; /* => infinity */
         scalars[1] = n2;
-        points[1] = P;          /* => -P */
+        points[1] = P; /* => -P */
         scalars[2] = n1;
-        points[2] = Q;          /* => infinity */
+        points[2] = Q; /* => infinity */
         scalars[3] = n2;
-        points[3] = Q;          /* => infinity */
+        points[3] = Q; /* => infinity */
         scalars[4] = n1;
-        points[4] = P;          /* => P */
+        points[4] = P; /* => P */
         scalars[5] = n2;
-        points[5] = Q;          /* => infinity */
+        points[5] = Q; /* => infinity */
         if (!TEST_true(EC_POINTs_mul(group, P, NULL, 6, points, scalars, ctx))
             || !TEST_true(EC_POINT_is_at_infinity(group, P)))
             goto err;
@@ -143,8 +143,7 @@ static int group_order_tests(EC_GROUP *group)
     r = 1;
 err:
     if (r == 0 && i != 0)
-        TEST_info(i == 1 ? "allowing precomputation" :
-                           "without precomputation");
+        TEST_info(i == 1 ? "allowing precomputation" : "without precomputation");
     EC_POINT_free(P);
     EC_POINT_free(Q);
     EC_POINT_free(R);
@@ -224,7 +223,7 @@ static int prime_field_tests(void)
             TEST_note("     point at infinity");
         } else {
             if (!TEST_true(EC_POINT_get_affine_coordinates(group, P, x, y,
-                                                           ctx)))
+                    ctx)))
                 goto err;
 
             test_output_bignum("x", x);
@@ -241,64 +240,63 @@ static int prime_field_tests(void)
         || !TEST_true(EC_POINT_is_at_infinity(group, P)))
         goto err;
 
-    len =
-        EC_POINT_point2oct(group, Q, POINT_CONVERSION_COMPRESSED, buf,
-                           sizeof(buf), ctx);
+    len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_COMPRESSED, buf,
+        sizeof(buf), ctx);
     if (!TEST_size_t_ne(len, 0)
         || !TEST_true(EC_POINT_oct2point(group, P, buf, len, ctx))
         || !TEST_int_eq(0, EC_POINT_cmp(group, P, Q, ctx)))
         goto err;
     test_output_memory("Generator as octet string, compressed form:",
-                       buf, len);
+        buf, len);
 
     len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_UNCOMPRESSED,
-                             buf, sizeof(buf), ctx);
+        buf, sizeof(buf), ctx);
     if (!TEST_size_t_ne(len, 0)
         || !TEST_true(EC_POINT_oct2point(group, P, buf, len, ctx))
         || !TEST_int_eq(0, EC_POINT_cmp(group, P, Q, ctx)))
         goto err;
     test_output_memory("Generator as octet string, uncompressed form:",
-                       buf, len);
+        buf, len);
 
     len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_HYBRID,
-                             buf, sizeof(buf), ctx);
+        buf, sizeof(buf), ctx);
     if (!TEST_size_t_ne(len, 0)
         || !TEST_true(EC_POINT_oct2point(group, P, buf, len, ctx))
         || !TEST_int_eq(0, EC_POINT_cmp(group, P, Q, ctx)))
         goto err;
     test_output_memory("Generator as octet string, hybrid form:",
-                       buf, len);
+        buf, len);
 
     if (!TEST_true(EC_POINT_invert(group, P, ctx))
         || !TEST_int_eq(0, EC_POINT_cmp(group, P, R, ctx))
 
-    /*
-     * Curve secp160r1 (Certicom Research SEC 2 Version 1.0, section 2.4.2,
-     * 2000) -- not a NIST curve, but commonly used
-     */
+        /*
+         * Curve secp160r1 (Certicom Research SEC 2 Version 1.0, section 2.4.2,
+         * 2000) -- not a NIST curve, but commonly used
+         */
 
-        || !TEST_true(BN_hex2bn(&p,                         "FFFFFFFF"
+        || !TEST_true(BN_hex2bn(&p, "FFFFFFFF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF"))
         || !TEST_int_eq(1, BN_check_prime(p, ctx, NULL))
-        || !TEST_true(BN_hex2bn(&a,                         "FFFFFFFF"
+        || !TEST_true(BN_hex2bn(&a, "FFFFFFFF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC"))
-        || !TEST_true(BN_hex2bn(&b,                         "1C97BEFC"
+        || !TEST_true(BN_hex2bn(&b, "1C97BEFC"
                                     "54BD7A8B65ACF89F81D4D4ADC565FA45"))
         || !TEST_true(EC_GROUP_set_curve(group, p, a, b, ctx))
-        || !TEST_true(BN_hex2bn(&x,                         "4A96B568"
+        || !TEST_true(BN_hex2bn(&x, "4A96B568"
                                     "8EF573284664698968C38BB913CBFC82"))
-        || !TEST_true(BN_hex2bn(&y,                         "23a62855"
+        || !TEST_true(BN_hex2bn(&y, "23a62855"
                                     "3168947d59dcc912042351377ac5fb32"))
         || !TEST_true(BN_add(yplusone, y, BN_value_one()))
-    /*
-     * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
-     * and therefore setting the coordinates should fail.
-     */
+        /*
+         * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
+         * and therefore setting the coordinates should fail.
+         */
         || !TEST_false(EC_POINT_set_affine_coordinates(group, P, x, yplusone,
-                                                       ctx))
+            ctx))
         || !TEST_true(EC_POINT_set_affine_coordinates(group, P, x, y, ctx))
         || !TEST_int_gt(EC_POINT_is_on_curve(group, P, ctx), 0)
-        || !TEST_true(BN_hex2bn(&z,                       "0100000000"
+        || !TEST_true(BN_hex2bn(&z, "0100000000"
                                     "000000000001F4C8F927AED3CA752257"))
         || !TEST_true(EC_GROUP_set_generator(group, P, z, BN_value_one()))
         || !TEST_true(EC_POINT_get_affine_coordinates(group, P, x, y, ctx)))
@@ -307,27 +305,27 @@ static int prime_field_tests(void)
     test_output_bignum("x", x);
     test_output_bignum("y", y);
     /* G_y value taken from the standard: */
-    if (!TEST_true(BN_hex2bn(&z,                         "23a62855"
+    if (!TEST_true(BN_hex2bn(&z, "23a62855"
                                  "3168947d59dcc912042351377ac5fb32"))
         || !TEST_BN_eq(y, z)
         || !TEST_int_eq(EC_GROUP_get_degree(group), 160)
         || !group_order_tests(group)
 
-    /* Curve P-192 (FIPS PUB 186-2, App. 6) */
+        /* Curve P-192 (FIPS PUB 186-2, App. 6) */
 
-        || !TEST_true(BN_hex2bn(&p,                 "FFFFFFFFFFFFFFFF"
+        || !TEST_true(BN_hex2bn(&p, "FFFFFFFFFFFFFFFF"
                                     "FFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF"))
         || !TEST_int_eq(1, BN_check_prime(p, ctx, NULL))
-        || !TEST_true(BN_hex2bn(&a,                 "FFFFFFFFFFFFFFFF"
+        || !TEST_true(BN_hex2bn(&a, "FFFFFFFFFFFFFFFF"
                                     "FFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC"))
-        || !TEST_true(BN_hex2bn(&b,                 "64210519E59C80E7"
+        || !TEST_true(BN_hex2bn(&b, "64210519E59C80E7"
                                     "0FA7E9AB72243049FEB8DEECC146B9B1"))
         || !TEST_true(EC_GROUP_set_curve(group, p, a, b, ctx))
-        || !TEST_true(BN_hex2bn(&x,                 "188DA80EB03090F6"
+        || !TEST_true(BN_hex2bn(&x, "188DA80EB03090F6"
                                     "7CBF20EB43A18800F4FF0AFD82FF1012"))
         || !TEST_true(EC_POINT_set_compressed_coordinates(group, P, x, 1, ctx))
         || !TEST_int_gt(EC_POINT_is_on_curve(group, P, ctx), 0)
-        || !TEST_true(BN_hex2bn(&z,                 "FFFFFFFFFFFFFFFF"
+        || !TEST_true(BN_hex2bn(&z, "FFFFFFFFFFFFFFFF"
                                     "FFFFFFFF99DEF836146BC9B1B4D22831"))
         || !TEST_true(EC_GROUP_set_generator(group, P, z, BN_value_one()))
         || !TEST_true(EC_POINT_get_affine_coordinates(group, P, x, y, ctx)))
@@ -337,34 +335,34 @@ static int prime_field_tests(void)
     test_output_bignum("x", x);
     test_output_bignum("y", y);
     /* G_y value taken from the standard: */
-    if (!TEST_true(BN_hex2bn(&z,                 "07192B95FFC8DA78"
+    if (!TEST_true(BN_hex2bn(&z, "07192B95FFC8DA78"
                                  "631011ED6B24CDD573F977A11E794811"))
         || !TEST_BN_eq(y, z)
         || !TEST_true(BN_add(yplusone, y, BN_value_one()))
-    /*
-     * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
-     * and therefore setting the coordinates should fail.
-     */
+        /*
+         * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
+         * and therefore setting the coordinates should fail.
+         */
         || !TEST_false(EC_POINT_set_affine_coordinates(group, P, x, yplusone,
-                                                       ctx))
+            ctx))
         || !TEST_int_eq(EC_GROUP_get_degree(group), 192)
         || !group_order_tests(group)
 
-    /* Curve P-224 (FIPS PUB 186-2, App. 6) */
+        /* Curve P-224 (FIPS PUB 186-2, App. 6) */
 
-        || !TEST_true(BN_hex2bn(&p,         "FFFFFFFFFFFFFFFFFFFFFFFF"
+        || !TEST_true(BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFF"
                                     "FFFFFFFF000000000000000000000001"))
         || !TEST_int_eq(1, BN_check_prime(p, ctx, NULL))
-        || !TEST_true(BN_hex2bn(&a,         "FFFFFFFFFFFFFFFFFFFFFFFF"
+        || !TEST_true(BN_hex2bn(&a, "FFFFFFFFFFFFFFFFFFFFFFFF"
                                     "FFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE"))
-        || !TEST_true(BN_hex2bn(&b,         "B4050A850C04B3ABF5413256"
+        || !TEST_true(BN_hex2bn(&b, "B4050A850C04B3ABF5413256"
                                     "5044B0B7D7BFD8BA270B39432355FFB4"))
         || !TEST_true(EC_GROUP_set_curve(group, p, a, b, ctx))
-        || !TEST_true(BN_hex2bn(&x,         "B70E0CBD6BB4BF7F321390B9"
+        || !TEST_true(BN_hex2bn(&x, "B70E0CBD6BB4BF7F321390B9"
                                     "4A03C1D356C21122343280D6115C1D21"))
         || !TEST_true(EC_POINT_set_compressed_coordinates(group, P, x, 0, ctx))
         || !TEST_int_gt(EC_POINT_is_on_curve(group, P, ctx), 0)
-        || !TEST_true(BN_hex2bn(&z,         "FFFFFFFFFFFFFFFFFFFFFFFF"
+        || !TEST_true(BN_hex2bn(&z, "FFFFFFFFFFFFFFFFFFFFFFFF"
                                     "FFFF16A2E0B8F03E13DD29455C5C2A3D"))
         || !TEST_true(EC_GROUP_set_generator(group, P, z, BN_value_one()))
         || !TEST_true(EC_POINT_get_affine_coordinates(group, P, x, y, ctx)))
@@ -374,20 +372,20 @@ static int prime_field_tests(void)
     test_output_bignum("x", x);
     test_output_bignum("y", y);
     /* G_y value taken from the standard: */
-    if (!TEST_true(BN_hex2bn(&z,         "BD376388B5F723FB4C22DFE6"
+    if (!TEST_true(BN_hex2bn(&z, "BD376388B5F723FB4C22DFE6"
                                  "CD4375A05A07476444D5819985007E34"))
         || !TEST_BN_eq(y, z)
         || !TEST_true(BN_add(yplusone, y, BN_value_one()))
-    /*
-     * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
-     * and therefore setting the coordinates should fail.
-     */
+        /*
+         * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
+         * and therefore setting the coordinates should fail.
+         */
         || !TEST_false(EC_POINT_set_affine_coordinates(group, P, x, yplusone,
-                                                       ctx))
+            ctx))
         || !TEST_int_eq(EC_GROUP_get_degree(group), 224)
         || !group_order_tests(group)
 
-    /* Curve P-256 (FIPS PUB 186-2, App. 6) */
+        /* Curve P-256 (FIPS PUB 186-2, App. 6) */
 
         || !TEST_true(BN_hex2bn(&p, "FFFFFFFF000000010000000000000000"
                                     "00000000FFFFFFFFFFFFFFFFFFFFFFFF"))
@@ -416,16 +414,16 @@ static int prime_field_tests(void)
                                  "2BCE33576B315ECECBB6406837BF51F5"))
         || !TEST_BN_eq(y, z)
         || !TEST_true(BN_add(yplusone, y, BN_value_one()))
-    /*
-     * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
-     * and therefore setting the coordinates should fail.
-     */
+        /*
+         * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
+         * and therefore setting the coordinates should fail.
+         */
         || !TEST_false(EC_POINT_set_affine_coordinates(group, P, x, yplusone,
-                                                       ctx))
+            ctx))
         || !TEST_int_eq(EC_GROUP_get_degree(group), 256)
         || !group_order_tests(group)
 
-    /* Curve P-384 (FIPS PUB 186-2, App. 6) */
+        /* Curve P-384 (FIPS PUB 186-2, App. 6) */
 
         || !TEST_true(BN_hex2bn(&p, "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE"
@@ -460,41 +458,41 @@ static int prime_field_tests(void)
                                  "0A60B1CE1D7E819D7A431D7C90EA0E5F"))
         || !TEST_BN_eq(y, z)
         || !TEST_true(BN_add(yplusone, y, BN_value_one()))
-    /*
-     * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
-     * and therefore setting the coordinates should fail.
-     */
+        /*
+         * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
+         * and therefore setting the coordinates should fail.
+         */
         || !TEST_false(EC_POINT_set_affine_coordinates(group, P, x, yplusone,
-                                                       ctx))
+            ctx))
         || !TEST_int_eq(EC_GROUP_get_degree(group), 384)
         || !group_order_tests(group)
 
-    /* Curve P-521 (FIPS PUB 186-2, App. 6) */
-        || !TEST_true(BN_hex2bn(&p,                              "1FF"
+        /* Curve P-521 (FIPS PUB 186-2, App. 6) */
+        || !TEST_true(BN_hex2bn(&p, "1FF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"))
         || !TEST_int_eq(1, BN_check_prime(p, ctx, NULL))
-        || !TEST_true(BN_hex2bn(&a,                              "1FF"
+        || !TEST_true(BN_hex2bn(&a, "1FF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC"))
-        || !TEST_true(BN_hex2bn(&b,                              "051"
+        || !TEST_true(BN_hex2bn(&b, "051"
                                     "953EB9618E1C9A1F929A21A0B68540EE"
                                     "A2DA725B99B315F3B8B489918EF109E1"
                                     "56193951EC7E937B1652C0BD3BB1BF07"
                                     "3573DF883D2C34F1EF451FD46B503F00"))
         || !TEST_true(EC_GROUP_set_curve(group, p, a, b, ctx))
-        || !TEST_true(BN_hex2bn(&x,                               "C6"
+        || !TEST_true(BN_hex2bn(&x, "C6"
                                     "858E06B70404E9CD9E3ECB662395B442"
                                     "9C648139053FB521F828AF606B4D3DBA"
                                     "A14B5E77EFE75928FE1DC127A2FFA8DE"
                                     "3348B3C1856A429BF97E7E31C2E5BD66"))
         || !TEST_true(EC_POINT_set_compressed_coordinates(group, P, x, 0, ctx))
         || !TEST_int_gt(EC_POINT_is_on_curve(group, P, ctx), 0)
-        || !TEST_true(BN_hex2bn(&z,                              "1FF"
+        || !TEST_true(BN_hex2bn(&z, "1FF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
                                     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA"
                                     "51868783BF2F966B7FCC0148F709A5D0"
@@ -507,34 +505,34 @@ static int prime_field_tests(void)
     test_output_bignum("x", x);
     test_output_bignum("y", y);
     /* G_y value taken from the standard: */
-    if (!TEST_true(BN_hex2bn(&z,                              "118"
+    if (!TEST_true(BN_hex2bn(&z, "118"
                                  "39296A789A3BC0045C8A5FB42C7D1BD9"
                                  "98F54449579B446817AFBD17273E662C"
                                  "97EE72995EF42640C550B9013FAD0761"
                                  "353C7086A272C24088BE94769FD16650"))
         || !TEST_BN_eq(y, z)
         || !TEST_true(BN_add(yplusone, y, BN_value_one()))
-    /*
-     * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
-     * and therefore setting the coordinates should fail.
-     */
+        /*
+         * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
+         * and therefore setting the coordinates should fail.
+         */
         || !TEST_false(EC_POINT_set_affine_coordinates(group, P, x, yplusone,
-                                                       ctx))
+            ctx))
         || !TEST_int_eq(EC_GROUP_get_degree(group), 521)
         || !group_order_tests(group)
 
-    /* more tests using the last curve */
+        /* more tests using the last curve */
 
-    /* Restore the point that got mangled in the (x, y + 1) test. */
+        /* Restore the point that got mangled in the (x, y + 1) test. */
         || !TEST_true(EC_POINT_set_affine_coordinates(group, P, x, y, ctx))
         || !TEST_true(EC_POINT_copy(Q, P))
         || !TEST_false(EC_POINT_is_at_infinity(group, Q))
         || !TEST_true(EC_POINT_dbl(group, P, P, ctx))
         || !TEST_int_gt(EC_POINT_is_on_curve(group, P, ctx), 0)
-        || !TEST_true(EC_POINT_invert(group, Q, ctx))       /* P = -2Q */
+        || !TEST_true(EC_POINT_invert(group, Q, ctx)) /* P = -2Q */
         || !TEST_true(EC_POINT_add(group, R, P, Q, ctx))
         || !TEST_true(EC_POINT_add(group, R, R, Q, ctx))
-        || !TEST_true(EC_POINT_is_at_infinity(group, R))    /* R = P + 2Q */
+        || !TEST_true(EC_POINT_is_at_infinity(group, R)) /* R = P + 2Q */
         || !TEST_false(EC_POINT_is_at_infinity(group, Q)))
         goto err;
 
@@ -551,7 +549,7 @@ static int prime_field_tests(void)
         || !TEST_true(BN_rshift1(y, y)))
         goto err;
 
-    scalars[0] = y;         /* (group order + 1)/2, so y*Q + y*Q = Q */
+    scalars[0] = y; /* (group order + 1)/2, so y*Q + y*Q = Q */
     scalars[1] = y;
 
     /* z is still the group order */
@@ -564,7 +562,7 @@ static int prime_field_tests(void)
         goto err;
     BN_set_negative(z, 1);
     scalars[0] = y;
-    scalars[1] = z;         /* z = -(order + y) */
+    scalars[1] = z; /* z = -(order + y) */
 
     if (!TEST_true(EC_POINTs_mul(group, P, NULL, 2, points, scalars, ctx))
         || !TEST_true(EC_POINT_is_at_infinity(group, P))
@@ -574,7 +572,7 @@ static int prime_field_tests(void)
     BN_set_negative(z, 1);
     scalars[0] = x;
     scalars[1] = y;
-    scalars[2] = z;         /* z = -(x+y) */
+    scalars[2] = z; /* z = -(x+y) */
 
     if (!TEST_ptr(scalar3 = BN_new()))
         goto err;
@@ -626,8 +624,7 @@ static struct c2_curve_test {
         "1",
         "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
         "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
-        1, "04000000000000000000020108A2E0CC0D99F8A5EF", "2", 163
-    },
+        1, "04000000000000000000020108A2E0CC0D99F8A5EF", "2", 163 },
     /* Curve B-163 (FIPS PUB 186-2, App. 6) */
     {
         "NIST curve B-163",
@@ -636,8 +633,7 @@ static struct c2_curve_test {
         "020A601907B8C953CA1481EB10512F78744A3205FD",
         "03F0EBA16286A2D57EA0991168D4994637E8343E36",
         "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
-        1, "040000000000000000000292FE77E70C12A4234C33", "2", 163
-    },
+        1, "040000000000000000000292FE77E70C12A4234C33", "2", 163 },
     /* Curve K-233 (FIPS PUB 186-2, App. 6) */
     {
         "NIST curve K-233",
@@ -648,8 +644,7 @@ static struct c2_curve_test {
         "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
         0,
         "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF",
-        "4", 233
-    },
+        "4", 233 },
     /* Curve B-233 (FIPS PUB 186-2, App. 6) */
     {
         "NIST curve B-233",
@@ -660,120 +655,113 @@ static struct c2_curve_test {
         "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
         1,
         "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7",
-        "2", 233
-    },
+        "2", 233 },
     /* Curve K-283 (FIPS PUB 186-2, App. 6) */
     {
         "NIST curve K-283",
-                                                                "08000000"
+        "08000000"
         "00000000000000000000000000000000000000000000000000000000000010A1",
         "0",
         "1",
-                                                                "0503213F"
+        "0503213F"
         "78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836",
-                                                                "01CCDA38"
+        "01CCDA38"
         "0F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259",
         0,
-                                                                "01FFFFFF"
+        "01FFFFFF"
         "FFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61",
-        "4", 283
-    },
+        "4", 283 },
     /* Curve B-283 (FIPS PUB 186-2, App. 6) */
     {
         "NIST curve B-283",
-                                                                "08000000"
+        "08000000"
         "00000000000000000000000000000000000000000000000000000000000010A1",
-                                                                "00000000"
+        "00000000"
         "0000000000000000000000000000000000000000000000000000000000000001",
-                                                                "027B680A"
+        "027B680A"
         "C8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5",
-                                                                "05F93925"
+        "05F93925"
         "8DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053",
-                                                                "03676854"
+        "03676854"
         "FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4",
         1,
-                                                                "03FFFFFF"
+        "03FFFFFF"
         "FFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307",
-        "2", 283
-    },
+        "2", 283 },
     /* Curve K-409 (FIPS PUB 186-2, App. 6) */
     {
         "NIST curve K-409",
-                                "0200000000000000000000000000000000000000"
+        "0200000000000000000000000000000000000000"
         "0000000000000000000000000000000000000000008000000000000000000001",
         "0",
         "1",
-                                "0060F05F658F49C1AD3AB1890F7184210EFD0987"
+        "0060F05F658F49C1AD3AB1890F7184210EFD0987"
         "E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746",
-                                "01E369050B7C4E42ACBA1DACBF04299C3460782F"
+        "01E369050B7C4E42ACBA1DACBF04299C3460782F"
         "918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B",
         1,
-                                "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+        "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
         "FFFFFFFFFFFFFE5F83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF",
-        "4", 409
-    },
+        "4", 409 },
     /* Curve B-409 (FIPS PUB 186-2, App. 6) */
     {
         "NIST curve B-409",
-                                "0200000000000000000000000000000000000000"
+        "0200000000000000000000000000000000000000"
         "0000000000000000000000000000000000000000008000000000000000000001",
-                                "0000000000000000000000000000000000000000"
+        "0000000000000000000000000000000000000000"
         "0000000000000000000000000000000000000000000000000000000000000001",
-                                "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422E"
+        "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422E"
         "F1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F",
-                                "015D4860D088DDB3496B0C6064756260441CDE4A"
+        "015D4860D088DDB3496B0C6064756260441CDE4A"
         "F1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7",
-                                "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5"
+        "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5"
         "A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706",
         1,
-                                "0100000000000000000000000000000000000000"
+        "0100000000000000000000000000000000000000"
         "00000000000001E2AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173",
-        "2", 409
-    },
+        "2", 409 },
     /* Curve K-571 (FIPS PUB 186-2, App. 6) */
     {
         "NIST curve K-571",
-                                                         "800000000000000"
+        "800000000000000"
         "0000000000000000000000000000000000000000000000000000000000000000"
         "0000000000000000000000000000000000000000000000000000000000000425",
         "0",
         "1",
-                                                        "026EB7A859923FBC"
+        "026EB7A859923FBC"
         "82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E6"
         "47DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972",
-                                                        "0349DC807F4FBF37"
+        "0349DC807F4FBF37"
         "4F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA7"
         "4FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3",
         0,
-                                                        "0200000000000000"
+        "0200000000000000"
         "00000000000000000000000000000000000000000000000000000000131850E1"
         "F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001",
-        "4", 571
-    },
+        "4", 571 },
     /* Curve B-571 (FIPS PUB 186-2, App. 6) */
     {
         "NIST curve B-571",
-                                                         "800000000000000"
+        "800000000000000"
         "0000000000000000000000000000000000000000000000000000000000000000"
         "0000000000000000000000000000000000000000000000000000000000000425",
-                                                        "0000000000000000"
+        "0000000000000000"
         "0000000000000000000000000000000000000000000000000000000000000000"
         "0000000000000000000000000000000000000000000000000000000000000001",
-                                                        "02F40E7E2221F295"
+        "02F40E7E2221F295"
         "DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD8EFA5933"
         "2BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A",
-                                                        "0303001D34B85629"
+        "0303001D34B85629"
         "6C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293"
         "CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19",
-                                                        "037BF27342DA639B"
+        "037BF27342DA639B"
         "6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A57"
         "6291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B",
         1,
-                                                        "03FFFFFFFFFFFFFF"
+        "03FFFFFFFFFFFFFF"
         "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE661CE18"
         "FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47",
-        "2", 571
-    }
+        "2", 571 }
 };
 
 static int char2_curve_test(int n)
@@ -784,10 +772,10 @@ static int char2_curve_test(int n)
     BIGNUM *x = NULL, *y = NULL, *z = NULL, *cof = NULL, *yplusone = NULL;
     EC_GROUP *group = NULL;
     EC_POINT *P = NULL, *Q = NULL, *R = NULL;
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     const EC_POINT *points[3];
     const BIGNUM *scalars[3];
-# endif
+#endif
     struct c2_curve_test *const test = char2_curve_tests + n;
 
     if (!TEST_ptr(ctx = BN_CTX_new())
@@ -811,15 +799,15 @@ static int char2_curve_test(int n)
         goto err;
 
 /* Change test based on whether binary point compression is enabled or not. */
-# ifdef OPENSSL_EC_BIN_PT_COMP
+#ifdef OPENSSL_EC_BIN_PT_COMP
     /*
      * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
      * and therefore setting the coordinates should fail.
      */
     if (!TEST_false(EC_POINT_set_affine_coordinates(group, P, x, yplusone, ctx))
         || !TEST_true(EC_POINT_set_compressed_coordinates(group, P, x,
-                                                          test->y_bit,
-                                                          ctx))
+            test->y_bit,
+            ctx))
         || !TEST_int_gt(EC_POINT_is_on_curve(group, P, ctx), 0)
         || !TEST_true(BN_hex2bn(&z, test->order))
         || !TEST_true(BN_hex2bn(&cof, test->cof))
@@ -833,7 +821,7 @@ static int char2_curve_test(int n)
     if (!TEST_true(BN_hex2bn(&z, test->y))
         || !TEST_BN_eq(y, z))
         goto err;
-# else
+#else
     /*
      * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
      * and therefore setting the coordinates should fail.
@@ -848,7 +836,7 @@ static int char2_curve_test(int n)
     TEST_info("%s -- Generator:", test->name);
     test_output_bignum("x", x);
     test_output_bignum("y", y);
-# endif
+#endif
 
     if (!TEST_int_eq(EC_GROUP_get_degree(group), test->degree)
         || !group_order_tests(group))
@@ -861,14 +849,14 @@ static int char2_curve_test(int n)
             || !TEST_false(EC_POINT_is_at_infinity(group, Q))
             || !TEST_true(EC_POINT_dbl(group, P, P, ctx))
             || !TEST_int_gt(EC_POINT_is_on_curve(group, P, ctx), 0)
-            || !TEST_true(EC_POINT_invert(group, Q, ctx))       /* P = -2Q */
+            || !TEST_true(EC_POINT_invert(group, Q, ctx)) /* P = -2Q */
             || !TEST_true(EC_POINT_add(group, R, P, Q, ctx))
             || !TEST_true(EC_POINT_add(group, R, R, Q, ctx))
-            || !TEST_true(EC_POINT_is_at_infinity(group, R))   /* R = P + 2Q */
+            || !TEST_true(EC_POINT_is_at_infinity(group, R)) /* R = P + 2Q */
             || !TEST_false(EC_POINT_is_at_infinity(group, Q)))
             goto err;
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
         TEST_note("combined multiplication ...");
         points[0] = Q;
         points[1] = Q;
@@ -878,7 +866,7 @@ static int char2_curve_test(int n)
             || !TEST_BN_even(y)
             || !TEST_true(BN_rshift1(y, y)))
             goto err;
-        scalars[0] = y;         /* (group order + 1)/2, so y*Q + y*Q = Q */
+        scalars[0] = y; /* (group order + 1)/2, so y*Q + y*Q = Q */
         scalars[1] = y;
 
         /* z is still the group order */
@@ -893,7 +881,7 @@ static int char2_curve_test(int n)
             goto err;
         BN_set_negative(z, 1);
         scalars[0] = y;
-        scalars[1] = z;         /* z = -(order + y) */
+        scalars[1] = z; /* z = -(order + y) */
 
         if (!TEST_true(EC_POINTs_mul(group, P, NULL, 2, points, scalars, ctx))
             || !TEST_true(EC_POINT_is_at_infinity(group, P)))
@@ -905,12 +893,12 @@ static int char2_curve_test(int n)
         BN_set_negative(z, 1);
         scalars[0] = x;
         scalars[1] = y;
-        scalars[2] = z;         /* z = -(x+y) */
+        scalars[2] = z; /* z = -(x+y) */
 
         if (!TEST_true(EC_POINTs_mul(group, P, NULL, 3, points, scalars, ctx))
             || !TEST_true(EC_POINT_is_at_infinity(group, P)))
             goto err;
-# endif
+#endif
     }
 
     r = 1;
@@ -961,7 +949,7 @@ static int char2_field_tests(void)
     test_output_bignum("b", b);
     test_output_bignum("p", p);
 
-     if (!TEST_ptr(P = EC_POINT_new(group))
+    if (!TEST_ptr(P = EC_POINT_new(group))
         || !TEST_ptr(Q = EC_POINT_new(group))
         || !TEST_ptr(R = EC_POINT_new(group))
         || !TEST_true(EC_POINT_set_to_infinity(group, P))
@@ -979,20 +967,20 @@ static int char2_field_tests(void)
         || !TEST_ptr(yplusone = BN_new())
         || !TEST_true(BN_hex2bn(&x, "6"))
 /* Change test based on whether binary point compression is enabled or not. */
-# ifdef OPENSSL_EC_BIN_PT_COMP
+#ifdef OPENSSL_EC_BIN_PT_COMP
         || !TEST_true(EC_POINT_set_compressed_coordinates(group, Q, x, 1, ctx))
-# else
+#else
         || !TEST_true(BN_hex2bn(&y, "8"))
         || !TEST_true(EC_POINT_set_affine_coordinates(group, Q, x, y, ctx))
-# endif
-       )
+#endif
+    )
         goto err;
     if (!TEST_int_gt(EC_POINT_is_on_curve(group, Q, ctx), 0)) {
 /* Change test based on whether binary point compression is enabled or not. */
-# ifdef OPENSSL_EC_BIN_PT_COMP
+#ifdef OPENSSL_EC_BIN_PT_COMP
         if (!TEST_true(EC_POINT_get_affine_coordinates(group, Q, x, y, ctx)))
             goto err;
-# endif
+#endif
         TEST_info("Point is not on curve");
         test_output_bignum("x", x);
         test_output_bignum("y", y);
@@ -1009,7 +997,7 @@ static int char2_field_tests(void)
             TEST_note("     point at infinity");
         else {
             if (!TEST_true(EC_POINT_get_affine_coordinates(group, P, x, y,
-                                                           ctx)))
+                    ctx)))
                 goto err;
 
             test_output_bignum("x", x);
@@ -1019,46 +1007,44 @@ static int char2_field_tests(void)
         if (!TEST_true(EC_POINT_copy(R, P))
             || !TEST_true(EC_POINT_add(group, P, P, Q, ctx)))
             goto err;
-    }
-    while (!EC_POINT_is_at_infinity(group, P));
+    } while (!EC_POINT_is_at_infinity(group, P));
 
     if (!TEST_true(EC_POINT_add(group, P, Q, R, ctx))
         || !TEST_true(EC_POINT_is_at_infinity(group, P)))
         goto err;
 
 /* Change test based on whether binary point compression is enabled or not. */
-# ifdef OPENSSL_EC_BIN_PT_COMP
+#ifdef OPENSSL_EC_BIN_PT_COMP
     len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_COMPRESSED,
-                             buf, sizeof(buf), ctx);
+        buf, sizeof(buf), ctx);
     if (!TEST_size_t_ne(len, 0)
         || !TEST_true(EC_POINT_oct2point(group, P, buf, len, ctx))
         || !TEST_int_eq(0, EC_POINT_cmp(group, P, Q, ctx)))
         goto err;
     test_output_memory("Generator as octet string, compressed form:",
-                       buf, len);
-# endif
+        buf, len);
+#endif
 
     len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_UNCOMPRESSED,
-                             buf, sizeof(buf), ctx);
+        buf, sizeof(buf), ctx);
     if (!TEST_size_t_ne(len, 0)
         || !TEST_true(EC_POINT_oct2point(group, P, buf, len, ctx))
         || !TEST_int_eq(0, EC_POINT_cmp(group, P, Q, ctx)))
         goto err;
     test_output_memory("Generator as octet string, uncompressed form:",
-                       buf, len);
+        buf, len);
 
 /* Change test based on whether binary point compression is enabled or not. */
-# ifdef OPENSSL_EC_BIN_PT_COMP
-    len =
-        EC_POINT_point2oct(group, Q, POINT_CONVERSION_HYBRID, buf, sizeof(buf),
-                           ctx);
+#ifdef OPENSSL_EC_BIN_PT_COMP
+    len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_HYBRID, buf, sizeof(buf),
+        ctx);
     if (!TEST_size_t_ne(len, 0)
         || !TEST_true(EC_POINT_oct2point(group, P, buf, len, ctx))
         || !TEST_int_eq(0, EC_POINT_cmp(group, P, Q, ctx)))
         goto err;
     test_output_memory("Generator as octet string, hybrid form:",
-                       buf, len);
-# endif
+        buf, len);
+#endif
 
     if (!TEST_true(EC_POINT_invert(group, P, ctx))
         || !TEST_int_eq(0, EC_POINT_cmp(group, P, R, ctx)))
@@ -1098,19 +1084,9 @@ static int hybrid_point_encoding_test(void)
         || !TEST_ptr(group = EC_GROUP_new_by_curve_name(NID_sect571k1))
         || !TEST_ptr(point = EC_POINT_new(group))
         || !TEST_true(EC_POINT_set_affine_coordinates(group, point, x, y, NULL))
-        || !TEST_size_t_ne(0, (len = EC_POINT_point2oct(group,
-                                                        point,
-                                                        POINT_CONVERSION_HYBRID,
-                                                        NULL,
-                                                        0,
-                                                        NULL)))
+        || !TEST_size_t_ne(0, (len = EC_POINT_point2oct(group, point, POINT_CONVERSION_HYBRID, NULL, 0, NULL)))
         || !TEST_ptr(buf = OPENSSL_malloc(len))
-        || !TEST_size_t_eq(len, EC_POINT_point2oct(group,
-                                                   point,
-                                                   POINT_CONVERSION_HYBRID,
-                                                   buf,
-                                                   len,
-                                                   NULL)))
+        || !TEST_size_t_eq(len, EC_POINT_point2oct(group, point, POINT_CONVERSION_HYBRID, buf, len, NULL)))
         goto err;
 
     r = 1;
@@ -1141,7 +1117,7 @@ static int internal_curve_test(int n)
 
     if (!TEST_ptr(group = EC_GROUP_new_by_curve_name(nid))) {
         TEST_info("EC_GROUP_new_curve_name() failed with curve %s\n",
-                  OBJ_nid2sn(nid));
+            OBJ_nid2sn(nid));
         return 0;
     }
     if (!TEST_true(EC_GROUP_check(group, NULL))) {
@@ -1176,26 +1152,25 @@ static int group_field_test(void)
     EC_GROUP *sect163r2_group = NULL;
 
     BN_hex2bn(&secp521r1_field,
-                "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
-                "FFFF");
-
+        "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+        "FFFF");
 
     BN_hex2bn(&sect163r2_field,
-                "08000000000000000000000000000000"
-                "00000000C9");
+        "08000000000000000000000000000000"
+        "00000000C9");
 
     secp521r1_group = EC_GROUP_new_by_curve_name(NID_secp521r1);
     if (BN_cmp(secp521r1_field, EC_GROUP_get0_field(secp521r1_group)))
-      r = 0;
+        r = 0;
 
-    # ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
     sect163r2_group = EC_GROUP_new_by_curve_name(NID_sect163r2);
     if (BN_cmp(sect163r2_field, EC_GROUP_get0_field(sect163r2_group)))
-      r = 0;
-    # endif
+        r = 0;
+#endif
 
     EC_GROUP_free(secp521r1_group);
     EC_GROUP_free(sect163r2_group);
@@ -1221,92 +1196,92 @@ struct nistp_test_params {
 
 static const struct nistp_test_params nistp_tests_params[] = {
     {
-     /* P-224 */
-     NID_secp224r1,
-     224,
-     /* p */
-     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
-     /* a */
-     "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
-     /* b */
-     "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
-     /* Qx */
-     "E84FB0B8E7000CB657D7973CF6B42ED78B301674276DF744AF130B3E",
-     /* Qy */
-     "4376675C6FC5612C21A0FF2D2A89D2987DF7A2BC52183B5982298555",
-     /* Gx */
-     "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
-     /* Gy */
-     "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
-     /* order */
-     "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
-     /* d */
-     "3F0C488E987C80BE0FEE521F8D90BE6034EC69AE11CA72AA777481E8",
-     },
+        /* P-224 */
+        NID_secp224r1,
+        224,
+        /* p */
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
+        /* a */
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
+        /* b */
+        "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
+        /* Qx */
+        "E84FB0B8E7000CB657D7973CF6B42ED78B301674276DF744AF130B3E",
+        /* Qy */
+        "4376675C6FC5612C21A0FF2D2A89D2987DF7A2BC52183B5982298555",
+        /* Gx */
+        "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
+        /* Gy */
+        "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
+        /* order */
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
+        /* d */
+        "3F0C488E987C80BE0FEE521F8D90BE6034EC69AE11CA72AA777481E8",
+    },
     {
-     /* P-256 */
-     NID_X9_62_prime256v1,
-     256,
-     /* p */
-     "ffffffff00000001000000000000000000000000ffffffffffffffffffffffff",
-     /* a */
-     "ffffffff00000001000000000000000000000000fffffffffffffffffffffffc",
-     /* b */
-     "5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b",
-     /* Qx */
-     "b7e08afdfe94bad3f1dc8c734798ba1c62b3a0ad1e9ea2a38201cd0889bc7a19",
-     /* Qy */
-     "3603f747959dbf7a4bb226e41928729063adc7ae43529e61b563bbc606cc5e09",
-     /* Gx */
-     "6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296",
-     /* Gy */
-     "4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5",
-     /* order */
-     "ffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551",
-     /* d */
-     "c477f9f65c22cce20657faa5b2d1d8122336f851a508a1ed04e479c34985bf96",
-     },
+        /* P-256 */
+        NID_X9_62_prime256v1,
+        256,
+        /* p */
+        "ffffffff00000001000000000000000000000000ffffffffffffffffffffffff",
+        /* a */
+        "ffffffff00000001000000000000000000000000fffffffffffffffffffffffc",
+        /* b */
+        "5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b",
+        /* Qx */
+        "b7e08afdfe94bad3f1dc8c734798ba1c62b3a0ad1e9ea2a38201cd0889bc7a19",
+        /* Qy */
+        "3603f747959dbf7a4bb226e41928729063adc7ae43529e61b563bbc606cc5e09",
+        /* Gx */
+        "6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296",
+        /* Gy */
+        "4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5",
+        /* order */
+        "ffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551",
+        /* d */
+        "c477f9f65c22cce20657faa5b2d1d8122336f851a508a1ed04e479c34985bf96",
+    },
     {
-     /* P-521 */
-     NID_secp521r1,
-     521,
-     /* p */
-                                                                  "1ff"
-     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-     /* a */
-                                                                  "1ff"
-     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-     "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc",
-     /* b */
-                                                                  "051"
-     "953eb9618e1c9a1f929a21a0b68540eea2da725b99b315f3b8b489918ef109e1"
-     "56193951ec7e937b1652c0bd3bb1bf073573df883d2c34f1ef451fd46b503f00",
-     /* Qx */
-                                                                 "0098"
-     "e91eef9a68452822309c52fab453f5f117c1da8ed796b255e9ab8f6410cca16e"
-     "59df403a6bdc6ca467a37056b1e54b3005d8ac030decfeb68df18b171885d5c4",
-     /* Qy */
-                                                                 "0164"
-     "350c321aecfc1cca1ba4364c9b15656150b4b78d6a48d7d28e7f31985ef17be8"
-     "554376b72900712c4b83ad668327231526e313f5f092999a4632fd50d946bc2e",
-     /* Gx */
-                                                                   "c6"
-     "858e06b70404e9cd9e3ecb662395b4429c648139053fb521f828af606b4d3dba"
-     "a14b5e77efe75928fe1dc127a2ffa8de3348b3c1856a429bf97e7e31c2e5bd66",
-     /* Gy */
-                                                                  "118"
-     "39296a789a3bc0045c8a5fb42c7d1bd998f54449579b446817afbd17273e662c"
-     "97ee72995ef42640c550b9013fad0761353c7086a272c24088be94769fd16650",
-     /* order */
-                                                                  "1ff"
-     "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa"
-     "51868783bf2f966b7fcc0148f709a5d03bb5c9b8899c47aebb6fb71e91386409",
-     /* d */
-                                                                 "0100"
-     "085f47b8e1b8b11b7eb33028c0b2888e304bfc98501955b45bba1478dc184eee"
-     "df09b86a5f7c21994406072787205e69a63709fe35aa93ba333514b24f961722",
-     },
+        /* P-521 */
+        NID_secp521r1,
+        521,
+        /* p */
+        "1ff"
+        "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        /* a */
+        "1ff"
+        "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc",
+        /* b */
+        "051"
+        "953eb9618e1c9a1f929a21a0b68540eea2da725b99b315f3b8b489918ef109e1"
+        "56193951ec7e937b1652c0bd3bb1bf073573df883d2c34f1ef451fd46b503f00",
+        /* Qx */
+        "0098"
+        "e91eef9a68452822309c52fab453f5f117c1da8ed796b255e9ab8f6410cca16e"
+        "59df403a6bdc6ca467a37056b1e54b3005d8ac030decfeb68df18b171885d5c4",
+        /* Qy */
+        "0164"
+        "350c321aecfc1cca1ba4364c9b15656150b4b78d6a48d7d28e7f31985ef17be8"
+        "554376b72900712c4b83ad668327231526e313f5f092999a4632fd50d946bc2e",
+        /* Gx */
+        "c6"
+        "858e06b70404e9cd9e3ecb662395b4429c648139053fb521f828af606b4d3dba"
+        "a14b5e77efe75928fe1dc127a2ffa8de3348b3c1856a429bf97e7e31c2e5bd66",
+        /* Gy */
+        "118"
+        "39296a789a3bc0045c8a5fb42c7d1bd998f54449579b446817afbd17273e662c"
+        "97ee72995ef42640c550b9013fad0761353c7086a272c24088be94769fd16650",
+        /* order */
+        "1ff"
+        "fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa"
+        "51868783bf2f966b7fcc0148f709a5d03bb5c9b8899c47aebb6fb71e91386409",
+        /* d */
+        "0100"
+        "085f47b8e1b8b11b7eb33028c0b2888e304bfc98501955b45bba1478dc184eee"
+        "df09b86a5f7c21994406072787205e69a63709fe35aa93ba333514b24f961722",
+    },
 };
 
 static int nistp_single_test(int idx)
@@ -1320,7 +1295,7 @@ static int nistp_single_test(int idx)
     int r = 0;
 
     TEST_note("NIST curve P-%d (optimised implementation):",
-              test->degree);
+        test->degree);
     if (!TEST_ptr(ctx = BN_CTX_new())
         || !TEST_ptr(p = BN_new())
         || !TEST_ptr(a = BN_new())
@@ -1345,14 +1320,14 @@ static int nistp_single_test(int idx)
         || !TEST_true(BN_hex2bn(&x, test->Qx))
         || !TEST_true(BN_hex2bn(&y, test->Qy))
         || !TEST_true(BN_add(yplusone, y, BN_value_one()))
-    /*
-     * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
-     * and therefore setting the coordinates should fail.
-     */
+        /*
+         * When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
+         * and therefore setting the coordinates should fail.
+         */
         || !TEST_false(EC_POINT_set_affine_coordinates(NISTP, Q_CHECK, x,
-                                                       yplusone, ctx))
+            yplusone, ctx))
         || !TEST_true(EC_POINT_set_affine_coordinates(NISTP, Q_CHECK, x, y,
-                                                      ctx))
+            ctx))
         || !TEST_true(BN_hex2bn(&x, test->Gx))
         || !TEST_true(BN_hex2bn(&y, test->Gy))
         || !TEST_true(EC_POINT_set_affine_coordinates(NISTP, G, x, y, ctx))
@@ -1393,7 +1368,7 @@ static int nistp_single_test(int idx)
         /* now repeat all tests with precomputation */
         || !TEST_true(EC_GROUP_precompute_mult(NISTP, ctx))
 #endif
-        )
+    )
         goto err;
 
     /* fixed point multiplication */
@@ -1404,7 +1379,7 @@ static int nistp_single_test(int idx)
     EC_POINT_mul(NISTP, Q, NULL, P, m, ctx);
     if (!TEST_int_eq(0, EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx))
 
-    /* reset generator */
+        /* reset generator */
         || !TEST_true(EC_GROUP_set_generator(NISTP, G, order, BN_value_one())))
         goto err;
     /* fixed point multiplication */
@@ -1423,7 +1398,7 @@ static int nistp_single_test(int idx)
         || !TEST_true(EC_POINT_invert(NISTP, P, ctx))
         || !TEST_true(EC_POINT_mul(NISTP, Q, m, P, n, ctx))
         || !TEST_int_eq(0, EC_POINT_cmp(NISTP, Q, G, ctx)))
-      goto err;
+        goto err;
 
     r = 1;
 err:
@@ -1446,48 +1421,471 @@ static int nistp_single_test(int idx)
 }
 
 static const unsigned char p521_named[] = {
-    0x06, 0x05, 0x2b, 0x81, 0x04, 0x00, 0x23,
+    0x06,
+    0x05,
+    0x2b,
+    0x81,
+    0x04,
+    0x00,
+    0x23,
 };
 
 static const unsigned char p521_explicit[] = {
-    0x30, 0x82, 0x01, 0xc3, 0x02, 0x01, 0x01, 0x30, 0x4d, 0x06, 0x07, 0x2a,
-    0x86, 0x48, 0xce, 0x3d, 0x01, 0x01, 0x02, 0x42, 0x01, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0x30, 0x81, 0x9f, 0x04, 0x42, 0x01, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xfc, 0x04, 0x42, 0x00, 0x51, 0x95, 0x3e, 0xb9, 0x61, 0x8e, 0x1c, 0x9a,
-    0x1f, 0x92, 0x9a, 0x21, 0xa0, 0xb6, 0x85, 0x40, 0xee, 0xa2, 0xda, 0x72,
-    0x5b, 0x99, 0xb3, 0x15, 0xf3, 0xb8, 0xb4, 0x89, 0x91, 0x8e, 0xf1, 0x09,
-    0xe1, 0x56, 0x19, 0x39, 0x51, 0xec, 0x7e, 0x93, 0x7b, 0x16, 0x52, 0xc0,
-    0xbd, 0x3b, 0xb1, 0xbf, 0x07, 0x35, 0x73, 0xdf, 0x88, 0x3d, 0x2c, 0x34,
-    0xf1, 0xef, 0x45, 0x1f, 0xd4, 0x6b, 0x50, 0x3f, 0x00, 0x03, 0x15, 0x00,
-    0xd0, 0x9e, 0x88, 0x00, 0x29, 0x1c, 0xb8, 0x53, 0x96, 0xcc, 0x67, 0x17,
-    0x39, 0x32, 0x84, 0xaa, 0xa0, 0xda, 0x64, 0xba, 0x04, 0x81, 0x85, 0x04,
-    0x00, 0xc6, 0x85, 0x8e, 0x06, 0xb7, 0x04, 0x04, 0xe9, 0xcd, 0x9e, 0x3e,
-    0xcb, 0x66, 0x23, 0x95, 0xb4, 0x42, 0x9c, 0x64, 0x81, 0x39, 0x05, 0x3f,
-    0xb5, 0x21, 0xf8, 0x28, 0xaf, 0x60, 0x6b, 0x4d, 0x3d, 0xba, 0xa1, 0x4b,
-    0x5e, 0x77, 0xef, 0xe7, 0x59, 0x28, 0xfe, 0x1d, 0xc1, 0x27, 0xa2, 0xff,
-    0xa8, 0xde, 0x33, 0x48, 0xb3, 0xc1, 0x85, 0x6a, 0x42, 0x9b, 0xf9, 0x7e,
-    0x7e, 0x31, 0xc2, 0xe5, 0xbd, 0x66, 0x01, 0x18, 0x39, 0x29, 0x6a, 0x78,
-    0x9a, 0x3b, 0xc0, 0x04, 0x5c, 0x8a, 0x5f, 0xb4, 0x2c, 0x7d, 0x1b, 0xd9,
-    0x98, 0xf5, 0x44, 0x49, 0x57, 0x9b, 0x44, 0x68, 0x17, 0xaf, 0xbd, 0x17,
-    0x27, 0x3e, 0x66, 0x2c, 0x97, 0xee, 0x72, 0x99, 0x5e, 0xf4, 0x26, 0x40,
-    0xc5, 0x50, 0xb9, 0x01, 0x3f, 0xad, 0x07, 0x61, 0x35, 0x3c, 0x70, 0x86,
-    0xa2, 0x72, 0xc2, 0x40, 0x88, 0xbe, 0x94, 0x76, 0x9f, 0xd1, 0x66, 0x50,
-    0x02, 0x42, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa,
-    0x51, 0x86, 0x87, 0x83, 0xbf, 0x2f, 0x96, 0x6b, 0x7f, 0xcc, 0x01, 0x48,
-    0xf7, 0x09, 0xa5, 0xd0, 0x3b, 0xb5, 0xc9, 0xb8, 0x89, 0x9c, 0x47, 0xae,
-    0xbb, 0x6f, 0xb7, 0x1e, 0x91, 0x38, 0x64, 0x09, 0x02, 0x01, 0x01,
+    0x30,
+    0x82,
+    0x01,
+    0xc3,
+    0x02,
+    0x01,
+    0x01,
+    0x30,
+    0x4d,
+    0x06,
+    0x07,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x01,
+    0x01,
+    0x02,
+    0x42,
+    0x01,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0x30,
+    0x81,
+    0x9f,
+    0x04,
+    0x42,
+    0x01,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xfc,
+    0x04,
+    0x42,
+    0x00,
+    0x51,
+    0x95,
+    0x3e,
+    0xb9,
+    0x61,
+    0x8e,
+    0x1c,
+    0x9a,
+    0x1f,
+    0x92,
+    0x9a,
+    0x21,
+    0xa0,
+    0xb6,
+    0x85,
+    0x40,
+    0xee,
+    0xa2,
+    0xda,
+    0x72,
+    0x5b,
+    0x99,
+    0xb3,
+    0x15,
+    0xf3,
+    0xb8,
+    0xb4,
+    0x89,
+    0x91,
+    0x8e,
+    0xf1,
+    0x09,
+    0xe1,
+    0x56,
+    0x19,
+    0x39,
+    0x51,
+    0xec,
+    0x7e,
+    0x93,
+    0x7b,
+    0x16,
+    0x52,
+    0xc0,
+    0xbd,
+    0x3b,
+    0xb1,
+    0xbf,
+    0x07,
+    0x35,
+    0x73,
+    0xdf,
+    0x88,
+    0x3d,
+    0x2c,
+    0x34,
+    0xf1,
+    0xef,
+    0x45,
+    0x1f,
+    0xd4,
+    0x6b,
+    0x50,
+    0x3f,
+    0x00,
+    0x03,
+    0x15,
+    0x00,
+    0xd0,
+    0x9e,
+    0x88,
+    0x00,
+    0x29,
+    0x1c,
+    0xb8,
+    0x53,
+    0x96,
+    0xcc,
+    0x67,
+    0x17,
+    0x39,
+    0x32,
+    0x84,
+    0xaa,
+    0xa0,
+    0xda,
+    0x64,
+    0xba,
+    0x04,
+    0x81,
+    0x85,
+    0x04,
+    0x00,
+    0xc6,
+    0x85,
+    0x8e,
+    0x06,
+    0xb7,
+    0x04,
+    0x04,
+    0xe9,
+    0xcd,
+    0x9e,
+    0x3e,
+    0xcb,
+    0x66,
+    0x23,
+    0x95,
+    0xb4,
+    0x42,
+    0x9c,
+    0x64,
+    0x81,
+    0x39,
+    0x05,
+    0x3f,
+    0xb5,
+    0x21,
+    0xf8,
+    0x28,
+    0xaf,
+    0x60,
+    0x6b,
+    0x4d,
+    0x3d,
+    0xba,
+    0xa1,
+    0x4b,
+    0x5e,
+    0x77,
+    0xef,
+    0xe7,
+    0x59,
+    0x28,
+    0xfe,
+    0x1d,
+    0xc1,
+    0x27,
+    0xa2,
+    0xff,
+    0xa8,
+    0xde,
+    0x33,
+    0x48,
+    0xb3,
+    0xc1,
+    0x85,
+    0x6a,
+    0x42,
+    0x9b,
+    0xf9,
+    0x7e,
+    0x7e,
+    0x31,
+    0xc2,
+    0xe5,
+    0xbd,
+    0x66,
+    0x01,
+    0x18,
+    0x39,
+    0x29,
+    0x6a,
+    0x78,
+    0x9a,
+    0x3b,
+    0xc0,
+    0x04,
+    0x5c,
+    0x8a,
+    0x5f,
+    0xb4,
+    0x2c,
+    0x7d,
+    0x1b,
+    0xd9,
+    0x98,
+    0xf5,
+    0x44,
+    0x49,
+    0x57,
+    0x9b,
+    0x44,
+    0x68,
+    0x17,
+    0xaf,
+    0xbd,
+    0x17,
+    0x27,
+    0x3e,
+    0x66,
+    0x2c,
+    0x97,
+    0xee,
+    0x72,
+    0x99,
+    0x5e,
+    0xf4,
+    0x26,
+    0x40,
+    0xc5,
+    0x50,
+    0xb9,
+    0x01,
+    0x3f,
+    0xad,
+    0x07,
+    0x61,
+    0x35,
+    0x3c,
+    0x70,
+    0x86,
+    0xa2,
+    0x72,
+    0xc2,
+    0x40,
+    0x88,
+    0xbe,
+    0x94,
+    0x76,
+    0x9f,
+    0xd1,
+    0x66,
+    0x50,
+    0x02,
+    0x42,
+    0x01,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xff,
+    0xfa,
+    0x51,
+    0x86,
+    0x87,
+    0x83,
+    0xbf,
+    0x2f,
+    0x96,
+    0x6b,
+    0x7f,
+    0xcc,
+    0x01,
+    0x48,
+    0xf7,
+    0x09,
+    0xa5,
+    0xd0,
+    0x3b,
+    0xb5,
+    0xc9,
+    0xb8,
+    0x89,
+    0x9c,
+    0x47,
+    0xae,
+    0xbb,
+    0x6f,
+    0xb7,
+    0x1e,
+    0x91,
+    0x38,
+    0x64,
+    0x09,
+    0x02,
+    0x01,
+    0x01,
 };
 
 /*
@@ -1551,9 +1949,7 @@ static int check_named_curve_test(int id)
          * nist prime. So only select one of these as an alternate prime.
          */
         if (!TEST_ptr(BN_copy(other_p,
-                              BN_ucmp(BN_get0_nist_prime_192(), other_p) == 0 ?
-                                      BN_get0_nist_prime_256() :
-                                      BN_get0_nist_prime_192())))
+                BN_ucmp(BN_get0_nist_prime_192(), other_p) == 0 ? BN_get0_nist_prime_256() : BN_get0_nist_prime_192())))
             goto err;
     }
 
@@ -1561,7 +1957,7 @@ static int check_named_curve_test(int id)
     if (!TEST_int_eq(EC_GROUP_check_named_curve(group, 0, NULL), nid)
         /* Only NIST curves pass */
         || !TEST_int_eq(EC_GROUP_check_named_curve(group, 1, NULL),
-                        EC_curve_nid2nist(nid) != NULL ? nid : NID_undef))
+            EC_curve_nid2nist(nid) != NULL ? nid : NID_undef))
         goto err;
 
     /* Fail if the curve name doesn't match the parameters */
@@ -1577,7 +1973,7 @@ static int check_named_curve_test(int id)
         goto err;
 
     if (!TEST_int_eq(EC_GROUP_set_seed(group, invalid_seed, invalid_seed_len),
-                     invalid_seed_len))
+            invalid_seed_len))
         goto err;
 
     if (has_seed) {
@@ -1606,24 +2002,24 @@ static int check_named_curve_test(int id)
 
     /* check that changing any generator parameter fails */
     if (!TEST_true(EC_GROUP_set_generator(gtest, other_gen, group_order,
-                                          group_cofactor))
+            group_cofactor))
         || !TEST_int_eq(EC_GROUP_check_named_curve(gtest, 0, NULL), 0)
         || !TEST_true(EC_GROUP_set_generator(gtest, group_gen, other_order,
-                                             group_cofactor))
+            group_cofactor))
         || !TEST_int_eq(EC_GROUP_check_named_curve(gtest, 0, NULL), 0)
         /* The order is not an optional field, so this should fail */
         || !TEST_false(EC_GROUP_set_generator(gtest, group_gen, NULL,
-                                              group_cofactor))
+            group_cofactor))
         || !TEST_true(EC_GROUP_set_generator(gtest, group_gen, group_order,
-                                             other_cofactor))
+            other_cofactor))
         || !TEST_int_eq(EC_GROUP_check_named_curve(gtest, 0, NULL), 0)
         /* Check that if the cofactor is not set then it still passes */
         || !TEST_true(EC_GROUP_set_generator(gtest, group_gen, group_order,
-                                             NULL))
+            NULL))
         || !TEST_int_eq(EC_GROUP_check_named_curve(gtest, 0, NULL), nid)
         /* check that restoring the generator passes */
         || !TEST_true(EC_GROUP_set_generator(gtest, group_gen, group_order,
-                                             group_cofactor))
+            group_cofactor))
         || !TEST_int_eq(EC_GROUP_check_named_curve(gtest, 0, NULL), nid))
         goto err;
 
@@ -1694,7 +2090,7 @@ static int check_named_curve_test(int id)
 static int check_named_curve_lookup_test(int id)
 {
     int ret = 0, nid, rv = 0;
-    EC_GROUP *g = NULL , *ga = NULL;
+    EC_GROUP *g = NULL, *ga = NULL;
     ECPARAMETERS *p = NULL, *pa = NULL;
     BN_CTX *ctx = NULL;
 
@@ -1723,19 +2119,19 @@ static int check_named_curve_lookup_test(int id)
          * EC_METHODs.
          */
         if (!TEST_ptr(ga = EC_GROUP_new_by_curve_name(rv))
-                || !TEST_ptr(pa = EC_GROUP_get_ecparameters(ga, NULL)))
+            || !TEST_ptr(pa = EC_GROUP_get_ecparameters(ga, NULL)))
             goto err;
 
         /* replace with group from explicit parameters, then compare */
         EC_GROUP_free(ga);
         if (!TEST_ptr(ga = EC_GROUP_new_from_ecparameters(pa))
-                || !TEST_int_eq(EC_GROUP_cmp(g, ga, ctx), 0))
+            || !TEST_int_eq(EC_GROUP_cmp(g, ga, ctx), 0))
             goto err;
     }
 
     ret = 1;
 
- err:
+err:
     EC_GROUP_free(g);
     EC_GROUP_free(ga);
     ECPARAMETERS_free(p);
@@ -1752,59 +2148,58 @@ static int check_named_curve_lookup_test(int id)
  * This function returns TRUE (1) if the checked nids are identical, or if they
  * alias to the same curve. FALSE (0) otherwise.
  */
-static ossl_inline
-int are_ec_nids_compatible(int n1d, int n2d)
+static ossl_inline int are_ec_nids_compatible(int n1d, int n2d)
 {
     int ret = 0;
     switch (n1d) {
 #ifndef OPENSSL_NO_EC2M
-        case NID_sect113r1:
-        case NID_wap_wsg_idm_ecid_wtls4:
-            ret = (n2d == NID_sect113r1 || n2d == NID_wap_wsg_idm_ecid_wtls4);
-            break;
-        case NID_sect163k1:
-        case NID_wap_wsg_idm_ecid_wtls3:
-            ret = (n2d == NID_sect163k1 || n2d == NID_wap_wsg_idm_ecid_wtls3);
-            break;
-        case NID_sect233k1:
-        case NID_wap_wsg_idm_ecid_wtls10:
-            ret = (n2d == NID_sect233k1 || n2d == NID_wap_wsg_idm_ecid_wtls10);
-            break;
-        case NID_sect233r1:
-        case NID_wap_wsg_idm_ecid_wtls11:
-            ret = (n2d == NID_sect233r1 || n2d == NID_wap_wsg_idm_ecid_wtls11);
-            break;
-        case NID_X9_62_c2pnb163v1:
-        case NID_wap_wsg_idm_ecid_wtls5:
-            ret = (n2d == NID_X9_62_c2pnb163v1
-                   || n2d == NID_wap_wsg_idm_ecid_wtls5);
-            break;
+    case NID_sect113r1:
+    case NID_wap_wsg_idm_ecid_wtls4:
+        ret = (n2d == NID_sect113r1 || n2d == NID_wap_wsg_idm_ecid_wtls4);
+        break;
+    case NID_sect163k1:
+    case NID_wap_wsg_idm_ecid_wtls3:
+        ret = (n2d == NID_sect163k1 || n2d == NID_wap_wsg_idm_ecid_wtls3);
+        break;
+    case NID_sect233k1:
+    case NID_wap_wsg_idm_ecid_wtls10:
+        ret = (n2d == NID_sect233k1 || n2d == NID_wap_wsg_idm_ecid_wtls10);
+        break;
+    case NID_sect233r1:
+    case NID_wap_wsg_idm_ecid_wtls11:
+        ret = (n2d == NID_sect233r1 || n2d == NID_wap_wsg_idm_ecid_wtls11);
+        break;
+    case NID_X9_62_c2pnb163v1:
+    case NID_wap_wsg_idm_ecid_wtls5:
+        ret = (n2d == NID_X9_62_c2pnb163v1
+            || n2d == NID_wap_wsg_idm_ecid_wtls5);
+        break;
 #endif /* OPENSSL_NO_EC2M */
-        case NID_secp112r1:
-        case NID_wap_wsg_idm_ecid_wtls6:
-            ret = (n2d == NID_secp112r1 || n2d == NID_wap_wsg_idm_ecid_wtls6);
-            break;
-        case NID_secp160r2:
-        case NID_wap_wsg_idm_ecid_wtls7:
-            ret = (n2d == NID_secp160r2 || n2d == NID_wap_wsg_idm_ecid_wtls7);
-            break;
+    case NID_secp112r1:
+    case NID_wap_wsg_idm_ecid_wtls6:
+        ret = (n2d == NID_secp112r1 || n2d == NID_wap_wsg_idm_ecid_wtls6);
+        break;
+    case NID_secp160r2:
+    case NID_wap_wsg_idm_ecid_wtls7:
+        ret = (n2d == NID_secp160r2 || n2d == NID_wap_wsg_idm_ecid_wtls7);
+        break;
 #ifdef OPENSSL_NO_EC_NISTP_64_GCC_128
-        case NID_secp224r1:
-        case NID_wap_wsg_idm_ecid_wtls12:
-            ret = (n2d == NID_secp224r1 || n2d == NID_wap_wsg_idm_ecid_wtls12);
-            break;
+    case NID_secp224r1:
+    case NID_wap_wsg_idm_ecid_wtls12:
+        ret = (n2d == NID_secp224r1 || n2d == NID_wap_wsg_idm_ecid_wtls12);
+        break;
 #else
-        /*
-         * For SEC P-224 we want to ensure that the SECP nid is returned, as
-         * that is associated with a specialized method.
-         */
-        case NID_wap_wsg_idm_ecid_wtls12:
-            ret = (n2d == NID_secp224r1);
-            break;
+    /*
+     * For SEC P-224 we want to ensure that the SECP nid is returned, as
+     * that is associated with a specialized method.
+     */
+    case NID_wap_wsg_idm_ecid_wtls12:
+        ret = (n2d == NID_secp224r1);
+        break;
 #endif /* def(OPENSSL_NO_EC_NISTP_64_GCC_128) */
 
-        default:
-            ret = (n1d == n2d);
+    default:
+        ret = (n1d == n2d);
     }
     return ret;
 }
@@ -1832,9 +2227,9 @@ static int check_named_curve_from_ecparameters(int id)
     static const unsigned char invalid_seed[] = "THIS IS NOT A VALID SEED";
     static size_t invalid_seed_len = sizeof(invalid_seed);
     ECPARAMETERS *params = NULL, *other_params = NULL;
-    EC_GROUP *g_ary[8] = {NULL};
+    EC_GROUP *g_ary[8] = { NULL };
     EC_GROUP **g_next = &g_ary[0];
-    ECPARAMETERS *p_ary[8] = {NULL};
+    ECPARAMETERS *p_ary[8] = { NULL };
     ECPARAMETERS **p_next = &p_ary[0];
 
     /* Do some setup */
@@ -1861,7 +2256,7 @@ static int check_named_curve_from_ecparameters(int id)
         || !TEST_ptr(other_gen = EC_POINT_dup(group_gen, group))
         || !TEST_true(EC_POINT_add(group, other_gen, group_gen, group_gen, NULL))
         || !TEST_true(EC_POINT_get_affine_coordinates(group, other_gen,
-                      other_gen_x, other_gen_y, bn_ctx))
+            other_gen_x, other_gen_y, bn_ctx))
         || !TEST_true(BN_copy(other_order, group_order))
         || !TEST_true(BN_add_word(other_order, 1))
         || !TEST_true(BN_copy(other_cofactor, group_cofactor))
@@ -1873,8 +2268,8 @@ static int check_named_curve_from_ecparameters(int id)
 
     if (!TEST_ptr(other_gen = EC_POINT_new(tmpg))
         || !TEST_true(EC_POINT_set_affine_coordinates(tmpg, other_gen,
-                                                      other_gen_x, other_gen_y,
-                                                      bn_ctx)))
+            other_gen_x, other_gen_y,
+            bn_ctx)))
         goto err;
 
     /*
@@ -1907,15 +2302,13 @@ static int check_named_curve_from_ecparameters(int id)
      * group.
      */
     if (!TEST_int_eq(EC_GROUP_set_seed(tmpg, invalid_seed, invalid_seed_len),
-                     invalid_seed_len)
-            || !TEST_ptr(other_params = *p_next++ =
-                         EC_GROUP_get_ecparameters(tmpg, NULL))
-            || !TEST_ptr(tgroup = *g_next++ =
-                          EC_GROUP_new_from_ecparameters(other_params))
-            || !TEST_int_ne((tnid = EC_GROUP_get_curve_name(tgroup)), NID_undef)
-            || !TEST_true(are_ec_nids_compatible(nid, tnid))
-            || !TEST_int_eq(EC_GROUP_get_asn1_flag(tgroup),
-                            OPENSSL_EC_EXPLICIT_CURVE)) {
+            invalid_seed_len)
+        || !TEST_ptr(other_params = *p_next++ = EC_GROUP_get_ecparameters(tmpg, NULL))
+        || !TEST_ptr(tgroup = *g_next++ = EC_GROUP_new_from_ecparameters(other_params))
+        || !TEST_int_ne((tnid = EC_GROUP_get_curve_name(tgroup)), NID_undef)
+        || !TEST_true(are_ec_nids_compatible(nid, tnid))
+        || !TEST_int_eq(EC_GROUP_get_asn1_flag(tgroup),
+            OPENSSL_EC_EXPLICIT_CURVE)) {
         TEST_info("nid = %s, tnid = %s", OBJ_nid2sn(nid), OBJ_nid2sn(tnid));
         goto err;
     }
@@ -1925,14 +2318,12 @@ static int check_named_curve_from_ecparameters(int id)
      * expect a "named" group.
      */
     if (!TEST_int_eq(EC_GROUP_set_seed(tmpg, NULL, 0), 1)
-            || !TEST_ptr(other_params = *p_next++ =
-                         EC_GROUP_get_ecparameters(tmpg, NULL))
-            || !TEST_ptr(tgroup = *g_next++ =
-                          EC_GROUP_new_from_ecparameters(other_params))
-            || !TEST_int_ne((tnid = EC_GROUP_get_curve_name(tgroup)), NID_undef)
-            || !TEST_true(are_ec_nids_compatible(nid, tnid))
-            || !TEST_int_eq(EC_GROUP_get_asn1_flag(tgroup),
-                            OPENSSL_EC_EXPLICIT_CURVE)) {
+        || !TEST_ptr(other_params = *p_next++ = EC_GROUP_get_ecparameters(tmpg, NULL))
+        || !TEST_ptr(tgroup = *g_next++ = EC_GROUP_new_from_ecparameters(other_params))
+        || !TEST_int_ne((tnid = EC_GROUP_get_curve_name(tgroup)), NID_undef)
+        || !TEST_true(are_ec_nids_compatible(nid, tnid))
+        || !TEST_int_eq(EC_GROUP_get_asn1_flag(tgroup),
+            OPENSSL_EC_EXPLICIT_CURVE)) {
         TEST_info("nid = %s, tnid = %s", OBJ_nid2sn(nid), OBJ_nid2sn(tnid));
         goto err;
     }
@@ -1943,56 +2334,46 @@ static int check_named_curve_from_ecparameters(int id)
      */
     if (/* Other gen, same group order & cofactor */
         !TEST_true(EC_GROUP_set_generator(tmpg, other_gen, group_order,
-                                          group_cofactor))
-        || !TEST_ptr(other_params = *p_next++ =
-                     EC_GROUP_get_ecparameters(tmpg, NULL))
-        || !TEST_ptr(tgroup = *g_next++ =
-                      EC_GROUP_new_from_ecparameters(other_params))
+            group_cofactor))
+        || !TEST_ptr(other_params = *p_next++ = EC_GROUP_get_ecparameters(tmpg, NULL))
+        || !TEST_ptr(tgroup = *g_next++ = EC_GROUP_new_from_ecparameters(other_params))
         || !TEST_int_eq((tnid = EC_GROUP_get_curve_name(tgroup)), NID_undef)
         /* Same gen & cofactor, different order */
         || !TEST_true(EC_GROUP_set_generator(tmpg, group_gen, other_order,
-                                             group_cofactor))
-        || !TEST_ptr(other_params = *p_next++ =
-                     EC_GROUP_get_ecparameters(tmpg, NULL))
-        || !TEST_ptr(tgroup = *g_next++ =
-                      EC_GROUP_new_from_ecparameters(other_params))
+            group_cofactor))
+        || !TEST_ptr(other_params = *p_next++ = EC_GROUP_get_ecparameters(tmpg, NULL))
+        || !TEST_ptr(tgroup = *g_next++ = EC_GROUP_new_from_ecparameters(other_params))
         || !TEST_int_eq((tnid = EC_GROUP_get_curve_name(tgroup)), NID_undef)
         /* The order is not an optional field, so this should fail */
         || !TEST_false(EC_GROUP_set_generator(tmpg, group_gen, NULL,
-                                              group_cofactor))
+            group_cofactor))
         /* Check that a wrong cofactor is ignored, and we still match */
         || !TEST_true(EC_GROUP_set_generator(tmpg, group_gen, group_order,
-                                             other_cofactor))
-        || !TEST_ptr(other_params = *p_next++ =
-                     EC_GROUP_get_ecparameters(tmpg, NULL))
-        || !TEST_ptr(tgroup = *g_next++ =
-                      EC_GROUP_new_from_ecparameters(other_params))
+            other_cofactor))
+        || !TEST_ptr(other_params = *p_next++ = EC_GROUP_get_ecparameters(tmpg, NULL))
+        || !TEST_ptr(tgroup = *g_next++ = EC_GROUP_new_from_ecparameters(other_params))
         || !TEST_int_ne((tnid = EC_GROUP_get_curve_name(tgroup)), NID_undef)
         || !TEST_true(are_ec_nids_compatible(nid, tnid))
         || !TEST_int_eq(EC_GROUP_get_asn1_flag(tgroup),
-                        OPENSSL_EC_EXPLICIT_CURVE)
+            OPENSSL_EC_EXPLICIT_CURVE)
         /* Check that if the cofactor is not set then it still matches */
         || !TEST_true(EC_GROUP_set_generator(tmpg, group_gen, group_order,
-                                             NULL))
-        || !TEST_ptr(other_params = *p_next++ =
-                     EC_GROUP_get_ecparameters(tmpg, NULL))
-        || !TEST_ptr(tgroup = *g_next++ =
-                      EC_GROUP_new_from_ecparameters(other_params))
+            NULL))
+        || !TEST_ptr(other_params = *p_next++ = EC_GROUP_get_ecparameters(tmpg, NULL))
+        || !TEST_ptr(tgroup = *g_next++ = EC_GROUP_new_from_ecparameters(other_params))
         || !TEST_int_ne((tnid = EC_GROUP_get_curve_name(tgroup)), NID_undef)
         || !TEST_true(are_ec_nids_compatible(nid, tnid))
         || !TEST_int_eq(EC_GROUP_get_asn1_flag(tgroup),
-                        OPENSSL_EC_EXPLICIT_CURVE)
+            OPENSSL_EC_EXPLICIT_CURVE)
         /* check that restoring the generator passes */
         || !TEST_true(EC_GROUP_set_generator(tmpg, group_gen, group_order,
-                                             group_cofactor))
-        || !TEST_ptr(other_params = *p_next++ =
-                     EC_GROUP_get_ecparameters(tmpg, NULL))
-        || !TEST_ptr(tgroup = *g_next++ =
-                      EC_GROUP_new_from_ecparameters(other_params))
+            group_cofactor))
+        || !TEST_ptr(other_params = *p_next++ = EC_GROUP_get_ecparameters(tmpg, NULL))
+        || !TEST_ptr(tgroup = *g_next++ = EC_GROUP_new_from_ecparameters(other_params))
         || !TEST_int_ne((tnid = EC_GROUP_get_curve_name(tgroup)), NID_undef)
         || !TEST_true(are_ec_nids_compatible(nid, tnid))
         || !TEST_int_eq(EC_GROUP_get_asn1_flag(tgroup),
-                        OPENSSL_EC_EXPLICIT_CURVE))
+            OPENSSL_EC_EXPLICIT_CURVE))
         goto err;
 
     ret = 1;
@@ -2010,7 +2391,6 @@ static int check_named_curve_from_ecparameters(int id)
     return ret;
 }
 
-
 static int parameter_test(void)
 {
     EC_GROUP *group = NULL, *group2 = NULL;
@@ -2079,15 +2459,15 @@ static int ossl_parameter_test(void)
     if (!TEST_ptr(group_nmd = EC_GROUP_new_by_curve_name(NID_secp384r1))
         /* test with null BN_CTX */
         || !TEST_ptr(params_nmd = EC_GROUP_to_params(
-                group_nmd, NULL, NULL, NULL))
+                         group_nmd, NULL, NULL, NULL))
         || !TEST_ptr(group_nmd2 = EC_GROUP_new_from_params(
-                params_nmd, NULL, NULL))
+                         params_nmd, NULL, NULL))
         || !TEST_int_eq(EC_GROUP_cmp(group_nmd, group_nmd2, NULL), 0)
         /* test with BN_CTX set */
         || !TEST_ptr(params_nmd2 = EC_GROUP_to_params(
-                group_nmd, NULL, NULL, bn_ctx))
+                         group_nmd, NULL, NULL, bn_ctx))
         || !TEST_ptr(group_nmd3 = EC_GROUP_new_from_params(
-                params_nmd2, NULL, NULL))
+                         params_nmd2, NULL, NULL))
         || !TEST_int_eq(EC_GROUP_cmp(group_nmd, group_nmd3, NULL), 0))
         goto err;
 
@@ -2102,7 +2482,7 @@ static int ossl_parameter_test(void)
 
     if (!TEST_true(EC_GROUP_get_curve(group_nmd, p, a, b, bn_ctx))
         || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(
-                bld, OSSL_PKEY_PARAM_EC_FIELD_TYPE, SN_X9_62_prime_field, 0))
+            bld, OSSL_PKEY_PARAM_EC_FIELD_TYPE, SN_X9_62_prime_field, 0))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_P, p))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_A, a))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_B, b)))
@@ -2123,25 +2503,24 @@ static int ossl_parameter_test(void)
 
     if (!TEST_ptr(group_gen = EC_GROUP_get0_generator(group_nmd))
         || !TEST_size_t_gt(bsize = EC_POINT_point2oct(
-                group_nmd, EC_GROUP_get0_generator(group_nmd),
-                POINT_CONVERSION_UNCOMPRESSED, NULL, 0, bn_ctx), 0)
+                               group_nmd, EC_GROUP_get0_generator(group_nmd),
+                               POINT_CONVERSION_UNCOMPRESSED, NULL, 0, bn_ctx),
+            0)
         || !TEST_ptr(buf2 = OPENSSL_malloc(bsize))
         || !TEST_size_t_eq(EC_POINT_point2oct(
-                group_nmd, EC_GROUP_get0_generator(group_nmd),
-                POINT_CONVERSION_UNCOMPRESSED, buf2, bsize, bn_ctx), bsize)
+                               group_nmd, EC_GROUP_get0_generator(group_nmd),
+                               POINT_CONVERSION_UNCOMPRESSED, buf2, bsize, bn_ctx),
+            bsize)
         || !TEST_true(OSSL_PARAM_BLD_push_octet_string(
-                bld, OSSL_PKEY_PARAM_EC_GENERATOR, buf2, bsize))
+            bld, OSSL_PKEY_PARAM_EC_GENERATOR, buf2, bsize))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(
-                bld, OSSL_PKEY_PARAM_EC_ORDER, EC_GROUP_get0_order(group_nmd))))
+            bld, OSSL_PKEY_PARAM_EC_ORDER, EC_GROUP_get0_order(group_nmd))))
         goto err;
 
     if (!TEST_ptr(params_exp = OSSL_PARAM_BLD_to_param(bld))
-        || !TEST_ptr(group_exp =
-                EC_GROUP_new_from_params(params_exp, NULL, NULL))
-        || !TEST_ptr(params_exp2 =
-                EC_GROUP_to_params(group_exp, NULL, NULL, NULL))
-        || !TEST_ptr(group_exp2 =
-                EC_GROUP_new_from_params(params_exp2, NULL, NULL))
+        || !TEST_ptr(group_exp = EC_GROUP_new_from_params(params_exp, NULL, NULL))
+        || !TEST_ptr(params_exp2 = EC_GROUP_to_params(group_exp, NULL, NULL, NULL))
+        || !TEST_ptr(group_exp2 = EC_GROUP_new_from_params(params_exp2, NULL, NULL))
         || !TEST_int_eq(EC_GROUP_cmp(group_exp, group_exp2, NULL), 0))
         goto err;
 
@@ -2245,12 +2624,12 @@ static int cofactor_range_test(void)
     if (!TEST_ptr(group = d2i_ECPKParameters(NULL, &b1, sizeof(params_cf_fail)))
         || !TEST_BN_eq_zero(EC_GROUP_get0_cofactor(group))
         || !TEST_ptr(group = d2i_ECPKParameters(&group, &b2,
-                                                sizeof(params_cf_pass)))
+                         sizeof(params_cf_pass)))
         || !TEST_int_gt(BN_hex2bn(&cf, "12bc94785251297abfafddf1565100da"), 0)
         || !TEST_BN_eq(cf, EC_GROUP_get0_cofactor(group)))
         goto err;
     ret = 1;
- err:
+err:
     BN_free(cf);
     EC_GROUP_free(group);
     return ret;
@@ -2295,14 +2674,12 @@ static int cardinality_test(int n)
         /* pull out the explicit curve parameters */
         || !TEST_true(EC_GROUP_get_curve(g1, g1_p, g1_a, g1_b, ctx))
         || !TEST_true(EC_POINT_get_affine_coordinates(g1,
-                      EC_GROUP_get0_generator(g1), g1_x, g1_y, ctx))
+            EC_GROUP_get0_generator(g1), g1_x, g1_y, ctx))
         || !TEST_true(BN_copy(g1_order, EC_GROUP_get0_order(g1)))
         || !TEST_true(EC_GROUP_get_cofactor(g1, g1_cf, ctx))
-        /* construct g2 manually with g1 parameters */
+    /* construct g2 manually with g1 parameters */
 #ifndef OPENSSL_NO_EC2M
-        || !TEST_ptr(g2 = (is_binary) ?
-                           EC_GROUP_new_curve_GF2m(g1_p, g1_a, g1_b, ctx) :
-                           EC_GROUP_new_curve_GFp(g1_p, g1_a, g1_b, ctx))
+        || !TEST_ptr(g2 = (is_binary) ? EC_GROUP_new_curve_GF2m(g1_p, g1_a, g1_b, ctx) : EC_GROUP_new_curve_GFp(g1_p, g1_a, g1_b, ctx))
 #else
         || !TEST_int_eq(0, is_binary)
         || !TEST_ptr(g2 = EC_GROUP_new_curve_GFp(g1_p, g1_a, g1_b, ctx))
@@ -2336,7 +2713,7 @@ static int cardinality_test(int n)
         || !TEST_false(EC_GROUP_set_generator(g2, g2_gen, g1_order, NULL)))
         goto err;
     ret = 1;
- err:
+err:
     EC_POINT_free(g2_gen);
     EC_GROUP_free(g1);
     EC_GROUP_free(g2);
@@ -2355,15 +2732,16 @@ static int check_ec_key_field_public_range_test(int id)
     EC_KEY *key = NULL;
 
     if (!TEST_ptr(x = BN_new())
-            || !TEST_ptr(y = BN_new())
-            || !TEST_ptr(key = EC_KEY_new_by_curve_name(curves[id].nid))
-            || !TEST_ptr(group = EC_KEY_get0_group(key))
-            || !TEST_ptr(field = EC_GROUP_get0_field(group))
-            || !TEST_int_gt(EC_KEY_generate_key(key), 0)
-            || !TEST_int_gt(EC_KEY_check_key(key), 0)
-            || !TEST_ptr(pub = EC_KEY_get0_public_key(key))
-            || !TEST_int_gt(EC_POINT_get_affine_coordinates(group, pub, x, y,
-                                                            NULL), 0))
+        || !TEST_ptr(y = BN_new())
+        || !TEST_ptr(key = EC_KEY_new_by_curve_name(curves[id].nid))
+        || !TEST_ptr(group = EC_KEY_get0_group(key))
+        || !TEST_ptr(field = EC_GROUP_get0_field(group))
+        || !TEST_int_gt(EC_KEY_generate_key(key), 0)
+        || !TEST_int_gt(EC_KEY_check_key(key), 0)
+        || !TEST_ptr(pub = EC_KEY_get0_public_key(key))
+        || !TEST_int_gt(EC_POINT_get_affine_coordinates(group, pub, x, y,
+                            NULL),
+            0))
         goto err;
 
     /*
@@ -2378,7 +2756,7 @@ static int check_ec_key_field_public_range_test(int id)
             goto err;
     } else
 #endif
-    if (type == NID_X9_62_prime_field) {
+        if (type == NID_X9_62_prime_field) {
         /* test for prime curves */
         if (!TEST_true(BN_add(x, x, field)))
             goto err;
@@ -2406,10 +2784,9 @@ static int check_ec_key_field_public_range_test(int id)
  *
  * If P is NULL use point at infinity.
  */
-static ossl_inline
-int ec_point_hex2point_test_helper(const EC_GROUP *group, const EC_POINT *P,
-                                   point_conversion_form_t form,
-                                   BN_CTX *bnctx)
+static ossl_inline int ec_point_hex2point_test_helper(const EC_GROUP *group, const EC_POINT *P,
+    point_conversion_form_t form,
+    BN_CTX *bnctx)
 {
     int ret = 0;
     EC_POINT *Q = NULL, *Pinf = NULL;
@@ -2418,14 +2795,14 @@ int ec_point_hex2point_test_helper(const EC_GROUP *group, const EC_POINT *P,
     if (P == NULL) {
         /* If P is NULL use point at infinity. */
         if (!TEST_ptr(Pinf = EC_POINT_new(group))
-                || !TEST_true(EC_POINT_set_to_infinity(group, Pinf)))
+            || !TEST_true(EC_POINT_set_to_infinity(group, Pinf)))
             goto err;
         P = Pinf;
     }
 
     if (!TEST_ptr(hex = EC_POINT_point2hex(group, P, form, bnctx))
-            || !TEST_ptr(Q = EC_POINT_hex2point(group, hex, NULL, bnctx))
-            || !TEST_int_eq(0, EC_POINT_cmp(group, Q, P, bnctx)))
+        || !TEST_ptr(Q = EC_POINT_hex2point(group, hex, NULL, bnctx))
+        || !TEST_int_eq(0, EC_POINT_cmp(group, Q, P, bnctx)))
         goto err;
 
     /*
@@ -2435,12 +2812,12 @@ int ec_point_hex2point_test_helper(const EC_GROUP *group, const EC_POINT *P,
      * so we include it anyway!
      */
     if (Pinf != NULL
-            && !TEST_true(EC_POINT_is_at_infinity(group, Q)))
+        && !TEST_true(EC_POINT_is_at_infinity(group, Q)))
         goto err;
 
     ret = 1;
 
- err:
+err:
     EC_POINT_free(Pinf);
     OPENSSL_free(hex);
     EC_POINT_free(Q);
@@ -2462,34 +2839,34 @@ static int ec_point_hex2point_test(int id)
     /* Do some setup */
     nid = curves[id].nid;
     if (!TEST_ptr(bnctx = BN_CTX_new())
-            || !TEST_ptr(group = EC_GROUP_new_by_curve_name(nid))
-            || !TEST_ptr(G = EC_GROUP_get0_generator(group))
-            || !TEST_ptr(P = EC_POINT_dup(G, group)))
+        || !TEST_ptr(group = EC_GROUP_new_by_curve_name(nid))
+        || !TEST_ptr(G = EC_GROUP_get0_generator(group))
+        || !TEST_ptr(P = EC_POINT_dup(G, group)))
         goto err;
 
     if (!TEST_true(ec_point_hex2point_test_helper(group, P,
-                                                  POINT_CONVERSION_COMPRESSED,
-                                                  bnctx))
-            || !TEST_true(ec_point_hex2point_test_helper(group, NULL,
-                                                         POINT_CONVERSION_COMPRESSED,
-                                                         bnctx))
-            || !TEST_true(ec_point_hex2point_test_helper(group, P,
-                                                         POINT_CONVERSION_UNCOMPRESSED,
-                                                         bnctx))
-            || !TEST_true(ec_point_hex2point_test_helper(group, NULL,
-                                                         POINT_CONVERSION_UNCOMPRESSED,
-                                                         bnctx))
-            || !TEST_true(ec_point_hex2point_test_helper(group, P,
-                                                         POINT_CONVERSION_HYBRID,
-                                                         bnctx))
-            || !TEST_true(ec_point_hex2point_test_helper(group, NULL,
-                                                         POINT_CONVERSION_HYBRID,
-                                                         bnctx)))
+            POINT_CONVERSION_COMPRESSED,
+            bnctx))
+        || !TEST_true(ec_point_hex2point_test_helper(group, NULL,
+            POINT_CONVERSION_COMPRESSED,
+            bnctx))
+        || !TEST_true(ec_point_hex2point_test_helper(group, P,
+            POINT_CONVERSION_UNCOMPRESSED,
+            bnctx))
+        || !TEST_true(ec_point_hex2point_test_helper(group, NULL,
+            POINT_CONVERSION_UNCOMPRESSED,
+            bnctx))
+        || !TEST_true(ec_point_hex2point_test_helper(group, P,
+            POINT_CONVERSION_HYBRID,
+            bnctx))
+        || !TEST_true(ec_point_hex2point_test_helper(group, NULL,
+            POINT_CONVERSION_HYBRID,
+            bnctx)))
         goto err;
 
     ret = 1;
 
- err:
+err:
     EC_POINT_free(P);
     EC_GROUP_free(group);
     BN_CTX_free(bnctx);
@@ -2498,7 +2875,7 @@ static int ec_point_hex2point_test(int id)
 }
 
 static int do_test_custom_explicit_fromdata(EC_GROUP *group, BN_CTX *ctx,
-                                            unsigned char *gen, int gen_size)
+    unsigned char *gen, int gen_size)
 {
     int ret = 0, i_out;
     EVP_PKEY_CTX *pctx = NULL;
@@ -2544,7 +2921,7 @@ static int do_test_custom_explicit_fromdata(EC_GROUP *group, BN_CTX *ctx,
     }
     if (!TEST_true(EC_GROUP_get_curve(group, p, a, b, ctx))
         || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld,
-                          OSSL_PKEY_PARAM_EC_FIELD_TYPE, field_name, 0))
+            OSSL_PKEY_PARAM_EC_FIELD_TYPE, field_name, 0))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_P, p))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_A, a))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_B, b)))
@@ -2552,131 +2929,132 @@ static int do_test_custom_explicit_fromdata(EC_GROUP *group, BN_CTX *ctx,
 
     if (EC_GROUP_get0_seed(group) != NULL) {
         if (!TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                           OSSL_PKEY_PARAM_EC_SEED, EC_GROUP_get0_seed(group),
-                           EC_GROUP_get_seed_len(group))))
+                OSSL_PKEY_PARAM_EC_SEED, EC_GROUP_get0_seed(group),
+                EC_GROUP_get_seed_len(group))))
             goto err;
     }
     if (EC_GROUP_get0_cofactor(group) != NULL) {
         if (!TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_COFACTOR,
-                                              EC_GROUP_get0_cofactor(group))))
+                EC_GROUP_get0_cofactor(group))))
             goto err;
     }
 
     if (!TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                       OSSL_PKEY_PARAM_EC_GENERATOR, gen, gen_size))
+            OSSL_PKEY_PARAM_EC_GENERATOR, gen, gen_size))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_ORDER,
-                                             EC_GROUP_get0_order(group))))
+            EC_GROUP_get0_order(group))))
         goto err;
 
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
         || !TEST_ptr(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))
         || !TEST_int_gt(EVP_PKEY_fromdata_init(pctx), 0)
         || !TEST_int_gt(EVP_PKEY_fromdata(pctx, &pkeyparam,
-                                          EVP_PKEY_KEY_PARAMETERS, params), 0))
+                            EVP_PKEY_KEY_PARAMETERS, params),
+            0))
         goto err;
 
     /*- Check that all the set values are retrievable -*/
 
     /* There should be no match to a group name since the generator changed */
     if (!TEST_false(EVP_PKEY_get_utf8_string_param(pkeyparam,
-                        OSSL_PKEY_PARAM_GROUP_NAME, name, sizeof(name),
-                        &name_len)))
+            OSSL_PKEY_PARAM_GROUP_NAME, name, sizeof(name),
+            &name_len)))
         goto err;
 
     /* The encoding should be explicit as it has no group */
     if (!TEST_true(EVP_PKEY_get_utf8_string_param(pkeyparam,
-                       OSSL_PKEY_PARAM_EC_ENCODING,
-                       name, sizeof(name), &name_len))
+            OSSL_PKEY_PARAM_EC_ENCODING,
+            name, sizeof(name), &name_len))
         || !TEST_str_eq(name, OSSL_PKEY_EC_ENCODING_EXPLICIT))
         goto err;
 
     if (!TEST_true(EVP_PKEY_get_utf8_string_param(pkeyparam,
-                       OSSL_PKEY_PARAM_EC_FIELD_TYPE, name, sizeof(name),
-                       &name_len))
+            OSSL_PKEY_PARAM_EC_FIELD_TYPE, name, sizeof(name),
+            &name_len))
         || !TEST_str_eq(name, field_name))
         goto err;
 
     if (!TEST_true(EVP_PKEY_get_octet_string_param(pkeyparam,
-                       OSSL_PKEY_PARAM_EC_GENERATOR, buf, sizeof(buf), &buf_len))
+            OSSL_PKEY_PARAM_EC_GENERATOR, buf, sizeof(buf), &buf_len))
         || !TEST_mem_eq(buf, (int)buf_len, gen, gen_size))
         goto err;
 
     if (!TEST_true(EVP_PKEY_get_bn_param(pkeyparam, OSSL_PKEY_PARAM_EC_P, &p_out))
         || !TEST_BN_eq(p_out, p)
         || !TEST_true(EVP_PKEY_get_bn_param(pkeyparam, OSSL_PKEY_PARAM_EC_A,
-                                            &a_out))
+            &a_out))
         || !TEST_BN_eq(a_out, a)
         || !TEST_true(EVP_PKEY_get_bn_param(pkeyparam, OSSL_PKEY_PARAM_EC_B,
-                                            &b_out))
+            &b_out))
         || !TEST_BN_eq(b_out, b)
         || !TEST_true(EVP_PKEY_get_bn_param(pkeyparam, OSSL_PKEY_PARAM_EC_ORDER,
-                                            &order_out))
+            &order_out))
         || !TEST_BN_eq(order_out, EC_GROUP_get0_order(group)))
         goto err;
 
     if (EC_GROUP_get0_cofactor(group) != NULL) {
         if (!TEST_true(EVP_PKEY_get_bn_param(pkeyparam,
-                           OSSL_PKEY_PARAM_EC_COFACTOR, &cofactor_out))
+                OSSL_PKEY_PARAM_EC_COFACTOR, &cofactor_out))
             || !TEST_BN_eq(cofactor_out, EC_GROUP_get0_cofactor(group)))
             goto err;
     }
     if (EC_GROUP_get0_seed(group) != NULL) {
         if (!TEST_true(EVP_PKEY_get_octet_string_param(pkeyparam,
-                           OSSL_PKEY_PARAM_EC_SEED, buf, sizeof(buf), &buf_len))
+                OSSL_PKEY_PARAM_EC_SEED, buf, sizeof(buf), &buf_len))
             || !TEST_mem_eq(buf, buf_len, EC_GROUP_get0_seed(group),
-                            EC_GROUP_get_seed_len(group)))
+                EC_GROUP_get_seed_len(group)))
             goto err;
     }
 
     if (EC_GROUP_get_field_type(group) == NID_X9_62_prime_field) {
         /* No extra fields should be set for a prime field */
         if (!TEST_false(EVP_PKEY_get_int_param(pkeyparam,
-                            OSSL_PKEY_PARAM_EC_CHAR2_M, &i_out))
+                OSSL_PKEY_PARAM_EC_CHAR2_M, &i_out))
             || !TEST_false(EVP_PKEY_get_int_param(pkeyparam,
-                               OSSL_PKEY_PARAM_EC_CHAR2_TP_BASIS, &i_out))
+                OSSL_PKEY_PARAM_EC_CHAR2_TP_BASIS, &i_out))
             || !TEST_false(EVP_PKEY_get_int_param(pkeyparam,
-                               OSSL_PKEY_PARAM_EC_CHAR2_PP_K1, &i_out))
+                OSSL_PKEY_PARAM_EC_CHAR2_PP_K1, &i_out))
             || !TEST_false(EVP_PKEY_get_int_param(pkeyparam,
-                               OSSL_PKEY_PARAM_EC_CHAR2_PP_K2, &i_out))
+                OSSL_PKEY_PARAM_EC_CHAR2_PP_K2, &i_out))
             || !TEST_false(EVP_PKEY_get_int_param(pkeyparam,
-                               OSSL_PKEY_PARAM_EC_CHAR2_PP_K3, &i_out))
+                OSSL_PKEY_PARAM_EC_CHAR2_PP_K3, &i_out))
             || !TEST_false(EVP_PKEY_get_utf8_string_param(pkeyparam,
-                               OSSL_PKEY_PARAM_EC_CHAR2_TYPE, name, sizeof(name),
-                               &name_len)))
+                OSSL_PKEY_PARAM_EC_CHAR2_TYPE, name, sizeof(name),
+                &name_len)))
             goto err;
     } else {
 #ifndef OPENSSL_NO_EC2M
         if (!TEST_true(EVP_PKEY_get_int_param(pkeyparam,
-                           OSSL_PKEY_PARAM_EC_CHAR2_M, &i_out))
+                OSSL_PKEY_PARAM_EC_CHAR2_M, &i_out))
             || !TEST_int_eq(EC_GROUP_get_degree(group), i_out)
             || !TEST_true(EVP_PKEY_get_utf8_string_param(pkeyparam,
-                              OSSL_PKEY_PARAM_EC_CHAR2_TYPE, name, sizeof(name),
-                              &name_len))
+                OSSL_PKEY_PARAM_EC_CHAR2_TYPE, name, sizeof(name),
+                &name_len))
             || !TEST_str_eq(name, basis_name))
             goto err;
 
         if (EC_GROUP_get_basis_type(group) == NID_X9_62_tpBasis) {
             if (!TEST_true(EVP_PKEY_get_int_param(pkeyparam,
-                               OSSL_PKEY_PARAM_EC_CHAR2_TP_BASIS, &i_out))
+                    OSSL_PKEY_PARAM_EC_CHAR2_TP_BASIS, &i_out))
                 || !TEST_int_eq(k1, i_out)
                 || !TEST_false(EVP_PKEY_get_int_param(pkeyparam,
-                                   OSSL_PKEY_PARAM_EC_CHAR2_PP_K1, &i_out))
+                    OSSL_PKEY_PARAM_EC_CHAR2_PP_K1, &i_out))
                 || !TEST_false(EVP_PKEY_get_int_param(pkeyparam,
-                                   OSSL_PKEY_PARAM_EC_CHAR2_PP_K2, &i_out))
+                    OSSL_PKEY_PARAM_EC_CHAR2_PP_K2, &i_out))
                 || !TEST_false(EVP_PKEY_get_int_param(pkeyparam,
-                                   OSSL_PKEY_PARAM_EC_CHAR2_PP_K3, &i_out)))
+                    OSSL_PKEY_PARAM_EC_CHAR2_PP_K3, &i_out)))
                 goto err;
         } else {
             if (!TEST_false(EVP_PKEY_get_int_param(pkeyparam,
-                                OSSL_PKEY_PARAM_EC_CHAR2_TP_BASIS, &i_out))
+                    OSSL_PKEY_PARAM_EC_CHAR2_TP_BASIS, &i_out))
                 || !TEST_true(EVP_PKEY_get_int_param(pkeyparam,
-                                  OSSL_PKEY_PARAM_EC_CHAR2_PP_K1, &i_out))
+                    OSSL_PKEY_PARAM_EC_CHAR2_PP_K1, &i_out))
                 || !TEST_int_eq(k1, i_out)
                 || !TEST_true(EVP_PKEY_get_int_param(pkeyparam,
-                                  OSSL_PKEY_PARAM_EC_CHAR2_PP_K2, &i_out))
+                    OSSL_PKEY_PARAM_EC_CHAR2_PP_K2, &i_out))
                 || !TEST_int_eq(k2, i_out)
                 || !TEST_true(EVP_PKEY_get_int_param(pkeyparam,
-                                  OSSL_PKEY_PARAM_EC_CHAR2_PP_K3, &i_out))
+                    OSSL_PKEY_PARAM_EC_CHAR2_PP_K3, &i_out))
                 || !TEST_int_eq(k3, i_out))
                 goto err;
         }
@@ -2701,7 +3079,7 @@ static int do_test_custom_explicit_fromdata(EC_GROUP *group, BN_CTX *ctx,
         || !TEST_ptr(OSSL_PARAM_locate_const(gettable, OSSL_PKEY_PARAM_EC_CHAR2_PP_K2))
         || !TEST_ptr(OSSL_PARAM_locate_const(gettable, OSSL_PKEY_PARAM_EC_CHAR2_PP_K3))
 #endif
-        )
+    )
         goto err;
     ret = 1;
 err:
@@ -2747,7 +3125,7 @@ static int custom_generator_test(int id)
     if (!TEST_ptr(k = BN_CTX_get(ctx))
         /* fetch a testing scalar k != 0,1 */
         || !TEST_true(BN_rand(k, EC_GROUP_order_bits(group) - 1,
-                              BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY))
+            BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY))
         /* make k even */
         || !TEST_true(BN_clear_bit(k, 0))
         || !TEST_ptr(G2 = EC_POINT_new(group))
@@ -2756,29 +3134,33 @@ static int custom_generator_test(int id)
         || !TEST_true(EC_POINT_mul(group, Q1, k, NULL, NULL, ctx))
         /* pull out the bytes of that */
         || !TEST_int_eq(EC_POINT_point2oct(group, Q1,
-                                           POINT_CONVERSION_UNCOMPRESSED, NULL,
-                                           0, ctx), bsize)
+                            POINT_CONVERSION_UNCOMPRESSED, NULL,
+                            0, ctx),
+            bsize)
         || !TEST_ptr(b1 = OPENSSL_malloc(bsize))
         || !TEST_int_eq(EC_POINT_point2oct(group, Q1,
-                                           POINT_CONVERSION_UNCOMPRESSED, b1,
-                                           bsize, ctx), bsize)
+                            POINT_CONVERSION_UNCOMPRESSED, b1,
+                            bsize, ctx),
+            bsize)
         /* new generator is G2 := 2G */
         || !TEST_true(EC_POINT_dbl(group, G2, EC_GROUP_get0_generator(group),
-                                   ctx))
+            ctx))
         || !TEST_true(EC_GROUP_set_generator(group, G2,
-                                             EC_GROUP_get0_order(group),
-                                             EC_GROUP_get0_cofactor(group)))
+            EC_GROUP_get0_order(group),
+            EC_GROUP_get0_cofactor(group)))
         || !TEST_ptr(Q2 = EC_POINT_new(group))
         || !TEST_true(BN_rshift1(k, k))
         /* Q2 := k/2 G2 */
         || !TEST_true(EC_POINT_mul(group, Q2, k, NULL, NULL, ctx))
         || !TEST_int_eq(EC_POINT_point2oct(group, Q2,
-                                           POINT_CONVERSION_UNCOMPRESSED, NULL,
-                                           0, ctx), bsize)
+                            POINT_CONVERSION_UNCOMPRESSED, NULL,
+                            0, ctx),
+            bsize)
         || !TEST_ptr(b2 = OPENSSL_malloc(bsize))
         || !TEST_int_eq(EC_POINT_point2oct(group, Q2,
-                                           POINT_CONVERSION_UNCOMPRESSED, b2,
-                                           bsize, ctx), bsize)
+                            POINT_CONVERSION_UNCOMPRESSED, b2,
+                            bsize, ctx),
+            bsize)
         /* Q1 = kG = k/2 G2 = Q2 should hold */
         || !TEST_mem_eq(b1, bsize, b2, bsize))
         goto err;
@@ -2788,7 +3170,7 @@ static int custom_generator_test(int id)
 
     ret = 1;
 
- err:
+err:
     EC_POINT_free(Q1);
     EC_POINT_free(Q2);
     EC_POINT_free(G2);
@@ -2819,9 +3201,9 @@ static int custom_params_test(int id)
     int is_prime = 0;
     EC_KEY *eckey1 = NULL, *eckey2 = NULL;
     EVP_PKEY *pkey1 = NULL, *pkey2 = NULL;
-    EVP_PKEY_CTX *pctx1 = NULL, *pctx2 = NULL;
+    EVP_PKEY_CTX *pctx1 = NULL, *pctx2 = NULL, *dctx = NULL;
     size_t sslen, t;
-    unsigned char *pub1 = NULL , *pub2 = NULL;
+    unsigned char *pub1 = NULL, *pub2 = NULL;
     OSSL_PARAM_BLD *param_bld = NULL;
     OSSL_PARAM *params1 = NULL, *params2 = NULL;
 
@@ -2838,9 +3220,9 @@ static int custom_params_test(int id)
 
     BN_CTX_start(ctx);
     if (!TEST_ptr(p = BN_CTX_get(ctx))
-            || !TEST_ptr(a = BN_CTX_get(ctx))
-            || !TEST_ptr(b = BN_CTX_get(ctx))
-            || !TEST_ptr(k = BN_CTX_get(ctx)))
+        || !TEST_ptr(a = BN_CTX_get(ctx))
+        || !TEST_ptr(b = BN_CTX_get(ctx))
+        || !TEST_ptr(k = BN_CTX_get(ctx)))
         goto err;
 
     if (!TEST_ptr(group = EC_GROUP_new_by_curve_name(nid)))
@@ -2860,21 +3242,22 @@ static int custom_params_test(int id)
 
     /* extract parameters from built-in curve */
     if (!TEST_true(EC_GROUP_get_curve(group, p, a, b, ctx))
-            || !TEST_ptr(G2 = EC_POINT_new(group))
-            /* new generator is G2 := 2G */
-            || !TEST_true(EC_POINT_dbl(group, G2,
-                                       EC_GROUP_get0_generator(group), ctx))
-            /* pull out the bytes of that */
-            || !TEST_int_eq(EC_POINT_point2oct(group, G2,
-                                               POINT_CONVERSION_UNCOMPRESSED,
-                                               NULL, 0, ctx), bsize)
-            || !TEST_ptr(buf1 = OPENSSL_malloc(bsize))
-            || !TEST_int_eq(EC_POINT_point2oct(group, G2,
-                                               POINT_CONVERSION_UNCOMPRESSED,
-                                               buf1, bsize, ctx), bsize)
-            || !TEST_ptr(z = EC_GROUP_get0_order(group))
-            || !TEST_ptr(cof = EC_GROUP_get0_cofactor(group))
-        )
+        || !TEST_ptr(G2 = EC_POINT_new(group))
+        /* new generator is G2 := 2G */
+        || !TEST_true(EC_POINT_dbl(group, G2,
+            EC_GROUP_get0_generator(group), ctx))
+        /* pull out the bytes of that */
+        || !TEST_int_eq(EC_POINT_point2oct(group, G2,
+                            POINT_CONVERSION_UNCOMPRESSED,
+                            NULL, 0, ctx),
+            bsize)
+        || !TEST_ptr(buf1 = OPENSSL_malloc(bsize))
+        || !TEST_int_eq(EC_POINT_point2oct(group, G2,
+                            POINT_CONVERSION_UNCOMPRESSED,
+                            buf1, bsize, ctx),
+            bsize)
+        || !TEST_ptr(z = EC_GROUP_get0_order(group))
+        || !TEST_ptr(cof = EC_GROUP_get0_cofactor(group)))
         goto err;
 
     /* create a new group using same params (but different generator) */
@@ -2892,53 +3275,56 @@ static int custom_params_test(int id)
     /* set 2*G as the generator of altgroup */
     EC_POINT_free(G2); /* discard G2 as it refers to the original group */
     if (!TEST_ptr(G2 = EC_POINT_new(altgroup))
-            || !TEST_true(EC_POINT_oct2point(altgroup, G2, buf1, bsize, ctx))
-            || !TEST_int_eq(EC_POINT_is_on_curve(altgroup, G2, ctx), 1)
-            || !TEST_true(EC_GROUP_set_generator(altgroup, G2, z, cof))
-       )
+        || !TEST_true(EC_POINT_oct2point(altgroup, G2, buf1, bsize, ctx))
+        || !TEST_int_eq(EC_POINT_is_on_curve(altgroup, G2, ctx), 1)
+        || !TEST_true(EC_GROUP_set_generator(altgroup, G2, z, cof)))
         goto err;
 
     /* verify math checks out */
     if (/* allocate temporary points on group and altgroup */
-            !TEST_ptr(Q1 = EC_POINT_new(group))
-            || !TEST_ptr(Q2 = EC_POINT_new(altgroup))
-            /* fetch a testing scalar k != 0,1 */
-            || !TEST_true(BN_rand(k, EC_GROUP_order_bits(group) - 1,
-                                  BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY))
-            /* make k even */
-            || !TEST_true(BN_clear_bit(k, 0))
-            /* Q1 := kG on group */
-            || !TEST_true(EC_POINT_mul(group, Q1, k, NULL, NULL, ctx))
-            /* pull out the bytes of that */
-            || !TEST_int_eq(EC_POINT_point2oct(group, Q1,
-                                               POINT_CONVERSION_UNCOMPRESSED,
-                                               NULL, 0, ctx), bsize)
-            || !TEST_int_eq(EC_POINT_point2oct(group, Q1,
-                                               POINT_CONVERSION_UNCOMPRESSED,
-                                               buf1, bsize, ctx), bsize)
-            /* k := k/2 */
-            || !TEST_true(BN_rshift1(k, k))
-            /* Q2 := k/2 G2 on altgroup */
-            || !TEST_true(EC_POINT_mul(altgroup, Q2, k, NULL, NULL, ctx))
-            /* pull out the bytes of that */
-            || !TEST_int_eq(EC_POINT_point2oct(altgroup, Q2,
-                                               POINT_CONVERSION_UNCOMPRESSED,
-                                               NULL, 0, ctx), bsize)
-            || !TEST_ptr(buf2 = OPENSSL_malloc(bsize))
-            || !TEST_int_eq(EC_POINT_point2oct(altgroup, Q2,
-                                               POINT_CONVERSION_UNCOMPRESSED,
-                                               buf2, bsize, ctx), bsize)
-            /* Q1 = kG = k/2 G2 = Q2 should hold */
-            || !TEST_mem_eq(buf1, bsize, buf2, bsize))
+        !TEST_ptr(Q1 = EC_POINT_new(group))
+        || !TEST_ptr(Q2 = EC_POINT_new(altgroup))
+        /* fetch a testing scalar k != 0,1 */
+        || !TEST_true(BN_rand(k, EC_GROUP_order_bits(group) - 1,
+            BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ANY))
+        /* make k even */
+        || !TEST_true(BN_clear_bit(k, 0))
+        /* Q1 := kG on group */
+        || !TEST_true(EC_POINT_mul(group, Q1, k, NULL, NULL, ctx))
+        /* pull out the bytes of that */
+        || !TEST_int_eq(EC_POINT_point2oct(group, Q1,
+                            POINT_CONVERSION_UNCOMPRESSED,
+                            NULL, 0, ctx),
+            bsize)
+        || !TEST_int_eq(EC_POINT_point2oct(group, Q1,
+                            POINT_CONVERSION_UNCOMPRESSED,
+                            buf1, bsize, ctx),
+            bsize)
+        /* k := k/2 */
+        || !TEST_true(BN_rshift1(k, k))
+        /* Q2 := k/2 G2 on altgroup */
+        || !TEST_true(EC_POINT_mul(altgroup, Q2, k, NULL, NULL, ctx))
+        /* pull out the bytes of that */
+        || !TEST_int_eq(EC_POINT_point2oct(altgroup, Q2,
+                            POINT_CONVERSION_UNCOMPRESSED,
+                            NULL, 0, ctx),
+            bsize)
+        || !TEST_ptr(buf2 = OPENSSL_malloc(bsize))
+        || !TEST_int_eq(EC_POINT_point2oct(altgroup, Q2,
+                            POINT_CONVERSION_UNCOMPRESSED,
+                            buf2, bsize, ctx),
+            bsize)
+        /* Q1 = kG = k/2 G2 = Q2 should hold */
+        || !TEST_mem_eq(buf1, bsize, buf2, bsize))
         goto err;
 
     /* create two `EC_KEY`s on altgroup */
     if (!TEST_ptr(eckey1 = EC_KEY_new())
-            || !TEST_true(EC_KEY_set_group(eckey1, altgroup))
-            || !TEST_true(EC_KEY_generate_key(eckey1))
-            || !TEST_ptr(eckey2 = EC_KEY_new())
-            || !TEST_true(EC_KEY_set_group(eckey2, altgroup))
-            || !TEST_true(EC_KEY_generate_key(eckey2)))
+        || !TEST_true(EC_KEY_set_group(eckey1, altgroup))
+        || !TEST_true(EC_KEY_generate_key(eckey1))
+        || !TEST_ptr(eckey2 = EC_KEY_new())
+        || !TEST_true(EC_KEY_set_group(eckey2, altgroup))
+        || !TEST_true(EC_KEY_generate_key(eckey2)))
         goto err;
 
     /* retrieve priv1 for later */
@@ -2952,51 +3338,55 @@ static int custom_params_test(int id)
      * define a provider key in the built-in group.
      */
     if (!TEST_true(EC_POINT_mul(group, Q1, priv1, NULL, NULL, ctx))
-            || !TEST_int_eq(EC_POINT_point2oct(group, Q1,
-                                               POINT_CONVERSION_UNCOMPRESSED,
-                                               NULL, 0, ctx), bsize)
-            || !TEST_ptr(pub1 = OPENSSL_malloc(bsize))
-            || !TEST_int_eq(EC_POINT_point2oct(group, Q1,
-                                               POINT_CONVERSION_UNCOMPRESSED,
-                                               pub1, bsize, ctx), bsize))
+        || !TEST_int_eq(EC_POINT_point2oct(group, Q1,
+                            POINT_CONVERSION_UNCOMPRESSED,
+                            NULL, 0, ctx),
+            bsize)
+        || !TEST_ptr(pub1 = OPENSSL_malloc(bsize))
+        || !TEST_int_eq(EC_POINT_point2oct(group, Q1,
+                            POINT_CONVERSION_UNCOMPRESSED,
+                            pub1, bsize, ctx),
+            bsize))
         goto err;
 
     /* retrieve bytes for pub2 for later */
     if (!TEST_ptr(Q = EC_KEY_get0_public_key(eckey2))
-            || !TEST_int_eq(EC_POINT_point2oct(altgroup, Q,
-                                               POINT_CONVERSION_UNCOMPRESSED,
-                                               NULL, 0, ctx), bsize)
-            || !TEST_ptr(pub2 = OPENSSL_malloc(bsize))
-            || !TEST_int_eq(EC_POINT_point2oct(altgroup, Q,
-                                               POINT_CONVERSION_UNCOMPRESSED,
-                                               pub2, bsize, ctx), bsize))
+        || !TEST_int_eq(EC_POINT_point2oct(altgroup, Q,
+                            POINT_CONVERSION_UNCOMPRESSED,
+                            NULL, 0, ctx),
+            bsize)
+        || !TEST_ptr(pub2 = OPENSSL_malloc(bsize))
+        || !TEST_int_eq(EC_POINT_point2oct(altgroup, Q,
+                            POINT_CONVERSION_UNCOMPRESSED,
+                            pub2, bsize, ctx),
+            bsize))
         goto err;
 
     /* create two `EVP_PKEY`s from the `EC_KEY`s */
     if (!TEST_ptr(pkey1 = EVP_PKEY_new())
-            || !TEST_int_eq(EVP_PKEY_assign_EC_KEY(pkey1, eckey1), 1))
+        || !TEST_int_eq(EVP_PKEY_assign_EC_KEY(pkey1, eckey1), 1))
         goto err;
     eckey1 = NULL; /* ownership passed to pkey1 */
     if (!TEST_ptr(pkey2 = EVP_PKEY_new())
-            || !TEST_int_eq(EVP_PKEY_assign_EC_KEY(pkey2, eckey2), 1))
+        || !TEST_int_eq(EVP_PKEY_assign_EC_KEY(pkey2, eckey2), 1))
         goto err;
     eckey2 = NULL; /* ownership passed to pkey2 */
 
     /* Compute keyexchange in both directions */
     if (!TEST_ptr(pctx1 = EVP_PKEY_CTX_new(pkey1, NULL))
-            || !TEST_int_eq(EVP_PKEY_derive_init(pctx1), 1)
-            || !TEST_int_eq(EVP_PKEY_derive_set_peer(pctx1, pkey2), 1)
-            || !TEST_int_eq(EVP_PKEY_derive(pctx1, NULL, &sslen), 1)
-            || !TEST_int_gt(bsize, sslen)
-            || !TEST_int_eq(EVP_PKEY_derive(pctx1, buf1, &sslen), 1))
+        || !TEST_int_eq(EVP_PKEY_derive_init(pctx1), 1)
+        || !TEST_int_eq(EVP_PKEY_derive_set_peer(pctx1, pkey2), 1)
+        || !TEST_int_eq(EVP_PKEY_derive(pctx1, NULL, &sslen), 1)
+        || !TEST_int_gt(bsize, sslen)
+        || !TEST_int_eq(EVP_PKEY_derive(pctx1, buf1, &sslen), 1))
         goto err;
     if (!TEST_ptr(pctx2 = EVP_PKEY_CTX_new(pkey2, NULL))
-            || !TEST_int_eq(EVP_PKEY_derive_init(pctx2), 1)
-            || !TEST_int_eq(EVP_PKEY_derive_set_peer(pctx2, pkey1), 1)
-            || !TEST_int_eq(EVP_PKEY_derive(pctx2, NULL, &t), 1)
-            || !TEST_int_gt(bsize, t)
-            || !TEST_int_le(sslen, t)
-            || !TEST_int_eq(EVP_PKEY_derive(pctx2, buf2, &t), 1))
+        || !TEST_int_eq(EVP_PKEY_derive_init(pctx2), 1)
+        || !TEST_int_eq(EVP_PKEY_derive_set_peer(pctx2, pkey1), 1)
+        || !TEST_int_eq(EVP_PKEY_derive(pctx2, NULL, &t), 1)
+        || !TEST_int_gt(bsize, t)
+        || !TEST_int_le(sslen, t)
+        || !TEST_int_eq(EVP_PKEY_derive(pctx2, buf2, &t), 1))
         goto err;
 
     /* Both sides should expect the same shared secret */
@@ -3005,55 +3395,58 @@ static int custom_params_test(int id)
 
     /* Build parameters for provider-native keys */
     if (!TEST_ptr(param_bld = OSSL_PARAM_BLD_new())
-            || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(param_bld,
-                                                          OSSL_PKEY_PARAM_GROUP_NAME,
-                                                          curve_name, 0))
-            || !TEST_true(OSSL_PARAM_BLD_push_octet_string(param_bld,
-                                                           OSSL_PKEY_PARAM_PUB_KEY,
-                                                           pub1, bsize))
-            || !TEST_true(OSSL_PARAM_BLD_push_BN(param_bld,
-                                                 OSSL_PKEY_PARAM_PRIV_KEY,
-                                                 priv1))
-            || !TEST_ptr(params1 = OSSL_PARAM_BLD_to_param(param_bld)))
+        || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(param_bld,
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            curve_name, 0))
+        || !TEST_true(OSSL_PARAM_BLD_push_octet_string(param_bld,
+            OSSL_PKEY_PARAM_PUB_KEY,
+            pub1, bsize))
+        || !TEST_true(OSSL_PARAM_BLD_push_BN(param_bld,
+            OSSL_PKEY_PARAM_PRIV_KEY,
+            priv1))
+        || !TEST_ptr(params1 = OSSL_PARAM_BLD_to_param(param_bld)))
         goto err;
 
     OSSL_PARAM_BLD_free(param_bld);
     if (!TEST_ptr(param_bld = OSSL_PARAM_BLD_new())
-            || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(param_bld,
-                                                          OSSL_PKEY_PARAM_GROUP_NAME,
-                                                          curve_name, 0))
-            || !TEST_true(OSSL_PARAM_BLD_push_octet_string(param_bld,
-                                                           OSSL_PKEY_PARAM_PUB_KEY,
-                                                           pub2, bsize))
-            || !TEST_ptr(params2 = OSSL_PARAM_BLD_to_param(param_bld)))
+        || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(param_bld,
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            curve_name, 0))
+        || !TEST_true(OSSL_PARAM_BLD_push_octet_string(param_bld,
+            OSSL_PKEY_PARAM_PUB_KEY,
+            pub2, bsize))
+        || !TEST_ptr(params2 = OSSL_PARAM_BLD_to_param(param_bld)))
         goto err;
 
     /* create two new provider-native `EVP_PKEY`s */
     EVP_PKEY_CTX_free(pctx2);
     if (!TEST_ptr(pctx2 = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))
-            || !TEST_int_eq(EVP_PKEY_fromdata_init(pctx2), 1)
-            || !TEST_int_eq(EVP_PKEY_fromdata(pctx2, &pkey1, EVP_PKEY_KEYPAIR,
-                                              params1), 1)
-            || !TEST_int_eq(EVP_PKEY_fromdata(pctx2, &pkey2, EVP_PKEY_PUBLIC_KEY,
-                                              params2), 1))
+        || !TEST_int_eq(EVP_PKEY_fromdata_init(pctx2), 1)
+        || !TEST_int_eq(EVP_PKEY_fromdata(pctx2, &pkey1, EVP_PKEY_KEYPAIR,
+                            params1),
+            1)
+        || !TEST_int_eq(EVP_PKEY_fromdata(pctx2, &pkey2, EVP_PKEY_PUBLIC_KEY,
+                            params2),
+            1))
         goto err;
 
     /* compute keyexchange once more using the provider keys */
     EVP_PKEY_CTX_free(pctx1);
     if (!TEST_ptr(pctx1 = EVP_PKEY_CTX_new(pkey1, NULL))
-            || !TEST_int_eq(EVP_PKEY_derive_init(pctx1), 1)
-            || !TEST_int_eq(EVP_PKEY_derive_set_peer(pctx1, pkey2), 1)
-            || !TEST_int_eq(EVP_PKEY_derive(pctx1, NULL, &t), 1)
-            || !TEST_int_gt(bsize, t)
-            || !TEST_int_le(sslen, t)
-            || !TEST_int_eq(EVP_PKEY_derive(pctx1, buf1, &t), 1)
-            /* compare with previous result */
-            || !TEST_mem_eq(buf1, t, buf2, sslen))
+        || !TEST_int_eq(EVP_PKEY_derive_init(pctx1), 1)
+        || !TEST_ptr(dctx = EVP_PKEY_CTX_dup(pctx1))
+        || !TEST_int_eq(EVP_PKEY_derive_set_peer_ex(dctx, pkey2, 1), 1)
+        || !TEST_int_eq(EVP_PKEY_derive(dctx, NULL, &t), 1)
+        || !TEST_int_gt(bsize, t)
+        || !TEST_int_le(sslen, t)
+        || !TEST_int_eq(EVP_PKEY_derive(dctx, buf1, &t), 1)
+        /* compare with previous result */
+        || !TEST_mem_eq(buf1, t, buf2, sslen))
         goto err;
 
     ret = 1;
 
- err:
+err:
     BN_CTX_end(ctx);
     BN_CTX_free(ctx);
     OSSL_PARAM_BLD_free(param_bld);
@@ -3074,49 +3467,50 @@ static int custom_params_test(int id)
     EVP_PKEY_free(pkey2);
     EVP_PKEY_CTX_free(pctx1);
     EVP_PKEY_CTX_free(pctx2);
+    EVP_PKEY_CTX_free(dctx);
 
     return ret;
 }
 
 static int ec_d2i_publickey_test(void)
 {
-   unsigned char buf[1000];
-   unsigned char *pubkey_enc = buf;
-   const unsigned char *pk_enc = pubkey_enc;
-   EVP_PKEY *gen_key = NULL, *decoded_key = NULL;
-   EVP_PKEY_CTX *pctx = NULL;
-   int pklen, ret = 0;
-   OSSL_PARAM params[2];
-
-   if (!TEST_ptr(gen_key = EVP_EC_gen("P-256")))
-       goto err;
-
-   if (!TEST_int_gt(pklen = i2d_PublicKey(gen_key, &pubkey_enc), 0))
-       goto err;
-
-   params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                "P-256", 0);
-   params[1] = OSSL_PARAM_construct_end();
-
-   if (!TEST_ptr(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))
-       || !TEST_true(EVP_PKEY_fromdata_init(pctx))
-       || !TEST_true(EVP_PKEY_fromdata(pctx, &decoded_key,
-                                       OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                                       params))
-       || !TEST_ptr(decoded_key)
-       || !TEST_ptr(decoded_key = d2i_PublicKey(EVP_PKEY_EC, &decoded_key,
-                                                &pk_enc, pklen)))
-       goto err;
-
-   if (!TEST_true(EVP_PKEY_eq(gen_key, decoded_key)))
-       goto err;
-   ret = 1;
-
- err:
-   EVP_PKEY_CTX_free(pctx);
-   EVP_PKEY_free(gen_key);
-   EVP_PKEY_free(decoded_key);
-   return ret;
+    unsigned char buf[1000];
+    unsigned char *pubkey_enc = buf;
+    const unsigned char *pk_enc = pubkey_enc;
+    EVP_PKEY *gen_key = NULL, *decoded_key = NULL;
+    EVP_PKEY_CTX *pctx = NULL;
+    int pklen, ret = 0;
+    OSSL_PARAM params[2];
+
+    if (!TEST_ptr(gen_key = EVP_EC_gen("P-256")))
+        goto err;
+
+    if (!TEST_int_gt(pklen = i2d_PublicKey(gen_key, &pubkey_enc), 0))
+        goto err;
+
+    params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
+        "P-256", 0);
+    params[1] = OSSL_PARAM_construct_end();
+
+    if (!TEST_ptr(pctx = EVP_PKEY_CTX_new_from_name(NULL, "EC", NULL))
+        || !TEST_true(EVP_PKEY_fromdata_init(pctx))
+        || !TEST_true(EVP_PKEY_fromdata(pctx, &decoded_key,
+            OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+            params))
+        || !TEST_ptr(decoded_key)
+        || !TEST_ptr(decoded_key = d2i_PublicKey(EVP_PKEY_EC, &decoded_key,
+                         &pk_enc, pklen)))
+        goto err;
+
+    if (!TEST_true(EVP_PKEY_eq(gen_key, decoded_key)))
+        goto err;
+    ret = 1;
+
+err:
+    EVP_PKEY_CTX_free(pctx);
+    EVP_PKEY_free(gen_key);
+    EVP_PKEY_free(decoded_key);
+    return ret;
 }
 
 int setup_tests(void)
diff --git a/test/endecode_test.c b/test/endecode_test.c
index 028deb4ed134a..3f8ed7f392564 100644
--- a/test/endecode_test.c
+++ b/test/endecode_test.c
@@ -19,9 +19,9 @@
 #include <openssl/encoder.h>
 #include <openssl/decoder.h>
 
-#include "internal/cryptlib.h"   /* ossl_assert */
-#include "crypto/pem.h"          /* For PVK and "blob" PEM headers */
-#include "crypto/evp.h"          /* For evp_pkey_is_provided() */
+#include "internal/cryptlib.h" /* ossl_assert */
+#include "crypto/pem.h" /* For PVK and "blob" PEM headers */
+#include "crypto/evp.h" /* For evp_pkey_is_provided() */
 
 #include "helpers/predefined_dhparams.h"
 #include "testutil.h"
@@ -31,18 +31,18 @@ OSSL_provider_init_fn ossl_legacy_provider_init;
 #endif
 
 /* Extended test macros to allow passing file & line number */
-#define TEST_FL_ptr(a)               test_ptr(file, line, #a, a)
-#define TEST_FL_mem_eq(a, m, b, n)   test_mem_eq(file, line, #a, #b, a, m, b, n)
-#define TEST_FL_strn_eq(a, b, n)     test_strn_eq(file, line, #a, #b, a, n, b, n)
+#define TEST_FL_ptr(a) test_ptr(file, line, #a, a)
+#define TEST_FL_mem_eq(a, m, b, n) test_mem_eq(file, line, #a, #b, a, m, b, n)
+#define TEST_FL_strn_eq(a, b, n) test_strn_eq(file, line, #a, #b, a, n, b, n)
 #define TEST_FL_strn2_eq(a, m, b, n) test_strn_eq(file, line, #a, #b, a, m, b, n)
-#define TEST_FL_int_eq(a, b)         test_int_eq(file, line, #a, #b, a, b)
-#define TEST_FL_int_ge(a, b)         test_int_ge(file, line, #a, #b, a, b)
-#define TEST_FL_int_gt(a, b)         test_int_gt(file, line, #a, #b, a, b)
-#define TEST_FL_long_gt(a, b)        test_long_gt(file, line, #a, #b, a, b)
-#define TEST_FL_true(a)              test_true(file, line, #a, (a) != 0)
+#define TEST_FL_int_eq(a, b) test_int_eq(file, line, #a, #b, a, b)
+#define TEST_FL_int_ge(a, b) test_int_ge(file, line, #a, #b, a, b)
+#define TEST_FL_int_gt(a, b) test_int_gt(file, line, #a, #b, a, b)
+#define TEST_FL_long_gt(a, b) test_long_gt(file, line, #a, #b, a, b)
+#define TEST_FL_true(a) test_true(file, line, #a, (a) != 0)
 
 #if defined(OPENSSL_NO_DH) && defined(OPENSSL_NO_DSA) && defined(OPENSSL_NO_EC)
-# define OPENSSL_NO_KEYPARAMS
+#define OPENSSL_NO_KEYPARAMS
 #endif
 
 static int default_libctx = 1;
@@ -65,12 +65,12 @@ static OSSL_PARAM_BLD *bld_prime = NULL;
 static OSSL_PARAM *ec_explicit_prime_params_nc = NULL;
 static OSSL_PARAM *ec_explicit_prime_params_explicit = NULL;
 
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
 static OSSL_PARAM_BLD *bld_tri_nc = NULL;
 static OSSL_PARAM_BLD *bld_tri = NULL;
 static OSSL_PARAM *ec_explicit_tri_params_nc = NULL;
 static OSSL_PARAM *ec_explicit_tri_params_explicit = NULL;
-# endif
+#endif
 #endif
 
 #ifndef OPENSSL_NO_KEYPARAMS
@@ -79,7 +79,7 @@ static EVP_PKEY *make_template(const char *type, OSSL_PARAM *genparams)
     EVP_PKEY *pkey = NULL;
     EVP_PKEY_CTX *ctx = NULL;
 
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
     /*
      * Use 512-bit DH(X) keys with predetermined parameters for efficiency,
      * for testing only. Use a minimum key size of 2048 for security purposes.
@@ -89,35 +89,29 @@ static EVP_PKEY *make_template(const char *type, OSSL_PARAM *genparams)
 
     if (strcmp(type, "X9.42 DH") == 0)
         return get_dhx512(keyctx);
-# endif
+#endif
 
     /*
      * No real need to check the errors other than for the cascade
      * effect.  |pkey| will simply remain NULL if something goes wrong.
      */
     (void)((ctx = EVP_PKEY_CTX_new_from_name(keyctx, type, testpropq)) != NULL
-           && EVP_PKEY_paramgen_init(ctx) > 0
-           && (genparams == NULL
-               || EVP_PKEY_CTX_set_params(ctx, genparams) > 0)
-           && EVP_PKEY_generate(ctx, &pkey) > 0);
+        && EVP_PKEY_paramgen_init(ctx) > 0
+        && (genparams == NULL
+            || EVP_PKEY_CTX_set_params(ctx, genparams) > 0)
+        && EVP_PKEY_generate(ctx, &pkey) > 0);
     EVP_PKEY_CTX_free(ctx);
 
     return pkey;
 }
 #endif
 
-#if !defined(OPENSSL_NO_DH) || \
-    !defined(OPENSSL_NO_DSA) || \
-    !defined(OPENSSL_NO_EC) || \
-    !defined(OPENSSL_NO_ML_DSA) || \
-    !defined(OPENSSL_NO_ML_KEM) || \
-    !defined(OPENSSL_NO_SLH_DSA)
+#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_ML_DSA) || !defined(OPENSSL_NO_ML_KEM) || !defined(OPENSSL_NO_SLH_DSA)
 static EVP_PKEY *make_key(const char *type, EVP_PKEY *template,
-                          OSSL_PARAM *genparams)
+    OSSL_PARAM *genparams)
 {
     EVP_PKEY *pkey = NULL;
-    EVP_PKEY_CTX *ctx =
-        template != NULL
+    EVP_PKEY_CTX *ctx = template != NULL
         ? EVP_PKEY_CTX_new_from_pkey(keyctx, template, testpropq)
         : EVP_PKEY_CTX_new_from_name(keyctx, type, testpropq);
 
@@ -126,10 +120,10 @@ static EVP_PKEY *make_key(const char *type, EVP_PKEY *template,
      * effect.  |pkey| will simply remain NULL if something goes wrong.
      */
     (void)(ctx != NULL
-           && EVP_PKEY_keygen_init(ctx) > 0
-           && (genparams == NULL
-               || EVP_PKEY_CTX_set_params(ctx, genparams) > 0)
-           && EVP_PKEY_keygen(ctx, &pkey) > 0);
+        && EVP_PKEY_keygen_init(ctx) > 0
+        && (genparams == NULL
+            || EVP_PKEY_CTX_set_params(ctx, genparams) > 0)
+        && EVP_PKEY_keygen(ctx, &pkey) > 0);
     EVP_PKEY_CTX_free(ctx);
     return pkey;
 }
@@ -137,33 +131,33 @@ static EVP_PKEY *make_key(const char *type, EVP_PKEY *template,
 
 /* Main test driver */
 
-typedef int (encoder)(const char *file, const int line,
-                      void **encoded, long *encoded_len,
-                      void *object, int selection,
-                      const char *output_type, const char *output_structure,
-                      const char *pass, const char *pcipher);
-typedef int (decoder)(const char *file, const int line,
-                      void **object, void *encoded, long encoded_len,
-                      const char *input_type, const char *structure_type,
-                      const char *keytype, int selection, const char *pass);
-typedef int (tester)(const char *file, const int line,
-                     const void *data1, size_t data1_len,
-                     const void *data2, size_t data2_len);
-typedef int (checker)(const char *file, const int line,
-                      const char *type, const void *data, size_t data_len);
-typedef void (dumper)(const char *label, const void *data, size_t data_len);
-
-#define FLAG_DECODE_WITH_TYPE   0x0001
-#define FLAG_FAIL_IF_FIPS       0x0002
+typedef int(encoder)(const char *file, const int line,
+    void **encoded, long *encoded_len,
+    void *object, int selection,
+    const char *output_type, const char *output_structure,
+    const char *pass, const char *pcipher);
+typedef int(decoder)(const char *file, const int line,
+    void **object, void *encoded, long encoded_len,
+    const char *input_type, const char *structure_type,
+    const char *keytype, int selection, const char *pass);
+typedef int(tester)(const char *file, const int line,
+    const void *data1, size_t data1_len,
+    const void *data2, size_t data2_len);
+typedef int(checker)(const char *file, const int line,
+    const char *type, const void *data, size_t data_len);
+typedef void(dumper)(const char *label, const void *data, size_t data_len);
+
+#define FLAG_DECODE_WITH_TYPE 0x0001
+#define FLAG_FAIL_IF_FIPS 0x0002
 
 static int test_encode_decode(const char *file, const int line,
-                              const char *type, EVP_PKEY *pkey,
-                              int selection, const char *output_type,
-                              const char *output_structure,
-                              const char *pass, const char *pcipher,
-                              encoder *encode_cb, decoder *decode_cb,
-                              tester *test_cb, checker *check_cb,
-                              dumper *dump_cb, int flags)
+    const char *type, EVP_PKEY *pkey,
+    int selection, const char *output_type,
+    const char *output_structure,
+    const char *pass, const char *pcipher,
+    encoder *encode_cb, decoder *decode_cb,
+    tester *test_cb, checker *check_cb,
+    dumper *dump_cb, int flags)
 {
     void *encoded = NULL;
     long encoded_len = 0;
@@ -179,31 +173,31 @@ static int test_encode_decode(const char *file, const int line,
      * dumping purposes.
      */
     if (!TEST_true(encode_cb(file, line, &encoded, &encoded_len, pkey, selection,
-                             output_type, output_structure, pass, pcipher)))
+            output_type, output_structure, pass, pcipher)))
         goto end;
 
     if ((flags & FLAG_FAIL_IF_FIPS) != 0 && is_fips && !is_fips_3_0_0) {
         if (TEST_false(decode_cb(file, line, (void **)&pkey2, encoded,
-                                  encoded_len, output_type, output_structure,
-                                  (flags & FLAG_DECODE_WITH_TYPE ? type : NULL),
-                                  selection, pass)))
+                encoded_len, output_type, output_structure,
+                (flags & FLAG_DECODE_WITH_TYPE ? type : NULL),
+                selection, pass)))
             ok = 1;
         goto end;
     }
 
     if (!TEST_true(check_cb(file, line, type, encoded, encoded_len))
         || !TEST_true(decode_cb(file, line, (void **)&pkey2, encoded, encoded_len,
-                                output_type, output_structure,
-                                (flags & FLAG_DECODE_WITH_TYPE ? type : NULL),
-                                selection, pass))
+            output_type, output_structure,
+            (flags & FLAG_DECODE_WITH_TYPE ? type : NULL),
+            selection, pass))
         || ((output_structure == NULL
-             || strcmp(output_structure, "type-specific") != 0)
+                || strcmp(output_structure, "type-specific") != 0)
             && !TEST_true(decode_cb(file, line, (void **)&pkey3, encoded, encoded_len,
-                                    output_type, output_structure,
-                                    (flags & FLAG_DECODE_WITH_TYPE ? type : NULL),
-                                    0, pass)))
+                output_type, output_structure,
+                (flags & FLAG_DECODE_WITH_TYPE ? type : NULL),
+                0, pass)))
         || !TEST_true(encode_cb(file, line, &encoded2, &encoded2_len, pkey2, selection,
-                                output_type, output_structure, pass, pcipher)))
+            output_type, output_structure, pass, pcipher)))
         goto end;
 
     if (selection == OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS) {
@@ -228,7 +222,7 @@ static int test_encode_decode(const char *file, const int line,
         goto end;
 
     ok = 1;
- end:
+end:
     if (!ok) {
         if (encoded != NULL && encoded_len != 0)
             dump_cb("|pkey| encoded", encoded, encoded_len);
@@ -246,11 +240,11 @@ static int test_encode_decode(const char *file, const int line,
 /* Encoding and decoding methods */
 
 static int encode_EVP_PKEY_prov(const char *file, const int line,
-                                void **encoded, long *encoded_len,
-                                void *object, int selection,
-                                const char *output_type,
-                                const char *output_structure,
-                                const char *pass, const char *pcipher)
+    void **encoded, long *encoded_len,
+    void *object, int selection,
+    const char *output_type,
+    const char *output_structure,
+    const char *pass, const char *pcipher)
 {
     EVP_PKEY *pkey = object;
     OSSL_ENCODER_CTX *ectx = NULL;
@@ -260,13 +254,13 @@ static int encode_EVP_PKEY_prov(const char *file, const int line,
     int ok = 0;
 
     if (!TEST_FL_ptr(ectx = OSSL_ENCODER_CTX_new_for_pkey(pkey, selection,
-                                                       output_type,
-                                                       output_structure,
-                                                       testpropq))
+                         output_type,
+                         output_structure,
+                         testpropq))
         || !TEST_FL_int_gt(OSSL_ENCODER_CTX_get_num_encoders(ectx), 0)
         || (pass != NULL
             && !TEST_FL_true(OSSL_ENCODER_CTX_set_passphrase(ectx, upass,
-                                                          strlen(pass))))
+                strlen(pass))))
         || (pcipher != NULL
             && !TEST_FL_true(OSSL_ENCODER_CTX_set_cipher(ectx, pcipher, NULL)))
         || !TEST_FL_ptr(mem_ser = BIO_new(BIO_s_mem()))
@@ -280,18 +274,18 @@ static int encode_EVP_PKEY_prov(const char *file, const int line,
     mem_buf->data = NULL;
     mem_buf->length = 0;
     ok = 1;
- end:
+end:
     BIO_free(mem_ser);
     OSSL_ENCODER_CTX_free(ectx);
     return ok;
 }
 
 static int decode_EVP_PKEY_prov(const char *file, const int line,
-                                void **object, void *encoded, long encoded_len,
-                                const char *input_type,
-                                const char *structure_type,
-                                const char *keytype, int selection,
-                                const char *pass)
+    void **object, void *encoded, long encoded_len,
+    const char *input_type,
+    const char *structure_type,
+    const char *keytype, int selection,
+    const char *pass)
 {
     EVP_PKEY *pkey = NULL, *testpkey = NULL;
     OSSL_DECODER_CTX *dctx = NULL;
@@ -321,17 +315,17 @@ static int decode_EVP_PKEY_prov(const char *file, const int line,
                                         : ((i == 1) ? NULL : badtype);
 
         if (!TEST_FL_ptr(dctx = OSSL_DECODER_CTX_new_for_pkey(&testpkey,
-                                                           testtype,
-                                                           structure_type,
-                                                           keytype,
-                                                           selection,
-                                                           testctx, testpropq))
+                             testtype,
+                             structure_type,
+                             keytype,
+                             selection,
+                             testctx, testpropq))
             || (pass != NULL
                 && !OSSL_DECODER_CTX_set_passphrase(dctx, upass, strlen(pass)))
             || !TEST_FL_int_gt(BIO_reset(encoded_bio), 0)
-               /* We expect to fail when using a bad input type */
+            /* We expect to fail when using a bad input type */
             || !TEST_FL_int_eq(OSSL_DECODER_from_bio(dctx, encoded_bio),
-                            (i == 2) ? 0 : 1))
+                (i == 2) ? 0 : 1))
             goto end;
         OSSL_DECODER_CTX_free(dctx);
         dctx = NULL;
@@ -353,7 +347,7 @@ static int decode_EVP_PKEY_prov(const char *file, const int line,
     *object = pkey;
     pkey = NULL;
 
- end:
+end:
     EVP_PKEY_free(pkey);
     EVP_PKEY_free(testpkey);
     BIO_free(encoded_bio);
@@ -362,11 +356,11 @@ static int decode_EVP_PKEY_prov(const char *file, const int line,
 }
 
 static int encode_EVP_PKEY_legacy_PEM(const char *file, const int line,
-                                      void **encoded, long *encoded_len,
-                                      void *object, ossl_unused int selection,
-                                      ossl_unused const char *output_type,
-                                      ossl_unused const char *output_structure,
-                                      const char *pass, const char *pcipher)
+    void **encoded, long *encoded_len,
+    void *object, ossl_unused int selection,
+    ossl_unused const char *output_type,
+    ossl_unused const char *output_structure,
+    const char *pass, const char *pcipher)
 {
     EVP_PKEY *pkey = object;
     EVP_CIPHER *cipher = NULL;
@@ -383,9 +377,9 @@ static int encode_EVP_PKEY_legacy_PEM(const char *file, const int line,
     }
     if (!TEST_FL_ptr(mem_ser = BIO_new(BIO_s_mem()))
         || !TEST_FL_true(PEM_write_bio_PrivateKey_traditional(mem_ser, pkey,
-                                                           cipher,
-                                                           upass, passlen,
-                                                           NULL, NULL))
+            cipher,
+            upass, passlen,
+            NULL, NULL))
         || !TEST_FL_true(BIO_get_mem_ptr(mem_ser, &mem_buf) > 0)
         || !TEST_FL_ptr(*encoded = mem_buf->data)
         || !TEST_FL_long_gt(*encoded_len = mem_buf->length, 0))
@@ -395,19 +389,19 @@ static int encode_EVP_PKEY_legacy_PEM(const char *file, const int line,
     mem_buf->data = NULL;
     mem_buf->length = 0;
     ok = 1;
- end:
+end:
     BIO_free(mem_ser);
     EVP_CIPHER_free(cipher);
     return ok;
 }
 
 static int encode_EVP_PKEY_MSBLOB(const char *file, const int line,
-                                  void **encoded, long *encoded_len,
-                                  void *object, int selection,
-                                  ossl_unused const char *output_type,
-                                  ossl_unused const char *output_structure,
-                                  ossl_unused const char *pass,
-                                  ossl_unused const char *pcipher)
+    void **encoded, long *encoded_len,
+    void *object, int selection,
+    ossl_unused const char *output_type,
+    ossl_unused const char *output_structure,
+    ossl_unused const char *pass,
+    ossl_unused const char *pcipher)
 {
     EVP_PKEY *pkey = object;
     BIO *mem_ser = NULL;
@@ -434,7 +428,7 @@ static int encode_EVP_PKEY_MSBLOB(const char *file, const int line,
     mem_buf->data = NULL;
     mem_buf->length = 0;
     ok = 1;
- end:
+end:
     BIO_free(mem_ser);
     return ok;
 }
@@ -447,12 +441,12 @@ static int pass_pw(char *buf, int size, int rwflag, void *userdata)
 }
 
 static int encode_EVP_PKEY_PVK(const char *file, const int line,
-                               void **encoded, long *encoded_len,
-                               void *object, int selection,
-                               ossl_unused const char *output_type,
-                               ossl_unused const char *output_structure,
-                               const char *pass,
-                               ossl_unused const char *pcipher)
+    void **encoded, long *encoded_len,
+    void *object, int selection,
+    ossl_unused const char *output_type,
+    ossl_unused const char *output_structure,
+    const char *pass,
+    ossl_unused const char *pcipher)
 {
     EVP_PKEY *pkey = object;
     BIO *mem_ser = NULL;
@@ -461,10 +455,12 @@ static int encode_EVP_PKEY_PVK(const char *file, const int line,
     int ok = 0;
 
     if (!TEST_FL_true(ossl_assert((selection
-                                & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0))
+                                      & OSSL_KEYMGMT_SELECT_PRIVATE_KEY)
+            != 0))
         || !TEST_FL_ptr(mem_ser = BIO_new(BIO_s_mem()))
         || !TEST_FL_int_ge(i2b_PVK_bio_ex(mem_ser, pkey, enc,
-                                          pass_pw, (void *)pass, testctx, testpropq), 0)
+                               pass_pw, (void *)pass, testctx, testpropq),
+            0)
         || !TEST_FL_true(BIO_get_mem_ptr(mem_ser, &mem_buf) > 0)
         || !TEST_FL_ptr(*encoded = mem_buf->data)
         || !TEST_FL_long_gt(*encoded_len = mem_buf->length, 0))
@@ -474,21 +470,21 @@ static int encode_EVP_PKEY_PVK(const char *file, const int line,
     mem_buf->data = NULL;
     mem_buf->length = 0;
     ok = 1;
- end:
+end:
     BIO_free(mem_ser);
     return ok;
 }
 
 static int test_text(const char *file, const int line,
-                     const void *data1, size_t data1_len,
-                     const void *data2, size_t data2_len)
+    const void *data1, size_t data1_len,
+    const void *data2, size_t data2_len)
 {
     return TEST_FL_strn2_eq(data1, data1_len, data2, data2_len);
 }
 
 static int test_mem(const char *file, const int line,
-                    const void *data1, size_t data1_len,
-                    const void *data2, size_t data2_len)
+    const void *data1, size_t data1_len,
+    const void *data2, size_t data2_len)
 {
     return TEST_FL_mem_eq(data1, data1_len, data2, data2_len);
 }
@@ -529,12 +525,11 @@ static void dump_pem(const char *label, const void *data, size_t data_len)
 }
 
 static int check_unprotected_PKCS8_DER(const char *file, const int line,
-                                       const char *type,
-                                       const void *data, size_t data_len)
+    const char *type,
+    const void *data, size_t data_len)
 {
     const unsigned char *datap = data;
-    PKCS8_PRIV_KEY_INFO *p8inf =
-        d2i_PKCS8_PRIV_KEY_INFO(NULL, &datap, data_len);
+    PKCS8_PRIV_KEY_INFO *p8inf = d2i_PKCS8_PRIV_KEY_INFO(NULL, &datap, data_len);
     int ok = 0;
 
     if (TEST_FL_ptr(p8inf)) {
@@ -559,39 +554,38 @@ static int check_unprotected_PKCS8_DER(const char *file, const int line,
 static int test_unprotected_via_DER(const char *type, EVP_PKEY *key, int fips)
 {
     return test_encode_decode(__FILE__, __LINE__, type, key,
-                              OSSL_KEYMGMT_SELECT_KEYPAIR
-                              | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS,
-                              "DER", "PrivateKeyInfo", NULL, NULL,
-                              encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
-                              test_mem, check_unprotected_PKCS8_DER,
-                              dump_der, fips ? 0 : FLAG_FAIL_IF_FIPS);
+        OSSL_KEYMGMT_SELECT_KEYPAIR
+            | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS,
+        "DER", "PrivateKeyInfo", NULL, NULL,
+        encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
+        test_mem, check_unprotected_PKCS8_DER,
+        dump_der, fips ? 0 : FLAG_FAIL_IF_FIPS);
 }
 
 static int check_unprotected_PKCS8_PEM(const char *file, const int line,
-                                       const char *type,
-                                       const void *data, size_t data_len)
+    const char *type,
+    const void *data, size_t data_len)
 {
-    static const char expected_pem_header[] =
-        "-----BEGIN " PEM_STRING_PKCS8INF "-----";
+    static const char expected_pem_header[] = "-----BEGIN " PEM_STRING_PKCS8INF "-----";
 
     return TEST_FL_strn_eq(data, expected_pem_header,
-                        sizeof(expected_pem_header) - 1);
+        sizeof(expected_pem_header) - 1);
 }
 
 static int test_unprotected_via_PEM(const char *type, EVP_PKEY *key, int fips)
 {
     return test_encode_decode(__FILE__, __LINE__, type, key,
-                              OSSL_KEYMGMT_SELECT_KEYPAIR
-                              | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS,
-                              "PEM", "PrivateKeyInfo", NULL, NULL,
-                              encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
-                              test_text, check_unprotected_PKCS8_PEM,
-                              dump_pem, fips ? 0 : FLAG_FAIL_IF_FIPS);
+        OSSL_KEYMGMT_SELECT_KEYPAIR
+            | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS,
+        "PEM", "PrivateKeyInfo", NULL, NULL,
+        encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
+        test_text, check_unprotected_PKCS8_PEM,
+        dump_pem, fips ? 0 : FLAG_FAIL_IF_FIPS);
 }
 
 #ifndef OPENSSL_NO_KEYPARAMS
 static int check_params_DER(const char *file, const int line,
-                            const char *type, const void *data, size_t data_len)
+    const char *type, const void *data, size_t data_len)
 {
     const unsigned char *datap = data;
     int ok = 0;
@@ -602,9 +596,9 @@ static int check_params_DER(const char *file, const int line,
         itype = EVP_PKEY_DH;
     else if (strcmp(type, "X9.42 DH") == 0)
         itype = EVP_PKEY_DHX;
-    else if (strcmp(type, "DSA") ==  0)
+    else if (strcmp(type, "DSA") == 0)
         itype = EVP_PKEY_DSA;
-    else if (strcmp(type, "EC") ==  0)
+    else if (strcmp(type, "EC") == 0)
         itype = EVP_PKEY_EC;
 
     if (itype != NID_undef) {
@@ -617,47 +611,47 @@ static int check_params_DER(const char *file, const int line,
 }
 
 static int check_params_PEM(const char *file, const int line,
-                            const char *type,
-                            const void *data, size_t data_len)
+    const char *type,
+    const void *data, size_t data_len)
 {
     static char expected_pem_header[80];
 
-    return
-        TEST_FL_int_gt(BIO_snprintf(expected_pem_header,
-                                 sizeof(expected_pem_header),
-                                 "-----BEGIN %s PARAMETERS-----", type), 0)
+    return TEST_FL_int_gt(BIO_snprintf(expected_pem_header,
+                              sizeof(expected_pem_header),
+                              "-----BEGIN %s PARAMETERS-----", type),
+               0)
         && TEST_FL_strn_eq(data, expected_pem_header, strlen(expected_pem_header));
 }
 
 static int test_params_via_DER(const char *type, EVP_PKEY *key)
 {
     return test_encode_decode(__FILE__, __LINE__, type, key, OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                              "DER", "type-specific", NULL, NULL,
-                              encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
-                              test_mem, check_params_DER,
-                              dump_der, FLAG_DECODE_WITH_TYPE);
+        "DER", "type-specific", NULL, NULL,
+        encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
+        test_mem, check_params_DER,
+        dump_der, FLAG_DECODE_WITH_TYPE);
 }
 
 static int test_params_via_PEM(const char *type, EVP_PKEY *key)
 {
     return test_encode_decode(__FILE__, __LINE__, type, key, OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                              "PEM", "type-specific", NULL, NULL,
-                              encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
-                              test_text, check_params_PEM,
-                              dump_pem, 0);
+        "PEM", "type-specific", NULL, NULL,
+        encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
+        test_text, check_params_PEM,
+        dump_pem, 0);
 }
 #endif /* !OPENSSL_NO_KEYPARAMS */
 
 static int check_unprotected_legacy_PEM(const char *file, const int line,
-                                        const char *type,
-                                        const void *data, size_t data_len)
+    const char *type,
+    const void *data, size_t data_len)
 {
     static char expected_pem_header[80];
 
-    return
-        TEST_FL_int_gt(BIO_snprintf(expected_pem_header,
-                                 sizeof(expected_pem_header),
-                                 "-----BEGIN %s PRIVATE KEY-----", type), 0)
+    return TEST_FL_int_gt(BIO_snprintf(expected_pem_header,
+                              sizeof(expected_pem_header),
+                              "-----BEGIN %s PRIVATE KEY-----", type),
+               0)
         && TEST_FL_strn_eq(data, expected_pem_header, strlen(expected_pem_header));
 }
 
@@ -667,16 +661,16 @@ static int test_unprotected_via_legacy_PEM(const char *type, EVP_PKEY *key)
         return TEST_skip("Test not available if using a non-default library context or FIPS provider");
 
     return test_encode_decode(__FILE__, __LINE__, type, key,
-                              OSSL_KEYMGMT_SELECT_KEYPAIR
-                              | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                              "PEM", "type-specific", NULL, NULL,
-                              encode_EVP_PKEY_legacy_PEM, decode_EVP_PKEY_prov,
-                              test_text, check_unprotected_legacy_PEM,
-                              dump_pem, 0);
+        OSSL_KEYMGMT_SELECT_KEYPAIR
+            | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+        "PEM", "type-specific", NULL, NULL,
+        encode_EVP_PKEY_legacy_PEM, decode_EVP_PKEY_prov,
+        test_text, check_unprotected_legacy_PEM,
+        dump_pem, 0);
 }
 
 static int check_MSBLOB(const char *file, const int line,
-                        const char *type, const void *data, size_t data_len)
+    const char *type, const void *data, size_t data_len)
 {
     const unsigned char *datap = data;
     EVP_PKEY *pkey = b2i_PrivateKey(&datap, data_len);
@@ -689,16 +683,16 @@ static int check_MSBLOB(const char *file, const int line,
 static int test_unprotected_via_MSBLOB(const char *type, EVP_PKEY *key)
 {
     return test_encode_decode(__FILE__, __LINE__, type, key,
-                              OSSL_KEYMGMT_SELECT_KEYPAIR
-                              | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                              "MSBLOB", NULL, NULL, NULL,
-                              encode_EVP_PKEY_MSBLOB, decode_EVP_PKEY_prov,
-                              test_mem, check_MSBLOB,
-                              dump_der, 0);
+        OSSL_KEYMGMT_SELECT_KEYPAIR
+            | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+        "MSBLOB", NULL, NULL, NULL,
+        encode_EVP_PKEY_MSBLOB, decode_EVP_PKEY_prov,
+        test_mem, check_MSBLOB,
+        dump_der, 0);
 }
 
 static int check_PVK(const char *file, const int line,
-                     const char *type, const void *data, size_t data_len)
+    const char *type, const void *data, size_t data_len)
 {
     const unsigned char *in = data;
     unsigned int saltlen = 0, keylen = 0;
@@ -710,20 +704,20 @@ static int check_PVK(const char *file, const int line,
 static int test_unprotected_via_PVK(const char *type, EVP_PKEY *key)
 {
     return test_encode_decode(__FILE__, __LINE__, type, key,
-                              OSSL_KEYMGMT_SELECT_KEYPAIR
-                              | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                              "PVK", NULL, NULL, NULL,
-                              encode_EVP_PKEY_PVK, decode_EVP_PKEY_prov,
-                              test_mem, check_PVK,
-                              dump_der, 0);
+        OSSL_KEYMGMT_SELECT_KEYPAIR
+            | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+        "PVK", NULL, NULL, NULL,
+        encode_EVP_PKEY_PVK, decode_EVP_PKEY_prov,
+        test_mem, check_PVK,
+        dump_der, 0);
 }
 
 static const char *pass_cipher = "AES-256-CBC";
 static const char *pass = "the holy handgrenade of antioch";
 
 static int check_protected_PKCS8_DER(const char *file, const int line,
-                                     const char *type,
-                                     const void *data, size_t data_len)
+    const char *type,
+    const void *data, size_t data_len)
 {
     const unsigned char *datap = data;
     X509_SIG *p8 = d2i_X509_SIG(NULL, &datap, data_len);
@@ -736,48 +730,47 @@ static int check_protected_PKCS8_DER(const char *file, const int line,
 static int test_protected_via_DER(const char *type, EVP_PKEY *key, int fips)
 {
     return test_encode_decode(__FILE__, __LINE__, type, key,
-                              OSSL_KEYMGMT_SELECT_KEYPAIR
-                              | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                              "DER", "EncryptedPrivateKeyInfo",
-                              pass, pass_cipher,
-                              encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
-                              test_mem, check_protected_PKCS8_DER,
-                              dump_der, fips ? 0 : FLAG_FAIL_IF_FIPS);
+        OSSL_KEYMGMT_SELECT_KEYPAIR
+            | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+        "DER", "EncryptedPrivateKeyInfo",
+        pass, pass_cipher,
+        encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
+        test_mem, check_protected_PKCS8_DER,
+        dump_der, fips ? 0 : FLAG_FAIL_IF_FIPS);
 }
 
 static int check_protected_PKCS8_PEM(const char *file, const int line,
-                                     const char *type,
-                                     const void *data, size_t data_len)
+    const char *type,
+    const void *data, size_t data_len)
 {
-    static const char expected_pem_header[] =
-        "-----BEGIN " PEM_STRING_PKCS8 "-----";
+    static const char expected_pem_header[] = "-----BEGIN " PEM_STRING_PKCS8 "-----";
 
     return TEST_FL_strn_eq(data, expected_pem_header,
-                        sizeof(expected_pem_header) - 1);
+        sizeof(expected_pem_header) - 1);
 }
 
 static int test_protected_via_PEM(const char *type, EVP_PKEY *key, int fips)
 {
     return test_encode_decode(__FILE__, __LINE__, type, key,
-                              OSSL_KEYMGMT_SELECT_KEYPAIR
-                              | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                              "PEM", "EncryptedPrivateKeyInfo",
-                              pass, pass_cipher,
-                              encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
-                              test_text, check_protected_PKCS8_PEM,
-                              dump_pem, fips ? 0 : FLAG_FAIL_IF_FIPS);
+        OSSL_KEYMGMT_SELECT_KEYPAIR
+            | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+        "PEM", "EncryptedPrivateKeyInfo",
+        pass, pass_cipher,
+        encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
+        test_text, check_protected_PKCS8_PEM,
+        dump_pem, fips ? 0 : FLAG_FAIL_IF_FIPS);
 }
 
 static int check_protected_legacy_PEM(const char *file, const int line,
-                                      const char *type,
-                                      const void *data, size_t data_len)
+    const char *type,
+    const void *data, size_t data_len)
 {
     static char expected_pem_header[80];
 
-    return
-        TEST_FL_int_gt(BIO_snprintf(expected_pem_header,
-                                 sizeof(expected_pem_header),
-                                 "-----BEGIN %s PRIVATE KEY-----", type), 0)
+    return TEST_FL_int_gt(BIO_snprintf(expected_pem_header,
+                              sizeof(expected_pem_header),
+                              "-----BEGIN %s PRIVATE KEY-----", type),
+               0)
         && TEST_FL_strn_eq(data, expected_pem_header, strlen(expected_pem_header))
         && TEST_FL_ptr(strstr(data, "\nDEK-Info: "));
 }
@@ -788,12 +781,12 @@ static int test_protected_via_legacy_PEM(const char *type, EVP_PKEY *key)
         return TEST_skip("Test not available if using a non-default library context or FIPS provider");
 
     return test_encode_decode(__FILE__, __LINE__, type, key,
-                              OSSL_KEYMGMT_SELECT_KEYPAIR
-                              | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                              "PEM", "type-specific", pass, pass_cipher,
-                              encode_EVP_PKEY_legacy_PEM, decode_EVP_PKEY_prov,
-                              test_text, check_protected_legacy_PEM,
-                              dump_pem, 0);
+        OSSL_KEYMGMT_SELECT_KEYPAIR
+            | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+        "PEM", "type-specific", pass, pass_cipher,
+        encode_EVP_PKEY_legacy_PEM, decode_EVP_PKEY_prov,
+        test_text, check_protected_legacy_PEM,
+        dump_pem, 0);
 }
 
 #ifndef OPENSSL_NO_RC4
@@ -805,18 +798,18 @@ static int test_protected_via_PVK(const char *type, EVP_PKEY *key)
         return TEST_skip("Legacy provider not available");
 
     ret = test_encode_decode(__FILE__, __LINE__, type, key,
-                              OSSL_KEYMGMT_SELECT_KEYPAIR
-                              | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                              "PVK", NULL, pass, NULL,
-                              encode_EVP_PKEY_PVK, decode_EVP_PKEY_prov,
-                              test_mem, check_PVK, dump_der, 0);
+        OSSL_KEYMGMT_SELECT_KEYPAIR
+            | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+        "PVK", NULL, pass, NULL,
+        encode_EVP_PKEY_PVK, decode_EVP_PKEY_prov,
+        test_mem, check_PVK, dump_der, 0);
     OSSL_PROVIDER_unload(lgcyprov);
     return ret;
 }
 #endif
 
 static int check_public_DER(const char *file, const int line,
-                            const char *type, const void *data, size_t data_len)
+    const char *type, const void *data, size_t data_len)
 {
     const unsigned char *datap = data;
     EVP_PKEY *pkey = d2i_PUBKEY_ex(NULL, &datap, data_len, testctx, testpropq);
@@ -829,39 +822,37 @@ static int check_public_DER(const char *file, const int line,
 static int test_public_via_DER(const char *type, EVP_PKEY *key, int fips)
 {
     return test_encode_decode(__FILE__, __LINE__, type, key,
-                              OSSL_KEYMGMT_SELECT_PUBLIC_KEY
-                              | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS,
-                              "DER", "SubjectPublicKeyInfo", NULL, NULL,
-                              encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
-                              test_mem, check_public_DER, dump_der,
-                              fips ? 0 : FLAG_FAIL_IF_FIPS);
+        OSSL_KEYMGMT_SELECT_PUBLIC_KEY
+            | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS,
+        "DER", "SubjectPublicKeyInfo", NULL, NULL,
+        encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
+        test_mem, check_public_DER, dump_der,
+        fips ? 0 : FLAG_FAIL_IF_FIPS);
 }
 
 static int check_public_PEM(const char *file, const int line,
-                            const char *type, const void *data, size_t data_len)
+    const char *type, const void *data, size_t data_len)
 {
-    static const char expected_pem_header[] =
-        "-----BEGIN " PEM_STRING_PUBLIC "-----";
+    static const char expected_pem_header[] = "-----BEGIN " PEM_STRING_PUBLIC "-----";
 
-    return
-        TEST_FL_strn_eq(data, expected_pem_header,
-                     sizeof(expected_pem_header) - 1);
+    return TEST_FL_strn_eq(data, expected_pem_header,
+        sizeof(expected_pem_header) - 1);
 }
 
 static int test_public_via_PEM(const char *type, EVP_PKEY *key, int fips)
 {
     return test_encode_decode(__FILE__, __LINE__, type, key,
-                              OSSL_KEYMGMT_SELECT_PUBLIC_KEY
-                              | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS,
-                              "PEM", "SubjectPublicKeyInfo", NULL, NULL,
-                              encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
-                              test_text, check_public_PEM, dump_pem,
-                              fips ? 0 : FLAG_FAIL_IF_FIPS);
+        OSSL_KEYMGMT_SELECT_PUBLIC_KEY
+            | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS,
+        "PEM", "SubjectPublicKeyInfo", NULL, NULL,
+        encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
+        test_text, check_public_PEM, dump_pem,
+        fips ? 0 : FLAG_FAIL_IF_FIPS);
 }
 
 static int check_public_MSBLOB(const char *file, const int line,
-                               const char *type,
-                               const void *data, size_t data_len)
+    const char *type,
+    const void *data, size_t data_len)
 {
     const unsigned char *datap = data;
     EVP_PKEY *pkey = b2i_PublicKey(&datap, data_len);
@@ -873,126 +864,121 @@ static int check_public_MSBLOB(const char *file, const int line,
 
 static int test_public_via_MSBLOB(const char *type, EVP_PKEY *key)
 {
-    return test_encode_decode(__FILE__, __LINE__, type, key, OSSL_KEYMGMT_SELECT_PUBLIC_KEY
-                              | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                              "MSBLOB", NULL, NULL, NULL,
-                              encode_EVP_PKEY_MSBLOB, decode_EVP_PKEY_prov,
-                              test_mem, check_public_MSBLOB, dump_der, 0);
+    return test_encode_decode(__FILE__, __LINE__, type, key, OSSL_KEYMGMT_SELECT_PUBLIC_KEY | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
+        "MSBLOB", NULL, NULL, NULL,
+        encode_EVP_PKEY_MSBLOB, decode_EVP_PKEY_prov,
+        test_mem, check_public_MSBLOB, dump_der, 0);
 }
 
-#define KEYS(KEYTYPE)                           \
+#define KEYS(KEYTYPE) \
     static EVP_PKEY *key_##KEYTYPE = NULL
-#define MAKE_KEYS(KEYTYPE, KEYTYPEstr, params)                          \
-    ok = ok                                                             \
+#define MAKE_KEYS(KEYTYPE, KEYTYPEstr, params) \
+    ok = ok                                    \
         && TEST_ptr(key_##KEYTYPE = make_key(KEYTYPEstr, NULL, params))
-#define FREE_KEYS(KEYTYPE)                                              \
-    EVP_PKEY_free(key_##KEYTYPE);                                       \
+#define FREE_KEYS(KEYTYPE) \
+    EVP_PKEY_free(key_##KEYTYPE);
 
 #define DOMAIN_KEYS(KEYTYPE)                    \
     static EVP_PKEY *template_##KEYTYPE = NULL; \
     static EVP_PKEY *key_##KEYTYPE = NULL
-#define MAKE_DOMAIN_KEYS(KEYTYPE, KEYTYPEstr, params)                   \
-    ok = ok                                                             \
-        && TEST_ptr(template_##KEYTYPE =                                \
-                    make_template(KEYTYPEstr, params))                  \
-        && TEST_ptr(key_##KEYTYPE =                                     \
-                    make_key(KEYTYPEstr, template_##KEYTYPE, NULL))
-#define FREE_DOMAIN_KEYS(KEYTYPE)                                       \
-    EVP_PKEY_free(template_##KEYTYPE);                                  \
+#define MAKE_DOMAIN_KEYS(KEYTYPE, KEYTYPEstr, params)                       \
+    ok = ok                                                                 \
+        && TEST_ptr(template_##KEYTYPE = make_template(KEYTYPEstr, params)) \
+        && TEST_ptr(key_##KEYTYPE = make_key(KEYTYPEstr, template_##KEYTYPE, NULL))
+#define FREE_DOMAIN_KEYS(KEYTYPE)      \
+    EVP_PKEY_free(template_##KEYTYPE); \
     EVP_PKEY_free(key_##KEYTYPE)
 
-#define IMPLEMENT_TEST_SUITE(KEYTYPE, KEYTYPEstr, fips)                 \
-    static int test_unprotected_##KEYTYPE##_via_DER(void)               \
-    {                                                                   \
+#define IMPLEMENT_TEST_SUITE(KEYTYPE, KEYTYPEstr, fips)                   \
+    static int test_unprotected_##KEYTYPE##_via_DER(void)                 \
+    {                                                                     \
         return test_unprotected_via_DER(KEYTYPEstr, key_##KEYTYPE, fips); \
-    }                                                                   \
-    static int test_unprotected_##KEYTYPE##_via_PEM(void)               \
-    {                                                                   \
+    }                                                                     \
+    static int test_unprotected_##KEYTYPE##_via_PEM(void)                 \
+    {                                                                     \
         return test_unprotected_via_PEM(KEYTYPEstr, key_##KEYTYPE, fips); \
-    }                                                                   \
-    static int test_protected_##KEYTYPE##_via_DER(void)                 \
-    {                                                                   \
-        return test_protected_via_DER(KEYTYPEstr, key_##KEYTYPE, fips); \
-    }                                                                   \
-    static int test_protected_##KEYTYPE##_via_PEM(void)                 \
-    {                                                                   \
-        return test_protected_via_PEM(KEYTYPEstr, key_##KEYTYPE, fips); \
-    }                                                                   \
-    static int test_public_##KEYTYPE##_via_DER(void)                    \
-    {                                                                   \
-        return test_public_via_DER(KEYTYPEstr, key_##KEYTYPE, fips);    \
-    }                                                                   \
-    static int test_public_##KEYTYPE##_via_PEM(void)                    \
-    {                                                                   \
-        return test_public_via_PEM(KEYTYPEstr, key_##KEYTYPE, fips);    \
+    }                                                                     \
+    static int test_protected_##KEYTYPE##_via_DER(void)                   \
+    {                                                                     \
+        return test_protected_via_DER(KEYTYPEstr, key_##KEYTYPE, fips);   \
+    }                                                                     \
+    static int test_protected_##KEYTYPE##_via_PEM(void)                   \
+    {                                                                     \
+        return test_protected_via_PEM(KEYTYPEstr, key_##KEYTYPE, fips);   \
+    }                                                                     \
+    static int test_public_##KEYTYPE##_via_DER(void)                      \
+    {                                                                     \
+        return test_public_via_DER(KEYTYPEstr, key_##KEYTYPE, fips);      \
+    }                                                                     \
+    static int test_public_##KEYTYPE##_via_PEM(void)                      \
+    {                                                                     \
+        return test_public_via_PEM(KEYTYPEstr, key_##KEYTYPE, fips);      \
     }
 
-#define ADD_TEST_SUITE(KEYTYPE)                                 \
-    ADD_TEST(test_unprotected_##KEYTYPE##_via_DER);             \
-    ADD_TEST(test_unprotected_##KEYTYPE##_via_PEM);             \
-    ADD_TEST(test_protected_##KEYTYPE##_via_DER);               \
-    ADD_TEST(test_protected_##KEYTYPE##_via_PEM);               \
-    ADD_TEST(test_public_##KEYTYPE##_via_DER);                  \
+#define ADD_TEST_SUITE(KEYTYPE)                     \
+    ADD_TEST(test_unprotected_##KEYTYPE##_via_DER); \
+    ADD_TEST(test_unprotected_##KEYTYPE##_via_PEM); \
+    ADD_TEST(test_protected_##KEYTYPE##_via_DER);   \
+    ADD_TEST(test_protected_##KEYTYPE##_via_PEM);   \
+    ADD_TEST(test_public_##KEYTYPE##_via_DER);      \
     ADD_TEST(test_public_##KEYTYPE##_via_PEM)
 
-#define IMPLEMENT_TEST_SUITE_PARAMS(KEYTYPE, KEYTYPEstr)           \
-    static int test_params_##KEYTYPE##_via_DER(void)               \
-    {                                                              \
-        return test_params_via_DER(KEYTYPEstr, key_##KEYTYPE);     \
-    }                                                              \
-    static int test_params_##KEYTYPE##_via_PEM(void)               \
-    {                                                              \
-        return test_params_via_PEM(KEYTYPEstr, key_##KEYTYPE);     \
+#define IMPLEMENT_TEST_SUITE_PARAMS(KEYTYPE, KEYTYPEstr)       \
+    static int test_params_##KEYTYPE##_via_DER(void)           \
+    {                                                          \
+        return test_params_via_DER(KEYTYPEstr, key_##KEYTYPE); \
+    }                                                          \
+    static int test_params_##KEYTYPE##_via_PEM(void)           \
+    {                                                          \
+        return test_params_via_PEM(KEYTYPEstr, key_##KEYTYPE); \
     }
 
-#define ADD_TEST_SUITE_PARAMS(KEYTYPE)                          \
-    ADD_TEST(test_params_##KEYTYPE##_via_DER);                  \
+#define ADD_TEST_SUITE_PARAMS(KEYTYPE)         \
+    ADD_TEST(test_params_##KEYTYPE##_via_DER); \
     ADD_TEST(test_params_##KEYTYPE##_via_PEM)
 
-#define IMPLEMENT_TEST_SUITE_LEGACY(KEYTYPE, KEYTYPEstr)                \
-    static int test_unprotected_##KEYTYPE##_via_legacy_PEM(void)        \
-    {                                                                   \
-        return                                                          \
-            test_unprotected_via_legacy_PEM(KEYTYPEstr, key_##KEYTYPE); \
-    }                                                                   \
-    static int test_protected_##KEYTYPE##_via_legacy_PEM(void)          \
-    {                                                                   \
-        return                                                          \
-            test_protected_via_legacy_PEM(KEYTYPEstr, key_##KEYTYPE);   \
+#define IMPLEMENT_TEST_SUITE_LEGACY(KEYTYPE, KEYTYPEstr)                   \
+    static int test_unprotected_##KEYTYPE##_via_legacy_PEM(void)           \
+    {                                                                      \
+        return test_unprotected_via_legacy_PEM(KEYTYPEstr, key_##KEYTYPE); \
+    }                                                                      \
+    static int test_protected_##KEYTYPE##_via_legacy_PEM(void)             \
+    {                                                                      \
+        return test_protected_via_legacy_PEM(KEYTYPEstr, key_##KEYTYPE);   \
     }
 
-#define ADD_TEST_SUITE_LEGACY(KEYTYPE)                                  \
-    ADD_TEST(test_unprotected_##KEYTYPE##_via_legacy_PEM);              \
+#define ADD_TEST_SUITE_LEGACY(KEYTYPE)                     \
+    ADD_TEST(test_unprotected_##KEYTYPE##_via_legacy_PEM); \
     ADD_TEST(test_protected_##KEYTYPE##_via_legacy_PEM)
 
-#define IMPLEMENT_TEST_SUITE_MSBLOB(KEYTYPE, KEYTYPEstr)                \
-    static int test_unprotected_##KEYTYPE##_via_MSBLOB(void)            \
-    {                                                                   \
-        return test_unprotected_via_MSBLOB(KEYTYPEstr, key_##KEYTYPE);  \
-    }                                                                   \
-    static int test_public_##KEYTYPE##_via_MSBLOB(void)                 \
-    {                                                                   \
-        return test_public_via_MSBLOB(KEYTYPEstr, key_##KEYTYPE);       \
+#define IMPLEMENT_TEST_SUITE_MSBLOB(KEYTYPE, KEYTYPEstr)               \
+    static int test_unprotected_##KEYTYPE##_via_MSBLOB(void)           \
+    {                                                                  \
+        return test_unprotected_via_MSBLOB(KEYTYPEstr, key_##KEYTYPE); \
+    }                                                                  \
+    static int test_public_##KEYTYPE##_via_MSBLOB(void)                \
+    {                                                                  \
+        return test_public_via_MSBLOB(KEYTYPEstr, key_##KEYTYPE);      \
     }
 
-#define ADD_TEST_SUITE_MSBLOB(KEYTYPE)                                  \
-    ADD_TEST(test_unprotected_##KEYTYPE##_via_MSBLOB);                  \
+#define ADD_TEST_SUITE_MSBLOB(KEYTYPE)                 \
+    ADD_TEST(test_unprotected_##KEYTYPE##_via_MSBLOB); \
     ADD_TEST(test_public_##KEYTYPE##_via_MSBLOB)
 
-#define IMPLEMENT_TEST_SUITE_UNPROTECTED_PVK(KEYTYPE, KEYTYPEstr)       \
-    static int test_unprotected_##KEYTYPE##_via_PVK(void)               \
-    {                                                                   \
-        return test_unprotected_via_PVK(KEYTYPEstr, key_##KEYTYPE);     \
+#define IMPLEMENT_TEST_SUITE_UNPROTECTED_PVK(KEYTYPE, KEYTYPEstr)   \
+    static int test_unprotected_##KEYTYPE##_via_PVK(void)           \
+    {                                                               \
+        return test_unprotected_via_PVK(KEYTYPEstr, key_##KEYTYPE); \
     }
-# define ADD_TEST_SUITE_UNPROTECTED_PVK(KEYTYPE)                        \
+#define ADD_TEST_SUITE_UNPROTECTED_PVK(KEYTYPE) \
     ADD_TEST(test_unprotected_##KEYTYPE##_via_PVK)
 #ifndef OPENSSL_NO_RC4
-# define IMPLEMENT_TEST_SUITE_PROTECTED_PVK(KEYTYPE, KEYTYPEstr)        \
-    static int test_protected_##KEYTYPE##_via_PVK(void)                 \
-    {                                                                   \
-        return test_protected_via_PVK(KEYTYPEstr, key_##KEYTYPE);       \
+#define IMPLEMENT_TEST_SUITE_PROTECTED_PVK(KEYTYPE, KEYTYPEstr)   \
+    static int test_protected_##KEYTYPE##_via_PVK(void)           \
+    {                                                             \
+        return test_protected_via_PVK(KEYTYPEstr, key_##KEYTYPE); \
     }
-# define ADD_TEST_SUITE_PROTECTED_PVK(KEYTYPE)                          \
+#define ADD_TEST_SUITE_PROTECTED_PVK(KEYTYPE) \
     ADD_TEST(test_protected_##KEYTYPE##_via_PVK)
 #endif
 
@@ -1015,9 +1001,9 @@ IMPLEMENT_TEST_SUITE_PARAMS(DSA, "DSA")
 IMPLEMENT_TEST_SUITE_LEGACY(DSA, "DSA")
 IMPLEMENT_TEST_SUITE_MSBLOB(DSA, "DSA")
 IMPLEMENT_TEST_SUITE_UNPROTECTED_PVK(DSA, "DSA")
-# ifndef OPENSSL_NO_RC4
+#ifndef OPENSSL_NO_RC4
 IMPLEMENT_TEST_SUITE_PROTECTED_PVK(DSA, "DSA")
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_EC
 DOMAIN_KEYS(EC);
@@ -1030,18 +1016,18 @@ IMPLEMENT_TEST_SUITE_LEGACY(ECExplicitPrimeNamedCurve, "EC")
 DOMAIN_KEYS(ECExplicitPrime2G);
 IMPLEMENT_TEST_SUITE(ECExplicitPrime2G, "EC", 0)
 IMPLEMENT_TEST_SUITE_LEGACY(ECExplicitPrime2G, "EC")
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
 DOMAIN_KEYS(ECExplicitTriNamedCurve);
 IMPLEMENT_TEST_SUITE(ECExplicitTriNamedCurve, "EC", 1)
 IMPLEMENT_TEST_SUITE_LEGACY(ECExplicitTriNamedCurve, "EC")
 DOMAIN_KEYS(ECExplicitTri2G);
 IMPLEMENT_TEST_SUITE(ECExplicitTri2G, "EC", 0)
 IMPLEMENT_TEST_SUITE_LEGACY(ECExplicitTri2G, "EC")
-# endif
-# ifndef OPENSSL_NO_SM2
+#endif
+#ifndef OPENSSL_NO_SM2
 KEYS(SM2);
 IMPLEMENT_TEST_SUITE(SM2, "SM2", 0)
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_ECX
 /*
@@ -1122,8 +1108,8 @@ IMPLEMENT_TEST_SUITE(ML_DSA_87, "ML-DSA-87", 1)
 #ifndef OPENSSL_NO_EC
 /* Explicit parameters that match a named curve */
 static int do_create_ec_explicit_prime_params(OSSL_PARAM_BLD *bld,
-                                              const unsigned char *gen,
-                                              size_t gen_len)
+    const unsigned char *gen,
+    size_t gen_len)
 {
     BIGNUM *a, *b, *prime, *order;
 
@@ -1160,27 +1146,27 @@ static int do_create_ec_explicit_prime_params(OSSL_PARAM_BLD *bld,
         0x84, 0xf3, 0xb9, 0xca, 0xc2, 0xfc, 0x63, 0x25, 0x51
     };
     return TEST_ptr(a = BN_CTX_get(bnctx))
-           && TEST_ptr(b = BN_CTX_get(bnctx))
-           && TEST_ptr(prime = BN_CTX_get(bnctx))
-           && TEST_ptr(order = BN_CTX_get(bnctx))
-           && TEST_ptr(BN_bin2bn(prime_data, sizeof(prime_data), prime))
-           && TEST_ptr(BN_bin2bn(a_data, sizeof(a_data), a))
-           && TEST_ptr(BN_bin2bn(b_data, sizeof(b_data), b))
-           && TEST_ptr(BN_bin2bn(order_data, sizeof(order_data), order))
-           && TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld,
-                            OSSL_PKEY_PARAM_EC_FIELD_TYPE, SN_X9_62_prime_field,
-                            0))
-           && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_P, prime))
-           && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_A, a))
-           && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_B, b))
-           && TEST_true(OSSL_PARAM_BLD_push_BN(bld,
-                            OSSL_PKEY_PARAM_EC_ORDER, order))
-           && TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                            OSSL_PKEY_PARAM_EC_GENERATOR, gen, gen_len))
-           && TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                            OSSL_PKEY_PARAM_EC_SEED, seed, sizeof(seed)))
-           && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_COFACTOR,
-                                               BN_value_one()));
+        && TEST_ptr(b = BN_CTX_get(bnctx))
+        && TEST_ptr(prime = BN_CTX_get(bnctx))
+        && TEST_ptr(order = BN_CTX_get(bnctx))
+        && TEST_ptr(BN_bin2bn(prime_data, sizeof(prime_data), prime))
+        && TEST_ptr(BN_bin2bn(a_data, sizeof(a_data), a))
+        && TEST_ptr(BN_bin2bn(b_data, sizeof(b_data), b))
+        && TEST_ptr(BN_bin2bn(order_data, sizeof(order_data), order))
+        && TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld,
+            OSSL_PKEY_PARAM_EC_FIELD_TYPE, SN_X9_62_prime_field,
+            0))
+        && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_P, prime))
+        && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_A, a))
+        && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_B, b))
+        && TEST_true(OSSL_PARAM_BLD_push_BN(bld,
+            OSSL_PKEY_PARAM_EC_ORDER, order))
+        && TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
+            OSSL_PKEY_PARAM_EC_GENERATOR, gen, gen_len))
+        && TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
+            OSSL_PKEY_PARAM_EC_SEED, seed, sizeof(seed)))
+        && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_COFACTOR,
+            BN_value_one()));
 }
 
 static int create_ec_explicit_prime_params_namedcurve(OSSL_PARAM_BLD *bld)
@@ -1197,7 +1183,7 @@ static int create_ec_explicit_prime_params_namedcurve(OSSL_PARAM_BLD *bld)
         0xcb, 0xb6, 0x40, 0x68, 0x37, 0xbf, 0x51, 0xf5
     };
     return do_create_ec_explicit_prime_params(bld, prime256v1_gen,
-                                              sizeof(prime256v1_gen));
+        sizeof(prime256v1_gen));
 }
 
 static int create_ec_explicit_prime_params(OSSL_PARAM_BLD *bld)
@@ -1215,20 +1201,47 @@ static int create_ec_explicit_prime_params(OSSL_PARAM_BLD *bld)
         0xa8, 0xc6, 0x56, 0x2b, 0x94, 0xb1, 0xae, 0x55
     };
     return do_create_ec_explicit_prime_params(bld, prime256v1_gen2,
-                                              sizeof(prime256v1_gen2));
+        sizeof(prime256v1_gen2));
 }
 
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
 static int do_create_ec_explicit_trinomial_params(OSSL_PARAM_BLD *bld,
-                                                  const unsigned char *gen,
-                                                  size_t gen_len)
+    const unsigned char *gen,
+    size_t gen_len)
 {
     BIGNUM *a, *b, *poly, *order, *cofactor;
     /* sect233k1 characteristic-two-field tpBasis */
     static const unsigned char poly_data[] = {
-        0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+        0x02,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x04,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x01,
     };
     static const unsigned char a_data[] = {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1245,31 +1258,31 @@ static int do_create_ec_explicit_trinomial_params(OSSL_PARAM_BLD *bld,
         0x00, 0x00, 0x00, 0x06, 0x9D, 0x5B, 0xB9, 0x15, 0xBC, 0xD4, 0x6E, 0xFB,
         0x1A, 0xD5, 0xF1, 0x73, 0xAB, 0xDF
     };
-    static const unsigned char cofactor_data[]= {
+    static const unsigned char cofactor_data[] = {
         0x4
     };
     return TEST_ptr(a = BN_CTX_get(bnctx))
-           && TEST_ptr(b = BN_CTX_get(bnctx))
-           && TEST_ptr(poly = BN_CTX_get(bnctx))
-           && TEST_ptr(order = BN_CTX_get(bnctx))
-           && TEST_ptr(cofactor = BN_CTX_get(bnctx))
-           && TEST_ptr(BN_bin2bn(poly_data, sizeof(poly_data), poly))
-           && TEST_ptr(BN_bin2bn(a_data, sizeof(a_data), a))
-           && TEST_ptr(BN_bin2bn(b_data, sizeof(b_data), b))
-           && TEST_ptr(BN_bin2bn(order_data, sizeof(order_data), order))
-           && TEST_ptr(BN_bin2bn(cofactor_data, sizeof(cofactor_data), cofactor))
-           && TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld,
-                            OSSL_PKEY_PARAM_EC_FIELD_TYPE,
-                            SN_X9_62_characteristic_two_field, 0))
-           && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_P, poly))
-           && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_A, a))
-           && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_B, b))
-           && TEST_true(OSSL_PARAM_BLD_push_BN(bld,
-                            OSSL_PKEY_PARAM_EC_ORDER, order))
-           && TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                            OSSL_PKEY_PARAM_EC_GENERATOR, gen, gen_len))
-           && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_COFACTOR,
-                                               cofactor));
+        && TEST_ptr(b = BN_CTX_get(bnctx))
+        && TEST_ptr(poly = BN_CTX_get(bnctx))
+        && TEST_ptr(order = BN_CTX_get(bnctx))
+        && TEST_ptr(cofactor = BN_CTX_get(bnctx))
+        && TEST_ptr(BN_bin2bn(poly_data, sizeof(poly_data), poly))
+        && TEST_ptr(BN_bin2bn(a_data, sizeof(a_data), a))
+        && TEST_ptr(BN_bin2bn(b_data, sizeof(b_data), b))
+        && TEST_ptr(BN_bin2bn(order_data, sizeof(order_data), order))
+        && TEST_ptr(BN_bin2bn(cofactor_data, sizeof(cofactor_data), cofactor))
+        && TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld,
+            OSSL_PKEY_PARAM_EC_FIELD_TYPE,
+            SN_X9_62_characteristic_two_field, 0))
+        && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_P, poly))
+        && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_A, a))
+        && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_B, b))
+        && TEST_true(OSSL_PARAM_BLD_push_BN(bld,
+            OSSL_PKEY_PARAM_EC_ORDER, order))
+        && TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
+            OSSL_PKEY_PARAM_EC_GENERATOR, gen, gen_len))
+        && TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_EC_COFACTOR,
+            cofactor));
 }
 
 static int create_ec_explicit_trinomial_params_namedcurve(OSSL_PARAM_BLD *bld)
@@ -1299,7 +1312,7 @@ static int create_ec_explicit_trinomial_params(OSSL_PARAM_BLD *bld)
     };
     return do_create_ec_explicit_trinomial_params(bld, gen2, sizeof(gen2));
 }
-# endif /* OPENSSL_NO_EC2M */
+#endif /* OPENSSL_NO_EC2M */
 
 /*
  * Test that multiple calls to OSSL_ENCODER_to_data() do not cause side effects
@@ -1314,7 +1327,7 @@ static int ec_encode_to_data_multi(void)
 
     ret = TEST_ptr(key = EVP_PKEY_Q_keygen(testctx, "", "EC", "P-256"))
         && TEST_ptr(ectx = OSSL_ENCODER_CTX_new_for_pkey(key, EVP_PKEY_KEYPAIR,
-                                                         "DER", NULL, NULL))
+                        "DER", NULL, NULL))
         && TEST_int_eq(OSSL_ENCODER_to_data(ectx, NULL, &enc_len), 1)
         && TEST_int_eq(OSSL_ENCODER_to_data(ectx, &enc, &enc_len), 1);
     OPENSSL_free(enc);
@@ -1340,15 +1353,15 @@ const OPTIONS *test_get_options(void)
     static const OPTIONS options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
         { "context", OPT_CONTEXT, '-',
-          "Explicitly use a non-default library context" },
+            "Explicitly use a non-default library context" },
         { "rsa", OPT_RSA_FILE, '<',
-          "PEM format RSA key file to encode/decode" },
+            "PEM format RSA key file to encode/decode" },
         { "pss", OPT_RSA_PSS_FILE, '<',
-          "PEM format RSA-PSS key file to encode/decode" },
+            "PEM format RSA-PSS key file to encode/decode" },
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the library context" },
+            "The configuration file to use for the library context" },
         { "provider", OPT_PROVIDER_NAME, 's',
-          "The provider to load (The default value is 'default')" },
+            "The provider to load (The default value is 'default')" },
         { NULL }
     };
     return options;
@@ -1363,7 +1376,7 @@ int setup_tests(void)
     int ok = 1;
 
 #ifndef OPENSSL_NO_DSA
-    static size_t qbits = 160;  /* PVK only tolerates 160 Q bits */
+    static size_t qbits = 160; /* PVK only tolerates 160 Q bits */
     static size_t pbits = 1024; /* With 160 Q bits, we MUST use 1024 P bits */
     OSSL_PARAM DSA_params[] = {
         OSSL_PARAM_size_t("pbits", &pbits),
@@ -1446,15 +1459,15 @@ int setup_tests(void)
         || !create_ec_explicit_prime_params(bld_prime)
         || !TEST_ptr(ec_explicit_prime_params_nc = OSSL_PARAM_BLD_to_param(bld_prime_nc))
         || !TEST_ptr(ec_explicit_prime_params_explicit = OSSL_PARAM_BLD_to_param(bld_prime))
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
         || !TEST_ptr(bld_tri_nc = OSSL_PARAM_BLD_new())
         || !TEST_ptr(bld_tri = OSSL_PARAM_BLD_new())
         || !create_ec_explicit_trinomial_params_namedcurve(bld_tri_nc)
         || !create_ec_explicit_trinomial_params(bld_tri)
         || !TEST_ptr(ec_explicit_tri_params_nc = OSSL_PARAM_BLD_to_param(bld_tri_nc))
         || !TEST_ptr(ec_explicit_tri_params_explicit = OSSL_PARAM_BLD_to_param(bld_tri))
-# endif
-        )
+#endif
+    )
         return 0;
 #endif
 
@@ -1474,13 +1487,13 @@ int setup_tests(void)
     MAKE_DOMAIN_KEYS(EC, "EC", EC_params);
     MAKE_DOMAIN_KEYS(ECExplicitPrimeNamedCurve, "EC", ec_explicit_prime_params_nc);
     MAKE_DOMAIN_KEYS(ECExplicitPrime2G, "EC", ec_explicit_prime_params_explicit);
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
     MAKE_DOMAIN_KEYS(ECExplicitTriNamedCurve, "EC", ec_explicit_tri_params_nc);
     MAKE_DOMAIN_KEYS(ECExplicitTri2G, "EC", ec_explicit_tri_params_explicit);
-# endif
-# ifndef OPENSSL_NO_SM2
+#endif
+#ifndef OPENSSL_NO_SM2
     MAKE_KEYS(SM2, "SM2", NULL);
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_ECX
     MAKE_KEYS(ED25519, "ED25519", NULL);
@@ -1542,9 +1555,9 @@ int setup_tests(void)
         ADD_TEST_SUITE_LEGACY(DSA);
         ADD_TEST_SUITE_MSBLOB(DSA);
         ADD_TEST_SUITE_UNPROTECTED_PVK(DSA);
-# ifndef OPENSSL_NO_RC4
+#ifndef OPENSSL_NO_RC4
         ADD_TEST_SUITE_PROTECTED_PVK(DSA);
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_EC
         ADD_TEST(ec_encode_to_data_multi);
@@ -1555,18 +1568,18 @@ int setup_tests(void)
         ADD_TEST_SUITE_LEGACY(ECExplicitPrimeNamedCurve);
         ADD_TEST_SUITE(ECExplicitPrime2G);
         ADD_TEST_SUITE_LEGACY(ECExplicitPrime2G);
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
         ADD_TEST_SUITE(ECExplicitTriNamedCurve);
         ADD_TEST_SUITE_LEGACY(ECExplicitTriNamedCurve);
         ADD_TEST_SUITE(ECExplicitTri2G);
         ADD_TEST_SUITE_LEGACY(ECExplicitTri2G);
-# endif
-# ifndef OPENSSL_NO_SM2
+#endif
+#ifndef OPENSSL_NO_SM2
         if (!is_fips_3_0_0) {
             /* 3.0.0 FIPS provider imports explicit EC params and then fails. */
             ADD_TEST_SUITE(SM2);
         }
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_ECX
         ADD_TEST_SUITE(ED25519);
@@ -1594,9 +1607,9 @@ int setup_tests(void)
          */
         ADD_TEST_SUITE_MSBLOB(RSA);
         ADD_TEST_SUITE_UNPROTECTED_PVK(RSA);
-# ifndef OPENSSL_NO_RC4
+#ifndef OPENSSL_NO_RC4
         ADD_TEST_SUITE_PROTECTED_PVK(RSA);
-# endif
+#endif
 
 #ifndef OPENSSL_NO_ML_DSA
         if (!is_fips_lt_3_5) {
@@ -1634,12 +1647,12 @@ void cleanup_tests(void)
     OSSL_PARAM_free(ec_explicit_prime_params_explicit);
     OSSL_PARAM_BLD_free(bld_prime_nc);
     OSSL_PARAM_BLD_free(bld_prime);
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
     OSSL_PARAM_free(ec_explicit_tri_params_nc);
     OSSL_PARAM_free(ec_explicit_tri_params_explicit);
     OSSL_PARAM_BLD_free(bld_tri_nc);
     OSSL_PARAM_BLD_free(bld_tri);
-# endif
+#endif
     BN_CTX_free(bnctx);
 #endif /* OPENSSL_NO_EC */
 
@@ -1654,13 +1667,13 @@ void cleanup_tests(void)
     FREE_DOMAIN_KEYS(EC);
     FREE_DOMAIN_KEYS(ECExplicitPrimeNamedCurve);
     FREE_DOMAIN_KEYS(ECExplicitPrime2G);
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
     FREE_DOMAIN_KEYS(ECExplicitTriNamedCurve);
     FREE_DOMAIN_KEYS(ECExplicitTri2G);
-# endif
-# ifndef OPENSSL_NO_SM2
+#endif
+#ifndef OPENSSL_NO_SM2
     FREE_KEYS(SM2);
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_ECX
     FREE_KEYS(ED25519);
diff --git a/test/endecoder_legacy_test.c b/test/endecoder_legacy_test.c
index 943cba56e59f5..04f26174b5329 100644
--- a/test/endecoder_legacy_test.c
+++ b/test/endecoder_legacy_test.c
@@ -51,7 +51,7 @@
 #include <openssl/dh.h>
 #include <openssl/dsa.h>
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# include <openssl/rsa.h>
+#include <openssl/rsa.h>
 #endif
 #include "internal/nelem.h"
 #include "crypto/evp.h"
@@ -59,14 +59,14 @@
 #include "testutil.h"
 
 typedef int PEM_write_bio_of_void_protected(BIO *out, const void *obj,
-                                            const EVP_CIPHER *enc,
-                                            unsigned char *kstr, int klen,
-                                            pem_password_cb *cb, void *u);
+    const EVP_CIPHER *enc,
+    unsigned char *kstr, int klen,
+    pem_password_cb *cb, void *u);
 typedef int PEM_write_bio_of_void_unprotected(BIO *out, const void *obj);
 typedef void *PEM_read_bio_of_void(BIO *out, void **obj,
-                                   pem_password_cb *cb, void *u);
+    pem_password_cb *cb, void *u);
 typedef int EVP_PKEY_print_fn(BIO *out, const EVP_PKEY *pkey,
-                              int indent, ASN1_PCTX *pctx);
+    int indent, ASN1_PCTX *pctx);
 typedef int EVP_PKEY_eq_fn(const EVP_PKEY *a, const EVP_PKEY *b);
 
 static struct test_stanza_st {
@@ -94,95 +94,99 @@ static struct test_stanza_st {
 } test_stanzas[] = {
 #ifndef OPENSSL_NO_DH
     { "DH", { "DH", "type-specific" }, EVP_PKEY_DH,
-      NULL,                      /* No i2d_DHPrivateKey */
-      NULL,                      /* No i2d_DHPublicKey */
-      (i2d_of_void *)i2d_DHparams,
-      NULL,                      /* No i2d_DH_PUBKEY */
-      NULL,                      /* No PEM_write_bio_DHPrivateKey */
-      NULL,                      /* No PEM_write_bio_DHPublicKey */
-      (PEM_write_bio_of_void_unprotected *)PEM_write_bio_DHparams,
-      NULL,                      /* No PEM_write_bio_DH_PUBKEY */
-      NULL,                      /* No d2i_DHPrivateKey */
-      NULL,                      /* No d2i_DHPublicKey */
-      (d2i_of_void *)d2i_DHparams,
-      NULL,                      /* No d2i_DH_PUBKEY */
-      NULL,                      /* No PEM_read_bio_DHPrivateKey */
-      NULL,                      /* No PEM_read_bio_DHPublicKey */
-      (PEM_read_bio_of_void *)PEM_read_bio_DHparams,
-      NULL },                    /* No PEM_read_bio_DH_PUBKEY */
+        NULL, /* No i2d_DHPrivateKey */
+        NULL, /* No i2d_DHPublicKey */
+        (i2d_of_void *)i2d_DHparams,
+        NULL, /* No i2d_DH_PUBKEY */
+        NULL, /* No PEM_write_bio_DHPrivateKey */
+        NULL, /* No PEM_write_bio_DHPublicKey */
+        (PEM_write_bio_of_void_unprotected *)PEM_write_bio_DHparams,
+        NULL, /* No PEM_write_bio_DH_PUBKEY */
+        NULL, /* No d2i_DHPrivateKey */
+        NULL, /* No d2i_DHPublicKey */
+        (d2i_of_void *)d2i_DHparams,
+        NULL, /* No d2i_DH_PUBKEY */
+        NULL, /* No PEM_read_bio_DHPrivateKey */
+        NULL, /* No PEM_read_bio_DHPublicKey */
+        (PEM_read_bio_of_void *)PEM_read_bio_DHparams,
+        NULL }, /* No PEM_read_bio_DH_PUBKEY */
     { "DHX", { "DHX", "type-specific" }, EVP_PKEY_DHX,
-      NULL,                      /* No i2d_DHxPrivateKey */
-      NULL,                      /* No i2d_DHxPublicKey */
-      (i2d_of_void *)i2d_DHxparams,
-      NULL,                      /* No i2d_DHx_PUBKEY */
-      NULL,                      /* No PEM_write_bio_DHxPrivateKey */
-      NULL,                      /* No PEM_write_bio_DHxPublicKey */
-      (PEM_write_bio_of_void_unprotected *)PEM_write_bio_DHxparams,
-      NULL,                      /* No PEM_write_bio_DHx_PUBKEY */
-      NULL,                      /* No d2i_DHxPrivateKey */
-      NULL,                      /* No d2i_DHxPublicKey */
-      (d2i_of_void *)d2i_DHxparams,
-      NULL,                      /* No d2i_DHx_PUBKEY */
-      NULL,                      /* No PEM_read_bio_DHxPrivateKey */
-      NULL,                      /* No PEM_read_bio_DHxPublicKey */
-      NULL,                      /* No PEM_read_bio_DHxparams */
-      NULL },                    /* No PEM_read_bio_DHx_PUBKEY */
+        NULL, /* No i2d_DHxPrivateKey */
+        NULL, /* No i2d_DHxPublicKey */
+        (i2d_of_void *)i2d_DHxparams,
+        NULL, /* No i2d_DHx_PUBKEY */
+        NULL, /* No PEM_write_bio_DHxPrivateKey */
+        NULL, /* No PEM_write_bio_DHxPublicKey */
+        (PEM_write_bio_of_void_unprotected *)PEM_write_bio_DHxparams,
+        NULL, /* No PEM_write_bio_DHx_PUBKEY */
+        NULL, /* No d2i_DHxPrivateKey */
+        NULL, /* No d2i_DHxPublicKey */
+        (d2i_of_void *)d2i_DHxparams,
+        NULL, /* No d2i_DHx_PUBKEY */
+        NULL, /* No PEM_read_bio_DHxPrivateKey */
+        NULL, /* No PEM_read_bio_DHxPublicKey */
+        NULL, /* No PEM_read_bio_DHxparams */
+        NULL }, /* No PEM_read_bio_DHx_PUBKEY */
 #endif
 #ifndef OPENSSL_NO_DSA
     { "DSA", { "DSA", "type-specific" }, EVP_PKEY_DSA,
-      (i2d_of_void *)i2d_DSAPrivateKey,
-      (i2d_of_void *)i2d_DSAPublicKey,
-      (i2d_of_void *)i2d_DSAparams,
-      (i2d_of_void *)i2d_DSA_PUBKEY,
-      (PEM_write_bio_of_void_protected *)PEM_write_bio_DSAPrivateKey,
-      NULL,                      /* No PEM_write_bio_DSAPublicKey */
-      (PEM_write_bio_of_void_unprotected *)PEM_write_bio_DSAparams,
-      (PEM_write_bio_of_void_unprotected *)PEM_write_bio_DSA_PUBKEY,
-      (d2i_of_void *)d2i_DSAPrivateKey,
-      (d2i_of_void *)d2i_DSAPublicKey,
-      (d2i_of_void *)d2i_DSAparams,
-      (d2i_of_void *)d2i_DSA_PUBKEY,
-      (PEM_read_bio_of_void *)PEM_read_bio_DSAPrivateKey,
-      NULL,                      /* No PEM_write_bio_DSAPublicKey */
-      (PEM_read_bio_of_void *)PEM_read_bio_DSAparams,
-      (PEM_read_bio_of_void *)PEM_read_bio_DSA_PUBKEY },
+        (i2d_of_void *)i2d_DSAPrivateKey,
+        (i2d_of_void *)i2d_DSAPublicKey,
+        (i2d_of_void *)i2d_DSAparams,
+        (i2d_of_void *)i2d_DSA_PUBKEY,
+        (PEM_write_bio_of_void_protected *)PEM_write_bio_DSAPrivateKey,
+        NULL, /* No PEM_write_bio_DSAPublicKey */
+        (PEM_write_bio_of_void_unprotected *)PEM_write_bio_DSAparams,
+        (PEM_write_bio_of_void_unprotected *)PEM_write_bio_DSA_PUBKEY,
+        (d2i_of_void *)d2i_DSAPrivateKey,
+        (d2i_of_void *)d2i_DSAPublicKey,
+        (d2i_of_void *)d2i_DSAparams,
+        (d2i_of_void *)d2i_DSA_PUBKEY,
+        (PEM_read_bio_of_void *)PEM_read_bio_DSAPrivateKey,
+        NULL, /* No PEM_write_bio_DSAPublicKey */
+        (PEM_read_bio_of_void *)PEM_read_bio_DSAparams,
+        (PEM_read_bio_of_void *)PEM_read_bio_DSA_PUBKEY },
 #endif
 #ifndef OPENSSL_NO_EC
-    { "EC", { "EC", "type-specific" }, EVP_PKEY_EC,
-      (i2d_of_void *)i2d_ECPrivateKey,
-      NULL,                      /* No i2d_ECPublicKey */
-      (i2d_of_void *)i2d_ECParameters,
-      (i2d_of_void *)i2d_EC_PUBKEY,
-      (PEM_write_bio_of_void_protected *)PEM_write_bio_ECPrivateKey,
-      NULL,                      /* No PEM_write_bio_ECPublicKey */
-      NULL,                      /* No PEM_write_bio_ECParameters */
-      (PEM_write_bio_of_void_unprotected *)PEM_write_bio_EC_PUBKEY,
-      (d2i_of_void *)d2i_ECPrivateKey,
-      NULL,                      /* No d2i_ECPublicKey */
-      (d2i_of_void *)d2i_ECParameters,
-      (d2i_of_void *)d2i_EC_PUBKEY,
-      (PEM_read_bio_of_void *)PEM_read_bio_ECPrivateKey,
-      NULL,                      /* No PEM_read_bio_ECPublicKey */
-      NULL,                      /* No PEM_read_bio_ECParameters */
-      (PEM_read_bio_of_void *)PEM_read_bio_EC_PUBKEY, },
+    {
+        "EC",
+        { "EC", "type-specific" },
+        EVP_PKEY_EC,
+        (i2d_of_void *)i2d_ECPrivateKey,
+        NULL, /* No i2d_ECPublicKey */
+        (i2d_of_void *)i2d_ECParameters,
+        (i2d_of_void *)i2d_EC_PUBKEY,
+        (PEM_write_bio_of_void_protected *)PEM_write_bio_ECPrivateKey,
+        NULL, /* No PEM_write_bio_ECPublicKey */
+        NULL, /* No PEM_write_bio_ECParameters */
+        (PEM_write_bio_of_void_unprotected *)PEM_write_bio_EC_PUBKEY,
+        (d2i_of_void *)d2i_ECPrivateKey,
+        NULL, /* No d2i_ECPublicKey */
+        (d2i_of_void *)d2i_ECParameters,
+        (d2i_of_void *)d2i_EC_PUBKEY,
+        (PEM_read_bio_of_void *)PEM_read_bio_ECPrivateKey,
+        NULL, /* No PEM_read_bio_ECPublicKey */
+        NULL, /* No PEM_read_bio_ECParameters */
+        (PEM_read_bio_of_void *)PEM_read_bio_EC_PUBKEY,
+    },
 #endif
     { "RSA", { "RSA", "type-specific" }, EVP_PKEY_RSA,
-      (i2d_of_void *)i2d_RSAPrivateKey,
-      (i2d_of_void *)i2d_RSAPublicKey,
-      NULL,                      /* No i2d_RSAparams */
-      (i2d_of_void *)i2d_RSA_PUBKEY,
-      (PEM_write_bio_of_void_protected *)PEM_write_bio_RSAPrivateKey,
-      (PEM_write_bio_of_void_unprotected *)PEM_write_bio_RSAPublicKey,
-      NULL,                      /* No PEM_write_bio_RSAparams */
-      (PEM_write_bio_of_void_unprotected *)PEM_write_bio_RSA_PUBKEY,
-      (d2i_of_void *)d2i_RSAPrivateKey,
-      (d2i_of_void *)d2i_RSAPublicKey,
-      NULL,                      /* No d2i_RSAparams */
-      (d2i_of_void *)d2i_RSA_PUBKEY,
-      (PEM_read_bio_of_void *)PEM_read_bio_RSAPrivateKey,
-      (PEM_read_bio_of_void *)PEM_read_bio_RSAPublicKey,
-      NULL,                      /* No PEM_read_bio_RSAparams */
-      (PEM_read_bio_of_void *)PEM_read_bio_RSA_PUBKEY }
+        (i2d_of_void *)i2d_RSAPrivateKey,
+        (i2d_of_void *)i2d_RSAPublicKey,
+        NULL, /* No i2d_RSAparams */
+        (i2d_of_void *)i2d_RSA_PUBKEY,
+        (PEM_write_bio_of_void_protected *)PEM_write_bio_RSAPrivateKey,
+        (PEM_write_bio_of_void_unprotected *)PEM_write_bio_RSAPublicKey,
+        NULL, /* No PEM_write_bio_RSAparams */
+        (PEM_write_bio_of_void_unprotected *)PEM_write_bio_RSA_PUBKEY,
+        (d2i_of_void *)d2i_RSAPrivateKey,
+        (d2i_of_void *)d2i_RSAPublicKey,
+        NULL, /* No d2i_RSAparams */
+        (d2i_of_void *)d2i_RSA_PUBKEY,
+        (PEM_read_bio_of_void *)PEM_read_bio_RSAPrivateKey,
+        (PEM_read_bio_of_void *)PEM_read_bio_RSAPublicKey,
+        NULL, /* No PEM_read_bio_RSAparams */
+        (PEM_read_bio_of_void *)PEM_read_bio_RSA_PUBKEY }
 };
 
 /*
@@ -196,7 +200,7 @@ static const OSSL_PARAM DH_params[] = { OSSL_PARAM_END };
 static const OSSL_PARAM DHX_params[] = { OSSL_PARAM_END };
 #endif
 #ifndef OPENSSL_NO_DSA
-static size_t qbits = 160;  /* PVK only tolerates 160 Q bits */
+static size_t qbits = 160; /* PVK only tolerates 160 Q bits */
 static size_t pbits = 1024; /* With 160 Q bits, we MUST use 1024 P bits */
 static const OSSL_PARAM DSA_params[] = {
     OSSL_PARAM_size_t("pbits", &pbits),
@@ -236,13 +240,12 @@ static struct key_st {
 };
 
 static EVP_PKEY *make_key(const char *type,
-                          const OSSL_PARAM *gen_template_params)
+    const OSSL_PARAM *gen_template_params)
 {
     EVP_PKEY *template = NULL;
     EVP_PKEY *pkey = NULL;
     EVP_PKEY_CTX *ctx = NULL;
-    OSSL_PARAM *gen_template_params_noconst =
-        (OSSL_PARAM *)gen_template_params;
+    OSSL_PARAM *gen_template_params_noconst = (OSSL_PARAM *)gen_template_params;
 
     if (gen_template_params != NULL
         && ((ctx = EVP_PKEY_CTX_new_from_name(NULL, type, NULL)) == NULL
@@ -257,16 +260,15 @@ static EVP_PKEY *make_key(const char *type,
      * No real need to check the errors other than for the cascade
      * effect.  |pkey| will simply remain NULL if something goes wrong.
      */
-    ctx =
-        template != NULL
+    ctx = template != NULL
         ? EVP_PKEY_CTX_new(template, NULL)
         : EVP_PKEY_CTX_new_from_name(NULL, type, NULL);
 
     (void)(ctx != NULL
-           && EVP_PKEY_keygen_init(ctx) > 0
-           && EVP_PKEY_keygen(ctx, &pkey) > 0);
+        && EVP_PKEY_keygen_init(ctx) > 0
+        && EVP_PKEY_keygen(ctx, &pkey) > 0);
 
- end:
+end:
     EVP_PKEY_free(template);
     EVP_PKEY_CTX_free(ctx);
     return pkey;
@@ -290,19 +292,19 @@ static int test_membio_str_eq(BIO *bio_provided, BIO *bio_legacy)
     long len_legacy = BIO_get_mem_data(bio_legacy, &str_legacy);
 
     return TEST_long_ge(len_legacy, 0)
-           && TEST_long_ge(len_provided, 0)
-           && TEST_strn2_eq(str_provided, len_provided,
-                            str_legacy, len_legacy);
+        && TEST_long_ge(len_provided, 0)
+        && TEST_strn2_eq(str_provided, len_provided,
+            str_legacy, len_legacy);
 }
 
 static int test_protected_PEM(const char *keytype, int evp_type,
-                              const void *legacy_key,
-                              PEM_write_bio_of_void_protected *pem_write_bio,
-                              PEM_read_bio_of_void *pem_read_bio,
-                              EVP_PKEY_eq_fn *evp_pkey_eq,
-                              EVP_PKEY_print_fn *evp_pkey_print,
-                              EVP_PKEY *provided_pkey, int selection,
-                              const char *structure)
+    const void *legacy_key,
+    PEM_write_bio_of_void_protected *pem_write_bio,
+    PEM_read_bio_of_void *pem_read_bio,
+    EVP_PKEY_eq_fn *evp_pkey_eq,
+    EVP_PKEY_print_fn *evp_pkey_print,
+    EVP_PKEY *provided_pkey, int selection,
+    const char *structure)
 {
     int ok = 0;
     BIO *membio_legacy = NULL;
@@ -318,13 +320,12 @@ static int test_protected_PEM(const char *keytype, int evp_type,
         || !TEST_ptr(membio_provided = BIO_new(BIO_s_mem())))
         goto end;
 
-    if (!TEST_ptr(ectx =
-                  OSSL_ENCODER_CTX_new_for_pkey(provided_pkey, selection,
-                                                "PEM", structure,
-                                                NULL))
+    if (!TEST_ptr(ectx = OSSL_ENCODER_CTX_new_for_pkey(provided_pkey, selection,
+                      "PEM", structure,
+                      NULL))
         || !TEST_true(OSSL_ENCODER_to_bio(ectx, membio_provided))
         || !TEST_true(pem_write_bio(membio_legacy, legacy_key,
-                                   NULL, NULL, 0, NULL, NULL))
+            NULL, NULL, 0, NULL, NULL))
         || !test_membio_str_eq(membio_provided, membio_legacy))
         goto end;
 
@@ -332,20 +333,19 @@ static int test_protected_PEM(const char *keytype, int evp_type,
         /* Now try decoding the results and compare the resulting keys */
 
         if (!TEST_ptr(decoded_legacy_pkey = EVP_PKEY_new())
-            || !TEST_ptr(dctx =
-                         OSSL_DECODER_CTX_new_for_pkey(&decoded_provided_pkey,
-                                                       "PEM", structure,
-                                                       keytype, selection,
-                                                       NULL, NULL))
+            || !TEST_ptr(dctx = OSSL_DECODER_CTX_new_for_pkey(&decoded_provided_pkey,
+                             "PEM", structure,
+                             keytype, selection,
+                             NULL, NULL))
             || !TEST_true(OSSL_DECODER_from_bio(dctx, membio_provided))
-            || !TEST_ptr(decoded_legacy_key =
-                         pem_read_bio(membio_legacy, NULL, NULL, NULL))
+            || !TEST_ptr(decoded_legacy_key = pem_read_bio(membio_legacy, NULL, NULL, NULL))
             || !TEST_true(EVP_PKEY_assign(decoded_legacy_pkey, evp_type,
-                                          decoded_legacy_key)))
+                decoded_legacy_key)))
             goto end;
 
         if (!TEST_int_gt(evp_pkey_eq(decoded_provided_pkey,
-                                     decoded_legacy_pkey), 0)) {
+                             decoded_legacy_pkey),
+                0)) {
             TEST_info("decoded_provided_pkey:");
             evp_pkey_print(bio_out, decoded_provided_pkey, 0, NULL);
             TEST_info("decoded_legacy_pkey:");
@@ -353,7 +353,7 @@ static int test_protected_PEM(const char *keytype, int evp_type,
         }
     }
     ok = 1;
- end:
+end:
     EVP_PKEY_free(decoded_legacy_pkey);
     EVP_PKEY_free(decoded_provided_pkey);
     OSSL_ENCODER_CTX_free(ectx);
@@ -364,13 +364,13 @@ static int test_protected_PEM(const char *keytype, int evp_type,
 }
 
 static int test_unprotected_PEM(const char *keytype, int evp_type,
-                                const void *legacy_key,
-                                PEM_write_bio_of_void_unprotected *pem_write_bio,
-                                PEM_read_bio_of_void *pem_read_bio,
-                                EVP_PKEY_eq_fn *evp_pkey_eq,
-                                EVP_PKEY_print_fn *evp_pkey_print,
-                                EVP_PKEY *provided_pkey, int selection,
-                                const char *structure)
+    const void *legacy_key,
+    PEM_write_bio_of_void_unprotected *pem_write_bio,
+    PEM_read_bio_of_void *pem_read_bio,
+    EVP_PKEY_eq_fn *evp_pkey_eq,
+    EVP_PKEY_print_fn *evp_pkey_print,
+    EVP_PKEY *provided_pkey, int selection,
+    const char *structure)
 {
     int ok = 0;
     BIO *membio_legacy = NULL;
@@ -386,10 +386,9 @@ static int test_unprotected_PEM(const char *keytype, int evp_type,
         || !TEST_ptr(membio_provided = BIO_new(BIO_s_mem())))
         goto end;
 
-    if (!TEST_ptr(ectx =
-                  OSSL_ENCODER_CTX_new_for_pkey(provided_pkey, selection,
-                                                "PEM", structure,
-                                                NULL))
+    if (!TEST_ptr(ectx = OSSL_ENCODER_CTX_new_for_pkey(provided_pkey, selection,
+                      "PEM", structure,
+                      NULL))
         || !TEST_true(OSSL_ENCODER_to_bio(ectx, membio_provided))
         || !TEST_true(pem_write_bio(membio_legacy, legacy_key))
         || !test_membio_str_eq(membio_provided, membio_legacy))
@@ -399,20 +398,19 @@ static int test_unprotected_PEM(const char *keytype, int evp_type,
         /* Now try decoding the results and compare the resulting keys */
 
         if (!TEST_ptr(decoded_legacy_pkey = EVP_PKEY_new())
-            || !TEST_ptr(dctx =
-                         OSSL_DECODER_CTX_new_for_pkey(&decoded_provided_pkey,
-                                                       "PEM", structure,
-                                                       keytype, selection,
-                                                       NULL, NULL))
+            || !TEST_ptr(dctx = OSSL_DECODER_CTX_new_for_pkey(&decoded_provided_pkey,
+                             "PEM", structure,
+                             keytype, selection,
+                             NULL, NULL))
             || !TEST_true(OSSL_DECODER_from_bio(dctx, membio_provided))
-            || !TEST_ptr(decoded_legacy_key =
-                         pem_read_bio(membio_legacy, NULL, NULL, NULL))
+            || !TEST_ptr(decoded_legacy_key = pem_read_bio(membio_legacy, NULL, NULL, NULL))
             || !TEST_true(EVP_PKEY_assign(decoded_legacy_pkey, evp_type,
-                                          decoded_legacy_key)))
+                decoded_legacy_key)))
             goto end;
 
         if (!TEST_int_gt(evp_pkey_eq(decoded_provided_pkey,
-                                     decoded_legacy_pkey), 0)) {
+                             decoded_legacy_pkey),
+                0)) {
             TEST_info("decoded_provided_pkey:");
             evp_pkey_print(bio_out, decoded_provided_pkey, 0, NULL);
             TEST_info("decoded_legacy_pkey:");
@@ -420,7 +418,7 @@ static int test_unprotected_PEM(const char *keytype, int evp_type,
         }
     }
     ok = 1;
- end:
+end:
     EVP_PKEY_free(decoded_legacy_pkey);
     EVP_PKEY_free(decoded_provided_pkey);
     OSSL_ENCODER_CTX_free(ectx);
@@ -431,11 +429,11 @@ static int test_unprotected_PEM(const char *keytype, int evp_type,
 }
 
 static int test_DER(const char *keytype, int evp_type,
-                    const void *legacy_key, i2d_of_void *i2d, d2i_of_void *d2i,
-                    EVP_PKEY_eq_fn *evp_pkey_eq,
-                    EVP_PKEY_print_fn *evp_pkey_print,
-                    EVP_PKEY *provided_pkey, int selection,
-                    const char *structure)
+    const void *legacy_key, i2d_of_void *i2d, d2i_of_void *d2i,
+    EVP_PKEY_eq_fn *evp_pkey_eq,
+    EVP_PKEY_print_fn *evp_pkey_print,
+    EVP_PKEY *provided_pkey, int selection,
+    const char *structure)
 {
     int ok = 0;
     unsigned char *der_legacy = NULL;
@@ -451,39 +449,38 @@ static int test_DER(const char *keytype, int evp_type,
     EVP_PKEY *decoded_legacy_pkey = NULL;
     EVP_PKEY *decoded_provided_pkey = NULL;
 
-    if (!TEST_ptr(ectx =
-                 OSSL_ENCODER_CTX_new_for_pkey(provided_pkey, selection,
-                                               "DER", structure,
-                                               NULL))
+    if (!TEST_ptr(ectx = OSSL_ENCODER_CTX_new_for_pkey(provided_pkey, selection,
+                      "DER", structure,
+                      NULL))
         || !TEST_true(OSSL_ENCODER_to_data(ectx,
-                                          &der_provided, &der_provided_len))
+            &der_provided, &der_provided_len))
         || !TEST_size_t_gt(der_legacy_len = i2d(legacy_key, &der_legacy), 0)
         || !TEST_mem_eq(der_provided, der_provided_len,
-                        der_legacy, der_legacy_len))
+            der_legacy, der_legacy_len))
         goto end;
 
     if (d2i != NULL) {
         /* Now try decoding the results and compare the resulting keys */
 
         if (!TEST_ptr(decoded_legacy_pkey = EVP_PKEY_new())
-            || !TEST_ptr(dctx =
-                         OSSL_DECODER_CTX_new_for_pkey(&decoded_provided_pkey,
-                                                       "DER", structure,
-                                                       keytype, selection,
-                                                       NULL, NULL))
+            || !TEST_ptr(dctx = OSSL_DECODER_CTX_new_for_pkey(&decoded_provided_pkey,
+                             "DER", structure,
+                             keytype, selection,
+                             NULL, NULL))
             || !TEST_true((pder_provided = der_provided,
-                           tmp_size = der_provided_len,
-                           OSSL_DECODER_from_data(dctx, &pder_provided,
-                                                  &tmp_size)))
+                tmp_size = der_provided_len,
+                OSSL_DECODER_from_data(dctx, &pder_provided,
+                    &tmp_size)))
             || !TEST_ptr((pder_legacy = der_legacy,
-                          decoded_legacy_key = d2i(NULL, &pder_legacy,
-                                                   (long)der_legacy_len)))
+                decoded_legacy_key = d2i(NULL, &pder_legacy,
+                    (long)der_legacy_len)))
             || !TEST_true(EVP_PKEY_assign(decoded_legacy_pkey, evp_type,
-                                          decoded_legacy_key)))
+                decoded_legacy_key)))
             goto end;
 
         if (!TEST_int_gt(evp_pkey_eq(decoded_provided_pkey,
-                                     decoded_legacy_pkey), 0)) {
+                             decoded_legacy_pkey),
+                0)) {
             TEST_info("decoded_provided_pkey:");
             evp_pkey_print(bio_out, decoded_provided_pkey, 0, NULL);
             TEST_info("decoded_legacy_pkey:");
@@ -491,7 +488,7 @@ static int test_DER(const char *keytype, int evp_type,
         }
     }
     ok = 1;
- end:
+end:
     EVP_PKEY_free(decoded_legacy_pkey);
     EVP_PKEY_free(decoded_provided_pkey);
     OSSL_ENCODER_CTX_free(ectx);
@@ -533,32 +530,31 @@ static int test_key(int idx)
             const char *structure = test_stanza->structure[i];
 
             TEST_info("Test OSSL_ENCODER against PEM_write_bio_{TYPE}PrivateKey for %s, %s",
-                      test_stanza->keytype, structure);
+                test_stanza->keytype, structure);
             if (!test_protected_PEM(key->keytype, key->evp_type, legacy_obj,
-                                    test_stanza->pem_write_bio_PrivateKey,
-                                    test_stanza->pem_read_bio_PrivateKey,
-                                    EVP_PKEY_eq, EVP_PKEY_print_private,
-                                    pkey, selection, structure))
+                    test_stanza->pem_write_bio_PrivateKey,
+                    test_stanza->pem_read_bio_PrivateKey,
+                    EVP_PKEY_eq, EVP_PKEY_print_private,
+                    pkey, selection, structure))
                 ok = 0;
         }
     }
 
     /* Test PublicKey to PEM */
     if (test_stanza->pem_write_bio_PublicKey != NULL) {
-        int selection =
-            OSSL_KEYMGMT_SELECT_PUBLIC_KEY
+        int selection = OSSL_KEYMGMT_SELECT_PUBLIC_KEY
             | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
 
         for (i = 0; i < OSSL_NELEM(test_stanza->structure); i++) {
             const char *structure = test_stanza->structure[i];
 
             TEST_info("Test OSSL_ENCODER against PEM_write_bio_{TYPE}PublicKey for %s, %s",
-                      test_stanza->keytype, structure);
+                test_stanza->keytype, structure);
             if (!test_unprotected_PEM(key->keytype, key->evp_type, legacy_obj,
-                                      test_stanza->pem_write_bio_PublicKey,
-                                      test_stanza->pem_read_bio_PublicKey,
-                                      EVP_PKEY_eq, EVP_PKEY_print_public,
-                                      pkey, selection, structure))
+                    test_stanza->pem_write_bio_PublicKey,
+                    test_stanza->pem_read_bio_PublicKey,
+                    EVP_PKEY_eq, EVP_PKEY_print_public,
+                    pkey, selection, structure))
                 ok = 0;
         }
     }
@@ -571,35 +567,33 @@ static int test_key(int idx)
             const char *structure = test_stanza->structure[i];
 
             TEST_info("Test OSSL_ENCODER against PEM_write_bio_{TYPE}params for %s, %s",
-                      test_stanza->keytype, structure);
+                test_stanza->keytype, structure);
             if (!test_unprotected_PEM(key->keytype, key->evp_type, legacy_obj,
-                                      test_stanza->pem_write_bio_params,
-                                      test_stanza->pem_read_bio_params,
-                                      EVP_PKEY_parameters_eq,
-                                      EVP_PKEY_print_params,
-                                      pkey, selection, structure))
+                    test_stanza->pem_write_bio_params,
+                    test_stanza->pem_read_bio_params,
+                    EVP_PKEY_parameters_eq,
+                    EVP_PKEY_print_params,
+                    pkey, selection, structure))
                 ok = 0;
         }
     }
 
     /* Test PUBKEY to PEM */
     if (test_stanza->pem_write_bio_PUBKEY != NULL) {
-        int selection =
-            OSSL_KEYMGMT_SELECT_PUBLIC_KEY
+        int selection = OSSL_KEYMGMT_SELECT_PUBLIC_KEY
             | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
         const char *structure = "SubjectPublicKeyInfo";
 
         TEST_info("Test OSSL_ENCODER against PEM_write_bio_{TYPE}_PUBKEY for %s, %s",
-                  test_stanza->keytype, structure);
+            test_stanza->keytype, structure);
         if (!test_unprotected_PEM(key->keytype, key->evp_type, legacy_obj,
-                                  test_stanza->pem_write_bio_PUBKEY,
-                                  test_stanza->pem_read_bio_PUBKEY,
-                                  EVP_PKEY_eq, EVP_PKEY_print_public,
-                                  pkey, selection, structure))
+                test_stanza->pem_write_bio_PUBKEY,
+                test_stanza->pem_read_bio_PUBKEY,
+                EVP_PKEY_eq, EVP_PKEY_print_public,
+                pkey, selection, structure))
             ok = 0;
     }
 
-
     /* Test PrivateKey to DER */
     if (test_stanza->i2d_PrivateKey != NULL) {
         int selection = OSSL_KEYMGMT_SELECT_ALL;
@@ -608,32 +602,31 @@ static int test_key(int idx)
             const char *structure = test_stanza->structure[i];
 
             TEST_info("Test OSSL_ENCODER against i2d_{TYPE}PrivateKey for %s, %s",
-                      test_stanza->keytype, structure);
+                test_stanza->keytype, structure);
             if (!test_DER(key->keytype, key->evp_type, legacy_obj,
-                          test_stanza->i2d_PrivateKey,
-                          test_stanza->d2i_PrivateKey,
-                          EVP_PKEY_eq, EVP_PKEY_print_private,
-                          pkey, selection, structure))
+                    test_stanza->i2d_PrivateKey,
+                    test_stanza->d2i_PrivateKey,
+                    EVP_PKEY_eq, EVP_PKEY_print_private,
+                    pkey, selection, structure))
                 ok = 0;
         }
     }
 
     /* Test PublicKey to DER */
     if (test_stanza->i2d_PublicKey != NULL) {
-        int selection =
-            OSSL_KEYMGMT_SELECT_PUBLIC_KEY
+        int selection = OSSL_KEYMGMT_SELECT_PUBLIC_KEY
             | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
 
         for (i = 0; i < OSSL_NELEM(test_stanza->structure); i++) {
             const char *structure = test_stanza->structure[i];
 
             TEST_info("Test OSSL_ENCODER against i2d_{TYPE}PublicKey for %s, %s",
-                      test_stanza->keytype, structure);
+                test_stanza->keytype, structure);
             if (!test_DER(key->keytype, key->evp_type, legacy_obj,
-                          test_stanza->i2d_PublicKey,
-                          test_stanza->d2i_PublicKey,
-                          EVP_PKEY_eq, EVP_PKEY_print_public,
-                          pkey, selection, structure))
+                    test_stanza->i2d_PublicKey,
+                    test_stanza->d2i_PublicKey,
+                    EVP_PKEY_eq, EVP_PKEY_print_public,
+                    pkey, selection, structure))
                 ok = 0;
         }
     }
@@ -646,31 +639,30 @@ static int test_key(int idx)
             const char *structure = test_stanza->structure[i];
 
             TEST_info("Test OSSL_ENCODER against i2d_{TYPE}params for %s, %s",
-                      test_stanza->keytype, structure);
+                test_stanza->keytype, structure);
             if (!test_DER(key->keytype, key->evp_type, legacy_obj,
-                          test_stanza->i2d_params, test_stanza->d2i_params,
-                          EVP_PKEY_parameters_eq, EVP_PKEY_print_params,
-                          pkey, selection, structure))
+                    test_stanza->i2d_params, test_stanza->d2i_params,
+                    EVP_PKEY_parameters_eq, EVP_PKEY_print_params,
+                    pkey, selection, structure))
                 ok = 0;
         }
     }
 
     /* Test PUBKEY to DER */
     if (test_stanza->i2d_PUBKEY != NULL) {
-        int selection =
-            OSSL_KEYMGMT_SELECT_PUBLIC_KEY
+        int selection = OSSL_KEYMGMT_SELECT_PUBLIC_KEY
             | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
         const char *structure = "SubjectPublicKeyInfo";
 
         TEST_info("Test OSSL_ENCODER against i2d_{TYPE}_PUBKEY for %s, %s",
-                  test_stanza->keytype, structure);
+            test_stanza->keytype, structure);
         if (!test_DER(key->keytype, key->evp_type, legacy_obj,
-                      test_stanza->i2d_PUBKEY, test_stanza->d2i_PUBKEY,
-                      EVP_PKEY_eq, EVP_PKEY_print_public,
-                      pkey, selection, structure))
+                test_stanza->i2d_PUBKEY, test_stanza->d2i_PUBKEY,
+                EVP_PKEY_eq, EVP_PKEY_print_public,
+                pkey, selection, structure))
             ok = 0;
     }
- end:
+end:
     EVP_PKEY_free(downgraded_pkey);
     return ok;
 }
@@ -696,23 +688,20 @@ int setup_tests(void)
     for (i = 0; i < OSSL_NELEM(keys); i++) {
 #ifndef OPENSSL_NO_DH
         if (strcmp(keys[i].keytype, "DH") == 0) {
-            if (!TEST_ptr(keys[i].key =
-                          load_pkey_pem(test_get_argument(1), NULL)))
-                return  0;
+            if (!TEST_ptr(keys[i].key = load_pkey_pem(test_get_argument(1), NULL)))
+                return 0;
             continue;
         }
 #endif
 #ifndef OPENSSL_NO_DEPRECATED_3_0
         if (strcmp(keys[i].keytype, "RSA") == 0) {
-            if (!TEST_ptr(keys[i].key =
-                          load_pkey_pem(test_get_argument(0), NULL)))
-                return  0;
+            if (!TEST_ptr(keys[i].key = load_pkey_pem(test_get_argument(0), NULL)))
+                return 0;
             continue;
         }
 #endif
         TEST_info("Generating %s key...", keys[i].keytype);
-        if (!TEST_ptr(keys[i].key =
-                      make_key(keys[i].keytype, keys[i].template_params)))
+        if (!TEST_ptr(keys[i].key = make_key(keys[i].keytype, keys[i].template_params)))
             return 0;
     }
 
diff --git a/test/enginetest.c b/test/enginetest.c
index 79ffb23054858..50556131b3939 100644
--- a/test/enginetest.c
+++ b/test/enginetest.c
@@ -15,16 +15,16 @@
 #include <stdlib.h>
 #include <openssl/e_os2.h>
 
-# include "testutil.h"
+#include "testutil.h"
 
 #ifndef OPENSSL_NO_ENGINE
-# include <openssl/buffer.h>
-# include <openssl/crypto.h>
-# include <openssl/engine.h>
-# include <openssl/rsa.h>
-# include <openssl/err.h>
-# include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/buffer.h>
+#include <openssl/crypto.h>
+#include <openssl/engine.h>
+#include <openssl/rsa.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 static void display_engine_list(void)
 {
@@ -34,7 +34,7 @@ static void display_engine_list(void)
     loop = 0;
     for (h = ENGINE_get_first(); h != NULL; h = ENGINE_get_next(h)) {
         TEST_info("#%d: id = \"%s\", name = \"%s\"",
-               loop++, ENGINE_get_id(h), ENGINE_get_name(h));
+            loop++, ENGINE_get_id(h), ENGINE_get_name(h));
     }
 
     /*
@@ -62,17 +62,17 @@ static int test_engines(void)
 
     memset(block, 0, sizeof(block));
     if (!TEST_ptr(new_h1 = ENGINE_new())
-            || !TEST_true(ENGINE_set_id(new_h1, "test_id0"))
-            || !TEST_true(ENGINE_set_name(new_h1, "First test item"))
-            || !TEST_ptr(new_h2 = ENGINE_new())
-            || !TEST_true(ENGINE_set_id(new_h2, "test_id1"))
-            || !TEST_true(ENGINE_set_name(new_h2, "Second test item"))
-            || !TEST_ptr(new_h3 = ENGINE_new())
-            || !TEST_true(ENGINE_set_id(new_h3, "test_id2"))
-            || !TEST_true(ENGINE_set_name(new_h3, "Third test item"))
-            || !TEST_ptr(new_h4 = ENGINE_new())
-            || !TEST_true(ENGINE_set_id(new_h4, "test_id3"))
-            || !TEST_true(ENGINE_set_name(new_h4, "Fourth test item")))
+        || !TEST_true(ENGINE_set_id(new_h1, "test_id0"))
+        || !TEST_true(ENGINE_set_name(new_h1, "First test item"))
+        || !TEST_ptr(new_h2 = ENGINE_new())
+        || !TEST_true(ENGINE_set_id(new_h2, "test_id1"))
+        || !TEST_true(ENGINE_set_name(new_h2, "Second test item"))
+        || !TEST_ptr(new_h3 = ENGINE_new())
+        || !TEST_true(ENGINE_set_id(new_h3, "test_id2"))
+        || !TEST_true(ENGINE_set_name(new_h3, "Third test item"))
+        || !TEST_ptr(new_h4 = ENGINE_new())
+        || !TEST_true(ENGINE_set_id(new_h4, "test_id3"))
+        || !TEST_true(ENGINE_set_name(new_h4, "Fourth test item")))
         goto end;
     TEST_info("Engines:");
     display_engine_list();
@@ -90,7 +90,7 @@ static int test_engines(void)
     display_engine_list();
 
     if (!TEST_true(ENGINE_add(new_h3))
-            || !TEST_true(ENGINE_add(new_h2)))
+        || !TEST_true(ENGINE_add(new_h2)))
         goto end;
     TEST_info("Engines:");
     display_engine_list();
@@ -142,7 +142,7 @@ static int test_engines(void)
     display_engine_list();
 
     if (!TEST_true(ENGINE_add(new_h1))
-            || !TEST_true(ENGINE_remove(new_h1)))
+        || !TEST_true(ENGINE_remove(new_h1)))
         goto end;
 
     TEST_info("About to beef up the engine-type list");
@@ -152,19 +152,19 @@ static int test_engines(void)
         BIO_snprintf(buf, sizeof(buf), "Fake engine type %d", loop);
         ename[loop] = OPENSSL_strdup(buf);
         if (!TEST_ptr(block[loop] = ENGINE_new())
-                || !TEST_true(ENGINE_set_id(block[loop], eid[loop]))
-                || !TEST_true(ENGINE_set_name(block[loop], ename[loop])))
+            || !TEST_true(ENGINE_set_id(block[loop], eid[loop]))
+            || !TEST_true(ENGINE_set_name(block[loop], ename[loop])))
             goto end;
     }
     for (loop = 0; loop < NUMTOADD; loop++) {
         if (!TEST_true(ENGINE_add(block[loop]))) {
             test_note("Adding stopped at %d, (%s,%s)",
-                      loop, ENGINE_get_id(block[loop]),
-                      ENGINE_get_name(block[loop]));
+                loop, ENGINE_get_id(block[loop]),
+                ENGINE_get_name(block[loop]));
             goto cleanup_loop;
         }
     }
- cleanup_loop:
+cleanup_loop:
     TEST_info("About to empty the engine-type list");
     while ((ptr = ENGINE_get_first()) != NULL) {
         if (!TEST_true(ENGINE_remove(ptr)))
@@ -177,7 +177,7 @@ static int test_engines(void)
     }
     to_return = 1;
 
- end:
+end:
     ENGINE_free(new_h1);
     ENGINE_free(new_h2);
     ENGINE_free(new_h3);
@@ -194,14 +194,14 @@ static int called_encrypt = 0;
 
 /* Test function to check operation has been redirected */
 static int test_encrypt(EVP_PKEY_CTX *ctx, unsigned char *sig,
-                        size_t *siglen, const unsigned char *tbs, size_t tbslen)
+    size_t *siglen, const unsigned char *tbs, size_t tbslen)
 {
     called_encrypt = 1;
     return 1;
 }
 
 static int test_pkey_meths(ENGINE *e, EVP_PKEY_METHOD **pmeth,
-                           const int **pnids, int nid)
+    const int **pnids, int nid)
 {
     static const int rnid = EVP_PKEY_RSA;
     if (pmeth == NULL) {
@@ -222,12 +222,11 @@ static int test_pkey_meths(ENGINE *e, EVP_PKEY_METHOD **pmeth,
 
 static EVP_PKEY *get_test_pkey(void)
 {
-    static unsigned char n[] =
-        "\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F"
-        "\x90\xEF\xA0\x0D\xF3\x77\x4A\x25\x9F\x2E\x62\xB4\xC5\xD9\x9C\xB5"
-        "\xAD\xB3\x00\xA0\x28\x5E\x53\x01\x93\x0E\x0C\x70\xFB\x68\x76\x93"
-        "\x9C\xE6\x16\xCE\x62\x4A\x11\xE0\x08\x6D\x34\x1E\xBC\xAC\xA0\xA1"
-        "\xF5";
+    static unsigned char n[] = "\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F"
+                               "\x90\xEF\xA0\x0D\xF3\x77\x4A\x25\x9F\x2E\x62\xB4\xC5\xD9\x9C\xB5"
+                               "\xAD\xB3\x00\xA0\x28\x5E\x53\x01\x93\x0E\x0C\x70\xFB\x68\x76\x93"
+                               "\x9C\xE6\x16\xCE\x62\x4A\x11\xE0\x08\x6D\x34\x1E\xBC\xAC\xA0\xA1"
+                               "\xF5";
     static unsigned char e[] = "\x11";
 
     RSA *rsa = RSA_new();
@@ -239,8 +238,8 @@ static EVP_PKEY *get_test_pkey(void)
         return NULL;
     }
 
-    if (!RSA_set0_key(rsa, BN_bin2bn(n, sizeof(n)-1, NULL),
-                      BN_bin2bn(e, sizeof(e)-1, NULL), NULL)) {
+    if (!RSA_set0_key(rsa, BN_bin2bn(n, sizeof(n) - 1, NULL),
+            BN_bin2bn(e, sizeof(e) - 1, NULL), NULL)) {
         EVP_PKEY_free(pk);
         return NULL;
     }
@@ -271,16 +270,16 @@ static int test_redirect(void)
     TEST_info("EVP_PKEY_encrypt test: no redirection");
     /* Encrypt some data: should succeed but not be redirected */
     if (!TEST_int_gt(EVP_PKEY_encrypt_init(ctx), 0)
-            || !TEST_int_gt(EVP_PKEY_encrypt(ctx, tmp, &len, pt, sizeof(pt)), 0)
-            || !TEST_false(called_encrypt))
+        || !TEST_int_gt(EVP_PKEY_encrypt(ctx, tmp, &len, pt, sizeof(pt)), 0)
+        || !TEST_false(called_encrypt))
         goto err;
     EVP_PKEY_CTX_free(ctx);
     ctx = NULL;
 
     /* Create a test ENGINE */
     if (!TEST_ptr(e = ENGINE_new())
-            || !TEST_true(ENGINE_set_id(e, "Test redirect engine"))
-            || !TEST_true(ENGINE_set_name(e, "Test redirect engine")))
+        || !TEST_true(ENGINE_set_id(e, "Test redirect engine"))
+        || !TEST_true(ENGINE_set_name(e, "Test redirect engine")))
         goto err;
 
     /*
@@ -289,7 +288,7 @@ static int test_redirect(void)
      * engine has no public key methods.
      */
     if (!TEST_ptr_null(ctx = EVP_PKEY_CTX_new(pkey, e))
-            || !TEST_int_le(EVP_PKEY_set1_engine(pkey, e), 0))
+        || !TEST_int_le(EVP_PKEY_set1_engine(pkey, e), 0))
         goto err;
 
     /* Setup an empty test EVP_PKEY_METHOD and set callback to return it */
@@ -314,8 +313,8 @@ static int test_redirect(void)
         goto err;
     /* Encrypt some data: should succeed and be redirected */
     if (!TEST_int_gt(EVP_PKEY_encrypt_init(ctx), 0)
-            || !TEST_int_gt(EVP_PKEY_encrypt(ctx, tmp, &len, pt, sizeof(pt)), 0)
-            || !TEST_true(called_encrypt))
+        || !TEST_int_gt(EVP_PKEY_encrypt(ctx, tmp, &len, pt, sizeof(pt)), 0)
+        || !TEST_true(called_encrypt))
         goto err;
 
     EVP_PKEY_CTX_free(ctx);
@@ -324,9 +323,9 @@ static int test_redirect(void)
 
     /* Create context with default engine: should not be redirected */
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new(pkey, NULL))
-            || !TEST_int_gt(EVP_PKEY_encrypt_init(ctx), 0)
-            || !TEST_int_gt(EVP_PKEY_encrypt(ctx, tmp, &len, pt, sizeof(pt)), 0)
-            || !TEST_false(called_encrypt))
+        || !TEST_int_gt(EVP_PKEY_encrypt_init(ctx), 0)
+        || !TEST_int_gt(EVP_PKEY_encrypt(ctx, tmp, &len, pt, sizeof(pt)), 0)
+        || !TEST_false(called_encrypt))
         goto err;
 
     EVP_PKEY_CTX_free(ctx);
@@ -340,14 +339,14 @@ static int test_redirect(void)
 
     /* Create context with default engine: should be redirected now */
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new(pkey, NULL))
-            || !TEST_int_gt(EVP_PKEY_encrypt_init(ctx), 0)
-            || !TEST_int_gt(EVP_PKEY_encrypt(ctx, tmp, &len, pt, sizeof(pt)), 0)
-            || !TEST_true(called_encrypt))
+        || !TEST_int_gt(EVP_PKEY_encrypt_init(ctx), 0)
+        || !TEST_int_gt(EVP_PKEY_encrypt(ctx, tmp, &len, pt, sizeof(pt)), 0)
+        || !TEST_true(called_encrypt))
         goto err;
 
     to_return = 1;
 
- err:
+err:
     EVP_PKEY_CTX_free(ctx);
     EVP_PKEY_free(pkey);
     ENGINE_free(e);
@@ -388,8 +387,8 @@ static int test_x509_dup_w_engine(void)
 
     /* Create a test ENGINE */
     if (!TEST_ptr(e = ENGINE_new())
-            || !TEST_true(ENGINE_set_id(e, "Test dummy engine"))
-            || !TEST_true(ENGINE_set_name(e, "Test dummy engine")))
+        || !TEST_true(ENGINE_set_id(e, "Test dummy engine"))
+        || !TEST_true(ENGINE_set_name(e, "Test dummy engine")))
         goto err;
 
     if (!TEST_ptr(rsameth = RSA_meth_dup(RSA_get_default_method())))
@@ -416,7 +415,7 @@ static int test_x509_dup_w_engine(void)
 
     ret = 1;
 
- err:
+err:
     X509_free(cert);
     X509_free(dupcert);
     X509_PUBKEY_free(duppubkey);
diff --git a/test/errtest.c b/test/errtest.c
index 2a66b483fec95..323184d93bdfb 100644
--- a/test/errtest.c
+++ b/test/errtest.c
@@ -15,13 +15,13 @@
 #include "testutil.h"
 
 #if defined(OPENSSL_SYS_WINDOWS)
-# include <windows.h>
+#include <windows.h>
 #else
-# include <errno.h>
+#include <errno.h>
 #endif
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# define IS_HEX(ch) ((ch >= '0' && ch <='9') || (ch >= 'A' && ch <='F'))
+#define IS_HEX(ch) ((ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'F'))
 
 static int test_print_error_format(void)
 {
@@ -29,16 +29,16 @@ static int test_print_error_format(void)
     char *lib;
     const char *func = OPENSSL_FUNC;
     char *reason;
-# ifdef OPENSSL_NO_ERR
+#ifdef OPENSSL_NO_ERR
     char reasonbuf[255];
-# endif
-# ifndef OPENSSL_NO_FILENAMES
+#endif
+#ifndef OPENSSL_NO_FILENAMES
     const char *file = OPENSSL_FILE;
     const int line = OPENSSL_LINE;
-# else
+#else
     const char *file = "";
     const int line = 0;
-# endif
+#endif
     /* The format for OpenSSL error lines */
     const char *expected_format = ":error:%08lX:%s:%s:%s:%s:%d";
     /*-
@@ -74,21 +74,21 @@ static int test_print_error_format(void)
         goto err;
     }
 
-# if !defined(OPENSSL_NO_ERR)
-#  if defined(OPENSSL_NO_AUTOERRINIT)
+#if !defined(OPENSSL_NO_ERR)
+#if defined(OPENSSL_NO_AUTOERRINIT)
     lib = "lib(2)";
-#  else
+#else
     lib = "system library";
-#  endif
+#endif
     reason = strerror(syserr);
-# else
+#else
     lib = "lib(2)";
     BIO_snprintf(reasonbuf, sizeof(reasonbuf), "reason(%lu)", reasoncode);
     reason = reasonbuf;
-# endif
+#endif
 
     BIO_snprintf(expected, sizeof(expected), expected_format,
-                 errorcode, lib, func, reason, file, line);
+        errorcode, lib, func, reason, file, line);
 
     if (!TEST_ptr(bio = BIO_new(BIO_s_mem())))
         goto err;
@@ -141,30 +141,21 @@ static int vdata_appends(void)
 
 static int raised_error(void)
 {
-    const char *f, *data;
-    int l;
+    int l, start_line = -1, end_line = -1;
+    const char *f, *data, *file = NULL;
     unsigned long e;
 
-    /*
-     * When OPENSSL_NO_ERR or OPENSSL_NO_FILENAMES, no file name or line
-     * number is saved, so no point checking them.
-     */
-#if !defined(OPENSSL_NO_FILENAMES) && !defined(OPENSSL_NO_ERR)
-    const char *file;
-    int line;
-
     file = __FILE__;
-    line = __LINE__ + 2; /* The error is generated on the ERR_raise_data line */
-#endif
+
+    start_line = __LINE__ + 1;
     ERR_raise_data(ERR_LIB_NONE, ERR_R_INTERNAL_ERROR,
-                   "calling exit()");
+        "calling exit()");
+    end_line = __LINE__ - 1;
     if (!TEST_ulong_ne(e = ERR_get_error_all(&f, &l, NULL, &data, NULL), 0)
-            || !TEST_int_eq(ERR_GET_REASON(e), ERR_R_INTERNAL_ERROR)
-#if !defined(OPENSSL_NO_FILENAMES) && !defined(OPENSSL_NO_ERR)
-            || !TEST_int_eq(l, line)
-            || !TEST_str_eq(f, file)
-#endif
-            || !TEST_str_eq(data, "calling exit()"))
+        || !TEST_int_eq(ERR_GET_REASON(e), ERR_R_INTERNAL_ERROR)
+        || (l > 0 && !(TEST_int_eq(l, start_line) || TEST_int_eq(l, end_line)))
+        || (strlen(f) != 0 && !TEST_str_eq(f, file))
+        || !TEST_str_eq(data, "calling exit()"))
         return 0;
     return 1;
 }
@@ -181,11 +172,11 @@ static int test_marks(void)
 
     /* Setting and clearing a mark should not affect the error */
     if (!TEST_true(ERR_set_mark())
-            || !TEST_true(ERR_pop_to_mark())
-            || !TEST_ulong_eq(mallocfail, ERR_peek_last_error())
-            || !TEST_true(ERR_set_mark())
-            || !TEST_true(ERR_clear_last_mark())
-            || !TEST_ulong_eq(mallocfail, ERR_peek_last_error()))
+        || !TEST_true(ERR_pop_to_mark())
+        || !TEST_ulong_eq(mallocfail, ERR_peek_last_error())
+        || !TEST_true(ERR_set_mark())
+        || !TEST_true(ERR_clear_last_mark())
+        || !TEST_ulong_eq(mallocfail, ERR_peek_last_error()))
         return 0;
 
     /* Test popping errors */
@@ -193,19 +184,19 @@ static int test_marks(void)
         return 0;
     ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
     if (!TEST_ulong_ne(mallocfail, ERR_peek_last_error())
-            || !TEST_true(ERR_pop_to_mark())
-            || !TEST_ulong_eq(mallocfail, ERR_peek_last_error()))
+        || !TEST_true(ERR_pop_to_mark())
+        || !TEST_ulong_eq(mallocfail, ERR_peek_last_error()))
         return 0;
 
     /* Nested marks should also work */
     if (!TEST_true(ERR_set_mark())
-            || !TEST_true(ERR_set_mark()))
+        || !TEST_true(ERR_set_mark()))
         return 0;
     ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
     if (!TEST_ulong_ne(mallocfail, ERR_peek_last_error())
-            || !TEST_true(ERR_pop_to_mark())
-            || !TEST_true(ERR_pop_to_mark())
-            || !TEST_ulong_eq(mallocfail, ERR_peek_last_error()))
+        || !TEST_true(ERR_pop_to_mark())
+        || !TEST_true(ERR_pop_to_mark())
+        || !TEST_ulong_eq(mallocfail, ERR_peek_last_error()))
         return 0;
 
     if (!TEST_true(ERR_set_mark()))
@@ -213,14 +204,14 @@ static int test_marks(void)
     ERR_raise(ERR_LIB_CRYPTO, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
     shouldnot = ERR_peek_last_error();
     if (!TEST_ulong_ne(mallocfail, shouldnot)
-            || !TEST_true(ERR_set_mark()))
+        || !TEST_true(ERR_set_mark()))
         return 0;
     ERR_raise(ERR_LIB_CRYPTO, ERR_R_INTERNAL_ERROR);
     if (!TEST_ulong_ne(shouldnot, ERR_peek_last_error())
-            || !TEST_true(ERR_pop_to_mark())
-            || !TEST_ulong_eq(shouldnot, ERR_peek_last_error())
-            || !TEST_true(ERR_pop_to_mark())
-            || !TEST_ulong_eq(mallocfail, ERR_peek_last_error()))
+        || !TEST_true(ERR_pop_to_mark())
+        || !TEST_ulong_eq(shouldnot, ERR_peek_last_error())
+        || !TEST_true(ERR_pop_to_mark())
+        || !TEST_ulong_eq(mallocfail, ERR_peek_last_error()))
         return 0;
 
     /* Setting and clearing a mark should not affect the errors on the stack */
@@ -228,7 +219,7 @@ static int test_marks(void)
         return 0;
     ERR_raise(ERR_LIB_CRYPTO, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
     if (!TEST_true(ERR_clear_last_mark())
-            || !TEST_ulong_eq(shouldnot, ERR_peek_last_error()))
+        || !TEST_ulong_eq(shouldnot, ERR_peek_last_error()))
         return 0;
 
     /*
@@ -236,15 +227,15 @@ static int test_marks(void)
      * a failure result
      */
     if (!TEST_false(ERR_pop_to_mark())
-            || !TEST_ulong_eq(0, ERR_peek_last_error()))
+        || !TEST_ulong_eq(0, ERR_peek_last_error()))
         return 0;
 
     /* Clearing where there is no mark should fail */
     ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE);
     if (!TEST_false(ERR_clear_last_mark())
-                /* "get" the last error to remove it */
-            || !TEST_ulong_eq(mallocfail, ERR_get_error())
-            || !TEST_ulong_eq(0, ERR_peek_last_error()))
+        /* "get" the last error to remove it */
+        || !TEST_ulong_eq(mallocfail, ERR_get_error())
+        || !TEST_ulong_eq(0, ERR_peek_last_error()))
         return 0;
 
     /*
@@ -268,7 +259,7 @@ static int test_marks(void)
 
     /* Should be able to "pop" past 2 errors */
     if (!TEST_true(ERR_pop_to_mark())
-            || !TEST_ulong_eq(mallocfail, ERR_peek_last_error()))
+        || !TEST_ulong_eq(mallocfail, ERR_peek_last_error()))
         return 0;
 
     if (!TEST_true(ERR_set_mark()))
@@ -278,7 +269,7 @@ static int test_marks(void)
 
     /* Should be able to "clear" past 2 errors */
     if (!TEST_true(ERR_clear_last_mark())
-            || !TEST_ulong_eq(shouldnot, ERR_peek_last_error()))
+        || !TEST_ulong_eq(shouldnot, ERR_peek_last_error()))
         return 0;
 
     /* Clear remaining errors from last test */
@@ -297,7 +288,7 @@ static int test_clear_error(void)
     ERR_raise_data(0, 0, "hello %s", "world");
     ERR_peek_error_data(&data, &flags);
     if (!TEST_str_eq(data, "hello world")
-            || !TEST_int_eq(flags, ERR_TXT_STRING | ERR_TXT_MALLOCED))
+        || !TEST_int_eq(flags, ERR_TXT_STRING | ERR_TXT_MALLOCED))
         goto err;
     ERR_clear_error();
 
@@ -305,7 +296,7 @@ static int test_clear_error(void)
     ERR_raise(0, 0);
     ERR_peek_error_data(&data, &flags);
     if (!TEST_str_eq(data, "")
-            || !TEST_int_eq(flags, ERR_TXT_MALLOCED))
+        || !TEST_int_eq(flags, ERR_TXT_MALLOCED))
         goto err;
     ERR_clear_error();
 
@@ -313,7 +304,7 @@ static int test_clear_error(void)
     ERR_raise_data(0, 0, "goodbye %s world", "cruel");
     ERR_peek_error_data(&data, &flags);
     if (!TEST_str_eq(data, "goodbye cruel world")
-            || !TEST_int_eq(flags, ERR_TXT_STRING | ERR_TXT_MALLOCED))
+        || !TEST_int_eq(flags, ERR_TXT_STRING | ERR_TXT_MALLOCED))
         goto err;
     ERR_clear_error();
 
@@ -324,13 +315,13 @@ static int test_clear_error(void)
     ERR_raise(0, 0);
     ERR_peek_error_data(&data, &flags);
     if (!TEST_str_eq(data, "")
-            || !TEST_int_eq(flags, ERR_TXT_MALLOCED))
+        || !TEST_int_eq(flags, ERR_TXT_MALLOCED))
         goto err;
     ERR_clear_error();
 
     res = 1;
- err:
-     ERR_clear_error();
+err:
+    ERR_clear_error();
     return res;
 }
 
@@ -382,7 +373,7 @@ static int test_save_restore(int idx)
             goto err;
         ERR_peek_last_error_data(&data, &flags);
         if (!TEST_str_eq(data, testdata)
-                || !TEST_int_eq(flags, ERR_TXT_STRING | ERR_TXT_MALLOCED))
+            || !TEST_int_eq(flags, ERR_TXT_STRING | ERR_TXT_MALLOCED))
             goto err;
 
         /* restore again to duplicate the entries */
@@ -391,26 +382,30 @@ static int test_save_restore(int idx)
         /* verify them all */
         if (idx == 0 || i == 0) {
             if (!TEST_ulong_eq(ERR_get_error_all(NULL, NULL, NULL,
-                                                 &data, &flags), mallocfail)
+                                   &data, &flags),
+                    mallocfail)
                 || !TEST_int_ne(flags, ERR_TXT_STRING | ERR_TXT_MALLOCED))
                 goto err;
         }
 
         if (!TEST_ulong_eq(ERR_get_error_all(NULL, NULL, NULL,
-                                             &data, &flags), interr)
+                               &data, &flags),
+                interr)
             || !TEST_str_eq(data, testdata)
             || !TEST_int_eq(flags, ERR_TXT_STRING | ERR_TXT_MALLOCED))
             goto err;
 
         if (idx == 0) {
             if (!TEST_ulong_eq(ERR_get_error_all(NULL, NULL, NULL,
-                                                 &data, &flags), mallocfail)
+                                   &data, &flags),
+                    mallocfail)
                 || !TEST_int_ne(flags, ERR_TXT_STRING | ERR_TXT_MALLOCED))
                 goto err;
         }
 
         if (!TEST_ulong_eq(ERR_get_error_all(NULL, NULL, NULL,
-                                             &data, &flags), interr)
+                               &data, &flags),
+                interr)
             || !TEST_str_eq(data, testdata)
             || !TEST_int_eq(flags, ERR_TXT_STRING | ERR_TXT_MALLOCED))
             goto err;
@@ -420,7 +415,7 @@ static int test_save_restore(int idx)
     }
 
     res = 1;
- err:
+err:
     OSSL_ERR_STATE_free(es);
     return res;
 }
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 982081f461ac5..f55d17258d1f2 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -33,7 +33,7 @@
 #include <openssl/engine.h>
 #include <openssl/proverr.h>
 #include <openssl/rand.h>
-# include <crypto/ml_kem.h>
+#include <crypto/ml_kem.h>
 #include "testutil.h"
 #include "internal/nelem.h"
 #include "internal/sizes.h"
@@ -107,7 +107,7 @@ static const unsigned char kExampleRSAKeyDER[] = {
     0x6f, 0xcc, 0xfa, 0x65, 0x77, 0x94, 0xb5, 0xa1, 0x0a, 0xa9, 0xd1, 0x8a,
     0x39, 0x37, 0xf4, 0x0b, 0xa0, 0xd7, 0x82, 0x27, 0x5e, 0xae, 0x17, 0x17,
     0xa1, 0x1e, 0x54, 0x34, 0xbf, 0x6e, 0xc4, 0x8e, 0x99, 0x5d, 0x08, 0xf1,
-    0x2d, 0x86, 0x9d, 0xa5, 0x20, 0x1b, 0xe5, 0xdf,
+    0x2d, 0x86, 0x9d, 0xa5, 0x20, 0x1b, 0xe5, 0xdf
 };
 
 /* An invalid key whose prime factors exceed modulus n. */
@@ -286,7 +286,7 @@ static const unsigned char kInvalidRSAKeyDER[] = {
     0x07, 0x15, 0x15, 0x15, 0x15, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00,
     0x02, 0x00, 0x25, 0x02, 0x02, 0x22, 0x3a, 0x02, 0x02, 0x02, 0x42, 0x02,
     0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-    0xe2, 0x80,
+    0xe2, 0x80
 };
 
 /*
@@ -429,7 +429,7 @@ static const unsigned char kExampleBadRSAKeyDER[] = {
     0xe6, 0xe0, 0x25, 0x78, 0x58, 0x14, 0x37, 0xf5, 0x1f, 0xe3, 0x22, 0xef,
     0xa8, 0x0e, 0x22, 0xa0, 0x94, 0x3a, 0xf6, 0xc9, 0x13, 0xe6, 0x06, 0xbf,
     0x7f, 0x99, 0xc6, 0xcc, 0xd8, 0xc6, 0xbe, 0xd9, 0x2e, 0x24, 0xc7, 0x69,
-    0x8c, 0x95, 0xba, 0xf6, 0x04, 0xb3, 0x0a, 0xf4, 0xcb, 0xf0, 0xce,
+    0x8c, 0x95, 0xba, 0xf6, 0x04, 0xb3, 0x0a, 0xf4, 0xcb, 0xf0, 0xce
 };
 
 /*
@@ -455,11 +455,11 @@ static const unsigned char kSignature[] = {
     0x5a, 0xc8, 0x16, 0x3e, 0x86, 0xd5, 0xc5, 0x71, 0x2f, 0xfc, 0x23, 0x48,
     0xd9, 0x0b, 0x13, 0xdd, 0x7b, 0x5a, 0x25, 0x79, 0xef, 0xa5, 0x7b, 0x04,
     0xed, 0x44, 0xf6, 0x18, 0x55, 0xe4, 0x0a, 0xe9, 0x57, 0x79, 0x5d, 0xd7,
-    0x55, 0xa7, 0xab, 0x45, 0x02, 0x97, 0x60, 0x42,
+    0x55, 0xa7, 0xab, 0x45, 0x02, 0x97, 0x60, 0x42
 };
 
 /*
- * kExampleRSAKeyPKCS8 is kExampleRSAKeyDER encoded in a PKCS #8
+ * kExampleRSAKeyPKCS8 is kExampleRSAKeyDER encoded in a PKCS#8 v1
  * PrivateKeyInfo.
  */
 static const unsigned char kExampleRSAKeyPKCS8[] = {
@@ -515,7 +515,81 @@ static const unsigned char kExampleRSAKeyPKCS8[] = {
     0x49, 0xaf, 0x6f, 0xcc, 0xfa, 0x65, 0x77, 0x94, 0xb5, 0xa1, 0x0a, 0xa9,
     0xd1, 0x8a, 0x39, 0x37, 0xf4, 0x0b, 0xa0, 0xd7, 0x82, 0x27, 0x5e, 0xae,
     0x17, 0x17, 0xa1, 0x1e, 0x54, 0x34, 0xbf, 0x6e, 0xc4, 0x8e, 0x99, 0x5d,
+    0x08, 0xf1, 0x2d, 0x86, 0x9d, 0xa5, 0x20, 0x1b, 0xe5, 0xdf
+};
+
+/*
+ * kExampleRSAKeyPKCS8 is kExampleRSAKeyDER encoded in a PKCS#8 v2
+ * PrivateKeyInfo (with an optional public key).
+ */
+static const unsigned char kExampleRSAKeyPKCS8_v2[] = {
+    0x30, 0x82, 0x03, 0x06, 0x02, 0x01, 0x01, 0x30, 0x0d, 0x06, 0x09, 0x2a,
+    0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82,
+    0x02, 0x60, 0x30, 0x82, 0x02, 0x5c, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81,
+    0x00, 0xf8, 0xb8, 0x6c, 0x83, 0xb4, 0xbc, 0xd9, 0xa8, 0x57, 0xc0, 0xa5,
+    0xb4, 0x59, 0x76, 0x8c, 0x54, 0x1d, 0x79, 0xeb, 0x22, 0x52, 0x04, 0x7e,
+    0xd3, 0x37, 0xeb, 0x41, 0xfd, 0x83, 0xf9, 0xf0, 0xa6, 0x85, 0x15, 0x34,
+    0x75, 0x71, 0x5a, 0x84, 0xa8, 0x3c, 0xd2, 0xef, 0x5a, 0x4e, 0xd3, 0xde,
+    0x97, 0x8a, 0xdd, 0xff, 0xbb, 0xcf, 0x0a, 0xaa, 0x86, 0x92, 0xbe, 0xb8,
+    0x50, 0xe4, 0xcd, 0x6f, 0x80, 0x33, 0x30, 0x76, 0x13, 0x8f, 0xca, 0x7b,
+    0xdc, 0xec, 0x5a, 0xca, 0x63, 0xc7, 0x03, 0x25, 0xef, 0xa8, 0x8a, 0x83,
+    0x58, 0x76, 0x20, 0xfa, 0x16, 0x77, 0xd7, 0x79, 0x92, 0x63, 0x01, 0x48,
+    0x1a, 0xd8, 0x7b, 0x67, 0xf1, 0x52, 0x55, 0x49, 0x4e, 0xd6, 0x6e, 0x4a,
+    0x5c, 0xd7, 0x7a, 0x37, 0x36, 0x0c, 0xde, 0xdd, 0x8f, 0x44, 0xe8, 0xc2,
+    0xa7, 0x2c, 0x2b, 0xb5, 0xaf, 0x64, 0x4b, 0x61, 0x07, 0x02, 0x03, 0x01,
+    0x00, 0x01, 0x02, 0x81, 0x80, 0x74, 0x88, 0x64, 0x3f, 0x69, 0x45, 0x3a,
+    0x6d, 0xc7, 0x7f, 0xb9, 0xa3, 0xc0, 0x6e, 0xec, 0xdc, 0xd4, 0x5a, 0xb5,
+    0x32, 0x85, 0x5f, 0x19, 0xd4, 0xf8, 0xd4, 0x3f, 0x3c, 0xfa, 0xc2, 0xf6,
+    0x5f, 0xee, 0xe6, 0xba, 0x87, 0x74, 0x2e, 0xc7, 0x0c, 0xd4, 0x42, 0xb8,
+    0x66, 0x85, 0x9c, 0x7b, 0x24, 0x61, 0xaa, 0x16, 0x11, 0xf6, 0xb5, 0xb6,
+    0xa4, 0x0a, 0xc9, 0x55, 0x2e, 0x81, 0xa5, 0x47, 0x61, 0xcb, 0x25, 0x8f,
+    0xc2, 0x15, 0x7b, 0x0e, 0x7c, 0x36, 0x9f, 0x3a, 0xda, 0x58, 0x86, 0x1c,
+    0x5b, 0x83, 0x79, 0xe6, 0x2b, 0xcc, 0xe6, 0xfa, 0x2c, 0x61, 0xf2, 0x78,
+    0x80, 0x1b, 0xe2, 0xf3, 0x9d, 0x39, 0x2b, 0x65, 0x57, 0x91, 0x3d, 0x71,
+    0x99, 0x73, 0xa5, 0xc2, 0x79, 0x20, 0x8c, 0x07, 0x4f, 0xe5, 0xb4, 0x60,
+    0x1f, 0x99, 0xa2, 0xb1, 0x4f, 0x0c, 0xef, 0xbc, 0x59, 0x53, 0x00, 0x7d,
+    0xb1, 0x02, 0x41, 0x00, 0xfc, 0x7e, 0x23, 0x65, 0x70, 0xf8, 0xce, 0xd3,
+    0x40, 0x41, 0x80, 0x6a, 0x1d, 0x01, 0xd6, 0x01, 0xff, 0xb6, 0x1b, 0x3d,
+    0x3d, 0x59, 0x09, 0x33, 0x79, 0xc0, 0x4f, 0xde, 0x96, 0x27, 0x4b, 0x18,
+    0xc6, 0xd9, 0x78, 0xf1, 0xf4, 0x35, 0x46, 0xe9, 0x7c, 0x42, 0x7a, 0x5d,
+    0x9f, 0xef, 0x54, 0xb8, 0xf7, 0x9f, 0xc4, 0x33, 0x6c, 0xf3, 0x8c, 0x32,
+    0x46, 0x87, 0x67, 0x30, 0x7b, 0xa7, 0xac, 0xe3, 0x02, 0x41, 0x00, 0xfc,
+    0x2c, 0xdf, 0x0c, 0x0d, 0x88, 0xf5, 0xb1, 0x92, 0xa8, 0x93, 0x47, 0x63,
+    0x55, 0xf5, 0xca, 0x58, 0x43, 0xba, 0x1c, 0xe5, 0x9e, 0xb6, 0x95, 0x05,
+    0xcd, 0xb5, 0x82, 0xdf, 0xeb, 0x04, 0x53, 0x9d, 0xbd, 0xc2, 0x38, 0x16,
+    0xb3, 0x62, 0xdd, 0xa1, 0x46, 0xdb, 0x6d, 0x97, 0x93, 0x9f, 0x8a, 0xc3,
+    0x9b, 0x64, 0x7e, 0x42, 0xe3, 0x32, 0x57, 0x19, 0x1b, 0xd5, 0x6e, 0x85,
+    0xfa, 0xb8, 0x8d, 0x02, 0x41, 0x00, 0xbc, 0x3d, 0xde, 0x6d, 0xd6, 0x97,
+    0xe8, 0xba, 0x9e, 0x81, 0x37, 0x17, 0xe5, 0xa0, 0x64, 0xc9, 0x00, 0xb7,
+    0xe7, 0xfe, 0xf4, 0x29, 0xd9, 0x2e, 0x43, 0x6b, 0x19, 0x20, 0xbd, 0x99,
+    0x75, 0xe7, 0x76, 0xf8, 0xd3, 0xae, 0xaf, 0x7e, 0xb8, 0xeb, 0x81, 0xf4,
+    0x9d, 0xfe, 0x07, 0x2b, 0x0b, 0x63, 0x0b, 0x5a, 0x55, 0x90, 0x71, 0x7d,
+    0xf1, 0xdb, 0xd9, 0xb1, 0x41, 0x41, 0x68, 0x2f, 0x4e, 0x39, 0x02, 0x40,
+    0x5a, 0x34, 0x66, 0xd8, 0xf5, 0xe2, 0x7f, 0x18, 0xb5, 0x00, 0x6e, 0x26,
+    0x84, 0x27, 0x14, 0x93, 0xfb, 0xfc, 0xc6, 0x0f, 0x5e, 0x27, 0xe6, 0xe1,
+    0xe9, 0xc0, 0x8a, 0xe4, 0x34, 0xda, 0xe9, 0xa2, 0x4b, 0x73, 0xbc, 0x8c,
+    0xb9, 0xba, 0x13, 0x6c, 0x7a, 0x2b, 0x51, 0x84, 0xa3, 0x4a, 0xe0, 0x30,
+    0x10, 0x06, 0x7e, 0xed, 0x17, 0x5a, 0x14, 0x00, 0xc9, 0xef, 0x85, 0xea,
+    0x52, 0x2c, 0xbc, 0x65, 0x02, 0x40, 0x51, 0xe3, 0xf2, 0x83, 0x19, 0x9b,
+    0xc4, 0x1e, 0x2f, 0x50, 0x3d, 0xdf, 0x5a, 0xa2, 0x18, 0xca, 0x5f, 0x2e,
+    0x49, 0xaf, 0x6f, 0xcc, 0xfa, 0x65, 0x77, 0x94, 0xb5, 0xa1, 0x0a, 0xa9,
+    0xd1, 0x8a, 0x39, 0x37, 0xf4, 0x0b, 0xa0, 0xd7, 0x82, 0x27, 0x5e, 0xae,
+    0x17, 0x17, 0xa1, 0x1e, 0x54, 0x34, 0xbf, 0x6e, 0xc4, 0x8e, 0x99, 0x5d,
     0x08, 0xf1, 0x2d, 0x86, 0x9d, 0xa5, 0x20, 0x1b, 0xe5, 0xdf,
+    /* Implicit optional Public key BIT STRING */
+    0x81,
+    0x81, 0x8d, 0x00, 0x30, 0x81, 0x89, 0x02, 0x81, 0x81, 0x00, 0xf8,
+    0xb8, 0x6c, 0x83, 0xb4, 0xbc, 0xd9, 0xa8, 0x57, 0xc0, 0xa5, 0xb4, 0x59,
+    0x76, 0x8c, 0x54, 0x1d, 0x79, 0xeb, 0x22, 0x52, 0x04, 0x7e, 0xd3, 0x37,
+    0xeb, 0x41, 0xfd, 0x83, 0xf9, 0xf0, 0xa6, 0x85, 0x15, 0x34, 0x75, 0x71,
+    0x5a, 0x84, 0xa8, 0x3c, 0xd2, 0xef, 0x5a, 0x4e, 0xd3, 0xde, 0x97, 0x8a,
+    0xdd, 0xff, 0xbb, 0xcf, 0x0a, 0xaa, 0x86, 0x92, 0xbe, 0xb8, 0x50, 0xe4,
+    0xcd, 0x6f, 0x80, 0x33, 0x30, 0x76, 0x13, 0x8f, 0xca, 0x7b, 0xdc, 0xec,
+    0x5a, 0xca, 0x63, 0xc7, 0x03, 0x25, 0xef, 0xa8, 0x8a, 0x83, 0x58, 0x76,
+    0x20, 0xfa, 0x16, 0x77, 0xd7, 0x79, 0x92, 0x63, 0x01, 0x48, 0x1a, 0xd8,
+    0x7b, 0x67, 0xf1, 0x52, 0x55, 0x49, 0x4e, 0xd6, 0x6e, 0x4a, 0x5c, 0xd7,
+    0x7a, 0x37, 0x36, 0x0c, 0xde, 0xdd, 0x8f, 0x44, 0xe8, 0xc2, 0xa7, 0x2c,
+    0x2b, 0xb5, 0xaf, 0x64, 0x4b, 0x61, 0x07, 0x02, 0x03, 0x01, 0x00, 0x01
 };
 
 #ifndef OPENSSL_NO_EC
@@ -534,7 +608,30 @@ static const unsigned char kExampleECKeyDER[] = {
     0x1e, 0x9d, 0xdc, 0xba, 0x5a, 0x01, 0xe7, 0xd6, 0x97, 0xa8, 0x0a, 0x18,
     0xf9, 0xc3, 0xc4, 0xa3, 0x1e, 0x56, 0xe2, 0x7c, 0x83, 0x48, 0xdb, 0x16,
     0x1a, 0x1c, 0xf5, 0x1d, 0x7e, 0xf1, 0x94, 0x2d, 0x4b, 0xcf, 0x72, 0x22,
-    0xc1,
+    0xc1
+};
+
+static const unsigned char kExampleECKeyPKCS8_v2[] = {
+    0x30, 0x81, 0xcb, 0x02, 0x01, 0x01, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86,
+    0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d,
+    0x03, 0x01, 0x07, 0x04, 0x6d, 0x30, 0x6b, 0x02, 0x01, 0x01, 0x04, 0x20,
+    0x07, 0x0f, 0x08, 0x72, 0x7a, 0xd4, 0xa0, 0x4a, 0x9c, 0xdd, 0x59, 0xc9,
+    0x4d, 0x89, 0x68, 0x77, 0x08, 0xb5, 0x6f, 0xc9, 0x5d, 0x30, 0x77, 0x0e,
+    0xe8, 0xd1, 0xc9, 0xce, 0x0a, 0x8b, 0xb4, 0x6a, 0xa1, 0x44, 0x03, 0x42,
+    0x00, 0x04, 0xe6, 0x2b, 0x69, 0xe2, 0xbf, 0x65, 0x9f, 0x97, 0xbe, 0x2f,
+    0x1e, 0x0d, 0x94, 0x8a, 0x4c, 0xd5, 0x97, 0x6b, 0xb7, 0xa9, 0x1e, 0x0d,
+    0x46, 0xfb, 0xdd, 0xa9, 0xa9, 0x1e, 0x9d, 0xdc, 0xba, 0x5a, 0x01, 0xe7,
+    0xd6, 0x97, 0xa8, 0x0a, 0x18, 0xf9, 0xc3, 0xc4, 0xa3, 0x1e, 0x56, 0xe2,
+    0x7c, 0x83, 0x48, 0xdb, 0x16, 0x1a, 0x1c, 0xf5, 0x1d, 0x7e, 0xf1, 0x94,
+    0x2d, 0x4b, 0xcf, 0x72, 0x22, 0xc1,
+    /* Optional implicit public key BIT STRING */
+    0x81,
+    0x42, 0x00, 0x04, 0xe6, 0x2b, 0x69, 0xe2, 0xbf, 0x65, 0x9f, 0x97,
+    0xbe, 0x2f, 0x1e, 0x0d, 0x94, 0x8a, 0x4c, 0xd5, 0x97, 0x6b, 0xb7, 0xa9,
+    0x1e, 0x0d, 0x46, 0xfb, 0xdd, 0xa9, 0xa9, 0x1e, 0x9d, 0xdc, 0xba, 0x5a,
+    0x01, 0xe7, 0xd6, 0x97, 0xa8, 0x0a, 0x18, 0xf9, 0xc3, 0xc4, 0xa3, 0x1e,
+    0x56, 0xe2, 0x7c, 0x83, 0x48, 0xdb, 0x16, 0x1a, 0x1c, 0xf5, 0x1d, 0x7e,
+    0xf1, 0x94, 0x2d, 0x4b, 0xcf, 0x72, 0x22, 0xc1
 };
 
 /*
@@ -584,7 +681,7 @@ static const unsigned char pExampleECParamDER[] = {
     0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07
 };
 
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 static const unsigned char kExampleED25519KeyDER[] = {
     0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70,
     0x04, 0x22, 0x04, 0x20, 0xba, 0x7b, 0xba, 0x20, 0x1b, 0x02, 0x75, 0x3a,
@@ -599,20 +696,20 @@ static const unsigned char kExampleED25519PubKeyDER[] = {
     0x97, 0xa3, 0x08, 0xdc, 0x65, 0x80, 0x39, 0x29
 };
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 static const unsigned char kExampleX25519KeyDER[] = {
     0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x6e,
     0x04, 0x22, 0x04, 0x20, 0xa0, 0x24, 0x3a, 0x31, 0x24, 0xc3, 0x3f, 0xf6,
     0x7b, 0x96, 0x0b, 0xd4, 0x8f, 0xd1, 0xee, 0x67, 0xf2, 0x9b, 0x88, 0xac,
     0x50, 0xce, 0x97, 0x36, 0xdd, 0xaf, 0x25, 0xf6, 0x10, 0x34, 0x96, 0x6e
 };
-#  endif
-# endif
+#endif
+#endif
 #endif
 
 /* kExampleDHKeyDER is a DH private key in ASN.1, DER format. */
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
 static const unsigned char kExampleDHKeyDER[] = {
     0x30, 0x82, 0x01, 0x21, 0x02, 0x01, 0x00, 0x30, 0x81, 0x95, 0x06, 0x09,
     0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x03, 0x01, 0x30, 0x81, 0x87,
@@ -640,7 +737,7 @@ static const unsigned char kExampleDHKeyDER[] = {
     0x83, 0xde, 0xad, 0xb6, 0x5d, 0x19, 0xc1, 0x53, 0xec, 0xfb, 0xaf, 0x06,
     0x2e, 0x87, 0x2a, 0x0b, 0x7a
 };
-# endif
+#endif
 #endif
 
 static const unsigned char kCFBDefaultKey[] = {
@@ -677,7 +774,7 @@ static const unsigned char cfbPlaintext[] = {
 };
 static const unsigned char cfbPlaintext_partial[] = {
     0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96, 0xE9, 0x3D, 0x7E, 0x11,
-    0x73, 0x93, 0x17, 0x2A, 0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96,
+    0x73, 0x93, 0x17, 0x2A, 0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96
 };
 
 static const unsigned char gcmDefaultPlaintext[16] = { 0 };
@@ -758,44 +855,50 @@ typedef struct APK_DATA_st {
 } APK_DATA;
 
 static APK_DATA keydata[] = {
-    {kExampleRSAKeyDER, sizeof(kExampleRSAKeyDER), "RSA", EVP_PKEY_RSA},
-    {kExampleRSAKeyPKCS8, sizeof(kExampleRSAKeyPKCS8), "RSA", EVP_PKEY_RSA},
+    { kExampleRSAKeyDER, sizeof(kExampleRSAKeyDER), "RSA", EVP_PKEY_RSA },
+    { kExampleRSAKeyPKCS8, sizeof(kExampleRSAKeyPKCS8), "RSA", EVP_PKEY_RSA },
 #ifndef OPENSSL_NO_EC
-    {kExampleECKeyDER, sizeof(kExampleECKeyDER), "EC", EVP_PKEY_EC}
+    { kExampleECKeyDER, sizeof(kExampleECKeyDER), "EC", EVP_PKEY_EC }
+#endif
+};
+
+static APK_DATA keydata_v2[] = {
+    { kExampleRSAKeyPKCS8_v2, sizeof(kExampleRSAKeyPKCS8_v2), "RSA", EVP_PKEY_RSA },
+#ifndef OPENSSL_NO_EC
+    { kExampleECKeyPKCS8_v2, sizeof(kExampleECKeyPKCS8_v2), "EC", EVP_PKEY_EC }
 #endif
 };
 
 static APK_DATA keycheckdata[] = {
-    {kExampleRSAKeyDER, sizeof(kExampleRSAKeyDER), "RSA", EVP_PKEY_RSA, 1, 1, 1,
-     0},
-    {kExampleBadRSAKeyDER, sizeof(kExampleBadRSAKeyDER), "RSA", EVP_PKEY_RSA,
-     0, 1, 1, 0},
-    {kExampleBad2RSAKeyDER, sizeof(kExampleBad2RSAKeyDER), "RSA", EVP_PKEY_RSA,
-     0, 0, 1 /* Since there are no "params" in an RSA key this passes */, 0},
+    { kExampleRSAKeyDER, sizeof(kExampleRSAKeyDER), "RSA", EVP_PKEY_RSA, 1, 1, 1,
+        0 },
+    { kExampleBadRSAKeyDER, sizeof(kExampleBadRSAKeyDER), "RSA", EVP_PKEY_RSA,
+        0, 1, 1, 0 },
+    { kExampleBad2RSAKeyDER, sizeof(kExampleBad2RSAKeyDER), "RSA", EVP_PKEY_RSA,
+        0, 0, 1 /* Since there are no "params" in an RSA key this passes */, 0 },
 #ifndef OPENSSL_NO_EC
-    {kExampleECKeyDER, sizeof(kExampleECKeyDER), "EC", EVP_PKEY_EC, 1, 1, 1, 0},
+    { kExampleECKeyDER, sizeof(kExampleECKeyDER), "EC", EVP_PKEY_EC, 1, 1, 1, 0 },
     /* group is also associated in our pub key */
-    {kExampleECPubKeyDER, sizeof(kExampleECPubKeyDER), "EC", EVP_PKEY_EC, 0, 1,
-     1, 1},
-    {pExampleECParamDER, sizeof(pExampleECParamDER), "EC", EVP_PKEY_EC, 0, 0, 1,
-     2},
-# ifndef OPENSSL_NO_ECX
-    {kExampleED25519KeyDER, sizeof(kExampleED25519KeyDER), "ED25519",
-     EVP_PKEY_ED25519, 1, 1, 1, 0},
-    {kExampleED25519PubKeyDER, sizeof(kExampleED25519PubKeyDER), "ED25519",
-     EVP_PKEY_ED25519, 0, 1, 1, 1},
-# endif
+    { kExampleECPubKeyDER, sizeof(kExampleECPubKeyDER), "EC", EVP_PKEY_EC, 0, 1,
+        1, 1 },
+    { pExampleECParamDER, sizeof(pExampleECParamDER), "EC", EVP_PKEY_EC, 0, 0, 1,
+        2 },
+#ifndef OPENSSL_NO_ECX
+    { kExampleED25519KeyDER, sizeof(kExampleED25519KeyDER), "ED25519",
+        EVP_PKEY_ED25519, 1, 1, 1, 0 },
+    { kExampleED25519PubKeyDER, sizeof(kExampleED25519PubKeyDER), "ED25519",
+        EVP_PKEY_ED25519, 0, 1, 1, 1 },
+#endif
 #endif
 };
 
 static EVP_PKEY *load_example_key(const char *keytype,
-                                  const unsigned char *data, size_t data_len)
+    const unsigned char *data, size_t data_len)
 {
     const unsigned char **pdata = &data;
     EVP_PKEY *pkey = NULL;
-    OSSL_DECODER_CTX *dctx =
-        OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", NULL, keytype, 0,
-                                      testctx, testpropq);
+    OSSL_DECODER_CTX *dctx = OSSL_DECODER_CTX_new_for_pkey(&pkey, "DER", NULL, keytype, 0,
+        testctx, testpropq);
 
     /* |pkey| will be NULL on error */
     (void)OSSL_DECODER_from_data(dctx, pdata, &data_len);
@@ -806,14 +909,14 @@ static EVP_PKEY *load_example_key(const char *keytype,
 static EVP_PKEY *load_example_rsa_key(void)
 {
     return load_example_key("RSA", kExampleRSAKeyDER,
-                            sizeof(kExampleRSAKeyDER));
+        sizeof(kExampleRSAKeyDER));
 }
 
 #ifndef OPENSSL_NO_DSA
 static EVP_PKEY *load_example_dsa_key(void)
 {
     return load_example_key("DSA", kExampleDSAKeyDER,
-                            sizeof(kExampleDSAKeyDER));
+        sizeof(kExampleDSAKeyDER));
 }
 #endif
 
@@ -821,32 +924,32 @@ static EVP_PKEY *load_example_dsa_key(void)
 static EVP_PKEY *load_example_ec_key(void)
 {
     return load_example_key("EC", kExampleECKeyDER,
-                            sizeof(kExampleECKeyDER));
+        sizeof(kExampleECKeyDER));
 }
 #endif
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
 static EVP_PKEY *load_example_dh_key(void)
 {
     return load_example_key("DH", kExampleDHKeyDER,
-                            sizeof(kExampleDHKeyDER));
+        sizeof(kExampleDHKeyDER));
 }
-# endif
+#endif
 
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 static EVP_PKEY *load_example_ed25519_key(void)
 {
     return load_example_key("ED25519", kExampleED25519KeyDER,
-                            sizeof(kExampleED25519KeyDER));
+        sizeof(kExampleED25519KeyDER));
 }
 
 static EVP_PKEY *load_example_x25519_key(void)
 {
     return load_example_key("X25519", kExampleX25519KeyDER,
-                            sizeof(kExampleX25519KeyDER));
+        sizeof(kExampleX25519KeyDER));
 }
-# endif
+#endif
 #endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 static EVP_PKEY *load_example_hmac_key(void)
@@ -859,7 +962,7 @@ static EVP_PKEY *load_example_hmac_key(void)
     };
 
     pkey = EVP_PKEY_new_raw_private_key_ex(testctx, "HMAC",
-                                           NULL, key, sizeof(key));
+        NULL, key, sizeof(key));
     if (!TEST_ptr(pkey))
         return NULL;
 
@@ -874,7 +977,7 @@ static int test_EVP_set_config_properties(void)
 
     fetched_properties = EVP_get1_default_properties(OSSL_LIB_CTX_get0_global_default());
     if (!TEST_ptr(fetched_properties)
-            || !TEST_str_eq(fetched_properties, test_propq))
+        || !TEST_str_eq(fetched_properties, test_propq))
         goto err;
     OPENSSL_free(fetched_properties);
     fetched_properties = NULL;
@@ -895,21 +998,21 @@ static int test_EVP_set_default_properties(void)
     const char test_fips_propq[] = "fips=yes,provider=fizzbang";
 
     if (!TEST_ptr(ctx = OSSL_LIB_CTX_new())
-            || !TEST_ptr(md = EVP_MD_fetch(ctx, "sha256", NULL)))
+        || !TEST_ptr(md = EVP_MD_fetch(ctx, "sha256", NULL)))
         goto err;
     EVP_MD_free(md);
     md = NULL;
 
     if (!TEST_true(EVP_set_default_properties(ctx, test_propq))
-            || !TEST_ptr_null(md = EVP_MD_fetch(ctx, "sha256", NULL))
-            || !TEST_ptr(md = EVP_MD_fetch(ctx, "sha256", "-provider")))
+        || !TEST_ptr_null(md = EVP_MD_fetch(ctx, "sha256", NULL))
+        || !TEST_ptr(md = EVP_MD_fetch(ctx, "sha256", "-provider")))
         goto err;
     EVP_MD_free(md);
     md = NULL;
 
     fetched_properties = EVP_get1_default_properties(ctx);
     if (!TEST_ptr(fetched_properties)
-            || !TEST_str_eq(fetched_properties, test_propq))
+        || !TEST_str_eq(fetched_properties, test_propq))
         goto err;
     OPENSSL_free(fetched_properties);
     fetched_properties = NULL;
@@ -918,7 +1021,7 @@ static int test_EVP_set_default_properties(void)
         goto err;
     fetched_properties = EVP_get1_default_properties(ctx);
     if (!TEST_ptr(fetched_properties)
-            || !TEST_str_eq(fetched_properties, test_fips_propq))
+        || !TEST_str_eq(fetched_properties, test_fips_propq))
         goto err;
     OPENSSL_free(fetched_properties);
     fetched_properties = NULL;
@@ -927,7 +1030,7 @@ static int test_EVP_set_default_properties(void)
         goto err;
 
     if (!TEST_true(EVP_set_default_properties(ctx, NULL))
-            || !TEST_ptr(md = EVP_MD_fetch(ctx, "sha256", NULL)))
+        || !TEST_ptr(md = EVP_MD_fetch(ctx, "sha256", NULL)))
         goto err;
     res = 1;
 err:
@@ -945,9 +1048,12 @@ static EVP_PKEY *make_key_fromdata(char *keytype, OSSL_PARAM *params)
 
     if (!TEST_ptr(pctx = EVP_PKEY_CTX_new_from_name(testctx, keytype, testpropq)))
         goto err;
-    if (!TEST_int_gt(EVP_PKEY_fromdata_init(pctx), 0)
+    /* Check that premature EVP_PKEY_CTX_set_params() fails gracefully */
+    if (!TEST_int_eq(EVP_PKEY_CTX_set_params(pctx, params), 0)
+        || !TEST_int_gt(EVP_PKEY_fromdata_init(pctx), 0)
         || !TEST_int_gt(EVP_PKEY_fromdata(pctx, &tmp_pkey, EVP_PKEY_KEYPAIR,
-                                          params), 0))
+                            params),
+            0))
         goto err;
 
     if (!TEST_ptr(tmp_pkey))
@@ -955,7 +1061,7 @@ static EVP_PKEY *make_key_fromdata(char *keytype, OSSL_PARAM *params)
 
     pkey = tmp_pkey;
     tmp_pkey = NULL;
- err:
+err:
     EVP_PKEY_free(tmp_pkey);
     EVP_PKEY_CTX_free(pctx);
     return pkey;
@@ -976,7 +1082,7 @@ static int test_selection(EVP_PKEY *pkey, int selection)
             goto err;
     }
     ret = PEM_write_bio_PrivateKey_ex(bio, pkey, NULL, NULL, 0, NULL, NULL,
-                                      testctx, NULL);
+        testctx, NULL);
     if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
         if (!TEST_true(ret))
             goto err;
@@ -986,7 +1092,7 @@ static int test_selection(EVP_PKEY *pkey, int selection)
     }
 
     testresult = 1;
- err:
+err:
     BIO_free(bio);
 
     return testresult;
@@ -1045,7 +1151,7 @@ static int test_EVP_PKEY_ffc_priv_pub(char *keytype)
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_Q, q))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_G, g))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY,
-                                             priv)))
+            priv)))
         goto err;
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
         || !TEST_ptr(params_and_priv = make_key_fromdata(keytype, params)))
@@ -1066,7 +1172,7 @@ static int test_EVP_PKEY_ffc_priv_pub(char *keytype)
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_Q, q))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_G, g))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PUB_KEY,
-                                             pub)))
+            pub)))
         goto err;
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
         || !TEST_ptr(params_and_pub = make_key_fromdata(keytype, params)))
@@ -1087,9 +1193,9 @@ static int test_EVP_PKEY_ffc_priv_pub(char *keytype)
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_Q, q))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_G, g))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PUB_KEY,
-                                             pub))
+            pub))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY,
-                                             priv)))
+            priv)))
         goto err;
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
         || !TEST_ptr(params_and_keypair = make_key_fromdata(keytype, params)))
@@ -1099,7 +1205,7 @@ static int test_EVP_PKEY_ffc_priv_pub(char *keytype)
         goto err;
 
     ret = 1;
- err:
+err:
     OSSL_PARAM_free(params);
     OSSL_PARAM_BLD_free(bld);
     EVP_PKEY_free(just_params);
@@ -1159,8 +1265,8 @@ static int test_EC_priv_pub(void)
     /* Test !priv and !pub */
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld,
-                                                      OSSL_PKEY_PARAM_GROUP_NAME,
-                                                      "P-256", 0)))
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            "P-256", 0)))
         goto err;
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
         || !TEST_ptr(just_params = make_key_fromdata("EC", params)))
@@ -1178,10 +1284,10 @@ static int test_EC_priv_pub(void)
     /* Test priv and !pub */
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld,
-                                                      OSSL_PKEY_PARAM_GROUP_NAME,
-                                                      "P-256", 0))
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            "P-256", 0))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY,
-                                             priv)))
+            priv)))
         goto err;
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
         || !TEST_ptr(params_and_priv = make_key_fromdata("EC", params)))
@@ -1205,11 +1311,11 @@ static int test_EC_priv_pub(void)
     /* Test !priv and pub */
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld,
-                                                      OSSL_PKEY_PARAM_GROUP_NAME,
-                                                      "P-256", 0))
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            "P-256", 0))
         || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                                                       OSSL_PKEY_PARAM_PUB_KEY,
-                                                       ec_pub, sizeof(ec_pub))))
+            OSSL_PKEY_PARAM_PUB_KEY,
+            ec_pub, sizeof(ec_pub))))
         goto err;
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
         || !TEST_ptr(params_and_pub = make_key_fromdata("EC", params)))
@@ -1227,13 +1333,13 @@ static int test_EC_priv_pub(void)
     /* Test priv and pub */
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld,
-                                                      OSSL_PKEY_PARAM_GROUP_NAME,
-                                                      "P-256", 0))
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            "P-256", 0))
         || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                                                       OSSL_PKEY_PARAM_PUB_KEY,
-                                                       ec_pub, sizeof(ec_pub)))
+            OSSL_PKEY_PARAM_PUB_KEY,
+            ec_pub, sizeof(ec_pub)))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY,
-                                             priv)))
+            priv)))
         goto err;
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
         || !TEST_ptr(params_and_keypair = make_key_fromdata("EC", params)))
@@ -1245,11 +1351,11 @@ static int test_EC_priv_pub(void)
     /* Try key equality */
     if (!TEST_int_gt(EVP_PKEY_parameters_eq(just_params, just_params), 0)
         || !TEST_int_gt(EVP_PKEY_parameters_eq(just_params, params_and_pub),
-                        0)
+            0)
         || !TEST_int_gt(EVP_PKEY_parameters_eq(just_params, params_and_priv),
-                        0)
+            0)
         || !TEST_int_gt(EVP_PKEY_parameters_eq(just_params, params_and_keypair),
-                        0)
+            0)
         || !TEST_int_gt(EVP_PKEY_eq(params_and_pub, params_and_pub), 0)
         || !TEST_int_gt(EVP_PKEY_eq(params_and_priv, params_and_priv), 0)
         || !TEST_int_gt(EVP_PKEY_eq(params_and_keypair, params_and_pub), 0)
@@ -1269,26 +1375,29 @@ static int test_EC_priv_pub(void)
 
     /* Positive and negative testcase for EVP_PKEY_get_octet_string_param */
     if (!TEST_int_eq(EVP_PKEY_get_octet_string_param(params_and_pub,
-                                                     OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
-                                                     buffer, sizeof(buffer), &len), 1)
+                         OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+                         buffer, sizeof(buffer), &len),
+            1)
         || !TEST_int_eq(len, 65))
         goto err;
 
     len = 0;
     if (!TEST_int_eq(EVP_PKEY_get_octet_string_param(params_and_pub,
-                                                     OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
-                                                     NULL, 0, &len), 1)
+                         OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+                         NULL, 0, &len),
+            1)
         || !TEST_int_eq(len, 65))
         goto err;
 
     /* too-short buffer len*/
     if (!TEST_int_eq(EVP_PKEY_get_octet_string_param(params_and_pub,
-                                                     OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
-                                                     buffer, 10, &len), 0))
+                         OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+                         buffer, 10, &len),
+            0))
         goto err;
 
     ret = 1;
- err:
+err:
     OSSL_PARAM_free(params);
     OSSL_PARAM_BLD_free(bld);
     EVP_PKEY_free(just_params);
@@ -1317,13 +1426,13 @@ static int test_evp_get_ec_pub(void)
 
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld,
-                                                      OSSL_PKEY_PARAM_GROUP_NAME,
-                                                      "P-256", 0))
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            "P-256", 0))
         || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                                                       OSSL_PKEY_PARAM_PUB_KEY,
-                                                       ec_pub, sizeof(ec_pub)))
+            OSSL_PKEY_PARAM_PUB_KEY,
+            ec_pub, sizeof(ec_pub)))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY,
-                                             priv)))
+            priv)))
         goto err;
 
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
@@ -1360,7 +1469,7 @@ static int test_evp_get_ec_pub(void)
 }
 
 /* Test that using a legacy EC key with only a private key in it works */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 static int test_EC_priv_only_legacy(void)
 {
     BIGNUM *priv = NULL;
@@ -1399,7 +1508,7 @@ static int test_EC_priv_only_legacy(void)
          * provider side which is sufficient for this test.
          */
         if (!TEST_true(EVP_DigestSignInit_ex(ctx, NULL, NULL, testctx,
-                                             testpropq, pkey, NULL)))
+                testpropq, pkey, NULL)))
             goto err;
         EVP_MD_CTX_free(ctx);
         ctx = NULL;
@@ -1418,7 +1527,7 @@ static int test_EC_priv_only_legacy(void)
     }
     ret = 1;
 
- err:
+err:
     EVP_MD_CTX_free(ctx);
     EVP_PKEY_free(pkey);
     EC_KEY_free(eckey);
@@ -1443,7 +1552,7 @@ static int test_evp_get_ec_pub_legacy(void)
 
     /* Create the legacy key */
     if (!TEST_ptr(eckey = EC_KEY_new_by_curve_name_ex(libctx, NULL,
-                                                      NID_X9_62_prime256v1)))
+                      NID_X9_62_prime256v1)))
         goto err;
 
     if (!TEST_ptr(priv = BN_bin2bn(ec_priv, sizeof(ec_priv), NULL)))
@@ -1496,7 +1605,7 @@ static int test_evp_get_ec_pub_legacy(void)
 
     return ret;
 }
-# endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 #endif /* OPENSSL_NO_EC */
 
 static int test_EVP_PKEY_sign(int tst)
@@ -1534,25 +1643,27 @@ static int test_EVP_PKEY_sign(int tst)
 
     ctx = EVP_PKEY_CTX_new_from_pkey(testctx, pkey, NULL);
     if (!TEST_ptr(ctx)
-            || !TEST_int_gt(EVP_PKEY_sign_init(ctx), 0)
-            || !TEST_int_gt(EVP_PKEY_sign(ctx, NULL, &sig_len, tbs,
-                                          sizeof(tbs)), 0))
+        || !TEST_int_gt(EVP_PKEY_sign_init(ctx), 0)
+        || !TEST_int_gt(EVP_PKEY_sign(ctx, NULL, &sig_len, tbs,
+                            sizeof(tbs)),
+            0))
         goto out;
     sig = OPENSSL_malloc(sig_len);
     if (!TEST_ptr(sig)
-            /* Test sending a signature buffer that is too short is rejected */
-            || !TEST_int_le(EVP_PKEY_sign(ctx, sig, &shortsig_len, tbs,
-                                          sizeof(tbs)), 0)
-            || !TEST_int_gt(EVP_PKEY_sign(ctx, sig, &sig_len, tbs, sizeof(tbs)),
-                            0)
-            /* Test the signature round-trips */
-            || !TEST_int_gt(EVP_PKEY_verify_init(ctx), 0)
-            || !TEST_int_gt(EVP_PKEY_verify(ctx, sig, sig_len, tbs, sizeof(tbs)),
-                            0))
+        /* Test sending a signature buffer that is too short is rejected */
+        || !TEST_int_le(EVP_PKEY_sign(ctx, sig, &shortsig_len, tbs,
+                            sizeof(tbs)),
+            0)
+        || !TEST_int_gt(EVP_PKEY_sign(ctx, sig, &sig_len, tbs, sizeof(tbs)),
+            0)
+        /* Test the signature round-trips */
+        || !TEST_int_gt(EVP_PKEY_verify_init(ctx), 0)
+        || !TEST_int_gt(EVP_PKEY_verify(ctx, sig, sig_len, tbs, sizeof(tbs)),
+            0))
         goto out;
 
     ret = 1;
- out:
+out:
     EVP_PKEY_CTX_free(ctx);
     OPENSSL_free(sig);
     EVP_PKEY_free(pkey);
@@ -1592,7 +1703,7 @@ static int test_EVP_PKEY_sign_with_app_method(int tst)
     } else {
 #ifndef OPENSSL_NO_DSA
         if (!TEST_ptr(pkey = load_example_dsa_key()))
-                goto out;
+            goto out;
         if (!TEST_ptr(dsa_meth = DSA_meth_dup(DSA_get_default_method())))
             goto out;
 
@@ -1609,25 +1720,27 @@ static int test_EVP_PKEY_sign_with_app_method(int tst)
 
     ctx = EVP_PKEY_CTX_new_from_pkey(testctx, pkey, NULL);
     if (!TEST_ptr(ctx)
-            || !TEST_int_gt(EVP_PKEY_sign_init(ctx), 0)
-            || !TEST_int_gt(EVP_PKEY_sign(ctx, NULL, &sig_len, tbs,
-                                          sizeof(tbs)), 0))
+        || !TEST_int_gt(EVP_PKEY_sign_init(ctx), 0)
+        || !TEST_int_gt(EVP_PKEY_sign(ctx, NULL, &sig_len, tbs,
+                            sizeof(tbs)),
+            0))
         goto out;
     sig = OPENSSL_malloc(sig_len);
     if (!TEST_ptr(sig)
-            /* Test sending a signature buffer that is too short is rejected */
-            || !TEST_int_le(EVP_PKEY_sign(ctx, sig, &shortsig_len, tbs,
-                                          sizeof(tbs)), 0)
-            || !TEST_int_gt(EVP_PKEY_sign(ctx, sig, &sig_len, tbs, sizeof(tbs)),
-                            0)
-            /* Test the signature round-trips */
-            || !TEST_int_gt(EVP_PKEY_verify_init(ctx), 0)
-            || !TEST_int_gt(EVP_PKEY_verify(ctx, sig, sig_len, tbs, sizeof(tbs)),
-                            0))
+        /* Test sending a signature buffer that is too short is rejected */
+        || !TEST_int_le(EVP_PKEY_sign(ctx, sig, &shortsig_len, tbs,
+                            sizeof(tbs)),
+            0)
+        || !TEST_int_gt(EVP_PKEY_sign(ctx, sig, &sig_len, tbs, sizeof(tbs)),
+            0)
+        /* Test the signature round-trips */
+        || !TEST_int_gt(EVP_PKEY_verify_init(ctx), 0)
+        || !TEST_int_gt(EVP_PKEY_verify(ctx, sig, sig_len, tbs, sizeof(tbs)),
+            0))
         goto out;
 
     ret = 1;
- out:
+out:
     EVP_PKEY_CTX_free(ctx);
     OPENSSL_free(sig);
     EVP_PKEY_free(pkey);
@@ -1663,26 +1776,26 @@ static int test_EVP_Enveloped(int n)
     if (n == 0)
         type = (EVP_CIPHER *)EVP_aes_256_cbc();
     else if (!TEST_ptr(type = EVP_CIPHER_fetch(testctx, "AES-256-CBC",
-                                               testpropq)))
+                           testpropq)))
         goto err;
 
     if (!TEST_ptr(keypair = load_example_rsa_key())
-            || !TEST_ptr(kek = OPENSSL_zalloc(EVP_PKEY_get_size(keypair)))
-            || !TEST_ptr(ctx = EVP_CIPHER_CTX_new())
-            || !TEST_true(EVP_SealInit(ctx, type, &kek, &kek_len, iv,
-                                       &keypair, 1))
-            || !TEST_true(EVP_SealUpdate(ctx, ciphertext, &ciphertext_len,
-                                         msg, sizeof(msg)))
-            || !TEST_true(EVP_SealFinal(ctx, ciphertext + ciphertext_len,
-                                        &len)))
+        || !TEST_ptr(kek = OPENSSL_zalloc(EVP_PKEY_get_size(keypair)))
+        || !TEST_ptr(ctx = EVP_CIPHER_CTX_new())
+        || !TEST_true(EVP_SealInit(ctx, type, &kek, &kek_len, iv,
+            &keypair, 1))
+        || !TEST_true(EVP_SealUpdate(ctx, ciphertext, &ciphertext_len,
+            msg, sizeof(msg)))
+        || !TEST_true(EVP_SealFinal(ctx, ciphertext + ciphertext_len,
+            &len)))
         goto err;
 
     ciphertext_len += len;
 
     if (!TEST_true(EVP_OpenInit(ctx, type, kek, kek_len, iv, keypair))
-            || !TEST_true(EVP_OpenUpdate(ctx, plaintext, &plaintext_len,
-                                         ciphertext, ciphertext_len))
-            || !TEST_true(EVP_OpenFinal(ctx, plaintext + plaintext_len, &len)))
+        || !TEST_true(EVP_OpenUpdate(ctx, plaintext, &plaintext_len,
+            ciphertext, ciphertext_len))
+        || !TEST_true(EVP_OpenFinal(ctx, plaintext + plaintext_len, &len)))
         goto err;
 
     plaintext_len += len;
@@ -1749,24 +1862,24 @@ static int test_EVP_DigestSignInit(int tst)
             goto out;
     } else {
         if (!TEST_ptr(a_md_ctx = md_ctx = EVP_MD_CTX_new())
-                || !TEST_ptr(a_md_ctx_verify = md_ctx_verify = EVP_MD_CTX_new()))
+            || !TEST_ptr(a_md_ctx_verify = md_ctx_verify = EVP_MD_CTX_new()))
             goto out;
     }
 
     if (tst % 3 == 0) {
         if (!TEST_ptr(pkey = load_example_rsa_key()))
-                goto out;
+            goto out;
     } else if (tst % 3 == 1) {
 #ifndef OPENSSL_NO_DSA
         if (!TEST_ptr(pkey = load_example_dsa_key()))
-                goto out;
+            goto out;
 #else
         ret = 1;
         goto out;
 #endif
     } else {
         if (!TEST_ptr(pkey = load_example_hmac_key()))
-                goto out;
+            goto out;
     }
 
     if (tst >= 3 && tst <= 5)
@@ -1791,13 +1904,13 @@ static int test_EVP_DigestSignInit(int tst)
     if (tst >= 9) {
         /* Determine the size of the signature. */
         if (!TEST_true(EVP_DigestSign(md_ctx, NULL, &sig_len, kMsg,
-                                      sizeof(kMsg)))
-                || !TEST_ptr(sig = OPENSSL_malloc(sig_len)))
+                sizeof(kMsg)))
+            || !TEST_ptr(sig = OPENSSL_malloc(sig_len)))
             goto out;
         if (tst <= 11) {
             /* Test that supply a short sig buffer fails */
             if (!TEST_false(EVP_DigestSign(md_ctx, sig, &shortsig_len, kMsg,
-                                           sizeof(kMsg))))
+                    sizeof(kMsg))))
                 goto out;
             /*
              * We end here because once EVP_DigestSign() has failed you should
@@ -1807,18 +1920,18 @@ static int test_EVP_DigestSignInit(int tst)
             goto out;
         }
         if (!TEST_true(EVP_DigestSign(md_ctx, sig, &sig_len, kMsg,
-                                      sizeof(kMsg))))
+                sizeof(kMsg))))
             goto out;
     } else {
         /* Determine the size of the signature. */
         if (!TEST_true(EVP_DigestSignFinal(md_ctx, NULL, &sig_len))
-                || !TEST_ptr(sig = OPENSSL_malloc(sig_len))
-                /*
-                    * Trying to create a signature with a deliberately short
-                    * buffer should fail.
-                    */
-                || !TEST_false(EVP_DigestSignFinal(md_ctx, sig, &shortsig_len))
-                || !TEST_true(EVP_DigestSignFinal(md_ctx, sig, &sig_len)))
+            || !TEST_ptr(sig = OPENSSL_malloc(sig_len))
+            /*
+             * Trying to create a signature with a deliberately short
+             * buffer should fail.
+             */
+            || !TEST_false(EVP_DigestSignFinal(md_ctx, sig, &shortsig_len))
+            || !TEST_true(EVP_DigestSignFinal(md_ctx, sig, &sig_len)))
             goto out;
     }
 
@@ -1834,7 +1947,7 @@ static int test_EVP_DigestSignInit(int tst)
         }
 
         if (!TEST_true(EVP_DigestVerifyInit(md_ctx_verify, NULL, md,
-                                            NULL, pkey)))
+                NULL, pkey)))
             goto out;
 
         if (tst >= 6 && tst <= 8) {
@@ -1842,7 +1955,7 @@ static int test_EVP_DigestSignInit(int tst)
                 goto out;
         } else {
             if (!TEST_true(EVP_DigestVerifyUpdate(md_ctx_verify, kMsg,
-                                                  sizeof(kMsg))))
+                    sizeof(kMsg))))
                 goto out;
         }
         if (!TEST_int_gt(EVP_DigestVerifyFinal(md_ctx_verify, sig, sig_len), 0))
@@ -1867,7 +1980,7 @@ static int test_EVP_DigestSignInit(int tst)
 
     ret = 1;
 
- out:
+out:
     BIO_free(membio);
     BIO_free(mdbio);
     EVP_MD_CTX_free(a_md_ctx);
@@ -1890,29 +2003,71 @@ static int test_EVP_DigestVerifyInit(void)
         return TEST_skip("Test does not support a non-default library context");
 
     if (!TEST_ptr(md_ctx = EVP_MD_CTX_new())
-            || !TEST_ptr(pkey = load_example_rsa_key()))
+        || !TEST_ptr(pkey = load_example_rsa_key()))
         goto out;
 
     if (!TEST_true(EVP_DigestVerifyInit(md_ctx, NULL, EVP_sha256(), NULL, pkey))
-            || !TEST_true(EVP_DigestVerifyUpdate(md_ctx, kMsg, sizeof(kMsg)))
-            || !TEST_int_gt(EVP_DigestVerifyFinal(md_ctx, kSignature,
-                                                 sizeof(kSignature)), 0))
+        || !TEST_true(EVP_DigestVerifyUpdate(md_ctx, kMsg, sizeof(kMsg)))
+        || !TEST_int_gt(EVP_DigestVerifyFinal(md_ctx, kSignature,
+                            sizeof(kSignature)),
+            0))
         goto out;
 
     /* test with reinitialization */
     if (!TEST_true(EVP_DigestVerifyInit(md_ctx, NULL, NULL, NULL, NULL))
-            || !TEST_true(EVP_DigestVerifyUpdate(md_ctx, kMsg, sizeof(kMsg)))
-            || !TEST_int_gt(EVP_DigestVerifyFinal(md_ctx, kSignature,
-                                                 sizeof(kSignature)), 0))
+        || !TEST_true(EVP_DigestVerifyUpdate(md_ctx, kMsg, sizeof(kMsg)))
+        || !TEST_int_gt(EVP_DigestVerifyFinal(md_ctx, kSignature,
+                            sizeof(kSignature)),
+            0))
         goto out;
     ret = 1;
 
- out:
+out:
     EVP_MD_CTX_free(md_ctx);
     EVP_PKEY_free(pkey);
     return ret;
 }
 
+#ifndef OPENSSL_NO_EC
+static int test_ecdsa_digestsign_keccak(void)
+{
+    int ret = 0;
+    EVP_PKEY *pkey = NULL;
+    EVP_MD_CTX *ctx = NULL;
+    EVP_MD *md = NULL;
+
+    if (nullprov != NULL)
+        return TEST_skip("Test does not support a non-default library context");
+
+    pkey = load_example_ec_key();
+    if (!TEST_ptr(pkey))
+        goto err;
+
+    /* This would not work with FIPS provider so just use NULL libctx */
+    md = EVP_MD_fetch(NULL, "KECCAK-256", NULL);
+    if (!TEST_ptr(md))
+        goto err;
+
+    ctx = EVP_MD_CTX_new();
+    if (!TEST_ptr(ctx))
+        goto err;
+
+    /*
+     * Just check EVP_DigestSignInit_ex() works.
+     */
+    if (!TEST_true(EVP_DigestSignInit(ctx, NULL, md, NULL, pkey)))
+        goto err;
+
+    ret = 1;
+err:
+    EVP_MD_CTX_free(ctx);
+    EVP_PKEY_free(pkey);
+    EVP_MD_free(md);
+
+    return ret;
+}
+#endif
+
 #ifndef OPENSSL_NO_SIPHASH
 /* test SIPHASH MAC via EVP_PKEY with non-default parameters and reinit */
 static int test_siphash_digestsign(void)
@@ -1934,7 +2089,7 @@ static int test_siphash_digestsign(void)
     memset(buf, 0, 8);
     memset(key, 1, 16);
     if (!TEST_ptr(pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_SIPHASH, NULL,
-                                                      key, 16)))
+                      key, 16)))
         goto out;
 
     if (!TEST_ptr(mdctx = EVP_MD_CTX_create()))
@@ -1943,8 +2098,9 @@ static int test_siphash_digestsign(void)
     if (!TEST_true(EVP_DigestSignInit(mdctx, &ctx, NULL, NULL, pkey)))
         goto out;
     if (!TEST_int_eq(EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_SIGNCTX,
-                                       EVP_PKEY_CTRL_SET_DIGEST_SIZE,
-                                       8, NULL), 1))
+                         EVP_PKEY_CTRL_SET_DIGEST_SIZE,
+                         8, NULL),
+            1))
         goto out;
     /* reinitialize */
     if (!TEST_true(EVP_DigestSignInit(mdctx, NULL, NULL, NULL, NULL)))
@@ -1957,7 +2113,7 @@ static int test_siphash_digestsign(void)
         goto out;
 
     ret = 1;
- out:
+out:
     EVP_PKEY_free(pkey);
     EVP_MD_CTX_free(mdctx);
     return ret;
@@ -1979,38 +2135,38 @@ static int test_EVP_Digest(void)
         goto out;
 
     if (!TEST_ptr(sha256 = EVP_MD_fetch(testctx, "sha256", testpropq))
-            || !TEST_ptr(shake256 = EVP_MD_fetch(testctx, "shake256", testpropq)))
+        || !TEST_ptr(shake256 = EVP_MD_fetch(testctx, "shake256", testpropq)))
         goto out;
 
     if (!TEST_true(EVP_DigestInit_ex(md_ctx, sha256, NULL))
-            || !TEST_true(EVP_DigestUpdate(md_ctx, kMsg, sizeof(kMsg)))
-            || !TEST_true(EVP_DigestFinal(md_ctx, md, NULL))
-            /* EVP_DigestFinal resets the EVP_MD_CTX. */
-            || !TEST_ptr_eq(EVP_MD_CTX_get0_md(md_ctx), NULL))
+        || !TEST_true(EVP_DigestUpdate(md_ctx, kMsg, sizeof(kMsg)))
+        || !TEST_true(EVP_DigestFinal(md_ctx, md, NULL))
+        /* EVP_DigestFinal resets the EVP_MD_CTX. */
+        || !TEST_ptr_eq(EVP_MD_CTX_get0_md(md_ctx), NULL))
         goto out;
 
     if (!TEST_true(EVP_DigestInit_ex(md_ctx, sha256, NULL))
-            || !TEST_true(EVP_DigestUpdate(md_ctx, kMsg, sizeof(kMsg)))
-            || !TEST_true(EVP_DigestFinal_ex(md_ctx, md, NULL))
-            /* EVP_DigestFinal_ex does not reset the EVP_MD_CTX. */
-            || !TEST_ptr(EVP_MD_CTX_get0_md(md_ctx))
-            /*
-             * EVP_DigestInit_ex with NULL type should work on
-             * pre-initialized context.
-             */
-            || !TEST_true(EVP_DigestInit_ex(md_ctx, NULL, NULL)))
+        || !TEST_true(EVP_DigestUpdate(md_ctx, kMsg, sizeof(kMsg)))
+        || !TEST_true(EVP_DigestFinal_ex(md_ctx, md, NULL))
+        /* EVP_DigestFinal_ex does not reset the EVP_MD_CTX. */
+        || !TEST_ptr(EVP_MD_CTX_get0_md(md_ctx))
+        /*
+         * EVP_DigestInit_ex with NULL type should work on
+         * pre-initialized context.
+         */
+        || !TEST_true(EVP_DigestInit_ex(md_ctx, NULL, NULL)))
         goto out;
 
     if (!TEST_true(EVP_DigestInit_ex(md_ctx, shake256, NULL))
-            || !TEST_true(EVP_DigestUpdate(md_ctx, kMsg, sizeof(kMsg)))
-            || !TEST_true(EVP_DigestFinalXOF(md_ctx, md, sizeof(md)))
-            /* EVP_DigestFinalXOF does not reset the EVP_MD_CTX. */
-            || !TEST_ptr(EVP_MD_CTX_get0_md(md_ctx))
-            || !TEST_true(EVP_DigestInit_ex(md_ctx, NULL, NULL)))
+        || !TEST_true(EVP_DigestUpdate(md_ctx, kMsg, sizeof(kMsg)))
+        || !TEST_true(EVP_DigestFinalXOF(md_ctx, md, sizeof(md)))
+        /* EVP_DigestFinalXOF does not reset the EVP_MD_CTX. */
+        || !TEST_ptr(EVP_MD_CTX_get0_md(md_ctx))
+        || !TEST_true(EVP_DigestInit_ex(md_ctx, NULL, NULL)))
         goto out;
     ret = 1;
 
- out:
+out:
     EVP_MD_CTX_free(md_ctx);
     EVP_MD_free(sha256);
     EVP_MD_free(shake256);
@@ -2041,7 +2197,7 @@ static int test_EVP_md_null(void)
         goto out;
 
     ret = 1;
- out:
+out:
     EVP_MD_CTX_free(md_ctx);
     return ret;
 }
@@ -2058,13 +2214,13 @@ static int test_d2i_AutoPrivateKey(int i)
 
     p = input;
     if (!TEST_ptr(pkey = d2i_AutoPrivateKey(NULL, &p, input_len))
-            || !TEST_ptr_eq(p, input + input_len)
-            || !TEST_int_eq(EVP_PKEY_get_id(pkey), expected_id))
+        || !TEST_ptr_eq(p, input + input_len)
+        || !TEST_int_eq(EVP_PKEY_get_id(pkey), expected_id))
         goto done;
 
     ret = 1;
 
- done:
+done:
     EVP_PKEY_free(pkey);
     return ret;
 }
@@ -2118,15 +2274,14 @@ static int test_invalide_ec_char2_pub_range_decode(int id)
     EVP_PKEY *pkey;
 
     pkey = load_example_key("EC", ec_der_pub_keys[id].der,
-                            ec_der_pub_keys[id].len);
+        ec_der_pub_keys[id].len);
 
     ret = (ec_der_pub_keys[id].valid && TEST_ptr(pkey))
-          || TEST_ptr_null(pkey);
+        || TEST_ptr_null(pkey);
     EVP_PKEY_free(pkey);
     return ret;
 }
 
-/* Tests loading a bad key in PKCS8 format */
 static int test_EVP_PKCS82PKEY(void)
 {
     int ret = 0;
@@ -2135,11 +2290,11 @@ static int test_EVP_PKCS82PKEY(void)
     EVP_PKEY *pkey = NULL;
 
     if (!TEST_ptr(p8inf = d2i_PKCS8_PRIV_KEY_INFO(NULL, &derp,
-                                              sizeof(kExampleBadECKeyDER))))
+                      sizeof(kExampleBadECKeyDER))))
         goto done;
 
     if (!TEST_ptr_eq(derp,
-                     kExampleBadECKeyDER + sizeof(kExampleBadECKeyDER)))
+            kExampleBadECKeyDER + sizeof(kExampleBadECKeyDER)))
         goto done;
 
     if (!TEST_ptr_null(pkey = EVP_PKCS82PKEY(p8inf)))
@@ -2147,7 +2302,7 @@ static int test_EVP_PKCS82PKEY(void)
 
     ret = 1;
 
- done:
+done:
     PKCS8_PRIV_KEY_INFO_free(p8inf);
     EVP_PKEY_free(pkey);
 
@@ -2155,6 +2310,30 @@ static int test_EVP_PKCS82PKEY(void)
 }
 
 #endif
+
+static int test_EVP_PKCS82PKEY_v2(int i)
+{
+    int ret = 0;
+    const unsigned char *p;
+    const APK_DATA *ak = &keydata_v2[i];
+    const unsigned char *input = ak->kder;
+    size_t input_len = ak->size;
+    PKCS8_PRIV_KEY_INFO *p8inf = NULL;
+
+    /* Can we parse PKCS#8 v2, ignoring the public key for now? */
+    p = input;
+    p8inf = d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, input_len);
+    if (!TEST_ptr(p8inf)
+        || !TEST_true(p == input + input_len))
+        goto done;
+
+    ret = 1;
+done:
+    PKCS8_PRIV_KEY_INFO_free(p8inf);
+    return ret;
+}
+
+/* Tests loading a bad key in PKCS8 format */
 static int test_EVP_PKCS82PKEY_wrong_tag(void)
 {
     EVP_PKEY *pkey = NULL;
@@ -2171,8 +2350,8 @@ static int test_EVP_PKCS82PKEY_wrong_tag(void)
     if (!TEST_ptr(membio = BIO_new(BIO_s_mem()))
         || !TEST_ptr(pkey = load_example_rsa_key())
         || !TEST_int_gt(i2d_PKCS8PrivateKey_bio(membio, pkey, NULL,
-                                                NULL, 0, NULL, NULL),
-                        0)
+                            NULL, 0, NULL, NULL),
+            0)
         || !TEST_int_gt(BIO_get_mem_data(membio, &membuf), 0)
         || !TEST_ptr(p8inf = d2i_PKCS8_PRIV_KEY_INFO_bio(membio, NULL))
         || !TEST_ptr(pkey2 = EVP_PKCS82PKEY(p8inf))
@@ -2181,7 +2360,7 @@ static int test_EVP_PKCS82PKEY_wrong_tag(void)
     }
 
     ok = 1;
- done:
+done:
     EVP_PKEY_free(pkey);
     EVP_PKEY_free(pkey2);
     PKCS8_PRIV_KEY_INFO_free(p8inf);
@@ -2201,23 +2380,23 @@ static int test_privatekey_to_pkcs8(void)
     if (!TEST_ptr(membio = BIO_new(BIO_s_mem()))
         || !TEST_ptr(pkey = load_example_rsa_key())
         || !TEST_int_gt(i2d_PKCS8PrivateKey_bio(membio, pkey, NULL,
-                                                NULL, 0, NULL, NULL),
-                        0)
+                            NULL, 0, NULL, NULL),
+            0)
         || !TEST_int_gt(membuf_len = BIO_get_mem_data(membio, &membuf), 0)
         || !TEST_ptr(membuf)
         || !TEST_mem_eq(membuf, (size_t)membuf_len,
-                        kExampleRSAKeyPKCS8, sizeof(kExampleRSAKeyPKCS8))
+            kExampleRSAKeyPKCS8, sizeof(kExampleRSAKeyPKCS8))
         /*
          * We try to write PEM as well, just to see that it doesn't err, but
          * assume that the result is correct.
          */
         || !TEST_int_gt(PEM_write_bio_PKCS8PrivateKey(membio, pkey, NULL,
-                                                      NULL, 0, NULL, NULL),
-                        0))
+                            NULL, 0, NULL, NULL),
+            0))
         goto done;
 
     ok = 1;
- done:
+done:
     EVP_PKEY_free(pkey);
     BIO_free_all(membio);
     return ok;
@@ -2229,7 +2408,7 @@ static const struct {
     const char *encoding_name;
 } ec_encodings[] = {
     { OPENSSL_EC_EXPLICIT_CURVE, OSSL_PKEY_EC_ENCODING_EXPLICIT },
-    { OPENSSL_EC_NAMED_CURVE,    OSSL_PKEY_EC_ENCODING_GROUP }
+    { OPENSSL_EC_NAMED_CURVE, OSSL_PKEY_EC_ENCODING_GROUP }
 };
 
 static int ec_export_get_encoding_cb(const OSSL_PARAM params[], void *arg)
@@ -2242,7 +2421,7 @@ static int ec_export_get_encoding_cb(const OSSL_PARAM params[], void *arg)
     *enc = -1;
 
     if (!TEST_ptr(p = OSSL_PARAM_locate_const(params,
-                                              OSSL_PKEY_PARAM_EC_ENCODING))
+                      OSSL_PKEY_PARAM_EC_ENCODING))
         || !TEST_true(OSSL_PARAM_get_utf8_string_ptr(p, &enc_name)))
         return 0;
 
@@ -2283,12 +2462,12 @@ static int test_EC_keygen_with_enc(int idx)
 
     /* Check that the encoding got all the way into the key */
     if (!TEST_true(evp_keymgmt_util_export(key, OSSL_KEYMGMT_SELECT_ALL,
-                                           ec_export_get_encoding_cb, &enc))
+            ec_export_get_encoding_cb, &enc))
         || !TEST_int_eq(enc, ec_encodings[idx].encoding))
         goto done;
 
     ret = 1;
- done:
+done:
     EVP_PKEY_free(key);
     EVP_PKEY_free(params);
     EVP_PKEY_CTX_free(kctx);
@@ -2301,11 +2480,10 @@ static int test_EC_keygen_with_enc(int idx)
 
 static int test_EVP_SM2_verify(void)
 {
-    const char *pubkey =
-        "-----BEGIN PUBLIC KEY-----\n"
-        "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEp1KLWq1ZE2jmoAnnBJE1LBGxVr18\n"
-        "YvvqECWCpXfAQ9qUJ+UmthnUPf0iM3SaXKHe6PlLIDyNlWMWb9RUh/yU3g==\n"
-        "-----END PUBLIC KEY-----\n";
+    const char *pubkey = "-----BEGIN PUBLIC KEY-----\n"
+                         "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEp1KLWq1ZE2jmoAnnBJE1LBGxVr18\n"
+                         "YvvqECWCpXfAQ9qUJ+UmthnUPf0iM3SaXKHe6PlLIDyNlWMWb9RUh/yU3g==\n"
+                         "-----END PUBLIC KEY-----\n";
 
     const char *msg = "message digest";
     const char *id = "ALICE123@YAHOO.COM";
@@ -2362,7 +2540,7 @@ static int test_EVP_SM2_verify(void)
         goto done;
     rc = 1;
 
- done:
+done:
     BIO_free(bio);
     EVP_PKEY_free(pkey);
     EVP_PKEY_CTX_free(pctx);
@@ -2392,15 +2570,15 @@ static int test_EVP_SM2(void)
     uint8_t plaintext[8];
     size_t ptext_len = sizeof(plaintext);
 
-    uint8_t sm2_id[] = {1, 2, 3, 4, 'l', 'e', 't', 't', 'e', 'r'};
+    uint8_t sm2_id[] = { 1, 2, 3, 4, 'l', 'e', 't', 't', 'e', 'r' };
 
-    OSSL_PARAM sparams[2] = {OSSL_PARAM_END, OSSL_PARAM_END};
-    OSSL_PARAM gparams[2] = {OSSL_PARAM_END, OSSL_PARAM_END};
+    OSSL_PARAM sparams[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
+    OSSL_PARAM gparams[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
     int i;
     char mdname[OSSL_MAX_NAME_SIZE];
 
     if (!TEST_ptr(pctx = EVP_PKEY_CTX_new_from_name(testctx,
-                                                    "SM2", testpropq)))
+                      "SM2", testpropq)))
         goto done;
 
     if (!TEST_true(EVP_PKEY_paramgen_init(pctx) == 1))
@@ -2413,7 +2591,7 @@ static int test_EVP_SM2(void)
         goto done;
 
     if (!TEST_ptr(kctx = EVP_PKEY_CTX_new_from_pkey(testctx,
-                                                    pkeyparams, testpropq)))
+                      pkeyparams, testpropq)))
         goto done;
 
     if (!TEST_int_gt(EVP_PKEY_keygen_init(kctx), 0))
@@ -2459,7 +2637,7 @@ static int test_EVP_SM2(void)
     /* Ensure that the signature round-trips. */
 
     if (!TEST_true(EVP_DigestVerifyInit(md_ctx_verify, NULL, check_md, NULL,
-                                        pkey)))
+            pkey)))
         goto done;
 
     if (!TEST_int_gt(EVP_PKEY_CTX_set1_id(sctx, sm2_id, sizeof(sm2_id)), 0))
@@ -2477,7 +2655,7 @@ static int test_EVP_SM2(void)
      */
 
     if (!TEST_true(EVP_DigestVerifyInit(md_ctx_verify, NULL, check_md, NULL,
-                                        pkey)))
+            pkey)))
         goto done;
 
     if (!TEST_int_gt(EVP_PKEY_CTX_set1_id(sctx, NULL, 0), 0))
@@ -2492,7 +2670,7 @@ static int test_EVP_SM2(void)
     /* now check encryption/decryption */
 
     gparams[0] = OSSL_PARAM_construct_utf8_string(OSSL_ASYM_CIPHER_PARAM_DIGEST,
-                                                  mdname, sizeof(mdname));
+        mdname, sizeof(mdname));
     for (i = 0; i < 2; i++) {
         const char *mdnames[] = {
 #ifndef OPENSSL_NO_SM3
@@ -2500,18 +2678,18 @@ static int test_EVP_SM2(void)
 #else
             NULL,
 #endif
-            "SHA2-256" };
+            "SHA2-256"
+        };
         EVP_PKEY_CTX_free(cctx);
 
         if (mdnames[i] == NULL)
             continue;
 
-        sparams[0] =
-            OSSL_PARAM_construct_utf8_string(OSSL_ASYM_CIPHER_PARAM_DIGEST,
-                                             (char *)mdnames[i], 0);
+        sparams[0] = OSSL_PARAM_construct_utf8_string(OSSL_ASYM_CIPHER_PARAM_DIGEST,
+            (char *)mdnames[i], 0);
 
         if (!TEST_ptr(cctx = EVP_PKEY_CTX_new_from_pkey(testctx,
-                                                        pkey, testpropq)))
+                          pkey, testpropq)))
             goto done;
 
         if (!TEST_true(EVP_PKEY_encrypt_init(cctx)))
@@ -2521,7 +2699,7 @@ static int test_EVP_SM2(void)
             goto done;
 
         if (!TEST_true(EVP_PKEY_encrypt(cctx, ciphertext, &ctext_len, kMsg,
-                                        sizeof(kMsg))))
+                sizeof(kMsg))))
             goto done;
 
         if (!TEST_int_gt(EVP_PKEY_decrypt_init(cctx), 0))
@@ -2531,7 +2709,8 @@ static int test_EVP_SM2(void)
             goto done;
 
         if (!TEST_int_gt(EVP_PKEY_decrypt(cctx, plaintext, &ptext_len, ciphertext,
-                                        ctext_len), 0))
+                             ctext_len),
+                0))
             goto done;
 
         if (!TEST_true(EVP_PKEY_CTX_get_params(cctx, gparams)))
@@ -2576,315 +2755,315 @@ static int test_EVP_SM2(void)
 
 #ifndef OPENSSL_NO_ML_KEM
 static const uint8_t ml_kem_seed[] = {
-  0x7c, 0x99, 0x35, 0xa0, 0xb0, 0x76, 0x94, 0xaa, 0x0c, 0x6d, 0x10, 0xe4,
-  0xdb, 0x6b, 0x1a, 0xdd, 0x2f, 0xd8, 0x1a, 0x25, 0xcc, 0xb1, 0x48, 0x03,
-  0x2d, 0xcd, 0x73, 0x99, 0x36, 0x73, 0x7f, 0x2d, 0x86, 0x26, 0xed, 0x79,
-  0xd4, 0x51, 0x14, 0x08, 0x00, 0xe0, 0x3b, 0x59, 0xb9, 0x56, 0xf8, 0x21,
-  0x0e, 0x55, 0x60, 0x67, 0x40, 0x7d, 0x13, 0xdc, 0x90, 0xfa, 0x9e, 0x8b,
-  0x87, 0x2b, 0xfb, 0x8f
+    0x7c, 0x99, 0x35, 0xa0, 0xb0, 0x76, 0x94, 0xaa, 0x0c, 0x6d, 0x10, 0xe4,
+    0xdb, 0x6b, 0x1a, 0xdd, 0x2f, 0xd8, 0x1a, 0x25, 0xcc, 0xb1, 0x48, 0x03,
+    0x2d, 0xcd, 0x73, 0x99, 0x36, 0x73, 0x7f, 0x2d, 0x86, 0x26, 0xed, 0x79,
+    0xd4, 0x51, 0x14, 0x08, 0x00, 0xe0, 0x3b, 0x59, 0xb9, 0x56, 0xf8, 0x21,
+    0x0e, 0x55, 0x60, 0x67, 0x40, 0x7d, 0x13, 0xdc, 0x90, 0xfa, 0x9e, 0x8b,
+    0x87, 0x2b, 0xfb, 0x8f
 };
 static const uint8_t ml_kem_512_pubkey[] = {
-  0x40, 0x08, 0x65, 0xed, 0x10, 0xb6, 0x19, 0xaa, 0x58, 0x11, 0x13, 0x9b,
-  0xc0, 0x86, 0x82, 0x57, 0x82, 0xb2, 0xb7, 0x12, 0x4f, 0x75, 0x7c, 0x83,
-  0xae, 0x79, 0x44, 0x44, 0xbc, 0x78, 0xa4, 0x78, 0x96, 0xac, 0xf1, 0x26,
-  0x2c, 0x81, 0x35, 0x10, 0x77, 0x89, 0x3b, 0xfc, 0x56, 0xf9, 0x04, 0x49,
-  0xc2, 0xfa, 0x5f, 0x6e, 0x58, 0x6d, 0xd3, 0x7c, 0x0b, 0x9b, 0x58, 0x19,
-  0x92, 0x63, 0x8c, 0xb7, 0xe7, 0xbc, 0xbb, 0xb9, 0x9a, 0xfe, 0x47, 0x81,
-  0xd8, 0x0a, 0x50, 0xe6, 0x94, 0x63, 0xfb, 0xd9, 0x88, 0x72, 0x2c, 0x36,
-  0x35, 0x42, 0x3e, 0x27, 0x46, 0x6c, 0x71, 0xdc, 0xc6, 0x74, 0x52, 0x7c,
-  0xcd, 0x72, 0x89, 0x68, 0xcb, 0xcd, 0xc0, 0x0c, 0x5c, 0x90, 0x35, 0xbb,
-  0x0a, 0xf2, 0xc9, 0x92, 0x2c, 0x78, 0x81, 0xa4, 0x1d, 0xd2, 0x87, 0x52,
-  0x73, 0x92, 0x51, 0x31, 0x23, 0x0f, 0x6c, 0xa5, 0x9e, 0x91, 0x36, 0xb3,
-  0x9f, 0x95, 0x6c, 0x93, 0xb3, 0xb2, 0xd1, 0x4c, 0x64, 0x1b, 0x08, 0x9e,
-  0x07, 0xd0, 0xa8, 0x40, 0xc8, 0x93, 0xec, 0xd7, 0x6b, 0xbf, 0x92, 0xc8,
-  0x05, 0x45, 0x66, 0x68, 0xd0, 0x7c, 0x62, 0x14, 0x91, 0xc5, 0xc0, 0x54,
-  0x99, 0x1a, 0x65, 0x6f, 0x51, 0x16, 0x19, 0x55, 0x6e, 0xb9, 0x77, 0x82,
-  0xe2, 0x7a, 0x3c, 0x78, 0x51, 0x24, 0xc7, 0x0b, 0x0d, 0xab, 0xa6, 0xc6,
-  0x24, 0xd1, 0x8e, 0x0f, 0x97, 0x93, 0xf9, 0x6b, 0xa9, 0xe1, 0x59, 0x9b,
-  0x17, 0xb3, 0x0d, 0xcc, 0xc0, 0xb4, 0xf3, 0x76, 0x6a, 0x07, 0xb2, 0x3b,
-  0x25, 0x73, 0x09, 0xcd, 0x76, 0xab, 0xa0, 0x72, 0xc2, 0xb9, 0xc9, 0x74,
-  0x43, 0x94, 0xc6, 0xab, 0x9c, 0xb6, 0xc5, 0x4a, 0x97, 0xb5, 0xc5, 0x78,
-  0x61, 0xa5, 0x8d, 0xc0, 0xa0, 0x35, 0x19, 0x83, 0x2e, 0xe3, 0x2a, 0x07,
-  0x65, 0x4a, 0x07, 0x0c, 0x0c, 0x8c, 0x4e, 0x86, 0x48, 0xad, 0xdc, 0x35,
-  0x5f, 0x27, 0x4f, 0xc6, 0xb9, 0x2a, 0x08, 0x7b, 0x3f, 0x97, 0x51, 0x92,
-  0x3e, 0x44, 0x27, 0x4f, 0x85, 0x8c, 0x49, 0xca, 0xba, 0x72, 0xb6, 0x58,
-  0x51, 0xb3, 0xad, 0xc4, 0x89, 0x36, 0x95, 0x50, 0x97, 0xca, 0xd9, 0x55,
-  0x3f, 0x5a, 0x26, 0x3f, 0x18, 0x44, 0xb5, 0x2a, 0x02, 0x0f, 0xf7, 0xca,
-  0x89, 0xe8, 0x81, 0xa0, 0x1b, 0x95, 0xd9, 0x57, 0xa3, 0x15, 0x3c, 0x0a,
-  0x5e, 0x0a, 0x1c, 0xcd, 0x66, 0xb1, 0x82, 0x1a, 0x2b, 0x86, 0x32, 0x54,
-  0x6e, 0x24, 0xc7, 0xcb, 0xbc, 0x4c, 0xb0, 0x88, 0x08, 0xca, 0xc3, 0x7f,
-  0x7d, 0xa6, 0xb1, 0x6f, 0x8a, 0xce, 0xd0, 0x52, 0xcd, 0xb2, 0x56, 0x49,
-  0x48, 0xf1, 0xab, 0x0f, 0x76, 0x8a, 0x0d, 0x32, 0x86, 0xcc, 0xc7, 0xc3,
-  0x74, 0x9c, 0x63, 0xc7, 0x81, 0x53, 0x0f, 0xa1, 0xae, 0x67, 0x05, 0x42,
-  0x85, 0x50, 0x04, 0xa6, 0x45, 0xb5, 0x22, 0x88, 0x1e, 0xc1, 0x41, 0x2b,
-  0xda, 0xe3, 0x42, 0x08, 0x5a, 0x9d, 0xd5, 0xf8, 0x12, 0x6a, 0xf9, 0x6b,
-  0xbd, 0xb0, 0xc1, 0xaf, 0x69, 0xa1, 0x55, 0x62, 0xcb, 0x2a, 0x15, 0x5a,
-  0x10, 0x03, 0x09, 0xd1, 0xb6, 0x41, 0xd0, 0x8b, 0x2d, 0x4e, 0xd1, 0x7b,
-  0xfb, 0xf0, 0xbc, 0x04, 0x26, 0x5f, 0x9b, 0x10, 0xc1, 0x08, 0xf8, 0x50,
-  0x30, 0x95, 0x04, 0xd7, 0x72, 0x81, 0x1b, 0xba, 0x8e, 0x2b, 0xe1, 0x62,
-  0x49, 0xaa, 0x73, 0x7d, 0x87, 0x9f, 0xc7, 0xfb, 0x25, 0x5e, 0xe7, 0xa6,
-  0xa0, 0xa7, 0x53, 0xbd, 0x93, 0x74, 0x1c, 0x61, 0x65, 0x8e, 0xc0, 0x74,
-  0xf6, 0xe0, 0x02, 0xb0, 0x19, 0x34, 0x57, 0x69, 0x11, 0x3c, 0xc0, 0x13,
-  0xff, 0x74, 0x94, 0xba, 0x83, 0x78, 0xb1, 0x1a, 0x17, 0x22, 0x60, 0xaa,
-  0xa5, 0x34, 0x21, 0xbd, 0xe0, 0x3a, 0x35, 0x58, 0x9d, 0x57, 0xe3, 0x22,
-  0xfe, 0xfa, 0x41, 0x00, 0xa4, 0x74, 0x39, 0x26, 0xab, 0x7d, 0x62, 0x25,
-  0x8b, 0x87, 0xb3, 0x1c, 0xcb, 0xb5, 0xe6, 0xb8, 0x9c, 0xb1, 0x0b, 0x27,
-  0x1a, 0xa0, 0x5d, 0x99, 0x4b, 0xb5, 0x70, 0x8b, 0x23, 0xab, 0x32, 0x7e,
-  0xcb, 0x93, 0xc0, 0xf3, 0x15, 0x68, 0x69, 0xf0, 0x88, 0x3d, 0xa2, 0x06,
-  0x4f, 0x79, 0x5e, 0x0e, 0x2a, 0xb7, 0xd3, 0xc6, 0x4d, 0x61, 0xd2, 0x30,
-  0x3f, 0xc3, 0xa2, 0x9e, 0x16, 0x19, 0x92, 0x3c, 0xa8, 0x01, 0xe5, 0x9f,
-  0xd7, 0x52, 0xca, 0x6e, 0x76, 0x49, 0xd3, 0x03, 0xc9, 0xd2, 0x07, 0x88,
-  0xe1, 0x21, 0x46, 0x51, 0xb0, 0x69, 0x95, 0xeb, 0x26, 0x0c, 0x92, 0x9a,
-  0x13, 0x44, 0xa8, 0x49, 0xb2, 0x5c, 0xa0, 0xa0, 0x1f, 0x1e, 0xb5, 0x29,
-  0x13, 0x68, 0x6b, 0xba, 0x61, 0x9e, 0x23, 0x71, 0x44, 0x64, 0x03, 0x1a,
-  0x78, 0x43, 0x92, 0x87, 0xfc, 0xa7, 0x8f, 0x4c, 0x04, 0x76, 0x22, 0x3e,
-  0xea, 0x61, 0xb7, 0xf2, 0x5a, 0x7c, 0xe4, 0x2c, 0xca, 0x90, 0x1b, 0x2a,
-  0xea, 0x12, 0x98, 0x17, 0x89, 0x4b, 0xa3, 0x47, 0x08, 0x23, 0x85, 0x4f,
-  0x3e, 0x5b, 0x28, 0xd8, 0x6b, 0xa9, 0x79, 0xe5, 0x46, 0x71, 0x86, 0x2d,
-  0x90, 0x47, 0x0b, 0x1e, 0x78, 0x38, 0x97, 0x2a, 0x81, 0xa4, 0x81, 0x07,
-  0xd6, 0xac, 0x06, 0x11, 0x40, 0x6b, 0x21, 0xfb, 0xcc, 0xe1, 0xdb, 0x77,
-  0x02, 0xea, 0x9d, 0xd6, 0xba, 0x6e, 0x40, 0x52, 0x7b, 0x9d, 0xc6, 0x63,
-  0xf3, 0xc9, 0x3b, 0xad, 0x05, 0x6d, 0xc2, 0x85, 0x11, 0xf6, 0x6c, 0x3e,
-  0x0b, 0x92, 0x8d, 0xb8, 0x87, 0x9d, 0x22, 0xc5, 0x92, 0x68, 0x5c, 0xc7,
-  0x75, 0xa6, 0xcd, 0x57, 0x4a, 0xc3, 0xbc, 0xe3, 0xb2, 0x75, 0x91, 0xc8,
-  0x21, 0x92, 0x90, 0x76, 0x35, 0x8a, 0x22, 0x00, 0xb3, 0x77, 0x36, 0x5f,
-  0x7e, 0xfb, 0x9e, 0x40, 0xc3, 0xbf, 0x0f, 0xf0, 0x43, 0x29, 0x86, 0xae,
-  0x4b, 0xc1, 0xa2, 0x42, 0xce, 0x99, 0x21, 0xaa, 0x9e, 0x22, 0x44, 0x88,
-  0x19, 0x58, 0x5d, 0xea, 0x30, 0x8e, 0xb0, 0x39
+    0x40, 0x08, 0x65, 0xed, 0x10, 0xb6, 0x19, 0xaa, 0x58, 0x11, 0x13, 0x9b,
+    0xc0, 0x86, 0x82, 0x57, 0x82, 0xb2, 0xb7, 0x12, 0x4f, 0x75, 0x7c, 0x83,
+    0xae, 0x79, 0x44, 0x44, 0xbc, 0x78, 0xa4, 0x78, 0x96, 0xac, 0xf1, 0x26,
+    0x2c, 0x81, 0x35, 0x10, 0x77, 0x89, 0x3b, 0xfc, 0x56, 0xf9, 0x04, 0x49,
+    0xc2, 0xfa, 0x5f, 0x6e, 0x58, 0x6d, 0xd3, 0x7c, 0x0b, 0x9b, 0x58, 0x19,
+    0x92, 0x63, 0x8c, 0xb7, 0xe7, 0xbc, 0xbb, 0xb9, 0x9a, 0xfe, 0x47, 0x81,
+    0xd8, 0x0a, 0x50, 0xe6, 0x94, 0x63, 0xfb, 0xd9, 0x88, 0x72, 0x2c, 0x36,
+    0x35, 0x42, 0x3e, 0x27, 0x46, 0x6c, 0x71, 0xdc, 0xc6, 0x74, 0x52, 0x7c,
+    0xcd, 0x72, 0x89, 0x68, 0xcb, 0xcd, 0xc0, 0x0c, 0x5c, 0x90, 0x35, 0xbb,
+    0x0a, 0xf2, 0xc9, 0x92, 0x2c, 0x78, 0x81, 0xa4, 0x1d, 0xd2, 0x87, 0x52,
+    0x73, 0x92, 0x51, 0x31, 0x23, 0x0f, 0x6c, 0xa5, 0x9e, 0x91, 0x36, 0xb3,
+    0x9f, 0x95, 0x6c, 0x93, 0xb3, 0xb2, 0xd1, 0x4c, 0x64, 0x1b, 0x08, 0x9e,
+    0x07, 0xd0, 0xa8, 0x40, 0xc8, 0x93, 0xec, 0xd7, 0x6b, 0xbf, 0x92, 0xc8,
+    0x05, 0x45, 0x66, 0x68, 0xd0, 0x7c, 0x62, 0x14, 0x91, 0xc5, 0xc0, 0x54,
+    0x99, 0x1a, 0x65, 0x6f, 0x51, 0x16, 0x19, 0x55, 0x6e, 0xb9, 0x77, 0x82,
+    0xe2, 0x7a, 0x3c, 0x78, 0x51, 0x24, 0xc7, 0x0b, 0x0d, 0xab, 0xa6, 0xc6,
+    0x24, 0xd1, 0x8e, 0x0f, 0x97, 0x93, 0xf9, 0x6b, 0xa9, 0xe1, 0x59, 0x9b,
+    0x17, 0xb3, 0x0d, 0xcc, 0xc0, 0xb4, 0xf3, 0x76, 0x6a, 0x07, 0xb2, 0x3b,
+    0x25, 0x73, 0x09, 0xcd, 0x76, 0xab, 0xa0, 0x72, 0xc2, 0xb9, 0xc9, 0x74,
+    0x43, 0x94, 0xc6, 0xab, 0x9c, 0xb6, 0xc5, 0x4a, 0x97, 0xb5, 0xc5, 0x78,
+    0x61, 0xa5, 0x8d, 0xc0, 0xa0, 0x35, 0x19, 0x83, 0x2e, 0xe3, 0x2a, 0x07,
+    0x65, 0x4a, 0x07, 0x0c, 0x0c, 0x8c, 0x4e, 0x86, 0x48, 0xad, 0xdc, 0x35,
+    0x5f, 0x27, 0x4f, 0xc6, 0xb9, 0x2a, 0x08, 0x7b, 0x3f, 0x97, 0x51, 0x92,
+    0x3e, 0x44, 0x27, 0x4f, 0x85, 0x8c, 0x49, 0xca, 0xba, 0x72, 0xb6, 0x58,
+    0x51, 0xb3, 0xad, 0xc4, 0x89, 0x36, 0x95, 0x50, 0x97, 0xca, 0xd9, 0x55,
+    0x3f, 0x5a, 0x26, 0x3f, 0x18, 0x44, 0xb5, 0x2a, 0x02, 0x0f, 0xf7, 0xca,
+    0x89, 0xe8, 0x81, 0xa0, 0x1b, 0x95, 0xd9, 0x57, 0xa3, 0x15, 0x3c, 0x0a,
+    0x5e, 0x0a, 0x1c, 0xcd, 0x66, 0xb1, 0x82, 0x1a, 0x2b, 0x86, 0x32, 0x54,
+    0x6e, 0x24, 0xc7, 0xcb, 0xbc, 0x4c, 0xb0, 0x88, 0x08, 0xca, 0xc3, 0x7f,
+    0x7d, 0xa6, 0xb1, 0x6f, 0x8a, 0xce, 0xd0, 0x52, 0xcd, 0xb2, 0x56, 0x49,
+    0x48, 0xf1, 0xab, 0x0f, 0x76, 0x8a, 0x0d, 0x32, 0x86, 0xcc, 0xc7, 0xc3,
+    0x74, 0x9c, 0x63, 0xc7, 0x81, 0x53, 0x0f, 0xa1, 0xae, 0x67, 0x05, 0x42,
+    0x85, 0x50, 0x04, 0xa6, 0x45, 0xb5, 0x22, 0x88, 0x1e, 0xc1, 0x41, 0x2b,
+    0xda, 0xe3, 0x42, 0x08, 0x5a, 0x9d, 0xd5, 0xf8, 0x12, 0x6a, 0xf9, 0x6b,
+    0xbd, 0xb0, 0xc1, 0xaf, 0x69, 0xa1, 0x55, 0x62, 0xcb, 0x2a, 0x15, 0x5a,
+    0x10, 0x03, 0x09, 0xd1, 0xb6, 0x41, 0xd0, 0x8b, 0x2d, 0x4e, 0xd1, 0x7b,
+    0xfb, 0xf0, 0xbc, 0x04, 0x26, 0x5f, 0x9b, 0x10, 0xc1, 0x08, 0xf8, 0x50,
+    0x30, 0x95, 0x04, 0xd7, 0x72, 0x81, 0x1b, 0xba, 0x8e, 0x2b, 0xe1, 0x62,
+    0x49, 0xaa, 0x73, 0x7d, 0x87, 0x9f, 0xc7, 0xfb, 0x25, 0x5e, 0xe7, 0xa6,
+    0xa0, 0xa7, 0x53, 0xbd, 0x93, 0x74, 0x1c, 0x61, 0x65, 0x8e, 0xc0, 0x74,
+    0xf6, 0xe0, 0x02, 0xb0, 0x19, 0x34, 0x57, 0x69, 0x11, 0x3c, 0xc0, 0x13,
+    0xff, 0x74, 0x94, 0xba, 0x83, 0x78, 0xb1, 0x1a, 0x17, 0x22, 0x60, 0xaa,
+    0xa5, 0x34, 0x21, 0xbd, 0xe0, 0x3a, 0x35, 0x58, 0x9d, 0x57, 0xe3, 0x22,
+    0xfe, 0xfa, 0x41, 0x00, 0xa4, 0x74, 0x39, 0x26, 0xab, 0x7d, 0x62, 0x25,
+    0x8b, 0x87, 0xb3, 0x1c, 0xcb, 0xb5, 0xe6, 0xb8, 0x9c, 0xb1, 0x0b, 0x27,
+    0x1a, 0xa0, 0x5d, 0x99, 0x4b, 0xb5, 0x70, 0x8b, 0x23, 0xab, 0x32, 0x7e,
+    0xcb, 0x93, 0xc0, 0xf3, 0x15, 0x68, 0x69, 0xf0, 0x88, 0x3d, 0xa2, 0x06,
+    0x4f, 0x79, 0x5e, 0x0e, 0x2a, 0xb7, 0xd3, 0xc6, 0x4d, 0x61, 0xd2, 0x30,
+    0x3f, 0xc3, 0xa2, 0x9e, 0x16, 0x19, 0x92, 0x3c, 0xa8, 0x01, 0xe5, 0x9f,
+    0xd7, 0x52, 0xca, 0x6e, 0x76, 0x49, 0xd3, 0x03, 0xc9, 0xd2, 0x07, 0x88,
+    0xe1, 0x21, 0x46, 0x51, 0xb0, 0x69, 0x95, 0xeb, 0x26, 0x0c, 0x92, 0x9a,
+    0x13, 0x44, 0xa8, 0x49, 0xb2, 0x5c, 0xa0, 0xa0, 0x1f, 0x1e, 0xb5, 0x29,
+    0x13, 0x68, 0x6b, 0xba, 0x61, 0x9e, 0x23, 0x71, 0x44, 0x64, 0x03, 0x1a,
+    0x78, 0x43, 0x92, 0x87, 0xfc, 0xa7, 0x8f, 0x4c, 0x04, 0x76, 0x22, 0x3e,
+    0xea, 0x61, 0xb7, 0xf2, 0x5a, 0x7c, 0xe4, 0x2c, 0xca, 0x90, 0x1b, 0x2a,
+    0xea, 0x12, 0x98, 0x17, 0x89, 0x4b, 0xa3, 0x47, 0x08, 0x23, 0x85, 0x4f,
+    0x3e, 0x5b, 0x28, 0xd8, 0x6b, 0xa9, 0x79, 0xe5, 0x46, 0x71, 0x86, 0x2d,
+    0x90, 0x47, 0x0b, 0x1e, 0x78, 0x38, 0x97, 0x2a, 0x81, 0xa4, 0x81, 0x07,
+    0xd6, 0xac, 0x06, 0x11, 0x40, 0x6b, 0x21, 0xfb, 0xcc, 0xe1, 0xdb, 0x77,
+    0x02, 0xea, 0x9d, 0xd6, 0xba, 0x6e, 0x40, 0x52, 0x7b, 0x9d, 0xc6, 0x63,
+    0xf3, 0xc9, 0x3b, 0xad, 0x05, 0x6d, 0xc2, 0x85, 0x11, 0xf6, 0x6c, 0x3e,
+    0x0b, 0x92, 0x8d, 0xb8, 0x87, 0x9d, 0x22, 0xc5, 0x92, 0x68, 0x5c, 0xc7,
+    0x75, 0xa6, 0xcd, 0x57, 0x4a, 0xc3, 0xbc, 0xe3, 0xb2, 0x75, 0x91, 0xc8,
+    0x21, 0x92, 0x90, 0x76, 0x35, 0x8a, 0x22, 0x00, 0xb3, 0x77, 0x36, 0x5f,
+    0x7e, 0xfb, 0x9e, 0x40, 0xc3, 0xbf, 0x0f, 0xf0, 0x43, 0x29, 0x86, 0xae,
+    0x4b, 0xc1, 0xa2, 0x42, 0xce, 0x99, 0x21, 0xaa, 0x9e, 0x22, 0x44, 0x88,
+    0x19, 0x58, 0x5d, 0xea, 0x30, 0x8e, 0xb0, 0x39
 };
 static const uint8_t ml_kem_768_pubkey[] = {
-  0xa8, 0xe6, 0x51, 0xa1, 0xe6, 0x85, 0xf2, 0x24, 0x78, 0xa8, 0x95, 0x4f,
-  0x00, 0x7b, 0xc7, 0x71, 0x1b, 0x93, 0x07, 0x72, 0xc7, 0x8f, 0x09, 0x2e,
-  0x82, 0x87, 0x8e, 0x3e, 0x93, 0x7f, 0x36, 0x79, 0x67, 0x53, 0x29, 0x13,
-  0xa8, 0xd5, 0x3d, 0xfd, 0xf4, 0xbf, 0xb1, 0xf8, 0x84, 0x67, 0x46, 0x59,
-  0x67, 0x05, 0xcf, 0x34, 0x51, 0x42, 0xb9, 0x72, 0xa3, 0xf1, 0x63, 0x25,
-  0xc4, 0x0c, 0x29, 0x52, 0xa3, 0x7b, 0x25, 0x89, 0x7e, 0x5e, 0xf3, 0x5f,
-  0xba, 0xeb, 0x73, 0xa4, 0xac, 0xbe, 0xb6, 0xa0, 0xb8, 0x99, 0x42, 0xce,
-  0xb1, 0x95, 0x53, 0x1c, 0xfc, 0x0a, 0x07, 0x99, 0x39, 0x54, 0x48, 0x3e,
-  0x6c, 0xbc, 0x87, 0xc0, 0x6a, 0xa7, 0x4f, 0xf0, 0xca, 0xc5, 0x20, 0x7e,
-  0x53, 0x5b, 0x26, 0x0a, 0xa9, 0x8d, 0x11, 0x98, 0xc0, 0x7d, 0xa6, 0x05,
-  0xc4, 0xd1, 0x10, 0x20, 0xf6, 0xc9, 0xf7, 0xbb, 0x68, 0xbb, 0x34, 0x56,
-  0xc7, 0x3a, 0x01, 0xb7, 0x10, 0xbc, 0x99, 0xd1, 0x77, 0x39, 0xa5, 0x17,
-  0x16, 0xaa, 0x01, 0x66, 0x0c, 0x8b, 0x62, 0x8b, 0x2f, 0x56, 0x02, 0xba,
-  0x65, 0xf0, 0x7e, 0xa9, 0x93, 0x33, 0x6e, 0x89, 0x6e, 0x83, 0xf2, 0xc5,
-  0x73, 0x1b, 0xbf, 0x03, 0x46, 0x0c, 0x5b, 0x6c, 0x8a, 0xfe, 0xcb, 0x74,
-  0x8e, 0xe3, 0x91, 0xe9, 0x89, 0x34, 0xa2, 0xc5, 0x7d, 0x4d, 0x06, 0x9f,
-  0x50, 0xd8, 0x8b, 0x30, 0xd6, 0x96, 0x6f, 0x38, 0xc3, 0x7b, 0xc6, 0x49,
-  0xb8, 0x26, 0x34, 0xce, 0x77, 0x22, 0x64, 0x5c, 0xcd, 0x62, 0x50, 0x63,
-  0x36, 0x46, 0x46, 0xd6, 0xd6, 0x99, 0xdb, 0x57, 0xb4, 0x5e, 0xb6, 0x74,
-  0x65, 0xe1, 0x6d, 0xe4, 0xd4, 0x06, 0xa8, 0x18, 0xb9, 0xea, 0xe1, 0xca,
-  0x91, 0x6a, 0x25, 0x94, 0x48, 0x97, 0x08, 0xa4, 0x3c, 0xea, 0x88, 0xb0,
-  0x2a, 0x4c, 0x03, 0xd0, 0x9b, 0x44, 0x81, 0x5c, 0x97, 0x10, 0x1c, 0xaf,
-  0x50, 0x48, 0xbb, 0xcb, 0x24, 0x7a, 0xe2, 0x36, 0x6c, 0xdc, 0x25, 0x4b,
-  0xa2, 0x21, 0x29, 0xf4, 0x5b, 0x3b, 0x0e, 0xb3, 0x99, 0xca, 0x91, 0xa3,
-  0x03, 0x40, 0x28, 0x30, 0xec, 0x01, 0xdb, 0x7b, 0x2c, 0xa4, 0x80, 0xcf,
-  0x35, 0x04, 0x09, 0xb2, 0x16, 0x09, 0x4b, 0x7b, 0x0c, 0x3a, 0xe3, 0x3c,
-  0xe1, 0x0a, 0x91, 0x24, 0xe8, 0x96, 0x51, 0xab, 0x90, 0x1e, 0xa2, 0x53,
-  0xc8, 0x41, 0x5b, 0xd7, 0x82, 0x5f, 0x02, 0xbb, 0x22, 0x93, 0x69, 0xaf,
-  0x97, 0x20, 0x28, 0xf2, 0x28, 0x75, 0xea, 0x55, 0xaf, 0x16, 0xd3, 0xbc,
-  0x69, 0xf7, 0x0c, 0x2e, 0xe8, 0xb7, 0x5f, 0x28, 0xb4, 0x7d, 0xd3, 0x91,
-  0xf9, 0x89, 0xad, 0xe3, 0x14, 0x72, 0x9c, 0x33, 0x1f, 0xa0, 0x4c, 0x19,
-  0x17, 0xb2, 0x78, 0xc3, 0xeb, 0x60, 0x28, 0x68, 0x51, 0x28, 0x21, 0xad,
-  0xc8, 0x25, 0xc6, 0x45, 0x77, 0xce, 0x1e, 0x63, 0xb1, 0xd9, 0x64, 0x4a,
-  0x61, 0x29, 0x48, 0xa3, 0x48, 0x3c, 0x7f, 0x1b, 0x9a, 0x25, 0x80, 0x00,
-  0xe3, 0x01, 0x96, 0x94, 0x4a, 0x40, 0x36, 0x27, 0x60, 0x9c, 0x76, 0xc7,
-  0xea, 0x6b, 0x5d, 0xe0, 0x17, 0x64, 0xd2, 0x43, 0x79, 0x11, 0x7b, 0x9e,
-  0xa2, 0x98, 0x48, 0xdc, 0x55, 0x5c, 0x45, 0x4b, 0xce, 0xae, 0x1b, 0xa5,
-  0xcc, 0x72, 0xc7, 0x4a, 0xb9, 0x6b, 0x9c, 0x91, 0xb9, 0x10, 0xd2, 0x6b,
-  0x88, 0xb2, 0x56, 0x39, 0xd4, 0x77, 0x8a, 0xe2, 0x6c, 0x7c, 0x61, 0x51,
-  0xa1, 0x9c, 0x6c, 0xd7, 0x93, 0x84, 0x54, 0x37, 0x24, 0x65, 0xe4, 0xc5,
-  0xec, 0x29, 0x24, 0x5a, 0xcb, 0x3d, 0xb5, 0x37, 0x9d, 0xe3, 0xda, 0xbf,
-  0xa6, 0x29, 0xa7, 0xc0, 0x4a, 0x83, 0x53, 0xa8, 0x53, 0x0c, 0x95, 0xac,
-  0xb7, 0x32, 0xbb, 0x4b, 0xb8, 0x19, 0x32, 0xbb, 0x2c, 0xa7, 0xa8, 0x48,
-  0xcd, 0x36, 0x68, 0x01, 0x44, 0x4a, 0xbe, 0x23, 0xc8, 0x3b, 0x36, 0x6a,
-  0x87, 0xd6, 0xa3, 0xcf, 0x36, 0x09, 0x24, 0xc0, 0x02, 0xba, 0xe9, 0x0a,
-  0xf6, 0x5c, 0x48, 0x06, 0x0b, 0x37, 0x52, 0xf2, 0xba, 0xdf, 0x1a, 0xb2,
-  0x72, 0x20, 0x72, 0x55, 0x4a, 0x50, 0x59, 0x75, 0x35, 0x94, 0xe6, 0xa7,
-  0x02, 0x76, 0x1f, 0xc9, 0x76, 0x84, 0xc8, 0xc4, 0xa7, 0x54, 0x0a, 0x6b,
-  0x07, 0xfb, 0xc9, 0xde, 0x87, 0xc9, 0x74, 0xaa, 0x88, 0x09, 0xd9, 0x28,
-  0xc7, 0xf4, 0xcb, 0xbf, 0x80, 0x45, 0xae, 0xa5, 0xbc, 0x66, 0x78, 0x25,
-  0xfd, 0x05, 0xa5, 0x21, 0xf1, 0xa4, 0xbf, 0x53, 0x92, 0x10, 0xc7, 0x11,
-  0x3b, 0xc3, 0x7b, 0x3e, 0x58, 0xb0, 0xcb, 0xfc, 0x53, 0xc8, 0x41, 0xcb,
-  0xb0, 0x37, 0x1d, 0xe2, 0xe5, 0x11, 0xb9, 0x89, 0xcb, 0x7c, 0x70, 0xc0,
-  0x23, 0x36, 0x6d, 0x78, 0xf9, 0xc3, 0x7e, 0xf0, 0x47, 0xf8, 0x72, 0x0b,
-  0xe1, 0xc7, 0x59, 0xa8, 0xd9, 0x6b, 0x93, 0xf6, 0x5a, 0x94, 0x11, 0x4f,
-  0xfa, 0xf6, 0x0d, 0x9a, 0x81, 0x79, 0x5e, 0x99, 0x5c, 0x71, 0x15, 0x2a,
-  0x46, 0x91, 0xa5, 0xa6, 0x02, 0xa9, 0xe1, 0xf3, 0x59, 0x9e, 0x37, 0xc7,
-  0x68, 0xc7, 0xbc, 0x10, 0x89, 0x94, 0xc0, 0x66, 0x9f, 0x3a, 0xdc, 0x95,
-  0x7d, 0x46, 0xb4, 0xb6, 0x25, 0x69, 0x68, 0xe2, 0x90, 0xd7, 0x89, 0x2e,
-  0xa8, 0x54, 0x64, 0xee, 0x7a, 0x75, 0x0f, 0x39, 0xc5, 0xe3, 0x15, 0x2c,
-  0x2d, 0xfc, 0x56, 0xd8, 0xb0, 0xc9, 0x24, 0xba, 0x8a, 0x95, 0x9a, 0x68,
-  0x09, 0x65, 0x47, 0xf6, 0x64, 0x23, 0xc8, 0x38, 0x98, 0x2a, 0x57, 0x94,
-  0xb9, 0xe1, 0x53, 0x37, 0x71, 0x33, 0x1a, 0x9a, 0x65, 0x6c, 0x28, 0x82,
-  0x8b, 0xeb, 0x91, 0x26, 0xa6, 0x0e, 0x95, 0xe8, 0xc5, 0xd9, 0x06, 0x83,
-  0x2c, 0x77, 0x10, 0x70, 0x55, 0x76, 0xb1, 0xfb, 0x95, 0x07, 0x26, 0x9d,
-  0xda, 0xf8, 0xc9, 0x5c, 0xe9, 0x71, 0x9b, 0x2c, 0xa8, 0xdd, 0x11, 0x2b,
-  0xe1, 0x0b, 0xcc, 0x9f, 0x4a, 0x37, 0xbd, 0x1b, 0x1e, 0xee, 0xb3, 0x3e,
-  0xcd, 0xa7, 0x6a, 0xe9, 0xf6, 0x9a, 0x5d, 0x4b, 0x29, 0x23, 0xa8, 0x69,
-  0x57, 0x67, 0x1d, 0x61, 0x93, 0x35, 0xbe, 0x1c, 0x4c, 0x2c, 0x77, 0xce,
-  0x87, 0xc4, 0x1f, 0x98, 0xa8, 0xcc, 0x46, 0x64, 0x60, 0xfa, 0x30, 0x0a,
-  0xaf, 0x5b, 0x30, 0x1f, 0x0a, 0x1d, 0x09, 0xc8, 0x8e, 0x65, 0xda, 0x4d,
-  0x8e, 0xe6, 0x4f, 0x68, 0xc0, 0x21, 0x89, 0xbb, 0xb3, 0x58, 0x4b, 0xaf,
-  0xf7, 0x16, 0xc8, 0x5d, 0xb6, 0x54, 0x04, 0x8a, 0x00, 0x43, 0x33, 0x48,
-  0x93, 0x93, 0xa0, 0x74, 0x27, 0xcd, 0x3e, 0x21, 0x7e, 0x6a, 0x34, 0x5f,
-  0x6c, 0x2c, 0x2b, 0x13, 0xc2, 0x7b, 0x33, 0x72, 0x71, 0xc0, 0xb2, 0x7b,
-  0x2d, 0xba, 0xa0, 0x0d, 0x23, 0x76, 0x00, 0xb5, 0xb5, 0x94, 0xe8, 0xcf,
-  0x2d, 0xd6, 0x25, 0xea, 0x76, 0xcf, 0x0e, 0xd8, 0x99, 0x12, 0x2c, 0x97,
-  0x96, 0xb4, 0xb0, 0x18, 0x70, 0x04, 0x25, 0x80, 0x49, 0xa4, 0x77, 0xcd,
-  0x11, 0xd6, 0x8c, 0x49, 0xb9, 0xa0, 0xe7, 0xb0, 0x0b, 0xce, 0x8c, 0xac,
-  0x78, 0x64, 0xcb, 0xb3, 0x75, 0x14, 0x00, 0x84, 0x74, 0x4c, 0x93, 0x06,
-  0x26, 0x94, 0xca, 0x79, 0x5c, 0x4f, 0x40, 0xe7, 0xac, 0xc9, 0xc5, 0xa1,
-  0x88, 0x40, 0x72, 0xd8, 0xc3, 0x8d, 0xaf, 0xb5, 0x01, 0xee, 0x41, 0x84,
-  0xdd, 0x5a, 0x81, 0x9e, 0xc2, 0x4e, 0xc1, 0x65, 0x12, 0x61, 0xf9, 0x62,
-  0xb1, 0x7a, 0x72, 0x15, 0xaa, 0x4a, 0x74, 0x8c, 0x15, 0x83, 0x6c, 0x38,
-  0x91, 0x37, 0x67, 0x82, 0x04, 0x83, 0x8d, 0x71, 0x95, 0xa8, 0x5b, 0x4f,
-  0x98, 0xa1, 0xb5, 0x74, 0xc4, 0xcd, 0x79, 0x09, 0xcd, 0x1f, 0x83, 0x3e,
-  0xff, 0xd1, 0x48, 0x55, 0x43, 0x22, 0x9d, 0x37, 0x48, 0xd9, 0xb5, 0xcd,
-  0x6c, 0x17, 0xb9, 0xb3, 0xb8, 0x4a, 0xef, 0x8b, 0xce, 0x13, 0xe6, 0x83,
-  0x73, 0x36, 0x59, 0xc7, 0x95, 0x42, 0xd6, 0x15, 0x78, 0x2a, 0x71, 0xcd,
-  0xee, 0xe7, 0x92, 0xba, 0xb5, 0x1b, 0xdc, 0x4b, 0xbf, 0xe8, 0x30, 0x8e,
-  0x66, 0x31, 0x44, 0xed, 0xe8, 0x49, 0x18, 0x30, 0xad, 0x98, 0xb4, 0x63,
-  0x4f, 0x64, 0xab, 0xa8, 0xb9, 0xc0, 0x42, 0x27, 0x26, 0x53, 0x92, 0x0f,
-  0x38, 0x0c, 0x1a, 0x17, 0xca, 0x87, 0xce, 0xd7, 0xaa, 0xc4, 0x1c, 0x82,
-  0x88, 0x87, 0x93, 0x18, 0x1a, 0x6f, 0x76, 0xe1, 0x97, 0xb7, 0xb9, 0x0e,
-  0xf9, 0x09, 0x43, 0xbb, 0x38, 0x44, 0x91, 0x29, 0x11, 0xd8, 0x55, 0x1e,
-  0x54, 0x66, 0xc5, 0x76, 0x7a, 0xb0, 0xbc, 0x61, 0xa1, 0xa3, 0xf7, 0x36,
-  0x16, 0x2e, 0xc0, 0x98, 0xa9, 0x00, 0xb1, 0x2d, 0xd8, 0xfa, 0xbb, 0xfb,
-  0x3f, 0xe8, 0xcb, 0x1d, 0xc4, 0xe8, 0x31, 0x5f, 0x2a, 0xf0, 0xd3, 0x2f,
-  0x00, 0x17, 0xae, 0x13, 0x6e, 0x19, 0xf0, 0x28
+    0xa8, 0xe6, 0x51, 0xa1, 0xe6, 0x85, 0xf2, 0x24, 0x78, 0xa8, 0x95, 0x4f,
+    0x00, 0x7b, 0xc7, 0x71, 0x1b, 0x93, 0x07, 0x72, 0xc7, 0x8f, 0x09, 0x2e,
+    0x82, 0x87, 0x8e, 0x3e, 0x93, 0x7f, 0x36, 0x79, 0x67, 0x53, 0x29, 0x13,
+    0xa8, 0xd5, 0x3d, 0xfd, 0xf4, 0xbf, 0xb1, 0xf8, 0x84, 0x67, 0x46, 0x59,
+    0x67, 0x05, 0xcf, 0x34, 0x51, 0x42, 0xb9, 0x72, 0xa3, 0xf1, 0x63, 0x25,
+    0xc4, 0x0c, 0x29, 0x52, 0xa3, 0x7b, 0x25, 0x89, 0x7e, 0x5e, 0xf3, 0x5f,
+    0xba, 0xeb, 0x73, 0xa4, 0xac, 0xbe, 0xb6, 0xa0, 0xb8, 0x99, 0x42, 0xce,
+    0xb1, 0x95, 0x53, 0x1c, 0xfc, 0x0a, 0x07, 0x99, 0x39, 0x54, 0x48, 0x3e,
+    0x6c, 0xbc, 0x87, 0xc0, 0x6a, 0xa7, 0x4f, 0xf0, 0xca, 0xc5, 0x20, 0x7e,
+    0x53, 0x5b, 0x26, 0x0a, 0xa9, 0x8d, 0x11, 0x98, 0xc0, 0x7d, 0xa6, 0x05,
+    0xc4, 0xd1, 0x10, 0x20, 0xf6, 0xc9, 0xf7, 0xbb, 0x68, 0xbb, 0x34, 0x56,
+    0xc7, 0x3a, 0x01, 0xb7, 0x10, 0xbc, 0x99, 0xd1, 0x77, 0x39, 0xa5, 0x17,
+    0x16, 0xaa, 0x01, 0x66, 0x0c, 0x8b, 0x62, 0x8b, 0x2f, 0x56, 0x02, 0xba,
+    0x65, 0xf0, 0x7e, 0xa9, 0x93, 0x33, 0x6e, 0x89, 0x6e, 0x83, 0xf2, 0xc5,
+    0x73, 0x1b, 0xbf, 0x03, 0x46, 0x0c, 0x5b, 0x6c, 0x8a, 0xfe, 0xcb, 0x74,
+    0x8e, 0xe3, 0x91, 0xe9, 0x89, 0x34, 0xa2, 0xc5, 0x7d, 0x4d, 0x06, 0x9f,
+    0x50, 0xd8, 0x8b, 0x30, 0xd6, 0x96, 0x6f, 0x38, 0xc3, 0x7b, 0xc6, 0x49,
+    0xb8, 0x26, 0x34, 0xce, 0x77, 0x22, 0x64, 0x5c, 0xcd, 0x62, 0x50, 0x63,
+    0x36, 0x46, 0x46, 0xd6, 0xd6, 0x99, 0xdb, 0x57, 0xb4, 0x5e, 0xb6, 0x74,
+    0x65, 0xe1, 0x6d, 0xe4, 0xd4, 0x06, 0xa8, 0x18, 0xb9, 0xea, 0xe1, 0xca,
+    0x91, 0x6a, 0x25, 0x94, 0x48, 0x97, 0x08, 0xa4, 0x3c, 0xea, 0x88, 0xb0,
+    0x2a, 0x4c, 0x03, 0xd0, 0x9b, 0x44, 0x81, 0x5c, 0x97, 0x10, 0x1c, 0xaf,
+    0x50, 0x48, 0xbb, 0xcb, 0x24, 0x7a, 0xe2, 0x36, 0x6c, 0xdc, 0x25, 0x4b,
+    0xa2, 0x21, 0x29, 0xf4, 0x5b, 0x3b, 0x0e, 0xb3, 0x99, 0xca, 0x91, 0xa3,
+    0x03, 0x40, 0x28, 0x30, 0xec, 0x01, 0xdb, 0x7b, 0x2c, 0xa4, 0x80, 0xcf,
+    0x35, 0x04, 0x09, 0xb2, 0x16, 0x09, 0x4b, 0x7b, 0x0c, 0x3a, 0xe3, 0x3c,
+    0xe1, 0x0a, 0x91, 0x24, 0xe8, 0x96, 0x51, 0xab, 0x90, 0x1e, 0xa2, 0x53,
+    0xc8, 0x41, 0x5b, 0xd7, 0x82, 0x5f, 0x02, 0xbb, 0x22, 0x93, 0x69, 0xaf,
+    0x97, 0x20, 0x28, 0xf2, 0x28, 0x75, 0xea, 0x55, 0xaf, 0x16, 0xd3, 0xbc,
+    0x69, 0xf7, 0x0c, 0x2e, 0xe8, 0xb7, 0x5f, 0x28, 0xb4, 0x7d, 0xd3, 0x91,
+    0xf9, 0x89, 0xad, 0xe3, 0x14, 0x72, 0x9c, 0x33, 0x1f, 0xa0, 0x4c, 0x19,
+    0x17, 0xb2, 0x78, 0xc3, 0xeb, 0x60, 0x28, 0x68, 0x51, 0x28, 0x21, 0xad,
+    0xc8, 0x25, 0xc6, 0x45, 0x77, 0xce, 0x1e, 0x63, 0xb1, 0xd9, 0x64, 0x4a,
+    0x61, 0x29, 0x48, 0xa3, 0x48, 0x3c, 0x7f, 0x1b, 0x9a, 0x25, 0x80, 0x00,
+    0xe3, 0x01, 0x96, 0x94, 0x4a, 0x40, 0x36, 0x27, 0x60, 0x9c, 0x76, 0xc7,
+    0xea, 0x6b, 0x5d, 0xe0, 0x17, 0x64, 0xd2, 0x43, 0x79, 0x11, 0x7b, 0x9e,
+    0xa2, 0x98, 0x48, 0xdc, 0x55, 0x5c, 0x45, 0x4b, 0xce, 0xae, 0x1b, 0xa5,
+    0xcc, 0x72, 0xc7, 0x4a, 0xb9, 0x6b, 0x9c, 0x91, 0xb9, 0x10, 0xd2, 0x6b,
+    0x88, 0xb2, 0x56, 0x39, 0xd4, 0x77, 0x8a, 0xe2, 0x6c, 0x7c, 0x61, 0x51,
+    0xa1, 0x9c, 0x6c, 0xd7, 0x93, 0x84, 0x54, 0x37, 0x24, 0x65, 0xe4, 0xc5,
+    0xec, 0x29, 0x24, 0x5a, 0xcb, 0x3d, 0xb5, 0x37, 0x9d, 0xe3, 0xda, 0xbf,
+    0xa6, 0x29, 0xa7, 0xc0, 0x4a, 0x83, 0x53, 0xa8, 0x53, 0x0c, 0x95, 0xac,
+    0xb7, 0x32, 0xbb, 0x4b, 0xb8, 0x19, 0x32, 0xbb, 0x2c, 0xa7, 0xa8, 0x48,
+    0xcd, 0x36, 0x68, 0x01, 0x44, 0x4a, 0xbe, 0x23, 0xc8, 0x3b, 0x36, 0x6a,
+    0x87, 0xd6, 0xa3, 0xcf, 0x36, 0x09, 0x24, 0xc0, 0x02, 0xba, 0xe9, 0x0a,
+    0xf6, 0x5c, 0x48, 0x06, 0x0b, 0x37, 0x52, 0xf2, 0xba, 0xdf, 0x1a, 0xb2,
+    0x72, 0x20, 0x72, 0x55, 0x4a, 0x50, 0x59, 0x75, 0x35, 0x94, 0xe6, 0xa7,
+    0x02, 0x76, 0x1f, 0xc9, 0x76, 0x84, 0xc8, 0xc4, 0xa7, 0x54, 0x0a, 0x6b,
+    0x07, 0xfb, 0xc9, 0xde, 0x87, 0xc9, 0x74, 0xaa, 0x88, 0x09, 0xd9, 0x28,
+    0xc7, 0xf4, 0xcb, 0xbf, 0x80, 0x45, 0xae, 0xa5, 0xbc, 0x66, 0x78, 0x25,
+    0xfd, 0x05, 0xa5, 0x21, 0xf1, 0xa4, 0xbf, 0x53, 0x92, 0x10, 0xc7, 0x11,
+    0x3b, 0xc3, 0x7b, 0x3e, 0x58, 0xb0, 0xcb, 0xfc, 0x53, 0xc8, 0x41, 0xcb,
+    0xb0, 0x37, 0x1d, 0xe2, 0xe5, 0x11, 0xb9, 0x89, 0xcb, 0x7c, 0x70, 0xc0,
+    0x23, 0x36, 0x6d, 0x78, 0xf9, 0xc3, 0x7e, 0xf0, 0x47, 0xf8, 0x72, 0x0b,
+    0xe1, 0xc7, 0x59, 0xa8, 0xd9, 0x6b, 0x93, 0xf6, 0x5a, 0x94, 0x11, 0x4f,
+    0xfa, 0xf6, 0x0d, 0x9a, 0x81, 0x79, 0x5e, 0x99, 0x5c, 0x71, 0x15, 0x2a,
+    0x46, 0x91, 0xa5, 0xa6, 0x02, 0xa9, 0xe1, 0xf3, 0x59, 0x9e, 0x37, 0xc7,
+    0x68, 0xc7, 0xbc, 0x10, 0x89, 0x94, 0xc0, 0x66, 0x9f, 0x3a, 0xdc, 0x95,
+    0x7d, 0x46, 0xb4, 0xb6, 0x25, 0x69, 0x68, 0xe2, 0x90, 0xd7, 0x89, 0x2e,
+    0xa8, 0x54, 0x64, 0xee, 0x7a, 0x75, 0x0f, 0x39, 0xc5, 0xe3, 0x15, 0x2c,
+    0x2d, 0xfc, 0x56, 0xd8, 0xb0, 0xc9, 0x24, 0xba, 0x8a, 0x95, 0x9a, 0x68,
+    0x09, 0x65, 0x47, 0xf6, 0x64, 0x23, 0xc8, 0x38, 0x98, 0x2a, 0x57, 0x94,
+    0xb9, 0xe1, 0x53, 0x37, 0x71, 0x33, 0x1a, 0x9a, 0x65, 0x6c, 0x28, 0x82,
+    0x8b, 0xeb, 0x91, 0x26, 0xa6, 0x0e, 0x95, 0xe8, 0xc5, 0xd9, 0x06, 0x83,
+    0x2c, 0x77, 0x10, 0x70, 0x55, 0x76, 0xb1, 0xfb, 0x95, 0x07, 0x26, 0x9d,
+    0xda, 0xf8, 0xc9, 0x5c, 0xe9, 0x71, 0x9b, 0x2c, 0xa8, 0xdd, 0x11, 0x2b,
+    0xe1, 0x0b, 0xcc, 0x9f, 0x4a, 0x37, 0xbd, 0x1b, 0x1e, 0xee, 0xb3, 0x3e,
+    0xcd, 0xa7, 0x6a, 0xe9, 0xf6, 0x9a, 0x5d, 0x4b, 0x29, 0x23, 0xa8, 0x69,
+    0x57, 0x67, 0x1d, 0x61, 0x93, 0x35, 0xbe, 0x1c, 0x4c, 0x2c, 0x77, 0xce,
+    0x87, 0xc4, 0x1f, 0x98, 0xa8, 0xcc, 0x46, 0x64, 0x60, 0xfa, 0x30, 0x0a,
+    0xaf, 0x5b, 0x30, 0x1f, 0x0a, 0x1d, 0x09, 0xc8, 0x8e, 0x65, 0xda, 0x4d,
+    0x8e, 0xe6, 0x4f, 0x68, 0xc0, 0x21, 0x89, 0xbb, 0xb3, 0x58, 0x4b, 0xaf,
+    0xf7, 0x16, 0xc8, 0x5d, 0xb6, 0x54, 0x04, 0x8a, 0x00, 0x43, 0x33, 0x48,
+    0x93, 0x93, 0xa0, 0x74, 0x27, 0xcd, 0x3e, 0x21, 0x7e, 0x6a, 0x34, 0x5f,
+    0x6c, 0x2c, 0x2b, 0x13, 0xc2, 0x7b, 0x33, 0x72, 0x71, 0xc0, 0xb2, 0x7b,
+    0x2d, 0xba, 0xa0, 0x0d, 0x23, 0x76, 0x00, 0xb5, 0xb5, 0x94, 0xe8, 0xcf,
+    0x2d, 0xd6, 0x25, 0xea, 0x76, 0xcf, 0x0e, 0xd8, 0x99, 0x12, 0x2c, 0x97,
+    0x96, 0xb4, 0xb0, 0x18, 0x70, 0x04, 0x25, 0x80, 0x49, 0xa4, 0x77, 0xcd,
+    0x11, 0xd6, 0x8c, 0x49, 0xb9, 0xa0, 0xe7, 0xb0, 0x0b, 0xce, 0x8c, 0xac,
+    0x78, 0x64, 0xcb, 0xb3, 0x75, 0x14, 0x00, 0x84, 0x74, 0x4c, 0x93, 0x06,
+    0x26, 0x94, 0xca, 0x79, 0x5c, 0x4f, 0x40, 0xe7, 0xac, 0xc9, 0xc5, 0xa1,
+    0x88, 0x40, 0x72, 0xd8, 0xc3, 0x8d, 0xaf, 0xb5, 0x01, 0xee, 0x41, 0x84,
+    0xdd, 0x5a, 0x81, 0x9e, 0xc2, 0x4e, 0xc1, 0x65, 0x12, 0x61, 0xf9, 0x62,
+    0xb1, 0x7a, 0x72, 0x15, 0xaa, 0x4a, 0x74, 0x8c, 0x15, 0x83, 0x6c, 0x38,
+    0x91, 0x37, 0x67, 0x82, 0x04, 0x83, 0x8d, 0x71, 0x95, 0xa8, 0x5b, 0x4f,
+    0x98, 0xa1, 0xb5, 0x74, 0xc4, 0xcd, 0x79, 0x09, 0xcd, 0x1f, 0x83, 0x3e,
+    0xff, 0xd1, 0x48, 0x55, 0x43, 0x22, 0x9d, 0x37, 0x48, 0xd9, 0xb5, 0xcd,
+    0x6c, 0x17, 0xb9, 0xb3, 0xb8, 0x4a, 0xef, 0x8b, 0xce, 0x13, 0xe6, 0x83,
+    0x73, 0x36, 0x59, 0xc7, 0x95, 0x42, 0xd6, 0x15, 0x78, 0x2a, 0x71, 0xcd,
+    0xee, 0xe7, 0x92, 0xba, 0xb5, 0x1b, 0xdc, 0x4b, 0xbf, 0xe8, 0x30, 0x8e,
+    0x66, 0x31, 0x44, 0xed, 0xe8, 0x49, 0x18, 0x30, 0xad, 0x98, 0xb4, 0x63,
+    0x4f, 0x64, 0xab, 0xa8, 0xb9, 0xc0, 0x42, 0x27, 0x26, 0x53, 0x92, 0x0f,
+    0x38, 0x0c, 0x1a, 0x17, 0xca, 0x87, 0xce, 0xd7, 0xaa, 0xc4, 0x1c, 0x82,
+    0x88, 0x87, 0x93, 0x18, 0x1a, 0x6f, 0x76, 0xe1, 0x97, 0xb7, 0xb9, 0x0e,
+    0xf9, 0x09, 0x43, 0xbb, 0x38, 0x44, 0x91, 0x29, 0x11, 0xd8, 0x55, 0x1e,
+    0x54, 0x66, 0xc5, 0x76, 0x7a, 0xb0, 0xbc, 0x61, 0xa1, 0xa3, 0xf7, 0x36,
+    0x16, 0x2e, 0xc0, 0x98, 0xa9, 0x00, 0xb1, 0x2d, 0xd8, 0xfa, 0xbb, 0xfb,
+    0x3f, 0xe8, 0xcb, 0x1d, 0xc4, 0xe8, 0x31, 0x5f, 0x2a, 0xf0, 0xd3, 0x2f,
+    0x00, 0x17, 0xae, 0x13, 0x6e, 0x19, 0xf0, 0x28
 };
 static const uint8_t ml_kem_1024_pubkey[] = {
-  0x53, 0x79, 0x11, 0x95, 0x7c, 0x12, 0x51, 0x48, 0xa8, 0x7f, 0x41, 0x58,
-  0x9c, 0xb2, 0x22, 0xd0, 0xd1, 0x92, 0x29, 0xe2, 0xcb, 0x55, 0xe1, 0xa0,
-  0x44, 0x79, 0x1e, 0x7c, 0xa6, 0x11, 0x92, 0xa4, 0x64, 0x60, 0xc3, 0x18,
-  0x3d, 0x2b, 0xcd, 0x6d, 0xe0, 0x8a, 0x5e, 0x76, 0x51, 0x60, 0x3a, 0xcc,
-  0x34, 0x9c, 0xa1, 0x6c, 0xba, 0x18, 0xab, 0xb2, 0x3a, 0x3e, 0x8c, 0x33,
-  0x0d, 0x74, 0x21, 0x59, 0x8a, 0x62, 0x78, 0xec, 0x7e, 0xbf, 0xab, 0xca,
-  0x0e, 0xf4, 0x88, 0xb2, 0x29, 0x05, 0x54, 0x75, 0x34, 0x99, 0xc0, 0x45,
-  0x2e, 0x45, 0x38, 0x15, 0x30, 0x99, 0x55, 0xb8, 0x15, 0x0f, 0xa1, 0xa1,
-  0xe3, 0x93, 0x38, 0x6d, 0xc1, 0x2f, 0xdb, 0x27, 0xb3, 0x8c, 0x67, 0x45,
-  0xf2, 0x94, 0x40, 0x16, 0xec, 0x45, 0x7f, 0x39, 0xb1, 0x8d, 0x60, 0x4a,
-  0x07, 0xa1, 0xab, 0xe0, 0x7b, 0xc8, 0x44, 0x05, 0x0f, 0xfa, 0x8a, 0x06,
-  0xfa, 0x15, 0x4a, 0x49, 0xd8, 0x8f, 0xac, 0x77, 0x54, 0x52, 0xd6, 0xa7,
-  0xc0, 0xe5, 0x89, 0xbf, 0xb5, 0xc3, 0x70, 0xc2, 0xc4, 0xb6, 0x20, 0x1d,
-  0xda, 0x80, 0xc9, 0xab, 0x20, 0x76, 0xec, 0xc0, 0x8b, 0x44, 0x52, 0x2f,
-  0xda, 0x33, 0x26, 0xf0, 0x33, 0x80, 0x6d, 0xd2, 0x69, 0x3f, 0x31, 0x97,
-  0x39, 0xf4, 0x0c, 0x4f, 0x42, 0xb2, 0x4a, 0xca, 0x70, 0x98, 0xfb, 0x8f,
-  0xf5, 0xf9, 0xac, 0x20, 0x29, 0x2d, 0x02, 0xb5, 0x6a, 0xc7, 0x46, 0x80,
-  0x1a, 0xcc, 0xcc, 0x84, 0x86, 0x3d, 0xee, 0x32, 0x87, 0x84, 0x97, 0xb6,
-  0x94, 0x38, 0xbf, 0x99, 0x17, 0x76, 0x28, 0x66, 0x50, 0x48, 0x2c, 0x8d,
-  0x9d, 0x95, 0x87, 0xbc, 0x6a, 0x55, 0xb8, 0x5c, 0x4d, 0x7f, 0xa7, 0x4d,
-  0x02, 0x65, 0x6b, 0x42, 0x1c, 0x9e, 0x23, 0xe0, 0x3a, 0x48, 0xd4, 0xb7,
-  0x44, 0x25, 0xc2, 0x6e, 0x4a, 0x20, 0xdd, 0x95, 0x62, 0xa4, 0xda, 0x07,
-  0x93, 0xf3, 0xa3, 0x52, 0xcc, 0xc0, 0xf1, 0x82, 0x17, 0xd8, 0x68, 0xc7,
-  0xf5, 0x00, 0x2a, 0xbe, 0x76, 0x8b, 0x1f, 0xc7, 0x3f, 0x05, 0x74, 0x4e,
-  0x7c, 0xc2, 0x8f, 0x10, 0x34, 0x40, 0x62, 0xc1, 0x0e, 0x08, 0xec, 0xcc,
-  0xed, 0x3c, 0x1f, 0x7d, 0x39, 0x2c, 0x01, 0xd9, 0x79, 0xdd, 0x71, 0x8d,
-  0x83, 0x98, 0x37, 0x46, 0x65, 0xa1, 0x6a, 0x98, 0x70, 0x58, 0x5c, 0x39,
-  0xd5, 0x58, 0x9a, 0x50, 0xe1, 0x33, 0x38, 0x9c, 0x9b, 0x9a, 0x27, 0x6c,
-  0x02, 0x42, 0x60, 0xd9, 0xfc, 0x77, 0x11, 0xc8, 0x1b, 0x63, 0x37, 0xb5,
-  0x7d, 0xa3, 0xc3, 0x76, 0xd0, 0xcd, 0x74, 0xe1, 0x4c, 0x73, 0x72, 0x7b,
-  0x27, 0x66, 0x56, 0xb9, 0xd8, 0xa4, 0xeb, 0x71, 0x89, 0x6f, 0xf5, 0x89,
-  0xd4, 0xb8, 0x93, 0xe7, 0x11, 0x0f, 0x3b, 0xb9, 0x48, 0xec, 0xe2, 0x91,
-  0xdd, 0x86, 0xc0, 0xb7, 0x46, 0x8a, 0x67, 0x8c, 0x74, 0x69, 0x80, 0xc1,
-  0x2a, 0xa6, 0xb9, 0x5e, 0x2b, 0x0c, 0xbe, 0x43, 0x31, 0xbb, 0x24, 0xa3,
-  0x3a, 0x27, 0x01, 0x53, 0xaa, 0x47, 0x2c, 0x47, 0x31, 0x23, 0x82, 0xca,
-  0x36, 0x5c, 0x5f, 0x35, 0x25, 0x9d, 0x02, 0x57, 0x46, 0xfc, 0x65, 0x95,
-  0xfe, 0x63, 0x6c, 0x76, 0x75, 0x10, 0xa6, 0x9c, 0x1e, 0x8a, 0x17, 0x6b,
-  0x79, 0x49, 0x95, 0x8f, 0x26, 0x97, 0x39, 0x94, 0x97, 0xa2, 0xfc, 0x73,
-  0x64, 0xa1, 0x2c, 0x81, 0x98, 0x29, 0x52, 0x39, 0xc8, 0x26, 0xcb, 0x50,
-  0x82, 0x08, 0x60, 0x77, 0x28, 0x2e, 0xd6, 0x28, 0x65, 0x1f, 0xc0, 0x4c,
-  0x63, 0x9b, 0x43, 0x85, 0x22, 0xa9, 0xde, 0x30, 0x9b, 0x14, 0xb0, 0x86,
-  0xd6, 0xe9, 0x23, 0xc5, 0x51, 0x62, 0x3b, 0xd7, 0x2a, 0x73, 0x3c, 0xb0,
-  0xda, 0xbc, 0x54, 0xa9, 0x41, 0x6a, 0x99, 0xe7, 0x2c, 0x9f, 0xda, 0x1c,
-  0xb3, 0xfb, 0x9b, 0xa0, 0x6b, 0x8a, 0xdb, 0x24, 0x22, 0xd6, 0x8c, 0xad,
-  0xc5, 0x53, 0xc9, 0x82, 0x02, 0xa1, 0x76, 0x56, 0x47, 0x8a, 0xc0, 0x44,
-  0xef, 0x34, 0x56, 0x37, 0x8a, 0xbc, 0xe9, 0x99, 0x1e, 0x01, 0x41, 0xba,
-  0x79, 0x09, 0x4f, 0xa8, 0xf7, 0x7a, 0x30, 0x08, 0x05, 0xd2, 0xd3, 0x2f,
-  0xfc, 0x62, 0xbf, 0x0c, 0xa4, 0x55, 0x4c, 0x33, 0x0c, 0x2b, 0xb7, 0x04,
-  0x2d, 0xb3, 0x51, 0x02, 0xf6, 0x8b, 0x1a, 0x00, 0x62, 0x58, 0x38, 0x65,
-  0x38, 0x1c, 0x74, 0xdd, 0x91, 0x3a, 0xf7, 0x0b, 0x26, 0xcf, 0x09, 0x23,
-  0xd0, 0xc4, 0xcb, 0x97, 0x16, 0x92, 0x22, 0x25, 0x52, 0xa8, 0xf4, 0xb7,
-  0x88, 0xb4, 0xaf, 0xd1, 0x34, 0x1a, 0x9d, 0xf4, 0x15, 0xcf, 0x20, 0x39,
-  0x00, 0xf5, 0xcc, 0xf7, 0xf6, 0x59, 0x88, 0x94, 0x9a, 0x75, 0x58, 0x0d,
-  0x04, 0x96, 0x39, 0x85, 0x31, 0x00, 0x85, 0x4b, 0x21, 0xf4, 0x01, 0x80,
-  0x03, 0x50, 0x2b, 0xb1, 0xba, 0x95, 0xf5, 0x56, 0xa5, 0xd6, 0x7c, 0x7e,
-  0xb5, 0x24, 0x10, 0xeb, 0xa2, 0x88, 0xa6, 0xd0, 0x63, 0x5c, 0xa8, 0xa4,
-  0xf6, 0xd6, 0x96, 0xd0, 0xa0, 0x20, 0xc8, 0x26, 0x93, 0x8d, 0x34, 0x94,
-  0x3c, 0x38, 0x08, 0xc7, 0x9c, 0xc0, 0x07, 0x76, 0x85, 0x33, 0x21, 0x6b,
-  0xc1, 0xb2, 0x9d, 0xa6, 0xc8, 0x12, 0xef, 0xf3, 0x34, 0x0b, 0xaa, 0x8d,
-  0x2e, 0x65, 0x34, 0x4f, 0x09, 0xbd, 0x47, 0x89, 0x4f, 0x5a, 0x3a, 0x41,
-  0x18, 0x71, 0x5b, 0x3c, 0x50, 0x20, 0x67, 0x93, 0x27, 0xf9, 0x18, 0x9f,
-  0x7e, 0x10, 0x85, 0x6b, 0x23, 0x8b, 0xb9, 0xb0, 0xab, 0x4c, 0xa8, 0x5a,
-  0xbf, 0x4b, 0x21, 0xf5, 0xc7, 0x6b, 0xcc, 0xd7, 0x18, 0x50, 0xb2, 0x2e,
-  0x04, 0x59, 0x28, 0x27, 0x6a, 0x0f, 0x2e, 0x95, 0x1d, 0xb0, 0x70, 0x7c,
-  0x6a, 0x11, 0x6d, 0xc1, 0x91, 0x13, 0xfa, 0x76, 0x2d, 0xc5, 0xf2, 0x0b,
-  0xd5, 0xd2, 0xab, 0x5b, 0xe7, 0x17, 0x44, 0xdc, 0x9c, 0xbd, 0xb5, 0x1e,
-  0xa7, 0x57, 0x96, 0x3a, 0xac, 0x56, 0xa9, 0x0a, 0x0d, 0x80, 0x23, 0xbe,
-  0xd1, 0xf5, 0xca, 0xe8, 0xa6, 0x4d, 0xa0, 0x47, 0x27, 0x9b, 0x35, 0x3a,
-  0x09, 0x6a, 0x83, 0x5b, 0x0b, 0x2b, 0x02, 0x3b, 0x6a, 0xa0, 0x48, 0x98,
-  0x92, 0x33, 0x07, 0x9a, 0xeb, 0x46, 0x7e, 0x52, 0x2f, 0xa2, 0x7a, 0x58,
-  0x22, 0x92, 0x1e, 0x5c, 0x55, 0x1b, 0x4f, 0x53, 0x75, 0x36, 0xe4, 0x6f,
-  0x3a, 0x6a, 0x97, 0xe7, 0x2c, 0x3b, 0x06, 0x31, 0x04, 0xe0, 0x9a, 0x04,
-  0x05, 0x98, 0x94, 0x0d, 0x87, 0x2f, 0x6d, 0x87, 0x1f, 0x5e, 0xf9, 0xb4,
-  0x35, 0x50, 0x73, 0xb5, 0x47, 0x69, 0xe4, 0x54, 0x54, 0xe6, 0xa0, 0x81,
-  0x95, 0x99, 0x40, 0x86, 0x21, 0xab, 0x44, 0x13, 0xb3, 0x55, 0x07, 0xb0,
-  0xdf, 0x57, 0x8c, 0xe2, 0xd5, 0x11, 0xd5, 0x20, 0x58, 0xd5, 0x74, 0x9d,
-  0xf3, 0x8b, 0x29, 0xd6, 0xcc, 0x58, 0x87, 0x0c, 0xaf, 0x92, 0xf6, 0x9a,
-  0x75, 0x16, 0x14, 0x06, 0xe7, 0x1c, 0x5f, 0xf9, 0x24, 0x51, 0xa7, 0x75,
-  0x22, 0xb8, 0xb2, 0x96, 0x7a, 0x2d, 0x58, 0xa4, 0x9a, 0x81, 0x66, 0x1a,
-  0xa6, 0x5a, 0xc0, 0x9b, 0x08, 0xc9, 0xfe, 0x45, 0xab, 0xc3, 0x85, 0x1f,
-  0x99, 0xc7, 0x30, 0xc4, 0x50, 0x03, 0xac, 0xa2, 0xbf, 0x0f, 0x84, 0x24,
-  0xa1, 0x9b, 0x74, 0x08, 0xa5, 0x37, 0xd5, 0x41, 0xc1, 0x6f, 0x56, 0x82,
-  0xbf, 0xe3, 0xa7, 0xfa, 0xea, 0x56, 0x4f, 0x12, 0x98, 0x61, 0x1a, 0x7f,
-  0x5f, 0x60, 0x92, 0x2b, 0xa1, 0x9d, 0xe7, 0x3b, 0x19, 0x17, 0xf1, 0x85,
-  0x32, 0x73, 0x55, 0x51, 0x99, 0xa6, 0x49, 0x31, 0x8b, 0x50, 0x77, 0x33,
-  0x45, 0xc9, 0x97, 0x46, 0x08, 0x56, 0x97, 0x2a, 0xcb, 0x43, 0xfc, 0x81,
-  0xab, 0x63, 0x21, 0xb1, 0xc3, 0x3c, 0x2b, 0xb5, 0x09, 0x8b, 0xd4, 0x89,
-  0xd6, 0x96, 0xa0, 0xf7, 0x06, 0x79, 0xc1, 0x21, 0x38, 0x73, 0xd0, 0x8b,
-  0xda, 0xd4, 0x28, 0x44, 0x92, 0x72, 0x16, 0x04, 0x72, 0x05, 0x63, 0x32,
-  0x12, 0x31, 0x0e, 0xe9, 0xa0, 0x6c, 0xb1, 0x00, 0x16, 0xc8, 0x05, 0x50,
-  0x3c, 0x34, 0x1a, 0x36, 0xd8, 0x7e, 0x56, 0x07, 0x2e, 0xab, 0xe2, 0x37,
-  0x31, 0xe3, 0x4a, 0xf7, 0xe2, 0x32, 0x8f, 0x85, 0xcd, 0xb3, 0x70, 0xcc,
-  0xaf, 0x00, 0x51, 0x5b, 0x64, 0xc9, 0xc5, 0x4b, 0xc8, 0x37, 0x57, 0x84,
-  0x47, 0xaa, 0xcf, 0xae, 0xd5, 0x96, 0x9a, 0xa3, 0x51, 0xe7, 0xda, 0x4e,
-  0xfa, 0x7b, 0x11, 0x5c, 0x4c, 0x51, 0xf4, 0xa6, 0x99, 0x77, 0x98, 0x50,
-  0x29, 0x5c, 0xa7, 0x2d, 0x78, 0x1a, 0xd4, 0x1b, 0xc6, 0x80, 0x53, 0x2b,
-  0x89, 0xe7, 0x10, 0xe2, 0x18, 0x9e, 0xb3, 0xc5, 0x08, 0x17, 0xba, 0x25,
-  0x5c, 0x74, 0x74, 0xc9, 0x5c, 0xa9, 0x11, 0x0c, 0xc4, 0x3b, 0x8b, 0xa8,
-  0xe6, 0x82, 0xc7, 0xfb, 0x7b, 0x0f, 0xdc, 0x26, 0x5c, 0x04, 0x83, 0xa6,
-  0x5c, 0xa4, 0x51, 0x4e, 0xe4, 0xb8, 0x32, 0xaa, 0xc5, 0x80, 0x0c, 0x3b,
-  0x08, 0xe7, 0x4f, 0x56, 0x39, 0x51, 0xc1, 0xfb, 0xb2, 0x10, 0x35, 0x3e,
-  0xfa, 0x1a, 0xa8, 0x66, 0x85, 0x6b, 0xc1, 0xe0, 0x34, 0x73, 0x3b, 0x04,
-  0x85, 0xda, 0xb1, 0xd0, 0x20, 0xc6, 0xbf, 0x76, 0x5f, 0xf6, 0x0b, 0x3b,
-  0x80, 0x19, 0x84, 0xa9, 0x0c, 0x2f, 0xe9, 0x70, 0xbf, 0x1d, 0xe9, 0x70,
-  0x04, 0xa6, 0xcf, 0x44, 0xb4, 0x98, 0x4a, 0xb5, 0x82, 0x58, 0xb4, 0xaf,
-  0x71, 0x22, 0x1c, 0xd1, 0x75, 0x30, 0xa7, 0x00, 0xc3, 0x29, 0x59, 0xc9,
-  0x43, 0x63, 0x44, 0xb5, 0x31, 0x6f, 0x09, 0xcc, 0xca, 0x70, 0x29, 0xa2,
-  0x30, 0xd6, 0x39, 0xdc, 0xb0, 0x22, 0xd8, 0xba, 0x79, 0xba, 0x91, 0xcd,
-  0x6a, 0xb1, 0x2a, 0xe1, 0x57, 0x9c, 0x50, 0xc7, 0xbb, 0x10, 0xe3, 0x03,
-  0x01, 0xa6, 0x5c, 0xae, 0x31, 0x01, 0xd4, 0x0c, 0x7b, 0xa9, 0x27, 0xbb,
-  0x55, 0x31, 0x48, 0xd1, 0x64, 0x70, 0x24, 0xd4, 0xa0, 0x6c, 0x81, 0x66,
-  0xd0, 0xb0, 0xb8, 0x12, 0x69, 0xb7, 0xd5, 0xf4, 0xb3, 0x4f, 0xb0, 0x22,
-  0xf6, 0x91, 0x52, 0xf5, 0x14, 0x00, 0x4a, 0x7c, 0x68, 0x53, 0x68, 0x55,
-  0x23, 0x43, 0xbb, 0x60, 0x36, 0x0f, 0xbb, 0x99, 0x45, 0xed, 0xf4, 0x46,
-  0xd3, 0x45, 0xbd, 0xca, 0xa7, 0x45, 0x5c, 0x74, 0xba, 0x0a, 0x55, 0x1e,
-  0x18, 0x46, 0x20, 0xfe, 0xf9, 0x76, 0x88, 0x77, 0x3d, 0x50, 0xb6, 0x43,
-  0x3c, 0xa7, 0xa7, 0xac, 0x5c, 0xb6, 0xb7, 0xf6, 0x71, 0xa1, 0x53, 0x76,
-  0xe5, 0xa6, 0x74, 0x7a, 0x62, 0x3f, 0xa7, 0xbc, 0x66, 0x30, 0x37, 0x3f,
-  0x5b, 0x1b, 0x51, 0x26, 0x90, 0xa6, 0x61, 0x37, 0x78, 0x70, 0xa6, 0x0a,
-  0x7a, 0x18, 0x96, 0x83, 0xf9, 0xb0, 0xcf, 0x04, 0x66, 0xe1, 0xf7, 0x50,
-  0x76, 0x26, 0x31, 0xc4, 0xab, 0x09, 0xf5, 0x05, 0xc4, 0x2d, 0xd2, 0x86,
-  0x33, 0x56, 0x94, 0x72, 0x73, 0x54, 0x42, 0x85, 0x1e, 0x32, 0x16, 0x16,
-  0xd4, 0x00, 0x98, 0x10, 0x77, 0x7b, 0x6b, 0xd4, 0x6f, 0xa7, 0x22, 0x44,
-  0x61, 0xa5, 0xcc, 0x27, 0x40, 0x5d, 0xfb, 0xac, 0x0d, 0x39, 0xb0, 0x02,
-  0xca, 0xb3, 0x34, 0x33, 0xf2, 0xa8, 0x6e, 0xb8, 0xce, 0x91, 0xc1, 0x34,
-  0xa6, 0x38, 0x6f, 0x86, 0x0a, 0x19, 0x94, 0xeb, 0x4b, 0x68, 0x75, 0xa4,
-  0x6d, 0x19, 0x55, 0x81, 0xd1, 0x73, 0x85, 0x4b, 0x53, 0xd2, 0x29, 0x3d,
-  0xf3, 0xe9, 0xa8, 0x22, 0x75, 0x6c, 0xd8, 0xf2, 0x12, 0xb3, 0x25, 0xca,
-  0x29, 0xb4, 0xf9, 0xf8, 0xcf, 0xba, 0xdf, 0x2e, 0x41, 0x86, 0x9a, 0xbf,
-  0xba, 0xd1, 0x07, 0x38, 0xad, 0x04, 0xcc, 0x75, 0x2b, 0xc2, 0x0c, 0x39,
-  0x47, 0x46, 0x85, 0x0e, 0x0c, 0x48, 0x47, 0xdb
+    0x53, 0x79, 0x11, 0x95, 0x7c, 0x12, 0x51, 0x48, 0xa8, 0x7f, 0x41, 0x58,
+    0x9c, 0xb2, 0x22, 0xd0, 0xd1, 0x92, 0x29, 0xe2, 0xcb, 0x55, 0xe1, 0xa0,
+    0x44, 0x79, 0x1e, 0x7c, 0xa6, 0x11, 0x92, 0xa4, 0x64, 0x60, 0xc3, 0x18,
+    0x3d, 0x2b, 0xcd, 0x6d, 0xe0, 0x8a, 0x5e, 0x76, 0x51, 0x60, 0x3a, 0xcc,
+    0x34, 0x9c, 0xa1, 0x6c, 0xba, 0x18, 0xab, 0xb2, 0x3a, 0x3e, 0x8c, 0x33,
+    0x0d, 0x74, 0x21, 0x59, 0x8a, 0x62, 0x78, 0xec, 0x7e, 0xbf, 0xab, 0xca,
+    0x0e, 0xf4, 0x88, 0xb2, 0x29, 0x05, 0x54, 0x75, 0x34, 0x99, 0xc0, 0x45,
+    0x2e, 0x45, 0x38, 0x15, 0x30, 0x99, 0x55, 0xb8, 0x15, 0x0f, 0xa1, 0xa1,
+    0xe3, 0x93, 0x38, 0x6d, 0xc1, 0x2f, 0xdb, 0x27, 0xb3, 0x8c, 0x67, 0x45,
+    0xf2, 0x94, 0x40, 0x16, 0xec, 0x45, 0x7f, 0x39, 0xb1, 0x8d, 0x60, 0x4a,
+    0x07, 0xa1, 0xab, 0xe0, 0x7b, 0xc8, 0x44, 0x05, 0x0f, 0xfa, 0x8a, 0x06,
+    0xfa, 0x15, 0x4a, 0x49, 0xd8, 0x8f, 0xac, 0x77, 0x54, 0x52, 0xd6, 0xa7,
+    0xc0, 0xe5, 0x89, 0xbf, 0xb5, 0xc3, 0x70, 0xc2, 0xc4, 0xb6, 0x20, 0x1d,
+    0xda, 0x80, 0xc9, 0xab, 0x20, 0x76, 0xec, 0xc0, 0x8b, 0x44, 0x52, 0x2f,
+    0xda, 0x33, 0x26, 0xf0, 0x33, 0x80, 0x6d, 0xd2, 0x69, 0x3f, 0x31, 0x97,
+    0x39, 0xf4, 0x0c, 0x4f, 0x42, 0xb2, 0x4a, 0xca, 0x70, 0x98, 0xfb, 0x8f,
+    0xf5, 0xf9, 0xac, 0x20, 0x29, 0x2d, 0x02, 0xb5, 0x6a, 0xc7, 0x46, 0x80,
+    0x1a, 0xcc, 0xcc, 0x84, 0x86, 0x3d, 0xee, 0x32, 0x87, 0x84, 0x97, 0xb6,
+    0x94, 0x38, 0xbf, 0x99, 0x17, 0x76, 0x28, 0x66, 0x50, 0x48, 0x2c, 0x8d,
+    0x9d, 0x95, 0x87, 0xbc, 0x6a, 0x55, 0xb8, 0x5c, 0x4d, 0x7f, 0xa7, 0x4d,
+    0x02, 0x65, 0x6b, 0x42, 0x1c, 0x9e, 0x23, 0xe0, 0x3a, 0x48, 0xd4, 0xb7,
+    0x44, 0x25, 0xc2, 0x6e, 0x4a, 0x20, 0xdd, 0x95, 0x62, 0xa4, 0xda, 0x07,
+    0x93, 0xf3, 0xa3, 0x52, 0xcc, 0xc0, 0xf1, 0x82, 0x17, 0xd8, 0x68, 0xc7,
+    0xf5, 0x00, 0x2a, 0xbe, 0x76, 0x8b, 0x1f, 0xc7, 0x3f, 0x05, 0x74, 0x4e,
+    0x7c, 0xc2, 0x8f, 0x10, 0x34, 0x40, 0x62, 0xc1, 0x0e, 0x08, 0xec, 0xcc,
+    0xed, 0x3c, 0x1f, 0x7d, 0x39, 0x2c, 0x01, 0xd9, 0x79, 0xdd, 0x71, 0x8d,
+    0x83, 0x98, 0x37, 0x46, 0x65, 0xa1, 0x6a, 0x98, 0x70, 0x58, 0x5c, 0x39,
+    0xd5, 0x58, 0x9a, 0x50, 0xe1, 0x33, 0x38, 0x9c, 0x9b, 0x9a, 0x27, 0x6c,
+    0x02, 0x42, 0x60, 0xd9, 0xfc, 0x77, 0x11, 0xc8, 0x1b, 0x63, 0x37, 0xb5,
+    0x7d, 0xa3, 0xc3, 0x76, 0xd0, 0xcd, 0x74, 0xe1, 0x4c, 0x73, 0x72, 0x7b,
+    0x27, 0x66, 0x56, 0xb9, 0xd8, 0xa4, 0xeb, 0x71, 0x89, 0x6f, 0xf5, 0x89,
+    0xd4, 0xb8, 0x93, 0xe7, 0x11, 0x0f, 0x3b, 0xb9, 0x48, 0xec, 0xe2, 0x91,
+    0xdd, 0x86, 0xc0, 0xb7, 0x46, 0x8a, 0x67, 0x8c, 0x74, 0x69, 0x80, 0xc1,
+    0x2a, 0xa6, 0xb9, 0x5e, 0x2b, 0x0c, 0xbe, 0x43, 0x31, 0xbb, 0x24, 0xa3,
+    0x3a, 0x27, 0x01, 0x53, 0xaa, 0x47, 0x2c, 0x47, 0x31, 0x23, 0x82, 0xca,
+    0x36, 0x5c, 0x5f, 0x35, 0x25, 0x9d, 0x02, 0x57, 0x46, 0xfc, 0x65, 0x95,
+    0xfe, 0x63, 0x6c, 0x76, 0x75, 0x10, 0xa6, 0x9c, 0x1e, 0x8a, 0x17, 0x6b,
+    0x79, 0x49, 0x95, 0x8f, 0x26, 0x97, 0x39, 0x94, 0x97, 0xa2, 0xfc, 0x73,
+    0x64, 0xa1, 0x2c, 0x81, 0x98, 0x29, 0x52, 0x39, 0xc8, 0x26, 0xcb, 0x50,
+    0x82, 0x08, 0x60, 0x77, 0x28, 0x2e, 0xd6, 0x28, 0x65, 0x1f, 0xc0, 0x4c,
+    0x63, 0x9b, 0x43, 0x85, 0x22, 0xa9, 0xde, 0x30, 0x9b, 0x14, 0xb0, 0x86,
+    0xd6, 0xe9, 0x23, 0xc5, 0x51, 0x62, 0x3b, 0xd7, 0x2a, 0x73, 0x3c, 0xb0,
+    0xda, 0xbc, 0x54, 0xa9, 0x41, 0x6a, 0x99, 0xe7, 0x2c, 0x9f, 0xda, 0x1c,
+    0xb3, 0xfb, 0x9b, 0xa0, 0x6b, 0x8a, 0xdb, 0x24, 0x22, 0xd6, 0x8c, 0xad,
+    0xc5, 0x53, 0xc9, 0x82, 0x02, 0xa1, 0x76, 0x56, 0x47, 0x8a, 0xc0, 0x44,
+    0xef, 0x34, 0x56, 0x37, 0x8a, 0xbc, 0xe9, 0x99, 0x1e, 0x01, 0x41, 0xba,
+    0x79, 0x09, 0x4f, 0xa8, 0xf7, 0x7a, 0x30, 0x08, 0x05, 0xd2, 0xd3, 0x2f,
+    0xfc, 0x62, 0xbf, 0x0c, 0xa4, 0x55, 0x4c, 0x33, 0x0c, 0x2b, 0xb7, 0x04,
+    0x2d, 0xb3, 0x51, 0x02, 0xf6, 0x8b, 0x1a, 0x00, 0x62, 0x58, 0x38, 0x65,
+    0x38, 0x1c, 0x74, 0xdd, 0x91, 0x3a, 0xf7, 0x0b, 0x26, 0xcf, 0x09, 0x23,
+    0xd0, 0xc4, 0xcb, 0x97, 0x16, 0x92, 0x22, 0x25, 0x52, 0xa8, 0xf4, 0xb7,
+    0x88, 0xb4, 0xaf, 0xd1, 0x34, 0x1a, 0x9d, 0xf4, 0x15, 0xcf, 0x20, 0x39,
+    0x00, 0xf5, 0xcc, 0xf7, 0xf6, 0x59, 0x88, 0x94, 0x9a, 0x75, 0x58, 0x0d,
+    0x04, 0x96, 0x39, 0x85, 0x31, 0x00, 0x85, 0x4b, 0x21, 0xf4, 0x01, 0x80,
+    0x03, 0x50, 0x2b, 0xb1, 0xba, 0x95, 0xf5, 0x56, 0xa5, 0xd6, 0x7c, 0x7e,
+    0xb5, 0x24, 0x10, 0xeb, 0xa2, 0x88, 0xa6, 0xd0, 0x63, 0x5c, 0xa8, 0xa4,
+    0xf6, 0xd6, 0x96, 0xd0, 0xa0, 0x20, 0xc8, 0x26, 0x93, 0x8d, 0x34, 0x94,
+    0x3c, 0x38, 0x08, 0xc7, 0x9c, 0xc0, 0x07, 0x76, 0x85, 0x33, 0x21, 0x6b,
+    0xc1, 0xb2, 0x9d, 0xa6, 0xc8, 0x12, 0xef, 0xf3, 0x34, 0x0b, 0xaa, 0x8d,
+    0x2e, 0x65, 0x34, 0x4f, 0x09, 0xbd, 0x47, 0x89, 0x4f, 0x5a, 0x3a, 0x41,
+    0x18, 0x71, 0x5b, 0x3c, 0x50, 0x20, 0x67, 0x93, 0x27, 0xf9, 0x18, 0x9f,
+    0x7e, 0x10, 0x85, 0x6b, 0x23, 0x8b, 0xb9, 0xb0, 0xab, 0x4c, 0xa8, 0x5a,
+    0xbf, 0x4b, 0x21, 0xf5, 0xc7, 0x6b, 0xcc, 0xd7, 0x18, 0x50, 0xb2, 0x2e,
+    0x04, 0x59, 0x28, 0x27, 0x6a, 0x0f, 0x2e, 0x95, 0x1d, 0xb0, 0x70, 0x7c,
+    0x6a, 0x11, 0x6d, 0xc1, 0x91, 0x13, 0xfa, 0x76, 0x2d, 0xc5, 0xf2, 0x0b,
+    0xd5, 0xd2, 0xab, 0x5b, 0xe7, 0x17, 0x44, 0xdc, 0x9c, 0xbd, 0xb5, 0x1e,
+    0xa7, 0x57, 0x96, 0x3a, 0xac, 0x56, 0xa9, 0x0a, 0x0d, 0x80, 0x23, 0xbe,
+    0xd1, 0xf5, 0xca, 0xe8, 0xa6, 0x4d, 0xa0, 0x47, 0x27, 0x9b, 0x35, 0x3a,
+    0x09, 0x6a, 0x83, 0x5b, 0x0b, 0x2b, 0x02, 0x3b, 0x6a, 0xa0, 0x48, 0x98,
+    0x92, 0x33, 0x07, 0x9a, 0xeb, 0x46, 0x7e, 0x52, 0x2f, 0xa2, 0x7a, 0x58,
+    0x22, 0x92, 0x1e, 0x5c, 0x55, 0x1b, 0x4f, 0x53, 0x75, 0x36, 0xe4, 0x6f,
+    0x3a, 0x6a, 0x97, 0xe7, 0x2c, 0x3b, 0x06, 0x31, 0x04, 0xe0, 0x9a, 0x04,
+    0x05, 0x98, 0x94, 0x0d, 0x87, 0x2f, 0x6d, 0x87, 0x1f, 0x5e, 0xf9, 0xb4,
+    0x35, 0x50, 0x73, 0xb5, 0x47, 0x69, 0xe4, 0x54, 0x54, 0xe6, 0xa0, 0x81,
+    0x95, 0x99, 0x40, 0x86, 0x21, 0xab, 0x44, 0x13, 0xb3, 0x55, 0x07, 0xb0,
+    0xdf, 0x57, 0x8c, 0xe2, 0xd5, 0x11, 0xd5, 0x20, 0x58, 0xd5, 0x74, 0x9d,
+    0xf3, 0x8b, 0x29, 0xd6, 0xcc, 0x58, 0x87, 0x0c, 0xaf, 0x92, 0xf6, 0x9a,
+    0x75, 0x16, 0x14, 0x06, 0xe7, 0x1c, 0x5f, 0xf9, 0x24, 0x51, 0xa7, 0x75,
+    0x22, 0xb8, 0xb2, 0x96, 0x7a, 0x2d, 0x58, 0xa4, 0x9a, 0x81, 0x66, 0x1a,
+    0xa6, 0x5a, 0xc0, 0x9b, 0x08, 0xc9, 0xfe, 0x45, 0xab, 0xc3, 0x85, 0x1f,
+    0x99, 0xc7, 0x30, 0xc4, 0x50, 0x03, 0xac, 0xa2, 0xbf, 0x0f, 0x84, 0x24,
+    0xa1, 0x9b, 0x74, 0x08, 0xa5, 0x37, 0xd5, 0x41, 0xc1, 0x6f, 0x56, 0x82,
+    0xbf, 0xe3, 0xa7, 0xfa, 0xea, 0x56, 0x4f, 0x12, 0x98, 0x61, 0x1a, 0x7f,
+    0x5f, 0x60, 0x92, 0x2b, 0xa1, 0x9d, 0xe7, 0x3b, 0x19, 0x17, 0xf1, 0x85,
+    0x32, 0x73, 0x55, 0x51, 0x99, 0xa6, 0x49, 0x31, 0x8b, 0x50, 0x77, 0x33,
+    0x45, 0xc9, 0x97, 0x46, 0x08, 0x56, 0x97, 0x2a, 0xcb, 0x43, 0xfc, 0x81,
+    0xab, 0x63, 0x21, 0xb1, 0xc3, 0x3c, 0x2b, 0xb5, 0x09, 0x8b, 0xd4, 0x89,
+    0xd6, 0x96, 0xa0, 0xf7, 0x06, 0x79, 0xc1, 0x21, 0x38, 0x73, 0xd0, 0x8b,
+    0xda, 0xd4, 0x28, 0x44, 0x92, 0x72, 0x16, 0x04, 0x72, 0x05, 0x63, 0x32,
+    0x12, 0x31, 0x0e, 0xe9, 0xa0, 0x6c, 0xb1, 0x00, 0x16, 0xc8, 0x05, 0x50,
+    0x3c, 0x34, 0x1a, 0x36, 0xd8, 0x7e, 0x56, 0x07, 0x2e, 0xab, 0xe2, 0x37,
+    0x31, 0xe3, 0x4a, 0xf7, 0xe2, 0x32, 0x8f, 0x85, 0xcd, 0xb3, 0x70, 0xcc,
+    0xaf, 0x00, 0x51, 0x5b, 0x64, 0xc9, 0xc5, 0x4b, 0xc8, 0x37, 0x57, 0x84,
+    0x47, 0xaa, 0xcf, 0xae, 0xd5, 0x96, 0x9a, 0xa3, 0x51, 0xe7, 0xda, 0x4e,
+    0xfa, 0x7b, 0x11, 0x5c, 0x4c, 0x51, 0xf4, 0xa6, 0x99, 0x77, 0x98, 0x50,
+    0x29, 0x5c, 0xa7, 0x2d, 0x78, 0x1a, 0xd4, 0x1b, 0xc6, 0x80, 0x53, 0x2b,
+    0x89, 0xe7, 0x10, 0xe2, 0x18, 0x9e, 0xb3, 0xc5, 0x08, 0x17, 0xba, 0x25,
+    0x5c, 0x74, 0x74, 0xc9, 0x5c, 0xa9, 0x11, 0x0c, 0xc4, 0x3b, 0x8b, 0xa8,
+    0xe6, 0x82, 0xc7, 0xfb, 0x7b, 0x0f, 0xdc, 0x26, 0x5c, 0x04, 0x83, 0xa6,
+    0x5c, 0xa4, 0x51, 0x4e, 0xe4, 0xb8, 0x32, 0xaa, 0xc5, 0x80, 0x0c, 0x3b,
+    0x08, 0xe7, 0x4f, 0x56, 0x39, 0x51, 0xc1, 0xfb, 0xb2, 0x10, 0x35, 0x3e,
+    0xfa, 0x1a, 0xa8, 0x66, 0x85, 0x6b, 0xc1, 0xe0, 0x34, 0x73, 0x3b, 0x04,
+    0x85, 0xda, 0xb1, 0xd0, 0x20, 0xc6, 0xbf, 0x76, 0x5f, 0xf6, 0x0b, 0x3b,
+    0x80, 0x19, 0x84, 0xa9, 0x0c, 0x2f, 0xe9, 0x70, 0xbf, 0x1d, 0xe9, 0x70,
+    0x04, 0xa6, 0xcf, 0x44, 0xb4, 0x98, 0x4a, 0xb5, 0x82, 0x58, 0xb4, 0xaf,
+    0x71, 0x22, 0x1c, 0xd1, 0x75, 0x30, 0xa7, 0x00, 0xc3, 0x29, 0x59, 0xc9,
+    0x43, 0x63, 0x44, 0xb5, 0x31, 0x6f, 0x09, 0xcc, 0xca, 0x70, 0x29, 0xa2,
+    0x30, 0xd6, 0x39, 0xdc, 0xb0, 0x22, 0xd8, 0xba, 0x79, 0xba, 0x91, 0xcd,
+    0x6a, 0xb1, 0x2a, 0xe1, 0x57, 0x9c, 0x50, 0xc7, 0xbb, 0x10, 0xe3, 0x03,
+    0x01, 0xa6, 0x5c, 0xae, 0x31, 0x01, 0xd4, 0x0c, 0x7b, 0xa9, 0x27, 0xbb,
+    0x55, 0x31, 0x48, 0xd1, 0x64, 0x70, 0x24, 0xd4, 0xa0, 0x6c, 0x81, 0x66,
+    0xd0, 0xb0, 0xb8, 0x12, 0x69, 0xb7, 0xd5, 0xf4, 0xb3, 0x4f, 0xb0, 0x22,
+    0xf6, 0x91, 0x52, 0xf5, 0x14, 0x00, 0x4a, 0x7c, 0x68, 0x53, 0x68, 0x55,
+    0x23, 0x43, 0xbb, 0x60, 0x36, 0x0f, 0xbb, 0x99, 0x45, 0xed, 0xf4, 0x46,
+    0xd3, 0x45, 0xbd, 0xca, 0xa7, 0x45, 0x5c, 0x74, 0xba, 0x0a, 0x55, 0x1e,
+    0x18, 0x46, 0x20, 0xfe, 0xf9, 0x76, 0x88, 0x77, 0x3d, 0x50, 0xb6, 0x43,
+    0x3c, 0xa7, 0xa7, 0xac, 0x5c, 0xb6, 0xb7, 0xf6, 0x71, 0xa1, 0x53, 0x76,
+    0xe5, 0xa6, 0x74, 0x7a, 0x62, 0x3f, 0xa7, 0xbc, 0x66, 0x30, 0x37, 0x3f,
+    0x5b, 0x1b, 0x51, 0x26, 0x90, 0xa6, 0x61, 0x37, 0x78, 0x70, 0xa6, 0x0a,
+    0x7a, 0x18, 0x96, 0x83, 0xf9, 0xb0, 0xcf, 0x04, 0x66, 0xe1, 0xf7, 0x50,
+    0x76, 0x26, 0x31, 0xc4, 0xab, 0x09, 0xf5, 0x05, 0xc4, 0x2d, 0xd2, 0x86,
+    0x33, 0x56, 0x94, 0x72, 0x73, 0x54, 0x42, 0x85, 0x1e, 0x32, 0x16, 0x16,
+    0xd4, 0x00, 0x98, 0x10, 0x77, 0x7b, 0x6b, 0xd4, 0x6f, 0xa7, 0x22, 0x44,
+    0x61, 0xa5, 0xcc, 0x27, 0x40, 0x5d, 0xfb, 0xac, 0x0d, 0x39, 0xb0, 0x02,
+    0xca, 0xb3, 0x34, 0x33, 0xf2, 0xa8, 0x6e, 0xb8, 0xce, 0x91, 0xc1, 0x34,
+    0xa6, 0x38, 0x6f, 0x86, 0x0a, 0x19, 0x94, 0xeb, 0x4b, 0x68, 0x75, 0xa4,
+    0x6d, 0x19, 0x55, 0x81, 0xd1, 0x73, 0x85, 0x4b, 0x53, 0xd2, 0x29, 0x3d,
+    0xf3, 0xe9, 0xa8, 0x22, 0x75, 0x6c, 0xd8, 0xf2, 0x12, 0xb3, 0x25, 0xca,
+    0x29, 0xb4, 0xf9, 0xf8, 0xcf, 0xba, 0xdf, 0x2e, 0x41, 0x86, 0x9a, 0xbf,
+    0xba, 0xd1, 0x07, 0x38, 0xad, 0x04, 0xcc, 0x75, 0x2b, 0xc2, 0x0c, 0x39,
+    0x47, 0x46, 0x85, 0x0e, 0x0c, 0x48, 0x47, 0xdb
 };
 #endif
 
@@ -2894,74 +3073,62 @@ static struct keys_st {
     const uint8_t *pub;
     /* If "name" is non-NULL, create via non-legacy _ex() API */
     char *name;
-    int  privlen;
-    int  publen;
+    int privlen;
+    int publen;
 } keys[] = {
-    {
-        EVP_PKEY_HMAC,
+    { EVP_PKEY_HMAC,
         (const uint8_t *)"0123456789",
         NULL,
-        NULL, 10, 0
-    },
-    {
-        EVP_PKEY_HMAC, (const uint8_t *)"", NULL,
+        NULL, 10, 0 },
+    { EVP_PKEY_HMAC, (const uint8_t *)"", NULL,
         NULL, 0, 0
 #ifndef OPENSSL_NO_POLY1305
-    }, {
-        EVP_PKEY_POLY1305,
+    },
+    { EVP_PKEY_POLY1305,
         (const uint8_t *)"01234567890123456789012345678901",
         NULL,
         NULL, 32, 0
 #endif
 #ifndef OPENSSL_NO_SIPHASH
-    }, {
-        EVP_PKEY_SIPHASH,
+    },
+    { EVP_PKEY_SIPHASH,
         (const uint8_t *)"0123456789012345",
         NULL,
         NULL, 16, 0
 #endif
     },
 #ifndef OPENSSL_NO_ECX
-    {
-        EVP_PKEY_X25519,
+    { EVP_PKEY_X25519,
         (const uint8_t *)"01234567890123456789012345678901",
         (const unsigned char *)"abcdefghijklmnopqrstuvwxyzabcdef",
-        NULL, 32, 32
-    }, {
-        EVP_PKEY_ED25519,
+        NULL, 32, 32 },
+    { EVP_PKEY_ED25519,
         (const uint8_t *)"01234567890123456789012345678901",
         (const uint8_t *)"abcdefghijklmnopqrstuvwxyzabcdef",
-        NULL, 32, 32
-    }, {
-        EVP_PKEY_X448,
+        NULL, 32, 32 },
+    { EVP_PKEY_X448,
         (const uint8_t *)"01234567890123456789012345678901234567890123456789012345",
         (const uint8_t *)"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd",
-        NULL, 56, 56
-    }, {
-        EVP_PKEY_ED448,
+        NULL, 56, 56 },
+    { EVP_PKEY_ED448,
         (const uint8_t *)"012345678901234567890123456789012345678901234567890123456",
         (const uint8_t *)"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcde",
-        NULL, 57, 57
-    },
+        NULL, 57, 57 },
 #endif
 #ifndef OPENSSL_NO_ML_KEM
-    {
-        NID_undef, ml_kem_seed, ml_kem_512_pubkey,
-        "ML-KEM-512", ML_KEM_SEED_BYTES, sizeof(ml_kem_512_pubkey)
-    }, {
-        NID_undef, ml_kem_seed, ml_kem_768_pubkey,
-        "ML-KEM-768", ML_KEM_SEED_BYTES, sizeof(ml_kem_768_pubkey)
-    }, {
-        NID_undef, ml_kem_seed, ml_kem_1024_pubkey,
-        "ML-KEM-1024", ML_KEM_SEED_BYTES, sizeof(ml_kem_1024_pubkey)
-    },
+    { NID_undef, ml_kem_seed, ml_kem_512_pubkey,
+        "ML-KEM-512", ML_KEM_SEED_BYTES, sizeof(ml_kem_512_pubkey) },
+    { NID_undef, ml_kem_seed, ml_kem_768_pubkey,
+        "ML-KEM-768", ML_KEM_SEED_BYTES, sizeof(ml_kem_768_pubkey) },
+    { NID_undef, ml_kem_seed, ml_kem_1024_pubkey,
+        "ML-KEM-1024", ML_KEM_SEED_BYTES, sizeof(ml_kem_1024_pubkey) },
 #endif
 };
 
 #ifndef OPENSSL_NO_ML_KEM
 static int
 ml_kem_seed_to_priv(const char *alg, const unsigned char *seed, int seedlen,
-                    unsigned char **ret, size_t *retlen)
+    unsigned char **ret, size_t *retlen)
 {
     OSSL_PARAM parr[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
     EVP_PKEY_CTX *ctx = NULL;
@@ -2991,7 +3158,7 @@ ml_kem_seed_to_priv(const char *alg, const unsigned char *seed, int seedlen,
         goto done;
     ok = 1;
 
-  done:
+done:
     EVP_PKEY_free(pkey);
     OSSL_PARAM_free(params);
     EVP_PKEY_CTX_free(ctx);
@@ -3014,7 +3181,7 @@ static int test_set_get_raw_keys_int(int tst, int pub, int uselibctx)
     if (pub && keys[tst].pub == NULL)
         return 1;
 
-    name  = keys[tst].name ? keys[tst].name : OBJ_nid2sn(keys[tst].type);
+    name = keys[tst].name ? keys[tst].name : OBJ_nid2sn(keys[tst].type);
 
     if (pub) {
 #ifndef OPENSSL_NO_EC
@@ -3022,16 +3189,16 @@ static int test_set_get_raw_keys_int(int tst, int pub, int uselibctx)
         in = keys[tst].pub;
         if (uselibctx || keys[tst].name != NULL) {
             pkey = EVP_PKEY_new_raw_public_key_ex(
-                        testctx,
-                        name,
-                        NULL,
-                        in,
-                        inlen);
+                testctx,
+                name,
+                NULL,
+                in,
+                inlen);
         } else {
             pkey = EVP_PKEY_new_raw_public_key(keys[tst].type,
-                                               NULL,
-                                               in,
-                                               inlen);
+                NULL,
+                in,
+                inlen);
         }
 #else
         return 1;
@@ -3042,52 +3209,50 @@ static int test_set_get_raw_keys_int(int tst, int pub, int uselibctx)
 #ifndef OPENSSL_NO_ML_KEM
         if (in == ml_kem_seed) {
             if (!TEST_true(ml_kem_seed_to_priv(name, in, inlen,
-                                               &privalloc, &inlen)))
+                    &privalloc, &inlen)))
                 goto done;
             in = privalloc;
         }
 #endif
         if (uselibctx || keys[tst].name != NULL) {
             pkey = EVP_PKEY_new_raw_private_key_ex(
-                        testctx,
-                        name,
-                        NULL,
-                        in,
-                        inlen);
+                testctx,
+                name,
+                NULL,
+                in,
+                inlen);
         } else {
             pkey = EVP_PKEY_new_raw_private_key(keys[tst].type,
-                                                NULL,
-                                                in,
-                                                inlen);
+                NULL,
+                in,
+                inlen);
         }
     }
 
     if (!TEST_ptr(pkey)
-            || !TEST_int_eq(EVP_PKEY_eq(pkey, pkey), 1)
-            || (!pub && !TEST_true(EVP_PKEY_get_raw_private_key(pkey, NULL, &len)))
-            || (pub && !TEST_true(EVP_PKEY_get_raw_public_key(pkey, NULL, &len)))
-            || !TEST_true(len == inlen))
+        || !TEST_int_eq(EVP_PKEY_eq(pkey, pkey), 1)
+        || (!pub && !TEST_true(EVP_PKEY_get_raw_private_key(pkey, NULL, &len)))
+        || (pub && !TEST_true(EVP_PKEY_get_raw_public_key(pkey, NULL, &len)))
+        || !TEST_true(len == inlen))
         goto done;
     if (tst != 1) {
         /*
          * Test that supplying a buffer that is too small fails. Doesn't apply
          * to HMAC with a zero length key
          */
-        if ((!pub && !TEST_false(EVP_PKEY_get_raw_private_key(pkey, shortbuf,
-                                                                 &shortlen)))
-                || (pub && !TEST_false(EVP_PKEY_get_raw_public_key(pkey, shortbuf,
-                                                                   &shortlen))))
+        if ((!pub && !TEST_false(EVP_PKEY_get_raw_private_key(pkey, shortbuf, &shortlen)))
+            || (pub && !TEST_false(EVP_PKEY_get_raw_public_key(pkey, shortbuf, &shortlen))))
             goto done;
     }
     if (!TEST_ptr(buf = OPENSSL_zalloc(len <= 80 ? 80 : len)))
         goto done;
     if ((!pub && !TEST_true(EVP_PKEY_get_raw_private_key(pkey, buf, &len)))
-            || (pub && !TEST_true(EVP_PKEY_get_raw_public_key(pkey, buf, &len)))
-            || !TEST_mem_eq(in, inlen, buf, len))
+        || (pub && !TEST_true(EVP_PKEY_get_raw_public_key(pkey, buf, &len)))
+        || !TEST_mem_eq(in, inlen, buf, len))
         goto done;
 
     ret = 1;
- done:
+done:
     OPENSSL_free(privalloc);
     OPENSSL_free(buf);
     EVP_PKEY_free(pkey);
@@ -3097,9 +3262,9 @@ static int test_set_get_raw_keys_int(int tst, int pub, int uselibctx)
 static int test_set_get_raw_keys(int tst)
 {
     return (nullprov != NULL || test_set_get_raw_keys_int(tst, 0, 0))
-           && test_set_get_raw_keys_int(tst, 0, 1)
-           && (nullprov != NULL || test_set_get_raw_keys_int(tst, 1, 0))
-           && test_set_get_raw_keys_int(tst, 1, 1);
+        && test_set_get_raw_keys_int(tst, 0, 1)
+        && (nullprov != NULL || test_set_get_raw_keys_int(tst, 1, 0))
+        && test_set_get_raw_keys_int(tst, 1, 1);
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -3176,7 +3341,7 @@ static int test_EVP_PKEY_check(int i)
 
     ret = 1;
 
- done:
+done:
     EVP_PKEY_CTX_free(ctx);
 #ifndef OPENSSL_NO_DEPRECATED_3_0
     EVP_PKEY_CTX_free(ctx2);
@@ -3194,11 +3359,11 @@ static int get_cmac_val(EVP_PKEY *pkey, unsigned char *mac)
     int ret = 1;
 
     if (!TEST_ptr(mdctx)
-            || !TEST_true(EVP_DigestSignInit_ex(mdctx, NULL, NULL, testctx,
-                                                testpropq, pkey, NULL))
-            || !TEST_true(EVP_DigestSignUpdate(mdctx, msg, sizeof(msg)))
-            || !TEST_true(EVP_DigestSignFinal(mdctx, mac, &maclen))
-            || !TEST_size_t_eq(maclen, AES_BLOCK_SIZE))
+        || !TEST_true(EVP_DigestSignInit_ex(mdctx, NULL, NULL, testctx,
+            testpropq, pkey, NULL))
+        || !TEST_true(EVP_DigestSignUpdate(mdctx, msg, sizeof(msg)))
+        || !TEST_true(EVP_DigestSignFinal(mdctx, mac, &maclen))
+        || !TEST_size_t_eq(maclen, AES_BLOCK_SIZE))
         ret = 0;
 
     EVP_MD_CTX_free(mdctx);
@@ -3216,9 +3381,9 @@ static int test_CMAC_keygen(void)
     int ret = 0;
     EVP_PKEY *pkey = NULL;
     unsigned char mac[AES_BLOCK_SIZE];
-# if !defined(OPENSSL_NO_DEPRECATED_3_0)
+#if !defined(OPENSSL_NO_DEPRECATED_3_0)
     unsigned char mac2[AES_BLOCK_SIZE];
-# endif
+#endif
 
     if (nullprov != NULL)
         return TEST_skip("Test does not support a non-default library context");
@@ -3231,18 +3396,20 @@ static int test_CMAC_keygen(void)
 
     /* Test a CMAC key created using the "generated" method */
     if (!TEST_int_gt(EVP_PKEY_keygen_init(kctx), 0)
-            || !TEST_int_gt(EVP_PKEY_CTX_ctrl(kctx, -1, EVP_PKEY_OP_KEYGEN,
-                                            EVP_PKEY_CTRL_CIPHER,
-                                            0, (void *)EVP_aes_256_cbc()), 0)
-            || !TEST_int_gt(EVP_PKEY_CTX_ctrl(kctx, -1, EVP_PKEY_OP_KEYGEN,
-                                            EVP_PKEY_CTRL_SET_MAC_KEY,
-                                            sizeof(key), (void *)key), 0)
-            || !TEST_int_gt(EVP_PKEY_keygen(kctx, &pkey), 0)
-            || !TEST_ptr(pkey)
-            || !TEST_true(get_cmac_val(pkey, mac)))
+        || !TEST_int_gt(EVP_PKEY_CTX_ctrl(kctx, -1, EVP_PKEY_OP_KEYGEN,
+                            EVP_PKEY_CTRL_CIPHER,
+                            0, (void *)EVP_aes_256_cbc()),
+            0)
+        || !TEST_int_gt(EVP_PKEY_CTX_ctrl(kctx, -1, EVP_PKEY_OP_KEYGEN,
+                            EVP_PKEY_CTRL_SET_MAC_KEY,
+                            sizeof(key), (void *)key),
+            0)
+        || !TEST_int_gt(EVP_PKEY_keygen(kctx, &pkey), 0)
+        || !TEST_ptr(pkey)
+        || !TEST_true(get_cmac_val(pkey, mac)))
         goto done;
 
-# if !defined(OPENSSL_NO_DEPRECATED_3_0)
+#if !defined(OPENSSL_NO_DEPRECATED_3_0)
     EVP_PKEY_free(pkey);
 
     /*
@@ -3251,14 +3418,14 @@ static int test_CMAC_keygen(void)
      */
     pkey = EVP_PKEY_new_CMAC_key(NULL, key, sizeof(key), EVP_aes_256_cbc());
     if (!TEST_ptr(pkey)
-            || !TEST_true(get_cmac_val(pkey, mac2))
-            || !TEST_mem_eq(mac, sizeof(mac), mac2, sizeof(mac2)))
+        || !TEST_true(get_cmac_val(pkey, mac2))
+        || !TEST_mem_eq(mac, sizeof(mac), mac2, sizeof(mac2)))
         goto done;
-# endif
+#endif
 
     ret = 1;
 
- done:
+done:
     EVP_PKEY_free(pkey);
     EVP_PKEY_CTX_free(kctx);
     return ret;
@@ -3289,21 +3456,24 @@ static int test_HKDF(void)
         memset(out, 0, outlen);
 
         if (!TEST_int_gt(EVP_PKEY_derive_init(pctx), 0)
-                || !TEST_int_gt(EVP_PKEY_CTX_set_hkdf_md(pctx, EVP_sha256()), 0)
-                || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_salt(pctx, salt,
-                                                            sizeof(salt) - 1), 0)
-                || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_key(pctx, key,
-                                                           sizeof(key) - 1), 0)
-                || !TEST_int_gt(EVP_PKEY_CTX_add1_hkdf_info(pctx, info,
-                                                            sizeof(info) - 1), 0)
-                || !TEST_int_gt(EVP_PKEY_derive(pctx, out, &outlen), 0)
-                || !TEST_mem_eq(out, outlen, expected, expectedlen))
+            || !TEST_int_gt(EVP_PKEY_CTX_set_hkdf_md(pctx, EVP_sha256()), 0)
+            || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_salt(pctx, salt,
+                                sizeof(salt) - 1),
+                0)
+            || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_key(pctx, key,
+                                sizeof(key) - 1),
+                0)
+            || !TEST_int_gt(EVP_PKEY_CTX_add1_hkdf_info(pctx, info,
+                                sizeof(info) - 1),
+                0)
+            || !TEST_int_gt(EVP_PKEY_derive(pctx, out, &outlen), 0)
+            || !TEST_mem_eq(out, outlen, expected, expectedlen))
             goto done;
     }
 
     ret = 1;
 
- done:
+done:
     EVP_PKEY_CTX_free(pctx);
 
     return ret;
@@ -3331,20 +3501,23 @@ static int test_emptyikm_HKDF(void)
     memset(out, 0, outlen);
 
     if (!TEST_int_gt(EVP_PKEY_derive_init(pctx), 0)
-            || !TEST_int_gt(EVP_PKEY_CTX_set_hkdf_md(pctx, EVP_sha256()), 0)
-            || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_salt(pctx, salt,
-                                                        sizeof(salt) - 1), 0)
-            || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_key(pctx, key,
-                                                       sizeof(key) - 1), 0)
-            || !TEST_int_gt(EVP_PKEY_CTX_add1_hkdf_info(pctx, info,
-                                                        sizeof(info) - 1), 0)
-            || !TEST_int_gt(EVP_PKEY_derive(pctx, out, &outlen), 0)
-            || !TEST_mem_eq(out, outlen, expected, expectedlen))
+        || !TEST_int_gt(EVP_PKEY_CTX_set_hkdf_md(pctx, EVP_sha256()), 0)
+        || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_salt(pctx, salt,
+                            sizeof(salt) - 1),
+            0)
+        || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_key(pctx, key,
+                            sizeof(key) - 1),
+            0)
+        || !TEST_int_gt(EVP_PKEY_CTX_add1_hkdf_info(pctx, info,
+                            sizeof(info) - 1),
+            0)
+        || !TEST_int_gt(EVP_PKEY_derive(pctx, out, &outlen), 0)
+        || !TEST_mem_eq(out, outlen, expected, expectedlen))
         goto done;
 
     ret = 1;
 
- done:
+done:
     EVP_PKEY_CTX_free(pctx);
 
     return ret;
@@ -3357,11 +3530,12 @@ static int test_empty_salt_info_HKDF(void)
     size_t outlen;
     int ret = 0;
     unsigned char salt[] = "";
+    unsigned char fake[] = "0123456789";
     unsigned char key[] = "012345678901234567890123456789";
     unsigned char info[] = "";
     const unsigned char expected[] = {
-	0x67, 0x12, 0xf9, 0x27, 0x8a, 0x8a, 0x3a, 0x8f, 0x7d, 0x2c, 0xa3, 0x6a,
-	0xaa, 0xe9, 0xb3, 0xb9, 0x52, 0x5f, 0xe0, 0x06,
+        0x67, 0x12, 0xf9, 0x27, 0x8a, 0x8a, 0x3a, 0x8f, 0x7d, 0x2c, 0xa3, 0x6a,
+        0xaa, 0xe9, 0xb3, 0xb9, 0x52, 0x5f, 0xe0, 0x06
     };
     size_t expectedlen = sizeof(expected);
 
@@ -3372,20 +3546,26 @@ static int test_empty_salt_info_HKDF(void)
     memset(out, 0, outlen);
 
     if (!TEST_int_gt(EVP_PKEY_derive_init(pctx), 0)
-            || !TEST_int_gt(EVP_PKEY_CTX_set_hkdf_md(pctx, EVP_sha256()), 0)
-            || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_salt(pctx, salt,
-                                                        sizeof(salt) - 1), 0)
-            || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_key(pctx, key,
-                                                       sizeof(key) - 1), 0)
-            || !TEST_int_gt(EVP_PKEY_CTX_add1_hkdf_info(pctx, info,
-                                                        sizeof(info) - 1), 0)
-            || !TEST_int_gt(EVP_PKEY_derive(pctx, out, &outlen), 0)
-            || !TEST_mem_eq(out, outlen, expected, expectedlen))
+        || !TEST_int_gt(EVP_PKEY_CTX_set_hkdf_md(pctx, EVP_sha256()), 0)
+        || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_salt(pctx, fake,
+                            sizeof(fake) - 1),
+            0)
+        || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_salt(pctx, salt,
+                            sizeof(salt) - 1),
+            0)
+        || !TEST_int_gt(EVP_PKEY_CTX_set1_hkdf_key(pctx, key,
+                            sizeof(key) - 1),
+            0)
+        || !TEST_int_gt(EVP_PKEY_CTX_add1_hkdf_info(pctx, info,
+                            sizeof(info) - 1),
+            0)
+        || !TEST_int_gt(EVP_PKEY_derive(pctx, out, &outlen), 0)
+        || !TEST_mem_eq(out, outlen, expected, expectedlen))
         goto done;
 
     ret = 1;
 
- done:
+done:
     EVP_PKEY_CTX_free(pctx);
 
     return ret;
@@ -3418,7 +3598,7 @@ static int test_X509_PUBKEY_inplace(void)
 
     ret = 1;
 
- done:
+done:
     X509_PUBKEY_free(xp);
     return ret;
 }
@@ -3432,14 +3612,14 @@ static int test_X509_PUBKEY_dup(void)
 
     xp = X509_PUBKEY_new_ex(testctx, testpropq);
     if (!TEST_ptr(xp)
-            || !TEST_ptr(d2i_X509_PUBKEY(&xp, &p, input_len))
-            || !TEST_ptr(xq = X509_PUBKEY_dup(xp))
-            || !TEST_ptr_ne(xp, xq))
+        || !TEST_ptr(d2i_X509_PUBKEY(&xp, &p, input_len))
+        || !TEST_ptr(xq = X509_PUBKEY_dup(xp))
+        || !TEST_ptr_ne(xp, xq))
         goto done;
 
     if (!TEST_ptr(X509_PUBKEY_get0(xq))
-            || !TEST_ptr(X509_PUBKEY_get0(xp))
-            || !TEST_ptr_ne(X509_PUBKEY_get0(xq), X509_PUBKEY_get0(xp)))
+        || !TEST_ptr(X509_PUBKEY_get0(xp))
+        || !TEST_ptr_ne(X509_PUBKEY_get0(xq), X509_PUBKEY_get0(xp)))
         goto done;
 
     X509_PUBKEY_free(xq);
@@ -3448,7 +3628,7 @@ static int test_X509_PUBKEY_dup(void)
     input_len = sizeof(kExampleBadECPubKeyDER);
 
     if (!TEST_ptr(xp = d2i_X509_PUBKEY(&xp, &p, input_len))
-            || !TEST_ptr(xq = X509_PUBKEY_dup(xp)))
+        || !TEST_ptr(xq = X509_PUBKEY_dup(xp)))
         goto done;
 
     X509_PUBKEY_free(xp);
@@ -3458,7 +3638,7 @@ static int test_X509_PUBKEY_dup(void)
 
     ret = 1;
 
- done:
+done:
     X509_PUBKEY_free(xp);
     X509_PUBKEY_free(xq);
     return ret;
@@ -3480,7 +3660,7 @@ static int test_EVP_PKEY_CTX_get_set_params(EVP_PKEY *pkey)
     /* Initialise a sign operation */
     ctx = EVP_PKEY_CTX_new_from_pkey(testctx, pkey, testpropq);
     if (!TEST_ptr(ctx)
-            || !TEST_int_gt(EVP_PKEY_sign_init(ctx), 0))
+        || !TEST_int_gt(EVP_PKEY_sign_init(ctx), 0))
         goto err;
 
     /*
@@ -3489,15 +3669,15 @@ static int test_EVP_PKEY_CTX_get_set_params(EVP_PKEY *pkey)
     params = EVP_PKEY_CTX_settable_params(ctx);
     if (!TEST_ptr(params)
         || !TEST_ptr(OSSL_PARAM_locate_const(params,
-                                             OSSL_SIGNATURE_PARAM_DIGEST)))
+            OSSL_SIGNATURE_PARAM_DIGEST)))
         goto err;
 
     params = EVP_PKEY_CTX_gettable_params(ctx);
     if (!TEST_ptr(params)
         || !TEST_ptr(OSSL_PARAM_locate_const(params,
-                                             OSSL_SIGNATURE_PARAM_ALGORITHM_ID))
+            OSSL_SIGNATURE_PARAM_ALGORITHM_ID))
         || !TEST_ptr(OSSL_PARAM_locate_const(params,
-                                             OSSL_SIGNATURE_PARAM_DIGEST)))
+            OSSL_SIGNATURE_PARAM_DIGEST)))
         goto err;
 
     /*
@@ -3507,7 +3687,7 @@ static int test_EVP_PKEY_CTX_get_set_params(EVP_PKEY *pkey)
     strcpy(mdname, "SHA512");
     param_md = param;
     *param++ = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_DIGEST,
-                                                mdname, 0);
+        mdname, 0);
     *param++ = OSSL_PARAM_construct_end();
 
     if (!TEST_true(EVP_PKEY_CTX_set_params(ctx, ourparams)))
@@ -3515,9 +3695,9 @@ static int test_EVP_PKEY_CTX_get_set_params(EVP_PKEY *pkey)
 
     mdname[0] = '\0';
     *param_md = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_DIGEST,
-                                                 mdname, sizeof(mdname));
+        mdname, sizeof(mdname));
     if (!TEST_true(EVP_PKEY_CTX_get_params(ctx, ourparams))
-            || !TEST_str_eq(mdname, "SHA512"))
+        || !TEST_str_eq(mdname, "SHA512"))
         goto err;
 
     /*
@@ -3525,8 +3705,8 @@ static int test_EVP_PKEY_CTX_get_set_params(EVP_PKEY *pkey)
      * TEST_PKEY_CTX_get_signature_md() functions
      */
     if (!TEST_int_gt(EVP_PKEY_CTX_set_signature_md(ctx, EVP_sha256()), 0)
-            || !TEST_int_gt(EVP_PKEY_CTX_get_signature_md(ctx, &md), 0)
-            || !TEST_ptr_eq(md, EVP_sha256()))
+        || !TEST_int_gt(EVP_PKEY_CTX_get_signature_md(ctx, &md), 0)
+        || !TEST_ptr_eq(md, EVP_sha256()))
         goto err;
 
     /*
@@ -3535,7 +3715,7 @@ static int test_EVP_PKEY_CTX_get_set_params(EVP_PKEY *pkey)
     mdctx = EVP_MD_CTX_new();
     if (!TEST_ptr(mdctx)
         || !TEST_true(EVP_DigestSignInit_ex(mdctx, NULL, "SHA1", testctx, testpropq,
-                                            pkey, NULL)))
+            pkey, NULL)))
         goto err;
 
     /*
@@ -3544,15 +3724,15 @@ static int test_EVP_PKEY_CTX_get_set_params(EVP_PKEY *pkey)
      */
     params = EVP_MD_CTX_settable_params(mdctx);
     if (!TEST_ptr(params)
-            || !TEST_int_eq(strcmp(params[0].key, OSSL_DIGEST_PARAM_SSL3_MS), 0)
-               /* The final key should be NULL */
-            || !TEST_ptr_null(params[1].key))
+        || !TEST_int_eq(strcmp(params[0].key, OSSL_DIGEST_PARAM_SSL3_MS), 0)
+        /* The final key should be NULL */
+        || !TEST_ptr_null(params[1].key))
         goto err;
 
     param = ourparams;
     memset(ssl3ms, 0, sizeof(ssl3ms));
     *param++ = OSSL_PARAM_construct_octet_string(OSSL_DIGEST_PARAM_SSL3_MS,
-                                                 ssl3ms, sizeof(ssl3ms));
+        ssl3ms, sizeof(ssl3ms));
     *param++ = OSSL_PARAM_construct_end();
 
     if (!TEST_true(EVP_MD_CTX_set_params(mdctx, ourparams)))
@@ -3560,7 +3740,7 @@ static int test_EVP_PKEY_CTX_get_set_params(EVP_PKEY *pkey)
 
     ret = 1;
 
- err:
+err:
     EVP_MD_CTX_free(mdctx);
     EVP_PKEY_CTX_free(ctx);
 
@@ -3593,16 +3773,17 @@ static int test_DSA_get_set_params(void)
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_Q, q))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_G, g))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PUB_KEY,
-                                             pub))
+            pub))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY,
-                                             priv)))
+            priv)))
         goto err;
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld)))
         goto err;
 
     if (!TEST_int_gt(EVP_PKEY_fromdata_init(pctx), 0)
         || !TEST_int_gt(EVP_PKEY_fromdata(pctx, &pkey, EVP_PKEY_KEYPAIR,
-                                          params), 0))
+                            params),
+            0))
         goto err;
 
     if (!TEST_ptr(pkey))
@@ -3610,7 +3791,7 @@ static int test_DSA_get_set_params(void)
 
     ret = test_EVP_PKEY_CTX_get_set_params(pkey);
 
- err:
+err:
     EVP_PKEY_free(pkey);
     EVP_PKEY_CTX_free(pctx);
     OSSL_PARAM_free(params);
@@ -3663,7 +3844,8 @@ static int test_RSA_get_set_params(void)
 
     if (!TEST_int_gt(EVP_PKEY_fromdata_init(pctx), 0)
         || !TEST_int_gt(EVP_PKEY_fromdata(pctx, &pkey, EVP_PKEY_KEYPAIR,
-                                          params), 0))
+                            params),
+            0))
         goto err;
 
     if (!TEST_ptr(pkey))
@@ -3671,7 +3853,7 @@ static int test_RSA_get_set_params(void)
 
     ret = test_EVP_PKEY_CTX_get_set_params(pkey);
 
- err:
+err:
     EVP_PKEY_free(pkey);
     EVP_PKEY_CTX_free(pctx);
     OSSL_PARAM_free(params);
@@ -3702,12 +3884,12 @@ static int test_RSA_OAEP_set_get_params(void)
 
         params[0] = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_PAD_MODE, &padding);
         params[1] = OSSL_PARAM_construct_utf8_string(OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST,
-                                                     OSSL_DIGEST_NAME_SHA2_256, 0);
+            OSSL_DIGEST_NAME_SHA2_256, 0);
         params[2] = OSSL_PARAM_construct_utf8_string(OSSL_ASYM_CIPHER_PARAM_MGF1_DIGEST,
-                                                     OSSL_DIGEST_NAME_SHA1, 0);
+            OSSL_DIGEST_NAME_SHA1, 0);
         params[3] = OSSL_PARAM_construct_end();
 
-        if (!TEST_int_gt(EVP_PKEY_encrypt_init_ex(key_ctx, params),0))
+        if (!TEST_int_gt(EVP_PKEY_encrypt_init_ex(key_ctx, params), 0))
             goto err;
     }
     {
@@ -3716,9 +3898,9 @@ static int test_RSA_OAEP_set_get_params(void)
         char mgf1md[30] = { '\0' };
 
         params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ASYM_CIPHER_PARAM_OAEP_DIGEST,
-                                                     oaepmd, sizeof(oaepmd));
+            oaepmd, sizeof(oaepmd));
         params[1] = OSSL_PARAM_construct_utf8_string(OSSL_ASYM_CIPHER_PARAM_MGF1_DIGEST,
-                                                     mgf1md, sizeof(mgf1md));
+            mgf1md, sizeof(mgf1md));
         params[2] = OSSL_PARAM_construct_end();
 
         if (!TEST_true(EVP_PKEY_CTX_get_params(key_ctx, params)))
@@ -3731,7 +3913,7 @@ static int test_RSA_OAEP_set_get_params(void)
 
     ret = 1;
 
- err:
+err:
     EVP_PKEY_free(key);
     EVP_PKEY_CTX_free(key_ctx);
 
@@ -3761,13 +3943,55 @@ static int test_RSA_OAEP_set_null_label(void)
 
     ret = 1;
 
- err:
+err:
     EVP_PKEY_free(key);
     EVP_PKEY_CTX_free(key_ctx);
 
     return ret;
 }
 
+static int test_RSA_encrypt(void)
+{
+    int ret = 0;
+    EVP_PKEY *pkey = NULL;
+    EVP_PKEY_CTX *pctx = NULL;
+    unsigned char *cbuf = NULL, *pbuf = NULL;
+    size_t clen = 0, plen = 0;
+
+    if (!TEST_ptr(pkey = load_example_rsa_key())
+        || !TEST_ptr(pctx = EVP_PKEY_CTX_new_from_pkey(testctx,
+                         pkey, testpropq))
+        || !TEST_int_gt(EVP_PKEY_encrypt_init(pctx), 0)
+        || !TEST_int_gt(EVP_PKEY_encrypt(pctx, cbuf, &clen, kMsg, sizeof(kMsg)), 0)
+        || !TEST_ptr(cbuf = OPENSSL_malloc(clen))
+        || !TEST_int_gt(EVP_PKEY_encrypt(pctx, cbuf, &clen, kMsg, sizeof(kMsg)), 0))
+        goto done;
+
+    /* Require failure when the output buffer is too small */
+    plen = clen - 1;
+    if (!TEST_int_le(EVP_PKEY_encrypt(pctx, cbuf, &plen, kMsg, sizeof(kMsg)), 0))
+        goto done;
+    /* flush error stack */
+    TEST_openssl_errors();
+
+    /* Check decryption of encrypted result */
+    if (!TEST_int_gt(EVP_PKEY_decrypt_init(pctx), 0)
+        || !TEST_int_gt(EVP_PKEY_decrypt(pctx, pbuf, &plen, cbuf, clen), 0)
+        || !TEST_ptr(pbuf = OPENSSL_malloc(plen))
+        || !TEST_int_gt(EVP_PKEY_decrypt(pctx, pbuf, &plen, cbuf, clen), 0)
+        || !TEST_mem_eq(pbuf, plen, kMsg, sizeof(kMsg))
+        || !TEST_int_gt(EVP_PKEY_encrypt_init(pctx), 0))
+        goto done;
+
+    ret = 1;
+done:
+    EVP_PKEY_CTX_free(pctx);
+    EVP_PKEY_free(pkey);
+    OPENSSL_free(cbuf);
+    OPENSSL_free(pbuf);
+    return ret;
+}
+
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 static int test_RSA_legacy(void)
 {
@@ -3835,7 +4059,7 @@ static int test_RSA_legacy(void)
 #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
 static int test_decrypt_null_chunks(void)
 {
-    EVP_CIPHER_CTX* ctx = NULL;
+    EVP_CIPHER_CTX *ctx = NULL;
     EVP_CIPHER *cipher = NULL;
     const unsigned char key[32] = {
         0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
@@ -3854,46 +4078,46 @@ static int test_decrypt_null_chunks(void)
     const int enc_offset = 10, dec_offset = 20;
 
     if (!TEST_ptr(cipher = EVP_CIPHER_fetch(testctx, "ChaCha20-Poly1305", testpropq))
-            || !TEST_ptr(ctx = EVP_CIPHER_CTX_new())
-            || !TEST_true(EVP_EncryptInit_ex(ctx, cipher, NULL,
-                                             key, iv))
-            || !TEST_true(EVP_EncryptUpdate(ctx, ciphertext, &ctlen, msg,
-                                            enc_offset))
-            /* Deliberate add a zero length update */
-            || !TEST_true(EVP_EncryptUpdate(ctx, ciphertext + ctlen, &tmp, NULL,
-                                            0))
-            || !TEST_int_eq(tmp, 0)
-            || !TEST_true(EVP_EncryptUpdate(ctx, ciphertext + ctlen, &tmp,
-                                            msg + enc_offset,
-                                            sizeof(msg) - enc_offset))
-            || !TEST_int_eq(ctlen += tmp, sizeof(msg))
-            || !TEST_true(EVP_EncryptFinal(ctx, ciphertext + ctlen, &tmp))
-            || !TEST_int_eq(tmp, 0))
+        || !TEST_ptr(ctx = EVP_CIPHER_CTX_new())
+        || !TEST_true(EVP_EncryptInit_ex(ctx, cipher, NULL,
+            key, iv))
+        || !TEST_true(EVP_EncryptUpdate(ctx, ciphertext, &ctlen, msg,
+            enc_offset))
+        /* Deliberate add a zero length update */
+        || !TEST_true(EVP_EncryptUpdate(ctx, ciphertext + ctlen, &tmp, NULL,
+            0))
+        || !TEST_int_eq(tmp, 0)
+        || !TEST_true(EVP_EncryptUpdate(ctx, ciphertext + ctlen, &tmp,
+            msg + enc_offset,
+            sizeof(msg) - enc_offset))
+        || !TEST_int_eq(ctlen += tmp, sizeof(msg))
+        || !TEST_true(EVP_EncryptFinal(ctx, ciphertext + ctlen, &tmp))
+        || !TEST_int_eq(tmp, 0))
         goto err;
 
     /* Deliberately initialise tmp to a non zero value */
     tmp = 99;
     if (!TEST_true(EVP_DecryptInit_ex(ctx, cipher, NULL, key, iv))
-            || !TEST_true(EVP_DecryptUpdate(ctx, plaintext, &ptlen, ciphertext,
-                                            dec_offset))
-            /*
-             * Deliberately add a zero length update. We also deliberately do
-             * this at a different offset than for encryption.
-             */
-            || !TEST_true(EVP_DecryptUpdate(ctx, plaintext + ptlen, &tmp, NULL,
-                                            0))
-            || !TEST_int_eq(tmp, 0)
-            || !TEST_true(EVP_DecryptUpdate(ctx, plaintext + ptlen, &tmp,
-                                            ciphertext + dec_offset,
-                                            ctlen - dec_offset))
-            || !TEST_int_eq(ptlen += tmp, sizeof(msg))
-            || !TEST_true(EVP_DecryptFinal(ctx, plaintext + ptlen, &tmp))
-            || !TEST_int_eq(tmp, 0)
-            || !TEST_mem_eq(msg, sizeof(msg), plaintext, ptlen))
+        || !TEST_true(EVP_DecryptUpdate(ctx, plaintext, &ptlen, ciphertext,
+            dec_offset))
+        /*
+         * Deliberately add a zero length update. We also deliberately do
+         * this at a different offset than for encryption.
+         */
+        || !TEST_true(EVP_DecryptUpdate(ctx, plaintext + ptlen, &tmp, NULL,
+            0))
+        || !TEST_int_eq(tmp, 0)
+        || !TEST_true(EVP_DecryptUpdate(ctx, plaintext + ptlen, &tmp,
+            ciphertext + dec_offset,
+            ctlen - dec_offset))
+        || !TEST_int_eq(ptlen += tmp, sizeof(msg))
+        || !TEST_true(EVP_DecryptFinal(ctx, plaintext + ptlen, &tmp))
+        || !TEST_int_eq(tmp, 0)
+        || !TEST_mem_eq(msg, sizeof(msg), plaintext, ptlen))
         goto err;
 
     ret = 1;
- err:
+err:
     EVP_CIPHER_CTX_free(ctx);
     EVP_CIPHER_free(cipher);
     return ret;
@@ -3910,7 +4134,7 @@ static int test_DH_priv_pub(void)
     return test_EVP_PKEY_ffc_priv_pub("DH");
 }
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 static int test_EVP_PKEY_set1_DH(void)
 {
     DH *x942dh = NULL, *noqdh = NULL;
@@ -3922,16 +4146,16 @@ static int test_EVP_PKEY_set1_DH(void)
     size_t len = 0;
 
     if (!TEST_ptr(p = BN_new())
-            || !TEST_ptr(g = BN_new())
-            || !TEST_ptr(pubkey = BN_new())
-            || !TEST_true(BN_set_word(p, 9999))
-            || !TEST_true(BN_set_word(g, 2))
-            || !TEST_true(BN_set_word(pubkey, 4321))
-            || !TEST_ptr(noqdh = DH_new())
-            || !TEST_true(DH_set0_pqg(noqdh, p, NULL, g))
-            || !TEST_true(DH_set0_key(noqdh, pubkey, NULL))
-            || !TEST_ptr(pubkey = BN_new())
-            || !TEST_true(BN_set_word(pubkey, 4321)))
+        || !TEST_ptr(g = BN_new())
+        || !TEST_ptr(pubkey = BN_new())
+        || !TEST_true(BN_set_word(p, 9999))
+        || !TEST_true(BN_set_word(g, 2))
+        || !TEST_true(BN_set_word(pubkey, 4321))
+        || !TEST_ptr(noqdh = DH_new())
+        || !TEST_true(DH_set0_pqg(noqdh, p, NULL, g))
+        || !TEST_true(DH_set0_key(noqdh, pubkey, NULL))
+        || !TEST_ptr(pubkey = BN_new())
+        || !TEST_true(BN_set_word(pubkey, 4321)))
         goto err;
     p = g = NULL;
 
@@ -3939,34 +4163,34 @@ static int test_EVP_PKEY_set1_DH(void)
     pkey1 = EVP_PKEY_new();
     pkey2 = EVP_PKEY_new();
     if (!TEST_ptr(x942dh)
-            || !TEST_ptr(noqdh)
-            || !TEST_ptr(pkey1)
-            || !TEST_ptr(pkey2)
-            || !TEST_true(DH_set0_key(x942dh, pubkey, NULL)))
+        || !TEST_ptr(noqdh)
+        || !TEST_ptr(pkey1)
+        || !TEST_ptr(pkey2)
+        || !TEST_true(DH_set0_key(x942dh, pubkey, NULL)))
         goto err;
     pubkey = NULL;
 
     if (!TEST_true(EVP_PKEY_set1_DH(pkey1, x942dh))
-            || !TEST_int_eq(EVP_PKEY_get_id(pkey1), EVP_PKEY_DHX))
+        || !TEST_int_eq(EVP_PKEY_get_id(pkey1), EVP_PKEY_DHX))
         goto err;
 
     if (!TEST_true(EVP_PKEY_get_bn_param(pkey1, OSSL_PKEY_PARAM_PUB_KEY,
-                                         &pubkey))
-            || !TEST_ptr(pubkey))
+            &pubkey))
+        || !TEST_ptr(pubkey))
         goto err;
 
     if (!TEST_true(EVP_PKEY_set1_DH(pkey2, noqdh))
-            || !TEST_int_eq(EVP_PKEY_get_id(pkey2), EVP_PKEY_DH))
+        || !TEST_int_eq(EVP_PKEY_get_id(pkey2), EVP_PKEY_DH))
         goto err;
 
     if (!TEST_true(EVP_PKEY_get_octet_string_param(pkey2,
-                                                   OSSL_PKEY_PARAM_PUB_KEY,
-                                                   pub, sizeof(pub), &len))
-            || !TEST_size_t_ne(len, 0))
+            OSSL_PKEY_PARAM_PUB_KEY,
+            pub, sizeof(pub), &len))
+        || !TEST_size_t_ne(len, 0))
         goto err;
 
     ret = 1;
- err:
+err:
     BN_free(p);
     BN_free(g);
     BN_free(pubkey);
@@ -3977,7 +4201,7 @@ static int test_EVP_PKEY_set1_DH(void)
 
     return ret;
 }
-# endif /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
 #endif /* !OPENSSL_NO_DH */
 
 /*
@@ -4017,7 +4241,7 @@ static int test_keygen_with_empty_template(int n)
         goto err;
 
     ret = 1;
- err:
+err:
     EVP_PKEY_CTX_free(ctx);
     EVP_PKEY_free(pkey);
     EVP_PKEY_free(tkey);
@@ -4082,11 +4306,11 @@ static int test_pkey_ctx_fail_without_provider(int tst)
         goto err;
 
 #if defined(OPENSSL_NO_EC) || defined(OPENSSL_NO_SM2)
- end:
+end:
 #endif
     ret = 1;
 
- err:
+err:
     EVP_PKEY_CTX_free(pctx);
     OSSL_PROVIDER_unload(tmpnullprov);
     OSSL_LIB_CTX_free(tmpctx);
@@ -4105,7 +4329,7 @@ static int test_rand_agglomeration(void)
     unsigned char out[sizeof(seed)];
 
     if (!TEST_int_ne(sizeof(seed) % step, 0)
-            || !TEST_ptr(rand = EVP_RAND_fetch(testctx, "TEST-RAND", testpropq)))
+        || !TEST_ptr(rand = EVP_RAND_fetch(testctx, "TEST-RAND", testpropq)))
         return 0;
     ctx = EVP_RAND_CTX_new(rand, NULL);
     EVP_RAND_free(rand);
@@ -4114,12 +4338,12 @@ static int test_rand_agglomeration(void)
 
     memset(out, 0, sizeof(out));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                             seed, sizeof(seed));
+        seed, sizeof(seed));
     *p++ = OSSL_PARAM_construct_uint(OSSL_RAND_PARAM_MAX_REQUEST, &step);
     *p = OSSL_PARAM_construct_end();
     res = TEST_true(EVP_RAND_CTX_set_params(ctx, params))
-          && TEST_true(EVP_RAND_generate(ctx, out, sizeof(out), 0, 1, NULL, 0))
-          && TEST_mem_eq(seed, sizeof(seed), out, sizeof(out));
+        && TEST_true(EVP_RAND_generate(ctx, out, sizeof(out), 0, 1, NULL, 0))
+        && TEST_mem_eq(seed, sizeof(seed), out, sizeof(out));
     EVP_RAND_CTX_free(ctx);
     return res;
 }
@@ -4184,8 +4408,7 @@ static int test_evp_iv_aes(int idx)
         type = EVP_aes_128_cbc();
         /* FALLTHROUGH */
     case 6:
-        type = (type != NULL) ? type :
-                                EVP_CIPHER_fetch(testctx, "aes-128-cbc", testpropq);
+        type = (type != NULL) ? type : EVP_CIPHER_fetch(testctx, "aes-128-cbc", testpropq);
         ref_iv = cbc_state;
         ref_len = sizeof(cbc_state);
         iv_reset = 1;
@@ -4194,8 +4417,7 @@ static int test_evp_iv_aes(int idx)
         type = EVP_aes_128_ofb();
         /* FALLTHROUGH */
     case 7:
-        type = (type != NULL) ? type :
-                                EVP_CIPHER_fetch(testctx, "aes-128-ofb", testpropq);
+        type = (type != NULL) ? type : EVP_CIPHER_fetch(testctx, "aes-128-ofb", testpropq);
         ref_iv = ofb_state;
         ref_len = sizeof(ofb_state);
         iv_reset = 1;
@@ -4204,8 +4426,7 @@ static int test_evp_iv_aes(int idx)
         type = EVP_aes_128_cfb();
         /* FALLTHROUGH */
     case 8:
-        type = (type != NULL) ? type :
-                                EVP_CIPHER_fetch(testctx, "aes-128-cfb", testpropq);
+        type = (type != NULL) ? type : EVP_CIPHER_fetch(testctx, "aes-128-cfb", testpropq);
         ref_iv = cfb_state;
         ref_len = sizeof(cfb_state);
         iv_reset = 1;
@@ -4214,8 +4435,7 @@ static int test_evp_iv_aes(int idx)
         type = EVP_aes_128_gcm();
         /* FALLTHROUGH */
     case 9:
-        type = (type != NULL) ? type :
-                                EVP_CIPHER_fetch(testctx, "aes-128-gcm", testpropq);
+        type = (type != NULL) ? type : EVP_CIPHER_fetch(testctx, "aes-128-gcm", testpropq);
         ref_iv = gcm_state;
         ref_len = sizeof(gcm_state);
         break;
@@ -4223,8 +4443,7 @@ static int test_evp_iv_aes(int idx)
         type = EVP_aes_128_ccm();
         /* FALLTHROUGH */
     case 10:
-        type = (type != NULL) ? type :
-                                EVP_CIPHER_fetch(testctx, "aes-128-ccm", testpropq);
+        type = (type != NULL) ? type : EVP_CIPHER_fetch(testctx, "aes-128-ccm", testpropq);
         ref_iv = ccm_state;
         ref_len = sizeof(ccm_state);
         break;
@@ -4237,8 +4456,7 @@ static int test_evp_iv_aes(int idx)
         type = EVP_aes_128_ocb();
         /* FALLTHROUGH */
     case 11:
-        type = (type != NULL) ? type :
-                                EVP_CIPHER_fetch(testctx, "aes-128-ocb", testpropq);
+        type = (type != NULL) ? type : EVP_CIPHER_fetch(testctx, "aes-128-ocb", testpropq);
         ref_iv = ocb_state;
         ref_len = sizeof(ocb_state);
         break;
@@ -4248,13 +4466,13 @@ static int test_evp_iv_aes(int idx)
     }
 
     if (!TEST_ptr(type)
-            || !TEST_ptr((ctx = EVP_CIPHER_CTX_new()))
-            || !TEST_true(EVP_EncryptInit_ex(ctx, type, NULL, key, init_iv))
-            || !TEST_true(EVP_EncryptUpdate(ctx, ciphertext, &len, msg,
-                          (int)sizeof(msg)))
-            || !TEST_true(EVP_CIPHER_CTX_get_original_iv(ctx, oiv, sizeof(oiv)))
-            || !TEST_true(EVP_CIPHER_CTX_get_updated_iv(ctx, iv, sizeof(iv)))
-            || !TEST_true(EVP_EncryptFinal_ex(ctx, ciphertext, &len)))
+        || !TEST_ptr((ctx = EVP_CIPHER_CTX_new()))
+        || !TEST_true(EVP_EncryptInit_ex(ctx, type, NULL, key, init_iv))
+        || !TEST_true(EVP_EncryptUpdate(ctx, ciphertext, &len, msg,
+            (int)sizeof(msg)))
+        || !TEST_true(EVP_CIPHER_CTX_get_original_iv(ctx, oiv, sizeof(oiv)))
+        || !TEST_true(EVP_CIPHER_CTX_get_updated_iv(ctx, iv, sizeof(iv)))
+        || !TEST_true(EVP_EncryptFinal_ex(ctx, ciphertext, &len)))
         goto err;
     ivlen = EVP_CIPHER_CTX_get_iv_length(ctx);
 
@@ -4262,7 +4480,7 @@ static int test_evp_iv_aes(int idx)
         goto err;
 
     if (!TEST_mem_eq(init_iv, ivlen, oiv, ivlen)
-            || !TEST_mem_eq(ref_iv, ref_len, iv, ivlen))
+        || !TEST_mem_eq(ref_iv, ref_len, iv, ivlen))
         goto err;
 
     /* CBC, OFB, and CFB modes: the updated iv must be reset after reinit */
@@ -4365,13 +4583,13 @@ static int test_evp_iv_des(int idx)
     }
 
     if (!TEST_ptr(type)
-            || !TEST_ptr((ctx = EVP_CIPHER_CTX_new()))
-            || !TEST_true(EVP_EncryptInit_ex(ctx, type, NULL, key, init_iv))
-            || !TEST_true(EVP_EncryptUpdate(ctx, ciphertext, &len, msg,
-                          (int)sizeof(msg)))
-            || !TEST_true(EVP_CIPHER_CTX_get_original_iv(ctx, oiv, sizeof(oiv)))
-            || !TEST_true(EVP_CIPHER_CTX_get_updated_iv(ctx, iv, sizeof(iv)))
-            || !TEST_true(EVP_EncryptFinal_ex(ctx, ciphertext, &len)))
+        || !TEST_ptr((ctx = EVP_CIPHER_CTX_new()))
+        || !TEST_true(EVP_EncryptInit_ex(ctx, type, NULL, key, init_iv))
+        || !TEST_true(EVP_EncryptUpdate(ctx, ciphertext, &len, msg,
+            (int)sizeof(msg)))
+        || !TEST_true(EVP_CIPHER_CTX_get_original_iv(ctx, oiv, sizeof(oiv)))
+        || !TEST_true(EVP_CIPHER_CTX_get_updated_iv(ctx, iv, sizeof(iv)))
+        || !TEST_true(EVP_EncryptFinal_ex(ctx, ciphertext, &len)))
         goto err;
     ivlen = EVP_CIPHER_CTX_get_iv_length(ctx);
 
@@ -4379,7 +4597,7 @@ static int test_evp_iv_des(int idx)
         goto err;
 
     if (!TEST_mem_eq(init_iv, ivlen, oiv, ivlen)
-            || !TEST_mem_eq(ref_iv, ref_len, iv, ivlen))
+        || !TEST_mem_eq(ref_iv, ref_len, iv, ivlen))
         goto err;
 
     if (!TEST_true(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, NULL))
@@ -4410,8 +4628,8 @@ static int test_evp_bf_default_keylen(int idx)
         return TEST_skip("Test requires legacy provider to be loaded");
 
     if (!TEST_ptr(cipher = EVP_CIPHER_fetch(testctx, algos[idx], testpropq))
-            || !TEST_int_eq(EVP_CIPHER_get_key_length(cipher), 16)
-            || !TEST_int_eq(EVP_CIPHER_get_iv_length(cipher), ivlen[idx]))
+        || !TEST_int_eq(EVP_CIPHER_get_key_length(cipher), 16)
+        || !TEST_int_eq(EVP_CIPHER_get_iv_length(cipher), ivlen[idx]))
         goto err;
 
     ret = 1;
@@ -4425,10 +4643,10 @@ static int test_evp_bf_default_keylen(int idx)
 static int ecpub_nids[] = {
     NID_brainpoolP256r1, NID_X9_62_prime256v1,
     NID_secp384r1, NID_secp521r1,
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
     NID_sect233k1, NID_sect233r1, NID_sect283r1,
     NID_sect409k1, NID_sect409r1, NID_sect571k1, NID_sect571r1,
-# endif
+#endif
     NID_brainpoolP384r1, NID_brainpoolP512r1
 };
 
@@ -4440,11 +4658,11 @@ static int test_ecpub(int idx)
     unsigned char *p;
     EVP_PKEY *pkey = NULL;
     EVP_PKEY_CTX *ctx = NULL;
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     const unsigned char *q;
     EVP_PKEY *pkey2 = NULL;
     EC_KEY *ec = NULL;
-# endif
+#endif
 
     if (nullprov != NULL)
         return TEST_skip("Test does not support a non-default library context");
@@ -4465,15 +4683,15 @@ static int test_ecpub(int idx)
     p = buf;
     len = i2d_PublicKey(pkey, &p);
     if (!TEST_int_ge(len, 1)
-            || !TEST_int_eq(len, savelen))
+        || !TEST_int_eq(len, savelen))
         goto done;
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     /* Now try to decode the just-created DER. */
     q = buf;
     if (!TEST_ptr((pkey2 = EVP_PKEY_new()))
-            || !TEST_ptr((ec = EC_KEY_new_by_curve_name(nid)))
-            || !TEST_true(EVP_PKEY_assign_EC_KEY(pkey2, ec)))
+        || !TEST_ptr((ec = EC_KEY_new_by_curve_name(nid)))
+        || !TEST_true(EVP_PKEY_assign_EC_KEY(pkey2, ec)))
         goto done;
     /* EC_KEY ownership transferred */
     ec = NULL;
@@ -4482,17 +4700,17 @@ static int test_ecpub(int idx)
     /* The keys should match. */
     if (!TEST_int_eq(EVP_PKEY_eq(pkey, pkey2), 1))
         goto done;
-# endif
+#endif
 
     ret = 1;
 
- done:
+done:
     EVP_PKEY_CTX_free(ctx);
     EVP_PKEY_free(pkey);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     EVP_PKEY_free(pkey2);
     EC_KEY_free(ec);
-# endif
+#endif
     return ret;
 }
 #endif
@@ -4599,7 +4817,7 @@ static int test_names_do_all(void)
         goto err;
 
     testresult = 1;
- err:
+err:
     EVP_MD_free(sha256);
     OSSL_LIB_CTX_free(ctx);
     return testresult;
@@ -4622,74 +4840,50 @@ typedef struct {
 } EVP_INIT_TEST_st;
 
 static const EVP_INIT_TEST_st evp_init_tests[] = {
-    {
-        "aes-128-cfb", kCFBDefaultKey, iCFBIV, cfbPlaintext,
+    { "aes-128-cfb", kCFBDefaultKey, iCFBIV, cfbPlaintext,
         cfbCiphertext, NULL, 0, sizeof(cfbPlaintext), sizeof(cfbCiphertext),
-        0, 1, 0, 1
-    },
-    {
-        "aes-256-gcm", kGCMDefaultKey, iGCMDefaultIV, gcmDefaultPlaintext,
+        0, 1, 0, 1 },
+    { "aes-256-gcm", kGCMDefaultKey, iGCMDefaultIV, gcmDefaultPlaintext,
         gcmDefaultCiphertext, gcmDefaultTag, sizeof(iGCMDefaultIV),
         sizeof(gcmDefaultPlaintext), sizeof(gcmDefaultCiphertext),
-        sizeof(gcmDefaultTag), 1, 0, 1
-    },
-    {
-        "aes-128-cfb", kCFBDefaultKey, iCFBIV, cfbPlaintext,
+        sizeof(gcmDefaultTag), 1, 0, 1 },
+    { "aes-128-cfb", kCFBDefaultKey, iCFBIV, cfbPlaintext,
         cfbCiphertext, NULL, 0, sizeof(cfbPlaintext), sizeof(cfbCiphertext),
-        0, 0, 0, 1
-    },
-    {
-        "aes-256-gcm", kGCMDefaultKey, iGCMDefaultIV, gcmDefaultPlaintext,
+        0, 0, 0, 1 },
+    { "aes-256-gcm", kGCMDefaultKey, iGCMDefaultIV, gcmDefaultPlaintext,
         gcmDefaultCiphertext, gcmDefaultTag, sizeof(iGCMDefaultIV),
         sizeof(gcmDefaultPlaintext), sizeof(gcmDefaultCiphertext),
-        sizeof(gcmDefaultTag), 0, 0, 1
-    },
-    {
-        "aes-128-cfb", kCFBDefaultKey, iCFBIV, cfbCiphertext,
+        sizeof(gcmDefaultTag), 0, 0, 1 },
+    { "aes-128-cfb", kCFBDefaultKey, iCFBIV, cfbCiphertext,
         cfbPlaintext, NULL, 0, sizeof(cfbCiphertext), sizeof(cfbPlaintext),
-        0, 1, 1, 0
-    },
-    {
-        "aes-256-gcm", kGCMDefaultKey, iGCMDefaultIV, gcmDefaultCiphertext,
+        0, 1, 1, 0 },
+    { "aes-256-gcm", kGCMDefaultKey, iGCMDefaultIV, gcmDefaultCiphertext,
         gcmDefaultPlaintext, gcmDefaultTag, sizeof(iGCMDefaultIV),
         sizeof(gcmDefaultCiphertext), sizeof(gcmDefaultPlaintext),
-        sizeof(gcmDefaultTag), 1, 1, 0
-    },
-    {
-        "aes-128-cfb", kCFBDefaultKey, iCFBIV, cfbCiphertext,
+        sizeof(gcmDefaultTag), 1, 1, 0 },
+    { "aes-128-cfb", kCFBDefaultKey, iCFBIV, cfbCiphertext,
         cfbPlaintext, NULL, 0, sizeof(cfbCiphertext), sizeof(cfbPlaintext),
-        0, 0, 1, 0
-    },
-    {
-        "aes-256-gcm", kGCMDefaultKey, iGCMDefaultIV, gcmDefaultCiphertext,
+        0, 0, 1, 0 },
+    { "aes-256-gcm", kGCMDefaultKey, iGCMDefaultIV, gcmDefaultCiphertext,
         gcmDefaultPlaintext, gcmDefaultTag, sizeof(iGCMDefaultIV),
         sizeof(gcmDefaultCiphertext), sizeof(gcmDefaultPlaintext),
-        sizeof(gcmDefaultTag), 0, 1, 0
-    }
+        sizeof(gcmDefaultTag), 0, 1, 0 }
 };
 
 /* use same key, iv and plaintext for cfb and ofb */
 static const EVP_INIT_TEST_st evp_reinit_tests[] = {
-    {
-        "aes-128-cfb", kCFBDefaultKey, iCFBIV, cfbPlaintext_partial,
+    { "aes-128-cfb", kCFBDefaultKey, iCFBIV, cfbPlaintext_partial,
         cfbCiphertext_partial, NULL, 0, sizeof(cfbPlaintext_partial),
-        sizeof(cfbCiphertext_partial), 0, 0, 1, 0
-    },
-    {
-        "aes-128-cfb", kCFBDefaultKey, iCFBIV, cfbCiphertext_partial,
+        sizeof(cfbCiphertext_partial), 0, 0, 1, 0 },
+    { "aes-128-cfb", kCFBDefaultKey, iCFBIV, cfbCiphertext_partial,
         cfbPlaintext_partial, NULL, 0, sizeof(cfbCiphertext_partial),
-        sizeof(cfbPlaintext_partial), 0, 0, 0, 0
-    },
-    {
-        "aes-128-ofb", kCFBDefaultKey, iCFBIV, cfbPlaintext_partial,
+        sizeof(cfbPlaintext_partial), 0, 0, 0, 0 },
+    { "aes-128-ofb", kCFBDefaultKey, iCFBIV, cfbPlaintext_partial,
         ofbCiphertext_partial, NULL, 0, sizeof(cfbPlaintext_partial),
-        sizeof(ofbCiphertext_partial), 0, 0, 1, 0
-    },
-    {
-        "aes-128-ofb", kCFBDefaultKey, iCFBIV, ofbCiphertext_partial,
+        sizeof(ofbCiphertext_partial), 0, 0, 1, 0 },
+    { "aes-128-ofb", kCFBDefaultKey, iCFBIV, ofbCiphertext_partial,
         cfbPlaintext_partial, NULL, 0, sizeof(ofbCiphertext_partial),
-        sizeof(cfbPlaintext_partial), 0, 0, 0, 0
-    },
+        sizeof(cfbPlaintext_partial), 0, 0, 0, 0 },
 };
 
 static int evp_init_seq_set_iv(EVP_CIPHER_CTX *ctx, const EVP_INIT_TEST_st *t)
@@ -4703,7 +4897,7 @@ static int evp_init_seq_set_iv(EVP_CIPHER_CTX *ctx, const EVP_INIT_TEST_st *t)
     if (!TEST_true(EVP_CipherInit_ex(ctx, NULL, NULL, NULL, t->iv, -1)))
         goto err;
     res = 1;
- err:
+err:
     return res;
 }
 
@@ -4749,7 +4943,7 @@ static int test_evp_init_seq(int idx)
         errmsg = "IV_INIT";
         goto err;
     }
-    if (t->keyfirst == 0 &&  !TEST_true(EVP_CipherInit_ex(ctx, NULL, NULL, t->key, NULL, -1))) {
+    if (t->keyfirst == 0 && !TEST_true(EVP_CipherInit_ex(ctx, NULL, NULL, t->key, NULL, -1))) {
         errmsg = "KEY_INIT (after iv)";
         goto err;
     }
@@ -4764,7 +4958,8 @@ static int test_evp_init_seq(int idx)
     if (t->finalenc == 0 && t->tag != NULL) {
         /* Set expected tag */
         if (!TEST_int_gt(EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
-                                           t->taglen, (void *)t->tag), 0)) {
+                             t->taglen, (void *)t->tag),
+                0)) {
             errmsg = "SET_TAG";
             goto err;
         }
@@ -4788,7 +4983,7 @@ static int test_evp_init_seq(int idx)
         }
     }
     testresult = 1;
- err:
+err:
     if (errmsg != NULL)
         TEST_info("evp_init_test %d: %s", idx, errmsg);
     EVP_CIPHER_CTX_free(ctx);
@@ -4811,24 +5006,24 @@ static int test_evp_reinit_seq(int idx)
     EVP_CIPHER *type = NULL;
 
     if (!TEST_ptr(ctx = EVP_CIPHER_CTX_new())
-            || !TEST_ptr(type = EVP_CIPHER_fetch(testctx, t->cipher, testpropq))
-            /* setup cipher context */
-            || !TEST_true(EVP_CipherInit_ex2(ctx, type, t->key, t->iv, t->initenc, NULL))
-            /* first iteration */
-            || !TEST_true(EVP_CipherUpdate(ctx, outbuf1, &outlen1, t->input, t->inlen))
-            || !TEST_true(EVP_CipherFinal_ex(ctx, outbuf1, &outlen_final))
-            /* check test results iteration 1 */
-            || !TEST_mem_eq(t->expected, t->expectedlen, outbuf1, outlen1 + outlen_final)
-            /* now re-init the context (same cipher, key and iv) */
-            || !TEST_true(EVP_CipherInit_ex2(ctx, NULL, NULL, NULL, -1, NULL))
-            /* second iteration */
-            || !TEST_true(EVP_CipherUpdate(ctx, outbuf2, &outlen2, t->input, t->inlen))
-            || !TEST_true(EVP_CipherFinal_ex(ctx, outbuf2, &outlen_final))
-            /* check test results iteration 2 */
-            || !TEST_mem_eq(t->expected, t->expectedlen, outbuf2, outlen2 + outlen_final))
+        || !TEST_ptr(type = EVP_CIPHER_fetch(testctx, t->cipher, testpropq))
+        /* setup cipher context */
+        || !TEST_true(EVP_CipherInit_ex2(ctx, type, t->key, t->iv, t->initenc, NULL))
+        /* first iteration */
+        || !TEST_true(EVP_CipherUpdate(ctx, outbuf1, &outlen1, t->input, t->inlen))
+        || !TEST_true(EVP_CipherFinal_ex(ctx, outbuf1, &outlen_final))
+        /* check test results iteration 1 */
+        || !TEST_mem_eq(t->expected, t->expectedlen, outbuf1, outlen1 + outlen_final)
+        /* now re-init the context (same cipher, key and iv) */
+        || !TEST_true(EVP_CipherInit_ex2(ctx, NULL, NULL, NULL, -1, NULL))
+        /* second iteration */
+        || !TEST_true(EVP_CipherUpdate(ctx, outbuf2, &outlen2, t->input, t->inlen))
+        || !TEST_true(EVP_CipherFinal_ex(ctx, outbuf2, &outlen_final))
+        /* check test results iteration 2 */
+        || !TEST_mem_eq(t->expected, t->expectedlen, outbuf2, outlen2 + outlen_final))
         goto err;
     testresult = 1;
- err:
+err:
     EVP_CIPHER_CTX_free(ctx);
     EVP_CIPHER_free(type);
     return testresult;
@@ -4843,14 +5038,10 @@ typedef struct {
 } EVP_RESET_TEST_st;
 
 static const EVP_RESET_TEST_st evp_reset_tests[] = {
-    {
-        cfbPlaintext, cfbCiphertext,
-        sizeof(cfbPlaintext), sizeof(cfbCiphertext), 1
-    },
-    {
-        cfbCiphertext, cfbPlaintext,
-        sizeof(cfbCiphertext), sizeof(cfbPlaintext), 0
-    }
+    { cfbPlaintext, cfbCiphertext,
+        sizeof(cfbPlaintext), sizeof(cfbCiphertext), 1 },
+    { cfbCiphertext, cfbPlaintext,
+        sizeof(cfbCiphertext), sizeof(cfbPlaintext), 0 }
 };
 
 /*
@@ -4912,7 +5103,7 @@ static int test_evp_reset(int idx)
         goto err;
     }
     testresult = 1;
- err:
+err:
     if (errmsg != NULL)
         TEST_info("test_evp_reset %d: %s", idx, errmsg);
     EVP_CIPHER_CTX_free(ctx);
@@ -4926,42 +5117,18 @@ typedef struct {
 } EVP_UPDATED_IV_TEST_st;
 
 static const EVP_UPDATED_IV_TEST_st evp_updated_iv_tests[] = {
-    {
-        "aes-128-cfb", 1
-    },
-    {
-        "aes-128-cfb", 0
-    },
-    {
-        "aes-128-cfb1", 1
-    },
-    {
-        "aes-128-cfb1", 0
-    },
-    {
-        "aes-128-cfb8", 1
-    },
-    {
-        "aes-128-cfb8", 0
-    },
-    {
-        "aes-128-ofb", 1
-    },
-    {
-        "aes-128-ofb", 0
-    },
-    {
-        "aes-128-ctr", 1
-    },
-    {
-        "aes-128-ctr", 0
-    },
-    {
-        "aes-128-cbc", 1
-    },
-    {
-        "aes-128-cbc", 0
-    }
+    { "aes-128-cfb", 1 },
+    { "aes-128-cfb", 0 },
+    { "aes-128-cfb1", 1 },
+    { "aes-128-cfb1", 0 },
+    { "aes-128-cfb8", 1 },
+    { "aes-128-cfb8", 0 },
+    { "aes-128-ofb", 1 },
+    { "aes-128-ofb", 0 },
+    { "aes-128-ctr", 1 },
+    { "aes-128-ctr", 0 },
+    { "aes-128-cbc", 1 },
+    { "aes-128-cbc", 0 }
 };
 
 /*
@@ -5006,7 +5173,7 @@ static int test_evp_updated_iv(int idx)
         goto err;
     }
     iv_len = EVP_CIPHER_CTX_get_iv_length(ctx);
-    if (!TEST_int_ge(iv_len,0)) {
+    if (!TEST_int_ge(iv_len, 0)) {
         errmsg = "CIPHER_CTX_GET_IV_LEN";
         goto err;
     }
@@ -5018,9 +5185,9 @@ static int test_evp_updated_iv(int idx)
         errmsg = "CIPHER_FINAL";
         goto err;
     }
- ok:
+ok:
     testresult = 1;
- err:
+err:
     if (errmsg != NULL)
         TEST_info("test_evp_updated_iv %d: %s", idx, errmsg);
     EVP_CIPHER_CTX_free(ctx);
@@ -5042,16 +5209,12 @@ typedef struct {
 } TEST_GCM_IV_REINIT_st;
 
 static const TEST_GCM_IV_REINIT_st gcm_reinit_tests[] = {
-    {
-        iGCMResetIV1, iGCMResetIV2, gcmResetCiphertext1, gcmResetCiphertext2,
+    { iGCMResetIV1, iGCMResetIV2, gcmResetCiphertext1, gcmResetCiphertext2,
         gcmResetTag1, gcmResetTag2, sizeof(iGCMResetIV1), sizeof(iGCMResetIV2),
-        sizeof(gcmResetCiphertext1), sizeof(gcmResetCiphertext2)
-    },
-    {
-        iGCMResetIV2, iGCMResetIV1, gcmResetCiphertext2, gcmResetCiphertext1,
+        sizeof(gcmResetCiphertext1), sizeof(gcmResetCiphertext2) },
+    { iGCMResetIV2, iGCMResetIV1, gcmResetCiphertext2, gcmResetCiphertext1,
         gcmResetTag2, gcmResetTag1, sizeof(iGCMResetIV2), sizeof(iGCMResetIV1),
-        sizeof(gcmResetCiphertext2), sizeof(gcmResetCiphertext1)
-    }
+        sizeof(gcmResetCiphertext2), sizeof(gcmResetCiphertext1) }
 };
 
 static int test_gcm_reinit(int idx)
@@ -5092,7 +5255,7 @@ static int test_gcm_reinit(int idx)
     }
     EVP_CIPHER_CTX_set_padding(ctx, 0);
     if (!TEST_true(EVP_CipherUpdate(ctx, outbuf, &outlen1, gcmResetPlaintext,
-                                    sizeof(gcmResetPlaintext)))) {
+            sizeof(gcmResetPlaintext)))) {
         errmsg = "CIPHER_UPDATE1";
         goto err;
     }
@@ -5126,7 +5289,7 @@ static int test_gcm_reinit(int idx)
         goto err;
     }
     if (!TEST_true(EVP_CipherUpdate(ctx, outbuf, &outlen1, gcmResetPlaintext,
-                                    sizeof(gcmResetPlaintext)))) {
+            sizeof(gcmResetPlaintext)))) {
         errmsg = "CIPHER_UPDATE2";
         goto err;
     }
@@ -5147,7 +5310,7 @@ static int test_gcm_reinit(int idx)
         goto err;
     }
     testresult = 1;
- err:
+err:
     if (errmsg != NULL)
         TEST_info("evp_init_test %d: %s", idx, errmsg);
     EVP_CIPHER_CTX_free(ctx);
@@ -5170,8 +5333,8 @@ static int test_ivlen_change(int idx)
     int res = 0;
     unsigned char outbuf[1024];
     static const unsigned char iv[] = {
-         0x57, 0x71, 0x7d, 0xad, 0xdb, 0x9b, 0x98, 0x82,
-         0x5a, 0x55, 0x91, 0x81, 0x42, 0xa8, 0x89, 0x34
+        0x57, 0x71, 0x7d, 0xad, 0xdb, 0x9b, 0x98, 0x82,
+        0x5a, 0x55, 0x91, 0x81, 0x42, 0xa8, 0x89, 0x34
     };
     EVP_CIPHER_CTX *ctx = NULL;
     EVP_CIPHER *ciph = NULL;
@@ -5182,31 +5345,31 @@ static int test_ivlen_change(int idx)
         goto err;
 
     if (!TEST_ptr(ciph = EVP_CIPHER_fetch(testctx, ivlen_change_ciphers[idx],
-                                          testpropq)))
+                      testpropq)))
         goto err;
 
     if (!TEST_true(EVP_CipherInit_ex(ctx, ciph, NULL, kGCMDefaultKey, iv, 1)))
         goto err;
 
     if (!TEST_true(EVP_CipherUpdate(ctx, outbuf, &outlen, gcmDefaultPlaintext,
-                                    sizeof(gcmDefaultPlaintext))))
+            sizeof(gcmDefaultPlaintext))))
         goto err;
 
     params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN,
-                                            &ivlen);
+        &ivlen);
     if (!TEST_true(EVP_CIPHER_CTX_set_params(ctx, params)))
         goto err;
 
     ERR_set_mark();
     if (!TEST_false(EVP_CipherUpdate(ctx, outbuf, &outlen, gcmDefaultPlaintext,
-                                    sizeof(gcmDefaultPlaintext)))) {
+            sizeof(gcmDefaultPlaintext)))) {
         ERR_clear_last_mark();
         goto err;
     }
     ERR_pop_to_mark();
 
     res = 1;
- err:
+err:
     EVP_CIPHER_CTX_free(ctx);
     EVP_CIPHER_free(ciph);
     return res;
@@ -5238,8 +5401,8 @@ static int test_keylen_change(int idx)
     int res = 0;
     unsigned char outbuf[1024];
     static const unsigned char key[] = {
-         0x57, 0x71, 0x7d, 0xad, 0xdb, 0x9b, 0x98, 0x82,
-         0x5a, 0x55, 0x91, 0x81, 0x42, 0xa8, 0x89, 0x34
+        0x57, 0x71, 0x7d, 0xad, 0xdb, 0x9b, 0x98, 0x82,
+        0x5a, 0x55, 0x91, 0x81, 0x42, 0xa8, 0x89, 0x34
     };
     EVP_CIPHER_CTX *ctx = NULL;
     EVP_CIPHER *ciph = NULL;
@@ -5253,41 +5416,41 @@ static int test_keylen_change(int idx)
         goto err;
 
     if (!TEST_ptr(ciph = EVP_CIPHER_fetch(testctx, keylen_change_ciphers[idx],
-                                          testpropq)))
+                      testpropq)))
         goto err;
 
     if (!TEST_true(EVP_CipherInit_ex(ctx, ciph, NULL, key, NULL, 1)))
         goto err;
 
     if (!TEST_true(EVP_CipherUpdate(ctx, outbuf, &outlen, gcmDefaultPlaintext,
-                                    sizeof(gcmDefaultPlaintext))))
+            sizeof(gcmDefaultPlaintext))))
         goto err;
 
     params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_KEYLEN,
-                                            &keylen);
+        &keylen);
     if (!TEST_true(EVP_CIPHER_CTX_set_params(ctx, params)))
         goto err;
 
     ERR_set_mark();
     if (!TEST_false(EVP_CipherUpdate(ctx, outbuf, &outlen, gcmDefaultPlaintext,
-                                    sizeof(gcmDefaultPlaintext)))) {
+            sizeof(gcmDefaultPlaintext)))) {
         ERR_clear_last_mark();
         goto err;
     }
     ERR_pop_to_mark();
 
     res = 1;
- err:
+err:
     EVP_CIPHER_CTX_free(ctx);
     EVP_CIPHER_free(ciph);
     return res;
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-static EVP_PKEY_METHOD *custom_pmeth =  NULL;
+static EVP_PKEY_METHOD *custom_pmeth = NULL;
 static const EVP_PKEY_METHOD *orig_pmeth = NULL;
 
-# define EVP_PKEY_CTRL_MY_COMMAND 9999
+#define EVP_PKEY_CTRL_MY_COMMAND 9999
 
 static int custom_pmeth_init(EVP_PKEY_CTX *ctx)
 {
@@ -5306,29 +5469,29 @@ static void custom_pmeth_cleanup(EVP_PKEY_CTX *ctx)
 }
 
 static int custom_pmeth_sign(EVP_PKEY_CTX *ctx, unsigned char *out,
-                             size_t *outlen, const unsigned char *in,
-                             size_t inlen)
+    size_t *outlen, const unsigned char *in,
+    size_t inlen)
 {
     int (*psign)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-                 const unsigned char *tbs, size_t tbslen);
+        const unsigned char *tbs, size_t tbslen);
 
     EVP_PKEY_meth_get_sign(orig_pmeth, NULL, &psign);
     return psign(ctx, out, outlen, in, inlen);
 }
 
 static int custom_pmeth_digestsign(EVP_MD_CTX *ctx, unsigned char *sig,
-                                   size_t *siglen, const unsigned char *tbs,
-                                   size_t tbslen)
+    size_t *siglen, const unsigned char *tbs,
+    size_t tbslen)
 {
     int (*pdigestsign)(EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
-                       const unsigned char *tbs, size_t tbslen);
+        const unsigned char *tbs, size_t tbslen);
 
     EVP_PKEY_meth_get_digestsign(orig_pmeth, &pdigestsign);
     return pdigestsign(ctx, sig, siglen, tbs, tbslen);
 }
 
 static int custom_pmeth_derive(EVP_PKEY_CTX *ctx, unsigned char *key,
-                               size_t *keylen)
+    size_t *keylen)
 {
     int (*pderive)(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
 
@@ -5387,52 +5550,52 @@ static int test_custom_pmeth(int idx)
         break;
     case 1:
     case 7:
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
         id = EVP_PKEY_DSA;
         pkey = load_example_dsa_key();
         break;
-# else
+#else
         return 1;
-# endif
+#endif
     case 2:
     case 8:
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
         id = EVP_PKEY_EC;
         pkey = load_example_ec_key();
         break;
-# else
+#else
         return 1;
-# endif
+#endif
     case 3:
     case 9:
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
         id = EVP_PKEY_ED25519;
         md = NULL;
         pkey = load_example_ed25519_key();
         break;
-# else
+#else
         return 1;
-# endif
+#endif
     case 4:
     case 10:
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
         id = EVP_PKEY_DH;
         doderive = 1;
         pkey = load_example_dh_key();
         break;
-# else
+#else
         return 1;
-# endif
+#endif
     case 5:
     case 11:
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
         id = EVP_PKEY_X25519;
         doderive = 1;
         pkey = load_example_x25519_key();
         break;
-# else
+#else
         return 1;
-# endif
+#endif
     default:
         TEST_error("Should not happen");
         goto err;
@@ -5463,17 +5626,18 @@ static int test_custom_pmeth(int idx)
     }
 
     if (!TEST_ptr(orig_pmeth = EVP_PKEY_meth_find(id))
-            || !TEST_ptr(pkey))
+        || !TEST_ptr(pkey))
         goto err;
 
     EVP_PKEY_meth_get0_info(&orig_id, &orig_flags, orig_pmeth);
     if (!TEST_int_eq(orig_id, id)
-            || !TEST_ptr(custom_pmeth = EVP_PKEY_meth_new(id, orig_flags)))
+        || !TEST_ptr(custom_pmeth = EVP_PKEY_meth_new(id, orig_flags)))
         goto err;
 
     if (id == EVP_PKEY_ED25519) {
         EVP_PKEY_meth_set_digestsign(custom_pmeth, custom_pmeth_digestsign);
-    } if (id == EVP_PKEY_DH || id == EVP_PKEY_X25519) {
+    }
+    if (id == EVP_PKEY_DH || id == EVP_PKEY_X25519) {
         EVP_PKEY_meth_set_derive(custom_pmeth, NULL, custom_pmeth_derive);
     } else {
         EVP_PKEY_meth_set_sign(custom_pmeth, NULL, custom_pmeth_sign);
@@ -5490,27 +5654,27 @@ static int test_custom_pmeth(int idx)
     if (doderive) {
         pctx = EVP_PKEY_CTX_new(pkey, NULL);
         if (!TEST_ptr(pctx)
-                || !TEST_int_eq(EVP_PKEY_derive_init(pctx), 1)
-                || !TEST_int_ge(EVP_PKEY_CTX_ctrl(pctx, -1, -1,
-                                                EVP_PKEY_CTRL_MY_COMMAND, 0, NULL),
-                                1)
-                || !TEST_int_eq(ctrl_called, 1)
-                || !TEST_int_ge(EVP_PKEY_derive_set_peer(pctx, pkey), 1)
-                || !TEST_int_ge(EVP_PKEY_derive(pctx, NULL, &reslen), 1)
-                || !TEST_ptr(res = OPENSSL_malloc(reslen))
-                || !TEST_int_ge(EVP_PKEY_derive(pctx, res, &reslen), 1))
+            || !TEST_int_eq(EVP_PKEY_derive_init(pctx), 1)
+            || !TEST_int_ge(EVP_PKEY_CTX_ctrl(pctx, -1, -1,
+                                EVP_PKEY_CTRL_MY_COMMAND, 0, NULL),
+                1)
+            || !TEST_int_eq(ctrl_called, 1)
+            || !TEST_int_ge(EVP_PKEY_derive_set_peer(pctx, pkey), 1)
+            || !TEST_int_ge(EVP_PKEY_derive(pctx, NULL, &reslen), 1)
+            || !TEST_ptr(res = OPENSSL_malloc(reslen))
+            || !TEST_int_ge(EVP_PKEY_derive(pctx, res, &reslen), 1))
             goto err;
     } else {
         ctx = EVP_MD_CTX_new();
         reslen = EVP_PKEY_size(pkey);
         res = OPENSSL_malloc(reslen);
         if (!TEST_ptr(ctx)
-                || !TEST_ptr(res)
-                || !TEST_true(EVP_DigestSignInit(ctx, &pctx, md, NULL, pkey))
-                || !TEST_int_ge(EVP_PKEY_CTX_ctrl(pctx, -1, -1,
-                                                EVP_PKEY_CTRL_MY_COMMAND, 0, NULL),
-                                1)
-                || !TEST_int_eq(ctrl_called, 1))
+            || !TEST_ptr(res)
+            || !TEST_true(EVP_DigestSignInit(ctx, &pctx, md, NULL, pkey))
+            || !TEST_int_ge(EVP_PKEY_CTX_ctrl(pctx, -1, -1,
+                                EVP_PKEY_CTRL_MY_COMMAND, 0, NULL),
+                1)
+            || !TEST_int_eq(ctrl_called, 1))
             goto err;
 
         if (id == EVP_PKEY_ED25519) {
@@ -5518,13 +5682,13 @@ static int test_custom_pmeth(int idx)
                 goto err;
         } else {
             if (!TEST_true(EVP_DigestUpdate(ctx, msg, sizeof(msg)))
-                    || !TEST_true(EVP_DigestSignFinal(ctx, res, &reslen)))
+                || !TEST_true(EVP_DigestSignFinal(ctx, res, &reslen)))
                 goto err;
         }
     }
 
     testresult = 1;
- err:
+err:
     OPENSSL_free(res);
     EVP_MD_CTX_free(ctx);
     if (doderive)
@@ -5547,7 +5711,7 @@ static int test_evp_md_cipher_meth(void)
 
     testresult = 1;
 
- err:
+err:
     EVP_MD_meth_free(md);
     EVP_CIPHER_meth_free(ciph);
 
@@ -5555,7 +5719,7 @@ static int test_evp_md_cipher_meth(void)
 }
 
 typedef struct {
-        int data;
+    int data;
 } custom_dgst_ctx;
 
 static int custom_md_init_called = 0;
@@ -5612,40 +5776,40 @@ static int test_custom_md_meth(void)
         goto err;
 
     if (!TEST_true(EVP_MD_meth_set_init(tmp, custom_md_init))
-            || !TEST_true(EVP_MD_meth_set_cleanup(tmp, custom_md_cleanup))
-            || !TEST_true(EVP_MD_meth_set_app_datasize(tmp,
-                                                       sizeof(custom_dgst_ctx))))
+        || !TEST_true(EVP_MD_meth_set_cleanup(tmp, custom_md_cleanup))
+        || !TEST_true(EVP_MD_meth_set_app_datasize(tmp,
+            sizeof(custom_dgst_ctx))))
         goto err;
 
     mdctx = EVP_MD_CTX_new();
     if (!TEST_ptr(mdctx)
-               /*
-                * Initing our custom md and then initing another md should
-                * result in the init and cleanup functions of the custom md
-                * being called.
-                */
-            || !TEST_true(EVP_DigestInit_ex(mdctx, tmp, NULL))
-            || !TEST_true(EVP_DigestInit_ex(mdctx, EVP_sha256(), NULL))
-            || !TEST_true(EVP_DigestUpdate(mdctx, mess, strlen(mess)))
-            || !TEST_true(EVP_DigestFinal_ex(mdctx, md_value, &md_len))
-            || !TEST_int_eq(custom_md_init_called, 1)
-            || !TEST_int_eq(custom_md_cleanup_called, 1))
+        /*
+         * Initing our custom md and then initing another md should
+         * result in the init and cleanup functions of the custom md
+         * being called.
+         */
+        || !TEST_true(EVP_DigestInit_ex(mdctx, tmp, NULL))
+        || !TEST_true(EVP_DigestInit_ex(mdctx, EVP_sha256(), NULL))
+        || !TEST_true(EVP_DigestUpdate(mdctx, mess, strlen(mess)))
+        || !TEST_true(EVP_DigestFinal_ex(mdctx, md_value, &md_len))
+        || !TEST_int_eq(custom_md_init_called, 1)
+        || !TEST_int_eq(custom_md_cleanup_called, 1))
         goto err;
 
     if (!TEST_int_eq(OBJ_create("1.3.6.1.4.1.16604.998866.1",
-                                "custom-md", "custom-md"), NID_undef)
-            || !TEST_int_eq(ERR_GET_LIB(ERR_peek_error()), ERR_LIB_OBJ)
-            || !TEST_int_eq(ERR_GET_REASON(ERR_get_error()), OBJ_R_OID_EXISTS))
+                         "custom-md", "custom-md"),
+            NID_undef)
+        || !TEST_int_eq(ERR_GET_LIB(ERR_peek_error()), ERR_LIB_OBJ)
+        || !TEST_int_eq(ERR_GET_REASON(ERR_get_error()), OBJ_R_OID_EXISTS))
         goto err;
 
-    o = ASN1_OBJECT_create(nid, (unsigned char *)
-                                "\53\6\1\4\1\201\201\134\274\373\122\1", 12,
-                                "custom-md", "custom-md");
+    o = ASN1_OBJECT_create(nid, (unsigned char *)"\53\6\1\4\1\201\201\134\274\373\122\1", 12,
+        "custom-md", "custom-md");
     if (!TEST_int_eq(OBJ_add_object(o), nid))
         goto err;
 
     testresult = 1;
- err:
+err:
     ASN1_OBJECT_free(o);
     EVP_MD_CTX_free(mdctx);
     EVP_MD_meth_free(tmp);
@@ -5653,14 +5817,14 @@ static int test_custom_md_meth(void)
 }
 
 typedef struct {
-        int data;
+    int data;
 } custom_ciph_ctx;
 
 static int custom_ciph_init_called = 0;
 static int custom_ciph_cleanup_called = 0;
 
 static int custom_ciph_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                            const unsigned char *iv, int enc)
+    const unsigned char *iv, int enc)
 {
     custom_ciph_ctx *p = EVP_CIPHER_CTX_get_cipher_data(ctx);
 
@@ -5707,34 +5871,34 @@ static int test_custom_ciph_meth(void)
         goto err;
 
     if (!TEST_true(EVP_CIPHER_meth_set_init(tmp, custom_ciph_init))
-            || !TEST_true(EVP_CIPHER_meth_set_flags(tmp, EVP_CIPH_ALWAYS_CALL_INIT))
-            || !TEST_true(EVP_CIPHER_meth_set_cleanup(tmp, custom_ciph_cleanup))
-            || !TEST_true(EVP_CIPHER_meth_set_impl_ctx_size(tmp,
-                                                            sizeof(custom_ciph_ctx))))
+        || !TEST_true(EVP_CIPHER_meth_set_flags(tmp, EVP_CIPH_ALWAYS_CALL_INIT))
+        || !TEST_true(EVP_CIPHER_meth_set_cleanup(tmp, custom_ciph_cleanup))
+        || !TEST_true(EVP_CIPHER_meth_set_impl_ctx_size(tmp,
+            sizeof(custom_ciph_ctx))))
         goto err;
 
     ciphctx = EVP_CIPHER_CTX_new();
     if (!TEST_ptr(ciphctx)
-            /*
-             * Initing our custom cipher and then initing another cipher
-             * should result in the init and cleanup functions of the custom
-             * cipher being called.
-             */
-            || !TEST_true(EVP_CipherInit_ex(ciphctx, tmp, NULL, NULL, NULL, 1))
-            || !TEST_true(EVP_CipherInit_ex(ciphctx, EVP_aes_128_cbc(), NULL,
-                                            NULL, NULL, 1))
-            || !TEST_int_eq(custom_ciph_init_called, 1)
-            || !TEST_int_eq(custom_ciph_cleanup_called, 1))
+        /*
+         * Initing our custom cipher and then initing another cipher
+         * should result in the init and cleanup functions of the custom
+         * cipher being called.
+         */
+        || !TEST_true(EVP_CipherInit_ex(ciphctx, tmp, NULL, NULL, NULL, 1))
+        || !TEST_true(EVP_CipherInit_ex(ciphctx, EVP_aes_128_cbc(), NULL,
+            NULL, NULL, 1))
+        || !TEST_int_eq(custom_ciph_init_called, 1)
+        || !TEST_int_eq(custom_ciph_cleanup_called, 1))
         goto err;
 
     testresult = 1;
- err:
+err:
     EVP_CIPHER_CTX_free(ciphctx);
     EVP_CIPHER_meth_free(tmp);
     return testresult;
 }
 
-# ifndef OPENSSL_NO_DYNAMIC_ENGINE
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 /* Test we can create a signature keys with an associated ENGINE */
 static int test_signatures_with_engine(int tst)
 {
@@ -5758,16 +5922,16 @@ static int test_signatures_with_engine(int tst)
     size_t maclen = 0;
     int ret;
 
-#  ifdef OPENSSL_NO_CMAC
+#ifdef OPENSSL_NO_CMAC
     /* Skip CMAC tests in a no-cmac build */
     if (tst <= 1)
         return 1;
-#  endif
-#  ifdef OPENSSL_NO_ECX
+#endif
+#ifdef OPENSSL_NO_ECX
     /* Skip ECX tests in a no-ecx build */
     if (tst == 2)
         return 1;
-#  endif
+#endif
 
     if (!TEST_ptr(e = ENGINE_by_id(engine_id)))
         return 0;
@@ -5780,15 +5944,15 @@ static int test_signatures_with_engine(int tst)
     switch (tst) {
     case 0:
         pkey = EVP_PKEY_new_CMAC_key(e, cmackey, sizeof(cmackey),
-                                     EVP_aes_128_cbc());
+            EVP_aes_128_cbc());
         break;
     case 1:
         pkey = EVP_PKEY_new_CMAC_key(e, badcmackey, sizeof(badcmackey),
-                                     EVP_aes_128_cbc());
+            EVP_aes_128_cbc());
         break;
     case 2:
         pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_ED25519, e, ed25519key,
-                                            sizeof(ed25519key));
+            sizeof(ed25519key));
         break;
     default:
         TEST_error("Invalid test case");
@@ -5801,13 +5965,13 @@ static int test_signatures_with_engine(int tst)
         goto err;
 
     ret = EVP_DigestSignInit(ctx, NULL, tst == 2 ? NULL : EVP_sha256(), NULL,
-                             pkey);
+        pkey);
     if (tst == 0) {
         if (!TEST_true(ret))
             goto err;
 
         if (!TEST_true(EVP_DigestSignUpdate(ctx, msg, sizeof(msg)))
-                || !TEST_true(EVP_DigestSignFinal(ctx, NULL, &maclen)))
+            || !TEST_true(EVP_DigestSignFinal(ctx, NULL, &maclen)))
             goto err;
 
         if (!TEST_ptr(mac = OPENSSL_malloc(maclen)))
@@ -5822,7 +5986,7 @@ static int test_signatures_with_engine(int tst)
     }
 
     testresult = 1;
- err:
+err:
     EVP_MD_CTX_free(ctx);
     OPENSSL_free(mac);
     EVP_PKEY_free(pkey);
@@ -5855,7 +6019,7 @@ static int test_cipher_with_engine(void)
     }
 
     if (!TEST_ptr(ctx = EVP_CIPHER_CTX_new())
-            || !TEST_ptr(ctx2 = EVP_CIPHER_CTX_new()))
+        || !TEST_ptr(ctx2 = EVP_CIPHER_CTX_new()))
         goto err;
 
     if (!TEST_true(EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), e, keyiv, keyiv)))
@@ -5866,11 +6030,11 @@ static int test_cipher_with_engine(void)
         goto err;
 
     if (!TEST_true(EVP_EncryptUpdate(ctx2, buf, &len, msg, sizeof(msg)))
-            || !TEST_true(EVP_EncryptFinal_ex(ctx2, buf + len, &len)))
+        || !TEST_true(EVP_EncryptFinal_ex(ctx2, buf + len, &len)))
         goto err;
 
     testresult = 1;
- err:
+err:
     EVP_CIPHER_CTX_free(ctx);
     EVP_CIPHER_CTX_free(ctx2);
     ENGINE_finish(e);
@@ -5878,7 +6042,7 @@ static int test_cipher_with_engine(void)
 
     return testresult;
 }
-# endif /* OPENSSL_NO_DYNAMIC_ENGINE */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 #endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 #ifndef OPENSSL_NO_ECX
@@ -5895,9 +6059,8 @@ static int test_ecx_short_keys(int tst)
     unsigned char ecxkeydata = 1;
     EVP_PKEY *pkey;
 
-
     pkey = EVP_PKEY_new_raw_private_key_ex(testctx, OBJ_nid2sn(ecxnids[tst]),
-                                           NULL, &ecxkeydata, 1);
+        NULL, &ecxkeydata, 1);
     if (!TEST_ptr_null(pkey)) {
         EVP_PKEY_free(pkey);
         return 0;
@@ -5921,7 +6084,7 @@ const OPTIONS *test_get_options(void)
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
         { "context", OPT_CONTEXT, '-', "Explicitly use a non-default library context" },
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the libctx" },
+            "The configuration file to use for the libctx" },
         { NULL }
     };
     return options;
@@ -5956,7 +6119,7 @@ static int test_ecx_not_private_key(int tst)
     pubkeylen = keys[tst].publen;
 
     pkey = EVP_PKEY_new_raw_public_key_ex(testctx, OBJ_nid2sn(keys[tst].type),
-                                          NULL, pubkey, pubkeylen);
+        NULL, pubkey, pubkeylen);
     if (!TEST_ptr(pkey))
         goto err;
 
@@ -5975,7 +6138,7 @@ static int test_ecx_not_private_key(int tst)
     if (!TEST_int_eq(EVP_DigestSign(ctx, mac, &maclen, msg, sizeof(msg)), 0))
         goto err;
 
- check_err:
+check_err:
     /*
      * Currently only EVP_DigestSign will throw PROV_R_NOT_A_PRIVATE_KEY,
      * but we relax the check to allow error also thrown by
@@ -5986,7 +6149,7 @@ static int test_ecx_not_private_key(int tst)
         ERR_clear_error();
     }
 
- err:
+err:
     EVP_MD_CTX_free(ctx);
     OPENSSL_free(mac);
     EVP_PKEY_free(pkey);
@@ -6016,7 +6179,7 @@ static int test_sign_continuation(void)
 
     /* Construct a pkey using precise propq to use our provider */
     if (!TEST_ptr(pctx = EVP_PKEY_CTX_new_from_name(testctx, "RSA",
-                                                    "provider=fake-rsa"))
+                      "provider=fake-rsa"))
         || !TEST_true(EVP_PKEY_fromdata_init(pctx))
         || !TEST_true(EVP_PKEY_fromdata(pctx, &pkey, EVP_PKEY_KEYPAIR, NULL))
         || !TEST_ptr(pkey))
@@ -6025,7 +6188,7 @@ static int test_sign_continuation(void)
     /* First test it continues (classic behavior) */
     if (!TEST_ptr(mctx = EVP_MD_CTX_new())
         || !TEST_true(EVP_DigestSignInit_ex(mctx, NULL, NULL, testctx,
-                                            NULL, pkey, NULL))
+            NULL, pkey, NULL))
         || !TEST_true(EVP_DigestSignUpdate(mctx, sigbuf, sizeof(sigbuf)))
         || !TEST_true(EVP_DigestSignFinal(mctx, signature, &siglen))
         || !TEST_true(EVP_DigestSignUpdate(mctx, sigbuf, sizeof(sigbuf)))
@@ -6037,7 +6200,7 @@ static int test_sign_continuation(void)
     /* try again but failing the continuation */
     if (!TEST_ptr(mctx = EVP_MD_CTX_new())
         || !TEST_true(EVP_DigestSignInit_ex(mctx, NULL, NULL, testctx,
-                                            NULL, pkey, nodup_params))
+            NULL, pkey, nodup_params))
         || !TEST_true(EVP_DigestSignUpdate(mctx, sigbuf, sizeof(sigbuf)))
         || !TEST_true(EVP_DigestSignFinal(mctx, signature, &siglen))
         || !TEST_false(EVP_DigestSignUpdate(mctx, sigbuf, sizeof(sigbuf)))
@@ -6055,11 +6218,11 @@ static int test_sign_continuation(void)
 }
 
 static int aes_gcm_encrypt(const unsigned char *gcm_key, size_t gcm_key_s,
-                           const unsigned char *gcm_iv, size_t gcm_ivlen,
-                           const unsigned char *gcm_pt, size_t gcm_pt_s,
-                           const unsigned char *gcm_aad, size_t gcm_aad_s,
-                           const unsigned char *gcm_ct, size_t gcm_ct_s,
-                           const unsigned char *gcm_tag, size_t gcm_tag_s)
+    const unsigned char *gcm_iv, size_t gcm_ivlen,
+    const unsigned char *gcm_pt, size_t gcm_pt_s,
+    const unsigned char *gcm_aad, size_t gcm_aad_s,
+    const unsigned char *gcm_ct, size_t gcm_ct_s,
+    const unsigned char *gcm_tag, size_t gcm_tag_s)
 {
     int ret = 0;
     EVP_CIPHER_CTX *ctx;
@@ -6072,27 +6235,27 @@ static int aes_gcm_encrypt(const unsigned char *gcm_key, size_t gcm_key_s,
     };
 
     if (!TEST_ptr(ctx = EVP_CIPHER_CTX_new())
-            || !TEST_ptr(cipher = EVP_CIPHER_fetch(testctx, "AES-256-GCM", "")))
+        || !TEST_ptr(cipher = EVP_CIPHER_fetch(testctx, "AES-256-GCM", "")))
         goto err;
 
     params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN,
-                                            &gcm_ivlen);
+        &gcm_ivlen);
 
     if (!TEST_true(EVP_EncryptInit_ex2(ctx, cipher, gcm_key, gcm_iv, params))
-            || (gcm_aad != NULL
-                && !TEST_true(EVP_EncryptUpdate(ctx, NULL, &outlen,
-                                                gcm_aad, gcm_aad_s)))
-            || !TEST_true(EVP_EncryptUpdate(ctx, outbuf, &outlen,
-                                            gcm_pt, gcm_pt_s))
-            || !TEST_true(EVP_EncryptFinal_ex(ctx, outbuf, &tmplen)))
+        || (gcm_aad != NULL
+            && !TEST_true(EVP_EncryptUpdate(ctx, NULL, &outlen,
+                gcm_aad, gcm_aad_s)))
+        || !TEST_true(EVP_EncryptUpdate(ctx, outbuf, &outlen,
+            gcm_pt, gcm_pt_s))
+        || !TEST_true(EVP_EncryptFinal_ex(ctx, outbuf, &tmplen)))
         goto err;
 
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
-                                                  outtag, sizeof(outtag));
+        outtag, sizeof(outtag));
 
     if (!TEST_true(EVP_CIPHER_CTX_get_params(ctx, params))
-            || !TEST_mem_eq(outbuf, outlen, gcm_ct, gcm_ct_s)
-            || !TEST_mem_eq(outtag, gcm_tag_s, gcm_tag, gcm_tag_s))
+        || !TEST_mem_eq(outbuf, outlen, gcm_ct, gcm_ct_s)
+        || !TEST_mem_eq(outtag, gcm_tag_s, gcm_tag, gcm_tag_s))
         goto err;
 
     ret = 1;
@@ -6104,11 +6267,11 @@ static int aes_gcm_encrypt(const unsigned char *gcm_key, size_t gcm_key_s,
 }
 
 static int aes_gcm_decrypt(const unsigned char *gcm_key, size_t gcm_key_s,
-                           const unsigned char *gcm_iv, size_t gcm_ivlen,
-                           const unsigned char *gcm_pt, size_t gcm_pt_s,
-                           const unsigned char *gcm_aad, size_t gcm_aad_s,
-                           const unsigned char *gcm_ct, size_t gcm_ct_s,
-                           const unsigned char *gcm_tag, size_t gcm_tag_s)
+    const unsigned char *gcm_iv, size_t gcm_ivlen,
+    const unsigned char *gcm_pt, size_t gcm_pt_s,
+    const unsigned char *gcm_aad, size_t gcm_aad_s,
+    const unsigned char *gcm_ct, size_t gcm_ct_s,
+    const unsigned char *gcm_tag, size_t gcm_tag_s)
 {
     int ret = 0;
     EVP_CIPHER_CTX *ctx;
@@ -6126,22 +6289,22 @@ static int aes_gcm_decrypt(const unsigned char *gcm_key, size_t gcm_key_s,
         goto err;
 
     params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN,
-                                            &gcm_ivlen);
+        &gcm_ivlen);
 
     if (!TEST_true(EVP_DecryptInit_ex2(ctx, cipher, gcm_key, gcm_iv, params))
-            || (gcm_aad != NULL
-                && !TEST_true(EVP_DecryptUpdate(ctx, NULL, &outlen,
-                                                gcm_aad, gcm_aad_s)))
-            || !TEST_true(EVP_DecryptUpdate(ctx, outbuf, &outlen,
-                                            gcm_ct, gcm_ct_s))
-            || !TEST_mem_eq(outbuf, outlen, gcm_pt, gcm_pt_s))
+        || (gcm_aad != NULL
+            && !TEST_true(EVP_DecryptUpdate(ctx, NULL, &outlen,
+                gcm_aad, gcm_aad_s)))
+        || !TEST_true(EVP_DecryptUpdate(ctx, outbuf, &outlen,
+            gcm_ct, gcm_ct_s))
+        || !TEST_mem_eq(outbuf, outlen, gcm_pt, gcm_pt_s))
         goto err;
 
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
-                                                  (void*)gcm_tag, gcm_tag_s);
+        (void *)gcm_tag, gcm_tag_s);
 
     if (!TEST_true(EVP_CIPHER_CTX_set_params(ctx, params))
-            ||!TEST_true(EVP_DecryptFinal_ex(ctx, outbuf, &outlen)))
+        || !TEST_true(EVP_DecryptFinal_ex(ctx, outbuf, &outlen)))
         goto err;
 
     ret = 1;
@@ -6158,7 +6321,7 @@ static int test_aes_gcm_ivlen_change_cve_2023_5363(void)
     static const unsigned char gcm_key[] = {
         0xd0, 0xc2, 0x67, 0xc1, 0x9f, 0x30, 0xd8, 0x0b, 0x89, 0x14, 0xbb, 0xbf,
         0xb7, 0x2f, 0x73, 0xb8, 0xd3, 0xcd, 0x5f, 0x6a, 0x78, 0x70, 0x15, 0x84,
-        0x8a, 0x7b, 0x30, 0xe3, 0x8f, 0x16, 0xf1, 0x8b,
+        0x8a, 0x7b, 0x30, 0xe3, 0x8f, 0x16, 0xf1, 0x8b
     };
     static const unsigned char gcm_iv[] = {
         0xb6, 0xdc, 0xda, 0x95, 0xac, 0x99, 0x77, 0x76, 0x25, 0xae, 0x87, 0xf8,
@@ -6171,33 +6334,33 @@ static int test_aes_gcm_ivlen_change_cve_2023_5363(void)
         0x95, 0x90, 0xac, 0x7b, 0x1f, 0x7b, 0xa0, 0x99, 0xe1, 0xf3, 0x48, 0x54,
         0xd0, 0xfc, 0xa9, 0xcc, 0x91, 0xf8, 0x1f, 0x9b, 0x6c, 0x9a, 0xe0, 0xdc,
         0x63, 0xea, 0x7d, 0x2a, 0x4a, 0x7d, 0xa5, 0xed, 0x68, 0x57, 0x27, 0x6b,
-        0x68, 0xe0, 0xf2, 0xb8, 0x51, 0x50, 0x8d, 0x3d,
+        0x68, 0xe0, 0xf2, 0xb8, 0x51, 0x50, 0x8d, 0x3d
     };
     static const unsigned char gcm_pt[] = {
         0xb8, 0xb6, 0x88, 0x36, 0x44, 0xe2, 0x34, 0xdf, 0x24, 0x32, 0x91, 0x07,
-        0x4f, 0xe3, 0x6f, 0x81,
+        0x4f, 0xe3, 0x6f, 0x81
     };
     static const unsigned char gcm_ct[] = {
         0xff, 0x4f, 0xb3, 0xf3, 0xf9, 0xa2, 0x51, 0xd4, 0x82, 0xc2, 0xbe, 0xf3,
-        0xe2, 0xd0, 0xec, 0xed,
+        0xe2, 0xd0, 0xec, 0xed
     };
     static const unsigned char gcm_tag[] = {
         0xbd, 0x06, 0x38, 0x09, 0xf7, 0xe1, 0xc4, 0x72, 0x0e, 0xf2, 0xea, 0x63,
-        0xdb, 0x99, 0x6c, 0x21,
+        0xdb, 0x99, 0x6c, 0x21
     };
 
     return aes_gcm_encrypt(gcm_key, sizeof(gcm_key), gcm_iv, sizeof(gcm_iv),
-                           gcm_pt, sizeof(gcm_pt), NULL, 0,
-                           gcm_ct, sizeof(gcm_ct), gcm_tag, sizeof(gcm_tag))
+               gcm_pt, sizeof(gcm_pt), NULL, 0,
+               gcm_ct, sizeof(gcm_ct), gcm_tag, sizeof(gcm_tag))
         && aes_gcm_decrypt(gcm_key, sizeof(gcm_key), gcm_iv, sizeof(gcm_iv),
-                           gcm_pt, sizeof(gcm_pt), NULL, 0,
-                           gcm_ct, sizeof(gcm_ct), gcm_tag, sizeof(gcm_tag));
+            gcm_pt, sizeof(gcm_pt), NULL, 0,
+            gcm_ct, sizeof(gcm_ct), gcm_tag, sizeof(gcm_tag));
 }
 
 #ifndef OPENSSL_NO_RC4
 static int rc4_encrypt(const unsigned char *rc4_key, size_t rc4_key_s,
-                       const unsigned char *rc4_pt, size_t rc4_pt_s,
-                       const unsigned char *rc4_ct, size_t rc4_ct_s)
+    const unsigned char *rc4_pt, size_t rc4_pt_s,
+    const unsigned char *rc4_ct, size_t rc4_ct_s)
 {
     int ret = 0;
     EVP_CIPHER_CTX *ctx;
@@ -6209,16 +6372,16 @@ static int rc4_encrypt(const unsigned char *rc4_key, size_t rc4_key_s,
     };
 
     if (!TEST_ptr(ctx = EVP_CIPHER_CTX_new())
-            || !TEST_ptr(cipher = EVP_CIPHER_fetch(testctx, "RC4", "")))
+        || !TEST_ptr(cipher = EVP_CIPHER_fetch(testctx, "RC4", "")))
         goto err;
 
     params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_KEYLEN,
-                                            &rc4_key_s);
+        &rc4_key_s);
 
     if (!TEST_true(EVP_EncryptInit_ex2(ctx, cipher, rc4_key, NULL, params))
-            || !TEST_true(EVP_EncryptUpdate(ctx, outbuf, &outlen,
-                                            rc4_pt, rc4_pt_s))
-            || !TEST_true(EVP_EncryptFinal_ex(ctx, outbuf, &tmplen)))
+        || !TEST_true(EVP_EncryptUpdate(ctx, outbuf, &outlen,
+            rc4_pt, rc4_pt_s))
+        || !TEST_true(EVP_EncryptFinal_ex(ctx, outbuf, &tmplen)))
         goto err;
 
     if (!TEST_mem_eq(outbuf, outlen, rc4_ct, rc4_ct_s))
@@ -6233,8 +6396,8 @@ static int rc4_encrypt(const unsigned char *rc4_key, size_t rc4_key_s,
 }
 
 static int rc4_decrypt(const unsigned char *rc4_key, size_t rc4_key_s,
-                       const unsigned char *rc4_pt, size_t rc4_pt_s,
-                       const unsigned char *rc4_ct, size_t rc4_ct_s)
+    const unsigned char *rc4_pt, size_t rc4_pt_s,
+    const unsigned char *rc4_ct, size_t rc4_ct_s)
 {
     int ret = 0;
     EVP_CIPHER_CTX *ctx;
@@ -6252,12 +6415,12 @@ static int rc4_decrypt(const unsigned char *rc4_key, size_t rc4_key_s,
         goto err;
 
     params[0] = OSSL_PARAM_construct_size_t(OSSL_CIPHER_PARAM_KEYLEN,
-                                            &rc4_key_s);
+        &rc4_key_s);
 
     if (!TEST_true(EVP_DecryptInit_ex2(ctx, cipher, rc4_key, NULL, params))
-            || !TEST_true(EVP_DecryptUpdate(ctx, outbuf, &outlen,
-                                            rc4_ct, rc4_ct_s))
-            || !TEST_mem_eq(outbuf, outlen, rc4_pt, rc4_pt_s))
+        || !TEST_true(EVP_DecryptUpdate(ctx, outbuf, &outlen,
+            rc4_ct, rc4_ct_s))
+        || !TEST_mem_eq(outbuf, outlen, rc4_pt, rc4_pt_s))
         goto err;
 
     ret = 1;
@@ -6275,12 +6438,10 @@ static int test_aes_rc4_keylen_change_cve_2023_5363(void)
         unsigned char key[5];
         unsigned char padding[11];
     } rc4_key = {
-        {   /* Five bytes of key material */
-            0x83, 0x32, 0x22, 0x77, 0x2a,
-        },
-        {   /* Random padding to 16 bytes */
-            0x80, 0xad, 0x97, 0xbd, 0xc9, 0x73, 0xdf, 0x8a, 0xaa, 0x32, 0x91
-        }
+        { /* Five bytes of key material */
+            0x83, 0x32, 0x22, 0x77, 0x2a },
+        { /* Random padding to 16 bytes */
+            0x80, 0xad, 0x97, 0xbd, 0xc9, 0x73, 0xdf, 0x8a, 0xaa, 0x32, 0x91 }
     };
     static const unsigned char rc4_pt[] = {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6295,9 +6456,9 @@ static int test_aes_rc4_keylen_change_cve_2023_5363(void)
         return TEST_skip("Test requires legacy provider to be loaded");
 
     return rc4_encrypt(rc4_key.key, sizeof(rc4_key.key),
-                       rc4_pt, sizeof(rc4_pt), rc4_ct, sizeof(rc4_ct))
+               rc4_pt, sizeof(rc4_pt), rc4_ct, sizeof(rc4_ct))
         && rc4_decrypt(rc4_key.key, sizeof(rc4_key.key),
-                       rc4_pt, sizeof(rc4_pt), rc4_ct, sizeof(rc4_ct));
+            rc4_pt, sizeof(rc4_pt), rc4_ct, sizeof(rc4_ct));
 }
 #endif
 
@@ -6346,9 +6507,9 @@ static int test_evp_cipher_pipeline(void)
     if (!TEST_ptr(fake_pipeline = fake_pipeline_start(testctx)))
         return 0;
     if (!TEST_ptr(pipeline_cipher = EVP_CIPHER_fetch(testctx, "AES-256-GCM",
-                                                     "provider=fake-pipeline"))
+                      "provider=fake-pipeline"))
         || !TEST_ptr(cipher = EVP_CIPHER_fetch(testctx, "AES-256-GCM",
-                                               "provider!=fake-pipeline"))
+                         "provider!=fake-pipeline"))
         || !TEST_ptr(ctx = EVP_CIPHER_CTX_new()))
         goto end;
     memset(key, 0x01, sizeof(key));
@@ -6359,8 +6520,8 @@ static int test_evp_cipher_pipeline(void)
     if (!TEST_false(EVP_CIPHER_can_pipeline(EVP_aes_256_gcm(), 1)))
         goto end;
     if (!TEST_false(EVP_CipherPipelineEncryptInit(ctx, pipeline_cipher,
-                                                  key, keylen,
-                                                  EVP_MAX_PIPES + 1, NULL, 0)))
+            key, keylen,
+            EVP_MAX_PIPES + 1, NULL, 0)))
         goto end;
 
     /* Positive tests */
@@ -6382,8 +6543,7 @@ static int test_evp_cipher_pipeline(void)
             for (i = 0; i < numpipes; i++) {
                 if (!TEST_ptr(iv_array[i] = OPENSSL_malloc(ivlen))
                     || !TEST_ptr(plaintext_array[i] = OPENSSL_malloc(plaintextlen))
-                    || !TEST_ptr(ciphertext_array_p[i] =
-                                 OPENSSL_malloc(plaintextlen + EVP_MAX_BLOCK_LENGTH))
+                    || !TEST_ptr(ciphertext_array_p[i] = OPENSSL_malloc(plaintextlen + EVP_MAX_BLOCK_LENGTH))
                     || !TEST_ptr(tag_array[i] = OPENSSL_malloc(taglen)))
                     goto err;
 
@@ -6394,8 +6554,7 @@ static int test_evp_cipher_pipeline(void)
                 ciphertextlen_array[i] = 0;
                 outsize_array[i] = plaintextlen + EVP_MAX_BLOCK_LENGTH;
             }
-            if (!TEST_ptr(ciphertext =
-                          OPENSSL_malloc(plaintextlen + EVP_MAX_BLOCK_LENGTH))
+            if (!TEST_ptr(ciphertext = OPENSSL_malloc(plaintextlen + EVP_MAX_BLOCK_LENGTH))
                 || !TEST_ptr(tag = OPENSSL_malloc(taglen))
                 || !TEST_ptr(exp_plaintext = OPENSSL_malloc(plaintextlen)))
                 goto err;
@@ -6404,17 +6563,17 @@ static int test_evp_cipher_pipeline(void)
             if (!TEST_true(EVP_CIPHER_CTX_reset(ctx))
                 || !TEST_true(EVP_CIPHER_can_pipeline(pipeline_cipher, 1))
                 || !TEST_true(EVP_CipherPipelineEncryptInit(ctx, pipeline_cipher,
-                                                            key, keylen, numpipes,
-                                                            (const unsigned char **)iv_array,
-                                                            ivlen))
+                    key, keylen, numpipes,
+                    (const unsigned char **)iv_array,
+                    ivlen))
                 /* reuse plaintext for AAD as it won't affect test */
                 || !TEST_true(EVP_CipherPipelineUpdate(ctx, NULL, outlen_array, NULL,
-                                                       (const unsigned char **)plaintext_array,
-                                                       inlen_array))
+                    (const unsigned char **)plaintext_array,
+                    inlen_array))
                 || !TEST_true(EVP_CipherPipelineUpdate(ctx, ciphertext_array_p,
-                                                       outlen_array, outsize_array,
-                                                       (const unsigned char **)plaintext_array,
-                                                       inlen_array)))
+                    outlen_array, outsize_array,
+                    (const unsigned char **)plaintext_array,
+                    inlen_array)))
                 goto err;
 
             for (i = 0; i < numpipes; i++) {
@@ -6430,7 +6589,7 @@ static int test_evp_cipher_pipeline(void)
                 ciphertextlen_array[i] += outlen_array[i];
 
             params[0] = OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_PIPELINE_AEAD_TAG,
-                                                       (void **)&aead_tags, taglen);
+                (void **)&aead_tags, taglen);
             if (!TEST_true(EVP_CIPHER_CTX_get_params(ctx, params)))
                 goto err;
 
@@ -6441,11 +6600,11 @@ static int test_evp_cipher_pipeline(void)
             for (i = 0; i < numpipes; i++) {
                 if (!TEST_true(EVP_EncryptInit(ctx, cipher, key, iv_array[i]))
                     || !TEST_true(EVP_EncryptUpdate(ctx, NULL, &outlen,
-                                                    plaintext_array[i],
-                                                    plaintextlen))
+                        plaintext_array[i],
+                        plaintextlen))
                     || !TEST_true(EVP_EncryptUpdate(ctx, ciphertext, &outlen,
-                                                    plaintext_array[i],
-                                                    plaintextlen)))
+                        plaintext_array[i],
+                        plaintextlen)))
                     goto err;
                 ciphertextlen = outlen;
 
@@ -6454,12 +6613,12 @@ static int test_evp_cipher_pipeline(void)
                 ciphertextlen += outlen;
 
                 params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
-                                                              (void *)tag, taglen);
+                    (void *)tag, taglen);
                 if (!TEST_true(EVP_CIPHER_CTX_get_params(ctx, params)))
                     goto err;
 
                 if (!TEST_mem_eq(ciphertext_array_p[i], ciphertextlen_array[i],
-                                 ciphertext, ciphertextlen)
+                        ciphertext, ciphertextlen)
                     || !TEST_mem_eq(tag_array[i], taglen, tag, taglen))
                     goto err;
             }
@@ -6469,21 +6628,21 @@ static int test_evp_cipher_pipeline(void)
 
             /* Decrypt using pipeline API and compare */
             params[0] = OSSL_PARAM_construct_octet_ptr(OSSL_CIPHER_PARAM_PIPELINE_AEAD_TAG,
-                                                       (void **)&aead_tags, taglen);
+                (void **)&aead_tags, taglen);
             if (!TEST_true(EVP_CIPHER_CTX_reset(ctx))
                 || !TEST_true(EVP_CIPHER_can_pipeline(pipeline_cipher, 0))
                 || !TEST_true(EVP_CipherPipelineDecryptInit(ctx, pipeline_cipher,
-                                                            key, keylen, numpipes,
-                                                            (const unsigned char **)iv_array,
-                                                            ivlen))
+                    key, keylen, numpipes,
+                    (const unsigned char **)iv_array,
+                    ivlen))
                 || !TEST_true(EVP_CIPHER_CTX_set_params(ctx, params))
                 || !TEST_true(EVP_CipherPipelineUpdate(ctx, NULL, outlen_array, NULL,
-                                                       (const unsigned char **)plaintext_array,
-                                                       inlen_array))
+                    (const unsigned char **)plaintext_array,
+                    inlen_array))
                 || !TEST_true(EVP_CipherPipelineUpdate(ctx, plaintext_array,
-                                                       outlen_array, outsize_array,
-                                                       (const unsigned char **)ciphertext_array_p,
-                                                       ciphertextlen_array)))
+                    outlen_array, outsize_array,
+                    (const unsigned char **)ciphertext_array_p,
+                    ciphertextlen_array)))
                 goto err;
 
             for (i = 0; i < numpipes; i++) {
@@ -6497,7 +6656,7 @@ static int test_evp_cipher_pipeline(void)
             for (i = 0; i < numpipes; i++) {
                 memset(exp_plaintext, i + 1, plaintextlen);
                 if (!TEST_mem_eq(plaintext_array[i], plaintextlen,
-                                 exp_plaintext, plaintextlen))
+                        exp_plaintext, plaintextlen))
                     goto err;
             }
 
@@ -6582,6 +6741,9 @@ int setup_tests(void)
     ADD_TEST(test_EVP_set_default_properties);
     ADD_ALL_TESTS(test_EVP_DigestSignInit, 30);
     ADD_TEST(test_EVP_DigestVerifyInit);
+#ifndef OPENSSL_NO_EC
+    ADD_TEST(test_ecdsa_digestsign_keccak);
+#endif
 #ifndef OPENSSL_NO_SIPHASH
     ADD_TEST(test_siphash_digestsign);
 #endif
@@ -6595,6 +6757,7 @@ int setup_tests(void)
     ADD_ALL_TESTS(test_d2i_AutoPrivateKey, OSSL_NELEM(keydata));
     ADD_TEST(test_privatekey_to_pkcs8);
     ADD_TEST(test_EVP_PKCS82PKEY_wrong_tag);
+    ADD_ALL_TESTS(test_EVP_PKCS82PKEY_v2, OSSL_NELEM(keydata_v2));
 #ifndef OPENSSL_NO_EC
     ADD_TEST(test_EVP_PKCS82PKEY);
 #endif
@@ -6627,7 +6790,7 @@ int setup_tests(void)
     ADD_TEST(test_X509_PUBKEY_inplace);
     ADD_TEST(test_X509_PUBKEY_dup);
     ADD_ALL_TESTS(test_invalide_ec_char2_pub_range_decode,
-                  OSSL_NELEM(ec_der_pub_keys));
+        OSSL_NELEM(ec_der_pub_keys));
 #endif
 #ifndef OPENSSL_NO_DSA
     ADD_TEST(test_DSA_get_set_params);
@@ -6636,6 +6799,7 @@ int setup_tests(void)
     ADD_TEST(test_RSA_get_set_params);
     ADD_TEST(test_RSA_OAEP_set_get_params);
     ADD_TEST(test_RSA_OAEP_set_null_label);
+    ADD_TEST(test_RSA_encrypt);
 #ifndef OPENSSL_NO_DEPRECATED_3_0
     ADD_TEST(test_RSA_legacy);
 #endif
@@ -6644,17 +6808,17 @@ int setup_tests(void)
 #endif
 #ifndef OPENSSL_NO_DH
     ADD_TEST(test_DH_priv_pub);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     ADD_TEST(test_EVP_PKEY_set1_DH);
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_EC
     ADD_TEST(test_EC_priv_pub);
     ADD_TEST(test_evp_get_ec_pub);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     ADD_TEST(test_EC_priv_only_legacy);
     ADD_TEST(test_evp_get_ec_pub_legacy);
-# endif
+#endif
 #endif
     ADD_ALL_TESTS(test_keygen_with_empty_template, 2);
     ADD_ALL_TESTS(test_pkey_ctx_fail_without_provider, 2);
@@ -6691,17 +6855,17 @@ int setup_tests(void)
     ADD_TEST(test_custom_md_meth);
     ADD_TEST(test_custom_ciph_meth);
 
-# ifndef OPENSSL_NO_DYNAMIC_ENGINE
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
     /* Tests only support the default libctx */
     if (testctx == NULL) {
-#  ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
         ADD_ALL_TESTS(test_signatures_with_engine, 3);
-#  else
+#else
         ADD_ALL_TESTS(test_signatures_with_engine, 2);
-#  endif
+#endif
         ADD_TEST(test_cipher_with_engine);
     }
-# endif
+#endif
 #endif
 
 #ifndef OPENSSL_NO_ECX
diff --git a/test/evp_extra_test2.c b/test/evp_extra_test2.c
index 90690bbeb52f2..3a4a50083821a 100644
--- a/test/evp_extra_test2.c
+++ b/test/evp_extra_test2.c
@@ -32,9 +32,9 @@
 
 /* Defined in tls-provider.c */
 int tls_provider_init(const OSSL_CORE_HANDLE *handle,
-                      const OSSL_DISPATCH *in,
-                      const OSSL_DISPATCH **out,
-                      void **provctx);
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx);
 
 static OSSL_LIB_CTX *mainctx = NULL;
 static OSSL_PROVIDER *nullprov = NULL;
@@ -44,57 +44,614 @@ static OSSL_PROVIDER *nullprov = NULL;
  * should never use this key anywhere but in an example.
  */
 static const unsigned char kExampleRSAKeyDER[] = {
-    0x30, 0x82, 0x02, 0x5c, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81, 0x00, 0xf8,
-    0xb8, 0x6c, 0x83, 0xb4, 0xbc, 0xd9, 0xa8, 0x57, 0xc0, 0xa5, 0xb4, 0x59,
-    0x76, 0x8c, 0x54, 0x1d, 0x79, 0xeb, 0x22, 0x52, 0x04, 0x7e, 0xd3, 0x37,
-    0xeb, 0x41, 0xfd, 0x83, 0xf9, 0xf0, 0xa6, 0x85, 0x15, 0x34, 0x75, 0x71,
-    0x5a, 0x84, 0xa8, 0x3c, 0xd2, 0xef, 0x5a, 0x4e, 0xd3, 0xde, 0x97, 0x8a,
-    0xdd, 0xff, 0xbb, 0xcf, 0x0a, 0xaa, 0x86, 0x92, 0xbe, 0xb8, 0x50, 0xe4,
-    0xcd, 0x6f, 0x80, 0x33, 0x30, 0x76, 0x13, 0x8f, 0xca, 0x7b, 0xdc, 0xec,
-    0x5a, 0xca, 0x63, 0xc7, 0x03, 0x25, 0xef, 0xa8, 0x8a, 0x83, 0x58, 0x76,
-    0x20, 0xfa, 0x16, 0x77, 0xd7, 0x79, 0x92, 0x63, 0x01, 0x48, 0x1a, 0xd8,
-    0x7b, 0x67, 0xf1, 0x52, 0x55, 0x49, 0x4e, 0xd6, 0x6e, 0x4a, 0x5c, 0xd7,
-    0x7a, 0x37, 0x36, 0x0c, 0xde, 0xdd, 0x8f, 0x44, 0xe8, 0xc2, 0xa7, 0x2c,
-    0x2b, 0xb5, 0xaf, 0x64, 0x4b, 0x61, 0x07, 0x02, 0x03, 0x01, 0x00, 0x01,
-    0x02, 0x81, 0x80, 0x74, 0x88, 0x64, 0x3f, 0x69, 0x45, 0x3a, 0x6d, 0xc7,
-    0x7f, 0xb9, 0xa3, 0xc0, 0x6e, 0xec, 0xdc, 0xd4, 0x5a, 0xb5, 0x32, 0x85,
-    0x5f, 0x19, 0xd4, 0xf8, 0xd4, 0x3f, 0x3c, 0xfa, 0xc2, 0xf6, 0x5f, 0xee,
-    0xe6, 0xba, 0x87, 0x74, 0x2e, 0xc7, 0x0c, 0xd4, 0x42, 0xb8, 0x66, 0x85,
-    0x9c, 0x7b, 0x24, 0x61, 0xaa, 0x16, 0x11, 0xf6, 0xb5, 0xb6, 0xa4, 0x0a,
-    0xc9, 0x55, 0x2e, 0x81, 0xa5, 0x47, 0x61, 0xcb, 0x25, 0x8f, 0xc2, 0x15,
-    0x7b, 0x0e, 0x7c, 0x36, 0x9f, 0x3a, 0xda, 0x58, 0x86, 0x1c, 0x5b, 0x83,
-    0x79, 0xe6, 0x2b, 0xcc, 0xe6, 0xfa, 0x2c, 0x61, 0xf2, 0x78, 0x80, 0x1b,
-    0xe2, 0xf3, 0x9d, 0x39, 0x2b, 0x65, 0x57, 0x91, 0x3d, 0x71, 0x99, 0x73,
-    0xa5, 0xc2, 0x79, 0x20, 0x8c, 0x07, 0x4f, 0xe5, 0xb4, 0x60, 0x1f, 0x99,
-    0xa2, 0xb1, 0x4f, 0x0c, 0xef, 0xbc, 0x59, 0x53, 0x00, 0x7d, 0xb1, 0x02,
-    0x41, 0x00, 0xfc, 0x7e, 0x23, 0x65, 0x70, 0xf8, 0xce, 0xd3, 0x40, 0x41,
-    0x80, 0x6a, 0x1d, 0x01, 0xd6, 0x01, 0xff, 0xb6, 0x1b, 0x3d, 0x3d, 0x59,
-    0x09, 0x33, 0x79, 0xc0, 0x4f, 0xde, 0x96, 0x27, 0x4b, 0x18, 0xc6, 0xd9,
-    0x78, 0xf1, 0xf4, 0x35, 0x46, 0xe9, 0x7c, 0x42, 0x7a, 0x5d, 0x9f, 0xef,
-    0x54, 0xb8, 0xf7, 0x9f, 0xc4, 0x33, 0x6c, 0xf3, 0x8c, 0x32, 0x46, 0x87,
-    0x67, 0x30, 0x7b, 0xa7, 0xac, 0xe3, 0x02, 0x41, 0x00, 0xfc, 0x2c, 0xdf,
-    0x0c, 0x0d, 0x88, 0xf5, 0xb1, 0x92, 0xa8, 0x93, 0x47, 0x63, 0x55, 0xf5,
-    0xca, 0x58, 0x43, 0xba, 0x1c, 0xe5, 0x9e, 0xb6, 0x95, 0x05, 0xcd, 0xb5,
-    0x82, 0xdf, 0xeb, 0x04, 0x53, 0x9d, 0xbd, 0xc2, 0x38, 0x16, 0xb3, 0x62,
-    0xdd, 0xa1, 0x46, 0xdb, 0x6d, 0x97, 0x93, 0x9f, 0x8a, 0xc3, 0x9b, 0x64,
-    0x7e, 0x42, 0xe3, 0x32, 0x57, 0x19, 0x1b, 0xd5, 0x6e, 0x85, 0xfa, 0xb8,
-    0x8d, 0x02, 0x41, 0x00, 0xbc, 0x3d, 0xde, 0x6d, 0xd6, 0x97, 0xe8, 0xba,
-    0x9e, 0x81, 0x37, 0x17, 0xe5, 0xa0, 0x64, 0xc9, 0x00, 0xb7, 0xe7, 0xfe,
-    0xf4, 0x29, 0xd9, 0x2e, 0x43, 0x6b, 0x19, 0x20, 0xbd, 0x99, 0x75, 0xe7,
-    0x76, 0xf8, 0xd3, 0xae, 0xaf, 0x7e, 0xb8, 0xeb, 0x81, 0xf4, 0x9d, 0xfe,
-    0x07, 0x2b, 0x0b, 0x63, 0x0b, 0x5a, 0x55, 0x90, 0x71, 0x7d, 0xf1, 0xdb,
-    0xd9, 0xb1, 0x41, 0x41, 0x68, 0x2f, 0x4e, 0x39, 0x02, 0x40, 0x5a, 0x34,
-    0x66, 0xd8, 0xf5, 0xe2, 0x7f, 0x18, 0xb5, 0x00, 0x6e, 0x26, 0x84, 0x27,
-    0x14, 0x93, 0xfb, 0xfc, 0xc6, 0x0f, 0x5e, 0x27, 0xe6, 0xe1, 0xe9, 0xc0,
-    0x8a, 0xe4, 0x34, 0xda, 0xe9, 0xa2, 0x4b, 0x73, 0xbc, 0x8c, 0xb9, 0xba,
-    0x13, 0x6c, 0x7a, 0x2b, 0x51, 0x84, 0xa3, 0x4a, 0xe0, 0x30, 0x10, 0x06,
-    0x7e, 0xed, 0x17, 0x5a, 0x14, 0x00, 0xc9, 0xef, 0x85, 0xea, 0x52, 0x2c,
-    0xbc, 0x65, 0x02, 0x40, 0x51, 0xe3, 0xf2, 0x83, 0x19, 0x9b, 0xc4, 0x1e,
-    0x2f, 0x50, 0x3d, 0xdf, 0x5a, 0xa2, 0x18, 0xca, 0x5f, 0x2e, 0x49, 0xaf,
-    0x6f, 0xcc, 0xfa, 0x65, 0x77, 0x94, 0xb5, 0xa1, 0x0a, 0xa9, 0xd1, 0x8a,
-    0x39, 0x37, 0xf4, 0x0b, 0xa0, 0xd7, 0x82, 0x27, 0x5e, 0xae, 0x17, 0x17,
-    0xa1, 0x1e, 0x54, 0x34, 0xbf, 0x6e, 0xc4, 0x8e, 0x99, 0x5d, 0x08, 0xf1,
-    0x2d, 0x86, 0x9d, 0xa5, 0x20, 0x1b, 0xe5, 0xdf,
+    0x30,
+    0x82,
+    0x02,
+    0x5c,
+    0x02,
+    0x01,
+    0x00,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xf8,
+    0xb8,
+    0x6c,
+    0x83,
+    0xb4,
+    0xbc,
+    0xd9,
+    0xa8,
+    0x57,
+    0xc0,
+    0xa5,
+    0xb4,
+    0x59,
+    0x76,
+    0x8c,
+    0x54,
+    0x1d,
+    0x79,
+    0xeb,
+    0x22,
+    0x52,
+    0x04,
+    0x7e,
+    0xd3,
+    0x37,
+    0xeb,
+    0x41,
+    0xfd,
+    0x83,
+    0xf9,
+    0xf0,
+    0xa6,
+    0x85,
+    0x15,
+    0x34,
+    0x75,
+    0x71,
+    0x5a,
+    0x84,
+    0xa8,
+    0x3c,
+    0xd2,
+    0xef,
+    0x5a,
+    0x4e,
+    0xd3,
+    0xde,
+    0x97,
+    0x8a,
+    0xdd,
+    0xff,
+    0xbb,
+    0xcf,
+    0x0a,
+    0xaa,
+    0x86,
+    0x92,
+    0xbe,
+    0xb8,
+    0x50,
+    0xe4,
+    0xcd,
+    0x6f,
+    0x80,
+    0x33,
+    0x30,
+    0x76,
+    0x13,
+    0x8f,
+    0xca,
+    0x7b,
+    0xdc,
+    0xec,
+    0x5a,
+    0xca,
+    0x63,
+    0xc7,
+    0x03,
+    0x25,
+    0xef,
+    0xa8,
+    0x8a,
+    0x83,
+    0x58,
+    0x76,
+    0x20,
+    0xfa,
+    0x16,
+    0x77,
+    0xd7,
+    0x79,
+    0x92,
+    0x63,
+    0x01,
+    0x48,
+    0x1a,
+    0xd8,
+    0x7b,
+    0x67,
+    0xf1,
+    0x52,
+    0x55,
+    0x49,
+    0x4e,
+    0xd6,
+    0x6e,
+    0x4a,
+    0x5c,
+    0xd7,
+    0x7a,
+    0x37,
+    0x36,
+    0x0c,
+    0xde,
+    0xdd,
+    0x8f,
+    0x44,
+    0xe8,
+    0xc2,
+    0xa7,
+    0x2c,
+    0x2b,
+    0xb5,
+    0xaf,
+    0x64,
+    0x4b,
+    0x61,
+    0x07,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0x02,
+    0x81,
+    0x80,
+    0x74,
+    0x88,
+    0x64,
+    0x3f,
+    0x69,
+    0x45,
+    0x3a,
+    0x6d,
+    0xc7,
+    0x7f,
+    0xb9,
+    0xa3,
+    0xc0,
+    0x6e,
+    0xec,
+    0xdc,
+    0xd4,
+    0x5a,
+    0xb5,
+    0x32,
+    0x85,
+    0x5f,
+    0x19,
+    0xd4,
+    0xf8,
+    0xd4,
+    0x3f,
+    0x3c,
+    0xfa,
+    0xc2,
+    0xf6,
+    0x5f,
+    0xee,
+    0xe6,
+    0xba,
+    0x87,
+    0x74,
+    0x2e,
+    0xc7,
+    0x0c,
+    0xd4,
+    0x42,
+    0xb8,
+    0x66,
+    0x85,
+    0x9c,
+    0x7b,
+    0x24,
+    0x61,
+    0xaa,
+    0x16,
+    0x11,
+    0xf6,
+    0xb5,
+    0xb6,
+    0xa4,
+    0x0a,
+    0xc9,
+    0x55,
+    0x2e,
+    0x81,
+    0xa5,
+    0x47,
+    0x61,
+    0xcb,
+    0x25,
+    0x8f,
+    0xc2,
+    0x15,
+    0x7b,
+    0x0e,
+    0x7c,
+    0x36,
+    0x9f,
+    0x3a,
+    0xda,
+    0x58,
+    0x86,
+    0x1c,
+    0x5b,
+    0x83,
+    0x79,
+    0xe6,
+    0x2b,
+    0xcc,
+    0xe6,
+    0xfa,
+    0x2c,
+    0x61,
+    0xf2,
+    0x78,
+    0x80,
+    0x1b,
+    0xe2,
+    0xf3,
+    0x9d,
+    0x39,
+    0x2b,
+    0x65,
+    0x57,
+    0x91,
+    0x3d,
+    0x71,
+    0x99,
+    0x73,
+    0xa5,
+    0xc2,
+    0x79,
+    0x20,
+    0x8c,
+    0x07,
+    0x4f,
+    0xe5,
+    0xb4,
+    0x60,
+    0x1f,
+    0x99,
+    0xa2,
+    0xb1,
+    0x4f,
+    0x0c,
+    0xef,
+    0xbc,
+    0x59,
+    0x53,
+    0x00,
+    0x7d,
+    0xb1,
+    0x02,
+    0x41,
+    0x00,
+    0xfc,
+    0x7e,
+    0x23,
+    0x65,
+    0x70,
+    0xf8,
+    0xce,
+    0xd3,
+    0x40,
+    0x41,
+    0x80,
+    0x6a,
+    0x1d,
+    0x01,
+    0xd6,
+    0x01,
+    0xff,
+    0xb6,
+    0x1b,
+    0x3d,
+    0x3d,
+    0x59,
+    0x09,
+    0x33,
+    0x79,
+    0xc0,
+    0x4f,
+    0xde,
+    0x96,
+    0x27,
+    0x4b,
+    0x18,
+    0xc6,
+    0xd9,
+    0x78,
+    0xf1,
+    0xf4,
+    0x35,
+    0x46,
+    0xe9,
+    0x7c,
+    0x42,
+    0x7a,
+    0x5d,
+    0x9f,
+    0xef,
+    0x54,
+    0xb8,
+    0xf7,
+    0x9f,
+    0xc4,
+    0x33,
+    0x6c,
+    0xf3,
+    0x8c,
+    0x32,
+    0x46,
+    0x87,
+    0x67,
+    0x30,
+    0x7b,
+    0xa7,
+    0xac,
+    0xe3,
+    0x02,
+    0x41,
+    0x00,
+    0xfc,
+    0x2c,
+    0xdf,
+    0x0c,
+    0x0d,
+    0x88,
+    0xf5,
+    0xb1,
+    0x92,
+    0xa8,
+    0x93,
+    0x47,
+    0x63,
+    0x55,
+    0xf5,
+    0xca,
+    0x58,
+    0x43,
+    0xba,
+    0x1c,
+    0xe5,
+    0x9e,
+    0xb6,
+    0x95,
+    0x05,
+    0xcd,
+    0xb5,
+    0x82,
+    0xdf,
+    0xeb,
+    0x04,
+    0x53,
+    0x9d,
+    0xbd,
+    0xc2,
+    0x38,
+    0x16,
+    0xb3,
+    0x62,
+    0xdd,
+    0xa1,
+    0x46,
+    0xdb,
+    0x6d,
+    0x97,
+    0x93,
+    0x9f,
+    0x8a,
+    0xc3,
+    0x9b,
+    0x64,
+    0x7e,
+    0x42,
+    0xe3,
+    0x32,
+    0x57,
+    0x19,
+    0x1b,
+    0xd5,
+    0x6e,
+    0x85,
+    0xfa,
+    0xb8,
+    0x8d,
+    0x02,
+    0x41,
+    0x00,
+    0xbc,
+    0x3d,
+    0xde,
+    0x6d,
+    0xd6,
+    0x97,
+    0xe8,
+    0xba,
+    0x9e,
+    0x81,
+    0x37,
+    0x17,
+    0xe5,
+    0xa0,
+    0x64,
+    0xc9,
+    0x00,
+    0xb7,
+    0xe7,
+    0xfe,
+    0xf4,
+    0x29,
+    0xd9,
+    0x2e,
+    0x43,
+    0x6b,
+    0x19,
+    0x20,
+    0xbd,
+    0x99,
+    0x75,
+    0xe7,
+    0x76,
+    0xf8,
+    0xd3,
+    0xae,
+    0xaf,
+    0x7e,
+    0xb8,
+    0xeb,
+    0x81,
+    0xf4,
+    0x9d,
+    0xfe,
+    0x07,
+    0x2b,
+    0x0b,
+    0x63,
+    0x0b,
+    0x5a,
+    0x55,
+    0x90,
+    0x71,
+    0x7d,
+    0xf1,
+    0xdb,
+    0xd9,
+    0xb1,
+    0x41,
+    0x41,
+    0x68,
+    0x2f,
+    0x4e,
+    0x39,
+    0x02,
+    0x40,
+    0x5a,
+    0x34,
+    0x66,
+    0xd8,
+    0xf5,
+    0xe2,
+    0x7f,
+    0x18,
+    0xb5,
+    0x00,
+    0x6e,
+    0x26,
+    0x84,
+    0x27,
+    0x14,
+    0x93,
+    0xfb,
+    0xfc,
+    0xc6,
+    0x0f,
+    0x5e,
+    0x27,
+    0xe6,
+    0xe1,
+    0xe9,
+    0xc0,
+    0x8a,
+    0xe4,
+    0x34,
+    0xda,
+    0xe9,
+    0xa2,
+    0x4b,
+    0x73,
+    0xbc,
+    0x8c,
+    0xb9,
+    0xba,
+    0x13,
+    0x6c,
+    0x7a,
+    0x2b,
+    0x51,
+    0x84,
+    0xa3,
+    0x4a,
+    0xe0,
+    0x30,
+    0x10,
+    0x06,
+    0x7e,
+    0xed,
+    0x17,
+    0x5a,
+    0x14,
+    0x00,
+    0xc9,
+    0xef,
+    0x85,
+    0xea,
+    0x52,
+    0x2c,
+    0xbc,
+    0x65,
+    0x02,
+    0x40,
+    0x51,
+    0xe3,
+    0xf2,
+    0x83,
+    0x19,
+    0x9b,
+    0xc4,
+    0x1e,
+    0x2f,
+    0x50,
+    0x3d,
+    0xdf,
+    0x5a,
+    0xa2,
+    0x18,
+    0xca,
+    0x5f,
+    0x2e,
+    0x49,
+    0xaf,
+    0x6f,
+    0xcc,
+    0xfa,
+    0x65,
+    0x77,
+    0x94,
+    0xb5,
+    0xa1,
+    0x0a,
+    0xa9,
+    0xd1,
+    0x8a,
+    0x39,
+    0x37,
+    0xf4,
+    0x0b,
+    0xa0,
+    0xd7,
+    0x82,
+    0x27,
+    0x5e,
+    0xae,
+    0x17,
+    0x17,
+    0xa1,
+    0x1e,
+    0x54,
+    0x34,
+    0xbf,
+    0x6e,
+    0xc4,
+    0x8e,
+    0x99,
+    0x5d,
+    0x08,
+    0xf1,
+    0x2d,
+    0x86,
+    0x9d,
+    0xa5,
+    0x20,
+    0x1b,
+    0xe5,
+    0xdf,
 };
 
 /*
@@ -102,59 +659,640 @@ static const unsigned char kExampleRSAKeyDER[] = {
  * PrivateKeyInfo.
  */
 static const unsigned char kExampleRSAKeyPKCS8[] = {
-    0x30, 0x82, 0x02, 0x76, 0x02, 0x01, 0x00, 0x30, 0x0d, 0x06, 0x09, 0x2a,
-    0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82,
-    0x02, 0x60, 0x30, 0x82, 0x02, 0x5c, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81,
-    0x00, 0xf8, 0xb8, 0x6c, 0x83, 0xb4, 0xbc, 0xd9, 0xa8, 0x57, 0xc0, 0xa5,
-    0xb4, 0x59, 0x76, 0x8c, 0x54, 0x1d, 0x79, 0xeb, 0x22, 0x52, 0x04, 0x7e,
-    0xd3, 0x37, 0xeb, 0x41, 0xfd, 0x83, 0xf9, 0xf0, 0xa6, 0x85, 0x15, 0x34,
-    0x75, 0x71, 0x5a, 0x84, 0xa8, 0x3c, 0xd2, 0xef, 0x5a, 0x4e, 0xd3, 0xde,
-    0x97, 0x8a, 0xdd, 0xff, 0xbb, 0xcf, 0x0a, 0xaa, 0x86, 0x92, 0xbe, 0xb8,
-    0x50, 0xe4, 0xcd, 0x6f, 0x80, 0x33, 0x30, 0x76, 0x13, 0x8f, 0xca, 0x7b,
-    0xdc, 0xec, 0x5a, 0xca, 0x63, 0xc7, 0x03, 0x25, 0xef, 0xa8, 0x8a, 0x83,
-    0x58, 0x76, 0x20, 0xfa, 0x16, 0x77, 0xd7, 0x79, 0x92, 0x63, 0x01, 0x48,
-    0x1a, 0xd8, 0x7b, 0x67, 0xf1, 0x52, 0x55, 0x49, 0x4e, 0xd6, 0x6e, 0x4a,
-    0x5c, 0xd7, 0x7a, 0x37, 0x36, 0x0c, 0xde, 0xdd, 0x8f, 0x44, 0xe8, 0xc2,
-    0xa7, 0x2c, 0x2b, 0xb5, 0xaf, 0x64, 0x4b, 0x61, 0x07, 0x02, 0x03, 0x01,
-    0x00, 0x01, 0x02, 0x81, 0x80, 0x74, 0x88, 0x64, 0x3f, 0x69, 0x45, 0x3a,
-    0x6d, 0xc7, 0x7f, 0xb9, 0xa3, 0xc0, 0x6e, 0xec, 0xdc, 0xd4, 0x5a, 0xb5,
-    0x32, 0x85, 0x5f, 0x19, 0xd4, 0xf8, 0xd4, 0x3f, 0x3c, 0xfa, 0xc2, 0xf6,
-    0x5f, 0xee, 0xe6, 0xba, 0x87, 0x74, 0x2e, 0xc7, 0x0c, 0xd4, 0x42, 0xb8,
-    0x66, 0x85, 0x9c, 0x7b, 0x24, 0x61, 0xaa, 0x16, 0x11, 0xf6, 0xb5, 0xb6,
-    0xa4, 0x0a, 0xc9, 0x55, 0x2e, 0x81, 0xa5, 0x47, 0x61, 0xcb, 0x25, 0x8f,
-    0xc2, 0x15, 0x7b, 0x0e, 0x7c, 0x36, 0x9f, 0x3a, 0xda, 0x58, 0x86, 0x1c,
-    0x5b, 0x83, 0x79, 0xe6, 0x2b, 0xcc, 0xe6, 0xfa, 0x2c, 0x61, 0xf2, 0x78,
-    0x80, 0x1b, 0xe2, 0xf3, 0x9d, 0x39, 0x2b, 0x65, 0x57, 0x91, 0x3d, 0x71,
-    0x99, 0x73, 0xa5, 0xc2, 0x79, 0x20, 0x8c, 0x07, 0x4f, 0xe5, 0xb4, 0x60,
-    0x1f, 0x99, 0xa2, 0xb1, 0x4f, 0x0c, 0xef, 0xbc, 0x59, 0x53, 0x00, 0x7d,
-    0xb1, 0x02, 0x41, 0x00, 0xfc, 0x7e, 0x23, 0x65, 0x70, 0xf8, 0xce, 0xd3,
-    0x40, 0x41, 0x80, 0x6a, 0x1d, 0x01, 0xd6, 0x01, 0xff, 0xb6, 0x1b, 0x3d,
-    0x3d, 0x59, 0x09, 0x33, 0x79, 0xc0, 0x4f, 0xde, 0x96, 0x27, 0x4b, 0x18,
-    0xc6, 0xd9, 0x78, 0xf1, 0xf4, 0x35, 0x46, 0xe9, 0x7c, 0x42, 0x7a, 0x5d,
-    0x9f, 0xef, 0x54, 0xb8, 0xf7, 0x9f, 0xc4, 0x33, 0x6c, 0xf3, 0x8c, 0x32,
-    0x46, 0x87, 0x67, 0x30, 0x7b, 0xa7, 0xac, 0xe3, 0x02, 0x41, 0x00, 0xfc,
-    0x2c, 0xdf, 0x0c, 0x0d, 0x88, 0xf5, 0xb1, 0x92, 0xa8, 0x93, 0x47, 0x63,
-    0x55, 0xf5, 0xca, 0x58, 0x43, 0xba, 0x1c, 0xe5, 0x9e, 0xb6, 0x95, 0x05,
-    0xcd, 0xb5, 0x82, 0xdf, 0xeb, 0x04, 0x53, 0x9d, 0xbd, 0xc2, 0x38, 0x16,
-    0xb3, 0x62, 0xdd, 0xa1, 0x46, 0xdb, 0x6d, 0x97, 0x93, 0x9f, 0x8a, 0xc3,
-    0x9b, 0x64, 0x7e, 0x42, 0xe3, 0x32, 0x57, 0x19, 0x1b, 0xd5, 0x6e, 0x85,
-    0xfa, 0xb8, 0x8d, 0x02, 0x41, 0x00, 0xbc, 0x3d, 0xde, 0x6d, 0xd6, 0x97,
-    0xe8, 0xba, 0x9e, 0x81, 0x37, 0x17, 0xe5, 0xa0, 0x64, 0xc9, 0x00, 0xb7,
-    0xe7, 0xfe, 0xf4, 0x29, 0xd9, 0x2e, 0x43, 0x6b, 0x19, 0x20, 0xbd, 0x99,
-    0x75, 0xe7, 0x76, 0xf8, 0xd3, 0xae, 0xaf, 0x7e, 0xb8, 0xeb, 0x81, 0xf4,
-    0x9d, 0xfe, 0x07, 0x2b, 0x0b, 0x63, 0x0b, 0x5a, 0x55, 0x90, 0x71, 0x7d,
-    0xf1, 0xdb, 0xd9, 0xb1, 0x41, 0x41, 0x68, 0x2f, 0x4e, 0x39, 0x02, 0x40,
-    0x5a, 0x34, 0x66, 0xd8, 0xf5, 0xe2, 0x7f, 0x18, 0xb5, 0x00, 0x6e, 0x26,
-    0x84, 0x27, 0x14, 0x93, 0xfb, 0xfc, 0xc6, 0x0f, 0x5e, 0x27, 0xe6, 0xe1,
-    0xe9, 0xc0, 0x8a, 0xe4, 0x34, 0xda, 0xe9, 0xa2, 0x4b, 0x73, 0xbc, 0x8c,
-    0xb9, 0xba, 0x13, 0x6c, 0x7a, 0x2b, 0x51, 0x84, 0xa3, 0x4a, 0xe0, 0x30,
-    0x10, 0x06, 0x7e, 0xed, 0x17, 0x5a, 0x14, 0x00, 0xc9, 0xef, 0x85, 0xea,
-    0x52, 0x2c, 0xbc, 0x65, 0x02, 0x40, 0x51, 0xe3, 0xf2, 0x83, 0x19, 0x9b,
-    0xc4, 0x1e, 0x2f, 0x50, 0x3d, 0xdf, 0x5a, 0xa2, 0x18, 0xca, 0x5f, 0x2e,
-    0x49, 0xaf, 0x6f, 0xcc, 0xfa, 0x65, 0x77, 0x94, 0xb5, 0xa1, 0x0a, 0xa9,
-    0xd1, 0x8a, 0x39, 0x37, 0xf4, 0x0b, 0xa0, 0xd7, 0x82, 0x27, 0x5e, 0xae,
-    0x17, 0x17, 0xa1, 0x1e, 0x54, 0x34, 0xbf, 0x6e, 0xc4, 0x8e, 0x99, 0x5d,
-    0x08, 0xf1, 0x2d, 0x86, 0x9d, 0xa5, 0x20, 0x1b, 0xe5, 0xdf,
+    0x30,
+    0x82,
+    0x02,
+    0x76,
+    0x02,
+    0x01,
+    0x00,
+    0x30,
+    0x0d,
+    0x06,
+    0x09,
+    0x2a,
+    0x86,
+    0x48,
+    0x86,
+    0xf7,
+    0x0d,
+    0x01,
+    0x01,
+    0x01,
+    0x05,
+    0x00,
+    0x04,
+    0x82,
+    0x02,
+    0x60,
+    0x30,
+    0x82,
+    0x02,
+    0x5c,
+    0x02,
+    0x01,
+    0x00,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xf8,
+    0xb8,
+    0x6c,
+    0x83,
+    0xb4,
+    0xbc,
+    0xd9,
+    0xa8,
+    0x57,
+    0xc0,
+    0xa5,
+    0xb4,
+    0x59,
+    0x76,
+    0x8c,
+    0x54,
+    0x1d,
+    0x79,
+    0xeb,
+    0x22,
+    0x52,
+    0x04,
+    0x7e,
+    0xd3,
+    0x37,
+    0xeb,
+    0x41,
+    0xfd,
+    0x83,
+    0xf9,
+    0xf0,
+    0xa6,
+    0x85,
+    0x15,
+    0x34,
+    0x75,
+    0x71,
+    0x5a,
+    0x84,
+    0xa8,
+    0x3c,
+    0xd2,
+    0xef,
+    0x5a,
+    0x4e,
+    0xd3,
+    0xde,
+    0x97,
+    0x8a,
+    0xdd,
+    0xff,
+    0xbb,
+    0xcf,
+    0x0a,
+    0xaa,
+    0x86,
+    0x92,
+    0xbe,
+    0xb8,
+    0x50,
+    0xe4,
+    0xcd,
+    0x6f,
+    0x80,
+    0x33,
+    0x30,
+    0x76,
+    0x13,
+    0x8f,
+    0xca,
+    0x7b,
+    0xdc,
+    0xec,
+    0x5a,
+    0xca,
+    0x63,
+    0xc7,
+    0x03,
+    0x25,
+    0xef,
+    0xa8,
+    0x8a,
+    0x83,
+    0x58,
+    0x76,
+    0x20,
+    0xfa,
+    0x16,
+    0x77,
+    0xd7,
+    0x79,
+    0x92,
+    0x63,
+    0x01,
+    0x48,
+    0x1a,
+    0xd8,
+    0x7b,
+    0x67,
+    0xf1,
+    0x52,
+    0x55,
+    0x49,
+    0x4e,
+    0xd6,
+    0x6e,
+    0x4a,
+    0x5c,
+    0xd7,
+    0x7a,
+    0x37,
+    0x36,
+    0x0c,
+    0xde,
+    0xdd,
+    0x8f,
+    0x44,
+    0xe8,
+    0xc2,
+    0xa7,
+    0x2c,
+    0x2b,
+    0xb5,
+    0xaf,
+    0x64,
+    0x4b,
+    0x61,
+    0x07,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0x02,
+    0x81,
+    0x80,
+    0x74,
+    0x88,
+    0x64,
+    0x3f,
+    0x69,
+    0x45,
+    0x3a,
+    0x6d,
+    0xc7,
+    0x7f,
+    0xb9,
+    0xa3,
+    0xc0,
+    0x6e,
+    0xec,
+    0xdc,
+    0xd4,
+    0x5a,
+    0xb5,
+    0x32,
+    0x85,
+    0x5f,
+    0x19,
+    0xd4,
+    0xf8,
+    0xd4,
+    0x3f,
+    0x3c,
+    0xfa,
+    0xc2,
+    0xf6,
+    0x5f,
+    0xee,
+    0xe6,
+    0xba,
+    0x87,
+    0x74,
+    0x2e,
+    0xc7,
+    0x0c,
+    0xd4,
+    0x42,
+    0xb8,
+    0x66,
+    0x85,
+    0x9c,
+    0x7b,
+    0x24,
+    0x61,
+    0xaa,
+    0x16,
+    0x11,
+    0xf6,
+    0xb5,
+    0xb6,
+    0xa4,
+    0x0a,
+    0xc9,
+    0x55,
+    0x2e,
+    0x81,
+    0xa5,
+    0x47,
+    0x61,
+    0xcb,
+    0x25,
+    0x8f,
+    0xc2,
+    0x15,
+    0x7b,
+    0x0e,
+    0x7c,
+    0x36,
+    0x9f,
+    0x3a,
+    0xda,
+    0x58,
+    0x86,
+    0x1c,
+    0x5b,
+    0x83,
+    0x79,
+    0xe6,
+    0x2b,
+    0xcc,
+    0xe6,
+    0xfa,
+    0x2c,
+    0x61,
+    0xf2,
+    0x78,
+    0x80,
+    0x1b,
+    0xe2,
+    0xf3,
+    0x9d,
+    0x39,
+    0x2b,
+    0x65,
+    0x57,
+    0x91,
+    0x3d,
+    0x71,
+    0x99,
+    0x73,
+    0xa5,
+    0xc2,
+    0x79,
+    0x20,
+    0x8c,
+    0x07,
+    0x4f,
+    0xe5,
+    0xb4,
+    0x60,
+    0x1f,
+    0x99,
+    0xa2,
+    0xb1,
+    0x4f,
+    0x0c,
+    0xef,
+    0xbc,
+    0x59,
+    0x53,
+    0x00,
+    0x7d,
+    0xb1,
+    0x02,
+    0x41,
+    0x00,
+    0xfc,
+    0x7e,
+    0x23,
+    0x65,
+    0x70,
+    0xf8,
+    0xce,
+    0xd3,
+    0x40,
+    0x41,
+    0x80,
+    0x6a,
+    0x1d,
+    0x01,
+    0xd6,
+    0x01,
+    0xff,
+    0xb6,
+    0x1b,
+    0x3d,
+    0x3d,
+    0x59,
+    0x09,
+    0x33,
+    0x79,
+    0xc0,
+    0x4f,
+    0xde,
+    0x96,
+    0x27,
+    0x4b,
+    0x18,
+    0xc6,
+    0xd9,
+    0x78,
+    0xf1,
+    0xf4,
+    0x35,
+    0x46,
+    0xe9,
+    0x7c,
+    0x42,
+    0x7a,
+    0x5d,
+    0x9f,
+    0xef,
+    0x54,
+    0xb8,
+    0xf7,
+    0x9f,
+    0xc4,
+    0x33,
+    0x6c,
+    0xf3,
+    0x8c,
+    0x32,
+    0x46,
+    0x87,
+    0x67,
+    0x30,
+    0x7b,
+    0xa7,
+    0xac,
+    0xe3,
+    0x02,
+    0x41,
+    0x00,
+    0xfc,
+    0x2c,
+    0xdf,
+    0x0c,
+    0x0d,
+    0x88,
+    0xf5,
+    0xb1,
+    0x92,
+    0xa8,
+    0x93,
+    0x47,
+    0x63,
+    0x55,
+    0xf5,
+    0xca,
+    0x58,
+    0x43,
+    0xba,
+    0x1c,
+    0xe5,
+    0x9e,
+    0xb6,
+    0x95,
+    0x05,
+    0xcd,
+    0xb5,
+    0x82,
+    0xdf,
+    0xeb,
+    0x04,
+    0x53,
+    0x9d,
+    0xbd,
+    0xc2,
+    0x38,
+    0x16,
+    0xb3,
+    0x62,
+    0xdd,
+    0xa1,
+    0x46,
+    0xdb,
+    0x6d,
+    0x97,
+    0x93,
+    0x9f,
+    0x8a,
+    0xc3,
+    0x9b,
+    0x64,
+    0x7e,
+    0x42,
+    0xe3,
+    0x32,
+    0x57,
+    0x19,
+    0x1b,
+    0xd5,
+    0x6e,
+    0x85,
+    0xfa,
+    0xb8,
+    0x8d,
+    0x02,
+    0x41,
+    0x00,
+    0xbc,
+    0x3d,
+    0xde,
+    0x6d,
+    0xd6,
+    0x97,
+    0xe8,
+    0xba,
+    0x9e,
+    0x81,
+    0x37,
+    0x17,
+    0xe5,
+    0xa0,
+    0x64,
+    0xc9,
+    0x00,
+    0xb7,
+    0xe7,
+    0xfe,
+    0xf4,
+    0x29,
+    0xd9,
+    0x2e,
+    0x43,
+    0x6b,
+    0x19,
+    0x20,
+    0xbd,
+    0x99,
+    0x75,
+    0xe7,
+    0x76,
+    0xf8,
+    0xd3,
+    0xae,
+    0xaf,
+    0x7e,
+    0xb8,
+    0xeb,
+    0x81,
+    0xf4,
+    0x9d,
+    0xfe,
+    0x07,
+    0x2b,
+    0x0b,
+    0x63,
+    0x0b,
+    0x5a,
+    0x55,
+    0x90,
+    0x71,
+    0x7d,
+    0xf1,
+    0xdb,
+    0xd9,
+    0xb1,
+    0x41,
+    0x41,
+    0x68,
+    0x2f,
+    0x4e,
+    0x39,
+    0x02,
+    0x40,
+    0x5a,
+    0x34,
+    0x66,
+    0xd8,
+    0xf5,
+    0xe2,
+    0x7f,
+    0x18,
+    0xb5,
+    0x00,
+    0x6e,
+    0x26,
+    0x84,
+    0x27,
+    0x14,
+    0x93,
+    0xfb,
+    0xfc,
+    0xc6,
+    0x0f,
+    0x5e,
+    0x27,
+    0xe6,
+    0xe1,
+    0xe9,
+    0xc0,
+    0x8a,
+    0xe4,
+    0x34,
+    0xda,
+    0xe9,
+    0xa2,
+    0x4b,
+    0x73,
+    0xbc,
+    0x8c,
+    0xb9,
+    0xba,
+    0x13,
+    0x6c,
+    0x7a,
+    0x2b,
+    0x51,
+    0x84,
+    0xa3,
+    0x4a,
+    0xe0,
+    0x30,
+    0x10,
+    0x06,
+    0x7e,
+    0xed,
+    0x17,
+    0x5a,
+    0x14,
+    0x00,
+    0xc9,
+    0xef,
+    0x85,
+    0xea,
+    0x52,
+    0x2c,
+    0xbc,
+    0x65,
+    0x02,
+    0x40,
+    0x51,
+    0xe3,
+    0xf2,
+    0x83,
+    0x19,
+    0x9b,
+    0xc4,
+    0x1e,
+    0x2f,
+    0x50,
+    0x3d,
+    0xdf,
+    0x5a,
+    0xa2,
+    0x18,
+    0xca,
+    0x5f,
+    0x2e,
+    0x49,
+    0xaf,
+    0x6f,
+    0xcc,
+    0xfa,
+    0x65,
+    0x77,
+    0x94,
+    0xb5,
+    0xa1,
+    0x0a,
+    0xa9,
+    0xd1,
+    0x8a,
+    0x39,
+    0x37,
+    0xf4,
+    0x0b,
+    0xa0,
+    0xd7,
+    0x82,
+    0x27,
+    0x5e,
+    0xae,
+    0x17,
+    0x17,
+    0xa1,
+    0x1e,
+    0x54,
+    0x34,
+    0xbf,
+    0x6e,
+    0xc4,
+    0x8e,
+    0x99,
+    0x5d,
+    0x08,
+    0xf1,
+    0x2d,
+    0x86,
+    0x9d,
+    0xa5,
+    0x20,
+    0x1b,
+    0xe5,
+    0xdf,
 };
 
 #ifndef OPENSSL_NO_DH
@@ -215,16 +1353,126 @@ static const unsigned char kExampleDHPrivateKeyDER[] = {
  * structure.
  */
 static const unsigned char kExampleECKeyDER[] = {
-    0x30, 0x77, 0x02, 0x01, 0x01, 0x04, 0x20, 0x07, 0x0f, 0x08, 0x72, 0x7a,
-    0xd4, 0xa0, 0x4a, 0x9c, 0xdd, 0x59, 0xc9, 0x4d, 0x89, 0x68, 0x77, 0x08,
-    0xb5, 0x6f, 0xc9, 0x5d, 0x30, 0x77, 0x0e, 0xe8, 0xd1, 0xc9, 0xce, 0x0a,
-    0x8b, 0xb4, 0x6a, 0xa0, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d,
-    0x03, 0x01, 0x07, 0xa1, 0x44, 0x03, 0x42, 0x00, 0x04, 0xe6, 0x2b, 0x69,
-    0xe2, 0xbf, 0x65, 0x9f, 0x97, 0xbe, 0x2f, 0x1e, 0x0d, 0x94, 0x8a, 0x4c,
-    0xd5, 0x97, 0x6b, 0xb7, 0xa9, 0x1e, 0x0d, 0x46, 0xfb, 0xdd, 0xa9, 0xa9,
-    0x1e, 0x9d, 0xdc, 0xba, 0x5a, 0x01, 0xe7, 0xd6, 0x97, 0xa8, 0x0a, 0x18,
-    0xf9, 0xc3, 0xc4, 0xa3, 0x1e, 0x56, 0xe2, 0x7c, 0x83, 0x48, 0xdb, 0x16,
-    0x1a, 0x1c, 0xf5, 0x1d, 0x7e, 0xf1, 0x94, 0x2d, 0x4b, 0xcf, 0x72, 0x22,
+    0x30,
+    0x77,
+    0x02,
+    0x01,
+    0x01,
+    0x04,
+    0x20,
+    0x07,
+    0x0f,
+    0x08,
+    0x72,
+    0x7a,
+    0xd4,
+    0xa0,
+    0x4a,
+    0x9c,
+    0xdd,
+    0x59,
+    0xc9,
+    0x4d,
+    0x89,
+    0x68,
+    0x77,
+    0x08,
+    0xb5,
+    0x6f,
+    0xc9,
+    0x5d,
+    0x30,
+    0x77,
+    0x0e,
+    0xe8,
+    0xd1,
+    0xc9,
+    0xce,
+    0x0a,
+    0x8b,
+    0xb4,
+    0x6a,
+    0xa0,
+    0x0a,
+    0x06,
+    0x08,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x03,
+    0x01,
+    0x07,
+    0xa1,
+    0x44,
+    0x03,
+    0x42,
+    0x00,
+    0x04,
+    0xe6,
+    0x2b,
+    0x69,
+    0xe2,
+    0xbf,
+    0x65,
+    0x9f,
+    0x97,
+    0xbe,
+    0x2f,
+    0x1e,
+    0x0d,
+    0x94,
+    0x8a,
+    0x4c,
+    0xd5,
+    0x97,
+    0x6b,
+    0xb7,
+    0xa9,
+    0x1e,
+    0x0d,
+    0x46,
+    0xfb,
+    0xdd,
+    0xa9,
+    0xa9,
+    0x1e,
+    0x9d,
+    0xdc,
+    0xba,
+    0x5a,
+    0x01,
+    0xe7,
+    0xd6,
+    0x97,
+    0xa8,
+    0x0a,
+    0x18,
+    0xf9,
+    0xc3,
+    0xc4,
+    0xa3,
+    0x1e,
+    0x56,
+    0xe2,
+    0x7c,
+    0x83,
+    0x48,
+    0xdb,
+    0x16,
+    0x1a,
+    0x1c,
+    0xf5,
+    0x1d,
+    0x7e,
+    0xf1,
+    0x94,
+    0x2d,
+    0x4b,
+    0xcf,
+    0x72,
+    0x22,
     0xc1,
 };
 
@@ -239,14 +1487,14 @@ static const unsigned char kExampleECKey2DER[] = {
     0x96, 0x69, 0xE0, 0x04, 0xCB, 0x89, 0x0B, 0x42
 };
 
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 static const unsigned char kExampleECXKey2DER[] = {
     0x30, 0x2E, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x6e,
     0x04, 0x22, 0x04, 0x20, 0xc8, 0xa9, 0xd5, 0xa9, 0x10, 0x91, 0xad, 0x85,
     0x1c, 0x66, 0x8b, 0x07, 0x36, 0xc1, 0xc9, 0xa0, 0x29, 0x36, 0xc0, 0xd3,
     0xad, 0x62, 0x67, 0x08, 0x58, 0x08, 0x80, 0x47, 0xba, 0x05, 0x74, 0x75
 };
-# endif
+#endif
 #endif
 
 typedef struct APK_DATA_st {
@@ -256,22 +1504,22 @@ typedef struct APK_DATA_st {
 } APK_DATA;
 
 static APK_DATA keydata[] = {
-    {kExampleRSAKeyDER, sizeof(kExampleRSAKeyDER), EVP_PKEY_RSA},
-    {kExampleRSAKeyPKCS8, sizeof(kExampleRSAKeyPKCS8), EVP_PKEY_RSA},
+    { kExampleRSAKeyDER, sizeof(kExampleRSAKeyDER), EVP_PKEY_RSA },
+    { kExampleRSAKeyPKCS8, sizeof(kExampleRSAKeyPKCS8), EVP_PKEY_RSA },
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_ECX
-    {kExampleECXKey2DER, sizeof(kExampleECXKey2DER), EVP_PKEY_X25519},
-# endif
-    {kExampleECKeyDER, sizeof(kExampleECKeyDER), EVP_PKEY_EC},
-    {kExampleECKey2DER, sizeof(kExampleECKey2DER), EVP_PKEY_EC},
+#ifndef OPENSSL_NO_ECX
+    { kExampleECXKey2DER, sizeof(kExampleECXKey2DER), EVP_PKEY_X25519 },
+#endif
+    { kExampleECKeyDER, sizeof(kExampleECKeyDER), EVP_PKEY_EC },
+    { kExampleECKey2DER, sizeof(kExampleECKey2DER), EVP_PKEY_EC },
 #endif
 #ifndef OPENSSL_NO_DH
-    {kExampleDHPrivateKeyDER, sizeof(kExampleDHPrivateKeyDER), EVP_PKEY_DH},
+    { kExampleDHPrivateKeyDER, sizeof(kExampleDHPrivateKeyDER), EVP_PKEY_DH },
 #endif
 };
 
 static int pkey_has_private(EVP_PKEY *key, const char *privtag,
-                            int use_octstring)
+    int use_octstring)
 {
     int ret = 0;
 
@@ -279,7 +1527,7 @@ static int pkey_has_private(EVP_PKEY *key, const char *privtag,
         unsigned char buf[64];
 
         ret = EVP_PKEY_get_octet_string_param(key, privtag, buf, sizeof(buf),
-                                              NULL);
+            NULL);
     } else {
         BIGNUM *bn = NULL;
 
@@ -320,7 +1568,8 @@ static int do_pkey_tofrom_data_select(EVP_PKEY *key, const char *keytype)
     if (!TEST_ptr(fromctx = EVP_PKEY_CTX_new_from_name(mainctx, keytype, NULL))
         || !TEST_int_eq(EVP_PKEY_fromdata_init(fromctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(fromctx, &fromkey, EVP_PKEY_PUBLIC_KEY,
-                                          keypair_params), 1)
+                            keypair_params),
+            1)
         || !TEST_false(pkey_has_private(fromkey, privtag, use_octstring)))
         goto end;
     /*
@@ -328,7 +1577,8 @@ static int do_pkey_tofrom_data_select(EVP_PKEY *key, const char *keytype)
      * the resulting key contains a private key.
      */
     if (!TEST_int_eq(EVP_PKEY_fromdata(fromctx, &fromkeypair,
-                                       EVP_PKEY_KEYPAIR, keypair_params), 1)
+                         EVP_PKEY_KEYPAIR, keypair_params),
+            1)
         || !TEST_true(pkey_has_private(fromkeypair, privtag, use_octstring)))
         goto end;
     ret = 1;
@@ -348,23 +1598,23 @@ static int test_dh_tofrom_data_select(void)
     OSSL_PARAM params[2];
     EVP_PKEY *key = NULL;
     EVP_PKEY_CTX *gctx = NULL;
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     const DH *dhkey;
     const BIGNUM *privkey;
-# endif
+#endif
 
     params[0] = OSSL_PARAM_construct_utf8_string("group", "ffdhe2048", 0);
     params[1] = OSSL_PARAM_construct_end();
     ret = TEST_ptr(gctx = EVP_PKEY_CTX_new_from_name(mainctx, "DHX", NULL))
-          && TEST_int_gt(EVP_PKEY_keygen_init(gctx), 0)
-          && TEST_true(EVP_PKEY_CTX_set_params(gctx, params))
-          && TEST_int_gt(EVP_PKEY_generate(gctx, &key), 0)
-          && TEST_true(do_pkey_tofrom_data_select(key, "DHX"));
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+        && TEST_int_gt(EVP_PKEY_keygen_init(gctx), 0)
+        && TEST_true(EVP_PKEY_CTX_set_params(gctx, params))
+        && TEST_int_gt(EVP_PKEY_generate(gctx, &key), 0)
+        && TEST_true(do_pkey_tofrom_data_select(key, "DHX"));
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     ret = ret && TEST_ptr(dhkey = EVP_PKEY_get0_DH(key))
-              && TEST_ptr(privkey = DH_get0_priv_key(dhkey))
-              && TEST_int_le(BN_num_bits(privkey), 225);
-# endif
+        && TEST_ptr(privkey = DH_get0_priv_key(dhkey))
+        && TEST_int_le(BN_num_bits(privkey), 225);
+#endif
     EVP_PKEY_free(key);
     EVP_PKEY_CTX_free(gctx);
     return ret;
@@ -380,21 +1630,21 @@ static int test_dh_paramgen(void)
 
     params[0] = OSSL_PARAM_construct_uint(OSSL_PKEY_PARAM_FFC_PBITS, &pbits);
     params[1] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_TYPE,
-                                                 "generator", 0);
+        "generator", 0);
     params[2] = OSSL_PARAM_construct_end();
 
     ret = TEST_ptr(gctx = EVP_PKEY_CTX_new_from_name(mainctx, "DH", NULL))
-          && TEST_int_gt(EVP_PKEY_paramgen_init(gctx), 0)
-          && TEST_true(EVP_PKEY_CTX_set_params(gctx, params))
-          && TEST_true(EVP_PKEY_paramgen(gctx, &pkey))
-          && TEST_ptr(pkey);
+        && TEST_int_gt(EVP_PKEY_paramgen_init(gctx), 0)
+        && TEST_true(EVP_PKEY_CTX_set_params(gctx, params))
+        && TEST_true(EVP_PKEY_paramgen(gctx, &pkey))
+        && TEST_ptr(pkey);
 
     EVP_PKEY_CTX_free(gctx);
     gctx = NULL;
 
     ret = ret && TEST_ptr(gctx = EVP_PKEY_CTX_new_from_pkey(mainctx, pkey, NULL))
-              && TEST_int_eq(EVP_PKEY_param_check(gctx), 1)
-              && TEST_int_eq(EVP_PKEY_param_check_quick(gctx), 1);
+        && TEST_int_eq(EVP_PKEY_param_check(gctx), 1)
+        && TEST_int_eq(EVP_PKEY_param_check_quick(gctx), 1);
 
     EVP_PKEY_CTX_free(gctx);
     EVP_PKEY_free(pkey);
@@ -439,18 +1689,18 @@ static int test_dh_paramfromdata(void)
 
     /* Test failure paths for FFC - mainly due to setting the wrong param type */
     ret = TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(mainctx, "DH", NULL))
-          && TEST_int_eq(set_fromdata_uint(ctx, OSSL_PKEY_PARAM_GROUP_NAME), 0)
-          && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_GROUP_NAME, "bad"), 0)
-          && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_P, "bad"), 0)
-          && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_GINDEX, "bad"), 0)
-          && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_PCOUNTER, "bad"), 0)
-          && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_COFACTOR, "bad"), 0)
-          && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_H, "bad"), 0)
-          && TEST_int_eq(set_fromdata_uint(ctx, OSSL_PKEY_PARAM_FFC_SEED), 0)
-          && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_VALIDATE_PQ, "bad"), 0)
-          && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_VALIDATE_G, "bad"), 0)
-          && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_VALIDATE_LEGACY, "bad"), 0)
-          && TEST_int_eq(set_fromdata_uint(ctx, OSSL_PKEY_PARAM_FFC_DIGEST), 0);
+        && TEST_int_eq(set_fromdata_uint(ctx, OSSL_PKEY_PARAM_GROUP_NAME), 0)
+        && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_GROUP_NAME, "bad"), 0)
+        && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_P, "bad"), 0)
+        && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_GINDEX, "bad"), 0)
+        && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_PCOUNTER, "bad"), 0)
+        && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_COFACTOR, "bad"), 0)
+        && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_H, "bad"), 0)
+        && TEST_int_eq(set_fromdata_uint(ctx, OSSL_PKEY_PARAM_FFC_SEED), 0)
+        && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_VALIDATE_PQ, "bad"), 0)
+        && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_VALIDATE_G, "bad"), 0)
+        && TEST_int_eq(set_fromdata_string(ctx, OSSL_PKEY_PARAM_FFC_VALIDATE_LEGACY, "bad"), 0)
+        && TEST_int_eq(set_fromdata_uint(ctx, OSSL_PKEY_PARAM_FFC_DIGEST), 0);
 
     EVP_PKEY_CTX_free(ctx);
     return ret;
@@ -473,7 +1723,7 @@ static int test_new_keytype(void)
         goto err;
     /* prepare & load tls-provider */
     if (!TEST_true(OSSL_PROVIDER_add_builtin(mainctx, "tls-provider",
-                                             tls_provider_init))
+            tls_provider_init))
         || !TEST_ptr(tlsprov = OSSL_PROVIDER_load(mainctx, "tls-provider")))
         goto err;
     /* now try creating key again, should work this time */
@@ -540,23 +1790,23 @@ static int test_ec_tofrom_data_select(void)
     EVP_PKEY *key = NULL;
 
     ret = TEST_ptr(key = EVP_PKEY_Q_keygen(mainctx, NULL, "EC", "P-256"))
-          && TEST_true(do_pkey_tofrom_data_select(key, "EC"));
+        && TEST_true(do_pkey_tofrom_data_select(key, "EC"));
     EVP_PKEY_free(key);
     return ret;
 }
 
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 static int test_ecx_tofrom_data_select(void)
 {
     int ret;
     EVP_PKEY *key = NULL;
 
     ret = TEST_ptr(key = EVP_PKEY_Q_keygen(mainctx, NULL, "X25519"))
-          && TEST_true(do_pkey_tofrom_data_select(key, "X25519"));
+        && TEST_true(do_pkey_tofrom_data_select(key, "X25519"));
     EVP_PKEY_free(key);
     return ret;
 }
-# endif
+#endif
 #endif
 
 #ifndef OPENSSL_NO_SM2
@@ -566,7 +1816,7 @@ static int test_sm2_tofrom_data_select(void)
     EVP_PKEY *key = NULL;
 
     ret = TEST_ptr(key = EVP_PKEY_Q_keygen(mainctx, NULL, "SM2"))
-          && TEST_true(do_pkey_tofrom_data_select(key, "SM2"));
+        && TEST_true(do_pkey_tofrom_data_select(key, "SM2"));
     EVP_PKEY_free(key);
     return ret;
 }
@@ -580,8 +1830,8 @@ static int test_rsa_tofrom_data_select(void)
     int pdata_len = sizeof(kExampleRSAKeyDER);
 
     ret = TEST_ptr(key = d2i_AutoPrivateKey_ex(NULL, &pdata, pdata_len,
-                                               mainctx, NULL))
-          && TEST_true(do_pkey_tofrom_data_select(key, "RSA"));
+                       mainctx, NULL))
+        && TEST_true(do_pkey_tofrom_data_select(key, "RSA"));
     EVP_PKEY_free(key);
     return ret;
 }
@@ -602,34 +1852,34 @@ static int test_d2i_AutoPrivateKey_ex(int i)
 
     p = input;
     if (!TEST_ptr(pkey = d2i_AutoPrivateKey_ex(NULL, &p, input_len, mainctx,
-                                               NULL))
-            || !TEST_ptr_eq(p, input + input_len)
-            || !TEST_int_eq(EVP_PKEY_get_id(pkey), expected_id))
+                      NULL))
+        || !TEST_ptr_eq(p, input + input_len)
+        || !TEST_int_eq(EVP_PKEY_get_id(pkey), expected_id))
         goto done;
 
     if (ak->evptype == EVP_PKEY_RSA) {
         if (!TEST_true(EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_RSA_D,
-                                             &priv_bn)))
+                &priv_bn)))
             goto done;
     } else if (ak->evptype == EVP_PKEY_X25519) {
         unsigned char buffer[32];
         size_t len;
 
         if (!TEST_true(EVP_PKEY_get_octet_string_param(pkey,
-                                                       OSSL_PKEY_PARAM_PRIV_KEY,
-                                                       buffer, sizeof(buffer),
-                                                       &len)))
+                OSSL_PKEY_PARAM_PRIV_KEY,
+                buffer, sizeof(buffer),
+                &len)))
             goto done;
     } else {
         if (!TEST_true(EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_PRIV_KEY,
-                                             &priv_bn)))
+                &priv_bn)))
             goto done;
     }
 
     if (ak->evptype == EVP_PKEY_DH) {
         if (!TEST_true(EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_FFC_P, &p_bn))
             || !TEST_true(EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_FFC_G,
-                                                &g_bn)))
+                &g_bn)))
             goto done;
     }
 
@@ -655,17 +1905,18 @@ static int test_pkcs8key_nid_bio(void)
     OSSL_PROVIDER *provider = NULL;
 
     ret = TEST_ptr(provider = OSSL_PROVIDER_load(NULL, "default"))
-          && TEST_ptr(enc_bio = BIO_new(BIO_s_mem()))
-          && TEST_ptr(in = BIO_new_mem_buf(kExampleRSAKeyPKCS8,
-                                           sizeof(kExampleRSAKeyPKCS8)))
-          && TEST_ptr(pkey = d2i_PrivateKey_ex_bio(in, NULL, NULL, NULL))
-          && TEST_int_eq(i2d_PKCS8PrivateKey_nid_bio(enc_bio, pkey, nid,
-                                                     pwd, sizeof(pwd) - 1,
-                                                     NULL, NULL), 1)
-          && TEST_int_gt(enc_datalen = BIO_get_mem_data(enc_bio, &enc_data), 0)
-          && TEST_ptr(pkey_dec = d2i_PKCS8PrivateKey_bio(enc_bio, NULL, NULL,
-                                                         (void *)pwd))
-          && TEST_true(EVP_PKEY_eq(pkey, pkey_dec));
+        && TEST_ptr(enc_bio = BIO_new(BIO_s_mem()))
+        && TEST_ptr(in = BIO_new_mem_buf(kExampleRSAKeyPKCS8,
+                        sizeof(kExampleRSAKeyPKCS8)))
+        && TEST_ptr(pkey = d2i_PrivateKey_ex_bio(in, NULL, NULL, NULL))
+        && TEST_int_eq(i2d_PKCS8PrivateKey_nid_bio(enc_bio, pkey, nid,
+                           pwd, sizeof(pwd) - 1,
+                           NULL, NULL),
+            1)
+        && TEST_int_gt(enc_datalen = BIO_get_mem_data(enc_bio, &enc_data), 0)
+        && TEST_ptr(pkey_dec = d2i_PKCS8PrivateKey_bio(enc_bio, NULL, NULL,
+                        (void *)pwd))
+        && TEST_true(EVP_PKEY_eq(pkey, pkey_dec));
 
     EVP_PKEY_free(pkey_dec);
     EVP_PKEY_free(pkey);
@@ -708,7 +1959,7 @@ static int test_alternative_default(void)
         goto err;
 
     ok = 1;
- err:
+err:
     EVP_MD_free(sha256);
     return ok;
 }
@@ -743,7 +1994,7 @@ static int test_provider_unload_effective(int testid)
         goto err;
 
     ok = 1;
- err:
+err:
     EVP_MD_free(sha256);
     OSSL_PROVIDER_unload(provider);
     return ok;
@@ -771,7 +2022,7 @@ static int test_d2i_PrivateKey_ex(int testid)
     TEST_int_eq(ERR_peek_error(), 0);
     test_openssl_errors();
 
- err:
+err:
     EVP_PKEY_free(pkey);
     BIO_free(key_bio);
     OSSL_PROVIDER_unload(provider);
@@ -805,7 +2056,7 @@ static int test_PEM_read_bio_negative(int testid)
 
     ok = 1;
 
- err:
+err:
     test_openssl_errors();
     EVP_PKEY_free(pkey);
     BIO_free(key_bio);
@@ -837,7 +2088,7 @@ static int test_PEM_read_bio_negative_wrong_password(int testid)
 
     if (/* Output Encrypted private key in PEM form */
         !TEST_true(PEM_write_bio_PrivateKey(key_bio, write_pkey, EVP_aes_256_cbc(),
-                                           NULL, 0, NULL, "pass")))
+            NULL, 0, NULL, "pass")))
         goto err;
 
     ERR_clear_error();
@@ -849,7 +2100,7 @@ static int test_PEM_read_bio_negative_wrong_password(int testid)
         goto err;
     ok = 1;
 
- err:
+err:
     test_openssl_errors();
     EVP_PKEY_free(read_pkey);
     EVP_PKEY_free(write_pkey);
@@ -861,18 +2112,19 @@ static int test_PEM_read_bio_negative_wrong_password(int testid)
 }
 
 static int do_fromdata_key_is_equal(const OSSL_PARAM params[],
-                                    const EVP_PKEY *expected, const char *type)
+    const EVP_PKEY *expected, const char *type)
 {
     EVP_PKEY_CTX *ctx = NULL;
     EVP_PKEY *pkey = NULL;
     int ret;
 
     ret = TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(mainctx, type, NULL))
-          && TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
-          && TEST_int_eq(EVP_PKEY_fromdata(ctx, &pkey,
-                                           EVP_PKEY_KEYPAIR,
-                                           (OSSL_PARAM *)params), 1)
-          && TEST_true(EVP_PKEY_eq(pkey, expected));
+        && TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
+        && TEST_int_eq(EVP_PKEY_fromdata(ctx, &pkey,
+                           EVP_PKEY_KEYPAIR,
+                           (OSSL_PARAM *)params),
+            1)
+        && TEST_true(EVP_PKEY_eq(pkey, expected));
     EVP_PKEY_CTX_free(ctx);
     EVP_PKEY_free(pkey);
     return ret;
@@ -888,77 +2140,856 @@ static int do_fromdata_key_is_equal(const OSSL_PARAM params[],
  *   -paramfile dsa_param.pem -pkeyopt type:fips186_4 -out dsa_priv.pem
  */
 static const unsigned char dsa_key[] = {
-    0x30, 0x82, 0x03, 0x4e, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00,
-    0xda, 0xb3, 0x46, 0x4d, 0x54, 0x57, 0xc7, 0xb4, 0x61, 0xa0, 0x6f, 0x66,
-    0x17, 0xda, 0xeb, 0x90, 0xf0, 0xa3, 0xd1, 0x29, 0xc9, 0x5f, 0xf2, 0x21,
-    0x3d, 0x85, 0xa3, 0x4a, 0xf0, 0xf8, 0x36, 0x39, 0x1b, 0xe3, 0xee, 0x37,
-    0x70, 0x06, 0x9b, 0xe8, 0xe3, 0x0a, 0xd2, 0xf1, 0xf6, 0xc4, 0x42, 0x23,
-    0x1f, 0x74, 0x78, 0xc2, 0x16, 0xf5, 0xce, 0xd6, 0xab, 0xa0, 0xc6, 0xe8,
-    0x99, 0x3d, 0xf8, 0x8b, 0xfb, 0x47, 0xf8, 0x5e, 0x05, 0x68, 0x6d, 0x8b,
-    0xa8, 0xad, 0xa1, 0xc2, 0x3a, 0x4e, 0xe0, 0xad, 0xec, 0x38, 0x75, 0x21,
-    0x55, 0x22, 0xce, 0xa2, 0xe9, 0xe5, 0x3b, 0xd7, 0x44, 0xeb, 0x5a, 0x03,
-    0x59, 0xa0, 0xc5, 0x7a, 0x92, 0x59, 0x7d, 0x7a, 0x07, 0x80, 0xfc, 0x4e,
-    0xf8, 0x56, 0x7e, 0xf1, 0x06, 0xe0, 0xba, 0xb2, 0xe7, 0x5b, 0x22, 0x55,
-    0xee, 0x4b, 0x42, 0x61, 0x67, 0x2c, 0x43, 0x9a, 0x38, 0x2b, 0x17, 0xc2,
-    0x62, 0x12, 0x8b, 0x0b, 0x22, 0x8c, 0x0c, 0x1c, 0x1c, 0x92, 0xb1, 0xec,
-    0x70, 0xce, 0x0f, 0x8c, 0xff, 0x8d, 0x21, 0xf9, 0x19, 0x68, 0x4d, 0x32,
-    0x59, 0x78, 0x42, 0x1d, 0x0c, 0xc5, 0x1a, 0xcb, 0x28, 0xe2, 0xc1, 0x1a,
-    0x35, 0xf1, 0x42, 0x0a, 0x19, 0x39, 0xfa, 0x83, 0xd1, 0xb4, 0xaa, 0x69,
-    0x0f, 0xc2, 0x8e, 0xf9, 0x59, 0x2c, 0xee, 0x11, 0xfc, 0x3e, 0x4b, 0x44,
-    0xfb, 0x9a, 0x32, 0xc8, 0x78, 0x23, 0x56, 0x85, 0x49, 0x21, 0x43, 0x12,
-    0x79, 0xbd, 0xa0, 0x70, 0x47, 0x2f, 0xae, 0xb6, 0xd7, 0x6c, 0xc6, 0x07,
-    0x76, 0xa9, 0x8a, 0xa2, 0x16, 0x02, 0x89, 0x1f, 0x1a, 0xd1, 0xa2, 0x96,
-    0x56, 0xd1, 0x1f, 0x10, 0xe1, 0xe5, 0x9f, 0x3f, 0xdd, 0x09, 0x0c, 0x40,
-    0x90, 0x71, 0xef, 0x14, 0x41, 0x02, 0x82, 0x3a, 0x6b, 0xe1, 0xf8, 0x2c,
-    0x5d, 0xbe, 0xfd, 0x1b, 0x02, 0x1d, 0x00, 0xe0, 0x20, 0xe0, 0x7c, 0x02,
-    0x16, 0xa7, 0x6c, 0x6a, 0x19, 0xba, 0xd5, 0x83, 0x73, 0xf3, 0x7d, 0x31,
-    0xef, 0xa7, 0xe1, 0x5d, 0x5b, 0x7f, 0xf3, 0xfc, 0xda, 0x84, 0x31, 0x02,
-    0x82, 0x01, 0x01, 0x00, 0x83, 0xdb, 0xa1, 0xbc, 0x3e, 0xc7, 0x29, 0xa5,
-    0x6a, 0x5c, 0x2c, 0xe8, 0x7a, 0x8c, 0x7e, 0xe8, 0xb8, 0x3e, 0x13, 0x47,
-    0xcd, 0x36, 0x7e, 0x79, 0x30, 0x7a, 0x28, 0x03, 0xd3, 0xd4, 0xd2, 0xe3,
-    0xee, 0x3b, 0x46, 0xda, 0xe0, 0x71, 0xe6, 0xcf, 0x46, 0x86, 0x0a, 0x37,
-    0x57, 0xb6, 0xe9, 0xcf, 0xa1, 0x78, 0x19, 0xb8, 0x72, 0x9f, 0x30, 0x8c,
-    0x2a, 0x04, 0x7c, 0x2f, 0x0c, 0x27, 0xa7, 0xb3, 0x23, 0xe0, 0x46, 0xf2,
-    0x75, 0x0c, 0x03, 0x4c, 0xad, 0xfb, 0xc1, 0xcb, 0x28, 0xcd, 0xa0, 0x63,
-    0xdb, 0x44, 0x88, 0xe0, 0xda, 0x6c, 0x5b, 0x89, 0xb2, 0x5b, 0x40, 0x6d,
-    0xeb, 0x78, 0x7a, 0xd5, 0xaf, 0x40, 0x52, 0x46, 0x63, 0x92, 0x13, 0x0d,
-    0xee, 0xee, 0xf9, 0x53, 0xca, 0x2d, 0x4e, 0x3b, 0x13, 0xd8, 0x0f, 0x50,
-    0xd0, 0x44, 0x57, 0x67, 0x0f, 0x45, 0x8f, 0x21, 0x30, 0x97, 0x9e, 0x80,
-    0xd9, 0xd0, 0x91, 0xb7, 0xc9, 0x5a, 0x69, 0xda, 0xeb, 0xd5, 0xea, 0x37,
-    0xf6, 0xb3, 0xbe, 0x1f, 0x24, 0xf1, 0x55, 0x14, 0x28, 0x05, 0xb5, 0xd8,
-    0x84, 0x0f, 0x62, 0x85, 0xaa, 0xec, 0x77, 0x64, 0xfd, 0x80, 0x7c, 0x41,
-    0x00, 0x88, 0xa3, 0x79, 0x7d, 0x4f, 0x6f, 0xe3, 0x76, 0xf4, 0xb5, 0x97,
-    0xb7, 0xeb, 0x67, 0x28, 0xba, 0x07, 0x1a, 0x59, 0x32, 0xc1, 0x53, 0xd9,
-    0x05, 0x6b, 0x63, 0x93, 0xce, 0xa1, 0xd9, 0x7a, 0xb2, 0xff, 0x1c, 0x12,
-    0x0a, 0x9a, 0xe5, 0x51, 0x1e, 0xba, 0xfc, 0x95, 0x2e, 0x28, 0xa9, 0xfc,
-    0x4c, 0xed, 0x7b, 0x05, 0xca, 0x67, 0xe0, 0x2d, 0xd7, 0x54, 0xb3, 0x05,
-    0x1c, 0x23, 0x2b, 0x35, 0x2e, 0x19, 0x48, 0x59, 0x0e, 0x58, 0xa8, 0x01,
-    0x56, 0xfb, 0x78, 0x90, 0xba, 0x08, 0x77, 0x94, 0x45, 0x05, 0x13, 0xc7,
-    0x6b, 0x96, 0xd2, 0xa3, 0xa6, 0x01, 0x9f, 0x34, 0x02, 0x82, 0x01, 0x00,
-    0x16, 0x1a, 0xb4, 0x6d, 0x9f, 0x16, 0x6c, 0xcc, 0x91, 0x66, 0xfe, 0x30,
-    0xeb, 0x8e, 0x44, 0xba, 0x2b, 0x7a, 0xc9, 0xa8, 0x95, 0xf2, 0xa6, 0x38,
-    0xd8, 0xaf, 0x3e, 0x91, 0x68, 0xe8, 0x52, 0xf3, 0x97, 0x37, 0x70, 0xf2,
-    0x47, 0xa3, 0xf4, 0x62, 0x26, 0xf5, 0x3b, 0x71, 0x52, 0x50, 0x15, 0x9c,
-    0x6d, 0xa6, 0x6d, 0x92, 0x4c, 0x48, 0x76, 0x31, 0x54, 0x48, 0xa5, 0x99,
-    0x7a, 0xd4, 0x61, 0xf7, 0x21, 0x44, 0xe7, 0xd8, 0x82, 0xc3, 0x50, 0xd3,
-    0xd9, 0xd4, 0x66, 0x20, 0xab, 0x70, 0x4c, 0x97, 0x9b, 0x8d, 0xac, 0x1f,
-    0x78, 0x27, 0x1e, 0x47, 0xf8, 0x3b, 0xd1, 0x55, 0x73, 0xf3, 0xb4, 0x8e,
-    0x6d, 0x45, 0x40, 0x54, 0xc6, 0xd8, 0x95, 0x15, 0x27, 0xb7, 0x5f, 0x65,
-    0xaa, 0xcb, 0x24, 0xc9, 0x49, 0x87, 0x32, 0xad, 0xcb, 0xf8, 0x35, 0x63,
-    0x56, 0x72, 0x7c, 0x4e, 0x6c, 0xad, 0x5f, 0x26, 0x8c, 0xd2, 0x80, 0x41,
-    0xaf, 0x88, 0x23, 0x20, 0x03, 0xa4, 0xd5, 0x3c, 0x53, 0x54, 0xb0, 0x3d,
-    0xed, 0x0e, 0x9e, 0x53, 0x0a, 0x63, 0x5f, 0xfd, 0x28, 0x57, 0x09, 0x07,
-    0x73, 0xf4, 0x0c, 0xd4, 0x71, 0x5d, 0x6b, 0xa0, 0xd7, 0x86, 0x99, 0x29,
-    0x9b, 0xca, 0xfb, 0xcc, 0xd6, 0x2f, 0xfe, 0xbe, 0x94, 0xef, 0x1a, 0x0e,
-    0x55, 0x84, 0xa7, 0xaf, 0x7b, 0xfa, 0xed, 0x77, 0x61, 0x28, 0x22, 0xee,
-    0x6b, 0x11, 0xdd, 0xb0, 0x17, 0x1e, 0x06, 0xe4, 0x29, 0x4c, 0xc2, 0x3f,
-    0xd6, 0x75, 0xb6, 0x08, 0x04, 0x55, 0x13, 0x48, 0x4f, 0x44, 0xea, 0x8d,
-    0xaf, 0xcb, 0xac, 0x22, 0xc4, 0x6a, 0xb3, 0x86, 0xe5, 0x47, 0xa9, 0xb5,
-    0x72, 0x17, 0x23, 0x11, 0x81, 0x7f, 0x00, 0x00, 0x67, 0x5c, 0xf4, 0x58,
-    0xcc, 0xe2, 0x46, 0xce, 0xf5, 0x6d, 0xd8, 0x18, 0x91, 0xc4, 0x20, 0xbf,
-    0x07, 0x48, 0x45, 0xfd, 0x02, 0x1c, 0x2f, 0x68, 0x44, 0xcb, 0xfb, 0x6b,
-    0xcb, 0x8d, 0x02, 0x49, 0x7c, 0xee, 0xd2, 0xa6, 0xd3, 0x43, 0xb8, 0xa4,
-    0x09, 0xb7, 0xc1, 0xd4, 0x4b, 0xc3, 0x66, 0xa7, 0xe0, 0x21,
+    0x30,
+    0x82,
+    0x03,
+    0x4e,
+    0x02,
+    0x01,
+    0x00,
+    0x02,
+    0x82,
+    0x01,
+    0x01,
+    0x00,
+    0xda,
+    0xb3,
+    0x46,
+    0x4d,
+    0x54,
+    0x57,
+    0xc7,
+    0xb4,
+    0x61,
+    0xa0,
+    0x6f,
+    0x66,
+    0x17,
+    0xda,
+    0xeb,
+    0x90,
+    0xf0,
+    0xa3,
+    0xd1,
+    0x29,
+    0xc9,
+    0x5f,
+    0xf2,
+    0x21,
+    0x3d,
+    0x85,
+    0xa3,
+    0x4a,
+    0xf0,
+    0xf8,
+    0x36,
+    0x39,
+    0x1b,
+    0xe3,
+    0xee,
+    0x37,
+    0x70,
+    0x06,
+    0x9b,
+    0xe8,
+    0xe3,
+    0x0a,
+    0xd2,
+    0xf1,
+    0xf6,
+    0xc4,
+    0x42,
+    0x23,
+    0x1f,
+    0x74,
+    0x78,
+    0xc2,
+    0x16,
+    0xf5,
+    0xce,
+    0xd6,
+    0xab,
+    0xa0,
+    0xc6,
+    0xe8,
+    0x99,
+    0x3d,
+    0xf8,
+    0x8b,
+    0xfb,
+    0x47,
+    0xf8,
+    0x5e,
+    0x05,
+    0x68,
+    0x6d,
+    0x8b,
+    0xa8,
+    0xad,
+    0xa1,
+    0xc2,
+    0x3a,
+    0x4e,
+    0xe0,
+    0xad,
+    0xec,
+    0x38,
+    0x75,
+    0x21,
+    0x55,
+    0x22,
+    0xce,
+    0xa2,
+    0xe9,
+    0xe5,
+    0x3b,
+    0xd7,
+    0x44,
+    0xeb,
+    0x5a,
+    0x03,
+    0x59,
+    0xa0,
+    0xc5,
+    0x7a,
+    0x92,
+    0x59,
+    0x7d,
+    0x7a,
+    0x07,
+    0x80,
+    0xfc,
+    0x4e,
+    0xf8,
+    0x56,
+    0x7e,
+    0xf1,
+    0x06,
+    0xe0,
+    0xba,
+    0xb2,
+    0xe7,
+    0x5b,
+    0x22,
+    0x55,
+    0xee,
+    0x4b,
+    0x42,
+    0x61,
+    0x67,
+    0x2c,
+    0x43,
+    0x9a,
+    0x38,
+    0x2b,
+    0x17,
+    0xc2,
+    0x62,
+    0x12,
+    0x8b,
+    0x0b,
+    0x22,
+    0x8c,
+    0x0c,
+    0x1c,
+    0x1c,
+    0x92,
+    0xb1,
+    0xec,
+    0x70,
+    0xce,
+    0x0f,
+    0x8c,
+    0xff,
+    0x8d,
+    0x21,
+    0xf9,
+    0x19,
+    0x68,
+    0x4d,
+    0x32,
+    0x59,
+    0x78,
+    0x42,
+    0x1d,
+    0x0c,
+    0xc5,
+    0x1a,
+    0xcb,
+    0x28,
+    0xe2,
+    0xc1,
+    0x1a,
+    0x35,
+    0xf1,
+    0x42,
+    0x0a,
+    0x19,
+    0x39,
+    0xfa,
+    0x83,
+    0xd1,
+    0xb4,
+    0xaa,
+    0x69,
+    0x0f,
+    0xc2,
+    0x8e,
+    0xf9,
+    0x59,
+    0x2c,
+    0xee,
+    0x11,
+    0xfc,
+    0x3e,
+    0x4b,
+    0x44,
+    0xfb,
+    0x9a,
+    0x32,
+    0xc8,
+    0x78,
+    0x23,
+    0x56,
+    0x85,
+    0x49,
+    0x21,
+    0x43,
+    0x12,
+    0x79,
+    0xbd,
+    0xa0,
+    0x70,
+    0x47,
+    0x2f,
+    0xae,
+    0xb6,
+    0xd7,
+    0x6c,
+    0xc6,
+    0x07,
+    0x76,
+    0xa9,
+    0x8a,
+    0xa2,
+    0x16,
+    0x02,
+    0x89,
+    0x1f,
+    0x1a,
+    0xd1,
+    0xa2,
+    0x96,
+    0x56,
+    0xd1,
+    0x1f,
+    0x10,
+    0xe1,
+    0xe5,
+    0x9f,
+    0x3f,
+    0xdd,
+    0x09,
+    0x0c,
+    0x40,
+    0x90,
+    0x71,
+    0xef,
+    0x14,
+    0x41,
+    0x02,
+    0x82,
+    0x3a,
+    0x6b,
+    0xe1,
+    0xf8,
+    0x2c,
+    0x5d,
+    0xbe,
+    0xfd,
+    0x1b,
+    0x02,
+    0x1d,
+    0x00,
+    0xe0,
+    0x20,
+    0xe0,
+    0x7c,
+    0x02,
+    0x16,
+    0xa7,
+    0x6c,
+    0x6a,
+    0x19,
+    0xba,
+    0xd5,
+    0x83,
+    0x73,
+    0xf3,
+    0x7d,
+    0x31,
+    0xef,
+    0xa7,
+    0xe1,
+    0x5d,
+    0x5b,
+    0x7f,
+    0xf3,
+    0xfc,
+    0xda,
+    0x84,
+    0x31,
+    0x02,
+    0x82,
+    0x01,
+    0x01,
+    0x00,
+    0x83,
+    0xdb,
+    0xa1,
+    0xbc,
+    0x3e,
+    0xc7,
+    0x29,
+    0xa5,
+    0x6a,
+    0x5c,
+    0x2c,
+    0xe8,
+    0x7a,
+    0x8c,
+    0x7e,
+    0xe8,
+    0xb8,
+    0x3e,
+    0x13,
+    0x47,
+    0xcd,
+    0x36,
+    0x7e,
+    0x79,
+    0x30,
+    0x7a,
+    0x28,
+    0x03,
+    0xd3,
+    0xd4,
+    0xd2,
+    0xe3,
+    0xee,
+    0x3b,
+    0x46,
+    0xda,
+    0xe0,
+    0x71,
+    0xe6,
+    0xcf,
+    0x46,
+    0x86,
+    0x0a,
+    0x37,
+    0x57,
+    0xb6,
+    0xe9,
+    0xcf,
+    0xa1,
+    0x78,
+    0x19,
+    0xb8,
+    0x72,
+    0x9f,
+    0x30,
+    0x8c,
+    0x2a,
+    0x04,
+    0x7c,
+    0x2f,
+    0x0c,
+    0x27,
+    0xa7,
+    0xb3,
+    0x23,
+    0xe0,
+    0x46,
+    0xf2,
+    0x75,
+    0x0c,
+    0x03,
+    0x4c,
+    0xad,
+    0xfb,
+    0xc1,
+    0xcb,
+    0x28,
+    0xcd,
+    0xa0,
+    0x63,
+    0xdb,
+    0x44,
+    0x88,
+    0xe0,
+    0xda,
+    0x6c,
+    0x5b,
+    0x89,
+    0xb2,
+    0x5b,
+    0x40,
+    0x6d,
+    0xeb,
+    0x78,
+    0x7a,
+    0xd5,
+    0xaf,
+    0x40,
+    0x52,
+    0x46,
+    0x63,
+    0x92,
+    0x13,
+    0x0d,
+    0xee,
+    0xee,
+    0xf9,
+    0x53,
+    0xca,
+    0x2d,
+    0x4e,
+    0x3b,
+    0x13,
+    0xd8,
+    0x0f,
+    0x50,
+    0xd0,
+    0x44,
+    0x57,
+    0x67,
+    0x0f,
+    0x45,
+    0x8f,
+    0x21,
+    0x30,
+    0x97,
+    0x9e,
+    0x80,
+    0xd9,
+    0xd0,
+    0x91,
+    0xb7,
+    0xc9,
+    0x5a,
+    0x69,
+    0xda,
+    0xeb,
+    0xd5,
+    0xea,
+    0x37,
+    0xf6,
+    0xb3,
+    0xbe,
+    0x1f,
+    0x24,
+    0xf1,
+    0x55,
+    0x14,
+    0x28,
+    0x05,
+    0xb5,
+    0xd8,
+    0x84,
+    0x0f,
+    0x62,
+    0x85,
+    0xaa,
+    0xec,
+    0x77,
+    0x64,
+    0xfd,
+    0x80,
+    0x7c,
+    0x41,
+    0x00,
+    0x88,
+    0xa3,
+    0x79,
+    0x7d,
+    0x4f,
+    0x6f,
+    0xe3,
+    0x76,
+    0xf4,
+    0xb5,
+    0x97,
+    0xb7,
+    0xeb,
+    0x67,
+    0x28,
+    0xba,
+    0x07,
+    0x1a,
+    0x59,
+    0x32,
+    0xc1,
+    0x53,
+    0xd9,
+    0x05,
+    0x6b,
+    0x63,
+    0x93,
+    0xce,
+    0xa1,
+    0xd9,
+    0x7a,
+    0xb2,
+    0xff,
+    0x1c,
+    0x12,
+    0x0a,
+    0x9a,
+    0xe5,
+    0x51,
+    0x1e,
+    0xba,
+    0xfc,
+    0x95,
+    0x2e,
+    0x28,
+    0xa9,
+    0xfc,
+    0x4c,
+    0xed,
+    0x7b,
+    0x05,
+    0xca,
+    0x67,
+    0xe0,
+    0x2d,
+    0xd7,
+    0x54,
+    0xb3,
+    0x05,
+    0x1c,
+    0x23,
+    0x2b,
+    0x35,
+    0x2e,
+    0x19,
+    0x48,
+    0x59,
+    0x0e,
+    0x58,
+    0xa8,
+    0x01,
+    0x56,
+    0xfb,
+    0x78,
+    0x90,
+    0xba,
+    0x08,
+    0x77,
+    0x94,
+    0x45,
+    0x05,
+    0x13,
+    0xc7,
+    0x6b,
+    0x96,
+    0xd2,
+    0xa3,
+    0xa6,
+    0x01,
+    0x9f,
+    0x34,
+    0x02,
+    0x82,
+    0x01,
+    0x00,
+    0x16,
+    0x1a,
+    0xb4,
+    0x6d,
+    0x9f,
+    0x16,
+    0x6c,
+    0xcc,
+    0x91,
+    0x66,
+    0xfe,
+    0x30,
+    0xeb,
+    0x8e,
+    0x44,
+    0xba,
+    0x2b,
+    0x7a,
+    0xc9,
+    0xa8,
+    0x95,
+    0xf2,
+    0xa6,
+    0x38,
+    0xd8,
+    0xaf,
+    0x3e,
+    0x91,
+    0x68,
+    0xe8,
+    0x52,
+    0xf3,
+    0x97,
+    0x37,
+    0x70,
+    0xf2,
+    0x47,
+    0xa3,
+    0xf4,
+    0x62,
+    0x26,
+    0xf5,
+    0x3b,
+    0x71,
+    0x52,
+    0x50,
+    0x15,
+    0x9c,
+    0x6d,
+    0xa6,
+    0x6d,
+    0x92,
+    0x4c,
+    0x48,
+    0x76,
+    0x31,
+    0x54,
+    0x48,
+    0xa5,
+    0x99,
+    0x7a,
+    0xd4,
+    0x61,
+    0xf7,
+    0x21,
+    0x44,
+    0xe7,
+    0xd8,
+    0x82,
+    0xc3,
+    0x50,
+    0xd3,
+    0xd9,
+    0xd4,
+    0x66,
+    0x20,
+    0xab,
+    0x70,
+    0x4c,
+    0x97,
+    0x9b,
+    0x8d,
+    0xac,
+    0x1f,
+    0x78,
+    0x27,
+    0x1e,
+    0x47,
+    0xf8,
+    0x3b,
+    0xd1,
+    0x55,
+    0x73,
+    0xf3,
+    0xb4,
+    0x8e,
+    0x6d,
+    0x45,
+    0x40,
+    0x54,
+    0xc6,
+    0xd8,
+    0x95,
+    0x15,
+    0x27,
+    0xb7,
+    0x5f,
+    0x65,
+    0xaa,
+    0xcb,
+    0x24,
+    0xc9,
+    0x49,
+    0x87,
+    0x32,
+    0xad,
+    0xcb,
+    0xf8,
+    0x35,
+    0x63,
+    0x56,
+    0x72,
+    0x7c,
+    0x4e,
+    0x6c,
+    0xad,
+    0x5f,
+    0x26,
+    0x8c,
+    0xd2,
+    0x80,
+    0x41,
+    0xaf,
+    0x88,
+    0x23,
+    0x20,
+    0x03,
+    0xa4,
+    0xd5,
+    0x3c,
+    0x53,
+    0x54,
+    0xb0,
+    0x3d,
+    0xed,
+    0x0e,
+    0x9e,
+    0x53,
+    0x0a,
+    0x63,
+    0x5f,
+    0xfd,
+    0x28,
+    0x57,
+    0x09,
+    0x07,
+    0x73,
+    0xf4,
+    0x0c,
+    0xd4,
+    0x71,
+    0x5d,
+    0x6b,
+    0xa0,
+    0xd7,
+    0x86,
+    0x99,
+    0x29,
+    0x9b,
+    0xca,
+    0xfb,
+    0xcc,
+    0xd6,
+    0x2f,
+    0xfe,
+    0xbe,
+    0x94,
+    0xef,
+    0x1a,
+    0x0e,
+    0x55,
+    0x84,
+    0xa7,
+    0xaf,
+    0x7b,
+    0xfa,
+    0xed,
+    0x77,
+    0x61,
+    0x28,
+    0x22,
+    0xee,
+    0x6b,
+    0x11,
+    0xdd,
+    0xb0,
+    0x17,
+    0x1e,
+    0x06,
+    0xe4,
+    0x29,
+    0x4c,
+    0xc2,
+    0x3f,
+    0xd6,
+    0x75,
+    0xb6,
+    0x08,
+    0x04,
+    0x55,
+    0x13,
+    0x48,
+    0x4f,
+    0x44,
+    0xea,
+    0x8d,
+    0xaf,
+    0xcb,
+    0xac,
+    0x22,
+    0xc4,
+    0x6a,
+    0xb3,
+    0x86,
+    0xe5,
+    0x47,
+    0xa9,
+    0xb5,
+    0x72,
+    0x17,
+    0x23,
+    0x11,
+    0x81,
+    0x7f,
+    0x00,
+    0x00,
+    0x67,
+    0x5c,
+    0xf4,
+    0x58,
+    0xcc,
+    0xe2,
+    0x46,
+    0xce,
+    0xf5,
+    0x6d,
+    0xd8,
+    0x18,
+    0x91,
+    0xc4,
+    0x20,
+    0xbf,
+    0x07,
+    0x48,
+    0x45,
+    0xfd,
+    0x02,
+    0x1c,
+    0x2f,
+    0x68,
+    0x44,
+    0xcb,
+    0xfb,
+    0x6b,
+    0xcb,
+    0x8d,
+    0x02,
+    0x49,
+    0x7c,
+    0xee,
+    0xd2,
+    0xa6,
+    0xd3,
+    0x43,
+    0xb8,
+    0xa4,
+    0x09,
+    0xb7,
+    0xc1,
+    0xd4,
+    0x4b,
+    0xc3,
+    0x66,
+    0xa7,
+    0xe0,
+    0x21,
 };
 static const unsigned char dsa_p[] = {
     0x00, 0xda, 0xb3, 0x46, 0x4d, 0x54, 0x57, 0xc7, 0xb4, 0x61, 0xa0, 0x6f, 0x66, 0x17, 0xda,
@@ -1036,12 +3067,13 @@ static int do_check_params(OSSL_PARAM key_params[], int expected)
     int ret;
 
     ret = TEST_ptr(gen_ctx = EVP_PKEY_CTX_new_from_name(mainctx, "DSA", NULL))
-          && TEST_int_eq(EVP_PKEY_fromdata_init(gen_ctx), 1)
-          && TEST_int_eq(EVP_PKEY_fromdata(gen_ctx, &pkey,
-                                           EVP_PKEY_KEYPAIR, key_params), 1)
-          && TEST_ptr(check_ctx = EVP_PKEY_CTX_new_from_pkey(mainctx, pkey,
-                                                        NULL))
-          && TEST_int_eq(EVP_PKEY_param_check(check_ctx), expected);
+        && TEST_int_eq(EVP_PKEY_fromdata_init(gen_ctx), 1)
+        && TEST_int_eq(EVP_PKEY_fromdata(gen_ctx, &pkey,
+                           EVP_PKEY_KEYPAIR, key_params),
+            1)
+        && TEST_ptr(check_ctx = EVP_PKEY_CTX_new_from_pkey(mainctx, pkey,
+                        NULL))
+        && TEST_int_eq(EVP_PKEY_param_check(check_ctx), expected);
     EVP_PKEY_CTX_free(check_ctx);
     EVP_PKEY_CTX_free(gen_ctx);
     EVP_PKEY_free(pkey);
@@ -1049,7 +3081,7 @@ static int do_check_params(OSSL_PARAM key_params[], int expected)
 }
 
 static int do_check_bn(OSSL_PARAM params[], const char *key,
-                       const unsigned char *expected, size_t expected_len)
+    const unsigned char *expected, size_t expected_len)
 {
     OSSL_PARAM *p;
     BIGNUM *bn = NULL;
@@ -1057,9 +3089,9 @@ static int do_check_bn(OSSL_PARAM params[], const char *key,
     int ret, len;
 
     ret = TEST_ptr(p = OSSL_PARAM_locate(params, key))
-          && TEST_true(OSSL_PARAM_get_BN(p, &bn))
-          && TEST_int_gt(len = BN_bn2binpad(bn, buffer, expected_len), 0)
-          && TEST_mem_eq(expected, expected_len, buffer, len);
+        && TEST_true(OSSL_PARAM_get_BN(p, &bn))
+        && TEST_int_gt(len = BN_bn2binpad(bn, buffer, expected_len), 0)
+        && TEST_mem_eq(expected, expected_len, buffer, len);
     BN_free(bn);
     return ret;
 }
@@ -1070,8 +3102,8 @@ static int do_check_int(OSSL_PARAM params[], const char *key, int expected)
     int val = 0;
 
     return TEST_ptr(p = OSSL_PARAM_locate(params, key))
-           && TEST_true(OSSL_PARAM_get_int(p, &val))
-           && TEST_int_eq(val, expected);
+        && TEST_true(OSSL_PARAM_get_int(p, &val))
+        && TEST_int_eq(val, expected);
 }
 
 static int test_dsa_tofrom_data_select(void)
@@ -1081,8 +3113,8 @@ static int test_dsa_tofrom_data_select(void)
     const unsigned char *pkeydata = dsa_key;
 
     ret = TEST_ptr(key = d2i_AutoPrivateKey_ex(NULL, &pkeydata, sizeof(dsa_key),
-                                               mainctx, NULL))
-          && TEST_true(do_pkey_tofrom_data_select(key, "DSA"));
+                       mainctx, NULL))
+        && TEST_true(do_pkey_tofrom_data_select(key, "DSA"));
 
     EVP_PKEY_free(key);
     return ret;
@@ -1105,24 +3137,24 @@ static int test_dsa_todata(void)
     int dsa_gindex = 5;
 
     gen_params[0] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_FFC_SEED,
-                                                      (void*)dsa_seed,
-                                                      sizeof(dsa_seed));
+        (void *)dsa_seed,
+        sizeof(dsa_seed));
     gen_params[1] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_FFC_GINDEX,
-                                             &dsa_gindex);
+        &dsa_gindex);
     gen_params[2] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_FFC_PCOUNTER,
-                                             &dsa_pcounter);
+        &dsa_pcounter);
     gen_params[3] = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(pkey = d2i_AutoPrivateKey_ex(NULL, &pkeydata, sizeof(dsa_key),
-                                               mainctx, NULL))
+                      mainctx, NULL))
         || !TEST_int_eq(EVP_PKEY_todata(pkey, EVP_PKEY_KEYPAIR, &to_params), 1)
         || !do_check_bn(to_params, OSSL_PKEY_PARAM_FFC_P, dsa_p, sizeof(dsa_p))
         || !do_check_bn(to_params, OSSL_PKEY_PARAM_FFC_Q, dsa_q, sizeof(dsa_q))
         || !do_check_bn(to_params, OSSL_PKEY_PARAM_FFC_G, dsa_g, sizeof(dsa_g))
         || !do_check_bn(to_params, OSSL_PKEY_PARAM_PUB_KEY, dsa_pub,
-                        sizeof(dsa_pub))
+            sizeof(dsa_pub))
         || !do_check_bn(to_params, OSSL_PKEY_PARAM_PRIV_KEY, dsa_priv,
-                        sizeof(dsa_priv))
+            sizeof(dsa_priv))
         || !do_check_int(to_params, OSSL_PKEY_PARAM_FFC_GINDEX, -1)
         || !do_check_int(to_params, OSSL_PKEY_PARAM_FFC_PCOUNTER, -1)
         || !do_check_int(to_params, OSSL_PKEY_PARAM_FFC_H, 0)
@@ -1139,9 +3171,9 @@ static int test_dsa_todata(void)
         || !do_check_params(all_params, 1))
         goto err;
     gen_params[1] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_FFC_GINDEX,
-                                             &dsa_gindex);
+        &dsa_gindex);
     gen_params[2] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_FFC_PCOUNTER,
-                                             &dsa_pcounter);
+        &dsa_pcounter);
     /*
      * Check that modifying the shallow copy values used in OSSL_PARAM_merge()
      * results in an invalid key. This also verifies that the fips186-4
@@ -1176,7 +3208,7 @@ static int test_dsa_todata(void)
 static int test_dsa_fromdata_digest_prop(int tstid)
 {
     EVP_PKEY_CTX *ctx = NULL, *gctx = NULL;
-    EVP_PKEY *pkey = NULL,  *pkey2 = NULL;
+    EVP_PKEY *pkey = NULL, *pkey2 = NULL;
     OSSL_PARAM params[4], *p = params;
     int ret = 0;
     int expected = (tstid == 0 ? 0 : 1);
@@ -1186,7 +3218,7 @@ static int test_dsa_fromdata_digest_prop(int tstid)
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_DIGEST, "SHA512", 0);
     /* Setting a bad prop query here should fail during paramgen - when it tries to do a fetch */
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_FFC_DIGEST_PROPS,
-                                            tstid == 0 ? "provider=unknown" : "provider=default", 0);
+        tstid == 0 ? "provider=unknown" : "provider=default", 0);
     *p++ = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(mainctx, "DSA", NULL))
@@ -1217,9 +3249,9 @@ static int test_pkey_todata_null(void)
     const unsigned char *pdata = keydata[0].kder;
 
     ret = TEST_ptr(pkey = d2i_AutoPrivateKey_ex(NULL, &pdata, keydata[0].size,
-                                                mainctx, NULL))
-          && TEST_int_eq(EVP_PKEY_todata(NULL, EVP_PKEY_KEYPAIR, &params), 0)
-          && TEST_int_eq(EVP_PKEY_todata(pkey, EVP_PKEY_KEYPAIR, NULL), 0);
+                       mainctx, NULL))
+        && TEST_int_eq(EVP_PKEY_todata(NULL, EVP_PKEY_KEYPAIR, &params), 0)
+        && TEST_int_eq(EVP_PKEY_todata(pkey, EVP_PKEY_KEYPAIR, NULL), 0);
     EVP_PKEY_free(pkey);
     return ret;
 }
@@ -1240,10 +3272,11 @@ static int test_pkey_export_null(void)
     const unsigned char *pdata = keydata[0].kder;
 
     ret = TEST_ptr(pkey = d2i_AutoPrivateKey_ex(NULL, &pdata, keydata[0].size,
-                                                mainctx, NULL))
-          && TEST_int_eq(EVP_PKEY_export(NULL, EVP_PKEY_KEYPAIR,
-                                         test_pkey_export_cb, NULL), 0)
-          && TEST_int_eq(EVP_PKEY_export(pkey, EVP_PKEY_KEYPAIR, NULL, NULL), 0);
+                       mainctx, NULL))
+        && TEST_int_eq(EVP_PKEY_export(NULL, EVP_PKEY_KEYPAIR,
+                           test_pkey_export_cb, NULL),
+            0)
+        && TEST_int_eq(EVP_PKEY_export(pkey, EVP_PKEY_KEYPAIR, NULL, NULL), 0);
     EVP_PKEY_free(pkey);
     return ret;
 }
@@ -1259,11 +3292,11 @@ static int test_pkey_export(void)
     int pdata_len = keydata[0].size;
 
     if (!TEST_ptr(pkey = d2i_AutoPrivateKey_ex(NULL, &pdata, pdata_len,
-                                               mainctx, NULL))
+                      mainctx, NULL))
         || !TEST_true(EVP_PKEY_export(pkey, EVP_PKEY_KEYPAIR,
-                                       test_pkey_export_cb, pkey))
+            test_pkey_export_cb, pkey))
         || !TEST_false(EVP_PKEY_export(pkey, EVP_PKEY_KEYPAIR,
-                                       test_pkey_export_cb, NULL)))
+            test_pkey_export_cb, NULL)))
         ret = 0;
     EVP_PKEY_free(pkey);
 
@@ -1275,9 +3308,9 @@ static int test_pkey_export(void)
         || !TEST_ptr(pkey = EVP_PKEY_new())
         || !TEST_true(EVP_PKEY_assign_RSA(pkey, rsa))
         || !TEST_true(EVP_PKEY_export(pkey, EVP_PKEY_KEYPAIR,
-                                      test_pkey_export_cb, pkey))
+            test_pkey_export_cb, pkey))
         || !TEST_false(EVP_PKEY_export(pkey, EVP_PKEY_KEYPAIR,
-                                       test_pkey_export_cb, NULL)))
+            test_pkey_export_cb, NULL)))
         ret = 0;
     EVP_PKEY_free(pkey);
 #endif
@@ -1298,21 +3331,23 @@ static int test_rsa_pss_sign(void)
     size_t sig_len = 0;
 
     sig_params[0] = OSSL_PARAM_construct_int(OSSL_PKEY_PARAM_PAD_MODE,
-                                             &padding);
+        &padding);
     sig_params[1] = OSSL_PARAM_construct_utf8_string(OSSL_SIGNATURE_PARAM_DIGEST,
-                                                     (char *)mdname, 0);
+        (char *)mdname, 0);
     sig_params[2] = OSSL_PARAM_construct_end();
 
     ret = TEST_ptr(pkey = d2i_AutoPrivateKey_ex(NULL, &pdata, keydata[0].size,
-                                                mainctx, NULL))
-          && TEST_ptr(pctx = EVP_PKEY_CTX_new_from_pkey(mainctx, pkey, NULL))
-          && TEST_int_gt(EVP_PKEY_sign_init_ex(pctx, sig_params), 0)
-          && TEST_int_gt(EVP_PKEY_sign(pctx, NULL, &sig_len, mdbuf,
-                                       sizeof(mdbuf)), 0)
-          && TEST_int_gt(sig_len, 0)
-          && TEST_ptr(sig = OPENSSL_malloc(sig_len))
-          && TEST_int_gt(EVP_PKEY_sign(pctx, sig, &sig_len, mdbuf,
-                                       sizeof(mdbuf)), 0);
+                       mainctx, NULL))
+        && TEST_ptr(pctx = EVP_PKEY_CTX_new_from_pkey(mainctx, pkey, NULL))
+        && TEST_int_gt(EVP_PKEY_sign_init_ex(pctx, sig_params), 0)
+        && TEST_int_gt(EVP_PKEY_sign(pctx, NULL, &sig_len, mdbuf,
+                           sizeof(mdbuf)),
+            0)
+        && TEST_int_gt(sig_len, 0)
+        && TEST_ptr(sig = OPENSSL_malloc(sig_len))
+        && TEST_int_gt(EVP_PKEY_sign(pctx, sig, &sig_len, mdbuf,
+                           sizeof(mdbuf)),
+            0);
 
     EVP_PKEY_CTX_free(pctx);
     OPENSSL_free(sig);
@@ -1329,7 +3364,7 @@ static int test_evp_md_ctx_dup(void)
 
     /* test copying freshly initialized context */
     ret = TEST_ptr(mdctx = EVP_MD_CTX_new())
-          && TEST_ptr(copyctx = EVP_MD_CTX_dup(mdctx));
+        && TEST_ptr(copyctx = EVP_MD_CTX_dup(mdctx));
 
     EVP_MD_CTX_free(mdctx);
     EVP_MD_CTX_free(copyctx);
@@ -1344,8 +3379,8 @@ static int test_evp_md_ctx_copy(void)
 
     /* test copying freshly initialized context */
     ret = TEST_ptr(mdctx = EVP_MD_CTX_new())
-          && TEST_ptr(copyctx = EVP_MD_CTX_new())
-          && TEST_true(EVP_MD_CTX_copy_ex(copyctx, mdctx));
+        && TEST_ptr(copyctx = EVP_MD_CTX_new())
+        && TEST_true(EVP_MD_CTX_copy_ex(copyctx, mdctx));
 
     EVP_MD_CTX_free(mdctx);
     EVP_MD_CTX_free(copyctx);
@@ -1361,7 +3396,7 @@ static int test_evp_md_ctx_copy2(void)
     void *origin_algctx = NULL;
 
     if (!TEST_ptr(ctx = OSSL_LIB_CTX_new())
-            || !TEST_ptr(md = EVP_MD_fetch(ctx, "sha256", NULL)))
+        || !TEST_ptr(md = EVP_MD_fetch(ctx, "sha256", NULL)))
         goto end;
 
     inctx = EVP_MD_CTX_new();
@@ -1382,7 +3417,7 @@ static int test_evp_md_ctx_copy2(void)
      */
     origin_algctx = outctx->algctx;
     ret = TEST_true(EVP_MD_CTX_copy_ex(outctx, inctx))
-          && TEST_true(outctx->algctx == origin_algctx);
+        && TEST_true(outctx->algctx == origin_algctx);
 
 end:
     EVP_MD_free(md);
@@ -1401,11 +3436,11 @@ static int test_evp_pbe_alg_add(void)
     EVP_PBE_KEYGEN *keygen = NULL;
 
     if (!TEST_true(EVP_PBE_alg_add(NID_pbeWithMD5AndDES_CBC, EVP_des_cbc(), EVP_md5(),
-                                   PKCS5_PBE_keyivgen)))
+            PKCS5_PBE_keyivgen)))
         goto err;
 
     if (!TEST_true(EVP_PBE_find_ex(EVP_PBE_TYPE_OUTER, NID_pbeWithMD5AndDES_CBC,
-                                   &cipher_nid, &md_nid, &keygen, &keygen_ex)))
+            &cipher_nid, &md_nid, &keygen, &keygen_ex)))
         goto err;
 
     if (!TEST_true(keygen != NULL))
@@ -1453,9 +3488,9 @@ int setup_tests(void)
 #ifndef OPENSSL_NO_EC
     ADD_ALL_TESTS(test_d2i_PrivateKey_ex, 2);
     ADD_TEST(test_ec_tofrom_data_select);
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
     ADD_TEST(test_ecx_tofrom_data_select);
-# endif
+#endif
     ADD_TEST(test_ec_d2i_i2d_pubkey);
 #else
     ADD_ALL_TESTS(test_d2i_PrivateKey_ex, 1);
diff --git a/test/evp_fetch_prov_test.c b/test/evp_fetch_prov_test.c
index 876d6ccc0a3d9..38cff1c82fc06 100644
--- a/test/evp_fetch_prov_test.c
+++ b/test/evp_fetch_prov_test.c
@@ -47,7 +47,7 @@ const OPTIONS *test_get_options(void)
         { "property", OPT_FETCH_PROPERTY, 's', "The fetch property e.g. provider=fips" },
         { "fetchfail", OPT_FETCH_FAILURE, '-', "fetch is expected to fail" },
         { "defaultctx", OPT_USE_DEFAULTCTX, '-',
-          "Use the default context if this is set" },
+            "Use the default context if this is set" },
         { OPT_HELP_STR, 1, '-', "file\tProvider names to explicitly load\n" },
         { NULL }
     };
@@ -55,23 +55,23 @@ const OPTIONS *test_get_options(void)
 }
 
 static int calculate_digest(const EVP_MD *md, const char *msg, size_t len,
-                            const unsigned char *exptd)
+    const unsigned char *exptd)
 {
     unsigned char out[SHA256_DIGEST_LENGTH];
     EVP_MD_CTX *ctx;
     int ret = 0;
 
     if (!TEST_ptr(ctx = EVP_MD_CTX_new())
-            || !TEST_true(EVP_DigestInit_ex(ctx, md, NULL))
-            || !TEST_true(EVP_DigestUpdate(ctx, msg, len))
-            || !TEST_true(EVP_DigestFinal_ex(ctx, out, NULL))
-            || !TEST_mem_eq(out, SHA256_DIGEST_LENGTH, exptd,
-                            SHA256_DIGEST_LENGTH)
-            || !TEST_true(md == EVP_MD_CTX_get0_md(ctx)))
+        || !TEST_true(EVP_DigestInit_ex(ctx, md, NULL))
+        || !TEST_true(EVP_DigestUpdate(ctx, msg, len))
+        || !TEST_true(EVP_DigestFinal_ex(ctx, out, NULL))
+        || !TEST_mem_eq(out, SHA256_DIGEST_LENGTH, exptd,
+            SHA256_DIGEST_LENGTH)
+        || !TEST_true(md == EVP_MD_CTX_get0_md(ctx)))
         goto err;
 
     ret = 1;
- err:
+err:
     EVP_MD_CTX_free(ctx);
     return ret;
 }
@@ -148,7 +148,7 @@ static X509_ALGOR *make_algor(int nid)
 
     if (!TEST_ptr(algor = X509_ALGOR_new())
         || !TEST_true(X509_ALGOR_set0(algor, OBJ_nid2obj(nid),
-                                      V_ASN1_UNDEF, NULL))) {
+            V_ASN1_UNDEF, NULL))) {
         X509_ALGOR_free(algor);
         return NULL;
     }
@@ -162,9 +162,9 @@ static int test_md(const EVP_MD *md)
 {
     const char testmsg[] = "Hello world";
     const unsigned char exptd[] = {
-      0x27, 0x51, 0x8b, 0xa9, 0x68, 0x30, 0x11, 0xf6, 0xb3, 0x96, 0x07, 0x2c,
-      0x05, 0xf6, 0x65, 0x6d, 0x04, 0xf5, 0xfb, 0xc3, 0x78, 0x7c, 0xf9, 0x24,
-      0x90, 0xec, 0x60, 0x6e, 0x50, 0x92, 0xe3, 0x26
+        0x27, 0x51, 0x8b, 0xa9, 0x68, 0x30, 0x11, 0xf6, 0xb3, 0x96, 0x07, 0x2c,
+        0x05, 0xf6, 0x65, 0x6d, 0x04, 0xf5, 0xfb, 0xc3, 0x78, 0x7c, 0xf9, 0x24,
+        0x90, 0xec, 0x60, 0x6e, 0x50, 0x92, 0xe3, 0x26
     };
 
     return TEST_ptr(md)
@@ -177,7 +177,7 @@ static int test_md(const EVP_MD *md)
 static int test_implicit_EVP_MD_fetch(void)
 {
     OSSL_LIB_CTX *ctx = NULL;
-    OSSL_PROVIDER *prov[2] = {NULL, NULL};
+    OSSL_PROVIDER *prov[2] = { NULL, NULL };
     int ret = 0;
 
     ret = (use_default_ctx == 0 || load_providers(&ctx, prov))
@@ -191,7 +191,7 @@ static int test_explicit_EVP_MD_fetch(const char *id)
 {
     OSSL_LIB_CTX *ctx = NULL;
     EVP_MD *md = NULL;
-    OSSL_PROVIDER *prov[2] = {NULL, NULL};
+    OSSL_PROVIDER *prov[2] = { NULL, NULL };
     int ret = 0;
 
     if (use_default_ctx == 0 && !load_providers(&ctx, prov))
@@ -213,7 +213,7 @@ static int test_explicit_EVP_MD_fetch(const char *id)
     }
     ret = 1;
 
- err:
+err:
     EVP_MD_free(md);
     unload_providers(&ctx, prov);
     return ret;
@@ -251,7 +251,7 @@ static int test_explicit_EVP_MD_fetch_by_X509_ALGOR(int idx)
     }
 
     ret = test_explicit_EVP_MD_fetch(id);
- end:
+end:
     X509_ALGOR_free(algor);
     return ret;
 }
@@ -260,7 +260,7 @@ static int test_explicit_EVP_MD_fetch_by_X509_ALGOR(int idx)
  * Test EVP_CIPHER_fetch()
  */
 static int encrypt_decrypt(const EVP_CIPHER *cipher, const unsigned char *msg,
-                           size_t len)
+    size_t len)
 {
     int ret = 0, ctlen, ptlen;
     EVP_CIPHER_CTX *ctx = NULL;
@@ -269,13 +269,13 @@ static int encrypt_decrypt(const EVP_CIPHER *cipher, const unsigned char *msg,
 
     memset(key, 0, sizeof(key));
     if (!TEST_ptr(ctx = EVP_CIPHER_CTX_new())
-            || !TEST_true(EVP_CipherInit_ex(ctx, cipher, NULL, key, NULL, 1))
-            || !TEST_true(EVP_CipherUpdate(ctx, ct, &ctlen, msg, len))
-            || !TEST_true(EVP_CipherFinal_ex(ctx, ct, &ctlen))
-            || !TEST_true(EVP_CipherInit_ex(ctx, cipher, NULL, key, NULL, 0))
-            || !TEST_true(EVP_CipherUpdate(ctx, pt, &ptlen, ct, ctlen))
-            || !TEST_true(EVP_CipherFinal_ex(ctx, pt, &ptlen))
-            || !TEST_mem_eq(pt, ptlen, msg, len))
+        || !TEST_true(EVP_CipherInit_ex(ctx, cipher, NULL, key, NULL, 1))
+        || !TEST_true(EVP_CipherUpdate(ctx, ct, &ctlen, msg, len))
+        || !TEST_true(EVP_CipherFinal_ex(ctx, ct, &ctlen))
+        || !TEST_true(EVP_CipherInit_ex(ctx, cipher, NULL, key, NULL, 0))
+        || !TEST_true(EVP_CipherUpdate(ctx, pt, &ptlen, ct, ctlen))
+        || !TEST_true(EVP_CipherFinal_ex(ctx, pt, &ptlen))
+        || !TEST_mem_eq(pt, ptlen, msg, len))
         goto err;
 
     ret = 1;
@@ -295,7 +295,7 @@ static int test_cipher(const EVP_CIPHER *cipher)
 static int test_implicit_EVP_CIPHER_fetch(void)
 {
     OSSL_LIB_CTX *ctx = NULL;
-    OSSL_PROVIDER *prov[2] = {NULL, NULL};
+    OSSL_PROVIDER *prov[2] = { NULL, NULL };
     int ret = 0;
 
     ret = (use_default_ctx == 0 || load_providers(&ctx, prov))
@@ -309,7 +309,7 @@ static int test_explicit_EVP_CIPHER_fetch(const char *id)
 {
     OSSL_LIB_CTX *ctx = NULL;
     EVP_CIPHER *cipher = NULL;
-    OSSL_PROVIDER *prov[2] = {NULL, NULL};
+    OSSL_PROVIDER *prov[2] = { NULL, NULL };
     int ret = 0;
 
     if (use_default_ctx == 0 && !load_providers(&ctx, prov))
@@ -367,7 +367,7 @@ static int test_explicit_EVP_CIPHER_fetch_by_X509_ALGOR(int idx)
     }
 
     ret = test_explicit_EVP_CIPHER_fetch(id);
- end:
+end:
     X509_ALGOR_free(algor);
     return ret;
 }
@@ -394,7 +394,7 @@ int setup_tests(void)
             use_default_ctx = 1;
             break;
         case OPT_TEST_CASES:
-           break;
+            break;
         default:
         case OPT_ERR:
             return 0;
diff --git a/test/evp_kdf_test.c b/test/evp_kdf_test.c
index 721b495ef09fb..c1a39333780fa 100644
--- a/test/evp_kdf_test.c
+++ b/test/evp_kdf_test.c
@@ -19,7 +19,6 @@
 #include "internal/numbers.h"
 #include "testutil.h"
 
-
 static EVP_KDF_CTX *get_kdfbyname_libctx(OSSL_LIB_CTX *libctx, const char *name)
 {
     EVP_KDF *kdf = EVP_KDF_fetch(libctx, name, NULL);
@@ -44,13 +43,13 @@ static OSSL_PARAM *construct_tls1_prf_params(const char *digest, const char *sec
         return NULL;
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)digest, 0);
+        (char *)digest, 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SECRET,
-                                             (unsigned char *)secret,
-                                             strlen(secret));
+        (unsigned char *)secret,
+        strlen(secret));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SEED,
-                                             (unsigned char *)seed,
-                                             strlen(seed));
+        (unsigned char *)seed,
+        strlen(seed));
     *p = OSSL_PARAM_construct_end();
 
     return params;
@@ -201,17 +200,17 @@ static OSSL_PARAM *construct_hkdf_params(char *digest, char *key,
 
     if (digest != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                                digest, 0);
+            digest, 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                             salt, strlen(salt));
+        salt, strlen(salt));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
-                                             (unsigned char *)key, keylen);
+        (unsigned char *)key, keylen);
     if (info != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO,
-                                                 info, strlen(info));
+            info, strlen(info));
     else
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_MODE,
-                                                "EXTRACT_ONLY", 0);
+            "EXTRACT_ONLY", 0);
     *p = OSSL_PARAM_construct_end();
 
     return params;
@@ -249,9 +248,9 @@ static int do_kdf_hkdf_gettables(int expand_only, int has_digest)
     EVP_KDF_CTX *kctx = NULL;
 
     if (!TEST_ptr(params = construct_hkdf_params(
-                                                 has_digest ? "sha256" : NULL,
-                                                 "secret", 6, "salt",
-                                                 expand_only ? NULL : "label"))
+                      has_digest ? "sha256" : NULL,
+                      "secret", 6, "salt",
+                      expand_only ? NULL : "label"))
         || !TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_HKDF))
         || !TEST_true(EVP_KDF_CTX_set_params(kctx, params)))
         goto err;
@@ -348,7 +347,7 @@ static int test_kdf_hkdf_set_invalid_mode(void)
     if (!TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_HKDF)))
         goto end;
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_MODE,
-                                                 "BADMODE", 0);
+        "BADMODE", 0);
     params[1] = OSSL_PARAM_construct_end();
     if (!TEST_int_eq(EVP_KDF_CTX_set_params(kctx, params), 0))
         goto end;
@@ -390,13 +389,13 @@ static int do_kdf_hkdf_set_invalid_param(const char *key, int type)
 static int test_kdf_hkdf_set_ctx_param_fail(void)
 {
     return do_kdf_hkdf_set_invalid_param(OSSL_KDF_PARAM_MODE,
-                                         OSSL_PARAM_OCTET_STRING)
-           && do_kdf_hkdf_set_invalid_param(OSSL_KDF_PARAM_KEY,
-                                            OSSL_PARAM_UTF8_STRING)
-           && do_kdf_hkdf_set_invalid_param(OSSL_KDF_PARAM_SALT,
-                                            OSSL_PARAM_UTF8_STRING)
-           && do_kdf_hkdf_set_invalid_param(OSSL_KDF_PARAM_INFO,
-                                            OSSL_PARAM_UTF8_STRING);
+               OSSL_PARAM_OCTET_STRING)
+        && do_kdf_hkdf_set_invalid_param(OSSL_KDF_PARAM_KEY,
+            OSSL_PARAM_UTF8_STRING)
+        && do_kdf_hkdf_set_invalid_param(OSSL_KDF_PARAM_SALT,
+            OSSL_PARAM_UTF8_STRING)
+        && do_kdf_hkdf_set_invalid_param(OSSL_KDF_PARAM_INFO,
+            OSSL_PARAM_UTF8_STRING);
 }
 
 static int test_kdf_hkdf_zero_output_size(void)
@@ -483,12 +482,12 @@ static OSSL_PARAM *construct_pbkdf1_params(char *pass, char *digest, char *salt,
         return NULL;
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
-                                             (unsigned char *)pass, strlen(pass));
+        (unsigned char *)pass, strlen(pass));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                             (unsigned char *)salt, strlen(salt));
+        (unsigned char *)salt, strlen(salt));
     *p++ = OSSL_PARAM_construct_uint(OSSL_KDF_PARAM_ITER, iter);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                             digest, 0);
+        digest, 0);
     *p = OSSL_PARAM_construct_end();
 
     return params;
@@ -524,8 +523,8 @@ static int test_kdf_pbkdf1(void)
         goto err;
 
     params = construct_pbkdf1_params("passwordPASSWORDpassword", "sha256",
-                                     "saltSALTsaltSALTsaltSALTsaltSALTsalt",
-                                     &iterations);
+        "saltSALTsaltSALTsaltSALTsaltSALTsalt",
+        &iterations);
 
     if (!TEST_ptr(params)
         || !TEST_ptr(kctx = get_kdfbyname_libctx(libctx, OSSL_KDF_NAME_PBKDF1))
@@ -569,8 +568,8 @@ static int test_kdf_pbkdf1_key_too_long(void)
         goto err;
 
     params = construct_pbkdf1_params("passwordPASSWORDpassword", "sha256",
-                                     "saltSALTsaltSALTsaltSALTsaltSALTsalt",
-                                     &iterations);
+        "saltSALTsaltSALTsaltSALTsaltSALTsalt",
+        &iterations);
 
     /*
      * This is the same test sequence as test_kdf_pbkdf1, but we expect
@@ -603,12 +602,12 @@ static OSSL_PARAM *construct_pbkdf2_params(char *pass, char *digest, char *salt,
         return NULL;
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
-                                             (unsigned char *)pass, strlen(pass));
+        (unsigned char *)pass, strlen(pass));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                             (unsigned char *)salt, strlen(salt));
+        (unsigned char *)salt, strlen(salt));
     *p++ = OSSL_PARAM_construct_uint(OSSL_KDF_PARAM_ITER, iter);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                             digest, 0);
+        digest, 0);
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_PKCS5, mode);
     *p = OSSL_PARAM_construct_end();
 
@@ -631,8 +630,8 @@ static int test_kdf_pbkdf2(void)
     };
 
     params = construct_pbkdf2_params("passwordPASSWORDpassword", "sha256",
-                                     "saltSALTsaltSALTsaltSALTsaltSALTsalt",
-                                     &iterations, &mode);
+        "saltSALTsaltSALTsaltSALTsaltSALTsalt",
+        &iterations, &mode);
 
     if (!TEST_ptr(params)
         || !TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_PBKDF2))
@@ -657,8 +656,8 @@ static int test_kdf_pbkdf2_small_output(void)
     OSSL_PARAM *params;
 
     params = construct_pbkdf2_params("passwordPASSWORDpassword", "sha256",
-                                     "saltSALTsaltSALTsaltSALTsaltSALTsalt",
-                                     &iterations, &mode);
+        "saltSALTsaltSALTsaltSALTsaltSALTsalt",
+        &iterations, &mode);
 
     if (!TEST_ptr(params)
         || !TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_PBKDF2))
@@ -688,8 +687,8 @@ static int test_kdf_pbkdf2_large_output(void)
         len = SIZE_MAX;
 
     params = construct_pbkdf2_params("passwordPASSWORDpassword", "sha256",
-                                     "saltSALTsaltSALTsaltSALTsaltSALTsalt",
-                                     &iterations, &mode);
+        "saltSALTsaltSALTsaltSALTsaltSALTsalt",
+        &iterations, &mode);
 
     if (!TEST_ptr(params)
         || !TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_PBKDF2))
@@ -714,8 +713,8 @@ static int test_kdf_pbkdf2_small_salt(void)
     OSSL_PARAM *params;
 
     params = construct_pbkdf2_params("passwordPASSWORDpassword", "sha256",
-                                     "saltSALT",
-                                     &iterations, &mode);
+        "saltSALT",
+        &iterations, &mode);
 
     if (!TEST_ptr(params)
         || !TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_PBKDF2))
@@ -739,8 +738,8 @@ static int test_kdf_pbkdf2_small_iterations(void)
     OSSL_PARAM *params;
 
     params = construct_pbkdf2_params("passwordPASSWORDpassword", "sha256",
-                                     "saltSALTsaltSALTsaltSALTsaltSALTsalt",
-                                     &iterations, &mode);
+        "saltSALTsaltSALTsaltSALTsaltSALTsalt",
+        &iterations, &mode);
 
     if (!TEST_ptr(params)
         || !TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_PBKDF2))
@@ -766,8 +765,8 @@ static int test_kdf_pbkdf2_small_salt_pkcs5(void)
     OSSL_PARAM mode_params[2];
 
     params = construct_pbkdf2_params("passwordPASSWORDpassword", "sha256",
-                                     "saltSALT",
-                                     &iterations, &mode);
+        "saltSALT",
+        &iterations, &mode);
 
     if (!TEST_ptr(params)
         || !TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_PBKDF2))
@@ -803,8 +802,8 @@ static int test_kdf_pbkdf2_small_iterations_pkcs5(void)
     OSSL_PARAM mode_params[2];
 
     params = construct_pbkdf2_params("passwordPASSWORDpassword", "sha256",
-                                     "saltSALTsaltSALTsaltSALTsaltSALTsalt",
-                                     &iterations, &mode);
+        "saltSALTsaltSALTsaltSALTsaltSALTsalt",
+        &iterations, &mode);
 
     if (!TEST_ptr(params)
         || !TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_PBKDF2))
@@ -838,8 +837,8 @@ static int test_kdf_pbkdf2_invalid_digest(void)
     OSSL_PARAM *params;
 
     params = construct_pbkdf2_params("passwordPASSWORDpassword", "blah",
-                                     "saltSALTsaltSALTsaltSALTsaltSALTsalt",
-                                     &iterations, &mode);
+        "saltSALTsaltSALTsaltSALTsaltSALTsalt",
+        &iterations, &mode);
 
     if (!TEST_ptr(params)
         || !TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_PBKDF2))
@@ -874,9 +873,9 @@ static int test_kdf_scrypt(void)
     };
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_PASSWORD,
-                                             (char *)"password", 8);
+        (char *)"password", 8);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                             (char *)"NaCl", 4);
+        (char *)"NaCl", 4);
     *p++ = OSSL_PARAM_construct_uint(OSSL_KDF_PARAM_SCRYPT_N, &nu);
     *p++ = OSSL_PARAM_construct_uint(OSSL_KDF_PARAM_SCRYPT_R, &ru);
     *p++ = OSSL_PARAM_construct_uint(OSSL_KDF_PARAM_SCRYPT_P, &pu);
@@ -911,30 +910,29 @@ static int test_kdf_ss_hash(void)
     OSSL_PARAM params[4], *p = params;
     unsigned char out[14];
     static unsigned char z[] = {
-        0x6d,0xbd,0xc2,0x3f,0x04,0x54,0x88,0xe4,0x06,0x27,0x57,0xb0,0x6b,0x9e,
-        0xba,0xe1,0x83,0xfc,0x5a,0x59,0x46,0xd8,0x0d,0xb9,0x3f,0xec,0x6f,0x62,
-        0xec,0x07,0xe3,0x72,0x7f,0x01,0x26,0xae,0xd1,0x2c,0xe4,0xb2,0x62,0xf4,
-        0x7d,0x48,0xd5,0x42,0x87,0xf8,0x1d,0x47,0x4c,0x7c,0x3b,0x18,0x50,0xe9
+        0x6d, 0xbd, 0xc2, 0x3f, 0x04, 0x54, 0x88, 0xe4, 0x06, 0x27, 0x57, 0xb0, 0x6b, 0x9e,
+        0xba, 0xe1, 0x83, 0xfc, 0x5a, 0x59, 0x46, 0xd8, 0x0d, 0xb9, 0x3f, 0xec, 0x6f, 0x62,
+        0xec, 0x07, 0xe3, 0x72, 0x7f, 0x01, 0x26, 0xae, 0xd1, 0x2c, 0xe4, 0xb2, 0x62, 0xf4,
+        0x7d, 0x48, 0xd5, 0x42, 0x87, 0xf8, 0x1d, 0x47, 0x4c, 0x7c, 0x3b, 0x18, 0x50, 0xe9
     };
     static unsigned char other[] = {
-        0xa1,0xb2,0xc3,0xd4,0xe5,0x43,0x41,0x56,0x53,0x69,0x64,0x3c,0x83,0x2e,
-        0x98,0x49,0xdc,0xdb,0xa7,0x1e,0x9a,0x31,0x39,0xe6,0x06,0xe0,0x95,0xde,
-        0x3c,0x26,0x4a,0x66,0xe9,0x8a,0x16,0x58,0x54,0xcd,0x07,0x98,0x9b,0x1e,
-        0xe0,0xec,0x3f,0x8d,0xbe
+        0xa1, 0xb2, 0xc3, 0xd4, 0xe5, 0x43, 0x41, 0x56, 0x53, 0x69, 0x64, 0x3c, 0x83, 0x2e,
+        0x98, 0x49, 0xdc, 0xdb, 0xa7, 0x1e, 0x9a, 0x31, 0x39, 0xe6, 0x06, 0xe0, 0x95, 0xde,
+        0x3c, 0x26, 0x4a, 0x66, 0xe9, 0x8a, 0x16, 0x58, 0x54, 0xcd, 0x07, 0x98, 0x9b, 0x1e,
+        0xe0, 0xec, 0x3f, 0x8d, 0xbe
     };
     static const unsigned char expected[sizeof(out)] = {
-        0xa4,0x62,0xde,0x16,0xa8,0x9d,0xe8,0x46,0x6e,0xf5,0x46,0x0b,0x47,0xb8
+        0xa4, 0x62, 0xde, 0x16, 0xa8, 0x9d, 0xe8, 0x46, 0x6e, 0xf5, 0x46, 0x0b, 0x47, 0xb8
     };
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)"sha224", 0);
+        (char *)"sha224", 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, z, sizeof(z));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, other,
-                                             sizeof(other));
+        sizeof(other));
     *p = OSSL_PARAM_construct_end();
 
-    ret =
-        TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_SSKDF))
+    ret = TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_SSKDF))
         && TEST_int_gt(EVP_KDF_derive(kctx, out, sizeof(out), params), 0)
         && TEST_mem_eq(out, sizeof(out), expected, sizeof(expected));
 
@@ -980,14 +978,13 @@ static int test_kdf_x963(void)
     };
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)"sha512", 0);
+        (char *)"sha512", 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, z, sizeof(z));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, shared,
-                                             sizeof(shared));
+        sizeof(shared));
     *p = OSSL_PARAM_construct_end();
 
-    ret =
-        TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_X963KDF))
+    ret = TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_X963KDF))
         && TEST_int_gt(EVP_KDF_derive(kctx, out, sizeof(out), params), 0)
         && TEST_mem_eq(out, sizeof(out), expected, sizeof(expected));
 
@@ -1006,8 +1003,22 @@ static int test_kdf_kbkdf_6803_128(void)
     EVP_KDF_CTX *kctx;
     OSSL_PARAM params[7];
     static unsigned char input_key[] = {
-        0x57, 0xD0, 0x29, 0x72, 0x98, 0xFF, 0xD9, 0xD3,
-        0x5D, 0xE5, 0xA4, 0x7F, 0xB4, 0xBD, 0xE2, 0x4B,
+        0x57,
+        0xD0,
+        0x29,
+        0x72,
+        0x98,
+        0xFF,
+        0xD9,
+        0xD3,
+        0x5D,
+        0xE5,
+        0xA4,
+        0x7F,
+        0xB4,
+        0xBD,
+        0xE2,
+        0x4B,
     };
     static unsigned char constants[][5] = {
         { 0x00, 0x00, 0x00, 0x02, 0x99 },
@@ -1015,12 +1026,12 @@ static int test_kdf_kbkdf_6803_128(void)
         { 0x00, 0x00, 0x00, 0x02, 0x55 },
     };
     static unsigned char outputs[][16] = {
-        {0xD1, 0x55, 0x77, 0x5A, 0x20, 0x9D, 0x05, 0xF0,
-         0x2B, 0x38, 0xD4, 0x2A, 0x38, 0x9E, 0x5A, 0x56},
-        {0x64, 0xDF, 0x83, 0xF8, 0x5A, 0x53, 0x2F, 0x17,
-         0x57, 0x7D, 0x8C, 0x37, 0x03, 0x57, 0x96, 0xAB},
-        {0x3E, 0x4F, 0xBD, 0xF3, 0x0F, 0xB8, 0x25, 0x9C,
-         0x42, 0x5C, 0xB6, 0xC9, 0x6F, 0x1F, 0x46, 0x35}
+        { 0xD1, 0x55, 0x77, 0x5A, 0x20, 0x9D, 0x05, 0xF0,
+            0x2B, 0x38, 0xD4, 0x2A, 0x38, 0x9E, 0x5A, 0x56 },
+        { 0x64, 0xDF, 0x83, 0xF8, 0x5A, 0x53, 0x2F, 0x17,
+            0x57, 0x7D, 0x8C, 0x37, 0x03, 0x57, 0x96, 0xAB },
+        { 0x3E, 0x4F, 0xBD, 0xF3, 0x0F, 0xB8, 0x25, 0x9C,
+            0x42, 0x5C, 0xB6, 0xC9, 0x6F, 0x1F, 0x46, 0x35 }
     };
     static unsigned char iv[16] = { 0 };
     unsigned char result[16] = { 0 };
@@ -1044,9 +1055,10 @@ static int test_kdf_kbkdf_6803_128(void)
         kctx = get_kdfbyname("KBKDF");
         ret = TEST_ptr(kctx)
             && TEST_int_gt(EVP_KDF_derive(kctx, result, sizeof(result),
-                                          params), 0)
+                               params),
+                0)
             && TEST_mem_eq(result, sizeof(result), outputs[i],
-                           sizeof(outputs[i]));
+                sizeof(outputs[i]));
         EVP_KDF_CTX_free(kctx);
         if (ret != 1)
             return ret;
@@ -1061,10 +1073,38 @@ static int test_kdf_kbkdf_6803_256(void)
     EVP_KDF_CTX *kctx;
     OSSL_PARAM params[7];
     static unsigned char input_key[] = {
-        0xB9, 0xD6, 0x82, 0x8B, 0x20, 0x56, 0xB7, 0xBE,
-        0x65, 0x6D, 0x88, 0xA1, 0x23, 0xB1, 0xFA, 0xC6,
-        0x82, 0x14, 0xAC, 0x2B, 0x72, 0x7E, 0xCF, 0x5F,
-        0x69, 0xAF, 0xE0, 0xC4, 0xDF, 0x2A, 0x6D, 0x2C,
+        0xB9,
+        0xD6,
+        0x82,
+        0x8B,
+        0x20,
+        0x56,
+        0xB7,
+        0xBE,
+        0x65,
+        0x6D,
+        0x88,
+        0xA1,
+        0x23,
+        0xB1,
+        0xFA,
+        0xC6,
+        0x82,
+        0x14,
+        0xAC,
+        0x2B,
+        0x72,
+        0x7E,
+        0xCF,
+        0x5F,
+        0x69,
+        0xAF,
+        0xE0,
+        0xC4,
+        0xDF,
+        0x2A,
+        0x6D,
+        0x2C,
     };
     static unsigned char constants[][5] = {
         { 0x00, 0x00, 0x00, 0x02, 0x99 },
@@ -1072,20 +1112,107 @@ static int test_kdf_kbkdf_6803_256(void)
         { 0x00, 0x00, 0x00, 0x02, 0x55 },
     };
     static unsigned char outputs[][32] = {
-        {0xE4, 0x67, 0xF9, 0xA9, 0x55, 0x2B, 0xC7, 0xD3,
-         0x15, 0x5A, 0x62, 0x20, 0xAF, 0x9C, 0x19, 0x22,
-         0x0E, 0xEE, 0xD4, 0xFF, 0x78, 0xB0, 0xD1, 0xE6,
-         0xA1, 0x54, 0x49, 0x91, 0x46, 0x1A, 0x9E, 0x50,
+        {
+            0xE4,
+            0x67,
+            0xF9,
+            0xA9,
+            0x55,
+            0x2B,
+            0xC7,
+            0xD3,
+            0x15,
+            0x5A,
+            0x62,
+            0x20,
+            0xAF,
+            0x9C,
+            0x19,
+            0x22,
+            0x0E,
+            0xEE,
+            0xD4,
+            0xFF,
+            0x78,
+            0xB0,
+            0xD1,
+            0xE6,
+            0xA1,
+            0x54,
+            0x49,
+            0x91,
+            0x46,
+            0x1A,
+            0x9E,
+            0x50,
         },
-        {0x41, 0x2A, 0xEF, 0xC3, 0x62, 0xA7, 0x28, 0x5F,
-         0xC3, 0x96, 0x6C, 0x6A, 0x51, 0x81, 0xE7, 0x60,
-         0x5A, 0xE6, 0x75, 0x23, 0x5B, 0x6D, 0x54, 0x9F,
-         0xBF, 0xC9, 0xAB, 0x66, 0x30, 0xA4, 0xC6, 0x04,
+        {
+            0x41,
+            0x2A,
+            0xEF,
+            0xC3,
+            0x62,
+            0xA7,
+            0x28,
+            0x5F,
+            0xC3,
+            0x96,
+            0x6C,
+            0x6A,
+            0x51,
+            0x81,
+            0xE7,
+            0x60,
+            0x5A,
+            0xE6,
+            0x75,
+            0x23,
+            0x5B,
+            0x6D,
+            0x54,
+            0x9F,
+            0xBF,
+            0xC9,
+            0xAB,
+            0x66,
+            0x30,
+            0xA4,
+            0xC6,
+            0x04,
         },
-        {0xFA, 0x62, 0x4F, 0xA0, 0xE5, 0x23, 0x99, 0x3F,
-         0xA3, 0x88, 0xAE, 0xFD, 0xC6, 0x7E, 0x67, 0xEB,
-         0xCD, 0x8C, 0x08, 0xE8, 0xA0, 0x24, 0x6B, 0x1D,
-         0x73, 0xB0, 0xD1, 0xDD, 0x9F, 0xC5, 0x82, 0xB0,
+        {
+            0xFA,
+            0x62,
+            0x4F,
+            0xA0,
+            0xE5,
+            0x23,
+            0x99,
+            0x3F,
+            0xA3,
+            0x88,
+            0xAE,
+            0xFD,
+            0xC6,
+            0x7E,
+            0x67,
+            0xEB,
+            0xCD,
+            0x8C,
+            0x08,
+            0xE8,
+            0xA0,
+            0x24,
+            0x6B,
+            0x1D,
+            0x73,
+            0xB0,
+            0xD1,
+            0xDD,
+            0x9F,
+            0xC5,
+            0x82,
+            0xB0,
         },
     };
     static unsigned char iv[16] = { 0 };
@@ -1110,9 +1237,10 @@ static int test_kdf_kbkdf_6803_256(void)
         kctx = get_kdfbyname("KBKDF");
         ret = TEST_ptr(kctx)
             && TEST_int_gt(EVP_KDF_derive(kctx, result, sizeof(result),
-                                          params), 0)
+                               params),
+                0)
             && TEST_mem_eq(result, sizeof(result), outputs[i],
-                           sizeof(outputs[i]));
+                sizeof(outputs[i]));
         EVP_KDF_CTX_free(kctx);
         if (ret != 1)
             return ret;
@@ -1156,7 +1284,7 @@ static int test_kdf_kbkdf_invalid_digest(void)
     EVP_KDF_CTX *kctx;
     OSSL_PARAM *params;
 
-    static unsigned char key[] = {0x01};
+    static unsigned char key[] = { 0x01 };
     int r = 32;
 
     params = construct_kbkdf_params("blah", "HMAC", key, 1, "prf", "test", &r);
@@ -1179,7 +1307,7 @@ static int test_kdf_kbkdf_invalid_mac(void)
     EVP_KDF_CTX *kctx;
     OSSL_PARAM *params;
 
-    static unsigned char key[] = {0x01};
+    static unsigned char key[] = { 0x01 };
     int r = 32;
 
     params = construct_kbkdf_params("sha256", "blah", key, 1, "prf", "test", &r);
@@ -1202,7 +1330,7 @@ static int test_kdf_kbkdf_invalid_r(void)
     EVP_KDF_CTX *kctx;
     OSSL_PARAM *params;
 
-    static unsigned char key[] = {0x01};
+    static unsigned char key[] = { 0x01 };
     int r = 31;
 
     params = construct_kbkdf_params("sha256", "HMAC", key, 1, "prf", "test", &r);
@@ -1219,14 +1347,13 @@ static int test_kdf_kbkdf_invalid_r(void)
     return ret;
 }
 
-
 static int test_kdf_kbkdf_empty_key(void)
 {
     int ret;
     EVP_KDF_CTX *kctx;
     OSSL_PARAM *params;
 
-    static unsigned char key[] = {0x01};
+    static unsigned char key[] = { 0x01 };
     unsigned char result[32] = { 0 };
     int r = 32;
 
@@ -1251,7 +1378,7 @@ static int test_kdf_kbkdf_1byte_key(void)
     EVP_KDF_CTX *kctx;
     OSSL_PARAM *params;
 
-    static unsigned char key[] = {0x01};
+    static unsigned char key[] = { 0x01 };
     unsigned char result[32] = { 0 };
     int r = 32;
 
@@ -1274,7 +1401,7 @@ static int test_kdf_kbkdf_zero_output_size(void)
     EVP_KDF_CTX *kctx;
     OSSL_PARAM *params;
 
-    static unsigned char key[] = {0x01};
+    static unsigned char key[] = { 0x01 };
     unsigned char result[32] = { 0 };
     int r = 32;
 
@@ -1301,16 +1428,58 @@ static int test_kdf_kbkdf_8009_prf1(void)
     EVP_KDF_CTX *kctx;
     OSSL_PARAM params[6];
     char *label = "prf", *digest = "sha256", *prf_input = "test",
-        *mac = "HMAC";
+         *mac = "HMAC";
     static unsigned char input_key[] = {
-        0x37, 0x05, 0xD9, 0x60, 0x80, 0xC1, 0x77, 0x28,
-        0xA0, 0xE8, 0x00, 0xEA, 0xB6, 0xE0, 0xD2, 0x3C,
+        0x37,
+        0x05,
+        0xD9,
+        0x60,
+        0x80,
+        0xC1,
+        0x77,
+        0x28,
+        0xA0,
+        0xE8,
+        0x00,
+        0xEA,
+        0xB6,
+        0xE0,
+        0xD2,
+        0x3C,
     };
     static unsigned char output[] = {
-        0x9D, 0x18, 0x86, 0x16, 0xF6, 0x38, 0x52, 0xFE,
-        0x86, 0x91, 0x5B, 0xB8, 0x40, 0xB4, 0xA8, 0x86,
-        0xFF, 0x3E, 0x6B, 0xB0, 0xF8, 0x19, 0xB4, 0x9B,
-        0x89, 0x33, 0x93, 0xD3, 0x93, 0x85, 0x42, 0x95,
+        0x9D,
+        0x18,
+        0x86,
+        0x16,
+        0xF6,
+        0x38,
+        0x52,
+        0xFE,
+        0x86,
+        0x91,
+        0x5B,
+        0xB8,
+        0x40,
+        0xB4,
+        0xA8,
+        0x86,
+        0xFF,
+        0x3E,
+        0x6B,
+        0xB0,
+        0xF8,
+        0x19,
+        0xB4,
+        0x9B,
+        0x89,
+        0x33,
+        0x93,
+        0xD3,
+        0x93,
+        0x85,
+        0x42,
+        0x95,
     };
     unsigned char result[sizeof(output)] = { 0 };
 
@@ -1341,20 +1510,90 @@ static int test_kdf_kbkdf_8009_prf2(void)
     EVP_KDF_CTX *kctx;
     OSSL_PARAM params[6];
     char *label = "prf", *digest = "sha384", *prf_input = "test",
-        *mac = "HMAC";
+         *mac = "HMAC";
     static unsigned char input_key[] = {
-        0x6D, 0x40, 0x4D, 0x37, 0xFA, 0xF7, 0x9F, 0x9D,
-        0xF0, 0xD3, 0x35, 0x68, 0xD3, 0x20, 0x66, 0x98,
-        0x00, 0xEB, 0x48, 0x36, 0x47, 0x2E, 0xA8, 0xA0,
-        0x26, 0xD1, 0x6B, 0x71, 0x82, 0x46, 0x0C, 0x52,
+        0x6D,
+        0x40,
+        0x4D,
+        0x37,
+        0xFA,
+        0xF7,
+        0x9F,
+        0x9D,
+        0xF0,
+        0xD3,
+        0x35,
+        0x68,
+        0xD3,
+        0x20,
+        0x66,
+        0x98,
+        0x00,
+        0xEB,
+        0x48,
+        0x36,
+        0x47,
+        0x2E,
+        0xA8,
+        0xA0,
+        0x26,
+        0xD1,
+        0x6B,
+        0x71,
+        0x82,
+        0x46,
+        0x0C,
+        0x52,
     };
     static unsigned char output[] = {
-        0x98, 0x01, 0xF6, 0x9A, 0x36, 0x8C, 0x2B, 0xF6,
-        0x75, 0xE5, 0x95, 0x21, 0xE1, 0x77, 0xD9, 0xA0,
-        0x7F, 0x67, 0xEF, 0xE1, 0xCF, 0xDE, 0x8D, 0x3C,
-        0x8D, 0x6F, 0x6A, 0x02, 0x56, 0xE3, 0xB1, 0x7D,
-        0xB3, 0xC1, 0xB6, 0x2A, 0xD1, 0xB8, 0x55, 0x33,
-        0x60, 0xD1, 0x73, 0x67, 0xEB, 0x15, 0x14, 0xD2,
+        0x98,
+        0x01,
+        0xF6,
+        0x9A,
+        0x36,
+        0x8C,
+        0x2B,
+        0xF6,
+        0x75,
+        0xE5,
+        0x95,
+        0x21,
+        0xE1,
+        0x77,
+        0xD9,
+        0xA0,
+        0x7F,
+        0x67,
+        0xEF,
+        0xE1,
+        0xCF,
+        0xDE,
+        0x8D,
+        0x3C,
+        0x8D,
+        0x6F,
+        0x6A,
+        0x02,
+        0x56,
+        0xE3,
+        0xB1,
+        0x7D,
+        0xB3,
+        0xC1,
+        0xB6,
+        0x2A,
+        0xD1,
+        0xB8,
+        0x55,
+        0x33,
+        0x60,
+        0xD1,
+        0x73,
+        0x67,
+        0xEB,
+        0x15,
+        0x14,
+        0xD2,
     };
     unsigned char result[sizeof(output)] = { 0 };
 
@@ -1397,23 +1636,103 @@ static int test_kdf_kbkdf_fixedinfo(void)
     int use_separator = 0;
 
     static unsigned char input_key[] = {
-        0xc1, 0x0b, 0x15, 0x2e, 0x8c, 0x97, 0xb7, 0x7e,
-        0x18, 0x70, 0x4e, 0x0f, 0x0b, 0xd3, 0x83, 0x05,
+        0xc1,
+        0x0b,
+        0x15,
+        0x2e,
+        0x8c,
+        0x97,
+        0xb7,
+        0x7e,
+        0x18,
+        0x70,
+        0x4e,
+        0x0f,
+        0x0b,
+        0xd3,
+        0x83,
+        0x05,
     };
     static unsigned char fixed_input[] = {
-        0x98, 0xcd, 0x4c, 0xbb, 0xbe, 0xbe, 0x15, 0xd1,
-        0x7d, 0xc8, 0x6e, 0x6d, 0xba, 0xd8, 0x00, 0xa2,
-        0xdc, 0xbd, 0x64, 0xf7, 0xc7, 0xad, 0x0e, 0x78,
-        0xe9, 0xcf, 0x94, 0xff, 0xdb, 0xa8, 0x9d, 0x03,
-        0xe9, 0x7e, 0xad, 0xf6, 0xc4, 0xf7, 0xb8, 0x06,
-        0xca, 0xf5, 0x2a, 0xa3, 0x8f, 0x09, 0xd0, 0xeb,
-        0x71, 0xd7, 0x1f, 0x49, 0x7b, 0xcc, 0x69, 0x06,
-        0xb4, 0x8d, 0x36, 0xc4,
+        0x98,
+        0xcd,
+        0x4c,
+        0xbb,
+        0xbe,
+        0xbe,
+        0x15,
+        0xd1,
+        0x7d,
+        0xc8,
+        0x6e,
+        0x6d,
+        0xba,
+        0xd8,
+        0x00,
+        0xa2,
+        0xdc,
+        0xbd,
+        0x64,
+        0xf7,
+        0xc7,
+        0xad,
+        0x0e,
+        0x78,
+        0xe9,
+        0xcf,
+        0x94,
+        0xff,
+        0xdb,
+        0xa8,
+        0x9d,
+        0x03,
+        0xe9,
+        0x7e,
+        0xad,
+        0xf6,
+        0xc4,
+        0xf7,
+        0xb8,
+        0x06,
+        0xca,
+        0xf5,
+        0x2a,
+        0xa3,
+        0x8f,
+        0x09,
+        0xd0,
+        0xeb,
+        0x71,
+        0xd7,
+        0x1f,
+        0x49,
+        0x7b,
+        0xcc,
+        0x69,
+        0x06,
+        0xb4,
+        0x8d,
+        0x36,
+        0xc4,
 
     };
     static unsigned char output[] = {
-        0x26, 0xfa, 0xf6, 0x19, 0x08, 0xad, 0x9e, 0xe8,
-        0x81, 0xb8, 0x30, 0x5c, 0x22, 0x1d, 0xb5, 0x3f,
+        0x26,
+        0xfa,
+        0xf6,
+        0x19,
+        0x08,
+        0xad,
+        0x9e,
+        0xe8,
+        0x81,
+        0xb8,
+        0x30,
+        0x5c,
+        0x22,
+        0x1d,
+        0xb5,
+        0x3f,
     };
     unsigned char result[sizeof(output)] = { 0 };
 
@@ -1421,12 +1740,12 @@ static int test_kdf_kbkdf_fixedinfo(void)
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_MAC, mac, 0);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_MODE, mode, 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, input_key,
-                                             sizeof(input_key));
+        sizeof(input_key));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO,
-                                             fixed_input, sizeof(fixed_input));
+        fixed_input, sizeof(fixed_input));
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_KBKDF_USE_L, &use_l);
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_KBKDF_USE_SEPARATOR,
-                                    &use_separator);
+        &use_separator);
     *p = OSSL_PARAM_construct_end();
 
     kctx = get_kdfbyname("KBKDF");
@@ -1574,11 +1893,11 @@ static int test_kdf_kbkdf_kmac(void)
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_MAC, mac, 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
-                                             input_key, sizeof(input_key));
+        input_key, sizeof(input_key));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO,
-                                             context, sizeof(context));
+        context, sizeof(context));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                             label, sizeof(label));
+        label, sizeof(label));
     *p = OSSL_PARAM_construct_end();
 
     kctx = get_kdfbyname("KBKDF");
@@ -1598,33 +1917,32 @@ static int test_kdf_ss_hmac(void)
     OSSL_PARAM params[6], *p = params;
     unsigned char out[16];
     static unsigned char z[] = {
-        0xb7,0x4a,0x14,0x9a,0x16,0x15,0x46,0xf8,0xc2,0x0b,0x06,0xac,0x4e,0xd4
+        0xb7, 0x4a, 0x14, 0x9a, 0x16, 0x15, 0x46, 0xf8, 0xc2, 0x0b, 0x06, 0xac, 0x4e, 0xd4
     };
     static unsigned char other[] = {
-        0x34,0x8a,0x37,0xa2,0x7e,0xf1,0x28,0x2f,0x5f,0x02,0x0d,0xcc
+        0x34, 0x8a, 0x37, 0xa2, 0x7e, 0xf1, 0x28, 0x2f, 0x5f, 0x02, 0x0d, 0xcc
     };
     static unsigned char salt[] = {
-        0x36,0x38,0x27,0x1c,0xcd,0x68,0xa2,0x5d,0xc2,0x4e,0xcd,0xdd,0x39,0xef,
-        0x3f,0x89
+        0x36, 0x38, 0x27, 0x1c, 0xcd, 0x68, 0xa2, 0x5d, 0xc2, 0x4e, 0xcd, 0xdd, 0x39, 0xef,
+        0x3f, 0x89
     };
     static const unsigned char expected[sizeof(out)] = {
-        0x44,0xf6,0x76,0xe8,0x5c,0x1b,0x1a,0x8b,0xbc,0x3d,0x31,0x92,0x18,0x63,
-        0x1c,0xa3
+        0x44, 0xf6, 0x76, 0xe8, 0x5c, 0x1b, 0x1a, 0x8b, 0xbc, 0x3d, 0x31, 0x92, 0x18, 0x63,
+        0x1c, 0xa3
     };
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_MAC,
-                                            (char *)OSSL_MAC_NAME_HMAC, 0);
+        (char *)OSSL_MAC_NAME_HMAC, 0);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)"sha256", 0);
+        (char *)"sha256", 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, z, sizeof(z));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, other,
-                                             sizeof(other));
+        sizeof(other));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT, salt,
-                                             sizeof(salt));
+        sizeof(salt));
     *p = OSSL_PARAM_construct_end();
 
-    ret =
-        TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_SSKDF))
+    ret = TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_SSKDF))
         && TEST_int_gt(EVP_KDF_derive(kctx, out, sizeof(out), params), 0)
         && TEST_mem_eq(out, sizeof(out), expected, sizeof(expected));
 
@@ -1640,38 +1958,37 @@ static int test_kdf_ss_kmac(void)
     unsigned char out[64];
     size_t mac_size = 20;
     static unsigned char z[] = {
-        0xb7,0x4a,0x14,0x9a,0x16,0x15,0x46,0xf8,0xc2,0x0b,0x06,0xac,0x4e,0xd4
+        0xb7, 0x4a, 0x14, 0x9a, 0x16, 0x15, 0x46, 0xf8, 0xc2, 0x0b, 0x06, 0xac, 0x4e, 0xd4
     };
     static unsigned char other[] = {
-        0x34,0x8a,0x37,0xa2,0x7e,0xf1,0x28,0x2f,0x5f,0x02,0x0d,0xcc
+        0x34, 0x8a, 0x37, 0xa2, 0x7e, 0xf1, 0x28, 0x2f, 0x5f, 0x02, 0x0d, 0xcc
     };
     static unsigned char salt[] = {
-        0x36,0x38,0x27,0x1c,0xcd,0x68,0xa2,0x5d,0xc2,0x4e,0xcd,0xdd,0x39,0xef,
-        0x3f,0x89
+        0x36, 0x38, 0x27, 0x1c, 0xcd, 0x68, 0xa2, 0x5d, 0xc2, 0x4e, 0xcd, 0xdd, 0x39, 0xef,
+        0x3f, 0x89
     };
     static const unsigned char expected[sizeof(out)] = {
-        0xe9,0xc1,0x84,0x53,0xa0,0x62,0xb5,0x3b,0xdb,0xfc,0xbb,0x5a,0x34,0xbd,
-        0xb8,0xe5,0xe7,0x07,0xee,0xbb,0x5d,0xd1,0x34,0x42,0x43,0xd8,0xcf,0xc2,
-        0xc2,0xe6,0x33,0x2f,0x91,0xbd,0xa5,0x86,0xf3,0x7d,0xe4,0x8a,0x65,0xd4,
-        0xc5,0x14,0xfd,0xef,0xaa,0x1e,0x67,0x54,0xf3,0x73,0xd2,0x38,0xe1,0x95,
-        0xae,0x15,0x7e,0x1d,0xe8,0x14,0x98,0x03
+        0xe9, 0xc1, 0x84, 0x53, 0xa0, 0x62, 0xb5, 0x3b, 0xdb, 0xfc, 0xbb, 0x5a, 0x34, 0xbd,
+        0xb8, 0xe5, 0xe7, 0x07, 0xee, 0xbb, 0x5d, 0xd1, 0x34, 0x42, 0x43, 0xd8, 0xcf, 0xc2,
+        0xc2, 0xe6, 0x33, 0x2f, 0x91, 0xbd, 0xa5, 0x86, 0xf3, 0x7d, 0xe4, 0x8a, 0x65, 0xd4,
+        0xc5, 0x14, 0xfd, 0xef, 0xaa, 0x1e, 0x67, 0x54, 0xf3, 0x73, 0xd2, 0x38, 0xe1, 0x95,
+        0xae, 0x15, 0x7e, 0x1d, 0xe8, 0x14, 0x98, 0x03
     };
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_MAC,
-                                            (char *)OSSL_MAC_NAME_KMAC128, 0);
+        (char *)OSSL_MAC_NAME_KMAC128, 0);
     /* The digest parameter is not needed here and should be ignored */
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)"SHA256", 0);
+        (char *)"SHA256", 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, z, sizeof(z));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO, other,
-                                             sizeof(other));
+        sizeof(other));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT, salt,
-                                             sizeof(salt));
+        sizeof(salt));
     *p++ = OSSL_PARAM_construct_size_t(OSSL_KDF_PARAM_MAC_SIZE, &mac_size);
     *p = OSSL_PARAM_construct_end();
 
-    ret =
-        TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_SSKDF))
+    ret = TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_SSKDF))
         && TEST_size_t_eq(EVP_KDF_CTX_get_kdf_size(kctx), 0)
         && TEST_int_eq(EVP_KDF_CTX_set_params(kctx, params), 1)
         /* The bug fix for KMAC returning SIZE_MAX was added in 3.0.8 */
@@ -1721,19 +2038,18 @@ static int test_kdf_sshkdf(void)
     };
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)"sha256", 0);
+        (char *)"sha256", 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, key,
-                                             sizeof(key));
+        sizeof(key));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SSHKDF_XCGHASH,
-                                             xcghash, sizeof(xcghash));
+        xcghash, sizeof(xcghash));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SSHKDF_SESSION_ID,
-                                             sessid, sizeof(sessid));
+        sessid, sizeof(sessid));
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_SSHKDF_TYPE,
-                                            &kdftype, sizeof(kdftype));
+        &kdftype, sizeof(kdftype));
     *p = OSSL_PARAM_construct_end();
 
-    ret =
-        TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_SSHKDF))
+    ret = TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_SSHKDF))
         && TEST_int_gt(EVP_KDF_derive(kctx, out, sizeof(out), params), 0)
         && TEST_mem_eq(out, sizeof(out), expected, sizeof(expected));
 
@@ -1753,7 +2069,7 @@ static int test_kdfs_same(EVP_KDF *kdf1, EVP_KDF *kdf2)
      * will result in a different pointer.
      */
     return TEST_ptr_eq(EVP_KDF_get0_provider(kdf1), EVP_KDF_get0_provider(kdf2))
-           && TEST_str_eq(EVP_KDF_get0_name(kdf1), EVP_KDF_get0_name(kdf2));
+        && TEST_str_eq(EVP_KDF_get0_name(kdf1), EVP_KDF_get0_name(kdf2));
 }
 
 static int test_kdf_get_kdf(void)
@@ -1765,7 +2081,7 @@ static int test_kdf_get_kdf(void)
     if (!TEST_ptr(obj = OBJ_nid2obj(NID_id_pbkdf2))
         || !TEST_ptr(kdf1 = EVP_KDF_fetch(NULL, OSSL_KDF_NAME_PBKDF2, NULL))
         || !TEST_ptr(kdf2 = EVP_KDF_fetch(NULL, OBJ_nid2sn(OBJ_obj2nid(obj)),
-                                          NULL))
+                         NULL))
         || !test_kdfs_same(kdf1, kdf2))
         ok = 0;
     EVP_KDF_free(kdf1);
@@ -1802,25 +2118,24 @@ static int test_kdf_x942_asn1(void)
     unsigned char out[24];
     /* RFC2631 Section 2.1.6 Test data */
     static unsigned char z[] = {
-        0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,
-        0x0e,0x0f,0x10,0x11,0x12,0x13
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d,
+        0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13
     };
     static const unsigned char expected[sizeof(out)] = {
-        0xa0,0x96,0x61,0x39,0x23,0x76,0xf7,0x04,
-        0x4d,0x90,0x52,0xa3,0x97,0x88,0x32,0x46,
-        0xb6,0x7f,0x5f,0x1e,0xf6,0x3e,0xb5,0xfb
+        0xa0, 0x96, 0x61, 0x39, 0x23, 0x76, 0xf7, 0x04,
+        0x4d, 0x90, 0x52, 0xa3, 0x97, 0x88, 0x32, 0x46,
+        0xb6, 0x7f, 0x5f, 0x1e, 0xf6, 0x3e, 0xb5, 0xfb
     };
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST,
-                                            (char *)"sha1", 0);
+        (char *)"sha1", 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, z,
-                                             sizeof(z));
+        sizeof(z));
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_CEK_ALG,
-                                            (char *)cek_alg, 0);
+        (char *)cek_alg, 0);
     *p = OSSL_PARAM_construct_end();
 
-    ret =
-        TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_X942KDF_ASN1))
+    ret = TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_X942KDF_ASN1))
         && TEST_int_gt(EVP_KDF_derive(kctx, out, sizeof(out), params), 0)
         && TEST_mem_eq(out, sizeof(out), expected, sizeof(expected));
 
@@ -1848,15 +2163,14 @@ static int test_kdf_krb5kdf(void)
     };
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_CIPHER,
-                                            (char *)"AES-128-CBC", 0);
+        (char *)"AES-128-CBC", 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY, key,
-                                             sizeof(key));
+        sizeof(key));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_CONSTANT,
-                                             constant, sizeof(constant));
+        constant, sizeof(constant));
     *p = OSSL_PARAM_construct_end();
 
-    ret =
-        TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_KRB5KDF))
+    ret = TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_KRB5KDF))
         && TEST_int_gt(EVP_KDF_derive(kctx, out, sizeof(out), params), 0)
         && TEST_mem_eq(out, sizeof(out), expected, sizeof(expected));
 
@@ -1878,7 +2192,7 @@ static int test_kdf_hmac_drbg_settables(void)
 
     /* Test there are settables */
     if (!TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_HMACDRBGKDF))
-            || !TEST_ptr(settableparams = EVP_KDF_CTX_settable_params(kctx)))
+        || !TEST_ptr(settableparams = EVP_KDF_CTX_settable_params(kctx)))
         goto err;
 
     /* Fail if no params have been set when doing a derive */
@@ -1890,7 +2204,8 @@ static int test_kdf_hmac_drbg_settables(void)
     for (i = 0; settableparams[i].key != NULL; ++i) {
         /* Skip "properties" key since it returns 1 unless the digest is also set */
         if (OPENSSL_strcasecmp(settableparams[i].key,
-                               OSSL_KDF_PARAM_PROPERTIES) != 0) {
+                OSSL_KDF_PARAM_PROPERTIES)
+            != 0) {
             TEST_note("Testing set int into %s fails", settableparams[i].key);
             params[0] = OSSL_PARAM_construct_int(settableparams[i].key, &j);
             if (!TEST_int_le(EVP_KDF_CTX_set_params(kctx, params), 0))
@@ -1899,13 +2214,13 @@ static int test_kdf_hmac_drbg_settables(void)
     }
     /* Test that we can set values multiple times */
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_HMACDRBG_ENTROPY,
-                                                  (char *)ent, sizeof(ent));
+        (char *)ent, sizeof(ent));
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_HMACDRBG_NONCE,
-                                                  (char *)ent, sizeof(ent));
+        (char *)ent, sizeof(ent));
     params[2] = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_DIGEST, "SHA256",
-                                                 0);
+        0);
     params[3] = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_PROPERTIES, "",
-                                                 0);
+        0);
     params[4] = OSSL_PARAM_construct_end();
     if (!TEST_int_eq(EVP_KDF_CTX_set_params(kctx, params), 1))
         goto err;
@@ -1913,13 +2228,13 @@ static int test_kdf_hmac_drbg_settables(void)
         goto err;
     /* Test we can retrieve values back */
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_DIGEST,
-                                                 digestname, sizeof(digestname));
+        digestname, sizeof(digestname));
     params[1] = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_MAC,
-                                                 macname, sizeof(macname));
+        macname, sizeof(macname));
     params[2] = OSSL_PARAM_construct_end();
     if (!TEST_int_eq(EVP_KDF_CTX_get_params(kctx, params), 1)
-            || !TEST_mem_eq(digestname, params[0].return_size, "SHA2-256", 8)
-            || !TEST_mem_eq(macname, params[1].return_size, "HMAC", 4))
+        || !TEST_mem_eq(digestname, params[0].return_size, "SHA2-256", 8)
+        || !TEST_mem_eq(macname, params[1].return_size, "HMAC", 4))
         goto err;
 
     /* Test the derive */
@@ -1928,7 +2243,7 @@ static int test_kdf_hmac_drbg_settables(void)
 
     /* test that XOF digests are not allowed */
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_ALG_PARAM_DIGEST,
-                                                 "shake256", 0);
+        "shake256", 0);
     params[1] = OSSL_PARAM_construct_end();
     if (!TEST_int_le(EVP_KDF_CTX_set_params(kctx, params), 0))
         goto err;
@@ -1950,7 +2265,7 @@ static int test_kdf_hmac_drbg_gettables(void)
 
     /* Test there are gettables */
     if (!TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_HMACDRBGKDF))
-            || !TEST_ptr(gettableparams = EVP_KDF_CTX_gettable_params(kctx)))
+        || !TEST_ptr(gettableparams = EVP_KDF_CTX_gettable_params(kctx)))
         goto err;
     /* Fail if we pass the wrong type for params */
     params[1] = OSSL_PARAM_construct_end();
@@ -1962,7 +2277,7 @@ static int test_kdf_hmac_drbg_gettables(void)
     /* fail to get params if they are not set yet */
     for (i = 0; gettableparams[i].key != NULL; ++i) {
         params[0] = OSSL_PARAM_construct_utf8_string(gettableparams[i].key,
-                                                     buf, sizeof(buf));
+            buf, sizeof(buf));
         if (!TEST_int_le(EVP_KDF_CTX_get_params(kctx, params), 0))
             goto err;
     }
@@ -2003,10 +2318,10 @@ static int test_kbkdf_mac_change(void)
     unsigned char out[sizeof(output)];
 
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_MAC,
-                                                 OSSL_MAC_NAME_KMAC128, 0);
+        OSSL_MAC_NAME_KMAC128, 0);
     params[1] = OSSL_PARAM_construct_end();
     if (!TEST_ptr(kctx = get_kdfbyname(OSSL_KDF_NAME_KBKDF))
-            || !TEST_true(EVP_KDF_CTX_set_params(kctx, params)))
+        || !TEST_true(EVP_KDF_CTX_set_params(kctx, params)))
         goto err;
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_MODE, "COUNTER", 0);
@@ -2016,12 +2331,12 @@ static int test_kbkdf_mac_change(void)
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_KBKDF_USE_SEPARATOR, &sep);
     *p++ = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_KBKDF_R, &r);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
-                                             key, sizeof(key));
+        key, sizeof(key));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_INFO,
-                                             info, sizeof(info));
+        info, sizeof(info));
     *p = OSSL_PARAM_construct_end();
     if (!TEST_true(EVP_KDF_derive(kctx, out, sizeof(out), params))
-            || !TEST_mem_eq(out, sizeof(out), output, sizeof(output)))
+        || !TEST_mem_eq(out, sizeof(out), output, sizeof(output)))
         goto err;
 
     ret = 1;
diff --git a/test/evp_libctx_test.c b/test/evp_libctx_test.c
index 039fca9bb09f8..3786c567a7442 100644
--- a/test/evp_libctx_test.c
+++ b/test/evp_libctx_test.c
@@ -33,7 +33,7 @@
 #include <openssl/encoder.h>
 #include "testutil.h"
 #include "internal/nelem.h"
-#include "crypto/bn_dh.h"   /* _bignum_ffdhe2048_p */
+#include "crypto/bn_dh.h" /* _bignum_ffdhe2048_p */
 
 static OSSL_LIB_CTX *libctx = NULL;
 static OSSL_PROVIDER *nullprov = NULL;
@@ -55,9 +55,9 @@ const OPTIONS *test_get_options(void)
     static const OPTIONS test_options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the libctx" },
+            "The configuration file to use for the libctx" },
         { "provider", OPT_PROVIDER_NAME, 's',
-          "The provider to load (The default value is 'default')" },
+            "The provider to load (The default value is 'default')" },
         { NULL }
     };
     return test_options;
@@ -66,7 +66,7 @@ const OPTIONS *test_get_options(void)
 #ifndef OPENSSL_NO_DH
 static const char *getname(int id)
 {
-    const char *name[] = {"p", "q", "g" };
+    const char *name[] = { "p", "q", "g" };
 
     if (id >= 0 && id < 3)
         return name[id];
@@ -139,10 +139,10 @@ static int test_dsa_param_keygen(int tstid)
     pind = tstid / 9;
     qind = (tstid / 3) % 3;
     gind = tstid % 3;
-    expected  = (pind == 0 && qind == 1 && gind == 2);
+    expected = (pind == 0 && qind == 1 && gind == 2);
 
     TEST_note("Testing with (p, q, g) = (%s, %s, %s)\n", getname(pind),
-              getname(qind), getname(gind));
+        getname(qind), getname(gind));
 
     if (!TEST_ptr(pkey_parm = EVP_PKEY_new())
         || !TEST_ptr(dsa = DSA_new())
@@ -202,10 +202,10 @@ static int do_dh_param_keygen(int tstid, const BIGNUM **bn)
     pind = tstid / 9;
     qind = (tstid / 3) % 3;
     gind = tstid % 3;
-    expected  = (pind == 0 && qind == 1 && gind == 2);
+    expected = (pind == 0 && qind == 1 && gind == 2);
 
     TEST_note("Testing with (p, q, g) = (%s, %s, %s)", getname(pind),
-              getname(qind), getname(gind));
+        getname(qind), getname(gind));
 
     if (!TEST_ptr(pkey_parm = EVP_PKEY_new())
         || !TEST_ptr(dh = DH_new())
@@ -252,7 +252,7 @@ static int do_dh_param_keygen(int tstid, const BIGNUM **bn)
 static int test_dh_safeprime_param_keygen(int tstid)
 {
     static const BIGNUM *bn[] = {
-        &ossl_bignum_ffdhe2048_p,  &ossl_bignum_ffdhe2048_q,
+        &ossl_bignum_ffdhe2048_p, &ossl_bignum_ffdhe2048_q,
         &ossl_bignum_const_2
     };
     return do_dh_param_keygen(tstid, bn);
@@ -265,71 +265,71 @@ static int dhx_cert_load(void)
     BIO *bio = NULL;
 
     static const unsigned char dhx_cert[] = {
-        0x30,0x82,0x03,0xff,0x30,0x82,0x02,0xe7,0xa0,0x03,0x02,0x01,0x02,0x02,0x09,0x00,
-        0xdb,0xf5,0x4d,0x22,0xa0,0x7a,0x67,0xa6,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,
-        0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x30,0x44,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,
-        0x04,0x06,0x13,0x02,0x55,0x4b,0x31,0x16,0x30,0x14,0x06,0x03,0x55,0x04,0x0a,0x0c,
-        0x0d,0x4f,0x70,0x65,0x6e,0x53,0x53,0x4c,0x20,0x47,0x72,0x6f,0x75,0x70,0x31,0x1d,
-        0x30,0x1b,0x06,0x03,0x55,0x04,0x03,0x0c,0x14,0x54,0x65,0x73,0x74,0x20,0x53,0x2f,
-        0x4d,0x49,0x4d,0x45,0x20,0x52,0x53,0x41,0x20,0x52,0x6f,0x6f,0x74,0x30,0x1e,0x17,
-        0x0d,0x31,0x33,0x30,0x38,0x30,0x32,0x31,0x34,0x34,0x39,0x32,0x39,0x5a,0x17,0x0d,
-        0x32,0x33,0x30,0x36,0x31,0x31,0x31,0x34,0x34,0x39,0x32,0x39,0x5a,0x30,0x44,0x31,
-        0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x4b,0x31,0x16,0x30,0x14,
-        0x06,0x03,0x55,0x04,0x0a,0x0c,0x0d,0x4f,0x70,0x65,0x6e,0x53,0x53,0x4c,0x20,0x47,
-        0x72,0x6f,0x75,0x70,0x31,0x1d,0x30,0x1b,0x06,0x03,0x55,0x04,0x03,0x0c,0x14,0x54,
-        0x65,0x73,0x74,0x20,0x53,0x2f,0x4d,0x49,0x4d,0x45,0x20,0x45,0x45,0x20,0x44,0x48,
-        0x20,0x23,0x31,0x30,0x82,0x01,0xb6,0x30,0x82,0x01,0x2b,0x06,0x07,0x2a,0x86,0x48,
-        0xce,0x3e,0x02,0x01,0x30,0x82,0x01,0x1e,0x02,0x81,0x81,0x00,0xd4,0x0c,0x4a,0x0c,
-        0x04,0x72,0x71,0x19,0xdf,0x59,0x19,0xc5,0xaf,0x44,0x7f,0xca,0x8e,0x2b,0xf0,0x09,
-        0xf5,0xd3,0x25,0xb1,0x73,0x16,0x55,0x89,0xdf,0xfd,0x07,0xaf,0x19,0xd3,0x7f,0xd0,
-        0x07,0xa2,0xfe,0x3f,0x5a,0xf1,0x01,0xc6,0xf8,0x2b,0xef,0x4e,0x6d,0x03,0x38,0x42,
-        0xa1,0x37,0xd4,0x14,0xb4,0x00,0x4a,0xb1,0x86,0x5a,0x83,0xce,0xb9,0x08,0x0e,0xc1,
-        0x99,0x27,0x47,0x8d,0x0b,0x85,0xa8,0x82,0xed,0xcc,0x0d,0xb9,0xb0,0x32,0x7e,0xdf,
-        0xe8,0xe4,0xf6,0xf6,0xec,0xb3,0xee,0x7a,0x11,0x34,0x65,0x97,0xfc,0x1a,0xb0,0x95,
-        0x4b,0x19,0xb9,0xa6,0x1c,0xd9,0x01,0x32,0xf7,0x35,0x7c,0x2d,0x5d,0xfe,0xc1,0x85,
-        0x70,0x49,0xf8,0xcc,0x99,0xd0,0xbe,0xf1,0x5a,0x78,0xc8,0x03,0x02,0x81,0x80,0x69,
-        0x00,0xfd,0x66,0xf2,0xfc,0x15,0x8b,0x09,0xb8,0xdc,0x4d,0xea,0xaa,0x79,0x55,0xf9,
-        0xdf,0x46,0xa6,0x2f,0xca,0x2d,0x8f,0x59,0x2a,0xad,0x44,0xa3,0xc6,0x18,0x2f,0x95,
-        0xb6,0x16,0x20,0xe3,0xd3,0xd1,0x8f,0x03,0xce,0x71,0x7c,0xef,0x3a,0xc7,0x44,0x39,
-        0x0e,0xe2,0x1f,0xd8,0xd3,0x89,0x2b,0xe7,0x51,0xdc,0x12,0x48,0x4c,0x18,0x4d,0x99,
-        0x12,0x06,0xe4,0x17,0x02,0x03,0x8c,0x24,0x05,0x8e,0xa6,0x85,0xf2,0x69,0x1b,0xe1,
-        0x6a,0xdc,0xe2,0x04,0x3a,0x01,0x9d,0x64,0xbe,0xfe,0x45,0xf9,0x44,0x18,0x71,0xbd,
-        0x2d,0x3e,0x7a,0x6f,0x72,0x7d,0x1a,0x80,0x42,0x57,0xae,0x18,0x6f,0x91,0xd6,0x61,
-        0x03,0x8a,0x1c,0x89,0x73,0xc7,0x56,0x41,0x03,0xd3,0xf8,0xed,0x65,0xe2,0x85,0x02,
-        0x15,0x00,0x89,0x94,0xab,0x10,0x67,0x45,0x41,0xad,0x63,0xc6,0x71,0x40,0x8d,0x6b,
-        0x9e,0x19,0x5b,0xa4,0xc7,0xf5,0x03,0x81,0x84,0x00,0x02,0x81,0x80,0x2f,0x5b,0xde,
-        0x72,0x02,0x36,0x6b,0x00,0x5e,0x24,0x7f,0x14,0x2c,0x18,0x52,0x42,0x97,0x4b,0xdb,
-        0x6e,0x15,0x50,0x3c,0x45,0x3e,0x25,0xf3,0xb7,0xc5,0x6e,0xe5,0x52,0xe7,0xc4,0xfb,
-        0xf4,0xa5,0xf0,0x39,0x12,0x7f,0xbc,0x54,0x1c,0x93,0xb9,0x5e,0xee,0xe9,0x14,0xb0,
-        0xdf,0xfe,0xfc,0x36,0xe4,0xf2,0xaf,0xfb,0x13,0xc8,0xdf,0x18,0x94,0x1d,0x40,0xb9,
-        0x71,0xdd,0x4c,0x9c,0xa7,0x03,0x52,0x02,0xb5,0xed,0x71,0x80,0x3e,0x23,0xda,0x28,
-        0xe5,0xab,0xe7,0x6f,0xf2,0x0a,0x0e,0x00,0x5b,0x7d,0xc6,0x4b,0xd7,0xc7,0xb2,0xc3,
-        0xba,0x62,0x7f,0x70,0x28,0xa0,0x9d,0x71,0x13,0x70,0xd1,0x9f,0x32,0x2f,0x3e,0xd2,
-        0xcd,0x1b,0xa4,0xc6,0x72,0xa0,0x74,0x5d,0x71,0xef,0x03,0x43,0x6e,0xa3,0x60,0x30,
-        0x5e,0x30,0x0c,0x06,0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x02,0x30,0x00,0x30,
-        0x0e,0x06,0x03,0x55,0x1d,0x0f,0x01,0x01,0xff,0x04,0x04,0x03,0x02,0x05,0xe0,0x30,
-        0x1d,0x06,0x03,0x55,0x1d,0x0e,0x04,0x16,0x04,0x14,0x0b,0x5a,0x4d,0x5f,0x7d,0x25,
-        0xc7,0xf2,0x9d,0xc1,0xaa,0xb7,0x63,0x82,0x2f,0xfa,0x8f,0x32,0xe7,0xc0,0x30,0x1f,
-        0x06,0x03,0x55,0x1d,0x23,0x04,0x18,0x30,0x16,0x80,0x14,0xdf,0x7e,0x5e,0x88,0x05,
-        0x24,0x33,0x08,0xdd,0x22,0x81,0x02,0x97,0xcc,0x9a,0xb7,0xb1,0x33,0x27,0x30,0x30,
-        0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x03,0x82,
-        0x01,0x01,0x00,0x5a,0xf2,0x63,0xef,0xd3,0x16,0xd7,0xf5,0xaa,0xdd,0x12,0x00,0x36,
-        0x00,0x21,0xa2,0x7b,0x08,0xd6,0x3b,0x9f,0x62,0xac,0x53,0x1f,0xed,0x4c,0xd1,0x15,
-        0x34,0x65,0x71,0xee,0x96,0x07,0xa6,0xef,0xb2,0xde,0xd8,0xbb,0x35,0x6e,0x2c,0xe2,
-        0xd1,0x26,0xef,0x7e,0x94,0xe2,0x88,0x51,0xa4,0x6c,0xaa,0x27,0x2a,0xd3,0xb6,0xc2,
-        0xf7,0xea,0xc3,0x0b,0xa9,0xb5,0x28,0x37,0xa2,0x63,0x08,0xe4,0x88,0xc0,0x1b,0x16,
-        0x1b,0xca,0xfd,0x8a,0x07,0x32,0x29,0xa7,0x53,0xb5,0x2d,0x30,0xe4,0xf5,0x16,0xc3,
-        0xe3,0xc2,0x4c,0x30,0x5d,0x35,0x80,0x1c,0xa2,0xdb,0xe3,0x4b,0x51,0x0d,0x4c,0x60,
-        0x5f,0xb9,0x46,0xac,0xa8,0x46,0xa7,0x32,0xa7,0x9c,0x76,0xf8,0xe9,0xb5,0x19,0xe2,
-        0x0c,0xe1,0x0f,0xc6,0x46,0xe2,0x38,0xa7,0x87,0x72,0x6d,0x6c,0xbc,0x88,0x2f,0x9d,
-        0x2d,0xe5,0xd0,0x7d,0x1e,0xc7,0x5d,0xf8,0x7e,0xb4,0x0b,0xa6,0xf9,0x6c,0xe3,0x7c,
-        0xb2,0x70,0x6e,0x75,0x9b,0x1e,0x63,0xe1,0x4d,0xb2,0x81,0xd3,0x55,0x38,0x94,0x1a,
-        0x7a,0xfa,0xbf,0x01,0x18,0x70,0x2d,0x35,0xd3,0xe3,0x10,0x7a,0x9a,0xa7,0x8f,0xf3,
-        0xbd,0x56,0x55,0x5e,0xd8,0xbd,0x4e,0x16,0x76,0xd0,0x48,0x4c,0xf9,0x51,0x54,0xdf,
-        0x2d,0xb0,0xc9,0xaa,0x5e,0x42,0x38,0x50,0xbf,0x0f,0xc0,0xd9,0x84,0x44,0x4b,0x42,
-        0x24,0xec,0x14,0xa3,0xde,0x11,0xdf,0x58,0x7f,0xc2,0x4d,0xb2,0xd5,0x42,0x78,0x6e,
-        0x52,0x3e,0xad,0xc3,0x5f,0x04,0xc4,0xe6,0x31,0xaa,0x81,0x06,0x8b,0x13,0x4b,0x3c,
-        0x0e,0x6a,0xb1
+        0x30, 0x82, 0x03, 0xff, 0x30, 0x82, 0x02, 0xe7, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x09, 0x00,
+        0xdb, 0xf5, 0x4d, 0x22, 0xa0, 0x7a, 0x67, 0xa6, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,
+        0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, 0x44, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55,
+        0x04, 0x06, 0x13, 0x02, 0x55, 0x4b, 0x31, 0x16, 0x30, 0x14, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c,
+        0x0d, 0x4f, 0x70, 0x65, 0x6e, 0x53, 0x53, 0x4c, 0x20, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x31, 0x1d,
+        0x30, 0x1b, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x14, 0x54, 0x65, 0x73, 0x74, 0x20, 0x53, 0x2f,
+        0x4d, 0x49, 0x4d, 0x45, 0x20, 0x52, 0x53, 0x41, 0x20, 0x52, 0x6f, 0x6f, 0x74, 0x30, 0x1e, 0x17,
+        0x0d, 0x31, 0x33, 0x30, 0x38, 0x30, 0x32, 0x31, 0x34, 0x34, 0x39, 0x32, 0x39, 0x5a, 0x17, 0x0d,
+        0x32, 0x33, 0x30, 0x36, 0x31, 0x31, 0x31, 0x34, 0x34, 0x39, 0x32, 0x39, 0x5a, 0x30, 0x44, 0x31,
+        0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x4b, 0x31, 0x16, 0x30, 0x14,
+        0x06, 0x03, 0x55, 0x04, 0x0a, 0x0c, 0x0d, 0x4f, 0x70, 0x65, 0x6e, 0x53, 0x53, 0x4c, 0x20, 0x47,
+        0x72, 0x6f, 0x75, 0x70, 0x31, 0x1d, 0x30, 0x1b, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x14, 0x54,
+        0x65, 0x73, 0x74, 0x20, 0x53, 0x2f, 0x4d, 0x49, 0x4d, 0x45, 0x20, 0x45, 0x45, 0x20, 0x44, 0x48,
+        0x20, 0x23, 0x31, 0x30, 0x82, 0x01, 0xb6, 0x30, 0x82, 0x01, 0x2b, 0x06, 0x07, 0x2a, 0x86, 0x48,
+        0xce, 0x3e, 0x02, 0x01, 0x30, 0x82, 0x01, 0x1e, 0x02, 0x81, 0x81, 0x00, 0xd4, 0x0c, 0x4a, 0x0c,
+        0x04, 0x72, 0x71, 0x19, 0xdf, 0x59, 0x19, 0xc5, 0xaf, 0x44, 0x7f, 0xca, 0x8e, 0x2b, 0xf0, 0x09,
+        0xf5, 0xd3, 0x25, 0xb1, 0x73, 0x16, 0x55, 0x89, 0xdf, 0xfd, 0x07, 0xaf, 0x19, 0xd3, 0x7f, 0xd0,
+        0x07, 0xa2, 0xfe, 0x3f, 0x5a, 0xf1, 0x01, 0xc6, 0xf8, 0x2b, 0xef, 0x4e, 0x6d, 0x03, 0x38, 0x42,
+        0xa1, 0x37, 0xd4, 0x14, 0xb4, 0x00, 0x4a, 0xb1, 0x86, 0x5a, 0x83, 0xce, 0xb9, 0x08, 0x0e, 0xc1,
+        0x99, 0x27, 0x47, 0x8d, 0x0b, 0x85, 0xa8, 0x82, 0xed, 0xcc, 0x0d, 0xb9, 0xb0, 0x32, 0x7e, 0xdf,
+        0xe8, 0xe4, 0xf6, 0xf6, 0xec, 0xb3, 0xee, 0x7a, 0x11, 0x34, 0x65, 0x97, 0xfc, 0x1a, 0xb0, 0x95,
+        0x4b, 0x19, 0xb9, 0xa6, 0x1c, 0xd9, 0x01, 0x32, 0xf7, 0x35, 0x7c, 0x2d, 0x5d, 0xfe, 0xc1, 0x85,
+        0x70, 0x49, 0xf8, 0xcc, 0x99, 0xd0, 0xbe, 0xf1, 0x5a, 0x78, 0xc8, 0x03, 0x02, 0x81, 0x80, 0x69,
+        0x00, 0xfd, 0x66, 0xf2, 0xfc, 0x15, 0x8b, 0x09, 0xb8, 0xdc, 0x4d, 0xea, 0xaa, 0x79, 0x55, 0xf9,
+        0xdf, 0x46, 0xa6, 0x2f, 0xca, 0x2d, 0x8f, 0x59, 0x2a, 0xad, 0x44, 0xa3, 0xc6, 0x18, 0x2f, 0x95,
+        0xb6, 0x16, 0x20, 0xe3, 0xd3, 0xd1, 0x8f, 0x03, 0xce, 0x71, 0x7c, 0xef, 0x3a, 0xc7, 0x44, 0x39,
+        0x0e, 0xe2, 0x1f, 0xd8, 0xd3, 0x89, 0x2b, 0xe7, 0x51, 0xdc, 0x12, 0x48, 0x4c, 0x18, 0x4d, 0x99,
+        0x12, 0x06, 0xe4, 0x17, 0x02, 0x03, 0x8c, 0x24, 0x05, 0x8e, 0xa6, 0x85, 0xf2, 0x69, 0x1b, 0xe1,
+        0x6a, 0xdc, 0xe2, 0x04, 0x3a, 0x01, 0x9d, 0x64, 0xbe, 0xfe, 0x45, 0xf9, 0x44, 0x18, 0x71, 0xbd,
+        0x2d, 0x3e, 0x7a, 0x6f, 0x72, 0x7d, 0x1a, 0x80, 0x42, 0x57, 0xae, 0x18, 0x6f, 0x91, 0xd6, 0x61,
+        0x03, 0x8a, 0x1c, 0x89, 0x73, 0xc7, 0x56, 0x41, 0x03, 0xd3, 0xf8, 0xed, 0x65, 0xe2, 0x85, 0x02,
+        0x15, 0x00, 0x89, 0x94, 0xab, 0x10, 0x67, 0x45, 0x41, 0xad, 0x63, 0xc6, 0x71, 0x40, 0x8d, 0x6b,
+        0x9e, 0x19, 0x5b, 0xa4, 0xc7, 0xf5, 0x03, 0x81, 0x84, 0x00, 0x02, 0x81, 0x80, 0x2f, 0x5b, 0xde,
+        0x72, 0x02, 0x36, 0x6b, 0x00, 0x5e, 0x24, 0x7f, 0x14, 0x2c, 0x18, 0x52, 0x42, 0x97, 0x4b, 0xdb,
+        0x6e, 0x15, 0x50, 0x3c, 0x45, 0x3e, 0x25, 0xf3, 0xb7, 0xc5, 0x6e, 0xe5, 0x52, 0xe7, 0xc4, 0xfb,
+        0xf4, 0xa5, 0xf0, 0x39, 0x12, 0x7f, 0xbc, 0x54, 0x1c, 0x93, 0xb9, 0x5e, 0xee, 0xe9, 0x14, 0xb0,
+        0xdf, 0xfe, 0xfc, 0x36, 0xe4, 0xf2, 0xaf, 0xfb, 0x13, 0xc8, 0xdf, 0x18, 0x94, 0x1d, 0x40, 0xb9,
+        0x71, 0xdd, 0x4c, 0x9c, 0xa7, 0x03, 0x52, 0x02, 0xb5, 0xed, 0x71, 0x80, 0x3e, 0x23, 0xda, 0x28,
+        0xe5, 0xab, 0xe7, 0x6f, 0xf2, 0x0a, 0x0e, 0x00, 0x5b, 0x7d, 0xc6, 0x4b, 0xd7, 0xc7, 0xb2, 0xc3,
+        0xba, 0x62, 0x7f, 0x70, 0x28, 0xa0, 0x9d, 0x71, 0x13, 0x70, 0xd1, 0x9f, 0x32, 0x2f, 0x3e, 0xd2,
+        0xcd, 0x1b, 0xa4, 0xc6, 0x72, 0xa0, 0x74, 0x5d, 0x71, 0xef, 0x03, 0x43, 0x6e, 0xa3, 0x60, 0x30,
+        0x5e, 0x30, 0x0c, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x02, 0x30, 0x00, 0x30,
+        0x0e, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x01, 0x01, 0xff, 0x04, 0x04, 0x03, 0x02, 0x05, 0xe0, 0x30,
+        0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x0b, 0x5a, 0x4d, 0x5f, 0x7d, 0x25,
+        0xc7, 0xf2, 0x9d, 0xc1, 0xaa, 0xb7, 0x63, 0x82, 0x2f, 0xfa, 0x8f, 0x32, 0xe7, 0xc0, 0x30, 0x1f,
+        0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0xdf, 0x7e, 0x5e, 0x88, 0x05,
+        0x24, 0x33, 0x08, 0xdd, 0x22, 0x81, 0x02, 0x97, 0xcc, 0x9a, 0xb7, 0xb1, 0x33, 0x27, 0x30, 0x30,
+        0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x03, 0x82,
+        0x01, 0x01, 0x00, 0x5a, 0xf2, 0x63, 0xef, 0xd3, 0x16, 0xd7, 0xf5, 0xaa, 0xdd, 0x12, 0x00, 0x36,
+        0x00, 0x21, 0xa2, 0x7b, 0x08, 0xd6, 0x3b, 0x9f, 0x62, 0xac, 0x53, 0x1f, 0xed, 0x4c, 0xd1, 0x15,
+        0x34, 0x65, 0x71, 0xee, 0x96, 0x07, 0xa6, 0xef, 0xb2, 0xde, 0xd8, 0xbb, 0x35, 0x6e, 0x2c, 0xe2,
+        0xd1, 0x26, 0xef, 0x7e, 0x94, 0xe2, 0x88, 0x51, 0xa4, 0x6c, 0xaa, 0x27, 0x2a, 0xd3, 0xb6, 0xc2,
+        0xf7, 0xea, 0xc3, 0x0b, 0xa9, 0xb5, 0x28, 0x37, 0xa2, 0x63, 0x08, 0xe4, 0x88, 0xc0, 0x1b, 0x16,
+        0x1b, 0xca, 0xfd, 0x8a, 0x07, 0x32, 0x29, 0xa7, 0x53, 0xb5, 0x2d, 0x30, 0xe4, 0xf5, 0x16, 0xc3,
+        0xe3, 0xc2, 0x4c, 0x30, 0x5d, 0x35, 0x80, 0x1c, 0xa2, 0xdb, 0xe3, 0x4b, 0x51, 0x0d, 0x4c, 0x60,
+        0x5f, 0xb9, 0x46, 0xac, 0xa8, 0x46, 0xa7, 0x32, 0xa7, 0x9c, 0x76, 0xf8, 0xe9, 0xb5, 0x19, 0xe2,
+        0x0c, 0xe1, 0x0f, 0xc6, 0x46, 0xe2, 0x38, 0xa7, 0x87, 0x72, 0x6d, 0x6c, 0xbc, 0x88, 0x2f, 0x9d,
+        0x2d, 0xe5, 0xd0, 0x7d, 0x1e, 0xc7, 0x5d, 0xf8, 0x7e, 0xb4, 0x0b, 0xa6, 0xf9, 0x6c, 0xe3, 0x7c,
+        0xb2, 0x70, 0x6e, 0x75, 0x9b, 0x1e, 0x63, 0xe1, 0x4d, 0xb2, 0x81, 0xd3, 0x55, 0x38, 0x94, 0x1a,
+        0x7a, 0xfa, 0xbf, 0x01, 0x18, 0x70, 0x2d, 0x35, 0xd3, 0xe3, 0x10, 0x7a, 0x9a, 0xa7, 0x8f, 0xf3,
+        0xbd, 0x56, 0x55, 0x5e, 0xd8, 0xbd, 0x4e, 0x16, 0x76, 0xd0, 0x48, 0x4c, 0xf9, 0x51, 0x54, 0xdf,
+        0x2d, 0xb0, 0xc9, 0xaa, 0x5e, 0x42, 0x38, 0x50, 0xbf, 0x0f, 0xc0, 0xd9, 0x84, 0x44, 0x4b, 0x42,
+        0x24, 0xec, 0x14, 0xa3, 0xde, 0x11, 0xdf, 0x58, 0x7f, 0xc2, 0x4d, 0xb2, 0xd5, 0x42, 0x78, 0x6e,
+        0x52, 0x3e, 0xad, 0xc3, 0x5f, 0x04, 0xc4, 0xe6, 0x31, 0xaa, 0x81, 0x06, 0x8b, 0x13, 0x4b, 0x3c,
+        0x0e, 0x6a, 0xb1
     };
 
     if (!TEST_ptr(bio = BIO_new_mem_buf(dhx_cert, sizeof(dhx_cert)))
@@ -359,14 +359,70 @@ static int test_cipher_reinit(int test_id)
         0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10
     };
     unsigned char key[64] = {
-        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-        0x01, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-        0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-        0x03, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+        0x00,
+        0x01,
+        0x02,
+        0x03,
+        0x04,
+        0x05,
+        0x06,
+        0x07,
+        0x08,
+        0x09,
+        0x0a,
+        0x0b,
+        0x0c,
+        0x0d,
+        0x0e,
+        0x0f,
+        0x01,
+        0x01,
+        0x02,
+        0x03,
+        0x04,
+        0x05,
+        0x06,
+        0x07,
+        0x08,
+        0x09,
+        0x0a,
+        0x0b,
+        0x0c,
+        0x0d,
+        0x0e,
+        0x0f,
+        0x02,
+        0x01,
+        0x02,
+        0x03,
+        0x04,
+        0x05,
+        0x06,
+        0x07,
+        0x08,
+        0x09,
+        0x0a,
+        0x0b,
+        0x0c,
+        0x0d,
+        0x0e,
+        0x0f,
+        0x03,
+        0x01,
+        0x02,
+        0x03,
+        0x04,
+        0x05,
+        0x06,
+        0x07,
+        0x08,
+        0x09,
+        0x0a,
+        0x0b,
+        0x0c,
+        0x0d,
+        0x0e,
+        0x0f,
     };
     unsigned char iv[48] = {
         0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
@@ -396,8 +452,8 @@ static int test_cipher_reinit(int test_id)
      * handle reinit (1.1.1 behaviour).
      */
     no_null_key = EVP_CIPHER_is_a(cipher, "RC4")
-                  || EVP_CIPHER_is_a(cipher, "RC4-40")
-                  || EVP_CIPHER_is_a(cipher, "RC4-HMAC-MD5");
+        || EVP_CIPHER_is_a(cipher, "RC4-40")
+        || EVP_CIPHER_is_a(cipher, "RC4-HMAC-MD5");
 
     /* DES3-WRAP uses random every update - so it will give a different value */
     diff = EVP_CIPHER_is_a(cipher, "DES3-WRAP");
@@ -405,11 +461,11 @@ static int test_cipher_reinit(int test_id)
         || !TEST_true(EVP_EncryptUpdate(ctx, out1, &out1_len, in, sizeof(in)))
         || !TEST_true(EVP_EncryptInit_ex(ctx, NULL, NULL, key, iv))
         || !TEST_int_eq(EVP_EncryptUpdate(ctx, out2, &out2_len, in, sizeof(in)),
-                        ccm ? 0 : 1)
+            ccm ? 0 : 1)
         || (!no_null_key
-        && (!TEST_true(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv))
-        || !TEST_int_eq(EVP_EncryptUpdate(ctx, out3, &out3_len, in, sizeof(in)),
-                        ccm || siv ? 0 : 1))))
+            && (!TEST_true(EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, iv))
+                || !TEST_int_eq(EVP_EncryptUpdate(ctx, out3, &out3_len, in, sizeof(in)),
+                    ccm || siv ? 0 : 1))))
         goto err;
 
     if (ccm == 0) {
@@ -447,20 +503,104 @@ static int test_cipher_reinit_partialupdate(int test_id)
     unsigned char out2[256];
     unsigned char out3[256];
     static const unsigned char in[32] = {
-        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-        0xba, 0xbe, 0xba, 0xbe, 0x00, 0x00, 0xba, 0xbe,
-        0x01, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+        0x08,
+        0x09,
+        0x0a,
+        0x0b,
+        0x0c,
+        0x0d,
+        0x0e,
+        0x0f,
+        0xba,
+        0xbe,
+        0xba,
+        0xbe,
+        0x00,
+        0x00,
+        0xba,
+        0xbe,
+        0x01,
+        0x01,
+        0x02,
+        0x03,
+        0x04,
+        0x05,
+        0x06,
+        0x07,
+        0x08,
+        0x09,
+        0x0a,
+        0x0b,
+        0x0c,
+        0x0d,
+        0x0e,
+        0x0f,
     };
     static const unsigned char key[64] = {
-        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-        0x01, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-        0x02, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-        0x03, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+        0x00,
+        0x01,
+        0x02,
+        0x03,
+        0x04,
+        0x05,
+        0x06,
+        0x07,
+        0x08,
+        0x09,
+        0x0a,
+        0x0b,
+        0x0c,
+        0x0d,
+        0x0e,
+        0x0f,
+        0x01,
+        0x01,
+        0x02,
+        0x03,
+        0x04,
+        0x05,
+        0x06,
+        0x07,
+        0x08,
+        0x09,
+        0x0a,
+        0x0b,
+        0x0c,
+        0x0d,
+        0x0e,
+        0x0f,
+        0x02,
+        0x01,
+        0x02,
+        0x03,
+        0x04,
+        0x05,
+        0x06,
+        0x07,
+        0x08,
+        0x09,
+        0x0a,
+        0x0b,
+        0x0c,
+        0x0d,
+        0x0e,
+        0x0f,
+        0x03,
+        0x01,
+        0x02,
+        0x03,
+        0x04,
+        0x05,
+        0x06,
+        0x07,
+        0x08,
+        0x09,
+        0x0a,
+        0x0b,
+        0x0c,
+        0x0d,
+        0x0e,
+        0x0f,
     };
     static const unsigned char iv[48] = {
         0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
@@ -487,7 +627,8 @@ static int test_cipher_reinit_partialupdate(int test_id)
 
     /* skip any ciphers that don't allow partial updates */
     if (((EVP_CIPHER_get_flags(cipher)
-          & (EVP_CIPH_FLAG_CTS | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)) != 0)
+             & (EVP_CIPH_FLAG_CTS | EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK))
+            != 0)
         || EVP_CIPHER_get_mode(cipher) == EVP_CIPH_CCM_MODE
         || EVP_CIPHER_get_mode(cipher) == EVP_CIPH_XTS_MODE
         || EVP_CIPHER_get_mode(cipher) == EVP_CIPH_WRAP_MODE) {
@@ -521,7 +662,7 @@ static int test_cipher_reinit_partialupdate(int test_id)
     return ret;
 }
 
-static int name_cmp(const char * const *a, const char * const *b)
+static int name_cmp(const char *const *a, const char *const *b)
 {
     return OPENSSL_strcasecmp(*a, *b);
 }
@@ -534,7 +675,7 @@ static void collect_cipher_names(EVP_CIPHER *cipher, void *cipher_names_list)
 
     /* Skip Triple-DES encryption operations in FIPS mode */
     if (OSSL_PROVIDER_available(libctx, "fips")
-            && strncmp(name, "DES", 3) == 0)
+        && strncmp(name, "DES", 3) == 0)
         return;
     assert(name != NULL);
     /* the cipher will be freed after returning, strdup is needed */
@@ -552,11 +693,10 @@ static int rsa_keygen(int bits, EVP_PKEY **pub, EVP_PKEY **priv)
     OSSL_ENCODER_CTX *ectx = NULL;
 
     if (!TEST_ptr(*priv = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", (size_t)bits))
-        || !TEST_ptr(ectx =
-                     OSSL_ENCODER_CTX_new_for_pkey(*priv,
-                                                   EVP_PKEY_PUBLIC_KEY,
-                                                   "DER", "type-specific",
-                                                   NULL))
+        || !TEST_ptr(ectx = OSSL_ENCODER_CTX_new_for_pkey(*priv,
+                         EVP_PKEY_PUBLIC_KEY,
+                         "DER", "type-specific",
+                         NULL))
         || !TEST_true(OSSL_ENCODER_to_data(ectx, &pub_der, &len)))
         goto err;
     pp = pub_der;
@@ -575,45 +715,57 @@ static int kem_rsa_gen_recover(void)
     EVP_PKEY *pub = NULL;
     EVP_PKEY *priv = NULL;
     EVP_PKEY_CTX *sctx = NULL, *rctx = NULL, *dctx = NULL;
-    unsigned char secret[256] = { 0, };
-    unsigned char ct[256] = { 0, };
-    unsigned char unwrap[256] = { 0, };
+    unsigned char secret[256] = {
+        0,
+    };
+    unsigned char ct[256] = {
+        0,
+    };
+    unsigned char unwrap[256] = {
+        0,
+    };
     size_t ctlen = 0, unwraplen = 0, secretlen = 0;
     int bits = 2048;
 
     ret = TEST_true(rsa_keygen(bits, &pub, &priv))
-          && TEST_ptr(sctx = EVP_PKEY_CTX_new_from_pkey(libctx, pub, NULL))
-          && TEST_int_eq(EVP_PKEY_encapsulate_init(sctx, NULL), 1)
-          && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(sctx, "RSASVE"), 1)
-          && TEST_ptr(dctx = EVP_PKEY_CTX_dup(sctx))
-          /* Test that providing a NULL wrappedlen fails */
-          && TEST_int_eq(EVP_PKEY_encapsulate(dctx, NULL, NULL, NULL, NULL), 0)
-          && TEST_int_eq(EVP_PKEY_encapsulate(dctx, NULL, &ctlen, NULL,
-                                              &secretlen), 1)
-          && TEST_int_eq(ctlen, secretlen)
-          && TEST_int_eq(ctlen, bits / 8)
-          && TEST_int_eq(EVP_PKEY_encapsulate(dctx, ct, &ctlen, secret,
-                                              &secretlen), 1)
-          && TEST_ptr(rctx = EVP_PKEY_CTX_new_from_pkey(libctx, priv, NULL))
-          && TEST_int_eq(EVP_PKEY_decapsulate_init(rctx, NULL), 1)
-          && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(rctx, "RSASVE"), 1)
-          /* Test that providing a NULL unwrappedlen fails */
-          && TEST_int_eq(EVP_PKEY_decapsulate(rctx, NULL, NULL, ct, ctlen), 0)
-          && TEST_int_eq(EVP_PKEY_decapsulate(rctx, NULL, &unwraplen,
-                                              ct, ctlen), 1)
-          && TEST_int_eq(EVP_PKEY_decapsulate(rctx, unwrap, &unwraplen,
-                                              ct, ctlen), 1)
-          && TEST_mem_eq(unwrap, unwraplen, secret, secretlen);
+        && TEST_ptr(sctx = EVP_PKEY_CTX_new_from_pkey(libctx, pub, NULL))
+        && TEST_int_eq(EVP_PKEY_encapsulate_init(sctx, NULL), 1)
+        && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(sctx, "RSASVE"), 1)
+        && TEST_ptr(dctx = EVP_PKEY_CTX_dup(sctx))
+        /* Test that providing a NULL wrappedlen fails */
+        && TEST_int_eq(EVP_PKEY_encapsulate(dctx, NULL, NULL, NULL, NULL), 0)
+        && TEST_int_eq(EVP_PKEY_encapsulate(dctx, NULL, &ctlen, NULL,
+                           &secretlen),
+            1)
+        && TEST_int_eq(ctlen, secretlen)
+        && TEST_int_eq(ctlen, bits / 8)
+        && TEST_int_eq(EVP_PKEY_encapsulate(dctx, ct, &ctlen, secret,
+                           &secretlen),
+            1)
+        && TEST_ptr(rctx = EVP_PKEY_CTX_new_from_pkey(libctx, priv, NULL))
+        && TEST_int_eq(EVP_PKEY_decapsulate_init(rctx, NULL), 1)
+        && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(rctx, "RSASVE"), 1)
+        /* Test that providing a NULL unwrappedlen fails */
+        && TEST_int_eq(EVP_PKEY_decapsulate(rctx, NULL, NULL, ct, ctlen), 0)
+        && TEST_int_eq(EVP_PKEY_decapsulate(rctx, NULL, &unwraplen,
+                           ct, ctlen),
+            1)
+        && TEST_int_eq(EVP_PKEY_decapsulate(rctx, unwrap, &unwraplen,
+                           ct, ctlen),
+            1)
+        && TEST_mem_eq(unwrap, unwraplen, secret, secretlen);
 
     /* Test that providing a too short unwrapped/ctlen fails */
     if (fips_provider_version_match(libctx, ">=3.4.0")) {
         ctlen = 1;
         if (!TEST_int_eq(EVP_PKEY_encapsulate(dctx, ct, &ctlen, secret,
-                                              &secretlen), 0))
+                             &secretlen),
+                0))
             ret = 0;
         unwraplen = 1;
         if (!TEST_int_eq(EVP_PKEY_decapsulate(rctx, unwrap, &unwraplen, ct,
-                                              ctlen), 0))
+                             ctlen),
+                0))
             ret = 0;
     }
 
@@ -642,13 +794,13 @@ static int test_cipher_tdes_randkey(void)
     params[0] = OSSL_PARAM_construct_int("encrypt-check", &check);
     params[1] = OSSL_PARAM_construct_end();
     ret = TEST_ptr(aes_cipher = EVP_CIPHER_fetch(libctx, "AES-256-CBC", NULL))
-          && TEST_int_eq(EVP_CIPHER_get_flags(aes_cipher) & EVP_CIPH_RAND_KEY, 0)
-          && TEST_ptr(tdes_cipher = EVP_CIPHER_fetch(libctx, "DES-EDE3-CBC", NULL))
-          && TEST_int_ne(EVP_CIPHER_get_flags(tdes_cipher) & EVP_CIPH_RAND_KEY, 0)
-          && TEST_ptr(ctx = EVP_CIPHER_CTX_new())
-          && TEST_true(EVP_CipherInit_ex2(ctx, tdes_cipher, NULL, NULL, 1,
-                                          params))
-          && TEST_int_gt(EVP_CIPHER_CTX_rand_key(ctx, key), 0);
+        && TEST_int_eq(EVP_CIPHER_get_flags(aes_cipher) & EVP_CIPH_RAND_KEY, 0)
+        && TEST_ptr(tdes_cipher = EVP_CIPHER_fetch(libctx, "DES-EDE3-CBC", NULL))
+        && TEST_int_ne(EVP_CIPHER_get_flags(tdes_cipher) & EVP_CIPH_RAND_KEY, 0)
+        && TEST_ptr(ctx = EVP_CIPHER_CTX_new())
+        && TEST_true(EVP_CipherInit_ex2(ctx, tdes_cipher, NULL, NULL, 1,
+            params))
+        && TEST_int_gt(EVP_CIPHER_CTX_rand_key(ctx, key), 0);
 
     EVP_CIPHER_CTX_free(ctx);
     EVP_CIPHER_free(tdes_cipher);
@@ -663,8 +815,12 @@ static int kem_rsa_params(void)
     EVP_PKEY *pub = NULL;
     EVP_PKEY *priv = NULL;
     EVP_PKEY_CTX *pubctx = NULL, *privctx = NULL;
-    unsigned char secret[256] = { 0, };
-    unsigned char ct[256] = { 0, };
+    unsigned char secret[256] = {
+        0,
+    };
+    unsigned char ct[256] = {
+        0,
+    };
     size_t ctlen = 0, secretlen = 0;
 
     ret = TEST_true(rsa_keygen(2048, &pub, &priv))
@@ -684,20 +840,17 @@ static int kem_rsa_params(void)
         && TEST_int_eq(EVP_PKEY_decapsulate_init(pubctx, NULL), 1)
         && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, "RSASVE"), 1)
         && TEST_int_eq(EVP_PKEY_decapsulate(pubctx, secret, &secretlen, ct,
-                                            sizeof(ct)), 0)
+                           sizeof(ct)),
+            0)
         && TEST_uchar_eq(secret[0], 0)
         /* Unless older FIPS, test encapsulate succeeds even if the mode is not set */
         && TEST_int_eq(EVP_PKEY_encapsulate_init(pubctx, NULL), 1)
-        && (is_fips_lt_3_5 ||
-            (TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, &ctlen, NULL, &secretlen), 1)
-             && TEST_true(ctlen <= sizeof(ct))
-             && TEST_true(secretlen <= sizeof(secret))
-             && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, ct, &ctlen, secret, &secretlen), 1)))
+        && (is_fips_lt_3_5 || (TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, &ctlen, NULL, &secretlen), 1) && TEST_true(ctlen <= sizeof(ct)) && TEST_true(secretlen <= sizeof(secret)) && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, ct, &ctlen, secret, &secretlen), 1)))
         /* Test setting a bad kem ops fail */
         && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, "RSA"), 0)
         && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, NULL), 0)
-        && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(NULL,  "RSASVE"), 0)
-        && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(NULL,  NULL), 0)
+        && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(NULL, "RSASVE"), 0)
+        && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(NULL, NULL), 0)
         /* Test secretlen is optional */
         && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(pubctx, "RSASVE"), 1)
         && TEST_int_eq(EVP_PKEY_encapsulate(pubctx, NULL, &ctlen, NULL, NULL), 1)
@@ -792,7 +945,7 @@ int setup_tests(void)
             config_file = opt_arg();
             break;
         case OPT_TEST_CASES:
-           break;
+            break;
         default:
         case OPT_ERR:
             return 0;
@@ -824,7 +977,7 @@ int setup_tests(void)
 
     ADD_ALL_TESTS(test_cipher_reinit, sk_OPENSSL_STRING_num(cipher_names));
     ADD_ALL_TESTS(test_cipher_reinit_partialupdate,
-                  sk_OPENSSL_STRING_num(cipher_names));
+        sk_OPENSSL_STRING_num(cipher_names));
     ADD_TEST(kem_rsa_gen_recover);
     ADD_TEST(kem_rsa_params);
 #ifndef OPENSSL_NO_DH
diff --git a/test/evp_pkey_dhkem_test.c b/test/evp_pkey_dhkem_test.c
index 1a8f93a6208cd..7e029194412a1 100644
--- a/test/evp_pkey_dhkem_test.c
+++ b/test/evp_pkey_dhkem_test.c
@@ -14,16 +14,16 @@
 #include "internal/nelem.h"
 #include "testutil.h"
 
-#define TEST_KEM_ENCAP       0
-#define TEST_KEM_DECAP       1
+#define TEST_KEM_ENCAP 0
+#define TEST_KEM_DECAP 1
 #define TEST_KEM_ENCAP_DECAP 2
 
-#define TEST_TYPE_AUTH        0
-#define TEST_TYPE_NOAUTH      1
+#define TEST_TYPE_AUTH 0
+#define TEST_TYPE_NOAUTH 1
 #define TEST_TYPE_AUTH_NOAUTH 2
 
-#define TEST_KEYTYPE_P256         0
-#define TEST_KEYTYPE_X25519       1
+#define TEST_KEYTYPE_P256 0
+#define TEST_KEYTYPE_X25519 1
 #define TEST_KEYTYPES_P256_X25519 2
 
 static OSSL_LIB_CTX *libctx = NULL;
@@ -43,15 +43,15 @@ static int test_dhkem_encapsulate(int tstid)
     const TEST_ENCAPDATA *t = &ec_encapdata[tstid];
 
     TEST_note("Test %s %s Decapsulate", t->curve,
-              t->spriv != NULL ? "Auth" : "");
+        t->spriv != NULL ? "Auth" : "");
 
     if (!TEST_ptr(rpub = new_raw_public_key(t->curve, t->rpub, t->rpublen)))
         goto err;
 
     if (t->spriv != NULL) {
         if (!TEST_ptr(spriv = new_raw_private_key(t->curve,
-                                                  t->spriv, t->sprivlen,
-                                                  t->spub, t->spublen)))
+                          t->spriv, t->sprivlen,
+                          t->spub, t->spublen)))
             goto err;
     }
     ret = do_encap(t, rpub, spriv);
@@ -71,7 +71,7 @@ static int test_dhkem_decapsulate(int tstid)
     TEST_note("Test %s %s Decapsulate", t->curve, t->spub != NULL ? "Auth" : "");
 
     if (!TEST_ptr(rpriv = new_raw_private_key(t->curve, t->rpriv, t->rprivlen,
-                                              t->rpub, t->rpublen)))
+                      t->rpub, t->rpublen)))
         goto err;
     if (t->spub != NULL) {
         if (!TEST_ptr(spub = new_raw_public_key(t->curve, t->spub, t->spublen)))
@@ -92,13 +92,13 @@ static int test_settables(int tstid)
     const OSSL_PARAM *p;
 
     return TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), 1)
-           && TEST_ptr(settableparams = EVP_PKEY_CTX_settable_params(ctx))
-           && TEST_ptr(p = OSSL_PARAM_locate_const(settableparams,
-                                                   OSSL_KEM_PARAM_OPERATION))
-           && TEST_uint_eq(p->data_type, OSSL_PARAM_UTF8_STRING)
-           && TEST_ptr(p = OSSL_PARAM_locate_const(settableparams,
-                                                   OSSL_KEM_PARAM_IKME))
-          && TEST_uint_eq(p->data_type, OSSL_PARAM_OCTET_STRING);
+        && TEST_ptr(settableparams = EVP_PKEY_CTX_settable_params(ctx))
+        && TEST_ptr(p = OSSL_PARAM_locate_const(settableparams,
+                        OSSL_KEM_PARAM_OPERATION))
+        && TEST_uint_eq(p->data_type, OSSL_PARAM_UTF8_STRING)
+        && TEST_ptr(p = OSSL_PARAM_locate_const(settableparams,
+                        OSSL_KEM_PARAM_IKME))
+        && TEST_uint_eq(p->data_type, OSSL_PARAM_OCTET_STRING);
 }
 
 /* Test initing multiple times passes */
@@ -107,9 +107,9 @@ static int test_init_multiple(int tstid)
     EVP_PKEY_CTX *ctx = rctx[tstid];
 
     return TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), 1)
-           && TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), 1)
-           && TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, NULL), 1)
-           && TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, NULL), 1);
+        && TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), 1)
+        && TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, NULL), 1)
+        && TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, NULL), 1);
 }
 
 /* Fail is various bad inputs are passed to the derivekey (keygen) operation */
@@ -124,22 +124,22 @@ static int test_ec_dhkem_derivekey_fail(void)
 
     /* Check non nist curve fails */
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                 "secp256k1", 0);
+        "secp256k1", 0);
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_DHKEM_IKM,
-                                                  (char *)t->ikm, t->ikmlen);
+        (char *)t->ikm, t->ikmlen);
     params[2] = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(genctx = EVP_PKEY_CTX_new_from_name(libctx, "EC", NULL))
         || !TEST_int_eq(EVP_PKEY_keygen_init(genctx), 1)
         || !TEST_int_eq(EVP_PKEY_CTX_set_params(genctx, params), 1)
-        || !TEST_int_eq(EVP_PKEY_generate(genctx, &pkey),0))
+        || !TEST_int_eq(EVP_PKEY_generate(genctx, &pkey), 0))
         goto err;
 
     /* Fail if curve is not one of P-256, P-384 or P-521 */
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                 "P-224", 0);
+        "P-224", 0);
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_DHKEM_IKM,
-                                                  (char *)t->ikm, t->ikmlen);
+        (char *)t->ikm, t->ikmlen);
     params[2] = OSSL_PARAM_construct_end();
     if (!TEST_int_eq(EVP_PKEY_keygen_init(genctx), 1)
         || !TEST_int_eq(EVP_PKEY_CTX_set_params(genctx, params), 1)
@@ -148,9 +148,9 @@ static int test_ec_dhkem_derivekey_fail(void)
 
     /* Fail if ikm len is too small*/
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                 "P-256", 0);
+        "P-256", 0);
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_DHKEM_IKM,
-                                                  (char *)t->ikm, t->ikmlen - 1);
+        (char *)t->ikm, t->ikmlen - 1);
     params[2] = OSSL_PARAM_construct_end();
     if (!TEST_int_eq(EVP_PKEY_CTX_set_params(genctx, params), 1)
         || !TEST_int_eq(EVP_PKEY_generate(genctx, &pkey), 0))
@@ -172,11 +172,12 @@ static int test_no_operation_set(int tstid)
     size_t len = 0;
 
     return TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), 1)
-           && TEST_int_eq(EVP_PKEY_encapsulate(ctx, NULL, &len, NULL, NULL), 1)
-           && TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, NULL), 1)
-           && TEST_int_eq(EVP_PKEY_decapsulate(ctx, NULL, &len,
-                                               t->expected_enc,
-                                               t->expected_enclen), 1);
+        && TEST_int_eq(EVP_PKEY_encapsulate(ctx, NULL, &len, NULL, NULL), 1)
+        && TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, NULL), 1)
+        && TEST_int_eq(EVP_PKEY_decapsulate(ctx, NULL, &len,
+                           t->expected_enc,
+                           t->expected_enclen),
+            1);
 }
 
 /* Fail if the ikm is too small */
@@ -191,15 +192,16 @@ static int test_ikm_small(int tstid)
     EVP_PKEY_CTX *ctx = rctx[tstid];
 
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_KEM_PARAM_OPERATION,
-                                                 OSSL_KEM_PARAM_OPERATION_DHKEM,
-                                                 0);
+        OSSL_KEM_PARAM_OPERATION_DHKEM,
+        0);
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_KEM_PARAM_IKME,
-                                                  tmp, sizeof(tmp));
+        tmp, sizeof(tmp));
     params[2] = OSSL_PARAM_construct_end();
 
     return TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, params), 1)
-           && TEST_int_eq(EVP_PKEY_encapsulate(ctx, enc, &enclen,
-                                               secret, &secretlen), 0);
+        && TEST_int_eq(EVP_PKEY_encapsulate(ctx, enc, &enclen,
+                           secret, &secretlen),
+            0);
 }
 
 /* Fail if buffers lengths are too small to hold returned data */
@@ -214,13 +216,14 @@ static int test_input_size_small(int tstid)
 
     if (!TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, opparam), 1)
         || !TEST_int_eq(EVP_PKEY_encapsulate(ctx, NULL, &enclen,
-                                             NULL, &seclen), 1))
-    goto err;
+                            NULL, &seclen),
+            1))
+        goto err;
 
     /* buffer too small for enc */
     enclen--;
     if (!TEST_int_eq(EVP_PKEY_encapsulate(ctx, enc, &enclen, sec, &seclen),
-                     0))
+            0))
         goto err;
     enclen++;
     /* buffer too small for secret */
@@ -230,12 +233,12 @@ static int test_input_size_small(int tstid)
     seclen++;
     if (!TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, opparam), 1))
         goto err;
-     /* buffer too small for decapsulate secret */
+    /* buffer too small for decapsulate secret */
     seclen--;
     if (!TEST_int_eq(EVP_PKEY_decapsulate(ctx, sec, &seclen, enc, enclen), 0))
         goto err;
     seclen++;
-     /* incorrect enclen passed to decap  */
+    /* incorrect enclen passed to decap  */
     enclen--;
     ret = TEST_int_eq(EVP_PKEY_decapsulate(ctx, sec, &seclen, enc, enclen), 0);
 err:
@@ -263,7 +266,8 @@ static int test_auth_key_type_mismatch(int tstid)
     int id2 = !tstid;
 
     return TEST_int_eq(EVP_PKEY_auth_encapsulate_init(rctx[id1],
-                                                      rkey[id2], opparam), 0);
+                           rkey[id2], opparam),
+        0);
 }
 
 static int test_ec_invalid_private_key(void)
@@ -279,9 +283,9 @@ static int test_ec_invalid_private_key(void)
     };
 
     ret = TEST_ptr(priv = new_raw_private_key("P-256", order, sizeof(order),
-                                              t->rpub, t->rpublen))
-          && TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, priv, NULL))
-          && TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), 0);
+                       t->rpub, t->rpublen))
+        && TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, priv, NULL))
+        && TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), 0);
     EVP_PKEY_free(priv);
     EVP_PKEY_CTX_free(ctx);
     return ret;
@@ -301,19 +305,20 @@ static int test_ec_public_key_infinity(void)
     const TEST_ENCAPDATA *t = &ec_encapdata[0];
 
     ret = TEST_ptr(key = new_raw_private_key(t->curve, t->rpriv, t->rprivlen,
-                                                tmp, sizeof(tmp)))
-          && TEST_ptr(keyctx = EVP_PKEY_CTX_new_from_pkey(libctx, key, NULL))
-          /* Fail if the recipient public key is invalid */
-          && TEST_int_eq(EVP_PKEY_encapsulate_init(keyctx, opparam), 1)
-          && TEST_int_eq(EVP_PKEY_encapsulate(keyctx, e, &elen, s, &slen), 0)
-          /* Fail the decap if the recipient public key is invalid */
-          && TEST_int_eq(EVP_PKEY_decapsulate_init(keyctx, opparam), 1)
-          && TEST_int_eq(EVP_PKEY_decapsulate(keyctx, s, &slen,
-                                              t->expected_enc,
-                                              t->expected_enclen), 0)
-          /* Fail if the auth key has a bad public key */
-          && TEST_int_eq(EVP_PKEY_auth_encapsulate_init(ctx, key, opparam), 1)
-          && TEST_int_eq(EVP_PKEY_encapsulate(ctx, e, &elen, s, &slen), 0);
+                       tmp, sizeof(tmp)))
+        && TEST_ptr(keyctx = EVP_PKEY_CTX_new_from_pkey(libctx, key, NULL))
+        /* Fail if the recipient public key is invalid */
+        && TEST_int_eq(EVP_PKEY_encapsulate_init(keyctx, opparam), 1)
+        && TEST_int_eq(EVP_PKEY_encapsulate(keyctx, e, &elen, s, &slen), 0)
+        /* Fail the decap if the recipient public key is invalid */
+        && TEST_int_eq(EVP_PKEY_decapsulate_init(keyctx, opparam), 1)
+        && TEST_int_eq(EVP_PKEY_decapsulate(keyctx, s, &slen,
+                           t->expected_enc,
+                           t->expected_enclen),
+            0)
+        /* Fail if the auth key has a bad public key */
+        && TEST_int_eq(EVP_PKEY_auth_encapsulate_init(ctx, key, opparam), 1)
+        && TEST_int_eq(EVP_PKEY_encapsulate(ctx, e, &elen, s, &slen), 0);
 
     EVP_PKEY_free(key);
     EVP_PKEY_CTX_free(keyctx);
@@ -328,16 +333,18 @@ static int test_null_params(int tstid)
 
     /* auth_encap/decap init must be passed a non NULL value */
     return TEST_int_eq(EVP_PKEY_auth_encapsulate_init(ctx, NULL, opparam), 0)
-           && TEST_int_eq(EVP_PKEY_auth_decapsulate_init(ctx, NULL, opparam), 0)
-           /* Check decap fails if NULL params are passed */
-           && TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, opparam), 1)
-           && TEST_int_eq(EVP_PKEY_decapsulate(ctx, NULL, NULL,
-                                               t->expected_enc,
-                                               t->expected_enclen), 0)
-           /* Check encap fails if NULL params are passed */
-           && TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, opparam), 1)
-           && TEST_int_eq(EVP_PKEY_encapsulate(ctx, NULL, NULL,
-                                               NULL, NULL), 0);
+        && TEST_int_eq(EVP_PKEY_auth_decapsulate_init(ctx, NULL, opparam), 0)
+        /* Check decap fails if NULL params are passed */
+        && TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, opparam), 1)
+        && TEST_int_eq(EVP_PKEY_decapsulate(ctx, NULL, NULL,
+                           t->expected_enc,
+                           t->expected_enclen),
+            0)
+        /* Check encap fails if NULL params are passed */
+        && TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, opparam), 1)
+        && TEST_int_eq(EVP_PKEY_encapsulate(ctx, NULL, NULL,
+                           NULL, NULL),
+            0);
 }
 
 static int test_set_params(int tstid)
@@ -354,14 +361,14 @@ static int test_set_params(int tstid)
         goto err;
     /* unknown string used for the operation param */
     badparams[0] = OSSL_PARAM_construct_utf8_string(OSSL_KEM_PARAM_OPERATION,
-                                                    "unknown_op", 0);
+        "unknown_op", 0);
     badparams[1] = OSSL_PARAM_construct_end();
     if (!TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, badparams), 0))
         goto err;
 
     /* NULL string set for the operation param */
     badparams[0] = OSSL_PARAM_construct_utf8_string(OSSL_KEM_PARAM_OPERATION,
-                                                    NULL, 0);
+        NULL, 0);
     badparams[1] = OSSL_PARAM_construct_end();
     if (!TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, badparams), 0))
         goto err;
@@ -402,7 +409,7 @@ static int test_nopublic(int tstid)
 
     TEST_note("%s %s", t->curve, encap ? "Encap" : "Decap");
     if (!TEST_ptr(priv = new_raw_private_key(t->curve, t->rpriv, t->rprivlen,
-                                             NULL, 0)))
+                      NULL, 0)))
         goto err;
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, priv, NULL)))
         goto err;
@@ -412,7 +419,7 @@ static int test_nopublic(int tstid)
             goto err;
     } else {
         if (!TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, opparam), expected))
-        goto err;
+            goto err;
     }
     if (expected == 0
         && !TEST_int_eq(ERR_GET_REASON(ERR_get_error()), PROV_R_NOT_A_PUBLIC_KEY))
@@ -437,21 +444,23 @@ static int test_noauthpublic(int tstid)
 
     TEST_note("%s %s", t->curve, encap ? "Encap" : "Decap");
     if (!TEST_ptr(auth = new_raw_private_key(t->curve, t->rpriv,
-                                             t->rprivlen, NULL, expected)))
+                      t->rprivlen, NULL, expected)))
         goto err;
 
     if (encap) {
         if (!TEST_int_eq(EVP_PKEY_auth_encapsulate_init(ctx, auth,
-                                                        opparam), expected))
+                             opparam),
+                expected))
             goto err;
     } else {
         if (!TEST_int_eq(EVP_PKEY_auth_decapsulate_init(ctx, auth,
-                                                        opparam), expected))
+                             opparam),
+                expected))
             goto err;
     }
     if (expected == 0
         && !TEST_int_eq(ERR_GET_REASON(ERR_get_error()),
-                        PROV_R_NOT_A_PUBLIC_KEY))
+            PROV_R_NOT_A_PUBLIC_KEY))
         goto err;
     ret = 1;
 err:
@@ -475,24 +484,24 @@ static int test_ec_dhkem_derivekey(int tstid)
     BIGNUM *priv = NULL;
 
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                                 (char *)t->curvename, 0);
+        (char *)t->curvename, 0);
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_DHKEM_IKM,
-                                                  (char *)t->ikm, t->ikmlen);
+        (char *)t->ikm, t->ikmlen);
     params[2] = OSSL_PARAM_construct_end();
 
     ret = TEST_ptr(genctx = EVP_PKEY_CTX_new_from_name(libctx, "EC", NULL))
-          && TEST_int_eq(EVP_PKEY_keygen_init(genctx), 1)
-          && TEST_int_eq(EVP_PKEY_CTX_set_params(genctx, params), 1)
-          && TEST_int_eq(EVP_PKEY_generate(genctx, &pkey), 1)
-          && TEST_true(EVP_PKEY_get_octet_string_param(pkey,
-                           OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
-                           pubkey, sizeof(pubkey), &pubkeylen))
-          && TEST_true(EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_PRIV_KEY,
-                                             &priv))
-          && TEST_int_gt(privkeylen = BN_bn2bin(priv, privkey), 0)
-          && TEST_int_le(privkeylen, sizeof(privkey))
-          && TEST_mem_eq(privkey, privkeylen, t->priv, t->privlen)
-          && TEST_mem_eq(pubkey, pubkeylen, t->pub, t->publen);
+        && TEST_int_eq(EVP_PKEY_keygen_init(genctx), 1)
+        && TEST_int_eq(EVP_PKEY_CTX_set_params(genctx, params), 1)
+        && TEST_int_eq(EVP_PKEY_generate(genctx, &pkey), 1)
+        && TEST_true(EVP_PKEY_get_octet_string_param(pkey,
+            OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+            pubkey, sizeof(pubkey), &pubkeylen))
+        && TEST_true(EVP_PKEY_get_bn_param(pkey, OSSL_PKEY_PARAM_PRIV_KEY,
+            &priv))
+        && TEST_int_gt(privkeylen = BN_bn2bin(priv, privkey), 0)
+        && TEST_int_le(privkeylen, sizeof(privkey))
+        && TEST_mem_eq(privkey, privkeylen, t->priv, t->privlen)
+        && TEST_mem_eq(pubkey, pubkeylen, t->pub, t->publen);
 
     BN_free(priv);
     EVP_PKEY_free(pkey);
@@ -526,41 +535,45 @@ static int test_ec_noikme(int tstid)
     }
     curve = dhkem_supported_curves[tstid];
     TEST_note("testing encap/decap of curve %s%s\n", curve,
-              auth ? " with auth" : "");
+        auth ? " with auth" : "");
 
     if (curve[0] == 'X') {
         if (!TEST_ptr(recip = EVP_PKEY_Q_keygen(libctx, NULL, curve))
-                || (auth
-                    && !TEST_ptr(sender_auth = EVP_PKEY_Q_keygen(libctx, NULL,
-                                                                 curve))))
+            || (auth
+                && !TEST_ptr(sender_auth = EVP_PKEY_Q_keygen(libctx, NULL,
+                                 curve))))
             goto err;
     } else {
         if (!TEST_ptr(recip = EVP_PKEY_Q_keygen(libctx, NULL, "EC", curve))
-                || (auth
-                    && !TEST_ptr(sender_auth = EVP_PKEY_Q_keygen(libctx, NULL,
-                                                                 "EC", curve))))
+            || (auth
+                && !TEST_ptr(sender_auth = EVP_PKEY_Q_keygen(libctx, NULL,
+                                 "EC", curve))))
             goto err;
     }
 
     ret = TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, recip, NULL))
-          && (sender_auth == NULL
-              || TEST_int_eq(EVP_PKEY_auth_encapsulate_init(ctx, sender_auth,
-                                                            NULL), 1))
-          && (sender_auth != NULL
-              || TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), 1))
-          && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(ctx, op), 1)
-          && TEST_int_eq(EVP_PKEY_encapsulate(ctx, sender_pub, &sender_publen,
-                                              sender_secret, &sender_secretlen), 1)
-          && (sender_auth == NULL
-              || TEST_int_eq(EVP_PKEY_auth_decapsulate_init(ctx, sender_auth,
-                                                            NULL), 1))
-          && (sender_auth != NULL
-              || TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, NULL), 1))
-          && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(ctx, op), 1)
-          && TEST_int_eq(EVP_PKEY_decapsulate(ctx, recip_secret, &recip_secretlen,
-                                             sender_pub, sender_publen), 1)
-          && TEST_mem_eq(recip_secret, recip_secretlen,
-                         sender_secret, sender_secretlen);
+        && (sender_auth == NULL
+            || TEST_int_eq(EVP_PKEY_auth_encapsulate_init(ctx, sender_auth,
+                               NULL),
+                1))
+        && (sender_auth != NULL
+            || TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), 1))
+        && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(ctx, op), 1)
+        && TEST_int_eq(EVP_PKEY_encapsulate(ctx, sender_pub, &sender_publen,
+                           sender_secret, &sender_secretlen),
+            1)
+        && (sender_auth == NULL
+            || TEST_int_eq(EVP_PKEY_auth_decapsulate_init(ctx, sender_auth,
+                               NULL),
+                1))
+        && (sender_auth != NULL
+            || TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, NULL), 1))
+        && TEST_int_eq(EVP_PKEY_CTX_set_kem_op(ctx, op), 1)
+        && TEST_int_eq(EVP_PKEY_decapsulate(ctx, recip_secret, &recip_secretlen,
+                           sender_pub, sender_publen),
+            1)
+        && TEST_mem_eq(recip_secret, recip_secretlen,
+            sender_secret, sender_secretlen);
 err:
     EVP_PKEY_CTX_free(ctx);
     EVP_PKEY_free(sender_auth);
@@ -576,9 +589,9 @@ static int do_ec_curve_failtest(const char *curve)
     EVP_PKEY_CTX *ctx = NULL;
 
     ret = TEST_ptr(key = EVP_PKEY_Q_keygen(libctx, NULL, "EC", curve))
-          && TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, key, NULL))
-          && TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), -2)
-          && TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, NULL), -2);
+        && TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, key, NULL))
+        && TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), -2)
+        && TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, NULL), -2);
     EVP_PKEY_free(key);
     EVP_PKEY_CTX_free(ctx);
     return ret;
@@ -610,7 +623,7 @@ static int test_ec_badpublic(int tstid)
     /* Set the recipient public key to the point at infinity */
     pub[0] = 0;
     if (!TEST_ptr(recippriv = new_raw_private_key(t->curve, t->rpriv, t->rprivlen,
-                                                  pub, 1)))
+                      pub, 1)))
         goto err;
 
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, recippriv, NULL)))
@@ -622,16 +635,17 @@ static int test_ec_badpublic(int tstid)
 
         if (!TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, opparam), 1))
             goto err;
-        if (!TEST_int_eq(EVP_PKEY_encapsulate(ctx, enc , &enclen,
-                                              secret, &secretlen), 0 ))
+        if (!TEST_int_eq(EVP_PKEY_encapsulate(ctx, enc, &enclen,
+                             secret, &secretlen),
+                0))
             goto err;
     } else {
         if (!TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, opparam), 1))
             goto err;
         if (!TEST_int_eq(EVP_PKEY_decapsulate(ctx, secret, &secretlen,
-                                              t->expected_enc,
-                                              t->expected_enclen),
-                         0))
+                             t->expected_enc,
+                             t->expected_enclen),
+                0))
             goto err;
     }
     if (!TEST_int_eq(ERR_GET_REASON(ERR_get_error()), PROV_R_INVALID_KEY))
@@ -660,19 +674,22 @@ static int test_ec_badauth(int tstid)
     /* Set the auth public key to the point at infinity */
     pub[0] = 0;
     if (!TEST_ptr(auth = new_raw_private_key(t->curve, t->rpriv, t->rprivlen,
-                                             pub, 1)))
+                      pub, 1)))
         goto err;
     if (encap) {
         if (!TEST_int_eq(EVP_PKEY_auth_encapsulate_init(ctx, auth,
-                                                        opparam), 1)
+                             opparam),
+                1)
             || !TEST_int_eq(EVP_PKEY_encapsulate(ctx, enc, &enclen,
-                                                 secret, &secretlen), 0))
+                                secret, &secretlen),
+                0))
             goto err;
     } else {
         if (!TEST_int_eq(EVP_PKEY_auth_decapsulate_init(ctx, auth, opparam), 1)
             || !TEST_int_eq(EVP_PKEY_decapsulate(ctx, secret, &secretlen,
-                                                 t->expected_enc,
-                                                 t->expected_enclen), 0))
+                                t->expected_enc,
+                                t->expected_enclen),
+                0))
             goto err;
     }
     if (!TEST_int_eq(ERR_GET_REASON(ERR_get_error()), PROV_R_INVALID_KEY))
@@ -695,8 +712,9 @@ static int test_ec_invalid_decap_enc_buffer(void)
     enc[0] = 0xFF;
 
     return TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, opparam), 1)
-           && TEST_int_eq(EVP_PKEY_decapsulate(ctx, secret, &secretlen,
-                                               enc, t->expected_enclen), 0);
+        && TEST_int_eq(EVP_PKEY_decapsulate(ctx, secret, &secretlen,
+                           enc, t->expected_enclen),
+            0);
 }
 
 #ifndef OPENSSL_NO_ECX
@@ -730,21 +748,23 @@ static int test_ecx_dhkem_derivekey(int tstid)
     }
 
     params[0] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_DHKEM_IKM,
-                                                  (char *)t->ikm, t->ikmlen);
+        (char *)t->ikm, t->ikmlen);
     params[1] = OSSL_PARAM_construct_end();
 
     ret = TEST_ptr(genctx = EVP_PKEY_CTX_new_from_name(libctx, t->curvename, NULL))
-          && TEST_int_eq(EVP_PKEY_keygen_init(genctx), 1)
-          && TEST_int_eq(EVP_PKEY_CTX_set_params(genctx, params), 1)
-          && TEST_int_eq(EVP_PKEY_keygen(genctx, &pkey), 1)
-          && TEST_int_eq(EVP_PKEY_get_octet_string_param(pkey,
-                             OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
-                             pubkey, sizeof(pubkey), &pubkeylen), 1)
-          && TEST_int_eq(EVP_PKEY_get_octet_string_param(pkey,
-                             OSSL_PKEY_PARAM_PRIV_KEY,
-                             privkey, sizeof(privkey), &privkeylen), 1)
-          && TEST_mem_eq(t->pub, t->publen, pubkey, pubkeylen)
-          && TEST_mem_eq(masked_priv, t->privlen, privkey, privkeylen);
+        && TEST_int_eq(EVP_PKEY_keygen_init(genctx), 1)
+        && TEST_int_eq(EVP_PKEY_CTX_set_params(genctx, params), 1)
+        && TEST_int_eq(EVP_PKEY_keygen(genctx, &pkey), 1)
+        && TEST_int_eq(EVP_PKEY_get_octet_string_param(pkey,
+                           OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+                           pubkey, sizeof(pubkey), &pubkeylen),
+            1)
+        && TEST_int_eq(EVP_PKEY_get_octet_string_param(pkey,
+                           OSSL_PKEY_PARAM_PRIV_KEY,
+                           privkey, sizeof(privkey), &privkeylen),
+            1)
+        && TEST_mem_eq(t->pub, t->publen, pubkey, pubkeylen)
+        && TEST_mem_eq(masked_priv, t->privlen, privkey, privkeylen);
 
     EVP_PKEY_free(pkey);
     EVP_PKEY_CTX_free(genctx);
@@ -761,7 +781,8 @@ static int test_ecx_auth_key_curve_mismatch(void)
         return 0;
 
     ret = TEST_int_eq(EVP_PKEY_auth_encapsulate_init(rctx[TEST_KEYTYPE_X25519],
-                                                     auth, opparam), 0);
+                          auth, opparam),
+        0);
     EVP_PKEY_free(auth);
     return ret;
 }
@@ -774,9 +795,9 @@ static int test_ed_curve_unsupported(void)
     EVP_PKEY_CTX *ctx = NULL;
 
     ret = TEST_ptr(key = EVP_PKEY_Q_keygen(libctx, NULL, "ED448"))
-          && TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, key, NULL))
-          && TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), -2)
-          && TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, NULL), -2);
+        && TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, key, NULL))
+        && TEST_int_eq(EVP_PKEY_encapsulate_init(ctx, NULL), -2)
+        && TEST_int_eq(EVP_PKEY_decapsulate_init(ctx, NULL), -2);
     EVP_PKEY_free(key);
     EVP_PKEY_CTX_free(ctx);
     return ret;
@@ -792,27 +813,25 @@ int setup_tests(void)
     if (!test_get_libctx(&libctx, &nullprov, config_file, &libprov, prov_name))
         return 0;
     opparam[0] = OSSL_PARAM_construct_utf8_string(OSSL_KEM_PARAM_OPERATION,
-                                                  op, 0);
+        op, 0);
     opparam[1] = OSSL_PARAM_construct_end();
 
     /* Create P256 and X25519 keys and ctxs */
     if (!TEST_ptr(rkey[TEST_KEYTYPE_P256] = EVP_PKEY_Q_keygen(libctx, NULL,
-                                                              "EC", "P-256")))
+                      "EC", "P-256")))
         goto err;
 #ifndef OPENSSL_NO_ECX
     if (!TEST_ptr(rkey[TEST_KEYTYPE_X25519] = EVP_PKEY_Q_keygen(libctx, NULL,
-                                                                "X25519")))
+                      "X25519")))
         goto err;
 #endif
-    if (!TEST_ptr(rctx[TEST_KEYTYPE_P256] =
-                      EVP_PKEY_CTX_new_from_pkey(libctx,
-                                                 rkey[TEST_KEYTYPE_P256], NULL)))
-       goto err;
+    if (!TEST_ptr(rctx[TEST_KEYTYPE_P256] = EVP_PKEY_CTX_new_from_pkey(libctx,
+                      rkey[TEST_KEYTYPE_P256], NULL)))
+        goto err;
 #ifndef OPENSSL_NO_ECX
-    if (!TEST_ptr(rctx[TEST_KEYTYPE_X25519] =
-                      EVP_PKEY_CTX_new_from_pkey(libctx,
-                                                 rkey[TEST_KEYTYPE_X25519], NULL)))
-       goto err;
+    if (!TEST_ptr(rctx[TEST_KEYTYPE_X25519] = EVP_PKEY_CTX_new_from_pkey(libctx,
+                      rkey[TEST_KEYTYPE_X25519], NULL)))
+        goto err;
 #endif
 
     ADD_ALL_TESTS(test_dhkem_encapsulate, OSSL_NELEM(ec_encapdata));
@@ -828,9 +847,9 @@ int setup_tests(void)
     ADD_ALL_TESTS(test_null_params, TEST_KEYTYPES_P256_X25519);
     ADD_ALL_TESTS(test_set_params, TEST_KEYTYPES_P256_X25519);
     ADD_ALL_TESTS(test_nopublic,
-                  TEST_KEM_ENCAP_DECAP * TEST_KEYTYPES_P256_X25519);
+        TEST_KEM_ENCAP_DECAP * TEST_KEYTYPES_P256_X25519);
     ADD_ALL_TESTS(test_noauthpublic,
-                  TEST_KEM_ENCAP_DECAP * TEST_KEYTYPES_P256_X25519);
+        TEST_KEM_ENCAP_DECAP * TEST_KEYTYPES_P256_X25519);
 #else
     ADD_ALL_TESTS(test_settables, TEST_KEYTYPE_P256);
     ADD_ALL_TESTS(test_init_multiple, TEST_KEYTYPE_P256);
@@ -842,14 +861,14 @@ int setup_tests(void)
     ADD_ALL_TESTS(test_null_params, TEST_KEYTYPE_P256);
     ADD_ALL_TESTS(test_set_params, TEST_KEYTYPE_P256);
     ADD_ALL_TESTS(test_nopublic,
-                  TEST_KEM_ENCAP_DECAP * TEST_KEYTYPE_P256);
+        TEST_KEM_ENCAP_DECAP * TEST_KEYTYPE_P256);
     ADD_ALL_TESTS(test_noauthpublic,
-                  TEST_KEM_ENCAP_DECAP * TEST_KEYTYPE_P256);
+        TEST_KEM_ENCAP_DECAP * TEST_KEYTYPE_P256);
 #endif
     /* EC Specific tests */
     ADD_ALL_TESTS(test_ec_dhkem_derivekey, OSSL_NELEM(ec_derivekey_data));
     ADD_ALL_TESTS(test_ec_noikme,
-                  TEST_TYPE_AUTH_NOAUTH * OSSL_NELEM(dhkem_supported_curves));
+        TEST_TYPE_AUTH_NOAUTH * OSSL_NELEM(dhkem_supported_curves));
     ADD_TEST(test_ec_auth_key_curve_mismatch);
     ADD_TEST(test_ec_invalid_private_key);
     ADD_TEST(test_ec_dhkem_derivekey_fail);
diff --git a/test/evp_pkey_dparams_test.c b/test/evp_pkey_dparams_test.c
index 07b7d6c745885..1b426a048ff40 100644
--- a/test/evp_pkey_dparams_test.c
+++ b/test/evp_pkey_dparams_test.c
@@ -22,7 +22,7 @@
 #include "testutil.h"
 
 #if defined(OPENSSL_NO_DH) && defined(OPENSSL_NO_DSA) && defined(OPENSSL_NO_EC)
-# define OPENSSL_NO_KEYPARAMS
+#define OPENSSL_NO_KEYPARAMS
 #endif
 
 #ifndef OPENSSL_NO_KEYPARAMS
@@ -33,25 +33,25 @@ struct pubkey {
     size_t key_bin_len;
 };
 
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
 static const unsigned char dhparam_bin[] = {
-0x30,0x82,0x01,0x08,0x02,0x82,0x01,0x01,0x00,0xc0,0xd1,0x2e,0x14,0x18,0xbd,0x03,
-0xfd,0x39,0xe1,0x99,0xf4,0x93,0x06,0x2d,0x49,0xc6,0xb5,0xb9,0xf0,0x91,0xcb,0x2f,
-0x48,0x54,0x79,0x7d,0xc4,0x65,0x11,0x55,0xf7,0x99,0xde,0x42,0x83,0x84,0xc0,0xf8,
-0x88,0x89,0xa0,0xff,0xff,0x7d,0xe8,0xef,0x9e,0xbc,0xf7,0x1d,0x70,0x6d,0x3a,0x33,
-0x49,0x28,0xa1,0xa3,0xe1,0x41,0xc4,0x8b,0x91,0xf9,0xf2,0xb6,0xe2,0x77,0x79,0x38,
-0x7d,0x21,0xb3,0xdf,0x79,0x9c,0x5e,0x65,0x16,0x00,0x16,0x82,0xb2,0x36,0x46,0x21,
-0xac,0xaf,0x86,0xc7,0xe3,0x10,0x44,0x48,0xfb,0xbd,0xad,0x4e,0x11,0x73,0x4c,0x25,
-0xb0,0x8c,0x1c,0x1e,0x8e,0x58,0x50,0x5e,0x43,0x89,0xe4,0xd9,0x34,0xf8,0x3b,0xcc,
-0x36,0x2c,0x1b,0xb3,0xb2,0x77,0x0c,0xa5,0x96,0xc1,0x8a,0x38,0xd4,0xe3,0x9c,0x2a,
-0xde,0x49,0x46,0xc7,0xd4,0xa2,0x47,0xc9,0x0a,0xbd,0x84,0xd4,0x1c,0xbc,0xb6,0x19,
-0x04,0x94,0x64,0xfa,0x8a,0x11,0x9c,0x5f,0x4a,0x4c,0x0f,0x58,0x81,0x02,0xbf,0xcf,
-0x87,0x27,0x2b,0xae,0x8e,0xe2,0x61,0x7a,0xdb,0xba,0x23,0x39,0x25,0x44,0xdc,0x22,
-0x75,0xc3,0x28,0xd9,0x12,0x33,0x84,0x32,0xd4,0x5d,0xd9,0x77,0xf8,0x04,0x90,0x38,
-0x0a,0xec,0x84,0x93,0x43,0xce,0xe7,0x07,0x42,0x7d,0x2d,0xe0,0x21,0x3b,0x19,0x22,
-0xa7,0x8f,0x50,0x31,0xda,0xd0,0x0d,0xd3,0x0b,0xdb,0xad,0xed,0x94,0x92,0xff,0x83,
-0x06,0x7f,0x7f,0xd7,0x7b,0x42,0x5b,0xba,0x93,0x7a,0xeb,0x43,0x5f,0xce,0x59,0x26,
-0xe8,0x76,0xdc,0xee,0xe2,0xbe,0x36,0x7a,0x83,0x02,0x01,0x02
+    0x30, 0x82, 0x01, 0x08, 0x02, 0x82, 0x01, 0x01, 0x00, 0xc0, 0xd1, 0x2e, 0x14, 0x18, 0xbd, 0x03,
+    0xfd, 0x39, 0xe1, 0x99, 0xf4, 0x93, 0x06, 0x2d, 0x49, 0xc6, 0xb5, 0xb9, 0xf0, 0x91, 0xcb, 0x2f,
+    0x48, 0x54, 0x79, 0x7d, 0xc4, 0x65, 0x11, 0x55, 0xf7, 0x99, 0xde, 0x42, 0x83, 0x84, 0xc0, 0xf8,
+    0x88, 0x89, 0xa0, 0xff, 0xff, 0x7d, 0xe8, 0xef, 0x9e, 0xbc, 0xf7, 0x1d, 0x70, 0x6d, 0x3a, 0x33,
+    0x49, 0x28, 0xa1, 0xa3, 0xe1, 0x41, 0xc4, 0x8b, 0x91, 0xf9, 0xf2, 0xb6, 0xe2, 0x77, 0x79, 0x38,
+    0x7d, 0x21, 0xb3, 0xdf, 0x79, 0x9c, 0x5e, 0x65, 0x16, 0x00, 0x16, 0x82, 0xb2, 0x36, 0x46, 0x21,
+    0xac, 0xaf, 0x86, 0xc7, 0xe3, 0x10, 0x44, 0x48, 0xfb, 0xbd, 0xad, 0x4e, 0x11, 0x73, 0x4c, 0x25,
+    0xb0, 0x8c, 0x1c, 0x1e, 0x8e, 0x58, 0x50, 0x5e, 0x43, 0x89, 0xe4, 0xd9, 0x34, 0xf8, 0x3b, 0xcc,
+    0x36, 0x2c, 0x1b, 0xb3, 0xb2, 0x77, 0x0c, 0xa5, 0x96, 0xc1, 0x8a, 0x38, 0xd4, 0xe3, 0x9c, 0x2a,
+    0xde, 0x49, 0x46, 0xc7, 0xd4, 0xa2, 0x47, 0xc9, 0x0a, 0xbd, 0x84, 0xd4, 0x1c, 0xbc, 0xb6, 0x19,
+    0x04, 0x94, 0x64, 0xfa, 0x8a, 0x11, 0x9c, 0x5f, 0x4a, 0x4c, 0x0f, 0x58, 0x81, 0x02, 0xbf, 0xcf,
+    0x87, 0x27, 0x2b, 0xae, 0x8e, 0xe2, 0x61, 0x7a, 0xdb, 0xba, 0x23, 0x39, 0x25, 0x44, 0xdc, 0x22,
+    0x75, 0xc3, 0x28, 0xd9, 0x12, 0x33, 0x84, 0x32, 0xd4, 0x5d, 0xd9, 0x77, 0xf8, 0x04, 0x90, 0x38,
+    0x0a, 0xec, 0x84, 0x93, 0x43, 0xce, 0xe7, 0x07, 0x42, 0x7d, 0x2d, 0xe0, 0x21, 0x3b, 0x19, 0x22,
+    0xa7, 0x8f, 0x50, 0x31, 0xda, 0xd0, 0x0d, 0xd3, 0x0b, 0xdb, 0xad, 0xed, 0x94, 0x92, 0xff, 0x83,
+    0x06, 0x7f, 0x7f, 0xd7, 0x7b, 0x42, 0x5b, 0xba, 0x93, 0x7a, 0xeb, 0x43, 0x5f, 0xce, 0x59, 0x26,
+    0xe8, 0x76, 0xdc, 0xee, 0xe2, 0xbe, 0x36, 0x7a, 0x83, 0x02, 0x01, 0x02
 };
 static const unsigned char dhkey_1[] = {
     0x7a, 0x49, 0xcb, 0xc3, 0x25, 0x67, 0x7a, 0x61,
@@ -126,51 +126,51 @@ static const unsigned char dhkey_2[] = {
 static const unsigned char dhkey_3[] = {
     0x01
 };
-# endif
+#endif
 
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
 static const unsigned char dsaparam_bin[] = {
-0x30,0x82,0x02,0x28,0x02,0x82,0x01,0x01,0x00,0xf2,0x85,0x01,0xa5,0xb9,0x56,0x65,
-0x19,0xff,0x9a,0x7d,0xf9,0x90,0xd6,0xaa,0x73,0xac,0xf7,0x94,0xfa,0x8a,0x64,0x6d,
-0xa0,0x01,0x42,0xe5,0x45,0xfc,0x53,0x72,0xb0,0x7c,0xe6,0x3b,0xfb,0x09,0x33,0x41,
-0x27,0xbd,0x00,0xb5,0x18,0x87,0x62,0xa8,0x2b,0xfc,0xd0,0x52,0x4a,0x14,0x2d,0xaa,
-0x36,0xc6,0xf3,0xa9,0xe3,0x90,0x1b,0x74,0xdf,0x0a,0x6d,0x33,0xba,0xf4,0x32,0x6d,
-0xba,0x36,0x68,0x1d,0x83,0x36,0x50,0xc6,0x62,0xc0,0x40,0x67,0x0e,0xf6,0x22,0x00,
-0x62,0x1b,0x76,0x72,0x62,0x5f,0xa0,0xdf,0x38,0xb1,0x1d,0x26,0x70,0x9b,0x84,0x64,
-0xbb,0x16,0x15,0xc2,0x66,0xb9,0x97,0xd0,0x07,0xf1,0x4b,0x70,0x02,0x03,0xf1,0xd2,
-0x03,0xdb,0x78,0x8b,0xb4,0xda,0x6f,0x3c,0xe2,0x31,0xa8,0x1c,0x99,0xea,0x9c,0x75,
-0x28,0x96,0x82,0x16,0x77,0xac,0x79,0x32,0x61,0x87,0xec,0xb7,0xb4,0xc3,0xea,0x12,
-0x62,0x1f,0x08,0xb8,0x16,0xab,0xcc,0xef,0x28,0xdf,0x06,0x07,0xbe,0xb0,0xdc,0x78,
-0x83,0x8a,0x70,0x80,0x34,0xe6,0x91,0xe3,0xd3,0x92,0xd9,0xf4,0x56,0x53,0x52,0xb7,
-0x35,0xf6,0x2a,0xec,0x4b,0xcb,0xa2,0x3c,0xc3,0x0c,0x94,0xa7,0x4e,0x1c,0x42,0x9c,
-0x72,0x99,0x60,0x8c,0xfe,0xfb,0x60,0x57,0x75,0xf5,0x23,0x11,0x12,0xba,0x97,0xcd,
-0xad,0x5a,0x0b,0xa6,0x1f,0x6a,0x48,0x2e,0x8d,0xda,0x95,0xc6,0x0e,0x14,0xde,0xf7,
-0x22,0x55,0xa8,0x6b,0x25,0xdf,0xa2,0xab,0x33,0x65,0x56,0xfc,0x78,0x4f,0x62,0xdf,
-0x48,0xdd,0xce,0x8b,0xe1,0x76,0xf4,0xf6,0x7f,0x02,0x1d,0x00,0xac,0xb0,0xb8,0x92,
-0x3b,0x6b,0x61,0xcf,0x36,0x6d,0xf2,0x1e,0x5d,0xe0,0x7b,0xf5,0x73,0x48,0xa3,0x8b,
-0x86,0x9e,0x88,0xce,0x40,0xf8,0x27,0x6d,0x02,0x82,0x01,0x00,0x77,0x6b,0x89,0xd6,
-0x8f,0x3d,0xce,0x52,0x30,0x74,0xb2,0xa1,0x13,0x96,0xd5,0x92,0xf2,0xf1,0x6b,0x10,
-0x31,0x0b,0xf3,0x69,0xaa,0xbf,0x4b,0x6c,0xcb,0x3f,0x6d,0x58,0x76,0x44,0x09,0xf9,
-0x28,0xef,0xa0,0xe4,0x55,0x77,0x57,0xe0,0xfb,0xcc,0x9a,0x6a,0x2c,0x90,0xec,0x72,
-0x24,0x0b,0x43,0xc5,0xbc,0x31,0xed,0x1a,0x46,0x2c,0x76,0x42,0x9e,0xc0,0x82,0xfc,
-0xff,0xf9,0x7e,0xe2,0x1f,0x39,0xf3,0x3b,0xdb,0x27,0x36,0xe7,0xf5,0x3b,0xc2,0x23,
-0xb6,0xd0,0xcf,0x5b,0x85,0x2e,0x1b,0x00,0x5b,0x31,0xaa,0x72,0x8f,0x37,0xee,0x56,
-0x71,0xc4,0xfd,0x3c,0x8d,0xfa,0x5b,0xab,0xb1,0xa9,0x52,0x76,0xa0,0xe4,0xe3,0x78,
-0x83,0x64,0x5d,0xd7,0x6c,0xec,0x9b,0x40,0x65,0xe2,0x0a,0x11,0x19,0x60,0xdd,0xce,
-0x29,0x9f,0xc6,0x1d,0x0a,0xab,0x8e,0x59,0x25,0xc5,0x0b,0x9c,0x02,0x45,0xba,0x99,
-0x74,0x22,0x1d,0xc1,0x57,0xca,0x50,0x8c,0x5e,0xdf,0xd8,0x5d,0x43,0xae,0x06,0x28,
-0x29,0x82,0xf6,0x5a,0xa9,0x51,0xa2,0x04,0x1d,0xbf,0x88,0x15,0x98,0xce,0x8a,0xb4,
-0x3b,0xe5,0x30,0x29,0xce,0x0c,0x9b,0xf8,0xdb,0xbf,0x06,0x9f,0xd0,0x59,0x18,0xd4,
-0x0b,0x94,0xbf,0xe9,0x67,0x6b,0x9e,0xf0,0x72,0xc6,0xbf,0x79,0x8f,0x1e,0xa3,0x95,
-0x24,0xe3,0xcb,0x58,0xb5,0x67,0xd3,0xae,0x79,0xb0,0x28,0x9c,0x9a,0xd0,0xa4,0xe7,
-0x22,0x15,0xc1,0x8b,0x04,0xb9,0x8a,0xa8,0xb7,0x1b,0x62,0x44,0xc6,0xef,0x4b,0x74,
-0xd0,0xfd,0xa9,0xb4,0x4e,0xdd,0x7d,0x38,0x60,0xd1,0x40,0xcd
+    0x30, 0x82, 0x02, 0x28, 0x02, 0x82, 0x01, 0x01, 0x00, 0xf2, 0x85, 0x01, 0xa5, 0xb9, 0x56, 0x65,
+    0x19, 0xff, 0x9a, 0x7d, 0xf9, 0x90, 0xd6, 0xaa, 0x73, 0xac, 0xf7, 0x94, 0xfa, 0x8a, 0x64, 0x6d,
+    0xa0, 0x01, 0x42, 0xe5, 0x45, 0xfc, 0x53, 0x72, 0xb0, 0x7c, 0xe6, 0x3b, 0xfb, 0x09, 0x33, 0x41,
+    0x27, 0xbd, 0x00, 0xb5, 0x18, 0x87, 0x62, 0xa8, 0x2b, 0xfc, 0xd0, 0x52, 0x4a, 0x14, 0x2d, 0xaa,
+    0x36, 0xc6, 0xf3, 0xa9, 0xe3, 0x90, 0x1b, 0x74, 0xdf, 0x0a, 0x6d, 0x33, 0xba, 0xf4, 0x32, 0x6d,
+    0xba, 0x36, 0x68, 0x1d, 0x83, 0x36, 0x50, 0xc6, 0x62, 0xc0, 0x40, 0x67, 0x0e, 0xf6, 0x22, 0x00,
+    0x62, 0x1b, 0x76, 0x72, 0x62, 0x5f, 0xa0, 0xdf, 0x38, 0xb1, 0x1d, 0x26, 0x70, 0x9b, 0x84, 0x64,
+    0xbb, 0x16, 0x15, 0xc2, 0x66, 0xb9, 0x97, 0xd0, 0x07, 0xf1, 0x4b, 0x70, 0x02, 0x03, 0xf1, 0xd2,
+    0x03, 0xdb, 0x78, 0x8b, 0xb4, 0xda, 0x6f, 0x3c, 0xe2, 0x31, 0xa8, 0x1c, 0x99, 0xea, 0x9c, 0x75,
+    0x28, 0x96, 0x82, 0x16, 0x77, 0xac, 0x79, 0x32, 0x61, 0x87, 0xec, 0xb7, 0xb4, 0xc3, 0xea, 0x12,
+    0x62, 0x1f, 0x08, 0xb8, 0x16, 0xab, 0xcc, 0xef, 0x28, 0xdf, 0x06, 0x07, 0xbe, 0xb0, 0xdc, 0x78,
+    0x83, 0x8a, 0x70, 0x80, 0x34, 0xe6, 0x91, 0xe3, 0xd3, 0x92, 0xd9, 0xf4, 0x56, 0x53, 0x52, 0xb7,
+    0x35, 0xf6, 0x2a, 0xec, 0x4b, 0xcb, 0xa2, 0x3c, 0xc3, 0x0c, 0x94, 0xa7, 0x4e, 0x1c, 0x42, 0x9c,
+    0x72, 0x99, 0x60, 0x8c, 0xfe, 0xfb, 0x60, 0x57, 0x75, 0xf5, 0x23, 0x11, 0x12, 0xba, 0x97, 0xcd,
+    0xad, 0x5a, 0x0b, 0xa6, 0x1f, 0x6a, 0x48, 0x2e, 0x8d, 0xda, 0x95, 0xc6, 0x0e, 0x14, 0xde, 0xf7,
+    0x22, 0x55, 0xa8, 0x6b, 0x25, 0xdf, 0xa2, 0xab, 0x33, 0x65, 0x56, 0xfc, 0x78, 0x4f, 0x62, 0xdf,
+    0x48, 0xdd, 0xce, 0x8b, 0xe1, 0x76, 0xf4, 0xf6, 0x7f, 0x02, 0x1d, 0x00, 0xac, 0xb0, 0xb8, 0x92,
+    0x3b, 0x6b, 0x61, 0xcf, 0x36, 0x6d, 0xf2, 0x1e, 0x5d, 0xe0, 0x7b, 0xf5, 0x73, 0x48, 0xa3, 0x8b,
+    0x86, 0x9e, 0x88, 0xce, 0x40, 0xf8, 0x27, 0x6d, 0x02, 0x82, 0x01, 0x00, 0x77, 0x6b, 0x89, 0xd6,
+    0x8f, 0x3d, 0xce, 0x52, 0x30, 0x74, 0xb2, 0xa1, 0x13, 0x96, 0xd5, 0x92, 0xf2, 0xf1, 0x6b, 0x10,
+    0x31, 0x0b, 0xf3, 0x69, 0xaa, 0xbf, 0x4b, 0x6c, 0xcb, 0x3f, 0x6d, 0x58, 0x76, 0x44, 0x09, 0xf9,
+    0x28, 0xef, 0xa0, 0xe4, 0x55, 0x77, 0x57, 0xe0, 0xfb, 0xcc, 0x9a, 0x6a, 0x2c, 0x90, 0xec, 0x72,
+    0x24, 0x0b, 0x43, 0xc5, 0xbc, 0x31, 0xed, 0x1a, 0x46, 0x2c, 0x76, 0x42, 0x9e, 0xc0, 0x82, 0xfc,
+    0xff, 0xf9, 0x7e, 0xe2, 0x1f, 0x39, 0xf3, 0x3b, 0xdb, 0x27, 0x36, 0xe7, 0xf5, 0x3b, 0xc2, 0x23,
+    0xb6, 0xd0, 0xcf, 0x5b, 0x85, 0x2e, 0x1b, 0x00, 0x5b, 0x31, 0xaa, 0x72, 0x8f, 0x37, 0xee, 0x56,
+    0x71, 0xc4, 0xfd, 0x3c, 0x8d, 0xfa, 0x5b, 0xab, 0xb1, 0xa9, 0x52, 0x76, 0xa0, 0xe4, 0xe3, 0x78,
+    0x83, 0x64, 0x5d, 0xd7, 0x6c, 0xec, 0x9b, 0x40, 0x65, 0xe2, 0x0a, 0x11, 0x19, 0x60, 0xdd, 0xce,
+    0x29, 0x9f, 0xc6, 0x1d, 0x0a, 0xab, 0x8e, 0x59, 0x25, 0xc5, 0x0b, 0x9c, 0x02, 0x45, 0xba, 0x99,
+    0x74, 0x22, 0x1d, 0xc1, 0x57, 0xca, 0x50, 0x8c, 0x5e, 0xdf, 0xd8, 0x5d, 0x43, 0xae, 0x06, 0x28,
+    0x29, 0x82, 0xf6, 0x5a, 0xa9, 0x51, 0xa2, 0x04, 0x1d, 0xbf, 0x88, 0x15, 0x98, 0xce, 0x8a, 0xb4,
+    0x3b, 0xe5, 0x30, 0x29, 0xce, 0x0c, 0x9b, 0xf8, 0xdb, 0xbf, 0x06, 0x9f, 0xd0, 0x59, 0x18, 0xd4,
+    0x0b, 0x94, 0xbf, 0xe9, 0x67, 0x6b, 0x9e, 0xf0, 0x72, 0xc6, 0xbf, 0x79, 0x8f, 0x1e, 0xa3, 0x95,
+    0x24, 0xe3, 0xcb, 0x58, 0xb5, 0x67, 0xd3, 0xae, 0x79, 0xb0, 0x28, 0x9c, 0x9a, 0xd0, 0xa4, 0xe7,
+    0x22, 0x15, 0xc1, 0x8b, 0x04, 0xb9, 0x8a, 0xa8, 0xb7, 0x1b, 0x62, 0x44, 0xc6, 0xef, 0x4b, 0x74,
+    0xd0, 0xfd, 0xa9, 0xb4, 0x4e, 0xdd, 0x7d, 0x38, 0x60, 0xd1, 0x40, 0xcd
 };
-# endif
+#endif
 
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
 static const unsigned char ecparam_bin[] = {
-0x06,0x08,0x2a,0x86,0x48,0xce,0x3d,0x03,0x01,0x07
+    0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07
 };
 static const unsigned char eckey_1[] = {
     0x04, 0xc8, 0x65, 0x45, 0x63, 0x73, 0xe5, 0x0a,
@@ -207,7 +207,7 @@ static const unsigned char eckey_3[] = {
     0x83, 0xc5, 0x78, 0xd0, 0x0b, 0x69, 0xb4, 0xb9,
     0xf1, 0xaa
 };
-# endif
+#endif
 
 #define NUM_KEYS 10
 
@@ -216,30 +216,26 @@ static const struct {
     const unsigned char *param_bin;
     size_t param_bin_len;
     struct pubkey keys[NUM_KEYS];
-} pkey_params [] = {
-# ifndef OPENSSL_NO_DH
+} pkey_params[] = {
+#ifndef OPENSSL_NO_DH
     { EVP_PKEY_DH, dhparam_bin, sizeof(dhparam_bin),
         { { 0, dhkey_1, sizeof(dhkey_1) },
-          { 0, dhkey_2, sizeof(dhkey_2) },
-          { 1, dhkey_3, sizeof(dhkey_3) },
-          { 1, dhkey_1, 0 },
-          { 1, dhparam_bin, sizeof(dhparam_bin) }
-        }
-    },
-# endif
-# ifndef OPENSSL_NO_DSA
+            { 0, dhkey_2, sizeof(dhkey_2) },
+            { 1, dhkey_3, sizeof(dhkey_3) },
+            { 1, dhkey_1, 0 },
+            { 1, dhparam_bin, sizeof(dhparam_bin) } } },
+#endif
+#ifndef OPENSSL_NO_DSA
     { EVP_PKEY_DSA, dsaparam_bin, sizeof(dsaparam_bin) },
-# endif
-# ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
     { EVP_PKEY_EC, ecparam_bin, sizeof(ecparam_bin),
         { { 0, eckey_1, sizeof(eckey_1) },
-          { 1, eckey_2, sizeof(eckey_2) },
-          { 1, eckey_3, sizeof(eckey_3) },
-          { 1, eckey_1, 0 },
-          { 1, eckey_1, sizeof(eckey_1) - 1 }
-        }
-    }
-# endif
+            { 1, eckey_2, sizeof(eckey_2) },
+            { 1, eckey_3, sizeof(eckey_3) },
+            { 1, eckey_1, 0 },
+            { 1, eckey_1, sizeof(eckey_1) - 1 } } }
+#endif
 };
 
 static int params_bio_test(int id)
@@ -251,7 +247,7 @@ static int params_bio_test(int id)
     int type = pkey_params[id].type;
 
     ret = TEST_ptr(in = BIO_new_mem_buf(pkey_params[id].param_bin,
-                                        (int)pkey_params[id].param_bin_len))
+                       (int)pkey_params[id].param_bin_len))
         /* Load in pkey params from binary */
         && TEST_ptr(d2i_KeyParams_bio(type, &in_key, in))
         && TEST_ptr(out = BIO_new(BIO_s_mem()))
@@ -260,8 +256,8 @@ static int params_bio_test(int id)
         /* test the output binary is the expected value */
         && TEST_int_gt(out_len = BIO_get_mem_data(out, &out_bin), 0)
         && TEST_mem_eq(pkey_params[id].param_bin,
-                       (int)pkey_params[id].param_bin_len,
-                       out_bin, out_len);
+            (int)pkey_params[id].param_bin_len,
+            out_bin, out_len);
 
     BIO_free(in);
     BIO_free(out);
@@ -282,7 +278,7 @@ static int set_enc_pubkey_test(int id)
         return TEST_skip("Not applicable test");
 
     ret = TEST_ptr(in = BIO_new_mem_buf(pkey_params[id].param_bin,
-                                        (int)pkey_params[id].param_bin_len))
+                       (int)pkey_params[id].param_bin_len))
         /* Load in pkey params from binary */
         && TEST_ptr(d2i_KeyParams_bio(type, &in_key, in));
 
@@ -291,16 +287,16 @@ static int set_enc_pubkey_test(int id)
             ERR_set_mark();
             ret = ret
                 && TEST_int_le(EVP_PKEY_set1_encoded_public_key(in_key,
-                                                                keys[i].key_bin,
-                                                                keys[i].key_bin_len),
-                               0);
+                                   keys[i].key_bin,
+                                   keys[i].key_bin_len),
+                    0);
             ERR_pop_to_mark();
         } else {
             ret = ret
                 && TEST_int_gt(EVP_PKEY_set1_encoded_public_key(in_key,
-                                                                keys[i].key_bin,
-                                                                keys[i].key_bin_len),
-                               0);
+                                   keys[i].key_bin,
+                                   keys[i].key_bin_len),
+                    0);
         }
         if (!ret)
             TEST_info("Test key index #%d", i);
diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c
index a51a4a3c073af..86c86bcd65270 100644
--- a/test/evp_pkey_provided_test.c
+++ b/test/evp_pkey_provided_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-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
@@ -16,8 +16,8 @@
 #include <openssl/core_names.h>
 #include <openssl/sha.h>
 #include "crypto/ecx.h"
-#include "crypto/evp.h"          /* For the internal API */
-#include "crypto/bn_dh.h"        /* _bignum_ffdhe2048_p */
+#include "crypto/evp.h" /* For the internal API */
+#include "crypto/bn_dh.h" /* _bignum_ffdhe2048_p */
 #include "internal/nelem.h"
 #include "testutil.h"
 
@@ -28,12 +28,12 @@ static char *datadir = NULL;
  * update the for loop bounds used inside test_print_key_using_encoder() and
  * test_print_key_using_encoder_public().
  */
-#define PRIV_TEXT    0
-#define PRIV_PEM     1
-#define PRIV_DER     2
-#define PUB_TEXT     3
-#define PUB_PEM      4
-#define PUB_DER      5
+#define PRIV_TEXT 0
+#define PRIV_PEM 1
+#define PRIV_DER 2
+#define PUB_TEXT 3
+#define PUB_PEM 4
+#define PUB_DER 5
 
 static void stripcr(char *buf, size_t *len)
 {
@@ -103,8 +103,8 @@ static int compare_with_file(const char *alg, int type, BIO *membio)
         goto err;
 
     if (!TEST_true(BIO_read_ex(file, buf, sizeof(buf), &readbytes))
-            || !TEST_true(BIO_eof(file))
-            || !TEST_size_t_lt(readbytes, sizeof(buf)))
+        || !TEST_true(BIO_eof(file))
+        || !TEST_size_t_lt(readbytes, sizeof(buf)))
         goto err;
 
     len = BIO_get_mem_data(membio, &memdata);
@@ -121,7 +121,7 @@ static int compare_with_file(const char *alg, int type, BIO *membio)
         goto err;
 
     ret = 1;
- err:
+err:
     OPENSSL_free(fullfile);
     (void)BIO_reset(membio);
     BIO_free(file);
@@ -148,23 +148,23 @@ static int test_print_key_using_pem(const char *alg, const EVP_PKEY *pk)
 
     if (/* Output Encrypted private key in PEM form */
         !TEST_true(PEM_write_bio_PrivateKey(bio_out, pk, EVP_aes_256_cbc(),
-                                            (unsigned char *)"pass", 4,
-                                            NULL, NULL))
+            (unsigned char *)"pass", 4,
+            NULL, NULL))
         /* Output zero-length passphrase encrypted private key in PEM form */
         || !TEST_true(PEM_write_bio_PKCS8PrivateKey(bio_out, pk,
-                                                    EVP_aes_256_cbc(),
-                                                    (const char *)~0, 0,
-                                                    NULL, NULL))
+            EVP_aes_256_cbc(),
+            (const char *)~0, 0,
+            NULL, NULL))
         || !TEST_true(PEM_write_bio_PKCS8PrivateKey(bio_out, pk,
-                                                    EVP_aes_256_cbc(),
-                                                    NULL, 0, NULL, ""))
+            EVP_aes_256_cbc(),
+            NULL, 0, NULL, ""))
         || !TEST_true(PEM_write_bio_PKCS8PrivateKey(bio_out, pk,
-                                                    EVP_aes_256_cbc(),
-                                                    NULL, 0, pass_cb, NULL))
+            EVP_aes_256_cbc(),
+            NULL, 0, pass_cb, NULL))
         || !TEST_false(PEM_write_bio_PKCS8PrivateKey(bio_out, pk,
-                                                     EVP_aes_256_cbc(),
-                                                     NULL, 0, pass_cb_error,
-                                                     NULL))
+            EVP_aes_256_cbc(),
+            NULL, 0, pass_cb_error,
+            NULL))
 #ifndef OPENSSL_NO_DES
         || !TEST_true(PEM_write_bio_PKCS8PrivateKey_nid(
             bio_out, pk, NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
@@ -187,23 +187,23 @@ static int test_print_key_using_pem(const char *alg, const EVP_PKEY *pk)
         || !TEST_true(compare_with_file(alg, PUB_PEM, membio))
         /* Unencrypted private key in PEM form */
         || !TEST_true(PEM_write_bio_PrivateKey(membio, pk,
-                                               NULL, NULL, 0, NULL, NULL))
+            NULL, NULL, 0, NULL, NULL))
         || !TEST_true(compare_with_file(alg, PRIV_PEM, membio))
         /* NULL key */
         || !TEST_false(PEM_write_bio_PrivateKey(membio, NULL,
-                                               NULL, NULL, 0, NULL, NULL))
+            NULL, NULL, 0, NULL, NULL))
         || !TEST_false(PEM_write_bio_PrivateKey_traditional(membio, NULL,
-                                               NULL, NULL, 0, NULL, NULL)))
+            NULL, NULL, 0, NULL, NULL)))
         goto err;
 
     ret = 1;
- err:
+err:
     BIO_free(membio);
     return ret;
 }
 
 static int test_print_key_type_using_encoder(const char *alg, int type,
-                                             const EVP_PKEY *pk)
+    const EVP_PKEY *pk)
 {
     const char *output_type, *output_structure;
     int selection;
@@ -265,9 +265,9 @@ static int test_print_key_type_using_encoder(const char *alg, int type,
     /* Make a context, it's valid for several prints */
     TEST_note("Setting up a OSSL_ENCODER context with passphrase");
     if (!TEST_ptr(ctx = OSSL_ENCODER_CTX_new_for_pkey(pk, selection,
-                                                      output_type,
-                                                      output_structure,
-                                                      NULL))
+                      output_type,
+                      output_structure,
+                      NULL))
         /* Check that this operation is supported */
         || !TEST_int_ne(OSSL_ENCODER_CTX_get_num_encoders(ctx), 0))
         goto err;
@@ -281,8 +281,8 @@ static int test_print_key_type_using_encoder(const char *alg, int type,
     if (type == PRIV_PEM) {
         /* Set a passphrase to be used later */
         if (!TEST_true(OSSL_ENCODER_CTX_set_passphrase(ctx,
-                                                          (unsigned char *)"pass",
-                                                          4)))
+                (unsigned char *)"pass",
+                4)))
             goto err;
 
         /* Use a valid cipher name */
@@ -324,7 +324,7 @@ static int test_print_key_using_encoder(const char *alg, const EVP_PKEY *pk)
 
 #ifndef OPENSSL_NO_ECX
 static int test_print_key_using_encoder_public(const char *alg,
-                                               const EVP_PKEY *pk)
+    const EVP_PKEY *pk)
 {
     int i;
     int ret = 1;
@@ -337,14 +337,14 @@ static int test_print_key_using_encoder_public(const char *alg,
 #endif
 
 /* Array indexes used in test_fromdata_rsa */
-#define N       0
-#define E       1
-#define D       2
-#define P       3
-#define Q       4
-#define DP      5
-#define DQ      6
-#define QINV    7
+#define N 0
+#define E 1
+#define D 2
+#define P 3
+#define Q 4
+#define DP 5
+#define DQ 6
+#define QINV 7
 
 static int test_fromdata_rsa(void)
 {
@@ -358,14 +358,14 @@ static int test_fromdata_rsa(void)
      * openssl genrsa 32 | openssl rsa -text
      */
     static unsigned long key_numbers[] = {
-        0xbc747fc5,              /* N */
-        0x10001,                 /* E */
-        0x7b133399,              /* D */
-        0xe963,                  /* P */
-        0xceb7,                  /* Q */
-        0x8599,                  /* DP */
-        0xbd87,                  /* DQ */
-        0xcc3b,                  /* QINV */
+        0xbc747fc5, /* N */
+        0x10001, /* E */
+        0x7b133399, /* D */
+        0xe963, /* P */
+        0xceb7, /* Q */
+        0x8599, /* DP */
+        0xbd87, /* DQ */
+        0xcc3b, /* QINV */
     };
     OSSL_PARAM fromdata_params[] = {
         OSSL_PARAM_ulong(OSSL_PKEY_PARAM_RSA_N, &key_numbers[N]),
@@ -386,7 +386,8 @@ static int test_fromdata_rsa(void)
 
     if (!TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, &pk, EVP_PKEY_KEYPAIR,
-                                          fromdata_params), 1))
+                            fromdata_params),
+            1))
         goto err;
 
     for (;;) {
@@ -415,7 +416,7 @@ static int test_fromdata_rsa(void)
         copy_pk = NULL;
 
         ret = test_print_key_using_pem("RSA", pk)
-              && test_print_key_using_encoder("RSA", pk);
+            && test_print_key_using_encoder("RSA", pk);
 
         if (!ret || dup_pk != NULL)
             break;
@@ -428,12 +429,12 @@ static int test_fromdata_rsa(void)
         if (!ret)
             goto err;
     }
- err:
+err:
     /* for better diagnostics always compare key params */
     for (i = 0; fromdata_params[i].key != NULL; ++i) {
         if (!TEST_true(BN_set_word(bn_from, key_numbers[i]))
             || !TEST_true(EVP_PKEY_get_bn_param(pk, fromdata_params[i].key,
-                                                &bn))
+                &bn))
             || !TEST_BN_eq(bn, bn_from))
             ret = 0;
     }
@@ -453,9 +454,9 @@ struct check_data {
 };
 
 static int do_fromdata_rsa_derive(OSSL_PARAM *fromdata_params,
-                                  struct check_data check[],
-                                  int expected_nbits, int expected_sbits,
-                                  int expected_ksize)
+    struct check_data check[],
+    int expected_nbits, int expected_sbits,
+    int expected_ksize)
 {
     const OSSL_PARAM *check_param = NULL;
     BIGNUM *check_bn = NULL;
@@ -468,7 +469,8 @@ static int do_fromdata_rsa_derive(OSSL_PARAM *fromdata_params,
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL))
         || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, &pk, EVP_PKEY_KEYPAIR,
-                                          fromdata_params), 1))
+                            fromdata_params),
+            1))
         goto err;
 
     /*
@@ -480,7 +482,7 @@ static int do_fromdata_rsa_derive(OSSL_PARAM *fromdata_params,
 
     for (i = 0; check[i].pname != NULL; i++) {
         if (!TEST_ptr(check_param = OSSL_PARAM_locate_const(todata_params,
-                                                            check[i].pname)))
+                          check[i].pname)))
             goto err;
         if (!TEST_int_eq(OSSL_PARAM_get_BN(check_param, &check_bn), 1))
             goto err;
@@ -554,41 +556,34 @@ static int test_fromdata_rsa_derive_from_pq_sp800(void)
      * crt derivation, openssl requires a minimum of 512 bits of n data,
      * and 2048 bits in the FIPS case
      */
-    static unsigned char n_data[] =
-        {0x00, 0xc7, 0x06, 0xd8, 0x6b, 0x3c, 0x4f, 0xb7, 0x95, 0x42, 0x44, 0x90,
-         0xbd, 0xef, 0xf3, 0xc4, 0xb5, 0xa8, 0x55, 0x9e, 0x33, 0xa3, 0x04, 0x3a,
-         0x90, 0xe5, 0x13, 0xff, 0x87, 0x69, 0x15, 0xa4, 0x8a, 0x17, 0x10, 0xcc,
-         0xdf, 0xf9, 0xc5, 0x0f, 0xf1, 0x12, 0xff, 0x12, 0x11, 0xe5, 0x6b, 0x5c,
-         0x83, 0xd9, 0x43, 0xd1, 0x8a, 0x7e, 0xa6, 0x60, 0x07, 0x2e, 0xbb, 0x03,
-         0x17, 0x2d, 0xec, 0x17, 0x87};
-    static unsigned char e_data[] = {0x01, 0x00, 0x01};
-    static unsigned char d_data[] =
-        {0x1e, 0x5e, 0x5d, 0x07, 0x7f, 0xdc, 0x6a, 0x16, 0xcc, 0x55, 0xca, 0x00,
-         0x31, 0x6c, 0xf0, 0xc7, 0x07, 0x38, 0x89, 0x3b, 0x37, 0xd4, 0x9d, 0x5b,
-         0x1e, 0x99, 0x3e, 0x94, 0x5a, 0xe4, 0x82, 0x86, 0x8a, 0x78, 0x34, 0x09,
-         0x37, 0xd5, 0xe7, 0xb4, 0xef, 0x5f, 0x83, 0x94, 0xff, 0xe5, 0x36, 0x79,
-         0x10, 0x0c, 0x38, 0xc5, 0x3a, 0x33, 0xa6, 0x7c, 0x3c, 0xcc, 0x98, 0xe0,
-         0xf5, 0xdb, 0xe6, 0x81};
-    static unsigned char p_data[] =
-        {0x00, 0xf6, 0x61, 0x38, 0x0e, 0x1f, 0x82, 0x7c, 0xb8, 0xba, 0x00, 0xd3,
-         0xac, 0xdc, 0x4e, 0x6b, 0x7e, 0xf7, 0x58, 0xf3, 0xd9, 0xd8, 0x21, 0xed,
-         0x54, 0xa3, 0x36, 0xd2, 0x2c, 0x5f, 0x06, 0x7d, 0xc5};
-    static unsigned char q_data[] =
-        {0x00, 0xce, 0xcc, 0x4a, 0xa5, 0x4f, 0xd6, 0x73, 0xd0, 0x20, 0xc3, 0x98,
-         0x64, 0x20, 0x9b, 0xc1, 0x23, 0xd8, 0x5c, 0x82, 0x4f, 0xe8, 0xa5, 0x32,
-         0xcd, 0x7e, 0x97, 0xb4, 0xde, 0xf6, 0x4c, 0x80, 0xdb};
-    static unsigned char dmp1_data[] =
-        {0x00, 0xd1, 0x07, 0xb6, 0x79, 0x34, 0xfe, 0x8e, 0x36, 0x63, 0x88, 0xa4,
-         0x0e, 0x3a, 0x73, 0x45, 0xfc, 0x58, 0x7a, 0x5d, 0x98, 0xeb, 0x28, 0x0d,
-         0xa5, 0x0b, 0x3c, 0x4d, 0xa0, 0x5b, 0x96, 0xb4, 0x49};
-    static unsigned char dmq1_data[] =
-        {0x5b, 0x47, 0x02, 0xdf, 0xaa, 0xb8, 0xae, 0x8f, 0xbc, 0x16, 0x79, 0x6a,
-         0x20, 0x96, 0x7f, 0x0e, 0x92, 0x4e, 0x6a, 0xda, 0x58, 0x86, 0xaa, 0x40,
-         0xd7, 0xd2, 0xa0, 0x6c, 0x15, 0x6c, 0xb9, 0x27};
-    static unsigned char iqmp_data[] =
-        {0x00, 0xa0, 0xd6, 0xf0, 0xe8, 0x17, 0x9e, 0xe7, 0xe6, 0x99, 0x12, 0xd6,
-         0xd9, 0x43, 0xcf, 0xed, 0x37, 0x29, 0xf5, 0x6c, 0x3e, 0xc1, 0x7f, 0x2e,
-         0x31, 0x3f, 0x64, 0x34, 0x66, 0x68, 0x5c, 0x22, 0x08};
+    static unsigned char n_data[] = { 0x00, 0xc7, 0x06, 0xd8, 0x6b, 0x3c, 0x4f, 0xb7, 0x95, 0x42, 0x44, 0x90,
+        0xbd, 0xef, 0xf3, 0xc4, 0xb5, 0xa8, 0x55, 0x9e, 0x33, 0xa3, 0x04, 0x3a,
+        0x90, 0xe5, 0x13, 0xff, 0x87, 0x69, 0x15, 0xa4, 0x8a, 0x17, 0x10, 0xcc,
+        0xdf, 0xf9, 0xc5, 0x0f, 0xf1, 0x12, 0xff, 0x12, 0x11, 0xe5, 0x6b, 0x5c,
+        0x83, 0xd9, 0x43, 0xd1, 0x8a, 0x7e, 0xa6, 0x60, 0x07, 0x2e, 0xbb, 0x03,
+        0x17, 0x2d, 0xec, 0x17, 0x87 };
+    static unsigned char e_data[] = { 0x01, 0x00, 0x01 };
+    static unsigned char d_data[] = { 0x1e, 0x5e, 0x5d, 0x07, 0x7f, 0xdc, 0x6a, 0x16, 0xcc, 0x55, 0xca, 0x00,
+        0x31, 0x6c, 0xf0, 0xc7, 0x07, 0x38, 0x89, 0x3b, 0x37, 0xd4, 0x9d, 0x5b,
+        0x1e, 0x99, 0x3e, 0x94, 0x5a, 0xe4, 0x82, 0x86, 0x8a, 0x78, 0x34, 0x09,
+        0x37, 0xd5, 0xe7, 0xb4, 0xef, 0x5f, 0x83, 0x94, 0xff, 0xe5, 0x36, 0x79,
+        0x10, 0x0c, 0x38, 0xc5, 0x3a, 0x33, 0xa6, 0x7c, 0x3c, 0xcc, 0x98, 0xe0,
+        0xf5, 0xdb, 0xe6, 0x81 };
+    static unsigned char p_data[] = { 0x00, 0xf6, 0x61, 0x38, 0x0e, 0x1f, 0x82, 0x7c, 0xb8, 0xba, 0x00, 0xd3,
+        0xac, 0xdc, 0x4e, 0x6b, 0x7e, 0xf7, 0x58, 0xf3, 0xd9, 0xd8, 0x21, 0xed,
+        0x54, 0xa3, 0x36, 0xd2, 0x2c, 0x5f, 0x06, 0x7d, 0xc5 };
+    static unsigned char q_data[] = { 0x00, 0xce, 0xcc, 0x4a, 0xa5, 0x4f, 0xd6, 0x73, 0xd0, 0x20, 0xc3, 0x98,
+        0x64, 0x20, 0x9b, 0xc1, 0x23, 0xd8, 0x5c, 0x82, 0x4f, 0xe8, 0xa5, 0x32,
+        0xcd, 0x7e, 0x97, 0xb4, 0xde, 0xf6, 0x4c, 0x80, 0xdb };
+    static unsigned char dmp1_data[] = { 0x00, 0xd1, 0x07, 0xb6, 0x79, 0x34, 0xfe, 0x8e, 0x36, 0x63, 0x88, 0xa4,
+        0x0e, 0x3a, 0x73, 0x45, 0xfc, 0x58, 0x7a, 0x5d, 0x98, 0xeb, 0x28, 0x0d,
+        0xa5, 0x0b, 0x3c, 0x4d, 0xa0, 0x5b, 0x96, 0xb4, 0x49 };
+    static unsigned char dmq1_data[] = { 0x5b, 0x47, 0x02, 0xdf, 0xaa, 0xb8, 0xae, 0x8f, 0xbc, 0x16, 0x79, 0x6a,
+        0x20, 0x96, 0x7f, 0x0e, 0x92, 0x4e, 0x6a, 0xda, 0x58, 0x86, 0xaa, 0x40,
+        0xd7, 0xd2, 0xa0, 0x6c, 0x15, 0x6c, 0xb9, 0x27 };
+    static unsigned char iqmp_data[] = { 0x00, 0xa0, 0xd6, 0xf0, 0xe8, 0x17, 0x9e, 0xe7, 0xe6, 0x99, 0x12, 0xd6,
+        0xd9, 0x43, 0xcf, 0xed, 0x37, 0x29, 0xf5, 0x6c, 0x3e, 0xc1, 0x7f, 0x2e,
+        0x31, 0x3f, 0x64, 0x34, 0x66, 0x68, 0x5c, 0x22, 0x08 };
 
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || !TEST_ptr(n = BN_bin2bn(n_data, sizeof(n_data), NULL))
@@ -603,11 +598,11 @@ static int test_fromdata_rsa_derive_from_pq_sp800(void)
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_E, e))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_D, d))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_FACTOR1,
-                                             p))
+            p))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_FACTOR2,
-                                             q))
+            q))
         || !TEST_true(OSSL_PARAM_BLD_push_int(bld,
-                                              OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ, 1))
+            OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ, 1))
         || !TEST_ptr(fromdata_params = OSSL_PARAM_BLD_to_param(bld)))
         goto err;
 
@@ -652,125 +647,115 @@ static int test_fromdata_rsa_derive_from_pq_multiprime(void)
      * crt derivation,  openssl requires a minimum of 512 bits of n data,
      * and 2048 bits in the FIPS case
      */
-    static unsigned char n_data[] =
-        {0x00, 0x95, 0x78, 0x21, 0xe0, 0xca, 0x94, 0x6c, 0x0b, 0x86, 0x2a, 0x01,
-         0xde, 0xd9, 0xab, 0xee, 0x88, 0x4a, 0x27, 0x4f, 0xcc, 0x5f, 0xf1, 0x71,
-         0xe1, 0x0b, 0xc3, 0xd1, 0x88, 0x76, 0xf0, 0x83, 0x03, 0x93, 0x7e, 0x39,
-         0xfa, 0x47, 0x89, 0x34, 0x27, 0x18, 0x19, 0x97, 0xfc, 0xd4, 0xfe, 0xe5,
-         0x8a, 0xa9, 0x11, 0x83, 0xb5, 0x15, 0x4a, 0x29, 0xa6, 0xa6, 0xd0, 0x6e,
-         0x0c, 0x7f, 0x61, 0x8f, 0x7e, 0x7c, 0xfb, 0xfc, 0x04, 0x8b, 0xca, 0x44,
-         0xf8, 0x59, 0x0b, 0x22, 0x6f, 0x3f, 0x92, 0x23, 0x98, 0xb5, 0xc8, 0xf7,
-         0xff, 0xf7, 0xac, 0x6b, 0x36, 0xb3, 0xaf, 0x39, 0xde, 0x66, 0x38, 0x51,
-         0x9f, 0xbe, 0xe2, 0xfc, 0xe4, 0x6f, 0x1a, 0x0f, 0x7a, 0xde, 0x7f, 0x0f,
-         0x4e, 0xbc, 0xed, 0xa2, 0x99, 0xc5, 0xd1, 0xbf, 0x8f, 0xba, 0x92, 0x91,
-         0xe4, 0x00, 0x91, 0xbb, 0x67, 0x36, 0x7d, 0x00, 0x50, 0xda, 0x28, 0x38,
-         0xdc, 0x9f, 0xfe, 0x3f, 0x24, 0x5a, 0x0d, 0xe1, 0x8d, 0xe9, 0x45, 0x2c,
-         0xd7, 0xf2, 0x67, 0x8c, 0x0c, 0x6e, 0xdb, 0xc8, 0x8b, 0x6b, 0x38, 0x30,
-         0x21, 0x94, 0xc0, 0xe3, 0xd7, 0xe0, 0x23, 0xd3, 0xd4, 0xfa, 0xdb, 0xb9,
-         0xfe, 0x1a, 0xcc, 0xc9, 0x79, 0x19, 0x35, 0x18, 0x42, 0x30, 0xc4, 0xb5,
-         0x92, 0x33, 0x1e, 0xd4, 0xc4, 0xc0, 0x9d, 0x55, 0x37, 0xd4, 0xef, 0x54,
-         0x71, 0x81, 0x09, 0x15, 0xdb, 0x11, 0x38, 0x6b, 0x35, 0x93, 0x11, 0xdc,
-         0xb1, 0x6c, 0xd6, 0xa4, 0x37, 0x84, 0xf3, 0xb2, 0x2f, 0x1b, 0xd6, 0x05,
-         0x9f, 0x0e, 0x5c, 0x98, 0x29, 0x2f, 0x95, 0xb6, 0x55, 0xbd, 0x24, 0x44,
-         0xc5, 0xc8, 0xa2, 0x76, 0x1e, 0xf8, 0x82, 0x8a, 0xdf, 0x34, 0x72, 0x7e,
-         0xdd, 0x65, 0x4b, 0xfc, 0x6c, 0x1c, 0x96, 0x70, 0xe2, 0x69, 0xb5, 0x12,
-         0x1b, 0x59, 0x67, 0x14, 0x9d};
-    static unsigned char e_data[] = {0x01, 0x00, 0x01};
-    static unsigned char d_data[] =
-        {0x64, 0x57, 0x4d, 0x86, 0xf6, 0xf8, 0x44, 0xc0, 0x47, 0xc5, 0x13, 0x94,
-         0x63, 0x54, 0x84, 0xc1, 0x81, 0xe6, 0x7a, 0x2f, 0x9d, 0x89, 0x1d, 0x06,
-         0x13, 0x3b, 0xd6, 0x02, 0x62, 0xb6, 0x7b, 0x7d, 0x7f, 0x1a, 0x92, 0x19,
-         0x6e, 0xc4, 0xb0, 0xfa, 0x3d, 0xb7, 0x90, 0xcc, 0xee, 0xc0, 0x5f, 0xa0,
-         0x82, 0x77, 0x7b, 0x8f, 0xa9, 0x47, 0x2c, 0x46, 0xf0, 0x5d, 0xa4, 0x43,
-         0x47, 0x90, 0x5b, 0x20, 0x73, 0x0f, 0x46, 0xd4, 0x56, 0x73, 0xe7, 0x71,
-         0x41, 0x75, 0xb4, 0x1c, 0x32, 0xf5, 0x0c, 0x68, 0x8c, 0x40, 0xea, 0x1c,
-         0x30, 0x12, 0xa2, 0x65, 0x02, 0x27, 0x98, 0x4e, 0x0a, 0xbf, 0x2b, 0x72,
-         0xb2, 0x5c, 0xe3, 0xbe, 0x3e, 0xc7, 0xdb, 0x9b, 0xa2, 0x4a, 0x90, 0xc0,
-         0xa7, 0xb0, 0x00, 0xf1, 0x6a, 0xff, 0xa3, 0x77, 0xf7, 0x71, 0xa2, 0x41,
-         0xe9, 0x6e, 0x7c, 0x38, 0x24, 0x46, 0xd5, 0x5c, 0x49, 0x2a, 0xe6, 0xee,
-         0x27, 0x4b, 0x2e, 0x6f, 0x16, 0x54, 0x2d, 0x37, 0x36, 0x01, 0x39, 0x2b,
-         0x23, 0x4b, 0xb4, 0x65, 0x25, 0x4d, 0x7f, 0x72, 0x20, 0x7f, 0x5d, 0xec,
-         0x50, 0xba, 0xbb, 0xaa, 0x9c, 0x3c, 0x1d, 0xa1, 0x40, 0x2c, 0x6a, 0x8b,
-         0x5f, 0x2e, 0xe0, 0xa6, 0xf7, 0x9e, 0x03, 0xb5, 0x44, 0x5f, 0x74, 0xc7,
-         0x9f, 0x89, 0x2b, 0x71, 0x2f, 0x66, 0x9f, 0x03, 0x6c, 0x96, 0xd0, 0x23,
-         0x36, 0x4d, 0xa1, 0xf0, 0x82, 0xcc, 0x43, 0xe7, 0x08, 0x93, 0x40, 0x18,
-         0xc0, 0x39, 0x73, 0x83, 0xe2, 0xec, 0x9b, 0x81, 0x9d, 0x4c, 0x86, 0xaa,
-         0x59, 0xa8, 0x67, 0x1c, 0x80, 0xdc, 0x6f, 0x7f, 0x23, 0x6b, 0x7d, 0x2c,
-         0x56, 0x99, 0xa0, 0x89, 0x7e, 0xdb, 0x8b, 0x7a, 0xaa, 0x03, 0x8e, 0x8e,
-         0x8e, 0x3a, 0x58, 0xb4, 0x03, 0x6b, 0x65, 0xfa, 0x92, 0x0a, 0x96, 0x93,
-         0xa6, 0x07, 0x60, 0x01};
-     static unsigned char p_data[] =
-        {0x06, 0x55, 0x7f, 0xbd, 0xfd, 0xa8, 0x4c, 0x94, 0x5e, 0x10, 0x8a, 0x54,
-         0x37, 0xf3, 0x64, 0x37, 0x3a, 0xca, 0x18, 0x1b, 0xdd, 0x71, 0xa5, 0x94,
-         0xc9, 0x31, 0x59, 0xa5, 0x89, 0xe9, 0xc4, 0xba, 0x55, 0x90, 0x6d, 0x9c,
-         0xcc, 0x52, 0x5d, 0x44, 0xa8, 0xbc, 0x2b, 0x3b, 0x8c, 0xbd, 0x96, 0xfa,
-         0xcd, 0x54, 0x63, 0xe3, 0xc8, 0xfe, 0x5e, 0xc6, 0x73, 0x98, 0x14, 0x7a,
-         0x54, 0x0e, 0xe7, 0x75, 0x49, 0x93, 0x20, 0x33, 0x17, 0xa9, 0x34, 0xa8,
-         0xee, 0xaf, 0x3a, 0xcc, 0xf5, 0x69, 0xfc, 0x30, 0x1a, 0xdf, 0x49, 0x61,
-         0xa4, 0xd1};
-    static unsigned char p2_data[] =
-        {0x03, 0xe2, 0x41, 0x3d, 0xb1, 0xdd, 0xad, 0xd7, 0x3b, 0xf8, 0xab, 0x32,
-         0x27, 0x8b, 0xac, 0x95, 0xc0, 0x1a, 0x3f, 0x80, 0x8e, 0x21, 0xa9, 0xb8,
-         0xa2, 0xed, 0xcf, 0x97, 0x5c, 0x61, 0x10, 0x94, 0x1b, 0xd0, 0xbe, 0x88,
-         0xc2, 0xa7, 0x20, 0xe5, 0xa5, 0xc2, 0x7a, 0x7e, 0xf0, 0xd1, 0xe4, 0x13,
-         0x75, 0xb9, 0x62, 0x90, 0xf1, 0xc3, 0x5b, 0x8c, 0xe9, 0xa9, 0x5b, 0xb7,
-         0x6d, 0xdc, 0xcd, 0x12, 0xea, 0x97, 0x05, 0x04, 0x25, 0x2a, 0x93, 0xd1,
-         0x4e, 0x05, 0x1a, 0x50, 0xa2, 0x67, 0xb8, 0x4b, 0x09, 0x15, 0x65, 0x6c,
-         0x66, 0x2d};
-    static unsigned char q_data[] =
-        {0x06, 0x13, 0x74, 0x6e, 0xde, 0x7c, 0x33, 0xc2, 0xe7, 0x05, 0x2c, 0xeb,
-         0x25, 0x7d, 0x4a, 0x07, 0x7e, 0x03, 0xcf, 0x6a, 0x23, 0x36, 0x25, 0x23,
-         0xf6, 0x5d, 0xde, 0xa3, 0x0f, 0x82, 0xe6, 0x4b, 0xec, 0x39, 0xbf, 0x37,
-         0x1f, 0x4f, 0x56, 0x1e, 0xd8, 0x62, 0x32, 0x5c, 0xf5, 0x37, 0x75, 0x20,
-         0xe2, 0x7e, 0x56, 0x82, 0xc6, 0x35, 0xd3, 0x4d, 0xfa, 0x6c, 0xc3, 0x93,
-         0xf0, 0x60, 0x53, 0x78, 0x95, 0xee, 0xf9, 0x8b, 0x2c, 0xaf, 0xb1, 0x47,
-         0x5c, 0x29, 0x0d, 0x2a, 0x47, 0x7f, 0xd0, 0x7a, 0x4e, 0x26, 0x7b, 0x47,
-         0xfb, 0x61};
-    static unsigned char dmp1_data[] =
-        {0x01, 0x13, 0x3a, 0x1f, 0x91, 0x92, 0xa3, 0x8c, 0xfb, 0x7a, 0x6b, 0x40,
-         0x68, 0x4e, 0xd3, 0xcf, 0xdc, 0x16, 0xb9, 0x88, 0xe1, 0x49, 0x8d, 0x05,
-         0x78, 0x30, 0xfc, 0x3a, 0x70, 0xf2, 0x51, 0x06, 0x1f, 0xc7, 0xe8, 0x13,
-         0x19, 0x4b, 0x51, 0xb1, 0x79, 0xc2, 0x96, 0xc4, 0x00, 0xdb, 0x9d, 0x68,
-         0xec, 0xb9, 0x4a, 0x4b, 0x3b, 0xae, 0x91, 0x7f, 0xb5, 0xd7, 0x36, 0x82,
-         0x9d, 0x09, 0xfa, 0x97, 0x99, 0xe9, 0x73, 0x29, 0xb8, 0xf6, 0x6b, 0x8d,
-         0xd1, 0x15, 0xc5, 0x31, 0x4c, 0xe6, 0xb4, 0x7b, 0xa5, 0xd4, 0x08, 0xac,
-         0x9e, 0x41};
-    static unsigned char dmq1_data[] =
-        {0x05, 0xcd, 0x33, 0xc2, 0xdd, 0x3b, 0xb8, 0xec, 0xe4, 0x4c, 0x03, 0xcc,
-         0xef, 0xba, 0x07, 0x22, 0xca, 0x47, 0x77, 0x18, 0x40, 0x50, 0xe5, 0xfb,
-         0xc5, 0xb5, 0x71, 0xed, 0x3e, 0xd5, 0x5d, 0x72, 0xa7, 0x37, 0xa8, 0x86,
-         0x48, 0xa6, 0x27, 0x74, 0x42, 0x66, 0xd8, 0xf1, 0xfb, 0xcf, 0x1d, 0x4e,
-         0xee, 0x15, 0x76, 0x23, 0x5e, 0x81, 0x6c, 0xa7, 0x2b, 0x74, 0x08, 0xf7,
-         0x4c, 0x71, 0x9d, 0xa2, 0x29, 0x7f, 0xca, 0xd5, 0x02, 0x31, 0x2c, 0x54,
-         0x18, 0x02, 0xb6, 0xa8, 0x65, 0x26, 0xfc, 0xf8, 0x9b, 0x80, 0x90, 0xfc,
-         0x75, 0x61};
-    static unsigned char iqmp_data[] =
-        {0x05, 0x78, 0xf8, 0xdd, 0x1c, 0x6f, 0x3d, 0xaf, 0x53, 0x84, 0x32, 0xa9,
-         0x35, 0x52, 0xf3, 0xd0, 0x4d, 0xf8, 0x09, 0x85, 0x3d, 0x72, 0x20, 0x8b,
-         0x47, 0xba, 0xc8, 0xce, 0xac, 0xd9, 0x76, 0x90, 0x05, 0x88, 0x63, 0x8a,
-         0x10, 0x2b, 0xcd, 0xd3, 0xbe, 0x8c, 0x16, 0x60, 0x6a, 0xfd, 0xce, 0xc7,
-         0x9f, 0xfa, 0xbb, 0xe3, 0xa6, 0xde, 0xc2, 0x8f, 0x1d, 0x25, 0xdc, 0x41,
-         0xcb, 0xa4, 0xeb, 0x76, 0xc9, 0xdc, 0x8e, 0x49, 0x0e, 0xe4, 0x7c, 0xd2,
-         0xd5, 0x6e, 0x26, 0x3c, 0x0b, 0xd3, 0xc5, 0x20, 0x4e, 0x4b, 0xb6, 0xf7,
-         0xae, 0xef};
-    static unsigned char exp3_data[] =
-        {0x02, 0x7d, 0x16, 0x24, 0xfc, 0x35, 0xf9, 0xd0, 0xb3, 0x02, 0xf2, 0x5f,
-         0xde, 0xeb, 0x27, 0x19, 0x85, 0xd0, 0xcb, 0xe4, 0x0a, 0x2f, 0x13, 0xdb,
-         0xd5, 0xba, 0xe0, 0x8c, 0x32, 0x8b, 0x97, 0xdd, 0xef, 0xbc, 0xe0, 0x7a,
-         0x2d, 0x90, 0x7e, 0x09, 0xe9, 0x1f, 0x26, 0xf2, 0xf4, 0x48, 0xea, 0x06,
-         0x76, 0x26, 0xe6, 0x3b, 0xce, 0x4e, 0xc9, 0xf9, 0x0f, 0x38, 0x90, 0x26,
-         0x87, 0x65, 0x36, 0x9a, 0xea, 0x6a, 0xfe, 0xb1, 0xdb, 0x46, 0xdf, 0x14,
-         0xfd, 0x13, 0x53, 0xfb, 0x5b, 0x35, 0x6e, 0xe7, 0xd5, 0xd8, 0x39, 0xf7,
-         0x2d, 0xb9};
-    static unsigned char coeff2_data[] =
-        {0x01, 0xba, 0x66, 0x0a, 0xa2, 0x86, 0xc0, 0x57, 0x7f, 0x4e, 0x68, 0xb1,
-         0x86, 0x63, 0x23, 0x5b, 0x0e, 0xeb, 0x93, 0x42, 0xd1, 0xaa, 0x15, 0x13,
-         0xcc, 0x29, 0x71, 0x8a, 0xb0, 0xe0, 0xc9, 0x67, 0xde, 0x1a, 0x7c, 0x1a,
-         0xef, 0xa7, 0x08, 0x85, 0xb3, 0xae, 0x98, 0x99, 0xde, 0xaf, 0x09, 0x38,
-         0xfc, 0x46, 0x29, 0x5f, 0x4f, 0x7e, 0x01, 0x6c, 0x50, 0x13, 0x95, 0x91,
-         0x4c, 0x0f, 0x00, 0xba, 0xca, 0x40, 0xa3, 0xd0, 0x58, 0xb6, 0x62, 0x4c,
-         0xd1, 0xb6, 0xd3, 0x29, 0x5d, 0x82, 0xb3, 0x3d, 0x61, 0xbe, 0x5d, 0xf0,
-         0x4b, 0xf4};
+    static unsigned char n_data[] = { 0x00, 0x95, 0x78, 0x21, 0xe0, 0xca, 0x94, 0x6c, 0x0b, 0x86, 0x2a, 0x01,
+        0xde, 0xd9, 0xab, 0xee, 0x88, 0x4a, 0x27, 0x4f, 0xcc, 0x5f, 0xf1, 0x71,
+        0xe1, 0x0b, 0xc3, 0xd1, 0x88, 0x76, 0xf0, 0x83, 0x03, 0x93, 0x7e, 0x39,
+        0xfa, 0x47, 0x89, 0x34, 0x27, 0x18, 0x19, 0x97, 0xfc, 0xd4, 0xfe, 0xe5,
+        0x8a, 0xa9, 0x11, 0x83, 0xb5, 0x15, 0x4a, 0x29, 0xa6, 0xa6, 0xd0, 0x6e,
+        0x0c, 0x7f, 0x61, 0x8f, 0x7e, 0x7c, 0xfb, 0xfc, 0x04, 0x8b, 0xca, 0x44,
+        0xf8, 0x59, 0x0b, 0x22, 0x6f, 0x3f, 0x92, 0x23, 0x98, 0xb5, 0xc8, 0xf7,
+        0xff, 0xf7, 0xac, 0x6b, 0x36, 0xb3, 0xaf, 0x39, 0xde, 0x66, 0x38, 0x51,
+        0x9f, 0xbe, 0xe2, 0xfc, 0xe4, 0x6f, 0x1a, 0x0f, 0x7a, 0xde, 0x7f, 0x0f,
+        0x4e, 0xbc, 0xed, 0xa2, 0x99, 0xc5, 0xd1, 0xbf, 0x8f, 0xba, 0x92, 0x91,
+        0xe4, 0x00, 0x91, 0xbb, 0x67, 0x36, 0x7d, 0x00, 0x50, 0xda, 0x28, 0x38,
+        0xdc, 0x9f, 0xfe, 0x3f, 0x24, 0x5a, 0x0d, 0xe1, 0x8d, 0xe9, 0x45, 0x2c,
+        0xd7, 0xf2, 0x67, 0x8c, 0x0c, 0x6e, 0xdb, 0xc8, 0x8b, 0x6b, 0x38, 0x30,
+        0x21, 0x94, 0xc0, 0xe3, 0xd7, 0xe0, 0x23, 0xd3, 0xd4, 0xfa, 0xdb, 0xb9,
+        0xfe, 0x1a, 0xcc, 0xc9, 0x79, 0x19, 0x35, 0x18, 0x42, 0x30, 0xc4, 0xb5,
+        0x92, 0x33, 0x1e, 0xd4, 0xc4, 0xc0, 0x9d, 0x55, 0x37, 0xd4, 0xef, 0x54,
+        0x71, 0x81, 0x09, 0x15, 0xdb, 0x11, 0x38, 0x6b, 0x35, 0x93, 0x11, 0xdc,
+        0xb1, 0x6c, 0xd6, 0xa4, 0x37, 0x84, 0xf3, 0xb2, 0x2f, 0x1b, 0xd6, 0x05,
+        0x9f, 0x0e, 0x5c, 0x98, 0x29, 0x2f, 0x95, 0xb6, 0x55, 0xbd, 0x24, 0x44,
+        0xc5, 0xc8, 0xa2, 0x76, 0x1e, 0xf8, 0x82, 0x8a, 0xdf, 0x34, 0x72, 0x7e,
+        0xdd, 0x65, 0x4b, 0xfc, 0x6c, 0x1c, 0x96, 0x70, 0xe2, 0x69, 0xb5, 0x12,
+        0x1b, 0x59, 0x67, 0x14, 0x9d };
+    static unsigned char e_data[] = { 0x01, 0x00, 0x01 };
+    static unsigned char d_data[] = { 0x64, 0x57, 0x4d, 0x86, 0xf6, 0xf8, 0x44, 0xc0, 0x47, 0xc5, 0x13, 0x94,
+        0x63, 0x54, 0x84, 0xc1, 0x81, 0xe6, 0x7a, 0x2f, 0x9d, 0x89, 0x1d, 0x06,
+        0x13, 0x3b, 0xd6, 0x02, 0x62, 0xb6, 0x7b, 0x7d, 0x7f, 0x1a, 0x92, 0x19,
+        0x6e, 0xc4, 0xb0, 0xfa, 0x3d, 0xb7, 0x90, 0xcc, 0xee, 0xc0, 0x5f, 0xa0,
+        0x82, 0x77, 0x7b, 0x8f, 0xa9, 0x47, 0x2c, 0x46, 0xf0, 0x5d, 0xa4, 0x43,
+        0x47, 0x90, 0x5b, 0x20, 0x73, 0x0f, 0x46, 0xd4, 0x56, 0x73, 0xe7, 0x71,
+        0x41, 0x75, 0xb4, 0x1c, 0x32, 0xf5, 0x0c, 0x68, 0x8c, 0x40, 0xea, 0x1c,
+        0x30, 0x12, 0xa2, 0x65, 0x02, 0x27, 0x98, 0x4e, 0x0a, 0xbf, 0x2b, 0x72,
+        0xb2, 0x5c, 0xe3, 0xbe, 0x3e, 0xc7, 0xdb, 0x9b, 0xa2, 0x4a, 0x90, 0xc0,
+        0xa7, 0xb0, 0x00, 0xf1, 0x6a, 0xff, 0xa3, 0x77, 0xf7, 0x71, 0xa2, 0x41,
+        0xe9, 0x6e, 0x7c, 0x38, 0x24, 0x46, 0xd5, 0x5c, 0x49, 0x2a, 0xe6, 0xee,
+        0x27, 0x4b, 0x2e, 0x6f, 0x16, 0x54, 0x2d, 0x37, 0x36, 0x01, 0x39, 0x2b,
+        0x23, 0x4b, 0xb4, 0x65, 0x25, 0x4d, 0x7f, 0x72, 0x20, 0x7f, 0x5d, 0xec,
+        0x50, 0xba, 0xbb, 0xaa, 0x9c, 0x3c, 0x1d, 0xa1, 0x40, 0x2c, 0x6a, 0x8b,
+        0x5f, 0x2e, 0xe0, 0xa6, 0xf7, 0x9e, 0x03, 0xb5, 0x44, 0x5f, 0x74, 0xc7,
+        0x9f, 0x89, 0x2b, 0x71, 0x2f, 0x66, 0x9f, 0x03, 0x6c, 0x96, 0xd0, 0x23,
+        0x36, 0x4d, 0xa1, 0xf0, 0x82, 0xcc, 0x43, 0xe7, 0x08, 0x93, 0x40, 0x18,
+        0xc0, 0x39, 0x73, 0x83, 0xe2, 0xec, 0x9b, 0x81, 0x9d, 0x4c, 0x86, 0xaa,
+        0x59, 0xa8, 0x67, 0x1c, 0x80, 0xdc, 0x6f, 0x7f, 0x23, 0x6b, 0x7d, 0x2c,
+        0x56, 0x99, 0xa0, 0x89, 0x7e, 0xdb, 0x8b, 0x7a, 0xaa, 0x03, 0x8e, 0x8e,
+        0x8e, 0x3a, 0x58, 0xb4, 0x03, 0x6b, 0x65, 0xfa, 0x92, 0x0a, 0x96, 0x93,
+        0xa6, 0x07, 0x60, 0x01 };
+    static unsigned char p_data[] = { 0x06, 0x55, 0x7f, 0xbd, 0xfd, 0xa8, 0x4c, 0x94, 0x5e, 0x10, 0x8a, 0x54,
+        0x37, 0xf3, 0x64, 0x37, 0x3a, 0xca, 0x18, 0x1b, 0xdd, 0x71, 0xa5, 0x94,
+        0xc9, 0x31, 0x59, 0xa5, 0x89, 0xe9, 0xc4, 0xba, 0x55, 0x90, 0x6d, 0x9c,
+        0xcc, 0x52, 0x5d, 0x44, 0xa8, 0xbc, 0x2b, 0x3b, 0x8c, 0xbd, 0x96, 0xfa,
+        0xcd, 0x54, 0x63, 0xe3, 0xc8, 0xfe, 0x5e, 0xc6, 0x73, 0x98, 0x14, 0x7a,
+        0x54, 0x0e, 0xe7, 0x75, 0x49, 0x93, 0x20, 0x33, 0x17, 0xa9, 0x34, 0xa8,
+        0xee, 0xaf, 0x3a, 0xcc, 0xf5, 0x69, 0xfc, 0x30, 0x1a, 0xdf, 0x49, 0x61,
+        0xa4, 0xd1 };
+    static unsigned char p2_data[] = { 0x03, 0xe2, 0x41, 0x3d, 0xb1, 0xdd, 0xad, 0xd7, 0x3b, 0xf8, 0xab, 0x32,
+        0x27, 0x8b, 0xac, 0x95, 0xc0, 0x1a, 0x3f, 0x80, 0x8e, 0x21, 0xa9, 0xb8,
+        0xa2, 0xed, 0xcf, 0x97, 0x5c, 0x61, 0x10, 0x94, 0x1b, 0xd0, 0xbe, 0x88,
+        0xc2, 0xa7, 0x20, 0xe5, 0xa5, 0xc2, 0x7a, 0x7e, 0xf0, 0xd1, 0xe4, 0x13,
+        0x75, 0xb9, 0x62, 0x90, 0xf1, 0xc3, 0x5b, 0x8c, 0xe9, 0xa9, 0x5b, 0xb7,
+        0x6d, 0xdc, 0xcd, 0x12, 0xea, 0x97, 0x05, 0x04, 0x25, 0x2a, 0x93, 0xd1,
+        0x4e, 0x05, 0x1a, 0x50, 0xa2, 0x67, 0xb8, 0x4b, 0x09, 0x15, 0x65, 0x6c,
+        0x66, 0x2d };
+    static unsigned char q_data[] = { 0x06, 0x13, 0x74, 0x6e, 0xde, 0x7c, 0x33, 0xc2, 0xe7, 0x05, 0x2c, 0xeb,
+        0x25, 0x7d, 0x4a, 0x07, 0x7e, 0x03, 0xcf, 0x6a, 0x23, 0x36, 0x25, 0x23,
+        0xf6, 0x5d, 0xde, 0xa3, 0x0f, 0x82, 0xe6, 0x4b, 0xec, 0x39, 0xbf, 0x37,
+        0x1f, 0x4f, 0x56, 0x1e, 0xd8, 0x62, 0x32, 0x5c, 0xf5, 0x37, 0x75, 0x20,
+        0xe2, 0x7e, 0x56, 0x82, 0xc6, 0x35, 0xd3, 0x4d, 0xfa, 0x6c, 0xc3, 0x93,
+        0xf0, 0x60, 0x53, 0x78, 0x95, 0xee, 0xf9, 0x8b, 0x2c, 0xaf, 0xb1, 0x47,
+        0x5c, 0x29, 0x0d, 0x2a, 0x47, 0x7f, 0xd0, 0x7a, 0x4e, 0x26, 0x7b, 0x47,
+        0xfb, 0x61 };
+    static unsigned char dmp1_data[] = { 0x01, 0x13, 0x3a, 0x1f, 0x91, 0x92, 0xa3, 0x8c, 0xfb, 0x7a, 0x6b, 0x40,
+        0x68, 0x4e, 0xd3, 0xcf, 0xdc, 0x16, 0xb9, 0x88, 0xe1, 0x49, 0x8d, 0x05,
+        0x78, 0x30, 0xfc, 0x3a, 0x70, 0xf2, 0x51, 0x06, 0x1f, 0xc7, 0xe8, 0x13,
+        0x19, 0x4b, 0x51, 0xb1, 0x79, 0xc2, 0x96, 0xc4, 0x00, 0xdb, 0x9d, 0x68,
+        0xec, 0xb9, 0x4a, 0x4b, 0x3b, 0xae, 0x91, 0x7f, 0xb5, 0xd7, 0x36, 0x82,
+        0x9d, 0x09, 0xfa, 0x97, 0x99, 0xe9, 0x73, 0x29, 0xb8, 0xf6, 0x6b, 0x8d,
+        0xd1, 0x15, 0xc5, 0x31, 0x4c, 0xe6, 0xb4, 0x7b, 0xa5, 0xd4, 0x08, 0xac,
+        0x9e, 0x41 };
+    static unsigned char dmq1_data[] = { 0x05, 0xcd, 0x33, 0xc2, 0xdd, 0x3b, 0xb8, 0xec, 0xe4, 0x4c, 0x03, 0xcc,
+        0xef, 0xba, 0x07, 0x22, 0xca, 0x47, 0x77, 0x18, 0x40, 0x50, 0xe5, 0xfb,
+        0xc5, 0xb5, 0x71, 0xed, 0x3e, 0xd5, 0x5d, 0x72, 0xa7, 0x37, 0xa8, 0x86,
+        0x48, 0xa6, 0x27, 0x74, 0x42, 0x66, 0xd8, 0xf1, 0xfb, 0xcf, 0x1d, 0x4e,
+        0xee, 0x15, 0x76, 0x23, 0x5e, 0x81, 0x6c, 0xa7, 0x2b, 0x74, 0x08, 0xf7,
+        0x4c, 0x71, 0x9d, 0xa2, 0x29, 0x7f, 0xca, 0xd5, 0x02, 0x31, 0x2c, 0x54,
+        0x18, 0x02, 0xb6, 0xa8, 0x65, 0x26, 0xfc, 0xf8, 0x9b, 0x80, 0x90, 0xfc,
+        0x75, 0x61 };
+    static unsigned char iqmp_data[] = { 0x05, 0x78, 0xf8, 0xdd, 0x1c, 0x6f, 0x3d, 0xaf, 0x53, 0x84, 0x32, 0xa9,
+        0x35, 0x52, 0xf3, 0xd0, 0x4d, 0xf8, 0x09, 0x85, 0x3d, 0x72, 0x20, 0x8b,
+        0x47, 0xba, 0xc8, 0xce, 0xac, 0xd9, 0x76, 0x90, 0x05, 0x88, 0x63, 0x8a,
+        0x10, 0x2b, 0xcd, 0xd3, 0xbe, 0x8c, 0x16, 0x60, 0x6a, 0xfd, 0xce, 0xc7,
+        0x9f, 0xfa, 0xbb, 0xe3, 0xa6, 0xde, 0xc2, 0x8f, 0x1d, 0x25, 0xdc, 0x41,
+        0xcb, 0xa4, 0xeb, 0x76, 0xc9, 0xdc, 0x8e, 0x49, 0x0e, 0xe4, 0x7c, 0xd2,
+        0xd5, 0x6e, 0x26, 0x3c, 0x0b, 0xd3, 0xc5, 0x20, 0x4e, 0x4b, 0xb6, 0xf7,
+        0xae, 0xef };
+    static unsigned char exp3_data[] = { 0x02, 0x7d, 0x16, 0x24, 0xfc, 0x35, 0xf9, 0xd0, 0xb3, 0x02, 0xf2, 0x5f,
+        0xde, 0xeb, 0x27, 0x19, 0x85, 0xd0, 0xcb, 0xe4, 0x0a, 0x2f, 0x13, 0xdb,
+        0xd5, 0xba, 0xe0, 0x8c, 0x32, 0x8b, 0x97, 0xdd, 0xef, 0xbc, 0xe0, 0x7a,
+        0x2d, 0x90, 0x7e, 0x09, 0xe9, 0x1f, 0x26, 0xf2, 0xf4, 0x48, 0xea, 0x06,
+        0x76, 0x26, 0xe6, 0x3b, 0xce, 0x4e, 0xc9, 0xf9, 0x0f, 0x38, 0x90, 0x26,
+        0x87, 0x65, 0x36, 0x9a, 0xea, 0x6a, 0xfe, 0xb1, 0xdb, 0x46, 0xdf, 0x14,
+        0xfd, 0x13, 0x53, 0xfb, 0x5b, 0x35, 0x6e, 0xe7, 0xd5, 0xd8, 0x39, 0xf7,
+        0x2d, 0xb9 };
+    static unsigned char coeff2_data[] = { 0x01, 0xba, 0x66, 0x0a, 0xa2, 0x86, 0xc0, 0x57, 0x7f, 0x4e, 0x68, 0xb1,
+        0x86, 0x63, 0x23, 0x5b, 0x0e, 0xeb, 0x93, 0x42, 0xd1, 0xaa, 0x15, 0x13,
+        0xcc, 0x29, 0x71, 0x8a, 0xb0, 0xe0, 0xc9, 0x67, 0xde, 0x1a, 0x7c, 0x1a,
+        0xef, 0xa7, 0x08, 0x85, 0xb3, 0xae, 0x98, 0x99, 0xde, 0xaf, 0x09, 0x38,
+        0xfc, 0x46, 0x29, 0x5f, 0x4f, 0x7e, 0x01, 0x6c, 0x50, 0x13, 0x95, 0x91,
+        0x4c, 0x0f, 0x00, 0xba, 0xca, 0x40, 0xa3, 0xd0, 0x58, 0xb6, 0x62, 0x4c,
+        0xd1, 0xb6, 0xd3, 0x29, 0x5d, 0x82, 0xb3, 0x3d, 0x61, 0xbe, 0x5d, 0xf0,
+        0x4b, 0xf4 };
 
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || !TEST_ptr(n = BN_bin2bn(n_data, sizeof(n_data), NULL))
@@ -788,13 +773,13 @@ static int test_fromdata_rsa_derive_from_pq_multiprime(void)
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_E, e))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_D, d))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_FACTOR1,
-                                             p))
+            p))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_FACTOR2,
-                                             q))
+            q))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_RSA_FACTOR3,
-                                             p2))
+            p2))
         || !TEST_true(OSSL_PARAM_BLD_push_int(bld,
-                                              OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ, 1))
+            OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ, 1))
         || !TEST_ptr(fromdata_params = OSSL_PARAM_BLD_to_param(bld)))
         goto err;
 
@@ -858,7 +843,7 @@ static int test_evp_pkey_get_bn_param_large(void)
         0x1, 0x00, 0x01
     };
     static const unsigned char d_data[] = {
-       0x99, 0x33, 0x13, 0x7b
+        0x99, 0x33, 0x13, 0x7b
     };
 
     /* N is a large buffer */
@@ -875,13 +860,14 @@ static int test_evp_pkey_get_bn_param_large(void)
         || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL))
         || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, &pk, EVP_PKEY_KEYPAIR,
-                                          fromdata_params), 1)
+                            fromdata_params),
+            1)
         || !TEST_ptr(key_ctx = EVP_PKEY_CTX_new_from_pkey(NULL, pk, ""))
         || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_RSA_N, &n_out))
         || !TEST_BN_eq(n, n_out))
         goto err;
     ret = 1;
- err:
+err:
     BN_free(n_out);
     BN_free(n);
     BN_free(e);
@@ -894,7 +880,6 @@ static int test_evp_pkey_get_bn_param_large(void)
     return ret;
 }
 
-
 #ifndef OPENSSL_NO_DH
 static int test_fromdata_dh_named_group(void)
 {
@@ -917,9 +902,34 @@ static int test_fromdata_dh_named_group(void)
      *                 -pkeyopt priv_len:224 -text
      */
     static const unsigned char priv_data[] = {
-        0x88, 0x85, 0xe7, 0x9f, 0xee, 0x6d, 0xc5, 0x7c, 0x78, 0xaf, 0x63, 0x5d,
-        0x38, 0x2a, 0xd0, 0xed, 0x56, 0x4b, 0x47, 0x21, 0x2b, 0xfa, 0x55, 0xfa,
-        0x87, 0xe8, 0xa9, 0x7b,
+        0x88,
+        0x85,
+        0xe7,
+        0x9f,
+        0xee,
+        0x6d,
+        0xc5,
+        0x7c,
+        0x78,
+        0xaf,
+        0x63,
+        0x5d,
+        0x38,
+        0x2a,
+        0xd0,
+        0xed,
+        0x56,
+        0x4b,
+        0x47,
+        0x21,
+        0x2b,
+        0xfa,
+        0x55,
+        0xfa,
+        0x87,
+        0xe8,
+        0xa9,
+        0x7b,
     };
     static const unsigned char pub_data[] = {
         0x00, 0xd6, 0x2d, 0x77, 0xe0, 0xd3, 0x7d, 0xf8, 0xeb, 0x98, 0x50, 0xa1,
@@ -952,10 +962,10 @@ static int test_fromdata_dh_named_group(void)
         || !TEST_ptr(pub = BN_bin2bn(pub_data, sizeof(pub_data), NULL))
         || !TEST_ptr(priv = BN_bin2bn(priv_data, sizeof(priv_data), NULL))
         || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld,
-                                                      OSSL_PKEY_PARAM_GROUP_NAME,
-                                                      group_name, 0))
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            group_name, 0))
         || !TEST_true(OSSL_PARAM_BLD_push_long(bld, OSSL_PKEY_PARAM_DH_PRIV_LEN,
-                                               priv_len))
+            priv_len))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PUB_KEY, pub))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY, priv))
         || !TEST_ptr(fromdata_params = OSSL_PARAM_BLD_to_param(bld)))
@@ -966,7 +976,8 @@ static int test_fromdata_dh_named_group(void)
 
     if (!TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, &pk, EVP_PKEY_KEYPAIR,
-                                          fromdata_params), 1))
+                            fromdata_params),
+            1))
         goto err;
 
     /*
@@ -975,29 +986,29 @@ static int test_fromdata_dh_named_group(void)
      * NUL byte.
      */
     if (!TEST_true(EVP_PKEY_get_utf8_string_param(pk,
-                                                  OSSL_PKEY_PARAM_GROUP_NAME,
-                                                  NULL, sizeof(name_out),
-                                                  &len))
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            NULL, sizeof(name_out),
+            &len))
         || !TEST_size_t_eq(len, sizeof(group_name) - 1)
         /* Just enough space to hold the group name and a terminating NUL */
         || !TEST_true(EVP_PKEY_get_utf8_string_param(pk,
-                                                     OSSL_PKEY_PARAM_GROUP_NAME,
-                                                     name_out,
-                                                     sizeof(group_name),
-                                                     &len))
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            name_out,
+            sizeof(group_name),
+            &len))
         || !TEST_size_t_eq(len, sizeof(group_name) - 1)
         /* Too small buffer to hold the terminating NUL byte */
         || !TEST_false(EVP_PKEY_get_utf8_string_param(pk,
-                                                      OSSL_PKEY_PARAM_GROUP_NAME,
-                                                      name_out,
-                                                      sizeof(group_name) - 1,
-                                                      &len))
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            name_out,
+            sizeof(group_name) - 1,
+            &len))
         /* Too small buffer to hold the whole group name, even! */
         || !TEST_false(EVP_PKEY_get_utf8_string_param(pk,
-                                                      OSSL_PKEY_PARAM_GROUP_NAME,
-                                                      name_out,
-                                                      sizeof(group_name) - 2,
-                                                      &len)))
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            name_out,
+            sizeof(group_name) - 2,
+            &len)))
         goto err;
 
     for (;;) {
@@ -1009,17 +1020,17 @@ static int test_fromdata_dh_named_group(void)
             goto err;
 
         if (!TEST_true(EVP_PKEY_get_utf8_string_param(pk,
-                                                      OSSL_PKEY_PARAM_GROUP_NAME,
-                                                      name_out,
-                                                      sizeof(name_out),
-                                                      &len))
+                OSSL_PKEY_PARAM_GROUP_NAME,
+                name_out,
+                sizeof(name_out),
+                &len))
             || !TEST_str_eq(name_out, group_name)
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_PUB_KEY,
-                                                &pub_out))
+                &pub_out))
 
             || !TEST_BN_eq(pub, pub_out)
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_PRIV_KEY,
-                                                &priv_out))
+                &priv_out))
             || !TEST_BN_eq(priv, priv_out)
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_FFC_P, &p))
             || !TEST_BN_eq(&ossl_bignum_ffdhe2048_p, p)
@@ -1028,23 +1039,23 @@ static int test_fromdata_dh_named_group(void)
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_FFC_G, &g))
             || !TEST_BN_eq(&ossl_bignum_const_2, g)
             || !TEST_false(EVP_PKEY_get_bn_param(pk,
-                                                 OSSL_PKEY_PARAM_FFC_COFACTOR,
-                                                 &j))
+                OSSL_PKEY_PARAM_FFC_COFACTOR,
+                &j))
             || !TEST_ptr_null(j)
             || !TEST_false(EVP_PKEY_get_octet_string_param(pk,
-                                                           OSSL_PKEY_PARAM_FFC_SEED,
-                                                           seed_out,
-                                                           sizeof(seed_out),
-                                                           &len))
+                OSSL_PKEY_PARAM_FFC_SEED,
+                seed_out,
+                sizeof(seed_out),
+                &len))
             || !TEST_true(EVP_PKEY_get_int_param(pk, OSSL_PKEY_PARAM_FFC_GINDEX,
-                                                 &gindex))
+                &gindex))
             || !TEST_int_eq(gindex, -1)
             || !TEST_true(EVP_PKEY_get_int_param(pk, OSSL_PKEY_PARAM_FFC_H,
-                                                 &hindex))
+                &hindex))
             || !TEST_int_eq(hindex, 0)
             || !TEST_true(EVP_PKEY_get_int_param(pk,
-                                                 OSSL_PKEY_PARAM_FFC_PCOUNTER,
-                                                 &pcounter))
+                OSSL_PKEY_PARAM_FFC_PCOUNTER,
+                &pcounter))
             || !TEST_int_eq(pcounter, -1))
             goto err;
         BN_free(p);
@@ -1078,7 +1089,7 @@ static int test_fromdata_dh_named_group(void)
         copy_pk = NULL;
 
         ret = test_print_key_using_pem("DH", pk)
-              && test_print_key_using_encoder("DH", pk);
+            && test_print_key_using_encoder("DH", pk);
 
         if (!ret || dup_pk != NULL)
             break;
@@ -1131,46 +1142,70 @@ static int test_fromdata_dh_fips186_4(void)
      *                 -pkeyopt group:ffdhe2048 -pkeyopt priv_len:224 -text
      */
     static const unsigned char priv_data[] = {
-       0x88, 0x85, 0xe7, 0x9f, 0xee, 0x6d, 0xc5, 0x7c, 0x78, 0xaf, 0x63, 0x5d,
-       0x38, 0x2a, 0xd0, 0xed, 0x56, 0x4b, 0x47, 0x21, 0x2b, 0xfa, 0x55, 0xfa,
-       0x87, 0xe8, 0xa9, 0x7b,
+        0x88,
+        0x85,
+        0xe7,
+        0x9f,
+        0xee,
+        0x6d,
+        0xc5,
+        0x7c,
+        0x78,
+        0xaf,
+        0x63,
+        0x5d,
+        0x38,
+        0x2a,
+        0xd0,
+        0xed,
+        0x56,
+        0x4b,
+        0x47,
+        0x21,
+        0x2b,
+        0xfa,
+        0x55,
+        0xfa,
+        0x87,
+        0xe8,
+        0xa9,
+        0x7b,
     };
     static const unsigned char pub_data[] = {
-       0xd6, 0x2d, 0x77, 0xe0, 0xd3, 0x7d, 0xf8, 0xeb, 0x98, 0x50, 0xa1, 0x82,
-       0x22, 0x65, 0xd5, 0xd9, 0xfe, 0xc9, 0x3f, 0xbe, 0x16, 0x83, 0xbd, 0x33,
-       0xe9, 0xc6, 0x93, 0xcf, 0x08, 0xaf, 0x83, 0xfa, 0x80, 0x8a, 0x6c, 0x64,
-       0xdf, 0x70, 0x64, 0xd5, 0x0a, 0x7c, 0x5a, 0x72, 0xda, 0x66, 0xe6, 0xf9,
-       0xf5, 0x31, 0x21, 0x92, 0xb0, 0x60, 0x1a, 0xb5, 0xd3, 0xf0, 0xa5, 0xfa,
-       0x48, 0x95, 0x2e, 0x38, 0xd9, 0xc5, 0xe6, 0xda, 0xfb, 0x6c, 0x03, 0x9d,
-       0x4b, 0x69, 0xb7, 0x95, 0xe4, 0x5c, 0xc0, 0x93, 0x4f, 0x48, 0xd9, 0x7e,
-       0x06, 0x22, 0xb2, 0xde, 0xf3, 0x79, 0x24, 0xed, 0xe1, 0xd1, 0x4a, 0x57,
-       0xf1, 0x40, 0x86, 0x70, 0x42, 0x25, 0xc5, 0x27, 0x68, 0xc9, 0xfa, 0xe5,
-       0x8e, 0x62, 0x7e, 0xff, 0x49, 0x6c, 0x5b, 0xb5, 0xba, 0xf9, 0xef, 0x9a,
-       0x1a, 0x10, 0xd4, 0x81, 0x53, 0xcf, 0x83, 0x04, 0x18, 0x1c, 0xe1, 0xdb,
-       0xe1, 0x65, 0xa9, 0x7f, 0xe1, 0x33, 0xeb, 0xc3, 0x4f, 0xe3, 0xb7, 0x22,
-       0xf7, 0x1c, 0x09, 0x4f, 0xed, 0xc6, 0x07, 0x8e, 0x78, 0x05, 0x8f, 0x7c,
-       0x96, 0xd9, 0x12, 0xe0, 0x81, 0x74, 0x1a, 0xe9, 0x13, 0xc0, 0x20, 0x82,
-       0x65, 0xbb, 0x42, 0x3b, 0xed, 0x08, 0x6a, 0x84, 0x4f, 0xea, 0x77, 0x14,
-       0x32, 0xf9, 0xed, 0xc2, 0x12, 0xd6, 0xc5, 0xc6, 0xb3, 0xe5, 0xf2, 0x6e,
-       0xf6, 0x16, 0x7f, 0x37, 0xde, 0xbc, 0x09, 0xc7, 0x06, 0x6b, 0x12, 0xbc,
-       0xad, 0x2d, 0x49, 0x25, 0xd5, 0xdc, 0xf4, 0x18, 0x14, 0xd2, 0xf0, 0xf1,
-       0x1d, 0x1f, 0x3a, 0xaa, 0x15, 0x55, 0xbb, 0x0d, 0x7f, 0xbe, 0x67, 0xa1,
-       0xa7, 0xf0, 0xaa, 0xb3, 0xfb, 0x41, 0x82, 0x39, 0x49, 0x93, 0xbc, 0xa8,
-       0xee, 0x72, 0x13, 0x45, 0x65, 0x15, 0x42, 0x17, 0xaa, 0xd8, 0xab, 0xcf,
-       0x33, 0x42, 0x83, 0x42
+        0xd6, 0x2d, 0x77, 0xe0, 0xd3, 0x7d, 0xf8, 0xeb, 0x98, 0x50, 0xa1, 0x82,
+        0x22, 0x65, 0xd5, 0xd9, 0xfe, 0xc9, 0x3f, 0xbe, 0x16, 0x83, 0xbd, 0x33,
+        0xe9, 0xc6, 0x93, 0xcf, 0x08, 0xaf, 0x83, 0xfa, 0x80, 0x8a, 0x6c, 0x64,
+        0xdf, 0x70, 0x64, 0xd5, 0x0a, 0x7c, 0x5a, 0x72, 0xda, 0x66, 0xe6, 0xf9,
+        0xf5, 0x31, 0x21, 0x92, 0xb0, 0x60, 0x1a, 0xb5, 0xd3, 0xf0, 0xa5, 0xfa,
+        0x48, 0x95, 0x2e, 0x38, 0xd9, 0xc5, 0xe6, 0xda, 0xfb, 0x6c, 0x03, 0x9d,
+        0x4b, 0x69, 0xb7, 0x95, 0xe4, 0x5c, 0xc0, 0x93, 0x4f, 0x48, 0xd9, 0x7e,
+        0x06, 0x22, 0xb2, 0xde, 0xf3, 0x79, 0x24, 0xed, 0xe1, 0xd1, 0x4a, 0x57,
+        0xf1, 0x40, 0x86, 0x70, 0x42, 0x25, 0xc5, 0x27, 0x68, 0xc9, 0xfa, 0xe5,
+        0x8e, 0x62, 0x7e, 0xff, 0x49, 0x6c, 0x5b, 0xb5, 0xba, 0xf9, 0xef, 0x9a,
+        0x1a, 0x10, 0xd4, 0x81, 0x53, 0xcf, 0x83, 0x04, 0x18, 0x1c, 0xe1, 0xdb,
+        0xe1, 0x65, 0xa9, 0x7f, 0xe1, 0x33, 0xeb, 0xc3, 0x4f, 0xe3, 0xb7, 0x22,
+        0xf7, 0x1c, 0x09, 0x4f, 0xed, 0xc6, 0x07, 0x8e, 0x78, 0x05, 0x8f, 0x7c,
+        0x96, 0xd9, 0x12, 0xe0, 0x81, 0x74, 0x1a, 0xe9, 0x13, 0xc0, 0x20, 0x82,
+        0x65, 0xbb, 0x42, 0x3b, 0xed, 0x08, 0x6a, 0x84, 0x4f, 0xea, 0x77, 0x14,
+        0x32, 0xf9, 0xed, 0xc2, 0x12, 0xd6, 0xc5, 0xc6, 0xb3, 0xe5, 0xf2, 0x6e,
+        0xf6, 0x16, 0x7f, 0x37, 0xde, 0xbc, 0x09, 0xc7, 0x06, 0x6b, 0x12, 0xbc,
+        0xad, 0x2d, 0x49, 0x25, 0xd5, 0xdc, 0xf4, 0x18, 0x14, 0xd2, 0xf0, 0xf1,
+        0x1d, 0x1f, 0x3a, 0xaa, 0x15, 0x55, 0xbb, 0x0d, 0x7f, 0xbe, 0x67, 0xa1,
+        0xa7, 0xf0, 0xaa, 0xb3, 0xfb, 0x41, 0x82, 0x39, 0x49, 0x93, 0xbc, 0xa8,
+        0xee, 0x72, 0x13, 0x45, 0x65, 0x15, 0x42, 0x17, 0xaa, 0xd8, 0xab, 0xcf,
+        0x33, 0x42, 0x83, 0x42
     };
     static const char group_name[] = "ffdhe2048";
     static const long priv_len = 224;
 
-
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || !TEST_ptr(pub = BN_bin2bn(pub_data, sizeof(pub_data), NULL))
         || !TEST_ptr(priv = BN_bin2bn(priv_data, sizeof(priv_data), NULL))
         || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld,
-                                                      OSSL_PKEY_PARAM_GROUP_NAME,
-                                                      group_name, 0))
+            OSSL_PKEY_PARAM_GROUP_NAME,
+            group_name, 0))
         || !TEST_true(OSSL_PARAM_BLD_push_long(bld, OSSL_PKEY_PARAM_DH_PRIV_LEN,
-                                               priv_len))
+            priv_len))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PUB_KEY, pub))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY, priv))
         || !TEST_ptr(fromdata_params = OSSL_PARAM_BLD_to_param(bld)))
@@ -1181,7 +1216,8 @@ static int test_fromdata_dh_fips186_4(void)
 
     if (!TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, &pk, EVP_PKEY_KEYPAIR,
-                                          fromdata_params), 1))
+                            fromdata_params),
+            1))
         goto err;
 
     for (;;) {
@@ -1193,16 +1229,16 @@ static int test_fromdata_dh_fips186_4(void)
             goto err;
 
         if (!TEST_true(EVP_PKEY_get_utf8_string_param(pk,
-                                                      OSSL_PKEY_PARAM_GROUP_NAME,
-                                                      name_out,
-                                                      sizeof(name_out),
-                                                      &len))
+                OSSL_PKEY_PARAM_GROUP_NAME,
+                name_out,
+                sizeof(name_out),
+                &len))
             || !TEST_str_eq(name_out, group_name)
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_PUB_KEY,
-                                                &pub_out))
+                &pub_out))
             || !TEST_BN_eq(pub, pub_out)
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_PRIV_KEY,
-                                                &priv_out))
+                &priv_out))
             || !TEST_BN_eq(priv, priv_out)
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_FFC_P, &p))
             || !TEST_BN_eq(&ossl_bignum_ffdhe2048_p, p)
@@ -1211,24 +1247,24 @@ static int test_fromdata_dh_fips186_4(void)
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_FFC_G, &g))
             || !TEST_BN_eq(&ossl_bignum_const_2, g)
             || !TEST_false(EVP_PKEY_get_bn_param(pk,
-                                                 OSSL_PKEY_PARAM_FFC_COFACTOR,
-                                                 &j))
+                OSSL_PKEY_PARAM_FFC_COFACTOR,
+                &j))
             || !TEST_ptr_null(j)
             || !TEST_false(EVP_PKEY_get_octet_string_param(pk,
-                                                           OSSL_PKEY_PARAM_FFC_SEED,
-                                                           seed_out,
-                                                           sizeof(seed_out),
-                                                           &len))
+                OSSL_PKEY_PARAM_FFC_SEED,
+                seed_out,
+                sizeof(seed_out),
+                &len))
             || !TEST_true(EVP_PKEY_get_int_param(pk,
-                                                 OSSL_PKEY_PARAM_FFC_GINDEX,
-                                                 &gindex))
+                OSSL_PKEY_PARAM_FFC_GINDEX,
+                &gindex))
             || !TEST_int_eq(gindex, -1)
             || !TEST_true(EVP_PKEY_get_int_param(pk, OSSL_PKEY_PARAM_FFC_H,
-                                                 &hindex))
+                &hindex))
             || !TEST_int_eq(hindex, 0)
             || !TEST_true(EVP_PKEY_get_int_param(pk,
-                                                 OSSL_PKEY_PARAM_FFC_PCOUNTER,
-                                                 &pcounter))
+                OSSL_PKEY_PARAM_FFC_PCOUNTER,
+                &pcounter))
             || !TEST_int_eq(pcounter, -1))
             goto err;
         BN_free(p);
@@ -1256,7 +1292,7 @@ static int test_fromdata_dh_fips186_4(void)
         key_ctx = NULL;
 
         ret = test_print_key_using_pem("DH", pk)
-              && test_print_key_using_encoder("DH", pk);
+            && test_print_key_using_encoder("DH", pk);
 
         if (!ret || dup_pk != NULL)
             break;
@@ -1289,18 +1325,16 @@ static int test_fromdata_dh_fips186_4(void)
 
 #endif
 
-
-
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 /* Array indexes used in test_fromdata_ecx */
-# define PRIV_KEY        0
-# define PUB_KEY         1
+#define PRIV_KEY 0
+#define PUB_KEY 1
 
-# define X25519_IDX      0
-# define X448_IDX        1
-# define ED25519_IDX     2
-# define ED448_IDX       3
+#define X25519_IDX 0
+#define X448_IDX 1
+#define ED25519_IDX 2
+#define ED448_IDX 3
 
 /*
  * tst uses indexes 0 ... (3 * 4 - 1)
@@ -1329,16 +1363,13 @@ static int test_fromdata_ecx(int tst)
                 0x77, 0x07, 0x6d, 0x0a, 0x73, 0x18, 0xa5, 0x7d, 0x3c, 0x16,
                 0xc1, 0x72, 0x51, 0xb2, 0x66, 0x45, 0xdf, 0x4c, 0x2f, 0x87,
                 0xeb, 0xc0, 0x99, 0x2a, 0xb1, 0x77, 0xfb, 0xa5, 0x1d, 0xb9,
-                0x2c, 0x2a
-            },
+                0x2c, 0x2a },
             /* Public Key */
             {
                 0x85, 0x20, 0xf0, 0x09, 0x89, 0x30, 0xa7, 0x54, 0x74, 0x8b,
                 0x7d, 0xdc, 0xb4, 0x3e, 0xf7, 0x5a, 0x0d, 0xbf, 0x3a, 0x0d,
                 0x26, 0x38, 0x1a, 0xf4, 0xeb, 0xa4, 0xa9, 0x8e, 0xaa, 0x9b,
-                0x4e, 0x6a
-            }
-        },
+                0x4e, 0x6a } },
         /* X448: Keys from RFC 7748 6.2 */
         {
             /* Private Key */
@@ -1348,8 +1379,7 @@ static int test_fromdata_ecx(int tst)
                 0xe8, 0xbc, 0x55, 0x65, 0xd4, 0x98, 0xc2, 0x8d, 0xd9, 0xc9,
                 0xba, 0xf5, 0x74, 0xa9, 0x41, 0x97, 0x44, 0x89, 0x73, 0x91,
                 0x00, 0x63, 0x82, 0xa6, 0xf1, 0x27, 0xab, 0x1d, 0x9a, 0xc2,
-                0xd8, 0xc0, 0xa5, 0x98, 0x72, 0x6b
-            },
+                0xd8, 0xc0, 0xa5, 0x98, 0x72, 0x6b },
             /* Public Key */
             {
                 0x9b, 0x08, 0xf7, 0xcc, 0x31, 0xb7, 0xe3, 0xe6, 0x7d, 0x22,
@@ -1357,9 +1387,7 @@ static int test_fromdata_ecx(int tst)
                 0x3d, 0xe0, 0x9c, 0x63, 0xfa, 0xa7, 0x3d, 0x2c, 0x22, 0xc5,
                 0xd9, 0xbb, 0xc8, 0x36, 0x64, 0x72, 0x41, 0xd9, 0x53, 0xd4,
                 0x0c, 0x5b, 0x12, 0xda, 0x88, 0x12, 0x0d, 0x53, 0x17, 0x7f,
-                0x80, 0xe5, 0x32, 0xc4, 0x1f, 0xa0
-            }
-        },
+                0x80, 0xe5, 0x32, 0xc4, 0x1f, 0xa0 } },
         /* ED25519: Keys from RFC 8032 */
         {
             /* Private Key */
@@ -1367,16 +1395,13 @@ static int test_fromdata_ecx(int tst)
                 0x9d, 0x61, 0xb1, 0x9d, 0xef, 0xfd, 0x5a, 0x60, 0xba, 0x84,
                 0x4a, 0xf4, 0x92, 0xec, 0x2c, 0xc4, 0x44, 0x49, 0xc5, 0x69,
                 0x7b, 0x32, 0x69, 0x19, 0x70, 0x3b, 0xac, 0x03, 0x1c, 0xae,
-                0x7f, 0x60
-            },
+                0x7f, 0x60 },
             /* Public Key */
             {
                 0xd7, 0x5a, 0x98, 0x01, 0x82, 0xb1, 0x0a, 0xb7, 0xd5, 0x4b,
                 0xfe, 0xd3, 0xc9, 0x64, 0x07, 0x3a, 0x0e, 0xe1, 0x72, 0xf3,
                 0xda, 0xa6, 0x23, 0x25, 0xaf, 0x02, 0x1a, 0x68, 0xf7, 0x07,
-                0x51, 0x1a
-            }
-        },
+                0x51, 0x1a } },
         /* ED448: Keys from RFC 8032 */
         {
             /* Private Key */
@@ -1386,8 +1411,7 @@ static int test_fromdata_ecx(int tst)
                 0xdd, 0xfa, 0x8c, 0x9f, 0x63, 0xc9, 0x96, 0x0e, 0xf6, 0xe3,
                 0x48, 0xa3, 0x52, 0x8c, 0x8a, 0x3f, 0xcc, 0x2f, 0x04, 0x4e,
                 0x39, 0xa3, 0xfc, 0x5b, 0x94, 0x49, 0x2f, 0x8f, 0x03, 0x2e,
-                0x75, 0x49, 0xa2, 0x00, 0x98, 0xf9, 0x5b
-            },
+                0x75, 0x49, 0xa2, 0x00, 0x98, 0xf9, 0x5b },
             /* Public Key */
             {
                 0x5f, 0xd7, 0x44, 0x9b, 0x59, 0xb4, 0x61, 0xfd, 0x2c, 0xe7,
@@ -1395,44 +1419,42 @@ static int test_fromdata_ecx(int tst)
                 0x85, 0xa7, 0x0e, 0x1f, 0x8a, 0x0e, 0xa7, 0x5d, 0x80, 0xe9,
                 0x67, 0x78, 0xed, 0xf1, 0x24, 0x76, 0x9b, 0x46, 0xc7, 0x06,
                 0x1b, 0xd6, 0x78, 0x3d, 0xf1, 0xe5, 0x0f, 0x6c, 0xd1, 0xfa,
-                0x1a, 0xbe, 0xaf, 0xe8, 0x25, 0x61, 0x80
-            }
-        }
+                0x1a, 0xbe, 0xaf, 0xe8, 0x25, 0x61, 0x80 } }
     };
     OSSL_PARAM x25519_fromdata_params[] = {
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY,
-                                key_numbers[X25519_IDX][PRIV_KEY],
-                                X25519_KEYLEN),
+            key_numbers[X25519_IDX][PRIV_KEY],
+            X25519_KEYLEN),
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY,
-                                key_numbers[X25519_IDX][PUB_KEY],
-                                X25519_KEYLEN),
+            key_numbers[X25519_IDX][PUB_KEY],
+            X25519_KEYLEN),
         OSSL_PARAM_END
     };
     OSSL_PARAM x448_fromdata_params[] = {
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY,
-                                key_numbers[X448_IDX][PRIV_KEY],
-                                X448_KEYLEN),
+            key_numbers[X448_IDX][PRIV_KEY],
+            X448_KEYLEN),
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY,
-                                key_numbers[X448_IDX][PUB_KEY],
-                                X448_KEYLEN),
+            key_numbers[X448_IDX][PUB_KEY],
+            X448_KEYLEN),
         OSSL_PARAM_END
     };
     OSSL_PARAM ed25519_fromdata_params[] = {
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY,
-                                key_numbers[ED25519_IDX][PRIV_KEY],
-                                ED25519_KEYLEN),
+            key_numbers[ED25519_IDX][PRIV_KEY],
+            ED25519_KEYLEN),
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY,
-                                key_numbers[ED25519_IDX][PUB_KEY],
-                                ED25519_KEYLEN),
+            key_numbers[ED25519_IDX][PUB_KEY],
+            ED25519_KEYLEN),
         OSSL_PARAM_END
     };
     OSSL_PARAM ed448_fromdata_params[] = {
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PRIV_KEY,
-                                key_numbers[ED448_IDX][PRIV_KEY],
-                                ED448_KEYLEN),
+            key_numbers[ED448_IDX][PRIV_KEY],
+            ED448_KEYLEN),
         OSSL_PARAM_octet_string(OSSL_PKEY_PARAM_PUB_KEY,
-                                key_numbers[ED448_IDX][PUB_KEY],
-                                ED448_KEYLEN),
+            key_numbers[ED448_IDX][PUB_KEY],
+            ED448_KEYLEN),
         OSSL_PARAM_END
     };
     OSSL_PARAM *fromdata_params = NULL;
@@ -1492,7 +1514,8 @@ static int test_fromdata_ecx(int tst)
 
     if (!TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, &pk, EVP_PKEY_KEYPAIR,
-                                          fromdata_params), 1))
+                            fromdata_params),
+            1))
         goto err;
 
     for (;;) {
@@ -1509,17 +1532,17 @@ static int test_fromdata_ecx(int tst)
             if (!TEST_int_gt(EVP_PKEY_check(ctx2), 0))
                 goto err;
             if (!TEST_true(EVP_PKEY_get_octet_string_param(
-                               pk, orig_fromdata_params[PRIV_KEY].key,
-                               out_priv, sizeof(out_priv), &len))
+                    pk, orig_fromdata_params[PRIV_KEY].key,
+                    out_priv, sizeof(out_priv), &len))
                 || !TEST_mem_eq(out_priv, len,
-                                orig_fromdata_params[PRIV_KEY].data,
-                                orig_fromdata_params[PRIV_KEY].data_size)
+                    orig_fromdata_params[PRIV_KEY].data,
+                    orig_fromdata_params[PRIV_KEY].data_size)
                 || !TEST_true(EVP_PKEY_get_octet_string_param(
-                                  pk, orig_fromdata_params[PUB_KEY].key,
-                                  out_pub, sizeof(out_pub), &len))
+                    pk, orig_fromdata_params[PUB_KEY].key,
+                    out_pub, sizeof(out_pub), &len))
                 || !TEST_mem_eq(out_pub, len,
-                                orig_fromdata_params[PUB_KEY].data,
-                                orig_fromdata_params[PUB_KEY].data_size))
+                    orig_fromdata_params[PUB_KEY].data,
+                    orig_fromdata_params[PUB_KEY].data_size))
                 goto err;
         } else {
             /* The private key check should fail if there is only a public key */
@@ -1532,11 +1555,11 @@ static int test_fromdata_ecx(int tst)
         ctx2 = NULL;
 
         if (!TEST_ptr(copy_pk = EVP_PKEY_new())
-               /* This should succeed because there are no parameters to copy */
+            /* This should succeed because there are no parameters to copy */
             || !TEST_true(EVP_PKEY_copy_parameters(copy_pk, pk)))
             goto err;
         if (!TEST_ptr(ctx2 = EVP_PKEY_CTX_new_from_pkey(NULL, copy_pk, NULL))
-               /* This should fail because copy_pk has no pubkey */
+            /* This should fail because copy_pk has no pubkey */
             || !TEST_int_le(EVP_PKEY_public_check(ctx2), 0))
             goto err;
         EVP_PKEY_CTX_free(ctx2);
@@ -1548,7 +1571,7 @@ static int test_fromdata_ecx(int tst)
             ret = test_print_key_using_encoder_public(alg, pk);
         else
             ret = test_print_key_using_pem(alg, pk)
-                  && test_print_key_using_encoder(alg, pk);
+                && test_print_key_using_encoder(alg, pk);
 
         if (!ret || dup_pk != NULL)
             break;
@@ -1570,7 +1593,7 @@ static int test_fromdata_ecx(int tst)
 
     return ret;
 }
-# endif /* OPENSSL_NO_ECX */
+#endif /* OPENSSL_NO_ECX */
 
 static int test_fromdata_ec(void)
 {
@@ -1585,28 +1608,28 @@ static int test_fromdata_ec(void)
     const char *curve = "prime256v1";
     const char bad_curve[] = "nonexistent-curve";
     OSSL_PARAM nokey_params[2] = {
-       OSSL_PARAM_END,
-       OSSL_PARAM_END
+        OSSL_PARAM_END,
+        OSSL_PARAM_END
     };
     /* UNCOMPRESSED FORMAT */
     static const unsigned char ec_pub_keydata[] = {
-       POINT_CONVERSION_UNCOMPRESSED,
-       0x1b, 0x93, 0x67, 0x55, 0x1c, 0x55, 0x9f, 0x63,
-       0xd1, 0x22, 0xa4, 0xd8, 0xd1, 0x0a, 0x60, 0x6d,
-       0x02, 0xa5, 0x77, 0x57, 0xc8, 0xa3, 0x47, 0x73,
-       0x3a, 0x6a, 0x08, 0x28, 0x39, 0xbd, 0xc9, 0xd2,
-       0x80, 0xec, 0xe9, 0xa7, 0x08, 0x29, 0x71, 0x2f,
-       0xc9, 0x56, 0x82, 0xee, 0x9a, 0x85, 0x0f, 0x6d,
-       0x7f, 0x59, 0x5f, 0x8c, 0xd1, 0x96, 0x0b, 0xdf,
-       0x29, 0x3e, 0x49, 0x07, 0x88, 0x3f, 0x9a, 0x29
+        POINT_CONVERSION_UNCOMPRESSED,
+        0x1b, 0x93, 0x67, 0x55, 0x1c, 0x55, 0x9f, 0x63,
+        0xd1, 0x22, 0xa4, 0xd8, 0xd1, 0x0a, 0x60, 0x6d,
+        0x02, 0xa5, 0x77, 0x57, 0xc8, 0xa3, 0x47, 0x73,
+        0x3a, 0x6a, 0x08, 0x28, 0x39, 0xbd, 0xc9, 0xd2,
+        0x80, 0xec, 0xe9, 0xa7, 0x08, 0x29, 0x71, 0x2f,
+        0xc9, 0x56, 0x82, 0xee, 0x9a, 0x85, 0x0f, 0x6d,
+        0x7f, 0x59, 0x5f, 0x8c, 0xd1, 0x96, 0x0b, 0xdf,
+        0x29, 0x3e, 0x49, 0x07, 0x88, 0x3f, 0x9a, 0x29
     };
     /* SAME BUT COMPRESSED FORMAT */
     static const unsigned char ec_pub_keydata_compressed[] = {
-       POINT_CONVERSION_COMPRESSED+1,
-       0x1b, 0x93, 0x67, 0x55, 0x1c, 0x55, 0x9f, 0x63,
-       0xd1, 0x22, 0xa4, 0xd8, 0xd1, 0x0a, 0x60, 0x6d,
-       0x02, 0xa5, 0x77, 0x57, 0xc8, 0xa3, 0x47, 0x73,
-       0x3a, 0x6a, 0x08, 0x28, 0x39, 0xbd, 0xc9, 0xd2
+        POINT_CONVERSION_COMPRESSED + 1,
+        0x1b, 0x93, 0x67, 0x55, 0x1c, 0x55, 0x9f, 0x63,
+        0xd1, 0x22, 0xa4, 0xd8, 0xd1, 0x0a, 0x60, 0x6d,
+        0x02, 0xa5, 0x77, 0x57, 0xc8, 0xa3, 0x47, 0x73,
+        0x3a, 0x6a, 0x08, 0x28, 0x39, 0xbd, 0xc9, 0xd2
     };
     static const unsigned char ec_priv_keydata[] = {
         0x33, 0xd0, 0x43, 0x83, 0xa9, 0x89, 0x56, 0x03,
@@ -1626,15 +1649,15 @@ static int test_fromdata_ec(void)
     BIGNUM *b = NULL;
     BIGNUM *p = NULL;
 
-
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new()))
         goto err;
     if (!TEST_ptr(ec_priv_bn = BN_bin2bn(ec_priv_keydata,
-                                         sizeof(ec_priv_keydata), NULL)))
+                      sizeof(ec_priv_keydata), NULL)))
         goto err;
 
     if (OSSL_PARAM_BLD_push_utf8_string(bld, OSSL_PKEY_PARAM_GROUP_NAME,
-                                        curve, 0) <= 0)
+            curve, 0)
+        <= 0)
         goto err;
     /*
      * We intentionally provide the input point in compressed format,
@@ -1645,8 +1668,9 @@ static int test_fromdata_ec(void)
      * format.
      */
     if (OSSL_PARAM_BLD_push_octet_string(bld, OSSL_PKEY_PARAM_PUB_KEY,
-                                         ec_pub_keydata_compressed,
-                                         sizeof(ec_pub_keydata_compressed)) <= 0)
+            ec_pub_keydata_compressed,
+            sizeof(ec_pub_keydata_compressed))
+        <= 0)
         goto err;
     if (OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY, ec_priv_bn) <= 0)
         goto err;
@@ -1657,18 +1681,19 @@ static int test_fromdata_ec(void)
         goto err;
 
     /* try importing parameters with bad curve first */
-    nokey_params[0] =
-        OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
-                                         (char *)bad_curve, sizeof(bad_curve));
+    nokey_params[0] = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME,
+        (char *)bad_curve, sizeof(bad_curve));
     if (!TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, &pk, EVP_PKEY_KEY_PARAMETERS,
-                                          nokey_params), 0)
+                            nokey_params),
+            0)
         || !TEST_ptr_null(pk))
         goto err;
 
     if (!TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, &pk, EVP_PKEY_KEYPAIR,
-                                          fromdata_params), 1))
+                            fromdata_params),
+            1))
         goto err;
 
     for (;;) {
@@ -1687,11 +1712,11 @@ static int test_fromdata_ec(void)
 
         if (!TEST_ptr(gettable = EVP_PKEY_gettable_params(pk))
             || !TEST_ptr(OSSL_PARAM_locate_const(gettable,
-                                                 OSSL_PKEY_PARAM_GROUP_NAME))
+                OSSL_PKEY_PARAM_GROUP_NAME))
             || !TEST_ptr(OSSL_PARAM_locate_const(gettable,
-                                                 OSSL_PKEY_PARAM_PUB_KEY))
+                OSSL_PKEY_PARAM_PUB_KEY))
             || !TEST_ptr(OSSL_PARAM_locate_const(gettable,
-                                                 OSSL_PKEY_PARAM_PRIV_KEY)))
+                OSSL_PKEY_PARAM_PRIV_KEY)))
             goto err;
 
         if (!TEST_ptr(group = EC_GROUP_new_by_curve_name(OBJ_sn2nid(curve)))
@@ -1720,12 +1745,12 @@ static int test_fromdata_ec(void)
         group_b = NULL;
 
         if (!EVP_PKEY_get_utf8_string_param(pk, OSSL_PKEY_PARAM_GROUP_NAME,
-                                            out_curve_name,
-                                            sizeof(out_curve_name),
-                                            &len)
+                out_curve_name,
+                sizeof(out_curve_name),
+                &len)
             || !TEST_str_eq(out_curve_name, curve)
             || !EVP_PKEY_get_octet_string_param(pk, OSSL_PKEY_PARAM_PUB_KEY,
-                                            out_pub, sizeof(out_pub), &len)
+                out_pub, sizeof(out_pub), &len)
 
             /*
              * Our providers use uncompressed format by default if
@@ -1735,17 +1760,17 @@ static int test_fromdata_ec(void)
              */
             || !TEST_true(out_pub[0] == POINT_CONVERSION_UNCOMPRESSED)
             || !TEST_mem_eq(out_pub + 1, len - 1,
-                            ec_pub_keydata + 1, sizeof(ec_pub_keydata) - 1)
+                ec_pub_keydata + 1, sizeof(ec_pub_keydata) - 1)
 
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_PRIV_KEY,
-                                                &bn_priv))
+                &bn_priv))
             || !TEST_BN_eq(ec_priv_bn, bn_priv))
             goto err;
         BN_free(bn_priv);
         bn_priv = NULL;
 
         ret = test_print_key_using_pem(alg, pk)
-              && test_print_key_using_encoder(alg, pk);
+            && test_print_key_using_encoder(alg, pk);
 
         if (!ret || dup_pk != NULL)
             break;
@@ -1786,7 +1811,8 @@ static int test_ec_dup_no_operation(void)
     if (!TEST_ptr(pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL))
         || !TEST_int_gt(EVP_PKEY_paramgen_init(pctx), 0)
         || !TEST_int_gt(EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx,
-                        NID_X9_62_prime256v1), 0)
+                            NID_X9_62_prime256v1),
+            0)
         || !TEST_int_gt(EVP_PKEY_paramgen(pctx, &param), 0)
         || !TEST_ptr(param))
         goto err;
@@ -1819,7 +1845,8 @@ static int test_ec_dup_keygen_operation(void)
     if (!TEST_ptr(pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_EC, NULL))
         || !TEST_int_gt(EVP_PKEY_paramgen_init(pctx), 0)
         || !TEST_int_gt(EVP_PKEY_CTX_set_ec_paramgen_curve_nid(pctx,
-                        NID_X9_62_prime256v1), 0)
+                            NID_X9_62_prime256v1),
+            0)
         || !TEST_int_gt(EVP_PKEY_paramgen(pctx, &param), 0)
         || !TEST_ptr(param))
         goto err;
@@ -1973,18 +2000,18 @@ static int test_fromdata_dsa_fips186_4(void)
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_Q, q))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_FFC_G, g))
         || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                                                       OSSL_PKEY_PARAM_FFC_SEED,
-                                                       seed_data,
-                                                       sizeof(seed_data)))
+            OSSL_PKEY_PARAM_FFC_SEED,
+            seed_data,
+            sizeof(seed_data)))
         || !TEST_true(OSSL_PARAM_BLD_push_int(bld, OSSL_PKEY_PARAM_FFC_GINDEX,
-                                              gindex))
+            gindex))
         || !TEST_true(OSSL_PARAM_BLD_push_int(bld,
-                                              OSSL_PKEY_PARAM_FFC_PCOUNTER,
-                                              pcounter))
+            OSSL_PKEY_PARAM_FFC_PCOUNTER,
+            pcounter))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PUB_KEY,
-                                             pub))
+            pub))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, OSSL_PKEY_PARAM_PRIV_KEY,
-                                             priv))
+            priv))
         || !TEST_ptr(fromdata_params = OSSL_PARAM_BLD_to_param(bld)))
         goto err;
 
@@ -1993,7 +2020,8 @@ static int test_fromdata_dsa_fips186_4(void)
 
     if (!TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
         || !TEST_int_eq(EVP_PKEY_fromdata(ctx, &pk, EVP_PKEY_KEYPAIR,
-                                          fromdata_params), 1))
+                            fromdata_params),
+            1))
         goto err;
 
     for (;;) {
@@ -2005,44 +2033,44 @@ static int test_fromdata_dsa_fips186_4(void)
             goto err;
 
         if (!TEST_false(EVP_PKEY_get_utf8_string_param(pk,
-                                                       OSSL_PKEY_PARAM_GROUP_NAME,
-                                                       name_out,
-                                                       sizeof(name_out),
-                                                       &len))
+                OSSL_PKEY_PARAM_GROUP_NAME,
+                name_out,
+                sizeof(name_out),
+                &len))
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_PUB_KEY,
-                                                &pub_out))
+                &pub_out))
             || !TEST_BN_eq(pub, pub_out)
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_PRIV_KEY,
-                                                &priv_out))
+                &priv_out))
             || !TEST_BN_eq(priv, priv_out)
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_FFC_P,
-                                                &p_out))
+                &p_out))
             || !TEST_BN_eq(p, p_out)
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_FFC_Q,
-                                                &q_out))
+                &q_out))
             || !TEST_BN_eq(q, q_out)
             || !TEST_true(EVP_PKEY_get_bn_param(pk, OSSL_PKEY_PARAM_FFC_G,
-                                                &g_out))
+                &g_out))
             || !TEST_BN_eq(g, g_out)
             || !TEST_false(EVP_PKEY_get_bn_param(pk,
-                                                 OSSL_PKEY_PARAM_FFC_COFACTOR,
-                                                 &j_out))
+                OSSL_PKEY_PARAM_FFC_COFACTOR,
+                &j_out))
             || !TEST_ptr_null(j_out)
             || !TEST_true(EVP_PKEY_get_octet_string_param(pk,
-                                                          OSSL_PKEY_PARAM_FFC_SEED,
-                                                          seed_out,
-                                                          sizeof(seed_out),
-                                                          &len))
+                OSSL_PKEY_PARAM_FFC_SEED,
+                seed_out,
+                sizeof(seed_out),
+                &len))
             || !TEST_true(EVP_PKEY_get_int_param(pk,
-                                                 OSSL_PKEY_PARAM_FFC_GINDEX,
-                                                 &gindex_out))
+                OSSL_PKEY_PARAM_FFC_GINDEX,
+                &gindex_out))
             || !TEST_int_eq(gindex, gindex_out)
             || !TEST_true(EVP_PKEY_get_int_param(pk, OSSL_PKEY_PARAM_FFC_H,
-                                                 &hindex_out))
+                &hindex_out))
             || !TEST_int_eq(hindex_out, 0)
             || !TEST_true(EVP_PKEY_get_int_param(pk,
-                                                 OSSL_PKEY_PARAM_FFC_PCOUNTER,
-                                                 &pcounter_out))
+                OSSL_PKEY_PARAM_FFC_PCOUNTER,
+                &pcounter_out))
             || !TEST_int_eq(pcounter, pcounter_out))
             goto err;
         BN_free(p_out);
@@ -2076,7 +2104,7 @@ static int test_fromdata_dsa_fips186_4(void)
         copy_pk = NULL;
 
         ret = test_print_key_using_pem("DSA", pk)
-              && test_print_key_using_encoder("DSA", pk);
+            && test_print_key_using_encoder("DSA", pk);
 
         if (!ret || dup_pk != NULL)
             break;
@@ -2090,7 +2118,7 @@ static int test_fromdata_dsa_fips186_4(void)
             goto err;
     }
 
- err:
+err:
     OSSL_PARAM_free(fromdata_params);
     OSSL_PARAM_BLD_free(bld);
     BN_free(p);
@@ -2122,30 +2150,29 @@ static int test_check_dsa(void)
         || !TEST_int_le(EVP_PKEY_public_check(ctx), 0)
         || !TEST_int_le(EVP_PKEY_private_check(ctx), 0)
         || !TEST_int_le(EVP_PKEY_pairwise_check(ctx), 0))
-       goto err;
+        goto err;
 
     ret = 1;
- err:
+err:
     EVP_PKEY_CTX_free(ctx);
 
     return ret;
 }
 #endif /* OPENSSL_NO_DSA */
 
-
 static OSSL_PARAM *do_construct_hkdf_params(char *digest, char *key,
-                                            size_t keylen, char *salt)
+    size_t keylen, char *salt)
 {
     OSSL_PARAM *params = OPENSSL_malloc(sizeof(OSSL_PARAM) * 5);
     OSSL_PARAM *p = params;
 
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_DIGEST, digest, 0);
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_SALT,
-                                             salt, strlen(salt));
+        salt, strlen(salt));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_KDF_PARAM_KEY,
-                                             (unsigned char *)key, keylen);
+        (unsigned char *)key, keylen);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_KDF_PARAM_MODE,
-                                            "EXTRACT_ONLY", 0);
+        "EXTRACT_ONLY", 0);
     *p = OSSL_PARAM_construct_end();
 
     return params;
@@ -2159,7 +2186,7 @@ static int test_evp_pkey_ctx_dup_kdf(void)
     OSSL_PARAM *params = NULL;
 
     if (!TEST_ptr(params = do_construct_hkdf_params("sha256", "secret", 6,
-                                                    "salt")))
+                      "salt")))
         goto err;
     if (!TEST_ptr(pctx = EVP_PKEY_CTX_new_from_name(NULL, "HKDF", NULL)))
         goto err;
@@ -2180,6 +2207,53 @@ static int test_evp_pkey_ctx_dup_kdf(void)
     return ret;
 }
 
+static const char *name_dup_algs[] = {
+#ifndef OPENSSL_NO_ECX
+    "ED25519",
+#endif
+#ifndef OPENSSL_NO_ML_KEM
+    "ML-KEM-512",
+#endif
+#ifndef OPENSSL_NO_ML_DSA
+    "ML-DSA-44",
+#endif
+    NULL
+};
+
+static int test_name_dup(int idx)
+{
+    const char *alg = name_dup_algs[idx];
+    EVP_PKEY *key = NULL;
+    EVP_PKEY_CTX *factory = NULL, *ctx = NULL;
+    int i, ret = 0;
+
+    if (alg == NULL
+        || (factory = EVP_PKEY_CTX_new_from_name(NULL, alg, NULL)) == NULL)
+        return 1;
+    TEST_info("Testing fresh context dup for: %s", alg);
+
+    /* Run twice to check that *repeated* use works */
+    for (i = 0; i < 2; ++i) {
+        EVP_PKEY_CTX_free(ctx);
+        EVP_PKEY_free(key);
+        key = NULL;
+        if (!TEST_ptr(ctx = EVP_PKEY_CTX_dup(factory))
+            || !TEST_int_gt(EVP_PKEY_keygen_init(ctx), 0)
+            || !TEST_int_gt(EVP_PKEY_keygen(ctx, &key), 0)) {
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+    }
+    ret = 1;
+
+end:
+    EVP_PKEY_CTX_free(factory);
+    EVP_PKEY_CTX_free(ctx);
+    EVP_PKEY_free(key);
+
+    return ret;
+}
+
 int setup_tests(void)
 {
     if (!test_skip_common_options()) {
@@ -2191,6 +2265,7 @@ int setup_tests(void)
         return 0;
 
     ADD_TEST(test_evp_pkey_ctx_dup_kdf);
+    ADD_ALL_TESTS(test_name_dup, OSSL_NELEM(name_dup_algs));
     ADD_TEST(test_evp_pkey_get_bn_param_large);
     ADD_TEST(test_fromdata_rsa);
     ADD_TEST(test_fromdata_rsa_derive_from_pq_sp800);
@@ -2204,9 +2279,9 @@ int setup_tests(void)
     ADD_TEST(test_fromdata_dsa_fips186_4);
 #endif
 #ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
     ADD_ALL_TESTS(test_fromdata_ecx, 4 * 3);
-# endif
+#endif
     ADD_TEST(test_fromdata_ec);
     ADD_TEST(test_ec_dup_no_operation);
     ADD_TEST(test_ec_dup_keygen_operation);
diff --git a/test/evp_skey_test.c b/test/evp_skey_test.c
index b81df9c8f81ce..7fd70ca732db7 100644
--- a/test/evp_skey_test.c
+++ b/test/evp_skey_test.c
@@ -38,8 +38,22 @@ static int test_skey_cipher(void)
     EVP_CIPHER *fake_cipher = NULL;
     EVP_CIPHER_CTX *ctx = NULL;
     const unsigned char import_key[KEY_SIZE] = {
-        0x53, 0x4B, 0x45, 0x59, 0x53, 0x4B, 0x45, 0x59,
-        0x53, 0x4B, 0x45, 0x59, 0x53, 0x4B, 0x45, 0x59,
+        0x53,
+        0x4B,
+        0x45,
+        0x59,
+        0x53,
+        0x4B,
+        0x45,
+        0x59,
+        0x53,
+        0x4B,
+        0x45,
+        0x59,
+        0x53,
+        0x4B,
+        0x45,
+        0x59,
     };
     OSSL_PARAM params[3];
     OSSL_PARAM *export_params = NULL;
@@ -56,12 +70,12 @@ static int test_skey_cipher(void)
 
     /* Create EVP_SKEY */
     params[0] = OSSL_PARAM_construct_utf8_string(FAKE_CIPHER_PARAM_KEY_NAME,
-                                                 "fake key name", 0);
+        "fake key name", 0);
     params[1] = OSSL_PARAM_construct_octet_string(OSSL_SKEY_PARAM_RAW_BYTES,
-                                                  (void *)import_key, KEY_SIZE);
+        (void *)import_key, KEY_SIZE);
     params[2] = OSSL_PARAM_construct_end();
     key = EVP_SKEY_import(libctx, "fake_cipher", FAKE_CIPHER_FETCH_PROPS,
-                          OSSL_SKEYMGMT_SELECT_ALL, params);
+        OSSL_SKEYMGMT_SELECT_ALL, params);
     if (!TEST_ptr(key))
         goto end;
 
@@ -72,7 +86,8 @@ static int test_skey_cipher(void)
 
     /* Export params */
     if (!TEST_int_gt(EVP_SKEY_export(key, OSSL_SKEYMGMT_SELECT_SECRET_KEY,
-                                     ossl_pkey_todata_cb, &export_params), 0))
+                         ossl_pkey_todata_cb, &export_params),
+            0))
         goto end;
 
     /* Export raw key */
@@ -120,7 +135,7 @@ static int test_aes_raw_skey(void)
         return 0;
 
     memset(encrypted_skey, 0, sizeof(encrypted_skey));
-    memset(encrypted_raw,  0, sizeof(encrypted_raw));
+    memset(encrypted_raw, 0, sizeof(encrypted_raw));
     memset(aes_key, 1, KEY_SIZE);
     memset(aes_iv, 2, IV_SIZE);
 
@@ -170,8 +185,8 @@ static int test_aes_raw_skey(void)
 
 #ifndef OPENSSL_NO_DES
 /* DES is used to test a "skey-unware" cipher provider */
-# define DES_KEY_SIZE 24
-# define DES_IV_SIZE 8
+#define DES_KEY_SIZE 24
+#define DES_IV_SIZE 8
 static int test_des_raw_skey(void)
 {
     const unsigned char data[DATA_SIZE] = {
@@ -196,7 +211,7 @@ static int test_des_raw_skey(void)
         return 0;
 
     memset(encrypted_skey, 0, sizeof(encrypted_skey));
-    memset(encrypted_raw,  0, sizeof(encrypted_raw));
+    memset(encrypted_raw, 0, sizeof(encrypted_raw));
     memset(des_key, 1, DES_KEY_SIZE);
     memset(des_iv, 2, DES_IV_SIZE);
 
@@ -207,7 +222,7 @@ static int test_des_raw_skey(void)
 
     /* Create EVP_SKEY */
     skey = EVP_SKEY_import_raw_key(libctx, "DES", des_key, sizeof(des_key),
-                                   NULL);
+        NULL);
     if (!TEST_ptr(skey))
         goto end;
 
@@ -232,7 +247,7 @@ static int test_des_raw_skey(void)
         || !TEST_int_gt(EVP_CipherUpdate(ctx, encrypted_raw, &enc_len, data, DATA_SIZE), 0)
         || !TEST_int_gt(EVP_CipherFinal(ctx, encrypted_raw + enc_len, &fin_len), 0)
         || !TEST_mem_eq(encrypted_skey, DATA_SIZE + DES_IV_SIZE, encrypted_raw,
-                        DATA_SIZE + DES_IV_SIZE))
+            DATA_SIZE + DES_IV_SIZE))
         goto end;
 
     ret = 1;
diff --git a/test/evp_test.c b/test/evp_test.c
index e34ea1d96e676..582328c877e01 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -39,14 +39,14 @@ typedef struct evp_test_method_st EVP_TEST_METHOD;
 
 /* Structure holding test information */
 typedef struct evp_test_st {
-    STANZA s;                     /* Common test stanza */
+    STANZA s; /* Common test stanza */
     char *name;
-    int skip;                     /* Current test should be skipped */
-    const EVP_TEST_METHOD *meth;  /* method for this test */
-    const char *err, *aux_err;    /* Error string for test */
-    char *expected_err;           /* Expected error value of test */
-    char *reason;                 /* Expected error reason string */
-    void *data;                   /* test specific data */
+    int skip; /* Current test should be skipped */
+    const EVP_TEST_METHOD *meth; /* method for this test */
+    const char *err, *aux_err; /* Error string for test */
+    char *expected_err; /* Expected error value of test */
+    char *reason; /* Expected error reason string */
+    void *data; /* test specific data */
     int expect_unapproved;
 } EVP_TEST;
 
@@ -55,13 +55,13 @@ struct evp_test_method_st {
     /* Name of test as it appears in file */
     const char *name;
     /* Initialise test for "alg" */
-    int (*init) (EVP_TEST *t, const char *alg);
+    int (*init)(EVP_TEST *t, const char *alg);
     /* Clean up method */
-    void (*cleanup) (EVP_TEST *t);
+    void (*cleanup)(EVP_TEST *t);
     /* Test specific name value pair processing */
-    int (*parse) (EVP_TEST *t, const char *name, const char *value);
+    int (*parse)(EVP_TEST *t, const char *name, const char *value);
     /* Run the test itself */
-    int (*run_test) (EVP_TEST *t);
+    int (*run_test)(EVP_TEST *t);
 };
 
 /* Linked list of named keys. */
@@ -95,7 +95,7 @@ static KEY_LIST *public_keys;
 static int find_key(EVP_PKEY **ppk, const char *name, KEY_LIST *lst);
 static int parse_bin(const char *value, unsigned char **buf, size_t *buflen);
 static int parse_bin_chunk(const char *value, size_t offset, size_t max,
-                           unsigned char **buf, size_t *buflen, size_t *out_offset);
+    unsigned char **buf, size_t *buflen, size_t *out_offset);
 static int is_digest_disabled(const char *name);
 static int is_pkey_disabled(const char *name);
 static int is_mac_disabled(const char *name);
@@ -104,7 +104,7 @@ static int is_kdf_disabled(const char *name);
 
 /* A callback that is triggered if fips unapproved mode is detected */
 static int fips_indicator_cb(const char *type, const char *desc,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     fips_indicator_callback_unapproved_count++;
     TEST_info("(Indicator Callback received %s : %s is not approved)", type, desc);
@@ -146,7 +146,7 @@ static int mac_check_fips_approved(EVP_MAC_CTX *ctx, EVP_TEST *t)
         return 1;
 
     params[0] = OSSL_PARAM_construct_int(OSSL_MAC_PARAM_FIPS_APPROVED_INDICATOR,
-                                         &approved);
+        &approved);
     if (!EVP_MAC_CTX_get_params(ctx, params))
         return 0;
     return check_fips_approved(t, approved);
@@ -163,8 +163,8 @@ static int pkey_check_fips_approved(EVP_PKEY_CTX *ctx, EVP_TEST *t)
     const OSSL_PARAM *gettables = EVP_PKEY_CTX_gettable_params(ctx);
 
     if (gettables == NULL
-            || OSSL_PARAM_locate_const(gettables,
-                                       OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR)
+        || OSSL_PARAM_locate_const(gettables,
+               OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR)
             == NULL)
         return 1;
 
@@ -173,7 +173,7 @@ static int pkey_check_fips_approved(EVP_PKEY_CTX *ctx, EVP_TEST *t)
         return 1;
 
     params[0] = OSSL_PARAM_construct_int(OSSL_ALG_PARAM_FIPS_APPROVED_INDICATOR,
-                                         &approved);
+        &approved);
     if (!EVP_PKEY_CTX_get_params(ctx, params))
         return 0;
     return check_fips_approved(t, approved);
@@ -192,7 +192,7 @@ static int rand_check_fips_approved(EVP_RAND_CTX *ctx, EVP_TEST *t)
         return 1;
 
     params[0] = OSSL_PARAM_construct_int(OSSL_DRBG_PARAM_FIPS_APPROVED_INDICATOR,
-                                         &approved);
+        &approved);
     if (!EVP_RAND_CTX_get_params(ctx, params))
         return 0;
     return check_fips_approved(t, approved);
@@ -243,8 +243,8 @@ static const OSSL_PARAM settable_ctx_params[] = {
 };
 
 static int ctrl2params(EVP_TEST *t, STACK_OF(OPENSSL_STRING) *controls,
-                       const OSSL_PARAM *settables,
-                       OSSL_PARAM params[], size_t params_sz, size_t *params_n)
+    const OSSL_PARAM *settables,
+    OSSL_PARAM params[], size_t params_sz, size_t *params_n)
 {
     int i;
 
@@ -269,9 +269,9 @@ static int ctrl2params(EVP_TEST *t, STACK_OF(OPENSSL_STRING) *controls,
 
         if (tmpval == NULL
             || !OSSL_PARAM_allocate_from_text(&params[*params_n],
-                                              settables,
-                                              tmpkey, tmpval,
-                                              strlen(tmpval), NULL)) {
+                settables,
+                tmpkey, tmpval,
+                strlen(tmpval), NULL)) {
             OPENSSL_free(tmpkey);
             t->err = "ERR_PARAM_ERROR";
             goto err;
@@ -286,7 +286,7 @@ static int ctrl2params(EVP_TEST *t, STACK_OF(OPENSSL_STRING) *controls,
 }
 
 static void ctrl2params_free(OSSL_PARAM params[],
-                             size_t params_n, size_t params_n_allocstart)
+    size_t params_n, size_t params_n_allocstart)
 {
     while (params_n-- > params_n_allocstart) {
         OPENSSL_free(params[params_n].data);
@@ -299,7 +299,7 @@ static int kdf_check_fips_approved(EVP_KDF_CTX *ctx, EVP_TEST *t)
     int approved = 1;
 
     params[0] = OSSL_PARAM_construct_int(OSSL_KDF_PARAM_FIPS_APPROVED_INDICATOR,
-                                         &approved);
+        &approved);
     if (!EVP_KDF_CTX_get_params(ctx, params))
         return 0;
     return check_fips_approved(t, approved);
@@ -311,7 +311,7 @@ static int cipher_check_fips_approved(EVP_CIPHER_CTX *ctx, EVP_TEST *t)
     int approved = 1;
 
     params[0] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_FIPS_APPROVED_INDICATOR,
-                                         &approved);
+        &approved);
     if (!EVP_CIPHER_CTX_get_params(ctx, params))
         return 0;
     return check_fips_approved(t, approved);
@@ -324,8 +324,8 @@ static int cipher_check_fips_approved(EVP_CIPHER_CTX *ctx, EVP_TEST *t)
  * case without producing unnecessary test framework output.
  */
 static int memory_err_compare(EVP_TEST *t, const char *err,
-                              const void *expected, size_t expected_len,
-                              const void *got, size_t got_len)
+    const void *expected, size_t expected_len,
+    const void *got, size_t got_len)
 {
     int r;
 
@@ -373,7 +373,7 @@ static void evp_test_buffer_free(EVP_TEST_BUFFER *db)
 
 /* append buffer to a list */
 static int evp_test_buffer_append(const char *value, size_t max_len,
-                                  STACK_OF(EVP_TEST_BUFFER) **sk)
+    STACK_OF(EVP_TEST_BUFFER) **sk)
 {
     EVP_TEST_BUFFER *db = NULL;
     int rv = 0;
@@ -394,7 +394,8 @@ static int evp_test_buffer_append(const char *value, size_t max_len,
             size_t new_offset = 0;
 
             if ((rv = parse_bin_chunk(value, offset, max_len, &db->buf,
-                                      &db->buflen, &new_offset)) == -1)
+                     &db->buflen, &new_offset))
+                == -1)
                 goto err;
             offset = new_offset;
         }
@@ -418,7 +419,7 @@ static int evp_test_buffer_append(const char *value, size_t max_len,
 
 /* replace last buffer in list with copies of itself */
 static int evp_test_buffer_ncopy(const char *value,
-                                 STACK_OF(EVP_TEST_BUFFER) *sk)
+    STACK_OF(EVP_TEST_BUFFER) *sk)
 {
     EVP_TEST_BUFFER *db;
     unsigned char *tbuf, *p;
@@ -446,7 +447,7 @@ static int evp_test_buffer_ncopy(const char *value,
 
 /* set repeat count for last buffer in list */
 static int evp_test_buffer_set_count(const char *value,
-                                     STACK_OF(EVP_TEST_BUFFER) *sk)
+    STACK_OF(EVP_TEST_BUFFER) *sk)
 {
     EVP_TEST_BUFFER *db;
     int count = atoi(value);
@@ -468,10 +469,10 @@ static int evp_test_buffer_set_count(const char *value,
 
 /* call "fn" with each element of the list in turn */
 static int evp_test_buffer_do(STACK_OF(EVP_TEST_BUFFER) *sk,
-                              int (*fn)(void *ctx,
-                                        const unsigned char *buf,
-                                        size_t buflen),
-                              void *ctx)
+    int (*fn)(void *ctx,
+        const unsigned char *buf,
+        size_t buflen),
+    void *ctx)
 {
     int i;
 
@@ -492,8 +493,8 @@ static int evp_test_buffer_do(STACK_OF(EVP_TEST_BUFFER) *sk,
  * Return an allocated buffer, set |out_len|.  If |input_len|
  * is zero, get an empty buffer but set length to zero.
  */
-static unsigned char* unescape(const char *input, size_t input_len,
-                               size_t *out_len)
+static unsigned char *unescape(const char *input, size_t input_len,
+    size_t *out_len)
 {
     unsigned char *ret, *p;
     size_t i;
@@ -524,7 +525,7 @@ static unsigned char* unescape(const char *input, size_t input_len,
     *out_len = p - ret;
     return ret;
 
- err:
+err:
     OPENSSL_free(ret);
     return NULL;
 }
@@ -586,7 +587,7 @@ static int parse_bin(const char *value, unsigned char **buf, size_t *buflen)
  * Return 1 on success, -1 on failure or 0 for end of value string.
  */
 static int parse_bin_chunk(const char *value, size_t offset, size_t max,
-                           unsigned char **buf, size_t *buflen, size_t *out_offset)
+    unsigned char **buf, size_t *buflen, size_t *out_offset)
 {
     size_t vlen;
     size_t chunk_len;
@@ -677,8 +678,10 @@ static int digest_test_init(EVP_TEST *t, const char *alg)
     if ((digest = fetched_digest = EVP_MD_fetch(libctx, alg, propquery)) == NULL
         && (digest = EVP_get_digestbyname(alg)) == NULL)
         return 0;
-    if (!TEST_ptr(mdat = OPENSSL_zalloc(sizeof(*mdat))))
+    if (!TEST_ptr(mdat = OPENSSL_zalloc(sizeof(*mdat)))) {
+        EVP_MD_free(fetched_digest);
         return 0;
+    }
     t->data = mdat;
     mdat->digest = digest;
     mdat->fetched_digest = fetched_digest;
@@ -699,7 +702,7 @@ static void digest_test_cleanup(EVP_TEST *t)
 }
 
 static int digest_test_parse(EVP_TEST *t,
-                             const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     DIGEST_DATA *mdata = t->data;
 
@@ -767,23 +770,22 @@ static int digest_test_run(EVP_TEST *t)
     if (!TEST_ptr(mctx = EVP_MD_CTX_new()))
         goto err;
 
-    got = OPENSSL_malloc(expected->output_len > EVP_MAX_MD_SIZE ?
-                         expected->output_len : EVP_MAX_MD_SIZE);
+    got = OPENSSL_malloc(expected->output_len > EVP_MAX_MD_SIZE ? expected->output_len : EVP_MAX_MD_SIZE);
     if (!TEST_ptr(got))
         goto err;
 
     if (expected->xof > 0) {
         xof |= 1;
         *p++ = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_XOFLEN,
-                                           &expected->output_len);
+            &expected->output_len);
     }
     if (expected->digest_size > 0) {
         *p++ = OSSL_PARAM_construct_size_t(OSSL_DIGEST_PARAM_SIZE,
-                                           &expected->digest_size);
+            &expected->digest_size);
     }
     if (expected->pad_type > 0)
         *p++ = OSSL_PARAM_construct_int(OSSL_DIGEST_PARAM_PAD_TYPE,
-                                        &expected->pad_type);
+            &expected->pad_type);
     *p++ = OSSL_PARAM_construct_end();
 
     if (!EVP_DigestInit_ex2(mctx, expected->digest, params)) {
@@ -829,31 +831,31 @@ static int digest_test_run(EVP_TEST *t)
         goto err;
     }
     if (!memory_err_compare(t, "DIGEST_MISMATCH",
-                            expected->output, expected->output_len,
-                            got, got_len))
+            expected->output, expected->output_len,
+            got, got_len))
         goto err;
 
     t->err = NULL;
 
     /* Test the EVP_Q_digest interface as well */
     if (sk_EVP_TEST_BUFFER_num(expected->input) == 1
-            && !xof
-            /* This should never fail but we need the returned pointer now */
-            && !TEST_ptr(inbuf = sk_EVP_TEST_BUFFER_value(expected->input, 0))
-            && !inbuf->count_set) {
+        && !xof
+        /* This should never fail but we need the returned pointer now */
+        && !TEST_ptr(inbuf = sk_EVP_TEST_BUFFER_value(expected->input, 0))
+        && !inbuf->count_set) {
         OPENSSL_cleanse(got, got_len);
         if (!TEST_true(EVP_Q_digest(libctx,
-                                    EVP_MD_get0_name(expected->fetched_digest),
-                                    NULL, inbuf->buf, inbuf->buflen,
-                                    got, &size))
-                || !TEST_mem_eq(got, size,
-                                expected->output, expected->output_len)) {
+                EVP_MD_get0_name(expected->fetched_digest),
+                NULL, inbuf->buf, inbuf->buflen,
+                got, &size))
+            || !TEST_mem_eq(got, size,
+                expected->output, expected->output_len)) {
             t->err = "EVP_Q_digest failed";
             goto err;
         }
     }
 
- err:
+err:
     OPENSSL_free(got);
     EVP_MD_CTX_free(mctx);
     return 1;
@@ -903,7 +905,6 @@ typedef struct cipher_data_st {
     STACK_OF(OPENSSL_STRING) *init_controls; /* collection of controls */
 } CIPHER_DATA;
 
-
 /*
  * XTS, SIV, CCM, stitched ciphers and Wrap modes have special
  * requirements about input lengths so we don't fragment for those
@@ -911,14 +912,16 @@ typedef struct cipher_data_st {
 static int cipher_test_valid_fragmentation(CIPHER_DATA *cdat)
 {
     return (cdat->aead == EVP_CIPH_CCM_MODE
-            || cdat->aead == EVP_CIPH_CBC_MODE
-            || (cdat->aead == -1
-                && EVP_CIPHER_get_mode(cdat->cipher) == EVP_CIPH_STREAM_CIPHER)
-            || ((EVP_CIPHER_get_flags(cdat->cipher) & EVP_CIPH_FLAG_CTS) != 0)
-            || EVP_CIPHER_get_mode(cdat->cipher) == EVP_CIPH_SIV_MODE
-            || EVP_CIPHER_get_mode(cdat->cipher) == EVP_CIPH_GCM_SIV_MODE
-            || EVP_CIPHER_get_mode(cdat->cipher) == EVP_CIPH_XTS_MODE
-            || EVP_CIPHER_get_mode(cdat->cipher) == EVP_CIPH_WRAP_MODE) ? 0 : 1;
+               || cdat->aead == EVP_CIPH_CBC_MODE
+               || (cdat->aead == -1
+                   && EVP_CIPHER_get_mode(cdat->cipher) == EVP_CIPH_STREAM_CIPHER)
+               || ((EVP_CIPHER_get_flags(cdat->cipher) & EVP_CIPH_FLAG_CTS) != 0)
+               || EVP_CIPHER_get_mode(cdat->cipher) == EVP_CIPH_SIV_MODE
+               || EVP_CIPHER_get_mode(cdat->cipher) == EVP_CIPH_GCM_SIV_MODE
+               || EVP_CIPHER_get_mode(cdat->cipher) == EVP_CIPH_XTS_MODE
+               || EVP_CIPHER_get_mode(cdat->cipher) == EVP_CIPH_WRAP_MODE)
+        ? 0
+        : 1;
 }
 
 static int cipher_test_init(EVP_TEST *t, const char *alg)
@@ -996,7 +999,7 @@ static void cipher_test_cleanup(EVP_TEST *t)
 }
 
 static int cipher_test_parse(EVP_TEST *t, const char *keyword,
-                             const char *value)
+    const char *value)
 {
     CIPHER_DATA *cdat = t->data;
     int i;
@@ -1081,8 +1084,8 @@ static int cipher_test_parse(EVP_TEST *t, const char *keyword,
 }
 
 static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
-                           size_t inp_misalign, int frag, int in_place,
-                           const OSSL_PARAM initparams[])
+    size_t inp_misalign, int frag, int in_place,
+    const OSSL_PARAM initparams[])
 {
     CIPHER_DATA *expected = t->data;
     unsigned char *in, *expected_out, *tmp = NULL;
@@ -1125,15 +1128,13 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
          * past inp_misalign in expression below. Output will be written
          * past out_misalign...
          */
-        tmp = OPENSSL_malloc(out_misalign + in_len + 2 * EVP_MAX_BLOCK_LENGTH +
-                             inp_misalign + in_len);
+        tmp = OPENSSL_malloc(out_misalign + in_len + 2 * EVP_MAX_BLOCK_LENGTH + inp_misalign + in_len);
         if (!tmp)
             goto err;
-        in = memcpy(tmp + out_misalign + in_len + 2 * EVP_MAX_BLOCK_LENGTH +
-                    inp_misalign, in, in_len);
+        in = memcpy(tmp + out_misalign + in_len + 2 * EVP_MAX_BLOCK_LENGTH + inp_misalign, in, in_len);
     }
     if (!EVP_CipherInit_ex2(ctx_base, expected->cipher, NULL, NULL, enc,
-                            initparams)) {
+            initparams)) {
         t->err = "CIPHERINIT_ERROR";
         goto err;
     }
@@ -1141,8 +1142,8 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
         OSSL_PARAM params[2];
 
         params[0] = OSSL_PARAM_construct_utf8_string(OSSL_CIPHER_PARAM_CTS_MODE,
-                                                     (char *)expected->cts_mode,
-                                                     0);
+            (char *)expected->cts_mode,
+            0);
         params[1] = OSSL_PARAM_construct_end();
         if (!EVP_CIPHER_CTX_set_params(ctx_base, params)) {
             t->err = "INVALID_CTS_MODE";
@@ -1152,7 +1153,8 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
     if (expected->iv) {
         if (expected->aead) {
             if (EVP_CIPHER_CTX_ctrl(ctx_base, EVP_CTRL_AEAD_SET_IVLEN,
-                                     expected->iv_len, 0) <= 0) {
+                    expected->iv_len, 0)
+                <= 0) {
                 t->err = "INVALID_IV_LENGTH";
                 goto err;
             }
@@ -1176,13 +1178,14 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
         }
         if (tag || expected->aead != EVP_CIPH_GCM_MODE) {
             if (EVP_CIPHER_CTX_ctrl(ctx_base, EVP_CTRL_AEAD_SET_TAG,
-                                     expected->tag_len, tag) <= 0)
+                    expected->tag_len, tag)
+                <= 0)
                 goto err;
         }
     }
 
     if (expected->rounds > 0) {
-        int  rounds = (int)expected->rounds;
+        int rounds = (int)expected->rounds;
 
         if (EVP_CIPHER_CTX_ctrl(ctx_base, EVP_CTRL_SET_RC5_ROUNDS, rounds, NULL) <= 0) {
             t->err = "INVALID_ROUNDS";
@@ -1214,7 +1217,7 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
         if (!TEST_true(EVP_CIPHER_CTX_get_updated_iv(ctx_base, iv, sizeof(iv)))
             || ((EVP_CIPHER_get_flags(expected->cipher) & EVP_CIPH_CUSTOM_IV) == 0
                 && !TEST_mem_eq(expected->iv, expected->iv_len, iv,
-                                expected->iv_len))) {
+                    expected->iv_len))) {
             t->err = "INVALID_IV";
             goto err;
         }
@@ -1225,7 +1228,7 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
     if (!EVP_CIPHER_CTX_copy(ctx, ctx_base)) {
         if (fips_dupctx_supported) {
             TEST_info("Doing a copy of Cipher %s Fails!\n",
-                      EVP_CIPHER_get0_name(expected->cipher));
+                EVP_CIPHER_get0_name(expected->cipher));
             ERR_print_errors_fp(stderr);
             goto err;
         } else {
@@ -1245,7 +1248,7 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
     } else {
         if (fips_dupctx_supported) {
             TEST_info("Doing a dup of Cipher %s Fails!\n",
-                      EVP_CIPHER_get0_name(expected->cipher));
+                EVP_CIPHER_get0_name(expected->cipher));
             ERR_print_errors_fp(stderr);
             goto err;
         } else {
@@ -1256,8 +1259,9 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
 
     if (expected->mac_key != NULL
         && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_MAC_KEY,
-                                (int)expected->mac_key_len,
-                                (void *)expected->mac_key) <= 0) {
+               (int)expected->mac_key_len,
+               (void *)expected->mac_key)
+            <= 0) {
         t->err = "SET_MAC_KEY_ERROR";
         goto err;
     }
@@ -1266,7 +1270,7 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
         OSSL_PARAM params[2];
 
         params[0] = OSSL_PARAM_construct_int(OSSL_CIPHER_PARAM_TLS_VERSION,
-                                             &expected->tls_version);
+            &expected->tls_version);
         params[1] = OSSL_PARAM_construct_end();
         if (!EVP_CIPHER_CTX_set_params(ctx, params)) {
             t->err = "SET_TLS_VERSION_ERROR";
@@ -1289,13 +1293,13 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
                 donelen = 0;
 
                 do {
-                    size_t current_aad_len = (size_t) data_chunk_size;
+                    size_t current_aad_len = (size_t)data_chunk_size;
 
-                    if (data_chunk_size == 0 || (size_t) data_chunk_size > aad_len)
+                    if (data_chunk_size == 0 || (size_t)data_chunk_size > aad_len)
                         current_aad_len = aad_len;
                     if (!EVP_CipherUpdate(ctx, NULL, &chunklen,
-                                          expected->aad[i] + donelen,
-                                          current_aad_len))
+                            expected->aad[i] + donelen,
+                            current_aad_len))
                         goto err;
                     donelen += current_aad_len;
                     aad_len -= current_aad_len;
@@ -1311,14 +1315,14 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
                 }
                 if (expected->aad_len[i] > 2) {
                     if (!EVP_CipherUpdate(ctx, NULL, &chunklen,
-                                          expected->aad[i] + donelen,
-                                          expected->aad_len[i] - 2))
+                            expected->aad[i] + donelen,
+                            expected->aad_len[i] - 2))
                         goto err;
                     donelen += expected->aad_len[i] - 2;
                 }
                 if (expected->aad_len[i] > 1
                     && !EVP_CipherUpdate(ctx, NULL, &chunklen,
-                                         expected->aad[i] + donelen, 1))
+                        expected->aad[i] + donelen, 1))
                     goto err;
             }
         }
@@ -1330,11 +1334,12 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
 
         /* duplicate the aad as the implementation might modify it */
         if ((tls_aad = OPENSSL_memdup(expected->aad[0],
-                                      expected->aad_len[0])) == NULL)
+                 expected->aad_len[0]))
+            == NULL)
             goto err;
         params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD,
-                                                      tls_aad,
-                                                      expected->aad_len[0]);
+            tls_aad,
+            expected->aad_len[0]);
         params[1] = OSSL_PARAM_construct_end();
         if (!EVP_CIPHER_CTX_set_params(ctx, params)) {
             OPENSSL_free(tls_aad);
@@ -1342,10 +1347,10 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
             goto err;
         }
         OPENSSL_free(tls_aad);
-    } else if (!enc && (expected->aead == EVP_CIPH_OCB_MODE
-                        || expected->tag_late)) {
+    } else if (!enc && (expected->aead == EVP_CIPH_OCB_MODE || expected->tag_late)) {
         if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
-                                 expected->tag_len, expected->tag) <= 0) {
+                expected->tag_len, expected->tag)
+            <= 0) {
             t->err = "TAG_SET_ERROR";
             goto err;
         }
@@ -1353,9 +1358,8 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
     if (expected->xts_standard != NULL) {
         OSSL_PARAM params[2];
 
-        params[0] =
-            OSSL_PARAM_construct_utf8_string(OSSL_CIPHER_PARAM_XTS_STANDARD,
-                                             (char *)expected->xts_standard, 0);
+        params[0] = OSSL_PARAM_construct_utf8_string(OSSL_CIPHER_PARAM_XTS_STANDARD,
+            (char *)expected->xts_standard, 0);
         params[1] = OSSL_PARAM_construct_end();
         if (!EVP_CIPHER_CTX_set_params(ctx, params)) {
             t->err = "SET_XTS_STANDARD_ERROR";
@@ -1368,12 +1372,12 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
     if (!frag) {
         do {
             /* Supply the data all in one go or according to data_chunk_size */
-            size_t current_in_len = (size_t) data_chunk_size;
+            size_t current_in_len = (size_t)data_chunk_size;
 
-            if (data_chunk_size == 0 || (size_t) data_chunk_size > in_len)
+            if (data_chunk_size == 0 || (size_t)data_chunk_size > in_len)
                 current_in_len = in_len;
             if (!EVP_CipherUpdate(ctx, tmp + out_misalign + tmplen, &chunklen,
-                                  in, current_in_len))
+                    in, current_in_len))
                 goto err;
             tmplen += chunklen;
             in += current_in_len;
@@ -1390,7 +1394,7 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
         }
         if (in_len > 1) {
             if (!EVP_CipherUpdate(ctx, tmp + out_misalign + tmplen, &chunklen,
-                                  in, in_len - 1))
+                    in, in_len - 1))
                 goto err;
             tmplen += chunklen;
             in += in_len - 1;
@@ -1398,7 +1402,7 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
         }
         if (in_len > 0) {
             if (!EVP_CipherUpdate(ctx, tmp + out_misalign + tmplen, &chunklen,
-                                  in, 1))
+                    in, 1))
                 goto err;
             tmplen += chunklen;
         }
@@ -1424,7 +1428,7 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
             out_len = tmplen + tmpflen;
     }
     if (!memory_err_compare(t, "VALUE_MISMATCH", expected_out, out_len,
-                            tmp + out_misalign, tmplen + tmpflen))
+            tmp + out_misalign, tmplen + tmpflen))
         goto err;
     if (enc && expected->aead && !expected->tls_aad) {
         unsigned char rtag[48]; /* longest known for TLS_SHA384_SHA384 */
@@ -1434,13 +1438,14 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
             goto err;
         }
         if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG,
-                                 expected->tag_len, rtag) <= 0) {
+                expected->tag_len, rtag)
+            <= 0) {
             t->err = "TAG_RETRIEVE_ERROR";
             goto err;
         }
         if (!memory_err_compare(t, "TAG_VALUE_MISMATCH",
-                                expected->tag, expected->tag_len,
-                                rtag, expected->tag_len))
+                expected->tag, expected->tag_len,
+                rtag, expected->tag_len))
             goto err;
     }
     /* Check the updated IV */
@@ -1450,7 +1455,7 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
         if (!TEST_true(EVP_CIPHER_CTX_get_updated_iv(ctx, iv, sizeof(iv)))
             || ((EVP_CIPHER_get_flags(expected->cipher) & EVP_CIPH_CUSTOM_IV) == 0
                 && !TEST_mem_eq(expected->next_iv, expected->iv_len, iv,
-                                expected->iv_len))) {
+                    expected->iv_len))) {
             t->err = "INVALID_NEXT_IV";
             goto err;
         }
@@ -1458,7 +1463,7 @@ static int cipher_test_enc(EVP_TEST *t, int enc, size_t out_misalign,
 
     t->err = NULL;
     ok = 1;
- err:
+err:
     OPENSSL_free(tmp);
     if (ctx != ctx_base)
         EVP_CIPHER_CTX_free(ctx_base);
@@ -1493,7 +1498,7 @@ static int cipher_test_run(EVP_TEST *t)
 
     if (sk_OPENSSL_STRING_num(cdat->init_controls) > 0) {
         if (!ctrl2params(t, cdat->init_controls, NULL,
-                         initparams, OSSL_NELEM(initparams), &params_n))
+                initparams, OSSL_NELEM(initparams), &params_n))
             return 0;
     }
 
@@ -1516,25 +1521,25 @@ static int cipher_test_run(EVP_TEST *t)
                         break;
                     if (in_place == 1) {
                         BIO_snprintf(aux_err, sizeof(aux_err),
-                                        "%s in-place, %sfragmented",
-                                        out_misalign ? "misaligned" : "aligned",
-                                        frag ? "" : "not ");
+                            "%s in-place, %sfragmented",
+                            out_misalign ? "misaligned" : "aligned",
+                            frag ? "" : "not ");
                     } else {
                         BIO_snprintf(aux_err, sizeof(aux_err),
-                                        "%s output and %s input, %sfragmented",
-                                        out_misalign ? "misaligned" : "aligned",
-                                        inp_misalign ? "misaligned" : "aligned",
-                                        frag ? "" : "not ");
+                            "%s output and %s input, %sfragmented",
+                            out_misalign ? "misaligned" : "aligned",
+                            inp_misalign ? "misaligned" : "aligned",
+                            frag ? "" : "not ");
                     }
                     if (cdat->enc) {
                         rv = cipher_test_enc(t, 1, out_misalign, inp_misalign,
-                                             frag, in_place, initparams);
+                            frag, in_place, initparams);
                         if (rv != 1)
                             goto end;
                     }
                     if (cdat->enc != 1) {
                         rv = cipher_test_enc(t, 0, out_misalign, inp_misalign,
-                                             frag, in_place, initparams);
+                            frag, in_place, initparams);
                         if (rv != 1)
                             goto end;
                     }
@@ -1545,7 +1550,7 @@ static int cipher_test_run(EVP_TEST *t)
     ctrl2params_free(initparams, params_n, 0);
     t->aux_err = NULL;
     return 1;
- end:
+end:
     ctrl2params_free(initparams, params_n, 0);
     return (rv < 0 ? 0 : 1);
 }
@@ -1558,7 +1563,6 @@ static const EVP_TEST_METHOD cipher_test_method = {
     cipher_test_run
 };
 
-
 /**
  **  MAC TESTS
  **/
@@ -1566,8 +1570,8 @@ static const EVP_TEST_METHOD cipher_test_method = {
 typedef struct mac_data_st {
     /* MAC type in one form or another */
     char *mac_name;
-    EVP_MAC *mac;                /* for mac_test_run_mac */
-    int type;                    /* for mac_test_run_pkey */
+    EVP_MAC *mac; /* for mac_test_run_mac */
+    int type; /* for mac_test_run_pkey */
     /* Algorithm string for this MAC */
     char *alg;
     /* MAC key */
@@ -1673,7 +1677,7 @@ static void mac_test_cleanup(EVP_TEST *t)
 }
 
 static int mac_test_parse(EVP_TEST *t,
-                          const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     MAC_DATA *mdata = t->data;
 
@@ -1717,7 +1721,7 @@ static int mac_test_parse(EVP_TEST *t,
 }
 
 static int mac_test_ctrl_pkey(EVP_TEST *t, EVP_PKEY_CTX *pctx,
-                              const char *value)
+    const char *value)
 {
     int rv = 0;
     char *p, *tmpval;
@@ -1760,7 +1764,7 @@ static int mac_test_run_pkey(EVP_TEST *t)
         TEST_info("Trying the EVP_PKEY %s test", OBJ_nid2sn(expected->type));
     else
         TEST_info("Trying the EVP_PKEY %s test with %s",
-                  OBJ_nid2sn(expected->type), expected->alg);
+            OBJ_nid2sn(expected->type), expected->alg);
 
     if (expected->type == EVP_PKEY_CMAC) {
 #ifdef OPENSSL_NO_DEPRECATED_3_0
@@ -1783,13 +1787,13 @@ static int mac_test_run_pkey(EVP_TEST *t)
         }
         tmpctx = OSSL_LIB_CTX_set0_default(libctx);
         key = EVP_PKEY_new_CMAC_key(NULL, expected->key, expected->key_len,
-                                    cipher);
+            cipher);
         OSSL_LIB_CTX_set0_default(tmpctx);
 #endif
     } else {
         key = EVP_PKEY_new_raw_private_key_ex(libctx,
-                                              OBJ_nid2sn(expected->type), NULL,
-                                              expected->key, expected->key_len);
+            OBJ_nid2sn(expected->type), NULL,
+            expected->key, expected->key_len);
     }
     if (key == NULL) {
         t->err = "MAC_KEY_CREATE_ERROR";
@@ -1815,17 +1819,17 @@ static int mac_test_run_pkey(EVP_TEST *t)
     }
     for (i = 0; i < sk_OPENSSL_STRING_num(expected->controls); i++)
         if (!mac_test_ctrl_pkey(t, pctx,
-                                sk_OPENSSL_STRING_value(expected->controls,
-                                                        i))) {
+                sk_OPENSSL_STRING_value(expected->controls,
+                    i))) {
             t->err = "EVPPKEYCTXCTRL_ERROR";
             goto err;
         }
     input_len = expected->input_len;
     donelen = 0;
     do {
-        size_t current_len = (size_t) data_chunk_size;
+        size_t current_len = (size_t)data_chunk_size;
 
-        if (data_chunk_size == 0 || (size_t) data_chunk_size > input_len)
+        if (data_chunk_size == 0 || (size_t)data_chunk_size > input_len)
             current_len = input_len;
         if (!EVP_DigestSignUpdate(mctx, expected->input + donelen, current_len)) {
             t->err = "DIGESTSIGNUPDATE_ERROR";
@@ -1844,14 +1848,14 @@ static int mac_test_run_pkey(EVP_TEST *t)
         goto err;
     }
     if (!EVP_DigestSignFinal(mctx, got, &got_len)
-            || !memory_err_compare(t, "TEST_MAC_ERR",
-                                   expected->output, expected->output_len,
-                                   got, got_len)) {
+        || !memory_err_compare(t, "TEST_MAC_ERR",
+            expected->output, expected->output_len,
+            got, got_len)) {
         t->err = "TEST_MAC_ERR";
         goto err;
     }
     t->err = NULL;
- err:
+err:
     EVP_CIPHER_free(cipher);
     EVP_MD_CTX_free(mctx);
     OPENSSL_free(got);
@@ -1871,17 +1875,16 @@ static int mac_test_run_mac(EVP_TEST *t)
     OSSL_PARAM params[21], sizes[3], *psizes = sizes, *p;
     size_t params_n = 0;
     size_t params_n_allocstart = 0;
-    const OSSL_PARAM *defined_params =
-        EVP_MAC_settable_ctx_params(expected->mac);
+    const OSSL_PARAM *defined_params = EVP_MAC_settable_ctx_params(expected->mac);
     int xof;
     int reinit = 1;
-    size_t input_len, donelen ;
+    size_t input_len, donelen;
 
     if (expected->alg == NULL)
         TEST_info("Trying the EVP_MAC %s test", expected->mac_name);
     else
         TEST_info("Trying the EVP_MAC %s test with %s",
-                  expected->mac_name, expected->alg);
+            expected->mac_name, expected->alg);
 
     if (expected->alg != NULL) {
         int skip = 0;
@@ -1892,21 +1895,21 @@ static int mac_test_run_mac(EVP_TEST *t)
          * should be and bet on that.
          */
         if (OSSL_PARAM_locate_const(defined_params,
-                                    OSSL_MAC_PARAM_CIPHER) != NULL) {
+                OSSL_MAC_PARAM_CIPHER)
+            != NULL) {
             if (is_cipher_disabled(expected->alg))
                 skip = 1;
             else
-                params[params_n++] =
-                    OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_CIPHER,
-                                                     expected->alg, 0);
+                params[params_n++] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_CIPHER,
+                    expected->alg, 0);
         } else if (OSSL_PARAM_locate_const(defined_params,
-                                           OSSL_MAC_PARAM_DIGEST) != NULL) {
+                       OSSL_MAC_PARAM_DIGEST)
+            != NULL) {
             if (is_digest_disabled(expected->alg))
                 skip = 1;
             else
-                params[params_n++] =
-                    OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
-                                                     expected->alg, 0);
+                params[params_n++] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
+                    expected->alg, 0);
         } else {
             t->err = "MAC_BAD_PARAMS";
             goto err;
@@ -1919,24 +1922,21 @@ static int mac_test_run_mac(EVP_TEST *t)
         }
     }
     if (expected->custom != NULL)
-        params[params_n++] =
-            OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_CUSTOM,
-                                              expected->custom,
-                                              expected->custom_len);
+        params[params_n++] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_CUSTOM,
+            expected->custom,
+            expected->custom_len);
     if (expected->salt != NULL)
-        params[params_n++] =
-            OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_SALT,
-                                              expected->salt,
-                                              expected->salt_len);
+        params[params_n++] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_SALT,
+            expected->salt,
+            expected->salt_len);
     if (expected->iv != NULL)
-        params[params_n++] =
-            OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_IV,
-                                              expected->iv,
-                                              expected->iv_len);
+        params[params_n++] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_IV,
+            expected->iv,
+            expected->iv_len);
 
     params_n_allocstart = params_n;
     if (!ctrl2params(t, expected->controls, defined_params,
-                     params, OSSL_NELEM(params), &params_n))
+            params, OSSL_NELEM(params), &params_n))
         goto err;
 
     p = OSSL_PARAM_locate(params + params_n_allocstart, "size");
@@ -1978,10 +1978,10 @@ static int mac_test_run_mac(EVP_TEST *t)
     }
     if (expected->output_size >= 0)
         *psizes++ = OSSL_PARAM_construct_int(OSSL_MAC_PARAM_SIZE,
-                                             &output_size);
+            &output_size);
     if (expected->block_size >= 0)
         *psizes++ = OSSL_PARAM_construct_int(OSSL_MAC_PARAM_BLOCK_SIZE,
-                                             &block_size);
+            &block_size);
     if (psizes != sizes) {
         *psizes = OSSL_PARAM_construct_end();
         if (!TEST_true(EVP_MAC_CTX_get_params(ctx, sizes))) {
@@ -1989,23 +1989,23 @@ static int mac_test_run_mac(EVP_TEST *t)
             goto err;
         }
         if (expected->output_size >= 0
-                && !TEST_int_eq(output_size, expected->output_size)) {
+            && !TEST_int_eq(output_size, expected->output_size)) {
             t->err = "TEST_FAILURE";
             goto err;
         }
         if (expected->block_size >= 0
-                && !TEST_int_eq(block_size, expected->block_size)) {
+            && !TEST_int_eq(block_size, expected->block_size)) {
             t->err = "TEST_FAILURE";
             goto err;
         }
     }
- retry:
+retry:
     input_len = expected->input_len;
     donelen = 0;
     do {
-        size_t current_len = (size_t) data_chunk_size;
+        size_t current_len = (size_t)data_chunk_size;
 
-        if (data_chunk_size == 0 || (size_t) data_chunk_size > input_len)
+        if (data_chunk_size == 0 || (size_t)data_chunk_size > input_len)
             current_len = input_len;
         if (!EVP_MAC_update(ctx, expected->input + donelen, current_len)) {
             t->err = "MAC_UPDATE_ERROR";
@@ -2023,8 +2023,8 @@ static int mac_test_run_mac(EVP_TEST *t)
         }
         if (!EVP_MAC_finalXOF(ctx, got, expected->output_len)
             || !memory_err_compare(t, "TEST_MAC_ERR",
-                                   expected->output, expected->output_len,
-                                   got, expected->output_len)) {
+                expected->output, expected->output_len,
+                got, expected->output_len)) {
             t->err = "MAC_FINAL_ERROR";
             goto err;
         }
@@ -2039,8 +2039,8 @@ static int mac_test_run_mac(EVP_TEST *t)
         }
         if (!EVP_MAC_final(ctx, got, &got_len, got_len)
             || !memory_err_compare(t, "TEST_MAC_ERR",
-                                   expected->output, expected->output_len,
-                                   got, got_len)) {
+                expected->output, expected->output_len,
+                got, got_len)) {
             t->err = "TEST_MAC_ERR";
             goto err;
         }
@@ -2054,10 +2054,9 @@ static int mac_test_run_mac(EVP_TEST *t)
 
         /* If the MAC uses IV, we have to set it again */
         if (expected->iv != NULL) {
-            ivparams[0] =
-                OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_IV,
-                                                  expected->iv,
-                                                  expected->iv_len);
+            ivparams[0] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_IV,
+                expected->iv,
+                expected->iv_len);
             ivparams[1] = OSSL_PARAM_construct_end();
         }
         ERR_set_mark();
@@ -2087,17 +2086,17 @@ static int mac_test_run_mac(EVP_TEST *t)
     if (!xof) {
         OPENSSL_cleanse(got, got_len);
         if (!TEST_true(EVP_Q_mac(libctx, expected->mac_name, NULL,
-                                 expected->alg, params,
-                                 expected->key, expected->key_len,
-                                 expected->input, expected->input_len,
-                                 got, got_len, &size))
-                || !TEST_mem_eq(got, size,
-                                expected->output, expected->output_len)) {
+                expected->alg, params,
+                expected->key, expected->key_len,
+                expected->input, expected->input_len,
+                got, got_len, &size))
+            || !TEST_mem_eq(got, size,
+                expected->output, expected->output_len)) {
             t->err = "EVP_Q_mac failed";
             goto err;
         }
     }
- err:
+err:
     ctrl2params_free(params, params_n, params_n_allocstart);
     EVP_MAC_CTX_free(ctx);
     OPENSSL_free(got);
@@ -2200,10 +2199,10 @@ static int kem_test_parse(EVP_TEST *t, const char *keyword, const char *value)
         return parse_bin(value, &kdata->output, &kdata->outputlen);
     if (strcmp(keyword, "EncodedPublicKey") == 0)
         return parse_bin(value, &kdata->encoded_pub_key,
-                         &kdata->encoded_pub_key_len);
+            &kdata->encoded_pub_key_len);
     if (strcmp(keyword, "EncodedPrivateKey") == 0)
         return parse_bin(value, &kdata->encoded_priv_key,
-                         &kdata->encoded_priv_key_len);
+            &kdata->encoded_priv_key_len);
     if (strcmp(keyword, "Entropy") == 0)
         return parse_bin(value, &kdata->entropy, &kdata->entropylen);
     if (strcmp(keyword, "Ciphertext") == 0)
@@ -2214,8 +2213,8 @@ static int kem_test_parse(EVP_TEST *t, const char *keyword, const char *value)
 }
 
 static int encapsulate(EVP_TEST *t, EVP_PKEY_CTX *ctx, const char *op,
-                       unsigned char **outwrapped, size_t *outwrappedlen,
-                       unsigned char **outsecret, size_t *outsecretlen)
+    unsigned char **outwrapped, size_t *outwrappedlen,
+    unsigned char **outsecret, size_t *outsecretlen)
 {
     int ret = 0;
     KEM_DATA *kdata = t->data;
@@ -2228,7 +2227,7 @@ static int encapsulate(EVP_TEST *t, EVP_PKEY_CTX *ctx, const char *op,
 
     if (sk_OPENSSL_STRING_num(kdata->init_ctrls) > 0)
         if (!ctrl2params(t, kdata->init_ctrls, NULL, params, params_max,
-                         &params_n))
+                &params_n))
             goto err;
 
     /* We don't expect very many controls here */
@@ -2237,10 +2236,9 @@ static int encapsulate(EVP_TEST *t, EVP_PKEY_CTX *ctx, const char *op,
 
     if (kdata->entropy != NULL)
         /* Input key material a.k.a entropy */
-        params[params_n++] =
-            OSSL_PARAM_construct_octet_string(OSSL_KEM_PARAM_IKME,
-                                              kdata->entropy,
-                                              kdata->entropylen);
+        params[params_n++] = OSSL_PARAM_construct_octet_string(OSSL_KEM_PARAM_IKME,
+            kdata->entropy,
+            kdata->entropylen);
     params[params_n] = OSSL_PARAM_construct_end();
 
     if (EVP_PKEY_encapsulate_init(ctx, params) <= 0) {
@@ -2301,8 +2299,8 @@ static int encapsulate(EVP_TEST *t, EVP_PKEY_CTX *ctx, const char *op,
 }
 
 static int decapsulate(EVP_TEST *t, EVP_PKEY_CTX *ctx, const char *op,
-                       const unsigned char *in, size_t inlen,
-                       const unsigned char *expected, size_t expectedlen)
+    const unsigned char *in, size_t inlen,
+    const unsigned char *expected, size_t expectedlen)
 {
     int ret = 0;
     KEM_DATA *kdata = t->data;
@@ -2314,7 +2312,7 @@ static int decapsulate(EVP_TEST *t, EVP_PKEY_CTX *ctx, const char *op,
 
     if (sk_OPENSSL_STRING_num(kdata->init_ctrls) > 0) {
         if (!ctrl2params(t, kdata->init_ctrls, NULL,
-                         params, 2, &params_n))
+                params, 2, &params_n))
             goto err;
         p = params;
     }
@@ -2374,18 +2372,20 @@ static int kem_test_run(EVP_TEST *t)
     } else if (kdata->encoded_pub_key != NULL) {
         /* Encoded public key */
         if ((pkey = EVP_PKEY_new_raw_public_key_ex(libctx, kdata->algname,
-                                                   propquery,
-                                                   kdata->encoded_pub_key,
-                                                   kdata->encoded_pub_key_len)) == NULL) {
+                 propquery,
+                 kdata->encoded_pub_key,
+                 kdata->encoded_pub_key_len))
+            == NULL) {
             t->err = "TEST_PARSE_PUBLIC_KEY_ERROR";
             goto ok;
         }
     } else if (kdata->encoded_priv_key != NULL) {
         /* Encoded private key */
         if ((pkey = EVP_PKEY_new_raw_private_key_ex(libctx, kdata->algname,
-                                                    propquery,
-                                                    kdata->encoded_priv_key,
-                                                    kdata->encoded_priv_key_len)) == NULL) {
+                 propquery,
+                 kdata->encoded_priv_key,
+                 kdata->encoded_priv_key_len))
+            == NULL) {
             t->err = "TEST_PARSE_PRIVATE_KEY_ERROR";
             goto ok;
         }
@@ -2401,17 +2401,17 @@ static int kem_test_run(EVP_TEST *t)
         size_t wrappedlen = 0, secretlen = 0;
 
         ret = encapsulate(t, kdata->ctx, kdata->op, &wrapped, &wrappedlen,
-                          &secret, &secretlen);
+            &secret, &secretlen);
         if (ret == 0 || t->err != NULL)
             goto err;
 
         /* Also attempt to decrypt if we have the private key */
         if (found_key || kdata->encoded_priv_key != NULL)
             ret = decapsulate(t, kdata->ctx, kdata->op, wrapped, wrappedlen,
-                              secret, secretlen);
+                secret, secretlen);
     } else {
         ret = decapsulate(t, kdata->ctx, kdata->op, kdata->input, kdata->inputlen,
-                          kdata->output, kdata->outputlen);
+            kdata->output, kdata->outputlen);
     }
 
 ok:
@@ -2443,12 +2443,12 @@ typedef struct pkey_data_st {
     /* Signature algo for such operations */
     EVP_SIGNATURE *sigalgo;
     /* Key operation to perform */
-    int (*keyopinit) (EVP_PKEY_CTX *ctx, const OSSL_PARAM params[]);
-    int (*keyopinit_ex2) (EVP_PKEY_CTX *ctx, EVP_SIGNATURE *algo,
-                          const OSSL_PARAM params[]);
-    int (*keyop) (EVP_PKEY_CTX *ctx,
-                  unsigned char *sig, size_t *siglen,
-                  const unsigned char *tbs, size_t tbslen);
+    int (*keyopinit)(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[]);
+    int (*keyopinit_ex2)(EVP_PKEY_CTX *ctx, EVP_SIGNATURE *algo,
+        const OSSL_PARAM params[]);
+    int (*keyop)(EVP_PKEY_CTX *ctx,
+        unsigned char *sig, size_t *siglen,
+        const unsigned char *tbs, size_t tbslen);
     /* Input to MAC */
     unsigned char *input;
     size_t input_len;
@@ -2456,7 +2456,7 @@ typedef struct pkey_data_st {
     unsigned char *output;
     size_t output_len;
     STACK_OF(OPENSSL_STRING) *init_controls; /* collection of controls */
-    STACK_OF(OPENSSL_STRING) *controls;      /* collection of controls */
+    STACK_OF(OPENSSL_STRING) *controls; /* collection of controls */
     EVP_PKEY *peer;
     int validate;
 } PKEY_DATA;
@@ -2466,7 +2466,7 @@ typedef struct pkey_data_st {
  * the appropriate initialisation function
  */
 static int pkey_test_init_keyctx(EVP_TEST *t, const char *keyname,
-                                 int use_public)
+    int use_public)
 {
     PKEY_DATA *kdata;
     EVP_PKEY *pkey = NULL;
@@ -2496,13 +2496,13 @@ static int pkey_test_init_keyctx(EVP_TEST *t, const char *keyname,
 }
 
 static int pkey_test_init(EVP_TEST *t, const char *name,
-                          int use_public,
-                          int (*keyopinit) (EVP_PKEY_CTX *ctx,
-                                            const OSSL_PARAM params[]),
-                          int (*keyop)(EVP_PKEY_CTX *ctx,
-                                       unsigned char *sig, size_t *siglen,
-                                       const unsigned char *tbs,
-                                       size_t tbslen))
+    int use_public,
+    int (*keyopinit)(EVP_PKEY_CTX *ctx,
+        const OSSL_PARAM params[]),
+    int (*keyop)(EVP_PKEY_CTX *ctx,
+        unsigned char *sig, size_t *siglen,
+        const unsigned char *tbs,
+        size_t tbslen))
 {
     PKEY_DATA *kdata = NULL;
     int rv = 0;
@@ -2519,14 +2519,14 @@ static int pkey_test_init(EVP_TEST *t, const char *name,
 }
 
 static int pkey_test_init_ex2(EVP_TEST *t, const char *name,
-                              int use_public,
-                              int (*keyopinit)(EVP_PKEY_CTX *ctx,
-                                               EVP_SIGNATURE *algo,
-                                               const OSSL_PARAM param[]),
-                              int (*keyop)(EVP_PKEY_CTX *ctx,
-                                           unsigned char *sig, size_t *siglen,
-                                           const unsigned char *tbs,
-                                           size_t tbslen))
+    int use_public,
+    int (*keyopinit)(EVP_PKEY_CTX *ctx,
+        EVP_SIGNATURE *algo,
+        const OSSL_PARAM param[]),
+    int (*keyop)(EVP_PKEY_CTX *ctx,
+        unsigned char *sig, size_t *siglen,
+        const unsigned char *tbs,
+        size_t tbslen))
 {
     PKEY_DATA *kdata = NULL;
     int rv = 0;
@@ -2553,7 +2553,7 @@ static int pkey_test_init_ex2(EVP_TEST *t, const char *name,
     kdata->keyopinit_ex2 = keyopinit;
     kdata->keyop = keyop;
     if (!TEST_ptr(kdata->sigalgo
-                  = EVP_SIGNATURE_fetch(libctx, algoname, propquery))) {
+            = EVP_SIGNATURE_fetch(libctx, algoname, propquery))) {
         TEST_info("algoname = '%s'", algoname);
         return 0;
     }
@@ -2575,7 +2575,7 @@ static void pkey_test_cleanup(EVP_TEST *t)
 }
 
 static int pkey_test_ctrl(EVP_TEST *t, EVP_PKEY_CTX *pctx,
-                          const char *value)
+    const char *value)
 {
     int rv = 0;
     char *p, *tmpval;
@@ -2605,7 +2605,7 @@ static int pkey_test_ctrl(EVP_TEST *t, EVP_PKEY_CTX *pctx,
 }
 
 static int pkey_add_control(EVP_TEST *t, STACK_OF(OPENSSL_STRING) *controls,
-                            const char *value)
+    const char *value)
 {
     char *p;
 
@@ -2626,7 +2626,7 @@ static int pkey_add_control(EVP_TEST *t, STACK_OF(OPENSSL_STRING) *controls,
 }
 
 static int pkey_test_parse(EVP_TEST *t,
-                           const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     PKEY_DATA *kdata = t->data;
     if (strcmp(keyword, "Input") == 0)
@@ -2653,8 +2653,8 @@ static int pkey_test_run_init(EVP_TEST *t)
 
     if (sk_OPENSSL_STRING_num(data->init_controls) > 0) {
         if (!ctrl2params(t, data->init_controls,
-                         NULL,
-                         params, OSSL_NELEM(params), &params_n))
+                NULL,
+                params, OSSL_NELEM(params), &params_n))
             goto err;
         p = params;
     }
@@ -2702,20 +2702,22 @@ static int pkey_test_run(EVP_TEST *t)
     }
 
     if (expected->keyop(expected->ctx, NULL, &got_len,
-                        expected->input, expected->input_len) <= 0
-            || !TEST_ptr(got = OPENSSL_malloc(got_len))) {
+            expected->input, expected->input_len)
+            <= 0
+        || !TEST_ptr(got = OPENSSL_malloc(got_len))) {
         t->err = "KEYOP_LENGTH_ERROR";
         goto err;
     }
     if (expected->keyop(expected->ctx, got, &got_len,
-                        expected->input, expected->input_len) <= 0) {
+            expected->input, expected->input_len)
+        <= 0) {
         t->err = "KEYOP_ERROR";
         goto err;
     }
 
     if (!memory_err_compare(t, "KEYOP_MISMATCH",
-                            expected->output, expected->output_len,
-                            got, got_len))
+            expected->output, expected->output_len,
+            got, got_len))
         goto err;
 
     t->err = NULL;
@@ -2724,25 +2726,27 @@ static int pkey_test_run(EVP_TEST *t)
 
     /* Repeat the test on the EVP_PKEY context copy. */
     if (expected->keyop(copy, NULL, &got_len, expected->input,
-                        expected->input_len) <= 0
-            || !TEST_ptr(got = OPENSSL_malloc(got_len))) {
+            expected->input_len)
+            <= 0
+        || !TEST_ptr(got = OPENSSL_malloc(got_len))) {
         t->err = "KEYOP_LENGTH_ERROR";
         goto err;
     }
     if (expected->keyop(copy, got, &got_len, expected->input,
-                        expected->input_len) <= 0) {
+            expected->input_len)
+        <= 0) {
         t->err = "KEYOP_ERROR";
         goto err;
     }
     if (!memory_err_compare(t, "KEYOP_MISMATCH",
-                            expected->output, expected->output_len,
-                            got, got_len))
+            expected->output, expected->output_len,
+            got, got_len))
         goto err;
 
     if (pkey_check_fips_approved(expected->ctx, t) <= 0)
         goto err;
 
- err:
+err:
     OPENSSL_free(got);
     EVP_PKEY_CTX_free(copy);
     return 1;
@@ -2770,7 +2774,7 @@ static int pkey_fromdata_test_init(EVP_TEST *t, const char *name)
         goto err;
     t->data = kdata;
     return 1;
- err:
+err:
     EVP_PKEY_CTX_free(kdata->ctx);
     OPENSSL_free(kdata);
     return 0;
@@ -2785,7 +2789,7 @@ static void pkey_fromdata_test_cleanup(EVP_TEST *t)
 }
 
 static int pkey_fromdata_test_parse(EVP_TEST *t,
-                                    const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     PKEY_DATA *kdata = t->data;
 
@@ -2813,7 +2817,7 @@ static int pkey_fromdata_test_run(EVP_TEST *t)
 
     if (sk_OPENSSL_STRING_num(kdata->controls) > 0) {
         if (!ctrl2params(t, kdata->controls, key_settable_ctx_params,
-                         params, OSSL_NELEM(params), &params_n))
+                params, OSSL_NELEM(params), &params_n))
             goto err;
         p = params;
     }
@@ -2845,7 +2849,7 @@ static int sign_test_init(EVP_TEST *t, const char *name)
 {
     if (strchr(name, ':') != NULL)
         return pkey_test_init_ex2(t, name, 0,
-                                  EVP_PKEY_sign_init_ex2, EVP_PKEY_sign);
+            EVP_PKEY_sign_init_ex2, EVP_PKEY_sign);
     return pkey_test_init(t, name, 0, EVP_PKEY_sign_init_ex, EVP_PKEY_sign);
 }
 
@@ -2864,7 +2868,7 @@ static const EVP_TEST_METHOD psign_test_method = {
 static int sign_test_message_init(EVP_TEST *t, const char *name)
 {
     return pkey_test_init_ex2(t, name, 0,
-                              EVP_PKEY_sign_message_init, EVP_PKEY_sign);
+        EVP_PKEY_sign_message_init, EVP_PKEY_sign);
 }
 
 static const EVP_TEST_METHOD psign_message_test_method = {
@@ -2884,10 +2888,10 @@ static int verify_recover_test_init(EVP_TEST *t, const char *name)
 {
     if (strchr(name, ':') != NULL)
         return pkey_test_init_ex2(t, name, 1,
-                                  EVP_PKEY_verify_recover_init_ex2,
-                                  EVP_PKEY_verify_recover);
+            EVP_PKEY_verify_recover_init_ex2,
+            EVP_PKEY_verify_recover);
     return pkey_test_init(t, name, 1, EVP_PKEY_verify_recover_init_ex,
-                          EVP_PKEY_verify_recover);
+        EVP_PKEY_verify_recover);
 }
 
 static const EVP_TEST_METHOD pverify_recover_test_method = {
@@ -2901,7 +2905,7 @@ static const EVP_TEST_METHOD pverify_recover_test_method = {
 static int decrypt_test_init(EVP_TEST *t, const char *name)
 {
     return pkey_test_init(t, name, 0, EVP_PKEY_decrypt_init_ex,
-                          EVP_PKEY_decrypt);
+        EVP_PKEY_decrypt);
 }
 
 static const EVP_TEST_METHOD pdecrypt_test_method = {
@@ -2921,7 +2925,7 @@ static int verify_test_init(EVP_TEST *t, const char *name)
 {
     if (strchr(name, ':') != NULL)
         return pkey_test_init_ex2(t, name, 1,
-                                  EVP_PKEY_verify_init_ex2, NULL);
+            EVP_PKEY_verify_init_ex2, NULL);
     return pkey_test_init(t, name, 1, EVP_PKEY_verify_init_ex, NULL);
 }
 
@@ -2933,7 +2937,8 @@ static int verify_test_run(EVP_TEST *t)
     if (!pkey_test_run_init(t))
         goto err;
     if (EVP_PKEY_verify(kdata->ctx, kdata->output, kdata->output_len,
-                        kdata->input, kdata->input_len) <= 0) {
+            kdata->input, kdata->input_len)
+        <= 0) {
         t->err = "VERIFY_ERROR";
         goto err;
     }
@@ -2958,7 +2963,7 @@ static const EVP_TEST_METHOD pverify_test_method = {
 static int verify_message_test_init(EVP_TEST *t, const char *name)
 {
     return pkey_test_init_ex2(t, name, 0,
-                              EVP_PKEY_verify_message_init, NULL);
+        EVP_PKEY_verify_message_init, NULL);
 }
 
 static const EVP_TEST_METHOD pverify_message_test_method = {
@@ -2977,7 +2982,7 @@ static const EVP_TEST_METHOD pverify_message_test_method = {
 static int verify_message_public_test_init(EVP_TEST *t, const char *name)
 {
     return pkey_test_init_ex2(t, name, 1,
-                              EVP_PKEY_verify_message_init, NULL);
+        EVP_PKEY_verify_message_init, NULL);
 }
 
 static const EVP_TEST_METHOD pverify_message_public_test_method = {
@@ -2994,7 +2999,7 @@ static int pderive_test_init(EVP_TEST *t, const char *name)
 }
 
 static int pderive_test_parse(EVP_TEST *t,
-                              const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     PKEY_DATA *kdata = t->data;
     int validate = 0;
@@ -3033,7 +3038,8 @@ static int pderive_test_run(EVP_TEST *t)
 
     t->err = NULL;
     if (EVP_PKEY_derive_set_peer_ex(expected->ctx, expected->peer,
-                                    expected->validate) <= 0) {
+            expected->validate)
+        <= 0) {
         t->err = "DERIVE_SET_PEER_ERROR";
         goto err;
     }
@@ -3057,8 +3063,8 @@ static int pderive_test_run(EVP_TEST *t)
         goto err;
     }
     if (!memory_err_compare(t, "SHARED_SECRET_MISMATCH",
-                            expected->output, expected->output_len,
-                            got, got_len))
+            expected->output, expected->output_len,
+            got, got_len))
         goto err;
 
     if (!pkey_check_fips_approved(dctx, t)) {
@@ -3066,7 +3072,7 @@ static int pderive_test_run(EVP_TEST *t)
         goto err;
     }
     t->err = NULL;
- err:
+err:
     OPENSSL_free(got);
     EVP_PKEY_CTX_free(dctx);
     return ret;
@@ -3086,23 +3092,25 @@ static const EVP_TEST_METHOD pderive_test_method = {
 
 typedef enum pbe_type_enum {
     PBE_TYPE_INVALID = 0,
-    PBE_TYPE_SCRYPT, PBE_TYPE_PBKDF2, PBE_TYPE_PKCS12
+    PBE_TYPE_SCRYPT,
+    PBE_TYPE_PBKDF2,
+    PBE_TYPE_PKCS12
 } PBE_TYPE;
 
 typedef struct pbe_data_st {
     PBE_TYPE pbe_type;
-        /* scrypt parameters */
+    /* scrypt parameters */
     uint64_t N, r, p, maxmem;
-        /* PKCS#12 parameters */
+    /* PKCS#12 parameters */
     int id, iter;
     const EVP_MD *md;
-        /* password */
+    /* password */
     unsigned char *pass;
     size_t pass_len;
-        /* salt */
+    /* salt */
     unsigned char *salt;
     size_t salt_len;
-        /* Expected output */
+    /* Expected output */
     unsigned char *key;
     size_t key_len;
 } PBE_DATA;
@@ -3117,7 +3125,7 @@ static int parse_uint64(const char *value, uint64_t *pr)
         TEST_info("Invalid empty integer value");
         return -1;
     }
-    for (*pr = 0; *p; ) {
+    for (*pr = 0; *p;) {
         if (*pr > UINT64_MAX / 10) {
             TEST_error("Integer overflow in string %s", value);
             return -1;
@@ -3134,7 +3142,7 @@ static int parse_uint64(const char *value, uint64_t *pr)
 }
 
 static int scrypt_test_parse(EVP_TEST *t,
-                             const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     PBE_DATA *pdata = t->data;
 
@@ -3151,7 +3159,7 @@ static int scrypt_test_parse(EVP_TEST *t,
 #endif
 
 static int pbkdf2_test_parse(EVP_TEST *t,
-                             const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     PBE_DATA *pdata = t->data;
 
@@ -3171,7 +3179,7 @@ static int pbkdf2_test_parse(EVP_TEST *t,
 }
 
 static int pkcs12_test_parse(EVP_TEST *t,
-                             const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     PBE_DATA *pdata = t->data;
 
@@ -3221,7 +3229,7 @@ static void pbe_test_cleanup(EVP_TEST *t)
 }
 
 static int pbe_test_parse(EVP_TEST *t,
-                          const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     PBE_DATA *pdata = t->data;
 
@@ -3257,39 +3265,42 @@ static int pbe_test_run(EVP_TEST *t)
     }
     if (expected->pbe_type == PBE_TYPE_PBKDF2) {
         if (PKCS5_PBKDF2_HMAC((char *)expected->pass, expected->pass_len,
-                              expected->salt, expected->salt_len,
-                              expected->iter, expected->md,
-                              expected->key_len, key) == 0) {
+                expected->salt, expected->salt_len,
+                expected->iter, expected->md,
+                expected->key_len, key)
+            == 0) {
             t->err = "PBKDF2_ERROR";
             goto err;
         }
 #ifndef OPENSSL_NO_SCRYPT
     } else if (expected->pbe_type == PBE_TYPE_SCRYPT) {
         if (EVP_PBE_scrypt((const char *)expected->pass, expected->pass_len,
-                            expected->salt, expected->salt_len,
-                            expected->N, expected->r, expected->p,
-                            expected->maxmem, key, expected->key_len) == 0) {
+                expected->salt, expected->salt_len,
+                expected->N, expected->r, expected->p,
+                expected->maxmem, key, expected->key_len)
+            == 0) {
             t->err = "SCRYPT_ERROR";
             goto err;
         }
 #endif
     } else if (expected->pbe_type == PBE_TYPE_PKCS12) {
         fetched_digest = EVP_MD_fetch(libctx, EVP_MD_get0_name(expected->md),
-                                      propquery);
+            propquery);
         if (fetched_digest == NULL) {
             t->err = "PKCS12_ERROR";
             goto err;
         }
         if (PKCS12_key_gen_uni(expected->pass, expected->pass_len,
-                               expected->salt, expected->salt_len,
-                               expected->id, expected->iter, expected->key_len,
-                               key, fetched_digest) == 0) {
+                expected->salt, expected->salt_len,
+                expected->id, expected->iter, expected->key_len,
+                key, fetched_digest)
+            == 0) {
             t->err = "PKCS12_ERROR";
             goto err;
         }
     }
     if (!memory_err_compare(t, "KEY_MISMATCH", expected->key, expected->key_len,
-                            key, expected->key_len))
+            key, expected->key_len))
         goto err;
 
     t->err = NULL;
@@ -3308,7 +3319,6 @@ static const EVP_TEST_METHOD pbe_test_method = {
     pbe_test_run
 };
 
-
 /**
  **  BASE64 TESTS
  **/
@@ -3346,7 +3356,7 @@ static int encode_test_init(EVP_TEST *t, const char *encoding)
     } else {
         TEST_error("Bad encoding: %s."
                    " Should be one of {canonical, valid, invalid}",
-                   encoding);
+            encoding);
         goto err;
     }
     t->data = edata;
@@ -3366,7 +3376,7 @@ static void encode_test_cleanup(EVP_TEST *t)
 }
 
 static int encode_test_parse(EVP_TEST *t,
-                             const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     ENCODE_DATA *edata = t->data;
 
@@ -3393,8 +3403,7 @@ static int encode_test_run(EVP_TEST *t)
     if (expected->encoding == BASE64_CANONICAL_ENCODING) {
 
         if (!TEST_ptr(encode_ctx = EVP_ENCODE_CTX_new())
-                || !TEST_ptr(encode_out =
-                        OPENSSL_malloc(EVP_ENCODE_LENGTH(expected->input_len))))
+            || !TEST_ptr(encode_out = OPENSSL_malloc(EVP_ENCODE_LENGTH(expected->input_len))))
             goto err;
 
         EVP_EncodeInit(encode_ctx);
@@ -3403,13 +3412,13 @@ static int encode_test_run(EVP_TEST *t)
         donelen = 0;
         output_len = 0;
         do {
-            size_t current_len = (size_t) data_chunk_size;
+            size_t current_len = (size_t)data_chunk_size;
 
-            if (data_chunk_size == 0 || (size_t) data_chunk_size > input_len)
+            if (data_chunk_size == 0 || (size_t)data_chunk_size > input_len)
                 current_len = input_len;
             if (!TEST_true(EVP_EncodeUpdate(encode_ctx, encode_out, &chunk_len,
-                                            expected->input + donelen,
-                                            current_len)))
+                    expected->input + donelen,
+                    current_len)))
                 goto err;
             donelen += current_len;
             input_len -= current_len;
@@ -3420,8 +3429,8 @@ static int encode_test_run(EVP_TEST *t)
         output_len += chunk_len;
 
         if (!memory_err_compare(t, "BAD_ENCODING",
-                                expected->output, expected->output_len,
-                                encode_out, output_len))
+                expected->output, expected->output_len,
+                encode_out, output_len))
             goto err;
     }
 
@@ -3440,12 +3449,13 @@ static int encode_test_run(EVP_TEST *t)
     input_len = expected->output_len;
     donelen = 0;
     do {
-        size_t current_len = (size_t) data_chunk_size;
+        size_t current_len = (size_t)data_chunk_size;
 
-        if (data_chunk_size == 0 || (size_t) data_chunk_size > input_len)
+        if (data_chunk_size == 0 || (size_t)data_chunk_size > input_len)
             current_len = input_len;
         if (EVP_DecodeUpdate(decode_ctx, decode_out + output_len, &chunk_len,
-                                expected->output + donelen, current_len) < 0) {
+                expected->output + donelen, current_len)
+            < 0) {
             t->err = "DECODE_ERROR";
             goto err;
         }
@@ -3461,9 +3471,9 @@ static int encode_test_run(EVP_TEST *t)
     output_len += chunk_len;
 
     if (expected->encoding != BASE64_INVALID_ENCODING
-            && !memory_err_compare(t, "BAD_DECODING",
-                                   expected->input, expected->input_len,
-                                   decode_out, output_len)) {
+        && !memory_err_compare(t, "BAD_DECODING",
+            expected->input, expected->input_len,
+            decode_out, output_len)) {
         t->err = "BAD_DECODING";
         goto err;
     }
@@ -3476,7 +3486,7 @@ static int encode_test_run(EVP_TEST *t)
     }
 
     t->err = NULL;
- err:
+err:
     OPENSSL_free(encode_out);
     OPENSSL_free(decode_out);
     EVP_ENCODE_CTX_free(decode_ctx);
@@ -3492,11 +3502,10 @@ static const EVP_TEST_METHOD encode_test_method = {
     encode_test_run,
 };
 
-
 /**
  **  RAND TESTS
  **/
-#define MAX_RAND_REPEATS    15
+#define MAX_RAND_REPEATS 15
 
 typedef struct rand_data_pass_st {
     unsigned char *entropy;
@@ -3510,8 +3519,8 @@ typedef struct rand_data_pass_st {
     unsigned char *pr_entropyB;
     unsigned char *output;
     size_t entropy_len, nonce_len, pers_len, addinA_len, addinB_len,
-           pr_entropyA_len, pr_entropyB_len, output_len, reseed_entropy_len,
-           reseed_addin_len;
+        pr_entropyA_len, pr_entropyB_len, output_len, reseed_entropy_len,
+        reseed_addin_len;
 } RAND_DATA_PASS;
 
 typedef struct rand_data_st {
@@ -3565,7 +3574,7 @@ static int rand_test_init(EVP_TEST *t, const char *name)
     rdata->n = -1;
     t->data = rdata;
     return 1;
- err:
+err:
     EVP_RAND_CTX_free(rdata->parent);
     OPENSSL_free(rdata);
     return 0;
@@ -3597,7 +3606,7 @@ static void rand_test_cleanup(EVP_TEST *t)
 }
 
 static int rand_test_parse(EVP_TEST *t,
-                          const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     RAND_DATA *rdata = t->data;
     RAND_DATA_PASS *item;
@@ -3615,14 +3624,14 @@ static int rand_test_parse(EVP_TEST *t,
             return parse_bin(value, &item->entropy, &item->entropy_len);
         if (HAS_PREFIX(keyword, "ReseedEntropy."))
             return parse_bin(value, &item->reseed_entropy,
-                             &item->reseed_entropy_len);
+                &item->reseed_entropy_len);
         if (HAS_PREFIX(keyword, "Nonce."))
             return parse_bin(value, &item->nonce, &item->nonce_len);
         if (HAS_PREFIX(keyword, "PersonalisationString."))
             return parse_bin(value, &item->pers, &item->pers_len);
         if (HAS_PREFIX(keyword, "ReseedAdditionalInput."))
             return parse_bin(value, &item->reseed_addin,
-                             &item->reseed_addin_len);
+                &item->reseed_addin_len);
         if (HAS_PREFIX(keyword, "AdditionalInputA."))
             return parse_bin(value, &item->addinA, &item->addinA_len);
         if (HAS_PREFIX(keyword, "AdditionalInputB."))
@@ -3675,8 +3684,8 @@ static int rand_test_run(EVP_TEST *t)
 
     if (sk_OPENSSL_STRING_num(expected->init_controls) > 0) {
         if (!ctrl2params(t, expected->init_controls,
-                         NULL,
-                         params, OSSL_NELEM(params), &params_n))
+                NULL,
+                params, OSSL_NELEM(params), &params_n))
             goto err;
     }
     p = params + params_n;
@@ -3684,10 +3693,10 @@ static int rand_test_run(EVP_TEST *t)
     *p++ = OSSL_PARAM_construct_int(OSSL_DRBG_PARAM_USE_DF, &expected->use_df);
     if (expected->cipher != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_CIPHER,
-                                                expected->cipher, 0);
+            expected->cipher, 0);
     if (expected->digest != NULL)
         *p++ = OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_DIGEST,
-                                                expected->digest, 0);
+            expected->digest, 0);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_DRBG_PARAM_MAC, "HMAC", 0);
     *p = OSSL_PARAM_construct_end();
     if (!EVP_RAND_CTX_set_params(expected->ctx, params)) {
@@ -3707,78 +3716,71 @@ static int rand_test_run(EVP_TEST *t)
         p = params;
         z = item->entropy != NULL ? item->entropy : (unsigned char *)"";
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                                 z, item->entropy_len);
+            z, item->entropy_len);
         z = item->nonce != NULL ? item->nonce : (unsigned char *)"";
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_NONCE,
-                                                 z, item->nonce_len);
+            z, item->nonce_len);
         *p = OSSL_PARAM_construct_end();
         if (!TEST_true(EVP_RAND_instantiate(expected->parent, strength,
-                                            0, NULL, 0, params)))
+                0, NULL, 0, params)))
             goto err;
 
         z = item->pers != NULL ? item->pers : (unsigned char *)"";
-        if (!TEST_true(EVP_RAND_instantiate
-                           (expected->ctx, strength,
-                            expected->prediction_resistance, z,
-                            item->pers_len, NULL)))
+        if (!TEST_true(EVP_RAND_instantiate(expected->ctx, strength,
+                expected->prediction_resistance, z,
+                item->pers_len, NULL)))
             goto err;
 
         if (item->reseed_entropy != NULL) {
-            params[0] = OSSL_PARAM_construct_octet_string
-                           (OSSL_RAND_PARAM_TEST_ENTROPY, item->reseed_entropy,
-                            item->reseed_entropy_len);
+            params[0] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY, item->reseed_entropy,
+                item->reseed_entropy_len);
             params[1] = OSSL_PARAM_construct_end();
             if (!TEST_true(EVP_RAND_CTX_set_params(expected->parent, params)))
                 goto err;
 
-            if (!TEST_true(EVP_RAND_reseed
-                               (expected->ctx, expected->prediction_resistance,
-                                NULL, 0, item->reseed_addin,
-                                item->reseed_addin_len)))
+            if (!TEST_true(EVP_RAND_reseed(expected->ctx, expected->prediction_resistance,
+                    NULL, 0, item->reseed_addin,
+                    item->reseed_addin_len)))
                 goto err;
         }
         if (item->pr_entropyA != NULL) {
-            params[0] = OSSL_PARAM_construct_octet_string
-                           (OSSL_RAND_PARAM_TEST_ENTROPY, item->pr_entropyA,
-                            item->pr_entropyA_len);
+            params[0] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY, item->pr_entropyA,
+                item->pr_entropyA_len);
             params[1] = OSSL_PARAM_construct_end();
             if (!TEST_true(EVP_RAND_CTX_set_params(expected->parent, params)))
                 goto err;
         }
-        if (!TEST_true(EVP_RAND_generate
-                           (expected->ctx, got, got_len,
-                            strength, expected->prediction_resistance,
-                            item->addinA, item->addinA_len)))
+        if (!TEST_true(EVP_RAND_generate(expected->ctx, got, got_len,
+                strength, expected->prediction_resistance,
+                item->addinA, item->addinA_len)))
             goto err;
 
         if (item->pr_entropyB != NULL) {
-            params[0] = OSSL_PARAM_construct_octet_string
-                           (OSSL_RAND_PARAM_TEST_ENTROPY, item->pr_entropyB,
-                            item->pr_entropyB_len);
+            params[0] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY, item->pr_entropyB,
+                item->pr_entropyB_len);
             params[1] = OSSL_PARAM_construct_end();
             if (!TEST_true(EVP_RAND_CTX_set_params(expected->parent, params)))
                 goto err;
         }
-        if (!TEST_true(EVP_RAND_generate
-                           (expected->ctx, got, got_len,
-                            strength, expected->prediction_resistance,
-                            item->addinB, item->addinB_len)))
+        if (!TEST_true(EVP_RAND_generate(expected->ctx, got, got_len,
+                strength, expected->prediction_resistance,
+                item->addinB, item->addinB_len)))
             goto err;
         if (!TEST_mem_eq(got, got_len, item->output, item->output_len))
             goto err;
         if (!rand_check_fips_approved(expected->ctx, t))
             goto err;
         if (!TEST_true(EVP_RAND_uninstantiate(expected->ctx))
-                || !TEST_true(EVP_RAND_uninstantiate(expected->parent))
-                || !TEST_true(EVP_RAND_verify_zeroization(expected->ctx))
-                || !TEST_int_eq(EVP_RAND_get_state(expected->ctx),
-                                EVP_RAND_STATE_UNINITIALISED))
+            || !TEST_true(EVP_RAND_uninstantiate(expected->parent))
+            || !TEST_true(EVP_RAND_verify_zeroization(expected->ctx))
+            || !TEST_int_eq(EVP_RAND_get_state(expected->ctx),
+                EVP_RAND_STATE_UNINITIALISED))
             goto err;
     }
     t->err = NULL;
     ret = 1;
 
- err:
+err:
     if (ret == 0 && i >= 0)
         TEST_info("Error in test case %d of %d\n", i, expected->n + 1);
     OPENSSL_free(got);
@@ -3857,7 +3859,7 @@ static void kdf_test_cleanup(EVP_TEST *t)
 }
 
 static int kdf_test_ctrl(EVP_TEST *t, EVP_KDF_CTX *kctx,
-                         const char *value)
+    const char *value)
 {
     KDF_DATA *kdata = t->data;
     int rv;
@@ -3922,7 +3924,7 @@ static int kdf_test_ctrl(EVP_TEST *t, EVP_KDF_CTX *kctx,
     }
 
     rv = OSSL_PARAM_allocate_from_text(kdata->p, defs, name, p,
-                                       strlen(p), NULL);
+        strlen(p), NULL);
     *++kdata->p = OSSL_PARAM_construct_end();
     if (!rv) {
         t->err = "KDF_PARAM_ERROR";
@@ -3938,7 +3940,7 @@ static int kdf_test_ctrl(EVP_TEST *t, EVP_KDF_CTX *kctx,
     }
 
     if ((strcmp(name, "cipher") == 0
-        || strcmp(name, "cekalg") == 0)
+            || strcmp(name, "cekalg") == 0)
         && is_cipher_disabled(p)) {
         TEST_info("skipping, '%s' is disabled", p);
         t->skip = 1;
@@ -3949,13 +3951,13 @@ static int kdf_test_ctrl(EVP_TEST *t, EVP_KDF_CTX *kctx,
         TEST_info("skipping, '%s' is disabled", p);
         t->skip = 1;
     }
- end:
+end:
     OPENSSL_free(name);
     return 1;
 }
 
 static int kdf_test_parse(EVP_TEST *t,
-                          const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     KDF_DATA *kdata = t->data;
 
@@ -3980,8 +3982,8 @@ static int kdf_test_run(EVP_TEST *t)
 
     if (sk_OPENSSL_STRING_num(expected->init_controls) > 0) {
         if (!ctrl2params(t, expected->init_controls,
-                         NULL,
-                         params, OSSL_NELEM(params), &params_n))
+                NULL,
+                params, OSSL_NELEM(params), &params_n))
             goto err;
         if (!EVP_KDF_CTX_set_params(expected->ctx, params)) {
             t->err = "KDF_CTRL_ERROR";
@@ -3999,7 +4001,7 @@ static int kdf_test_run(EVP_TEST *t)
     }
     /* FIPS(3.0.0): can't dup KDF contexts #17572 */
     if (fips_provider_version_gt(libctx, 3, 0, 0)
-            && (ctx = EVP_KDF_CTX_dup(expected->ctx)) != NULL) {
+        && (ctx = EVP_KDF_CTX_dup(expected->ctx)) != NULL) {
         EVP_KDF_CTX_free(expected->ctx);
         expected->ctx = ctx;
     }
@@ -4012,13 +4014,13 @@ static int kdf_test_run(EVP_TEST *t)
         goto err;
     }
     if (!memory_err_compare(t, "KDF_MISMATCH",
-                            expected->output, expected->output_len,
-                            got, got_len))
+            expected->output, expected->output_len,
+            got, got_len))
         goto err;
 
     t->err = NULL;
 
- err:
+err:
     ctrl2params_free(params, params_n, params_allocated_n);
     OPENSSL_free(got);
     return ret;
@@ -4083,7 +4085,7 @@ static void pkey_kdf_test_cleanup(EVP_TEST *t)
 }
 
 static int pkey_kdf_test_parse(EVP_TEST *t,
-                               const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     PKEY_KDF_DATA *kdata = t->data;
 
@@ -4140,7 +4142,7 @@ static int pkey_kdf_test_run(EVP_TEST *t)
     }
     t->err = NULL;
 
- err:
+err:
     OPENSSL_free(got);
     return ret;
 }
@@ -4171,7 +4173,7 @@ static int keypair_test_init(EVP_TEST *t, const char *pair)
 
     /* Split private and public names. */
     if (!TEST_ptr(priv = OPENSSL_strdup(pair))
-            || !TEST_ptr(pub = strchr(priv, ':'))) {
+        || !TEST_ptr(pub = strchr(priv, ':'))) {
         t->err = "PARSING_ERROR";
         goto end;
     }
@@ -4203,7 +4205,7 @@ static int keypair_test_init(EVP_TEST *t, const char *pair)
     rv = 1;
     t->err = NULL;
 
- end:
+end:
     OPENSSL_free(priv);
     return rv;
 }
@@ -4316,7 +4318,7 @@ static void keygen_test_cleanup(EVP_TEST *t)
 }
 
 static int keygen_test_parse(EVP_TEST *t,
-                             const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     KEYGEN_TEST_DATA *keygen = t->data;
 
@@ -4333,7 +4335,7 @@ static int keygen_test_parse(EVP_TEST *t,
 
 /* Iterate thru the key's expected values */
 static int check_pkey_expected_values(EVP_TEST *t, const EVP_PKEY *pkey,
-                                      STACK_OF(OPENSSL_STRING) *out_controls)
+    STACK_OF(OPENSSL_STRING) *out_controls)
 {
     int ret = 0;
     OSSL_PARAM out_params[4], *p;
@@ -4342,8 +4344,8 @@ static int check_pkey_expected_values(EVP_TEST *t, const EVP_PKEY *pkey,
     if (sk_OPENSSL_STRING_num(out_controls) > 0) {
 
         if (!ctrl2params(t, out_controls,
-                         EVP_PKEY_gettable_params(pkey),
-                         out_params, OSSL_NELEM(out_params), &out_params_n))
+                EVP_PKEY_gettable_params(pkey),
+                out_params, OSSL_NELEM(out_params), &out_params_n))
             goto err;
         for (p = out_params; p->key != NULL; ++p) {
             if (p->data_type == OSSL_PARAM_OCTET_STRING) {
@@ -4352,7 +4354,7 @@ static int check_pkey_expected_values(EVP_TEST *t, const EVP_PKEY *pkey,
                 if (data == NULL)
                     goto err;
                 ret = EVP_PKEY_get_octet_string_param(pkey, p->key, data,
-                                                      p->data_size, &len)
+                          p->data_size, &len)
                     && len == p->data_size
                     && (TEST_mem_eq(p->data, len, data, len) == 1);
                 OPENSSL_free(data);
@@ -4388,12 +4390,12 @@ static int keygen_test_run(EVP_TEST *t)
             return 1;
         }
         if (!TEST_ptr(genctx = EVP_PKEY_CTX_new_from_pkey(libctx, keyparams,
-                                                          propquery)))
+                          propquery)))
             goto err;
 
     } else {
         if (!TEST_ptr(genctx = EVP_PKEY_CTX_new_from_name(libctx, keygen->alg,
-                                                          propquery)))
+                          propquery)))
             goto err;
     }
 
@@ -4406,8 +4408,8 @@ static int keygen_test_run(EVP_TEST *t)
         if ((params = OPENSSL_malloc(sizeof(OSSL_PARAM) * 4)) == NULL)
             goto err;
         if (!ctrl2params(t, keygen->in_controls,
-                         EVP_PKEY_CTX_settable_params(genctx),
-                         params, 4, &params_n))
+                EVP_PKEY_CTX_settable_params(genctx),
+                params, 4, &params_n))
             goto err;
         if (!EVP_PKEY_CTX_set_params(genctx, params)) {
             t->err = "PKEY_CTRL_ERROR";
@@ -4499,7 +4501,7 @@ typedef struct {
 } DIGESTSIGN_DATA;
 
 static int digestsigver_test_init(EVP_TEST *t, const char *alg, int is_verify,
-                                  int is_oneshot)
+    int is_oneshot)
 {
     const EVP_MD *md = NULL;
     DIGESTSIGN_DATA *mdat;
@@ -4548,7 +4550,7 @@ static void digestsigver_test_cleanup(EVP_TEST *t)
 }
 
 static int digestsigver_test_parse(EVP_TEST *t,
-                                   const char *keyword, const char *value)
+    const char *keyword, const char *value)
 {
     DIGESTSIGN_DATA *mdata = t->data;
 
@@ -4595,15 +4597,14 @@ static int digestsigver_test_parse(EVP_TEST *t,
 }
 
 static int check_deterministic_noncetype(EVP_TEST *t,
-                                         DIGESTSIGN_DATA *mdata)
+    DIGESTSIGN_DATA *mdata)
 {
     if (mdata->deterministic_noncetype == 1) {
         OSSL_PARAM params[2];
         unsigned int nonce_type = 1;
 
-        params[0] =
-            OSSL_PARAM_construct_uint(OSSL_SIGNATURE_PARAM_NONCE_TYPE,
-                                      &nonce_type);
+        params[0] = OSSL_PARAM_construct_uint(OSSL_SIGNATURE_PARAM_NONCE_TYPE,
+            &nonce_type);
         params[1] = OSSL_PARAM_construct_end();
         if (!EVP_PKEY_CTX_set_params(mdata->pctx, params))
             t->err = "EVP_PKEY_CTX_set_params_ERROR";
@@ -4627,21 +4628,21 @@ static int signverify_init(EVP_TEST *t, DIGESTSIGN_DATA *data)
 
     if (sk_OPENSSL_STRING_num(data->init_controls) > 0) {
         if (!ctrl2params(t, data->init_controls,
-                         NULL,
-                         params, OSSL_NELEM(params), &params_n))
+                NULL,
+                params, OSSL_NELEM(params), &params_n))
             goto err;
         p = params;
     }
 
     if (data->is_verify) {
         if (!EVP_DigestVerifyInit_ex(data->ctx, &data->pctx, name, libctx,
-                                     NULL, data->key, p)) {
+                NULL, data->key, p)) {
             t->err = "DIGESTVERIFYINIT_ERROR";
             goto err;
         }
     } else {
         if (!EVP_DigestSignInit_ex(data->ctx, &data->pctx, name, libctx, NULL,
-                                   data->key, p)) {
+                data->key, p)) {
             t->err = "DIGESTSIGNINIT_ERROR";
             goto err;
         }
@@ -4660,7 +4661,7 @@ static int signverify_init(EVP_TEST *t, DIGESTSIGN_DATA *data)
 }
 
 static int digestsign_update_fn(void *ctx, const unsigned char *buf,
-                                size_t buflen)
+    size_t buflen)
 {
     return EVP_DigestSignUpdate(ctx, buf, buflen);
 }
@@ -4684,7 +4685,7 @@ static int digestsign_test_run(EVP_TEST *t)
     }
 
     if (!evp_test_buffer_do(expected->input, digestsign_update_fn,
-                            expected->ctx)) {
+            expected->ctx)) {
         t->err = "DIGESTUPDATE_ERROR";
         goto err;
     }
@@ -4703,12 +4704,12 @@ static int digestsign_test_run(EVP_TEST *t)
         goto err;
     }
     if (!memory_err_compare(t, "SIGNATURE_MISMATCH",
-                            expected->output, expected->output_len,
-                            got, got_len))
+            expected->output, expected->output_len,
+            got, got_len))
         goto err;
 
     t->err = NULL;
- err:
+err:
     OPENSSL_free(got);
     return 1;
 }
@@ -4727,7 +4728,7 @@ static int digestverify_test_init(EVP_TEST *t, const char *alg)
 }
 
 static int digestverify_update_fn(void *ctx, const unsigned char *buf,
-                                  size_t buflen)
+    size_t buflen)
 {
     return EVP_DigestVerifyUpdate(ctx, buf, buflen);
 }
@@ -4745,7 +4746,8 @@ static int digestverify_test_run(EVP_TEST *t)
     }
 
     if (EVP_DigestVerifyFinal(mdata->ctx, mdata->output,
-                              mdata->output_len) <= 0)
+            mdata->output_len)
+        <= 0)
         t->err = "VERIFY_ERROR";
     return 1;
 }
@@ -4773,7 +4775,7 @@ static int oneshot_digestsign_test_run(EVP_TEST *t)
         goto err;
 
     if (!EVP_DigestSign(expected->ctx, NULL, &got_len,
-                        expected->osin, expected->osin_len)) {
+            expected->osin, expected->osin_len)) {
         t->err = "DIGESTSIGN_LENGTH_ERROR";
         goto err;
     }
@@ -4783,17 +4785,17 @@ static int oneshot_digestsign_test_run(EVP_TEST *t)
     }
     got_len *= 2;
     if (!EVP_DigestSign(expected->ctx, got, &got_len,
-                        expected->osin, expected->osin_len)) {
+            expected->osin, expected->osin_len)) {
         t->err = "DIGESTSIGN_ERROR";
         goto err;
     }
     if (!memory_err_compare(t, "SIGNATURE_MISMATCH",
-                            expected->output, expected->output_len,
-                            got, got_len))
+            expected->output, expected->output_len,
+            got, got_len))
         goto err;
 
     t->err = NULL;
- err:
+err:
     OPENSSL_free(got);
     return 1;
 }
@@ -4819,7 +4821,8 @@ static int oneshot_digestverify_test_run(EVP_TEST *t)
         return 1;
 
     if (EVP_DigestVerify(mdata->ctx, mdata->output, mdata->output_len,
-                         mdata->osin, mdata->osin_len) <= 0)
+            mdata->osin, mdata->osin_len)
+        <= 0)
         t->err = "VERIFY_ERROR";
     return 1;
 }
@@ -4832,7 +4835,6 @@ static const EVP_TEST_METHOD oneshot_digestverify_test_method = {
     oneshot_digestverify_test_run
 };
 
-
 /**
  **  PARSING AND DISPATCH
  **/
@@ -4913,22 +4915,22 @@ static int check_test_error(EVP_TEST *t)
     if (t->err != NULL && t->expected_err == NULL) {
         if (t->aux_err != NULL) {
             TEST_info("%s:%d: Source of above error (%s); unexpected error %s",
-                      t->s.test_file, t->s.start, t->aux_err, t->err);
+                t->s.test_file, t->s.start, t->aux_err, t->err);
         } else {
             TEST_info("%s:%d: Source of above error; unexpected error %s",
-                      t->s.test_file, t->s.start, t->err);
+                t->s.test_file, t->s.start, t->err);
         }
         return 0;
     }
     if (t->err == NULL && t->expected_err != NULL) {
         TEST_info("%s:%d: Succeeded but was expecting %s",
-                  t->s.test_file, t->s.start, t->expected_err);
+            t->s.test_file, t->s.start, t->expected_err);
         return 0;
     }
 
     if (strcmp(t->err, t->expected_err) != 0) {
         TEST_info("%s:%d: Expected %s got %s",
-                  t->s.test_file, t->s.start, t->expected_err, t->err);
+            t->s.test_file, t->s.start, t->expected_err, t->err);
         return 0;
     }
 
@@ -4937,14 +4939,14 @@ static int check_test_error(EVP_TEST *t)
 
     if (t->reason == NULL) {
         TEST_info("%s:%d: Test is missing function or reason code",
-                  t->s.test_file, t->s.start);
+            t->s.test_file, t->s.start);
         return 0;
     }
 
     err = ERR_peek_error();
     if (err == 0) {
         TEST_info("%s:%d: Expected error \"%s\" not set",
-                  t->s.test_file, t->s.start, t->reason);
+            t->s.test_file, t->s.start, t->reason);
         return 0;
     }
 
@@ -4952,7 +4954,7 @@ static int check_test_error(EVP_TEST *t)
     if (reason == NULL) {
         TEST_info("%s:%d: Expected error \"%s\", no strings available."
                   " Assuming ok.",
-                  t->s.test_file, t->s.start, t->reason);
+            t->s.test_file, t->s.start, t->reason);
         return 1;
     }
 
@@ -4960,7 +4962,7 @@ static int check_test_error(EVP_TEST *t)
         return 1;
 
     TEST_info("%s:%d: Expected error \"%s\", got \"%s\"",
-              t->s.test_file, t->s.start, t->reason, reason);
+        t->s.test_file, t->s.start, t->reason, reason);
 
     return 0;
 }
@@ -4977,7 +4979,7 @@ static int run_test(EVP_TEST *t)
         /* run the test */
         if (t->err == NULL && t->meth->run_test(t) != 1) {
             TEST_info("%s:%d %s error",
-                      t->s.test_file, t->s.start, t->meth->name);
+                t->s.test_file, t->s.start, t->meth->name);
             return 0;
         }
         if (!check_test_error(t)) {
@@ -5067,9 +5069,8 @@ static int securitycheck_enabled(void)
 
             prov = OSSL_PROVIDER_load(libctx, "fips");
             if (prov != NULL) {
-                params[0] =
-                    OSSL_PARAM_construct_int(OSSL_PROV_PARAM_SECURITY_CHECKS,
-                                             &check);
+                params[0] = OSSL_PARAM_construct_int(OSSL_PROV_PARAM_SECURITY_CHECKS,
+                    &check);
                 params[1] = OSSL_PARAM_construct_end();
                 OSSL_PROVIDER_get_params(prov, params);
                 OSSL_PROVIDER_unload(prov);
@@ -5097,7 +5098,7 @@ static int prov_available(char *providers)
         for (; isspace((unsigned char)(*providers)); providers++)
             continue;
         if (*providers == '\0')
-            break;               /* End of the road */
+            break; /* End of the road */
         for (p = providers; *p != '\0' && !isspace((unsigned char)(*p)); p++)
             continue;
         if (*p == '\0')
@@ -5105,7 +5106,7 @@ static int prov_available(char *providers)
         else
             *p = '\0';
         if (OSSL_PROVIDER_available(libctx, providers))
-            return 1;            /* Found one */
+            return 1; /* Found one */
     }
     return 0;
 }
@@ -5161,7 +5162,7 @@ static int parse(EVP_TEST *t)
         }
         klist = &public_keys;
     } else if (strcmp(pp->key, "PrivateKeyRaw") == 0
-               || strcmp(pp->key, "PublicKeyRaw") == 0) {
+        || strcmp(pp->key, "PublicKeyRaw") == 0) {
         char *strnid = NULL, *keydata = NULL;
         unsigned char *keybin;
         size_t keylen;
@@ -5195,10 +5196,10 @@ static int parse(EVP_TEST *t)
         }
         if (klist == &private_keys)
             pkey = EVP_PKEY_new_raw_private_key_ex(libctx, strnid, NULL, keybin,
-                                                   keylen);
+                keylen);
         else
             pkey = EVP_PKEY_new_raw_public_key_ex(libctx, strnid, NULL, keybin,
-                                                  keylen);
+                keylen);
         if (pkey == NULL && !key_unsupported()) {
             TEST_info("Can't read %s data", pp->key);
             OPENSSL_free(keybin);
@@ -5209,9 +5210,9 @@ static int parse(EVP_TEST *t)
     } else if (strcmp(pp->key, "Availablein") == 0) {
         if (!prov_available(pp->value)) {
             TEST_info("skipping, '%s' provider not available: %s:%d",
-                      pp->value, t->s.test_file, t->s.start);
-                t->skip = 1;
-                return 0;
+                pp->value, t->s.test_file, t->s.start);
+            t->skip = 1;
+            return 0;
         }
         skipped++;
         pp++;
@@ -5224,9 +5225,9 @@ static int parse(EVP_TEST *t)
                 return 0;
             } else if (j == 0) {
                 TEST_info("skipping, FIPS provider incompatible version: %s:%d",
-                          t->s.test_file, t->s.start);
-                    t->skip = 1;
-                    return 0;
+                    t->s.test_file, t->s.start);
+                t->skip = 1;
+                return 0;
             }
         }
         skipped++;
@@ -5273,13 +5274,13 @@ static int parse(EVP_TEST *t)
 #endif
             {
                 TEST_info("skipping, Securitycheck is disabled: %s:%d",
-                          t->s.test_file, t->s.start);
+                    t->s.test_file, t->s.start);
                 t->skip = 1;
                 return 0;
             }
         } else if (strcmp(pp->key, "Availablein") == 0) {
             TEST_info("Line %d: 'Availablein' should be the first option",
-                      t->s.curr);
+                t->s.curr);
             return 0;
         } else if (strcmp(pp->key, "Result") == 0) {
             if (t->expected_err != NULL) {
@@ -5298,7 +5299,7 @@ static int parse(EVP_TEST *t)
         } else if (strcmp(pp->key, "Threads") == 0) {
             if (OSSL_set_max_threads(libctx, atoi(pp->value)) == 0) {
                 TEST_info("skipping, '%s' threads not available: %s:%d",
-                          pp->value, t->s.test_file, t->s.start);
+                    pp->value, t->s.test_file, t->s.start);
                 t->skip = 1;
             }
         } else if (strcmp(pp->key, "Unapproved") == 0) {
@@ -5306,7 +5307,7 @@ static int parse(EVP_TEST *t)
         } else if (strcmp(pp->key, "Extended-Test") == 0) {
             if (!extended_tests) {
                 TEST_info("skipping extended test: %s:%d",
-                          t->s.test_file, t->s.start);
+                    t->s.test_file, t->s.start);
                 t->skip = 1;
             }
         } else {
@@ -5319,7 +5320,7 @@ static int parse(EVP_TEST *t)
             }
             if (rv < 0) {
                 TEST_info("Line %d: error processing keyword %s = %s\n",
-                          t->s.curr, pp->key, pp->value);
+                    t->s.curr, pp->key, pp->value);
                 return 0;
             }
             if (t->skip)
@@ -5359,7 +5360,9 @@ static int run_file_tests(int i)
     clear_test(t);
 
     free_key_list(public_keys);
+    public_keys = NULL;
     free_key_list(private_keys);
+    private_keys = NULL;
     BIO_free(t->s.key);
     c = t->s.errors;
     OPENSSL_free(t);
@@ -5371,14 +5374,14 @@ const OPTIONS *test_get_options(void)
     static const OPTIONS test_options[] = {
         OPT_TEST_OPTIONS_WITH_EXTRA_USAGE("[file...]\n"),
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the libctx" },
+            "The configuration file to use for the libctx" },
         { "process", OPT_IN_PLACE, 's',
-          "Mode for data processing by cipher tests [in_place/both], both by default"},
+            "Mode for data processing by cipher tests [in_place/both], both by default" },
         { "provider", OPT_PROVIDER_NAME, 's',
-          "The provider to load (when no configuration file, the default value is 'default')" },
+            "The provider to load (when no configuration file, the default value is 'default')" },
         { "propquery", OPT_PROV_PROPQUERY, 's',
-          "Property query used when fetching algorithms" },
-        { "chunk", OPT_DATA_CHUNK, 'N', "Size of data chunks to be processed, 0 for default size"},
+            "Property query used when fetching algorithms" },
+        { "chunk", OPT_DATA_CHUNK, 'N', "Size of data chunks to be processed, 0 for default size" },
         { OPT_HELP_STR, 1, '-', "file\tFile to run tests on.\n" },
         { NULL }
     };
@@ -5402,9 +5405,9 @@ int setup_tests(void)
             break;
         case OPT_IN_PLACE:
             if ((process_mode_in_place = evp_test_process_mode(opt_arg())) == -1)
-        case OPT_DATA_CHUNK:
-            if (!opt_int(opt_arg(), &data_chunk_size))
-                return 0;
+            case OPT_DATA_CHUNK:
+                if (!opt_int(opt_arg(), &data_chunk_size))
+                    return 0;
             break;
         case OPT_PROVIDER_NAME:
             provider_name = opt_arg();
diff --git a/test/evp_xof_test.c b/test/evp_xof_test.c
index 42d358b638b4f..4175ab9f70a2d 100644
--- a/test/evp_xof_test.c
+++ b/test/evp_xof_test.c
@@ -149,10 +149,38 @@ static const unsigned char shake256_largemsg_input[] = {
 };
 
 static const unsigned char shake256_largemsg_output[] = {
-    0x64, 0xea, 0x24, 0x6a, 0xab, 0x80, 0x37, 0x9e,
-    0x08, 0xe2, 0x19, 0x9e, 0x09, 0x69, 0xe2, 0xee,
-    0x1a, 0x5d, 0xd1, 0x68, 0x68, 0xec, 0x8d, 0x42,
-    0xd0, 0xf8, 0xb8, 0x44, 0x74, 0x54, 0x87, 0x3e,
+    0x64,
+    0xea,
+    0x24,
+    0x6a,
+    0xab,
+    0x80,
+    0x37,
+    0x9e,
+    0x08,
+    0xe2,
+    0x19,
+    0x9e,
+    0x09,
+    0x69,
+    0xe2,
+    0xee,
+    0x1a,
+    0x5d,
+    0xd1,
+    0x68,
+    0x68,
+    0xec,
+    0x8d,
+    0x42,
+    0xd0,
+    0xf8,
+    0xb8,
+    0x44,
+    0x74,
+    0x54,
+    0x87,
+    0x3e,
 };
 
 static EVP_MD_CTX *shake_setup(const char *name)
@@ -184,10 +212,10 @@ static int shake_kat_test(void)
     if (!TEST_ptr(ctx = shake_setup("SHAKE256")))
         return 0;
     if (!TEST_true(EVP_DigestUpdate(ctx, shake256_input,
-                                    sizeof(shake256_input)))
+            sizeof(shake256_input)))
         || !TEST_true(EVP_DigestFinalXOF(ctx, out, sizeof(out)))
         || !TEST_mem_eq(out, sizeof(out),
-                        shake256_output,sizeof(shake256_output))
+            shake256_output, sizeof(shake256_output))
         /* Test that a second call to EVP_DigestFinalXOF fails */
         || !TEST_false(EVP_DigestFinalXOF(ctx, out, sizeof(out)))
         /* Test that a call to EVP_DigestSqueeze fails */
@@ -210,7 +238,7 @@ static int shake_kat_digestfinal_test(void)
     if (!TEST_ptr(ctx = shake_setup("SHAKE256")))
         return 0;
     if (!TEST_true(EVP_DigestUpdate(ctx, shake256_input,
-                   sizeof(shake256_input))))
+            sizeof(shake256_input))))
         return 0;
     ERR_set_mark();
     if (!TEST_false(EVP_DigestFinal(ctx, out, &digest_length))) {
@@ -224,11 +252,11 @@ static int shake_kat_digestfinal_test(void)
     if (!TEST_ptr(ctx = shake_setup("SHAKE256")))
         return 0;
     if (!TEST_true(EVP_DigestUpdate(ctx, shake256_input,
-                   sizeof(shake256_input))))
+            sizeof(shake256_input))))
         return 0;
     if (!TEST_true(EVP_DigestFinalXOF(ctx, out, sizeof(out)))
         || !TEST_mem_eq(out, sizeof(out),
-                        shake256_output, sizeof(shake256_output))
+            shake256_output, sizeof(shake256_output))
         || !TEST_false(EVP_DigestFinalXOF(ctx, out, sizeof(out))))
         goto err;
     ret = 1;
@@ -265,11 +293,11 @@ static int shake_kat_digestfinal_xoflen_test(void)
         || !TEST_int_eq(EVP_MD_get_size(md), 0)
         || !TEST_true(EVP_MD_xof(md))
         || !TEST_true(EVP_DigestUpdate(ctx, shake256_input,
-                                       sizeof(shake256_input)))
+            sizeof(shake256_input)))
         || !TEST_true(EVP_DigestFinal(ctx, out, &digest_length))
         || !TEST_uint_eq(digest_length, (unsigned int)sz)
         || !TEST_mem_eq(out, digest_length,
-                        shake256_output, digest_length)
+            shake256_output, digest_length)
         || !TEST_uchar_eq(out[digest_length], 0))
         goto err;
     ret = 1;
@@ -300,13 +328,13 @@ static int shake_absorb_test(void)
             if ((i + sz) > total)
                 sz = total - i;
             if (!TEST_true(EVP_DigestUpdate(ctx, shake256_largemsg_input + i,
-                                            sz)))
+                    sz)))
                 goto err;
         }
         if (!TEST_true(EVP_DigestFinalXOF(ctx, out, sizeof(out)))
             || !TEST_mem_eq(out, sizeof(out),
-                            shake256_largemsg_output,
-                            sizeof(shake256_largemsg_output)))
+                shake256_largemsg_output,
+                sizeof(shake256_largemsg_output)))
             goto err;
         if (!TEST_true(EVP_DigestInit_ex2(ctx, NULL, NULL)))
             goto err;
@@ -326,36 +354,36 @@ static const struct {
 } stride_tests[] = {
     { 1, 1 },
     { 1, 136 },
-    { 1, 136/2 },
-    { 1, 136/2-1 },
-    { 1, 136/2+1 },
-    { 1, 136*3 },
+    { 1, 136 / 2 },
+    { 1, 136 / 2 - 1 },
+    { 1, 136 / 2 + 1 },
+    { 1, 136 * 3 },
     { 8, 8 },
     { 9, 9 },
     { 10, 10 },
-    { 136/2 - 1, 136 },
-    { 136/2 - 1, 136-1 },
-    { 136/2 - 1, 136+1 },
-    { 136/2, 136 },
-    { 136/2, 136-1 },
-    { 136/2, 136+1 },
-    { 136/2 + 1, 136 },
-    { 136/2 + 1, 136-1 },
-    { 136/2 + 1, 136+1 },
+    { 136 / 2 - 1, 136 },
+    { 136 / 2 - 1, 136 - 1 },
+    { 136 / 2 - 1, 136 + 1 },
+    { 136 / 2, 136 },
+    { 136 / 2, 136 - 1 },
+    { 136 / 2, 136 + 1 },
+    { 136 / 2 + 1, 136 },
+    { 136 / 2 + 1, 136 - 1 },
+    { 136 / 2 + 1, 136 + 1 },
     { 136, 2 },
     { 136, 136 },
-    { 136-1, 136 },
-    { 136-1, 136-1 },
-    { 136-1, 136+1 },
-    { 136+1, 136 },
-    { 136+1, 136-1 },
-    { 136+1, 136+1 },
-    { 136*3, 136 },
-    { 136*3, 136 + 1 },
-    { 136*3, 136 - 1 },
-    { 136*3, 136/2 },
-    { 136*3, 136/2 + 1 },
-    { 136*3, 136/2 - 1 },
+    { 136 - 1, 136 },
+    { 136 - 1, 136 - 1 },
+    { 136 - 1, 136 + 1 },
+    { 136 + 1, 136 },
+    { 136 + 1, 136 - 1 },
+    { 136 + 1, 136 + 1 },
+    { 136 * 3, 136 },
+    { 136 * 3, 136 + 1 },
+    { 136 * 3, 136 - 1 },
+    { 136 * 3, 136 / 2 },
+    { 136 * 3, 136 / 2 + 1 },
+    { 136 * 3, 136 / 2 - 1 },
 };
 
 /*
@@ -367,9 +395,9 @@ static const struct {
  * represent the expected output.
  */
 static int do_shake_squeeze_test(int tst,
-                                 const unsigned char *in, size_t inlen,
-                                 const unsigned char *expected_out,
-                                 size_t expected_outlen)
+    const unsigned char *in, size_t inlen,
+    const unsigned char *expected_out,
+    size_t expected_outlen)
 {
     int ret = 0;
     EVP_MD_CTX *ctx = NULL;
@@ -403,7 +431,7 @@ static int do_shake_squeeze_test(int tst,
 static int shake_squeeze_kat_test(int tst)
 {
     return do_shake_squeeze_test(tst, shake256_input, sizeof(shake256_input),
-                                 shake256_output, sizeof(shake256_output));
+        shake256_output, sizeof(shake256_output));
 }
 
 /*
@@ -432,14 +460,14 @@ static int shake_squeeze_large_test(int tst)
 }
 
 static const size_t dupoffset_tests[] = {
-    1, 135, 136, 137, 136*3-1, 136*3, 136*3+1
+    1, 135, 136, 137, 136 * 3 - 1, 136 * 3, 136 * 3 + 1
 };
 
 /* Helper function to test that EVP_MD_CTX_dup() copies the internal state */
 static int do_shake_squeeze_dup_test(int tst, const char *alg,
-                                     const unsigned char *in, size_t inlen,
-                                     const unsigned char *expected_out,
-                                     size_t expected_outlen)
+    const unsigned char *in, size_t inlen,
+    const unsigned char *expected_out,
+    size_t expected_outlen)
 {
     int ret = 0;
     EVP_MD_CTX *cur, *ctx = NULL, *dupctx = NULL;
@@ -494,7 +522,7 @@ static int shake_squeeze_dup_test(int tst)
         goto err;
 
     ret = do_shake_squeeze_dup_test(tst, alg, msg, sizeof(msg),
-                                    out, sizeof(out));
+        out, sizeof(out));
 err:
     EVP_MD_CTX_free(ctx);
     return ret;
@@ -516,7 +544,7 @@ static int shake_squeeze_no_absorb_test(void)
     if (!TEST_true(EVP_DigestInit_ex2(ctx, NULL, NULL))
         || !TEST_true(EVP_DigestSqueeze(ctx, out2, sizeof(out2) / 2))
         || !TEST_true(EVP_DigestSqueeze(ctx, out2 + sizeof(out2) / 2,
-                                        sizeof(out2) / 2)))
+            sizeof(out2) / 2)))
         goto err;
 
     if (!TEST_mem_eq(out2, sizeof(out2), out, sizeof(out)))
@@ -534,7 +562,7 @@ static int xof_fail_test(void)
     EVP_MD *md = NULL;
 
     ret = TEST_ptr(md = EVP_MD_fetch(NULL, "SHA256", NULL))
-            && TEST_false(EVP_MD_xof(md));
+        && TEST_false(EVP_MD_xof(md));
     EVP_MD_free(md);
     return ret;
 }
diff --git a/test/exdatatest.c b/test/exdatatest.c
index 6ee916cb3d670..b3c4a083eb35a 100644
--- a/test/exdatatest.c
+++ b/test/exdatatest.c
@@ -27,7 +27,7 @@ static int gbl_result;
  */
 
 static void exnew(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-          int idx, long argl, void *argp)
+    int idx, long argl, void *argp)
 {
     if (!TEST_int_eq(idx, saved_idx)
         || !TEST_long_eq(argl, saved_argl)
@@ -37,7 +37,7 @@ static void exnew(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
 }
 
 static int exdup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
-          void **from_d, int idx, long argl, void *argp)
+    void **from_d, int idx, long argl, void *argp)
 {
     if (!TEST_int_eq(idx, saved_idx)
         || !TEST_long_eq(argl, saved_argl)
@@ -48,7 +48,7 @@ static int exdup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
 }
 
 static void exfree(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-            int idx, long argl, void *argp)
+    int idx, long argl, void *argp)
 {
     if (!TEST_int_eq(idx, saved_idx)
         || !TEST_long_eq(argl, saved_argl)
@@ -69,7 +69,7 @@ typedef struct myobj_ex_data_st {
 } MYOBJ_EX_DATA;
 
 static void exnew2(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-          int idx, long argl, void *argp)
+    int idx, long argl, void *argp)
 {
     MYOBJ_EX_DATA *ex_data = OPENSSL_zalloc(sizeof(*ex_data));
 
@@ -87,9 +87,9 @@ static void exnew2(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
 }
 
 static int exdup2(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
-          void **from_d, int idx, long argl, void *argp)
+    void **from_d, int idx, long argl, void *argp)
 {
-    MYOBJ_EX_DATA **update_ex_data = (MYOBJ_EX_DATA**)from_d;
+    MYOBJ_EX_DATA **update_ex_data = (MYOBJ_EX_DATA **)from_d;
     MYOBJ_EX_DATA *ex_data = NULL;
 
     if (!TEST_true(idx == saved_idx2 || idx == saved_idx3)
@@ -112,7 +112,7 @@ static int exdup2(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
 }
 
 static void exfree2(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-            int idx, long argl, void *argp)
+    int idx, long argl, void *argp)
 {
     MYOBJ_EX_DATA *ex_data = CRYPTO_get_ex_data(ad, idx);
 
@@ -156,7 +156,7 @@ static char *MYOBJ_gethello(MYOBJ *obj)
 
 static void MYOBJ_sethello2(MYOBJ *obj, char *cp)
 {
-    MYOBJ_EX_DATA* ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx2);
+    MYOBJ_EX_DATA *ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx2);
 
     if (TEST_ptr(ex_data))
         ex_data->hello = cp;
@@ -166,7 +166,7 @@ static void MYOBJ_sethello2(MYOBJ *obj, char *cp)
 
 static char *MYOBJ_gethello2(MYOBJ *obj)
 {
-    MYOBJ_EX_DATA* ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx2);
+    MYOBJ_EX_DATA *ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx2);
 
     if (TEST_ptr(ex_data))
         return ex_data->hello;
@@ -177,11 +177,11 @@ static char *MYOBJ_gethello2(MYOBJ *obj)
 
 static void MYOBJ_allochello3(MYOBJ *obj, char *cp)
 {
-    MYOBJ_EX_DATA* ex_data = NULL;
+    MYOBJ_EX_DATA *ex_data = NULL;
 
     if (TEST_ptr_null(ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx3))
         && TEST_true(CRYPTO_alloc_ex_data(CRYPTO_EX_INDEX_APP, obj,
-                                          &obj->ex_data, saved_idx3))
+            &obj->ex_data, saved_idx3))
         && TEST_ptr(ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx3)))
         ex_data->hello = cp;
     else
@@ -190,7 +190,7 @@ static void MYOBJ_allochello3(MYOBJ *obj, char *cp)
 
 static char *MYOBJ_gethello3(MYOBJ *obj)
 {
-    MYOBJ_EX_DATA* ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx3);
+    MYOBJ_EX_DATA *ex_data = CRYPTO_get_ex_data(&obj->ex_data, saved_idx3);
 
     if (TEST_ptr(ex_data))
         return ex_data->hello;
@@ -213,7 +213,7 @@ static MYOBJ *MYOBJ_dup(MYOBJ *in)
 
     if (obj != NULL)
         obj->st |= CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_APP, &obj->ex_data,
-                                     &in->ex_data);
+            &in->ex_data);
     return obj;
 }
 
@@ -233,11 +233,11 @@ static int test_exdata(void)
     if (!TEST_ptr(saved_argp = OPENSSL_malloc(1)))
         goto err;
     saved_idx = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_APP,
-                                        saved_argl, saved_argp,
-                                        exnew, exdup, exfree);
+        saved_argl, saved_argp,
+        exnew, exdup, exfree);
     saved_idx2 = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_APP,
-                                         saved_argl, saved_argp,
-                                         exnew2, exdup2, exfree2);
+        saved_argl, saved_argp,
+        exnew2, exdup2, exfree2);
     t1 = MYOBJ_new();
     t2 = MYOBJ_new();
     if (!TEST_int_eq(t1->st, 1) || !TEST_int_eq(t2->st, 1))
@@ -250,8 +250,8 @@ static int test_exdata(void)
      * was initialized.
      */
     saved_idx3 = CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_APP,
-                                         saved_argl, saved_argp,
-                                         exnew2, exdup2, exfree2);
+        saved_argl, saved_argp,
+        exnew2, exdup2, exfree2);
     if (!TEST_ptr_null(CRYPTO_get_ex_data(&t1->ex_data, saved_idx3)))
         goto err;
 
@@ -302,7 +302,7 @@ static int test_exdata(void)
 
     if (gbl_result)
         res = 1;
- err:
+err:
     MYOBJ_free(t1);
     MYOBJ_free(t2);
     MYOBJ_free(t3);
diff --git a/test/exptest.c b/test/exptest.c
index 143dfa99581ab..ebb8284899a50 100644
--- a/test/exptest.c
+++ b/test/exptest.c
@@ -20,7 +20,7 @@
 
 #include "testutil.h"
 
-#define NUM_BITS        (BN_BITS2 * 4)
+#define NUM_BITS (BN_BITS2 * 4)
 
 #define BN_print_var(v) test_output_bignum(#v, v)
 
@@ -29,7 +29,7 @@
  * returns zero and prints debug output otherwise.
  */
 static int a_is_zero_mod_one(const char *method, const BIGNUM *r,
-                             const BIGNUM *a)
+    const BIGNUM *a)
 {
     if (!BN_is_zero(r)) {
         TEST_error("%s failed: a ** 0 mod 1 = r (should be 0)", method);
@@ -137,7 +137,7 @@ static int test_mod_exp_zero(void)
     }
 
     ret = !failed;
- err:
+err:
     BN_free(r);
     BN_free(a);
     BN_free(p);
@@ -177,21 +177,21 @@ static int test_mod_exp(int round)
         goto err;
     c = (c % BN_BITS) - BN_BITS2;
     if (!TEST_true(BN_rand(a, NUM_BITS + c, BN_RAND_TOP_ONE,
-                           BN_RAND_BOTTOM_ANY)))
+            BN_RAND_BOTTOM_ANY)))
         goto err;
 
     if (!TEST_int_gt(RAND_bytes(&c, 1), 0))
         goto err;
     c = (c % BN_BITS) - BN_BITS2;
     if (!TEST_true(BN_rand(b, NUM_BITS + c, BN_RAND_TOP_ONE,
-                           BN_RAND_BOTTOM_ANY)))
+            BN_RAND_BOTTOM_ANY)))
         goto err;
 
     if (!TEST_int_gt(RAND_bytes(&c, 1), 0))
         goto err;
     c = (c % BN_BITS) - BN_BITS2;
     if (!TEST_true(BN_rand(m, NUM_BITS + c, BN_RAND_TOP_ONE,
-                           BN_RAND_BOTTOM_ODD)))
+            BN_RAND_BOTTOM_ODD)))
         goto err;
 
     if (!TEST_true(BN_mod(a, a, m, ctx))
@@ -223,7 +223,7 @@ static int test_mod_exp(int round)
     }
 
     ret = 1;
- err:
+err:
     BN_free(r_mont);
     BN_free(r_mont_const);
     BN_free(r_recp);
@@ -288,8 +288,8 @@ static int test_mod_exp_x2(int idx)
         || !TEST_true(BN_mod_exp_simple(r_simple1, a1, b1, m1, ctx))
         || !TEST_true(BN_mod_exp_simple(r_simple2, a2, b2, m2, ctx))
         || !TEST_true(BN_mod_exp_mont_consttime_x2(r_mont_const_x2_1, a1, b1, m1, NULL,
-                                                   r_mont_const_x2_2, a2, b2, m2, NULL,
-                                                   ctx)))
+            r_mont_const_x2_2, a2, b2, m2, NULL,
+            ctx)))
         goto err;
 
     if (!TEST_BN_eq(r_simple1, r_mont_const_x2_1)
@@ -313,7 +313,7 @@ static int test_mod_exp_x2(int idx)
     }
 
     ret = 1;
- err:
+err:
     BN_free(r_mont_const_x2_1);
     BN_free(r_mont_const_x2_2);
     BN_free(r_simple1);
diff --git a/test/ext_internal_test.c b/test/ext_internal_test.c
index 20cf708de27a3..cc354a02e2c17 100644
--- a/test/ext_internal_test.c
+++ b/test/ext_internal_test.c
@@ -88,14 +88,14 @@ static int test_extension_list(void)
         if (!TEST_size_t_eq(i, ext_list[i].idx)) {
             retval = 0;
             TEST_error("TLSEXT_IDX_%s=%zd, found at=%zd\n",
-                       ext_list[i].name, ext_list[i].idx, i);
+                ext_list[i].name, ext_list[i].idx, i);
         }
         type = ossl_get_extension_type(ext_list[i].idx);
         if (!TEST_uint_eq(type, ext_list[i].type)) {
             retval = 0;
             TEST_error("TLSEXT_IDX_%s=%zd expected=0x%05X got=0x%05X",
-                       ext_list[i].name, ext_list[i].idx, ext_list[i].type,
-                       type);
+                ext_list[i].name, ext_list[i].idx, ext_list[i].type,
+                type);
         }
     }
     return retval;
diff --git a/test/fake_cipherprov.c b/test/fake_cipherprov.c
index d058f06aab69a..2322a1a8122b6 100644
--- a/test/fake_cipherprov.c
+++ b/test/fake_cipherprov.c
@@ -77,7 +77,7 @@ static void *fake_skeymgmt_import(void *provctx, int selection, const OSSL_PARAM
 }
 
 static int fake_skeymgmt_export(void *keydata, int selection,
-                                OSSL_CALLBACK *param_callback, void *cbarg)
+    OSSL_CALLBACK *param_callback, void *cbarg)
 {
     OSSL_PARAM params[3];
     PROV_CIPHER_FAKE_CTX *ctx = (PROV_CIPHER_FAKE_CTX *)keydata;
@@ -85,15 +85,15 @@ static int fake_skeymgmt_export(void *keydata, int selection,
 
     if (selection & OSSL_SKEYMGMT_SELECT_PARAMETERS) {
         *p = OSSL_PARAM_construct_utf8_string(FAKE_CIPHER_PARAM_KEY_NAME,
-                                              ctx->key_name,
-                                              strlen(ctx->key_name));
+            ctx->key_name,
+            strlen(ctx->key_name));
         p++;
     }
 
     if (selection & OSSL_SKEYMGMT_SELECT_SECRET_KEY) {
         *p = OSSL_PARAM_construct_octet_string(OSSL_SKEY_PARAM_RAW_BYTES,
-                                               ctx->key,
-                                               sizeof(ctx->key));
+            ctx->key,
+            sizeof(ctx->key));
         p++;
     }
     *p = OSSL_PARAM_construct_end();
@@ -126,8 +126,8 @@ static void fake_freectx(void *vctx)
 }
 
 static int fake_skey_init(PROV_CIPHER_FAKE_CTX *ctx, void *pkeyparam,
-                          const unsigned char *iv, size_t ivlen,
-                          const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     if (pkeyparam != NULL)
         memcpy(ctx, pkeyparam, sizeof(PROV_CIPHER_FAKE_CTX));
@@ -137,8 +137,8 @@ static int fake_skey_init(PROV_CIPHER_FAKE_CTX *ctx, void *pkeyparam,
 
 static OSSL_FUNC_cipher_encrypt_skey_init_fn fake_skey_einit;
 static int fake_skey_einit(void *vctx, void *pkeyparam,
-                           const unsigned char *iv, size_t ivlen,
-                           const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     PROV_CIPHER_FAKE_CTX *ctx = (PROV_CIPHER_FAKE_CTX *)vctx;
 
@@ -150,8 +150,8 @@ static int fake_skey_einit(void *vctx, void *pkeyparam,
 
 static OSSL_FUNC_cipher_decrypt_skey_init_fn fake_skey_dinit;
 static int fake_skey_dinit(void *vctx, void *pkeyparam,
-                           const unsigned char *iv, size_t ivlen,
-                           const OSSL_PARAM params[])
+    const unsigned char *iv, size_t ivlen,
+    const OSSL_PARAM params[])
 {
     PROV_CIPHER_FAKE_CTX *ctx = (PROV_CIPHER_FAKE_CTX *)vctx;
 
@@ -163,7 +163,7 @@ static int fake_skey_dinit(void *vctx, void *pkeyparam,
 
 static OSSL_FUNC_cipher_cipher_fn fake_cipher;
 static int fake_cipher(void *vctx, unsigned char *out, size_t *outl,
-                       size_t outsize, const unsigned char *in, size_t inl)
+    size_t outsize, const unsigned char *in, size_t inl)
 {
     PROV_CIPHER_FAKE_CTX *ctx = (PROV_CIPHER_FAKE_CTX *)vctx;
     size_t i;
@@ -180,7 +180,7 @@ static int fake_cipher(void *vctx, unsigned char *out, size_t *outl,
 
 static OSSL_FUNC_cipher_final_fn fake_final;
 static int fake_final(void *vctx, unsigned char *out, size_t *outl,
-                      size_t outsize)
+    size_t outsize)
 {
     *outl = 0;
     return 1;
@@ -213,7 +213,7 @@ static const OSSL_PARAM fake_known_gettable_ctx_params[] = {
 
 static OSSL_FUNC_cipher_gettable_ctx_params_fn fake_gettable_ctx_params;
 static const OSSL_PARAM *fake_gettable_ctx_params(ossl_unused void *cctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return fake_known_gettable_ctx_params;
 }
@@ -243,38 +243,38 @@ static const OSSL_PARAM fake_known_settable_ctx_params[] = {
 
 static OSSL_FUNC_cipher_settable_ctx_params_fn fake_settable_ctx_params;
 static const OSSL_PARAM *fake_settable_ctx_params(ossl_unused void *cctx,
-                                                  ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return fake_known_settable_ctx_params;
 }
 
 static const OSSL_DISPATCH ossl_fake_functions[] = {
     { OSSL_FUNC_CIPHER_NEWCTX,
-      (void (*)(void)) fake_newctx },
-    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void)) fake_freectx },
-    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void)) fake_newctx },
-    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void)) fake_cipher },
-    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void)) fake_final },
-    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void)) fake_cipher },
-    { OSSL_FUNC_CIPHER_GET_PARAMS, (void (*)(void)) fake_get_params },
-    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS, (void (*)(void)) fake_get_ctx_params },
+        (void (*)(void))fake_newctx },
+    { OSSL_FUNC_CIPHER_FREECTX, (void (*)(void))fake_freectx },
+    { OSSL_FUNC_CIPHER_DUPCTX, (void (*)(void))fake_newctx },
+    { OSSL_FUNC_CIPHER_UPDATE, (void (*)(void))fake_cipher },
+    { OSSL_FUNC_CIPHER_FINAL, (void (*)(void))fake_final },
+    { OSSL_FUNC_CIPHER_CIPHER, (void (*)(void))fake_cipher },
+    { OSSL_FUNC_CIPHER_GET_PARAMS, (void (*)(void))fake_get_params },
+    { OSSL_FUNC_CIPHER_GET_CTX_PARAMS, (void (*)(void))fake_get_ctx_params },
     { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,
-      (void (*)(void)) fake_gettable_ctx_params },
+        (void (*)(void))fake_gettable_ctx_params },
     { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,
-      (void (*)(void)) fake_settable_ctx_params },
-    { OSSL_FUNC_CIPHER_ENCRYPT_SKEY_INIT, (void (*)(void)) fake_skey_einit },
-    { OSSL_FUNC_CIPHER_DECRYPT_SKEY_INIT, (void (*)(void)) fake_skey_dinit },
+        (void (*)(void))fake_settable_ctx_params },
+    { OSSL_FUNC_CIPHER_ENCRYPT_SKEY_INIT, (void (*)(void))fake_skey_einit },
+    { OSSL_FUNC_CIPHER_DECRYPT_SKEY_INIT, (void (*)(void))fake_skey_dinit },
     OSSL_DISPATCH_END
 };
 
 static const OSSL_ALGORITHM fake_cipher_algs[] = {
-    { "fake_cipher", FAKE_CIPHER_FETCH_PROPS, ossl_fake_functions},
+    { "fake_cipher", FAKE_CIPHER_FETCH_PROPS, ossl_fake_functions },
     { NULL, NULL, NULL }
 };
 
 static const OSSL_ALGORITHM *fake_cipher_query(void *provctx,
-                                               int operation_id,
-                                               int *no_cache)
+    int operation_id,
+    int *no_cache)
 {
     *no_cache = 0;
     switch (operation_id) {
@@ -294,8 +294,8 @@ static const OSSL_DISPATCH fake_cipher_method[] = {
 };
 
 static int fake_cipher_provider_init(const OSSL_CORE_HANDLE *handle,
-                                     const OSSL_DISPATCH *in,
-                                     const OSSL_DISPATCH **out, void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out, void **provctx)
 {
     if (!TEST_ptr(*provctx = OSSL_LIB_CTX_new()))
         return 0;
@@ -308,8 +308,8 @@ OSSL_PROVIDER *fake_cipher_start(OSSL_LIB_CTX *libctx)
     OSSL_PROVIDER *p;
 
     if (!TEST_true(OSSL_PROVIDER_add_builtin(libctx, FAKE_PROV_NAME,
-                                             fake_cipher_provider_init))
-            || !TEST_ptr(p = OSSL_PROVIDER_try_load(libctx, FAKE_PROV_NAME, 1)))
+            fake_cipher_provider_init))
+        || !TEST_ptr(p = OSSL_PROVIDER_try_load(libctx, FAKE_PROV_NAME, 1)))
         return NULL;
 
     return p;
diff --git a/test/fake_pipelineprov.c b/test/fake_pipelineprov.c
index 4761d2fde56a6..251d0f89eb540 100644
--- a/test/fake_pipelineprov.c
+++ b/test/fake_pipelineprov.c
@@ -37,7 +37,7 @@ typedef struct fake_pipeline_ctx_st {
 } CIPHER_PIPELINE_CTX;
 
 static void *fake_pipeline_newctx(void *provctx, char *ciphername,
-                                  size_t kbits, size_t ivbits)
+    size_t kbits, size_t ivbits)
 {
     CIPHER_PIPELINE_CTX *ctx;
 
@@ -78,9 +78,9 @@ OSSL_FUNC_cipher_settable_ctx_params_fn fake_pipeline_aead_settable_ctx_params;
 OSSL_FUNC_cipher_set_ctx_params_fn fake_pipeline_aead_set_ctx_params;
 
 static int fake_pipeline_init(void *vctx,
-                              const unsigned char *key, size_t keylen,
-                              size_t numpipes, const unsigned char **iv,
-                              size_t ivlen, int enc)
+    const unsigned char *key, size_t keylen,
+    size_t numpipes, const unsigned char **iv,
+    size_t ivlen, int enc)
 {
     CIPHER_PIPELINE_CTX *ctx = (CIPHER_PIPELINE_CTX *)vctx;
     size_t i = 0;
@@ -98,25 +98,25 @@ static int fake_pipeline_init(void *vctx,
 }
 
 int fake_pipeline_einit(void *vctx,
-                        const unsigned char *key, size_t keylen,
-                        size_t numpipes, const unsigned char **iv,
-                        size_t ivlen, const OSSL_PARAM params[])
+    const unsigned char *key, size_t keylen,
+    size_t numpipes, const unsigned char **iv,
+    size_t ivlen, const OSSL_PARAM params[])
 {
     return fake_pipeline_init(vctx, key, keylen, numpipes, iv, ivlen, 1);
 }
 
 int fake_pipeline_dinit(void *vctx,
-                        const unsigned char *key, size_t keylen,
-                        size_t numpipes, const unsigned char **iv,
-                        size_t ivlen, const OSSL_PARAM params[])
+    const unsigned char *key, size_t keylen,
+    size_t numpipes, const unsigned char **iv,
+    size_t ivlen, const OSSL_PARAM params[])
 {
     return fake_pipeline_init(vctx, key, keylen, numpipes, iv, ivlen, 0);
 }
 
 int fake_pipeline_update(void *vctx, size_t numpipes,
-                         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)
 {
     CIPHER_PIPELINE_CTX *ctx = (CIPHER_PIPELINE_CTX *)vctx;
     int ioutl, inl_;
@@ -125,9 +125,9 @@ int fake_pipeline_update(void *vctx, size_t numpipes,
     for (i = 0; i < numpipes; i++) {
         inl_ = (int)inl[i];
         if (!EVP_CipherUpdate(ctx->cipher_ctxs[i],
-                              (out != NULL) ? out[i] : NULL,
-                              &ioutl,
-                              in[i], inl_))
+                (out != NULL) ? out[i] : NULL,
+                &ioutl,
+                in[i], inl_))
             return 0;
         outl[i] = (size_t)ioutl;
     }
@@ -135,8 +135,8 @@ int fake_pipeline_update(void *vctx, size_t numpipes,
 }
 
 int fake_pipeline_final(void *vctx, size_t numpipes,
-                        unsigned char **out, size_t *outl,
-                        const size_t *outsize)
+    unsigned char **out, size_t *outl,
+    const size_t *outsize)
 {
     CIPHER_PIPELINE_CTX *ctx = (CIPHER_PIPELINE_CTX *)vctx;
     int ioutl;
@@ -158,7 +158,7 @@ static const OSSL_PARAM fake_pipeline_aead_known_gettable_ctx_params[] = {
     OSSL_PARAM_END
 };
 const OSSL_PARAM *fake_pipeline_aead_gettable_ctx_params(ossl_unused void *cctx,
-                                                         ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return fake_pipeline_aead_known_gettable_ctx_params;
 }
@@ -168,7 +168,7 @@ static const OSSL_PARAM fake_pipeline_aead_known_settable_ctx_params[] = {
     OSSL_PARAM_END
 };
 const OSSL_PARAM *fake_pipeline_aead_settable_ctx_params(ossl_unused void *cctx,
-                                                         ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return fake_pipeline_aead_known_settable_ctx_params;
 }
@@ -208,8 +208,8 @@ int fake_pipeline_aead_get_ctx_params(void *vctx, OSSL_PARAM params[])
         }
         for (i = 0; i < ctx->numpipes; i++) {
             aead_params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
-                                                               (void *)aead_tags[i],
-                                                               taglen);
+                (void *)aead_tags[i],
+                taglen);
             if (!EVP_CIPHER_CTX_get_params(ctx->cipher_ctxs[i], aead_params)) {
                 ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);
                 return 0;
@@ -236,8 +236,8 @@ int fake_pipeline_aead_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         }
         for (i = 0; i < ctx->numpipes; i++) {
             aead_params[0] = OSSL_PARAM_construct_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG,
-                                                               (void *)aead_tags[i],
-                                                               taglen);
+                (void *)aead_tags[i],
+                taglen);
             if (!EVP_CIPHER_CTX_set_params(ctx->cipher_ctxs[i], aead_params)) {
                 ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_SET_PARAMETER);
                 return 0;
@@ -249,57 +249,57 @@ int fake_pipeline_aead_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     return 1;
 }
 
-#define IMPLEMENT_aead_cipher_pipeline(alg, lc, UCMODE, flags, kbits, blkbits,          \
-                                       ivbits, ciphername)                              \
-    static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lc##_get_params;            \
-    static int alg##_##kbits##_##lc##_get_params(OSSL_PARAM params[])                   \
-    {                                                                                   \
-        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,         \
-                                              flags, kbits, blkbits, ivbits);           \
-    }                                                                                   \
-    static OSSL_FUNC_cipher_newctx_fn fake_pipeline_##alg##_##kbits##_##lc##_newctx;    \
-    static void * fake_pipeline_##alg##_##kbits##_##lc##_newctx(void *provctx)          \
-    {                                                                                   \
-        return fake_pipeline_newctx(provctx, ciphername, kbits, ivbits);                \
-    }                                                                                   \
-    static const OSSL_DISPATCH fake_pipeline_##alg##kbits##lc##_functions[] = {         \
-        { OSSL_FUNC_CIPHER_NEWCTX,                                                      \
-          (void (*)(void))fake_pipeline_##alg##_##kbits##_##lc##_newctx },              \
-        { OSSL_FUNC_CIPHER_FREECTX,                                                     \
-          (void (*)(void))fake_pipeline_freectx },                                      \
-        { OSSL_FUNC_CIPHER_PIPELINE_ENCRYPT_INIT,                                       \
-          (void (*)(void))fake_pipeline_einit },                                        \
-        { OSSL_FUNC_CIPHER_PIPELINE_DECRYPT_INIT,                                       \
-          (void (*)(void))fake_pipeline_dinit },                                        \
-        { OSSL_FUNC_CIPHER_PIPELINE_UPDATE,                                             \
-          (void (*)(void))fake_pipeline_update },                                       \
-        { OSSL_FUNC_CIPHER_PIPELINE_FINAL,                                              \
-          (void (*)(void))fake_pipeline_final },                                        \
-        { OSSL_FUNC_CIPHER_GET_PARAMS,                                                  \
-          (void (*)(void)) alg##_##kbits##_##lc##_get_params },                         \
-        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                              \
-          (void (*)(void)) fake_pipeline_aead_get_ctx_params },                         \
-        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                              \
-          (void (*)(void)) fake_pipeline_aead_set_ctx_params },                         \
-        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                             \
-          (void (*)(void)) ossl_cipher_generic_gettable_params },                       \
-        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                         \
-          (void (*)(void)) fake_pipeline_aead_gettable_ctx_params },                    \
-        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                         \
-          (void (*)(void)) fake_pipeline_aead_settable_ctx_params },                    \
-        OSSL_DISPATCH_END                                                               \
+#define IMPLEMENT_aead_cipher_pipeline(alg, lc, UCMODE, flags, kbits, blkbits,       \
+    ivbits, ciphername)                                                              \
+    static OSSL_FUNC_cipher_get_params_fn alg##_##kbits##_##lc##_get_params;         \
+    static int alg##_##kbits##_##lc##_get_params(OSSL_PARAM params[])                \
+    {                                                                                \
+        return ossl_cipher_generic_get_params(params, EVP_CIPH_##UCMODE##_MODE,      \
+            flags, kbits, blkbits, ivbits);                                          \
+    }                                                                                \
+    static OSSL_FUNC_cipher_newctx_fn fake_pipeline_##alg##_##kbits##_##lc##_newctx; \
+    static void *fake_pipeline_##alg##_##kbits##_##lc##_newctx(void *provctx)        \
+    {                                                                                \
+        return fake_pipeline_newctx(provctx, ciphername, kbits, ivbits);             \
+    }                                                                                \
+    static const OSSL_DISPATCH fake_pipeline_##alg##kbits##lc##_functions[] = {      \
+        { OSSL_FUNC_CIPHER_NEWCTX,                                                   \
+            (void (*)(void))fake_pipeline_##alg##_##kbits##_##lc##_newctx },         \
+        { OSSL_FUNC_CIPHER_FREECTX,                                                  \
+            (void (*)(void))fake_pipeline_freectx },                                 \
+        { OSSL_FUNC_CIPHER_PIPELINE_ENCRYPT_INIT,                                    \
+            (void (*)(void))fake_pipeline_einit },                                   \
+        { OSSL_FUNC_CIPHER_PIPELINE_DECRYPT_INIT,                                    \
+            (void (*)(void))fake_pipeline_dinit },                                   \
+        { OSSL_FUNC_CIPHER_PIPELINE_UPDATE,                                          \
+            (void (*)(void))fake_pipeline_update },                                  \
+        { OSSL_FUNC_CIPHER_PIPELINE_FINAL,                                           \
+            (void (*)(void))fake_pipeline_final },                                   \
+        { OSSL_FUNC_CIPHER_GET_PARAMS,                                               \
+            (void (*)(void))alg##_##kbits##_##lc##_get_params },                     \
+        { OSSL_FUNC_CIPHER_GET_CTX_PARAMS,                                           \
+            (void (*)(void))fake_pipeline_aead_get_ctx_params },                     \
+        { OSSL_FUNC_CIPHER_SET_CTX_PARAMS,                                           \
+            (void (*)(void))fake_pipeline_aead_set_ctx_params },                     \
+        { OSSL_FUNC_CIPHER_GETTABLE_PARAMS,                                          \
+            (void (*)(void))ossl_cipher_generic_gettable_params },                   \
+        { OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS,                                      \
+            (void (*)(void))fake_pipeline_aead_gettable_ctx_params },                \
+        { OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS,                                      \
+            (void (*)(void))fake_pipeline_aead_settable_ctx_params },                \
+        OSSL_DISPATCH_END                                                            \
     }
 
 IMPLEMENT_aead_cipher_pipeline(aes, gcm, GCM, AEAD_FLAGS, 256, 8, 96, "AES-256-GCM");
 
 static const OSSL_ALGORITHM fake_ciphers[] = {
-    {"AES-256-GCM", "provider=fake-pipeline", fake_pipeline_aes256gcm_functions},
-    {NULL, NULL, NULL}
+    { "AES-256-GCM", "provider=fake-pipeline", fake_pipeline_aes256gcm_functions },
+    { NULL, NULL, NULL }
 };
 
 static const OSSL_ALGORITHM *fake_pipeline_query(OSSL_PROVIDER *prov,
-                                                 int operation_id,
-                                                 int *no_cache)
+    int operation_id,
+    int *no_cache)
 {
     *no_cache = 0;
     switch (operation_id) {
@@ -317,8 +317,8 @@ static const OSSL_DISPATCH fake_pipeline_method[] = {
 };
 
 static int fake_pipeline_provider_init(const OSSL_CORE_HANDLE *handle,
-                                       const OSSL_DISPATCH *in,
-                                       const OSSL_DISPATCH **out, void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out, void **provctx)
 {
     if (!TEST_ptr(*provctx = OSSL_LIB_CTX_new()))
         return 0;
@@ -331,8 +331,8 @@ OSSL_PROVIDER *fake_pipeline_start(OSSL_LIB_CTX *libctx)
     OSSL_PROVIDER *p;
 
     if (!TEST_true(OSSL_PROVIDER_add_builtin(libctx, "fake-pipeline",
-                                             fake_pipeline_provider_init))
-            || !TEST_ptr(p = OSSL_PROVIDER_try_load(libctx, "fake-pipeline", 1)))
+            fake_pipeline_provider_init))
+        || !TEST_ptr(p = OSSL_PROVIDER_try_load(libctx, "fake-pipeline", 1)))
         return NULL;
 
     return p;
diff --git a/test/fake_rsaprov.c b/test/fake_rsaprov.c
index c1b8e28286143..6252456e8df1e 100644
--- a/test/fake_rsaprov.c
+++ b/test/fake_rsaprov.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-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.
@@ -9,12 +9,15 @@
  */
 
 #include <string.h>
+#include <openssl/asn1.h>
+#include <openssl/asn1t.h>
 #include <openssl/core_names.h>
 #include <openssl/core_object.h>
 #include <openssl/rand.h>
 #include <openssl/provider.h>
 #include "testutil.h"
 #include "fake_rsaprov.h"
+#include "internal/asn1.h"
 
 static OSSL_FUNC_keymgmt_new_fn fake_rsa_keymgmt_new;
 static OSSL_FUNC_keymgmt_free_fn fake_rsa_keymgmt_free;
@@ -32,6 +35,18 @@ static int exptypes_selection;
 static int query_id;
 static int key_deleted;
 
+unsigned fake_rsa_query_operation_name = 0;
+
+typedef struct {
+    OSSL_LIB_CTX *libctx;
+} PROV_FAKE_RSA_CTX;
+
+#define PROV_FAKE_RSA_LIBCTX_OF(provctx) (((PROV_FAKE_RSA_CTX *)provctx)->libctx)
+
+#define FAKE_RSA_STATUS_IMPORTED 1
+#define FAKE_RSA_STATUS_GENERATED 2
+#define FAKE_RSA_STATUS_DECODED 3
+
 struct fake_rsa_keydata {
     int selection;
     int status;
@@ -71,93 +86,85 @@ static int fake_rsa_keymgmt_has(const void *key, int selection)
     return 1;
 }
 
-
 static const char *fake_rsa_keymgmt_query(int id)
 {
     /* record global for checking */
     query_id = id;
 
-    return "RSA";
+    return fake_rsa_query_operation_name ? NULL : "RSA";
 }
 
 static int fake_rsa_keymgmt_import(void *keydata, int selection,
-                                   const OSSL_PARAM *p)
+    const OSSL_PARAM *p)
 {
     struct fake_rsa_keydata *fake_rsa_key = keydata;
 
     /* key was imported */
-    fake_rsa_key->status = 1;
+    fake_rsa_key->status = FAKE_RSA_STATUS_IMPORTED;
 
     return 1;
 }
 
-static unsigned char fake_rsa_n[] =
-   "\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F"
-   "\x90\xEF\xA0\x0D\xF3\x77\x4A\x25\x9F\x2E\x62\xB4\xC5\xD9\x9C\xB5"
-   "\xAD\xB3\x00\xA0\x28\x5E\x53\x01\x93\x0E\x0C\x70\xFB\x68\x76\x93"
-   "\x9C\xE6\x16\xCE\x62\x4A\x11\xE0\x08\x6D\x34\x1E\xBC\xAC\xA0\xA1"
-   "\xF5";
+static unsigned char fake_rsa_n[] = "\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F"
+                                    "\x90\xEF\xA0\x0D\xF3\x77\x4A\x25\x9F\x2E\x62\xB4\xC5\xD9\x9C\xB5"
+                                    "\xAD\xB3\x00\xA0\x28\x5E\x53\x01\x93\x0E\x0C\x70\xFB\x68\x76\x93"
+                                    "\x9C\xE6\x16\xCE\x62\x4A\x11\xE0\x08\x6D\x34\x1E\xBC\xAC\xA0\xA1"
+                                    "\xF5";
 
 static unsigned char fake_rsa_e[] = "\x11";
 
-static unsigned char fake_rsa_d[] =
-    "\x0A\x03\x37\x48\x62\x64\x87\x69\x5F\x5F\x30\xBC\x38\xB9\x8B\x44"
-    "\xC2\xCD\x2D\xFF\x43\x40\x98\xCD\x20\xD8\xA1\x38\xD0\x90\xBF\x64"
-    "\x79\x7C\x3F\xA7\xA2\xCD\xCB\x3C\xD1\xE0\xBD\xBA\x26\x54\xB4\xF9"
-    "\xDF\x8E\x8A\xE5\x9D\x73\x3D\x9F\x33\xB3\x01\x62\x4A\xFD\x1D\x51";
+static unsigned char fake_rsa_d[] = "\x0A\x03\x37\x48\x62\x64\x87\x69\x5F\x5F\x30\xBC\x38\xB9\x8B\x44"
+                                    "\xC2\xCD\x2D\xFF\x43\x40\x98\xCD\x20\xD8\xA1\x38\xD0\x90\xBF\x64"
+                                    "\x79\x7C\x3F\xA7\xA2\xCD\xCB\x3C\xD1\xE0\xBD\xBA\x26\x54\xB4\xF9"
+                                    "\xDF\x8E\x8A\xE5\x9D\x73\x3D\x9F\x33\xB3\x01\x62\x4A\xFD\x1D\x51";
 
-static unsigned char fake_rsa_p[] =
-    "\x00\xD8\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
-    "\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x12"
-    "\x0D";
+static unsigned char fake_rsa_p[] = "\x00\xD8\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
+                                    "\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x12"
+                                    "\x0D";
 
-static unsigned char fake_rsa_q[] =
-    "\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-    "\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
-    "\x89";
+static unsigned char fake_rsa_q[] = "\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
+                                    "\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
+                                    "\x89";
 
-static unsigned char fake_rsa_dmp1[] =
-    "\x59\x0B\x95\x72\xA2\xC2\xA9\xC4\x06\x05\x9D\xC2\xAB\x2F\x1D\xAF"
-    "\xEB\x7E\x8B\x4F\x10\xA7\x54\x9E\x8E\xED\xF5\xB4\xFC\xE0\x9E\x05";
+static unsigned char fake_rsa_dmp1[] = "\x59\x0B\x95\x72\xA2\xC2\xA9\xC4\x06\x05\x9D\xC2\xAB\x2F\x1D\xAF"
+                                       "\xEB\x7E\x8B\x4F\x10\xA7\x54\x9E\x8E\xED\xF5\xB4\xFC\xE0\x9E\x05";
 
-static unsigned char fake_rsa_dmq1[] =
-    "\x00\x8E\x3C\x05\x21\xFE\x15\xE0\xEA\x06\xA3\x6F\xF0\xF1\x0C\x99"
-    "\x52\xC3\x5B\x7A\x75\x14\xFD\x32\x38\xB8\x0A\xAD\x52\x98\x62\x8D"
-    "\x51";
+static unsigned char fake_rsa_dmq1[] = "\x00\x8E\x3C\x05\x21\xFE\x15\xE0\xEA\x06\xA3\x6F\xF0\xF1\x0C\x99"
+                                       "\x52\xC3\x5B\x7A\x75\x14\xFD\x32\x38\xB8\x0A\xAD\x52\x98\x62\x8D"
+                                       "\x51";
 
-static unsigned char fake_rsa_iqmp[] =
-    "\x36\x3F\xF7\x18\x9D\xA8\xE9\x0B\x1D\x34\x1F\x71\xD0\x9B\x76\xA8"
-    "\xA9\x43\xE1\x1D\x10\xB2\x4D\x24\x9F\x2D\xEA\xFE\xF8\x0C\x18\x26";
+static unsigned char fake_rsa_iqmp[] = "\x36\x3F\xF7\x18\x9D\xA8\xE9\x0B\x1D\x34\x1F\x71\xD0\x9B\x76\xA8"
+                                       "\xA9\x43\xE1\x1D\x10\xB2\x4D\x24\x9F\x2D\xEA\xFE\xF8\x0C\x18\x26";
 
 OSSL_PARAM *fake_rsa_key_params(int priv)
 {
     if (priv) {
         OSSL_PARAM params[] = {
             OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_N, fake_rsa_n,
-                          sizeof(fake_rsa_n) -1),
+                sizeof(fake_rsa_n) - 1),
             OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_E, fake_rsa_e,
-                          sizeof(fake_rsa_e) -1),
+                sizeof(fake_rsa_e) - 1),
             OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_D, fake_rsa_d,
-                          sizeof(fake_rsa_d) -1),
+                sizeof(fake_rsa_d) - 1),
             OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR1, fake_rsa_p,
-                          sizeof(fake_rsa_p) -1),
+                sizeof(fake_rsa_p) - 1),
             OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_FACTOR2, fake_rsa_q,
-                          sizeof(fake_rsa_q) -1),
+                sizeof(fake_rsa_q) - 1),
             OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT1, fake_rsa_dmp1,
-                          sizeof(fake_rsa_dmp1) -1),
+                sizeof(fake_rsa_dmp1) - 1),
             OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_EXPONENT2, fake_rsa_dmq1,
-                          sizeof(fake_rsa_dmq1) -1),
+                sizeof(fake_rsa_dmq1) - 1),
             OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_COEFFICIENT1, fake_rsa_iqmp,
-                          sizeof(fake_rsa_iqmp) -1),
+                sizeof(fake_rsa_iqmp) - 1),
             OSSL_PARAM_END
         };
         return OSSL_PARAM_dup(params);
     } else {
         OSSL_PARAM params[] = {
             OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_N, fake_rsa_n,
-                          sizeof(fake_rsa_n) -1),
+                sizeof(fake_rsa_n) - 1),
             OSSL_PARAM_BN(OSSL_PKEY_PARAM_RSA_E, fake_rsa_e,
-                          sizeof(fake_rsa_e) -1),
+                sizeof(fake_rsa_e) - 1),
             OSSL_PARAM_END
         };
         return OSSL_PARAM_dup(params);
@@ -165,7 +172,7 @@ OSSL_PARAM *fake_rsa_key_params(int priv)
 }
 
 static int fake_rsa_keymgmt_export(void *keydata, int selection,
-                                   OSSL_CALLBACK *param_callback, void *cbarg)
+    OSSL_CALLBACK *param_callback, void *cbarg)
 {
     OSSL_PARAM *params = NULL;
     int ret;
@@ -219,21 +226,21 @@ static void *fake_rsa_keymgmt_load(const void *reference, size_t reference_sz)
 {
     struct fake_rsa_keydata *key = NULL;
 
-    if (reference_sz != sizeof(*key))
+    if (reference_sz != sizeof(key))
         return NULL;
 
     key = *(struct fake_rsa_keydata **)reference;
-    if (key->status != 1)
+    if (key->status != FAKE_RSA_STATUS_IMPORTED && key->status != FAKE_RSA_STATUS_DECODED)
         return NULL;
 
     /* detach the reference */
-    *(struct fake_rsa_keydata  **)reference = NULL;
+    *(struct fake_rsa_keydata **)reference = NULL;
 
     return key;
 }
 
 static void *fake_rsa_gen_init(void *provctx, int selection,
-                               const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     unsigned char *gctx = NULL;
 
@@ -258,18 +265,18 @@ static void *fake_rsa_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
     if (!TEST_ptr(keydata = fake_rsa_keymgmt_new(NULL)))
         return NULL;
 
-    keydata->status = 2;
+    keydata->status = FAKE_RSA_STATUS_GENERATED;
     return keydata;
 }
 
 static void fake_rsa_gen_cleanup(void *genctx)
 {
-   OPENSSL_free(genctx);
+    OPENSSL_free(genctx);
 }
 
 static const OSSL_DISPATCH fake_rsa_keymgmt_funcs[] = {
     { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))fake_rsa_keymgmt_new },
-    { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))fake_rsa_keymgmt_free} ,
+    { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))fake_rsa_keymgmt_free },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))fake_rsa_keymgmt_has },
     { OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME,
         (void (*)(void))fake_rsa_keymgmt_query },
@@ -311,7 +318,7 @@ static void fake_rsa_sig_freectx(void *sigctx)
 }
 
 static int fake_rsa_sig_sign_init(void *ctx, void *provkey,
-                                  const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     unsigned char *sigctx = ctx;
     struct fake_rsa_keydata *keydata = provkey;
@@ -330,8 +337,8 @@ static int fake_rsa_sig_sign_init(void *ctx, void *provkey,
 }
 
 static int fake_rsa_sig_sign(void *ctx, unsigned char *sig,
-                             size_t *siglen, size_t sigsize,
-                             const unsigned char *tbs, size_t tbslen)
+    size_t *siglen, size_t sigsize,
+    const unsigned char *tbs, size_t tbslen)
 {
     unsigned char *sigctx = ctx;
 
@@ -374,7 +381,7 @@ static void *fake_rsa_sig_dupctx(void *ctx)
 }
 
 static int fake_rsa_dgstsgnvfy_init(void *ctx, unsigned char type,
-                                    void *provkey, const OSSL_PARAM params[])
+    void *provkey, const OSSL_PARAM params[])
 {
     unsigned char *sigctx = ctx;
     struct fake_rsa_keydata *keydata = provkey;
@@ -405,19 +412,19 @@ static int fake_rsa_dgstsgnvfy_init(void *ctx, unsigned char type,
 }
 
 static int fake_rsa_dgstsgn_init(void *ctx, const char *mdname,
-                                 void *provkey, const OSSL_PARAM params[])
+    void *provkey, const OSSL_PARAM params[])
 {
     return fake_rsa_dgstsgnvfy_init(ctx, FAKE_DGSTSGN_SIGN, provkey, params);
 }
 
 static int fake_rsa_dgstvfy_init(void *ctx, const char *mdname,
-                                 void *provkey, const OSSL_PARAM params[])
+    void *provkey, const OSSL_PARAM params[])
 {
     return fake_rsa_dgstsgnvfy_init(ctx, FAKE_DGSTSGN_VERIFY, provkey, params);
 }
 
 static int fake_rsa_dgstsgnvfy_update(void *ctx, const unsigned char *data,
-                                      size_t datalen)
+    size_t datalen)
 {
     unsigned char *sigctx = ctx;
 
@@ -433,7 +440,7 @@ static int fake_rsa_dgstsgnvfy_update(void *ctx, const unsigned char *data,
 }
 
 static int fake_rsa_dgstsgnvfy_final(void *ctx, unsigned char *sig,
-                                     size_t *siglen, size_t sigsize)
+    size_t *siglen, size_t sigsize)
 {
     unsigned char *sigctx = ctx;
 
@@ -470,14 +477,14 @@ static int fake_rsa_dgstsgnvfy_final(void *ctx, unsigned char *sig,
 }
 
 static int fake_rsa_dgstvfy_final(void *ctx, unsigned char *sig,
-                                  size_t siglen)
+    size_t siglen)
 {
     return fake_rsa_dgstsgnvfy_final(ctx, sig, NULL, siglen);
 }
 
 static int fake_rsa_dgstsgn(void *ctx, unsigned char *sig, size_t *siglen,
-                            size_t sigsize, const unsigned char *tbs,
-                            size_t tbslen)
+    size_t sigsize, const unsigned char *tbs,
+    size_t tbslen)
 {
     if (!fake_rsa_dgstsgnvfy_update(ctx, tbs, tbslen))
         return 0;
@@ -486,7 +493,7 @@ static int fake_rsa_dgstsgn(void *ctx, unsigned char *sig, size_t *siglen,
 }
 
 static int fake_rsa_dgstvfy(void *ctx, unsigned char *sig, size_t siglen,
-                            const unsigned char *tbv, size_t tbvlen)
+    const unsigned char *tbv, size_t tbvlen)
 {
     if (!fake_rsa_dgstsgnvfy_update(ctx, tbv, tbvlen))
         return 0;
@@ -538,9 +545,9 @@ static const char fake_rsa_openpwtest[] = "fake_rsa:openpwtest";
 static const char fake_rsa_prompt[] = "Fake Prompt Info";
 
 static void *fake_rsa_st_open_ex(void *provctx, const char *uri,
-                                 const OSSL_PARAM params[],
-                                 OSSL_PASSPHRASE_CALLBACK *pw_cb,
-                                 void *pw_cbarg)
+    const OSSL_PARAM params[],
+    OSSL_PASSPHRASE_CALLBACK *pw_cb,
+    void *pw_cbarg)
 {
     unsigned char *storectx = NULL;
 
@@ -549,14 +556,15 @@ static void *fake_rsa_st_open_ex(void *provctx, const char *uri,
         return NULL;
 
     if (strncmp(uri, fake_rsa_openpwtest,
-                sizeof(fake_rsa_openpwtest) - 1) == 0) {
+            sizeof(fake_rsa_openpwtest) - 1)
+        == 0) {
         const char *pw_check = FAKE_PASSPHRASE;
         char fakepw[sizeof(FAKE_PASSPHRASE) + 1] = { 0 };
         size_t fakepw_len = 0;
         OSSL_PARAM pw_params[2] = {
             OSSL_PARAM_utf8_string(OSSL_PASSPHRASE_PARAM_INFO,
-                                   (void *)fake_rsa_prompt,
-                                   sizeof(fake_rsa_prompt) - 1),
+                (void *)fake_rsa_prompt,
+                sizeof(fake_rsa_prompt) - 1),
             OSSL_PARAM_END,
         };
 
@@ -603,14 +611,14 @@ static const OSSL_PARAM *fake_rsa_st_settable_ctx_params(void *provctx)
 }
 
 static int fake_rsa_st_set_ctx_params(void *loaderctx,
-                                      const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return 1;
 }
 
 static int fake_rsa_st_load(void *loaderctx,
-                            OSSL_CALLBACK *object_cb, void *object_cbarg,
-                            OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *object_cb, void *object_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     unsigned char *storectx = loaderctx;
     OSSL_PARAM params[4];
@@ -623,22 +631,19 @@ static int fake_rsa_st_load(void *loaderctx,
         if (key_deleted == 1) {
             *storectx = 1;
             break;
-	}
+        }
 
         /* Construct a new key using our keymgmt functions */
         if (!TEST_ptr(key = fake_rsa_keymgmt_new(NULL)))
             break;
         if (!TEST_int_gt(fake_rsa_keymgmt_import(key, 0, NULL), 0))
             break;
-        params[0] =
-            OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &object_type);
-        params[1] =
-            OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
-                                             "RSA", 0);
+        params[0] = OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &object_type);
+        params[1] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
+            "RSA", 0);
         /* The address of the key becomes the octet string */
-        params[2] =
-            OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_REFERENCE,
-                                              &key, sizeof(*key));
+        params[2] = OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_REFERENCE,
+            &key, sizeof(key));
         params[3] = OSSL_PARAM_construct_end();
         rv = object_cb(params, object_cbarg);
         *storectx = 1;
@@ -663,8 +668,8 @@ static int fake_rsa_st_load(void *loaderctx,
 }
 
 static int fake_rsa_st_delete(void *loaderctx, const char *uri,
-                              const OSSL_PARAM params[],
-                              OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    const OSSL_PARAM params[],
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     key_deleted = 1;
     return 1;
@@ -688,7 +693,7 @@ static const OSSL_DISPATCH fake_rsa_store_funcs[] = {
     { OSSL_FUNC_STORE_OPEN, (void (*)(void))fake_rsa_st_open },
     { OSSL_FUNC_STORE_OPEN_EX, (void (*)(void))fake_rsa_st_open_ex },
     { OSSL_FUNC_STORE_SETTABLE_CTX_PARAMS,
-      (void (*)(void))fake_rsa_st_settable_ctx_params },
+        (void (*)(void))fake_rsa_st_settable_ctx_params },
     { OSSL_FUNC_STORE_SET_CTX_PARAMS, (void (*)(void))fake_rsa_st_set_ctx_params },
     { OSSL_FUNC_STORE_LOAD, (void (*)(void))fake_rsa_st_load },
     { OSSL_FUNC_STORE_EOF, (void (*)(void))fake_rsa_st_eof },
@@ -702,9 +707,500 @@ static const OSSL_ALGORITHM fake_rsa_store_algs[] = {
     { NULL, NULL, NULL }
 };
 
+struct der2key_ctx_st; /* Forward declaration */
+typedef int check_key_fn(void *, struct der2key_ctx_st *ctx);
+typedef void adjust_key_fn(void *, struct der2key_ctx_st *ctx);
+typedef void free_key_fn(void *);
+typedef void *d2i_PKCS8_fn(void **, const unsigned char **, long,
+    struct der2key_ctx_st *);
+struct keytype_desc_st {
+    const char *keytype_name;
+    const OSSL_DISPATCH *fns; /* Keymgmt (to pilfer functions from) */
+
+    /* The input structure name */
+    const char *structure_name;
+
+    /*
+     * The EVP_PKEY_xxx type macro.  Should be zero for type specific
+     * structures, non-zero when the outermost structure is PKCS#8 or
+     * SubjectPublicKeyInfo.  This determines which of the function
+     * pointers below will be used.
+     */
+    int evp_type;
+
+    /* The selection mask for OSSL_FUNC_decoder_does_selection() */
+    int selection_mask;
+
+    /* For type specific decoders, we use the corresponding d2i */
+    d2i_of_void *d2i_private_key; /* From type-specific DER */
+    d2i_of_void *d2i_public_key; /* From type-specific DER */
+    d2i_of_void *d2i_key_params; /* From type-specific DER */
+    d2i_PKCS8_fn *d2i_PKCS8; /* Wrapped in a PrivateKeyInfo */
+    d2i_of_void *d2i_PUBKEY; /* Wrapped in a SubjectPublicKeyInfo */
+
+    /*
+     * For any key, we may need to check that the key meets expectations.
+     * This is useful when the same functions can decode several variants
+     * of a key.
+     */
+    check_key_fn *check_key;
+
+    /*
+     * For any key, we may need to make provider specific adjustments, such
+     * as ensure the key carries the correct library context.
+     */
+    adjust_key_fn *adjust_key;
+    /* {type}_free() */
+    free_key_fn *free_key;
+};
+
+/*
+ * Start blatant code steal. Alternative: Open up d2i_X509_PUBKEY_INTERNAL
+ * as per https://github.com/openssl/openssl/issues/16697 (TBD)
+ * Code from openssl/crypto/x509/x_pubkey.c as
+ * ossl_d2i_X509_PUBKEY_INTERNAL is presently not public
+ */
+struct X509_pubkey_st {
+    X509_ALGOR *algor;
+    ASN1_BIT_STRING *public_key;
+
+    EVP_PKEY *pkey;
+
+    /* extra data for the callback, used by d2i_PUBKEY_ex */
+    OSSL_LIB_CTX *libctx;
+    char *propq;
+};
+
+ASN1_SEQUENCE(X509_PUBKEY_INTERNAL) = {
+    ASN1_SIMPLE(X509_PUBKEY, algor, X509_ALGOR),
+    ASN1_SIMPLE(X509_PUBKEY, public_key, ASN1_BIT_STRING)
+} static_ASN1_SEQUENCE_END_name(X509_PUBKEY, X509_PUBKEY_INTERNAL)
+
+                                          static X509_PUBKEY
+    * fake_rsa_d2i_X509_PUBKEY_INTERNAL(const unsigned char **pp, long len, OSSL_LIB_CTX *libctx)
+{
+    X509_PUBKEY *xpub = OPENSSL_zalloc(sizeof(*xpub));
+
+    if (xpub == NULL)
+        return NULL;
+    return (X509_PUBKEY *)ASN1_item_d2i_ex((ASN1_VALUE **)&xpub, pp, len,
+        ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL),
+        libctx, NULL);
+}
+/* end steal https://github.com/openssl/openssl/issues/16697 */
+
+/*
+ * Context used for DER to key decoding.
+ */
+struct der2key_ctx_st {
+    PROV_FAKE_RSA_CTX *provctx;
+    struct keytype_desc_st *desc;
+    /* The selection that is passed to fake_rsa_der2key_decode() */
+    int selection;
+    /* Flag used to signal that a failure is fatal */
+    unsigned int flag_fatal : 1;
+};
+
+static int fake_rsa_read_der(PROV_FAKE_RSA_CTX *provctx, OSSL_CORE_BIO *cin,
+    unsigned char **data, long *len)
+{
+    BUF_MEM *mem = NULL;
+    BIO *in = BIO_new_from_core_bio(provctx->libctx, cin);
+    int ok = (asn1_d2i_read_bio(in, &mem) >= 0);
+
+    if (ok) {
+        *data = (unsigned char *)mem->data;
+        *len = (long)mem->length;
+        OPENSSL_free(mem);
+    }
+    BIO_free(in);
+    return ok;
+}
+
+typedef void *key_from_pkcs8_t(const PKCS8_PRIV_KEY_INFO *p8inf,
+    OSSL_LIB_CTX *libctx, const char *propq);
+static void *fake_rsa_der2key_decode_p8(const unsigned char **input_der,
+    long input_der_len, struct der2key_ctx_st *ctx,
+    key_from_pkcs8_t *key_from_pkcs8)
+{
+    PKCS8_PRIV_KEY_INFO *p8inf = NULL;
+    const X509_ALGOR *alg = NULL;
+    void *key = NULL;
+
+    if ((p8inf = d2i_PKCS8_PRIV_KEY_INFO(NULL, input_der, input_der_len)) != NULL
+        && PKCS8_pkey_get0(NULL, NULL, NULL, &alg, p8inf)
+        && OBJ_obj2nid(alg->algorithm) == ctx->desc->evp_type)
+        key = key_from_pkcs8(p8inf, PROV_FAKE_RSA_LIBCTX_OF(ctx->provctx), NULL);
+    PKCS8_PRIV_KEY_INFO_free(p8inf);
+
+    return key;
+}
+
+static struct fake_rsa_keydata *fake_rsa_d2i_PUBKEY(struct fake_rsa_keydata **a,
+    const unsigned char **pp, long length)
+{
+    struct fake_rsa_keydata *key = NULL;
+    X509_PUBKEY *xpk;
+
+    xpk = fake_rsa_d2i_X509_PUBKEY_INTERNAL(pp, length, NULL);
+    if (xpk == NULL)
+        goto err_exit;
+
+    key = fake_rsa_keymgmt_new(NULL);
+    if (key == NULL)
+        goto err_exit;
+
+    key->status = FAKE_RSA_STATUS_DECODED;
+
+    if (a != NULL) {
+        fake_rsa_keymgmt_free(*a);
+        *a = key;
+    }
+
+err_exit:
+    X509_PUBKEY_free(xpk);
+    return key;
+}
+
+/* ---------------------------------------------------------------------- */
+
+static OSSL_FUNC_decoder_freectx_fn der2key_freectx;
+static OSSL_FUNC_decoder_decode_fn fake_rsa_der2key_decode;
+static OSSL_FUNC_decoder_export_object_fn der2key_export_object;
+
+static struct der2key_ctx_st *
+der2key_newctx(void *provctx, struct keytype_desc_st *desc, const char *tls_name)
+{
+    struct der2key_ctx_st *ctx = OPENSSL_zalloc(sizeof(*ctx));
+
+    if (ctx != NULL) {
+        ctx->provctx = provctx;
+        ctx->desc = desc;
+        if (desc->evp_type == 0)
+            ctx->desc->evp_type = OBJ_sn2nid(tls_name);
+    }
+    return ctx;
+}
+
+static void der2key_freectx(void *vctx)
+{
+    struct der2key_ctx_st *ctx = vctx;
+
+    OPENSSL_free(ctx);
+}
+
+static int der2key_check_selection(int selection,
+    const struct keytype_desc_st *desc)
+{
+    /*
+     * The selections are kinda sorta "levels", i.e. each selection given
+     * here is assumed to include those following.
+     */
+    int checks[] = {
+        OSSL_KEYMGMT_SELECT_PRIVATE_KEY,
+        OSSL_KEYMGMT_SELECT_PUBLIC_KEY,
+        OSSL_KEYMGMT_SELECT_ALL_PARAMETERS
+    };
+    size_t i;
+
+    /* The decoder implementations made here support guessing */
+    if (selection == 0)
+        return 1;
+
+    for (i = 0; i < OSSL_NELEM(checks); i++) {
+        int check1 = (selection & checks[i]) != 0;
+        int check2 = (desc->selection_mask & checks[i]) != 0;
+
+        /*
+         * If the caller asked for the currently checked bit(s), return
+         * whether the decoder description says it's supported.
+         */
+        if (check1)
+            return check2;
+    }
+
+    /* This should be dead code, but just to be safe... */
+    return 0;
+}
+
+static int fake_rsa_der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+{
+    struct der2key_ctx_st *ctx = vctx;
+    unsigned char *der = NULL;
+    const unsigned char *derp;
+    long der_len = 0;
+    void *key = NULL;
+    int ok = 0;
+
+    ctx->selection = selection;
+    /*
+     * The caller is allowed to specify 0 as a selection mark, to have the
+     * structure and key type guessed.  For type-specific structures, this
+     * is not recommended, as some structures are very similar.
+     * Note that 0 isn't the same as OSSL_KEYMGMT_SELECT_ALL, as the latter
+     * signifies a private key structure, where everything else is assumed
+     * to be present as well.
+     */
+    if (selection == 0)
+        selection = ctx->desc->selection_mask;
+    if ((selection & ctx->desc->selection_mask) == 0) {
+        ERR_raise(ERR_LIB_PROV, ERR_R_PASSED_INVALID_ARGUMENT);
+        return 0;
+    }
+
+    ok = fake_rsa_read_der(ctx->provctx, cin, &der, &der_len);
+    if (!ok)
+        goto next;
+
+    ok = 0; /* Assume that we fail */
+
+    if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
+        derp = der;
+        if (ctx->desc->d2i_PKCS8 != NULL) {
+            key = ctx->desc->d2i_PKCS8(NULL, &derp, der_len, ctx);
+            if (ctx->flag_fatal)
+                goto end;
+        } else if (ctx->desc->d2i_private_key != NULL) {
+            key = ctx->desc->d2i_private_key(NULL, &derp, der_len);
+        }
+        if (key == NULL && ctx->selection != 0)
+            goto next;
+    }
+    if (key == NULL && (selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
+        derp = der;
+        if (ctx->desc->d2i_PUBKEY != NULL)
+            key = ctx->desc->d2i_PUBKEY(NULL, &derp, der_len);
+        else
+            key = ctx->desc->d2i_public_key(NULL, &derp, der_len);
+        if (key == NULL && ctx->selection != 0)
+            goto next;
+    }
+    if (key == NULL && (selection & OSSL_KEYMGMT_SELECT_ALL_PARAMETERS) != 0) {
+        derp = der;
+        if (ctx->desc->d2i_key_params != NULL)
+            key = ctx->desc->d2i_key_params(NULL, &derp, der_len);
+        if (key == NULL && ctx->selection != 0)
+            goto next;
+    }
+
+    /*
+     * Last minute check to see if this was the correct type of key.  This
+     * should never lead to a fatal error, i.e. the decoding itself was
+     * correct, it was just an unexpected key type.  This is generally for
+     * classes of key types that have subtle variants, like RSA-PSS keys as
+     * opposed to plain RSA keys.
+     */
+    if (key != NULL
+        && ctx->desc->check_key != NULL
+        && !ctx->desc->check_key(key, ctx)) {
+        ctx->desc->free_key(key);
+        key = NULL;
+    }
+
+    if (key != NULL && ctx->desc->adjust_key != NULL)
+        ctx->desc->adjust_key(key, ctx);
+
+next:
+    /*
+     * Indicated that we successfully decoded something, or not at all.
+     * Ending up "empty handed" is not an error.
+     */
+    ok = 1;
+
+    /*
+     * We free memory here so it's not held up during the callback, because
+     * we know the process is recursive and the allocated chunks of memory
+     * add up.
+     */
+    OPENSSL_free(der);
+    der = NULL;
+
+    if (key != NULL) {
+        OSSL_PARAM params[4];
+        int object_type = OSSL_OBJECT_PKEY;
+
+        params[0] = OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &object_type);
+        params[1] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
+            (char *)ctx->desc->keytype_name,
+            0);
+        /* The address of the key becomes the octet string */
+        params[2] = OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_REFERENCE,
+            &key, sizeof(key));
+        params[3] = OSSL_PARAM_construct_end();
+
+        ok = data_cb(params, data_cbarg);
+    }
+
+end:
+    ctx->desc->free_key(key);
+    OPENSSL_free(der);
+
+    return ok;
+}
+
+static OSSL_FUNC_keymgmt_export_fn *
+fake_rsa_prov_get_keymgmt_export(const OSSL_DISPATCH *fns)
+{
+    /* Pilfer the keymgmt dispatch table */
+    for (; fns->function_id != 0; fns++)
+        if (fns->function_id == OSSL_FUNC_KEYMGMT_EXPORT)
+            return OSSL_FUNC_keymgmt_export(fns);
+
+    return NULL;
+}
+
+static int der2key_export_object(void *vctx,
+    const void *reference, size_t reference_sz,
+    OSSL_CALLBACK *export_cb, void *export_cbarg)
+{
+    struct der2key_ctx_st *ctx = vctx;
+    OSSL_FUNC_keymgmt_export_fn *export = fake_rsa_prov_get_keymgmt_export(ctx->desc->fns);
+    void *keydata;
+
+    if (reference_sz == sizeof(keydata) && export != NULL) {
+        /* The contents of the reference is the address to our object */
+        keydata = *(void **)reference;
+
+        return export(keydata, ctx->selection, export_cb, export_cbarg);
+    }
+    return 0;
+}
+
+/* ---------------------------------------------------------------------- */
+
+static struct fake_rsa_keydata *fake_rsa_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
+    OSSL_LIB_CTX *libctx, const char *propq)
+{
+    struct fake_rsa_keydata *key = fake_rsa_keymgmt_new(NULL);
+
+    if (key)
+        key->status = FAKE_RSA_STATUS_DECODED;
+    return key;
+}
+
+#define rsa_evp_type EVP_PKEY_RSA
+
+static void *fake_rsa_d2i_PKCS8(void **key, const unsigned char **der, long der_len,
+    struct der2key_ctx_st *ctx)
+{
+    return fake_rsa_der2key_decode_p8(der, der_len, ctx,
+        (key_from_pkcs8_t *)fake_rsa_key_from_pkcs8);
+}
+
+static void fake_rsa_key_adjust(void *key, struct der2key_ctx_st *ctx)
+{
+}
+
+/* ---------------------------------------------------------------------- */
+
+#define DO_PrivateKeyInfo(keytype)         \
+    "PrivateKeyInfo", keytype##_evp_type,  \
+        (OSSL_KEYMGMT_SELECT_PRIVATE_KEY), \
+        NULL,                              \
+        NULL,                              \
+        NULL,                              \
+        fake_rsa_d2i_PKCS8,                \
+        NULL,                              \
+        NULL,                              \
+        fake_rsa_key_adjust,               \
+        (free_key_fn *)fake_rsa_keymgmt_free
+
+#define DO_SubjectPublicKeyInfo(keytype)        \
+    "SubjectPublicKeyInfo", keytype##_evp_type, \
+        (OSSL_KEYMGMT_SELECT_PUBLIC_KEY),       \
+        NULL,                                   \
+        NULL,                                   \
+        NULL,                                   \
+        NULL,                                   \
+        (d2i_of_void *)fake_rsa_d2i_PUBKEY,     \
+        NULL,                                   \
+        fake_rsa_key_adjust,                    \
+        (free_key_fn *)fake_rsa_keymgmt_free
+
+/*
+ * MAKE_DECODER is the single driver for creating OSSL_DISPATCH tables.
+ * It takes the following arguments:
+ *
+ * keytype_name The implementation key type as a string.
+ * keytype      The implementation key type.  This must correspond exactly
+ *              to our existing keymgmt keytype names...  in other words,
+ *              there must exist an ossl_##keytype##_keymgmt_functions.
+ * type         The type name for the set of functions that implement the
+ *              decoder for the key type.  This isn't necessarily the same
+ *              as keytype.  For example, the key types ed25519, ed448,
+ *              x25519 and x448 are all handled by the same functions with
+ *              the common type name ecx.
+ * kind         The kind of support to implement.  This translates into
+ *              the DO_##kind macros above, to populate the keytype_desc_st
+ *              structure.
+ */
+#define MAKE_DECODER(keytype_name, keytype, type, kind)                                             \
+    static struct keytype_desc_st kind##_##keytype##_desc = { keytype_name, fake_rsa_keymgmt_funcs, \
+        DO_##kind(keytype) };                                                                       \
+                                                                                                    \
+    static OSSL_FUNC_decoder_newctx_fn kind##_der2##keytype##_newctx;                               \
+                                                                                                    \
+    static void *kind##_der2##keytype##_newctx(void *provctx)                                       \
+    {                                                                                               \
+        return der2key_newctx(provctx, &kind##_##keytype##_desc, keytype_name);                     \
+    }                                                                                               \
+    static int kind##_der2##keytype##_does_selection(void *provctx,                                 \
+        int selection)                                                                              \
+    {                                                                                               \
+        return der2key_check_selection(selection,                                                   \
+            &kind##_##keytype##_desc);                                                              \
+    }                                                                                               \
+    static const OSSL_DISPATCH                                                                      \
+        fake_rsa_##kind##_der_to_##keytype##_decoder_functions[]                                    \
+        = {                                                                                         \
+              { OSSL_FUNC_DECODER_NEWCTX,                                                           \
+                  (void (*)(void))kind##_der2##keytype##_newctx },                                  \
+              { OSSL_FUNC_DECODER_FREECTX,                                                          \
+                  (void (*)(void))der2key_freectx },                                                \
+              { OSSL_FUNC_DECODER_DOES_SELECTION,                                                   \
+                  (void (*)(void))kind##_der2##keytype##_does_selection },                          \
+              { OSSL_FUNC_DECODER_DECODE,                                                           \
+                  (void (*)(void))fake_rsa_der2key_decode },                                        \
+              { OSSL_FUNC_DECODER_EXPORT_OBJECT,                                                    \
+                  (void (*)(void))der2key_export_object },                                          \
+              OSSL_DISPATCH_END                                                                     \
+          }
+
+MAKE_DECODER("RSA", rsa, rsa, PrivateKeyInfo);
+MAKE_DECODER("RSA", rsa, rsa, SubjectPublicKeyInfo);
+
+static const OSSL_ALGORITHM fake_rsa_decoder_algs[] = {
+#define DECODER_PROVIDER "fake-rsa"
+#define DECODER_STRUCTURE_SubjectPublicKeyInfo "SubjectPublicKeyInfo"
+#define DECODER_STRUCTURE_PrivateKeyInfo "PrivateKeyInfo"
+
+/* Arguments are prefixed with '_' to avoid build breaks on certain platforms */
+/*
+ * Obviously this is not FIPS approved, but in order to test in conjunction
+ * with the FIPS provider we pretend that it is.
+ */
+
+#define DECODER(_name, _input, _output)                          \
+    { _name,                                                     \
+        "provider=" DECODER_PROVIDER ",fips=yes,input=" #_input, \
+        (fake_rsa_##_input##_to_##_output##_decoder_functions) }
+#define DECODER_w_structure(_name, _input, _structure, _output) \
+    { _name,                                                    \
+        "provider=" DECODER_PROVIDER ",fips=yes,input=" #_input \
+        ",structure=" DECODER_STRUCTURE_##_structure,           \
+        (fake_rsa_##_structure##_##_input##_to_##_output##_decoder_functions) }
+
+    DECODER_w_structure("RSA:rsaEncryption", der, PrivateKeyInfo, rsa),
+    DECODER_w_structure("RSA:rsaEncryption", der, SubjectPublicKeyInfo, rsa),
+#undef DECODER_PROVIDER
+    { NULL, NULL, NULL }
+};
+
 static const OSSL_ALGORITHM *fake_rsa_query(void *provctx,
-                                            int operation_id,
-                                            int *no_cache)
+    int operation_id,
+    int *no_cache)
 {
     *no_cache = 0;
     switch (operation_id) {
@@ -716,23 +1212,46 @@ static const OSSL_ALGORITHM *fake_rsa_query(void *provctx,
 
     case OSSL_OP_STORE:
         return fake_rsa_store_algs;
+
+    case OSSL_OP_DECODER:
+        return fake_rsa_decoder_algs;
     }
     return NULL;
 }
 
+static void fake_rsa_prov_teardown(void *provctx)
+{
+    PROV_FAKE_RSA_CTX *pctx = (PROV_FAKE_RSA_CTX *)provctx;
+
+    OSSL_LIB_CTX_free(pctx->libctx);
+    OPENSSL_free(pctx);
+}
+
 /* Functions we provide to the core */
 static const OSSL_DISPATCH fake_rsa_method[] = {
-    { OSSL_FUNC_PROVIDER_TEARDOWN, (void (*)(void))OSSL_LIB_CTX_free },
+    { OSSL_FUNC_PROVIDER_TEARDOWN, (void (*)(void))fake_rsa_prov_teardown },
     { OSSL_FUNC_PROVIDER_QUERY_OPERATION, (void (*)(void))fake_rsa_query },
     OSSL_DISPATCH_END
 };
 
 static int fake_rsa_provider_init(const OSSL_CORE_HANDLE *handle,
-                                  const OSSL_DISPATCH *in,
-                                  const OSSL_DISPATCH **out, void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out, void **provctx)
 {
-    if (!TEST_ptr(*provctx = OSSL_LIB_CTX_new()))
+    OSSL_LIB_CTX *libctx;
+    PROV_FAKE_RSA_CTX *prov_ctx;
+
+    if (!TEST_ptr(libctx = OSSL_LIB_CTX_new_from_dispatch(handle, in)))
+        return 0;
+
+    if (!TEST_ptr(prov_ctx = OPENSSL_malloc(sizeof(*prov_ctx)))) {
+        OSSL_LIB_CTX_free(libctx);
         return 0;
+    }
+
+    prov_ctx->libctx = libctx;
+
+    *provctx = prov_ctx;
     *out = fake_rsa_method;
     return 1;
 }
@@ -742,8 +1261,8 @@ OSSL_PROVIDER *fake_rsa_start(OSSL_LIB_CTX *libctx)
     OSSL_PROVIDER *p;
 
     if (!TEST_true(OSSL_PROVIDER_add_builtin(libctx, "fake-rsa",
-                                             fake_rsa_provider_init))
-            || !TEST_ptr(p = OSSL_PROVIDER_try_load(libctx, "fake-rsa", 1)))
+            fake_rsa_provider_init))
+        || !TEST_ptr(p = OSSL_PROVIDER_try_load(libctx, "fake-rsa", 1)))
         return NULL;
 
     return p;
diff --git a/test/fake_rsaprov.h b/test/fake_rsaprov.h
index cb2e66eb68ef2..00e7dccb48727 100644
--- a/test/fake_rsaprov.h
+++ b/test/fake_rsaprov.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-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
@@ -14,5 +14,14 @@
 /* Fake RSA provider implementation */
 OSSL_PROVIDER *fake_rsa_start(OSSL_LIB_CTX *libctx);
 void fake_rsa_finish(OSSL_PROVIDER *p);
+
 OSSL_PARAM *fake_rsa_key_params(int priv);
 void fake_rsa_restore_store_state(void);
+
+/*
+ * When fake_rsa_query_operation_name is set to a non-zero value,
+ * query_operation_name() will return NULL.
+ *
+ * By default, it is 0, in which case query_operation_name() will return "RSA".
+ */
+extern unsigned fake_rsa_query_operation_name;
diff --git a/test/fatalerrtest.c b/test/fatalerrtest.c
index 30930d9ce8a59..9d7f56bf9f53b 100644
--- a/test/fatalerrtest.c
+++ b/test/fatalerrtest.c
@@ -29,8 +29,8 @@ static int test_fatalerr(void)
     };
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, TLS_method(), TLS_method(),
-                                       TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto err;
 
     /*
@@ -38,13 +38,13 @@ static int test_fatalerr(void)
      * to force a handshake failure.
      */
     if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "AES128-SHA"))
-            || !TEST_true(SSL_CTX_set_cipher_list(cctx, "AES256-SHA"))
-            || !TEST_true(SSL_CTX_set_ciphersuites(sctx,
-                                                   "TLS_AES_128_GCM_SHA256"))
-            || !TEST_true(SSL_CTX_set_ciphersuites(cctx,
-                                                   "TLS_AES_256_GCM_SHA384"))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &sssl, &cssl, NULL,
-                          NULL)))
+        || !TEST_true(SSL_CTX_set_cipher_list(cctx, "AES256-SHA"))
+        || !TEST_true(SSL_CTX_set_ciphersuites(sctx,
+            "TLS_AES_128_GCM_SHA256"))
+        || !TEST_true(SSL_CTX_set_ciphersuites(cctx,
+            "TLS_AES_256_GCM_SHA384"))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &sssl, &cssl, NULL,
+            NULL)))
         goto err;
 
     wbio = SSL_get_wbio(cssl);
@@ -73,7 +73,7 @@ static int test_fatalerr(void)
         goto err;
 
     ret = 1;
- err:
+err:
     SSL_free(sssl);
     SSL_free(cssl);
     SSL_CTX_free(sctx);
@@ -92,7 +92,7 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(cert = test_get_argument(0))
-            || !TEST_ptr(privkey = test_get_argument(1)))
+        || !TEST_ptr(privkey = test_get_argument(1)))
         return 0;
 
     ADD_TEST(test_fatalerr);
diff --git a/test/ffc_internal_test.c b/test/ffc_internal_test.c
index c56d1d0e9982e..4743279e4c4e0 100644
--- a/test/ffc_internal_test.c
+++ b/test/ffc_internal_test.c
@@ -181,14 +181,14 @@ static int ffc_params_validate_g_unverified_test(void)
     ossl_ffc_params_init(&params);
 
     if (!TEST_ptr(p = BN_bin2bn(dsa_2048_224_sha256_p,
-                                sizeof(dsa_2048_224_sha256_p), NULL)))
+                      sizeof(dsa_2048_224_sha256_p), NULL)))
         goto err;
     p1 = p;
     if (!TEST_ptr(q = BN_bin2bn(dsa_2048_224_sha256_q,
-                                sizeof(dsa_2048_224_sha256_q), NULL)))
+                      sizeof(dsa_2048_224_sha256_q), NULL)))
         goto err;
     if (!TEST_ptr(g = BN_bin2bn(dsa_2048_224_sha256_g,
-                                sizeof(dsa_2048_224_sha256_g), NULL)))
+                      sizeof(dsa_2048_224_sha256_g), NULL)))
         goto err;
     g1 = g;
 
@@ -200,36 +200,36 @@ static int ffc_params_validate_g_unverified_test(void)
     ossl_ffc_set_digest(&params, "SHA256", NULL);
 
     if (!TEST_false(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                       FFC_PARAM_TYPE_DSA,
-                                                       &res, NULL)))
+            FFC_PARAM_TYPE_DSA,
+            &res, NULL)))
         goto err;
 
     ossl_ffc_params_set0_pqg(&params, p, q, g);
     g = NULL;
     if (!TEST_true(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                      FFC_PARAM_TYPE_DSA,
-                                                      &res, NULL)))
+            FFC_PARAM_TYPE_DSA,
+            &res, NULL)))
         goto err;
 
     /* incorrect g */
     BN_add_word(g1, 1);
     if (!TEST_false(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                       FFC_PARAM_TYPE_DSA,
-                                                       &res, NULL)))
+            FFC_PARAM_TYPE_DSA,
+            &res, NULL)))
         goto err;
 
     /* fail if g < 2 */
     BN_set_word(g1, 1);
     if (!TEST_false(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                       FFC_PARAM_TYPE_DSA,
-                                                       &res, NULL)))
+            FFC_PARAM_TYPE_DSA,
+            &res, NULL)))
         goto err;
 
     BN_copy(g1, p1);
     /* Fail if g >= p */
     if (!TEST_false(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                       FFC_PARAM_TYPE_DSA,
-                                                       &res, NULL)))
+            FFC_PARAM_TYPE_DSA,
+            &res, NULL)))
         goto err;
 
     ret = 1;
@@ -249,12 +249,12 @@ static int ffc_params_validate_pq_test(void)
 
     ossl_ffc_params_init(&params);
     if (!TEST_ptr(p = BN_bin2bn(dsa_2048_224_sha224_p,
-                                   sizeof(dsa_2048_224_sha224_p),
-                                   NULL)))
+                      sizeof(dsa_2048_224_sha224_p),
+                      NULL)))
         goto err;
     if (!TEST_ptr(q = BN_bin2bn(dsa_2048_224_sha224_q,
-                                   sizeof(dsa_2048_224_sha224_q),
-                                   NULL)))
+                      sizeof(dsa_2048_224_sha224_q),
+                      NULL)))
         goto err;
 
     /* No p */
@@ -264,73 +264,72 @@ static int ffc_params_validate_pq_test(void)
     ossl_ffc_set_digest(&params, "SHA224", NULL);
 
     if (!TEST_false(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                       FFC_PARAM_TYPE_DSA,
-                                                       &res, NULL)))
+            FFC_PARAM_TYPE_DSA,
+            &res, NULL)))
         goto err;
 
     /* Test valid case */
     ossl_ffc_params_set0_pqg(&params, p, NULL, NULL);
     p = NULL;
     ossl_ffc_params_set_validate_params(&params, dsa_2048_224_sha224_seed,
-                                        sizeof(dsa_2048_224_sha224_seed),
-                                        dsa_2048_224_sha224_counter);
+        sizeof(dsa_2048_224_sha224_seed),
+        dsa_2048_224_sha224_counter);
     if (!TEST_true(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                      FFC_PARAM_TYPE_DSA,
-                                                      &res, NULL)))
+            FFC_PARAM_TYPE_DSA,
+            &res, NULL)))
         goto err;
 
     /* Bad counter - so p is not prime */
     ossl_ffc_params_set_validate_params(&params, dsa_2048_224_sha224_seed,
-                                        sizeof(dsa_2048_224_sha224_seed),
-                                        1);
+        sizeof(dsa_2048_224_sha224_seed),
+        1);
     if (!TEST_false(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                       FFC_PARAM_TYPE_DSA,
-                                                       &res, NULL)))
+            FFC_PARAM_TYPE_DSA,
+            &res, NULL)))
         goto err;
 
     /* seedlen smaller than N */
     ossl_ffc_params_set_validate_params(&params, dsa_2048_224_sha224_seed,
-                                        sizeof(dsa_2048_224_sha224_seed)-1,
-                                        dsa_2048_224_sha224_counter);
+        sizeof(dsa_2048_224_sha224_seed) - 1,
+        dsa_2048_224_sha224_counter);
     if (!TEST_false(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                       FFC_PARAM_TYPE_DSA,
-                                                       &res, NULL)))
+            FFC_PARAM_TYPE_DSA,
+            &res, NULL)))
         goto err;
 
     /* Provided seed doesn't produce a valid prime q */
     ossl_ffc_params_set_validate_params(&params, dsa_2048_224_sha224_bad_seed,
-                                        sizeof(dsa_2048_224_sha224_bad_seed),
-                                        dsa_2048_224_sha224_counter);
+        sizeof(dsa_2048_224_sha224_bad_seed),
+        dsa_2048_224_sha224_counter);
     if (!TEST_false(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                       FFC_PARAM_TYPE_DSA,
-                                                       &res, NULL)))
+            FFC_PARAM_TYPE_DSA,
+            &res, NULL)))
         goto err;
 
     if (!TEST_ptr(p = BN_bin2bn(dsa_3072_256_sha512_p,
-                                sizeof(dsa_3072_256_sha512_p), NULL)))
+                      sizeof(dsa_3072_256_sha512_p), NULL)))
         goto err;
     if (!TEST_ptr(q = BN_bin2bn(dsa_3072_256_sha512_q,
-                                sizeof(dsa_3072_256_sha512_q),
-                                NULL)))
+                      sizeof(dsa_3072_256_sha512_q),
+                      NULL)))
         goto err;
 
-
     ossl_ffc_params_set0_pqg(&params, p, q, NULL);
-    p = q  = NULL;
+    p = q = NULL;
     ossl_ffc_set_digest(&params, "SHA512", NULL);
     ossl_ffc_params_set_validate_params(&params, dsa_3072_256_sha512_seed,
-                                        sizeof(dsa_3072_256_sha512_seed),
-                                        dsa_3072_256_sha512_counter);
+        sizeof(dsa_3072_256_sha512_seed),
+        dsa_3072_256_sha512_counter);
     /* Q doesn't div P-1 */
     if (!TEST_false(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                       FFC_PARAM_TYPE_DSA,
-                                                       &res, NULL)))
+            FFC_PARAM_TYPE_DSA,
+            &res, NULL)))
         goto err;
 
     /* Bad L/N for FIPS DH */
     if (!TEST_false(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                       FFC_PARAM_TYPE_DH,
-                                                       &res, NULL)))
+            FFC_PARAM_TYPE_DH,
+            &res, NULL)))
         goto err;
 
     ret = 1;
@@ -350,12 +349,12 @@ static int ffc_params_gen_test(void)
 
     ossl_ffc_params_init(&params);
     if (!TEST_true(ossl_ffc_params_FIPS186_4_generate(NULL, &params,
-                                                      FFC_PARAM_TYPE_DH,
-                                                      2048, 256, &res, NULL)))
+            FFC_PARAM_TYPE_DH,
+            2048, 256, &res, NULL)))
         goto err;
     if (!TEST_true(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                      FFC_PARAM_TYPE_DH,
-                                                      &res, NULL)))
+            FFC_PARAM_TYPE_DH,
+            &res, NULL)))
         goto err;
 
     ret = 1;
@@ -372,12 +371,12 @@ static int ffc_params_gen_canonicalg_test(void)
     ossl_ffc_params_init(&params);
     params.gindex = 1;
     if (!TEST_true(ossl_ffc_params_FIPS186_4_generate(NULL, &params,
-                                                      FFC_PARAM_TYPE_DH,
-                                                      2048, 256, &res, NULL)))
+            FFC_PARAM_TYPE_DH,
+            2048, 256, &res, NULL)))
         goto err;
     if (!TEST_true(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                      FFC_PARAM_TYPE_DH,
-                                                      &res, NULL)))
+            FFC_PARAM_TYPE_DH,
+            &res, NULL)))
         goto err;
 
     if (!TEST_true(ossl_ffc_params_print(bio_out, &params, 4)))
@@ -399,12 +398,12 @@ static int ffc_params_fips186_2_gen_validate_test(void)
     if (!TEST_ptr(bn = BN_new()))
         goto err;
     if (!TEST_true(ossl_ffc_params_FIPS186_2_generate(NULL, &params,
-                                                      FFC_PARAM_TYPE_DH,
-                                                      1024, 160, &res, NULL)))
+            FFC_PARAM_TYPE_DH,
+            1024, 160, &res, NULL)))
         goto err;
     if (!TEST_true(ossl_ffc_params_FIPS186_2_validate(NULL, &params,
-                                                      FFC_PARAM_TYPE_DH,
-                                                      &res, NULL)))
+            FFC_PARAM_TYPE_DH,
+            &res, NULL)))
         goto err;
 
     /*
@@ -412,8 +411,8 @@ static int ffc_params_fips186_2_gen_validate_test(void)
      * fips 186-4 given the same seed value. So validation of q will fail.
      */
     if (!TEST_false(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                       FFC_PARAM_TYPE_DSA,
-                                                       &res, NULL)))
+            FFC_PARAM_TYPE_DSA,
+            &res, NULL)))
         goto err;
     /* As the params are randomly generated the error is one of the following */
     if (!TEST_true(res == FFC_CHECK_Q_MISMATCH || res == FFC_CHECK_Q_NOT_PRIME))
@@ -422,8 +421,9 @@ static int ffc_params_fips186_2_gen_validate_test(void)
     ossl_ffc_params_set_flags(&params, FFC_PARAM_FLAG_VALIDATE_G);
     /* Partially valid g test will still pass */
     if (!TEST_int_eq(ossl_ffc_params_FIPS186_4_validate(NULL, &params,
-                                                        FFC_PARAM_TYPE_DSA,
-                                                        &res, NULL), 2))
+                         FFC_PARAM_TYPE_DSA,
+                         &res, NULL),
+            2))
         goto err;
 
     if (!TEST_true(ossl_ffc_params_print(bio_out, &params, 4)))
@@ -569,7 +569,7 @@ static int ffc_private_validate_test(void)
 
     /* Pass if priv key >= 1 */
     if (!TEST_true(ossl_ffc_validate_private_key(params->q, BN_value_one(),
-                                                 &res)))
+            &res)))
         goto err;
 
     if (!TEST_ptr(BN_copy(priv, params->q)))
@@ -644,8 +644,8 @@ static int ffc_private_gen_test(int index)
         goto err;
     /* N is ignored in this case */
     if (!TEST_true(ossl_ffc_generate_private_key(ctx, params, 0,
-                                                 ossl_ifc_ffc_compute_security_bits(BN_num_bits(params->p)),
-                                                 priv)))
+            ossl_ifc_ffc_compute_security_bits(BN_num_bits(params->p)),
+            priv)))
         goto err;
     if (!TEST_int_le(BN_num_bits(priv), 225))
         goto err;
diff --git a/test/filterprov.c b/test/filterprov.c
index fe724cf482dce..11f9445d6d6ae 100644
--- a/test/filterprov.c
+++ b/test/filterprov.c
@@ -21,7 +21,7 @@
 #include "filterprov.h"
 #include "prov/bio.h"
 
-#define MAX_FILTERS     10
+#define MAX_FILTERS 10
 #define MAX_ALG_FILTERS 5
 
 struct filter_prov_globals_st {
@@ -70,7 +70,7 @@ static int filter_get_params(void *provctx, OSSL_PARAM params[])
 }
 
 static int filter_get_capabilities(void *provctx, const char *capability,
-                                   OSSL_CALLBACK *cb, void *arg)
+    OSSL_CALLBACK *cb, void *arg)
 {
     struct filter_prov_globals_st *globs = get_globals();
 
@@ -78,8 +78,8 @@ static int filter_get_capabilities(void *provctx, const char *capability,
 }
 
 static const OSSL_ALGORITHM *filter_query(void *provctx,
-                                          int operation_id,
-                                          int *no_cache)
+    int operation_id,
+    int *no_cache)
 {
     struct filter_prov_globals_st *globs = get_globals();
     int i;
@@ -97,7 +97,7 @@ static const OSSL_ALGORITHM *filter_query(void *provctx,
 }
 
 static void filter_unquery(void *provctx, int operation_id,
-                           const OSSL_ALGORITHM *algs)
+    const OSSL_ALGORITHM *algs)
 {
     struct filter_prov_globals_st *globs = get_globals();
     int i;
@@ -136,9 +136,9 @@ static const OSSL_DISPATCH filter_dispatch_table[] = {
 };
 
 int filter_provider_init(const OSSL_CORE_HANDLE *handle,
-                         const OSSL_DISPATCH *in,
-                         const OSSL_DISPATCH **out,
-                         void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     OSSL_FUNC_core_get_libctx_fn *c_get_libctx = NULL;
     BIO_METHOD *corebiometh;
@@ -177,7 +177,7 @@ int filter_provider_init(const OSSL_CORE_HANDLE *handle,
      * create their own library context.
      */
     if ((*provctx = ossl_prov_ctx_new()) == NULL
-            || (corebiometh = ossl_bio_prov_init_bio_method()) == NULL) {
+        || (corebiometh = ossl_bio_prov_init_bio_method()) == NULL) {
         ossl_prov_ctx_free(*provctx);
         *provctx = NULL;
         goto err;
@@ -188,7 +188,7 @@ int filter_provider_init(const OSSL_CORE_HANDLE *handle,
     *out = filter_dispatch_table;
     return 1;
 
- err:
+err:
     OSSL_PROVIDER_unload(ourglobals.deflt);
     OSSL_LIB_CTX_free(ourglobals.libctx);
     return 0;
@@ -209,8 +209,8 @@ int filter_provider_set_filter(int operation, const char *filterstr)
     char *filterstrtmp = OPENSSL_strdup(filterstr);
     char *name, *sep;
     const OSSL_ALGORITHM *provalgs = OSSL_PROVIDER_query_operation(globs->deflt,
-                                                                   operation,
-                                                                   &no_cache);
+        operation,
+        &no_cache);
     const OSSL_ALGORITHM *algs;
 
     if (filterstrtmp == NULL)
@@ -259,7 +259,7 @@ int filter_provider_set_filter(int operation, const char *filterstr)
     globs->num_dispatch++;
 
     ret = 1;
- err:
+err:
     OSSL_PROVIDER_unquery_operation(globs->deflt, operation, provalgs);
     OPENSSL_free(filterstrtmp);
     return ret;
diff --git a/test/fips_version_test.c b/test/fips_version_test.c
index dd23bb51e508d..e732b3ad8a1ec 100644
--- a/test/fips_version_test.c
+++ b/test/fips_version_test.c
@@ -26,7 +26,7 @@ const OPTIONS *test_get_options(void)
     static const OPTIONS test_options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the libctx" },
+            "The configuration file to use for the libctx" },
         { NULL }
     };
     return test_options;
@@ -53,7 +53,7 @@ int setup_tests(void)
             config_file = opt_arg();
             break;
         case OPT_TEST_CASES:
-           break;
+            break;
         default:
         case OPT_ERR:
             return 0;
diff --git a/test/gmdifftest.c b/test/gmdifftest.c
index 028816f6ded40..4f6e697de9546 100644
--- a/test/gmdifftest.c
+++ b/test/gmdifftest.c
@@ -50,11 +50,11 @@ static int check_time(long offset)
 static int test_gmtime(int offset)
 {
     return check_time(offset)
-           && check_time(-offset)
-           && check_time(offset * 1000L)
-           && check_time(-offset * 1000L)
-           && check_time(offset * 1000000L)
-           && check_time(-offset * 1000000L);
+        && check_time(-offset)
+        && check_time(offset * 1000L)
+        && check_time(-offset * 1000L)
+        && check_time(offset * 1000000L)
+        && check_time(-offset * 1000000L);
 }
 
 int setup_tests(void)
diff --git a/test/helpers/cmp_testlib.c b/test/helpers/cmp_testlib.c
index e0fb1d3d345dc..56888a394d99b 100644
--- a/test/helpers/cmp_testlib.c
+++ b/test/helpers/cmp_testlib.c
@@ -75,7 +75,7 @@ int STACK_OF_X509_push1(STACK_OF(X509) *sk, X509 *cert)
 }
 
 int print_to_bio_out(const char *func, const char *file, int line,
-                     OSSL_CMP_severity level, const char *msg)
+    OSSL_CMP_severity level, const char *msg)
 {
     return OSSL_CMP_print_to_bio(bio_out, func, file, line, level, msg);
 }
diff --git a/test/helpers/cmp_testlib.h b/test/helpers/cmp_testlib.h
index 50b085beca01f..079b840975abe 100644
--- a/test/helpers/cmp_testlib.h
+++ b/test/helpers/cmp_testlib.h
@@ -10,23 +10,23 @@
  */
 
 #ifndef OSSL_TEST_CMP_TESTLIB_H
-# define OSSL_TEST_CMP_TESTLIB_H
+#define OSSL_TEST_CMP_TESTLIB_H
 
-# include <openssl/cmp.h>
-# include <openssl/pem.h>
-# include <openssl/rand.h>
+#include <openssl/cmp.h>
+#include <openssl/pem.h>
+#include <openssl/rand.h>
 
-# include "../../crypto/cmp/cmp_local.h"
-# include "../testutil.h"
+#include "../../crypto/cmp/cmp_local.h"
+#include "../testutil.h"
 
-# ifndef OPENSSL_NO_CMP
-#  define CMP_TEST_REFVALUE_LENGTH 15 /* arbitrary value */
+#ifndef OPENSSL_NO_CMP
+#define CMP_TEST_REFVALUE_LENGTH 15 /* arbitrary value */
 OSSL_CMP_MSG *load_pkimsg(const char *file, OSSL_LIB_CTX *libctx);
 int valid_asn1_encoding(const OSSL_CMP_MSG *msg);
 int STACK_OF_X509_cmp(const STACK_OF(X509) *sk1, const STACK_OF(X509) *sk2);
 int STACK_OF_X509_push1(STACK_OF(X509) *sk, X509 *cert);
 int print_to_bio_out(const char *func, const char *file, int line,
-                     OSSL_CMP_severity level, const char *msg);
-# endif
+    OSSL_CMP_severity level, const char *msg);
+#endif
 
 #endif /* OSSL_TEST_CMP_TESTLIB_H */
diff --git a/test/helpers/handshake.c b/test/helpers/handshake.c
index 64eb6ae441092..39de431b6dcad 100644
--- a/test/helpers/handshake.c
+++ b/test/helpers/handshake.c
@@ -81,8 +81,7 @@ static int ex_data_idx;
 static void info_cb(const SSL *s, int where, int ret)
 {
     if (where & SSL_CB_ALERT) {
-        HANDSHAKE_EX_DATA *ex_data =
-            (HANDSHAKE_EX_DATA*)(SSL_get_ex_data(s, ex_data_idx));
+        HANDSHAKE_EX_DATA *ex_data = (HANDSHAKE_EX_DATA *)(SSL_get_ex_data(s, ex_data_idx));
         if (where & SSL_CB_WRITE) {
             ex_data->alert_sent = ret;
             if (strcmp(SSL_alert_type_string(ret), "F") == 0
@@ -103,8 +102,7 @@ static void info_cb(const SSL *s, int where, int ret)
 static int select_server_ctx(SSL *s, void *arg, int ignore)
 {
     const char *servername = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
-    HANDSHAKE_EX_DATA *ex_data =
-        (HANDSHAKE_EX_DATA*)(SSL_get_ex_data(s, ex_data_idx));
+    HANDSHAKE_EX_DATA *ex_data = (HANDSHAKE_EX_DATA *)(SSL_get_ex_data(s, ex_data_idx));
 
     if (servername == NULL) {
         ex_data->servername = SSL_TEST_SERVERNAME_SERVER1;
@@ -112,7 +110,7 @@ static int select_server_ctx(SSL *s, void *arg, int ignore)
     }
 
     if (strcmp(servername, "server2") == 0) {
-        SSL_CTX *new_ctx = (SSL_CTX*)arg;
+        SSL_CTX *new_ctx = (SSL_CTX *)arg;
         SSL_set_SSL_CTX(s, new_ctx);
         /*
          * Copy over all the SSL_CTX options - reasonable behavior
@@ -141,16 +139,15 @@ static int client_hello_select_server_ctx(SSL *s, void *arg, int ignore)
     const char *servername;
     const unsigned char *p;
     size_t len, remaining;
-    HANDSHAKE_EX_DATA *ex_data =
-        (HANDSHAKE_EX_DATA*)(SSL_get_ex_data(s, ex_data_idx));
+    HANDSHAKE_EX_DATA *ex_data = (HANDSHAKE_EX_DATA *)(SSL_get_ex_data(s, ex_data_idx));
 
     /*
      * The server_name extension was given too much extensibility when it
      * was written, so parsing the normal case is a bit complex.
      */
     if (!SSL_client_hello_get0_ext(s, TLSEXT_TYPE_server_name, &p,
-                                   &remaining) ||
-        remaining <= 2)
+            &remaining)
+        || remaining <= 2)
         return 0;
     /* Extract the length of the supplied list of names. */
     len = (*(p++) << 8);
@@ -188,8 +185,7 @@ static int client_hello_select_server_ctx(SSL *s, void *arg, int ignore)
 
         ex_data->servername = SSL_TEST_SERVERNAME_SERVER2;
         return 1;
-    } else if (len == strlen("server1") &&
-               HAS_PREFIX(servername, "server1")) {
+    } else if (len == strlen("server1") && HAS_PREFIX(servername, "server1")) {
         ex_data->servername = SSL_TEST_SERVERNAME_SERVER1;
         return 1;
     } else if (ignore) {
@@ -249,10 +245,7 @@ static int client_hello_nov12_cb(SSL *s, int *al, void *arg)
         return SSL_CLIENT_HELLO_ERROR;
     }
     (void)SSL_client_hello_get0_session_id(s, &p);
-    if (p == NULL ||
-        SSL_client_hello_get0_random(s, &p) == 0 ||
-        SSL_client_hello_get0_ciphers(s, &p) == 0 ||
-        SSL_client_hello_get0_compression_methods(s, &p) == 0) {
+    if (p == NULL || SSL_client_hello_get0_random(s, &p) == 0 || SSL_client_hello_get0_ciphers(s, &p) == 0 || SSL_client_hello_get0_compression_methods(s, &p) == 0) {
         *al = SSL_AD_INTERNAL_ERROR;
         return SSL_CLIENT_HELLO_ERROR;
     }
@@ -299,13 +292,15 @@ static int client_ocsp_cb(SSL *s, void *arg)
     return 1;
 }
 
-static int verify_reject_cb(X509_STORE_CTX *ctx, void *arg) {
+static int verify_reject_cb(X509_STORE_CTX *ctx, void *arg)
+{
     X509_STORE_CTX_set_error(ctx, X509_V_ERR_APPLICATION_VERIFICATION);
     return 0;
 }
 
 static int n_retries = 0;
-static int verify_retry_cb(X509_STORE_CTX *ctx, void *arg) {
+static int verify_retry_cb(X509_STORE_CTX *ctx, void *arg)
+{
     int idx = SSL_get_ex_data_X509_STORE_CTX_idx();
     SSL *ssl;
 
@@ -320,24 +315,24 @@ static int verify_retry_cb(X509_STORE_CTX *ctx, void *arg) {
     return SSL_set_retry_verify(ssl);
 }
 
-static int verify_accept_cb(X509_STORE_CTX *ctx, void *arg) {
+static int verify_accept_cb(X509_STORE_CTX *ctx, void *arg)
+{
     return 1;
 }
 
 static int broken_session_ticket_cb(SSL *s, unsigned char *key_name,
-                                    unsigned char *iv, EVP_CIPHER_CTX *ctx,
-                                    EVP_MAC_CTX *hctx, int enc)
+    unsigned char *iv, EVP_CIPHER_CTX *ctx,
+    EVP_MAC_CTX *hctx, int enc)
 {
     return 0;
 }
 
 static int do_not_call_session_ticket_cb(SSL *s, unsigned char *key_name,
-                                         unsigned char *iv,
-                                         EVP_CIPHER_CTX *ctx,
-                                         EVP_MAC_CTX *hctx, int enc)
+    unsigned char *iv,
+    EVP_CIPHER_CTX *ctx,
+    EVP_MAC_CTX *hctx, int enc)
 {
-    HANDSHAKE_EX_DATA *ex_data =
-        (HANDSHAKE_EX_DATA*)(SSL_get_ex_data(s, ex_data_idx));
+    HANDSHAKE_EX_DATA *ex_data = (HANDSHAKE_EX_DATA *)(SSL_get_ex_data(s, ex_data_idx));
     ex_data->session_ticket_do_not_call = 1;
     return 0;
 }
@@ -357,8 +352,8 @@ static int parse_protos(const char *protos, unsigned char **out, size_t *outlen)
 
     /* Should never have reuse. */
     if (!TEST_ptr_null(*out)
-            /* Test values are small, so we omit length limit checks. */
-            || !TEST_ptr(*out = OPENSSL_malloc(len + 1)))
+        /* Test values are small, so we omit length limit checks. */
+        || !TEST_ptr(*out = OPENSSL_malloc(len + 1)))
         return 0;
     *outlen = len + 1;
 
@@ -398,24 +393,25 @@ static int parse_protos(const char *protos, unsigned char **out, size_t *outlen)
  * protocol that it supports.
  */
 static int client_npn_cb(SSL *s, unsigned char **out, unsigned char *outlen,
-                         const unsigned char *in, unsigned int inlen,
-                         void *arg)
+    const unsigned char *in, unsigned int inlen,
+    void *arg)
 {
-    CTX_DATA *ctx_data = (CTX_DATA*)(arg);
+    CTX_DATA *ctx_data = (CTX_DATA *)(arg);
     int ret;
 
     ret = SSL_select_next_proto(out, outlen, in, inlen,
-                                ctx_data->npn_protocols,
-                                ctx_data->npn_protocols_len);
+        ctx_data->npn_protocols,
+        ctx_data->npn_protocols_len);
     /* Accept both OPENSSL_NPN_NEGOTIATED and OPENSSL_NPN_NO_OVERLAP. */
     return TEST_true(ret == OPENSSL_NPN_NEGOTIATED || ret == OPENSSL_NPN_NO_OVERLAP)
-        ? SSL_TLSEXT_ERR_OK : SSL_TLSEXT_ERR_ALERT_FATAL;
+        ? SSL_TLSEXT_ERR_OK
+        : SSL_TLSEXT_ERR_ALERT_FATAL;
 }
 
 static int server_npn_cb(SSL *s, const unsigned char **data,
-                         unsigned int *len, void *arg)
+    unsigned int *len, void *arg)
 {
-    CTX_DATA *ctx_data = (CTX_DATA*)(arg);
+    CTX_DATA *ctx_data = (CTX_DATA *)(arg);
     *data = ctx_data->npn_protocols;
     *len = ctx_data->npn_protocols_len;
     return SSL_TLSEXT_ERR_OK;
@@ -429,10 +425,10 @@ static int server_npn_cb(SSL *s, const unsigned char **data,
  * respond with a fatal "no_application_protocol" alert.
  */
 static int server_alpn_cb(SSL *s, const unsigned char **out,
-                          unsigned char *outlen, const unsigned char *in,
-                          unsigned int inlen, void *arg)
+    unsigned char *outlen, const unsigned char *in,
+    unsigned int inlen, void *arg)
 {
-    CTX_DATA *ctx_data = (CTX_DATA*)(arg);
+    CTX_DATA *ctx_data = (CTX_DATA *)(arg);
     int ret;
 
     /* SSL_select_next_proto isn't const-correct... */
@@ -444,13 +440,13 @@ static int server_alpn_cb(SSL *s, const unsigned char **out,
      * so we can return directly without storing a copy.
      */
     ret = SSL_select_next_proto(&tmp_out, outlen,
-                                ctx_data->alpn_protocols,
-                                ctx_data->alpn_protocols_len, in, inlen);
+        ctx_data->alpn_protocols,
+        ctx_data->alpn_protocols_len, in, inlen);
 
     *out = tmp_out;
     /* Unlike NPN, we don't tolerate a mismatch. */
     return ret == OPENSSL_NPN_NEGOTIATED ? SSL_TLSEXT_ERR_OK
-        : SSL_TLSEXT_ERR_ALERT_FATAL;
+                                         : SSL_TLSEXT_ERR_ALERT_FATAL;
 }
 
 static int generate_session_ticket_cb(SSL *s, void *arg)
@@ -466,10 +462,10 @@ static int generate_session_ticket_cb(SSL *s, void *arg)
 }
 
 static int decrypt_session_ticket_cb(SSL *s, SSL_SESSION *ss,
-                                     const unsigned char *keyname,
-                                     size_t keyname_len,
-                                     SSL_TICKET_STATUS status,
-                                     void *arg)
+    const unsigned char *keyname,
+    size_t keyname_len,
+    SSL_TICKET_STATUS status,
+    void *arg)
 {
     switch (status) {
     case SSL_TICKET_EMPTY:
@@ -490,27 +486,29 @@ static int decrypt_session_ticket_cb(SSL *s, SSL_SESSION *ss,
  * in the server/client CONF.
  */
 static int configure_handshake_ctx(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
-                                   SSL_CTX *client_ctx,
-                                   const SSL_TEST_CTX *test,
-                                   const SSL_TEST_EXTRA_CONF *extra,
-                                   CTX_DATA *server_ctx_data,
-                                   CTX_DATA *server2_ctx_data,
-                                   CTX_DATA *client_ctx_data)
+    SSL_CTX *client_ctx,
+    const SSL_TEST_CTX *test,
+    const SSL_TEST_EXTRA_CONF *extra,
+    CTX_DATA *server_ctx_data,
+    CTX_DATA *server2_ctx_data,
+    CTX_DATA *client_ctx_data)
 {
     unsigned char *ticket_keys;
     size_t ticket_key_len;
 
     if (!TEST_int_eq(SSL_CTX_set_max_send_fragment(server_ctx,
-                                                   test->max_fragment_size), 1))
+                         test->max_fragment_size),
+            1))
         goto err;
     if (server2_ctx != NULL) {
         if (!TEST_int_eq(SSL_CTX_set_max_send_fragment(server2_ctx,
-                                                       test->max_fragment_size),
-                         1))
+                             test->max_fragment_size),
+                1))
             goto err;
     }
     if (!TEST_int_eq(SSL_CTX_set_max_send_fragment(client_ctx,
-                                                   test->max_fragment_size), 1))
+                         test->max_fragment_size),
+            1))
         goto err;
 
     switch (extra->client.verify_callback) {
@@ -535,7 +533,7 @@ static int configure_handshake_ctx(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
     case TLSEXT_max_fragment_length_4096:
     case TLSEXT_max_fragment_length_DISABLED:
         SSL_CTX_set_tlsext_max_fragment_length(
-              client_ctx, extra->client.max_fragment_len_mode);
+            client_ctx, extra->client.max_fragment_len_mode);
         break;
     }
 
@@ -572,7 +570,8 @@ static int configure_handshake_ctx(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
         SSL_CTX_set_tlsext_status_cb(server_ctx, server_ocsp_cb);
         SSL_CTX_set_tlsext_status_arg(server_ctx,
             ((extra->server.cert_status == SSL_TEST_CERT_STATUS_GOOD_RESPONSE)
-            ? &dummy_ocsp_resp_good_val : &dummy_ocsp_resp_bad_val));
+                    ? &dummy_ocsp_resp_good_val
+                    : &dummy_ocsp_resp_bad_val));
     }
 
     /*
@@ -582,86 +581,84 @@ static int configure_handshake_ctx(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
      */
     if (server2_ctx != NULL)
         SSL_CTX_set_tlsext_ticket_key_evp_cb(server2_ctx,
-                                             do_not_call_session_ticket_cb);
+            do_not_call_session_ticket_cb);
 
     if (extra->server.broken_session_ticket) {
         SSL_CTX_set_tlsext_ticket_key_evp_cb(server_ctx,
-                                             broken_session_ticket_cb);
+            broken_session_ticket_cb);
     }
 #ifndef OPENSSL_NO_NEXTPROTONEG
     if (extra->server.npn_protocols != NULL) {
         if (!TEST_true(parse_protos(extra->server.npn_protocols,
-                                    &server_ctx_data->npn_protocols,
-                                    &server_ctx_data->npn_protocols_len)))
+                &server_ctx_data->npn_protocols,
+                &server_ctx_data->npn_protocols_len)))
             goto err;
         SSL_CTX_set_npn_advertised_cb(server_ctx, server_npn_cb,
-                                      server_ctx_data);
+            server_ctx_data);
     }
     if (extra->server2.npn_protocols != NULL) {
         if (!TEST_true(parse_protos(extra->server2.npn_protocols,
-                                    &server2_ctx_data->npn_protocols,
-                                    &server2_ctx_data->npn_protocols_len))
-                || !TEST_ptr(server2_ctx))
+                &server2_ctx_data->npn_protocols,
+                &server2_ctx_data->npn_protocols_len))
+            || !TEST_ptr(server2_ctx))
             goto err;
         SSL_CTX_set_npn_advertised_cb(server2_ctx, server_npn_cb,
-                                      server2_ctx_data);
+            server2_ctx_data);
     }
     if (extra->client.npn_protocols != NULL) {
         if (!TEST_true(parse_protos(extra->client.npn_protocols,
-                                    &client_ctx_data->npn_protocols,
-                                    &client_ctx_data->npn_protocols_len)))
+                &client_ctx_data->npn_protocols,
+                &client_ctx_data->npn_protocols_len)))
             goto err;
         SSL_CTX_set_next_proto_select_cb(client_ctx, client_npn_cb,
-                                         client_ctx_data);
+            client_ctx_data);
     }
 #endif
     if (extra->server.alpn_protocols != NULL) {
         if (!TEST_true(parse_protos(extra->server.alpn_protocols,
-                                    &server_ctx_data->alpn_protocols,
-                                    &server_ctx_data->alpn_protocols_len)))
+                &server_ctx_data->alpn_protocols,
+                &server_ctx_data->alpn_protocols_len)))
             goto err;
         SSL_CTX_set_alpn_select_cb(server_ctx, server_alpn_cb, server_ctx_data);
     }
     if (extra->server2.alpn_protocols != NULL) {
         if (!TEST_ptr(server2_ctx)
-                || !TEST_true(parse_protos(extra->server2.alpn_protocols,
-                                           &server2_ctx_data->alpn_protocols,
-                                           &server2_ctx_data->alpn_protocols_len
-            )))
+            || !TEST_true(parse_protos(extra->server2.alpn_protocols,
+                &server2_ctx_data->alpn_protocols,
+                &server2_ctx_data->alpn_protocols_len)))
             goto err;
         SSL_CTX_set_alpn_select_cb(server2_ctx, server_alpn_cb,
-                                   server2_ctx_data);
+            server2_ctx_data);
     }
     if (extra->client.alpn_protocols != NULL) {
         unsigned char *alpn_protos = NULL;
         size_t alpn_protos_len = 0;
 
         if (!TEST_true(parse_protos(extra->client.alpn_protocols,
-                                    &alpn_protos, &alpn_protos_len))
-                /* Reversed return value convention... */
-                || !TEST_int_eq(SSL_CTX_set_alpn_protos(client_ctx, alpn_protos,
-                                                        alpn_protos_len), 0))
+                &alpn_protos, &alpn_protos_len))
+            /* Reversed return value convention... */
+            || !TEST_int_eq(SSL_CTX_set_alpn_protos(client_ctx, alpn_protos,
+                                alpn_protos_len),
+                0))
             goto err;
         OPENSSL_free(alpn_protos);
     }
 
     if (extra->server.session_ticket_app_data != NULL) {
-        server_ctx_data->session_ticket_app_data =
-            OPENSSL_strdup(extra->server.session_ticket_app_data);
+        server_ctx_data->session_ticket_app_data = OPENSSL_strdup(extra->server.session_ticket_app_data);
         if (!TEST_ptr(server_ctx_data->session_ticket_app_data))
             goto err;
         SSL_CTX_set_session_ticket_cb(server_ctx, generate_session_ticket_cb,
-                                      decrypt_session_ticket_cb, server_ctx_data);
+            decrypt_session_ticket_cb, server_ctx_data);
     }
     if (extra->server2.session_ticket_app_data != NULL) {
         if (!TEST_ptr(server2_ctx))
             goto err;
-        server2_ctx_data->session_ticket_app_data =
-            OPENSSL_strdup(extra->server2.session_ticket_app_data);
+        server2_ctx_data->session_ticket_app_data = OPENSSL_strdup(extra->server2.session_ticket_app_data);
         if (!TEST_ptr(server2_ctx_data->session_ticket_app_data))
             goto err;
         SSL_CTX_set_session_ticket_cb(server2_ctx, NULL,
-                                      decrypt_session_ticket_cb, server2_ctx_data);
+            decrypt_session_ticket_cb, server2_ctx_data);
     }
 
     /*
@@ -670,9 +667,10 @@ static int configure_handshake_ctx(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
      */
     ticket_key_len = SSL_CTX_set_tlsext_ticket_keys(server_ctx, NULL, 0);
     if (!TEST_ptr(ticket_keys = OPENSSL_zalloc(ticket_key_len))
-            || !TEST_int_eq(SSL_CTX_set_tlsext_ticket_keys(server_ctx,
-                                                           ticket_keys,
-                                                           ticket_key_len), 1)) {
+        || !TEST_int_eq(SSL_CTX_set_tlsext_ticket_keys(server_ctx,
+                            ticket_keys,
+                            ticket_key_len),
+            1)) {
         OPENSSL_free(ticket_keys);
         goto err;
     }
@@ -685,7 +683,7 @@ static int configure_handshake_ctx(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
     switch (extra->client.ct_validation) {
     case SSL_TEST_CT_VALIDATION_PERMISSIVE:
         if (!TEST_true(SSL_CTX_enable_ct(client_ctx,
-                                         SSL_CT_VALIDATION_PERMISSIVE)))
+                SSL_CT_VALIDATION_PERMISSIVE)))
             goto err;
         break;
     case SSL_TEST_CT_VALIDATION_STRICT:
@@ -698,10 +696,10 @@ static int configure_handshake_ctx(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
 #endif
 #ifndef OPENSSL_NO_SRP
     if (!configure_handshake_ctx_for_srp(server_ctx, server2_ctx, client_ctx,
-                                         extra, server_ctx_data,
-                                         server2_ctx_data, client_ctx_data))
+            extra, server_ctx_data,
+            server2_ctx_data, client_ctx_data))
         goto err;
-#endif  /* !OPENSSL_NO_SRP */
+#endif /* !OPENSSL_NO_SRP */
 #ifndef OPENSSL_NO_COMP_ALG
     if (test->compress_certificates) {
         if (!TEST_true(SSL_CTX_compress_certs(server_ctx, 0)))
@@ -717,11 +715,11 @@ static int configure_handshake_ctx(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
 
 /* Configure per-SSL callbacks and other properties. */
 static void configure_handshake_ssl(SSL *server, SSL *client,
-                                    const SSL_TEST_EXTRA_CONF *extra)
+    const SSL_TEST_EXTRA_CONF *extra)
 {
     if (extra->client.servername != SSL_TEST_SERVERNAME_NONE)
         SSL_set_tlsext_host_name(client,
-                                 ssl_servername_name(extra->client.servername));
+            ssl_servername_name(extra->client.servername));
     if (extra->client.enable_pha)
         SSL_set_post_handshake_auth(client, 1);
 }
@@ -755,8 +753,8 @@ static int create_peer(PEER *peer, SSL_CTX *ctx)
     unsigned char *read_buf = NULL, *write_buf = NULL;
 
     if (!TEST_ptr(ssl = SSL_new(ctx))
-            || !TEST_ptr(write_buf = OPENSSL_zalloc(peer_buffer_size))
-            || !TEST_ptr(read_buf = OPENSSL_zalloc(peer_buffer_size)))
+        || !TEST_ptr(write_buf = OPENSSL_zalloc(peer_buffer_size))
+        || !TEST_ptr(read_buf = OPENSSL_zalloc(peer_buffer_size)))
         goto err;
 
     peer->ssl = ssl;
@@ -798,7 +796,7 @@ static void do_handshake_step(PEER *peer)
 
             /* Memory bios should never block with SSL_ERROR_WANT_WRITE. */
             if (error != SSL_ERROR_WANT_READ
-                    && error != SSL_ERROR_WANT_RETRY_VERIFY)
+                && error != SSL_ERROR_WANT_RETRY_VERIFY)
                 peer->status = PEER_ERROR;
         }
     }
@@ -844,8 +842,7 @@ static void do_app_data_step(PEER *peer)
     }
 
     /* ... but we only write one write-buffer-full of data. */
-    write_bytes = peer->bytes_to_write < peer->write_buf_len ? peer->bytes_to_write :
-        peer->write_buf_len;
+    write_bytes = peer->bytes_to_write < peer->write_buf_len ? peer->bytes_to_write : peer->write_buf_len;
     if (write_bytes) {
         ret = SSL_write(peer->ssl, peer->write_buf, write_bytes);
         if (ret > 0) {
@@ -893,16 +890,16 @@ static void do_reneg_setup_step(const SSL_TEST_CTX *test_ctx, PEER *peer)
     }
 
     if (!TEST_int_eq(peer->status, PEER_RETRY)
-            || !TEST_true(test_ctx->handshake_mode
-                              == SSL_TEST_HANDSHAKE_RENEG_SERVER
-                          || test_ctx->handshake_mode
-                              == SSL_TEST_HANDSHAKE_RENEG_CLIENT
-                          || test_ctx->handshake_mode
-                              == SSL_TEST_HANDSHAKE_KEY_UPDATE_SERVER
-                          || test_ctx->handshake_mode
-                              == SSL_TEST_HANDSHAKE_KEY_UPDATE_CLIENT
-                          || test_ctx->handshake_mode
-                              == SSL_TEST_HANDSHAKE_POST_HANDSHAKE_AUTH)) {
+        || !TEST_true(test_ctx->handshake_mode
+                == SSL_TEST_HANDSHAKE_RENEG_SERVER
+            || test_ctx->handshake_mode
+                == SSL_TEST_HANDSHAKE_RENEG_CLIENT
+            || test_ctx->handshake_mode
+                == SSL_TEST_HANDSHAKE_KEY_UPDATE_SERVER
+            || test_ctx->handshake_mode
+                == SSL_TEST_HANDSHAKE_KEY_UPDATE_CLIENT
+            || test_ctx->handshake_mode
+                == SSL_TEST_HANDSHAKE_POST_HANDSHAKE_AUTH)) {
         peer->status = PEER_TEST_FAILURE;
         return;
     }
@@ -912,9 +909,9 @@ static void do_reneg_setup_step(const SSL_TEST_CTX *test_ctx, PEER *peer)
 
     /* Check if we are the peer that is going to initiate */
     if ((test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_SERVER
-                && SSL_is_server(peer->ssl))
-            || (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_CLIENT
-                && !SSL_is_server(peer->ssl))) {
+            && SSL_is_server(peer->ssl))
+        || (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RENEG_CLIENT
+            && !SSL_is_server(peer->ssl))) {
         /*
          * If we already asked for a renegotiation then fall through to the
          * SSL_read() below.
@@ -936,7 +933,7 @@ static void do_reneg_setup_step(const SSL_TEST_CTX *test_ctx, PEER *peer)
                 }
                 if (test_ctx->extra.client.reneg_ciphers != NULL) {
                     if (!SSL_set_cipher_list(peer->ssl,
-                                test_ctx->extra.client.reneg_ciphers)) {
+                            test_ctx->extra.client.reneg_ciphers)) {
                         peer->status = PEER_ERROR;
                         return;
                     }
@@ -969,11 +966,11 @@ static void do_reneg_setup_step(const SSL_TEST_CTX *test_ctx, PEER *peer)
             return;
         }
     } else if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_KEY_UPDATE_SERVER
-               || test_ctx->handshake_mode
-                  == SSL_TEST_HANDSHAKE_KEY_UPDATE_CLIENT) {
+        || test_ctx->handshake_mode
+            == SSL_TEST_HANDSHAKE_KEY_UPDATE_CLIENT) {
         if (SSL_is_server(peer->ssl)
-                != (test_ctx->handshake_mode
-                    == SSL_TEST_HANDSHAKE_KEY_UPDATE_SERVER)) {
+            != (test_ctx->handshake_mode
+                == SSL_TEST_HANDSHAKE_KEY_UPDATE_SERVER)) {
             peer->status = PEER_SUCCESS;
             return;
         }
@@ -1045,7 +1042,6 @@ static void do_reneg_setup_step(const SSL_TEST_CTX *test_ctx, PEER *peer)
     peer->status = PEER_SUCCESS;
 }
 
-
 /*
  * RFC 5246 says:
  *
@@ -1091,7 +1087,6 @@ typedef enum {
     CONNECTION_DONE
 } connect_phase_t;
 
-
 static int renegotiate_op(const SSL_TEST_CTX *test_ctx)
 {
     switch (test_ctx->handshake_mode) {
@@ -1115,7 +1110,7 @@ static int post_handshake_op(const SSL_TEST_CTX *test_ctx)
 }
 
 static connect_phase_t next_phase(const SSL_TEST_CTX *test_ctx,
-                                  connect_phase_t phase)
+    connect_phase_t phase)
 {
     switch (phase) {
     case HANDSHAKE:
@@ -1142,7 +1137,7 @@ static connect_phase_t next_phase(const SSL_TEST_CTX *test_ctx,
 }
 
 static void do_connect_step(const SSL_TEST_CTX *test_ctx, PEER *peer,
-                            connect_phase_t phase)
+    connect_phase_t phase)
 {
     switch (phase) {
     case HANDSHAKE:
@@ -1189,8 +1184,8 @@ typedef enum {
  * client_spoke_last: 1 if the client went last.
  */
 static handshake_status_t handshake_status(peer_status_t last_status,
-                                           peer_status_t previous_status,
-                                           int client_spoke_last)
+    peer_status_t previous_status,
+    int client_spoke_last)
 {
     switch (last_status) {
     case PEER_TEST_FAILURE:
@@ -1254,8 +1249,8 @@ static char *dup_str(const unsigned char *in, size_t len)
         return NULL;
 
     /* Assert that the string does not contain NUL-bytes. */
-    if (TEST_size_t_eq(OPENSSL_strnlen((const char*)(in), len), len))
-        TEST_ptr(ret = OPENSSL_strndup((const char*)(in), len));
+    if (TEST_size_t_eq(OPENSSL_strnlen((const char *)(in), len), len))
+        TEST_ptr(ret = OPENSSL_strndup((const char *)(in), len));
     return ret;
 }
 
@@ -1297,12 +1292,12 @@ static int set_sock_as_sctp(int sock)
     rto_info.srto_max = 200;
     rto_info.srto_min = 50;
     (void)setsockopt(sock, IPPROTO_SCTP, SCTP_RTOINFO,
-                     (const void *)&rto_info, sizeof(struct sctp_rtoinfo));
+        (const void *)&rto_info, sizeof(struct sctp_rtoinfo));
     memset(&assocparams, 0, sizeof(struct sctp_assocparams));
     assocparams.sasoc_asocmaxrxt = 2;
     (void)setsockopt(sock, IPPROTO_SCTP, SCTP_ASSOCINFO,
-                     (const void *)&assocparams,
-                     sizeof(struct sctp_assocparams));
+        (const void *)&assocparams,
+        sizeof(struct sctp_assocparams));
 
     /*
      * For SCTP we have to set various options on the socket prior to
@@ -1337,7 +1332,7 @@ static int create_sctp_socks(int *ssock, int *csock)
      * worry about it here.
      */
     if (!BIO_lookup_ex(NULL, "4463", BIO_LOOKUP_SERVER, family, SOCK_STREAM,
-                       IPPROTO_SCTP, &res))
+            IPPROTO_SCTP, &res))
         return 0;
 
     for (ai = res; ai != NULL; ai = BIO_ADDRINFO_next(ai)) {
@@ -1351,8 +1346,8 @@ static int create_sctp_socks(int *ssock, int *csock)
         }
 
         if (!set_sock_as_sctp(lsock)
-                || !BIO_listen(lsock, BIO_ADDRINFO_address(ai),
-                               BIO_SOCK_REUSEADDR)) {
+            || !BIO_listen(lsock, BIO_ADDRINFO_address(ai),
+                BIO_SOCK_REUSEADDR)) {
             BIO_closesocket(lsock);
             lsock = INVALID_SOCKET;
             continue;
@@ -1369,7 +1364,7 @@ static int create_sctp_socks(int *ssock, int *csock)
     res = NULL;
 
     if (!BIO_lookup_ex(NULL, "4463", BIO_LOOKUP_CLIENT, family, SOCK_STREAM,
-                        IPPROTO_SCTP, &res))
+            IPPROTO_SCTP, &res))
         goto err;
 
     consock = BIO_socket(family, SOCK_STREAM, IPPROTO_SCTP, 0);
@@ -1377,8 +1372,8 @@ static int create_sctp_socks(int *ssock, int *csock)
         goto err;
 
     if (!set_sock_as_sctp(consock)
-            || !BIO_connect(consock, BIO_ADDRINFO_address(res), 0)
-            || !BIO_socket_nbio(consock, 1))
+        || !BIO_connect(consock, BIO_ADDRINFO_address(res), 0)
+        || !BIO_socket_nbio(consock, 1))
         goto err;
 
     asock = BIO_accept_ex(lsock, NULL, BIO_SOCK_NONBLOCK);
@@ -1390,7 +1385,7 @@ static int create_sctp_socks(int *ssock, int *csock)
     consock = asock = INVALID_SOCKET;
     ret = 1;
 
- err:
+err:
     BIO_ADDRINFO_free(res);
     if (consock != INVALID_SOCKET)
         BIO_closesocket(consock);
@@ -1429,18 +1424,18 @@ static HANDSHAKE_RESULT *do_handshake_internal(
     int client_turn = 1, client_turn_count = 0, client_wait_count = 0;
     connect_phase_t phase = HANDSHAKE;
     handshake_status_t status = HANDSHAKE_RETRY;
-    const unsigned char* tick = NULL;
+    const unsigned char *tick = NULL;
     size_t tick_len = 0;
-    const unsigned char* sess_id = NULL;
+    const unsigned char *sess_id = NULL;
     unsigned int sess_id_len = 0;
-    SSL_SESSION* sess = NULL;
+    SSL_SESSION *sess = NULL;
     const unsigned char *proto = NULL;
     /* API dictates unsigned int rather than size_t. */
     unsigned int proto_len = 0;
     EVP_PKEY *tmp_key;
     const STACK_OF(X509_NAME) *names;
     time_t start;
-    const char* cipher;
+    const char *cipher;
 
     if (ret == NULL)
         return NULL;
@@ -1454,8 +1449,8 @@ static HANDSHAKE_RESULT *do_handshake_internal(
     memset(&client_ex_data, 0, sizeof(client_ex_data));
 
     if (!configure_handshake_ctx(server_ctx, server2_ctx, client_ctx,
-                                 test_ctx, extra, &server_ctx_data,
-                                 &server2_ctx_data, &client_ctx_data)) {
+            test_ctx, extra, &server_ctx_data,
+            &server2_ctx_data, &client_ctx_data)) {
         TEST_note("configure_handshake_ctx");
         HANDSHAKE_RESULT_free(ret);
         return NULL;
@@ -1486,9 +1481,9 @@ static HANDSHAKE_RESULT *do_handshake_internal(
         SSL_SESSION_get_id(serv_sess_in, &sess_id_len);
         /* In case we're testing resumption without tickets. */
         if ((sess_id_len > 0
-                    && !TEST_true(SSL_CTX_add_session(server_ctx,
-                                                      serv_sess_in)))
-                || !TEST_true(SSL_set_session(client.ssl, session_in)))
+                && !TEST_true(SSL_CTX_add_session(server_ctx,
+                    serv_sess_in)))
+            || !TEST_true(SSL_set_session(client.ssl, session_in)))
             goto err;
         sess_id_len = 0;
     }
@@ -1510,7 +1505,7 @@ static HANDSHAKE_RESULT *do_handshake_internal(
     }
 
     if (!TEST_ptr(client_to_server)
-            || !TEST_ptr(server_to_client))
+        || !TEST_ptr(server_to_client))
         goto err;
 
     /* Non-blocking bio. */
@@ -1527,15 +1522,15 @@ static HANDSHAKE_RESULT *do_handshake_internal(
     } else {
         SSL_set_bio(client.ssl, server_to_client, client_to_server);
         if (!TEST_int_gt(BIO_up_ref(server_to_client), 0)
-                || !TEST_int_gt(BIO_up_ref(client_to_server), 0))
+            || !TEST_int_gt(BIO_up_ref(client_to_server), 0))
             goto err;
         SSL_set_bio(server.ssl, client_to_server, server_to_client);
     }
 
     ex_data_idx = SSL_get_ex_new_index(0, "ex data", NULL, NULL, NULL);
     if (!TEST_int_ge(ex_data_idx, 0)
-            || !TEST_int_eq(SSL_set_ex_data(server.ssl, ex_data_idx, &server_ex_data), 1)
-            || !TEST_int_eq(SSL_set_ex_data(client.ssl, ex_data_idx, &client_ex_data), 1))
+        || !TEST_int_eq(SSL_set_ex_data(server.ssl, ex_data_idx, &server_ex_data), 1)
+        || !TEST_int_eq(SSL_set_ex_data(client.ssl, ex_data_idx, &client_ex_data), 1))
         goto err;
 
     SSL_set_info_callback(server.ssl, &info_cb);
@@ -1558,13 +1553,13 @@ static HANDSHAKE_RESULT *do_handshake_internal(
         if (client_turn) {
             do_connect_step(test_ctx, &client, phase);
             status = handshake_status(client.status, server.status,
-                                      1 /* client went last */);
+                1 /* client went last */);
             if (server.status == PEER_WAITING)
                 server.status = PEER_RETRY;
         } else {
             do_connect_step(test_ctx, &server, phase);
             status = handshake_status(server.status, client.status,
-                                      0 /* server went last */);
+                0 /* server went last */);
         }
 
         switch (status) {
@@ -1609,7 +1604,7 @@ static HANDSHAKE_RESULT *do_handshake_internal(
                  * same endpoint again.
                  */
                 if ((client_turn && server.status == PEER_RETRY)
-                        || (!client_turn && client.status == PEER_RETRY))
+                    || (!client_turn && client.status == PEER_RETRY))
                     client_turn ^= 1;
             } else {
                 if (client_turn_count++ >= 2000) {
@@ -1638,7 +1633,7 @@ static HANDSHAKE_RESULT *do_handshake_internal(
             break;
         }
     }
- err:
+err:
     ret->server_alert_sent = server_ex_data.alert_sent;
     ret->server_num_fatal_alerts_sent = server_ex_data.num_fatal_alerts_sent;
     ret->server_alert_received = client_ex_data.alert_received;
@@ -1657,8 +1652,8 @@ static HANDSHAKE_RESULT *do_handshake_internal(
     else
         ret->session_ticket = SSL_TEST_SESSION_TICKET_YES;
     ret->compression = (SSL_get_current_compression(client.ssl) == NULL)
-                       ? SSL_TEST_COMPRESSION_NO
-                       : SSL_TEST_COMPRESSION_YES;
+        ? SSL_TEST_COMPRESSION_NO
+        : SSL_TEST_COMPRESSION_YES;
     if (sess_id == NULL || sess_id_len == 0)
         ret->session_id = SSL_TEST_SESSION_ID_NO;
     else
@@ -1666,7 +1661,7 @@ static HANDSHAKE_RESULT *do_handshake_internal(
     ret->session_ticket_do_not_call = server_ex_data.session_ticket_do_not_call;
 
     if (extra->client.verify_callback == SSL_TEST_VERIFY_RETRY_ONCE
-            && n_retries != -1)
+        && n_retries != -1)
         ret->result = SSL_TEST_SERVER_FAIL;
 
 #ifndef OPENSSL_NO_NEXTPROTONEG
@@ -1684,15 +1679,15 @@ static HANDSHAKE_RESULT *do_handshake_internal(
     ret->server_alpn_negotiated = dup_str(proto, proto_len);
 
     if ((sess = SSL_get0_session(server.ssl)) != NULL) {
-        SSL_SESSION_get0_ticket_appdata(sess, (void**)&tick, &tick_len);
-        ret->result_session_ticket_app_data = OPENSSL_strndup((const char*)tick, tick_len);
+        SSL_SESSION_get0_ticket_appdata(sess, (void **)&tick, &tick_len);
+        ret->result_session_ticket_app_data = OPENSSL_strndup((const char *)tick, tick_len);
     }
 
     ret->client_resumed = SSL_session_reused(client.ssl);
     ret->server_resumed = SSL_session_reused(server.ssl);
 
     cipher = SSL_CIPHER_get_name(SSL_get_current_cipher(client.ssl));
-    ret->cipher = dup_str((const unsigned char*)cipher, strlen(cipher));
+    ret->cipher = dup_str((const unsigned char *)cipher, strlen(cipher));
 
     if (session_out != NULL)
         *session_out = SSL_get1_session(client.ssl);
@@ -1743,19 +1738,19 @@ static HANDSHAKE_RESULT *do_handshake_internal(
 }
 
 HANDSHAKE_RESULT *do_handshake(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
-                               SSL_CTX *client_ctx, SSL_CTX *resume_server_ctx,
-                               SSL_CTX *resume_client_ctx,
-                               const SSL_TEST_CTX *test_ctx)
+    SSL_CTX *client_ctx, SSL_CTX *resume_server_ctx,
+    SSL_CTX *resume_client_ctx,
+    const SSL_TEST_CTX *test_ctx)
 {
     HANDSHAKE_RESULT *result;
     SSL_SESSION *session = NULL, *serv_sess = NULL;
 
     result = do_handshake_internal(server_ctx, server2_ctx, client_ctx,
-                                   test_ctx, &test_ctx->extra,
-                                   NULL, NULL, &session, &serv_sess);
+        test_ctx, &test_ctx->extra,
+        NULL, NULL, &session, &serv_sess);
     if (result == NULL
-            || test_ctx->handshake_mode != SSL_TEST_HANDSHAKE_RESUME
-            || result->result == SSL_TEST_INTERNAL_ERROR)
+        || test_ctx->handshake_mode != SSL_TEST_HANDSHAKE_RESUME
+        || result->result == SSL_TEST_INTERNAL_ERROR)
         goto end;
 
     if (result->result != SSL_TEST_SUCCESS) {
@@ -1766,9 +1761,9 @@ HANDSHAKE_RESULT *do_handshake(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
     HANDSHAKE_RESULT_free(result);
     /* We don't support SNI on second handshake yet, so server2_ctx is NULL. */
     result = do_handshake_internal(resume_server_ctx, NULL, resume_client_ctx,
-                                   test_ctx, &test_ctx->resume_extra,
-                                   session, serv_sess, NULL, NULL);
- end:
+        test_ctx, &test_ctx->resume_extra,
+        session, serv_sess, NULL, NULL);
+end:
     SSL_SESSION_free(session);
     SSL_SESSION_free(serv_sess);
     return result;
diff --git a/test/helpers/handshake.h b/test/helpers/handshake.h
index 78b03f9f4b96a..7cf654f8b7932 100644
--- a/test/helpers/handshake.h
+++ b/test/helpers/handshake.h
@@ -84,15 +84,15 @@ void HANDSHAKE_RESULT_free(HANDSHAKE_RESULT *result);
 
 /* Do a handshake and report some information about the result. */
 HANDSHAKE_RESULT *do_handshake(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
-                               SSL_CTX *client_ctx, SSL_CTX *resume_server_ctx,
-                               SSL_CTX *resume_client_ctx,
-                               const SSL_TEST_CTX *test_ctx);
+    SSL_CTX *client_ctx, SSL_CTX *resume_server_ctx,
+    SSL_CTX *resume_client_ctx,
+    const SSL_TEST_CTX *test_ctx);
 
 int configure_handshake_ctx_for_srp(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
-                                    SSL_CTX *client_ctx,
-                                    const SSL_TEST_EXTRA_CONF *extra,
-                                    CTX_DATA *server_ctx_data,
-                                    CTX_DATA *server2_ctx_data,
-                                    CTX_DATA *client_ctx_data);
+    SSL_CTX *client_ctx,
+    const SSL_TEST_EXTRA_CONF *extra,
+    CTX_DATA *server_ctx_data,
+    CTX_DATA *server2_ctx_data,
+    CTX_DATA *client_ctx_data);
 
-#endif  /* OSSL_TEST_HANDSHAKE_HELPER_H */
+#endif /* OSSL_TEST_HANDSHAKE_HELPER_H */
diff --git a/test/helpers/handshake_srp.c b/test/helpers/handshake_srp.c
index 8522388a47f00..780d3bc2b148e 100644
--- a/test/helpers/handshake_srp.c
+++ b/test/helpers/handshake_srp.c
@@ -21,18 +21,19 @@
 
 static char *client_srp_cb(SSL *s, void *arg)
 {
-    CTX_DATA *ctx_data = (CTX_DATA*)(arg);
+    CTX_DATA *ctx_data = (CTX_DATA *)(arg);
     return OPENSSL_strdup(ctx_data->srp_password);
 }
 
 static int server_srp_cb(SSL *s, int *ad, void *arg)
 {
-    CTX_DATA *ctx_data = (CTX_DATA*)(arg);
+    CTX_DATA *ctx_data = (CTX_DATA *)(arg);
     if (strcmp(ctx_data->srp_user, SSL_get_srp_username(s)) != 0)
         return SSL3_AL_FATAL;
     if (SSL_set_srp_server_param_pw(s, ctx_data->srp_user,
-                                    ctx_data->srp_password,
-                                    "2048" /* known group */) < 0) {
+            ctx_data->srp_password,
+            "2048" /* known group */)
+        < 0) {
         *ad = SSL_AD_INTERNAL_ERROR;
         return SSL3_AL_FATAL;
     }
@@ -40,11 +41,11 @@ static int server_srp_cb(SSL *s, int *ad, void *arg)
 }
 
 int configure_handshake_ctx_for_srp(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
-                                    SSL_CTX *client_ctx,
-                                    const SSL_TEST_EXTRA_CONF *extra,
-                                    CTX_DATA *server_ctx_data,
-                                    CTX_DATA *server2_ctx_data,
-                                    CTX_DATA *client_ctx_data)
+    SSL_CTX *client_ctx,
+    const SSL_TEST_EXTRA_CONF *extra,
+    CTX_DATA *server_ctx_data,
+    CTX_DATA *server2_ctx_data,
+    CTX_DATA *client_ctx_data)
 {
     if (extra->server.srp_user != NULL) {
         SSL_CTX_set_srp_username_callback(server_ctx, server_srp_cb);
@@ -76,7 +77,7 @@ int configure_handshake_ctx_for_srp(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
     }
     if (extra->client.srp_user != NULL) {
         if (!TEST_true(SSL_CTX_set_srp_username(client_ctx,
-                                                extra->client.srp_user)))
+                extra->client.srp_user)))
             return 0;
         SSL_CTX_set_srp_client_pwd_callback(client_ctx, client_srp_cb);
         client_ctx_data->srp_password = OPENSSL_strdup(extra->client.srp_password);
diff --git a/test/helpers/noisydgrambio.c b/test/helpers/noisydgrambio.c
index 2edd9835bbef7..8413d745886df 100644
--- a/test/helpers/noisydgrambio.c
+++ b/test/helpers/noisydgrambio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -11,7 +11,7 @@
 #include "quictestlib.h"
 #include "../testutil.h"
 
-#define MSG_DATA_LEN_MAX    1472
+#define MSG_DATA_LEN_MAX 1472
 #define SAMPLING_WINDOW_PERIOD 10 /* in milliseconds */
 #define MAX_PKTS_PER_WINDOW 1024
 
@@ -22,9 +22,9 @@ struct pkt_info_st {
 
 struct bw_limiter_st {
     struct pkt_info_st pinfos[MAX_PKTS_PER_WINDOW]; /* ring buffer */
-    size_t start, num;    /* ring buffer start and number of items */
-    size_t size_sum;              /* sum of packet sizes in window */
-    size_t bw;                            /* bandwidth in bytes/ms */
+    size_t start, num; /* ring buffer start and number of items */
+    size_t size_sum; /* sum of packet sizes in window */
+    size_t bw; /* bandwidth in bytes/ms */
 };
 
 struct noisy_dgram_st {
@@ -32,7 +32,7 @@ struct noisy_dgram_st {
     BIO_MSG msg;
     uint64_t reinject_dgram;
     int backoff;
-    int noise_rate;      /* 1 in noise_rate packets will get noise */
+    int noise_rate; /* 1 in noise_rate packets will get noise */
     struct bw_limiter_st recv_limit, send_limit;
     OSSL_TIME (*now_cb)(void *arg);
     void *now_cb_arg;
@@ -51,57 +51,57 @@ static long noisy_dgram_ctrl(BIO *bio, int cmd, long num, void *ptr)
         ret = 0L;
         break;
     case BIO_CTRL_NOISE_BACK_OFF: {
-            struct noisy_dgram_st *data;
+        struct noisy_dgram_st *data;
 
-            data = BIO_get_data(bio);
-            if (!TEST_ptr(data))
-                return 0;
-            data->backoff = 1;
-            ret = 1;
-            break;
-        }
+        data = BIO_get_data(bio);
+        if (!TEST_ptr(data))
+            return 0;
+        data->backoff = (int)num;
+        ret = 1;
+        break;
+    }
     case BIO_CTRL_NOISE_RATE: {
-            struct noisy_dgram_st *data;
+        struct noisy_dgram_st *data;
 
-            data = BIO_get_data(bio);
-            if (!TEST_ptr(data))
-                return 0;
-            data->noise_rate = (int)num;
-            ret = 1;
-            break;
-        }
+        data = BIO_get_data(bio);
+        if (!TEST_ptr(data))
+            return 0;
+        data->noise_rate = (int)num;
+        ret = 1;
+        break;
+    }
     case BIO_CTRL_NOISE_RECV_BANDWIDTH: {
-            struct noisy_dgram_st *data;
+        struct noisy_dgram_st *data;
 
-            data = BIO_get_data(bio);
-            if (!TEST_ptr(data))
-                return 0;
-            data->recv_limit.bw = (size_t)num;
-            ret = 1;
-            break;
-        }
+        data = BIO_get_data(bio);
+        if (!TEST_ptr(data))
+            return 0;
+        data->recv_limit.bw = (size_t)num;
+        ret = 1;
+        break;
+    }
     case BIO_CTRL_NOISE_SEND_BANDWIDTH: {
-            struct noisy_dgram_st *data;
+        struct noisy_dgram_st *data;
 
-            data = BIO_get_data(bio);
-            if (!TEST_ptr(data))
-                return 0;
-            data->send_limit.bw = (size_t)num;
-            ret = 1;
-            break;
-        }
+        data = BIO_get_data(bio);
+        if (!TEST_ptr(data))
+            return 0;
+        data->send_limit.bw = (size_t)num;
+        ret = 1;
+        break;
+    }
     case BIO_CTRL_NOISE_SET_NOW_CB: {
-            struct noisy_dgram_st *data;
-            struct bio_noise_now_cb_st *now_cb = ptr;
+        struct noisy_dgram_st *data;
+        struct bio_noise_now_cb_st *now_cb = ptr;
 
-            data = BIO_get_data(bio);
-            if (!TEST_ptr(data))
-                return 0;
-            data->now_cb = now_cb->now_cb;
-            data->now_cb_arg = now_cb->now_cb_arg;
-            ret = 1;
-            break;
-        }
+        data = BIO_get_data(bio);
+        if (!TEST_ptr(data))
+            return 0;
+        data->now_cb = now_cb->now_cb;
+        data->now_cb_arg = now_cb->now_cb_arg;
+        ret = 1;
+        break;
+    }
     default:
         ret = BIO_ctrl(next, cmd, num, ptr);
         break;
@@ -110,7 +110,7 @@ static long noisy_dgram_ctrl(BIO *bio, int cmd, long num, void *ptr)
 }
 
 static size_t bandwidth_limit(struct bw_limiter_st *limit, OSSL_TIME now,
-                              BIO_MSG *msg, size_t num_msg)
+    BIO_MSG *msg, size_t num_msg)
 {
     size_t i;
     OSSL_TIME sampling_start
@@ -134,41 +134,41 @@ static size_t bandwidth_limit(struct bw_limiter_st *limit, OSSL_TIME now,
     limit->num -= i;
 
     for (i = 0; i < num_msg; ++i) {
-         size_t end;
-         size_t pktsize = msg[i].data_len;
-
-         if ((limit->size_sum + pktsize) / SAMPLING_WINDOW_PERIOD > limit->bw) {
-             /*
-              * Throw out all the packets once reaching the limit,
-              * although some following packets could still fit.
-              * This is accurate enough.
-              */
+        size_t end;
+        size_t pktsize = msg[i].data_len;
+
+        if ((limit->size_sum + pktsize) / SAMPLING_WINDOW_PERIOD > limit->bw) {
+            /*
+             * Throw out all the packets once reaching the limit,
+             * although some following packets could still fit.
+             * This is accurate enough.
+             */
 #ifdef OSSL_NOISY_DGRAM_DEBUG
-             printf("**BW limit applied: now: %llu orig packets %u new packets %u\n",
-                    (unsigned long long)ossl_time2ms(now),
-                    (unsigned int)num_msg, (unsigned int) i);
+            printf("**BW limit applied: now: %llu orig packets %u new packets %u\n",
+                (unsigned long long)ossl_time2ms(now),
+                (unsigned int)num_msg, (unsigned int)i);
 #endif
-             num_msg = i;
-             break;
-         }
-
-         if (limit->num >= MAX_PKTS_PER_WINDOW) {
-             limit->size_sum -= limit->pinfos[limit->start].size;
-             limit->start = (limit->start + 1) % MAX_PKTS_PER_WINDOW;
-         } else {
-           ++limit->num;
-         }
-         end = (limit->start + limit->num) % MAX_PKTS_PER_WINDOW;
-         limit->pinfos[end].size = pktsize;
-         limit->pinfos[end].timestamp = now;
-         limit->size_sum += pktsize;
+            num_msg = i;
+            break;
+        }
+
+        if (limit->num >= MAX_PKTS_PER_WINDOW) {
+            limit->size_sum -= limit->pinfos[limit->start].size;
+            limit->start = (limit->start + 1) % MAX_PKTS_PER_WINDOW;
+        } else {
+            ++limit->num;
+        }
+        end = (limit->start + limit->num) % MAX_PKTS_PER_WINDOW;
+        limit->pinfos[end].size = pktsize;
+        limit->pinfos[end].timestamp = now;
+        limit->size_sum += pktsize;
     }
     return num_msg;
 }
 
 static int noisy_dgram_sendmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
-                                size_t num_msg, uint64_t flags,
-                                size_t *msgs_processed)
+    size_t num_msg, uint64_t flags,
+    size_t *msgs_processed)
 {
     BIO *next = BIO_next(bio);
     struct noisy_dgram_st *data;
@@ -200,17 +200,17 @@ static int noisy_dgram_sendmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
 }
 
 /* Default noise_rate value. With a value of 5 that is 20% packets. */
-#define NOISE_RATE  5
+#define NOISE_RATE 5
 
 /*
  * We have 3 different types of noise: drop, duplicate and delay
  * Each of these have equal probability.
  */
-#define NOISE_TYPE_DROP      0
+#define NOISE_TYPE_DROP 0
 #define NOISE_TYPE_DUPLICATE 1
-#define NOISE_TYPE_DELAY     2
-#define NOISE_TYPE_BITFLIPS  3
-#define NUM_NOISE_TYPES      4
+#define NOISE_TYPE_DELAY 2
+#define NOISE_TYPE_BITFLIPS 3
+#define NUM_NOISE_TYPES 4
 
 /*
  * When a duplicate occurs we reinject the new datagram after up to
@@ -225,7 +225,7 @@ static int noisy_dgram_sendmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
 #define MAX_DGRAM_REINJECT 4
 
 static void get_noise(int noise_rate, int long_header, uint64_t *reinject,
-                      int *should_drop, uint16_t *flip, size_t *flip_offset)
+    int *should_drop, uint16_t *flip, size_t *flip_offset)
 {
     uint32_t type;
 
@@ -254,8 +254,8 @@ static void get_noise(int noise_rate, int long_header, uint64_t *reinject,
      * MAX_DGRAM_DELAY datagrams later
      */
     *reinject = (type == NOISE_TYPE_DUPLICATE || type == NOISE_TYPE_DELAY)
-                ? (uint64_t)((test_random() % MAX_DGRAM_REINJECT) + 1)
-                : 0;
+        ? (uint64_t)((test_random() % MAX_DGRAM_REINJECT) + 1)
+        : 0;
 
     /*
      * No point in reinjecting after 1 datagram if the current datagram is also
@@ -277,7 +277,7 @@ static void get_noise(int noise_rate, int long_header, uint64_t *reinject,
 }
 
 static void flip_bits(unsigned char *msg, size_t msg_len, uint16_t flip,
-                      size_t flip_offset)
+    size_t flip_offset)
 {
     if (flip == 0)
         return;
@@ -290,7 +290,7 @@ static void flip_bits(unsigned char *msg, size_t msg_len, uint16_t flip,
 
 #ifdef OSSL_NOISY_DGRAM_DEBUG
     printf("**Flipping bits in a datagram at offset %u\n",
-            (unsigned int)flip_offset);
+        (unsigned int)flip_offset);
     BIO_dump_fp(stdout, msg, msg_len);
     printf("\n");
 #endif
@@ -300,8 +300,8 @@ static void flip_bits(unsigned char *msg, size_t msg_len, uint16_t flip,
 }
 
 static int noisy_dgram_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
-                                size_t num_msg, uint64_t flags,
-                                size_t *msgs_processed)
+    size_t num_msg, uint64_t flags,
+    size_t *msgs_processed)
 {
     BIO *next = BIO_next(bio);
     size_t i, j, data_len = 0, msg_cnt = 0;
@@ -359,16 +359,16 @@ static int noisy_dgram_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
 
     /* Introduce noise */
     for (i = 0, thismsg = msg;
-         i < msg_cnt;
-         i++, thismsg++, data->this_dgram++) {
+        i < msg_cnt;
+        i++, thismsg++, data->this_dgram++) {
         uint64_t reinject;
         int should_drop;
-        uint16_t flip;
-        size_t flip_offset;
+        uint16_t flip = 0;
+        size_t flip_offset = 0;
 
         /* If we have a message to reinject then insert it now */
         if (data->reinject_dgram > 0
-                && data->reinject_dgram == data->this_dgram) {
+            && data->reinject_dgram == data->this_dgram) {
             if (msg_cnt < num_msg) {
                 /* Make space for the injected message */
                 for (j = msg_cnt; j > i; j--) {
@@ -390,8 +390,8 @@ static int noisy_dgram_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
         }
 
         get_noise(data->noise_rate,
-                  /* long header */ (((uint8_t *)thismsg->data)[0] & 0x80) != 0,
-                  &reinject, &should_drop, &flip, &flip_offset);
+            /* long header */ (((uint8_t *)thismsg->data)[0] & 0x80) != 0,
+            &reinject, &should_drop, &flip, &flip_offset);
         if (data->backoff) {
             /*
              * We might be asked to back off on introducing too much noise if
@@ -399,13 +399,15 @@ static int noisy_dgram_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
              * we always ensure that the next datagram does not get dropped so
              * that the connection always survives. After that we can resume
              * with normal noise
+             * Note that the backoff value is configurable via BIO ctrl,
+             * allowing for multiframe backoff.
              */
 #ifdef OSSL_NOISY_DGRAM_DEBUG
             printf("**Back off applied\n");
 #endif
             should_drop = 0;
             flip = 0;
-            data->backoff = 0;
+            data->backoff--;
         }
 
         flip_bits(thismsg->data, thismsg->data_len, flip, flip_offset);
@@ -428,7 +430,7 @@ static int noisy_dgram_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
 
 #ifdef OSSL_NOISY_DGRAM_DEBUG
             printf("**Scheduling a reinject after %u messages%s\n",
-                   (unsigned int)reinject, should_drop ? "" : "(duplicating)");
+                (unsigned int)reinject, should_drop ? "" : "(duplicating)");
             BIO_dump_fp(stdout, thismsg->data, thismsg->data_len);
             printf("\n");
 #endif
@@ -458,7 +460,7 @@ static int noisy_dgram_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
     printf("End of post-filter datagram list\n");
 #endif
 
- end:
+end:
     *msgs_processed = msg_cnt;
 
     if (msg_cnt == 0) {
@@ -492,8 +494,8 @@ static int noisy_dgram_new(BIO *bio)
     data->msg.peer = BIO_ADDR_new();
     data->msg.local = BIO_ADDR_new();
     if (data->msg.data == NULL
-            || data->msg.peer == NULL
-            || data->msg.local == NULL) {
+        || data->msg.peer == NULL
+        || data->msg.local == NULL) {
         data_free(data);
         return 0;
     }
@@ -514,7 +516,7 @@ static int noisy_dgram_free(BIO *bio)
 }
 
 /* Choose a sufficiently large type likely to be unused for this custom BIO */
-#define BIO_TYPE_NOISY_DGRAM_FILTER  (0x80 | BIO_TYPE_FILTER)
+#define BIO_TYPE_NOISY_DGRAM_FILTER (0x80 | BIO_TYPE_FILTER)
 
 static BIO_METHOD *method_noisy_dgram = NULL;
 
@@ -523,7 +525,7 @@ const BIO_METHOD *bio_f_noisy_dgram_filter(void)
 {
     if (method_noisy_dgram == NULL) {
         method_noisy_dgram = BIO_meth_new(BIO_TYPE_NOISY_DGRAM_FILTER,
-                                          "Noisy datagram filter");
+            "Noisy datagram filter");
         if (method_noisy_dgram == NULL
             || !BIO_meth_set_ctrl(method_noisy_dgram, noisy_dgram_ctrl)
             || !BIO_meth_set_sendmmsg(method_noisy_dgram, noisy_dgram_sendmmsg)
diff --git a/test/helpers/pkcs12.c b/test/helpers/pkcs12.c
index e31018d9fa022..625414a918124 100644
--- a/test/helpers/pkcs12.c
+++ b/test/helpers/pkcs12.c
@@ -44,7 +44,6 @@ static int check_p12_mac(PKCS12 *p12, const PKCS12_ENC *mac);
 static int check_asn1_string(const ASN1_TYPE *av, const char *txt);
 static int check_attrs(const STACK_OF(X509_ATTRIBUTE) *bag_attrs, const PKCS12_ATTR *attrs);
 
-
 /* --------------------------------------------------------------------------
  * Global settings
  */
@@ -69,7 +68,6 @@ void PKCS12_helper_set_propq(const char *propq)
     test_propq = propq;
 }
 
-
 /* --------------------------------------------------------------------------
  * Test data load functions
  */
@@ -119,13 +117,11 @@ int end_pkcs12_builder(PKCS12_BUILDER *pb)
     return result;
 }
 
-
 void start_pkcs12(PKCS12_BUILDER *pb)
 {
     pb->safes = NULL;
 }
 
-
 void end_pkcs12(PKCS12_BUILDER *pb)
 {
     if (!pb->success)
@@ -133,7 +129,6 @@ void end_pkcs12(PKCS12_BUILDER *pb)
     generate_p12(pb, NULL);
 }
 
-
 void end_pkcs12_with_mac(PKCS12_BUILDER *pb, const PKCS12_ENC *mac)
 {
     if (!pb->success)
@@ -141,7 +136,6 @@ void end_pkcs12_with_mac(PKCS12_BUILDER *pb, const PKCS12_ENC *mac)
     generate_p12(pb, mac);
 }
 
-
 /* Generate the PKCS12 encoding and write to memory bio */
 static void generate_p12(PKCS12_BUILDER *pb, const PKCS12_ENC *mac)
 {
@@ -173,7 +167,7 @@ static void generate_p12(PKCS12_BUILDER *pb, const PKCS12_ENC *mac)
             md = EVP_MD_fetch(test_ctx, OBJ_nid2sn(mac->nid), test_propq);
 
         if (!TEST_true(PKCS12_set_mac(p12, mac->pass, strlen(mac->pass),
-                                      NULL, 0, mac->iter, md))) {
+                NULL, 0, mac->iter, md))) {
             pb->success = 0;
             goto err;
         }
@@ -189,7 +183,6 @@ static void generate_p12(PKCS12_BUILDER *pb, const PKCS12_ENC *mac)
     PKCS12_free(p12);
 }
 
-
 static int write_p12(PKCS12 *p12, const char *outfile)
 {
     int ret = 0;
@@ -233,7 +226,6 @@ static PKCS12 *from_bio_p12(BIO *bio, const PKCS12_ENC *mac)
     return NULL;
 }
 
-
 /* For use with existing files */
 static PKCS12 *read_p12(const char *infile, const PKCS12_ENC *mac)
 {
@@ -265,7 +257,6 @@ static int check_p12_mac(PKCS12 *p12, const PKCS12_ENC *mac)
         && TEST_true(PKCS12_verify_mac(p12, mac->pass, strlen(mac->pass)));
 }
 
-
 /* -------------------------------------------------------------------------
  * PKCS7 content info builder
  */
@@ -275,7 +266,6 @@ void start_contentinfo(PKCS12_BUILDER *pb)
     pb->bags = NULL;
 }
 
-
 void end_contentinfo(PKCS12_BUILDER *pb)
 {
     if (pb->success && pb->bags != NULL) {
@@ -286,18 +276,17 @@ void end_contentinfo(PKCS12_BUILDER *pb)
     pb->bags = NULL;
 }
 
-
 void end_contentinfo_encrypted(PKCS12_BUILDER *pb, const PKCS12_ENC *enc)
 {
     if (pb->success && pb->bags != NULL) {
         if (legacy) {
             if (!TEST_true(PKCS12_add_safe(&pb->safes, pb->bags, enc->nid,
-                                           enc->iter, enc->pass)))
+                    enc->iter, enc->pass)))
                 pb->success = 0;
         } else {
             if (!TEST_true(PKCS12_add_safe_ex(&pb->safes, pb->bags, enc->nid,
-                                              enc->iter, enc->pass, test_ctx,
-                                              test_propq)))
+                    enc->iter, enc->pass, test_ctx,
+                    test_propq)))
                 pb->success = 0;
         }
     }
@@ -305,7 +294,6 @@ void end_contentinfo_encrypted(PKCS12_BUILDER *pb, const PKCS12_ENC *enc)
     pb->bags = NULL;
 }
 
-
 static STACK_OF(PKCS12_SAFEBAG) *decode_contentinfo(STACK_OF(PKCS7) *safes, int idx, const PKCS12_ENC *enc)
 {
     STACK_OF(PKCS12_SAFEBAG) *bags = NULL;
@@ -333,7 +321,6 @@ static STACK_OF(PKCS12_SAFEBAG) *decode_contentinfo(STACK_OF(PKCS7) *safes, int
     return NULL;
 }
 
-
 /* -------------------------------------------------------------------------
  * PKCS12 safeBag/attribute builder
  */
@@ -343,7 +330,7 @@ static int add_attributes(PKCS12_SAFEBAG *bag, const PKCS12_ATTR *attr)
     int ret = 0;
     int attr_nid;
     const PKCS12_ATTR *p_attr = attr;
-    STACK_OF(X509_ATTRIBUTE)* attrs = NULL;
+    STACK_OF(X509_ATTRIBUTE) *attrs = NULL;
     X509_ATTRIBUTE *x509_attr = NULL;
 
     if (attr == NULL)
@@ -358,10 +345,10 @@ static int add_attributes(PKCS12_SAFEBAG *bag, const PKCS12_ATTR *attr)
                 goto err;
         } else if (attr_nid == NID_localKeyID) {
             if (!TEST_true(PKCS12_add_localkeyid(bag, (unsigned char *)p_attr->value,
-                                                 strlen(p_attr->value))))
+                    strlen(p_attr->value))))
                 goto err;
         } else if (attr_nid == NID_oracle_jdk_trustedkeyusage) {
-            attrs = (STACK_OF(X509_ATTRIBUTE)*)PKCS12_SAFEBAG_get0_attrs(bag);
+            attrs = (STACK_OF(X509_ATTRIBUTE) *)PKCS12_SAFEBAG_get0_attrs(bag);
             x509_attr = X509_ATTRIBUTE_create(attr_nid, V_ASN1_OBJECT, OBJ_txt2obj(p_attr->value, 0));
             X509at_add1_attr(&attrs, x509_attr);
             PKCS12_SAFEBAG_set0_attrs(bag, attrs);
@@ -369,8 +356,8 @@ static int add_attributes(PKCS12_SAFEBAG *bag, const PKCS12_ATTR *attr)
         } else {
             /* Custom attribute values limited to ASCII in these tests */
             if (!TEST_true(PKCS12_add1_attr_by_txt(bag, p_attr->oid, MBSTRING_ASC,
-                                                   (unsigned char *)p_attr->value,
-                                                   strlen(p_attr->value))))
+                    (unsigned char *)p_attr->value,
+                    strlen(p_attr->value))))
                 goto err;
         }
         p_attr++;
@@ -381,7 +368,7 @@ static int add_attributes(PKCS12_SAFEBAG *bag, const PKCS12_ATTR *attr)
 }
 
 void add_certbag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
-                 const PKCS12_ATTR *attrs)
+    const PKCS12_ATTR *attrs)
 {
     PKCS12_SAFEBAG *bag = NULL;
     X509 *cert = NULL;
@@ -415,7 +402,7 @@ void add_certbag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
 }
 
 void add_keybag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
-                const PKCS12_ATTR *attrs, const PKCS12_ENC *enc)
+    const PKCS12_ATTR *attrs, const PKCS12_ENC *enc)
 {
     PKCS12_SAFEBAG *bag = NULL;
     EVP_PKEY *pkey = NULL;
@@ -435,7 +422,7 @@ void add_keybag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
         bag = PKCS12_add_key(&pb->bags, pkey, 0 /*keytype*/, enc->iter, enc->nid, enc->pass);
     else
         bag = PKCS12_add_key_ex(&pb->bags, pkey, 0 /*keytype*/, enc->iter, enc->nid, enc->pass,
-                                test_ctx, test_propq);
+            test_ctx, test_propq);
     if (!TEST_ptr(bag)) {
         pb->success = 0;
         goto err;
@@ -447,7 +434,7 @@ void add_keybag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
 }
 
 void add_secretbag(PKCS12_BUILDER *pb, int secret_nid, const char *secret,
-                               const PKCS12_ATTR *attrs)
+    const PKCS12_ATTR *attrs)
 {
     PKCS12_SAFEBAG *bag = NULL;
 
@@ -465,7 +452,6 @@ void add_secretbag(PKCS12_BUILDER *pb, int secret_nid, const char *secret,
         pb->success = 0;
 }
 
-
 /* -------------------------------------------------------------------------
  * PKCS12 structure checking
  */
@@ -481,21 +467,21 @@ static int check_asn1_string(const ASN1_TYPE *av, const char *txt)
     switch (av->type) {
     case V_ASN1_BMPSTRING:
         value = OPENSSL_uni2asc(av->value.bmpstring->data,
-                                av->value.bmpstring->length);
+            av->value.bmpstring->length);
         if (!TEST_str_eq(txt, (char *)value))
             goto err;
         break;
 
     case V_ASN1_UTF8STRING:
         if (!TEST_mem_eq(txt, strlen(txt), (char *)av->value.utf8string->data,
-                         av->value.utf8string->length))
+                av->value.utf8string->length))
             goto err;
         break;
 
     case V_ASN1_OCTET_STRING:
         if (!TEST_mem_eq(txt, strlen(txt),
-                         (char *)av->value.octet_string->data,
-                         av->value.octet_string->length))
+                (char *)av->value.octet_string->data,
+                av->value.octet_string->length))
             goto err;
         break;
 
@@ -547,7 +533,7 @@ static int check_attrs(const STACK_OF(X509_ATTRIBUTE) *bag_attrs, const PKCS12_A
 }
 
 void check_certbag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
-                   const PKCS12_ATTR *attrs)
+    const PKCS12_ATTR *attrs)
 {
     X509 *x509 = NULL;
     X509 *ref_x509 = NULL;
@@ -572,6 +558,11 @@ void check_certbag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
         pb->success = 0;
         goto err;
     }
+    if (!TEST_ptr_null(PKCS12_SAFEBAG_get0_bag_obj(bag))) {
+        pb->success = 0;
+        goto err;
+    }
+
     ref_x509 = load_cert_asn1(bytes, len);
     if (!TEST_false(X509_cmp(x509, ref_x509)))
         pb->success = 0;
@@ -581,7 +572,7 @@ void check_certbag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
 }
 
 void check_keybag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
-                  const PKCS12_ATTR *attrs, const PKCS12_ENC *enc)
+    const PKCS12_ATTR *attrs, const PKCS12_ENC *enc)
 {
     EVP_PKEY *pkey = NULL;
     EVP_PKEY *ref_pkey = NULL;
@@ -633,6 +624,10 @@ void check_keybag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
         pb->success = 0;
         goto err;
     }
+    if (!TEST_ptr_null(PKCS12_SAFEBAG_get0_bag_type(bag))) {
+        pb->success = 0;
+        goto err;
+    }
 
     /* PKEY compare returns 1 for match */
     ref_pkey = load_pkey_asn1(bytes, len);
@@ -663,7 +658,6 @@ void check_secretbag(PKCS12_BUILDER *pb, int secret_nid, const char *secret, con
         pb->success = 0;
 }
 
-
 void start_check_pkcs12(PKCS12_BUILDER *pb)
 {
     PKCS12 *p12;
@@ -752,7 +746,6 @@ void end_check_pkcs12(PKCS12_BUILDER *pb)
     sk_PKCS7_pop_free(pb->safes, PKCS7_free);
 }
 
-
 void start_check_contentinfo(PKCS12_BUILDER *pb)
 {
     if (!pb->success)
@@ -781,7 +774,6 @@ void start_check_contentinfo_encrypted(PKCS12_BUILDER *pb, const PKCS12_ENC *enc
     TEST_info("Decoding %d bags", sk_PKCS12_SAFEBAG_num(pb->bags));
 }
 
-
 void end_check_contentinfo(PKCS12_BUILDER *pb)
 {
     if (!pb->success)
@@ -792,5 +784,3 @@ void end_check_contentinfo(PKCS12_BUILDER *pb)
     sk_PKCS12_SAFEBAG_pop_free(pb->bags, PKCS12_SAFEBAG_free);
     pb->bags = NULL;
 }
-
-
diff --git a/test/helpers/pkcs12.h b/test/helpers/pkcs12.h
index f09013222ee2e..258303234e577 100644
--- a/test/helpers/pkcs12.h
+++ b/test/helpers/pkcs12.h
@@ -20,7 +20,6 @@
 
 #include "../testutil.h"
 
-
 /* -------------------------------------------------------------------------
  * PKCS#12 Test structures
  */
@@ -31,12 +30,11 @@ typedef struct pkcs12_attr {
     char *value;
 } PKCS12_ATTR;
 
-
 /* Holds encryption parameters */
 typedef struct pkcs12_enc {
-    int         nid;
+    int nid;
     const char *pass;
-    int         iter;
+    int iter;
 } PKCS12_ENC;
 
 /* Set of variables required for constructing the PKCS#12 structure */
@@ -50,7 +48,6 @@ typedef struct pkcs12_builder {
     int bag_idx;
 } PKCS12_BUILDER;
 
-
 /* -------------------------------------------------------------------------
  * PKCS#12 Test function declarations
  */
@@ -77,11 +74,11 @@ void end_contentinfo(PKCS12_BUILDER *pb);
 void end_contentinfo_encrypted(PKCS12_BUILDER *pb, const PKCS12_ENC *enc);
 
 void add_certbag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
-                 const PKCS12_ATTR *attrs);
+    const PKCS12_ATTR *attrs);
 void add_keybag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
-                const PKCS12_ATTR *attrs, const PKCS12_ENC *enc);
+    const PKCS12_ATTR *attrs, const PKCS12_ENC *enc);
 void add_secretbag(PKCS12_BUILDER *pb, int secret_nid, const char *secret,
-                   const PKCS12_ATTR *attrs);
+    const PKCS12_ATTR *attrs);
 void add_extra_attr(PKCS12_BUILDER *pb);
 
 /* Decode/check functions */
@@ -96,9 +93,8 @@ void start_check_contentinfo_encrypted(PKCS12_BUILDER *pb, const PKCS12_ENC *enc
 void end_check_contentinfo(PKCS12_BUILDER *pb);
 
 void check_certbag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
-                   const PKCS12_ATTR *attrs);
+    const PKCS12_ATTR *attrs);
 void check_keybag(PKCS12_BUILDER *pb, const unsigned char *bytes, int len,
-                  const PKCS12_ATTR *attrs, const PKCS12_ENC *enc);
+    const PKCS12_ATTR *attrs, const PKCS12_ENC *enc);
 void check_secretbag(PKCS12_BUILDER *pb, int secret_nid, const char *secret,
-                     const PKCS12_ATTR *attrs);
-
+    const PKCS12_ATTR *attrs);
diff --git a/test/helpers/pktsplitbio.c b/test/helpers/pktsplitbio.c
index d3f2c27b19b0b..15a2882c99588 100644
--- a/test/helpers/pktsplitbio.c
+++ b/test/helpers/pktsplitbio.c
@@ -31,8 +31,8 @@ static long pkt_split_dgram_ctrl(BIO *bio, int cmd, long num, void *ptr)
 }
 
 static int pkt_split_dgram_sendmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
-                                    size_t num_msg, uint64_t flags,
-                                    size_t *msgs_processed)
+    size_t num_msg, uint64_t flags,
+    size_t *msgs_processed)
 {
     BIO *next = BIO_next(bio);
 
@@ -47,8 +47,8 @@ static int pkt_split_dgram_sendmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
 }
 
 static int pkt_split_dgram_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
-                                    size_t num_msg, uint64_t flags,
-                                    size_t *msgs_processed)
+    size_t num_msg, uint64_t flags,
+    size_t *msgs_processed)
 {
     BIO *next = BIO_next(bio);
     size_t i, j, data_len = 0, msg_cnt = 0;
@@ -90,7 +90,8 @@ static int pkt_split_dgram_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
 
         /* Decode the packet header */
         if (ossl_quic_wire_decode_pkt_hdr(&pkt, bdata->short_conn_id_len,
-                                          0, 0, &hdr, NULL, NULL) != 1)
+                0, 0, &hdr, NULL, NULL)
+            != 1)
             return 0;
         remain = PACKET_remaining(&pkt);
         if (remain > 0) {
@@ -101,8 +102,8 @@ static int pkt_split_dgram_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
             thismsg->data_len -= remain;
             msg[i + 1].data_len = remain;
             memmove(msg[i + 1].data,
-                    (unsigned char *)msg[i + 1].data + thismsg->data_len,
-                    remain);
+                (unsigned char *)msg[i + 1].data + thismsg->data_len,
+                remain);
             msg_cnt++;
         }
     }
@@ -112,7 +113,7 @@ static int pkt_split_dgram_recvmmsg(BIO *bio, BIO_MSG *msg, size_t stride,
 }
 
 /* Choose a sufficiently large type likely to be unused for this custom BIO */
-#define BIO_TYPE_PKT_SPLIT_DGRAM_FILTER  (0x81 | BIO_TYPE_FILTER)
+#define BIO_TYPE_PKT_SPLIT_DGRAM_FILTER (0x81 | BIO_TYPE_FILTER)
 
 static BIO_METHOD *method_pkt_split_dgram = NULL;
 
@@ -121,13 +122,13 @@ const BIO_METHOD *bio_f_pkt_split_dgram_filter(void)
 {
     if (method_pkt_split_dgram == NULL) {
         method_pkt_split_dgram = BIO_meth_new(BIO_TYPE_PKT_SPLIT_DGRAM_FILTER,
-                                              "Packet splitting datagram filter");
+            "Packet splitting datagram filter");
         if (method_pkt_split_dgram == NULL
             || !BIO_meth_set_ctrl(method_pkt_split_dgram, pkt_split_dgram_ctrl)
             || !BIO_meth_set_sendmmsg(method_pkt_split_dgram,
-                                      pkt_split_dgram_sendmmsg)
+                pkt_split_dgram_sendmmsg)
             || !BIO_meth_set_recvmmsg(method_pkt_split_dgram,
-                                      pkt_split_dgram_recvmmsg))
+                pkt_split_dgram_recvmmsg))
             return NULL;
     }
     return method_pkt_split_dgram;
diff --git a/test/helpers/predefined_dhparams.c b/test/helpers/predefined_dhparams.c
index 4bdadc41432b1..28070efdb64b7 100644
--- a/test/helpers/predefined_dhparams.c
+++ b/test/helpers/predefined_dhparams.c
@@ -16,7 +16,7 @@
 #ifndef OPENSSL_NO_DH
 
 static EVP_PKEY *get_dh_from_pg_bn(OSSL_LIB_CTX *libctx, const char *type,
-                                   BIGNUM *p, BIGNUM *g, BIGNUM *q)
+    BIGNUM *p, BIGNUM *g, BIGNUM *q)
 {
     EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_from_name(libctx, type, NULL);
     OSSL_PARAM_BLD *tmpl = NULL;
@@ -27,10 +27,10 @@ static EVP_PKEY *get_dh_from_pg_bn(OSSL_LIB_CTX *libctx, const char *type,
         goto err;
 
     if ((tmpl = OSSL_PARAM_BLD_new()) == NULL
-            || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P, p)
-            || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_G, g)
-            || (q != NULL
-                && !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_Q, q)))
+        || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_P, p)
+        || !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_G, g)
+        || (q != NULL
+            && !OSSL_PARAM_BLD_push_BN(tmpl, OSSL_PKEY_PARAM_FFC_Q, q)))
         goto err;
 
     params = OSSL_PARAM_BLD_to_param(tmpl);
@@ -38,7 +38,7 @@ static EVP_PKEY *get_dh_from_pg_bn(OSSL_LIB_CTX *libctx, const char *type,
         || EVP_PKEY_fromdata(pctx, &dhpkey, EVP_PKEY_KEY_PARAMETERS, params) <= 0)
         goto err;
 
- err:
+err:
     EVP_PKEY_CTX_free(pctx);
     OSSL_PARAM_free(params);
     OSSL_PARAM_BLD_free(tmpl);
@@ -46,9 +46,9 @@ static EVP_PKEY *get_dh_from_pg_bn(OSSL_LIB_CTX *libctx, const char *type,
 }
 
 static EVP_PKEY *get_dh_from_pg(OSSL_LIB_CTX *libctx, const char *type,
-                                unsigned char *pdata, size_t plen,
-                                unsigned char *gdata, size_t glen,
-                                unsigned char *qdata, size_t qlen)
+    unsigned char *pdata, size_t plen,
+    unsigned char *gdata, size_t glen,
+    unsigned char *qdata, size_t qlen)
 {
     EVP_PKEY *dhpkey = NULL;
     BIGNUM *p = NULL, *g = NULL, *q = NULL;
@@ -62,7 +62,7 @@ static EVP_PKEY *get_dh_from_pg(OSSL_LIB_CTX *libctx, const char *type,
 
     dhpkey = get_dh_from_pg_bn(libctx, type, p, g, q);
 
- err:
+err:
     BN_free(p);
     BN_free(g);
     BN_free(q);
@@ -72,81 +72,510 @@ static EVP_PKEY *get_dh_from_pg(OSSL_LIB_CTX *libctx, const char *type,
 EVP_PKEY *get_dh512(OSSL_LIB_CTX *libctx)
 {
     static unsigned char dh512_p[] = {
-        0xCB, 0xC8, 0xE1, 0x86, 0xD0, 0x1F, 0x94, 0x17, 0xA6, 0x99, 0xF0, 0xC6,
-        0x1F, 0x0D, 0xAC, 0xB6, 0x25, 0x3E, 0x06, 0x39, 0xCA, 0x72, 0x04, 0xB0,
-        0x6E, 0xDA, 0xC0, 0x61, 0xE6, 0x7A, 0x77, 0x25, 0xE8, 0x3B, 0xB9, 0x5F,
-        0x9A, 0xB6, 0xB5, 0xFE, 0x99, 0x0B, 0xA1, 0x93, 0x4E, 0x35, 0x33, 0xB8,
-        0xE1, 0xF1, 0x13, 0x4F, 0x59, 0x1A, 0xD2, 0x57, 0xC0, 0x26, 0x21, 0x33,
-        0x02, 0xC5, 0xAE, 0x23,
+        0xCB,
+        0xC8,
+        0xE1,
+        0x86,
+        0xD0,
+        0x1F,
+        0x94,
+        0x17,
+        0xA6,
+        0x99,
+        0xF0,
+        0xC6,
+        0x1F,
+        0x0D,
+        0xAC,
+        0xB6,
+        0x25,
+        0x3E,
+        0x06,
+        0x39,
+        0xCA,
+        0x72,
+        0x04,
+        0xB0,
+        0x6E,
+        0xDA,
+        0xC0,
+        0x61,
+        0xE6,
+        0x7A,
+        0x77,
+        0x25,
+        0xE8,
+        0x3B,
+        0xB9,
+        0x5F,
+        0x9A,
+        0xB6,
+        0xB5,
+        0xFE,
+        0x99,
+        0x0B,
+        0xA1,
+        0x93,
+        0x4E,
+        0x35,
+        0x33,
+        0xB8,
+        0xE1,
+        0xF1,
+        0x13,
+        0x4F,
+        0x59,
+        0x1A,
+        0xD2,
+        0x57,
+        0xC0,
+        0x26,
+        0x21,
+        0x33,
+        0x02,
+        0xC5,
+        0xAE,
+        0x23,
     };
     static unsigned char dh512_g[] = {
         0x02,
     };
 
     return get_dh_from_pg(libctx, "DH", dh512_p, sizeof(dh512_p),
-                          dh512_g, sizeof(dh512_g), NULL, 0);
+        dh512_g, sizeof(dh512_g), NULL, 0);
 }
 
 EVP_PKEY *get_dhx512(OSSL_LIB_CTX *libctx)
 {
     static unsigned char dhx512_p[] = {
-        0x00, 0xe8, 0x1a, 0xb7, 0x9a, 0x02, 0x65, 0x64, 0x94, 0x7b, 0xba, 0x09,
-        0x1c, 0x12, 0x27, 0x1e, 0xea, 0x89, 0x32, 0x64, 0x78, 0xf8, 0x1c, 0x78,
-        0x8e, 0x96, 0xc3, 0xc6, 0x9f, 0x41, 0x05, 0x41, 0x65, 0xae, 0xe3, 0x05,
-        0xea, 0x66, 0x21, 0xf7, 0x38, 0xb7, 0x2b, 0x32, 0x40, 0x5a, 0x14, 0x86,
-        0x51, 0x94, 0xb1, 0xcf, 0x01, 0xe3, 0x27, 0x28, 0xf6, 0x75, 0xa3, 0x15,
-        0xbb, 0x12, 0x4d, 0x99, 0xe7,
+        0x00,
+        0xe8,
+        0x1a,
+        0xb7,
+        0x9a,
+        0x02,
+        0x65,
+        0x64,
+        0x94,
+        0x7b,
+        0xba,
+        0x09,
+        0x1c,
+        0x12,
+        0x27,
+        0x1e,
+        0xea,
+        0x89,
+        0x32,
+        0x64,
+        0x78,
+        0xf8,
+        0x1c,
+        0x78,
+        0x8e,
+        0x96,
+        0xc3,
+        0xc6,
+        0x9f,
+        0x41,
+        0x05,
+        0x41,
+        0x65,
+        0xae,
+        0xe3,
+        0x05,
+        0xea,
+        0x66,
+        0x21,
+        0xf7,
+        0x38,
+        0xb7,
+        0x2b,
+        0x32,
+        0x40,
+        0x5a,
+        0x14,
+        0x86,
+        0x51,
+        0x94,
+        0xb1,
+        0xcf,
+        0x01,
+        0xe3,
+        0x27,
+        0x28,
+        0xf6,
+        0x75,
+        0xa3,
+        0x15,
+        0xbb,
+        0x12,
+        0x4d,
+        0x99,
+        0xe7,
     };
     static unsigned char dhx512_g[] = {
-        0x00, 0x91, 0xc1, 0x43, 0x6d, 0x0d, 0xb0, 0xa4, 0xde, 0x41, 0xb7, 0x93,
-        0xad, 0x51, 0x94, 0x1b, 0x43, 0xd8, 0x42, 0xf1, 0x5e, 0x46, 0x83, 0x5d,
-        0xf1, 0xd1, 0xf0, 0x41, 0x10, 0xd1, 0x1c, 0x5e, 0xad, 0x9b, 0x68, 0xb1,
-        0x6f, 0xf5, 0x8e, 0xaa, 0x6d, 0x71, 0x88, 0x37, 0xdf, 0x05, 0xf7, 0x6e,
-        0x7a, 0xb4, 0x25, 0x10, 0x6c, 0x7f, 0x38, 0xb4, 0xc8, 0xfc, 0xcc, 0x0c,
-        0x6a, 0x02, 0x08, 0x61, 0xf6,
+        0x00,
+        0x91,
+        0xc1,
+        0x43,
+        0x6d,
+        0x0d,
+        0xb0,
+        0xa4,
+        0xde,
+        0x41,
+        0xb7,
+        0x93,
+        0xad,
+        0x51,
+        0x94,
+        0x1b,
+        0x43,
+        0xd8,
+        0x42,
+        0xf1,
+        0x5e,
+        0x46,
+        0x83,
+        0x5d,
+        0xf1,
+        0xd1,
+        0xf0,
+        0x41,
+        0x10,
+        0xd1,
+        0x1c,
+        0x5e,
+        0xad,
+        0x9b,
+        0x68,
+        0xb1,
+        0x6f,
+        0xf5,
+        0x8e,
+        0xaa,
+        0x6d,
+        0x71,
+        0x88,
+        0x37,
+        0xdf,
+        0x05,
+        0xf7,
+        0x6e,
+        0x7a,
+        0xb4,
+        0x25,
+        0x10,
+        0x6c,
+        0x7f,
+        0x38,
+        0xb4,
+        0xc8,
+        0xfc,
+        0xcc,
+        0x0c,
+        0x6a,
+        0x02,
+        0x08,
+        0x61,
+        0xf6,
     };
     static unsigned char dhx512_q[] = {
-        0x00, 0xdd, 0xf6, 0x35, 0xad, 0xfa, 0x70, 0xc7, 0xe7, 0xa8, 0xf0, 0xe3,
-        0xda, 0x79, 0x34, 0x3f, 0x5b, 0xcf, 0x73, 0x82, 0x91,
+        0x00,
+        0xdd,
+        0xf6,
+        0x35,
+        0xad,
+        0xfa,
+        0x70,
+        0xc7,
+        0xe7,
+        0xa8,
+        0xf0,
+        0xe3,
+        0xda,
+        0x79,
+        0x34,
+        0x3f,
+        0x5b,
+        0xcf,
+        0x73,
+        0x82,
+        0x91,
     };
 
     return get_dh_from_pg(libctx, "X9.42 DH",
-                          dhx512_p, sizeof(dhx512_p),
-                          dhx512_g, sizeof(dhx512_g),
-                          dhx512_q, sizeof(dhx512_q));
+        dhx512_p, sizeof(dhx512_p),
+        dhx512_g, sizeof(dhx512_g),
+        dhx512_q, sizeof(dhx512_q));
 }
 
 EVP_PKEY *get_dh1024dsa(OSSL_LIB_CTX *libctx)
 {
     static unsigned char dh1024_p[] = {
-        0xC8, 0x00, 0xF7, 0x08, 0x07, 0x89, 0x4D, 0x90, 0x53, 0xF3, 0xD5, 0x00,
-        0x21, 0x1B, 0xF7, 0x31, 0xA6, 0xA2, 0xDA, 0x23, 0x9A, 0xC7, 0x87, 0x19,
-        0x3B, 0x47, 0xB6, 0x8C, 0x04, 0x6F, 0xFF, 0xC6, 0x9B, 0xB8, 0x65, 0xD2,
-        0xC2, 0x5F, 0x31, 0x83, 0x4A, 0xA7, 0x5F, 0x2F, 0x88, 0x38, 0xB6, 0x55,
-        0xCF, 0xD9, 0x87, 0x6D, 0x6F, 0x9F, 0xDA, 0xAC, 0xA6, 0x48, 0xAF, 0xFC,
-        0x33, 0x84, 0x37, 0x5B, 0x82, 0x4A, 0x31, 0x5D, 0xE7, 0xBD, 0x52, 0x97,
-        0xA1, 0x77, 0xBF, 0x10, 0x9E, 0x37, 0xEA, 0x64, 0xFA, 0xCA, 0x28, 0x8D,
-        0x9D, 0x3B, 0xD2, 0x6E, 0x09, 0x5C, 0x68, 0xC7, 0x45, 0x90, 0xFD, 0xBB,
-        0x70, 0xC9, 0x3A, 0xBB, 0xDF, 0xD4, 0x21, 0x0F, 0xC4, 0x6A, 0x3C, 0xF6,
-        0x61, 0xCF, 0x3F, 0xD6, 0x13, 0xF1, 0x5F, 0xBC, 0xCF, 0xBC, 0x26, 0x9E,
-        0xBC, 0x0B, 0xBD, 0xAB, 0x5D, 0xC9, 0x54, 0x39,
+        0xC8,
+        0x00,
+        0xF7,
+        0x08,
+        0x07,
+        0x89,
+        0x4D,
+        0x90,
+        0x53,
+        0xF3,
+        0xD5,
+        0x00,
+        0x21,
+        0x1B,
+        0xF7,
+        0x31,
+        0xA6,
+        0xA2,
+        0xDA,
+        0x23,
+        0x9A,
+        0xC7,
+        0x87,
+        0x19,
+        0x3B,
+        0x47,
+        0xB6,
+        0x8C,
+        0x04,
+        0x6F,
+        0xFF,
+        0xC6,
+        0x9B,
+        0xB8,
+        0x65,
+        0xD2,
+        0xC2,
+        0x5F,
+        0x31,
+        0x83,
+        0x4A,
+        0xA7,
+        0x5F,
+        0x2F,
+        0x88,
+        0x38,
+        0xB6,
+        0x55,
+        0xCF,
+        0xD9,
+        0x87,
+        0x6D,
+        0x6F,
+        0x9F,
+        0xDA,
+        0xAC,
+        0xA6,
+        0x48,
+        0xAF,
+        0xFC,
+        0x33,
+        0x84,
+        0x37,
+        0x5B,
+        0x82,
+        0x4A,
+        0x31,
+        0x5D,
+        0xE7,
+        0xBD,
+        0x52,
+        0x97,
+        0xA1,
+        0x77,
+        0xBF,
+        0x10,
+        0x9E,
+        0x37,
+        0xEA,
+        0x64,
+        0xFA,
+        0xCA,
+        0x28,
+        0x8D,
+        0x9D,
+        0x3B,
+        0xD2,
+        0x6E,
+        0x09,
+        0x5C,
+        0x68,
+        0xC7,
+        0x45,
+        0x90,
+        0xFD,
+        0xBB,
+        0x70,
+        0xC9,
+        0x3A,
+        0xBB,
+        0xDF,
+        0xD4,
+        0x21,
+        0x0F,
+        0xC4,
+        0x6A,
+        0x3C,
+        0xF6,
+        0x61,
+        0xCF,
+        0x3F,
+        0xD6,
+        0x13,
+        0xF1,
+        0x5F,
+        0xBC,
+        0xCF,
+        0xBC,
+        0x26,
+        0x9E,
+        0xBC,
+        0x0B,
+        0xBD,
+        0xAB,
+        0x5D,
+        0xC9,
+        0x54,
+        0x39,
     };
     static unsigned char dh1024_g[] = {
-        0x3B, 0x40, 0x86, 0xE7, 0xF3, 0x6C, 0xDE, 0x67, 0x1C, 0xCC, 0x80, 0x05,
-        0x5A, 0xDF, 0xFE, 0xBD, 0x20, 0x27, 0x74, 0x6C, 0x24, 0xC9, 0x03, 0xF3,
-        0xE1, 0x8D, 0xC3, 0x7D, 0x98, 0x27, 0x40, 0x08, 0xB8, 0x8C, 0x6A, 0xE9,
-        0xBB, 0x1A, 0x3A, 0xD6, 0x86, 0x83, 0x5E, 0x72, 0x41, 0xCE, 0x85, 0x3C,
-        0xD2, 0xB3, 0xFC, 0x13, 0xCE, 0x37, 0x81, 0x9E, 0x4C, 0x1C, 0x7B, 0x65,
-        0xD3, 0xE6, 0xA6, 0x00, 0xF5, 0x5A, 0x95, 0x43, 0x5E, 0x81, 0xCF, 0x60,
-        0xA2, 0x23, 0xFC, 0x36, 0xA7, 0x5D, 0x7A, 0x4C, 0x06, 0x91, 0x6E, 0xF6,
-        0x57, 0xEE, 0x36, 0xCB, 0x06, 0xEA, 0xF5, 0x3D, 0x95, 0x49, 0xCB, 0xA7,
-        0xDD, 0x81, 0xDF, 0x80, 0x09, 0x4A, 0x97, 0x4D, 0xA8, 0x22, 0x72, 0xA1,
-        0x7F, 0xC4, 0x70, 0x56, 0x70, 0xE8, 0x20, 0x10, 0x18, 0x8F, 0x2E, 0x60,
-        0x07, 0xE7, 0x68, 0x1A, 0x82, 0x5D, 0x32, 0xA2,
+        0x3B,
+        0x40,
+        0x86,
+        0xE7,
+        0xF3,
+        0x6C,
+        0xDE,
+        0x67,
+        0x1C,
+        0xCC,
+        0x80,
+        0x05,
+        0x5A,
+        0xDF,
+        0xFE,
+        0xBD,
+        0x20,
+        0x27,
+        0x74,
+        0x6C,
+        0x24,
+        0xC9,
+        0x03,
+        0xF3,
+        0xE1,
+        0x8D,
+        0xC3,
+        0x7D,
+        0x98,
+        0x27,
+        0x40,
+        0x08,
+        0xB8,
+        0x8C,
+        0x6A,
+        0xE9,
+        0xBB,
+        0x1A,
+        0x3A,
+        0xD6,
+        0x86,
+        0x83,
+        0x5E,
+        0x72,
+        0x41,
+        0xCE,
+        0x85,
+        0x3C,
+        0xD2,
+        0xB3,
+        0xFC,
+        0x13,
+        0xCE,
+        0x37,
+        0x81,
+        0x9E,
+        0x4C,
+        0x1C,
+        0x7B,
+        0x65,
+        0xD3,
+        0xE6,
+        0xA6,
+        0x00,
+        0xF5,
+        0x5A,
+        0x95,
+        0x43,
+        0x5E,
+        0x81,
+        0xCF,
+        0x60,
+        0xA2,
+        0x23,
+        0xFC,
+        0x36,
+        0xA7,
+        0x5D,
+        0x7A,
+        0x4C,
+        0x06,
+        0x91,
+        0x6E,
+        0xF6,
+        0x57,
+        0xEE,
+        0x36,
+        0xCB,
+        0x06,
+        0xEA,
+        0xF5,
+        0x3D,
+        0x95,
+        0x49,
+        0xCB,
+        0xA7,
+        0xDD,
+        0x81,
+        0xDF,
+        0x80,
+        0x09,
+        0x4A,
+        0x97,
+        0x4D,
+        0xA8,
+        0x22,
+        0x72,
+        0xA1,
+        0x7F,
+        0xC4,
+        0x70,
+        0x56,
+        0x70,
+        0xE8,
+        0x20,
+        0x10,
+        0x18,
+        0x8F,
+        0x2E,
+        0x60,
+        0x07,
+        0xE7,
+        0x68,
+        0x1A,
+        0x82,
+        0x5D,
+        0x32,
+        0xA2,
     };
 
     return get_dh_from_pg(libctx, "DH", dh1024_p, sizeof(dh1024_p),
-                          dh1024_g, sizeof(dh1024_g), NULL, 0);
+        dh1024_g, sizeof(dh1024_g), NULL, 0);
 }
 
 EVP_PKEY *get_dh2048(OSSL_LIB_CTX *libctx)
@@ -164,7 +593,7 @@ EVP_PKEY *get_dh2048(OSSL_LIB_CTX *libctx)
 
     dhpkey = get_dh_from_pg_bn(libctx, "DH", p, g, NULL);
 
- err:
+err:
     BN_free(p);
     BN_free(g);
     return dhpkey;
@@ -185,7 +614,7 @@ EVP_PKEY *get_dh4096(OSSL_LIB_CTX *libctx)
 
     dhpkey = get_dh_from_pg_bn(libctx, "DH", p, g, NULL);
 
- err:
+err:
     BN_free(p);
     BN_free(g);
     return dhpkey;
diff --git a/test/helpers/quictestlib.c b/test/helpers/quictestlib.c
index a03afd5606abf..164acc4007728 100644
--- a/test/helpers/quictestlib.c
+++ b/test/helpers/quictestlib.c
@@ -15,7 +15,7 @@
 #include "ssltestlib.h"
 #include "../testutil.h"
 #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG)
-# include "../threadstest.h"
+#include "../threadstest.h"
 #endif
 #include "internal/quic_ssl.h"
 #include "internal/quic_wire_pkt.h"
@@ -72,6 +72,12 @@ struct qtest_fault {
     struct noise_args_data_st noiseargs;
 };
 
+#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG)
+static int client_ready = 0;
+static CRYPTO_CONDVAR *client_ready_cond = NULL;
+static CRYPTO_MUTEX *client_ready_mutex = NULL;
+#endif
+
 static void packet_plain_finish(void *arg);
 static void handshake_finish(void *arg);
 static OSSL_TIME qtest_get_time(void);
@@ -88,8 +94,8 @@ static OSSL_TIME fake_now_cb(void *arg)
 }
 
 static void noise_msg_callback(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)
 {
     struct noise_args_data_st *noiseargs = (struct noise_args_data_st *)arg;
 
@@ -109,43 +115,55 @@ static void noise_msg_callback(int write_p, int version, int content_type,
              * of our noise being too much such that the connection itself
              * fails. We back off on the noise for a bit to avoid that.
              */
-            (void)BIO_ctrl(noiseargs->cbio, BIO_CTRL_NOISE_BACK_OFF, 0, NULL);
-            (void)BIO_ctrl(noiseargs->sbio, BIO_CTRL_NOISE_BACK_OFF, 0, NULL);
+            (void)BIO_ctrl(noiseargs->cbio, BIO_CTRL_NOISE_BACK_OFF, 1, NULL);
+            (void)BIO_ctrl(noiseargs->sbio, BIO_CTRL_NOISE_BACK_OFF, 1, NULL);
         }
     }
 
 #ifndef OPENSSL_NO_SSL_TRACE
     if ((noiseargs->flags & QTEST_FLAG_CLIENT_TRACE) != 0
-            && !SSL_is_server(ssl))
+        && !SSL_is_server(ssl))
         SSL_trace(write_p, version, content_type, buf, len, ssl,
-                  noiseargs->tracebio);
+            noiseargs->tracebio);
 #endif
 }
 
 int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
-                              SSL_CTX *serverctx, char *certfile, char *keyfile,
-                              int flags, QUIC_TSERVER **qtserv, SSL **cssl,
-                              QTEST_FAULT **fault, BIO **tracebio)
+    SSL_CTX *serverctx, char *certfile, char *keyfile,
+    int flags, QUIC_TSERVER **qtserv, SSL **cssl,
+    QTEST_FAULT **fault, BIO **tracebio)
 {
     /* ALPN value as recognised by QUIC_TSERVER */
     unsigned char alpn[] = { 8, 'o', 's', 's', 'l', 't', 'e', 's', 't' };
-    QUIC_TSERVER_ARGS tserver_args = {0};
+    QUIC_TSERVER_ARGS tserver_args = { 0 };
     BIO *cbio = NULL, *sbio = NULL, *fisbio = NULL;
     BIO_ADDR *peeraddr = NULL;
-    struct in_addr ina = {0};
+    struct in_addr ina = { 0 };
     BIO *tmpbio = NULL;
     QTEST_DATA *bdata = NULL;
 
+#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG)
+    if (client_ready_cond == NULL) {
+        client_ready_cond = ossl_crypto_condvar_new();
+        if (client_ready_cond == NULL)
+            return 0;
+    }
+
+    if (client_ready_mutex == NULL) {
+        client_ready_mutex = ossl_crypto_mutex_new();
+        if (client_ready_mutex == NULL) {
+            ossl_crypto_condvar_free(&client_ready_cond);
+            client_ready_cond = NULL;
+            return 0;
+        }
+    }
+#endif
+
     bdata = OPENSSL_zalloc(sizeof(QTEST_DATA));
     if (bdata == NULL)
         return 0;
 
     *qtserv = NULL;
-    if (*cssl == NULL) {
-        *cssl = SSL_new(clientctx);
-        if (!TEST_ptr(*cssl))
-            return 0;
-    }
 
     if (fault != NULL) {
         *fault = OPENSSL_zalloc(sizeof(**fault));
@@ -154,6 +172,12 @@ int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
         bdata->fault = *fault;
     }
 
+    if (*cssl == NULL) {
+        *cssl = SSL_new(clientctx);
+        if (!TEST_ptr(*cssl))
+            goto err;
+    }
+
 #ifndef OPENSSL_NO_SSL_TRACE
     if ((flags & QTEST_FLAG_CLIENT_TRACE) != 0) {
         tmpbio = BIO_new_fp(stdout, BIO_NOCLOSE);
@@ -205,14 +229,14 @@ int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
             goto err;
 
         if (!TEST_true(BIO_dgram_set_caps(cbio, BIO_DGRAM_CAP_HANDLES_DST_ADDR))
-                || !TEST_true(BIO_dgram_set_caps(sbio, BIO_DGRAM_CAP_HANDLES_DST_ADDR)))
+            || !TEST_true(BIO_dgram_set_caps(sbio, BIO_DGRAM_CAP_HANDLES_DST_ADDR)))
             goto err;
 
         if (!TEST_ptr(localaddr = BIO_ADDR_new()))
             goto err;
         /* Dummy client local addresses */
         if (!TEST_true(BIO_ADDR_rawmake(localaddr, AF_INET, &ina, sizeof(ina),
-                                        htons(0)))) {
+                htons(0)))) {
             BIO_ADDR_free(localaddr);
             goto err;
         }
@@ -222,7 +246,7 @@ int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
         }
         /* Dummy server address */
         if (!TEST_true(BIO_ADDR_rawmake(peeraddr, AF_INET, &ina, sizeof(ina),
-                                        htons(0))))
+                htons(0))))
             goto err;
     }
 
@@ -258,7 +282,8 @@ int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
         cbio = BIO_push(noisebio, cbio);
         if ((flags & QTEST_FLAG_FAKE_TIME) != 0) {
             if (!TEST_int_eq(BIO_ctrl(cbio, BIO_CTRL_NOISE_SET_NOW_CB,
-                                      0, &now_cb), 1))
+                                 0, &now_cb),
+                    1))
                 goto err;
         }
 
@@ -269,11 +294,12 @@ int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
         sbio = BIO_push(noisebio, sbio);
         if ((flags & QTEST_FLAG_FAKE_TIME) != 0) {
             if (!TEST_int_eq(BIO_ctrl(sbio, BIO_CTRL_NOISE_SET_NOW_CB,
-                                      0, &now_cb), 1))
+                                 0, &now_cb),
+                    1))
                 goto err;
         }
 
-        (void)BIO_ctrl(sbio, BIO_CTRL_NOISE_BACK_OFF, 0, NULL);
+        (void)BIO_ctrl(sbio, BIO_CTRL_NOISE_BACK_OFF, 2, NULL);
 
         (*fault)->noiseargs.cbio = cbio;
         (*fault)->noiseargs.sbio = sbio;
@@ -287,7 +313,7 @@ int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
     SSL_set_bio(*cssl, cbio, cbio);
 
     if (!TEST_true(SSL_set_blocking_mode(*cssl,
-                                         (flags & QTEST_FLAG_BLOCK) != 0 ? 1 : 0)))
+            (flags & QTEST_FLAG_BLOCK) != 0 ? 1 : 0)))
         goto err;
 
     if (!TEST_true(SSL_set1_initial_peer_addr(*cssl, peeraddr)))
@@ -328,7 +354,7 @@ int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
     }
 
     if (!TEST_ptr(*qtserv = ossl_quic_tserver_new(&tserver_args, certfile,
-                                                  keyfile)))
+                      keyfile)))
         goto err;
 
     bdata->short_conn_id_len = ossl_quic_tserver_get_short_header_conn_id_len(*qtserv);
@@ -338,7 +364,7 @@ int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
 
     if ((flags & QTEST_FLAG_NOISE) != 0)
         ossl_quic_tserver_set_msg_callback(*qtserv, noise_msg_callback,
-                                           &(*fault)->noiseargs);
+            &(*fault)->noiseargs);
 
     if (fault != NULL)
         (*fault)->qtserv = *qtserv;
@@ -346,7 +372,7 @@ int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
     BIO_ADDR_free(peeraddr);
 
     return 1;
- err:
+err:
     SSL_CTX_free(tserver_args.ctx);
     BIO_ADDR_free(peeraddr);
     BIO_free_all(cbio);
@@ -414,7 +440,6 @@ QTEST_FAULT *qtest_create_injector(QUIC_TSERVER *ts)
 
     f->qtserv = ts;
     return f;
-
 }
 
 int qtest_supports_blocking(void)
@@ -426,14 +451,13 @@ int qtest_supports_blocking(void)
 #endif
 }
 
-#define MAXLOOPS    1000
+#define MAXLOOPS 1000
 
 #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG)
 static int globserverret = 0;
 static TSAN_QUALIFIER int abortserverthread = 0;
 static QUIC_TSERVER *globtserv;
 static const thread_t thread_zero;
-
 static void run_server_thread(void)
 {
     /*
@@ -457,7 +481,7 @@ int qtest_wait_for_timeout(SSL *s, QUIC_TSERVER *qtserv)
 
     /* Don't wait if either BIO has data waiting */
     if (BIO_pending(SSL_get_rbio(s)) > 0
-            || BIO_pending(ossl_quic_tserver_get0_rbio(qtserv)) > 0)
+        || BIO_pending(ossl_quic_tserver_get0_rbio(qtserv)) > 0)
         return 1;
 
     /*
@@ -490,11 +514,12 @@ int qtest_wait_for_timeout(SSL *s, QUIC_TSERVER *qtserv)
 }
 
 int qtest_create_quic_connection_ex(QUIC_TSERVER *qtserv, SSL *clientssl,
-                                    int wanterr)
+    int wanterr)
 {
     int retc = -1, rets = 0, abortctr = 0, ret = 0;
     int clienterr = 0, servererr = 0;
 #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG)
+
     /*
      * Pointless initialisation to avoid bogus compiler warnings about using
      * t uninitialised
@@ -503,6 +528,15 @@ int qtest_create_quic_connection_ex(QUIC_TSERVER *qtserv, SSL *clientssl,
 
     if (clientssl != NULL)
         abortserverthread = 0;
+
+    /*
+     * Only set the client_ready flag to zero if we are the client
+     */
+    if (clientssl != NULL) {
+        ossl_crypto_mutex_lock(client_ready_mutex);
+        client_ready = 0;
+        ossl_crypto_mutex_unlock(client_ready_mutex);
+    }
 #endif
 
     if (!TEST_ptr(qtserv)) {
@@ -531,6 +565,12 @@ int qtest_create_quic_connection_ex(QUIC_TSERVER *qtserv, SSL *clientssl,
         if (!clienterr && retc <= 0) {
             int err;
 
+#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG)
+            ossl_crypto_mutex_lock(client_ready_mutex);
+            client_ready = 1;
+            ossl_crypto_condvar_broadcast(client_ready_cond);
+            ossl_crypto_mutex_unlock(client_ready_mutex);
+#endif
             retc = SSL_connect(clientssl);
             if (retc <= 0) {
                 err = SSL_get_error(clientssl, retc);
@@ -545,7 +585,7 @@ int qtest_create_quic_connection_ex(QUIC_TSERVER *qtserv, SSL *clientssl,
                         rets = 1;
                 } else {
                     if (err != SSL_ERROR_WANT_READ
-                            && err != SSL_ERROR_WANT_WRITE) {
+                        && err != SSL_ERROR_WANT_WRITE) {
                         TEST_info("SSL_connect() failed %d, %d", retc, err);
                         TEST_openssl_errors();
                         clienterr = 1;
@@ -557,8 +597,18 @@ int qtest_create_quic_connection_ex(QUIC_TSERVER *qtserv, SSL *clientssl,
         qtest_add_time(1);
         if (clientssl != NULL)
             SSL_handle_events(clientssl);
-        if (qtserv != NULL)
+        if (qtserv != NULL) {
+#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG)
+            ossl_crypto_mutex_lock(client_ready_mutex);
+            for (;;) {
+                if (client_ready == 1)
+                    break;
+                ossl_crypto_condvar_wait(client_ready_cond, client_ready_mutex);
+            }
+            ossl_crypto_mutex_unlock(client_ready_mutex);
+#endif
             ossl_quic_tserver_tick(qtserv);
+        }
 
         if (!servererr && rets <= 0) {
             servererr = ossl_quic_tserver_is_term_any(qtserv);
@@ -579,14 +629,22 @@ int qtest_create_quic_connection_ex(QUIC_TSERVER *qtserv, SSL *clientssl,
                 goto err;
         }
     } while ((retc <= 0 && !clienterr)
-             || (rets <= 0 && !servererr
+        || (rets <= 0 && !servererr
 #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG)
-                 && !tsan_load(&abortserverthread)
+            && !tsan_load(&abortserverthread)
 #endif
                 ));
 
     if (qtserv == NULL && rets > 0) {
 #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG)
+        /*
+         * Make sure we unblock the server before we wait on completion here
+         * in case it didn't happen in the connect loop above
+         */
+        ossl_crypto_mutex_lock(client_ready_mutex);
+        client_ready = 1;
+        ossl_crypto_condvar_broadcast(client_ready_cond);
+        ossl_crypto_mutex_unlock(client_ready_mutex);
         if (!TEST_true(wait_for_thread(t)) || !TEST_true(globserverret))
             goto err;
 #else
@@ -597,7 +655,7 @@ int qtest_create_quic_connection_ex(QUIC_TSERVER *qtserv, SSL *clientssl,
 
     if (!clienterr && !servererr)
         ret = 1;
- err:
+err:
     return ret;
 }
 
@@ -618,7 +676,7 @@ static void run_server_shutdown_thread(void)
      */
     do {
         ossl_quic_tserver_tick(globtserv);
-    } while(!tsan_load(&shutdowndone));
+    } while (!tsan_load(&shutdowndone));
 }
 #endif
 
@@ -632,6 +690,11 @@ int qtest_shutdown(QUIC_TSERVER *qtserv, SSL *clientssl)
      * t uninitialised
      */
     thread_t t = thread_zero;
+
+    ossl_crypto_condvar_free(&client_ready_cond);
+    client_ready_cond = NULL;
+    ossl_crypto_mutex_free(&client_ready_mutex);
+    client_ready_mutex = NULL;
 #endif
 
     if (SSL_get_blocking_mode(clientssl) > 0) {
@@ -692,10 +755,10 @@ int qtest_check_server_transport_err(QUIC_TSERVER *qtserv, uint64_t code)
         return 0;
 
     cause = ossl_quic_tserver_get_terminate_cause(qtserv);
-    if  (!TEST_ptr(cause)
-            || !TEST_true(cause->remote)
-            || !TEST_false(cause->app)
-            || !TEST_uint64_t_eq(cause->error_code, code))
+    if (!TEST_ptr(cause)
+        || !TEST_true(cause->remote)
+        || !TEST_false(cause->app)
+        || !TEST_uint64_t_eq(cause->error_code, code))
         return 0;
 
     return 1;
@@ -723,11 +786,11 @@ void qtest_fault_free(QTEST_FAULT *fault)
 }
 
 static int packet_plain_mutate(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)
 {
     QTEST_FAULT *fault = arg;
     size_t i, bufsz = 0;
@@ -779,8 +842,8 @@ static int packet_plain_mutate(const QUIC_PKT_HDR *hdrin,
      */
     if (fault->pplaincb != NULL)
         fault->pplaincb(fault, &fault->pplainhdr,
-                        (unsigned char *)fault->pplainio.buf,
-                        fault->pplainio.buf_len, fault->pplaincbarg);
+            (unsigned char *)fault->pplainio.buf,
+            fault->pplainio.buf_len, fault->pplaincbarg);
 
     *hdrout = &fault->pplainhdr;
     *iovecout = &fault->pplainio;
@@ -801,16 +864,16 @@ static void packet_plain_finish(void *arg)
 }
 
 int qtest_fault_set_packet_plain_listener(QTEST_FAULT *fault,
-                                          qtest_fault_on_packet_plain_cb pplaincb,
-                                          void *pplaincbarg)
+    qtest_fault_on_packet_plain_cb pplaincb,
+    void *pplaincbarg)
 {
     fault->pplaincb = pplaincb;
     fault->pplaincbarg = pplaincbarg;
 
     return ossl_quic_tserver_set_plain_packet_mutator(fault->qtserv,
-                                                      packet_plain_mutate,
-                                                      packet_plain_finish,
-                                                      fault);
+        packet_plain_mutate,
+        packet_plain_finish,
+        fault);
 }
 
 /* To be called from a packet_plain_listener callback */
@@ -850,7 +913,7 @@ int qtest_fault_resize_plain_packet(QTEST_FAULT *fault, size_t newlen)
  * callback
  */
 int qtest_fault_prepend_frame(QTEST_FAULT *fault, const unsigned char *frame,
-                              size_t frame_len)
+    size_t frame_len)
 {
     unsigned char *buf;
     size_t old_len;
@@ -868,7 +931,7 @@ int qtest_fault_prepend_frame(QTEST_FAULT *fault, const unsigned char *frame,
 
     /* Extend the size of the packet by the size of the new frame */
     if (!TEST_true(qtest_fault_resize_plain_packet(fault,
-                                                   old_len + frame_len)))
+            old_len + frame_len)))
         return 0;
 
     memmove(buf + frame_len, buf, old_len);
@@ -878,8 +941,8 @@ int qtest_fault_prepend_frame(QTEST_FAULT *fault, const unsigned char *frame,
 }
 
 static int handshake_mutate(const unsigned char *msgin, size_t msginlen,
-                            unsigned char **msgout, size_t *msgoutlen,
-                            void *arg)
+    unsigned char **msgout, size_t *msgoutlen,
+    void *arg)
 {
     QTEST_FAULT *fault = arg;
     unsigned char *buf;
@@ -897,15 +960,14 @@ static int handshake_mutate(const unsigned char *msgin, size_t msginlen,
     memcpy(buf, msgin, msginlen);
 
     if (!PACKET_buf_init(&pkt, buf, msginlen)
-            || !PACKET_get_1(&pkt, &msgtype)
-            || !PACKET_get_net_3(&pkt, &payloadlen)
-            || PACKET_remaining(&pkt) != payloadlen)
+        || !PACKET_get_1(&pkt, &msgtype)
+        || !PACKET_get_net_3(&pkt, &payloadlen)
+        || PACKET_remaining(&pkt) != payloadlen)
         return 0;
 
     /* Parse specific message types */
     switch (msgtype) {
-    case SSL3_MT_ENCRYPTED_EXTENSIONS:
-    {
+    case SSL3_MT_ENCRYPTED_EXTENSIONS: {
         QTEST_ENCRYPTED_EXTENSIONS ee;
 
         if (fault->encextcb == NULL)
@@ -927,8 +989,8 @@ static int handshake_mutate(const unsigned char *msgin, size_t msginlen,
     }
 
     if (fault->handshakecb != NULL
-            && !fault->handshakecb(fault, buf, fault->handbuflen,
-                                   fault->handshakecbarg))
+        && !fault->handshakecb(fault, buf, fault->handbuflen,
+            fault->handshakecbarg))
         return 0;
 
     *msgout = buf;
@@ -946,29 +1008,29 @@ static void handshake_finish(void *arg)
 }
 
 int qtest_fault_set_handshake_listener(QTEST_FAULT *fault,
-                                       qtest_fault_on_handshake_cb handshakecb,
-                                       void *handshakecbarg)
+    qtest_fault_on_handshake_cb handshakecb,
+    void *handshakecbarg)
 {
     fault->handshakecb = handshakecb;
     fault->handshakecbarg = handshakecbarg;
 
     return ossl_quic_tserver_set_handshake_mutator(fault->qtserv,
-                                                   handshake_mutate,
-                                                   handshake_finish,
-                                                   fault);
+        handshake_mutate,
+        handshake_finish,
+        fault);
 }
 
 int qtest_fault_set_hand_enc_ext_listener(QTEST_FAULT *fault,
-                                          qtest_fault_on_enc_ext_cb encextcb,
-                                          void *encextcbarg)
+    qtest_fault_on_enc_ext_cb encextcb,
+    void *encextcbarg)
 {
     fault->encextcb = encextcb;
     fault->encextcbarg = encextcbarg;
 
     return ossl_quic_tserver_set_handshake_mutator(fault->qtserv,
-                                                   handshake_mutate,
-                                                   handshake_finish,
-                                                   fault);
+        handshake_mutate,
+        handshake_finish,
+        fault);
 }
 
 /* To be called from a handshake_listener callback */
@@ -1009,16 +1071,16 @@ int qtest_fault_resize_message(QTEST_FAULT *fault, size_t newlen)
 
     /* Fixup the handshake message header */
     fault->handbuf[1] = (unsigned char)((newlen >> 16) & 0xff);
-    fault->handbuf[2] = (unsigned char)((newlen >>  8) & 0xff);
-    fault->handbuf[3] = (unsigned char)((newlen      ) & 0xff);
+    fault->handbuf[2] = (unsigned char)((newlen >> 8) & 0xff);
+    fault->handbuf[3] = (unsigned char)((newlen) & 0xff);
 
     return 1;
 }
 
 int qtest_fault_delete_extension(QTEST_FAULT *fault,
-                                 unsigned int exttype, unsigned char *ext,
-                                 size_t *extlen,
-                                 BUF_MEM *old_ext)
+    unsigned int exttype, unsigned char *ext,
+    size_t *extlen,
+    BUF_MEM *old_ext)
 {
     PACKET pkt, sub, subext;
     WPACKET old_ext_wpkt;
@@ -1037,7 +1099,7 @@ int qtest_fault_delete_extension(QTEST_FAULT *fault,
     do {
         start = PACKET_data(&sub);
         if (!PACKET_get_net_2(&sub, &type)
-                || !PACKET_get_length_prefixed_2(&sub, &subext))
+            || !PACKET_get_length_prefixed_2(&sub, &subext))
             return 0;
     } while (type != exttype);
 
@@ -1049,7 +1111,7 @@ int qtest_fault_delete_extension(QTEST_FAULT *fault,
             return 0;
 
         if (!WPACKET_memcpy(&old_ext_wpkt, PACKET_data(&subext),
-                            PACKET_remaining(&subext))
+                PACKET_remaining(&subext))
             || !WPACKET_get_total_written(&old_ext_wpkt, &w)) {
             WPACKET_cleanup(&old_ext_wpkt);
             return 0;
@@ -1077,7 +1139,7 @@ int qtest_fault_delete_extension(QTEST_FAULT *fault,
 
     /* Fixup the length bytes for the extension block */
     ext[0] = (unsigned char)((newlen >> 8) & 0xff);
-    ext[1] = (unsigned char)((newlen     ) & 0xff);
+    ext[1] = (unsigned char)((newlen) & 0xff);
 
     /*
      * Length of the whole extension block is the new payload length plus the
@@ -1095,15 +1157,15 @@ int qtest_fault_delete_extension(QTEST_FAULT *fault,
     return 1;
 }
 
-#define BIO_TYPE_CIPHER_PACKET_FILTER  (0x80 | BIO_TYPE_FILTER)
+#define BIO_TYPE_CIPHER_PACKET_FILTER (0x80 | BIO_TYPE_FILTER)
 
 static BIO_METHOD *pcipherbiometh = NULL;
 
-# define BIO_MSG_N(array, stride, n) (*(BIO_MSG *)((char *)(array) + (n)*(stride)))
+#define BIO_MSG_N(array, stride, n) (*(BIO_MSG *)((char *)(array) + (n) * (stride)))
 
 static int pcipher_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
-                            size_t num_msg, uint64_t flags,
-                            size_t *num_processed)
+    size_t num_msg, uint64_t flags,
+    size_t *num_processed)
 {
     BIO *next = BIO_next(b);
     ossl_ssize_t ret = 0;
@@ -1118,7 +1180,7 @@ static int pcipher_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
 
     bdata = BIO_get_data(b);
     if (bdata == NULL || bdata->fault == NULL
-            || (bdata->fault->pciphercb == NULL && bdata->fault->datagramcb == NULL))
+        || (bdata->fault->pciphercb == NULL && bdata->fault->datagramcb == NULL))
         return BIO_sendmmsg(next, msg, stride, num_msg, flags, num_processed);
 
     if (num_msg == 0) {
@@ -1143,8 +1205,8 @@ static int pcipher_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
 
             do {
                 if (!ossl_quic_wire_decode_pkt_hdr(&pkt,
-                                                   bdata->short_conn_id_len,
-                                                   1, 0, &hdr, NULL, NULL))
+                        bdata->short_conn_id_len,
+                        1, 0, &hdr, NULL, NULL))
                     goto out;
 
                 /*
@@ -1152,8 +1214,8 @@ static int pcipher_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
                  * const is safe
                  */
                 if (!bdata->fault->pciphercb(bdata->fault, &hdr,
-                                             (unsigned char *)hdr.data, hdr.len,
-                                             bdata->fault->pciphercbarg))
+                        (unsigned char *)hdr.data, hdr.len,
+                        bdata->fault->pciphercbarg))
                     goto out;
 
                 /*
@@ -1167,8 +1229,8 @@ static int pcipher_sendmmsg(BIO *b, BIO_MSG *msg, size_t stride,
         }
 
         if (bdata->fault->datagramcb != NULL
-                && !bdata->fault->datagramcb(bdata->fault, &bdata->fault->msg, stride,
-                                             bdata->fault->datagramcbarg))
+            && !bdata->fault->datagramcb(bdata->fault, &bdata->fault->msg, stride,
+                bdata->fault->datagramcbarg))
             goto out;
 
         if (!BIO_sendmmsg(next, &bdata->fault->msg, stride, 1, flags, &tmpnump)) {
@@ -1218,20 +1280,20 @@ BIO_METHOD *qtest_get_bio_method(void)
         return NULL;
 
     if (!TEST_true(BIO_meth_set_sendmmsg(tmp, pcipher_sendmmsg))
-            || !TEST_true(BIO_meth_set_ctrl(tmp, pcipher_ctrl))
-            || !TEST_true(BIO_meth_set_destroy(tmp, pcipher_destroy)))
+        || !TEST_true(BIO_meth_set_ctrl(tmp, pcipher_ctrl))
+        || !TEST_true(BIO_meth_set_destroy(tmp, pcipher_destroy)))
         goto err;
 
     pcipherbiometh = tmp;
     tmp = NULL;
- err:
+err:
     BIO_meth_free(tmp);
     return pcipherbiometh;
 }
 
 int qtest_fault_set_packet_cipher_listener(QTEST_FAULT *fault,
-                                           qtest_fault_on_packet_cipher_cb pciphercb,
-                                           void *pciphercbarg)
+    qtest_fault_on_packet_cipher_cb pciphercb,
+    void *pciphercbarg)
 {
     fault->pciphercb = pciphercb;
     fault->pciphercbarg = pciphercbarg;
@@ -1240,8 +1302,8 @@ int qtest_fault_set_packet_cipher_listener(QTEST_FAULT *fault,
 }
 
 int qtest_fault_set_datagram_listener(QTEST_FAULT *fault,
-                                      qtest_fault_on_datagram_cb datagramcb,
-                                      void *datagramcbarg)
+    qtest_fault_on_datagram_cb datagramcb,
+    void *datagramcbarg)
 {
     fault->datagramcb = datagramcb;
     fault->datagramcbarg = datagramcbarg;
@@ -1253,11 +1315,11 @@ int qtest_fault_set_datagram_listener(QTEST_FAULT *fault,
 int qtest_fault_resize_datagram(QTEST_FAULT *fault, size_t newlen)
 {
     if (newlen > fault->msgalloc)
-            return 0;
+        return 0;
 
     if (newlen > fault->msg.data_len)
         memset((unsigned char *)fault->msg.data + fault->msg.data_len, 0,
-                newlen - fault->msg.data_len);
+            newlen - fault->msg.data_len);
 
     fault->msg.data_len = newlen;
 
@@ -1265,8 +1327,8 @@ int qtest_fault_resize_datagram(QTEST_FAULT *fault, size_t newlen)
 }
 
 int qtest_fault_set_bw_limit(QTEST_FAULT *fault,
-                             size_t ctos_bw, size_t stoc_bw,
-                             int noise_rate)
+    size_t ctos_bw, size_t stoc_bw,
+    int noise_rate)
 {
     BIO *sbio = fault->noiseargs.sbio;
     BIO *cbio = fault->noiseargs.cbio;
@@ -1279,15 +1341,16 @@ int qtest_fault_set_bw_limit(QTEST_FAULT *fault,
         return 0;
     /* We set the bandwidth limit on the sending side */
     if (!TEST_int_eq(BIO_ctrl(cbio, BIO_CTRL_NOISE_SEND_BANDWIDTH,
-                              (long)ctos_bw, NULL), 1))
+                         (long)ctos_bw, NULL),
+            1))
         return 0;
     if (!TEST_int_eq(BIO_ctrl(sbio, BIO_CTRL_NOISE_SEND_BANDWIDTH,
-                              (long)stoc_bw, NULL), 1))
+                         (long)stoc_bw, NULL),
+            1))
         return 0;
     return 1;
 }
 
-
 int bio_msg_copy(BIO_MSG *dst, BIO_MSG *src)
 {
     /*
diff --git a/test/helpers/quictestlib.h b/test/helpers/quictestlib.h
index 6c20ddd2b8763..63c77f90b78be 100644
--- a/test/helpers/quictestlib.h
+++ b/test/helpers/quictestlib.h
@@ -32,11 +32,11 @@ typedef struct qtest_fault_encrypted_extensions {
 /* Flags for use with qtest_create_quic_objects() */
 
 /* Indicates whether we are using blocking mode or not */
-#define QTEST_FLAG_BLOCK        (1 << 0)
+#define QTEST_FLAG_BLOCK (1 << 0)
 /* Use fake time rather than real time */
-#define QTEST_FLAG_FAKE_TIME    (1 << 1)
+#define QTEST_FLAG_FAKE_TIME (1 << 1)
 /* Introduce noise in the BIO */
-#define QTEST_FLAG_NOISE        (1 << 2)
+#define QTEST_FLAG_NOISE (1 << 2)
 /* Split datagrams such that each datagram contains one packet */
 #define QTEST_FLAG_PACKET_SPLIT (1 << 3)
 /* Turn on client side tracing */
@@ -47,9 +47,9 @@ typedef struct qtest_fault_encrypted_extensions {
  * instance. |flags| is the logical or of flags defined above, or 0 if none.
  */
 int qtest_create_quic_objects(OSSL_LIB_CTX *libctx, SSL_CTX *clientctx,
-                              SSL_CTX *serverctx, char *certfile, char *keyfile,
-                              int flags, QUIC_TSERVER **qtserv, SSL **cssl,
-                              QTEST_FAULT **fault, BIO **tracebio);
+    SSL_CTX *serverctx, char *certfile, char *keyfile,
+    int flags, QUIC_TSERVER **qtserv, SSL **cssl,
+    QTEST_FAULT **fault, BIO **tracebio);
 
 /* Where QTEST_FLAG_FAKE_TIME is used, add millis to the current time */
 void qtest_add_time(uint64_t millis);
@@ -88,7 +88,7 @@ int qtest_wait_for_timeout(SSL *s, QUIC_TSERVER *qtserv);
  * clientssl indicates SSL_ERROR_WANT_XXX as specified by |wanterr|
  */
 int qtest_create_quic_connection_ex(QUIC_TSERVER *qtserv, SSL *clientssl,
-                                    int wanterr);
+    int wanterr);
 
 /*
  * Shutdown the client SSL object gracefully
@@ -116,15 +116,14 @@ int qtest_check_server_frame_encoding_err(QUIC_TSERVER *qtserv);
  * Enable tests to listen for pre-encryption QUIC packets being sent
  */
 typedef int (*qtest_fault_on_packet_plain_cb)(QTEST_FAULT *fault,
-                                              QUIC_PKT_HDR *hdr,
-                                              unsigned char *buf,
-                                              size_t len,
-                                              void *cbarg);
+    QUIC_PKT_HDR *hdr,
+    unsigned char *buf,
+    size_t len,
+    void *cbarg);
 
 int qtest_fault_set_packet_plain_listener(QTEST_FAULT *fault,
-                                          qtest_fault_on_packet_plain_cb pplaincb,
-                                          void *pplaincbarg);
-
+    qtest_fault_on_packet_plain_cb pplaincb,
+    void *pplaincbarg);
 
 /*
  * Helper function to be called from a packet_plain_listener callback if it
@@ -141,20 +140,20 @@ int qtest_fault_resize_plain_packet(QTEST_FAULT *fault, size_t newlen);
  * callback
  */
 int qtest_fault_prepend_frame(QTEST_FAULT *fault, const unsigned char *frame,
-                              size_t frame_len);
+    size_t frame_len);
 
 /*
  * The general handshake message listener is sent the entire handshake message
  * data block, including the handshake header itself
  */
 typedef int (*qtest_fault_on_handshake_cb)(QTEST_FAULT *fault,
-                                           unsigned char *msg,
-                                           size_t msglen,
-                                           void *handshakecbarg);
+    unsigned char *msg,
+    size_t msglen,
+    void *handshakecbarg);
 
 int qtest_fault_set_handshake_listener(QTEST_FAULT *fault,
-                                       qtest_fault_on_handshake_cb handshakecb,
-                                       void *handshakecbarg);
+    qtest_fault_on_handshake_cb handshakecb,
+    void *handshakecbarg);
 
 /*
  * Helper function to be called from a handshake_listener callback if it wants
@@ -179,17 +178,16 @@ int qtest_fault_resize_handshake(QTEST_FAULT *fault, size_t newlen);
  * data and exclude the handshake header
  */
 typedef int (*qtest_fault_on_enc_ext_cb)(QTEST_FAULT *fault,
-                                         QTEST_ENCRYPTED_EXTENSIONS *ee,
-                                         size_t eelen,
-                                         void *encextcbarg);
+    QTEST_ENCRYPTED_EXTENSIONS *ee,
+    size_t eelen,
+    void *encextcbarg);
 
 int qtest_fault_set_hand_enc_ext_listener(QTEST_FAULT *fault,
-                                          qtest_fault_on_enc_ext_cb encextcb,
-                                          void *encextcbarg);
+    qtest_fault_on_enc_ext_cb encextcb,
+    void *encextcbarg);
 
 /* Add listeners for other types of handshake message here */
 
-
 /*
  * Helper function to be called from message specific listener callbacks. newlen
  * is the new length of the specific message excluding the handshake message
@@ -208,9 +206,9 @@ int qtest_fault_resize_message(QTEST_FAULT *fault, size_t newlen);
  * is appended to the given BUF_MEM.
  */
 int qtest_fault_delete_extension(QTEST_FAULT *fault,
-                                 unsigned int exttype, unsigned char *ext,
-                                 size_t *extlen,
-                                 BUF_MEM *old_ext);
+    unsigned int exttype, unsigned char *ext,
+    size_t *extlen,
+    BUF_MEM *old_ext);
 
 /*
  * Add additional helper functions for querying extensions here (e.g.
@@ -222,29 +220,29 @@ int qtest_fault_delete_extension(QTEST_FAULT *fault,
  * Enable tests to listen for post-encryption QUIC packets being sent
  */
 typedef int (*qtest_fault_on_packet_cipher_cb)(QTEST_FAULT *fault,
-                                               /* The parsed packet header */
-                                               QUIC_PKT_HDR *hdr,
-                                               /* The packet payload data */
-                                               unsigned char *buf,
-                                               /* Length of the payload */
-                                               size_t len,
-                                               void *cbarg);
+    /* The parsed packet header */
+    QUIC_PKT_HDR *hdr,
+    /* The packet payload data */
+    unsigned char *buf,
+    /* Length of the payload */
+    size_t len,
+    void *cbarg);
 
 int qtest_fault_set_packet_cipher_listener(QTEST_FAULT *fault,
-                                           qtest_fault_on_packet_cipher_cb pciphercb,
-                                           void *picphercbarg);
+    qtest_fault_on_packet_cipher_cb pciphercb,
+    void *picphercbarg);
 
 /*
  * Enable tests to listen for datagrams being sent
  */
 typedef int (*qtest_fault_on_datagram_cb)(QTEST_FAULT *fault,
-                                          BIO_MSG *m,
-                                          size_t stride,
-                                          void *cbarg);
+    BIO_MSG *m,
+    size_t stride,
+    void *cbarg);
 
 int qtest_fault_set_datagram_listener(QTEST_FAULT *fault,
-                                      qtest_fault_on_datagram_cb datagramcb,
-                                      void *datagramcbarg);
+    qtest_fault_on_datagram_cb datagramcb,
+    void *datagramcbarg);
 
 /*
  * To be called from a datagram_listener callback. The datagram buffer is over
@@ -260,17 +258,17 @@ int qtest_fault_resize_datagram(QTEST_FAULT *fault, size_t newlen);
  */
 
 int qtest_fault_set_bw_limit(QTEST_FAULT *fault,
-                             size_t ctos_bw, size_t stoc_bw,
-                             int noise_rate);
+    size_t ctos_bw, size_t stoc_bw,
+    int noise_rate);
 
 /* Copy a BIO_MSG */
 int bio_msg_copy(BIO_MSG *dst, BIO_MSG *src);
 
-#define BIO_CTRL_NOISE_BACK_OFF       1001
-#define BIO_CTRL_NOISE_RATE           1002
+#define BIO_CTRL_NOISE_BACK_OFF 1001
+#define BIO_CTRL_NOISE_RATE 1002
 #define BIO_CTRL_NOISE_RECV_BANDWIDTH 1003
 #define BIO_CTRL_NOISE_SEND_BANDWIDTH 1004
-#define BIO_CTRL_NOISE_SET_NOW_CB     1005
+#define BIO_CTRL_NOISE_SET_NOW_CB 1005
 
 struct bio_noise_now_cb_st {
     OSSL_TIME (*now_cb)(void *);
diff --git a/test/helpers/ssl_test_ctx.c b/test/helpers/ssl_test_ctx.c
index ec2c7885ba7c7..e68bc62681439 100644
--- a/test/helpers/ssl_test_ctx.c
+++ b/test/helpers/ssl_test_ctx.c
@@ -25,8 +25,7 @@ static int parse_boolean(const char *value, int *result)
     if (OPENSSL_strcasecmp(value, "Yes") == 0) {
         *result = 1;
         return 1;
-    }
-    else if (OPENSSL_strcasecmp(value, "No") == 0) {
+    } else if (OPENSSL_strcasecmp(value, "No") == 0) {
         *result = 0;
         return 1;
     }
@@ -34,25 +33,25 @@ static int parse_boolean(const char *value, int *result)
     return 0;
 }
 
-#define IMPLEMENT_SSL_TEST_BOOL_OPTION(struct_type, name, field)        \
+#define IMPLEMENT_SSL_TEST_BOOL_OPTION(struct_type, name, field)           \
     static int parse_##name##_##field(struct_type *ctx, const char *value) \
-    {                                                                   \
-        return parse_boolean(value, &ctx->field);                       \
+    {                                                                      \
+        return parse_boolean(value, &ctx->field);                          \
     }
 
-#define IMPLEMENT_SSL_TEST_STRING_OPTION(struct_type, name, field)      \
+#define IMPLEMENT_SSL_TEST_STRING_OPTION(struct_type, name, field)         \
     static int parse_##name##_##field(struct_type *ctx, const char *value) \
-    {                                                                   \
-        OPENSSL_free(ctx->field);                                       \
-        ctx->field = OPENSSL_strdup(value);                             \
-        return TEST_ptr(ctx->field);                                    \
+    {                                                                      \
+        OPENSSL_free(ctx->field);                                          \
+        ctx->field = OPENSSL_strdup(value);                                \
+        return TEST_ptr(ctx->field);                                       \
     }
 
-#define IMPLEMENT_SSL_TEST_INT_OPTION(struct_type, name, field)        \
+#define IMPLEMENT_SSL_TEST_INT_OPTION(struct_type, name, field)            \
     static int parse_##name##_##field(struct_type *ctx, const char *value) \
-    {                                                                   \
-        ctx->field = atoi(value);                                       \
-        return 1;                                                       \
+    {                                                                      \
+        ctx->field = atoi(value);                                          \
+        return 1;                                                          \
     }
 
 /* True enums and other test configuration values that map to an int. */
@@ -61,9 +60,8 @@ typedef struct {
     int value;
 } test_enum;
 
-
 __owur static int parse_enum(const test_enum *enums, size_t num_enums,
-                             int *value, const char *name)
+    int *value, const char *name)
 {
     size_t i;
     for (i = 0; i < num_enums; i++) {
@@ -76,7 +74,7 @@ __owur static int parse_enum(const test_enum *enums, size_t num_enums,
 }
 
 static const char *enum_name(const test_enum *enums, size_t num_enums,
-                             int value)
+    int value)
 {
     size_t i;
     for (i = 0; i < num_enums; i++) {
@@ -87,22 +85,21 @@ static const char *enum_name(const test_enum *enums, size_t num_enums,
     return "InvalidValue";
 }
 
-
 /* ExpectedResult */
 
 static const test_enum ssl_test_results[] = {
-    {"Success", SSL_TEST_SUCCESS},
-    {"ServerFail", SSL_TEST_SERVER_FAIL},
-    {"ClientFail", SSL_TEST_CLIENT_FAIL},
-    {"InternalError", SSL_TEST_INTERNAL_ERROR},
-    {"FirstHandshakeFailed", SSL_TEST_FIRST_HANDSHAKE_FAILED},
+    { "Success", SSL_TEST_SUCCESS },
+    { "ServerFail", SSL_TEST_SERVER_FAIL },
+    { "ClientFail", SSL_TEST_CLIENT_FAIL },
+    { "InternalError", SSL_TEST_INTERNAL_ERROR },
+    { "FirstHandshakeFailed", SSL_TEST_FIRST_HANDSHAKE_FAILED },
 };
 
 __owur static int parse_expected_result(SSL_TEST_CTX *test_ctx, const char *value)
 {
     int ret_value;
     if (!parse_enum(ssl_test_results, OSSL_NELEM(ssl_test_results),
-                    &ret_value, value)) {
+            &ret_value, value)) {
         return 0;
     }
     test_ctx->expected_result = ret_value;
@@ -117,13 +114,13 @@ const char *ssl_test_result_name(ssl_test_result_t result)
 /* ExpectedClientAlert / ExpectedServerAlert */
 
 static const test_enum ssl_alerts[] = {
-    {"UnknownCA", SSL_AD_UNKNOWN_CA},
-    {"HandshakeFailure", SSL_AD_HANDSHAKE_FAILURE},
-    {"UnrecognizedName", SSL_AD_UNRECOGNIZED_NAME},
-    {"NoRenegotiation", SSL_AD_NO_RENEGOTIATION},
-    {"BadCertificate", SSL_AD_BAD_CERTIFICATE},
-    {"NoApplicationProtocol", SSL_AD_NO_APPLICATION_PROTOCOL},
-    {"CertificateRequired", SSL_AD_CERTIFICATE_REQUIRED},
+    { "UnknownCA", SSL_AD_UNKNOWN_CA },
+    { "HandshakeFailure", SSL_AD_HANDSHAKE_FAILURE },
+    { "UnrecognizedName", SSL_AD_UNRECOGNIZED_NAME },
+    { "NoRenegotiation", SSL_AD_NO_RENEGOTIATION },
+    { "BadCertificate", SSL_AD_BAD_CERTIFICATE },
+    { "NoApplicationProtocol", SSL_AD_NO_APPLICATION_PROTOCOL },
+    { "CertificateRequired", SSL_AD_CERTIFICATE_REQUIRED },
 };
 
 __owur static int parse_alert(int *alert, const char *value)
@@ -149,19 +146,19 @@ const char *ssl_alert_name(int alert)
 /* ExpectedProtocol */
 
 static const test_enum ssl_protocols[] = {
-     {"TLSv1.3", TLS1_3_VERSION},
-     {"TLSv1.2", TLS1_2_VERSION},
-     {"TLSv1.1", TLS1_1_VERSION},
-     {"TLSv1", TLS1_VERSION},
-     {"SSLv3", SSL3_VERSION},
-     {"DTLSv1", DTLS1_VERSION},
-     {"DTLSv1.2", DTLS1_2_VERSION},
+    { "TLSv1.3", TLS1_3_VERSION },
+    { "TLSv1.2", TLS1_2_VERSION },
+    { "TLSv1.1", TLS1_1_VERSION },
+    { "TLSv1", TLS1_VERSION },
+    { "SSLv3", SSL3_VERSION },
+    { "DTLSv1", DTLS1_VERSION },
+    { "DTLSv1.2", DTLS1_2_VERSION },
 };
 
 __owur static int parse_protocol(SSL_TEST_CTX *test_ctx, const char *value)
 {
     return parse_enum(ssl_protocols, OSSL_NELEM(ssl_protocols),
-                      &test_ctx->expected_protocol, value);
+        &test_ctx->expected_protocol, value);
 }
 
 const char *ssl_protocol_name(int protocol)
@@ -172,19 +169,19 @@ const char *ssl_protocol_name(int protocol)
 /* VerifyCallback */
 
 static const test_enum ssl_verify_callbacks[] = {
-    {"None", SSL_TEST_VERIFY_NONE},
-    {"AcceptAll", SSL_TEST_VERIFY_ACCEPT_ALL},
-    {"RetryOnce", SSL_TEST_VERIFY_RETRY_ONCE},
-    {"RejectAll", SSL_TEST_VERIFY_REJECT_ALL},
+    { "None", SSL_TEST_VERIFY_NONE },
+    { "AcceptAll", SSL_TEST_VERIFY_ACCEPT_ALL },
+    { "RetryOnce", SSL_TEST_VERIFY_RETRY_ONCE },
+    { "RejectAll", SSL_TEST_VERIFY_REJECT_ALL },
 };
 
 __owur static int parse_client_verify_callback(SSL_TEST_CLIENT_CONF *client_conf,
-                                               const char *value)
+    const char *value)
 {
     int ret_value;
 
     if (!parse_enum(ssl_verify_callbacks, OSSL_NELEM(ssl_verify_callbacks),
-                    &ret_value, value)) {
+            &ret_value, value)) {
         return 0;
     }
     client_conf->verify_callback = ret_value;
@@ -194,24 +191,24 @@ __owur static int parse_client_verify_callback(SSL_TEST_CLIENT_CONF *client_conf
 const char *ssl_verify_callback_name(ssl_verify_callback_t callback)
 {
     return enum_name(ssl_verify_callbacks, OSSL_NELEM(ssl_verify_callbacks),
-                     callback);
+        callback);
 }
 
 /* ServerName */
 
 static const test_enum ssl_servername[] = {
-    {"None", SSL_TEST_SERVERNAME_NONE},
-    {"server1", SSL_TEST_SERVERNAME_SERVER1},
-    {"server2", SSL_TEST_SERVERNAME_SERVER2},
-    {"invalid", SSL_TEST_SERVERNAME_INVALID},
+    { "None", SSL_TEST_SERVERNAME_NONE },
+    { "server1", SSL_TEST_SERVERNAME_SERVER1 },
+    { "server2", SSL_TEST_SERVERNAME_SERVER2 },
+    { "invalid", SSL_TEST_SERVERNAME_INVALID },
 };
 
 __owur static int parse_servername(SSL_TEST_CLIENT_CONF *client_conf,
-                                   const char *value)
+    const char *value)
 {
     int ret_value;
     if (!parse_enum(ssl_servername, OSSL_NELEM(ssl_servername),
-                    &ret_value, value)) {
+            &ret_value, value)) {
         return 0;
     }
     client_conf->servername = ret_value;
@@ -219,11 +216,11 @@ __owur static int parse_servername(SSL_TEST_CLIENT_CONF *client_conf,
 }
 
 __owur static int parse_expected_servername(SSL_TEST_CTX *test_ctx,
-                                            const char *value)
+    const char *value)
 {
     int ret_value;
     if (!parse_enum(ssl_servername, OSSL_NELEM(ssl_servername),
-                    &ret_value, value)) {
+            &ret_value, value)) {
         return 0;
     }
     test_ctx->expected_servername = ret_value;
@@ -233,28 +230,28 @@ __owur static int parse_expected_servername(SSL_TEST_CTX *test_ctx,
 const char *ssl_servername_name(ssl_servername_t server)
 {
     return enum_name(ssl_servername, OSSL_NELEM(ssl_servername),
-                     server);
+        server);
 }
 
 /* ServerNameCallback */
 
 static const test_enum ssl_servername_callbacks[] = {
-    {"None", SSL_TEST_SERVERNAME_CB_NONE},
-    {"IgnoreMismatch", SSL_TEST_SERVERNAME_IGNORE_MISMATCH},
-    {"RejectMismatch", SSL_TEST_SERVERNAME_REJECT_MISMATCH},
-    {"ClientHelloIgnoreMismatch",
-     SSL_TEST_SERVERNAME_CLIENT_HELLO_IGNORE_MISMATCH},
-    {"ClientHelloRejectMismatch",
-     SSL_TEST_SERVERNAME_CLIENT_HELLO_REJECT_MISMATCH},
-    {"ClientHelloNoV12", SSL_TEST_SERVERNAME_CLIENT_HELLO_NO_V12},
+    { "None", SSL_TEST_SERVERNAME_CB_NONE },
+    { "IgnoreMismatch", SSL_TEST_SERVERNAME_IGNORE_MISMATCH },
+    { "RejectMismatch", SSL_TEST_SERVERNAME_REJECT_MISMATCH },
+    { "ClientHelloIgnoreMismatch",
+        SSL_TEST_SERVERNAME_CLIENT_HELLO_IGNORE_MISMATCH },
+    { "ClientHelloRejectMismatch",
+        SSL_TEST_SERVERNAME_CLIENT_HELLO_REJECT_MISMATCH },
+    { "ClientHelloNoV12", SSL_TEST_SERVERNAME_CLIENT_HELLO_NO_V12 },
 };
 
 __owur static int parse_servername_callback(SSL_TEST_SERVER_CONF *server_conf,
-                                            const char *value)
+    const char *value)
 {
     int ret_value;
     if (!parse_enum(ssl_servername_callbacks,
-                    OSSL_NELEM(ssl_servername_callbacks), &ret_value, value)) {
+            OSSL_NELEM(ssl_servername_callbacks), &ret_value, value)) {
         return 0;
     }
     server_conf->servername_callback = ret_value;
@@ -264,22 +261,22 @@ __owur static int parse_servername_callback(SSL_TEST_SERVER_CONF *server_conf,
 const char *ssl_servername_callback_name(ssl_servername_callback_t callback)
 {
     return enum_name(ssl_servername_callbacks,
-                     OSSL_NELEM(ssl_servername_callbacks), callback);
+        OSSL_NELEM(ssl_servername_callbacks), callback);
 }
 
 /* SessionTicketExpected */
 
 static const test_enum ssl_session_ticket[] = {
-    {"Ignore", SSL_TEST_SESSION_TICKET_IGNORE},
-    {"Yes", SSL_TEST_SESSION_TICKET_YES},
-    {"No", SSL_TEST_SESSION_TICKET_NO},
+    { "Ignore", SSL_TEST_SESSION_TICKET_IGNORE },
+    { "Yes", SSL_TEST_SESSION_TICKET_YES },
+    { "No", SSL_TEST_SESSION_TICKET_NO },
 };
 
 __owur static int parse_session_ticket(SSL_TEST_CTX *test_ctx, const char *value)
 {
     int ret_value;
     if (!parse_enum(ssl_session_ticket, OSSL_NELEM(ssl_session_ticket),
-                    &ret_value, value)) {
+            &ret_value, value)) {
         return 0;
     }
     test_ctx->session_ticket_expected = ret_value;
@@ -289,8 +286,8 @@ __owur static int parse_session_ticket(SSL_TEST_CTX *test_ctx, const char *value
 const char *ssl_session_ticket_name(ssl_session_ticket_t server)
 {
     return enum_name(ssl_session_ticket,
-                     OSSL_NELEM(ssl_session_ticket),
-                     server);
+        OSSL_NELEM(ssl_session_ticket),
+        server);
 }
 
 /* CompressionExpected */
@@ -300,16 +297,16 @@ IMPLEMENT_SSL_TEST_BOOL_OPTION(SSL_TEST_CTX, test, compression_expected)
 /* SessionIdExpected */
 
 static const test_enum ssl_session_id[] = {
-    {"Ignore", SSL_TEST_SESSION_ID_IGNORE},
-    {"Yes", SSL_TEST_SESSION_ID_YES},
-    {"No", SSL_TEST_SESSION_ID_NO},
+    { "Ignore", SSL_TEST_SESSION_ID_IGNORE },
+    { "Yes", SSL_TEST_SESSION_ID_YES },
+    { "No", SSL_TEST_SESSION_ID_NO },
 };
 
 __owur static int parse_session_id(SSL_TEST_CTX *test_ctx, const char *value)
 {
     int ret_value;
     if (!parse_enum(ssl_session_id, OSSL_NELEM(ssl_session_id),
-                    &ret_value, value)) {
+            &ret_value, value)) {
         return 0;
     }
     test_ctx->session_id_expected = ret_value;
@@ -319,23 +316,23 @@ __owur static int parse_session_id(SSL_TEST_CTX *test_ctx, const char *value)
 const char *ssl_session_id_name(ssl_session_id_t server)
 {
     return enum_name(ssl_session_id,
-                     OSSL_NELEM(ssl_session_id),
-                     server);
+        OSSL_NELEM(ssl_session_id),
+        server);
 }
 
 /* Method */
 
 static const test_enum ssl_test_methods[] = {
-    {"TLS", SSL_TEST_METHOD_TLS},
-    {"DTLS", SSL_TEST_METHOD_DTLS},
-    {"QUIC", SSL_TEST_METHOD_QUIC}
+    { "TLS", SSL_TEST_METHOD_TLS },
+    { "DTLS", SSL_TEST_METHOD_DTLS },
+    { "QUIC", SSL_TEST_METHOD_QUIC }
 };
 
 __owur static int parse_test_method(SSL_TEST_CTX *test_ctx, const char *value)
 {
     int ret_value;
     if (!parse_enum(ssl_test_methods, OSSL_NELEM(ssl_test_methods),
-                    &ret_value, value)) {
+            &ret_value, value)) {
         return 0;
     }
     test_ctx->method = ret_value;
@@ -369,20 +366,20 @@ IMPLEMENT_SSL_TEST_STRING_OPTION(SSL_TEST_SERVER_CONF, server, session_ticket_ap
 /* Handshake mode */
 
 static const test_enum ssl_handshake_modes[] = {
-    {"Simple", SSL_TEST_HANDSHAKE_SIMPLE},
-    {"Resume", SSL_TEST_HANDSHAKE_RESUME},
-    {"RenegotiateServer", SSL_TEST_HANDSHAKE_RENEG_SERVER},
-    {"RenegotiateClient", SSL_TEST_HANDSHAKE_RENEG_CLIENT},
-    {"KeyUpdateServer", SSL_TEST_HANDSHAKE_KEY_UPDATE_SERVER},
-    {"KeyUpdateClient", SSL_TEST_HANDSHAKE_KEY_UPDATE_CLIENT},
-    {"PostHandshakeAuth", SSL_TEST_HANDSHAKE_POST_HANDSHAKE_AUTH},
+    { "Simple", SSL_TEST_HANDSHAKE_SIMPLE },
+    { "Resume", SSL_TEST_HANDSHAKE_RESUME },
+    { "RenegotiateServer", SSL_TEST_HANDSHAKE_RENEG_SERVER },
+    { "RenegotiateClient", SSL_TEST_HANDSHAKE_RENEG_CLIENT },
+    { "KeyUpdateServer", SSL_TEST_HANDSHAKE_KEY_UPDATE_SERVER },
+    { "KeyUpdateClient", SSL_TEST_HANDSHAKE_KEY_UPDATE_CLIENT },
+    { "PostHandshakeAuth", SSL_TEST_HANDSHAKE_POST_HANDSHAKE_AUTH },
 };
 
 __owur static int parse_handshake_mode(SSL_TEST_CTX *test_ctx, const char *value)
 {
     int ret_value;
     if (!parse_enum(ssl_handshake_modes, OSSL_NELEM(ssl_handshake_modes),
-                    &ret_value, value)) {
+            &ret_value, value)) {
         return 0;
     }
     test_ctx->handshake_mode = ret_value;
@@ -392,7 +389,7 @@ __owur static int parse_handshake_mode(SSL_TEST_CTX *test_ctx, const char *value
 const char *ssl_handshake_mode_name(ssl_handshake_mode_t mode)
 {
     return enum_name(ssl_handshake_modes, OSSL_NELEM(ssl_handshake_modes),
-                     mode);
+        mode);
 }
 
 /* Renegotiation Ciphersuites */
@@ -402,15 +399,15 @@ IMPLEMENT_SSL_TEST_STRING_OPTION(SSL_TEST_CLIENT_CONF, client, reneg_ciphers)
 /* KeyUpdateType */
 
 static const test_enum ssl_key_update_types[] = {
-    {"KeyUpdateRequested", SSL_KEY_UPDATE_REQUESTED},
-    {"KeyUpdateNotRequested", SSL_KEY_UPDATE_NOT_REQUESTED},
+    { "KeyUpdateRequested", SSL_KEY_UPDATE_REQUESTED },
+    { "KeyUpdateNotRequested", SSL_KEY_UPDATE_NOT_REQUESTED },
 };
 
 __owur static int parse_key_update_type(SSL_TEST_CTX *test_ctx, const char *value)
 {
     int ret_value;
     if (!parse_enum(ssl_key_update_types, OSSL_NELEM(ssl_key_update_types),
-                    &ret_value, value)) {
+            &ret_value, value)) {
         return 0;
     }
     test_ctx->key_update_type = ret_value;
@@ -420,17 +417,17 @@ __owur static int parse_key_update_type(SSL_TEST_CTX *test_ctx, const char *valu
 /* CT Validation */
 
 static const test_enum ssl_ct_validation_modes[] = {
-    {"None", SSL_TEST_CT_VALIDATION_NONE},
-    {"Permissive", SSL_TEST_CT_VALIDATION_PERMISSIVE},
-    {"Strict", SSL_TEST_CT_VALIDATION_STRICT},
+    { "None", SSL_TEST_CT_VALIDATION_NONE },
+    { "Permissive", SSL_TEST_CT_VALIDATION_PERMISSIVE },
+    { "Strict", SSL_TEST_CT_VALIDATION_STRICT },
 };
 
 __owur static int parse_ct_validation(SSL_TEST_CLIENT_CONF *client_conf,
-                                      const char *value)
+    const char *value)
 {
     int ret_value;
     if (!parse_enum(ssl_ct_validation_modes, OSSL_NELEM(ssl_ct_validation_modes),
-                    &ret_value, value)) {
+            &ret_value, value)) {
         return 0;
     }
     client_conf->ct_validation = ret_value;
@@ -440,7 +437,7 @@ __owur static int parse_ct_validation(SSL_TEST_CLIENT_CONF *client_conf,
 const char *ssl_ct_validation_name(ssl_ct_validation_t mode)
 {
     return enum_name(ssl_ct_validation_modes, OSSL_NELEM(ssl_ct_validation_modes),
-                     mode);
+        mode);
 }
 
 IMPLEMENT_SSL_TEST_BOOL_OPTION(SSL_TEST_CTX, test, resumption_expected)
@@ -453,17 +450,17 @@ IMPLEMENT_SSL_TEST_BOOL_OPTION(SSL_TEST_CTX, test, enable_server_sctp_label_bug)
 /* CertStatus */
 
 static const test_enum ssl_certstatus[] = {
-    {"None", SSL_TEST_CERT_STATUS_NONE},
-    {"GoodResponse", SSL_TEST_CERT_STATUS_GOOD_RESPONSE},
-    {"BadResponse", SSL_TEST_CERT_STATUS_BAD_RESPONSE}
+    { "None", SSL_TEST_CERT_STATUS_NONE },
+    { "GoodResponse", SSL_TEST_CERT_STATUS_GOOD_RESPONSE },
+    { "BadResponse", SSL_TEST_CERT_STATUS_BAD_RESPONSE }
 };
 
 __owur static int parse_certstatus(SSL_TEST_SERVER_CONF *server_conf,
-                                            const char *value)
+    const char *value)
 {
     int ret_value;
     if (!parse_enum(ssl_certstatus, OSSL_NELEM(ssl_certstatus), &ret_value,
-                    value)) {
+            value)) {
         return 0;
     }
     server_conf->cert_status = ret_value;
@@ -473,34 +470,33 @@ __owur static int parse_certstatus(SSL_TEST_SERVER_CONF *server_conf,
 const char *ssl_certstatus_name(ssl_cert_status_t cert_status)
 {
     return enum_name(ssl_certstatus,
-                     OSSL_NELEM(ssl_certstatus), cert_status);
+        OSSL_NELEM(ssl_certstatus), cert_status);
 }
 
 /* ApplicationData */
 
 IMPLEMENT_SSL_TEST_INT_OPTION(SSL_TEST_CTX, test, app_data_size)
 
-
 /* MaxFragmentSize */
 
 IMPLEMENT_SSL_TEST_INT_OPTION(SSL_TEST_CTX, test, max_fragment_size)
 
 /* Maximum-Fragment-Length TLS extension mode */
 static const test_enum ssl_max_fragment_len_mode[] = {
-    {"None", TLSEXT_max_fragment_length_DISABLED},
-    { "512", TLSEXT_max_fragment_length_512},
-    {"1024", TLSEXT_max_fragment_length_1024},
-    {"2048", TLSEXT_max_fragment_length_2048},
-    {"4096", TLSEXT_max_fragment_length_4096}
+    { "None", TLSEXT_max_fragment_length_DISABLED },
+    { "512", TLSEXT_max_fragment_length_512 },
+    { "1024", TLSEXT_max_fragment_length_1024 },
+    { "2048", TLSEXT_max_fragment_length_2048 },
+    { "4096", TLSEXT_max_fragment_length_4096 }
 };
 
 __owur static int parse_max_fragment_len_mode(SSL_TEST_CLIENT_CONF *client_conf,
-                                              const char *value)
+    const char *value)
 {
     int ret_value;
 
     if (!parse_enum(ssl_max_fragment_len_mode,
-                    OSSL_NELEM(ssl_max_fragment_len_mode), &ret_value, value)) {
+            OSSL_NELEM(ssl_max_fragment_len_mode), &ret_value, value)) {
         return 0;
     }
     client_conf->max_fragment_len_mode = ret_value;
@@ -510,10 +506,9 @@ __owur static int parse_max_fragment_len_mode(SSL_TEST_CLIENT_CONF *client_conf,
 const char *ssl_max_fragment_len_name(int MFL_mode)
 {
     return enum_name(ssl_max_fragment_len_mode,
-                     OSSL_NELEM(ssl_max_fragment_len_mode), MFL_mode);
+        OSSL_NELEM(ssl_max_fragment_len_mode), MFL_mode);
 }
 
-
 /* Expected key and signature types */
 
 __owur static int parse_expected_key_type(int *ptype, const char *value)
@@ -552,40 +547,39 @@ __owur static int parse_expected_key_type(int *ptype, const char *value)
 }
 
 __owur static int parse_expected_tmp_key_type(SSL_TEST_CTX *test_ctx,
-                                              const char *value)
+    const char *value)
 {
     return parse_expected_key_type(&test_ctx->expected_tmp_key_type, value);
 }
 
 __owur static int parse_expected_server_cert_type(SSL_TEST_CTX *test_ctx,
-                                                  const char *value)
+    const char *value)
 {
     return parse_expected_key_type(&test_ctx->expected_server_cert_type,
-                                   value);
+        value);
 }
 
 __owur static int parse_expected_server_sign_type(SSL_TEST_CTX *test_ctx,
-                                                 const char *value)
+    const char *value)
 {
     return parse_expected_key_type(&test_ctx->expected_server_sign_type,
-                                   value);
+        value);
 }
 
 __owur static int parse_expected_client_cert_type(SSL_TEST_CTX *test_ctx,
-                                                  const char *value)
+    const char *value)
 {
     return parse_expected_key_type(&test_ctx->expected_client_cert_type,
-                                   value);
+        value);
 }
 
 __owur static int parse_expected_client_sign_type(SSL_TEST_CTX *test_ctx,
-                                                 const char *value)
+    const char *value)
 {
     return parse_expected_key_type(&test_ctx->expected_client_sign_type,
-                                   value);
+        value);
 }
 
-
 /* Expected signing hash */
 
 __owur static int parse_expected_sign_hash(int *ptype, const char *value)
@@ -604,22 +598,22 @@ __owur static int parse_expected_sign_hash(int *ptype, const char *value)
 }
 
 __owur static int parse_expected_server_sign_hash(SSL_TEST_CTX *test_ctx,
-                                                  const char *value)
+    const char *value)
 {
     return parse_expected_sign_hash(&test_ctx->expected_server_sign_hash,
-                                    value);
+        value);
 }
 
 __owur static int parse_expected_client_sign_hash(SSL_TEST_CTX *test_ctx,
-                                                  const char *value)
+    const char *value)
 {
     return parse_expected_sign_hash(&test_ctx->expected_client_sign_hash,
-                                    value);
+        value);
 }
 
 __owur static int parse_expected_ca_names(STACK_OF(X509_NAME) **pnames,
-                                          const char *value,
-                                          OSSL_LIB_CTX *libctx)
+    const char *value,
+    OSSL_LIB_CTX *libctx)
 {
     if (value == NULL)
         return 0;
@@ -630,16 +624,16 @@ __owur static int parse_expected_ca_names(STACK_OF(X509_NAME) **pnames,
     return *pnames != NULL;
 }
 __owur static int parse_expected_server_ca_names(SSL_TEST_CTX *test_ctx,
-                                                 const char *value)
+    const char *value)
 {
     return parse_expected_ca_names(&test_ctx->expected_server_ca_names, value,
-                                   test_ctx->libctx);
+        test_ctx->libctx);
 }
 __owur static int parse_expected_client_ca_names(SSL_TEST_CTX *test_ctx,
-                                                 const char *value)
+    const char *value)
 {
     return parse_expected_ca_names(&test_ctx->expected_client_ca_names, value,
-                                   test_ctx->libctx);
+        test_ctx->libctx);
 }
 
 /* ExpectedCipher */
@@ -710,7 +704,7 @@ static const ssl_test_client_option ssl_test_client_options[] = {
     { "NPNProtocols", &parse_client_npn_protocols },
     { "ALPNProtocols", &parse_client_alpn_protocols },
     { "CTValidation", &parse_ct_validation },
-    { "RenegotiateCiphers", &parse_client_reneg_ciphers},
+    { "RenegotiateCiphers", &parse_client_reneg_ciphers },
     { "SRPUser", &parse_client_srp_user },
     { "SRPPassword", &parse_client_srp_password },
     { "MaxFragmentLenExt", &parse_max_fragment_len_mode },
@@ -790,7 +784,7 @@ void SSL_TEST_CTX_free(SSL_TEST_CTX *ctx)
 }
 
 static int parse_client_options(SSL_TEST_CLIENT_CONF *client, const CONF *conf,
-                                const char *client_section)
+    const char *client_section)
 {
     STACK_OF(CONF_VALUE) *sk_conf;
     int i;
@@ -806,7 +800,7 @@ static int parse_client_options(SSL_TEST_CLIENT_CONF *client, const CONF *conf,
             if (strcmp(option->name, ssl_test_client_options[j].name) == 0) {
                 if (!ssl_test_client_options[j].parse(client, option->value)) {
                     TEST_info("Bad value %s for option %s",
-                              option->value, option->name);
+                        option->value, option->name);
                     return 0;
                 }
                 found = 1;
@@ -823,7 +817,7 @@ static int parse_client_options(SSL_TEST_CLIENT_CONF *client, const CONF *conf,
 }
 
 static int parse_server_options(SSL_TEST_SERVER_CONF *server, const CONF *conf,
-                                const char *server_section)
+    const char *server_section)
 {
     STACK_OF(CONF_VALUE) *sk_conf;
     int i;
@@ -839,7 +833,7 @@ static int parse_server_options(SSL_TEST_SERVER_CONF *server, const CONF *conf,
             if (strcmp(option->name, ssl_test_server_options[j].name) == 0) {
                 if (!ssl_test_server_options[j].parse(server, option->value)) {
                     TEST_info("Bad value %s for option %s",
-                               option->value, option->name);
+                        option->value, option->name);
                     return 0;
                 }
                 found = 1;
@@ -856,7 +850,7 @@ static int parse_server_options(SSL_TEST_SERVER_CONF *server, const CONF *conf,
 }
 
 SSL_TEST_CTX *SSL_TEST_CTX_create(const CONF *conf, const char *test_section,
-                                  OSSL_LIB_CTX *libctx)
+    OSSL_LIB_CTX *libctx)
 {
     STACK_OF(CONF_VALUE) *sk_conf = NULL;
     SSL_TEST_CTX *ctx = NULL;
@@ -864,7 +858,7 @@ SSL_TEST_CTX *SSL_TEST_CTX_create(const CONF *conf, const char *test_section,
     size_t j;
 
     if (!TEST_ptr(sk_conf = NCONF_get_section(conf, test_section))
-            || !TEST_ptr(ctx = SSL_TEST_CTX_new(libctx)))
+        || !TEST_ptr(ctx = SSL_TEST_CTX_new(libctx)))
         goto err;
 
     for (i = 0; i < sk_CONF_VALUE_num(sk_conf); i++) {
@@ -883,22 +877,22 @@ SSL_TEST_CTX *SSL_TEST_CTX_create(const CONF *conf, const char *test_section,
                 goto err;
         } else if (strcmp(option->name, "resume-client") == 0) {
             if (!parse_client_options(&ctx->resume_extra.client, conf,
-                                      option->value))
+                    option->value))
                 goto err;
         } else if (strcmp(option->name, "resume-server") == 0) {
             if (!parse_server_options(&ctx->resume_extra.server, conf,
-                                      option->value))
+                    option->value))
                 goto err;
         } else if (strcmp(option->name, "resume-server2") == 0) {
             if (!parse_server_options(&ctx->resume_extra.server2, conf,
-                                      option->value))
+                    option->value))
                 goto err;
         } else {
             for (j = 0; j < OSSL_NELEM(ssl_test_ctx_options); j++) {
                 if (strcmp(option->name, ssl_test_ctx_options[j].name) == 0) {
                     if (!ssl_test_ctx_options[j].parse(ctx, option->value)) {
                         TEST_info("Bad value %s for option %s",
-                                   option->value, option->name);
+                            option->value, option->name);
                         goto err;
                     }
                     found = 1;
@@ -914,9 +908,9 @@ SSL_TEST_CTX *SSL_TEST_CTX_create(const CONF *conf, const char *test_section,
 
     goto done;
 
- err:
+err:
     SSL_TEST_CTX_free(ctx);
     ctx = NULL;
- done:
+done:
     return ctx;
 }
diff --git a/test/helpers/ssl_test_ctx.h b/test/helpers/ssl_test_ctx.h
index 017d2d1121514..c8ae265163daa 100644
--- a/test/helpers/ssl_test_ctx.h
+++ b/test/helpers/ssl_test_ctx.h
@@ -14,7 +14,7 @@
 #include <openssl/ssl.h>
 
 typedef enum {
-    SSL_TEST_SUCCESS = 0,  /* Default */
+    SSL_TEST_SUCCESS = 0, /* Default */
     SSL_TEST_SERVER_FAIL,
     SSL_TEST_CLIENT_FAIL,
     SSL_TEST_INTERNAL_ERROR,
@@ -37,7 +37,7 @@ typedef enum {
 } ssl_servername_t;
 
 typedef enum {
-    SSL_TEST_SERVERNAME_CB_NONE = 0,  /* Default */
+    SSL_TEST_SERVERNAME_CB_NONE = 0, /* Default */
     SSL_TEST_SERVERNAME_IGNORE_MISMATCH,
     SSL_TEST_SERVERNAME_REJECT_MISMATCH,
     SSL_TEST_SERVERNAME_CLIENT_HELLO_IGNORE_MISMATCH,
@@ -242,7 +242,7 @@ const char *ssl_protocol_name(int protocol);
 const char *ssl_verify_callback_name(ssl_verify_callback_t verify_callback);
 const char *ssl_servername_name(ssl_servername_t server);
 const char *ssl_servername_callback_name(ssl_servername_callback_t
-                                         servername_callback);
+        servername_callback);
 const char *ssl_session_ticket_name(ssl_session_ticket_t server);
 const char *ssl_session_id_name(ssl_session_id_t server);
 const char *ssl_test_method_name(ssl_test_method_t method);
@@ -256,10 +256,10 @@ const char *ssl_max_fragment_len_name(int MFL_mode);
  * See test/README.ssltest.md for details on the conf file format.
  */
 SSL_TEST_CTX *SSL_TEST_CTX_create(const CONF *conf, const char *test_section,
-                                  OSSL_LIB_CTX *libctx);
+    OSSL_LIB_CTX *libctx);
 
 SSL_TEST_CTX *SSL_TEST_CTX_new(OSSL_LIB_CTX *libctx);
 
 void SSL_TEST_CTX_free(SSL_TEST_CTX *ctx);
 
-#endif  /* OSSL_TEST_SSL_TEST_CTX_H */
+#endif /* OSSL_TEST_SSL_TEST_CTX_H */
diff --git a/test/helpers/ssltestlib.c b/test/helpers/ssltestlib.c
index e9a51c9c30d0b..0f9b83865d864 100644
--- a/test/helpers/ssltestlib.c
+++ b/test/helpers/ssltestlib.c
@@ -12,7 +12,7 @@
  * when the deprecated calls are not hidden
  */
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# define OPENSSL_SUPPRESS_DEPRECATED
+#define OPENSSL_SUPPRESS_DEPRECATED
 #endif
 
 #include <string.h>
@@ -24,10 +24,10 @@
 #include "../testutil.h"
 
 #if (!defined(OPENSSL_NO_KTLS) || !defined(OPENSSL_NO_QUIC)) && !defined(OPENSSL_NO_POSIX_IO) && !defined(OPENSSL_NO_SOCK)
-# define OSSL_USE_SOCKETS 1
-# include "internal/e_winsock.h"
-# include "internal/sockets.h"
-# include <openssl/bio.h>
+#define OSSL_USE_SOCKETS 1
+#include "internal/e_winsock.h"
+#include "internal/sockets.h"
+#include <openssl/bio.h>
 #endif
 
 static int tls_dump_new(BIO *bi);
@@ -39,10 +39,10 @@ static int tls_dump_gets(BIO *bp, char *buf, int size);
 static int tls_dump_puts(BIO *bp, const char *str);
 
 /* Choose a sufficiently large type likely to be unused for this custom BIO */
-#define BIO_TYPE_TLS_DUMP_FILTER   (0x80 | BIO_TYPE_FILTER)
-#define BIO_TYPE_MEMPACKET_TEST    0x81
-#define BIO_TYPE_ALWAYS_RETRY      0x82
-#define BIO_TYPE_MAYBE_RETRY       (0x83 | BIO_TYPE_FILTER)
+#define BIO_TYPE_TLS_DUMP_FILTER (0x80 | BIO_TYPE_FILTER)
+#define BIO_TYPE_MEMPACKET_TEST 0x81
+#define BIO_TYPE_ALWAYS_RETRY 0x82
+#define BIO_TYPE_MAYBE_RETRY (0x83 | BIO_TYPE_FILTER)
 
 static BIO_METHOD *method_tls_dump = NULL;
 static BIO_METHOD *meth_mem = NULL;
@@ -55,7 +55,7 @@ const BIO_METHOD *bio_f_tls_dump_filter(void)
 {
     if (method_tls_dump == NULL) {
         method_tls_dump = BIO_meth_new(BIO_TYPE_TLS_DUMP_FILTER,
-                                        "TLS dump filter");
+            "TLS dump filter");
         if (method_tls_dump == NULL
             || !BIO_meth_set_write(method_tls_dump, tls_dump_write)
             || !BIO_meth_set_read(method_tls_dump, tls_dump_read)
@@ -97,29 +97,28 @@ static void copy_flags(BIO *bio)
     BIO_set_flags(bio, flags);
 }
 
-#define RECORD_CONTENT_TYPE     0
-#define RECORD_VERSION_HI       1
-#define RECORD_VERSION_LO       2
-#define RECORD_EPOCH_HI         3
-#define RECORD_EPOCH_LO         4
-#define RECORD_SEQUENCE_START   5
-#define RECORD_SEQUENCE_END     10
-#define RECORD_LEN_HI           11
-#define RECORD_LEN_LO           12
-
-#define MSG_TYPE                0
-#define MSG_LEN_HI              1
-#define MSG_LEN_MID             2
-#define MSG_LEN_LO              3
-#define MSG_SEQ_HI              4
-#define MSG_SEQ_LO              5
-#define MSG_FRAG_OFF_HI         6
-#define MSG_FRAG_OFF_MID        7
-#define MSG_FRAG_OFF_LO         8
-#define MSG_FRAG_LEN_HI         9
-#define MSG_FRAG_LEN_MID        10
-#define MSG_FRAG_LEN_LO         11
-
+#define RECORD_CONTENT_TYPE 0
+#define RECORD_VERSION_HI 1
+#define RECORD_VERSION_LO 2
+#define RECORD_EPOCH_HI 3
+#define RECORD_EPOCH_LO 4
+#define RECORD_SEQUENCE_START 5
+#define RECORD_SEQUENCE_END 10
+#define RECORD_LEN_HI 11
+#define RECORD_LEN_LO 12
+
+#define MSG_TYPE 0
+#define MSG_LEN_HI 1
+#define MSG_LEN_MID 2
+#define MSG_LEN_LO 3
+#define MSG_SEQ_HI 4
+#define MSG_SEQ_LO 5
+#define MSG_FRAG_OFF_HI 6
+#define MSG_FRAG_OFF_MID 7
+#define MSG_FRAG_OFF_LO 8
+#define MSG_FRAG_LEN_HI 9
+#define MSG_FRAG_LEN_MID 10
+#define MSG_FRAG_LEN_LO 11
 
 static void dump_data(const char *data, int len)
 {
@@ -142,7 +141,7 @@ static void dump_data(const char *data, int len)
         content = rec[RECORD_CONTENT_TYPE];
         printf("** Record Content-type: %d\n", content);
         printf("** Record Version: %02x%02x\n",
-               rec[RECORD_VERSION_HI], rec[RECORD_VERSION_LO]);
+            rec[RECORD_VERSION_HI], rec[RECORD_VERSION_LO]);
         epoch = (rec[RECORD_EPOCH_HI] << 8) | rec[RECORD_EPOCH_LO];
         printf("** Record Epoch: %d\n", epoch);
         printf("** Record Sequence: ");
@@ -159,22 +158,22 @@ static void dump_data(const char *data, int len)
             if (epoch > 0) {
                 printf("**---- HANDSHAKE MESSAGE FRAGMENT ENCRYPTED ----\n");
             } else if (rem < DTLS1_HM_HEADER_LENGTH
-                    || reclen < DTLS1_HM_HEADER_LENGTH) {
+                || reclen < DTLS1_HM_HEADER_LENGTH) {
                 printf("**---- HANDSHAKE MESSAGE FRAGMENT TRUNCATED ----\n");
             } else {
                 printf("*** Message Type: %d\n", rec[MSG_TYPE]);
                 msglen = (rec[MSG_LEN_HI] << 16) | (rec[MSG_LEN_MID] << 8)
-                         | rec[MSG_LEN_LO];
+                    | rec[MSG_LEN_LO];
                 printf("*** Message Length: %d\n", msglen);
                 printf("*** Message sequence: %d\n",
-                       (rec[MSG_SEQ_HI] << 8) | rec[MSG_SEQ_LO]);
+                    (rec[MSG_SEQ_HI] << 8) | rec[MSG_SEQ_LO]);
                 fragoff = (rec[MSG_FRAG_OFF_HI] << 16)
-                          | (rec[MSG_FRAG_OFF_MID] << 8)
-                          | rec[MSG_FRAG_OFF_LO];
+                    | (rec[MSG_FRAG_OFF_MID] << 8)
+                    | rec[MSG_FRAG_OFF_LO];
                 printf("*** Message Fragment offset: %d\n", fragoff);
                 fraglen = (rec[MSG_FRAG_LEN_HI] << 16)
-                          | (rec[MSG_FRAG_LEN_MID] << 8)
-                          | rec[MSG_FRAG_LEN_LO];
+                    | (rec[MSG_FRAG_LEN_MID] << 8)
+                    | rec[MSG_FRAG_LEN_LO];
                 printf("*** Message Fragment len: %d\n", fraglen);
                 if (fragoff + fraglen > msglen)
                     printf("***---- HANDSHAKE MESSAGE FRAGMENT INVALID ----\n");
@@ -253,7 +252,6 @@ static int tls_dump_puts(BIO *bio, const char *str)
     return tls_dump_write(bio, str, strlen(str));
 }
 
-
 struct mempacket_st {
     unsigned char *data;
     int len;
@@ -293,7 +291,7 @@ const BIO_METHOD *bio_s_mempacket_test(void)
 {
     if (meth_mem == NULL) {
         if (!TEST_ptr(meth_mem = BIO_meth_new(BIO_TYPE_MEMPACKET_TEST,
-                                              "Mem Packet Test"))
+                          "Mem Packet Test"))
             || !TEST_true(BIO_meth_set_write(meth_mem, mempacket_test_write))
             || !TEST_true(BIO_meth_set_read(meth_mem, mempacket_test_read))
             || !TEST_true(BIO_meth_set_puts(meth_mem, mempacket_test_puts))
@@ -340,13 +338,13 @@ static int mempacket_test_free(BIO *bio)
 }
 
 /* Record Header values */
-#define EPOCH_HI        3
-#define EPOCH_LO        4
+#define EPOCH_HI 3
+#define EPOCH_LO 4
 #define RECORD_SEQUENCE 10
-#define RECORD_LEN_HI   11
-#define RECORD_LEN_LO   12
+#define RECORD_LEN_HI 11
+#define RECORD_LEN_LO 12
 
-#define STANDARD_PACKET                 0
+#define STANDARD_PACKET 0
 
 static int mempacket_test_read(BIO *bio, char *out, int outl)
 {
@@ -370,7 +368,7 @@ static int mempacket_test_read(BIO *bio, char *out, int outl)
         outl = thispkt->len;
 
     if (thispkt->type != INJECT_PACKET_IGNORE_REC_SEQ
-            && (ctx->injected || ctx->droprec >= 0)) {
+        && (ctx->injected || ctx->droprec >= 0)) {
         /*
          * Overwrite the record sequence number. We strictly number them in
          * the order received. Since we are actually a reliable transport
@@ -394,7 +392,7 @@ static int mempacket_test_read(BIO *bio, char *out, int outl)
             } while (seq > 0);
 
             len = ((rec[RECORD_LEN_HI] << 8) | rec[RECORD_LEN_LO])
-                  + DTLS1_RT_HEADER_LENGTH;
+                + DTLS1_RT_HEADER_LENGTH;
             if (rem < (int)len)
                 return -1;
             if (ctx->droprec == (int)ctx->currrec && ctx->dropepoch == epoch) {
@@ -446,7 +444,7 @@ int mempacket_swap_epoch(BIO *bio)
             return 0;
         epoch = (rec[EPOCH_HI] << 8) | rec[EPOCH_LO];
         len = ((rec[RECORD_LEN_HI] << 8) | rec[RECORD_LEN_LO])
-                + DTLS1_RT_HEADER_LENGTH;
+            + DTLS1_RT_HEADER_LENGTH;
         if (rem < len)
             return 0;
 
@@ -536,15 +534,49 @@ int mempacket_move_packet(BIO *bio, int d, int s)
     return 1;
 }
 
+int mempacket_dup_last_packet(BIO *bio)
+{
+    MEMPACKET_TEST_CTX *ctx = BIO_get_data(bio);
+    MEMPACKET *thispkt, *duppkt;
+    int numpkts = sk_MEMPACKET_num(ctx->pkts);
+
+    /* We can only duplicate a packet if there is at least 1 pending */
+    if (numpkts <= 0)
+        return 0;
+
+    /* Get the last packet */
+    thispkt = sk_MEMPACKET_value(ctx->pkts, numpkts - 1);
+    if (thispkt == NULL)
+        return 0;
+
+    duppkt = OPENSSL_malloc(sizeof(*duppkt));
+    if (duppkt == NULL)
+        return 0;
+
+    *duppkt = *thispkt;
+    duppkt->data = OPENSSL_memdup(thispkt->data, thispkt->len);
+    if (duppkt->data == NULL) {
+        mempacket_free(duppkt);
+        return 0;
+    }
+    duppkt->num++;
+    if (sk_MEMPACKET_insert(ctx->pkts, duppkt, numpkts) <= 0) {
+        mempacket_free(duppkt);
+        return 0;
+    }
+
+    return 1;
+}
+
 int mempacket_test_inject(BIO *bio, const char *in, int inl, int pktnum,
-                          int type)
+    int type)
 {
     MEMPACKET_TEST_CTX *ctx = BIO_get_data(bio);
     MEMPACKET *thispkt = NULL, *looppkt, *nextpkt, *allpkts[3];
     int i, duprec;
     const unsigned char *inu = (const unsigned char *)in;
     size_t len = ((inu[RECORD_LEN_HI] << 8) | inu[RECORD_LEN_LO])
-                 + DTLS1_RT_HEADER_LENGTH;
+        + DTLS1_RT_HEADER_LENGTH;
 
     if (ctx == NULL)
         return -1;
@@ -565,7 +597,7 @@ int mempacket_test_inject(BIO *bio, const char *in, int inl, int pktnum,
     if (pktnum >= 0) {
         if (ctx->noinject)
             return -1;
-        ctx->injected  = 1;
+        ctx->injected = 1;
     } else {
         ctx->noinject = 1;
     }
@@ -618,7 +650,7 @@ int mempacket_test_inject(BIO *bio, const char *in, int inl, int pktnum,
                     ctx->lastpkt++;
                 else
                     return inl;
-            } while(1);
+            } while (1);
         } else if (looppkt->num == thispkt->num) {
             if (!ctx->noinject) {
                 /* We injected two packets with the same packet number! */
@@ -643,7 +675,7 @@ int mempacket_test_inject(BIO *bio, const char *in, int inl, int pktnum,
 
     return inl;
 
- err:
+err:
     for (i = 0; i < (ctx->duprec > 0 ? 3 : 1); i++)
         mempacket_free(allpkts[i]);
     return -1;
@@ -729,21 +761,21 @@ const BIO_METHOD *bio_s_always_retry(void)
 {
     if (meth_always_retry == NULL) {
         if (!TEST_ptr(meth_always_retry = BIO_meth_new(BIO_TYPE_ALWAYS_RETRY,
-                                                       "Always Retry"))
+                          "Always Retry"))
             || !TEST_true(BIO_meth_set_write(meth_always_retry,
-                                             always_retry_write))
+                always_retry_write))
             || !TEST_true(BIO_meth_set_read(meth_always_retry,
-                                            always_retry_read))
+                always_retry_read))
             || !TEST_true(BIO_meth_set_puts(meth_always_retry,
-                                            always_retry_puts))
+                always_retry_puts))
             || !TEST_true(BIO_meth_set_gets(meth_always_retry,
-                                            always_retry_gets))
+                always_retry_gets))
             || !TEST_true(BIO_meth_set_ctrl(meth_always_retry,
-                                            always_retry_ctrl))
+                always_retry_ctrl))
             || !TEST_true(BIO_meth_set_create(meth_always_retry,
-                                              always_retry_new))
+                always_retry_new))
             || !TEST_true(BIO_meth_set_destroy(meth_always_retry,
-                                               always_retry_free)))
+                always_retry_free)))
             return NULL;
     }
     return meth_always_retry;
@@ -829,15 +861,15 @@ const BIO_METHOD *bio_s_maybe_retry(void)
 {
     if (meth_maybe_retry == NULL) {
         if (!TEST_ptr(meth_maybe_retry = BIO_meth_new(BIO_TYPE_MAYBE_RETRY,
-                                                      "Maybe Retry"))
+                          "Maybe Retry"))
             || !TEST_true(BIO_meth_set_write(meth_maybe_retry,
-                                             maybe_retry_write))
+                maybe_retry_write))
             || !TEST_true(BIO_meth_set_ctrl(meth_maybe_retry,
-                                            maybe_retry_ctrl))
+                maybe_retry_ctrl))
             || !TEST_true(BIO_meth_set_create(meth_maybe_retry,
-                                              maybe_retry_new))
+                maybe_retry_new))
             || !TEST_true(BIO_meth_set_destroy(meth_maybe_retry,
-                                               maybe_retry_free)))
+                maybe_retry_free)))
             return NULL;
     }
     return meth_maybe_retry;
@@ -911,9 +943,9 @@ static long maybe_retry_ctrl(BIO *bio, int cmd, long num, void *ptr)
 }
 
 int create_ssl_ctx_pair(OSSL_LIB_CTX *libctx, const SSL_METHOD *sm,
-                        const SSL_METHOD *cm, int min_proto_version,
-                        int max_proto_version, SSL_CTX **sctx, SSL_CTX **cctx,
-                        char *certfile, char *privkeyfile)
+    const SSL_METHOD *cm, int min_proto_version,
+    int max_proto_version, SSL_CTX **sctx, SSL_CTX **cctx,
+    char *certfile, char *privkeyfile)
 {
     SSL_CTX *serverctx = NULL;
     SSL_CTX *clientctx = NULL;
@@ -923,7 +955,7 @@ int create_ssl_ctx_pair(OSSL_LIB_CTX *libctx, const SSL_METHOD *sm,
             serverctx = *sctx;
         else if (!TEST_ptr(serverctx = SSL_CTX_new_ex(libctx, NULL, sm))
             || !TEST_true(SSL_CTX_set_options(serverctx,
-                                              SSL_OP_ALLOW_CLIENT_RENEGOTIATION)))
+                SSL_OP_ALLOW_CLIENT_RENEGOTIATION)))
             goto err;
     }
 
@@ -935,41 +967,43 @@ int create_ssl_ctx_pair(OSSL_LIB_CTX *libctx, const SSL_METHOD *sm,
     }
 
 #if !defined(OPENSSL_NO_TLS1_3) \
-    && defined(OPENSSL_NO_EC) \
+    && defined(OPENSSL_NO_EC)   \
     && defined(OPENSSL_NO_DH)
     /*
      * There are no usable built-in TLSv1.3 groups if ec and dh are both
      * disabled
      */
     if (max_proto_version == 0
-            && (sm == TLS_server_method() || cm == TLS_client_method()))
+        && (sm == TLS_server_method() || cm == TLS_client_method()))
         max_proto_version = TLS1_2_VERSION;
 #endif
 
     if (serverctx != NULL
-            && ((min_proto_version > 0
-                 && !TEST_true(SSL_CTX_set_min_proto_version(serverctx,
-                                                            min_proto_version)))
-                || (max_proto_version > 0
-                    && !TEST_true(SSL_CTX_set_max_proto_version(serverctx,
-                                                                max_proto_version)))))
+        && ((min_proto_version > 0
+                && !TEST_true(SSL_CTX_set_min_proto_version(serverctx,
+                    min_proto_version)))
+            || (max_proto_version > 0
+                && !TEST_true(SSL_CTX_set_max_proto_version(serverctx,
+                    max_proto_version)))))
         goto err;
     if (clientctx != NULL
         && ((min_proto_version > 0
-             && !TEST_true(SSL_CTX_set_min_proto_version(clientctx,
-                                                         min_proto_version)))
+                && !TEST_true(SSL_CTX_set_min_proto_version(clientctx,
+                    min_proto_version)))
             || (max_proto_version > 0
                 && !TEST_true(SSL_CTX_set_max_proto_version(clientctx,
-                                                            max_proto_version)))))
+                    max_proto_version)))))
         goto err;
 
     if (serverctx != NULL && certfile != NULL && privkeyfile != NULL) {
         if (!TEST_int_eq(SSL_CTX_use_certificate_file(serverctx, certfile,
-                                                      SSL_FILETYPE_PEM), 1)
-                || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(serverctx,
-                                                            privkeyfile,
-                                                            SSL_FILETYPE_PEM), 1)
-                || !TEST_int_eq(SSL_CTX_check_private_key(serverctx), 1))
+                             SSL_FILETYPE_PEM),
+                1)
+            || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(serverctx,
+                                privkeyfile,
+                                SSL_FILETYPE_PEM),
+                1)
+            || !TEST_int_eq(SSL_CTX_check_private_key(serverctx), 1))
             goto err;
     }
 
@@ -979,7 +1013,7 @@ int create_ssl_ctx_pair(OSSL_LIB_CTX *libctx, const SSL_METHOD *sm,
         *cctx = clientctx;
     return 1;
 
- err:
+err:
     if (sctx != NULL && *sctx == NULL)
         SSL_CTX_free(serverctx);
     if (cctx != NULL && *cctx == NULL)
@@ -987,7 +1021,7 @@ int create_ssl_ctx_pair(OSSL_LIB_CTX *libctx, const SSL_METHOD *sm,
     return 0;
 }
 
-#define MAXLOOPS    1000000
+#define MAXLOOPS 1000000
 
 #if defined(OSSL_USE_SOCKETS)
 
@@ -1016,31 +1050,31 @@ int create_test_sockets(int *cfdp, int *sfdp, int socktype, BIO_ADDR *saddr)
     socklen_t slen = sizeof(sin);
     int afd = -1, cfd = -1, sfd = -1;
 
-    memset ((char *) &sin, 0, sizeof(sin));
+    memset((char *)&sin, 0, sizeof(sin));
     sin.sin_family = AF_INET;
     sin.sin_addr.s_addr = inet_addr(host);
 
     afd = BIO_socket(AF_INET, socktype,
-                     socktype == SOCK_STREAM ? IPPROTO_TCP : IPPROTO_UDP, 0);
+        socktype == SOCK_STREAM ? IPPROTO_TCP : IPPROTO_UDP, 0);
     if (afd == INVALID_SOCKET)
         return 0;
 
-    if (bind(afd, (struct sockaddr*)&sin, sizeof(sin)) < 0)
+    if (bind(afd, (struct sockaddr *)&sin, sizeof(sin)) < 0)
         goto out;
 
-    if (getsockname(afd, (struct sockaddr*)&sin, &slen) < 0)
+    if (getsockname(afd, (struct sockaddr *)&sin, &slen) < 0)
         goto out;
 
     if (saddr != NULL
-            && !BIO_ADDR_rawmake(saddr, sin.sin_family, &sin.sin_addr,
-                                 sizeof(sin.sin_addr), sin.sin_port))
+        && !BIO_ADDR_rawmake(saddr, sin.sin_family, &sin.sin_addr,
+            sizeof(sin.sin_addr), sin.sin_port))
         goto out;
 
     if (socktype == SOCK_STREAM && listen(afd, 1) < 0)
         goto out;
 
     cfd = BIO_socket(AF_INET, socktype,
-                     socktype == SOCK_STREAM ? IPPROTO_TCP : IPPROTO_UDP, 0);
+        socktype == SOCK_STREAM ? IPPROTO_TCP : IPPROTO_UDP, 0);
     if (cfd == INVALID_SOCKET)
         goto out;
 
@@ -1062,7 +1096,7 @@ int create_test_sockets(int *cfdp, int *sfdp, int socktype, BIO_ADDR *saddr)
         if (sfd == -1 && errno != EAGAIN)
             goto out;
 
-        if (!cfd_connected && connect(cfd, (struct sockaddr*)&sin, sizeof(sin)) < 0)
+        if (!cfd_connected && connect(cfd, (struct sockaddr *)&sin, sizeof(sin)) < 0)
             goto out;
         else
             cfd_connected = 1;
@@ -1087,11 +1121,11 @@ int create_test_sockets(int *cfdp, int *sfdp, int socktype, BIO_ADDR *saddr)
 }
 
 int create_ssl_objects2(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
-                          SSL **cssl, int sfd, int cfd)
+    SSL **cssl, int sfd, int cfd)
 {
     SSL *serverssl = NULL, *clientssl = NULL;
     BIO *s_to_c_bio = NULL, *c_to_s_bio = NULL;
-    BIO_POLL_DESCRIPTOR rdesc = {0}, wdesc = {0};
+    BIO_POLL_DESCRIPTOR rdesc = { 0 }, wdesc = { 0 };
 
     if (*sssl != NULL)
         serverssl = *sssl;
@@ -1103,11 +1137,11 @@ int create_ssl_objects2(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
         goto error;
 
     if (!TEST_ptr(s_to_c_bio = BIO_new_socket(sfd, BIO_NOCLOSE))
-            || !TEST_ptr(c_to_s_bio = BIO_new_socket(cfd, BIO_NOCLOSE)))
+        || !TEST_ptr(c_to_s_bio = BIO_new_socket(cfd, BIO_NOCLOSE)))
         goto error;
 
     if (!TEST_false(SSL_get_rpoll_descriptor(clientssl, &rdesc)
-        || !TEST_false(SSL_get_wpoll_descriptor(clientssl, &wdesc))))
+            || !TEST_false(SSL_get_wpoll_descriptor(clientssl, &wdesc))))
         goto error;
 
     SSL_set_bio(clientssl, c_to_s_bio, c_to_s_bio);
@@ -1133,7 +1167,7 @@ int create_ssl_objects2(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
     *cssl = clientssl;
     return 1;
 
- error:
+error:
     SSL_free(serverssl);
     SSL_free(clientssl);
     BIO_free(s_to_c_bio);
@@ -1154,7 +1188,7 @@ int wait_until_sock_readable(int sock)
  * NOTE: Transfers control of the BIOs - this function will free them on error
  */
 int create_ssl_objects(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
-                          SSL **cssl, BIO *s_to_c_fbio, BIO *c_to_s_fbio)
+    SSL **cssl, BIO *s_to_c_fbio, BIO *c_to_s_fbio)
 {
     SSL *serverssl = NULL, *clientssl = NULL;
     BIO *s_to_c_bio = NULL, *c_to_s_bio = NULL;
@@ -1170,19 +1204,19 @@ int create_ssl_objects(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
 
     if (SSL_is_dtls(clientssl)) {
         if (!TEST_ptr(s_to_c_bio = BIO_new(bio_s_mempacket_test()))
-                || !TEST_ptr(c_to_s_bio = BIO_new(bio_s_mempacket_test())))
+            || !TEST_ptr(c_to_s_bio = BIO_new(bio_s_mempacket_test())))
             goto error;
     } else {
         if (!TEST_ptr(s_to_c_bio = BIO_new(BIO_s_mem()))
-                || !TEST_ptr(c_to_s_bio = BIO_new(BIO_s_mem())))
+            || !TEST_ptr(c_to_s_bio = BIO_new(BIO_s_mem())))
             goto error;
     }
 
     if (s_to_c_fbio != NULL
-            && !TEST_ptr(s_to_c_bio = BIO_push(s_to_c_fbio, s_to_c_bio)))
+        && !TEST_ptr(s_to_c_bio = BIO_push(s_to_c_fbio, s_to_c_bio)))
         goto error;
     if (c_to_s_fbio != NULL
-            && !TEST_ptr(c_to_s_bio = BIO_push(c_to_s_fbio, c_to_s_bio)))
+        && !TEST_ptr(c_to_s_bio = BIO_push(c_to_s_fbio, c_to_s_bio)))
         goto error;
 
     /* Set Non-blocking IO behaviour */
@@ -1203,7 +1237,7 @@ int create_ssl_objects(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
     *cssl = clientssl;
     return 1;
 
- error:
+error:
     SSL_free(serverssl);
     SSL_free(clientssl);
     BIO_free(s_to_c_bio);
@@ -1224,12 +1258,13 @@ int create_ssl_objects(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
  * has SSL_get_error() return the value in the |want| parameter. The connection
  * attempt could be restarted by a subsequent call to this function.
  */
-int create_bare_ssl_connection(SSL *serverssl, SSL *clientssl, int want,
-                               int read, int listen)
+int create_bare_ssl_connection_ex(SSL *serverssl, SSL *clientssl, int want,
+    int read, int listen, int *cm_count, int *sm_count)
 {
     int retc = -1, rets = -1, err, abortctr = 0, ret = 0;
     int clienterr = 0, servererr = 0;
     int isdtls = SSL_is_dtls(serverssl);
+    int icm_count = 0, ism_count = 0;
 #ifndef OPENSSL_NO_SOCK
     BIO_ADDR *peer = NULL;
 
@@ -1255,6 +1290,7 @@ int create_bare_ssl_connection(SSL *serverssl, SSL *clientssl, int want,
             retc = SSL_connect(clientssl);
             if (retc <= 0)
                 err = SSL_get_error(clientssl, retc);
+            icm_count++;
         }
 
         if (!clienterr && retc <= 0 && err != SSL_ERROR_WANT_READ) {
@@ -1280,18 +1316,20 @@ int create_bare_ssl_connection(SSL *serverssl, SSL *clientssl, int want,
                     listen = 0;
                     rets = 0;
                 }
+                ism_count++;
             } else
 #endif
             {
                 rets = SSL_accept(serverssl);
                 if (rets <= 0)
                     err = SSL_get_error(serverssl, rets);
+                ism_count++;
             }
         }
 
         if (!servererr && rets <= 0
-                && err != SSL_ERROR_WANT_READ
-                && err != SSL_ERROR_WANT_X509_LOOKUP) {
+            && err != SSL_ERROR_WANT_READ
+            && err != SSL_ERROR_WANT_X509_LOOKUP) {
             TEST_info("SSL_accept() failed %d, %d", rets, err);
             if (want != SSL_ERROR_SSL)
                 TEST_openssl_errors();
@@ -1311,6 +1349,7 @@ int create_bare_ssl_connection(SSL *serverssl, SSL *clientssl, int want,
                     TEST_info("Unexpected SSL_read() success!");
                     goto err;
                 }
+                ism_count++;
             }
             if (retc > 0 && rets <= 0) {
                 if (SSL_read(clientssl, buf, sizeof(buf)) > 0) {
@@ -1318,6 +1357,7 @@ int create_bare_ssl_connection(SSL *serverssl, SSL *clientssl, int want,
                     TEST_info("Unexpected SSL_read() success!");
                     goto err;
                 }
+                icm_count++;
             }
         }
         if (++abortctr == MAXLOOPS) {
@@ -1332,27 +1372,40 @@ int create_bare_ssl_connection(SSL *serverssl, SSL *clientssl, int want,
              */
             OSSL_sleep(50);
         }
-    } while (retc <=0 || rets <= 0);
+    } while (retc <= 0 || rets <= 0);
 
     ret = 1;
- err:
+err:
+    if (cm_count != NULL)
+        *cm_count = icm_count;
+    if (sm_count != NULL)
+        *sm_count = ism_count;
 #ifndef OPENSSL_NO_SOCK
     BIO_ADDR_free(peer);
 #endif
     return ret;
 }
 
+int create_bare_ssl_connection(SSL *serverssl, SSL *clientssl, int want,
+    int read, int listen)
+{
+    return create_bare_ssl_connection_ex(serverssl, clientssl, want, read,
+        listen, NULL, NULL);
+}
+
 /*
  * Create an SSL connection including any post handshake NewSessionTicket
  * messages.
  */
-int create_ssl_connection(SSL *serverssl, SSL *clientssl, int want)
+int create_ssl_connection_ex(SSL *serverssl, SSL *clientssl, int want,
+    int *cm_count, int *sm_count)
 {
     int i;
     unsigned char buf;
     size_t readbytes;
 
-    if (!create_bare_ssl_connection(serverssl, clientssl, want, 1, 0))
+    if (!create_bare_ssl_connection_ex(serverssl, clientssl, want, 1, 0,
+            cm_count, sm_count))
         return 0;
 
     /*
@@ -1365,14 +1418,21 @@ int create_ssl_connection(SSL *serverssl, SSL *clientssl, int want)
             if (!TEST_ulong_eq(readbytes, 0))
                 return 0;
         } else if (!TEST_int_eq(SSL_get_error(clientssl, 0),
-                                SSL_ERROR_WANT_READ)) {
+                       SSL_ERROR_WANT_READ)) {
             return 0;
         }
+        if (cm_count != NULL)
+            (*cm_count)++;
     }
 
     return 1;
 }
 
+int create_ssl_connection(SSL *serverssl, SSL *clientssl, int want)
+{
+    return create_ssl_connection_ex(serverssl, clientssl, want, NULL, NULL);
+}
+
 void shutdown_ssl_connection(SSL *serverssl, SSL *clientssl)
 {
     SSL_shutdown(clientssl);
@@ -1407,12 +1467,12 @@ SSL_SESSION *create_a_psk(SSL *ssl, size_t mdsize)
     }
     sess = SSL_SESSION_new();
     if (!TEST_ptr(sess)
-            || !TEST_ptr(cipher)
-            || !TEST_true(SSL_SESSION_set1_master_key(sess, key, mdsize))
-            || !TEST_true(SSL_SESSION_set_cipher(sess, cipher))
-            || !TEST_true(
-                    SSL_SESSION_set_protocol_version(sess,
-                                                     TLS1_3_VERSION))) {
+        || !TEST_ptr(cipher)
+        || !TEST_true(SSL_SESSION_set1_master_key(sess, key, mdsize))
+        || !TEST_true(SSL_SESSION_set_cipher(sess, cipher))
+        || !TEST_true(
+            SSL_SESSION_set_protocol_version(sess,
+                TLS1_3_VERSION))) {
         SSL_SESSION_free(sess);
         return NULL;
     }
@@ -1422,7 +1482,7 @@ SSL_SESSION *create_a_psk(SSL *ssl, size_t mdsize)
 #define NUM_EXTRA_CERTS 40
 
 int ssl_ctx_add_large_cert_chain(OSSL_LIB_CTX *libctx, SSL_CTX *sctx,
-                                 const char *cert_file)
+    const char *cert_file)
 {
     BIO *certbio = NULL;
     X509 *chaincert = NULL;
@@ -1449,8 +1509,7 @@ int ssl_ctx_add_large_cert_chain(OSSL_LIB_CTX *libctx, SSL_CTX *sctx,
      * test we need to have a message larger than that.
      */
     certlen = i2d_X509(chaincert, NULL);
-    OPENSSL_assert(certlen * NUM_EXTRA_CERTS >
-                   (SSL3_RT_MAX_PLAIN_LENGTH * 4) / 3);
+    OPENSSL_assert(certlen * NUM_EXTRA_CERTS > (SSL3_RT_MAX_PLAIN_LENGTH * 4) / 3);
     for (i = 0; i < NUM_EXTRA_CERTS; i++) {
         if (!X509_up_ref(chaincert))
             goto end;
@@ -1461,7 +1520,7 @@ int ssl_ctx_add_large_cert_chain(OSSL_LIB_CTX *libctx, SSL_CTX *sctx,
     }
 
     ret = 1;
- end:
+end:
     BIO_free(certbio);
     X509_free(chaincert);
     return ret;
diff --git a/test/helpers/ssltestlib.h b/test/helpers/ssltestlib.h
index 5369bb6e92501..7db8fd3248c5b 100644
--- a/test/helpers/ssltestlib.h
+++ b/test/helpers/ssltestlib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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
@@ -8,12 +8,12 @@
  */
 
 #ifndef OSSL_TEST_SSLTESTLIB_H
-# define OSSL_TEST_SSLTESTLIB_H
+#define OSSL_TEST_SSLTESTLIB_H
 
-# include <openssl/ssl.h>
+#include <openssl/ssl.h>
 
-#define TLS13_AES_128_GCM_SHA256_BYTES  ((const unsigned char *)"\x13\x01")
-#define TLS13_AES_256_GCM_SHA384_BYTES  ((const unsigned char *)"\x13\x02")
+#define TLS13_AES_128_GCM_SHA256_BYTES ((const unsigned char *)"\x13\x01")
+#define TLS13_AES_256_GCM_SHA384_BYTES ((const unsigned char *)"\x13\x02")
 #define TLS13_CHACHA20_POLY1305_SHA256_BYTES ((const unsigned char *)"\x13\x03")
 #define TLS13_AES_128_CCM_SHA256_BYTES ((const unsigned char *)"\x13\x04")
 #define TLS13_AES_128_CCM_8_SHA256_BYTES ((const unsigned char *)"\x13\05")
@@ -21,18 +21,22 @@
 #define TLS13_SHA384_SHA384_BYTES ((const unsigned char *)"\xC0\xB5")
 
 int create_ssl_ctx_pair(OSSL_LIB_CTX *libctx, const SSL_METHOD *sm,
-                        const SSL_METHOD *cm, int min_proto_version,
-                        int max_proto_version, SSL_CTX **sctx, SSL_CTX **cctx,
-                        char *certfile, char *privkeyfile);
+    const SSL_METHOD *cm, int min_proto_version,
+    int max_proto_version, SSL_CTX **sctx, SSL_CTX **cctx,
+    char *certfile, char *privkeyfile);
 int create_ssl_objects(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
-                       SSL **cssl, BIO *s_to_c_fbio, BIO *c_to_s_fbio);
+    SSL **cssl, BIO *s_to_c_fbio, BIO *c_to_s_fbio);
 int create_bare_ssl_connection(SSL *serverssl, SSL *clientssl, int want,
-                               int read, int listen);
+    int read, int listen);
+int create_bare_ssl_connection_ex(SSL *serverssl, SSL *clientssl, int want,
+    int read, int listen, int *cm_count, int *sm_count);
 int create_ssl_objects2(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl,
-                       SSL **cssl, int sfd, int cfd);
+    SSL **cssl, int sfd, int cfd);
 int wait_until_sock_readable(int sock);
 int create_test_sockets(int *cfdp, int *sfdp, int socktype, BIO_ADDR *saddr);
 int create_ssl_connection(SSL *serverssl, SSL *clientssl, int want);
+int create_ssl_connection_ex(SSL *serverssl, SSL *clientssl, int want,
+    int *cm_count, int *sm_count);
 void shutdown_ssl_connection(SSL *serverssl, SSL *clientssl);
 
 /* Note: Not thread safe! */
@@ -50,28 +54,29 @@ void set_always_retry_err_val(int err);
  * Maybe retry BIO ctrls. We make them large enough to not clash with standard
  * BIO ctrl codes.
  */
-#define MAYBE_RETRY_CTRL_SET_RETRY_AFTER_CNT       (1 << 15)
+#define MAYBE_RETRY_CTRL_SET_RETRY_AFTER_CNT (1 << 15)
 
 const BIO_METHOD *bio_s_maybe_retry(void);
 void bio_s_maybe_retry_free(void);
 
 /* Packet types - value 0 is reserved */
-#define INJECT_PACKET                   1
-#define INJECT_PACKET_IGNORE_REC_SEQ    2
+#define INJECT_PACKET 1
+#define INJECT_PACKET_IGNORE_REC_SEQ 2
 
 /*
  * Mempacket BIO ctrls. We make them large enough to not clash with standard BIO
  * ctrl codes.
  */
-#define MEMPACKET_CTRL_SET_DROP_EPOCH       (1 << 15)
-#define MEMPACKET_CTRL_SET_DROP_REC         (2 << 15)
-#define MEMPACKET_CTRL_GET_DROP_REC         (3 << 15)
-#define MEMPACKET_CTRL_SET_DUPLICATE_REC    (4 << 15)
+#define MEMPACKET_CTRL_SET_DROP_EPOCH (1 << 15)
+#define MEMPACKET_CTRL_SET_DROP_REC (2 << 15)
+#define MEMPACKET_CTRL_GET_DROP_REC (3 << 15)
+#define MEMPACKET_CTRL_SET_DUPLICATE_REC (4 << 15)
 
 int mempacket_swap_epoch(BIO *bio);
 int mempacket_move_packet(BIO *bio, int d, int s);
+int mempacket_dup_last_packet(BIO *bio);
 int mempacket_test_inject(BIO *bio, const char *in, int inl, int pktnum,
-                          int type);
+    int type);
 
 typedef struct mempacket_st MEMPACKET;
 
@@ -81,7 +86,7 @@ SSL_SESSION *create_a_psk(SSL *ssl, size_t mdsize);
 
 /* Add cert from `cert_file` multiple times to create large extra cert chain */
 int ssl_ctx_add_large_cert_chain(OSSL_LIB_CTX *libctx, SSL_CTX *sctx,
-                                 const char *cert_file);
+    const char *cert_file);
 
 ENGINE *load_dasync(void);
 
diff --git a/test/hexstr_test.c b/test/hexstr_test.c
index 7f3bd505b7d68..8ac93823ec01a 100644
--- a/test/hexstr_test.c
+++ b/test/hexstr_test.c
@@ -29,32 +29,38 @@ static const unsigned char test_2[] = { 0xAB, 0xCD, 0xEF, 0x76, 0x00 };
 static struct testdata tbl_testdata[] = {
     {
         "AB:CD:EF:F1",
-        test_1, sizeof(test_1),
+        test_1,
+        sizeof(test_1),
         ':',
     },
     {
         "AB:CD:EF:76:00",
-        test_2, sizeof(test_2),
+        test_2,
+        sizeof(test_2),
         ':',
     },
     {
         "AB_CD_EF_F1",
-        test_1, sizeof(test_1),
+        test_1,
+        sizeof(test_1),
         '_',
     },
     {
         "AB_CD_EF_76_00",
-        test_2, sizeof(test_2),
+        test_2,
+        sizeof(test_2),
         '_',
     },
     {
         "ABCDEFF1",
-        test_1, sizeof(test_1),
+        test_1,
+        sizeof(test_1),
         '\0',
     },
     {
         "ABCDEF7600",
-        test_2, sizeof(test_2),
+        test_2,
+        sizeof(test_2),
         '\0',
     },
 };
@@ -71,7 +77,7 @@ static int test_hexstr_sep_to_from(int test_index)
         || !TEST_mem_eq(buf, len, test->expected, test->expected_len)
         || !TEST_ptr(out = ossl_buf2hexstr_sep(buf, len, test->sep))
         || !TEST_str_eq(out, test->in))
-       goto err;
+        goto err;
 
     ret = 1;
 err:
@@ -92,7 +98,7 @@ static int test_hexstr_to_from(int test_index)
         if (!TEST_ptr(buf = OPENSSL_hexstr2buf(test->in, &len))
             || !TEST_mem_eq(buf, len, test->expected, test->expected_len)
             || !TEST_ptr(out = OPENSSL_buf2hexstr(buf, len)))
-           goto err;
+            goto err;
         if (test->sep == ':') {
             if (!TEST_str_eq(out, test->in))
                 goto err;
@@ -118,15 +124,15 @@ static int test_hexstr_ex_to_from(int test_index)
     struct testdata *test = &tbl_testdata[test_index];
 
     return TEST_true(OPENSSL_hexstr2buf_ex(buf, sizeof(buf), &len, test->in, ':'))
-           && TEST_mem_eq(buf, len, test->expected, test->expected_len)
-           && TEST_false(OPENSSL_buf2hexstr_ex(out, 3 * len - 1, NULL, buf, len,
-                                               ':'))
-           && TEST_true(OPENSSL_buf2hexstr_ex(out, sizeof(out), NULL, buf, len,
-                                              ':'))
-           && TEST_str_eq(out, test->in)
-           && TEST_true(OPENSSL_buf2hexstr_ex(out, sizeof(out), NULL, buf, 0,
-                                              ':'))
-           && TEST_size_t_eq(strlen(out), 0);
+        && TEST_mem_eq(buf, len, test->expected, test->expected_len)
+        && TEST_false(OPENSSL_buf2hexstr_ex(out, 3 * len - 1, NULL, buf, len,
+            ':'))
+        && TEST_true(OPENSSL_buf2hexstr_ex(out, sizeof(out), NULL, buf, len,
+            ':'))
+        && TEST_str_eq(out, test->in)
+        && TEST_true(OPENSSL_buf2hexstr_ex(out, sizeof(out), NULL, buf, 0,
+            ':'))
+        && TEST_size_t_eq(strlen(out), 0);
 }
 
 int setup_tests(void)
diff --git a/test/hmactest.c b/test/hmactest.c
index 28aba7f6309ac..d3ae8955d8783 100644
--- a/test/hmactest.c
+++ b/test/hmactest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -19,19 +19,19 @@
 
 #include "internal/nelem.h"
 
-# include <openssl/hmac.h>
-# include <openssl/sha.h>
-# ifndef OPENSSL_NO_MD5
-#  include <openssl/md5.h>
-# endif
+#include <openssl/hmac.h>
+#include <openssl/sha.h>
+#ifndef OPENSSL_NO_MD5
+#include <openssl/md5.h>
+#endif
 
-# ifdef CHARSET_EBCDIC
-#  include <openssl/ebcdic.h>
-# endif
+#ifdef CHARSET_EBCDIC
+#include <openssl/ebcdic.h>
+#endif
 
 #include "testutil.h"
 
-# ifndef OPENSSL_NO_MD5
+#ifndef OPENSSL_NO_MD5
 static struct test_st {
     const char key[16];
     int key_len;
@@ -40,69 +40,69 @@ static struct test_st {
     const char *digest;
 } test[8] = {
     {
-        "", 0, "More text test vectors to stuff up EBCDIC machines :-)", 54,
+        "",
+        0,
+        "More text test vectors to stuff up EBCDIC machines :-)",
+        54,
         "e9139d1e6ee064ef8cf514fc7dc83e86",
     },
     {
         "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
-        16, "Hi There", 8,
+        16,
+        "Hi There",
+        8,
         "9294727a3638bb1c13f48ef8158bfc9d",
     },
     {
-        "Jefe", 4, "what do ya want for nothing?", 28,
+        "Jefe",
+        4,
+        "what do ya want for nothing?",
+        28,
         "750c783e6ab0b503eaa86e310a5db738",
     },
     {
         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",
-        16, {
-            0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+        16,
+        { 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
             0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
             0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
             0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-            0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd
-        }, 50, "56be34521d144c88dbb8c733f0e8b3f6",
-    },
-    {
-        "", 0, "My test data", 12,
-        "61afdecb95429ef494d61fdee15990cabf0826fc"
+            0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd },
+        50,
+        "56be34521d144c88dbb8c733f0e8b3f6",
     },
-    {
-        "", 0, "My test data", 12,
-        "2274b195d90ce8e03406f4b526a47e0787a88a65479938f1a5baa3ce0f079776"
-    },
-    {
-        "123456", 6, "My test data", 12,
-        "bab53058ae861a7f191abe2d0145cbb123776a6369ee3f9d79ce455667e411dd"
-    },
-    {
-        "12345", 5, "My test data again", 18,
-        "a12396ceddd2a85f4c656bc1e0aa50c78cffde3e"
-    }
+    { "", 0, "My test data", 12,
+        "61afdecb95429ef494d61fdee15990cabf0826fc" },
+    { "", 0, "My test data", 12,
+        "2274b195d90ce8e03406f4b526a47e0787a88a65479938f1a5baa3ce0f079776" },
+    { "123456", 6, "My test data", 12,
+        "bab53058ae861a7f191abe2d0145cbb123776a6369ee3f9d79ce455667e411dd" },
+    { "12345", 5, "My test data again", 18,
+        "a12396ceddd2a85f4c656bc1e0aa50c78cffde3e" }
 };
-# endif
+#endif
 
 static char *pt(unsigned char *md, unsigned int len);
 
-
-# ifndef OPENSSL_NO_MD5
+#ifndef OPENSSL_NO_MD5
 static int test_hmac_md5(int idx)
 {
     char *p;
-#  ifdef CHARSET_EBCDIC
+#ifdef CHARSET_EBCDIC
     ebcdic2ascii(test[0].data, test[0].data, test[0].data_len);
     ebcdic2ascii(test[1].data, test[1].data, test[1].data_len);
     ebcdic2ascii(test[2].key, test[2].key, test[2].key_len);
     ebcdic2ascii(test[2].data, test[2].data, test[2].data_len);
-#  endif
+#endif
 
     p = pt(HMAC(EVP_md5(),
-                test[idx].key, test[idx].key_len,
-                test[idx].data, test[idx].data_len, NULL, NULL),
-                MD5_DIGEST_LENGTH);
+               test[idx].key, test[idx].key_len,
+               test[idx].data, test[idx].data_len, NULL, NULL),
+        MD5_DIGEST_LENGTH);
 
     return TEST_ptr(p) && TEST_str_eq(p, test[idx].digest);
 }
-# endif
+#endif
 
 static int test_hmac_bad(void)
 {
@@ -200,20 +200,43 @@ static int test_hmac_run(void)
     return ret;
 }
 
-
 static int test_hmac_single_shot(void)
 {
     char *p;
 
     /* Test single-shot with NULL key. */
     p = pt(HMAC(EVP_sha1(), NULL, 0, test[4].data, test[4].data_len,
-                NULL, NULL), SHA_DIGEST_LENGTH);
+               NULL, NULL),
+        SHA_DIGEST_LENGTH);
     if (!TEST_ptr(p) || !TEST_str_eq(p, test[4].digest))
         return 0;
 
     return 1;
 }
 
+/* https://github.com/openssl/openssl/issues/13210 */
+static int test_hmac_final_update_fail(void)
+{
+    HMAC_CTX *ctx = NULL;
+    unsigned char buf[EVP_MAX_MD_SIZE];
+    unsigned int len;
+    int ret = 0;
+
+    /* HMAC_Update() after HMAC_Final() must return an error. */
+    if (!TEST_ptr(ctx = HMAC_CTX_new()))
+        goto err;
+    if (!TEST_true(HMAC_Init_ex(ctx, test[5].key, test[5].key_len, EVP_sha256(), NULL))
+        || !TEST_true(HMAC_Update(ctx, test[5].data, test[5].data_len))
+        || !TEST_true(HMAC_Final(ctx, buf, &len))
+        || !TEST_false(HMAC_Update(ctx, test[5].data, test[5].data_len))
+        || !TEST_false(HMAC_Final(ctx, buf, &len)))
+        goto err;
+
+    ret = 1;
+err:
+    HMAC_CTX_free(ctx);
+    return ret;
+}
 
 static int test_hmac_copy(void)
 {
@@ -247,19 +270,19 @@ static int test_hmac_copy(void)
 
 static int test_hmac_copy_uninited(void)
 {
-    const unsigned char key[24] = {0};
-    const unsigned char ct[166] = {0};
+    const unsigned char key[24] = { 0 };
+    const unsigned char ct[166] = { 0 };
     EVP_PKEY *pkey = NULL;
     EVP_MD_CTX *ctx = NULL;
     EVP_MD_CTX *ctx_tmp = NULL;
     int res = 0;
 
     if (!TEST_ptr(ctx = EVP_MD_CTX_new())
-            || !TEST_ptr(pkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, NULL,
-                                                     key, sizeof(key)))
-            || !TEST_true(EVP_DigestSignInit(ctx, NULL, EVP_sha1(), NULL, pkey))
-            || !TEST_ptr(ctx_tmp = EVP_MD_CTX_new())
-            || !TEST_true(EVP_MD_CTX_copy(ctx_tmp, ctx)))
+        || !TEST_ptr(pkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, NULL,
+                         key, sizeof(key)))
+        || !TEST_true(EVP_DigestSignInit(ctx, NULL, EVP_sha1(), NULL, pkey))
+        || !TEST_ptr(ctx_tmp = EVP_MD_CTX_new())
+        || !TEST_true(EVP_MD_CTX_copy(ctx_tmp, ctx)))
         goto err;
     EVP_MD_CTX_free(ctx);
     ctx = ctx_tmp;
@@ -268,7 +291,7 @@ static int test_hmac_copy_uninited(void)
     if (!TEST_true(EVP_DigestSignUpdate(ctx, ct, sizeof(ct))))
         goto err;
     res = 1;
- err:
+err:
     EVP_MD_CTX_free(ctx);
     EVP_MD_CTX_free(ctx_tmp);
     EVP_PKEY_free(pkey);
@@ -276,7 +299,7 @@ static int test_hmac_copy_uninited(void)
 }
 
 #ifndef OPENSSL_NO_MD5
-# define OSSL_HEX_CHARS_PER_BYTE 2
+#define OSSL_HEX_CHARS_PER_BYTE 2
 static char *pt(unsigned char *md, unsigned int len)
 {
     unsigned int i;
@@ -286,7 +309,7 @@ static char *pt(unsigned char *md, unsigned int len)
         return NULL;
     for (i = 0; i < len && (i + 1) * OSSL_HEX_CHARS_PER_BYTE < sizeof(buf); i++)
         BIO_snprintf(buf + i * OSSL_HEX_CHARS_PER_BYTE,
-                     OSSL_HEX_CHARS_PER_BYTE + 1, "%02x", md[i]);
+            OSSL_HEX_CHARS_PER_BYTE + 1, "%02x", md[i]);
     return buf;
 }
 #endif
@@ -299,88 +322,68 @@ static struct test_chunks_st {
     int chunk_size[10];
     const char *digest;
 } test_chunks[12] = {
-    {
-        "SHA224",
+    { "SHA224",
         "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", 64,
         4, { 1, 50, 200, 4000 },
-        "40821a39dd54f01443b3f96b9370a15023fbdd819a074ffc4b703c77"
-    },
-    {
-        "SHA224",
+        "40821a39dd54f01443b3f96b9370a15023fbdd819a074ffc4b703c77" },
+    { "SHA224",
         "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
         "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
-        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", 192,
+        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
+        192,
         10, { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 },
-        "55ffa85e53e9a68f41c8d653c60b4ada9566d22aed3811834882661c"
-    },
-    {
-        "SHA224", "0123456789abcdef0123456789abcdef", 32,
+        "55ffa85e53e9a68f41c8d653c60b4ada9566d22aed3811834882661c" },
+    { "SHA224", "0123456789abcdef0123456789abcdef", 32,
         4, { 100, 4096, 100, 3896 },
-        "0fd18e7d8e974f401b29bf0502a71f6a9b77804e9191380ce9f48377"
-    },
-    {
-        "SHA256",
+        "0fd18e7d8e974f401b29bf0502a71f6a9b77804e9191380ce9f48377" },
+    { "SHA256",
         "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", 64,
         4, { 1, 50, 200, 4000 },
-        "f67a46fa77c66d3ea5b3ffb9a10afb3e501eaadd16b15978fdee9f014a782140"
-    },
-    {
-        "SHA256",
+        "f67a46fa77c66d3ea5b3ffb9a10afb3e501eaadd16b15978fdee9f014a782140" },
+    { "SHA256",
         "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
         "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
-        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", 192,
+        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
+        192,
         10, { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 },
-        "21a6f61ed6dbec30b58557a80988ff610d69b50b2e96d75863ab50f99da58c9d"
-    },
-    {
-        "SHA256", "0123456789abcdef0123456789abcdef", 32,
+        "21a6f61ed6dbec30b58557a80988ff610d69b50b2e96d75863ab50f99da58c9d" },
+    { "SHA256", "0123456789abcdef0123456789abcdef", 32,
         4, { 100, 4096, 100, 3896 },
-        "7bfd45c1bdde9b79244816b0aea0a67ea954a182e74c60410bfbc1fdc4842660"
-    },
-    {
-        "SHA384",
+        "7bfd45c1bdde9b79244816b0aea0a67ea954a182e74c60410bfbc1fdc4842660" },
+    { "SHA384",
         "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", 64,
         4, { 1, 50, 200, 4000 },
         "e270e3c8ca3f2796a0c29cc7569fcec7584b04db26da64326aca0d17bd7731de"
-        "938694b273f3dafe6e2dc123cde26640"
-    },
-    {
-        "SHA384",
+        "938694b273f3dafe6e2dc123cde26640" },
+    { "SHA384",
         "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
         "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
-        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", 192,
+        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
+        192,
         10, { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 },
         "7036fd7d251298975acd18938471243e92fffe67be158f16c910c400576592d2"
-        "618c3c077ef25d703312668bd2d813ff"
-    },
-    {
-        "SHA384", "0123456789abcdef0123456789abcdef", 32,
+        "618c3c077ef25d703312668bd2d813ff" },
+    { "SHA384", "0123456789abcdef0123456789abcdef", 32,
         4, { 100, 8192, 100, 8092 },
         "0af8224145bd0812d2e34ba1f980ed4d218461271a54cce75dc43d36eda01e4e"
-        "ff4299c1ebf533a7ae636fa3e6aff903"
-    },
-    {
-        "SHA512",
+        "ff4299c1ebf533a7ae636fa3e6aff903" },
+    { "SHA512",
         "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", 64,
         4, { 1, 50, 200, 4000 },
         "4016e960e2342553d4b9d34fb57355ab8b7f33af5dc2676fc1189e94b38f2b2c"
-        "a0ec8dc3c8b95fb1109d58480cea1e8f88e02f34ad79b303e4809373c46c1b16"
-    },
-    {
-        "SHA512",
+        "a0ec8dc3c8b95fb1109d58480cea1e8f88e02f34ad79b303e4809373c46c1b16" },
+    { "SHA512",
         "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
         "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
-        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", 192,
+        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
+        192,
         10, { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 },
         "7ceb6a421fc19434bcb7ec9c8a15ea524dbfb896c24f5f517513f06597de99b1"
-        "918eb6b2472e52215ec7d1b5544766f79ff6ac6d1eb456f19a93819fa2d43c29"
-    },
-    {
-        "SHA512", "0123456789abcdef0123456789abcdef", 32,
+        "918eb6b2472e52215ec7d1b5544766f79ff6ac6d1eb456f19a93819fa2d43c29" },
+    { "SHA512", "0123456789abcdef0123456789abcdef", 32,
         4, { 100, 8192, 100, 8092 },
         "cebf722ffdff5f0e4cbfbd480cd086101d4627d30d42f1f7cf21c43251018069"
-        "854d8e030b5a54cec1e2245d5b4629ff928806d4eababb427d751ec7c274047f"
-    },
+        "854d8e030b5a54cec1e2245d5b4629ff928806d4eababb427d751ec7c274047f" },
 };
 
 static int test_hmac_chunks(int idx)
@@ -400,11 +403,11 @@ static int test_hmac_chunks(int idx)
 
 #ifdef CHARSET_EBCDIC
     ebcdic2ascii(test_chunks[idx].key, test_chunks[idx].key,
-                 test_chunks[idx].key_len);
+        test_chunks[idx].key_len);
 #endif
 
     if (!TEST_true(HMAC_Init_ex(ctx, test_chunks[idx].key,
-                                test_chunks[idx].key_len, md, NULL)))
+            test_chunks[idx].key_len, md, NULL)))
         goto err;
 
     for (i = 0; i < test_chunks[idx].chunks; i++) {
@@ -435,10 +438,10 @@ int setup_tests(void)
     ADD_TEST(test_hmac_single_shot);
     ADD_TEST(test_hmac_bad);
     ADD_TEST(test_hmac_run);
+    ADD_TEST(test_hmac_final_update_fail);
     ADD_TEST(test_hmac_copy);
     ADD_TEST(test_hmac_copy_uninited);
     ADD_ALL_TESTS(test_hmac_chunks,
-                  sizeof(test_chunks) / sizeof(struct test_chunks_st));
+        sizeof(test_chunks) / sizeof(struct test_chunks_st));
     return 1;
 }
-
diff --git a/test/hpke_test.c b/test/hpke_test.c
index ca065144f7d75..b223193858b8e 100644
--- a/test/hpke_test.c
+++ b/test/hpke_test.c
@@ -71,7 +71,7 @@ typedef struct {
  * @return 1 for good, 0 for bad
  */
 static int cmpkey(const EVP_PKEY *pkey,
-                  const unsigned char *pub, size_t publen)
+    const unsigned char *pub, size_t publen)
 {
     unsigned char pubbuf[256];
     size_t pubbuflen = 0;
@@ -80,8 +80,8 @@ static int cmpkey(const EVP_PKEY *pkey,
     if (!TEST_true(publen <= sizeof(pubbuf)))
         return 0;
     erv = EVP_PKEY_get_octet_string_param(pkey,
-                                          OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
-                                          pubbuf, sizeof(pubbuf), &pubbuflen);
+        OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY,
+        pubbuf, sizeof(pubbuf), &pubbuflen);
     if (!TEST_true(erv))
         return 0;
     if (pub != NULL && !TEST_mem_eq(pubbuf, pubbuflen, pub, publen))
@@ -90,8 +90,8 @@ static int cmpkey(const EVP_PKEY *pkey,
 }
 
 static int do_testhpke(const TEST_BASEDATA *base,
-                       const TEST_AEADDATA *aead, size_t aeadsz,
-                       const TEST_EXPORTDATA *export, size_t exportsz)
+    const TEST_AEADDATA *aead, size_t aeadsz,
+    const TEST_EXPORTDATA *export, size_t exportsz)
 {
     OSSL_LIB_CTX *libctx = testctx;
     const char *propq = testpropq;
@@ -116,13 +116,13 @@ static int do_testhpke(const TEST_BASEDATA *base,
     uint64_t lastseq = 0;
 
     if (!TEST_true(OSSL_HPKE_keygen(base->suite, pub, &publen, &privE,
-                                    base->ikmE, base->ikmElen, libctx, propq)))
+            base->ikmE, base->ikmElen, libctx, propq)))
         goto end;
     if (!TEST_true(cmpkey(privE, base->expected_pkEm, base->expected_pkEmlen)))
         goto end;
     if (!TEST_ptr(sealctx = OSSL_HPKE_CTX_new(base->mode, base->suite,
-                                              OSSL_HPKE_ROLE_SENDER,
-                                              libctx, propq)))
+                      OSSL_HPKE_ROLE_SENDER,
+                      libctx, propq)))
         goto end;
     if (!TEST_true(OSSL_HPKE_CTX_set1_ikme(sealctx, base->ikmE, base->ikmElen)))
         goto end;
@@ -131,27 +131,27 @@ static int do_testhpke(const TEST_BASEDATA *base,
         if (!TEST_true(base->ikmAuth != NULL && base->ikmAuthlen > 0))
             goto end;
         if (!TEST_true(OSSL_HPKE_keygen(base->suite,
-                                        authpub, &authpublen, &authpriv,
-                                        base->ikmAuth, base->ikmAuthlen,
-                                        libctx, propq)))
+                authpub, &authpublen, &authpriv,
+                base->ikmAuth, base->ikmAuthlen,
+                libctx, propq)))
             goto end;
         if (!TEST_true(OSSL_HPKE_CTX_set1_authpriv(sealctx, authpriv)))
             goto end;
     }
     if (!TEST_true(OSSL_HPKE_keygen(base->suite, rpub, &rpublen, &privR,
-                                    base->ikmR, base->ikmRlen, libctx, propq)))
+            base->ikmR, base->ikmRlen, libctx, propq)))
         goto end;
     if (!TEST_true(cmpkey(privR, base->expected_pkRm, base->expected_pkRmlen)))
         goto end;
     if (base->mode == OSSL_HPKE_MODE_PSK
         || base->mode == OSSL_HPKE_MODE_PSKAUTH) {
         if (!TEST_true(OSSL_HPKE_CTX_set1_psk(sealctx, base->pskid,
-                                              base->psk, base->psklen)))
+                base->psk, base->psklen)))
             goto end;
     }
     if (!TEST_true(OSSL_HPKE_encap(sealctx, enc, &enclen,
-                                   rpub, rpublen,
-                                   base->ksinfo, base->ksinfolen)))
+            rpub, rpublen,
+            base->ksinfo, base->ksinfolen)))
         goto end;
     if (!TEST_true(cmpkey(privE, enc, enclen)))
         goto end;
@@ -159,11 +159,11 @@ static int do_testhpke(const TEST_BASEDATA *base,
         ctlen = sizeof(ct);
         memset(ct, 0, ctlen);
         if (!TEST_true(OSSL_HPKE_seal(sealctx, ct, &ctlen,
-                                      aead[i].aad, aead[i].aadlen,
-                                      aead[i].pt, aead[i].ptlen)))
+                aead[i].aad, aead[i].aadlen,
+                aead[i].pt, aead[i].ptlen)))
             goto end;
         if (!TEST_mem_eq(ct, ctlen, aead[i].expected_ct,
-                         aead[i].expected_ctlen))
+                aead[i].expected_ctlen))
             goto end;
         if (!TEST_true(OSSL_HPKE_CTX_get_seq(sealctx, &lastseq)))
             goto end;
@@ -171,34 +171,34 @@ static int do_testhpke(const TEST_BASEDATA *base,
             goto end;
     }
     if (!TEST_ptr(openctx = OSSL_HPKE_CTX_new(base->mode, base->suite,
-                                              OSSL_HPKE_ROLE_RECEIVER,
-                                              libctx, propq)))
+                      OSSL_HPKE_ROLE_RECEIVER,
+                      libctx, propq)))
         goto end;
     if (base->mode == OSSL_HPKE_MODE_PSK
         || base->mode == OSSL_HPKE_MODE_PSKAUTH) {
         if (!TEST_true(base->pskid != NULL && base->psk != NULL
-                       && base->psklen > 0))
+                && base->psklen > 0))
             goto end;
         if (!TEST_true(OSSL_HPKE_CTX_set1_psk(openctx, base->pskid,
-                                              base->psk, base->psklen)))
+                base->psk, base->psklen)))
             goto end;
     }
     if (base->mode == OSSL_HPKE_MODE_AUTH
         || base->mode == OSSL_HPKE_MODE_PSKAUTH) {
         if (!TEST_true(OSSL_HPKE_CTX_set1_authpub(openctx,
-                                                  authpub, authpublen)))
+                authpub, authpublen)))
             goto end;
     }
     if (!TEST_true(OSSL_HPKE_decap(openctx, enc, enclen, privR,
-                                   base->ksinfo, base->ksinfolen)))
+            base->ksinfo, base->ksinfolen)))
         goto end;
     for (i = 0; i < aeadsz; ++i) {
         ptoutlen = sizeof(ptout);
         memset(ptout, 0, ptoutlen);
         if (!TEST_true(OSSL_HPKE_open(openctx, ptout, &ptoutlen,
-                                      aead[i].aad, aead[i].aadlen,
-                                      aead[i].expected_ct,
-                                      aead[i].expected_ctlen)))
+                aead[i].aad, aead[i].aadlen,
+                aead[i].expected_ct,
+                aead[i].expected_ctlen)))
             goto end;
         if (!TEST_mem_eq(aead[i].pt, aead[i].ptlen, ptout, ptoutlen))
             goto end;
@@ -217,22 +217,22 @@ static int do_testhpke(const TEST_BASEDATA *base,
             goto end;
         /* export with too long label should fail */
         if (!TEST_false(OSSL_HPKE_export(sealctx, eval, len,
-                                         export[i].context, -1)))
+                export[i].context, -1)))
             goto end;
         /* good export call */
         if (!TEST_true(OSSL_HPKE_export(sealctx, eval, len,
-                                        export[i].context,
-                                        export[i].contextlen)))
+                export[i].context,
+                export[i].contextlen)))
             goto end;
         if (!TEST_mem_eq(eval, len, export[i].expected_secret,
-                         export[i].expected_secretlen))
+                export[i].expected_secretlen))
             goto end;
 
         /* check seal fails if export only mode */
         if (aeadsz == 0) {
 
             if (!TEST_false(OSSL_HPKE_seal(sealctx, ct, &ctlen,
-                                           NULL, 0, ptout, ptoutlen)))
+                    NULL, 0, ptout, ptoutlen)))
                 goto end;
         }
     }
@@ -287,10 +287,38 @@ static const unsigned char first_ikmr[] = {
     0xb7, 0xac, 0xcf, 0xaf, 0xf8, 0x99, 0x50, 0x98
 };
 static const unsigned char first_ikmepub[] = {
-    0x0a, 0xd0, 0x95, 0x0d, 0x9f, 0xb9, 0x58, 0x8e,
-    0x59, 0x69, 0x0b, 0x74, 0xf1, 0x23, 0x7e, 0xcd,
-    0xf1, 0xd7, 0x75, 0xcd, 0x60, 0xbe, 0x2e, 0xca,
-    0x57, 0xaf, 0x5a, 0x4b, 0x04, 0x71, 0xc9, 0x1b,
+    0x0a,
+    0xd0,
+    0x95,
+    0x0d,
+    0x9f,
+    0xb9,
+    0x58,
+    0x8e,
+    0x59,
+    0x69,
+    0x0b,
+    0x74,
+    0xf1,
+    0x23,
+    0x7e,
+    0xcd,
+    0xf1,
+    0xd7,
+    0x75,
+    0xcd,
+    0x60,
+    0xbe,
+    0x2e,
+    0xca,
+    0x57,
+    0xaf,
+    0x5a,
+    0x4b,
+    0x04,
+    0x71,
+    0xc9,
+    0x1b,
 };
 static const unsigned char first_ikmrpub[] = {
     0x9f, 0xed, 0x7e, 0x8c, 0x17, 0x38, 0x75, 0x60,
@@ -372,11 +400,9 @@ static int x25519kdfsha256_hkdfsha256_aes128gcm_psk_test(void)
     const TEST_BASEDATA pskdata = {
         /* "X25519", NULL, "SHA256", "SHA256", "AES-128-GCM", */
         OSSL_HPKE_MODE_PSK,
-        {
-            OSSL_HPKE_KEM_ID_X25519,
+        { OSSL_HPKE_KEM_ID_X25519,
             OSSL_HPKE_KDF_ID_HKDF_SHA256,
-            OSSL_HPKE_AEAD_ID_AES_GCM_128
-        },
+            OSSL_HPKE_AEAD_ID_AES_GCM_128 },
         first_ikme, sizeof(first_ikme),
         first_ikmepub, sizeof(first_ikmepub),
         first_ikmr, sizeof(first_ikmr),
@@ -384,38 +410,32 @@ static int x25519kdfsha256_hkdfsha256_aes128gcm_psk_test(void)
         first_ikmrpriv, sizeof(first_ikmrpriv),
         first_expected_shared_secret, sizeof(first_expected_shared_secret),
         ksinfo, sizeof(ksinfo),
-        NULL, 0,    /* No Auth */
-        psk, sizeof(psk), (char *) pskid
+        NULL, 0, /* No Auth */
+        psk, sizeof(psk), (char *)pskid
     };
     const TEST_AEADDATA aeaddata[] = {
-        {
-            0,
+        { 0,
             pt, sizeof(pt),
             first_aad0, sizeof(first_aad0),
-            first_ct0, sizeof(first_ct0)
-        },
-        {
-            1,
+            first_ct0, sizeof(first_ct0) },
+        { 1,
             pt, sizeof(pt),
             first_aad1, sizeof(first_aad1),
-            first_ct1, sizeof(first_ct1)
-        },
-        {
-            2,
+            first_ct1, sizeof(first_ct1) },
+        { 2,
             pt, sizeof(pt),
             first_aad2, sizeof(first_aad2),
-            first_ct2, sizeof(first_ct2)
-        }
+            first_ct2, sizeof(first_ct2) }
     };
     const TEST_EXPORTDATA exportdata[] = {
         { NULL, 0, first_export1, sizeof(first_export1) },
         { first_context2, sizeof(first_context2),
-          first_export2, sizeof(first_export2) },
+            first_export2, sizeof(first_export2) },
         { first_context3, sizeof(first_context3),
-          first_export3, sizeof(first_export3) },
+            first_export3, sizeof(first_export3) },
     };
     return do_testhpke(&pskdata, aeaddata, OSSL_NELEM(aeaddata),
-                       exportdata, OSSL_NELEM(exportdata));
+        exportdata, OSSL_NELEM(exportdata));
 }
 
 static const unsigned char second_ikme[] = {
@@ -425,10 +445,38 @@ static const unsigned char second_ikme[] = {
     0x98, 0x12, 0xe6, 0x67, 0x06, 0xdf, 0x32, 0x34
 };
 static const unsigned char second_ikmepub[] = {
-    0x37, 0xfd, 0xa3, 0x56, 0x7b, 0xdb, 0xd6, 0x28,
-    0xe8, 0x86, 0x68, 0xc3, 0xc8, 0xd7, 0xe9, 0x7d,
-    0x1d, 0x12, 0x53, 0xb6, 0xd4, 0xea, 0x6d, 0x44,
-    0xc1, 0x50, 0xf7, 0x41, 0xf1, 0xbf, 0x44, 0x31,
+    0x37,
+    0xfd,
+    0xa3,
+    0x56,
+    0x7b,
+    0xdb,
+    0xd6,
+    0x28,
+    0xe8,
+    0x86,
+    0x68,
+    0xc3,
+    0xc8,
+    0xd7,
+    0xe9,
+    0x7d,
+    0x1d,
+    0x12,
+    0x53,
+    0xb6,
+    0xd4,
+    0xea,
+    0x6d,
+    0x44,
+    0xc1,
+    0x50,
+    0xf7,
+    0x41,
+    0xf1,
+    0xbf,
+    0x44,
+    0x31,
 };
 static const unsigned char second_ikmr[] = {
     0x6d, 0xb9, 0xdf, 0x30, 0xaa, 0x07, 0xdd, 0x42,
@@ -504,11 +552,9 @@ static int x25519kdfsha256_hkdfsha256_aes128gcm_base_test(void)
 {
     const TEST_BASEDATA basedata = {
         OSSL_HPKE_MODE_BASE,
-        {
-            OSSL_HPKE_KEM_ID_X25519,
+        { OSSL_HPKE_KEM_ID_X25519,
             OSSL_HPKE_KDF_ID_HKDF_SHA256,
-            OSSL_HPKE_AEAD_ID_AES_GCM_128
-        },
+            OSSL_HPKE_AEAD_ID_AES_GCM_128 },
         second_ikme, sizeof(second_ikme),
         second_ikmepub, sizeof(second_ikmepub),
         second_ikmr, sizeof(second_ikmr),
@@ -520,28 +566,24 @@ static int x25519kdfsha256_hkdfsha256_aes128gcm_base_test(void)
         NULL, 0, NULL /* no psk */
     };
     const TEST_AEADDATA aeaddata[] = {
-        {
-            0,
+        { 0,
             pt, sizeof(pt),
             second_aead0, sizeof(second_aead0),
-            second_ct0, sizeof(second_ct0)
-        },
-        {
-            1,
+            second_ct0, sizeof(second_ct0) },
+        { 1,
             pt, sizeof(pt),
             second_aead1, sizeof(second_aead1),
-            second_ct1, sizeof(second_ct1)
-        }
+            second_ct1, sizeof(second_ct1) }
     };
     const TEST_EXPORTDATA exportdata[] = {
         { NULL, 0, second_export1, sizeof(second_export1) },
         { second_context2, sizeof(second_context2),
-          second_export2, sizeof(second_export2) },
+            second_export2, sizeof(second_export2) },
         { second_context3, sizeof(second_context3),
-          second_export3, sizeof(second_export3) },
+            second_export3, sizeof(second_export3) },
     };
     return do_testhpke(&basedata, aeaddata, OSSL_NELEM(aeaddata),
-                       exportdata, OSSL_NELEM(exportdata));
+        exportdata, OSSL_NELEM(exportdata));
 }
 #endif
 
@@ -552,14 +594,70 @@ static const unsigned char third_ikme[] = {
     0x1f, 0x5a, 0xa2, 0x28, 0x16, 0xce, 0x86, 0x0e
 };
 static const unsigned char third_ikmepub[] = {
-    0x04, 0xa9, 0x27, 0x19, 0xc6, 0x19, 0x5d, 0x50,
-    0x85, 0x10, 0x4f, 0x46, 0x9a, 0x8b, 0x98, 0x14,
-    0xd5, 0x83, 0x8f, 0xf7, 0x2b, 0x60, 0x50, 0x1e,
-    0x2c, 0x44, 0x66, 0xe5, 0xe6, 0x7b, 0x32, 0x5a,
-    0xc9, 0x85, 0x36, 0xd7, 0xb6, 0x1a, 0x1a, 0xf4,
-    0xb7, 0x8e, 0x5b, 0x7f, 0x95, 0x1c, 0x09, 0x00,
-    0xbe, 0x86, 0x3c, 0x40, 0x3c, 0xe6, 0x5c, 0x9b,
-    0xfc, 0xb9, 0x38, 0x26, 0x57, 0x22, 0x2d, 0x18,
+    0x04,
+    0xa9,
+    0x27,
+    0x19,
+    0xc6,
+    0x19,
+    0x5d,
+    0x50,
+    0x85,
+    0x10,
+    0x4f,
+    0x46,
+    0x9a,
+    0x8b,
+    0x98,
+    0x14,
+    0xd5,
+    0x83,
+    0x8f,
+    0xf7,
+    0x2b,
+    0x60,
+    0x50,
+    0x1e,
+    0x2c,
+    0x44,
+    0x66,
+    0xe5,
+    0xe6,
+    0x7b,
+    0x32,
+    0x5a,
+    0xc9,
+    0x85,
+    0x36,
+    0xd7,
+    0xb6,
+    0x1a,
+    0x1a,
+    0xf4,
+    0xb7,
+    0x8e,
+    0x5b,
+    0x7f,
+    0x95,
+    0x1c,
+    0x09,
+    0x00,
+    0xbe,
+    0x86,
+    0x3c,
+    0x40,
+    0x3c,
+    0xe6,
+    0x5c,
+    0x9b,
+    0xfc,
+    0xb9,
+    0x38,
+    0x26,
+    0x57,
+    0x22,
+    0x2d,
+    0x18,
     0xc4,
 };
 static const unsigned char third_ikmr[] = {
@@ -641,11 +739,9 @@ static int P256kdfsha256_hkdfsha256_aes128gcm_base_test(void)
 {
     const TEST_BASEDATA basedata = {
         OSSL_HPKE_MODE_BASE,
-        {
-            OSSL_HPKE_KEM_ID_P256,
+        { OSSL_HPKE_KEM_ID_P256,
             OSSL_HPKE_KDF_ID_HKDF_SHA256,
-            OSSL_HPKE_AEAD_ID_AES_GCM_128
-        },
+            OSSL_HPKE_AEAD_ID_AES_GCM_128 },
         third_ikme, sizeof(third_ikme),
         third_ikmepub, sizeof(third_ikmepub),
         third_ikmr, sizeof(third_ikmr),
@@ -657,28 +753,24 @@ static int P256kdfsha256_hkdfsha256_aes128gcm_base_test(void)
         NULL, 0, NULL /* PSK stuff */
     };
     const TEST_AEADDATA aeaddata[] = {
-        {
-            0,
+        { 0,
             pt, sizeof(pt),
             third_aead0, sizeof(third_aead0),
-            third_ct0, sizeof(third_ct0)
-        },
-        {
-            1,
+            third_ct0, sizeof(third_ct0) },
+        { 1,
             pt, sizeof(pt),
             third_aead1, sizeof(third_aead1),
-            third_ct1, sizeof(third_ct1)
-        }
+            third_ct1, sizeof(third_ct1) }
     };
     const TEST_EXPORTDATA exportdata[] = {
         { NULL, 0, third_export1, sizeof(third_export1) },
         { third_context2, sizeof(third_context2),
-          third_export2, sizeof(third_export2) },
+            third_export2, sizeof(third_export2) },
         { third_context3, sizeof(third_context3),
-          third_export3, sizeof(third_export3) },
+            third_export3, sizeof(third_export3) },
     };
     return do_testhpke(&basedata, aeaddata, OSSL_NELEM(aeaddata),
-                       exportdata, OSSL_NELEM(exportdata));
+        exportdata, OSSL_NELEM(exportdata));
 }
 
 #ifndef OPENSSL_NO_ECX
@@ -747,11 +839,9 @@ static int export_only_test(void)
     /* based on RFC9180 A.7 */
     const TEST_BASEDATA basedata = {
         OSSL_HPKE_MODE_BASE,
-        {
-            OSSL_HPKE_KEM_ID_X25519,
+        { OSSL_HPKE_KEM_ID_X25519,
             OSSL_HPKE_KDF_ID_HKDF_SHA256,
-            OSSL_HPKE_AEAD_ID_EXPORTONLY
-        },
+            OSSL_HPKE_AEAD_ID_EXPORTONLY },
         fourth_ikme, sizeof(fourth_ikme),
         fourth_ikmepub, sizeof(fourth_ikmepub),
         fourth_ikmr, sizeof(fourth_ikmr),
@@ -765,12 +855,12 @@ static int export_only_test(void)
     const TEST_EXPORTDATA exportdata[] = {
         { NULL, 0, fourth_export1, sizeof(fourth_export1) },
         { fourth_context2, sizeof(fourth_context2),
-          fourth_export2, sizeof(fourth_export2) },
+            fourth_export2, sizeof(fourth_export2) },
         { fourth_context3, sizeof(fourth_context3),
-          fourth_export3, sizeof(fourth_export3) },
+            fourth_export3, sizeof(fourth_export3) },
     };
     return do_testhpke(&basedata, NULL, 0,
-                       exportdata, OSSL_NELEM(exportdata));
+        exportdata, OSSL_NELEM(exportdata));
 }
 #endif
 
@@ -862,10 +952,12 @@ static const char *bogus_suite_strs[] = {
     "0x10,0x01,,0x02",
     /* embedded NUL chars */
     "0x10,\00x01,,0x02",
-    "0x10,\0""0x01,0x02",
+    "0x10,\0"
+    "0x01,0x02",
     "0x10\0,0x01,0x02",
     "0x10,0x01\0,0x02",
-    "0x10,0x01,\0""0x02",
+    "0x10,0x01,\0"
+    "0x02",
     /* embedded whitespace */
     " aes-256-gcm,hkdf-sha512,x25519",
     "aes-256-gcm, hkdf-sha512,x25519",
@@ -960,8 +1052,8 @@ static int test_hpke_modes_suites(void)
             psklen = 0;
         }
         for (kemind = 0; /* iterate over the kems, kdfs and aeads */
-             overallresult == 1 && kemind < OSSL_NELEM(hpke_kem_list);
-             kemind++) {
+            overallresult == 1 && kemind < OSSL_NELEM(hpke_kem_list);
+            kemind++) {
             uint16_t kem_id = hpke_kem_list[kemind];
             size_t authpublen = OSSL_HPKE_TSTSIZE;
             unsigned char authpub[OSSL_HPKE_TSTSIZE];
@@ -972,8 +1064,9 @@ static int test_hpke_modes_suites(void)
             if (hpke_mode == OSSL_HPKE_MODE_AUTH
                 || hpke_mode == OSSL_HPKE_MODE_PSKAUTH) {
                 if (TEST_true(OSSL_HPKE_keygen(hpke_suite, authpub, &authpublen,
-                                               &authpriv, NULL, 0,
-                                               testctx, NULL)) != 1) {
+                        &authpriv, NULL, 0,
+                        testctx, NULL))
+                    != 1) {
                     overallresult = 0;
                 }
                 authpubp = authpub;
@@ -981,15 +1074,15 @@ static int test_hpke_modes_suites(void)
                 authpublen = 0;
             }
             for (kdfind = 0;
-                 overallresult == 1 && kdfind < OSSL_NELEM(hpke_kdf_list);
-                 kdfind++) {
+                overallresult == 1 && kdfind < OSSL_NELEM(hpke_kdf_list);
+                kdfind++) {
                 uint16_t kdf_id = hpke_kdf_list[kdfind];
 
                 hpke_suite.kdf_id = kdf_id;
                 for (aeadind = 0;
-                     overallresult == 1
-                     && aeadind < OSSL_NELEM(hpke_aead_list);
-                     aeadind++) {
+                    overallresult == 1
+                    && aeadind < OSSL_NELEM(hpke_aead_list);
+                    aeadind++) {
                     uint16_t aead_id = hpke_aead_list[aeadind];
                     size_t publen = OSSL_HPKE_TSTSIZE;
                     unsigned char pub[OSSL_HPKE_TSTSIZE];
@@ -1002,53 +1095,53 @@ static int test_hpke_modes_suites(void)
 
                     hpke_suite.aead_id = aead_id;
                     if (!TEST_true(OSSL_HPKE_keygen(hpke_suite,
-                                                    pub, &publen, &privp,
-                                                    NULL, 0, testctx, NULL)))
+                            pub, &publen, &privp,
+                            NULL, 0, testctx, NULL)))
                         overallresult = 0;
                     if (!TEST_ptr(ctx = OSSL_HPKE_CTX_new(hpke_mode, hpke_suite,
-                                                          OSSL_HPKE_ROLE_SENDER,
-                                                          testctx, NULL)))
+                                      OSSL_HPKE_ROLE_SENDER,
+                                      testctx, NULL)))
                         overallresult = 0;
                     if (hpke_mode == OSSL_HPKE_MODE_PSK
                         || hpke_mode == OSSL_HPKE_MODE_PSKAUTH) {
                         if (!TEST_true(OSSL_HPKE_CTX_set1_psk(ctx, pskidp,
-                                                              pskp, psklen)))
+                                pskp, psklen)))
                             overallresult = 0;
                     }
                     if (hpke_mode == OSSL_HPKE_MODE_AUTH
                         || hpke_mode == OSSL_HPKE_MODE_PSKAUTH) {
                         if (!TEST_true(OSSL_HPKE_CTX_set1_authpriv(ctx,
-                                                                   authpriv)))
+                                authpriv)))
                             overallresult = 0;
                     }
                     if (!TEST_true(OSSL_HPKE_encap(ctx, senderpub,
-                                                   &senderpublen,
-                                                   pub, publen,
-                                                   infop, infolen)))
+                            &senderpublen,
+                            pub, publen,
+                            infop, infolen)))
                         overallresult = 0;
                     /* throw in a call with a too-short cipherlen */
                     cipherlen = 15;
                     if (!TEST_false(OSSL_HPKE_seal(ctx, cipher, &cipherlen,
-                                                   aadp, aadlen,
-                                                   plain, plainlen)))
+                            aadp, aadlen,
+                            plain, plainlen)))
                         overallresult = 0;
                     /* fix back real cipherlen */
                     cipherlen = OSSL_HPKE_TSTSIZE;
                     if (!TEST_true(OSSL_HPKE_seal(ctx, cipher, &cipherlen,
-                                                  aadp, aadlen,
-                                                  plain, plainlen)))
+                            aadp, aadlen,
+                            plain, plainlen)))
                         overallresult = 0;
                     OSSL_HPKE_CTX_free(ctx);
                     memset(clear, 0, clearlen);
                     rctx = OSSL_HPKE_CTX_new(hpke_mode, hpke_suite,
-                                             OSSL_HPKE_ROLE_RECEIVER,
-                                             testctx, NULL);
+                        OSSL_HPKE_ROLE_RECEIVER,
+                        testctx, NULL);
                     if (!TEST_ptr(rctx))
                         overallresult = 0;
                     if (hpke_mode == OSSL_HPKE_MODE_PSK
                         || hpke_mode == OSSL_HPKE_MODE_PSKAUTH) {
                         if (!TEST_true(OSSL_HPKE_CTX_set1_psk(rctx, pskidp,
-                                                              pskp, psklen)))
+                                pskp, psklen)))
                             overallresult = 0;
                     }
                     if (hpke_mode == OSSL_HPKE_MODE_AUTH
@@ -1057,31 +1150,30 @@ static int test_hpke_modes_suites(void)
                         if (hpke_suite.kem_id == OSSL_HPKE_KEM_ID_P256) {
                             /* set to fail decode of authpub this time */
                             if (!TEST_false(OSSL_HPKE_CTX_set1_authpub(rctx,
-                                                                       authpub,
-                                                                       10
-                                                                       )))
+                                    authpub,
+                                    10)))
                                 overallresult = 0;
                         }
                         if (!TEST_true(OSSL_HPKE_CTX_set1_authpub(rctx,
-                                                                  authpubp,
-                                                                  authpublen)))
+                                authpubp,
+                                authpublen)))
                             overallresult = 0;
                     }
                     if (!TEST_true(OSSL_HPKE_decap(rctx, senderpub,
-                                                   senderpublen, privp,
-                                                   infop, infolen)))
+                            senderpublen, privp,
+                            infop, infolen)))
                         overallresult = 0;
                     /* throw in a call with a too-short clearlen */
                     clearlen = 15;
                     if (!TEST_false(OSSL_HPKE_open(rctx, clear, &clearlen,
-                                                   aadp, aadlen, cipher,
-                                                   cipherlen)))
+                            aadp, aadlen, cipher,
+                            cipherlen)))
                         overallresult = 0;
                     /* fix up real clearlen again */
                     clearlen = OSSL_HPKE_TSTSIZE;
                     if (!TEST_true(OSSL_HPKE_open(rctx, clear, &clearlen,
-                                                  aadp, aadlen, cipher,
-                                                  cipherlen)))
+                            aadp, aadlen, cipher,
+                            cipherlen)))
                         overallresult = 0;
                     OSSL_HPKE_CTX_free(rctx);
                     EVP_PKEY_free(privp);
@@ -1094,13 +1186,14 @@ static int test_hpke_modes_suites(void)
                         const char *res = NULL;
 
                         res = (overallresult == 1 ? "worked" : "failed");
-                        TEST_note("HPKE %s for mode: %s/0x%02x, "\
-                                  "kem: %s/0x%02x, kdf: %s/0x%02x, "\
-                                  "aead: %s/0x%02x", res,
-                                  mode_str_list[mind], (int) mind,
-                                  kem_str_list[kemind], kem_id,
-                                  kdf_str_list[kdfind], kdf_id,
-                                  aead_str_list[aeadind], aead_id);
+                        TEST_note("HPKE %s for mode: %s/0x%02x, "
+                                  "kem: %s/0x%02x, kdf: %s/0x%02x, "
+                                  "aead: %s/0x%02x",
+                            res,
+                            mode_str_list[mind], (int)mind,
+                            kem_str_list[kemind], kem_id,
+                            kdf_str_list[kdfind], kdf_id,
+                            aead_str_list[aeadind], aead_id);
                     }
                 }
             }
@@ -1139,50 +1232,50 @@ static int test_hpke_export(void)
     char *estr = "foo";
 
     if (!TEST_true(OSSL_HPKE_keygen(hpke_suite, pub, &publen, &privp,
-                                    NULL, 0, testctx, NULL)))
+            NULL, 0, testctx, NULL)))
         goto end;
     if (!TEST_ptr(ctx = OSSL_HPKE_CTX_new(hpke_mode, hpke_suite,
-                                          OSSL_HPKE_ROLE_SENDER,
-                                          testctx, NULL)))
+                      OSSL_HPKE_ROLE_SENDER,
+                      testctx, NULL)))
         goto end;
     /* a few error cases 1st */
     if (!TEST_false(OSSL_HPKE_export(NULL, exp, sizeof(exp),
-                                     (unsigned char *)estr, strlen(estr))))
+            (unsigned char *)estr, strlen(estr))))
         goto end;
     /* ctx before encap should fail too */
     if (!TEST_false(OSSL_HPKE_export(ctx, exp, sizeof(exp),
-                                     (unsigned char *)estr, strlen(estr))))
+            (unsigned char *)estr, strlen(estr))))
         goto end;
     if (!TEST_true(OSSL_HPKE_encap(ctx, enc, &enclen, pub, publen, NULL, 0)))
         goto end;
     if (!TEST_true(OSSL_HPKE_seal(ctx, cipher, &cipherlen, NULL, 0,
-                                  plain, plainlen)))
+            plain, plainlen)))
         goto end;
     /* now for real */
     if (!TEST_true(OSSL_HPKE_export(ctx, exp, sizeof(exp),
-                                    (unsigned char *)estr, strlen(estr))))
+            (unsigned char *)estr, strlen(estr))))
         goto end;
     /* check a 2nd call with same input gives same output */
     if (!TEST_true(OSSL_HPKE_export(ctx, exp2, sizeof(exp2),
-                                    (unsigned char *)estr, strlen(estr))))
+            (unsigned char *)estr, strlen(estr))))
         goto end;
     if (!TEST_mem_eq(exp, sizeof(exp), exp2, sizeof(exp2)))
         goto end;
     if (!TEST_ptr(rctx = OSSL_HPKE_CTX_new(hpke_mode, hpke_suite,
-                                           OSSL_HPKE_ROLE_RECEIVER,
-                                           testctx, NULL)))
+                      OSSL_HPKE_ROLE_RECEIVER,
+                      testctx, NULL)))
         goto end;
     if (!TEST_true(OSSL_HPKE_decap(rctx, enc, enclen, privp, NULL, 0)))
         goto end;
     if (!TEST_true(OSSL_HPKE_open(rctx, clear, &clearlen, NULL, 0,
-                                  cipher, cipherlen)))
+            cipher, cipherlen)))
         goto end;
     if (!TEST_true(OSSL_HPKE_export(rctx, rexp, sizeof(rexp),
-                                    (unsigned char *)estr, strlen(estr))))
+            (unsigned char *)estr, strlen(estr))))
         goto end;
     /* check a 2nd call with same input gives same output */
     if (!TEST_true(OSSL_HPKE_export(rctx, rexp2, sizeof(rexp2),
-                                    (unsigned char *)estr, strlen(estr))))
+            (unsigned char *)estr, strlen(estr))))
         goto end;
     if (!TEST_mem_eq(rexp, sizeof(rexp), rexp2, sizeof(rexp2)))
         goto end;
@@ -1215,11 +1308,11 @@ static int test_hpke_suite_strs(void)
         for (kdfind = 0; kdfind != OSSL_NELEM(kdf_str_list); kdfind++) {
             for (aeadind = 0; aeadind != OSSL_NELEM(aead_str_list); aeadind++) {
                 BIO_snprintf(sstr, 128, "%s,%s,%s", kem_str_list[kemind],
-                             kdf_str_list[kdfind], aead_str_list[aeadind]);
+                    kdf_str_list[kdfind], aead_str_list[aeadind]);
                 if (TEST_true(OSSL_HPKE_str2suite(sstr, &stirred)) != 1) {
                     if (verbose)
                         TEST_note("Unexpected str2suite fail for :%s",
-                                  bogus_suite_strs[sind]);
+                            bogus_suite_strs[sind]);
                     overallresult = 0;
                 }
             }
@@ -1227,10 +1320,11 @@ static int test_hpke_suite_strs(void)
     }
     for (sind = 0; sind != OSSL_NELEM(bogus_suite_strs); sind++) {
         if (TEST_false(OSSL_HPKE_str2suite(bogus_suite_strs[sind],
-                                           &stirred)) != 1) {
+                &stirred))
+            != 1) {
             if (verbose)
                 TEST_note("OSSL_HPKE_str2suite didn't fail for bogus[%d]:%s",
-                          sind, bogus_suite_strs[sind]);
+                    sind, bogus_suite_strs[sind]);
             overallresult = 0;
         }
     }
@@ -1271,17 +1365,19 @@ static int test_hpke_grease(void)
     /* check too short for public value */
     g_pub_len = 10;
     if (TEST_false(OSSL_HPKE_get_grease_value(NULL, &g_suite,
-                                              g_pub, &g_pub_len,
-                                              g_cipher, g_cipher_len,
-                                              testctx, NULL)) != 1) {
+            g_pub, &g_pub_len,
+            g_cipher, g_cipher_len,
+            testctx, NULL))
+        != 1) {
         overallresult = 0;
     }
     /* reset to work */
     g_pub_len = OSSL_HPKE_TSTSIZE;
     if (TEST_true(OSSL_HPKE_get_grease_value(NULL, &g_suite,
-                                             g_pub, &g_pub_len,
-                                             g_cipher, g_cipher_len,
-                                             testctx, NULL)) != 1) {
+            g_pub, &g_pub_len,
+            g_cipher, g_cipher_len,
+            testctx, NULL))
+        != 1) {
         overallresult = 0;
     }
     /* expansion */
@@ -1360,33 +1456,33 @@ static int test_hpke_oddcalls(void)
     if (!TEST_false(OSSL_HPKE_get_ciphertext_size(bad_suite, 0)))
         goto end;
     if (!TEST_false(OSSL_HPKE_keygen(bad_suite, pub, &publen, &privp,
-                                     NULL, 0, testctx, badpropq)))
+            NULL, 0, testctx, badpropq)))
         goto end;
     if (!TEST_false(OSSL_HPKE_keygen(bad_suite, pub, &publen, &privp,
-                                     NULL, 0, testctx, NULL)))
+            NULL, 0, testctx, NULL)))
         goto end;
 
     /* dodgy keygen calls */
     /* no pub */
     if (!TEST_false(OSSL_HPKE_keygen(hpke_suite, NULL, &publen, &privp,
-                                     NULL, 0, testctx, NULL)))
+            NULL, 0, testctx, NULL)))
         goto end;
     /* ikmlen but NULL ikm */
     if (!TEST_false(OSSL_HPKE_keygen(hpke_suite, pub, &publen, &privp,
-                                     NULL, 80, testctx, NULL)))
+            NULL, 80, testctx, NULL)))
         goto end;
     /* zero ikmlen but ikm */
     if (!TEST_false(OSSL_HPKE_keygen(hpke_suite, pub, &publen, &privp,
-                                     fake_ikm, 0, testctx, NULL)))
+            fake_ikm, 0, testctx, NULL)))
         goto end;
     /* GIANT ikmlen */
     if (!TEST_false(OSSL_HPKE_keygen(hpke_suite, pub, &publen, &privp,
-                                     fake_ikm, -1, testctx, NULL)))
+            fake_ikm, -1, testctx, NULL)))
         goto end;
     /* short publen */
     publen = 10;
     if (!TEST_false(OSSL_HPKE_keygen(hpke_suite, pub, &publen, &privp,
-                                     NULL, 0, testctx, NULL)))
+            NULL, 0, testctx, NULL)))
         goto end;
     publen = sizeof(pub);
 
@@ -1402,23 +1498,23 @@ static int test_hpke_oddcalls(void)
      */
     /* good keygen */
     if (!TEST_true(OSSL_HPKE_keygen(hpke_suite, pub, &publen, &privp,
-                                    NULL, 0, testctx, NULL)))
+            NULL, 0, testctx, NULL)))
         goto end;
 
     /* a psk context with no psk => encap fail */
     if (!TEST_ptr(ctx = OSSL_HPKE_CTX_new(OSSL_HPKE_MODE_PSK, hpke_suite,
-                                          OSSL_HPKE_ROLE_SENDER,
-                                          testctx, NULL)))
+                      OSSL_HPKE_ROLE_SENDER,
+                      testctx, NULL)))
         goto end;
     /* set bad length psk */
     if (!TEST_false(OSSL_HPKE_CTX_set1_psk(ctx, "foo",
-                                           (unsigned char *)"bar", -1)))
+            (unsigned char *)"bar", -1)))
         goto end;
     /* set bad length pskid */
     memset(giant_pskid, 'A', sizeof(giant_pskid) - 1);
     giant_pskid[sizeof(giant_pskid) - 1] = '\0';
     if (!TEST_false(OSSL_HPKE_CTX_set1_psk(ctx, giant_pskid,
-                                           (unsigned char *)"bar", 3)))
+            (unsigned char *)"bar", 3)))
         goto end;
     /* still no psk really set so encap fails */
     if (!TEST_false(OSSL_HPKE_encap(ctx, enc, &enclen, pub, publen, NULL, 0)))
@@ -1427,18 +1523,18 @@ static int test_hpke_oddcalls(void)
 
     /* bad suite */
     if (!TEST_ptr_null(ctx = OSSL_HPKE_CTX_new(hpke_mode, bad_suite,
-                                               OSSL_HPKE_ROLE_SENDER,
-                                               testctx, NULL)))
+                           OSSL_HPKE_ROLE_SENDER,
+                           testctx, NULL)))
         goto end;
     /* bad mode */
     if (!TEST_ptr_null(ctx = OSSL_HPKE_CTX_new(bad_mode, hpke_suite,
-                                               OSSL_HPKE_ROLE_SENDER,
-                                               testctx, NULL)))
+                           OSSL_HPKE_ROLE_SENDER,
+                           testctx, NULL)))
         goto end;
     /* make good ctx */
     if (!TEST_ptr(ctx = OSSL_HPKE_CTX_new(hpke_mode, hpke_suite,
-                                          OSSL_HPKE_ROLE_SENDER,
-                                          testctx, NULL)))
+                      OSSL_HPKE_ROLE_SENDER,
+                      testctx, NULL)))
         goto end;
     /* too long ikm */
     if (!TEST_false(OSSL_HPKE_CTX_set1_ikme(ctx, fake_ikm, -1)))
@@ -1457,11 +1553,11 @@ static int test_hpke_oddcalls(void)
         goto end;
     /* bad mode for psk */
     if (!TEST_false(OSSL_HPKE_CTX_set1_psk(ctx, "foo",
-                                           (unsigned char *)"bar", 3)))
+            (unsigned char *)"bar", 3)))
         goto end;
     /* seal before encap */
     if (!TEST_false(OSSL_HPKE_seal(ctx, cipher, &cipherlen, NULL, 0,
-                                   plain, plainlen)))
+            plain, plainlen)))
         goto end;
     /* encap with dodgy public */
     if (!TEST_false(OSSL_HPKE_encap(ctx, enc, &enclen, pub, 1, NULL, 0)))
@@ -1487,19 +1583,19 @@ static int test_hpke_oddcalls(void)
     plainlen = 0;
     /* should fail for no plaintext */
     if (!TEST_false(OSSL_HPKE_seal(ctx, cipher, &cipherlen, NULL, 0,
-                                   plain, plainlen)))
+            plain, plainlen)))
         goto end;
     plainlen = sizeof(plain);
     /* working seal */
     if (!TEST_true(OSSL_HPKE_seal(ctx, cipher, &cipherlen, NULL, 0,
-                                  plain, plainlen)))
+            plain, plainlen)))
         goto end;
 
     /* receiver side */
     /* decap fail with psk mode but no psk set */
     if (!TEST_ptr(rctx = OSSL_HPKE_CTX_new(OSSL_HPKE_MODE_PSK, hpke_suite,
-                                           OSSL_HPKE_ROLE_RECEIVER,
-                                           testctx, NULL)))
+                      OSSL_HPKE_ROLE_RECEIVER,
+                      testctx, NULL)))
         goto end;
     if (!TEST_false(OSSL_HPKE_decap(rctx, enc, enclen, privp, NULL, 0)))
         goto end;
@@ -1508,12 +1604,12 @@ static int test_hpke_oddcalls(void)
 
     /* back good calls for base mode  */
     if (!TEST_ptr(rctx = OSSL_HPKE_CTX_new(hpke_mode, hpke_suite,
-                                           OSSL_HPKE_ROLE_RECEIVER,
-                                           testctx, NULL)))
+                      OSSL_HPKE_ROLE_RECEIVER,
+                      testctx, NULL)))
         goto end;
     /* open before decap */
     if (!TEST_false(OSSL_HPKE_open(rctx, clear, &clearlen, NULL, 0,
-                                   cipher, cipherlen)))
+            cipher, cipherlen)))
         goto end;
     /* decap with info too long */
     if (!TEST_false(OSSL_HPKE_decap(rctx, enc, enclen, privp, info, -1)))
@@ -1527,19 +1623,19 @@ static int test_hpke_oddcalls(void)
     /* no space for recovered clear */
     clearlen = 0;
     if (!TEST_false(OSSL_HPKE_open(rctx, clear, &clearlen, NULL, 0,
-                                   cipher, cipherlen)))
+            cipher, cipherlen)))
         goto end;
     clearlen = OSSL_HPKE_TSTSIZE;
     /* seq wrap around test */
     if (!TEST_true(OSSL_HPKE_CTX_set_seq(rctx, -1)))
         goto end;
     if (!TEST_false(OSSL_HPKE_open(rctx, clear, &clearlen, NULL, 0,
-                                   cipher, cipherlen)))
+            cipher, cipherlen)))
         goto end;
     if (!TEST_true(OSSL_HPKE_CTX_set_seq(rctx, 0)))
         goto end;
     if (!TEST_true(OSSL_HPKE_open(rctx, clear, &clearlen, NULL, 0,
-                                  cipher, cipherlen)))
+            cipher, cipherlen)))
         goto end;
     if (!TEST_mem_eq(plain, plainlen, clear, clearlen))
         goto end;
@@ -1654,40 +1750,40 @@ static int test_hpke_random_suites(void)
 
     /* test with NULL/0 inputs */
     if (!TEST_false(OSSL_HPKE_get_grease_value(NULL, NULL,
-                                               NULL, NULL, NULL, 0,
-                                               testctx, NULL)))
+            NULL, NULL, NULL, 0,
+            testctx, NULL)))
         return 0;
     enclen = 10;
     if (!TEST_false(OSSL_HPKE_get_grease_value(&def_suite, &suite2,
-                                               enc, &enclen, ct, ctlen,
-                                               testctx, NULL)))
+            enc, &enclen, ct, ctlen,
+            testctx, NULL)))
         return 0;
 
     enclen = sizeof(enc); /* reset, 'cause get_grease() will have set */
     /* test with a should-be-good suite */
     if (!TEST_true(OSSL_HPKE_get_grease_value(&def_suite, &suite2,
-                                              enc, &enclen, ct, ctlen,
-                                              testctx, NULL)))
+            enc, &enclen, ct, ctlen,
+            testctx, NULL)))
         return 0;
     /* no suggested suite */
     enclen = sizeof(enc); /* reset, 'cause get_grease() will have set */
     if (!TEST_true(OSSL_HPKE_get_grease_value(NULL, &suite2,
-                                              enc, &enclen,
-                                              ct, ctlen,
-                                              testctx, NULL)))
+            enc, &enclen,
+            ct, ctlen,
+            testctx, NULL)))
         return 0;
     /* suggested suite with P-521, just to be sure we hit long values */
     enclen = sizeof(enc); /* reset, 'cause get_grease() will have set */
     suite.kem_id = OSSL_HPKE_KEM_ID_P521;
     if (!TEST_true(OSSL_HPKE_get_grease_value(&suite, &suite2,
-                                              enc, &enclen, ct, ctlen,
-                                              testctx, NULL)))
+            enc, &enclen, ct, ctlen,
+            testctx, NULL)))
         return 0;
     enclen = sizeof(enc);
     ctlen = 2; /* too-short cttext (can't fit an aead tag) */
     if (!TEST_false(OSSL_HPKE_get_grease_value(NULL, &suite2,
-                                               enc, &enclen, ct, ctlen,
-                                               testctx, NULL)))
+            enc, &enclen, ct, ctlen,
+            testctx, NULL)))
         return 0;
 
     ctlen = sizeof(ct);
@@ -1696,22 +1792,22 @@ static int test_hpke_random_suites(void)
     suite.kem_id = OSSL_HPKE_KEM_ID_X25519; /* back to default */
     suite.aead_id = 0x1234; /* bad aead */
     if (!TEST_false(OSSL_HPKE_get_grease_value(&suite, &suite2,
-                                               enc, &enclen, ct, ctlen,
-                                               testctx, NULL)))
+            enc, &enclen, ct, ctlen,
+            testctx, NULL)))
         return 0;
     enclen = sizeof(enc);
     suite.aead_id = def_suite.aead_id; /* good aead */
     suite.kdf_id = 0x3451; /* bad kdf */
     if (!TEST_false(OSSL_HPKE_get_grease_value(&suite, &suite2,
-                                               enc, &enclen, ct, ctlen,
-                                               testctx, NULL)))
+            enc, &enclen, ct, ctlen,
+            testctx, NULL)))
         return 0;
     enclen = sizeof(enc);
     suite.kdf_id = def_suite.kdf_id; /* good kdf */
     suite.kem_id = 0x4517; /* bad kem */
     if (!TEST_false(OSSL_HPKE_get_grease_value(&suite, &suite2,
-                                               enc, &enclen, ct, ctlen,
-                                               testctx, NULL)))
+            enc, &enclen, ct, ctlen,
+            testctx, NULL)))
         return 0;
     return 1;
 }
@@ -1730,8 +1826,8 @@ static int test_hpke_random_suites(void)
  * that were input.
  */
 static int test_hpke_one_ikm_gen(uint16_t kem_id,
-                                 const unsigned char *ikm, size_t ikmlen,
-                                 const unsigned char *pub, size_t publen)
+    const unsigned char *ikm, size_t ikmlen,
+    const unsigned char *pub, size_t publen)
 {
     OSSL_HPKE_SUITE hpke_suite = OSSL_HPKE_SUITE_DEFAULT;
     unsigned char lpub[OSSL_HPKE_TSTSIZE];
@@ -1740,7 +1836,7 @@ static int test_hpke_one_ikm_gen(uint16_t kem_id,
 
     hpke_suite.kem_id = kem_id;
     if (!TEST_true(OSSL_HPKE_keygen(hpke_suite, lpub, &lpublen, &sk,
-                                    ikm, ikmlen, testctx, NULL)))
+            ikm, ikmlen, testctx, NULL)))
         return 0;
     if (!TEST_ptr(sk))
         return 0;
@@ -1759,27 +1855,27 @@ static int test_hpke_ikms(void)
 
 #ifndef OPENSSL_NO_ECX
     res = test_hpke_one_ikm_gen(OSSL_HPKE_KEM_ID_X25519,
-                                ikm25519, sizeof(ikm25519),
-                                pub25519, sizeof(pub25519));
+        ikm25519, sizeof(ikm25519),
+        pub25519, sizeof(pub25519));
     if (res != 1)
         return res;
 #endif
 
     res = test_hpke_one_ikm_gen(OSSL_HPKE_KEM_ID_P521,
-                                ikmp521, sizeof(ikmp521),
-                                pubp521, sizeof(pubp521));
+        ikmp521, sizeof(ikmp521),
+        pubp521, sizeof(pubp521));
     if (res != 1)
         return res;
 
     res = test_hpke_one_ikm_gen(OSSL_HPKE_KEM_ID_P256,
-                                ikmp256, sizeof(ikmp256),
-                                pubp256, sizeof(pubp256));
+        ikmp256, sizeof(ikmp256),
+        pubp256, sizeof(pubp256));
     if (res != 1)
         return res;
 
     res = test_hpke_one_ikm_gen(OSSL_HPKE_KEM_ID_P256,
-                                ikmiter, sizeof(ikmiter),
-                                pubiter, sizeof(pubiter));
+        ikmiter, sizeof(ikmiter),
+        pubiter, sizeof(pubiter));
     if (res != 1)
         return res;
 
@@ -1817,47 +1913,47 @@ static int test_hpke_compressed(void)
 
     /* generate auth key pair */
     if (!TEST_true(OSSL_HPKE_keygen(hpke_suite, authpub, &authpublen, &authpriv,
-                                    NULL, 0, testctx, NULL)))
+            NULL, 0, testctx, NULL)))
         goto end;
     /* now get the compressed form public key */
     if (!TEST_true(EVP_PKEY_set_utf8_string_param(authpriv,
-                      OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
-                      OSSL_PKEY_EC_POINT_CONVERSION_FORMAT_COMPRESSED)))
+            OSSL_PKEY_PARAM_EC_POINT_CONVERSION_FORMAT,
+            OSSL_PKEY_EC_POINT_CONVERSION_FORMAT_COMPRESSED)))
         goto end;
     if (!TEST_true(EVP_PKEY_get_octet_string_param(authpriv,
-                                                   OSSL_PKEY_PARAM_PUB_KEY,
-                                                   authpub,
-                                                   sizeof(authpub),
-                                                   &authpublen)))
+            OSSL_PKEY_PARAM_PUB_KEY,
+            authpub,
+            sizeof(authpub),
+            &authpublen)))
         goto end;
 
     /* sender side as usual */
     if (!TEST_true(OSSL_HPKE_keygen(hpke_suite, pub, &publen, &privp,
-                                    NULL, 0, testctx, NULL)))
+            NULL, 0, testctx, NULL)))
         goto end;
     if (!TEST_ptr(ctx = OSSL_HPKE_CTX_new(hpke_mode, hpke_suite,
-                                          OSSL_HPKE_ROLE_SENDER,
-                                          testctx, NULL)))
+                      OSSL_HPKE_ROLE_SENDER,
+                      testctx, NULL)))
         goto end;
     if (!TEST_true(OSSL_HPKE_CTX_set1_authpriv(ctx, authpriv)))
         goto end;
     if (!TEST_true(OSSL_HPKE_encap(ctx, enc, &enclen, pub, publen, NULL, 0)))
         goto end;
     if (!TEST_true(OSSL_HPKE_seal(ctx, cipher, &cipherlen, NULL, 0,
-                                  plain, plainlen)))
+            plain, plainlen)))
         goto end;
 
     /* receiver side providing compressed form of auth public */
     if (!TEST_ptr(rctx = OSSL_HPKE_CTX_new(hpke_mode, hpke_suite,
-                                           OSSL_HPKE_ROLE_RECEIVER,
-                                           testctx, NULL)))
+                      OSSL_HPKE_ROLE_RECEIVER,
+                      testctx, NULL)))
         goto end;
     if (!TEST_true(OSSL_HPKE_CTX_set1_authpub(rctx, authpub, authpublen)))
         goto end;
     if (!TEST_true(OSSL_HPKE_decap(rctx, enc, enclen, privp, NULL, 0)))
         goto end;
     if (!TEST_true(OSSL_HPKE_open(rctx, clear, &clearlen, NULL, 0,
-                                  cipher, cipherlen)))
+            cipher, cipherlen)))
         goto end;
     erv = 1;
 
@@ -1894,11 +1990,11 @@ static int test_hpke_noncereuse(void)
 
     /* sender side is not allowed set seq once some crypto done */
     if (!TEST_true(OSSL_HPKE_keygen(hpke_suite, pub, &publen, &privp,
-                                    NULL, 0, testctx, NULL)))
+            NULL, 0, testctx, NULL)))
         goto end;
     if (!TEST_ptr(ctx = OSSL_HPKE_CTX_new(hpke_mode, hpke_suite,
-                                          OSSL_HPKE_ROLE_SENDER,
-                                          testctx, NULL)))
+                      OSSL_HPKE_ROLE_SENDER,
+                      testctx, NULL)))
         goto end;
     /* set seq will fail before any crypto done */
     if (!TEST_false(OSSL_HPKE_CTX_set_seq(ctx, seq)))
@@ -1909,13 +2005,13 @@ static int test_hpke_noncereuse(void)
     if (!TEST_false(OSSL_HPKE_CTX_set_seq(ctx, seq + 1)))
         goto end;
     if (!TEST_true(OSSL_HPKE_seal(ctx, cipher, &cipherlen, NULL, 0,
-                                  plain, plainlen)))
+            plain, plainlen)))
         goto end;
 
     /* receiver side is allowed control seq */
     if (!TEST_ptr(rctx = OSSL_HPKE_CTX_new(hpke_mode, hpke_suite,
-                                           OSSL_HPKE_ROLE_RECEIVER,
-                                           testctx, NULL)))
+                      OSSL_HPKE_ROLE_RECEIVER,
+                      testctx, NULL)))
         goto end;
     /* set seq will work before any crypto done */
     if (!TEST_true(OSSL_HPKE_CTX_set_seq(rctx, seq)))
@@ -1927,13 +2023,13 @@ static int test_hpke_noncereuse(void)
         goto end;
     /* but that value isn't good so decap will fail */
     if (!TEST_false(OSSL_HPKE_open(rctx, clear, &clearlen, NULL, 0,
-                                   cipher, cipherlen)))
+            cipher, cipherlen)))
         goto end;
     /* reset seq to correct value and _open() should work */
     if (!TEST_true(OSSL_HPKE_CTX_set_seq(rctx, 0)))
         goto end;
     if (!TEST_true(OSSL_HPKE_open(rctx, clear, &clearlen, NULL, 0,
-                                  cipher, cipherlen)))
+            cipher, cipherlen)))
         goto end;
     erv = 1;
 
diff --git a/test/http_test.c b/test/http_test.c
index 548af69535a51..8b27e128cbf6c 100644
--- a/test/http_test.c
+++ b/test/http_test.c
@@ -15,9 +15,9 @@
 
 #include "testutil.h"
 
-#define HTTP_STATUS_CODE_OK                200
-#define HTTP_STATUS_CODES_FATAL_ERROR      399
-#define HTTP_STATUS_CODES_NONFATAL_ERROR   400
+#define HTTP_STATUS_CODE_OK 200
+#define HTTP_STATUS_CODES_FATAL_ERROR 399
+#define HTTP_STATUS_CODES_NONFATAL_ERROR 400
 
 static const ASN1_ITEM *x509_it = NULL;
 static X509 *x509 = NULL;
@@ -41,8 +41,8 @@ typedef struct {
  * Response hdr has HTTP version 1.|version| and |keep_alive| (unless implicit).
  */
 static int mock_http_server(BIO *in, BIO *out, char version, int keep_alive,
-                            const char *content_type, const char *txt,
-                            ASN1_VALUE *rsp, const ASN1_ITEM *it)
+    const char *content_type, const char *txt,
+    ASN1_VALUE *rsp, const ASN1_ITEM *it)
 {
     const char *req, *path;
     long count = BIO_get_mem_data(in, (unsigned char **)&req);
@@ -53,7 +53,7 @@ static int mock_http_server(BIO *in, BIO *out, char version, int keep_alive,
 
     /* first line should contain "(GET|POST) (/<suggested status>)?/<path> HTTP/1.x" */
     if (!is_get
-            && !(TEST_true(count >= 5 && CHECK_AND_SKIP_PREFIX(hdr, "POST "))))
+        && !(TEST_true(count >= 5 && CHECK_AND_SKIP_PREFIX(hdr, "POST "))))
         return 0;
 
     /* get any status code string to be returned suggested by test client */
@@ -89,17 +89,20 @@ static int mock_http_server(BIO *in, BIO *out, char version, int keep_alive,
         if (!is_get)
             return 0;
         return BIO_printf(out, "HTTP/1.%c 301 Moved Permanently\r\n"
-                          "Location: %s\r\n\r\n",
-                          version, RPATH) > 0; /* same server */
+                               "Location: %s\r\n\r\n",
+                   version, RPATH)
+            > 0; /* same server */
     }
     if (BIO_printf(out, "HTTP/1.%c %s %s\r\n", version, status,
-                   /* mock some reason string: */
-                   strcmp(status, "200") == 0 ? "OK" :
-                   strcmp(status, "400") >= 0 ? "error" : "fatal") <= 0)
+            /* mock some reason string: */
+            strcmp(status, "200") == 0 ? "OK" : strcmp(status, "400") >= 0 ? "error"
+                                                                           : "fatal")
+        <= 0)
         return 0;
     if ((version == '0') == keep_alive) /* otherwise, default */
         if (BIO_printf(out, "Connection: %s\r\n",
-                       version == '0' ? "keep-alive" : "close") <= 0)
+                version == '0' ? "keep-alive" : "close")
+            <= 0)
             return 0;
 
     if (strcmp(status, "399") == 0) /* HTTP_STATUS_CODES_FATAL_ERROR */
@@ -111,7 +114,9 @@ static int mock_http_server(BIO *in, BIO *out, char version, int keep_alive,
         else if ((len = ASN1_item_i2d(rsp, NULL, it)) <= 0)
             return 0;
         if (BIO_printf(out, "Content-Type: %s\r\n"
-                       "Content-Length: %d\r\n\r\n", content_type, len) <= 0)
+                            "Content-Length: %d\r\n\r\n",
+                content_type, len)
+            <= 0)
             return 0;
         if (txt != NULL)
             return BIO_puts(out, txt);
@@ -130,14 +135,14 @@ static int mock_http_server(BIO *in, BIO *out, char version, int keep_alive,
 }
 
 static long http_bio_cb_ex(BIO *bio, int oper, const char *argp, size_t len,
-                           int cmd, long argl, int ret, size_t *processed)
+    int cmd, long argl, int ret, size_t *processed)
 {
     server_args *args = (server_args *)BIO_get_callback_arg(bio);
 
     if (oper == (BIO_CB_CTRL | BIO_CB_RETURN) && cmd == BIO_CTRL_FLUSH)
         ret = mock_http_server(bio, args->out, args->version, args->keep_alive,
-                               args->content_type, args->txt,
-                               (ASN1_VALUE *)x509, x509_it);
+            args->content_type, args->txt,
+            (ASN1_VALUE *)x509, x509_it);
     return ret;
 }
 
@@ -160,13 +165,13 @@ static int test_http_method(int do_get, int do_txt, int suggested_status)
     int real_server = do_txt && 0; /* remove "&& 0" for using real server */
 
     BIO_snprintf(path, sizeof(path), "/%d%s", suggested_status,
-                 do_get > 1 ? "/will-be-redirected" : RPATH);
+        do_get > 1 ? "/will-be-redirected" : RPATH);
     if (do_txt) {
         content_type = "text/plain";
         req = BIO_new(BIO_s_mem());
         if (req == NULL
-                || BIO_puts(req, text1) != sizeof(text1) - 1
-                || BIO_puts(req, text2) != sizeof(text2) - 1) {
+            || BIO_puts(req, text1) != sizeof(text1) - 1
+            || BIO_puts(req, text2) != sizeof(text2) - 1) {
             BIO_free(req);
             req = NULL;
         }
@@ -184,23 +189,22 @@ static int test_http_method(int do_get, int do_txt, int suggested_status)
     BIO_set_callback_ex(wbio, http_bio_cb_ex);
     BIO_set_callback_arg(wbio, (char *)&mock_args);
 
-    rsp = do_get ?
-        OSSL_HTTP_get(real_server ? REAL_SERVER_URL : path,
-                      NULL /* proxy */, NULL /* no_proxy */,
-                      real_server ? NULL : wbio,
-                      real_server ? NULL : rbio,
-                      NULL /* bio_update_fn */, NULL /* arg */,
-                      0 /* buf_size */, headers,
-                      real_server ? "text/html; charset=utf-8":  content_type,
-                      !do_txt /* expect_asn1 */,
-                      OSSL_HTTP_DEFAULT_MAX_RESP_LEN, 0 /* timeout */)
-        : OSSL_HTTP_transfer(NULL, NULL /* host */, NULL /* port */, path,
-                             0 /* use_ssl */, NULL /* proxy */, NULL /* no_pr */,
-                             wbio, rbio, NULL /* bio_fn */, NULL /* arg */,
-                             0 /* buf_size */, headers, content_type,
-                             req, content_type, !do_txt /* expect_asn1 */,
-                             OSSL_HTTP_DEFAULT_MAX_RESP_LEN, 0 /* timeout */,
-                             0 /* keep_alive */);
+    rsp = do_get ? OSSL_HTTP_get(real_server ? REAL_SERVER_URL : path,
+                       NULL /* proxy */, NULL /* no_proxy */,
+                       real_server ? NULL : wbio,
+                       real_server ? NULL : rbio,
+                       NULL /* bio_update_fn */, NULL /* arg */,
+                       0 /* buf_size */, headers,
+                       real_server ? "text/html; charset=utf-8" : content_type,
+                       !do_txt /* expect_asn1 */,
+                       OSSL_HTTP_DEFAULT_MAX_RESP_LEN, 0 /* timeout */)
+                 : OSSL_HTTP_transfer(NULL, NULL /* host */, NULL /* port */, path,
+                       0 /* use_ssl */, NULL /* proxy */, NULL /* no_pr */,
+                       wbio, rbio, NULL /* bio_fn */, NULL /* arg */,
+                       0 /* buf_size */, headers, content_type,
+                       req, content_type, !do_txt /* expect_asn1 */,
+                       OSSL_HTTP_DEFAULT_MAX_RESP_LEN, 0 /* timeout */,
+                       0 /* keep_alive */);
     if (!TEST_int_eq(suggested_status == HTTP_STATUS_CODES_FATAL_ERROR, rsp == NULL))
         goto err;
     if (suggested_status == HTTP_STATUS_CODES_FATAL_ERROR)
@@ -210,13 +214,13 @@ static int test_http_method(int do_get, int do_txt, int suggested_status)
             char rtext[sizeof(DOCTYPE_HTML)];
 
             res = TEST_int_eq(BIO_gets(rsp, rtext, sizeof(rtext)),
-                              sizeof(DOCTYPE_HTML) - 1)
+                      sizeof(DOCTYPE_HTML) - 1)
                 && TEST_str_eq(rtext, DOCTYPE_HTML);
         } else if (do_txt) {
             char rtext[sizeof(text1) + 1 /* more space than needed */];
 
             res = TEST_int_eq(BIO_gets(rsp, rtext, sizeof(rtext)),
-                              sizeof(text1) - 1)
+                      sizeof(text1) - 1)
                 && TEST_str_eq(rtext, text1);
         } else {
             X509 *rcert = d2i_X509_bio(rsp, NULL);
@@ -227,7 +231,7 @@ static int test_http_method(int do_get, int do_txt, int suggested_status)
         BIO_free(rsp);
     }
 
- err:
+err:
     BIO_free(req);
     BIO_free(wbio);
     BIO_free(rbio);
@@ -256,14 +260,14 @@ static int test_http_keep_alive(char version, int keep_alive, int kept_alive)
 
     for (res = 1, i = 1; res && i <= 2; i++) {
         rsp = OSSL_HTTP_transfer(&rctx, NULL /* server */, NULL /* port */,
-                                 RPATH, 0 /* use_ssl */,
-                                 NULL /* proxy */, NULL /* no_proxy */,
-                                 wbio, rbio, NULL /* bio_update_fn */, NULL,
-                                 0 /* buf_size */, NULL /* headers */,
-                                 NULL /* content_type */, NULL /* req => GET */,
-                                 content_type, 0 /* ASN.1 not expected */,
-                                 0 /* max_resp_len */, 0 /* timeout */,
-                                 keep_alive);
+            RPATH, 0 /* use_ssl */,
+            NULL /* proxy */, NULL /* no_proxy */,
+            wbio, rbio, NULL /* bio_update_fn */, NULL,
+            0 /* buf_size */, NULL /* headers */,
+            NULL /* content_type */, NULL /* req => GET */,
+            content_type, 0 /* ASN.1 not expected */,
+            0 /* max_resp_len */, 0 /* timeout */,
+            keep_alive);
         if (keep_alive == 2 && kept_alive == 0)
             res = res && TEST_ptr_null(rsp)
                 && TEST_int_eq(OSSL_HTTP_is_alive(rctx), 0);
@@ -276,14 +280,14 @@ static int test_http_keep_alive(char version, int keep_alive, int kept_alive)
     }
     OSSL_HTTP_close(rctx, res);
 
- err:
+err:
     BIO_free(wbio);
     BIO_free(rbio);
     return res;
 }
 
 static int test_http_url_ok(const char *url, int exp_ssl, const char *exp_host,
-                            const char *exp_port, const char *exp_path)
+    const char *exp_port, const char *exp_path)
 {
     char *user, *host, *port, *path, *query, *frag;
     int exp_num, num, ssl;
@@ -292,7 +296,7 @@ static int test_http_url_ok(const char *url, int exp_ssl, const char *exp_host,
     if (!TEST_int_eq(sscanf(exp_port, "%d", &exp_num), 1))
         return 0;
     res = TEST_true(OSSL_HTTP_parse_url(url, &ssl, &user, &host, &port, &num,
-                                        &path, &query, &frag))
+              &path, &query, &frag))
         && TEST_str_eq(host, exp_host)
         && TEST_str_eq(port, exp_port)
         && TEST_int_eq(num, exp_num)
@@ -319,7 +323,7 @@ static int test_http_url_path_query_ok(const char *url, const char *exp_path_qu)
     int res;
 
     res = TEST_true(OSSL_HTTP_parse_url(url, NULL, NULL, &host, NULL, NULL,
-                                        &path, NULL, NULL))
+              &path, NULL, NULL))
         && TEST_str_eq(host, "host")
         && TEST_str_eq(path, exp_path_qu);
     OPENSSL_free(host);
@@ -332,6 +336,16 @@ static int test_http_url_dns(void)
     return test_http_url_ok("host:65535/path", 0, "host", "65535", "/path");
 }
 
+static int test_http_url_timestamp(void)
+{
+    return test_http_url_ok("host/p/2017-01-03T00:00:00", 0, "host", "80",
+               "/p/2017-01-03T00:00:00")
+        && test_http_url_ok("http://host/p/2017-01-03T00:00:00", 0, "host",
+            "80", "/p/2017-01-03T00:00:00")
+        && test_http_url_ok("https://host/p/2017-01-03T00:00:00", 1, "host",
+            "443", "/p/2017-01-03T00:00:00");
+}
+
 static int test_http_url_path_query(void)
 {
     return test_http_url_path_query_ok("http://usr@host:1/p?q=x#frag", "/p?q=x")
@@ -361,7 +375,7 @@ static int test_http_url_invalid(const char *url)
     int res;
 
     res = TEST_false(OSSL_HTTP_parse_url(url, &ssl, NULL, &host, &port, &num,
-                                         &path, NULL, NULL))
+              &path, NULL, NULL))
         && TEST_ptr_null(host)
         && TEST_ptr_null(port)
         && TEST_ptr_null(path);
@@ -381,7 +395,7 @@ static int test_http_url_invalid_prefix(void)
 static int test_http_url_invalid_port(void)
 {
     return test_http_url_invalid("https://1.2.3.4:65536/pkix")
-           && test_http_url_invalid("https://1.2.3.4:");
+        && test_http_url_invalid("https://1.2.3.4:");
 }
 
 static int test_http_url_invalid_path(void)
@@ -504,7 +518,7 @@ static int test_http_resp_hdr_limit(size_t limit)
         goto err;
 
     if (!TEST_true(OSSL_HTTP_REQ_CTX_set_request_line(rctx, 0 /* GET */,
-                                                      NULL, NULL, RPATH)))
+            NULL, NULL, RPATH)))
         goto err;
 
     OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(rctx, limit);
@@ -519,7 +533,7 @@ static int test_http_resp_hdr_limit(size_t limit)
     else
         res = TEST_ptr(mem);
 
- err:
+err:
     BIO_free(wbio);
     BIO_free(rbio);
     OSSL_HTTP_REQ_CTX_free(rctx);
@@ -559,6 +573,7 @@ int setup_tests(void)
         return 0;
 
     ADD_TEST(test_http_url_dns);
+    ADD_TEST(test_http_url_timestamp);
     ADD_TEST(test_http_url_path_query);
     ADD_TEST(test_http_url_userinfo_query_fragment);
     ADD_TEST(test_http_url_ipv4);
diff --git a/test/ideatest.c b/test/ideatest.c
index f6d73d9d783c5..206ae9b16a430 100644
--- a/test/ideatest.c
+++ b/test/ideatest.c
@@ -20,14 +20,14 @@
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_IDEA
-# include <openssl/idea.h>
+#include <openssl/idea.h>
 
 static const unsigned char k[16] = {
     0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04,
     0x00, 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08
 };
 
-static const  unsigned char in[8] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03 };
+static const unsigned char in[8] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03 };
 static const unsigned char c[8] = { 0x11, 0xFB, 0xED, 0x2B, 0x01, 0x98, 0x6D, 0xE5 };
 
 static unsigned char out[80];
@@ -35,14 +35,28 @@ static unsigned char out[80];
 static const unsigned char text[] = "Hello to all people out there";
 
 static const unsigned char cfb_key[16] = {
-    0xe1, 0xf0, 0xc3, 0xd2, 0xa5, 0xb4, 0x87, 0x96,
-    0x69, 0x78, 0x4b, 0x5a, 0x2d, 0x3c, 0x0f, 0x1e,
+    0xe1,
+    0xf0,
+    0xc3,
+    0xd2,
+    0xa5,
+    0xb4,
+    0x87,
+    0x96,
+    0x69,
+    0x78,
+    0x4b,
+    0x5a,
+    0x2d,
+    0x3c,
+    0x0f,
+    0x1e,
 };
 static const unsigned char cfb_iv[80] = {
     0x34, 0x12, 0x78, 0x56, 0xab, 0x90, 0xef, 0xcd
 };
 static unsigned char cfb_buf1[40], cfb_buf2[40], cfb_tmp[8];
-# define CFB_TEST_SIZE 24
+#define CFB_TEST_SIZE 24
 static const unsigned char plain[CFB_TEST_SIZE] = {
     0x4e, 0x6f, 0x77, 0x20, 0x69, 0x73,
     0x20, 0x74, 0x68, 0x65, 0x20, 0x74,
@@ -54,9 +68,9 @@ static const unsigned char cfb_cipher64[CFB_TEST_SIZE] = {
     0x59, 0xD8, 0xE2, 0x65, 0x00, 0x58, 0x6C, 0x3F,
     0x2C, 0x17, 0x25, 0xD0, 0x1A, 0x38, 0xB7, 0x2A,
     0x39, 0x61, 0x37, 0xDC, 0x79, 0xFB, 0x9F, 0x45
-/*- 0xF9,0x78,0x32,0xB5,0x42,0x1A,0x6B,0x38,
-    0x9A,0x44,0xD6,0x04,0x19,0x43,0xC4,0xD9,
-    0x3D,0x1E,0xAE,0x47,0xFC,0xCF,0x29,0x0B,*/
+    /*- 0xF9,0x78,0x32,0xB5,0x42,0x1A,0x6B,0x38,
+        0x9A,0x44,0xD6,0x04,0x19,0x43,0xC4,0xD9,
+        0x3D,0x1E,0xAE,0x47,0xFC,0xCF,0x29,0x0B,*/
 };
 
 static int test_idea_ecb(void)
@@ -99,19 +113,19 @@ static int test_idea_cfb64(void)
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_tmp));
     n = 0;
     IDEA_cfb64_encrypt(plain, cfb_buf1, (long)12, &eks,
-                       cfb_tmp, &n, IDEA_ENCRYPT);
+        cfb_tmp, &n, IDEA_ENCRYPT);
     IDEA_cfb64_encrypt(&plain[12], &cfb_buf1[12],
-                       (long)CFB_TEST_SIZE - 12, &eks,
-                       cfb_tmp, &n, IDEA_ENCRYPT);
+        (long)CFB_TEST_SIZE - 12, &eks,
+        cfb_tmp, &n, IDEA_ENCRYPT);
     if (!TEST_mem_eq(cfb_cipher64, CFB_TEST_SIZE, cfb_buf1, CFB_TEST_SIZE))
         return 0;
     memcpy(cfb_tmp, cfb_iv, sizeof(cfb_tmp));
     n = 0;
     IDEA_cfb64_encrypt(cfb_buf1, cfb_buf2, (long)13, &eks,
-                       cfb_tmp, &n, IDEA_DECRYPT);
+        cfb_tmp, &n, IDEA_DECRYPT);
     IDEA_cfb64_encrypt(&cfb_buf1[13], &cfb_buf2[13],
-                       (long)CFB_TEST_SIZE - 13, &eks,
-                       cfb_tmp, &n, IDEA_DECRYPT);
+        (long)CFB_TEST_SIZE - 13, &eks,
+        cfb_tmp, &n, IDEA_DECRYPT);
     return TEST_mem_eq(plain, CFB_TEST_SIZE, cfb_buf2, CFB_TEST_SIZE);
 }
 #endif
diff --git a/test/igetest.c b/test/igetest.c
index 7a8ff6880270c..5a97ee514001a 100644
--- a/test/igetest.c
+++ b/test/igetest.c
@@ -20,19 +20,19 @@
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 
-# define TEST_SIZE       128
-# define BIG_TEST_SIZE 10240
+#define TEST_SIZE 128
+#define BIG_TEST_SIZE 10240
 
-# if BIG_TEST_SIZE < TEST_SIZE
-#  error BIG_TEST_SIZE is smaller than TEST_SIZE
-# endif
+#if BIG_TEST_SIZE < TEST_SIZE
+#error BIG_TEST_SIZE is smaller than TEST_SIZE
+#endif
 
 static unsigned char rkey[16];
 static unsigned char rkey2[16];
 static unsigned char plaintext[BIG_TEST_SIZE];
 static unsigned char saved_iv[AES_BLOCK_SIZE * 4];
 
-# define MAX_VECTOR_SIZE 64
+#define MAX_VECTOR_SIZE 64
 
 struct ige_test {
     const unsigned char key[16];
@@ -44,37 +44,37 @@ struct ige_test {
 };
 
 static struct ige_test const ige_test_vectors[] = {
-    {{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}, /* key */
-     {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-      0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f}, /* iv */
-     {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* in */
-     {0x1a, 0x85, 0x19, 0xa6, 0x55, 0x7b, 0xe6, 0x52,
-      0xe9, 0xda, 0x8e, 0x43, 0xda, 0x4e, 0xf4, 0x45,
-      0x3c, 0xf4, 0x56, 0xb4, 0xca, 0x48, 0x8a, 0xa3,
-      0x83, 0xc7, 0x9c, 0x98, 0xb3, 0x47, 0x97, 0xcb}, /* out */
-     32, AES_ENCRYPT},          /* test vector 0 */
-
-    {{0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20,
-      0x61, 0x6e, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x65}, /* key */
-     {0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f,
-      0x6e, 0x20, 0x6f, 0x66, 0x20, 0x49, 0x47, 0x45,
-      0x20, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x66, 0x6f,
-      0x72, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x53, 0x53}, /* iv */
-     {0x4c, 0x2e, 0x20, 0x4c, 0x65, 0x74, 0x27, 0x73,
-      0x20, 0x68, 0x6f, 0x70, 0x65, 0x20, 0x42, 0x65,
-      0x6e, 0x20, 0x67, 0x6f, 0x74, 0x20, 0x69, 0x74,
-      0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x21, 0x0a}, /* in */
-     {0x99, 0x70, 0x64, 0x87, 0xa1, 0xcd, 0xe6, 0x13,
-      0xbc, 0x6d, 0xe0, 0xb6, 0xf2, 0x4b, 0x1c, 0x7a,
-      0xa4, 0x48, 0xc8, 0xb9, 0xc3, 0x40, 0x3e, 0x34,
-      0x67, 0xa8, 0xca, 0xd8, 0x93, 0x40, 0xf5, 0x3b}, /* out */
-     32, AES_DECRYPT},          /* test vector 1 */
+    { { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+          0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, /* key */
+        { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+            0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+            0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+            0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, /* iv */
+        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* in */
+        { 0x1a, 0x85, 0x19, 0xa6, 0x55, 0x7b, 0xe6, 0x52,
+            0xe9, 0xda, 0x8e, 0x43, 0xda, 0x4e, 0xf4, 0x45,
+            0x3c, 0xf4, 0x56, 0xb4, 0xca, 0x48, 0x8a, 0xa3,
+            0x83, 0xc7, 0x9c, 0x98, 0xb3, 0x47, 0x97, 0xcb }, /* out */
+        32, AES_ENCRYPT }, /* test vector 0 */
+
+    { { 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20,
+          0x61, 0x6e, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x65 }, /* key */
+        { 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f,
+            0x6e, 0x20, 0x6f, 0x66, 0x20, 0x49, 0x47, 0x45,
+            0x20, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x66, 0x6f,
+            0x72, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x53, 0x53 }, /* iv */
+        { 0x4c, 0x2e, 0x20, 0x4c, 0x65, 0x74, 0x27, 0x73,
+            0x20, 0x68, 0x6f, 0x70, 0x65, 0x20, 0x42, 0x65,
+            0x6e, 0x20, 0x67, 0x6f, 0x74, 0x20, 0x69, 0x74,
+            0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x21, 0x0a }, /* in */
+        { 0x99, 0x70, 0x64, 0x87, 0xa1, 0xcd, 0xe6, 0x13,
+            0xbc, 0x6d, 0xe0, 0xb6, 0xf2, 0x4b, 0x1c, 0x7a,
+            0xa4, 0x48, 0xc8, 0xb9, 0xc3, 0x40, 0x3e, 0x34,
+            0x67, 0xa8, 0xca, 0xd8, 0x93, 0x40, 0xf5, 0x3b }, /* out */
+        32, AES_DECRYPT }, /* test vector 1 */
 };
 
 struct bi_ige_test {
@@ -89,60 +89,60 @@ struct bi_ige_test {
 };
 
 static struct bi_ige_test const bi_ige_test_vectors[] = {
-    {{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}, /* key1 */
-     {0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-      0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f}, /* key2 */
-     {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-      0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-      0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-      0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-      0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-      0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-      0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-      0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f}, /* iv */
-     {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, /* in */
-     {0x14, 0x40, 0x6f, 0xae, 0xa2, 0x79, 0xf2, 0x56,
-      0x1f, 0x86, 0xeb, 0x3b, 0x7d, 0xff, 0x53, 0xdc,
-      0x4e, 0x27, 0x0c, 0x03, 0xde, 0x7c, 0xe5, 0x16,
-      0x6a, 0x9c, 0x20, 0x33, 0x9d, 0x33, 0xfe, 0x12}, /* out */
-     16, 32, AES_ENCRYPT},      /* test vector 0 */
-    {{0x58, 0x0a, 0x06, 0xe9, 0x97, 0x07, 0x59, 0x5c,
-      0x9e, 0x19, 0xd2, 0xa7, 0xbb, 0x40, 0x2b, 0x7a,
-      0xc7, 0xd8, 0x11, 0x9e, 0x4c, 0x51, 0x35, 0x75,
-      0x64, 0x28, 0x0f, 0x23, 0xad, 0x74, 0xac, 0x37}, /* key1 */
-     {0xd1, 0x80, 0xa0, 0x31, 0x47, 0xa3, 0x11, 0x13,
-      0x86, 0x26, 0x9e, 0x6d, 0xff, 0xaf, 0x72, 0x74,
-      0x5b, 0xa2, 0x35, 0x81, 0xd2, 0xa6, 0x3d, 0x21,
-      0x67, 0x7b, 0x58, 0xa8, 0x18, 0xf9, 0x72, 0xe4}, /* key2 */
-     {0x80, 0x3d, 0xbd, 0x4c, 0xe6, 0x7b, 0x06, 0xa9,
-      0x53, 0x35, 0xd5, 0x7e, 0x71, 0xc1, 0x70, 0x70,
-      0x74, 0x9a, 0x00, 0x28, 0x0c, 0xbf, 0x6c, 0x42,
-      0x9b, 0xa4, 0xdd, 0x65, 0x11, 0x77, 0x7c, 0x67,
-      0xfe, 0x76, 0x0a, 0xf0, 0xd5, 0xc6, 0x6e, 0x6a,
-      0xe7, 0x5e, 0x4c, 0xf2, 0x7e, 0x9e, 0xf9, 0x20,
-      0x0e, 0x54, 0x6f, 0x2d, 0x8a, 0x8d, 0x7e, 0xbd,
-      0x48, 0x79, 0x37, 0x99, 0xff, 0x27, 0x93, 0xa3}, /* iv */
-     {0xf1, 0x54, 0x3d, 0xca, 0xfe, 0xb5, 0xef, 0x1c,
-      0x4f, 0xa6, 0x43, 0xf6, 0xe6, 0x48, 0x57, 0xf0,
-      0xee, 0x15, 0x7f, 0xe3, 0xe7, 0x2f, 0xd0, 0x2f,
-      0x11, 0x95, 0x7a, 0x17, 0x00, 0xab, 0xa7, 0x0b,
-      0xbe, 0x44, 0x09, 0x9c, 0xcd, 0xac, 0xa8, 0x52,
-      0xa1, 0x8e, 0x7b, 0x75, 0xbc, 0xa4, 0x92, 0x5a,
-      0xab, 0x46, 0xd3, 0x3a, 0xa0, 0xd5, 0x35, 0x1c,
-      0x55, 0xa4, 0xb3, 0xa8, 0x40, 0x81, 0xa5, 0x0b}, /* in */
-     {0x42, 0xe5, 0x28, 0x30, 0x31, 0xc2, 0xa0, 0x23,
-      0x68, 0x49, 0x4e, 0xb3, 0x24, 0x59, 0x92, 0x79,
-      0xc1, 0xa5, 0xcc, 0xe6, 0x76, 0x53, 0xb1, 0xcf,
-      0x20, 0x86, 0x23, 0xe8, 0x72, 0x55, 0x99, 0x92,
-      0x0d, 0x16, 0x1c, 0x5a, 0x2f, 0xce, 0xcb, 0x51,
-      0xe2, 0x67, 0xfa, 0x10, 0xec, 0xcd, 0x3d, 0x67,
-      0xa5, 0xe6, 0xf7, 0x31, 0x26, 0xb0, 0x0d, 0x76,
-      0x5e, 0x28, 0xdc, 0x7f, 0x01, 0xc5, 0xa5, 0x4c}, /* out */
-     32, 64, AES_ENCRYPT},      /* test vector 1 */
+    { { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+          0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, /* key1 */
+        { 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+            0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, /* key2 */
+        { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+            0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+            0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+            0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+            0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+            0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+            0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+            0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f }, /* iv */
+        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* in */
+        { 0x14, 0x40, 0x6f, 0xae, 0xa2, 0x79, 0xf2, 0x56,
+            0x1f, 0x86, 0xeb, 0x3b, 0x7d, 0xff, 0x53, 0xdc,
+            0x4e, 0x27, 0x0c, 0x03, 0xde, 0x7c, 0xe5, 0x16,
+            0x6a, 0x9c, 0x20, 0x33, 0x9d, 0x33, 0xfe, 0x12 }, /* out */
+        16, 32, AES_ENCRYPT }, /* test vector 0 */
+    { { 0x58, 0x0a, 0x06, 0xe9, 0x97, 0x07, 0x59, 0x5c,
+          0x9e, 0x19, 0xd2, 0xa7, 0xbb, 0x40, 0x2b, 0x7a,
+          0xc7, 0xd8, 0x11, 0x9e, 0x4c, 0x51, 0x35, 0x75,
+          0x64, 0x28, 0x0f, 0x23, 0xad, 0x74, 0xac, 0x37 }, /* key1 */
+        { 0xd1, 0x80, 0xa0, 0x31, 0x47, 0xa3, 0x11, 0x13,
+            0x86, 0x26, 0x9e, 0x6d, 0xff, 0xaf, 0x72, 0x74,
+            0x5b, 0xa2, 0x35, 0x81, 0xd2, 0xa6, 0x3d, 0x21,
+            0x67, 0x7b, 0x58, 0xa8, 0x18, 0xf9, 0x72, 0xe4 }, /* key2 */
+        { 0x80, 0x3d, 0xbd, 0x4c, 0xe6, 0x7b, 0x06, 0xa9,
+            0x53, 0x35, 0xd5, 0x7e, 0x71, 0xc1, 0x70, 0x70,
+            0x74, 0x9a, 0x00, 0x28, 0x0c, 0xbf, 0x6c, 0x42,
+            0x9b, 0xa4, 0xdd, 0x65, 0x11, 0x77, 0x7c, 0x67,
+            0xfe, 0x76, 0x0a, 0xf0, 0xd5, 0xc6, 0x6e, 0x6a,
+            0xe7, 0x5e, 0x4c, 0xf2, 0x7e, 0x9e, 0xf9, 0x20,
+            0x0e, 0x54, 0x6f, 0x2d, 0x8a, 0x8d, 0x7e, 0xbd,
+            0x48, 0x79, 0x37, 0x99, 0xff, 0x27, 0x93, 0xa3 }, /* iv */
+        { 0xf1, 0x54, 0x3d, 0xca, 0xfe, 0xb5, 0xef, 0x1c,
+            0x4f, 0xa6, 0x43, 0xf6, 0xe6, 0x48, 0x57, 0xf0,
+            0xee, 0x15, 0x7f, 0xe3, 0xe7, 0x2f, 0xd0, 0x2f,
+            0x11, 0x95, 0x7a, 0x17, 0x00, 0xab, 0xa7, 0x0b,
+            0xbe, 0x44, 0x09, 0x9c, 0xcd, 0xac, 0xa8, 0x52,
+            0xa1, 0x8e, 0x7b, 0x75, 0xbc, 0xa4, 0x92, 0x5a,
+            0xab, 0x46, 0xd3, 0x3a, 0xa0, 0xd5, 0x35, 0x1c,
+            0x55, 0xa4, 0xb3, 0xa8, 0x40, 0x81, 0xa5, 0x0b }, /* in */
+        { 0x42, 0xe5, 0x28, 0x30, 0x31, 0xc2, 0xa0, 0x23,
+            0x68, 0x49, 0x4e, 0xb3, 0x24, 0x59, 0x92, 0x79,
+            0xc1, 0xa5, 0xcc, 0xe6, 0x76, 0x53, 0xb1, 0xcf,
+            0x20, 0x86, 0x23, 0xe8, 0x72, 0x55, 0x99, 0x92,
+            0x0d, 0x16, 0x1c, 0x5a, 0x2f, 0xce, 0xcb, 0x51,
+            0xe2, 0x67, 0xfa, 0x10, 0xec, 0xcd, 0x3d, 0x67,
+            0xa5, 0xe6, 0xf7, 0x31, 0x26, 0xb0, 0x0d, 0x76,
+            0x5e, 0x28, 0xdc, 0x7f, 0x01, 0xc5, 0xa5, 0x4c }, /* out */
+        32, 64, AES_ENCRYPT }, /* test vector 1 */
 
 };
 
@@ -195,8 +195,8 @@ static int test_bi_ige_vectors(int n)
     AES_KEY key2;
     unsigned char buf[MAX_VECTOR_SIZE];
 
-        if (!TEST_int_le(v->length, MAX_VECTOR_SIZE))
-            return 0;
+    if (!TEST_int_le(v->length, MAX_VECTOR_SIZE))
+        return 0;
 
     if (v->encrypt == AES_ENCRYPT) {
         AES_set_encrypt_key(v->key1, 8 * v->keysize, &key1);
@@ -207,7 +207,7 @@ static int test_bi_ige_vectors(int n)
     }
 
     AES_bi_ige_encrypt(v->in, buf, v->length, &key1, &key2, v->iv,
-                       v->encrypt);
+        v->encrypt);
 
     if (!TEST_mem_eq(v->out, v->length, buf, v->length)) {
         test_output_memory("key 1", v->key1, sizeof(v->key1));
@@ -248,10 +248,10 @@ static int test_ige_enc_chaining(void)
     AES_set_encrypt_key(rkey, 8 * sizeof(rkey), &key);
     memcpy(iv, saved_iv, sizeof(iv));
     AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE / 2, &key, iv,
-                    AES_ENCRYPT);
+        AES_ENCRYPT);
     AES_ige_encrypt(plaintext + TEST_SIZE / 2,
-                    ciphertext + TEST_SIZE / 2, TEST_SIZE / 2,
-                    &key, iv, AES_ENCRYPT);
+        ciphertext + TEST_SIZE / 2, TEST_SIZE / 2,
+        &key, iv, AES_ENCRYPT);
 
     AES_set_decrypt_key(rkey, 8 * sizeof(rkey), &key);
     memcpy(iv, saved_iv, sizeof(iv));
@@ -270,18 +270,18 @@ static int test_ige_dec_chaining(void)
     AES_set_encrypt_key(rkey, 8 * sizeof(rkey), &key);
     memcpy(iv, saved_iv, sizeof(iv));
     AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE / 2, &key, iv,
-                    AES_ENCRYPT);
+        AES_ENCRYPT);
     AES_ige_encrypt(plaintext + TEST_SIZE / 2,
-                    ciphertext + TEST_SIZE / 2, TEST_SIZE / 2,
-                    &key, iv, AES_ENCRYPT);
+        ciphertext + TEST_SIZE / 2, TEST_SIZE / 2,
+        &key, iv, AES_ENCRYPT);
 
     AES_set_decrypt_key(rkey, 8 * sizeof(rkey), &key);
     memcpy(iv, saved_iv, sizeof(iv));
     AES_ige_encrypt(ciphertext, checktext, TEST_SIZE / 2, &key, iv,
-                    AES_DECRYPT);
+        AES_DECRYPT);
     AES_ige_encrypt(ciphertext + TEST_SIZE / 2,
-                    checktext + TEST_SIZE / 2, TEST_SIZE / 2, &key, iv,
-                    AES_DECRYPT);
+        checktext + TEST_SIZE / 2, TEST_SIZE / 2, &key, iv,
+        AES_DECRYPT);
 
     return TEST_mem_eq(checktext, TEST_SIZE, plaintext, TEST_SIZE);
 }
@@ -300,14 +300,14 @@ static int test_ige_garble_forwards(void)
     AES_set_encrypt_key(rkey, 8 * sizeof(rkey), &key);
     memcpy(iv, saved_iv, sizeof(iv));
     AES_ige_encrypt(plaintext, ciphertext, sizeof(plaintext), &key, iv,
-                    AES_ENCRYPT);
+        AES_ENCRYPT);
 
     /* corrupt halfway through */
     ++ciphertext[sizeof(ciphertext) / 2];
     AES_set_decrypt_key(rkey, 8 * sizeof(rkey), &key);
     memcpy(iv, saved_iv, sizeof(iv));
     AES_ige_encrypt(ciphertext, checktext, sizeof(checktext), &key, iv,
-                    AES_DECRYPT);
+        AES_DECRYPT);
 
     matches = 0;
     for (n = 0; n < sizeof(checktext); ++n)
@@ -335,12 +335,12 @@ static int test_bi_ige_enc_dec(void)
     AES_set_encrypt_key(rkey, 8 * sizeof(rkey), &key);
     AES_set_encrypt_key(rkey2, 8 * sizeof(rkey2), &key2);
     AES_bi_ige_encrypt(plaintext, ciphertext, TEST_SIZE, &key, &key2, iv,
-                       AES_ENCRYPT);
+        AES_ENCRYPT);
 
     AES_set_decrypt_key(rkey, 8 * sizeof(rkey), &key);
     AES_set_decrypt_key(rkey2, 8 * sizeof(rkey2), &key2);
     AES_bi_ige_encrypt(ciphertext, checktext, TEST_SIZE, &key, &key2, iv,
-                       AES_DECRYPT);
+        AES_DECRYPT);
 
     return TEST_mem_eq(checktext, TEST_SIZE, plaintext, TEST_SIZE);
 }
@@ -358,14 +358,14 @@ static int test_bi_ige_garble1(void)
     AES_set_encrypt_key(rkey, 8 * sizeof(rkey), &key);
     AES_set_encrypt_key(rkey2, 8 * sizeof(rkey2), &key2);
     AES_ige_encrypt(plaintext, ciphertext, sizeof(plaintext), &key, iv,
-                    AES_ENCRYPT);
+        AES_ENCRYPT);
 
     /* corrupt halfway through */
     ++ciphertext[sizeof(ciphertext) / 2];
     AES_set_decrypt_key(rkey, 8 * sizeof(rkey), &key);
     AES_set_decrypt_key(rkey2, 8 * sizeof(rkey2), &key2);
     AES_ige_encrypt(ciphertext, checktext, sizeof(checktext), &key, iv,
-                    AES_DECRYPT);
+        AES_DECRYPT);
 
     matches = 0;
     for (n = 0; n < sizeof(checktext); ++n)
@@ -389,14 +389,14 @@ static int test_bi_ige_garble2(void)
     AES_set_encrypt_key(rkey, 8 * sizeof(rkey), &key);
     AES_set_encrypt_key(rkey2, 8 * sizeof(rkey2), &key2);
     AES_ige_encrypt(plaintext, ciphertext, sizeof(plaintext), &key, iv,
-                    AES_ENCRYPT);
+        AES_ENCRYPT);
 
     /* corrupt right at the end */
     ++ciphertext[sizeof(ciphertext) - 1];
     AES_set_decrypt_key(rkey, 8 * sizeof(rkey), &key);
     AES_set_decrypt_key(rkey2, 8 * sizeof(rkey2), &key2);
     AES_ige_encrypt(ciphertext, checktext, sizeof(checktext), &key, iv,
-                    AES_DECRYPT);
+        AES_DECRYPT);
 
     matches = 0;
     for (n = 0; n < sizeof(checktext); ++n)
@@ -420,14 +420,14 @@ static int test_bi_ige_garble3(void)
     AES_set_encrypt_key(rkey, 8 * sizeof(rkey), &key);
     AES_set_encrypt_key(rkey2, 8 * sizeof(rkey2), &key2);
     AES_ige_encrypt(plaintext, ciphertext, sizeof(plaintext), &key, iv,
-                    AES_ENCRYPT);
+        AES_ENCRYPT);
 
     /* corrupt right at the start */
     ++ciphertext[0];
     AES_set_decrypt_key(rkey, 8 * sizeof(rkey), &key);
     AES_set_decrypt_key(rkey2, 8 * sizeof(rkey2), &key2);
     AES_ige_encrypt(ciphertext, checktext, sizeof(checktext), &key, iv,
-                    AES_DECRYPT);
+        AES_DECRYPT);
 
     matches = 0;
     for (n = 0; n < sizeof(checktext); ++n)
diff --git a/test/json_test.c b/test/json_test.c
index 33d9522dd07b6..b54bdc0fd27f8 100644
--- a/test/json_test.c
+++ b/test/json_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -14,10 +14,10 @@
 #include "internal/json_enc.h"
 
 struct helper {
-    OSSL_JSON_ENC   j;
-    int             init;
-    uint32_t        flags;
-    BIO             *mem_bio;
+    OSSL_JSON_ENC j;
+    int init;
+    uint32_t flags;
+    BIO *mem_bio;
 };
 
 static int helper_ensure(struct helper *h)
@@ -56,40 +56,40 @@ static void helper_set_flags(struct helper *h, uint32_t flags)
 }
 
 struct script_word {
-    void        *p;
-    uint64_t    u64;
-    int64_t     i64;
-    double      d;
-    void        (*fp)(void);
+    void *p;
+    uint64_t u64;
+    int64_t i64;
+    double d;
+    void (*fp)(void);
 };
 
-#define OP_P(x)     { (x) },
-#define OP_U64(x)   { NULL, (x) },
-#define OP_I64(x)   { NULL, 0, (x) },
-#define OP_D(x)     { NULL, 0, 0, (x) },
-#define OP_FP(x)    { NULL, 0, 0, 0, (void (*)(void))(x) },
+#define OP_P(x) { (x) },
+#define OP_U64(x) { NULL, (x) },
+#define OP_I64(x) { NULL, 0, (x) },
+#define OP_D(x) { NULL, 0, 0, (x) },
+#define OP_FP(x) { NULL, 0, 0, 0, (void (*)(void))(x) },
 
 struct script_info {
-    const char                  *name, *title;
-    const struct script_word    *words;
-    size_t                      num_words;
-    const char                  *expected_output;
-    size_t                      expected_output_len;
+    const char *name, *title;
+    const struct script_word *words;
+    size_t num_words;
+    const char *expected_output;
+    size_t expected_output_len;
 };
 
 typedef const struct script_info *(*info_func)(void);
 
 enum {
     OPK_END,
-    OPK_CALL,           /* (OSSL_JSON_ENC *) */
-    OPK_CALL_P,         /* (OSSL_JSON_ENC *, const void *) */
-    OPK_CALL_I,         /* (OSSL_JSON_ENC *, int) */
-    OPK_CALL_U64,       /* (OSSL_JSON_ENC *, uint64_t) */
-    OPK_CALL_I64,       /* (OSSL_JSON_ENC *, int64_t) */
-    OPK_CALL_D,         /* (OSSL_JSON_ENC *, double) */
-    OPK_CALL_PZ,        /* (OSSL_JSON_ENC *, const void *, size_t) */
-    OPK_ASSERT_ERROR,   /* (OSSL_JSON_ENC *, int expect_error) */
-    OPK_INIT_FLAGS      /* (uint32_t flags) */
+    OPK_CALL, /* (OSSL_JSON_ENC *) */
+    OPK_CALL_P, /* (OSSL_JSON_ENC *, const void *) */
+    OPK_CALL_I, /* (OSSL_JSON_ENC *, int) */
+    OPK_CALL_U64, /* (OSSL_JSON_ENC *, uint64_t) */
+    OPK_CALL_I64, /* (OSSL_JSON_ENC *, int64_t) */
+    OPK_CALL_D, /* (OSSL_JSON_ENC *, double) */
+    OPK_CALL_PZ, /* (OSSL_JSON_ENC *, const void *, size_t) */
+    OPK_ASSERT_ERROR, /* (OSSL_JSON_ENC *, int expect_error) */
+    OPK_INIT_FLAGS /* (uint32_t flags) */
 };
 
 typedef void (*fp_type)(OSSL_JSON_ENC *);
@@ -100,48 +100,48 @@ typedef void (*fp_i64_type)(OSSL_JSON_ENC *, int64_t);
 typedef void (*fp_d_type)(OSSL_JSON_ENC *, double);
 typedef void (*fp_pz_type)(OSSL_JSON_ENC *, const void *, size_t);
 
-#define OP_END()              OP_U64(OPK_END)
-#define OP_CALL(f)            OP_U64(OPK_CALL)     OP_FP(f)
-#define OP_CALL_P(f, x)       OP_U64(OPK_CALL_P)   OP_FP(f) OP_P  (x)
-#define OP_CALL_I(f, x)       OP_U64(OPK_CALL_I)   OP_FP(f) OP_I64(x)
-#define OP_CALL_U64(f, x)     OP_U64(OPK_CALL_U64) OP_FP(f) OP_U64(x)
-#define OP_CALL_I64(f, x)     OP_U64(OPK_CALL_I64) OP_FP(f) OP_I64(x)
-#define OP_CALL_D(f, x)       OP_U64(OPK_CALL_D)   OP_FP(f) OP_D  (x)
-#define OP_CALL_PZ(f, x, xl)  OP_U64(OPK_CALL_PZ)  OP_FP(f) OP_P  (x) OP_U64(xl)
-#define OP_ASSERT_ERROR(err)  OP_U64(OPK_ASSERT_ERROR) OP_U64(err)
-#define OP_INIT_FLAGS(flags)  OP_U64(OPK_INIT_FLAGS)   OP_U64(flags)
-
-#define OPJ_BEGIN_O()         OP_CALL(ossl_json_object_begin)
-#define OPJ_END_O()           OP_CALL(ossl_json_object_end)
-#define OPJ_BEGIN_A()         OP_CALL(ossl_json_array_begin)
-#define OPJ_END_A()           OP_CALL(ossl_json_array_end)
-#define OPJ_NULL()            OP_CALL(ossl_json_null)
-#define OPJ_BOOL(x)           OP_CALL_I(ossl_json_bool, (x))
-#define OPJ_U64(x)            OP_CALL_U64(ossl_json_u64, (x))
-#define OPJ_I64(x)            OP_CALL_I64(ossl_json_i64, (x))
-#define OPJ_F64(x)            OP_CALL_D(ossl_json_f64, (x))
-#define OPJ_KEY(x)            OP_CALL_P(ossl_json_key, (x))
-#define OPJ_STR(x)            OP_CALL_P(ossl_json_str, (x))
-#define OPJ_STR_LEN(x, xl)    OP_CALL_PZ(ossl_json_str_len, (x), (xl))
-#define OPJ_STR_HEX(x, xl)    OP_CALL_PZ(ossl_json_str_hex, (x), (xl))
-
-#define BEGIN_SCRIPT(name, title, flags)                                       \
-    static const struct script_info *get_script_##name(void)                   \
-    {                                                                          \
-        static const char script_name[] = #name;                               \
-        static const char script_title[] = #title;                             \
-                                                                               \
-        static const struct script_word script_words[] = {                     \
+#define OP_END() OP_U64(OPK_END)
+#define OP_CALL(f) OP_U64(OPK_CALL) OP_FP(f)
+#define OP_CALL_P(f, x) OP_U64(OPK_CALL_P) OP_FP(f) OP_P(x)
+#define OP_CALL_I(f, x) OP_U64(OPK_CALL_I) OP_FP(f) OP_I64(x)
+#define OP_CALL_U64(f, x) OP_U64(OPK_CALL_U64) OP_FP(f) OP_U64(x)
+#define OP_CALL_I64(f, x) OP_U64(OPK_CALL_I64) OP_FP(f) OP_I64(x)
+#define OP_CALL_D(f, x) OP_U64(OPK_CALL_D) OP_FP(f) OP_D(x)
+#define OP_CALL_PZ(f, x, xl) OP_U64(OPK_CALL_PZ) OP_FP(f) OP_P(x) OP_U64(xl)
+#define OP_ASSERT_ERROR(err) OP_U64(OPK_ASSERT_ERROR) OP_U64(err)
+#define OP_INIT_FLAGS(flags) OP_U64(OPK_INIT_FLAGS) OP_U64(flags)
+
+#define OPJ_BEGIN_O() OP_CALL(ossl_json_object_begin)
+#define OPJ_END_O() OP_CALL(ossl_json_object_end)
+#define OPJ_BEGIN_A() OP_CALL(ossl_json_array_begin)
+#define OPJ_END_A() OP_CALL(ossl_json_array_end)
+#define OPJ_NULL() OP_CALL(ossl_json_null)
+#define OPJ_BOOL(x) OP_CALL_I(ossl_json_bool, (x))
+#define OPJ_U64(x) OP_CALL_U64(ossl_json_u64, (x))
+#define OPJ_I64(x) OP_CALL_I64(ossl_json_i64, (x))
+#define OPJ_KEY(x) OP_CALL_P(ossl_json_key, (x))
+#define OPJ_STR(x) OP_CALL_P(ossl_json_str, (x))
+#define OPJ_STR_LEN(x, xl) OP_CALL_PZ(ossl_json_str_len, (x), (xl))
+#define OPJ_STR_HEX(x, xl) OP_CALL_PZ(ossl_json_str_hex, (x), (xl))
+
+#define BEGIN_SCRIPT(name, title, flags)                     \
+    static const struct script_info *get_script_##name(void) \
+    {                                                        \
+        static const char script_name[] = #name;             \
+        static const char script_title[] = #title;           \
+                                                             \
+        static const struct script_word script_words[] = {   \
             OP_INIT_FLAGS(flags)
 
-#define END_SCRIPT_EXPECTING(s, slen)                                          \
-            OP_END()                                                           \
-        };                                                                     \
-        static const struct script_info script_info = {                        \
-            script_name, script_title, script_words, OSSL_NELEM(script_words), \
-            (s), (slen)                                                        \
-        };                                                                     \
-        return &script_info;                                                   \
+#define END_SCRIPT_EXPECTING(s, slen)                                      \
+    OP_END()                                                               \
+    }                                                                      \
+    ;                                                                      \
+    static const struct script_info script_info = {                        \
+        script_name, script_title, script_words, OSSL_NELEM(script_words), \
+        (s), (slen)                                                        \
+    };                                                                     \
+    return &script_info;                                                   \
     }
 
 #ifdef OPENSSL_SYS_VMS
@@ -150,394 +150,397 @@ typedef void (*fp_pz_type)(OSSL_JSON_ENC *, const void *, size_t);
  * stops the build.  Because we think we know what we're doing, we change that
  * particular message to be merely informational.
  */
-# pragma message informational UCNNOMAP
+#pragma message informational UCNNOMAP
 #endif
 
-#define END_SCRIPT_EXPECTING_S(s)   END_SCRIPT_EXPECTING(s, SIZE_MAX)
-#define END_SCRIPT_EXPECTING_Q(s)   END_SCRIPT_EXPECTING(#s, sizeof(#s) - 1)
+#define END_SCRIPT_EXPECTING_S(s) END_SCRIPT_EXPECTING(s, SIZE_MAX)
+#define END_SCRIPT_EXPECTING_Q(s) END_SCRIPT_EXPECTING(#s, sizeof(#s) - 1)
 
 #define SCRIPT(name) get_script_##name,
 
 BEGIN_SCRIPT(null, "serialize a single null", 0)
-    OPJ_NULL()
+OPJ_NULL()
 END_SCRIPT_EXPECTING_Q(null)
 
 BEGIN_SCRIPT(obj_empty, "serialize an empty object", 0)
-    OPJ_BEGIN_O()
-    OPJ_END_O()
+OPJ_BEGIN_O()
+OPJ_END_O()
 END_SCRIPT_EXPECTING_Q({})
 
 BEGIN_SCRIPT(array_empty, "serialize an empty array", 0)
-    OPJ_BEGIN_A()
-    OPJ_END_A()
+OPJ_BEGIN_A()
+OPJ_END_A()
 END_SCRIPT_EXPECTING_Q([])
 
 BEGIN_SCRIPT(bool_false, "serialize false", 0)
-    OPJ_BOOL(0)
+OPJ_BOOL(0)
 END_SCRIPT_EXPECTING_Q(false)
 
 BEGIN_SCRIPT(bool_true, "serialize true", 0)
-    OPJ_BOOL(1)
+OPJ_BOOL(1)
 END_SCRIPT_EXPECTING_Q(true)
 
 BEGIN_SCRIPT(u64_0, "serialize u64(0)", 0)
-    OPJ_U64(0)
+OPJ_U64(0)
 END_SCRIPT_EXPECTING_Q(0)
 
 BEGIN_SCRIPT(u64_1, "serialize u64(1)", 0)
-    OPJ_U64(1)
+OPJ_U64(1)
 END_SCRIPT_EXPECTING_Q(1)
 
 BEGIN_SCRIPT(u64_10, "serialize u64(10)", 0)
-    OPJ_U64(10)
+OPJ_U64(10)
 END_SCRIPT_EXPECTING_Q(10)
 
 BEGIN_SCRIPT(u64_12345, "serialize u64(12345)", 0)
-    OPJ_U64(12345)
+OPJ_U64(12345)
 END_SCRIPT_EXPECTING_Q(12345)
 
 BEGIN_SCRIPT(u64_18446744073709551615, "serialize u64(18446744073709551615)", 0)
-    OPJ_U64(18446744073709551615ULL)
+OPJ_U64(18446744073709551615ULL)
 END_SCRIPT_EXPECTING_Q(18446744073709551615)
 
 BEGIN_SCRIPT(i64_0, "serialize i64(0)", 0)
-    OPJ_I64(0)
+OPJ_I64(0)
 END_SCRIPT_EXPECTING_Q(0)
 
 BEGIN_SCRIPT(i64_1, "serialize i64(1)", 0)
-    OPJ_I64(1)
+OPJ_I64(1)
 END_SCRIPT_EXPECTING_Q(1)
 
 BEGIN_SCRIPT(i64_2, "serialize i64(2)", 0)
-    OPJ_I64(2)
+OPJ_I64(2)
 END_SCRIPT_EXPECTING_Q(2)
 
 BEGIN_SCRIPT(i64_10, "serialize i64(10)", 0)
-    OPJ_I64(10)
+OPJ_I64(10)
 END_SCRIPT_EXPECTING_Q(10)
 
 BEGIN_SCRIPT(i64_12345, "serialize i64(12345)", 0)
-    OPJ_I64(12345)
+OPJ_I64(12345)
 END_SCRIPT_EXPECTING_Q(12345)
 
 BEGIN_SCRIPT(i64_9223372036854775807, "serialize i64(9223372036854775807)", 0)
-    OPJ_I64(9223372036854775807LL)
+OPJ_I64(9223372036854775807LL)
 END_SCRIPT_EXPECTING_Q(9223372036854775807)
 
 BEGIN_SCRIPT(i64_m1, "serialize i64(-1)", 0)
-    OPJ_I64(-1)
+OPJ_I64(-1)
 END_SCRIPT_EXPECTING_Q(-1)
 
 BEGIN_SCRIPT(i64_m2, "serialize i64(-2)", 0)
-    OPJ_I64(-2)
+OPJ_I64(-2)
 END_SCRIPT_EXPECTING_Q(-2)
 
 BEGIN_SCRIPT(i64_m10, "serialize i64(-10)", 0)
-    OPJ_I64(-10)
+OPJ_I64(-10)
 END_SCRIPT_EXPECTING_Q(-10)
 
 BEGIN_SCRIPT(i64_m12345, "serialize i64(-12345)", 0)
-    OPJ_I64(-12345)
+OPJ_I64(-12345)
 END_SCRIPT_EXPECTING_Q(-12345)
 
 BEGIN_SCRIPT(i64_m9223372036854775807, "serialize i64(-9223372036854775807)", 0)
-    OPJ_I64(-9223372036854775807LL)
+OPJ_I64(-9223372036854775807LL)
 END_SCRIPT_EXPECTING_Q(-9223372036854775807)
 
 BEGIN_SCRIPT(i64_m9223372036854775808, "serialize i64(-9223372036854775808)", 0)
-    OPJ_I64(-9223372036854775807LL - 1LL)
+OPJ_I64(-9223372036854775807LL - 1LL)
 END_SCRIPT_EXPECTING_Q(-9223372036854775808)
 
 BEGIN_SCRIPT(str_empty, "serialize \"\"", 0)
-    OPJ_STR("")
+OPJ_STR("")
 END_SCRIPT_EXPECTING_Q("")
 
 BEGIN_SCRIPT(str_a, "serialize \"a\"", 0)
-    OPJ_STR("a")
+OPJ_STR("a")
 END_SCRIPT_EXPECTING_Q("a")
 
 BEGIN_SCRIPT(str_abc, "serialize \"abc\"", 0)
-    OPJ_STR("abc")
+OPJ_STR("abc")
 END_SCRIPT_EXPECTING_Q("abc")
 
 BEGIN_SCRIPT(str_quote, "serialize with quote", 0)
-    OPJ_STR("abc\"def")
+OPJ_STR("abc\"def")
 END_SCRIPT_EXPECTING_Q("abc\"def")
 
 BEGIN_SCRIPT(str_quote2, "serialize with quote", 0)
-    OPJ_STR("abc\"\"def")
+OPJ_STR("abc\"\"def")
 END_SCRIPT_EXPECTING_Q("abc\"\"def")
 
 BEGIN_SCRIPT(str_escape, "serialize with various escapes", 0)
-    OPJ_STR("abc\"\"de'f\r\n\t\b\f\\\x01\v\x7f\\")
+OPJ_STR("abc\"\"de'f\r\n\t\b\f\\\x01\v\x7f\\")
 END_SCRIPT_EXPECTING_Q("abc\"\"de'f\r\n\t\b\f\\\u0001\u000b\u007f\\")
 
 BEGIN_SCRIPT(str_len, "length-signalled string", 0)
-    OPJ_STR_LEN("abcdef", 6)
+OPJ_STR_LEN("abcdef", 6)
 END_SCRIPT_EXPECTING_Q("abcdef")
 
 BEGIN_SCRIPT(str_len0, "0-length-signalled string", 0)
-    OPJ_STR_LEN("", 0)
+OPJ_STR_LEN("", 0)
 END_SCRIPT_EXPECTING_Q("")
 
 BEGIN_SCRIPT(str_len_nul, "string with NUL", 0)
-    OPJ_STR_LEN("x\0y", 3)
+OPJ_STR_LEN("x\0y", 3)
 END_SCRIPT_EXPECTING_Q("x\u0000y")
 
 BEGIN_SCRIPT(hex_data0, "zero-length hex data", 0)
-    OPJ_STR_HEX("", 0)
+OPJ_STR_HEX("", 0)
 END_SCRIPT_EXPECTING_Q("")
 
 BEGIN_SCRIPT(hex_data, "hex data", 0)
-    OPJ_STR_HEX("\x00\x01\x5a\xfb\xff", 5)
+OPJ_STR_HEX("\x00\x01\x5a\xfb\xff", 5)
 END_SCRIPT_EXPECTING_Q("00015afbff")
 
 BEGIN_SCRIPT(array_nest1, "serialize nested empty arrays", 0)
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_END_A()
-    OPJ_END_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_END_A()
+OPJ_END_A()
 END_SCRIPT_EXPECTING_Q([[]])
 
 BEGIN_SCRIPT(array_nest2, "serialize nested empty arrays", 0)
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
 END_SCRIPT_EXPECTING_Q([[[]]])
 
 BEGIN_SCRIPT(array_nest3, "serialize nested empty arrays", 0)
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_END_A()
-    OPJ_BEGIN_A()
-    OPJ_END_A()
-    OPJ_BEGIN_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_BEGIN_A()
-    OPJ_END_A()
-    OPJ_END_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_END_A()
+OPJ_BEGIN_A()
+OPJ_END_A()
+OPJ_BEGIN_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_BEGIN_A()
+OPJ_END_A()
+OPJ_END_A()
 END_SCRIPT_EXPECTING_S("[[[],[],[]],[]]")
 
 BEGIN_SCRIPT(array_nest4, "deep nested arrays", 0)
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_BEGIN_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_END_A()
-    OPJ_NULL()
-    OPJ_END_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_BEGIN_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_END_A()
+OPJ_NULL()
+OPJ_END_A()
 END_SCRIPT_EXPECTING_S("[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]],null]")
 
 BEGIN_SCRIPT(obj_nontrivial1, "serialize nontrivial object", 0)
-    OPJ_BEGIN_O()
-    OPJ_KEY("")
-    OPJ_NULL()
-    OPJ_END_O()
+OPJ_BEGIN_O()
+OPJ_KEY("")
+OPJ_NULL()
+OPJ_END_O()
 END_SCRIPT_EXPECTING_S("{\"\":null}")
 
 BEGIN_SCRIPT(obj_nontrivial2, "serialize nontrivial object", 0)
-    OPJ_BEGIN_O()
-    OPJ_KEY("")
-    OPJ_NULL()
-    OPJ_KEY("x")
-    OPJ_NULL()
-    OPJ_END_O()
+OPJ_BEGIN_O()
+OPJ_KEY("")
+OPJ_NULL()
+OPJ_KEY("x")
+OPJ_NULL()
+OPJ_END_O()
 END_SCRIPT_EXPECTING_S("{\"\":null,\"x\":null}")
 
 BEGIN_SCRIPT(obj_nest1, "serialize nested objects", 0)
-    OPJ_BEGIN_O()
-    OPJ_KEY("")
-    OPJ_BEGIN_O()
-    OPJ_KEY("x")
-    OPJ_U64(42)
-    OPJ_END_O()
-    OPJ_KEY("x")
-    OPJ_BEGIN_A()
-    OPJ_U64(42)
-    OPJ_U64(101)
-    OPJ_END_A()
-    OPJ_KEY("y")
-    OPJ_NULL()
-    OPJ_KEY("z")
-    OPJ_BEGIN_O()
-    OPJ_KEY("z0")
-    OPJ_I64(-1)
-    OPJ_KEY("z1")
-    OPJ_I64(-2)
-    OPJ_END_O()
-    OPJ_END_O()
+OPJ_BEGIN_O()
+OPJ_KEY("")
+OPJ_BEGIN_O()
+OPJ_KEY("x")
+OPJ_U64(42)
+OPJ_END_O()
+OPJ_KEY("x")
+OPJ_BEGIN_A()
+OPJ_U64(42)
+OPJ_U64(101)
+OPJ_END_A()
+OPJ_KEY("y")
+OPJ_NULL()
+OPJ_KEY("z")
+OPJ_BEGIN_O()
+OPJ_KEY("z0")
+OPJ_I64(-1)
+OPJ_KEY("z1")
+OPJ_I64(-2)
+OPJ_END_O()
+OPJ_END_O()
 END_SCRIPT_EXPECTING_S("{\"\":{\"x\":42},\"x\":[42,101],\"y\":null,\"z\":{\"z0\":-1,\"z1\":-2}}")
 
 BEGIN_SCRIPT(err_obj_no_key, "error test: object item without key", 0)
-    OPJ_BEGIN_O()
-    OP_ASSERT_ERROR(0)
-    OPJ_NULL()
-    OP_ASSERT_ERROR(1)
-    OPJ_END_O()
-    OP_ASSERT_ERROR(1)
+OPJ_BEGIN_O()
+OP_ASSERT_ERROR(0)
+OPJ_NULL()
+OP_ASSERT_ERROR(1)
+OPJ_END_O()
+OP_ASSERT_ERROR(1)
 END_SCRIPT_EXPECTING_S("{")
 
 BEGIN_SCRIPT(err_obj_multi_key, "error test: object item with repeated key", 0)
-    OPJ_BEGIN_O()
-    OPJ_KEY("x")
-    OP_ASSERT_ERROR(0)
-    OPJ_KEY("y")
-    OP_ASSERT_ERROR(1)
-    OPJ_NULL()
-    OP_ASSERT_ERROR(1)
+OPJ_BEGIN_O()
+OPJ_KEY("x")
+OP_ASSERT_ERROR(0)
+OPJ_KEY("y")
+OP_ASSERT_ERROR(1)
+OPJ_NULL()
+OP_ASSERT_ERROR(1)
 END_SCRIPT_EXPECTING_S("{\"x\":")
 
 BEGIN_SCRIPT(err_obj_no_value, "error test: object item with no value", 0)
-    OPJ_BEGIN_O()
-    OPJ_KEY("x")
-    OP_ASSERT_ERROR(0)
-    OPJ_END_O()
-    OP_ASSERT_ERROR(1)
+OPJ_BEGIN_O()
+OPJ_KEY("x")
+OP_ASSERT_ERROR(0)
+OPJ_END_O()
+OP_ASSERT_ERROR(1)
 END_SCRIPT_EXPECTING_S("{\"x\":")
 
 BEGIN_SCRIPT(err_utf8, "error test: only basic ASCII supported", 0)
-    OPJ_STR("\x80")
-    OP_ASSERT_ERROR(0)
+OPJ_STR("\x80")
+OP_ASSERT_ERROR(0)
 END_SCRIPT_EXPECTING_S("\"\\u0080\"")
 
 BEGIN_SCRIPT(utf8_2, "test: valid UTF-8 2byte supported", 0)
-    OPJ_STR("low=\xc2\x80, high=\xdf\xbf")
-    OP_ASSERT_ERROR(0)
+OPJ_STR("low=\xc2\x80, high=\xdf\xbf")
+OP_ASSERT_ERROR(0)
 END_SCRIPT_EXPECTING_S("\"low=\xc2\x80, high=\xdf\xbf\"")
 
 BEGIN_SCRIPT(utf8_3, "test: valid UTF-8 3byte supported", 0)
-    OPJ_STR("low=\xe0\xa0\x80, high=\xef\xbf\xbf")
-    OP_ASSERT_ERROR(0)
+OPJ_STR("low=\xe0\xa0\x80, high=\xef\xbf\xbf")
+OP_ASSERT_ERROR(0)
 END_SCRIPT_EXPECTING_S("\"low=\xe0\xa0\x80, high=\xef\xbf\xbf\"")
 
 BEGIN_SCRIPT(utf8_4, "test: valid UTF-8 4byte supported", 0)
-    OPJ_STR("low=\xf0\x90\xbf\xbf, high=\xf4\x8f\xbf\xbf")
-    OP_ASSERT_ERROR(0)
+OPJ_STR("low=\xf0\x90\xbf\xbf, high=\xf4\x8f\xbf\xbf")
+OP_ASSERT_ERROR(0)
 END_SCRIPT_EXPECTING_S("\"low=\xf0\x90\xbf\xbf, high=\xf4\x8f\xbf\xbf\"")
 
 BEGIN_SCRIPT(ijson_int, "I-JSON: large integer", OSSL_JSON_FLAG_IJSON)
-    OPJ_BEGIN_A()
-    OPJ_U64(1)
-    OPJ_I64(-1)
-    OPJ_U64(9007199254740991)
-    OPJ_U64(9007199254740992)
-    OPJ_I64(-9007199254740991)
-    OPJ_I64(-9007199254740992)
-    OPJ_END_A()
+OPJ_BEGIN_A()
+OPJ_U64(1)
+OPJ_I64(-1)
+OPJ_U64(9007199254740991)
+OPJ_U64(9007199254740992)
+OPJ_I64(-9007199254740991)
+OPJ_I64(-9007199254740992)
+OPJ_END_A()
 END_SCRIPT_EXPECTING_S("[1,-1,9007199254740991,\"9007199254740992\",-9007199254740991,\"-9007199254740992\"]")
 
 BEGIN_SCRIPT(multi_item, "multiple top level items", 0)
-    OPJ_NULL()
-    OPJ_NULL()
-    OPJ_BEGIN_A()
-    OPJ_END_A()
-    OPJ_BEGIN_A()
-    OPJ_END_A()
+OPJ_NULL()
+OPJ_NULL()
+OPJ_BEGIN_A()
+OPJ_END_A()
+OPJ_BEGIN_A()
+OPJ_END_A()
 END_SCRIPT_EXPECTING_S("nullnull[][]")
 
 BEGIN_SCRIPT(seq, "JSON-SEQ", OSSL_JSON_FLAG_SEQ)
-    OPJ_NULL()
-    OPJ_NULL()
-    OPJ_NULL()
-    OPJ_BEGIN_O()
-    OPJ_KEY("x")
-    OPJ_U64(1)
-    OPJ_KEY("y")
-    OPJ_BEGIN_O()
-    OPJ_END_O()
-    OPJ_END_O()
-END_SCRIPT_EXPECTING_S("\x1Enull\n" "\x1Enull\n" "\x1Enull\n" "\x1E{\"x\":1,\"y\":{}}\n")
+OPJ_NULL()
+OPJ_NULL()
+OPJ_NULL()
+OPJ_BEGIN_O()
+OPJ_KEY("x")
+OPJ_U64(1)
+OPJ_KEY("y")
+OPJ_BEGIN_O()
+OPJ_END_O()
+OPJ_END_O()
+END_SCRIPT_EXPECTING_S("\x1Enull\n"
+                       "\x1Enull\n"
+                       "\x1Enull\n"
+                       "\x1E{\"x\":1,\"y\":{}}\n")
 
 static const info_func scripts[] = {
     SCRIPT(null)
-    SCRIPT(obj_empty)
-    SCRIPT(array_empty)
-    SCRIPT(bool_false)
-    SCRIPT(bool_true)
-    SCRIPT(u64_0)
-    SCRIPT(u64_1)
-    SCRIPT(u64_10)
-    SCRIPT(u64_12345)
-    SCRIPT(u64_18446744073709551615)
-    SCRIPT(i64_0)
-    SCRIPT(i64_1)
-    SCRIPT(i64_2)
-    SCRIPT(i64_10)
-    SCRIPT(i64_12345)
-    SCRIPT(i64_9223372036854775807)
-    SCRIPT(i64_m1)
-    SCRIPT(i64_m2)
-    SCRIPT(i64_m10)
-    SCRIPT(i64_m12345)
-    SCRIPT(i64_m9223372036854775807)
-    SCRIPT(i64_m9223372036854775808)
-    SCRIPT(str_empty)
-    SCRIPT(str_a)
-    SCRIPT(str_abc)
-    SCRIPT(str_quote)
-    SCRIPT(str_quote2)
-    SCRIPT(str_escape)
-    SCRIPT(str_len)
-    SCRIPT(str_len0)
-    SCRIPT(str_len_nul)
-    SCRIPT(hex_data0)
-    SCRIPT(hex_data)
-    SCRIPT(array_nest1)
-    SCRIPT(array_nest2)
-    SCRIPT(array_nest3)
-    SCRIPT(array_nest4)
-    SCRIPT(obj_nontrivial1)
-    SCRIPT(obj_nontrivial2)
-    SCRIPT(obj_nest1)
-    SCRIPT(err_obj_no_key)
-    SCRIPT(err_obj_multi_key)
-    SCRIPT(err_obj_no_value)
-    SCRIPT(err_utf8)
-    SCRIPT(utf8_2)
-    SCRIPT(utf8_3)
-    SCRIPT(utf8_4)
-    SCRIPT(ijson_int)
-    SCRIPT(multi_item)
-    SCRIPT(seq)
+        SCRIPT(obj_empty)
+            SCRIPT(array_empty)
+                SCRIPT(bool_false)
+                    SCRIPT(bool_true)
+                        SCRIPT(u64_0)
+                            SCRIPT(u64_1)
+                                SCRIPT(u64_10)
+                                    SCRIPT(u64_12345)
+                                        SCRIPT(u64_18446744073709551615)
+                                            SCRIPT(i64_0)
+                                                SCRIPT(i64_1)
+                                                    SCRIPT(i64_2)
+                                                        SCRIPT(i64_10)
+                                                            SCRIPT(i64_12345)
+                                                                SCRIPT(i64_9223372036854775807)
+                                                                    SCRIPT(i64_m1)
+                                                                        SCRIPT(i64_m2)
+                                                                            SCRIPT(i64_m10)
+                                                                                SCRIPT(i64_m12345)
+                                                                                    SCRIPT(i64_m9223372036854775807)
+                                                                                        SCRIPT(i64_m9223372036854775808)
+                                                                                            SCRIPT(str_empty)
+                                                                                                SCRIPT(str_a)
+                                                                                                    SCRIPT(str_abc)
+                                                                                                        SCRIPT(str_quote)
+                                                                                                            SCRIPT(str_quote2)
+                                                                                                                SCRIPT(str_escape)
+                                                                                                                    SCRIPT(str_len)
+                                                                                                                        SCRIPT(str_len0)
+                                                                                                                            SCRIPT(str_len_nul)
+                                                                                                                                SCRIPT(hex_data0)
+                                                                                                                                    SCRIPT(hex_data)
+                                                                                                                                        SCRIPT(array_nest1)
+                                                                                                                                            SCRIPT(array_nest2)
+                                                                                                                                                SCRIPT(array_nest3)
+                                                                                                                                                    SCRIPT(array_nest4)
+                                                                                                                                                        SCRIPT(obj_nontrivial1)
+                                                                                                                                                            SCRIPT(obj_nontrivial2)
+                                                                                                                                                                SCRIPT(obj_nest1)
+                                                                                                                                                                    SCRIPT(err_obj_no_key)
+                                                                                                                                                                        SCRIPT(err_obj_multi_key)
+                                                                                                                                                                            SCRIPT(err_obj_no_value)
+                                                                                                                                                                                SCRIPT(err_utf8)
+                                                                                                                                                                                    SCRIPT(utf8_2)
+                                                                                                                                                                                        SCRIPT(utf8_3)
+                                                                                                                                                                                            SCRIPT(utf8_4)
+                                                                                                                                                                                                SCRIPT(ijson_int)
+                                                                                                                                                                                                    SCRIPT(multi_item)
+                                                                                                                                                                                                        SCRIPT(seq)
 };
 
 /* Test runner. */
@@ -547,16 +550,16 @@ static int run_script(const struct script_info *info)
     const struct script_word *words = info->words;
     size_t wp = 0;
     struct script_word w;
-    struct helper h = {0};
+    struct helper h = { 0 };
     BUF_MEM *bufp = NULL;
 
     TEST_info("running script '%s' (%s)", info->name, info->title);
 
-#define GET_WORD()  (w = words[wp++])
-#define GET_U64()   (GET_WORD().u64)
-#define GET_I64()   (GET_WORD().i64)
-#define GET_FP()    (GET_WORD().fp)
-#define GET_P()     (GET_WORD().p)
+#define GET_WORD() (w = words[wp++])
+#define GET_U64() (GET_WORD().u64)
+#define GET_I64() (GET_WORD().i64)
+#define GET_FP() (GET_WORD().fp)
+#define GET_P() (GET_WORD().p)
 
     for (;;)
         switch (GET_U64()) {
@@ -565,8 +568,7 @@ static int run_script(const struct script_info *info)
         case OPK_INIT_FLAGS:
             helper_set_flags(&h, (uint32_t)GET_U64());
             break;
-        case OPK_CALL:
-        {
+        case OPK_CALL: {
             fp_type f = (fp_type)GET_FP();
 
             if (!TEST_true(helper_ensure(&h)))
@@ -575,8 +577,7 @@ static int run_script(const struct script_info *info)
             f(&h.j);
             break;
         }
-        case OPK_CALL_I:
-        {
+        case OPK_CALL_I: {
             fp_i_type f = (fp_i_type)GET_FP();
 
             if (!TEST_true(helper_ensure(&h)))
@@ -585,8 +586,7 @@ static int run_script(const struct script_info *info)
             f(&h.j, (int)GET_I64());
             break;
         }
-        case OPK_CALL_U64:
-        {
+        case OPK_CALL_U64: {
             fp_u64_type f = (fp_u64_type)GET_FP();
 
             if (!TEST_true(helper_ensure(&h)))
@@ -595,8 +595,7 @@ static int run_script(const struct script_info *info)
             f(&h.j, GET_U64());
             break;
         }
-        case OPK_CALL_I64:
-        {
+        case OPK_CALL_I64: {
             fp_i64_type f = (fp_i64_type)GET_FP();
 
             if (!TEST_true(helper_ensure(&h)))
@@ -605,8 +604,7 @@ static int run_script(const struct script_info *info)
             f(&h.j, GET_I64());
             break;
         }
-        case OPK_CALL_P:
-        {
+        case OPK_CALL_P: {
             fp_p_type f = (fp_p_type)GET_FP();
 
             if (!TEST_true(helper_ensure(&h)))
@@ -615,8 +613,7 @@ static int run_script(const struct script_info *info)
             f(&h.j, GET_P());
             break;
         }
-        case OPK_CALL_PZ:
-        {
+        case OPK_CALL_PZ: {
             fp_pz_type f = (fp_pz_type)GET_FP();
             void *p;
             uint64_t u64;
@@ -624,13 +621,12 @@ static int run_script(const struct script_info *info)
             if (!TEST_true(helper_ensure(&h)))
                 goto err;
 
-            p   = GET_P();
+            p = GET_P();
             u64 = GET_U64();
             f(&h.j, p, (size_t)u64);
             break;
         }
-        case OPK_ASSERT_ERROR:
-        {
+        case OPK_ASSERT_ERROR: {
             if (!TEST_true(helper_ensure(&h)))
                 goto err;
 
@@ -640,7 +636,7 @@ static int run_script(const struct script_info *info)
 
             break;
         }
-#define OP_ASSERT_ERROR(err)  OP_U64(OPK_ASSERT_ERROR) OP_U64(err)
+#define OP_ASSERT_ERROR(err) OP_U64(OPK_ASSERT_ERROR) OP_U64(err)
 
         default:
             TEST_error("unknown opcode");
@@ -662,10 +658,10 @@ static int run_script(const struct script_info *info)
         goto err;
 
     if (!TEST_mem_eq(bufp->data, bufp->length,
-                     info->expected_output,
-                     info->expected_output_len == SIZE_MAX
-                        ? strlen(info->expected_output)
-                        : info->expected_output_len))
+            info->expected_output,
+            info->expected_output_len == SIZE_MAX
+                ? strlen(info->expected_output)
+                : info->expected_output_len))
         goto err;
 
     ok = 1;
diff --git a/test/keymgmt_internal_test.c b/test/keymgmt_internal_test.c
index 8d5aa22dab3ec..3cc4bf542ad92 100644
--- a/test/keymgmt_internal_test.c
+++ b/test/keymgmt_internal_test.c
@@ -24,7 +24,7 @@
 #include <openssl/core_names.h>
 #include "internal/core.h"
 #include "internal/nelem.h"
-#include "crypto/evp.h"          /* For the internal API */
+#include "crypto/evp.h" /* For the internal API */
 #include "testutil.h"
 
 typedef struct {
@@ -55,10 +55,10 @@ static FIXTURE *set_up(const char *testcase_name)
     if (!TEST_ptr(fixture = OPENSSL_zalloc(sizeof(*fixture)))
         || !TEST_ptr(fixture->ctx1 = OSSL_LIB_CTX_new())
         || !TEST_ptr(fixture->prov1 = OSSL_PROVIDER_load(fixture->ctx1,
-                                                         "default"))
+                         "default"))
         || !TEST_ptr(fixture->ctx2 = OSSL_LIB_CTX_new())
         || !TEST_ptr(fixture->prov2 = OSSL_PROVIDER_load(fixture->ctx2,
-                                                         "default"))) {
+                         "default"))) {
         tear_down(fixture);
         return NULL;
     }
@@ -66,17 +66,17 @@ static FIXTURE *set_up(const char *testcase_name)
 }
 
 /* Array indexes */
-#define N       0
-#define E       1
-#define D       2
-#define P       3
-#define Q       4
-#define F3      5                /* Extra factor */
-#define DP      6
-#define DQ      7
-#define E3      8                /* Extra exponent */
-#define QINV    9
-#define C2      10               /* Extra coefficient */
+#define N 0
+#define E 1
+#define D 2
+#define P 3
+#define Q 4
+#define F3 5 /* Extra factor */
+#define DP 6
+#define DQ 7
+#define E3 8 /* Extra exponent */
+#define QINV 9
+#define C2 10 /* Extra coefficient */
 
 /*
  * We have to do this because OSSL_PARAM_get_ulong() can't handle params
@@ -89,7 +89,7 @@ static FIXTURE *set_up(const char *testcase_name)
 static int get_ulong_via_BN(const OSSL_PARAM *p, unsigned long *goal)
 {
     BIGNUM *n = NULL;
-    int ret = 1;                 /* Ever so hopeful */
+    int ret = 1; /* Ever so hopeful */
 
     if (!TEST_true(OSSL_PARAM_get_BN(p, &n))
         || !TEST_int_ge(BN_bn2nativepad(n, (unsigned char *)goal, sizeof(*goal)), 0))
@@ -159,20 +159,22 @@ static int test_pass_rsa(FIXTURE *fixture)
      * openssl genrsa 32 | openssl rsa -text
      */
     static BN_ULONG expected[] = {
-        0xbc747fc5,              /* N */
-        0x10001,                 /* E */
-        0x7b133399,              /* D */
-        0xe963,                  /* P */
-        0xceb7,                  /* Q */
-        1,                       /* F3 */
-        0x8599,                  /* DP */
-        0xbd87,                  /* DQ */
-        2,                       /* E3 */
-        0xcc3b,                  /* QINV */
-        3,                       /* C3 */
-        0                        /* Extra, should remain zero */
+        0xbc747fc5, /* N */
+        0x10001, /* E */
+        0x7b133399, /* D */
+        0xe963, /* P */
+        0xceb7, /* Q */
+        1, /* F3 */
+        0x8599, /* DP */
+        0xbd87, /* DQ */
+        2, /* E3 */
+        0xcc3b, /* QINV */
+        3, /* C3 */
+        0 /* Extra, should remain zero */
+    };
+    static unsigned long keydata[OSSL_NELEM(expected)] = {
+        0,
     };
-    static unsigned long keydata[OSSL_NELEM(expected)] = { 0, };
 
     if (!TEST_ptr(rsa = RSA_new()))
         goto err;
@@ -210,7 +212,7 @@ static int test_pass_rsa(FIXTURE *fixture)
         || !TEST_ptr(bn_coeffs[0] = BN_new())
         || !TEST_true(BN_set_word(bn_coeffs[0], expected[C2]))
         || !TEST_true(RSA_set0_multi_prime_params(rsa, bn_primes, bn_exps,
-                                                  bn_coeffs, 1)))
+            bn_coeffs, 1)))
         goto err;
 
     if (!TEST_ptr(pk = EVP_PKEY_new())
@@ -229,15 +231,15 @@ static int test_pass_rsa(FIXTURE *fixture)
         km = km3;
         /* Check that we can't export an RSA key into an RSA-PSS keymanager */
         if (!TEST_ptr_null(provkey2 = evp_pkey_export_to_provider(pk, NULL,
-                                                                  &km,
-                                                                  NULL)))
+                               &km,
+                               NULL)))
             goto err;
 
         if (!TEST_ptr(provkey = evp_pkey_export_to_provider(pk, NULL, &km1,
-                                                            NULL))
+                          NULL))
             || !TEST_true(evp_keymgmt_export(km2, provkey,
-                                             OSSL_KEYMGMT_SELECT_KEYPAIR,
-                                             &export_cb, keydata)))
+                OSSL_KEYMGMT_SELECT_KEYPAIR,
+                &export_cb, keydata)))
             goto err;
 
         /*
@@ -269,7 +271,7 @@ static int test_pass_rsa(FIXTURE *fixture)
             goto err;
     }
 
- err:
+err:
     RSA_free(rsa);
     BN_free(bn1);
     BN_free(bn2);
@@ -306,7 +308,7 @@ static int test_evp_pkey_export_to_provider(int n)
     int ret = 0;
 
     if (!TEST_ptr(libctx = OSSL_LIB_CTX_new())
-         || !TEST_ptr(prov = OSSL_PROVIDER_load(libctx, "default")))
+        || !TEST_ptr(prov = OSSL_PROVIDER_load(libctx, "default")))
         goto end;
 
     if ((bio = BIO_new_file(cert_filename, "r")) == NULL) {
@@ -317,7 +319,7 @@ static int test_evp_pkey_export_to_provider(int n)
 
     if ((cert = PEM_read_bio_X509(bio, NULL, NULL, NULL)) == NULL) {
         TEST_error("'%s' doesn't appear to be a X.509 certificate in PEM format\n",
-                   cert_filename);
+            cert_filename);
         TEST_openssl_errors();
         goto end;
     }
@@ -327,22 +329,22 @@ static int test_evp_pkey_export_to_provider(int n)
 
     if (n == 0) {
         if (!TEST_ptr(keydata = evp_pkey_export_to_provider(pkey, NULL,
-                                                            NULL, NULL)))
+                          NULL, NULL)))
             goto end;
     } else if (n == 1) {
         if (!TEST_ptr(keydata = evp_pkey_export_to_provider(pkey, NULL,
-                                                            &keymgmt, NULL)))
+                          &keymgmt, NULL)))
             goto end;
     } else {
         keymgmt = EVP_KEYMGMT_fetch(libctx, "RSA", NULL);
 
         if (!TEST_ptr(keydata = evp_pkey_export_to_provider(pkey, NULL,
-                                                            &keymgmt, NULL)))
+                          &keymgmt, NULL)))
             goto end;
     }
 
     ret = 1;
- end:
+end:
     BIO_free(bio);
     X509_free(cert);
     EVP_KEYMGMT_free(keymgmt);
diff --git a/test/lhash_test.c b/test/lhash_test.c
index 94e9f3944ea5e..a055d041a408f 100644
--- a/test/lhash_test.c
+++ b/test/lhash_test.c
@@ -33,14 +33,14 @@
 DEFINE_LHASH_OF_EX(int);
 
 static int int_tests[] = { 65537, 13, 1, 3, -5, 6, 7, 4, -10, -12, -14, 22, 9,
-                           -17, 16, 17, -23, 35, 37, 173, 11 };
+    -17, 16, 17, -23, 35, 37, 173, 11 };
 static const size_t n_int_tests = OSSL_NELEM(int_tests);
 static short int_found[OSSL_NELEM(int_tests)];
 static short int_not_found;
 
 static unsigned long int int_hash(const int *p)
 {
-    return 3 & *p;      /* To force collisions */
+    return 3 & *p; /* To force collisions */
 }
 
 static int int_cmp(const int *p, const int *q)
@@ -86,12 +86,12 @@ static int test_int_lhash(void)
         int data;
         int null;
     } dels[] = {
-        { 65537,    0 },
-        { 173,      0 },
-        { 999,      1 },
-        { 37,       0 },
-        { 1,        0 },
-        { 34,       1 }
+        { 65537, 0 },
+        { 173, 0 },
+        { 999, 1 },
+        { 37, 0 },
+        { 1, 0 },
+        { 34, 1 }
     };
     const unsigned int n_dels = OSSL_NELEM(dels);
     LHASH_OF(int) *h = lh_int_new(&int_hash, &int_cmp);
@@ -167,7 +167,7 @@ static int test_int_lhash(void)
     /* delete */
     for (i = 0; i < n_dels; i++) {
         const int b = lh_int_delete(h, &dels[i].data) == NULL;
-        if (!TEST_int_eq(b ^ dels[i].null,  0)) {
+        if (!TEST_int_eq(b ^ dels[i].null, 0)) {
             TEST_info("lhash int delete %d", i);
             goto end;
         }
@@ -183,7 +183,6 @@ static int test_int_lhash(void)
     return testresult;
 }
 
-
 static int int_filter_all(HT_VALUE *v, void *arg)
 {
     return 1;
@@ -218,12 +217,12 @@ static int test_int_hashtable(void)
         int data;
         int should_del;
     } dels[] = {
-        { 65537 , 1},
-        { 173 , 1},
-        { 999 , 0 },
-        { 37 , 1 },
-        { 1 , 1 },
-        { 34 , 0 }
+        { 65537, 1 },
+        { 173, 1 },
+        { 999, 0 },
+        { 37, 1 },
+        { 1, 1 },
+        { 34, 0 }
     };
     const size_t n_dels = OSSL_NELEM(dels);
     HT_CONFIG hash_conf = {
@@ -250,7 +249,8 @@ static int test_int_hashtable(void)
     for (i = 0; i < n_int_tests; i++) {
         HT_SET_KEY_FIELD(&key, mykey, int_tests[i]);
         if (!TEST_int_eq(ossl_ht_test_int_insert(ht, TO_HT_KEY(&key),
-                         &int_tests[i], NULL), 1)) {
+                             &int_tests[i], NULL),
+                1)) {
             TEST_info("int insert %zu", i);
             goto end;
         }
@@ -273,7 +273,7 @@ static int test_int_hashtable(void)
         if (!TEST_int_eq(int_found[i], 1)) {
             TEST_info("hashtable int foreach %zu", i);
             goto end;
-    }
+        }
 
     /* filter */
     list = ossl_ht_filter(ht, 64, int_filter_all, NULL);
@@ -288,7 +288,7 @@ static int test_int_hashtable(void)
         if (dels[i].should_del) {
             if (!TEST_int_eq(todel, 1)) {
                 TEST_info("hashtable couldn't find entry %d to delete\n",
-                          dels[i].data);
+                    dels[i].data);
                 goto end;
             }
         } else {
@@ -296,7 +296,7 @@ static int test_int_hashtable(void)
                 TEST_info("%d found an entry that shouldn't be there\n", dels[i].data);
                 goto end;
             }
-       }
+        }
     }
 
     rc = 1;
@@ -312,7 +312,7 @@ static unsigned long int stress_hash(const int *p)
 
 #ifdef MEASURE_HASH_PERFORMANCE
 static int
-timeval_subtract (struct timeval *result, struct timeval *x, struct timeval *y)
+timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y)
 {
     /* Perform the carry for the later subtraction by updating y. */
     if (x->tv_usec < y->tv_usec) {
@@ -366,7 +366,7 @@ static int test_stress(void)
 
     /* num_items */
     if (!TEST_int_eq(lh_int_num_items(h), n))
-            goto end;
+        goto end;
 
     /* delete in a different order */
     for (i = 0; i < n; i++) {
@@ -405,12 +405,12 @@ static int test_hashtable_stress(int idx)
     unsigned int i;
     int testresult = 0, *p;
     HT_CONFIG hash_conf = {
-        NULL,              /* use default context */
+        NULL, /* use default context */
         hashtable_intfree, /* our free function */
-        hashtable_hash,    /* our hash function */
-        625000,            /* preset hash size */
-        1,                 /* Check collisions */
-        0                  /* Lockless reads */
+        hashtable_hash, /* our hash function */
+        625000, /* preset hash size */
+        1, /* Check collisions */
+        0 /* Lockless reads */
     };
     HT *h;
     INTKEY key;
@@ -422,7 +422,6 @@ static int test_hashtable_stress(int idx)
     hash_conf.lockless_reads = idx;
     h = ossl_ht_new(&hash_conf);
 
-
     if (!TEST_ptr(h))
         goto end;
 #ifdef MEASURE_HASH_PERFORMANCE
@@ -441,7 +440,8 @@ static int test_hashtable_stress(int idx)
         *p = 3 * i + 1;
         HT_SET_KEY_FIELD(&key, mykey, *p);
         if (!TEST_int_eq(ossl_ht_test_int_insert(h, TO_HT_KEY(&key),
-                         p, NULL), 1)) {
+                             p, NULL),
+                1)) {
             TEST_info("hashtable unable to insert element %d\n", *p);
             goto end;
         }
@@ -449,7 +449,7 @@ static int test_hashtable_stress(int idx)
 
     /* make sure we stored everything */
     if (!TEST_int_eq((size_t)ossl_ht_count(h), n))
-            goto end;
+        goto end;
 
     /* delete or get in a different order */
     for (i = 0; i < n; i++) {
@@ -495,7 +495,35 @@ static HT *m_ht = NULL;
 #define NUM_WORKERS 16
 
 static struct test_mt_entry test_mt_entries[TEST_MT_POOL_SZ];
-static char *worker_exits[NUM_WORKERS];
+static char **worker_exits;
+static thread_t *workers;
+static int num_workers = NUM_WORKERS;
+
+static int setup_num_workers(void)
+{
+    char *harness_jobs = getenv("HARNESS_JOBS");
+    char *lhash_workers = getenv("LHASH_WORKERS");
+    /* If we have HARNESS_JOBS set, don't eat more than a quarter */
+    if (harness_jobs != NULL) {
+        int jobs = atoi(harness_jobs);
+        if (jobs > 0)
+            num_workers = jobs / 4;
+    }
+    /* But if we have explicitly set LHASH_WORKERS use that */
+    if (lhash_workers != NULL) {
+        int jobs = atoi(lhash_workers);
+        if (jobs > 0)
+            num_workers = jobs;
+    }
+
+    TEST_info("using %d workers\n", num_workers);
+
+    free(worker_exits);
+    free(workers);
+    worker_exits = calloc(num_workers, sizeof(*worker_exits));
+    workers = calloc(num_workers, sizeof(*workers));
+    return worker_exits != NULL && workers != NULL;
+}
 
 HT_START_KEY_DEFN(mtkey)
 HT_DEF_KEY_FIELD(index, uint32_t)
@@ -526,7 +554,7 @@ static void hashtable_mt_free(HT_VALUE *v)
         free_failure = 1;
     } else {
         CRYPTO_atomic_add(&m->pending_delete, -1,
-                          &ret, worker_lock);
+            &ret, worker_lock);
     }
 }
 
@@ -571,14 +599,14 @@ static void do_mt_hash_work(void)
             worker_exits[num] = "Unable to increment global iterator";
             return;
         }
-        switch(behavior) {
+        switch (behavior) {
         case DO_LOOKUP:
             ossl_ht_read_lock(m_ht);
             m = ossl_ht_mt_TEST_MT_ENTRY_get(m_ht, TO_HT_KEY(&key), &v);
             if (m != NULL && m != expected_m) {
                 worker_exits[num] = "Read unexpected value from hashtable";
                 TEST_info("Iteration %d Read unexpected value %p when %p expected",
-                          giter, (void *)m, (void *)expected_m);
+                    giter, (void *)m, (void *)expected_m);
             }
             ossl_ht_read_unlock(m_ht);
             if (worker_exits[num] != NULL)
@@ -595,13 +623,11 @@ static void do_mt_hash_work(void)
                 r = NULL;
             }
 
-            if (expected_rc != ossl_ht_mt_TEST_MT_ENTRY_insert(m_ht,
-                                                               TO_HT_KEY(&key),
-                                                               expected_m, r)) {
+            if (expected_rc != ossl_ht_mt_TEST_MT_ENTRY_insert(m_ht, TO_HT_KEY(&key), expected_m, r)) {
                 TEST_info("Iteration %d Expected rc %d on %s of element %u which is %s\n",
-                          giter, expected_rc, behavior == DO_REPLACE ? "replace" : "insert",
-                          (unsigned int)index,
-                          expected_m->in_table ? "in table" : "not in table");
+                    giter, expected_rc, behavior == DO_REPLACE ? "replace" : "insert",
+                    (unsigned int)index,
+                    expected_m->in_table ? "in table" : "not in table");
                 worker_exits[num] = "Failure on insert";
             }
             if (expected_rc == 1)
@@ -627,8 +653,8 @@ static void do_mt_hash_work(void)
             }
             if (expected_rc != ossl_ht_delete(m_ht, TO_HT_KEY(&key))) {
                 TEST_info("Iteration %d Expected rc %d on delete of element %u which is %s\n",
-                          giter, expected_rc, (unsigned int)index,
-                          expected_m->in_table ? "in table" : "not in table");
+                    giter, expected_rc, (unsigned int)index,
+                    expected_m->in_table ? "in table" : "not in table");
                 worker_exits[num] = "Failure on delete";
             }
             ossl_ht_write_unlock(m_ht);
@@ -645,22 +671,22 @@ static void do_mt_hash_work(void)
 static int test_hashtable_multithread(void)
 {
     HT_CONFIG hash_conf = {
-        NULL,              /* use default context */
+        NULL, /* use default context */
         hashtable_mt_free, /* our free function */
-        NULL,              /* default hash function */
-        0,                 /* default hash size */
-        1,                 /* Check collisions */
+        NULL, /* default hash function */
+        0, /* default hash size */
+        1, /* Check collisions */
     };
     int ret = 0;
-    thread_t workers[NUM_WORKERS];
     int i;
 #ifdef MEASURE_HASH_PERFORMANCE
     struct timeval start, end, delta;
 #endif
 
-    memset(worker_exits, 0, sizeof(char *) * NUM_WORKERS);
+    if (!TEST_true(setup_num_workers()))
+        goto end;
+
     memset(test_mt_entries, 0, sizeof(TEST_MT_ENTRY) * TEST_MT_POOL_SZ);
-    memset(workers, 0, sizeof(thread_t) * NUM_WORKERS);
 
     m_ht = ossl_ht_new(&hash_conf);
 
@@ -675,23 +701,22 @@ static int test_hashtable_multithread(void)
     gettimeofday(&start, NULL);
 #endif
 
-    for (i = 0; i < NUM_WORKERS; i++) {
+    for (i = 0; i < num_workers; i++) {
         if (!run_thread(&workers[i], do_mt_hash_work))
             goto shutdown;
     }
 
 shutdown:
-    for (--i; i >= 0; i--) {
+    for (i = 0; i < num_workers; i++) {
         wait_for_thread(workers[i]);
     }
 
-
     /*
      * Now that the workers are done, check for any error
      * conditions
      */
     ret = 1;
-    for (i = 0; i < NUM_WORKERS; i++) {
+    for (i = 0; i < num_workers; i++) {
         if (worker_exits[i] != NULL) {
             TEST_info("Worker %d failed: %s\n", i, worker_exits[i]);
             ret = 0;
@@ -713,6 +738,10 @@ static int test_hashtable_multithread(void)
     ossl_ht_free(m_ht);
     CRYPTO_THREAD_lock_free(worker_lock);
     CRYPTO_THREAD_lock_free(testrand_lock);
+    free(workers);
+    workers = NULL;
+    free(worker_exits);
+    worker_exits = NULL;
 end:
     return ret;
 }
diff --git a/test/list_test.c b/test/list_test.c
index db288d1d08c02..9deb57c4b91a9 100644
--- a/test/list_test.c
+++ b/test/list_test.c
@@ -30,8 +30,10 @@ DEFINE_LIST_OF(buzz, TESTL);
 
 static int test_fizzbuzz(void)
 {
-    OSSL_LIST(fizz) a;
-    OSSL_LIST(buzz) b;
+    OSSL_LIST(fizz)
+    a;
+    OSSL_LIST(buzz)
+    b;
     TESTL elem[20];
     const int nelem = OSSL_NELEM(elem);
     int i, na = 0, nb = 0;
@@ -57,29 +59,29 @@ static int test_fizzbuzz(void)
     }
 
     if (!TEST_false(ossl_list_fizz_is_empty(&a))
-            || !TEST_size_t_eq(ossl_list_fizz_num(&a), na)
-            || !TEST_size_t_eq(ossl_list_buzz_num(&b), nb)
-            || !TEST_ptr(ossl_list_fizz_head(&a))
-            || !TEST_ptr(ossl_list_fizz_tail(&a))
-            || !TEST_ptr(ossl_list_buzz_head(&b))
-            || !TEST_ptr(ossl_list_buzz_tail(&b))
-            || !TEST_int_eq(ossl_list_fizz_head(&a)->n, 3)
-            || !TEST_int_eq(ossl_list_fizz_tail(&a)->n, na * 3)
-            || !TEST_int_eq(ossl_list_buzz_head(&b)->n, nb * 5)
-            || !TEST_int_eq(ossl_list_buzz_tail(&b)->n, 5))
+        || !TEST_size_t_eq(ossl_list_fizz_num(&a), na)
+        || !TEST_size_t_eq(ossl_list_buzz_num(&b), nb)
+        || !TEST_ptr(ossl_list_fizz_head(&a))
+        || !TEST_ptr(ossl_list_fizz_tail(&a))
+        || !TEST_ptr(ossl_list_buzz_head(&b))
+        || !TEST_ptr(ossl_list_buzz_tail(&b))
+        || !TEST_int_eq(ossl_list_fizz_head(&a)->n, 3)
+        || !TEST_int_eq(ossl_list_fizz_tail(&a)->n, na * 3)
+        || !TEST_int_eq(ossl_list_buzz_head(&b)->n, nb * 5)
+        || !TEST_int_eq(ossl_list_buzz_tail(&b)->n, 5))
         return 0;
     ossl_list_fizz_remove(&a, ossl_list_fizz_head(&a));
     ossl_list_buzz_remove(&b, ossl_list_buzz_tail(&b));
     if (!TEST_size_t_eq(ossl_list_fizz_num(&a), --na)
-            || !TEST_size_t_eq(ossl_list_buzz_num(&b), --nb)
-            || !TEST_ptr(ossl_list_fizz_head(&a))
-            || !TEST_ptr(ossl_list_buzz_tail(&b))
-            || !TEST_int_eq(ossl_list_fizz_head(&a)->n, 6)
-            || !TEST_int_eq(ossl_list_buzz_tail(&b)->n, 10)
-            || !TEST_ptr(ossl_list_fizz_next(ossl_list_fizz_head(&a)))
-            || !TEST_ptr(ossl_list_fizz_prev(ossl_list_fizz_tail(&a)))
-            || !TEST_int_eq(ossl_list_fizz_next(ossl_list_fizz_head(&a))->n, 9)
-            || !TEST_int_eq(ossl_list_fizz_prev(ossl_list_fizz_tail(&a))->n, 15))
+        || !TEST_size_t_eq(ossl_list_buzz_num(&b), --nb)
+        || !TEST_ptr(ossl_list_fizz_head(&a))
+        || !TEST_ptr(ossl_list_buzz_tail(&b))
+        || !TEST_int_eq(ossl_list_fizz_head(&a)->n, 6)
+        || !TEST_int_eq(ossl_list_buzz_tail(&b)->n, 10)
+        || !TEST_ptr(ossl_list_fizz_next(ossl_list_fizz_head(&a)))
+        || !TEST_ptr(ossl_list_fizz_prev(ossl_list_fizz_tail(&a)))
+        || !TEST_int_eq(ossl_list_fizz_next(ossl_list_fizz_head(&a))->n, 9)
+        || !TEST_int_eq(ossl_list_fizz_prev(ossl_list_fizz_tail(&a))->n, 15))
         return 0;
     return 1;
 }
@@ -95,7 +97,8 @@ DEFINE_LIST_OF(int, INTL);
 static int test_insert(void)
 {
     INTL *c, *d;
-    OSSL_LIST(int) l;
+    OSSL_LIST(int)
+    l;
     INTL elem[20];
     size_t i;
     int n = 1;
@@ -107,13 +110,13 @@ static int test_insert(void)
     }
 
     /* Check various insert options - head, tail, middle */
-    ossl_list_int_insert_head(&l, elem + 3);                /* 3 */
-    ossl_list_int_insert_tail(&l, elem + 6);                /* 3 6 */
-    ossl_list_int_insert_before(&l, elem + 6, elem + 5);    /* 3 5 6 */
-    ossl_list_int_insert_before(&l, elem + 3, elem + 1);    /* 1 3 5 6 */
-    ossl_list_int_insert_after(&l, elem + 1, elem + 2);     /* 1 2 3 5 6 */
-    ossl_list_int_insert_after(&l, elem + 6, elem + 7);     /* 1 2 3 5 6 7 */
-    ossl_list_int_insert_after(&l, elem + 3, elem + 4);     /* 1 2 3 4 5 6 7 */
+    ossl_list_int_insert_head(&l, elem + 3); /* 3 */
+    ossl_list_int_insert_tail(&l, elem + 6); /* 3 6 */
+    ossl_list_int_insert_before(&l, elem + 6, elem + 5); /* 3 5 6 */
+    ossl_list_int_insert_before(&l, elem + 3, elem + 1); /* 1 3 5 6 */
+    ossl_list_int_insert_after(&l, elem + 1, elem + 2); /* 1 2 3 5 6 */
+    ossl_list_int_insert_after(&l, elem + 6, elem + 7); /* 1 2 3 5 6 7 */
+    ossl_list_int_insert_after(&l, elem + 3, elem + 4); /* 1 2 3 4 5 6 7 */
     if (!TEST_size_t_eq(ossl_list_int_num(&l), 7))
         return 0;
     c = ossl_list_int_head(&l);
@@ -129,9 +132,9 @@ static int test_insert(void)
         return 0;
 
     /* Check removing head, tail and middle */
-    ossl_list_int_remove(&l, elem + 1);                     /* 2 3 4 5 6 7 */
-    ossl_list_int_remove(&l, elem + 6);                     /* 2 3 4 5 7 */
-    ossl_list_int_remove(&l, elem + 7);                     /* 2 3 4 5 */
+    ossl_list_int_remove(&l, elem + 1); /* 2 3 4 5 6 7 */
+    ossl_list_int_remove(&l, elem + 6); /* 2 3 4 5 7 */
+    ossl_list_int_remove(&l, elem + 7); /* 2 3 4 5 */
     n = 2;
     c = ossl_list_int_head(&l);
     d = ossl_list_int_tail(&l);
@@ -146,28 +149,28 @@ static int test_insert(void)
         return 0;
 
     /* Check removing the head of a two element list works */
-    ossl_list_int_remove(&l, elem + 2);                     /* 3 4 5 */
-    ossl_list_int_remove(&l, elem + 4);                     /* 3 5 */
-    ossl_list_int_remove(&l, elem + 3);                     /* 5 */
+    ossl_list_int_remove(&l, elem + 2); /* 3 4 5 */
+    ossl_list_int_remove(&l, elem + 4); /* 3 5 */
+    ossl_list_int_remove(&l, elem + 3); /* 5 */
     if (!TEST_ptr(ossl_list_int_head(&l))
-            || !TEST_ptr(ossl_list_int_tail(&l))
-            || !TEST_int_eq(ossl_list_int_head(&l)->n, 5)
-            || !TEST_int_eq(ossl_list_int_tail(&l)->n, 5))
+        || !TEST_ptr(ossl_list_int_tail(&l))
+        || !TEST_int_eq(ossl_list_int_head(&l)->n, 5)
+        || !TEST_int_eq(ossl_list_int_tail(&l)->n, 5))
         return 0;
 
     /* Check removing the tail of a two element list works */
-    ossl_list_int_insert_head(&l, elem);                    /* 0 5 */
-    ossl_list_int_remove(&l, elem + 5);                     /* 0 */
+    ossl_list_int_insert_head(&l, elem); /* 0 5 */
+    ossl_list_int_remove(&l, elem + 5); /* 0 */
     if (!TEST_ptr(ossl_list_int_head(&l))
-            || !TEST_ptr(ossl_list_int_tail(&l))
-            || !TEST_int_eq(ossl_list_int_head(&l)->n, 0)
-            || !TEST_int_eq(ossl_list_int_tail(&l)->n, 0))
+        || !TEST_ptr(ossl_list_int_tail(&l))
+        || !TEST_int_eq(ossl_list_int_head(&l)->n, 0)
+        || !TEST_int_eq(ossl_list_int_tail(&l)->n, 0))
         return 0;
 
     /* Check removing the only element works */
     ossl_list_int_remove(&l, elem);
     if (!TEST_ptr_null(ossl_list_int_head(&l))
-            || !TEST_ptr_null(ossl_list_int_tail(&l)))
+        || !TEST_ptr_null(ossl_list_int_tail(&l)))
         return 0;
     return 1;
 }
diff --git a/test/localetest.c b/test/localetest.c
index 616356a1404d4..63871fa063ce5 100644
--- a/test/localetest.c
+++ b/test/localetest.c
@@ -16,81 +16,81 @@
 #include "testutil/output.h"
 
 #ifndef OPENSSL_NO_LOCALE
-# include <locale.h>
-# ifdef OPENSSL_SYS_MACOSX
-#  include <xlocale.h>
-# endif
+#include <locale.h>
+#ifdef OPENSSL_SYS_MACOSX
+#include <xlocale.h>
+#endif
 
 int setup_tests(void)
 {
-  const unsigned char der_bytes[] = {
-  0x30, 0x82, 0x03, 0x09, 0x30, 0x82, 0x01, 0xf1, 0xa0, 0x03, 0x02, 0x01,
-  0x02, 0x02, 0x14, 0x08, 0xe0, 0x8c, 0xd3, 0xf3, 0xbf, 0x2c, 0xf2, 0x0d,
-  0x0a, 0x75, 0xd1, 0xe8, 0xea, 0xbe, 0x70, 0x61, 0xd9, 0x67, 0xf9, 0x30,
-  0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
-  0x05, 0x00, 0x30, 0x14, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04,
-  0x03, 0x0c, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74,
-  0x30, 0x1e, 0x17, 0x0d, 0x32, 0x32, 0x30, 0x34, 0x31, 0x31, 0x31, 0x34,
-  0x31, 0x39, 0x35, 0x37, 0x5a, 0x17, 0x0d, 0x32, 0x32, 0x30, 0x35, 0x31,
-  0x31, 0x31, 0x34, 0x31, 0x39, 0x35, 0x37, 0x5a, 0x30, 0x14, 0x31, 0x12,
-  0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x09, 0x6c, 0x6f, 0x63,
-  0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d,
-  0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
-  0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82,
-  0x01, 0x01, 0x00, 0xc3, 0x1f, 0x5c, 0x56, 0x46, 0x8d, 0x69, 0xb6, 0x48,
-  0x3c, 0xbf, 0xe2, 0x0f, 0xa7, 0x4a, 0x44, 0x72, 0x74, 0x36, 0xfe, 0xe8,
-  0x2f, 0x10, 0x4a, 0xe9, 0x46, 0x45, 0x72, 0x5e, 0x48, 0xdd, 0x75, 0xab,
-  0xd9, 0x63, 0x91, 0x37, 0x93, 0x46, 0x28, 0x7e, 0x45, 0x94, 0x4b, 0x8a,
-  0xd5, 0x05, 0x2b, 0x9a, 0x01, 0x96, 0x30, 0xde, 0xcc, 0x14, 0x2d, 0x06,
-  0x09, 0x1b, 0x7d, 0x50, 0x14, 0x99, 0x36, 0x6b, 0x97, 0x6e, 0xc9, 0xb1,
-  0x69, 0x70, 0xcd, 0x9b, 0x74, 0x24, 0x9a, 0xe2, 0xd4, 0xc0, 0x1e, 0xbc,
-  0xec, 0xf6, 0x7a, 0xbb, 0xa0, 0x53, 0x93, 0xf8, 0x68, 0x9a, 0x18, 0xa1,
-  0xa1, 0x5c, 0x47, 0x93, 0xd1, 0x4c, 0x36, 0x8c, 0x00, 0xb3, 0x66, 0xda,
-  0xf1, 0x05, 0xb2, 0x3a, 0xad, 0x7e, 0x4b, 0xf3, 0xd3, 0x93, 0xfa, 0x59,
-  0x09, 0x9c, 0x60, 0x37, 0x69, 0x61, 0xe8, 0x5a, 0x33, 0xc6, 0xb2, 0x1a,
-  0xba, 0x36, 0xe2, 0xb3, 0x58, 0xe9, 0x73, 0x01, 0x2d, 0x36, 0x48, 0x36,
-  0x94, 0xe4, 0xb2, 0xa4, 0x5b, 0xdf, 0x3d, 0x5f, 0x62, 0x9f, 0xd9, 0xf3,
-  0x24, 0x0c, 0xf0, 0x2f, 0x71, 0x44, 0x79, 0x13, 0x70, 0x95, 0xa7, 0xbe,
-  0xea, 0x0a, 0x08, 0x0a, 0xa6, 0x4b, 0xe9, 0x58, 0x6b, 0xa4, 0xc2, 0xed,
-  0x74, 0x1e, 0xb0, 0x3b, 0x59, 0xd5, 0xe6, 0xdb, 0x8f, 0x58, 0x6a, 0xa3,
-  0x7d, 0x52, 0x40, 0xec, 0x72, 0xb7, 0xba, 0x7e, 0x30, 0x9d, 0x12, 0x57,
-  0xf2, 0x48, 0xae, 0x80, 0x0d, 0x0a, 0xf4, 0xfd, 0x24, 0xed, 0xd8, 0x05,
-  0xb2, 0x96, 0x44, 0x02, 0x3e, 0x6e, 0x25, 0xb0, 0xc4, 0x93, 0xda, 0xfe,
-  0x78, 0xd9, 0xbb, 0xd2, 0x71, 0x69, 0x70, 0x7f, 0xba, 0xf7, 0xb0, 0x4f,
-  0x14, 0xf7, 0x98, 0x71, 0x01, 0x6c, 0xec, 0x6f, 0x76, 0x03, 0x59, 0xff,
-  0xe2, 0xba, 0x8d, 0xd9, 0x21, 0x08, 0xb3, 0x02, 0x03, 0x01, 0x00, 0x01,
-  0xa3, 0x53, 0x30, 0x51, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04,
-  0x16, 0x04, 0x14, 0x59, 0xb8, 0x6e, 0x1a, 0x72, 0xe9, 0x27, 0x1e, 0xbf,
-  0x80, 0x87, 0x0f, 0xa9, 0xd0, 0x06, 0x6a, 0x11, 0x30, 0x77, 0x8e, 0x30,
-  0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14,
-  0x59, 0xb8, 0x6e, 0x1a, 0x72, 0xe9, 0x27, 0x1e, 0xbf, 0x80, 0x87, 0x0f,
-  0xa9, 0xd0, 0x06, 0x6a, 0x11, 0x30, 0x77, 0x8e, 0x30, 0x0f, 0x06, 0x03,
-  0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01,
-  0xff, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01,
-  0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x98, 0x76, 0x9e,
-  0x3c, 0xfc, 0x3f, 0x58, 0xe8, 0xf2, 0x1f, 0x2e, 0x11, 0xa2, 0x59, 0xfa,
-  0x27, 0xb5, 0xec, 0x9d, 0x97, 0x05, 0x06, 0x2c, 0x95, 0xa5, 0x28, 0x88,
-  0x86, 0xeb, 0x4e, 0x8a, 0x62, 0xe9, 0x87, 0x78, 0xd8, 0x18, 0x22, 0x4e,
-  0xb1, 0x8d, 0x46, 0x4a, 0x4c, 0x6e, 0x7c, 0x53, 0x62, 0x2c, 0xf2, 0x7a,
-  0x95, 0xa0, 0x1a, 0x30, 0x18, 0x6a, 0x31, 0x6f, 0x3f, 0x55, 0x25, 0x9f,
-  0x67, 0x60, 0x68, 0x99, 0x0f, 0x41, 0x09, 0xc8, 0xe2, 0x04, 0x33, 0x22,
-  0x1a, 0xe9, 0xf3, 0xae, 0xce, 0xb6, 0x83, 0x64, 0x78, 0x66, 0x14, 0xc9,
-  0x54, 0xc8, 0x34, 0x70, 0x96, 0xaf, 0x16, 0xcd, 0xb8, 0xdf, 0x81, 0x7e,
-  0xf0, 0xa6, 0x7d, 0xc1, 0x13, 0xb2, 0x76, 0x3a, 0xd5, 0x7e, 0x68, 0x8c,
-  0xd5, 0x00, 0x70, 0x82, 0x23, 0x7e, 0x5e, 0xc9, 0x31, 0x2f, 0x33, 0x54,
-  0xaa, 0xaf, 0xcd, 0xe9, 0x38, 0x9a, 0x23, 0x53, 0xad, 0x4e, 0x72, 0xa7,
-  0x6f, 0x47, 0x60, 0xc9, 0xd3, 0x06, 0x9b, 0x7a, 0x21, 0xc6, 0xe9, 0xdb,
-  0x3c, 0xaa, 0xc0, 0x21, 0x29, 0x5f, 0x44, 0x6a, 0x45, 0x90, 0x73, 0x5e,
-  0x6d, 0x78, 0x82, 0xcb, 0x42, 0xe6, 0xba, 0x67, 0xb2, 0xe6, 0xa2, 0x15,
-  0x04, 0xea, 0x69, 0xae, 0x3e, 0xc0, 0x0c, 0x10, 0x99, 0xec, 0xa9, 0xb0,
-  0x7e, 0xe8, 0x94, 0xe2, 0xf3, 0xaf, 0xf7, 0x9f, 0x65, 0xe7, 0xd7, 0xe2,
-  0x49, 0xfa, 0x52, 0x7d, 0xb5, 0xfd, 0xa0, 0xa5, 0xe0, 0x49, 0xa7, 0x3d,
-  0x94, 0x20, 0x2d, 0xec, 0x8c, 0x22, 0xa5, 0xa4, 0x43, 0xfa, 0x7e, 0xd0,
-  0x50, 0x21, 0xb8, 0x67, 0x18, 0x44, 0x69, 0x8f, 0xdd, 0x47, 0x41, 0xc6,
-  0x35, 0xe0, 0xe9, 0x2e, 0x41, 0xa9, 0x6f, 0x41, 0xee, 0xb9, 0xbd, 0x45,
-  0xf3, 0x88, 0xc1, 0x23, 0x35, 0x96, 0xba, 0xf8, 0xcd, 0x4b, 0x83, 0x73,
-  0x5f
-};
+    const unsigned char der_bytes[] = {
+        0x30, 0x82, 0x03, 0x09, 0x30, 0x82, 0x01, 0xf1, 0xa0, 0x03, 0x02, 0x01,
+        0x02, 0x02, 0x14, 0x08, 0xe0, 0x8c, 0xd3, 0xf3, 0xbf, 0x2c, 0xf2, 0x0d,
+        0x0a, 0x75, 0xd1, 0xe8, 0xea, 0xbe, 0x70, 0x61, 0xd9, 0x67, 0xf9, 0x30,
+        0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
+        0x05, 0x00, 0x30, 0x14, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04,
+        0x03, 0x0c, 0x09, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74,
+        0x30, 0x1e, 0x17, 0x0d, 0x32, 0x32, 0x30, 0x34, 0x31, 0x31, 0x31, 0x34,
+        0x31, 0x39, 0x35, 0x37, 0x5a, 0x17, 0x0d, 0x32, 0x32, 0x30, 0x35, 0x31,
+        0x31, 0x31, 0x34, 0x31, 0x39, 0x35, 0x37, 0x5a, 0x30, 0x14, 0x31, 0x12,
+        0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x09, 0x6c, 0x6f, 0x63,
+        0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d,
+        0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
+        0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82,
+        0x01, 0x01, 0x00, 0xc3, 0x1f, 0x5c, 0x56, 0x46, 0x8d, 0x69, 0xb6, 0x48,
+        0x3c, 0xbf, 0xe2, 0x0f, 0xa7, 0x4a, 0x44, 0x72, 0x74, 0x36, 0xfe, 0xe8,
+        0x2f, 0x10, 0x4a, 0xe9, 0x46, 0x45, 0x72, 0x5e, 0x48, 0xdd, 0x75, 0xab,
+        0xd9, 0x63, 0x91, 0x37, 0x93, 0x46, 0x28, 0x7e, 0x45, 0x94, 0x4b, 0x8a,
+        0xd5, 0x05, 0x2b, 0x9a, 0x01, 0x96, 0x30, 0xde, 0xcc, 0x14, 0x2d, 0x06,
+        0x09, 0x1b, 0x7d, 0x50, 0x14, 0x99, 0x36, 0x6b, 0x97, 0x6e, 0xc9, 0xb1,
+        0x69, 0x70, 0xcd, 0x9b, 0x74, 0x24, 0x9a, 0xe2, 0xd4, 0xc0, 0x1e, 0xbc,
+        0xec, 0xf6, 0x7a, 0xbb, 0xa0, 0x53, 0x93, 0xf8, 0x68, 0x9a, 0x18, 0xa1,
+        0xa1, 0x5c, 0x47, 0x93, 0xd1, 0x4c, 0x36, 0x8c, 0x00, 0xb3, 0x66, 0xda,
+        0xf1, 0x05, 0xb2, 0x3a, 0xad, 0x7e, 0x4b, 0xf3, 0xd3, 0x93, 0xfa, 0x59,
+        0x09, 0x9c, 0x60, 0x37, 0x69, 0x61, 0xe8, 0x5a, 0x33, 0xc6, 0xb2, 0x1a,
+        0xba, 0x36, 0xe2, 0xb3, 0x58, 0xe9, 0x73, 0x01, 0x2d, 0x36, 0x48, 0x36,
+        0x94, 0xe4, 0xb2, 0xa4, 0x5b, 0xdf, 0x3d, 0x5f, 0x62, 0x9f, 0xd9, 0xf3,
+        0x24, 0x0c, 0xf0, 0x2f, 0x71, 0x44, 0x79, 0x13, 0x70, 0x95, 0xa7, 0xbe,
+        0xea, 0x0a, 0x08, 0x0a, 0xa6, 0x4b, 0xe9, 0x58, 0x6b, 0xa4, 0xc2, 0xed,
+        0x74, 0x1e, 0xb0, 0x3b, 0x59, 0xd5, 0xe6, 0xdb, 0x8f, 0x58, 0x6a, 0xa3,
+        0x7d, 0x52, 0x40, 0xec, 0x72, 0xb7, 0xba, 0x7e, 0x30, 0x9d, 0x12, 0x57,
+        0xf2, 0x48, 0xae, 0x80, 0x0d, 0x0a, 0xf4, 0xfd, 0x24, 0xed, 0xd8, 0x05,
+        0xb2, 0x96, 0x44, 0x02, 0x3e, 0x6e, 0x25, 0xb0, 0xc4, 0x93, 0xda, 0xfe,
+        0x78, 0xd9, 0xbb, 0xd2, 0x71, 0x69, 0x70, 0x7f, 0xba, 0xf7, 0xb0, 0x4f,
+        0x14, 0xf7, 0x98, 0x71, 0x01, 0x6c, 0xec, 0x6f, 0x76, 0x03, 0x59, 0xff,
+        0xe2, 0xba, 0x8d, 0xd9, 0x21, 0x08, 0xb3, 0x02, 0x03, 0x01, 0x00, 0x01,
+        0xa3, 0x53, 0x30, 0x51, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04,
+        0x16, 0x04, 0x14, 0x59, 0xb8, 0x6e, 0x1a, 0x72, 0xe9, 0x27, 0x1e, 0xbf,
+        0x80, 0x87, 0x0f, 0xa9, 0xd0, 0x06, 0x6a, 0x11, 0x30, 0x77, 0x8e, 0x30,
+        0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14,
+        0x59, 0xb8, 0x6e, 0x1a, 0x72, 0xe9, 0x27, 0x1e, 0xbf, 0x80, 0x87, 0x0f,
+        0xa9, 0xd0, 0x06, 0x6a, 0x11, 0x30, 0x77, 0x8e, 0x30, 0x0f, 0x06, 0x03,
+        0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01,
+        0xff, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01,
+        0x01, 0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00, 0x98, 0x76, 0x9e,
+        0x3c, 0xfc, 0x3f, 0x58, 0xe8, 0xf2, 0x1f, 0x2e, 0x11, 0xa2, 0x59, 0xfa,
+        0x27, 0xb5, 0xec, 0x9d, 0x97, 0x05, 0x06, 0x2c, 0x95, 0xa5, 0x28, 0x88,
+        0x86, 0xeb, 0x4e, 0x8a, 0x62, 0xe9, 0x87, 0x78, 0xd8, 0x18, 0x22, 0x4e,
+        0xb1, 0x8d, 0x46, 0x4a, 0x4c, 0x6e, 0x7c, 0x53, 0x62, 0x2c, 0xf2, 0x7a,
+        0x95, 0xa0, 0x1a, 0x30, 0x18, 0x6a, 0x31, 0x6f, 0x3f, 0x55, 0x25, 0x9f,
+        0x67, 0x60, 0x68, 0x99, 0x0f, 0x41, 0x09, 0xc8, 0xe2, 0x04, 0x33, 0x22,
+        0x1a, 0xe9, 0xf3, 0xae, 0xce, 0xb6, 0x83, 0x64, 0x78, 0x66, 0x14, 0xc9,
+        0x54, 0xc8, 0x34, 0x70, 0x96, 0xaf, 0x16, 0xcd, 0xb8, 0xdf, 0x81, 0x7e,
+        0xf0, 0xa6, 0x7d, 0xc1, 0x13, 0xb2, 0x76, 0x3a, 0xd5, 0x7e, 0x68, 0x8c,
+        0xd5, 0x00, 0x70, 0x82, 0x23, 0x7e, 0x5e, 0xc9, 0x31, 0x2f, 0x33, 0x54,
+        0xaa, 0xaf, 0xcd, 0xe9, 0x38, 0x9a, 0x23, 0x53, 0xad, 0x4e, 0x72, 0xa7,
+        0x6f, 0x47, 0x60, 0xc9, 0xd3, 0x06, 0x9b, 0x7a, 0x21, 0xc6, 0xe9, 0xdb,
+        0x3c, 0xaa, 0xc0, 0x21, 0x29, 0x5f, 0x44, 0x6a, 0x45, 0x90, 0x73, 0x5e,
+        0x6d, 0x78, 0x82, 0xcb, 0x42, 0xe6, 0xba, 0x67, 0xb2, 0xe6, 0xa2, 0x15,
+        0x04, 0xea, 0x69, 0xae, 0x3e, 0xc0, 0x0c, 0x10, 0x99, 0xec, 0xa9, 0xb0,
+        0x7e, 0xe8, 0x94, 0xe2, 0xf3, 0xaf, 0xf7, 0x9f, 0x65, 0xe7, 0xd7, 0xe2,
+        0x49, 0xfa, 0x52, 0x7d, 0xb5, 0xfd, 0xa0, 0xa5, 0xe0, 0x49, 0xa7, 0x3d,
+        0x94, 0x20, 0x2d, 0xec, 0x8c, 0x22, 0xa5, 0xa4, 0x43, 0xfa, 0x7e, 0xd0,
+        0x50, 0x21, 0xb8, 0x67, 0x18, 0x44, 0x69, 0x8f, 0xdd, 0x47, 0x41, 0xc6,
+        0x35, 0xe0, 0xe9, 0x2e, 0x41, 0xa9, 0x6f, 0x41, 0xee, 0xb9, 0xbd, 0x45,
+        0xf3, 0x88, 0xc1, 0x23, 0x35, 0x96, 0xba, 0xf8, 0xcd, 0x4b, 0x83, 0x73,
+        0x5f
+    };
 
     char str1[] = "SubjectPublicKeyInfo", str2[] = "subjectpublickeyinfo";
     int res;
diff --git a/test/mdc2_internal_test.c b/test/mdc2_internal_test.c
index 56f464b1f3eb6..0fce250004fe6 100644
--- a/test/mdc2_internal_test.c
+++ b/test/mdc2_internal_test.c
@@ -27,7 +27,6 @@ typedef struct {
     const unsigned char expected[MDC2_DIGEST_LENGTH];
 } TESTDATA;
 
-
 /**********************************************************************
  *
  * Test driver
@@ -35,13 +34,9 @@ typedef struct {
  ***/
 
 static TESTDATA tests[] = {
-    {
-        "Now is the time for all ",
-        {
-            0x42, 0xE5, 0x0C, 0xD2, 0x24, 0xBA, 0xCE, 0xBA,
-            0x76, 0x0B, 0xDD, 0x2B, 0xD4, 0x09, 0x28, 0x1A
-        }
-    }
+    { "Now is the time for all ",
+        { 0x42, 0xE5, 0x0C, 0xD2, 0x24, 0xBA, 0xCE, 0xBA,
+            0x76, 0x0B, 0xDD, 0x2B, 0xD4, 0x09, 0x28, 0x1A } }
 };
 
 /**********************************************************************
@@ -58,11 +53,11 @@ static int test_mdc2(int idx)
 
     MDC2_Init(&c);
     MDC2_Update(&c, (const unsigned char *)testdata.input,
-                strlen(testdata.input));
+        strlen(testdata.input));
     MDC2_Final(&(md[0]), &c);
 
     if (!TEST_mem_eq(testdata.expected, MDC2_DIGEST_LENGTH,
-                     md, MDC2_DIGEST_LENGTH)) {
+            md, MDC2_DIGEST_LENGTH)) {
         TEST_info("mdc2 test %d: unexpected output", idx);
         return 0;
     }
diff --git a/test/mdc2test.c b/test/mdc2test.c
index a524ceca160d4..39b8c144ad569 100644
--- a/test/mdc2test.c
+++ b/test/mdc2test.c
@@ -21,16 +21,16 @@
 #include "testutil.h"
 
 #if defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_MDC2)
-# define OPENSSL_NO_MDC2
+#define OPENSSL_NO_MDC2
 #endif
 
 #ifndef OPENSSL_NO_MDC2
-# include <openssl/evp.h>
-# include <openssl/mdc2.h>
+#include <openssl/evp.h>
+#include <openssl/mdc2.h>
 
-# ifdef CHARSET_EBCDIC
-#  include <openssl/ebcdic.h>
-# endif
+#ifdef CHARSET_EBCDIC
+#include <openssl/ebcdic.h>
+#endif
 
 static unsigned char pad1[16] = {
     0x42, 0xE5, 0x0C, 0xD2, 0x24, 0xBA, 0xCE, 0xBA,
@@ -54,16 +54,16 @@ static int test_mdc2(void)
     OSSL_PARAM params[2];
 
     params[i++] = OSSL_PARAM_construct_uint(OSSL_DIGEST_PARAM_PAD_TYPE,
-                                            &pad_type),
+        &pad_type),
     params[i++] = OSSL_PARAM_construct_end();
 
     prov = OSSL_PROVIDER_load(NULL, "legacy");
     if (!TEST_ptr(prov))
         goto end;
 
-# ifdef CHARSET_EBCDIC
+#ifdef CHARSET_EBCDIC
     ebcdic2ascii(text, text, tlen);
-# endif
+#endif
 
     c = EVP_MD_CTX_new();
     if (!TEST_ptr(c)
@@ -81,7 +81,7 @@ static int test_mdc2(void)
         goto end;
 
     testresult = 1;
- end:
+end:
     EVP_MD_CTX_free(c);
     OSSL_PROVIDER_unload(prov);
     return testresult;
diff --git a/test/membio_test.c b/test/membio_test.c
index f566184af7e06..eafd4d24fac31 100644
--- a/test/membio_test.c
+++ b/test/membio_test.c
@@ -48,13 +48,13 @@ static int test_dgram(void)
 
     /* Reading all 4 dgrams out again should all be the correct size */
     if (!TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(msg1))
-            || !TEST_mem_eq(buf, sizeof(msg1), msg1, sizeof(msg1))
-            || !TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(msg2))
-            || !TEST_mem_eq(buf, sizeof(msg2), msg2, sizeof(msg2))
-            || !TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(msg3))
-            || !TEST_mem_eq(buf, sizeof(msg3), msg3, sizeof(msg3))
-            || !TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(msg4))
-            || !TEST_mem_eq(buf, sizeof(msg4), msg4, sizeof(msg4)))
+        || !TEST_mem_eq(buf, sizeof(msg1), msg1, sizeof(msg1))
+        || !TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(msg2))
+        || !TEST_mem_eq(buf, sizeof(msg2), msg2, sizeof(msg2))
+        || !TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(msg3))
+        || !TEST_mem_eq(buf, sizeof(msg3), msg3, sizeof(msg3))
+        || !TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(msg4))
+        || !TEST_mem_eq(buf, sizeof(msg4), msg4, sizeof(msg4)))
         goto err;
 
     /* Interleaving writes and reads should be fine */
@@ -63,14 +63,14 @@ static int test_dgram(void)
     if (!TEST_int_eq(BIO_write(bio, msg2, sizeof(msg2)), sizeof(msg2)))
         goto err;
     if (!TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(msg1))
-            || !TEST_mem_eq(buf, sizeof(msg1), msg1, sizeof(msg1)))
+        || !TEST_mem_eq(buf, sizeof(msg1), msg1, sizeof(msg1)))
         goto err;
     if (!TEST_int_eq(BIO_write(bio, msg3, sizeof(msg3)), sizeof(msg3)))
         goto err;
     if (!TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(msg2))
-            || !TEST_mem_eq(buf, sizeof(msg2), msg2, sizeof(msg2))
-            || !TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(msg3))
-            || !TEST_mem_eq(buf, sizeof(msg3), msg3, sizeof(msg3)))
+        || !TEST_mem_eq(buf, sizeof(msg2), msg2, sizeof(msg2))
+        || !TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(msg3))
+        || !TEST_mem_eq(buf, sizeof(msg3), msg3, sizeof(msg3)))
         goto err;
 
     /*
@@ -82,10 +82,10 @@ static int test_dgram(void)
     if (!TEST_int_eq(BIO_write(bio, msg2, sizeof(msg2)), sizeof(msg2)))
         goto err;
     if (!TEST_int_eq(BIO_read(bio, buf, /* Short buffer */ 2), 2)
-            || !TEST_mem_eq(buf, 2, msg1, 2))
+        || !TEST_mem_eq(buf, 2, msg1, 2))
         goto err;
     if (!TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(msg2))
-            || !TEST_mem_eq(buf, sizeof(msg2), msg2, sizeof(msg2)))
+        || !TEST_mem_eq(buf, sizeof(msg2), msg2, sizeof(msg2)))
         goto err;
 
     /*
@@ -94,17 +94,17 @@ static int test_dgram(void)
      * return a negative result, but not eof. Retry flags will be set.
      */
     if (!TEST_int_eq(BIO_write(bio, NULL, 0), 0)
-            || !TEST_int_lt(BIO_read(bio, buf, sizeof(buf)), 0)
-            || !TEST_false(BIO_eof(bio))
-            || !TEST_true(BIO_should_retry(bio)))
+        || !TEST_int_lt(BIO_read(bio, buf, sizeof(buf)), 0)
+        || !TEST_false(BIO_eof(bio))
+        || !TEST_true(BIO_should_retry(bio)))
         goto err;
 
     if (!TEST_int_eq(BIO_dgram_set_mtu(bio, 123456), 1)
-            || !TEST_int_eq(BIO_dgram_get_mtu(bio), 123456))
+        || !TEST_int_eq(BIO_dgram_get_mtu(bio), 123456))
         goto err;
 
     testresult = 1;
- err:
+err:
     BIO_free(rbio);
     BIO_free(bio);
     return testresult;
diff --git a/test/memleaktest.c b/test/memleaktest.c
index 8761686773986..dd1226bf81ff3 100644
--- a/test/memleaktest.c
+++ b/test/memleaktest.c
@@ -15,16 +15,16 @@
 
 /* __has_feature is a clang-ism, while __SANITIZE_ADDRESS__ is a gcc-ism */
 #if defined(__has_feature)
-# if __has_feature(address_sanitizer)
-#  define __SANITIZE_ADDRESS__ 1
-# endif
+#if __has_feature(address_sanitizer)
+#define __SANITIZE_ADDRESS__ 1
+#endif
 #endif
 /* If __SANITIZE_ADDRESS__ isn't defined, define it to be false */
 /* Leak detection is not yet supported with MSVC on Windows, so */
 /* set __SANITIZE_ADDRESS__ to false in this case as well.      */
 #if !defined(__SANITIZE_ADDRESS__) || defined(_MSC_VER)
-# undef __SANITIZE_ADDRESS__
-# define __SANITIZE_ADDRESS__ 0
+#undef __SANITIZE_ADDRESS__
+#define __SANITIZE_ADDRESS__ 0
 #endif
 
 /*
diff --git a/test/ml_dsa_test.c b/test/ml_dsa_test.c
index 9e23887d907cd..d7043de773609 100644
--- a/test/ml_dsa_test.c
+++ b/test/ml_dsa_test.c
@@ -26,7 +26,7 @@ static OSSL_PROVIDER *null_prov = NULL;
 static OSSL_PROVIDER *lib_prov = NULL;
 
 static EVP_PKEY *do_gen_key(const char *alg,
-                            const uint8_t *seed, size_t seed_len)
+    const uint8_t *seed, size_t seed_len)
 {
     EVP_PKEY *pkey = NULL;
     EVP_PKEY_CTX *ctx = NULL;
@@ -34,15 +34,15 @@ static EVP_PKEY *do_gen_key(const char *alg,
 
     if (seed_len != 0)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_ML_DSA_SEED,
-                                                 (char *)seed, seed_len);
+            (char *)seed, seed_len);
     *p++ = OSSL_PARAM_construct_utf8_string(OSSL_PKEY_PARAM_PROPERTIES,
-                                            "?fips=yes", 0);
+        "?fips=yes", 0);
     *p = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(lib_ctx, alg, NULL))
-            || !TEST_int_eq(EVP_PKEY_keygen_init(ctx), 1)
-            || !TEST_int_eq(EVP_PKEY_CTX_set_params(ctx, params), 1)
-            || !TEST_int_eq(EVP_PKEY_generate(ctx, &pkey), 1))
+        || !TEST_int_eq(EVP_PKEY_keygen_init(ctx), 1)
+        || !TEST_int_eq(EVP_PKEY_CTX_set_params(ctx, params), 1)
+        || !TEST_int_eq(EVP_PKEY_generate(ctx, &pkey), 1))
         pkey = NULL;
 
     EVP_PKEY_CTX_free(ctx);
@@ -50,9 +50,9 @@ static EVP_PKEY *do_gen_key(const char *alg,
 }
 
 static int ml_dsa_create_keypair(EVP_PKEY **pkey, const char *name,
-                                 const uint8_t *priv, size_t priv_len,
-                                 const uint8_t *pub, size_t pub_len,
-                                 int expected)
+    const uint8_t *priv, size_t priv_len,
+    const uint8_t *pub, size_t pub_len,
+    int expected)
 {
     int ret = 0, selection = 0;
     EVP_PKEY_CTX *ctx = NULL;
@@ -60,20 +60,21 @@ static int ml_dsa_create_keypair(EVP_PKEY **pkey, const char *name,
 
     if (priv != NULL) {
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_PRIV_KEY,
-                                                 (uint8_t *)priv, priv_len);
+            (uint8_t *)priv, priv_len);
         selection = OSSL_KEYMGMT_SELECT_PRIVATE_KEY;
     }
     if (pub != NULL) {
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_PUB_KEY,
-                                                 (uint8_t *)pub, pub_len);
+            (uint8_t *)pub, pub_len);
         selection |= OSSL_KEYMGMT_SELECT_PUBLIC_KEY;
     }
     *p = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(lib_ctx, name, NULL))
-            || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
-            || !TEST_int_eq(EVP_PKEY_fromdata(ctx, pkey, selection,
-                                              params), expected))
+        || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
+        || !TEST_int_eq(EVP_PKEY_fromdata(ctx, pkey, selection,
+                            params),
+            expected))
         goto err;
 
     ret = 1;
@@ -89,17 +90,27 @@ static int ml_dsa_keygen_test(int tst_id)
     EVP_PKEY *pkey = NULL;
     uint8_t priv[5 * 1024], pub[3 * 1024], seed[ML_DSA_SEED_BYTES];
     size_t priv_len, pub_len, seed_len;
+    int bits = 0, sec_bits = 0, sig_len = 0;
 
     if (!TEST_ptr(pkey = do_gen_key(tst->name, tst->seed, tst->seed_len))
-            || !TEST_true(EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_ML_DSA_SEED,
-                                                          seed, sizeof(seed), &seed_len))
-            || !TEST_true(EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_PRIV_KEY,
-                                                          priv, sizeof(priv), &priv_len))
-            || !TEST_true(EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_PUB_KEY,
-                                                          pub, sizeof(pub), &pub_len))
-            || !TEST_mem_eq(pub, pub_len, tst->pub, tst->pub_len)
-            || !TEST_mem_eq(priv, priv_len, tst->priv, tst->priv_len)
-            || !TEST_mem_eq(seed, seed_len, tst->seed, tst->seed_len))
+        || !TEST_true(EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_ML_DSA_SEED,
+            seed, sizeof(seed), &seed_len))
+        || !TEST_true(EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_PRIV_KEY,
+            priv, sizeof(priv), &priv_len))
+        || !TEST_true(EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_PUB_KEY,
+            pub, sizeof(pub), &pub_len))
+        || !TEST_mem_eq(pub, pub_len, tst->pub, tst->pub_len)
+        || !TEST_mem_eq(priv, priv_len, tst->priv, tst->priv_len)
+        || !TEST_mem_eq(seed, seed_len, tst->seed, tst->seed_len)
+        /* The following checks assume that algorithm is ML-DSA-65 */
+        || !TEST_true(EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_BITS, &bits))
+        || !TEST_int_eq(bits, 1952 * 8)
+        || !TEST_true(EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_SECURITY_BITS,
+            &sec_bits))
+        || !TEST_int_eq(sec_bits, 192)
+        || !TEST_true(EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_MAX_SIZE,
+            &sig_len))
+        || !TEST_int_ge(sig_len, 3309))
         goto err;
     ret = 1;
 err:
@@ -125,8 +136,8 @@ static int ml_dsa_siggen_test(int tst_id)
     *p++ = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_MESSAGE_ENCODING, &encode);
     if (td->add_random != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_TEST_ENTROPY,
-                                                 (char *)td->add_random,
-                                                 td->add_random_len);
+            (char *)td->add_random,
+            td->add_random_len);
     *p = OSSL_PARAM_construct_end();
 
     /*
@@ -134,21 +145,24 @@ static int ml_dsa_siggen_test(int tst_id)
      * The keygen path is tested via ml_dsa_keygen_test
      */
     if (!TEST_true(ml_dsa_create_keypair(&pkey, td->alg, td->priv, td->priv_len,
-                                         NULL, 0, 1))
-            || !TEST_ptr(sctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, pkey, NULL))
-            || !TEST_ptr(sig_alg = EVP_SIGNATURE_fetch(lib_ctx, td->alg, NULL))
-            || !TEST_int_eq(EVP_PKEY_sign_message_init(sctx, sig_alg, params), 1)
-            || !TEST_int_eq(EVP_PKEY_sign(sctx, NULL, &psig_len,
-                                          td->msg, td->msg_len), 1)
-            || !TEST_true(EVP_PKEY_get_size_t_param(pkey, OSSL_PKEY_PARAM_MAX_SIZE,
-                                                    &sig_len2))
-            || !TEST_int_eq(sig_len2, psig_len)
-            || !TEST_ptr(psig = OPENSSL_zalloc(psig_len))
-            || !TEST_int_eq(EVP_PKEY_sign(sctx, psig, &psig_len,
-                                          td->msg, td->msg_len), 1)
-            || !TEST_int_eq(EVP_Q_digest(lib_ctx, "SHA256", NULL, psig, psig_len,
-                                         digest, &digest_len), 1)
-            || !TEST_mem_eq(digest, digest_len, td->sig_digest, td->sig_digest_len))
+            NULL, 0, 1))
+        || !TEST_ptr(sctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, pkey, NULL))
+        || !TEST_ptr(sig_alg = EVP_SIGNATURE_fetch(lib_ctx, td->alg, NULL))
+        || !TEST_int_eq(EVP_PKEY_sign_message_init(sctx, sig_alg, params), 1)
+        || !TEST_int_eq(EVP_PKEY_sign(sctx, NULL, &psig_len,
+                            td->msg, td->msg_len),
+            1)
+        || !TEST_true(EVP_PKEY_get_size_t_param(pkey, OSSL_PKEY_PARAM_MAX_SIZE,
+            &sig_len2))
+        || !TEST_int_eq(sig_len2, psig_len)
+        || !TEST_ptr(psig = OPENSSL_zalloc(psig_len))
+        || !TEST_int_eq(EVP_PKEY_sign(sctx, psig, &psig_len,
+                            td->msg, td->msg_len),
+            1)
+        || !TEST_int_eq(EVP_Q_digest(lib_ctx, "SHA256", NULL, psig, psig_len,
+                            digest, &digest_len),
+            1)
+        || !TEST_mem_eq(digest, digest_len, td->sig_digest, td->sig_digest_len))
         goto err;
     ret = 1;
 err:
@@ -173,7 +187,7 @@ static int ml_dsa_sigver_test(int tst_id)
     *p = OSSL_PARAM_construct_end();
 
     if (!TEST_true(ml_dsa_create_keypair(&pkey, td->alg, NULL, 0,
-                                         td->pub, td->pub_len, 1)))
+            td->pub, td->pub_len, 1)))
         goto err;
 
     if (!TEST_ptr(vctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, pkey, NULL)))
@@ -181,8 +195,9 @@ static int ml_dsa_sigver_test(int tst_id)
     if (!TEST_ptr(sig_alg = EVP_SIGNATURE_fetch(lib_ctx, td->alg, NULL)))
         goto err;
     if (!TEST_int_eq(EVP_PKEY_verify_message_init(vctx, sig_alg, params), 1)
-            || !TEST_int_eq(EVP_PKEY_verify(vctx, td->sig, td->sig_len,
-                                            td->msg, td->msg_len), td->expected))
+        || !TEST_int_eq(EVP_PKEY_verify(vctx, td->sig, td->sig_len,
+                            td->msg, td->msg_len),
+            td->expected))
         goto err;
     ret = 1;
 err:
@@ -200,13 +215,13 @@ static int ml_dsa_key_dup_test(void)
     EVP_PKEY_CTX *ctx = NULL;
 
     if (!TEST_ptr(pkey = do_gen_key(tst->name, tst->seed, tst->seed_len))
-            || !TEST_ptr(pkey_copy = EVP_PKEY_dup(pkey))
-            || !TEST_int_eq(EVP_PKEY_eq(pkey, pkey_copy), 1)
-            || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, pkey_copy, NULL))
-            || !TEST_int_eq(EVP_PKEY_check(ctx), 1))
+        || !TEST_ptr(pkey_copy = EVP_PKEY_dup(pkey))
+        || !TEST_int_eq(EVP_PKEY_eq(pkey, pkey_copy), 1)
+        || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, pkey_copy, NULL))
+        || !TEST_int_eq(EVP_PKEY_check(ctx), 1))
         goto err;
     ret = 1;
- err:
+err:
     EVP_PKEY_free(pkey);
     EVP_PKEY_free(pkey_copy);
     EVP_PKEY_CTX_free(ctx);
@@ -223,21 +238,21 @@ static int ml_dsa_key_internal_test(void)
 
     /* We should fail to fetch and fail here if the libctx is not set */
     if (!TEST_ptr_null(key = ossl_ml_dsa_key_new(NULL, NULL, EVP_PKEY_ML_DSA_44))
-            /* fail if the algorithm is invalid */
-            || !TEST_ptr_null(key = ossl_ml_dsa_key_new(lib_ctx, "", NID_undef))
-            /* Dup should fail if the src is NULL */
-            || !TEST_ptr_null(key1 = ossl_ml_dsa_key_dup(NULL, OSSL_KEYMGMT_SELECT_KEYPAIR))
-            || !TEST_ptr(key = ossl_ml_dsa_key_new(lib_ctx, "?fips=yes",
-                                                   EVP_PKEY_ML_DSA_44))
-            || !TEST_ptr(key1 = ossl_ml_dsa_key_dup(key, OSSL_KEYMGMT_SELECT_KEYPAIR))
-            || !TEST_true(ossl_ml_dsa_key_pub_alloc(key1))
-            || !TEST_false(ossl_ml_dsa_key_pub_alloc(key1))
-            || !TEST_true(ossl_ml_dsa_key_priv_alloc(key))
-            || !TEST_false(ossl_ml_dsa_key_priv_alloc(key)))
+        /* fail if the algorithm is invalid */
+        || !TEST_ptr_null(key = ossl_ml_dsa_key_new(lib_ctx, "", NID_undef))
+        /* Dup should fail if the src is NULL */
+        || !TEST_ptr_null(key1 = ossl_ml_dsa_key_dup(NULL, OSSL_KEYMGMT_SELECT_KEYPAIR))
+        || !TEST_ptr(key = ossl_ml_dsa_key_new(lib_ctx, "?fips=yes",
+                         EVP_PKEY_ML_DSA_44))
+        || !TEST_ptr(key1 = ossl_ml_dsa_key_dup(key, OSSL_KEYMGMT_SELECT_KEYPAIR))
+        || !TEST_true(ossl_ml_dsa_key_pub_alloc(key1))
+        || !TEST_false(ossl_ml_dsa_key_pub_alloc(key1))
+        || !TEST_true(ossl_ml_dsa_key_priv_alloc(key))
+        || !TEST_false(ossl_ml_dsa_key_priv_alloc(key)))
         goto err;
 
     ret = 1;
- err:
+err:
     ossl_ml_dsa_key_free(key1);
     ossl_ml_dsa_key_free(key);
     return ret;
@@ -256,21 +271,21 @@ static int from_data_invalid_public_test(void)
     pub[0] ^= 1;
 
     if (!TEST_true(ml_dsa_create_keypair(&pkey, tst->name, tst->priv, tst->priv_len,
-                                         tst->pub, tst->pub_len, 1))
-            || !TEST_true(ml_dsa_create_keypair(&pkey, tst->name, tst->priv, tst->priv_len,
-                                                pub, tst->pub_len, 0))
-            || !TEST_true(ml_dsa_create_keypair(&pkey, tst->name, tst->priv, tst->priv_len,
-                                                tst->pub, tst->pub_len - 1, 0))
-            || !TEST_true(ml_dsa_create_keypair(&pkey, tst->name, tst->priv, tst->priv_len,
-                                                tst->pub, tst->pub_len + 1, 0))
-            || !TEST_true(ml_dsa_create_keypair(&pkey, tst->name, tst->priv, tst->priv_len - 1,
-                                                tst->pub, tst->pub_len, 0))
-            || !TEST_true(ml_dsa_create_keypair(&pkey, tst->name, tst->priv, tst->priv_len + 1,
-                                                tst->pub, tst->pub_len, 0)))
+            tst->pub, tst->pub_len, 1))
+        || !TEST_true(ml_dsa_create_keypair(&pkey, tst->name, tst->priv, tst->priv_len,
+            pub, tst->pub_len, 0))
+        || !TEST_true(ml_dsa_create_keypair(&pkey, tst->name, tst->priv, tst->priv_len,
+            tst->pub, tst->pub_len - 1, 0))
+        || !TEST_true(ml_dsa_create_keypair(&pkey, tst->name, tst->priv, tst->priv_len,
+            tst->pub, tst->pub_len + 1, 0))
+        || !TEST_true(ml_dsa_create_keypair(&pkey, tst->name, tst->priv, tst->priv_len - 1,
+            tst->pub, tst->pub_len, 0))
+        || !TEST_true(ml_dsa_create_keypair(&pkey, tst->name, tst->priv, tst->priv_len + 1,
+            tst->pub, tst->pub_len, 0)))
         goto err;
 
     ret = 1;
- err:
+err:
     OPENSSL_free(pub);
     EVP_PKEY_free(pkey);
     return ret;
@@ -285,23 +300,25 @@ static int from_data_bad_input_test(void)
     uint32_t i = 0;
 
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(lib_ctx, "ML-DSA-44", NULL))
-            || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
-            || !TEST_ptr(EVP_PKEY_fromdata_settable(ctx, OSSL_KEYMGMT_SELECT_KEYPAIR))
-            || !TEST_ptr_null(EVP_PKEY_fromdata_settable(ctx, 0)))
+        || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
+        || !TEST_ptr(EVP_PKEY_fromdata_settable(ctx, OSSL_KEYMGMT_SELECT_KEYPAIR))
+        || !TEST_ptr_null(EVP_PKEY_fromdata_settable(ctx, 0)))
         goto err;
 
     params[0] = OSSL_PARAM_construct_uint32(OSSL_PKEY_PARAM_PRIV_KEY, &i);
     params[1] = OSSL_PARAM_construct_end();
     if (!TEST_int_ne(EVP_PKEY_fromdata(ctx, &pkey, OSSL_KEYMGMT_SELECT_PRIVATE_KEY,
-                                       params), 1))
+                         params),
+            1))
         goto err;
     params[0] = OSSL_PARAM_construct_uint32(OSSL_PKEY_PARAM_PUB_KEY, &i);
     params[1] = OSSL_PARAM_construct_end();
     if (!TEST_int_ne(EVP_PKEY_fromdata(ctx, &pkey, OSSL_KEYMGMT_SELECT_PUBLIC_KEY,
-                                       params), 1))
+                         params),
+            1))
         goto err;
     ret = 1;
- err:
+err:
     EVP_PKEY_free(pkey);
     EVP_PKEY_CTX_free(ctx);
     return ret;
@@ -315,26 +332,26 @@ static int ml_dsa_keygen_drbg_test(void)
     uint8_t *priv = NULL, *pub = NULL;
 
     if (!TEST_ptr(pkey = do_gen_key("ML-DSA-44", NULL, 0))
-            || !TEST_ptr(pkey2 = do_gen_key("ML-DSA-44", NULL, 0))
-            || !TEST_ptr(pkey3 = do_gen_key("ML-DSA-65", NULL, 0))
-            || !TEST_int_eq(EVP_PKEY_eq(pkey, pkey2), 0)
-            || !TEST_int_eq(EVP_PKEY_eq(pkey, pkey3), -1)
-            || !TEST_int_eq(EVP_PKEY_get_raw_private_key(pkey, NULL, &len), 1)
-            || !TEST_int_gt(len, 0)
-            || !TEST_ptr(priv = OPENSSL_malloc(len))
-            || !TEST_int_eq(EVP_PKEY_get_raw_private_key(pkey, priv, &len), 1)
-            || !TEST_int_eq(EVP_PKEY_get_raw_public_key(pkey, NULL, &len), 1)
-            || !TEST_int_gt(len, 0)
-            || !TEST_ptr(pub = OPENSSL_malloc(len))
-            || !TEST_int_eq(EVP_PKEY_get_raw_public_key(pkey, pub, &len), 1)
-            /* Load just the public part into a PKEY */
-            || !TEST_true(ml_dsa_create_keypair(&pkey_pub, "ML-DSA-44", NULL, 0,
-                                                pub, len, 1))
-            /* test that the KEY's are equal */
-            || !TEST_int_eq(EVP_PKEY_eq(pkey_pub, pkey), 1))
+        || !TEST_ptr(pkey2 = do_gen_key("ML-DSA-44", NULL, 0))
+        || !TEST_ptr(pkey3 = do_gen_key("ML-DSA-65", NULL, 0))
+        || !TEST_int_eq(EVP_PKEY_eq(pkey, pkey2), 0)
+        || !TEST_int_eq(EVP_PKEY_eq(pkey, pkey3), -1)
+        || !TEST_int_eq(EVP_PKEY_get_raw_private_key(pkey, NULL, &len), 1)
+        || !TEST_int_gt(len, 0)
+        || !TEST_ptr(priv = OPENSSL_malloc(len))
+        || !TEST_int_eq(EVP_PKEY_get_raw_private_key(pkey, priv, &len), 1)
+        || !TEST_int_eq(EVP_PKEY_get_raw_public_key(pkey, NULL, &len), 1)
+        || !TEST_int_gt(len, 0)
+        || !TEST_ptr(pub = OPENSSL_malloc(len))
+        || !TEST_int_eq(EVP_PKEY_get_raw_public_key(pkey, pub, &len), 1)
+        /* Load just the public part into a PKEY */
+        || !TEST_true(ml_dsa_create_keypair(&pkey_pub, "ML-DSA-44", NULL, 0,
+            pub, len, 1))
+        /* test that the KEY's are equal */
+        || !TEST_int_eq(EVP_PKEY_eq(pkey_pub, pkey), 1))
         goto err;
     ret = 1;
- err:
+err:
     OPENSSL_free(pub);
     OPENSSL_free(priv);
     EVP_PKEY_free(pkey);
@@ -347,9 +364,9 @@ static int ml_dsa_keygen_drbg_test(void)
 static uint8_t msg1[] = "Hello World";
 static uint8_t ctx1[] = "Context Test";
 /* This message size will not fit into the internal buffer - so an alloc occurs */
-static uint8_t msg2[2048] = {0};
+static uint8_t msg2[2048] = { 0 };
 /* This ctx is larger than 255 and will fail */
-static uint8_t ctx2[256] = {0};
+static uint8_t ctx2[256] = { 0 };
 
 static struct sig_params_st {
     uint8_t *msg;
@@ -388,31 +405,31 @@ static int do_ml_dsa_sign_verify(const char *alg, int tstid)
         goto err;
 
     *p++ = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_MESSAGE_ENCODING,
-                                    (int *)&sp->encoded);
+        (int *)&sp->encoded);
     if (sp->ctx != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_CONTEXT_STRING,
-                                                 sp->ctx, sp->ctx_len);
+            sp->ctx, sp->ctx_len);
     *p++ = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(sctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, key, NULL))
-            || !TEST_ptr(sig_alg = EVP_SIGNATURE_fetch(lib_ctx, alg, NULL))
-            || !TEST_int_eq(EVP_PKEY_sign_message_init(sctx, sig_alg, params), sp->expected))
+        || !TEST_ptr(sig_alg = EVP_SIGNATURE_fetch(lib_ctx, alg, NULL))
+        || !TEST_int_eq(EVP_PKEY_sign_message_init(sctx, sig_alg, params), sp->expected))
         goto err;
     if (sp->expected == 0) {
         ret = 1; /* return true as we expected to fail */
         goto err;
     }
     if (!TEST_int_eq(EVP_PKEY_sign(sctx, NULL, &sig_len, sp->msg, sp->msg_len), 1)
-            || !TEST_ptr(sig = OPENSSL_zalloc(sig_len)))
+        || !TEST_ptr(sig = OPENSSL_zalloc(sig_len)))
         goto err;
     sig_len--;
     if (!TEST_int_eq(EVP_PKEY_sign(sctx, sig, &sig_len, sp->msg, sp->msg_len), 0))
         goto err;
     sig_len++;
     if (!TEST_int_eq(EVP_PKEY_sign(sctx, sig, &sig_len, sp->msg, sp->msg_len), 1)
-            || !TEST_ptr(vctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, key, NULL))
-            || !TEST_int_eq(EVP_PKEY_verify_message_init(vctx, sig_alg, params), 1)
-            || !TEST_int_eq(EVP_PKEY_verify(vctx, sig, sig_len, sp->msg, sp->msg_len), 1))
+        || !TEST_ptr(vctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, key, NULL))
+        || !TEST_int_eq(EVP_PKEY_verify_message_init(vctx, sig_alg, params), 1)
+        || !TEST_int_eq(EVP_PKEY_verify(vctx, sig, sig_len, sp->msg, sp->msg_len), 1))
         goto err;
     ret = 1;
 err:
@@ -451,42 +468,49 @@ static int ml_dsa_digest_sign_verify_test(void)
         goto err;
 
     *p++ = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_MESSAGE_ENCODING,
-                                    (int *)&sp->encoded);
+        (int *)&sp->encoded);
     if (sp->ctx != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_CONTEXT_STRING,
-                                                 sp->ctx, sp->ctx_len);
+            sp->ctx, sp->ctx_len);
     *p++ = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(mctx = EVP_MD_CTX_new())
-            || !TEST_int_eq(EVP_DigestSignInit_ex(mctx, NULL, "SHA256",
-                                                  lib_ctx, "?fips=true",
-                                                  key, params), 0)
-            || !TEST_int_eq(EVP_DigestSignInit_ex(mctx, NULL, NULL, lib_ctx,
-                                                  "?fips=true", key, params), 1))
+        || !TEST_int_eq(EVP_DigestSignInit_ex(mctx, NULL, "SHA256",
+                            lib_ctx, "?fips=true",
+                            key, params),
+            0)
+        || !TEST_int_eq(EVP_DigestSignInit_ex(mctx, NULL, NULL, lib_ctx,
+                            "?fips=true", key, params),
+            1))
         goto err;
     if (sp->expected == 0) {
         ret = 1; /* return true as we expected to fail */
         goto err;
     }
     if (!TEST_int_eq(EVP_DigestSign(mctx, NULL, &sig_len, sp->msg, sp->msg_len), 1)
-            || !TEST_ptr(sig = OPENSSL_zalloc(sig_len)))
+        || !TEST_ptr(sig = OPENSSL_zalloc(sig_len)))
         goto err;
     sig_len--;
     if (!TEST_int_eq(EVP_DigestSign(mctx, sig, &sig_len, sp->msg, sp->msg_len), 0))
         goto err;
     sig_len++;
     if (!TEST_int_eq(EVP_DigestSignInit_ex(mctx, NULL, NULL, lib_ctx, "?fips=true",
-                                           key, params), 1)
-            || !TEST_int_eq(EVP_DigestSign(mctx, sig, &sig_len,
-                                           sp->msg, sp->msg_len), 1)
-            || !TEST_int_eq(EVP_DigestVerifyInit_ex(mctx, NULL, "SHA256",
-                                                    lib_ctx, "?fips=true",
-                                                    key, params), 0)
-            || !TEST_int_eq(EVP_DigestVerifyInit_ex(mctx, NULL, NULL,
-                                                    lib_ctx, "?fips=true",
-                                                    key, params), 1)
-            || !TEST_int_eq(EVP_DigestVerify(mctx, sig, sig_len,
-                                             sp->msg, sp->msg_len), 1))
+                         key, params),
+            1)
+        || !TEST_int_eq(EVP_DigestSign(mctx, sig, &sig_len,
+                            sp->msg, sp->msg_len),
+            1)
+        || !TEST_int_eq(EVP_DigestVerifyInit_ex(mctx, NULL, "SHA256",
+                            lib_ctx, "?fips=true",
+                            key, params),
+            0)
+        || !TEST_int_eq(EVP_DigestVerifyInit_ex(mctx, NULL, NULL,
+                            lib_ctx, "?fips=true",
+                            key, params),
+            1)
+        || !TEST_int_eq(EVP_DigestVerify(mctx, sig, sig_len,
+                            sp->msg, sp->msg_len),
+            1))
         goto err;
     ret = 1;
 err:
@@ -512,15 +536,15 @@ static int ml_dsa_priv_pub_bad_t0_test(void)
      */
     priv[td->priv_len - 6 * 416] ^= 1;
     if (!TEST_true(ml_dsa_create_keypair(&key, td->alg,
-                                         priv, td->priv_len, NULL, 0, 0)))
+            priv, td->priv_len, NULL, 0, 0)))
         goto err;
 
     priv[td->priv_len - 6 * 416] ^= 1;
     if (!TEST_true(ml_dsa_create_keypair(&key, td->alg,
-                                         priv, td->priv_len, NULL, 0, 1)))
+            priv, td->priv_len, NULL, 0, 1)))
         goto err;
     ret = 1;
- err:
+err:
     OPENSSL_free(priv);
     EVP_PKEY_free(key);
     return ret;
@@ -531,7 +555,7 @@ const OPTIONS *test_get_options(void)
     static const OPTIONS options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the libctx" },
+            "The configuration file to use for the libctx" },
         { NULL }
     };
     return options;
diff --git a/test/ml_kem_evp_extra_test.c b/test/ml_kem_evp_extra_test.c
index bfa52c9af2e68..def63903e2446 100644
--- a/test/ml_kem_evp_extra_test.c
+++ b/test/ml_kem_evp_extra_test.c
@@ -61,55 +61,37 @@ static uint8_t dec_seed[32] = {
     0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x20, 0x66, 0x6f
 };
 static uint8_t expected_rho[3][32] = {
-    {
-        0x7e, 0xfb, 0x9e, 0x40, 0xc3, 0xbf, 0x0f, 0xf0, 0x43, 0x29, 0x86, 0xae,
+    { 0x7e, 0xfb, 0x9e, 0x40, 0xc3, 0xbf, 0x0f, 0xf0, 0x43, 0x29, 0x86, 0xae,
         0x4b, 0xc1, 0xa2, 0x42, 0xce, 0x99, 0x21, 0xaa, 0x9e, 0x22, 0x44, 0x88,
-        0x19, 0x58, 0x5d, 0xea, 0x30, 0x8e, 0xb0, 0x39
-    },
-    {
-        0x16, 0x2e, 0xc0, 0x98, 0xa9, 0x00, 0xb1, 0x2d, 0xd8, 0xfa, 0xbb, 0xfb,
+        0x19, 0x58, 0x5d, 0xea, 0x30, 0x8e, 0xb0, 0x39 },
+    { 0x16, 0x2e, 0xc0, 0x98, 0xa9, 0x00, 0xb1, 0x2d, 0xd8, 0xfa, 0xbb, 0xfb,
         0x3f, 0xe8, 0xcb, 0x1d, 0xc4, 0xe8, 0x31, 0x5f, 0x2a, 0xf0, 0xd3, 0x2f,
-        0x00, 0x17, 0xae, 0x13, 0x6e, 0x19, 0xf0, 0x28
-    },
-    {
-        0x29, 0xb4, 0xf9, 0xf8, 0xcf, 0xba, 0xdf, 0x2e, 0x41, 0x86, 0x9a, 0xbf,
+        0x00, 0x17, 0xae, 0x13, 0x6e, 0x19, 0xf0, 0x28 },
+    { 0x29, 0xb4, 0xf9, 0xf8, 0xcf, 0xba, 0xdf, 0x2e, 0x41, 0x86, 0x9a, 0xbf,
         0xba, 0xd1, 0x07, 0x38, 0xad, 0x04, 0xcc, 0x75, 0x2b, 0xc2, 0x0c, 0x39,
-        0x47, 0x46, 0x85, 0x0e, 0x0c, 0x48, 0x47, 0xdb
-    }
+        0x47, 0x46, 0x85, 0x0e, 0x0c, 0x48, 0x47, 0xdb }
 };
 static uint8_t expected_ctext_sha256[3][32] = {
-    {
-        0xbc, 0x29, 0xd7, 0xdf, 0x8b, 0xc5, 0x46, 0x5d, 0x98, 0x06, 0x01, 0xd8,
+    { 0xbc, 0x29, 0xd7, 0xdf, 0x8b, 0xc5, 0x46, 0x5d, 0x98, 0x06, 0x01, 0xd8,
         0x00, 0x25, 0x97, 0x93, 0xe2, 0x60, 0x38, 0x25, 0xa5, 0x72, 0xda, 0x6c,
-        0xd1, 0x98, 0xa5, 0x12, 0xcc, 0x6d, 0x1a, 0x34
-    },
-    {
-        0x36, 0x82, 0x9a, 0x2f, 0x35, 0xcb, 0xf4, 0xde, 0xb6, 0x2c, 0x0a, 0x12,
+        0xd1, 0x98, 0xa5, 0x12, 0xcc, 0x6d, 0x1a, 0x34 },
+    { 0x36, 0x82, 0x9a, 0x2f, 0x35, 0xcb, 0xf4, 0xde, 0xb6, 0x2c, 0x0a, 0x12,
         0xa1, 0x5c, 0x22, 0xda, 0xe9, 0xf8, 0xd2, 0xc2, 0x52, 0x56, 0x6f, 0xc2,
-        0x4f, 0x88, 0xab, 0xe8, 0x05, 0xcb, 0x57, 0x5e
-    },
-    {
-        0x50, 0x81, 0x36, 0xa1, 0x3f, 0x8a, 0x79, 0x20, 0xe3, 0x43, 0x44, 0x98,
+        0x4f, 0x88, 0xab, 0xe8, 0x05, 0xcb, 0x57, 0x5e },
+    { 0x50, 0x81, 0x36, 0xa1, 0x3f, 0x8a, 0x79, 0x20, 0xe3, 0x43, 0x44, 0x98,
         0xc6, 0x97, 0x5c, 0xbb, 0xab, 0x45, 0x7d, 0x80, 0x93, 0x09, 0xeb, 0x2f,
-        0x92, 0x45, 0x3e, 0x74, 0x09, 0x73, 0x82, 0x10
-    }
+        0x92, 0x45, 0x3e, 0x74, 0x09, 0x73, 0x82, 0x10 }
 };
 static uint8_t expected_shared_secret[3][32] = {
-    {
-        0x31, 0x98, 0x39, 0xe8, 0x2a, 0xb6, 0xb2, 0x22, 0xde, 0x7b, 0x61, 0x9e,
+    { 0x31, 0x98, 0x39, 0xe8, 0x2a, 0xb6, 0xb2, 0x22, 0xde, 0x7b, 0x61, 0x9e,
         0x80, 0xda, 0x83, 0x91, 0x52, 0x2b, 0xbb, 0x37, 0x67, 0x70, 0x18, 0x49,
-        0x4a, 0x47, 0x42, 0xc5, 0x3f, 0x9a, 0xbf, 0xdf
-    },
-    {
-        0xe7, 0x18, 0x4a, 0x09, 0x75, 0xee, 0x34, 0x70, 0x87, 0x8d, 0x2d, 0x15,
+        0x4a, 0x47, 0x42, 0xc5, 0x3f, 0x9a, 0xbf, 0xdf },
+    { 0xe7, 0x18, 0x4a, 0x09, 0x75, 0xee, 0x34, 0x70, 0x87, 0x8d, 0x2d, 0x15,
         0x9e, 0xc8, 0x31, 0x29, 0xc8, 0xae, 0xc2, 0x53, 0xd4, 0xee, 0x17, 0xb4,
-        0x81, 0x03, 0x11, 0xd1, 0x98, 0xcd, 0x03, 0x68
-    },
-    {
-        0x48, 0x9d, 0xd1, 0xe9, 0xc2, 0xbe, 0x4a, 0xf3, 0x48, 0x2b, 0xdb, 0x35,
+        0x81, 0x03, 0x11, 0xd1, 0x98, 0xcd, 0x03, 0x68 },
+    { 0x48, 0x9d, 0xd1, 0xe9, 0xc2, 0xbe, 0x4a, 0xf3, 0x48, 0x2b, 0xdb, 0x35,
         0xbb, 0x26, 0xce, 0x76, 0x0e, 0x6e, 0x41, 0x4d, 0xa6, 0xec, 0xbe, 0x48,
-        0x99, 0x85, 0x74, 0x8a, 0x82, 0x5f, 0x1c, 0xd6
-    },
+        0x99, 0x85, 0x74, 0x8a, 0x82, 0x5f, 0x1c, 0xd6 },
 };
 
 static int test_ml_kem(void)
@@ -140,9 +122,19 @@ static int test_ml_kem(void)
     if (!TEST_int_gt(EVP_PKEY_copy_parameters(bkey, akey), 0))
         goto err;
 
+    /* Bob's empty key is not equal to Alice's */
+    if (!TEST_false(EVP_PKEY_eq(akey, bkey))
+        || !TEST_false(EVP_PKEY_eq(bkey, akey)))
+        goto err;
+
     if (!TEST_true(EVP_PKEY_set1_encoded_public_key(bkey, rawpub, publen)))
         goto err;
 
+    /* Bob's copy of Alice's public key makes the two equal */
+    if (!TEST_true(EVP_PKEY_eq(akey, bkey))
+        || !TEST_true(EVP_PKEY_eq(bkey, akey)))
+        goto err;
+
     /* Encapsulate Bob's key */
     ctx = EVP_PKEY_CTX_new_from_pkey(testctx, bkey, NULL);
     if (!TEST_ptr(ctx))
@@ -152,7 +144,8 @@ static int test_ml_kem(void)
         goto err;
 
     if (!TEST_int_gt(EVP_PKEY_encapsulate(ctx, NULL, &wrpkeylen, NULL,
-                                          &bgenkeylen), 0))
+                         &bgenkeylen),
+            0))
         goto err;
 
     if (!TEST_size_t_gt(wrpkeylen, 0) || !TEST_size_t_gt(bgenkeylen, 0))
@@ -164,7 +157,8 @@ static int test_ml_kem(void)
         goto err;
 
     if (!TEST_int_gt(EVP_PKEY_encapsulate(ctx, wrpkey, &wrpkeylen, bgenkey,
-                                          &bgenkeylen), 0))
+                         &bgenkeylen),
+            0))
         goto err;
 
     EVP_PKEY_CTX_free(ctx);
@@ -178,7 +172,8 @@ static int test_ml_kem(void)
         goto err;
 
     if (!TEST_int_gt(EVP_PKEY_decapsulate(ctx, NULL, &agenkeylen, wrpkey,
-                                          wrpkeylen), 0))
+                         wrpkeylen),
+            0))
         goto err;
 
     if (!TEST_size_t_gt(agenkeylen, 0))
@@ -189,7 +184,8 @@ static int test_ml_kem(void)
         goto err;
 
     if (!TEST_int_gt(EVP_PKEY_decapsulate(ctx, agenkey, &agenkeylen, wrpkey,
-                                          wrpkeylen), 0))
+                         wrpkeylen),
+            0))
         goto err;
 
     /* Hopefully we ended up with a shared key */
@@ -204,7 +200,7 @@ static int test_ml_kem(void)
         goto err;
 
     res = 1;
- err:
+err:
     EVP_PKEY_CTX_free(ctx);
     EVP_PKEY_free(akey);
     EVP_PKEY_free(bkey);
@@ -234,7 +230,7 @@ static int test_non_derandomised_ml_kem(void)
     if (!TEST_ptr(sha256 = EVP_MD_fetch(NULL, "sha256", NULL)))
         return 0;
 
-    for (i = 0; i < (int) OSSL_NELEM(alg); ++i) {
+    for (i = 0; i < (int)OSSL_NELEM(alg); ++i) {
         const ML_KEM_VINFO *v;
         OSSL_PARAM params[3], *p;
         uint8_t hash[32];
@@ -254,7 +250,7 @@ static int test_non_derandomised_ml_kem(void)
         /* Configure the private RNG to output just the keygen seed */
         p = params;
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                                 gen_seed, sizeof(gen_seed));
+            gen_seed, sizeof(gen_seed));
         *p++ = OSSL_PARAM_construct_uint(OSSL_RAND_PARAM_STRENGTH, &strength);
         *p = OSSL_PARAM_construct_end();
         if (!TEST_true(EVP_RAND_CTX_set_params(privctx, params)))
@@ -278,7 +274,7 @@ static int test_non_derandomised_ml_kem(void)
         res = -3;
         /* Check that we got the expected 'rho' value in the ciphertext */
         if (!TEST_mem_eq(rawpub + v->vector_bytes, ML_KEM_RANDOM_BYTES,
-                         expected_rho[i], ML_KEM_RANDOM_BYTES))
+                expected_rho[i], ML_KEM_RANDOM_BYTES))
             goto done;
 
         res = -4;
@@ -294,7 +290,7 @@ static int test_non_derandomised_ml_kem(void)
         /* Configure the public RNG to output just the encap seed */
         p = params;
         *p = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                               enc_seed, sizeof(enc_seed));
+            enc_seed, sizeof(enc_seed));
         if (!TEST_true(EVP_RAND_CTX_set_params(pubctx, params)))
             goto done;
 
@@ -306,7 +302,8 @@ static int test_non_derandomised_ml_kem(void)
         if (!TEST_int_gt(EVP_PKEY_encapsulate_init(ctx, NULL), 0))
             goto done;
         if (!TEST_int_gt(EVP_PKEY_encapsulate(ctx, NULL, &wrpkeylen, NULL,
-                                              &bgenkeylen), 0))
+                             &bgenkeylen),
+                0))
             goto done;
         if (!TEST_size_t_eq(wrpkeylen, v->ctext_bytes)
             || !TEST_size_t_eq(bgenkeylen, ML_KEM_SHARED_SECRET_BYTES))
@@ -316,7 +313,7 @@ static int test_non_derandomised_ml_kem(void)
         if (!TEST_ptr(wrpkey) || !TEST_ptr(bgenkey))
             goto done;
         if (!TEST_true(EVP_PKEY_encapsulate(ctx, wrpkey, &wrpkeylen, bgenkey,
-                                            &bgenkeylen)))
+                &bgenkeylen)))
             goto done;
         EVP_PKEY_CTX_free(ctx);
         ctx = NULL;
@@ -327,14 +324,14 @@ static int test_non_derandomised_ml_kem(void)
         res = -6;
         /* Check the ciphertext hash */
         if (!TEST_true(EVP_Digest(wrpkey, v->ctext_bytes,
-                                  hash, NULL, sha256, NULL))
+                hash, NULL, sha256, NULL))
             || !TEST_mem_eq(hash, sizeof(hash),
-                            expected_ctext_sha256[i],
-                            sizeof(expected_ctext_sha256[i])))
+                expected_ctext_sha256[i],
+                sizeof(expected_ctext_sha256[i])))
             goto done;
         /* Check for the expected shared secret */
         if (!TEST_mem_eq(bgenkey, bgenkeylen,
-                         expected_shared_secret[i], ML_KEM_SHARED_SECRET_BYTES))
+                expected_shared_secret[i], ML_KEM_SHARED_SECRET_BYTES))
             goto done;
 
         /*
@@ -348,7 +345,7 @@ static int test_non_derandomised_ml_kem(void)
         if (!TEST_int_gt(EVP_PKEY_decapsulate_init(ctx, NULL), 0))
             goto done;
         if (!TEST_true(EVP_PKEY_decapsulate(ctx, NULL, &agenkeylen, wrpkey,
-                                            wrpkeylen)))
+                wrpkeylen)))
             goto done;
         if (!TEST_size_t_eq(agenkeylen, ML_KEM_SHARED_SECRET_BYTES))
             goto done;
@@ -356,7 +353,7 @@ static int test_non_derandomised_ml_kem(void)
         if (!TEST_ptr(agenkey))
             goto done;
         if (!TEST_true(EVP_PKEY_decapsulate(ctx, agenkey, &agenkeylen, wrpkey,
-                                            wrpkeylen)))
+                wrpkeylen)))
             goto done;
         /* Hopefully we ended up with a shared key */
         if (!TEST_mem_eq(agenkey, agenkeylen, bgenkey, bgenkeylen))
@@ -366,7 +363,7 @@ static int test_non_derandomised_ml_kem(void)
         /* Now a quick negative test by zeroing the ciphertext */
         memset(wrpkey, 0, v->ctext_bytes);
         if (!TEST_true(EVP_PKEY_decapsulate(ctx, agenkey, &agenkeylen, wrpkey,
-                                            wrpkeylen)))
+                wrpkeylen)))
             goto done;
         if (!TEST_mem_ne(agenkey, agenkeylen, bgenkey, bgenkeylen))
             goto done;
@@ -375,20 +372,20 @@ static int test_non_derandomised_ml_kem(void)
         /* Configure decap entropy for a bad ciphertext length */
         p = params;
         *p = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                               dec_seed, sizeof(dec_seed));
+            dec_seed, sizeof(dec_seed));
         if (!TEST_true(EVP_RAND_CTX_set_params(pubctx, params)))
             goto done;
 
         /* This time decap should fail, and return the decap entropy */
         if (!TEST_false(EVP_PKEY_decapsulate(ctx, agenkey, &agenkeylen, wrpkey,
-                                             wrpkeylen - 1)))
+                wrpkeylen - 1)))
             goto done;
         if (!TEST_mem_eq(agenkey, agenkeylen, dec_seed, sizeof(dec_seed)))
             goto done;
 
         res = 0;
 
-     done:
+    done:
         EVP_PKEY_CTX_free(ctx);
         EVP_PKEY_free(akey);
         EVP_PKEY_free(bkey);
@@ -424,7 +421,7 @@ int setup_tests(void)
     if (test_rand != 0) {
         /* Cargo-culted from test/rand_test.c, this may need changes */
         if (!TEST_true(RAND_set_DRBG_type(NULL, "TEST-RAND", "fips=no",
-                                             NULL, NULL)))
+                NULL, NULL)))
             return 0;
         ADD_TEST(test_non_derandomised_ml_kem);
         return 1;
diff --git a/test/ml_kem_internal_test.c b/test/ml_kem_internal_test.c
index bb745a2afc1ac..23eeb2aa47723 100644
--- a/test/ml_kem_internal_test.c
+++ b/test/ml_kem_internal_test.c
@@ -12,7 +12,7 @@
 #include <openssl/rand.h>
 #include <openssl/core_names.h>
 #ifndef OPENSSL_NO_STDIO
-# include <stdio.h>
+#include <stdio.h>
 #endif
 #include <crypto/ml_kem.h>
 #include "testutil.h"
@@ -38,58 +38,39 @@ static uint8_t ml_kem_public_entropy[] = {
     0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x20, 0x66, 0x6f
 };
 static uint8_t ml_kem_expected_rho[3][ML_KEM_RANDOM_BYTES] = {
-    {
-        0x7e, 0xfb, 0x9e, 0x40, 0xc3, 0xbf, 0x0f, 0xf0, 0x43, 0x29, 0x86, 0xae,
+    { 0x7e, 0xfb, 0x9e, 0x40, 0xc3, 0xbf, 0x0f, 0xf0, 0x43, 0x29, 0x86, 0xae,
         0x4b, 0xc1, 0xa2, 0x42, 0xce, 0x99, 0x21, 0xaa, 0x9e, 0x22, 0x44, 0x88,
-        0x19, 0x58, 0x5d, 0xea, 0x30, 0x8e, 0xb0, 0x39
-    },
-    {
-        0x16, 0x2e, 0xc0, 0x98, 0xa9, 0x00, 0xb1, 0x2d, 0xd8, 0xfa, 0xbb, 0xfb,
+        0x19, 0x58, 0x5d, 0xea, 0x30, 0x8e, 0xb0, 0x39 },
+    { 0x16, 0x2e, 0xc0, 0x98, 0xa9, 0x00, 0xb1, 0x2d, 0xd8, 0xfa, 0xbb, 0xfb,
         0x3f, 0xe8, 0xcb, 0x1d, 0xc4, 0xe8, 0x31, 0x5f, 0x2a, 0xf0, 0xd3, 0x2f,
-        0x00, 0x17, 0xae, 0x13, 0x6e, 0x19, 0xf0, 0x28
-    },
-    {
-        0x29, 0xb4, 0xf9, 0xf8, 0xcf, 0xba, 0xdf, 0x2e, 0x41, 0x86, 0x9a, 0xbf,
+        0x00, 0x17, 0xae, 0x13, 0x6e, 0x19, 0xf0, 0x28 },
+    { 0x29, 0xb4, 0xf9, 0xf8, 0xcf, 0xba, 0xdf, 0x2e, 0x41, 0x86, 0x9a, 0xbf,
         0xba, 0xd1, 0x07, 0x38, 0xad, 0x04, 0xcc, 0x75, 0x2b, 0xc2, 0x0c, 0x39,
-        0x47, 0x46, 0x85, 0x0e, 0x0c, 0x48, 0x47, 0xdb
-    }
+        0x47, 0x46, 0x85, 0x0e, 0x0c, 0x48, 0x47, 0xdb }
 };
 static uint8_t ml_kem_expected_ctext_sha256[3][32] = {
-    {
-        0xbc, 0x29, 0xd7, 0xdf, 0x8b, 0xc5, 0x46, 0x5d, 0x98, 0x06, 0x01, 0xd8,
+    { 0xbc, 0x29, 0xd7, 0xdf, 0x8b, 0xc5, 0x46, 0x5d, 0x98, 0x06, 0x01, 0xd8,
         0x00, 0x25, 0x97, 0x93, 0xe2, 0x60, 0x38, 0x25, 0xa5, 0x72, 0xda, 0x6c,
-        0xd1, 0x98, 0xa5, 0x12, 0xcc, 0x6d, 0x1a, 0x34
-    },
-    {
-        0x36, 0x82, 0x9a, 0x2f, 0x35, 0xcb, 0xf4, 0xde, 0xb6, 0x2c, 0x0a, 0x12,
+        0xd1, 0x98, 0xa5, 0x12, 0xcc, 0x6d, 0x1a, 0x34 },
+    { 0x36, 0x82, 0x9a, 0x2f, 0x35, 0xcb, 0xf4, 0xde, 0xb6, 0x2c, 0x0a, 0x12,
         0xa1, 0x5c, 0x22, 0xda, 0xe9, 0xf8, 0xd2, 0xc2, 0x52, 0x56, 0x6f, 0xc2,
-        0x4f, 0x88, 0xab, 0xe8, 0x05, 0xcb, 0x57, 0x5e
-    },
-    {
-        0x50, 0x81, 0x36, 0xa1, 0x3f, 0x8a, 0x79, 0x20, 0xe3, 0x43, 0x44, 0x98,
+        0x4f, 0x88, 0xab, 0xe8, 0x05, 0xcb, 0x57, 0x5e },
+    { 0x50, 0x81, 0x36, 0xa1, 0x3f, 0x8a, 0x79, 0x20, 0xe3, 0x43, 0x44, 0x98,
         0xc6, 0x97, 0x5c, 0xbb, 0xab, 0x45, 0x7d, 0x80, 0x93, 0x09, 0xeb, 0x2f,
-        0x92, 0x45, 0x3e, 0x74, 0x09, 0x73, 0x82, 0x10
-    }
+        0x92, 0x45, 0x3e, 0x74, 0x09, 0x73, 0x82, 0x10 }
 };
 static uint8_t ml_kem_expected_shared_secret[3][32] = {
-    {
-        0x31, 0x98, 0x39, 0xe8, 0x2a, 0xb6, 0xb2, 0x22, 0xde, 0x7b, 0x61, 0x9e,
+    { 0x31, 0x98, 0x39, 0xe8, 0x2a, 0xb6, 0xb2, 0x22, 0xde, 0x7b, 0x61, 0x9e,
         0x80, 0xda, 0x83, 0x91, 0x52, 0x2b, 0xbb, 0x37, 0x67, 0x70, 0x18, 0x49,
-        0x4a, 0x47, 0x42, 0xc5, 0x3f, 0x9a, 0xbf, 0xdf
-    },
-    {
-        0xe7, 0x18, 0x4a, 0x09, 0x75, 0xee, 0x34, 0x70, 0x87, 0x8d, 0x2d, 0x15,
+        0x4a, 0x47, 0x42, 0xc5, 0x3f, 0x9a, 0xbf, 0xdf },
+    { 0xe7, 0x18, 0x4a, 0x09, 0x75, 0xee, 0x34, 0x70, 0x87, 0x8d, 0x2d, 0x15,
         0x9e, 0xc8, 0x31, 0x29, 0xc8, 0xae, 0xc2, 0x53, 0xd4, 0xee, 0x17, 0xb4,
-        0x81, 0x03, 0x11, 0xd1, 0x98, 0xcd, 0x03, 0x68
-    },
-    {
-        0x48, 0x9d, 0xd1, 0xe9, 0xc2, 0xbe, 0x4a, 0xf3, 0x48, 0x2b, 0xdb, 0x35,
+        0x81, 0x03, 0x11, 0xd1, 0x98, 0xcd, 0x03, 0x68 },
+    { 0x48, 0x9d, 0xd1, 0xe9, 0xc2, 0xbe, 0x4a, 0xf3, 0x48, 0x2b, 0xdb, 0x35,
         0xbb, 0x26, 0xce, 0x76, 0x0e, 0x6e, 0x41, 0x4d, 0xa6, 0xec, 0xbe, 0x48,
-        0x99, 0x85, 0x74, 0x8a, 0x82, 0x5f, 0x1c, 0xd6
-    },
+        0x99, 0x85, 0x74, 0x8a, 0x82, 0x5f, 0x1c, 0xd6 },
 };
 
-
 static int sanity_test(void)
 {
     static const int alg[3] = {
@@ -107,12 +88,14 @@ static int sanity_test(void)
         return 0;
 
     if (!TEST_ptr(privctx = RAND_get0_private(NULL))
-        || !TEST_ptr(pubctx = RAND_get0_public(NULL)))
-        return 0;
+        || !TEST_ptr(pubctx = RAND_get0_public(NULL))) {
+        ret = -1;
+        goto err;
+    }
 
     decap_entropy = ml_kem_public_entropy + ML_KEM_RANDOM_BYTES;
 
-    for (i = 0; i < (int) OSSL_NELEM(alg); ++i) {
+    for (i = 0; i < (int)OSSL_NELEM(alg); ++i) {
         OSSL_PARAM params[3];
         uint8_t hash[32];
         uint8_t shared_secret[ML_KEM_SHARED_SECRET_BYTES];
@@ -127,15 +110,15 @@ static int sanity_test(void)
         const ML_KEM_VINFO *v;
 
         /* Configure the private RNG to output just the keygen seed */
-        params[0] =
-            OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                              ml_kem_private_entropy,
-                                              sizeof(ml_kem_private_entropy));
-        params[1] =
-            OSSL_PARAM_construct_uint(OSSL_RAND_PARAM_STRENGTH, &strength);
+        params[0] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
+            ml_kem_private_entropy,
+            sizeof(ml_kem_private_entropy));
+        params[1] = OSSL_PARAM_construct_uint(OSSL_RAND_PARAM_STRENGTH, &strength);
         params[2] = OSSL_PARAM_construct_end();
-        if (!TEST_true(EVP_RAND_CTX_set_params(privctx, params)))
-            return 0;
+        if (!TEST_true(EVP_RAND_CTX_set_params(privctx, params))) {
+            ret = -1;
+            goto err;
+        }
 
         public_key = ossl_ml_kem_key_new(NULL, NULL, alg[i]);
         private_key = ossl_ml_kem_key_new(NULL, NULL, alg[i]);
@@ -151,7 +134,7 @@ static int sanity_test(void)
         ret2 = -2;
         /* Generate a private key */
         if (!ossl_ml_kem_genkey(encoded_public_key, v->pubkey_bytes,
-                                private_key))
+                private_key))
             goto done;
 
         /* Check that no more entropy is available! */
@@ -161,69 +144,68 @@ static int sanity_test(void)
         ret2 = -3;
         /* Check that we got the expected 'rho' value in the ciphertext */
         if (!TEST_mem_eq(encoded_public_key + v->vector_bytes,
-                         ML_KEM_RANDOM_BYTES,
-                         ml_kem_expected_rho[i],
-                         ML_KEM_RANDOM_BYTES))
+                ML_KEM_RANDOM_BYTES,
+                ml_kem_expected_rho[i],
+                ML_KEM_RANDOM_BYTES))
             goto done;
 
         ret2 = -4;
         /* Create the expected associated public key */
         if (!ossl_ml_kem_parse_public_key(encoded_public_key, v->pubkey_bytes,
-                                          public_key))
+                public_key))
             goto done;
 
         /* Configure the public RNG to output the encap and decap seeds */
-        params[0] =
-            OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                              ml_kem_public_entropy,
-                                              sizeof(ml_kem_public_entropy));
+        params[0] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
+            ml_kem_public_entropy,
+            sizeof(ml_kem_public_entropy));
         if (!TEST_true(EVP_RAND_CTX_set_params(pubctx, params)))
             goto done;
 
         /* encaps - decaps test: validate shared secret equality */
         ret2 = -5;
         if (!ossl_ml_kem_encap_rand(ciphertext, v->ctext_bytes,
-                                    shared_secret, sizeof(shared_secret),
-                                    public_key))
+                shared_secret, sizeof(shared_secret),
+                public_key))
             goto done;
 
         ret2 = -6;
         /* Check the ciphertext hash */
         if (!TEST_true(EVP_Digest(ciphertext, v->ctext_bytes,
-                                  hash, NULL, sha256, NULL))
+                hash, NULL, sha256, NULL))
             || !TEST_mem_eq(hash, sizeof(hash),
-                            ml_kem_expected_ctext_sha256[i],
-                            sizeof(ml_kem_expected_ctext_sha256[i])))
+                ml_kem_expected_ctext_sha256[i],
+                sizeof(ml_kem_expected_ctext_sha256[i])))
             goto done;
 
         /* Check for the expected shared secret */
         if (!TEST_mem_eq(shared_secret, sizeof(shared_secret),
-                         ml_kem_expected_shared_secret[i],
-                         ML_KEM_SHARED_SECRET_BYTES))
+                ml_kem_expected_shared_secret[i],
+                ML_KEM_SHARED_SECRET_BYTES))
             goto done;
 
         /* Now decapsulate the ciphertext */
         ret2 = -7;
         if (!ossl_ml_kem_decap(shared_secret2, sizeof(shared_secret2),
-                               ciphertext, v->ctext_bytes, private_key))
+                ciphertext, v->ctext_bytes, private_key))
             goto done;
 
         /* Check for the same shared secret */
         if (!TEST_mem_eq(shared_secret, sizeof(shared_secret),
-                         shared_secret2, sizeof(shared_secret2)))
+                shared_secret2, sizeof(shared_secret2)))
             goto done;
 
         ret2 = -8;
         /* Now a quick negative test by zeroing the ciphertext */
         memset(ciphertext, 0, v->ctext_bytes);
         if (!TEST_true(ossl_ml_kem_decap(shared_secret2, sizeof(shared_secret2),
-                                         ciphertext, v->ctext_bytes,
-                                         private_key)))
+                ciphertext, v->ctext_bytes,
+                private_key)))
             goto done;
 
         /* Ensure we have a mismatch */
         if (!TEST_mem_ne(shared_secret, sizeof(shared_secret),
-                         shared_secret2, sizeof(shared_secret2)))
+                shared_secret2, sizeof(shared_secret2)))
             goto done;
 
         ret2 = -9;
@@ -232,12 +214,12 @@ static int sanity_test(void)
          * last batch of entropy to return a fake shared secret, just in case.
          */
         if (!TEST_false(ossl_ml_kem_decap(shared_secret2, sizeof(shared_secret2),
-                                          ciphertext, v->ctext_bytes - 1,
-                                          private_key)))
+                ciphertext, v->ctext_bytes - 1,
+                private_key)))
             goto done;
 
         if (!TEST_mem_eq(shared_secret2, sizeof(shared_secret2),
-                         decap_entropy, ML_KEM_SHARED_SECRET_BYTES))
+                decap_entropy, ML_KEM_SHARED_SECRET_BYTES))
             goto done;
 
         /* Check that no more entropy is available! */
@@ -254,6 +236,8 @@ static int sanity_test(void)
         OPENSSL_free(encoded_public_key);
         OPENSSL_free(ciphertext);
     }
+
+err:
     EVP_MD_free(sha256);
     return ret == 0;
 }
diff --git a/test/modes_internal_test.c b/test/modes_internal_test.c
index aa667b16d167a..9ee731379c135 100644
--- a/test/modes_internal_test.c
+++ b/test/modes_internal_test.c
@@ -27,7 +27,7 @@
 typedef struct {
     size_t size;
     const unsigned char *data;
-}  SIZED_DATA;
+} SIZED_DATA;
 
 /**********************************************************************
  *
@@ -37,9 +37,10 @@ typedef struct {
 
 /* cts128 test vectors from RFC 3962 */
 static const unsigned char cts128_test_key[16] = "chicken teriyaki";
-static const unsigned char cts128_test_input[64] =
-    "I would like the" " General Gau's C"
-    "hicken, please, " "and wonton soup.";
+static const unsigned char cts128_test_input[64] = "I would like the"
+                                                   " General Gau's C"
+                                                   "hicken, please, "
+                                                   "and wonton soup.";
 static const unsigned char cts128_test_iv[] = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
@@ -93,9 +94,9 @@ static const unsigned char vector_64[64] = {
     0x3b, 0xc1, 0x03, 0xe1, 0xa1, 0x94, 0xbb, 0xd8
 };
 
-#define CTS128_TEST_VECTOR(len)                 \
-    {                                           \
-        sizeof(vector_##len), vector_##len      \
+#define CTS128_TEST_VECTOR(len)            \
+    {                                      \
+        sizeof(vector_##len), vector_##len \
     }
 static const SIZED_DATA aes_cts128_vectors[] = {
     CTS128_TEST_VECTOR(17),
@@ -133,25 +134,25 @@ static AES_KEY *cts128_decrypt_key_schedule(void)
 typedef struct {
     const char *case_name;
     size_t (*last_blocks_correction)(const unsigned char *in,
-                                     unsigned char *out, size_t len);
+        unsigned char *out, size_t len);
     size_t (*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 (*encrypt_stream)(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 (*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 (*decrypt_stream)(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);
 } CTS128_FIXTURE;
 
 static size_t last_blocks_correction(const unsigned char *in,
-                                     unsigned char *out, size_t len)
+    unsigned char *out, size_t len)
 {
     size_t tail;
 
@@ -164,7 +165,7 @@ static size_t last_blocks_correction(const unsigned char *in,
 }
 
 static size_t last_blocks_correction_nist(const unsigned char *in,
-                                          unsigned char *out, size_t len)
+    unsigned char *out, size_t len)
 {
     size_t tail;
 
@@ -202,40 +203,41 @@ static int execute_cts128(const CTS128_FIXTURE *fixture, int num)
     /* test block-based encryption */
     memcpy(iv, test_iv, test_iv_len);
     if (!TEST_size_t_eq(fixture->encrypt_block(test_input, ciphertext, len,
-                                               encrypt_key_schedule, iv,
-                                               (block128_f)AES_encrypt), len)
-            || !TEST_mem_eq(ciphertext, len, vector, len)
-            || !TEST_mem_eq(iv, sizeof(iv), vector + len - tail, sizeof(iv)))
+                            encrypt_key_schedule, iv,
+                            (block128_f)AES_encrypt),
+            len)
+        || !TEST_mem_eq(ciphertext, len, vector, len)
+        || !TEST_mem_eq(iv, sizeof(iv), vector + len - tail, sizeof(iv)))
         return 0;
 
     /* test block-based decryption */
     memcpy(iv, test_iv, test_iv_len);
     size = fixture->decrypt_block(ciphertext, cleartext, len,
-                                  decrypt_key_schedule, iv,
-                                  (block128_f)AES_decrypt);
+        decrypt_key_schedule, iv,
+        (block128_f)AES_decrypt);
     if (!TEST_true(len == size || len + 16 == size)
-            || !TEST_mem_eq(cleartext, len, test_input, len)
-            || !TEST_mem_eq(iv, sizeof(iv), vector + len - tail, sizeof(iv)))
+        || !TEST_mem_eq(cleartext, len, test_input, len)
+        || !TEST_mem_eq(iv, sizeof(iv), vector + len - tail, sizeof(iv)))
         return 0;
 
     /* test streamed encryption */
     memcpy(iv, test_iv, test_iv_len);
     if (!TEST_size_t_eq(fixture->encrypt_stream(test_input, ciphertext, len,
-                                                encrypt_key_schedule, iv,
-                                                (cbc128_f) AES_cbc_encrypt),
-                        len)
-            || !TEST_mem_eq(ciphertext, len, vector, len)
-            || !TEST_mem_eq(iv, sizeof(iv), vector + len - tail, sizeof(iv)))
+                            encrypt_key_schedule, iv,
+                            (cbc128_f)AES_cbc_encrypt),
+            len)
+        || !TEST_mem_eq(ciphertext, len, vector, len)
+        || !TEST_mem_eq(iv, sizeof(iv), vector + len - tail, sizeof(iv)))
         return 0;
 
     /* test streamed decryption */
     memcpy(iv, test_iv, test_iv_len);
     if (!TEST_size_t_eq(fixture->decrypt_stream(ciphertext, cleartext, len,
-                                                decrypt_key_schedule, iv,
-                                                (cbc128_f)AES_cbc_encrypt),
-                        len)
-            || !TEST_mem_eq(cleartext, len, test_input, len)
-            || !TEST_mem_eq(iv, sizeof(iv), vector + len - tail, sizeof(iv)))
+                            decrypt_key_schedule, iv,
+                            (cbc128_f)AES_cbc_encrypt),
+            len)
+        || !TEST_mem_eq(cleartext, len, test_input, len)
+        || !TEST_mem_eq(iv, sizeof(iv), vector + len - tail, sizeof(iv)))
         return 0;
 
     return 1;
@@ -277,9 +279,9 @@ static const u8 T1[] = {
 };
 
 /* Test Case 2 */
-# define K2 K1
-# define A2 A1
-# define IV2 IV1
+#define K2 K1
+#define A2 A1
+#define IV2 IV1
 static const u8 P2[16];
 static const u8 C2[] = {
     0x03, 0x88, 0xda, 0xce, 0x60, 0xb6, 0xa3, 0x92,
@@ -292,7 +294,7 @@ static const u8 T2[] = {
 };
 
 /* Test Case 3 */
-# define A3 A2
+#define A3 A2
 static const u8 K3[] = {
     0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
     0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08
@@ -331,8 +333,8 @@ static const u8 T3[] = {
 };
 
 /* Test Case 4 */
-# define K4 K3
-# define IV4 IV3
+#define K4 K3
+#define IV4 IV3
 static const u8 P4[] = {
     0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
     0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
@@ -367,9 +369,9 @@ static const u8 T4[] = {
 };
 
 /* Test Case 5 */
-# define K5 K4
-# define P5 P4
-# define A5 A4
+#define K5 K4
+#define P5 P4
+#define A5 A4
 static const u8 IV5[] = {
     0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad
 };
@@ -391,9 +393,9 @@ static const u8 T5[] = {
 };
 
 /* Test Case 6 */
-# define K6 K5
-# define P6 P5
-# define A6 A5
+#define K6 K5
+#define P6 P5
+#define A6 A5
 static const u8 IV6[] = {
     0x93, 0x13, 0x22, 0x5d, 0xf8, 0x84, 0x06, 0xe5,
     0x55, 0x90, 0x9c, 0x5a, 0xff, 0x52, 0x69, 0xaa,
@@ -429,9 +431,9 @@ static const u8 T7[] = {
 };
 
 /* Test Case 8 */
-# define K8 K7
-# define IV8 IV7
-# define A8 A7
+#define K8 K7
+#define IV8 IV7
+#define A8 A7
 static const u8 P8[16];
 static const u8 C8[] = {
     0x98, 0xe7, 0x24, 0x7c, 0x07, 0xf0, 0xfe, 0x41,
@@ -444,7 +446,7 @@ static const u8 T8[] = {
 };
 
 /* Test Case 9 */
-# define A9 A8
+#define A9 A8
 static const u8 K9[] = {
     0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
     0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
@@ -484,8 +486,8 @@ static const u8 T9[] = {
 };
 
 /* Test Case 10 */
-# define K10 K9
-# define IV10 IV9
+#define K10 K9
+#define IV10 IV9
 static const u8 P10[] = {
     0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
     0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
@@ -520,9 +522,9 @@ static const u8 T10[] = {
 };
 
 /* Test Case 11 */
-# define K11 K10
-# define P11 P10
-# define A11 A10
+#define K11 K10
+#define P11 P10
+#define A11 A10
 static const u8 IV11[] = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad };
 
 static const u8 C11[] = {
@@ -542,9 +544,9 @@ static const u8 T11[] = {
 };
 
 /* Test Case 12 */
-# define K12 K11
-# define P12 P11
-# define A12 A11
+#define K12 K11
+#define P12 P11
+#define A12 A11
 static const u8 IV12[] = {
     0x93, 0x13, 0x22, 0x5d, 0xf8, 0x84, 0x06, 0xe5,
     0x55, 0x90, 0x9c, 0x5a, 0xff, 0x52, 0x69, 0xaa,
@@ -580,8 +582,8 @@ static const u8 T13[] = {
 };
 
 /* Test Case 14 */
-# define K14 K13
-# define A14 A13
+#define K14 K13
+#define A14 A13
 static const u8 P14[16], IV14[12];
 static const u8 C14[] = {
     0xce, 0xa7, 0x40, 0x3d, 0x4d, 0x60, 0x6b, 0x6e,
@@ -594,7 +596,7 @@ static const u8 T14[] = {
 };
 
 /* Test Case 15 */
-# define A15 A14
+#define A15 A14
 static const u8 K15[] = {
     0xfe, 0xff, 0xe9, 0x92, 0x86, 0x65, 0x73, 0x1c,
     0x6d, 0x6a, 0x8f, 0x94, 0x67, 0x30, 0x83, 0x08,
@@ -635,8 +637,8 @@ static const u8 T15[] = {
 };
 
 /* Test Case 16 */
-# define K16 K15
-# define IV16 IV15
+#define K16 K15
+#define IV16 IV15
 static const u8 P16[] = {
     0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
     0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
@@ -671,9 +673,9 @@ static const u8 T16[] = {
 };
 
 /* Test Case 17 */
-# define K17 K16
-# define P17 P16
-# define A17 A16
+#define K17 K16
+#define P17 P16
+#define A17 A16
 static const u8 IV17[] = { 0xca, 0xfe, 0xba, 0xbe, 0xfa, 0xce, 0xdb, 0xad };
 
 static const u8 C17[] = {
@@ -693,9 +695,9 @@ static const u8 T17[] = {
 };
 
 /* Test Case 18 */
-# define K18 K17
-# define P18 P17
-# define A18 A17
+#define K18 K17
+#define P18 P17
+#define A18 A17
 static const u8 IV18[] = {
     0x93, 0x13, 0x22, 0x5d, 0xf8, 0x84, 0x06, 0xe5,
     0x55, 0x90, 0x9c, 0x5a, 0xff, 0x52, 0x69, 0xaa,
@@ -724,10 +726,10 @@ static const u8 T18[] = {
 };
 
 /* Test Case 19 */
-# define K19 K1
-# define P19 P1
-# define IV19 IV1
-# define C19 C1
+#define K19 K1
+#define P19 P1
+#define IV19 IV1
+#define C19 C1
 static const u8 A19[] = {
     0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
     0xa5, 0x59, 0x09, 0xc5, 0xaf, 0xf5, 0x26, 0x9a,
@@ -753,8 +755,8 @@ static const u8 T19[] = {
 };
 
 /* Test Case 20 */
-# define K20 K1
-# define A20 A1
+#define K20 K1
+#define A20 A1
 /* this results in 0xff in counter LSB */
 static const u8 IV20[64] = { 0xff, 0xff, 0xff, 0xff };
 
@@ -803,14 +805,16 @@ static const u8 T20[] = {
     0xb0, 0x26, 0xa9, 0xed, 0x3f, 0xe1, 0xe8, 0x5f
 };
 
-#define GCM128_TEST_VECTOR(n)                   \
-    {                                           \
-        {sizeof(K##n), K##n},                   \
-        {sizeof(IV##n), IV##n},                 \
-        {sizeof(A##n), A##n},                   \
-        {sizeof(P##n), P##n},                   \
-        {sizeof(C##n), C##n},                   \
-        {sizeof(T##n), T##n}                    \
+#define GCM128_TEST_VECTOR(n)         \
+    {                                 \
+        { sizeof(K##n), K##n },       \
+            { sizeof(IV##n), IV##n }, \
+            { sizeof(A##n), A##n },   \
+            { sizeof(P##n), P##n },   \
+            { sizeof(C##n), C##n },   \
+        {                             \
+            sizeof(T##n), T##n        \
+        }                             \
     }
 static struct gcm128_data {
     const SIZED_DATA K;
@@ -873,8 +877,8 @@ static int test_gcm128(int idx)
         if (!TEST_int_ge(CRYPTO_gcm128_encrypt(&ctx, P.data, out, P.size), 0))
             return 0;
     if (!TEST_false(CRYPTO_gcm128_finish(&ctx, T.data, 16))
-            || (C.data != NULL
-                    && !TEST_mem_eq(out, P.size, C.data, P.size)))
+        || (C.data != NULL
+            && !TEST_mem_eq(out, P.size, C.data, P.size)))
         return 0;
 
     CRYPTO_gcm128_setiv(&ctx, IV.data, IV.size);
@@ -884,8 +888,8 @@ static int test_gcm128(int idx)
     if (C.data != NULL)
         CRYPTO_gcm128_decrypt(&ctx, C.data, out, P.size);
     if (!TEST_false(CRYPTO_gcm128_finish(&ctx, T.data, 16))
-            || (P.data != NULL
-                    && !TEST_mem_eq(out, P.size, P.data, P.size)))
+        || (P.data != NULL
+            && !TEST_mem_eq(out, P.size, P.data, P.size)))
         return 0;
 
     return 1;
diff --git a/test/namemap_internal_test.c b/test/namemap_internal_test.c
index fdfc782539d6a..c8163f84a3da3 100644
--- a/test/namemap_internal_test.c
+++ b/test/namemap_internal_test.c
@@ -22,10 +22,10 @@ static int test_namemap_empty(void)
     int ok;
 
     ok = TEST_int_eq(ossl_namemap_empty(NULL), 1)
-         && TEST_ptr(nm = ossl_namemap_new(NULL))
-         && TEST_int_eq(ossl_namemap_empty(nm), 1)
-         && TEST_int_ne(ossl_namemap_add_name(nm, 0, NAME1), 0)
-         && TEST_int_eq(ossl_namemap_empty(nm), 0);
+        && TEST_ptr(nm = ossl_namemap_new(NULL))
+        && TEST_int_eq(ossl_namemap_empty(nm), 1)
+        && TEST_int_ne(ossl_namemap_add_name(nm, 0, NAME1), 0)
+        && TEST_int_eq(ossl_namemap_empty(nm), 0);
     ossl_namemap_free(nm);
     return ok;
 }
diff --git a/test/nodefltctxtest.c b/test/nodefltctxtest.c
index 3af3f91736f86..8801721e59bb7 100644
--- a/test/nodefltctxtest.c
+++ b/test/nodefltctxtest.c
@@ -47,7 +47,7 @@ static int test_no_deflt_ctx_init(void)
         goto err;
 
     testresult = 1;
- err:
+err:
     EVP_MD_free(md);
     OSSL_LIB_CTX_free(ctx);
     return testresult;
diff --git a/test/ocspapitest.c b/test/ocspapitest.c
index 13026d6b4a42b..ce8f172494ce9 100644
--- a/test/ocspapitest.c
+++ b/test/ocspapitest.c
@@ -41,7 +41,7 @@ static int get_cert_and_key(X509 **cert_out, EVP_PKEY **key_out)
     *cert_out = cert;
     *key_out = key;
     return 1;
- end:
+end:
     X509_free(cert);
     EVP_PKEY_free(key);
     return 0;
@@ -60,7 +60,7 @@ static int get_cert(X509 **cert_out)
         goto end;
     *cert_out = cert;
     return 1;
- end:
+end:
     X509_free(cert);
     return 0;
 }
@@ -68,7 +68,7 @@ static int get_cert(X509 **cert_out)
 static OCSP_BASICRESP *make_dummy_resp(void)
 {
     const unsigned char namestr[] = "openssl.example.com";
-    unsigned char keybytes[128] = {7};
+    unsigned char keybytes[128] = { 7 };
     OCSP_BASICRESP *bs = OCSP_BASICRESP_new();
     OCSP_BASICRESP *bs_out = NULL;
     OCSP_CERTID *cid = NULL;
@@ -82,8 +82,8 @@ static OCSP_BASICRESP *make_dummy_resp(void)
         || !TEST_ptr(key)
         || !TEST_ptr(serial)
         || !TEST_true(X509_NAME_add_entry_by_NID(name, NID_commonName,
-                                                 MBSTRING_ASC,
-                                                 namestr, -1, -1, 1))
+            MBSTRING_ASC,
+            namestr, -1, -1, 1))
         || !TEST_true(ASN1_BIT_STRING_set(key, keybytes, sizeof(keybytes)))
         || !TEST_true(ASN1_INTEGER_set_uint64(serial, (uint64_t)1)))
         goto err;
@@ -93,12 +93,12 @@ static OCSP_BASICRESP *make_dummy_resp(void)
         || !TEST_ptr(nextupd)
         || !TEST_ptr(cid)
         || !TEST_true(OCSP_basic_add1_status(bs, cid,
-                                             V_OCSP_CERTSTATUS_UNKNOWN,
-                                             0, NULL, thisupd, nextupd)))
+            V_OCSP_CERTSTATUS_UNKNOWN,
+            0, NULL, thisupd, nextupd)))
         goto err;
     bs_out = bs;
     bs = NULL;
- err:
+err:
     ASN1_TIME_free(thisupd);
     ASN1_TIME_free(nextupd);
     ASN1_BIT_STRING_free(key);
@@ -128,7 +128,7 @@ static int test_resp_signer(void)
         || !TEST_true(get_cert_and_key(&signer, &key))
         || !TEST_true(sk_X509_push(extra_certs, signer))
         || !TEST_true(OCSP_basic_sign(bs, signer, key, EVP_sha1(),
-                                      NULL, OCSP_NOCERTS)))
+            NULL, OCSP_NOCERTS)))
         goto err;
     if (!TEST_true(OCSP_resp_get0_signer(bs, &tmp, extra_certs))
         || !TEST_int_eq(X509_cmp(tmp, signer), 0))
@@ -140,13 +140,13 @@ static int test_resp_signer(void)
     tmp = NULL;
     if (!TEST_ptr(bs)
         || !TEST_true(OCSP_basic_sign(bs, signer, key, EVP_sha1(),
-                                      NULL, 0)))
+            NULL, 0)))
         goto err;
     if (!TEST_true(OCSP_resp_get0_signer(bs, &tmp, NULL))
         || !TEST_int_eq(X509_cmp(tmp, signer), 0))
         goto err;
     ret = 1;
- err:
+err:
     OCSP_BASICRESP_free(bs);
     sk_X509_free(extra_certs);
     X509_free(signer);
@@ -163,15 +163,15 @@ static int test_access_description(int testcase)
         goto err;
 
     switch (testcase) {
-    case 0:     /* no change */
+    case 0: /* no change */
         break;
-    case 1:     /* check and release current location */
+    case 1: /* check and release current location */
         if (!TEST_ptr(ad->location))
             goto err;
         GENERAL_NAME_free(ad->location);
         ad->location = NULL;
         break;
-    case 2:     /* replace current location */
+    case 2: /* replace current location */
         GENERAL_NAME_free(ad->location);
         ad->location = GENERAL_NAME_new();
         if (!TEST_ptr(ad->location))
diff --git a/test/ossl_store_test.c b/test/ossl_store_test.c
index ba1bc6fdc50f9..f251313d1a699 100644
--- a/test/ossl_store_test.c
+++ b/test/ossl_store_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-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
@@ -14,11 +14,11 @@
 #include "testutil.h"
 
 #ifndef PATH_MAX
-# if defined(_WIN32) && defined(_MAX_PATH)
-#  define PATH_MAX _MAX_PATH
-# else
-#  define PATH_MAX 4096
-# endif
+#if defined(_WIN32) && defined(_MAX_PATH)
+#define PATH_MAX _MAX_PATH
+#else
+#define PATH_MAX 4096
+#endif
 #endif
 
 typedef enum OPTION_choice {
@@ -45,12 +45,12 @@ static int test_store_open(void)
     char *input = test_mk_file_path(inputdir, infile);
 
     ret = TEST_ptr(input)
-          && TEST_ptr(search = OSSL_STORE_SEARCH_by_alias("nothing"))
-          && TEST_ptr(ui_method= UI_create_method("DummyUI"))
-          && TEST_ptr(sctx = OSSL_STORE_open_ex(input, NULL, NULL, ui_method,
-                                                NULL, NULL, NULL, NULL))
-          && TEST_false(OSSL_STORE_find(sctx, NULL))
-          && TEST_true(OSSL_STORE_find(sctx, search));
+        && TEST_ptr(search = OSSL_STORE_SEARCH_by_alias("nothing"))
+        && TEST_ptr(ui_method = UI_create_method("DummyUI"))
+        && TEST_ptr(sctx = OSSL_STORE_open_ex(input, NULL, NULL, ui_method,
+                        NULL, NULL, NULL, NULL))
+        && TEST_false(OSSL_STORE_find(sctx, NULL))
+        && TEST_true(OSSL_STORE_find(sctx, search));
     UI_destroy_method(ui_method);
     OSSL_STORE_SEARCH_free(search);
     OSSL_STORE_close(sctx);
@@ -58,13 +58,82 @@ static int test_store_open(void)
     return ret;
 }
 
+#ifndef OPENSSL_NO_WINSTORE
+/*
+ * This is the one of the root certificate authorities from the
+ * microsoft cert store.  We use it to extract the subject name
+ * so that we can search for it in the store
+ */
+static const unsigned char mscert[] = {
+    0x30, 0x82, 0x01, 0x3b, 0x30, 0x81, 0xee, 0xa0, 0x03, 0x02, 0x01, 0x02,
+    0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x30, 0x81,
+    0x88, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02,
+    0x55, 0x53, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13,
+    0x0a, 0x57, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x74, 0x6f, 0x6e, 0x31,
+    0x10, 0x30, 0x0e, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x07, 0x52, 0x65,
+    0x64, 0x6d, 0x6f, 0x6e, 0x64, 0x31, 0x1e, 0x30, 0x1c, 0x06, 0x03, 0x55,
+    0x04, 0x0a, 0x13, 0x15, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x6f, 0x66,
+    0x74, 0x20, 0x43, 0x6f, 0x72, 0x70, 0x6f, 0x72, 0x61, 0x74, 0x69, 0x6f,
+    0x6e, 0x31, 0x32, 0x30, 0x30, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x29,
+    0x4d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x6f, 0x66, 0x74, 0x20, 0x52, 0x6f,
+    0x6f, 0x74, 0x20, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+    0x74, 0x65, 0x20, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79,
+    0x20, 0x32, 0x30, 0x31, 0x31, 0x30, 0x20, 0x17, 0x0d, 0x32, 0x35, 0x30,
+    0x34, 0x32, 0x39, 0x30, 0x35, 0x34, 0x33, 0x33, 0x30, 0x5a, 0x18, 0x0f,
+    0x32, 0x31, 0x32, 0x35, 0x30, 0x34, 0x32, 0x39, 0x30, 0x35, 0x34, 0x33,
+    0x33, 0x30, 0x5a, 0x30, 0x00, 0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b,
+    0x65, 0x70, 0x03, 0x21, 0x00, 0x21, 0x86, 0x38, 0x28, 0x7d, 0xad, 0x35,
+    0xad, 0xc3, 0x91, 0x07, 0x41, 0x65, 0x02, 0xe1, 0x72, 0x79, 0xf4, 0x0d,
+    0xd5, 0xe2, 0xbb, 0xba, 0xd8, 0x81, 0x06, 0xad, 0xa0, 0x7b, 0x2a, 0x41,
+    0x09, 0xa3, 0x02, 0x30, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70,
+    0x03, 0x41, 0x00, 0x2e, 0xbb, 0xb9, 0x55, 0x59, 0x24, 0xb0, 0xdb, 0x18,
+    0xd0, 0xb4, 0xa6, 0x8b, 0xa8, 0xbf, 0x4c, 0xbd, 0x83, 0x27, 0xe7, 0xc2,
+    0xc8, 0x13, 0xc2, 0x81, 0xbe, 0xdf, 0x04, 0x7b, 0x09, 0x87, 0x08, 0x53,
+    0x97, 0xd6, 0x7c, 0xb7, 0x6c, 0xa6, 0x78, 0x63, 0x3c, 0x27, 0x29, 0x81,
+    0x85, 0xd0, 0x73, 0x92, 0x2d, 0x5c, 0x33, 0x8e, 0x88, 0x18, 0x9b, 0x1c,
+    0xcf, 0xc3, 0x4a, 0xf0, 0x82, 0x05, 0x05
+};
+#define TEST_CERT_LEN 1521
+
+static int test_store_open_winstore(void)
+{
+    int ret = 0;
+    OSSL_STORE_CTX *sctx = NULL;
+    OSSL_STORE_SEARCH *search = NULL;
+    UI_METHOD *ui_method = NULL;
+    OSSL_STORE_INFO *info = NULL;
+    X509 *testcert = NULL;
+    const unsigned char *certptr = mscert;
+
+    /*
+     * Test the winstore, by opening it, searching for the MS root certificate
+     * and ensure that it was found.  Note that we have to search by
+     * subject name, as winstore only allows searches by that method
+     */
+    ret = TEST_ptr(testcert = d2i_X509(NULL, &certptr, TEST_CERT_LEN))
+        && TEST_ptr(search = OSSL_STORE_SEARCH_by_name(X509_get_issuer_name(testcert)))
+        && TEST_ptr(ui_method = UI_create_method("DummyUI"))
+        && TEST_ptr(sctx = OSSL_STORE_open_ex("org.openssl.winstore:", NULL,
+                        NULL, ui_method, NULL, NULL,
+                        NULL, NULL))
+        && TEST_true(OSSL_STORE_find(sctx, search))
+        && TEST_ptr(info = OSSL_STORE_load(sctx));
+    UI_destroy_method(ui_method);
+    OSSL_STORE_INFO_free(info);
+    OSSL_STORE_SEARCH_free(search);
+    OSSL_STORE_close(sctx);
+    X509_free(testcert);
+    return ret;
+}
+#endif
+
 static int test_store_search_by_key_fingerprint_fail(void)
 {
     int ret;
     OSSL_STORE_SEARCH *search = NULL;
 
     ret = TEST_ptr_null(search = OSSL_STORE_SEARCH_by_key_fingerprint(
-                                     EVP_sha256(), NULL, 0));
+                            EVP_sha256(), NULL, 0));
     OSSL_STORE_SEARCH_free(search);
     return ret;
 }
@@ -81,8 +150,8 @@ static int get_params(const char *uri, const char *type)
         goto err;
 
     while (!OSSL_STORE_eof(ctx)
-            && (info = OSSL_STORE_load(ctx)) != NULL
-            && pkey == NULL) {
+        && (info = OSSL_STORE_load(ctx)) != NULL
+        && pkey == NULL) {
         if (OSSL_STORE_INFO_get_type(info) == OSSL_STORE_INFO_PARAMS) {
             pkey = OSSL_STORE_INFO_get1_PARAMS(info);
         }
@@ -94,7 +163,7 @@ static int get_params(const char *uri, const char *type)
         ret = EVP_PKEY_is_a(pkey, type);
     EVP_PKEY_free(pkey);
 
- err:
+err:
     OSSL_STORE_close(ctx);
     return ret;
 }
@@ -163,14 +232,14 @@ static int test_store_attach_unregistered_scheme(void)
     char *input = test_mk_file_path(inputdir, sm2file);
 
     ret = TEST_ptr(input)
-          && TEST_ptr(libctx = OSSL_LIB_CTX_new())
-          && TEST_ptr(provider = OSSL_PROVIDER_load(libctx, "default"))
-          && TEST_ptr(bio = BIO_new_file(input, "r"))
-          && TEST_ptr(store_ctx = OSSL_STORE_attach(bio, "file", libctx, NULL,
-                                                    NULL, NULL, NULL, NULL, NULL))
-          && TEST_int_ne(ERR_GET_LIB(ERR_peek_error()), ERR_LIB_OSSL_STORE)
-          && TEST_int_ne(ERR_GET_REASON(ERR_peek_error()),
-                         OSSL_STORE_R_UNREGISTERED_SCHEME);
+        && TEST_ptr(libctx = OSSL_LIB_CTX_new())
+        && TEST_ptr(provider = OSSL_PROVIDER_load(libctx, "default"))
+        && TEST_ptr(bio = BIO_new_file(input, "r"))
+        && TEST_ptr(store_ctx = OSSL_STORE_attach(bio, "file", libctx, NULL,
+                        NULL, NULL, NULL, NULL, NULL))
+        && TEST_int_ne(ERR_GET_LIB(ERR_peek_error()), ERR_LIB_OSSL_STORE)
+        && TEST_int_ne(ERR_GET_REASON(ERR_peek_error()),
+            OSSL_STORE_R_UNREGISTERED_SCHEME);
 
     BIO_free(bio);
     OSSL_STORE_close(store_ctx);
@@ -212,7 +281,7 @@ int setup_tests(void)
             datadir = opt_arg();
             break;
         case OPT_TEST_CASES:
-           break;
+            break;
         default:
         case OPT_ERR:
             return 0;
@@ -230,6 +299,9 @@ int setup_tests(void)
 
     if (infile != NULL)
         ADD_TEST(test_store_open);
+#ifndef OPENSSL_NO_WINSTORE
+    ADD_TEST(test_store_open_winstore);
+#endif
     ADD_TEST(test_store_search_by_key_fingerprint_fail);
     ADD_ALL_TESTS(test_store_get_params, 3);
     if (sm2file != NULL)
diff --git a/test/p_minimal.c b/test/p_minimal.c
index 0bff9823f824a..cd42621493216 100644
--- a/test/p_minimal.c
+++ b/test/p_minimal.c
@@ -16,9 +16,9 @@
 
 OSSL_provider_init_fn OSSL_provider_init; /* Check the function signature */
 int OSSL_provider_init(const OSSL_CORE_HANDLE *handle,
-                       const OSSL_DISPATCH *oin,
-                       const OSSL_DISPATCH **out,
-                       void **provctx)
+    const OSSL_DISPATCH *oin,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     return 1;
 }
diff --git a/test/p_test.c b/test/p_test.c
index 05f71ec8347c0..1e38bee717b68 100644
--- a/test/p_test.c
+++ b/test/p_test.c
@@ -25,7 +25,7 @@
  * object form.
  */
 #ifdef PROVIDER_INIT_FUNCTION_NAME
-# define OSSL_provider_init PROVIDER_INIT_FUNCTION_NAME
+#define OSSL_provider_init PROVIDER_INIT_FUNCTION_NAME
 #endif
 
 #include "internal/e_os.h"
@@ -53,7 +53,7 @@ static OSSL_FUNC_BIO_vsnprintf_fn *c_BIO_vsnprintf;
 /* Tell the core what params we provide and what type they are */
 static const OSSL_PARAM p_param_types[] = {
     { "greeting", OSSL_PARAM_UTF8_STRING, NULL, 0, 0 },
-    { "digest-check", OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0},
+    { "digest-check", OSSL_PARAM_UNSIGNED_INTEGER, NULL, 0, 0 },
     { NULL, 0, NULL, 0, 0 }
 };
 
@@ -75,7 +75,7 @@ static int local_snprintf(char *buf, size_t n, const char *format, ...)
 }
 
 static void p_set_error(int lib, int reason, const char *file, int line,
-                        const char *func, const char *fmt, ...)
+    const char *func, const char *fmt, ...)
 {
     va_list ap;
 
@@ -106,13 +106,13 @@ static int p_get_params(void *provctx, OSSL_PARAM params[])
             static OSSL_PARAM counter_request[] = {
                 /* Known libcrypto provided parameters */
                 { "openssl-version", OSSL_PARAM_UTF8_PTR,
-                  &opensslv, sizeof(&opensslv), 0 },
+                    &opensslv, sizeof(&opensslv), 0 },
                 { "provider-name", OSSL_PARAM_UTF8_PTR,
-                  &provname, sizeof(&provname), 0},
+                    &provname, sizeof(&provname), 0 },
 
                 /* This might be present, if there's such a configuration */
                 { "greeting", OSSL_PARAM_UTF8_PTR,
-                  &greeting, sizeof(&greeting), 0 },
+                    &greeting, sizeof(&greeting), 0 },
 
                 { NULL, 0, NULL, 0, 0 }
             };
@@ -129,7 +129,7 @@ static int p_get_params(void *provctx, OSSL_PARAM params[])
                     const char *namep = *(void **)counter_request[1].data;
 
                     local_snprintf(buf, sizeof(buf), "Hello OpenSSL %.20s, greetings from %s!",
-                                   versionp, namep);
+                        versionp, namep);
                 }
             } else {
                 local_snprintf(buf, sizeof(buf), "Howdy stranger...");
@@ -156,15 +156,15 @@ static int p_get_params(void *provctx, OSSL_PARAM params[])
             OSSL_PROVIDER *deflt;
 
             /*
-            * "default" has not been loaded into the parent libctx. We should be able
-            * to explicitly load it as a non-child provider.
-            */
+             * "default" has not been loaded into the parent libctx. We should be able
+             * to explicitly load it as a non-child provider.
+             */
             deflt = OSSL_PROVIDER_load(ctx->libctx, "default");
             if (deflt == NULL
-                    || !OSSL_PROVIDER_available(ctx->libctx, "default")) {
+                || !OSSL_PROVIDER_available(ctx->libctx, "default")) {
                 /* We set error "3" for a failure to load the default provider */
                 p_set_error(ERR_LIB_PROV, 3, ctx->thisfile, OPENSSL_LINE,
-                            ctx->thisfunc, NULL);
+                    ctx->thisfunc, NULL);
                 ok = 0;
             }
 
@@ -175,16 +175,16 @@ static int p_get_params(void *provctx, OSSL_PARAM params[])
              * available.
              */
             if (ok
-                    && OSSL_PROVIDER_available(ctx->libctx, "default")
-                    && OSSL_PROVIDER_available(ctx->libctx, "base")
-                    && OSSL_PROVIDER_available(ctx->libctx, "legacy")
-                    && OSSL_PROVIDER_available(ctx->libctx, "p_test")
-                    && md4 != NULL
-                    && mdctx != NULL) {
+                && OSSL_PROVIDER_available(ctx->libctx, "default")
+                && OSSL_PROVIDER_available(ctx->libctx, "base")
+                && OSSL_PROVIDER_available(ctx->libctx, "legacy")
+                && OSSL_PROVIDER_available(ctx->libctx, "p_test")
+                && md4 != NULL
+                && mdctx != NULL) {
                 if (EVP_DigestInit_ex(mdctx, md4, NULL)
-                        && EVP_DigestUpdate(mdctx, (const unsigned char *)msg,
-                                            strlen(msg))
-                        && EVP_DigestFinal(mdctx, out, NULL))
+                    && EVP_DigestUpdate(mdctx, (const unsigned char *)msg,
+                        strlen(msg))
+                    && EVP_DigestFinal(mdctx, out, NULL))
                     digestsuccess = 1;
             }
             EVP_MD_CTX_free(mdctx);
@@ -221,18 +221,18 @@ static int p_get_params(void *provctx, OSSL_PARAM params[])
 static const OSSL_ITEM *p_get_reason_strings(void *_)
 {
     static const OSSL_ITEM reason_strings[] = {
-        {1, "dummy reason string"},
-        {2, "Can't create child library context"},
-        {3, "Can't load default provider"},
-        {0, NULL}
+        { 1, "dummy reason string" },
+        { 2, "Can't create child library context" },
+        { 3, "Can't load default provider" },
+        { 0, NULL }
     };
 
     return reason_strings;
 }
 
 static const OSSL_ALGORITHM *p_query(OSSL_PROVIDER *prov,
-                                     int operation_id,
-                                     int *no_cache)
+    int operation_id,
+    int *no_cache)
 {
     *no_cache = 1;
     return NULL;
@@ -242,16 +242,16 @@ static const OSSL_DISPATCH p_test_table[] = {
     { OSSL_FUNC_PROVIDER_GETTABLE_PARAMS, (void (*)(void))p_gettable_params },
     { OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))p_get_params },
     { OSSL_FUNC_PROVIDER_GET_REASON_STRINGS,
-        (void (*)(void))p_get_reason_strings},
+        (void (*)(void))p_get_reason_strings },
     { OSSL_FUNC_PROVIDER_TEARDOWN, (void (*)(void))p_teardown },
     { OSSL_FUNC_PROVIDER_QUERY_OPERATION, (void (*)(void))p_query },
     OSSL_DISPATCH_END
 };
 
 int OSSL_provider_init(const OSSL_CORE_HANDLE *handle,
-                       const OSSL_DISPATCH *oin,
-                       const OSSL_DISPATCH **out,
-                       void **provctx)
+    const OSSL_DISPATCH *oin,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     P_TEST_CTX *ctx;
     const OSSL_DISPATCH *in = oin;
@@ -304,7 +304,7 @@ int OSSL_provider_init(const OSSL_CORE_HANDLE *handle,
     if (ctx->libctx == NULL) {
         /* We set error "2" for a failure to create the child libctx*/
         p_set_error(ERR_LIB_PROV, 2, ctx->thisfile, OPENSSL_LINE, ctx->thisfunc,
-                    NULL);
+            NULL);
         p_teardown(ctx);
         return 0;
     }
diff --git a/test/packettest.c b/test/packettest.c
index 40b68d310a724..4b0e6f5c63e97 100644
--- a/test/packettest.c
+++ b/test/packettest.c
@@ -19,11 +19,11 @@ static int test_PACKET_remaining(void)
     PACKET pkt;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
-            || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 1))
-            || !TEST_size_t_eq(PACKET_remaining(&pkt), 1)
-            || !TEST_true(PACKET_forward(&pkt, 1))
-            || !TEST_size_t_eq(PACKET_remaining(&pkt), 0))
+        || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
+        || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 1))
+        || !TEST_size_t_eq(PACKET_remaining(&pkt), 1)
+        || !TEST_true(PACKET_forward(&pkt, 1))
+        || !TEST_size_t_eq(PACKET_remaining(&pkt), 0))
         return 0;
 
     return 1;
@@ -34,12 +34,12 @@ static int test_PACKET_end(void)
     PACKET pkt;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
-            || !TEST_ptr_eq(PACKET_end(&pkt), smbuf + BUF_LEN)
-            || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 1))
-            || !TEST_ptr_eq(PACKET_end(&pkt), smbuf + BUF_LEN)
-            || !TEST_true(PACKET_forward(&pkt, 1))
-            || !TEST_ptr_eq(PACKET_end(&pkt), smbuf + BUF_LEN))
+        || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
+        || !TEST_ptr_eq(PACKET_end(&pkt), smbuf + BUF_LEN)
+        || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 1))
+        || !TEST_ptr_eq(PACKET_end(&pkt), smbuf + BUF_LEN)
+        || !TEST_true(PACKET_forward(&pkt, 1))
+        || !TEST_ptr_eq(PACKET_end(&pkt), smbuf + BUF_LEN))
         return 0;
 
     return 1;
@@ -51,12 +51,12 @@ static int test_PACKET_get_1(void)
     PACKET pkt;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_true(PACKET_get_1(&pkt, &i))
-            || !TEST_uint_eq(i, 0x02)
-            || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 2))
-            || !TEST_true(PACKET_get_1(&pkt, &i))
-            || !TEST_uint_eq(i, 0xfe)
-            || !TEST_false(PACKET_get_1(&pkt, &i)))
+        || !TEST_true(PACKET_get_1(&pkt, &i))
+        || !TEST_uint_eq(i, 0x02)
+        || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 2))
+        || !TEST_true(PACKET_get_1(&pkt, &i))
+        || !TEST_uint_eq(i, 0xfe)
+        || !TEST_false(PACKET_get_1(&pkt, &i)))
         return 0;
 
     return 1;
@@ -68,12 +68,12 @@ static int test_PACKET_get_4(void)
     PACKET pkt;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_true(PACKET_get_4(&pkt, &i))
-            || !TEST_ulong_eq(i, 0x08060402UL)
-            || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 8))
-            || !TEST_true(PACKET_get_4(&pkt, &i))
-            || !TEST_ulong_eq(i, 0xfefcfaf8UL)
-            || !TEST_false(PACKET_get_4(&pkt, &i)))
+        || !TEST_true(PACKET_get_4(&pkt, &i))
+        || !TEST_ulong_eq(i, 0x08060402UL)
+        || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 8))
+        || !TEST_true(PACKET_get_4(&pkt, &i))
+        || !TEST_ulong_eq(i, 0xfefcfaf8UL)
+        || !TEST_false(PACKET_get_4(&pkt, &i)))
         return 0;
 
     return 1;
@@ -85,12 +85,12 @@ static int test_PACKET_get_net_2(void)
     PACKET pkt;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_true(PACKET_get_net_2(&pkt, &i))
-            || !TEST_uint_eq(i, 0x0204)
-            || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 4))
-            || !TEST_true(PACKET_get_net_2(&pkt, &i))
-            || !TEST_uint_eq(i, 0xfcfe)
-            || !TEST_false(PACKET_get_net_2(&pkt, &i)))
+        || !TEST_true(PACKET_get_net_2(&pkt, &i))
+        || !TEST_uint_eq(i, 0x0204)
+        || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 4))
+        || !TEST_true(PACKET_get_net_2(&pkt, &i))
+        || !TEST_uint_eq(i, 0xfcfe)
+        || !TEST_false(PACKET_get_net_2(&pkt, &i)))
         return 0;
 
     return 1;
@@ -102,12 +102,12 @@ static int test_PACKET_get_net_3(void)
     PACKET pkt;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_true(PACKET_get_net_3(&pkt, &i))
-            || !TEST_ulong_eq(i, 0x020406UL)
-            || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 6))
-            || !TEST_true(PACKET_get_net_3(&pkt, &i))
-            || !TEST_ulong_eq(i, 0xfafcfeUL)
-            || !TEST_false(PACKET_get_net_3(&pkt, &i)))
+        || !TEST_true(PACKET_get_net_3(&pkt, &i))
+        || !TEST_ulong_eq(i, 0x020406UL)
+        || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 6))
+        || !TEST_true(PACKET_get_net_3(&pkt, &i))
+        || !TEST_ulong_eq(i, 0xfafcfeUL)
+        || !TEST_false(PACKET_get_net_3(&pkt, &i)))
         return 0;
 
     return 1;
@@ -119,12 +119,12 @@ static int test_PACKET_get_net_4(void)
     PACKET pkt;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_true(PACKET_get_net_4(&pkt, &i))
-            || !TEST_ulong_eq(i, 0x02040608UL)
-            || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 8))
-            || !TEST_true(PACKET_get_net_4(&pkt, &i))
-            || !TEST_ulong_eq(i, 0xf8fafcfeUL)
-            || !TEST_false(PACKET_get_net_4(&pkt, &i)))
+        || !TEST_true(PACKET_get_net_4(&pkt, &i))
+        || !TEST_ulong_eq(i, 0x02040608UL)
+        || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 8))
+        || !TEST_true(PACKET_get_net_4(&pkt, &i))
+        || !TEST_ulong_eq(i, 0xf8fafcfeUL)
+        || !TEST_false(PACKET_get_net_4(&pkt, &i)))
         return 0;
 
     return 1;
@@ -136,16 +136,16 @@ static int test_PACKET_get_sub_packet(void)
     unsigned long i = 0;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_true(PACKET_get_sub_packet(&pkt, &subpkt, 4))
-            || !TEST_true(PACKET_get_net_4(&subpkt, &i))
-            || !TEST_ulong_eq(i, 0x02040608UL)
-            || !TEST_size_t_eq(PACKET_remaining(&subpkt), 0)
-            || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 8))
-            || !TEST_true(PACKET_get_sub_packet(&pkt, &subpkt, 4))
-            || !TEST_true(PACKET_get_net_4(&subpkt, &i))
-            || !TEST_ulong_eq(i, 0xf8fafcfeUL)
-            || !TEST_size_t_eq(PACKET_remaining(&subpkt), 0)
-            || !TEST_false(PACKET_get_sub_packet(&pkt, &subpkt, 4)))
+        || !TEST_true(PACKET_get_sub_packet(&pkt, &subpkt, 4))
+        || !TEST_true(PACKET_get_net_4(&subpkt, &i))
+        || !TEST_ulong_eq(i, 0x02040608UL)
+        || !TEST_size_t_eq(PACKET_remaining(&subpkt), 0)
+        || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 8))
+        || !TEST_true(PACKET_get_sub_packet(&pkt, &subpkt, 4))
+        || !TEST_true(PACKET_get_net_4(&subpkt, &i))
+        || !TEST_ulong_eq(i, 0xf8fafcfeUL)
+        || !TEST_size_t_eq(PACKET_remaining(&subpkt), 0)
+        || !TEST_false(PACKET_get_sub_packet(&pkt, &subpkt, 4)))
         return 0;
 
     return 1;
@@ -157,19 +157,19 @@ static int test_PACKET_get_bytes(void)
     PACKET pkt;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_true(PACKET_get_bytes(&pkt, &bytes, 4))
-            || !TEST_uchar_eq(bytes[0], 2)
-            || !TEST_uchar_eq(bytes[1], 4)
-            || !TEST_uchar_eq(bytes[2], 6)
-            || !TEST_uchar_eq(bytes[3], 8)
-            || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN -4)
-            || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 8))
-            || !TEST_true(PACKET_get_bytes(&pkt, &bytes, 4))
-            || !TEST_uchar_eq(bytes[0], 0xf8)
-            || !TEST_uchar_eq(bytes[1], 0xfa)
-            || !TEST_uchar_eq(bytes[2], 0xfc)
-            || !TEST_uchar_eq(bytes[3], 0xfe)
-            || !TEST_false(PACKET_remaining(&pkt)))
+        || !TEST_true(PACKET_get_bytes(&pkt, &bytes, 4))
+        || !TEST_uchar_eq(bytes[0], 2)
+        || !TEST_uchar_eq(bytes[1], 4)
+        || !TEST_uchar_eq(bytes[2], 6)
+        || !TEST_uchar_eq(bytes[3], 8)
+        || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN - 4)
+        || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 8))
+        || !TEST_true(PACKET_get_bytes(&pkt, &bytes, 4))
+        || !TEST_uchar_eq(bytes[0], 0xf8)
+        || !TEST_uchar_eq(bytes[1], 0xfa)
+        || !TEST_uchar_eq(bytes[2], 0xfc)
+        || !TEST_uchar_eq(bytes[3], 0xfe)
+        || !TEST_false(PACKET_remaining(&pkt)))
         return 0;
 
     return 1;
@@ -181,19 +181,19 @@ static int test_PACKET_copy_bytes(void)
     PACKET pkt;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_true(PACKET_copy_bytes(&pkt, bytes, 4))
-            || !TEST_char_eq(bytes[0], 2)
-            || !TEST_char_eq(bytes[1], 4)
-            || !TEST_char_eq(bytes[2], 6)
-            || !TEST_char_eq(bytes[3], 8)
-            || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN - 4)
-            || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 8))
-            || !TEST_true(PACKET_copy_bytes(&pkt, bytes, 4))
-            || !TEST_uchar_eq(bytes[0], 0xf8)
-            || !TEST_uchar_eq(bytes[1], 0xfa)
-            || !TEST_uchar_eq(bytes[2], 0xfc)
-            || !TEST_uchar_eq(bytes[3], 0xfe)
-            || !TEST_false(PACKET_remaining(&pkt)))
+        || !TEST_true(PACKET_copy_bytes(&pkt, bytes, 4))
+        || !TEST_char_eq(bytes[0], 2)
+        || !TEST_char_eq(bytes[1], 4)
+        || !TEST_char_eq(bytes[2], 6)
+        || !TEST_char_eq(bytes[3], 8)
+        || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN - 4)
+        || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 8))
+        || !TEST_true(PACKET_copy_bytes(&pkt, bytes, 4))
+        || !TEST_uchar_eq(bytes[0], 0xf8)
+        || !TEST_uchar_eq(bytes[1], 0xfa)
+        || !TEST_uchar_eq(bytes[2], 0xfc)
+        || !TEST_uchar_eq(bytes[3], 0xfe)
+        || !TEST_false(PACKET_remaining(&pkt)))
         return 0;
 
     return 1;
@@ -206,11 +206,11 @@ static int test_PACKET_copy_all(void)
     size_t len;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_true(PACKET_copy_all(&pkt, tmp, BUF_LEN, &len))
-            || !TEST_size_t_eq(len, BUF_LEN)
-            || !TEST_mem_eq(smbuf, BUF_LEN, tmp, BUF_LEN)
-            || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
-            || !TEST_false(PACKET_copy_all(&pkt, tmp, BUF_LEN - 1, &len)))
+        || !TEST_true(PACKET_copy_all(&pkt, tmp, BUF_LEN, &len))
+        || !TEST_size_t_eq(len, BUF_LEN)
+        || !TEST_mem_eq(smbuf, BUF_LEN, tmp, BUF_LEN)
+        || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
+        || !TEST_false(PACKET_copy_all(&pkt, tmp, BUF_LEN - 1, &len)))
         return 0;
 
     return 1;
@@ -224,13 +224,13 @@ static int test_PACKET_memdup(void)
     int result = 0;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_true(PACKET_memdup(&pkt, &data, &len))
-            || !TEST_size_t_eq(len, BUF_LEN)
-            || !TEST_mem_eq(data, len, PACKET_data(&pkt), len)
-            || !TEST_true(PACKET_forward(&pkt, 10))
-            || !TEST_true(PACKET_memdup(&pkt, &data, &len))
-            || !TEST_size_t_eq(len, BUF_LEN - 10)
-            || !TEST_mem_eq(data, len, PACKET_data(&pkt), len))
+        || !TEST_true(PACKET_memdup(&pkt, &data, &len))
+        || !TEST_size_t_eq(len, BUF_LEN)
+        || !TEST_mem_eq(data, len, PACKET_data(&pkt), len)
+        || !TEST_true(PACKET_forward(&pkt, 10))
+        || !TEST_true(PACKET_memdup(&pkt, &data, &len))
+        || !TEST_size_t_eq(len, BUF_LEN - 10)
+        || !TEST_mem_eq(data, len, PACKET_data(&pkt), len))
         goto end;
     result = 1;
 end:
@@ -249,14 +249,14 @@ static int test_PACKET_strndup(void)
     memset(buf2, 'y', 10);
     buf2[5] = '\0';
 
-    if (!TEST_true(PACKET_buf_init(&pkt, (unsigned char*)buf1, 10))
-            || !TEST_true(PACKET_strndup(&pkt, &data))
-            || !TEST_size_t_eq(strlen(data), 10)
-            || !TEST_strn_eq(data, buf1, 10)
-            || !TEST_true(PACKET_buf_init(&pkt, (unsigned char*)buf2, 10))
-            || !TEST_true(PACKET_strndup(&pkt, &data))
-            || !TEST_size_t_eq(strlen(data), 5)
-            || !TEST_str_eq(data, buf2))
+    if (!TEST_true(PACKET_buf_init(&pkt, (unsigned char *)buf1, 10))
+        || !TEST_true(PACKET_strndup(&pkt, &data))
+        || !TEST_size_t_eq(strlen(data), 10)
+        || !TEST_strn_eq(data, buf1, 10)
+        || !TEST_true(PACKET_buf_init(&pkt, (unsigned char *)buf2, 10))
+        || !TEST_true(PACKET_strndup(&pkt, &data))
+        || !TEST_size_t_eq(strlen(data), 5)
+        || !TEST_str_eq(data, buf2))
         goto end;
 
     result = 1;
@@ -274,10 +274,10 @@ static int test_PACKET_contains_zero_byte(void)
     memset(buf2, 'y', 10);
     buf2[5] = '\0';
 
-    if (!TEST_true(PACKET_buf_init(&pkt, (unsigned char*)buf1, 10))
-            || !TEST_false(PACKET_contains_zero_byte(&pkt))
-            || !TEST_true(PACKET_buf_init(&pkt, (unsigned char*)buf2, 10))
-            || !TEST_true(PACKET_contains_zero_byte(&pkt)))
+    if (!TEST_true(PACKET_buf_init(&pkt, (unsigned char *)buf1, 10))
+        || !TEST_false(PACKET_contains_zero_byte(&pkt))
+        || !TEST_true(PACKET_buf_init(&pkt, (unsigned char *)buf2, 10))
+        || !TEST_true(PACKET_contains_zero_byte(&pkt)))
         return 0;
 
     return 1;
@@ -289,12 +289,12 @@ static int test_PACKET_forward(void)
     PACKET pkt;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_true(PACKET_forward(&pkt, 1))
-            || !TEST_true(PACKET_get_bytes(&pkt, &byte, 1))
-            || !TEST_uchar_eq(byte[0], 4)
-            || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 3))
-            || !TEST_true(PACKET_get_bytes(&pkt, &byte, 1))
-            || !TEST_uchar_eq(byte[0], 0xfe))
+        || !TEST_true(PACKET_forward(&pkt, 1))
+        || !TEST_true(PACKET_get_bytes(&pkt, &byte, 1))
+        || !TEST_uchar_eq(byte[0], 4)
+        || !TEST_true(PACKET_forward(&pkt, BUF_LEN - 3))
+        || !TEST_true(PACKET_get_bytes(&pkt, &byte, 1))
+        || !TEST_uchar_eq(byte[0], 0xfe))
         return 0;
 
     return 1;
@@ -307,10 +307,10 @@ static int test_PACKET_buf_init(void)
 
     /* Also tests PACKET_remaining() */
     if (!TEST_true(PACKET_buf_init(&pkt, buf1, 4))
-            || !TEST_size_t_eq(PACKET_remaining(&pkt), 4)
-            || !TEST_true(PACKET_buf_init(&pkt, buf1, BUF_LEN))
-            || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
-            || !TEST_false(PACKET_buf_init(&pkt, buf1, -1)))
+        || !TEST_size_t_eq(PACKET_remaining(&pkt), 4)
+        || !TEST_true(PACKET_buf_init(&pkt, buf1, BUF_LEN))
+        || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
+        || !TEST_false(PACKET_buf_init(&pkt, buf1, -1)))
         return 0;
 
     return 1;
@@ -322,7 +322,7 @@ static int test_PACKET_null_init(void)
 
     PACKET_null_init(&pkt);
     if (!TEST_size_t_eq(PACKET_remaining(&pkt), 0)
-            || !TEST_false(PACKET_forward(&pkt, 1)))
+        || !TEST_false(PACKET_forward(&pkt, 1)))
         return 0;
 
     return 1;
@@ -333,13 +333,13 @@ static int test_PACKET_equal(void)
     PACKET pkt;
 
     if (!TEST_true(PACKET_buf_init(&pkt, smbuf, 4))
-            || !TEST_true(PACKET_equal(&pkt, smbuf, 4))
-            || !TEST_false(PACKET_equal(&pkt, smbuf + 1, 4))
-            || !TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
-            || !TEST_true(PACKET_equal(&pkt, smbuf, BUF_LEN))
-            || !TEST_false(PACKET_equal(&pkt, smbuf, BUF_LEN - 1))
-            || !TEST_false(PACKET_equal(&pkt, smbuf, BUF_LEN + 1))
-            || !TEST_false(PACKET_equal(&pkt, smbuf, 0)))
+        || !TEST_true(PACKET_equal(&pkt, smbuf, 4))
+        || !TEST_false(PACKET_equal(&pkt, smbuf + 1, 4))
+        || !TEST_true(PACKET_buf_init(&pkt, smbuf, BUF_LEN))
+        || !TEST_true(PACKET_equal(&pkt, smbuf, BUF_LEN))
+        || !TEST_false(PACKET_equal(&pkt, smbuf, BUF_LEN - 1))
+        || !TEST_false(PACKET_equal(&pkt, smbuf, BUF_LEN + 1))
+        || !TEST_false(PACKET_equal(&pkt, smbuf, 0)))
         return 0;
 
     return 1;
@@ -358,13 +358,13 @@ static int test_PACKET_get_length_prefixed_1(void)
         buf1[i] = (i * 2) & 0xff;
 
     if (!TEST_true(PACKET_buf_init(&pkt, buf1, BUF_LEN))
-            || !TEST_true(PACKET_buf_init(&short_pkt, buf1, len))
-            || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &subpkt))
-            || !TEST_size_t_eq(PACKET_remaining(&subpkt), len)
-            || !TEST_true(PACKET_get_net_2(&subpkt, &i))
-            || !TEST_uint_eq(i, 0x0204)
-            || !TEST_false(PACKET_get_length_prefixed_1(&short_pkt, &subpkt))
-            || !TEST_size_t_eq(PACKET_remaining(&short_pkt), len))
+        || !TEST_true(PACKET_buf_init(&short_pkt, buf1, len))
+        || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &subpkt))
+        || !TEST_size_t_eq(PACKET_remaining(&subpkt), len)
+        || !TEST_true(PACKET_get_net_2(&subpkt, &i))
+        || !TEST_uint_eq(i, 0x0204)
+        || !TEST_false(PACKET_get_length_prefixed_1(&short_pkt, &subpkt))
+        || !TEST_size_t_eq(PACKET_remaining(&short_pkt), len))
         return 0;
 
     return 1;
@@ -373,7 +373,7 @@ static int test_PACKET_get_length_prefixed_1(void)
 static int test_PACKET_get_length_prefixed_2(void)
 {
     unsigned char buf1[1024];
-    const size_t len = 516;  /* 0x0204 */
+    const size_t len = 516; /* 0x0204 */
     unsigned int i;
     PACKET pkt, short_pkt, subpkt;
 
@@ -382,13 +382,13 @@ static int test_PACKET_get_length_prefixed_2(void)
         buf1[i - 1] = (i * 2) & 0xff;
 
     if (!TEST_true(PACKET_buf_init(&pkt, buf1, 1024))
-            || !TEST_true(PACKET_buf_init(&short_pkt, buf1, len))
-            || !TEST_true(PACKET_get_length_prefixed_2(&pkt, &subpkt))
-            || !TEST_size_t_eq(PACKET_remaining(&subpkt), len)
-            || !TEST_true(PACKET_get_net_2(&subpkt, &i))
-            || !TEST_uint_eq(i, 0x0608)
-            || !TEST_false(PACKET_get_length_prefixed_2(&short_pkt, &subpkt))
-            || !TEST_size_t_eq(PACKET_remaining(&short_pkt), len))
+        || !TEST_true(PACKET_buf_init(&short_pkt, buf1, len))
+        || !TEST_true(PACKET_get_length_prefixed_2(&pkt, &subpkt))
+        || !TEST_size_t_eq(PACKET_remaining(&subpkt), len)
+        || !TEST_true(PACKET_get_net_2(&subpkt, &i))
+        || !TEST_uint_eq(i, 0x0608)
+        || !TEST_false(PACKET_get_length_prefixed_2(&short_pkt, &subpkt))
+        || !TEST_size_t_eq(PACKET_remaining(&short_pkt), len))
         return 0;
 
     return 1;
@@ -397,7 +397,7 @@ static int test_PACKET_get_length_prefixed_2(void)
 static int test_PACKET_get_length_prefixed_3(void)
 {
     unsigned char buf1[1024];
-    const size_t len = 516;  /* 0x000204 */
+    const size_t len = 516; /* 0x000204 */
     unsigned int i;
     PACKET pkt, short_pkt, subpkt;
 
@@ -406,13 +406,13 @@ static int test_PACKET_get_length_prefixed_3(void)
         buf1[i] = (i * 2) & 0xff;
 
     if (!TEST_true(PACKET_buf_init(&pkt, buf1, 1024))
-            || !TEST_true(PACKET_buf_init(&short_pkt, buf1, len))
-            || !TEST_true(PACKET_get_length_prefixed_3(&pkt, &subpkt))
-            || !TEST_size_t_eq(PACKET_remaining(&subpkt), len)
-            || !TEST_true(PACKET_get_net_2(&subpkt, &i))
-            || !TEST_uint_eq(i, 0x0608)
-            || !TEST_false(PACKET_get_length_prefixed_3(&short_pkt, &subpkt))
-            || !TEST_size_t_eq(PACKET_remaining(&short_pkt), len))
+        || !TEST_true(PACKET_buf_init(&short_pkt, buf1, len))
+        || !TEST_true(PACKET_get_length_prefixed_3(&pkt, &subpkt))
+        || !TEST_size_t_eq(PACKET_remaining(&subpkt), len)
+        || !TEST_true(PACKET_get_net_2(&subpkt, &i))
+        || !TEST_uint_eq(i, 0x0608)
+        || !TEST_false(PACKET_get_length_prefixed_3(&short_pkt, &subpkt))
+        || !TEST_size_t_eq(PACKET_remaining(&short_pkt), len))
         return 0;
 
     return 1;
@@ -431,12 +431,12 @@ static int test_PACKET_as_length_prefixed_1(void)
         buf1[i] = (i * 2) & 0xff;
 
     if (!TEST_true(PACKET_buf_init(&pkt, buf1, BUF_LEN))
-            || !TEST_true(PACKET_buf_init(&exact_pkt, buf1, len + 1))
-            || !TEST_false(PACKET_as_length_prefixed_1(&pkt, &subpkt))
-            || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
-            || !TEST_true(PACKET_as_length_prefixed_1(&exact_pkt, &subpkt))
-            || !TEST_size_t_eq(PACKET_remaining(&exact_pkt), 0)
-            || !TEST_size_t_eq(PACKET_remaining(&subpkt), len))
+        || !TEST_true(PACKET_buf_init(&exact_pkt, buf1, len + 1))
+        || !TEST_false(PACKET_as_length_prefixed_1(&pkt, &subpkt))
+        || !TEST_size_t_eq(PACKET_remaining(&pkt), BUF_LEN)
+        || !TEST_true(PACKET_as_length_prefixed_1(&exact_pkt, &subpkt))
+        || !TEST_size_t_eq(PACKET_remaining(&exact_pkt), 0)
+        || !TEST_size_t_eq(PACKET_remaining(&subpkt), len))
         return 0;
 
     return 1;
@@ -445,21 +445,21 @@ static int test_PACKET_as_length_prefixed_1(void)
 static int test_PACKET_as_length_prefixed_2(void)
 {
     unsigned char buf[1024];
-    const size_t len = 516;  /* 0x0204 */
+    const size_t len = 516; /* 0x0204 */
     unsigned int i;
     PACKET pkt, exact_pkt, subpkt;
 
     memset(&subpkt, 0, sizeof(subpkt));
     for (i = 1; i <= 1024; i++)
-        buf[i-1] = (i * 2) & 0xff;
+        buf[i - 1] = (i * 2) & 0xff;
 
     if (!TEST_true(PACKET_buf_init(&pkt, buf, 1024))
-            || !TEST_true(PACKET_buf_init(&exact_pkt, buf, len + 2))
-            || !TEST_false(PACKET_as_length_prefixed_2(&pkt, &subpkt))
-            || !TEST_size_t_eq(PACKET_remaining(&pkt), 1024)
-            || !TEST_true(PACKET_as_length_prefixed_2(&exact_pkt, &subpkt))
-            || !TEST_size_t_eq(PACKET_remaining(&exact_pkt), 0)
-            || !TEST_size_t_eq(PACKET_remaining(&subpkt), len))
+        || !TEST_true(PACKET_buf_init(&exact_pkt, buf, len + 2))
+        || !TEST_false(PACKET_as_length_prefixed_2(&pkt, &subpkt))
+        || !TEST_size_t_eq(PACKET_remaining(&pkt), 1024)
+        || !TEST_true(PACKET_as_length_prefixed_2(&exact_pkt, &subpkt))
+        || !TEST_size_t_eq(PACKET_remaining(&exact_pkt), 0)
+        || !TEST_size_t_eq(PACKET_remaining(&subpkt), len))
         return 0;
 
     return 1;
@@ -476,26 +476,26 @@ static int test_PACKET_get_quic_vlint(void)
     };
 
     static const struct quic_test_case cases[] = {
-        { {0x00}, 1, 0  },
-        { {0x01}, 1, 1  },
-        { {0x3e}, 1, 62 },
-        { {0x3f}, 1, 63 },
-        { {0x40,0x00}, 2, 0 },
-        { {0x40,0x01}, 2, 1 },
-        { {0x40,0x02}, 2, 2 },
-        { {0x40,0xff}, 2, 255 },
-        { {0x41,0x00}, 2, 256 },
-        { {0x7f,0xfe}, 2, 16382 },
-        { {0x7f,0xff}, 2, 16383 },
-        { {0x80,0x00,0x00,0x00}, 4, 0 },
-        { {0x80,0x00,0x00,0x01}, 4, 1 },
-        { {0x80,0x00,0x01,0x02}, 4, 258 },
-        { {0x80,0x18,0x49,0x65}, 4, 1591653 },
-        { {0xbe,0x18,0x49,0x65}, 4, 1041779045 },
-        { {0xbf,0xff,0xff,0xff}, 4, 1073741823 },
-        { {0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, 8, 0 },
-        { {0xc0,0x00,0x00,0x00,0x00,0x00,0x01,0x02}, 8, 258 },
-        { {0xfd,0x1f,0x59,0x8d,0xc9,0xf8,0x71,0x8a}, 8, 4404337426105397642 },
+        { { 0x00 }, 1, 0 },
+        { { 0x01 }, 1, 1 },
+        { { 0x3e }, 1, 62 },
+        { { 0x3f }, 1, 63 },
+        { { 0x40, 0x00 }, 2, 0 },
+        { { 0x40, 0x01 }, 2, 1 },
+        { { 0x40, 0x02 }, 2, 2 },
+        { { 0x40, 0xff }, 2, 255 },
+        { { 0x41, 0x00 }, 2, 256 },
+        { { 0x7f, 0xfe }, 2, 16382 },
+        { { 0x7f, 0xff }, 2, 16383 },
+        { { 0x80, 0x00, 0x00, 0x00 }, 4, 0 },
+        { { 0x80, 0x00, 0x00, 0x01 }, 4, 1 },
+        { { 0x80, 0x00, 0x01, 0x02 }, 4, 258 },
+        { { 0x80, 0x18, 0x49, 0x65 }, 4, 1591653 },
+        { { 0xbe, 0x18, 0x49, 0x65 }, 4, 1041779045 },
+        { { 0xbf, 0xff, 0xff, 0xff }, 4, 1073741823 },
+        { { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 8, 0 },
+        { { 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02 }, 8, 258 },
+        { { 0xfd, 0x1f, 0x59, 0x8d, 0xc9, 0xf8, 0x71, 0x8a }, 8, 4404337426105397642 },
     };
 
     PACKET pkt;
@@ -507,11 +507,10 @@ static int test_PACKET_get_quic_vlint(void)
         v = 55;
 
         if (!TEST_true(PACKET_buf_init(&pkt, cases[i].buf, sizeof(cases[i].buf)))
-                || !TEST_true(PACKET_get_quic_vlint(&pkt, &v))
-                || !TEST_uint64_t_eq(v, cases[i].value)
-                || !TEST_size_t_eq(PACKET_remaining(&pkt),
-                                   sizeof(cases[i].buf) - cases[i].expected_read_count)
-           )
+            || !TEST_true(PACKET_get_quic_vlint(&pkt, &v))
+            || !TEST_uint64_t_eq(v, cases[i].value)
+            || !TEST_size_t_eq(PACKET_remaining(&pkt),
+                sizeof(cases[i].buf) - cases[i].expected_read_count))
             return 0;
     }
 
@@ -528,28 +527,28 @@ static int test_PACKET_get_quic_length_prefixed(void)
 
     static const struct quic_test_case cases[] = {
         /* success cases */
-        { {0x00}, 1, 0, 0 },
-        { {0x01}, 1, 1, 0 },
-        { {0x02}, 1, 2, 0 },
-        { {0x03}, 1, 3, 0 },
-        { {0x04}, 1, 4, 0 },
-        { {0x05}, 1, 5, 0 },
+        { { 0x00 }, 1, 0, 0 },
+        { { 0x01 }, 1, 1, 0 },
+        { { 0x02 }, 1, 2, 0 },
+        { { 0x03 }, 1, 3, 0 },
+        { { 0x04 }, 1, 4, 0 },
+        { { 0x05 }, 1, 5, 0 },
 
         /* failure cases */
-        { {0x10}, 1, 0, 1 },
-        { {0x3f}, 1, 0, 1 },
+        { { 0x10 }, 1, 0, 1 },
+        { { 0x3f }, 1, 0, 1 },
     };
 
     size_t i;
-    PACKET pkt, subpkt = {0};
+    PACKET pkt, subpkt = { 0 };
 
     for (i = 0; i < OSSL_NELEM(cases); ++i) {
         memset(&pkt, 0, sizeof(pkt));
 
         if (!TEST_true(PACKET_buf_init(&pkt, cases[i].buf,
-                                       cases[i].fail
-                                         ? sizeof(cases[i].buf)
-                                         : cases[i].enclen + cases[i].len)))
+                cases[i].fail
+                    ? sizeof(cases[i].buf)
+                    : cases[i].enclen + cases[i].len)))
             return 0;
 
         if (!TEST_int_eq(PACKET_get_quic_length_prefixed(&pkt, &subpkt), !cases[i].fail))
diff --git a/test/pairwise_fail_test.c b/test/pairwise_fail_test.c
index 0e46aba2ad79d..3173225a0c852 100644
--- a/test/pairwise_fail_test.c
+++ b/test/pairwise_fail_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -36,9 +36,9 @@ const OPTIONS *test_get_options(void)
     static const OPTIONS test_options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the libctx" },
+            "The configuration file to use for the libctx" },
         { "pairwise", OPT_PAIRWISETEST, 's',
-          "Test keygen pairwise test failures" },
+            "Test keygen pairwise test failures" },
         { "dsaparam", OPT_DSAPARAM, 's', "DSA param file" },
         { NULL }
     };
@@ -133,6 +133,39 @@ static int test_keygen_pairwise_failure(void)
             goto err;
         if (!TEST_ptr_null(pkey))
             goto err;
+    } else if (strncmp(pairwise_name, "ml-dsa", 6) == 0) {
+        if (!TEST_true(setup_selftest_pairwise_failure(type)))
+            goto err;
+        if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "ML-DSA-87", NULL)))
+            goto err;
+        if (!TEST_int_eq(EVP_PKEY_keygen_init(ctx), 1))
+            goto err;
+        if (!TEST_int_le(EVP_PKEY_keygen(ctx, &pkey), 0))
+            goto err;
+        if (!TEST_ptr_null(pkey))
+            goto err;
+    } else if (strncmp(pairwise_name, "slh-dsa", 7) == 0) {
+        if (!TEST_true(setup_selftest_pairwise_failure(type)))
+            goto err;
+        if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "SLH-DSA-SHA2-256f", NULL)))
+            goto err;
+        if (!TEST_int_eq(EVP_PKEY_keygen_init(ctx), 1))
+            goto err;
+        if (!TEST_int_le(EVP_PKEY_keygen(ctx, &pkey), 0))
+            goto err;
+        if (!TEST_ptr_null(pkey))
+            goto err;
+    } else if (strncmp(pairwise_name, "ml-kem", 6) == 0) {
+        if (!TEST_true(setup_selftest_pairwise_failure(type)))
+            goto err;
+        if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "ML-KEM-1024", NULL)))
+            goto err;
+        if (!TEST_int_eq(EVP_PKEY_keygen_init(ctx), 1))
+            goto err;
+        if (!TEST_int_le(EVP_PKEY_keygen(ctx, &pkey), 0))
+            goto err;
+        if (!TEST_ptr_null(pkey))
+            goto err;
     }
     ret = 1;
 err:
@@ -160,7 +193,7 @@ int setup_tests(void)
             dsaparam_file = opt_arg();
             break;
         case OPT_TEST_CASES:
-           break;
+            break;
         default:
         case OPT_ERR:
             return 0;
diff --git a/test/param_build_test.c b/test/param_build_test.c
index f693b4b11bf61..3b90a5e829ccc 100644
--- a/test/param_build_test.c
+++ b/test/param_build_test.c
@@ -26,7 +26,7 @@ static int template_public_single_zero_test(int idx)
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || !TEST_ptr(zbn = BN_new())
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, "zeronumber",
-                                             idx == 0 ? zbn : NULL))
+            idx == 0 ? zbn : NULL))
         || !TEST_ptr(params_blt = OSSL_PARAM_BLD_to_param(bld)))
         goto err;
 
@@ -116,9 +116,9 @@ static int template_public_test(int tstid)
         || !TEST_true((BN_set_negative(nbn, 1), 1))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, "negativebignumber", nbn))
         || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld, "utf8_s", "foo",
-                                                      sizeof("foo")))
+            sizeof("foo")))
         || !TEST_true(OSSL_PARAM_BLD_push_utf8_ptr(bld, "utf8_p", "bar-boom",
-                                                   0))
+            0))
         || !TEST_true(OSSL_PARAM_BLD_push_int(bld, "i", -6))
         || !TEST_ptr(params_blt = OSSL_PARAM_BLD_to_param(bld)))
         goto err;
@@ -249,8 +249,8 @@ static int template_private_test(int tstid)
     int res = 0;
 
     if (!TEST_ptr(data1 = OPENSSL_secure_malloc(data1_size))
-            || !TEST_ptr(data2 = OPENSSL_secure_malloc(data2_size))
-            || !TEST_ptr(bld = OSSL_PARAM_BLD_new()))
+        || !TEST_ptr(data2 = OPENSSL_secure_malloc(data2_size))
+        || !TEST_ptr(bld = OSSL_PARAM_BLD_new()))
         goto err;
 
     for (j = 0; j < data1_num; j++)
@@ -273,9 +273,9 @@ static int template_private_test(int tstid)
         || !TEST_true((BN_set_negative(nbn, 1), 1))
         || !TEST_true(OSSL_PARAM_BLD_push_BN(bld, "negativebignumber", nbn))
         || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld, "oct_s", data1,
-                                                       data1_size))
+            data1_size))
         || !TEST_true(OSSL_PARAM_BLD_push_octet_ptr(bld, "oct_p", data2,
-                                                    data2_size))
+            data2_size))
         || !TEST_ptr(params_blt = OSSL_PARAM_BLD_to_param(bld)))
         goto err;
     switch (tstid) {
@@ -414,7 +414,8 @@ static int builder_limit_test(void)
     if (!TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld)))
         goto err;
     /* Count the elements in the params array, expecting n */
-    for (i = 0; params[i].key != NULL; i++);
+    for (i = 0; params[i].key != NULL; i++)
+        ;
     if (!TEST_int_eq(i, n))
         goto err;
 
@@ -426,7 +427,8 @@ static int builder_limit_test(void)
         || !TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld)))
         goto err;
     /* Count the elements in the params array, expecting 1 */
-    for (i = 0; params[i].key != NULL; i++);
+    for (i = 0; params[i].key != NULL; i++)
+        ;
     if (!TEST_int_eq(i, 1))
         goto err;
     res = 1;
@@ -466,9 +468,9 @@ static int builder_merge_test(void)
 
     if (!TEST_ptr(bld2)
         || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld2, "oct_s", data1,
-                                                       sizeof(data1)))
+            sizeof(data1)))
         || !TEST_true(OSSL_PARAM_BLD_push_octet_ptr(bld2, "oct_p", data2,
-                                                    sizeof(data2)))
+            sizeof(data2)))
         || !TEST_true(OSSL_PARAM_BLD_push_uint32(bld2, "i32", 99))
         || !TEST_ptr(bn_pub = BN_new())
         || !TEST_true(BN_set_word(bn_pub, 0x42))
@@ -554,7 +556,7 @@ int setup_tests(void)
     ADD_ALL_TESTS(template_public_single_zero_test, 2);
     ADD_ALL_TESTS(template_public_test, 5);
     /* Only run the secure memory testing if we have secure memory available */
-    if (CRYPTO_secure_malloc_init(1<<16, 16)) {
+    if (CRYPTO_secure_malloc_init(1 << 16, 16)) {
         ADD_TEST(template_private_single_zero_test);
         ADD_ALL_TESTS(template_private_test, 5);
     }
diff --git a/test/params_api_test.c b/test/params_api_test.c
index 715c2718bb326..4102bb6389c3c 100644
--- a/test/params_api_test.c
+++ b/test/params_api_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2025 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2019, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -35,16 +35,20 @@ static void swap_copy(unsigned char *out, const void *in, size_t len)
  * byte reversal.
  */
 static void le_copy(unsigned char *out, size_t outlen,
-                    const void *in, size_t inlen)
+    const void *in, size_t inlen)
 {
     DECLARE_IS_ENDIAN;
 
     if (IS_LITTLE_ENDIAN) {
         memcpy(out, in, outlen);
     } else {
-        if (outlen < inlen)
+        if (outlen < inlen) {
             in = (const char *)in + inlen - outlen;
-        swap_copy(out, in, outlen);
+            inlen = outlen;
+        }
+        if (!ossl_assert(outlen <= inlen))
+            return;
+        swap_copy(out, in, inlen);
     }
 }
 
@@ -64,10 +68,8 @@ static const struct {
     { 5, { 0xd1, 0x76, 0x01, 0x1b, 0xcd } },
     { 8, { 0x59, 0xb2, 0x1a, 0xe9, 0x2a, 0xd8, 0x46, 0x40 } },
     { 8, { 0xb4, 0xae, 0xbd, 0xb4, 0xdd, 0x04, 0xb1, 0x4c } },
-    { 16, { 0x61, 0xe8, 0x7e, 0x31, 0xe9, 0x33, 0x83, 0x3d,
-            0x87, 0x99, 0xc7, 0xd8, 0x5d, 0xa9, 0x8b, 0x42 } },
-    { 16, { 0xee, 0x6e, 0x8b, 0xc3, 0xec, 0xcf, 0x37, 0xcc,
-            0x89, 0x67, 0xf2, 0x68, 0x33, 0xa0, 0x14, 0xb0 } },
+    { 16, { 0x61, 0xe8, 0x7e, 0x31, 0xe9, 0x33, 0x83, 0x3d, 0x87, 0x99, 0xc7, 0xd8, 0x5d, 0xa9, 0x8b, 0x42 } },
+    { 16, { 0xee, 0x6e, 0x8b, 0xc3, 0xec, 0xcf, 0x37, 0xcc, 0x89, 0x67, 0xf2, 0x68, 0x33, 0xa0, 0x14, 0xb0 } },
 };
 
 static int test_param_type_null(OSSL_PARAM *param)
@@ -77,7 +79,7 @@ static int test_param_type_null(OSSL_PARAM *param)
     double dval;
     BIGNUM *bn;
 
-    switch(param->data_type) {
+    switch (param->data_type) {
     case OSSL_PARAM_INTEGER:
         if (param->data_size == sizeof(int32_t))
             rc = OSSL_PARAM_get_int32(param, (int32_t *)&intval);
@@ -114,7 +116,7 @@ static int test_param_type_null(OSSL_PARAM *param)
 }
 
 static int test_param_type_extra(OSSL_PARAM *param, const unsigned char *cmp,
-                                 size_t width)
+    size_t width)
 {
     int32_t i32;
     int64_t i64;
@@ -135,7 +137,7 @@ static int test_param_type_extra(OSSL_PARAM *param, const unsigned char *cmp,
             return 0;
     } else {
         if ((bit32
-             && !TEST_true(OSSL_PARAM_get_uint32(param, (uint32_t *)&i32)))
+                && !TEST_true(OSSL_PARAM_get_uint32(param, (uint32_t *)&i32)))
             || !TEST_true(OSSL_PARAM_get_uint64(param, (uint64_t *)&i64))
             || (sizet && !TEST_true(OSSL_PARAM_get_size_t(param, &s))))
             return 0;
@@ -196,8 +198,7 @@ static int test_param_int(int n)
 {
     int in, out;
     unsigned char buf[MAX_LEN], cmp[sizeof(int)];
-    const size_t len = raw_values[n].len >= sizeof(int) ?
-                       sizeof(int) : raw_values[n].len;
+    const size_t len = raw_values[n].len >= sizeof(int) ? sizeof(int) : raw_values[n].len;
     OSSL_PARAM param = OSSL_PARAM_int("a", NULL);
 
     if (!TEST_int_eq(test_param_type_null(&param), 1))
@@ -227,7 +228,8 @@ static int test_param_long(int n)
     long int in, out;
     unsigned char buf[MAX_LEN], cmp[sizeof(long int)];
     const size_t len = raw_values[n].len >= sizeof(long int)
-                       ? sizeof(long int) : raw_values[n].len;
+        ? sizeof(long int)
+        : raw_values[n].len;
     OSSL_PARAM param = OSSL_PARAM_long("a", NULL);
 
     if (!TEST_int_eq(test_param_type_null(&param), 1))
@@ -286,7 +288,8 @@ static int test_param_ulong(int n)
     unsigned long int in, out;
     unsigned char buf[MAX_LEN], cmp[sizeof(unsigned long int)];
     const size_t len = raw_values[n].len >= sizeof(unsigned long int)
-                       ? sizeof(unsigned long int) : raw_values[n].len;
+        ? sizeof(unsigned long int)
+        : raw_values[n].len;
     OSSL_PARAM param = OSSL_PARAM_ulong("a", NULL);
 
     if (!TEST_int_eq(test_param_type_null(&param), 1))
@@ -316,7 +319,8 @@ static int test_param_int32(int n)
     int32_t in, out;
     unsigned char buf[MAX_LEN], cmp[sizeof(int32_t)];
     const size_t len = raw_values[n].len >= sizeof(int32_t)
-                       ? sizeof(int32_t) : raw_values[n].len;
+        ? sizeof(int32_t)
+        : raw_values[n].len;
     OSSL_PARAM param = OSSL_PARAM_int32("a", NULL);
 
     if (!TEST_int_eq(test_param_type_null(&param), 1))
@@ -346,7 +350,8 @@ static int test_param_uint32(int n)
     uint32_t in, out;
     unsigned char buf[MAX_LEN], cmp[sizeof(uint32_t)];
     const size_t len = raw_values[n].len >= sizeof(uint32_t)
-                       ? sizeof(uint32_t) : raw_values[n].len;
+        ? sizeof(uint32_t)
+        : raw_values[n].len;
     OSSL_PARAM param = OSSL_PARAM_uint32("a", NULL);
 
     if (!TEST_int_eq(test_param_type_null(&param), 1))
@@ -376,7 +381,8 @@ static int test_param_int64(int n)
     int64_t in, out;
     unsigned char buf[MAX_LEN], cmp[sizeof(int64_t)];
     const size_t len = raw_values[n].len >= sizeof(int64_t)
-                       ? sizeof(int64_t) : raw_values[n].len;
+        ? sizeof(int64_t)
+        : raw_values[n].len;
     OSSL_PARAM param = OSSL_PARAM_int64("a", NULL);
 
     if (!TEST_int_eq(test_param_type_null(&param), 1))
@@ -406,7 +412,8 @@ static int test_param_uint64(int n)
     uint64_t in, out;
     unsigned char buf[MAX_LEN], cmp[sizeof(uint64_t)];
     const size_t len = raw_values[n].len >= sizeof(uint64_t)
-                       ? sizeof(uint64_t) : raw_values[n].len;
+        ? sizeof(uint64_t)
+        : raw_values[n].len;
     OSSL_PARAM param = OSSL_PARAM_uint64("a", NULL);
 
     if (!TEST_int_eq(test_param_type_null(&param), 1))
@@ -436,7 +443,8 @@ static int test_param_size_t(int n)
     size_t in, out;
     unsigned char buf[MAX_LEN], cmp[sizeof(size_t)];
     const size_t len = raw_values[n].len >= sizeof(size_t)
-                       ? sizeof(size_t) : raw_values[n].len;
+        ? sizeof(size_t)
+        : raw_values[n].len;
     OSSL_PARAM param = OSSL_PARAM_size_t("a", NULL);
 
     if (!TEST_int_eq(test_param_type_null(&param), 1))
@@ -466,7 +474,8 @@ static int test_param_time_t(int n)
     time_t in, out;
     unsigned char buf[MAX_LEN], cmp[sizeof(time_t)];
     const size_t len = raw_values[n].len >= sizeof(time_t)
-                       ? sizeof(time_t) : raw_values[n].len;
+        ? sizeof(time_t)
+        : raw_values[n].len;
     OSSL_PARAM param = OSSL_PARAM_time_t("a", NULL);
 
     if (!TEST_int_eq(test_param_type_null(&param), 1))
@@ -497,7 +506,7 @@ static int test_param_bignum(int n)
     const size_t len = raw_values[n].len;
     BIGNUM *b = NULL, *c = NULL;
     OSSL_PARAM param = OSSL_PARAM_DEFN("bn", OSSL_PARAM_UNSIGNED_INTEGER,
-                                       NULL, 0);
+        NULL, 0);
     int ret = 0;
 
     if (!TEST_int_eq(test_param_type_null(&param), 1))
@@ -575,7 +584,7 @@ static int test_param_real(void)
 
     param.data = &p;
     return TEST_true(OSSL_PARAM_set_double(&param, 3.14159))
-           && TEST_double_eq(p, 3.14159);
+        && TEST_double_eq(p, 3.14159);
 }
 
 static int test_param_construct(int tstid)
@@ -706,7 +715,7 @@ static int test_param_construct(int tstid)
     /* OCTET string */
     if (!TEST_ptr(cp = OSSL_PARAM_locate(p, "octstr"))
         || !TEST_true(OSSL_PARAM_set_octet_string(cp, "abcdefghi",
-                                                  sizeof("abcdefghi")))
+            sizeof("abcdefghi")))
         || !TEST_size_t_eq(cp->return_size, sizeof("abcdefghi")))
         goto err;
     /* Match the return size to avoid trailing garbage bytes */
@@ -714,13 +723,13 @@ static int test_param_construct(int tstid)
     if (!TEST_true(OSSL_PARAM_get_octet_string(cp, &vpn, 0, &s))
         || !TEST_size_t_eq(s, sizeof("abcdefghi"))
         || !TEST_mem_eq(vpn, sizeof("abcdefghi"),
-                        "abcdefghi", sizeof("abcdefghi")))
+            "abcdefghi", sizeof("abcdefghi")))
         goto err;
     vp = buf2;
     if (!TEST_true(OSSL_PARAM_get_octet_string(cp, &vp, sizeof(buf2), &s))
         || !TEST_size_t_eq(s, sizeof("abcdefghi"))
         || !TEST_mem_eq(vp, sizeof("abcdefghi"),
-                        "abcdefghi", sizeof("abcdefghi")))
+            "abcdefghi", sizeof("abcdefghi")))
         goto err;
     /* OCTET pointer */
     vp = &l;
@@ -760,26 +769,26 @@ static int test_param_construct(int tstid)
 static int test_param_modified(void)
 {
     OSSL_PARAM param[3] = { OSSL_PARAM_int("a", NULL),
-                            OSSL_PARAM_int("b", NULL),
-                            OSSL_PARAM_END };
+        OSSL_PARAM_int("b", NULL),
+        OSSL_PARAM_END };
     int a, b;
 
     param->data = &a;
     param[1].data = &b;
     if (!TEST_false(OSSL_PARAM_modified(param))
-            && !TEST_true(OSSL_PARAM_set_int32(param, 1234))
-            && !TEST_true(OSSL_PARAM_modified(param))
-            && !TEST_false(OSSL_PARAM_modified(param + 1))
-            && !TEST_true(OSSL_PARAM_set_int32(param + 1, 1))
-            && !TEST_true(OSSL_PARAM_modified(param + 1)))
+        && !TEST_true(OSSL_PARAM_set_int32(param, 1234))
+        && !TEST_true(OSSL_PARAM_modified(param))
+        && !TEST_false(OSSL_PARAM_modified(param + 1))
+        && !TEST_true(OSSL_PARAM_set_int32(param + 1, 1))
+        && !TEST_true(OSSL_PARAM_modified(param + 1)))
         return 0;
     OSSL_PARAM_set_all_unmodified(param);
     if (!TEST_false(OSSL_PARAM_modified(param))
-            && !TEST_true(OSSL_PARAM_set_int32(param, 4321))
-            && !TEST_true(OSSL_PARAM_modified(param))
-            && !TEST_false(OSSL_PARAM_modified(param + 1))
-            && !TEST_true(OSSL_PARAM_set_int32(param + 1, 2))
-            && !TEST_true(OSSL_PARAM_modified(param + 1)))
+        && !TEST_true(OSSL_PARAM_set_int32(param, 4321))
+        && !TEST_true(OSSL_PARAM_modified(param))
+        && !TEST_false(OSSL_PARAM_modified(param + 1))
+        && !TEST_true(OSSL_PARAM_set_int32(param + 1, 2))
+        && !TEST_true(OSSL_PARAM_modified(param + 1)))
         return 0;
     return 1;
 }
@@ -796,25 +805,52 @@ static int test_param_copy_null(void)
     param[i] = OSSL_PARAM_construct_end();
 
     ret = TEST_ptr_null(OSSL_PARAM_dup(NULL))
-          && TEST_ptr(cp1 = OSSL_PARAM_merge(NULL, param))
-          && TEST_ptr(p = OSSL_PARAM_locate(cp1, "a"))
-          && TEST_true(OSSL_PARAM_get_int(p, &val))
-          && TEST_int_eq(val, 1)
-          && TEST_ptr(p = OSSL_PARAM_locate(cp1, "b"))
-          && TEST_true(OSSL_PARAM_get_int(p, &val))
-          && TEST_int_eq(val, 2)
-          && TEST_ptr(cp2 = OSSL_PARAM_merge(param, NULL))
-          && TEST_ptr(p = OSSL_PARAM_locate(cp2, "a"))
-          && TEST_true(OSSL_PARAM_get_int(p, &val))
-          && TEST_int_eq(val, 1)
-          && TEST_ptr(p = OSSL_PARAM_locate(cp2, "b"))
-          && TEST_true(OSSL_PARAM_get_int(p, &val))
-          && TEST_int_eq(val, 2)
-          && TEST_ptr_null(OSSL_PARAM_merge(NULL, NULL));
+        && TEST_ptr(cp1 = OSSL_PARAM_merge(NULL, param))
+        && TEST_ptr(p = OSSL_PARAM_locate(cp1, "a"))
+        && TEST_true(OSSL_PARAM_get_int(p, &val))
+        && TEST_int_eq(val, 1)
+        && TEST_ptr(p = OSSL_PARAM_locate(cp1, "b"))
+        && TEST_true(OSSL_PARAM_get_int(p, &val))
+        && TEST_int_eq(val, 2)
+        && TEST_ptr(cp2 = OSSL_PARAM_merge(param, NULL))
+        && TEST_ptr(p = OSSL_PARAM_locate(cp2, "a"))
+        && TEST_true(OSSL_PARAM_get_int(p, &val))
+        && TEST_int_eq(val, 1)
+        && TEST_ptr(p = OSSL_PARAM_locate(cp2, "b"))
+        && TEST_true(OSSL_PARAM_get_int(p, &val))
+        && TEST_int_eq(val, 2)
+        && TEST_ptr_null(OSSL_PARAM_merge(NULL, NULL));
     OSSL_PARAM_free(cp2);
     OSSL_PARAM_free(cp1);
     return ret;
 }
+static int test_param_merge(void)
+{
+    int val, ret;
+    int values[] = { 1, 2, 3, 4 };
+    OSSL_PARAM *p = NULL, *cp = NULL;
+    OSSL_PARAM param[3], param1[3];
+
+    param[0] = OSSL_PARAM_construct_int("diff1", &values[0]);
+    param[1] = OSSL_PARAM_construct_int("same", &values[1]);
+    param[2] = OSSL_PARAM_construct_end();
+    param1[0] = OSSL_PARAM_construct_int("diff2", &values[2]);
+    param1[1] = OSSL_PARAM_construct_int("same", &values[3]);
+    param1[2] = OSSL_PARAM_construct_end();
+
+    ret = TEST_ptr(p = OSSL_PARAM_merge(param, param1))
+        && TEST_ptr(cp = OSSL_PARAM_locate(p, "diff1"))
+        && TEST_true(OSSL_PARAM_get_int(p, &val))
+        && TEST_int_eq(val, values[0])
+        && TEST_ptr(cp = OSSL_PARAM_locate(p, "diff2"))
+        && TEST_true(OSSL_PARAM_get_int(cp, &val))
+        && TEST_int_eq(val, values[2])
+        && TEST_ptr(cp = OSSL_PARAM_locate(p, "same"))
+        && TEST_true(OSSL_PARAM_get_int(cp, &val))
+        && TEST_int_eq(val, values[3]);
+    OSSL_PARAM_free(p);
+    return ret;
+}
 
 int setup_tests(void)
 {
@@ -834,5 +870,6 @@ int setup_tests(void)
     ADD_ALL_TESTS(test_param_construct, 4);
     ADD_TEST(test_param_modified);
     ADD_TEST(test_param_copy_null);
+    ADD_TEST(test_param_merge);
     return 1;
 }
diff --git a/test/params_conversion_test.c b/test/params_conversion_test.c
index 01a768efd0853..b66b7b5e62a59 100644
--- a/test/params_conversion_test.c
+++ b/test/params_conversion_test.c
@@ -15,10 +15,10 @@
 /* On machines that dont support <inttypes.h> just disable the tests */
 #if !defined(OPENSSL_NO_INTTYPES_H)
 
-# ifdef OPENSSL_SYS_VMS
-#  define strtoumax strtoull
-#  define strtoimax strtoll
-# endif
+#ifdef OPENSSL_SYS_VMS
+#define strtoumax strtoull
+#define strtoimax strtoll
+#endif
 
 typedef struct {
     OSSL_PARAM *param;
@@ -41,8 +41,8 @@ static int param_conversion_load_stanza(PARAM_CONVERSION *pc, const STANZA *s)
     static uint64_t datum_u64, ref_u64;
     static double datum_d, ref_d;
     static OSSL_PARAM params[] = {
-        OSSL_PARAM_int32("int32",   &datum_i32),
-        OSSL_PARAM_int64("int64",   &datum_i64),
+        OSSL_PARAM_int32("int32", &datum_i32),
+        OSSL_PARAM_int64("int64", &datum_i64),
         OSSL_PARAM_uint32("uint32", &datum_u32),
         OSSL_PARAM_uint64("uint64", &datum_u64),
         OSSL_PARAM_double("double", &datum_d),
@@ -119,7 +119,7 @@ static int param_conversion_load_stanza(PARAM_CONVERSION *pc, const STANZA *s)
         }
         if (*p != '\0') {
             TEST_info("Line %d: extra characters at end '%s' for %s",
-                      s->curr, p, pp->key);
+                s->curr, p, pp->key);
             return 0;
         }
     }
@@ -191,7 +191,7 @@ static int param_conversion_test(const PARAM_CONVERSION *pc, int line)
 
     if (!pc->valid_i32) {
         if (!TEST_false(OSSL_PARAM_get_int32(pc->param, &i32))
-                || !TEST_ulong_ne(ERR_get_error(), 0)) {
+            || !TEST_ulong_ne(ERR_get_error(), 0)) {
             TEST_note("unexpected valid conversion to int32 on line %d", line);
             return 0;
         }
@@ -205,14 +205,14 @@ static int param_conversion_test(const PARAM_CONVERSION *pc, int line)
         if (!TEST_true(OSSL_PARAM_set_int32(pc->param, i32))
             || !TEST_mem_eq(pc->datum, pc->size, pc->ref, pc->size)) {
             TEST_note("unexpected valid conversion from int32 on line %d",
-                      line);
+                line);
             return 0;
         }
     }
 
     if (!pc->valid_i64) {
         if (!TEST_false(OSSL_PARAM_get_int64(pc->param, &i64))
-                || !TEST_ulong_ne(ERR_get_error(), 0)) {
+            || !TEST_ulong_ne(ERR_get_error(), 0)) {
             TEST_note("unexpected valid conversion to int64 on line %d", line);
             return 0;
         }
@@ -226,14 +226,14 @@ static int param_conversion_test(const PARAM_CONVERSION *pc, int line)
         if (!TEST_true(OSSL_PARAM_set_int64(pc->param, i64))
             || !TEST_mem_eq(pc->datum, pc->size, pc->ref, pc->size)) {
             TEST_note("unexpected valid conversion from int64 on line %d",
-                      line);
+                line);
             return 0;
         }
     }
 
     if (!pc->valid_u32) {
         if (!TEST_false(OSSL_PARAM_get_uint32(pc->param, &u32))
-                || !TEST_ulong_ne(ERR_get_error(), 0)) {
+            || !TEST_ulong_ne(ERR_get_error(), 0)) {
             TEST_note("unexpected valid conversion to uint32 on line %d", line);
             return 0;
         }
@@ -247,14 +247,14 @@ static int param_conversion_test(const PARAM_CONVERSION *pc, int line)
         if (!TEST_true(OSSL_PARAM_set_uint32(pc->param, u32))
             || !TEST_mem_eq(pc->datum, pc->size, pc->ref, pc->size)) {
             TEST_note("unexpected valid conversion from uint32 on line %d",
-                      line);
+                line);
             return 0;
         }
     }
 
     if (!pc->valid_u64) {
         if (!TEST_false(OSSL_PARAM_get_uint64(pc->param, &u64))
-                || !TEST_ulong_ne(ERR_get_error(), 0)) {
+            || !TEST_ulong_ne(ERR_get_error(), 0)) {
             TEST_note("unexpected valid conversion to uint64 on line %d", line);
             return 0;
         }
@@ -268,14 +268,14 @@ static int param_conversion_test(const PARAM_CONVERSION *pc, int line)
         if (!TEST_true(OSSL_PARAM_set_uint64(pc->param, u64))
             || !TEST_mem_eq(pc->datum, pc->size, pc->ref, pc->size)) {
             TEST_note("unexpected valid conversion from uint64 on line %d",
-                      line);
+                line);
             return 0;
         }
     }
 
     if (!pc->valid_d) {
         if (!TEST_false(OSSL_PARAM_get_double(pc->param, &d))
-                || !TEST_ulong_ne(ERR_get_error(), 0)) {
+            || !TEST_ulong_ne(ERR_get_error(), 0)) {
             TEST_note("unexpected valid conversion to double on line %d", line);
             return 0;
         }
@@ -309,7 +309,7 @@ static int param_conversion_test(const PARAM_CONVERSION *pc, int line)
         if (!TEST_true(OSSL_PARAM_set_double(pc->param, d))
             || !TEST_mem_eq(pc->datum, pc->size, pc->ref, pc->size)) {
             TEST_note("unexpected valid conversion from double on line %d",
-                      line);
+                line);
             return 0;
         }
     }
diff --git a/test/params_test.c b/test/params_test.c
index cd3c836c7ec77..dfb7f6f04d2d6 100644
--- a/test/params_test.c
+++ b/test/params_test.c
@@ -73,17 +73,17 @@ struct object_st {
     size_t p6_l;
 };
 
-#define p1_init 42                              /* The ultimate answer */
-#define p2_init 6.283                           /* Magic number */
+#define p1_init 42 /* The ultimate answer */
+#define p2_init 6.283 /* Magic number */
 /* Stolen from evp_data, BLAKE2s256 test */
-#define p3_init                                 \
-    "4142434445464748494a4b4c4d4e4f50"          \
-    "5152535455565758595a616263646566"          \
-    "6768696a6b6c6d6e6f70717273747576"          \
+#define p3_init                        \
+    "4142434445464748494a4b4c4d4e4f50" \
+    "5152535455565758595a616263646566" \
+    "6768696a6b6c6d6e6f70717273747576" \
     "7778797a30313233343536373839"
-#define p4_init "BLAKE2s256"                    /* Random string */
-#define p5_init "Hellow World"                  /* Random string */
-#define p6_init OPENSSL_FULL_VERSION_STR        /* Static string */
+#define p4_init "BLAKE2s256" /* Random string */
+#define p5_init "Hellow World" /* Random string */ /* codespell:ignore */
+#define p6_init OPENSSL_FULL_VERSION_STR /* Static string */
 
 static void cleanup_object(void *vobj)
 {
@@ -113,7 +113,7 @@ static void *init_object(void)
     obj->p6 = p6_init;
 
     return obj;
- fail:
+fail:
     cleanup_object(obj);
     obj = NULL;
 
@@ -139,12 +139,12 @@ static int raw_set_params(void *vobj, const OSSL_PARAM *params)
         } else if (strcmp(params->key, "p3") == 0) {
             BN_free(obj->p3);
             if (!TEST_ptr(obj->p3 = BN_native2bn(params->data,
-                                                 params->data_size, NULL)))
+                              params->data_size, NULL)))
                 return 0;
         } else if (strcmp(params->key, "p4") == 0) {
             OPENSSL_free(obj->p4);
             if (!TEST_ptr(obj->p4 = OPENSSL_strndup(params->data,
-                                                    params->data_size)))
+                              params->data_size)))
                 return 0;
             obj->p4_l = strlen(obj->p4);
         } else if (strcmp(params->key, "p5") == 0) {
@@ -152,8 +152,7 @@ static int raw_set_params(void *vobj, const OSSL_PARAM *params)
              * Protect obj->p5 against too much data.  This should not
              * happen, we don't use that long strings.
              */
-            size_t data_length =
-                OPENSSL_strnlen(params->data, params->data_size);
+            size_t data_length = OPENSSL_strnlen(params->data, params->data_size);
 
             if (!TEST_size_t_lt(data_length, sizeof(obj->p5)))
                 return 0;
@@ -302,18 +301,18 @@ static const struct provider_dispatch_st provider_api = {
  * they don't understand (the application may have one big bag of
  * parameters).
  */
-static int app_p1;                    /* "p1" */
-static double app_p2;                 /* "p2" is ignored */
-static BIGNUM *app_p3 = NULL;         /* "p3" */
+static int app_p1; /* "p1" */
+static double app_p2; /* "p2" is ignored */
+static BIGNUM *app_p3 = NULL; /* "p3" */
 static unsigned char bignumbin[4096]; /* "p3" */
-static char app_p4[256];              /* "p4" */
-static char app_p5[256];              /* "p5" */
-static const char *app_p6 = NULL;     /* "p6" */
-static unsigned char foo[1];          /* "foo" */
-
-#define app_p1_init 17           /* A random number */
-#define app_p2_init 47.11        /* Another random number */
-#define app_p3_init "deadbeef"   /* Classic */
+static char app_p4[256]; /* "p4" */
+static char app_p5[256]; /* "p5" */
+static const char *app_p6 = NULL; /* "p6" */
+static unsigned char foo[1]; /* "foo" */
+
+#define app_p1_init 17 /* A random number */
+#define app_p2_init 47.11 /* Another random number */
+#define app_p3_init "deadbeef" /* Classic */
 #define app_p4_init "Hello"
 #define app_p5_init "World"
 #define app_p6_init "Cookie"
@@ -369,7 +368,7 @@ static OSSL_PARAM static_api_params[] = {
     OSSL_PARAM_DEFN("p5", OSSL_PARAM_UTF8_STRING, &app_p5, sizeof(app_p5)),
     /* sizeof(app_p6_init), because we know that's what we're using */
     OSSL_PARAM_DEFN("p6", OSSL_PARAM_UTF8_PTR, &app_p6,
-                    sizeof(app_p6_init) - 1),
+        sizeof(app_p6_init) - 1),
     OSSL_PARAM_DEFN("foo", OSSL_PARAM_OCTET_STRING, &foo, sizeof(foo)),
     OSSL_PARAM_END
 };
@@ -386,12 +385,12 @@ static OSSL_PARAM *construct_api_params(void)
     params[n++] = OSSL_PARAM_construct_int("p1", &app_p1);
     params[n++] = OSSL_PARAM_construct_BN("p3", bignumbin, sizeof(bignumbin));
     params[n++] = OSSL_PARAM_construct_utf8_string("p4", app_p4,
-                                                   sizeof(app_p4));
+        sizeof(app_p4));
     params[n++] = OSSL_PARAM_construct_utf8_string("p5", app_p5,
-                                                   sizeof(app_p5));
+        sizeof(app_p5));
     /* sizeof(app_p6_init), because we know that's what we're using */
     params[n++] = OSSL_PARAM_construct_utf8_ptr("p6", (char **)&app_p6,
-                                                sizeof(app_p6_init));
+        sizeof(app_p6_init));
     params[n++] = OSSL_PARAM_construct_octet_string("foo", &foo, sizeof(foo));
     params[n++] = OSSL_PARAM_construct_end();
 
@@ -457,21 +456,21 @@ static int test_case_variant(OSSL_PARAM *params, const struct provider_dispatch_
     init_app_variables();
 
     if (!TEST_true(prov->get_params(obj, params))
-        || !TEST_int_eq(app_p1, p1_init)        /* "provider" value */
+        || !TEST_int_eq(app_p1, p1_init) /* "provider" value */
         || !TEST_double_eq(app_p2, app_p2_init) /* Should remain untouched */
         || !TEST_ptr(p = OSSL_PARAM_locate(params, "p3"))
         || !TEST_ptr(BN_native2bn(bignumbin, p->return_size, app_p3))
-        || !TEST_BN_eq(app_p3, verify_p3)       /* "provider" value */
-        || !TEST_str_eq(app_p4, p4_init)        /* "provider" value */
+        || !TEST_BN_eq(app_p3, verify_p3) /* "provider" value */
+        || !TEST_str_eq(app_p4, p4_init) /* "provider" value */
         || !TEST_ptr(p = OSSL_PARAM_locate(params, "p5"))
         || !TEST_size_t_eq(p->return_size,
-                           sizeof(p5_init) - 1) /* "provider" value */
-        || !TEST_str_eq(app_p5, p5_init)        /* "provider" value */
+            sizeof(p5_init) - 1) /* "provider" value */
+        || !TEST_str_eq(app_p5, p5_init) /* "provider" value */
         || !TEST_ptr(p = OSSL_PARAM_locate(params, "p6"))
         || !TEST_size_t_eq(p->return_size,
-                           sizeof(p6_init) - 1) /* "provider" value */
-        || !TEST_str_eq(app_p6, p6_init)        /* "provider" value */
-        || !TEST_char_eq(foo[0], app_foo_init)  /* Should remain untouched */
+            sizeof(p6_init) - 1) /* "provider" value */
+        || !TEST_str_eq(app_p6, p6_init) /* "provider" value */
+        || !TEST_char_eq(foo[0], app_foo_init) /* Should remain untouched */
         || !TEST_ptr(p = OSSL_PARAM_locate(params, "foo")))
         errcnt++;
 
@@ -486,12 +485,12 @@ static int test_case_variant(OSSL_PARAM *params, const struct provider_dispatch_
     } else {
         struct object_st *sneakpeek = obj;
 
-        if (!TEST_int_eq(sneakpeek->p1, app_p1)         /* app value set */
-            || !TEST_double_eq(sneakpeek->p2, p2_init)  /* Should remain untouched */
-            || !TEST_BN_eq(sneakpeek->p3, app_p3)       /* app value set */
-            || !TEST_str_eq(sneakpeek->p4, app_p4)      /* app value set */
-            || !TEST_str_eq(sneakpeek->p5, app_p5)      /* app value set */
-            || !TEST_str_eq(sneakpeek->p6, app_p6))     /* app value set */
+        if (!TEST_int_eq(sneakpeek->p1, app_p1) /* app value set */
+            || !TEST_double_eq(sneakpeek->p2, p2_init) /* Should remain untouched */
+            || !TEST_BN_eq(sneakpeek->p3, app_p3) /* app value set */
+            || !TEST_str_eq(sneakpeek->p4, app_p4) /* app value set */
+            || !TEST_str_eq(sneakpeek->p5, app_p5) /* app value set */
+            || !TEST_str_eq(sneakpeek->p6, app_p6)) /* app value set */
             errcnt++;
     }
 
@@ -508,25 +507,25 @@ static int test_case_variant(OSSL_PARAM *params, const struct provider_dispatch_
     }
 
     if (!TEST_true(prov->get_params(obj, params))
-        || !TEST_int_eq(app_p1, app_p1_init)    /* app value */
+        || !TEST_int_eq(app_p1, app_p1_init) /* app value */
         || !TEST_double_eq(app_p2, app_p2_init) /* Should remain untouched */
         || !TEST_ptr(p = OSSL_PARAM_locate(params, "p3"))
         || !TEST_ptr(BN_native2bn(bignumbin, p->return_size, app_p3))
-        || !TEST_BN_eq(app_p3, verify_p3)       /* app value */
-        || !TEST_str_eq(app_p4, app_p4_init)    /* app value */
+        || !TEST_BN_eq(app_p3, verify_p3) /* app value */
+        || !TEST_str_eq(app_p4, app_p4_init) /* app value */
         || !TEST_ptr(p = OSSL_PARAM_locate(params, "p5"))
         || !TEST_size_t_eq(p->return_size,
-                           sizeof(app_p5_init) - 1) /* app value */
-        || !TEST_str_eq(app_p5, app_p5_init)    /* app value */
+            sizeof(app_p5_init) - 1) /* app value */
+        || !TEST_str_eq(app_p5, app_p5_init) /* app value */
         || !TEST_ptr(p = OSSL_PARAM_locate(params, "p6"))
         || !TEST_size_t_eq(p->return_size,
-                           sizeof(app_p6_init) - 1) /* app value */
-        || !TEST_str_eq(app_p6, app_p6_init)    /* app value */
-        || !TEST_char_eq(foo[0], app_foo_init)  /* Should remain untouched */
+            sizeof(app_p6_init) - 1) /* app value */
+        || !TEST_str_eq(app_p6, app_p6_init) /* app value */
+        || !TEST_char_eq(foo[0], app_foo_init) /* Should remain untouched */
         || !TEST_ptr(p = OSSL_PARAM_locate(params, "foo")))
         errcnt++;
 
- fin:
+fin:
     BN_free(verify_p3);
     verify_p3 = NULL;
     cleanup_app_variables();
@@ -540,10 +539,10 @@ static int test_case(int i)
     TEST_info("Case: %s", test_cases[i].desc);
 
     return test_case_variant(test_cases[i].app->static_params,
-                             test_cases[i].prov)
+               test_cases[i].prov)
         && (test_cases[i].app->constructed_params == NULL
             || test_case_variant(test_cases[i].app->constructed_params(),
-                                 test_cases[i].prov));
+                test_cases[i].prov));
 }
 
 /*-
@@ -572,45 +571,45 @@ struct int_from_text_test_st {
 };
 
 static struct int_from_text_test_st int_from_text_test_cases[] = {
-    { "int",               "",          0, 0, 0 },
-    { "int",              "0",          0, 1, 4 },
-    { "int",            "101",        101, 1, 4 },
-    { "int",           "-102",       -102, 1, 4 },
-    { "int",            "12A",         12, 1, 4 }, /* incomplete */
-    { "int",          "0x12B",      0x12B, 1, 4 },
-    { "hexint",         "12C",      0x12C, 1, 4 },
-    { "hexint",       "0x12D",          0, 1, 4 }, /* zero */
+    { "int", "", 0, 0, 0 },
+    { "int", "0", 0, 1, 4 },
+    { "int", "101", 101, 1, 4 },
+    { "int", "-102", -102, 1, 4 },
+    { "int", "12A", 12, 1, 4 }, /* incomplete */
+    { "int", "0x12B", 0x12B, 1, 4 },
+    { "hexint", "12C", 0x12C, 1, 4 },
+    { "hexint", "0x12D", 0, 1, 4 }, /* zero */
     /* test check of the target buffer size */
-    { "int",     "0x7fffffff",  INT32_MAX, 1, 4 },
-    { "int",     "2147483647",  INT32_MAX, 1, 4 },
-    { "int",     "2147483648",          0, 0, 0 }, /* too small buffer */
-    { "int",    "-2147483648",  INT32_MIN, 1, 4 },
-    { "int",    "-2147483649",          0, 0, 4 }, /* too small buffer */
-    { "short",       "0x7fff",  INT16_MAX, 1, 2 },
-    { "short",        "32767",  INT16_MAX, 1, 2 },
-    { "short",        "32768",          0, 0, 0 }, /* too small buffer */
-    { "ushort",      "0xffff", UINT16_MAX, 1, 2 },
-    { "ushort",       "65535", UINT16_MAX, 1, 2 },
-    { "ushort",       "65536",          0, 0, 0 }, /* too small buffer */
+    { "int", "0x7fffffff", INT32_MAX, 1, 4 },
+    { "int", "2147483647", INT32_MAX, 1, 4 },
+    { "int", "2147483648", 0, 0, 0 }, /* too small buffer */
+    { "int", "-2147483648", INT32_MIN, 1, 4 },
+    { "int", "-2147483649", 0, 0, 4 }, /* too small buffer */
+    { "short", "0x7fff", INT16_MAX, 1, 2 },
+    { "short", "32767", INT16_MAX, 1, 2 },
+    { "short", "32768", 0, 0, 0 }, /* too small buffer */
+    { "ushort", "0xffff", UINT16_MAX, 1, 2 },
+    { "ushort", "65535", UINT16_MAX, 1, 2 },
+    { "ushort", "65536", 0, 0, 0 }, /* too small buffer */
     /* test check of sign extension in arbitrary size results */
-    { "num",              "0",          0, 1, 1 },
-    { "num",              "0",          0, 1, 1 },
-    { "num",           "0xff",       0xff, 1, 2 }, /* sign extension */
-    { "num",          "-0xff",      -0xff, 1, 2 }, /* sign extension */
-    { "num",           "0x7f",       0x7f, 1, 1 }, /* no sign extension */
-    { "num",          "-0x7f",      -0x7f, 1, 1 }, /* no sign extension */
-    { "num",           "0x80",       0x80, 1, 2 }, /* sign extension */
-    { "num",          "-0x80",      -0x80, 1, 1 }, /* no sign extension */
-    { "num",           "0x81",       0x81, 1, 2 }, /* sign extension */
-    { "num",          "-0x81",      -0x81, 1, 2 }, /* sign extension */
-    { "unum",          "0xff",       0xff, 1, 1 },
-    { "unum",         "-0xff",      -0xff, 0, 0 }, /* invalid neg number */
-    { "unum",          "0x7f",       0x7f, 1, 1 },
-    { "unum",         "-0x7f",      -0x7f, 0, 0 }, /* invalid neg number */
-    { "unum",          "0x80",       0x80, 1, 1 },
-    { "unum",         "-0x80",      -0x80, 0, 0 }, /* invalid neg number */
-    { "unum",          "0x81",       0x81, 1, 1 },
-    { "unum",         "-0x81",      -0x81, 0, 0 }, /* invalid neg number */
+    { "num", "0", 0, 1, 1 },
+    { "num", "0", 0, 1, 1 },
+    { "num", "0xff", 0xff, 1, 2 }, /* sign extension */
+    { "num", "-0xff", -0xff, 1, 2 }, /* sign extension */
+    { "num", "0x7f", 0x7f, 1, 1 }, /* no sign extension */
+    { "num", "-0x7f", -0x7f, 1, 1 }, /* no sign extension */
+    { "num", "0x80", 0x80, 1, 2 }, /* sign extension */
+    { "num", "-0x80", -0x80, 1, 1 }, /* no sign extension */
+    { "num", "0x81", 0x81, 1, 2 }, /* sign extension */
+    { "num", "-0x81", -0x81, 1, 2 }, /* sign extension */
+    { "unum", "0xff", 0xff, 1, 1 },
+    { "unum", "-0xff", -0xff, 0, 0 }, /* invalid neg number */
+    { "unum", "0x7f", 0x7f, 1, 1 },
+    { "unum", "-0x7f", -0x7f, 0, 0 }, /* invalid neg number */
+    { "unum", "0x80", 0x80, 1, 1 },
+    { "unum", "-0x80", -0x80, 0, 0 }, /* invalid neg number */
+    { "unum", "0x81", 0x81, 1, 1 },
+    { "unum", "-0x81", -0x81, 0, 0 }, /* invalid neg number */
 };
 
 static int check_int_from_text(const struct int_from_text_test_st a)
@@ -620,10 +619,10 @@ static int check_int_from_text(const struct int_from_text_test_st a)
     int res;
 
     if (!OSSL_PARAM_allocate_from_text(&param, params_from_text,
-                                       a.argname, a.strval, 0, NULL)) {
+            a.argname, a.strval, 0, NULL)) {
         if (a.expected_res)
             TEST_error("unexpected OSSL_PARAM_allocate_from_text() return for %s \"%s\"",
-                       a.argname, a.strval);
+                a.argname, a.strval);
         return !a.expected_res;
     }
 
@@ -631,7 +630,7 @@ static int check_int_from_text(const struct int_from_text_test_st a)
     if (param.data_size == 0) {
         OPENSSL_free(param.data);
         TEST_error("unexpected zero size for %s \"%s\"",
-                   a.argname, a.strval);
+            a.argname, a.strval);
         return 0;
     }
     res = OSSL_PARAM_get_long(&param, &val);
@@ -639,18 +638,19 @@ static int check_int_from_text(const struct int_from_text_test_st a)
 
     if (res ^ a.expected_res) {
         TEST_error("unexpected OSSL_PARAM_get_long() return for %s \"%s\": "
-                   "%d != %d", a.argname, a.strval, a.expected_res, res);
+                   "%d != %d",
+            a.argname, a.strval, a.expected_res, res);
         return 0;
     }
     if (val != a.expected_intval) {
         TEST_error("unexpected result for %s \"%s\":  %li != %li",
-                   a.argname, a.strval, a.expected_intval, val);
+            a.argname, a.strval, a.expected_intval, val);
         return 0;
     }
     if (param.data_size != a.expected_bufsize) {
         TEST_error("unexpected size for %s \"%s\":  %d != %d",
-                   a.argname, a.strval,
-                   (int)a.expected_bufsize, (int)param.data_size);
+            a.argname, a.strval,
+            (int)a.expected_bufsize, (int)param.data_size);
         return 0;
     }
 
@@ -672,20 +672,18 @@ static int check_octetstr_from_hexstr(void)
         ERR_clear_error();
         memset(&param, 0, sizeof(param));
         if (expected)
-            result =
-                TEST_true(OSSL_PARAM_allocate_from_text(&param,
-                                                        params_from_text,
-                                                        "hexoctets", values[i], 0,
-                                                        NULL));
+            result = TEST_true(OSSL_PARAM_allocate_from_text(&param,
+                params_from_text,
+                "hexoctets", values[i], 0,
+                NULL));
         else
-            result =
-                TEST_false(OSSL_PARAM_allocate_from_text(&param,
-                                                         params_from_text,
-                                                         "hexoctets", values[i], 0,
-                                                         NULL));
+            result = TEST_false(OSSL_PARAM_allocate_from_text(&param,
+                params_from_text,
+                "hexoctets", values[i], 0,
+                NULL));
         if (!result) {
             TEST_error("unexpected OSSL_PARAM_allocate_from_text() %s for 'octets' \"%s\"",
-                       (expected ? "failure" : "success"), values[i]);
+                (expected ? "failure" : "success"), values[i]);
             errcnt++;
         }
         OPENSSL_free(param.data);
diff --git a/test/pbelutest.c b/test/pbelutest.c
index 4039a879c0c52..f6e305f8e2e9b 100644
--- a/test/pbelutest.c
+++ b/test/pbelutest.c
@@ -34,9 +34,9 @@ static int test_pbelu(void)
     /* Error: print out whole table */
     for (i = 0; EVP_PBE_get(&pbe_type, &pbe_nid, i) != 0; i++) {
         failed = pbe_type < last_type
-                 || (pbe_type == last_type && pbe_nid < last_nid);
+            || (pbe_type == last_type && pbe_nid < last_nid);
         TEST_note("PBE type=%d %d (%s): %s\n", pbe_type, pbe_nid,
-                  OBJ_nid2sn(pbe_nid), failed ? "ERROR" : "OK");
+            OBJ_nid2sn(pbe_nid), failed ? "ERROR" : "OK");
         last_type = pbe_type;
         last_nid = pbe_nid;
     }
diff --git a/test/pbetest.c b/test/pbetest.c
index cfffc2b932332..399e3a58f60c4 100644
--- a/test/pbetest.c
+++ b/test/pbetest.c
@@ -23,15 +23,43 @@
 static const char pbe_password[] = "MyVoiceIsMyPassport";
 
 static unsigned char pbe_salt[] = {
-    0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+    0x01,
+    0x02,
+    0x03,
+    0x04,
+    0x05,
+    0x06,
+    0x07,
+    0x08,
 };
 
 static const int pbe_iter = 1000;
 
 static unsigned char pbe_plaintext[] = {
-    0x57, 0x65, 0x20, 0x61, 0x72, 0x65, 0x20, 0x61,
-    0x6c, 0x6c, 0x20, 0x6d, 0x61, 0x64, 0x65, 0x20,
-    0x6f, 0x66, 0x20, 0x73, 0x74, 0x61, 0x72, 0x73,
+    0x57,
+    0x65,
+    0x20,
+    0x61,
+    0x72,
+    0x65,
+    0x20,
+    0x61,
+    0x6c,
+    0x6c,
+    0x20,
+    0x6d,
+    0x61,
+    0x64,
+    0x65,
+    0x20,
+    0x6f,
+    0x66,
+    0x20,
+    0x73,
+    0x74,
+    0x61,
+    0x72,
+    0x73,
 };
 #endif
 
@@ -39,25 +67,74 @@ static unsigned char pbe_plaintext[] = {
 
 #if !defined OPENSSL_NO_RC4 && !defined OPENSSL_NO_MD5
 static const unsigned char pbe_ciphertext_rc4_md5[] = {
-    0x21, 0x90, 0xfa, 0xee, 0x95, 0x66, 0x59, 0x45,
-    0xfa, 0x1e, 0x9f, 0xe2, 0x25, 0xd2, 0xf9, 0x71,
-    0x94, 0xe4, 0x3d, 0xc9, 0x7c, 0xb0, 0x07, 0x23,
+    0x21,
+    0x90,
+    0xfa,
+    0xee,
+    0x95,
+    0x66,
+    0x59,
+    0x45,
+    0xfa,
+    0x1e,
+    0x9f,
+    0xe2,
+    0x25,
+    0xd2,
+    0xf9,
+    0x71,
+    0x94,
+    0xe4,
+    0x3d,
+    0xc9,
+    0x7c,
+    0xb0,
+    0x07,
+    0x23,
 };
 #endif
 
 #if !defined OPENSSL_NO_DES && !defined OPENSSL_NO_SHA1
 static const unsigned char pbe_ciphertext_des_sha1[] = {
-    0xce, 0x4b, 0xb0, 0x0a, 0x7b, 0x48, 0xd7, 0xe3,
-    0x9a, 0x9f, 0x46, 0xd6, 0x41, 0x42, 0x4b, 0x44,
-    0x36, 0x45, 0x5f, 0x60, 0x8f, 0x3c, 0xd0, 0x55,
-    0xd0, 0x8d, 0xa9, 0xab, 0x78, 0x5b, 0x63, 0xaf,
+    0xce,
+    0x4b,
+    0xb0,
+    0x0a,
+    0x7b,
+    0x48,
+    0xd7,
+    0xe3,
+    0x9a,
+    0x9f,
+    0x46,
+    0xd6,
+    0x41,
+    0x42,
+    0x4b,
+    0x44,
+    0x36,
+    0x45,
+    0x5f,
+    0x60,
+    0x8f,
+    0x3c,
+    0xd0,
+    0x55,
+    0xd0,
+    0x8d,
+    0xa9,
+    0xab,
+    0x78,
+    0x5b,
+    0x63,
+    0xaf,
 };
 #endif
 
 #if !defined OPENSSL_NO_RC4 && !defined OPENSSL_NO_MD5 \
     || !defined OPENSSL_NO_DES && !defined OPENSSL_NO_SHA1
 static int test_pkcs5_pbe(const EVP_CIPHER *cipher, const EVP_MD *md,
-                          const unsigned char *exp, const int exp_len)
+    const unsigned char *exp, const int exp_len)
 {
     int ret = 0;
     EVP_CIPHER_CTX *ctx;
@@ -74,11 +151,11 @@ static int test_pkcs5_pbe(const EVP_CIPHER *cipher, const EVP_MD *md,
         goto err;
 
     if (!TEST_true(PKCS5_pbe_set0_algor(algor, EVP_CIPHER_nid(cipher), pbe_iter,
-                                        pbe_salt, sizeof(pbe_salt)))
+            pbe_salt, sizeof(pbe_salt)))
         || !TEST_true(PKCS5_PBE_keyivgen(ctx, pbe_password, strlen(pbe_password),
-                                          algor->parameter, cipher, md, 1))
+            algor->parameter, cipher, md, 1))
         || !TEST_true(EVP_CipherUpdate(ctx, out, &i, pbe_plaintext,
-                                       sizeof(pbe_plaintext))))
+            sizeof(pbe_plaintext))))
         goto err;
     outlen = i;
 
@@ -92,7 +169,7 @@ static int test_pkcs5_pbe(const EVP_CIPHER *cipher, const EVP_MD *md,
     /* Decrypt */
 
     if (!TEST_true(PKCS5_PBE_keyivgen(ctx, pbe_password, strlen(pbe_password),
-                                          algor->parameter, cipher, md, 0))
+            algor->parameter, cipher, md, 0))
         || !TEST_true(EVP_CipherUpdate(ctx, out, &i, exp, exp_len)))
         goto err;
 
diff --git a/test/pem_read_depr_test.c b/test/pem_read_depr_test.c
index aef85f91cfe9b..2aa1f9704f588 100644
--- a/test/pem_read_depr_test.c
+++ b/test/pem_read_depr_test.c
@@ -32,7 +32,7 @@ static BIO *getfile(const char *filename)
         goto err;
     infile = BIO_new_file(paramsfile, "r");
 
- err:
+err:
     OPENSSL_free(paramsfile);
     return infile;
 }
@@ -53,7 +53,7 @@ static int test_read_dh_params(void)
 
     testresult = 1;
 
- err:
+err:
     BIO_free(infile);
     DH_free(dh);
     return testresult;
@@ -74,7 +74,7 @@ static int test_read_dh_x942_params(void)
 
     testresult = 1;
 
- err:
+err:
     BIO_free(infile);
     DH_free(dh);
     return testresult;
@@ -97,7 +97,7 @@ static int test_read_dsa_params(void)
 
     testresult = 1;
 
- err:
+err:
     BIO_free(infile);
     DSA_free(dsa);
     return testresult;
@@ -118,7 +118,7 @@ static int test_read_dsa_private(void)
 
     testresult = 1;
 
- err:
+err:
     BIO_free(infile);
     DSA_free(dsa);
     return testresult;
@@ -139,7 +139,7 @@ static int test_read_dsa_public(void)
 
     testresult = 1;
 
- err:
+err:
     BIO_free(infile);
     DSA_free(dsa);
     return testresult;
@@ -161,7 +161,7 @@ static int test_read_rsa_private(void)
 
     testresult = 1;
 
- err:
+err:
     BIO_free(infile);
     RSA_free(rsa);
     return testresult;
@@ -182,7 +182,7 @@ static int test_read_rsa_public(void)
 
     testresult = 1;
 
- err:
+err:
     BIO_free(infile);
     RSA_free(rsa);
     return testresult;
diff --git a/test/pemtest.c b/test/pemtest.c
index bf97098365443..fdfd38c01ba85 100644
--- a/test/pemtest.c
+++ b/test/pemtest.c
@@ -21,9 +21,9 @@ typedef struct {
 
 static TESTDATA b64_pem_data[] = {
     { "hello world",
-      "aGVsbG8gd29ybGQ=" },
+        "aGVsbG8gd29ybGQ=" },
     { "a very ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong input",
-      "YSB2ZXJ5IG9vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZyBpbnB1dA==" }
+        "YSB2ZXJ5IG9vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZyBpbnB1dA==" }
 };
 
 static const char *pemtype = "PEMTESTDATA";
@@ -45,14 +45,14 @@ static int test_b64(int idx)
         || !TEST_true(BIO_printf(b, "%s\n", encoded))
         || !TEST_true(BIO_printf(b, "-----END %s-----\n", pemtype))
         || !TEST_true(PEM_read_bio_ex(b, &name, &header, &data, &len,
-                                      PEM_FLAG_ONLY_B64)))
+            PEM_FLAG_ONLY_B64)))
         goto err;
     if (!TEST_int_eq(memcmp(pemtype, name, strlen(pemtype)), 0)
         || !TEST_int_eq(len, strlen(raw))
         || !TEST_int_eq(memcmp(data, raw, strlen(raw)), 0))
         goto err;
     ret = 1;
- err:
+err:
     BIO_free(b);
     OPENSSL_free(name);
     OPENSSL_free(header);
@@ -74,7 +74,7 @@ static int test_invalid(void)
         || !TEST_true(BIO_printf(b, "-----END %s-----\n", pemtype))
         /* Expected to fail due to non-base64 character */
         || TEST_true(PEM_read_bio_ex(b, &name, &header, &data, &len,
-                                     PEM_FLAG_ONLY_B64))) {
+            PEM_FLAG_ONLY_B64))) {
         BIO_free(b);
         return 0;
     }
@@ -99,10 +99,9 @@ static int test_cert_key_cert(void)
 static int test_empty_payload(void)
 {
     BIO *b;
-    static char *emptypay =
-        "-----BEGIN CERTIFICATE-----\n"
-        "-\n" /* Base64 EOF character */
-        "-----END CERTIFICATE-----";
+    static char *emptypay = "-----BEGIN CERTIFICATE-----\n"
+                            "-\n" /* Base64 EOF character */
+                            "-----END CERTIFICATE-----";
     char *name = NULL, *header = NULL;
     unsigned char *data = NULL;
     long len;
@@ -117,7 +116,7 @@ static int test_empty_payload(void)
         goto err;
 
     ret = 1;
- err:
+err:
     OPENSSL_free(name);
     OPENSSL_free(header);
     OPENSSL_free(data);
@@ -128,13 +127,12 @@ static int test_empty_payload(void)
 static int test_protected_params(void)
 {
     BIO *b;
-    static char *protectedpay =
-        "-----BEGIN RSA PRIVATE KEY-----\n"
-        "Proc-Type: 4,ENCRYPTED\n"
-        "DEK-Info: AES-256-CBC,4A44448ED28992710556549B35100CEA\n"
-        "\n"
-        "Xw3INxKeH+rUUF57mjATpvj6zknVhedwrlRmRvnwlLv5wqIy5Ae4UVLPh7SUswfC\n"
-        "-----END RSA PRIVATE KEY-----\n";
+    static char *protectedpay = "-----BEGIN RSA PRIVATE KEY-----\n"
+                                "Proc-Type: 4,ENCRYPTED\n"
+                                "DEK-Info: AES-256-CBC,4A44448ED28992710556549B35100CEA\n"
+                                "\n"
+                                "Xw3INxKeH+rUUF57mjATpvj6zknVhedwrlRmRvnwlLv5wqIy5Ae4UVLPh7SUswfC\n"
+                                "-----END RSA PRIVATE KEY-----\n";
     EVP_PKEY *pkey = NULL;
     int ret = 0;
 
@@ -148,7 +146,7 @@ static int test_protected_params(void)
         goto err;
 
     ret = 1;
- err:
+err:
     EVP_PKEY_free(pkey);
     BIO_free(b);
     return ret;
diff --git a/test/pkcs12_api_test.c b/test/pkcs12_api_test.c
index 5afef5a16ad3a..b013818f0bf3f 100644
--- a/test/pkcs12_api_test.c
+++ b/test/pkcs12_api_test.c
@@ -136,7 +136,7 @@ static int pkcs12_parse_test(void)
 
 static int pkcs12_create_cb(PKCS12_SAFEBAG *bag, void *cbarg)
 {
-    int cb_ret = *((int*)cbarg);
+    int cb_ret = *((int *)cbarg);
     return cb_ret;
 }
 
@@ -171,10 +171,10 @@ static int pkcs12_create_ex2_test(int test)
     if (test == 0) {
         /* Confirm PKCS12_create_ex2 returns NULL */
         ptr = PKCS12_create_ex2(NULL, NULL, NULL,
-                                NULL, NULL, NID_undef, NID_undef,
-                                0, 0, 0,
-                                testctx, NULL,
-                                NULL, NULL);
+            NULL, NULL, NID_undef, NID_undef,
+            0, 0, 0,
+            testctx, NULL,
+            NULL, NULL);
         if (TEST_ptr(ptr))
             goto err;
 
@@ -185,10 +185,10 @@ static int pkcs12_create_ex2_test(int test)
         /* Specified call back called - return success */
         cb_ret = 1;
         ptr = PKCS12_create_ex2(NULL, NULL, NULL,
-                                cert, NULL, NID_undef, NID_undef,
-                                0, 0, 0,
-                                testctx, NULL,
-                                pkcs12_create_cb, (void*)&cb_ret);
+            cert, NULL, NID_undef, NID_undef,
+            0, 0, 0,
+            testctx, NULL,
+            pkcs12_create_cb, (void *)&cb_ret);
         /* PKCS12 successfully created */
         if (!TEST_ptr(ptr))
             goto err;
@@ -196,21 +196,21 @@ static int pkcs12_create_ex2_test(int test)
         /* Specified call back called - return error*/
         cb_ret = -1;
         ptr = PKCS12_create_ex2(NULL, NULL, NULL,
-                                cert, NULL, NID_undef, NID_undef,
-                                0, 0, 0,
-                                testctx, NULL,
-                                pkcs12_create_cb, (void*)&cb_ret);
+            cert, NULL, NID_undef, NID_undef,
+            0, 0, 0,
+            testctx, NULL,
+            pkcs12_create_cb, (void *)&cb_ret);
         /* PKCS12 not created */
-       if (TEST_ptr(ptr))
+        if (TEST_ptr(ptr))
             goto err;
     } else if (test == 2) {
         /* Specified call back called - return failure */
         cb_ret = 0;
         ptr = PKCS12_create_ex2(NULL, NULL, NULL,
-                                cert, NULL, NID_undef, NID_undef,
-                                0, 0, 0,
-                                testctx, NULL,
-                                pkcs12_create_cb, (void*)&cb_ret);
+            cert, NULL, NID_undef, NID_undef,
+            0, 0, 0,
+            testctx, NULL,
+            pkcs12_create_cb, (void *)&cb_ret);
         /* PKCS12 successfully created */
         if (!TEST_ptr(ptr))
             goto err;
@@ -242,12 +242,12 @@ const OPTIONS *test_get_options(void)
 {
     static const OPTIONS options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
-        { "in",   OPT_IN_FILE,   '<', "PKCS12 input file" },
-        { "pass",   OPT_IN_PASS,   's', "PKCS12 input file password" },
-        { "has-key",   OPT_IN_HAS_KEY,  'n', "Whether the input file does contain an user key" },
-        { "has-cert",   OPT_IN_HAS_CERT, 'n', "Whether the input file does contain an user certificate" },
-        { "has-ca",   OPT_IN_HAS_CA,   'n', "Whether the input file does contain other certificate" },
-        { "legacy",  OPT_LEGACY,  '-', "Test the legacy APIs" },
+        { "in", OPT_IN_FILE, '<', "PKCS12 input file" },
+        { "pass", OPT_IN_PASS, 's', "PKCS12 input file password" },
+        { "has-key", OPT_IN_HAS_KEY, 'n', "Whether the input file does contain an user key" },
+        { "has-cert", OPT_IN_HAS_CERT, 'n', "Whether the input file does contain an user certificate" },
+        { "has-ca", OPT_IN_HAS_CA, 'n', "Whether the input file does contain other certificate" },
+        { "legacy", OPT_LEGACY, '-', "Test the legacy APIs" },
         { NULL }
     };
     return options;
diff --git a/test/pkcs12_format_test.c b/test/pkcs12_format_test.c
index ccc951c75b3a4..7d6ebd6e2236f 100644
--- a/test/pkcs12_format_test.c
+++ b/test/pkcs12_format_test.c
@@ -31,160 +31,2228 @@ static OSSL_PROVIDER *lgcyprov = NULL;
  */
 
 static const unsigned char CERT1[] = {
-    0x30, 0x82, 0x01, 0xed, 0x30, 0x82, 0x01, 0x56, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x09, 0x00,
-    0x8b, 0x4b, 0x5e, 0x6c, 0x03, 0x28, 0x4e, 0xe6, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,
-    0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x19, 0x31, 0x17, 0x30, 0x15, 0x06, 0x03, 0x55,
-    0x04, 0x03, 0x0c, 0x0e, 0x50, 0x31, 0x32, 0x54, 0x65, 0x73, 0x74, 0x2d, 0x52, 0x6f, 0x6f, 0x74,
-    0x2d, 0x41, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x39, 0x30, 0x39, 0x33, 0x30, 0x30, 0x30, 0x34, 0x36,
-    0x35, 0x36, 0x5a, 0x17, 0x0d, 0x32, 0x39, 0x30, 0x39, 0x32, 0x37, 0x30, 0x30, 0x34, 0x36, 0x35,
-    0x36, 0x5a, 0x30, 0x1b, 0x31, 0x19, 0x30, 0x17, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x10, 0x50,
-    0x31, 0x32, 0x54, 0x65, 0x73, 0x74, 0x2d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2d, 0x31, 0x30,
-    0x81, 0x9f, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
-    0x00, 0x03, 0x81, 0x8d, 0x00, 0x30, 0x81, 0x89, 0x02, 0x81, 0x81, 0x00, 0xbc, 0xdc, 0x6f, 0x8c,
-    0x7a, 0x2a, 0x4b, 0xea, 0x66, 0x66, 0x04, 0xa9, 0x05, 0x92, 0x53, 0xd7, 0x13, 0x3c, 0x49, 0xe1,
-    0xc8, 0xbb, 0xdf, 0x3d, 0xcb, 0x88, 0x31, 0x07, 0x20, 0x59, 0x93, 0x24, 0x7f, 0x7d, 0xc6, 0x84,
-    0x81, 0x16, 0x64, 0x4a, 0x52, 0xa6, 0x30, 0x44, 0xdc, 0x1a, 0x30, 0xde, 0xae, 0x29, 0x18, 0xcf,
-    0xc7, 0xf3, 0xcf, 0x0c, 0xb7, 0x8e, 0x2b, 0x1e, 0x21, 0x01, 0x0b, 0xfb, 0xe5, 0xe6, 0xcf, 0x2b,
-    0x84, 0xe1, 0x33, 0xf8, 0xba, 0x02, 0xfc, 0x30, 0xfa, 0xc4, 0x33, 0xc7, 0x37, 0xc6, 0x7f, 0x72,
-    0x31, 0x92, 0x1d, 0x8f, 0xa0, 0xfb, 0xe5, 0x4a, 0x08, 0x31, 0x78, 0x80, 0x9c, 0x23, 0xb4, 0xe9,
-    0x19, 0x56, 0x04, 0xfa, 0x0d, 0x07, 0x04, 0xb7, 0x43, 0xac, 0x4c, 0x49, 0x7c, 0xc2, 0xa1, 0x44,
-    0xc1, 0x48, 0x7d, 0x28, 0xe5, 0x23, 0x66, 0x07, 0x22, 0xd5, 0xf0, 0xf1, 0x02, 0x03, 0x01, 0x00,
-    0x01, 0xa3, 0x3b, 0x30, 0x39, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16,
-    0x80, 0x14, 0xdb, 0xbb, 0xb8, 0x92, 0x4e, 0x24, 0x0b, 0x1b, 0xbb, 0x78, 0x33, 0xf9, 0x01, 0x02,
-    0x23, 0x0d, 0x96, 0x18, 0x30, 0x47, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x04, 0x02, 0x30,
-    0x00, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02, 0x04, 0xf0, 0x30, 0x0d,
-    0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x81, 0x81,
-    0x00, 0x1c, 0x13, 0xdc, 0x02, 0xf1, 0x44, 0x36, 0x65, 0xa9, 0xbe, 0x30, 0x1c, 0x66, 0x14, 0x20,
-    0x86, 0x5a, 0xa8, 0x69, 0x25, 0xf8, 0x1a, 0xb6, 0x9e, 0x5e, 0xe9, 0x89, 0xb8, 0x67, 0x70, 0x19,
-    0x87, 0x60, 0xeb, 0x4b, 0x11, 0x71, 0x85, 0xf8, 0xe9, 0xa7, 0x3e, 0x20, 0x42, 0xec, 0x43, 0x25,
-    0x01, 0x03, 0xe5, 0x4d, 0x83, 0x22, 0xf5, 0x8e, 0x3a, 0x1a, 0x1b, 0xd4, 0x1c, 0xda, 0x6b, 0x9d,
-    0x10, 0x1b, 0xee, 0x67, 0x4e, 0x1f, 0x69, 0xab, 0xbc, 0xaa, 0x62, 0x8e, 0x9e, 0xc6, 0xee, 0xd6,
-    0x09, 0xc0, 0xca, 0xe0, 0xaa, 0x9f, 0x07, 0xb2, 0xc2, 0xbb, 0x31, 0x96, 0xa2, 0x04, 0x62, 0xd3,
-    0x13, 0x32, 0x29, 0x67, 0x6e, 0xad, 0x2e, 0x0b, 0xea, 0x04, 0x7c, 0x8c, 0x5a, 0x5d, 0xac, 0x14,
-    0xaa, 0x61, 0x7f, 0x28, 0x6c, 0x2d, 0x64, 0x2d, 0xc3, 0xaf, 0x77, 0x52, 0x90, 0xb4, 0x37, 0xc0,
+    0x30,
+    0x82,
+    0x01,
+    0xed,
+    0x30,
+    0x82,
+    0x01,
+    0x56,
+    0xa0,
+    0x03,
+    0x02,
+    0x01,
+    0x02,
+    0x02,
+    0x09,
+    0x00,
+    0x8b,
+    0x4b,
+    0x5e,
+    0x6c,
+    0x03,
+    0x28,
+    0x4e,
+    0xe6,
+    0x30,
+    0x0d,
+    0x06,
+    0x09,
+    0x2a,
+    0x86,
+    0x48,
+    0x86,
+    0xf7,
+    0x0d,
+    0x01,
+    0x01,
+    0x0b,
+    0x05,
+    0x00,
+    0x30,
+    0x19,
+    0x31,
+    0x17,
+    0x30,
+    0x15,
+    0x06,
+    0x03,
+    0x55,
+    0x04,
+    0x03,
+    0x0c,
+    0x0e,
+    0x50,
+    0x31,
+    0x32,
+    0x54,
+    0x65,
+    0x73,
+    0x74,
+    0x2d,
+    0x52,
+    0x6f,
+    0x6f,
+    0x74,
+    0x2d,
+    0x41,
+    0x30,
+    0x1e,
+    0x17,
+    0x0d,
+    0x31,
+    0x39,
+    0x30,
+    0x39,
+    0x33,
+    0x30,
+    0x30,
+    0x30,
+    0x34,
+    0x36,
+    0x35,
+    0x36,
+    0x5a,
+    0x17,
+    0x0d,
+    0x32,
+    0x39,
+    0x30,
+    0x39,
+    0x32,
+    0x37,
+    0x30,
+    0x30,
+    0x34,
+    0x36,
+    0x35,
+    0x36,
+    0x5a,
+    0x30,
+    0x1b,
+    0x31,
+    0x19,
+    0x30,
+    0x17,
+    0x06,
+    0x03,
+    0x55,
+    0x04,
+    0x03,
+    0x0c,
+    0x10,
+    0x50,
+    0x31,
+    0x32,
+    0x54,
+    0x65,
+    0x73,
+    0x74,
+    0x2d,
+    0x53,
+    0x65,
+    0x72,
+    0x76,
+    0x65,
+    0x72,
+    0x2d,
+    0x31,
+    0x30,
+    0x81,
+    0x9f,
+    0x30,
+    0x0d,
+    0x06,
+    0x09,
+    0x2a,
+    0x86,
+    0x48,
+    0x86,
+    0xf7,
+    0x0d,
+    0x01,
+    0x01,
+    0x01,
+    0x05,
+    0x00,
+    0x03,
+    0x81,
+    0x8d,
+    0x00,
+    0x30,
+    0x81,
+    0x89,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xbc,
+    0xdc,
+    0x6f,
+    0x8c,
+    0x7a,
+    0x2a,
+    0x4b,
+    0xea,
+    0x66,
+    0x66,
+    0x04,
+    0xa9,
+    0x05,
+    0x92,
+    0x53,
+    0xd7,
+    0x13,
+    0x3c,
+    0x49,
+    0xe1,
+    0xc8,
+    0xbb,
+    0xdf,
+    0x3d,
+    0xcb,
+    0x88,
+    0x31,
+    0x07,
+    0x20,
+    0x59,
+    0x93,
+    0x24,
+    0x7f,
+    0x7d,
+    0xc6,
+    0x84,
+    0x81,
+    0x16,
+    0x64,
+    0x4a,
+    0x52,
+    0xa6,
+    0x30,
+    0x44,
+    0xdc,
+    0x1a,
+    0x30,
+    0xde,
+    0xae,
+    0x29,
+    0x18,
+    0xcf,
+    0xc7,
+    0xf3,
+    0xcf,
+    0x0c,
+    0xb7,
+    0x8e,
+    0x2b,
+    0x1e,
+    0x21,
+    0x01,
+    0x0b,
+    0xfb,
+    0xe5,
+    0xe6,
+    0xcf,
+    0x2b,
+    0x84,
+    0xe1,
+    0x33,
+    0xf8,
+    0xba,
+    0x02,
+    0xfc,
+    0x30,
+    0xfa,
+    0xc4,
+    0x33,
+    0xc7,
+    0x37,
+    0xc6,
+    0x7f,
+    0x72,
+    0x31,
+    0x92,
+    0x1d,
+    0x8f,
+    0xa0,
+    0xfb,
+    0xe5,
+    0x4a,
+    0x08,
+    0x31,
+    0x78,
+    0x80,
+    0x9c,
+    0x23,
+    0xb4,
+    0xe9,
+    0x19,
+    0x56,
+    0x04,
+    0xfa,
+    0x0d,
+    0x07,
+    0x04,
+    0xb7,
+    0x43,
+    0xac,
+    0x4c,
+    0x49,
+    0x7c,
+    0xc2,
+    0xa1,
+    0x44,
+    0xc1,
+    0x48,
+    0x7d,
+    0x28,
+    0xe5,
+    0x23,
+    0x66,
+    0x07,
+    0x22,
+    0xd5,
+    0xf0,
+    0xf1,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0xa3,
+    0x3b,
+    0x30,
+    0x39,
+    0x30,
+    0x1f,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x23,
+    0x04,
+    0x18,
+    0x30,
+    0x16,
+    0x80,
+    0x14,
+    0xdb,
+    0xbb,
+    0xb8,
+    0x92,
+    0x4e,
+    0x24,
+    0x0b,
+    0x1b,
+    0xbb,
+    0x78,
+    0x33,
+    0xf9,
+    0x01,
+    0x02,
+    0x23,
+    0x0d,
+    0x96,
+    0x18,
+    0x30,
+    0x47,
+    0x30,
+    0x09,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x13,
+    0x04,
+    0x02,
+    0x30,
+    0x00,
+    0x30,
+    0x0b,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x0f,
+    0x04,
+    0x04,
+    0x03,
+    0x02,
+    0x04,
+    0xf0,
+    0x30,
+    0x0d,
+    0x06,
+    0x09,
+    0x2a,
+    0x86,
+    0x48,
+    0x86,
+    0xf7,
+    0x0d,
+    0x01,
+    0x01,
+    0x0b,
+    0x05,
+    0x00,
+    0x03,
+    0x81,
+    0x81,
+    0x00,
+    0x1c,
+    0x13,
+    0xdc,
+    0x02,
+    0xf1,
+    0x44,
+    0x36,
+    0x65,
+    0xa9,
+    0xbe,
+    0x30,
+    0x1c,
+    0x66,
+    0x14,
+    0x20,
+    0x86,
+    0x5a,
+    0xa8,
+    0x69,
+    0x25,
+    0xf8,
+    0x1a,
+    0xb6,
+    0x9e,
+    0x5e,
+    0xe9,
+    0x89,
+    0xb8,
+    0x67,
+    0x70,
+    0x19,
+    0x87,
+    0x60,
+    0xeb,
+    0x4b,
+    0x11,
+    0x71,
+    0x85,
+    0xf8,
+    0xe9,
+    0xa7,
+    0x3e,
+    0x20,
+    0x42,
+    0xec,
+    0x43,
+    0x25,
+    0x01,
+    0x03,
+    0xe5,
+    0x4d,
+    0x83,
+    0x22,
+    0xf5,
+    0x8e,
+    0x3a,
+    0x1a,
+    0x1b,
+    0xd4,
+    0x1c,
+    0xda,
+    0x6b,
+    0x9d,
+    0x10,
+    0x1b,
+    0xee,
+    0x67,
+    0x4e,
+    0x1f,
+    0x69,
+    0xab,
+    0xbc,
+    0xaa,
+    0x62,
+    0x8e,
+    0x9e,
+    0xc6,
+    0xee,
+    0xd6,
+    0x09,
+    0xc0,
+    0xca,
+    0xe0,
+    0xaa,
+    0x9f,
+    0x07,
+    0xb2,
+    0xc2,
+    0xbb,
+    0x31,
+    0x96,
+    0xa2,
+    0x04,
+    0x62,
+    0xd3,
+    0x13,
+    0x32,
+    0x29,
+    0x67,
+    0x6e,
+    0xad,
+    0x2e,
+    0x0b,
+    0xea,
+    0x04,
+    0x7c,
+    0x8c,
+    0x5a,
+    0x5d,
+    0xac,
+    0x14,
+    0xaa,
+    0x61,
+    0x7f,
+    0x28,
+    0x6c,
+    0x2d,
+    0x64,
+    0x2d,
+    0xc3,
+    0xaf,
+    0x77,
+    0x52,
+    0x90,
+    0xb4,
+    0x37,
+    0xc0,
     0x30,
 };
 
 static const unsigned char CERT2[] = {
-    0x30, 0x82, 0x01, 0xed, 0x30, 0x82, 0x01, 0x56, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x09, 0x00,
-    0x8b, 0x4b, 0x5e, 0x6c, 0x03, 0x28, 0x4e, 0xe7, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86,
-    0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x19, 0x31, 0x17, 0x30, 0x15, 0x06, 0x03, 0x55,
-    0x04, 0x03, 0x0c, 0x0e, 0x50, 0x31, 0x32, 0x54, 0x65, 0x73, 0x74, 0x2d, 0x52, 0x6f, 0x6f, 0x74,
-    0x2d, 0x41, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x39, 0x30, 0x39, 0x33, 0x30, 0x30, 0x30, 0x34, 0x36,
-    0x35, 0x36, 0x5a, 0x17, 0x0d, 0x32, 0x39, 0x30, 0x39, 0x32, 0x37, 0x30, 0x30, 0x34, 0x36, 0x35,
-    0x36, 0x5a, 0x30, 0x1b, 0x31, 0x19, 0x30, 0x17, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x10, 0x50,
-    0x31, 0x32, 0x54, 0x65, 0x73, 0x74, 0x2d, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2d, 0x31, 0x30,
-    0x81, 0x9f, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
-    0x00, 0x03, 0x81, 0x8d, 0x00, 0x30, 0x81, 0x89, 0x02, 0x81, 0x81, 0x00, 0xa8, 0x6e, 0x40, 0x86,
-    0x9f, 0x98, 0x59, 0xfb, 0x57, 0xbf, 0xc1, 0x55, 0x12, 0x38, 0xeb, 0xb3, 0x46, 0x34, 0xc9, 0x35,
-    0x4d, 0xfd, 0x03, 0xe9, 0x3a, 0x88, 0x9e, 0x97, 0x8f, 0xf4, 0xec, 0x36, 0x7b, 0x3f, 0xba, 0xb8,
-    0xa5, 0x96, 0x30, 0x03, 0xc5, 0xc6, 0xd9, 0xa8, 0x4e, 0xbc, 0x23, 0x51, 0xa1, 0x96, 0xd2, 0x03,
-    0x98, 0x73, 0xb6, 0x17, 0x9c, 0x77, 0xd4, 0x95, 0x1e, 0x1b, 0xb3, 0x1b, 0xc8, 0x71, 0xd1, 0x2e,
-    0x31, 0xc7, 0x6a, 0x75, 0x57, 0x08, 0x7f, 0xba, 0x70, 0x76, 0xf7, 0x67, 0xf4, 0x4e, 0xbe, 0xfc,
-    0x70, 0x61, 0x41, 0x07, 0x2b, 0x7c, 0x3c, 0x3b, 0xb3, 0xbc, 0xd5, 0xa8, 0xbd, 0x28, 0xd8, 0x49,
-    0xd3, 0xe1, 0x78, 0xc8, 0xc1, 0x42, 0x5e, 0x18, 0x36, 0xa8, 0x41, 0xf7, 0xc8, 0xaa, 0x35, 0xfe,
-    0x2d, 0xd1, 0xb4, 0xcc, 0x00, 0x67, 0xae, 0x79, 0xd3, 0x28, 0xd5, 0x5b, 0x02, 0x03, 0x01, 0x00,
-    0x01, 0xa3, 0x3b, 0x30, 0x39, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16,
-    0x80, 0x14, 0xdb, 0xbb, 0xb8, 0x92, 0x4e, 0x24, 0x0b, 0x1b, 0xbb, 0x78, 0x33, 0xf9, 0x01, 0x02,
-    0x23, 0x0d, 0x96, 0x18, 0x30, 0x47, 0x30, 0x09, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x04, 0x02, 0x30,
-    0x00, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02, 0x04, 0xf0, 0x30, 0x0d,
-    0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x81, 0x81,
-    0x00, 0x3b, 0xa6, 0x73, 0xbe, 0xe0, 0x28, 0xed, 0x1f, 0x29, 0x78, 0x4c, 0xc0, 0x1f, 0xe9, 0x85,
-    0xc6, 0x8f, 0xe3, 0x87, 0x7c, 0xd9, 0xe7, 0x0a, 0x37, 0xe8, 0xaa, 0xb5, 0xd2, 0x7f, 0xf8, 0x90,
-    0x20, 0x80, 0x35, 0xa7, 0x79, 0x2b, 0x04, 0xa7, 0xbf, 0xe6, 0x7b, 0x58, 0xcb, 0xec, 0x0e, 0x58,
-    0xef, 0x2a, 0x70, 0x8a, 0x56, 0x8a, 0xcf, 0x6b, 0x7a, 0x74, 0x0c, 0xf4, 0x15, 0x37, 0x93, 0xcd,
-    0xe6, 0xb2, 0xa1, 0x83, 0x09, 0xdb, 0x9e, 0x4f, 0xff, 0x6a, 0x17, 0x4f, 0x33, 0xc9, 0xcc, 0x90,
-    0x2a, 0x67, 0xff, 0x16, 0x78, 0xa8, 0x2c, 0x10, 0xe0, 0x52, 0x8c, 0xe6, 0xe9, 0x90, 0x8d, 0xe0,
-    0x62, 0x04, 0x9a, 0x0f, 0x44, 0x01, 0x82, 0x14, 0x92, 0x44, 0x25, 0x69, 0x22, 0xb7, 0xb8, 0xc5,
-    0x94, 0x4c, 0x4b, 0x1c, 0x9b, 0x92, 0x60, 0x66, 0x90, 0x4e, 0xb9, 0xa8, 0x4c, 0x89, 0xbb, 0x0f,
+    0x30,
+    0x82,
+    0x01,
+    0xed,
+    0x30,
+    0x82,
+    0x01,
+    0x56,
+    0xa0,
+    0x03,
+    0x02,
+    0x01,
+    0x02,
+    0x02,
+    0x09,
+    0x00,
+    0x8b,
+    0x4b,
+    0x5e,
+    0x6c,
+    0x03,
+    0x28,
+    0x4e,
+    0xe7,
+    0x30,
+    0x0d,
+    0x06,
+    0x09,
+    0x2a,
+    0x86,
+    0x48,
+    0x86,
+    0xf7,
+    0x0d,
+    0x01,
+    0x01,
+    0x0b,
+    0x05,
+    0x00,
+    0x30,
+    0x19,
+    0x31,
+    0x17,
+    0x30,
+    0x15,
+    0x06,
+    0x03,
+    0x55,
+    0x04,
+    0x03,
+    0x0c,
+    0x0e,
+    0x50,
+    0x31,
+    0x32,
+    0x54,
+    0x65,
+    0x73,
+    0x74,
+    0x2d,
+    0x52,
+    0x6f,
+    0x6f,
+    0x74,
+    0x2d,
+    0x41,
+    0x30,
+    0x1e,
+    0x17,
+    0x0d,
+    0x31,
+    0x39,
+    0x30,
+    0x39,
+    0x33,
+    0x30,
+    0x30,
+    0x30,
+    0x34,
+    0x36,
+    0x35,
+    0x36,
+    0x5a,
+    0x17,
+    0x0d,
+    0x32,
+    0x39,
+    0x30,
+    0x39,
+    0x32,
+    0x37,
+    0x30,
+    0x30,
+    0x34,
+    0x36,
+    0x35,
+    0x36,
+    0x5a,
+    0x30,
+    0x1b,
+    0x31,
+    0x19,
+    0x30,
+    0x17,
+    0x06,
+    0x03,
+    0x55,
+    0x04,
+    0x03,
+    0x0c,
+    0x10,
+    0x50,
+    0x31,
+    0x32,
+    0x54,
+    0x65,
+    0x73,
+    0x74,
+    0x2d,
+    0x43,
+    0x6c,
+    0x69,
+    0x65,
+    0x6e,
+    0x74,
+    0x2d,
+    0x31,
+    0x30,
+    0x81,
+    0x9f,
+    0x30,
+    0x0d,
+    0x06,
+    0x09,
+    0x2a,
+    0x86,
+    0x48,
+    0x86,
+    0xf7,
+    0x0d,
+    0x01,
+    0x01,
+    0x01,
+    0x05,
+    0x00,
+    0x03,
+    0x81,
+    0x8d,
+    0x00,
+    0x30,
+    0x81,
+    0x89,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xa8,
+    0x6e,
+    0x40,
+    0x86,
+    0x9f,
+    0x98,
+    0x59,
+    0xfb,
+    0x57,
+    0xbf,
+    0xc1,
+    0x55,
+    0x12,
+    0x38,
+    0xeb,
+    0xb3,
+    0x46,
+    0x34,
+    0xc9,
+    0x35,
+    0x4d,
+    0xfd,
+    0x03,
+    0xe9,
+    0x3a,
+    0x88,
+    0x9e,
+    0x97,
+    0x8f,
+    0xf4,
+    0xec,
+    0x36,
+    0x7b,
+    0x3f,
+    0xba,
+    0xb8,
+    0xa5,
+    0x96,
+    0x30,
+    0x03,
+    0xc5,
+    0xc6,
+    0xd9,
+    0xa8,
+    0x4e,
+    0xbc,
+    0x23,
+    0x51,
+    0xa1,
+    0x96,
+    0xd2,
+    0x03,
+    0x98,
+    0x73,
+    0xb6,
+    0x17,
+    0x9c,
+    0x77,
+    0xd4,
+    0x95,
+    0x1e,
+    0x1b,
+    0xb3,
+    0x1b,
+    0xc8,
+    0x71,
+    0xd1,
+    0x2e,
+    0x31,
+    0xc7,
+    0x6a,
+    0x75,
+    0x57,
+    0x08,
+    0x7f,
+    0xba,
+    0x70,
+    0x76,
+    0xf7,
+    0x67,
+    0xf4,
+    0x4e,
+    0xbe,
+    0xfc,
+    0x70,
+    0x61,
+    0x41,
+    0x07,
+    0x2b,
+    0x7c,
+    0x3c,
+    0x3b,
+    0xb3,
+    0xbc,
+    0xd5,
+    0xa8,
+    0xbd,
+    0x28,
+    0xd8,
+    0x49,
+    0xd3,
+    0xe1,
+    0x78,
+    0xc8,
+    0xc1,
+    0x42,
+    0x5e,
+    0x18,
+    0x36,
+    0xa8,
+    0x41,
+    0xf7,
+    0xc8,
+    0xaa,
+    0x35,
+    0xfe,
+    0x2d,
+    0xd1,
+    0xb4,
+    0xcc,
+    0x00,
+    0x67,
+    0xae,
+    0x79,
+    0xd3,
+    0x28,
+    0xd5,
+    0x5b,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0xa3,
+    0x3b,
+    0x30,
+    0x39,
+    0x30,
+    0x1f,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x23,
+    0x04,
+    0x18,
+    0x30,
+    0x16,
+    0x80,
+    0x14,
+    0xdb,
+    0xbb,
+    0xb8,
+    0x92,
+    0x4e,
+    0x24,
+    0x0b,
+    0x1b,
+    0xbb,
+    0x78,
+    0x33,
+    0xf9,
+    0x01,
+    0x02,
+    0x23,
+    0x0d,
+    0x96,
+    0x18,
+    0x30,
+    0x47,
+    0x30,
+    0x09,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x13,
+    0x04,
+    0x02,
+    0x30,
+    0x00,
+    0x30,
+    0x0b,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x0f,
+    0x04,
+    0x04,
+    0x03,
+    0x02,
+    0x04,
+    0xf0,
+    0x30,
+    0x0d,
+    0x06,
+    0x09,
+    0x2a,
+    0x86,
+    0x48,
+    0x86,
+    0xf7,
+    0x0d,
+    0x01,
+    0x01,
+    0x0b,
+    0x05,
+    0x00,
+    0x03,
+    0x81,
+    0x81,
+    0x00,
+    0x3b,
+    0xa6,
+    0x73,
+    0xbe,
+    0xe0,
+    0x28,
+    0xed,
+    0x1f,
+    0x29,
+    0x78,
+    0x4c,
+    0xc0,
+    0x1f,
+    0xe9,
+    0x85,
+    0xc6,
+    0x8f,
+    0xe3,
+    0x87,
+    0x7c,
+    0xd9,
+    0xe7,
+    0x0a,
+    0x37,
+    0xe8,
+    0xaa,
+    0xb5,
+    0xd2,
+    0x7f,
+    0xf8,
+    0x90,
+    0x20,
+    0x80,
+    0x35,
+    0xa7,
+    0x79,
+    0x2b,
+    0x04,
+    0xa7,
+    0xbf,
+    0xe6,
+    0x7b,
+    0x58,
+    0xcb,
+    0xec,
+    0x0e,
+    0x58,
+    0xef,
+    0x2a,
+    0x70,
+    0x8a,
+    0x56,
+    0x8a,
+    0xcf,
+    0x6b,
+    0x7a,
+    0x74,
+    0x0c,
+    0xf4,
+    0x15,
+    0x37,
+    0x93,
+    0xcd,
+    0xe6,
+    0xb2,
+    0xa1,
+    0x83,
+    0x09,
+    0xdb,
+    0x9e,
+    0x4f,
+    0xff,
+    0x6a,
+    0x17,
+    0x4f,
+    0x33,
+    0xc9,
+    0xcc,
+    0x90,
+    0x2a,
+    0x67,
+    0xff,
+    0x16,
+    0x78,
+    0xa8,
+    0x2c,
+    0x10,
+    0xe0,
+    0x52,
+    0x8c,
+    0xe6,
+    0xe9,
+    0x90,
+    0x8d,
+    0xe0,
+    0x62,
+    0x04,
+    0x9a,
+    0x0f,
+    0x44,
+    0x01,
+    0x82,
+    0x14,
+    0x92,
+    0x44,
+    0x25,
+    0x69,
+    0x22,
+    0xb7,
+    0xb8,
+    0xc5,
+    0x94,
+    0x4c,
+    0x4b,
+    0x1c,
+    0x9b,
+    0x92,
+    0x60,
+    0x66,
+    0x90,
+    0x4e,
+    0xb9,
+    0xa8,
+    0x4c,
+    0x89,
+    0xbb,
+    0x0f,
     0x0b,
 };
 
 static const unsigned char KEY1[] = {
-    0x30, 0x82, 0x02, 0x5d, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81, 0x00, 0xbc, 0xdc, 0x6f, 0x8c, 0x7a,
-    0x2a, 0x4b, 0xea, 0x66, 0x66, 0x04, 0xa9, 0x05, 0x92, 0x53, 0xd7, 0x13, 0x3c, 0x49, 0xe1, 0xc8,
-    0xbb, 0xdf, 0x3d, 0xcb, 0x88, 0x31, 0x07, 0x20, 0x59, 0x93, 0x24, 0x7f, 0x7d, 0xc6, 0x84, 0x81,
-    0x16, 0x64, 0x4a, 0x52, 0xa6, 0x30, 0x44, 0xdc, 0x1a, 0x30, 0xde, 0xae, 0x29, 0x18, 0xcf, 0xc7,
-    0xf3, 0xcf, 0x0c, 0xb7, 0x8e, 0x2b, 0x1e, 0x21, 0x01, 0x0b, 0xfb, 0xe5, 0xe6, 0xcf, 0x2b, 0x84,
-    0xe1, 0x33, 0xf8, 0xba, 0x02, 0xfc, 0x30, 0xfa, 0xc4, 0x33, 0xc7, 0x37, 0xc6, 0x7f, 0x72, 0x31,
-    0x92, 0x1d, 0x8f, 0xa0, 0xfb, 0xe5, 0x4a, 0x08, 0x31, 0x78, 0x80, 0x9c, 0x23, 0xb4, 0xe9, 0x19,
-    0x56, 0x04, 0xfa, 0x0d, 0x07, 0x04, 0xb7, 0x43, 0xac, 0x4c, 0x49, 0x7c, 0xc2, 0xa1, 0x44, 0xc1,
-    0x48, 0x7d, 0x28, 0xe5, 0x23, 0x66, 0x07, 0x22, 0xd5, 0xf0, 0xf1, 0x02, 0x03, 0x01, 0x00, 0x01,
-    0x02, 0x81, 0x81, 0x00, 0xa5, 0x6d, 0xf9, 0x8f, 0xf5, 0x5a, 0xa3, 0x50, 0xd9, 0x0d, 0x37, 0xbb,
-    0xce, 0x13, 0x94, 0xb8, 0xea, 0x32, 0x7f, 0x0c, 0xf5, 0x46, 0x0b, 0x90, 0x17, 0x7e, 0x5e, 0x63,
-    0xbd, 0xa4, 0x78, 0xcd, 0x19, 0x97, 0xd4, 0x92, 0x30, 0x78, 0xaa, 0xb4, 0xa7, 0x9c, 0xc6, 0xdf,
-    0x2a, 0x65, 0x0e, 0xb5, 0x9f, 0x9c, 0x84, 0x0d, 0x4d, 0x3a, 0x74, 0xfc, 0xd0, 0xb4, 0x09, 0x74,
-    0xc4, 0xb8, 0x24, 0x03, 0xa8, 0xf0, 0xf8, 0x0d, 0x5c, 0x8e, 0xdf, 0x4b, 0xe1, 0x0a, 0x8f, 0x4f,
-    0xd5, 0xc7, 0x9b, 0x54, 0x55, 0x8f, 0x00, 0x5c, 0xea, 0x4c, 0x73, 0xf9, 0x1b, 0xbf, 0xb8, 0x93,
-    0x33, 0x20, 0xce, 0x45, 0xd9, 0x03, 0x02, 0xb2, 0x36, 0xc5, 0x0a, 0x30, 0x50, 0x78, 0x80, 0x66,
-    0x00, 0x22, 0x38, 0x86, 0xcf, 0x63, 0x4a, 0x5c, 0xbf, 0x2b, 0xd9, 0x6e, 0xe6, 0xf0, 0x39, 0xad,
-    0x12, 0x25, 0x41, 0xb9, 0x02, 0x41, 0x00, 0xf3, 0x7c, 0x07, 0x99, 0x64, 0x3a, 0x28, 0x8c, 0x8d,
-    0x05, 0xfe, 0x32, 0xb5, 0x4c, 0x8c, 0x6d, 0xde, 0x3d, 0x16, 0x08, 0xa0, 0x01, 0x61, 0x4f, 0x8e,
-    0xa0, 0xf7, 0x26, 0x26, 0xb5, 0x8e, 0xc0, 0x7a, 0xce, 0x86, 0x34, 0xde, 0xb8, 0xef, 0x86, 0x01,
-    0xbe, 0x24, 0xaa, 0x9b, 0x36, 0x93, 0x72, 0x9b, 0xf9, 0xc6, 0xcb, 0x76, 0x84, 0x67, 0x06, 0x06,
-    0x30, 0x50, 0xdf, 0x42, 0x17, 0xe0, 0xa7, 0x02, 0x41, 0x00, 0xc6, 0x91, 0xa0, 0x41, 0x34, 0x11,
-    0x67, 0x4b, 0x08, 0x0f, 0xda, 0xa7, 0x99, 0xec, 0x58, 0x11, 0xa5, 0x82, 0xdb, 0x50, 0xfe, 0x77,
-    0xe2, 0xd1, 0x53, 0x9c, 0x7d, 0xe8, 0xbf, 0xe7, 0x7c, 0xa9, 0x01, 0xb1, 0x87, 0xc3, 0x52, 0x79,
-    0x9e, 0x2c, 0xa7, 0x6f, 0x02, 0x37, 0x32, 0xef, 0x24, 0x31, 0x21, 0x0b, 0x86, 0x05, 0x32, 0x4a,
-    0x2e, 0x0b, 0x65, 0x05, 0xd3, 0xd6, 0x30, 0xb2, 0xfc, 0xa7, 0x02, 0x41, 0x00, 0xc2, 0xed, 0x31,
-    0xdc, 0x40, 0x9c, 0x3a, 0xe8, 0x42, 0xe2, 0x60, 0x5e, 0x52, 0x3c, 0xc5, 0x54, 0x14, 0x0e, 0x8d,
-    0x7c, 0x3c, 0x34, 0xbe, 0xa6, 0x05, 0x86, 0xa2, 0x36, 0x5d, 0xd9, 0x0e, 0x3e, 0xd4, 0x52, 0x50,
-    0xa9, 0x35, 0x01, 0x93, 0x68, 0x92, 0x2e, 0x9a, 0x86, 0x27, 0x1a, 0xab, 0x32, 0x9e, 0xe2, 0x79,
-    0x9f, 0x5b, 0xf3, 0xa5, 0xd2, 0xf1, 0xd3, 0x6e, 0x7b, 0x3e, 0x1b, 0x85, 0x93, 0x02, 0x40, 0x68,
-    0xb8, 0xb6, 0x7e, 0x8c, 0xba, 0x3c, 0xf2, 0x8a, 0x2e, 0xea, 0x4f, 0x07, 0xd3, 0x68, 0x62, 0xee,
-    0x1a, 0x04, 0x16, 0x44, 0x0d, 0xef, 0xf6, 0x1b, 0x95, 0x65, 0xa5, 0xd1, 0x47, 0x81, 0x2c, 0x14,
-    0xb3, 0x8e, 0xf9, 0x08, 0xcf, 0x11, 0x07, 0x55, 0xca, 0x2a, 0xad, 0xf7, 0xd3, 0xbd, 0x0f, 0x97,
-    0xf0, 0xde, 0xde, 0x70, 0xb6, 0x44, 0x70, 0x47, 0xf7, 0xf9, 0xcf, 0x75, 0x61, 0x7f, 0xf3, 0x02,
-    0x40, 0x38, 0x4a, 0x67, 0xaf, 0xae, 0xb6, 0xb2, 0x6a, 0x00, 0x25, 0x5a, 0xa4, 0x65, 0x20, 0xb1,
-    0x13, 0xbd, 0x83, 0xff, 0xb4, 0xbc, 0xf4, 0xdd, 0xa1, 0xbb, 0x1c, 0x96, 0x37, 0x35, 0xf4, 0xbf,
-    0xed, 0x4c, 0xed, 0x92, 0xe8, 0xac, 0xc9, 0xc1, 0xa5, 0xa3, 0x23, 0x66, 0x40, 0x8a, 0xa1, 0xe6,
-    0xe3, 0x95, 0xfe, 0xc4, 0x53, 0xf5, 0x7d, 0x6e, 0xca, 0x45, 0x42, 0xe4, 0xc2, 0x9f, 0xe5, 0x1e,
+    0x30,
+    0x82,
+    0x02,
+    0x5d,
+    0x02,
+    0x01,
+    0x00,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xbc,
+    0xdc,
+    0x6f,
+    0x8c,
+    0x7a,
+    0x2a,
+    0x4b,
+    0xea,
+    0x66,
+    0x66,
+    0x04,
+    0xa9,
+    0x05,
+    0x92,
+    0x53,
+    0xd7,
+    0x13,
+    0x3c,
+    0x49,
+    0xe1,
+    0xc8,
+    0xbb,
+    0xdf,
+    0x3d,
+    0xcb,
+    0x88,
+    0x31,
+    0x07,
+    0x20,
+    0x59,
+    0x93,
+    0x24,
+    0x7f,
+    0x7d,
+    0xc6,
+    0x84,
+    0x81,
+    0x16,
+    0x64,
+    0x4a,
+    0x52,
+    0xa6,
+    0x30,
+    0x44,
+    0xdc,
+    0x1a,
+    0x30,
+    0xde,
+    0xae,
+    0x29,
+    0x18,
+    0xcf,
+    0xc7,
+    0xf3,
+    0xcf,
+    0x0c,
+    0xb7,
+    0x8e,
+    0x2b,
+    0x1e,
+    0x21,
+    0x01,
+    0x0b,
+    0xfb,
+    0xe5,
+    0xe6,
+    0xcf,
+    0x2b,
+    0x84,
+    0xe1,
+    0x33,
+    0xf8,
+    0xba,
+    0x02,
+    0xfc,
+    0x30,
+    0xfa,
+    0xc4,
+    0x33,
+    0xc7,
+    0x37,
+    0xc6,
+    0x7f,
+    0x72,
+    0x31,
+    0x92,
+    0x1d,
+    0x8f,
+    0xa0,
+    0xfb,
+    0xe5,
+    0x4a,
+    0x08,
+    0x31,
+    0x78,
+    0x80,
+    0x9c,
+    0x23,
+    0xb4,
+    0xe9,
+    0x19,
+    0x56,
+    0x04,
+    0xfa,
+    0x0d,
+    0x07,
+    0x04,
+    0xb7,
+    0x43,
+    0xac,
+    0x4c,
+    0x49,
+    0x7c,
+    0xc2,
+    0xa1,
+    0x44,
+    0xc1,
+    0x48,
+    0x7d,
+    0x28,
+    0xe5,
+    0x23,
+    0x66,
+    0x07,
+    0x22,
+    0xd5,
+    0xf0,
+    0xf1,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xa5,
+    0x6d,
+    0xf9,
+    0x8f,
+    0xf5,
+    0x5a,
+    0xa3,
+    0x50,
+    0xd9,
+    0x0d,
+    0x37,
+    0xbb,
+    0xce,
+    0x13,
+    0x94,
+    0xb8,
+    0xea,
+    0x32,
+    0x7f,
+    0x0c,
+    0xf5,
+    0x46,
+    0x0b,
+    0x90,
+    0x17,
+    0x7e,
+    0x5e,
+    0x63,
+    0xbd,
+    0xa4,
+    0x78,
+    0xcd,
+    0x19,
+    0x97,
+    0xd4,
+    0x92,
+    0x30,
+    0x78,
+    0xaa,
+    0xb4,
+    0xa7,
+    0x9c,
+    0xc6,
+    0xdf,
+    0x2a,
+    0x65,
+    0x0e,
+    0xb5,
+    0x9f,
+    0x9c,
+    0x84,
+    0x0d,
+    0x4d,
+    0x3a,
+    0x74,
+    0xfc,
+    0xd0,
+    0xb4,
+    0x09,
+    0x74,
+    0xc4,
+    0xb8,
+    0x24,
+    0x03,
+    0xa8,
+    0xf0,
+    0xf8,
+    0x0d,
+    0x5c,
+    0x8e,
+    0xdf,
+    0x4b,
+    0xe1,
+    0x0a,
+    0x8f,
+    0x4f,
+    0xd5,
+    0xc7,
+    0x9b,
+    0x54,
+    0x55,
+    0x8f,
+    0x00,
+    0x5c,
+    0xea,
+    0x4c,
+    0x73,
+    0xf9,
+    0x1b,
+    0xbf,
+    0xb8,
+    0x93,
+    0x33,
+    0x20,
+    0xce,
+    0x45,
+    0xd9,
+    0x03,
+    0x02,
+    0xb2,
+    0x36,
+    0xc5,
+    0x0a,
+    0x30,
+    0x50,
+    0x78,
+    0x80,
+    0x66,
+    0x00,
+    0x22,
+    0x38,
+    0x86,
+    0xcf,
+    0x63,
+    0x4a,
+    0x5c,
+    0xbf,
+    0x2b,
+    0xd9,
+    0x6e,
+    0xe6,
+    0xf0,
+    0x39,
+    0xad,
+    0x12,
+    0x25,
+    0x41,
+    0xb9,
+    0x02,
+    0x41,
+    0x00,
+    0xf3,
+    0x7c,
+    0x07,
+    0x99,
+    0x64,
+    0x3a,
+    0x28,
+    0x8c,
+    0x8d,
+    0x05,
+    0xfe,
+    0x32,
+    0xb5,
+    0x4c,
+    0x8c,
+    0x6d,
+    0xde,
+    0x3d,
+    0x16,
+    0x08,
+    0xa0,
+    0x01,
+    0x61,
+    0x4f,
+    0x8e,
+    0xa0,
+    0xf7,
+    0x26,
+    0x26,
+    0xb5,
+    0x8e,
+    0xc0,
+    0x7a,
+    0xce,
+    0x86,
+    0x34,
+    0xde,
+    0xb8,
+    0xef,
+    0x86,
+    0x01,
+    0xbe,
+    0x24,
+    0xaa,
+    0x9b,
+    0x36,
+    0x93,
+    0x72,
+    0x9b,
+    0xf9,
+    0xc6,
+    0xcb,
+    0x76,
+    0x84,
+    0x67,
+    0x06,
+    0x06,
+    0x30,
+    0x50,
+    0xdf,
+    0x42,
+    0x17,
+    0xe0,
+    0xa7,
+    0x02,
+    0x41,
+    0x00,
+    0xc6,
+    0x91,
+    0xa0,
+    0x41,
+    0x34,
+    0x11,
+    0x67,
+    0x4b,
+    0x08,
+    0x0f,
+    0xda,
+    0xa7,
+    0x99,
+    0xec,
+    0x58,
+    0x11,
+    0xa5,
+    0x82,
+    0xdb,
+    0x50,
+    0xfe,
+    0x77,
+    0xe2,
+    0xd1,
+    0x53,
+    0x9c,
+    0x7d,
+    0xe8,
+    0xbf,
+    0xe7,
+    0x7c,
+    0xa9,
+    0x01,
+    0xb1,
+    0x87,
+    0xc3,
+    0x52,
+    0x79,
+    0x9e,
+    0x2c,
+    0xa7,
+    0x6f,
+    0x02,
+    0x37,
+    0x32,
+    0xef,
+    0x24,
+    0x31,
+    0x21,
+    0x0b,
+    0x86,
+    0x05,
+    0x32,
+    0x4a,
+    0x2e,
+    0x0b,
+    0x65,
+    0x05,
+    0xd3,
+    0xd6,
+    0x30,
+    0xb2,
+    0xfc,
+    0xa7,
+    0x02,
+    0x41,
+    0x00,
+    0xc2,
+    0xed,
+    0x31,
+    0xdc,
+    0x40,
+    0x9c,
+    0x3a,
+    0xe8,
+    0x42,
+    0xe2,
+    0x60,
+    0x5e,
+    0x52,
+    0x3c,
+    0xc5,
+    0x54,
+    0x14,
+    0x0e,
+    0x8d,
+    0x7c,
+    0x3c,
+    0x34,
+    0xbe,
+    0xa6,
+    0x05,
+    0x86,
+    0xa2,
+    0x36,
+    0x5d,
+    0xd9,
+    0x0e,
+    0x3e,
+    0xd4,
+    0x52,
+    0x50,
+    0xa9,
+    0x35,
+    0x01,
+    0x93,
+    0x68,
+    0x92,
+    0x2e,
+    0x9a,
+    0x86,
+    0x27,
+    0x1a,
+    0xab,
+    0x32,
+    0x9e,
+    0xe2,
+    0x79,
+    0x9f,
+    0x5b,
+    0xf3,
+    0xa5,
+    0xd2,
+    0xf1,
+    0xd3,
+    0x6e,
+    0x7b,
+    0x3e,
+    0x1b,
+    0x85,
+    0x93,
+    0x02,
+    0x40,
+    0x68,
+    0xb8,
+    0xb6,
+    0x7e,
+    0x8c,
+    0xba,
+    0x3c,
+    0xf2,
+    0x8a,
+    0x2e,
+    0xea,
+    0x4f,
+    0x07,
+    0xd3,
+    0x68,
+    0x62,
+    0xee,
+    0x1a,
+    0x04,
+    0x16,
+    0x44,
+    0x0d,
+    0xef,
+    0xf6,
+    0x1b,
+    0x95,
+    0x65,
+    0xa5,
+    0xd1,
+    0x47,
+    0x81,
+    0x2c,
+    0x14,
+    0xb3,
+    0x8e,
+    0xf9,
+    0x08,
+    0xcf,
+    0x11,
+    0x07,
+    0x55,
+    0xca,
+    0x2a,
+    0xad,
+    0xf7,
+    0xd3,
+    0xbd,
+    0x0f,
+    0x97,
+    0xf0,
+    0xde,
+    0xde,
+    0x70,
+    0xb6,
+    0x44,
+    0x70,
+    0x47,
+    0xf7,
+    0xf9,
+    0xcf,
+    0x75,
+    0x61,
+    0x7f,
+    0xf3,
+    0x02,
+    0x40,
+    0x38,
+    0x4a,
+    0x67,
+    0xaf,
+    0xae,
+    0xb6,
+    0xb2,
+    0x6a,
+    0x00,
+    0x25,
+    0x5a,
+    0xa4,
+    0x65,
+    0x20,
+    0xb1,
+    0x13,
+    0xbd,
+    0x83,
+    0xff,
+    0xb4,
+    0xbc,
+    0xf4,
+    0xdd,
+    0xa1,
+    0xbb,
+    0x1c,
+    0x96,
+    0x37,
+    0x35,
+    0xf4,
+    0xbf,
+    0xed,
+    0x4c,
+    0xed,
+    0x92,
+    0xe8,
+    0xac,
+    0xc9,
+    0xc1,
+    0xa5,
+    0xa3,
+    0x23,
+    0x66,
+    0x40,
+    0x8a,
+    0xa1,
+    0xe6,
+    0xe3,
+    0x95,
+    0xfe,
+    0xc4,
+    0x53,
+    0xf5,
+    0x7d,
+    0x6e,
+    0xca,
+    0x45,
+    0x42,
+    0xe4,
+    0xc2,
+    0x9f,
+    0xe5,
+    0x1e,
     0xb5,
 };
 
-
 static const unsigned char KEY2[] = {
-    0x30, 0x82, 0x02, 0x5c, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81, 0x00, 0xa8, 0x6e, 0x40, 0x86, 0x9f,
-    0x98, 0x59, 0xfb, 0x57, 0xbf, 0xc1, 0x55, 0x12, 0x38, 0xeb, 0xb3, 0x46, 0x34, 0xc9, 0x35, 0x4d,
-    0xfd, 0x03, 0xe9, 0x3a, 0x88, 0x9e, 0x97, 0x8f, 0xf4, 0xec, 0x36, 0x7b, 0x3f, 0xba, 0xb8, 0xa5,
-    0x96, 0x30, 0x03, 0xc5, 0xc6, 0xd9, 0xa8, 0x4e, 0xbc, 0x23, 0x51, 0xa1, 0x96, 0xd2, 0x03, 0x98,
-    0x73, 0xb6, 0x17, 0x9c, 0x77, 0xd4, 0x95, 0x1e, 0x1b, 0xb3, 0x1b, 0xc8, 0x71, 0xd1, 0x2e, 0x31,
-    0xc7, 0x6a, 0x75, 0x57, 0x08, 0x7f, 0xba, 0x70, 0x76, 0xf7, 0x67, 0xf4, 0x4e, 0xbe, 0xfc, 0x70,
-    0x61, 0x41, 0x07, 0x2b, 0x7c, 0x3c, 0x3b, 0xb3, 0xbc, 0xd5, 0xa8, 0xbd, 0x28, 0xd8, 0x49, 0xd3,
-    0xe1, 0x78, 0xc8, 0xc1, 0x42, 0x5e, 0x18, 0x36, 0xa8, 0x41, 0xf7, 0xc8, 0xaa, 0x35, 0xfe, 0x2d,
-    0xd1, 0xb4, 0xcc, 0x00, 0x67, 0xae, 0x79, 0xd3, 0x28, 0xd5, 0x5b, 0x02, 0x03, 0x01, 0x00, 0x01,
-    0x02, 0x81, 0x81, 0x00, 0xa6, 0x00, 0x83, 0xf8, 0x2b, 0x33, 0xac, 0xfb, 0xdb, 0xf0, 0x52, 0x4b,
-    0xd6, 0x39, 0xe3, 0x94, 0x3d, 0x8d, 0xa9, 0x01, 0xb0, 0x6b, 0xbe, 0x7f, 0x10, 0x01, 0xb6, 0xcd,
-    0x0a, 0x45, 0x0a, 0xca, 0x67, 0x8e, 0xd8, 0x29, 0x44, 0x8a, 0x51, 0xa8, 0x66, 0x35, 0x26, 0x30,
-    0x8b, 0xe9, 0x41, 0xa6, 0x22, 0xec, 0xd2, 0xf0, 0x58, 0x41, 0x33, 0x26, 0xf2, 0x3f, 0xe8, 0x75,
-    0x4f, 0xc7, 0x5d, 0x2e, 0x5a, 0xa8, 0x7a, 0xd2, 0xbf, 0x59, 0xa0, 0x86, 0x79, 0x0b, 0x92, 0x6c,
-    0x95, 0x5d, 0x87, 0x63, 0x5c, 0xd6, 0x1a, 0xc0, 0xf6, 0x7a, 0x15, 0x8d, 0xc7, 0x3c, 0xb6, 0x9e,
-    0xa6, 0x58, 0x46, 0x9b, 0xbf, 0x3e, 0x28, 0x8c, 0xdf, 0x1a, 0x87, 0xaa, 0x7e, 0xf5, 0xf2, 0xcb,
-    0x5e, 0x84, 0x2d, 0xf6, 0x82, 0x7e, 0x89, 0x4e, 0xf5, 0xe6, 0x3c, 0x92, 0x80, 0x1e, 0x98, 0x1c,
-    0x6a, 0x7b, 0x57, 0x01, 0x02, 0x41, 0x00, 0xdd, 0x60, 0x95, 0xd7, 0xa1, 0x9d, 0x0c, 0xa1, 0x84,
-    0xc5, 0x39, 0xca, 0x67, 0x4c, 0x1c, 0x06, 0x71, 0x5b, 0x5c, 0x2d, 0x8d, 0xce, 0xcd, 0xe2, 0x79,
-    0xc8, 0x33, 0xbe, 0x50, 0x37, 0x60, 0x9f, 0x3b, 0xb9, 0x59, 0x55, 0x22, 0x1f, 0xa5, 0x4b, 0x1d,
-    0xca, 0x38, 0xa0, 0xab, 0x87, 0x9c, 0x86, 0x0e, 0xdb, 0x1c, 0x4f, 0x4f, 0x07, 0xed, 0x18, 0x3f,
-    0x05, 0x3c, 0xec, 0x78, 0x11, 0xf6, 0x99, 0x02, 0x41, 0x00, 0xc2, 0xc5, 0xcf, 0xbe, 0x95, 0x91,
-    0xeb, 0xcf, 0x47, 0xf3, 0x33, 0x32, 0xc7, 0x7e, 0x93, 0x56, 0xf7, 0xd8, 0xf9, 0xd4, 0xb6, 0xd6,
-    0x20, 0xac, 0xba, 0x8a, 0x20, 0x19, 0x14, 0xab, 0xc5, 0x5d, 0xb2, 0x08, 0xcc, 0x77, 0x7c, 0x65,
-    0xa8, 0xdb, 0x66, 0x97, 0x36, 0x44, 0x2c, 0x63, 0xc0, 0x6a, 0x7e, 0xb0, 0x0b, 0x5c, 0x90, 0x12,
-    0x50, 0xb4, 0x36, 0x60, 0xc3, 0x1f, 0x22, 0x0c, 0xc8, 0x13, 0x02, 0x40, 0x33, 0xc8, 0x7e, 0x04,
-    0x7c, 0x97, 0x61, 0xf6, 0xfe, 0x39, 0xac, 0x34, 0xfe, 0x48, 0xbd, 0x5d, 0x7c, 0x72, 0xa4, 0x73,
-    0x3b, 0x72, 0x9e, 0x92, 0x55, 0x6e, 0x51, 0x3c, 0x39, 0x43, 0x5a, 0xe4, 0xa4, 0x71, 0xcc, 0xc5,
-    0xaf, 0x3f, 0xbb, 0xc8, 0x80, 0x65, 0x67, 0x2d, 0x9e, 0x32, 0x10, 0x99, 0x03, 0x2c, 0x99, 0xc8,
-    0xab, 0x71, 0xed, 0x31, 0xf8, 0xbb, 0xde, 0xee, 0x69, 0x7f, 0xba, 0x31, 0x02, 0x40, 0x7e, 0xbc,
-    0x60, 0x55, 0x4e, 0xd5, 0xc8, 0x6e, 0xf4, 0x0e, 0x57, 0xbe, 0x2e, 0xf9, 0x39, 0xbe, 0x59, 0x3f,
-    0xa2, 0x30, 0xbb, 0x57, 0xd1, 0xa3, 0x13, 0x2e, 0x55, 0x7c, 0x7c, 0x6a, 0xd8, 0xde, 0x02, 0xbe,
-    0x9e, 0xed, 0x10, 0xd0, 0xc5, 0x73, 0x1d, 0xea, 0x3e, 0xb1, 0x55, 0x81, 0x02, 0xef, 0x48, 0xc8,
-    0x1c, 0x5c, 0x7a, 0x92, 0xb0, 0x58, 0xd3, 0x19, 0x5b, 0x5d, 0xa2, 0xb6, 0x56, 0x69, 0x02, 0x40,
-    0x1e, 0x00, 0x6a, 0x9f, 0xba, 0xee, 0x46, 0x5a, 0xc5, 0xb5, 0x9f, 0x91, 0x33, 0xdd, 0xc9, 0x96,
-    0x75, 0xb7, 0x87, 0xcf, 0x18, 0x1c, 0xb7, 0xb9, 0x3f, 0x04, 0x10, 0xb8, 0x75, 0xa9, 0xb8, 0xa0,
-    0x31, 0x35, 0x03, 0x30, 0x89, 0xc8, 0x37, 0x68, 0x20, 0x30, 0x99, 0x39, 0x96, 0xd6, 0x2b, 0x3d,
-    0x5e, 0x45, 0x84, 0xf7, 0xd2, 0x61, 0x50, 0xc9, 0x50, 0xba, 0x8d, 0x08, 0xaa, 0xd0, 0x08, 0x1e,
+    0x30,
+    0x82,
+    0x02,
+    0x5c,
+    0x02,
+    0x01,
+    0x00,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xa8,
+    0x6e,
+    0x40,
+    0x86,
+    0x9f,
+    0x98,
+    0x59,
+    0xfb,
+    0x57,
+    0xbf,
+    0xc1,
+    0x55,
+    0x12,
+    0x38,
+    0xeb,
+    0xb3,
+    0x46,
+    0x34,
+    0xc9,
+    0x35,
+    0x4d,
+    0xfd,
+    0x03,
+    0xe9,
+    0x3a,
+    0x88,
+    0x9e,
+    0x97,
+    0x8f,
+    0xf4,
+    0xec,
+    0x36,
+    0x7b,
+    0x3f,
+    0xba,
+    0xb8,
+    0xa5,
+    0x96,
+    0x30,
+    0x03,
+    0xc5,
+    0xc6,
+    0xd9,
+    0xa8,
+    0x4e,
+    0xbc,
+    0x23,
+    0x51,
+    0xa1,
+    0x96,
+    0xd2,
+    0x03,
+    0x98,
+    0x73,
+    0xb6,
+    0x17,
+    0x9c,
+    0x77,
+    0xd4,
+    0x95,
+    0x1e,
+    0x1b,
+    0xb3,
+    0x1b,
+    0xc8,
+    0x71,
+    0xd1,
+    0x2e,
+    0x31,
+    0xc7,
+    0x6a,
+    0x75,
+    0x57,
+    0x08,
+    0x7f,
+    0xba,
+    0x70,
+    0x76,
+    0xf7,
+    0x67,
+    0xf4,
+    0x4e,
+    0xbe,
+    0xfc,
+    0x70,
+    0x61,
+    0x41,
+    0x07,
+    0x2b,
+    0x7c,
+    0x3c,
+    0x3b,
+    0xb3,
+    0xbc,
+    0xd5,
+    0xa8,
+    0xbd,
+    0x28,
+    0xd8,
+    0x49,
+    0xd3,
+    0xe1,
+    0x78,
+    0xc8,
+    0xc1,
+    0x42,
+    0x5e,
+    0x18,
+    0x36,
+    0xa8,
+    0x41,
+    0xf7,
+    0xc8,
+    0xaa,
+    0x35,
+    0xfe,
+    0x2d,
+    0xd1,
+    0xb4,
+    0xcc,
+    0x00,
+    0x67,
+    0xae,
+    0x79,
+    0xd3,
+    0x28,
+    0xd5,
+    0x5b,
+    0x02,
+    0x03,
+    0x01,
+    0x00,
+    0x01,
+    0x02,
+    0x81,
+    0x81,
+    0x00,
+    0xa6,
+    0x00,
+    0x83,
+    0xf8,
+    0x2b,
+    0x33,
+    0xac,
+    0xfb,
+    0xdb,
+    0xf0,
+    0x52,
+    0x4b,
+    0xd6,
+    0x39,
+    0xe3,
+    0x94,
+    0x3d,
+    0x8d,
+    0xa9,
+    0x01,
+    0xb0,
+    0x6b,
+    0xbe,
+    0x7f,
+    0x10,
+    0x01,
+    0xb6,
+    0xcd,
+    0x0a,
+    0x45,
+    0x0a,
+    0xca,
+    0x67,
+    0x8e,
+    0xd8,
+    0x29,
+    0x44,
+    0x8a,
+    0x51,
+    0xa8,
+    0x66,
+    0x35,
+    0x26,
+    0x30,
+    0x8b,
+    0xe9,
+    0x41,
+    0xa6,
+    0x22,
+    0xec,
+    0xd2,
+    0xf0,
+    0x58,
+    0x41,
+    0x33,
+    0x26,
+    0xf2,
+    0x3f,
+    0xe8,
+    0x75,
+    0x4f,
+    0xc7,
+    0x5d,
+    0x2e,
+    0x5a,
+    0xa8,
+    0x7a,
+    0xd2,
+    0xbf,
+    0x59,
+    0xa0,
+    0x86,
+    0x79,
+    0x0b,
+    0x92,
+    0x6c,
+    0x95,
+    0x5d,
+    0x87,
+    0x63,
+    0x5c,
+    0xd6,
+    0x1a,
+    0xc0,
+    0xf6,
+    0x7a,
+    0x15,
+    0x8d,
+    0xc7,
+    0x3c,
+    0xb6,
+    0x9e,
+    0xa6,
+    0x58,
+    0x46,
+    0x9b,
+    0xbf,
+    0x3e,
+    0x28,
+    0x8c,
+    0xdf,
+    0x1a,
+    0x87,
+    0xaa,
+    0x7e,
+    0xf5,
+    0xf2,
+    0xcb,
+    0x5e,
+    0x84,
+    0x2d,
+    0xf6,
+    0x82,
+    0x7e,
+    0x89,
+    0x4e,
+    0xf5,
+    0xe6,
+    0x3c,
+    0x92,
+    0x80,
+    0x1e,
+    0x98,
+    0x1c,
+    0x6a,
+    0x7b,
+    0x57,
+    0x01,
+    0x02,
+    0x41,
+    0x00,
+    0xdd,
+    0x60,
+    0x95,
+    0xd7,
+    0xa1,
+    0x9d,
+    0x0c,
+    0xa1,
+    0x84,
+    0xc5,
+    0x39,
+    0xca,
+    0x67,
+    0x4c,
+    0x1c,
+    0x06,
+    0x71,
+    0x5b,
+    0x5c,
+    0x2d,
+    0x8d,
+    0xce,
+    0xcd,
+    0xe2,
+    0x79,
+    0xc8,
+    0x33,
+    0xbe,
+    0x50,
+    0x37,
+    0x60,
+    0x9f,
+    0x3b,
+    0xb9,
+    0x59,
+    0x55,
+    0x22,
+    0x1f,
+    0xa5,
+    0x4b,
+    0x1d,
+    0xca,
+    0x38,
+    0xa0,
+    0xab,
+    0x87,
+    0x9c,
+    0x86,
+    0x0e,
+    0xdb,
+    0x1c,
+    0x4f,
+    0x4f,
+    0x07,
+    0xed,
+    0x18,
+    0x3f,
+    0x05,
+    0x3c,
+    0xec,
+    0x78,
+    0x11,
+    0xf6,
+    0x99,
+    0x02,
+    0x41,
+    0x00,
+    0xc2,
+    0xc5,
+    0xcf,
+    0xbe,
+    0x95,
+    0x91,
+    0xeb,
+    0xcf,
+    0x47,
+    0xf3,
+    0x33,
+    0x32,
+    0xc7,
+    0x7e,
+    0x93,
+    0x56,
+    0xf7,
+    0xd8,
+    0xf9,
+    0xd4,
+    0xb6,
+    0xd6,
+    0x20,
+    0xac,
+    0xba,
+    0x8a,
+    0x20,
+    0x19,
+    0x14,
+    0xab,
+    0xc5,
+    0x5d,
+    0xb2,
+    0x08,
+    0xcc,
+    0x77,
+    0x7c,
+    0x65,
+    0xa8,
+    0xdb,
+    0x66,
+    0x97,
+    0x36,
+    0x44,
+    0x2c,
+    0x63,
+    0xc0,
+    0x6a,
+    0x7e,
+    0xb0,
+    0x0b,
+    0x5c,
+    0x90,
+    0x12,
+    0x50,
+    0xb4,
+    0x36,
+    0x60,
+    0xc3,
+    0x1f,
+    0x22,
+    0x0c,
+    0xc8,
+    0x13,
+    0x02,
+    0x40,
+    0x33,
+    0xc8,
+    0x7e,
+    0x04,
+    0x7c,
+    0x97,
+    0x61,
+    0xf6,
+    0xfe,
+    0x39,
+    0xac,
+    0x34,
+    0xfe,
+    0x48,
+    0xbd,
+    0x5d,
+    0x7c,
+    0x72,
+    0xa4,
+    0x73,
+    0x3b,
+    0x72,
+    0x9e,
+    0x92,
+    0x55,
+    0x6e,
+    0x51,
+    0x3c,
+    0x39,
+    0x43,
+    0x5a,
+    0xe4,
+    0xa4,
+    0x71,
+    0xcc,
+    0xc5,
+    0xaf,
+    0x3f,
+    0xbb,
+    0xc8,
+    0x80,
+    0x65,
+    0x67,
+    0x2d,
+    0x9e,
+    0x32,
+    0x10,
+    0x99,
+    0x03,
+    0x2c,
+    0x99,
+    0xc8,
+    0xab,
+    0x71,
+    0xed,
+    0x31,
+    0xf8,
+    0xbb,
+    0xde,
+    0xee,
+    0x69,
+    0x7f,
+    0xba,
+    0x31,
+    0x02,
+    0x40,
+    0x7e,
+    0xbc,
+    0x60,
+    0x55,
+    0x4e,
+    0xd5,
+    0xc8,
+    0x6e,
+    0xf4,
+    0x0e,
+    0x57,
+    0xbe,
+    0x2e,
+    0xf9,
+    0x39,
+    0xbe,
+    0x59,
+    0x3f,
+    0xa2,
+    0x30,
+    0xbb,
+    0x57,
+    0xd1,
+    0xa3,
+    0x13,
+    0x2e,
+    0x55,
+    0x7c,
+    0x7c,
+    0x6a,
+    0xd8,
+    0xde,
+    0x02,
+    0xbe,
+    0x9e,
+    0xed,
+    0x10,
+    0xd0,
+    0xc5,
+    0x73,
+    0x1d,
+    0xea,
+    0x3e,
+    0xb1,
+    0x55,
+    0x81,
+    0x02,
+    0xef,
+    0x48,
+    0xc8,
+    0x1c,
+    0x5c,
+    0x7a,
+    0x92,
+    0xb0,
+    0x58,
+    0xd3,
+    0x19,
+    0x5b,
+    0x5d,
+    0xa2,
+    0xb6,
+    0x56,
+    0x69,
+    0x02,
+    0x40,
+    0x1e,
+    0x00,
+    0x6a,
+    0x9f,
+    0xba,
+    0xee,
+    0x46,
+    0x5a,
+    0xc5,
+    0xb5,
+    0x9f,
+    0x91,
+    0x33,
+    0xdd,
+    0xc9,
+    0x96,
+    0x75,
+    0xb7,
+    0x87,
+    0xcf,
+    0x18,
+    0x1c,
+    0xb7,
+    0xb9,
+    0x3f,
+    0x04,
+    0x10,
+    0xb8,
+    0x75,
+    0xa9,
+    0xb8,
+    0xa0,
+    0x31,
+    0x35,
+    0x03,
+    0x30,
+    0x89,
+    0xc8,
+    0x37,
+    0x68,
+    0x20,
+    0x30,
+    0x99,
+    0x39,
+    0x96,
+    0xd6,
+    0x2b,
+    0x3d,
+    0x5e,
+    0x45,
+    0x84,
+    0xf7,
+    0xd2,
+    0x61,
+    0x50,
+    0xc9,
+    0x50,
+    0xba,
+    0x8d,
+    0x08,
+    0xaa,
+    0xd0,
+    0x08,
+    0x1e,
 };
 
-
 static const PKCS12_ATTR ATTRS1[] = {
     { "friendlyName", "george" },
     { "localKeyID", "1234567890" },
@@ -247,21 +2315,21 @@ static const int enc_nids_all[] = {
 #endif
 
 #ifndef OPENSSL_NO_MD2
-# ifndef OPENSSL_NO_DES
+#ifndef OPENSSL_NO_DES
     NID_pbeWithMD2AndDES_CBC,
-# endif
-# ifndef OPENSSL_NO_RC2
+#endif
+#ifndef OPENSSL_NO_RC2
     NID_pbeWithMD2AndRC2_CBC,
-# endif
+#endif
 #endif
 
 #ifndef OPENSSL_NO_MD5
-# ifndef OPENSSL_NO_DES
+#ifndef OPENSSL_NO_DES
     NID_pbeWithMD5AndDES_CBC,
-# endif
-# ifndef OPENSSL_NO_RC2
+#endif
+#ifndef OPENSSL_NO_RC2
     NID_pbeWithMD5AndRC2_CBC,
-# endif
+#endif
 #endif
 #ifndef OPENSSL_NO_DES
     NID_pbeWithSHA1AndDES_CBC,
@@ -326,7 +2394,6 @@ static int get_custom_oid(void)
     return sec_nid = OBJ_txt2nid("CustomSecretOID");
 }
 
-
 /* --------------------------------------------------------------------------
  * PKCS12 format tests
  */
@@ -338,22 +2405,22 @@ static int test_single_cert_no_attrs(void)
     /* Generate/encode */
     start_pkcs12(pb);
 
-        start_contentinfo(pb);
+    start_contentinfo(pb);
 
-            add_certbag(pb, CERT1, sizeof(CERT1), NULL);
+    add_certbag(pb, CERT1, sizeof(CERT1), NULL);
 
-        end_contentinfo(pb);
+    end_contentinfo(pb);
 
     end_pkcs12(pb);
 
     /* Read/decode */
     start_check_pkcs12(pb);
 
-        start_check_contentinfo(pb);
+    start_check_contentinfo(pb);
 
-            check_certbag(pb, CERT1, sizeof(CERT1), NULL);
+    check_certbag(pb, CERT1, sizeof(CERT1), NULL);
 
-        end_check_contentinfo(pb);
+    end_check_contentinfo(pb);
 
     end_check_pkcs12(pb);
 
@@ -366,29 +2433,29 @@ static int test_single_key(PKCS12_ENC *enc)
     PKCS12_BUILDER *pb;
 
     BIO_snprintf(fname, sizeof(fname), "1key_ciph-%s_iter-%d.p12",
-                 OBJ_nid2sn(enc->nid), enc->iter);
+        OBJ_nid2sn(enc->nid), enc->iter);
 
     pb = new_pkcs12_builder(fname);
 
     /* Generate/encode */
     start_pkcs12(pb);
 
-        start_contentinfo(pb);
+    start_contentinfo(pb);
 
-            add_keybag(pb, KEY1, sizeof(KEY1), NULL, enc);
+    add_keybag(pb, KEY1, sizeof(KEY1), NULL, enc);
 
-        end_contentinfo(pb);
+    end_contentinfo(pb);
 
     end_pkcs12(pb);
 
     /* Read/decode */
     start_check_pkcs12(pb);
 
-        start_check_contentinfo(pb);
+    start_check_contentinfo(pb);
 
-            check_keybag(pb, KEY1, sizeof(KEY1), NULL, enc);
+    check_keybag(pb, KEY1, sizeof(KEY1), NULL, enc);
 
-        end_check_contentinfo(pb);
+    end_check_contentinfo(pb);
 
     end_check_pkcs12(pb);
 
@@ -438,22 +2505,22 @@ static int test_single_key_with_attrs(void)
     /* Generate/encode */
     start_pkcs12(pb);
 
-        start_contentinfo(pb);
+    start_contentinfo(pb);
 
-            add_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
+    add_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
 
-        end_contentinfo(pb);
+    end_contentinfo(pb);
 
     end_pkcs12(pb);
 
     /* Read/decode */
     start_check_pkcs12(pb);
 
-        start_check_contentinfo(pb);
+    start_check_contentinfo(pb);
 
-            check_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
+    check_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
 
-        end_check_contentinfo(pb);
+    end_check_contentinfo(pb);
 
     end_check_pkcs12(pb);
 
@@ -466,29 +2533,29 @@ static int test_single_cert_mac(PKCS12_ENC *mac)
     PKCS12_BUILDER *pb;
 
     BIO_snprintf(fname, sizeof(fname), "1cert_mac-%s_iter-%d.p12",
-                 OBJ_nid2sn(mac->nid), mac->iter);
+        OBJ_nid2sn(mac->nid), mac->iter);
 
     pb = new_pkcs12_builder(fname);
 
     /* Generate/encode */
     start_pkcs12(pb);
 
-        start_contentinfo(pb);
+    start_contentinfo(pb);
 
-            add_certbag(pb, CERT1, sizeof(CERT1), NULL);
+    add_certbag(pb, CERT1, sizeof(CERT1), NULL);
 
-        end_contentinfo(pb);
+    end_contentinfo(pb);
 
     end_pkcs12_with_mac(pb, mac);
 
     /* Read/decode */
     start_check_pkcs12_with_mac(pb, mac);
 
-        start_check_contentinfo(pb);
+    start_check_contentinfo(pb);
 
-            check_certbag(pb, CERT1, sizeof(CERT1), NULL);
+    check_certbag(pb, CERT1, sizeof(CERT1), NULL);
 
-        end_check_contentinfo(pb);
+    end_check_contentinfo(pb);
 
     end_check_pkcs12(pb);
 
@@ -535,24 +2602,24 @@ static int test_cert_key_with_attrs_and_mac(void)
     /* Generate/encode */
     start_pkcs12(pb);
 
-        start_contentinfo(pb);
+    start_contentinfo(pb);
 
-            add_certbag(pb, CERT1, sizeof(CERT1), ATTRS1);
-            add_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
+    add_certbag(pb, CERT1, sizeof(CERT1), ATTRS1);
+    add_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
 
-        end_contentinfo(pb);
+    end_contentinfo(pb);
 
     end_pkcs12_with_mac(pb, &mac_default);
 
     /* Read/decode */
     start_check_pkcs12_with_mac(pb, &mac_default);
 
-        start_check_contentinfo(pb);
+    start_check_contentinfo(pb);
 
-            check_certbag(pb, CERT1, sizeof(CERT1), ATTRS1);
-            check_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
+    check_certbag(pb, CERT1, sizeof(CERT1), ATTRS1);
+    check_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
 
-        end_check_contentinfo(pb);
+    end_check_contentinfo(pb);
 
     end_check_pkcs12(pb);
 
@@ -566,24 +2633,24 @@ static int test_cert_key_encrypted_content(void)
     /* Generate/encode */
     start_pkcs12(pb);
 
-        start_contentinfo(pb);
+    start_contentinfo(pb);
 
-            add_certbag(pb, CERT1, sizeof(CERT1), ATTRS1);
-            add_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
+    add_certbag(pb, CERT1, sizeof(CERT1), ATTRS1);
+    add_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
 
-        end_contentinfo_encrypted(pb, &enc_default);
+    end_contentinfo_encrypted(pb, &enc_default);
 
     end_pkcs12_with_mac(pb, &mac_default);
 
     /* Read/decode */
     start_check_pkcs12_with_mac(pb, &mac_default);
 
-        start_check_contentinfo_encrypted(pb, &enc_default);
+    start_check_contentinfo_encrypted(pb, &enc_default);
 
-            check_certbag(pb, CERT1, sizeof(CERT1), ATTRS1);
-            check_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
+    check_certbag(pb, CERT1, sizeof(CERT1), ATTRS1);
+    check_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
 
-        end_check_contentinfo(pb);
+    end_check_contentinfo(pb);
 
     end_check_pkcs12(pb);
 
@@ -598,22 +2665,22 @@ static int test_single_secret_encrypted_content(void)
     /* Generate/encode */
     start_pkcs12(pb);
 
-        start_contentinfo(pb);
+    start_contentinfo(pb);
 
-            add_secretbag(pb, custom_nid, "VerySecretMessage", ATTRS1);
+    add_secretbag(pb, custom_nid, "VerySecretMessage", ATTRS1);
 
-        end_contentinfo_encrypted(pb, &enc_default);
+    end_contentinfo_encrypted(pb, &enc_default);
 
     end_pkcs12_with_mac(pb, &mac_default);
 
     /* Read/decode */
     start_check_pkcs12_with_mac(pb, &mac_default);
 
-        start_check_contentinfo_encrypted(pb, &enc_default);
+    start_check_contentinfo_encrypted(pb, &enc_default);
 
-            check_secretbag(pb, custom_nid, "VerySecretMessage", ATTRS1);
+    check_secretbag(pb, custom_nid, "VerySecretMessage", ATTRS1);
 
-        end_check_contentinfo(pb);
+    end_check_contentinfo(pb);
 
     end_check_pkcs12(pb);
 
@@ -627,29 +2694,29 @@ static int test_single_secret(PKCS12_ENC *enc)
     PKCS12_BUILDER *pb;
 
     BIO_snprintf(fname, sizeof(fname), "1secret_ciph-%s_iter-%d.p12",
-                 OBJ_nid2sn(enc->nid), enc->iter);
+        OBJ_nid2sn(enc->nid), enc->iter);
     pb = new_pkcs12_builder(fname);
     custom_nid = get_custom_oid();
 
     /* Generate/encode */
     start_pkcs12(pb);
 
-        start_contentinfo(pb);
+    start_contentinfo(pb);
 
-            add_secretbag(pb, custom_nid, "VerySecretMessage", ATTRS1);
+    add_secretbag(pb, custom_nid, "VerySecretMessage", ATTRS1);
 
-        end_contentinfo_encrypted(pb, enc);
+    end_contentinfo_encrypted(pb, enc);
 
     end_pkcs12_with_mac(pb, &mac_default);
 
     /* Read/decode */
     start_check_pkcs12_with_mac(pb, &mac_default);
 
-        start_check_contentinfo_encrypted(pb, enc);
+    start_check_contentinfo_encrypted(pb, enc);
 
-            check_secretbag(pb, custom_nid, "VerySecretMessage", ATTRS1);
+    check_secretbag(pb, custom_nid, "VerySecretMessage", ATTRS1);
 
-        end_check_contentinfo(pb);
+    end_check_contentinfo(pb);
 
     end_check_pkcs12(pb);
 
@@ -678,40 +2745,40 @@ static int test_multiple_contents(void)
     /* Generate/encode */
     start_pkcs12(pb);
 
-        start_contentinfo(pb);
+    start_contentinfo(pb);
 
-            add_certbag(pb, CERT1, sizeof(CERT1), ATTRS1);
-            add_certbag(pb, CERT2, sizeof(CERT2), ATTRS2);
-            add_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
-            add_keybag(pb, KEY2, sizeof(KEY2), ATTRS2, &enc_default);
+    add_certbag(pb, CERT1, sizeof(CERT1), ATTRS1);
+    add_certbag(pb, CERT2, sizeof(CERT2), ATTRS2);
+    add_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
+    add_keybag(pb, KEY2, sizeof(KEY2), ATTRS2, &enc_default);
 
-        end_contentinfo(pb);
+    end_contentinfo(pb);
 
-        start_contentinfo(pb);
+    start_contentinfo(pb);
 
-            add_secretbag(pb, custom_nid, "VeryVerySecretMessage", ATTRS1);
+    add_secretbag(pb, custom_nid, "VeryVerySecretMessage", ATTRS1);
 
-        end_contentinfo_encrypted(pb, &enc_default);
+    end_contentinfo_encrypted(pb, &enc_default);
 
     end_pkcs12_with_mac(pb, &mac_default);
 
     /* Read/decode */
     start_check_pkcs12_with_mac(pb, &mac_default);
 
-        start_check_contentinfo(pb);
+    start_check_contentinfo(pb);
 
-            check_certbag(pb, CERT1, sizeof(CERT1), ATTRS1);
-            check_certbag(pb, CERT2, sizeof(CERT2), ATTRS2);
-            check_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
-            check_keybag(pb, KEY2, sizeof(KEY2), ATTRS2, &enc_default);
+    check_certbag(pb, CERT1, sizeof(CERT1), ATTRS1);
+    check_certbag(pb, CERT2, sizeof(CERT2), ATTRS2);
+    check_keybag(pb, KEY1, sizeof(KEY1), ATTRS1, &enc_default);
+    check_keybag(pb, KEY2, sizeof(KEY2), ATTRS2, &enc_default);
 
-        end_check_contentinfo(pb);
+    end_check_contentinfo(pb);
 
-        start_check_contentinfo_encrypted(pb, &enc_default);
+    start_check_contentinfo_encrypted(pb, &enc_default);
 
-            check_secretbag(pb, custom_nid, "VeryVerySecretMessage", ATTRS1);
+    check_secretbag(pb, custom_nid, "VeryVerySecretMessage", ATTRS1);
 
-        end_check_contentinfo(pb);
+    end_check_contentinfo(pb);
 
     end_check_pkcs12(pb);
 
@@ -725,22 +2792,22 @@ static int test_jdk_trusted_attr(void)
     /* Generate/encode */
     start_pkcs12(pb);
 
-        start_contentinfo(pb);
+    start_contentinfo(pb);
 
-            add_certbag(pb, CERT1, sizeof(CERT1), ATTRS3);
+    add_certbag(pb, CERT1, sizeof(CERT1), ATTRS3);
 
-        end_contentinfo(pb);
+    end_contentinfo(pb);
 
     end_pkcs12_with_mac(pb, &mac_default);
 
     /* Read/decode */
     start_check_pkcs12_with_mac(pb, &mac_default);
 
-        start_check_contentinfo(pb);
+    start_check_contentinfo(pb);
 
-            check_certbag(pb, CERT1, sizeof(CERT1), ATTRS3);
+    check_certbag(pb, CERT1, sizeof(CERT1), ATTRS3);
 
-        end_check_contentinfo(pb);
+    end_check_contentinfo(pb);
 
     end_check_pkcs12(pb);
 
@@ -756,37 +2823,37 @@ static int test_set0_attrs(void)
 
     start_pkcs12(pb);
 
-        start_contentinfo(pb);
+    start_contentinfo(pb);
 
-            /* Add cert and attrs (name/locakkey only) */
-            add_certbag(pb, CERT1, sizeof(CERT1), ATTRS4);
+    /* Add cert and attrs (name/locakkey only) */
+    add_certbag(pb, CERT1, sizeof(CERT1), ATTRS4);
 
-            bag = sk_PKCS12_SAFEBAG_value(pb->bags, 0);
-            attrs = (STACK_OF(X509_ATTRIBUTE)*)PKCS12_SAFEBAG_get0_attrs(bag);
+    bag = sk_PKCS12_SAFEBAG_value(pb->bags, 0);
+    attrs = (STACK_OF(X509_ATTRIBUTE) *)PKCS12_SAFEBAG_get0_attrs(bag);
 
-            /* Create new attr, add to list and confirm return attrs is not NULL */
-            attr = X509_ATTRIBUTE_create(NID_oracle_jdk_trustedkeyusage, V_ASN1_OBJECT, OBJ_txt2obj("anyExtendedKeyUsage", 0));
-            X509at_add1_attr(&attrs, attr);
-            PKCS12_SAFEBAG_set0_attrs(bag, attrs);
-            attrs = (STACK_OF(X509_ATTRIBUTE)*)PKCS12_SAFEBAG_get0_attrs(bag);
-            X509_ATTRIBUTE_free(attr);
-            if(!TEST_ptr(attrs)) {
-                goto err;
-            }
+    /* Create new attr, add to list and confirm return attrs is not NULL */
+    attr = X509_ATTRIBUTE_create(NID_oracle_jdk_trustedkeyusage, V_ASN1_OBJECT, OBJ_txt2obj("anyExtendedKeyUsage", 0));
+    X509at_add1_attr(&attrs, attr);
+    PKCS12_SAFEBAG_set0_attrs(bag, attrs);
+    attrs = (STACK_OF(X509_ATTRIBUTE) *)PKCS12_SAFEBAG_get0_attrs(bag);
+    X509_ATTRIBUTE_free(attr);
+    if (!TEST_ptr(attrs)) {
+        goto err;
+    }
 
-        end_contentinfo(pb);
+    end_contentinfo(pb);
 
     end_pkcs12(pb);
 
     /* Read/decode */
     start_check_pkcs12(pb);
 
-        start_check_contentinfo(pb);
+    start_check_contentinfo(pb);
 
-            /* Use existing check functionality to confirm cert bag attrs identical to ATTRS3 */
-            check_certbag(pb, CERT1, sizeof(CERT1), ATTRS3);
+    /* Use existing check functionality to confirm cert bag attrs identical to ATTRS3 */
+    check_certbag(pb, CERT1, sizeof(CERT1), ATTRS3);
 
-        end_check_contentinfo(pb);
+    end_check_contentinfo(pb);
 
     end_check_pkcs12(pb);
 
@@ -806,68 +2873,626 @@ static int pkcs12_create_test(void)
     const unsigned char *p;
 
     static const unsigned char rsa_key[] = {
-        0x30, 0x82, 0x02, 0x5d, 0x02, 0x01, 0x00, 0x02, 0x81, 0x81, 0x00, 0xbb,
-        0x24, 0x7a, 0x09, 0x7e, 0x0e, 0xb2, 0x37, 0x32, 0xcc, 0x39, 0x67, 0xad,
-        0xf1, 0x9e, 0x3d, 0x6b, 0x82, 0x83, 0xd1, 0xd0, 0xac, 0xa4, 0xc0, 0x18,
-        0xbe, 0x8d, 0x98, 0x00, 0xc0, 0x7b, 0xff, 0x07, 0x44, 0xc9, 0xca, 0x1c,
-        0xba, 0x36, 0xe1, 0x27, 0x69, 0xff, 0xb1, 0xe3, 0x8d, 0x8b, 0xee, 0x57,
-        0xa9, 0x3a, 0xaa, 0x16, 0x43, 0x39, 0x54, 0x19, 0x7c, 0xae, 0x69, 0x24,
-        0x14, 0xf6, 0x64, 0xff, 0xbc, 0x74, 0xc6, 0x67, 0x6c, 0x4c, 0xf1, 0x02,
-        0x49, 0x69, 0xc7, 0x2b, 0xe1, 0xe1, 0xa1, 0xa3, 0x43, 0x14, 0xf4, 0x77,
-        0x8f, 0xc8, 0xd0, 0x85, 0x5a, 0x35, 0x95, 0xac, 0x62, 0xa9, 0xc1, 0x21,
-        0x00, 0x77, 0xa0, 0x8b, 0x97, 0x30, 0xb4, 0x5a, 0x2c, 0xb8, 0x90, 0x2f,
-        0x48, 0xa0, 0x05, 0x28, 0x4b, 0xf2, 0x0f, 0x8d, 0xec, 0x8b, 0x4d, 0x03,
-        0x42, 0x75, 0xd6, 0xad, 0x81, 0xc0, 0x11, 0x02, 0x03, 0x01, 0x00, 0x01,
-        0x02, 0x81, 0x80, 0x00, 0xfc, 0xb9, 0x4a, 0x26, 0x07, 0x89, 0x51, 0x2b,
-        0x53, 0x72, 0x91, 0xe0, 0x18, 0x3e, 0xa6, 0x5e, 0x31, 0xef, 0x9c, 0x0c,
-        0x16, 0x24, 0x42, 0xd0, 0x28, 0x33, 0xf9, 0xfa, 0xd0, 0x3c, 0x54, 0x04,
-        0x06, 0xc0, 0x15, 0xf5, 0x1b, 0x9a, 0xb3, 0x24, 0x31, 0xab, 0x3c, 0x6b,
-        0x47, 0x43, 0xb0, 0xd2, 0xa9, 0xdc, 0x05, 0xe1, 0x81, 0x59, 0xb6, 0x04,
-        0xe9, 0x66, 0x61, 0xaa, 0xd7, 0x0b, 0x00, 0x8f, 0x3d, 0xe5, 0xbf, 0xa2,
-        0xf8, 0x5e, 0x25, 0x6c, 0x1e, 0x22, 0x0f, 0xb4, 0xfd, 0x41, 0xe2, 0x03,
-        0x31, 0x5f, 0xda, 0x20, 0xc5, 0xc0, 0xf3, 0x55, 0x0e, 0xe1, 0xc9, 0xec,
-        0xd7, 0x3e, 0x2a, 0x0c, 0x01, 0xca, 0x7b, 0x22, 0xcb, 0xac, 0xf4, 0x2b,
-        0x27, 0xf0, 0x78, 0x5f, 0xb5, 0xc2, 0xf9, 0xe8, 0x14, 0x5a, 0x6e, 0x7e,
-        0x86, 0xbd, 0x6a, 0x9b, 0x20, 0x0c, 0xba, 0xcc, 0x97, 0x20, 0x11, 0x02,
-        0x41, 0x00, 0xc9, 0x59, 0x9f, 0x29, 0x8a, 0x5b, 0x9f, 0xe3, 0x2a, 0xd8,
-        0x7e, 0xc2, 0x40, 0x9f, 0xa8, 0x45, 0xe5, 0x3e, 0x11, 0x8d, 0x3c, 0xed,
-        0x6e, 0xab, 0xce, 0xd0, 0x65, 0x46, 0xd8, 0xc7, 0x07, 0x63, 0xb5, 0x23,
-        0x34, 0xf4, 0x9f, 0x7e, 0x1c, 0xc7, 0xc7, 0xf9, 0x65, 0xd1, 0xf4, 0x04,
-        0x42, 0x38, 0xbe, 0x3a, 0x0c, 0x9d, 0x08, 0x25, 0xfc, 0xa3, 0x71, 0xd9,
-        0xae, 0x0c, 0x39, 0x61, 0xf4, 0x89, 0x02, 0x41, 0x00, 0xed, 0xef, 0xab,
-        0xa9, 0xd5, 0x39, 0x9c, 0xee, 0x59, 0x1b, 0xff, 0xcf, 0x48, 0x44, 0x1b,
-        0xb6, 0x32, 0xe7, 0x46, 0x24, 0xf3, 0x04, 0x7f, 0xde, 0x95, 0x08, 0x6d,
-        0x75, 0x9e, 0x67, 0x17, 0xba, 0x5c, 0xa4, 0xd4, 0xe2, 0xe2, 0x4d, 0x77,
-        0xce, 0xeb, 0x66, 0x29, 0xc5, 0x96, 0xe0, 0x62, 0xbb, 0xe5, 0xac, 0xdc,
-        0x44, 0x62, 0x54, 0x86, 0xed, 0x64, 0x0c, 0xce, 0xd0, 0x60, 0x03, 0x9d,
-        0x49, 0x02, 0x40, 0x54, 0xd9, 0x18, 0x72, 0x27, 0xe4, 0xbe, 0x76, 0xbb,
-        0x1a, 0x6a, 0x28, 0x2f, 0x95, 0x58, 0x12, 0xc4, 0x2c, 0xa8, 0xb6, 0xcc,
-        0xe2, 0xfd, 0x0d, 0x17, 0x64, 0xc8, 0x18, 0xd7, 0xc6, 0xdf, 0x3d, 0x4c,
-        0x1a, 0x9e, 0xf9, 0x2a, 0xb0, 0xb9, 0x2e, 0x12, 0xfd, 0xec, 0xc3, 0x51,
-        0xc1, 0xed, 0xa9, 0xfd, 0xb7, 0x76, 0x93, 0x41, 0xd8, 0xc8, 0x22, 0x94,
-        0x1a, 0x77, 0xf6, 0x9c, 0xc3, 0xc3, 0x89, 0x02, 0x41, 0x00, 0x8e, 0xf9,
-        0xa7, 0x08, 0xad, 0xb5, 0x2a, 0x04, 0xdb, 0x8d, 0x04, 0xa1, 0xb5, 0x06,
-        0x20, 0x34, 0xd2, 0xcf, 0xc0, 0x89, 0xb1, 0x72, 0x31, 0xb8, 0x39, 0x8b,
-        0xcf, 0xe2, 0x8e, 0xa5, 0xda, 0x4f, 0x45, 0x1e, 0x53, 0x42, 0x66, 0xc4,
-        0x30, 0x4b, 0x29, 0x8e, 0xc1, 0x69, 0x17, 0x29, 0x8c, 0x8a, 0xe6, 0x0f,
-        0x82, 0x68, 0xa1, 0x41, 0xb3, 0xb6, 0x70, 0x99, 0x75, 0xa9, 0x27, 0x18,
-        0xe4, 0xe9, 0x02, 0x41, 0x00, 0x89, 0xea, 0x6e, 0x6d, 0x70, 0xdf, 0x25,
-        0x5f, 0x18, 0x3f, 0x48, 0xda, 0x63, 0x10, 0x8b, 0xfe, 0xa8, 0x0c, 0x94,
-        0x0f, 0xde, 0x97, 0x56, 0x53, 0x89, 0x94, 0xe2, 0x1e, 0x2c, 0x74, 0x3c,
-        0x91, 0x81, 0x34, 0x0b, 0xa6, 0x40, 0xf8, 0xcb, 0x2a, 0x60, 0x8c, 0xe0,
-        0x02, 0xb7, 0x89, 0x93, 0xcf, 0x18, 0x9f, 0x49, 0x54, 0xfd, 0x7d, 0x3f,
-        0x9a, 0xef, 0xd4, 0xa4, 0x4f, 0xc1, 0x45, 0x99, 0x91,
+        0x30,
+        0x82,
+        0x02,
+        0x5d,
+        0x02,
+        0x01,
+        0x00,
+        0x02,
+        0x81,
+        0x81,
+        0x00,
+        0xbb,
+        0x24,
+        0x7a,
+        0x09,
+        0x7e,
+        0x0e,
+        0xb2,
+        0x37,
+        0x32,
+        0xcc,
+        0x39,
+        0x67,
+        0xad,
+        0xf1,
+        0x9e,
+        0x3d,
+        0x6b,
+        0x82,
+        0x83,
+        0xd1,
+        0xd0,
+        0xac,
+        0xa4,
+        0xc0,
+        0x18,
+        0xbe,
+        0x8d,
+        0x98,
+        0x00,
+        0xc0,
+        0x7b,
+        0xff,
+        0x07,
+        0x44,
+        0xc9,
+        0xca,
+        0x1c,
+        0xba,
+        0x36,
+        0xe1,
+        0x27,
+        0x69,
+        0xff,
+        0xb1,
+        0xe3,
+        0x8d,
+        0x8b,
+        0xee,
+        0x57,
+        0xa9,
+        0x3a,
+        0xaa,
+        0x16,
+        0x43,
+        0x39,
+        0x54,
+        0x19,
+        0x7c,
+        0xae,
+        0x69,
+        0x24,
+        0x14,
+        0xf6,
+        0x64,
+        0xff,
+        0xbc,
+        0x74,
+        0xc6,
+        0x67,
+        0x6c,
+        0x4c,
+        0xf1,
+        0x02,
+        0x49,
+        0x69,
+        0xc7,
+        0x2b,
+        0xe1,
+        0xe1,
+        0xa1,
+        0xa3,
+        0x43,
+        0x14,
+        0xf4,
+        0x77,
+        0x8f,
+        0xc8,
+        0xd0,
+        0x85,
+        0x5a,
+        0x35,
+        0x95,
+        0xac,
+        0x62,
+        0xa9,
+        0xc1,
+        0x21,
+        0x00,
+        0x77,
+        0xa0,
+        0x8b,
+        0x97,
+        0x30,
+        0xb4,
+        0x5a,
+        0x2c,
+        0xb8,
+        0x90,
+        0x2f,
+        0x48,
+        0xa0,
+        0x05,
+        0x28,
+        0x4b,
+        0xf2,
+        0x0f,
+        0x8d,
+        0xec,
+        0x8b,
+        0x4d,
+        0x03,
+        0x42,
+        0x75,
+        0xd6,
+        0xad,
+        0x81,
+        0xc0,
+        0x11,
+        0x02,
+        0x03,
+        0x01,
+        0x00,
+        0x01,
+        0x02,
+        0x81,
+        0x80,
+        0x00,
+        0xfc,
+        0xb9,
+        0x4a,
+        0x26,
+        0x07,
+        0x89,
+        0x51,
+        0x2b,
+        0x53,
+        0x72,
+        0x91,
+        0xe0,
+        0x18,
+        0x3e,
+        0xa6,
+        0x5e,
+        0x31,
+        0xef,
+        0x9c,
+        0x0c,
+        0x16,
+        0x24,
+        0x42,
+        0xd0,
+        0x28,
+        0x33,
+        0xf9,
+        0xfa,
+        0xd0,
+        0x3c,
+        0x54,
+        0x04,
+        0x06,
+        0xc0,
+        0x15,
+        0xf5,
+        0x1b,
+        0x9a,
+        0xb3,
+        0x24,
+        0x31,
+        0xab,
+        0x3c,
+        0x6b,
+        0x47,
+        0x43,
+        0xb0,
+        0xd2,
+        0xa9,
+        0xdc,
+        0x05,
+        0xe1,
+        0x81,
+        0x59,
+        0xb6,
+        0x04,
+        0xe9,
+        0x66,
+        0x61,
+        0xaa,
+        0xd7,
+        0x0b,
+        0x00,
+        0x8f,
+        0x3d,
+        0xe5,
+        0xbf,
+        0xa2,
+        0xf8,
+        0x5e,
+        0x25,
+        0x6c,
+        0x1e,
+        0x22,
+        0x0f,
+        0xb4,
+        0xfd,
+        0x41,
+        0xe2,
+        0x03,
+        0x31,
+        0x5f,
+        0xda,
+        0x20,
+        0xc5,
+        0xc0,
+        0xf3,
+        0x55,
+        0x0e,
+        0xe1,
+        0xc9,
+        0xec,
+        0xd7,
+        0x3e,
+        0x2a,
+        0x0c,
+        0x01,
+        0xca,
+        0x7b,
+        0x22,
+        0xcb,
+        0xac,
+        0xf4,
+        0x2b,
+        0x27,
+        0xf0,
+        0x78,
+        0x5f,
+        0xb5,
+        0xc2,
+        0xf9,
+        0xe8,
+        0x14,
+        0x5a,
+        0x6e,
+        0x7e,
+        0x86,
+        0xbd,
+        0x6a,
+        0x9b,
+        0x20,
+        0x0c,
+        0xba,
+        0xcc,
+        0x97,
+        0x20,
+        0x11,
+        0x02,
+        0x41,
+        0x00,
+        0xc9,
+        0x59,
+        0x9f,
+        0x29,
+        0x8a,
+        0x5b,
+        0x9f,
+        0xe3,
+        0x2a,
+        0xd8,
+        0x7e,
+        0xc2,
+        0x40,
+        0x9f,
+        0xa8,
+        0x45,
+        0xe5,
+        0x3e,
+        0x11,
+        0x8d,
+        0x3c,
+        0xed,
+        0x6e,
+        0xab,
+        0xce,
+        0xd0,
+        0x65,
+        0x46,
+        0xd8,
+        0xc7,
+        0x07,
+        0x63,
+        0xb5,
+        0x23,
+        0x34,
+        0xf4,
+        0x9f,
+        0x7e,
+        0x1c,
+        0xc7,
+        0xc7,
+        0xf9,
+        0x65,
+        0xd1,
+        0xf4,
+        0x04,
+        0x42,
+        0x38,
+        0xbe,
+        0x3a,
+        0x0c,
+        0x9d,
+        0x08,
+        0x25,
+        0xfc,
+        0xa3,
+        0x71,
+        0xd9,
+        0xae,
+        0x0c,
+        0x39,
+        0x61,
+        0xf4,
+        0x89,
+        0x02,
+        0x41,
+        0x00,
+        0xed,
+        0xef,
+        0xab,
+        0xa9,
+        0xd5,
+        0x39,
+        0x9c,
+        0xee,
+        0x59,
+        0x1b,
+        0xff,
+        0xcf,
+        0x48,
+        0x44,
+        0x1b,
+        0xb6,
+        0x32,
+        0xe7,
+        0x46,
+        0x24,
+        0xf3,
+        0x04,
+        0x7f,
+        0xde,
+        0x95,
+        0x08,
+        0x6d,
+        0x75,
+        0x9e,
+        0x67,
+        0x17,
+        0xba,
+        0x5c,
+        0xa4,
+        0xd4,
+        0xe2,
+        0xe2,
+        0x4d,
+        0x77,
+        0xce,
+        0xeb,
+        0x66,
+        0x29,
+        0xc5,
+        0x96,
+        0xe0,
+        0x62,
+        0xbb,
+        0xe5,
+        0xac,
+        0xdc,
+        0x44,
+        0x62,
+        0x54,
+        0x86,
+        0xed,
+        0x64,
+        0x0c,
+        0xce,
+        0xd0,
+        0x60,
+        0x03,
+        0x9d,
+        0x49,
+        0x02,
+        0x40,
+        0x54,
+        0xd9,
+        0x18,
+        0x72,
+        0x27,
+        0xe4,
+        0xbe,
+        0x76,
+        0xbb,
+        0x1a,
+        0x6a,
+        0x28,
+        0x2f,
+        0x95,
+        0x58,
+        0x12,
+        0xc4,
+        0x2c,
+        0xa8,
+        0xb6,
+        0xcc,
+        0xe2,
+        0xfd,
+        0x0d,
+        0x17,
+        0x64,
+        0xc8,
+        0x18,
+        0xd7,
+        0xc6,
+        0xdf,
+        0x3d,
+        0x4c,
+        0x1a,
+        0x9e,
+        0xf9,
+        0x2a,
+        0xb0,
+        0xb9,
+        0x2e,
+        0x12,
+        0xfd,
+        0xec,
+        0xc3,
+        0x51,
+        0xc1,
+        0xed,
+        0xa9,
+        0xfd,
+        0xb7,
+        0x76,
+        0x93,
+        0x41,
+        0xd8,
+        0xc8,
+        0x22,
+        0x94,
+        0x1a,
+        0x77,
+        0xf6,
+        0x9c,
+        0xc3,
+        0xc3,
+        0x89,
+        0x02,
+        0x41,
+        0x00,
+        0x8e,
+        0xf9,
+        0xa7,
+        0x08,
+        0xad,
+        0xb5,
+        0x2a,
+        0x04,
+        0xdb,
+        0x8d,
+        0x04,
+        0xa1,
+        0xb5,
+        0x06,
+        0x20,
+        0x34,
+        0xd2,
+        0xcf,
+        0xc0,
+        0x89,
+        0xb1,
+        0x72,
+        0x31,
+        0xb8,
+        0x39,
+        0x8b,
+        0xcf,
+        0xe2,
+        0x8e,
+        0xa5,
+        0xda,
+        0x4f,
+        0x45,
+        0x1e,
+        0x53,
+        0x42,
+        0x66,
+        0xc4,
+        0x30,
+        0x4b,
+        0x29,
+        0x8e,
+        0xc1,
+        0x69,
+        0x17,
+        0x29,
+        0x8c,
+        0x8a,
+        0xe6,
+        0x0f,
+        0x82,
+        0x68,
+        0xa1,
+        0x41,
+        0xb3,
+        0xb6,
+        0x70,
+        0x99,
+        0x75,
+        0xa9,
+        0x27,
+        0x18,
+        0xe4,
+        0xe9,
+        0x02,
+        0x41,
+        0x00,
+        0x89,
+        0xea,
+        0x6e,
+        0x6d,
+        0x70,
+        0xdf,
+        0x25,
+        0x5f,
+        0x18,
+        0x3f,
+        0x48,
+        0xda,
+        0x63,
+        0x10,
+        0x8b,
+        0xfe,
+        0xa8,
+        0x0c,
+        0x94,
+        0x0f,
+        0xde,
+        0x97,
+        0x56,
+        0x53,
+        0x89,
+        0x94,
+        0xe2,
+        0x1e,
+        0x2c,
+        0x74,
+        0x3c,
+        0x91,
+        0x81,
+        0x34,
+        0x0b,
+        0xa6,
+        0x40,
+        0xf8,
+        0xcb,
+        0x2a,
+        0x60,
+        0x8c,
+        0xe0,
+        0x02,
+        0xb7,
+        0x89,
+        0x93,
+        0xcf,
+        0x18,
+        0x9f,
+        0x49,
+        0x54,
+        0xfd,
+        0x7d,
+        0x3f,
+        0x9a,
+        0xef,
+        0xd4,
+        0xa4,
+        0x4f,
+        0xc1,
+        0x45,
+        0x99,
+        0x91,
     };
 
     p = rsa_key;
     if (!TEST_ptr(pkey = d2i_PrivateKey_ex(EVP_PKEY_RSA, NULL, &p,
-                                           sizeof(rsa_key), NULL, NULL)))
+                      sizeof(rsa_key), NULL, NULL)))
         goto err;
     if (!TEST_int_eq(ERR_peek_error(), 0))
         goto err;
     p12 = PKCS12_create(NULL, NULL, pkey, NULL, NULL,
-                        NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
-                        NID_pbe_WithSHA1And3_Key_TripleDES_CBC, 2, 1, 0);
+        NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
+        NID_pbe_WithSHA1And3_Key_TripleDES_CBC, 2, 1, 0);
     if (!TEST_ptr(p12))
         goto err;
 
@@ -902,7 +3527,7 @@ static int pkcs12_recreate_test(void)
     if (!TEST_ptr(pkey))
         goto err;
     p12 = PKCS12_create("pass", NULL, pkey, cert, NULL, NID_aes_256_cbc,
-                        NID_aes_256_cbc, 2, 1, 0);
+        NID_aes_256_cbc, 2, 1, 0);
     if (!TEST_ptr(p12))
         goto err;
     if (!TEST_int_eq(ERR_peek_error(), 0))
@@ -920,13 +3545,14 @@ static int pkcs12_recreate_test(void)
     if (!TEST_ptr(p12_parsed))
         goto err;
     if (!TEST_int_eq(PKCS12_parse(p12_parsed, "pass", &pkey_parsed,
-                                  &cert_parsed, NULL), 1))
+                         &cert_parsed, NULL),
+            1))
         goto err;
 
     /* cert_parsed also contains auxiliary data */
     p12_recreated = PKCS12_create("new_pass", NULL, pkey_parsed, cert_parsed,
-                                  NULL, NID_aes_256_cbc, NID_aes_256_cbc,
-                                  2, 1, 0);
+        NULL, NID_aes_256_cbc, NID_aes_256_cbc,
+        2, 1, 0);
     if (!TEST_ptr(p12_recreated))
         goto err;
     if (!TEST_int_eq(ERR_peek_error(), 0))
@@ -958,8 +3584,8 @@ const OPTIONS *test_get_options(void)
 {
     static const OPTIONS options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
-        { "write",   OPT_WRITE,   '-', "Write PKCS12 objects to file" },
-        { "legacy",  OPT_LEGACY,  '-', "Test the legacy APIs" },
+        { "write", OPT_WRITE, '-', "Write PKCS12 objects to file" },
+        { "legacy", OPT_LEGACY, '-', "Test the legacy APIs" },
         { "context", OPT_CONTEXT, '-', "Explicitly use a non-default library context" },
         { NULL }
     };
@@ -1010,7 +3636,7 @@ int setup_tests(void)
      */
     if (!default_libctx) {
         if (!TEST_false(OSSL_PROVIDER_available(NULL, "default"))
-                || !TEST_false(OSSL_PROVIDER_available(NULL, "fips")))
+            || !TEST_false(OSSL_PROVIDER_available(NULL, "fips")))
             return 0;
     }
 
diff --git a/test/pkcs7_test.c b/test/pkcs7_test.c
index 7c0380444407d..ac4bb84bbe366 100644
--- a/test/pkcs7_test.c
+++ b/test/pkcs7_test.c
@@ -148,19 +148,19 @@ static int pkcs7_verify_test(void)
 
     if (!TEST_ptr(bio = BIO_new(BIO_s_mem())))
         goto end;
-    for  (i = 0; i < OSSL_NELEM(sig); ++i)
+    for (i = 0; i < OSSL_NELEM(sig); ++i)
         BIO_puts(bio, sig[i]);
 
     ret = TEST_ptr(msg_bio = BIO_new_mem_buf(signed_data, strlen(signed_data)))
-          && TEST_ptr(x509_bio = BIO_new_mem_buf(cert_der, sizeof(cert_der)))
-          && TEST_ptr(cert = d2i_X509_bio(x509_bio, NULL))
-          && TEST_int_eq(ERR_peek_error(), 0)
-          && TEST_ptr(store = X509_STORE_new())
-          && TEST_true(X509_STORE_add_cert(store, cert))
-          && TEST_ptr(p7 = SMIME_read_PKCS7(bio, NULL))
-          && TEST_int_eq(ERR_peek_error(), 0)
-          && TEST_true(PKCS7_verify(p7, NULL, store, msg_bio, NULL, PKCS7_TEXT))
-          && TEST_int_eq(ERR_peek_error(), 0);
+        && TEST_ptr(x509_bio = BIO_new_mem_buf(cert_der, sizeof(cert_der)))
+        && TEST_ptr(cert = d2i_X509_bio(x509_bio, NULL))
+        && TEST_int_eq(ERR_peek_error(), 0)
+        && TEST_ptr(store = X509_STORE_new())
+        && TEST_true(X509_STORE_add_cert(store, cert))
+        && TEST_ptr(p7 = SMIME_read_PKCS7(bio, NULL))
+        && TEST_int_eq(ERR_peek_error(), 0)
+        && TEST_true(PKCS7_verify(p7, NULL, store, msg_bio, NULL, PKCS7_TEXT))
+        && TEST_int_eq(ERR_peek_error(), 0);
 end:
     X509_STORE_free(store);
     X509_free(cert);
@@ -365,18 +365,18 @@ static int pkcs7_inner_content_verify_test(void)
         goto end;
 
     ret = TEST_ptr(x509_bio = BIO_new_mem_buf(smroot_der, sizeof smroot_der))
-            && TEST_ptr(cert = d2i_X509_bio(x509_bio, NULL))
-            && TEST_int_eq(ERR_peek_error(), 0)
-            && TEST_ptr(store = X509_STORE_new())
-            && TEST_true(X509_STORE_add_cert(store, cert))
-            && TEST_ptr(param = X509_STORE_get0_param(store))
-            && TEST_true(X509_VERIFY_PARAM_set_purpose(param,
-                                                       X509_PURPOSE_CODE_SIGN))
-            && TEST_true(X509_STORE_set1_param(store, param))
-            && TEST_ptr(p7 = d2i_PKCS7_bio(bio, NULL))
-            && TEST_int_eq(ERR_peek_error(), 0)
-            && TEST_true(PKCS7_verify(p7, NULL, store, NULL, NULL, 0))
-            && TEST_int_eq(ERR_peek_error(), 0);
+        && TEST_ptr(cert = d2i_X509_bio(x509_bio, NULL))
+        && TEST_int_eq(ERR_peek_error(), 0)
+        && TEST_ptr(store = X509_STORE_new())
+        && TEST_true(X509_STORE_add_cert(store, cert))
+        && TEST_ptr(param = X509_STORE_get0_param(store))
+        && TEST_true(X509_VERIFY_PARAM_set_purpose(param,
+            X509_PURPOSE_CODE_SIGN))
+        && TEST_true(X509_STORE_set1_param(store, param))
+        && TEST_ptr(p7 = d2i_PKCS7_bio(bio, NULL))
+        && TEST_int_eq(ERR_peek_error(), 0)
+        && TEST_true(PKCS7_verify(p7, NULL, store, NULL, NULL, 0))
+        && TEST_int_eq(ERR_peek_error(), 0);
 end:
     X509_STORE_free(store);
     X509_free(cert);
diff --git a/test/pkey_meth_kdf_test.c b/test/pkey_meth_kdf_test.c
index ad58adf482614..015c5df24aaec 100644
--- a/test/pkey_meth_kdf_test.c
+++ b/test/pkey_meth_kdf_test.c
@@ -36,24 +36,28 @@ static int test_kdf_tls1_prf(int index)
         goto err;
     }
     if (EVP_PKEY_CTX_set1_tls1_prf_secret(pctx,
-                                          (unsigned char *)"secret", 6) <= 0) {
+            (unsigned char *)"secret", 6)
+        <= 0) {
         TEST_error("EVP_PKEY_CTX_set1_tls1_prf_secret");
         goto err;
     }
     if (index == 0) {
         if (EVP_PKEY_CTX_add1_tls1_prf_seed(pctx,
-                                            (unsigned char *)"seed", 4) <= 0) {
+                (unsigned char *)"seed", 4)
+            <= 0) {
             TEST_error("EVP_PKEY_CTX_add1_tls1_prf_seed");
             goto err;
         }
     } else {
         if (EVP_PKEY_CTX_add1_tls1_prf_seed(pctx,
-                                            (unsigned char *)"se", 2) <= 0) {
+                (unsigned char *)"se", 2)
+            <= 0) {
             TEST_error("EVP_PKEY_CTX_add1_tls1_prf_seed");
             goto err;
         }
         if (EVP_PKEY_CTX_add1_tls1_prf_seed(pctx,
-                                            (unsigned char *)"ed", 2) <= 0) {
+                (unsigned char *)"ed", 2)
+            <= 0) {
             TEST_error("EVP_PKEY_CTX_add1_tls1_prf_seed");
             goto err;
         }
@@ -98,12 +102,12 @@ static int test_kdf_hkdf(int index)
         goto err;
     }
     if (EVP_PKEY_CTX_set1_hkdf_salt(pctx, (const unsigned char *)"salt", 4)
-            <= 0) {
+        <= 0) {
         TEST_error("EVP_PKEY_CTX_set1_hkdf_salt");
         goto err;
     }
     if (EVP_PKEY_CTX_set1_hkdf_key(pctx, (const unsigned char *)"secret", 6)
-            <= 0) {
+        <= 0) {
         TEST_error("EVP_PKEY_CTX_set1_hkdf_key");
         goto err;
     }
diff --git a/test/pkey_meth_test.c b/test/pkey_meth_test.c
index d3c6c79684391..83ec3b5bdff03 100644
--- a/test/pkey_meth_test.c
+++ b/test/pkey_meth_test.c
@@ -33,7 +33,6 @@ static int test_asn1_meths(void)
         if (pkey_id < prev)
             good = 0;
         prev = pkey_id;
-
     }
     if (!good) {
         TEST_error("EVP_PKEY_ASN1_METHOD table out of order");
@@ -66,7 +65,6 @@ static int test_pkey_meths(void)
         if (pkey_id < prev)
             good = 0;
         prev = pkey_id;
-
     }
     if (!good) {
         TEST_error("EVP_PKEY_METHOD table out of order");
diff --git a/test/poly1305_internal_test.c b/test/poly1305_internal_test.c
index 359025de0b080..c6399be3712ec 100644
--- a/test/poly1305_internal_test.c
+++ b/test/poly1305_internal_test.c
@@ -38,117 +38,61 @@ static TESTDATA tests[] = {
      * RFC7539
      */
     {
-        {
-            34,
-            {
-                0x43, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72,
+        { 34,
+            { 0x43, 0x72, 0x79, 0x70, 0x74, 0x6f, 0x67, 0x72,
                 0x61, 0x70, 0x68, 0x69, 0x63, 0x20, 0x46, 0x6f,
                 0x72, 0x75, 0x6d, 0x20, 0x52, 0x65, 0x73, 0x65,
                 0x61, 0x72, 0x63, 0x68, 0x20, 0x47, 0x72, 0x6f,
 
-                0x75, 0x70
-            }
-        },
-        {
-            32,
-            {
-                0x85, 0xd6, 0xbe, 0x78, 0x57, 0x55, 0x6d, 0x33,
+                0x75, 0x70 } },
+        { 32,
+            { 0x85, 0xd6, 0xbe, 0x78, 0x57, 0x55, 0x6d, 0x33,
                 0x7f, 0x44, 0x52, 0xfe, 0x42, 0xd5, 0x06, 0xa8,
                 0x01, 0x03, 0x80, 0x8a, 0xfb, 0x0d, 0xb2, 0xfd,
-                0x4a, 0xbf, 0xf6, 0xaf, 0x41, 0x49, 0xf5, 0x1b
-            }
-        },
-        {
-            16,
-            {
-                0xa8, 0x06, 0x1d, 0xc1, 0x30, 0x51, 0x36, 0xc6,
-                0xc2, 0x2b, 0x8b, 0xaf, 0x0c, 0x01, 0x27, 0xa9
-            }
-        }
-    },
+                0x4a, 0xbf, 0xf6, 0xaf, 0x41, 0x49, 0xf5, 0x1b } },
+        { 16,
+            { 0xa8, 0x06, 0x1d, 0xc1, 0x30, 0x51, 0x36, 0xc6,
+                0xc2, 0x2b, 0x8b, 0xaf, 0x0c, 0x01, 0x27, 0xa9 } } },
     /*
      * test vectors from "The Poly1305-AES message-authentication code"
      */
     {
-        {
-            2,
-            {
-                0xf3, 0xf6
-            }
-        },
-        {
-            32,
-            {
-                0x85, 0x1f, 0xc4, 0x0c, 0x34, 0x67, 0xac, 0x0b,
+        { 2,
+            { 0xf3, 0xf6 } },
+        { 32,
+            { 0x85, 0x1f, 0xc4, 0x0c, 0x34, 0x67, 0xac, 0x0b,
                 0xe0, 0x5c, 0xc2, 0x04, 0x04, 0xf3, 0xf7, 0x00,
                 0x58, 0x0b, 0x3b, 0x0f, 0x94, 0x47, 0xbb, 0x1e,
-                0x69, 0xd0, 0x95, 0xb5, 0x92, 0x8b, 0x6d, 0xbc
-            }
-        },
-        {
-            16,
-            {
-                0xf4, 0xc6, 0x33, 0xc3, 0x04, 0x4f, 0xc1, 0x45,
-                0xf8, 0x4f, 0x33, 0x5c, 0xb8, 0x19, 0x53, 0xde
-            }
-        }
-    },
-    {
-        {
-            0,
-            {
-                0
-            }
-        },
-        {
-            32,
-            {
-                0xa0, 0xf3, 0x08, 0x00, 0x00, 0xf4, 0x64, 0x00,
+                0x69, 0xd0, 0x95, 0xb5, 0x92, 0x8b, 0x6d, 0xbc } },
+        { 16,
+            { 0xf4, 0xc6, 0x33, 0xc3, 0x04, 0x4f, 0xc1, 0x45,
+                0xf8, 0x4f, 0x33, 0x5c, 0xb8, 0x19, 0x53, 0xde } } },
+    { { 0,
+          { 0 } },
+        { 32,
+            { 0xa0, 0xf3, 0x08, 0x00, 0x00, 0xf4, 0x64, 0x00,
                 0xd0, 0xc7, 0xe9, 0x07, 0x6c, 0x83, 0x44, 0x03,
                 0xdd, 0x3f, 0xab, 0x22, 0x51, 0xf1, 0x1a, 0xc7,
-                0x59, 0xf0, 0x88, 0x71, 0x29, 0xcc, 0x2e, 0xe7
-            }
-        },
-        {
-            16,
-            {
-                0xdd, 0x3f, 0xab, 0x22, 0x51, 0xf1, 0x1a, 0xc7,
-                0x59, 0xf0, 0x88, 0x71, 0x29, 0xcc, 0x2e, 0xe7
-            }
-        }
-    },
-    {
-        {
-            32,
-            {
-                0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
-                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
-                0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
-                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36
-            }
-        },
-        {
-            32,
-            {
-                0x48, 0x44, 0x3d, 0x0b, 0xb0, 0xd2, 0x11, 0x09,
+                0x59, 0xf0, 0x88, 0x71, 0x29, 0xcc, 0x2e, 0xe7 } },
+        { 16,
+            { 0xdd, 0x3f, 0xab, 0x22, 0x51, 0xf1, 0x1a, 0xc7,
+                0x59, 0xf0, 0x88, 0x71, 0x29, 0xcc, 0x2e, 0xe7 } } },
+    { { 32,
+          { 0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
+              0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
+              0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
+              0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36 } },
+        { 32,
+            { 0x48, 0x44, 0x3d, 0x0b, 0xb0, 0xd2, 0x11, 0x09,
                 0xc8, 0x9a, 0x10, 0x0b, 0x5c, 0xe2, 0xc2, 0x08,
                 0x83, 0x14, 0x9c, 0x69, 0xb5, 0x61, 0xdd, 0x88,
-                0x29, 0x8a, 0x17, 0x98, 0xb1, 0x07, 0x16, 0xef
-            }
-        },
-        {
-            16,
-            {
-                0x0e, 0xe1, 0xc1, 0x6b, 0xb7, 0x3f, 0x0f, 0x4f,
-                0xd1, 0x98, 0x81, 0x75, 0x3c, 0x01, 0xcd, 0xbe
-            }
-        }
-    },
+                0x29, 0x8a, 0x17, 0x98, 0xb1, 0x07, 0x16, 0xef } },
+        { 16,
+            { 0x0e, 0xe1, 0xc1, 0x6b, 0xb7, 0x3f, 0x0f, 0x4f,
+                0xd1, 0x98, 0x81, 0x75, 0x3c, 0x01, 0xcd, 0xbe } } },
     {
-        {
-            63,
-            {
-                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+        { 63,
+            { 0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
                 0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
                 0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
                 0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
@@ -156,35 +100,23 @@ static TESTDATA tests[] = {
                 0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
                 0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
                 0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
-                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9
-            }
-        },
-        {
-            32,
-            {
-                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9 } },
+        { 32,
+            { 0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
                 0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
                 0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
-                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
-            }
-        },
-        {
-            16,
-            {
-                0x51, 0x54, 0xad, 0x0d, 0x2c, 0xb2, 0x6e, 0x01,
-                0x27, 0x4f, 0xc5, 0x11, 0x48, 0x49, 0x1f, 0x1b
-            }
-        },
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57 } },
+        { 16,
+            { 0x51, 0x54, 0xad, 0x0d, 0x2c, 0xb2, 0x6e, 0x01,
+                0x27, 0x4f, 0xc5, 0x11, 0x48, 0x49, 0x1f, 0x1b } },
     },
     /*
      * self-generated vectors exercise "significant" lengths, such that
      * are handled by different code paths
      */
     {
-        {
-            64,
-            {
-                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+        { 64,
+            { 0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
                 0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
                 0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
                 0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
@@ -192,62 +124,39 @@ static TESTDATA tests[] = {
                 0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
                 0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67,
                 0xfa, 0x83, 0xe1, 0x58, 0xc9, 0x94, 0xd9, 0x61,
-                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9, 0xaf
-            }
-        },
-        {
-            32,
-            {
-                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xc4, 0xcb, 0x21, 0x09, 0x5c, 0x1b, 0xf9, 0xaf } },
+        { 32,
+            { 0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
                 0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
                 0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
-                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
-            }
-        },
-        {
-            16,
-            {
-                0x81, 0x20, 0x59, 0xa5, 0xda, 0x19, 0x86, 0x37,
-                0xca, 0xc7, 0xc4, 0xa6, 0x31, 0xbe, 0xe4, 0x66
-            }
-        },
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57 } },
+        { 16,
+            { 0x81, 0x20, 0x59, 0xa5, 0xda, 0x19, 0x86, 0x37,
+                0xca, 0xc7, 0xc4, 0xa6, 0x31, 0xbe, 0xe4, 0x66 } },
     },
     {
-        {
-            48,
-            {
-                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+        { 48,
+            { 0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
                 0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
                 0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
                 0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
 
                 0x99, 0x0c, 0x62, 0xe4, 0x8b, 0x80, 0x18, 0xb2,
-                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67
-            }
-        },
-        {
-            32,
-            {
-                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xc3, 0xe4, 0xa0, 0xfa, 0x31, 0x34, 0xcb, 0x67 } },
+        { 32,
+            { 0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
                 0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
                 0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
                 0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
 
-            }
-        },
-        {
-            16,
-            {
-                0x5b, 0x88, 0xd7, 0xf6, 0x22, 0x8b, 0x11, 0xe2,
-                0xe2, 0x85, 0x79, 0xa5, 0xc0, 0xc1, 0xf7, 0x61
-            }
-        },
+            } },
+        { 16,
+            { 0x5b, 0x88, 0xd7, 0xf6, 0x22, 0x8b, 0x11, 0xe2,
+                0xe2, 0x85, 0x79, 0xa5, 0xc0, 0xc1, 0xf7, 0x61 } },
     },
     {
-        {
-            96,
-            {
-                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+        { 96,
+            { 0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
                 0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
                 0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
                 0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
@@ -260,31 +169,19 @@ static TESTDATA tests[] = {
                 0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
                 0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
                 0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
-                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36
-            }
-        },
-        {
-            32,
-            {
-                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36 } },
+        { 32,
+            { 0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
                 0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
                 0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
-                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
-            }
-        },
-        {
-            16,
-            {
-                0xbb, 0xb6, 0x13, 0xb2, 0xb6, 0xd7, 0x53, 0xba,
-                0x07, 0x39, 0x5b, 0x91, 0x6a, 0xae, 0xce, 0x15
-            }
-        },
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57 } },
+        { 16,
+            { 0xbb, 0xb6, 0x13, 0xb2, 0xb6, 0xd7, 0x53, 0xba,
+                0x07, 0x39, 0x5b, 0x91, 0x6a, 0xae, 0xce, 0x15 } },
     },
     {
-        {
-            112,
-            {
-                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+        { 112,
+            { 0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
                 0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
                 0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
                 0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
@@ -300,31 +197,19 @@ static TESTDATA tests[] = {
                 0x29, 0x8a, 0x17, 0x98, 0xb1, 0x07, 0x16, 0xef,
 
                 0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
-                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24
-            }
-        },
-        {
-            32,
-            {
-                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24 } },
+        { 32,
+            { 0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
                 0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
                 0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
-                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
-            }
-        },
-        {
-            16,
-            {
-                0xc7, 0x94, 0xd7, 0x05, 0x7d, 0x17, 0x78, 0xc4,
-                0xbb, 0xee, 0x0a, 0x39, 0xb3, 0xd9, 0x73, 0x42
-            }
-        },
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57 } },
+        { 16,
+            { 0xc7, 0x94, 0xd7, 0x05, 0x7d, 0x17, 0x78, 0xc4,
+                0xbb, 0xee, 0x0a, 0x39, 0xb3, 0xd9, 0x73, 0x42 } },
     },
     {
-        {
-            128,
-            {
-                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+        { 128,
+            { 0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
                 0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
                 0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
                 0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
@@ -342,31 +227,19 @@ static TESTDATA tests[] = {
                 0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
                 0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
                 0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
-                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36
-            }
-        },
-        {
-            32,
-            {
-                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36 } },
+        { 32,
+            { 0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
                 0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
                 0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
-                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
-            }
-        },
-        {
-            16,
-            {
-                0xff, 0xbc, 0xb9, 0xb3, 0x71, 0x42, 0x31, 0x52,
-                0xd7, 0xfc, 0xa5, 0xad, 0x04, 0x2f, 0xba, 0xa9
-            }
-        },
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57 } },
+        { 16,
+            { 0xff, 0xbc, 0xb9, 0xb3, 0x71, 0x42, 0x31, 0x52,
+                0xd7, 0xfc, 0xa5, 0xad, 0x04, 0x2f, 0xba, 0xa9 } },
     },
     {
-        {
-            144,
-            {
-                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+        { 144,
+            { 0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
                 0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
                 0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
                 0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
@@ -387,31 +260,19 @@ static TESTDATA tests[] = {
                 0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36,
 
                 0x81, 0x20, 0x59, 0xa5, 0xda, 0x19, 0x86, 0x37,
-                0xca, 0xc7, 0xc4, 0xa6, 0x31, 0xbe, 0xe4, 0x66
-            }
-        },
-        {
-            32,
-            {
-                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xca, 0xc7, 0xc4, 0xa6, 0x31, 0xbe, 0xe4, 0x66 } },
+        { 32,
+            { 0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
                 0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
                 0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
-                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
-            }
-        },
-        {
-            16,
-            {
-                0x06, 0x9e, 0xd6, 0xb8, 0xef, 0x0f, 0x20, 0x7b,
-                0x3e, 0x24, 0x3b, 0xb1, 0x01, 0x9f, 0xe6, 0x32
-            }
-        },
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57 } },
+        { 16,
+            { 0x06, 0x9e, 0xd6, 0xb8, 0xef, 0x0f, 0x20, 0x7b,
+                0x3e, 0x24, 0x3b, 0xb1, 0x01, 0x9f, 0xe6, 0x32 } },
     },
     {
-        {
-            160,
-            {
-                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+        { 160,
+            { 0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
                 0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
                 0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
                 0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
@@ -434,31 +295,19 @@ static TESTDATA tests[] = {
                 0x81, 0x20, 0x59, 0xa5, 0xda, 0x19, 0x86, 0x37,
                 0xca, 0xc7, 0xc4, 0xa6, 0x31, 0xbe, 0xe4, 0x66,
                 0x5b, 0x88, 0xd7, 0xf6, 0x22, 0x8b, 0x11, 0xe2,
-                0xe2, 0x85, 0x79, 0xa5, 0xc0, 0xc1, 0xf7, 0x61
-            }
-        },
-        {
-            32,
-            {
-                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xe2, 0x85, 0x79, 0xa5, 0xc0, 0xc1, 0xf7, 0x61 } },
+        { 32,
+            { 0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
                 0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
                 0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
-                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
-            }
-        },
-        {
-            16,
-            {
-                0xcc, 0xa3, 0x39, 0xd9, 0xa4, 0x5f, 0xa2, 0x36,
-                0x8c, 0x2c, 0x68, 0xb3, 0xa4, 0x17, 0x91, 0x33
-            }
-        },
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57 } },
+        { 16,
+            { 0xcc, 0xa3, 0x39, 0xd9, 0xa4, 0x5f, 0xa2, 0x36,
+                0x8c, 0x2c, 0x68, 0xb3, 0xa4, 0x17, 0x91, 0x33 } },
     },
     {
-        {
-            288,
-            {
-                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+        { 288,
+            { 0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
                 0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
                 0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
                 0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
@@ -501,31 +350,19 @@ static TESTDATA tests[] = {
                 0x66, 0x3c, 0xea, 0x19, 0x0f, 0xfb, 0x83, 0xd8,
                 0x95, 0x93, 0xf3, 0xf4, 0x76, 0xb6, 0xbc, 0x24,
                 0xd7, 0xe6, 0x79, 0x10, 0x7e, 0xa2, 0x6a, 0xdb,
-                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36
-            }
-        },
-        {
-            32,
-            {
-                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0x8c, 0xaf, 0x66, 0x52, 0xd0, 0x65, 0x61, 0x36 } },
+        { 32,
+            { 0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
                 0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
                 0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
-                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
-            }
-        },
-        {
-            16,
-            {
-                0x53, 0xf6, 0xe8, 0x28, 0xa2, 0xf0, 0xfe, 0x0e,
-                0xe8, 0x15, 0xbf, 0x0b, 0xd5, 0x84, 0x1a, 0x34
-            }
-        },
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57 } },
+        { 16,
+            { 0x53, 0xf6, 0xe8, 0x28, 0xa2, 0xf0, 0xfe, 0x0e,
+                0xe8, 0x15, 0xbf, 0x0b, 0xd5, 0x84, 0x1a, 0x34 } },
     },
     {
-        {
-            320,
-            {
-                0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
+        { 320,
+            { 0xab, 0x08, 0x12, 0x72, 0x4a, 0x7f, 0x1e, 0x34,
                 0x27, 0x42, 0xcb, 0xed, 0x37, 0x4d, 0x94, 0xd1,
                 0x36, 0xc6, 0xb8, 0x79, 0x5d, 0x45, 0xb3, 0x81,
                 0x98, 0x30, 0xf2, 0xc0, 0x44, 0x91, 0xfa, 0xf0,
@@ -573,34 +410,22 @@ static TESTDATA tests[] = {
                 0x81, 0x20, 0x59, 0xa5, 0xda, 0x19, 0x86, 0x37,
                 0xca, 0xc7, 0xc4, 0xa6, 0x31, 0xbe, 0xe4, 0x66,
                 0x5b, 0x88, 0xd7, 0xf6, 0x22, 0x8b, 0x11, 0xe2,
-                0xe2, 0x85, 0x79, 0xa5, 0xc0, 0xc1, 0xf7, 0x61
-            }
-        },
-        {
-            32,
-            {
-                0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
+                0xe2, 0x85, 0x79, 0xa5, 0xc0, 0xc1, 0xf7, 0x61 } },
+        { 32,
+            { 0x12, 0x97, 0x6a, 0x08, 0xc4, 0x42, 0x6d, 0x0c,
                 0xe8, 0xa8, 0x24, 0x07, 0xc4, 0xf4, 0x82, 0x07,
                 0x80, 0xf8, 0xc2, 0x0a, 0xa7, 0x12, 0x02, 0xd1,
-                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57
-            }
-        },
-        {
-            16,
-            {
-                0xb8, 0x46, 0xd4, 0x4e, 0x9b, 0xbd, 0x53, 0xce,
-                0xdf, 0xfb, 0xfb, 0xb6, 0xb7, 0xfa, 0x49, 0x33
-            }
-        },
+                0xe2, 0x91, 0x79, 0xcb, 0xcb, 0x55, 0x5a, 0x57 } },
+        { 16,
+            { 0xb8, 0x46, 0xd4, 0x4e, 0x9b, 0xbd, 0x53, 0xce,
+                0xdf, 0xfb, 0xfb, 0xb6, 0xb7, 0xfa, 0x49, 0x33 } },
     },
     /*
      * 4th power of the key spills to 131th bit in SIMD key setup
      */
     {
-        {
-            256,
-            {
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        { 256,
+            { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -638,34 +463,22 @@ static TESTDATA tests[] = {
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-            }
-        },
-        {
-            32,
-            {
-                0xad, 0x62, 0x81, 0x07, 0xe8, 0x35, 0x1d, 0x0f,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } },
+        { 32,
+            { 0xad, 0x62, 0x81, 0x07, 0xe8, 0x35, 0x1d, 0x0f,
                 0x2c, 0x23, 0x1a, 0x05, 0xdc, 0x4a, 0x41, 0x06,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
-        {
-            16,
-            {
-                0x07, 0x14, 0x5a, 0x4c, 0x02, 0xfe, 0x5f, 0xa3,
-                0x20, 0x36, 0xde, 0x68, 0xfa, 0xbe, 0x90, 0x66
-            }
-        },
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+        { 16,
+            { 0x07, 0x14, 0x5a, 0x4c, 0x02, 0xfe, 0x5f, 0xa3,
+                0x20, 0x36, 0xde, 0x68, 0xfa, 0xbe, 0x90, 0x66 } },
     },
     /*
      * poly1305_ieee754.c failed this in final stage
      */
     {
-        {
-            252,
-            {
-                0x84, 0x23, 0x64, 0xe1, 0x56, 0x33, 0x6c, 0x09,
+        { 252,
+            { 0x84, 0x23, 0x64, 0xe1, 0x56, 0x33, 0x6c, 0x09,
                 0x98, 0xb9, 0x33, 0xa6, 0x23, 0x77, 0x26, 0x18,
                 0x0d, 0x9e, 0x3f, 0xdc, 0xbd, 0xe4, 0xcd, 0x5d,
                 0x17, 0x08, 0x0f, 0xc3, 0xbe, 0xb4, 0x96, 0x14,
@@ -703,34 +516,22 @@ static TESTDATA tests[] = {
                 0xda, 0x94, 0x32, 0x1c, 0x5e, 0x44, 0x06, 0x04,
                 0x89, 0x33, 0x6c, 0xb6, 0x5b, 0xf3, 0x98, 0x9c,
                 0x36, 0xf7, 0x28, 0x2c, 0x2f, 0x5d, 0x2b, 0x88,
-                0x2c, 0x17, 0x1e, 0x74
-            }
-        },
-        {
-            32,
-            {
-                0x95, 0xd5, 0xc0, 0x05, 0x50, 0x3e, 0x51, 0x0d,
+                0x2c, 0x17, 0x1e, 0x74 } },
+        { 32,
+            { 0x95, 0xd5, 0xc0, 0x05, 0x50, 0x3e, 0x51, 0x0d,
                 0x8c, 0xd0, 0xaa, 0x07, 0x2c, 0x4a, 0x4d, 0x06,
                 0x6e, 0xab, 0xc5, 0x2d, 0x11, 0x65, 0x3d, 0xf4,
-                0x7f, 0xbf, 0x63, 0xab, 0x19, 0x8b, 0xcc, 0x26
-            }
-        },
-        {
-            16,
-            {
-                0xf2, 0x48, 0x31, 0x2e, 0x57, 0x8d, 0x9d, 0x58,
-                0xf8, 0xb7, 0xbb, 0x4d, 0x19, 0x10, 0x54, 0x31
-            }
-        },
+                0x7f, 0xbf, 0x63, 0xab, 0x19, 0x8b, 0xcc, 0x26 } },
+        { 16,
+            { 0xf2, 0x48, 0x31, 0x2e, 0x57, 0x8d, 0x9d, 0x58,
+                0xf8, 0xb7, 0xbb, 0x4d, 0x19, 0x10, 0x54, 0x31 } },
     },
     /*
      * AVX2 in poly1305-x86.pl failed this with 176+32 split
      */
     {
-        {
-            208,
-            {
-                0x24, 0x8a, 0xc3, 0x10, 0x85, 0xb6, 0xc2, 0xad,
+        { 208,
+            { 0x24, 0x8a, 0xc3, 0x10, 0x85, 0xb6, 0xc2, 0xad,
                 0xaa, 0xa3, 0x82, 0x59, 0xa0, 0xd7, 0x19, 0x2c,
                 0x5c, 0x35, 0xd1, 0xbb, 0x4e, 0xf3, 0x9a, 0xd9,
                 0x4c, 0x38, 0xd1, 0xc8, 0x24, 0x79, 0xe2, 0xdd,
@@ -761,110 +562,64 @@ static TESTDATA tests[] = {
                 0x71, 0x35, 0x1b, 0x1d, 0x92, 0x1e, 0xa5, 0x51,
                 0x04, 0x7a, 0xbc, 0xc6, 0xb8, 0x7a, 0x90, 0x1f,
                 0xde, 0x7d, 0xb7, 0x9f, 0xa1, 0x81, 0x8c, 0x11,
-                0x33, 0x6d, 0xbc, 0x07, 0x24, 0x4a, 0x40, 0xeb
-            }
-        },
-        {
-            32,
-            {
-                0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                0x33, 0x6d, 0xbc, 0x07, 0x24, 0x4a, 0x40, 0xeb } },
+        { 32,
+            { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
                 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
-        {
-            16,
-            {
-                0xbc, 0x93, 0x9b, 0xc5, 0x28, 0x14, 0x80, 0xfa,
-                0x99, 0xc6, 0xd6, 0x8c, 0x25, 0x8e, 0xc4, 0x2f
-            }
-        },
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+        { 16,
+            { 0xbc, 0x93, 0x9b, 0xc5, 0x28, 0x14, 0x80, 0xfa,
+                0x99, 0xc6, 0xd6, 0x8c, 0x25, 0x8e, 0xc4, 0x2f } },
     },
     /*
      * test vectors from Google
      */
     {
-        {
-            0,
+        { 0,
             {
                 0x00,
-            }
-        },
-        {
-            32,
-            {
-                0xc8, 0xaf, 0xaa, 0xc3, 0x31, 0xee, 0x37, 0x2c,
+            } },
+        { 32,
+            { 0xc8, 0xaf, 0xaa, 0xc3, 0x31, 0xee, 0x37, 0x2c,
                 0xd6, 0x08, 0x2d, 0xe1, 0x34, 0x94, 0x3b, 0x17,
                 0x47, 0x10, 0x13, 0x0e, 0x9f, 0x6f, 0xea, 0x8d,
-                0x72, 0x29, 0x38, 0x50, 0xa6, 0x67, 0xd8, 0x6c
-            }
-        },
-        {
-            16,
-            {
-                0x47, 0x10, 0x13, 0x0e, 0x9f, 0x6f, 0xea, 0x8d,
-                0x72, 0x29, 0x38, 0x50, 0xa6, 0x67, 0xd8, 0x6c
-            }
-        },
+                0x72, 0x29, 0x38, 0x50, 0xa6, 0x67, 0xd8, 0x6c } },
+        { 16,
+            { 0x47, 0x10, 0x13, 0x0e, 0x9f, 0x6f, 0xea, 0x8d,
+                0x72, 0x29, 0x38, 0x50, 0xa6, 0x67, 0xd8, 0x6c } },
     },
     {
-        {
-            12,
-            {
-                0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f,
-                0x72, 0x6c, 0x64, 0x21
-            }
-        },
-        {
-            32,
-            {
-                0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20,
+        { 12,
+            { 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f,
+                0x72, 0x6c, 0x64, 0x21 } },
+        { 32,
+            { 0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20,
                 0x33, 0x32, 0x2d, 0x62, 0x79, 0x74, 0x65, 0x20,
                 0x6b, 0x65, 0x79, 0x20, 0x66, 0x6f, 0x72, 0x20,
-                0x50, 0x6f, 0x6c, 0x79, 0x31, 0x33, 0x30, 0x35
-            }
-        },
-        {
-            16,
-            {
-                0xa6, 0xf7, 0x45, 0x00, 0x8f, 0x81, 0xc9, 0x16,
-                0xa2, 0x0d, 0xcc, 0x74, 0xee, 0xf2, 0xb2, 0xf0
-            }
-        },
+                0x50, 0x6f, 0x6c, 0x79, 0x31, 0x33, 0x30, 0x35 } },
+        { 16,
+            { 0xa6, 0xf7, 0x45, 0x00, 0x8f, 0x81, 0xc9, 0x16,
+                0xa2, 0x0d, 0xcc, 0x74, 0xee, 0xf2, 0xb2, 0xf0 } },
     },
     {
-        {
-            32,
-            {
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        { 32,
+            { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
-        {
-            32,
-            {
-                0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+        { 32,
+            { 0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20,
                 0x33, 0x32, 0x2d, 0x62, 0x79, 0x74, 0x65, 0x20,
                 0x6b, 0x65, 0x79, 0x20, 0x66, 0x6f, 0x72, 0x20,
-                0x50, 0x6f, 0x6c, 0x79, 0x31, 0x33, 0x30, 0x35
-            }
-        },
-        {
-            16,
-            {
-                0x49, 0xec, 0x78, 0x09, 0x0e, 0x48, 0x1e, 0xc6,
-                0xc2, 0x6b, 0x33, 0xb9, 0x1c, 0xcc, 0x03, 0x07
-            }
-        },
+                0x50, 0x6f, 0x6c, 0x79, 0x31, 0x33, 0x30, 0x35 } },
+        { 16,
+            { 0x49, 0xec, 0x78, 0x09, 0x0e, 0x48, 0x1e, 0xc6,
+                0xc2, 0x6b, 0x33, 0xb9, 0x1c, 0xcc, 0x03, 0x07 } },
     },
     {
-        {
-            128,
-            {
-                0x89, 0xda, 0xb8, 0x0b, 0x77, 0x17, 0xc1, 0xdb,
+        { 128,
+            { 0x89, 0xda, 0xb8, 0x0b, 0x77, 0x17, 0xc1, 0xdb,
                 0x5d, 0xb4, 0x37, 0x86, 0x0a, 0x3f, 0x70, 0x21,
                 0x8e, 0x93, 0xe1, 0xb8, 0xf4, 0x61, 0xfb, 0x67,
                 0x7f, 0x16, 0xf3, 0x5f, 0x6f, 0x87, 0xe2, 0xa9,
@@ -882,31 +637,19 @@ static TESTDATA tests[] = {
                 0x41, 0x30, 0x0d, 0xf3, 0x0a, 0xdb, 0xec, 0xa2,
                 0x8f, 0x64, 0x27, 0xa8, 0xbc, 0x1a, 0x99, 0x9f,
                 0xd5, 0x1c, 0x55, 0x4a, 0x01, 0x7d, 0x09, 0x5d,
-                0x8c, 0x3e, 0x31, 0x27, 0xda, 0xf9, 0xf5, 0x95
-            }
-        },
-        {
-            32,
-            {
-                0x2d, 0x77, 0x3b, 0xe3, 0x7a, 0xdb, 0x1e, 0x4d,
+                0x8c, 0x3e, 0x31, 0x27, 0xda, 0xf9, 0xf5, 0x95 } },
+        { 32,
+            { 0x2d, 0x77, 0x3b, 0xe3, 0x7a, 0xdb, 0x1e, 0x4d,
                 0x68, 0x3b, 0xf0, 0x07, 0x5e, 0x79, 0xc4, 0xee,
                 0x03, 0x79, 0x18, 0x53, 0x5a, 0x7f, 0x99, 0xcc,
-                0xb7, 0x04, 0x0f, 0xb5, 0xf5, 0xf4, 0x3a, 0xea
-            }
-        },
-        {
-            16,
-            {
-                0xc8, 0x5d, 0x15, 0xed, 0x44, 0xc3, 0x78, 0xd6,
-                0xb0, 0x0e, 0x23, 0x06, 0x4c, 0x7b, 0xcd, 0x51
-            }
-        },
+                0xb7, 0x04, 0x0f, 0xb5, 0xf5, 0xf4, 0x3a, 0xea } },
+        { 16,
+            { 0xc8, 0x5d, 0x15, 0xed, 0x44, 0xc3, 0x78, 0xd6,
+                0xb0, 0x0e, 0x23, 0x06, 0x4c, 0x7b, 0xcd, 0x51 } },
     },
     {
-        {
-            528,
-            {
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,
+        { 528,
+            { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,
                 0x17, 0x03, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00,
 
                 0x06, 0xdb, 0x1f, 0x1f, 0x36, 0x8d, 0x69, 0x6a,
@@ -987,34 +730,22 @@ static TESTDATA tests[] = {
                 0xdc, 0xb9, 0x9b, 0x1a, 0x6e, 0x69, 0x08, 0x54,
                 0xce, 0x07, 0x69, 0xcd, 0xe3, 0x97, 0x61, 0xd8,
                 0x2f, 0xcd, 0xec, 0x15, 0xf0, 0xd9, 0x2d, 0x7d,
-                0x8e, 0x94, 0xad, 0xe8, 0xeb, 0x83, 0xfb, 0xe0
-            }
-        },
-        {
-            32,
-            {
-                0x99, 0xe5, 0x82, 0x2d, 0xd4, 0x17, 0x3c, 0x99,
+                0x8e, 0x94, 0xad, 0xe8, 0xeb, 0x83, 0xfb, 0xe0 } },
+        { 32,
+            { 0x99, 0xe5, 0x82, 0x2d, 0xd4, 0x17, 0x3c, 0x99,
                 0x5e, 0x3d, 0xae, 0x0d, 0xde, 0xfb, 0x97, 0x74,
                 0x3f, 0xde, 0x3b, 0x08, 0x01, 0x34, 0xb3, 0x9f,
-                0x76, 0xe9, 0xbf, 0x8d, 0x0e, 0x88, 0xd5, 0x46
-            }
-        },
-        {
-            16,
-            {
-                0x26, 0x37, 0x40, 0x8f, 0xe1, 0x30, 0x86, 0xea,
-                0x73, 0xf9, 0x71, 0xe3, 0x42, 0x5e, 0x28, 0x20
-            }
-        },
+                0x76, 0xe9, 0xbf, 0x8d, 0x0e, 0x88, 0xd5, 0x46 } },
+        { 16,
+            { 0x26, 0x37, 0x40, 0x8f, 0xe1, 0x30, 0x86, 0xea,
+                0x73, 0xf9, 0x71, 0xe3, 0x42, 0x5e, 0x28, 0x20 } },
     },
     /*
      * test vectors from Hanno Böck
      */
     {
-        {
-            257,
-            {
-                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+        { 257,
+            { 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
                 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
                 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
                 0xcc, 0x80, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
@@ -1054,84 +785,48 @@ static TESTDATA tests[] = {
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x71, 0x92, 0x05, 0xa8, 0x52, 0x1d,
 
-                0xfc
-            }
-        },
-        {
-            32,
-            {
-                0x7f, 0x1b, 0x02, 0x64, 0x00, 0x00, 0x00, 0x00,
+                0xfc } },
+        { 32,
+            { 0x7f, 0x1b, 0x02, 0x64, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc
-            }
-        },
-        {
-            16,
-            {
-                0x85, 0x59, 0xb8, 0x76, 0xec, 0xee, 0xd6, 0x6e,
-                0xb3, 0x77, 0x98, 0xc0, 0x45, 0x7b, 0xaf, 0xf9
-            }
-        },
+                0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc } },
+        { 16,
+            { 0x85, 0x59, 0xb8, 0x76, 0xec, 0xee, 0xd6, 0x6e,
+                0xb3, 0x77, 0x98, 0xc0, 0x45, 0x7b, 0xaf, 0xf9 } },
     },
     {
-        {
-            39,
-            {
-                0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+        { 39,
+            { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
                 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
                 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
                 0xaa, 0xaa, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00,
 
-                0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x64
-            }
-        },
-        {
-            32,
-            {
-                0xe0, 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x64 } },
+        { 32,
+            { 0xe0, 0x00, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-                0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa
-            }
-        },
-        {
-            16,
-            {
-                0x00, 0xbd, 0x12, 0x58, 0x97, 0x8e, 0x20, 0x54,
-                0x44, 0xc9, 0xaa, 0xaa, 0x82, 0x00, 0x6f, 0xed
-            }
-        },
+                0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa } },
+        { 16,
+            { 0x00, 0xbd, 0x12, 0x58, 0x97, 0x8e, 0x20, 0x54,
+                0x44, 0xc9, 0xaa, 0xaa, 0x82, 0x00, 0x6f, 0xed } },
     },
     {
-        {
-            2,
-            {
-                0x02, 0xfc
-            }
-        },
-        {
-            32,
-            {
-                0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+        { 2,
+            { 0x02, 0xfc } },
+        { 32,
+            { 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
                 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
                 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
-                0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c
-            }
-        },
-        {
-            16,
-            {
-                0x06, 0x12, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
-                0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c
-            }
-        },
+                0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c } },
+        { 16,
+            { 0x06, 0x12, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+                0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c } },
     },
     {
-        {
-            415,
-            {
-                0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
+        { 415,
+            { 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
                 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
                 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
                 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b, 0x7b,
@@ -1194,31 +889,19 @@ static TESTDATA tests[] = {
                 0x00, 0x09, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc
-            }
-        },
-        {
-            32,
-            {
-                0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc } },
+        { 32,
+            { 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b, 0x7b
-            }
-        },
-        {
-            16,
-            {
-                0x33, 0x20, 0x5b, 0xbf, 0x9e, 0x9f, 0x8f, 0x72,
-                0x12, 0xab, 0x9e, 0x2a, 0xb9, 0xb7, 0xe4, 0xa5
-            }
-        },
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b, 0x7b } },
+        { 16,
+            { 0x33, 0x20, 0x5b, 0xbf, 0x9e, 0x9f, 0x8f, 0x72,
+                0x12, 0xab, 0x9e, 0x2a, 0xb9, 0xb7, 0xe4, 0xa5 } },
     },
     {
-        {
-            118,
-            {
-                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
+        { 118,
+            { 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
                 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
                 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
                 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77,
@@ -1235,34 +918,24 @@ static TESTDATA tests[] = {
 
                 0xec, 0x01, 0x00, 0xac, 0xac, 0xac, 0x2c, 0xac,
                 0xa2, 0xac, 0xac, 0xac, 0xac, 0xac, 0xac, 0xac,
-                0xac, 0xac, 0xac, 0xac, 0x64, 0xf2
-            }
-        },
-        {
-            32,
-            {
-                0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x7f,
+                0xac, 0xac, 0xac, 0xac, 0x64, 0xf2 } },
+        { 32,
+            { 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x7f,
                 0x01, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0xcf, 0x77, 0x77, 0x77, 0x77, 0x77,
-                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77
-            }
-        },
-        {
-            16,
-            {
-                0x02, 0xee, 0x7c, 0x8c, 0x54, 0x6d, 0xde, 0xb1,
-                0xa4, 0x67, 0xe4, 0xc3, 0x98, 0x11, 0x58, 0xb9
-            }
-        },
+                0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77 } },
+        { 16,
+            { 0x02, 0xee, 0x7c, 0x8c, 0x54, 0x6d, 0xde, 0xb1,
+                0xa4, 0x67, 0xe4, 0xc3, 0x98, 0x11, 0x58, 0xb9 } },
     },
     /*
      * test vectors from Andrew Moon
      */
-    { /* nacl */
+    {
+        /* nacl */
         {
             131,
-            {
-                0x8e, 0x99, 0x3b, 0x9f, 0x48, 0x68, 0x12, 0x73,
+            { 0x8e, 0x99, 0x3b, 0x9f, 0x48, 0x68, 0x12, 0x73,
                 0xc2, 0x96, 0x50, 0xba, 0x32, 0xfc, 0x76, 0xce,
                 0x48, 0x33, 0x2e, 0xa7, 0x16, 0x4d, 0x96, 0xa4,
                 0x47, 0x6f, 0xb8, 0xc5, 0x31, 0xa1, 0x18, 0x6a,
@@ -1282,167 +955,108 @@ static TESTDATA tests[] = {
                 0x79, 0x73, 0xf6, 0x22, 0xa4, 0x3d, 0x14, 0xa6,
                 0x59, 0x9b, 0x1f, 0x65, 0x4c, 0xb4, 0x5a, 0x74,
 
-                0xe3, 0x55, 0xa5
-            }
-        },
-        {
-            32,
-            {
-                0xee, 0xa6, 0xa7, 0x25, 0x1c, 0x1e, 0x72, 0x91,
+                0xe3, 0x55, 0xa5 } },
+        { 32,
+            { 0xee, 0xa6, 0xa7, 0x25, 0x1c, 0x1e, 0x72, 0x91,
                 0x6d, 0x11, 0xc2, 0xcb, 0x21, 0x4d, 0x3c, 0x25,
                 0x25, 0x39, 0x12, 0x1d, 0x8e, 0x23, 0x4e, 0x65,
-                0x2d, 0x65, 0x1f, 0xa4, 0xc8, 0xcf, 0xf8, 0x80
-            }
-        },
-        {
-            16,
-            {
-                0xf3, 0xff, 0xc7, 0x70, 0x3f, 0x94, 0x00, 0xe5,
-                0x2a, 0x7d, 0xfb, 0x4b, 0x3d, 0x33, 0x05, 0xd9
-            }
-        },
+                0x2d, 0x65, 0x1f, 0xa4, 0xc8, 0xcf, 0xf8, 0x80 } },
+        { 16,
+            { 0xf3, 0xff, 0xc7, 0x70, 0x3f, 0x94, 0x00, 0xe5,
+                0x2a, 0x7d, 0xfb, 0x4b, 0x3d, 0x33, 0x05, 0xd9 } },
     },
-    { /* wrap 2^130-5 */
+    {
+        /* wrap 2^130-5 */
         {
             16,
-            {
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-            }
-        },
-        {
-            32,
-            {
-                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } },
+        { 32,
+            { 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
-        {
-            16,
-            {
-                0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+        { 16,
+            { 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
     },
-    { /* wrap 2^128 */
+    {
+        /* wrap 2^128 */
         {
             16,
-            {
-                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
-        {
-            32,
-            {
-                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            { 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+        { 32,
+            { 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-            }
-        },
-        {
-            16,
-            {
-                0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } },
+        { 16,
+            { 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
     },
-    { /* limb carry */
+    {
+        /* limb carry */
         {
             48,
-            {
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 
                 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
-        {
-            32,
-            {
-                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+        { 32,
+            { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
-        {
-            16,
-            {
-                0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+        { 16,
+            { 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
     },
-    { /* 2^130-5 */
+    {
+        /* 2^130-5 */
         {
             48,
-            {
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                 0xfb, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
                 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
 
                 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-                0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
-            }
-        },
-        {
-            32,
-            {
-                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 } },
+        { 32,
+            { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
-        {
-            16,
-            {
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+        { 16,
+            { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
-            }
-        },
+            } },
     },
-    { /* 2^130-6 */
+    {
+        /* 2^130-6 */
         {
             16,
-            {
-                0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-            }
-        },
-        {
-            32,
-            {
-                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            { 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } },
+        { 32,
+            { 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
-        {
-            16,
-            {
-                0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-            }
-        },
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+        { 16,
+            { 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } },
     },
-    { /* 5*H+L reduction intermediate */
+    {
+        /* 5*H+L reduction intermediate */
         {
             64,
-            {
-                0xe3, 0x35, 0x94, 0xd7, 0x50, 0x5e, 0x43, 0xb9,
+            { 0xe3, 0x35, 0x94, 0xd7, 0x50, 0x5e, 0x43, 0xb9,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x33, 0x94, 0xd7, 0x50, 0x5e, 0x43, 0x79, 0xcd,
                 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1450,31 +1064,20 @@ static TESTDATA tests[] = {
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
-        {
-            32,
-            {
-                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+        { 32,
+            { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
-        {
-            16,
-            {
-                0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+        { 16,
+            { 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
     },
     { /* 5*H+L reduction final */
         {
             48,
-            {
-                0xe3, 0x35, 0x94, 0xd7, 0x50, 0x5e, 0x43, 0xb9,
+            { 0xe3, 0x35, 0x94, 0xd7, 0x50, 0x5e, 0x43, 0xb9,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x33, 0x94, 0xd7, 0x50, 0x5e, 0x43, 0x79, 0xcd,
                 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1482,25 +1085,15 @@ static TESTDATA tests[] = {
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
-            }
-        },
-        {
-            32,
-            {
-                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            } },
+        { 32,
+            { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        },
-        {
-            16,
-            {
-                0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            }
-        }
-    }
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+        { 16,
+            { 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }
 };
 
 static int test_poly1305(int idx)
@@ -1529,7 +1122,7 @@ static int test_poly1305(int idx)
     if (inlen > 16) {
         Poly1305_Init(&poly1305, key);
         Poly1305_Update(&poly1305, in, 1);
-        Poly1305_Update(&poly1305, in+1, inlen-1);
+        Poly1305_Update(&poly1305, in + 1, inlen - 1);
         Poly1305_Final(&poly1305, out);
 
         if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) {
@@ -1543,7 +1136,7 @@ static int test_poly1305(int idx)
 
         Poly1305_Init(&poly1305, key);
         Poly1305_Update(&poly1305, in, half);
-        Poly1305_Update(&poly1305, in+half, inlen-half);
+        Poly1305_Update(&poly1305, in + half, inlen - half);
         Poly1305_Final(&poly1305, out);
 
         if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) {
@@ -1554,12 +1147,12 @@ static int test_poly1305(int idx)
         for (half = 16; half < inlen; half += 16) {
             Poly1305_Init(&poly1305, key);
             Poly1305_Update(&poly1305, in, half);
-            Poly1305_Update(&poly1305, in+half, inlen-half);
+            Poly1305_Update(&poly1305, in + half, inlen - half);
             Poly1305_Final(&poly1305, out);
 
             if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) {
                 TEST_info("Poly1305 test #%d/%zu+%zu failed.",
-                          idx, half, inlen-half);
+                    idx, half, inlen - half);
                 return 0;
             }
         }
diff --git a/test/priority_queue_test.c b/test/priority_queue_test.c
index d8cafc943c43c..e90d5b330afc0 100644
--- a/test/priority_queue_test.c
+++ b/test/priority_queue_test.c
@@ -49,7 +49,7 @@ static void free_checker(ossl_unused size_t *p)
 }
 
 static int test_size_t_priority_queue_int(int reserve, int order, int count,
-                                          int remove, int random, int popfree)
+    int remove, int random, int popfree)
 {
     PRIORITY_QUEUE_OF(size_t) *pq = NULL;
     static size_t values[MAX_SAMPLES], sorted[MAX_SAMPLES], ref[MAX_SAMPLES];
@@ -58,9 +58,9 @@ static int test_size_t_priority_queue_int(int reserve, int order, int count,
     static const char *orders[3] = { "unordered", "ascending", "descending" };
 
     TEST_info("testing count %d, %s, %s, values %s, remove %d, %sfree",
-              count, orders[order], reserve ? "reserve" : "grow",
-              random ? "random" : "deterministic", remove,
-              popfree ? "pop " : "");
+        count, orders[order], reserve ? "reserve" : "grow",
+        random ? "random" : "deterministic", remove,
+        popfree ? "pop " : "");
 
     if (!TEST_size_t_le(count, MAX_SAMPLES))
         return 0;
@@ -80,7 +80,7 @@ static int test_size_t_priority_queue_int(int reserve, int order, int count,
         qsort(values, count, sizeof(*values), &qsort_size_t_compare_rev);
 
     if (!TEST_ptr(pq = ossl_pqueue_size_t_new(&size_t_compare))
-            || !TEST_size_t_eq(ossl_pqueue_size_t_num(pq), 0))
+        || !TEST_size_t_eq(ossl_pqueue_size_t_num(pq), 0))
         goto err;
 
     if (reserve && !TEST_true(ossl_pqueue_size_t_reserve(pq, count)))
@@ -91,7 +91,7 @@ static int test_size_t_priority_queue_int(int reserve, int order, int count,
             goto err;
 
     if (!TEST_size_t_eq(*ossl_pqueue_size_t_peek(pq), *sorted)
-            || !TEST_size_t_eq(ossl_pqueue_size_t_num(pq), count))
+        || !TEST_size_t_eq(ossl_pqueue_size_t_num(pq), count))
         goto err;
 
     if (remove) {
@@ -99,7 +99,7 @@ static int test_size_t_priority_queue_int(int reserve, int order, int count,
             i = test_random() % count;
             if (values[i] != SIZE_MAX) {
                 if (!TEST_ptr_eq(ossl_pqueue_size_t_remove(pq, ref[i]),
-                                 values + i))
+                        values + i))
                     goto err;
                 values[i] = SIZE_MAX;
             }
@@ -109,8 +109,8 @@ static int test_size_t_priority_queue_int(int reserve, int order, int count,
     }
     for (i = 0; ossl_pqueue_size_t_peek(pq) != NULL; i++)
         if (!TEST_size_t_eq(*ossl_pqueue_size_t_peek(pq), sorted[i])
-                || !TEST_size_t_eq(*ossl_pqueue_size_t_pop(pq), sorted[i]))
-                goto err;
+            || !TEST_size_t_eq(*ossl_pqueue_size_t_pop(pq), sorted[i]))
+            goto err;
 
     if (popfree) {
         num_rec_freed = 0;
@@ -121,7 +121,7 @@ static int test_size_t_priority_queue_int(int reserve, int order, int count,
             goto err;
     }
     res = 1;
- err:
+err:
     ossl_pqueue_size_t_free(pq);
     return res;
 }
@@ -148,18 +148,18 @@ static int test_size_t_priority_queue(int n)
 
     count = test_size_t_priority_counts[count];
     return test_size_t_priority_queue_int(reserve, order, count, remove,
-                                          random, popfree);
+        random, popfree);
 }
 
 static int test_large_priority_queue(void)
 {
     return test_size_t_priority_queue_int(0, 0, MAX_SAMPLES, MAX_SAMPLES / 100,
-                                          1, 1);
+        1, 1);
 }
 
 typedef struct info_st {
     uint64_t seq_num, sub_seq;
-    size_t   idx;
+    size_t idx;
 } INFO;
 
 DEFINE_PRIORITY_QUEUE_OF(INFO);
@@ -190,57 +190,57 @@ static int test_22644(void)
 
     infos[0].seq_num = 70650219160667140;
     if (!TEST_true(ossl_pqueue_INFO_push(pq, &infos[0], &infos[0].idx))
-            || !TEST_size_t_eq(infos[0].idx, 7)
-            || !TEST_ptr(ossl_pqueue_INFO_remove(pq, infos[0].idx)))
+        || !TEST_size_t_eq(infos[0].idx, 7)
+        || !TEST_ptr(ossl_pqueue_INFO_remove(pq, infos[0].idx)))
         goto err;
 
     infos[1].seq_num = 289360691352306692;
     if (!TEST_true(ossl_pqueue_INFO_push(pq, &infos[1], &infos[1].idx))
-            || !TEST_size_t_eq(infos[1].idx, 7)
-            || !TEST_ptr(ossl_pqueue_INFO_remove(pq, infos[1].idx)))
+        || !TEST_size_t_eq(infos[1].idx, 7)
+        || !TEST_ptr(ossl_pqueue_INFO_remove(pq, infos[1].idx)))
         goto err;
-    
+
     infos[2].seq_num = 289360691352306692;
     if (!TEST_true(ossl_pqueue_INFO_push(pq, &infos[2], &infos[2].idx))
-            || !TEST_size_t_eq(infos[2].idx, 7))
+        || !TEST_size_t_eq(infos[2].idx, 7))
         goto err;
 
     infos[3].seq_num = 289360691352306692;
     if (!TEST_true(ossl_pqueue_INFO_push(pq, &infos[3], &infos[3].idx))
-            || !TEST_size_t_eq(infos[3].idx, 6))
+        || !TEST_size_t_eq(infos[3].idx, 6))
         goto err;
 
     infos[4].seq_num = 289360691352306692;
     if (!TEST_true(ossl_pqueue_INFO_push(pq, &infos[4], &infos[4].idx))
-            || !TEST_size_t_eq(infos[4].idx, 5))
+        || !TEST_size_t_eq(infos[4].idx, 5))
         goto err;
 
     infos[5].seq_num = 289360691352306692;
     if (!TEST_true(ossl_pqueue_INFO_push(pq, &infos[5], &infos[5].idx))
-            || !TEST_size_t_eq(infos[5].idx, 4))
+        || !TEST_size_t_eq(infos[5].idx, 4))
         goto err;
 
     infos[6].seq_num = 289360691352306692;
     if (!TEST_true(ossl_pqueue_INFO_push(pq, &infos[6], &infos[6].idx))
-            || !TEST_size_t_eq(infos[6].idx, 3))
+        || !TEST_size_t_eq(infos[6].idx, 3))
         goto err;
 
     infos[7].seq_num = 289360691352306692;
     if (!TEST_true(ossl_pqueue_INFO_push(pq, &infos[7], &infos[7].idx))
-            || !TEST_size_t_eq(infos[7].idx, 2))
+        || !TEST_size_t_eq(infos[7].idx, 2))
         goto err;
 
     infos[8].seq_num = 289360691352306692;
     if (!TEST_true(ossl_pqueue_INFO_push(pq, &infos[8], &infos[8].idx))
-            || !TEST_size_t_eq(infos[8].idx, 1))
+        || !TEST_size_t_eq(infos[8].idx, 1))
         goto err;
 
     if (!TEST_ptr(ossl_pqueue_INFO_pop(pq))
-            || !TEST_ptr(ossl_pqueue_INFO_pop(pq)))     /* crash if bug present */
+        || !TEST_ptr(ossl_pqueue_INFO_pop(pq))) /* crash if bug present */
         goto err;
     res = 1;
 
- err:
+err:
     ossl_pqueue_INFO_free(pq);
     return res;
 }
@@ -248,12 +248,12 @@ static int test_22644(void)
 int setup_tests(void)
 {
     ADD_ALL_TESTS(test_size_t_priority_queue,
-                  OSSL_NELEM(test_size_t_priority_counts)   /* count */
-                  * 3                                       /* order */
-                  * 2                                       /* random */
-                  * 2                                       /* reserve */
-                  * 6                                       /* remove */
-                  * 2);                                     /* pop & free */
+        OSSL_NELEM(test_size_t_priority_counts) /* count */
+            * 3 /* order */
+            * 2 /* random */
+            * 2 /* reserve */
+            * 6 /* remove */
+            * 2); /* pop & free */
     ADD_TEST(test_large_priority_queue);
     ADD_TEST(test_22644);
     return 1;
diff --git a/test/property_test.c b/test/property_test.c
index 18f8cc8740e0d..d470731e5074d 100644
--- a/test/property_test.c
+++ b/test/property_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2025 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2019, Oracle and/or its affiliates.  All rights reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -99,7 +99,7 @@ static int test_property_string(void)
         /* Check name and values are distinct */
         && TEST_int_eq(ossl_property_value(ctx, "cold", 0), 0)
         && TEST_int_ne(ossl_property_name(ctx, "fnord", 0),
-                       ossl_property_value(ctx, "fnord", 0)))
+            ossl_property_value(ctx, "fnord", 0)))
         res = 1;
     ossl_method_store_free(store);
     OSSL_LIB_CTX_free(ctx);
@@ -137,7 +137,7 @@ static const struct {
     { "n=0x3", "n=-3", -1 },
     { "n=0x33", "n=51", 1 },
     { "n=0x123456789abcdef", "n=0x123456789abcdef", 1 },
-    { "n=0x7fffffffffffffff", "n=0x7fffffffffffffff", 1 },   /* INT64_MAX */
+    { "n=0x7fffffffffffffff", "n=0x7fffffffffffffff", 1 }, /* INT64_MAX */
     { "n=9223372036854775807", "n=9223372036854775807", 1 }, /* INT64_MAX */
     { "n=0777777777777777777777", "n=0777777777777777777777", 1 }, /* INT64_MAX */
     { "n=033", "n=27", 1 },
@@ -155,7 +155,7 @@ static int test_property_parse(int n)
 
     if (TEST_ptr(store = ossl_method_store_new(NULL))
         && add_property_names("sky", "groan", "cold", "today", "tomorrow", "n",
-                              NULL)
+            NULL)
         && TEST_ptr(p = ossl_parse_property(NULL, parser_tests[n].defn))
         && TEST_ptr(q = ossl_parse_query(NULL, parser_tests[n].query, 0))
         && TEST_int_eq(ossl_property_match_count(q, p), parser_tests[n].e))
@@ -192,26 +192,26 @@ static const struct {
     int query;
     const char *ps;
 } parse_error_tests[] = {
-    { 0, "n=1, n=1" },          /* duplicate name */
-    { 0, "n=1, a=hi, n=1" },    /* duplicate name */
-    { 1, "n=1, a=bye, ?n=0" },  /* duplicate name */
-    { 0, "a=abc,#@!, n=1" },    /* non-ASCII character located */
-    { 1, "a='Hello" },          /* Unterminated string */
-    { 0, "a=\"World" },         /* Unterminated string */
-    { 0, "a=_abd_" },           /* Unquoted string not starting with alphabetic */
-    { 1, "a=2, n=012345678" },  /* Bad octal digit */
-    { 0, "n=0x28FG, a=3" },     /* Bad hex digit */
-    { 0, "n=145d, a=2" },       /* Bad decimal digit */
-    { 0, "n=0x8000000000000000, a=3" },     /* Hex overflow */
-    { 0, "n=922337203000000000d, a=2" },    /* Decimal overflow */
+    { 0, "n=1, n=1" }, /* duplicate name */
+    { 0, "n=1, a=hi, n=1" }, /* duplicate name */
+    { 1, "n=1, a=bye, ?n=0" }, /* duplicate name */
+    { 0, "a=abc,#@!, n=1" }, /* non-ASCII character located */
+    { 1, "a='Hello" }, /* Unterminated string */
+    { 0, "a=\"World" }, /* Unterminated string */
+    { 0, "a=_abd_" }, /* Unquoted string not starting with alphabetic */
+    { 1, "a=2, n=012345678" }, /* Bad octal digit */
+    { 0, "n=0x28FG, a=3" }, /* Bad hex digit */
+    { 0, "n=145d, a=2" }, /* Bad decimal digit */
+    { 0, "n=0x8000000000000000, a=3" }, /* Hex overflow */
+    { 0, "n=922337203000000000d, a=2" }, /* Decimal overflow */
     { 0, "a=2, n=1000000000000000000000" }, /* Octal overflow */
-    { 1, "@='hello'" },         /* Invalid name */
+    { 1, "@='hello'" }, /* Invalid name */
     { 1, "n0123456789012345678901234567890123456789"
          "0123456789012345678901234567890123456789"
          "0123456789012345678901234567890123456789"
          "0123456789012345678901234567890123456789=yes" }, /* Name too long */
-    { 0, ".n=3" },              /* Invalid name */
-    { 1, "fnord.fnord.=3" }     /* Invalid name */
+    { 0, ".n=3" }, /* Invalid name */
+    { 1, "fnord.fnord.=3" } /* Invalid name */
 };
 
 static int test_property_parse_error(int n)
@@ -232,7 +232,7 @@ static int test_property_parse_error(int n)
         goto err;
     }
     r = 1;
- err:
+err:
     ossl_property_free(p);
     ossl_method_store_free(store);
     return r;
@@ -273,10 +273,10 @@ static int test_property_merge(int n)
 
     if (TEST_ptr(store = ossl_method_store_new(NULL))
         && add_property_names("colour", "urn", "clouds", "pot", "day", "night",
-                              NULL)
+            NULL)
         && TEST_ptr(prop = ossl_parse_property(NULL, merge_tests[n].prop))
         && TEST_ptr(q_global = ossl_parse_query(NULL, merge_tests[n].q_global,
-                                                0))
+                        0))
         && TEST_ptr(q_local = ossl_parse_query(NULL, merge_tests[n].q_local, 0))
         && TEST_ptr(q_combined = ossl_property_merge(q_local, q_global))
         && TEST_int_ge(ossl_property_match_count(q_combined, prop), 0))
@@ -302,7 +302,7 @@ static int test_property_defn_cache(void)
         && TEST_ptr_ne(red, blue)
         && TEST_true(ossl_prop_defn_set(NULL, "red", &red));
 
-    if (!r)  {
+    if (!r) {
         ossl_property_free(red);
         red = NULL;
         ossl_property_free(blue);
@@ -340,7 +340,7 @@ static const struct {
     { "alpha", "alpha=yes", 1 },
     { "alpha=no", "alpha", -1 },
     { "alpha=1", "alpha=1", 1 },
-    { "alpha=2", "alpha=1",-1 },
+    { "alpha=2", "alpha=1", -1 },
     { "alpha", "omega", -1 },
     { "alpha", "?omega", 0 },
     { "alpha", "?omega=1", 0 },
@@ -391,8 +391,8 @@ static int test_register_deregister(void)
 
     for (i = 0; i < OSSL_NELEM(impls); i++)
         if (!TEST_true(ossl_method_store_add(store, &prov, impls[i].nid,
-                                             impls[i].prop, impls[i].impl,
-                                             &up_ref, &down_ref))) {
+                impls[i].prop, impls[i].impl,
+                &up_ref, &down_ref))) {
             TEST_note("iteration %zd", i + 1);
             goto err;
         }
@@ -465,9 +465,9 @@ static int test_property(void)
 
     for (i = 0; i < OSSL_NELEM(impls); i++)
         if (!TEST_true(ossl_method_store_add(store, *impls[i].prov,
-                                             impls[i].nid, impls[i].prop,
-                                             impls[i].impl,
-                                             &up_ref, &down_ref))) {
+                impls[i].nid, impls[i].prop,
+                impls[i].impl,
+                &up_ref, &down_ref))) {
             TEST_note("iteration %zd", i + 1);
             goto err;
         }
@@ -480,8 +480,8 @@ static int test_property(void)
         OSSL_PROPERTY_LIST *pq = NULL;
 
         if (!TEST_true(ossl_method_store_fetch(store,
-                                               queries[i].nid, queries[i].prop,
-                                               &nullprov, &result))
+                queries[i].nid, queries[i].prop,
+                &nullprov, &result))
             || !TEST_str_eq((char *)result, queries[i].expected)) {
             TEST_note("iteration %zd", i + 1);
             ossl_property_free(pq);
@@ -498,9 +498,9 @@ static int test_property(void)
         result = NULL;
         if (queries[i].prov == &fake_prov1) {
             if (!TEST_true(ossl_method_store_fetch(store,
-                                                   queries[i].nid,
-                                                   queries[i].prop,
-                                                   &fake_prov1, &result))
+                    queries[i].nid,
+                    queries[i].prop,
+                    &fake_prov1, &result))
                 || !TEST_ptr_eq(fake_prov1, &fake_provider1)
                 || !TEST_str_eq((char *)result, queries[i].expected)) {
                 TEST_note("iteration %zd", i + 1);
@@ -509,9 +509,9 @@ static int test_property(void)
             }
         } else {
             if (!TEST_false(ossl_method_store_fetch(store,
-                                                    queries[i].nid,
-                                                    queries[i].prop,
-                                                    &fake_prov1, &result))
+                    queries[i].nid,
+                    queries[i].prop,
+                    &fake_prov1, &result))
                 || !TEST_ptr_eq(fake_prov1, &fake_provider1)
                 || !TEST_ptr_null(result)) {
                 TEST_note("iteration %zd", i + 1);
@@ -530,9 +530,9 @@ static int test_property(void)
         result = NULL;
         if (queries[i].prov == &fake_prov2) {
             if (!TEST_true(ossl_method_store_fetch(store,
-                                                   queries[i].nid,
-                                                   queries[i].prop,
-                                                   &fake_prov2, &result))
+                    queries[i].nid,
+                    queries[i].prop,
+                    &fake_prov2, &result))
                 || !TEST_ptr_eq(fake_prov2, &fake_provider2)
                 || !TEST_str_eq((char *)result, queries[i].expected)) {
                 TEST_note("iteration %zd", i + 1);
@@ -541,9 +541,9 @@ static int test_property(void)
             }
         } else {
             if (!TEST_false(ossl_method_store_fetch(store,
-                                                    queries[i].nid,
-                                                    queries[i].prop,
-                                                    &fake_prov2, &result))
+                    queries[i].nid,
+                    queries[i].prop,
+                    &fake_prov2, &result))
                 || !TEST_ptr_eq(fake_prov2, &fake_provider2)
                 || !TEST_ptr_null(result)) {
                 TEST_note("iteration %zd", i + 1);
@@ -578,13 +578,13 @@ static int test_query_cache_stochastic(void)
         v[i] = 2 * i;
         BIO_snprintf(buf, sizeof(buf), "n=%d\n", i);
         if (!TEST_true(ossl_method_store_add(store, &prov, i, buf, "abc",
-                                             &up_ref, &down_ref))
-                || !TEST_true(ossl_method_store_cache_set(store, &prov, i,
-                                                          buf, v + i,
-                                                          &up_ref, &down_ref))
-                || !TEST_true(ossl_method_store_cache_set(store, &prov, i,
-                                                          "n=1234", "miss",
-                                                          &up_ref, &down_ref))) {
+                &up_ref, &down_ref))
+            || !TEST_true(ossl_method_store_cache_set(store, &prov, i,
+                buf, v + i,
+                &up_ref, &down_ref))
+            || !TEST_true(ossl_method_store_cache_set(store, &prov, i,
+                "n=1234", "miss",
+                &up_ref, &down_ref))) {
             TEST_note("iteration %d", i);
             goto err;
         }
@@ -612,20 +612,20 @@ static int test_fips_mode(void)
         goto err;
 
     ret = TEST_true(EVP_set_default_properties(ctx, "default=yes,fips=yes"))
-          && TEST_true(EVP_default_properties_is_fips_enabled(ctx))
-          && TEST_true(EVP_set_default_properties(ctx, "fips=no,default=yes"))
-          && TEST_false(EVP_default_properties_is_fips_enabled(ctx))
-          && TEST_true(EVP_set_default_properties(ctx, "fips=no"))
-          && TEST_false(EVP_default_properties_is_fips_enabled(ctx))
-          && TEST_true(EVP_set_default_properties(ctx, "fips!=no"))
-          && TEST_true(EVP_default_properties_is_fips_enabled(ctx))
-          && TEST_true(EVP_set_default_properties(ctx, "fips=no"))
-          && TEST_false(EVP_default_properties_is_fips_enabled(ctx))
-          && TEST_true(EVP_set_default_properties(ctx, "fips=no,default=yes"))
-          && TEST_true(EVP_default_properties_enable_fips(ctx, 1))
-          && TEST_true(EVP_default_properties_is_fips_enabled(ctx))
-          && TEST_true(EVP_default_properties_enable_fips(ctx, 0))
-          && TEST_false(EVP_default_properties_is_fips_enabled(ctx));
+        && TEST_true(EVP_default_properties_is_fips_enabled(ctx))
+        && TEST_true(EVP_set_default_properties(ctx, "fips=no,default=yes"))
+        && TEST_false(EVP_default_properties_is_fips_enabled(ctx))
+        && TEST_true(EVP_set_default_properties(ctx, "fips=no"))
+        && TEST_false(EVP_default_properties_is_fips_enabled(ctx))
+        && TEST_true(EVP_set_default_properties(ctx, "fips!=no"))
+        && TEST_true(EVP_default_properties_is_fips_enabled(ctx))
+        && TEST_true(EVP_set_default_properties(ctx, "fips=no"))
+        && TEST_false(EVP_default_properties_is_fips_enabled(ctx))
+        && TEST_true(EVP_set_default_properties(ctx, "fips=no,default=yes"))
+        && TEST_true(EVP_default_properties_enable_fips(ctx, 1))
+        && TEST_true(EVP_default_properties_is_fips_enabled(ctx))
+        && TEST_true(EVP_default_properties_enable_fips(ctx, 0))
+        && TEST_false(EVP_default_properties_is_fips_enabled(ctx));
 err:
     OSSL_LIB_CTX_free(ctx);
     return ret;
@@ -647,8 +647,8 @@ static struct {
     { "fips=yes,provider!=fips", "fips=yes,provider!=fips" },
     { "fips=yes,?provider=fips", "fips=yes,?provider=fips" },
     { "fips=yes,-provider", "fips=yes,-provider" },
-      /* foo is an unknown internal name */
-    { "foo=yes,fips=yes", "fips=yes"},
+    /* foo is an unknown internal name */
+    { "foo=yes,fips=yes", "fips=yes" },
     { "", "" },
     { "fips=3", "fips=3" },
     { "fips=-3", "fips=-3" },
@@ -666,27 +666,43 @@ static int test_property_list_to_string(int i)
     char *buf = NULL;
 
     if (to_string_tests[i].in != NULL
-            && !TEST_ptr(pl = ossl_parse_query(NULL, to_string_tests[i].in, 1)))
+        && !TEST_ptr(pl = ossl_parse_query(NULL, to_string_tests[i].in, 1)))
         goto err;
     bufsize = ossl_property_list_to_string(NULL, pl, NULL, 0);
     if (!TEST_size_t_gt(bufsize, 0))
         goto err;
     buf = OPENSSL_malloc(bufsize);
     if (!TEST_ptr(buf)
-            || !TEST_size_t_eq(ossl_property_list_to_string(NULL, pl, buf,
-                                                            bufsize),
-                               bufsize)
-            || !TEST_str_eq(to_string_tests[i].out, buf)
-            || !TEST_size_t_eq(bufsize, strlen(to_string_tests[i].out) + 1))
+        || !TEST_size_t_eq(ossl_property_list_to_string(NULL, pl, buf,
+                               bufsize),
+            bufsize)
+        || !TEST_str_eq(to_string_tests[i].out, buf)
+        || !TEST_size_t_eq(bufsize, strlen(to_string_tests[i].out) + 1))
         goto err;
 
     ret = 1;
- err:
+err:
     OPENSSL_free(buf);
     ossl_property_free(pl);
     return ret;
 }
 
+static int test_property_list_to_string_bounds(void)
+{
+    OSSL_PROPERTY_LIST *pl = NULL;
+    char buf[16];
+    int ret = 0;
+
+    if (!TEST_ptr(pl = ossl_parse_query(NULL, "provider='$1'", 1)))
+        goto err;
+    if (!TEST_size_t_eq(ossl_property_list_to_string(NULL, pl, buf, 10), 14))
+        goto err;
+    ret = 1;
+err:
+    ossl_property_free(pl);
+    return ret;
+}
+
 int setup_tests(void)
 {
     ADD_TEST(test_property_string);
@@ -701,5 +717,6 @@ int setup_tests(void)
     ADD_TEST(test_query_cache_stochastic);
     ADD_TEST(test_fips_mode);
     ADD_ALL_TESTS(test_property_list_to_string, OSSL_NELEM(to_string_tests));
+    ADD_TEST(test_property_list_to_string_bounds);
     return 1;
 }
diff --git a/test/prov_config_test.c b/test/prov_config_test.c
index 2fd913deadf4f..d271ae45396e0 100644
--- a/test/prov_config_test.c
+++ b/test/prov_config_test.c
@@ -40,7 +40,7 @@ static int test_double_config(void)
         goto err;
 
     testresult = 1;
- err:
+err:
     EVP_MD_free(sha256);
     OSSL_LIB_CTX_free(ctx);
     return testresult;
@@ -62,7 +62,7 @@ static int test_recursive_config(void)
     /* We expect to get a recursion error here */
     if (ERR_GET_REASON(err) == CONF_R_RECURSIVE_SECTION_REFERENCE)
         testresult = 1;
- err:
+err:
     OSSL_LIB_CTX_free(ctx);
     return testresult;
 }
@@ -110,7 +110,7 @@ static int test_path_config(void)
     OSSL_PROVIDER_unload(prov);
 
     testresult = 1;
- err:
+err:
     OSSL_LIB_CTX_free(ctx);
     return testresult;
 }
diff --git a/test/provfetchtest.c b/test/provfetchtest.c
index d8c9307ddd177..1159baf4f0be6 100644
--- a/test/provfetchtest.c
+++ b/test/provfetchtest.c
@@ -17,8 +17,8 @@
 #include "testutil.h"
 
 static int dummy_decoder_decode(void *ctx, OSSL_CORE_BIO *cin, int selection,
-                                OSSL_CALLBACK *object_cb, void *object_cbarg,
-                                OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *object_cb, void *object_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     return 0;
 }
@@ -34,9 +34,9 @@ static const OSSL_ALGORITHM dummy_decoders[] = {
 };
 
 static int dummy_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)
+    const void *obj_raw,
+    const OSSL_PARAM obj_abstract[], int selection,
+    OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg)
 {
     return 0;
 }
@@ -56,9 +56,9 @@ static void *dummy_store_open(void *provctx, const char *uri)
     return NULL;
 }
 
-static int dummy_store_load(void *loaderctx,  OSSL_CALLBACK *object_cb,
-                            void *object_cbarg, OSSL_PASSPHRASE_CALLBACK *pw_cb,
-                            void *pw_cbarg)
+static int dummy_store_load(void *loaderctx, OSSL_CALLBACK *object_cb,
+    void *object_cbarg, OSSL_PASSPHRASE_CALLBACK *pw_cb,
+    void *pw_cbarg)
 {
     return 0;
 }
@@ -87,7 +87,7 @@ static const OSSL_ALGORITHM dummy_store[] = {
 };
 
 static void *dummy_rand_newctx(void *provctx, void *parent,
-                               const OSSL_DISPATCH *parent_calls)
+    const OSSL_DISPATCH *parent_calls)
 {
     return provctx;
 }
@@ -97,9 +97,9 @@ static void dummy_rand_freectx(void *vctx)
 }
 
 static int dummy_rand_instantiate(void *vdrbg, 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[])
 {
     return 1;
 }
@@ -110,12 +110,12 @@ static int dummy_rand_uninstantiate(void *vdrbg)
 }
 
 static int dummy_rand_generate(void *vctx, unsigned char *out, size_t outlen,
-                               unsigned int strength, int prediction_resistance,
-                               const unsigned char *addin, size_t addin_len)
+    unsigned int strength, int prediction_resistance,
+    const unsigned char *addin, size_t addin_len)
 {
     size_t i;
 
-    for (i = 0; i <outlen; i++)
+    for (i = 0; i < outlen; i++)
         out[i] = (unsigned char)(i & 0xff);
 
     return 1;
@@ -162,11 +162,11 @@ static const OSSL_DISPATCH dummy_rand_functions[] = {
     { OSSL_FUNC_RAND_UNINSTANTIATE, (void (*)(void))dummy_rand_uninstantiate },
     { OSSL_FUNC_RAND_GENERATE, (void (*)(void))dummy_rand_generate },
     { OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS,
-      (void(*)(void))dummy_rand_gettable_ctx_params },
-    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void(*)(void))dummy_rand_get_ctx_params },
-    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void(*)(void))dummy_rand_enable_locking },
-    { OSSL_FUNC_RAND_LOCK, (void(*)(void))dummy_rand_lock },
-    { OSSL_FUNC_RAND_UNLOCK, (void(*)(void))dummy_rand_unlock },
+        (void (*)(void))dummy_rand_gettable_ctx_params },
+    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void (*)(void))dummy_rand_get_ctx_params },
+    { OSSL_FUNC_RAND_ENABLE_LOCKING, (void (*)(void))dummy_rand_enable_locking },
+    { OSSL_FUNC_RAND_LOCK, (void (*)(void))dummy_rand_lock },
+    { OSSL_FUNC_RAND_UNLOCK, (void (*)(void))dummy_rand_unlock },
     OSSL_DISPATCH_END
 };
 
@@ -176,7 +176,7 @@ static const OSSL_ALGORITHM dummy_rand[] = {
 };
 
 static const OSSL_ALGORITHM *dummy_query(void *provctx, int operation_id,
-                                         int *no_cache)
+    int *no_cache)
 {
     *no_cache = 0;
     switch (operation_id) {
@@ -199,9 +199,9 @@ static const OSSL_DISPATCH dummy_dispatch_table[] = {
 };
 
 static int dummy_provider_init(const OSSL_CORE_HANDLE *handle,
-                               const OSSL_DISPATCH *in,
-                               const OSSL_DISPATCH **out,
-                               void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     OSSL_LIB_CTX *libctx = OSSL_LIB_CTX_new_child(handle, in);
     unsigned char buf[32];
@@ -243,35 +243,35 @@ static int fetch_test(int tst)
         goto err;
 
     if (!TEST_true(OSSL_PROVIDER_add_builtin(libctx, "dummy-prov",
-                                             dummy_provider_init))
-            || !TEST_ptr(nullprov = OSSL_PROVIDER_load(libctx, "default"))
-            || !TEST_ptr(dummyprov = OSSL_PROVIDER_load(libctx, "dummy-prov")))
+            dummy_provider_init))
+        || !TEST_ptr(nullprov = OSSL_PROVIDER_load(libctx, "default"))
+        || !TEST_ptr(dummyprov = OSSL_PROVIDER_load(libctx, "dummy-prov")))
         goto err;
 
     switch (tst % 4) {
     case 0:
         decoder = OSSL_DECODER_fetch(libctx, "DUMMY",
-                                     query ? "provider=dummy" : NULL);
+            query ? "provider=dummy" : NULL);
         if (!TEST_ptr(decoder))
             goto err;
         break;
     case 1:
         encoder = OSSL_ENCODER_fetch(libctx, "DUMMY",
-                                     query ? "provider=dummy" : NULL);
+            query ? "provider=dummy" : NULL);
         if (!TEST_ptr(encoder))
             goto err;
         break;
     case 2:
         loader = OSSL_STORE_LOADER_fetch(libctx, "DUMMY",
-                                         query ? "provider=dummy" : NULL);
+            query ? "provider=dummy" : NULL);
         if (!TEST_ptr(loader))
             goto err;
         break;
     case 3:
         if (!TEST_true(RAND_set_DRBG_type(libctx, "DUMMY",
-                                          query ? "provider=dummy" : NULL,
-                                          NULL, NULL))
-                || !TEST_int_ge(RAND_bytes_ex(libctx, buf, sizeof(buf), 0), 1))
+                query ? "provider=dummy" : NULL,
+                NULL, NULL))
+            || !TEST_int_ge(RAND_bytes_ex(libctx, buf, sizeof(buf), 0), 1))
             goto err;
         break;
     default:
@@ -279,7 +279,7 @@ static int fetch_test(int tst)
     }
 
     testresult = 1;
- err:
+err:
     OSSL_DECODER_free(decoder);
     OSSL_ENCODER_free(encoder);
     OSSL_STORE_LOADER_free(loader);
diff --git a/test/provider_default_search_path_test.c b/test/provider_default_search_path_test.c
index 684a508765f89..383135fc21b0a 100644
--- a/test/provider_default_search_path_test.c
+++ b/test/provider_default_search_path_test.c
@@ -34,9 +34,9 @@ static int test_explicit_libctx(void)
     const char *retrieved_path = NULL;
     int ok;
 
-         /* Set search path for default context, then create a new context and set
-            another path for it. Finally, get both paths and make sure they are
-            still what we set and are separate. */
+    /* Set search path for default context, then create a new context and set
+       another path for it. Finally, get both paths and make sure they are
+       still what we set and are separate. */
     ok = TEST_true(OSSL_PROVIDER_set_default_search_path(NULL, def_libctx_path))
         && TEST_ptr(ctx = OSSL_LIB_CTX_new())
         && TEST_true(OSSL_PROVIDER_set_default_search_path(ctx, path))
@@ -56,4 +56,3 @@ int setup_tests(void)
     ADD_TEST(test_explicit_libctx);
     return 1;
 }
-
diff --git a/test/provider_fallback_test.c b/test/provider_fallback_test.c
index 26ba9ea1dcb06..db65af3ea6178 100644
--- a/test/provider_fallback_test.c
+++ b/test/provider_fallback_test.c
@@ -53,11 +53,9 @@ static int test_explicit_provider(void)
     return ok;
 }
 
-
 int setup_tests(void)
 {
     ADD_TEST(test_fallback_provider);
     ADD_TEST(test_explicit_provider);
     return 1;
 }
-
diff --git a/test/provider_internal_test.c b/test/provider_internal_test.c
index 29e5b8ae1c555..65411d322e59b 100644
--- a/test/provider_internal_test.c
+++ b/test/provider_internal_test.c
@@ -25,8 +25,7 @@ static int test_provider(OSSL_PROVIDER *prov, const char *expected_greeting)
     const char *greeting = "no greeting received";
     int ret = 0;
 
-    ret =
-        TEST_true(ossl_provider_activate(prov, 1, 0))
+    ret = TEST_true(ossl_provider_activate(prov, 1, 0))
         && TEST_true(ossl_provider_get_params(prov, greeting_request))
         && TEST_ptr(greeting = greeting_request[0].data)
         && TEST_size_t_gt(greeting_request[0].data_size, 0)
@@ -43,8 +42,8 @@ static const char *expected_greeting1(const char *name)
     static char expected_greeting[256] = "";
 
     BIO_snprintf(expected_greeting, sizeof(expected_greeting),
-                 "Hello OpenSSL %.20s, greetings from %s!",
-                 OPENSSL_VERSION_STR, name);
+        "Hello OpenSSL %.20s, greetings from %s!",
+        OPENSSL_VERSION_STR, name);
 
     return expected_greeting;
 }
@@ -62,9 +61,7 @@ static int test_builtin_provider(void)
      */
     EVP_set_default_properties(NULL, "fips=yes");
 
-    ret =
-        TEST_ptr(prov =
-                 ossl_provider_new(NULL, name, PROVIDER_INIT_FUNCTION_NAME, NULL, 0))
+    ret = TEST_ptr(prov = ossl_provider_new(NULL, name, PROVIDER_INIT_FUNCTION_NAME, NULL, 0))
         && test_provider(prov, expected_greeting1(name));
 
     EVP_set_default_properties(NULL, "");
@@ -78,25 +75,22 @@ static int test_loaded_provider(void)
     const char *name = "p_test";
     OSSL_PROVIDER *prov = NULL;
 
-    return
-        TEST_ptr(prov = ossl_provider_new(NULL, name, NULL, NULL, 0))
+    return TEST_ptr(prov = ossl_provider_new(NULL, name, NULL, NULL, 0))
         && test_provider(prov, expected_greeting1(name));
 }
 
-# ifndef OPENSSL_NO_AUTOLOAD_CONFIG
+#ifndef OPENSSL_NO_AUTOLOAD_CONFIG
 static int test_configured_provider(void)
 {
     const char *name = "p_test_configured";
     OSSL_PROVIDER *prov = NULL;
     /* This MUST match the config file */
-    const char *expected_greeting =
-        "Hello OpenSSL, greetings from Test Provider";
+    const char *expected_greeting = "Hello OpenSSL, greetings from Test Provider";
 
-    return
-        TEST_ptr(prov = ossl_provider_find(NULL, name, 0))
+    return TEST_ptr(prov = ossl_provider_find(NULL, name, 0))
         && test_provider(prov, expected_greeting);
 }
-# endif
+#endif
 #endif
 
 static int test_cache_flushes(void)
@@ -107,9 +101,9 @@ static int test_cache_flushes(void)
     int ret = 0;
 
     if (!TEST_ptr(ctx = OSSL_LIB_CTX_new())
-            || !TEST_ptr(prov = OSSL_PROVIDER_load(ctx, "default"))
-            || !TEST_true(OSSL_PROVIDER_available(ctx, "default"))
-            || !TEST_ptr(md = EVP_MD_fetch(ctx, "SHA256", NULL)))
+        || !TEST_ptr(prov = OSSL_PROVIDER_load(ctx, "default"))
+        || !TEST_true(OSSL_PROVIDER_available(ctx, "default"))
+        || !TEST_ptr(md = EVP_MD_fetch(ctx, "SHA256", NULL)))
         goto err;
     EVP_MD_free(md);
     md = NULL;
@@ -129,7 +123,7 @@ static int test_cache_flushes(void)
     }
 
     ret = 1;
- err:
+err:
     OSSL_PROVIDER_unload(prov);
     EVP_MD_free(md);
     OSSL_LIB_CTX_free(ctx);
@@ -141,11 +135,10 @@ int setup_tests(void)
     ADD_TEST(test_builtin_provider);
 #ifndef NO_PROVIDER_MODULE
     ADD_TEST(test_loaded_provider);
-# ifndef OPENSSL_NO_AUTOLOAD_CONFIG
+#ifndef OPENSSL_NO_AUTOLOAD_CONFIG
     ADD_TEST(test_configured_provider);
-# endif
+#endif
 #endif
     ADD_TEST(test_cache_flushes);
     return 1;
 }
-
diff --git a/test/provider_pkey_test.c b/test/provider_pkey_test.c
index 4abbdd33ec4d6..c7397c33e62c1 100644
--- a/test/provider_pkey_test.c
+++ b/test/provider_pkey_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-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
@@ -23,7 +23,7 @@ extern int key_deleted; /* From fake_rsaprov.c */
 
 /* Fetch SIGNATURE method using a libctx and propq */
 static int fetch_sig(OSSL_LIB_CTX *ctx, const char *alg, const char *propq,
-                     OSSL_PROVIDER *expected_prov)
+    OSSL_PROVIDER *expected_prov)
 {
     OSSL_PROVIDER *prov;
     EVP_SIGNATURE *sig = EVP_SIGNATURE_fetch(ctx, "RSA", propq);
@@ -37,8 +37,8 @@ static int fetch_sig(OSSL_LIB_CTX *ctx, const char *alg, const char *propq,
 
     if (!TEST_ptr_eq(prov, expected_prov)) {
         TEST_info("Fetched provider: %s, Expected provider: %s",
-                  OSSL_PROVIDER_get0_name(prov),
-                  OSSL_PROVIDER_get0_name(expected_prov));
+            OSSL_PROVIDER_get0_name(prov),
+            OSSL_PROVIDER_get0_name(expected_prov));
         goto end;
     }
 
@@ -48,7 +48,6 @@ static int fetch_sig(OSSL_LIB_CTX *ctx, const char *alg, const char *propq,
     return ret;
 }
 
-
 static int test_pkey_sig(void)
 {
     OSSL_PROVIDER *deflt = NULL;
@@ -70,7 +69,7 @@ static int test_pkey_sig(void)
 
     /* Construct a pkey using precise propq to use our provider */
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "RSA",
-                                                   "provider=fake-rsa"))
+                      "provider=fake-rsa"))
         || !TEST_true(EVP_PKEY_fromdata_init(ctx))
         || !TEST_true(EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEYPAIR, NULL))
         || !TEST_ptr(pkey))
@@ -89,7 +88,7 @@ static int test_pkey_sig(void)
          * fake-rsa as the key is not exportable.
          */
         if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_pkey(libctx, pkey,
-                                                       "?provider=default")))
+                          "?provider=default")))
             goto end;
 
         /*
@@ -154,7 +153,7 @@ static int test_alternative_keygen_init(void)
         return 0;
 
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "RSA",
-                                                   "?provider=fake-rsa")))
+                      "?provider=fake-rsa")))
         goto end;
 
     if (!TEST_int_gt(EVP_PKEY_keygen_init(ctx), 0))
@@ -197,10 +196,10 @@ static int test_pkey_eq(void)
     /* Construct a public key for fake-rsa */
     if (!TEST_ptr(params = fake_rsa_key_params(0))
         || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "RSA",
-                                                      "provider=fake-rsa"))
+                         "provider=fake-rsa"))
         || !TEST_true(EVP_PKEY_fromdata_init(ctx))
         || !TEST_true(EVP_PKEY_fromdata(ctx, &pkey_fake, EVP_PKEY_PUBLIC_KEY,
-                                        params))
+            params))
         || !TEST_ptr(pkey_fake))
         goto end;
 
@@ -212,10 +211,10 @@ static int test_pkey_eq(void)
     /* Construct a public key for default */
     if (!TEST_ptr(params = fake_rsa_key_params(0))
         || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "RSA",
-                                                      "provider=default"))
+                         "provider=default"))
         || !TEST_true(EVP_PKEY_fromdata_init(ctx))
         || !TEST_true(EVP_PKEY_fromdata(ctx, &pkey_dflt, EVP_PKEY_PUBLIC_KEY,
-                                        params))
+            params))
         || !TEST_ptr(pkey_dflt))
         goto end;
 
@@ -239,6 +238,77 @@ static int test_pkey_eq(void)
     return ret;
 }
 
+static int test_pkey_can_sign(void)
+{
+    OSSL_PROVIDER *fake_rsa = NULL;
+    EVP_PKEY *pkey_fake = NULL;
+    EVP_PKEY_CTX *ctx = NULL;
+    OSSL_PARAM *params = NULL;
+    int ret = 0;
+
+    if (!TEST_ptr(fake_rsa = fake_rsa_start(libctx)))
+        return 0;
+
+    /*
+     * Ensure other tests did not forget to reset fake_rsa_query_operation_name
+     * to its default value: 0
+     */
+    if (!TEST_int_eq(fake_rsa_query_operation_name, 0))
+        goto end;
+
+    if (!TEST_ptr(params = fake_rsa_key_params(0))
+        || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "RSA",
+                         "provider=fake-rsa"))
+        || !TEST_true(EVP_PKEY_fromdata_init(ctx))
+        || !TEST_true(EVP_PKEY_fromdata(ctx, &pkey_fake, EVP_PKEY_PUBLIC_KEY,
+            params))
+        || !TEST_true(EVP_PKEY_can_sign(pkey_fake))
+        || !TEST_ptr(pkey_fake))
+        goto end;
+
+    EVP_PKEY_CTX_free(ctx);
+    ctx = NULL;
+    EVP_PKEY_free(pkey_fake);
+    pkey_fake = NULL;
+    OSSL_PARAM_free(params);
+    params = NULL;
+
+    /*
+     * Documented behavior for OSSL_FUNC_keymgmt_query_operation_name()
+     * allows it to return NULL, in which case the fallback should be to use
+     * EVP_KEYMGMT_get0_name(). That is exactly the thing we are testing here.
+     */
+    fake_rsa_query_operation_name = 1;
+
+    if (!TEST_ptr(params = fake_rsa_key_params(0))
+        || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(libctx, "RSA",
+                         "provider=fake-rsa"))
+        || !TEST_true(EVP_PKEY_fromdata_init(ctx))
+        || !TEST_true(EVP_PKEY_fromdata(ctx, &pkey_fake, EVP_PKEY_PUBLIC_KEY,
+            params))
+        || !TEST_true(EVP_PKEY_can_sign(pkey_fake))
+        || !TEST_ptr(pkey_fake))
+        goto end;
+
+    EVP_PKEY_CTX_free(ctx);
+    ctx = NULL;
+    EVP_PKEY_free(pkey_fake);
+    pkey_fake = NULL;
+    OSSL_PARAM_free(params);
+    params = NULL;
+
+    ret = 1;
+end:
+
+    EVP_PKEY_CTX_free(ctx);
+    EVP_PKEY_free(pkey_fake);
+    OSSL_PARAM_free(params);
+    fake_rsa_query_operation_name = 0;
+
+    fake_rsa_finish(fake_rsa);
+    return ret;
+}
+
 static int test_pkey_store(int idx)
 {
     OSSL_PROVIDER *deflt = NULL;
@@ -259,18 +329,18 @@ static int test_pkey_store(int idx)
         goto end;
 
     if (!TEST_ptr(loader = OSSL_STORE_LOADER_fetch(libctx, "fake_rsa",
-                                                   propq)))
+                      propq)))
         goto end;
 
     OSSL_STORE_LOADER_free(loader);
 
     if (!TEST_ptr(ctx = OSSL_STORE_open_ex("fake_rsa:test", libctx, propq,
-                                           NULL, NULL, NULL, NULL, NULL)))
+                      NULL, NULL, NULL, NULL, NULL)))
         goto end;
 
     while (!OSSL_STORE_eof(ctx)
-           && (info = OSSL_STORE_load(ctx)) != NULL
-           && pkey == NULL) {
+        && (info = OSSL_STORE_load(ctx)) != NULL
+        && pkey == NULL) {
         if (OSSL_STORE_INFO_get_type(info) == OSSL_STORE_INFO_PKEY)
             pkey = OSSL_STORE_INFO_get1_PKEY(info);
         OSSL_STORE_INFO_free(info);
@@ -309,19 +379,19 @@ static int test_pkey_delete(void)
         goto end;
 
     if (!TEST_ptr(loader = OSSL_STORE_LOADER_fetch(libctx, "fake_rsa",
-                                                   propq)))
+                      propq)))
         goto end;
 
     OSSL_STORE_LOADER_free(loader);
 
     /* First iteration: load key, check it, delete it */
     if (!TEST_ptr(ctx = OSSL_STORE_open_ex("fake_rsa:test", libctx, propq,
-                                           NULL, NULL, NULL, NULL, NULL)))
+                      NULL, NULL, NULL, NULL, NULL)))
         goto end;
 
     while (!OSSL_STORE_eof(ctx)
-           && (info = OSSL_STORE_load(ctx)) != NULL
-           && pkey == NULL) {
+        && (info = OSSL_STORE_load(ctx)) != NULL
+        && pkey == NULL) {
         if (OSSL_STORE_INFO_get_type(info) == OSSL_STORE_INFO_PKEY)
             pkey = OSSL_STORE_INFO_get1_PKEY(info);
         OSSL_STORE_INFO_free(info);
@@ -334,20 +404,21 @@ static int test_pkey_delete(void)
     pkey = NULL;
 
     if (!TEST_int_eq(OSSL_STORE_delete("fake_rsa:test", libctx, propq,
-                                       NULL, NULL, NULL), 1))
+                         NULL, NULL, NULL),
+            1))
         goto end;
     if (!TEST_int_eq(OSSL_STORE_close(ctx), 1))
         goto end;
 
     /* Second iteration: load key should fail */
     if (!TEST_ptr(ctx = OSSL_STORE_open_ex("fake_rsa:test", libctx, propq,
-                                           NULL, NULL, NULL, NULL, NULL)))
+                      NULL, NULL, NULL, NULL, NULL)))
         goto end;
 
     while (!OSSL_STORE_eof(ctx)) {
-           info = OSSL_STORE_load(ctx);
-	   if (!TEST_ptr_null(info))
-               goto end;
+        info = OSSL_STORE_load(ctx);
+        if (!TEST_ptr_null(info))
+            goto end;
     }
 
     ret = 1;
@@ -391,26 +462,26 @@ static int test_pkey_store_open_ex(void)
         goto end;
 
     if (!TEST_ptr(loader = OSSL_STORE_LOADER_fetch(libctx, "fake_rsa",
-                                                   propq)))
+                      propq)))
         goto end;
 
     OSSL_STORE_LOADER_free(loader);
 
-    if (!TEST_ptr(ui_method= UI_create_method("PW Callbacks")))
+    if (!TEST_ptr(ui_method = UI_create_method("PW Callbacks")))
         goto end;
 
     if (UI_method_set_reader(ui_method, fake_pw_read_string))
         goto end;
 
     if (!TEST_ptr(ctx = OSSL_STORE_open_ex("fake_rsa:openpwtest", libctx, propq,
-                                           ui_method, NULL, NULL, NULL, NULL)))
+                      ui_method, NULL, NULL, NULL, NULL)))
         goto end;
 
     /* retry w/o ui_method to ensure we actually enter pw checks and fail */
     OSSL_STORE_close(ctx);
     if (!TEST_ptr_null(ctx = OSSL_STORE_open_ex("fake_rsa:openpwtest", libctx,
-                                                propq, NULL, NULL, NULL, NULL,
-                                                NULL)))
+                           propq, NULL, NULL, NULL, NULL,
+                           NULL)))
         goto end;
 
     ret = 1;
@@ -424,6 +495,292 @@ static int test_pkey_store_open_ex(void)
     return ret;
 }
 
+#define DEFAULT_PROVIDER_IDX 0
+#define FAKE_RSA_PROVIDER_IDX 1
+
+static int reset_ctx_providers(OSSL_LIB_CTX **ctx, OSSL_PROVIDER *providers[2], const char *prop)
+{
+    OSSL_PROVIDER_unload(providers[DEFAULT_PROVIDER_IDX]);
+    providers[DEFAULT_PROVIDER_IDX] = NULL;
+    fake_rsa_finish(providers[FAKE_RSA_PROVIDER_IDX]);
+    providers[FAKE_RSA_PROVIDER_IDX] = NULL;
+    OSSL_LIB_CTX_free(*ctx);
+    *ctx = NULL;
+
+    if (!TEST_ptr(*ctx = OSSL_LIB_CTX_new())
+        || !TEST_ptr(providers[DEFAULT_PROVIDER_IDX] = OSSL_PROVIDER_load(*ctx, "default"))
+        || !TEST_ptr(providers[FAKE_RSA_PROVIDER_IDX] = fake_rsa_start(*ctx))
+        || !TEST_true(EVP_set_default_properties(*ctx, prop)))
+        return 0;
+    return 1;
+}
+
+struct test_pkey_decoder_properties_t {
+    const char *provider_props;
+    const char *explicit_props;
+    int curr_provider_idx;
+};
+
+static int test_pkey_provider_decoder_props(void)
+{
+    OSSL_LIB_CTX *my_libctx = NULL;
+    OSSL_PROVIDER *providers[2] = { NULL };
+    struct test_pkey_decoder_properties_t properties_test[] = {
+        { "?provider=fake-rsa", NULL, FAKE_RSA_PROVIDER_IDX },
+        { "?provider=default", NULL, DEFAULT_PROVIDER_IDX },
+        { NULL, "?provider=fake-rsa", FAKE_RSA_PROVIDER_IDX },
+        { NULL, "?provider=default", DEFAULT_PROVIDER_IDX },
+        { NULL, "provider=fake-rsa", FAKE_RSA_PROVIDER_IDX },
+        { NULL, "provider=default", DEFAULT_PROVIDER_IDX },
+    };
+    EVP_PKEY *pkey = NULL;
+    BIO *bio_priv = NULL;
+    unsigned char *encoded_pub = NULL;
+    int len_pub;
+    const unsigned char *p;
+    PKCS8_PRIV_KEY_INFO *p8 = NULL;
+    size_t i;
+    int ret = 0;
+    const char pem_rsa_priv_key[] = {
+        0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x42, 0x45, 0x47, 0x49, 0x4E, 0x20, 0x50,
+        0x52, 0x49, 0x56, 0x41, 0x54, 0x45, 0x20, 0x4B, 0x45, 0x59, 0x2D, 0x2D,
+        0x2D, 0x2D, 0x2D, 0x0A, 0x4D, 0x49, 0x49, 0x45, 0x76, 0x51, 0x49, 0x42,
+        0x41, 0x44, 0x41, 0x4E, 0x42, 0x67, 0x6B, 0x71, 0x68, 0x6B, 0x69, 0x47,
+        0x39, 0x77, 0x30, 0x42, 0x41, 0x51, 0x45, 0x46, 0x41, 0x41, 0x53, 0x43,
+        0x42, 0x4B, 0x63, 0x77, 0x67, 0x67, 0x53, 0x6A, 0x41, 0x67, 0x45, 0x41,
+        0x41, 0x6F, 0x49, 0x42, 0x41, 0x51, 0x44, 0x45, 0x6B, 0x43, 0x34, 0x5A,
+        0x57, 0x76, 0x33, 0x75, 0x63, 0x46, 0x62, 0x55, 0x0A, 0x46, 0x38, 0x59,
+        0x77, 0x6C, 0x55, 0x72, 0x6D, 0x51, 0x6C, 0x4C, 0x43, 0x5A, 0x77, 0x41,
+        0x67, 0x72, 0x34, 0x44, 0x50, 0x55, 0x41, 0x46, 0x56, 0x48, 0x6C, 0x2B,
+        0x77, 0x46, 0x63, 0x58, 0x79, 0x70, 0x56, 0x67, 0x53, 0x63, 0x56, 0x59,
+        0x34, 0x4B, 0x37, 0x51, 0x6D, 0x64, 0x57, 0x4B, 0x73, 0x59, 0x71, 0x62,
+        0x38, 0x74, 0x70, 0x4F, 0x78, 0x71, 0x77, 0x30, 0x4E, 0x77, 0x5A, 0x57,
+        0x58, 0x0A, 0x4F, 0x2B, 0x74, 0x61, 0x34, 0x2B, 0x79, 0x32, 0x37, 0x43,
+        0x4F, 0x75, 0x66, 0x6F, 0x4F, 0x68, 0x52, 0x54, 0x4D, 0x77, 0x4E, 0x79,
+        0x4E, 0x32, 0x4C, 0x77, 0x53, 0x4E, 0x54, 0x50, 0x4E, 0x33, 0x65, 0x45,
+        0x6B, 0x34, 0x65, 0x65, 0x35, 0x51, 0x6E, 0x70, 0x70, 0x45, 0x79, 0x44,
+        0x72, 0x71, 0x6F, 0x43, 0x67, 0x76, 0x54, 0x6C, 0x41, 0x41, 0x64, 0x54,
+        0x6F, 0x46, 0x61, 0x58, 0x76, 0x6A, 0x0A, 0x78, 0x31, 0x33, 0x59, 0x62,
+        0x6A, 0x37, 0x6A, 0x66, 0x68, 0x77, 0x4E, 0x37, 0x34, 0x71, 0x4B, 0x64,
+        0x71, 0x73, 0x53, 0x45, 0x74, 0x50, 0x57, 0x79, 0x67, 0x67, 0x65, 0x6F,
+        0x74, 0x69, 0x51, 0x53, 0x50, 0x79, 0x36, 0x4B, 0x79, 0x42, 0x49, 0x75,
+        0x57, 0x74, 0x49, 0x78, 0x50, 0x41, 0x41, 0x38, 0x6A, 0x41, 0x76, 0x66,
+        0x41, 0x6E, 0x51, 0x6A, 0x31, 0x65, 0x58, 0x68, 0x67, 0x68, 0x46, 0x0A,
+        0x4E, 0x32, 0x4E, 0x78, 0x6B, 0x71, 0x67, 0x78, 0x76, 0x42, 0x59, 0x64,
+        0x4E, 0x79, 0x31, 0x6D, 0x33, 0x2B, 0x6A, 0x58, 0x41, 0x43, 0x50, 0x4C,
+        0x52, 0x7A, 0x63, 0x31, 0x31, 0x5A, 0x62, 0x4E, 0x48, 0x4B, 0x69, 0x77,
+        0x68, 0x43, 0x59, 0x31, 0x2F, 0x48, 0x69, 0x53, 0x42, 0x6B, 0x77, 0x48,
+        0x6C, 0x49, 0x4B, 0x2B, 0x2F, 0x56, 0x4C, 0x6A, 0x32, 0x73, 0x6D, 0x43,
+        0x4B, 0x64, 0x55, 0x51, 0x0A, 0x67, 0x76, 0x4C, 0x58, 0x53, 0x6E, 0x6E,
+        0x56, 0x67, 0x51, 0x75, 0x6C, 0x48, 0x69, 0x6F, 0x44, 0x36, 0x55, 0x67,
+        0x59, 0x38, 0x78, 0x41, 0x32, 0x61, 0x34, 0x4D, 0x31, 0x72, 0x68, 0x59,
+        0x75, 0x54, 0x56, 0x38, 0x42, 0x72, 0x50, 0x52, 0x5A, 0x34, 0x42, 0x46,
+        0x78, 0x32, 0x6F, 0x30, 0x6A, 0x59, 0x57, 0x76, 0x47, 0x62, 0x41, 0x2F,
+        0x48, 0x6C, 0x70, 0x37, 0x66, 0x54, 0x4F, 0x79, 0x2B, 0x0A, 0x46, 0x35,
+        0x4F, 0x6B, 0x69, 0x48, 0x53, 0x37, 0x41, 0x67, 0x4D, 0x42, 0x41, 0x41,
+        0x45, 0x43, 0x67, 0x67, 0x45, 0x41, 0x59, 0x67, 0x43, 0x75, 0x38, 0x31,
+        0x5A, 0x69, 0x51, 0x42, 0x56, 0x44, 0x76, 0x57, 0x69, 0x44, 0x47, 0x4B,
+        0x72, 0x2B, 0x31, 0x70, 0x49, 0x66, 0x32, 0x43, 0x78, 0x70, 0x72, 0x47,
+        0x4A, 0x45, 0x6D, 0x31, 0x68, 0x38, 0x36, 0x5A, 0x63, 0x45, 0x78, 0x33,
+        0x4C, 0x37, 0x0A, 0x71, 0x46, 0x44, 0x57, 0x2B, 0x67, 0x38, 0x48, 0x47,
+        0x57, 0x64, 0x30, 0x34, 0x53, 0x33, 0x71, 0x76, 0x68, 0x39, 0x4C, 0x75,
+        0x62, 0x6C, 0x41, 0x4A, 0x7A, 0x65, 0x74, 0x41, 0x50, 0x78, 0x52, 0x58,
+        0x4C, 0x39, 0x7A, 0x78, 0x33, 0x50, 0x58, 0x6A, 0x4A, 0x5A, 0x73, 0x37,
+        0x65, 0x33, 0x48, 0x4C, 0x45, 0x75, 0x6E, 0x79, 0x33, 0x54, 0x61, 0x57,
+        0x65, 0x7A, 0x30, 0x58, 0x49, 0x30, 0x4F, 0x0A, 0x34, 0x4C, 0x53, 0x59,
+        0x38, 0x53, 0x38, 0x64, 0x36, 0x70, 0x56, 0x42, 0x50, 0x6D, 0x55, 0x45,
+        0x74, 0x77, 0x47, 0x57, 0x4E, 0x34, 0x76, 0x59, 0x71, 0x48, 0x6E, 0x4B,
+        0x4C, 0x58, 0x4F, 0x62, 0x34, 0x51, 0x51, 0x41, 0x58, 0x73, 0x34, 0x4D,
+        0x7A, 0x66, 0x6B, 0x4D, 0x2F, 0x4D, 0x65, 0x2F, 0x62, 0x2B, 0x7A, 0x64,
+        0x75, 0x31, 0x75, 0x6D, 0x77, 0x6A, 0x4D, 0x6C, 0x33, 0x44, 0x75, 0x64,
+        0x0A, 0x35, 0x72, 0x56, 0x68, 0x6B, 0x67, 0x76, 0x74, 0x38, 0x75, 0x68,
+        0x44, 0x55, 0x47, 0x33, 0x58, 0x53, 0x48, 0x65, 0x6F, 0x4A, 0x59, 0x42,
+        0x4D, 0x62, 0x54, 0x39, 0x69, 0x6B, 0x4A, 0x44, 0x56, 0x4D, 0x4A, 0x35,
+        0x31, 0x72, 0x72, 0x65, 0x2F, 0x31, 0x52, 0x69, 0x64, 0x64, 0x67, 0x78,
+        0x70, 0x38, 0x53, 0x6B, 0x74, 0x56, 0x6B, 0x76, 0x47, 0x6D, 0x4D, 0x6C,
+        0x39, 0x6B, 0x51, 0x52, 0x38, 0x0A, 0x38, 0x64, 0x76, 0x33, 0x50, 0x78,
+        0x2F, 0x6B, 0x54, 0x4E, 0x39, 0x34, 0x45, 0x75, 0x52, 0x67, 0x30, 0x43,
+        0x6B, 0x58, 0x42, 0x68, 0x48, 0x70, 0x6F, 0x47, 0x6F, 0x34, 0x71, 0x6E,
+        0x4D, 0x33, 0x51, 0x33, 0x42, 0x35, 0x50, 0x6C, 0x6D, 0x53, 0x4B, 0x35,
+        0x67, 0x6B, 0x75, 0x50, 0x76, 0x57, 0x79, 0x39, 0x6C, 0x38, 0x4C, 0x2F,
+        0x54, 0x56, 0x74, 0x38, 0x4C, 0x62, 0x36, 0x2F, 0x7A, 0x4C, 0x0A, 0x42,
+        0x79, 0x51, 0x57, 0x2B, 0x67, 0x30, 0x32, 0x77, 0x78, 0x65, 0x4E, 0x47,
+        0x68, 0x77, 0x31, 0x66, 0x6B, 0x44, 0x2B, 0x58, 0x46, 0x48, 0x37, 0x4B,
+        0x6B, 0x53, 0x65, 0x57, 0x6C, 0x2B, 0x51, 0x6E, 0x72, 0x4C, 0x63, 0x65,
+        0x50, 0x4D, 0x30, 0x68, 0x51, 0x4B, 0x42, 0x67, 0x51, 0x44, 0x78, 0x6F,
+        0x71, 0x55, 0x6B, 0x30, 0x50, 0x4C, 0x4F, 0x59, 0x35, 0x57, 0x67, 0x4F,
+        0x6B, 0x67, 0x72, 0x0A, 0x75, 0x6D, 0x67, 0x69, 0x65, 0x2F, 0x4B, 0x31,
+        0x57, 0x4B, 0x73, 0x2B, 0x69, 0x7A, 0x54, 0x74, 0x41, 0x70, 0x6A, 0x7A,
+        0x63, 0x4D, 0x37, 0x36, 0x73, 0x7A, 0x61, 0x36, 0x33, 0x62, 0x35, 0x52,
+        0x39, 0x77, 0x2B, 0x50, 0x2B, 0x4E, 0x73, 0x73, 0x4D, 0x56, 0x34, 0x61,
+        0x65, 0x56, 0x39, 0x65, 0x70, 0x45, 0x47, 0x5A, 0x4F, 0x36, 0x38, 0x49,
+        0x55, 0x6D, 0x69, 0x30, 0x51, 0x6A, 0x76, 0x51, 0x0A, 0x6E, 0x70, 0x6C,
+        0x75, 0x51, 0x6F, 0x61, 0x64, 0x46, 0x59, 0x77, 0x65, 0x46, 0x77, 0x53,
+        0x51, 0x31, 0x31, 0x42, 0x58, 0x48, 0x6F, 0x65, 0x51, 0x42, 0x41, 0x34,
+        0x6E, 0x4E, 0x70, 0x6B, 0x72, 0x56, 0x35, 0x38, 0x68, 0x67, 0x7A, 0x5A,
+        0x4E, 0x33, 0x6D, 0x39, 0x4A, 0x4C, 0x52, 0x37, 0x4A, 0x78, 0x79, 0x72,
+        0x49, 0x71, 0x58, 0x73, 0x52, 0x6E, 0x55, 0x7A, 0x6C, 0x31, 0x33, 0x4B,
+        0x6A, 0x0A, 0x47, 0x7A, 0x5A, 0x42, 0x43, 0x4A, 0x78, 0x43, 0x70, 0x4A,
+        0x6A, 0x66, 0x54, 0x7A, 0x65, 0x2F, 0x79, 0x6D, 0x65, 0x38, 0x64, 0x33,
+        0x70, 0x61, 0x35, 0x51, 0x4B, 0x42, 0x67, 0x51, 0x44, 0x51, 0x50, 0x35,
+        0x6D, 0x42, 0x34, 0x6A, 0x49, 0x2B, 0x67, 0x33, 0x58, 0x48, 0x33, 0x4D,
+        0x75, 0x4C, 0x79, 0x42, 0x6A, 0x4D, 0x6F, 0x54, 0x49, 0x76, 0x6F, 0x79,
+        0x37, 0x43, 0x59, 0x4D, 0x68, 0x5A, 0x0A, 0x36, 0x2F, 0x2B, 0x4B, 0x6B,
+        0x70, 0x77, 0x31, 0x33, 0x32, 0x4A, 0x31, 0x36, 0x6D, 0x71, 0x6B, 0x4C,
+        0x72, 0x77, 0x55, 0x4F, 0x5A, 0x66, 0x54, 0x30, 0x65, 0x31, 0x72, 0x4A,
+        0x42, 0x73, 0x43, 0x55, 0x6B, 0x45, 0x6F, 0x42, 0x6D, 0x67, 0x4B, 0x4E,
+        0x74, 0x52, 0x6B, 0x48, 0x6F, 0x33, 0x2F, 0x53, 0x6A, 0x55, 0x49, 0x2F,
+        0x39, 0x66, 0x48, 0x6A, 0x33, 0x75, 0x53, 0x74, 0x50, 0x48, 0x56, 0x0A,
+        0x6F, 0x50, 0x63, 0x66, 0x58, 0x6A, 0x2F, 0x67, 0x46, 0x52, 0x55, 0x6B,
+        0x44, 0x44, 0x7A, 0x59, 0x2B, 0x61, 0x75, 0x42, 0x33, 0x64, 0x48, 0x4F,
+        0x4E, 0x46, 0x31, 0x55, 0x31, 0x7A, 0x30, 0x36, 0x45, 0x41, 0x4E, 0x6B,
+        0x6B, 0x50, 0x43, 0x43, 0x33, 0x61, 0x35, 0x33, 0x38, 0x55, 0x41, 0x4E,
+        0x42, 0x49, 0x61, 0x50, 0x6A, 0x77, 0x70, 0x52, 0x64, 0x42, 0x7A, 0x4E,
+        0x77, 0x31, 0x78, 0x6C, 0x0A, 0x62, 0x76, 0x6E, 0x35, 0x61, 0x43, 0x74,
+        0x33, 0x48, 0x77, 0x4B, 0x42, 0x67, 0x42, 0x66, 0x4F, 0x6C, 0x34, 0x6A,
+        0x47, 0x45, 0x58, 0x59, 0x6D, 0x4E, 0x36, 0x4B, 0x2B, 0x75, 0x30, 0x65,
+        0x62, 0x71, 0x52, 0x44, 0x6B, 0x74, 0x32, 0x67, 0x49, 0x6F, 0x57, 0x36,
+        0x62, 0x46, 0x6F, 0x37, 0x58, 0x64, 0x36, 0x78, 0x63, 0x69, 0x2F, 0x67,
+        0x46, 0x57, 0x6A, 0x6F, 0x56, 0x43, 0x4F, 0x42, 0x59, 0x0A, 0x67, 0x43,
+        0x38, 0x47, 0x4C, 0x4D, 0x6E, 0x77, 0x33, 0x7A, 0x32, 0x71, 0x67, 0x61,
+        0x76, 0x34, 0x63, 0x51, 0x49, 0x67, 0x38, 0x45, 0x44, 0x59, 0x70, 0x62,
+        0x70, 0x45, 0x34, 0x46, 0x48, 0x51, 0x6E, 0x6E, 0x74, 0x50, 0x6B, 0x4B,
+        0x57, 0x2F, 0x62, 0x72, 0x75, 0x30, 0x4E, 0x74, 0x33, 0x79, 0x61, 0x4E,
+        0x62, 0x38, 0x69, 0x67, 0x79, 0x31, 0x61, 0x5A, 0x4F, 0x52, 0x66, 0x49,
+        0x76, 0x5A, 0x0A, 0x71, 0x54, 0x4D, 0x4C, 0x45, 0x33, 0x6D, 0x65, 0x6C,
+        0x63, 0x5A, 0x57, 0x37, 0x4C, 0x61, 0x69, 0x71, 0x65, 0x4E, 0x31, 0x56,
+        0x30, 0x76, 0x48, 0x2F, 0x4D, 0x43, 0x55, 0x64, 0x70, 0x58, 0x39, 0x59,
+        0x31, 0x34, 0x4B, 0x39, 0x43, 0x4A, 0x59, 0x78, 0x7A, 0x73, 0x52, 0x4F,
+        0x67, 0x50, 0x71, 0x64, 0x45, 0x67, 0x4D, 0x57, 0x59, 0x44, 0x46, 0x41,
+        0x6F, 0x47, 0x41, 0x41, 0x65, 0x39, 0x6C, 0x0A, 0x58, 0x4D, 0x69, 0x65,
+        0x55, 0x4F, 0x68, 0x6C, 0x30, 0x73, 0x71, 0x68, 0x64, 0x5A, 0x59, 0x52,
+        0x62, 0x4F, 0x31, 0x65, 0x69, 0x77, 0x54, 0x49, 0x4C, 0x58, 0x51, 0x36,
+        0x79, 0x47, 0x4D, 0x69, 0x42, 0x38, 0x61, 0x65, 0x2F, 0x76, 0x30, 0x70,
+        0x62, 0x42, 0x45, 0x57, 0x6C, 0x70, 0x6E, 0x38, 0x6B, 0x32, 0x2B, 0x4A,
+        0x6B, 0x71, 0x56, 0x54, 0x77, 0x48, 0x67, 0x67, 0x62, 0x43, 0x41, 0x5A,
+        0x0A, 0x6A, 0x4F, 0x61, 0x71, 0x56, 0x74, 0x58, 0x31, 0x6D, 0x55, 0x79,
+        0x54, 0x59, 0x7A, 0x6A, 0x73, 0x54, 0x7A, 0x34, 0x5A, 0x59, 0x6A, 0x68,
+        0x61, 0x48, 0x4A, 0x33, 0x6A, 0x31, 0x57, 0x6C, 0x65, 0x67, 0x6F, 0x4D,
+        0x63, 0x73, 0x74, 0x64, 0x66, 0x54, 0x2B, 0x74, 0x78, 0x4D, 0x55, 0x37,
+        0x34, 0x6F, 0x67, 0x64, 0x4F, 0x71, 0x4D, 0x7A, 0x68, 0x78, 0x53, 0x55,
+        0x4F, 0x34, 0x35, 0x67, 0x38, 0x0A, 0x66, 0x39, 0x57, 0x38, 0x39, 0x6D,
+        0x70, 0x61, 0x38, 0x62, 0x42, 0x6A, 0x4F, 0x50, 0x75, 0x2B, 0x79, 0x46,
+        0x79, 0x36, 0x36, 0x74, 0x44, 0x61, 0x5A, 0x36, 0x73, 0x57, 0x45, 0x37,
+        0x63, 0x35, 0x53, 0x58, 0x45, 0x48, 0x58, 0x6C, 0x38, 0x43, 0x67, 0x59,
+        0x45, 0x41, 0x74, 0x41, 0x57, 0x77, 0x46, 0x50, 0x6F, 0x44, 0x53, 0x54,
+        0x64, 0x7A, 0x6F, 0x58, 0x41, 0x77, 0x52, 0x6F, 0x66, 0x30, 0x0A, 0x51,
+        0x4D, 0x4F, 0x30, 0x38, 0x2B, 0x50, 0x6E, 0x51, 0x47, 0x6F, 0x50, 0x62,
+        0x4D, 0x4A, 0x54, 0x71, 0x72, 0x67, 0x78, 0x72, 0x48, 0x59, 0x43, 0x53,
+        0x38, 0x75, 0x34, 0x63, 0x59, 0x53, 0x48, 0x64, 0x44, 0x4D, 0x4A, 0x44,
+        0x43, 0x4F, 0x4D, 0x6F, 0x35, 0x67, 0x46, 0x58, 0x79, 0x43, 0x2B, 0x35,
+        0x46, 0x66, 0x54, 0x69, 0x47, 0x77, 0x42, 0x68, 0x79, 0x35, 0x38, 0x7A,
+        0x35, 0x62, 0x37, 0x0A, 0x67, 0x42, 0x77, 0x46, 0x4B, 0x49, 0x39, 0x52,
+        0x67, 0x52, 0x66, 0x56, 0x31, 0x44, 0x2F, 0x4E, 0x69, 0x6D, 0x78, 0x50,
+        0x72, 0x6C, 0x6A, 0x33, 0x57, 0x48, 0x79, 0x65, 0x63, 0x31, 0x2F, 0x43,
+        0x73, 0x2B, 0x42, 0x72, 0x2B, 0x2F, 0x76, 0x65, 0x6B, 0x4D, 0x56, 0x46,
+        0x67, 0x35, 0x67, 0x65, 0x6B, 0x65, 0x48, 0x72, 0x34, 0x61, 0x47, 0x53,
+        0x46, 0x34, 0x62, 0x6B, 0x30, 0x41, 0x6A, 0x56, 0x0A, 0x54, 0x76, 0x2F,
+        0x70, 0x51, 0x6A, 0x79, 0x52, 0x75, 0x5A, 0x41, 0x74, 0x36, 0x36, 0x49,
+        0x62, 0x52, 0x5A, 0x64, 0x6C, 0x32, 0x49, 0x49, 0x3D, 0x0A, 0x2D, 0x2D,
+        0x2D, 0x2D, 0x2D, 0x45, 0x4E, 0x44, 0x20, 0x50, 0x52, 0x49, 0x56, 0x41,
+        0x54, 0x45, 0x20, 0x4B, 0x45, 0x59, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D
+    };
+    /*
+     * PEM of pem_rsa_priv_key:
+     * -----BEGIN PRIVATE KEY-----
+     * MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDEkC4ZWv3ucFbU
+     * F8YwlUrmQlLCZwAgr4DPUAFVHl+wFcXypVgScVY4K7QmdWKsYqb8tpOxqw0NwZWX
+     * O+ta4+y27COufoOhRTMwNyN2LwSNTPN3eEk4ee5QnppEyDrqoCgvTlAAdToFaXvj
+     * x13Ybj7jfhwN74qKdqsSEtPWyggeotiQSPy6KyBIuWtIxPAA8jAvfAnQj1eXhghF
+     * N2NxkqgxvBYdNy1m3+jXACPLRzc11ZbNHKiwhCY1/HiSBkwHlIK+/VLj2smCKdUQ
+     * gvLXSnnVgQulHioD6UgY8xA2a4M1rhYuTV8BrPRZ4BFx2o0jYWvGbA/Hlp7fTOy+
+     * F5OkiHS7AgMBAAECggEAYgCu81ZiQBVDvWiDGKr+1pIf2CxprGJEm1h86ZcEx3L7
+     * qFDW+g8HGWd04S3qvh9LublAJzetAPxRXL9zx3PXjJZs7e3HLEuny3TaWez0XI0O
+     * 4LSY8S8d6pVBPmUEtwGWN4vYqHnKLXOb4QQAXs4MzfkM/Me/b+zdu1umwjMl3Dud
+     * 5rVhkgvt8uhDUG3XSHeoJYBMbT9ikJDVMJ51rre/1Riddgxp8SktVkvGmMl9kQR8
+     * 8dv3Px/kTN94EuRg0CkXBhHpoGo4qnM3Q3B5PlmSK5gkuPvWy9l8L/TVt8Lb6/zL
+     * ByQW+g02wxeNGhw1fkD+XFH7KkSeWl+QnrLcePM0hQKBgQDxoqUk0PLOY5WgOkgr
+     * umgie/K1WKs+izTtApjzcM76sza63b5R9w+P+NssMV4aeV9epEGZO68IUmi0QjvQ
+     * npluQoadFYweFwSQ11BXHoeQBA4nNpkrV58hgzZN3m9JLR7JxyrIqXsRnUzl13Kj
+     * GzZBCJxCpJjfTze/yme8d3pa5QKBgQDQP5mB4jI+g3XH3MuLyBjMoTIvoy7CYMhZ
+     * 6/+Kkpw132J16mqkLrwUOZfT0e1rJBsCUkEoBmgKNtRkHo3/SjUI/9fHj3uStPHV
+     * oPcfXj/gFRUkDDzY+auB3dHONF1U1z06EANkkPCC3a538UANBIaPjwpRdBzNw1xl
+     * bvn5aCt3HwKBgBfOl4jGEXYmN6K+u0ebqRDkt2gIoW6bFo7Xd6xci/gFWjoVCOBY
+     * gC8GLMnw3z2qgav4cQIg8EDYpbpE4FHQnntPkKW/bru0Nt3yaNb8igy1aZORfIvZ
+     * qTMLE3melcZW7LaiqeN1V0vH/MCUdpX9Y14K9CJYxzsROgPqdEgMWYDFAoGAAe9l
+     * XMieUOhl0sqhdZYRbO1eiwTILXQ6yGMiB8ae/v0pbBEWlpn8k2+JkqVTwHggbCAZ
+     * jOaqVtX1mUyTYzjsTz4ZYjhaHJ3j1WlegoMcstdfT+txMU74ogdOqMzhxSUO45g8
+     * f9W89mpa8bBjOPu+yFy66tDaZ6sWE7c5SXEHXl8CgYEAtAWwFPoDSTdzoXAwRof0
+     * QMO08+PnQGoPbMJTqrgxrHYCS8u4cYSHdDMJDCOMo5gFXyC+5FfTiGwBhy58z5b7
+     * gBwFKI9RgRfV1D/NimxPrlj3WHyec1/Cs+Br+/vekMVFg5gekeHr4aGSF4bk0AjV
+     * Tv/pQjyRuZAt66IbRZdl2II=
+     * -----END PRIVATE KEY-----
+     */
+
+    /* Load private key BIO, DER-encoded public key and PKCS#8 private key for testing */
+    if (!TEST_ptr(bio_priv = BIO_new(BIO_s_mem()))
+        || !TEST_int_gt(BIO_write(bio_priv, pem_rsa_priv_key, sizeof(pem_rsa_priv_key)), 0)
+        || !TEST_ptr(pkey = PEM_read_bio_PrivateKey_ex(bio_priv, NULL, NULL, NULL, NULL, NULL))
+        || !TEST_int_ge(BIO_seek(bio_priv, 0), 0)
+        || !TEST_int_gt((len_pub = i2d_PUBKEY(pkey, &encoded_pub)), 0)
+        || !TEST_ptr(p8 = EVP_PKEY2PKCS8(pkey)))
+        goto end;
+    EVP_PKEY_free(pkey);
+    pkey = NULL;
+
+    for (i = 0; i < OSSL_NELEM(properties_test); i++) {
+        const char *libctx_prop = properties_test[i].provider_props;
+        const char *explicit_prop = properties_test[i].explicit_props;
+        /* *curr_provider will be updated in reset_ctx_providers */
+        OSSL_PROVIDER **curr_provider = &providers[properties_test[i].curr_provider_idx];
+
+        /*
+         * Decoding a PEM-encoded key uses the properties to select the right provider.
+         * Using a PEM-encoding adds an extra decoder before the key is created.
+         */
+        if (!TEST_int_eq(reset_ctx_providers(&my_libctx, providers, libctx_prop), 1))
+            goto end;
+        if (!TEST_int_ge(BIO_seek(bio_priv, 0), 0)
+            || !TEST_ptr(pkey = PEM_read_bio_PrivateKey_ex(bio_priv, NULL, NULL, NULL, my_libctx,
+                             explicit_prop))
+            || !TEST_ptr_eq(EVP_PKEY_get0_provider(pkey), *curr_provider))
+            goto end;
+        EVP_PKEY_free(pkey);
+        pkey = NULL;
+
+        /* Decoding a DER-encoded X509_PUBKEY uses the properties to select the right provider */
+        if (!TEST_int_eq(reset_ctx_providers(&my_libctx, providers, libctx_prop), 1))
+            goto end;
+        p = encoded_pub;
+        if (!TEST_ptr(pkey = d2i_PUBKEY_ex(NULL, &p, len_pub, my_libctx, explicit_prop))
+            || !TEST_ptr_eq(EVP_PKEY_get0_provider(pkey), *curr_provider))
+            goto end;
+        EVP_PKEY_free(pkey);
+        pkey = NULL;
+
+        /* Decoding a PKCS8_PRIV_KEY_INFO uses the properties to select the right provider */
+        if (!TEST_int_eq(reset_ctx_providers(&my_libctx, providers, libctx_prop), 1))
+            goto end;
+        if (!TEST_ptr(pkey = EVP_PKCS82PKEY_ex(p8, my_libctx, explicit_prop))
+            || !TEST_ptr_eq(EVP_PKEY_get0_provider(pkey), *curr_provider))
+            goto end;
+        EVP_PKEY_free(pkey);
+        pkey = NULL;
+    }
+
+    ret = 1;
+
+end:
+    PKCS8_PRIV_KEY_INFO_free(p8);
+    BIO_free(bio_priv);
+    OPENSSL_free(encoded_pub);
+    EVP_PKEY_free(pkey);
+    OSSL_PROVIDER_unload(providers[DEFAULT_PROVIDER_IDX]);
+    fake_rsa_finish(providers[FAKE_RSA_PROVIDER_IDX]);
+    OSSL_LIB_CTX_free(my_libctx);
+    return ret;
+}
+
 int setup_tests(void)
 {
     libctx = OSSL_LIB_CTX_new();
@@ -433,9 +790,11 @@ int setup_tests(void)
     ADD_TEST(test_pkey_sig);
     ADD_TEST(test_alternative_keygen_init);
     ADD_TEST(test_pkey_eq);
+    ADD_TEST(test_pkey_can_sign);
     ADD_ALL_TESTS(test_pkey_store, 2);
     ADD_TEST(test_pkey_delete);
     ADD_TEST(test_pkey_store_open_ex);
+    ADD_TEST(test_pkey_provider_decoder_props);
 
     return 1;
 }
diff --git a/test/provider_status_test.c b/test/provider_status_test.c
index 9fcd2c2b14bd5..9f3294a44178b 100644
--- a/test/provider_status_test.c
+++ b/test/provider_status_test.c
@@ -38,16 +38,16 @@ const OPTIONS *test_get_options(void)
     static const OPTIONS test_options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
         { "provider_name", OPT_PROVIDER_NAME, 's',
-          "The name of the provider to load" },
+            "The name of the provider to load" },
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the libctx" },
+            "The configuration file to use for the libctx" },
         { NULL }
     };
     return test_options;
 }
 
 static int self_test_events(const OSSL_PARAM params[], void *arg,
-                            const char *title, int corrupt)
+    const char *title, int corrupt)
 {
     struct self_test_arg *args = arg;
     const OSSL_PARAM *p = NULL;
@@ -76,7 +76,7 @@ static int self_test_events(const OSSL_PARAM params[], void *arg,
     if (strcmp(phase, OSSL_SELF_TEST_PHASE_START) == 0)
         BIO_printf(bio_out, "%s : (%s) : ", desc, type);
     else if (strcmp(phase, OSSL_SELF_TEST_PHASE_PASS) == 0
-             || strcmp(phase, OSSL_SELF_TEST_PHASE_FAIL) == 0)
+        || strcmp(phase, OSSL_SELF_TEST_PHASE_FAIL) == 0)
         BIO_printf(bio_out, "%s\n", phase);
     /*
      * The self test code will internally corrupt the KAT test result if an
@@ -121,10 +121,10 @@ static int get_provider_params(const OSSL_PROVIDER *prov)
 
     params[0] = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_NAME, &name, 0);
     params[1] = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_VERSION,
-                                              &version, 0);
+        &version, 0);
     params[2] = OSSL_PARAM_construct_int(OSSL_PROV_PARAM_STATUS, &status);
     params[3] = OSSL_PARAM_construct_utf8_ptr(OSSL_PROV_PARAM_BUILDINFO,
-                                              &buildinfo, 0);
+        &buildinfo, 0);
     params[4] = OSSL_PARAM_construct_end();
     OSSL_PARAM_set_all_unmodified(params);
     if (!TEST_true(OSSL_PROVIDER_get_params(prov, params)))
@@ -227,7 +227,7 @@ int setup_tests(void)
             provider_name = opt_arg();
             break;
         case OPT_TEST_CASES:
-           break;
+            break;
         default:
         case OPT_ERR:
             return 0;
diff --git a/test/provider_test.c b/test/provider_test.c
index ef08cc51ea30a..475f9ba08c7f0 100644
--- a/test/provider_test.c
+++ b/test/provider_test.c
@@ -23,19 +23,19 @@ static OSSL_PARAM greeting_request[] = {
 static unsigned int digestsuccess = 0;
 static OSSL_PARAM digest_check[] = {
     { "digest-check", OSSL_PARAM_UNSIGNED_INTEGER, &digestsuccess,
-      sizeof(digestsuccess) },
+        sizeof(digestsuccess) },
     { NULL, 0, NULL, 0, 0 }
 };
 
 static unsigned int stopsuccess = 0;
 static OSSL_PARAM stop_property_mirror[] = {
     { "stop-property-mirror", OSSL_PARAM_UNSIGNED_INTEGER, &stopsuccess,
-      sizeof(stopsuccess) },
+        sizeof(stopsuccess) },
     { NULL, 0, NULL, 0, 0 }
 };
 
 static int test_provider(OSSL_LIB_CTX **libctx, const char *name,
-                         OSSL_PROVIDER *legacy)
+    OSSL_PROVIDER *legacy)
 {
     OSSL_PROVIDER *prov = NULL;
     const char *greeting = NULL;
@@ -46,9 +46,8 @@ static int test_provider(OSSL_LIB_CTX **libctx, const char *name,
     OSSL_PROVIDER *deflt = NULL, *base = NULL;
 
     BIO_snprintf(expected_greeting, sizeof(expected_greeting),
-                 "Hello OpenSSL %.20s, greetings from %s!",
-                 OPENSSL_VERSION_STR, name);
-
+        "Hello OpenSSL %.20s, greetings from %s!",
+        OPENSSL_VERSION_STR, name);
 
     /*
      * We set properties that we know the providers we are using don't have.
@@ -72,7 +71,7 @@ static int test_provider(OSSL_LIB_CTX **libctx, const char *name,
     EVP_set_default_properties(*libctx, "");
     if (dolegacycheck) {
         if (!TEST_true(OSSL_PROVIDER_get_params(prov, digest_check))
-                || !TEST_true(digestsuccess))
+            || !TEST_true(digestsuccess))
             goto err;
 
         /*
@@ -80,24 +79,24 @@ static int test_provider(OSSL_LIB_CTX **libctx, const char *name,
          * own properties explicitly
          */
         if (!TEST_true(OSSL_PROVIDER_get_params(prov, stop_property_mirror))
-                || !TEST_true(stopsuccess))
+            || !TEST_true(stopsuccess))
             goto err;
         EVP_set_default_properties(*libctx, "fips=yes");
         if (!TEST_true(OSSL_PROVIDER_get_params(prov, digest_check))
-                || !TEST_true(digestsuccess))
+            || !TEST_true(digestsuccess))
             goto err;
         EVP_set_default_properties(*libctx, "");
     }
     if (!TEST_true(OSSL_PROVIDER_get_params(prov, greeting_request))
-            || !TEST_ptr(greeting = greeting_request[0].data)
-            || !TEST_size_t_gt(greeting_request[0].data_size, 0)
-            || !TEST_str_eq(greeting, expected_greeting))
+        || !TEST_ptr(greeting = greeting_request[0].data)
+        || !TEST_size_t_gt(greeting_request[0].data_size, 0)
+        || !TEST_str_eq(greeting, expected_greeting))
         goto err;
 
     /* Make sure we got the error we were expecting */
     err = ERR_peek_last_error();
     if (!TEST_int_gt(err, 0)
-            || !TEST_int_eq(ERR_GET_REASON(err), 1))
+        || !TEST_int_eq(ERR_GET_REASON(err), 1))
         goto err;
 
     OSSL_PROVIDER_unload(legacy);
@@ -106,7 +105,7 @@ static int test_provider(OSSL_LIB_CTX **libctx, const char *name,
     if (dolegacycheck) {
         /* Legacy provider should also be unloaded from child libctx */
         if (!TEST_true(OSSL_PROVIDER_get_params(prov, digest_check))
-                || !TEST_false(digestsuccess))
+            || !TEST_false(digestsuccess))
             goto err;
         /*
          * Loading the legacy provider again should make it available again in
@@ -117,15 +116,15 @@ static int test_provider(OSSL_LIB_CTX **libctx, const char *name,
         legacy = OSSL_PROVIDER_load(*libctx, "legacy");
         deflt = OSSL_PROVIDER_load(*libctx, "default");
         if (!TEST_ptr(deflt)
-                || !TEST_true(OSSL_PROVIDER_available(*libctx, "default")))
+            || !TEST_true(OSSL_PROVIDER_available(*libctx, "default")))
             goto err;
         OSSL_PROVIDER_unload(deflt);
         deflt = NULL;
         if (!TEST_ptr(legacy)
-                || !TEST_false(OSSL_PROVIDER_available(*libctx, "default"))
-                || !TEST_true(OSSL_PROVIDER_get_params(prov, digest_check))
-                || !TEST_true(digestsuccess))
-        goto err;
+            || !TEST_false(OSSL_PROVIDER_available(*libctx, "default"))
+            || !TEST_true(OSSL_PROVIDER_get_params(prov, digest_check))
+            || !TEST_true(digestsuccess))
+            goto err;
         OSSL_PROVIDER_unload(legacy);
         legacy = NULL;
     }
@@ -147,7 +146,7 @@ static int test_provider(OSSL_LIB_CTX **libctx, const char *name,
     /* We print out all the data to make sure it can still be accessed */
     ERR_print_errors_fp(stderr);
     ok = 1;
- err:
+err:
     OSSL_PROVIDER_unload(base);
     OSSL_PROVIDER_unload(deflt);
     OSSL_PROVIDER_unload(legacy);
@@ -171,7 +170,7 @@ static int test_provider_ex(OSSL_LIB_CTX **libctx, const char *name)
 
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
         || !TEST_true(OSSL_PARAM_BLD_push_utf8_string(bld, "greeting", custom_buf,
-                                                      strlen(custom_buf)))
+            strlen(custom_buf)))
         || !TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))) {
         goto err;
     }
@@ -180,15 +179,15 @@ static int test_provider_ex(OSSL_LIB_CTX **libctx, const char *name)
         goto err;
 
     if (!TEST_true(OSSL_PROVIDER_get_params(prov, greeting_request))
-            || !TEST_ptr(greeting = greeting_request[0].data)
-            || !TEST_size_t_gt(greeting_request[0].data_size, 0)
-            || !TEST_str_eq(greeting, custom_buf))
+        || !TEST_ptr(greeting = greeting_request[0].data)
+        || !TEST_size_t_gt(greeting_request[0].data_size, 0)
+        || !TEST_str_eq(greeting, custom_buf))
         goto err;
 
     /* Make sure we got the error we were expecting */
     err = ERR_peek_last_error();
     if (!TEST_int_gt(err, 0)
-            || !TEST_int_eq(ERR_GET_REASON(err), 1))
+        || !TEST_int_eq(ERR_GET_REASON(err), 1))
         goto err;
 
     if (!TEST_true(OSSL_PROVIDER_unload(prov)))
@@ -205,7 +204,7 @@ static int test_provider_ex(OSSL_LIB_CTX **libctx, const char *name)
     /* We print out all the data to make sure it can still be accessed */
     ERR_print_errors_fp(stderr);
     ok = 1;
- err:
+err:
     OSSL_PARAM_BLD_free(bld);
     OSSL_PARAM_free(params);
     OSSL_PROVIDER_unload(prov);
@@ -221,10 +220,9 @@ static int test_builtin_provider(void)
     const char *name = "p_test_builtin";
     int ok;
 
-    ok =
-        TEST_ptr(libctx)
+    ok = TEST_ptr(libctx)
         && TEST_true(OSSL_PROVIDER_add_builtin(libctx, name,
-                                               PROVIDER_INIT_FUNCTION_NAME))
+            PROVIDER_INIT_FUNCTION_NAME))
         && test_provider(&libctx, name, NULL);
 
     OSSL_LIB_CTX_free(libctx);
@@ -254,7 +252,7 @@ static int test_builtin_provider_with_child(void)
     }
 
     if (!TEST_true(OSSL_PROVIDER_add_builtin(libctx, name,
-                                             PROVIDER_INIT_FUNCTION_NAME))) {
+            PROVIDER_INIT_FUNCTION_NAME))) {
         OSSL_PROVIDER_unload(legacy);
         OSSL_LIB_CTX_free(libctx);
         return 0;
@@ -336,4 +334,3 @@ int setup_tests(void)
 #endif
     return 1;
 }
-
diff --git a/test/punycode_test.c b/test/punycode_test.c
index 00a21bb78e5b5..37f6056903c67 100644
--- a/test/punycode_test.c
+++ b/test/punycode_test.c
@@ -15,139 +15,98 @@
 #include "internal/packet.h"
 #include "testutil.h"
 
-
 static const struct puny_test {
     unsigned int raw[50];
     const char *encoded;
 } puny_cases[] = {
     { /* Test of 4 byte codepoint using smileyface emoji */
-        { 0x1F600
-        },
-        "e28h"
-    },
+        { 0x1F600 },
+        "e28h" },
     /* Test cases from RFC 3492 */
-    {   /* Arabic (Egyptian) */
+    { /* Arabic (Egyptian) */
         { 0x0644, 0x064A, 0x0647, 0x0645, 0x0627, 0x0628, 0x062A, 0x0643, 0x0644,
-          0x0645, 0x0648, 0x0634, 0x0639, 0x0631, 0x0628, 0x064A, 0x061F
-        },
-        "egbpdaj6bu4bxfgehfvwxn"
-    },
-    {   /* Chinese (simplified) */
-        { 0x4ED6, 0x4EEC, 0x4E3A, 0x4EC0, 0x4E48, 0x4E0D, 0x8BF4, 0x4E2D, 0x6587
-        },
-        "ihqwcrb4cv8a8dqg056pqjye"
-    },
-    {   /* Chinese (traditional) */
-        { 0x4ED6, 0x5011, 0x7232, 0x4EC0, 0x9EBD, 0x4E0D, 0x8AAA, 0x4E2D, 0x6587
-        },
-        "ihqwctvzc91f659drss3x8bo0yb"
-    },
-    {    /* Czech: Pro<ccaron>prost<ecaron>nemluv<iacute><ccaron>esky */
+            0x0645, 0x0648, 0x0634, 0x0639, 0x0631, 0x0628, 0x064A, 0x061F },
+        "egbpdaj6bu4bxfgehfvwxn" },
+    { /* Chinese (simplified) */
+        { 0x4ED6, 0x4EEC, 0x4E3A, 0x4EC0, 0x4E48, 0x4E0D, 0x8BF4, 0x4E2D, 0x6587 },
+        "ihqwcrb4cv8a8dqg056pqjye" },
+    { /* Chinese (traditional) */
+        { 0x4ED6, 0x5011, 0x7232, 0x4EC0, 0x9EBD, 0x4E0D, 0x8AAA, 0x4E2D, 0x6587 },
+        "ihqwctvzc91f659drss3x8bo0yb" },
+    { /* Czech: Pro<ccaron>prost<ecaron>nemluv<iacute><ccaron>esky */
         { 0x0050, 0x0072, 0x006F, 0x010D, 0x0070, 0x0072, 0x006F, 0x0073, 0x0074,
-          0x011B, 0x006E, 0x0065, 0x006D, 0x006C, 0x0075, 0x0076, 0x00ED, 0x010D,
-          0x0065, 0x0073, 0x006B, 0x0079
-       },
-        "Proprostnemluvesky-uyb24dma41a"
-    },
-    {   /* Hebrew */
+            0x011B, 0x006E, 0x0065, 0x006D, 0x006C, 0x0075, 0x0076, 0x00ED, 0x010D,
+            0x0065, 0x0073, 0x006B, 0x0079 },
+        "Proprostnemluvesky-uyb24dma41a" },
+    { /* Hebrew */
         { 0x05DC, 0x05DE, 0x05D4, 0x05D4, 0x05DD, 0x05E4, 0x05E9, 0x05D5, 0x05D8,
-          0x05DC, 0x05D0, 0x05DE, 0x05D3, 0x05D1, 0x05E8, 0x05D9, 0x05DD, 0x05E2,
-          0x05D1, 0x05E8, 0x05D9, 0x05EA
-        },
-        "4dbcagdahymbxekheh6e0a7fei0b"
-    },
-    {   /* Hindi (Devanagari) */
+            0x05DC, 0x05D0, 0x05DE, 0x05D3, 0x05D1, 0x05E8, 0x05D9, 0x05DD, 0x05E2,
+            0x05D1, 0x05E8, 0x05D9, 0x05EA },
+        "4dbcagdahymbxekheh6e0a7fei0b" },
+    { /* Hindi (Devanagari) */
         { 0x092F, 0x0939, 0x0932, 0x094B, 0x0917, 0x0939, 0x093F, 0x0928, 0x094D,
-          0x0926, 0x0940, 0x0915, 0x094D, 0x092F, 0x094B, 0x0902, 0x0928, 0x0939,
-          0x0940, 0x0902, 0x092C, 0x094B, 0x0932, 0x0938, 0x0915, 0x0924, 0x0947,
-          0x0939, 0x0948, 0x0902
-        },
-        "i1baa7eci9glrd9b2ae1bj0hfcgg6iyaf8o0a1dig0cd"
-    },
-    {   /* Japanese (kanji and hiragana) */
+            0x0926, 0x0940, 0x0915, 0x094D, 0x092F, 0x094B, 0x0902, 0x0928, 0x0939,
+            0x0940, 0x0902, 0x092C, 0x094B, 0x0932, 0x0938, 0x0915, 0x0924, 0x0947,
+            0x0939, 0x0948, 0x0902 },
+        "i1baa7eci9glrd9b2ae1bj0hfcgg6iyaf8o0a1dig0cd" },
+    { /* Japanese (kanji and hiragana) */
         { 0x306A, 0x305C, 0x307F, 0x3093, 0x306A, 0x65E5, 0x672C, 0x8A9E, 0x3092,
-          0x8A71, 0x3057, 0x3066, 0x304F, 0x308C, 0x306A, 0x3044, 0x306E, 0x304B
-        },
-        "n8jok5ay5dzabd5bym9f0cm5685rrjetr6pdxa"
-    },
-    {   /* Korean (Hangul syllables) */
+            0x8A71, 0x3057, 0x3066, 0x304F, 0x308C, 0x306A, 0x3044, 0x306E, 0x304B },
+        "n8jok5ay5dzabd5bym9f0cm5685rrjetr6pdxa" },
+    { /* Korean (Hangul syllables) */
         { 0xC138, 0xACC4, 0xC758, 0xBAA8, 0xB4E0, 0xC0AC, 0xB78C, 0xB4E4, 0xC774,
-          0xD55C, 0xAD6D, 0xC5B4, 0xB97C, 0xC774, 0xD574, 0xD55C, 0xB2E4, 0xBA74,
-          0xC5BC, 0xB9C8, 0xB098, 0xC88B, 0xC744, 0xAE4C
-        },
-        "989aomsvi5e83db1d2a355cv1e0vak1dwrv93d5xbh15a0dt30a5jpsd879ccm6fea98c"
-    },
-    {   /* Russian (Cyrillic) */
+            0xD55C, 0xAD6D, 0xC5B4, 0xB97C, 0xC774, 0xD574, 0xD55C, 0xB2E4, 0xBA74,
+            0xC5BC, 0xB9C8, 0xB098, 0xC88B, 0xC744, 0xAE4C },
+        "989aomsvi5e83db1d2a355cv1e0vak1dwrv93d5xbh15a0dt30a5jpsd879ccm6fea98c" },
+    { /* Russian (Cyrillic) */
         { 0x043F, 0x043E, 0x0447, 0x0435, 0x043C, 0x0443, 0x0436, 0x0435, 0x043E,
-          0x043D, 0x0438, 0x043D, 0x0435, 0x0433, 0x043E, 0x0432, 0x043E, 0x0440,
-          0x044F, 0x0442, 0x043F, 0x043E, 0x0440, 0x0443, 0x0441, 0x0441, 0x043A,
-          0x0438
-        },
-        "b1abfaaepdrnnbgefbaDotcwatmq2g4l"
-    },
-    {   /* Spanish */
+            0x043D, 0x0438, 0x043D, 0x0435, 0x0433, 0x043E, 0x0432, 0x043E, 0x0440,
+            0x044F, 0x0442, 0x043F, 0x043E, 0x0440, 0x0443, 0x0441, 0x0441, 0x043A,
+            0x0438 },
+        "b1abfaaepdrnnbgefbaDotcwatmq2g4l" },
+    { /* Spanish */
         { 0x0050, 0x006F, 0x0072, 0x0071, 0x0075, 0x00E9, 0x006E, 0x006F, 0x0070,
-          0x0075, 0x0065, 0x0064, 0x0065, 0x006E, 0x0073, 0x0069, 0x006D, 0x0070,
-          0x006C, 0x0065, 0x006D, 0x0065, 0x006E, 0x0074, 0x0065, 0x0068, 0x0061,
-          0x0062, 0x006C, 0x0061, 0x0072, 0x0065, 0x006E, 0x0045, 0x0073, 0x0070,
-          0x0061, 0x00F1, 0x006F, 0x006C
-        },
-        "PorqunopuedensimplementehablarenEspaol-fmd56a"
-    },
-    {   /* Vietnamese */
+            0x0075, 0x0065, 0x0064, 0x0065, 0x006E, 0x0073, 0x0069, 0x006D, 0x0070,
+            0x006C, 0x0065, 0x006D, 0x0065, 0x006E, 0x0074, 0x0065, 0x0068, 0x0061,
+            0x0062, 0x006C, 0x0061, 0x0072, 0x0065, 0x006E, 0x0045, 0x0073, 0x0070,
+            0x0061, 0x00F1, 0x006F, 0x006C },
+        "PorqunopuedensimplementehablarenEspaol-fmd56a" },
+    { /* Vietnamese */
         { 0x0054, 0x1EA1, 0x0069, 0x0073, 0x0061, 0x006F, 0x0068, 0x1ECD, 0x006B,
-          0x0068, 0x00F4, 0x006E, 0x0067, 0x0074, 0x0068, 0x1EC3, 0x0063, 0x0068,
-          0x1EC9, 0x006E, 0x00F3, 0x0069, 0x0074, 0x0069, 0x1EBF, 0x006E, 0x0067,
-          0x0056, 0x0069, 0x1EC7, 0x0074
-        },
-        "TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g"
-    },
-    {   /* Japanese: 3<nen>B<gumi><kinpachi><sensei> */
-        { 0x0033, 0x5E74, 0x0042, 0x7D44, 0x91D1, 0x516B, 0x5148, 0x751F
-        },
-        "3B-ww4c5e180e575a65lsy2b"
-    },
-    {   /* Japanese: <amuro><namie>-with-SUPER-MONKEYS */
+            0x0068, 0x00F4, 0x006E, 0x0067, 0x0074, 0x0068, 0x1EC3, 0x0063, 0x0068,
+            0x1EC9, 0x006E, 0x00F3, 0x0069, 0x0074, 0x0069, 0x1EBF, 0x006E, 0x0067,
+            0x0056, 0x0069, 0x1EC7, 0x0074 },
+        "TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g" },
+    { /* Japanese: 3<nen>B<gumi><kinpachi><sensei> */
+        { 0x0033, 0x5E74, 0x0042, 0x7D44, 0x91D1, 0x516B, 0x5148, 0x751F },
+        "3B-ww4c5e180e575a65lsy2b" },
+    { /* Japanese: <amuro><namie>-with-SUPER-MONKEYS */
         { 0x5B89, 0x5BA4, 0x5948, 0x7F8E, 0x6075, 0x002D, 0x0077, 0x0069, 0x0074,
-          0x0068, 0x002D, 0x0053, 0x0055, 0x0050, 0x0045, 0x0052, 0x002D, 0x004D,
-          0x004F, 0x004E, 0x004B, 0x0045, 0x0059, 0x0053
-        },
-        "-with-SUPER-MONKEYS-pc58ag80a8qai00g7n9n"
-    },
-    {   /* Japanese: Hello-Another-Way-<sorezore><no><basho> */
+            0x0068, 0x002D, 0x0053, 0x0055, 0x0050, 0x0045, 0x0052, 0x002D, 0x004D,
+            0x004F, 0x004E, 0x004B, 0x0045, 0x0059, 0x0053 },
+        "-with-SUPER-MONKEYS-pc58ag80a8qai00g7n9n" },
+    { /* Japanese: Hello-Another-Way-<sorezore><no><basho> */
         { 0x0048, 0x0065, 0x006C, 0x006C, 0x006F, 0x002D, 0x0041, 0x006E, 0x006F,
-          0x0074, 0x0068, 0x0065, 0x0072, 0x002D, 0x0057, 0x0061, 0x0079, 0x002D,
-          0x305D, 0x308C, 0x305E, 0x308C, 0x306E, 0x5834, 0x6240
-        },
-        "Hello-Another-Way--fc4qua05auwb3674vfr0b"
-    },
-    {   /* Japanese: <hitotsu><yane><no><shita>2 */
-        { 0x3072, 0x3068, 0x3064, 0x5C4B, 0x6839, 0x306E, 0x4E0B, 0x0032
-        },
-        "2-u9tlzr9756bt3uc0v"
-    },
-    {   /* Japanese: Maji<de>Koi<suru>5<byou><mae> */
+            0x0074, 0x0068, 0x0065, 0x0072, 0x002D, 0x0057, 0x0061, 0x0079, 0x002D,
+            0x305D, 0x308C, 0x305E, 0x308C, 0x306E, 0x5834, 0x6240 },
+        "Hello-Another-Way--fc4qua05auwb3674vfr0b" },
+    { /* Japanese: <hitotsu><yane><no><shita>2 */
+        { 0x3072, 0x3068, 0x3064, 0x5C4B, 0x6839, 0x306E, 0x4E0B, 0x0032 },
+        "2-u9tlzr9756bt3uc0v" },
+    { /* Japanese: Maji<de>Koi<suru>5<byou><mae> */
         { 0x004D, 0x0061, 0x006A, 0x0069, 0x3067, 0x004B, 0x006F, 0x0069, 0x3059,
-          0x308B, 0x0035, 0x79D2, 0x524D
-        },
-        "MajiKoi5-783gue6qz075azm5e"
-    },
-    {   /* Japanese: <pafii>de<runba> */
-        { 0x30D1, 0x30D5, 0x30A3, 0x30FC, 0x0064, 0x0065, 0x30EB, 0x30F3, 0x30D0
-        },
-        "de-jg4avhby1noc0d"
-    },
-    {   /* Japanese: <sono><supiido><de> */
-        { 0x305D, 0x306E, 0x30B9, 0x30D4, 0x30FC, 0x30C9, 0x3067
-        },
-        "d9juau41awczczp"
-    },
-    {   /* -> $1.00 <- */
+            0x308B, 0x0035, 0x79D2, 0x524D },
+        "MajiKoi5-783gue6qz075azm5e" },
+    { /* Japanese: <pafii>de<runba> */
+        { 0x30D1, 0x30D5, 0x30A3, 0x30FC, 0x0064, 0x0065, 0x30EB, 0x30F3, 0x30D0 },
+        "de-jg4avhby1noc0d" },
+    { /* Japanese: <sono><supiido><de> */
+        { 0x305D, 0x306E, 0x30B9, 0x30D4, 0x30FC, 0x30C9, 0x3067 },
+        "d9juau41awczczp" },
+    { /* -> $1.00 <- */
         { 0x002D, 0x003E, 0x0020, 0x0024, 0x0031, 0x002E, 0x0030, 0x0030, 0x0020,
-          0x003C, 0x002D
-        },
-        "-> $1.00 <--"
-    }
+            0x003C, 0x002D },
+        "-> $1.00 <--" }
 };
 
 static int test_punycode(int n)
@@ -158,13 +117,13 @@ static int test_punycode(int n)
     size_t i;
 
     if (!TEST_true(ossl_punycode_decode(tc->encoded, strlen(tc->encoded),
-                                        buffer, &bsize)))
+            buffer, &bsize)))
         return 0;
     for (i = 0; i < OSSL_NELEM(tc->raw); i++)
         if (tc->raw[i] == 0)
             break;
     if (!TEST_mem_eq(buffer, bsize * sizeof(*buffer),
-                     tc->raw, i * sizeof(*tc->raw)))
+            tc->raw, i * sizeof(*tc->raw)))
         return 0;
     return 1;
 }
@@ -173,10 +132,10 @@ static const struct bad_decode_test {
     size_t outlen;
     const char input[20];
 } bad_decode_tests[] = {
-    { 20, "xn--e-*" },   /* bad digit '*' */
+    { 20, "xn--e-*" }, /* bad digit '*' */
     { 10, "xn--e-999" }, /* loop > enc_len */
     { 20, "xn--e-999999999" }, /* Too big */
-    { 20, {'x', 'n', '-', '-', (char)0x80, '-' } }, /* Not basic */
+    { 20, { 'x', 'n', '-', '-', (char)0x80, '-' } }, /* Not basic */
     { 20, "xn--e-Oy65t" }, /* codepoint > 0x10FFFF */
 };
 
@@ -197,12 +156,12 @@ static int test_a2ulabel(void)
      * verifying that behaviour here.
      */
     if (!TEST_int_eq(ossl_a2ulabel("xn--a.b.c", out, 1), 0)
-            || !TEST_int_eq(ossl_a2ulabel("xn--a.b.c", out, 7), 1))
+        || !TEST_int_eq(ossl_a2ulabel("xn--a.b.c", out, 7), 1))
         return 0;
     /* Test for an off by one on the buffer size works */
     if (!TEST_int_eq(ossl_a2ulabel("xn--a.b.c", out, 6), 0)
-            || !TEST_int_eq(ossl_a2ulabel("xn--a.b.c", out, 7), 1)
-            || !TEST_str_eq(out,"\xc2\x80.b.c"))
+        || !TEST_int_eq(ossl_a2ulabel("xn--a.b.c", out, 7), 1)
+        || !TEST_str_eq(out, "\xc2\x80.b.c"))
         return 0;
 
     /* Test 4 byte smiley face */
@@ -260,23 +219,23 @@ static int test_dotted_overflow(void)
             goto err;
     }
     if (!TEST_true(WPACKET_put_bytes_u8(&p, '\0')))
-            goto err;
+        goto err;
     if (!TEST_ptr(out = OPENSSL_malloc(in->length)))
         goto err;
 
     /* Test the decode into an undersized buffer */
     memset(out, 0x7f, in->length - 1);
     if (!TEST_int_le(ossl_a2ulabel(in->data, out, num_reps), 0)
-            || !TEST_int_eq(out[num_reps], 0x7f))
+        || !TEST_int_eq(out[num_reps], 0x7f))
         goto err;
 
     /* Test the decode works into a full size buffer */
     if (!TEST_int_gt(ossl_a2ulabel(in->data, out, in->length), 0)
-            || !TEST_size_t_eq(strlen(out), num_reps * 3))
+        || !TEST_size_t_eq(strlen(out), num_reps * 3))
         goto err;
 
     res = 1;
- err:
+err:
     WPACKET_cleanup(&p);
     BUF_MEM_free(in);
     OPENSSL_free(out);
diff --git a/test/quic-openssl-docker/hq-interop/quic-hq-interop-server.c b/test/quic-openssl-docker/hq-interop/quic-hq-interop-server.c
index 66ce7867ad0d0..7c8b18ff0ccc3 100644
--- a/test/quic-openssl-docker/hq-interop/quic-hq-interop-server.c
+++ b/test/quic-openssl-docker/hq-interop/quic-hq-interop-server.c
@@ -31,7 +31,7 @@
  * Environment variables:
  * - FILEPREFIX: Specifies the directory containing files to serve.
  *   Defaults to "./downloads" if not set.
- * - SSLKEYLOGFILE: specifies that keylogging should be preformed on the server
+ * - SSLKEYLOGFILE: specifies that keylogging should be performed on the server
  *   should be set to a file name to record keylog data to
  * - NO_ADDR_VALIDATE: Disables server address validation of clients
  *
@@ -41,13 +41,13 @@
 
 /* Include the appropriate header file for SOCK_STREAM */
 #ifdef _WIN32
-# include <stdarg.h>
-# include <winsock2.h>
-# include <ws2tcpip.h>
+#include <stdarg.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #else
-# include <sys/socket.h>
-# include <netinet/in.h>
-# include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <unistd.h>
 #endif
 
 #include <openssl/bio.h>
@@ -77,7 +77,17 @@
  * negotiate the desired protocol during the TLS handshake.
  */
 static const unsigned char alpn_ossltest[] = {
-    10, 'h', 'q', '-', 'i', 'n', 't', 'e', 'r', 'o', 'p',
+    10,
+    'h',
+    'q',
+    '-',
+    'i',
+    'n',
+    't',
+    'e',
+    'r',
+    'o',
+    'p',
 };
 
 /**
@@ -124,8 +134,8 @@ static char *fileprefix = NULL;
  * - The predefined protocol is specified in the `alpn_ossltest` array.
  */
 static int select_alpn(SSL *ssl, const unsigned char **out,
-                       unsigned char *out_len, const unsigned char *in,
-                       unsigned int in_len, void *arg)
+    unsigned char *out_len, const unsigned char *in,
+    unsigned int in_len, void *arg)
 {
     /*
      * Use the next_proto helper function here.
@@ -133,8 +143,9 @@ static int select_alpn(SSL *ssl, const unsigned char **out,
      * what the client is requesting
      */
     if (SSL_select_next_proto((unsigned char **)out, out_len, alpn_ossltest,
-                              sizeof(alpn_ossltest), in,
-                              in_len) == OPENSSL_NPN_NEGOTIATED)
+            sizeof(alpn_ossltest), in,
+            in_len)
+        == OPENSSL_NPN_NEGOTIATED)
         return SSL_TLSEXT_ERR_OK;
     return SSL_TLSEXT_ERR_ALERT_FATAL;
 }
@@ -407,7 +418,7 @@ static int handle_io_failure(SSL *ssl, int res)
          */
         if (SSL_get_verify_result(ssl) != X509_V_OK)
             fprintf(stderr, "Verify error: %s\n",
-                    X509_verify_cert_error_string(SSL_get_verify_result(ssl)));
+                X509_verify_cert_error_string(SSL_get_verify_result(ssl)));
         return -1;
 
     default:
@@ -465,7 +476,7 @@ static void process_new_stream(SSL *stream)
     for (;;) {
         nread = 0;
         ret = SSL_read_ex(stream, &buf[total_read],
-                          sizeof(buf) - total_read - 1, &nread);
+            sizeof(buf) - total_read - 1, &nread);
         total_read += nread;
         if (ret <= 0) {
             ret = handle_io_failure(stream, ret);
@@ -641,20 +652,20 @@ static int run_quic_server(SSL_CTX *ctx, BIO *sock)
          * a call to SSL_set_default_stream_mode
          */
         if (!SSL_set_incoming_stream_policy(conn,
-                                            SSL_INCOMING_STREAM_POLICY_ACCEPT,
-                                            0)) {
-            fprintf(stderr, "Failed to set incomming stream policy\n");
+                SSL_INCOMING_STREAM_POLICY_ACCEPT,
+                0)) {
+            fprintf(stderr, "Failed to set incoming stream policy\n");
             goto close_conn;
         }
 
         /*
-         * Until the connection is closed, accept incomming stream
+         * Until the connection is closed, accept incoming stream
          * requests and serve them
          */
         for (;;) {
             /*
              * Note that SSL_accept_stream is blocking here, as the
-             * conn SSL object inherited the deafult blocking property
+             * conn SSL object inherited the default blocking property
              * from its parent, the listener SSL object.  As such there
              * is no need to handle retry failures here.
              */
@@ -665,7 +676,7 @@ static int run_quic_server(SSL_CTX *ctx, BIO *sock)
                  * Hit a legitimate error, and should bail out
                  * or
                  * The Client closed the connection, and there are no
-                 * more incomming streams expected
+                 * more incoming streams expected
                  *
                  * Filter on the shutdown error, and only print an error
                  * message if the cause is not SHUTDOWN
@@ -674,7 +685,7 @@ static int run_quic_server(SSL_CTX *ctx, BIO *sock)
                 errcode = ERR_get_error();
                 if (ERR_GET_REASON(errcode) != SSL_R_PROTOCOL_IS_SHUTDOWN)
                     fprintf(stderr, "Failure in accept stream, error %s\n",
-                            ERR_reason_error_string(errcode));
+                        ERR_reason_error_string(errcode));
                 break;
             }
             process_new_stream(stream);
@@ -685,7 +696,7 @@ static int run_quic_server(SSL_CTX *ctx, BIO *sock)
          * Shut down the connection. We may need to call this multiple times
          * to ensure the connection is shutdown completely.
          */
-close_conn:
+    close_conn:
         while (SSL_shutdown(conn) != 1)
             continue;
 
diff --git a/test/quic-openssl-docker/hq-interop/quic-hq-interop.c b/test/quic-openssl-docker/hq-interop/quic-hq-interop.c
index 14375d178a77b..c9815c24cebb6 100644
--- a/test/quic-openssl-docker/hq-interop/quic-hq-interop.c
+++ b/test/quic-openssl-docker/hq-interop/quic-hq-interop.c
@@ -44,10 +44,10 @@
 
 /* Include the appropriate header file for SOCK_DGRAM */
 #ifdef _WIN32 /* Windows */
-# include <winsock2.h>
+#include <winsock2.h>
 #else /* Linux/Unix */
-# include <sys/socket.h>
-# include <sys/select.h>
+#include <sys/socket.h>
+#include <sys/select.h>
 #endif
 
 #include <openssl/bio.h>
@@ -98,7 +98,7 @@ static BIO *session_bio = NULL;
  *       freed.
  */
 static BIO *create_socket_bio(const char *hostname, const char *port,
-                              BIO_ADDR **peer_addr)
+    BIO_ADDR **peer_addr)
 {
     int sock = -1;
     BIO_ADDRINFO *res;
@@ -109,7 +109,7 @@ static BIO *create_socket_bio(const char *hostname, const char *port,
      * Lookup IP address info for the server.
      */
     if (!BIO_lookup_ex(hostname, port, BIO_LOOKUP_CLIENT, AF_UNSPEC, SOCK_DGRAM,
-                       0, &res))
+            0, &res))
         return NULL;
 
     /*
@@ -326,7 +326,7 @@ static int handle_io_failure(SSL *ssl, int res)
          */
         if (SSL_get_verify_result(ssl) != X509_V_OK)
             fprintf(stderr, "Verify error: %s\n",
-                    X509_verify_cert_error_string(SSL_get_verify_result(ssl)));
+                X509_verify_cert_error_string(SSL_get_verify_result(ssl)));
         return -1;
 
     default:
@@ -401,17 +401,15 @@ static int setup_session_cache(SSL *ssl, SSL_CTX *ctx, const char *filename)
     int rc = 0;
     int new_cache = 0;
 
-    /* 
-     * Because we cache sessions to a file in this client, we don't 
-     * actualy need to internally store sessions, because we restore them
+    /*
+     * Because we cache sessions to a file in this client, we don't
+     * actually need to internally store sessions, because we restore them
      * from the file with SSL_set_session below, but we want to ensure
      * that caching is enabled so that the session cache callbacks get called
      * properly.  The documentation is a bit unclear under what conditions
      * the callback is made, so play it safe here, by enforcing enablement
      */
-    if (!SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_CLIENT |
-                                             SSL_SESS_CACHE_NO_INTERNAL_STORE |
-                                             SSL_SESS_CACHE_NO_AUTO_CLEAR))
+    if (!SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_CLIENT | SSL_SESS_CACHE_NO_INTERNAL_STORE | SSL_SESS_CACHE_NO_AUTO_CLEAR))
         return rc;
 
     /* open our cache file */
@@ -469,7 +467,7 @@ static BIO **outbiolist = NULL;
  * This static variable holds the reference to a dynamically allocated array
  * of strings, representing output names. It is initialized to NULL and
  * populated as required during operation.  This array holds the names of the
- * output files from http GET requests.  Indicies are correlated with the
+ * output files from http GET requests.  Indices are correlated with the
  * corresponding outbiolist and poll_list arrays
  */
 static char **outnames = NULL;
@@ -568,14 +566,14 @@ static size_t build_request_set(SSL *ssl)
          * Expand our poll_list, outbiolist, and outnames arrays
          */
         poll_list = OPENSSL_realloc(poll_list,
-                                    sizeof(SSL_POLL_ITEM) * poll_count);
+            sizeof(SSL_POLL_ITEM) * poll_count);
         if (poll_list == NULL) {
             fprintf(stderr, "Unable to realloc poll_list\n");
             goto err;
         }
 
         outbiolist = OPENSSL_realloc(outbiolist,
-                                     sizeof(BIO *) * poll_count);
+            sizeof(BIO *) * poll_count);
         if (outbiolist == NULL) {
             fprintf(stderr, "Unable to realloc outbiolist\n");
             goto err;
@@ -608,7 +606,7 @@ static size_t build_request_set(SSL *ssl)
         new_stream = NULL;
 
         /*
-         * NOTE: We are doing groups of 25 because thats 1/4 of the initial max
+         * NOTE: We are doing groups of 25 because that's 1/4 of the initial max
          * stream count that most servers advertise.  This gives the server an
          * opportunity to send us updated MAX_STREAM frames to extend our stream
          * allotment before we run out, which many servers defer doing.
@@ -650,8 +648,8 @@ static size_t build_request_set(SSL *ssl)
 
         /* Write an HTTP GET request to the peer */
         while (!SSL_write_ex2(poll_list[poll_idx].desc.value.ssl,
-                              req_string, strlen(req_string),
-                              SSL_WRITE_FLAG_CONCLUDE, &written)) {
+            req_string, strlen(req_string),
+            SSL_WRITE_FLAG_CONCLUDE, &written)) {
             if (handle_io_failure(poll_list[poll_idx].desc.value.ssl, 0) == 1)
                 continue; /* Retry */
             fprintf(stderr, "Failed to write start of HTTP request\n");
@@ -699,9 +697,9 @@ static BIO_ADDR *peer_addr = NULL;
  * @return Returns 0 on success, 1 on error.
  */
 static int setup_connection(char *hostname, char *port,
-                            SSL_CTX **ctx, SSL **ssl)
+    SSL_CTX **ctx, SSL **ssl)
 {
-    unsigned char alpn[] = {10, 'h', 'q', '-', 'i', 'n', 't', 'e', 'r', 'o', 'p'};
+    unsigned char alpn[] = { 10, 'h', 'q', '-', 'i', 'n', 't', 'e', 'r', 'o', 'p' };
     int ret = 0;
     BIO *bio = NULL;
 
@@ -906,8 +904,6 @@ int main(int argc, char *argv[])
             goto end;
         }
     }
-    BIO_free(req_bio);
-    req_bio = NULL;
     reqnames[read_offset + 1] = '\0';
 
     if (!setup_connection(hostname, port, &ctx, &ssl)) {
@@ -937,7 +933,7 @@ int main(int argc, char *argv[])
         poll_timeout.tv_sec = 0;
         poll_timeout.tv_usec = 0;
         if (!SSL_poll(poll_list, this_poll_count, sizeof(SSL_POLL_ITEM),
-                      &poll_timeout, 0, &result_count)) {
+                &poll_timeout, 0, &result_count)) {
             fprintf(stderr, "Failed to poll\n");
             goto end;
         }
@@ -968,9 +964,9 @@ int main(int argc, char *argv[])
 
                 /* Read our data, and handle any errors/eof conditions */
                 if (!SSL_read_ex(poll_list[poll_idx].desc.value.ssl, buf,
-                                 sizeof(buf), &readbytes)) {
+                        sizeof(buf), &readbytes)) {
                     switch (handle_io_failure(poll_list[poll_idx].desc.value.ssl,
-                                              0)) {
+                        0)) {
                     case 1:
                         eof = 0;
                         break; /* Retry on next poll */
@@ -1021,7 +1017,7 @@ int main(int argc, char *argv[])
 
     /* Success! */
     res = EXIT_SUCCESS;
- end:
+end:
     /*
      * If something bad happened then we will dump the contents of the
      * OpenSSL error stack to stderr. There might be some useful diagnostic
@@ -1037,6 +1033,7 @@ int main(int argc, char *argv[])
      */
     BIO_ADDR_free(peer_addr);
     OPENSSL_free(reqnames);
+    BIO_free(req_bio);
     BIO_free(session_bio);
     for (poll_idx = 0; poll_idx < poll_count; poll_idx++) {
         BIO_free(outbiolist[poll_idx]);
diff --git a/test/quic_ackm_test.c b/test/quic_ackm_test.c
index 0f26e9d38a0e8..9b8e3aafb7fa5 100644
--- a/test/quic_ackm_test.c
+++ b/test/quic_ackm_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -12,7 +12,7 @@
 #include "internal/quic_ackm.h"
 #include "internal/quic_cc.h"
 
-static OSSL_TIME fake_time = {0};
+static OSSL_TIME fake_time = { 0 };
 
 #define TIME_BASE (ossl_ticks2time(123 * OSSL_TIME_SECOND))
 
@@ -104,7 +104,8 @@ static int helper_init(struct helper *h, size_t num_pkts)
 
     /* Initialise ACK manager. */
     h->ackm = ossl_ackm_new(fake_now, NULL, &h->statm,
-                            &ossl_cc_dummy_method, h->ccdata);
+        &ossl_cc_dummy_method, h->ccdata,
+        /* is_server */ 0);
     if (!TEST_ptr(h->ackm))
         goto err;
 
@@ -141,18 +142,18 @@ static const QUIC_PN high_linear_20[] = {
  * ******************************************************************
  */
 struct tx_ack_test_case {
-    const QUIC_PN              *pn_table;
-    size_t                      pn_table_len;
-    const OSSL_QUIC_ACK_RANGE  *ack_ranges;
-    size_t                      num_ack_ranges;
-    const char                 *expect_ack; /* 1=ack, 2=lost, 4=discarded */
+    const QUIC_PN *pn_table;
+    size_t pn_table_len;
+    const OSSL_QUIC_ACK_RANGE *ack_ranges;
+    size_t num_ack_ranges;
+    const char *expect_ack; /* 1=ack, 2=lost, 4=discarded */
 };
 
-#define DEFINE_TX_ACK_CASE(n, pntable)                          \
-    static const struct tx_ack_test_case tx_ack_case_##n = {    \
-        (pntable), OSSL_NELEM(pntable),                         \
-        tx_ack_range_##n, OSSL_NELEM(tx_ack_range_##n),         \
-        tx_ack_expect_##n                                       \
+#define DEFINE_TX_ACK_CASE(n, pntable)                       \
+    static const struct tx_ack_test_case tx_ack_case_##n = { \
+        (pntable), OSSL_NELEM(pntable),                      \
+        tx_ack_range_##n, OSSL_NELEM(tx_ack_range_##n),      \
+        tx_ack_expect_##n                                    \
     }
 
 /* One range, partial coverage of space */
@@ -305,15 +306,18 @@ static const struct tx_ack_test_case *const tx_ack_cases[] = {
 };
 
 enum {
-    MODE_ACK, MODE_DISCARD, MODE_PTO, MODE_NUM
+    MODE_ACK,
+    MODE_DISCARD,
+    MODE_PTO,
+    MODE_NUM
 };
 
 static int test_probe_counts(const OSSL_ACKM_PROBE_INFO *p,
-                             uint32_t anti_deadlock_handshake,
-                             uint32_t anti_deadlock_initial,
-                             uint32_t pto_initial,
-                             uint32_t pto_handshake,
-                             uint32_t pto_app)
+    uint32_t anti_deadlock_handshake,
+    uint32_t anti_deadlock_initial,
+    uint32_t pto_initial,
+    uint32_t pto_handshake,
+    uint32_t pto_app)
 {
     if (!TEST_uint_eq(p->anti_deadlock_handshake, anti_deadlock_handshake))
         return 0;
@@ -340,7 +344,7 @@ static int test_tx_ack_case_actual(int tidx, int space, int mode)
     size_t i;
     OSSL_ACKM_TX_PKT *tx;
     const struct tx_ack_test_case *c = tx_ack_cases[tidx];
-    OSSL_QUIC_FRAME_ACK ack = {0};
+    OSSL_QUIC_FRAME_ACK ack = { 0 };
     OSSL_TIME loss_detection_deadline = ossl_time_zero();
 
     /* Cannot discard app space, so skip this */
@@ -354,8 +358,8 @@ static int test_tx_ack_case_actual(int tidx, int space, int mode)
 
     /* Arm callback. */
     ossl_ackm_set_loss_detection_deadline_callback(h.ackm,
-                                                   on_loss_detection_deadline_callback,
-                                                   &loss_detection_deadline);
+        on_loss_detection_deadline_callback,
+        &loss_detection_deadline);
 
     /* Allocate TX packet structures. */
     for (i = 0; i < c->pn_table_len; ++i) {
@@ -363,18 +367,18 @@ static int test_tx_ack_case_actual(int tidx, int space, int mode)
         if (!TEST_ptr(tx))
             goto err;
 
-        tx->pkt_num             = c->pn_table[i];
-        tx->pkt_space           = space;
-        tx->is_inflight         = 1;
-        tx->is_ack_eliciting    = 1;
-        tx->num_bytes           = 123;
-        tx->largest_acked       = QUIC_PN_INVALID;
-        tx->on_lost             = on_lost;
-        tx->on_acked            = on_acked;
-        tx->on_discarded        = on_discarded;
-        tx->cb_arg              = &h.pkts[i];
+        tx->pkt_num = c->pn_table[i];
+        tx->pkt_space = space;
+        tx->is_inflight = 1;
+        tx->is_ack_eliciting = 1;
+        tx->num_bytes = 123;
+        tx->largest_acked = QUIC_PN_INVALID;
+        tx->on_lost = on_lost;
+        tx->on_acked = on_acked;
+        tx->on_discarded = on_discarded;
+        tx->cb_arg = &h.pkts[i];
 
-        tx->time  = fake_time;
+        tx->time = fake_time;
 
         if (!TEST_int_eq(ossl_ackm_on_tx_packet(h.ackm, tx), 1))
             goto err;
@@ -386,7 +390,7 @@ static int test_tx_ack_case_actual(int tidx, int space, int mode)
             goto err;
 
         /* Check all discard callbacks were called. */
-        for (i  = 0; i < c->pn_table_len; ++i) {
+        for (i = 0; i < c->pn_table_len; ++i) {
             if (!TEST_int_eq(h.pkts[i].acked, 0))
                 goto err;
             if (!TEST_int_eq(h.pkts[i].lost, 0))
@@ -396,21 +400,21 @@ static int test_tx_ack_case_actual(int tidx, int space, int mode)
         }
     } else if (mode == MODE_ACK) {
         /* Try acknowledging. */
-        ack.ack_ranges      = (OSSL_QUIC_ACK_RANGE *)c->ack_ranges;
-        ack.num_ack_ranges  = c->num_ack_ranges;
+        ack.ack_ranges = (OSSL_QUIC_ACK_RANGE *)c->ack_ranges;
+        ack.num_ack_ranges = c->num_ack_ranges;
         if (!TEST_int_eq(ossl_ackm_on_rx_ack_frame(h.ackm, &ack, space, fake_time), 1))
             goto err;
 
         /* Check correct ranges were acknowledged. */
         for (i = 0; i < c->pn_table_len; ++i) {
             if (!TEST_int_eq(h.pkts[i].acked,
-                             (c->expect_ack[i] & 1) != 0 ? 1 : 0))
+                    (c->expect_ack[i] & 1) != 0 ? 1 : 0))
                 goto err;
             if (!TEST_int_eq(h.pkts[i].lost,
-                             (c->expect_ack[i] & 2) != 0 ? 1 : 0))
+                    (c->expect_ack[i] & 2) != 0 ? 1 : 0))
                 goto err;
             if (!TEST_int_eq(h.pkts[i].discarded,
-                             (c->expect_ack[i] & 4) != 0 ? 1 : 0))
+                    (c->expect_ack[i] & 4) != 0 ? 1 : 0))
                 goto err;
         }
     } else if (mode == MODE_PTO) {
@@ -454,9 +458,10 @@ static int test_tx_ack_case_actual(int tidx, int space, int mode)
                     goto err;
             } else {
                 if (!TEST_int_eq(test_probe_counts(&probe, 0, 0,
-                                                   space == QUIC_PN_SPACE_INITIAL,
-                                                   space == QUIC_PN_SPACE_HANDSHAKE,
-                                                   space == QUIC_PN_SPACE_APP), 1))
+                                     space == QUIC_PN_SPACE_INITIAL,
+                                     space == QUIC_PN_SPACE_HANDSHAKE,
+                                     space == QUIC_PN_SPACE_APP),
+                        1))
                     goto err;
             }
         }
@@ -476,17 +481,17 @@ static int test_tx_ack_case_actual(int tidx, int space, int mode)
  */
 enum {
     TX_ACK_TIME_OP_END,
-    TX_ACK_TIME_OP_PKT,     /* TX packets */
-    TX_ACK_TIME_OP_ACK,     /* Synthesise incoming ACK of single PN range */
-    TX_ACK_TIME_OP_EXPECT   /* Ack/loss assertion */
+    TX_ACK_TIME_OP_PKT, /* TX packets */
+    TX_ACK_TIME_OP_ACK, /* Synthesise incoming ACK of single PN range */
+    TX_ACK_TIME_OP_EXPECT /* Ack/loss assertion */
 };
 
 struct tx_ack_time_op {
-    int       kind;
-    uint64_t  time_advance; /* all ops */
-    QUIC_PN   pn;           /* PKT, ACK */
-    size_t    num_pn;       /* PKT, ACK */
-    const char *expect;     /* 1=ack, 2=lost, 4=discarded */
+    int kind;
+    uint64_t time_advance; /* all ops */
+    QUIC_PN pn; /* PKT, ACK */
+    size_t num_pn; /* PKT, ACK */
+    const char *expect; /* 1=ack, 2=lost, 4=discarded */
 };
 
 #define TX_OP_PKT(advance, pn, num_pn) \
@@ -502,11 +507,11 @@ static const char tx_ack_time_script_1_expect[] = {
 };
 
 static const struct tx_ack_time_op tx_ack_time_script_1[] = {
-    TX_OP_PKT   (      0, 0, 1)
-    TX_OP_PKT   (3600000, 1, 1)
-    TX_OP_ACK   (   1000, 1, 1)
-    TX_OP_EXPECT(tx_ack_time_script_1_expect)
-    TX_OP_END
+    TX_OP_PKT(0, 0, 1)
+        TX_OP_PKT(3600000, 1, 1)
+            TX_OP_ACK(1000, 1, 1)
+                TX_OP_EXPECT(tx_ack_time_script_1_expect)
+                    TX_OP_END
 };
 
 static const struct tx_ack_time_op *const tx_ack_time_scripts[] = {
@@ -518,8 +523,8 @@ static int test_tx_ack_time_script(int tidx)
     int testresult = 0;
     struct helper h;
     OSSL_ACKM_TX_PKT *tx = NULL;
-    OSSL_QUIC_FRAME_ACK ack = {0};
-    OSSL_QUIC_ACK_RANGE ack_range = {0};
+    OSSL_QUIC_FRAME_ACK ack = { 0 };
+    OSSL_QUIC_ACK_RANGE ack_range = { 0 };
     size_t i, num_pkts = 0, pkt_idx = 0;
     const struct tx_ack_time_op *script = tx_ack_time_scripts[tidx], *s;
 
@@ -541,63 +546,64 @@ static int test_tx_ack_time_script(int tidx)
     /* Run script. */
     for (s = script; s->kind != TX_ACK_TIME_OP_END; ++s)
         switch (s->kind) {
-            case TX_ACK_TIME_OP_PKT:
-                for (i = 0; i < s->num_pn; ++i) {
-                    tx = h.pkts[pkt_idx + i].pkt;
-
-                    tx->pkt_num             = s->pn + i;
-                    tx->pkt_space           = QUIC_PN_SPACE_INITIAL;
-                    tx->num_bytes           = 123;
-                    tx->largest_acked       = QUIC_PN_INVALID;
-                    tx->is_inflight         = 1;
-                    tx->is_ack_eliciting    = 1;
-                    tx->on_lost             = on_lost;
-                    tx->on_acked            = on_acked;
-                    tx->on_discarded        = on_discarded;
-                    tx->cb_arg              = &h.pkts[pkt_idx + i];
-
-                    fake_time = ossl_time_add(fake_time,
-                                              ossl_ticks2time(s->time_advance));
-                    tx->time   = fake_time;
-
-                    if (!TEST_int_eq(ossl_ackm_on_tx_packet(h.ackm, tx), 1))
-                        goto err;
-                }
-
-                pkt_idx += s->num_pn;
-                break;
-
-            case TX_ACK_TIME_OP_ACK:
-                ack.ack_ranges      = &ack_range;
-                ack.num_ack_ranges  = 1;
-
-                ack_range.start     = s->pn;
-                ack_range.end       = s->pn + s->num_pn;
+        case TX_ACK_TIME_OP_PKT:
+            for (i = 0; i < s->num_pn; ++i) {
+                tx = h.pkts[pkt_idx + i].pkt;
+
+                tx->pkt_num = s->pn + i;
+                tx->pkt_space = QUIC_PN_SPACE_INITIAL;
+                tx->num_bytes = 123;
+                tx->largest_acked = QUIC_PN_INVALID;
+                tx->is_inflight = 1;
+                tx->is_ack_eliciting = 1;
+                tx->on_lost = on_lost;
+                tx->on_acked = on_acked;
+                tx->on_discarded = on_discarded;
+                tx->cb_arg = &h.pkts[pkt_idx + i];
 
                 fake_time = ossl_time_add(fake_time,
-                                          ossl_ticks2time(s->time_advance));
+                    ossl_ticks2time(s->time_advance));
+                tx->time = fake_time;
+
+                if (!TEST_int_eq(ossl_ackm_on_tx_packet(h.ackm, tx), 1))
+                    goto err;
+            }
+
+            pkt_idx += s->num_pn;
+            break;
+
+        case TX_ACK_TIME_OP_ACK:
+            ack.ack_ranges = &ack_range;
+            ack.num_ack_ranges = 1;
+
+            ack_range.start = s->pn;
+            ack_range.end = s->pn + s->num_pn;
+
+            fake_time = ossl_time_add(fake_time,
+                ossl_ticks2time(s->time_advance));
+
+            if (!TEST_int_eq(ossl_ackm_on_rx_ack_frame(h.ackm, &ack,
+                                 QUIC_PN_SPACE_INITIAL,
+                                 fake_time),
+                    1))
+                goto err;
+
+            break;
 
-                if (!TEST_int_eq(ossl_ackm_on_rx_ack_frame(h.ackm, &ack,
-                                                           QUIC_PN_SPACE_INITIAL,
-                                                           fake_time), 1))
+        case TX_ACK_TIME_OP_EXPECT:
+            for (i = 0; i < num_pkts; ++i) {
+                if (!TEST_int_eq(h.pkts[i].acked,
+                        (s->expect[i] & 1) != 0 ? 1 : 0))
+                    goto err;
+                if (!TEST_int_eq(h.pkts[i].lost,
+                        (s->expect[i] & 2) != 0 ? 1 : 0))
                     goto err;
+                if (!TEST_int_eq(h.pkts[i].discarded,
+                        (s->expect[i] & 4) != 0 ? 1 : 0))
+                    goto err;
+            }
 
-                break;
-
-            case TX_ACK_TIME_OP_EXPECT:
-                for (i = 0; i < num_pkts; ++i) {
-                    if (!TEST_int_eq(h.pkts[i].acked,
-                                     (s->expect[i] & 1) != 0 ? 1 : 0))
-                        goto err;
-                    if (!TEST_int_eq(h.pkts[i].lost,
-                                     (s->expect[i] & 2) != 0 ? 1 : 0))
-                        goto err;
-                    if (!TEST_int_eq(h.pkts[i].discarded,
-                                     (s->expect[i] & 4) != 0 ? 1 : 0))
-                        goto err;
-                }
-
-                break;
+            break;
         }
 
     testresult = 1;
@@ -612,87 +618,87 @@ static int test_tx_ack_time_script(int tidx)
  */
 enum {
     RX_OPK_END,
-    RX_OPK_PKT,              /* RX packet */
-    RX_OPK_CHECK_UNPROC,     /* check PNs unprocessable */
-    RX_OPK_CHECK_PROC,       /* check PNs processable */
-    RX_OPK_CHECK_STATE,      /* check is_desired/deadline */
-    RX_OPK_CHECK_ACKS,       /* check ACK ranges */
-    RX_OPK_TX,               /* TX packet */
-    RX_OPK_RX_ACK,           /* RX ACK frame */
-    RX_OPK_SKIP_IF_PN_SPACE  /* skip for a given PN space */
+    RX_OPK_PKT, /* RX packet */
+    RX_OPK_CHECK_UNPROC, /* check PNs unprocessable */
+    RX_OPK_CHECK_PROC, /* check PNs processable */
+    RX_OPK_CHECK_STATE, /* check is_desired/deadline */
+    RX_OPK_CHECK_ACKS, /* check ACK ranges */
+    RX_OPK_TX, /* TX packet */
+    RX_OPK_RX_ACK, /* RX ACK frame */
+    RX_OPK_SKIP_IF_PN_SPACE /* skip for a given PN space */
 };
 
 struct rx_test_op {
-    int                         kind;
-    uint64_t                    time_advance;
+    int kind;
+    uint64_t time_advance;
 
-    QUIC_PN                     pn;     /* PKT, CHECK_(UN)PROC, TX, RX_ACK */
-    size_t                      num_pn; /* PKT, CHECK_(UN)PROC, TX, RX_ACK */
+    QUIC_PN pn; /* PKT, CHECK_(UN)PROC, TX, RX_ACK */
+    size_t num_pn; /* PKT, CHECK_(UN)PROC, TX, RX_ACK */
 
-    char                        expect_desired;     /* CHECK_STATE */
-    char                        expect_deadline;    /* CHECK_STATE */
+    char expect_desired; /* CHECK_STATE */
+    char expect_deadline; /* CHECK_STATE */
 
-    const OSSL_QUIC_ACK_RANGE  *ack_ranges;         /* CHECK_ACKS */
-    size_t                      num_ack_ranges;     /* CHECK_ACKS */
+    const OSSL_QUIC_ACK_RANGE *ack_ranges; /* CHECK_ACKS */
+    size_t num_ack_ranges; /* CHECK_ACKS */
 
-    QUIC_PN                     largest_acked;      /* TX */
+    QUIC_PN largest_acked; /* TX */
 };
 
-#define RX_OP_PKT(advance, pn, num_pn)                              \
-    {                                                               \
-      RX_OPK_PKT, (advance) * OSSL_TIME_MS, (pn), (num_pn),         \
-      0, 0, NULL, 0, 0                                              \
+#define RX_OP_PKT(advance, pn, num_pn)                        \
+    {                                                         \
+        RX_OPK_PKT, (advance) * OSSL_TIME_MS, (pn), (num_pn), \
+        0, 0, NULL, 0, 0                                      \
     },
 
-#define RX_OP_CHECK_UNPROC(advance, pn, num_pn)                     \
-    {                                                               \
-      RX_OPK_CHECK_UNPROC, (advance) * OSSL_TIME_MS, (pn), (num_pn),\
-      0, 0, NULL, 0, 0                                              \
+#define RX_OP_CHECK_UNPROC(advance, pn, num_pn)                        \
+    {                                                                  \
+        RX_OPK_CHECK_UNPROC, (advance) * OSSL_TIME_MS, (pn), (num_pn), \
+        0, 0, NULL, 0, 0                                               \
     },
 
-#define RX_OP_CHECK_PROC(advance, pn, num_pn)                       \
-    {                                                               \
-      RX_OPK_CHECK_PROC, (advance) * OSSL_TIME_MS, (pn), (num_pn),  \
-      0, 0, NULL, 0, 0                                              \
+#define RX_OP_CHECK_PROC(advance, pn, num_pn)                        \
+    {                                                                \
+        RX_OPK_CHECK_PROC, (advance) * OSSL_TIME_MS, (pn), (num_pn), \
+        0, 0, NULL, 0, 0                                             \
     },
 
 #define RX_OP_CHECK_STATE(advance, expect_desired, expect_deadline) \
     {                                                               \
-      RX_OPK_CHECK_STATE, (advance) * OSSL_TIME_MS, 0, 0,           \
-      (expect_desired), (expect_deadline), NULL, 0, 0               \
+        RX_OPK_CHECK_STATE, (advance) * OSSL_TIME_MS, 0, 0,         \
+        (expect_desired), (expect_deadline), NULL, 0, 0             \
     },
 
-#define RX_OP_CHECK_ACKS(advance, ack_ranges)                       \
-    {                                                               \
-      RX_OPK_CHECK_ACKS, (advance) * OSSL_TIME_MS, 0, 0,            \
-      0, 0, (ack_ranges), OSSL_NELEM(ack_ranges), 0                 \
+#define RX_OP_CHECK_ACKS(advance, ack_ranges)              \
+    {                                                      \
+        RX_OPK_CHECK_ACKS, (advance) * OSSL_TIME_MS, 0, 0, \
+        0, 0, (ack_ranges), OSSL_NELEM(ack_ranges), 0      \
     },
 
-#define RX_OP_CHECK_NO_ACKS(advance)                                \
-    {                                                               \
-      RX_OPK_CHECK_ACKS, (advance) * OSSL_TIME_MS, 0, 0,            \
-      0, 0, NULL, 0, 0                                              \
+#define RX_OP_CHECK_NO_ACKS(advance)                       \
+    {                                                      \
+        RX_OPK_CHECK_ACKS, (advance) * OSSL_TIME_MS, 0, 0, \
+        0, 0, NULL, 0, 0                                   \
     },
 
-#define RX_OP_TX(advance, pn, largest_acked)                        \
-    {                                                               \
-      RX_OPK_TX, (advance) * OSSL_TIME_MS, (pn), 1,                 \
-      0, 0, NULL, 0, (largest_acked)                                \
+#define RX_OP_TX(advance, pn, largest_acked)          \
+    {                                                 \
+        RX_OPK_TX, (advance) * OSSL_TIME_MS, (pn), 1, \
+        0, 0, NULL, 0, (largest_acked)                \
     },
 
-#define RX_OP_RX_ACK(advance, pn, num_pn)                           \
-    {                                                               \
-      RX_OPK_RX_ACK, (advance) * OSSL_TIME_MS, (pn), (num_pn),      \
-      0, 0, NULL, 0, 0                                              \
+#define RX_OP_RX_ACK(advance, pn, num_pn)                        \
+    {                                                            \
+        RX_OPK_RX_ACK, (advance) * OSSL_TIME_MS, (pn), (num_pn), \
+        0, 0, NULL, 0, 0                                         \
     },
 
-#define RX_OP_SKIP_IF_PN_SPACE(pn_space)                            \
-    {                                                               \
-      RX_OPK_SKIP_IF_PN_SPACE, 0, (pn_space), 0,                    \
-      0, 0, NULL, 0, 0                                              \
+#define RX_OP_SKIP_IF_PN_SPACE(pn_space)           \
+    {                                              \
+        RX_OPK_SKIP_IF_PN_SPACE, 0, (pn_space), 0, \
+        0, 0, NULL, 0, 0                           \
     },
 
-#define RX_OP_END                                                   \
+#define RX_OP_END \
     { RX_OPK_END }
 
 /* RX 1. Simple Test with ACK Desired (Packet Threshold, Exactly) */
@@ -701,23 +707,23 @@ static const OSSL_QUIC_ACK_RANGE rx_ack_ranges_1a[] = {
 };
 
 static const struct rx_test_op rx_script_1[] = {
-    RX_OP_CHECK_STATE   (0, 0, 0)   /* no threshold yet */
-    RX_OP_CHECK_PROC    (0, 0, 3)
+    RX_OP_CHECK_STATE(0, 0, 0) /* no threshold yet */
+    RX_OP_CHECK_PROC(0, 0, 3)
 
-    RX_OP_PKT           (0, 0, 2)   /* two packets, threshold */
-    RX_OP_CHECK_UNPROC  (0, 0, 2)
-    RX_OP_CHECK_PROC    (0, 2, 1)
-    RX_OP_CHECK_STATE   (0, 1, 0)   /* threshold met, immediate */
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_1a)
+        RX_OP_PKT(0, 0, 2) /* two packets, threshold */
+    RX_OP_CHECK_UNPROC(0, 0, 2)
+        RX_OP_CHECK_PROC(0, 2, 1)
+            RX_OP_CHECK_STATE(0, 1, 0) /* threshold met, immediate */
+    RX_OP_CHECK_ACKS(0, rx_ack_ranges_1a)
 
     /* At this point we would generate e.g. a packet with an ACK. */
-    RX_OP_TX            (0, 0, 1)   /* ACKs both */
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_1a) /* not provably ACKed yet */
-    RX_OP_RX_ACK        (0, 0, 1)   /* TX'd packet is ACK'd */
+    RX_OP_TX(0, 0, 1) /* ACKs both */
+    RX_OP_CHECK_ACKS(0, rx_ack_ranges_1a) /* not provably ACKed yet */
+    RX_OP_RX_ACK(0, 0, 1) /* TX'd packet is ACK'd */
 
-    RX_OP_CHECK_NO_ACKS (0)         /* nothing more to ACK */
-    RX_OP_CHECK_UNPROC  (0, 0, 2)   /* still unprocessable */
-    RX_OP_CHECK_PROC    (0, 2, 1)   /* still processable */
+    RX_OP_CHECK_NO_ACKS(0) /* nothing more to ACK */
+    RX_OP_CHECK_UNPROC(0, 0, 2) /* still unprocessable */
+    RX_OP_CHECK_PROC(0, 2, 1) /* still processable */
 
     RX_OP_END
 };
@@ -738,41 +744,41 @@ static const struct rx_test_op rx_script_2[] = {
      * generation, so a different RX_OP_CHECK_STATE test is needed.
      */
     RX_OP_SKIP_IF_PN_SPACE(QUIC_PN_SPACE_INITIAL)
-    RX_OP_SKIP_IF_PN_SPACE(QUIC_PN_SPACE_HANDSHAKE)
+        RX_OP_SKIP_IF_PN_SPACE(QUIC_PN_SPACE_HANDSHAKE)
 
-    RX_OP_CHECK_STATE   (0, 0, 0)   /* no threshold yet */
-    RX_OP_CHECK_PROC    (0, 0, 3)
+            RX_OP_CHECK_STATE(0, 0, 0) /* no threshold yet */
+    RX_OP_CHECK_PROC(0, 0, 3)
 
     /* First packet always generates an ACK so get it out of the way. */
-    RX_OP_PKT           (0, 0, 1)
-    RX_OP_CHECK_UNPROC  (0, 0, 1)
-    RX_OP_CHECK_PROC    (0, 1, 1)
-    RX_OP_CHECK_STATE   (0, 1, 0)   /* first packet always causes ACK */
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_2a) /* clears packet counter */
-    RX_OP_CHECK_STATE   (0, 0, 0)   /* desired state should have been cleared */
+    RX_OP_PKT(0, 0, 1)
+        RX_OP_CHECK_UNPROC(0, 0, 1)
+            RX_OP_CHECK_PROC(0, 1, 1)
+                RX_OP_CHECK_STATE(0, 1, 0) /* first packet always causes ACK */
+    RX_OP_CHECK_ACKS(0, rx_ack_ranges_2a) /* clears packet counter */
+    RX_OP_CHECK_STATE(0, 0, 0) /* desired state should have been cleared */
 
     /* Second packet should not cause ACK-desired state */
-    RX_OP_PKT           (0, 1, 1)   /* just one packet, threshold is 2 */
-    RX_OP_CHECK_UNPROC  (0, 0, 2)
-    RX_OP_CHECK_PROC    (0, 2, 1)
-    RX_OP_CHECK_STATE   (0, 0, 1)   /* threshold not yet met, so deadline */
+    RX_OP_PKT(0, 1, 1) /* just one packet, threshold is 2 */
+    RX_OP_CHECK_UNPROC(0, 0, 2)
+        RX_OP_CHECK_PROC(0, 2, 1)
+            RX_OP_CHECK_STATE(0, 0, 1) /* threshold not yet met, so deadline */
     /* Don't check ACKs here, as it would reset our threshold counter. */
 
     /* Now receive a second packet, triggering the threshold */
-    RX_OP_PKT           (0, 2, 1)   /* second packet meets threshold */
-    RX_OP_CHECK_UNPROC  (0, 0, 3)
-    RX_OP_CHECK_PROC    (0, 3, 1)
-    RX_OP_CHECK_STATE   (0, 1, 0)   /* desired immediately */
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_2b)
+    RX_OP_PKT(0, 2, 1) /* second packet meets threshold */
+    RX_OP_CHECK_UNPROC(0, 0, 3)
+        RX_OP_CHECK_PROC(0, 3, 1)
+            RX_OP_CHECK_STATE(0, 1, 0) /* desired immediately */
+    RX_OP_CHECK_ACKS(0, rx_ack_ranges_2b)
 
     /* At this point we would generate e.g. a packet with an ACK. */
-    RX_OP_TX            (0, 0, 2)   /* ACKs all */
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_2b) /* not provably ACKed yet */
-    RX_OP_RX_ACK        (0, 0, 1)   /* TX'd packet is ACK'd */
+    RX_OP_TX(0, 0, 2) /* ACKs all */
+    RX_OP_CHECK_ACKS(0, rx_ack_ranges_2b) /* not provably ACKed yet */
+    RX_OP_RX_ACK(0, 0, 1) /* TX'd packet is ACK'd */
 
-    RX_OP_CHECK_NO_ACKS (0)         /* nothing more to ACK */
-    RX_OP_CHECK_UNPROC  (0, 0, 3)   /* still unprocessable */
-    RX_OP_CHECK_PROC    (0, 3, 1)   /* still processable */
+    RX_OP_CHECK_NO_ACKS(0) /* nothing more to ACK */
+    RX_OP_CHECK_UNPROC(0, 0, 3) /* still unprocessable */
+    RX_OP_CHECK_PROC(0, 3, 1) /* still processable */
 
     RX_OP_END
 };
@@ -791,52 +797,52 @@ static const OSSL_QUIC_ACK_RANGE rx_ack_ranges_3c[] = {
 };
 
 static const struct rx_test_op rx_script_3[] = {
-    RX_OP_CHECK_STATE   (0, 0, 0)   /* no threshold yet */
-    RX_OP_CHECK_PROC    (0, 0, 11)
+    RX_OP_CHECK_STATE(0, 0, 0) /* no threshold yet */
+    RX_OP_CHECK_PROC(0, 0, 11)
 
     /* First packet always generates an ACK so get it out of the way. */
-    RX_OP_PKT           (0, 0, 1)
-    RX_OP_CHECK_UNPROC  (0, 0, 1)
-    RX_OP_CHECK_PROC    (0, 1, 1)
-    RX_OP_CHECK_STATE   (0, 1, 0)   /* first packet always causes ACK */
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_3a) /* clears packet counter */
-    RX_OP_CHECK_STATE   (0, 0, 0)   /* desired state should have been cleared */
+    RX_OP_PKT(0, 0, 1)
+        RX_OP_CHECK_UNPROC(0, 0, 1)
+            RX_OP_CHECK_PROC(0, 1, 1)
+                RX_OP_CHECK_STATE(0, 1, 0) /* first packet always causes ACK */
+    RX_OP_CHECK_ACKS(0, rx_ack_ranges_3a) /* clears packet counter */
+    RX_OP_CHECK_STATE(0, 0, 0) /* desired state should have been cleared */
 
     /* Generate ten packets, exceeding the threshold. */
-    RX_OP_PKT           (0, 1, 10)  /* ten packets, threshold is 2 */
-    RX_OP_CHECK_UNPROC  (0, 0, 11)
-    RX_OP_CHECK_PROC    (0, 11, 1)
-    RX_OP_CHECK_STATE   (0, 1, 0)   /* threshold met, immediate */
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_3b)
+    RX_OP_PKT(0, 1, 10) /* ten packets, threshold is 2 */
+    RX_OP_CHECK_UNPROC(0, 0, 11)
+        RX_OP_CHECK_PROC(0, 11, 1)
+            RX_OP_CHECK_STATE(0, 1, 0) /* threshold met, immediate */
+    RX_OP_CHECK_ACKS(0, rx_ack_ranges_3b)
 
     /*
      * Test TX'ing a packet which doesn't ACK anything.
      */
-    RX_OP_TX            (0, 0, QUIC_PN_INVALID)
-    RX_OP_RX_ACK        (0, 0, 1)
+    RX_OP_TX(0, 0, QUIC_PN_INVALID)
+        RX_OP_RX_ACK(0, 0, 1)
 
     /*
      * At this point we would generate a packet with an ACK immediately.
      * TX a packet which when ACKed makes [0,5] provably ACKed.
      */
-    RX_OP_TX            (0, 1, 5)
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_3b) /* not provably ACKed yet */
-    RX_OP_RX_ACK        (0, 1, 1)
+    RX_OP_TX(0, 1, 5)
+        RX_OP_CHECK_ACKS(0, rx_ack_ranges_3b) /* not provably ACKed yet */
+    RX_OP_RX_ACK(0, 1, 1)
 
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_3c) /* provably ACKed now gone */
-    RX_OP_CHECK_UNPROC  (0, 0, 11) /* still unprocessable */
-    RX_OP_CHECK_PROC    (0, 11, 1) /* still processable */
+        RX_OP_CHECK_ACKS(0, rx_ack_ranges_3c) /* provably ACKed now gone */
+    RX_OP_CHECK_UNPROC(0, 0, 11) /* still unprocessable */
+    RX_OP_CHECK_PROC(0, 11, 1) /* still processable */
 
     /*
      * Now TX another packet which provably ACKs the rest when ACKed.
      */
-    RX_OP_TX            (0, 2, 10)
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_3c) /* not provably ACKed yet */
-    RX_OP_RX_ACK        (0, 2, 1)
+    RX_OP_TX(0, 2, 10)
+        RX_OP_CHECK_ACKS(0, rx_ack_ranges_3c) /* not provably ACKed yet */
+    RX_OP_RX_ACK(0, 2, 1)
 
-    RX_OP_CHECK_NO_ACKS (0)         /* provably ACKed now gone */
-    RX_OP_CHECK_UNPROC  (0, 0, 11)  /* still unprocessable */
-    RX_OP_CHECK_PROC    (0, 11, 1)  /* still processable */
+        RX_OP_CHECK_NO_ACKS(0) /* provably ACKed now gone */
+    RX_OP_CHECK_UNPROC(0, 0, 11) /* still unprocessable */
+    RX_OP_CHECK_PROC(0, 11, 1) /* still processable */
 
     RX_OP_END
 };
@@ -853,36 +859,36 @@ static const struct rx_test_op rx_script_4[] = {
     /* The application PN space is tested in rx_script_2. */
     RX_OP_SKIP_IF_PN_SPACE(QUIC_PN_SPACE_APP)
 
-    RX_OP_CHECK_STATE   (0, 0, 0)   /* no threshold yet */
-    RX_OP_CHECK_PROC    (0, 0, 3)
+        RX_OP_CHECK_STATE(0, 0, 0) /* no threshold yet */
+    RX_OP_CHECK_PROC(0, 0, 3)
 
     /* First packet always generates an ACK so get it out of the way. */
-    RX_OP_PKT           (0, 0, 1)
-    RX_OP_CHECK_UNPROC  (0, 0, 1)
-    RX_OP_CHECK_PROC    (0, 1, 1)
-    RX_OP_CHECK_STATE   (0, 1, 0)   /* first packet always causes ACK */
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_2a) /* clears packet counter */
-    RX_OP_CHECK_STATE   (0, 0, 0)   /* desired state should have been cleared */
+    RX_OP_PKT(0, 0, 1)
+        RX_OP_CHECK_UNPROC(0, 0, 1)
+            RX_OP_CHECK_PROC(0, 1, 1)
+                RX_OP_CHECK_STATE(0, 1, 0) /* first packet always causes ACK */
+    RX_OP_CHECK_ACKS(0, rx_ack_ranges_2a) /* clears packet counter */
+    RX_OP_CHECK_STATE(0, 0, 0) /* desired state should have been cleared */
 
     /*
      * Second packet should cause ACK-desired state because we are
      * INITIAL/HANDSHAKE (RFC 9000 s. 13.2.1)
      */
-    RX_OP_PKT           (0, 1, 1)   /* just one packet, threshold is 2 */
-    RX_OP_CHECK_UNPROC  (0, 0, 2)
-    RX_OP_CHECK_PROC    (0, 2, 1)
-    RX_OP_CHECK_STATE   (0, 1, 1)
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_4a)
-    RX_OP_CHECK_STATE   (0, 0, 0)   /* desired state should have been cleared */
+    RX_OP_PKT(0, 1, 1) /* just one packet, threshold is 2 */
+    RX_OP_CHECK_UNPROC(0, 0, 2)
+        RX_OP_CHECK_PROC(0, 2, 1)
+            RX_OP_CHECK_STATE(0, 1, 1)
+                RX_OP_CHECK_ACKS(0, rx_ack_ranges_4a)
+                    RX_OP_CHECK_STATE(0, 0, 0) /* desired state should have been cleared */
 
     /* At this point we would generate e.g. a packet with an ACK. */
-    RX_OP_TX            (0, 0, 1)   /* ACKs all */
-    RX_OP_CHECK_ACKS    (0, rx_ack_ranges_4a) /* not provably ACKed yet */
-    RX_OP_RX_ACK        (0, 0, 1)   /* TX'd packet is ACK'd */
+    RX_OP_TX(0, 0, 1) /* ACKs all */
+    RX_OP_CHECK_ACKS(0, rx_ack_ranges_4a) /* not provably ACKed yet */
+    RX_OP_RX_ACK(0, 0, 1) /* TX'd packet is ACK'd */
 
-    RX_OP_CHECK_NO_ACKS (0)         /* nothing more to ACK */
-    RX_OP_CHECK_UNPROC  (0, 0, 2)   /* still unprocessable */
-    RX_OP_CHECK_PROC    (0, 2, 1)   /* still processable */
+    RX_OP_CHECK_NO_ACKS(0) /* nothing more to ACK */
+    RX_OP_CHECK_UNPROC(0, 0, 2) /* still unprocessable */
+    RX_OP_CHECK_PROC(0, 2, 1) /* still processable */
 
     RX_OP_END
 };
@@ -895,7 +901,7 @@ static const struct rx_test_op *const rx_test_scripts[] = {
 };
 
 static void on_ack_deadline_callback(OSSL_TIME deadline,
-                                     int pkt_space, void *arg)
+    int pkt_space, void *arg)
 {
     ((OSSL_TIME *)arg)[pkt_space] = deadline;
 }
@@ -907,8 +913,8 @@ static int test_rx_ack_actual(int tidx, int space)
     const struct rx_test_op *script = rx_test_scripts[tidx], *s;
     size_t i, num_tx = 0, txi = 0;
     const OSSL_QUIC_FRAME_ACK *ack;
-    OSSL_QUIC_FRAME_ACK rx_ack = {0};
-    OSSL_QUIC_ACK_RANGE rx_ack_range = {0};
+    OSSL_QUIC_FRAME_ACK rx_ack = { 0 };
+    OSSL_QUIC_ACK_RANGE rx_ack_range = { 0 };
     struct pkt_info *pkts = NULL;
     OSSL_ACKM_TX_PKT *txs = NULL, *tx;
     OSSL_TIME ack_deadline[QUIC_PN_SPACE_NUM];
@@ -923,7 +929,7 @@ static int test_rx_ack_actual(int tidx, int space)
 
     /* Arm callback for testing. */
     ossl_ackm_set_ack_deadline_callback(h.ackm, on_ack_deadline_callback,
-                                        ack_deadline);
+        ack_deadline);
 
     /*
      * Determine how many packets we are TXing, and therefore how many packet
@@ -945,21 +951,22 @@ static int test_rx_ack_actual(int tidx, int space)
     /* Run script. */
     for (s = script; s->kind != RX_OPK_END; ++s, ++opn) {
         fake_time = ossl_time_add(fake_time,
-                                  ossl_ticks2time(s->time_advance));
+            ossl_ticks2time(s->time_advance));
         switch (s->kind) {
         case RX_OPK_PKT:
             for (i = 0; i < s->num_pn; ++i) {
-                OSSL_ACKM_RX_PKT pkt = {0};
+                OSSL_ACKM_RX_PKT pkt = { 0 };
 
-                pkt.pkt_num             = s->pn + i;
-                pkt.time                = fake_time;
-                pkt.pkt_space           = space;
-                pkt.is_ack_eliciting    = 1;
+                pkt.pkt_num = s->pn + i;
+                pkt.time = fake_time;
+                pkt.pkt_space = space;
+                pkt.is_ack_eliciting = 1;
 
                 /* The packet should be processable before we feed it. */
                 if (!TEST_int_eq(ossl_ackm_is_rx_pn_processable(h.ackm,
-                                                                pkt.pkt_num,
-                                                                pkt.pkt_space), 1))
+                                     pkt.pkt_num,
+                                     pkt.pkt_space),
+                        1))
                     goto err;
 
                 if (!TEST_int_eq(ossl_ackm_on_rx_packet(h.ackm, &pkt), 1))
@@ -972,29 +979,30 @@ static int test_rx_ack_actual(int tidx, int space)
         case RX_OPK_CHECK_PROC:
             for (i = 0; i < s->num_pn; ++i)
                 if (!TEST_int_eq(ossl_ackm_is_rx_pn_processable(h.ackm,
-                                                                s->pn + i, space),
-                                 (s->kind == RX_OPK_CHECK_PROC)))
+                                     s->pn + i, space),
+                        (s->kind == RX_OPK_CHECK_PROC)))
                     goto err;
 
             break;
 
         case RX_OPK_CHECK_STATE:
             if (!TEST_int_eq(ossl_ackm_is_ack_desired(h.ackm, space),
-                             s->expect_desired))
+                    s->expect_desired))
                 goto err;
 
             if (!TEST_int_eq(!ossl_time_is_infinite(ossl_ackm_get_ack_deadline(h.ackm, space))
-                             && !ossl_time_is_zero(ossl_ackm_get_ack_deadline(h.ackm, space)),
-                             s->expect_deadline))
+                        && !ossl_time_is_zero(ossl_ackm_get_ack_deadline(h.ackm, space)),
+                    s->expect_deadline))
                 goto err;
 
             for (i = 0; i < QUIC_PN_SPACE_NUM; ++i) {
                 if (i != (size_t)space
-                        && !TEST_true(ossl_time_is_infinite(ossl_ackm_get_ack_deadline(h.ackm, i))))
+                    && !TEST_true(ossl_time_is_infinite(ossl_ackm_get_ack_deadline(h.ackm, i))))
                     goto err;
 
                 if (!TEST_int_eq(ossl_time_compare(ossl_ackm_get_ack_deadline(h.ackm, i),
-                                                   ack_deadline[i]), 0))
+                                     ack_deadline[i]),
+                        0))
                     goto err;
             }
 
@@ -1012,10 +1020,10 @@ static int test_rx_ack_actual(int tidx, int space)
 
             for (i = 0; i < ack->num_ack_ranges; ++i) {
                 if (!TEST_uint64_t_eq(ack->ack_ranges[i].start,
-                                      s->ack_ranges[i].start))
+                        s->ack_ranges[i].start))
                     goto err;
                 if (!TEST_uint64_t_eq(ack->ack_ranges[i].end,
-                                      s->ack_ranges[i].end))
+                        s->ack_ranges[i].end))
                     goto err;
             }
 
@@ -1024,17 +1032,17 @@ static int test_rx_ack_actual(int tidx, int space)
         case RX_OPK_TX:
             pkts[txi].pkt = tx = &txs[txi];
 
-            tx->pkt_num             = s->pn;
-            tx->pkt_space           = space;
-            tx->num_bytes           = 123;
-            tx->largest_acked       = s->largest_acked;
-            tx->is_inflight         = 1;
-            tx->is_ack_eliciting    = 1;
-            tx->on_lost             = on_lost;
-            tx->on_acked            = on_acked;
-            tx->on_discarded        = on_discarded;
-            tx->cb_arg              = &pkts[txi];
-            tx->time                = fake_time;
+            tx->pkt_num = s->pn;
+            tx->pkt_space = space;
+            tx->num_bytes = 123;
+            tx->largest_acked = s->largest_acked;
+            tx->is_inflight = 1;
+            tx->is_ack_eliciting = 1;
+            tx->on_lost = on_lost;
+            tx->on_acked = on_acked;
+            tx->on_discarded = on_discarded;
+            tx->cb_arg = &pkts[txi];
+            tx->time = fake_time;
 
             if (!TEST_int_eq(ossl_ackm_on_tx_packet(h.ackm, tx), 1))
                 goto err;
@@ -1043,14 +1051,15 @@ static int test_rx_ack_actual(int tidx, int space)
             break;
 
         case RX_OPK_RX_ACK:
-            rx_ack.ack_ranges       = &rx_ack_range;
-            rx_ack.num_ack_ranges   = 1;
+            rx_ack.ack_ranges = &rx_ack_range;
+            rx_ack.num_ack_ranges = 1;
 
-            rx_ack_range.start      = s->pn;
-            rx_ack_range.end        = s->pn + s->num_pn - 1;
+            rx_ack_range.start = s->pn;
+            rx_ack_range.end = s->pn + s->num_pn - 1;
 
             if (!TEST_int_eq(ossl_ackm_on_rx_ack_frame(h.ackm, &rx_ack,
-                                                       space, fake_time), 1))
+                                 space, fake_time),
+                    1))
                 goto err;
 
             break;
@@ -1109,7 +1118,7 @@ static int test_rx_ack(int idx)
 int setup_tests(void)
 {
     ADD_ALL_TESTS(test_tx_ack_case,
-                  OSSL_NELEM(tx_ack_cases) * MODE_NUM * QUIC_PN_SPACE_NUM);
+        OSSL_NELEM(tx_ack_cases) * MODE_NUM * QUIC_PN_SPACE_NUM);
     ADD_ALL_TESTS(test_tx_ack_time_script, OSSL_NELEM(tx_ack_time_scripts));
     ADD_ALL_TESTS(test_rx_ack, OSSL_NELEM(rx_test_scripts) * QUIC_PN_SPACE_NUM);
     return 1;
diff --git a/test/quic_cc_test.c b/test/quic_cc_test.c
index e1f750e412c4d..abe10780fc2cc 100644
--- a/test/quic_cc_test.c
+++ b/test/quic_cc_test.c
@@ -19,7 +19,7 @@
  * Time Simulation
  * ===============
  */
-static OSSL_TIME fake_time = {0};
+static OSSL_TIME fake_time = { 0 };
 
 #define TIME_BASE (ossl_ticks2time(5 * OSSL_TIME_SECOND))
 
@@ -51,37 +51,37 @@ typedef struct net_pkt_st {
     /*
      * The time at which the packet was sent.
      */
-    OSSL_TIME   tx_time;
+    OSSL_TIME tx_time;
 
     /*
      * The time at which the simulated packet arrives at the RX side (success)
      * or is dropped (!success).
      */
-    OSSL_TIME   arrive_time;
+    OSSL_TIME arrive_time;
 
     /*
      * The time at which the transmitting side makes a determination of
      * acknowledgement (if success) or loss (if !success).
      */
-    OSSL_TIME   determination_time;
+    OSSL_TIME determination_time;
 
     /*
      * Current earliest time there is something to be done for this packet.
      * min(arrive_time, determination_time).
      */
-    OSSL_TIME   next_time;
+    OSSL_TIME next_time;
 
     /* 1 if the packet will be successfully delivered, 0 if it is to be lost. */
-    int         success;
+    int success;
 
     /* 1 if we have already processed packet arrival. */
-    int         arrived;
+    int arrived;
 
     /* Size of simulated packet in bytes. */
-    size_t      size;
+    size_t size;
 
     /* pqueue internal index. */
-    size_t      idx;
+    size_t idx;
 } NET_PKT;
 
 DEFINE_PRIORITY_QUEUE_OF(NET_PKT);
@@ -93,31 +93,31 @@ static int net_pkt_cmp(const NET_PKT *a, const NET_PKT *b)
 
 struct net_sim {
     const OSSL_CC_METHOD *ccm;
-    OSSL_CC_DATA         *cc;
+    OSSL_CC_DATA *cc;
 
     uint64_t capacity; /* bytes/s */
-    uint64_t latency;  /* ms */
+    uint64_t latency; /* ms */
 
     uint64_t spare_capacity;
-    PRIORITY_QUEUE_OF(NET_PKT) *pkts;
+    PRIORITY_QUEUE_OF(NET_PKT) * pkts;
 
     uint64_t total_acked, total_lost; /* bytes */
 };
 
 static int net_sim_init(struct net_sim *s,
-                        const OSSL_CC_METHOD *ccm, OSSL_CC_DATA *cc,
-                        uint64_t capacity, uint64_t latency)
+    const OSSL_CC_METHOD *ccm, OSSL_CC_DATA *cc,
+    uint64_t capacity, uint64_t latency)
 {
-    s->ccm              = ccm;
-    s->cc               = cc;
+    s->ccm = ccm;
+    s->cc = cc;
 
-    s->capacity         = capacity;
-    s->latency          = latency;
+    s->capacity = capacity;
+    s->latency = latency;
 
-    s->spare_capacity   = capacity;
+    s->spare_capacity = capacity;
 
-    s->total_acked      = 0;
-    s->total_lost       = 0;
+    s->total_acked = 0;
+    s->total_lost = 0;
 
     if (!TEST_ptr(s->pkts = ossl_pqueue_NET_PKT_new(net_pkt_cmp)))
         return 0;
@@ -159,27 +159,27 @@ static int net_sim_send(struct net_sim *s, size_t sz)
     pkt->success = success;
     if (success) {
         /* This packet will arrive successfully after |latency| time. */
-        pkt->arrive_time        = ossl_time_add(pkt->tx_time,
-                                                ossl_ms2time(s->latency));
+        pkt->arrive_time = ossl_time_add(pkt->tx_time,
+            ossl_ms2time(s->latency));
         /* Assume all received packets are acknowledged immediately. */
         pkt->determination_time = ossl_time_add(pkt->arrive_time,
-                                                ossl_ms2time(s->latency));
-        pkt->next_time          = pkt->arrive_time;
-        s->spare_capacity      -= sz;
+            ossl_ms2time(s->latency));
+        pkt->next_time = pkt->arrive_time;
+        s->spare_capacity -= sz;
     } else {
         /*
          * In our network model, assume all packets are dropped due to a
          * bottleneck at the peer's NIC RX queue; thus dropping occurs after
          * |latency|.
          */
-        pkt->arrive_time        = ossl_time_add(pkt->tx_time,
-                                                ossl_ms2time(s->latency));
+        pkt->arrive_time = ossl_time_add(pkt->tx_time,
+            ossl_ms2time(s->latency));
         /*
          * It will take longer to detect loss than to detect acknowledgement.
          */
         pkt->determination_time = ossl_time_add(pkt->tx_time,
-                                                ossl_ms2time(3 * s->latency));
-        pkt->next_time          = pkt->determination_time;
+            ossl_ms2time(3 * s->latency));
+        pkt->next_time = pkt->determination_time;
     }
 
     pkt->size = sz;
@@ -229,7 +229,7 @@ static int net_sim_process_one(struct net_sim *s, int skip_forward)
         return 0;
 
     if (!pkt->success) {
-        OSSL_CC_LOSS_INFO loss_info = {0};
+        OSSL_CC_LOSS_INFO loss_info = { 0 };
 
         loss_info.tx_time = pkt->tx_time;
         loss_info.tx_size = pkt->size;
@@ -244,7 +244,7 @@ static int net_sim_process_one(struct net_sim *s, int skip_forward)
         ossl_pqueue_NET_PKT_pop(s->pkts);
         OPENSSL_free(pkt);
     } else {
-        OSSL_CC_ACK_INFO ack_info = {0};
+        OSSL_CC_ACK_INFO ack_info = { 0 };
 
         ack_info.tx_time = pkt->tx_time;
         ack_info.tx_size = pkt->size;
@@ -282,7 +282,7 @@ static FILE *logfile;
 #endif
 
 static int dump_state(const OSSL_CC_METHOD *ccm, OSSL_CC_DATA *cc,
-                                  struct net_sim *s)
+    struct net_sim *s)
 {
 #ifdef GENERATE_LOG
     uint64_t cwnd_size, cur_bytes, state;
@@ -291,27 +291,27 @@ static int dump_state(const OSSL_CC_METHOD *ccm, OSSL_CC_DATA *cc,
         return 1;
 
     if (!TEST_true(ccm->get_option_uint(cc, OSSL_CC_OPTION_CUR_CWND_SIZE,
-                                        &cwnd_size)))
+            &cwnd_size)))
         return 0;
 
     if (!TEST_true(ccm->get_option_uint(cc, OSSL_CC_OPTION_CUR_BYTES_IN_FLIGHT,
-                                        &cur_bytes)))
+            &cur_bytes)))
         return 0;
 
     if (!TEST_true(ccm->get_option_uint(cc, OSSL_CC_OPTION_CUR_STATE,
-                                        &state)))
+            &state)))
         return 0;
 
     fprintf(logfile, "%10lu,%10lu,%10lu,%10lu,%10lu,%10lu,%10lu,%10lu,\"%c\"\n",
-            ossl_time2ms(fake_time),
-            ccm->get_tx_allowance(cc),
-            cwnd_size,
-            cur_bytes,
-            s->total_acked,
-            s->total_lost,
-            s->capacity,
-            s->spare_capacity,
-            (char)state);
+        ossl_time2ms(fake_time),
+        ccm->get_tx_allowance(cc),
+        cwnd_size,
+        cur_bytes,
+        s->total_acked,
+        s->total_lost,
+        s->capacity,
+        s->spare_capacity,
+        (char)state);
 #endif
 
     return 1;
@@ -352,7 +352,7 @@ static int test_simulate(void)
     have_sim = 1;
 
     *p++ = OSSL_PARAM_construct_size_t(OSSL_CC_OPTION_MAX_DGRAM_PAYLOAD_LEN,
-                                       &mdpl);
+        &mdpl);
     *p++ = OSSL_PARAM_construct_end();
 
     if (!TEST_true(ccm->set_input_params(cc, params)))
@@ -360,9 +360,9 @@ static int test_simulate(void)
 
     p = params;
     *p++ = OSSL_PARAM_construct_uint64(OSSL_CC_OPTION_CUR_BYTES_IN_FLIGHT,
-                                       &diag_cur_bytes_in_flight);
+        &diag_cur_bytes_in_flight);
     *p++ = OSSL_PARAM_construct_uint64(OSSL_CC_OPTION_CUR_CWND_SIZE,
-                                       &diag_cur_cwnd_size);
+        &diag_cur_cwnd_size);
     *p++ = OSSL_PARAM_construct_end();
 
     if (!TEST_true(ccm->bind_diagnostics(cc, params)))
@@ -449,9 +449,9 @@ static int test_simulate(void)
         double error = ((double)estimated_capacity / (double)actual_capacity) - 1.0;
 
         TEST_info("est = %6llu kB/s, act=%6llu kB/s (error=%.02f%%)\n",
-                  (unsigned long long)estimated_capacity,
-                  (unsigned long long)actual_capacity,
-                  error * 100.0);
+            (unsigned long long)estimated_capacity,
+            (unsigned long long)actual_capacity,
+            error * 100.0);
 
         /* Max 5% error */
         if (!TEST_double_le(error, 0.05))
@@ -485,8 +485,8 @@ static int test_sanity(void)
     int testresult = 0;
     OSSL_CC_DATA *cc = NULL;
     const OSSL_CC_METHOD *ccm = &ossl_cc_newreno_method;
-    OSSL_CC_LOSS_INFO loss_info = {0};
-    OSSL_CC_ACK_INFO ack_info = {0};
+    OSSL_CC_LOSS_INFO loss_info = { 0 };
+    OSSL_CC_ACK_INFO ack_info = { 0 };
     uint64_t allowance, allowance2;
     OSSL_PARAM params[3], *p = params;
     size_t mdpl = 1472, diag_mdpl = SIZE_MAX;
@@ -499,7 +499,7 @@ static int test_sanity(void)
 
     /* Test configuration of options. */
     *p++ = OSSL_PARAM_construct_size_t(OSSL_CC_OPTION_MAX_DGRAM_PAYLOAD_LEN,
-                                       &mdpl);
+        &mdpl);
     *p++ = OSSL_PARAM_construct_end();
 
     if (!TEST_true(ccm->set_input_params(cc, params)))
@@ -509,9 +509,9 @@ static int test_sanity(void)
 
     p = params;
     *p++ = OSSL_PARAM_construct_size_t(OSSL_CC_OPTION_MAX_DGRAM_PAYLOAD_LEN,
-                                       &diag_mdpl);
+        &diag_mdpl);
     *p++ = OSSL_PARAM_construct_uint64(OSSL_CC_OPTION_CUR_BYTES_IN_FLIGHT,
-                                       &diag_cur_bytes_in_flight);
+        &diag_cur_bytes_in_flight);
     *p++ = OSSL_PARAM_construct_end();
 
     if (!TEST_true(ccm->bind_diagnostics(cc, params))
@@ -574,7 +574,7 @@ static int test_sanity(void)
         goto err;
 
     if (!TEST_uint64_t_eq(allowance2 = ccm->get_tx_allowance(cc),
-                          allowance - 1200 - 1300))
+            allowance - 1200 - 1300))
         goto err;
 
     loss_info.tx_time = fake_time;
diff --git a/test/quic_cfq_test.c b/test/quic_cfq_test.c
index f6af23d908433..b17e298962ee7 100644
--- a/test/quic_cfq_test.c
+++ b/test/quic_cfq_test.c
@@ -59,8 +59,8 @@ static size_t g_free_len;
 
 static void free_cb(unsigned char *buf, size_t buf_len, void *arg)
 {
-    g_free      = buf;
-    g_free_len  = buf_len;
+    g_free = buf;
+    g_free_len = buf_len;
 }
 
 static int check(QUIC_CFQ *cfq)
@@ -72,7 +72,7 @@ static int check(QUIC_CFQ *cfq)
 
     for (pn_space = QUIC_PN_SPACE_INITIAL; pn_space < QUIC_PN_SPACE_NUM; ++pn_space)
         for (i = 0, item = ossl_quic_cfq_get_priority_head(cfq, pn_space);;
-             ++i, item = ossl_quic_cfq_item_get_priority_next(item, pn_space)) {
+            ++i, item = ossl_quic_cfq_item_get_priority_next(item, pn_space)) {
 
             if (expect[pn_space][i] == UINT32_MAX) {
                 if (!TEST_ptr_null(item))
@@ -85,10 +85,10 @@ static int check(QUIC_CFQ *cfq)
 
             if (!TEST_ptr(item)
                 || !TEST_ptr_eq(ossl_quic_cfq_item_get_encoded(item),
-                                ref_buf + expect[pn_space][i])
+                    ref_buf + expect[pn_space][i])
                 || !TEST_int_eq(ossl_quic_cfq_item_get_pn_space(item), pn_space)
                 || !TEST_int_eq(ossl_quic_cfq_item_get_state(item),
-                                QUIC_CFQ_STATE_NEW))
+                    QUIC_CFQ_STATE_NEW))
                 goto err;
         }
 
@@ -108,27 +108,27 @@ static int test_cfq(void)
     if (!TEST_ptr(cfq = ossl_quic_cfq_new()))
         goto err;
 
-    g_free      = NULL;
-    g_free_len  = 0;
+    g_free = NULL;
+    g_free_len = 0;
 
     for (i = 0; i < OSSL_NELEM(ref_buf); ++i) {
         if (!TEST_ptr(item = ossl_quic_cfq_add_frame(cfq, ref_priority[i],
-                                                     ref_pn_space[i],
-                                                     ref_frame_type[i], 0,
-                                                     ref_buf + i,
-                                                     1,
-                                                     free_cb,
-                                                     NULL))
+                          ref_pn_space[i],
+                          ref_frame_type[i], 0,
+                          ref_buf + i,
+                          1,
+                          free_cb,
+                          NULL))
             || !TEST_int_eq(ossl_quic_cfq_item_get_state(item),
-                            QUIC_CFQ_STATE_NEW)
+                QUIC_CFQ_STATE_NEW)
             || !TEST_uint_eq(ossl_quic_cfq_item_get_pn_space(item),
-                             ref_pn_space[i])
+                ref_pn_space[i])
             || !TEST_uint64_t_eq(ossl_quic_cfq_item_get_frame_type(item),
-                                 ref_frame_type[i])
+                ref_frame_type[i])
             || !TEST_ptr_eq(ossl_quic_cfq_item_get_encoded(item),
-                            ref_buf + i)
+                ref_buf + i)
             || !TEST_size_t_eq(ossl_quic_cfq_item_get_encoded_len(item),
-                               1))
+                1))
             goto err;
     }
 
@@ -137,7 +137,7 @@ static int test_cfq(void)
 
     for (pn_space = QUIC_PN_SPACE_INITIAL; pn_space < QUIC_PN_SPACE_NUM; ++pn_space)
         for (item = ossl_quic_cfq_get_priority_head(cfq, pn_space);
-             item != NULL; item = inext) {
+            item != NULL; item = inext) {
             inext = ossl_quic_cfq_item_get_priority_next(item, pn_space);
 
             ossl_quic_cfq_mark_tx(cfq, item);
diff --git a/test/quic_client_test.c b/test/quic_client_test.c
index 91d70c9e0d8e0..9edf3c18d858e 100644
--- a/test/quic_client_test.c
+++ b/test/quic_client_test.c
@@ -18,8 +18,8 @@
 static const char msg1[] = "GET LICENSE.txt\r\n";
 static char msg2[16000];
 
-#define DST_PORT        4433
-#define DST_ADDR        0x7f000001UL
+#define DST_PORT 4433
+#define DST_ADDR 0x7f000001UL
 
 static int is_want(SSL *s, int ret)
 {
@@ -34,7 +34,7 @@ static int test_quic_client_ex(int fd_arg)
     int c_fd;
     BIO *c_net_bio = NULL, *c_net_bio_own = NULL;
     BIO_ADDR *s_addr_ = NULL;
-    struct in_addr ina = {0};
+    struct in_addr ina = { 0 };
     SSL_CTX *c_ctx = NULL;
     SSL *c_ssl = NULL;
     short port = DST_PORT;
@@ -43,7 +43,6 @@ static int test_quic_client_ex(int fd_arg)
     OSSL_TIME start_time;
     unsigned char alpn[] = { 8, 'h', 't', 't', 'p', '/', '0', '.', '9' };
 
-
     if (fd_arg == INVALID_SOCKET) {
         /* Setup test client. */
         c_fd = BIO_socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP, 0);
@@ -58,7 +57,7 @@ static int test_quic_client_ex(int fd_arg)
 
         ina.s_addr = htonl(DST_ADDR);
         if (!TEST_true(BIO_ADDR_rawmake(s_addr_, AF_INET, &ina, sizeof(ina),
-                                        htons(port))))
+                htons(port))))
             goto err;
     } else {
         c_fd = fd_arg;
@@ -100,7 +99,8 @@ static int test_quic_client_ex(int fd_arg)
 
     for (;;) {
         if (ossl_time_compare(ossl_time_subtract(ossl_time_now(), start_time),
-                              ossl_ms2time(10000)) >= 0) {
+                ossl_ms2time(10000))
+            >= 0) {
             TEST_error("timeout while attempting QUIC client test");
             goto err;
         }
@@ -118,7 +118,7 @@ static int test_quic_client_ex(int fd_arg)
 
         if (c_connected && !c_write_done) {
             if (!TEST_int_eq(SSL_write(c_ssl, msg1, sizeof(msg1) - 1),
-                             (int)sizeof(msg1) - 1))
+                    (int)sizeof(msg1) - 1))
                 goto err;
 
             if (!TEST_true(SSL_stream_conclude(c_ssl, 0)))
@@ -129,7 +129,7 @@ static int test_quic_client_ex(int fd_arg)
 
         if (c_write_done && !c_shutdown && c_total_read < sizeof(msg2) - 1) {
             ret = SSL_read_ex(c_ssl, msg2 + c_total_read,
-                              sizeof(msg2) - 1 - c_total_read, &l);
+                sizeof(msg2) - 1 - c_total_read, &l);
             if (ret != 1) {
                 if (SSL_get_error(c_ssl, ret) == SSL_ERROR_ZERO_RETURN) {
                     c_shutdown = 1;
@@ -177,7 +177,7 @@ static int test_quic_client(void)
 
 static int test_quic_client_connect_first(void)
 {
-    struct sockaddr_in sin = {0};
+    struct sockaddr_in sin = { 0 };
     int c_fd;
     int rv;
 
diff --git a/test/quic_fc_test.c b/test/quic_fc_test.c
index 1113406cdf9b2..52351e5ffe11e 100644
--- a/test/quic_fc_test.c
+++ b/test/quic_fc_test.c
@@ -44,10 +44,10 @@ static int test_txfc(int is_stream)
         goto err;
 
     if (is_stream) {
-        if ( !TEST_uint64_t_eq(ossl_quic_txfc_get_credit(txfc, 0), 2000))
+        if (!TEST_uint64_t_eq(ossl_quic_txfc_get_credit(txfc, 0), 2000))
             goto err;
 
-        if ( !TEST_uint64_t_eq(ossl_quic_txfc_get_credit(txfc, 100), 1900))
+        if (!TEST_uint64_t_eq(ossl_quic_txfc_get_credit(txfc, 100), 1900))
             goto err;
     }
 
@@ -60,8 +60,7 @@ static int test_txfc(int is_stream)
     if (!TEST_uint64_t_eq(ossl_quic_txfc_get_credit_local(txfc, 0), 1500))
         goto err;
 
-    if (is_stream && !TEST_uint64_t_eq(ossl_quic_txfc_get_credit(txfc, 0),
-                                       1500))
+    if (is_stream && !TEST_uint64_t_eq(ossl_quic_txfc_get_credit(txfc, 0), 1500))
         goto err;
 
     if (!TEST_false(ossl_quic_txfc_has_become_blocked(txfc, 0)))
@@ -79,8 +78,7 @@ static int test_txfc(int is_stream)
     if (!TEST_uint64_t_eq(ossl_quic_txfc_get_credit_local(txfc, 0), 1400))
         goto err;
 
-    if (is_stream && !TEST_uint64_t_eq(ossl_quic_txfc_get_credit(txfc, 0),
-                                       1400))
+    if (is_stream && !TEST_uint64_t_eq(ossl_quic_txfc_get_credit(txfc, 0), 1400))
         goto err;
 
     if (!TEST_false(ossl_quic_txfc_has_become_blocked(txfc, 0)))
@@ -92,8 +90,7 @@ static int test_txfc(int is_stream)
     if (!TEST_uint64_t_eq(ossl_quic_txfc_get_credit_local(txfc, 0), 0))
         goto err;
 
-    if (is_stream && !TEST_uint64_t_eq(ossl_quic_txfc_get_credit(txfc, 0),
-                                       0))
+    if (is_stream && !TEST_uint64_t_eq(ossl_quic_txfc_get_credit(txfc, 0), 0))
         goto err;
 
     if (!TEST_uint64_t_eq(ossl_quic_txfc_get_swm(txfc), 2000))
@@ -203,30 +200,30 @@ static OSSL_TIME fake_now(void *arg)
     return cur_time;
 }
 
-#define RX_OPC_END                    0
-#define RX_OPC_INIT_CONN              1 /* arg0=initial window, arg1=max window */
-#define RX_OPC_INIT_STREAM            2 /* arg0=initial window, arg1=max window */
-#define RX_OPC_RX                     3 /* arg0=end, arg1=is_fin */
-#define RX_OPC_RETIRE                 4 /* arg0=num_bytes, arg1=rtt in OSSL_TIME ticks, expect_fail */
-#define RX_OPC_CHECK_CWM_CONN         5 /* arg0=expected */
-#define RX_OPC_CHECK_CWM_STREAM       6 /* arg0=expected */
-#define RX_OPC_CHECK_SWM_CONN         7 /* arg0=expected */
-#define RX_OPC_CHECK_SWM_STREAM       8 /* arg0=expected */
-#define RX_OPC_CHECK_RWM_CONN         9 /* arg0=expected */
-#define RX_OPC_CHECK_RWM_STREAM      10 /* arg0=expected */
-#define RX_OPC_CHECK_CHANGED_CONN    11 /* arg0=expected, arg1=clear */
-#define RX_OPC_CHECK_CHANGED_STREAM  12 /* arg0=expected, arg1=clear */
-#define RX_OPC_CHECK_ERROR_CONN      13 /* arg0=expected, arg1=clear */
-#define RX_OPC_CHECK_ERROR_STREAM    14 /* arg0=expected, arg1=clear */
-#define RX_OPC_STEP_TIME             15 /* arg0=OSSL_TIME ticks to advance */
-#define RX_OPC_MSG                   16
+#define RX_OPC_END 0
+#define RX_OPC_INIT_CONN 1 /* arg0=initial window, arg1=max window */
+#define RX_OPC_INIT_STREAM 2 /* arg0=initial window, arg1=max window */
+#define RX_OPC_RX 3 /* arg0=end, arg1=is_fin */
+#define RX_OPC_RETIRE 4 /* arg0=num_bytes, arg1=rtt in OSSL_TIME ticks, expect_fail */
+#define RX_OPC_CHECK_CWM_CONN 5 /* arg0=expected */
+#define RX_OPC_CHECK_CWM_STREAM 6 /* arg0=expected */
+#define RX_OPC_CHECK_SWM_CONN 7 /* arg0=expected */
+#define RX_OPC_CHECK_SWM_STREAM 8 /* arg0=expected */
+#define RX_OPC_CHECK_RWM_CONN 9 /* arg0=expected */
+#define RX_OPC_CHECK_RWM_STREAM 10 /* arg0=expected */
+#define RX_OPC_CHECK_CHANGED_CONN 11 /* arg0=expected, arg1=clear */
+#define RX_OPC_CHECK_CHANGED_STREAM 12 /* arg0=expected, arg1=clear */
+#define RX_OPC_CHECK_ERROR_CONN 13 /* arg0=expected, arg1=clear */
+#define RX_OPC_CHECK_ERROR_STREAM 14 /* arg0=expected, arg1=clear */
+#define RX_OPC_STEP_TIME 15 /* arg0=OSSL_TIME ticks to advance */
+#define RX_OPC_MSG 16
 
 struct rx_test_op {
-    unsigned char   op;
-    size_t          stream_idx;
-    uint64_t        arg0, arg1;
-    unsigned char   expect_fail;
-    const char     *msg;
+    unsigned char op;
+    size_t stream_idx;
+    uint64_t arg0, arg1;
+    unsigned char expect_fail;
+    const char *msg;
 };
 
 #define RX_OP_END \
@@ -264,22 +261,22 @@ struct rx_test_op {
 #define RX_OP_MSG(msg) \
     { RX_OPC_MSG, 0, 0, 0, 0, (msg) },
 
-#define RX_OP_INIT(init_window_size, max_window_size) \
+#define RX_OP_INIT(init_window_size, max_window_size)  \
     RX_OP_INIT_CONN(init_window_size, max_window_size) \
     RX_OP_INIT_STREAM(0, init_window_size, max_window_size)
-#define RX_OP_CHECK_CWM(expected) \
+#define RX_OP_CHECK_CWM(expected)  \
     RX_OP_CHECK_CWM_CONN(expected) \
     RX_OP_CHECK_CWM_STREAM(0, expected)
-#define RX_OP_CHECK_SWM(expected) \
+#define RX_OP_CHECK_SWM(expected)  \
     RX_OP_CHECK_SWM_CONN(expected) \
     RX_OP_CHECK_SWM_STREAM(0, expected)
-#define RX_OP_CHECK_RWM(expected) \
+#define RX_OP_CHECK_RWM(expected)  \
     RX_OP_CHECK_RWM_CONN(expected) \
     RX_OP_CHECK_RWM_STREAM(0, expected)
-#define RX_OP_CHECK_CHANGED(expected, clear) \
+#define RX_OP_CHECK_CHANGED(expected, clear)  \
     RX_OP_CHECK_CHANGED_CONN(expected, clear) \
     RX_OP_CHECK_CHANGED_STREAM(0, expected, clear)
-#define RX_OP_CHECK_ERROR(expected, clear) \
+#define RX_OP_CHECK_ERROR(expected, clear)  \
     RX_OP_CHECK_ERROR_CONN(expected, clear) \
     RX_OP_CHECK_ERROR_STREAM(0, expected, clear)
 
@@ -289,11 +286,11 @@ struct rx_test_op {
 /* 1. Basic RXFC Tests (stream window == connection window) */
 static const struct rx_test_op rx_script_1[] = {
     RX_OP_STEP_TIME(1000 * OSSL_TIME_MS)
-    RX_OP_INIT(INIT_WINDOW_SIZE, 10 * INIT_WINDOW_SIZE)
+        RX_OP_INIT(INIT_WINDOW_SIZE, 10 * INIT_WINDOW_SIZE)
     /* Check initial state. */
     RX_OP_CHECK_CWM(INIT_WINDOW_SIZE)
-    RX_OP_CHECK_ERROR(0, 0)
-    RX_OP_CHECK_CHANGED(0, 0)
+        RX_OP_CHECK_ERROR(0, 0)
+            RX_OP_CHECK_CHANGED(0, 0)
     /* We cannot retire what we have not received. */
     RX_OP_RETIRE(0, 1, 0, 1)
     /* Zero bytes is a no-op and always valid. */
@@ -302,172 +299,172 @@ static const struct rx_test_op rx_script_1[] = {
     RX_OP_RX(0, 50, 0)
     /* CWM has not changed. */
     RX_OP_CHECK_CWM(INIT_WINDOW_SIZE)
-    RX_OP_CHECK_SWM(50)
+        RX_OP_CHECK_SWM(50)
 
     /* RX, Partial retire */
     RX_OP_RX(0, 60, 0)
-    RX_OP_CHECK_SWM(60)
-    RX_OP_RETIRE(0, 20, 50 * OSSL_TIME_MS, 0)
-    RX_OP_CHECK_RWM(20)
-    RX_OP_CHECK_SWM(60)
-    RX_OP_CHECK_CWM(INIT_WINDOW_SIZE)
-    RX_OP_CHECK_CHANGED(0, 0)
-    RX_OP_CHECK_ERROR(0, 0)
+        RX_OP_CHECK_SWM(60)
+            RX_OP_RETIRE(0, 20, 50 * OSSL_TIME_MS, 0)
+                RX_OP_CHECK_RWM(20)
+                    RX_OP_CHECK_SWM(60)
+                        RX_OP_CHECK_CWM(INIT_WINDOW_SIZE)
+                            RX_OP_CHECK_CHANGED(0, 0)
+                                RX_OP_CHECK_ERROR(0, 0)
 
     /* Fully retired */
     RX_OP_RETIRE(0, 41, 0, 1)
-    RX_OP_RETIRE(0, 40, 0, 0)
-    RX_OP_CHECK_SWM(60)
-    RX_OP_CHECK_RWM(60)
-    RX_OP_CHECK_CWM(INIT_WINDOW_SIZE)
-    RX_OP_CHECK_CHANGED(0, 0)
-    RX_OP_CHECK_ERROR(0, 0)
+        RX_OP_RETIRE(0, 40, 0, 0)
+            RX_OP_CHECK_SWM(60)
+                RX_OP_CHECK_RWM(60)
+                    RX_OP_CHECK_CWM(INIT_WINDOW_SIZE)
+                        RX_OP_CHECK_CHANGED(0, 0)
+                            RX_OP_CHECK_ERROR(0, 0)
 
     /* Exhaustion of window - we do not enlarge the window this epoch */
     RX_OP_STEP_TIME(201 * OSSL_TIME_MS)
-    RX_OP_RX(0, INIT_WINDOW_SIZE, 0)
-    RX_OP_RETIRE(0, INIT_WINDOW_SIZE - 60, 50 * OSSL_TIME_MS, 0)
-    RX_OP_CHECK_SWM(INIT_WINDOW_SIZE)
-    RX_OP_CHECK_CHANGED(1, 0)
-    RX_OP_CHECK_CHANGED(1, 1)
-    RX_OP_CHECK_CHANGED(0, 0)
-    RX_OP_CHECK_ERROR(0, 0)
-    RX_OP_CHECK_CWM(INIT_WINDOW_SIZE * 2)
+        RX_OP_RX(0, INIT_WINDOW_SIZE, 0)
+            RX_OP_RETIRE(0, INIT_WINDOW_SIZE - 60, 50 * OSSL_TIME_MS, 0)
+                RX_OP_CHECK_SWM(INIT_WINDOW_SIZE)
+                    RX_OP_CHECK_CHANGED(1, 0)
+                        RX_OP_CHECK_CHANGED(1, 1)
+                            RX_OP_CHECK_CHANGED(0, 0)
+                                RX_OP_CHECK_ERROR(0, 0)
+                                    RX_OP_CHECK_CWM(INIT_WINDOW_SIZE * 2)
 
     /* Second epoch - we still do not enlarge the window this epoch */
     RX_OP_RX(0, INIT_WINDOW_SIZE + 1, 0)
-    RX_OP_STEP_TIME(201 * OSSL_TIME_MS)
-    RX_OP_RX(0, INIT_WINDOW_SIZE * 2, 0)
-    RX_OP_RETIRE(0, INIT_WINDOW_SIZE, 50 * OSSL_TIME_MS, 0)
-    RX_OP_CHECK_SWM(INIT_WINDOW_SIZE * 2)
-    RX_OP_CHECK_CHANGED(1, 0)
-    RX_OP_CHECK_CHANGED(1, 1)
-    RX_OP_CHECK_CHANGED(0, 0)
-    RX_OP_CHECK_ERROR(0, 0)
-    RX_OP_CHECK_CWM(INIT_WINDOW_SIZE * 3)
+        RX_OP_STEP_TIME(201 * OSSL_TIME_MS)
+            RX_OP_RX(0, INIT_WINDOW_SIZE * 2, 0)
+                RX_OP_RETIRE(0, INIT_WINDOW_SIZE, 50 * OSSL_TIME_MS, 0)
+                    RX_OP_CHECK_SWM(INIT_WINDOW_SIZE * 2)
+                        RX_OP_CHECK_CHANGED(1, 0)
+                            RX_OP_CHECK_CHANGED(1, 1)
+                                RX_OP_CHECK_CHANGED(0, 0)
+                                    RX_OP_CHECK_ERROR(0, 0)
+                                        RX_OP_CHECK_CWM(INIT_WINDOW_SIZE * 3)
 
     /* Third epoch - we enlarge the window */
     RX_OP_RX(0, INIT_WINDOW_SIZE * 2 + 1, 0)
-    RX_OP_STEP_TIME(199 * OSSL_TIME_MS)
-    RX_OP_RX(0, INIT_WINDOW_SIZE * 3, 0)
-    RX_OP_RETIRE(0, INIT_WINDOW_SIZE, 50 * OSSL_TIME_MS, 0)
-    RX_OP_CHECK_SWM(INIT_WINDOW_SIZE * 3)
-    RX_OP_CHECK_CHANGED(1, 0)
-    RX_OP_CHECK_CHANGED(1, 1)
-    RX_OP_CHECK_CHANGED(0, 0)
-    RX_OP_CHECK_ERROR(0, 0)
-    RX_OP_CHECK_CWM(INIT_WINDOW_SIZE * 5)
+        RX_OP_STEP_TIME(199 * OSSL_TIME_MS)
+            RX_OP_RX(0, INIT_WINDOW_SIZE * 3, 0)
+                RX_OP_RETIRE(0, INIT_WINDOW_SIZE, 50 * OSSL_TIME_MS, 0)
+                    RX_OP_CHECK_SWM(INIT_WINDOW_SIZE * 3)
+                        RX_OP_CHECK_CHANGED(1, 0)
+                            RX_OP_CHECK_CHANGED(1, 1)
+                                RX_OP_CHECK_CHANGED(0, 0)
+                                    RX_OP_CHECK_ERROR(0, 0)
+                                        RX_OP_CHECK_CWM(INIT_WINDOW_SIZE * 5)
 
     /* Fourth epoch - peer violates flow control */
     RX_OP_RX(0, INIT_WINDOW_SIZE * 5 - 5, 0)
-    RX_OP_STEP_TIME(250 * OSSL_TIME_MS)
-    RX_OP_RX(0, INIT_WINDOW_SIZE * 5 + 1, 0)
-    RX_OP_CHECK_SWM(INIT_WINDOW_SIZE * 5)
-    RX_OP_CHECK_ERROR(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 0)
-    RX_OP_CHECK_ERROR(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 1)
-    RX_OP_CHECK_ERROR(0, 0)
-    RX_OP_CHECK_CWM(INIT_WINDOW_SIZE * 5)
+        RX_OP_STEP_TIME(250 * OSSL_TIME_MS)
+            RX_OP_RX(0, INIT_WINDOW_SIZE * 5 + 1, 0)
+                RX_OP_CHECK_SWM(INIT_WINDOW_SIZE * 5)
+                    RX_OP_CHECK_ERROR(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 0)
+                        RX_OP_CHECK_ERROR(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 1)
+                            RX_OP_CHECK_ERROR(0, 0)
+                                RX_OP_CHECK_CWM(INIT_WINDOW_SIZE * 5)
     /*
      * No window expansion due to flow control violation; window expansion is
      * triggered by retirement only.
      */
     RX_OP_CHECK_CHANGED(0, 0)
 
-    RX_OP_END
+        RX_OP_END
 };
 
 /* 2. Interaction between connection and stream-level flow control */
 static const struct rx_test_op rx_script_2[] = {
     RX_OP_STEP_TIME(1000 * OSSL_TIME_MS)
-    RX_OP_INIT_CONN(INIT_WINDOW_SIZE, 10 * INIT_WINDOW_SIZE)
-    RX_OP_INIT_STREAM(0, INIT_S_WINDOW_SIZE, 30 * INIT_S_WINDOW_SIZE)
-    RX_OP_INIT_STREAM(1, INIT_S_WINDOW_SIZE, 30 * INIT_S_WINDOW_SIZE)
-
-    RX_OP_RX(0, 10, 0)
-    RX_OP_CHECK_CWM_CONN(INIT_WINDOW_SIZE)
-    RX_OP_CHECK_CWM_STREAM(0, INIT_S_WINDOW_SIZE)
-    RX_OP_CHECK_CWM_STREAM(1, INIT_S_WINDOW_SIZE)
-    RX_OP_CHECK_SWM_CONN(10)
-    RX_OP_CHECK_SWM_STREAM(0, 10)
-    RX_OP_CHECK_SWM_STREAM(1, 0)
-    RX_OP_CHECK_RWM_CONN(0)
-    RX_OP_CHECK_RWM_STREAM(0, 0)
-    RX_OP_CHECK_RWM_STREAM(1, 0)
-
-    RX_OP_RX(1, 42, 0)
-    RX_OP_RX(1, 42, 0) /* monotonic; equal or lower values ignored */
+        RX_OP_INIT_CONN(INIT_WINDOW_SIZE, 10 * INIT_WINDOW_SIZE)
+            RX_OP_INIT_STREAM(0, INIT_S_WINDOW_SIZE, 30 * INIT_S_WINDOW_SIZE)
+                RX_OP_INIT_STREAM(1, INIT_S_WINDOW_SIZE, 30 * INIT_S_WINDOW_SIZE)
+
+                    RX_OP_RX(0, 10, 0)
+                        RX_OP_CHECK_CWM_CONN(INIT_WINDOW_SIZE)
+                            RX_OP_CHECK_CWM_STREAM(0, INIT_S_WINDOW_SIZE)
+                                RX_OP_CHECK_CWM_STREAM(1, INIT_S_WINDOW_SIZE)
+                                    RX_OP_CHECK_SWM_CONN(10)
+                                        RX_OP_CHECK_SWM_STREAM(0, 10)
+                                            RX_OP_CHECK_SWM_STREAM(1, 0)
+                                                RX_OP_CHECK_RWM_CONN(0)
+                                                    RX_OP_CHECK_RWM_STREAM(0, 0)
+                                                        RX_OP_CHECK_RWM_STREAM(1, 0)
+
+                                                            RX_OP_RX(1, 42, 0)
+                                                                RX_OP_RX(1, 42, 0) /* monotonic; equal or lower values ignored */
     RX_OP_RX(1, 35, 0)
-    RX_OP_CHECK_CWM_CONN(INIT_WINDOW_SIZE)
-    RX_OP_CHECK_CWM_STREAM(0, INIT_S_WINDOW_SIZE)
-    RX_OP_CHECK_CWM_STREAM(1, INIT_S_WINDOW_SIZE)
-    RX_OP_CHECK_SWM_CONN(52)
-    RX_OP_CHECK_SWM_STREAM(0, 10)
-    RX_OP_CHECK_SWM_STREAM(1, 42)
-    RX_OP_CHECK_RWM_CONN(0)
-    RX_OP_CHECK_RWM_STREAM(0, 0)
-    RX_OP_CHECK_RWM_STREAM(1, 0)
-
-    RX_OP_RETIRE(0, 10, 50 * OSSL_TIME_MS, 0)
-    RX_OP_CHECK_RWM_CONN(10)
-    RX_OP_CHECK_RWM_STREAM(0, 10)
-    RX_OP_CHECK_CWM_CONN(INIT_WINDOW_SIZE)
-    RX_OP_CHECK_CWM_STREAM(0, INIT_S_WINDOW_SIZE)
-    RX_OP_CHECK_CWM_STREAM(1, INIT_S_WINDOW_SIZE)
-
-    RX_OP_RETIRE(1, 42, 50 * OSSL_TIME_MS, 0)
-    RX_OP_CHECK_RWM_CONN(52)
-    RX_OP_CHECK_RWM_STREAM(1, 42)
-    RX_OP_CHECK_CWM_CONN(INIT_WINDOW_SIZE)
-    RX_OP_CHECK_CWM_STREAM(0, INIT_S_WINDOW_SIZE)
-    RX_OP_CHECK_CWM_STREAM(1, INIT_S_WINDOW_SIZE)
-
-    RX_OP_CHECK_CHANGED_CONN(0, 0)
+        RX_OP_CHECK_CWM_CONN(INIT_WINDOW_SIZE)
+            RX_OP_CHECK_CWM_STREAM(0, INIT_S_WINDOW_SIZE)
+                RX_OP_CHECK_CWM_STREAM(1, INIT_S_WINDOW_SIZE)
+                    RX_OP_CHECK_SWM_CONN(52)
+                        RX_OP_CHECK_SWM_STREAM(0, 10)
+                            RX_OP_CHECK_SWM_STREAM(1, 42)
+                                RX_OP_CHECK_RWM_CONN(0)
+                                    RX_OP_CHECK_RWM_STREAM(0, 0)
+                                        RX_OP_CHECK_RWM_STREAM(1, 0)
+
+                                            RX_OP_RETIRE(0, 10, 50 * OSSL_TIME_MS, 0)
+                                                RX_OP_CHECK_RWM_CONN(10)
+                                                    RX_OP_CHECK_RWM_STREAM(0, 10)
+                                                        RX_OP_CHECK_CWM_CONN(INIT_WINDOW_SIZE)
+                                                            RX_OP_CHECK_CWM_STREAM(0, INIT_S_WINDOW_SIZE)
+                                                                RX_OP_CHECK_CWM_STREAM(1, INIT_S_WINDOW_SIZE)
+
+                                                                    RX_OP_RETIRE(1, 42, 50 * OSSL_TIME_MS, 0)
+                                                                        RX_OP_CHECK_RWM_CONN(52)
+                                                                            RX_OP_CHECK_RWM_STREAM(1, 42)
+                                                                                RX_OP_CHECK_CWM_CONN(INIT_WINDOW_SIZE)
+                                                                                    RX_OP_CHECK_CWM_STREAM(0, INIT_S_WINDOW_SIZE)
+                                                                                        RX_OP_CHECK_CWM_STREAM(1, INIT_S_WINDOW_SIZE)
+
+                                                                                            RX_OP_CHECK_CHANGED_CONN(0, 0)
 
     /* FC limited by stream but not connection */
     RX_OP_STEP_TIME(1000 * OSSL_TIME_MS)
-    RX_OP_RX(0, INIT_S_WINDOW_SIZE, 0)
-    RX_OP_CHECK_SWM_CONN(INIT_S_WINDOW_SIZE + 42)
-    RX_OP_CHECK_SWM_STREAM(0, INIT_S_WINDOW_SIZE)
-    RX_OP_CHECK_SWM_STREAM(1, 42)
-    RX_OP_CHECK_CWM_CONN(INIT_WINDOW_SIZE)
-    RX_OP_CHECK_CWM_STREAM(0, INIT_S_WINDOW_SIZE)
+        RX_OP_RX(0, INIT_S_WINDOW_SIZE, 0)
+            RX_OP_CHECK_SWM_CONN(INIT_S_WINDOW_SIZE + 42)
+                RX_OP_CHECK_SWM_STREAM(0, INIT_S_WINDOW_SIZE)
+                    RX_OP_CHECK_SWM_STREAM(1, 42)
+                        RX_OP_CHECK_CWM_CONN(INIT_WINDOW_SIZE)
+                            RX_OP_CHECK_CWM_STREAM(0, INIT_S_WINDOW_SIZE)
 
     /* We bump CWM when more than 1/4 of the window has been retired */
     RX_OP_RETIRE(0, INIT_S_WINDOW_SIZE - 10, 50 * OSSL_TIME_MS, 0)
-    RX_OP_CHECK_CWM_STREAM(0, INIT_S_WINDOW_SIZE * 2)
-    RX_OP_CHECK_CHANGED_STREAM(0, 1, 0)
-    RX_OP_CHECK_CHANGED_STREAM(0, 1, 1)
-    RX_OP_CHECK_CHANGED_STREAM(0, 0, 0)
+        RX_OP_CHECK_CWM_STREAM(0, INIT_S_WINDOW_SIZE * 2)
+            RX_OP_CHECK_CHANGED_STREAM(0, 1, 0)
+                RX_OP_CHECK_CHANGED_STREAM(0, 1, 1)
+                    RX_OP_CHECK_CHANGED_STREAM(0, 0, 0)
 
     /*
      * This is more than 1/4 of the connection window, so CWM will
      * be bumped here too.
      */
     RX_OP_CHECK_CWM_CONN(INIT_S_WINDOW_SIZE + INIT_WINDOW_SIZE + 42)
-    RX_OP_CHECK_RWM_CONN(INIT_S_WINDOW_SIZE + 42)
-    RX_OP_CHECK_RWM_STREAM(0, INIT_S_WINDOW_SIZE)
-    RX_OP_CHECK_RWM_STREAM(1, 42)
-    RX_OP_CHECK_CHANGED_CONN(1, 0)
-    RX_OP_CHECK_CHANGED_CONN(1, 1)
-    RX_OP_CHECK_CHANGED_CONN(0, 0)
-    RX_OP_CHECK_ERROR_CONN(0, 0)
-    RX_OP_CHECK_ERROR_STREAM(0, 0, 0)
-    RX_OP_CHECK_ERROR_STREAM(1, 0, 0)
+        RX_OP_CHECK_RWM_CONN(INIT_S_WINDOW_SIZE + 42)
+            RX_OP_CHECK_RWM_STREAM(0, INIT_S_WINDOW_SIZE)
+                RX_OP_CHECK_RWM_STREAM(1, 42)
+                    RX_OP_CHECK_CHANGED_CONN(1, 0)
+                        RX_OP_CHECK_CHANGED_CONN(1, 1)
+                            RX_OP_CHECK_CHANGED_CONN(0, 0)
+                                RX_OP_CHECK_ERROR_CONN(0, 0)
+                                    RX_OP_CHECK_ERROR_STREAM(0, 0, 0)
+                                        RX_OP_CHECK_ERROR_STREAM(1, 0, 0)
 
     /* Test exceeding limit at stream level. */
     RX_OP_RX(0, INIT_S_WINDOW_SIZE * 2 + 1, 0)
-    RX_OP_CHECK_ERROR_STREAM(0, OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 0)
-    RX_OP_CHECK_ERROR_STREAM(0, OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 1)
-    RX_OP_CHECK_ERROR_STREAM(0, 0, 0)
-    RX_OP_CHECK_ERROR_CONN(0, 0) /* doesn't affect conn */
+        RX_OP_CHECK_ERROR_STREAM(0, OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 0)
+            RX_OP_CHECK_ERROR_STREAM(0, OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 1)
+                RX_OP_CHECK_ERROR_STREAM(0, 0, 0)
+                    RX_OP_CHECK_ERROR_CONN(0, 0) /* doesn't affect conn */
 
     /* Test exceeding limit at connection level. */
     RX_OP_RX(0, INIT_WINDOW_SIZE * 2, 0)
-    RX_OP_CHECK_ERROR_CONN(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 0)
-    RX_OP_CHECK_ERROR_CONN(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 1)
-    RX_OP_CHECK_ERROR_CONN(0, 0)
+        RX_OP_CHECK_ERROR_CONN(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 0)
+            RX_OP_CHECK_ERROR_CONN(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 1)
+                RX_OP_CHECK_ERROR_CONN(0, 0)
 
-    RX_OP_END
+                    RX_OP_END
 };
 
 static const struct rx_test_op *rx_scripts[] = {
@@ -477,151 +474,151 @@ static const struct rx_test_op *rx_scripts[] = {
 
 static int run_rxfc_script(const struct rx_test_op *script)
 {
-#define MAX_STREAMS     3
+#define MAX_STREAMS 3
     int testresult = 0;
     const struct rx_test_op *op = script;
-    QUIC_RXFC conn_rxfc = {0}, stream_rxfc[MAX_STREAMS] = {0}; /* coverity */
-    char stream_init_done[MAX_STREAMS] = {0};
+    QUIC_RXFC conn_rxfc = { 0 }, stream_rxfc[MAX_STREAMS] = { 0 }; /* coverity */
+    char stream_init_done[MAX_STREAMS] = { 0 };
     int conn_init_done = 0;
 
     cur_time = ossl_time_zero();
 
     for (; op->op != RX_OPC_END; ++op) {
         switch (op->op) {
-            case RX_OPC_INIT_CONN:
-                if (!TEST_true(ossl_quic_rxfc_init(&conn_rxfc, 0,
-                                                   op->arg0, op->arg1,
-                                                   fake_now, NULL)))
-                    goto err;
-
-                conn_init_done = 1;
-                break;
-
-            case RX_OPC_INIT_STREAM:
-                if (!TEST_size_t_lt(op->stream_idx, OSSL_NELEM(stream_rxfc))
-                    || !TEST_true(conn_init_done))
-                    goto err;
-
-                if (!TEST_true(ossl_quic_rxfc_init(&stream_rxfc[op->stream_idx],
-                                                   &conn_rxfc,
-                                                   op->arg0, op->arg1,
-                                                   fake_now, NULL)))
-                    goto err;
-
-                stream_init_done[op->stream_idx] = 1;
-                break;
-
-            case RX_OPC_RX:
-                if (!TEST_true(conn_init_done && op->stream_idx < OSSL_NELEM(stream_rxfc)
-                               && stream_init_done[op->stream_idx]))
-                    goto err;
-
-                if (!TEST_true(ossl_quic_rxfc_on_rx_stream_frame(&stream_rxfc[op->stream_idx],
-                                                                 op->arg0,
-                                                                 (int)op->arg1)))
-                    goto err;
-
-                break;
-
-            case RX_OPC_RETIRE:
-                if (!TEST_true(conn_init_done && op->stream_idx < OSSL_NELEM(stream_rxfc)
-                               && stream_init_done[op->stream_idx]))
-                    goto err;
-
-                if (!TEST_int_eq(ossl_quic_rxfc_on_retire(&stream_rxfc[op->stream_idx],
-                                                          op->arg0,
-                                                          ossl_ticks2time(op->arg1)),
-                                 !op->expect_fail))
-                    goto err;
-
-                break;
-            case RX_OPC_CHECK_CWM_CONN:
-                if (!TEST_true(conn_init_done))
-                    goto err;
-                if (!TEST_uint64_t_eq(ossl_quic_rxfc_get_cwm(&conn_rxfc),
-                                      op->arg0))
-                    goto err;
-                break;
-            case RX_OPC_CHECK_CWM_STREAM:
-                if (!TEST_true(op->stream_idx < OSSL_NELEM(stream_rxfc)
-                               && stream_init_done[op->stream_idx]))
-                    goto err;
-                if (!TEST_uint64_t_eq(ossl_quic_rxfc_get_cwm(&stream_rxfc[op->stream_idx]),
-                                      op->arg0))
-                    goto err;
-                break;
-            case RX_OPC_CHECK_SWM_CONN:
-                if (!TEST_true(conn_init_done))
-                    goto err;
-                if (!TEST_uint64_t_eq(ossl_quic_rxfc_get_swm(&conn_rxfc),
-                                      op->arg0))
-                    goto err;
-                break;
-            case RX_OPC_CHECK_SWM_STREAM:
-                if (!TEST_true(op->stream_idx < OSSL_NELEM(stream_rxfc)
-                               && stream_init_done[op->stream_idx]))
-                    goto err;
-                if (!TEST_uint64_t_eq(ossl_quic_rxfc_get_swm(&stream_rxfc[op->stream_idx]),
-                                      op->arg0))
-                    goto err;
-                break;
-            case RX_OPC_CHECK_RWM_CONN:
-                if (!TEST_true(conn_init_done))
-                    goto err;
-                if (!TEST_uint64_t_eq(ossl_quic_rxfc_get_rwm(&conn_rxfc),
-                                      op->arg0))
-                    goto err;
-                break;
-            case RX_OPC_CHECK_RWM_STREAM:
-                if (!TEST_true(op->stream_idx < OSSL_NELEM(stream_rxfc)
-                               && stream_init_done[op->stream_idx]))
-                    goto err;
-                if (!TEST_uint64_t_eq(ossl_quic_rxfc_get_rwm(&stream_rxfc[op->stream_idx]),
-                                      op->arg0))
-                    goto err;
-                break;
-            case RX_OPC_CHECK_CHANGED_CONN:
-                if (!TEST_true(conn_init_done))
-                    goto err;
-                if (!TEST_int_eq(ossl_quic_rxfc_has_cwm_changed(&conn_rxfc,
-                                                                (int)op->arg1),
-                                 (int)op->arg0))
-                    goto err;
-                break;
-            case RX_OPC_CHECK_CHANGED_STREAM:
-                if (!TEST_true(op->stream_idx < OSSL_NELEM(stream_rxfc)
-                               && stream_init_done[op->stream_idx]))
-                    goto err;
-                if (!TEST_int_eq(ossl_quic_rxfc_has_cwm_changed(&stream_rxfc[op->stream_idx],
-                                                                (int)op->arg1),
-                                 (int)op->arg0))
-                    goto err;
-                break;
-            case RX_OPC_CHECK_ERROR_CONN:
-                if (!TEST_true(conn_init_done))
-                    goto err;
-                if (!TEST_int_eq(ossl_quic_rxfc_get_error(&conn_rxfc,
-                                                          (int)op->arg1),
-                                 (int)op->arg0))
-                    goto err;
-                break;
-            case RX_OPC_CHECK_ERROR_STREAM:
-                if (!TEST_true(op->stream_idx < OSSL_NELEM(stream_rxfc)
-                               && stream_init_done[op->stream_idx]))
-                    goto err;
-                if (!TEST_int_eq(ossl_quic_rxfc_get_error(&stream_rxfc[op->stream_idx],
-                                                          (int)op->arg1),
-                                 (int)op->arg0))
-                    goto err;
-                break;
-            case RX_OPC_STEP_TIME:
-                cur_time = ossl_time_add(cur_time, ossl_ticks2time(op->arg0));
-                break;
-            case RX_OPC_MSG:
-                fprintf(stderr, "# %s\n", op->msg);
-                break;
-            default:
+        case RX_OPC_INIT_CONN:
+            if (!TEST_true(ossl_quic_rxfc_init(&conn_rxfc, 0,
+                    op->arg0, op->arg1,
+                    fake_now, NULL)))
+                goto err;
+
+            conn_init_done = 1;
+            break;
+
+        case RX_OPC_INIT_STREAM:
+            if (!TEST_size_t_lt(op->stream_idx, OSSL_NELEM(stream_rxfc))
+                || !TEST_true(conn_init_done))
+                goto err;
+
+            if (!TEST_true(ossl_quic_rxfc_init(&stream_rxfc[op->stream_idx],
+                    &conn_rxfc,
+                    op->arg0, op->arg1,
+                    fake_now, NULL)))
+                goto err;
+
+            stream_init_done[op->stream_idx] = 1;
+            break;
+
+        case RX_OPC_RX:
+            if (!TEST_true(conn_init_done && op->stream_idx < OSSL_NELEM(stream_rxfc)
+                    && stream_init_done[op->stream_idx]))
                 goto err;
+
+            if (!TEST_true(ossl_quic_rxfc_on_rx_stream_frame(&stream_rxfc[op->stream_idx],
+                    op->arg0,
+                    (int)op->arg1)))
+                goto err;
+
+            break;
+
+        case RX_OPC_RETIRE:
+            if (!TEST_true(conn_init_done && op->stream_idx < OSSL_NELEM(stream_rxfc)
+                    && stream_init_done[op->stream_idx]))
+                goto err;
+
+            if (!TEST_int_eq(ossl_quic_rxfc_on_retire(&stream_rxfc[op->stream_idx],
+                                 op->arg0,
+                                 ossl_ticks2time(op->arg1)),
+                    !op->expect_fail))
+                goto err;
+
+            break;
+        case RX_OPC_CHECK_CWM_CONN:
+            if (!TEST_true(conn_init_done))
+                goto err;
+            if (!TEST_uint64_t_eq(ossl_quic_rxfc_get_cwm(&conn_rxfc),
+                    op->arg0))
+                goto err;
+            break;
+        case RX_OPC_CHECK_CWM_STREAM:
+            if (!TEST_true(op->stream_idx < OSSL_NELEM(stream_rxfc)
+                    && stream_init_done[op->stream_idx]))
+                goto err;
+            if (!TEST_uint64_t_eq(ossl_quic_rxfc_get_cwm(&stream_rxfc[op->stream_idx]),
+                    op->arg0))
+                goto err;
+            break;
+        case RX_OPC_CHECK_SWM_CONN:
+            if (!TEST_true(conn_init_done))
+                goto err;
+            if (!TEST_uint64_t_eq(ossl_quic_rxfc_get_swm(&conn_rxfc),
+                    op->arg0))
+                goto err;
+            break;
+        case RX_OPC_CHECK_SWM_STREAM:
+            if (!TEST_true(op->stream_idx < OSSL_NELEM(stream_rxfc)
+                    && stream_init_done[op->stream_idx]))
+                goto err;
+            if (!TEST_uint64_t_eq(ossl_quic_rxfc_get_swm(&stream_rxfc[op->stream_idx]),
+                    op->arg0))
+                goto err;
+            break;
+        case RX_OPC_CHECK_RWM_CONN:
+            if (!TEST_true(conn_init_done))
+                goto err;
+            if (!TEST_uint64_t_eq(ossl_quic_rxfc_get_rwm(&conn_rxfc),
+                    op->arg0))
+                goto err;
+            break;
+        case RX_OPC_CHECK_RWM_STREAM:
+            if (!TEST_true(op->stream_idx < OSSL_NELEM(stream_rxfc)
+                    && stream_init_done[op->stream_idx]))
+                goto err;
+            if (!TEST_uint64_t_eq(ossl_quic_rxfc_get_rwm(&stream_rxfc[op->stream_idx]),
+                    op->arg0))
+                goto err;
+            break;
+        case RX_OPC_CHECK_CHANGED_CONN:
+            if (!TEST_true(conn_init_done))
+                goto err;
+            if (!TEST_int_eq(ossl_quic_rxfc_has_cwm_changed(&conn_rxfc,
+                                 (int)op->arg1),
+                    (int)op->arg0))
+                goto err;
+            break;
+        case RX_OPC_CHECK_CHANGED_STREAM:
+            if (!TEST_true(op->stream_idx < OSSL_NELEM(stream_rxfc)
+                    && stream_init_done[op->stream_idx]))
+                goto err;
+            if (!TEST_int_eq(ossl_quic_rxfc_has_cwm_changed(&stream_rxfc[op->stream_idx],
+                                 (int)op->arg1),
+                    (int)op->arg0))
+                goto err;
+            break;
+        case RX_OPC_CHECK_ERROR_CONN:
+            if (!TEST_true(conn_init_done))
+                goto err;
+            if (!TEST_int_eq(ossl_quic_rxfc_get_error(&conn_rxfc,
+                                 (int)op->arg1),
+                    (int)op->arg0))
+                goto err;
+            break;
+        case RX_OPC_CHECK_ERROR_STREAM:
+            if (!TEST_true(op->stream_idx < OSSL_NELEM(stream_rxfc)
+                    && stream_init_done[op->stream_idx]))
+                goto err;
+            if (!TEST_int_eq(ossl_quic_rxfc_get_error(&stream_rxfc[op->stream_idx],
+                                 (int)op->arg1),
+                    (int)op->arg0))
+                goto err;
+            break;
+        case RX_OPC_STEP_TIME:
+            cur_time = ossl_time_add(cur_time, ossl_ticks2time(op->arg0));
+            break;
+        case RX_OPC_MSG:
+            fprintf(stderr, "# %s\n", op->msg);
+            break;
+        default:
+            goto err;
         }
     }
 
diff --git a/test/quic_fifd_test.c b/test/quic_fifd_test.c
index cfa5a77745b72..89edea81e93e9 100644
--- a/test/quic_fifd_test.c
+++ b/test/quic_fifd_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -14,38 +14,42 @@
 
 static OSSL_TIME cur_time;
 
-static OSSL_TIME fake_now(void *arg) {
+static OSSL_TIME fake_now(void *arg)
+{
     return cur_time;
 }
 
-static void step_time(uint64_t ms) {
+static void step_time(uint64_t ms)
+{
     cur_time = ossl_time_add(cur_time, ossl_ms2time(ms));
 }
 
 static QUIC_SSTREAM *(*get_sstream_by_id_p)(uint64_t stream_id, uint32_t pn_space,
-                                            void *arg);
+    void *arg);
 
 static QUIC_SSTREAM *get_sstream_by_id(uint64_t stream_id, uint32_t pn_space,
-                                       void *arg)
+    void *arg)
 {
     return get_sstream_by_id_p(stream_id, pn_space, arg);
 }
 
 static void (*regen_frame_p)(uint64_t frame_type, uint64_t stream_id,
-                             QUIC_TXPIM_PKT *pkt, void *arg);
+    QUIC_TXPIM_PKT *pkt, void *arg);
 
 static void regen_frame(uint64_t frame_type, uint64_t stream_id,
-                        QUIC_TXPIM_PKT *pkt, void *arg)
+    QUIC_TXPIM_PKT *pkt, void *arg)
 {
     regen_frame_p(frame_type, stream_id, pkt, arg);
 }
 
 static void confirm_frame(uint64_t frame_type, uint64_t stream_id,
-                          QUIC_TXPIM_PKT *pkt, void *arg)
-{}
+    QUIC_TXPIM_PKT *pkt, void *arg)
+{
+}
 
 static void sstream_updated(uint64_t stream_id, void *arg)
-{}
+{
+}
 
 typedef struct info_st {
     QUIC_FIFD fifd;
@@ -69,7 +73,7 @@ static int cfq_freed;
  *    Test that a submitted packet, on ack, releases the TXPIM packet
  */
 static QUIC_SSTREAM *sstream_expect(uint64_t stream_id, uint32_t pn_space,
-                                    void *arg)
+    void *arg)
 {
     if (stream_id == 42 || stream_id == 43)
         return cur_info->sstream[stream_id - 42];
@@ -83,7 +87,7 @@ static uint64_t regen_stream_id[16];
 static size_t regen_count;
 
 static void regen_expect(uint64_t frame_type, uint64_t stream_id,
-                         QUIC_TXPIM_PKT *pkt, void *arg)
+    QUIC_TXPIM_PKT *pkt, void *arg)
 {
     regen_frame_type[regen_count] = frame_type;
     regen_stream_id[regen_count] = stream_id;
@@ -98,31 +102,32 @@ static void cfq_free_cb_(unsigned char *buf, size_t buf_len, void *arg)
         cfq_freed = 1;
 }
 
-#define TEST_KIND_ACK       0
-#define TEST_KIND_LOSS      1
-#define TEST_KIND_DISCARD   2
-#define TEST_KIND_NUM       3
+#define TEST_KIND_ACK 0
+#define TEST_KIND_LOSS 1
+#define TEST_KIND_DISCARD 2
+#define TEST_KIND_NUM 3
 
 static int test_generic(INFO *info, int kind)
 {
     int testresult = 0;
     size_t i, consumed = 0;
     QUIC_TXPIM_PKT *pkt = NULL, *pkt2 = NULL;
-    OSSL_QUIC_FRAME_STREAM hdr = {0};
+    OSSL_QUIC_FRAME_STREAM hdr = { 0 };
     OSSL_QTX_IOVEC iov[2];
     size_t num_iov;
-    QUIC_TXPIM_CHUNK chunk = {42, 0, 11, 0};
-    OSSL_QUIC_FRAME_ACK ack = {0};
-    OSSL_QUIC_ACK_RANGE ack_ranges[1] = {0};
+    QUIC_TXPIM_CHUNK chunk = { 42, 0, 11, 0 };
+    OSSL_QUIC_FRAME_ACK ack = { 0 };
+    OSSL_QUIC_ACK_RANGE ack_ranges[1] = { 0 };
     QUIC_CFQ_ITEM *cfq_item = NULL;
     uint32_t pn_space = (kind == TEST_KIND_DISCARD)
-        ? QUIC_PN_SPACE_HANDSHAKE : QUIC_PN_SPACE_APP;
+        ? QUIC_PN_SPACE_HANDSHAKE
+        : QUIC_PN_SPACE_APP;
 
-    cur_time            = ossl_seconds2time(1000);
-    regen_count         = 0;
+    cur_time = ossl_seconds2time(1000);
+    regen_count = 0;
 
     get_sstream_by_id_p = sstream_expect;
-    regen_frame_p       = regen_expect;
+    regen_frame_p = regen_expect;
 
     if (!TEST_ptr(pkt = ossl_quic_txpim_pkt_alloc(info->txpim)))
         goto err;
@@ -130,8 +135,8 @@ static int test_generic(INFO *info, int kind)
     for (i = 0; i < 2; ++i) {
         num_iov = OSSL_NELEM(iov);
         if (!TEST_true(ossl_quic_sstream_append(info->sstream[i],
-                                                (unsigned char *)"Test message",
-                                                12, &consumed))
+                (unsigned char *)"Test message",
+                12, &consumed))
             || !TEST_size_t_eq(consumed, 12))
             goto err;
 
@@ -139,21 +144,20 @@ static int test_generic(INFO *info, int kind)
             ossl_quic_sstream_fin(info->sstream[i]);
 
         if (!TEST_true(ossl_quic_sstream_get_stream_frame(info->sstream[i], 0,
-                                                          &hdr, iov, &num_iov))
+                &hdr, iov, &num_iov))
             || !TEST_int_eq(hdr.is_fin, i == 1)
             || !TEST_uint64_t_eq(hdr.offset, 0)
             || !TEST_uint64_t_eq(hdr.len, 12)
             || !TEST_size_t_eq(ossl_quic_sstream_get_buffer_used(info->sstream[i]), 12)
             || !TEST_true(ossl_quic_sstream_mark_transmitted(info->sstream[i],
-                                                             hdr.offset,
-                                                             hdr.offset + hdr.len - 1)))
+                hdr.offset,
+                hdr.offset + hdr.len - 1)))
             goto err;
 
-        if (i == 1 && !TEST_true(ossl_quic_sstream_mark_transmitted_fin(info->sstream[i],
-                                                                        hdr.offset + hdr.len)))
+        if (i == 1 && !TEST_true(ossl_quic_sstream_mark_transmitted_fin(info->sstream[i], hdr.offset + hdr.len)))
             goto err;
 
-        chunk.has_fin   = hdr.is_fin;
+        chunk.has_fin = hdr.is_fin;
         chunk.stream_id = 42 + i;
         if (!TEST_true(ossl_quic_txpim_pkt_append_chunk(pkt, &chunk)))
             goto err;
@@ -161,35 +165,35 @@ static int test_generic(INFO *info, int kind)
 
     cfq_freed = 0;
     if (!TEST_ptr(cfq_item = ossl_quic_cfq_add_frame(info->cfq, 10,
-                                                     pn_space,
-                                                     OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, 0,
-                                                     placeholder_data,
-                                                     sizeof(placeholder_data),
-                                                     cfq_free_cb_, NULL))
+                      pn_space,
+                      OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, 0,
+                      placeholder_data,
+                      sizeof(placeholder_data),
+                      cfq_free_cb_, NULL))
         || !TEST_ptr_eq(cfq_item, ossl_quic_cfq_get_priority_head(info->cfq, pn_space)))
         goto err;
 
     ossl_quic_txpim_pkt_add_cfq_item(pkt, cfq_item);
 
-    pkt->ackm_pkt.pkt_num           = 0;
-    pkt->ackm_pkt.pkt_space         = pn_space;
-    pkt->ackm_pkt.largest_acked     = QUIC_PN_INVALID;
-    pkt->ackm_pkt.num_bytes         = 50;
-    pkt->ackm_pkt.time              = cur_time;
-    pkt->ackm_pkt.is_inflight       = 1;
-    pkt->ackm_pkt.is_ack_eliciting  = 1;
+    pkt->ackm_pkt.pkt_num = 0;
+    pkt->ackm_pkt.pkt_space = pn_space;
+    pkt->ackm_pkt.largest_acked = QUIC_PN_INVALID;
+    pkt->ackm_pkt.num_bytes = 50;
+    pkt->ackm_pkt.time = cur_time;
+    pkt->ackm_pkt.is_inflight = 1;
+    pkt->ackm_pkt.is_ack_eliciting = 1;
     if (kind == TEST_KIND_LOSS) {
-        pkt->had_handshake_done_frame   = 1;
-        pkt->had_max_data_frame         = 1;
+        pkt->had_handshake_done_frame = 1;
+        pkt->had_max_data_frame = 1;
         pkt->had_max_streams_bidi_frame = 1;
-        pkt->had_max_streams_uni_frame  = 1;
-        pkt->had_ack_frame              = 1;
+        pkt->had_max_streams_uni_frame = 1;
+        pkt->had_ack_frame = 1;
     }
 
     ack_ranges[0].start = 0;
-    ack_ranges[0].end   = 0;
-    ack.ack_ranges      = ack_ranges;
-    ack.num_ack_ranges  = 1;
+    ack_ranges[0].end = 0;
+    ack.ack_ranges = ack_ranges;
+    ack.num_ack_ranges = 1;
 
     if (!TEST_true(ossl_quic_fifd_pkt_commit(&info->fifd, pkt)))
         goto err;
@@ -201,8 +205,8 @@ static int test_generic(INFO *info, int kind)
     switch (kind) {
     case TEST_KIND_ACK:
         if (!TEST_true(ossl_ackm_on_rx_ack_frame(info->ackm, &ack,
-                                                 pn_space,
-                                                 cur_time)))
+                pn_space,
+                cur_time)))
             goto err;
 
         for (i = 0; i < 2; ++i)
@@ -229,22 +233,22 @@ static int test_generic(INFO *info, int kind)
             goto err;
 
         step_time(10000);
-        pkt2->ackm_pkt.pkt_num          = 50;
-        pkt2->ackm_pkt.pkt_space        = pn_space;
-        pkt2->ackm_pkt.largest_acked    = QUIC_PN_INVALID;
-        pkt2->ackm_pkt.num_bytes        = 50;
-        pkt2->ackm_pkt.time             = cur_time;
-        pkt2->ackm_pkt.is_inflight      = 1;
+        pkt2->ackm_pkt.pkt_num = 50;
+        pkt2->ackm_pkt.pkt_space = pn_space;
+        pkt2->ackm_pkt.largest_acked = QUIC_PN_INVALID;
+        pkt2->ackm_pkt.num_bytes = 50;
+        pkt2->ackm_pkt.time = cur_time;
+        pkt2->ackm_pkt.is_inflight = 1;
         pkt2->ackm_pkt.is_ack_eliciting = 1;
 
         ack_ranges[0].start = 50;
-        ack_ranges[0].end   = 50;
-        ack.ack_ranges      = ack_ranges;
-        ack.num_ack_ranges  = 1;
+        ack_ranges[0].end = 50;
+        ack.ack_ranges = ack_ranges;
+        ack.num_ack_ranges = 1;
 
         if (!TEST_true(ossl_quic_fifd_pkt_commit(&info->fifd, pkt2))
             || !TEST_true(ossl_ackm_on_rx_ack_frame(info->ackm, &ack,
-                                                    pn_space, cur_time)))
+                pn_space, cur_time)))
             goto err;
 
         for (i = 0; i < 2; ++i) {
@@ -254,7 +258,7 @@ static int test_generic(INFO *info, int kind)
              * ensuring it is returned again
              */
             if (!TEST_true(ossl_quic_sstream_get_stream_frame(info->sstream[i], 0,
-                                                              &hdr, iov, &num_iov))
+                    &hdr, iov, &num_iov))
                 || !TEST_uint64_t_eq(hdr.offset, 0)
                 || !TEST_uint64_t_eq(hdr.len, 12))
                 goto err;
@@ -285,7 +289,7 @@ static int test_generic(INFO *info, int kind)
         /* FIN should have been marked as lost */
         num_iov = OSSL_NELEM(iov);
         if (!TEST_true(ossl_quic_sstream_get_stream_frame(info->sstream[1], 1,
-                                                          &hdr, iov, &num_iov))
+                &hdr, iov, &num_iov))
             || !TEST_true(hdr.is_fin)
             || !TEST_uint64_t_eq(hdr.len, 0))
             goto err;
@@ -318,7 +322,7 @@ static int test_generic(INFO *info, int kind)
 static int test_fifd(int idx)
 {
     int testresult = 0;
-    INFO info = {0};
+    INFO info = { 0 };
     size_t i;
 
     cur_info = &info;
@@ -327,19 +331,20 @@ static int test_fifd(int idx)
     if (!TEST_true(ossl_statm_init(&info.statm))
         || !TEST_ptr(info.ccdata = ossl_cc_dummy_method.new(fake_now, NULL))
         || !TEST_ptr(info.ackm = ossl_ackm_new(fake_now, NULL,
-                                               &info.statm,
-                                               &ossl_cc_dummy_method,
-                                               info.ccdata))
+                         &info.statm,
+                         &ossl_cc_dummy_method,
+                         info.ccdata,
+                         /* is_server */ 0))
         || !TEST_true(ossl_ackm_on_handshake_confirmed(info.ackm))
         || !TEST_ptr(info.cfq = ossl_quic_cfq_new())
         || !TEST_ptr(info.txpim = ossl_quic_txpim_new())
         || !TEST_true(ossl_quic_fifd_init(&info.fifd, info.cfq, info.ackm,
-                                          info.txpim,
-                                          get_sstream_by_id, NULL,
-                                          regen_frame, NULL,
-                                          confirm_frame, NULL,
-                                          sstream_updated, NULL,
-                                          NULL, NULL)))
+            info.txpim,
+            get_sstream_by_id, NULL,
+            regen_frame, NULL,
+            confirm_frame, NULL,
+            sstream_updated, NULL,
+            NULL, NULL)))
         goto err;
 
     for (i = 0; i < OSSL_NELEM(info.sstream); ++i)
diff --git a/test/quic_lcidm_test.c b/test/quic_lcidm_test.c
index b5937dfdbffe5..c317722ad9543 100644
--- a/test/quic_lcidm_test.c
+++ b/test/quic_lcidm_test.c
@@ -23,7 +23,7 @@ static int test_lcidm(void)
     int testresult = 0;
     QUIC_LCIDM *lcidm;
     size_t lcid_len = 10; /* != ODCID len */
-    QUIC_CONN_ID lcid_1, lcid_dummy, lcid_init = {0};
+    QUIC_CONN_ID lcid_1, lcid_dummy, lcid_init = { 0 };
     OSSL_QUIC_FRAME_NEW_CONN_ID ncid_frame_1, ncid_frame_2, ncid_frame_3;
     void *opaque = NULL;
     uint64_t seq_num = UINT64_MAX;
@@ -60,35 +60,35 @@ static int test_lcidm(void)
         || !TEST_ptr_eq(opaque, ptrs + 2)
         || !TEST_uint64_t_eq(seq_num, 0)
         || !TEST_true(ossl_quic_lcidm_lookup(lcidm, &ncid_frame_1.conn_id,
-                                             &seq_num, &opaque))
+            &seq_num, &opaque))
         || !TEST_ptr_eq(opaque, ptrs + 2)
         || !TEST_uint64_t_eq(seq_num, 1)
         || !TEST_true(ossl_quic_lcidm_lookup(lcidm, &ncid_frame_2.conn_id,
-                                             &seq_num, &opaque))
+            &seq_num, &opaque))
         || !TEST_ptr_eq(opaque, ptrs + 2)
         || !TEST_uint64_t_eq(seq_num, 2)
         || !TEST_true(ossl_quic_lcidm_lookup(lcidm, &ncid_frame_3.conn_id,
-                                             &seq_num, &opaque))
+            &seq_num, &opaque))
         || !TEST_ptr_eq(opaque, ptrs + 2)
         || !TEST_uint64_t_eq(seq_num, 3)
         || !TEST_true(ossl_quic_lcidm_retire(lcidm, ptrs + 2, 2, NULL,
-                                             &lcid_dummy, &seq_num, &did_retire))
+            &lcid_dummy, &seq_num, &did_retire))
         || !TEST_true(did_retire)
         || !TEST_size_t_eq(ossl_quic_lcidm_get_num_active_lcid(lcidm, ptrs + 2), 3)
         || !TEST_true(ossl_quic_lcidm_retire(lcidm, ptrs + 2, 2, NULL,
-                                             &lcid_dummy, &seq_num, &did_retire))
+            &lcid_dummy, &seq_num, &did_retire))
         || !TEST_true(did_retire)
         || !TEST_size_t_eq(ossl_quic_lcidm_get_num_active_lcid(lcidm, ptrs + 2), 2)
         || !TEST_true(ossl_quic_lcidm_retire(lcidm, ptrs + 2, 2, NULL,
-                                             &lcid_dummy, &seq_num, &did_retire))
+            &lcid_dummy, &seq_num, &did_retire))
         || !TEST_false(did_retire)
         || !TEST_size_t_eq(ossl_quic_lcidm_get_num_active_lcid(lcidm, ptrs + 2), 2)
         || !TEST_false(ossl_quic_lcidm_lookup(lcidm, &lcid_init,
-                                              &seq_num, &opaque))
+            &seq_num, &opaque))
         || !TEST_false(ossl_quic_lcidm_lookup(lcidm, &ncid_frame_1.conn_id,
-                                              &seq_num, &opaque))
+            &seq_num, &opaque))
         || !TEST_true(ossl_quic_lcidm_lookup(lcidm, &ncid_frame_2.conn_id,
-                                             &seq_num, &opaque))
+            &seq_num, &opaque))
         || !TEST_true(ossl_quic_lcidm_cull(lcidm, ptrs + 2))
         || !TEST_size_t_eq(ossl_quic_lcidm_get_num_active_lcid(lcidm, ptrs + 2), 0))
         goto err;
diff --git a/test/quic_multistream_test.c b/test/quic_multistream_test.c
index b73c8bef7edd4..169577a64595f 100644
--- a/test/quic_multistream_test.c
+++ b/test/quic_multistream_test.c
@@ -19,12 +19,22 @@
 #include "testutil.h"
 #include "helpers/quictestlib.h"
 #if defined(OPENSSL_THREADS)
-# include "internal/thread_arch.h"
+#include "internal/thread_arch.h"
 #endif
-#include "internal/numbers.h"  /* UINT64_C */
+#include "internal/numbers.h" /* UINT64_C */
 
 static const char *certfile, *keyfile;
 
+#if defined(_AIX)
+/*
+ * Some versions of AIX define macros for events and revents for use when
+ * accessing pollfd structures (see Github issue #24236). That interferes
+ * with our use of these names here. We simply undef them.
+ */
+#undef revents
+#undef events
+#endif
+
 #if defined(OPENSSL_THREADS)
 struct child_thread_args {
     struct helper *h;
@@ -41,156 +51,156 @@ struct child_thread_args {
 #endif
 
 typedef struct stream_info {
-    const char      *name;
-    SSL             *c_stream;
-    uint64_t        s_stream_id;
+    const char *name;
+    SSL *c_stream;
+    uint64_t s_stream_id;
 } STREAM_INFO;
 
 DEFINE_LHASH_OF_EX(STREAM_INFO);
 
 struct helper {
-    int                     s_fd;
-    BIO                     *s_net_bio, *s_net_bio_own, *s_qtf_wbio, *s_qtf_wbio_own;
+    int s_fd;
+    BIO *s_net_bio, *s_net_bio_own, *s_qtf_wbio, *s_qtf_wbio_own;
     /* The BIO_ADDR used for BIO_bind() */
-    BIO_ADDR                *s_net_bio_orig_addr;
+    BIO_ADDR *s_net_bio_orig_addr;
     /* The resulting address, which is the one to connect to */
-    BIO_ADDR                *s_net_bio_addr;
+    BIO_ADDR *s_net_bio_addr;
 
     /*
      * When doing a blocking mode test run, s_priv always points to the TSERVER
      * and s is NULL when the main thread should not be touching s_priv.
      */
-    QUIC_TSERVER            *s, *s_priv;
-    LHASH_OF(STREAM_INFO)   *s_streams;
+    QUIC_TSERVER *s, *s_priv;
+    LHASH_OF(STREAM_INFO) *s_streams;
 
-    int                     c_fd;
-    BIO                     *c_net_bio, *c_net_bio_own;
-    SSL_CTX                 *c_ctx;
-    SSL                     *c_conn;
-    LHASH_OF(STREAM_INFO)   *c_streams;
+    int c_fd;
+    BIO *c_net_bio, *c_net_bio_own;
+    SSL_CTX *c_ctx;
+    SSL *c_conn;
+    LHASH_OF(STREAM_INFO) *c_streams;
 
 #if defined(OPENSSL_THREADS)
-    struct child_thread_args    *threads;
-    size_t                      num_threads;
-    CRYPTO_MUTEX		*misc_m;
-    CRYPTO_CONDVAR		*misc_cv;
+    struct child_thread_args *threads;
+    size_t num_threads;
+    CRYPTO_MUTEX *misc_m;
+    CRYPTO_CONDVAR *misc_cv;
 #endif
 
-    OSSL_TIME       start_time;
+    OSSL_TIME start_time;
 
     /*
      * This is a duration recording the amount of time we have skipped forwards
      * for testing purposes relative to the real ossl_time_now() clock. We add
      * a quantity of time to this every time we skip some time.
      */
-    CRYPTO_RWLOCK   *time_lock;
-    OSSL_TIME       time_slip; /* protected by time_lock */
+    CRYPTO_RWLOCK *time_lock;
+    OSSL_TIME time_slip; /* protected by time_lock */
 
-    QTEST_FAULT     *qtf;
+    QTEST_FAULT *qtf;
 
-    int             init, blocking, check_spin_again;
-    int             free_order, need_injector;
+    int init, blocking, check_spin_again;
+    int free_order, need_injector;
 
     int (*qtf_packet_plain_cb)(struct helper *h, QUIC_PKT_HDR *hdr,
-                               unsigned char *buf, size_t buf_len);
+        unsigned char *buf, size_t buf_len);
     int (*qtf_handshake_cb)(struct helper *h,
-                            unsigned char *buf, size_t buf_len);
+        unsigned char *buf, size_t buf_len);
     int (*qtf_datagram_cb)(struct helper *h,
-                           BIO_MSG *m, size_t stride);
+        BIO_MSG *m, size_t stride);
     uint64_t inject_word0, inject_word1;
     uint64_t scratch0, scratch1, fail_count;
 #if defined(OPENSSL_THREADS)
     struct {
-        CRYPTO_THREAD   *t;
-        CRYPTO_MUTEX    *m;
-        CRYPTO_CONDVAR  *c;
-        int             ready, stop;
+        CRYPTO_THREAD *t;
+        CRYPTO_MUTEX *m;
+        CRYPTO_CONDVAR *c;
+        int ready, stop;
     } server_thread;
     int s_checked_out;
 #endif
 };
 
 struct helper_local {
-    struct helper           *h;
-    LHASH_OF(STREAM_INFO)   *c_streams;
-    int                     thread_idx;
-    const struct script_op  *check_op;
-    int                     explicit_event_handling;
+    struct helper *h;
+    LHASH_OF(STREAM_INFO) *c_streams;
+    int thread_idx;
+    const struct script_op *check_op;
+    int explicit_event_handling;
 };
 
 struct script_op {
-    uint32_t        op;
-    const void      *arg0;
-    size_t          arg1;
-    int             (*check_func)(struct helper *h, struct helper_local *hl);
-    const char      *stream_name;
-    uint64_t        arg2;
-    int             (*qtf_packet_plain_cb)(struct helper *h, QUIC_PKT_HDR *hdr,
-                                           unsigned char *buf, size_t buf_len);
-    int             (*qtf_handshake_cb)(struct helper *h,
-                                        unsigned char *buf, size_t buf_len);
-    int             (*qtf_datagram_cb)(struct helper *h,
-                                       BIO_MSG *m, size_t stride);
+    uint32_t op;
+    const void *arg0;
+    size_t arg1;
+    int (*check_func)(struct helper *h, struct helper_local *hl);
+    const char *stream_name;
+    uint64_t arg2;
+    int (*qtf_packet_plain_cb)(struct helper *h, QUIC_PKT_HDR *hdr,
+        unsigned char *buf, size_t buf_len);
+    int (*qtf_handshake_cb)(struct helper *h,
+        unsigned char *buf, size_t buf_len);
+    int (*qtf_datagram_cb)(struct helper *h,
+        BIO_MSG *m, size_t stride);
 };
 
-#define OPK_END                                     0
-#define OPK_CHECK                                   1
-#define OPK_C_SET_ALPN                              2
-#define OPK_C_CONNECT_WAIT                          3
-#define OPK_C_WRITE                                 4
-#define OPK_S_WRITE                                 5
-#define OPK_C_READ_EXPECT                           6
-#define OPK_S_READ_EXPECT                           7
-#define OPK_C_EXPECT_FIN                            8
-#define OPK_S_EXPECT_FIN                            9
-#define OPK_C_CONCLUDE                              10
-#define OPK_S_CONCLUDE                              11
-#define OPK_C_DETACH                                12
-#define OPK_C_ATTACH                                13
-#define OPK_C_NEW_STREAM                            14
-#define OPK_S_NEW_STREAM                            15
-#define OPK_C_ACCEPT_STREAM_WAIT                    16
-#define OPK_C_ACCEPT_STREAM_NONE                    17
-#define OPK_C_FREE_STREAM                           18
-#define OPK_C_SET_DEFAULT_STREAM_MODE               19
-#define OPK_C_SET_INCOMING_STREAM_POLICY            20
-#define OPK_C_SHUTDOWN_WAIT                         21
-#define OPK_C_EXPECT_CONN_CLOSE_INFO                22
-#define OPK_S_EXPECT_CONN_CLOSE_INFO                23
-#define OPK_S_BIND_STREAM_ID                        24
-#define OPK_C_WAIT_FOR_DATA                         25
-#define OPK_C_WRITE_FAIL                            26
-#define OPK_S_WRITE_FAIL                            27
-#define OPK_C_READ_FAIL                             28
-#define OPK_C_STREAM_RESET                          29
-#define OPK_S_ACCEPT_STREAM_WAIT                    30
-#define OPK_NEW_THREAD                              31
-#define OPK_BEGIN_REPEAT                            32
-#define OPK_END_REPEAT                              33
-#define OPK_S_UNBIND_STREAM_ID                      34
-#define OPK_C_READ_FAIL_WAIT                        35
-#define OPK_C_CLOSE_SOCKET                          36
-#define OPK_C_EXPECT_SSL_ERR                        37
-#define OPK_EXPECT_ERR_REASON                       38
-#define OPK_EXPECT_ERR_LIB                          39
-#define OPK_SLEEP                                   40
-#define OPK_S_READ_FAIL                             41
-#define OPK_S_SET_INJECT_PLAIN                      42
-#define OPK_SET_INJECT_WORD                         43
-#define OPK_C_INHIBIT_TICK                          44
-#define OPK_C_SET_WRITE_BUF_SIZE                    45
-#define OPK_S_SET_INJECT_HANDSHAKE                  46
-#define OPK_S_NEW_TICKET                            47
-#define OPK_C_SKIP_IF_UNBOUND                       48
-#define OPK_S_SET_INJECT_DATAGRAM                   49
-#define OPK_S_SHUTDOWN                              50
-#define OPK_POP_ERR                                 51
-#define OPK_C_WRITE_EX2                             52
-#define OPK_SKIP_IF_BLOCKING                        53
-#define OPK_C_STREAM_RESET_FAIL                     54
-
-#define EXPECT_CONN_CLOSE_APP       (1U << 0)
-#define EXPECT_CONN_CLOSE_REMOTE    (1U << 1)
+#define OPK_END 0
+#define OPK_CHECK 1
+#define OPK_C_SET_ALPN 2
+#define OPK_C_CONNECT_WAIT 3
+#define OPK_C_WRITE 4
+#define OPK_S_WRITE 5
+#define OPK_C_READ_EXPECT 6
+#define OPK_S_READ_EXPECT 7
+#define OPK_C_EXPECT_FIN 8
+#define OPK_S_EXPECT_FIN 9
+#define OPK_C_CONCLUDE 10
+#define OPK_S_CONCLUDE 11
+#define OPK_C_DETACH 12
+#define OPK_C_ATTACH 13
+#define OPK_C_NEW_STREAM 14
+#define OPK_S_NEW_STREAM 15
+#define OPK_C_ACCEPT_STREAM_WAIT 16
+#define OPK_C_ACCEPT_STREAM_NONE 17
+#define OPK_C_FREE_STREAM 18
+#define OPK_C_SET_DEFAULT_STREAM_MODE 19
+#define OPK_C_SET_INCOMING_STREAM_POLICY 20
+#define OPK_C_SHUTDOWN_WAIT 21
+#define OPK_C_EXPECT_CONN_CLOSE_INFO 22
+#define OPK_S_EXPECT_CONN_CLOSE_INFO 23
+#define OPK_S_BIND_STREAM_ID 24
+#define OPK_C_WAIT_FOR_DATA 25
+#define OPK_C_WRITE_FAIL 26
+#define OPK_S_WRITE_FAIL 27
+#define OPK_C_READ_FAIL 28
+#define OPK_C_STREAM_RESET 29
+#define OPK_S_ACCEPT_STREAM_WAIT 30
+#define OPK_NEW_THREAD 31
+#define OPK_BEGIN_REPEAT 32
+#define OPK_END_REPEAT 33
+#define OPK_S_UNBIND_STREAM_ID 34
+#define OPK_C_READ_FAIL_WAIT 35
+#define OPK_C_CLOSE_SOCKET 36
+#define OPK_C_EXPECT_SSL_ERR 37
+#define OPK_EXPECT_ERR_REASON 38
+#define OPK_EXPECT_ERR_LIB 39
+#define OPK_SLEEP 40
+#define OPK_S_READ_FAIL 41
+#define OPK_S_SET_INJECT_PLAIN 42
+#define OPK_SET_INJECT_WORD 43
+#define OPK_C_INHIBIT_TICK 44
+#define OPK_C_SET_WRITE_BUF_SIZE 45
+#define OPK_S_SET_INJECT_HANDSHAKE 46
+#define OPK_S_NEW_TICKET 47
+#define OPK_C_SKIP_IF_UNBOUND 48
+#define OPK_S_SET_INJECT_DATAGRAM 49
+#define OPK_S_SHUTDOWN 50
+#define OPK_POP_ERR 51
+#define OPK_C_WRITE_EX2 52
+#define OPK_SKIP_IF_BLOCKING 53
+#define OPK_C_STREAM_RESET_FAIL 54
+
+#define EXPECT_CONN_CLOSE_APP (1U << 0)
+#define EXPECT_CONN_CLOSE_REMOTE (1U << 1)
 
 /* OPK_C_NEW_STREAM */
 #define ALLOW_FAIL (1U << 16)
@@ -206,136 +216,134 @@ struct script_op {
 
 #define ANY_ID UINT64_MAX
 
-#define OP_END  \
-    {OPK_END}
-#define OP_CHECK(func, arg2)  \
-    {OPK_CHECK, NULL, 0, (func), NULL, (arg2)},
+#define OP_END \
+    { OPK_END }
+#define OP_CHECK(func, arg2) \
+    { OPK_CHECK, NULL, 0, (func), NULL, (arg2) },
 #define OP_C_SET_ALPN(alpn) \
-    {OPK_C_SET_ALPN, (alpn), 0, NULL, NULL},
+    { OPK_C_SET_ALPN, (alpn), 0, NULL, NULL },
 #define OP_C_CONNECT_WAIT() \
-    {OPK_C_CONNECT_WAIT, NULL, 0, NULL, NULL},
+    { OPK_C_CONNECT_WAIT, NULL, 0, NULL, NULL },
 #define OP_C_CONNECT_WAIT_OR_FAIL() \
-    {OPK_C_CONNECT_WAIT, NULL, 1, NULL, NULL},
-#define OP_C_WRITE(stream_name, buf, buf_len)   \
-    {OPK_C_WRITE, (buf), (buf_len), NULL, #stream_name},
-#define OP_S_WRITE(stream_name, buf, buf_len)   \
-    {OPK_S_WRITE, (buf), (buf_len), NULL, #stream_name},
-#define OP_C_READ_EXPECT(stream_name, buf, buf_len)   \
-    {OPK_C_READ_EXPECT, (buf), (buf_len), NULL, #stream_name},
-#define OP_S_READ_EXPECT(stream_name, buf, buf_len)   \
-    {OPK_S_READ_EXPECT, (buf), (buf_len), NULL, #stream_name},
+    { OPK_C_CONNECT_WAIT, NULL, 1, NULL, NULL },
+#define OP_C_WRITE(stream_name, buf, buf_len) \
+    { OPK_C_WRITE, (buf), (buf_len), NULL, #stream_name },
+#define OP_S_WRITE(stream_name, buf, buf_len) \
+    { OPK_S_WRITE, (buf), (buf_len), NULL, #stream_name },
+#define OP_C_READ_EXPECT(stream_name, buf, buf_len) \
+    { OPK_C_READ_EXPECT, (buf), (buf_len), NULL, #stream_name },
+#define OP_S_READ_EXPECT(stream_name, buf, buf_len) \
+    { OPK_S_READ_EXPECT, (buf), (buf_len), NULL, #stream_name },
 #define OP_C_EXPECT_FIN(stream_name) \
-    {OPK_C_EXPECT_FIN, NULL, 0, NULL, #stream_name},
+    { OPK_C_EXPECT_FIN, NULL, 0, NULL, #stream_name },
 #define OP_S_EXPECT_FIN(stream_name) \
-    {OPK_S_EXPECT_FIN, NULL, 0, NULL, #stream_name},
+    { OPK_S_EXPECT_FIN, NULL, 0, NULL, #stream_name },
 #define OP_C_CONCLUDE(stream_name) \
-    {OPK_C_CONCLUDE, NULL, 0, NULL, #stream_name},
+    { OPK_C_CONCLUDE, NULL, 0, NULL, #stream_name },
 #define OP_S_CONCLUDE(stream_name) \
-    {OPK_S_CONCLUDE, NULL, 0, NULL, #stream_name},
+    { OPK_S_CONCLUDE, NULL, 0, NULL, #stream_name },
 #define OP_C_DETACH(stream_name) \
-    {OPK_C_DETACH, NULL, 0, NULL, #stream_name},
+    { OPK_C_DETACH, NULL, 0, NULL, #stream_name },
 #define OP_C_ATTACH(stream_name) \
-    {OPK_C_ATTACH, NULL, 0, NULL, #stream_name},
+    { OPK_C_ATTACH, NULL, 0, NULL, #stream_name },
 #define OP_C_NEW_STREAM_BIDI(stream_name, expect_id) \
-    {OPK_C_NEW_STREAM, NULL, 0, NULL, #stream_name, (expect_id)},
+    { OPK_C_NEW_STREAM, NULL, 0, NULL, #stream_name, (expect_id) },
 #define OP_C_NEW_STREAM_BIDI_EX(stream_name, expect_id, flags) \
-    {OPK_C_NEW_STREAM, NULL, (flags), NULL, #stream_name, (expect_id)},
+    { OPK_C_NEW_STREAM, NULL, (flags), NULL, #stream_name, (expect_id) },
 #define OP_C_NEW_STREAM_UNI(stream_name, expect_id) \
-    {OPK_C_NEW_STREAM, NULL, SSL_STREAM_FLAG_UNI, \
-     NULL, #stream_name, (expect_id)},
+    { OPK_C_NEW_STREAM, NULL, SSL_STREAM_FLAG_UNI,  \
+        NULL, #stream_name, (expect_id) },
 #define OP_C_NEW_STREAM_UNI_EX(stream_name, expect_id, flags) \
-    {OPK_C_NEW_STREAM, NULL, (flags) | SSL_STREAM_FLAG_UNI, \
-     NULL, #stream_name, (expect_id)},
+    { OPK_C_NEW_STREAM, NULL, (flags) | SSL_STREAM_FLAG_UNI,  \
+        NULL, #stream_name, (expect_id) },
 #define OP_S_NEW_STREAM_BIDI(stream_name, expect_id) \
-    {OPK_S_NEW_STREAM, NULL, 0, NULL, #stream_name, (expect_id)},
+    { OPK_S_NEW_STREAM, NULL, 0, NULL, #stream_name, (expect_id) },
 #define OP_S_NEW_STREAM_UNI(stream_name, expect_id) \
-    {OPK_S_NEW_STREAM, NULL, 1, NULL, #stream_name, (expect_id)},
+    { OPK_S_NEW_STREAM, NULL, 1, NULL, #stream_name, (expect_id) },
 #define OP_C_ACCEPT_STREAM_WAIT(stream_name) \
-    {OPK_C_ACCEPT_STREAM_WAIT, NULL, 0, NULL, #stream_name},
+    { OPK_C_ACCEPT_STREAM_WAIT, NULL, 0, NULL, #stream_name },
 #define OP_C_ACCEPT_STREAM_NONE() \
-    {OPK_C_ACCEPT_STREAM_NONE, NULL, 0, NULL, NULL},
+    { OPK_C_ACCEPT_STREAM_NONE, NULL, 0, NULL, NULL },
 #define OP_C_FREE_STREAM(stream_name) \
-    {OPK_C_FREE_STREAM, NULL, 0, NULL, #stream_name},
+    { OPK_C_FREE_STREAM, NULL, 0, NULL, #stream_name },
 #define OP_C_SET_DEFAULT_STREAM_MODE(mode) \
-    {OPK_C_SET_DEFAULT_STREAM_MODE, NULL, (mode), NULL, NULL},
+    { OPK_C_SET_DEFAULT_STREAM_MODE, NULL, (mode), NULL, NULL },
 #define OP_C_SET_INCOMING_STREAM_POLICY(policy) \
-    {OPK_C_SET_INCOMING_STREAM_POLICY, NULL, (policy), NULL, NULL},
+    { OPK_C_SET_INCOMING_STREAM_POLICY, NULL, (policy), NULL, NULL },
 #define OP_C_SHUTDOWN_WAIT(reason, flags) \
-    {OPK_C_SHUTDOWN_WAIT, (reason), (flags), NULL, NULL},
-#define OP_C_EXPECT_CONN_CLOSE_INFO(ec, app, remote)                \
-    {OPK_C_EXPECT_CONN_CLOSE_INFO, NULL,                            \
-        ((app) ? EXPECT_CONN_CLOSE_APP : 0) |                       \
-        ((remote) ? EXPECT_CONN_CLOSE_REMOTE : 0),                  \
-        NULL, NULL, (ec)},
-#define OP_S_EXPECT_CONN_CLOSE_INFO(ec, app, remote) \
-    {OPK_S_EXPECT_CONN_CLOSE_INFO, NULL,            \
-        ((app) ? EXPECT_CONN_CLOSE_APP : 0) |       \
-        ((remote) ? EXPECT_CONN_CLOSE_REMOTE : 0),  \
-        NULL, NULL, (ec)},
+    { OPK_C_SHUTDOWN_WAIT, (reason), (flags), NULL, NULL },
+#define OP_C_EXPECT_CONN_CLOSE_INFO(ec, app, remote)                                     \
+    { OPK_C_EXPECT_CONN_CLOSE_INFO, NULL,                                                \
+        ((app) ? EXPECT_CONN_CLOSE_APP : 0) | ((remote) ? EXPECT_CONN_CLOSE_REMOTE : 0), \
+        NULL, NULL, (ec) },
+#define OP_S_EXPECT_CONN_CLOSE_INFO(ec, app, remote)                                     \
+    { OPK_S_EXPECT_CONN_CLOSE_INFO, NULL,                                                \
+        ((app) ? EXPECT_CONN_CLOSE_APP : 0) | ((remote) ? EXPECT_CONN_CLOSE_REMOTE : 0), \
+        NULL, NULL, (ec) },
 #define OP_S_BIND_STREAM_ID(stream_name, stream_id) \
-    {OPK_S_BIND_STREAM_ID, NULL, 0, NULL, #stream_name, (stream_id)},
+    { OPK_S_BIND_STREAM_ID, NULL, 0, NULL, #stream_name, (stream_id) },
 #define OP_C_WAIT_FOR_DATA(stream_name) \
-    {OPK_C_WAIT_FOR_DATA, NULL, 0, NULL, #stream_name},
-#define OP_C_WRITE_FAIL(stream_name)  \
-    {OPK_C_WRITE_FAIL, NULL, 0, NULL, #stream_name},
-#define OP_S_WRITE_FAIL(stream_name)  \
-    {OPK_S_WRITE_FAIL, NULL, 0, NULL, #stream_name},
-#define OP_C_READ_FAIL(stream_name)  \
-    {OPK_C_READ_FAIL, NULL, 0, NULL, #stream_name},
-#define OP_S_READ_FAIL(stream_name, allow_zero_len)  \
-    {OPK_S_READ_FAIL, NULL, (allow_zero_len), NULL, #stream_name},
-#define OP_C_STREAM_RESET(stream_name, aec)  \
-    {OPK_C_STREAM_RESET, NULL, 0, NULL, #stream_name, (aec)},
-#define OP_C_STREAM_RESET_FAIL(stream_name, aec)  \
-    {OPK_C_STREAM_RESET_FAIL, NULL, 0, NULL, #stream_name, (aec)},
-#define OP_S_ACCEPT_STREAM_WAIT(stream_name)  \
-    {OPK_S_ACCEPT_STREAM_WAIT, NULL, 0, NULL, #stream_name},
+    { OPK_C_WAIT_FOR_DATA, NULL, 0, NULL, #stream_name },
+#define OP_C_WRITE_FAIL(stream_name) \
+    { OPK_C_WRITE_FAIL, NULL, 0, NULL, #stream_name },
+#define OP_S_WRITE_FAIL(stream_name) \
+    { OPK_S_WRITE_FAIL, NULL, 0, NULL, #stream_name },
+#define OP_C_READ_FAIL(stream_name) \
+    { OPK_C_READ_FAIL, NULL, 0, NULL, #stream_name },
+#define OP_S_READ_FAIL(stream_name, allow_zero_len) \
+    { OPK_S_READ_FAIL, NULL, (allow_zero_len), NULL, #stream_name },
+#define OP_C_STREAM_RESET(stream_name, aec) \
+    { OPK_C_STREAM_RESET, NULL, 0, NULL, #stream_name, (aec) },
+#define OP_C_STREAM_RESET_FAIL(stream_name, aec) \
+    { OPK_C_STREAM_RESET_FAIL, NULL, 0, NULL, #stream_name, (aec) },
+#define OP_S_ACCEPT_STREAM_WAIT(stream_name) \
+    { OPK_S_ACCEPT_STREAM_WAIT, NULL, 0, NULL, #stream_name },
 #define OP_NEW_THREAD(num_threads, script) \
-    {OPK_NEW_THREAD, (script), (num_threads), NULL, NULL, 0 },
-#define OP_BEGIN_REPEAT(n)  \
-    {OPK_BEGIN_REPEAT, NULL, (n)},
+    { OPK_NEW_THREAD, (script), (num_threads), NULL, NULL, 0 },
+#define OP_BEGIN_REPEAT(n) \
+    { OPK_BEGIN_REPEAT, NULL, (n) },
 #define OP_END_REPEAT() \
-    {OPK_END_REPEAT},
+    { OPK_END_REPEAT },
 #define OP_S_UNBIND_STREAM_ID(stream_name) \
-    {OPK_S_UNBIND_STREAM_ID, NULL, 0, NULL, #stream_name},
+    { OPK_S_UNBIND_STREAM_ID, NULL, 0, NULL, #stream_name },
 #define OP_C_READ_FAIL_WAIT(stream_name) \
-    {OPK_C_READ_FAIL_WAIT, NULL, 0, NULL, #stream_name},
+    { OPK_C_READ_FAIL_WAIT, NULL, 0, NULL, #stream_name },
 #define OP_C_CLOSE_SOCKET() \
-    {OPK_C_CLOSE_SOCKET},
+    { OPK_C_CLOSE_SOCKET },
 #define OP_C_EXPECT_SSL_ERR(stream_name, err) \
-    {OPK_C_EXPECT_SSL_ERR, NULL, (err), NULL, #stream_name},
+    { OPK_C_EXPECT_SSL_ERR, NULL, (err), NULL, #stream_name },
 #define OP_EXPECT_ERR_REASON(err) \
-    {OPK_EXPECT_ERR_REASON, NULL, (err)},
+    { OPK_EXPECT_ERR_REASON, NULL, (err) },
 #define OP_EXPECT_ERR_LIB(lib) \
-    {OPK_EXPECT_ERR_LIB, NULL, (lib)},
+    { OPK_EXPECT_ERR_LIB, NULL, (lib) },
 #define OP_SLEEP(ms) \
-    {OPK_SLEEP, NULL, 0, NULL, NULL, (ms)},
+    { OPK_SLEEP, NULL, 0, NULL, NULL, (ms) },
 #define OP_S_SET_INJECT_PLAIN(f) \
-    {OPK_S_SET_INJECT_PLAIN, NULL, 0, NULL, NULL, 0, (f)},
+    { OPK_S_SET_INJECT_PLAIN, NULL, 0, NULL, NULL, 0, (f) },
 #define OP_SET_INJECT_WORD(w0, w1) \
-    {OPK_SET_INJECT_WORD, NULL, (w0), NULL, NULL, (w1), NULL},
+    { OPK_SET_INJECT_WORD, NULL, (w0), NULL, NULL, (w1), NULL },
 #define OP_C_INHIBIT_TICK(inhibit) \
-    {OPK_C_INHIBIT_TICK, NULL, (inhibit), NULL, NULL, 0, NULL},
+    { OPK_C_INHIBIT_TICK, NULL, (inhibit), NULL, NULL, 0, NULL },
 #define OP_C_SET_WRITE_BUF_SIZE(stream_name, size) \
-    {OPK_C_SET_WRITE_BUF_SIZE, NULL, (size), NULL, #stream_name},
+    { OPK_C_SET_WRITE_BUF_SIZE, NULL, (size), NULL, #stream_name },
 #define OP_S_SET_INJECT_HANDSHAKE(f) \
-    {OPK_S_SET_INJECT_HANDSHAKE, NULL, 0, NULL, NULL, 0, NULL, (f)},
+    { OPK_S_SET_INJECT_HANDSHAKE, NULL, 0, NULL, NULL, 0, NULL, (f) },
 #define OP_S_NEW_TICKET() \
-    {OPK_S_NEW_TICKET},
+    { OPK_S_NEW_TICKET },
 #define OP_C_SKIP_IF_UNBOUND(stream_name, n) \
-    {OPK_C_SKIP_IF_UNBOUND, NULL, (n), NULL, #stream_name},
+    { OPK_C_SKIP_IF_UNBOUND, NULL, (n), NULL, #stream_name },
 #define OP_S_SET_INJECT_DATAGRAM(f) \
-    {OPK_S_SET_INJECT_DATAGRAM, NULL, 0, NULL, NULL, 0, NULL, NULL, (f)},
+    { OPK_S_SET_INJECT_DATAGRAM, NULL, 0, NULL, NULL, 0, NULL, NULL, (f) },
 #define OP_S_SHUTDOWN(error_code) \
-    {OPK_S_SHUTDOWN, NULL, (error_code)},
+    { OPK_S_SHUTDOWN, NULL, (error_code) },
 #define OP_POP_ERR() \
-    {OPK_POP_ERR},
+    { OPK_POP_ERR },
 #define OP_C_WRITE_EX2(stream_name, buf, buf_len, flags) \
-    {OPK_C_WRITE_EX2, (buf), (buf_len), NULL, #stream_name, (flags)},
+    { OPK_C_WRITE_EX2, (buf), (buf_len), NULL, #stream_name, (flags) },
 #define OP_CHECK2(func, arg1, arg2) \
-    {OPK_CHECK, NULL, (arg1), (func), NULL, (arg2)},
+    { OPK_CHECK, NULL, (arg1), (func), NULL, (arg2) },
 #define OP_SKIP_IF_BLOCKING(n) \
-    {OPK_SKIP_IF_BLOCKING, NULL, (n), NULL, 0},
+    { OPK_SKIP_IF_BLOCKING, NULL, (n), NULL, 0 },
 
 static OSSL_TIME get_time(void *arg)
 {
@@ -529,7 +537,7 @@ static int join_server_thread(struct helper *h)
 static int *s_checked_out_p(struct helper *h, int thread_idx)
 {
     return (thread_idx < 0) ? &h->s_checked_out
-        : &h->threads[thread_idx].s_checked_out;
+                            : &h->threads[thread_idx].s_checked_out;
 }
 
 static QUIC_TSERVER *s_lock(struct helper *h, struct helper_local *hl)
@@ -567,8 +575,8 @@ static unsigned int server_helper_thread(void *arg)
     for (;;) {
         int ready, stop;
 
-        ready   = h->server_thread.ready;
-        stop    = h->server_thread.stop;
+        ready = h->server_thread.ready;
+        stop = h->server_thread.stop;
 
         if (stop)
             break;
@@ -600,7 +608,8 @@ static QUIC_TSERVER *s_lock(struct helper *h, struct helper_local *hl)
 }
 
 static void s_unlock(struct helper *h, struct helper_local *hl)
-{}
+{
+}
 
 #endif
 
@@ -674,11 +683,11 @@ static void helper_cleanup(struct helper *h)
 }
 
 static int helper_init(struct helper *h, const char *script_name,
-                       int free_order, int blocking,
-                       int need_injector)
+    int free_order, int blocking,
+    int need_injector)
 {
-    struct in_addr ina = {0};
-    QUIC_TSERVER_ARGS s_args = {0};
+    struct in_addr ina = { 0 };
+    QUIC_TSERVER_ARGS s_args = { 0 };
     union BIO_sock_info_u info;
     char title[128];
     QTEST_DATA *bdata = NULL;
@@ -699,11 +708,11 @@ static int helper_init(struct helper *h, const char *script_name,
         goto err;
 
     if (!TEST_ptr(h->s_streams = lh_STREAM_INFO_new(stream_info_hash,
-                                                    stream_info_cmp)))
+                      stream_info_cmp)))
         goto err;
 
     if (!TEST_ptr(h->c_streams = lh_STREAM_INFO_new(stream_info_hash,
-                                                    stream_info_cmp)))
+                      stream_info_cmp)))
         goto err;
 
     ina.s_addr = htonl(0x7f000001UL);
@@ -720,7 +729,7 @@ static int helper_init(struct helper *h, const char *script_name,
         goto err;
 
     if (!TEST_true(BIO_ADDR_rawmake(h->s_net_bio_orig_addr, AF_INET,
-                                    &ina, sizeof(ina), 0)))
+            &ina, sizeof(ina), 0)))
         goto err;
 
     if (!TEST_true(BIO_bind(h->s_fd, h->s_net_bio_orig_addr, 0)))
@@ -733,7 +742,7 @@ static int helper_init(struct helper *h, const char *script_name,
     if (!TEST_int_gt(BIO_ADDR_rawport(h->s_net_bio_addr), 0))
         goto err;
 
-    if  (!TEST_ptr(h->s_net_bio = h->s_net_bio_own = BIO_new_dgram(h->s_fd, 0)))
+    if (!TEST_ptr(h->s_net_bio = h->s_net_bio_own = BIO_new_dgram(h->s_fd, 0)))
         goto err;
 
     if (!BIO_up_ref(h->s_net_bio))
@@ -752,11 +761,11 @@ static int helper_init(struct helper *h, const char *script_name,
         s_args.net_wbio = h->s_net_bio;
     }
 
-    s_args.net_rbio     = h->s_net_bio;
-    s_args.alpn         = NULL;
-    s_args.now_cb       = get_time;
-    s_args.now_cb_arg   = h;
-    s_args.ctx          = NULL;
+    s_args.net_rbio = h->s_net_bio;
+    s_args.alpn = NULL;
+    s_args.now_cb = get_time;
+    s_args.now_cb_arg = h;
+    s_args.ctx = NULL;
 
     if (!TEST_ptr(h->s_priv = ossl_quic_tserver_new(&s_args, certfile, keyfile)))
         goto err;
@@ -817,9 +826,9 @@ static int helper_init(struct helper *h, const char *script_name,
 
 #if defined(OPENSSL_THREADS)
     if (!TEST_ptr(h->misc_m = ossl_crypto_mutex_new()))
-      goto err;
+        goto err;
     if (!TEST_ptr(h->misc_cv = ossl_crypto_condvar_new()))
-      goto err;
+        goto err;
 #endif
 
     if (h->blocking) {
@@ -840,8 +849,8 @@ static int helper_init(struct helper *h, const char *script_name,
 #endif
     }
 
-    h->start_time   = ossl_time_now();
-    h->init         = 1;
+    h->start_time = ossl_time_now();
+    h->init = 1;
     return 1;
 
 err:
@@ -850,11 +859,11 @@ static int helper_init(struct helper *h, const char *script_name,
 }
 
 static int helper_local_init(struct helper_local *hl, struct helper *h,
-                             int thread_idx)
+    int thread_idx)
 {
-    hl->h                       = h;
-    hl->c_streams               = NULL;
-    hl->thread_idx              = thread_idx;
+    hl->h = h;
+    hl->c_streams = NULL;
+    hl->thread_idx = thread_idx;
     hl->explicit_event_handling = 0;
 
     if (!TEST_ptr(h))
@@ -864,7 +873,7 @@ static int helper_local_init(struct helper_local *hl, struct helper *h,
         hl->c_streams = h->c_streams;
     } else {
         if (!TEST_ptr(hl->c_streams = lh_STREAM_INFO_new(stream_info_hash,
-                                                         stream_info_cmp)))
+                          stream_info_cmp)))
             return 0;
     }
 
@@ -883,7 +892,7 @@ static void helper_local_cleanup(struct helper_local *hl)
 }
 
 static STREAM_INFO *get_stream_info(LHASH_OF(STREAM_INFO) *lh,
-                                    const char *stream_name)
+    const char *stream_name)
 {
     STREAM_INFO key, *info;
 
@@ -900,8 +909,8 @@ static STREAM_INFO *get_stream_info(LHASH_OF(STREAM_INFO) *lh,
         if (info == NULL)
             return NULL;
 
-        info->name          = stream_name;
-        info->s_stream_id   = UINT64_MAX;
+        info->name = stream_name;
+        info->s_stream_id = UINT64_MAX;
         lh_STREAM_INFO_insert(lh, info);
     }
 
@@ -909,21 +918,21 @@ static STREAM_INFO *get_stream_info(LHASH_OF(STREAM_INFO) *lh,
 }
 
 static int helper_local_set_c_stream(struct helper_local *hl,
-                                     const char *stream_name,
-                                     SSL *c_stream)
+    const char *stream_name,
+    SSL *c_stream)
 {
     STREAM_INFO *info = get_stream_info(hl->c_streams, stream_name);
 
     if (info == NULL)
         return 0;
 
-    info->c_stream      = c_stream;
-    info->s_stream_id   = UINT64_MAX;
+    info->c_stream = c_stream;
+    info->s_stream_id = UINT64_MAX;
     return 1;
 }
 
 static SSL *helper_local_get_c_stream(struct helper_local *hl,
-                                      const char *stream_name)
+    const char *stream_name)
 {
     STREAM_INFO *info;
 
@@ -939,7 +948,7 @@ static SSL *helper_local_get_c_stream(struct helper_local *hl,
 
 static int
 helper_set_s_stream(struct helper *h, const char *stream_name,
-                    uint64_t s_stream_id)
+    uint64_t s_stream_id)
 {
     STREAM_INFO *info;
 
@@ -950,8 +959,8 @@ helper_set_s_stream(struct helper *h, const char *stream_name,
     if (info == NULL)
         return 0;
 
-    info->c_stream      = NULL;
-    info->s_stream_id   = s_stream_id;
+    info->c_stream = NULL;
+    info->s_stream_id = s_stream_id;
     return 1;
 }
 
@@ -970,8 +979,8 @@ static uint64_t helper_get_s_stream(struct helper *h, const char *stream_name)
 }
 
 static int helper_packet_plain_listener(QTEST_FAULT *qtf, QUIC_PKT_HDR *hdr,
-                                        unsigned char *buf, size_t buf_len,
-                                        void *arg)
+    unsigned char *buf, size_t buf_len,
+    void *arg)
 {
     struct helper *h = arg;
 
@@ -979,8 +988,8 @@ static int helper_packet_plain_listener(QTEST_FAULT *qtf, QUIC_PKT_HDR *hdr,
 }
 
 static int helper_handshake_listener(QTEST_FAULT *fault,
-                                     unsigned char *buf, size_t buf_len,
-                                     void *arg)
+    unsigned char *buf, size_t buf_len,
+    void *arg)
 {
     struct helper *h = arg;
 
@@ -988,8 +997,8 @@ static int helper_handshake_listener(QTEST_FAULT *fault,
 }
 
 static int helper_datagram_listener(QTEST_FAULT *fault,
-                                    BIO_MSG *msg, size_t stride,
-                                    void *arg)
+    BIO_MSG *msg, size_t stride,
+    void *arg)
 {
     struct helper *h = arg;
 
@@ -1009,16 +1018,15 @@ static int check_consistent_want(SSL *s, int ret)
     int w = SSL_want(s);
 
     int ok = TEST_true(
-        (ec == SSL_ERROR_NONE                 && w == SSL_NOTHING)
-    ||  (ec == SSL_ERROR_ZERO_RETURN          && w == SSL_NOTHING)
-    ||  (ec == SSL_ERROR_SSL                  && w == SSL_NOTHING)
-    ||  (ec == SSL_ERROR_SYSCALL              && w == SSL_NOTHING)
-    ||  (ec == SSL_ERROR_WANT_READ            && w == SSL_READING)
-    ||  (ec == SSL_ERROR_WANT_WRITE           && w == SSL_WRITING)
-    ||  (ec == SSL_ERROR_WANT_CLIENT_HELLO_CB && w == SSL_CLIENT_HELLO_CB)
-    ||  (ec == SSL_ERROR_WANT_X509_LOOKUP     && w == SSL_X509_LOOKUP)
-    ||  (ec == SSL_ERROR_WANT_RETRY_VERIFY    && w == SSL_RETRY_VERIFY)
-    );
+        (ec == SSL_ERROR_NONE && w == SSL_NOTHING)
+        || (ec == SSL_ERROR_ZERO_RETURN && w == SSL_NOTHING)
+        || (ec == SSL_ERROR_SSL && w == SSL_NOTHING)
+        || (ec == SSL_ERROR_SYSCALL && w == SSL_NOTHING)
+        || (ec == SSL_ERROR_WANT_READ && w == SSL_READING)
+        || (ec == SSL_ERROR_WANT_WRITE && w == SSL_WRITING)
+        || (ec == SSL_ERROR_WANT_CLIENT_HELLO_CB && w == SSL_CLIENT_HELLO_CB)
+        || (ec == SSL_ERROR_WANT_X509_LOOKUP && w == SSL_X509_LOOKUP)
+        || (ec == SSL_ERROR_WANT_RETRY_VERIFY && w == SSL_RETRY_VERIFY));
 
     if (!ok)
         TEST_error("got error=%d, want=%d", ec, w);
@@ -1027,8 +1035,8 @@ static int check_consistent_want(SSL *s, int ret)
 }
 
 static int run_script_worker(struct helper *h, const struct script_op *script,
-                             const char *script_name,
-                             int thread_idx)
+    const char *script_name,
+    int thread_idx)
 {
     int testresult = 0;
     unsigned char *tmp_buf = NULL;
@@ -1050,29 +1058,29 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
     if (!TEST_true(helper_local_init(hl, h, thread_idx)))
         goto out;
 
-#define COMMON_SPIN_AGAIN()                             \
-    {                                                   \
-        no_advance = 1;                                 \
-        continue;                                       \
+#define COMMON_SPIN_AGAIN() \
+    {                       \
+        no_advance = 1;     \
+        continue;           \
     }
-#define S_SPIN_AGAIN()                                  \
-    {                                                   \
-        s_lock(h, hl);                                  \
-        ossl_quic_tserver_tick(h->s);                   \
-        COMMON_SPIN_AGAIN();                            \
+#define S_SPIN_AGAIN()                \
+    {                                 \
+        s_lock(h, hl);                \
+        ossl_quic_tserver_tick(h->s); \
+        COMMON_SPIN_AGAIN();          \
     }
-#define C_SPIN_AGAIN()                                  \
-    {                                                   \
-        if (h->blocking) {                              \
-            TEST_error("spin again in blocking mode");  \
-            goto out;                                   \
-        }                                               \
-        COMMON_SPIN_AGAIN();                            \
+#define C_SPIN_AGAIN()                                 \
+    {                                                  \
+        if (h->blocking) {                             \
+            TEST_error("spin again in blocking mode"); \
+            goto out;                                  \
+        }                                              \
+        COMMON_SPIN_AGAIN();                           \
     }
 
     for (;;) {
-        SSL *c_tgt              = h->c_conn;
-        uint64_t s_stream_id    = UINT64_MAX;
+        SSL *c_tgt = h->c_conn;
+        uint64_t s_stream_id = UINT64_MAX;
 
         s_unlock(h, hl);
 
@@ -1082,10 +1090,10 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
             if (!first)
                 ++op_idx;
 
-            first           = 0;
-            offset          = 0;
-            op_start_time   = ossl_time_now();
-            op_deadline     = ossl_time_add(op_start_time, ossl_ms2time(60000));
+            first = 0;
+            offset = 0;
+            op_start_time = ossl_time_now();
+            op_deadline = ossl_time_add(op_start_time, ossl_ms2time(60000));
         }
 
         if (!TEST_int_le(ossl_time_compare(ossl_time_now(), op_deadline), 0)) {
@@ -1126,30 +1134,30 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
         if (thread_idx >= 0) {
             /* Only allow certain opcodes on child threads. */
             switch (op->op) {
-                case OPK_END:
-                case OPK_CHECK:
-                case OPK_C_ACCEPT_STREAM_WAIT:
-                case OPK_C_NEW_STREAM:
-                case OPK_C_READ_EXPECT:
-                case OPK_C_EXPECT_FIN:
-                case OPK_C_WRITE:
-                case OPK_C_WRITE_EX2:
-                case OPK_C_CONCLUDE:
-                case OPK_C_FREE_STREAM:
-                case OPK_BEGIN_REPEAT:
-                case OPK_END_REPEAT:
-                case OPK_C_READ_FAIL_WAIT:
-                case OPK_C_EXPECT_SSL_ERR:
-                case OPK_EXPECT_ERR_REASON:
-                case OPK_EXPECT_ERR_LIB:
-                case OPK_POP_ERR:
-                case OPK_SLEEP:
-                    break;
-
-                default:
-                    TEST_error("opcode %lu not allowed on child thread",
-                               (unsigned long)op->op);
-                    goto out;
+            case OPK_END:
+            case OPK_CHECK:
+            case OPK_C_ACCEPT_STREAM_WAIT:
+            case OPK_C_NEW_STREAM:
+            case OPK_C_READ_EXPECT:
+            case OPK_C_EXPECT_FIN:
+            case OPK_C_WRITE:
+            case OPK_C_WRITE_EX2:
+            case OPK_C_CONCLUDE:
+            case OPK_C_FREE_STREAM:
+            case OPK_BEGIN_REPEAT:
+            case OPK_END_REPEAT:
+            case OPK_C_READ_FAIL_WAIT:
+            case OPK_C_EXPECT_SSL_ERR:
+            case OPK_EXPECT_ERR_REASON:
+            case OPK_EXPECT_ERR_LIB:
+            case OPK_POP_ERR:
+            case OPK_SLEEP:
+                break;
+
+            default:
+                TEST_error("opcode %lu not allowed on child thread",
+                    (unsigned long)op->op);
+                goto out;
             }
         }
 
@@ -1229,724 +1237,643 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
 
             break;
 
-        case OPK_CHECK:
-            {
-                int ok;
+        case OPK_CHECK: {
+            int ok;
 
-                hl->check_op = op;
-                ok = op->check_func(h, hl);
-                hl->check_op = NULL;
+            hl->check_op = op;
+            ok = op->check_func(h, hl);
+            hl->check_op = NULL;
 
-                if (thread_idx < 0 && h->check_spin_again) {
-                    h->check_spin_again = 0;
-                    S_SPIN_AGAIN();
-                }
-
-                if (!TEST_true(ok))
-                    goto out;
+            if (thread_idx < 0 && h->check_spin_again) {
+                h->check_spin_again = 0;
+                S_SPIN_AGAIN();
             }
-            break;
-
-        case OPK_C_SET_ALPN:
-            {
-                const char *alpn = op->arg0;
-                size_t alpn_len = strlen(alpn);
 
-                if (!TEST_size_t_le(alpn_len, UINT8_MAX)
-                    || !TEST_ptr(tmp_buf = (unsigned char *)OPENSSL_malloc(alpn_len + 1)))
-                    goto out;
-
-                memcpy(tmp_buf + 1, alpn, alpn_len);
-                tmp_buf[0] = (unsigned char)alpn_len;
+            if (!TEST_true(ok))
+                goto out;
+        } break;
 
-                /* 0 is the success case for SSL_set_alpn_protos(). */
-                if (!TEST_false(SSL_set_alpn_protos(h->c_conn, tmp_buf,
-                                                    alpn_len + 1)))
-                    goto out;
+        case OPK_C_SET_ALPN: {
+            const char *alpn = op->arg0;
+            size_t alpn_len = strlen(alpn);
 
-                OPENSSL_free(tmp_buf);
-                tmp_buf = NULL;
-            }
-            break;
+            if (!TEST_size_t_le(alpn_len, UINT8_MAX)
+                || !TEST_ptr(tmp_buf = (unsigned char *)OPENSSL_malloc(alpn_len + 1)))
+                goto out;
 
-        case OPK_C_CONNECT_WAIT:
-            {
-                int ret;
+            memcpy(tmp_buf + 1, alpn, alpn_len);
+            tmp_buf[0] = (unsigned char)alpn_len;
 
-                connect_started = 1;
+            /* 0 is the success case for SSL_set_alpn_protos(). */
+            if (!TEST_false(SSL_set_alpn_protos(h->c_conn, tmp_buf,
+                    alpn_len + 1)))
+                goto out;
 
-                ret = SSL_connect(h->c_conn);
-                if (!check_consistent_want(c_tgt, ret))
-                    goto out;
-                if (ret != 1) {
-                    if (!h->blocking && is_want(h->c_conn, ret))
-                        C_SPIN_AGAIN();
+            OPENSSL_free(tmp_buf);
+            tmp_buf = NULL;
+        } break;
 
-                    if (op->arg1 == 0 && !TEST_int_eq(ret, 1))
-                        goto out;
-                }
-            }
-            break;
+        case OPK_C_CONNECT_WAIT: {
+            int ret;
 
-        case OPK_C_WRITE:
-            {
-                size_t bytes_written = 0;
-                int r;
+            connect_started = 1;
 
-                if (!TEST_ptr(c_tgt))
-                    goto out;
+            ret = SSL_connect(h->c_conn);
+            if (!check_consistent_want(c_tgt, ret))
+                goto out;
+            if (ret != 1) {
+                if (!h->blocking && is_want(h->c_conn, ret))
+                    C_SPIN_AGAIN();
 
-                r = SSL_write_ex(c_tgt, op->arg0, op->arg1, &bytes_written);
-                if (!TEST_true(r)
-                    || !check_consistent_want(c_tgt, r)
-                    || !TEST_size_t_eq(bytes_written, op->arg1))
+                if (op->arg1 == 0 && !TEST_int_eq(ret, 1))
                     goto out;
             }
-            break;
+        } break;
 
-        case OPK_C_WRITE_EX2:
-            {
-                size_t bytes_written = 0;
-                int r;
+        case OPK_C_WRITE: {
+            size_t bytes_written = 0;
+            int r;
 
-                if (!TEST_ptr(c_tgt))
-                    goto out;
+            if (!TEST_ptr(c_tgt))
+                goto out;
 
-                r = SSL_write_ex2(c_tgt, op->arg0, op->arg1, op->arg2,
-                                  &bytes_written);
-                if (!TEST_true(r)
-                    || !check_consistent_want(c_tgt, r)
-                    || !TEST_size_t_eq(bytes_written, op->arg1))
-                    goto out;
-            }
-            break;
+            r = SSL_write_ex(c_tgt, op->arg0, op->arg1, &bytes_written);
+            if (!TEST_true(r)
+                || !check_consistent_want(c_tgt, r)
+                || !TEST_size_t_eq(bytes_written, op->arg1))
+                goto out;
+        } break;
 
-        case OPK_S_WRITE:
-            {
-                size_t bytes_written = 0;
+        case OPK_C_WRITE_EX2: {
+            size_t bytes_written = 0;
+            int r;
 
-                if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
-                    goto out;
+            if (!TEST_ptr(c_tgt))
+                goto out;
 
-                if (!TEST_true(ossl_quic_tserver_write(ACQUIRE_S(), s_stream_id,
-                                                       op->arg0, op->arg1,
-                                                       &bytes_written))
-                    || !TEST_size_t_eq(bytes_written, op->arg1))
-                    goto out;
-            }
-            break;
+            r = SSL_write_ex2(c_tgt, op->arg0, op->arg1, op->arg2,
+                &bytes_written);
+            if (!TEST_true(r)
+                || !check_consistent_want(c_tgt, r)
+                || !TEST_size_t_eq(bytes_written, op->arg1))
+                goto out;
+        } break;
 
-        case OPK_C_CONCLUDE:
-            {
-                if (!TEST_true(SSL_stream_conclude(c_tgt, 0)))
-                    goto out;
-            }
-            break;
+        case OPK_S_WRITE: {
+            size_t bytes_written = 0;
 
-        case OPK_S_CONCLUDE:
-            {
-                if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
-                    goto out;
+            if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
+                goto out;
 
-                ossl_quic_tserver_conclude(ACQUIRE_S(), s_stream_id);
-            }
-            break;
+            if (!TEST_true(ossl_quic_tserver_write(ACQUIRE_S(), s_stream_id,
+                    op->arg0, op->arg1,
+                    &bytes_written))
+                || !TEST_size_t_eq(bytes_written, op->arg1))
+                goto out;
+        } break;
 
-        case OPK_C_WAIT_FOR_DATA:
-            {
-                char buf[1];
-                size_t bytes_read = 0;
+        case OPK_C_CONCLUDE: {
+            if (!TEST_true(SSL_stream_conclude(c_tgt, 0)))
+                goto out;
+        } break;
 
-                if (!TEST_ptr(c_tgt))
-                    goto out;
+        case OPK_S_CONCLUDE: {
+            if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
+                goto out;
 
-                if (!SSL_peek_ex(c_tgt, buf, sizeof(buf), &bytes_read)
-                    || bytes_read == 0)
-                    C_SPIN_AGAIN();
-            }
-            break;
+            ossl_quic_tserver_conclude(ACQUIRE_S(), s_stream_id);
+        } break;
 
-        case OPK_C_READ_EXPECT:
-            {
-                size_t bytes_read = 0;
-                int r;
+        case OPK_C_WAIT_FOR_DATA: {
+            char buf[1];
+            size_t bytes_read = 0;
 
-                if (op->arg1 > 0 && tmp_buf == NULL
-                    && !TEST_ptr(tmp_buf = OPENSSL_malloc(op->arg1)))
-                    goto out;
+            if (!TEST_ptr(c_tgt))
+                goto out;
 
-                r = SSL_read_ex(c_tgt, tmp_buf + offset, op->arg1 - offset,
-                                &bytes_read);
-                if (!check_consistent_want(c_tgt, r))
-                    goto out;
+            if (!SSL_peek_ex(c_tgt, buf, sizeof(buf), &bytes_read)
+                || bytes_read == 0)
+                C_SPIN_AGAIN();
+        } break;
 
-                if (!r)
-                    C_SPIN_AGAIN();
+        case OPK_C_READ_EXPECT: {
+            size_t bytes_read = 0;
+            int r;
 
-                if (bytes_read + offset != op->arg1) {
-                    offset += bytes_read;
-                    C_SPIN_AGAIN();
-                }
+            if (op->arg1 > 0 && tmp_buf == NULL
+                && !TEST_ptr(tmp_buf = OPENSSL_malloc(op->arg1)))
+                goto out;
 
-                if (op->arg1 > 0
-                    && !TEST_mem_eq(tmp_buf, op->arg1, op->arg0, op->arg1))
-                    goto out;
+            r = SSL_read_ex(c_tgt, tmp_buf + offset, op->arg1 - offset,
+                &bytes_read);
+            if (!check_consistent_want(c_tgt, r))
+                goto out;
+
+            if (!r)
+                C_SPIN_AGAIN();
 
-                OPENSSL_free(tmp_buf);
-                tmp_buf = NULL;
+            if (bytes_read + offset != op->arg1) {
+                offset += bytes_read;
+                C_SPIN_AGAIN();
             }
-            break;
 
-        case OPK_S_READ_EXPECT:
-            {
-                size_t bytes_read = 0;
+            if (op->arg1 > 0
+                && !TEST_mem_eq(tmp_buf, op->arg1, op->arg0, op->arg1))
+                goto out;
 
-                if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
-                    goto out;
+            OPENSSL_free(tmp_buf);
+            tmp_buf = NULL;
+        } break;
 
-                if (op->arg1 > 0 && tmp_buf == NULL
-                    && !TEST_ptr(tmp_buf = OPENSSL_malloc(op->arg1)))
-                    goto out;
+        case OPK_S_READ_EXPECT: {
+            size_t bytes_read = 0;
 
-                if (!TEST_true(ossl_quic_tserver_read(ACQUIRE_S(), s_stream_id,
-                                                      tmp_buf + offset,
-                                                      op->arg1 - offset,
-                                                      &bytes_read)))
-                    goto out;
+            if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
+                goto out;
 
-                if (bytes_read + offset != op->arg1) {
-                    offset += bytes_read;
-                    S_SPIN_AGAIN();
-                }
+            if (op->arg1 > 0 && tmp_buf == NULL
+                && !TEST_ptr(tmp_buf = OPENSSL_malloc(op->arg1)))
+                goto out;
 
-                if (op->arg1 > 0
-                    && !TEST_mem_eq(tmp_buf, op->arg1, op->arg0, op->arg1))
-                    goto out;
+            if (!TEST_true(ossl_quic_tserver_read(ACQUIRE_S(), s_stream_id,
+                    tmp_buf + offset,
+                    op->arg1 - offset,
+                    &bytes_read)))
+                goto out;
 
-                OPENSSL_free(tmp_buf);
-                tmp_buf = NULL;
+            if (bytes_read + offset != op->arg1) {
+                offset += bytes_read;
+                S_SPIN_AGAIN();
             }
-            break;
 
-        case OPK_C_EXPECT_FIN:
-            {
-                char buf[1];
-                size_t bytes_read = 0;
-                int r;
+            if (op->arg1 > 0
+                && !TEST_mem_eq(tmp_buf, op->arg1, op->arg0, op->arg1))
+                goto out;
 
-                r = SSL_read_ex(c_tgt, buf, sizeof(buf), &bytes_read);
-                if (!check_consistent_want(c_tgt, r)
-                    || !TEST_false(r)
-                    || !TEST_size_t_eq(bytes_read, 0))
-                    goto out;
+            OPENSSL_free(tmp_buf);
+            tmp_buf = NULL;
+        } break;
 
-                if (is_want(c_tgt, 0))
-                    C_SPIN_AGAIN();
+        case OPK_C_EXPECT_FIN: {
+            char buf[1];
+            size_t bytes_read = 0;
+            int r;
 
-                if (!TEST_int_eq(SSL_get_error(c_tgt, 0),
-                                 SSL_ERROR_ZERO_RETURN))
-                    goto out;
+            r = SSL_read_ex(c_tgt, buf, sizeof(buf), &bytes_read);
+            if (!check_consistent_want(c_tgt, r)
+                || !TEST_false(r)
+                || !TEST_size_t_eq(bytes_read, 0))
+                goto out;
 
-                if (!TEST_int_eq(SSL_want(c_tgt), SSL_NOTHING))
-                    goto out;
-            }
-            break;
+            if (is_want(c_tgt, 0))
+                C_SPIN_AGAIN();
 
-        case OPK_S_EXPECT_FIN:
-            {
-                if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
-                    goto out;
+            if (!TEST_int_eq(SSL_get_error(c_tgt, 0),
+                    SSL_ERROR_ZERO_RETURN))
+                goto out;
 
-                if (!ossl_quic_tserver_has_read_ended(ACQUIRE_S(), s_stream_id))
-                    S_SPIN_AGAIN();
-            }
-            break;
+            if (!TEST_int_eq(SSL_want(c_tgt), SSL_NOTHING))
+                goto out;
+        } break;
 
-        case OPK_C_DETACH:
-            {
-                SSL *c_stream;
+        case OPK_S_EXPECT_FIN: {
+            if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
+                goto out;
 
-                if (!TEST_ptr_null(c_tgt))
-                    goto out; /* don't overwrite existing stream with same name */
+            if (!ossl_quic_tserver_has_read_ended(ACQUIRE_S(), s_stream_id))
+                S_SPIN_AGAIN();
+        } break;
 
-                if (!TEST_ptr(op->stream_name))
-                    goto out;
+        case OPK_C_DETACH: {
+            SSL *c_stream;
 
-                if (!TEST_ptr(c_stream = ossl_quic_detach_stream(h->c_conn)))
-                    goto out;
+            if (!TEST_ptr_null(c_tgt))
+                goto out; /* don't overwrite existing stream with same name */
 
-                if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name, c_stream)))
-                    goto out;
-            }
-            break;
+            if (!TEST_ptr(op->stream_name))
+                goto out;
 
-        case OPK_C_ATTACH:
-            {
-                if (!TEST_ptr(c_tgt))
-                    goto out;
+            if (!TEST_ptr(c_stream = ossl_quic_detach_stream(h->c_conn)))
+                goto out;
 
-                if (!TEST_ptr(op->stream_name))
-                    goto out;
+            if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name, c_stream)))
+                goto out;
+        } break;
 
-                if (!TEST_true(ossl_quic_attach_stream(h->c_conn, c_tgt)))
-                    goto out;
+        case OPK_C_ATTACH: {
+            if (!TEST_ptr(c_tgt))
+                goto out;
 
-                if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name, NULL)))
-                    goto out;
-            }
-            break;
+            if (!TEST_ptr(op->stream_name))
+                goto out;
 
-        case OPK_C_NEW_STREAM:
-            {
-                SSL *c_stream;
-                uint64_t flags = op->arg1;
-                int allow_fail = ((flags & ALLOW_FAIL) != 0);
+            if (!TEST_true(ossl_quic_attach_stream(h->c_conn, c_tgt)))
+                goto out;
 
-                flags &= ~(uint64_t)ALLOW_FAIL;
+            if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name, NULL)))
+                goto out;
+        } break;
 
-                if (!TEST_ptr_null(c_tgt))
-                    goto out; /* don't overwrite existing stream with same name */
+        case OPK_C_NEW_STREAM: {
+            SSL *c_stream;
+            uint64_t flags = op->arg1;
+            int allow_fail = ((flags & ALLOW_FAIL) != 0);
 
-                if (!TEST_ptr(op->stream_name))
-                    goto out;
+            flags &= ~(uint64_t)ALLOW_FAIL;
 
-                c_stream = SSL_new_stream(h->c_conn, flags);
-                if (!allow_fail && !TEST_ptr(c_stream))
-                    goto out;
+            if (!TEST_ptr_null(c_tgt))
+                goto out; /* don't overwrite existing stream with same name */
 
-                if (allow_fail && c_stream == NULL) {
-                    if (!TEST_size_t_eq(ERR_GET_REASON(ERR_get_error()),
-                                        SSL_R_STREAM_COUNT_LIMITED))
-                        goto out;
+            if (!TEST_ptr(op->stream_name))
+                goto out;
 
-                    ++h->fail_count;
-                    break;
-                }
+            c_stream = SSL_new_stream(h->c_conn, flags);
+            if (!allow_fail && !TEST_ptr(c_stream))
+                goto out;
 
-                if (op->arg2 != UINT64_MAX
-                    && !TEST_uint64_t_eq(SSL_get_stream_id(c_stream),
-                                         op->arg2))
+            if (allow_fail && c_stream == NULL) {
+                if (!TEST_size_t_eq(ERR_GET_REASON(ERR_get_error()),
+                        SSL_R_STREAM_COUNT_LIMITED))
                     goto out;
 
-                if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name, c_stream)))
-                    goto out;
+                ++h->fail_count;
+                break;
             }
-            break;
 
-        case OPK_S_NEW_STREAM:
-            {
-                uint64_t stream_id = UINT64_MAX;
+            if (op->arg2 != UINT64_MAX
+                && !TEST_uint64_t_eq(SSL_get_stream_id(c_stream),
+                    op->arg2))
+                goto out;
 
-                if (!TEST_uint64_t_eq(s_stream_id, UINT64_MAX))
-                    goto out; /* don't overwrite existing stream with same name */
+            if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name, c_stream)))
+                goto out;
+        } break;
 
-                if (!TEST_ptr(op->stream_name))
-                    goto out;
+        case OPK_S_NEW_STREAM: {
+            uint64_t stream_id = UINT64_MAX;
 
-                if (!TEST_true(ossl_quic_tserver_stream_new(ACQUIRE_S(),
-                                                            op->arg1 > 0,
-                                                            &stream_id)))
-                    goto out;
+            if (!TEST_uint64_t_eq(s_stream_id, UINT64_MAX))
+                goto out; /* don't overwrite existing stream with same name */
 
-                if (op->arg2 != UINT64_MAX
-                    && !TEST_uint64_t_eq(stream_id, op->arg2))
-                    goto out;
+            if (!TEST_ptr(op->stream_name))
+                goto out;
 
-                if (!TEST_true(helper_set_s_stream(h, op->stream_name,
-                                                   stream_id)))
-                    goto out;
-            }
-            break;
+            if (!TEST_true(ossl_quic_tserver_stream_new(ACQUIRE_S(),
+                    op->arg1 > 0,
+                    &stream_id)))
+                goto out;
 
-        case OPK_C_ACCEPT_STREAM_WAIT:
-            {
-                SSL *c_stream;
+            if (op->arg2 != UINT64_MAX
+                && !TEST_uint64_t_eq(stream_id, op->arg2))
+                goto out;
 
-                if (!TEST_ptr_null(c_tgt))
-                    goto out; /* don't overwrite existing stream with same name */
+            if (!TEST_true(helper_set_s_stream(h, op->stream_name,
+                    stream_id)))
+                goto out;
+        } break;
 
-                if (!TEST_ptr(op->stream_name))
-                    goto out;
+        case OPK_C_ACCEPT_STREAM_WAIT: {
+            SSL *c_stream;
 
-                if ((c_stream = SSL_accept_stream(h->c_conn, 0)) == NULL)
-                    C_SPIN_AGAIN();
+            if (!TEST_ptr_null(c_tgt))
+                goto out; /* don't overwrite existing stream with same name */
 
-                if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name,
-                                                          c_stream)))
-                    goto out;
-            }
-            break;
+            if (!TEST_ptr(op->stream_name))
+                goto out;
 
-        case OPK_S_ACCEPT_STREAM_WAIT:
-            {
-                uint64_t new_stream_id;
+            if ((c_stream = SSL_accept_stream(h->c_conn, 0)) == NULL)
+                C_SPIN_AGAIN();
 
-                if (!TEST_uint64_t_eq(s_stream_id, UINT64_MAX))
-                    goto out;
+            if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name,
+                    c_stream)))
+                goto out;
+        } break;
 
-                if (!TEST_ptr(op->stream_name))
-                    goto out;
+        case OPK_S_ACCEPT_STREAM_WAIT: {
+            uint64_t new_stream_id;
 
-                new_stream_id = ossl_quic_tserver_pop_incoming_stream(ACQUIRE_S());
-                if (new_stream_id == UINT64_MAX)
-                    S_SPIN_AGAIN();
+            if (!TEST_uint64_t_eq(s_stream_id, UINT64_MAX))
+                goto out;
 
-                if (!TEST_true(helper_set_s_stream(h, op->stream_name, new_stream_id)))
-                    goto out;
-            }
-            break;
+            if (!TEST_ptr(op->stream_name))
+                goto out;
 
-        case OPK_C_ACCEPT_STREAM_NONE:
-            {
-                SSL *c_stream;
+            new_stream_id = ossl_quic_tserver_pop_incoming_stream(ACQUIRE_S());
+            if (new_stream_id == UINT64_MAX)
+                S_SPIN_AGAIN();
 
-                if (!TEST_ptr_null(c_stream = SSL_accept_stream(h->c_conn,
-                                                                SSL_ACCEPT_STREAM_NO_BLOCK))) {
-                    SSL_free(c_stream);
-                    goto out;
-                }
-            }
-            break;
+            if (!TEST_true(helper_set_s_stream(h, op->stream_name, new_stream_id)))
+                goto out;
+        } break;
 
-        case OPK_C_FREE_STREAM:
-            {
-                if (!TEST_ptr(c_tgt)
-                    || !TEST_true(!SSL_is_connection(c_tgt)))
-                    goto out;
+        case OPK_C_ACCEPT_STREAM_NONE: {
+            SSL *c_stream;
 
-                if (!TEST_ptr(op->stream_name))
-                    goto out;
+            if (!TEST_ptr_null(c_stream = SSL_accept_stream(h->c_conn,
+                                   SSL_ACCEPT_STREAM_NO_BLOCK))) {
+                SSL_free(c_stream);
+                goto out;
+            }
+        } break;
 
-                if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name, NULL)))
-                    goto out;
+        case OPK_C_FREE_STREAM: {
+            if (!TEST_ptr(c_tgt)
+                || !TEST_true(!SSL_is_connection(c_tgt)))
+                goto out;
 
-                SSL_free(c_tgt);
-                c_tgt = NULL;
-            }
-            break;
+            if (!TEST_ptr(op->stream_name))
+                goto out;
 
-        case OPK_C_SET_DEFAULT_STREAM_MODE:
-            {
-                if (!TEST_ptr(c_tgt))
-                    goto out;
+            if (!TEST_true(helper_local_set_c_stream(hl, op->stream_name, NULL)))
+                goto out;
 
-                if (!TEST_true(SSL_set_default_stream_mode(c_tgt, op->arg1)))
-                    goto out;
-            }
-            break;
+            SSL_free(c_tgt);
+            c_tgt = NULL;
+        } break;
 
-        case OPK_C_SET_INCOMING_STREAM_POLICY:
-            {
-                if (!TEST_ptr(c_tgt))
-                    goto out;
+        case OPK_C_SET_DEFAULT_STREAM_MODE: {
+            if (!TEST_ptr(c_tgt))
+                goto out;
 
-                if (!TEST_true(SSL_set_incoming_stream_policy(c_tgt,
-                                                              op->arg1, 0)))
-                    goto out;
-            }
-            break;
+            if (!TEST_true(SSL_set_default_stream_mode(c_tgt, op->arg1)))
+                goto out;
+        } break;
 
-        case OPK_C_SHUTDOWN_WAIT:
-            {
-                int ret;
-                QUIC_CHANNEL *ch = ossl_quic_conn_get_channel(h->c_conn);
-                SSL_SHUTDOWN_EX_ARGS args = {0};
+        case OPK_C_SET_INCOMING_STREAM_POLICY: {
+            if (!TEST_ptr(c_tgt))
+                goto out;
 
-                ossl_quic_engine_set_inhibit_tick(ossl_quic_channel_get0_engine(ch), 0);
+            if (!TEST_true(SSL_set_incoming_stream_policy(c_tgt,
+                    op->arg1, 0)))
+                goto out;
+        } break;
 
-                if (!TEST_ptr(c_tgt))
-                    goto out;
+        case OPK_C_SHUTDOWN_WAIT: {
+            int ret;
+            QUIC_CHANNEL *ch = ossl_quic_conn_get_channel(h->c_conn);
+            SSL_SHUTDOWN_EX_ARGS args = { 0 };
 
-                args.quic_reason = (const char *)op->arg0;
+            ossl_quic_engine_set_inhibit_tick(ossl_quic_channel_get0_engine(ch), 0);
 
-                ret = SSL_shutdown_ex(c_tgt, op->arg1, &args, sizeof(args));
-                if (!TEST_int_ge(ret, 0))
-                    goto out;
+            if (!TEST_ptr(c_tgt))
+                goto out;
 
-                if (ret == 0)
-                    C_SPIN_AGAIN();
-            }
-            break;
+            args.quic_reason = (const char *)op->arg0;
 
-        case OPK_S_SHUTDOWN:
-            {
-                ossl_quic_tserver_shutdown(ACQUIRE_S(), op->arg1);
-            }
-            break;
+            ret = SSL_shutdown_ex(c_tgt, op->arg1, &args, sizeof(args));
+            if (!TEST_int_ge(ret, 0))
+                goto out;
 
-        case OPK_C_EXPECT_CONN_CLOSE_INFO:
-            {
-                SSL_CONN_CLOSE_INFO cc_info = {0};
-                int expect_app = (op->arg1 & EXPECT_CONN_CLOSE_APP) != 0;
-                int expect_remote = (op->arg1 & EXPECT_CONN_CLOSE_REMOTE) != 0;
-                uint64_t error_code = op->arg2;
+            if (ret == 0)
+                C_SPIN_AGAIN();
+        } break;
 
-                if (!TEST_ptr(c_tgt))
-                    goto out;
+        case OPK_S_SHUTDOWN: {
+            ossl_quic_tserver_shutdown(ACQUIRE_S(), op->arg1);
+        } break;
 
-                if (h->blocking
-                    && !TEST_true(SSL_shutdown_ex(c_tgt,
-                                                  SSL_SHUTDOWN_FLAG_WAIT_PEER,
-                                                  NULL, 0)))
-                    goto out;
+        case OPK_C_EXPECT_CONN_CLOSE_INFO: {
+            SSL_CONN_CLOSE_INFO cc_info = { 0 };
+            int expect_app = (op->arg1 & EXPECT_CONN_CLOSE_APP) != 0;
+            int expect_remote = (op->arg1 & EXPECT_CONN_CLOSE_REMOTE) != 0;
+            uint64_t error_code = op->arg2;
 
-                if (!SSL_get_conn_close_info(c_tgt, &cc_info, sizeof(cc_info)))
-                    C_SPIN_AGAIN();
+            if (!TEST_ptr(c_tgt))
+                goto out;
 
-                if (!TEST_int_eq(expect_app,
-                                 (cc_info.flags
-                                  & SSL_CONN_CLOSE_FLAG_TRANSPORT) == 0)
-                    || !TEST_int_eq(expect_remote,
-                                    (cc_info.flags
-                                     & SSL_CONN_CLOSE_FLAG_LOCAL) == 0)
-                    || !TEST_uint64_t_eq(error_code, cc_info.error_code)) {
-                    TEST_info("Connection close reason: %s", cc_info.reason);
-                    goto out;
-                }
+            if (h->blocking
+                && !TEST_true(SSL_shutdown_ex(c_tgt,
+                    SSL_SHUTDOWN_FLAG_WAIT_PEER,
+                    NULL, 0)))
+                goto out;
+
+            if (!SSL_get_conn_close_info(c_tgt, &cc_info, sizeof(cc_info)))
+                C_SPIN_AGAIN();
+
+            if (!TEST_int_eq(expect_app,
+                    (cc_info.flags
+                        & SSL_CONN_CLOSE_FLAG_TRANSPORT)
+                        == 0)
+                || !TEST_int_eq(expect_remote,
+                    (cc_info.flags
+                        & SSL_CONN_CLOSE_FLAG_LOCAL)
+                        == 0)
+                || !TEST_uint64_t_eq(error_code, cc_info.error_code)) {
+                TEST_info("Connection close reason: %s", cc_info.reason);
+                goto out;
             }
-            break;
+        } break;
 
-        case OPK_S_EXPECT_CONN_CLOSE_INFO:
-            {
-                const QUIC_TERMINATE_CAUSE *tc;
-                int expect_app = (op->arg1 & EXPECT_CONN_CLOSE_APP) != 0;
-                int expect_remote = (op->arg1 & EXPECT_CONN_CLOSE_REMOTE) != 0;
-                uint64_t error_code = op->arg2;
+        case OPK_S_EXPECT_CONN_CLOSE_INFO: {
+            const QUIC_TERMINATE_CAUSE *tc;
+            int expect_app = (op->arg1 & EXPECT_CONN_CLOSE_APP) != 0;
+            int expect_remote = (op->arg1 & EXPECT_CONN_CLOSE_REMOTE) != 0;
+            uint64_t error_code = op->arg2;
 
-                if (!ossl_quic_tserver_is_term_any(ACQUIRE_S())) {
-                    ossl_quic_tserver_ping(ACQUIRE_S());
-                    S_SPIN_AGAIN();
-                }
+            if (!ossl_quic_tserver_is_term_any(ACQUIRE_S())) {
+                ossl_quic_tserver_ping(ACQUIRE_S());
+                S_SPIN_AGAIN();
+            }
 
-                if (!TEST_ptr(tc = ossl_quic_tserver_get_terminate_cause(ACQUIRE_S())))
-                    goto out;
+            if (!TEST_ptr(tc = ossl_quic_tserver_get_terminate_cause(ACQUIRE_S())))
+                goto out;
 
-                if (!TEST_uint64_t_eq(error_code, tc->error_code)
-                    || !TEST_int_eq(expect_app, tc->app)
-                    || !TEST_int_eq(expect_remote, tc->remote))
-                    goto out;
-            }
-            break;
+            if (!TEST_uint64_t_eq(error_code, tc->error_code)
+                || !TEST_int_eq(expect_app, tc->app)
+                || !TEST_int_eq(expect_remote, tc->remote))
+                goto out;
+        } break;
 
-        case OPK_S_BIND_STREAM_ID:
-            {
-                if (!TEST_uint64_t_eq(s_stream_id, UINT64_MAX))
-                    goto out;
+        case OPK_S_BIND_STREAM_ID: {
+            if (!TEST_uint64_t_eq(s_stream_id, UINT64_MAX))
+                goto out;
 
-                if (!TEST_ptr(op->stream_name))
-                    goto out;
+            if (!TEST_ptr(op->stream_name))
+                goto out;
 
-                if (!TEST_true(helper_set_s_stream(h, op->stream_name, op->arg2)))
-                    goto out;
-            }
-            break;
+            if (!TEST_true(helper_set_s_stream(h, op->stream_name, op->arg2)))
+                goto out;
+        } break;
 
-        case OPK_S_UNBIND_STREAM_ID:
-            {
-                if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
-                    goto out;
+        case OPK_S_UNBIND_STREAM_ID: {
+            if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
+                goto out;
 
-                if (!TEST_ptr(op->stream_name))
-                    goto out;
+            if (!TEST_ptr(op->stream_name))
+                goto out;
 
-                if (!TEST_true(helper_set_s_stream(h, op->stream_name, UINT64_MAX)))
-                    goto out;
-            }
-            break;
+            if (!TEST_true(helper_set_s_stream(h, op->stream_name, UINT64_MAX)))
+                goto out;
+        } break;
 
-        case OPK_C_WRITE_FAIL:
-            {
-                size_t bytes_written = 0;
-                int r;
+        case OPK_C_WRITE_FAIL: {
+            size_t bytes_written = 0;
+            int r;
 
-                if (!TEST_ptr(c_tgt))
-                    goto out;
+            if (!TEST_ptr(c_tgt))
+                goto out;
 
-                r = SSL_write_ex(c_tgt, "apple", 5, &bytes_written);
-                if (!TEST_false(r)
-                    || !check_consistent_want(c_tgt, r))
-                    goto out;
-            }
-            break;
+            r = SSL_write_ex(c_tgt, "apple", 5, &bytes_written);
+            if (!TEST_false(r)
+                || !check_consistent_want(c_tgt, r))
+                goto out;
+        } break;
 
-        case OPK_S_WRITE_FAIL:
-            {
-                size_t bytes_written = 0;
+        case OPK_S_WRITE_FAIL: {
+            size_t bytes_written = 0;
 
-                if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
-                    goto out;
+            if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
+                goto out;
 
-                if (!TEST_false(ossl_quic_tserver_write(ACQUIRE_S(), s_stream_id,
-                                                       (const unsigned char *)"apple", 5,
-                                                       &bytes_written)))
-                    goto out;
-            }
-            break;
+            if (!TEST_false(ossl_quic_tserver_write(ACQUIRE_S(), s_stream_id,
+                    (const unsigned char *)"apple", 5,
+                    &bytes_written)))
+                goto out;
+        } break;
 
-        case OPK_C_READ_FAIL:
-            {
-                size_t bytes_read = 0;
-                char buf[1];
-                int r;
+        case OPK_C_READ_FAIL: {
+            size_t bytes_read = 0;
+            char buf[1];
+            int r;
 
-                if (!TEST_ptr(c_tgt))
-                    goto out;
+            if (!TEST_ptr(c_tgt))
+                goto out;
 
-                r = SSL_read_ex(c_tgt, buf, sizeof(buf), &bytes_read);
-                if (!TEST_false(r))
-                    goto out;
-                if (!check_consistent_want(c_tgt, r))
-                    goto out;
-            }
-            break;
+            r = SSL_read_ex(c_tgt, buf, sizeof(buf), &bytes_read);
+            if (!TEST_false(r))
+                goto out;
+            if (!check_consistent_want(c_tgt, r))
+                goto out;
+        } break;
 
-        case OPK_C_READ_FAIL_WAIT:
-            {
-                size_t bytes_read = 0;
-                char buf[1];
-                int r;
+        case OPK_C_READ_FAIL_WAIT: {
+            size_t bytes_read = 0;
+            char buf[1];
+            int r;
 
-                if (!TEST_ptr(c_tgt))
-                    goto out;
+            if (!TEST_ptr(c_tgt))
+                goto out;
 
-                r = SSL_read_ex(c_tgt, buf, sizeof(buf), &bytes_read);
-                if (!TEST_false(r))
-                    goto out;
-                if (!check_consistent_want(c_tgt, r))
-                    goto out;
+            r = SSL_read_ex(c_tgt, buf, sizeof(buf), &bytes_read);
+            if (!TEST_false(r))
+                goto out;
+            if (!check_consistent_want(c_tgt, r))
+                goto out;
 
-                if (is_want(c_tgt, 0))
-                    C_SPIN_AGAIN();
-            }
-            break;
+            if (is_want(c_tgt, 0))
+                C_SPIN_AGAIN();
+        } break;
 
-        case OPK_S_READ_FAIL:
-            {
-                int ret;
-                size_t bytes_read = 0;
-                unsigned char buf[1];
+        case OPK_S_READ_FAIL: {
+            int ret;
+            size_t bytes_read = 0;
+            unsigned char buf[1];
 
-                if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
-                    goto out;
+            if (!TEST_uint64_t_ne(s_stream_id, UINT64_MAX))
+                goto out;
 
-                ret = ossl_quic_tserver_read(ACQUIRE_S(), s_stream_id,
-                                             buf, sizeof(buf),
-                                             &bytes_read);
-                if (!TEST_true(ret == 0 || (op->arg1 && bytes_read == 0)))
-                    goto out;
-            }
-            break;
+            ret = ossl_quic_tserver_read(ACQUIRE_S(), s_stream_id,
+                buf, sizeof(buf),
+                &bytes_read);
+            if (!TEST_true(ret == 0 || (op->arg1 && bytes_read == 0)))
+                goto out;
+        } break;
 
         case OPK_C_STREAM_RESET:
-        case OPK_C_STREAM_RESET_FAIL:
-            {
-                SSL_STREAM_RESET_ARGS args = {0};
+        case OPK_C_STREAM_RESET_FAIL: {
+            SSL_STREAM_RESET_ARGS args = { 0 };
 
-                if (!TEST_ptr(c_tgt))
-                    goto out;
+            if (!TEST_ptr(c_tgt))
+                goto out;
 
-                args.quic_error_code = op->arg2;
-                if (op->op == OPK_C_STREAM_RESET) {
-                    if (!TEST_true(SSL_stream_reset(c_tgt, &args, sizeof(args))))
-                        goto out;
-                } else {
-                    if (!TEST_false(SSL_stream_reset(c_tgt, &args, sizeof(args))))
-                        goto out;
-                }
+            args.quic_error_code = op->arg2;
+            if (op->op == OPK_C_STREAM_RESET) {
+                if (!TEST_true(SSL_stream_reset(c_tgt, &args, sizeof(args))))
+                    goto out;
+            } else {
+                if (!TEST_false(SSL_stream_reset(c_tgt, &args, sizeof(args))))
+                    goto out;
             }
-            break;
+        } break;
 
-        case OPK_NEW_THREAD:
-            {
+        case OPK_NEW_THREAD: {
 #if !defined(OPENSSL_THREADS)
-                /*
-                 * If this test script requires threading and we do not have
-                 * support for it, skip the rest of it.
-                 */
-                TEST_skip("threading not supported, skipping");
-                testresult = 1;
-                goto out;
+            /*
+             * If this test script requires threading and we do not have
+             * support for it, skip the rest of it.
+             */
+            TEST_skip("threading not supported, skipping");
+            testresult = 1;
+            goto out;
 #else
-                size_t i;
+            size_t i;
 
-                if (!TEST_ptr_null(h->threads)) {
-                    TEST_error("max one NEW_THREAD operation per script");
-                    goto out;
-                }
+            if (!TEST_ptr_null(h->threads)) {
+                TEST_error("max one NEW_THREAD operation per script");
+                goto out;
+            }
 
-                h->threads = OPENSSL_zalloc(op->arg1 * sizeof(struct child_thread_args));
-                if (!TEST_ptr(h->threads))
-                    goto out;
+            h->threads = OPENSSL_zalloc(op->arg1 * sizeof(struct child_thread_args));
+            if (!TEST_ptr(h->threads))
+                goto out;
 
-                h->num_threads = op->arg1;
+            h->num_threads = op->arg1;
 
-                for (i = 0; i < op->arg1; ++i) {
-                    h->threads[i].h            = h;
-                    h->threads[i].script       = op->arg0;
-                    h->threads[i].script_name  = script_name;
-                    h->threads[i].thread_idx   = i;
+            for (i = 0; i < op->arg1; ++i) {
+                h->threads[i].h = h;
+                h->threads[i].script = op->arg0;
+                h->threads[i].script_name = script_name;
+                h->threads[i].thread_idx = i;
 
-                    h->threads[i].m = ossl_crypto_mutex_new();
-                    if (!TEST_ptr(h->threads[i].m))
-                        goto out;
+                h->threads[i].m = ossl_crypto_mutex_new();
+                if (!TEST_ptr(h->threads[i].m))
+                    goto out;
 
-                    h->threads[i].t
-                        = ossl_crypto_thread_native_start(run_script_child_thread,
-                                                          &h->threads[i], 1);
-                    if (!TEST_ptr(h->threads[i].t))
-                        goto out;
-                }
-#endif
+                h->threads[i].t
+                    = ossl_crypto_thread_native_start(run_script_child_thread,
+                        &h->threads[i], 1);
+                if (!TEST_ptr(h->threads[i].t))
+                    goto out;
             }
-            break;
+#endif
+        } break;
 
-        case OPK_C_CLOSE_SOCKET:
-            {
-                BIO_closesocket(h->c_fd);
-                h->c_fd = -1;
-            }
-            break;
+        case OPK_C_CLOSE_SOCKET: {
+            BIO_closesocket(h->c_fd);
+            h->c_fd = -1;
+        } break;
 
-        case OPK_C_EXPECT_SSL_ERR:
-            {
-                if (!TEST_size_t_eq((size_t)SSL_get_error(c_tgt, 0), op->arg1))
-                    goto out;
-                if (!TEST_int_eq(SSL_want(c_tgt), SSL_NOTHING))
-                    goto out;
-            }
-            break;
+        case OPK_C_EXPECT_SSL_ERR: {
+            if (!TEST_size_t_eq((size_t)SSL_get_error(c_tgt, 0), op->arg1))
+                goto out;
+            if (!TEST_int_eq(SSL_want(c_tgt), SSL_NOTHING))
+                goto out;
+        } break;
 
-        case OPK_EXPECT_ERR_REASON:
-            {
-                if (!TEST_size_t_eq((size_t)ERR_GET_REASON(ERR_peek_last_error()), op->arg1))
-                    goto out;
-            }
-            break;
+        case OPK_EXPECT_ERR_REASON: {
+            if (!TEST_size_t_eq((size_t)ERR_GET_REASON(ERR_peek_last_error()), op->arg1))
+                goto out;
+        } break;
 
-        case OPK_EXPECT_ERR_LIB:
-            {
-                if (!TEST_size_t_eq((size_t)ERR_GET_LIB(ERR_peek_last_error()), op->arg1))
-                    goto out;
-            }
-            break;
+        case OPK_EXPECT_ERR_LIB: {
+            if (!TEST_size_t_eq((size_t)ERR_GET_LIB(ERR_peek_last_error()), op->arg1))
+                goto out;
+        } break;
 
         case OPK_POP_ERR:
             ERR_pop();
             break;
 
-        case OPK_SLEEP:
-            {
-                OSSL_sleep(op->arg2);
-            }
-            break;
+        case OPK_SLEEP: {
+            OSSL_sleep(op->arg2);
+        } break;
 
         case OPK_S_SET_INJECT_PLAIN:
             h->qtf_packet_plain_cb = op->qtf_packet_plain_cb;
 
             if (!TEST_true(qtest_fault_set_packet_plain_listener(h->qtf,
-                                                                 h->qtf_packet_plain_cb != NULL ?
-                                                                 helper_packet_plain_listener : NULL,
-                                                                 h)))
+                    h->qtf_packet_plain_cb != NULL ? helper_packet_plain_listener : NULL,
+                    h)))
                 goto out;
 
             break;
@@ -1955,9 +1882,8 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
             h->qtf_handshake_cb = op->qtf_handshake_cb;
 
             if (!TEST_true(qtest_fault_set_handshake_listener(h->qtf,
-                                                              h->qtf_handshake_cb != NULL ?
-                                                              helper_handshake_listener : NULL,
-                                                              h)))
+                    h->qtf_handshake_cb != NULL ? helper_handshake_listener : NULL,
+                    h)))
                 goto out;
 
             break;
@@ -1966,9 +1892,8 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
             h->qtf_datagram_cb = op->qtf_datagram_cb;
 
             if (!TEST_true(qtest_fault_set_datagram_listener(h->qtf,
-                                                             h->qtf_datagram_cb != NULL ?
-                                                             helper_datagram_listener : NULL,
-                                                             h)))
+                    h->qtf_datagram_cb != NULL ? helper_datagram_listener : NULL,
+                    h)))
                 goto out;
 
             break;
@@ -1983,14 +1908,12 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
             h->inject_word1 = op->arg2;
             break;
 
-        case OPK_C_INHIBIT_TICK:
-            {
-                QUIC_CHANNEL *ch = ossl_quic_conn_get_channel(h->c_conn);
+        case OPK_C_INHIBIT_TICK: {
+            QUIC_CHANNEL *ch = ossl_quic_conn_get_channel(h->c_conn);
 
-                ossl_quic_engine_set_inhibit_tick(ossl_quic_channel_get0_engine(ch),
-                                                  op->arg1);
-            }
-            break;
+            ossl_quic_engine_set_inhibit_tick(ossl_quic_channel_get0_engine(ch),
+                op->arg1);
+        } break;
 
         case OPK_C_SET_WRITE_BUF_SIZE:
             if (!TEST_ptr(c_tgt))
@@ -2020,18 +1943,18 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
         const char *e_str, *f_str;
 
         TEST_error("failed in script \"%s\" at op %zu, thread %d\n",
-                   script_name, op_idx + 1, thread_idx);
+            script_name, op_idx + 1, thread_idx);
 
         for (i = 0; i < repeat_stack_len; ++i)
             TEST_info("while repeating, iteration %zu of %zu, starting at script op %zu",
-                      repeat_stack_done[i],
-                      repeat_stack_limit[i],
-                      repeat_stack_idx[i]);
+                repeat_stack_done[i],
+                repeat_stack_limit[i],
+                repeat_stack_idx[i]);
 
         ERR_print_errors_fp(stderr);
 
         if (h->c_conn != NULL) {
-            SSL_CONN_CLOSE_INFO cc_info = {0};
+            SSL_CONN_CLOSE_INFO cc_info = { 0 };
 
             if (SSL_get_conn_close_info(h->c_conn, &cc_info, sizeof(cc_info))) {
                 e_str = ossl_quic_err_to_string(cc_info.error_code);
@@ -2044,20 +1967,23 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
 
                 TEST_info("client side is closed: %llu(%s)/%llu(%s), "
                           "%s, %s, reason: \"%s\"",
-                          (unsigned long long)cc_info.error_code,
-                          e_str,
-                          (unsigned long long)cc_info.frame_type,
-                          f_str,
-                          (cc_info.flags & SSL_CONN_CLOSE_FLAG_LOCAL) != 0
-                            ? "local" : "remote",
-                          (cc_info.flags & SSL_CONN_CLOSE_FLAG_TRANSPORT) != 0
-                            ? "transport" : "app",
-                          cc_info.reason != NULL ? cc_info.reason : "-");
+                    (unsigned long long)cc_info.error_code,
+                    e_str,
+                    (unsigned long long)cc_info.frame_type,
+                    f_str,
+                    (cc_info.flags & SSL_CONN_CLOSE_FLAG_LOCAL) != 0
+                        ? "local"
+                        : "remote",
+                    (cc_info.flags & SSL_CONN_CLOSE_FLAG_TRANSPORT) != 0
+                        ? "transport"
+                        : "app",
+                    cc_info.reason != NULL ? cc_info.reason : "-");
             }
         }
 
         tcause = (h->s != NULL
-                  ? ossl_quic_tserver_get_terminate_cause(h->s) : NULL);
+                ? ossl_quic_tserver_get_terminate_cause(h->s)
+                : NULL);
         if (tcause != NULL) {
             e_str = ossl_quic_err_to_string(tcause->error_code);
             f_str = ossl_quic_frame_type_to_string(tcause->frame_type);
@@ -2068,14 +1994,14 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
                 f_str = "?";
 
             TEST_info("server side is closed: %llu(%s)/%llu(%s), "
-                     "%s, %s, reason: \"%s\"",
-                      (unsigned long long)tcause->error_code,
-                      e_str,
-                      (unsigned long long)tcause->frame_type,
-                      f_str,
-                      tcause->remote ? "remote" : "local",
-                      tcause->app ? "app" : "transport",
-                      tcause->reason != NULL ? tcause->reason : "-");
+                      "%s, %s, reason: \"%s\"",
+                (unsigned long long)tcause->error_code,
+                e_str,
+                (unsigned long long)tcause->frame_type,
+                f_str,
+                tcause->remote ? "remote" : "local",
+                tcause->app ? "app" : "transport",
+                tcause->reason != NULL ? tcause->reason : "-");
         }
     }
 
@@ -2085,15 +2011,15 @@ static int run_script_worker(struct helper *h, const struct script_op *script,
 }
 
 static int run_script(const struct script_op *script,
-                      const char *script_name,
-                      int free_order,
-                      int blocking)
+    const char *script_name,
+    int free_order,
+    int blocking)
 {
     int testresult = 0;
     struct helper h;
 
     if (!TEST_true(helper_init(&h, script_name,
-                               free_order, blocking, 1)))
+            free_order, blocking, 1)))
         goto out;
 
     if (!TEST_true(run_script_worker(&h, script, script_name, -1)))
@@ -2117,12 +2043,12 @@ static CRYPTO_THREAD_RETVAL run_script_child_thread(void *arg)
     struct child_thread_args *args = arg;
 
     testresult = run_script_worker(args->h, args->script,
-                                   args->script_name,
-                                   args->thread_idx);
+        args->script_name,
+        args->thread_idx);
 
     ossl_crypto_mutex_lock(args->m);
-    args->testresult    = testresult;
-    args->done          = 1;
+    args->testresult = testresult;
+    args->done = 1;
     ossl_crypto_mutex_unlock(args->m);
     return 1;
 }
@@ -2130,504 +2056,504 @@ static CRYPTO_THREAD_RETVAL run_script_child_thread(void *arg)
 
 /* 1. Simple single-stream test */
 static const struct script_op script_1[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_C_CONCLUDE           (DEFAULT)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
-    OP_S_EXPECT_FIN         (a)
-    OP_S_WRITE              (a, "orange", 6)
-    OP_S_CONCLUDE           (a)
-    OP_C_READ_EXPECT        (DEFAULT, "orange", 6)
-    OP_C_EXPECT_FIN         (DEFAULT)
-    OP_END
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_WRITE(DEFAULT, "apple", 5)
+                OP_C_CONCLUDE(DEFAULT)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
+                            OP_S_EXPECT_FIN(a)
+                                OP_S_WRITE(a, "orange", 6)
+                                    OP_S_CONCLUDE(a)
+                                        OP_C_READ_EXPECT(DEFAULT, "orange", 6)
+                                            OP_C_EXPECT_FIN(DEFAULT)
+                                                OP_END
 };
 
 /* 2. Multi-stream test */
 static const struct script_op script_2[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_INCOMING_STREAM_POLICY(SSL_INCOMING_STREAM_POLICY_ACCEPT)
-    OP_C_WRITE              (DEFAULT,  "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (DEFAULT, "orange", 6)
-
-    OP_C_NEW_STREAM_BIDI    (b, C_BIDI_ID(1))
-    OP_C_WRITE              (b, "flamingo", 8)
-    OP_C_CONCLUDE           (b)
-    OP_S_BIND_STREAM_ID     (b, C_BIDI_ID(1))
-    OP_S_READ_EXPECT        (b, "flamingo", 8)
-    OP_S_EXPECT_FIN         (b)
-    OP_S_WRITE              (b, "gargoyle", 8)
-    OP_S_CONCLUDE           (b)
-    OP_C_READ_EXPECT        (b, "gargoyle", 8)
-    OP_C_EXPECT_FIN         (b)
-
-    OP_C_NEW_STREAM_UNI     (c, C_UNI_ID(0))
-    OP_C_WRITE              (c, "elephant", 8)
-    OP_C_CONCLUDE           (c)
-    OP_S_BIND_STREAM_ID     (c, C_UNI_ID(0))
-    OP_S_READ_EXPECT        (c, "elephant", 8)
-    OP_S_EXPECT_FIN         (c)
-    OP_S_WRITE_FAIL         (c)
-
-    OP_C_ACCEPT_STREAM_NONE ()
-
-    OP_S_NEW_STREAM_BIDI    (d, S_BIDI_ID(0))
-    OP_S_WRITE              (d, "frog", 4)
-    OP_S_CONCLUDE           (d)
-
-    OP_C_ACCEPT_STREAM_WAIT (d)
-    OP_C_ACCEPT_STREAM_NONE ()
-    OP_C_READ_EXPECT        (d, "frog", 4)
-    OP_C_EXPECT_FIN         (d)
-
-    OP_S_NEW_STREAM_BIDI    (e, S_BIDI_ID(1))
-    OP_S_WRITE              (e, "mixture", 7)
-    OP_S_CONCLUDE           (e)
-
-    OP_C_ACCEPT_STREAM_WAIT (e)
-    OP_C_READ_EXPECT        (e, "mixture", 7)
-    OP_C_EXPECT_FIN         (e)
-    OP_C_WRITE              (e, "ramble", 6)
-    OP_S_READ_EXPECT        (e, "ramble", 6)
-    OP_C_CONCLUDE           (e)
-    OP_S_EXPECT_FIN         (e)
-
-    OP_S_NEW_STREAM_UNI     (f, S_UNI_ID(0))
-    OP_S_WRITE              (f, "yonder", 6)
-    OP_S_CONCLUDE           (f)
-
-    OP_C_ACCEPT_STREAM_WAIT (f)
-    OP_C_ACCEPT_STREAM_NONE ()
-    OP_C_READ_EXPECT        (f, "yonder", 6)
-    OP_C_EXPECT_FIN         (f)
-    OP_C_WRITE_FAIL         (f)
-
-    OP_C_SET_INCOMING_STREAM_POLICY(SSL_INCOMING_STREAM_POLICY_REJECT)
-    OP_S_NEW_STREAM_BIDI    (g, S_BIDI_ID(2))
-    OP_S_WRITE              (g, "unseen", 6)
-    OP_S_CONCLUDE           (g)
-
-    OP_C_ACCEPT_STREAM_NONE ()
-
-    OP_C_SET_INCOMING_STREAM_POLICY(SSL_INCOMING_STREAM_POLICY_AUTO)
-    OP_S_NEW_STREAM_BIDI    (h, S_BIDI_ID(3))
-    OP_S_WRITE              (h, "UNSEEN", 6)
-    OP_S_CONCLUDE           (h)
-
-    OP_C_ACCEPT_STREAM_NONE ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_INCOMING_STREAM_POLICY(SSL_INCOMING_STREAM_POLICY_ACCEPT)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
+                            OP_S_WRITE(a, "orange", 6)
+                                OP_C_READ_EXPECT(DEFAULT, "orange", 6)
+
+                                    OP_C_NEW_STREAM_BIDI(b, C_BIDI_ID(1))
+                                        OP_C_WRITE(b, "flamingo", 8)
+                                            OP_C_CONCLUDE(b)
+                                                OP_S_BIND_STREAM_ID(b, C_BIDI_ID(1))
+                                                    OP_S_READ_EXPECT(b, "flamingo", 8)
+                                                        OP_S_EXPECT_FIN(b)
+                                                            OP_S_WRITE(b, "gargoyle", 8)
+                                                                OP_S_CONCLUDE(b)
+                                                                    OP_C_READ_EXPECT(b, "gargoyle", 8)
+                                                                        OP_C_EXPECT_FIN(b)
+
+                                                                            OP_C_NEW_STREAM_UNI(c, C_UNI_ID(0))
+                                                                                OP_C_WRITE(c, "elephant", 8)
+                                                                                    OP_C_CONCLUDE(c)
+                                                                                        OP_S_BIND_STREAM_ID(c, C_UNI_ID(0))
+                                                                                            OP_S_READ_EXPECT(c, "elephant", 8)
+                                                                                                OP_S_EXPECT_FIN(c)
+                                                                                                    OP_S_WRITE_FAIL(c)
+
+                                                                                                        OP_C_ACCEPT_STREAM_NONE()
+
+                                                                                                            OP_S_NEW_STREAM_BIDI(d, S_BIDI_ID(0))
+                                                                                                                OP_S_WRITE(d, "frog", 4)
+                                                                                                                    OP_S_CONCLUDE(d)
+
+                                                                                                                        OP_C_ACCEPT_STREAM_WAIT(d)
+                                                                                                                            OP_C_ACCEPT_STREAM_NONE()
+                                                                                                                                OP_C_READ_EXPECT(d, "frog", 4)
+                                                                                                                                    OP_C_EXPECT_FIN(d)
+
+                                                                                                                                        OP_S_NEW_STREAM_BIDI(e, S_BIDI_ID(1))
+                                                                                                                                            OP_S_WRITE(e, "mixture", 7)
+                                                                                                                                                OP_S_CONCLUDE(e)
+
+                                                                                                                                                    OP_C_ACCEPT_STREAM_WAIT(e)
+                                                                                                                                                        OP_C_READ_EXPECT(e, "mixture", 7)
+                                                                                                                                                            OP_C_EXPECT_FIN(e)
+                                                                                                                                                                OP_C_WRITE(e, "ramble", 6)
+                                                                                                                                                                    OP_S_READ_EXPECT(e, "ramble", 6)
+                                                                                                                                                                        OP_C_CONCLUDE(e)
+                                                                                                                                                                            OP_S_EXPECT_FIN(e)
+
+                                                                                                                                                                                OP_S_NEW_STREAM_UNI(f, S_UNI_ID(0))
+                                                                                                                                                                                    OP_S_WRITE(f, "yonder", 6)
+                                                                                                                                                                                        OP_S_CONCLUDE(f)
+
+                                                                                                                                                                                            OP_C_ACCEPT_STREAM_WAIT(f)
+                                                                                                                                                                                                OP_C_ACCEPT_STREAM_NONE()
+                                                                                                                                                                                                    OP_C_READ_EXPECT(f, "yonder", 6)
+                                                                                                                                                                                                        OP_C_EXPECT_FIN(f)
+                                                                                                                                                                                                            OP_C_WRITE_FAIL(f)
+
+                                                                                                                                                                                                                OP_C_SET_INCOMING_STREAM_POLICY(SSL_INCOMING_STREAM_POLICY_REJECT)
+                                                                                                                                                                                                                    OP_S_NEW_STREAM_BIDI(g, S_BIDI_ID(2))
+                                                                                                                                                                                                                        OP_S_WRITE(g, "unseen", 6)
+                                                                                                                                                                                                                            OP_S_CONCLUDE(g)
+
+                                                                                                                                                                                                                                OP_C_ACCEPT_STREAM_NONE()
+
+                                                                                                                                                                                                                                    OP_C_SET_INCOMING_STREAM_POLICY(SSL_INCOMING_STREAM_POLICY_AUTO)
+                                                                                                                                                                                                                                        OP_S_NEW_STREAM_BIDI(h, S_BIDI_ID(3))
+                                                                                                                                                                                                                                            OP_S_WRITE(h, "UNSEEN", 6)
+                                                                                                                                                                                                                                                OP_S_CONCLUDE(h)
+
+                                                                                                                                                                                                                                                    OP_C_ACCEPT_STREAM_NONE()
 
     /*
      * Streams g, h should have been rejected, so server should have got
      * STOP_SENDING/RESET_STREAM.
      */
-    OP_CHECK                (check_rejected, S_BIDI_ID(2))
-    OP_CHECK                (check_rejected, S_BIDI_ID(3))
+    OP_CHECK(check_rejected, S_BIDI_ID(2))
+        OP_CHECK(check_rejected, S_BIDI_ID(3))
 
-    OP_END
+            OP_END
 };
 
 /* 3. Default stream detach/reattach test */
 static const struct script_op script_3[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_C_DETACH             (a)             /* DEFAULT becomes stream 'a' */
-    OP_C_WRITE_FAIL         (DEFAULT)
+            OP_C_WRITE(DEFAULT, "apple", 5)
+                OP_C_DETACH(a) /* DEFAULT becomes stream 'a' */
+    OP_C_WRITE_FAIL(DEFAULT)
 
-    OP_C_WRITE              (a, "by", 2)
+        OP_C_WRITE(a, "by", 2)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "appleby", 7)
+            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                OP_S_READ_EXPECT(a, "appleby", 7)
 
-    OP_S_WRITE              (a, "hello", 5)
-    OP_C_READ_EXPECT        (a, "hello", 5)
+                    OP_S_WRITE(a, "hello", 5)
+                        OP_C_READ_EXPECT(a, "hello", 5)
 
-    OP_C_WRITE_FAIL         (DEFAULT)
-    OP_C_ATTACH             (a)
-    OP_C_WRITE              (DEFAULT, "is here", 7)
-    OP_S_READ_EXPECT        (a, "is here", 7)
+                            OP_C_WRITE_FAIL(DEFAULT)
+                                OP_C_ATTACH(a)
+                                    OP_C_WRITE(DEFAULT, "is here", 7)
+                                        OP_S_READ_EXPECT(a, "is here", 7)
 
-    OP_C_DETACH             (a)
-    OP_C_CONCLUDE           (a)
-    OP_S_EXPECT_FIN         (a)
+                                            OP_C_DETACH(a)
+                                                OP_C_CONCLUDE(a)
+                                                    OP_S_EXPECT_FIN(a)
 
-    OP_END
+                                                        OP_END
 };
 
 /* 4. Default stream mode test */
 static const struct script_op script_4[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
-    OP_C_WRITE_FAIL         (DEFAULT)
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+                OP_C_WRITE_FAIL(DEFAULT)
 
-    OP_S_NEW_STREAM_BIDI    (a, S_BIDI_ID(0))
-    OP_S_WRITE              (a, "apple", 5)
+                    OP_S_NEW_STREAM_BIDI(a, S_BIDI_ID(0))
+                        OP_S_WRITE(a, "apple", 5)
 
-    OP_C_READ_FAIL          (DEFAULT)
+                            OP_C_READ_FAIL(DEFAULT)
 
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "apple", 5)
+                                OP_C_ACCEPT_STREAM_WAIT(a)
+                                    OP_C_READ_EXPECT(a, "apple", 5)
 
-    OP_C_ATTACH             (a)
-    OP_C_WRITE              (DEFAULT, "orange", 6)
-    OP_S_READ_EXPECT        (a, "orange", 6)
+                                        OP_C_ATTACH(a)
+                                            OP_C_WRITE(DEFAULT, "orange", 6)
+                                                OP_S_READ_EXPECT(a, "orange", 6)
 
-    OP_END
+                                                    OP_END
 };
 
 /* 5. Test stream reset functionality */
 static const struct script_op script_5[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_NEW_STREAM_BIDI    (b, C_BIDI_ID(1))
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+                OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                    OP_C_NEW_STREAM_BIDI(b, C_BIDI_ID(1))
 
-    OP_C_WRITE              (a, "apple", 5)
-    OP_C_STREAM_RESET       (a, 42)
+                        OP_C_WRITE(a, "apple", 5)
+                            OP_C_STREAM_RESET(a, 42)
 
-    OP_C_WRITE              (b, "strawberry", 10)
+                                OP_C_WRITE(b, "strawberry", 10)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_BIND_STREAM_ID     (b, C_BIDI_ID(1))
-    OP_S_READ_EXPECT        (b, "strawberry", 10)
+                                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                        OP_S_BIND_STREAM_ID(b, C_BIDI_ID(1))
+                                            OP_S_READ_EXPECT(b, "strawberry", 10)
     /* Reset disrupts read of already sent data */
-    OP_S_READ_FAIL          (a, 0)
-    OP_CHECK                (check_stream_reset, C_BIDI_ID(0))
+    OP_S_READ_FAIL(a, 0)
+        OP_CHECK(check_stream_reset, C_BIDI_ID(0))
 
-    OP_END
+            OP_END
 };
 
 /* 6. Test STOP_SENDING functionality */
 static const struct script_op script_6[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
-    OP_S_NEW_STREAM_BIDI    (a, S_BIDI_ID(0))
-    OP_S_WRITE              (a, "apple", 5)
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+                OP_S_NEW_STREAM_BIDI(a, S_BIDI_ID(0))
+                    OP_S_WRITE(a, "apple", 5)
 
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_FREE_STREAM        (a)
-    OP_C_ACCEPT_STREAM_NONE ()
+                        OP_C_ACCEPT_STREAM_WAIT(a)
+                            OP_C_FREE_STREAM(a)
+                                OP_C_ACCEPT_STREAM_NONE()
 
-    OP_CHECK                (check_stream_stopped, S_BIDI_ID(0))
+                                    OP_CHECK(check_stream_stopped, S_BIDI_ID(0))
 
-    OP_END
+                                        OP_END
 };
 
 /* 7. Unidirectional default stream mode test (client sends first) */
 static const struct script_op script_7[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_AUTO_UNI)
-    OP_C_WRITE              (DEFAULT, "apple", 5)
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_AUTO_UNI)
+                OP_C_WRITE(DEFAULT, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_UNI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
-    OP_S_WRITE_FAIL         (a)
+                    OP_S_BIND_STREAM_ID(a, C_UNI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
+                            OP_S_WRITE_FAIL(a)
 
-    OP_END
+                                OP_END
 };
 
 /* 8. Unidirectional default stream mode test (server sends first) */
 static const struct script_op script_8[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_AUTO_UNI)
-    OP_S_NEW_STREAM_UNI     (a, S_UNI_ID(0))
-    OP_S_WRITE              (a, "apple", 5)
-    OP_C_READ_EXPECT        (DEFAULT, "apple", 5)
-    OP_C_WRITE_FAIL         (DEFAULT)
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_AUTO_UNI)
+                OP_S_NEW_STREAM_UNI(a, S_UNI_ID(0))
+                    OP_S_WRITE(a, "apple", 5)
+                        OP_C_READ_EXPECT(DEFAULT, "apple", 5)
+                            OP_C_WRITE_FAIL(DEFAULT)
 
-    OP_END
+                                OP_END
 };
 
 /* 9. Unidirectional default stream mode test (server sends first on bidi) */
 static const struct script_op script_9[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_AUTO_UNI)
-    OP_S_NEW_STREAM_BIDI    (a, S_BIDI_ID(0))
-    OP_S_WRITE              (a, "apple", 5)
-    OP_C_READ_EXPECT        (DEFAULT, "apple", 5)
-    OP_C_WRITE              (DEFAULT, "orange", 6)
-    OP_S_READ_EXPECT        (a, "orange", 6)
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_AUTO_UNI)
+                OP_S_NEW_STREAM_BIDI(a, S_BIDI_ID(0))
+                    OP_S_WRITE(a, "apple", 5)
+                        OP_C_READ_EXPECT(DEFAULT, "apple", 5)
+                            OP_C_WRITE(DEFAULT, "orange", 6)
+                                OP_S_READ_EXPECT(a, "orange", 6)
 
-    OP_END
+                                    OP_END
 };
 
 /* 10. Shutdown */
 static const struct script_op script_10[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+            OP_C_WRITE(DEFAULT, "apple", 5)
+                OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                    OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_C_SHUTDOWN_WAIT      (NULL, 0)
-    OP_C_EXPECT_CONN_CLOSE_INFO(0, 1, 0)
-    OP_S_EXPECT_CONN_CLOSE_INFO(0, 1, 1)
+                        OP_C_SHUTDOWN_WAIT(NULL, 0)
+                            OP_C_EXPECT_CONN_CLOSE_INFO(0, 1, 0)
+                                OP_S_EXPECT_CONN_CLOSE_INFO(0, 1, 1)
 
-    OP_END
+                                    OP_END
 };
 
 /* 11. Many threads accepted on the same client connection */
 static const struct script_op script_11_child[] = {
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "foo", 3)
-    OP_SLEEP                (10)
-    OP_C_EXPECT_FIN         (a)
+    OP_C_ACCEPT_STREAM_WAIT(a)
+        OP_C_READ_EXPECT(a, "foo", 3)
+            OP_SLEEP(10)
+                OP_C_EXPECT_FIN(a)
 
-    OP_END
+                    OP_END
 };
 
 static const struct script_op script_11[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_NEW_THREAD           (5, script_11_child)
+                OP_NEW_THREAD(5, script_11_child)
 
-    OP_S_NEW_STREAM_BIDI    (a, ANY_ID)
-    OP_S_WRITE              (a, "foo", 3)
-    OP_S_CONCLUDE           (a)
+                    OP_S_NEW_STREAM_BIDI(a, ANY_ID)
+                        OP_S_WRITE(a, "foo", 3)
+                            OP_S_CONCLUDE(a)
 
-    OP_S_NEW_STREAM_BIDI    (b, ANY_ID)
-    OP_S_WRITE              (b, "foo", 3)
-    OP_S_CONCLUDE           (b)
+                                OP_S_NEW_STREAM_BIDI(b, ANY_ID)
+                                    OP_S_WRITE(b, "foo", 3)
+                                        OP_S_CONCLUDE(b)
 
-    OP_S_NEW_STREAM_BIDI    (c, ANY_ID)
-    OP_S_WRITE              (c, "foo", 3)
-    OP_S_CONCLUDE           (c)
+                                            OP_S_NEW_STREAM_BIDI(c, ANY_ID)
+                                                OP_S_WRITE(c, "foo", 3)
+                                                    OP_S_CONCLUDE(c)
 
-    OP_S_NEW_STREAM_BIDI    (d, ANY_ID)
-    OP_S_WRITE              (d, "foo", 3)
-    OP_S_CONCLUDE           (d)
+                                                        OP_S_NEW_STREAM_BIDI(d, ANY_ID)
+                                                            OP_S_WRITE(d, "foo", 3)
+                                                                OP_S_CONCLUDE(d)
 
-    OP_S_NEW_STREAM_BIDI    (e, ANY_ID)
-    OP_S_WRITE              (e, "foo", 3)
-    OP_S_CONCLUDE           (e)
+                                                                    OP_S_NEW_STREAM_BIDI(e, ANY_ID)
+                                                                        OP_S_WRITE(e, "foo", 3)
+                                                                            OP_S_CONCLUDE(e)
 
-    OP_END
+                                                                                OP_END
 };
 
 /* 12. Many threads initiated on the same client connection */
 static const struct script_op script_12_child[] = {
-    OP_C_NEW_STREAM_BIDI    (a, ANY_ID)
-    OP_C_WRITE              (a, "foo", 3)
-    OP_C_CONCLUDE           (a)
-    OP_C_FREE_STREAM        (a)
+    OP_C_NEW_STREAM_BIDI(a, ANY_ID)
+        OP_C_WRITE(a, "foo", 3)
+            OP_C_CONCLUDE(a)
+                OP_C_FREE_STREAM(a)
 
-    OP_END
+                    OP_END
 };
 
 static const struct script_op script_12[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
-
-    OP_NEW_THREAD           (5, script_12_child)
-
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "foo", 3)
-    OP_S_EXPECT_FIN         (a)
-    OP_S_BIND_STREAM_ID     (b, C_BIDI_ID(1))
-    OP_S_READ_EXPECT        (b, "foo", 3)
-    OP_S_EXPECT_FIN         (b)
-    OP_S_BIND_STREAM_ID     (c, C_BIDI_ID(2))
-    OP_S_READ_EXPECT        (c, "foo", 3)
-    OP_S_EXPECT_FIN         (c)
-    OP_S_BIND_STREAM_ID     (d, C_BIDI_ID(3))
-    OP_S_READ_EXPECT        (d, "foo", 3)
-    OP_S_EXPECT_FIN         (d)
-    OP_S_BIND_STREAM_ID     (e, C_BIDI_ID(4))
-    OP_S_READ_EXPECT        (e, "foo", 3)
-    OP_S_EXPECT_FIN         (e)
-
-    OP_END
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+
+                OP_NEW_THREAD(5, script_12_child)
+
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "foo", 3)
+                            OP_S_EXPECT_FIN(a)
+                                OP_S_BIND_STREAM_ID(b, C_BIDI_ID(1))
+                                    OP_S_READ_EXPECT(b, "foo", 3)
+                                        OP_S_EXPECT_FIN(b)
+                                            OP_S_BIND_STREAM_ID(c, C_BIDI_ID(2))
+                                                OP_S_READ_EXPECT(c, "foo", 3)
+                                                    OP_S_EXPECT_FIN(c)
+                                                        OP_S_BIND_STREAM_ID(d, C_BIDI_ID(3))
+                                                            OP_S_READ_EXPECT(d, "foo", 3)
+                                                                OP_S_EXPECT_FIN(d)
+                                                                    OP_S_BIND_STREAM_ID(e, C_BIDI_ID(4))
+                                                                        OP_S_READ_EXPECT(e, "foo", 3)
+                                                                            OP_S_EXPECT_FIN(e)
+
+                                                                                OP_END
 };
 
 /* 13. Many threads accepted on the same client connection (stress test) */
 static const struct script_op script_13_child[] = {
-    OP_BEGIN_REPEAT         (10)
+    OP_BEGIN_REPEAT(10)
 
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "foo", 3)
-    OP_C_EXPECT_FIN         (a)
-    OP_C_FREE_STREAM        (a)
+        OP_C_ACCEPT_STREAM_WAIT(a)
+            OP_C_READ_EXPECT(a, "foo", 3)
+                OP_C_EXPECT_FIN(a)
+                    OP_C_FREE_STREAM(a)
 
-    OP_END_REPEAT           ()
+                        OP_END_REPEAT()
 
-    OP_END
+                            OP_END
 };
 
 static const struct script_op script_13[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_NEW_THREAD           (5, script_13_child)
+                OP_NEW_THREAD(5, script_13_child)
 
-    OP_BEGIN_REPEAT         (50)
+                    OP_BEGIN_REPEAT(50)
 
-    OP_S_NEW_STREAM_BIDI    (a, ANY_ID)
-    OP_S_WRITE              (a, "foo", 3)
-    OP_S_CONCLUDE           (a)
-    OP_S_UNBIND_STREAM_ID   (a)
+                        OP_S_NEW_STREAM_BIDI(a, ANY_ID)
+                            OP_S_WRITE(a, "foo", 3)
+                                OP_S_CONCLUDE(a)
+                                    OP_S_UNBIND_STREAM_ID(a)
 
-    OP_END_REPEAT           ()
+                                        OP_END_REPEAT()
 
-    OP_END
+                                            OP_END
 };
 
 /* 14. Many threads initiating on the same client connection (stress test) */
 static const struct script_op script_14_child[] = {
-    OP_BEGIN_REPEAT         (10)
+    OP_BEGIN_REPEAT(10)
 
-    OP_C_NEW_STREAM_BIDI    (a, ANY_ID)
-    OP_C_WRITE              (a, "foo", 3)
-    OP_C_CONCLUDE           (a)
-    OP_C_FREE_STREAM        (a)
+        OP_C_NEW_STREAM_BIDI(a, ANY_ID)
+            OP_C_WRITE(a, "foo", 3)
+                OP_C_CONCLUDE(a)
+                    OP_C_FREE_STREAM(a)
 
-    OP_END_REPEAT           ()
+                        OP_END_REPEAT()
 
-    OP_END
+                            OP_END
 };
 
 static const struct script_op script_14[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_NEW_THREAD           (5, script_14_child)
+                OP_NEW_THREAD(5, script_14_child)
 
-    OP_BEGIN_REPEAT         (50)
+                    OP_BEGIN_REPEAT(50)
 
-    OP_S_ACCEPT_STREAM_WAIT (a)
-    OP_S_READ_EXPECT        (a, "foo", 3)
-    OP_S_EXPECT_FIN         (a)
-    OP_S_UNBIND_STREAM_ID   (a)
+                        OP_S_ACCEPT_STREAM_WAIT(a)
+                            OP_S_READ_EXPECT(a, "foo", 3)
+                                OP_S_EXPECT_FIN(a)
+                                    OP_S_UNBIND_STREAM_ID(a)
 
-    OP_END_REPEAT           ()
+                                        OP_END_REPEAT()
 
-    OP_END
+                                            OP_END
 };
 
 /* 15. Client sending large number of streams, MAX_STREAMS test */
 static const struct script_op script_15[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
     /*
      * This will cause a protocol violation to be raised by the server if we are
      * not handling the stream limit correctly on the TX side.
      */
-    OP_BEGIN_REPEAT         (200)
+    OP_BEGIN_REPEAT(200)
 
-    OP_C_NEW_STREAM_BIDI_EX (a, ANY_ID, SSL_STREAM_FLAG_ADVANCE)
-    OP_C_WRITE              (a, "foo", 3)
-    OP_C_CONCLUDE           (a)
-    OP_C_FREE_STREAM        (a)
+        OP_C_NEW_STREAM_BIDI_EX(a, ANY_ID, SSL_STREAM_FLAG_ADVANCE)
+            OP_C_WRITE(a, "foo", 3)
+                OP_C_CONCLUDE(a)
+                    OP_C_FREE_STREAM(a)
 
-    OP_END_REPEAT           ()
+                        OP_END_REPEAT()
 
     /* Prove the connection is still good. */
-    OP_S_NEW_STREAM_BIDI    (a, S_BIDI_ID(0))
-    OP_S_WRITE              (a, "bar", 3)
-    OP_S_CONCLUDE           (a)
+    OP_S_NEW_STREAM_BIDI(a, S_BIDI_ID(0))
+        OP_S_WRITE(a, "bar", 3)
+            OP_S_CONCLUDE(a)
 
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "bar", 3)
-    OP_C_EXPECT_FIN         (a)
+                OP_C_ACCEPT_STREAM_WAIT(a)
+                    OP_C_READ_EXPECT(a, "bar", 3)
+                        OP_C_EXPECT_FIN(a)
 
     /*
      * Drain the queue of incoming streams. We should be able to get all 200
      * even though only 100 can be initiated at a time.
      */
-    OP_BEGIN_REPEAT         (200)
+    OP_BEGIN_REPEAT(200)
 
-    OP_S_ACCEPT_STREAM_WAIT (b)
-    OP_S_READ_EXPECT        (b, "foo", 3)
-    OP_S_EXPECT_FIN         (b)
-    OP_S_UNBIND_STREAM_ID   (b)
+        OP_S_ACCEPT_STREAM_WAIT(b)
+            OP_S_READ_EXPECT(b, "foo", 3)
+                OP_S_EXPECT_FIN(b)
+                    OP_S_UNBIND_STREAM_ID(b)
 
-    OP_END_REPEAT           ()
+                        OP_END_REPEAT()
 
-    OP_END
+                            OP_END
 };
 
 /* 16. Server sending large number of streams, MAX_STREAMS test */
 static const struct script_op script_16[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
     /*
      * This will cause a protocol violation to be raised by the client if we are
      * not handling the stream limit correctly on the TX side.
      */
-    OP_BEGIN_REPEAT         (200)
+    OP_BEGIN_REPEAT(200)
 
-    OP_S_NEW_STREAM_BIDI    (a, ANY_ID)
-    OP_S_WRITE              (a, "foo", 3)
-    OP_S_CONCLUDE           (a)
-    OP_S_UNBIND_STREAM_ID   (a)
+        OP_S_NEW_STREAM_BIDI(a, ANY_ID)
+            OP_S_WRITE(a, "foo", 3)
+                OP_S_CONCLUDE(a)
+                    OP_S_UNBIND_STREAM_ID(a)
 
-    OP_END_REPEAT           ()
+                        OP_END_REPEAT()
 
     /* Prove that the connection is still good. */
-    OP_C_NEW_STREAM_BIDI    (a, ANY_ID)
-    OP_C_WRITE              (a, "bar", 3)
-    OP_C_CONCLUDE           (a)
+    OP_C_NEW_STREAM_BIDI(a, ANY_ID)
+        OP_C_WRITE(a, "bar", 3)
+            OP_C_CONCLUDE(a)
 
-    OP_S_ACCEPT_STREAM_WAIT (b)
-    OP_S_READ_EXPECT        (b, "bar", 3)
-    OP_S_EXPECT_FIN         (b)
+                OP_S_ACCEPT_STREAM_WAIT(b)
+                    OP_S_READ_EXPECT(b, "bar", 3)
+                        OP_S_EXPECT_FIN(b)
 
     /* Drain the queue of incoming streams. */
-    OP_BEGIN_REPEAT         (200)
+    OP_BEGIN_REPEAT(200)
 
-    OP_C_ACCEPT_STREAM_WAIT (b)
-    OP_C_READ_EXPECT        (b, "foo", 3)
-    OP_C_EXPECT_FIN         (b)
-    OP_C_FREE_STREAM        (b)
+        OP_C_ACCEPT_STREAM_WAIT(b)
+            OP_C_READ_EXPECT(b, "foo", 3)
+                OP_C_EXPECT_FIN(b)
+                    OP_C_FREE_STREAM(b)
 
-    OP_END_REPEAT           ()
+                        OP_END_REPEAT()
 
-    OP_END
+                            OP_END
 };
 
 /* 17. Key update test - unlimited */
 static const struct script_op script_17[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
+            OP_C_WRITE(DEFAULT, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                    OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_CHECK                (override_key_update, 1)
+                        OP_CHECK(override_key_update, 1)
 
-    OP_BEGIN_REPEAT         (200)
+                            OP_BEGIN_REPEAT(200)
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                                OP_C_WRITE(DEFAULT, "apple", 5)
+                                    OP_S_READ_EXPECT(a, "apple", 5)
 
     /*
      * TXKU frequency is bounded by RTT because a previous TXKU needs to be
@@ -2635,45 +2561,45 @@ static const struct script_op script_17[] = {
      * waiting this long, we eliminate any such concern and ensure as many key
      * updates as possible can occur for the purposes of this test.
      */
-    OP_CHECK                (skip_time_ms,    100)
+    OP_CHECK(skip_time_ms, 100)
 
-    OP_END_REPEAT           ()
+        OP_END_REPEAT()
 
     /* At least 5 RXKUs detected */
-    OP_CHECK                (check_key_update_ge, 5)
+    OP_CHECK(check_key_update_ge, 5)
 
     /*
      * Prove the connection is still healthy by sending something in both
      * directions.
      */
-    OP_C_WRITE              (DEFAULT, "xyzzy", 5)
-    OP_S_READ_EXPECT        (a, "xyzzy", 5)
+    OP_C_WRITE(DEFAULT, "xyzzy", 5)
+        OP_S_READ_EXPECT(a, "xyzzy", 5)
 
-    OP_S_WRITE              (a, "plugh", 5)
-    OP_C_READ_EXPECT        (DEFAULT, "plugh", 5)
+            OP_S_WRITE(a, "plugh", 5)
+                OP_C_READ_EXPECT(DEFAULT, "plugh", 5)
 
-    OP_END
+                    OP_END
 };
 
 /* 18. Key update test - RTT-bounded */
 static const struct script_op script_18[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
+            OP_C_WRITE(DEFAULT, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                    OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_CHECK                (override_key_update, 1)
+                        OP_CHECK(override_key_update, 1)
 
-    OP_BEGIN_REPEAT         (200)
+                            OP_BEGIN_REPEAT(200)
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_READ_EXPECT        (a, "apple", 5)
-    OP_CHECK                (skip_time_ms,    8)
+                                OP_C_WRITE(DEFAULT, "apple", 5)
+                                    OP_S_READ_EXPECT(a, "apple", 5)
+                                        OP_CHECK(skip_time_ms, 8)
 
-    OP_END_REPEAT           ()
+                                            OP_END_REPEAT()
 
     /*
      * This time we simulate far less time passing between writes, so there are
@@ -2681,48 +2607,48 @@ static const struct script_op script_18[] = {
      * 1 packet above, which is absurd; thus this ensures we only actually
      * generate TXKUs when we are allowed to.
      */
-    OP_CHECK                (check_key_update_lt, 240)
+    OP_CHECK(check_key_update_lt, 240)
 
     /*
      * Prove the connection is still healthy by sending something in both
      * directions.
      */
-    OP_C_WRITE              (DEFAULT, "xyzzy", 5)
-    OP_S_READ_EXPECT        (a, "xyzzy", 5)
+    OP_C_WRITE(DEFAULT, "xyzzy", 5)
+        OP_S_READ_EXPECT(a, "xyzzy", 5)
 
-    OP_S_WRITE              (a, "plugh", 5)
-    OP_C_READ_EXPECT        (DEFAULT, "plugh", 5)
+            OP_S_WRITE(a, "plugh", 5)
+                OP_C_READ_EXPECT(DEFAULT, "plugh", 5)
 
-    OP_END
+                    OP_END
 };
 
 /* 19. Key update test - artificially triggered */
 static const struct script_op script_19[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
+            OP_C_WRITE(DEFAULT, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                    OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_C_WRITE              (DEFAULT, "orange", 6)
-    OP_S_READ_EXPECT        (a, "orange", 6)
+                        OP_C_WRITE(DEFAULT, "orange", 6)
+                            OP_S_READ_EXPECT(a, "orange", 6)
 
-    OP_S_WRITE              (a, "strawberry", 10)
-    OP_C_READ_EXPECT        (DEFAULT, "strawberry", 10)
+                                OP_S_WRITE(a, "strawberry", 10)
+                                    OP_C_READ_EXPECT(DEFAULT, "strawberry", 10)
 
-    OP_CHECK                (check_key_update_lt, 1)
-    OP_CHECK                (trigger_key_update, 0)
+                                        OP_CHECK(check_key_update_lt, 1)
+                                            OP_CHECK(trigger_key_update, 0)
 
-    OP_C_WRITE              (DEFAULT, "orange", 6)
-    OP_S_READ_EXPECT        (a, "orange", 6)
-    OP_S_WRITE              (a, "ok", 2)
+                                                OP_C_WRITE(DEFAULT, "orange", 6)
+                                                    OP_S_READ_EXPECT(a, "orange", 6)
+                                                        OP_S_WRITE(a, "ok", 2)
 
-    OP_C_READ_EXPECT        (DEFAULT, "ok", 2)
-    OP_CHECK                (check_key_update_ge, 1)
+                                                            OP_C_READ_EXPECT(DEFAULT, "ok", 2)
+                                                                OP_CHECK(check_key_update_ge, 1)
 
-    OP_END
+                                                                    OP_END
 };
 
 /* 20. Multiple threads accept stream with socket forcibly closed (error test) */
@@ -2777,69 +2703,157 @@ static int script_20_wait2(struct helper *h, struct helper_local *hl)
 }
 
 static const struct script_op script_20_child[] = {
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "foo", 3)
+    OP_C_ACCEPT_STREAM_WAIT(a)
+        OP_C_READ_EXPECT(a, "foo", 3)
 
-    OP_CHECK                (script_20_trigger1, 0)
-    OP_CHECK                (script_20_wait2, 1)
+            OP_CHECK(script_20_trigger1, 0)
+                OP_CHECK(script_20_wait2, 1)
 
-    OP_C_READ_FAIL_WAIT     (a)
-    OP_C_EXPECT_SSL_ERR     (a, SSL_ERROR_SYSCALL)
+                    OP_C_READ_FAIL_WAIT(a)
+                        OP_C_EXPECT_SSL_ERR(a, SSL_ERROR_SYSCALL)
 
-    OP_EXPECT_ERR_LIB       (ERR_LIB_SSL)
-    OP_EXPECT_ERR_REASON    (SSL_R_PROTOCOL_IS_SHUTDOWN)
+                            OP_EXPECT_ERR_LIB(ERR_LIB_SSL)
+                                OP_EXPECT_ERR_REASON(SSL_R_PROTOCOL_IS_SHUTDOWN)
 
-    OP_POP_ERR              ()
-    OP_EXPECT_ERR_LIB       (ERR_LIB_SSL)
-    OP_EXPECT_ERR_REASON    (SSL_R_QUIC_NETWORK_ERROR)
+                                    OP_POP_ERR()
+                                        OP_EXPECT_ERR_LIB(ERR_LIB_SSL)
+                                            OP_EXPECT_ERR_REASON(SSL_R_QUIC_NETWORK_ERROR)
 
-    OP_C_FREE_STREAM        (a)
+                                                OP_C_FREE_STREAM(a)
 
-    OP_END
+                                                    OP_END
 };
 
 static const struct script_op script_20[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_NEW_THREAD           (5, script_20_child)
+                OP_NEW_THREAD(5, script_20_child)
 
-    OP_BEGIN_REPEAT         (5)
+                    OP_BEGIN_REPEAT(5)
 
-    OP_S_NEW_STREAM_BIDI    (a, ANY_ID)
-    OP_S_WRITE              (a, "foo", 3)
-    OP_S_UNBIND_STREAM_ID   (a)
+                        OP_S_NEW_STREAM_BIDI(a, ANY_ID)
+                            OP_S_WRITE(a, "foo", 3)
+                                OP_S_UNBIND_STREAM_ID(a)
 
-    OP_END_REPEAT           ()
+                                    OP_END_REPEAT()
 
-    OP_CHECK                (script_20_wait1, 5)
+                                        OP_CHECK(script_20_wait1, 5)
 
-    OP_C_CLOSE_SOCKET       ()
-    OP_CHECK                (script_20_trigger2, 0)
+                                            OP_C_CLOSE_SOCKET()
+                                                OP_CHECK(script_20_trigger2, 0)
 
-    OP_END
+                                                    OP_END
 };
 
 /* 21. Fault injection - unknown frame in 1-RTT packet */
 static int script_21_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     WPACKET wpkt;
-    unsigned char frame_buf[8];
+    unsigned char frame_buf[21];
     size_t written;
 
     if (h->inject_word0 == 0 || hdr->type != h->inject_word0)
         return 1;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, h->inject_word1)))
         goto err;
 
+    switch (h->inject_word1) {
+    case OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE:
+    case OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE:
+    case OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID:
+        /*
+         * These cases to be formatted properly need a single uint64_t
+         */
+        if (!TEST_true(WPACKET_put_bytes_u64(&wpkt, (uint64_t)0)))
+            goto err;
+        break;
+    case OSSL_QUIC_FRAME_TYPE_MAX_DATA:
+    case OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI:
+    case OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI:
+    case OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI:
+    case OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI:
+    case OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED:
+        /*
+         * These cases require a single vlint
+         */
+        if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, (uint64_t)0)))
+            goto err;
+        break;
+    case OSSL_QUIC_FRAME_TYPE_STOP_SENDING:
+    case OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA:
+    case OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED:
+        /*
+         * These cases require 2 variable integers
+         */
+        if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, (uint64_t)0)))
+            goto err;
+        if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, (uint64_t)0)))
+            goto err;
+        break;
+    case OSSL_QUIC_FRAME_TYPE_STREAM:
+    case OSSL_QUIC_FRAME_TYPE_RESET_STREAM:
+    case OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_APP:
+        /*
+         * These cases require 3 variable integers
+         */
+        if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, (uint64_t)0)))
+            goto err;
+        if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, (uint64_t)0)))
+            goto err;
+        if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, (uint64_t)0)))
+            goto err;
+        break;
+    case OSSL_QUIC_FRAME_TYPE_NEW_TOKEN:
+        /*
+         * Special case for new token
+         */
+
+        /* New token length, cannot be zero */
+        if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, (uint64_t)1)))
+            goto err;
+
+        /* 1 bytes of token data, to match the above length */
+        if (!TEST_true(WPACKET_put_bytes_u8(&wpkt, (uint8_t)0)))
+            goto err;
+        break;
+    case OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID:
+        /*
+         * Special case for New Connection ids, has a combination
+         * of vlints and fixed width values
+         */
+
+        /* seq number */
+        if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, (uint64_t)0)))
+            goto err;
+
+        /* retire prior to */
+        if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, (uint64_t)0)))
+            goto err;
+
+        /* Connection id length, arbitrary at 1 bytes */
+        if (!TEST_true(WPACKET_put_bytes_u8(&wpkt, (uint8_t)1)))
+            goto err;
+
+        /* The connection id, to match the above length */
+        if (!TEST_true(WPACKET_put_bytes_u8(&wpkt, (uint8_t)0)))
+            goto err;
+
+        /* 16 bytes total for the SRT */
+        if (!TEST_true(WPACKET_memset(&wpkt, 0, 16)))
+            goto err;
+
+        break;
+    }
+
     if (!TEST_true(WPACKET_get_total_written(&wpkt, &written)))
         goto err;
 
@@ -2856,26 +2870,26 @@ static int script_21_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_21[] = {
-    OP_S_SET_INJECT_PLAIN   (script_21_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_21_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (QUIC_PKT_TYPE_1RTT, OSSL_QUIC_VLINT_MAX)
+                            OP_SET_INJECT_WORD(QUIC_PKT_TYPE_1RTT, OSSL_QUIC_VLINT_MAX)
 
-    OP_S_WRITE              (a, "orange", 6)
+                                OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+                                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                                        OP_END
 };
 
 /* 22. Fault injection - non-zero packet header reserved bits */
 static int script_22_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     if (h->inject_word0 == 0)
         return 1;
@@ -2885,26 +2899,26 @@ static int script_22_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_22[] = {
-    OP_S_SET_INJECT_PLAIN   (script_22_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_22_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, 0)
+                            OP_SET_INJECT_WORD(1, 0)
 
-    OP_S_WRITE              (a, "orange", 6)
+                                OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_PROTOCOL_VIOLATION,0,0)
+                                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, 0)
 
-    OP_END
+                                        OP_END
 };
 
 /* 23. Fault injection - empty NEW_TOKEN */
 static int script_23_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     WPACKET wpkt;
@@ -2915,7 +2929,7 @@ static int script_23_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
         return 1;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, OSSL_QUIC_FRAME_TYPE_NEW_TOKEN))
@@ -2938,26 +2952,26 @@ static int script_23_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_23[] = {
-    OP_S_SET_INJECT_PLAIN   (script_23_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_23_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, 0)
+                            OP_SET_INJECT_WORD(1, 0)
 
-    OP_S_WRITE              (a, "orange", 6)
+                                OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+                                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                                        OP_END
 };
 
 /* 24. Fault injection - excess value of MAX_STREAMS_BIDI */
 static int script_24_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     WPACKET wpkt;
@@ -2968,7 +2982,7 @@ static int script_24_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
         return 1;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, h->inject_word1))
@@ -2991,83 +3005,83 @@ static int script_24_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_24[] = {
-    OP_S_SET_INJECT_PLAIN   (script_24_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_24_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI)
+                            OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI)
 
-    OP_S_WRITE              (a, "orange", 6)
+                                OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+                                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                                        OP_END
 };
 
 /* 25. Fault injection - excess value of MAX_STREAMS_UNI */
 static const struct script_op script_25[] = {
-    OP_S_SET_INJECT_PLAIN   (script_24_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_24_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI)
+                            OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI)
 
-    OP_S_WRITE              (a, "orange", 6)
+                                OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+                                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                                        OP_END
 };
 
 /* 26. Fault injection - excess value of STREAMS_BLOCKED_BIDI */
 static const struct script_op script_26[] = {
-    OP_S_SET_INJECT_PLAIN   (script_24_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_24_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI)
+                            OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI)
 
-    OP_S_WRITE              (a, "orange", 6)
+                                OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR,0,0)
+                                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR, 0, 0)
 
-    OP_END
+                                        OP_END
 };
 
 /* 27. Fault injection - excess value of STREAMS_BLOCKED_UNI */
 static const struct script_op script_27[] = {
-    OP_S_SET_INJECT_PLAIN   (script_24_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_24_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI)
+                            OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI)
 
-    OP_S_WRITE              (a, "orange", 6)
+                                OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR,0,0)
+                                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR, 0, 0)
 
-    OP_END
+                                        OP_END
 };
 
 /* 28. Fault injection - received RESET_STREAM for send-only stream */
 static int script_28_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     WPACKET wpkt;
@@ -3078,15 +3092,15 @@ static int script_28_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
         return 1;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, h->inject_word1))
         || !TEST_true(WPACKET_quic_write_vlint(&wpkt, /* stream ID */
-                                               h->inject_word0 - 1))
+            h->inject_word0 - 1))
         || !TEST_true(WPACKET_quic_write_vlint(&wpkt, 123))
         || (h->inject_word1 == OSSL_QUIC_FRAME_TYPE_RESET_STREAM
-           && !TEST_true(WPACKET_quic_write_vlint(&wpkt, 5)))) /* final size */
+            && !TEST_true(WPACKET_quic_write_vlint(&wpkt, 5)))) /* final size */
         goto err;
 
     if (!TEST_true(WPACKET_get_total_written(&wpkt, &written)))
@@ -3105,103 +3119,103 @@ static int script_28_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_28[] = {
-    OP_S_SET_INJECT_PLAIN   (script_28_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_28_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "orange", 6)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "orange", 6)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "orange", 6)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "orange", 6)
 
-    OP_C_NEW_STREAM_UNI     (b, C_UNI_ID(0))
-    OP_C_WRITE              (b, "apple", 5)
+                                    OP_C_NEW_STREAM_UNI(b, C_UNI_ID(0))
+                                        OP_C_WRITE(b, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (b, C_UNI_ID(0))
-    OP_S_READ_EXPECT        (b, "apple", 5)
+                                            OP_S_BIND_STREAM_ID(b, C_UNI_ID(0))
+                                                OP_S_READ_EXPECT(b, "apple", 5)
 
-    OP_SET_INJECT_WORD      (C_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_RESET_STREAM)
-    OP_S_WRITE              (a, "fruit", 5)
+                                                    OP_SET_INJECT_WORD(C_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_RESET_STREAM)
+                                                        OP_S_WRITE(a, "fruit", 5)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0)
+                                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR, 0, 0)
 
-    OP_END
+                                                                OP_END
 };
 
 /* 29. Fault injection - received RESET_STREAM for nonexistent send-only stream */
 static const struct script_op script_29[] = {
-    OP_S_SET_INJECT_PLAIN   (script_28_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_28_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "orange", 6)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "orange", 6)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "orange", 6)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "orange", 6)
 
-    OP_C_NEW_STREAM_UNI     (b, C_UNI_ID(0))
-    OP_C_WRITE              (b, "apple", 5)
+                                    OP_C_NEW_STREAM_UNI(b, C_UNI_ID(0))
+                                        OP_C_WRITE(b, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (b, C_UNI_ID(0))
-    OP_S_READ_EXPECT        (b, "apple", 5)
+                                            OP_S_BIND_STREAM_ID(b, C_UNI_ID(0))
+                                                OP_S_READ_EXPECT(b, "apple", 5)
 
-    OP_SET_INJECT_WORD      (C_UNI_ID(1) + 1, OSSL_QUIC_FRAME_TYPE_RESET_STREAM)
-    OP_S_WRITE              (a, "fruit", 5)
+                                                    OP_SET_INJECT_WORD(C_UNI_ID(1) + 1, OSSL_QUIC_FRAME_TYPE_RESET_STREAM)
+                                                        OP_S_WRITE(a, "fruit", 5)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0)
+                                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR, 0, 0)
 
-    OP_END
+                                                                OP_END
 };
 
 /* 30. Fault injection - received STOP_SENDING for receive-only stream */
 static const struct script_op script_30[] = {
-    OP_S_SET_INJECT_PLAIN   (script_28_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_28_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_S_NEW_STREAM_UNI     (a, S_UNI_ID(0))
-    OP_S_WRITE              (a, "apple", 5)
+                    OP_S_NEW_STREAM_UNI(a, S_UNI_ID(0))
+                        OP_S_WRITE(a, "apple", 5)
 
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "apple", 5)
+                            OP_C_ACCEPT_STREAM_WAIT(a)
+                                OP_C_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (S_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_STOP_SENDING)
-    OP_S_WRITE              (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(S_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_STOP_SENDING)
+                                        OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 31. Fault injection - received STOP_SENDING for nonexistent receive-only stream */
 static const struct script_op script_31[] = {
-    OP_S_SET_INJECT_PLAIN   (script_28_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_28_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_S_NEW_STREAM_UNI     (a, S_UNI_ID(0))
-    OP_S_WRITE              (a, "apple", 5)
+                    OP_S_NEW_STREAM_UNI(a, S_UNI_ID(0))
+                        OP_S_WRITE(a, "apple", 5)
 
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "apple", 5)
+                            OP_C_ACCEPT_STREAM_WAIT(a)
+                                OP_C_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (C_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_STOP_SENDING)
-    OP_S_WRITE              (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(C_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_STOP_SENDING)
+                                        OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 32. Fault injection - STREAM frame for nonexistent stream */
 static int script_32_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     WPACKET wpkt;
@@ -3218,30 +3232,30 @@ static int script_32_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
     case 0:
         return 1;
     case 1:
-        offset  = 0;
-        flen    = 0;
+        offset = 0;
+        flen = 0;
         break;
     case 2:
-        offset  = (((uint64_t)1)<<62) - 1;
-        flen    = 5;
+        offset = (((uint64_t)1) << 62) - 1;
+        flen = 5;
         break;
     case 3:
-        offset  = 1 * 1024 * 1024 * 1024; /* 1G */
-        flen    = 5;
+        offset = 1 * 1024 * 1024 * 1024; /* 1G */
+        flen = 5;
         break;
     case 4:
-        offset  = 0;
-        flen    = 1;
+        offset = 0;
+        flen = 1;
         break;
     }
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, type))
         || !TEST_true(WPACKET_quic_write_vlint(&wpkt, /* stream ID */
-                                               h->inject_word0 - 1))
+            h->inject_word0 - 1))
         || !TEST_true(WPACKET_quic_write_vlint(&wpkt, offset))
         || !TEST_true(WPACKET_quic_write_vlint(&wpkt, flen)))
         goto err;
@@ -3266,164 +3280,164 @@ static int script_32_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_32[] = {
-    OP_S_SET_INJECT_PLAIN   (script_32_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_32_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_S_NEW_STREAM_UNI     (a, S_UNI_ID(0))
-    OP_S_WRITE              (a, "apple", 5)
+                    OP_S_NEW_STREAM_UNI(a, S_UNI_ID(0))
+                        OP_S_WRITE(a, "apple", 5)
 
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "apple", 5)
+                            OP_C_ACCEPT_STREAM_WAIT(a)
+                                OP_C_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (C_UNI_ID(0) + 1, 1)
-    OP_S_WRITE              (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(C_UNI_ID(0) + 1, 1)
+                                        OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 33. Fault injection - STREAM frame with illegal offset */
 static const struct script_op script_33[] = {
-    OP_S_SET_INJECT_PLAIN   (script_32_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_32_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (C_BIDI_ID(0) + 1, 2)
-    OP_S_WRITE              (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(C_BIDI_ID(0) + 1, 2)
+                                        OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 34. Fault injection - STREAM frame which exceeds FC */
 static const struct script_op script_34[] = {
-    OP_S_SET_INJECT_PLAIN   (script_32_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_32_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (C_BIDI_ID(0) + 1, 3)
-    OP_S_WRITE              (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(C_BIDI_ID(0) + 1, 3)
+                                        OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FLOW_CONTROL_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 35. Fault injection - MAX_STREAM_DATA for receive-only stream */
 static const struct script_op script_35[] = {
-    OP_S_SET_INJECT_PLAIN   (script_28_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_28_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_S_NEW_STREAM_UNI     (a, S_UNI_ID(0))
-    OP_S_WRITE              (a, "apple", 5)
+                    OP_S_NEW_STREAM_UNI(a, S_UNI_ID(0))
+                        OP_S_WRITE(a, "apple", 5)
 
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "apple", 5)
+                            OP_C_ACCEPT_STREAM_WAIT(a)
+                                OP_C_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (S_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA)
-    OP_S_WRITE              (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(S_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA)
+                                        OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 36. Fault injection - MAX_STREAM_DATA for nonexistent stream */
 static const struct script_op script_36[] = {
-    OP_S_SET_INJECT_PLAIN   (script_28_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_28_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_S_NEW_STREAM_UNI     (a, S_UNI_ID(0))
-    OP_S_WRITE              (a, "apple", 5)
+                    OP_S_NEW_STREAM_UNI(a, S_UNI_ID(0))
+                        OP_S_WRITE(a, "apple", 5)
 
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "apple", 5)
+                            OP_C_ACCEPT_STREAM_WAIT(a)
+                                OP_C_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (C_BIDI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA)
-    OP_S_WRITE              (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(C_BIDI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA)
+                                        OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 37. Fault injection - STREAM_DATA_BLOCKED for send-only stream */
 static const struct script_op script_37[] = {
-    OP_S_SET_INJECT_PLAIN   (script_28_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_28_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_UNI     (a, C_UNI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
+                    OP_C_NEW_STREAM_UNI(a, C_UNI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_UNI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_UNI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_S_NEW_STREAM_UNI     (b, S_UNI_ID(0))
-    OP_SET_INJECT_WORD      (C_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED)
-    OP_S_WRITE              (b, "orange", 5)
+                                    OP_S_NEW_STREAM_UNI(b, S_UNI_ID(0))
+                                        OP_SET_INJECT_WORD(C_UNI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED)
+                                            OP_S_WRITE(b, "orange", 5)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0)
+                                                OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR, 0, 0)
 
-    OP_END
+                                                    OP_END
 };
 
 /* 38. Fault injection - STREAM_DATA_BLOCKED for non-existent stream */
 static const struct script_op script_38[] = {
-    OP_S_SET_INJECT_PLAIN   (script_28_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_28_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_UNI     (a, C_UNI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
+                    OP_C_NEW_STREAM_UNI(a, C_UNI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_UNI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_UNI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (C_BIDI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED)
+                                    OP_SET_INJECT_WORD(C_BIDI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED)
 
-    OP_S_NEW_STREAM_UNI     (b, S_UNI_ID(0))
-    OP_S_WRITE              (b, "orange", 5)
+                                        OP_S_NEW_STREAM_UNI(b, S_UNI_ID(0))
+                                            OP_S_WRITE(b, "orange", 5)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0)
+                                                OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR, 0, 0)
 
-    OP_END
+                                                    OP_END
 };
 
 /* 39. Fault injection - NEW_CONN_ID with zero-len CID */
 static int script_39_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     WPACKET wpkt;
     unsigned char frame_buf[64];
     size_t i, written;
     uint64_t seq_no = 0, retire_prior_to = 0;
-    QUIC_CONN_ID new_cid = {0};
+    QUIC_CONN_ID new_cid = { 0 };
     QUIC_CHANNEL *ch = ossl_quic_tserver_get_channel(h->s_priv);
 
     if (hdr->type != QUIC_PKT_TYPE_1RTT)
@@ -3433,23 +3447,23 @@ static int script_39_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
     case 0:
         return 1;
     case 1:
-        new_cid.id_len  = 0;
+        new_cid.id_len = 0;
         break;
     case 2:
-        new_cid.id_len  = 21;
+        new_cid.id_len = 21;
         break;
     case 3:
-        new_cid.id_len  = 1;
-        new_cid.id[0]   = 0x55;
+        new_cid.id_len = 1;
+        new_cid.id[0] = 0x55;
 
-        seq_no          = 0;
+        seq_no = 0;
         retire_prior_to = 1;
         break;
     case 4:
         /* Use our actual CID so we don't break connectivity. */
         ossl_quic_channel_get_diag_local_cid(ch, &new_cid);
 
-        seq_no          = 2;
+        seq_no = 2;
         retire_prior_to = 2;
         break;
     case 5:
@@ -3457,16 +3471,16 @@ static int script_39_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
          * Use a bogus CID which will need to be ignored if connectivity is to
          * be continued.
          */
-        new_cid.id_len  = 8;
-        new_cid.id[0]   = 0x55;
+        new_cid.id_len = 8;
+        new_cid.id[0] = 0x55;
 
-        seq_no          = 1;
+        seq_no = 1;
         retire_prior_to = 1;
         break;
     }
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID))
@@ -3503,69 +3517,69 @@ static int script_39_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_39[] = {
-    OP_S_SET_INJECT_PLAIN   (script_39_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_39_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (0, 1)
-    OP_S_WRITE              (a, "orange", 5)
+                                    OP_SET_INJECT_WORD(0, 1)
+                                        OP_S_WRITE(a, "orange", 5)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 40. Shutdown flush test */
 static const unsigned char script_40_data[1024] = "strawberry";
 
 static const struct script_op script_40[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
+                OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                    OP_C_WRITE(a, "apple", 5)
 
-    OP_C_INHIBIT_TICK       (1)
-    OP_C_SET_WRITE_BUF_SIZE (a, 1024 * 100 * 3)
+                        OP_C_INHIBIT_TICK(1)
+                            OP_C_SET_WRITE_BUF_SIZE(a, 1024 * 100 * 3)
 
-    OP_BEGIN_REPEAT         (100)
+                                OP_BEGIN_REPEAT(100)
 
-    OP_C_WRITE              (a, script_40_data, sizeof(script_40_data))
+                                    OP_C_WRITE(a, script_40_data, sizeof(script_40_data))
 
-    OP_END_REPEAT           ()
+                                        OP_END_REPEAT()
 
-    OP_C_CONCLUDE           (a)
-    OP_C_SHUTDOWN_WAIT      (NULL, 0) /* disengages tick inhibition */
+                                            OP_C_CONCLUDE(a)
+                                                OP_C_SHUTDOWN_WAIT(NULL, 0) /* disengages tick inhibition */
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_BEGIN_REPEAT         (100)
+            OP_BEGIN_REPEAT(100)
 
-    OP_S_READ_EXPECT        (a, script_40_data, sizeof(script_40_data))
+                OP_S_READ_EXPECT(a, script_40_data, sizeof(script_40_data))
 
-    OP_END_REPEAT           ()
+                    OP_END_REPEAT()
 
-    OP_S_EXPECT_FIN         (a)
+                        OP_S_EXPECT_FIN(a)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(0, 1, 0)
-    OP_S_EXPECT_CONN_CLOSE_INFO(0, 1, 1)
+                            OP_C_EXPECT_CONN_CLOSE_INFO(0, 1, 0)
+                                OP_S_EXPECT_CONN_CLOSE_INFO(0, 1, 1)
 
-    OP_END
+                                    OP_END
 };
 
 /* 41. Fault injection - PATH_CHALLENGE yields PATH_RESPONSE */
 static const uint64_t path_challenge = UINT64_C(0xbdeb9451169c83aa);
 
 static int script_41_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     WPACKET wpkt;
@@ -3576,7 +3590,7 @@ static int script_41_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
         return 1;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, h->inject_word1))
@@ -3601,7 +3615,7 @@ static int script_41_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static void script_41_trace(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)
 {
     uint64_t frame_type, frame_data;
     int was_minimal;
@@ -3619,7 +3633,7 @@ static void script_41_trace(int write_p, int version, int content_type,
     }
 
     if (!TEST_true(ossl_quic_wire_peek_frame_header(&pkt, &frame_type,
-                                                    &was_minimal))) {
+            &was_minimal))) {
         ++h->scratch1;
         return;
     }
@@ -3627,13 +3641,13 @@ static void script_41_trace(int write_p, int version, int content_type,
     if (frame_type != OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE)
         return;
 
-   if (!TEST_true(ossl_quic_wire_decode_frame_path_response(&pkt, &frame_data))
-       || !TEST_uint64_t_eq(frame_data, path_challenge)) {
-       ++h->scratch1;
+    if (!TEST_true(ossl_quic_wire_decode_frame_path_response(&pkt, &frame_data))
+        || !TEST_uint64_t_eq(frame_data, path_challenge)) {
+        ++h->scratch1;
         return;
-   }
+    }
 
-   ++h->scratch0;
+    ++h->scratch0;
 }
 
 static int script_41_setup(struct helper *h, struct helper_local *hl)
@@ -3656,30 +3670,30 @@ static int script_41_check(struct helper *h, struct helper_local *hl)
 }
 
 static const struct script_op script_41[] = {
-    OP_S_SET_INJECT_PLAIN   (script_41_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_CHECK                (script_41_setup, 0)
+    OP_S_SET_INJECT_PLAIN(script_41_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_CHECK(script_41_setup, 0)
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                    OP_C_WRITE(DEFAULT, "apple", 5)
+                        OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                            OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE)
+                                OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE)
 
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (DEFAULT, "orange", 6)
+                                    OP_S_WRITE(a, "orange", 6)
+                                        OP_C_READ_EXPECT(DEFAULT, "orange", 6)
 
-    OP_C_WRITE              (DEFAULT, "strawberry", 10)
-    OP_S_READ_EXPECT        (a, "strawberry", 10)
+                                            OP_C_WRITE(DEFAULT, "strawberry", 10)
+                                                OP_S_READ_EXPECT(a, "strawberry", 10)
 
-    OP_CHECK                (script_41_check, 0)
-    OP_END
+                                                    OP_CHECK(script_41_check, 0)
+                                                        OP_END
 };
 
 /* 42. Fault injection - CRYPTO frame with illegal offset */
 static int script_42_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     unsigned char frame_buf[64];
@@ -3692,7 +3706,7 @@ static int script_42_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
     --h->inject_word0;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, OSSL_QUIC_FRAME_TYPE_CRYPTO))
@@ -3717,49 +3731,49 @@ static int script_42_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_42[] = {
-    OP_S_SET_INJECT_PLAIN   (script_42_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_42_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, (((uint64_t)1) << 62) - 1)
-    OP_S_WRITE              (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(1, (((uint64_t)1) << 62) - 1)
+                                        OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 43. Fault injection - CRYPTO frame exceeding FC */
 static const struct script_op script_43[] = {
-    OP_S_SET_INJECT_PLAIN   (script_42_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_42_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, 0x100000 /* 1 MiB */)
-    OP_S_WRITE              (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(1, 0x100000 /* 1 MiB */)
+                                        OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 44. Fault injection - PADDING */
 static int script_44_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     WPACKET wpkt;
@@ -3770,7 +3784,7 @@ static int script_44_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
         return 1;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(ossl_quic_wire_encode_padding(&wpkt, 1)))
@@ -3792,20 +3806,20 @@ static int script_44_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_44[] = {
-    OP_S_SET_INJECT_PLAIN   (script_44_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_44_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, 0)
+                            OP_SET_INJECT_WORD(1, 0)
 
-    OP_S_WRITE              (a, "Strawberry", 10)
-    OP_C_READ_EXPECT        (DEFAULT, "Strawberry", 10)
+                                OP_S_WRITE(a, "Strawberry", 10)
+                                    OP_C_READ_EXPECT(DEFAULT, "Strawberry", 10)
 
-    OP_END
+                                        OP_END
 };
 
 /* 45. PING must generate ACK */
@@ -3837,29 +3851,29 @@ static int wait_incoming_acks_increased(struct helper *h, struct helper_local *h
 }
 
 static const struct script_op script_45[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+            OP_C_WRITE(DEFAULT, "apple", 5)
+                OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                    OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_BEGIN_REPEAT         (2)
+                        OP_BEGIN_REPEAT(2)
 
-    OP_CHECK                (force_ping, 0)
-    OP_CHECK                (wait_incoming_acks_increased, 0)
+                            OP_CHECK(force_ping, 0)
+                                OP_CHECK(wait_incoming_acks_increased, 0)
 
-    OP_END_REPEAT           ()
+                                    OP_END_REPEAT()
 
-    OP_S_WRITE              (a, "Strawberry", 10)
-    OP_C_READ_EXPECT        (DEFAULT, "Strawberry", 10)
+                                        OP_S_WRITE(a, "Strawberry", 10)
+                                            OP_C_READ_EXPECT(DEFAULT, "Strawberry", 10)
 
-    OP_END
+                                                OP_END
 };
 
 /* 46. Fault injection - ACK - malformed initial range */
 static int script_46_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     WPACKET wpkt;
@@ -3873,46 +3887,46 @@ static int script_46_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
         return 1;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     type = OSSL_QUIC_FRAME_TYPE_ACK_WITHOUT_ECN;
 
     switch (h->inject_word0) {
     case 1:
-        largest_acked   = 100;
-        first_range     = 101;
-        range_count     = 0;
+        largest_acked = 100;
+        first_range = 101;
+        range_count = 0;
         break;
     case 2:
-        largest_acked   = 100;
-        first_range     = 80;
+        largest_acked = 100;
+        first_range = 80;
         /* [20..100]; [0..18]  */
-        range_count     = 1;
-        agap            = 0;
-        alen            = 19;
+        range_count = 1;
+        agap = 0;
+        alen = 19;
         break;
     case 3:
-        largest_acked   = 100;
-        first_range     = 80;
-        range_count     = 1;
-        agap            = 18;
-        alen            = 1;
+        largest_acked = 100;
+        first_range = 80;
+        range_count = 1;
+        agap = 18;
+        alen = 1;
         break;
     case 4:
-        type            = OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN;
-        largest_acked   = 100;
-        first_range     = 1;
-        range_count     = 0;
+        type = OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN;
+        largest_acked = 100;
+        first_range = 1;
+        range_count = 0;
         break;
     case 5:
-        type            = OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN;
-        largest_acked   = 0;
-        first_range     = 0;
-        range_count     = 0;
-        ect0            = 0;
-        ect1            = 50;
-        ecnce           = 200;
+        type = OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN;
+        largest_acked = 0;
+        first_range = 0;
+        range_count = 0;
+        ect0 = 0;
+        ect1 = 50;
+        ecnce = 200;
         break;
     }
 
@@ -3952,125 +3966,125 @@ static int script_46_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_46[] = {
-    OP_S_SET_INJECT_PLAIN   (script_46_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_46_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, 0)
+                            OP_SET_INJECT_WORD(1, 0)
 
-    OP_S_WRITE              (a, "Strawberry", 10)
+                                OP_S_WRITE(a, "Strawberry", 10)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+                                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                                        OP_END
 };
 
 /* 47. Fault injection - ACK - malformed subsequent range */
 static const struct script_op script_47[] = {
-    OP_S_SET_INJECT_PLAIN   (script_46_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_46_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (2, 0)
+                            OP_SET_INJECT_WORD(2, 0)
 
-    OP_S_WRITE              (a, "Strawberry", 10)
+                                OP_S_WRITE(a, "Strawberry", 10)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+                                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                                        OP_END
 };
 
 /* 48. Fault injection - ACK - malformed subsequent range */
 static const struct script_op script_48[] = {
-    OP_S_SET_INJECT_PLAIN   (script_46_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_46_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (3, 0)
+                            OP_SET_INJECT_WORD(3, 0)
 
-    OP_S_WRITE              (a, "Strawberry", 10)
+                                OP_S_WRITE(a, "Strawberry", 10)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+                                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                                        OP_END
 };
 
 /* 49. Fault injection - ACK - fictional PN */
 static const struct script_op script_49[] = {
-    OP_S_SET_INJECT_PLAIN   (script_46_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_46_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (4, 0)
+                            OP_SET_INJECT_WORD(4, 0)
 
-    OP_S_WRITE              (a, "Strawberry", 10)
-    OP_C_READ_EXPECT        (DEFAULT, "Strawberry", 10)
+                                OP_S_WRITE(a, "Strawberry", 10)
+                                    OP_C_READ_EXPECT(DEFAULT, "Strawberry", 10)
 
-    OP_END
+                                        OP_END
 };
 
 /* 50. Fault injection - ACK - duplicate PN */
 static const struct script_op script_50[] = {
-    OP_S_SET_INJECT_PLAIN   (script_46_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_46_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_BEGIN_REPEAT         (2)
+                            OP_BEGIN_REPEAT(2)
 
-    OP_SET_INJECT_WORD      (5, 0)
+                                OP_SET_INJECT_WORD(5, 0)
 
-    OP_S_WRITE              (a, "Strawberry", 10)
-    OP_C_READ_EXPECT        (DEFAULT, "Strawberry", 10)
+                                    OP_S_WRITE(a, "Strawberry", 10)
+                                        OP_C_READ_EXPECT(DEFAULT, "Strawberry", 10)
 
-    OP_END_REPEAT           ()
+                                            OP_END_REPEAT()
 
-    OP_END
+                                                OP_END
 };
 
 /* 51. Fault injection - PATH_RESPONSE is ignored */
 static const struct script_op script_51[] = {
-    OP_S_SET_INJECT_PLAIN   (script_41_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_41_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE)
+                            OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE)
 
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (DEFAULT, "orange", 6)
+                                OP_S_WRITE(a, "orange", 6)
+                                    OP_C_READ_EXPECT(DEFAULT, "orange", 6)
 
-    OP_C_WRITE              (DEFAULT, "Strawberry", 10)
-    OP_S_READ_EXPECT        (a, "Strawberry", 10)
+                                        OP_C_WRITE(DEFAULT, "Strawberry", 10)
+                                            OP_S_READ_EXPECT(a, "Strawberry", 10)
 
-    OP_END
+                                                OP_END
 };
 
 /* 52. Fault injection - ignore BLOCKED frames with bogus values */
 static int script_52_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     unsigned char frame_buf[64];
@@ -4084,7 +4098,7 @@ static int script_52_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
     --h->inject_word0;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, type)))
@@ -4113,52 +4127,52 @@ static int script_52_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_52[] = {
-    OP_S_SET_INJECT_PLAIN   (script_52_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_52_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED)
+                            OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED)
 
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (DEFAULT, "orange", 6)
+                                OP_S_WRITE(a, "orange", 6)
+                                    OP_C_READ_EXPECT(DEFAULT, "orange", 6)
 
-    OP_C_WRITE              (DEFAULT, "Strawberry", 10)
-    OP_S_READ_EXPECT        (a, "Strawberry", 10)
+                                        OP_C_WRITE(DEFAULT, "Strawberry", 10)
+                                            OP_S_READ_EXPECT(a, "Strawberry", 10)
 
-    OP_SET_INJECT_WORD      (1, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED)
+                                                OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED)
 
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (DEFAULT, "orange", 6)
+                                                    OP_S_WRITE(a, "orange", 6)
+                                                        OP_C_READ_EXPECT(DEFAULT, "orange", 6)
 
-    OP_C_WRITE              (DEFAULT, "Strawberry", 10)
-    OP_S_READ_EXPECT        (a, "Strawberry", 10)
+                                                            OP_C_WRITE(DEFAULT, "Strawberry", 10)
+                                                                OP_S_READ_EXPECT(a, "Strawberry", 10)
 
-    OP_SET_INJECT_WORD      (1, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI)
+                                                                    OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI)
 
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (DEFAULT, "orange", 6)
+                                                                        OP_S_WRITE(a, "orange", 6)
+                                                                            OP_C_READ_EXPECT(DEFAULT, "orange", 6)
 
-    OP_C_WRITE              (DEFAULT, "Strawberry", 10)
-    OP_S_READ_EXPECT        (a, "Strawberry", 10)
+                                                                                OP_C_WRITE(DEFAULT, "Strawberry", 10)
+                                                                                    OP_S_READ_EXPECT(a, "Strawberry", 10)
 
-    OP_SET_INJECT_WORD      (1, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI)
+                                                                                        OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI)
 
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (DEFAULT, "orange", 6)
+                                                                                            OP_S_WRITE(a, "orange", 6)
+                                                                                                OP_C_READ_EXPECT(DEFAULT, "orange", 6)
 
-    OP_C_WRITE              (DEFAULT, "Strawberry", 10)
-    OP_S_READ_EXPECT        (a, "Strawberry", 10)
+                                                                                                    OP_C_WRITE(DEFAULT, "Strawberry", 10)
+                                                                                                        OP_S_READ_EXPECT(a, "Strawberry", 10)
 
-    OP_END
+                                                                                                            OP_END
 };
 
 /* 53. Fault injection - excess CRYPTO buffer size */
 static int script_53_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     size_t written;
@@ -4180,8 +4194,8 @@ static int script_53_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
          * waiting for in-order delivery of previous bytes. This tests our flow
          * control on CRYPTO stream buffering.
          */
-        offset      = 100000;
-        data_len    = 1;
+        offset = 100000;
+        data_len = 1;
         break;
     }
 
@@ -4218,25 +4232,25 @@ static int script_53_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_53[] = {
-    OP_S_SET_INJECT_PLAIN   (script_53_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_53_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, 0)
-    OP_S_WRITE              (a, "Strawberry", 10)
+                            OP_SET_INJECT_WORD(1, 0)
+                                OP_S_WRITE(a, "Strawberry", 10)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED,0,0)
+                                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED, 0, 0)
 
-    OP_END
+                                        OP_END
 };
 
 /* 54. Fault injection - corrupted crypto stream data */
 static int script_54_inject_handshake(struct helper *h,
-                                      unsigned char *buf, size_t buf_len)
+    unsigned char *buf, size_t buf_len)
 {
     size_t i;
 
@@ -4248,91 +4262,91 @@ static int script_54_inject_handshake(struct helper *h,
 
 static const struct script_op script_54[] = {
     OP_S_SET_INJECT_HANDSHAKE(script_54_inject_handshake)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT_OR_FAIL()
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT_OR_FAIL()
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CRYPTO_UNEXPECTED_MESSAGE,0,0)
+                OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CRYPTO_UNEXPECTED_MESSAGE, 0, 0)
 
-    OP_END
+                    OP_END
 };
 
 /* 55. Fault injection - NEW_CONN_ID with >20 byte CID */
 static const struct script_op script_55[] = {
-    OP_S_SET_INJECT_PLAIN   (script_39_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_39_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (0, 2)
-    OP_S_WRITE              (a, "orange", 5)
+                                    OP_SET_INJECT_WORD(0, 2)
+                                        OP_S_WRITE(a, "orange", 5)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 56. Fault injection - NEW_CONN_ID with seq no < retire prior to */
 static const struct script_op script_56[] = {
-    OP_S_SET_INJECT_PLAIN   (script_39_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_39_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (0, 3)
-    OP_S_WRITE              (a, "orange", 5)
+                                    OP_SET_INJECT_WORD(0, 3)
+                                        OP_S_WRITE(a, "orange", 5)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 57. Fault injection - NEW_CONN_ID with lower seq so ignored */
 static const struct script_op script_57[] = {
-    OP_S_SET_INJECT_PLAIN   (script_39_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_39_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (0, 4)
-    OP_S_WRITE              (a, "orange", 5)
-    OP_C_READ_EXPECT        (a, "orange", 5)
+                                    OP_SET_INJECT_WORD(0, 4)
+                                        OP_S_WRITE(a, "orange", 5)
+                                            OP_C_READ_EXPECT(a, "orange", 5)
 
-    OP_C_WRITE              (a, "Strawberry", 10)
-    OP_S_READ_EXPECT        (a, "Strawberry", 10)
+                                                OP_C_WRITE(a, "Strawberry", 10)
+                                                    OP_S_READ_EXPECT(a, "Strawberry", 10)
 
     /*
      * Now we send a NEW_CONN_ID with a bogus CID. However the sequence number
      * is old so it should be ignored and we should still be able to
      * communicate.
      */
-    OP_SET_INJECT_WORD      (0, 5)
-    OP_S_WRITE              (a, "raspberry", 9)
-    OP_C_READ_EXPECT        (a, "raspberry", 9)
+    OP_SET_INJECT_WORD(0, 5)
+        OP_S_WRITE(a, "raspberry", 9)
+            OP_C_READ_EXPECT(a, "raspberry", 9)
 
-    OP_C_WRITE              (a, "peach", 5)
-    OP_S_READ_EXPECT        (a, "peach", 5)
+                OP_C_WRITE(a, "peach", 5)
+                    OP_S_READ_EXPECT(a, "peach", 5)
 
-    OP_END
+                        OP_END
 };
 
 /* 58. Fault injection - repeated HANDSHAKE_DONE */
 static int script_58_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     unsigned char frame_buf[64];
@@ -4343,7 +4357,7 @@ static int script_58_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
         return 1;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (h->inject_word0 == 1) {
@@ -4372,42 +4386,42 @@ static int script_58_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_58[] = {
-    OP_S_SET_INJECT_PLAIN   (script_58_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_58_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, 0)
+                            OP_SET_INJECT_WORD(1, 0)
 
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (DEFAULT, "orange", 6)
+                                OP_S_WRITE(a, "orange", 6)
+                                    OP_C_READ_EXPECT(DEFAULT, "orange", 6)
 
-    OP_C_WRITE              (DEFAULT, "Strawberry", 10)
-    OP_S_READ_EXPECT        (a, "Strawberry", 10)
+                                        OP_C_WRITE(DEFAULT, "Strawberry", 10)
+                                            OP_S_READ_EXPECT(a, "Strawberry", 10)
 
-    OP_END
+                                                OP_END
 };
 
 /* 59. Fault injection - multi-byte frame encoding */
 static const struct script_op script_59[] = {
-    OP_S_SET_INJECT_PLAIN   (script_58_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_S_SET_INJECT_PLAIN(script_58_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                        OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (2, 0)
+                            OP_SET_INJECT_WORD(2, 0)
 
-    OP_S_WRITE              (a, "orange", 6)
+                                OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_PROTOCOL_VIOLATION,0,0)
+                                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, 0)
 
-    OP_END
+                                        OP_END
 };
 
 /* 60. Connection close reason truncation */
@@ -4432,30 +4446,30 @@ static int check_shutdown_reason(struct helper *h, struct helper_local *hl)
 
     if (!TEST_size_t_ge(tc->reason_len, 50)
         || !TEST_mem_eq(long_reason, tc->reason_len,
-                        tc->reason, tc->reason_len))
+            tc->reason, tc->reason_len))
         return 0;
 
     return 1;
 }
 
 static const struct script_op script_60[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_WRITE              (DEFAULT, "apple", 5)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+            OP_C_WRITE(DEFAULT, "apple", 5)
+                OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                    OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_CHECK                (init_reason, 0)
-    OP_C_SHUTDOWN_WAIT      (long_reason, 0)
-    OP_CHECK                (check_shutdown_reason, 0)
+                        OP_CHECK(init_reason, 0)
+                            OP_C_SHUTDOWN_WAIT(long_reason, 0)
+                                OP_CHECK(check_shutdown_reason, 0)
 
-    OP_END
+                                    OP_END
 };
 
 /* 61. Fault injection - RESET_STREAM exceeding stream count FC */
 static int script_61_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     WPACKET wpkt;
@@ -4466,15 +4480,15 @@ static int script_61_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
         return 1;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, h->inject_word0))
         || !TEST_true(WPACKET_quic_write_vlint(&wpkt, /* stream ID */
-                                               h->inject_word1))
+            h->inject_word1))
         || !TEST_true(WPACKET_quic_write_vlint(&wpkt, 123))
         || (h->inject_word0 == OSSL_QUIC_FRAME_TYPE_RESET_STREAM
-           && !TEST_true(WPACKET_quic_write_vlint(&wpkt, 0)))) /* final size */
+            && !TEST_true(WPACKET_quic_write_vlint(&wpkt, 0)))) /* final size */
         goto err;
 
     if (!TEST_true(WPACKET_get_total_written(&wpkt, &written)))
@@ -4493,92 +4507,92 @@ static int script_61_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_61[] = {
-    OP_S_SET_INJECT_PLAIN   (script_61_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_61_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "orange", 6)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "orange", 6)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "orange", 6)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "orange", 6)
 
-    OP_SET_INJECT_WORD      (OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
-                             S_BIDI_ID(OSSL_QUIC_VLINT_MAX / 4))
-    OP_S_WRITE              (a, "fruit", 5)
+                                    OP_SET_INJECT_WORD(OSSL_QUIC_FRAME_TYPE_RESET_STREAM,
+                                        S_BIDI_ID(OSSL_QUIC_VLINT_MAX / 4))
+                                        OP_S_WRITE(a, "fruit", 5)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 62. Fault injection - STOP_SENDING with high ID */
 static const struct script_op script_62[] = {
-    OP_S_SET_INJECT_PLAIN   (script_61_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_61_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "orange", 6)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "orange", 6)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "orange", 6)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "orange", 6)
 
-    OP_SET_INJECT_WORD      (OSSL_QUIC_FRAME_TYPE_STOP_SENDING,
-                             C_BIDI_ID(OSSL_QUIC_VLINT_MAX / 4))
-    OP_S_WRITE              (a, "fruit", 5)
+                                    OP_SET_INJECT_WORD(OSSL_QUIC_FRAME_TYPE_STOP_SENDING,
+                                        C_BIDI_ID(OSSL_QUIC_VLINT_MAX / 4))
+                                        OP_S_WRITE(a, "fruit", 5)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_STATE_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 63. Fault injection - STREAM frame exceeding stream limit */
 static const struct script_op script_63[] = {
-    OP_S_SET_INJECT_PLAIN   (script_32_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_32_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (S_BIDI_ID(5000) + 1, 4)
-    OP_S_WRITE              (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(S_BIDI_ID(5000) + 1, 4)
+                                        OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR,0,0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_STREAM_LIMIT_ERROR, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 64. Fault injection - STREAM - zero-length no-FIN is accepted */
 static const struct script_op script_64[] = {
-    OP_S_SET_INJECT_PLAIN   (script_32_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_32_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_S_NEW_STREAM_UNI     (a, S_UNI_ID(0))
-    OP_S_WRITE              (a, "apple", 5)
+                    OP_S_NEW_STREAM_UNI(a, S_UNI_ID(0))
+                        OP_S_WRITE(a, "apple", 5)
 
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "apple", 5)
+                            OP_C_ACCEPT_STREAM_WAIT(a)
+                                OP_C_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (S_BIDI_ID(20) + 1, 1)
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(S_BIDI_ID(20) + 1, 1)
+                                        OP_S_WRITE(a, "orange", 6)
+                                            OP_C_READ_EXPECT(a, "orange", 6)
 
-    OP_END
+                                                OP_END
 };
 
 /* 65. Fault injection - CRYPTO - zero-length is accepted */
 static int script_65_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     unsigned char frame_buf[64];
@@ -4591,7 +4605,7 @@ static int script_65_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
     --h->inject_word0;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, OSSL_QUIC_FRAME_TYPE_CRYPTO))
@@ -4615,27 +4629,27 @@ static int script_65_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_65[] = {
-    OP_S_SET_INJECT_PLAIN   (script_65_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_65_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, 0)
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(1, 0)
+                                        OP_S_WRITE(a, "orange", 6)
+                                            OP_C_READ_EXPECT(a, "orange", 6)
 
-    OP_END
+                                                OP_END
 };
 
 /* 66. Fault injection - large MAX_STREAM_DATA */
 static int script_66_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
-                                  unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int ok = 0;
     WPACKET wpkt;
@@ -4646,7 +4660,7 @@ static int script_66_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
         return 1;
 
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, h->inject_word1)))
@@ -4654,7 +4668,7 @@ static int script_66_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 
     if (h->inject_word1 == OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA)
         if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, /* stream ID */
-                                                h->inject_word0 - 1)))
+                h->inject_word0 - 1)))
             goto err;
 
     if (!TEST_true(WPACKET_quic_write_vlint(&wpkt, OSSL_QUIC_VLINT_MAX)))
@@ -4676,72 +4690,72 @@ static int script_66_inject_plain(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_66[] = {
-    OP_S_SET_INJECT_PLAIN   (script_66_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_66_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_S_NEW_STREAM_BIDI    (a, S_BIDI_ID(0))
-    OP_S_WRITE              (a, "apple", 5)
+                    OP_S_NEW_STREAM_BIDI(a, S_BIDI_ID(0))
+                        OP_S_WRITE(a, "apple", 5)
 
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "apple", 5)
+                            OP_C_ACCEPT_STREAM_WAIT(a)
+                                OP_C_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (S_BIDI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA)
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (a, "orange", 6)
-    OP_C_WRITE              (a, "Strawberry", 10)
-    OP_S_READ_EXPECT        (a, "Strawberry", 10)
+                                    OP_SET_INJECT_WORD(S_BIDI_ID(0) + 1, OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA)
+                                        OP_S_WRITE(a, "orange", 6)
+                                            OP_C_READ_EXPECT(a, "orange", 6)
+                                                OP_C_WRITE(a, "Strawberry", 10)
+                                                    OP_S_READ_EXPECT(a, "Strawberry", 10)
 
-    OP_END
+                                                        OP_END
 };
 
 /* 67. Fault injection - large MAX_DATA */
 static const struct script_op script_67[] = {
-    OP_S_SET_INJECT_PLAIN   (script_66_inject_plain)
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_S_SET_INJECT_PLAIN(script_66_inject_plain)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_S_NEW_STREAM_BIDI    (a, S_BIDI_ID(0))
-    OP_S_WRITE              (a, "apple", 5)
+                    OP_S_NEW_STREAM_BIDI(a, S_BIDI_ID(0))
+                        OP_S_WRITE(a, "apple", 5)
 
-    OP_C_ACCEPT_STREAM_WAIT (a)
-    OP_C_READ_EXPECT        (a, "apple", 5)
+                            OP_C_ACCEPT_STREAM_WAIT(a)
+                                OP_C_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD      (1, OSSL_QUIC_FRAME_TYPE_MAX_DATA)
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (a, "orange", 6)
-    OP_C_WRITE              (a, "Strawberry", 10)
-    OP_S_READ_EXPECT        (a, "Strawberry", 10)
+                                    OP_SET_INJECT_WORD(1, OSSL_QUIC_FRAME_TYPE_MAX_DATA)
+                                        OP_S_WRITE(a, "orange", 6)
+                                            OP_C_READ_EXPECT(a, "orange", 6)
+                                                OP_C_WRITE(a, "Strawberry", 10)
+                                                    OP_S_READ_EXPECT(a, "Strawberry", 10)
 
-    OP_END
+                                                        OP_END
 };
 
 /* 68. Fault injection - Unexpected TLS messages */
 static int script_68_inject_handshake(struct helper *h, unsigned char *msg,
-                                      size_t msglen)
+    size_t msglen)
 {
     const unsigned char *data;
     size_t datalen;
     const unsigned char certreq[] = {
-        SSL3_MT_CERTIFICATE_REQUEST,         /* CertificateRequest message */
-        0, 0, 12,                            /* Length of message */
-        1, 1,                                /* certificate_request_context */
-        0, 8,                                /* Extensions block length */
+        SSL3_MT_CERTIFICATE_REQUEST, /* CertificateRequest message */
+        0, 0, 12, /* Length of message */
+        1, 1, /* certificate_request_context */
+        0, 8, /* Extensions block length */
         0, TLSEXT_TYPE_signature_algorithms, /* sig_algs extension*/
-        0, 4,                                /* 4 bytes of sig algs extension*/
-        0, 2,                                /* sigalgs list is 2 bytes long */
-        8, 4                                 /* rsa_pss_rsae_sha256 */
+        0, 4, /* 4 bytes of sig algs extension*/
+        0, 2, /* sigalgs list is 2 bytes long */
+        8, 4 /* rsa_pss_rsae_sha256 */
     };
     const unsigned char keyupdate[] = {
-        SSL3_MT_KEY_UPDATE,                  /* KeyUpdate message */
-        0, 0, 1,                             /* Length of message */
-        SSL_KEY_UPDATE_NOT_REQUESTED         /* update_not_requested */
+        SSL3_MT_KEY_UPDATE, /* KeyUpdate message */
+        0, 0, 1, /* Length of message */
+        SSL_KEY_UPDATE_NOT_REQUESTED /* update_not_requested */
     };
 
     /* We transform the NewSessionTicket message into something else */
-    switch(h->inject_word0) {
+    switch (h->inject_word0) {
     case 0:
         return 1;
 
@@ -4762,7 +4776,7 @@ static int script_68_inject_handshake(struct helper *h, unsigned char *msg,
     }
 
     if (!TEST_true(qtest_fault_resize_message(h->qtf,
-                                              datalen - SSL3_HM_HEADER_LENGTH)))
+            datalen - SSL3_HM_HEADER_LENGTH)))
         return 0;
 
     memcpy(msg, data, datalen);
@@ -4773,51 +4787,52 @@ static int script_68_inject_handshake(struct helper *h, unsigned char *msg,
 /* Send a CerticateRequest message post-handshake */
 static const struct script_op script_68[] = {
     OP_S_SET_INJECT_HANDSHAKE(script_68_inject_handshake)
-    OP_C_SET_ALPN            ("ossltest")
-    OP_C_CONNECT_WAIT        ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI     (a, C_BIDI_ID(0))
-    OP_C_WRITE               (a, "apple", 5)
-    OP_S_BIND_STREAM_ID      (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT         (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD       (1, 0)
-    OP_S_NEW_TICKET          ()
-    OP_S_WRITE               (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(1, 0)
+                                        OP_S_NEW_TICKET()
+                                            OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, 0)
+                                                OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, 0)
 
-    OP_END
+                                                    OP_END
 };
 
 /* 69. Send a TLS KeyUpdate message post-handshake */
 static const struct script_op script_69[] = {
     OP_S_SET_INJECT_HANDSHAKE(script_68_inject_handshake)
-    OP_C_SET_ALPN            ("ossltest")
-    OP_C_CONNECT_WAIT        ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI     (a, C_BIDI_ID(0))
-    OP_C_WRITE               (a, "apple", 5)
-    OP_S_BIND_STREAM_ID      (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT         (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_SET_INJECT_WORD       (2, 0)
-    OP_S_NEW_TICKET          ()
-    OP_S_WRITE               (a, "orange", 6)
+                                    OP_SET_INJECT_WORD(2, 0)
+                                        OP_S_NEW_TICKET()
+                                            OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN
-                                + SSL_AD_UNEXPECTED_MESSAGE, 0, 0)
+                                                OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN
+                                                        + SSL_AD_UNEXPECTED_MESSAGE,
+                                                    0, 0)
 
-    OP_END
+                                                    OP_END
 };
 
 static int set_max_early_data(struct helper *h, struct helper_local *hl)
 {
 
     if (!TEST_true(ossl_quic_tserver_set_max_early_data(ACQUIRE_S(),
-                                                        (uint32_t)hl->check_op->arg2)))
+            (uint32_t)hl->check_op->arg2)))
         return 0;
 
     return 1;
@@ -4825,41 +4840,41 @@ static int set_max_early_data(struct helper *h, struct helper_local *hl)
 
 /* 70. Send a TLS NewSessionTicket message with invalid max_early_data */
 static const struct script_op script_70[] = {
-    OP_C_SET_ALPN            ("ossltest")
-    OP_C_CONNECT_WAIT        ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI     (a, C_BIDI_ID(0))
-    OP_C_WRITE               (a, "apple", 5)
-    OP_S_BIND_STREAM_ID      (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT         (a, "apple", 5)
+                OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                    OP_C_WRITE(a, "apple", 5)
+                        OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                            OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_CHECK                 (set_max_early_data, 0xfffffffe)
-    OP_S_NEW_TICKET          ()
-    OP_S_WRITE               (a, "orange", 6)
+                                OP_CHECK(set_max_early_data, 0xfffffffe)
+                                    OP_S_NEW_TICKET()
+                                        OP_S_WRITE(a, "orange", 6)
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, 0)
+                                            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_PROTOCOL_VIOLATION, 0, 0)
 
-    OP_END
+                                                OP_END
 };
 
 /* 71. Send a TLS NewSessionTicket message with valid max_early_data */
 static const struct script_op script_71[] = {
-    OP_C_SET_ALPN            ("ossltest")
-    OP_C_CONNECT_WAIT        ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI     (a, C_BIDI_ID(0))
-    OP_C_WRITE               (a, "apple", 5)
-    OP_S_BIND_STREAM_ID      (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT         (a, "apple", 5)
+                OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                    OP_C_WRITE(a, "apple", 5)
+                        OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                            OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_CHECK                 (set_max_early_data, 0xffffffff)
-    OP_S_NEW_TICKET          ()
-    OP_S_WRITE               (a, "orange", 6)
-    OP_C_READ_EXPECT         (a, "orange", 6)
+                                OP_CHECK(set_max_early_data, 0xffffffff)
+                                    OP_S_NEW_TICKET()
+                                        OP_S_WRITE(a, "orange", 6)
+                                            OP_C_READ_EXPECT(a, "orange", 6)
 
-    OP_END
+                                                OP_END
 };
 
 /* 72. Test that APL stops handing out streams after limit reached (bidi) */
@@ -4872,62 +4887,62 @@ static int script_72_check(struct helper *h, struct helper_local *hl)
 }
 
 static const struct script_op script_72[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
     /*
      * Request more streams than a server will initially hand out and test that
      * they fail properly.
      */
-    OP_BEGIN_REPEAT         (200)
+    OP_BEGIN_REPEAT(200)
 
-    OP_C_NEW_STREAM_BIDI_EX (a, ANY_ID, ALLOW_FAIL | SSL_STREAM_FLAG_NO_BLOCK)
-    OP_C_SKIP_IF_UNBOUND    (a, 2)
-    OP_C_WRITE              (a, "apple", 5)
-    OP_C_FREE_STREAM        (a)
+        OP_C_NEW_STREAM_BIDI_EX(a, ANY_ID, ALLOW_FAIL | SSL_STREAM_FLAG_NO_BLOCK)
+            OP_C_SKIP_IF_UNBOUND(a, 2)
+                OP_C_WRITE(a, "apple", 5)
+                    OP_C_FREE_STREAM(a)
 
-    OP_END_REPEAT           ()
+                        OP_END_REPEAT()
 
-    OP_CHECK                (script_72_check, 0)
+                            OP_CHECK(script_72_check, 0)
 
-    OP_END
+                                OP_END
 };
 
 /* 73. Test that APL stops handing out streams after limit reached (uni) */
 static const struct script_op script_73[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
     /*
      * Request more streams than a server will initially hand out and test that
      * they fail properly.
      */
-    OP_BEGIN_REPEAT         (200)
+    OP_BEGIN_REPEAT(200)
 
-    OP_C_NEW_STREAM_UNI_EX  (a, ANY_ID, ALLOW_FAIL | SSL_STREAM_FLAG_NO_BLOCK)
-    OP_C_SKIP_IF_UNBOUND    (a, 2)
-    OP_C_WRITE              (a, "apple", 5)
-    OP_C_FREE_STREAM        (a)
+        OP_C_NEW_STREAM_UNI_EX(a, ANY_ID, ALLOW_FAIL | SSL_STREAM_FLAG_NO_BLOCK)
+            OP_C_SKIP_IF_UNBOUND(a, 2)
+                OP_C_WRITE(a, "apple", 5)
+                    OP_C_FREE_STREAM(a)
 
-    OP_END_REPEAT           ()
+                        OP_END_REPEAT()
 
-    OP_CHECK                (script_72_check, 0)
+                            OP_CHECK(script_72_check, 0)
 
-    OP_END
+                                OP_END
 };
 
 /* 74. Version negotiation: QUIC_VERSION_1 ignored */
 static int generate_version_neg(WPACKET *wpkt, uint32_t version)
 {
-    QUIC_PKT_HDR hdr = {0};
+    QUIC_PKT_HDR hdr = { 0 };
 
-    hdr.type                = QUIC_PKT_TYPE_VERSION_NEG;
-    hdr.version             = 0;
-    hdr.fixed               = 1;
-    hdr.dst_conn_id.id_len  = 0;
-    hdr.src_conn_id.id_len  = 8;
+    hdr.type = QUIC_PKT_TYPE_VERSION_NEG;
+    hdr.version = 0;
+    hdr.fixed = 1;
+    hdr.dst_conn_id.id_len = 0;
+    hdr.src_conn_id.id_len = 8;
     memset(hdr.src_conn_id.id, 0x55, 8);
 
     if (!TEST_true(ossl_quic_wire_encode_pkt_hdr(wpkt, 0, &hdr, NULL)))
@@ -4998,11 +5013,11 @@ static QUIC_PKT_HDR *hdr_to_free = NULL;
  * armed again
  */
 static int script_74_alter_version(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)
 {
     *hdrout = OPENSSL_memdup(hdrin, sizeof(QUIC_PKT_HDR));
     *iovecout = iovecin;
@@ -5030,98 +5045,98 @@ static void script_74_finish_mutation(void *arg)
  * to force a version negotiation
  */
 static int script_74_arm_packet_mutator(struct helper *h,
-                                        struct helper_local *hl)
+    struct helper_local *hl)
 {
     QUIC_CHANNEL *ch = ossl_quic_conn_get_channel(h->c_conn);
 
     do_mutation = 1;
     if (!ossl_quic_channel_set_mutator(ch, script_74_alter_version,
-                                       script_74_finish_mutation,
-                                       NULL))
+            script_74_finish_mutation,
+            NULL))
         return 0;
     return 1;
 }
 
 static const struct script_op script_74[] = {
-    OP_CHECK                (script_74_arm_packet_mutator, 0)
-    OP_C_SET_ALPN            ("ossltest")
-    OP_C_CONNECT_WAIT        ()
+    OP_CHECK(script_74_arm_packet_mutator, 0)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI     (a, C_BIDI_ID(0))
-    OP_C_WRITE               (a, "apple", 5)
-    OP_S_BIND_STREAM_ID      (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT         (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_END
+                                    OP_END
 };
 
 /* 75. Version negotiation: Unknown version causes connection abort */
 static const struct script_op script_75[] = {
-    OP_S_SET_INJECT_DATAGRAM (server_gen_version_neg)
-    OP_SET_INJECT_WORD       (2, 0)
+    OP_S_SET_INJECT_DATAGRAM(server_gen_version_neg)
+        OP_SET_INJECT_WORD(2, 0)
 
-    OP_C_SET_ALPN            ("ossltest")
-    OP_C_CONNECT_WAIT_OR_FAIL()
+            OP_C_SET_ALPN("ossltest")
+                OP_C_CONNECT_WAIT_OR_FAIL()
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CONNECTION_REFUSED,0,0)
+                    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_CONNECTION_REFUSED, 0, 0)
 
-    OP_END
+                        OP_END
 };
 
 /* 76. Test peer-initiated shutdown wait */
 static int script_76_check(struct helper *h, struct helper_local *hl)
 {
     if (!TEST_false(SSL_shutdown_ex(h->c_conn,
-                                    SSL_SHUTDOWN_FLAG_WAIT_PEER
-                                    | SSL_SHUTDOWN_FLAG_NO_BLOCK,
-                                    NULL, 0)))
+            SSL_SHUTDOWN_FLAG_WAIT_PEER
+                | SSL_SHUTDOWN_FLAG_NO_BLOCK,
+            NULL, 0)))
         return 0;
 
     return 1;
 }
 
 static const struct script_op script_76[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
+                OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                    OP_C_WRITE(a, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                        OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                            OP_S_READ_EXPECT(a, "apple", 5)
 
     /* Check a WAIT_PEER call doesn't succeed yet. */
-    OP_CHECK                (script_76_check, 0)
-    OP_S_SHUTDOWN           (42)
+    OP_CHECK(script_76_check, 0)
+        OP_S_SHUTDOWN(42)
 
-    OP_C_SHUTDOWN_WAIT      (NULL, SSL_SHUTDOWN_FLAG_WAIT_PEER)
-    OP_C_EXPECT_CONN_CLOSE_INFO(42, 1, 1)
+            OP_C_SHUTDOWN_WAIT(NULL, SSL_SHUTDOWN_FLAG_WAIT_PEER)
+                OP_C_EXPECT_CONN_CLOSE_INFO(42, 1, 1)
 
-    OP_END
+                    OP_END
 };
 
 /* 77. Ensure default stream popping operates correctly */
 static const struct script_op script_77[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_SET_INCOMING_STREAM_POLICY(SSL_INCOMING_STREAM_POLICY_ACCEPT)
+            OP_C_SET_INCOMING_STREAM_POLICY(SSL_INCOMING_STREAM_POLICY_ACCEPT)
 
-    OP_S_NEW_STREAM_BIDI    (a, S_BIDI_ID(0))
-    OP_S_WRITE              (a, "Strawberry", 10)
+                OP_S_NEW_STREAM_BIDI(a, S_BIDI_ID(0))
+                    OP_S_WRITE(a, "Strawberry", 10)
 
-    OP_C_READ_EXPECT        (DEFAULT, "Strawberry", 10)
+                        OP_C_READ_EXPECT(DEFAULT, "Strawberry", 10)
 
-    OP_S_NEW_STREAM_BIDI    (b, S_BIDI_ID(1))
-    OP_S_WRITE              (b, "xyz", 3)
+                            OP_S_NEW_STREAM_BIDI(b, S_BIDI_ID(1))
+                                OP_S_WRITE(b, "xyz", 3)
 
-    OP_C_ACCEPT_STREAM_WAIT (b)
-    OP_C_READ_EXPECT        (b, "xyz", 3)
+                                    OP_C_ACCEPT_STREAM_WAIT(b)
+                                        OP_C_READ_EXPECT(b, "xyz", 3)
 
-    OP_END
+                                            OP_END
 };
 
 /* 78. Post-connection session ticket handling */
@@ -5161,52 +5176,53 @@ static int check_got_session_ticket(struct helper *h, struct helper_local *hl)
 static int check_idle_timeout(struct helper *h, struct helper_local *hl);
 
 static const struct script_op script_78[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_CHECK                (setup_session, 0)
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_CHECK(setup_session, 0)
+            OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
+                    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                        OP_C_WRITE(a, "apple", 5)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
+                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                OP_S_READ_EXPECT(a, "apple", 5)
 
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (a, "orange", 6)
+                                    OP_S_WRITE(a, "orange", 6)
+                                        OP_C_READ_EXPECT(a, "orange", 6)
 
-    OP_CHECK                (trigger_late_session_ticket, 0)
+                                            OP_CHECK(trigger_late_session_ticket, 0)
 
-    OP_S_WRITE              (a, "Strawberry", 10)
-    OP_C_READ_EXPECT        (a, "Strawberry", 10)
+                                                OP_S_WRITE(a, "Strawberry", 10)
+                                                    OP_C_READ_EXPECT(a, "Strawberry", 10)
 
-    OP_CHECK                (check_got_session_ticket, 0)
-    OP_CHECK2               (check_idle_timeout,
-                             SSL_VALUE_CLASS_FEATURE_NEGOTIATED, 30000)
+                                                        OP_CHECK(check_got_session_ticket, 0)
+                                                            OP_CHECK2(check_idle_timeout,
+                                                                SSL_VALUE_CLASS_FEATURE_NEGOTIATED, 30000)
 
-    OP_END
+                                                                OP_END
 };
 
 /* 79. Optimised FIN test */
 static const struct script_op script_79[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_WRITE_EX2          (DEFAULT, "apple", 5, SSL_WRITE_FLAG_CONCLUDE)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
-    OP_S_EXPECT_FIN         (a)
-    OP_S_WRITE              (a, "orange", 6)
-    OP_S_CONCLUDE           (a)
-    OP_C_READ_EXPECT        (DEFAULT, "orange", 6)
-    OP_C_EXPECT_FIN         (DEFAULT)
-    OP_END
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_WRITE_EX2(DEFAULT, "apple", 5, SSL_WRITE_FLAG_CONCLUDE)
+                OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                    OP_S_READ_EXPECT(a, "apple", 5)
+                        OP_S_EXPECT_FIN(a)
+                            OP_S_WRITE(a, "orange", 6)
+                                OP_S_CONCLUDE(a)
+                                    OP_C_READ_EXPECT(DEFAULT, "orange", 6)
+                                        OP_C_EXPECT_FIN(DEFAULT)
+                                            OP_END
 };
 
 /* 80. Stateless reset detection test */
 static QUIC_STATELESS_RESET_TOKEN test_reset_token = {
     { 0xde, 0xad, 0xbe, 0xef, 0xde, 0xad, 0xbe, 0xef, 0xde, 0xad, 0xbe, 0xef,
-     0xde, 0xad, 0xbe, 0xef }};
+        0xde, 0xad, 0xbe, 0xef }
+};
 
 /*
  * Generate a packet in the following format:
@@ -5218,7 +5234,7 @@ static QUIC_STATELESS_RESET_TOKEN test_reset_token = {
  *  }
  */
 static int script_80_send_stateless_reset(struct helper *h, QUIC_PKT_HDR *hdr,
-                                          unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     unsigned char databuf[64];
 
@@ -5232,24 +5248,25 @@ static int script_80_send_stateless_reset(struct helper *h, QUIC_PKT_HDR *hdr,
     RAND_bytes(databuf, 64);
     databuf[0] = 0x40;
     memcpy(&databuf[48], test_reset_token.token,
-           sizeof(test_reset_token.token));
+        sizeof(test_reset_token.token));
 
     if (!TEST_int_eq(SSL_inject_net_dgram(h->c_conn, databuf, sizeof(databuf),
-                                          NULL, h->s_net_bio_addr), 1))
+                         NULL, h->s_net_bio_addr),
+            1))
         return 0;
 
     return 1;
 }
 
 static int script_80_gen_new_conn_id(struct helper *h, QUIC_PKT_HDR *hdr,
-                                     unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     int rc = 0;
     size_t l;
     unsigned char frame_buf[64];
     WPACKET wpkt;
-    QUIC_CONN_ID new_cid = {0};
-    OSSL_QUIC_FRAME_NEW_CONN_ID ncid = {0};
+    QUIC_CONN_ID new_cid = { 0 };
+    OSSL_QUIC_FRAME_NEW_CONN_ID ncid = { 0 };
     QUIC_CHANNEL *ch = ossl_quic_tserver_get_channel(ACQUIRE_S_NOHL());
 
     if (h->inject_word0 == 0)
@@ -5259,7 +5276,7 @@ static int script_80_gen_new_conn_id(struct helper *h, QUIC_PKT_HDR *hdr,
 
     fprintf(stderr, "sending new conn id\n");
     if (!TEST_true(WPACKET_init_static_len(&wpkt, frame_buf,
-                                           sizeof(frame_buf), 0)))
+            sizeof(frame_buf), 0)))
         return 0;
 
     ossl_quic_channel_get_diag_local_cid(ch, &new_cid);
@@ -5268,7 +5285,7 @@ static int script_80_gen_new_conn_id(struct helper *h, QUIC_PKT_HDR *hdr,
     ncid.retire_prior_to = 2;
     ncid.conn_id = new_cid;
     memcpy(ncid.stateless_reset.token, test_reset_token.token,
-           sizeof(test_reset_token.token));
+        sizeof(test_reset_token.token));
 
     if (!TEST_true(ossl_quic_wire_encode_frame_new_conn_id(&wpkt, &ncid)))
         goto err;
@@ -5290,7 +5307,7 @@ static int script_80_gen_new_conn_id(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static int script_80_inject_pkt(struct helper *h, QUIC_PKT_HDR *hdr,
-                                unsigned char *buf, size_t len)
+    unsigned char *buf, size_t len)
 {
     if (h->inject_word1 == 1)
         return script_80_send_stateless_reset(h, hdr, buf, len);
@@ -5301,20 +5318,20 @@ static int script_80_inject_pkt(struct helper *h, QUIC_PKT_HDR *hdr,
 }
 
 static const struct script_op script_80[] = {
-    OP_S_SET_INJECT_PLAIN       (script_80_inject_pkt)
-    OP_C_SET_ALPN               ("ossltest")
-    OP_C_CONNECT_WAIT           ()
-    OP_C_WRITE                  (DEFAULT, "apple", 5)
-    OP_C_CONCLUDE               (DEFAULT)
-    OP_S_BIND_STREAM_ID         (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT            (a, "apple", 5)
-    OP_SET_INJECT_WORD          (1, 0)
-    OP_S_WRITE                  (a, "apple", 5)
-    OP_C_READ_EXPECT            (DEFAULT, "apple", 5)
-    OP_SET_INJECT_WORD          (0, 1)
-    OP_S_WRITE                  (a, "apple", 5)
-    OP_C_EXPECT_CONN_CLOSE_INFO (0, 0, 1)
-    OP_END
+    OP_S_SET_INJECT_PLAIN(script_80_inject_pkt)
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
+                OP_C_WRITE(DEFAULT, "apple", 5)
+                    OP_C_CONCLUDE(DEFAULT)
+                        OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                            OP_S_READ_EXPECT(a, "apple", 5)
+                                OP_SET_INJECT_WORD(1, 0)
+                                    OP_S_WRITE(a, "apple", 5)
+                                        OP_C_READ_EXPECT(DEFAULT, "apple", 5)
+                                            OP_SET_INJECT_WORD(0, 1)
+                                                OP_S_WRITE(a, "apple", 5)
+                                                    OP_C_EXPECT_CONN_CLOSE_INFO(0, 0, 1)
+                                                        OP_END
 };
 
 /* 81. Idle timeout configuration */
@@ -5324,19 +5341,19 @@ static int modify_idle_timeout(struct helper *h, struct helper_local *hl)
 
     /* Test bad value is rejected. */
     if (!TEST_false(SSL_set_feature_request_uint(h->c_conn,
-                                                 SSL_VALUE_QUIC_IDLE_TIMEOUT,
-                                                 (1ULL << 62))))
+            SSL_VALUE_QUIC_IDLE_TIMEOUT,
+            (1ULL << 62))))
         return 0;
 
     /* Set value. */
     if (!TEST_true(SSL_set_feature_request_uint(h->c_conn,
-                                                SSL_VALUE_QUIC_IDLE_TIMEOUT,
-                                                hl->check_op->arg2)))
+            SSL_VALUE_QUIC_IDLE_TIMEOUT,
+            hl->check_op->arg2)))
         return 0;
 
     if (!TEST_true(SSL_get_feature_request_uint(h->c_conn,
-                                                SSL_VALUE_QUIC_IDLE_TIMEOUT,
-                                                &v)))
+            SSL_VALUE_QUIC_IDLE_TIMEOUT,
+            &v)))
         return 0;
 
     if (!TEST_uint64_t_eq(v, hl->check_op->arg2))
@@ -5350,8 +5367,8 @@ static int check_idle_timeout(struct helper *h, struct helper_local *hl)
     uint64_t v = 0;
 
     if (!TEST_true(SSL_get_value_uint(h->c_conn, hl->check_op->arg1,
-                                      SSL_VALUE_QUIC_IDLE_TIMEOUT,
-                                      &v)))
+            SSL_VALUE_QUIC_IDLE_TIMEOUT,
+            &v)))
         return 0;
 
     if (!TEST_uint64_t_eq(v, hl->check_op->arg2))
@@ -5361,33 +5378,33 @@ static int check_idle_timeout(struct helper *h, struct helper_local *hl)
 }
 
 static const struct script_op script_81[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_CHECK                (modify_idle_timeout, 25000)
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_CHECK(modify_idle_timeout, 25000)
+            OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_CHECK2               (check_idle_timeout,
-                             SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, 30000)
-    OP_CHECK2               (check_idle_timeout,
-                             SSL_VALUE_CLASS_FEATURE_NEGOTIATED, 25000)
+                    OP_CHECK2(check_idle_timeout,
+                        SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, 30000)
+                        OP_CHECK2(check_idle_timeout,
+                            SSL_VALUE_CLASS_FEATURE_NEGOTIATED, 25000)
 
-    OP_END
+                            OP_END
 };
 
 /* 82. Negotiated default idle timeout if not configured */
 static const struct script_op script_82[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_CHECK2               (check_idle_timeout,
-                             SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, 30000)
-    OP_CHECK2               (check_idle_timeout,
-                             SSL_VALUE_CLASS_FEATURE_NEGOTIATED, 30000)
+                OP_CHECK2(check_idle_timeout,
+                    SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, 30000)
+                    OP_CHECK2(check_idle_timeout,
+                        SSL_VALUE_CLASS_FEATURE_NEGOTIATED, 30000)
 
-    OP_END
+                        OP_END
 };
 
 /* 83. No late changes to idle timeout */
@@ -5396,34 +5413,34 @@ static int cannot_change_idle_timeout(struct helper *h, struct helper_local *hl)
     uint64_t v = 0;
 
     if (!TEST_true(SSL_get_feature_request_uint(h->c_conn,
-                                                SSL_VALUE_QUIC_IDLE_TIMEOUT,
-                                                &v)))
+            SSL_VALUE_QUIC_IDLE_TIMEOUT,
+            &v)))
         return 0;
 
     if (!TEST_uint64_t_eq(v, 30000))
         return 0;
 
     if (!TEST_false(SSL_set_feature_request_uint(h->c_conn,
-                                                 SSL_VALUE_QUIC_IDLE_TIMEOUT,
-                                                 5000)))
+            SSL_VALUE_QUIC_IDLE_TIMEOUT,
+            5000)))
         return 0;
 
     return 1;
 }
 
 static const struct script_op script_83[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_CHECK                (cannot_change_idle_timeout, 0)
-    OP_CHECK2               (check_idle_timeout,
-                             SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, 30000)
-    OP_CHECK2               (check_idle_timeout,
-                             SSL_VALUE_CLASS_FEATURE_NEGOTIATED, 30000)
+                OP_CHECK(cannot_change_idle_timeout, 0)
+                    OP_CHECK2(check_idle_timeout,
+                        SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, 30000)
+                        OP_CHECK2(check_idle_timeout,
+                            SSL_VALUE_CLASS_FEATURE_NEGOTIATED, 30000)
 
-    OP_END
+                            OP_END
 };
 
 /* 84. Test query of available streams */
@@ -5484,78 +5501,78 @@ static int check_write_buf_stat(struct helper *h, struct helper_local *hl)
 }
 
 static const struct script_op script_84[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_CHECK2               (check_avail_streams, 0, 100)
-    OP_CHECK2               (check_avail_streams, 1, 100)
-    OP_CHECK2               (check_avail_streams, 2, 100)
-    OP_CHECK2               (check_avail_streams, 3, 100)
+                OP_CHECK2(check_avail_streams, 0, 100)
+                    OP_CHECK2(check_avail_streams, 1, 100)
+                        OP_CHECK2(check_avail_streams, 2, 100)
+                            OP_CHECK2(check_avail_streams, 3, 100)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
+                                OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
 
-    OP_CHECK2               (check_avail_streams, 0, 99)
-    OP_CHECK2               (check_avail_streams, 1, 100)
-    OP_CHECK2               (check_avail_streams, 2, 100)
-    OP_CHECK2               (check_avail_streams, 3, 100)
+                                    OP_CHECK2(check_avail_streams, 0, 99)
+                                        OP_CHECK2(check_avail_streams, 1, 100)
+                                            OP_CHECK2(check_avail_streams, 2, 100)
+                                                OP_CHECK2(check_avail_streams, 3, 100)
 
-    OP_C_NEW_STREAM_UNI     (b, C_UNI_ID(0))
+                                                    OP_C_NEW_STREAM_UNI(b, C_UNI_ID(0))
 
-    OP_CHECK2               (check_avail_streams, 0, 99)
-    OP_CHECK2               (check_avail_streams, 1, 100)
-    OP_CHECK2               (check_avail_streams, 2, 99)
-    OP_CHECK2               (check_avail_streams, 3, 100)
+                                                        OP_CHECK2(check_avail_streams, 0, 99)
+                                                            OP_CHECK2(check_avail_streams, 1, 100)
+                                                                OP_CHECK2(check_avail_streams, 2, 99)
+                                                                    OP_CHECK2(check_avail_streams, 3, 100)
 
-    OP_S_NEW_STREAM_BIDI    (c, S_BIDI_ID(0))
-    OP_S_WRITE              (c, "x", 1)
+                                                                        OP_S_NEW_STREAM_BIDI(c, S_BIDI_ID(0))
+                                                                            OP_S_WRITE(c, "x", 1)
 
-    OP_C_ACCEPT_STREAM_WAIT (c)
-    OP_C_READ_EXPECT        (c, "x", 1)
+                                                                                OP_C_ACCEPT_STREAM_WAIT(c)
+                                                                                    OP_C_READ_EXPECT(c, "x", 1)
 
-    OP_CHECK2               (check_avail_streams, 0, 99)
-    OP_CHECK2               (check_avail_streams, 1, 99)
-    OP_CHECK2               (check_avail_streams, 2, 99)
-    OP_CHECK2               (check_avail_streams, 3, 100)
+                                                                                        OP_CHECK2(check_avail_streams, 0, 99)
+                                                                                            OP_CHECK2(check_avail_streams, 1, 99)
+                                                                                                OP_CHECK2(check_avail_streams, 2, 99)
+                                                                                                    OP_CHECK2(check_avail_streams, 3, 100)
 
-    OP_S_NEW_STREAM_UNI     (d, S_UNI_ID(0))
-    OP_S_WRITE              (d, "x", 1)
+                                                                                                        OP_S_NEW_STREAM_UNI(d, S_UNI_ID(0))
+                                                                                                            OP_S_WRITE(d, "x", 1)
 
-    OP_C_ACCEPT_STREAM_WAIT (d)
-    OP_C_READ_EXPECT        (d, "x", 1)
+                                                                                                                OP_C_ACCEPT_STREAM_WAIT(d)
+                                                                                                                    OP_C_READ_EXPECT(d, "x", 1)
 
-    OP_CHECK2               (check_avail_streams, 0, 99)
-    OP_CHECK2               (check_avail_streams, 1, 99)
-    OP_CHECK2               (check_avail_streams, 2, 99)
-    OP_CHECK2               (check_avail_streams, 3, 99)
+                                                                                                                        OP_CHECK2(check_avail_streams, 0, 99)
+                                                                                                                            OP_CHECK2(check_avail_streams, 1, 99)
+                                                                                                                                OP_CHECK2(check_avail_streams, 2, 99)
+                                                                                                                                    OP_CHECK2(check_avail_streams, 3, 99)
 
-    OP_CHECK2               (check_write_buf_stat, 0, 0)
-    OP_CHECK                (set_event_handling_mode_conn,
-                             SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT)
-    OP_C_WRITE              (a, "apple", 5)
-    OP_CHECK2               (check_write_buf_stat, 5, 0)
+                                                                                                                                        OP_CHECK2(check_write_buf_stat, 0, 0)
+                                                                                                                                            OP_CHECK(set_event_handling_mode_conn,
+                                                                                                                                                SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT)
+                                                                                                                                                OP_C_WRITE(a, "apple", 5)
+                                                                                                                                                    OP_CHECK2(check_write_buf_stat, 5, 0)
 
-    OP_CHECK                (reenable_test_event_handling, 0)
+                                                                                                                                                        OP_CHECK(reenable_test_event_handling, 0)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (a, "orange", 6)
+                                                                                                                                                            OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                                                                                                                                                OP_S_READ_EXPECT(a, "apple", 5)
+                                                                                                                                                                    OP_S_WRITE(a, "orange", 6)
+                                                                                                                                                                        OP_C_READ_EXPECT(a, "orange", 6)
 
-    OP_END
+                                                                                                                                                                            OP_END
 };
 
 /* 85. Test SSL_poll (lite, non-blocking) */
 ossl_unused static int script_85_poll(struct helper *h, struct helper_local *hl)
 {
     int ok = 1, ret, expected_ret = 1;
-    static const struct timeval timeout = {0};
+    static const struct timeval timeout = { 0 };
     size_t result_count, expected_result_count = 0;
-    SSL_POLL_ITEM items[5] = {0}, *item = items;
+    SSL_POLL_ITEM items[5] = { 0 }, *item = items;
     SSL *c_a, *c_b, *c_c, *c_d;
     size_t i;
-    uint64_t mode, expected_revents[5] = {0};
+    uint64_t mode, expected_revents[5] = { 0 };
 
     if (!TEST_ptr(c_a = helper_local_get_c_stream(hl, "a"))
         || !TEST_ptr(c_b = helper_local_get_c_stream(hl, "b"))
@@ -5563,55 +5580,55 @@ ossl_unused static int script_85_poll(struct helper *h, struct helper_local *hl)
         || !TEST_ptr(c_d = helper_local_get_c_stream(hl, "d")))
         return 0;
 
-    item->desc    = SSL_as_poll_descriptor(c_a);
-    item->events  = UINT64_MAX;
+    item->desc = SSL_as_poll_descriptor(c_a);
+    item->events = UINT64_MAX;
     item->revents = UINT64_MAX;
     ++item;
 
-    item->desc    = SSL_as_poll_descriptor(c_b);
-    item->events  = UINT64_MAX;
+    item->desc = SSL_as_poll_descriptor(c_b);
+    item->events = UINT64_MAX;
     item->revents = UINT64_MAX;
     ++item;
 
-    item->desc    = SSL_as_poll_descriptor(c_c);
-    item->events  = UINT64_MAX;
+    item->desc = SSL_as_poll_descriptor(c_c);
+    item->events = UINT64_MAX;
     item->revents = UINT64_MAX;
     ++item;
 
-    item->desc    = SSL_as_poll_descriptor(c_d);
-    item->events  = UINT64_MAX;
+    item->desc = SSL_as_poll_descriptor(c_d);
+    item->events = UINT64_MAX;
     item->revents = UINT64_MAX;
     ++item;
 
-    item->desc    = SSL_as_poll_descriptor(h->c_conn);
-    item->events  = UINT64_MAX;
+    item->desc = SSL_as_poll_descriptor(h->c_conn);
+    item->events = UINT64_MAX;
     item->revents = UINT64_MAX;
     ++item;
 
     result_count = SIZE_MAX;
     ret = SSL_poll(items, OSSL_NELEM(items), sizeof(SSL_POLL_ITEM),
-                   &timeout, 0,
-                   &result_count);
+        &timeout, 0,
+        &result_count);
 
     mode = hl->check_op->arg2;
     switch (mode) {
     case 0:
         /* No incoming data yet */
-        expected_revents[0]     = SSL_POLL_EVENT_W;
-        expected_revents[1]     = SSL_POLL_EVENT_W;
-        expected_revents[2]     = SSL_POLL_EVENT_W;
-        expected_revents[3]     = SSL_POLL_EVENT_W;
-        expected_revents[4]     = SSL_POLL_EVENT_OS;
-        expected_result_count   = 5;
+        expected_revents[0] = SSL_POLL_EVENT_W;
+        expected_revents[1] = SSL_POLL_EVENT_W;
+        expected_revents[2] = SSL_POLL_EVENT_W;
+        expected_revents[3] = SSL_POLL_EVENT_W;
+        expected_revents[4] = SSL_POLL_EVENT_OS;
+        expected_result_count = 5;
         break;
     case 1:
         /* Expect more events */
-        expected_revents[0]     = SSL_POLL_EVENT_W | SSL_POLL_EVENT_R;
-        expected_revents[1]     = SSL_POLL_EVENT_W | SSL_POLL_EVENT_ER;
-        expected_revents[2]     = SSL_POLL_EVENT_EW;
-        expected_revents[3]     = SSL_POLL_EVENT_W;
-        expected_revents[4]     = SSL_POLL_EVENT_OS | SSL_POLL_EVENT_ISB;
-        expected_result_count   = 5;
+        expected_revents[0] = SSL_POLL_EVENT_W | SSL_POLL_EVENT_R;
+        expected_revents[1] = SSL_POLL_EVENT_W | SSL_POLL_EVENT_ER;
+        expected_revents[2] = SSL_POLL_EVENT_EW;
+        expected_revents[3] = SSL_POLL_EVENT_W;
+        expected_revents[4] = SSL_POLL_EVENT_OS | SSL_POLL_EVENT_ISB;
+        expected_result_count = 5;
         break;
     default:
         return 0;
@@ -5624,7 +5641,7 @@ ossl_unused static int script_85_poll(struct helper *h, struct helper_local *hl)
     for (i = 0; i < OSSL_NELEM(items); ++i)
         if (!TEST_uint64_t_eq(items[i].revents, expected_revents[i])) {
             TEST_error("mismatch at index %zu in poll results, mode %d",
-                       i, (int)mode);
+                i, (int)mode);
             ok = 0;
         }
 
@@ -5632,59 +5649,59 @@ ossl_unused static int script_85_poll(struct helper *h, struct helper_local *hl)
 }
 
 static const struct script_op script_85[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+            OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "flamingo", 8)
+                OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                    OP_C_WRITE(a, "flamingo", 8)
 
-    OP_C_NEW_STREAM_BIDI    (b, C_BIDI_ID(1))
-    OP_C_WRITE              (b, "orange", 6)
+                        OP_C_NEW_STREAM_BIDI(b, C_BIDI_ID(1))
+                            OP_C_WRITE(b, "orange", 6)
 
-    OP_C_NEW_STREAM_BIDI    (c, C_BIDI_ID(2))
-    OP_C_WRITE              (c, "Strawberry", 10)
+                                OP_C_NEW_STREAM_BIDI(c, C_BIDI_ID(2))
+                                    OP_C_WRITE(c, "Strawberry", 10)
 
-    OP_C_NEW_STREAM_BIDI    (d, C_BIDI_ID(3))
-    OP_C_WRITE              (d, "sync", 4)
+                                        OP_C_NEW_STREAM_BIDI(d, C_BIDI_ID(3))
+                                            OP_C_WRITE(d, "sync", 4)
 
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_BIND_STREAM_ID     (b, C_BIDI_ID(1))
-    OP_S_BIND_STREAM_ID     (c, C_BIDI_ID(2))
-    OP_S_BIND_STREAM_ID     (d, C_BIDI_ID(3))
+                                                OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                                                    OP_S_BIND_STREAM_ID(b, C_BIDI_ID(1))
+                                                        OP_S_BIND_STREAM_ID(c, C_BIDI_ID(2))
+                                                            OP_S_BIND_STREAM_ID(d, C_BIDI_ID(3))
 
     /* Check nothing readable yet. */
-    OP_CHECK                (script_85_poll, 0)
+    OP_CHECK(script_85_poll, 0)
 
     /* Send something that will make client sockets readable. */
-    OP_S_READ_EXPECT        (a, "flamingo", 8)
-    OP_S_WRITE              (a, "herringbone", 11)
+    OP_S_READ_EXPECT(a, "flamingo", 8)
+        OP_S_WRITE(a, "herringbone", 11)
 
     /* Send something that will make 'b' reset. */
-    OP_S_SET_INJECT_PLAIN   (script_28_inject_plain)
-    OP_SET_INJECT_WORD      (C_BIDI_ID(1) + 1, OSSL_QUIC_FRAME_TYPE_RESET_STREAM)
+    OP_S_SET_INJECT_PLAIN(script_28_inject_plain)
+        OP_SET_INJECT_WORD(C_BIDI_ID(1) + 1, OSSL_QUIC_FRAME_TYPE_RESET_STREAM)
 
     /* Ensure sync. */
-    OP_S_READ_EXPECT        (d, "sync", 4)
-    OP_S_WRITE              (d, "x", 1)
-    OP_C_READ_EXPECT        (d, "x", 1)
+    OP_S_READ_EXPECT(d, "sync", 4)
+        OP_S_WRITE(d, "x", 1)
+            OP_C_READ_EXPECT(d, "x", 1)
 
     /* Send something that will make 'c' reset. */
-    OP_S_SET_INJECT_PLAIN   (script_28_inject_plain)
-    OP_SET_INJECT_WORD      (C_BIDI_ID(2) + 1, OSSL_QUIC_FRAME_TYPE_STOP_SENDING)
+    OP_S_SET_INJECT_PLAIN(script_28_inject_plain)
+        OP_SET_INJECT_WORD(C_BIDI_ID(2) + 1, OSSL_QUIC_FRAME_TYPE_STOP_SENDING)
 
-    OP_S_NEW_STREAM_BIDI    (z, S_BIDI_ID(0))
-    OP_S_WRITE              (z, "z", 1)
+            OP_S_NEW_STREAM_BIDI(z, S_BIDI_ID(0))
+                OP_S_WRITE(z, "z", 1)
 
     /* Ensure sync. */
-    OP_S_WRITE              (d, "x", 1)
-    OP_C_READ_EXPECT        (d, "x", 1)
+    OP_S_WRITE(d, "x", 1)
+        OP_C_READ_EXPECT(d, "x", 1)
 
     /* Check a is now readable. */
-    OP_CHECK                (script_85_poll, 1)
+    OP_CHECK(script_85_poll, 1)
 
-    OP_END
+        OP_END
 };
 
 /* 86. Event Handling Mode Configuration */
@@ -5711,34 +5728,34 @@ static ossl_unused int set_event_handling_mode_stream(struct helper *h, struct h
 }
 
 static const struct script_op script_86[] = {
-    OP_SKIP_IF_BLOCKING     (23)
+    OP_SKIP_IF_BLOCKING(23)
 
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
+        OP_C_SET_ALPN("ossltest")
+            OP_C_CONNECT_WAIT()
 
-    OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
+                OP_C_SET_DEFAULT_STREAM_MODE(SSL_DEFAULT_STREAM_MODE_NONE)
 
     /* Turn on explicit handling mode. */
-    OP_CHECK                (set_event_handling_mode_conn,
-                             SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT)
+    OP_CHECK(set_event_handling_mode_conn,
+        SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT)
 
     /*
      * Create a new stream and write data. This won't get sent
      * to the network net because we are in explicit mode
      * and we haven't called SSL_handle_events().
      */
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
+    OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+        OP_C_WRITE(a, "apple", 5)
 
     /* Put connection back into implicit handling mode. */
-    OP_CHECK                (set_event_handling_mode_conn,
-                             SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT)
+    OP_CHECK(set_event_handling_mode_conn,
+        SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT)
 
     /* Override at stream level. */
-    OP_CHECK                (set_event_handling_mode_stream,
-                             SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT)
-    OP_C_WRITE              (a, "orange", 6)
-    OP_C_CONCLUDE           (a)
+    OP_CHECK(set_event_handling_mode_stream,
+        SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT)
+        OP_C_WRITE(a, "orange", 6)
+            OP_C_CONCLUDE(a)
 
     /*
      * Confirm the data isn't going to arrive. OP_SLEEP is always undesirable
@@ -5747,49 +5764,48 @@ static const struct script_op script_86[] = {
      * signals arriving from the peer which could be used for synchronisation.
      * Slow OSes will pass this anyway (fail-open).
      */
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
+    OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
 
-    OP_BEGIN_REPEAT         (20)
-    OP_S_READ_FAIL          (a, 1)
-    OP_SLEEP                (10)
-    OP_END_REPEAT           ()
+        OP_BEGIN_REPEAT(20)
+            OP_S_READ_FAIL(a, 1)
+                OP_SLEEP(10)
+                    OP_END_REPEAT()
 
     /* Now let the data arrive and confirm it arrives. */
-    OP_CHECK                (reenable_test_event_handling, 0)
-    OP_S_READ_EXPECT        (a, "appleorange", 11)
-    OP_S_EXPECT_FIN         (a)
+    OP_CHECK(reenable_test_event_handling, 0)
+        OP_S_READ_EXPECT(a, "appleorange", 11)
+            OP_S_EXPECT_FIN(a)
 
     /* Back into explicit mode. */
-    OP_CHECK                (set_event_handling_mode_conn,
-                             SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT)
-    OP_S_WRITE              (a, "ok", 2)
-    OP_C_READ_FAIL          (a)
+    OP_CHECK(set_event_handling_mode_conn,
+        SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT)
+        OP_S_WRITE(a, "ok", 2)
+            OP_C_READ_FAIL(a)
 
     /* Works once event handling is done. */
-    OP_CHECK                (reenable_test_event_handling, 0)
-    OP_C_READ_EXPECT        (a, "ok", 2)
+    OP_CHECK(reenable_test_event_handling, 0)
+        OP_C_READ_EXPECT(a, "ok", 2)
 
-    OP_END
+            OP_END
 };
 
-
 /* 87. Test stream reset functionality */
 static const struct script_op script_87[] = {
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT       ()
-    OP_C_NEW_STREAM_BIDI    (a, C_BIDI_ID(0))
-    OP_C_WRITE              (a, "apple", 5)
-    OP_C_CONCLUDE           (a)
-    OP_S_BIND_STREAM_ID     (a, C_BIDI_ID(0))
-    OP_S_READ_EXPECT        (a, "apple", 5)
-    OP_S_EXPECT_FIN         (a)
-    OP_S_WRITE              (a, "orange", 6)
-    OP_C_READ_EXPECT        (a, "orange", 6)
-    OP_S_CONCLUDE           (a)
-    OP_C_EXPECT_FIN         (a)
-    OP_SLEEP                (1000)
-    OP_C_STREAM_RESET_FAIL  (a, 42)
-    OP_END
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT()
+            OP_C_NEW_STREAM_BIDI(a, C_BIDI_ID(0))
+                OP_C_WRITE(a, "apple", 5)
+                    OP_C_CONCLUDE(a)
+                        OP_S_BIND_STREAM_ID(a, C_BIDI_ID(0))
+                            OP_S_READ_EXPECT(a, "apple", 5)
+                                OP_S_EXPECT_FIN(a)
+                                    OP_S_WRITE(a, "orange", 6)
+                                        OP_C_READ_EXPECT(a, "orange", 6)
+                                            OP_S_CONCLUDE(a)
+                                                OP_C_EXPECT_FIN(a)
+                                                    OP_SLEEP(1000)
+                                                        OP_C_STREAM_RESET_FAIL(a, 42)
+                                                            OP_END
 };
 
 static const struct script_op *const scripts[] = {
@@ -5908,21 +5924,21 @@ static int test_script(int idx)
     BIO_snprintf(script_name, sizeof(script_name), "script %d", script_idx + 1);
 
     TEST_info("Running script %d (order=%d, blocking=%d)", script_idx + 1,
-              free_order, blocking);
+        free_order, blocking);
     return run_script(scripts[script_idx], script_name, free_order, blocking);
 }
 
 /* Dynamically generated tests. */
 static struct script_op dyn_frame_types_script[] = {
-    OP_S_SET_INJECT_PLAIN   (script_21_inject_plain)
-    OP_SET_INJECT_WORD      (0, 0) /* dynamic */
+    OP_S_SET_INJECT_PLAIN(script_21_inject_plain)
+        OP_SET_INJECT_WORD(0, 0) /* dynamic */
 
-    OP_C_SET_ALPN           ("ossltest")
-    OP_C_CONNECT_WAIT_OR_FAIL()
+    OP_C_SET_ALPN("ossltest")
+        OP_C_CONNECT_WAIT_OR_FAIL()
 
-    OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR,0,0)
+            OP_C_EXPECT_CONN_CLOSE_INFO(OSSL_QUIC_ERR_FRAME_ENCODING_ERROR, 0, 0)
 
-    OP_END
+                OP_END
 };
 
 struct forbidden_frame_type {
@@ -5991,7 +6007,7 @@ static ossl_unused int test_dyn_frame_types(int idx)
         }
 
     BIO_snprintf(script_name, sizeof(script_name),
-                 "dyn script %d", idx);
+        "dyn script %d", idx);
 
     return run_script(dyn_frame_types_script, script_name, 0, 0);
 }
@@ -6000,7 +6016,7 @@ OPT_TEST_DECLARE_USAGE("certfile privkeyfile\n")
 
 int setup_tests(void)
 {
-#if defined (_PUT_MODEL_)
+#if defined(_PUT_MODEL_)
     return TEST_skip("QUIC is not supported by this build");
 #endif
 
diff --git a/test/quic_newcid_test.c b/test/quic_newcid_test.c
index 80a15e1b7ab0f..2252583a79fe5 100644
--- a/test/quic_newcid_test.c
+++ b/test/quic_newcid_test.c
@@ -21,7 +21,7 @@ static char *privkey = NULL;
  */
 static size_t ncid_injected;
 static int add_ncid_frame_cb(QTEST_FAULT *fault, QUIC_PKT_HDR *hdr,
-                             unsigned char *buf, size_t len, void *cbarg)
+    unsigned char *buf, size_t len, void *cbarg)
 {
     /*
      * We inject NEW_CONNECTION_ID frame to trigger change of the DCID.
@@ -29,10 +29,10 @@ static int add_ncid_frame_cb(QTEST_FAULT *fault, QUIC_PKT_HDR *hdr,
      * able to receive packets with this new id.
      */
     static unsigned char new_conn_id_frame[] = {
-        0x18,                           /* Type */
-        0x01,                           /* Sequence Number */
-        0x01,                           /* Retire Prior To */
-        0x08,                           /* Connection ID Length */
+        0x18, /* Type */
+        0x01, /* Sequence Number */
+        0x01, /* Retire Prior To */
+        0x08, /* Connection ID Length */
         0x33, 0x44, 0x55, 0x66, 0xde, 0xad, 0xbe, 0xef, /* Connection ID */
         0xab, 0xcd, 0xef, 0x01, 0x12, 0x32, 0x23, 0x45, /* Stateless Reset Token */
         0x56, 0x06, 0x08, 0x89, 0xa1, 0xb2, 0xc3, 0xd4
@@ -43,7 +43,7 @@ static int add_ncid_frame_cb(QTEST_FAULT *fault, QUIC_PKT_HDR *hdr,
         return 1;
 
     return qtest_fault_prepend_frame(fault, new_conn_id_frame,
-                                     sizeof(new_conn_id_frame));
+        sizeof(new_conn_id_frame));
 }
 
 static int test_ncid_frame(int fail)
@@ -60,7 +60,7 @@ static int test_ncid_frame(int fail)
     QTEST_FAULT *fault = NULL;
     static const QUIC_CONN_ID conn_id = {
         0x08,
-        {0x33, 0x44, 0x55, 0x66, 0xde, 0xad, 0xbe, 0xef}
+        { 0x33, 0x44, 0x55, 0x66, 0xde, 0xad, 0xbe, 0xef }
     };
 
     ncid_injected = 0;
@@ -68,7 +68,7 @@ static int test_ncid_frame(int fail)
         goto err;
 
     if (!TEST_true(qtest_create_quic_objects(NULL, cctx, NULL, cert, privkey, 0,
-                                             &qtserv, &cssl, &fault, NULL)))
+            &qtserv, &cssl, &fault, NULL)))
         goto err;
 
     if (!TEST_true(qtest_create_quic_connection(qtserv, cssl)))
@@ -79,7 +79,7 @@ static int test_ncid_frame(int fail)
 
     ossl_quic_tserver_tick(qtserv);
     if (!TEST_true(ossl_quic_tserver_read(qtserv, 0, buf, sizeof(buf),
-                                          &bytesread)))
+            &bytesread)))
         goto err;
 
     /*
@@ -95,14 +95,14 @@ static int test_ncid_frame(int fail)
      * a NEW_CONNECTION_ID frame.
      */
     if (!TEST_true(qtest_fault_set_packet_plain_listener(fault,
-                                                         add_ncid_frame_cb,
-                                                         NULL)))
+            add_ncid_frame_cb,
+            NULL)))
         goto err;
     if (!fail && !TEST_true(ossl_quic_tserver_set_new_local_cid(qtserv, &conn_id)))
         goto err;
     if (!TEST_true(ossl_quic_tserver_write(qtserv, 0,
-                                           (unsigned char *)msg, msglen,
-                                           &byteswritten)))
+            (unsigned char *)msg, msglen,
+            &byteswritten)))
         goto err;
 
     if (!TEST_true(ncid_injected))
@@ -126,7 +126,7 @@ static int test_ncid_frame(int fail)
 
     ossl_quic_tserver_tick(qtserv);
     if (!TEST_true(ossl_quic_tserver_read(qtserv, 0, buf, sizeof(buf),
-                                          &bytesread)))
+            &bytesread)))
         goto err;
 
     if (fail) {
@@ -138,7 +138,7 @@ static int test_ncid_frame(int fail)
     }
 
     testresult = 1;
- err:
+err:
     qtest_fault_free(fault);
     SSL_free(cssl);
     ossl_quic_tserver_free(qtserv);
@@ -172,7 +172,7 @@ int setup_tests(void)
 
     return 1;
 
- err:
+err:
     OPENSSL_free(cert);
     OPENSSL_free(privkey);
     return 0;
diff --git a/test/quic_qlog_test.c b/test/quic_qlog_test.c
index e54ced2f0eb59..657066a98f34b 100644
--- a/test/quic_qlog_test.c
+++ b/test/quic_qlog_test.c
@@ -15,7 +15,7 @@
  * ANSI C only guarantees support for up to 509 characters in a string literal.
  */
 static const char expected[] = {
-     30, '{', '"', 'q', 'l', 'o', 'g', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n',
+    30, '{', '"', 'q', 'l', 'o', 'g', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n',
     '"', ':', '"', '0', '.', '3', '"', ',', '"', 'q', 'l', 'o', 'g', '_', 'f',
     'o', 'r', 'm', 'a', 't', '"', ':', '"', 'J', 'S', 'O', 'N', '-', 'S', 'E',
     'Q', '"', ',', '"', 't', 'i', 't', 'l', 'e', '"', ':', '"', 't', 'e', 's',
@@ -34,7 +34,7 @@ static const char expected[] = {
     't', 'a', 'g', 'e', '_', 'p', 'o', 'i', 'n', 't', '"', ':', '{', '"', 't',
     'y', 'p', 'e', '"', ':', '"', 'c', 'l', 'i', 'e', 'n', 't', '"', ',', '"',
     'n', 'a', 'm', 'e', '"', ':', '"', 'O', 'p', 'e', 'n', 'S', 'S', 'L', '/',
-    'x', '.', 'y', '.', 'z', '"', '}', '}', '}',  10,  30, '{', '"', 'n', 'a',
+    'x', '.', 'y', '.', 'z', '"', '}', '}', '}', 10, 30, '{', '"', 'n', 'a',
     'm', 'e', '"', ':', '"', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', ':',
     'p', 'a', 'c', 'k', 'e', 't', '_', 's', 'e', 'n', 't', '"', ',', '"', 'd',
     'a', 't', 'a', '"', ':', '{', '"', 'f', 'i', 'e', 'l', 'd', '1', '"', ':',
@@ -52,12 +52,12 @@ static const char expected[] = {
     ':', '{', '"', 'f', 'i', 'e', 'l', 'd', '1', '0', '"', ':', '"', 'b', 'a',
     'z', '"', '}', ',', '"', 'a', 'r', 'r', 'a', 'y', '"', ':', '[', '"', 'a',
     '"', ',', '"', 'b', '"', ']', '}', ',', '"', 't', 'i', 'm', 'e', '"', ':',
-    '1', '7', '0', '6', '5', '3', '1', '1', '7', '0', '0', '0', '}',  10,  30,
+    '1', '7', '0', '6', '5', '3', '1', '1', '7', '0', '0', '0', '}', 10, 30,
     '{', '"', 'n', 'a', 'm', 'e', '"', ':', '"', 't', 'r', 'a', 'n', 's', 'p',
     'o', 'r', 't', ':', 'p', 'a', 'c', 'k', 'e', 't', '_', 's', 'e', 'n', 't',
     '"', ',', '"', 'd', 'a', 't', 'a', '"', ':', '{', '"', 'f', 'i', 'e', 'l',
     'd', '1', '"', ':', '"', 'b', 'a', 'r', '"', '}', ',', '"', 't', 'i', 'm',
-    'e', '"', ':', '1', '0', '0', '0', '}',  10
+    'e', '"', ':', '1', '0', '0', '0', '}', 10
 };
 
 static const unsigned char bin_buf[] = {
@@ -77,7 +77,7 @@ static OSSL_TIME now(void *arg)
 static int test_qlog(void)
 {
     int testresult = 0;
-    QLOG_TRACE_INFO qti = {0};
+    QLOG_TRACE_INFO qti = { 0 };
     QLOG *qlog;
     BIO *bio;
     char *buf = NULL;
@@ -85,14 +85,14 @@ static int test_qlog(void)
 
     last_time = ossl_time_from_time_t(170653117);
 
-    qti.odcid.id_len        = 1;
-    qti.odcid.id[0]         = 0x55;
-    qti.title               = "test title";
-    qti.description         = "test description";
-    qti.group_id            = "test group ID";
+    qti.odcid.id_len = 1;
+    qti.odcid.id[0] = 0x55;
+    qti.title = "test title";
+    qti.description = "test description";
+    qti.group_id = "test group ID";
     qti.override_process_id = 123;
-    qti.now_cb              = now;
-    qti.override_impl_name  = "OpenSSL/x.y.z";
+    qti.now_cb = now;
+    qti.override_impl_name = "OpenSSL/x.y.z";
 
     if (!TEST_ptr(qlog = ossl_qlog_new(&qti)))
         goto err;
@@ -107,32 +107,32 @@ static int test_qlog(void)
         goto err;
 
     QLOG_EVENT_BEGIN(qlog, transport, packet_sent)
-        QLOG_STR("field1", "foo");
-        QLOG_STR_LEN("field2", "bar", 3);
-        QLOG_I64("field3", 42);
-        QLOG_I64("field4", 1ULL << 60);
-        QLOG_U64("field5", UINT64_MAX);
-        QLOG_BOOL("field6", 0);
-        QLOG_BOOL("field7", 1);
-        QLOG_BIN("field8", bin_buf, sizeof(bin_buf));
-        QLOG_CID("field9", &qti.odcid);
-        QLOG_BEGIN("subgroup")
-            QLOG_STR("field10", "baz");
-        QLOG_END()
-        QLOG_BEGIN_ARRAY("array")
-            QLOG_STR(NULL, "a");
-            QLOG_STR(NULL, "b");
-        QLOG_END_ARRAY()
+    QLOG_STR("field1", "foo");
+    QLOG_STR_LEN("field2", "bar", 3);
+    QLOG_I64("field3", 42);
+    QLOG_I64("field4", 1ULL << 60);
+    QLOG_U64("field5", UINT64_MAX);
+    QLOG_BOOL("field6", 0);
+    QLOG_BOOL("field7", 1);
+    QLOG_BIN("field8", bin_buf, sizeof(bin_buf));
+    QLOG_CID("field9", &qti.odcid);
+    QLOG_BEGIN("subgroup")
+    QLOG_STR("field10", "baz");
+    QLOG_END()
+    QLOG_BEGIN_ARRAY("array")
+    QLOG_STR(NULL, "a");
+    QLOG_STR(NULL, "b");
+    QLOG_END_ARRAY()
     QLOG_EVENT_END()
 
     /* not enabled */
     QLOG_EVENT_BEGIN(qlog, transport, packet_received)
-        QLOG_STR("field1", "foo");
+    QLOG_STR("field1", "foo");
     QLOG_EVENT_END()
 
     /* test delta time calculation */
     QLOG_EVENT_BEGIN(qlog, transport, packet_sent)
-        QLOG_STR("field1", "bar");
+    QLOG_STR("field1", "bar");
     QLOG_EVENT_END()
 
     if (!TEST_true(ossl_qlog_flush(qlog)))
@@ -153,52 +153,52 @@ static int test_qlog(void)
 
 struct filter_spec {
     const char *filter;
-    int         expect_ok;
-    uint32_t    expect_event_type;
-    int         expect_event_enable;
+    int expect_ok;
+    uint32_t expect_event_type;
+    int expect_event_enable;
 };
 
 static const struct filter_spec filters[] = {
     { "*", 1,
-      QLOG_EVENT_TYPE_transport_packet_sent, 1 },
+        QLOG_EVENT_TYPE_transport_packet_sent, 1 },
     { "-*", 1,
-      QLOG_EVENT_TYPE_transport_packet_sent, 0 },
+        QLOG_EVENT_TYPE_transport_packet_sent, 0 },
     { "+*", 1,
-      QLOG_EVENT_TYPE_transport_packet_sent, 1 },
+        QLOG_EVENT_TYPE_transport_packet_sent, 1 },
     { "* *", 1,
-      QLOG_EVENT_TYPE_transport_packet_received, 1 },
+        QLOG_EVENT_TYPE_transport_packet_received, 1 },
     { "-* +*", 1,
-      QLOG_EVENT_TYPE_transport_packet_received, 1 },
+        QLOG_EVENT_TYPE_transport_packet_received, 1 },
     { "-* +* -*", 1,
-      QLOG_EVENT_TYPE_transport_packet_received, 0 },
+        QLOG_EVENT_TYPE_transport_packet_received, 0 },
     { "  *", 1,
-      QLOG_EVENT_TYPE_transport_packet_sent, 1 },
+        QLOG_EVENT_TYPE_transport_packet_sent, 1 },
     { " ", 1,
-      QLOG_EVENT_TYPE_transport_packet_sent, 0 },
+        QLOG_EVENT_TYPE_transport_packet_sent, 0 },
     { "", 1,
-      QLOG_EVENT_TYPE_transport_packet_sent, 0 },
+        QLOG_EVENT_TYPE_transport_packet_sent, 0 },
     { "transport:packet_sent", 1,
-      QLOG_EVENT_TYPE_transport_packet_sent, 1 },
+        QLOG_EVENT_TYPE_transport_packet_sent, 1 },
     { "transport:packet_sent", 1,
-      QLOG_EVENT_TYPE_transport_packet_received, 0 },
+        QLOG_EVENT_TYPE_transport_packet_received, 0 },
     { "* -transport:packet_sent", 1,
-      QLOG_EVENT_TYPE_transport_packet_received, 1 },
+        QLOG_EVENT_TYPE_transport_packet_received, 1 },
     { "* -transport:packet_sent", 1,
-      QLOG_EVENT_TYPE_transport_packet_sent, 0 },
+        QLOG_EVENT_TYPE_transport_packet_sent, 0 },
     { "unknown:event", 1,
-      QLOG_EVENT_TYPE_transport_packet_sent, 0 },
+        QLOG_EVENT_TYPE_transport_packet_sent, 0 },
     { "unknown:event +transport:packet_sent", 1,
-      QLOG_EVENT_TYPE_transport_packet_sent, 1 },
+        QLOG_EVENT_TYPE_transport_packet_sent, 1 },
     { "unknown:event transport:*", 1,
-      QLOG_EVENT_TYPE_transport_packet_sent, 1 },
+        QLOG_EVENT_TYPE_transport_packet_sent, 1 },
     { "unknown:event +transport:* -transport:packet_sent", 1,
-      QLOG_EVENT_TYPE_transport_packet_received, 1 },
+        QLOG_EVENT_TYPE_transport_packet_received, 1 },
     { "unknown:event transport:* -transport:packet_sent", 1,
-      QLOG_EVENT_TYPE_transport_packet_sent, 0 },
+        QLOG_EVENT_TYPE_transport_packet_sent, 0 },
     { "* -transport:*", 1,
-      QLOG_EVENT_TYPE_connectivity_connection_started, 1 },
+        QLOG_EVENT_TYPE_connectivity_connection_started, 1 },
     { "* -transport:*", 1,
-      QLOG_EVENT_TYPE_transport_parameters_set, 0 },
+        QLOG_EVENT_TYPE_transport_parameters_set, 0 },
     { "&", 0 },
     { "event_name_without_category", 0 },
     { "event_name_with_@badchar:foo", 0 },
@@ -216,22 +216,22 @@ static const struct filter_spec filters[] = {
 static int test_qlog_filter(int idx)
 {
     int testresult = 0;
-    QLOG_TRACE_INFO qti = {0};
+    QLOG_TRACE_INFO qti = { 0 };
     QLOG *qlog;
 
-    qti.odcid.id_len        = 1;
-    qti.odcid.id[0]         = 0x55;
+    qti.odcid.id_len = 1;
+    qti.odcid.id[0] = 0x55;
 
     if (!TEST_ptr(qlog = ossl_qlog_new(&qti)))
         goto err;
 
     if (!TEST_int_eq(ossl_qlog_set_filter(qlog, filters[idx].filter),
-                     filters[idx].expect_ok))
+            filters[idx].expect_ok))
         goto err;
 
     if (filters[idx].expect_event_type != QLOG_EVENT_TYPE_NONE)
         if (!TEST_int_eq(ossl_qlog_enabled(qlog, filters[idx].expect_event_type),
-                         filters[idx].expect_event_enable))
+                filters[idx].expect_event_enable))
             goto err;
 
     testresult = 1;
diff --git a/test/quic_rcidm_test.c b/test/quic_rcidm_test.c
index 4b7fa50eea4d7..619c4c3efe7d7 100644
--- a/test/quic_rcidm_test.c
+++ b/test/quic_rcidm_test.c
@@ -25,18 +25,18 @@ static int test_rcidm(int idx)
 {
     int testresult = 0;
     QUIC_RCIDM *rcidm;
-    OSSL_QUIC_FRAME_NEW_CONN_ID ncid_frame_1 = {0}, ncid_frame_2 = {0};
+    OSSL_QUIC_FRAME_NEW_CONN_ID ncid_frame_1 = { 0 }, ncid_frame_2 = { 0 };
     QUIC_CONN_ID dcid_out;
     const QUIC_CONN_ID *odcid = NULL;
     uint64_t seq_num_out;
 
-    ncid_frame_1.seq_num        = 2;
+    ncid_frame_1.seq_num = 2;
     ncid_frame_1.conn_id.id_len = 8;
-    ncid_frame_1.conn_id.id[0]  = 3;
+    ncid_frame_1.conn_id.id[0] = 3;
 
-    ncid_frame_2.seq_num        = 3;
+    ncid_frame_2.seq_num = 3;
     ncid_frame_2.conn_id.id_len = 8;
-    ncid_frame_2.conn_id.id[0]  = 4;
+    ncid_frame_2.conn_id.id[0] = 4;
 
     odcid = ((idx == 2) ? NULL : &cid8_1);
     if (!TEST_ptr(rcidm = ossl_quic_rcidm_new(odcid)))
diff --git a/test/quic_record_test.c b/test/quic_record_test.c
index 188ccd15b1947..4966a2f7b5fef 100644
--- a/test/quic_record_test.c
+++ b/test/quic_record_test.c
@@ -16,23 +16,23 @@
 #include "testutil.h"
 #include "quic_record_test_util.h"
 
-static const QUIC_CONN_ID empty_conn_id = {0, {0}};
-
-#define RX_TEST_OP_END                     0 /* end of script */
-#define RX_TEST_OP_SET_SCID_LEN            1 /* change SCID length */
-#define RX_TEST_OP_SET_INIT_LARGEST_PN     2 /* set initial largest PN */
-#define RX_TEST_OP_SET_RX_DCID             3 /* register an RX DCID */
-#define RX_TEST_OP_INJECT                  4 /* inject a datagram into demux */
-#define RX_TEST_OP_PROVIDE_SECRET          5 /* provide RX secret */
-#define RX_TEST_OP_PROVIDE_SECRET_INITIAL  6 /* provide RX secret for initial */
-#define RX_TEST_OP_DISCARD_EL              7 /* discard an encryption level */
-#define RX_TEST_OP_CHECK_PKT               8 /* read packet, compare to expected */
-#define RX_TEST_OP_CHECK_NO_PKT            9 /* check no packet is available to read */
-#define RX_TEST_OP_CHECK_KEY_EPOCH        10 /* check key epoch value matches */
-#define RX_TEST_OP_KEY_UPDATE_TIMEOUT     11 /* complete key update process */
-#define RX_TEST_OP_SET_INIT_KEY_PHASE     12 /* initial Key Phase bit value */
-#define RX_TEST_OP_CHECK_PKT_EPOCH        13 /* check read key epoch matches */
-#define RX_TEST_OP_ALLOW_1RTT             14 /* allow 1RTT packet processing */
+static const QUIC_CONN_ID empty_conn_id = { 0, { 0 } };
+
+#define RX_TEST_OP_END 0 /* end of script */
+#define RX_TEST_OP_SET_SCID_LEN 1 /* change SCID length */
+#define RX_TEST_OP_SET_INIT_LARGEST_PN 2 /* set initial largest PN */
+#define RX_TEST_OP_SET_RX_DCID 3 /* register an RX DCID */
+#define RX_TEST_OP_INJECT 4 /* inject a datagram into demux */
+#define RX_TEST_OP_PROVIDE_SECRET 5 /* provide RX secret */
+#define RX_TEST_OP_PROVIDE_SECRET_INITIAL 6 /* provide RX secret for initial */
+#define RX_TEST_OP_DISCARD_EL 7 /* discard an encryption level */
+#define RX_TEST_OP_CHECK_PKT 8 /* read packet, compare to expected */
+#define RX_TEST_OP_CHECK_NO_PKT 9 /* check no packet is available to read */
+#define RX_TEST_OP_CHECK_KEY_EPOCH 10 /* check key epoch value matches */
+#define RX_TEST_OP_KEY_UPDATE_TIMEOUT 11 /* complete key update process */
+#define RX_TEST_OP_SET_INIT_KEY_PHASE 12 /* initial Key Phase bit value */
+#define RX_TEST_OP_CHECK_PKT_EPOCH 13 /* check read key epoch matches */
+#define RX_TEST_OP_ALLOW_1RTT 14 /* allow 1RTT packet processing */
 
 struct rx_test_op {
     unsigned char op;
@@ -58,19 +58,19 @@ struct rx_test_op {
     { RX_TEST_OP_SET_RX_DCID, 0, NULL, 0, NULL, 0, 0, 0, &(dcid), NULL },
 #define RX_OP_INJECT(dgram) \
     { RX_TEST_OP_INJECT, 0, (dgram), sizeof(dgram), NULL, 0, 0, 0, NULL },
-#define RX_OP_PROVIDE_SECRET(el, suite, key)                           \
-    {                                                               \
-        RX_TEST_OP_PROVIDE_SECRET, 0, (key), sizeof(key),             \
-        NULL, (el), (suite), 0, NULL, NULL                          \
+#define RX_OP_PROVIDE_SECRET(el, suite, key)              \
+    {                                                     \
+        RX_TEST_OP_PROVIDE_SECRET, 0, (key), sizeof(key), \
+        NULL, (el), (suite), 0, NULL, NULL                \
     },
 #define RX_OP_PROVIDE_SECRET_INITIAL(dcid) \
     { RX_TEST_OP_PROVIDE_SECRET_INITIAL, 0, NULL, 0, NULL, 0, 0, 0, &(dcid), NULL },
 #define RX_OP_DISCARD_EL(el) \
     { RX_TEST_OP_DISCARD_EL, 0, NULL, 0, NULL, (el), 0, 0, NULL, NULL },
-#define RX_OP_CHECK_PKT(expect_hdr, expect_body)                       \
-    {                                                               \
-        RX_TEST_OP_CHECK_PKT, 0, (expect_body), sizeof(expect_body),  \
-        &(expect_hdr), 0, 0, 0, NULL, NULL                          \
+#define RX_OP_CHECK_PKT(expect_hdr, expect_body)                     \
+    {                                                                \
+        RX_TEST_OP_CHECK_PKT, 0, (expect_body), sizeof(expect_body), \
+        &(expect_hdr), 0, 0, 0, NULL, NULL                           \
     },
 #define RX_OP_CHECK_NO_PKT() \
     { RX_TEST_OP_CHECK_NO_PKT, 0, NULL, 0, NULL, 0, 0, 0, NULL, NULL },
@@ -85,13 +85,13 @@ struct rx_test_op {
 #define RX_OP_ALLOW_1RTT() \
     { RX_TEST_OP_ALLOW_1RTT, 0, NULL, 0, NULL, 0, 0, 0, NULL },
 
-#define RX_OP_INJECT_N(n)                                          \
+#define RX_OP_INJECT_N(n) \
     RX_OP_INJECT(rx_script_##n##_in)
-#define RX_OP_CHECK_PKT_N(n)                                       \
+#define RX_OP_CHECK_PKT_N(n) \
     RX_OP_CHECK_PKT(rx_script_##n##_expect_hdr, rx_script_##n##_body)
 
-#define RX_OP_INJECT_CHECK(n)                                  \
-    RX_OP_INJECT_N(n)                                              \
+#define RX_OP_INJECT_CHECK(n) \
+    RX_OP_INJECT_N(n)         \
     RX_OP_CHECK_PKT_N(n)
 
 /* 1. RFC 9001 - A.3 Server Initial */
@@ -128,8 +128,8 @@ static const QUIC_CONN_ID rx_script_1_dcid = {
 
 static const QUIC_PKT_HDR rx_script_1_expect_hdr = {
     QUIC_PKT_TYPE_INITIAL,
-    0, 0, 2, 0, 1, 0, 0, 1, { 0, {0} },
-    { 8, {0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } },
+    0, 0, 2, 0, 1, 0, 0, 1, { 0, { 0 } },
+    { 8, { 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } },
     { 0, 1, 0, 0 },
     NULL, 0,
     99, NULL
@@ -137,12 +137,12 @@ static const QUIC_PKT_HDR rx_script_1_expect_hdr = {
 
 static const struct rx_test_op rx_script_1[] = {
     RX_OP_SET_SCID_LEN(2)
-    RX_OP_SET_INIT_LARGEST_PN(0)
-    RX_OP_SET_RX_DCID(empty_conn_id)
-    RX_OP_PROVIDE_SECRET_INITIAL(rx_script_1_dcid)
-    RX_OP_INJECT_CHECK(1)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_END
+        RX_OP_SET_INIT_LARGEST_PN(0)
+            RX_OP_SET_RX_DCID(empty_conn_id)
+                RX_OP_PROVIDE_SECRET_INITIAL(rx_script_1_dcid)
+                    RX_OP_INJECT_CHECK(1)
+                        RX_OP_CHECK_NO_PKT()
+                            RX_OP_END
 };
 
 /* 2. RFC 9001 - A.5 ChaCha20-Poly1305 Short Header Packet */
@@ -164,51 +164,51 @@ static const unsigned char rx_script_2_body[] = {
 
 static const QUIC_PKT_HDR rx_script_2_expect_hdr = {
     QUIC_PKT_TYPE_1RTT,
-    0, 0, 3, 0, 1, 0, 0, 0, {0, {0}}, {0, {0}},
-    {0x00, 0xbf, 0xf4, 0x00},
+    0, 0, 3, 0, 1, 0, 0, 0, { 0, { 0 } }, { 0, { 0 } },
+    { 0x00, 0xbf, 0xf4, 0x00 },
     NULL, 0,
     1, NULL
 };
 
 static const struct rx_test_op rx_script_2[] = {
     RX_OP_ALLOW_1RTT()
-    RX_OP_SET_INIT_LARGEST_PN(654360560)
-    RX_OP_SET_RX_DCID(empty_conn_id)
-    RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_CHACHA20POLY1305,
-                         rx_script_2_secret)
-    RX_OP_INJECT_CHECK(2)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_END
+        RX_OP_SET_INIT_LARGEST_PN(654360560)
+            RX_OP_SET_RX_DCID(empty_conn_id)
+                RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_CHACHA20POLY1305,
+                    rx_script_2_secret)
+                    RX_OP_INJECT_CHECK(2)
+                        RX_OP_CHECK_NO_PKT()
+                            RX_OP_END
 };
 #endif /* !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) */
 
 /* 3. Real World - Version Negotiation Response */
 static const unsigned char rx_script_3_in[] = {
-    0xc7,                               /* Long; Random Bits */
-    0x00, 0x00, 0x00, 0x00,             /* Version 0 (Version Negotiation) */
-    0x00,                               /* DCID */
+    0xc7, /* Long; Random Bits */
+    0x00, 0x00, 0x00, 0x00, /* Version 0 (Version Negotiation) */
+    0x00, /* DCID */
     0x0c, 0x35, 0x3c, 0x1b, 0x97, 0xca, /* SCID */
     0xf8, 0x99, 0x11, 0x39, 0xad, 0x79,
     0x1f,
-    0x00, 0x00, 0x00, 0x01,             /* Supported Version: 1 */
-    0xaa, 0x9a, 0x3a, 0x9a              /* Supported Version: Random (GREASE) */
+    0x00, 0x00, 0x00, 0x01, /* Supported Version: 1 */
+    0xaa, 0x9a, 0x3a, 0x9a /* Supported Version: Random (GREASE) */
 };
 
 static const QUIC_PKT_HDR rx_script_3_expect_hdr = {
     QUIC_PKT_TYPE_VERSION_NEG,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    0,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    0,          /* Version */
-    {0, {0}},                                   /* DCID */
-    {12, {0x35, 0x3c, 0x1b, 0x97, 0xca, 0xf8,   /* SCID */
-          0x99, 0x11, 0x39, 0xad, 0x79, 0x1f}},
-    {0},        /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    0, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    0, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 12, { 0x35, 0x3c, 0x1b, 0x97, 0xca, 0xf8, /* SCID */
+              0x99, 0x11, 0x39, 0xad, 0x79, 0x1f } },
+    { 0 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     8, NULL
 };
 
@@ -225,43 +225,154 @@ static const struct rx_test_op rx_script_3[] = {
      * we still pass the packet to it, to exercise what it does.
      */
     RX_OP_INJECT_CHECK(3)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_END
+        RX_OP_CHECK_NO_PKT()
+            RX_OP_END
 };
 
 /* 4. Real World - Retry (S2C) */
 static const unsigned char rx_script_4_in[] = {
-    0xf0,                           /* Long; Retry */
-    0x00, 0x00, 0x00, 0x01,         /* Version 1 */
-    0x00,                           /* DCID */
-    0x04, 0xad, 0x15, 0x3f, 0xae,   /* SCID */
+    0xf0, /* Long; Retry */
+    0x00,
+    0x00,
+    0x00,
+    0x01, /* Version 1 */
+    0x00, /* DCID */
+    0x04,
+    0xad,
+    0x15,
+    0x3f,
+    0xae, /* SCID */
     /* Retry Token, including 16-byte Retry Integrity Tag */
-    0xf6, 0x8b, 0x6e, 0xa3, 0xdc, 0x40, 0x38, 0xc6, 0xa5, 0x99, 0x1c, 0xa9,
-    0x77, 0xe6, 0x1d, 0x4f, 0x09, 0x36, 0x12, 0x26, 0x00, 0x56, 0x0b, 0x29,
-    0x7d, 0x5e, 0xda, 0x39, 0xc6, 0x61, 0x57, 0x69, 0x15, 0xff, 0x93, 0x39,
-    0x95, 0xf0, 0x57, 0xf1, 0xe5, 0x36, 0x08, 0xad, 0xd2, 0x75, 0xa9, 0x68,
-    0x29, 0xed, 0xaa, 0x03, 0x0e, 0x5f, 0xac, 0xbd, 0x26, 0x07, 0x95, 0x4e,
-    0x48, 0x61, 0x26, 0xc5, 0xe2, 0x6c, 0x60, 0xbf, 0xa8, 0x6f, 0x51, 0xbb,
-    0x1d, 0xf7, 0x98, 0x95, 0x3b, 0x2c, 0x50, 0x79, 0xcc, 0xde, 0x27, 0x84,
-    0x44, 0x9b, 0xb2, 0x4a, 0x94, 0x4d, 0x4d, 0x3d, 0xbc, 0x00, 0x9d, 0x69,
-    0xad, 0x45, 0x89, 0x04, 0x48, 0xca, 0x04, 0xf6, 0x3a, 0x62, 0xc1, 0x38,
-    0x9d, 0x82, 0xb3, 0x45, 0x62, 0x4c,
+    0xf6,
+    0x8b,
+    0x6e,
+    0xa3,
+    0xdc,
+    0x40,
+    0x38,
+    0xc6,
+    0xa5,
+    0x99,
+    0x1c,
+    0xa9,
+    0x77,
+    0xe6,
+    0x1d,
+    0x4f,
+    0x09,
+    0x36,
+    0x12,
+    0x26,
+    0x00,
+    0x56,
+    0x0b,
+    0x29,
+    0x7d,
+    0x5e,
+    0xda,
+    0x39,
+    0xc6,
+    0x61,
+    0x57,
+    0x69,
+    0x15,
+    0xff,
+    0x93,
+    0x39,
+    0x95,
+    0xf0,
+    0x57,
+    0xf1,
+    0xe5,
+    0x36,
+    0x08,
+    0xad,
+    0xd2,
+    0x75,
+    0xa9,
+    0x68,
+    0x29,
+    0xed,
+    0xaa,
+    0x03,
+    0x0e,
+    0x5f,
+    0xac,
+    0xbd,
+    0x26,
+    0x07,
+    0x95,
+    0x4e,
+    0x48,
+    0x61,
+    0x26,
+    0xc5,
+    0xe2,
+    0x6c,
+    0x60,
+    0xbf,
+    0xa8,
+    0x6f,
+    0x51,
+    0xbb,
+    0x1d,
+    0xf7,
+    0x98,
+    0x95,
+    0x3b,
+    0x2c,
+    0x50,
+    0x79,
+    0xcc,
+    0xde,
+    0x27,
+    0x84,
+    0x44,
+    0x9b,
+    0xb2,
+    0x4a,
+    0x94,
+    0x4d,
+    0x4d,
+    0x3d,
+    0xbc,
+    0x00,
+    0x9d,
+    0x69,
+    0xad,
+    0x45,
+    0x89,
+    0x04,
+    0x48,
+    0xca,
+    0x04,
+    0xf6,
+    0x3a,
+    0x62,
+    0xc1,
+    0x38,
+    0x9d,
+    0x82,
+    0xb3,
+    0x45,
+    0x62,
+    0x4c,
 };
 
 static const QUIC_PKT_HDR rx_script_4_expect_hdr = {
     QUIC_PKT_TYPE_RETRY,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    0,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    1,          /* Version */
-    {0, {0}},                           /* DCID */
-    {4, {0xad, 0x15, 0x3f, 0xae}},      /* SCID */
-    {0},        /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    0, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    1, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 4, { 0xad, 0x15, 0x3f, 0xae } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     114, NULL
 };
 
@@ -280,9 +391,9 @@ static const unsigned char rx_script_4_body[] = {
 
 static const struct rx_test_op rx_script_4[] = {
     RX_OP_SET_RX_DCID(empty_conn_id)
-    RX_OP_INJECT_CHECK(4)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_END
+        RX_OP_INJECT_CHECK(4)
+            RX_OP_CHECK_NO_PKT()
+                RX_OP_END
 };
 
 /*
@@ -290,7 +401,7 @@ static const struct rx_test_op rx_script_4[] = {
  *      - Initial, Handshake, 1-RTT (AES-128-GCM/SHA256)
  */
 static const QUIC_CONN_ID rx_script_5_c2s_init_dcid = {
-    4, {0xad, 0x15, 0x3f, 0xae}
+    4, { 0xad, 0x15, 0x3f, 0xae }
 };
 
 static const unsigned char rx_script_5_handshake_secret[32] = {
@@ -300,357 +411,2591 @@ static const unsigned char rx_script_5_handshake_secret[32] = {
 };
 
 static const unsigned char rx_script_5_1rtt_secret[32] = {
-    0x53, 0xf2, 0x1b, 0x94, 0xa7, 0x65, 0xf7, 0x76, 0xfb, 0x06, 0x27, 0xaa,
-    0xd2, 0x3f, 0xe0, 0x9a, 0xbb, 0xcf, 0x99, 0x6f, 0x13, 0x2c, 0x6a, 0x37,
-    0x95, 0xf3, 0xda, 0x21, 0xcb, 0xcb, 0xa5, 0x26,
+    0x53,
+    0xf2,
+    0x1b,
+    0x94,
+    0xa7,
+    0x65,
+    0xf7,
+    0x76,
+    0xfb,
+    0x06,
+    0x27,
+    0xaa,
+    0xd2,
+    0x3f,
+    0xe0,
+    0x9a,
+    0xbb,
+    0xcf,
+    0x99,
+    0x6f,
+    0x13,
+    0x2c,
+    0x6a,
+    0x37,
+    0x95,
+    0xf3,
+    0xda,
+    0x21,
+    0xcb,
+    0xcb,
+    0xa5,
+    0x26,
 };
 
 static const unsigned char rx_script_5_in[] = {
     /* First Packet: Initial */
-    0xc4,                           /* Long, Initial, PN Length=2 bytes */
-    0x00, 0x00, 0x00, 0x01,         /* Version */
-    0x00,                           /* DCID */
-    0x04, 0x83, 0xd0, 0x0a, 0x27,   /* SCID */
-    0x00,                           /* Token Length */
-    0x41, 0xd2,                     /* Length (466) */
-    0xe3, 0xab,                     /* PN (0) */
-    0x22, 0x35, 0x34, 0x12, 0xcf, 0x20, 0x2b, 0x16, 0xaf, 0x08, 0xd4, 0xe0,
-    0x94, 0x8b, 0x1e, 0x62, 0xdf, 0x31, 0x61, 0xcc, 0xf9, 0xfa, 0x66, 0x4f,
-    0x18, 0x61, 0x07, 0xcb, 0x13, 0xd3, 0xf9, 0xbf, 0xe2, 0x8e, 0x25, 0x8d,
-    0xd1, 0xdf, 0x58, 0x9c, 0x05, 0x20, 0xf9, 0xf2, 0x01, 0x20, 0xe9, 0x39,
-    0xc3, 0x80, 0x77, 0xec, 0xa4, 0x57, 0xcf, 0x57, 0x8c, 0xdd, 0x68, 0x82,
-    0x91, 0xfe, 0x71, 0xa0, 0xfa, 0x56, 0x4c, 0xf2, 0xe7, 0x2b, 0xd0, 0xc0,
-    0xda, 0x81, 0xe2, 0x39, 0xb5, 0xf0, 0x0f, 0xd9, 0x07, 0xd5, 0x67, 0x09,
-    0x02, 0xf0, 0xff, 0x74, 0xb0, 0xa0, 0xd9, 0x3a, 0x7e, 0xb6, 0x57, 0x82,
-    0x47, 0x18, 0x66, 0xed, 0xe2, 0x18, 0x4d, 0xc2, 0x5c, 0x9f, 0x05, 0x09,
-    0x18, 0x24, 0x0e, 0x3f, 0x3d, 0xf9, 0x15, 0x8b, 0x08, 0xfd, 0x25, 0xe9,
-    0xc9, 0xb7, 0x8c, 0x18, 0x7b, 0xf3, 0x37, 0x58, 0xf0, 0xf0, 0xac, 0x33,
-    0x55, 0x3f, 0x39, 0xbc, 0x62, 0x03, 0x8a, 0xc0, 0xd6, 0xcc, 0x49, 0x47,
-    0xeb, 0x85, 0xb6, 0x72, 0xd7, 0xf8, 0xdc, 0x01, 0x32, 0xec, 0x1b, 0x4e,
-    0x38, 0x6e, 0x2c, 0xc5, 0x80, 0xf2, 0x43, 0x4a, 0xf5, 0xe5, 0xa2, 0xf8,
-    0x76, 0xa7, 0xa8, 0x57, 0x32, 0x67, 0x72, 0xeb, 0x82, 0xac, 0x3e, 0xc0,
-    0x15, 0x67, 0xac, 0x32, 0x19, 0x18, 0x0a, 0xef, 0x20, 0xa1, 0xe8, 0xaf,
-    0xac, 0x33, 0x87, 0x4c, 0x55, 0x05, 0x9b, 0x78, 0xf0, 0x3a, 0xce, 0x02,
-    0x28, 0x06, 0x84, 0x61, 0x97, 0xac, 0x87, 0x8f, 0x25, 0xe7, 0x1b, 0xa3,
-    0x02, 0x08, 0x4c, 0x2e, 0xef, 0xbd, 0x4f, 0x82, 0xe7, 0x37, 0x6c, 0x27,
-    0x6f, 0x85, 0xb4, 0xbc, 0x79, 0x38, 0x45, 0x80, 0x8a, 0xda, 0x2f, 0x11,
-    0x11, 0xac, 0x9c, 0xf3, 0x93, 0xc1, 0x49, 0x1b, 0x94, 0x12, 0x77, 0x07,
-    0xdc, 0xbf, 0xc2, 0xfd, 0x8b, 0xf6, 0xf1, 0x66, 0x1c, 0x7f, 0x07, 0xbf,
-    0x1f, 0xae, 0x27, 0x6c, 0x66, 0xe9, 0xa3, 0x64, 0x7a, 0x96, 0x78, 0x45,
-    0xfe, 0x4b, 0x8c, 0x6f, 0x7f, 0x03, 0x47, 0x3c, 0xd7, 0xf7, 0x63, 0x92,
-    0x58, 0x5b, 0x63, 0x83, 0x03, 0x05, 0xc3, 0x5d, 0x36, 0x62, 0x63, 0x5e,
-    0xcf, 0xfe, 0x0a, 0x29, 0xfa, 0xeb, 0xc8, 0xaf, 0xce, 0x31, 0x07, 0x6a,
-    0x09, 0x41, 0xc0, 0x2d, 0x98, 0x70, 0x05, 0x3b, 0x41, 0xfc, 0x7d, 0x61,
-    0xe0, 0x41, 0x7d, 0x13, 0x41, 0x51, 0x52, 0xb4, 0x78, 0xd5, 0x46, 0x51,
-    0x3b, 0xf1, 0xcd, 0xcc, 0x2e, 0x49, 0x30, 0x8b, 0x2a, 0xd2, 0xe6, 0x69,
-    0xb5, 0x6b, 0x7a, 0xf4, 0xbb, 0xd1, 0xf8, 0x4a, 0xe8, 0x53, 0x10, 0x46,
-    0x85, 0x8d, 0x66, 0x8e, 0x2b, 0xe8, 0x5d, 0xab, 0x7e, 0xfe, 0x5a, 0x79,
-    0xcf, 0xc5, 0x0c, 0x30, 0x9e, 0x98, 0x02, 0xb3, 0xa6, 0xd5, 0xfa, 0x25,
-    0xa8, 0xc8, 0xc1, 0xd9, 0x51, 0x60, 0x57, 0x5d, 0xfe, 0x75, 0x97, 0x05,
-    0xda, 0xbb, 0xc6, 0x6a, 0xbe, 0x5c, 0xa5, 0x65, 0x0a, 0x12, 0x33, 0x1c,
-    0xdf, 0xee, 0x08, 0xa9, 0x13, 0x13, 0x28, 0xce, 0x61, 0x59, 0xd1, 0x4e,
-    0xc7, 0x74, 0xfd, 0x64, 0xde, 0x08, 0xce, 0xda, 0x3f, 0xec, 0xad, 0xc9,
-    0xe1, 0xf9, 0x1f, 0x74, 0xf6, 0x86, 0x37, 0x6a, 0xa0, 0xc8, 0x0b, 0x1b,
-    0x94, 0x98, 0x86, 0x81, 0x3b, 0xfc, 0x47, 0x6c, 0xc9, 0x3e, 0x3c, 0x30,
-    0xc5, 0x9e, 0xb2, 0x32, 0x47, 0xf5, 0x0c, 0x6f,
+    0xc4, /* Long, Initial, PN Length=2 bytes */
+    0x00,
+    0x00,
+    0x00,
+    0x01, /* Version */
+    0x00, /* DCID */
+    0x04,
+    0x83,
+    0xd0,
+    0x0a,
+    0x27, /* SCID */
+    0x00, /* Token Length */
+    0x41,
+    0xd2, /* Length (466) */
+    0xe3,
+    0xab, /* PN (0) */
+    0x22,
+    0x35,
+    0x34,
+    0x12,
+    0xcf,
+    0x20,
+    0x2b,
+    0x16,
+    0xaf,
+    0x08,
+    0xd4,
+    0xe0,
+    0x94,
+    0x8b,
+    0x1e,
+    0x62,
+    0xdf,
+    0x31,
+    0x61,
+    0xcc,
+    0xf9,
+    0xfa,
+    0x66,
+    0x4f,
+    0x18,
+    0x61,
+    0x07,
+    0xcb,
+    0x13,
+    0xd3,
+    0xf9,
+    0xbf,
+    0xe2,
+    0x8e,
+    0x25,
+    0x8d,
+    0xd1,
+    0xdf,
+    0x58,
+    0x9c,
+    0x05,
+    0x20,
+    0xf9,
+    0xf2,
+    0x01,
+    0x20,
+    0xe9,
+    0x39,
+    0xc3,
+    0x80,
+    0x77,
+    0xec,
+    0xa4,
+    0x57,
+    0xcf,
+    0x57,
+    0x8c,
+    0xdd,
+    0x68,
+    0x82,
+    0x91,
+    0xfe,
+    0x71,
+    0xa0,
+    0xfa,
+    0x56,
+    0x4c,
+    0xf2,
+    0xe7,
+    0x2b,
+    0xd0,
+    0xc0,
+    0xda,
+    0x81,
+    0xe2,
+    0x39,
+    0xb5,
+    0xf0,
+    0x0f,
+    0xd9,
+    0x07,
+    0xd5,
+    0x67,
+    0x09,
+    0x02,
+    0xf0,
+    0xff,
+    0x74,
+    0xb0,
+    0xa0,
+    0xd9,
+    0x3a,
+    0x7e,
+    0xb6,
+    0x57,
+    0x82,
+    0x47,
+    0x18,
+    0x66,
+    0xed,
+    0xe2,
+    0x18,
+    0x4d,
+    0xc2,
+    0x5c,
+    0x9f,
+    0x05,
+    0x09,
+    0x18,
+    0x24,
+    0x0e,
+    0x3f,
+    0x3d,
+    0xf9,
+    0x15,
+    0x8b,
+    0x08,
+    0xfd,
+    0x25,
+    0xe9,
+    0xc9,
+    0xb7,
+    0x8c,
+    0x18,
+    0x7b,
+    0xf3,
+    0x37,
+    0x58,
+    0xf0,
+    0xf0,
+    0xac,
+    0x33,
+    0x55,
+    0x3f,
+    0x39,
+    0xbc,
+    0x62,
+    0x03,
+    0x8a,
+    0xc0,
+    0xd6,
+    0xcc,
+    0x49,
+    0x47,
+    0xeb,
+    0x85,
+    0xb6,
+    0x72,
+    0xd7,
+    0xf8,
+    0xdc,
+    0x01,
+    0x32,
+    0xec,
+    0x1b,
+    0x4e,
+    0x38,
+    0x6e,
+    0x2c,
+    0xc5,
+    0x80,
+    0xf2,
+    0x43,
+    0x4a,
+    0xf5,
+    0xe5,
+    0xa2,
+    0xf8,
+    0x76,
+    0xa7,
+    0xa8,
+    0x57,
+    0x32,
+    0x67,
+    0x72,
+    0xeb,
+    0x82,
+    0xac,
+    0x3e,
+    0xc0,
+    0x15,
+    0x67,
+    0xac,
+    0x32,
+    0x19,
+    0x18,
+    0x0a,
+    0xef,
+    0x20,
+    0xa1,
+    0xe8,
+    0xaf,
+    0xac,
+    0x33,
+    0x87,
+    0x4c,
+    0x55,
+    0x05,
+    0x9b,
+    0x78,
+    0xf0,
+    0x3a,
+    0xce,
+    0x02,
+    0x28,
+    0x06,
+    0x84,
+    0x61,
+    0x97,
+    0xac,
+    0x87,
+    0x8f,
+    0x25,
+    0xe7,
+    0x1b,
+    0xa3,
+    0x02,
+    0x08,
+    0x4c,
+    0x2e,
+    0xef,
+    0xbd,
+    0x4f,
+    0x82,
+    0xe7,
+    0x37,
+    0x6c,
+    0x27,
+    0x6f,
+    0x85,
+    0xb4,
+    0xbc,
+    0x79,
+    0x38,
+    0x45,
+    0x80,
+    0x8a,
+    0xda,
+    0x2f,
+    0x11,
+    0x11,
+    0xac,
+    0x9c,
+    0xf3,
+    0x93,
+    0xc1,
+    0x49,
+    0x1b,
+    0x94,
+    0x12,
+    0x77,
+    0x07,
+    0xdc,
+    0xbf,
+    0xc2,
+    0xfd,
+    0x8b,
+    0xf6,
+    0xf1,
+    0x66,
+    0x1c,
+    0x7f,
+    0x07,
+    0xbf,
+    0x1f,
+    0xae,
+    0x27,
+    0x6c,
+    0x66,
+    0xe9,
+    0xa3,
+    0x64,
+    0x7a,
+    0x96,
+    0x78,
+    0x45,
+    0xfe,
+    0x4b,
+    0x8c,
+    0x6f,
+    0x7f,
+    0x03,
+    0x47,
+    0x3c,
+    0xd7,
+    0xf7,
+    0x63,
+    0x92,
+    0x58,
+    0x5b,
+    0x63,
+    0x83,
+    0x03,
+    0x05,
+    0xc3,
+    0x5d,
+    0x36,
+    0x62,
+    0x63,
+    0x5e,
+    0xcf,
+    0xfe,
+    0x0a,
+    0x29,
+    0xfa,
+    0xeb,
+    0xc8,
+    0xaf,
+    0xce,
+    0x31,
+    0x07,
+    0x6a,
+    0x09,
+    0x41,
+    0xc0,
+    0x2d,
+    0x98,
+    0x70,
+    0x05,
+    0x3b,
+    0x41,
+    0xfc,
+    0x7d,
+    0x61,
+    0xe0,
+    0x41,
+    0x7d,
+    0x13,
+    0x41,
+    0x51,
+    0x52,
+    0xb4,
+    0x78,
+    0xd5,
+    0x46,
+    0x51,
+    0x3b,
+    0xf1,
+    0xcd,
+    0xcc,
+    0x2e,
+    0x49,
+    0x30,
+    0x8b,
+    0x2a,
+    0xd2,
+    0xe6,
+    0x69,
+    0xb5,
+    0x6b,
+    0x7a,
+    0xf4,
+    0xbb,
+    0xd1,
+    0xf8,
+    0x4a,
+    0xe8,
+    0x53,
+    0x10,
+    0x46,
+    0x85,
+    0x8d,
+    0x66,
+    0x8e,
+    0x2b,
+    0xe8,
+    0x5d,
+    0xab,
+    0x7e,
+    0xfe,
+    0x5a,
+    0x79,
+    0xcf,
+    0xc5,
+    0x0c,
+    0x30,
+    0x9e,
+    0x98,
+    0x02,
+    0xb3,
+    0xa6,
+    0xd5,
+    0xfa,
+    0x25,
+    0xa8,
+    0xc8,
+    0xc1,
+    0xd9,
+    0x51,
+    0x60,
+    0x57,
+    0x5d,
+    0xfe,
+    0x75,
+    0x97,
+    0x05,
+    0xda,
+    0xbb,
+    0xc6,
+    0x6a,
+    0xbe,
+    0x5c,
+    0xa5,
+    0x65,
+    0x0a,
+    0x12,
+    0x33,
+    0x1c,
+    0xdf,
+    0xee,
+    0x08,
+    0xa9,
+    0x13,
+    0x13,
+    0x28,
+    0xce,
+    0x61,
+    0x59,
+    0xd1,
+    0x4e,
+    0xc7,
+    0x74,
+    0xfd,
+    0x64,
+    0xde,
+    0x08,
+    0xce,
+    0xda,
+    0x3f,
+    0xec,
+    0xad,
+    0xc9,
+    0xe1,
+    0xf9,
+    0x1f,
+    0x74,
+    0xf6,
+    0x86,
+    0x37,
+    0x6a,
+    0xa0,
+    0xc8,
+    0x0b,
+    0x1b,
+    0x94,
+    0x98,
+    0x86,
+    0x81,
+    0x3b,
+    0xfc,
+    0x47,
+    0x6c,
+    0xc9,
+    0x3e,
+    0x3c,
+    0x30,
+    0xc5,
+    0x9e,
+    0xb2,
+    0x32,
+    0x47,
+    0xf5,
+    0x0c,
+    0x6f,
 
     /* Second Packet: Handshake */
-    0xe6,                           /* Long, Handshake, PN Length=2 bytes */
-    0x00, 0x00, 0x00, 0x01,         /* Version */
-    0x00,                           /* DCID */
-    0x04, 0x83, 0xd0, 0x0a, 0x27,   /* SCID */
-    0x42, 0x9c,                     /* Length (668) */
-    0x9c, 0x55,                     /* PN (0) */
-    0x55, 0xd4, 0x50, 0x02, 0x1a, 0x57, 0x84, 0x22, 0xcd, 0x01, 0xe5, 0x42,
-    0x1b, 0x1e, 0x06, 0xf1, 0x86, 0xe2, 0x90, 0xf8, 0x9c, 0x3d, 0xa2, 0x7c,
-    0xde, 0x2b, 0xc9, 0x2e, 0xcd, 0xa8, 0x4f, 0x5a, 0x20, 0xca, 0x96, 0xb6,
-    0x11, 0x4b, 0xc8, 0x71, 0x32, 0xb5, 0xc7, 0x1a, 0x69, 0x7f, 0x1e, 0x37,
-    0x49, 0xfb, 0x08, 0xce, 0x83, 0x5f, 0x02, 0x6d, 0x8a, 0x8f, 0xe7, 0x5d,
-    0xe1, 0x34, 0x31, 0x22, 0x53, 0x53, 0x32, 0xcb, 0x04, 0x21, 0xce, 0xbc,
-    0xa5, 0x1b, 0xdd, 0x4d, 0xd5, 0x1c, 0xd6, 0x5d, 0x88, 0x29, 0x5a, 0x19,
-    0x71, 0x6a, 0xc2, 0xfa, 0xb7, 0xb4, 0x7d, 0xd1, 0x72, 0x93, 0x8f, 0x7c,
-    0xb5, 0x36, 0x1b, 0xea, 0xf3, 0xf1, 0xd7, 0x6e, 0xd3, 0x91, 0x96, 0x62,
-    0x4d, 0xc6, 0xec, 0xb7, 0xb0, 0xb7, 0x9b, 0x95, 0x8b, 0x14, 0x8d, 0x1a,
-    0x0d, 0xb6, 0x3e, 0xec, 0xfe, 0x3b, 0x51, 0xea, 0x1a, 0x05, 0x14, 0x12,
-    0x93, 0x0e, 0x7e, 0xe6, 0xa2, 0xc5, 0x22, 0x87, 0x65, 0xf8, 0x5d, 0x3c,
-    0x55, 0x18, 0xcb, 0xe9, 0xef, 0x23, 0x43, 0xfe, 0xe8, 0x0d, 0xb2, 0x0f,
-    0xc5, 0xf4, 0xb3, 0xde, 0x0c, 0xea, 0xa4, 0x48, 0x8e, 0xbf, 0x1f, 0xc7,
-    0x99, 0x53, 0x8c, 0xc1, 0x3d, 0xba, 0xf4, 0x8e, 0x8e, 0x02, 0x52, 0xf6,
-    0x1f, 0xcf, 0x1d, 0xaa, 0xb3, 0xcb, 0x08, 0xc2, 0xe1, 0x70, 0x68, 0x74,
-    0x78, 0xa9, 0x30, 0x67, 0xba, 0x2b, 0xea, 0x35, 0x63, 0x47, 0xff, 0x29,
-    0x73, 0x29, 0xc6, 0xe8, 0x08, 0xa9, 0x1e, 0x8f, 0x28, 0x41, 0xa4, 0x24,
-    0x54, 0x26, 0x5f, 0x42, 0x77, 0xb1, 0x2b, 0x3d, 0x65, 0x67, 0x60, 0xa7,
-    0x23, 0x0d, 0xa7, 0xf4, 0xd6, 0xe9, 0x4e, 0x58, 0x43, 0x9f, 0x3c, 0x9e,
-    0x77, 0x61, 0xe5, 0x04, 0x4f, 0x73, 0xc9, 0x10, 0x79, 0xd0, 0xda, 0x3b,
-    0xc6, 0x19, 0x93, 0x9f, 0x48, 0x3b, 0x76, 0x38, 0xa1, 0x72, 0x49, 0x7d,
-    0x86, 0x7f, 0xe8, 0x1b, 0xa9, 0x5b, 0xc0, 0x47, 0xa0, 0x9c, 0x3f, 0x65,
-    0x60, 0x76, 0x59, 0xaf, 0x20, 0x2d, 0x40, 0xa6, 0x80, 0x49, 0x5a, 0x8f,
-    0x09, 0xf8, 0xf6, 0x97, 0xc1, 0xbd, 0xe1, 0x9f, 0x9b, 0xa2, 0x4c, 0x7b,
-    0x88, 0xac, 0xbe, 0x4b, 0x11, 0x28, 0xd7, 0x67, 0xe6, 0xad, 0xaf, 0xd0,
-    0xad, 0x01, 0x29, 0xa4, 0x4a, 0xc4, 0xb8, 0x2e, 0x42, 0x79, 0x24, 0x9e,
-    0xd5, 0x34, 0xae, 0x45, 0xf1, 0x0b, 0x38, 0x4a, 0x76, 0xfb, 0x50, 0xa2,
-    0x99, 0xc9, 0x5b, 0x6d, 0xc0, 0xb7, 0x55, 0xd8, 0x8d, 0x49, 0xdd, 0x1b,
-    0xb8, 0xec, 0x10, 0x57, 0x9e, 0x33, 0xb4, 0x10, 0x16, 0x19, 0xac, 0x69,
-    0xa2, 0x19, 0x1b, 0xd0, 0x77, 0x45, 0xeb, 0x49, 0x5c, 0xc5, 0x7c, 0xbe,
-    0x4b, 0x4a, 0x22, 0x5c, 0x3d, 0x0e, 0x6e, 0xe5, 0x4b, 0x36, 0x06, 0x63,
-    0x03, 0x97, 0xab, 0xed, 0xdc, 0xea, 0x64, 0xc2, 0x70, 0xb6, 0x7e, 0x35,
-    0xfb, 0x13, 0x66, 0x37, 0xa3, 0x3f, 0x28, 0x16, 0x6c, 0xe7, 0xd4, 0xe6,
-    0xca, 0x26, 0x0f, 0x19, 0xdd, 0x02, 0xae, 0xc1, 0xcf, 0x18, 0x7d, 0x56,
-    0xe6, 0x52, 0xf3, 0x37, 0xb5, 0x86, 0x9d, 0x1d, 0x55, 0xb3, 0x95, 0x19,
-    0x19, 0xa5, 0x44, 0x95, 0x81, 0xed, 0x02, 0x18, 0xf1, 0x85, 0x57, 0x78,
-    0x28, 0xc4, 0x9a, 0xba, 0xe8, 0x5e, 0x22, 0x8d, 0xc1, 0x7b, 0x2a, 0x8a,
-    0xc8, 0xb9, 0xdd, 0x82, 0xb2, 0x7b, 0x9f, 0x3d, 0xf5, 0x27, 0x2a, 0x48,
-    0x53, 0xc7, 0xa0, 0x70, 0x0e, 0x9d, 0x61, 0xaa, 0xe2, 0xad, 0x28, 0xf2,
-    0xb4, 0xfc, 0x56, 0x6b, 0x89, 0xe7, 0xf9, 0x51, 0xc9, 0xe9, 0xd3, 0x8a,
-    0x8c, 0x7e, 0x86, 0xdd, 0xba, 0x2f, 0x39, 0xbf, 0x26, 0x62, 0x23, 0xd6,
-    0x98, 0x6d, 0x3e, 0x72, 0xd7, 0x1b, 0xe1, 0x62, 0x94, 0x35, 0xe2, 0x18,
-    0x19, 0x46, 0xb8, 0x2c, 0xb5, 0x8f, 0x8f, 0xb0, 0x5b, 0x76, 0x7b, 0x7e,
-    0xb8, 0xc6, 0xb7, 0xe9, 0x4e, 0x9d, 0x30, 0x68, 0x03, 0x1e, 0x19, 0x73,
-    0xc5, 0x3e, 0x24, 0xe2, 0x95, 0x60, 0x1b, 0x27, 0x93, 0x7c, 0x17, 0xc2,
-    0xc6, 0xa3, 0xbd, 0xbd, 0x70, 0xc6, 0x60, 0x59, 0xc8, 0x5c, 0xd7, 0x9a,
-    0xc4, 0x29, 0xac, 0x0f, 0xaa, 0x0d, 0xa9, 0x92, 0xa3, 0x95, 0xd7, 0x0f,
-    0x6f, 0x74, 0x99, 0x9b, 0xc1, 0xd3, 0x68, 0x6d, 0xac, 0x82, 0x2d, 0x32,
-    0x41, 0x9e, 0x0c, 0xf7, 0x31, 0x59, 0x4c, 0x93, 0x1c, 0x3b, 0x71, 0x69,
-    0xcf, 0xc5, 0xca, 0x2b, 0xdf, 0xe7, 0xaa, 0xfd, 0x1d, 0x71, 0x01, 0x7e,
-    0x1c, 0x70, 0x62, 0x20, 0x61, 0xf8, 0x35, 0xc1, 0x71, 0xe7, 0x02, 0x0d,
-    0x88, 0x44, 0xd9, 0x00, 0xc5, 0xcc, 0x63, 0xe4, 0xf0, 0x86, 0xa7, 0xd0,
-    0xfe, 0xcc, 0xb7, 0x1d, 0xfc, 0x21, 0x61, 0x54, 0x15, 0xea, 0x81, 0x5e,
-    0xc0, 0x31, 0xfa, 0xbf, 0x7d, 0xb9, 0x3b, 0xa2, 0x1e, 0x42, 0x73, 0x05,
-    0x3c, 0xdb, 0x21, 0x59, 0x4f, 0x63,
+    0xe6, /* Long, Handshake, PN Length=2 bytes */
+    0x00,
+    0x00,
+    0x00,
+    0x01, /* Version */
+    0x00, /* DCID */
+    0x04,
+    0x83,
+    0xd0,
+    0x0a,
+    0x27, /* SCID */
+    0x42,
+    0x9c, /* Length (668) */
+    0x9c,
+    0x55, /* PN (0) */
+    0x55,
+    0xd4,
+    0x50,
+    0x02,
+    0x1a,
+    0x57,
+    0x84,
+    0x22,
+    0xcd,
+    0x01,
+    0xe5,
+    0x42,
+    0x1b,
+    0x1e,
+    0x06,
+    0xf1,
+    0x86,
+    0xe2,
+    0x90,
+    0xf8,
+    0x9c,
+    0x3d,
+    0xa2,
+    0x7c,
+    0xde,
+    0x2b,
+    0xc9,
+    0x2e,
+    0xcd,
+    0xa8,
+    0x4f,
+    0x5a,
+    0x20,
+    0xca,
+    0x96,
+    0xb6,
+    0x11,
+    0x4b,
+    0xc8,
+    0x71,
+    0x32,
+    0xb5,
+    0xc7,
+    0x1a,
+    0x69,
+    0x7f,
+    0x1e,
+    0x37,
+    0x49,
+    0xfb,
+    0x08,
+    0xce,
+    0x83,
+    0x5f,
+    0x02,
+    0x6d,
+    0x8a,
+    0x8f,
+    0xe7,
+    0x5d,
+    0xe1,
+    0x34,
+    0x31,
+    0x22,
+    0x53,
+    0x53,
+    0x32,
+    0xcb,
+    0x04,
+    0x21,
+    0xce,
+    0xbc,
+    0xa5,
+    0x1b,
+    0xdd,
+    0x4d,
+    0xd5,
+    0x1c,
+    0xd6,
+    0x5d,
+    0x88,
+    0x29,
+    0x5a,
+    0x19,
+    0x71,
+    0x6a,
+    0xc2,
+    0xfa,
+    0xb7,
+    0xb4,
+    0x7d,
+    0xd1,
+    0x72,
+    0x93,
+    0x8f,
+    0x7c,
+    0xb5,
+    0x36,
+    0x1b,
+    0xea,
+    0xf3,
+    0xf1,
+    0xd7,
+    0x6e,
+    0xd3,
+    0x91,
+    0x96,
+    0x62,
+    0x4d,
+    0xc6,
+    0xec,
+    0xb7,
+    0xb0,
+    0xb7,
+    0x9b,
+    0x95,
+    0x8b,
+    0x14,
+    0x8d,
+    0x1a,
+    0x0d,
+    0xb6,
+    0x3e,
+    0xec,
+    0xfe,
+    0x3b,
+    0x51,
+    0xea,
+    0x1a,
+    0x05,
+    0x14,
+    0x12,
+    0x93,
+    0x0e,
+    0x7e,
+    0xe6,
+    0xa2,
+    0xc5,
+    0x22,
+    0x87,
+    0x65,
+    0xf8,
+    0x5d,
+    0x3c,
+    0x55,
+    0x18,
+    0xcb,
+    0xe9,
+    0xef,
+    0x23,
+    0x43,
+    0xfe,
+    0xe8,
+    0x0d,
+    0xb2,
+    0x0f,
+    0xc5,
+    0xf4,
+    0xb3,
+    0xde,
+    0x0c,
+    0xea,
+    0xa4,
+    0x48,
+    0x8e,
+    0xbf,
+    0x1f,
+    0xc7,
+    0x99,
+    0x53,
+    0x8c,
+    0xc1,
+    0x3d,
+    0xba,
+    0xf4,
+    0x8e,
+    0x8e,
+    0x02,
+    0x52,
+    0xf6,
+    0x1f,
+    0xcf,
+    0x1d,
+    0xaa,
+    0xb3,
+    0xcb,
+    0x08,
+    0xc2,
+    0xe1,
+    0x70,
+    0x68,
+    0x74,
+    0x78,
+    0xa9,
+    0x30,
+    0x67,
+    0xba,
+    0x2b,
+    0xea,
+    0x35,
+    0x63,
+    0x47,
+    0xff,
+    0x29,
+    0x73,
+    0x29,
+    0xc6,
+    0xe8,
+    0x08,
+    0xa9,
+    0x1e,
+    0x8f,
+    0x28,
+    0x41,
+    0xa4,
+    0x24,
+    0x54,
+    0x26,
+    0x5f,
+    0x42,
+    0x77,
+    0xb1,
+    0x2b,
+    0x3d,
+    0x65,
+    0x67,
+    0x60,
+    0xa7,
+    0x23,
+    0x0d,
+    0xa7,
+    0xf4,
+    0xd6,
+    0xe9,
+    0x4e,
+    0x58,
+    0x43,
+    0x9f,
+    0x3c,
+    0x9e,
+    0x77,
+    0x61,
+    0xe5,
+    0x04,
+    0x4f,
+    0x73,
+    0xc9,
+    0x10,
+    0x79,
+    0xd0,
+    0xda,
+    0x3b,
+    0xc6,
+    0x19,
+    0x93,
+    0x9f,
+    0x48,
+    0x3b,
+    0x76,
+    0x38,
+    0xa1,
+    0x72,
+    0x49,
+    0x7d,
+    0x86,
+    0x7f,
+    0xe8,
+    0x1b,
+    0xa9,
+    0x5b,
+    0xc0,
+    0x47,
+    0xa0,
+    0x9c,
+    0x3f,
+    0x65,
+    0x60,
+    0x76,
+    0x59,
+    0xaf,
+    0x20,
+    0x2d,
+    0x40,
+    0xa6,
+    0x80,
+    0x49,
+    0x5a,
+    0x8f,
+    0x09,
+    0xf8,
+    0xf6,
+    0x97,
+    0xc1,
+    0xbd,
+    0xe1,
+    0x9f,
+    0x9b,
+    0xa2,
+    0x4c,
+    0x7b,
+    0x88,
+    0xac,
+    0xbe,
+    0x4b,
+    0x11,
+    0x28,
+    0xd7,
+    0x67,
+    0xe6,
+    0xad,
+    0xaf,
+    0xd0,
+    0xad,
+    0x01,
+    0x29,
+    0xa4,
+    0x4a,
+    0xc4,
+    0xb8,
+    0x2e,
+    0x42,
+    0x79,
+    0x24,
+    0x9e,
+    0xd5,
+    0x34,
+    0xae,
+    0x45,
+    0xf1,
+    0x0b,
+    0x38,
+    0x4a,
+    0x76,
+    0xfb,
+    0x50,
+    0xa2,
+    0x99,
+    0xc9,
+    0x5b,
+    0x6d,
+    0xc0,
+    0xb7,
+    0x55,
+    0xd8,
+    0x8d,
+    0x49,
+    0xdd,
+    0x1b,
+    0xb8,
+    0xec,
+    0x10,
+    0x57,
+    0x9e,
+    0x33,
+    0xb4,
+    0x10,
+    0x16,
+    0x19,
+    0xac,
+    0x69,
+    0xa2,
+    0x19,
+    0x1b,
+    0xd0,
+    0x77,
+    0x45,
+    0xeb,
+    0x49,
+    0x5c,
+    0xc5,
+    0x7c,
+    0xbe,
+    0x4b,
+    0x4a,
+    0x22,
+    0x5c,
+    0x3d,
+    0x0e,
+    0x6e,
+    0xe5,
+    0x4b,
+    0x36,
+    0x06,
+    0x63,
+    0x03,
+    0x97,
+    0xab,
+    0xed,
+    0xdc,
+    0xea,
+    0x64,
+    0xc2,
+    0x70,
+    0xb6,
+    0x7e,
+    0x35,
+    0xfb,
+    0x13,
+    0x66,
+    0x37,
+    0xa3,
+    0x3f,
+    0x28,
+    0x16,
+    0x6c,
+    0xe7,
+    0xd4,
+    0xe6,
+    0xca,
+    0x26,
+    0x0f,
+    0x19,
+    0xdd,
+    0x02,
+    0xae,
+    0xc1,
+    0xcf,
+    0x18,
+    0x7d,
+    0x56,
+    0xe6,
+    0x52,
+    0xf3,
+    0x37,
+    0xb5,
+    0x86,
+    0x9d,
+    0x1d,
+    0x55,
+    0xb3,
+    0x95,
+    0x19,
+    0x19,
+    0xa5,
+    0x44,
+    0x95,
+    0x81,
+    0xed,
+    0x02,
+    0x18,
+    0xf1,
+    0x85,
+    0x57,
+    0x78,
+    0x28,
+    0xc4,
+    0x9a,
+    0xba,
+    0xe8,
+    0x5e,
+    0x22,
+    0x8d,
+    0xc1,
+    0x7b,
+    0x2a,
+    0x8a,
+    0xc8,
+    0xb9,
+    0xdd,
+    0x82,
+    0xb2,
+    0x7b,
+    0x9f,
+    0x3d,
+    0xf5,
+    0x27,
+    0x2a,
+    0x48,
+    0x53,
+    0xc7,
+    0xa0,
+    0x70,
+    0x0e,
+    0x9d,
+    0x61,
+    0xaa,
+    0xe2,
+    0xad,
+    0x28,
+    0xf2,
+    0xb4,
+    0xfc,
+    0x56,
+    0x6b,
+    0x89,
+    0xe7,
+    0xf9,
+    0x51,
+    0xc9,
+    0xe9,
+    0xd3,
+    0x8a,
+    0x8c,
+    0x7e,
+    0x86,
+    0xdd,
+    0xba,
+    0x2f,
+    0x39,
+    0xbf,
+    0x26,
+    0x62,
+    0x23,
+    0xd6,
+    0x98,
+    0x6d,
+    0x3e,
+    0x72,
+    0xd7,
+    0x1b,
+    0xe1,
+    0x62,
+    0x94,
+    0x35,
+    0xe2,
+    0x18,
+    0x19,
+    0x46,
+    0xb8,
+    0x2c,
+    0xb5,
+    0x8f,
+    0x8f,
+    0xb0,
+    0x5b,
+    0x76,
+    0x7b,
+    0x7e,
+    0xb8,
+    0xc6,
+    0xb7,
+    0xe9,
+    0x4e,
+    0x9d,
+    0x30,
+    0x68,
+    0x03,
+    0x1e,
+    0x19,
+    0x73,
+    0xc5,
+    0x3e,
+    0x24,
+    0xe2,
+    0x95,
+    0x60,
+    0x1b,
+    0x27,
+    0x93,
+    0x7c,
+    0x17,
+    0xc2,
+    0xc6,
+    0xa3,
+    0xbd,
+    0xbd,
+    0x70,
+    0xc6,
+    0x60,
+    0x59,
+    0xc8,
+    0x5c,
+    0xd7,
+    0x9a,
+    0xc4,
+    0x29,
+    0xac,
+    0x0f,
+    0xaa,
+    0x0d,
+    0xa9,
+    0x92,
+    0xa3,
+    0x95,
+    0xd7,
+    0x0f,
+    0x6f,
+    0x74,
+    0x99,
+    0x9b,
+    0xc1,
+    0xd3,
+    0x68,
+    0x6d,
+    0xac,
+    0x82,
+    0x2d,
+    0x32,
+    0x41,
+    0x9e,
+    0x0c,
+    0xf7,
+    0x31,
+    0x59,
+    0x4c,
+    0x93,
+    0x1c,
+    0x3b,
+    0x71,
+    0x69,
+    0xcf,
+    0xc5,
+    0xca,
+    0x2b,
+    0xdf,
+    0xe7,
+    0xaa,
+    0xfd,
+    0x1d,
+    0x71,
+    0x01,
+    0x7e,
+    0x1c,
+    0x70,
+    0x62,
+    0x20,
+    0x61,
+    0xf8,
+    0x35,
+    0xc1,
+    0x71,
+    0xe7,
+    0x02,
+    0x0d,
+    0x88,
+    0x44,
+    0xd9,
+    0x00,
+    0xc5,
+    0xcc,
+    0x63,
+    0xe4,
+    0xf0,
+    0x86,
+    0xa7,
+    0xd0,
+    0xfe,
+    0xcc,
+    0xb7,
+    0x1d,
+    0xfc,
+    0x21,
+    0x61,
+    0x54,
+    0x15,
+    0xea,
+    0x81,
+    0x5e,
+    0xc0,
+    0x31,
+    0xfa,
+    0xbf,
+    0x7d,
+    0xb9,
+    0x3b,
+    0xa2,
+    0x1e,
+    0x42,
+    0x73,
+    0x05,
+    0x3c,
+    0xdb,
+    0x21,
+    0x59,
+    0x4f,
+    0x63,
 
     /* Third Packet: 1-RTT */
-    0x5f,               /* Short, 1-RTT, Spin=0, KP=0, PN Length=2 bytes */
-    0x68, 0x47,         /* PN (0) */
-    0xa3, 0x3c, 0xa5, 0x27, 0x5e, 0xf9, 0x8d, 0xec, 0xea, 0x6c, 0x09, 0x18,
-    0x40, 0x80, 0xee, 0x9f, 0x6f, 0x73, 0x5c, 0x49, 0xe3, 0xec, 0xb7, 0x58,
-    0x05, 0x66, 0x8f, 0xa3, 0x52, 0x37, 0xa1, 0x22, 0x1f, 0xc6, 0x92, 0xd6,
-    0x59, 0x04, 0x99, 0xcb, 0x44, 0xef, 0x66, 0x05, 0x2d, 0xd0, 0x85, 0x24,
-    0xbb, 0xe3, 0xa1, 0xd1, 0xbe, 0xf7, 0x54, 0xad, 0x65, 0xf4, 0xd4, 0x59,
-    0x54, 0x87, 0x4e, 0x22, 0x4f, 0x06, 0x07, 0xa7, 0x8a, 0x14, 0x89, 0xd1,
-    0x3f, 0xd3, 0xe4, 0x6f, 0x71, 0x8f, 0x9a, 0xd2, 0x3b, 0x61, 0x0a, 0xba,
-    0x9a, 0x31, 0x56, 0xc7,
+    0x5f, /* Short, 1-RTT, Spin=0, KP=0, PN Length=2 bytes */
+    0x68,
+    0x47, /* PN (0) */
+    0xa3,
+    0x3c,
+    0xa5,
+    0x27,
+    0x5e,
+    0xf9,
+    0x8d,
+    0xec,
+    0xea,
+    0x6c,
+    0x09,
+    0x18,
+    0x40,
+    0x80,
+    0xee,
+    0x9f,
+    0x6f,
+    0x73,
+    0x5c,
+    0x49,
+    0xe3,
+    0xec,
+    0xb7,
+    0x58,
+    0x05,
+    0x66,
+    0x8f,
+    0xa3,
+    0x52,
+    0x37,
+    0xa1,
+    0x22,
+    0x1f,
+    0xc6,
+    0x92,
+    0xd6,
+    0x59,
+    0x04,
+    0x99,
+    0xcb,
+    0x44,
+    0xef,
+    0x66,
+    0x05,
+    0x2d,
+    0xd0,
+    0x85,
+    0x24,
+    0xbb,
+    0xe3,
+    0xa1,
+    0xd1,
+    0xbe,
+    0xf7,
+    0x54,
+    0xad,
+    0x65,
+    0xf4,
+    0xd4,
+    0x59,
+    0x54,
+    0x87,
+    0x4e,
+    0x22,
+    0x4f,
+    0x06,
+    0x07,
+    0xa7,
+    0x8a,
+    0x14,
+    0x89,
+    0xd1,
+    0x3f,
+    0xd3,
+    0xe4,
+    0x6f,
+    0x71,
+    0x8f,
+    0x9a,
+    0xd2,
+    0x3b,
+    0x61,
+    0x0a,
+    0xba,
+    0x9a,
+    0x31,
+    0x56,
+    0xc7,
 };
 
 static const QUIC_PKT_HDR rx_script_5a_expect_hdr = {
     QUIC_PKT_TYPE_INITIAL,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    1,          /* Version */
-    {0, {0}},                           /* DCID */
-    {4, {0x83, 0xd0, 0x0a, 0x27}},      /* SCID */
-    {0},        /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    1, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 4, { 0x83, 0xd0, 0x0a, 0x27 } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     448, NULL
 };
 
 static const unsigned char rx_script_5a_body[] = {
-    0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x40, 0x5a, 0x02, 0x00,
-    0x00, 0x56, 0x03, 0x03, 0xe2, 0xd2, 0x0a, 0x3b, 0xa2, 0xc4, 0xd2, 0x29,
-    0xc8, 0xe8, 0xba, 0x23, 0x31, 0x88, 0x2c, 0x71, 0xeb, 0xba, 0x42, 0x5f,
-    0x94, 0xe9, 0x0a, 0x90, 0x35, 0x31, 0x1e, 0xca, 0xed, 0xf8, 0x8a, 0x8d,
-    0x00, 0x13, 0x01, 0x00, 0x00, 0x2e, 0x00, 0x2b, 0x00, 0x02, 0x03, 0x04,
-    0x00, 0x33, 0x00, 0x24, 0x00, 0x1d, 0x00, 0x20, 0x96, 0x0b, 0x4b, 0x30,
-    0x66, 0x3a, 0x75, 0x01, 0x4a, 0xdc, 0x2a, 0x75, 0x1f, 0xce, 0x7a, 0x30,
-    0x9d, 0x00, 0xca, 0x20, 0xb4, 0xe0, 0x6b, 0x81, 0x23, 0x18, 0x0b, 0x20,
-    0x1f, 0x54, 0x86, 0x1d,
+    0x02,
+    0x03,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x06,
+    0x00,
+    0x40,
+    0x5a,
+    0x02,
+    0x00,
+    0x00,
+    0x56,
+    0x03,
+    0x03,
+    0xe2,
+    0xd2,
+    0x0a,
+    0x3b,
+    0xa2,
+    0xc4,
+    0xd2,
+    0x29,
+    0xc8,
+    0xe8,
+    0xba,
+    0x23,
+    0x31,
+    0x88,
+    0x2c,
+    0x71,
+    0xeb,
+    0xba,
+    0x42,
+    0x5f,
+    0x94,
+    0xe9,
+    0x0a,
+    0x90,
+    0x35,
+    0x31,
+    0x1e,
+    0xca,
+    0xed,
+    0xf8,
+    0x8a,
+    0x8d,
+    0x00,
+    0x13,
+    0x01,
+    0x00,
+    0x00,
+    0x2e,
+    0x00,
+    0x2b,
+    0x00,
+    0x02,
+    0x03,
+    0x04,
+    0x00,
+    0x33,
+    0x00,
+    0x24,
+    0x00,
+    0x1d,
+    0x00,
+    0x20,
+    0x96,
+    0x0b,
+    0x4b,
+    0x30,
+    0x66,
+    0x3a,
+    0x75,
+    0x01,
+    0x4a,
+    0xdc,
+    0x2a,
+    0x75,
+    0x1f,
+    0xce,
+    0x7a,
+    0x30,
+    0x9d,
+    0x00,
+    0xca,
+    0x20,
+    0xb4,
+    0xe0,
+    0x6b,
+    0x81,
+    0x23,
+    0x18,
+    0x0b,
+    0x20,
+    0x1f,
+    0x54,
+    0x86,
+    0x1d,
 };
 
 static const QUIC_PKT_HDR rx_script_5b_expect_hdr = {
     QUIC_PKT_TYPE_HANDSHAKE,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    1,          /* Version */
-    {0, {0}},                           /* DCID */
-    {4, {0x83, 0xd0, 0x0a, 0x27}},      /* SCID */
-    {0},        /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    1, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 4, { 0x83, 0xd0, 0x0a, 0x27 } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     650, NULL
 };
 
 static const unsigned char rx_script_5b_body[] = {
-    0x06, 0x00, 0x42, 0x86, 0x08, 0x00, 0x00, 0x7d, 0x00, 0x7b, 0x00, 0x10,
-    0x00, 0x08, 0x00, 0x06, 0x05, 0x64, 0x75, 0x6d, 0x6d, 0x79, 0x00, 0x39,
-    0x00, 0x6b, 0x4b, 0x20, 0x0b, 0x1b, 0xe1, 0x1f, 0xd0, 0x78, 0xc0, 0x69,
-    0x72, 0x9c, 0xe2, 0xf7, 0x05, 0x04, 0x80, 0x08, 0x00, 0x00, 0x06, 0x04,
-    0x80, 0x08, 0x00, 0x00, 0x07, 0x04, 0x80, 0x08, 0x00, 0x00, 0x04, 0x04,
-    0x80, 0x0c, 0x00, 0x00, 0x08, 0x02, 0x40, 0x64, 0x09, 0x02, 0x40, 0x64,
-    0x01, 0x04, 0x80, 0x00, 0x75, 0x30, 0x03, 0x02, 0x45, 0xac, 0x0b, 0x01,
-    0x1a, 0x0c, 0x00, 0x02, 0x10, 0x41, 0x94, 0x41, 0x8d, 0x0d, 0xfb, 0x60,
-    0x7b, 0xdc, 0xcc, 0xa2, 0x9c, 0x3e, 0xa5, 0xdf, 0x8d, 0x00, 0x08, 0x2d,
-    0x71, 0x8a, 0x38, 0xdf, 0xdd, 0xe0, 0x03, 0x0e, 0x01, 0x04, 0x0f, 0x04,
-    0x83, 0xd0, 0x0a, 0x27, 0x10, 0x04, 0xad, 0x15, 0x3f, 0xae, 0x20, 0x01,
-    0x00, 0x0b, 0x00, 0x01, 0x8f, 0x00, 0x00, 0x01, 0x8b, 0x00, 0x01, 0x86,
-    0x30, 0x82, 0x01, 0x82, 0x30, 0x82, 0x01, 0x29, 0xa0, 0x03, 0x02, 0x01,
-    0x02, 0x02, 0x14, 0x0a, 0x73, 0x0f, 0x86, 0x18, 0xf2, 0xc3, 0x30, 0x01,
-    0xd2, 0xc0, 0xc1, 0x62, 0x52, 0x13, 0xf1, 0x9c, 0x13, 0x39, 0xb5, 0x30,
-    0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x30,
-    0x17, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x0c,
-    0x6d, 0x61, 0x70, 0x61, 0x6b, 0x74, 0x2e, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
-    0x30, 0x1e, 0x17, 0x0d, 0x32, 0x32, 0x30, 0x38, 0x30, 0x32, 0x31, 0x32,
-    0x30, 0x30, 0x31, 0x38, 0x5a, 0x17, 0x0d, 0x32, 0x32, 0x30, 0x39, 0x30,
-    0x31, 0x31, 0x32, 0x30, 0x30, 0x31, 0x38, 0x5a, 0x30, 0x17, 0x31, 0x15,
-    0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x0c, 0x6d, 0x61, 0x70,
-    0x61, 0x6b, 0x74, 0x2e, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x30, 0x59, 0x30,
-    0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08,
-    0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03, 0x42, 0x00, 0x04,
-    0x67, 0xf4, 0xd3, 0x8f, 0x15, 0x6d, 0xee, 0x85, 0xcc, 0x2a, 0x77, 0xfc,
-    0x0b, 0x8f, 0x9f, 0xcf, 0xa9, 0x95, 0x5d, 0x5b, 0xcd, 0xb7, 0x8b, 0xba,
-    0x31, 0x0a, 0x73, 0x62, 0xc5, 0xd0, 0x0e, 0x07, 0x90, 0xae, 0x38, 0x43,
-    0x79, 0xce, 0x5e, 0x33, 0xad, 0x31, 0xbf, 0x9f, 0x2a, 0x56, 0x83, 0xa5,
-    0x24, 0x16, 0xab, 0x0c, 0xf1, 0x64, 0xbe, 0xe4, 0x93, 0xb5, 0x89, 0xd6,
-    0x05, 0xe4, 0xf7, 0x7b, 0xa3, 0x53, 0x30, 0x51, 0x30, 0x1d, 0x06, 0x03,
-    0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x02, 0x64, 0x0f, 0x55, 0x69,
-    0x14, 0x91, 0x19, 0xed, 0xf9, 0x1a, 0xe9, 0x1d, 0xa5, 0x5a, 0xd0, 0x48,
-    0x96, 0x9f, 0x60, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d, 0x23, 0x04, 0x18,
-    0x30, 0x16, 0x80, 0x14, 0x02, 0x64, 0x0f, 0x55, 0x69, 0x14, 0x91, 0x19,
-    0xed, 0xf9, 0x1a, 0xe9, 0x1d, 0xa5, 0x5a, 0xd0, 0x48, 0x96, 0x9f, 0x60,
-    0x30, 0x0f, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x05,
-    0x30, 0x03, 0x01, 0x01, 0xff, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48,
-    0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47, 0x00, 0x30, 0x44, 0x02, 0x20,
-    0x0a, 0x82, 0x92, 0x6e, 0xd3, 0xc6, 0x66, 0xd9, 0xd3, 0x75, 0xff, 0x71,
-    0x3b, 0x61, 0x46, 0x21, 0x00, 0xe6, 0x21, 0x5d, 0x9c, 0x86, 0xe9, 0x65,
-    0x40, 0x4f, 0xeb, 0x70, 0x4f, 0x2c, 0xad, 0x00, 0x02, 0x20, 0x08, 0xc2,
-    0x07, 0x5d, 0x16, 0xfc, 0x54, 0x34, 0x2b, 0xb4, 0x18, 0x67, 0x44, 0x81,
-    0xc9, 0xa9, 0x67, 0x2e, 0xce, 0xa1, 0x02, 0x9f, 0x3b, 0xe5, 0x61, 0x16,
-    0x0b, 0x50, 0xf6, 0xa1, 0x50, 0x94, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x4a,
-    0x04, 0x03, 0x00, 0x46, 0x30, 0x44, 0x02, 0x20, 0x7d, 0x57, 0x17, 0x14,
-    0x46, 0x09, 0x95, 0x70, 0x09, 0x45, 0xe8, 0x9e, 0x5c, 0x87, 0x55, 0xd9,
-    0x08, 0xc6, 0x5e, 0x47, 0x73, 0x5e, 0xb1, 0xc9, 0xef, 0xcb, 0xe5, 0x7f,
-    0xcc, 0xb0, 0x28, 0xbc, 0x02, 0x20, 0x5d, 0xe4, 0x2b, 0x83, 0xd9, 0x78,
-    0x75, 0x45, 0xf3, 0x22, 0x2b, 0x38, 0xeb, 0x68, 0xe5, 0x71, 0x5d, 0xcb,
-    0xc3, 0x68, 0xb3, 0x0e, 0x7d, 0x5e, 0x1d, 0xc2, 0x1b, 0x8a, 0x62, 0x80,
-    0x48, 0x3e, 0x14, 0x00, 0x00, 0x20, 0x37, 0xcd, 0x55, 0xca, 0x3f, 0x4b,
-    0xf0, 0x95, 0xf8, 0xe4, 0xfe, 0x59, 0xab, 0xbc, 0xc1, 0x8f, 0x0c, 0x3f,
-    0x41, 0x59, 0xf6, 0x96, 0xdb, 0x75, 0xae, 0xe7, 0x86, 0x1a, 0x92, 0xa7,
-    0x53, 0x0a,
+    0x06,
+    0x00,
+    0x42,
+    0x86,
+    0x08,
+    0x00,
+    0x00,
+    0x7d,
+    0x00,
+    0x7b,
+    0x00,
+    0x10,
+    0x00,
+    0x08,
+    0x00,
+    0x06,
+    0x05,
+    0x64,
+    0x75,
+    0x6d,
+    0x6d,
+    0x79,
+    0x00,
+    0x39,
+    0x00,
+    0x6b,
+    0x4b,
+    0x20,
+    0x0b,
+    0x1b,
+    0xe1,
+    0x1f,
+    0xd0,
+    0x78,
+    0xc0,
+    0x69,
+    0x72,
+    0x9c,
+    0xe2,
+    0xf7,
+    0x05,
+    0x04,
+    0x80,
+    0x08,
+    0x00,
+    0x00,
+    0x06,
+    0x04,
+    0x80,
+    0x08,
+    0x00,
+    0x00,
+    0x07,
+    0x04,
+    0x80,
+    0x08,
+    0x00,
+    0x00,
+    0x04,
+    0x04,
+    0x80,
+    0x0c,
+    0x00,
+    0x00,
+    0x08,
+    0x02,
+    0x40,
+    0x64,
+    0x09,
+    0x02,
+    0x40,
+    0x64,
+    0x01,
+    0x04,
+    0x80,
+    0x00,
+    0x75,
+    0x30,
+    0x03,
+    0x02,
+    0x45,
+    0xac,
+    0x0b,
+    0x01,
+    0x1a,
+    0x0c,
+    0x00,
+    0x02,
+    0x10,
+    0x41,
+    0x94,
+    0x41,
+    0x8d,
+    0x0d,
+    0xfb,
+    0x60,
+    0x7b,
+    0xdc,
+    0xcc,
+    0xa2,
+    0x9c,
+    0x3e,
+    0xa5,
+    0xdf,
+    0x8d,
+    0x00,
+    0x08,
+    0x2d,
+    0x71,
+    0x8a,
+    0x38,
+    0xdf,
+    0xdd,
+    0xe0,
+    0x03,
+    0x0e,
+    0x01,
+    0x04,
+    0x0f,
+    0x04,
+    0x83,
+    0xd0,
+    0x0a,
+    0x27,
+    0x10,
+    0x04,
+    0xad,
+    0x15,
+    0x3f,
+    0xae,
+    0x20,
+    0x01,
+    0x00,
+    0x0b,
+    0x00,
+    0x01,
+    0x8f,
+    0x00,
+    0x00,
+    0x01,
+    0x8b,
+    0x00,
+    0x01,
+    0x86,
+    0x30,
+    0x82,
+    0x01,
+    0x82,
+    0x30,
+    0x82,
+    0x01,
+    0x29,
+    0xa0,
+    0x03,
+    0x02,
+    0x01,
+    0x02,
+    0x02,
+    0x14,
+    0x0a,
+    0x73,
+    0x0f,
+    0x86,
+    0x18,
+    0xf2,
+    0xc3,
+    0x30,
+    0x01,
+    0xd2,
+    0xc0,
+    0xc1,
+    0x62,
+    0x52,
+    0x13,
+    0xf1,
+    0x9c,
+    0x13,
+    0x39,
+    0xb5,
+    0x30,
+    0x0a,
+    0x06,
+    0x08,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x04,
+    0x03,
+    0x02,
+    0x30,
+    0x17,
+    0x31,
+    0x15,
+    0x30,
+    0x13,
+    0x06,
+    0x03,
+    0x55,
+    0x04,
+    0x03,
+    0x0c,
+    0x0c,
+    0x6d,
+    0x61,
+    0x70,
+    0x61,
+    0x6b,
+    0x74,
+    0x2e,
+    0x6c,
+    0x6f,
+    0x63,
+    0x61,
+    0x6c,
+    0x30,
+    0x1e,
+    0x17,
+    0x0d,
+    0x32,
+    0x32,
+    0x30,
+    0x38,
+    0x30,
+    0x32,
+    0x31,
+    0x32,
+    0x30,
+    0x30,
+    0x31,
+    0x38,
+    0x5a,
+    0x17,
+    0x0d,
+    0x32,
+    0x32,
+    0x30,
+    0x39,
+    0x30,
+    0x31,
+    0x31,
+    0x32,
+    0x30,
+    0x30,
+    0x31,
+    0x38,
+    0x5a,
+    0x30,
+    0x17,
+    0x31,
+    0x15,
+    0x30,
+    0x13,
+    0x06,
+    0x03,
+    0x55,
+    0x04,
+    0x03,
+    0x0c,
+    0x0c,
+    0x6d,
+    0x61,
+    0x70,
+    0x61,
+    0x6b,
+    0x74,
+    0x2e,
+    0x6c,
+    0x6f,
+    0x63,
+    0x61,
+    0x6c,
+    0x30,
+    0x59,
+    0x30,
+    0x13,
+    0x06,
+    0x07,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x02,
+    0x01,
+    0x06,
+    0x08,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x03,
+    0x01,
+    0x07,
+    0x03,
+    0x42,
+    0x00,
+    0x04,
+    0x67,
+    0xf4,
+    0xd3,
+    0x8f,
+    0x15,
+    0x6d,
+    0xee,
+    0x85,
+    0xcc,
+    0x2a,
+    0x77,
+    0xfc,
+    0x0b,
+    0x8f,
+    0x9f,
+    0xcf,
+    0xa9,
+    0x95,
+    0x5d,
+    0x5b,
+    0xcd,
+    0xb7,
+    0x8b,
+    0xba,
+    0x31,
+    0x0a,
+    0x73,
+    0x62,
+    0xc5,
+    0xd0,
+    0x0e,
+    0x07,
+    0x90,
+    0xae,
+    0x38,
+    0x43,
+    0x79,
+    0xce,
+    0x5e,
+    0x33,
+    0xad,
+    0x31,
+    0xbf,
+    0x9f,
+    0x2a,
+    0x56,
+    0x83,
+    0xa5,
+    0x24,
+    0x16,
+    0xab,
+    0x0c,
+    0xf1,
+    0x64,
+    0xbe,
+    0xe4,
+    0x93,
+    0xb5,
+    0x89,
+    0xd6,
+    0x05,
+    0xe4,
+    0xf7,
+    0x7b,
+    0xa3,
+    0x53,
+    0x30,
+    0x51,
+    0x30,
+    0x1d,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x0e,
+    0x04,
+    0x16,
+    0x04,
+    0x14,
+    0x02,
+    0x64,
+    0x0f,
+    0x55,
+    0x69,
+    0x14,
+    0x91,
+    0x19,
+    0xed,
+    0xf9,
+    0x1a,
+    0xe9,
+    0x1d,
+    0xa5,
+    0x5a,
+    0xd0,
+    0x48,
+    0x96,
+    0x9f,
+    0x60,
+    0x30,
+    0x1f,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x23,
+    0x04,
+    0x18,
+    0x30,
+    0x16,
+    0x80,
+    0x14,
+    0x02,
+    0x64,
+    0x0f,
+    0x55,
+    0x69,
+    0x14,
+    0x91,
+    0x19,
+    0xed,
+    0xf9,
+    0x1a,
+    0xe9,
+    0x1d,
+    0xa5,
+    0x5a,
+    0xd0,
+    0x48,
+    0x96,
+    0x9f,
+    0x60,
+    0x30,
+    0x0f,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x13,
+    0x01,
+    0x01,
+    0xff,
+    0x04,
+    0x05,
+    0x30,
+    0x03,
+    0x01,
+    0x01,
+    0xff,
+    0x30,
+    0x0a,
+    0x06,
+    0x08,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x04,
+    0x03,
+    0x02,
+    0x03,
+    0x47,
+    0x00,
+    0x30,
+    0x44,
+    0x02,
+    0x20,
+    0x0a,
+    0x82,
+    0x92,
+    0x6e,
+    0xd3,
+    0xc6,
+    0x66,
+    0xd9,
+    0xd3,
+    0x75,
+    0xff,
+    0x71,
+    0x3b,
+    0x61,
+    0x46,
+    0x21,
+    0x00,
+    0xe6,
+    0x21,
+    0x5d,
+    0x9c,
+    0x86,
+    0xe9,
+    0x65,
+    0x40,
+    0x4f,
+    0xeb,
+    0x70,
+    0x4f,
+    0x2c,
+    0xad,
+    0x00,
+    0x02,
+    0x20,
+    0x08,
+    0xc2,
+    0x07,
+    0x5d,
+    0x16,
+    0xfc,
+    0x54,
+    0x34,
+    0x2b,
+    0xb4,
+    0x18,
+    0x67,
+    0x44,
+    0x81,
+    0xc9,
+    0xa9,
+    0x67,
+    0x2e,
+    0xce,
+    0xa1,
+    0x02,
+    0x9f,
+    0x3b,
+    0xe5,
+    0x61,
+    0x16,
+    0x0b,
+    0x50,
+    0xf6,
+    0xa1,
+    0x50,
+    0x94,
+    0x00,
+    0x00,
+    0x0f,
+    0x00,
+    0x00,
+    0x4a,
+    0x04,
+    0x03,
+    0x00,
+    0x46,
+    0x30,
+    0x44,
+    0x02,
+    0x20,
+    0x7d,
+    0x57,
+    0x17,
+    0x14,
+    0x46,
+    0x09,
+    0x95,
+    0x70,
+    0x09,
+    0x45,
+    0xe8,
+    0x9e,
+    0x5c,
+    0x87,
+    0x55,
+    0xd9,
+    0x08,
+    0xc6,
+    0x5e,
+    0x47,
+    0x73,
+    0x5e,
+    0xb1,
+    0xc9,
+    0xef,
+    0xcb,
+    0xe5,
+    0x7f,
+    0xcc,
+    0xb0,
+    0x28,
+    0xbc,
+    0x02,
+    0x20,
+    0x5d,
+    0xe4,
+    0x2b,
+    0x83,
+    0xd9,
+    0x78,
+    0x75,
+    0x45,
+    0xf3,
+    0x22,
+    0x2b,
+    0x38,
+    0xeb,
+    0x68,
+    0xe5,
+    0x71,
+    0x5d,
+    0xcb,
+    0xc3,
+    0x68,
+    0xb3,
+    0x0e,
+    0x7d,
+    0x5e,
+    0x1d,
+    0xc2,
+    0x1b,
+    0x8a,
+    0x62,
+    0x80,
+    0x48,
+    0x3e,
+    0x14,
+    0x00,
+    0x00,
+    0x20,
+    0x37,
+    0xcd,
+    0x55,
+    0xca,
+    0x3f,
+    0x4b,
+    0xf0,
+    0x95,
+    0xf8,
+    0xe4,
+    0xfe,
+    0x59,
+    0xab,
+    0xbc,
+    0xc1,
+    0x8f,
+    0x0c,
+    0x3f,
+    0x41,
+    0x59,
+    0xf6,
+    0x96,
+    0xdb,
+    0x75,
+    0xae,
+    0xe7,
+    0x86,
+    0x1a,
+    0x92,
+    0xa7,
+    0x53,
+    0x0a,
 };
 
 static const QUIC_PKT_HDR rx_script_5c_expect_hdr = {
     QUIC_PKT_TYPE_1RTT,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    0,          /* Version */
-    {0, {0}},                           /* DCID */
-    {0, {0}},                           /* SCID */
-    {0},        /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    0, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     72, NULL
 };
 
 static const unsigned char rx_script_5c_body[] = {
-    0x18, 0x03, 0x00, 0x04, 0x92, 0xec, 0xaa, 0xd6, 0x47, 0xd8, 0x8b, 0x56,
-    0x3b, 0x5f, 0x67, 0xe6, 0xb9, 0xb9, 0xca, 0x72, 0xca, 0xf2, 0x49, 0x7d,
-    0x18, 0x02, 0x00, 0x04, 0xa9, 0x6e, 0x9b, 0x84, 0x26, 0x43, 0x00, 0xc7,
-    0x55, 0x71, 0x67, 0x2e, 0x52, 0xdd, 0x47, 0xfd, 0x06, 0x51, 0x33, 0x08,
-    0x18, 0x01, 0x00, 0x04, 0x36, 0xd5, 0x1f, 0x06, 0x4e, 0xbf, 0xb4, 0xc9,
-    0xef, 0x97, 0x1e, 0x9a, 0x3c, 0xab, 0x1e, 0xfc, 0xb7, 0x90, 0xc3, 0x1a,
+    0x18,
+    0x03,
+    0x00,
+    0x04,
+    0x92,
+    0xec,
+    0xaa,
+    0xd6,
+    0x47,
+    0xd8,
+    0x8b,
+    0x56,
+    0x3b,
+    0x5f,
+    0x67,
+    0xe6,
+    0xb9,
+    0xb9,
+    0xca,
+    0x72,
+    0xca,
+    0xf2,
+    0x49,
+    0x7d,
+    0x18,
+    0x02,
+    0x00,
+    0x04,
+    0xa9,
+    0x6e,
+    0x9b,
+    0x84,
+    0x26,
+    0x43,
+    0x00,
+    0xc7,
+    0x55,
+    0x71,
+    0x67,
+    0x2e,
+    0x52,
+    0xdd,
+    0x47,
+    0xfd,
+    0x06,
+    0x51,
+    0x33,
+    0x08,
+    0x18,
+    0x01,
+    0x00,
+    0x04,
+    0x36,
+    0xd5,
+    0x1f,
+    0x06,
+    0x4e,
+    0xbf,
+    0xb4,
+    0xc9,
+    0xef,
+    0x97,
+    0x1e,
+    0x9a,
+    0x3c,
+    0xab,
+    0x1e,
+    0xfc,
+    0xb7,
+    0x90,
+    0xc3,
+    0x1a,
 };
 
 static const struct rx_test_op rx_script_5[] = {
     RX_OP_ALLOW_1RTT()
-    RX_OP_SET_RX_DCID(empty_conn_id)
-    RX_OP_PROVIDE_SECRET_INITIAL(rx_script_5_c2s_init_dcid)
-    RX_OP_INJECT_N(5)
-    RX_OP_CHECK_PKT_N(5a)
-    RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
+        RX_OP_SET_RX_DCID(empty_conn_id)
+            RX_OP_PROVIDE_SECRET_INITIAL(rx_script_5_c2s_init_dcid)
+                RX_OP_INJECT_N(5)
+                    RX_OP_CHECK_PKT_N(5a)
+                        RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
     RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE,
-                      QRL_SUITE_AES128GCM, rx_script_5_handshake_secret)
-    RX_OP_CHECK_PKT_N(5b)
-    RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
+        QRL_SUITE_AES128GCM, rx_script_5_handshake_secret)
+        RX_OP_CHECK_PKT_N(5b)
+            RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
     RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT,
-                      QRL_SUITE_AES128GCM, rx_script_5_1rtt_secret)
-    RX_OP_CHECK_PKT_N(5c)
-    RX_OP_CHECK_NO_PKT()
+        QRL_SUITE_AES128GCM, rx_script_5_1rtt_secret)
+        RX_OP_CHECK_PKT_N(5c)
+            RX_OP_CHECK_NO_PKT()
 
     /* Discard Initial EL and try injecting the packet again */
     RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_INITIAL)
-    RX_OP_INJECT_N(5)
+        RX_OP_INJECT_N(5)
     /* Initial packet is not output because we have discarded Initial keys */
     RX_OP_CHECK_PKT_N(5b)
-    RX_OP_CHECK_PKT_N(5c)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_CHECK_PKT_N(5c)
+            RX_OP_CHECK_NO_PKT()
     /* Try again with discarded keys */
     RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_HANDSHAKE)
-    RX_OP_INJECT_N(5)
-    RX_OP_CHECK_PKT_N(5c)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_INJECT_N(5)
+            RX_OP_CHECK_PKT_N(5c)
+                RX_OP_CHECK_NO_PKT()
     /* Try again */
     RX_OP_INJECT_N(5)
-    RX_OP_CHECK_PKT_N(5c)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_CHECK_PKT_N(5c)
+            RX_OP_CHECK_NO_PKT()
     /* Try again with discarded 1-RTT keys */
     RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_1RTT)
-    RX_OP_INJECT_N(5)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_INJECT_N(5)
+            RX_OP_CHECK_NO_PKT()
 
     /* Recreate QRL, test reading packets received before key */
     RX_OP_SET_SCID_LEN(0)
-    RX_OP_SET_RX_DCID(empty_conn_id)
-    RX_OP_INJECT_N(5)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_PROVIDE_SECRET_INITIAL(rx_script_5_c2s_init_dcid)
-    RX_OP_CHECK_PKT_N(5a)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE,
-                      QRL_SUITE_AES128GCM, rx_script_5_handshake_secret)
-    RX_OP_CHECK_PKT_N(5b)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT,
-                      QRL_SUITE_AES128GCM, rx_script_5_1rtt_secret)
-    RX_OP_CHECK_PKT_N(5c)
-    RX_OP_CHECK_NO_PKT()
-
-    RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_INITIAL)
-    RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_HANDSHAKE)
-    RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_1RTT)
-    RX_OP_INJECT_N(5)
-    RX_OP_CHECK_NO_PKT()
-
-    RX_OP_END
+        RX_OP_SET_RX_DCID(empty_conn_id)
+            RX_OP_INJECT_N(5)
+                RX_OP_CHECK_NO_PKT()
+                    RX_OP_PROVIDE_SECRET_INITIAL(rx_script_5_c2s_init_dcid)
+                        RX_OP_CHECK_PKT_N(5a)
+                            RX_OP_CHECK_NO_PKT()
+                                RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE,
+                                    QRL_SUITE_AES128GCM, rx_script_5_handshake_secret)
+                                    RX_OP_CHECK_PKT_N(5b)
+                                        RX_OP_CHECK_NO_PKT()
+                                            RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT,
+                                                QRL_SUITE_AES128GCM, rx_script_5_1rtt_secret)
+                                                RX_OP_CHECK_PKT_N(5c)
+                                                    RX_OP_CHECK_NO_PKT()
+
+                                                        RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_INITIAL)
+                                                            RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_HANDSHAKE)
+                                                                RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_1RTT)
+                                                                    RX_OP_INJECT_N(5)
+                                                                        RX_OP_CHECK_NO_PKT()
+
+                                                                            RX_OP_END
 };
 
 /*
@@ -658,362 +3003,2656 @@ static const struct rx_test_op rx_script_5[] = {
  *      - Initial, Handshake, 1-RTT (AES-256-GCM/SHA384)
  */
 static const QUIC_CONN_ID rx_script_6_c2s_init_dcid = {
-    4, {0xac, 0x88, 0x95, 0xbd}
+    4, { 0xac, 0x88, 0x95, 0xbd }
 };
 
 static const unsigned char rx_script_6_handshake_secret[48] = {
-    0xd1, 0x41, 0xb0, 0xf6, 0x0d, 0x8b, 0xbd, 0xe8, 0x5b, 0xa8, 0xff, 0xd7,
-    0x18, 0x9a, 0x23, 0x7b, 0x13, 0x5c, 0x1e, 0x90, 0x1d, 0x08, 0x95, 0xcc,
-    0xc5, 0x8e, 0x73, 0x4e, 0x02, 0x6f, 0x3c, 0xb6, 0x26, 0x77, 0x8d, 0x53,
-    0xc5, 0x62, 0x9f, 0xb5, 0xf0, 0x88, 0xfb, 0xe5, 0x14, 0x71, 0xab, 0xe6,
+    0xd1,
+    0x41,
+    0xb0,
+    0xf6,
+    0x0d,
+    0x8b,
+    0xbd,
+    0xe8,
+    0x5b,
+    0xa8,
+    0xff,
+    0xd7,
+    0x18,
+    0x9a,
+    0x23,
+    0x7b,
+    0x13,
+    0x5c,
+    0x1e,
+    0x90,
+    0x1d,
+    0x08,
+    0x95,
+    0xcc,
+    0xc5,
+    0x8e,
+    0x73,
+    0x4e,
+    0x02,
+    0x6f,
+    0x3c,
+    0xb6,
+    0x26,
+    0x77,
+    0x8d,
+    0x53,
+    0xc5,
+    0x62,
+    0x9f,
+    0xb5,
+    0xf0,
+    0x88,
+    0xfb,
+    0xe5,
+    0x14,
+    0x71,
+    0xab,
+    0xe6,
 };
 
 static const unsigned char rx_script_6_1rtt_secret[48] = {
-    0x2d, 0x6b, 0x9d, 0xd4, 0x39, 0xa0, 0xe7, 0xff, 0x17, 0xe2, 0xcb, 0x5c,
-    0x0d, 0x4a, 0xf6, 0x3f, 0xf4, 0xfe, 0xfc, 0xe5, 0x22, 0xfa, 0xf5, 0x5b,
-    0xc0, 0xb2, 0x18, 0xbb, 0x92, 0x4d, 0x35, 0xea, 0x67, 0xa6, 0xe7, 0xc1,
-    0x90, 0x10, 0xc9, 0x14, 0x46, 0xf5, 0x95, 0x57, 0x8b, 0x90, 0x88, 0x5d,
+    0x2d,
+    0x6b,
+    0x9d,
+    0xd4,
+    0x39,
+    0xa0,
+    0xe7,
+    0xff,
+    0x17,
+    0xe2,
+    0xcb,
+    0x5c,
+    0x0d,
+    0x4a,
+    0xf6,
+    0x3f,
+    0xf4,
+    0xfe,
+    0xfc,
+    0xe5,
+    0x22,
+    0xfa,
+    0xf5,
+    0x5b,
+    0xc0,
+    0xb2,
+    0x18,
+    0xbb,
+    0x92,
+    0x4d,
+    0x35,
+    0xea,
+    0x67,
+    0xa6,
+    0xe7,
+    0xc1,
+    0x90,
+    0x10,
+    0xc9,
+    0x14,
+    0x46,
+    0xf5,
+    0x95,
+    0x57,
+    0x8b,
+    0x90,
+    0x88,
+    0x5d,
 };
 
 static const unsigned char rx_script_6_in[] = {
     /* First Packet: Initial */
-    0xc5,                           /* Long, Initial, PN Length=2 bytes */
-    0x00, 0x00, 0x00, 0x01,         /* Version */
-    0x00,                           /* DCID */
-    0x04, 0x36, 0xf4, 0x75, 0x2d,   /* SCID */
-    0x00,                           /* Token Length */
-    0x41, 0xbe,                     /* Length (446) */
-    0xa9, 0xe2,                     /* PN (0) */
-    0x83, 0x39, 0x95, 0x8f, 0x8f, 0x8c, 0xa9, 0xaf, 0x10, 0x29, 0x3d, 0xfc,
-    0x56, 0x4a, 0x1c, 0x4b, 0xc9, 0x48, 0xb1, 0xaf, 0x36, 0xd5, 0xac, 0x95,
-    0xbf, 0xfd, 0x2c, 0x4d, 0x70, 0x2e, 0x5b, 0x7c, 0x22, 0x5f, 0x5f, 0xee,
-    0x10, 0x8f, 0xfb, 0x0b, 0x5f, 0x9d, 0x7e, 0x68, 0x2f, 0x94, 0x0b, 0xdb,
-    0xed, 0xef, 0xfa, 0x4e, 0xc6, 0xd5, 0xe7, 0xef, 0xe0, 0x78, 0x3c, 0xdc,
-    0xe9, 0xd8, 0xe8, 0x56, 0x71, 0xd7, 0xe7, 0x6c, 0x7f, 0x5d, 0xaa, 0x7a,
-    0x52, 0x1d, 0x95, 0x7a, 0x80, 0x70, 0x38, 0xc0, 0x8b, 0xa1, 0x2f, 0x09,
-    0x16, 0xd2, 0xec, 0xa3, 0x23, 0x72, 0x45, 0x3c, 0xbd, 0x8c, 0xda, 0xbb,
-    0x37, 0x5a, 0x8d, 0xb2, 0x00, 0x7e, 0x67, 0x0c, 0xa0, 0x32, 0xdd, 0x80,
-    0x07, 0x71, 0xb0, 0x95, 0x21, 0xbc, 0x1e, 0xbd, 0x63, 0x0a, 0x10, 0xe7,
-    0x4b, 0x6e, 0x2e, 0x85, 0x3a, 0x65, 0xf7, 0x06, 0x6e, 0x7e, 0x8f, 0x65,
-    0x8c, 0xb1, 0x93, 0xe9, 0x0d, 0xe8, 0x46, 0xe7, 0xcf, 0xa7, 0xd2, 0x8b,
-    0x15, 0x23, 0xec, 0xc3, 0xec, 0x44, 0xda, 0x62, 0x15, 0x35, 0x34, 0x2f,
-    0x62, 0x77, 0xc8, 0x1f, 0x83, 0x22, 0x00, 0xe5, 0xc0, 0x89, 0xb8, 0x97,
-    0xd2, 0x37, 0x02, 0xea, 0xa2, 0x35, 0xbf, 0x19, 0xf0, 0xba, 0x1d, 0xb7,
-    0xaa, 0x36, 0xbb, 0x11, 0x60, 0xc3, 0x45, 0x1f, 0xe5, 0x18, 0xde, 0x4c,
-    0x01, 0x23, 0x2d, 0x17, 0x78, 0xdd, 0x4c, 0x8a, 0x1e, 0x1b, 0xd4, 0xda,
-    0x56, 0x43, 0x13, 0xa4, 0x4f, 0xfd, 0xd5, 0x92, 0x6a, 0x05, 0x5f, 0x14,
-    0x63, 0x85, 0x7d, 0xf1, 0x31, 0xb8, 0x27, 0x0b, 0xa6, 0xb5, 0x50, 0xca,
-    0x8b, 0x0e, 0xa1, 0x0d, 0xf9, 0xc4, 0xea, 0x6a, 0x6e, 0x4b, 0x6d, 0xdf,
-    0x49, 0xe8, 0x32, 0xf6, 0x85, 0xc4, 0x29, 0x26, 0x32, 0xfb, 0x5e, 0xa8,
-    0x55, 0x6b, 0x67, 0xe9, 0xaa, 0x35, 0x33, 0x90, 0xd8, 0x2a, 0x71, 0x0b,
-    0x6a, 0x48, 0xc4, 0xa3, 0x8b, 0xe0, 0xe7, 0x00, 0x3d, 0xee, 0x30, 0x70,
-    0x84, 0xbd, 0xa3, 0x3c, 0x9e, 0xa3, 0x5c, 0x69, 0xab, 0x55, 0x7b, 0xe2,
-    0xe5, 0x86, 0x13, 0xcb, 0x93, 0x3f, 0xcb, 0x3e, 0x6d, 0xc9, 0xc2, 0x10,
-    0x2b, 0x00, 0x9b, 0x3f, 0x14, 0x4e, 0x04, 0x27, 0xc0, 0xae, 0x1d, 0x48,
-    0x89, 0x3a, 0xf4, 0xac, 0xe0, 0x05, 0x07, 0xc9, 0x74, 0x6e, 0x21, 0x01,
-    0xe9, 0x26, 0xfd, 0xb4, 0xb2, 0x2a, 0xda, 0x72, 0xda, 0xbf, 0x63, 0x9d,
-    0x37, 0xaf, 0x90, 0x05, 0xd6, 0x89, 0xc7, 0xa6, 0x81, 0x4e, 0x2a, 0x30,
-    0xe3, 0x05, 0x88, 0x9f, 0xd0, 0xba, 0x8d, 0xc4, 0x21, 0x52, 0x5a, 0x7a,
-    0xe1, 0xad, 0xd3, 0x88, 0xc2, 0x18, 0xad, 0x4c, 0xb1, 0x66, 0x73, 0x1b,
-    0xf2, 0xd1, 0xb9, 0x43, 0xaa, 0xc4, 0x66, 0xcd, 0x42, 0xfa, 0x80, 0xec,
-    0xa1, 0x7c, 0x45, 0x02, 0x53, 0x45, 0xd5, 0x07, 0xd4, 0x70, 0x12, 0x1b,
-    0x08, 0x05, 0x6e, 0x99, 0x0a, 0xd3, 0x5b, 0x99, 0x6b, 0x65, 0xc4, 0xc0,
-    0x04, 0x1b, 0x75, 0xf2, 0x86, 0x99, 0x09, 0x4a, 0x50, 0x70, 0x00, 0x7a,
-    0x93, 0xaa, 0xe6, 0xf4, 0x03, 0x29, 0x06, 0xa4, 0x30, 0x6d, 0x52, 0xbd,
-    0x60, 0xd1, 0x7e, 0xd6, 0x07, 0xc0, 0x41, 0x01, 0x12, 0x3e, 0x16, 0x94,
+    0xc5, /* Long, Initial, PN Length=2 bytes */
+    0x00,
+    0x00,
+    0x00,
+    0x01, /* Version */
+    0x00, /* DCID */
+    0x04,
+    0x36,
+    0xf4,
+    0x75,
+    0x2d, /* SCID */
+    0x00, /* Token Length */
+    0x41,
+    0xbe, /* Length (446) */
+    0xa9,
+    0xe2, /* PN (0) */
+    0x83,
+    0x39,
+    0x95,
+    0x8f,
+    0x8f,
+    0x8c,
+    0xa9,
+    0xaf,
+    0x10,
+    0x29,
+    0x3d,
+    0xfc,
+    0x56,
+    0x4a,
+    0x1c,
+    0x4b,
+    0xc9,
+    0x48,
+    0xb1,
+    0xaf,
+    0x36,
+    0xd5,
+    0xac,
+    0x95,
+    0xbf,
+    0xfd,
+    0x2c,
+    0x4d,
+    0x70,
+    0x2e,
+    0x5b,
+    0x7c,
+    0x22,
+    0x5f,
+    0x5f,
+    0xee,
+    0x10,
+    0x8f,
+    0xfb,
+    0x0b,
+    0x5f,
+    0x9d,
+    0x7e,
+    0x68,
+    0x2f,
+    0x94,
+    0x0b,
+    0xdb,
+    0xed,
+    0xef,
+    0xfa,
+    0x4e,
+    0xc6,
+    0xd5,
+    0xe7,
+    0xef,
+    0xe0,
+    0x78,
+    0x3c,
+    0xdc,
+    0xe9,
+    0xd8,
+    0xe8,
+    0x56,
+    0x71,
+    0xd7,
+    0xe7,
+    0x6c,
+    0x7f,
+    0x5d,
+    0xaa,
+    0x7a,
+    0x52,
+    0x1d,
+    0x95,
+    0x7a,
+    0x80,
+    0x70,
+    0x38,
+    0xc0,
+    0x8b,
+    0xa1,
+    0x2f,
+    0x09,
+    0x16,
+    0xd2,
+    0xec,
+    0xa3,
+    0x23,
+    0x72,
+    0x45,
+    0x3c,
+    0xbd,
+    0x8c,
+    0xda,
+    0xbb,
+    0x37,
+    0x5a,
+    0x8d,
+    0xb2,
+    0x00,
+    0x7e,
+    0x67,
+    0x0c,
+    0xa0,
+    0x32,
+    0xdd,
+    0x80,
+    0x07,
+    0x71,
+    0xb0,
+    0x95,
+    0x21,
+    0xbc,
+    0x1e,
+    0xbd,
+    0x63,
+    0x0a,
+    0x10,
+    0xe7,
+    0x4b,
+    0x6e,
+    0x2e,
+    0x85,
+    0x3a,
+    0x65,
+    0xf7,
+    0x06,
+    0x6e,
+    0x7e,
+    0x8f,
+    0x65,
+    0x8c,
+    0xb1,
+    0x93,
+    0xe9,
+    0x0d,
+    0xe8,
+    0x46,
+    0xe7,
+    0xcf,
+    0xa7,
+    0xd2,
+    0x8b,
+    0x15,
+    0x23,
+    0xec,
+    0xc3,
+    0xec,
+    0x44,
+    0xda,
+    0x62,
+    0x15,
+    0x35,
+    0x34,
+    0x2f,
+    0x62,
+    0x77,
+    0xc8,
+    0x1f,
+    0x83,
+    0x22,
+    0x00,
+    0xe5,
+    0xc0,
+    0x89,
+    0xb8,
+    0x97,
+    0xd2,
+    0x37,
+    0x02,
+    0xea,
+    0xa2,
+    0x35,
+    0xbf,
+    0x19,
+    0xf0,
+    0xba,
+    0x1d,
+    0xb7,
+    0xaa,
+    0x36,
+    0xbb,
+    0x11,
+    0x60,
+    0xc3,
+    0x45,
+    0x1f,
+    0xe5,
+    0x18,
+    0xde,
+    0x4c,
+    0x01,
+    0x23,
+    0x2d,
+    0x17,
+    0x78,
+    0xdd,
+    0x4c,
+    0x8a,
+    0x1e,
+    0x1b,
+    0xd4,
+    0xda,
+    0x56,
+    0x43,
+    0x13,
+    0xa4,
+    0x4f,
+    0xfd,
+    0xd5,
+    0x92,
+    0x6a,
+    0x05,
+    0x5f,
+    0x14,
+    0x63,
+    0x85,
+    0x7d,
+    0xf1,
+    0x31,
+    0xb8,
+    0x27,
+    0x0b,
+    0xa6,
+    0xb5,
+    0x50,
+    0xca,
+    0x8b,
+    0x0e,
+    0xa1,
+    0x0d,
+    0xf9,
+    0xc4,
+    0xea,
+    0x6a,
+    0x6e,
+    0x4b,
+    0x6d,
+    0xdf,
+    0x49,
+    0xe8,
+    0x32,
+    0xf6,
+    0x85,
+    0xc4,
+    0x29,
+    0x26,
+    0x32,
+    0xfb,
+    0x5e,
+    0xa8,
+    0x55,
+    0x6b,
+    0x67,
+    0xe9,
+    0xaa,
+    0x35,
+    0x33,
+    0x90,
+    0xd8,
+    0x2a,
+    0x71,
+    0x0b,
+    0x6a,
+    0x48,
+    0xc4,
+    0xa3,
+    0x8b,
+    0xe0,
+    0xe7,
+    0x00,
+    0x3d,
+    0xee,
+    0x30,
+    0x70,
+    0x84,
+    0xbd,
+    0xa3,
+    0x3c,
+    0x9e,
+    0xa3,
+    0x5c,
+    0x69,
+    0xab,
+    0x55,
+    0x7b,
+    0xe2,
+    0xe5,
+    0x86,
+    0x13,
+    0xcb,
+    0x93,
+    0x3f,
+    0xcb,
+    0x3e,
+    0x6d,
+    0xc9,
+    0xc2,
+    0x10,
+    0x2b,
+    0x00,
+    0x9b,
+    0x3f,
+    0x14,
+    0x4e,
+    0x04,
+    0x27,
+    0xc0,
+    0xae,
+    0x1d,
+    0x48,
+    0x89,
+    0x3a,
+    0xf4,
+    0xac,
+    0xe0,
+    0x05,
+    0x07,
+    0xc9,
+    0x74,
+    0x6e,
+    0x21,
+    0x01,
+    0xe9,
+    0x26,
+    0xfd,
+    0xb4,
+    0xb2,
+    0x2a,
+    0xda,
+    0x72,
+    0xda,
+    0xbf,
+    0x63,
+    0x9d,
+    0x37,
+    0xaf,
+    0x90,
+    0x05,
+    0xd6,
+    0x89,
+    0xc7,
+    0xa6,
+    0x81,
+    0x4e,
+    0x2a,
+    0x30,
+    0xe3,
+    0x05,
+    0x88,
+    0x9f,
+    0xd0,
+    0xba,
+    0x8d,
+    0xc4,
+    0x21,
+    0x52,
+    0x5a,
+    0x7a,
+    0xe1,
+    0xad,
+    0xd3,
+    0x88,
+    0xc2,
+    0x18,
+    0xad,
+    0x4c,
+    0xb1,
+    0x66,
+    0x73,
+    0x1b,
+    0xf2,
+    0xd1,
+    0xb9,
+    0x43,
+    0xaa,
+    0xc4,
+    0x66,
+    0xcd,
+    0x42,
+    0xfa,
+    0x80,
+    0xec,
+    0xa1,
+    0x7c,
+    0x45,
+    0x02,
+    0x53,
+    0x45,
+    0xd5,
+    0x07,
+    0xd4,
+    0x70,
+    0x12,
+    0x1b,
+    0x08,
+    0x05,
+    0x6e,
+    0x99,
+    0x0a,
+    0xd3,
+    0x5b,
+    0x99,
+    0x6b,
+    0x65,
+    0xc4,
+    0xc0,
+    0x04,
+    0x1b,
+    0x75,
+    0xf2,
+    0x86,
+    0x99,
+    0x09,
+    0x4a,
+    0x50,
+    0x70,
+    0x00,
+    0x7a,
+    0x93,
+    0xaa,
+    0xe6,
+    0xf4,
+    0x03,
+    0x29,
+    0x06,
+    0xa4,
+    0x30,
+    0x6d,
+    0x52,
+    0xbd,
+    0x60,
+    0xd1,
+    0x7e,
+    0xd6,
+    0x07,
+    0xc0,
+    0x41,
+    0x01,
+    0x12,
+    0x3e,
+    0x16,
+    0x94,
 
     /* Second Packet: Handshake */
-    0xea,                           /* Long, Handshake, PN Length=2 bytes */
-    0x00, 0x00, 0x00, 0x01,         /* Version */
-    0x00,                           /* DCID */
-    0x04, 0x36, 0xf4, 0x75, 0x2d,   /* SCID */
-    0x42, 0xb0,                     /* Length (688) */
-    0x3a, 0xc5,                     /* PN (0) */
-    0x3b, 0x8e, 0x4c, 0x01, 0x72, 0x6b, 0xfa, 0xbb, 0xad, 0xf9, 0x9e, 0x21,
-    0xb1, 0xd0, 0x01, 0xf1, 0xd4, 0x67, 0x8d, 0x2c, 0xee, 0x04, 0x60, 0x4a,
-    0xe2, 0xe4, 0xc6, 0x89, 0x01, 0xae, 0x3c, 0x1f, 0xf7, 0xe6, 0xf7, 0xac,
-    0x26, 0xcf, 0x3c, 0x6d, 0x1d, 0xfd, 0x11, 0x02, 0x51, 0x73, 0xb5, 0xe1,
-    0xb2, 0x44, 0x42, 0x32, 0x0f, 0xf5, 0x3d, 0x55, 0x2d, 0x1f, 0x02, 0x29,
-    0x51, 0x35, 0xdb, 0xc7, 0x7a, 0x34, 0x4b, 0xec, 0x60, 0x49, 0xa2, 0x90,
-    0x11, 0xef, 0x5a, 0xa9, 0x1c, 0xf7, 0xd9, 0x21, 0x68, 0x1c, 0x2b, 0xc6,
-    0x57, 0xde, 0xb1, 0x0b, 0x31, 0xed, 0xef, 0x16, 0xba, 0x08, 0xb9, 0xe2,
-    0xd9, 0xd0, 0xd8, 0x1f, 0xc4, 0x32, 0xe8, 0x45, 0x2a, 0x86, 0xe4, 0xd3,
-    0xaf, 0x72, 0x4f, 0x30, 0x01, 0x71, 0x15, 0x9b, 0xa9, 0x55, 0x35, 0xf7,
-    0x39, 0x7e, 0x6a, 0x59, 0x18, 0x4f, 0xe6, 0xdf, 0xb5, 0x0d, 0xc2, 0xe7,
-    0xb2, 0xa1, 0xa6, 0xa3, 0x9c, 0xf0, 0x0d, 0x59, 0x05, 0x49, 0x95, 0xfa,
-    0xcc, 0x72, 0xd7, 0xc0, 0x84, 0x2e, 0xc4, 0x1c, 0xd4, 0xa0, 0xe3, 0x6c,
-    0x5a, 0x8c, 0x94, 0x4d, 0x37, 0x1a, 0x1c, 0x68, 0x93, 0x5f, 0xe5, 0x99,
-    0x27, 0xc6, 0x06, 0xaa, 0x1f, 0x29, 0x17, 0xc5, 0x8c, 0x3d, 0x53, 0xa7,
-    0x05, 0x3a, 0x44, 0x53, 0x86, 0xed, 0x56, 0x99, 0x4c, 0xe2, 0x7b, 0x3a,
-    0x1e, 0x5d, 0x6d, 0xac, 0x78, 0x1e, 0xfa, 0x55, 0x58, 0x6e, 0x72, 0xee,
-    0xf9, 0x33, 0x64, 0x7f, 0x93, 0x3c, 0xfe, 0x18, 0x97, 0x6b, 0x02, 0x74,
-    0x90, 0x0d, 0xba, 0x89, 0xc0, 0x22, 0x0a, 0x0a, 0x37, 0x4c, 0x28, 0x74,
-    0xa7, 0x3a, 0x44, 0x74, 0x42, 0xff, 0xf1, 0xd2, 0x8d, 0x0c, 0xc1, 0xed,
-    0x98, 0x98, 0x8e, 0xa8, 0x6b, 0x95, 0x6a, 0x86, 0x0b, 0xb4, 0x95, 0x58,
-    0x34, 0x12, 0xb0, 0xc0, 0xf8, 0x2d, 0x5b, 0x40, 0x51, 0x80, 0x07, 0x91,
-    0x31, 0x77, 0xd3, 0x06, 0xa5, 0xe5, 0x1f, 0xe2, 0xf8, 0x92, 0xe4, 0x23,
-    0x2b, 0xf0, 0x4c, 0xa9, 0xa5, 0x6c, 0x6f, 0xaf, 0xaf, 0xbf, 0x97, 0xcf,
-    0x46, 0xf2, 0x8d, 0x61, 0x0e, 0x73, 0xcd, 0xc5, 0xde, 0xda, 0x50, 0x82,
-    0x61, 0x6d, 0xb1, 0xa2, 0xbe, 0x6b, 0x99, 0xcd, 0x5b, 0x99, 0x8f, 0x66,
-    0xab, 0x11, 0x78, 0xcc, 0xdb, 0x66, 0x98, 0xca, 0x19, 0x92, 0xf4, 0x05,
-    0xae, 0xe6, 0xf3, 0xe7, 0xf0, 0x30, 0x28, 0x31, 0x74, 0xff, 0xe2, 0xb3,
-    0x3a, 0x4f, 0x79, 0xe7, 0x2a, 0x9f, 0xe3, 0x41, 0xb2, 0x88, 0xc8, 0x8f,
-    0x77, 0x57, 0x42, 0x65, 0xdb, 0x07, 0xf6, 0x5f, 0xb8, 0x34, 0x17, 0xe3,
-    0x8d, 0x22, 0x5b, 0x88, 0x94, 0x60, 0x97, 0x32, 0x3d, 0x8a, 0x51, 0x9d,
-    0xb5, 0xac, 0xd7, 0x99, 0x96, 0x23, 0x6d, 0xc9, 0xab, 0x61, 0x41, 0x8f,
-    0x72, 0x1b, 0xf8, 0x84, 0xd9, 0x57, 0x88, 0x68, 0x3d, 0x73, 0x5f, 0xb1,
-    0x18, 0x5c, 0x3a, 0x35, 0xd2, 0xc5, 0xb7, 0x29, 0xc7, 0x95, 0xdd, 0x21,
-    0xc0, 0x78, 0x49, 0xf3, 0x24, 0xe0, 0x4c, 0x5c, 0x32, 0x08, 0xb7, 0x00,
-    0x43, 0x70, 0x5a, 0x95, 0x23, 0x91, 0xf5, 0xb7, 0x61, 0x85, 0x6f, 0xb3,
-    0xa4, 0x6b, 0x05, 0x9d, 0x39, 0xa3, 0xb1, 0x1c, 0x61, 0xc5, 0xa5, 0xe7,
-    0x9a, 0xe9, 0x5d, 0xaa, 0xca, 0x11, 0xd8, 0x4b, 0xa4, 0x9c, 0x18, 0x4e,
-    0x2b, 0x2d, 0x75, 0xc1, 0x12, 0x20, 0xe4, 0x66, 0xa5, 0x59, 0x67, 0x4b,
-    0xcc, 0x52, 0x2d, 0xfa, 0xaa, 0xa4, 0xe9, 0xfc, 0x79, 0xd7, 0xff, 0x03,
-    0x3e, 0xec, 0xba, 0x97, 0x37, 0x52, 0xc1, 0x57, 0x31, 0x8e, 0x57, 0x0c,
-    0x54, 0x92, 0x9c, 0x25, 0x5c, 0xfa, 0x9f, 0xa5, 0x36, 0x18, 0xd0, 0xaa,
-    0xf3, 0x3b, 0x5b, 0x59, 0xbd, 0x33, 0x5e, 0x7d, 0x74, 0x7c, 0xaf, 0xe9,
-    0x54, 0x80, 0xc4, 0xb4, 0xa1, 0x24, 0x9e, 0x23, 0x0d, 0xbf, 0x4e, 0x0f,
-    0xaf, 0xa5, 0x16, 0xcb, 0x3b, 0xfa, 0x33, 0xa5, 0x68, 0xa6, 0x64, 0x48,
-    0x2f, 0x5e, 0xfa, 0x64, 0x4e, 0xe3, 0x27, 0x4f, 0x13, 0xe6, 0x37, 0xf6,
-    0xb9, 0x63, 0x4b, 0xdc, 0x49, 0x3c, 0x5e, 0x9e, 0x06, 0xea, 0xac, 0xa3,
-    0xdf, 0x6c, 0x49, 0xfb, 0xa1, 0x01, 0x4f, 0x6f, 0x74, 0x1f, 0xd3, 0x26,
-    0xa1, 0x92, 0x3e, 0xe0, 0x73, 0xd6, 0x3b, 0x67, 0x13, 0x53, 0x2e, 0xcb,
-    0xbc, 0x83, 0xd0, 0x6e, 0x28, 0xb1, 0xcb, 0xd9, 0x66, 0xe0, 0x33, 0x59,
-    0x45, 0xd3, 0x13, 0xc2, 0x48, 0xd5, 0x9e, 0x88, 0xba, 0x75, 0x7b, 0xb1,
-    0xfe, 0x6f, 0xec, 0xde, 0xff, 0x14, 0x59, 0x75, 0xbf, 0x1a, 0x74, 0x47,
-    0xc5, 0xd8, 0xe8, 0x1b, 0x3c, 0x86, 0xd7, 0x1f, 0x99, 0x11, 0xd3, 0x29,
-    0xfd, 0x5d, 0x22, 0x7e, 0x03, 0x78, 0xed, 0x62, 0x0e, 0xbe, 0x6d, 0x75,
-    0xf4, 0xa8, 0x6e, 0xc7, 0x21, 0x76, 0xc5, 0xa0, 0x0c, 0xaa, 0x58, 0x78,
-    0x7e, 0x6e, 0xfc, 0x1e, 0x2a, 0x1c, 0xdd, 0xe5, 0x78, 0x08, 0xbd, 0xdb,
-    0xea, 0x8f, 0x8a, 0xa5, 0xbf, 0x93, 0xfe, 0x0f, 0x03, 0xa1, 0xc8, 0x64,
-    0x9f, 0x4a,
+    0xea, /* Long, Handshake, PN Length=2 bytes */
+    0x00,
+    0x00,
+    0x00,
+    0x01, /* Version */
+    0x00, /* DCID */
+    0x04,
+    0x36,
+    0xf4,
+    0x75,
+    0x2d, /* SCID */
+    0x42,
+    0xb0, /* Length (688) */
+    0x3a,
+    0xc5, /* PN (0) */
+    0x3b,
+    0x8e,
+    0x4c,
+    0x01,
+    0x72,
+    0x6b,
+    0xfa,
+    0xbb,
+    0xad,
+    0xf9,
+    0x9e,
+    0x21,
+    0xb1,
+    0xd0,
+    0x01,
+    0xf1,
+    0xd4,
+    0x67,
+    0x8d,
+    0x2c,
+    0xee,
+    0x04,
+    0x60,
+    0x4a,
+    0xe2,
+    0xe4,
+    0xc6,
+    0x89,
+    0x01,
+    0xae,
+    0x3c,
+    0x1f,
+    0xf7,
+    0xe6,
+    0xf7,
+    0xac,
+    0x26,
+    0xcf,
+    0x3c,
+    0x6d,
+    0x1d,
+    0xfd,
+    0x11,
+    0x02,
+    0x51,
+    0x73,
+    0xb5,
+    0xe1,
+    0xb2,
+    0x44,
+    0x42,
+    0x32,
+    0x0f,
+    0xf5,
+    0x3d,
+    0x55,
+    0x2d,
+    0x1f,
+    0x02,
+    0x29,
+    0x51,
+    0x35,
+    0xdb,
+    0xc7,
+    0x7a,
+    0x34,
+    0x4b,
+    0xec,
+    0x60,
+    0x49,
+    0xa2,
+    0x90,
+    0x11,
+    0xef,
+    0x5a,
+    0xa9,
+    0x1c,
+    0xf7,
+    0xd9,
+    0x21,
+    0x68,
+    0x1c,
+    0x2b,
+    0xc6,
+    0x57,
+    0xde,
+    0xb1,
+    0x0b,
+    0x31,
+    0xed,
+    0xef,
+    0x16,
+    0xba,
+    0x08,
+    0xb9,
+    0xe2,
+    0xd9,
+    0xd0,
+    0xd8,
+    0x1f,
+    0xc4,
+    0x32,
+    0xe8,
+    0x45,
+    0x2a,
+    0x86,
+    0xe4,
+    0xd3,
+    0xaf,
+    0x72,
+    0x4f,
+    0x30,
+    0x01,
+    0x71,
+    0x15,
+    0x9b,
+    0xa9,
+    0x55,
+    0x35,
+    0xf7,
+    0x39,
+    0x7e,
+    0x6a,
+    0x59,
+    0x18,
+    0x4f,
+    0xe6,
+    0xdf,
+    0xb5,
+    0x0d,
+    0xc2,
+    0xe7,
+    0xb2,
+    0xa1,
+    0xa6,
+    0xa3,
+    0x9c,
+    0xf0,
+    0x0d,
+    0x59,
+    0x05,
+    0x49,
+    0x95,
+    0xfa,
+    0xcc,
+    0x72,
+    0xd7,
+    0xc0,
+    0x84,
+    0x2e,
+    0xc4,
+    0x1c,
+    0xd4,
+    0xa0,
+    0xe3,
+    0x6c,
+    0x5a,
+    0x8c,
+    0x94,
+    0x4d,
+    0x37,
+    0x1a,
+    0x1c,
+    0x68,
+    0x93,
+    0x5f,
+    0xe5,
+    0x99,
+    0x27,
+    0xc6,
+    0x06,
+    0xaa,
+    0x1f,
+    0x29,
+    0x17,
+    0xc5,
+    0x8c,
+    0x3d,
+    0x53,
+    0xa7,
+    0x05,
+    0x3a,
+    0x44,
+    0x53,
+    0x86,
+    0xed,
+    0x56,
+    0x99,
+    0x4c,
+    0xe2,
+    0x7b,
+    0x3a,
+    0x1e,
+    0x5d,
+    0x6d,
+    0xac,
+    0x78,
+    0x1e,
+    0xfa,
+    0x55,
+    0x58,
+    0x6e,
+    0x72,
+    0xee,
+    0xf9,
+    0x33,
+    0x64,
+    0x7f,
+    0x93,
+    0x3c,
+    0xfe,
+    0x18,
+    0x97,
+    0x6b,
+    0x02,
+    0x74,
+    0x90,
+    0x0d,
+    0xba,
+    0x89,
+    0xc0,
+    0x22,
+    0x0a,
+    0x0a,
+    0x37,
+    0x4c,
+    0x28,
+    0x74,
+    0xa7,
+    0x3a,
+    0x44,
+    0x74,
+    0x42,
+    0xff,
+    0xf1,
+    0xd2,
+    0x8d,
+    0x0c,
+    0xc1,
+    0xed,
+    0x98,
+    0x98,
+    0x8e,
+    0xa8,
+    0x6b,
+    0x95,
+    0x6a,
+    0x86,
+    0x0b,
+    0xb4,
+    0x95,
+    0x58,
+    0x34,
+    0x12,
+    0xb0,
+    0xc0,
+    0xf8,
+    0x2d,
+    0x5b,
+    0x40,
+    0x51,
+    0x80,
+    0x07,
+    0x91,
+    0x31,
+    0x77,
+    0xd3,
+    0x06,
+    0xa5,
+    0xe5,
+    0x1f,
+    0xe2,
+    0xf8,
+    0x92,
+    0xe4,
+    0x23,
+    0x2b,
+    0xf0,
+    0x4c,
+    0xa9,
+    0xa5,
+    0x6c,
+    0x6f,
+    0xaf,
+    0xaf,
+    0xbf,
+    0x97,
+    0xcf,
+    0x46,
+    0xf2,
+    0x8d,
+    0x61,
+    0x0e,
+    0x73,
+    0xcd,
+    0xc5,
+    0xde,
+    0xda,
+    0x50,
+    0x82,
+    0x61,
+    0x6d,
+    0xb1,
+    0xa2,
+    0xbe,
+    0x6b,
+    0x99,
+    0xcd,
+    0x5b,
+    0x99,
+    0x8f,
+    0x66,
+    0xab,
+    0x11,
+    0x78,
+    0xcc,
+    0xdb,
+    0x66,
+    0x98,
+    0xca,
+    0x19,
+    0x92,
+    0xf4,
+    0x05,
+    0xae,
+    0xe6,
+    0xf3,
+    0xe7,
+    0xf0,
+    0x30,
+    0x28,
+    0x31,
+    0x74,
+    0xff,
+    0xe2,
+    0xb3,
+    0x3a,
+    0x4f,
+    0x79,
+    0xe7,
+    0x2a,
+    0x9f,
+    0xe3,
+    0x41,
+    0xb2,
+    0x88,
+    0xc8,
+    0x8f,
+    0x77,
+    0x57,
+    0x42,
+    0x65,
+    0xdb,
+    0x07,
+    0xf6,
+    0x5f,
+    0xb8,
+    0x34,
+    0x17,
+    0xe3,
+    0x8d,
+    0x22,
+    0x5b,
+    0x88,
+    0x94,
+    0x60,
+    0x97,
+    0x32,
+    0x3d,
+    0x8a,
+    0x51,
+    0x9d,
+    0xb5,
+    0xac,
+    0xd7,
+    0x99,
+    0x96,
+    0x23,
+    0x6d,
+    0xc9,
+    0xab,
+    0x61,
+    0x41,
+    0x8f,
+    0x72,
+    0x1b,
+    0xf8,
+    0x84,
+    0xd9,
+    0x57,
+    0x88,
+    0x68,
+    0x3d,
+    0x73,
+    0x5f,
+    0xb1,
+    0x18,
+    0x5c,
+    0x3a,
+    0x35,
+    0xd2,
+    0xc5,
+    0xb7,
+    0x29,
+    0xc7,
+    0x95,
+    0xdd,
+    0x21,
+    0xc0,
+    0x78,
+    0x49,
+    0xf3,
+    0x24,
+    0xe0,
+    0x4c,
+    0x5c,
+    0x32,
+    0x08,
+    0xb7,
+    0x00,
+    0x43,
+    0x70,
+    0x5a,
+    0x95,
+    0x23,
+    0x91,
+    0xf5,
+    0xb7,
+    0x61,
+    0x85,
+    0x6f,
+    0xb3,
+    0xa4,
+    0x6b,
+    0x05,
+    0x9d,
+    0x39,
+    0xa3,
+    0xb1,
+    0x1c,
+    0x61,
+    0xc5,
+    0xa5,
+    0xe7,
+    0x9a,
+    0xe9,
+    0x5d,
+    0xaa,
+    0xca,
+    0x11,
+    0xd8,
+    0x4b,
+    0xa4,
+    0x9c,
+    0x18,
+    0x4e,
+    0x2b,
+    0x2d,
+    0x75,
+    0xc1,
+    0x12,
+    0x20,
+    0xe4,
+    0x66,
+    0xa5,
+    0x59,
+    0x67,
+    0x4b,
+    0xcc,
+    0x52,
+    0x2d,
+    0xfa,
+    0xaa,
+    0xa4,
+    0xe9,
+    0xfc,
+    0x79,
+    0xd7,
+    0xff,
+    0x03,
+    0x3e,
+    0xec,
+    0xba,
+    0x97,
+    0x37,
+    0x52,
+    0xc1,
+    0x57,
+    0x31,
+    0x8e,
+    0x57,
+    0x0c,
+    0x54,
+    0x92,
+    0x9c,
+    0x25,
+    0x5c,
+    0xfa,
+    0x9f,
+    0xa5,
+    0x36,
+    0x18,
+    0xd0,
+    0xaa,
+    0xf3,
+    0x3b,
+    0x5b,
+    0x59,
+    0xbd,
+    0x33,
+    0x5e,
+    0x7d,
+    0x74,
+    0x7c,
+    0xaf,
+    0xe9,
+    0x54,
+    0x80,
+    0xc4,
+    0xb4,
+    0xa1,
+    0x24,
+    0x9e,
+    0x23,
+    0x0d,
+    0xbf,
+    0x4e,
+    0x0f,
+    0xaf,
+    0xa5,
+    0x16,
+    0xcb,
+    0x3b,
+    0xfa,
+    0x33,
+    0xa5,
+    0x68,
+    0xa6,
+    0x64,
+    0x48,
+    0x2f,
+    0x5e,
+    0xfa,
+    0x64,
+    0x4e,
+    0xe3,
+    0x27,
+    0x4f,
+    0x13,
+    0xe6,
+    0x37,
+    0xf6,
+    0xb9,
+    0x63,
+    0x4b,
+    0xdc,
+    0x49,
+    0x3c,
+    0x5e,
+    0x9e,
+    0x06,
+    0xea,
+    0xac,
+    0xa3,
+    0xdf,
+    0x6c,
+    0x49,
+    0xfb,
+    0xa1,
+    0x01,
+    0x4f,
+    0x6f,
+    0x74,
+    0x1f,
+    0xd3,
+    0x26,
+    0xa1,
+    0x92,
+    0x3e,
+    0xe0,
+    0x73,
+    0xd6,
+    0x3b,
+    0x67,
+    0x13,
+    0x53,
+    0x2e,
+    0xcb,
+    0xbc,
+    0x83,
+    0xd0,
+    0x6e,
+    0x28,
+    0xb1,
+    0xcb,
+    0xd9,
+    0x66,
+    0xe0,
+    0x33,
+    0x59,
+    0x45,
+    0xd3,
+    0x13,
+    0xc2,
+    0x48,
+    0xd5,
+    0x9e,
+    0x88,
+    0xba,
+    0x75,
+    0x7b,
+    0xb1,
+    0xfe,
+    0x6f,
+    0xec,
+    0xde,
+    0xff,
+    0x14,
+    0x59,
+    0x75,
+    0xbf,
+    0x1a,
+    0x74,
+    0x47,
+    0xc5,
+    0xd8,
+    0xe8,
+    0x1b,
+    0x3c,
+    0x86,
+    0xd7,
+    0x1f,
+    0x99,
+    0x11,
+    0xd3,
+    0x29,
+    0xfd,
+    0x5d,
+    0x22,
+    0x7e,
+    0x03,
+    0x78,
+    0xed,
+    0x62,
+    0x0e,
+    0xbe,
+    0x6d,
+    0x75,
+    0xf4,
+    0xa8,
+    0x6e,
+    0xc7,
+    0x21,
+    0x76,
+    0xc5,
+    0xa0,
+    0x0c,
+    0xaa,
+    0x58,
+    0x78,
+    0x7e,
+    0x6e,
+    0xfc,
+    0x1e,
+    0x2a,
+    0x1c,
+    0xdd,
+    0xe5,
+    0x78,
+    0x08,
+    0xbd,
+    0xdb,
+    0xea,
+    0x8f,
+    0x8a,
+    0xa5,
+    0xbf,
+    0x93,
+    0xfe,
+    0x0f,
+    0x03,
+    0xa1,
+    0xc8,
+    0x64,
+    0x9f,
+    0x4a,
 
     /* Third Packet: 1-RTT */
-    0x48,               /* Short, 1-RTT, Spin=0, KP=0, PN Length=2 bytes */
-    0x3e, 0x28,         /* PN (0) */
-    0xb9, 0xdb, 0x61, 0xf8, 0x8b, 0x3a, 0xef, 0x26, 0x69, 0xf2, 0x57, 0xc6,
-    0x84, 0x25, 0x6b, 0x77, 0xbe, 0x8c, 0x43, 0x32, 0xf3, 0x9a, 0xd1, 0x85,
-    0x14, 0xbc, 0x89, 0x3b, 0x9c, 0xf3, 0xfc, 0x00, 0xa1, 0x3a, 0xc3, 0xc4,
-    0x1e, 0xdf, 0xd0, 0x11, 0x70, 0xd9, 0x02, 0x7a, 0xd4, 0xef, 0x86, 0x67,
-    0xb1, 0x1e, 0x5d, 0xe3, 0x7f, 0x82, 0x14, 0x52, 0xa5, 0x8a, 0x89, 0xa7,
-    0x98, 0x75, 0x2f, 0x8a, 0x00, 0xf3, 0xbd, 0x49, 0x26, 0x4d, 0x0c, 0xc7,
-    0x38, 0xe7, 0x91, 0x85, 0xc9, 0x21, 0x6a, 0x1c, 0xc4, 0xa3, 0x0e, 0xd8,
-    0xfe, 0xb1, 0x25, 0x1a,
+    0x48, /* Short, 1-RTT, Spin=0, KP=0, PN Length=2 bytes */
+    0x3e,
+    0x28, /* PN (0) */
+    0xb9,
+    0xdb,
+    0x61,
+    0xf8,
+    0x8b,
+    0x3a,
+    0xef,
+    0x26,
+    0x69,
+    0xf2,
+    0x57,
+    0xc6,
+    0x84,
+    0x25,
+    0x6b,
+    0x77,
+    0xbe,
+    0x8c,
+    0x43,
+    0x32,
+    0xf3,
+    0x9a,
+    0xd1,
+    0x85,
+    0x14,
+    0xbc,
+    0x89,
+    0x3b,
+    0x9c,
+    0xf3,
+    0xfc,
+    0x00,
+    0xa1,
+    0x3a,
+    0xc3,
+    0xc4,
+    0x1e,
+    0xdf,
+    0xd0,
+    0x11,
+    0x70,
+    0xd9,
+    0x02,
+    0x7a,
+    0xd4,
+    0xef,
+    0x86,
+    0x67,
+    0xb1,
+    0x1e,
+    0x5d,
+    0xe3,
+    0x7f,
+    0x82,
+    0x14,
+    0x52,
+    0xa5,
+    0x8a,
+    0x89,
+    0xa7,
+    0x98,
+    0x75,
+    0x2f,
+    0x8a,
+    0x00,
+    0xf3,
+    0xbd,
+    0x49,
+    0x26,
+    0x4d,
+    0x0c,
+    0xc7,
+    0x38,
+    0xe7,
+    0x91,
+    0x85,
+    0xc9,
+    0x21,
+    0x6a,
+    0x1c,
+    0xc4,
+    0xa3,
+    0x0e,
+    0xd8,
+    0xfe,
+    0xb1,
+    0x25,
+    0x1a,
 };
 
 static const QUIC_PKT_HDR rx_script_6a_expect_hdr = {
     QUIC_PKT_TYPE_INITIAL,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    1,          /* Version */
-    {0, {0}},                           /* DCID */
-    {4, {0x36, 0xf4, 0x75, 0x2d}},      /* SCID */
-    {0},        /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    1, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 4, { 0x36, 0xf4, 0x75, 0x2d } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     428, NULL
 };
 
 static const unsigned char rx_script_6a_body[] = {
-    0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
-    0x40, 0x5a, 0x02, 0x00, 0x00, 0x56, 0x03, 0x03, 0xc3, 0x45, 0xe8, 0xb8,
-    0xf9, 0x7c, 0x9f, 0x5d, 0xcf, 0x66, 0x25, 0xe4, 0x91, 0x0e, 0xb0, 0x5a,
-    0x14, 0xce, 0xaf, 0xea, 0x83, 0x12, 0xde, 0x68, 0xd9, 0x31, 0xf2, 0x23,
-    0x11, 0x3a, 0x15, 0xcb, 0x00, 0x13, 0x02, 0x00, 0x00, 0x2e, 0x00, 0x2b,
-    0x00, 0x02, 0x03, 0x04, 0x00, 0x33, 0x00, 0x24, 0x00, 0x1d, 0x00, 0x20,
-    0xab, 0xd3, 0xc6, 0x9f, 0x36, 0xd3, 0x52, 0x93, 0x87, 0xee, 0x92, 0x01,
-    0xa2, 0xd6, 0x9a, 0x5e, 0x61, 0x43, 0xcc, 0x4a, 0xcc, 0x7a, 0xcd, 0x83,
-    0xb2, 0xd9, 0xad, 0xd1, 0x14, 0xdc, 0x84, 0x61,
+    0x02,
+    0x03,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x06,
+    0x00,
+    0x40,
+    0x5a,
+    0x02,
+    0x00,
+    0x00,
+    0x56,
+    0x03,
+    0x03,
+    0xc3,
+    0x45,
+    0xe8,
+    0xb8,
+    0xf9,
+    0x7c,
+    0x9f,
+    0x5d,
+    0xcf,
+    0x66,
+    0x25,
+    0xe4,
+    0x91,
+    0x0e,
+    0xb0,
+    0x5a,
+    0x14,
+    0xce,
+    0xaf,
+    0xea,
+    0x83,
+    0x12,
+    0xde,
+    0x68,
+    0xd9,
+    0x31,
+    0xf2,
+    0x23,
+    0x11,
+    0x3a,
+    0x15,
+    0xcb,
+    0x00,
+    0x13,
+    0x02,
+    0x00,
+    0x00,
+    0x2e,
+    0x00,
+    0x2b,
+    0x00,
+    0x02,
+    0x03,
+    0x04,
+    0x00,
+    0x33,
+    0x00,
+    0x24,
+    0x00,
+    0x1d,
+    0x00,
+    0x20,
+    0xab,
+    0xd3,
+    0xc6,
+    0x9f,
+    0x36,
+    0xd3,
+    0x52,
+    0x93,
+    0x87,
+    0xee,
+    0x92,
+    0x01,
+    0xa2,
+    0xd6,
+    0x9a,
+    0x5e,
+    0x61,
+    0x43,
+    0xcc,
+    0x4a,
+    0xcc,
+    0x7a,
+    0xcd,
+    0x83,
+    0xb2,
+    0xd9,
+    0xad,
+    0xd1,
+    0x14,
+    0xdc,
+    0x84,
+    0x61,
 };
 
 static const QUIC_PKT_HDR rx_script_6b_expect_hdr = {
     QUIC_PKT_TYPE_HANDSHAKE,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    1,          /* Version */
-    {0, {0}},                           /* DCID */
-    {4, {0x36, 0xf4, 0x75, 0x2d}},      /* SCID */
-    {0},        /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    1, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 4, { 0x36, 0xf4, 0x75, 0x2d } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     670, NULL
 };
 
 static const unsigned char rx_script_6b_body[] = {
-    0x06, 0x00, 0x42, 0x9a, 0x08, 0x00, 0x00, 0x80, 0x00, 0x7e, 0x00, 0x10,
-    0x00, 0x08, 0x00, 0x06, 0x05, 0x64, 0x75, 0x6d, 0x6d, 0x79, 0x00, 0x39,
-    0x00, 0x6e, 0x47, 0xfa, 0x05, 0x5a, 0xe0, 0xec, 0x4a, 0xf3, 0x05, 0x04,
-    0x80, 0x08, 0x00, 0x00, 0x06, 0x04, 0x80, 0x08, 0x00, 0x00, 0x07, 0x04,
-    0x80, 0x08, 0x00, 0x00, 0x04, 0x04, 0x80, 0x0c, 0x00, 0x00, 0x08, 0x02,
-    0x40, 0x64, 0x09, 0x02, 0x40, 0x64, 0x01, 0x04, 0x80, 0x00, 0x75, 0x30,
-    0x03, 0x02, 0x45, 0xac, 0x0b, 0x01, 0x1a, 0x0c, 0x00, 0x02, 0x10, 0x35,
-    0xd7, 0x7d, 0x8b, 0xc5, 0xb1, 0x89, 0xb1, 0x5c, 0x23, 0x74, 0x50, 0xfd,
-    0x47, 0xfe, 0xd2, 0x00, 0x11, 0x96, 0x38, 0x27, 0xde, 0x7d, 0xfb, 0x2b,
-    0x38, 0x56, 0xe5, 0x2a, 0xb8, 0x6b, 0xfa, 0xaa, 0xde, 0x81, 0x0e, 0x01,
-    0x04, 0x0f, 0x04, 0x36, 0xf4, 0x75, 0x2d, 0x10, 0x04, 0xac, 0x88, 0x95,
-    0xbd, 0x20, 0x01, 0x00, 0x0b, 0x00, 0x01, 0x8f, 0x00, 0x00, 0x01, 0x8b,
-    0x00, 0x01, 0x86, 0x30, 0x82, 0x01, 0x82, 0x30, 0x82, 0x01, 0x29, 0xa0,
-    0x03, 0x02, 0x01, 0x02, 0x02, 0x14, 0x0a, 0x73, 0x0f, 0x86, 0x18, 0xf2,
-    0xc3, 0x30, 0x01, 0xd2, 0xc0, 0xc1, 0x62, 0x52, 0x13, 0xf1, 0x9c, 0x13,
-    0x39, 0xb5, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04,
-    0x03, 0x02, 0x30, 0x17, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04,
-    0x03, 0x0c, 0x0c, 0x6d, 0x61, 0x70, 0x61, 0x6b, 0x74, 0x2e, 0x6c, 0x6f,
-    0x63, 0x61, 0x6c, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x32, 0x30, 0x38, 0x30,
-    0x32, 0x31, 0x32, 0x30, 0x30, 0x31, 0x38, 0x5a, 0x17, 0x0d, 0x32, 0x32,
-    0x30, 0x39, 0x30, 0x31, 0x31, 0x32, 0x30, 0x30, 0x31, 0x38, 0x5a, 0x30,
-    0x17, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x0c,
-    0x6d, 0x61, 0x70, 0x61, 0x6b, 0x74, 0x2e, 0x6c, 0x6f, 0x63, 0x61, 0x6c,
-    0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02,
-    0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x03,
-    0x42, 0x00, 0x04, 0x67, 0xf4, 0xd3, 0x8f, 0x15, 0x6d, 0xee, 0x85, 0xcc,
-    0x2a, 0x77, 0xfc, 0x0b, 0x8f, 0x9f, 0xcf, 0xa9, 0x95, 0x5d, 0x5b, 0xcd,
-    0xb7, 0x8b, 0xba, 0x31, 0x0a, 0x73, 0x62, 0xc5, 0xd0, 0x0e, 0x07, 0x90,
-    0xae, 0x38, 0x43, 0x79, 0xce, 0x5e, 0x33, 0xad, 0x31, 0xbf, 0x9f, 0x2a,
-    0x56, 0x83, 0xa5, 0x24, 0x16, 0xab, 0x0c, 0xf1, 0x64, 0xbe, 0xe4, 0x93,
-    0xb5, 0x89, 0xd6, 0x05, 0xe4, 0xf7, 0x7b, 0xa3, 0x53, 0x30, 0x51, 0x30,
-    0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14, 0x02, 0x64,
-    0x0f, 0x55, 0x69, 0x14, 0x91, 0x19, 0xed, 0xf9, 0x1a, 0xe9, 0x1d, 0xa5,
-    0x5a, 0xd0, 0x48, 0x96, 0x9f, 0x60, 0x30, 0x1f, 0x06, 0x03, 0x55, 0x1d,
-    0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x02, 0x64, 0x0f, 0x55, 0x69,
-    0x14, 0x91, 0x19, 0xed, 0xf9, 0x1a, 0xe9, 0x1d, 0xa5, 0x5a, 0xd0, 0x48,
-    0x96, 0x9f, 0x60, 0x30, 0x0f, 0x06, 0x03, 0x55, 0x1d, 0x13, 0x01, 0x01,
-    0xff, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xff, 0x30, 0x0a, 0x06, 0x08,
-    0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47, 0x00, 0x30,
-    0x44, 0x02, 0x20, 0x0a, 0x82, 0x92, 0x6e, 0xd3, 0xc6, 0x66, 0xd9, 0xd3,
-    0x75, 0xff, 0x71, 0x3b, 0x61, 0x46, 0x21, 0x00, 0xe6, 0x21, 0x5d, 0x9c,
-    0x86, 0xe9, 0x65, 0x40, 0x4f, 0xeb, 0x70, 0x4f, 0x2c, 0xad, 0x00, 0x02,
-    0x20, 0x08, 0xc2, 0x07, 0x5d, 0x16, 0xfc, 0x54, 0x34, 0x2b, 0xb4, 0x18,
-    0x67, 0x44, 0x81, 0xc9, 0xa9, 0x67, 0x2e, 0xce, 0xa1, 0x02, 0x9f, 0x3b,
-    0xe5, 0x61, 0x16, 0x0b, 0x50, 0xf6, 0xa1, 0x50, 0x94, 0x00, 0x00, 0x0f,
-    0x00, 0x00, 0x4b, 0x04, 0x03, 0x00, 0x47, 0x30, 0x45, 0x02, 0x20, 0x78,
-    0x9e, 0xe0, 0x6a, 0x7a, 0xbd, 0xc3, 0x84, 0x3d, 0x25, 0x6a, 0x59, 0x23,
-    0x97, 0x52, 0x64, 0x4e, 0xb6, 0x9f, 0xcc, 0xd3, 0xd7, 0xa9, 0x29, 0x44,
-    0x75, 0x6d, 0x50, 0xfc, 0x22, 0xde, 0xd3, 0x02, 0x21, 0x00, 0xe5, 0x28,
-    0xd6, 0x5a, 0xd1, 0xec, 0x4a, 0xcc, 0x20, 0xb4, 0xea, 0x15, 0xfb, 0x8e,
-    0x73, 0xa8, 0x6b, 0xbb, 0x42, 0x70, 0x90, 0x08, 0x6e, 0x74, 0x6f, 0x5a,
-    0x05, 0xb5, 0x39, 0xee, 0x01, 0x04, 0x14, 0x00, 0x00, 0x30, 0xff, 0x9f,
-    0xb2, 0x1d, 0xcb, 0x4f, 0xfc, 0x7a, 0xac, 0xf4, 0x75, 0x24, 0x83, 0x5f,
-    0x8d, 0xa3, 0x3e, 0x9d, 0xef, 0x43, 0x67, 0x89, 0x5d, 0x55, 0xc7, 0xce,
-    0x80, 0xab, 0xc3, 0xc7, 0x74, 0xc7, 0xb2, 0x91, 0x27, 0xce, 0xd8, 0x5e,
-    0xc4, 0x4e, 0x96, 0x19, 0x68, 0x2d, 0xbe, 0x6f, 0x49, 0xfa,
+    0x06,
+    0x00,
+    0x42,
+    0x9a,
+    0x08,
+    0x00,
+    0x00,
+    0x80,
+    0x00,
+    0x7e,
+    0x00,
+    0x10,
+    0x00,
+    0x08,
+    0x00,
+    0x06,
+    0x05,
+    0x64,
+    0x75,
+    0x6d,
+    0x6d,
+    0x79,
+    0x00,
+    0x39,
+    0x00,
+    0x6e,
+    0x47,
+    0xfa,
+    0x05,
+    0x5a,
+    0xe0,
+    0xec,
+    0x4a,
+    0xf3,
+    0x05,
+    0x04,
+    0x80,
+    0x08,
+    0x00,
+    0x00,
+    0x06,
+    0x04,
+    0x80,
+    0x08,
+    0x00,
+    0x00,
+    0x07,
+    0x04,
+    0x80,
+    0x08,
+    0x00,
+    0x00,
+    0x04,
+    0x04,
+    0x80,
+    0x0c,
+    0x00,
+    0x00,
+    0x08,
+    0x02,
+    0x40,
+    0x64,
+    0x09,
+    0x02,
+    0x40,
+    0x64,
+    0x01,
+    0x04,
+    0x80,
+    0x00,
+    0x75,
+    0x30,
+    0x03,
+    0x02,
+    0x45,
+    0xac,
+    0x0b,
+    0x01,
+    0x1a,
+    0x0c,
+    0x00,
+    0x02,
+    0x10,
+    0x35,
+    0xd7,
+    0x7d,
+    0x8b,
+    0xc5,
+    0xb1,
+    0x89,
+    0xb1,
+    0x5c,
+    0x23,
+    0x74,
+    0x50,
+    0xfd,
+    0x47,
+    0xfe,
+    0xd2,
+    0x00,
+    0x11,
+    0x96,
+    0x38,
+    0x27,
+    0xde,
+    0x7d,
+    0xfb,
+    0x2b,
+    0x38,
+    0x56,
+    0xe5,
+    0x2a,
+    0xb8,
+    0x6b,
+    0xfa,
+    0xaa,
+    0xde,
+    0x81,
+    0x0e,
+    0x01,
+    0x04,
+    0x0f,
+    0x04,
+    0x36,
+    0xf4,
+    0x75,
+    0x2d,
+    0x10,
+    0x04,
+    0xac,
+    0x88,
+    0x95,
+    0xbd,
+    0x20,
+    0x01,
+    0x00,
+    0x0b,
+    0x00,
+    0x01,
+    0x8f,
+    0x00,
+    0x00,
+    0x01,
+    0x8b,
+    0x00,
+    0x01,
+    0x86,
+    0x30,
+    0x82,
+    0x01,
+    0x82,
+    0x30,
+    0x82,
+    0x01,
+    0x29,
+    0xa0,
+    0x03,
+    0x02,
+    0x01,
+    0x02,
+    0x02,
+    0x14,
+    0x0a,
+    0x73,
+    0x0f,
+    0x86,
+    0x18,
+    0xf2,
+    0xc3,
+    0x30,
+    0x01,
+    0xd2,
+    0xc0,
+    0xc1,
+    0x62,
+    0x52,
+    0x13,
+    0xf1,
+    0x9c,
+    0x13,
+    0x39,
+    0xb5,
+    0x30,
+    0x0a,
+    0x06,
+    0x08,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x04,
+    0x03,
+    0x02,
+    0x30,
+    0x17,
+    0x31,
+    0x15,
+    0x30,
+    0x13,
+    0x06,
+    0x03,
+    0x55,
+    0x04,
+    0x03,
+    0x0c,
+    0x0c,
+    0x6d,
+    0x61,
+    0x70,
+    0x61,
+    0x6b,
+    0x74,
+    0x2e,
+    0x6c,
+    0x6f,
+    0x63,
+    0x61,
+    0x6c,
+    0x30,
+    0x1e,
+    0x17,
+    0x0d,
+    0x32,
+    0x32,
+    0x30,
+    0x38,
+    0x30,
+    0x32,
+    0x31,
+    0x32,
+    0x30,
+    0x30,
+    0x31,
+    0x38,
+    0x5a,
+    0x17,
+    0x0d,
+    0x32,
+    0x32,
+    0x30,
+    0x39,
+    0x30,
+    0x31,
+    0x31,
+    0x32,
+    0x30,
+    0x30,
+    0x31,
+    0x38,
+    0x5a,
+    0x30,
+    0x17,
+    0x31,
+    0x15,
+    0x30,
+    0x13,
+    0x06,
+    0x03,
+    0x55,
+    0x04,
+    0x03,
+    0x0c,
+    0x0c,
+    0x6d,
+    0x61,
+    0x70,
+    0x61,
+    0x6b,
+    0x74,
+    0x2e,
+    0x6c,
+    0x6f,
+    0x63,
+    0x61,
+    0x6c,
+    0x30,
+    0x59,
+    0x30,
+    0x13,
+    0x06,
+    0x07,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x02,
+    0x01,
+    0x06,
+    0x08,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x03,
+    0x01,
+    0x07,
+    0x03,
+    0x42,
+    0x00,
+    0x04,
+    0x67,
+    0xf4,
+    0xd3,
+    0x8f,
+    0x15,
+    0x6d,
+    0xee,
+    0x85,
+    0xcc,
+    0x2a,
+    0x77,
+    0xfc,
+    0x0b,
+    0x8f,
+    0x9f,
+    0xcf,
+    0xa9,
+    0x95,
+    0x5d,
+    0x5b,
+    0xcd,
+    0xb7,
+    0x8b,
+    0xba,
+    0x31,
+    0x0a,
+    0x73,
+    0x62,
+    0xc5,
+    0xd0,
+    0x0e,
+    0x07,
+    0x90,
+    0xae,
+    0x38,
+    0x43,
+    0x79,
+    0xce,
+    0x5e,
+    0x33,
+    0xad,
+    0x31,
+    0xbf,
+    0x9f,
+    0x2a,
+    0x56,
+    0x83,
+    0xa5,
+    0x24,
+    0x16,
+    0xab,
+    0x0c,
+    0xf1,
+    0x64,
+    0xbe,
+    0xe4,
+    0x93,
+    0xb5,
+    0x89,
+    0xd6,
+    0x05,
+    0xe4,
+    0xf7,
+    0x7b,
+    0xa3,
+    0x53,
+    0x30,
+    0x51,
+    0x30,
+    0x1d,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x0e,
+    0x04,
+    0x16,
+    0x04,
+    0x14,
+    0x02,
+    0x64,
+    0x0f,
+    0x55,
+    0x69,
+    0x14,
+    0x91,
+    0x19,
+    0xed,
+    0xf9,
+    0x1a,
+    0xe9,
+    0x1d,
+    0xa5,
+    0x5a,
+    0xd0,
+    0x48,
+    0x96,
+    0x9f,
+    0x60,
+    0x30,
+    0x1f,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x23,
+    0x04,
+    0x18,
+    0x30,
+    0x16,
+    0x80,
+    0x14,
+    0x02,
+    0x64,
+    0x0f,
+    0x55,
+    0x69,
+    0x14,
+    0x91,
+    0x19,
+    0xed,
+    0xf9,
+    0x1a,
+    0xe9,
+    0x1d,
+    0xa5,
+    0x5a,
+    0xd0,
+    0x48,
+    0x96,
+    0x9f,
+    0x60,
+    0x30,
+    0x0f,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x13,
+    0x01,
+    0x01,
+    0xff,
+    0x04,
+    0x05,
+    0x30,
+    0x03,
+    0x01,
+    0x01,
+    0xff,
+    0x30,
+    0x0a,
+    0x06,
+    0x08,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x04,
+    0x03,
+    0x02,
+    0x03,
+    0x47,
+    0x00,
+    0x30,
+    0x44,
+    0x02,
+    0x20,
+    0x0a,
+    0x82,
+    0x92,
+    0x6e,
+    0xd3,
+    0xc6,
+    0x66,
+    0xd9,
+    0xd3,
+    0x75,
+    0xff,
+    0x71,
+    0x3b,
+    0x61,
+    0x46,
+    0x21,
+    0x00,
+    0xe6,
+    0x21,
+    0x5d,
+    0x9c,
+    0x86,
+    0xe9,
+    0x65,
+    0x40,
+    0x4f,
+    0xeb,
+    0x70,
+    0x4f,
+    0x2c,
+    0xad,
+    0x00,
+    0x02,
+    0x20,
+    0x08,
+    0xc2,
+    0x07,
+    0x5d,
+    0x16,
+    0xfc,
+    0x54,
+    0x34,
+    0x2b,
+    0xb4,
+    0x18,
+    0x67,
+    0x44,
+    0x81,
+    0xc9,
+    0xa9,
+    0x67,
+    0x2e,
+    0xce,
+    0xa1,
+    0x02,
+    0x9f,
+    0x3b,
+    0xe5,
+    0x61,
+    0x16,
+    0x0b,
+    0x50,
+    0xf6,
+    0xa1,
+    0x50,
+    0x94,
+    0x00,
+    0x00,
+    0x0f,
+    0x00,
+    0x00,
+    0x4b,
+    0x04,
+    0x03,
+    0x00,
+    0x47,
+    0x30,
+    0x45,
+    0x02,
+    0x20,
+    0x78,
+    0x9e,
+    0xe0,
+    0x6a,
+    0x7a,
+    0xbd,
+    0xc3,
+    0x84,
+    0x3d,
+    0x25,
+    0x6a,
+    0x59,
+    0x23,
+    0x97,
+    0x52,
+    0x64,
+    0x4e,
+    0xb6,
+    0x9f,
+    0xcc,
+    0xd3,
+    0xd7,
+    0xa9,
+    0x29,
+    0x44,
+    0x75,
+    0x6d,
+    0x50,
+    0xfc,
+    0x22,
+    0xde,
+    0xd3,
+    0x02,
+    0x21,
+    0x00,
+    0xe5,
+    0x28,
+    0xd6,
+    0x5a,
+    0xd1,
+    0xec,
+    0x4a,
+    0xcc,
+    0x20,
+    0xb4,
+    0xea,
+    0x15,
+    0xfb,
+    0x8e,
+    0x73,
+    0xa8,
+    0x6b,
+    0xbb,
+    0x42,
+    0x70,
+    0x90,
+    0x08,
+    0x6e,
+    0x74,
+    0x6f,
+    0x5a,
+    0x05,
+    0xb5,
+    0x39,
+    0xee,
+    0x01,
+    0x04,
+    0x14,
+    0x00,
+    0x00,
+    0x30,
+    0xff,
+    0x9f,
+    0xb2,
+    0x1d,
+    0xcb,
+    0x4f,
+    0xfc,
+    0x7a,
+    0xac,
+    0xf4,
+    0x75,
+    0x24,
+    0x83,
+    0x5f,
+    0x8d,
+    0xa3,
+    0x3e,
+    0x9d,
+    0xef,
+    0x43,
+    0x67,
+    0x89,
+    0x5d,
+    0x55,
+    0xc7,
+    0xce,
+    0x80,
+    0xab,
+    0xc3,
+    0xc7,
+    0x74,
+    0xc7,
+    0xb2,
+    0x91,
+    0x27,
+    0xce,
+    0xd8,
+    0x5e,
+    0xc4,
+    0x4e,
+    0x96,
+    0x19,
+    0x68,
+    0x2d,
+    0xbe,
+    0x6f,
+    0x49,
+    0xfa,
 };
 
 static const QUIC_PKT_HDR rx_script_6c_expect_hdr = {
     QUIC_PKT_TYPE_1RTT,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    0,          /* Version */
-    {0, {0}},                           /* DCID */
-    {0, {0}},                           /* SCID */
-    {0},        /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    0, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     72, NULL
 };
 
 static const unsigned char rx_script_6c_body[] = {
-    0x18, 0x03, 0x00, 0x04, 0xf2, 0x94, 0x49, 0xc3, 0x34, 0xa1, 0xf4, 0x0f,
-    0xcb, 0xb8, 0x03, 0x04, 0x1f, 0xc8, 0x69, 0xb9, 0x3b, 0xd5, 0xc6, 0x93,
-    0x18, 0x02, 0x00, 0x04, 0x9a, 0x4f, 0xec, 0x52, 0xde, 0xd2, 0xc8, 0xb7,
-    0x1c, 0x0c, 0xf3, 0x4e, 0x46, 0xf0, 0x6c, 0x54, 0x34, 0x1b, 0x0d, 0x98,
-    0x18, 0x01, 0x00, 0x04, 0xe3, 0x33, 0x9e, 0x59, 0x00, 0x69, 0xc3, 0xac,
-    0xfc, 0x58, 0x0e, 0xa4, 0xf4, 0xf3, 0x23, 0x1b, 0xd6, 0x8e, 0x5b, 0x08,
+    0x18,
+    0x03,
+    0x00,
+    0x04,
+    0xf2,
+    0x94,
+    0x49,
+    0xc3,
+    0x34,
+    0xa1,
+    0xf4,
+    0x0f,
+    0xcb,
+    0xb8,
+    0x03,
+    0x04,
+    0x1f,
+    0xc8,
+    0x69,
+    0xb9,
+    0x3b,
+    0xd5,
+    0xc6,
+    0x93,
+    0x18,
+    0x02,
+    0x00,
+    0x04,
+    0x9a,
+    0x4f,
+    0xec,
+    0x52,
+    0xde,
+    0xd2,
+    0xc8,
+    0xb7,
+    0x1c,
+    0x0c,
+    0xf3,
+    0x4e,
+    0x46,
+    0xf0,
+    0x6c,
+    0x54,
+    0x34,
+    0x1b,
+    0x0d,
+    0x98,
+    0x18,
+    0x01,
+    0x00,
+    0x04,
+    0xe3,
+    0x33,
+    0x9e,
+    0x59,
+    0x00,
+    0x69,
+    0xc3,
+    0xac,
+    0xfc,
+    0x58,
+    0x0e,
+    0xa4,
+    0xf4,
+    0xf3,
+    0x23,
+    0x1b,
+    0xd6,
+    0x8e,
+    0x5b,
+    0x08,
 };
 
 static const struct rx_test_op rx_script_6[] = {
     RX_OP_ALLOW_1RTT()
-    RX_OP_SET_RX_DCID(empty_conn_id)
-    RX_OP_PROVIDE_SECRET_INITIAL(rx_script_6_c2s_init_dcid)
-    RX_OP_INJECT_N(6)
-    RX_OP_CHECK_PKT_N(6a)
-    RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
+        RX_OP_SET_RX_DCID(empty_conn_id)
+            RX_OP_PROVIDE_SECRET_INITIAL(rx_script_6_c2s_init_dcid)
+                RX_OP_INJECT_N(6)
+                    RX_OP_CHECK_PKT_N(6a)
+                        RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
     RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE,
-                      QRL_SUITE_AES256GCM, rx_script_6_handshake_secret)
-    RX_OP_CHECK_PKT_N(6b)
-    RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
+        QRL_SUITE_AES256GCM, rx_script_6_handshake_secret)
+        RX_OP_CHECK_PKT_N(6b)
+            RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
     RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT,
-                      QRL_SUITE_AES256GCM, rx_script_6_1rtt_secret)
-    RX_OP_CHECK_PKT_N(6c)
-    RX_OP_CHECK_NO_PKT()
+        QRL_SUITE_AES256GCM, rx_script_6_1rtt_secret)
+        RX_OP_CHECK_PKT_N(6c)
+            RX_OP_CHECK_NO_PKT()
 
     /* Discard Initial EL and try injecting the packet again */
     RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_INITIAL)
-    RX_OP_INJECT_N(6)
+        RX_OP_INJECT_N(6)
     /* Initial packet is not output because we have discarded Initial keys */
     RX_OP_CHECK_PKT_N(6b)
-    RX_OP_CHECK_PKT_N(6c)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_CHECK_PKT_N(6c)
+            RX_OP_CHECK_NO_PKT()
     /* Try again with discarded keys */
     RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_HANDSHAKE)
-    RX_OP_INJECT_N(6)
-    RX_OP_CHECK_PKT_N(6c)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_INJECT_N(6)
+            RX_OP_CHECK_PKT_N(6c)
+                RX_OP_CHECK_NO_PKT()
     /* Try again */
     RX_OP_INJECT_N(6)
-    RX_OP_CHECK_PKT_N(6c)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_CHECK_PKT_N(6c)
+            RX_OP_CHECK_NO_PKT()
     /* Try again with discarded 1-RTT keys */
     RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_1RTT)
-    RX_OP_INJECT_N(6)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_INJECT_N(6)
+            RX_OP_CHECK_NO_PKT()
 
     /* Recreate QRL, test reading packets received before key */
     RX_OP_SET_SCID_LEN(0)
-    RX_OP_SET_RX_DCID(empty_conn_id)
-    RX_OP_INJECT_N(6)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_PROVIDE_SECRET_INITIAL(rx_script_6_c2s_init_dcid)
-    RX_OP_CHECK_PKT_N(6a)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE,
-                      QRL_SUITE_AES256GCM, rx_script_6_handshake_secret)
-    RX_OP_CHECK_PKT_N(6b)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT,
-                      QRL_SUITE_AES256GCM, rx_script_6_1rtt_secret)
-    RX_OP_CHECK_PKT_N(6c)
-    RX_OP_CHECK_NO_PKT()
-
-    RX_OP_END
+        RX_OP_SET_RX_DCID(empty_conn_id)
+            RX_OP_INJECT_N(6)
+                RX_OP_CHECK_NO_PKT()
+                    RX_OP_PROVIDE_SECRET_INITIAL(rx_script_6_c2s_init_dcid)
+                        RX_OP_CHECK_PKT_N(6a)
+                            RX_OP_CHECK_NO_PKT()
+                                RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE,
+                                    QRL_SUITE_AES256GCM, rx_script_6_handshake_secret)
+                                    RX_OP_CHECK_PKT_N(6b)
+                                        RX_OP_CHECK_NO_PKT()
+                                            RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT,
+                                                QRL_SUITE_AES256GCM, rx_script_6_1rtt_secret)
+                                                RX_OP_CHECK_PKT_N(6c)
+                                                    RX_OP_CHECK_NO_PKT()
+
+                                                        RX_OP_END
 };
 
 /*
@@ -1022,361 +5661,2624 @@ static const struct rx_test_op rx_script_6[] = {
  */
 #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
 static const QUIC_CONN_ID rx_script_7_c2s_init_dcid = {
-    4, {0xfa, 0x5d, 0xd6, 0x80}
+    4, { 0xfa, 0x5d, 0xd6, 0x80 }
 };
 
 static const unsigned char rx_script_7_handshake_secret[32] = {
-    0x85, 0x44, 0xa4, 0x02, 0x46, 0x5b, 0x2a, 0x92, 0x80, 0x71, 0xfd, 0x11,
-    0x89, 0x73, 0x84, 0xeb, 0x3e, 0x0d, 0x89, 0x4f, 0x71, 0xdc, 0x9c, 0xdd,
-    0x55, 0x77, 0x9e, 0x79, 0x7b, 0xeb, 0xfa, 0x86,
+    0x85,
+    0x44,
+    0xa4,
+    0x02,
+    0x46,
+    0x5b,
+    0x2a,
+    0x92,
+    0x80,
+    0x71,
+    0xfd,
+    0x11,
+    0x89,
+    0x73,
+    0x84,
+    0xeb,
+    0x3e,
+    0x0d,
+    0x89,
+    0x4f,
+    0x71,
+    0xdc,
+    0x9c,
+    0xdd,
+    0x55,
+    0x77,
+    0x9e,
+    0x79,
+    0x7b,
+    0xeb,
+    0xfa,
+    0x86,
 };
 
 static const unsigned char rx_script_7_1rtt_secret[32] = {
-    0x4a, 0x77, 0xb6, 0x0e, 0xfd, 0x90, 0xca, 0xbf, 0xc0, 0x1a, 0x64, 0x9f,
-    0xc0, 0x03, 0xd3, 0x8d, 0xc5, 0x41, 0x04, 0x50, 0xb1, 0x5b, 0x74, 0xe7,
-    0xe3, 0x99, 0x0c, 0xdf, 0x74, 0x61, 0x35, 0xe6,
+    0x4a,
+    0x77,
+    0xb6,
+    0x0e,
+    0xfd,
+    0x90,
+    0xca,
+    0xbf,
+    0xc0,
+    0x1a,
+    0x64,
+    0x9f,
+    0xc0,
+    0x03,
+    0xd3,
+    0x8d,
+    0xc5,
+    0x41,
+    0x04,
+    0x50,
+    0xb1,
+    0x5b,
+    0x74,
+    0xe7,
+    0xe3,
+    0x99,
+    0x0c,
+    0xdf,
+    0x74,
+    0x61,
+    0x35,
+    0xe6,
 };
 
 static const unsigned char rx_script_7_in[] = {
     /* First Packet: Initial */
-    0xc2,                           /* Long, Initial, PN Length=2 bytes */
-    0x00, 0x00, 0x00, 0x01,         /* Version */
-    0x00,                           /* DCID */
-    0x04, 0x03, 0x45, 0x0c, 0x7a,   /* SCID */
-    0x00,                           /* Token Length */
-    0x41, 0xcb,                     /* Length (459) */
-    0x3c, 0xe0,                     /* PN (0) */
-    0x85, 0x05, 0xc2, 0x4d, 0x0f, 0xf3, 0x62, 0x51, 0x04, 0x33, 0xfa, 0xb5,
-    0xa3, 0x02, 0xbd, 0x5c, 0x22, 0x0c, 0x1d, 0xda, 0x06, 0xf1, 0xd7, 0xe0,
-    0xc8, 0x56, 0xb0, 0x3d, 0xc1, 0x49, 0x8c, 0xc2, 0x88, 0x5a, 0x0e, 0xd5,
-    0x67, 0x72, 0xec, 0xcc, 0x7a, 0x2b, 0x46, 0x17, 0x49, 0x4b, 0x28, 0x6a,
-    0x89, 0x71, 0xfd, 0x31, 0x9a, 0xa1, 0x97, 0x64, 0xe2, 0xbf, 0xa0, 0x6d,
-    0xf6, 0x76, 0x83, 0x28, 0xc4, 0xd5, 0x39, 0x87, 0x22, 0x7c, 0x11, 0x9a,
-    0x53, 0x66, 0xb4, 0x27, 0xf1, 0xab, 0x6f, 0x49, 0x43, 0x3f, 0x9a, 0x23,
-    0xd3, 0x53, 0x06, 0xe8, 0x14, 0xfd, 0xc0, 0x67, 0x1f, 0x88, 0x2a, 0xa8,
-    0xae, 0x5f, 0x05, 0x0a, 0xeb, 0x66, 0x72, 0x8c, 0x46, 0xcc, 0x54, 0x21,
-    0x5e, 0x14, 0xfe, 0x68, 0xc7, 0xf7, 0x60, 0x67, 0xb5, 0xa7, 0x0d, 0xf4,
-    0xe1, 0xff, 0x60, 0xe3, 0x11, 0x38, 0x92, 0x90, 0xc2, 0x48, 0x28, 0xbf,
-    0xf3, 0x85, 0x27, 0xfe, 0xbf, 0x42, 0x26, 0x1a, 0x4e, 0x78, 0xf1, 0xf0,
-    0x88, 0x16, 0x1b, 0x64, 0x5f, 0x66, 0x02, 0x0b, 0x45, 0x3d, 0x38, 0xd9,
-    0x09, 0xd5, 0xff, 0xc2, 0x68, 0x02, 0x2c, 0xc4, 0x3f, 0x60, 0x6e, 0x2f,
-    0x7f, 0x43, 0xf7, 0x1a, 0x37, 0xcc, 0xe0, 0xe0, 0x4b, 0x96, 0xc1, 0xb1,
-    0x8b, 0x1c, 0x7c, 0x6e, 0x80, 0xe3, 0x92, 0x9b, 0x86, 0x87, 0x1f, 0x9a,
-    0x6a, 0x62, 0x18, 0xf4, 0x86, 0xc2, 0x3e, 0x33, 0xa3, 0xbf, 0x43, 0x96,
-    0x6e, 0xff, 0x94, 0xaf, 0x6d, 0x23, 0x5c, 0x42, 0xed, 0xe7, 0xb9, 0x2c,
-    0x33, 0xb0, 0xc6, 0x3d, 0x44, 0x00, 0x0b, 0xa3, 0x39, 0xa8, 0xeb, 0x8c,
-    0x81, 0x1a, 0x99, 0x20, 0xbd, 0xfa, 0xf3, 0xf4, 0xf0, 0x11, 0xd8, 0x41,
-    0x31, 0x8d, 0xdc, 0x0d, 0x00, 0xa6, 0x31, 0x40, 0xc6, 0xc6, 0xad, 0x74,
-    0x93, 0x62, 0x1c, 0x55, 0xce, 0x5f, 0x8c, 0x5b, 0x3c, 0xcb, 0x25, 0x5e,
-    0xbf, 0xed, 0xbb, 0x3c, 0x97, 0x4b, 0x62, 0xe0, 0xba, 0xf1, 0xb0, 0x30,
-    0xbf, 0x35, 0x89, 0x7e, 0x25, 0x61, 0x54, 0x86, 0x52, 0x11, 0x86, 0x90,
-    0xc3, 0xf5, 0xad, 0xa0, 0x96, 0x30, 0xb2, 0xf0, 0xa6, 0x79, 0x39, 0x1c,
-    0x51, 0x42, 0xa1, 0x00, 0x6f, 0x55, 0x7d, 0xdc, 0xd0, 0x7c, 0xcf, 0x01,
-    0x88, 0x03, 0xd7, 0x2d, 0x65, 0x2b, 0x40, 0xee, 0xba, 0x10, 0xd8, 0x0c,
-    0x85, 0x14, 0xb7, 0x4d, 0x9e, 0x7d, 0x7c, 0xde, 0x7f, 0x0d, 0x0e, 0x3b,
-    0x3d, 0xe3, 0xd3, 0x63, 0xc2, 0xed, 0xc7, 0x41, 0xaf, 0x05, 0x85, 0x87,
-    0x46, 0x55, 0x7e, 0xbe, 0x14, 0x5b, 0x98, 0xae, 0x6e, 0x67, 0x1a, 0x65,
-    0xc6, 0xcf, 0xe1, 0x28, 0x50, 0x6b, 0xb4, 0xf6, 0xba, 0x63, 0xbc, 0xf1,
-    0xd7, 0xa4, 0x97, 0x2d, 0x4d, 0x04, 0x26, 0x96, 0xec, 0x0c, 0xd4, 0xae,
-    0x6a, 0xca, 0x7e, 0x65, 0xc5, 0x43, 0x7e, 0xf8, 0x77, 0x61, 0xd0, 0x2c,
-    0xe5, 0x37, 0x0a, 0xb3, 0x7a, 0x8c, 0x2a, 0xa1, 0xdc, 0x29, 0xdb, 0xec,
-    0xca, 0xdc, 0xfe, 0xdd, 0x38, 0xd2, 0x13, 0x9f, 0x94, 0x6d, 0x5b, 0x87,
-    0xf3, 0x15, 0xa8, 0xe5, 0xe9, 0x65, 0x1d, 0x4f, 0x92, 0x1b, 0xf4, 0xa6,
-    0xa4, 0xd6, 0x22, 0xfc, 0x26, 0x1b, 0x35, 0xa4, 0x1c, 0x88, 0x9f, 0x7d,
-    0xe0, 0x9a, 0x89, 0x0f, 0x6c, 0xc1, 0xda, 0x6e, 0x45, 0xce, 0x74, 0xb1,
+    0xc2, /* Long, Initial, PN Length=2 bytes */
+    0x00,
+    0x00,
+    0x00,
+    0x01, /* Version */
+    0x00, /* DCID */
+    0x04,
+    0x03,
+    0x45,
+    0x0c,
+    0x7a, /* SCID */
+    0x00, /* Token Length */
+    0x41,
+    0xcb, /* Length (459) */
+    0x3c,
+    0xe0, /* PN (0) */
+    0x85,
+    0x05,
+    0xc2,
+    0x4d,
+    0x0f,
+    0xf3,
+    0x62,
+    0x51,
+    0x04,
+    0x33,
+    0xfa,
+    0xb5,
+    0xa3,
+    0x02,
+    0xbd,
+    0x5c,
+    0x22,
+    0x0c,
+    0x1d,
+    0xda,
+    0x06,
+    0xf1,
+    0xd7,
+    0xe0,
+    0xc8,
+    0x56,
+    0xb0,
+    0x3d,
+    0xc1,
+    0x49,
+    0x8c,
+    0xc2,
+    0x88,
+    0x5a,
+    0x0e,
+    0xd5,
+    0x67,
+    0x72,
+    0xec,
+    0xcc,
+    0x7a,
+    0x2b,
+    0x46,
+    0x17,
+    0x49,
+    0x4b,
+    0x28,
+    0x6a,
+    0x89,
+    0x71,
+    0xfd,
+    0x31,
+    0x9a,
+    0xa1,
+    0x97,
+    0x64,
+    0xe2,
+    0xbf,
+    0xa0,
+    0x6d,
+    0xf6,
+    0x76,
+    0x83,
+    0x28,
+    0xc4,
+    0xd5,
+    0x39,
+    0x87,
+    0x22,
+    0x7c,
+    0x11,
+    0x9a,
+    0x53,
+    0x66,
+    0xb4,
+    0x27,
+    0xf1,
+    0xab,
+    0x6f,
+    0x49,
+    0x43,
+    0x3f,
+    0x9a,
+    0x23,
+    0xd3,
+    0x53,
+    0x06,
+    0xe8,
+    0x14,
+    0xfd,
+    0xc0,
+    0x67,
+    0x1f,
+    0x88,
+    0x2a,
+    0xa8,
+    0xae,
+    0x5f,
+    0x05,
+    0x0a,
+    0xeb,
+    0x66,
+    0x72,
+    0x8c,
+    0x46,
+    0xcc,
+    0x54,
+    0x21,
+    0x5e,
+    0x14,
+    0xfe,
+    0x68,
+    0xc7,
+    0xf7,
+    0x60,
+    0x67,
+    0xb5,
+    0xa7,
+    0x0d,
+    0xf4,
+    0xe1,
+    0xff,
+    0x60,
+    0xe3,
+    0x11,
+    0x38,
+    0x92,
+    0x90,
+    0xc2,
+    0x48,
+    0x28,
+    0xbf,
+    0xf3,
+    0x85,
+    0x27,
+    0xfe,
+    0xbf,
+    0x42,
+    0x26,
+    0x1a,
+    0x4e,
+    0x78,
+    0xf1,
+    0xf0,
+    0x88,
+    0x16,
+    0x1b,
+    0x64,
+    0x5f,
+    0x66,
+    0x02,
+    0x0b,
+    0x45,
+    0x3d,
+    0x38,
+    0xd9,
+    0x09,
+    0xd5,
+    0xff,
+    0xc2,
+    0x68,
+    0x02,
+    0x2c,
+    0xc4,
+    0x3f,
+    0x60,
+    0x6e,
+    0x2f,
+    0x7f,
+    0x43,
+    0xf7,
+    0x1a,
+    0x37,
+    0xcc,
+    0xe0,
+    0xe0,
+    0x4b,
+    0x96,
+    0xc1,
+    0xb1,
+    0x8b,
+    0x1c,
+    0x7c,
+    0x6e,
+    0x80,
+    0xe3,
+    0x92,
+    0x9b,
+    0x86,
+    0x87,
+    0x1f,
+    0x9a,
+    0x6a,
+    0x62,
+    0x18,
+    0xf4,
+    0x86,
+    0xc2,
+    0x3e,
+    0x33,
+    0xa3,
+    0xbf,
+    0x43,
+    0x96,
+    0x6e,
+    0xff,
+    0x94,
+    0xaf,
+    0x6d,
+    0x23,
+    0x5c,
+    0x42,
+    0xed,
+    0xe7,
+    0xb9,
+    0x2c,
+    0x33,
+    0xb0,
+    0xc6,
+    0x3d,
+    0x44,
+    0x00,
+    0x0b,
+    0xa3,
+    0x39,
+    0xa8,
+    0xeb,
+    0x8c,
+    0x81,
+    0x1a,
+    0x99,
+    0x20,
+    0xbd,
+    0xfa,
+    0xf3,
+    0xf4,
+    0xf0,
+    0x11,
+    0xd8,
+    0x41,
+    0x31,
+    0x8d,
+    0xdc,
+    0x0d,
+    0x00,
+    0xa6,
+    0x31,
+    0x40,
+    0xc6,
+    0xc6,
+    0xad,
+    0x74,
+    0x93,
+    0x62,
+    0x1c,
+    0x55,
+    0xce,
+    0x5f,
+    0x8c,
+    0x5b,
+    0x3c,
+    0xcb,
+    0x25,
+    0x5e,
+    0xbf,
+    0xed,
+    0xbb,
+    0x3c,
+    0x97,
+    0x4b,
+    0x62,
+    0xe0,
+    0xba,
+    0xf1,
+    0xb0,
+    0x30,
+    0xbf,
+    0x35,
+    0x89,
+    0x7e,
+    0x25,
+    0x61,
+    0x54,
+    0x86,
+    0x52,
+    0x11,
+    0x86,
+    0x90,
+    0xc3,
+    0xf5,
+    0xad,
+    0xa0,
+    0x96,
+    0x30,
+    0xb2,
+    0xf0,
+    0xa6,
+    0x79,
+    0x39,
+    0x1c,
+    0x51,
+    0x42,
+    0xa1,
+    0x00,
+    0x6f,
+    0x55,
+    0x7d,
+    0xdc,
+    0xd0,
+    0x7c,
+    0xcf,
+    0x01,
+    0x88,
+    0x03,
+    0xd7,
+    0x2d,
+    0x65,
+    0x2b,
+    0x40,
+    0xee,
+    0xba,
+    0x10,
+    0xd8,
+    0x0c,
+    0x85,
+    0x14,
+    0xb7,
+    0x4d,
+    0x9e,
+    0x7d,
+    0x7c,
+    0xde,
+    0x7f,
+    0x0d,
+    0x0e,
+    0x3b,
+    0x3d,
+    0xe3,
+    0xd3,
+    0x63,
+    0xc2,
+    0xed,
+    0xc7,
+    0x41,
+    0xaf,
+    0x05,
+    0x85,
+    0x87,
+    0x46,
+    0x55,
+    0x7e,
+    0xbe,
+    0x14,
+    0x5b,
+    0x98,
+    0xae,
+    0x6e,
+    0x67,
+    0x1a,
+    0x65,
+    0xc6,
+    0xcf,
+    0xe1,
+    0x28,
+    0x50,
+    0x6b,
+    0xb4,
+    0xf6,
+    0xba,
+    0x63,
+    0xbc,
+    0xf1,
+    0xd7,
+    0xa4,
+    0x97,
+    0x2d,
+    0x4d,
+    0x04,
+    0x26,
+    0x96,
+    0xec,
+    0x0c,
+    0xd4,
+    0xae,
+    0x6a,
+    0xca,
+    0x7e,
+    0x65,
+    0xc5,
+    0x43,
+    0x7e,
+    0xf8,
+    0x77,
+    0x61,
+    0xd0,
+    0x2c,
+    0xe5,
+    0x37,
+    0x0a,
+    0xb3,
+    0x7a,
+    0x8c,
+    0x2a,
+    0xa1,
+    0xdc,
+    0x29,
+    0xdb,
+    0xec,
+    0xca,
+    0xdc,
+    0xfe,
+    0xdd,
+    0x38,
+    0xd2,
+    0x13,
+    0x9f,
+    0x94,
+    0x6d,
+    0x5b,
+    0x87,
+    0xf3,
+    0x15,
+    0xa8,
+    0xe5,
+    0xe9,
+    0x65,
+    0x1d,
+    0x4f,
+    0x92,
+    0x1b,
+    0xf4,
+    0xa6,
+    0xa4,
+    0xd6,
+    0x22,
+    0xfc,
+    0x26,
+    0x1b,
+    0x35,
+    0xa4,
+    0x1c,
+    0x88,
+    0x9f,
+    0x7d,
+    0xe0,
+    0x9a,
+    0x89,
+    0x0f,
+    0x6c,
+    0xc1,
+    0xda,
+    0x6e,
+    0x45,
+    0xce,
+    0x74,
+    0xb1,
     0xff,
 
     /* Second Packet: Handshake */
-    0xeb,                           /* Long, Handshake, PN Length=2 bytes */
-    0x00, 0x00, 0x00, 0x01,         /* Version */
-    0x00,                           /* DCID */
-    0x04, 0x03, 0x45, 0x0c, 0x7a,   /* SCID */
-    0x42, 0xa3,                     /* Length (675) */
-    0x43, 0x29,                     /* PN (0) */
-    0xff, 0xdb, 0xcf, 0x3c, 0x17, 0xcf, 0xdc, 0x42, 0x3a, 0x59, 0x88, 0xdb,
-    0x13, 0xef, 0x09, 0x3d, 0xf2, 0x24, 0xf3, 0xeb, 0xca, 0xb0, 0xe1, 0xa4,
-    0x67, 0x64, 0x65, 0x80, 0x5f, 0x73, 0x29, 0x69, 0x29, 0xba, 0x03, 0x77,
-    0x22, 0xc8, 0xa8, 0xd5, 0x21, 0xf2, 0xa2, 0x30, 0x7f, 0x86, 0x3a, 0x8a,
-    0xdd, 0x92, 0x33, 0xa6, 0x57, 0x21, 0x39, 0xdd, 0x34, 0xb4, 0x39, 0xa7,
-    0x6f, 0x0a, 0x14, 0xba, 0x9e, 0x3b, 0x3a, 0x6a, 0x4b, 0xc5, 0xda, 0x44,
-    0x82, 0xca, 0x52, 0x86, 0x68, 0x8a, 0x0c, 0x5e, 0xeb, 0x1e, 0x81, 0x43,
-    0x3a, 0x59, 0x2c, 0x26, 0x63, 0xa3, 0x89, 0x92, 0x80, 0xe9, 0x75, 0xc2,
-    0xdb, 0xb9, 0x58, 0x6d, 0xab, 0xfd, 0x21, 0xe0, 0x35, 0x79, 0x2e, 0x56,
-    0x7b, 0xfb, 0xb3, 0x7a, 0x05, 0x33, 0x0f, 0x13, 0xe5, 0xef, 0x04, 0x41,
-    0x69, 0x85, 0x91, 0x24, 0xce, 0xb5, 0x21, 0x8d, 0x0a, 0x13, 0xda, 0xae,
-    0x86, 0x2f, 0x25, 0x1f, 0x9c, 0x70, 0x8a, 0xaa, 0x05, 0xeb, 0x30, 0x93,
-    0x50, 0xc1, 0x39, 0xab, 0x99, 0x8a, 0x31, 0xc1, 0xc1, 0x5e, 0x39, 0xcf,
-    0x64, 0x3f, 0x9f, 0x5c, 0xa5, 0xa1, 0x88, 0xb2, 0x5f, 0x23, 0xcb, 0x76,
-    0xe5, 0xf3, 0x2d, 0xa0, 0xed, 0xad, 0xcf, 0x30, 0x05, 0x44, 0xdc, 0xa5,
-    0x81, 0xb1, 0x7f, 0x78, 0x0d, 0x4d, 0x96, 0xa3, 0xcb, 0xcb, 0x45, 0xcf,
-    0x5f, 0x22, 0xb8, 0x93, 0x2b, 0x16, 0xe0, 0x1c, 0x53, 0x34, 0x76, 0x3b,
-    0x7b, 0x78, 0xa1, 0x46, 0x40, 0x43, 0x4b, 0x0e, 0x1c, 0xfd, 0xcf, 0x01,
-    0xf1, 0x2c, 0xee, 0xd0, 0xbd, 0x9f, 0x44, 0xd2, 0xd7, 0x13, 0xf9, 0x65,
-    0x82, 0xf5, 0x42, 0xec, 0x9f, 0x5d, 0x51, 0x5a, 0x7b, 0xf2, 0x39, 0xbb,
-    0xa6, 0x19, 0x5c, 0x73, 0x95, 0x65, 0x5b, 0x64, 0x2f, 0xda, 0x50, 0xd0,
-    0x02, 0x34, 0x3f, 0x35, 0xc1, 0xd6, 0x31, 0x3b, 0xcf, 0x3f, 0x81, 0x8d,
-    0xe0, 0x40, 0xfd, 0x6d, 0x32, 0x68, 0xa4, 0xf2, 0x4e, 0x3a, 0x4a, 0x42,
-    0x2c, 0x07, 0x2d, 0x27, 0xa3, 0x34, 0xe7, 0x27, 0x87, 0x80, 0x76, 0xc0,
-    0xa0, 0x72, 0x05, 0xf2, 0x88, 0x81, 0xe3, 0x32, 0x00, 0x76, 0x8d, 0x24,
-    0x5c, 0x97, 0x2d, 0xd6, 0xb8, 0x34, 0xf8, 0x1c, 0x1a, 0x6d, 0xc7, 0x3f,
-    0xcf, 0x56, 0xae, 0xec, 0x26, 0x74, 0x53, 0x69, 0xcd, 0x7a, 0x97, 0x29,
-    0xab, 0x12, 0x7d, 0x75, 0xf8, 0x8d, 0x5b, 0xc0, 0x77, 0x20, 0xb6, 0x6a,
-    0x0b, 0xce, 0x98, 0x50, 0xca, 0x47, 0x42, 0x1e, 0x5d, 0xc3, 0x24, 0x5a,
-    0x47, 0x48, 0x3b, 0xa0, 0x9e, 0x43, 0xe9, 0x8d, 0x18, 0x23, 0xda, 0x6f,
-    0x8c, 0xda, 0xd0, 0x3e, 0xdb, 0x37, 0xff, 0xfc, 0x7e, 0x17, 0xbe, 0x42,
-    0xfd, 0xdb, 0x51, 0xb1, 0xa4, 0xfd, 0x9a, 0x20, 0x27, 0x24, 0x17, 0x04,
-    0x70, 0xb6, 0x21, 0x87, 0x88, 0xe9, 0xda, 0x63, 0xcb, 0xcb, 0x1d, 0xaf,
-    0x4a, 0x46, 0x76, 0x88, 0xa1, 0xf8, 0x48, 0x6c, 0x06, 0xb4, 0x62, 0x1a,
-    0x67, 0x18, 0xb0, 0x1d, 0x58, 0x6a, 0xfe, 0x1f, 0xf1, 0x48, 0xff, 0xcb,
-    0xa4, 0xd1, 0xa8, 0x12, 0x1f, 0x45, 0x94, 0x2f, 0x55, 0x80, 0x6a, 0x06,
-    0xcc, 0x7b, 0xb0, 0xcc, 0xb8, 0x06, 0x52, 0x16, 0xe3, 0x6e, 0x7e, 0xb0,
-    0x42, 0xfd, 0x3b, 0x7e, 0x0a, 0x42, 0x7b, 0x73, 0xaf, 0x2c, 0xf3, 0xbd,
-    0xe5, 0x72, 0x8c, 0x16, 0xb2, 0xd7, 0x7a, 0x11, 0xb6, 0x9f, 0xd1, 0x69,
-    0xc1, 0x1a, 0xe0, 0x26, 0x26, 0x13, 0xe2, 0x75, 0xf5, 0x74, 0xae, 0x3f,
-    0xee, 0x1e, 0x09, 0x63, 0x5a, 0x30, 0x19, 0xa5, 0x59, 0x48, 0x90, 0x9b,
-    0x46, 0x56, 0xd8, 0x6f, 0x6b, 0x76, 0x82, 0x32, 0xc7, 0x29, 0x76, 0x2e,
-    0x32, 0xb6, 0x23, 0x99, 0xeb, 0x92, 0x5d, 0xc4, 0x4c, 0xa1, 0xe9, 0x26,
-    0x37, 0x9a, 0x7d, 0x4c, 0x16, 0x9c, 0x18, 0xe9, 0xc0, 0xff, 0x48, 0x79,
-    0xb1, 0x7b, 0x0b, 0x1e, 0x6f, 0xb1, 0x77, 0xa5, 0xd2, 0xc6, 0x9a, 0xa9,
-    0xfc, 0xd1, 0x0f, 0x69, 0xf3, 0xe0, 0x49, 0x70, 0x57, 0x80, 0x86, 0xa7,
-    0x3f, 0x54, 0xa8, 0x60, 0xfb, 0xe4, 0x06, 0xa3, 0x13, 0xb9, 0x2f, 0xa7,
-    0x37, 0x80, 0x0c, 0x43, 0xac, 0x2f, 0xae, 0x6e, 0x62, 0x2b, 0x53, 0xe4,
-    0xfe, 0x58, 0xd7, 0x8b, 0x96, 0xdc, 0xe6, 0xd3, 0x86, 0xb8, 0xd6, 0x42,
-    0x5b, 0x68, 0x03, 0x48, 0x3f, 0xcd, 0xee, 0x39, 0x8b, 0xc4, 0x53, 0x30,
-    0x87, 0x48, 0x2a, 0x01, 0x9d, 0x6f, 0x8e, 0x36, 0x75, 0x73, 0xef, 0x77,
-    0x3a, 0x82, 0xd8, 0x4c, 0x0e, 0x7f, 0xb3, 0x8f, 0x16, 0xd1, 0x10, 0xcf,
-    0x2f, 0xa3, 0xdf, 0x65, 0xba, 0x91, 0x79, 0xf6, 0x93, 0x60, 0x08, 0xe5,
-    0xdb, 0x73, 0x02, 0x7a, 0x0b, 0x0e, 0xcc, 0x3b, 0x1f, 0x08, 0x2d, 0x51,
-    0x3e, 0x87, 0x48, 0xd3, 0xd3, 0x75, 0xc2, 0x28, 0xa3, 0xf3, 0x02, 0xde,
-    0x8f, 0xa6, 0xbd, 0xb3, 0x19, 0xa0, 0xdb, 0x48, 0x51, 0x03, 0x5f, 0x98,
+    0xeb, /* Long, Handshake, PN Length=2 bytes */
+    0x00,
+    0x00,
+    0x00,
+    0x01, /* Version */
+    0x00, /* DCID */
+    0x04,
+    0x03,
+    0x45,
+    0x0c,
+    0x7a, /* SCID */
+    0x42,
+    0xa3, /* Length (675) */
+    0x43,
+    0x29, /* PN (0) */
+    0xff,
+    0xdb,
+    0xcf,
+    0x3c,
+    0x17,
+    0xcf,
+    0xdc,
+    0x42,
+    0x3a,
+    0x59,
+    0x88,
+    0xdb,
+    0x13,
+    0xef,
+    0x09,
+    0x3d,
+    0xf2,
+    0x24,
+    0xf3,
+    0xeb,
+    0xca,
+    0xb0,
+    0xe1,
+    0xa4,
+    0x67,
+    0x64,
+    0x65,
+    0x80,
+    0x5f,
+    0x73,
+    0x29,
+    0x69,
+    0x29,
+    0xba,
+    0x03,
+    0x77,
+    0x22,
+    0xc8,
+    0xa8,
+    0xd5,
+    0x21,
+    0xf2,
+    0xa2,
+    0x30,
+    0x7f,
+    0x86,
+    0x3a,
+    0x8a,
+    0xdd,
+    0x92,
+    0x33,
+    0xa6,
+    0x57,
+    0x21,
+    0x39,
+    0xdd,
+    0x34,
+    0xb4,
+    0x39,
+    0xa7,
+    0x6f,
+    0x0a,
+    0x14,
+    0xba,
+    0x9e,
+    0x3b,
+    0x3a,
+    0x6a,
+    0x4b,
+    0xc5,
+    0xda,
+    0x44,
+    0x82,
+    0xca,
+    0x52,
+    0x86,
+    0x68,
+    0x8a,
+    0x0c,
+    0x5e,
+    0xeb,
+    0x1e,
+    0x81,
+    0x43,
+    0x3a,
+    0x59,
+    0x2c,
+    0x26,
+    0x63,
+    0xa3,
+    0x89,
+    0x92,
+    0x80,
+    0xe9,
+    0x75,
+    0xc2,
+    0xdb,
+    0xb9,
+    0x58,
+    0x6d,
+    0xab,
+    0xfd,
+    0x21,
+    0xe0,
+    0x35,
+    0x79,
+    0x2e,
+    0x56,
+    0x7b,
+    0xfb,
+    0xb3,
+    0x7a,
+    0x05,
+    0x33,
+    0x0f,
+    0x13,
+    0xe5,
+    0xef,
+    0x04,
+    0x41,
+    0x69,
+    0x85,
+    0x91,
+    0x24,
+    0xce,
+    0xb5,
+    0x21,
+    0x8d,
+    0x0a,
+    0x13,
+    0xda,
+    0xae,
+    0x86,
+    0x2f,
+    0x25,
+    0x1f,
+    0x9c,
+    0x70,
+    0x8a,
+    0xaa,
+    0x05,
+    0xeb,
+    0x30,
+    0x93,
+    0x50,
+    0xc1,
+    0x39,
+    0xab,
+    0x99,
+    0x8a,
+    0x31,
+    0xc1,
+    0xc1,
+    0x5e,
+    0x39,
+    0xcf,
+    0x64,
+    0x3f,
+    0x9f,
+    0x5c,
+    0xa5,
+    0xa1,
+    0x88,
+    0xb2,
+    0x5f,
+    0x23,
+    0xcb,
+    0x76,
+    0xe5,
+    0xf3,
+    0x2d,
+    0xa0,
+    0xed,
+    0xad,
+    0xcf,
+    0x30,
+    0x05,
+    0x44,
+    0xdc,
+    0xa5,
+    0x81,
+    0xb1,
+    0x7f,
+    0x78,
+    0x0d,
+    0x4d,
+    0x96,
+    0xa3,
+    0xcb,
+    0xcb,
+    0x45,
+    0xcf,
+    0x5f,
+    0x22,
+    0xb8,
+    0x93,
+    0x2b,
+    0x16,
+    0xe0,
+    0x1c,
+    0x53,
+    0x34,
+    0x76,
+    0x3b,
+    0x7b,
+    0x78,
+    0xa1,
+    0x46,
+    0x40,
+    0x43,
+    0x4b,
+    0x0e,
+    0x1c,
+    0xfd,
+    0xcf,
+    0x01,
+    0xf1,
+    0x2c,
+    0xee,
+    0xd0,
+    0xbd,
+    0x9f,
+    0x44,
+    0xd2,
+    0xd7,
+    0x13,
+    0xf9,
+    0x65,
+    0x82,
+    0xf5,
+    0x42,
+    0xec,
+    0x9f,
+    0x5d,
+    0x51,
+    0x5a,
+    0x7b,
+    0xf2,
+    0x39,
+    0xbb,
+    0xa6,
+    0x19,
+    0x5c,
+    0x73,
+    0x95,
+    0x65,
+    0x5b,
+    0x64,
+    0x2f,
+    0xda,
+    0x50,
+    0xd0,
+    0x02,
+    0x34,
+    0x3f,
+    0x35,
+    0xc1,
+    0xd6,
+    0x31,
+    0x3b,
+    0xcf,
+    0x3f,
+    0x81,
+    0x8d,
+    0xe0,
+    0x40,
+    0xfd,
+    0x6d,
+    0x32,
+    0x68,
+    0xa4,
+    0xf2,
+    0x4e,
+    0x3a,
+    0x4a,
+    0x42,
+    0x2c,
+    0x07,
+    0x2d,
+    0x27,
+    0xa3,
+    0x34,
+    0xe7,
+    0x27,
+    0x87,
+    0x80,
+    0x76,
+    0xc0,
+    0xa0,
+    0x72,
+    0x05,
+    0xf2,
+    0x88,
+    0x81,
+    0xe3,
+    0x32,
+    0x00,
+    0x76,
+    0x8d,
+    0x24,
+    0x5c,
+    0x97,
+    0x2d,
+    0xd6,
+    0xb8,
+    0x34,
+    0xf8,
+    0x1c,
+    0x1a,
+    0x6d,
+    0xc7,
+    0x3f,
+    0xcf,
+    0x56,
+    0xae,
+    0xec,
+    0x26,
+    0x74,
+    0x53,
+    0x69,
+    0xcd,
+    0x7a,
+    0x97,
+    0x29,
+    0xab,
+    0x12,
+    0x7d,
+    0x75,
+    0xf8,
+    0x8d,
+    0x5b,
+    0xc0,
+    0x77,
+    0x20,
+    0xb6,
+    0x6a,
+    0x0b,
+    0xce,
+    0x98,
+    0x50,
+    0xca,
+    0x47,
+    0x42,
+    0x1e,
+    0x5d,
+    0xc3,
+    0x24,
+    0x5a,
+    0x47,
+    0x48,
+    0x3b,
+    0xa0,
+    0x9e,
+    0x43,
+    0xe9,
+    0x8d,
+    0x18,
+    0x23,
+    0xda,
+    0x6f,
+    0x8c,
+    0xda,
+    0xd0,
+    0x3e,
+    0xdb,
+    0x37,
+    0xff,
+    0xfc,
+    0x7e,
+    0x17,
+    0xbe,
+    0x42,
+    0xfd,
+    0xdb,
+    0x51,
+    0xb1,
+    0xa4,
+    0xfd,
+    0x9a,
+    0x20,
+    0x27,
+    0x24,
+    0x17,
+    0x04,
+    0x70,
+    0xb6,
+    0x21,
+    0x87,
+    0x88,
+    0xe9,
+    0xda,
+    0x63,
+    0xcb,
+    0xcb,
+    0x1d,
+    0xaf,
+    0x4a,
+    0x46,
+    0x76,
+    0x88,
+    0xa1,
+    0xf8,
+    0x48,
+    0x6c,
+    0x06,
+    0xb4,
+    0x62,
+    0x1a,
+    0x67,
+    0x18,
+    0xb0,
+    0x1d,
+    0x58,
+    0x6a,
+    0xfe,
+    0x1f,
+    0xf1,
+    0x48,
+    0xff,
+    0xcb,
+    0xa4,
+    0xd1,
+    0xa8,
+    0x12,
+    0x1f,
+    0x45,
+    0x94,
+    0x2f,
+    0x55,
+    0x80,
+    0x6a,
+    0x06,
+    0xcc,
+    0x7b,
+    0xb0,
+    0xcc,
+    0xb8,
+    0x06,
+    0x52,
+    0x16,
+    0xe3,
+    0x6e,
+    0x7e,
+    0xb0,
+    0x42,
+    0xfd,
+    0x3b,
+    0x7e,
+    0x0a,
+    0x42,
+    0x7b,
+    0x73,
+    0xaf,
+    0x2c,
+    0xf3,
+    0xbd,
+    0xe5,
+    0x72,
+    0x8c,
+    0x16,
+    0xb2,
+    0xd7,
+    0x7a,
+    0x11,
+    0xb6,
+    0x9f,
+    0xd1,
+    0x69,
+    0xc1,
+    0x1a,
+    0xe0,
+    0x26,
+    0x26,
+    0x13,
+    0xe2,
+    0x75,
+    0xf5,
+    0x74,
+    0xae,
+    0x3f,
+    0xee,
+    0x1e,
+    0x09,
+    0x63,
+    0x5a,
+    0x30,
+    0x19,
+    0xa5,
+    0x59,
+    0x48,
+    0x90,
+    0x9b,
+    0x46,
+    0x56,
+    0xd8,
+    0x6f,
+    0x6b,
+    0x76,
+    0x82,
+    0x32,
+    0xc7,
+    0x29,
+    0x76,
+    0x2e,
+    0x32,
+    0xb6,
+    0x23,
+    0x99,
+    0xeb,
+    0x92,
+    0x5d,
+    0xc4,
+    0x4c,
+    0xa1,
+    0xe9,
+    0x26,
+    0x37,
+    0x9a,
+    0x7d,
+    0x4c,
+    0x16,
+    0x9c,
+    0x18,
+    0xe9,
+    0xc0,
+    0xff,
+    0x48,
+    0x79,
+    0xb1,
+    0x7b,
+    0x0b,
+    0x1e,
+    0x6f,
+    0xb1,
+    0x77,
+    0xa5,
+    0xd2,
+    0xc6,
+    0x9a,
+    0xa9,
+    0xfc,
+    0xd1,
+    0x0f,
+    0x69,
+    0xf3,
+    0xe0,
+    0x49,
+    0x70,
+    0x57,
+    0x80,
+    0x86,
+    0xa7,
+    0x3f,
+    0x54,
+    0xa8,
+    0x60,
+    0xfb,
+    0xe4,
+    0x06,
+    0xa3,
+    0x13,
+    0xb9,
+    0x2f,
+    0xa7,
+    0x37,
+    0x80,
+    0x0c,
+    0x43,
+    0xac,
+    0x2f,
+    0xae,
+    0x6e,
+    0x62,
+    0x2b,
+    0x53,
+    0xe4,
+    0xfe,
+    0x58,
+    0xd7,
+    0x8b,
+    0x96,
+    0xdc,
+    0xe6,
+    0xd3,
+    0x86,
+    0xb8,
+    0xd6,
+    0x42,
+    0x5b,
+    0x68,
+    0x03,
+    0x48,
+    0x3f,
+    0xcd,
+    0xee,
+    0x39,
+    0x8b,
+    0xc4,
+    0x53,
+    0x30,
+    0x87,
+    0x48,
+    0x2a,
+    0x01,
+    0x9d,
+    0x6f,
+    0x8e,
+    0x36,
+    0x75,
+    0x73,
+    0xef,
+    0x77,
+    0x3a,
+    0x82,
+    0xd8,
+    0x4c,
+    0x0e,
+    0x7f,
+    0xb3,
+    0x8f,
+    0x16,
+    0xd1,
+    0x10,
+    0xcf,
+    0x2f,
+    0xa3,
+    0xdf,
+    0x65,
+    0xba,
+    0x91,
+    0x79,
+    0xf6,
+    0x93,
+    0x60,
+    0x08,
+    0xe5,
+    0xdb,
+    0x73,
+    0x02,
+    0x7a,
+    0x0b,
+    0x0e,
+    0xcc,
+    0x3b,
+    0x1f,
+    0x08,
+    0x2d,
+    0x51,
+    0x3e,
+    0x87,
+    0x48,
+    0xd3,
+    0xd3,
+    0x75,
+    0xc2,
+    0x28,
+    0xa3,
+    0xf3,
+    0x02,
+    0xde,
+    0x8f,
+    0xa6,
+    0xbd,
+    0xb3,
+    0x19,
+    0xa0,
+    0xdb,
+    0x48,
+    0x51,
+    0x03,
+    0x5f,
+    0x98,
     0xbe,
 
     /* Third Packet: 1-RTT */
-    0x5c,               /* Short, 1-RTT, Spin=0, KP=0, PN Length=2 bytes */
-    0x4f, 0x33,         /* PN (0) */
-    0x16, 0x75, 0x98, 0x67, 0x04, 0x16, 0x61, 0xe3, 0x00, 0xb7, 0x9d, 0x5c,
-    0x53, 0x4c, 0x26, 0x90, 0x92, 0x8e, 0x0e, 0xc0, 0x9c, 0x6d, 0x8b, 0xac,
-    0x15, 0x6d, 0x89, 0x74, 0x2f, 0xe7, 0x84, 0xe3, 0x46, 0x46, 0x8c, 0xc1,
-    0x21, 0x7c, 0x44, 0xa5, 0x00, 0x29, 0xca, 0xf2, 0x11, 0x18, 0xe0, 0x04,
-    0x40, 0x55, 0xd2, 0xa7, 0xe5, 0x9d, 0x22, 0xa2, 0x2a, 0x6c, 0x03, 0x87,
-    0xa3, 0xa3, 0xfa, 0xf5, 0x6c, 0xd7, 0x7d, 0xae, 0x3f, 0x28, 0x01, 0xae,
-    0x06, 0x11, 0x69, 0x67, 0x90, 0x57, 0x5a, 0xd0, 0xeb, 0xdd, 0xac, 0xbd,
-    0x7f, 0x33, 0x86, 0xbb,
+    0x5c, /* Short, 1-RTT, Spin=0, KP=0, PN Length=2 bytes */
+    0x4f,
+    0x33, /* PN (0) */
+    0x16,
+    0x75,
+    0x98,
+    0x67,
+    0x04,
+    0x16,
+    0x61,
+    0xe3,
+    0x00,
+    0xb7,
+    0x9d,
+    0x5c,
+    0x53,
+    0x4c,
+    0x26,
+    0x90,
+    0x92,
+    0x8e,
+    0x0e,
+    0xc0,
+    0x9c,
+    0x6d,
+    0x8b,
+    0xac,
+    0x15,
+    0x6d,
+    0x89,
+    0x74,
+    0x2f,
+    0xe7,
+    0x84,
+    0xe3,
+    0x46,
+    0x46,
+    0x8c,
+    0xc1,
+    0x21,
+    0x7c,
+    0x44,
+    0xa5,
+    0x00,
+    0x29,
+    0xca,
+    0xf2,
+    0x11,
+    0x18,
+    0xe0,
+    0x04,
+    0x40,
+    0x55,
+    0xd2,
+    0xa7,
+    0xe5,
+    0x9d,
+    0x22,
+    0xa2,
+    0x2a,
+    0x6c,
+    0x03,
+    0x87,
+    0xa3,
+    0xa3,
+    0xfa,
+    0xf5,
+    0x6c,
+    0xd7,
+    0x7d,
+    0xae,
+    0x3f,
+    0x28,
+    0x01,
+    0xae,
+    0x06,
+    0x11,
+    0x69,
+    0x67,
+    0x90,
+    0x57,
+    0x5a,
+    0xd0,
+    0xeb,
+    0xdd,
+    0xac,
+    0xbd,
+    0x7f,
+    0x33,
+    0x86,
+    0xbb,
 };
 
 static const QUIC_PKT_HDR rx_script_7a_expect_hdr = {
     QUIC_PKT_TYPE_INITIAL,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    1,          /* Version */
-    {0, {0}},                           /* DCID */
-    {4, {0x03, 0x45, 0x0c, 0x7a}},      /* SCID */
-    {0},        /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    1, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 4, { 0x03, 0x45, 0x0c, 0x7a } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     441, NULL
 };
 
 static const unsigned char rx_script_7a_body[] = {
-    0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
-    0x00, 0x40, 0x5a, 0x02, 0x00, 0x00, 0x56, 0x03, 0x03, 0xd5, 0xfb, 0x6a,
-    0x81, 0x1c, 0xdb, 0xa2, 0x5c, 0x11, 0x31, 0xda, 0x15, 0x28, 0x97, 0x94,
-    0x83, 0xfd, 0x9d, 0x91, 0x0e, 0x87, 0x71, 0x46, 0x64, 0xb4, 0xd9, 0x9e,
-    0xbd, 0xa8, 0x48, 0x32, 0xbf, 0x00, 0x13, 0x03, 0x00, 0x00, 0x2e, 0x00,
-    0x2b, 0x00, 0x02, 0x03, 0x04, 0x00, 0x33, 0x00, 0x24, 0x00, 0x1d, 0x00,
-    0x20, 0xef, 0xbb, 0x46, 0xe9, 0xb4, 0xf6, 0x54, 0xc4, 0x07, 0x71, 0xdc,
-    0x50, 0xd5, 0x69, 0x40, 0xbc, 0x85, 0x7f, 0xf9, 0x48, 0x14, 0xe3, 0xd6,
-    0x08, 0xa9, 0x0b, 0xfd, 0xbe, 0xf1, 0x57, 0x21, 0x34,
+    0x02,
+    0x03,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x06,
+    0x00,
+    0x40,
+    0x5a,
+    0x02,
+    0x00,
+    0x00,
+    0x56,
+    0x03,
+    0x03,
+    0xd5,
+    0xfb,
+    0x6a,
+    0x81,
+    0x1c,
+    0xdb,
+    0xa2,
+    0x5c,
+    0x11,
+    0x31,
+    0xda,
+    0x15,
+    0x28,
+    0x97,
+    0x94,
+    0x83,
+    0xfd,
+    0x9d,
+    0x91,
+    0x0e,
+    0x87,
+    0x71,
+    0x46,
+    0x64,
+    0xb4,
+    0xd9,
+    0x9e,
+    0xbd,
+    0xa8,
+    0x48,
+    0x32,
+    0xbf,
+    0x00,
+    0x13,
+    0x03,
+    0x00,
+    0x00,
+    0x2e,
+    0x00,
+    0x2b,
+    0x00,
+    0x02,
+    0x03,
+    0x04,
+    0x00,
+    0x33,
+    0x00,
+    0x24,
+    0x00,
+    0x1d,
+    0x00,
+    0x20,
+    0xef,
+    0xbb,
+    0x46,
+    0xe9,
+    0xb4,
+    0xf6,
+    0x54,
+    0xc4,
+    0x07,
+    0x71,
+    0xdc,
+    0x50,
+    0xd5,
+    0x69,
+    0x40,
+    0xbc,
+    0x85,
+    0x7f,
+    0xf9,
+    0x48,
+    0x14,
+    0xe3,
+    0xd6,
+    0x08,
+    0xa9,
+    0x0b,
+    0xfd,
+    0xbe,
+    0xf1,
+    0x57,
+    0x21,
+    0x34,
 };
 
 static const QUIC_PKT_HDR rx_script_7b_expect_hdr = {
     QUIC_PKT_TYPE_HANDSHAKE,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    1,          /* Version */
-    {0, {0}},                           /* DCID */
-    {4, {0x03, 0x45, 0x0c, 0x7a}},      /* SCID */
-    {0},        /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    1, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 4, { 0x03, 0x45, 0x0c, 0x7a } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     657, NULL
 };
 
 static const unsigned char rx_script_7b_body[] = {
-    0x06, 0x00, 0x42, 0x8d, 0x08, 0x00, 0x00, 0x82, 0x00, 0x80, 0x00, 0x10,
-    0x00, 0x08, 0x00, 0x06, 0x05, 0x64, 0x75, 0x6d, 0x6d, 0x79, 0x00, 0x39,
-    0x00, 0x70, 0x46, 0x0a, 0x0d, 0xdc, 0x59, 0xf0, 0x4e, 0xb2, 0x2c, 0xac,
-    0x69, 0x6a, 0xc9, 0x77, 0xa9, 0x99, 0x05, 0x04, 0x80, 0x08, 0x00, 0x00,
-    0x06, 0x04, 0x80, 0x08, 0x00, 0x00, 0x07, 0x04, 0x80, 0x08, 0x00, 0x00,
-    0x04, 0x04, 0x80, 0x0c, 0x00, 0x00, 0x08, 0x02, 0x40, 0x64, 0x09, 0x02,
-    0x40, 0x64, 0x01, 0x04, 0x80, 0x00, 0x75, 0x30, 0x03, 0x02, 0x45, 0xac,
-    0x0b, 0x01, 0x1a, 0x0c, 0x00, 0x02, 0x10, 0x42, 0xf0, 0xed, 0x09, 0x07,
-    0x5b, 0xd9, 0x5a, 0xb2, 0x39, 0x5d, 0x73, 0x2c, 0x57, 0x1f, 0x50, 0x00,
-    0x0b, 0xe0, 0x3e, 0xf3, 0xd6, 0x91, 0x6f, 0x9c, 0xcc, 0x31, 0xf7, 0xa5,
-    0x0e, 0x01, 0x04, 0x0f, 0x04, 0x03, 0x45, 0x0c, 0x7a, 0x10, 0x04, 0xfa,
-    0x5d, 0xd6, 0x80, 0x20, 0x01, 0x00, 0x0b, 0x00, 0x01, 0x8f, 0x00, 0x00,
-    0x01, 0x8b, 0x00, 0x01, 0x86, 0x30, 0x82, 0x01, 0x82, 0x30, 0x82, 0x01,
-    0x29, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x14, 0x0a, 0x73, 0x0f, 0x86,
-    0x18, 0xf2, 0xc3, 0x30, 0x01, 0xd2, 0xc0, 0xc1, 0x62, 0x52, 0x13, 0xf1,
-    0x9c, 0x13, 0x39, 0xb5, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce,
-    0x3d, 0x04, 0x03, 0x02, 0x30, 0x17, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03,
-    0x55, 0x04, 0x03, 0x0c, 0x0c, 0x6d, 0x61, 0x70, 0x61, 0x6b, 0x74, 0x2e,
-    0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x30, 0x1e, 0x17, 0x0d, 0x32, 0x32, 0x30,
-    0x38, 0x30, 0x32, 0x31, 0x32, 0x30, 0x30, 0x31, 0x38, 0x5a, 0x17, 0x0d,
-    0x32, 0x32, 0x30, 0x39, 0x30, 0x31, 0x31, 0x32, 0x30, 0x30, 0x31, 0x38,
-    0x5a, 0x30, 0x17, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x03,
-    0x0c, 0x0c, 0x6d, 0x61, 0x70, 0x61, 0x6b, 0x74, 0x2e, 0x6c, 0x6f, 0x63,
-    0x61, 0x6c, 0x30, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce,
-    0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01,
-    0x07, 0x03, 0x42, 0x00, 0x04, 0x67, 0xf4, 0xd3, 0x8f, 0x15, 0x6d, 0xee,
-    0x85, 0xcc, 0x2a, 0x77, 0xfc, 0x0b, 0x8f, 0x9f, 0xcf, 0xa9, 0x95, 0x5d,
-    0x5b, 0xcd, 0xb7, 0x8b, 0xba, 0x31, 0x0a, 0x73, 0x62, 0xc5, 0xd0, 0x0e,
-    0x07, 0x90, 0xae, 0x38, 0x43, 0x79, 0xce, 0x5e, 0x33, 0xad, 0x31, 0xbf,
-    0x9f, 0x2a, 0x56, 0x83, 0xa5, 0x24, 0x16, 0xab, 0x0c, 0xf1, 0x64, 0xbe,
-    0xe4, 0x93, 0xb5, 0x89, 0xd6, 0x05, 0xe4, 0xf7, 0x7b, 0xa3, 0x53, 0x30,
-    0x51, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, 0x04, 0x16, 0x04, 0x14,
-    0x02, 0x64, 0x0f, 0x55, 0x69, 0x14, 0x91, 0x19, 0xed, 0xf9, 0x1a, 0xe9,
-    0x1d, 0xa5, 0x5a, 0xd0, 0x48, 0x96, 0x9f, 0x60, 0x30, 0x1f, 0x06, 0x03,
-    0x55, 0x1d, 0x23, 0x04, 0x18, 0x30, 0x16, 0x80, 0x14, 0x02, 0x64, 0x0f,
-    0x55, 0x69, 0x14, 0x91, 0x19, 0xed, 0xf9, 0x1a, 0xe9, 0x1d, 0xa5, 0x5a,
-    0xd0, 0x48, 0x96, 0x9f, 0x60, 0x30, 0x0f, 0x06, 0x03, 0x55, 0x1d, 0x13,
-    0x01, 0x01, 0xff, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xff, 0x30, 0x0a,
-    0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, 0x03, 0x47,
-    0x00, 0x30, 0x44, 0x02, 0x20, 0x0a, 0x82, 0x92, 0x6e, 0xd3, 0xc6, 0x66,
-    0xd9, 0xd3, 0x75, 0xff, 0x71, 0x3b, 0x61, 0x46, 0x21, 0x00, 0xe6, 0x21,
-    0x5d, 0x9c, 0x86, 0xe9, 0x65, 0x40, 0x4f, 0xeb, 0x70, 0x4f, 0x2c, 0xad,
-    0x00, 0x02, 0x20, 0x08, 0xc2, 0x07, 0x5d, 0x16, 0xfc, 0x54, 0x34, 0x2b,
-    0xb4, 0x18, 0x67, 0x44, 0x81, 0xc9, 0xa9, 0x67, 0x2e, 0xce, 0xa1, 0x02,
-    0x9f, 0x3b, 0xe5, 0x61, 0x16, 0x0b, 0x50, 0xf6, 0xa1, 0x50, 0x94, 0x00,
-    0x00, 0x0f, 0x00, 0x00, 0x4c, 0x04, 0x03, 0x00, 0x48, 0x30, 0x46, 0x02,
-    0x21, 0x00, 0xaa, 0x18, 0x61, 0x93, 0xdf, 0xbb, 0x79, 0xe7, 0x34, 0x7e,
-    0x2e, 0x61, 0x13, 0x8c, 0xa0, 0x33, 0xfb, 0x33, 0xca, 0xfc, 0xd2, 0x45,
-    0xb0, 0xc7, 0x89, 0x3d, 0xf1, 0xd6, 0x54, 0x94, 0x05, 0xb6, 0x02, 0x21,
-    0x00, 0xef, 0x6c, 0xb6, 0xf2, 0x00, 0xb2, 0x32, 0xb1, 0xf3, 0x3f, 0x59,
-    0xf5, 0xc8, 0x18, 0xbe, 0x39, 0xbb, 0x27, 0xf8, 0x67, 0xac, 0xcb, 0x63,
-    0xa4, 0x29, 0xfb, 0x8e, 0x88, 0x0f, 0xe5, 0xe9, 0x7e, 0x14, 0x00, 0x00,
-    0x20, 0xfc, 0x2c, 0x4c, 0xa7, 0x77, 0x24, 0x79, 0x29, 0xa8, 0x82, 0x1a,
-    0x4d, 0x58, 0x9d, 0x82, 0xe2, 0x09, 0x36, 0x63, 0x0e, 0x0b, 0x55, 0x51,
-    0x80, 0x93, 0x40, 0xda, 0x41, 0x33, 0x08, 0x10, 0x2c,
+    0x06,
+    0x00,
+    0x42,
+    0x8d,
+    0x08,
+    0x00,
+    0x00,
+    0x82,
+    0x00,
+    0x80,
+    0x00,
+    0x10,
+    0x00,
+    0x08,
+    0x00,
+    0x06,
+    0x05,
+    0x64,
+    0x75,
+    0x6d,
+    0x6d,
+    0x79,
+    0x00,
+    0x39,
+    0x00,
+    0x70,
+    0x46,
+    0x0a,
+    0x0d,
+    0xdc,
+    0x59,
+    0xf0,
+    0x4e,
+    0xb2,
+    0x2c,
+    0xac,
+    0x69,
+    0x6a,
+    0xc9,
+    0x77,
+    0xa9,
+    0x99,
+    0x05,
+    0x04,
+    0x80,
+    0x08,
+    0x00,
+    0x00,
+    0x06,
+    0x04,
+    0x80,
+    0x08,
+    0x00,
+    0x00,
+    0x07,
+    0x04,
+    0x80,
+    0x08,
+    0x00,
+    0x00,
+    0x04,
+    0x04,
+    0x80,
+    0x0c,
+    0x00,
+    0x00,
+    0x08,
+    0x02,
+    0x40,
+    0x64,
+    0x09,
+    0x02,
+    0x40,
+    0x64,
+    0x01,
+    0x04,
+    0x80,
+    0x00,
+    0x75,
+    0x30,
+    0x03,
+    0x02,
+    0x45,
+    0xac,
+    0x0b,
+    0x01,
+    0x1a,
+    0x0c,
+    0x00,
+    0x02,
+    0x10,
+    0x42,
+    0xf0,
+    0xed,
+    0x09,
+    0x07,
+    0x5b,
+    0xd9,
+    0x5a,
+    0xb2,
+    0x39,
+    0x5d,
+    0x73,
+    0x2c,
+    0x57,
+    0x1f,
+    0x50,
+    0x00,
+    0x0b,
+    0xe0,
+    0x3e,
+    0xf3,
+    0xd6,
+    0x91,
+    0x6f,
+    0x9c,
+    0xcc,
+    0x31,
+    0xf7,
+    0xa5,
+    0x0e,
+    0x01,
+    0x04,
+    0x0f,
+    0x04,
+    0x03,
+    0x45,
+    0x0c,
+    0x7a,
+    0x10,
+    0x04,
+    0xfa,
+    0x5d,
+    0xd6,
+    0x80,
+    0x20,
+    0x01,
+    0x00,
+    0x0b,
+    0x00,
+    0x01,
+    0x8f,
+    0x00,
+    0x00,
+    0x01,
+    0x8b,
+    0x00,
+    0x01,
+    0x86,
+    0x30,
+    0x82,
+    0x01,
+    0x82,
+    0x30,
+    0x82,
+    0x01,
+    0x29,
+    0xa0,
+    0x03,
+    0x02,
+    0x01,
+    0x02,
+    0x02,
+    0x14,
+    0x0a,
+    0x73,
+    0x0f,
+    0x86,
+    0x18,
+    0xf2,
+    0xc3,
+    0x30,
+    0x01,
+    0xd2,
+    0xc0,
+    0xc1,
+    0x62,
+    0x52,
+    0x13,
+    0xf1,
+    0x9c,
+    0x13,
+    0x39,
+    0xb5,
+    0x30,
+    0x0a,
+    0x06,
+    0x08,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x04,
+    0x03,
+    0x02,
+    0x30,
+    0x17,
+    0x31,
+    0x15,
+    0x30,
+    0x13,
+    0x06,
+    0x03,
+    0x55,
+    0x04,
+    0x03,
+    0x0c,
+    0x0c,
+    0x6d,
+    0x61,
+    0x70,
+    0x61,
+    0x6b,
+    0x74,
+    0x2e,
+    0x6c,
+    0x6f,
+    0x63,
+    0x61,
+    0x6c,
+    0x30,
+    0x1e,
+    0x17,
+    0x0d,
+    0x32,
+    0x32,
+    0x30,
+    0x38,
+    0x30,
+    0x32,
+    0x31,
+    0x32,
+    0x30,
+    0x30,
+    0x31,
+    0x38,
+    0x5a,
+    0x17,
+    0x0d,
+    0x32,
+    0x32,
+    0x30,
+    0x39,
+    0x30,
+    0x31,
+    0x31,
+    0x32,
+    0x30,
+    0x30,
+    0x31,
+    0x38,
+    0x5a,
+    0x30,
+    0x17,
+    0x31,
+    0x15,
+    0x30,
+    0x13,
+    0x06,
+    0x03,
+    0x55,
+    0x04,
+    0x03,
+    0x0c,
+    0x0c,
+    0x6d,
+    0x61,
+    0x70,
+    0x61,
+    0x6b,
+    0x74,
+    0x2e,
+    0x6c,
+    0x6f,
+    0x63,
+    0x61,
+    0x6c,
+    0x30,
+    0x59,
+    0x30,
+    0x13,
+    0x06,
+    0x07,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x02,
+    0x01,
+    0x06,
+    0x08,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x03,
+    0x01,
+    0x07,
+    0x03,
+    0x42,
+    0x00,
+    0x04,
+    0x67,
+    0xf4,
+    0xd3,
+    0x8f,
+    0x15,
+    0x6d,
+    0xee,
+    0x85,
+    0xcc,
+    0x2a,
+    0x77,
+    0xfc,
+    0x0b,
+    0x8f,
+    0x9f,
+    0xcf,
+    0xa9,
+    0x95,
+    0x5d,
+    0x5b,
+    0xcd,
+    0xb7,
+    0x8b,
+    0xba,
+    0x31,
+    0x0a,
+    0x73,
+    0x62,
+    0xc5,
+    0xd0,
+    0x0e,
+    0x07,
+    0x90,
+    0xae,
+    0x38,
+    0x43,
+    0x79,
+    0xce,
+    0x5e,
+    0x33,
+    0xad,
+    0x31,
+    0xbf,
+    0x9f,
+    0x2a,
+    0x56,
+    0x83,
+    0xa5,
+    0x24,
+    0x16,
+    0xab,
+    0x0c,
+    0xf1,
+    0x64,
+    0xbe,
+    0xe4,
+    0x93,
+    0xb5,
+    0x89,
+    0xd6,
+    0x05,
+    0xe4,
+    0xf7,
+    0x7b,
+    0xa3,
+    0x53,
+    0x30,
+    0x51,
+    0x30,
+    0x1d,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x0e,
+    0x04,
+    0x16,
+    0x04,
+    0x14,
+    0x02,
+    0x64,
+    0x0f,
+    0x55,
+    0x69,
+    0x14,
+    0x91,
+    0x19,
+    0xed,
+    0xf9,
+    0x1a,
+    0xe9,
+    0x1d,
+    0xa5,
+    0x5a,
+    0xd0,
+    0x48,
+    0x96,
+    0x9f,
+    0x60,
+    0x30,
+    0x1f,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x23,
+    0x04,
+    0x18,
+    0x30,
+    0x16,
+    0x80,
+    0x14,
+    0x02,
+    0x64,
+    0x0f,
+    0x55,
+    0x69,
+    0x14,
+    0x91,
+    0x19,
+    0xed,
+    0xf9,
+    0x1a,
+    0xe9,
+    0x1d,
+    0xa5,
+    0x5a,
+    0xd0,
+    0x48,
+    0x96,
+    0x9f,
+    0x60,
+    0x30,
+    0x0f,
+    0x06,
+    0x03,
+    0x55,
+    0x1d,
+    0x13,
+    0x01,
+    0x01,
+    0xff,
+    0x04,
+    0x05,
+    0x30,
+    0x03,
+    0x01,
+    0x01,
+    0xff,
+    0x30,
+    0x0a,
+    0x06,
+    0x08,
+    0x2a,
+    0x86,
+    0x48,
+    0xce,
+    0x3d,
+    0x04,
+    0x03,
+    0x02,
+    0x03,
+    0x47,
+    0x00,
+    0x30,
+    0x44,
+    0x02,
+    0x20,
+    0x0a,
+    0x82,
+    0x92,
+    0x6e,
+    0xd3,
+    0xc6,
+    0x66,
+    0xd9,
+    0xd3,
+    0x75,
+    0xff,
+    0x71,
+    0x3b,
+    0x61,
+    0x46,
+    0x21,
+    0x00,
+    0xe6,
+    0x21,
+    0x5d,
+    0x9c,
+    0x86,
+    0xe9,
+    0x65,
+    0x40,
+    0x4f,
+    0xeb,
+    0x70,
+    0x4f,
+    0x2c,
+    0xad,
+    0x00,
+    0x02,
+    0x20,
+    0x08,
+    0xc2,
+    0x07,
+    0x5d,
+    0x16,
+    0xfc,
+    0x54,
+    0x34,
+    0x2b,
+    0xb4,
+    0x18,
+    0x67,
+    0x44,
+    0x81,
+    0xc9,
+    0xa9,
+    0x67,
+    0x2e,
+    0xce,
+    0xa1,
+    0x02,
+    0x9f,
+    0x3b,
+    0xe5,
+    0x61,
+    0x16,
+    0x0b,
+    0x50,
+    0xf6,
+    0xa1,
+    0x50,
+    0x94,
+    0x00,
+    0x00,
+    0x0f,
+    0x00,
+    0x00,
+    0x4c,
+    0x04,
+    0x03,
+    0x00,
+    0x48,
+    0x30,
+    0x46,
+    0x02,
+    0x21,
+    0x00,
+    0xaa,
+    0x18,
+    0x61,
+    0x93,
+    0xdf,
+    0xbb,
+    0x79,
+    0xe7,
+    0x34,
+    0x7e,
+    0x2e,
+    0x61,
+    0x13,
+    0x8c,
+    0xa0,
+    0x33,
+    0xfb,
+    0x33,
+    0xca,
+    0xfc,
+    0xd2,
+    0x45,
+    0xb0,
+    0xc7,
+    0x89,
+    0x3d,
+    0xf1,
+    0xd6,
+    0x54,
+    0x94,
+    0x05,
+    0xb6,
+    0x02,
+    0x21,
+    0x00,
+    0xef,
+    0x6c,
+    0xb6,
+    0xf2,
+    0x00,
+    0xb2,
+    0x32,
+    0xb1,
+    0xf3,
+    0x3f,
+    0x59,
+    0xf5,
+    0xc8,
+    0x18,
+    0xbe,
+    0x39,
+    0xbb,
+    0x27,
+    0xf8,
+    0x67,
+    0xac,
+    0xcb,
+    0x63,
+    0xa4,
+    0x29,
+    0xfb,
+    0x8e,
+    0x88,
+    0x0f,
+    0xe5,
+    0xe9,
+    0x7e,
+    0x14,
+    0x00,
+    0x00,
+    0x20,
+    0xfc,
+    0x2c,
+    0x4c,
+    0xa7,
+    0x77,
+    0x24,
+    0x79,
+    0x29,
+    0xa8,
+    0x82,
+    0x1a,
+    0x4d,
+    0x58,
+    0x9d,
+    0x82,
+    0xe2,
+    0x09,
+    0x36,
+    0x63,
+    0x0e,
+    0x0b,
+    0x55,
+    0x51,
+    0x80,
+    0x93,
+    0x40,
+    0xda,
+    0x41,
+    0x33,
+    0x08,
+    0x10,
+    0x2c,
 };
 
 static const QUIC_PKT_HDR rx_script_7c_expect_hdr = {
     QUIC_PKT_TYPE_1RTT,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    0,          /* Version */
-    {0, {0}},                           /* DCID */
-    {0, {0}},                           /* SCID */
-    {0},        /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    0, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     72, NULL
 };
 
 static const unsigned char rx_script_7c_body[] = {
-    0x18, 0x03, 0x00, 0x04, 0xf7, 0x75, 0x72, 0xa2, 0xfd, 0x17, 0xd4, 0x82,
-    0x8e, 0xe9, 0x5b, 0xce, 0xed, 0xec, 0x88, 0xb9, 0x73, 0xbf, 0x36, 0x9f,
-    0x18, 0x02, 0x00, 0x04, 0x5f, 0x43, 0x96, 0xe4, 0x15, 0xdc, 0x56, 0x6b,
-    0x67, 0x4c, 0x36, 0xb2, 0xe2, 0x77, 0xdc, 0x6e, 0xb9, 0x2c, 0x0d, 0x79,
-    0x18, 0x01, 0x00, 0x04, 0xcb, 0x83, 0x4a, 0xf4, 0x8d, 0x7b, 0x69, 0x90,
-    0xaf, 0x0d, 0xd2, 0x38, 0xa4, 0xf1, 0x94, 0xff, 0x63, 0x24, 0xd3, 0x7a,
+    0x18,
+    0x03,
+    0x00,
+    0x04,
+    0xf7,
+    0x75,
+    0x72,
+    0xa2,
+    0xfd,
+    0x17,
+    0xd4,
+    0x82,
+    0x8e,
+    0xe9,
+    0x5b,
+    0xce,
+    0xed,
+    0xec,
+    0x88,
+    0xb9,
+    0x73,
+    0xbf,
+    0x36,
+    0x9f,
+    0x18,
+    0x02,
+    0x00,
+    0x04,
+    0x5f,
+    0x43,
+    0x96,
+    0xe4,
+    0x15,
+    0xdc,
+    0x56,
+    0x6b,
+    0x67,
+    0x4c,
+    0x36,
+    0xb2,
+    0xe2,
+    0x77,
+    0xdc,
+    0x6e,
+    0xb9,
+    0x2c,
+    0x0d,
+    0x79,
+    0x18,
+    0x01,
+    0x00,
+    0x04,
+    0xcb,
+    0x83,
+    0x4a,
+    0xf4,
+    0x8d,
+    0x7b,
+    0x69,
+    0x90,
+    0xaf,
+    0x0d,
+    0xd2,
+    0x38,
+    0xa4,
+    0xf1,
+    0x94,
+    0xff,
+    0x63,
+    0x24,
+    0xd3,
+    0x7a,
 };
 
 static const struct rx_test_op rx_script_7[] = {
     RX_OP_ALLOW_1RTT()
-    RX_OP_SET_RX_DCID(empty_conn_id)
-    RX_OP_PROVIDE_SECRET_INITIAL(rx_script_7_c2s_init_dcid)
-    RX_OP_INJECT_N(7)
-    RX_OP_CHECK_PKT_N(7a)
-    RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
+        RX_OP_SET_RX_DCID(empty_conn_id)
+            RX_OP_PROVIDE_SECRET_INITIAL(rx_script_7_c2s_init_dcid)
+                RX_OP_INJECT_N(7)
+                    RX_OP_CHECK_PKT_N(7a)
+                        RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
     RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE,
-                      QRL_SUITE_CHACHA20POLY1305, rx_script_7_handshake_secret)
-    RX_OP_CHECK_PKT_N(7b)
-    RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
+        QRL_SUITE_CHACHA20POLY1305, rx_script_7_handshake_secret)
+        RX_OP_CHECK_PKT_N(7b)
+            RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
     RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT,
-                      QRL_SUITE_CHACHA20POLY1305, rx_script_7_1rtt_secret)
-    RX_OP_CHECK_PKT_N(7c)
-    RX_OP_CHECK_NO_PKT()
+        QRL_SUITE_CHACHA20POLY1305, rx_script_7_1rtt_secret)
+        RX_OP_CHECK_PKT_N(7c)
+            RX_OP_CHECK_NO_PKT()
 
     /* Discard Initial EL and try injecting the packet again */
     RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_INITIAL)
-    RX_OP_INJECT_N(7)
+        RX_OP_INJECT_N(7)
     /* Initial packet is not output because we have discarded Initial keys */
     RX_OP_CHECK_PKT_N(7b)
-    RX_OP_CHECK_PKT_N(7c)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_CHECK_PKT_N(7c)
+            RX_OP_CHECK_NO_PKT()
     /* Try again with discarded keys */
     RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_HANDSHAKE)
-    RX_OP_INJECT_N(7)
-    RX_OP_CHECK_PKT_N(7c)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_INJECT_N(7)
+            RX_OP_CHECK_PKT_N(7c)
+                RX_OP_CHECK_NO_PKT()
     /* Try again */
     RX_OP_INJECT_N(7)
-    RX_OP_CHECK_PKT_N(7c)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_CHECK_PKT_N(7c)
+            RX_OP_CHECK_NO_PKT()
     /* Try again with discarded 1-RTT keys */
     RX_OP_DISCARD_EL(QUIC_ENC_LEVEL_1RTT)
-    RX_OP_INJECT_N(7)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_INJECT_N(7)
+            RX_OP_CHECK_NO_PKT()
 
     /* Recreate QRL, test reading packets received before key */
     RX_OP_SET_SCID_LEN(0)
-    RX_OP_SET_RX_DCID(empty_conn_id)
-    RX_OP_INJECT_N(7)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_PROVIDE_SECRET_INITIAL(rx_script_7_c2s_init_dcid)
-    RX_OP_CHECK_PKT_N(7a)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE,
-                      QRL_SUITE_CHACHA20POLY1305, rx_script_7_handshake_secret)
-    RX_OP_CHECK_PKT_N(7b)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT,
-                      QRL_SUITE_CHACHA20POLY1305, rx_script_7_1rtt_secret)
-    RX_OP_CHECK_PKT_N(7c)
-    RX_OP_CHECK_NO_PKT()
-
-    RX_OP_END
+        RX_OP_SET_RX_DCID(empty_conn_id)
+            RX_OP_INJECT_N(7)
+                RX_OP_CHECK_NO_PKT()
+                    RX_OP_PROVIDE_SECRET_INITIAL(rx_script_7_c2s_init_dcid)
+                        RX_OP_CHECK_PKT_N(7a)
+                            RX_OP_CHECK_NO_PKT()
+                                RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE,
+                                    QRL_SUITE_CHACHA20POLY1305, rx_script_7_handshake_secret)
+                                    RX_OP_CHECK_PKT_N(7b)
+                                        RX_OP_CHECK_NO_PKT()
+                                            RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT,
+                                                QRL_SUITE_CHACHA20POLY1305, rx_script_7_1rtt_secret)
+                                                RX_OP_CHECK_PKT_N(7c)
+                                                    RX_OP_CHECK_NO_PKT()
+
+                                                        RX_OP_END
 };
 #endif /* !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) */
 
@@ -1390,29 +8292,76 @@ static const unsigned char rx_script_8_1rtt_secret[32] = {
 };
 
 static const unsigned char rx_script_8a_in[] = {
-    0x51,                           /* Short, 1-RTT, PN Length=2 bytes, KP=0 */
-    0xcb, 0xf4,                     /* PN (4) */
-    0x3f, 0x68, 0x7b, 0xa8, 0x2b, 0xb9, 0xfa, 0x7d, 0xe4, 0x6b, 0x20, 0x48,
-    0xd1, 0x3c, 0xcb, 0x4b, 0xef, 0xb1, 0xfd, 0x5e, 0x1b, 0x19, 0x83, 0xa9,
-    0x47, 0x62, 0xc1, 0x6e, 0xef, 0x27, 0xc3, 0x9b, 0x8f, 0x3f, 0xce, 0x11,
-    0x68, 0xf5, 0x73, 0x0d, 0xf2, 0xdc, 0xe0, 0x28, 0x28, 0x79, 0xa6, 0x39,
-    0xc3, 0xb9, 0xd3,
+    0x51, /* Short, 1-RTT, PN Length=2 bytes, KP=0 */
+    0xcb,
+    0xf4, /* PN (4) */
+    0x3f,
+    0x68,
+    0x7b,
+    0xa8,
+    0x2b,
+    0xb9,
+    0xfa,
+    0x7d,
+    0xe4,
+    0x6b,
+    0x20,
+    0x48,
+    0xd1,
+    0x3c,
+    0xcb,
+    0x4b,
+    0xef,
+    0xb1,
+    0xfd,
+    0x5e,
+    0x1b,
+    0x19,
+    0x83,
+    0xa9,
+    0x47,
+    0x62,
+    0xc1,
+    0x6e,
+    0xef,
+    0x27,
+    0xc3,
+    0x9b,
+    0x8f,
+    0x3f,
+    0xce,
+    0x11,
+    0x68,
+    0xf5,
+    0x73,
+    0x0d,
+    0xf2,
+    0xdc,
+    0xe0,
+    0x28,
+    0x28,
+    0x79,
+    0xa6,
+    0x39,
+    0xc3,
+    0xb9,
+    0xd3,
 };
 
 static const QUIC_PKT_HDR rx_script_8a_expect_hdr = {
     QUIC_PKT_TYPE_1RTT,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    0,          /* Version */
-    {0, {0}},   /* DCID */
-    {0, {0}},   /* SCID */
-    {0, 4},     /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    0, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0, 4 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     35, NULL
 };
 
@@ -1423,157 +8372,466 @@ static const unsigned char rx_script_8a_body[] = {
 };
 
 static const unsigned char rx_script_8b_in[] = {
-    0x52,                           /* Short, 1-RTT, PN Length=2 bytes, KP=1 */
-    0x21, 0x8e,                     /* PN (5) */
-    0xa2, 0x6a, 0x9c, 0x83, 0x24, 0x48, 0xae, 0x60, 0x1e, 0xc2, 0xa5, 0x91,
-    0xfa, 0xe5, 0xf2, 0x05, 0x14, 0x37, 0x04, 0x6a, 0xa8, 0xae, 0x06, 0x58,
-    0xd7, 0x85, 0x48, 0xd7, 0x3b, 0x85, 0x9e, 0x5a, 0xb3, 0x46, 0x89, 0x1b,
-    0x4b, 0x6e, 0x1d, 0xd1, 0xfc, 0xb7, 0x47, 0xda, 0x6a, 0x64, 0x4b, 0x8e,
-    0xf2, 0x69, 0x16,
+    0x52, /* Short, 1-RTT, PN Length=2 bytes, KP=1 */
+    0x21,
+    0x8e, /* PN (5) */
+    0xa2,
+    0x6a,
+    0x9c,
+    0x83,
+    0x24,
+    0x48,
+    0xae,
+    0x60,
+    0x1e,
+    0xc2,
+    0xa5,
+    0x91,
+    0xfa,
+    0xe5,
+    0xf2,
+    0x05,
+    0x14,
+    0x37,
+    0x04,
+    0x6a,
+    0xa8,
+    0xae,
+    0x06,
+    0x58,
+    0xd7,
+    0x85,
+    0x48,
+    0xd7,
+    0x3b,
+    0x85,
+    0x9e,
+    0x5a,
+    0xb3,
+    0x46,
+    0x89,
+    0x1b,
+    0x4b,
+    0x6e,
+    0x1d,
+    0xd1,
+    0xfc,
+    0xb7,
+    0x47,
+    0xda,
+    0x6a,
+    0x64,
+    0x4b,
+    0x8e,
+    0xf2,
+    0x69,
+    0x16,
 };
 
 static const QUIC_PKT_HDR rx_script_8b_expect_hdr = {
     QUIC_PKT_TYPE_1RTT,
-    0,          /* Spin Bit */
-    1,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    0,          /* Version */
-    {0, {0}},   /* DCID */
-    {0, {0}},   /* SCID */
-    {0, 5},     /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    1, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    0, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0, 5 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     35, NULL
 };
 
 static const unsigned char rx_script_8b_body[] = {
-    0x02, 0x04, 0x03, 0x00, 0x00, 0x0c, 0x00, 0x36, 0x49, 0x27, 0x6d, 0x20,
-    0x68, 0x61, 0x76, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x20, 0x77, 0x6f, 0x6e,
-    0x64, 0x65, 0x72, 0x66, 0x75, 0x6c, 0x20, 0x74, 0x69, 0x6d, 0x65,
+    0x02,
+    0x04,
+    0x03,
+    0x00,
+    0x00,
+    0x0c,
+    0x00,
+    0x36,
+    0x49,
+    0x27,
+    0x6d,
+    0x20,
+    0x68,
+    0x61,
+    0x76,
+    0x69,
+    0x6e,
+    0x67,
+    0x20,
+    0x61,
+    0x20,
+    0x77,
+    0x6f,
+    0x6e,
+    0x64,
+    0x65,
+    0x72,
+    0x66,
+    0x75,
+    0x6c,
+    0x20,
+    0x74,
+    0x69,
+    0x6d,
+    0x65,
 };
 
 static const unsigned char rx_script_8c_in[] = {
-    0x5b,                           /* Short, 1-RTT, PN Length=2 bytes, KP=0 */
-    0x98, 0xd6,                     /* PN (3) */
-    0x3c, 0x6f, 0x94, 0x20, 0x5e, 0xfc, 0x5b, 0x3a, 0x4a, 0x65, 0x1a, 0x9a,
-    0x6c, 0x00, 0x52, 0xb6, 0x0c, 0x9b, 0x07, 0xf9, 0x6f, 0xbc, 0x3d, 0xb4,
-    0x57, 0xe0, 0x15, 0x74, 0xfe, 0x76, 0xea, 0x1f, 0x23, 0xae, 0x22, 0x62,
-    0xb7, 0x90, 0x94, 0x89, 0x38, 0x9b, 0x5b, 0x47, 0xed,
+    0x5b, /* Short, 1-RTT, PN Length=2 bytes, KP=0 */
+    0x98,
+    0xd6, /* PN (3) */
+    0x3c,
+    0x6f,
+    0x94,
+    0x20,
+    0x5e,
+    0xfc,
+    0x5b,
+    0x3a,
+    0x4a,
+    0x65,
+    0x1a,
+    0x9a,
+    0x6c,
+    0x00,
+    0x52,
+    0xb6,
+    0x0c,
+    0x9b,
+    0x07,
+    0xf9,
+    0x6f,
+    0xbc,
+    0x3d,
+    0xb4,
+    0x57,
+    0xe0,
+    0x15,
+    0x74,
+    0xfe,
+    0x76,
+    0xea,
+    0x1f,
+    0x23,
+    0xae,
+    0x22,
+    0x62,
+    0xb7,
+    0x90,
+    0x94,
+    0x89,
+    0x38,
+    0x9b,
+    0x5b,
+    0x47,
+    0xed,
 };
 
 static const QUIC_PKT_HDR rx_script_8c_expect_hdr = {
     QUIC_PKT_TYPE_1RTT,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    0,          /* Version */
-    {0, {0}},   /* DCID */
-    {0, {0}},   /* SCID */
-    {0, 3},     /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    0, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0, 3 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     29, NULL
 };
 
 static const unsigned char rx_script_8c_body[] = {
-    0x08, 0x00, 0x49, 0x27, 0x6d, 0x20, 0x68, 0x61, 0x76, 0x69, 0x6e, 0x67,
-    0x20, 0x61, 0x20, 0x77, 0x6f, 0x6e, 0x64, 0x65, 0x72, 0x66, 0x75, 0x6c,
-    0x20, 0x74, 0x69, 0x6d, 0x65,
+    0x08,
+    0x00,
+    0x49,
+    0x27,
+    0x6d,
+    0x20,
+    0x68,
+    0x61,
+    0x76,
+    0x69,
+    0x6e,
+    0x67,
+    0x20,
+    0x61,
+    0x20,
+    0x77,
+    0x6f,
+    0x6e,
+    0x64,
+    0x65,
+    0x72,
+    0x66,
+    0x75,
+    0x6c,
+    0x20,
+    0x74,
+    0x69,
+    0x6d,
+    0x65,
 };
 
 static const unsigned char rx_script_8d_in[] = {
-    0x55,                           /* Short, 1-RTT, PN Length=2 bytes, KP=1 */
-    0x98, 0x20,                     /* PN (6) */
-    0x45, 0x53, 0x05, 0x29, 0x30, 0x42, 0x29, 0x02, 0xf2, 0xa7, 0x27, 0xd6,
-    0xb0, 0xb7, 0x30, 0xad, 0x45, 0xd8, 0x73, 0xd7, 0xe3, 0x65, 0xee, 0xd9,
-    0x35, 0x33, 0x03, 0x3a, 0x35, 0x0b, 0x59, 0xa7, 0xbc, 0x23, 0x37, 0xc2,
-    0x5e, 0x13, 0x88, 0x18, 0x79, 0x94, 0x6c, 0x15, 0xe3, 0x1f, 0x0d, 0xd1,
-    0xc3, 0xfa, 0x40, 0xff,
+    0x55, /* Short, 1-RTT, PN Length=2 bytes, KP=1 */
+    0x98,
+    0x20, /* PN (6) */
+    0x45,
+    0x53,
+    0x05,
+    0x29,
+    0x30,
+    0x42,
+    0x29,
+    0x02,
+    0xf2,
+    0xa7,
+    0x27,
+    0xd6,
+    0xb0,
+    0xb7,
+    0x30,
+    0xad,
+    0x45,
+    0xd8,
+    0x73,
+    0xd7,
+    0xe3,
+    0x65,
+    0xee,
+    0xd9,
+    0x35,
+    0x33,
+    0x03,
+    0x3a,
+    0x35,
+    0x0b,
+    0x59,
+    0xa7,
+    0xbc,
+    0x23,
+    0x37,
+    0xc2,
+    0x5e,
+    0x13,
+    0x88,
+    0x18,
+    0x79,
+    0x94,
+    0x6c,
+    0x15,
+    0xe3,
+    0x1f,
+    0x0d,
+    0xd1,
+    0xc3,
+    0xfa,
+    0x40,
+    0xff,
 };
 
 static const QUIC_PKT_HDR rx_script_8d_expect_hdr = {
     QUIC_PKT_TYPE_1RTT,
-    0,          /* Spin Bit */
-    1,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    0,          /* Version */
-    {0, {0}},   /* DCID */
-    {0, {0}},   /* SCID */
-    {0, 6},     /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    1, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    0, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0, 6 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     36, NULL
 };
 
 static const unsigned char rx_script_8d_body[] = {
-    0x02, 0x05, 0x03, 0x00, 0x00, 0x0c, 0x00, 0x40, 0x51, 0x49, 0x27, 0x6d,
-    0x20, 0x68, 0x61, 0x76, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x20, 0x77, 0x6f,
-    0x6e, 0x64, 0x65, 0x72, 0x66, 0x75, 0x6c, 0x20, 0x74, 0x69, 0x6d, 0x65,
+    0x02,
+    0x05,
+    0x03,
+    0x00,
+    0x00,
+    0x0c,
+    0x00,
+    0x40,
+    0x51,
+    0x49,
+    0x27,
+    0x6d,
+    0x20,
+    0x68,
+    0x61,
+    0x76,
+    0x69,
+    0x6e,
+    0x67,
+    0x20,
+    0x61,
+    0x20,
+    0x77,
+    0x6f,
+    0x6e,
+    0x64,
+    0x65,
+    0x72,
+    0x66,
+    0x75,
+    0x6c,
+    0x20,
+    0x74,
+    0x69,
+    0x6d,
+    0x65,
 };
 
 static const unsigned char rx_script_8e_in[] = {
-    0x55,                           /* Short, 1-RTTT, PN Length=2 bytes, KP=0 */
-    0x76, 0x25,                     /* PN (10) */
-    0x1c, 0x0d, 0x70, 0x4c, 0x2b, 0xc5, 0x7d, 0x7b, 0x77, 0x64, 0x03, 0x27,
-    0xb3, 0x5d, 0x83, 0x9e, 0x35, 0x05, 0x10, 0xd2, 0xa4, 0x5c, 0x83, 0xd6,
-    0x94, 0x12, 0x18, 0xc5, 0xb3, 0x0f, 0x0a, 0xb1, 0x8a, 0x82, 0x9f, 0xd6,
-    0xa9, 0xab, 0x40, 0xc1, 0x05, 0xe8, 0x1b, 0x74, 0xaa, 0x8e, 0xd6, 0x8b,
-    0xa5, 0xa3, 0x77, 0x79,
+    0x55, /* Short, 1-RTTT, PN Length=2 bytes, KP=0 */
+    0x76,
+    0x25, /* PN (10) */
+    0x1c,
+    0x0d,
+    0x70,
+    0x4c,
+    0x2b,
+    0xc5,
+    0x7d,
+    0x7b,
+    0x77,
+    0x64,
+    0x03,
+    0x27,
+    0xb3,
+    0x5d,
+    0x83,
+    0x9e,
+    0x35,
+    0x05,
+    0x10,
+    0xd2,
+    0xa4,
+    0x5c,
+    0x83,
+    0xd6,
+    0x94,
+    0x12,
+    0x18,
+    0xc5,
+    0xb3,
+    0x0f,
+    0x0a,
+    0xb1,
+    0x8a,
+    0x82,
+    0x9f,
+    0xd6,
+    0xa9,
+    0xab,
+    0x40,
+    0xc1,
+    0x05,
+    0xe8,
+    0x1b,
+    0x74,
+    0xaa,
+    0x8e,
+    0xd6,
+    0x8b,
+    0xa5,
+    0xa3,
+    0x77,
+    0x79,
 };
 
 static const QUIC_PKT_HDR rx_script_8e_expect_hdr = {
     QUIC_PKT_TYPE_1RTT,
-    0,          /* Spin Bit */
-    0,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    0,          /* Version */
-    {0, {0}},   /* DCID */
-    {0, {0}},   /* SCID */
-    {0, 10},    /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    0, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    0, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0, 10 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     36, NULL
 };
 
 static const unsigned char rx_script_8e_body[] = {
-    0x02, 0x09, 0x04, 0x00, 0x00, 0x0c, 0x00, 0x40, 0xbd, 0x49, 0x27, 0x6d,
-    0x20, 0x68, 0x61, 0x76, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x20, 0x77, 0x6f,
-    0x6e, 0x64, 0x65, 0x72, 0x66, 0x75, 0x6c, 0x20, 0x74, 0x69, 0x6d, 0x65,
+    0x02,
+    0x09,
+    0x04,
+    0x00,
+    0x00,
+    0x0c,
+    0x00,
+    0x40,
+    0xbd,
+    0x49,
+    0x27,
+    0x6d,
+    0x20,
+    0x68,
+    0x61,
+    0x76,
+    0x69,
+    0x6e,
+    0x67,
+    0x20,
+    0x61,
+    0x20,
+    0x77,
+    0x6f,
+    0x6e,
+    0x64,
+    0x65,
+    0x72,
+    0x66,
+    0x75,
+    0x6c,
+    0x20,
+    0x74,
+    0x69,
+    0x6d,
+    0x65,
 };
 
 static const unsigned char rx_script_8f_in[] = {
-    0x48,                           /* Short, 1-RTT, PN Length=2 Bytes, KP=1 */
-    0x4d, 0xf6,                     /* PN (15) */
+    0x48, /* Short, 1-RTT, PN Length=2 Bytes, KP=1 */
+    0x4d, 0xf6, /* PN (15) */
     0x42, 0x86, 0xa1, 0xfa, 0x69, 0x6b, 0x1a, 0x45, 0xf2, 0xcd, 0xf6, 0x92,
     0xe1, 0xe6, 0x1a, 0x49, 0x37, 0xd7, 0x10, 0xae, 0x09, 0xbd
 };
 
 static const QUIC_PKT_HDR rx_script_8f_expect_hdr = {
     QUIC_PKT_TYPE_1RTT,
-    0,          /* Spin Bit */
-    1,          /* Key Phase */
-    2,          /* PN Length */
-    0,          /* Partial */
-    1,          /* Fixed */
-    0,          /* Unused */
-    0,          /* Reserved */
-    0,          /* Version */
-    {0, {0}},   /* DCID */
-    {0, {0}},   /* SCID */
-    {0, 15},    /* PN */
-    NULL, 0,    /* Token/Token Len */
+    0, /* Spin Bit */
+    1, /* Key Phase */
+    2, /* PN Length */
+    0, /* Partial */
+    1, /* Fixed */
+    0, /* Unused */
+    0, /* Reserved */
+    0, /* Version */
+    { 0, { 0 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0, 15 }, /* PN */
+    NULL, 0, /* Token/Token Len */
     6, NULL
 };
 
@@ -1583,28 +8841,28 @@ static const unsigned char rx_script_8f_body[] = {
 
 static const struct rx_test_op rx_script_8[] = {
     RX_OP_ALLOW_1RTT()
-    RX_OP_SET_RX_DCID(empty_conn_id)
+        RX_OP_SET_RX_DCID(empty_conn_id)
     /* Inject before we get the keys */
     RX_OP_INJECT_N(8a)
     /* Nothing yet */
     RX_OP_CHECK_NO_PKT()
     /* Provide keys */
     RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT,
-                         QRL_SUITE_AES128GCM, rx_script_8_1rtt_secret)
+        QRL_SUITE_AES128GCM, rx_script_8_1rtt_secret)
     /* Now the injected packet is successfully returned */
     RX_OP_CHECK_PKT_N(8a)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_CHECK_KEY_EPOCH(0)
-    RX_OP_CHECK_PKT_EPOCH(0)
+        RX_OP_CHECK_NO_PKT()
+            RX_OP_CHECK_KEY_EPOCH(0)
+                RX_OP_CHECK_PKT_EPOCH(0)
 
     /* Packet with new key phase */
     RX_OP_INJECT_N(8b)
     /* Packet is successfully decrypted and returned */
     RX_OP_CHECK_PKT_N(8b)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_CHECK_NO_PKT()
     /* Key epoch has increased */
     RX_OP_CHECK_KEY_EPOCH(1)
-    RX_OP_CHECK_PKT_EPOCH(1)
+        RX_OP_CHECK_PKT_EPOCH(1)
 
     /*
      * Now inject an old packet with the old keys (perhaps reordered in
@@ -1613,87 +8871,87 @@ static const struct rx_test_op rx_script_8[] = {
     RX_OP_INJECT_N(8c)
     /* Should still be decrypted OK */
     RX_OP_CHECK_PKT_N(8c)
-    RX_OP_CHECK_NO_PKT()
+        RX_OP_CHECK_NO_PKT()
     /* Epoch has not changed */
     RX_OP_CHECK_KEY_EPOCH(1)
-    RX_OP_CHECK_PKT_EPOCH(0)
+        RX_OP_CHECK_PKT_EPOCH(0)
 
     /* Another packet with the new keys. */
     RX_OP_INJECT_N(8d)
-    RX_OP_CHECK_PKT_N(8d)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_CHECK_KEY_EPOCH(1)
-    RX_OP_CHECK_PKT_EPOCH(1)
+        RX_OP_CHECK_PKT_N(8d)
+            RX_OP_CHECK_NO_PKT()
+                RX_OP_CHECK_KEY_EPOCH(1)
+                    RX_OP_CHECK_PKT_EPOCH(1)
 
     /* We can inject the old packet multiple times and it still works */
     RX_OP_INJECT_N(8c)
-    RX_OP_CHECK_PKT_N(8c)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_CHECK_KEY_EPOCH(1)
-    RX_OP_CHECK_PKT_EPOCH(0)
+        RX_OP_CHECK_PKT_N(8c)
+            RX_OP_CHECK_NO_PKT()
+                RX_OP_CHECK_KEY_EPOCH(1)
+                    RX_OP_CHECK_PKT_EPOCH(0)
 
     /* Until we move from UPDATING to COOLDOWN */
     RX_OP_KEY_UPDATE_TIMEOUT(0)
-    RX_OP_INJECT_N(8c)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_CHECK_KEY_EPOCH(1)
+        RX_OP_INJECT_N(8c)
+            RX_OP_CHECK_NO_PKT()
+                RX_OP_CHECK_KEY_EPOCH(1)
 
     /*
      * Injecting a packet from the next epoch (epoch 2) while in COOLDOWN
      * doesn't work
      */
     RX_OP_INJECT_N(8e)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_CHECK_KEY_EPOCH(1)
+        RX_OP_CHECK_NO_PKT()
+            RX_OP_CHECK_KEY_EPOCH(1)
 
     /* Move from COOLDOWN to NORMAL and try again */
     RX_OP_KEY_UPDATE_TIMEOUT(1)
-    RX_OP_INJECT_N(8e)
-    RX_OP_CHECK_PKT_N(8e)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_CHECK_KEY_EPOCH(2)
-    RX_OP_CHECK_PKT_EPOCH(2)
+        RX_OP_INJECT_N(8e)
+            RX_OP_CHECK_PKT_N(8e)
+                RX_OP_CHECK_NO_PKT()
+                    RX_OP_CHECK_KEY_EPOCH(2)
+                        RX_OP_CHECK_PKT_EPOCH(2)
 
     /* Can still receive old packet */
     RX_OP_INJECT_N(8d)
-    RX_OP_CHECK_PKT_N(8d)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_CHECK_KEY_EPOCH(2)
-    RX_OP_CHECK_PKT_EPOCH(1)
+        RX_OP_CHECK_PKT_N(8d)
+            RX_OP_CHECK_NO_PKT()
+                RX_OP_CHECK_KEY_EPOCH(2)
+                    RX_OP_CHECK_PKT_EPOCH(1)
 
     /* Move straight from UPDATING to NORMAL */
     RX_OP_KEY_UPDATE_TIMEOUT(1)
 
     /* Try a packet from epoch 3 */
     RX_OP_INJECT_N(8f)
-    RX_OP_CHECK_PKT_N(8f)
-    RX_OP_CHECK_NO_PKT()
-    RX_OP_CHECK_KEY_EPOCH(3)
-    RX_OP_CHECK_PKT_EPOCH(3)
+        RX_OP_CHECK_PKT_N(8f)
+            RX_OP_CHECK_NO_PKT()
+                RX_OP_CHECK_KEY_EPOCH(3)
+                    RX_OP_CHECK_PKT_EPOCH(3)
 
-    RX_OP_END
+                        RX_OP_END
 };
 
 /* 9. 1-RTT Deferral Test */
 static const struct rx_test_op rx_script_9[] = {
     RX_OP_SET_RX_DCID(empty_conn_id)
-    RX_OP_PROVIDE_SECRET_INITIAL(rx_script_5_c2s_init_dcid)
-    RX_OP_INJECT_N(5)
+        RX_OP_PROVIDE_SECRET_INITIAL(rx_script_5_c2s_init_dcid)
+            RX_OP_INJECT_N(5)
 
-    RX_OP_CHECK_PKT_N(5a)
-    RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
+                RX_OP_CHECK_PKT_N(5a)
+                    RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
     RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE,
-                      QRL_SUITE_AES128GCM, rx_script_5_handshake_secret)
-    RX_OP_CHECK_PKT_N(5b)
-    RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
+        QRL_SUITE_AES128GCM, rx_script_5_handshake_secret)
+        RX_OP_CHECK_PKT_N(5b)
+            RX_OP_CHECK_NO_PKT() /* not got secret for next packet yet */
     RX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT,
-                      QRL_SUITE_AES128GCM, rx_script_5_1rtt_secret)
-    RX_OP_CHECK_NO_PKT() /* still nothing - 1-RTT not enabled */
+        QRL_SUITE_AES128GCM, rx_script_5_1rtt_secret)
+        RX_OP_CHECK_NO_PKT() /* still nothing - 1-RTT not enabled */
     RX_OP_ALLOW_1RTT()
-    RX_OP_CHECK_PKT_N(5c) /* now we get the 1-RTT packet */
+        RX_OP_CHECK_PKT_N(5c) /* now we get the 1-RTT packet */
     RX_OP_CHECK_NO_PKT()
 
-    RX_OP_END
+        RX_OP_END
 };
 
 static const struct rx_test_op *rx_scripts[] = {
@@ -1713,19 +8971,19 @@ static const struct rx_test_op *rx_scripts[] = {
 };
 
 struct rx_state {
-    QUIC_DEMUX         *demux;
+    QUIC_DEMUX *demux;
 
     /* OSSL_QRX with necessary data */
-    OSSL_QRX           *qrx;
-    OSSL_QRX_ARGS       args;
+    OSSL_QRX *qrx;
+    OSSL_QRX_ARGS args;
 
     /* Used for the RX depacketizer */
-    SSL_CTX            *quic_ssl_ctx;
-    QUIC_CONNECTION    *quic_conn;
+    SSL_CTX *quic_ssl_ctx;
+    QUIC_CONNECTION *quic_conn;
 
-    QUIC_CONN_ID        rx_dcid;
+    QUIC_CONN_ID rx_dcid;
 
-    int                 allow_1rtt;
+    int allow_1rtt;
 };
 
 static void rx_state_teardown(struct rx_state *s)
@@ -1763,7 +9021,7 @@ static OSSL_TIME fake_time(void *arg)
 }
 
 static void demux_default_handler(QUIC_URXE *e, void *arg,
-                                  const QUIC_CONN_ID *dcid)
+    const QUIC_CONN_ID *dcid)
 {
     struct rx_state *s = arg;
 
@@ -1777,13 +9035,13 @@ static int rx_state_ensure(struct rx_state *s)
 {
     if (s->demux == NULL
         && !TEST_ptr(s->demux = ossl_quic_demux_new(NULL,
-                                                    s->args.short_conn_id_len,
-                                                    fake_time,
-                                                    NULL)))
+                         s->args.short_conn_id_len,
+                         fake_time,
+                         NULL)))
         return 0;
 
-    s->args.demux           = s->demux;
-    s->args.max_deferred    = 32;
+    s->args.demux = s->demux;
+    s->args.max_deferred = 32;
 
     /* Initialise OSSL_QRX */
     if (s->qrx == NULL
@@ -1801,7 +9059,7 @@ static int rx_state_ensure(struct rx_state *s)
 static int rx_run_script(const struct rx_test_op *script)
 {
     int testresult = 0;
-    struct rx_state s = {0};
+    struct rx_state s = { 0 };
     size_t i;
     OSSL_QRX_PKT *pkt = NULL;
     const struct rx_test_op *op = script;
@@ -1809,122 +9067,122 @@ static int rx_run_script(const struct rx_test_op *script)
 
     for (; op->op != RX_TEST_OP_END; ++op)
         switch (op->op) {
-            case RX_TEST_OP_SET_SCID_LEN:
-                rx_state_teardown(&s);
-                s.args.short_conn_id_len = op->enc_level;
-                break;
-            case RX_TEST_OP_SET_INIT_LARGEST_PN:
-                rx_state_teardown(&s);
-                for (i = 0; i < QUIC_PN_SPACE_NUM; ++i)
-                    s.args.init_largest_pn[i] = op->largest_pn;
-                break;
-            case RX_TEST_OP_SET_RX_DCID:
-                if (!TEST_true(rx_state_ensure(&s)))
-                    goto err;
-                s.rx_dcid = *op->dcid;
-                break;
-            case RX_TEST_OP_PROVIDE_SECRET:
-                if (!TEST_true(rx_state_ensure(&s)))
-                    goto err;
-                if (!TEST_true(ossl_qrx_provide_secret(s.qrx, op->enc_level,
-                                                       op->suite_id, NULL,
-                                                       op->buf,
-                                                       op->buf_len)))
-                    goto err;
-                break;
-            case RX_TEST_OP_PROVIDE_SECRET_INITIAL:
-                if (!TEST_true(rx_state_ensure(&s)))
-                    goto err;
-                if (!TEST_true(ossl_quic_provide_initial_secret(NULL, NULL,
-                                                                op->dcid, 0,
-                                                                s.qrx, NULL)))
-                    goto err;
-                break;
-            case RX_TEST_OP_DISCARD_EL:
-                if (!TEST_true(rx_state_ensure(&s)))
-                    goto err;
-                if (!TEST_true(ossl_qrx_discard_enc_level(s.qrx, op->enc_level)))
-                    goto err;
-                break;
-            case RX_TEST_OP_INJECT:
-                if (!TEST_true(rx_state_ensure(&s)))
-                    goto err;
-                if (!TEST_true(ossl_quic_demux_inject(s.demux,
-                                                      op->buf, op->buf_len,
-                                                      NULL, NULL)))
-                    goto err;
-                break;
-            case RX_TEST_OP_CHECK_PKT:
-                if (!TEST_true(rx_state_ensure(&s)))
-                    goto err;
-
-                if (!TEST_true(ossl_qrx_read_pkt(s.qrx, &pkt)))
-                    goto err;
+        case RX_TEST_OP_SET_SCID_LEN:
+            rx_state_teardown(&s);
+            s.args.short_conn_id_len = op->enc_level;
+            break;
+        case RX_TEST_OP_SET_INIT_LARGEST_PN:
+            rx_state_teardown(&s);
+            for (i = 0; i < QUIC_PN_SPACE_NUM; ++i)
+                s.args.init_largest_pn[i] = op->largest_pn;
+            break;
+        case RX_TEST_OP_SET_RX_DCID:
+            if (!TEST_true(rx_state_ensure(&s)))
+                goto err;
+            s.rx_dcid = *op->dcid;
+            break;
+        case RX_TEST_OP_PROVIDE_SECRET:
+            if (!TEST_true(rx_state_ensure(&s)))
+                goto err;
+            if (!TEST_true(ossl_qrx_provide_secret(s.qrx, op->enc_level,
+                    op->suite_id, NULL,
+                    op->buf,
+                    op->buf_len)))
+                goto err;
+            break;
+        case RX_TEST_OP_PROVIDE_SECRET_INITIAL:
+            if (!TEST_true(rx_state_ensure(&s)))
+                goto err;
+            if (!TEST_true(ossl_quic_provide_initial_secret(NULL, NULL,
+                    op->dcid, 0,
+                    s.qrx, NULL)))
+                goto err;
+            break;
+        case RX_TEST_OP_DISCARD_EL:
+            if (!TEST_true(rx_state_ensure(&s)))
+                goto err;
+            if (!TEST_true(ossl_qrx_discard_enc_level(s.qrx, op->enc_level)))
+                goto err;
+            break;
+        case RX_TEST_OP_INJECT:
+            if (!TEST_true(rx_state_ensure(&s)))
+                goto err;
+            if (!TEST_true(ossl_quic_demux_inject(s.demux,
+                    op->buf, op->buf_len,
+                    NULL, NULL)))
+                goto err;
+            break;
+        case RX_TEST_OP_CHECK_PKT:
+            if (!TEST_true(rx_state_ensure(&s)))
+                goto err;
 
-                if (!TEST_ptr(pkt) || !TEST_ptr(pkt->hdr))
-                    goto err;
+            if (!TEST_true(ossl_qrx_read_pkt(s.qrx, &pkt)))
+                goto err;
 
-                if (!TEST_mem_eq(pkt->hdr->data, pkt->hdr->len,
-                                 op->buf, op->buf_len))
-                    goto err;
+            if (!TEST_ptr(pkt) || !TEST_ptr(pkt->hdr))
+                goto err;
 
-                if (!TEST_true(cmp_pkt_hdr(pkt->hdr, op->hdr,
-                                           op->buf, op->buf_len, 1)))
-                    goto err;
+            if (!TEST_mem_eq(pkt->hdr->data, pkt->hdr->len,
+                    op->buf, op->buf_len))
+                goto err;
 
-                last_key_epoch = pkt->key_epoch;
+            if (!TEST_true(cmp_pkt_hdr(pkt->hdr, op->hdr,
+                    op->buf, op->buf_len, 1)))
+                goto err;
 
-                ossl_qrx_pkt_release(pkt);
-                pkt = NULL;
-                break;
-            case RX_TEST_OP_CHECK_NO_PKT:
-                if (!TEST_true(rx_state_ensure(&s)))
-                    goto err;
+            last_key_epoch = pkt->key_epoch;
 
-                if (!TEST_false(ossl_qrx_read_pkt(s.qrx, &pkt)))
-                    goto err;
+            ossl_qrx_pkt_release(pkt);
+            pkt = NULL;
+            break;
+        case RX_TEST_OP_CHECK_NO_PKT:
+            if (!TEST_true(rx_state_ensure(&s)))
+                goto err;
 
-                break;
-            case RX_TEST_OP_CHECK_KEY_EPOCH:
-                if (!TEST_true(rx_state_ensure(&s)))
-                    goto err;
+            if (!TEST_false(ossl_qrx_read_pkt(s.qrx, &pkt)))
+                goto err;
 
-                if (!TEST_uint64_t_eq(ossl_qrx_get_key_epoch(s.qrx),
-                                      op->largest_pn))
-                    goto err;
+            break;
+        case RX_TEST_OP_CHECK_KEY_EPOCH:
+            if (!TEST_true(rx_state_ensure(&s)))
+                goto err;
 
-                break;
-            case RX_TEST_OP_CHECK_PKT_EPOCH:
-                if (!TEST_true(rx_state_ensure(&s)))
-                    goto err;
+            if (!TEST_uint64_t_eq(ossl_qrx_get_key_epoch(s.qrx),
+                    op->largest_pn))
+                goto err;
 
-                if (!TEST_uint64_t_eq(last_key_epoch, op->largest_pn))
-                    goto err;
+            break;
+        case RX_TEST_OP_CHECK_PKT_EPOCH:
+            if (!TEST_true(rx_state_ensure(&s)))
+                goto err;
 
-                break;
-            case RX_TEST_OP_KEY_UPDATE_TIMEOUT:
-                if (!TEST_true(rx_state_ensure(&s)))
-                    goto err;
+            if (!TEST_uint64_t_eq(last_key_epoch, op->largest_pn))
+                goto err;
 
-                if (!TEST_true(ossl_qrx_key_update_timeout(s.qrx,
-                                                           op->enc_level)))
-                    goto err;
+            break;
+        case RX_TEST_OP_KEY_UPDATE_TIMEOUT:
+            if (!TEST_true(rx_state_ensure(&s)))
+                goto err;
 
-                break;
-            case RX_TEST_OP_SET_INIT_KEY_PHASE:
-                rx_state_teardown(&s);
-                s.args.init_key_phase_bit = (unsigned char)op->enc_level;
-                break;
-            case RX_TEST_OP_ALLOW_1RTT:
-                s.allow_1rtt = 1;
+            if (!TEST_true(ossl_qrx_key_update_timeout(s.qrx,
+                    op->enc_level)))
+                goto err;
 
-                if (!TEST_true(rx_state_ensure(&s)))
-                    goto err;
+            break;
+        case RX_TEST_OP_SET_INIT_KEY_PHASE:
+            rx_state_teardown(&s);
+            s.args.init_key_phase_bit = (unsigned char)op->enc_level;
+            break;
+        case RX_TEST_OP_ALLOW_1RTT:
+            s.allow_1rtt = 1;
 
-                break;
-            default:
-                OPENSSL_assert(0);
+            if (!TEST_true(rx_state_ensure(&s)))
                 goto err;
+
+            break;
+        default:
+            OPENSSL_assert(0);
+            goto err;
         }
 
     testresult = 1;
@@ -1957,13 +9215,13 @@ struct pkt_hdr_test {
 
 /* Packet Header Test 1: INITIAL With SCID */
 static const unsigned char pkt_hdr_test_1_expected[] = {
-    0xc1,                     /* Long|Fixed, Type=Initial, PN Len=2 */
-    0x00, 0x00, 0x00, 0x01,   /* Version */
-    0x00,                     /* DCID Length */
+    0xc1, /* Long|Fixed, Type=Initial, PN Len=2 */
+    0x00, 0x00, 0x00, 0x01, /* Version */
+    0x00, /* DCID Length */
     0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID Length, SCID */
-    0x00,                     /* Token Length */
-    0x15,                     /* Length=21 */
-    0x33, 0x44,               /* Encoded PN */
+    0x00, /* Token Length */
+    0x15, /* Length=21 */
+    0x33, 0x44, /* Encoded PN */
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* Payload */
     0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22
@@ -1977,37 +9235,37 @@ static const unsigned char pkt_hdr_test_1_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_1 = {
     {
-        QUIC_PKT_TYPE_INITIAL,  /* type */
-        0,                      /* spin bit */
-        0,                      /* key phase */
-        2,                      /* PN length */
-        0,                      /* partial */
-        1,                      /* fixed */
-        0,                      /* unused */
-        0,                      /* reserved */
-        1,                      /* version */
-        { 0, {0} },             /* DCID */
-        { 8, {0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
-        { 0x33, 0x44 },         /* PN */
-        NULL, 0,                /* Token/Token Len */
-        19, NULL                /* Len/Data */
+        QUIC_PKT_TYPE_INITIAL, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        2, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        1, /* version */
+        { 0, { 0 } }, /* DCID */
+        { 8, { 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
+        { 0x33, 0x44 }, /* PN */
+        NULL, 0, /* Token/Token Len */
+        19, NULL /* Len/Data */
     },
     pkt_hdr_test_1_expected, OSSL_NELEM(pkt_hdr_test_1_expected),
-    pkt_hdr_test_1_payload,  OSSL_NELEM(pkt_hdr_test_1_payload),
+    pkt_hdr_test_1_payload, OSSL_NELEM(pkt_hdr_test_1_payload),
     0, sizeof(pkt_hdr_test_1_expected),
     17, 21
 };
 
 /* Packet Header Test 2: INITIAL With SCID and Token */
 static const unsigned char pkt_hdr_test_2_expected[] = {
-    0xc1,                     /* Long|Fixed, Type=Initial, PN Len=2 */
-    0x00, 0x00, 0x00, 0x01,   /* Version */
-    0x00,                     /* DCID Length */
+    0xc1, /* Long|Fixed, Type=Initial, PN Len=2 */
+    0x00, 0x00, 0x00, 0x01, /* Version */
+    0x00, /* DCID Length */
     0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID Length, SCID */
-    0x07,                     /* Token Length */
+    0x07, /* Token Length */
     0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
-    0x15,                     /* Length=21 */
-    0x33, 0x44,               /* Encoded PN */
+    0x15, /* Length=21 */
+    0x33, 0x44, /* Encoded PN */
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* Payload */
     0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22
@@ -2025,38 +9283,38 @@ static const unsigned char pkt_hdr_test_2_token[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_2 = {
     {
-        QUIC_PKT_TYPE_INITIAL,  /* type */
-        0,                      /* spin bit */
-        0,                      /* key phase */
-        2,                      /* PN length */
-        0,                      /* partial */
-        1,                      /* fixed */
-        0,                      /* unused */
-        0,                      /* reserved */
-        1,                      /* version */
-        { 0, {0} },             /* DCID */
-        { 8, {0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
-        { 0x33, 0x44 },         /* PN */
+        QUIC_PKT_TYPE_INITIAL, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        2, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        1, /* version */
+        { 0, { 0 } }, /* DCID */
+        { 8, { 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
+        { 0x33, 0x44 }, /* PN */
         pkt_hdr_test_2_token, sizeof(pkt_hdr_test_2_token), /* Token */
-        19, NULL                /* Len/Data */
+        19, NULL /* Len/Data */
     },
     pkt_hdr_test_2_expected, OSSL_NELEM(pkt_hdr_test_2_expected),
-    pkt_hdr_test_2_payload,  OSSL_NELEM(pkt_hdr_test_2_payload),
+    pkt_hdr_test_2_payload, OSSL_NELEM(pkt_hdr_test_2_payload),
     0, sizeof(pkt_hdr_test_2_expected),
     24, 28
 };
 
 /* Packet Header Test 3: INITIAL With DCID and SCID and Token */
 static const unsigned char pkt_hdr_test_3_expected[] = {
-    0xc1,                     /* Long|Fixed, Type=Initial, PN Len=2 */
-    0x00, 0x00, 0x00, 0x01,   /* Version */
-    0x03,                     /* DCID Length */
-    0x70, 0x71, 0x72,         /* DCID */
+    0xc1, /* Long|Fixed, Type=Initial, PN Len=2 */
+    0x00, 0x00, 0x00, 0x01, /* Version */
+    0x03, /* DCID Length */
+    0x70, 0x71, 0x72, /* DCID */
     0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID Length, SCID */
-    0x06,                     /* Token Length */
+    0x06, /* Token Length */
     0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
-    0x15,                     /* Length=21 */
-    0x33, 0x44,               /* Encoded PN */
+    0x15, /* Length=21 */
+    0x33, 0x44, /* Encoded PN */
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* Payload */
     0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22
@@ -2074,36 +9332,36 @@ static const unsigned char pkt_hdr_test_3_token[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_3 = {
     {
-        QUIC_PKT_TYPE_INITIAL,  /* type */
-        0,                      /* spin bit */
-        0,                      /* key phase */
-        2,                      /* PN length */
-        0,                      /* partial */
-        1,                      /* fixed */
-        0,                      /* unused */
-        0,                      /* reserved */
-        1,                      /* version */
-        { 3, {0x70, 0x71, 0x72} },                                /* DCID */
-        { 8, {0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
-        { 0x33, 0x44 },         /* PN */
+        QUIC_PKT_TYPE_INITIAL, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        2, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        1, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 8, { 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
+        { 0x33, 0x44 }, /* PN */
         pkt_hdr_test_3_token, sizeof(pkt_hdr_test_3_token), /* Token */
-        19, NULL                /* Len/Data */
+        19, NULL /* Len/Data */
     },
     pkt_hdr_test_3_expected, OSSL_NELEM(pkt_hdr_test_3_expected),
-    pkt_hdr_test_3_payload,  OSSL_NELEM(pkt_hdr_test_3_payload),
+    pkt_hdr_test_3_payload, OSSL_NELEM(pkt_hdr_test_3_payload),
     0, sizeof(pkt_hdr_test_3_expected),
     26, 30
 };
 
 /* Packet Header Test 4: 0-RTT */
 static const unsigned char pkt_hdr_test_4_expected[] = {
-    0xd0,                     /* Long|Fixed, Type=0-RTT, PN Len=1 */
-    0x00, 0x00, 0x00, 0x01,   /* Version */
-    0x03,                     /* DCID Length */
-    0x70, 0x71, 0x72,         /* DCID */
+    0xd0, /* Long|Fixed, Type=0-RTT, PN Len=1 */
+    0x00, 0x00, 0x00, 0x01, /* Version */
+    0x03, /* DCID Length */
+    0x70, 0x71, 0x72, /* DCID */
     0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID Length, SCID */
-    0x14,                     /* Length=20 */
-    0x33,                     /* Encoded PN */
+    0x14, /* Length=20 */
+    0x33, /* Encoded PN */
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* Payload */
     0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22
@@ -2117,36 +9375,36 @@ static const unsigned char pkt_hdr_test_4_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_4 = {
     {
-        QUIC_PKT_TYPE_0RTT,     /* type */
-        0,                      /* spin bit */
-        0,                      /* key phase */
-        1,                      /* PN length */
-        0,                      /* partial */
-        1,                      /* fixed */
-        0,                      /* unused */
-        0,                      /* reserved */
-        1,                      /* version */
-        { 3, {0x70, 0x71, 0x72} },                                /* DCID */
-        { 8, {0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
-        { 0x33 },               /* PN */
-        NULL, 0,                /* Token */
-        19, NULL                /* Len/Data */
+        QUIC_PKT_TYPE_0RTT, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        1, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        1, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 8, { 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
+        { 0x33 }, /* PN */
+        NULL, 0, /* Token */
+        19, NULL /* Len/Data */
     },
     pkt_hdr_test_4_expected, OSSL_NELEM(pkt_hdr_test_4_expected),
-    pkt_hdr_test_4_payload,  OSSL_NELEM(pkt_hdr_test_4_payload),
+    pkt_hdr_test_4_payload, OSSL_NELEM(pkt_hdr_test_4_payload),
     0, sizeof(pkt_hdr_test_4_expected),
     19, 23
 };
 
 /* Packet Header Test 5: Handshake */
 static const unsigned char pkt_hdr_test_5_expected[] = {
-    0xe0,                     /* Long|Fixed, Type=Handshake, PN Len=1 */
-    0x00, 0x00, 0x00, 0x01,   /* Version */
-    0x03,                     /* DCID Length */
-    0x70, 0x71, 0x72,         /* DCID */
+    0xe0, /* Long|Fixed, Type=Handshake, PN Len=1 */
+    0x00, 0x00, 0x00, 0x01, /* Version */
+    0x03, /* DCID Length */
+    0x70, 0x71, 0x72, /* DCID */
     0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID Length, SCID */
-    0x14,                     /* Length=20 */
-    0x33,                     /* Encoded PN */
+    0x14, /* Length=20 */
+    0x33, /* Encoded PN */
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* Payload */
     0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22
@@ -2160,73 +9418,73 @@ static const unsigned char pkt_hdr_test_5_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_5 = {
     {
-        QUIC_PKT_TYPE_HANDSHAKE,    /* type */
-        0,                          /* spin bit */
-        0,                          /* key phase */
-        1,                          /* PN length */
-        0,                          /* partial */
-        1,                          /* fixed */
-        0,                          /* unused */
-        0,                          /* reserved */
-        1,                          /* version */
-        { 3, {0x70, 0x71, 0x72} },                                /* DCID */
-        { 8, {0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
-        { 0x33 },                   /* PN */
-        NULL, 0,                    /* Token */
-        19, NULL                    /* Len/Data */
+        QUIC_PKT_TYPE_HANDSHAKE, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        1, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        1, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 8, { 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
+        { 0x33 }, /* PN */
+        NULL, 0, /* Token */
+        19, NULL /* Len/Data */
     },
     pkt_hdr_test_5_expected, OSSL_NELEM(pkt_hdr_test_5_expected),
-    pkt_hdr_test_5_payload,  OSSL_NELEM(pkt_hdr_test_5_payload),
+    pkt_hdr_test_5_payload, OSSL_NELEM(pkt_hdr_test_5_payload),
     0, sizeof(pkt_hdr_test_5_expected),
     19, 23
 };
 
 /* Packet Header Test 6: Retry */
 static const unsigned char pkt_hdr_test_6_expected[] = {
-    0xf0,                     /* Long|Fixed, Type=Retry */
-    0x00, 0x00, 0x00, 0x01,   /* Version */
-    0x03,                     /* DCID Length */
-    0x70, 0x71, 0x72,         /* DCID */
+    0xf0, /* Long|Fixed, Type=Retry */
+    0x00, 0x00, 0x00, 0x01, /* Version */
+    0x03, /* DCID Length */
+    0x70, 0x71, 0x72, /* DCID */
     0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID Length, SCID */
-    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,       /* Retry Token */
+    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* Retry Token */
     0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
-    0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f              /* Retry Integrity Tag */
+    0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f /* Retry Integrity Tag */
 };
 
 static const unsigned char pkt_hdr_test_6_payload[] = {
-    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,       /* Retry Token */
+    0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* Retry Token */
     0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
-    0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f              /* Retry Integrity Tag */
+    0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f /* Retry Integrity Tag */
 };
 
 static const struct pkt_hdr_test pkt_hdr_test_6 = {
     {
-        QUIC_PKT_TYPE_RETRY,        /* type */
-        0,                          /* spin bit */
-        0,                          /* key phase */
-        0,                          /* PN length */
-        0,                          /* partial */
-        1,                          /* fixed */
-        0,                          /* unused */
-        0,                          /* reserved */
-        1,                          /* version */
-        { 3, {0x70, 0x71, 0x72} },                                /* DCID */
-        { 8, {0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
-        { 0 },                      /* PN */
-        NULL, 0,                    /* Token */
-        24, NULL                    /* Len/Data */
+        QUIC_PKT_TYPE_RETRY, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        0, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        1, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 8, { 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
+        { 0 }, /* PN */
+        NULL, 0, /* Token */
+        24, NULL /* Len/Data */
     },
     pkt_hdr_test_6_expected, OSSL_NELEM(pkt_hdr_test_6_expected),
-    pkt_hdr_test_6_payload,  OSSL_NELEM(pkt_hdr_test_6_payload),
+    pkt_hdr_test_6_payload, OSSL_NELEM(pkt_hdr_test_6_payload),
     0, 21,
     SIZE_MAX, SIZE_MAX
 };
 
 /* Packet Header Test 7: 1-RTT */
 static const unsigned char pkt_hdr_test_7_expected[] = {
-    0x42,                     /* Short|Fixed, Type=1-RTT, PN Len=3 */
-    0x70, 0x71, 0x72,         /* DCID */
-    0x50, 0x51, 0x52,         /* PN */
+    0x42, /* Short|Fixed, Type=1-RTT, PN Len=3 */
+    0x70, 0x71, 0x72, /* DCID */
+    0x50, 0x51, 0x52, /* PN */
     0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
     0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1
 };
@@ -2238,32 +9496,32 @@ static const unsigned char pkt_hdr_test_7_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_7 = {
     {
-        QUIC_PKT_TYPE_1RTT,         /* type */
-        0,                          /* spin bit */
-        0,                          /* key phase */
-        3,                          /* PN length */
-        0,                          /* partial */
-        1,                          /* fixed */
-        0,                          /* unused */
-        0,                          /* reserved */
-        0,                          /* version */
-        { 3, {0x70, 0x71, 0x72} },  /* DCID */
-        { 0, {0} },                 /* SCID */
-        { 0x50, 0x51, 0x52 },       /* PN */
-        NULL, 0,                    /* Token */
-        18, NULL                    /* Len/Data */
+        QUIC_PKT_TYPE_1RTT, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        3, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        0, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 0, { 0 } }, /* SCID */
+        { 0x50, 0x51, 0x52 }, /* PN */
+        NULL, 0, /* Token */
+        18, NULL /* Len/Data */
     },
     pkt_hdr_test_7_expected, OSSL_NELEM(pkt_hdr_test_7_expected),
-    pkt_hdr_test_7_payload,  OSSL_NELEM(pkt_hdr_test_7_payload),
+    pkt_hdr_test_7_payload, OSSL_NELEM(pkt_hdr_test_7_payload),
     3, 21,
     4, 8
 };
 
 /* Packet Header Test 8: 1-RTT with Spin Bit */
 static const unsigned char pkt_hdr_test_8_expected[] = {
-    0x62,                     /* Short|Fixed, Type=1-RTT, PN Len=3, Spin=1 */
-    0x70, 0x71, 0x72,         /* DCID */
-    0x50, 0x51, 0x52,         /* PN */
+    0x62, /* Short|Fixed, Type=1-RTT, PN Len=3, Spin=1 */
+    0x70, 0x71, 0x72, /* DCID */
+    0x50, 0x51, 0x52, /* PN */
     0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
     0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1
 };
@@ -2275,32 +9533,32 @@ static const unsigned char pkt_hdr_test_8_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_8 = {
     {
-        QUIC_PKT_TYPE_1RTT,         /* type */
-        1,                          /* spin bit */
-        0,                          /* key phase */
-        3,                          /* PN length */
-        0,                          /* partial */
-        1,                          /* fixed */
-        0,                          /* unused */
-        0,                          /* reserved */
-        0,                          /* version */
-        { 3, {0x70, 0x71, 0x72} },  /* DCID */
-        { 0, {0} },                 /* SCID */
-        { 0x50, 0x51, 0x52 },       /* PN */
-        NULL, 0,                    /* Token */
-        18, NULL                    /* Len/Data */
+        QUIC_PKT_TYPE_1RTT, /* type */
+        1, /* spin bit */
+        0, /* key phase */
+        3, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        0, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 0, { 0 } }, /* SCID */
+        { 0x50, 0x51, 0x52 }, /* PN */
+        NULL, 0, /* Token */
+        18, NULL /* Len/Data */
     },
     pkt_hdr_test_8_expected, OSSL_NELEM(pkt_hdr_test_8_expected),
-    pkt_hdr_test_8_payload,  OSSL_NELEM(pkt_hdr_test_8_payload),
+    pkt_hdr_test_8_payload, OSSL_NELEM(pkt_hdr_test_8_payload),
     3, 21,
     4, 8
 };
 
 /* Packet Header Test 9: 1-RTT with Key Phase Bit */
 static const unsigned char pkt_hdr_test_9_expected[] = {
-    0x46,                     /* Short|Fixed, Type=1-RTT, PN Len=3, Key Phase=1 */
-    0x70, 0x71, 0x72,         /* DCID */
-    0x50, 0x51, 0x52,         /* PN */
+    0x46, /* Short|Fixed, Type=1-RTT, PN Len=3, Key Phase=1 */
+    0x70, 0x71, 0x72, /* DCID */
+    0x50, 0x51, 0x52, /* PN */
     0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
     0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1
 };
@@ -2312,36 +9570,36 @@ static const unsigned char pkt_hdr_test_9_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_9 = {
     {
-        QUIC_PKT_TYPE_1RTT,         /* type */
-        0,                          /* spin bit */
-        1,                          /* key phase */
-        3,                          /* PN length */
-        0,                          /* partial */
-        1,                          /* fixed */
-        0,                          /* unused */
-        0,                          /* reserved */
-        0,                          /* version */
-        { 3, {0x70, 0x71, 0x72} },  /* DCID */
-        { 0, {0} },                 /* SCID */
-        { 0x50, 0x51, 0x52 },       /* PN */
-        NULL, 0,                    /* Token */
-        18, NULL                    /* Len/Data */
+        QUIC_PKT_TYPE_1RTT, /* type */
+        0, /* spin bit */
+        1, /* key phase */
+        3, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        0, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 0, { 0 } }, /* SCID */
+        { 0x50, 0x51, 0x52 }, /* PN */
+        NULL, 0, /* Token */
+        18, NULL /* Len/Data */
     },
     pkt_hdr_test_9_expected, OSSL_NELEM(pkt_hdr_test_9_expected),
-    pkt_hdr_test_9_payload,  OSSL_NELEM(pkt_hdr_test_9_payload),
+    pkt_hdr_test_9_payload, OSSL_NELEM(pkt_hdr_test_9_payload),
     3, 21,
     4, 8
 };
 
 /* Packet Header Test 10: Handshake with 4-Byte PN */
 static const unsigned char pkt_hdr_test_10_expected[] = {
-    0xe3,                     /* Long|Fixed, Type=Handshake, PN Len=4 */
-    0x00, 0x00, 0x00, 0x01,   /* Version */
-    0x03,                     /* DCID Length */
-    0x70, 0x71, 0x72,         /* DCID */
+    0xe3, /* Long|Fixed, Type=Handshake, PN Len=4 */
+    0x00, 0x00, 0x00, 0x01, /* Version */
+    0x03, /* DCID Length */
+    0x70, 0x71, 0x72, /* DCID */
     0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID Length, SCID */
-    0x17,                     /* Length=20 */
-    0x33, 0x44, 0x55, 0x66,   /* Encoded PN */
+    0x17, /* Length=20 */
+    0x33, 0x44, 0x55, 0x66, /* Encoded PN */
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* Payload */
     0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22
@@ -2355,32 +9613,32 @@ static const unsigned char pkt_hdr_test_10_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_10 = {
     {
-        QUIC_PKT_TYPE_HANDSHAKE,    /* type */
-        0,                          /* spin bit */
-        0,                          /* key phase */
-        4,                          /* PN length */
-        0,                          /* partial */
-        1,                          /* fixed */
-        0,                          /* unused */
-        0,                          /* reserved */
-        1,                          /* version */
-        { 3, {0x70, 0x71, 0x72} },                                /* DCID */
-        { 8, {0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
+        QUIC_PKT_TYPE_HANDSHAKE, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        4, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        1, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 8, { 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
         { 0x33, 0x44, 0x55, 0x66 }, /* PN */
-        NULL, 0,                    /* Token */
-        19, NULL                    /* Len/Data */
+        NULL, 0, /* Token */
+        19, NULL /* Len/Data */
     },
     pkt_hdr_test_10_expected, OSSL_NELEM(pkt_hdr_test_10_expected),
-    pkt_hdr_test_10_payload,  OSSL_NELEM(pkt_hdr_test_10_payload),
+    pkt_hdr_test_10_payload, OSSL_NELEM(pkt_hdr_test_10_payload),
     0, sizeof(pkt_hdr_test_10_expected),
     19, 23
 };
 
 /* Packet Header Test 11: 1-RTT with 4-Byte PN */
 static const unsigned char pkt_hdr_test_11_expected[] = {
-    0x43,                     /* Short|Fixed, Type=1-RTT, PN Len=4 */
-    0x70, 0x71, 0x72,         /* DCID */
-    0x50, 0x51, 0x52, 0x53,   /* PN */
+    0x43, /* Short|Fixed, Type=1-RTT, PN Len=4 */
+    0x70, 0x71, 0x72, /* DCID */
+    0x50, 0x51, 0x52, 0x53, /* PN */
     0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
     0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1
 };
@@ -2392,34 +9650,34 @@ static const unsigned char pkt_hdr_test_11_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_11 = {
     {
-        QUIC_PKT_TYPE_1RTT,         /* type */
-        0,                          /* spin bit */
-        0,                          /* key phase */
-        4,                          /* PN length */
-        0,                          /* partial */
-        1,                          /* fixed */
-        0,                          /* unused */
-        0,                          /* reserved */
-        0,                          /* version */
-        { 3, {0x70, 0x71, 0x72} },  /* DCID */
-        { 0, {0} },                 /* SCID */
+        QUIC_PKT_TYPE_1RTT, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        4, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        0, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 0, { 0 } }, /* SCID */
         { 0x50, 0x51, 0x52, 0x53 }, /* PN */
-        NULL, 0,                    /* Token */
-        18, NULL                    /* Len/Data */
+        NULL, 0, /* Token */
+        18, NULL /* Len/Data */
     },
     pkt_hdr_test_11_expected, OSSL_NELEM(pkt_hdr_test_11_expected),
-    pkt_hdr_test_11_payload,  OSSL_NELEM(pkt_hdr_test_11_payload),
+    pkt_hdr_test_11_payload, OSSL_NELEM(pkt_hdr_test_11_payload),
     3, 21,
     4, 8
 };
 
 /* Packet Header Test 12: Version Negotiation */
 static const unsigned char pkt_hdr_test_12_expected[] = {
-    0xc0,                       /* Long|Fixed, Type=Version Neg */
-    0x00, 0x00, 0x00, 0x00,     /* Version (0) */
-    0x03, 0x70, 0x71, 0x72,     /* DCID */
-    0x02, 0x81, 0x82,           /* SCID */
-    0x11, 0x22, 0x33, 0x44      /* One Version */
+    0xc0, /* Long|Fixed, Type=Version Neg */
+    0x00, 0x00, 0x00, 0x00, /* Version (0) */
+    0x03, 0x70, 0x71, 0x72, /* DCID */
+    0x02, 0x81, 0x82, /* SCID */
+    0x11, 0x22, 0x33, 0x44 /* One Version */
 };
 
 static const unsigned char pkt_hdr_test_12_payload[] = {
@@ -2428,34 +9686,34 @@ static const unsigned char pkt_hdr_test_12_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_12 = {
     {
-        QUIC_PKT_TYPE_VERSION_NEG,  /* type */
-        0,                          /* spin bit */
-        0,                          /* key phase */
-        0,                          /* PN length */
-        0,                          /* partial */
-        1,                          /* fixed */
-        0,                          /* unused */
-        0,                          /* reserved */
-        0,                          /* version */
-        { 3, {0x70, 0x71, 0x72} },  /* DCID */
-        { 2, {0x81, 0x82} },        /* SCID */
-        { 0 },                      /* PN */
-        NULL, 0,                    /* Token */
-        4, NULL                     /* Len/Data */
+        QUIC_PKT_TYPE_VERSION_NEG, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        0, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        0, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 2, { 0x81, 0x82 } }, /* SCID */
+        { 0 }, /* PN */
+        NULL, 0, /* Token */
+        4, NULL /* Len/Data */
     },
     pkt_hdr_test_12_expected, OSSL_NELEM(pkt_hdr_test_12_expected),
-    pkt_hdr_test_12_payload,  OSSL_NELEM(pkt_hdr_test_12_payload),
+    pkt_hdr_test_12_payload, OSSL_NELEM(pkt_hdr_test_12_payload),
     0, 12,
     SIZE_MAX, SIZE_MAX
 };
 
 /* Packet Header Test 13: Version Negotiation without Fixed Bit */
 static const unsigned char pkt_hdr_test_13_expected[] = {
-    0x80,                       /* Long|Fixed, Type=Version Neg */
-    0x00, 0x00, 0x00, 0x00,     /* Version (0) */
-    0x03, 0x70, 0x71, 0x72,     /* DCID */
-    0x02, 0x81, 0x82,           /* SCID */
-    0x11, 0x22, 0x33, 0x44      /* One Version */
+    0x80, /* Long|Fixed, Type=Version Neg */
+    0x00, 0x00, 0x00, 0x00, /* Version (0) */
+    0x03, 0x70, 0x71, 0x72, /* DCID */
+    0x02, 0x81, 0x82, /* SCID */
+    0x11, 0x22, 0x33, 0x44 /* One Version */
 };
 
 static const unsigned char pkt_hdr_test_13_payload[] = {
@@ -2464,32 +9722,32 @@ static const unsigned char pkt_hdr_test_13_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_13 = {
     {
-        QUIC_PKT_TYPE_VERSION_NEG,  /* type */
-        0,                          /* spin bit */
-        0,                          /* key phase */
-        0,                          /* PN length */
-        0,                          /* partial */
-        0,                          /* fixed */
-        0,                          /* unused */
-        0,                          /* reserved */
-        0,                          /* version */
-        { 3, {0x70, 0x71, 0x72} },  /* DCID */
-        { 2, {0x81, 0x82} },        /* SCID */
-        { 0 },                      /* PN */
-        NULL, 0,                    /* Token */
-        4, NULL                     /* Len/Data */
+        QUIC_PKT_TYPE_VERSION_NEG, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        0, /* PN length */
+        0, /* partial */
+        0, /* fixed */
+        0, /* unused */
+        0, /* reserved */
+        0, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 2, { 0x81, 0x82 } }, /* SCID */
+        { 0 }, /* PN */
+        NULL, 0, /* Token */
+        4, NULL /* Len/Data */
     },
     pkt_hdr_test_13_expected, OSSL_NELEM(pkt_hdr_test_13_expected),
-    pkt_hdr_test_13_payload,  OSSL_NELEM(pkt_hdr_test_13_payload),
+    pkt_hdr_test_13_payload, OSSL_NELEM(pkt_hdr_test_13_payload),
     0, 12,
     SIZE_MAX, SIZE_MAX
 };
 
 /* Packet Header Test 14: 1-RTT - Malformed - No Fixed Bit */
 static const unsigned char pkt_hdr_test_14_expected[] = {
-    0x02,                     /* Fixed, Type=1-RTT, PN Len=3 */
-    0x70, 0x71, 0x72,         /* DCID */
-    0x50, 0x51, 0x52,         /* PN */
+    0x02, /* Fixed, Type=1-RTT, PN Len=3 */
+    0x70, 0x71, 0x72, /* DCID */
+    0x50, 0x51, 0x52, /* PN */
     0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
     0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1
 };
@@ -2504,13 +9762,13 @@ static const struct pkt_hdr_test pkt_hdr_test_14 = {
 
 /* Packet Header Test 15: Handshake - Malformed - No Fixed Bit */
 static const unsigned char pkt_hdr_test_15_expected[] = {
-    0xa0,                     /* Long, Type=Handshake, PN Len=1 */
-    0x00, 0x00, 0x00, 0x01,   /* Version */
-    0x03,                     /* DCID Length */
-    0x70, 0x71, 0x72,         /* DCID */
+    0xa0, /* Long, Type=Handshake, PN Len=1 */
+    0x00, 0x00, 0x00, 0x01, /* Version */
+    0x03, /* DCID Length */
+    0x70, 0x71, 0x72, /* DCID */
     0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID Length, SCID */
-    0x14,                     /* Length=20 */
-    0x33,                     /* Encoded PN */
+    0x14, /* Length=20 */
+    0x33, /* Encoded PN */
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* Payload */
     0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22
@@ -2526,13 +9784,13 @@ static const struct pkt_hdr_test pkt_hdr_test_15 = {
 
 /* Packet Header Test 16: Handshake - Malformed - Wrong Version */
 static const unsigned char pkt_hdr_test_16_expected[] = {
-    0xe0,                     /* Long|Fixed, Type=Handshake, PN Len=1 */
-    0x00, 0x00, 0x00, 0x02,   /* Version */
-    0x03,                     /* DCID Length */
-    0x70, 0x71, 0x72,         /* DCID */
+    0xe0, /* Long|Fixed, Type=Handshake, PN Len=1 */
+    0x00, 0x00, 0x00, 0x02, /* Version */
+    0x03, /* DCID Length */
+    0x70, 0x71, 0x72, /* DCID */
     0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID Length, SCID */
-    0x14,                     /* Length=20 */
-    0x33,                     /* Encoded PN */
+    0x14, /* Length=20 */
+    0x33, /* Encoded PN */
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* Payload */
     0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22
@@ -2548,13 +9806,13 @@ static const struct pkt_hdr_test pkt_hdr_test_16 = {
 
 /* Packet Header Test 17: Initial - Non-Zero Reserved Bits */
 static const unsigned char pkt_hdr_test_17_expected[] = {
-    0xcd,                     /* Long|Fixed, Type=Initial, PN Len=2 */
-    0x00, 0x00, 0x00, 0x01,   /* Version */
-    0x00,                     /* DCID Length */
+    0xcd, /* Long|Fixed, Type=Initial, PN Len=2 */
+    0x00, 0x00, 0x00, 0x01, /* Version */
+    0x00, /* DCID Length */
     0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID Length, SCID */
-    0x00,                     /* Token Length */
-    0x15,                     /* Length=21 */
-    0x33, 0x44,               /* Encoded PN */
+    0x00, /* Token Length */
+    0x15, /* Length=21 */
+    0x33, 0x44, /* Encoded PN */
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* Payload */
     0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22
@@ -2568,36 +9826,36 @@ static const unsigned char pkt_hdr_test_17_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_17 = {
     {
-        QUIC_PKT_TYPE_INITIAL,  /* type */
-        0,                      /* spin bit */
-        0,                      /* key phase */
-        2,                      /* PN length */
-        0,                      /* partial */
-        1,                      /* fixed */
-        0,                      /* unused */
-        3,                      /* reserved */
-        1,                      /* version */
-        { 0, {0} },             /* DCID */
-        { 8, {0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
-        { 0x33, 0x44 },         /* PN */
-        NULL, 0,                /* Token/Token Len */
-        19, NULL                /* Len/Data */
+        QUIC_PKT_TYPE_INITIAL, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        2, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        3, /* reserved */
+        1, /* version */
+        { 0, { 0 } }, /* DCID */
+        { 8, { 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
+        { 0x33, 0x44 }, /* PN */
+        NULL, 0, /* Token/Token Len */
+        19, NULL /* Len/Data */
     },
     pkt_hdr_test_17_expected, OSSL_NELEM(pkt_hdr_test_17_expected),
-    pkt_hdr_test_17_payload,  OSSL_NELEM(pkt_hdr_test_17_payload),
+    pkt_hdr_test_17_payload, OSSL_NELEM(pkt_hdr_test_17_payload),
     0, sizeof(pkt_hdr_test_17_expected),
     17, 21
 };
 
 /* Packet Header Test 18: 0-RTT - Non-Zero Reserved Bits */
 static const unsigned char pkt_hdr_test_18_expected[] = {
-    0xd8,                     /* Long|Fixed, Type=0-RTT, PN Len=1 */
-    0x00, 0x00, 0x00, 0x01,   /* Version */
-    0x03,                     /* DCID Length */
-    0x70, 0x71, 0x72,         /* DCID */
+    0xd8, /* Long|Fixed, Type=0-RTT, PN Len=1 */
+    0x00, 0x00, 0x00, 0x01, /* Version */
+    0x03, /* DCID Length */
+    0x70, 0x71, 0x72, /* DCID */
     0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID Length, SCID */
-    0x14,                     /* Length=20 */
-    0x33,                     /* Encoded PN */
+    0x14, /* Length=20 */
+    0x33, /* Encoded PN */
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* Payload */
     0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22
@@ -2611,36 +9869,36 @@ static const unsigned char pkt_hdr_test_18_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_18 = {
     {
-        QUIC_PKT_TYPE_0RTT,     /* type */
-        0,                      /* spin bit */
-        0,                      /* key phase */
-        1,                      /* PN length */
-        0,                      /* partial */
-        1,                      /* fixed */
-        0,                      /* unused */
-        2,                      /* reserved */
-        1,                      /* version */
-        { 3, {0x70, 0x71, 0x72} },                                /* DCID */
-        { 8, {0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
-        { 0x33 },               /* PN */
-        NULL, 0,                /* Token */
-        19, NULL                /* Len/Data */
+        QUIC_PKT_TYPE_0RTT, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        1, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        2, /* reserved */
+        1, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 8, { 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
+        { 0x33 }, /* PN */
+        NULL, 0, /* Token */
+        19, NULL /* Len/Data */
     },
     pkt_hdr_test_18_expected, OSSL_NELEM(pkt_hdr_test_18_expected),
-    pkt_hdr_test_18_payload,  OSSL_NELEM(pkt_hdr_test_18_payload),
+    pkt_hdr_test_18_payload, OSSL_NELEM(pkt_hdr_test_18_payload),
     0, sizeof(pkt_hdr_test_18_expected),
     19, 23
 };
 
 /* Packet Header Test 19: Handshake - Non-Zero Reserved Bits */
 static const unsigned char pkt_hdr_test_19_expected[] = {
-    0xe4,                     /* Long|Fixed, Type=Handshake, PN Len=1 */
-    0x00, 0x00, 0x00, 0x01,   /* Version */
-    0x03,                     /* DCID Length */
-    0x70, 0x71, 0x72,         /* DCID */
+    0xe4, /* Long|Fixed, Type=Handshake, PN Len=1 */
+    0x00, 0x00, 0x00, 0x01, /* Version */
+    0x03, /* DCID Length */
+    0x70, 0x71, 0x72, /* DCID */
     0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID Length, SCID */
-    0x14,                     /* Length=20 */
-    0x33,                     /* Encoded PN */
+    0x14, /* Length=20 */
+    0x33, /* Encoded PN */
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, /* Payload */
     0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
     0x20, 0x21, 0x22
@@ -2654,32 +9912,32 @@ static const unsigned char pkt_hdr_test_19_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_19 = {
     {
-        QUIC_PKT_TYPE_HANDSHAKE,    /* type */
-        0,                          /* spin bit */
-        0,                          /* key phase */
-        1,                          /* PN length */
-        0,                          /* partial */
-        1,                          /* fixed */
-        0,                          /* unused */
-        1,                          /* reserved */
-        1,                          /* version */
-        { 3, {0x70, 0x71, 0x72} },                                /* DCID */
-        { 8, {0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
-        { 0x33 },                   /* PN */
-        NULL, 0,                    /* Token */
-        19, NULL                    /* Len/Data */
+        QUIC_PKT_TYPE_HANDSHAKE, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        1, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        1, /* reserved */
+        1, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 8, { 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
+        { 0x33 }, /* PN */
+        NULL, 0, /* Token */
+        19, NULL /* Len/Data */
     },
     pkt_hdr_test_19_expected, OSSL_NELEM(pkt_hdr_test_19_expected),
-    pkt_hdr_test_19_payload,  OSSL_NELEM(pkt_hdr_test_19_payload),
+    pkt_hdr_test_19_payload, OSSL_NELEM(pkt_hdr_test_19_payload),
     0, sizeof(pkt_hdr_test_19_expected),
     19, 23
 };
 
 /* Packet Header Test 20: 1-RTT with Non-Zero Reserved Bits */
 static const unsigned char pkt_hdr_test_20_expected[] = {
-    0x5a,                     /* Short|Fixed, Type=1-RTT, PN Len=3 */
-    0x70, 0x71, 0x72,         /* DCID */
-    0x50, 0x51, 0x52,         /* PN */
+    0x5a, /* Short|Fixed, Type=1-RTT, PN Len=3 */
+    0x70, 0x71, 0x72, /* DCID */
+    0x50, 0x51, 0x52, /* PN */
     0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
     0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1
 };
@@ -2691,23 +9949,23 @@ static const unsigned char pkt_hdr_test_20_payload[] = {
 
 static const struct pkt_hdr_test pkt_hdr_test_20 = {
     {
-        QUIC_PKT_TYPE_1RTT,         /* type */
-        0,                          /* spin bit */
-        0,                          /* key phase */
-        3,                          /* PN length */
-        0,                          /* partial */
-        1,                          /* fixed */
-        0,                          /* unused */
-        3,                          /* reserved */
-        0,                          /* version */
-        { 3, {0x70, 0x71, 0x72} },  /* DCID */
-        { 0, {0} },                 /* SCID */
-        { 0x50, 0x51, 0x52 },       /* PN */
-        NULL, 0,                    /* Token */
-        18, NULL                    /* Len/Data */
+        QUIC_PKT_TYPE_1RTT, /* type */
+        0, /* spin bit */
+        0, /* key phase */
+        3, /* PN length */
+        0, /* partial */
+        1, /* fixed */
+        0, /* unused */
+        3, /* reserved */
+        0, /* version */
+        { 3, { 0x70, 0x71, 0x72 } }, /* DCID */
+        { 0, { 0 } }, /* SCID */
+        { 0x50, 0x51, 0x52 }, /* PN */
+        NULL, 0, /* Token */
+        18, NULL /* Len/Data */
     },
     pkt_hdr_test_20_expected, OSSL_NELEM(pkt_hdr_test_20_expected),
-    pkt_hdr_test_20_payload,  OSSL_NELEM(pkt_hdr_test_20_payload),
+    pkt_hdr_test_20_payload, OSSL_NELEM(pkt_hdr_test_20_payload),
     3, 21,
     4, 8
 };
@@ -2742,24 +10000,24 @@ static const struct pkt_hdr_test *const pkt_hdr_tests[] = {
  * Count of number of times we observed an unchanged (u) or changed (c) bit in
  * each header-protectable bit over all test suites.
  */
-static unsigned int counts_u[HPR_CIPHER_COUNT][37] = {0};
-static unsigned int counts_c[HPR_CIPHER_COUNT][37] = {0};
+static unsigned int counts_u[HPR_CIPHER_COUNT][37] = { 0 };
+static unsigned int counts_c[HPR_CIPHER_COUNT][37] = { 0 };
 
 #define TEST_PKT_BUF_LEN 20000
 
 static int test_wire_pkt_hdr_actual(int tidx, int repeat, int cipher,
-                                    size_t trunc_len)
+    size_t trunc_len)
 {
     int testresult = 0;
     const struct pkt_hdr_test *t = pkt_hdr_tests[tidx];
-    QUIC_PKT_HDR hdr = {0};
-    QUIC_PKT_HDR_PTRS ptrs = {0}, wptrs = {0};
-    PACKET pkt = {0};
-    WPACKET wpkt = {0};
+    QUIC_PKT_HDR hdr = { 0 };
+    QUIC_PKT_HDR_PTRS ptrs = { 0 }, wptrs = { 0 };
+    PACKET pkt = { 0 };
+    WPACKET wpkt = { 0 };
     unsigned char *buf = NULL;
     size_t l = 0, i, j;
-    QUIC_HDR_PROTECTOR hpr = {0};
-    unsigned char hpr_key[32] = {0,1,2,3,4,5,6,7};
+    QUIC_HDR_PROTECTOR hpr = { 0 };
+    unsigned char hpr_key[32] = { 0, 1, 2, 3, 4, 5, 6, 7 };
     int have_hpr = 0, hpr_cipher_id, hpr_key_len;
     unsigned char *hbuf = NULL;
     int is_trunc = trunc_len < t->expected_len;
@@ -2773,29 +10031,29 @@ static int test_wire_pkt_hdr_actual(int tidx, int repeat, int cipher,
         expect_fail = 1;
 
     switch (cipher) {
-        case 0:
-            hpr_cipher_id = QUIC_HDR_PROT_CIPHER_AES_128;
-            hpr_key_len   = 16;
-            break;
-        case 1:
-            hpr_cipher_id = QUIC_HDR_PROT_CIPHER_AES_256;
-            hpr_key_len   = 32;
-            break;
-        case 2:
-            /*
-             * In a build without CHACHA, we rerun the AES 256 tests.
-             * Removing all dependence on CHACHA is more difficult and these
-             * tests are fast enough.
-             */
+    case 0:
+        hpr_cipher_id = QUIC_HDR_PROT_CIPHER_AES_128;
+        hpr_key_len = 16;
+        break;
+    case 1:
+        hpr_cipher_id = QUIC_HDR_PROT_CIPHER_AES_256;
+        hpr_key_len = 32;
+        break;
+    case 2:
+        /*
+         * In a build without CHACHA, we rerun the AES 256 tests.
+         * Removing all dependence on CHACHA is more difficult and these
+         * tests are fast enough.
+         */
 #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
-            hpr_cipher_id = QUIC_HDR_PROT_CIPHER_CHACHA;
+        hpr_cipher_id = QUIC_HDR_PROT_CIPHER_CHACHA;
 #else
-            hpr_cipher_id = QUIC_HDR_PROT_CIPHER_AES_256;
+        hpr_cipher_id = QUIC_HDR_PROT_CIPHER_AES_256;
 #endif
-            hpr_key_len   = 32;
-            break;
-        default:
-            goto err;
+        hpr_key_len = 32;
+        break;
+    default:
+        goto err;
     }
 
     if (!TEST_ptr(buf = OPENSSL_malloc(TEST_PKT_BUF_LEN)))
@@ -2808,8 +10066,8 @@ static int test_wire_pkt_hdr_actual(int tidx, int repeat, int cipher,
         goto err;
 
     if (!TEST_int_eq(ossl_quic_wire_decode_pkt_hdr(&pkt, t->short_conn_id_len,
-                                                   0, 0, &hdr, &ptrs, NULL),
-                     !expect_fail))
+                         0, 0, &hdr, &ptrs, NULL),
+            !expect_fail))
         goto err;
 
     if (!expect_fail && !is_trunc) {
@@ -2831,7 +10089,7 @@ static int test_wire_pkt_hdr_actual(int tidx, int repeat, int cipher,
             if (!TEST_ptr_eq(ptrs.raw_sample, t->expected + t->sample_offset))
                 goto err;
             if (!TEST_size_t_eq(ptrs.raw_sample_len,
-                                t->expected_len - t->sample_offset))
+                    t->expected_len - t->sample_offset))
                 goto err;
         }
 
@@ -2850,9 +10108,9 @@ static int test_wire_pkt_hdr_actual(int tidx, int repeat, int cipher,
         /* Test header protection. */
         if (t->sample_offset != SIZE_MAX) { /* if packet type has protection */
             if (!TEST_true(ossl_quic_hdr_protector_init(&hpr, NULL, NULL,
-                                                        hpr_cipher_id,
-                                                        hpr_key,
-                                                        hpr_key_len)))
+                    hpr_cipher_id,
+                    hpr_key,
+                    hpr_key_len)))
                 goto err;
 
             have_hpr = 1;
@@ -2868,9 +10126,9 @@ static int test_wire_pkt_hdr_actual(int tidx, int repeat, int cipher,
             memcpy(hbuf, t->expected, t->expected_len);
 
             /* Fixup pointers to new buffer and encrypt. */
-            ptrs.raw_pn         = hbuf + (ptrs.raw_pn     - ptrs.raw_start);
-            ptrs.raw_sample     = hbuf + (ptrs.raw_sample - ptrs.raw_start);
-            ptrs.raw_start      = hbuf;
+            ptrs.raw_pn = hbuf + (ptrs.raw_pn - ptrs.raw_start);
+            ptrs.raw_sample = hbuf + (ptrs.raw_sample - ptrs.raw_start);
+            ptrs.raw_start = hbuf;
             if (!TEST_true(ossl_quic_hdr_protector_encrypt(&hpr, &ptrs)))
                 goto err;
 
@@ -2935,7 +10193,7 @@ static int test_wire_pkt_hdr_inner(int tidx, int repeat, int cipher)
 
     /* Test with entire packet */
     if (!TEST_true(test_wire_pkt_hdr_actual(tidx, repeat, cipher,
-                                            t->expected_len)))
+            t->expected_len)))
         goto err;
 
     /* Now repeat for every possible truncation of the packet */
@@ -2994,14 +10252,14 @@ static int test_wire_pkt_hdr(int idx)
 }
 
 /* TX Tests */
-#define TX_TEST_OP_END                     0 /* end of script */
-#define TX_TEST_OP_WRITE                   1 /* write packet */
-#define TX_TEST_OP_PROVIDE_SECRET          2 /* provide TX secret */
-#define TX_TEST_OP_PROVIDE_SECRET_INITIAL  3 /* provide TX secret for initial */
-#define TX_TEST_OP_DISCARD_EL              4 /* discard an encryption level */
-#define TX_TEST_OP_CHECK_DGRAM             5 /* read datagram, compare to expected */
-#define TX_TEST_OP_CHECK_NO_DGRAM          6 /* check no datagram is in queue */
-#define TX_TEST_OP_KEY_UPDATE              7 /* perform key update for 1-RTT */
+#define TX_TEST_OP_END 0 /* end of script */
+#define TX_TEST_OP_WRITE 1 /* write packet */
+#define TX_TEST_OP_PROVIDE_SECRET 2 /* provide TX secret */
+#define TX_TEST_OP_PROVIDE_SECRET_INITIAL 3 /* provide TX secret for initial */
+#define TX_TEST_OP_DISCARD_EL 4 /* discard an encryption level */
+#define TX_TEST_OP_CHECK_DGRAM 5 /* read datagram, compare to expected */
+#define TX_TEST_OP_CHECK_NO_DGRAM 6 /* check no datagram is in queue */
+#define TX_TEST_OP_KEY_UPDATE 7 /* perform key update for 1-RTT */
 
 struct tx_test_op {
     unsigned char op;
@@ -3012,38 +10270,38 @@ struct tx_test_op {
     const QUIC_CONN_ID *dcid;
 };
 
-#define TX_OP_END                                                       \
+#define TX_OP_END \
     { TX_TEST_OP_END }
-#define TX_OP_WRITE(pkt)                                                \
+#define TX_OP_WRITE(pkt) \
     { TX_TEST_OP_WRITE, NULL, 0, &(pkt), 0, 0, NULL },
-#define TX_OP_PROVIDE_SECRET(el, suite, key)                            \
-    {                                                                   \
-        TX_TEST_OP_PROVIDE_SECRET, (key), sizeof(key),                  \
-        NULL, (el), (suite), NULL                                       \
+#define TX_OP_PROVIDE_SECRET(el, suite, key)           \
+    {                                                  \
+        TX_TEST_OP_PROVIDE_SECRET, (key), sizeof(key), \
+        NULL, (el), (suite), NULL                      \
     },
-#define TX_OP_PROVIDE_SECRET_INITIAL(dcid, is_server)                   \
-    { TX_TEST_OP_PROVIDE_SECRET_INITIAL,                                \
-      NULL, 0, NULL, 0, (is_server), &(dcid) },
-#define TX_OP_DISCARD_EL(el)                                            \
+#define TX_OP_PROVIDE_SECRET_INITIAL(dcid, is_server) \
+    { TX_TEST_OP_PROVIDE_SECRET_INITIAL,              \
+        NULL, 0, NULL, 0, (is_server), &(dcid) },
+#define TX_OP_DISCARD_EL(el) \
     { TX_TEST_OP_DISCARD_EL, NULL, 0, NULL, (el), 0, NULL },
-#define TX_OP_CHECK_DGRAM(expect_dgram)                                 \
-    {                                                                   \
-        TX_TEST_OP_CHECK_DGRAM, (expect_dgram), sizeof(expect_dgram),   \
-        NULL, 0, 0, NULL                                                \
+#define TX_OP_CHECK_DGRAM(expect_dgram)                               \
+    {                                                                 \
+        TX_TEST_OP_CHECK_DGRAM, (expect_dgram), sizeof(expect_dgram), \
+        NULL, 0, 0, NULL                                              \
     },
 #define TX_OP_CHECK_NO_DGRAM() \
     { TX_TEST_OP_CHECK_NO_PKT, NULL, 0, NULL, 0, 0, NULL },
 
-#define TX_OP_WRITE_N(n)                                                \
+#define TX_OP_WRITE_N(n) \
     TX_OP_WRITE(tx_script_##n##_pkt)
-#define TX_OP_CHECK_DGRAM_N(n)                                          \
+#define TX_OP_CHECK_DGRAM_N(n) \
     TX_OP_CHECK_DGRAM(tx_script_##n##_dgram)
 
-#define TX_OP_WRITE_CHECK(n)                                            \
-    TX_OP_WRITE_N(n)                                                    \
+#define TX_OP_WRITE_CHECK(n) \
+    TX_OP_WRITE_N(n)         \
     TX_OP_CHECK_DGRAM_N(n)
 
-#define TX_OP_KEY_UPDATE()                                              \
+#define TX_OP_KEY_UPDATE() \
     { TX_TEST_OP_KEY_UPDATE, NULL, 0, NULL, 0, 0, NULL },
 
 /* 1. RFC 9001 - A.2 Client Initial */
@@ -3175,20 +10433,20 @@ static const unsigned char tx_script_1_dgram[] = {
 };
 
 static QUIC_PKT_HDR tx_script_1_hdr = {
-    QUIC_PKT_TYPE_INITIAL,      /* type */
-    0,                          /* spin bit */
-    0,                          /* key phase */
-    4,                          /* PN length */
-    0,                          /* partial */
-    0,                          /* fixed */
-    0,                          /* unused */
-    0,                          /* reserved */
-    1,                          /* version */
-    {8, {0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08}}, /* DCID */
-    { 0, {0} },                 /* SCID */
-    { 0 },                      /* PN */
-    NULL, 0,                    /* Token */
-    5555, NULL                  /* Len/Data */
+    QUIC_PKT_TYPE_INITIAL, /* type */
+    0, /* spin bit */
+    0, /* key phase */
+    4, /* PN length */
+    0, /* partial */
+    0, /* fixed */
+    0, /* unused */
+    0, /* reserved */
+    1, /* version */
+    { 8, { 0x83, 0x94, 0xc8, 0xf0, 0x3e, 0x51, 0x57, 0x08 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token */
+    5555, NULL /* Len/Data */
 };
 
 static const OSSL_QTX_IOVEC tx_script_1_iovec[] = {
@@ -3206,8 +10464,8 @@ static const OSSL_QTX_PKT tx_script_1_pkt = {
 
 static const struct tx_test_op tx_script_1[] = {
     TX_OP_PROVIDE_SECRET_INITIAL(tx_script_1_hdr.dst_conn_id, 0)
-    TX_OP_WRITE_CHECK(1)
-    TX_OP_END
+        TX_OP_WRITE_CHECK(1)
+            TX_OP_END
 };
 
 /* 2. RFC 9001 - A.3 Server Initial */
@@ -3240,20 +10498,20 @@ static const unsigned char tx_script_2_dgram[] = {
 };
 
 static QUIC_PKT_HDR tx_script_2_hdr = {
-    QUIC_PKT_TYPE_INITIAL,      /* type */
-    0,                          /* spin bit */
-    0,                          /* key phase */
-    2,                          /* PN length */
-    0,                          /* partial */
-    0,                          /* fixed */
-    0,                          /* unused */
-    0,                          /* reserved */
-    1,                          /* version */
-    { 0, {0} },                 /* DCID */
-    {8, {0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5}}, /* SCID */
-    { 0 },                      /* PN */
-    NULL, 0,                    /* Token */
-    5555, NULL                  /* Len/Data */
+    QUIC_PKT_TYPE_INITIAL, /* type */
+    0, /* spin bit */
+    0, /* key phase */
+    2, /* PN length */
+    0, /* partial */
+    0, /* fixed */
+    0, /* unused */
+    0, /* reserved */
+    1, /* version */
+    { 0, { 0 } }, /* DCID */
+    { 8, { 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5 } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token */
+    5555, NULL /* Len/Data */
 };
 
 static const OSSL_QTX_IOVEC tx_script_2_iovec[] = {
@@ -3271,8 +10529,8 @@ static const OSSL_QTX_PKT tx_script_2_pkt = {
 
 static const struct tx_test_op tx_script_2[] = {
     TX_OP_PROVIDE_SECRET_INITIAL(tx_script_1_hdr.dst_conn_id, 1)
-    TX_OP_WRITE_CHECK(2)
-    TX_OP_END
+        TX_OP_WRITE_CHECK(2)
+            TX_OP_END
 };
 
 #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
@@ -3292,20 +10550,20 @@ static const unsigned char tx_script_3_secret[] = {
 };
 
 static QUIC_PKT_HDR tx_script_3_hdr = {
-    QUIC_PKT_TYPE_1RTT,         /* type */
-    0,                          /* spin bit */
-    0,                          /* key phase */
-    3,                          /* PN length */
-    0,                          /* partial */
-    0,                          /* fixed */
-    0,                          /* unused */
-    0,                          /* reserved */
-    0,                          /* version */
-    { 0, {0} },                 /* DCID */
-    { 0, {0} },                 /* SCID */
-    { 0 },                      /* PN */
-    NULL, 0,                    /* Token */
-    5555, NULL                  /* Len/Data */
+    QUIC_PKT_TYPE_1RTT, /* type */
+    0, /* spin bit */
+    0, /* key phase */
+    3, /* PN length */
+    0, /* partial */
+    0, /* fixed */
+    0, /* unused */
+    0, /* reserved */
+    0, /* version */
+    { 0, { 0 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token */
+    5555, NULL /* Len/Data */
 };
 
 static const OSSL_QTX_IOVEC tx_script_3_iovec[] = {
@@ -3323,8 +10581,8 @@ static const OSSL_QTX_PKT tx_script_3_pkt = {
 
 static const struct tx_test_op tx_script_3[] = {
     TX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_CHACHA20POLY1305, tx_script_3_secret)
-    TX_OP_WRITE_CHECK(3)
-    TX_OP_END
+        TX_OP_WRITE_CHECK(3)
+            TX_OP_END
 };
 #endif /* !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) */
 
@@ -3336,9 +10594,41 @@ static const unsigned char tx_script_4_secret[] = {
 };
 
 static const unsigned char tx_script_4a_body[] = {
-    0x02, 0x03, 0x09, 0x00, 0x03, 0x0c, 0x00, 0x36, 0x49, 0x27, 0x6d, 0x20,
-    0x68, 0x61, 0x76, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x20, 0x77, 0x6f, 0x6e,
-    0x64, 0x65, 0x72, 0x66, 0x75, 0x6c, 0x20, 0x74, 0x69, 0x6d, 0x65,
+    0x02,
+    0x03,
+    0x09,
+    0x00,
+    0x03,
+    0x0c,
+    0x00,
+    0x36,
+    0x49,
+    0x27,
+    0x6d,
+    0x20,
+    0x68,
+    0x61,
+    0x76,
+    0x69,
+    0x6e,
+    0x67,
+    0x20,
+    0x61,
+    0x20,
+    0x77,
+    0x6f,
+    0x6e,
+    0x64,
+    0x65,
+    0x72,
+    0x66,
+    0x75,
+    0x6c,
+    0x20,
+    0x74,
+    0x69,
+    0x6d,
+    0x65,
 };
 
 static const unsigned char tx_script_4a_dgram[] = {
@@ -3350,20 +10640,20 @@ static const unsigned char tx_script_4a_dgram[] = {
 };
 
 static QUIC_PKT_HDR tx_script_4a_hdr = {
-    QUIC_PKT_TYPE_1RTT,         /* type */
-    0,                          /* spin bit */
-    0,                          /* key phase */
-    2,                          /* PN length */
-    0,                          /* partial */
-    0,                          /* fixed */
-    0,                          /* unused */
-    0,                          /* reserved */
-    0,                          /* version */
-    { 4, {0x6e, 0x4e, 0xbd, 0x49} }, /* DCID */
-    { 0, {0} },                 /* SCID */
-    { 0 },                      /* PN */
-    NULL, 0,                    /* Token */
-    5555, NULL                  /* Len/Data */
+    QUIC_PKT_TYPE_1RTT, /* type */
+    0, /* spin bit */
+    0, /* key phase */
+    2, /* PN length */
+    0, /* partial */
+    0, /* fixed */
+    0, /* unused */
+    0, /* reserved */
+    0, /* version */
+    { 4, { 0x6e, 0x4e, 0xbd, 0x49 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token */
+    5555, NULL /* Len/Data */
 };
 
 static const OSSL_QTX_IOVEC tx_script_4a_iovec[] = {
@@ -3380,34 +10670,121 @@ static const OSSL_QTX_PKT tx_script_4a_pkt = {
 };
 
 static const unsigned char tx_script_4b_body[] = {
-    0x02, 0x04, 0x07, 0x00, 0x00, 0x0c, 0x00, 0x40, 0x51, 0x49, 0x27, 0x6d,
-    0x20, 0x68, 0x61, 0x76, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x20, 0x77, 0x6f,
-    0x6e, 0x64, 0x65, 0x72, 0x66, 0x75, 0x6c, 0x20, 0x74, 0x69, 0x6d, 0x65,
+    0x02,
+    0x04,
+    0x07,
+    0x00,
+    0x00,
+    0x0c,
+    0x00,
+    0x40,
+    0x51,
+    0x49,
+    0x27,
+    0x6d,
+    0x20,
+    0x68,
+    0x61,
+    0x76,
+    0x69,
+    0x6e,
+    0x67,
+    0x20,
+    0x61,
+    0x20,
+    0x77,
+    0x6f,
+    0x6e,
+    0x64,
+    0x65,
+    0x72,
+    0x66,
+    0x75,
+    0x6c,
+    0x20,
+    0x74,
+    0x69,
+    0x6d,
+    0x65,
 };
 
 static const unsigned char tx_script_4b_dgram[] = {
-    0x58, 0x6e, 0x4e, 0xbd, 0x49, 0xa4, 0x43, 0x33, 0xea, 0x11, 0x3a, 0x6c,
-    0xf5, 0x20, 0xef, 0x55, 0x8d, 0x25, 0xe2, 0x3b, 0x0e, 0x8c, 0xea, 0x17,
-    0xfc, 0x2b, 0x7a, 0xab, 0xfa, 0x3d, 0x07, 0xda, 0xa7, 0x7c, 0xc7, 0x47,
-    0x82, 0x02, 0x46, 0x40, 0x4f, 0x01, 0xad, 0xb2, 0x9d, 0x97, 0xdb, 0xfc,
-    0x9c, 0x4b, 0x46, 0xb1, 0x5a, 0x7f, 0x0b, 0x12, 0xaf, 0x49, 0xdf,
+    0x58,
+    0x6e,
+    0x4e,
+    0xbd,
+    0x49,
+    0xa4,
+    0x43,
+    0x33,
+    0xea,
+    0x11,
+    0x3a,
+    0x6c,
+    0xf5,
+    0x20,
+    0xef,
+    0x55,
+    0x8d,
+    0x25,
+    0xe2,
+    0x3b,
+    0x0e,
+    0x8c,
+    0xea,
+    0x17,
+    0xfc,
+    0x2b,
+    0x7a,
+    0xab,
+    0xfa,
+    0x3d,
+    0x07,
+    0xda,
+    0xa7,
+    0x7c,
+    0xc7,
+    0x47,
+    0x82,
+    0x02,
+    0x46,
+    0x40,
+    0x4f,
+    0x01,
+    0xad,
+    0xb2,
+    0x9d,
+    0x97,
+    0xdb,
+    0xfc,
+    0x9c,
+    0x4b,
+    0x46,
+    0xb1,
+    0x5a,
+    0x7f,
+    0x0b,
+    0x12,
+    0xaf,
+    0x49,
+    0xdf,
 };
 
 static QUIC_PKT_HDR tx_script_4b_hdr = {
-    QUIC_PKT_TYPE_1RTT,         /* type */
-    0,                          /* spin bit */
-    1,                          /* key phase */
-    2,                          /* PN length */
-    0,                          /* partial */
-    0,                          /* fixed */
-    0,                          /* unused */
-    0,                          /* reserved */
-    0,                          /* version */
-    { 4, {0x6e, 0x4e, 0xbd, 0x49} }, /* DCID */
-    { 0, {0} },                 /* SCID */
-    { 0 },                      /* PN */
-    NULL, 0,                    /* Token */
-    5555, NULL                  /* Len/Data */
+    QUIC_PKT_TYPE_1RTT, /* type */
+    0, /* spin bit */
+    1, /* key phase */
+    2, /* PN length */
+    0, /* partial */
+    0, /* fixed */
+    0, /* unused */
+    0, /* reserved */
+    0, /* version */
+    { 4, { 0x6e, 0x4e, 0xbd, 0x49 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token */
+    5555, NULL /* Len/Data */
 };
 
 static const OSSL_QTX_IOVEC tx_script_4b_iovec[] = {
@@ -3424,34 +10801,121 @@ static const OSSL_QTX_PKT tx_script_4b_pkt = {
 };
 
 static const unsigned char tx_script_4c_body[] = {
-    0x02, 0x09, 0x0e, 0x00, 0x00, 0x0c, 0x00, 0x40, 0xd8, 0x49, 0x27, 0x6d,
-    0x20, 0x68, 0x61, 0x76, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x20, 0x77, 0x6f,
-    0x6e, 0x64, 0x65, 0x72, 0x66, 0x75, 0x6c, 0x20, 0x74, 0x69, 0x6d, 0x65,
+    0x02,
+    0x09,
+    0x0e,
+    0x00,
+    0x00,
+    0x0c,
+    0x00,
+    0x40,
+    0xd8,
+    0x49,
+    0x27,
+    0x6d,
+    0x20,
+    0x68,
+    0x61,
+    0x76,
+    0x69,
+    0x6e,
+    0x67,
+    0x20,
+    0x61,
+    0x20,
+    0x77,
+    0x6f,
+    0x6e,
+    0x64,
+    0x65,
+    0x72,
+    0x66,
+    0x75,
+    0x6c,
+    0x20,
+    0x74,
+    0x69,
+    0x6d,
+    0x65,
 };
 
 static const unsigned char tx_script_4c_dgram[] = {
-    0x49, 0x6e, 0x4e, 0xbd, 0x49, 0x4d, 0xd9, 0x85, 0xba, 0x26, 0xfb, 0x68,
-    0x83, 0x9b, 0x94, 0x34, 0x7d, 0xc1, 0x7a, 0x05, 0xb7, 0x38, 0x43, 0x21,
-    0xe2, 0xec, 0x2b, 0xc1, 0x81, 0x74, 0x2d, 0xda, 0x24, 0xba, 0xbd, 0x99,
-    0x69, 0xd2, 0x56, 0xfa, 0xae, 0x29, 0x24, 0xb2, 0xaa, 0xda, 0xbd, 0x82,
-    0x80, 0xf1, 0xbb, 0x6a, 0xfd, 0xae, 0xda, 0x0e, 0x09, 0xcf, 0x09,
+    0x49,
+    0x6e,
+    0x4e,
+    0xbd,
+    0x49,
+    0x4d,
+    0xd9,
+    0x85,
+    0xba,
+    0x26,
+    0xfb,
+    0x68,
+    0x83,
+    0x9b,
+    0x94,
+    0x34,
+    0x7d,
+    0xc1,
+    0x7a,
+    0x05,
+    0xb7,
+    0x38,
+    0x43,
+    0x21,
+    0xe2,
+    0xec,
+    0x2b,
+    0xc1,
+    0x81,
+    0x74,
+    0x2d,
+    0xda,
+    0x24,
+    0xba,
+    0xbd,
+    0x99,
+    0x69,
+    0xd2,
+    0x56,
+    0xfa,
+    0xae,
+    0x29,
+    0x24,
+    0xb2,
+    0xaa,
+    0xda,
+    0xbd,
+    0x82,
+    0x80,
+    0xf1,
+    0xbb,
+    0x6a,
+    0xfd,
+    0xae,
+    0xda,
+    0x0e,
+    0x09,
+    0xcf,
+    0x09,
 };
 
 static QUIC_PKT_HDR tx_script_4c_hdr = {
-    QUIC_PKT_TYPE_1RTT,         /* type */
-    0,                          /* spin bit */
-    0,                          /* key phase */
-    2,                          /* PN length */
-    0,                          /* partial */
-    0,                          /* fixed */
-    0,                          /* unused */
-    0,                          /* reserved */
-    0,                          /* version */
-    { 4, {0x6e, 0x4e, 0xbd, 0x49} }, /* DCID */
-    { 0, {0} },                 /* SCID */
-    { 0 },                      /* PN */
-    NULL, 0,                    /* Token */
-    5555, NULL                  /* Len/Data */
+    QUIC_PKT_TYPE_1RTT, /* type */
+    0, /* spin bit */
+    0, /* key phase */
+    2, /* PN length */
+    0, /* partial */
+    0, /* fixed */
+    0, /* unused */
+    0, /* reserved */
+    0, /* version */
+    { 4, { 0x6e, 0x4e, 0xbd, 0x49 } }, /* DCID */
+    { 0, { 0 } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token */
+    5555, NULL /* Len/Data */
 };
 
 static const OSSL_QTX_IOVEC tx_script_4c_iovec[] = {
@@ -3469,60 +10933,281 @@ static const OSSL_QTX_PKT tx_script_4c_pkt = {
 
 static const struct tx_test_op tx_script_4[] = {
     TX_OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, tx_script_4_secret)
-    TX_OP_WRITE_CHECK(4a)
-    TX_OP_KEY_UPDATE()
-    TX_OP_WRITE_CHECK(4b)
-    TX_OP_KEY_UPDATE()
-    TX_OP_WRITE_CHECK(4c)
-    TX_OP_END
+        TX_OP_WRITE_CHECK(4a)
+            TX_OP_KEY_UPDATE()
+                TX_OP_WRITE_CHECK(4b)
+                    TX_OP_KEY_UPDATE()
+                        TX_OP_WRITE_CHECK(4c)
+                            TX_OP_END
 };
 
 /* 5. Real World - Retry Packet */
 static const unsigned char tx_script_5_body[] = {
     /* Retry Token */
-    0x92, 0xe7, 0xc6, 0xd8, 0x09, 0x65, 0x72, 0x55, 0xe5, 0xe2, 0x73, 0x04,
-    0xf3, 0x07, 0x5b, 0x21, 0x9f, 0x50, 0xcb, 0xbc, 0x79, 0xc5, 0x77, 0x5a,
-    0x29, 0x43, 0x65, 0x49, 0xf0, 0x6e, 0xc1, 0xc0, 0x3a, 0xe8, 0xca, 0xd2,
-    0x44, 0x69, 0xdd, 0x23, 0x31, 0x93, 0x52, 0x02, 0xf7, 0x42, 0x07, 0x78,
-    0xa1, 0x81, 0x61, 0x9c, 0x39, 0x07, 0x18, 0x69, 0x6e, 0x4f, 0xdc, 0xa0,
-    0xbe, 0x4b, 0xe5, 0xf2, 0xe9, 0xd2, 0xa4, 0xa7, 0x34, 0x55, 0x5e, 0xf3,
-    0xf8, 0x9c, 0x49, 0x8f, 0x0c, 0xc8, 0xb2, 0x75, 0x4b, 0x4d, 0x2f, 0xfe,
-    0x05, 0x5a, 0xdd, 0x4b, 0xe6, 0x14, 0xb4, 0xd2, 0xc0, 0x93, 0x6e, 0x0e,
-    0x84, 0x41, 0x4d, 0x31,
+    0x92,
+    0xe7,
+    0xc6,
+    0xd8,
+    0x09,
+    0x65,
+    0x72,
+    0x55,
+    0xe5,
+    0xe2,
+    0x73,
+    0x04,
+    0xf3,
+    0x07,
+    0x5b,
+    0x21,
+    0x9f,
+    0x50,
+    0xcb,
+    0xbc,
+    0x79,
+    0xc5,
+    0x77,
+    0x5a,
+    0x29,
+    0x43,
+    0x65,
+    0x49,
+    0xf0,
+    0x6e,
+    0xc1,
+    0xc0,
+    0x3a,
+    0xe8,
+    0xca,
+    0xd2,
+    0x44,
+    0x69,
+    0xdd,
+    0x23,
+    0x31,
+    0x93,
+    0x52,
+    0x02,
+    0xf7,
+    0x42,
+    0x07,
+    0x78,
+    0xa1,
+    0x81,
+    0x61,
+    0x9c,
+    0x39,
+    0x07,
+    0x18,
+    0x69,
+    0x6e,
+    0x4f,
+    0xdc,
+    0xa0,
+    0xbe,
+    0x4b,
+    0xe5,
+    0xf2,
+    0xe9,
+    0xd2,
+    0xa4,
+    0xa7,
+    0x34,
+    0x55,
+    0x5e,
+    0xf3,
+    0xf8,
+    0x9c,
+    0x49,
+    0x8f,
+    0x0c,
+    0xc8,
+    0xb2,
+    0x75,
+    0x4b,
+    0x4d,
+    0x2f,
+    0xfe,
+    0x05,
+    0x5a,
+    0xdd,
+    0x4b,
+    0xe6,
+    0x14,
+    0xb4,
+    0xd2,
+    0xc0,
+    0x93,
+    0x6e,
+    0x0e,
+    0x84,
+    0x41,
+    0x4d,
+    0x31,
     /* Retry Integrity Tag */
-    0x43, 0x8e, 0xab, 0xcd, 0xce, 0x24, 0x44, 0xc2, 0x20, 0xe1, 0xe2, 0xc8,
-    0xae, 0xa3, 0x8d, 0x4e,
+    0x43,
+    0x8e,
+    0xab,
+    0xcd,
+    0xce,
+    0x24,
+    0x44,
+    0xc2,
+    0x20,
+    0xe1,
+    0xe2,
+    0xc8,
+    0xae,
+    0xa3,
+    0x8d,
+    0x4e,
 };
 
 static const unsigned char tx_script_5_dgram[] = {
-    0xf0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0xa9, 0x20, 0xcc, 0xc2, 0x92,
-    0xe7, 0xc6, 0xd8, 0x09, 0x65, 0x72, 0x55, 0xe5, 0xe2, 0x73, 0x04, 0xf3,
-    0x07, 0x5b, 0x21, 0x9f, 0x50, 0xcb, 0xbc, 0x79, 0xc5, 0x77, 0x5a, 0x29,
-    0x43, 0x65, 0x49, 0xf0, 0x6e, 0xc1, 0xc0, 0x3a, 0xe8, 0xca, 0xd2, 0x44,
-    0x69, 0xdd, 0x23, 0x31, 0x93, 0x52, 0x02, 0xf7, 0x42, 0x07, 0x78, 0xa1,
-    0x81, 0x61, 0x9c, 0x39, 0x07, 0x18, 0x69, 0x6e, 0x4f, 0xdc, 0xa0, 0xbe,
-    0x4b, 0xe5, 0xf2, 0xe9, 0xd2, 0xa4, 0xa7, 0x34, 0x55, 0x5e, 0xf3, 0xf8,
-    0x9c, 0x49, 0x8f, 0x0c, 0xc8, 0xb2, 0x75, 0x4b, 0x4d, 0x2f, 0xfe, 0x05,
-    0x5a, 0xdd, 0x4b, 0xe6, 0x14, 0xb4, 0xd2, 0xc0, 0x93, 0x6e, 0x0e, 0x84,
-    0x41, 0x4d, 0x31, 0x43, 0x8e, 0xab, 0xcd, 0xce, 0x24, 0x44, 0xc2, 0x20,
-    0xe1, 0xe2, 0xc8, 0xae, 0xa3, 0x8d, 0x4e,
+    0xf0,
+    0x00,
+    0x00,
+    0x00,
+    0x01,
+    0x00,
+    0x04,
+    0xa9,
+    0x20,
+    0xcc,
+    0xc2,
+    0x92,
+    0xe7,
+    0xc6,
+    0xd8,
+    0x09,
+    0x65,
+    0x72,
+    0x55,
+    0xe5,
+    0xe2,
+    0x73,
+    0x04,
+    0xf3,
+    0x07,
+    0x5b,
+    0x21,
+    0x9f,
+    0x50,
+    0xcb,
+    0xbc,
+    0x79,
+    0xc5,
+    0x77,
+    0x5a,
+    0x29,
+    0x43,
+    0x65,
+    0x49,
+    0xf0,
+    0x6e,
+    0xc1,
+    0xc0,
+    0x3a,
+    0xe8,
+    0xca,
+    0xd2,
+    0x44,
+    0x69,
+    0xdd,
+    0x23,
+    0x31,
+    0x93,
+    0x52,
+    0x02,
+    0xf7,
+    0x42,
+    0x07,
+    0x78,
+    0xa1,
+    0x81,
+    0x61,
+    0x9c,
+    0x39,
+    0x07,
+    0x18,
+    0x69,
+    0x6e,
+    0x4f,
+    0xdc,
+    0xa0,
+    0xbe,
+    0x4b,
+    0xe5,
+    0xf2,
+    0xe9,
+    0xd2,
+    0xa4,
+    0xa7,
+    0x34,
+    0x55,
+    0x5e,
+    0xf3,
+    0xf8,
+    0x9c,
+    0x49,
+    0x8f,
+    0x0c,
+    0xc8,
+    0xb2,
+    0x75,
+    0x4b,
+    0x4d,
+    0x2f,
+    0xfe,
+    0x05,
+    0x5a,
+    0xdd,
+    0x4b,
+    0xe6,
+    0x14,
+    0xb4,
+    0xd2,
+    0xc0,
+    0x93,
+    0x6e,
+    0x0e,
+    0x84,
+    0x41,
+    0x4d,
+    0x31,
+    0x43,
+    0x8e,
+    0xab,
+    0xcd,
+    0xce,
+    0x24,
+    0x44,
+    0xc2,
+    0x20,
+    0xe1,
+    0xe2,
+    0xc8,
+    0xae,
+    0xa3,
+    0x8d,
+    0x4e,
 };
 
 static QUIC_PKT_HDR tx_script_5_hdr = {
-    QUIC_PKT_TYPE_RETRY,        /* type */
-    0,                          /* spin bit */
-    0,                          /* key phase */
-    0,                          /* PN length */
-    0,                          /* partial */
-    0,                          /* fixed */
-    0,                          /* unused */
-    0,                          /* reserved */
-    1,                          /* version */
-    { 0, {0} },                 /* DCID */
-    { 4, {0xa9, 0x20, 0xcc, 0xc2} },   /* SCID */
-    { 0 },                      /* PN */
-    NULL, 0,                    /* Token */
-    5555, NULL                  /* Len/Data */
+    QUIC_PKT_TYPE_RETRY, /* type */
+    0, /* spin bit */
+    0, /* key phase */
+    0, /* PN length */
+    0, /* partial */
+    0, /* fixed */
+    0, /* unused */
+    0, /* reserved */
+    1, /* version */
+    { 0, { 0 } }, /* DCID */
+    { 4, { 0xa9, 0x20, 0xcc, 0xc2 } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token */
+    5555, NULL /* Len/Data */
 };
 
 static const OSSL_QTX_IOVEC tx_script_5_iovec[] = {
@@ -3540,42 +11225,41 @@ static const OSSL_QTX_PKT tx_script_5_pkt = {
 
 static const struct tx_test_op tx_script_5[] = {
     TX_OP_WRITE_CHECK(5)
-    TX_OP_END
+        TX_OP_END
 };
 
 /* 6. Real World - Version Negotiation Packet */
 static const unsigned char tx_script_6_body[] = {
-    0x00, 0x00, 0x00, 0x01,             /* Supported Version: 1 */
-    0xaa, 0x9a, 0x3a, 0x9a              /* Supported Version: Random (GREASE) */
+    0x00, 0x00, 0x00, 0x01, /* Supported Version: 1 */
+    0xaa, 0x9a, 0x3a, 0x9a /* Supported Version: Random (GREASE) */
 };
 
 static const unsigned char tx_script_6_dgram[] = {
-    0x80,                               /* Long */
-    0x00, 0x00, 0x00, 0x00,             /* Version 0 (Version Negotiation) */
-    0x00,                               /* DCID */
+    0x80, /* Long */
+    0x00, 0x00, 0x00, 0x00, /* Version 0 (Version Negotiation) */
+    0x00, /* DCID */
     0x0c, 0x35, 0x3c, 0x1b, 0x97, 0xca, /* SCID */
     0xf8, 0x99, 0x11, 0x39, 0xad, 0x79,
     0x1f,
-    0x00, 0x00, 0x00, 0x01,             /* Supported Version: 1 */
-    0xaa, 0x9a, 0x3a, 0x9a              /* Supported Version: Random (GREASE) */
+    0x00, 0x00, 0x00, 0x01, /* Supported Version: 1 */
+    0xaa, 0x9a, 0x3a, 0x9a /* Supported Version: Random (GREASE) */
 };
 
 static QUIC_PKT_HDR tx_script_6_hdr = {
-    QUIC_PKT_TYPE_VERSION_NEG,  /* type */
-    0,                          /* spin bit */
-    0,                          /* key phase */
-    0,                          /* PN length */
-    0,                          /* partial */
-    0,                          /* fixed */
-    0,                          /* unused */
-    0,                          /* reserved */
-    0,                          /* version */
-    { 0, {0} },                 /* DCID */
-    { 12, {0x35, 0x3c, 0x1b, 0x97, 0xca, 0xf8, 0x99,
-           0x11, 0x39, 0xad, 0x79, 0x1f} }, /* SCID */
-    { 0 },                      /* PN */
-    NULL, 0,                    /* Token */
-    5555, NULL                  /* Len/Data */
+    QUIC_PKT_TYPE_VERSION_NEG, /* type */
+    0, /* spin bit */
+    0, /* key phase */
+    0, /* PN length */
+    0, /* partial */
+    0, /* fixed */
+    0, /* unused */
+    0, /* reserved */
+    0, /* version */
+    { 0, { 0 } }, /* DCID */
+    { 12, { 0x35, 0x3c, 0x1b, 0x97, 0xca, 0xf8, 0x99, 0x11, 0x39, 0xad, 0x79, 0x1f } }, /* SCID */
+    { 0 }, /* PN */
+    NULL, 0, /* Token */
+    5555, NULL /* Len/Data */
 };
 
 static const OSSL_QTX_IOVEC tx_script_6_iovec[] = {
@@ -3593,7 +11277,7 @@ static const OSSL_QTX_PKT tx_script_6_pkt = {
 
 static const struct tx_test_op tx_script_6[] = {
     TX_OP_WRITE_CHECK(6)
-    TX_OP_END
+        TX_OP_END
 };
 
 static const struct tx_test_op *const tx_scripts[] = {
@@ -3612,8 +11296,8 @@ static int tx_run_script(const struct tx_test_op *script)
     int testresult = 0;
     const struct tx_test_op *op = script;
     OSSL_QTX *qtx = NULL;
-    BIO_MSG msg = {0};
-    OSSL_QTX_ARGS args = {0};
+    BIO_MSG msg = { 0 };
+    OSSL_QTX_ARGS args = { 0 };
 
     args.mdpl = 1472;
 
@@ -3622,69 +11306,67 @@ static int tx_run_script(const struct tx_test_op *script)
 
     for (; op->op != TX_TEST_OP_END; ++op)
         switch (op->op) {
-            case TX_TEST_OP_PROVIDE_SECRET:
-                if (!TEST_true(ossl_qtx_provide_secret(qtx, op->enc_level,
-                                                       op->suite_id, NULL,
-                                                       op->buf, op->buf_len)))
-                    goto err;
-                break;
-            case TX_TEST_OP_PROVIDE_SECRET_INITIAL:
-                if (!TEST_true(ossl_quic_provide_initial_secret(NULL, NULL,
-                                                                op->dcid,
-                                                                (int)op->suite_id,
-                                                                NULL, qtx)))
-                    goto err;
-                break;
-            case TX_TEST_OP_DISCARD_EL:
-                if (!TEST_true(ossl_qtx_discard_enc_level(qtx, op->enc_level)))
-                    goto err;
-                break;
-            case TX_TEST_OP_WRITE:
-                {
-                    uint32_t enc_level
-                        = ossl_quic_pkt_type_to_enc_level(op->pkt->hdr->type);
-                    uint64_t old_value = 0, new_value, max_value;
-
-                    if (enc_level < QUIC_ENC_LEVEL_NUM) { /* encrypted packet */
-                        max_value = ossl_qtx_get_max_epoch_pkt_count(qtx, enc_level);
-
-                        if (!TEST_uint64_t_lt(max_value, UINT64_MAX))
-                            goto err;
-
-                        old_value = ossl_qtx_get_cur_epoch_pkt_count(qtx, enc_level);
-                        if (!TEST_uint64_t_lt(old_value, UINT64_MAX))
-                            goto err;
-                    }
+        case TX_TEST_OP_PROVIDE_SECRET:
+            if (!TEST_true(ossl_qtx_provide_secret(qtx, op->enc_level,
+                    op->suite_id, NULL,
+                    op->buf, op->buf_len)))
+                goto err;
+            break;
+        case TX_TEST_OP_PROVIDE_SECRET_INITIAL:
+            if (!TEST_true(ossl_quic_provide_initial_secret(NULL, NULL,
+                    op->dcid,
+                    (int)op->suite_id,
+                    NULL, qtx)))
+                goto err;
+            break;
+        case TX_TEST_OP_DISCARD_EL:
+            if (!TEST_true(ossl_qtx_discard_enc_level(qtx, op->enc_level)))
+                goto err;
+            break;
+        case TX_TEST_OP_WRITE: {
+            uint32_t enc_level
+                = ossl_quic_pkt_type_to_enc_level(op->pkt->hdr->type);
+            uint64_t old_value = 0, new_value, max_value;
 
-                    if (!TEST_true(ossl_qtx_write_pkt(qtx, op->pkt)))
-                        goto err;
+            if (enc_level < QUIC_ENC_LEVEL_NUM) { /* encrypted packet */
+                max_value = ossl_qtx_get_max_epoch_pkt_count(qtx, enc_level);
 
-                    if (enc_level < QUIC_ENC_LEVEL_NUM) {
-                        new_value = ossl_qtx_get_cur_epoch_pkt_count(qtx, enc_level);
-                        if (!TEST_uint64_t_eq(old_value + 1, new_value))
-                            goto err;
-                    }
-                }
-                break;
-            case TX_TEST_OP_CHECK_DGRAM:
-                if (!TEST_true(ossl_qtx_pop_net(qtx, &msg)))
+                if (!TEST_uint64_t_lt(max_value, UINT64_MAX))
                     goto err;
 
-                if (!TEST_mem_eq(msg.data, msg.data_len, op->buf, op->buf_len))
+                old_value = ossl_qtx_get_cur_epoch_pkt_count(qtx, enc_level);
+                if (!TEST_uint64_t_lt(old_value, UINT64_MAX))
                     goto err;
+            }
 
-                break;
-            case TX_TEST_OP_CHECK_NO_DGRAM:
-                if (!TEST_false(ossl_qtx_pop_net(qtx, &msg)))
-                    goto err;
-                break;
-            case TX_TEST_OP_KEY_UPDATE:
-                if (!TEST_true(ossl_qtx_trigger_key_update(qtx)))
+            if (!TEST_true(ossl_qtx_write_pkt(qtx, op->pkt)))
+                goto err;
+
+            if (enc_level < QUIC_ENC_LEVEL_NUM) {
+                new_value = ossl_qtx_get_cur_epoch_pkt_count(qtx, enc_level);
+                if (!TEST_uint64_t_eq(old_value + 1, new_value))
                     goto err;
-                break;
-            default:
-                OPENSSL_assert(0);
+            }
+        } break;
+        case TX_TEST_OP_CHECK_DGRAM:
+            if (!TEST_true(ossl_qtx_pop_net(qtx, &msg)))
+                goto err;
+
+            if (!TEST_mem_eq(msg.data, msg.data_len, op->buf, op->buf_len))
                 goto err;
+
+            break;
+        case TX_TEST_OP_CHECK_NO_DGRAM:
+            if (!TEST_false(ossl_qtx_pop_net(qtx, &msg)))
+                goto err;
+            break;
+        case TX_TEST_OP_KEY_UPDATE:
+            if (!TEST_true(ossl_qtx_trigger_key_update(qtx)))
+                goto err;
+            break;
+        default:
+            OPENSSL_assert(0);
+            goto err;
         }
 
     testresult = 1;
diff --git a/test/quic_record_test_util.h b/test/quic_record_test_util.h
index fba4bf21d671a..f6a945c326cd5 100644
--- a/test/quic_record_test_util.h
+++ b/test/quic_record_test_util.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef OSSL_RECORD_TEST_UTIL_H
-# define OSSL_RECORD_TEST_UTIL_H
+#define OSSL_RECORD_TEST_UTIL_H
 
 static int cmp_pkt_hdr(const QUIC_PKT_HDR *a, const QUIC_PKT_HDR *b,
-                       const unsigned char *b_data, size_t b_len,
-                       int cmp_data)
+    const unsigned char *b_data, size_t b_len,
+    int cmp_data)
 {
     int ok = 1;
 
     if (b_data == NULL) {
         b_data = b->data;
-        b_len  = b->len;
+        b_len = b->len;
     }
 
     if (!TEST_int_eq(a->type, b->type)
diff --git a/test/quic_srt_gen_test.c b/test/quic_srt_gen_test.c
index 59f331d5af2e5..fcbf4aea225fc 100644
--- a/test/quic_srt_gen_test.c
+++ b/test/quic_srt_gen_test.c
@@ -17,10 +17,10 @@
 #include "testutil/output.h"
 
 struct test_case {
-    const unsigned char         *key;
-    size_t                      key_len;
-    QUIC_CONN_ID                dcid;
-    QUIC_STATELESS_RESET_TOKEN  expected;
+    const unsigned char *key;
+    size_t key_len;
+    QUIC_CONN_ID dcid;
+    QUIC_STATELESS_RESET_TOKEN expected;
 };
 
 static const unsigned char key_1[] = { 0x01, 0x02, 0x03 };
@@ -31,19 +31,13 @@ static const unsigned char key_2[] = {
 };
 
 static const struct test_case tests[] = {
-    {
-      key_1, sizeof(key_1), { 2, { 0x55, 0x66 } },
-      {{ 0x02,0x9e,0x8f,0x3d,0x1e,0xa9,0x06,0x23,0xb2,0x43,0xd2,0x19,0x59,0x8a,0xa1,0x66 }}
-    },
-    {
-      key_2, sizeof(key_2), { 0, { 0 } },
-      {{ 0x93,0x10,0x2f,0xc7,0xaf,0x9d,0x9b,0x28,0x3f,0x84,0x95,0x6b,0xa3,0xdc,0x07,0x6b }}
-    },
-    {
-      key_2, sizeof(key_2),
-      { 20, { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } },
-      {{ 0x9a,0x98,0x98,0x61,0xbe,0xfd,0xe3,0x05,0x45,0xac,0x66,0xcf,0x3b,0x58,0xfb,0xab }}
-    }
+    { key_1, sizeof(key_1), { 2, { 0x55, 0x66 } },
+        { { 0x02, 0x9e, 0x8f, 0x3d, 0x1e, 0xa9, 0x06, 0x23, 0xb2, 0x43, 0xd2, 0x19, 0x59, 0x8a, 0xa1, 0x66 } } },
+    { key_2, sizeof(key_2), { 0, { 0 } },
+        { { 0x93, 0x10, 0x2f, 0xc7, 0xaf, 0x9d, 0x9b, 0x28, 0x3f, 0x84, 0x95, 0x6b, 0xa3, 0xdc, 0x07, 0x6b } } },
+    { key_2, sizeof(key_2),
+        { 20, { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } },
+        { { 0x9a, 0x98, 0x98, 0x61, 0xbe, 0xfd, 0xe3, 0x05, 0x45, 0xac, 0x66, 0xcf, 0x3b, 0x58, 0xfb, 0xab } } }
 };
 
 static int test_srt_gen(int idx)
@@ -55,18 +49,18 @@ static int test_srt_gen(int idx)
     size_t i;
 
     if (!TEST_ptr(srt_gen = ossl_quic_srt_gen_new(NULL, NULL,
-                                                  t->key, t->key_len)))
+                      t->key, t->key_len)))
         goto err;
 
     for (i = 0; i < 2; ++i) {
         memset(&token, 0xff, sizeof(token));
 
         if (!TEST_true(ossl_quic_srt_gen_calculate_token(srt_gen, &t->dcid,
-                                                         &token)))
+                &token)))
             goto err;
 
         if (!TEST_mem_eq(token.token, sizeof(token.token),
-                         &t->expected, sizeof(t->expected)))
+                &t->expected, sizeof(t->expected)))
             goto err;
     }
 
diff --git a/test/quic_srtm_test.c b/test/quic_srtm_test.c
index 558e323cd6ea2..cbdf8476324f8 100644
--- a/test/quic_srtm_test.c
+++ b/test/quic_srtm_test.c
@@ -12,13 +12,9 @@
 
 static char ptrs[8];
 
-static const QUIC_STATELESS_RESET_TOKEN token_1 = {{
-    0x01, 0x02, 0x03, 0x04
-}};
+static const QUIC_STATELESS_RESET_TOKEN token_1 = { { 0x01, 0x02, 0x03, 0x04 } };
 
-static const QUIC_STATELESS_RESET_TOKEN token_2 = {{
-    0x01, 0x02, 0x03, 0x05
-}};
+static const QUIC_STATELESS_RESET_TOKEN token_2 = { { 0x01, 0x02, 0x03, 0x05 } };
 
 static int test_srtm(void)
 {
@@ -67,8 +63,7 @@ static int test_srtm(void)
         || !TEST_ptr_eq(opaque, ptrs + 2)
         || !TEST_uint64_t_eq(seq_num, 0)
         || !TEST_true(ossl_quic_srtm_remove(srtm, ptrs + 2, 0))
-        || !TEST_false(ossl_quic_srtm_lookup(srtm, &token_2, 0, &opaque, &seq_num))
-       )
+        || !TEST_false(ossl_quic_srtm_lookup(srtm, &token_2, 0, &opaque, &seq_num)))
         goto err;
 
     testresult = 1;
diff --git a/test/quic_stream_test.c b/test/quic_stream_test.c
index e2935be0d53b7..6a646d93636e7 100644
--- a/test/quic_stream_test.c
+++ b/test/quic_stream_test.c
@@ -11,7 +11,7 @@
 #include "testutil.h"
 
 static int compare_iov(const unsigned char *ref, size_t ref_len,
-                       const OSSL_QTX_IOVEC *iov, size_t iov_len)
+    const OSSL_QTX_IOVEC *iov, size_t iov_len)
 {
     size_t i, total_len = 0;
     const unsigned char *cur = ref;
@@ -55,12 +55,12 @@ static int test_sstream_simple(void)
     /* Should not have any data yet */
     num_iov = OSSL_NELEM(iov);
     if (!TEST_false(ossl_quic_sstream_get_stream_frame(sstream, 0, &hdr, iov,
-                                                       &num_iov)))
+            &num_iov)))
         goto err;
 
     /* Append data */
     if (!TEST_true(ossl_quic_sstream_append(sstream, data_1, sizeof(data_1),
-                                            &wr))
+            &wr))
         || !TEST_size_t_eq(wr, sizeof(data_1)))
         goto err;
 
@@ -71,7 +71,7 @@ static int test_sstream_simple(void)
     /* Read data */
     num_iov = OSSL_NELEM(iov);
     if (!TEST_true(ossl_quic_sstream_get_stream_frame(sstream, 0, &hdr, iov,
-                                                      &num_iov))
+            &num_iov))
         || !TEST_size_t_gt(num_iov, 0)
         || !TEST_uint64_t_eq(hdr.offset, 0)
         || !TEST_uint64_t_eq(hdr.len, sizeof(data_1))
@@ -88,7 +88,7 @@ static int test_sstream_simple(void)
     /* Read data */
     num_iov = OSSL_NELEM(iov);
     if (!TEST_true(ossl_quic_sstream_get_stream_frame(sstream, 0, &hdr, iov,
-                                                      &num_iov))
+            &num_iov))
         || !TEST_size_t_gt(num_iov, 0)
         || !TEST_uint64_t_eq(hdr.offset, 8)
         || !TEST_uint64_t_eq(hdr.len, sizeof(data_1) - 8)
@@ -104,7 +104,7 @@ static int test_sstream_simple(void)
     /* Read more data; should not be any more */
     num_iov = OSSL_NELEM(iov);
     if (!TEST_false(ossl_quic_sstream_get_stream_frame(sstream, 0, &hdr, iov,
-                                                       &num_iov)))
+            &num_iov)))
         goto err;
 
     /* Now we have lost bytes 4-6 */
@@ -114,7 +114,7 @@ static int test_sstream_simple(void)
     /* Should be able to read them */
     num_iov = OSSL_NELEM(iov);
     if (!TEST_true(ossl_quic_sstream_get_stream_frame(sstream, 0, &hdr, iov,
-                                                      &num_iov))
+            &num_iov))
         || !TEST_size_t_gt(num_iov, 0)
         || !TEST_uint64_t_eq(hdr.offset, 4)
         || !TEST_uint64_t_eq(hdr.len, 3)
@@ -131,7 +131,7 @@ static int test_sstream_simple(void)
     /* Read more data; should not be any more */
     num_iov = OSSL_NELEM(iov);
     if (!TEST_false(ossl_quic_sstream_get_stream_frame(sstream, 0, &hdr, iov,
-                                                       &num_iov)))
+            &num_iov)))
         goto err;
 
     if (!TEST_size_t_eq(ossl_quic_sstream_get_buffer_used(sstream), 16))
@@ -158,7 +158,7 @@ static int test_sstream_simple(void)
     for (i = 0; i < 2; ++i) {
         num_iov = OSSL_NELEM(iov);
         if (!TEST_true(ossl_quic_sstream_get_stream_frame(sstream, 0, &hdr, iov,
-                                                          &num_iov))
+                &num_iov))
             || !TEST_uint64_t_eq(hdr.offset, 16)
             || !TEST_uint64_t_eq(hdr.len, 0)
             || !TEST_true(hdr.is_fin)
@@ -172,7 +172,7 @@ static int test_sstream_simple(void)
     /* Read more data; FIN should not be returned any more */
     num_iov = OSSL_NELEM(iov);
     if (!TEST_false(ossl_quic_sstream_get_stream_frame(sstream, 0, &hdr, iov,
-                                                       &num_iov)))
+            &num_iov)))
         goto err;
 
     /* Lose FIN frame */
@@ -183,7 +183,7 @@ static int test_sstream_simple(void)
     for (i = 0; i < 2; ++i) {
         num_iov = OSSL_NELEM(iov);
         if (!TEST_true(ossl_quic_sstream_get_stream_frame(sstream, 0, &hdr, iov,
-                                                          &num_iov))
+                &num_iov))
             || !TEST_uint64_t_eq(hdr.offset, 16)
             || !TEST_uint64_t_eq(hdr.len, 0)
             || !TEST_true(hdr.is_fin)
@@ -197,7 +197,7 @@ static int test_sstream_simple(void)
     /* Read more data; FIN should not be returned any more */
     num_iov = OSSL_NELEM(iov);
     if (!TEST_false(ossl_quic_sstream_get_stream_frame(sstream, 0, &hdr, iov,
-                                                       &num_iov)))
+            &num_iov)))
         goto err;
 
     /* Acknowledge fin. */
@@ -208,7 +208,7 @@ static int test_sstream_simple(void)
         goto err;
 
     testresult = 1;
- err:
+err:
     ossl_quic_sstream_free(sstream);
     return testresult;
 }
@@ -247,12 +247,12 @@ static int test_sstream_bulk(int idx)
      * Append a preliminary buffer to allow later code to exercise wraparound.
      */
     if (!TEST_true(ossl_quic_sstream_append(sstream, src_buf, init_size / 2,
-                                            &consumed))
+            &consumed))
         || !TEST_size_t_eq(consumed, init_size / 2)
         || !TEST_true(ossl_quic_sstream_mark_transmitted(sstream, 0,
-                                                         init_size / 2 - 1))
+            init_size / 2 - 1))
         || !TEST_true(ossl_quic_sstream_mark_acked(sstream, 0,
-                                                   init_size / 2 - 1)))
+            init_size / 2 - 1)))
         goto err;
 
     start_at = init_size / 2;
@@ -269,8 +269,8 @@ static int test_sstream_bulk(int idx)
             goto err;
 
         memcpy(ref_src_cur, src_buf, consumed);
-        ref_src_cur     += consumed;
-        total_written   += consumed;
+        ref_src_cur += consumed;
+        total_written += consumed;
     } while (consumed > 0);
 
     if (!TEST_size_t_eq(ossl_quic_sstream_get_buffer_used(sstream), init_size)
@@ -289,8 +289,8 @@ static int test_sstream_bulk(int idx)
             *ref_dst_cur++ = *ref_src_cur;
             ++expected;
         } else if (!TEST_true(ossl_quic_sstream_mark_transmitted(sstream,
-                                                                 start_at + i,
-                                                                 start_at + i)))
+                       start_at + i,
+                       start_at + i)))
             goto err;
 
         ++ref_src_cur;
@@ -306,7 +306,7 @@ static int test_sstream_bulk(int idx)
     for (i = 0, rd = 0; rd < expected; ++i) {
         num_iov = OSSL_NELEM(iov);
         if (!TEST_true(ossl_quic_sstream_get_stream_frame(sstream, i, &hdr, iov,
-                                                          &num_iov)))
+                &num_iov)))
             goto err;
 
         cur_rd = 0;
@@ -316,7 +316,7 @@ static int test_sstream_bulk(int idx)
 
             memcpy(dst_cur, iov[j].buf, iov[j].buf_len);
             dst_cur += iov[j].buf_len;
-            cur_rd  += iov[j].buf_len;
+            cur_rd += iov[j].buf_len;
         }
 
         if (!TEST_uint64_t_eq(cur_rd, hdr.len))
@@ -329,7 +329,7 @@ static int test_sstream_bulk(int idx)
         goto err;
 
     testresult = 1;
- err:
+err:
     OPENSSL_free(src_buf);
     OPENSSL_free(dst_buf);
     OPENSSL_free(ref_src_buf);
@@ -339,8 +339,8 @@ static int test_sstream_bulk(int idx)
 }
 
 static int test_single_copy_read(QUIC_RSTREAM *qrs,
-                                 unsigned char *buf, size_t size,
-                                 size_t *readbytes, int *fin)
+    unsigned char *buf, size_t size,
+    size_t *readbytes, int *fin)
 {
     const unsigned char *record;
     size_t rec_len;
@@ -370,8 +370,7 @@ static int test_single_copy_read(QUIC_RSTREAM *qrs,
     return 1;
 }
 
-static const unsigned char simple_data[] =
-    "Hello world! And thank you for all the fish!";
+static const unsigned char simple_data[] = "Hello world! And thank you for all the fish!";
 
 static int test_rstream_simple(int idx)
 {
@@ -382,55 +381,56 @@ static int test_rstream_simple(int idx)
     int fin = 0;
     int use_rbuf = idx > 1;
     int use_sc = idx % 2;
-    int (* read_fn)(QUIC_RSTREAM *, unsigned char *, size_t, size_t *,
-                    int *) = use_sc ? test_single_copy_read
-                                    : ossl_quic_rstream_read;
+    int (*read_fn)(QUIC_RSTREAM *, unsigned char *, size_t, size_t *,
+        int *)
+        = use_sc ? test_single_copy_read
+                 : ossl_quic_rstream_read;
 
     if (!TEST_ptr(rstream = ossl_quic_rstream_new(NULL, NULL, 0)))
         goto err;
 
     if (!TEST_true(ossl_quic_rstream_queue_data(rstream, NULL, 5,
-                                                simple_data + 5, 10, 0))
+            simple_data + 5, 10, 0))
         || !TEST_true(ossl_quic_rstream_queue_data(rstream, NULL,
-                                                   sizeof(simple_data) - 1,
-                                                   simple_data + sizeof(simple_data) - 1,
-                                                   1, 1))
+            sizeof(simple_data) - 1,
+            simple_data + sizeof(simple_data) - 1,
+            1, 1))
         || !TEST_true(ossl_quic_rstream_peek(rstream, buf, sizeof(buf),
-                                             &readbytes, &fin))
+            &readbytes, &fin))
         || !TEST_false(fin)
         || !TEST_size_t_eq(readbytes, 0)
         || !TEST_true(ossl_quic_rstream_queue_data(rstream, NULL,
-                                                   sizeof(simple_data) - 10,
-                                                   simple_data + sizeof(simple_data) - 10,
-                                                   10, 1))
+            sizeof(simple_data) - 10,
+            simple_data + sizeof(simple_data) - 10,
+            10, 1))
         || !TEST_true(ossl_quic_rstream_queue_data(rstream, NULL, 0,
-                                                   simple_data, 1, 0))
+            simple_data, 1, 0))
         || !TEST_true(ossl_quic_rstream_peek(rstream, buf, sizeof(buf),
-                                             &readbytes, &fin))
+            &readbytes, &fin))
         || !TEST_false(fin)
         || !TEST_size_t_eq(readbytes, 1)
         || !TEST_mem_eq(buf, 1, simple_data, 1)
         || (use_rbuf && !TEST_false(ossl_quic_rstream_move_to_rbuf(rstream)))
         || (use_rbuf
             && !TEST_true(ossl_quic_rstream_resize_rbuf(rstream,
-                                                        sizeof(simple_data))))
+                sizeof(simple_data))))
         || (use_rbuf && !TEST_true(ossl_quic_rstream_move_to_rbuf(rstream)))
         || !TEST_true(ossl_quic_rstream_queue_data(rstream, NULL,
-                                                   0, simple_data,
-                                                   10, 0))
+            0, simple_data,
+            10, 0))
         || !TEST_true(ossl_quic_rstream_queue_data(rstream, NULL,
-                                                   sizeof(simple_data),
-                                                   NULL,
-                                                   0, 1))
+            sizeof(simple_data),
+            NULL,
+            0, 1))
         || !TEST_true(ossl_quic_rstream_peek(rstream, buf, sizeof(buf),
-                                             &readbytes, &fin))
+            &readbytes, &fin))
         || !TEST_false(fin)
         || !TEST_size_t_eq(readbytes, 15)
         || !TEST_mem_eq(buf, 15, simple_data, 15)
         || !TEST_true(ossl_quic_rstream_queue_data(rstream, NULL,
-                                                   15,
-                                                   simple_data + 15,
-                                                   sizeof(simple_data) - 15, 1))
+            15,
+            simple_data + 15,
+            sizeof(simple_data) - 15, 1))
         || !TEST_true(ossl_quic_rstream_available(rstream, &avail, &fin))
         || !TEST_true(fin)
         || !TEST_size_t_eq(avail, sizeof(simple_data))
@@ -443,19 +443,19 @@ static int test_rstream_simple(int idx)
         || !TEST_size_t_eq(readbytes, 12)
         || !TEST_mem_eq(buf + 2, 12, simple_data + 2, 12)
         || !TEST_true(ossl_quic_rstream_queue_data(rstream, NULL,
-                                                   sizeof(simple_data),
-                                                   NULL,
-                                                   0, 1))
+            sizeof(simple_data),
+            NULL,
+            0, 1))
         || (use_rbuf
             && !TEST_true(ossl_quic_rstream_resize_rbuf(rstream,
-                                                        2 * sizeof(simple_data))))
+                2 * sizeof(simple_data))))
         || (use_rbuf && !TEST_true(ossl_quic_rstream_move_to_rbuf(rstream)))
         || !TEST_true(read_fn(rstream, buf + 14, 5, &readbytes, &fin))
         || !TEST_false(fin)
         || !TEST_size_t_eq(readbytes, 5)
         || !TEST_mem_eq(buf, 14 + 5, simple_data, 14 + 5)
         || !TEST_true(read_fn(rstream, buf + 14 + 5, sizeof(buf) - 14 - 5,
-                              &readbytes, &fin))
+            &readbytes, &fin))
         || !TEST_true(fin)
         || !TEST_size_t_eq(readbytes, sizeof(buf) - 14 - 5)
         || !TEST_mem_eq(buf, sizeof(buf), simple_data, sizeof(simple_data))
@@ -467,7 +467,7 @@ static int test_rstream_simple(int idx)
 
     ret = 1;
 
- err:
+err:
     ossl_quic_rstream_free(rstream);
     return ret;
 }
@@ -507,14 +507,14 @@ static int test_rstream_random(int idx)
                 queued_min = off + size;
 
             if (!TEST_true(ossl_quic_rstream_queue_data(rstream, NULL, off,
-                                                        bulk_data + off,
-                                                        size, 0)))
+                    bulk_data + off,
+                    size, 0)))
                 goto err;
             if (queued_max < off + size)
                 queued_max = off + size;
 
             if (test_random() % 5 != 0)
-               continue;
+                continue;
 
             /* random overlapping retransmit */
             off = read_off + test_random() % 50;
@@ -527,39 +527,39 @@ static int test_rstream_random(int idx)
                 queued_min = off + size;
 
             if (!TEST_true(ossl_quic_rstream_queue_data(rstream, NULL, off,
-                                                        bulk_data + off,
-                                                        size, 0)))
+                    bulk_data + off,
+                    size, 0)))
                 goto err;
             if (queued_max < off + size)
                 queued_max = off + size;
         }
         if (idx % 2 == 0) {
             if (!TEST_true(test_single_copy_read(rstream, read_buf, data_size,
-                                                 &readbytes, &fin)))
+                    &readbytes, &fin)))
                 goto err;
         } else if (!TEST_true(ossl_quic_rstream_read(rstream, read_buf,
-                                                     data_size,
-                                                     &readbytes, &fin))) {
+                       data_size,
+                       &readbytes, &fin))) {
             goto err;
         }
         if (!TEST_size_t_ge(readbytes, queued_min - read_off)
             || !TEST_size_t_le(readbytes + read_off, data_size)
             || (idx % 3 != 0
                 && !TEST_mem_eq(read_buf, readbytes, bulk_data + read_off,
-                                readbytes)))
+                    readbytes)))
             goto err;
         read_off += readbytes;
         queued_min = read_off;
         if (test_random() % 50 == 0)
             if (!TEST_true(ossl_quic_rstream_resize_rbuf(rstream,
-                                                         queued_max - read_off + 1))
+                    queued_max - read_off + 1))
                 || !TEST_true(ossl_quic_rstream_move_to_rbuf(rstream)))
                 goto err;
         if (!fin_set && queued_max >= data_size - test_random() % 200) {
             fin_set = 1;
             /* Queue empty fin frame */
             if (!TEST_true(ossl_quic_rstream_queue_data(rstream, NULL, data_size,
-                                                        NULL, 0, 1)))
+                    NULL, 0, 1)))
                 goto err;
         }
     }
@@ -575,11 +575,11 @@ static int test_rstream_random(int idx)
         /* We might still receive the final empty frame */
         if (idx % 2 == 0) {
             if (!TEST_true(test_single_copy_read(rstream, read_buf, data_size,
-                                                 &readbytes, &fin)))
+                    &readbytes, &fin)))
                 goto err;
         } else if (!TEST_true(ossl_quic_rstream_read(rstream, read_buf,
-                                                     data_size,
-                                                     &readbytes, &fin))) {
+                       data_size,
+                       &readbytes, &fin))) {
             goto err;
         }
         if (!TEST_size_t_eq(readbytes, 0) || !TEST_true(fin))
@@ -588,7 +588,7 @@ static int test_rstream_random(int idx)
 
     ret = 1;
 
- err:
+err:
     ossl_quic_rstream_free(rstream);
     OPENSSL_free(bulk_data);
     OPENSSL_free(read_buf);
diff --git a/test/quic_tserver_test.c b/test/quic_tserver_test.c
index e3732b11a36ec..ae576441e7335 100644
--- a/test/quic_tserver_test.c
+++ b/test/quic_tserver_test.c
@@ -58,11 +58,11 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
     BIO *s_net_bio = NULL, *s_net_bio_own = NULL;
     BIO *c_net_bio = NULL, *c_net_bio_own = NULL;
     BIO *c_pair_own = NULL, *s_pair_own = NULL;
-    QUIC_TSERVER_ARGS tserver_args = {0};
+    QUIC_TSERVER_ARGS tserver_args = { 0 };
     QUIC_TSERVER *tserver = NULL;
     BIO_ADDR *s_addr_ = NULL;
-    struct in_addr ina = {0};
-    union BIO_sock_info_u s_info = {0};
+    struct in_addr ina = { 0 };
+    union BIO_sock_info_u s_info = { 0 };
     SSL_CTX *c_ctx = NULL;
     SSL *c_ssl = NULL;
     int c_connected = 0, c_write_done = 0, c_begin_read = 0, s_read_done = 0;
@@ -124,7 +124,7 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
         tserver_args.now_cb = fake_now;
 
     if (!TEST_ptr(tserver = ossl_quic_tserver_new(&tserver_args, certfile,
-                                                  keyfile))) {
+                      keyfile))) {
         BIO_free(s_net_bio);
         goto err;
     }
@@ -139,7 +139,7 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
          * datagrams.
          */
         if (!TEST_true(BIO_new_bio_dgram_pair(&c_pair_own, 5000,
-                                              &s_pair_own, 5000)))
+                &s_pair_own, 5000)))
             goto err;
     }
 
@@ -158,8 +158,8 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
         goto err;
 
     if (!TEST_ptr(c_ctx = SSL_CTX_new(use_thread_assist
-                                      ? OSSL_QUIC_client_thread_method()
-                                      : OSSL_QUIC_client_method())))
+                          ? OSSL_QUIC_client_thread_method()
+                          : OSSL_QUIC_client_method())))
         goto err;
 
     if (!TEST_ptr(c_ssl = SSL_new(c_ctx)))
@@ -201,7 +201,8 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
 
     for (;;) {
         if (ossl_time_compare(ossl_time_subtract(real_now(NULL), start_time),
-                              ossl_ms2time(limit_ms)) >= 0) {
+                ossl_ms2time(limit_ms))
+            >= 0) {
             TEST_error("timeout while attempting QUIC server test");
             goto err;
         }
@@ -230,7 +231,7 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
 
         if (c_connected && !c_write_done) {
             if (!TEST_int_eq(SSL_write(c_ssl, msg1, sizeof(msg1) - 1),
-                             (int)sizeof(msg1) - 1))
+                    (int)sizeof(msg1) - 1))
                 goto err;
 
             if (!TEST_true(SSL_stream_conclude(c_ssl, 0)))
@@ -241,8 +242,8 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
 
         if (c_connected && c_write_done && !s_read_done) {
             if (!ossl_quic_tserver_read(tserver, 0,
-                                        (unsigned char *)msg2 + s_total_read,
-                                        sizeof(msg2) - s_total_read, &l)) {
+                    (unsigned char *)msg2 + s_total_read,
+                    sizeof(msg2) - s_total_read, &l)) {
                 if (!TEST_true(ossl_quic_tserver_has_read_ended(tserver, 0)))
                     goto err;
 
@@ -250,7 +251,7 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
                     goto err;
 
                 s_begin_write = 1;
-                s_read_done   = 1;
+                s_read_done = 1;
             } else {
                 s_total_read += l;
                 if (!TEST_size_t_le(s_total_read, sizeof(msg1) - 1))
@@ -260,8 +261,8 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
 
         if (s_begin_write && s_total_written < sizeof(msg1) - 1) {
             if (!TEST_true(ossl_quic_tserver_write(tserver, 0,
-                                                   (unsigned char *)msg2 + s_total_written,
-                                                   sizeof(msg1) - 1 - s_total_written, &l)))
+                    (unsigned char *)msg2 + s_total_written,
+                    sizeof(msg1) - 1 - s_total_written, &l)))
                 goto err;
 
             s_total_written += l;
@@ -274,7 +275,7 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
 
         if (c_begin_read && c_total_read < sizeof(msg1) - 1) {
             ret = SSL_read_ex(c_ssl, msg3 + c_total_read,
-                              sizeof(msg1) - 1 - c_total_read, &l);
+                sizeof(msg1) - 1 - c_total_read, &l);
             if (!TEST_true(ret == 1 || is_want(c_ssl, ret)))
                 goto err;
 
@@ -282,7 +283,7 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
 
             if (c_total_read == sizeof(msg1) - 1) {
                 if (!TEST_mem_eq(msg1, sizeof(msg1) - 1,
-                                 msg3, c_total_read))
+                        msg3, c_total_read))
                     goto err;
 
                 c_wait_eos = 1;
@@ -302,7 +303,7 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
              */
             if (SSL_get_error(c_ssl, ret) != SSL_ERROR_WANT_READ) {
                 if (!TEST_int_eq(SSL_get_error(c_ssl, ret),
-                                 SSL_ERROR_ZERO_RETURN))
+                        SSL_ERROR_ZERO_RETURN))
                     goto err;
 
                 c_done_eos = 1;
@@ -338,8 +339,7 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
                  */
                 if (!TEST_true(SSL_get_event_timeout(c_ssl, &tv, &isinf)))
                     goto err;
-                if (!isinf && ossl_time_compare(ossl_time_zero(),
-                                                ossl_time_from_timeval(tv)) >= 0)
+                if (!isinf && ossl_time_compare(ossl_time_zero(), ossl_time_from_timeval(tv)) >= 0)
                     OSSL_sleep(100); /* Ensure CPU scheduling for test purposes */
             } else {
                 c_done_idle_test = 1;
@@ -370,7 +370,7 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
         ossl_quic_tserver_tick(tserver);
 
         if (use_inject) {
-            BIO_MSG rmsg = {0};
+            BIO_MSG rmsg = { 0 };
             size_t msgs_processed = 0;
 
             for (;;) {
@@ -379,15 +379,15 @@ static int do_test(int use_thread_assist, int use_fake_time, int use_inject)
                  * into QUIC via the injection interface, thereby testing the
                  * injection interface.
                  */
-                rmsg.data       = scratch_buf;
-                rmsg.data_len   = sizeof(scratch_buf);
+                rmsg.data = scratch_buf;
+                rmsg.data_len = sizeof(scratch_buf);
 
                 if (!BIO_recvmmsg(c_net_bio, &rmsg, sizeof(rmsg), 1, 0, &msgs_processed)
                     || msgs_processed == 0 || rmsg.data_len == 0)
                     break;
 
                 if (!TEST_true(SSL_inject_net_dgram(c_ssl, rmsg.data, rmsg.data_len,
-                                                    NULL, NULL)))
+                        NULL, NULL)))
                     goto err;
             }
         }
@@ -438,7 +438,7 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(certfile = test_get_argument(0))
-            || !TEST_ptr(keyfile = test_get_argument(1)))
+        || !TEST_ptr(keyfile = test_get_argument(1)))
         return 0;
 
     if ((fake_time_lock = CRYPTO_THREAD_lock_new()) == NULL)
diff --git a/test/quic_txp_test.c b/test/quic_txp_test.c
index 329953a3bd758..c4d6cc055db44 100644
--- a/test/quic_txp_test.c
+++ b/test/quic_txp_test.c
@@ -27,8 +27,22 @@ static const QUIC_CONN_ID cid_1 = {
 };
 
 static const unsigned char reset_token_1[16] = {
-    0x99, 0x88, 0x77, 0x66, 0x55, 0x44, 0x33, 0x22, 0x11,
-    0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x12,
+    0x99,
+    0x88,
+    0x77,
+    0x66,
+    0x55,
+    0x44,
+    0x33,
+    0x22,
+    0x11,
+    0xaa,
+    0xbb,
+    0xcc,
+    0xdd,
+    0xee,
+    0xff,
+    0x12,
 };
 
 static const unsigned char secret_1[32] = {
@@ -41,39 +55,39 @@ static OSSL_TIME fake_now(void *arg)
 }
 
 struct helper {
-    OSSL_QUIC_TX_PACKETISER         *txp;
-    OSSL_QUIC_TX_PACKETISER_ARGS    args;
-    OSSL_QTX_ARGS                   qtx_args;
-    BIO                             *bio1, *bio2;
-    QUIC_TXFC                       conn_txfc;
-    QUIC_RXFC                       conn_rxfc, stream_rxfc;
-    QUIC_RXFC                       max_streams_bidi_rxfc, max_streams_uni_rxfc;
-    OSSL_STATM                      statm;
-    OSSL_CC_DATA                    *cc_data;
-    const OSSL_CC_METHOD            *cc_method;
-    QUIC_STREAM_MAP                 qsm;
-    char                            have_statm, have_qsm;
-    QUIC_DEMUX                      *demux;
-    OSSL_QRX                        *qrx;
-    OSSL_QRX_ARGS                   qrx_args;
-    OSSL_QRX_PKT                    *qrx_pkt;
-    PACKET                          pkt;
-    uint64_t                        frame_type;
+    OSSL_QUIC_TX_PACKETISER *txp;
+    OSSL_QUIC_TX_PACKETISER_ARGS args;
+    OSSL_QTX_ARGS qtx_args;
+    BIO *bio1, *bio2;
+    QUIC_TXFC conn_txfc;
+    QUIC_RXFC conn_rxfc, stream_rxfc;
+    QUIC_RXFC max_streams_bidi_rxfc, max_streams_uni_rxfc;
+    OSSL_STATM statm;
+    OSSL_CC_DATA *cc_data;
+    const OSSL_CC_METHOD *cc_method;
+    QUIC_STREAM_MAP qsm;
+    char have_statm, have_qsm;
+    QUIC_DEMUX *demux;
+    OSSL_QRX *qrx;
+    OSSL_QRX_ARGS qrx_args;
+    OSSL_QRX_PKT *qrx_pkt;
+    PACKET pkt;
+    uint64_t frame_type;
     union {
-        uint64_t                        max_data;
-        OSSL_QUIC_FRAME_NEW_CONN_ID     new_conn_id;
-        OSSL_QUIC_FRAME_ACK             ack;
+        uint64_t max_data;
+        OSSL_QUIC_FRAME_NEW_CONN_ID new_conn_id;
+        OSSL_QUIC_FRAME_ACK ack;
         struct {
             const unsigned char *token;
-            size_t              token_len;
+            size_t token_len;
         } new_token;
-        OSSL_QUIC_FRAME_CRYPTO          crypto;
-        OSSL_QUIC_FRAME_STREAM          stream;
-        OSSL_QUIC_FRAME_STOP_SENDING    stop_sending;
-        OSSL_QUIC_FRAME_RESET_STREAM    reset_stream;
-        OSSL_QUIC_FRAME_CONN_CLOSE      conn_close;
+        OSSL_QUIC_FRAME_CRYPTO crypto;
+        OSSL_QUIC_FRAME_STREAM stream;
+        OSSL_QUIC_FRAME_STOP_SENDING stop_sending;
+        OSSL_QUIC_FRAME_RESET_STREAM reset_stream;
+        OSSL_QUIC_FRAME_CONN_CLOSE conn_close;
     } frame;
-    OSSL_QUIC_ACK_RANGE     ack_ranges[16];
+    OSSL_QUIC_ACK_RANGE ack_ranges[16];
 };
 
 static void helper_cleanup(struct helper *h)
@@ -85,8 +99,8 @@ static void helper_cleanup(struct helper *h)
     h->qrx_pkt = NULL;
 
     for (pn_space = QUIC_PN_SPACE_INITIAL;
-         pn_space < QUIC_PN_SPACE_NUM;
-         ++pn_space)
+        pn_space < QUIC_PN_SPACE_NUM;
+        ++pn_space)
         ossl_ackm_on_pkt_space_discarded(h->args.ackm, pn_space);
 
     ossl_quic_tx_packetiser_free(h->txp);
@@ -109,7 +123,7 @@ static void helper_cleanup(struct helper *h)
 }
 
 static void demux_default_handler(QUIC_URXE *e, void *arg,
-                                  const QUIC_CONN_ID *dcid)
+    const QUIC_CONN_ID *dcid)
 {
     struct helper *h = arg;
 
@@ -130,8 +144,8 @@ static int helper_init(struct helper *h)
     if (!TEST_true(BIO_new_bio_dgram_pair(&h->bio1, 0, &h->bio2, 0)))
         goto err;
 
-    h->qtx_args.bio    = h->bio1;
-    h->qtx_args.mdpl   = 1200;
+    h->qtx_args.bio = h->bio1;
+    h->qtx_args.mdpl = 1200;
 
     if (!TEST_ptr(h->args.qtx = ossl_qtx_new(&h->qtx_args)))
         goto err;
@@ -146,32 +160,32 @@ static int helper_init(struct helper *h)
         goto err;
 
     if (!TEST_true(ossl_quic_rxfc_init(&h->conn_rxfc, NULL,
-                                       2 * 1024 * 1024,
-                                       10 * 1024 * 1024,
-                                       fake_now,
-                                       NULL)))
+            2 * 1024 * 1024,
+            10 * 1024 * 1024,
+            fake_now,
+            NULL)))
         goto err;
 
     if (!TEST_true(ossl_quic_rxfc_init(&h->stream_rxfc, &h->conn_rxfc,
-                                       1 * 1024 * 1024,
-                                       5 * 1024 * 1024,
-                                       fake_now,
-                                       NULL)))
+            1 * 1024 * 1024,
+            5 * 1024 * 1024,
+            fake_now,
+            NULL)))
         goto err;
 
     if (!TEST_true(ossl_quic_rxfc_init(&h->max_streams_bidi_rxfc, NULL,
-                                       100, 100,
-                                       fake_now,
-                                       NULL)))
+            100, 100,
+            fake_now,
+            NULL)))
         goto err;
 
     if (!TEST_true(ossl_quic_rxfc_init(&h->max_streams_uni_rxfc, NULL,
-                                       100, 100,
-                                       fake_now,
-                                       NULL)))
+            100, 100,
+            fake_now,
+            NULL)))
 
-    if (!TEST_true(ossl_statm_init(&h->statm)))
-        goto err;
+        if (!TEST_true(ossl_statm_init(&h->statm)))
+            goto err;
 
     h->have_statm = 1;
 
@@ -180,15 +194,16 @@ static int helper_init(struct helper *h)
         goto err;
 
     if (!TEST_ptr(h->args.ackm = ossl_ackm_new(fake_now, NULL,
-                                               &h->statm,
-                                               h->cc_method,
-                                               h->cc_data)))
+                      &h->statm,
+                      h->cc_method,
+                      h->cc_data,
+                      /* is_server */ 0)))
         goto err;
 
     if (!TEST_true(ossl_quic_stream_map_init(&h->qsm, NULL, NULL,
-                                             &h->max_streams_bidi_rxfc,
-                                             &h->max_streams_uni_rxfc,
-                                             /*is_server=*/0)))
+            &h->max_streams_bidi_rxfc,
+            &h->max_streams_uni_rxfc,
+            /*is_server=*/0)))
         goto err;
 
     h->have_qsm = 1;
@@ -197,17 +212,17 @@ static int helper_init(struct helper *h)
         if (!TEST_ptr(h->args.crypto[i] = ossl_quic_sstream_new(4096)))
             goto err;
 
-    h->args.cur_scid                = scid_1;
-    h->args.cur_dcid                = dcid_1;
-    h->args.qsm                     = &h->qsm;
-    h->args.conn_txfc               = &h->conn_txfc;
-    h->args.conn_rxfc               = &h->conn_rxfc;
-    h->args.max_streams_bidi_rxfc   = &h->max_streams_bidi_rxfc;
-    h->args.max_streams_uni_rxfc    = &h->max_streams_uni_rxfc;
-    h->args.cc_method               = h->cc_method;
-    h->args.cc_data                 = h->cc_data;
-    h->args.now                     = fake_now;
-    h->args.protocol_version        = QUIC_VERSION_1;
+    h->args.cur_scid = scid_1;
+    h->args.cur_dcid = dcid_1;
+    h->args.qsm = &h->qsm;
+    h->args.conn_txfc = &h->conn_txfc;
+    h->args.conn_rxfc = &h->conn_rxfc;
+    h->args.max_streams_bidi_rxfc = &h->max_streams_bidi_rxfc;
+    h->args.max_streams_uni_rxfc = &h->max_streams_uni_rxfc;
+    h->args.cc_method = h->cc_method;
+    h->args.cc_data = h->cc_data;
+    h->args.now = fake_now;
+    h->args.protocol_version = QUIC_VERSION_1;
 
     if (!TEST_ptr(h->txp = ossl_quic_tx_packetiser_new(&h->args)))
         goto err;
@@ -219,14 +234,14 @@ static int helper_init(struct helper *h)
     ossl_quic_tx_packetiser_set_validated(h->txp);
 
     if (!TEST_ptr(h->demux = ossl_quic_demux_new(h->bio2, 8,
-                                                 fake_now, NULL)))
+                      fake_now, NULL)))
         goto err;
 
     ossl_quic_demux_set_default_handler(h->demux, demux_default_handler, h);
 
-    h->qrx_args.demux                  = h->demux;
-    h->qrx_args.short_conn_id_len      = 8;
-    h->qrx_args.max_deferred           = 32;
+    h->qrx_args.demux = h->demux;
+    h->qrx_args.short_conn_id_len = 8;
+    h->qrx_args.max_deferred = 32;
 
     if (!TEST_ptr(h->qrx = ossl_qrx_new(&h->qrx_args)))
         goto err;
@@ -241,30 +256,30 @@ static int helper_init(struct helper *h)
     return rc;
 }
 
-#define OPK_END                     0   /* End of Script */
-#define OPK_TXP_GENERATE            1   /* Call generate, expect packet output */
-#define OPK_TXP_GENERATE_NONE       2   /* Call generate, expect no packet output */
-#define OPK_RX_PKT                  3   /* Receive, expect packet */
-#define OPK_RX_PKT_NONE             4   /* Receive, expect no packet */
-#define OPK_EXPECT_DGRAM_LEN        5   /* Expect received datagram length in range */
-#define OPK_EXPECT_FRAME            6   /* Expect next frame is of type */
-#define OPK_EXPECT_INITIAL_TOKEN    7   /* Expect initial token buffer match */
-#define OPK_EXPECT_HDR              8   /* Expect header structure match */
-#define OPK_CHECK                   9   /* Call check function */
-#define OPK_NEXT_FRAME              10  /* Next frame */
-#define OPK_EXPECT_NO_FRAME         11  /* Expect no further frames */
-#define OPK_PROVIDE_SECRET          12  /* Provide secret to QTX and QRX */
-#define OPK_DISCARD_EL              13  /* Discard QTX EL */
-#define OPK_CRYPTO_SEND             14  /* Push data into crypto send stream */
-#define OPK_STREAM_NEW              15  /* Create new application stream */
-#define OPK_STREAM_SEND             16  /* Push data into application send stream */
-#define OPK_STREAM_FIN              17  /* Mark stream as finished */
-#define OPK_STOP_SENDING            18  /* Mark stream for STOP_SENDING */
-#define OPK_RESET_STREAM            19  /* Mark stream for RESET_STREAM */
-#define OPK_CONN_TXFC_BUMP          20  /* Bump connection TXFC CWM */
-#define OPK_STREAM_TXFC_BUMP        21  /* Bump stream TXFC CWM */
-#define OPK_HANDSHAKE_COMPLETE      22  /* Mark handshake as complete */
-#define OPK_NOP                     23  /* No-op */
+#define OPK_END 0 /* End of Script */
+#define OPK_TXP_GENERATE 1 /* Call generate, expect packet output */
+#define OPK_TXP_GENERATE_NONE 2 /* Call generate, expect no packet output */
+#define OPK_RX_PKT 3 /* Receive, expect packet */
+#define OPK_RX_PKT_NONE 4 /* Receive, expect no packet */
+#define OPK_EXPECT_DGRAM_LEN 5 /* Expect received datagram length in range */
+#define OPK_EXPECT_FRAME 6 /* Expect next frame is of type */
+#define OPK_EXPECT_INITIAL_TOKEN 7 /* Expect initial token buffer match */
+#define OPK_EXPECT_HDR 8 /* Expect header structure match */
+#define OPK_CHECK 9 /* Call check function */
+#define OPK_NEXT_FRAME 10 /* Next frame */
+#define OPK_EXPECT_NO_FRAME 11 /* Expect no further frames */
+#define OPK_PROVIDE_SECRET 12 /* Provide secret to QTX and QRX */
+#define OPK_DISCARD_EL 13 /* Discard QTX EL */
+#define OPK_CRYPTO_SEND 14 /* Push data into crypto send stream */
+#define OPK_STREAM_NEW 15 /* Create new application stream */
+#define OPK_STREAM_SEND 16 /* Push data into application send stream */
+#define OPK_STREAM_FIN 17 /* Mark stream as finished */
+#define OPK_STOP_SENDING 18 /* Mark stream for STOP_SENDING */
+#define OPK_RESET_STREAM 19 /* Mark stream for RESET_STREAM */
+#define OPK_CONN_TXFC_BUMP 20 /* Bump connection TXFC CWM */
+#define OPK_STREAM_TXFC_BUMP 21 /* Bump stream TXFC CWM */
+#define OPK_HANDSHAKE_COMPLETE 22 /* Mark handshake as complete */
+#define OPK_NOP 23 /* No-op */
 
 struct script_op {
     uint32_t opcode;
@@ -274,7 +289,7 @@ struct script_op {
     int (*check_func)(struct helper *h);
 };
 
-#define OP_END      \
+#define OP_END \
     { OPK_END }
 #define OP_TXP_GENERATE() \
     { OPK_TXP_GENERATE },
@@ -338,36 +353,36 @@ static int schedule_ack_eliciting_app(struct helper *h)
 /* 1. 1-RTT, Single Handshake Done Frame */
 static const struct script_op script_1[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CHECK(schedule_handshake_done)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
+        OP_TXP_GENERATE_NONE()
+            OP_CHECK(schedule_handshake_done)
+                OP_TXP_GENERATE()
+                    OP_RX_PKT()
     /* Should not be long */
     OP_EXPECT_DGRAM_LEN(21, 32)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_NEXT_FRAME()
+            OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE)
+                OP_EXPECT_NO_FRAME()
+                    OP_RX_PKT_NONE()
+                        OP_TXP_GENERATE_NONE()
+                            OP_END
 };
 
 /* 2. 1-RTT, Forced ACK-Eliciting Frame */
 static const struct script_op script_2[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CHECK(schedule_ack_eliciting_app)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
+        OP_TXP_GENERATE_NONE()
+            OP_CHECK(schedule_ack_eliciting_app)
+                OP_TXP_GENERATE()
+                    OP_RX_PKT()
     /* Should not be long */
     OP_EXPECT_DGRAM_LEN(21, 32)
     /* A PING frame should have been added */
     OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_PING)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_PING)
+            OP_EXPECT_NO_FRAME()
+                OP_RX_PKT_NONE()
+                    OP_TXP_GENERATE_NONE()
+                        OP_END
 };
 
 /* 3. 1-RTT, MAX_DATA */
@@ -379,7 +394,7 @@ static int schedule_max_data(struct helper *h)
 
     if (!TEST_true(ossl_quic_rxfc_on_rx_stream_frame(&h->stream_rxfc, cwm, 0))
         || !TEST_true(ossl_quic_rxfc_on_retire(&h->stream_rxfc, cwm,
-                                               ossl_ticks2time(OSSL_TIME_MS))))
+            ossl_ticks2time(OSSL_TIME_MS))))
         return 0;
 
     return 1;
@@ -387,19 +402,19 @@ static int schedule_max_data(struct helper *h)
 
 static const struct script_op script_3[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CHECK(schedule_max_data)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
+        OP_TXP_GENERATE_NONE()
+            OP_CHECK(schedule_max_data)
+                OP_TXP_GENERATE()
+                    OP_RX_PKT()
     /* Should not be long */
     OP_EXPECT_DGRAM_LEN(21, 40)
     /* A PING frame should have been added */
     OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_MAX_DATA)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_MAX_DATA)
+            OP_EXPECT_NO_FRAME()
+                OP_RX_PKT_NONE()
+                    OP_TXP_GENERATE_NONE()
+                        OP_END
 };
 
 /* 4. 1-RTT, CFQ (NEW_CONN_ID) */
@@ -415,11 +430,11 @@ static int schedule_cfq_new_conn_id(struct helper *h)
     WPACKET wpkt;
     BUF_MEM *buf_mem = NULL;
     size_t l = 0;
-    OSSL_QUIC_FRAME_NEW_CONN_ID ncid = {0};
+    OSSL_QUIC_FRAME_NEW_CONN_ID ncid = { 0 };
 
-    ncid.seq_num         = 2345;
+    ncid.seq_num = 2345;
     ncid.retire_prior_to = 1234;
-    ncid.conn_id         = cid_1;
+    ncid.conn_id = cid_1;
     memcpy(ncid.stateless_reset.token, reset_token_1, sizeof(reset_token_1));
 
     if (!TEST_ptr(buf_mem = BUF_MEM_new()))
@@ -439,11 +454,11 @@ static int schedule_cfq_new_conn_id(struct helper *h)
         goto err;
 
     if (!TEST_ptr(cfq_item = ossl_quic_cfq_add_frame(h->args.cfq, 1,
-                                                     QUIC_PN_SPACE_APP,
-                                                     OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, 0,
-                                                     (unsigned char *)buf_mem->data, l,
-                                                     free_buf_mem,
-                                                     buf_mem)))
+                      QUIC_PN_SPACE_APP,
+                      OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID, 0,
+                      (unsigned char *)buf_mem->data, l,
+                      free_buf_mem,
+                      buf_mem)))
         goto err;
 
     rc = 1;
@@ -458,11 +473,11 @@ static int check_cfq_new_conn_id(struct helper *h)
     if (!TEST_uint64_t_eq(h->frame.new_conn_id.seq_num, 2345)
         || !TEST_uint64_t_eq(h->frame.new_conn_id.retire_prior_to, 1234)
         || !TEST_mem_eq(&h->frame.new_conn_id.conn_id, sizeof(cid_1),
-                        &cid_1, sizeof(cid_1))
+            &cid_1, sizeof(cid_1))
         || !TEST_mem_eq(&h->frame.new_conn_id.stateless_reset.token,
-                        sizeof(reset_token_1),
-                        reset_token_1,
-                        sizeof(reset_token_1)))
+            sizeof(reset_token_1),
+            reset_token_1,
+            sizeof(reset_token_1)))
         return 0;
 
     return 1;
@@ -470,18 +485,18 @@ static int check_cfq_new_conn_id(struct helper *h)
 
 static const struct script_op script_4[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CHECK(schedule_cfq_new_conn_id)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(21, 128)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID)
-    OP_CHECK(check_cfq_new_conn_id)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_TXP_GENERATE_NONE()
+            OP_CHECK(schedule_cfq_new_conn_id)
+                OP_TXP_GENERATE()
+                    OP_RX_PKT()
+                        OP_EXPECT_DGRAM_LEN(21, 128)
+                            OP_NEXT_FRAME()
+                                OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID)
+                                    OP_CHECK(check_cfq_new_conn_id)
+                                        OP_EXPECT_NO_FRAME()
+                                            OP_RX_PKT_NONE()
+                                                OP_TXP_GENERATE_NONE()
+                                                    OP_END
 };
 
 /* 5. 1-RTT, CFQ (NEW_TOKEN) */
@@ -504,7 +519,7 @@ static int schedule_cfq_new_token(struct helper *h)
         goto err;
 
     if (!TEST_true(ossl_quic_wire_encode_frame_new_token(&wpkt, token_1,
-                                                         sizeof(token_1)))) {
+            sizeof(token_1)))) {
         WPACKET_cleanup(&wpkt);
         goto err;
     }
@@ -515,11 +530,11 @@ static int schedule_cfq_new_token(struct helper *h)
         goto err;
 
     if (!TEST_ptr(cfq_item = ossl_quic_cfq_add_frame(h->args.cfq, 1,
-                                                     QUIC_PN_SPACE_APP,
-                                                     OSSL_QUIC_FRAME_TYPE_NEW_TOKEN, 0,
-                                                     (unsigned char *)buf_mem->data, l,
-                                                     free_buf_mem,
-                                                     buf_mem)))
+                      QUIC_PN_SPACE_APP,
+                      OSSL_QUIC_FRAME_TYPE_NEW_TOKEN, 0,
+                      (unsigned char *)buf_mem->data, l,
+                      free_buf_mem,
+                      buf_mem)))
         goto err;
 
     rc = 1;
@@ -532,9 +547,9 @@ static int schedule_cfq_new_token(struct helper *h)
 static int check_cfq_new_token(struct helper *h)
 {
     if (!TEST_mem_eq(h->frame.new_token.token,
-                     h->frame.new_token.token_len,
-                     token_1,
-                     sizeof(token_1)))
+            h->frame.new_token.token_len,
+            token_1,
+            sizeof(token_1)))
         return 0;
 
     return 1;
@@ -542,31 +557,31 @@ static int check_cfq_new_token(struct helper *h)
 
 static const struct script_op script_5[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CHECK(schedule_cfq_new_token)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(21, 512)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_NEW_TOKEN)
-    OP_CHECK(check_cfq_new_token)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_TXP_GENERATE_NONE()
+            OP_CHECK(schedule_cfq_new_token)
+                OP_TXP_GENERATE()
+                    OP_RX_PKT()
+                        OP_EXPECT_DGRAM_LEN(21, 512)
+                            OP_NEXT_FRAME()
+                                OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_NEW_TOKEN)
+                                    OP_CHECK(check_cfq_new_token)
+                                        OP_EXPECT_NO_FRAME()
+                                            OP_RX_PKT_NONE()
+                                                OP_TXP_GENERATE_NONE()
+                                                    OP_END
 };
 
 /* 6. 1-RTT, ACK */
 static int schedule_ack(struct helper *h)
 {
     size_t i;
-    OSSL_ACKM_RX_PKT rx_pkt = {0};
+    OSSL_ACKM_RX_PKT rx_pkt = { 0 };
 
     /* Stimulate ACK emission by simulating a few received packets. */
     for (i = 0; i < 5; ++i) {
-        rx_pkt.pkt_num          = i;
-        rx_pkt.time             = fake_now(NULL);
-        rx_pkt.pkt_space        = QUIC_PN_SPACE_APP;
+        rx_pkt.pkt_num = i;
+        rx_pkt.time = fake_now(NULL);
+        rx_pkt.pkt_space = QUIC_PN_SPACE_APP;
         rx_pkt.is_ack_eliciting = 1;
 
         if (!TEST_true(ossl_ackm_on_rx_packet(h->args.ackm, &rx_pkt)))
@@ -578,37 +593,37 @@ static int schedule_ack(struct helper *h)
 
 static const struct script_op script_6[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CHECK(schedule_ack)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(21, 512)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_ACK_WITHOUT_ECN)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_TXP_GENERATE_NONE()
+            OP_CHECK(schedule_ack)
+                OP_TXP_GENERATE()
+                    OP_RX_PKT()
+                        OP_EXPECT_DGRAM_LEN(21, 512)
+                            OP_NEXT_FRAME()
+                                OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_ACK_WITHOUT_ECN)
+                                    OP_EXPECT_NO_FRAME()
+                                        OP_RX_PKT_NONE()
+                                            OP_TXP_GENERATE_NONE()
+                                                OP_END
 };
 
 /* 7. 1-RTT, ACK, NEW_TOKEN */
 static const struct script_op script_7[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CHECK(schedule_cfq_new_token)
-    OP_CHECK(schedule_ack)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(21, 512)
+        OP_TXP_GENERATE_NONE()
+            OP_CHECK(schedule_cfq_new_token)
+                OP_CHECK(schedule_ack)
+                    OP_TXP_GENERATE()
+                        OP_RX_PKT()
+                            OP_EXPECT_DGRAM_LEN(21, 512)
     /* ACK must come before NEW_TOKEN */
     OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_ACK_WITHOUT_ECN)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_NEW_TOKEN)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_ACK_WITHOUT_ECN)
+            OP_NEXT_FRAME()
+                OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_NEW_TOKEN)
+                    OP_EXPECT_NO_FRAME()
+                        OP_RX_PKT_NONE()
+                            OP_TXP_GENERATE_NONE()
+                                OP_END
 };
 
 /* 8. 1-RTT, CRYPTO */
@@ -618,17 +633,17 @@ static const unsigned char crypto_1[] = {
 
 static const struct script_op script_8[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CRYPTO_SEND(QUIC_PN_SPACE_APP, crypto_1)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(21, 512)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_CRYPTO)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_TXP_GENERATE_NONE()
+            OP_CRYPTO_SEND(QUIC_PN_SPACE_APP, crypto_1)
+                OP_TXP_GENERATE()
+                    OP_RX_PKT()
+                        OP_EXPECT_DGRAM_LEN(21, 512)
+                            OP_NEXT_FRAME()
+                                OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_CRYPTO)
+                                    OP_EXPECT_NO_FRAME()
+                                        OP_RX_PKT_NONE()
+                                            OP_TXP_GENERATE_NONE()
+                                                OP_END
 };
 
 /* 9. 1-RTT, STREAM */
@@ -639,7 +654,7 @@ static const unsigned char stream_9[] = {
 static int check_stream_9(struct helper *h)
 {
     if (!TEST_mem_eq(h->frame.stream.data, (size_t)h->frame.stream.len,
-                     stream_9, sizeof(stream_9)))
+            stream_9, sizeof(stream_9)))
         return 0;
 
     return 1;
@@ -647,25 +662,25 @@ static int check_stream_9(struct helper *h)
 
 static const struct script_op script_9[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_HANDSHAKE_COMPLETE()
-    OP_TXP_GENERATE_NONE()
-    OP_STREAM_NEW(42)
-    OP_STREAM_SEND(42, stream_9)
+        OP_HANDSHAKE_COMPLETE()
+            OP_TXP_GENERATE_NONE()
+                OP_STREAM_NEW(42)
+                    OP_STREAM_SEND(42, stream_9)
     /* Still no output because of TXFC */
     OP_TXP_GENERATE_NONE()
     /* Now grant a TXFC budget */
     OP_CONN_TXFC_BUMP(1000)
-    OP_STREAM_TXFC_BUMP(42, 1000)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(21, 512)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_STREAM)
-    OP_CHECK(check_stream_9)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_STREAM_TXFC_BUMP(42, 1000)
+            OP_TXP_GENERATE()
+                OP_RX_PKT()
+                    OP_EXPECT_DGRAM_LEN(21, 512)
+                        OP_NEXT_FRAME()
+                            OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_STREAM)
+                                OP_CHECK(check_stream_9)
+                                    OP_EXPECT_NO_FRAME()
+                                        OP_RX_PKT_NONE()
+                                            OP_TXP_GENERATE_NONE()
+                                                OP_END
 };
 
 /* 10. 1-RTT, STREAM, round robin */
@@ -907,7 +922,7 @@ static int check_stream_10a(struct helper *h)
         return 0;
 
     if (!TEST_mem_eq(h->frame.stream.data, (size_t)h->frame.stream.len,
-                     stream_10a, (size_t)h->frame.stream.len))
+            stream_10a, (size_t)h->frame.stream.len))
         return 0;
 
     stream_10a_off = h->frame.stream.offset + h->frame.stream.len;
@@ -921,7 +936,7 @@ static int check_stream_10b(struct helper *h)
         return 0;
 
     if (!TEST_mem_eq(h->frame.stream.data, (size_t)h->frame.stream.len,
-                     stream_10b, (size_t)h->frame.stream.len))
+            stream_10b, (size_t)h->frame.stream.len))
         return 0;
 
     stream_10b_off = h->frame.stream.offset + h->frame.stream.len;
@@ -935,7 +950,7 @@ static int check_stream_10c(struct helper *h)
         return 0;
 
     if (!TEST_mem_eq(h->frame.stream.data, (size_t)h->frame.stream.len,
-                     stream_10a + stream_10a_off, (size_t)h->frame.stream.len))
+            stream_10a + stream_10a_off, (size_t)h->frame.stream.len))
         return 0;
 
     return 1;
@@ -948,7 +963,7 @@ static int check_stream_10d(struct helper *h)
         return 0;
 
     if (!TEST_mem_eq(h->frame.stream.data, (size_t)h->frame.stream.len,
-                     stream_10b + stream_10b_off, (size_t)h->frame.stream.len))
+            stream_10b + stream_10b_off, (size_t)h->frame.stream.len))
         return 0;
 
     return 1;
@@ -956,66 +971,66 @@ static int check_stream_10d(struct helper *h)
 
 static const struct script_op script_10[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_HANDSHAKE_COMPLETE()
-    OP_TXP_GENERATE_NONE()
-    OP_STREAM_NEW(42)
-    OP_STREAM_NEW(43)
-    OP_CONN_TXFC_BUMP(10000)
-    OP_STREAM_TXFC_BUMP(42, 5000)
-    OP_STREAM_TXFC_BUMP(43, 5000)
-    OP_STREAM_SEND(42, stream_10a)
-    OP_STREAM_SEND(43, stream_10b)
+        OP_HANDSHAKE_COMPLETE()
+            OP_TXP_GENERATE_NONE()
+                OP_STREAM_NEW(42)
+                    OP_STREAM_NEW(43)
+                        OP_CONN_TXFC_BUMP(10000)
+                            OP_STREAM_TXFC_BUMP(42, 5000)
+                                OP_STREAM_TXFC_BUMP(43, 5000)
+                                    OP_STREAM_SEND(42, stream_10a)
+                                        OP_STREAM_SEND(43, stream_10b)
 
     /* First packet containing data from stream 42 */
     OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(1100, 1200)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_STREAM)
-    OP_CHECK(check_stream_10a)
-    OP_EXPECT_NO_FRAME()
+        OP_RX_PKT()
+            OP_EXPECT_DGRAM_LEN(1100, 1200)
+                OP_NEXT_FRAME()
+                    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_STREAM)
+                        OP_CHECK(check_stream_10a)
+                            OP_EXPECT_NO_FRAME()
 
     /* Second packet containing data from stream 43 */
     OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(1100, 1200)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_STREAM)
-    OP_CHECK(check_stream_10b)
-    OP_EXPECT_NO_FRAME()
+        OP_RX_PKT()
+            OP_EXPECT_DGRAM_LEN(1100, 1200)
+                OP_NEXT_FRAME()
+                    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_STREAM)
+                        OP_CHECK(check_stream_10b)
+                            OP_EXPECT_NO_FRAME()
 
     /* Third packet containing data from stream 42 */
     OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(200, 500)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_STREAM_OFF_LEN)
-    OP_CHECK(check_stream_10c)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_STREAM_OFF)
-    OP_CHECK(check_stream_10d)
-    OP_EXPECT_NO_FRAME()
-
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-
-    OP_END
+        OP_RX_PKT()
+            OP_EXPECT_DGRAM_LEN(200, 500)
+                OP_NEXT_FRAME()
+                    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_STREAM_OFF_LEN)
+                        OP_CHECK(check_stream_10c)
+                            OP_NEXT_FRAME()
+                                OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_STREAM_OFF)
+                                    OP_CHECK(check_stream_10d)
+                                        OP_EXPECT_NO_FRAME()
+
+                                            OP_RX_PKT_NONE()
+                                                OP_TXP_GENERATE_NONE()
+
+                                                    OP_END
 };
 
 /* 11. Initial, CRYPTO */
 static const struct script_op script_11[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_INITIAL, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CRYPTO_SEND(QUIC_PN_SPACE_INITIAL, crypto_1)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(1200, 1200)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_CRYPTO)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_TXP_GENERATE_NONE()
+            OP_CRYPTO_SEND(QUIC_PN_SPACE_INITIAL, crypto_1)
+                OP_TXP_GENERATE()
+                    OP_RX_PKT()
+                        OP_EXPECT_DGRAM_LEN(1200, 1200)
+                            OP_NEXT_FRAME()
+                                OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_CRYPTO)
+                                    OP_EXPECT_NO_FRAME()
+                                        OP_RX_PKT_NONE()
+                                            OP_TXP_GENERATE_NONE()
+                                                OP_END
 };
 
 /* 12. 1-RTT, STOP_SENDING */
@@ -1030,20 +1045,20 @@ static int check_stream_12(struct helper *h)
 
 static const struct script_op script_12[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_HANDSHAKE_COMPLETE()
-    OP_TXP_GENERATE_NONE()
-    OP_STREAM_NEW(42)
-    OP_STOP_SENDING(42, 4568)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(21, 128)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_STOP_SENDING)
-    OP_CHECK(check_stream_12)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_HANDSHAKE_COMPLETE()
+            OP_TXP_GENERATE_NONE()
+                OP_STREAM_NEW(42)
+                    OP_STOP_SENDING(42, 4568)
+                        OP_TXP_GENERATE()
+                            OP_RX_PKT()
+                                OP_EXPECT_DGRAM_LEN(21, 128)
+                                    OP_NEXT_FRAME()
+                                        OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_STOP_SENDING)
+                                            OP_CHECK(check_stream_12)
+                                                OP_EXPECT_NO_FRAME()
+                                                    OP_RX_PKT_NONE()
+                                                        OP_TXP_GENERATE_NONE()
+                                                            OP_END
 };
 
 /* 13. 1-RTT, RESET_STREAM */
@@ -1063,35 +1078,35 @@ static ossl_unused int check_stream_13(struct helper *h)
 
 static const struct script_op script_13[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_HANDSHAKE_COMPLETE()
-    OP_TXP_GENERATE_NONE()
-    OP_STREAM_NEW(42)
-    OP_CONN_TXFC_BUMP(8)
-    OP_STREAM_TXFC_BUMP(42, 8)
-    OP_STREAM_SEND(42, stream_13)
-    OP_RESET_STREAM(42, 4568)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(21, 128)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_RESET_STREAM)
-    OP_CHECK(check_stream_13)
-    OP_NEXT_FRAME()
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_HANDSHAKE_COMPLETE()
+            OP_TXP_GENERATE_NONE()
+                OP_STREAM_NEW(42)
+                    OP_CONN_TXFC_BUMP(8)
+                        OP_STREAM_TXFC_BUMP(42, 8)
+                            OP_STREAM_SEND(42, stream_13)
+                                OP_RESET_STREAM(42, 4568)
+                                    OP_TXP_GENERATE()
+                                        OP_RX_PKT()
+                                            OP_EXPECT_DGRAM_LEN(21, 128)
+                                                OP_NEXT_FRAME()
+                                                    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_RESET_STREAM)
+                                                        OP_CHECK(check_stream_13)
+                                                            OP_NEXT_FRAME()
+                                                                OP_EXPECT_NO_FRAME()
+                                                                    OP_RX_PKT_NONE()
+                                                                        OP_TXP_GENERATE_NONE()
+                                                                            OP_END
 };
 
 /* 14. 1-RTT, CONNECTION_CLOSE */
 static int gen_conn_close(struct helper *h)
 {
-    OSSL_QUIC_FRAME_CONN_CLOSE f = {0};
+    OSSL_QUIC_FRAME_CONN_CLOSE f = { 0 };
 
-    f.error_code     = 2345;
-    f.frame_type     = OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE;
-    f.reason         = "Reason string";
-    f.reason_len     = strlen(f.reason);
+    f.error_code = 2345;
+    f.frame_type = OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE;
+    f.reason = "Reason string";
+    f.reason_len = strlen(f.reason);
 
     if (!TEST_true(ossl_quic_tx_packetiser_schedule_conn_close(h->txp, &f)))
         return 0;
@@ -1103,10 +1118,10 @@ static int check_14(struct helper *h)
 {
     if (!TEST_int_eq(h->frame.conn_close.is_app, 0)
         || !TEST_uint64_t_eq(h->frame.conn_close.frame_type,
-                             OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE)
+            OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE)
         || !TEST_uint64_t_eq(h->frame.conn_close.error_code, 2345)
         || !TEST_mem_eq(h->frame.conn_close.reason, h->frame.conn_close.reason_len,
-                        "Reason string", 13))
+            "Reason string", 13))
         return 0;
 
     return 1;
@@ -1114,18 +1129,18 @@ static int check_14(struct helper *h)
 
 static const struct script_op script_14[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_HANDSHAKE_COMPLETE()
-    OP_TXP_GENERATE_NONE()
-    OP_CHECK(gen_conn_close)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(21, 512)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_TRANSPORT)
-    OP_CHECK(check_14)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_END
+        OP_HANDSHAKE_COMPLETE()
+            OP_TXP_GENERATE_NONE()
+                OP_CHECK(gen_conn_close)
+                    OP_TXP_GENERATE()
+                        OP_RX_PKT()
+                            OP_EXPECT_DGRAM_LEN(21, 512)
+                                OP_NEXT_FRAME()
+                                    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_TRANSPORT)
+                                        OP_CHECK(check_14)
+                                            OP_EXPECT_NO_FRAME()
+                                                OP_RX_PKT_NONE()
+                                                    OP_END
 };
 
 /* 15. INITIAL, Anti-Deadlock Probe Simulation */
@@ -1143,17 +1158,17 @@ static int gen_probe_initial(struct helper *h)
 
 static const struct script_op script_15[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_INITIAL, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CHECK(gen_probe_initial)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(1200, 1200)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_PING)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_TXP_GENERATE_NONE()
+            OP_CHECK(gen_probe_initial)
+                OP_TXP_GENERATE()
+                    OP_RX_PKT()
+                        OP_EXPECT_DGRAM_LEN(1200, 1200)
+                            OP_NEXT_FRAME()
+                                OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_PING)
+                                    OP_EXPECT_NO_FRAME()
+                                        OP_RX_PKT_NONE()
+                                            OP_TXP_GENERATE_NONE()
+                                                OP_END
 };
 
 /* 16. HANDSHAKE, Anti-Deadlock Probe Simulation */
@@ -1171,18 +1186,18 @@ static int gen_probe_handshake(struct helper *h)
 
 static const struct script_op script_16[] = {
     OP_DISCARD_EL(QUIC_ENC_LEVEL_INITIAL)
-    OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CHECK(gen_probe_handshake)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(21, 512)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_PING)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE, QRL_SUITE_AES128GCM, secret_1)
+            OP_TXP_GENERATE_NONE()
+                OP_CHECK(gen_probe_handshake)
+                    OP_TXP_GENERATE()
+                        OP_RX_PKT()
+                            OP_EXPECT_DGRAM_LEN(21, 512)
+                                OP_NEXT_FRAME()
+                                    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_PING)
+                                        OP_EXPECT_NO_FRAME()
+                                            OP_RX_PKT_NONE()
+                                                OP_TXP_GENERATE_NONE()
+                                                    OP_END
 };
 
 /* 17. 1-RTT, Probe Simulation */
@@ -1200,19 +1215,19 @@ static int gen_probe_1rtt(struct helper *h)
 
 static const struct script_op script_17[] = {
     OP_DISCARD_EL(QUIC_ENC_LEVEL_INITIAL)
-    OP_DISCARD_EL(QUIC_ENC_LEVEL_HANDSHAKE)
-    OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CHECK(gen_probe_1rtt)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(21, 512)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_PING)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_DISCARD_EL(QUIC_ENC_LEVEL_HANDSHAKE)
+            OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_1RTT, QRL_SUITE_AES128GCM, secret_1)
+                OP_TXP_GENERATE_NONE()
+                    OP_CHECK(gen_probe_1rtt)
+                        OP_TXP_GENERATE()
+                            OP_RX_PKT()
+                                OP_EXPECT_DGRAM_LEN(21, 512)
+                                    OP_NEXT_FRAME()
+                                        OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_PING)
+                                            OP_EXPECT_NO_FRAME()
+                                                OP_RX_PKT_NONE()
+                                                    OP_TXP_GENERATE_NONE()
+                                                        OP_END
 };
 
 /* 18. Big Token Rejection */
@@ -1224,10 +1239,10 @@ static int try_big_token(struct helper *h)
 
     /* Ensure big token is rejected */
     if (!TEST_false(ossl_quic_tx_packetiser_set_initial_token(h->txp,
-                                                              big_token,
-                                                              sizeof(big_token),
-                                                              NULL,
-                                                              NULL)))
+            big_token,
+            sizeof(big_token),
+            NULL,
+            NULL)))
         return 0;
 
     /*
@@ -1239,7 +1254,7 @@ static int try_big_token(struct helper *h)
             return 0;
 
         if (ossl_quic_tx_packetiser_set_initial_token(h->txp, big_token, i,
-                                                      NULL, NULL))
+                NULL, NULL))
             break;
     }
 
@@ -1248,19 +1263,19 @@ static int try_big_token(struct helper *h)
 
 static const struct script_op script_18[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_INITIAL, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CHECK(try_big_token)
-    OP_TXP_GENERATE_NONE()
-    OP_CRYPTO_SEND(QUIC_PN_SPACE_INITIAL, crypto_1)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(1200, 1200)
-    OP_NEXT_FRAME()
-    OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_CRYPTO)
-    OP_EXPECT_NO_FRAME()
-    OP_RX_PKT_NONE()
-    OP_TXP_GENERATE_NONE()
-    OP_END
+        OP_TXP_GENERATE_NONE()
+            OP_CHECK(try_big_token)
+                OP_TXP_GENERATE_NONE()
+                    OP_CRYPTO_SEND(QUIC_PN_SPACE_INITIAL, crypto_1)
+                        OP_TXP_GENERATE()
+                            OP_RX_PKT()
+                                OP_EXPECT_DGRAM_LEN(1200, 1200)
+                                    OP_NEXT_FRAME()
+                                        OP_EXPECT_FRAME(OSSL_QUIC_FRAME_TYPE_CRYPTO)
+                                            OP_EXPECT_NO_FRAME()
+                                                OP_RX_PKT_NONE()
+                                                    OP_TXP_GENERATE_NONE()
+                                                        OP_END
 };
 
 static const struct script_op *const scripts[] = {
@@ -1330,8 +1345,8 @@ static int run_script(int script_idx, const struct script_op *script)
             if (!TEST_true(ossl_qrx_read_pkt(h.qrx, &h.qrx_pkt)))
                 goto err;
             if (!TEST_true(PACKET_buf_init(&h.pkt,
-                                           h.qrx_pkt->hdr->data,
-                                           h.qrx_pkt->hdr->len)))
+                    h.qrx_pkt->hdr->data,
+                    h.qrx_pkt->hdr->len)))
                 goto err;
             h.frame_type = UINT64_MAX;
             break;
@@ -1352,12 +1367,12 @@ static int run_script(int script_idx, const struct script_op *script)
             break;
         case OPK_EXPECT_INITIAL_TOKEN:
             if (!TEST_mem_eq(h.qrx_pkt->hdr->token, h.qrx_pkt->hdr->token_len,
-                             op->buf, (size_t)op->arg0))
+                    op->buf, (size_t)op->arg0))
                 goto err;
             break;
         case OPK_EXPECT_HDR:
             if (!TEST_true(cmp_pkt_hdr(h.qrx_pkt->hdr, op->buf,
-                                       NULL, 0, 0)))
+                    NULL, 0, 0)))
                 goto err;
             break;
         case OPK_CHECK:
@@ -1382,28 +1397,28 @@ static int run_script(int script_idx, const struct script_op *script)
                 break;
             case OSSL_QUIC_FRAME_TYPE_MAX_DATA:
                 if (!TEST_true(ossl_quic_wire_decode_frame_max_data(&h.pkt,
-                                                                    &h.frame.max_data)))
+                        &h.frame.max_data)))
                     goto err;
                 break;
             case OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID:
                 if (!TEST_true(ossl_quic_wire_decode_frame_new_conn_id(&h.pkt,
-                                                                       &h.frame.new_conn_id)))
+                        &h.frame.new_conn_id)))
                     goto err;
                 break;
             case OSSL_QUIC_FRAME_TYPE_NEW_TOKEN:
                 if (!TEST_true(ossl_quic_wire_decode_frame_new_token(&h.pkt,
-                                                                     &h.frame.new_token.token,
-                                                                     &h.frame.new_token.token_len)))
+                        &h.frame.new_token.token,
+                        &h.frame.new_token.token_len)))
                     goto err;
                 break;
             case OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN:
             case OSSL_QUIC_FRAME_TYPE_ACK_WITHOUT_ECN:
-                h.frame.ack.ack_ranges      = h.ack_ranges;
-                h.frame.ack.num_ack_ranges  = OSSL_NELEM(h.ack_ranges);
+                h.frame.ack.ack_ranges = h.ack_ranges;
+                h.frame.ack.num_ack_ranges = OSSL_NELEM(h.ack_ranges);
                 if (!TEST_true(ossl_quic_wire_decode_frame_ack(&h.pkt,
-                                                               h.args.ack_delay_exponent,
-                                                               &h.frame.ack,
-                                                               NULL)))
+                        h.args.ack_delay_exponent,
+                        &h.frame.ack,
+                        NULL)))
                     goto err;
                 break;
             case OSSL_QUIC_FRAME_TYPE_CRYPTO:
@@ -1425,20 +1440,20 @@ static int run_script(int script_idx, const struct script_op *script)
 
             case OSSL_QUIC_FRAME_TYPE_STOP_SENDING:
                 if (!TEST_true(ossl_quic_wire_decode_frame_stop_sending(&h.pkt,
-                                                                        &h.frame.stop_sending)))
+                        &h.frame.stop_sending)))
                     goto err;
                 break;
 
             case OSSL_QUIC_FRAME_TYPE_RESET_STREAM:
                 if (!TEST_true(ossl_quic_wire_decode_frame_reset_stream(&h.pkt,
-                                                                        &h.frame.reset_stream)))
+                        &h.frame.reset_stream)))
                     goto err;
                 break;
 
             case OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_TRANSPORT:
             case OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_APP:
                 if (!TEST_true(ossl_quic_wire_decode_frame_conn_close(&h.pkt,
-                                                                      &h.frame.conn_close)))
+                        &h.frame.conn_close)))
                     goto err;
                 break;
 
@@ -1454,19 +1469,19 @@ static int run_script(int script_idx, const struct script_op *script)
             break;
         case OPK_PROVIDE_SECRET:
             if (!TEST_true(ossl_qtx_provide_secret(h.args.qtx,
-                                                   (uint32_t)op->arg0,
-                                                   (uint32_t)op->arg1,
-                                                   NULL, op->buf, op->buf_len)))
+                    (uint32_t)op->arg0,
+                    (uint32_t)op->arg1,
+                    NULL, op->buf, op->buf_len)))
                 goto err;
             if (!TEST_true(ossl_qrx_provide_secret(h.qrx,
-                                                   (uint32_t)op->arg0,
-                                                   (uint32_t)op->arg1,
-                                                   NULL, op->buf, op->buf_len)))
+                    (uint32_t)op->arg0,
+                    (uint32_t)op->arg1,
+                    NULL, op->buf, op->buf_len)))
                 goto err;
             break;
         case OPK_DISCARD_EL:
             if (!TEST_true(ossl_quic_tx_packetiser_discard_enc_level(h.txp,
-                                                                     (uint32_t)op->arg0)))
+                    (uint32_t)op->arg0)))
                 goto err;
             /*
              * We do not discard on the QRX here, the object is to test the
@@ -1474,126 +1489,112 @@ static int run_script(int script_idx, const struct script_op *script)
              * want to know about it.
              */
             break;
-        case OPK_CRYPTO_SEND:
-            {
-                size_t consumed = 0;
+        case OPK_CRYPTO_SEND: {
+            size_t consumed = 0;
 
-                if (!TEST_true(ossl_quic_sstream_append(h.args.crypto[op->arg0],
-                                                        op->buf, op->buf_len,
-                                                        &consumed)))
-                    goto err;
+            if (!TEST_true(ossl_quic_sstream_append(h.args.crypto[op->arg0],
+                    op->buf, op->buf_len,
+                    &consumed)))
+                goto err;
 
-                if (!TEST_size_t_eq(consumed, op->buf_len))
-                    goto err;
-            }
-            break;
-        case OPK_STREAM_NEW:
-            {
-                QUIC_STREAM *s;
+            if (!TEST_size_t_eq(consumed, op->buf_len))
+                goto err;
+        } break;
+        case OPK_STREAM_NEW: {
+            QUIC_STREAM *s;
 
-                if (!TEST_ptr(s = ossl_quic_stream_map_alloc(h.args.qsm, op->arg0,
-                                                             QUIC_STREAM_DIR_BIDI)))
-                    goto err;
+            if (!TEST_ptr(s = ossl_quic_stream_map_alloc(h.args.qsm, op->arg0,
+                              QUIC_STREAM_DIR_BIDI)))
+                goto err;
 
-                if (!TEST_ptr(s->sstream = ossl_quic_sstream_new(512 * 1024))
-                    || !TEST_true(ossl_quic_txfc_init(&s->txfc, &h.conn_txfc))
-                    || !TEST_true(ossl_quic_rxfc_init(&s->rxfc, &h.conn_rxfc,
-                                                      1 * 1024 * 1024,
-                                                      16 * 1024 * 1024,
-                                                      fake_now, NULL))
-                    || !TEST_ptr(s->rstream = ossl_quic_rstream_new(&s->rxfc,
-                                                                    NULL, 1024))) {
-                    ossl_quic_sstream_free(s->sstream);
-                    ossl_quic_stream_map_release(h.args.qsm, s);
-                    goto err;
-                }
+            if (!TEST_ptr(s->sstream = ossl_quic_sstream_new(512 * 1024))
+                || !TEST_true(ossl_quic_txfc_init(&s->txfc, &h.conn_txfc))
+                || !TEST_true(ossl_quic_rxfc_init(&s->rxfc, &h.conn_rxfc,
+                    1 * 1024 * 1024,
+                    16 * 1024 * 1024,
+                    fake_now, NULL))
+                || !TEST_ptr(s->rstream = ossl_quic_rstream_new(&s->rxfc,
+                                 NULL, 1024))) {
+                ossl_quic_sstream_free(s->sstream);
+                ossl_quic_stream_map_release(h.args.qsm, s);
+                goto err;
             }
-            break;
-        case OPK_STREAM_SEND:
-            {
-                QUIC_STREAM *s;
-                size_t consumed = 0;
+        } break;
+        case OPK_STREAM_SEND: {
+            QUIC_STREAM *s;
+            size_t consumed = 0;
 
-                if (!TEST_ptr(s = ossl_quic_stream_map_get_by_id(h.args.qsm,
-                                                                 op->arg0)))
-                    goto err;
+            if (!TEST_ptr(s = ossl_quic_stream_map_get_by_id(h.args.qsm,
+                              op->arg0)))
+                goto err;
 
-                if (!TEST_true(ossl_quic_sstream_append(s->sstream, op->buf,
-                                                        op->buf_len, &consumed)))
-                    goto err;
+            if (!TEST_true(ossl_quic_sstream_append(s->sstream, op->buf,
+                    op->buf_len, &consumed)))
+                goto err;
 
-                if (!TEST_size_t_eq(consumed, op->buf_len))
-                    goto err;
+            if (!TEST_size_t_eq(consumed, op->buf_len))
+                goto err;
 
-                ossl_quic_stream_map_update_state(h.args.qsm, s);
-            }
-            break;
-        case OPK_STREAM_FIN:
-            {
-                QUIC_STREAM *s;
+            ossl_quic_stream_map_update_state(h.args.qsm, s);
+        } break;
+        case OPK_STREAM_FIN: {
+            QUIC_STREAM *s;
 
-                if (!TEST_ptr(s = ossl_quic_stream_map_get_by_id(h.args.qsm,
-                                                                 op->arg0)))
-                    goto err;
+            if (!TEST_ptr(s = ossl_quic_stream_map_get_by_id(h.args.qsm,
+                              op->arg0)))
+                goto err;
 
-                ossl_quic_sstream_fin(s->sstream);
-            }
-            break;
-        case OPK_STOP_SENDING:
-            {
-                QUIC_STREAM *s;
+            ossl_quic_sstream_fin(s->sstream);
+        } break;
+        case OPK_STOP_SENDING: {
+            QUIC_STREAM *s;
 
-                if (!TEST_ptr(s = ossl_quic_stream_map_get_by_id(h.args.qsm,
-                                                                 op->arg0)))
-                    goto err;
+            if (!TEST_ptr(s = ossl_quic_stream_map_get_by_id(h.args.qsm,
+                              op->arg0)))
+                goto err;
 
-                if (!TEST_true(ossl_quic_stream_map_stop_sending_recv_part(h.args.qsm,
-                                                                           s, op->arg1)))
-                    goto err;
+            if (!TEST_true(ossl_quic_stream_map_stop_sending_recv_part(h.args.qsm,
+                    s, op->arg1)))
+                goto err;
 
-                ossl_quic_stream_map_update_state(h.args.qsm, s);
+            ossl_quic_stream_map_update_state(h.args.qsm, s);
 
-                if (!TEST_true(s->active))
-                    goto err;
-            }
-            break;
-        case OPK_RESET_STREAM:
-            {
-                QUIC_STREAM *s;
+            if (!TEST_true(s->active))
+                goto err;
+        } break;
+        case OPK_RESET_STREAM: {
+            QUIC_STREAM *s;
 
-                if (!TEST_ptr(s = ossl_quic_stream_map_get_by_id(h.args.qsm,
-                                                                 op->arg0)))
-                    goto err;
+            if (!TEST_ptr(s = ossl_quic_stream_map_get_by_id(h.args.qsm,
+                              op->arg0)))
+                goto err;
 
-                if (!TEST_true(ossl_quic_stream_map_reset_stream_send_part(h.args.qsm,
-                                                                           s, op->arg1)))
-                    goto err;
+            if (!TEST_true(ossl_quic_stream_map_reset_stream_send_part(h.args.qsm,
+                    s, op->arg1)))
+                goto err;
 
-                ossl_quic_stream_map_update_state(h.args.qsm, s);
+            ossl_quic_stream_map_update_state(h.args.qsm, s);
 
-                if (!TEST_true(s->active))
-                    goto err;
-            }
-            break;
+            if (!TEST_true(s->active))
+                goto err;
+        } break;
         case OPK_CONN_TXFC_BUMP:
             if (!TEST_true(ossl_quic_txfc_bump_cwm(h.args.conn_txfc, op->arg0)))
                 goto err;
 
             break;
-        case OPK_STREAM_TXFC_BUMP:
-            {
-                QUIC_STREAM *s;
+        case OPK_STREAM_TXFC_BUMP: {
+            QUIC_STREAM *s;
 
-                if (!TEST_ptr(s = ossl_quic_stream_map_get_by_id(h.args.qsm,
-                                                                 op->arg1)))
-                    goto err;
+            if (!TEST_ptr(s = ossl_quic_stream_map_get_by_id(h.args.qsm,
+                              op->arg1)))
+                goto err;
 
-                if (!TEST_true(ossl_quic_txfc_bump_cwm(&s->txfc, op->arg0)))
-                    goto err;
+            if (!TEST_true(ossl_quic_txfc_bump_cwm(&s->txfc, op->arg0)))
+                goto err;
 
-                ossl_quic_stream_map_update_state(h.args.qsm, s);
-            }
-            break;
+            ossl_quic_stream_map_update_state(h.args.qsm, s);
+        } break;
         case OPK_HANDSHAKE_COMPLETE:
             ossl_quic_tx_packetiser_notify_handshake_complete(h.txp);
             break;
@@ -1658,23 +1659,23 @@ static int check_is_handshake(struct helper *h)
 
 static struct script_op dyn_script_1[] = {
     OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_INITIAL, QRL_SUITE_AES128GCM, secret_1)
-    OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE, QRL_SUITE_AES128GCM, secret_1)
-    OP_TXP_GENERATE_NONE()
-    OP_CRYPTO_SEND(QUIC_PN_SPACE_INITIAL, dyn_script_1_crypto_1a) /* [crypto_idx] */
+        OP_PROVIDE_SECRET(QUIC_ENC_LEVEL_HANDSHAKE, QRL_SUITE_AES128GCM, secret_1)
+            OP_TXP_GENERATE_NONE()
+                OP_CRYPTO_SEND(QUIC_PN_SPACE_INITIAL, dyn_script_1_crypto_1a) /* [crypto_idx] */
     OP_CRYPTO_SEND(QUIC_PN_SPACE_HANDSHAKE, dyn_script_1_crypto_1b)
-    OP_TXP_GENERATE()
-    OP_RX_PKT()
-    OP_EXPECT_DGRAM_LEN(1200, 1200)
-    OP_CHECK(check_is_initial)
-    OP_NOP() /* [pkt_idx] */
+        OP_TXP_GENERATE()
+            OP_RX_PKT()
+                OP_EXPECT_DGRAM_LEN(1200, 1200)
+                    OP_CHECK(check_is_initial)
+                        OP_NOP() /* [pkt_idx] */
     OP_NOP() /* [check_idx] */
     OP_END
 };
 
-static const size_t dyn_script_1_crypto_idx     = 3;
-static const size_t dyn_script_1_pkt_idx        = 9;
-static const size_t dyn_script_1_check_idx      = 10;
-static const size_t dyn_script_1_start_from     = 1000;
+static const size_t dyn_script_1_crypto_idx = 3;
+static const size_t dyn_script_1_pkt_idx = 9;
+static const size_t dyn_script_1_check_idx = 10;
+static const size_t dyn_script_1_start_from = 1000;
 
 static int test_dyn_script_1(int idx)
 {
@@ -1684,12 +1685,12 @@ static int test_dyn_script_1(int idx)
     dyn_script_1[dyn_script_1_crypto_idx].buf_len = target_size;
 
     if (expect_handshake_pkt_in_same_dgram) {
-        dyn_script_1[dyn_script_1_pkt_idx].opcode       = OPK_RX_PKT;
-        dyn_script_1[dyn_script_1_check_idx].opcode     = OPK_CHECK;
+        dyn_script_1[dyn_script_1_pkt_idx].opcode = OPK_RX_PKT;
+        dyn_script_1[dyn_script_1_check_idx].opcode = OPK_CHECK;
         dyn_script_1[dyn_script_1_check_idx].check_func = check_is_handshake;
     } else {
-        dyn_script_1[dyn_script_1_pkt_idx].opcode       = OPK_RX_PKT_NONE;
-        dyn_script_1[dyn_script_1_check_idx].opcode     = OPK_NOP;
+        dyn_script_1[dyn_script_1_pkt_idx].opcode = OPK_RX_PKT_NONE;
+        dyn_script_1[dyn_script_1_check_idx].opcode = OPK_NOP;
     }
 
     if (!run_script(idx, dyn_script_1)) {
@@ -1704,7 +1705,7 @@ int setup_tests(void)
 {
     ADD_ALL_TESTS(test_script, OSSL_NELEM(scripts));
     ADD_ALL_TESTS(test_dyn_script_1,
-                  OSSL_NELEM(dyn_script_1_crypto_1a)
-                  - dyn_script_1_start_from + 1);
+        OSSL_NELEM(dyn_script_1_crypto_1a)
+            - dyn_script_1_start_from + 1);
     return 1;
 }
diff --git a/test/quic_txpim_test.c b/test/quic_txpim_test.c
index 84f870312b796..397bd980f223c 100644
--- a/test/quic_txpim_test.c
+++ b/test/quic_txpim_test.c
@@ -16,7 +16,7 @@ static int test_txpim(void)
     int testresult = 0;
     QUIC_TXPIM *txpim;
     size_t i, j;
-    QUIC_TXPIM_PKT *pkts[10] = {NULL};
+    QUIC_TXPIM_PKT *pkts[10] = { NULL };
     QUIC_TXPIM_CHUNK chunks[3];
     const QUIC_TXPIM_CHUNK *rchunks;
 
@@ -32,15 +32,15 @@ static int test_txpim(void)
 
         for (j = 0; j < OSSL_NELEM(chunks); ++j) {
             chunks[j].stream_id = 100 - j;
-            chunks[j].start     = 1000 * i + j * 10;
-            chunks[j].end       = chunks[j].start + 5;
+            chunks[j].start = 1000 * i + j * 10;
+            chunks[j].end = chunks[j].start + 5;
 
             if (!TEST_true(ossl_quic_txpim_pkt_append_chunk(pkts[i], chunks + j)))
                 goto err;
         }
 
         if (!TEST_size_t_eq(ossl_quic_txpim_pkt_get_num_chunks(pkts[i]),
-                            OSSL_NELEM(chunks)))
+                OSSL_NELEM(chunks)))
             goto err;
 
         rchunks = ossl_quic_txpim_pkt_get_chunks(pkts[i]);
diff --git a/test/quic_wire_test.c b/test/quic_wire_test.c
index 10630e8be39e2..3724f6e08e154 100644
--- a/test/quic_wire_test.c
+++ b/test/quic_wire_test.c
@@ -75,7 +75,7 @@ static const unsigned char encode_case_2_expect[] = {
 /* 3. ACK */
 static const OSSL_QUIC_ACK_RANGE encode_case_3_ranges[] = {
     { 20, 30 },
-    {  0, 10 }
+    { 0, 10 }
 };
 
 static const OSSL_QUIC_FRAME_ACK encode_case_3_f = {
@@ -95,13 +95,13 @@ static int encode_case_3_enc(WPACKET *pkt)
 
 static int encode_case_3_dec(PACKET *pkt, ossl_ssize_t fail)
 {
-    OSSL_QUIC_ACK_RANGE ranges[4] = {0};
-    OSSL_QUIC_FRAME_ACK f = {0};
+    OSSL_QUIC_ACK_RANGE ranges[4] = { 0 };
+    OSSL_QUIC_FRAME_ACK f = { 0 };
     uint64_t total_ranges = 0, peek_total_ranges = 0;
     int ret;
 
-    f.ack_ranges        = ranges;
-    f.num_ack_ranges    = OSSL_NELEM(ranges);
+    f.ack_ranges = ranges;
+    f.num_ack_ranges = OSSL_NELEM(ranges);
 
     ret = ossl_quic_wire_peek_frame_ack_num_ranges(pkt, &peek_total_ranges);
     if (fail < 0 && !TEST_int_eq(ret, 1))
@@ -120,20 +120,20 @@ static int encode_case_3_dec(PACKET *pkt, ossl_ssize_t fail)
         return 0;
 
     if (!TEST_uint64_t_le(f.num_ack_ranges * sizeof(OSSL_QUIC_ACK_RANGE),
-                          SIZE_MAX)
+            SIZE_MAX)
         || !TEST_uint64_t_le(encode_case_3_f.num_ack_ranges
-                             * sizeof(OSSL_QUIC_ACK_RANGE),
-                             SIZE_MAX))
+                * sizeof(OSSL_QUIC_ACK_RANGE),
+            SIZE_MAX))
         return 0;
 
     if (!TEST_mem_eq(f.ack_ranges,
-                     (size_t)f.num_ack_ranges * sizeof(OSSL_QUIC_ACK_RANGE),
-                     encode_case_3_f.ack_ranges,
-                     (size_t)encode_case_3_f.num_ack_ranges * sizeof(OSSL_QUIC_ACK_RANGE)))
+            (size_t)f.num_ack_ranges * sizeof(OSSL_QUIC_ACK_RANGE),
+            encode_case_3_f.ack_ranges,
+            (size_t)encode_case_3_f.num_ack_ranges * sizeof(OSSL_QUIC_ACK_RANGE)))
         return 0;
 
     if (!TEST_uint64_t_eq(ossl_time2ticks(f.delay_time),
-                          ossl_time2ticks(encode_case_3_f.delay_time)))
+            ossl_time2ticks(encode_case_3_f.delay_time)))
         return 0;
 
     if (!TEST_true(f.ecn_present))
@@ -152,18 +152,21 @@ static int encode_case_3_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_3_expect[] = {
-    0x03,                   /* Type */
-    0x1E,                   /* Largest Acknowledged */
-    0x40, 0x7d,             /* ACK Delay */
-    1,                      /* ACK Range Count */
-    10,                     /* First ACK Range */
-
-    8,                      /* Gap */
-    10,                     /* Length */
-
-    0x3c,                   /* ECT0 Count */
-    0x40, 0x46,             /* ECT1 Count */
-    0x40, 0x50,             /* ECNCE Count */
+    0x03, /* Type */
+    0x1E, /* Largest Acknowledged */
+    0x40,
+    0x7d, /* ACK Delay */
+    1, /* ACK Range Count */
+    10, /* First ACK Range */
+
+    8, /* Gap */
+    10, /* Length */
+
+    0x3c, /* ECT0 Count */
+    0x40,
+    0x46, /* ECT1 Count */
+    0x40,
+    0x50, /* ECNCE Count */
 };
 
 /* 4. RESET_STREAM */
@@ -174,7 +177,8 @@ static const OSSL_QUIC_FRAME_RESET_STREAM encode_case_4_f = {
 static int encode_case_4_enc(WPACKET *pkt)
 {
     if (!TEST_int_eq(ossl_quic_wire_encode_frame_reset_stream(pkt,
-                                                              &encode_case_4_f), 1))
+                         &encode_case_4_f),
+            1))
         return 0;
 
     return 1;
@@ -182,7 +186,7 @@ static int encode_case_4_enc(WPACKET *pkt)
 
 static int encode_case_4_dec(PACKET *pkt, ossl_ssize_t fail)
 {
-    OSSL_QUIC_FRAME_RESET_STREAM f = {0};
+    OSSL_QUIC_FRAME_RESET_STREAM f = { 0 };
 
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_reset_stream(pkt, &f), fail < 0))
         return 0;
@@ -197,10 +201,17 @@ static int encode_case_4_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_4_expect[] = {
-    0x04,                   /* Type */
-    0x52, 0x34,             /* Stream ID */
-    0x80, 0x00, 0x97, 0x81, /* App Error Code */
-    0x80, 0x01, 0x17, 0x17, /* Final Size */
+    0x04, /* Type */
+    0x52,
+    0x34, /* Stream ID */
+    0x80,
+    0x00,
+    0x97,
+    0x81, /* App Error Code */
+    0x80,
+    0x01,
+    0x17,
+    0x17, /* Final Size */
 };
 
 /* 5. STOP_SENDING */
@@ -211,7 +222,8 @@ static const OSSL_QUIC_FRAME_STOP_SENDING encode_case_5_f = {
 static int encode_case_5_enc(WPACKET *pkt)
 {
     if (!TEST_int_eq(ossl_quic_wire_encode_frame_stop_sending(pkt,
-                                                              &encode_case_5_f), 1))
+                         &encode_case_5_f),
+            1))
         return 0;
 
     return 1;
@@ -219,7 +231,7 @@ static int encode_case_5_enc(WPACKET *pkt)
 
 static int encode_case_5_dec(PACKET *pkt, ossl_ssize_t fail)
 {
-    OSSL_QUIC_FRAME_STOP_SENDING f = {0};
+    OSSL_QUIC_FRAME_STOP_SENDING f = { 0 };
 
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_stop_sending(pkt, &f), fail < 0))
         return 0;
@@ -234,9 +246,9 @@ static int encode_case_5_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_5_expect[] = {
-    0x05,                   /* Type */
-    0x52, 0x34,             /* Stream ID */
-    0x80, 0x00, 0x97, 0x81  /* App Error Code */
+    0x05, /* Type */
+    0x52, 0x34, /* Stream ID */
+    0x80, 0x00, 0x97, 0x81 /* App Error Code */
 };
 
 /* 6. CRYPTO */
@@ -251,7 +263,7 @@ static const OSSL_QUIC_FRAME_CRYPTO encode_case_6_f = {
 static int encode_case_6_enc(WPACKET *pkt)
 {
     if (!TEST_ptr(ossl_quic_wire_encode_frame_crypto(pkt,
-                                                     &encode_case_6_f)))
+            &encode_case_6_f)))
         return 0;
 
     return 1;
@@ -259,7 +271,7 @@ static int encode_case_6_enc(WPACKET *pkt)
 
 static int encode_case_6_dec(PACKET *pkt, ossl_ssize_t fail)
 {
-    OSSL_QUIC_FRAME_CRYPTO f = {0};
+    OSSL_QUIC_FRAME_CRYPTO f = { 0 };
 
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_crypto(pkt, 0, &f), fail < 0))
         return 0;
@@ -274,17 +286,17 @@ static int encode_case_6_dec(PACKET *pkt, ossl_ssize_t fail)
         return 0;
 
     if (!TEST_mem_eq(f.data, (size_t)f.len,
-                     encode_case_6_data, sizeof(encode_case_6_data)))
+            encode_case_6_data, sizeof(encode_case_6_data)))
         return 0;
 
     return 1;
 }
 
 static const unsigned char encode_case_6_expect[] = {
-    0x06,                   /* Type */
-    0x52, 0x34,             /* Offset */
-    0x05,                   /* Length */
-    93, 18, 17, 102, 33     /* Data */
+    0x06, /* Type */
+    0x52, 0x34, /* Offset */
+    0x05, /* Length */
+    93, 18, 17, 102, 33 /* Data */
 };
 
 /* 7. NEW_TOKEN */
@@ -296,8 +308,9 @@ static const unsigned char encode_case_7_token[] = {
 static int encode_case_7_enc(WPACKET *pkt)
 {
     if (!TEST_int_eq(ossl_quic_wire_encode_frame_new_token(pkt,
-                                                        encode_case_7_token,
-                                                        sizeof(encode_case_7_token)), 1))
+                         encode_case_7_token,
+                         sizeof(encode_case_7_token)),
+            1))
         return 0;
 
     return 1;
@@ -309,23 +322,24 @@ static int encode_case_7_dec(PACKET *pkt, ossl_ssize_t fail)
     size_t token_len = 0;
 
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_new_token(pkt,
-                                                           &token,
-                                                           &token_len), fail < 0))
+                         &token,
+                         &token_len),
+            fail < 0))
         return 0;
 
     if (fail >= 0)
         return 1;
 
     if (!TEST_mem_eq(token, token_len,
-                     encode_case_7_token, sizeof(encode_case_7_token)))
+            encode_case_7_token, sizeof(encode_case_7_token)))
         return 0;
 
     return 1;
 }
 
 static const unsigned char encode_case_7_expect[] = {
-    0x07,                   /* Type */
-    0x10,                   /* Length */
+    0x07, /* Type */
+    0x10, /* Length */
     0xde, 0x06, 0xcb, 0x76, 0x5d, 0xb1, 0xa7, 0x71, /* Token */
     0x78, 0x09, 0xbb, 0xe8, 0x50, 0x19, 0x12, 0x9a
 };
@@ -335,13 +349,13 @@ static const unsigned char encode_case_8_data[] = {
     0xde, 0x06, 0xcb, 0x76, 0x5d
 };
 static const OSSL_QUIC_FRAME_STREAM encode_case_8_f = {
-   0x1234, 0, 5, encode_case_8_data, 0, 0
+    0x1234, 0, 5, encode_case_8_data, 0, 0
 };
 
 static int encode_case_8_enc(WPACKET *pkt)
 {
     if (!TEST_ptr(ossl_quic_wire_encode_frame_stream(pkt,
-                                                     &encode_case_8_f)))
+            &encode_case_8_f)))
         return 0;
 
     return 1;
@@ -349,7 +363,7 @@ static int encode_case_8_enc(WPACKET *pkt)
 
 static int encode_case_8_dec(PACKET *pkt, ossl_ssize_t fail)
 {
-    OSSL_QUIC_FRAME_STREAM f = {0};
+    OSSL_QUIC_FRAME_STREAM f = { 0 };
 
     if (fail >= 3)
         /*
@@ -368,7 +382,7 @@ static int encode_case_8_dec(PACKET *pkt, ossl_ssize_t fail)
         return 0;
 
     if (!TEST_mem_eq(f.data, (size_t)f.len,
-                     encode_case_8_data, sizeof(encode_case_8_data)))
+            encode_case_8_data, sizeof(encode_case_8_data)))
         return 0;
 
     if (!TEST_uint64_t_eq(f.stream_id, 0x1234))
@@ -387,9 +401,9 @@ static int encode_case_8_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_8_expect[] = {
-    0x08,                           /* Type (OFF=0, LEN=0, FIN=0) */
-    0x52, 0x34,                     /* Stream ID */
-    0xde, 0x06, 0xcb, 0x76, 0x5d    /* Data */
+    0x08, /* Type (OFF=0, LEN=0, FIN=0) */
+    0x52, 0x34, /* Stream ID */
+    0xde, 0x06, 0xcb, 0x76, 0x5d /* Data */
 };
 
 /* 9. STREAM (length, offset, fin) */
@@ -397,13 +411,13 @@ static const unsigned char encode_case_9_data[] = {
     0xde, 0x06, 0xcb, 0x76, 0x5d
 };
 static const OSSL_QUIC_FRAME_STREAM encode_case_9_f = {
-   0x1234, 0x39, 5, encode_case_9_data, 1, 1
+    0x1234, 0x39, 5, encode_case_9_data, 1, 1
 };
 
 static int encode_case_9_enc(WPACKET *pkt)
 {
     if (!TEST_ptr(ossl_quic_wire_encode_frame_stream(pkt,
-                                                     &encode_case_9_f)))
+            &encode_case_9_f)))
         return 0;
 
     return 1;
@@ -411,7 +425,7 @@ static int encode_case_9_enc(WPACKET *pkt)
 
 static int encode_case_9_dec(PACKET *pkt, ossl_ssize_t fail)
 {
-    OSSL_QUIC_FRAME_STREAM f = {0};
+    OSSL_QUIC_FRAME_STREAM f = { 0 };
 
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_stream(pkt, 0, &f), fail < 0))
         return 0;
@@ -423,7 +437,7 @@ static int encode_case_9_dec(PACKET *pkt, ossl_ssize_t fail)
         return 0;
 
     if (!TEST_mem_eq(f.data, (size_t)f.len,
-                     encode_case_9_data, sizeof(encode_case_9_data)))
+            encode_case_9_data, sizeof(encode_case_9_data)))
         return 0;
 
     if (!TEST_uint64_t_eq(f.stream_id, 0x1234))
@@ -442,11 +456,11 @@ static int encode_case_9_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_9_expect[] = {
-    0x0f,                           /* Type (OFF=1, LEN=1, FIN=1) */
-    0x52, 0x34,                     /* Stream ID */
-    0x39,                           /* Offset */
-    0x05,                           /* Length */
-    0xde, 0x06, 0xcb, 0x76, 0x5d    /* Data */
+    0x0f, /* Type (OFF=1, LEN=1, FIN=1) */
+    0x52, 0x34, /* Stream ID */
+    0x39, /* Offset */
+    0x05, /* Length */
+    0xde, 0x06, 0xcb, 0x76, 0x5d /* Data */
 };
 
 /* 10. MAX_DATA */
@@ -475,16 +489,18 @@ static int encode_case_10_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_10_expect[] = {
-    0x10,                           /* Type */
-    0x52, 0x34,                     /* Max Data */
+    0x10, /* Type */
+    0x52,
+    0x34, /* Max Data */
 };
 
 /* 11. MAX_STREAM_DATA */
 static int encode_case_11_enc(WPACKET *pkt)
 {
     if (!TEST_int_eq(ossl_quic_wire_encode_frame_max_stream_data(pkt,
-                                                                 0x1234,
-                                                                 0x9781), 1))
+                         0x1234,
+                         0x9781),
+            1))
         return 0;
 
     return 1;
@@ -495,8 +511,9 @@ static int encode_case_11_dec(PACKET *pkt, ossl_ssize_t fail)
     uint64_t stream_id = 0, max_data = 0;
 
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_max_stream_data(pkt,
-                                                                 &stream_id,
-                                                                 &max_data), fail < 0))
+                         &stream_id,
+                         &max_data),
+            fail < 0))
         return 0;
 
     if (fail >= 0)
@@ -512,9 +529,13 @@ static int encode_case_11_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_11_expect[] = {
-    0x11,                           /* Type */
-    0x52, 0x34,                     /* Stream ID */
-    0x80, 0x00, 0x97, 0x81,         /* Max Data */
+    0x11, /* Type */
+    0x52,
+    0x34, /* Stream ID */
+    0x80,
+    0x00,
+    0x97,
+    0x81, /* Max Data */
 };
 
 /* 12. MAX_STREAMS */
@@ -532,13 +553,13 @@ static int encode_case_12_enc(WPACKET *pkt)
 static int encode_case_12_dec(PACKET *pkt, ossl_ssize_t fail)
 {
     uint64_t max_streams_1 = 0, max_streams_2 = 0,
-            frame_type_1 = 0, frame_type_2 = 0;
+             frame_type_1 = 0, frame_type_2 = 0;
     int is_minimal = 1, success_if;
 
     success_if = (fail < 0 || fail >= 1);
     if (!TEST_int_eq(ossl_quic_wire_peek_frame_header(pkt, &frame_type_1,
-                                                      &is_minimal),
-                     success_if))
+                         &is_minimal),
+            success_if))
         return 0;
 
     if (!TEST_true(!success_if || is_minimal))
@@ -546,14 +567,14 @@ static int encode_case_12_dec(PACKET *pkt, ossl_ssize_t fail)
 
     success_if = (fail < 0 || fail >= 3);
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_max_streams(pkt,
-                                                             &max_streams_1),
-                     success_if))
+                         &max_streams_1),
+            success_if))
         return 0;
 
     success_if = (fail < 0 || fail >= 4);
     if (!TEST_int_eq(ossl_quic_wire_peek_frame_header(pkt, &frame_type_2,
-                                                      &is_minimal),
-                     success_if))
+                         &is_minimal),
+            success_if))
         return 0;
 
     if (!TEST_true(!success_if || is_minimal))
@@ -561,8 +582,8 @@ static int encode_case_12_dec(PACKET *pkt, ossl_ssize_t fail)
 
     success_if = (fail < 0);
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_max_streams(pkt,
-                                                             &max_streams_2),
-                     success_if))
+                         &max_streams_2),
+            success_if))
         return 0;
 
     if ((fail < 0 || fail >= 3)
@@ -585,10 +606,14 @@ static int encode_case_12_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_12_expect[] = {
-    0x12,                           /* Type (MAX_STREAMS Bidirectional) */
-    0x52, 0x34,                     /* Max Streams */
-    0x13,                           /* Type (MAX_STREAMS Unidirectional) */
-    0x80, 0x00, 0x97, 0x81,         /* Max Streams */
+    0x12, /* Type (MAX_STREAMS Bidirectional) */
+    0x52,
+    0x34, /* Max Streams */
+    0x13, /* Type (MAX_STREAMS Unidirectional) */
+    0x80,
+    0x00,
+    0x97,
+    0x81, /* Max Streams */
 };
 
 /* 13. DATA_BLOCKED */
@@ -605,7 +630,8 @@ static int encode_case_13_dec(PACKET *pkt, ossl_ssize_t fail)
     uint64_t max_data = 0;
 
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_data_blocked(pkt,
-                                                              &max_data), fail < 0))
+                         &max_data),
+            fail < 0))
         return 0;
 
     if (fail >= 0)
@@ -618,16 +644,18 @@ static int encode_case_13_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_13_expect[] = {
-    0x14,                           /* Type */
-    0x52, 0x34,                     /* Max Data */
+    0x14, /* Type */
+    0x52,
+    0x34, /* Max Data */
 };
 
 /* 14. STREAM_DATA_BLOCKED */
 static int encode_case_14_enc(WPACKET *pkt)
 {
     if (!TEST_int_eq(ossl_quic_wire_encode_frame_stream_data_blocked(pkt,
-                                                                     0x1234,
-                                                                     0x9781), 1))
+                         0x1234,
+                         0x9781),
+            1))
         return 0;
 
     return 1;
@@ -638,8 +666,9 @@ static int encode_case_14_dec(PACKET *pkt, ossl_ssize_t fail)
     uint64_t stream_id = 0, max_data = 0;
 
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_stream_data_blocked(pkt,
-                                                                     &stream_id,
-                                                                     &max_data), fail < 0))
+                         &stream_id,
+                         &max_data),
+            fail < 0))
         return 0;
 
     if (fail >= 0)
@@ -655,9 +684,13 @@ static int encode_case_14_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_14_expect[] = {
-    0x15,                           /* Type */
-    0x52, 0x34,                     /* Stream ID */
-    0x80, 0x00, 0x97, 0x81,         /* Max Data */
+    0x15, /* Type */
+    0x52,
+    0x34, /* Stream ID */
+    0x80,
+    0x00,
+    0x97,
+    0x81, /* Max Data */
 };
 
 /* 15. STREAMS_BLOCKED */
@@ -675,13 +708,13 @@ static int encode_case_15_enc(WPACKET *pkt)
 static int encode_case_15_dec(PACKET *pkt, ossl_ssize_t fail)
 {
     uint64_t max_streams_1 = 0, max_streams_2 = 0,
-            frame_type_1 = 0, frame_type_2 = 0;
+             frame_type_1 = 0, frame_type_2 = 0;
     int is_minimal = 1, success_if;
 
     success_if = (fail < 0 || fail >= 1);
     if (!TEST_int_eq(ossl_quic_wire_peek_frame_header(pkt, &frame_type_1,
-                                                      &is_minimal),
-                     success_if))
+                         &is_minimal),
+            success_if))
         return 0;
 
     if (!TEST_true(!success_if || is_minimal))
@@ -689,22 +722,22 @@ static int encode_case_15_dec(PACKET *pkt, ossl_ssize_t fail)
 
     success_if = (fail < 0 || fail >= 3);
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_streams_blocked(pkt,
-                                                                 &max_streams_1),
-                     success_if))
+                         &max_streams_1),
+            success_if))
         return 0;
 
     success_if = (fail < 0 || fail >= 4);
     if (!TEST_int_eq(ossl_quic_wire_peek_frame_header(pkt, &frame_type_2,
-                                                      &is_minimal),
-                     success_if))
+                         &is_minimal),
+            success_if))
         return 0;
 
     if (!TEST_true(!success_if || is_minimal))
         return 0;
 
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_streams_blocked(pkt,
-                                                                 &max_streams_2),
-                     fail < 0 || fail >= 8))
+                         &max_streams_2),
+            fail < 0 || fail >= 8))
         return 0;
 
     if ((fail < 0 || fail >= 1)
@@ -727,10 +760,14 @@ static int encode_case_15_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_15_expect[] = {
-    0x16,                           /* Type (STREAMS_BLOCKED Bidirectional) */
-    0x52, 0x34,                     /* Max Streams */
-    0x17,                           /* Type (STREAMS_BLOCKED Unidirectional) */
-    0x80, 0x00, 0x97, 0x81,         /* Max Streams */
+    0x16, /* Type (STREAMS_BLOCKED Bidirectional) */
+    0x52,
+    0x34, /* Max Streams */
+    0x17, /* Type (STREAMS_BLOCKED Unidirectional) */
+    0x80,
+    0x00,
+    0x97,
+    0x81, /* Max Streams */
 };
 
 /* 16. NEW_CONNECTION_ID */
@@ -741,22 +778,17 @@ static const unsigned char encode_case_16_conn_id[] = {
 static const OSSL_QUIC_FRAME_NEW_CONN_ID encode_case_16_f = {
     0x9781,
     0x1234,
-    {
-        0x4,
-        {0x33, 0x44, 0x55, 0x66}
-    },
-    {
-        {
-            0xde, 0x06, 0xcb, 0x76, 0x5d, 0xb1, 0xa7, 0x71,
-            0x78, 0x09, 0xbb, 0xe8, 0x50, 0x19, 0x12, 0x9a
-        }
-    }
+    { 0x4,
+        { 0x33, 0x44, 0x55, 0x66 } },
+    { { 0xde, 0x06, 0xcb, 0x76, 0x5d, 0xb1, 0xa7, 0x71,
+        0x78, 0x09, 0xbb, 0xe8, 0x50, 0x19, 0x12, 0x9a } }
 };
 
 static int encode_case_16_enc(WPACKET *pkt)
 {
     if (!TEST_int_eq(ossl_quic_wire_encode_frame_new_conn_id(pkt,
-                                                             &encode_case_16_f), 1))
+                         &encode_case_16_f),
+            1))
         return 0;
 
     return 1;
@@ -764,7 +796,7 @@ static int encode_case_16_enc(WPACKET *pkt)
 
 static int encode_case_16_dec(PACKET *pkt, ossl_ssize_t fail)
 {
-    OSSL_QUIC_FRAME_NEW_CONN_ID f = {0};
+    OSSL_QUIC_FRAME_NEW_CONN_ID f = { 0 };
 
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_new_conn_id(pkt, &f), fail < 0))
         return 0;
@@ -782,24 +814,24 @@ static int encode_case_16_dec(PACKET *pkt, ossl_ssize_t fail)
         return 0;
 
     if (!TEST_mem_eq(f.conn_id.id, f.conn_id.id_len,
-                     encode_case_16_conn_id, sizeof(encode_case_16_conn_id)))
+            encode_case_16_conn_id, sizeof(encode_case_16_conn_id)))
         return 0;
 
     if (!TEST_mem_eq(f.stateless_reset.token,
-                     sizeof(f.stateless_reset.token),
-                     encode_case_16_f.stateless_reset.token,
-                     sizeof(encode_case_16_f.stateless_reset.token)))
+            sizeof(f.stateless_reset.token),
+            encode_case_16_f.stateless_reset.token,
+            sizeof(encode_case_16_f.stateless_reset.token)))
         return 0;
 
     return 1;
 }
 
 static const unsigned char encode_case_16_expect[] = {
-    0x18,                           /* Type */
-    0x80, 0x00, 0x97, 0x81,         /* Sequence Number */
-    0x52, 0x34,                     /* Retire Prior To */
-    0x04,                           /* Connection ID Length */
-    0x33, 0x44, 0x55, 0x66,         /* Connection ID */
+    0x18, /* Type */
+    0x80, 0x00, 0x97, 0x81, /* Sequence Number */
+    0x52, 0x34, /* Retire Prior To */
+    0x04, /* Connection ID Length */
+    0x33, 0x44, 0x55, 0x66, /* Connection ID */
     0xde, 0x06, 0xcb, 0x76, 0x5d, 0xb1, 0xa7, 0x71, /* Stateless Reset Token */
     0x78, 0x09, 0xbb, 0xe8, 0x50, 0x19, 0x12, 0x9a
 };
@@ -808,22 +840,17 @@ static const unsigned char encode_case_16_expect[] = {
 static const OSSL_QUIC_FRAME_NEW_CONN_ID encode_case_16b_f = {
     0x1234,
     0x9781,
-    {
-        0x4,
-        {0x33, 0x44, 0x55, 0x66}
-    },
-    {
-        {
-            0xde, 0x06, 0xcb, 0x76, 0x5d, 0xb1, 0xa7, 0x71,
-            0x78, 0x09, 0xbb, 0xe8, 0x50, 0x19, 0x12, 0x9a
-        }
-    }
+    { 0x4,
+        { 0x33, 0x44, 0x55, 0x66 } },
+    { { 0xde, 0x06, 0xcb, 0x76, 0x5d, 0xb1, 0xa7, 0x71,
+        0x78, 0x09, 0xbb, 0xe8, 0x50, 0x19, 0x12, 0x9a } }
 };
 
 static int encode_case_16b_enc(WPACKET *pkt)
 {
     if (!TEST_int_eq(ossl_quic_wire_encode_frame_new_conn_id(pkt,
-                                                             &encode_case_16b_f), 1))
+                         &encode_case_16b_f),
+            1))
         return 0;
 
     return 1;
@@ -831,7 +858,7 @@ static int encode_case_16b_enc(WPACKET *pkt)
 
 static int encode_case_16b_dec(PACKET *pkt, ossl_ssize_t fail)
 {
-    OSSL_QUIC_FRAME_NEW_CONN_ID f = {0};
+    OSSL_QUIC_FRAME_NEW_CONN_ID f = { 0 };
 
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_new_conn_id(pkt, &f), 0))
         return 0;
@@ -843,11 +870,11 @@ static int encode_case_16b_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_16b_expect[] = {
-    0x18,                           /* Type */
-    0x52, 0x34,                     /* Sequence Number */
-    0x80, 0x00, 0x97, 0x81,         /* Retire Prior To */
-    0x04,                           /* Connection ID Length */
-    0x33, 0x44, 0x55, 0x66,         /* Connection ID */
+    0x18, /* Type */
+    0x52, 0x34, /* Sequence Number */
+    0x80, 0x00, 0x97, 0x81, /* Retire Prior To */
+    0x04, /* Connection ID Length */
+    0x33, 0x44, 0x55, 0x66, /* Connection ID */
     0xde, 0x06, 0xcb, 0x76, 0x5d, 0xb1, 0xa7, 0x71, /* Stateless Reset Token */
     0x78, 0x09, 0xbb, 0xe8, 0x50, 0x19, 0x12, 0x9a
 };
@@ -878,18 +905,20 @@ static int encode_case_17_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_17_expect[] = {
-    0x19,                           /* Type */
-    0x52, 0x34,                     /* Seq Num */
+    0x19, /* Type */
+    0x52,
+    0x34, /* Seq Num */
 };
 
 /* 18. PATH_CHALLENGE */
 static const uint64_t encode_case_18_data
-    = (((uint64_t)0x5f4b12)<<40) | (uint64_t)0x731834UL;
+    = (((uint64_t)0x5f4b12) << 40) | (uint64_t)0x731834UL;
 
 static int encode_case_18_enc(WPACKET *pkt)
 {
     if (!TEST_int_eq(ossl_quic_wire_encode_frame_path_challenge(pkt,
-                                                                encode_case_18_data), 1))
+                         encode_case_18_data),
+            1))
         return 0;
 
     return 1;
@@ -912,18 +941,26 @@ static int encode_case_18_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_18_expect[] = {
-    0x1A,                                           /* Type */
-    0x5f, 0x4b, 0x12, 0x00, 0x00, 0x73, 0x18, 0x34, /* Data */
+    0x1A, /* Type */
+    0x5f,
+    0x4b,
+    0x12,
+    0x00,
+    0x00,
+    0x73,
+    0x18,
+    0x34, /* Data */
 };
 
 /* 19. PATH_RESPONSE */
 static const uint64_t encode_case_19_data
-    = (((uint64_t)0x5f4b12)<<40) | (uint64_t)0x731834UL;
+    = (((uint64_t)0x5f4b12) << 40) | (uint64_t)0x731834UL;
 
 static int encode_case_19_enc(WPACKET *pkt)
 {
     if (!TEST_int_eq(ossl_quic_wire_encode_frame_path_response(pkt,
-                                                               encode_case_19_data), 1))
+                         encode_case_19_data),
+            1))
         return 0;
 
     return 1;
@@ -946,8 +983,15 @@ static int encode_case_19_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_19_expect[] = {
-    0x1B,                                           /* Type */
-    0x5f, 0x4b, 0x12, 0x00, 0x00, 0x73, 0x18, 0x34, /* Data */
+    0x1B, /* Type */
+    0x5f,
+    0x4b,
+    0x12,
+    0x00,
+    0x00,
+    0x73,
+    0x18,
+    0x34, /* Data */
 };
 
 /* 20. CONNECTION_CLOSE (transport) */
@@ -968,7 +1012,8 @@ static const OSSL_QUIC_FRAME_CONN_CLOSE encode_case_20_f = {
 static int encode_case_20_enc(WPACKET *pkt)
 {
     if (!TEST_int_eq(ossl_quic_wire_encode_frame_conn_close(pkt,
-                                                            &encode_case_20_f), 1))
+                         &encode_case_20_f),
+            1))
         return 0;
 
     return 1;
@@ -976,7 +1021,7 @@ static int encode_case_20_enc(WPACKET *pkt)
 
 static int encode_case_20_dec(PACKET *pkt, ossl_ssize_t fail)
 {
-    OSSL_QUIC_FRAME_CONN_CLOSE f = {0};
+    OSSL_QUIC_FRAME_CONN_CLOSE f = { 0 };
 
     if (!TEST_int_eq(ossl_quic_wire_decode_frame_conn_close(pkt, &f), fail < 0))
         return 0;
@@ -997,17 +1042,17 @@ static int encode_case_20_dec(PACKET *pkt, ossl_ssize_t fail)
         return 0;
 
     if (!TEST_mem_eq(f.reason, f.reason_len,
-                     encode_case_20_f.reason, encode_case_20_f.reason_len))
+            encode_case_20_f.reason, encode_case_20_f.reason_len))
         return 0;
 
     return 1;
 }
 
 static const unsigned char encode_case_20_expect[] = {
-    0x1C,                           /* Type */
-    0x52, 0x34,                     /* Sequence Number */
-    0x80, 0x00, 0x97, 0x81,         /* Frame Type */
-    0x12,                           /* Reason Length */
+    0x1C, /* Type */
+    0x52, 0x34, /* Sequence Number */
+    0x80, 0x00, 0x97, 0x81, /* Frame Type */
+    0x12, /* Reason Length */
     0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x20, 0x66, 0x6f, /* Reason */
     0x72, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x75, 0x72, 0x65
 };
@@ -1036,19 +1081,19 @@ static const unsigned char encode_case_21_expect[] = {
 };
 
 /* 22. Buffer Transport Parameter */
-static const unsigned char encode_case_22_data[] = {0x55,0x77,0x32,0x46,0x99};
+static const unsigned char encode_case_22_data[] = { 0x55, 0x77, 0x32, 0x46, 0x99 };
 
 static int encode_case_22_enc(WPACKET *pkt)
 {
     unsigned char *p;
 
     if (!TEST_ptr(ossl_quic_wire_encode_transport_param_bytes(pkt, 0x1234,
-                                                              encode_case_22_data,
-                                                              sizeof(encode_case_22_data))))
+            encode_case_22_data,
+            sizeof(encode_case_22_data))))
         return 0;
 
     if (!TEST_ptr(p = ossl_quic_wire_encode_transport_param_bytes(pkt, 0x9781,
-                                                                  NULL, 2)))
+                      NULL, 2)))
         return 0;
 
     p[0] = 0x33;
@@ -1062,10 +1107,10 @@ static int encode_case_22_dec(PACKET *pkt, ossl_ssize_t fail)
     uint64_t id = 0;
     size_t len = 0;
     const unsigned char *p;
-    static const unsigned char data[] = {0x33, 0x44};
+    static const unsigned char data[] = { 0x33, 0x44 };
 
     if (!TEST_int_eq(ossl_quic_wire_peek_transport_param(pkt, &id),
-                     fail < 0 || fail >= 2))
+            fail < 0 || fail >= 2))
         return 0;
 
     if ((fail < 0 || fail >= 2)
@@ -1093,7 +1138,7 @@ static int encode_case_22_dec(PACKET *pkt, ossl_ssize_t fail)
 
     if ((fail < 0 || fail >= 8)
         && !TEST_int_eq(ossl_quic_wire_peek_transport_param(pkt, &id),
-                        fail < 0 || fail >= 12))
+            fail < 0 || fail >= 12))
         return 0;
 
     if ((fail < 0 || fail >= 12)
@@ -1123,13 +1168,13 @@ static int encode_case_22_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_22_expect[] = {
-    0x52, 0x34,                         /* ID */
-    0x05,                               /* Length */
-    0x55, 0x77, 0x32, 0x46, 0x99,       /* Data */
+    0x52, 0x34, /* ID */
+    0x05, /* Length */
+    0x55, 0x77, 0x32, 0x46, 0x99, /* Data */
 
-    0x80, 0x00, 0x97, 0x81,             /* ID */
-    0x02,                               /* Length */
-    0x33, 0x44                          /* Data */
+    0x80, 0x00, 0x97, 0x81, /* ID */
+    0x02, /* Length */
+    0x33, 0x44 /* Data */
 };
 
 /* 23. Integer Transport Parameter */
@@ -1149,8 +1194,8 @@ static int encode_case_23_dec(PACKET *pkt, ossl_ssize_t fail)
     uint64_t id = 0, value = 0;
 
     if (!TEST_int_eq(ossl_quic_wire_decode_transport_param_int(pkt,
-                                                               &id, &value),
-                     fail < 0 || fail >= 7))
+                         &id, &value),
+            fail < 0 || fail >= 7))
         return 0;
 
     if ((fail < 0 || fail >= 7)
@@ -1162,8 +1207,8 @@ static int encode_case_23_dec(PACKET *pkt, ossl_ssize_t fail)
         return 0;
 
     if (!TEST_int_eq(ossl_quic_wire_decode_transport_param_int(pkt,
-                                                               &id, &value),
-                     fail < 0 || fail >= 14))
+                         &id, &value),
+            fail < 0 || fail >= 14))
         return 0;
 
     if ((fail < 0 || fail >= 14)
@@ -1178,48 +1223,56 @@ static int encode_case_23_dec(PACKET *pkt, ossl_ssize_t fail)
 }
 
 static const unsigned char encode_case_23_expect[] = {
-    0x52, 0x34,
+    0x52,
+    0x34,
     0x04,
-    0x80, 0x00, 0x97, 0x81,
+    0x80,
+    0x00,
+    0x97,
+    0x81,
 
-    0x62, 0x33,
+    0x62,
+    0x33,
     0x04,
-    0x80, 0x00, 0x45, 0x45,
+    0x80,
+    0x00,
+    0x45,
+    0x45,
 };
 
-#define ENCODE_CASE(n)                          \
-    {                                           \
-      encode_case_##n##_enc,                    \
-      encode_case_##n##_expect,                 \
-      OSSL_NELEM(encode_case_##n##_expect),     \
-      encode_case_##n##_dec                     \
+#define ENCODE_CASE(n)                        \
+    {                                         \
+        encode_case_##n##_enc,                \
+        encode_case_##n##_expect,             \
+        OSSL_NELEM(encode_case_##n##_expect), \
+        encode_case_##n##_dec                 \
     },
 
 static const struct encode_test_case encode_cases[] = {
     ENCODE_CASE(1)
-    ENCODE_CASE(2)
-    ENCODE_CASE(3)
-    ENCODE_CASE(4)
-    ENCODE_CASE(5)
-    ENCODE_CASE(6)
-    ENCODE_CASE(7)
-    ENCODE_CASE(8)
-    ENCODE_CASE(9)
-    ENCODE_CASE(10)
-    ENCODE_CASE(11)
-    ENCODE_CASE(12)
-    ENCODE_CASE(13)
-    ENCODE_CASE(14)
-    ENCODE_CASE(15)
-    ENCODE_CASE(16)
-    ENCODE_CASE(16b)
-    ENCODE_CASE(17)
-    ENCODE_CASE(18)
-    ENCODE_CASE(19)
-    ENCODE_CASE(20)
-    ENCODE_CASE(21)
-    ENCODE_CASE(22)
-    ENCODE_CASE(23)
+        ENCODE_CASE(2)
+            ENCODE_CASE(3)
+                ENCODE_CASE(4)
+                    ENCODE_CASE(5)
+                        ENCODE_CASE(6)
+                            ENCODE_CASE(7)
+                                ENCODE_CASE(8)
+                                    ENCODE_CASE(9)
+                                        ENCODE_CASE(10)
+                                            ENCODE_CASE(11)
+                                                ENCODE_CASE(12)
+                                                    ENCODE_CASE(13)
+                                                        ENCODE_CASE(14)
+                                                            ENCODE_CASE(15)
+                                                                ENCODE_CASE(16)
+                                                                    ENCODE_CASE(16b)
+                                                                        ENCODE_CASE(17)
+                                                                            ENCODE_CASE(18)
+                                                                                ENCODE_CASE(19)
+                                                                                    ENCODE_CASE(20)
+                                                                                        ENCODE_CASE(21)
+                                                                                            ENCODE_CASE(22)
+                                                                                                ENCODE_CASE(23)
 };
 
 static int test_wire_encode(int idx)
@@ -1284,109 +1337,110 @@ static int test_wire_encode(int idx)
 }
 
 struct ack_test_case {
-    const unsigned char    *input_buf;
-    size_t                  input_buf_len;
-    int                   (*deserializer)(PACKET *pkt);
-    int                     expect_fail;
+    const unsigned char *input_buf;
+    size_t input_buf_len;
+    int (*deserializer)(PACKET *pkt);
+    int expect_fail;
 };
 
 /* ACK Frame with Excessive First ACK Range Field */
 static const unsigned char ack_case_1_input[] = {
-    0x02,           /* ACK Without ECN */
-    0x08,           /* Largest Acknowledged */
-    0x01,           /* ACK Delay */
-    0x00,           /* ACK Range Count */
-    0x09,           /* First ACK Range */
+    0x02, /* ACK Without ECN */
+    0x08, /* Largest Acknowledged */
+    0x01, /* ACK Delay */
+    0x00, /* ACK Range Count */
+    0x09, /* First ACK Range */
 };
 
 /* ACK Frame with Valid ACK Range Field */
 static const unsigned char ack_case_2_input[] = {
-    0x02,           /* ACK Without ECN */
-    0x08,           /* Largest Acknowledged */
-    0x01,           /* ACK Delay */
-    0x00,           /* ACK Range Count */
-    0x08,           /* First ACK Range */
+    0x02, /* ACK Without ECN */
+    0x08, /* Largest Acknowledged */
+    0x01, /* ACK Delay */
+    0x00, /* ACK Range Count */
+    0x08, /* First ACK Range */
 };
 
 /* ACK Frame with Excessive ACK Range Gap */
 static const unsigned char ack_case_3_input[] = {
-    0x02,           /* ACK Without ECN */
-    0x08,           /* Largest Acknowledged */
-    0x01,           /* ACK Delay */
-    0x01,           /* ACK Range Count */
-    0x01,           /* First ACK Range */
-
-    0x05,           /* Gap */
-    0x01,           /* ACK Range Length */
+    0x02, /* ACK Without ECN */
+    0x08, /* Largest Acknowledged */
+    0x01, /* ACK Delay */
+    0x01, /* ACK Range Count */
+    0x01, /* First ACK Range */
+
+    0x05, /* Gap */
+    0x01, /* ACK Range Length */
 };
 
 /* ACK Frame with Valid ACK Range */
 static const unsigned char ack_case_4_input[] = {
-    0x02,           /* ACK Without ECN */
-    0x08,           /* Largest Acknowledged */
-    0x01,           /* ACK Delay */
-    0x01,           /* ACK Range Count */
-    0x01,           /* First ACK Range */
-
-    0x04,           /* Gap */
-    0x01,           /* ACK Range Length */
+    0x02, /* ACK Without ECN */
+    0x08, /* Largest Acknowledged */
+    0x01, /* ACK Delay */
+    0x01, /* ACK Range Count */
+    0x01, /* First ACK Range */
+
+    0x04, /* Gap */
+    0x01, /* ACK Range Length */
 };
 
 /* ACK Frame with Excessive ACK Range Length */
 static const unsigned char ack_case_5_input[] = {
-    0x02,           /* ACK Without ECN */
-    0x08,           /* Largest Acknowledged */
-    0x01,           /* ACK Delay */
-    0x01,           /* ACK Range Count */
-    0x01,           /* First ACK Range */
-
-    0x04,           /* Gap */
-    0x02,           /* ACK Range Length */
+    0x02, /* ACK Without ECN */
+    0x08, /* Largest Acknowledged */
+    0x01, /* ACK Delay */
+    0x01, /* ACK Range Count */
+    0x01, /* First ACK Range */
+
+    0x04, /* Gap */
+    0x02, /* ACK Range Length */
 };
 
 /* ACK Frame with Multiple ACK Ranges, Final Having Excessive Length */
 static const unsigned char ack_case_6_input[] = {
-    0x02,           /* ACK Without ECN */
-    0x08,           /* Largest Acknowledged */
-    0x01,           /* ACK Delay */
-    0x02,           /* ACK Range Count */
-    0x01,           /* First ACK Range */
+    0x02, /* ACK Without ECN */
+    0x08, /* Largest Acknowledged */
+    0x01, /* ACK Delay */
+    0x02, /* ACK Range Count */
+    0x01, /* First ACK Range */
 
-    0x01,           /* Gap */
-    0x02,           /* ACK Range Length */
+    0x01, /* Gap */
+    0x02, /* ACK Range Length */
 
-    0x00,           /* Gap */
-    0x01,           /* ACK Range Length */
+    0x00, /* Gap */
+    0x01, /* ACK Range Length */
 };
 
 /* ACK Frame with Multiple ACK Ranges, Valid */
 static const unsigned char ack_case_7_input[] = {
-    0x02,           /* ACK Without ECN */
-    0x08,           /* Largest Acknowledged */
-    0x01,           /* ACK Delay */
-    0x02,           /* ACK Range Count */
-    0x01,           /* First ACK Range */
+    0x02, /* ACK Without ECN */
+    0x08, /* Largest Acknowledged */
+    0x01, /* ACK Delay */
+    0x02, /* ACK Range Count */
+    0x01, /* First ACK Range */
 
-    0x01,           /* Gap */
-    0x02,           /* ACK Range Length */
+    0x01, /* Gap */
+    0x02, /* ACK Range Length */
 
-    0x00,           /* Gap */
-    0x00,           /* ACK Range Length */
+    0x00, /* Gap */
+    0x00, /* ACK Range Length */
 };
 
 static int ack_generic_decode(PACKET *pkt)
 {
-    OSSL_QUIC_ACK_RANGE ranges[8] = {0};
-    OSSL_QUIC_FRAME_ACK f = {0};
+    OSSL_QUIC_ACK_RANGE ranges[8] = { 0 };
+    OSSL_QUIC_FRAME_ACK f = { 0 };
     uint64_t total_ranges = 0, peek_total_ranges = 0;
     int r;
     size_t i;
 
-    f.ack_ranges        = ranges;
-    f.num_ack_ranges    = OSSL_NELEM(ranges);
+    f.ack_ranges = ranges;
+    f.num_ack_ranges = OSSL_NELEM(ranges);
 
     if (!TEST_int_eq(ossl_quic_wire_peek_frame_ack_num_ranges(pkt,
-                                                              &peek_total_ranges), 1))
+                         &peek_total_ranges),
+            1))
         return 0;
 
     r = ossl_quic_wire_decode_frame_ack(pkt, 3, &f, &total_ranges);
@@ -1406,22 +1460,22 @@ static int ack_generic_decode(PACKET *pkt)
     return 1;
 }
 
-#define ACK_CASE(n, expect_fail, dec)   \
-    {                                   \
-        ack_case_##n##_input,           \
-        sizeof(ack_case_##n##_input),   \
-        (dec),                          \
-        (expect_fail)                   \
+#define ACK_CASE(n, expect_fail, dec) \
+    {                                 \
+        ack_case_##n##_input,         \
+        sizeof(ack_case_##n##_input), \
+        (dec),                        \
+        (expect_fail)                 \
     },
 
 static const struct ack_test_case ack_cases[] = {
     ACK_CASE(1, 1, ack_generic_decode)
-    ACK_CASE(2, 0, ack_generic_decode)
-    ACK_CASE(3, 1, ack_generic_decode)
-    ACK_CASE(4, 0, ack_generic_decode)
-    ACK_CASE(5, 1, ack_generic_decode)
-    ACK_CASE(6, 1, ack_generic_decode)
-    ACK_CASE(7, 0, ack_generic_decode)
+        ACK_CASE(2, 0, ack_generic_decode)
+            ACK_CASE(3, 1, ack_generic_decode)
+                ACK_CASE(4, 0, ack_generic_decode)
+                    ACK_CASE(5, 1, ack_generic_decode)
+                        ACK_CASE(6, 1, ack_generic_decode)
+                            ACK_CASE(7, 0, ack_generic_decode)
 };
 
 static int test_wire_ack(int idx)
@@ -1431,8 +1485,9 @@ static int test_wire_ack(int idx)
     const struct ack_test_case *c = &ack_cases[idx];
 
     if (!TEST_int_eq(PACKET_buf_init(&pkt,
-                                     (unsigned char *)c->input_buf,
-                                     c->input_buf_len), 1))
+                         (unsigned char *)c->input_buf,
+                         c->input_buf_len),
+            1))
         goto err;
 
     r = c->deserializer(&pkt);
@@ -1454,33 +1509,33 @@ static int test_wire_ack(int idx)
 
 /* Packet Header PN Encoding Tests */
 struct pn_test {
-    QUIC_PN         pn, tx_largest_acked, rx_largest_pn;
-    char            expected_len;
-    unsigned char   expected_bytes[4];
+    QUIC_PN pn, tx_largest_acked, rx_largest_pn;
+    char expected_len;
+    unsigned char expected_bytes[4];
 };
 
 static const struct pn_test pn_tests[] = {
     /* RFC 9000 Section A.2 */
-    { 0xac5c02, 0xabe8b3, 0xabe8b3, 2, {0x5c,0x02} },
-    { 0xace8fe, 0xabe8b3, 0xabe8b3, 3, {0xac,0xe8,0xfe} },
+    { 0xac5c02, 0xabe8b3, 0xabe8b3, 2, { 0x5c, 0x02 } },
+    { 0xace8fe, 0xabe8b3, 0xabe8b3, 3, { 0xac, 0xe8, 0xfe } },
     /* RFC 9000 Section A.3 */
-    { 0xa82f9b32, 0xa82f30ea, 0xa82f30ea, 2, {0x9b,0x32} },
+    { 0xa82f9b32, 0xa82f30ea, 0xa82f30ea, 2, { 0x9b, 0x32 } },
     /* Boundary Cases */
-    { 1, 0, 0, 1, {0x01} },
-    { 256, 255, 255, 1, {0x00} },
-    { 257, 255, 255, 1, {0x01} },
-    { 256, 128, 128, 1, {0x00} },
-    { 256, 127, 127, 2, {0x01,0x00} },
-    { 65536, 32768, 32768, 2, {0x00,0x00} },
-    { 65537, 32769, 32769, 2, {0x00,0x01} },
-    { 65536, 32767, 32767, 3, {0x01,0x00,0x00} },
-    { 65537, 32768, 32768, 3, {0x01,0x00,0x01} },
-    { 16777216, 8388608, 8388608, 3, {0x00,0x00,0x00} },
-    { 16777217, 8388609, 8388609, 3, {0x00,0x00,0x01} },
-    { 16777216, 8388607, 8388607, 4, {0x01,0x00,0x00,0x00} },
-    { 16777217, 8388608, 8388608, 4, {0x01,0x00,0x00,0x01} },
-    { 4294967296, 2147483648, 2147483648, 4, {0x00,0x00,0x00,0x00} },
-    { 4294967297, 2147483648, 2147483648, 4, {0x00,0x00,0x00,0x01} },
+    { 1, 0, 0, 1, { 0x01 } },
+    { 256, 255, 255, 1, { 0x00 } },
+    { 257, 255, 255, 1, { 0x01 } },
+    { 256, 128, 128, 1, { 0x00 } },
+    { 256, 127, 127, 2, { 0x01, 0x00 } },
+    { 65536, 32768, 32768, 2, { 0x00, 0x00 } },
+    { 65537, 32769, 32769, 2, { 0x00, 0x01 } },
+    { 65536, 32767, 32767, 3, { 0x01, 0x00, 0x00 } },
+    { 65537, 32768, 32768, 3, { 0x01, 0x00, 0x01 } },
+    { 16777216, 8388608, 8388608, 3, { 0x00, 0x00, 0x00 } },
+    { 16777217, 8388609, 8388609, 3, { 0x00, 0x00, 0x01 } },
+    { 16777216, 8388607, 8388607, 4, { 0x01, 0x00, 0x00, 0x00 } },
+    { 16777217, 8388608, 8388608, 4, { 0x01, 0x00, 0x00, 0x01 } },
+    { 4294967296, 2147483648, 2147483648, 4, { 0x00, 0x00, 0x00, 0x00 } },
+    { 4294967297, 2147483648, 2147483648, 4, { 0x00, 0x00, 0x00, 0x01 } },
 };
 
 static int test_wire_pkt_hdr_pn(int tidx)
@@ -1502,7 +1557,7 @@ static int test_wire_pkt_hdr_pn(int tidx)
         goto err;
 
     if (!TEST_true(ossl_quic_wire_decode_pkt_hdr_pn(buf, pn_len,
-                                                    t->rx_largest_pn, &res_pn)))
+            t->rx_largest_pn, &res_pn)))
         goto err;
 
     if (!TEST_uint64_t_eq(res_pn, t->pn))
@@ -1519,25 +1574,25 @@ static const QUIC_CONN_ID retry_orig_dcid = {
 };
 
 static const unsigned char retry_encoded[] = {
-  0xff,                                                 /* Long Header, Retry */
-  0x00, 0x00, 0x00, 0x01,                               /* Version 1 */
-  0x00,                                                 /* DCID */
-  0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID */
+    0xff, /* Long Header, Retry */
+    0x00, 0x00, 0x00, 0x01, /* Version 1 */
+    0x00, /* DCID */
+    0x08, 0xf0, 0x67, 0xa5, 0x50, 0x2a, 0x42, 0x62, 0xb5, /* SCID */
 
-  /* Retry Token */
-  0x74, 0x6f, 0x6b, 0x65, 0x6e,
+    /* Retry Token */
+    0x74, 0x6f, 0x6b, 0x65, 0x6e,
 
-  /* Retry Integrity Tag */
-  0x04, 0xa2, 0x65, 0xba, 0x2e, 0xff, 0x4d, 0x82, 0x90, 0x58, 0xfb, 0x3f, 0x0f,
-  0x24, 0x96, 0xba
+    /* Retry Integrity Tag */
+    0x04, 0xa2, 0x65, 0xba, 0x2e, 0xff, 0x4d, 0x82, 0x90, 0x58, 0xfb, 0x3f, 0x0f,
+    0x24, 0x96, 0xba
 };
 
 static int test_wire_retry_integrity_tag(void)
 {
     int testresult = 0;
-    PACKET pkt = {0};
-    QUIC_PKT_HDR hdr = {0};
-    unsigned char got_tag[QUIC_RETRY_INTEGRITY_TAG_LEN] = {0};
+    PACKET pkt = { 0 };
+    QUIC_PKT_HDR hdr = { 0 };
+    unsigned char got_tag[QUIC_RETRY_INTEGRITY_TAG_LEN] = { 0 };
 
     if (!TEST_true(PACKET_buf_init(&pkt, retry_encoded, sizeof(retry_encoded))))
         goto err;
@@ -1549,18 +1604,18 @@ static int test_wire_retry_integrity_tag(void)
         goto err;
 
     if (!TEST_true(ossl_quic_calculate_retry_integrity_tag(NULL, NULL, &hdr,
-                                                           &retry_orig_dcid,
-                                                           got_tag)))
+            &retry_orig_dcid,
+            got_tag)))
         goto err;
 
     if (!TEST_mem_eq(got_tag, sizeof(got_tag),
-                     retry_encoded + sizeof(retry_encoded)
-                        - QUIC_RETRY_INTEGRITY_TAG_LEN,
-                     QUIC_RETRY_INTEGRITY_TAG_LEN))
+            retry_encoded + sizeof(retry_encoded)
+                - QUIC_RETRY_INTEGRITY_TAG_LEN,
+            QUIC_RETRY_INTEGRITY_TAG_LEN))
         goto err;
 
     if (!TEST_true(ossl_quic_validate_retry_integrity_tag(NULL, NULL, &hdr,
-                                                          &retry_orig_dcid)))
+            &retry_orig_dcid)))
         goto err;
 
     testresult = 1;
@@ -1570,19 +1625,27 @@ static int test_wire_retry_integrity_tag(void)
 
 /* is_minimal=0 test */
 static const unsigned char non_minimal_1[] = {
-    0x40, 0x00,
+    0x40,
+    0x00,
 };
 
 static const unsigned char non_minimal_2[] = {
-    0x40, 0x3F,
+    0x40,
+    0x3F,
 };
 
 static const unsigned char non_minimal_3[] = {
-    0x80, 0x00, 0x00, 0x00,
+    0x80,
+    0x00,
+    0x00,
+    0x00,
 };
 
 static const unsigned char non_minimal_4[] = {
-    0x80, 0x00, 0x3F, 0xFF,
+    0x80,
+    0x00,
+    0x3F,
+    0xFF,
 };
 
 static const unsigned char non_minimal_5[] = {
@@ -1619,11 +1682,11 @@ static int test_wire_minimal(int idx)
     PACKET pkt;
 
     if (!TEST_true(PACKET_buf_init(&pkt, non_minimal[idx],
-                                   non_minimal_len[idx])))
+            non_minimal_len[idx])))
         goto err;
 
     if (!TEST_true(ossl_quic_wire_peek_frame_header(&pkt, &frame_type,
-                                                    &is_minimal)))
+            &is_minimal)))
         goto err;
 
     if (!TEST_false(is_minimal))
@@ -1636,10 +1699,10 @@ static int test_wire_minimal(int idx)
 
 int setup_tests(void)
 {
-    ADD_ALL_TESTS(test_wire_encode,     OSSL_NELEM(encode_cases));
-    ADD_ALL_TESTS(test_wire_ack,        OSSL_NELEM(ack_cases));
+    ADD_ALL_TESTS(test_wire_encode, OSSL_NELEM(encode_cases));
+    ADD_ALL_TESTS(test_wire_ack, OSSL_NELEM(ack_cases));
     ADD_ALL_TESTS(test_wire_pkt_hdr_pn, OSSL_NELEM(pn_tests));
     ADD_TEST(test_wire_retry_integrity_tag);
-    ADD_ALL_TESTS(test_wire_minimal,    OSSL_NELEM(non_minimal_len));
+    ADD_ALL_TESTS(test_wire_minimal, OSSL_NELEM(non_minimal_len));
     return 1;
 }
diff --git a/test/quicapitest.c b/test/quicapitest.c
index 4782479cc6494..6b9ee8e69ad8c 100644
--- a/test/quicapitest.c
+++ b/test/quicapitest.c
@@ -34,11 +34,11 @@ static char *datadir = NULL;
 static int is_fips = 0;
 
 /* The ssltrace test assumes some options are switched on/off */
-#if !defined(OPENSSL_NO_SSL_TRACE) \
+#if !defined(OPENSSL_NO_SSL_TRACE)                            \
     && defined(OPENSSL_NO_BROTLI) && defined(OPENSSL_NO_ZSTD) \
-    && !defined(OPENSSL_NO_ECX) && !defined(OPENSSL_NO_DH) \
+    && !defined(OPENSSL_NO_ECX) && !defined(OPENSSL_NO_DH)    \
     && !defined(OPENSSL_NO_ML_DSA) && !defined(OPENSSL_NO_ML_KEM)
-# define DO_SSL_TRACE_TEST
+#define DO_SSL_TRACE_TEST
 #endif
 
 /*
@@ -67,14 +67,14 @@ static int test_quic_write_read(int idx)
 
     for (k = 0; k < 2; k++) {
         if (!TEST_ptr(cctx)
-                || !TEST_true(qtest_create_quic_objects(libctx, cctx, sctx,
-                                                        cert, privkey,
-                                                        idx >= 1
-                                                            ? QTEST_FLAG_BLOCK
-                                                            : 0,
-                                                        &qtserv, &clientquic,
-                                                        NULL, NULL))
-                || !TEST_true(SSL_set_tlsext_host_name(clientquic, "localhost")))
+            || !TEST_true(qtest_create_quic_objects(libctx, cctx, sctx,
+                cert, privkey,
+                idx >= 1
+                    ? QTEST_FLAG_BLOCK
+                    : 0,
+                &qtserv, &clientquic,
+                NULL, NULL))
+            || !TEST_true(SSL_set_tlsext_host_name(clientquic, "localhost")))
             goto end;
 
         if (sess != NULL && !TEST_true(SSL_set_session(clientquic, sess)))
@@ -85,7 +85,7 @@ static int test_quic_write_read(int idx)
 
         if (idx >= 1) {
             if (!TEST_true(BIO_get_fd(ossl_quic_tserver_get0_rbio(qtserv),
-                                      &ssock)))
+                    &ssock)))
                 goto end;
             if (!TEST_int_gt(csock = SSL_get_rfd(clientquic), 0))
                 goto end;
@@ -106,8 +106,8 @@ static int test_quic_write_read(int idx)
                     ossl_quic_tserver_tick(qtserv);
 
                     if (!TEST_true(ossl_quic_tserver_read(qtserv, sid, buf,
-                                                          sizeof(buf),
-                                                          &numbytes)))
+                            sizeof(buf),
+                            &numbytes)))
                         goto end;
                 } while (numbytes == 0);
 
@@ -121,43 +121,43 @@ static int test_quic_write_read(int idx)
 
             ossl_quic_tserver_tick(qtserv);
             if (!TEST_true(ossl_quic_tserver_write(qtserv, sid,
-                                                   (unsigned char *)msg,
-                                                   msglen, &numbytes)))
+                    (unsigned char *)msg,
+                    msglen, &numbytes)))
                 goto end;
             ossl_quic_tserver_tick(qtserv);
             SSL_handle_events(clientquic);
 
             if (idx >= 2 && j > 0) {
                 if (!TEST_false(SSL_read_ex(clientquic, buf, 1, &numbytes))
-                        || !TEST_int_eq(SSL_get_error(clientquic, 0),
-                                        SSL_ERROR_SYSCALL)
-                        || !TEST_false(SSL_write_ex(clientquic, msg, msglen,
-                                                    &numbytes))
-                        || !TEST_int_eq(SSL_get_error(clientquic, 0),
-                                        SSL_ERROR_SYSCALL))
+                    || !TEST_int_eq(SSL_get_error(clientquic, 0),
+                        SSL_ERROR_SYSCALL)
+                    || !TEST_false(SSL_write_ex(clientquic, msg, msglen,
+                        &numbytes))
+                    || !TEST_int_eq(SSL_get_error(clientquic, 0),
+                        SSL_ERROR_SYSCALL))
                     goto end;
                 break;
             }
 
             /*
-            * In blocking mode the SSL_read_ex call will block until the socket
-            * is readable and has our data. In non-blocking mode we're doing
-            * everything in memory, so it should be immediately available
-            */
+             * In blocking mode the SSL_read_ex call will block until the socket
+             * is readable and has our data. In non-blocking mode we're doing
+             * everything in memory, so it should be immediately available
+             */
             if (!TEST_true(SSL_read_ex(clientquic, buf, 1, &numbytes))
-                    || !TEST_size_t_eq(numbytes, 1)
-                    || !TEST_true(SSL_has_pending(clientquic))
-                    || !TEST_int_eq(SSL_pending(clientquic), msglen - 1)
-                    || !TEST_true(SSL_read_ex(clientquic, buf + 1,
-                                              sizeof(buf) - 1, &numbytes))
-                    || !TEST_mem_eq(buf, numbytes + 1, msg, msglen))
+                || !TEST_size_t_eq(numbytes, 1)
+                || !TEST_true(SSL_has_pending(clientquic))
+                || !TEST_int_eq(SSL_pending(clientquic), msglen - 1)
+                || !TEST_true(SSL_read_ex(clientquic, buf + 1,
+                    sizeof(buf) - 1, &numbytes))
+                || !TEST_mem_eq(buf, numbytes + 1, msg, msglen))
                 goto end;
         }
 
         /* Test that exporters work. */
         if (!TEST_true(SSL_export_keying_material(clientquic, scratch,
-                        sizeof(scratch), "test", 4, (unsigned char *)"ctx", 3,
-                        1)))
+                sizeof(scratch), "test", 4, (unsigned char *)"ctx", 3,
+                1)))
             goto end;
 
         if (sess == NULL) {
@@ -195,7 +195,7 @@ static int test_quic_write_read(int idx)
 
     ret = 1;
 
- end:
+end:
     SSL_SESSION_free(sess);
     ossl_quic_tserver_free(qtserv);
     SSL_free(clientquic);
@@ -226,29 +226,28 @@ static int test_fin_only_blocking(void)
         return TEST_skip("Blocking tests not supported in this build");
 
     if (!TEST_ptr(cctx)
-            || !TEST_true(qtest_create_quic_objects(libctx, cctx, sctx,
-                                                    cert, privkey,
-                                                    QTEST_FLAG_BLOCK,
-                                                    &qtserv, &clientquic,
-                                                    NULL, NULL))
-            || !TEST_true(SSL_set_tlsext_host_name(clientquic, "localhost")))
+        || !TEST_true(qtest_create_quic_objects(libctx, cctx, sctx,
+            cert, privkey,
+            QTEST_FLAG_BLOCK,
+            &qtserv, &clientquic,
+            NULL, NULL))
+        || !TEST_true(SSL_set_tlsext_host_name(clientquic, "localhost")))
         goto end;
 
     if (!TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
         goto end;
 
     if (!TEST_true(ossl_quic_tserver_stream_new(qtserv, 0, &sid))
-            || !TEST_true(ossl_quic_tserver_write(qtserv, sid,
-                                                  (unsigned char *)msg,
-                                                  strlen(msg), &numbytes))
-            || !TEST_size_t_eq(strlen(msg), numbytes))
+        || !TEST_true(ossl_quic_tserver_write(qtserv, sid,
+            (unsigned char *)msg,
+            strlen(msg), &numbytes))
+        || !TEST_size_t_eq(strlen(msg), numbytes))
         goto end;
 
     ossl_quic_tserver_tick(qtserv);
 
     if (!TEST_true(SSL_read_ex(clientquic, buf, sizeof(buf), &numbytes))
-            || !TEST_mem_eq(msg, strlen(msg), buf, numbytes))
-
+        || !TEST_mem_eq(msg, strlen(msg), buf, numbytes))
 
         goto end;
 
@@ -261,11 +260,11 @@ static int test_fin_only_blocking(void)
     timediff = ossl_time_subtract(ossl_time_now(), timer);
 
     if (!TEST_int_eq(SSL_get_error(clientquic, 0), SSL_ERROR_ZERO_RETURN)
-               /*
-                * We expect the SSL_read_ex to not have blocked so this should
-                * be very fast. 40ms should be plenty.
-                */
-            || !TEST_uint64_t_le(ossl_time2ms(timediff), 40))
+        /*
+         * We expect the SSL_read_ex to not have blocked so this should
+         * be very fast. 40ms should be plenty.
+         */
+        || !TEST_uint64_t_le(ossl_time2ms(timediff), 40))
         goto end;
 
     if (!TEST_true(qtest_shutdown(qtserv, clientquic)))
@@ -273,7 +272,7 @@ static int test_fin_only_blocking(void)
 
     ret = 1;
 
- end:
+end:
     ossl_quic_tserver_free(qtserv);
     SSL_free(clientquic);
     SSL_CTX_free(cctx);
@@ -334,7 +333,7 @@ static int test_ciphersuites(void)
         goto err;
 
     testresult = 1;
- err:
+err:
     SSL_free(ssl);
     SSL_CTX_free(ctx);
 
@@ -348,7 +347,7 @@ static int test_cipher_find(void)
     struct {
         const unsigned char *cipherbytes;
         int ok;
-    } testciphers[]  = {
+    } testciphers[] = {
         { TLS13_AES_128_GCM_SHA256_BYTES, 1 },
         { TLS13_AES_256_GCM_SHA384_BYTES, 1 },
         { TLS13_CHACHA20_POLY1305_SHA256_BYTES, 1 },
@@ -372,16 +371,16 @@ static int test_cipher_find(void)
     for (i = 0; i < OSSL_NELEM(testciphers); i++)
         if (testciphers[i].ok) {
             if (!TEST_ptr(SSL_CIPHER_find(clientquic,
-                                          testciphers[i].cipherbytes)))
+                    testciphers[i].cipherbytes)))
                 goto err;
         } else {
             if (!TEST_ptr_null(SSL_CIPHER_find(clientquic,
-                                               testciphers[i].cipherbytes)))
+                    testciphers[i].cipherbytes)))
                 goto err;
         }
 
     testresult = 1;
- err:
+err:
     SSL_free(clientquic);
     SSL_CTX_free(cctx);
 
@@ -402,24 +401,23 @@ static int test_version(void)
     int testresult = 0;
 
     if (!TEST_ptr(cctx)
-            || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
-                                                    privkey, 0, &qtserv,
-                                                    &clientquic, NULL, NULL))
-            || !TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
+        || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
+            privkey, 0, &qtserv,
+            &clientquic, NULL, NULL))
+        || !TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
         goto err;
 
     if (!TEST_int_eq(SSL_version(clientquic), OSSL_QUIC1_VERSION)
-            || !TEST_str_eq(SSL_get_version(clientquic), "QUICv1"))
+        || !TEST_str_eq(SSL_get_version(clientquic), "QUICv1"))
         goto err;
 
     if (!TEST_true(SSL_is_quic(clientquic))
-            || !TEST_false(SSL_is_tls(clientquic))
-            || !TEST_false(SSL_is_dtls(clientquic)))
+        || !TEST_false(SSL_is_tls(clientquic))
+        || !TEST_false(SSL_is_dtls(clientquic)))
         goto err;
 
-
     testresult = 1;
- err:
+err:
     ossl_quic_tserver_free(qtserv);
     SSL_free(clientquic);
     SSL_CTX_free(cctx);
@@ -428,91 +426,6 @@ static int test_version(void)
 }
 
 #if defined(DO_SSL_TRACE_TEST)
-static void strip_line_ends(char *str)
-{
-    size_t i;
-
-    for (i = strlen(str);
-         i > 0 && (str[i - 1] == '\n' || str[i - 1] == '\r');
-         i--);
-
-    str[i] = '\0';
-}
-
-static int compare_with_file(BIO *membio)
-{
-    BIO *file = NULL, *newfile = NULL;
-    char buf1[8192], buf2[8192];
-    char *reffile;
-    int ret = 0;
-    size_t i;
-
-#ifdef OPENSSL_NO_ZLIB
-    reffile = test_mk_file_path(datadir, "ssltraceref.txt");
-#else
-    reffile = test_mk_file_path(datadir, "ssltraceref-zlib.txt");
-#endif
-    if (!TEST_ptr(reffile))
-        goto err;
-
-    file = BIO_new_file(reffile, "rb");
-    if (!TEST_ptr(file))
-        goto err;
-
-    newfile = BIO_new_file("ssltraceref-new.txt", "wb");
-    if (!TEST_ptr(newfile))
-        goto err;
-
-    while (BIO_gets(membio, buf2, sizeof(buf2)) > 0)
-        if (BIO_puts(newfile, buf2) <= 0) {
-            TEST_error("Failed writing new file data");
-            goto err;
-        }
-
-    if (!TEST_int_ge(BIO_seek(membio, 0), 0))
-        goto err;
-
-    while (BIO_gets(file, buf1, sizeof(buf1)) > 0) {
-        size_t line_len;
-
-        if (BIO_gets(membio, buf2, sizeof(buf2)) <= 0) {
-            TEST_error("Failed reading mem data");
-            goto err;
-        }
-        strip_line_ends(buf1);
-        strip_line_ends(buf2);
-        line_len = strlen(buf1);
-        if (line_len > 0 && buf1[line_len - 1] == '?') {
-            /* Wildcard at the EOL means ignore anything after it */
-            if (strlen(buf2) > line_len)
-                buf2[line_len] = '\0';
-        }
-        if (line_len != strlen(buf2)) {
-            TEST_error("Actual and ref line data length mismatch");
-            TEST_info("%s", buf1);
-            TEST_info("%s", buf2);
-           goto err;
-        }
-        for (i = 0; i < line_len; i++) {
-            /* '?' is a wild card character in the reference text */
-            if (buf1[i] == '?')
-                buf2[i] = '?';
-        }
-        if (!TEST_str_eq(buf1, buf2))
-            goto err;
-    }
-    if (!TEST_true(BIO_eof(file))
-            || !TEST_true(BIO_eof(membio)))
-        goto err;
-
-    ret = 1;
- err:
-    OPENSSL_free(reffile);
-    BIO_free(file);
-    BIO_free(newfile);
-    return ret;
-}
-
 /*
  * Tests that the SSL_trace() msg_callback works as expected with a QUIC
  * connection. This also provides testing of the msg_callback at the same time.
@@ -524,15 +437,16 @@ static int test_ssl_trace(void)
     QUIC_TSERVER *qtserv = NULL;
     int testresult = 0;
     BIO *bio = NULL;
+    char *reffile = NULL;
 
     if (!TEST_ptr(cctx = SSL_CTX_new_ex(libctx, NULL, OSSL_QUIC_client_method()))
-            || !TEST_ptr(bio = BIO_new(BIO_s_mem()))
-            || !TEST_true(SSL_CTX_set_ciphersuites(cctx, "TLS_AES_128_GCM_SHA256"))
-            || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
-                                                    privkey,
-                                                    QTEST_FLAG_FAKE_TIME,
-                                                    &qtserv,
-                                                    &clientquic, NULL, NULL)))
+        || !TEST_ptr(bio = BIO_new(BIO_s_mem()))
+        || !TEST_true(SSL_CTX_set_ciphersuites(cctx, "TLS_AES_128_GCM_SHA256"))
+        || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
+            privkey,
+            QTEST_FLAG_FAKE_TIME,
+            &qtserv,
+            &clientquic, NULL, NULL)))
         goto err;
 
     SSL_set_msg_callback(clientquic, SSL_trace);
@@ -547,16 +461,23 @@ static int test_ssl_trace(void)
         if (!TEST_int_gt(BIO_pending(bio), 0))
             goto err;
     } else {
-        if (!TEST_true(compare_with_file(bio)))
+
+#ifdef OPENSSL_NO_ZLIB
+        reffile = test_mk_file_path(datadir, "ssltraceref.txt");
+#else
+        reffile = test_mk_file_path(datadir, "ssltraceref-zlib.txt");
+#endif
+        if (!TEST_true(compare_with_reference_file(bio, reffile)))
             goto err;
     }
 
     testresult = 1;
- err:
+err:
     ossl_quic_tserver_free(qtserv);
     SSL_free(clientquic);
     SSL_CTX_free(cctx);
     BIO_free(bio);
+    OPENSSL_free(reffile);
 
     return testresult;
 }
@@ -594,8 +515,8 @@ static int find_new_token_data(BIO *membio)
      */
 
     while (state != SUCCESS
-           && state != FAILED
-           && BIO_gets(membio, buf, sizeof(buf)) > 0) {
+        && state != FAILED
+        && BIO_gets(membio, buf, sizeof(buf)) > 0) {
         switch (state) {
         case INITIAL:
             if (strstr(buf, "Received Frame: New token"))
@@ -645,10 +566,10 @@ static int test_new_token(void)
     if (!TEST_ptr(cctx = SSL_CTX_new_ex(libctx, NULL, OSSL_QUIC_client_method()))
         || !TEST_ptr(bio = BIO_new(BIO_s_mem()))
         || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
-                                                privkey,
-                                                QTEST_FLAG_FAKE_TIME,
-                                                &qtserv,
-                                                &clientquic, NULL, NULL)))
+            privkey,
+            QTEST_FLAG_FAKE_TIME,
+            &qtserv,
+            &clientquic, NULL, NULL)))
 
         goto err;
 
@@ -669,10 +590,10 @@ static int test_new_token(void)
     ossl_quic_tserver_tick(qtserv);
 
     if (!TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
-                                             privkey,
-                                             QTEST_FLAG_FAKE_TIME,
-                                             &qtserv2,
-                                             &clientquic2, NULL, NULL)))
+            privkey,
+            QTEST_FLAG_FAKE_TIME,
+            &qtserv2,
+            &clientquic2, NULL, NULL)))
         goto err;
 
     SSL_set_msg_callback(clientquic2, SSL_trace);
@@ -687,7 +608,7 @@ static int test_new_token(void)
         goto err;
 
     testresult = 1;
- err:
+err:
     ossl_quic_tserver_free(qtserv);
     ossl_quic_tserver_free(qtserv2);
     SSL_free(clientquic);
@@ -707,13 +628,13 @@ static int ensure_valid_ciphers(const STACK_OF(SSL_CIPHER) *ciphers)
     for (i = 0; i < (size_t)sk_SSL_CIPHER_num(ciphers); ++i) {
         const SSL_CIPHER *cipher = sk_SSL_CIPHER_value(ciphers, i);
         switch (SSL_CIPHER_get_id(cipher)) {
-            case TLS1_3_CK_AES_128_GCM_SHA256:
-            case TLS1_3_CK_AES_256_GCM_SHA384:
-            case TLS1_3_CK_CHACHA20_POLY1305_SHA256:
-                break;
-            default:
-                TEST_error("forbidden cipher: %s", SSL_CIPHER_get_name(cipher));
-                return 0;
+        case TLS1_3_CK_AES_128_GCM_SHA256:
+        case TLS1_3_CK_AES_256_GCM_SHA384:
+        case TLS1_3_CK_CHACHA20_POLY1305_SHA256:
+            break;
+        default:
+            TEST_error("forbidden cipher: %s", SSL_CIPHER_get_name(cipher));
+            return 0;
         }
     }
 
@@ -740,22 +661,21 @@ static int test_quic_forbidden_apis_ctx(void)
     /*
      * List of ciphersuites we do and don't allow in QUIC.
      */
-#define QUIC_CIPHERSUITES \
-    "TLS_AES_128_GCM_SHA256:"           \
-    "TLS_AES_256_GCM_SHA384:"           \
+#define QUIC_CIPHERSUITES     \
+    "TLS_AES_128_GCM_SHA256:" \
+    "TLS_AES_256_GCM_SHA384:" \
     "TLS_CHACHA20_POLY1305_SHA256"
 
-#define NON_QUIC_CIPHERSUITES           \
-    "TLS_AES_128_CCM_SHA256:"           \
-    "TLS_AES_256_CCM_SHA384:"           \
-    "TLS_AES_128_CCM_8_SHA256:"         \
-    "TLS_SHA256_SHA256:"                \
+#define NON_QUIC_CIPHERSUITES   \
+    "TLS_AES_128_CCM_SHA256:"   \
+    "TLS_AES_256_CCM_SHA384:"   \
+    "TLS_AES_128_CCM_8_SHA256:" \
+    "TLS_SHA256_SHA256:"        \
     "TLS_SHA384_SHA384"
 
     /* Set TLSv1.3 ciphersuite list for the SSL_CTX. */
     if (!TEST_true(SSL_CTX_set_ciphersuites(ctx,
-                                            QUIC_CIPHERSUITES ":"
-                                            NON_QUIC_CIPHERSUITES)))
+            QUIC_CIPHERSUITES ":" NON_QUIC_CIPHERSUITES)))
         goto err;
 
     /*
@@ -791,8 +711,7 @@ static int test_quic_forbidden_apis(void)
 
     /* Set TLSv1.3 ciphersuite list for the SSL_CTX. */
     if (!TEST_true(SSL_set_ciphersuites(ssl,
-                                        QUIC_CIPHERSUITES ":"
-                                        NON_QUIC_CIPHERSUITES)))
+            QUIC_CIPHERSUITES ":" NON_QUIC_CIPHERSUITES)))
         goto err;
 
     /* Non-QUIC ciphersuites must not appear in supported ciphers list. */
@@ -891,7 +810,7 @@ static int test_quic_forbidden_options(void)
         goto err;
 
     /* HRR */
-    if  (!TEST_false(SSL_stateless(ssl)))
+    if (!TEST_false(SSL_stateless(ssl)))
         goto err;
 
     /* Quiet Shutdown */
@@ -969,7 +888,7 @@ static int test_quic_set_fd(int idx)
     return testresult;
 }
 
-#define MAXLOOPS    1000
+#define MAXLOOPS 1000
 
 static int test_bio_ssl(void)
 {
@@ -1005,8 +924,8 @@ static int test_bio_ssl(void)
         goto err;
 
     if (!TEST_true(qtest_create_quic_objects(libctx, NULL, NULL, cert, privkey,
-                                             QTEST_FLAG_FAKE_TIME, &qtserv,
-                                             &clientquic, NULL, NULL)))
+            QTEST_FLAG_FAKE_TIME, &qtserv,
+            &clientquic, NULL, NULL)))
         goto err;
 
     msglen = strlen(msg);
@@ -1052,17 +971,17 @@ static int test_bio_ssl(void)
      */
     for (i = 0, thisbio = cbio; i < 2; i++) {
         if (!TEST_true(ossl_quic_tserver_read(qtserv, sid, buf, sizeof(buf),
-                                              &readbytes))
-                || !TEST_mem_eq(msg, msglen, buf, readbytes))
+                &readbytes))
+            || !TEST_mem_eq(msg, msglen, buf, readbytes))
             goto err;
 
         if (!TEST_true(ossl_quic_tserver_write(qtserv, sid, (unsigned char *)msg,
-                                               msglen, &written)))
+                msglen, &written)))
             goto err;
         ossl_quic_tserver_tick(qtserv);
 
         if (!TEST_true(BIO_read_ex(thisbio, buf, sizeof(buf), &readbytes))
-                || !TEST_mem_eq(msg, msglen, buf, readbytes))
+            || !TEST_mem_eq(msg, msglen, buf, readbytes))
             goto err;
 
         if (i == 1)
@@ -1100,7 +1019,7 @@ static int test_bio_ssl(void)
     }
 
     testresult = 1;
- err:
+err:
     BIO_free_all(cbio);
     BIO_free_all(strbio);
     SSL_free(stream);
@@ -1128,10 +1047,10 @@ static int test_back_pressure(void)
     int i;
 
     if (!TEST_ptr(cctx)
-            || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
-                                                    privkey, 0, &qtserv,
-                                                    &clientquic, NULL, NULL))
-            || !TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
+        || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
+            privkey, 0, &qtserv,
+            &clientquic, NULL, NULL))
+        || !TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
         goto err;
 
     msg = OPENSSL_malloc(msglen);
@@ -1157,7 +1076,7 @@ static int test_back_pressure(void)
         /* Receive data at the server */
         ossl_quic_tserver_tick(qtserv);
         if (!TEST_true(ossl_quic_tserver_read(qtserv, 0, buf, sizeof(buf),
-                                              &readbytes)))
+                &readbytes)))
             goto err;
     }
 
@@ -1167,7 +1086,7 @@ static int test_back_pressure(void)
     }
 
     testresult = 1;
- err:
+err:
     SSL_free(clientquic);
     ossl_quic_tserver_free(qtserv);
     SSL_CTX_free(cctx);
@@ -1176,11 +1095,10 @@ static int test_back_pressure(void)
     return testresult;
 }
 
-
 static int dgram_ctr = 0;
 
 static void dgram_cb(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)
 {
     if (!write_p)
         return;
@@ -1205,23 +1123,23 @@ static int test_multiple_dgrams(void)
     buf = OPENSSL_zalloc(buflen);
 
     if (!TEST_ptr(cctx)
-            || !TEST_ptr(buf)
-            || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
-                                                    privkey, 0, &qtserv,
-                                                    &clientquic, NULL, NULL))
-            || !TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
+        || !TEST_ptr(buf)
+        || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
+            privkey, 0, &qtserv,
+            &clientquic, NULL, NULL))
+        || !TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
         goto err;
 
     dgram_ctr = 0;
     SSL_set_msg_callback(clientquic, dgram_cb);
     if (!TEST_true(SSL_write_ex(clientquic, buf, buflen, &written))
-            || !TEST_size_t_eq(written, buflen)
-               /* We wrote enough data for 2 datagrams */
-            || !TEST_int_eq(dgram_ctr, 2))
+        || !TEST_size_t_eq(written, buflen)
+        /* We wrote enough data for 2 datagrams */
+        || !TEST_int_eq(dgram_ctr, 2))
         goto err;
 
     testresult = 1;
- err:
+err:
     OPENSSL_free(buf);
     SSL_free(clientquic);
     ossl_quic_tserver_free(qtserv);
@@ -1272,11 +1190,11 @@ static int test_non_io_retry(int idx)
 
     flags = (idx >= 1) ? QTEST_FLAG_BLOCK : 0;
     if (!TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert, privkey,
-                                             flags, &qtserv, &clientquic, NULL,
-                                             NULL))
-            || !TEST_true(qtest_create_quic_connection_ex(qtserv, clientquic,
-                            SSL_ERROR_WANT_RETRY_VERIFY))
-            || !TEST_int_eq(SSL_want(clientquic), SSL_RETRY_VERIFY))
+            flags, &qtserv, &clientquic, NULL,
+            NULL))
+        || !TEST_true(qtest_create_quic_connection_ex(qtserv, clientquic,
+            SSL_ERROR_WANT_RETRY_VERIFY))
+        || !TEST_int_eq(SSL_want(clientquic), SSL_RETRY_VERIFY))
         goto err;
 
     allow = 1;
@@ -1284,7 +1202,7 @@ static int test_non_io_retry(int idx)
         goto err;
 
     testresult = 1;
- err:
+err:
     SSL_free(clientquic);
     ossl_quic_tserver_free(qtserv);
     SSL_CTX_free(cctx);
@@ -1298,7 +1216,7 @@ static const char *pskid = "Identity";
 static SSL_SESSION *serverpsk = NULL, *clientpsk = NULL;
 
 static int use_session_cb(SSL *ssl, const EVP_MD *md, const unsigned char **id,
-                          size_t *idlen, SSL_SESSION **sess)
+    size_t *idlen, SSL_SESSION **sess)
 {
     use_session_cb_cnt++;
 
@@ -1313,7 +1231,7 @@ static int use_session_cb(SSL *ssl, const EVP_MD *md, const unsigned char **id,
 }
 
 static int find_session_cb(SSL *ssl, const unsigned char *identity,
-                           size_t identity_len, SSL_SESSION **sess)
+    size_t identity_len, SSL_SESSION **sess)
 {
     find_session_cb_cnt++;
 
@@ -1322,7 +1240,7 @@ static int find_session_cb(SSL *ssl, const unsigned char *identity,
 
     /* Identity should match that set by the client */
     if (strlen(pskid) != identity_len
-            || strncmp(pskid, (const char *)identity, identity_len) != 0) {
+        || strncmp(pskid, (const char *)identity, identity_len) != 0) {
         SSL_SESSION_free(serverpsk);
         return 0;
     }
@@ -1340,10 +1258,10 @@ static int test_quic_psk(void)
     int testresult = 0;
 
     if (!TEST_ptr(cctx)
-               /* No cert or private key for the server, i.e. PSK only */
-            || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, NULL,
-                                                    NULL, 0, &qtserv,
-                                                    &clientquic, NULL, NULL)))
+        /* No cert or private key for the server, i.e. PSK only */
+        || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, NULL,
+            NULL, 0, &qtserv,
+            &clientquic, NULL, NULL)))
         goto end;
 
     SSL_set_psk_use_session_callback(clientquic, use_session_cb);
@@ -1357,15 +1275,15 @@ static int test_quic_psk(void)
         goto end;
 
     if (!TEST_true(qtest_create_quic_connection(qtserv, clientquic))
-            || !TEST_int_eq(1, find_session_cb_cnt)
-            || !TEST_int_eq(1, use_session_cb_cnt)
-               /* Check that we actually used the PSK */
-            || !TEST_true(SSL_session_reused(clientquic)))
+        || !TEST_int_eq(1, find_session_cb_cnt)
+        || !TEST_int_eq(1, use_session_cb_cnt)
+        /* Check that we actually used the PSK */
+        || !TEST_true(SSL_session_reused(clientquic)))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(clientquic);
     ossl_quic_tserver_free(qtserv);
     SSL_CTX_free(cctx);
@@ -1391,8 +1309,7 @@ static int test_client_auth(int idx)
     if (!TEST_ptr(cctx) || !TEST_ptr(sctx))
         goto err;
 
-    SSL_CTX_set_verify(sctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT
-                             | SSL_VERIFY_CLIENT_ONCE, NULL);
+    SSL_CTX_set_verify(sctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE, NULL);
 
     if (!TEST_true(SSL_CTX_load_verify_file(sctx, cauthca)))
         goto err;
@@ -1400,12 +1317,12 @@ static int test_client_auth(int idx)
     if (idx > 0
         && (!TEST_true(SSL_CTX_use_certificate_chain_file(cctx, ccert))
             || !TEST_true(SSL_CTX_use_PrivateKey_file(cctx, cprivkey,
-                                                      SSL_FILETYPE_PEM))))
-            goto err;
+                SSL_FILETYPE_PEM))))
+        goto err;
 
     if (!TEST_true(qtest_create_quic_objects(libctx, cctx, sctx, cert,
-                                             privkey, 0, &qtserv,
-                                             &clientquic, NULL, NULL)))
+            privkey, 0, &qtserv,
+            &clientquic, NULL, NULL)))
         goto err;
 
     if (idx > 1) {
@@ -1433,16 +1350,16 @@ static int test_client_auth(int idx)
 
     ossl_quic_tserver_tick(qtserv);
     if (!TEST_true(ossl_quic_tserver_write(qtserv, 0,
-                                           (unsigned char *)msg,
-                                           msglen, &numbytes)))
+            (unsigned char *)msg,
+            msglen, &numbytes)))
         goto err;
 
     ossl_quic_tserver_tick(qtserv);
     SSL_handle_events(clientquic);
 
     if (!TEST_true(SSL_read_ex(clientquic, buf, sizeof(buf), &numbytes))
-            || !TEST_size_t_eq(numbytes, msglen)
-            || !TEST_mem_eq(buf, numbytes, msg, msglen))
+        || !TEST_size_t_eq(numbytes, msglen)
+        || !TEST_mem_eq(buf, numbytes, msg, msglen))
         goto err;
 
     if (!TEST_true(qtest_shutdown(qtserv, clientquic)))
@@ -1450,7 +1367,7 @@ static int test_client_auth(int idx)
 
     testresult = 1;
 
- err:
+err:
     SSL_free(clientquic);
     ossl_quic_tserver_free(qtserv);
     SSL_CTX_free(sctx);
@@ -1480,18 +1397,18 @@ static int test_alpn(int idx)
         goto err;
 
     if (!TEST_ptr(cctx)
-            || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
-                                                    privkey,
-                                                    QTEST_FLAG_FAKE_TIME,
-                                                    &qtserv,
-                                                    &clientquic, NULL, NULL)))
+        || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
+            privkey,
+            QTEST_FLAG_FAKE_TIME,
+            &qtserv,
+            &clientquic, NULL, NULL)))
         goto err;
 
     if (idx == 0) {
         /*
-        * Clear the ALPN we set in qtest_create_quic_objects. We use TEST_false
-        * because SSL_set_alpn_protos returns 0 for success.
-        */
+         * Clear the ALPN we set in qtest_create_quic_objects. We use TEST_false
+         * because SSL_set_alpn_protos returns 0 for success.
+         */
         if (!TEST_false(SSL_set_alpn_protos(clientquic, NULL, 0)))
             goto err;
     }
@@ -1506,12 +1423,12 @@ static int test_alpn(int idx)
     } else {
         /* ALPN was provided so we expect the connection to succeed */
         if (!TEST_int_eq(SSL_get_error(clientquic, ret), SSL_ERROR_WANT_READ)
-                || !TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
+            || !TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
             goto err;
     }
 
     testresult = 1;
- err:
+err:
     ossl_quic_tserver_free(qtserv);
     SSL_free(clientquic);
     SSL_CTX_free(cctx);
@@ -1530,12 +1447,12 @@ static int test_get_shutdown(void)
     int testresult = 0;
 
     if (!TEST_ptr(cctx)
-            || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
-                                                    privkey,
-                                                    QTEST_FLAG_FAKE_TIME,
-                                                    &qtserv, &clientquic,
-                                                    NULL, NULL))
-            || !TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
+        || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
+            privkey,
+            QTEST_FLAG_FAKE_TIME,
+            &qtserv, &clientquic,
+            NULL, NULL))
+        || !TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
         goto err;
 
     if (!TEST_int_eq(SSL_get_shutdown(clientquic), 0))
@@ -1553,11 +1470,11 @@ static int test_get_shutdown(void)
     } while (SSL_shutdown(clientquic) == 0);
 
     if (!TEST_int_eq(SSL_get_shutdown(clientquic),
-                     SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN))
+            SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN))
         goto err;
 
     testresult = 1;
- err:
+err:
     ossl_quic_tserver_free(qtserv);
     SSL_free(clientquic);
     SSL_CTX_free(cctx);
@@ -1565,15 +1482,15 @@ static int test_get_shutdown(void)
     return testresult;
 }
 
-#define MAX_LOOPS   2000
+#define MAX_LOOPS 2000
 
 /*
  * Keep retrying SSL_read_ex until it succeeds or we give up. Accept a stream
  * if we don't already have one
  */
 static int unreliable_client_read(SSL *clientquic, SSL **stream, void *buf,
-                                  size_t buflen, size_t *readbytes,
-                                  QUIC_TSERVER *qtserv)
+    size_t buflen, size_t *readbytes,
+    QUIC_TSERVER *qtserv)
 {
     int abortctr;
 
@@ -1601,15 +1518,15 @@ static int unreliable_client_read(SSL *clientquic, SSL **stream, void *buf,
 
 /* Keep retrying ossl_quic_tserver_read until it succeeds or we give up */
 static int unreliable_server_read(QUIC_TSERVER *qtserv, uint64_t sid,
-                                  void *buf, size_t buflen, size_t *readbytes,
-                                  SSL *clientquic)
+    void *buf, size_t buflen, size_t *readbytes,
+    SSL *clientquic)
 {
     int abortctr;
 
     /* We just do this in a loop with a sleep for simplicity */
     for (abortctr = 0; abortctr < MAX_LOOPS; abortctr++) {
         if (ossl_quic_tserver_read(qtserv, sid, buf, buflen, readbytes)
-                && *readbytes > 1)
+            && *readbytes > 1)
             return 1;
         ossl_quic_tserver_tick(qtserv);
         SSL_handle_events(clientquic);
@@ -1646,20 +1563,20 @@ static int test_noisy_dgram(int idx)
         flags |= QTEST_FLAG_PACKET_SPLIT;
 
     if (!TEST_ptr(cctx)
-            || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
-                                                    privkey, flags,
-                                                    &qtserv,
-                                                    &clientquic, &fault, NULL)))
+        || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
+            privkey, flags,
+            &qtserv,
+            &clientquic, &fault, NULL)))
         goto err;
 
     if (!TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
-            goto err;
+        goto err;
 
     if (!TEST_true(SSL_set_incoming_stream_policy(clientquic,
-                                                  SSL_INCOMING_STREAM_POLICY_ACCEPT,
-                                                  0))
-            || !TEST_true(SSL_set_default_stream_mode(clientquic,
-                                                      SSL_DEFAULT_STREAM_MODE_NONE)))
+            SSL_INCOMING_STREAM_POLICY_ACCEPT,
+            0))
+        || !TEST_true(SSL_set_default_stream_mode(clientquic,
+            SSL_DEFAULT_STREAM_MODE_NONE)))
         goto err;
 
     for (j = 0; j < 2; j++) {
@@ -1675,9 +1592,9 @@ static int test_noisy_dgram(int idx)
          */
         for (i = 0; i < 20; i++) {
             if (!TEST_true(ossl_quic_tserver_write(qtserv, sid,
-                                                   (unsigned char *)msg, msglen,
-                                                   &written))
-                    || !TEST_size_t_eq(msglen, written))
+                    (unsigned char *)msg, msglen,
+                    &written))
+                || !TEST_size_t_eq(msglen, written))
                 goto err;
             ossl_quic_tserver_tick(qtserv);
             qtest_add_time(1);
@@ -1688,17 +1605,17 @@ static int test_noisy_dgram(int idx)
              * handle that
              */
             if (!TEST_true(unreliable_client_read(clientquic, &stream[j], buf,
-                                                  sizeof(buf), &readbytes,
-                                                  qtserv))
-                    || !TEST_mem_eq(msg, msglen, buf, readbytes))
+                    sizeof(buf), &readbytes,
+                    qtserv))
+                || !TEST_mem_eq(msg, msglen, buf, readbytes))
                 goto err;
         }
 
         /* Send data from the client to the server */
         for (i = 0; i < 20; i++) {
             if (!TEST_true(SSL_write_ex(stream[j], (unsigned char *)msg,
-                                        msglen, &written))
-                    || !TEST_size_t_eq(msglen, written))
+                    msglen, &written))
+                || !TEST_size_t_eq(msglen, written))
                 goto err;
 
             ossl_quic_tserver_tick(qtserv);
@@ -1710,14 +1627,14 @@ static int test_noisy_dgram(int idx)
              * handle that
              */
             if (!TEST_true(unreliable_server_read(qtserv, sid, buf, sizeof(buf),
-                                                  &readbytes, clientquic))
-                    || !TEST_mem_eq(msg, msglen, buf, readbytes))
+                    &readbytes, clientquic))
+                || !TEST_mem_eq(msg, msglen, buf, readbytes))
                 goto err;
         }
     }
 
     testresult = 1;
- err:
+err:
     ossl_quic_tserver_free(qtserv);
     SSL_free(stream[0]);
     SSL_free(stream[1]);
@@ -1732,9 +1649,9 @@ static int test_noisy_dgram(int idx)
  * Create a connection and send some big data using a transport with limited bandwidth.
  */
 
-#define TEST_TRANSFER_DATA_SIZE (2*1024*1024)    /* 2 MBytes */
-#define TEST_SINGLE_WRITE_SIZE (16*1024)        /* 16 kBytes */
-#define TEST_BW_LIMIT 1000                      /* 1000 Bytes/ms */
+#define TEST_TRANSFER_DATA_SIZE (2 * 1024 * 1024) /* 2 MBytes */
+#define TEST_SINGLE_WRITE_SIZE (16 * 1024) /* 16 kBytes */
+#define TEST_BW_LIMIT 1000 /* 1000 Bytes/ms */
 static int test_bw_limit(void)
 {
     SSL_CTX *cctx = SSL_CTX_new_ex(libctx, NULL, OSSL_QUIC_client_method());
@@ -1750,10 +1667,10 @@ static int test_bw_limit(void)
     uint64_t real_bw;
 
     if (!TEST_ptr(cctx)
-            || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
-                                                    privkey, flags,
-                                                    &qtserv,
-                                                    &clientquic, &fault, NULL)))
+        || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
+            privkey, flags,
+            &qtserv,
+            &clientquic, &fault, NULL)))
         goto err;
 
     if (!TEST_ptr(msg = OPENSSL_zalloc(TEST_SINGLE_WRITE_SIZE))
@@ -1765,7 +1682,7 @@ static int test_bw_limit(void)
         goto err;
 
     if (!TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
-            goto err;
+        goto err;
 
     qtest_start_stopwatch();
 
@@ -1774,42 +1691,42 @@ static int test_bw_limit(void)
 
         if (sendlen > 0) {
             if (!SSL_write_ex(clientquic, msg,
-                              sendlen > TEST_SINGLE_WRITE_SIZE ? TEST_SINGLE_WRITE_SIZE
-                                                               : sendlen,
-                              &written)) {
-                TEST_info("Retrying to send: %llu", (unsigned long long) sendlen);
+                    sendlen > TEST_SINGLE_WRITE_SIZE ? TEST_SINGLE_WRITE_SIZE
+                                                     : sendlen,
+                    &written)) {
+                TEST_info("Retrying to send: %llu", (unsigned long long)sendlen);
                 if (!TEST_int_eq(SSL_get_error(clientquic, 0), SSL_ERROR_WANT_WRITE))
                     goto err;
             } else {
                 sendlen -= written;
-                TEST_info("Remaining to send: %llu", (unsigned long long) sendlen);
+                TEST_info("Remaining to send: %llu", (unsigned long long)sendlen);
             }
         } else {
             SSL_handle_events(clientquic);
         }
 
         if (ossl_quic_tserver_read(qtserv, 0, recvbuf,
-                                   recvlen > TEST_SINGLE_WRITE_SIZE ? TEST_SINGLE_WRITE_SIZE
-                                                                    : recvlen,
-                                   &readbytes)
+                recvlen > TEST_SINGLE_WRITE_SIZE ? TEST_SINGLE_WRITE_SIZE
+                                                 : recvlen,
+                &readbytes)
             && readbytes > 1) {
             recvlen -= readbytes;
-            TEST_info("Remaining to recv: %llu", (unsigned long long) recvlen);
+            TEST_info("Remaining to recv: %llu", (unsigned long long)recvlen);
         } else {
-            TEST_info("No progress on recv: %llu", (unsigned long long) recvlen);
+            TEST_info("No progress on recv: %llu", (unsigned long long)recvlen);
         }
         ossl_quic_tserver_tick(qtserv);
     }
     real_bw = TEST_TRANSFER_DATA_SIZE / qtest_get_stopwatch_time();
 
     TEST_info("BW limit: %d Bytes/ms Real bandwidth reached: %llu Bytes/ms",
-              TEST_BW_LIMIT, (unsigned long long)real_bw);
+        TEST_BW_LIMIT, (unsigned long long)real_bw);
 
     if (!TEST_uint64_t_lt(real_bw, TEST_BW_LIMIT))
         goto err;
 
     testresult = 1;
- err:
+err:
     OPENSSL_free(msg);
     OPENSSL_free(recvbuf);
     ossl_quic_tserver_free(qtserv);
@@ -1835,41 +1752,40 @@ enum {
 #define TPARAM_CHECK_DROP(name, reason) \
     { QUIC_TPARAM_##name, TPARAM_OP_DROP, (reason) },
 #define TPARAM_CHECK_INJECT(name, buf, buf_len, reason) \
-    { QUIC_TPARAM_##name, TPARAM_OP_INJECT, (reason), \
-      (buf), (buf_len) },
+    { QUIC_TPARAM_##name, TPARAM_OP_INJECT, (reason),   \
+        (buf), (buf_len) },
 #define TPARAM_CHECK_INJECT_A(name, buf, reason) \
     TPARAM_CHECK_INJECT(name, buf, sizeof(buf), reason)
 #define TPARAM_CHECK_DROP_INJECT(name, buf, buf_len, reason) \
-    { QUIC_TPARAM_##name, TPARAM_OP_DROP_INJECT, (reason), \
-      (buf), (buf_len) },
+    { QUIC_TPARAM_##name, TPARAM_OP_DROP_INJECT, (reason),   \
+        (buf), (buf_len) },
 #define TPARAM_CHECK_DROP_INJECT_A(name, buf, reason) \
     TPARAM_CHECK_DROP_INJECT(name, buf, sizeof(buf), reason)
 #define TPARAM_CHECK_INJECT_TWICE(name, buf, buf_len, reason) \
-    { QUIC_TPARAM_##name, TPARAM_OP_INJECT_TWICE, (reason), \
-      (buf), (buf_len) },
+    { QUIC_TPARAM_##name, TPARAM_OP_INJECT_TWICE, (reason),   \
+        (buf), (buf_len) },
 #define TPARAM_CHECK_INJECT_TWICE_A(name, buf, reason) \
     TPARAM_CHECK_INJECT_TWICE(name, buf, sizeof(buf), reason)
 #define TPARAM_CHECK_INJECT_RAW(buf, buf_len, reason) \
-    { 0, TPARAM_OP_INJECT_RAW, (reason), \
-      (buf), (buf_len) },
+    { 0, TPARAM_OP_INJECT_RAW, (reason),              \
+        (buf), (buf_len) },
 #define TPARAM_CHECK_INJECT_RAW_A(buf, reason) \
     TPARAM_CHECK_INJECT_RAW(buf, sizeof(buf), reason)
 #define TPARAM_CHECK_MUTATE(name, reason) \
     { QUIC_TPARAM_##name, TPARAM_OP_MUTATE, (reason) },
-#define TPARAM_CHECK_INT(name, reason) \
-    TPARAM_CHECK_DROP_INJECT(name, NULL, 0, reason) \
+#define TPARAM_CHECK_INT(name, reason)                  \
+    TPARAM_CHECK_DROP_INJECT(name, NULL, 0, reason)     \
     TPARAM_CHECK_DROP_INJECT_A(name, bogus_int, reason) \
     TPARAM_CHECK_DROP_INJECT_A(name, int_with_trailer, reason)
 
 struct tparam_test {
-    uint64_t    id;
-    int         op;
-    const char  *expect_fail; /* substring to expect in reason */
-    const void  *buf;
-    size_t      buf_len;
+    uint64_t id;
+    int op;
+    const char *expect_fail; /* substring to expect in reason */
+    const void *buf;
+    size_t buf_len;
 };
 
-
 static const unsigned char disable_active_migration_1[] = {
     0x00
 };
@@ -1891,21 +1807,61 @@ static const unsigned char malformed_preferred_addr_1[] = {
 };
 
 static const unsigned char malformed_preferred_addr_2[42] = {
-    0x0d, 0x28, /* too short */
+    0x0d,
+    0x28, /* too short */
 };
 
 static const unsigned char malformed_preferred_addr_3[64] = {
-    0x0d, 0x3e, /* too long */
+    0x0d,
+    0x3e, /* too long */
 };
 
 static const unsigned char malformed_preferred_addr_4[] = {
     /* TPARAM too short for CID length indicated */
-    0x0d, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x55,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0d,
+    0x29,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x01,
+    0x55,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
 };
 
 static const unsigned char malformed_unknown_1[] = {
@@ -1913,11 +1869,14 @@ static const unsigned char malformed_unknown_1[] = {
 };
 
 static const unsigned char malformed_unknown_2[] = {
-    0x55, 0x55,
+    0x55,
+    0x55,
 };
 
 static const unsigned char malformed_unknown_3[] = {
-    0x55, 0x55, 0x01,
+    0x55,
+    0x55,
+    0x01,
 };
 
 static const unsigned char ack_delay_exp[] = {
@@ -1927,14 +1886,49 @@ static const unsigned char ack_delay_exp[] = {
 static const unsigned char stateless_reset_token[16] = { 0x42 };
 
 static const unsigned char preferred_addr[] = {
-    0x44, 0x44, 0x44, 0x44,
-    0x55, 0x55,
-    0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-    0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
-    0x77, 0x77,
-    0x02, 0xAA, 0xBB,
-    0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
-    0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+    0x44,
+    0x44,
+    0x44,
+    0x44,
+    0x55,
+    0x55,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x66,
+    0x77,
+    0x77,
+    0x02,
+    0xAA,
+    0xBB,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
+    0x99,
 };
 
 static const unsigned char long_cid[21] = { 0x42 };
@@ -1944,146 +1938,174 @@ static const unsigned char excess_ack_delay_exp[] = {
 };
 
 static const unsigned char excess_max_ack_delay[] = {
-    0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00,
+    0xC0,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x40,
+    0x00,
 };
 
 static const unsigned char excess_initial_max_streams[] = {
-    0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+    0xD0,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x01,
 };
 
 static const unsigned char undersize_udp_payload_size[] = {
-    0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xaf,
+    0xC0,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x04,
+    0xaf,
 };
 
 static const unsigned char undersize_active_conn_id_limit[] = {
-    0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+    0xC0,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x01,
 };
 
 static const unsigned char bogus_int[9] = { 0 };
 
 static const unsigned char int_with_trailer[2] = { 0x01 };
 
-#define QUIC_TPARAM_UNKNOWN_1   0xf1f1
+#define QUIC_TPARAM_UNKNOWN_1 0xf1f1
 
 static const struct tparam_test tparam_tests[] = {
     TPARAM_CHECK_DUP(ORIG_DCID,
-                     "ORIG_DCID appears multiple times")
-    TPARAM_CHECK_DUP(INITIAL_SCID,
-                     "INITIAL_SCID appears multiple times")
-    TPARAM_CHECK_DUP(INITIAL_MAX_DATA,
-                     "INITIAL_MAX_DATA appears multiple times")
-    TPARAM_CHECK_DUP(INITIAL_MAX_STREAM_DATA_BIDI_LOCAL,
-                     "INITIAL_MAX_STREAM_DATA_BIDI_LOCAL appears multiple times")
-    TPARAM_CHECK_DUP(INITIAL_MAX_STREAM_DATA_BIDI_REMOTE,
-                     "INITIAL_MAX_STREAM_DATA_BIDI_REMOTE appears multiple times")
-    TPARAM_CHECK_DUP(INITIAL_MAX_STREAM_DATA_UNI,
-                     "INITIAL_MAX_STREAM_DATA_UNI appears multiple times")
-    TPARAM_CHECK_DUP(INITIAL_MAX_STREAMS_BIDI,
-                     "INITIAL_MAX_STREAMS_BIDI appears multiple times")
-    TPARAM_CHECK_DUP(INITIAL_MAX_STREAMS_UNI,
-                     "INITIAL_MAX_STREAMS_UNI appears multiple times")
-    TPARAM_CHECK_DUP(MAX_IDLE_TIMEOUT,
-                     "MAX_IDLE_TIMEOUT appears multiple times")
-    TPARAM_CHECK_DUP(MAX_UDP_PAYLOAD_SIZE,
-                     "MAX_UDP_PAYLOAD_SIZE appears multiple times")
-    TPARAM_CHECK_DUP(ACTIVE_CONN_ID_LIMIT,
-                     "ACTIVE_CONN_ID_LIMIT appears multiple times")
-    TPARAM_CHECK_DUP(DISABLE_ACTIVE_MIGRATION,
-                     "DISABLE_ACTIVE_MIGRATION appears multiple times")
-
-    TPARAM_CHECK_DROP(INITIAL_SCID,
-                      "INITIAL_SCID was not sent but is required")
-    TPARAM_CHECK_DROP(ORIG_DCID,
-                      "ORIG_DCID was not sent but is required")
-
-    TPARAM_CHECK_DROP_INJECT_A(DISABLE_ACTIVE_MIGRATION, disable_active_migration_1,
-                               "DISABLE_ACTIVE_MIGRATION is malformed")
-    TPARAM_CHECK_INJECT(UNKNOWN_1, NULL, 0,
-                        NULL)
-    TPARAM_CHECK_INJECT_RAW_A(malformed_stateless_reset_token_1,
-                              "STATELESS_RESET_TOKEN is malformed")
-    TPARAM_CHECK_INJECT_A(STATELESS_RESET_TOKEN,
-                          malformed_stateless_reset_token_2,
-                          "STATELESS_RESET_TOKEN is malformed")
-    TPARAM_CHECK_INJECT_A(STATELESS_RESET_TOKEN,
-                          malformed_stateless_reset_token_3,
-                          "STATELESS_RESET_TOKEN is malformed")
-    TPARAM_CHECK_INJECT_A(STATELESS_RESET_TOKEN,
-                          malformed_stateless_reset_token_4,
-                          "STATELESS_RESET_TOKEN is malformed")
-    TPARAM_CHECK_INJECT(STATELESS_RESET_TOKEN,
-                        NULL, 0,
-                        "STATELESS_RESET_TOKEN is malformed")
-    TPARAM_CHECK_INJECT_RAW_A(malformed_preferred_addr_1,
-                              "PREFERRED_ADDR is malformed")
-    TPARAM_CHECK_INJECT_RAW_A(malformed_preferred_addr_2,
-                              "PREFERRED_ADDR is malformed")
-    TPARAM_CHECK_INJECT_RAW_A(malformed_preferred_addr_3,
-                              "PREFERRED_ADDR is malformed")
-    TPARAM_CHECK_INJECT_RAW_A(malformed_preferred_addr_4,
-                              "PREFERRED_ADDR is malformed")
-    TPARAM_CHECK_INJECT_RAW_A(malformed_unknown_1,
-                              "bad transport parameter")
-    TPARAM_CHECK_INJECT_RAW_A(malformed_unknown_2,
-                              "bad transport parameter")
-    TPARAM_CHECK_INJECT_RAW_A(malformed_unknown_3,
-                              "bad transport parameter")
-
-    TPARAM_CHECK_INJECT_A(ACK_DELAY_EXP, excess_ack_delay_exp,
-                          "ACK_DELAY_EXP is malformed")
-    TPARAM_CHECK_INJECT_A(MAX_ACK_DELAY, excess_max_ack_delay,
-                          "MAX_ACK_DELAY is malformed")
-    TPARAM_CHECK_DROP_INJECT_A(INITIAL_MAX_STREAMS_BIDI, excess_initial_max_streams,
-                               "INITIAL_MAX_STREAMS_BIDI is malformed")
-    TPARAM_CHECK_DROP_INJECT_A(INITIAL_MAX_STREAMS_UNI, excess_initial_max_streams,
-                               "INITIAL_MAX_STREAMS_UNI is malformed")
-
-    TPARAM_CHECK_DROP_INJECT_A(MAX_UDP_PAYLOAD_SIZE, undersize_udp_payload_size,
-                               "MAX_UDP_PAYLOAD_SIZE is malformed")
-    TPARAM_CHECK_DROP_INJECT_A(ACTIVE_CONN_ID_LIMIT, undersize_active_conn_id_limit,
-                               "ACTIVE_CONN_ID_LIMIT is malformed")
-
-    TPARAM_CHECK_INJECT_TWICE_A(ACK_DELAY_EXP, ack_delay_exp,
-                                "ACK_DELAY_EXP appears multiple times")
-    TPARAM_CHECK_INJECT_TWICE_A(MAX_ACK_DELAY, ack_delay_exp,
-                                "MAX_ACK_DELAY appears multiple times")
-    TPARAM_CHECK_INJECT_TWICE_A(STATELESS_RESET_TOKEN, stateless_reset_token,
-                                "STATELESS_RESET_TOKEN appears multiple times")
-    TPARAM_CHECK_INJECT_TWICE_A(PREFERRED_ADDR, preferred_addr,
-                                "PREFERRED_ADDR appears multiple times")
-
-    TPARAM_CHECK_MUTATE(ORIG_DCID,
-                        "ORIG_DCID does not match expected value")
-    TPARAM_CHECK_MUTATE(INITIAL_SCID,
-                        "INITIAL_SCID does not match expected value")
-
-    TPARAM_CHECK_DROP_INJECT_A(ORIG_DCID, long_cid,
-                               "ORIG_DCID is malformed")
-    TPARAM_CHECK_DROP_INJECT_A(INITIAL_SCID, long_cid,
-                               "INITIAL_SCID is malformed")
-
-    TPARAM_CHECK_INT(INITIAL_MAX_DATA,
-                     "INITIAL_MAX_DATA is malformed")
-    TPARAM_CHECK_INT(INITIAL_MAX_STREAM_DATA_BIDI_LOCAL,
-                     "INITIAL_MAX_STREAM_DATA_BIDI_LOCAL is malformed")
-    TPARAM_CHECK_INT(INITIAL_MAX_STREAM_DATA_BIDI_REMOTE,
-                     "INITIAL_MAX_STREAM_DATA_BIDI_REMOTE is malformed")
-    TPARAM_CHECK_INT(INITIAL_MAX_STREAM_DATA_UNI,
-                     "INITIAL_MAX_STREAM_DATA_UNI is malformed")
-    TPARAM_CHECK_INT(ACK_DELAY_EXP,
-                     "ACK_DELAY_EXP is malformed")
-    TPARAM_CHECK_INT(MAX_ACK_DELAY,
-                     "MAX_ACK_DELAY is malformed")
-    TPARAM_CHECK_INT(INITIAL_MAX_STREAMS_BIDI,
-                     "INITIAL_MAX_STREAMS_BIDI is malformed")
-    TPARAM_CHECK_INT(INITIAL_MAX_STREAMS_UNI,
-                     "INITIAL_MAX_STREAMS_UNI is malformed")
-    TPARAM_CHECK_INT(MAX_IDLE_TIMEOUT,
-                     "MAX_IDLE_TIMEOUT is malformed")
-    TPARAM_CHECK_INT(MAX_UDP_PAYLOAD_SIZE,
-                     "MAX_UDP_PAYLOAD_SIZE is malformed")
-    TPARAM_CHECK_INT(ACTIVE_CONN_ID_LIMIT,
-                     "ACTIVE_CONN_ID_LIMIT is malformed")
+        "ORIG_DCID appears multiple times")
+        TPARAM_CHECK_DUP(INITIAL_SCID,
+            "INITIAL_SCID appears multiple times")
+            TPARAM_CHECK_DUP(INITIAL_MAX_DATA,
+                "INITIAL_MAX_DATA appears multiple times")
+                TPARAM_CHECK_DUP(INITIAL_MAX_STREAM_DATA_BIDI_LOCAL,
+                    "INITIAL_MAX_STREAM_DATA_BIDI_LOCAL appears multiple times")
+                    TPARAM_CHECK_DUP(INITIAL_MAX_STREAM_DATA_BIDI_REMOTE,
+                        "INITIAL_MAX_STREAM_DATA_BIDI_REMOTE appears multiple times")
+                        TPARAM_CHECK_DUP(INITIAL_MAX_STREAM_DATA_UNI,
+                            "INITIAL_MAX_STREAM_DATA_UNI appears multiple times")
+                            TPARAM_CHECK_DUP(INITIAL_MAX_STREAMS_BIDI,
+                                "INITIAL_MAX_STREAMS_BIDI appears multiple times")
+                                TPARAM_CHECK_DUP(INITIAL_MAX_STREAMS_UNI,
+                                    "INITIAL_MAX_STREAMS_UNI appears multiple times")
+                                    TPARAM_CHECK_DUP(MAX_IDLE_TIMEOUT,
+                                        "MAX_IDLE_TIMEOUT appears multiple times")
+                                        TPARAM_CHECK_DUP(MAX_UDP_PAYLOAD_SIZE,
+                                            "MAX_UDP_PAYLOAD_SIZE appears multiple times")
+                                            TPARAM_CHECK_DUP(ACTIVE_CONN_ID_LIMIT,
+                                                "ACTIVE_CONN_ID_LIMIT appears multiple times")
+                                                TPARAM_CHECK_DUP(DISABLE_ACTIVE_MIGRATION,
+                                                    "DISABLE_ACTIVE_MIGRATION appears multiple times")
+
+                                                    TPARAM_CHECK_DROP(INITIAL_SCID,
+                                                        "INITIAL_SCID was not sent but is required")
+                                                        TPARAM_CHECK_DROP(ORIG_DCID,
+                                                            "ORIG_DCID was not sent but is required")
+
+                                                            TPARAM_CHECK_DROP_INJECT_A(DISABLE_ACTIVE_MIGRATION, disable_active_migration_1,
+                                                                "DISABLE_ACTIVE_MIGRATION is malformed")
+                                                                TPARAM_CHECK_INJECT(UNKNOWN_1, NULL, 0,
+                                                                    NULL)
+                                                                    TPARAM_CHECK_INJECT_RAW_A(malformed_stateless_reset_token_1,
+                                                                        "STATELESS_RESET_TOKEN is malformed")
+                                                                        TPARAM_CHECK_INJECT_A(STATELESS_RESET_TOKEN,
+                                                                            malformed_stateless_reset_token_2,
+                                                                            "STATELESS_RESET_TOKEN is malformed")
+                                                                            TPARAM_CHECK_INJECT_A(STATELESS_RESET_TOKEN,
+                                                                                malformed_stateless_reset_token_3,
+                                                                                "STATELESS_RESET_TOKEN is malformed")
+                                                                                TPARAM_CHECK_INJECT_A(STATELESS_RESET_TOKEN,
+                                                                                    malformed_stateless_reset_token_4,
+                                                                                    "STATELESS_RESET_TOKEN is malformed")
+                                                                                    TPARAM_CHECK_INJECT(STATELESS_RESET_TOKEN,
+                                                                                        NULL, 0,
+                                                                                        "STATELESS_RESET_TOKEN is malformed")
+                                                                                        TPARAM_CHECK_INJECT_RAW_A(malformed_preferred_addr_1,
+                                                                                            "PREFERRED_ADDR is malformed")
+                                                                                            TPARAM_CHECK_INJECT_RAW_A(malformed_preferred_addr_2,
+                                                                                                "PREFERRED_ADDR is malformed")
+                                                                                                TPARAM_CHECK_INJECT_RAW_A(malformed_preferred_addr_3,
+                                                                                                    "PREFERRED_ADDR is malformed")
+                                                                                                    TPARAM_CHECK_INJECT_RAW_A(malformed_preferred_addr_4,
+                                                                                                        "PREFERRED_ADDR is malformed")
+                                                                                                        TPARAM_CHECK_INJECT_RAW_A(malformed_unknown_1,
+                                                                                                            "bad transport parameter")
+                                                                                                            TPARAM_CHECK_INJECT_RAW_A(malformed_unknown_2,
+                                                                                                                "bad transport parameter")
+                                                                                                                TPARAM_CHECK_INJECT_RAW_A(malformed_unknown_3,
+                                                                                                                    "bad transport parameter")
+
+                                                                                                                    TPARAM_CHECK_INJECT_A(ACK_DELAY_EXP, excess_ack_delay_exp,
+                                                                                                                        "ACK_DELAY_EXP is malformed")
+                                                                                                                        TPARAM_CHECK_INJECT_A(MAX_ACK_DELAY, excess_max_ack_delay,
+                                                                                                                            "MAX_ACK_DELAY is malformed")
+                                                                                                                            TPARAM_CHECK_DROP_INJECT_A(INITIAL_MAX_STREAMS_BIDI, excess_initial_max_streams,
+                                                                                                                                "INITIAL_MAX_STREAMS_BIDI is malformed")
+                                                                                                                                TPARAM_CHECK_DROP_INJECT_A(INITIAL_MAX_STREAMS_UNI, excess_initial_max_streams,
+                                                                                                                                    "INITIAL_MAX_STREAMS_UNI is malformed")
+
+                                                                                                                                    TPARAM_CHECK_DROP_INJECT_A(MAX_UDP_PAYLOAD_SIZE, undersize_udp_payload_size,
+                                                                                                                                        "MAX_UDP_PAYLOAD_SIZE is malformed")
+                                                                                                                                        TPARAM_CHECK_DROP_INJECT_A(ACTIVE_CONN_ID_LIMIT, undersize_active_conn_id_limit,
+                                                                                                                                            "ACTIVE_CONN_ID_LIMIT is malformed")
+
+                                                                                                                                            TPARAM_CHECK_INJECT_TWICE_A(ACK_DELAY_EXP, ack_delay_exp,
+                                                                                                                                                "ACK_DELAY_EXP appears multiple times")
+                                                                                                                                                TPARAM_CHECK_INJECT_TWICE_A(MAX_ACK_DELAY, ack_delay_exp,
+                                                                                                                                                    "MAX_ACK_DELAY appears multiple times")
+                                                                                                                                                    TPARAM_CHECK_INJECT_TWICE_A(STATELESS_RESET_TOKEN, stateless_reset_token,
+                                                                                                                                                        "STATELESS_RESET_TOKEN appears multiple times")
+                                                                                                                                                        TPARAM_CHECK_INJECT_TWICE_A(PREFERRED_ADDR, preferred_addr,
+                                                                                                                                                            "PREFERRED_ADDR appears multiple times")
+
+                                                                                                                                                            TPARAM_CHECK_MUTATE(ORIG_DCID,
+                                                                                                                                                                "ORIG_DCID does not match expected value")
+                                                                                                                                                                TPARAM_CHECK_MUTATE(INITIAL_SCID,
+                                                                                                                                                                    "INITIAL_SCID does not match expected value")
+
+                                                                                                                                                                    TPARAM_CHECK_DROP_INJECT_A(ORIG_DCID, long_cid,
+                                                                                                                                                                        "ORIG_DCID is malformed")
+                                                                                                                                                                        TPARAM_CHECK_DROP_INJECT_A(INITIAL_SCID, long_cid,
+                                                                                                                                                                            "INITIAL_SCID is malformed")
+
+                                                                                                                                                                            TPARAM_CHECK_INT(INITIAL_MAX_DATA,
+                                                                                                                                                                                "INITIAL_MAX_DATA is malformed")
+                                                                                                                                                                                TPARAM_CHECK_INT(INITIAL_MAX_STREAM_DATA_BIDI_LOCAL,
+                                                                                                                                                                                    "INITIAL_MAX_STREAM_DATA_BIDI_LOCAL is malformed")
+                                                                                                                                                                                    TPARAM_CHECK_INT(INITIAL_MAX_STREAM_DATA_BIDI_REMOTE,
+                                                                                                                                                                                        "INITIAL_MAX_STREAM_DATA_BIDI_REMOTE is malformed")
+                                                                                                                                                                                        TPARAM_CHECK_INT(INITIAL_MAX_STREAM_DATA_UNI,
+                                                                                                                                                                                            "INITIAL_MAX_STREAM_DATA_UNI is malformed")
+                                                                                                                                                                                            TPARAM_CHECK_INT(ACK_DELAY_EXP,
+                                                                                                                                                                                                "ACK_DELAY_EXP is malformed")
+                                                                                                                                                                                                TPARAM_CHECK_INT(MAX_ACK_DELAY,
+                                                                                                                                                                                                    "MAX_ACK_DELAY is malformed")
+                                                                                                                                                                                                    TPARAM_CHECK_INT(INITIAL_MAX_STREAMS_BIDI,
+                                                                                                                                                                                                        "INITIAL_MAX_STREAMS_BIDI is malformed")
+                                                                                                                                                                                                        TPARAM_CHECK_INT(INITIAL_MAX_STREAMS_UNI,
+                                                                                                                                                                                                            "INITIAL_MAX_STREAMS_UNI is malformed")
+                                                                                                                                                                                                            TPARAM_CHECK_INT(MAX_IDLE_TIMEOUT,
+                                                                                                                                                                                                                "MAX_IDLE_TIMEOUT is malformed")
+                                                                                                                                                                                                                TPARAM_CHECK_INT(MAX_UDP_PAYLOAD_SIZE,
+                                                                                                                                                                                                                    "MAX_UDP_PAYLOAD_SIZE is malformed")
+                                                                                                                                                                                                                    TPARAM_CHECK_INT(ACTIVE_CONN_ID_LIMIT,
+                                                                                                                                                                                                                        "ACTIVE_CONN_ID_LIMIT is malformed")
 };
 
 struct tparam_ctx {
@@ -2091,16 +2113,16 @@ struct tparam_ctx {
 };
 
 static int tparam_handle(struct tparam_ctx *ctx,
-                         uint64_t id, unsigned char *data,
-                         size_t data_len,
-                         WPACKET *wpkt)
+    uint64_t id, unsigned char *data,
+    size_t data_len,
+    WPACKET *wpkt)
 {
     const struct tparam_test *t = ctx->t;
 
     switch (t->op) {
     case TPARAM_OP_DUP:
         if (!TEST_ptr(ossl_quic_wire_encode_transport_param_bytes(wpkt, id,
-                                                                  data, data_len)))
+                data, data_len)))
             return 0;
 
         /*
@@ -2108,7 +2130,7 @@ static int tparam_handle(struct tparam_ctx *ctx,
          */
         if (id == t->id
             && !TEST_ptr(ossl_quic_wire_encode_transport_param_bytes(wpkt, id,
-                                                                     data, data_len)))
+                data, data_len)))
             return 0;
 
         return 1;
@@ -2118,7 +2140,7 @@ static int tparam_handle(struct tparam_ctx *ctx,
         /* Pass through unless ID matches. */
         if (id != t->id
             && !TEST_ptr(ossl_quic_wire_encode_transport_param_bytes(wpkt, id,
-                                                                     data, data_len)))
+                data, data_len)))
             return 0;
 
         return 1;
@@ -2128,7 +2150,7 @@ static int tparam_handle(struct tparam_ctx *ctx,
     case TPARAM_OP_INJECT_RAW:
         /* Always pass through. */
         if (!TEST_ptr(ossl_quic_wire_encode_transport_param_bytes(wpkt, id,
-                                                                  data, data_len)))
+                data, data_len)))
             return 0;
 
         return 1;
@@ -2142,7 +2164,7 @@ static int tparam_handle(struct tparam_ctx *ctx,
         }
 
         if (!TEST_ptr(ossl_quic_wire_encode_transport_param_bytes(wpkt, id,
-                                                                  data, data_len)))
+                data, data_len)))
             return 0;
 
         if (id == t->id)
@@ -2156,11 +2178,11 @@ static int tparam_handle(struct tparam_ctx *ctx,
 }
 
 static int tparam_on_enc_ext(QTEST_FAULT *qtf, QTEST_ENCRYPTED_EXTENSIONS *ee,
-                             size_t ee_len, void *arg)
+    size_t ee_len, void *arg)
 {
     int rc = 0;
     struct tparam_ctx *ctx = arg;
-    PACKET pkt = {0};
+    PACKET pkt = { 0 };
     WPACKET wpkt;
     int have_wpkt = 0;
     BUF_MEM *old_bufm = NULL, *new_bufm = NULL;
@@ -2176,8 +2198,8 @@ static int tparam_on_enc_ext(QTEST_FAULT *qtf, QTEST_ENCRYPTED_EXTENSIONS *ee,
      * extension which was removed.
      */
     if (!TEST_true(qtest_fault_delete_extension(qtf, TLSEXT_TYPE_quic_transport_parameters,
-                                                ee->extensions, &ee->extensionslen,
-                                                old_bufm)))
+            ee->extensions, &ee->extensionslen,
+            old_bufm)))
         goto err;
 
     if (!TEST_true(PACKET_buf_init(&pkt, (unsigned char *)old_bufm->data, old_bufm->length))
@@ -2196,14 +2218,14 @@ static int tparam_on_enc_ext(QTEST_FAULT *qtf, QTEST_ENCRYPTED_EXTENSIONS *ee,
      *
      */
     if (!TEST_true(WPACKET_put_bytes_u16(&wpkt,
-                                         TLSEXT_TYPE_quic_transport_parameters))
+            TLSEXT_TYPE_quic_transport_parameters))
         || !TEST_true(WPACKET_start_sub_packet_u16(&wpkt)))
         goto err;
 
-    for (; PACKET_remaining(&pkt) > 0; ) {
+    for (; PACKET_remaining(&pkt) > 0;) {
         tp_p = (unsigned char *)ossl_quic_wire_decode_transport_param_bytes(&pkt,
-                                                                            &id,
-                                                                            &tp_len);
+            &id,
+            &tp_len);
         if (!TEST_ptr(tp_p)) {
             TEST_mem_eq(PACKET_data(&pkt), PACKET_remaining(&pkt), NULL, 0);
             goto err;
@@ -2216,14 +2238,14 @@ static int tparam_on_enc_ext(QTEST_FAULT *qtf, QTEST_ENCRYPTED_EXTENSIONS *ee,
     if (ctx->t->op == TPARAM_OP_INJECT || ctx->t->op == TPARAM_OP_DROP_INJECT
         || ctx->t->op == TPARAM_OP_INJECT_TWICE) {
         if (!TEST_ptr(ossl_quic_wire_encode_transport_param_bytes(&wpkt, ctx->t->id,
-                                                                  ctx->t->buf,
-                                                                  ctx->t->buf_len)))
+                ctx->t->buf,
+                ctx->t->buf_len)))
             goto err;
 
         if (ctx->t->op == TPARAM_OP_INJECT_TWICE
             && !TEST_ptr(ossl_quic_wire_encode_transport_param_bytes(&wpkt, ctx->t->id,
-                                                                     ctx->t->buf,
-                                                                     ctx->t->buf_len)))
+                ctx->t->buf,
+                ctx->t->buf_len)))
             goto err;
     } else if (ctx->t->op == TPARAM_OP_INJECT_RAW) {
         if (!TEST_true(WPACKET_memcpy(&wpkt, ctx->t->buf, ctx->t->buf_len)))
@@ -2253,7 +2275,7 @@ static int tparam_on_enc_ext(QTEST_FAULT *qtf, QTEST_ENCRYPTED_EXTENSIONS *ee,
     eb_len = (((uint16_t)ee->extensions[0]) << 8) + (uint16_t)ee->extensions[1];
     eb_len += written;
     ee->extensions[0] = (unsigned char)((eb_len >> 8) & 0xFF);
-    ee->extensions[1] = (unsigned char)( eb_len       & 0xFF);
+    ee->extensions[1] = (unsigned char)(eb_len & 0xFF);
 
     rc = 1;
 err:
@@ -2271,7 +2293,7 @@ static int test_tparam(int idx)
     SSL *c_ssl = NULL;
     QUIC_TSERVER *s = NULL;
     QTEST_FAULT *qtf = NULL;
-    struct tparam_ctx ctx = {0};
+    struct tparam_ctx ctx = { 0 };
 
     ctx.t = &tparam_tests[idx];
 
@@ -2279,20 +2301,20 @@ static int test_tparam(int idx)
         goto err;
 
     if (!TEST_true(qtest_create_quic_objects(libctx, c_ctx, NULL, cert,
-                                             privkey, 0, &s,
-                                             &c_ssl, &qtf, NULL)))
+            privkey, 0, &s,
+            &c_ssl, &qtf, NULL)))
         goto err;
 
     if (!TEST_true(qtest_fault_set_hand_enc_ext_listener(qtf, tparam_on_enc_ext,
-                                                         &ctx)))
+            &ctx)))
         goto err;
 
     if (!TEST_true(qtest_create_quic_connection_ex(s, c_ssl,
-                                                   ctx.t->expect_fail != NULL)))
+            ctx.t->expect_fail != NULL)))
         goto err;
 
     if (ctx.t->expect_fail != NULL) {
-        SSL_CONN_CLOSE_INFO info = {0};
+        SSL_CONN_CLOSE_INFO info = { 0 };
 
         if (!TEST_true(SSL_get_conn_close_info(c_ssl, &info, sizeof(info))))
             goto err;
@@ -2302,9 +2324,9 @@ static int test_tparam(int idx)
             || !TEST_ptr(strstr(info.reason, ctx.t->expect_fail))) {
             TEST_error("expected connection closure information mismatch"
                        " during TPARAM test: flags=%llu ec=%llu reason='%s'",
-                       (unsigned long long)info.flags,
-                       (unsigned long long)info.error_code,
-                       info.reason);
+                (unsigned long long)info.flags,
+                (unsigned long long)info.error_code,
+                info.reason);
             goto err;
         }
     }
@@ -2314,11 +2336,12 @@ static int test_tparam(int idx)
     if (!testresult) {
         if (ctx.t->expect_fail != NULL)
             TEST_info("failed during test for id=%llu, op=%d, bl=%zu, "
-                      "expected failure='%s'", (unsigned long long)ctx.t->id,
-                      ctx.t->op, ctx.t->buf_len, ctx.t->expect_fail);
+                      "expected failure='%s'",
+                (unsigned long long)ctx.t->id,
+                ctx.t->op, ctx.t->buf_len, ctx.t->expect_fail);
         else
             TEST_info("failed during test for id=%llu, op=%d, bl=%zu",
-                      (unsigned long long)ctx.t->id, ctx.t->op, ctx.t->buf_len);
+                (unsigned long long)ctx.t->id, ctx.t->op, ctx.t->buf_len);
     }
 
     ossl_quic_tserver_free(s);
@@ -2364,10 +2387,10 @@ static int test_session_cb(void)
     SSL_CTX_set_session_cache_mode(cctx, SSL_SESS_CACHE_CLIENT);
 
     if (!TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
-                                             privkey,
-                                             QTEST_FLAG_FAKE_TIME,
-                                             &qtserv, &clientquic,
-                                             NULL, NULL)))
+            privkey,
+            QTEST_FLAG_FAKE_TIME,
+            &qtserv, &clientquic,
+            NULL, NULL)))
         goto err;
 
     if (!TEST_true(qtest_create_quic_connection(qtserv, clientquic)))
@@ -2385,11 +2408,11 @@ static int test_session_cb(void)
      * correct SSL reference
      */
     if (!TEST_int_eq(new_called, 2)
-            || !TEST_ptr_eq(clientquic, cbssl))
+        || !TEST_ptr_eq(clientquic, cbssl))
         goto err;
 
     testresult = 1;
- err:
+err:
     cbssl = NULL;
     ossl_quic_tserver_free(qtserv);
     SSL_free(clientquic);
@@ -2408,8 +2431,7 @@ static int test_domain_flags(void)
     if (!TEST_ptr(ctx = SSL_CTX_new_ex(libctx, NULL, OSSL_QUIC_client_method()))
         || !TEST_true(SSL_CTX_get_domain_flags(ctx, &domain_flags))
         || !TEST_uint64_t_ne(domain_flags, 0)
-        || !TEST_uint64_t_ne(domain_flags & (SSL_DOMAIN_FLAG_SINGLE_THREAD
-                                             | SSL_DOMAIN_FLAG_MULTI_THREAD), 0)
+        || !TEST_uint64_t_ne(domain_flags & (SSL_DOMAIN_FLAG_SINGLE_THREAD | SSL_DOMAIN_FLAG_MULTI_THREAD), 0)
         || !TEST_uint64_t_ne(domain_flags & SSL_DOMAIN_FLAG_LEGACY_BLOCKING, 0)
         || !TEST_true(SSL_CTX_set_domain_flags(ctx, SSL_DOMAIN_FLAG_SINGLE_THREAD))
         || !TEST_true(SSL_CTX_get_domain_flags(ctx, &domain_flags))
@@ -2453,10 +2475,10 @@ static int test_early_ticks(void)
     int inf = 0;
 
     if (!TEST_ptr(cctx)
-            || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
-                                                    privkey, QTEST_FLAG_FAKE_TIME,
-                                                    &qtserv,
-                                                    &clientquic, NULL, NULL)))
+        || !TEST_true(qtest_create_quic_objects(libctx, cctx, NULL, cert,
+            privkey, QTEST_FLAG_FAKE_TIME,
+            &qtserv,
+            &clientquic, NULL, NULL)))
         goto err;
 
     if (!TEST_true(SSL_in_before(clientquic)))
@@ -2466,11 +2488,11 @@ static int test_early_ticks(void)
         goto err;
 
     if (!TEST_true(SSL_get_event_timeout(clientquic, &tv, &inf))
-            || !TEST_true(inf))
+        || !TEST_true(inf))
         goto err;
 
     if (!TEST_false(SSL_has_pending(clientquic))
-            || !TEST_int_eq(SSL_pending(clientquic), 0))
+        || !TEST_int_eq(SSL_pending(clientquic), 0))
         goto err;
 
     if (!TEST_true(SSL_in_before(clientquic)))
@@ -2483,7 +2505,7 @@ static int test_early_ticks(void)
         goto err;
 
     testresult = 1;
- err:
+err:
     SSL_free(clientquic);
     SSL_CTX_free(cctx);
     ossl_quic_tserver_free(qtserv);
@@ -2491,17 +2513,30 @@ static int test_early_ticks(void)
 }
 
 static int select_alpn(SSL *ssl, const unsigned char **out,
-                       unsigned char *out_len, const unsigned char *in,
-                       unsigned int in_len, void *arg)
+    unsigned char *out_len, const unsigned char *in,
+    unsigned int in_len, void *arg)
 {
     static unsigned char alpn[] = { 8, 'o', 's', 's', 'l', 't', 'e', 's', 't' };
 
     if (SSL_select_next_proto((unsigned char **)out, out_len, alpn, sizeof(alpn),
-                              in, in_len) == OPENSSL_NPN_NEGOTIATED)
+            in, in_len)
+        == OPENSSL_NPN_NEGOTIATED)
         return SSL_TLSEXT_ERR_OK;
     return SSL_TLSEXT_ERR_ALERT_FATAL;
 }
 
+static SSL_CTX *create_client_ctx(void)
+{
+    SSL_CTX *ssl_ctx;
+
+    if (!TEST_ptr(ssl_ctx = SSL_CTX_new_ex(libctx, NULL, OSSL_QUIC_client_method()))) {
+        SSL_CTX_free(ssl_ctx);
+        ssl_ctx = NULL;
+    }
+
+    return ssl_ctx;
+}
+
 static SSL_CTX *create_server_ctx(void)
 {
     SSL_CTX *ssl_ctx;
@@ -2527,7 +2562,7 @@ static BIO_ADDR *create_addr(struct in_addr *ina, short int port)
         return NULL;
 
     if (!TEST_true(BIO_ADDR_rawmake(addr, AF_INET, ina, sizeof(struct in_addr),
-                                    htons(port)))) {
+            htons(port)))) {
         BIO_ADDR_free(addr);
         return NULL;
     }
@@ -2641,7 +2676,7 @@ static int test_ssl_new_from_listener(void)
     }
 
     testresult = 1;
- err:
+err:
     SSL_free(qconn);
     SSL_free(qlistener);
     SSL_free(qserver);
@@ -2654,8 +2689,259 @@ static int test_ssl_new_from_listener(void)
     return testresult;
 }
 
-/***********************************************************************************/
+static int test_server_method_with_ssl_new(void)
+{
+    SSL_CTX *ctx = NULL;
+    SSL *ssl = NULL;
+    int ret = 0;
+    unsigned long err;
+
+    /* Create a new SSL_CTX using the QUIC server method */
+    ctx = SSL_CTX_new_ex(libctx, NULL, OSSL_QUIC_server_method());
+    if (!TEST_ptr(ctx))
+        goto end;
+
+    /* Try to create a new SSL object - this should fail */
+    ssl = SSL_new(ctx);
 
+    /* Check that SSL_new() returned NULL */
+    if (!TEST_ptr_null(ssl))
+        goto end;
+
+    /* Check for the expected error */
+    err = ERR_peek_error();
+    if (!TEST_true(ERR_GET_LIB(err) == ERR_LIB_SSL && ERR_GET_REASON(err) == ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED))
+        goto end;
+
+    ret = 1;
+
+end:
+    SSL_free(ssl);
+    SSL_CTX_free(ctx);
+    return ret;
+}
+
+static int create_quic_ssl_objects(SSL_CTX *sctx, SSL_CTX *cctx,
+    SSL **lssl, SSL **cssl)
+{
+    BIO_ADDR *addr = NULL;
+    struct in_addr ina;
+    BIO *cbio = NULL, *sbio = NULL;
+    int ret = 0;
+
+    *cssl = *lssl = NULL;
+    ina.s_addr = htonl(0x1f000001);
+
+    if (!TEST_true(BIO_new_bio_dgram_pair(&cbio, 0, &sbio, 0)))
+        goto err;
+
+    if (!TEST_ptr(addr = create_addr(&ina, 8040)))
+        goto err;
+
+    if (!TEST_true(bio_addr_bind(sbio, addr)))
+        goto err;
+    addr = NULL;
+
+    *lssl = ql_create(sctx, sbio);
+    sbio = NULL;
+    if (!TEST_ptr(*lssl))
+        goto err;
+
+    if (!TEST_ptr(*cssl = SSL_new(cctx)))
+        goto err;
+
+    if (!TEST_ptr(addr = create_addr(&ina, 8040)))
+        goto err;
+    if (!TEST_true(bio_addr_bind(cbio, addr)))
+        goto err;
+
+    if (!TEST_true(qc_init(*cssl, addr))) {
+        addr = NULL;
+        goto err;
+    }
+    addr = NULL;
+    SSL_set_bio(*cssl, cbio, cbio);
+    cbio = NULL;
+
+    ret = 1;
+
+err:
+    if (!ret) {
+        SSL_free(*cssl);
+        SSL_free(*lssl);
+        *cssl = *lssl = NULL;
+    }
+    BIO_free(cbio);
+    BIO_free(sbio);
+    BIO_ADDR_free(addr);
+
+    return ret;
+}
+
+static int test_ssl_accept_connection(void)
+{
+    SSL_CTX *cctx = NULL, *sctx = NULL;
+    SSL *clientssl = NULL, *serverssl = NULL, *qlistener = NULL;
+    int testresult = 0;
+    int ret, i;
+
+    if (!TEST_ptr(sctx = create_server_ctx())
+        || !TEST_ptr(cctx = create_client_ctx()))
+        goto err;
+
+    if (!create_quic_ssl_objects(sctx, cctx, &qlistener, &clientssl))
+        goto err;
+
+    /* Calling SSL_accept() on a listener is expected to fail */
+    ret = SSL_accept(qlistener);
+    if (!TEST_int_le(ret, 0)
+        || !TEST_int_eq(SSL_get_error(qlistener, ret), SSL_ERROR_SSL))
+        goto err;
+
+    /* Send ClientHello and server retry */
+    for (i = 0; i < 2; i++) {
+        ret = SSL_connect(clientssl);
+        if (!TEST_int_le(ret, 0)
+            || !TEST_int_eq(SSL_get_error(clientssl, ret), SSL_ERROR_WANT_READ))
+            goto err;
+        SSL_handle_events(qlistener);
+    }
+
+    /* We expect a server SSL object which has not yet completed its handshake */
+    serverssl = SSL_accept_connection(qlistener, 0);
+    if (!TEST_ptr(serverssl) || !TEST_false(SSL_is_init_finished(serverssl)))
+        goto err;
+
+    /* Call SSL_accept() and SSL_connect() until we are connected */
+    if (!TEST_true(create_bare_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE, 0, 0)))
+        goto err;
+
+    testresult = 1;
+
+err:
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    SSL_free(qlistener);
+    SSL_CTX_free(sctx);
+    SSL_CTX_free(cctx);
+
+    return testresult;
+}
+
+static SSL *quic_verify_ssl = NULL;
+
+static int quic_verify_cb(int ok, X509_STORE_CTX *ctx)
+{
+    SSL *cssl = (SSL *)X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
+
+    /* Confirm we got the SSL object we were expecting */
+    return TEST_ptr_eq(cssl, quic_verify_ssl);
+}
+
+static int test_ssl_set_verify(void)
+{
+    SSL_CTX *cctx = NULL, *sctx = NULL;
+    SSL *clientssl = NULL, *serverssl = NULL, *qlistener = NULL;
+    int testresult = 0;
+    int ret, i;
+
+    if (!TEST_ptr(sctx = create_server_ctx())
+        || !TEST_ptr(cctx = create_client_ctx()))
+        goto err;
+
+    if (!create_quic_ssl_objects(sctx, cctx, &qlistener, &clientssl))
+        goto err;
+
+    quic_verify_ssl = clientssl;
+    SSL_set_verify(clientssl, SSL_VERIFY_PEER, quic_verify_cb);
+
+    /* Send ClientHello and server retry */
+    for (i = 0; i < 2; i++) {
+        ret = SSL_connect(clientssl);
+        if (!TEST_int_le(ret, 0)
+            || !TEST_int_eq(SSL_get_error(clientssl, ret), SSL_ERROR_WANT_READ))
+            goto err;
+        SSL_handle_events(qlistener);
+    }
+
+    /* We expect a server SSL object which has not yet completed its handshake */
+    serverssl = SSL_accept_connection(qlistener, 0);
+
+    /* Call SSL_accept() and SSL_connect() until we are connected */
+    if (!TEST_true(create_bare_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE, 0, 0)))
+        goto err;
+
+    testresult = 1;
+
+err:
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    SSL_free(qlistener);
+    SSL_CTX_free(sctx);
+    SSL_CTX_free(cctx);
+
+    return testresult;
+}
+
+/*
+ * When the server has a different primary group than the client, the server
+ * should not fail on the client hello retry.
+ */
+static int test_client_hello_retry(void)
+{
+#if !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_ECX)
+    SSL_CTX *cctx = NULL, *sctx = NULL;
+    SSL *clientssl = NULL, *serverssl = NULL, *qlistener = NULL;
+    int testresult = 0, i = 0, ret = 0;
+
+    if (!TEST_ptr(sctx = create_server_ctx())
+        || !TEST_ptr(cctx = create_client_ctx()))
+        goto err;
+    /*
+     * set the specific groups for the test
+     */
+    if (!TEST_true(SSL_CTX_set1_groups_list(cctx, "secp384r1:secp256r1")))
+        goto err;
+    if (!TEST_true(SSL_CTX_set1_groups_list(sctx, "secp256r1")))
+        goto err;
+
+    if (!create_quic_ssl_objects(sctx, cctx, &qlistener, &clientssl))
+        goto err;
+
+    /* Send ClientHello and server retry */
+    for (i = 0; i < 2; i++) {
+        ret = SSL_connect(clientssl);
+        if (!TEST_int_le(ret, 0)
+            || !TEST_int_eq(SSL_get_error(clientssl, ret), SSL_ERROR_WANT_READ))
+            goto err;
+        SSL_handle_events(qlistener);
+    }
+
+    /* We expect a server SSL object which has not yet completed its handshake */
+    serverssl = SSL_accept_connection(qlistener, 0);
+
+    /* Call SSL_accept() and SSL_connect() until we are connected */
+    if (!TEST_true(create_bare_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE, 0, 0)))
+        goto err;
+
+    testresult = 1;
+
+err:
+    SSL_CTX_free(cctx);
+    SSL_CTX_free(sctx);
+    SSL_free(clientssl);
+    SSL_free(serverssl);
+    SSL_free(qlistener);
+
+    return testresult;
+#else
+    return TEST_skip("EC(X) keys are not supported in this build");
+#endif
+}
+/***********************************************************************************/
 OPT_TEST_DECLARE_USAGE("provider config certsdir datadir\n")
 
 int setup_tests(void)
@@ -2674,7 +2960,7 @@ int setup_tests(void)
      * available
      */
     if (!TEST_false(OSSL_PROVIDER_available(NULL, "default"))
-            || !TEST_false(OSSL_PROVIDER_available(NULL, "fips")))
+        || !TEST_false(OSSL_PROVIDER_available(NULL, "fips")))
         goto err;
 
     if (!test_skip_common_options()) {
@@ -2683,9 +2969,9 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(modulename = test_get_argument(0))
-            || !TEST_ptr(configfile = test_get_argument(1))
-            || !TEST_ptr(certsdir = test_get_argument(2))
-            || !TEST_ptr(datadir = test_get_argument(3)))
+        || !TEST_ptr(configfile = test_get_argument(1))
+        || !TEST_ptr(certsdir = test_get_argument(2))
+        || !TEST_ptr(datadir = test_get_argument(3)))
         goto err;
 
     if (!TEST_true(OSSL_LIB_CTX_load_config(libctx, configfile)))
@@ -2697,7 +2983,7 @@ int setup_tests(void)
 
     /* Check the default provider is not available */
     if (strcmp(modulename, "default") != 0
-            && !TEST_false(OSSL_PROVIDER_available(libctx, "default")))
+        && !TEST_false(OSSL_PROVIDER_available(libctx, "default")))
         goto err;
 
     if (strcmp(modulename, "fips") == 0)
@@ -2753,8 +3039,12 @@ int setup_tests(void)
 #ifndef OPENSSL_NO_SSL_TRACE
     ADD_TEST(test_new_token);
 #endif
+    ADD_TEST(test_server_method_with_ssl_new);
+    ADD_TEST(test_ssl_accept_connection);
+    ADD_TEST(test_ssl_set_verify);
+    ADD_TEST(test_client_hello_retry);
     return 1;
- err:
+err:
     cleanup_tests();
     return 0;
 }
diff --git a/test/quicfaultstest.c b/test/quicfaultstest.c
index c2187e1ea4295..6e1d58ce02764 100644
--- a/test/quicfaultstest.c
+++ b/test/quicfaultstest.c
@@ -35,7 +35,7 @@ static int test_basic(void)
         goto err;
 
     if (!TEST_true(qtest_create_quic_objects(NULL, cctx, NULL, cert, privkey, 0,
-                                             &qtserv, &cssl, NULL, NULL)))
+            &qtserv, &cssl, NULL, NULL)))
         goto err;
 
     if (!TEST_true(qtest_create_quic_connection(qtserv, cssl)))
@@ -57,7 +57,7 @@ static int test_basic(void)
         goto err;
 
     testresult = 1;
- err:
+err:
     SSL_free(cssl);
     ossl_quic_tserver_free(qtserv);
     SSL_CTX_free(cctx);
@@ -68,7 +68,7 @@ static int test_basic(void)
  * Test that adding an unknown frame type is handled correctly
  */
 static int add_unknown_frame_cb(QTEST_FAULT *fault, QUIC_PKT_HDR *hdr,
-                                unsigned char *buf, size_t len, void *cbarg)
+    unsigned char *buf, size_t len, void *cbarg)
 {
     static size_t done = 0;
     /*
@@ -85,7 +85,7 @@ static int add_unknown_frame_cb(QTEST_FAULT *fault, QUIC_PKT_HDR *hdr,
         return 1;
 
     return qtest_fault_prepend_frame(fault, unknown_frame,
-                                     sizeof(unknown_frame));
+        sizeof(unknown_frame));
 }
 
 static int test_unknown_frame(void)
@@ -105,7 +105,7 @@ static int test_unknown_frame(void)
         goto err;
 
     if (!TEST_true(qtest_create_quic_objects(NULL, cctx, NULL, cert, privkey, 0,
-                                             &qtserv, &cssl, &fault, NULL)))
+            &qtserv, &cssl, &fault, NULL)))
         goto err;
 
     if (!TEST_true(qtest_create_quic_connection(qtserv, cssl)))
@@ -116,8 +116,8 @@ static int test_unknown_frame(void)
      * type
      */
     if (!TEST_true(qtest_fault_set_packet_plain_listener(fault,
-                                                         add_unknown_frame_cb,
-                                                         NULL)))
+            add_unknown_frame_cb,
+            NULL)))
         goto err;
 
     if (!TEST_true(ossl_quic_tserver_stream_new(qtserv, /*is_uni=*/0, &sid))
@@ -125,7 +125,7 @@ static int test_unknown_frame(void)
         goto err;
 
     if (!TEST_true(ossl_quic_tserver_write(qtserv, sid, (unsigned char *)msg, msglen,
-                                           &byteswritten)))
+            &byteswritten)))
         goto err;
 
     if (!TEST_size_t_eq(msglen, byteswritten))
@@ -142,14 +142,14 @@ static int test_unknown_frame(void)
         goto err;
 
     if (!TEST_int_eq(ERR_GET_REASON(ERR_peek_error()),
-                     SSL_R_QUIC_PROTOCOL_ERROR))
+            SSL_R_QUIC_PROTOCOL_ERROR))
         goto err;
 
     if (!TEST_true(qtest_check_server_frame_encoding_err(qtserv)))
         goto err;
 
     testresult = 1;
- err:
+err:
     qtest_fault_free(fault);
     SSL_free(cssl);
     ossl_quic_tserver_free(qtserv);
@@ -162,13 +162,13 @@ static int test_unknown_frame(void)
  * connected to.
  */
 static int drop_extensions_cb(QTEST_FAULT *fault,
-                                    QTEST_ENCRYPTED_EXTENSIONS *ee,
-                                    size_t eelen, void *encextcbarg)
+    QTEST_ENCRYPTED_EXTENSIONS *ee,
+    size_t eelen, void *encextcbarg)
 {
     int *ext = (int *)encextcbarg;
 
     if (!qtest_fault_delete_extension(fault, *ext, ee->extensions,
-                                      &ee->extensionslen, NULL))
+            &ee->extensionslen, NULL))
         return 0;
 
     return 1;
@@ -187,7 +187,7 @@ static int test_drop_extensions(int idx)
         goto err;
 
     if (!TEST_true(qtest_create_quic_objects(NULL, cctx, NULL, cert, privkey, 0,
-                                             &qtserv, &cssl, &fault, NULL)))
+            &qtserv, &cssl, &fault, NULL)))
         goto err;
 
     if (idx == 0) {
@@ -199,8 +199,8 @@ static int test_drop_extensions(int idx)
     }
 
     if (!TEST_true(qtest_fault_set_hand_enc_ext_listener(fault,
-                                                         drop_extensions_cb,
-                                                         &ext)))
+            drop_extensions_cb,
+            &ext)))
         goto err;
 
     /*
@@ -214,7 +214,7 @@ static int test_drop_extensions(int idx)
         goto err;
 
     testresult = 1;
- err:
+err:
     qtest_fault_free(fault);
     SSL_free(cssl);
     ossl_quic_tserver_free(qtserv);
@@ -228,7 +228,7 @@ static int test_drop_extensions(int idx)
 static int docorrupt = 0;
 
 static int on_packet_cipher_cb(QTEST_FAULT *fault, QUIC_PKT_HDR *hdr,
-                               unsigned char *buf, size_t len, void *cbarg)
+    unsigned char *buf, size_t len, void *cbarg)
 {
     if (!docorrupt || len == 0)
         return 1;
@@ -240,7 +240,7 @@ static int on_packet_cipher_cb(QTEST_FAULT *fault, QUIC_PKT_HDR *hdr,
 }
 
 static int on_datagram_cb(QTEST_FAULT *fault, BIO_MSG *m, size_t stride,
-                          void *cbarg)
+    void *cbarg)
 {
     if (!docorrupt || m->data_len == 0)
         return 1;
@@ -274,21 +274,21 @@ static int test_corrupted_data(int idx)
         goto err;
 
     if (!TEST_true(qtest_create_quic_objects(NULL, cctx, NULL, cert, privkey,
-                                             QTEST_FLAG_FAKE_TIME, &qtserv,
-                                             &cssl, &fault, NULL)))
+            QTEST_FLAG_FAKE_TIME, &qtserv,
+            &cssl, &fault, NULL)))
         goto err;
 
     if (idx == 0) {
         /* Listen for encrypted packets being sent */
         if (!TEST_true(qtest_fault_set_packet_cipher_listener(fault,
-                                                              on_packet_cipher_cb,
-                                                              NULL)))
+                on_packet_cipher_cb,
+                NULL)))
             goto err;
     } else {
         /* Listen for datagrams being sent */
         if (!TEST_true(qtest_fault_set_datagram_listener(fault,
-                                                         on_datagram_cb,
-                                                         NULL)))
+                on_datagram_cb,
+                NULL)))
             goto err;
     }
     if (!TEST_true(qtest_create_quic_connection(qtserv, cssl)))
@@ -306,7 +306,7 @@ static int test_corrupted_data(int idx)
      * "lost"
      */
     if (!TEST_true(ossl_quic_tserver_write(qtserv, sid, (unsigned char *)msg, 5,
-                                           &byteswritten)))
+            &byteswritten)))
         goto err;
 
     if (!TEST_size_t_eq(byteswritten, 5))
@@ -322,7 +322,7 @@ static int test_corrupted_data(int idx)
 
     /* Send rest of message */
     if (!TEST_true(ossl_quic_tserver_write(qtserv, sid, (unsigned char *)msg + 5,
-                                           msglen - 5, &byteswritten)))
+            msglen - 5, &byteswritten)))
         goto err;
 
     if (!TEST_size_t_eq(byteswritten, msglen - 5))
@@ -361,7 +361,7 @@ static int test_corrupted_data(int idx)
         goto err;
 
     testresult = 1;
- err:
+err:
     qtest_fault_free(fault);
     SSL_free(cssl);
     ossl_quic_tserver_free(qtserv);
@@ -398,7 +398,7 @@ int setup_tests(void)
 
     return 1;
 
- err:
+err:
     OPENSSL_free(cert);
     OPENSSL_free(privkey);
     return 0;
diff --git a/test/radix/main.c b/test/radix/main.c
index 4a1e886a716d8..0f3dc11663779 100644
--- a/test/radix/main.c
+++ b/test/radix/main.c
@@ -23,7 +23,7 @@ static int test_script(int idx)
 {
     SCRIPT_INFO *script_info = scripts[idx];
     int testresult;
-    TERP_CONFIG cfg = {0};
+    TERP_CONFIG cfg = { 0 };
 
     if (!TEST_true(bindings_process_init(0, 0)))
         return 0;
diff --git a/test/radix/quic_bindings.c b/test/radix/quic_bindings.c
index 49b8e28ef69a7..eb9423ef314e2 100644
--- a/test/radix/quic_bindings.c
+++ b/test/radix/quic_bindings.c
@@ -48,57 +48,57 @@
  * objects.
  */
 typedef struct radix_obj_st {
-    char                *name;  /* owned, zero-terminated */
-    SSL                 *ssl;   /* owns one reference */
-    unsigned int        registered      : 1; /* in LHASH? */
-    unsigned int        active          : 1; /* tick? */
+    char *name; /* owned, zero-terminated */
+    SSL *ssl; /* owns one reference */
+    unsigned int registered : 1; /* in LHASH? */
+    unsigned int active : 1; /* tick? */
 } RADIX_OBJ;
 
 DEFINE_LHASH_OF_EX(RADIX_OBJ);
 
 /* Process-level state (i.e. "globals" in the normal sense of the word) */
 typedef struct radix_process_st {
-    size_t                  node_idx;
-    size_t                  process_idx;
-    size_t                  next_thread_idx;
-    STACK_OF(RADIX_THREAD)  *threads;
+    size_t node_idx;
+    size_t process_idx;
+    size_t next_thread_idx;
+    STACK_OF(RADIX_THREAD) *threads;
 
     /* Process-global state. */
-    CRYPTO_MUTEX            *gm;            /* global mutex */
-    LHASH_OF(RADIX_OBJ)     *objs;          /* protected by gm */
-    OSSL_TIME               time_slip;      /* protected by gm */
-    BIO                     *keylog_out;    /* protected by gm */
+    CRYPTO_MUTEX *gm; /* global mutex */
+    LHASH_OF(RADIX_OBJ) *objs; /* protected by gm */
+    OSSL_TIME time_slip; /* protected by gm */
+    BIO *keylog_out; /* protected by gm */
 
-    int                     done_join_all_threads;
+    int done_join_all_threads;
 
     /*
      * Valid if done_join_all threads. Logical AND of all child worker results.
      */
-    int                     thread_composite_testresult;
+    int thread_composite_testresult;
 } RADIX_PROCESS;
 
-#define NUM_SLOTS       8
+#define NUM_SLOTS 8
 
 /* Thread-level state within a process */
 typedef struct radix_thread_st {
-    RADIX_PROCESS       *rp;
-    CRYPTO_THREAD       *t;
-    unsigned char       *tmp_buf;
-    size_t              tmp_buf_offset;
-    size_t              thread_idx; /* 0=main thread */
-    RADIX_OBJ           *slot[NUM_SLOTS];
-    SSL                 *ssl[NUM_SLOTS];
+    RADIX_PROCESS *rp;
+    CRYPTO_THREAD *t;
+    unsigned char *tmp_buf;
+    size_t tmp_buf_offset;
+    size_t thread_idx; /* 0=main thread */
+    RADIX_OBJ *slot[NUM_SLOTS];
+    SSL *ssl[NUM_SLOTS];
 
     /* child thread spawn arguments */
-    SCRIPT_INFO         *child_script_info;
-    BIO                 *debug_bio;
+    SCRIPT_INFO *child_script_info;
+    BIO *debug_bio;
 
     /* m protects all of the below values */
-    CRYPTO_MUTEX        *m;
-    int                 done;
-    int                 testresult; /* valid if done */
+    CRYPTO_MUTEX *m;
+    int done;
+    int testresult; /* valid if done */
 
-    uint64_t            scratch0;
+    uint64_t scratch0;
 } RADIX_THREAD;
 
 DEFINE_STACK_OF(RADIX_THREAD)
@@ -112,14 +112,14 @@ static RADIX_OBJ *RADIX_OBJ_new(const char *name, SSL *ssl)
         return NULL;
 
     if (!TEST_ptr(obj = OPENSSL_zalloc(sizeof(*obj))))
-       return NULL;
+        return NULL;
 
     if (!TEST_ptr(obj->name = OPENSSL_strdup(name))) {
         OPENSSL_free(obj);
         return NULL;
     }
 
-    obj->ssl  = ssl;
+    obj->ssl = ssl;
     return obj;
 }
 
@@ -166,10 +166,10 @@ static int RADIX_PROCESS_init(RADIX_PROCESS *rp, size_t node_idx, size_t process
         && !TEST_ptr(rp->keylog_out = BIO_new_file(keylog_path, "a")))
         goto err;
 
-    rp->node_idx                = node_idx;
-    rp->process_idx             = process_idx;
-    rp->done_join_all_threads   = 0;
-    rp->next_thread_idx         = 0;
+    rp->node_idx = node_idx;
+    rp->process_idx = process_idx;
+    rp->done_join_all_threads = 0;
+    rp->next_thread_idx = 0;
     return 1;
 
 err:
@@ -202,7 +202,7 @@ static const char *stream_state_to_str(int state)
 }
 
 static void report_ssl_state(BIO *bio, const char *pfx, int is_write,
-                             int state, uint64_t ec)
+    int state, uint64_t ec)
 {
     const char *state_s = stream_state_to_str(state);
 
@@ -217,7 +217,7 @@ static void report_ssl(SSL *ssl, BIO *bio, const char *pfx)
 {
     const char *type = "SSL";
     int is_quic = SSL_is_quic(ssl), is_conn = 0, is_listener = 0;
-    SSL_CONN_CLOSE_INFO cc_info = {0};
+    SSL_CONN_CLOSE_INFO cc_info = { 0 };
     const char *e_str, *f_str;
 
     if (is_quic) {
@@ -246,17 +246,19 @@ static void report_ssl(SSL *ssl, BIO *bio, const char *pfx)
             f_str = "?";
 
         BIO_printf(bio, "%sConnection is closed: %s(%llu)/%s(%llu), "
-                   "%s, %s, reason: \"%s\"\n",
-                   pfx,
-                   e_str,
-                   (unsigned long long)cc_info.error_code,
-                   f_str,
-                   (unsigned long long)cc_info.frame_type,
-                   (cc_info.flags & SSL_CONN_CLOSE_FLAG_LOCAL) != 0
-                     ? "local" : "remote",
-                   (cc_info.flags & SSL_CONN_CLOSE_FLAG_TRANSPORT) != 0
-                     ? "transport" : "app",
-                   cc_info.reason != NULL ? cc_info.reason : "-");
+                        "%s, %s, reason: \"%s\"\n",
+            pfx,
+            e_str,
+            (unsigned long long)cc_info.error_code,
+            f_str,
+            (unsigned long long)cc_info.frame_type,
+            (cc_info.flags & SSL_CONN_CLOSE_FLAG_LOCAL) != 0
+                ? "local"
+                : "remote",
+            (cc_info.flags & SSL_CONN_CLOSE_FLAG_TRANSPORT) != 0
+                ? "transport"
+                : "app",
+            cc_info.reason != NULL ? cc_info.reason : "-");
     }
 
     if (is_quic && !is_listener) {
@@ -265,7 +267,7 @@ static void report_ssl(SSL *ssl, BIO *bio, const char *pfx)
 
         if (stream_id != UINT64_MAX)
             BIO_printf(bio, "%sStream ID: %llu\n", pfx,
-                       (unsigned long long)stream_id);
+                (unsigned long long)stream_id);
 
         rstate = SSL_get_stream_read_state(ssl);
         wstate = SSL_get_stream_write_state(ssl);
@@ -302,30 +304,30 @@ static void RADIX_THREAD_report_state(RADIX_THREAD *rt, BIO *bio)
             BIO_printf(bio, "  %3zu) <NULL>\n", i);
         else
             BIO_printf(bio, "  %3zu) '%s' (SSL: %p)\n", i,
-                       rt->slot[i]->name,
-                       (void *)rt->ssl[i]);
+                rt->slot[i]->name,
+                (void *)rt->ssl[i]);
 }
 
 static void RADIX_PROCESS_report_state(RADIX_PROCESS *rp, BIO *bio,
-                                       int verbose)
+    int verbose)
 {
     BIO_printf(bio, "Final process state for node %zu, process %zu:\n",
-               rp->node_idx, rp->process_idx);
+        rp->node_idx, rp->process_idx);
 
     BIO_printf(bio, "  Threads (incl. main):        %zu\n",
-               rp->next_thread_idx);
+        rp->next_thread_idx);
     BIO_printf(bio, "  Time slip:                   %llu ms\n",
-               (unsigned long long)ossl_time2ms(rp->time_slip));
+        (unsigned long long)ossl_time2ms(rp->time_slip));
 
     BIO_printf(bio, "  Objects:\n");
     lh_RADIX_OBJ_doall_arg(rp->objs, report_obj, bio);
 
     if (verbose)
         RADIX_THREAD_report_state(sk_RADIX_THREAD_value(rp->threads, 0),
-                                  bio_err);
+            bio_err);
 
     BIO_printf(bio, "\n==========================================="
-               "===========================\n");
+                    "===========================\n");
 }
 
 static void RADIX_PROCESS_report_thread_results(RADIX_PROCESS *rp, BIO *bio)
@@ -346,9 +348,9 @@ static void RADIX_PROCESS_report_thread_results(RADIX_PROCESS *rp, BIO *bio)
         ossl_crypto_mutex_unlock(rt->m);
 
         BIO_printf(bio, "\n====(n%zu/p%zu/t%zu)============================"
-                   "===========================\n"
-                   "Result for child thread with index %zu:\n",
-                   rp->node_idx, rp->process_idx, rt->thread_idx, rt->thread_idx);
+                        "===========================\n"
+                        "Result for child thread with index %zu:\n",
+            rp->node_idx, rp->process_idx, rt->thread_idx, rt->thread_idx);
 
         BIO_snprintf(pfx_buf, sizeof(pfx_buf), "#  -T-%2zu:\t# ", rt->thread_idx);
         BIO_set_prefix(bio_err, pfx_buf);
@@ -358,13 +360,13 @@ static void RADIX_PROCESS_report_thread_results(RADIX_PROCESS *rp, BIO *bio)
         BIO_printf(bio, "\n");
         BIO_set_prefix(bio_err, "# ");
         BIO_printf(bio, "==> Child thread with index %zu exited with %d\n",
-                   rt->thread_idx, rt_testresult);
+            rt->thread_idx, rt_testresult);
         if (!rt_testresult)
             RADIX_THREAD_report_state(rt, bio);
     }
 
     BIO_printf(bio, "\n==========================================="
-               "===========================\n");
+                    "===========================\n");
 }
 
 static int RADIX_THREAD_join(RADIX_THREAD *rt);
@@ -394,8 +396,8 @@ static int RADIX_PROCESS_join_all_threads(RADIX_PROCESS *rp, int *testresult)
     }
 
     rp->thread_composite_testresult = composite_testresult;
-    *testresult                     = composite_testresult;
-    rp->done_join_all_threads       = 1;
+    *testresult = composite_testresult;
+    rp->done_join_all_threads = 1;
 
     RADIX_PROCESS_report_thread_results(rp, bio_err);
     return ok;
@@ -439,7 +441,7 @@ static RADIX_OBJ *RADIX_PROCESS_get_obj(RADIX_PROCESS *rp, const char *name)
 }
 
 static int RADIX_PROCESS_set_obj(RADIX_PROCESS *rp,
-                                 const char *name, RADIX_OBJ *obj)
+    const char *name, RADIX_OBJ *obj)
 {
     RADIX_OBJ *existing;
 
@@ -497,7 +499,7 @@ static RADIX_THREAD *RADIX_THREAD_new(RADIX_PROCESS *rp)
         || !TEST_ptr(rt = OPENSSL_zalloc(sizeof(*rt))))
         return 0;
 
-    rt->rp          = rp;
+    rt->rp = rp;
 
 #if defined(OPENSSL_THREADS)
     if (!TEST_ptr(rt->m = ossl_crypto_mutex_new())) {
@@ -511,7 +513,7 @@ static RADIX_THREAD *RADIX_THREAD_new(RADIX_PROCESS *rp)
         return 0;
     }
 
-    rt->thread_idx  = rp->next_thread_idx++;
+    rt->thread_idx = rp->next_thread_idx++;
     assert(rt->thread_idx + 1 == (size_t)sk_RADIX_THREAD_num(rp->threads));
     return rt;
 }
@@ -544,8 +546,8 @@ static int RADIX_THREAD_join(RADIX_THREAD *rt)
     return 1;
 }
 
-static RADIX_PROCESS        radix_process;
-static CRYPTO_THREAD_LOCAL  radix_thread;
+static RADIX_PROCESS radix_process;
+static CRYPTO_THREAD_LOCAL radix_thread;
 
 static void radix_thread_cleanup_tl(void *p)
 {
@@ -592,7 +594,7 @@ static int bindings_process_init(size_t node_idx, size_t process_idx)
         return 0;
 
     if (!TEST_true(CRYPTO_THREAD_init_local(&radix_thread,
-                                            radix_thread_cleanup_tl)))
+            radix_thread_cleanup_tl)))
         return 0;
 
     if (!TEST_ptr(rt = RADIX_THREAD_new(&radix_process)))
@@ -607,12 +609,12 @@ static int bindings_process_finish(int testresult_main)
     int testresult, testresult_child;
 
     if (!TEST_true(RADIX_PROCESS_join_all_threads(&radix_process,
-                                                  &testresult_child)))
+            &testresult_child)))
         return 0;
 
     testresult = testresult_main && testresult_child;
     RADIX_PROCESS_report_state(&radix_process, bio_err,
-                               /*verbose=*/!testresult);
+        /*verbose=*/!testresult);
     radix_thread_cleanup(); /* cleanup main thread */
     RADIX_PROCESS_cleanup(&radix_process);
 
@@ -620,13 +622,13 @@ static int bindings_process_finish(int testresult_main)
         BIO_printf(bio_err, "==> OK\n\n");
     else
         BIO_printf(bio_err, "==> ERROR (main=%d, children=%d)\n\n",
-                   testresult_main, testresult_child);
+            testresult_main, testresult_child);
 
     return testresult;
 }
 
-#define RP()    (&radix_process)
-#define RT()    (radix_get_thread())
+#define RP() (&radix_process)
+#define RT() (radix_get_thread())
 
 static OSSL_TIME get_time(void *arg)
 {
@@ -660,8 +662,8 @@ static int do_per_op(TERP *terp, void *arg)
 
 static int bindings_adjust_terp_config(TERP_CONFIG *cfg)
 {
-    cfg->now_cb     = get_time;
-    cfg->per_op_cb  = do_per_op;
+    cfg->now_cb = get_time;
+    cfg->per_op_cb = do_per_op;
     return 1;
 }
 
@@ -674,42 +676,42 @@ static int expect_slot_ssl(FUNC_CTX *fctx, size_t idx, SSL **p_ssl)
     return 1;
 }
 
-#define REQUIRE_SSL_N(idx, ssl)                                 \
-    do {                                                        \
-        (ssl) = NULL; /* quiet uninitialized warnings */        \
-        if (!TEST_true(expect_slot_ssl(fctx, (idx), &(ssl))))   \
-            goto err;                                           \
+#define REQUIRE_SSL_N(idx, ssl)                               \
+    do {                                                      \
+        (ssl) = NULL; /* quiet uninitialized warnings */      \
+        if (!TEST_true(expect_slot_ssl(fctx, (idx), &(ssl)))) \
+            goto err;                                         \
     } while (0)
-#define REQUIRE_SSL(ssl)    REQUIRE_SSL_N(0, (ssl))
+#define REQUIRE_SSL(ssl) REQUIRE_SSL_N(0, (ssl))
 
-#define REQUIRE_SSL_2(a, b)                                     \
-    do {                                                        \
-        REQUIRE_SSL_N(0, (a));                                  \
-        REQUIRE_SSL_N(1, (b));                                  \
+#define REQUIRE_SSL_2(a, b)    \
+    do {                       \
+        REQUIRE_SSL_N(0, (a)); \
+        REQUIRE_SSL_N(1, (b)); \
     } while (0)
 
-#define REQUIRE_SSL_3(a, b, c)                                  \
-    do {                                                        \
-        REQUIRE_SSL_N(0, (a));                                  \
-        REQUIRE_SSL_N(1, (b));                                  \
-        REQUIRE_SSL_N(2, (c));                                  \
+#define REQUIRE_SSL_3(a, b, c) \
+    do {                       \
+        REQUIRE_SSL_N(0, (a)); \
+        REQUIRE_SSL_N(1, (b)); \
+        REQUIRE_SSL_N(2, (c)); \
     } while (0)
 
-#define REQUIRE_SSL_4(a, b, c, d)                               \
-    do {                                                        \
-        REQUIRE_SSL_N(0, (a));                                  \
-        REQUIRE_SSL_N(1, (b));                                  \
-        REQUIRE_SSL_N(2, (c));                                  \
-        REQUIRE_SSL_N(3, (d));                                  \
+#define REQUIRE_SSL_4(a, b, c, d) \
+    do {                          \
+        REQUIRE_SSL_N(0, (a));    \
+        REQUIRE_SSL_N(1, (b));    \
+        REQUIRE_SSL_N(2, (c));    \
+        REQUIRE_SSL_N(3, (d));    \
     } while (0)
 
-#define REQUIRE_SSL_5(a, b, c, d, e)                            \
-    do {                                                        \
-        REQUIRE_SSL_N(0, (a));                                  \
-        REQUIRE_SSL_N(1, (b));                                  \
-        REQUIRE_SSL_N(2, (c));                                  \
-        REQUIRE_SSL_N(3, (d));                                  \
-        REQUIRE_SSL_N(4, (e));                                  \
+#define REQUIRE_SSL_5(a, b, c, d, e) \
+    do {                             \
+        REQUIRE_SSL_N(0, (a));       \
+        REQUIRE_SSL_N(1, (b));       \
+        REQUIRE_SSL_N(2, (c));       \
+        REQUIRE_SSL_N(3, (d));       \
+        REQUIRE_SSL_N(4, (e));       \
     } while (0)
 
 #define C_BIDI_ID(ordinal) \
@@ -726,7 +728,7 @@ static int expect_slot_ssl(FUNC_CTX *fctx, size_t idx, SSL **p_ssl)
 static int RADIX_THREAD_worker_run(RADIX_THREAD *rt)
 {
     int ok = 0;
-    TERP_CONFIG cfg = {0};
+    TERP_CONFIG cfg = { 0 };
 
     cfg.debug_bio = rt->debug_bio;
     if (!TEST_true(bindings_adjust_terp_config(&cfg)))
@@ -755,8 +757,8 @@ static unsigned int RADIX_THREAD_worker_main(void *p)
     testresult = RADIX_THREAD_worker_run(rt);
 
     ossl_crypto_mutex_lock(rt->m);
-    rt->testresult  = testresult;
-    rt->done        = 1;
+    rt->testresult = testresult;
+    rt->done = 1;
     ossl_crypto_mutex_unlock(rt->m);
 
     radix_thread_cleanup();
@@ -799,11 +801,11 @@ DEF_FUNC(hf_spawn_thread)
     if (!TEST_ptr(child_rt->debug_bio = BIO_new(BIO_s_mem())))
         goto err;
 
-    ossl_crypto_mutex_lock(child_rt->m);
-
     child_rt->child_script_info = script_info;
+
+    ossl_crypto_mutex_lock(child_rt->m);
     if (!TEST_ptr(child_rt->t = ossl_crypto_thread_native_start(RADIX_THREAD_worker_main,
-                                                                child_rt, 1))) {
+                      child_rt, 1))) {
         ossl_crypto_mutex_unlock(child_rt->m);
         goto err;
     }
@@ -830,14 +832,14 @@ DEF_FUNC(hf_clear)
 
     for (i = 0; i < NUM_SLOTS; ++i) {
         rt->slot[i] = NULL;
-        rt->ssl[i]  = NULL;
+        rt->ssl[i] = NULL;
     }
 
     ossl_crypto_mutex_unlock(RP()->gm);
     return 1;
 }
 
-#define OP_SPAWN_THREAD(script_name)                            \
+#define OP_SPAWN_THREAD(script_name) \
     (OP_PUSH_P(SCRIPT(script_name)), OP_FUNC(hf_spawn_thread))
-#define OP_CLEAR()                                              \
+#define OP_CLEAR() \
     (OP_FUNC(hf_clear))
diff --git a/test/radix/quic_ops.c b/test/radix/quic_ops.c
index e3167a565ba40..4475f91803232 100644
--- a/test/radix/quic_ops.c
+++ b/test/radix/quic_ops.c
@@ -7,6 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 #include "internal/sockets.h"
+#include <openssl/rand.h>
 
 static const unsigned char alpn_ossltest[] = {
     /* "\x08ossltest" (hex for EBCDIC resilience) */
@@ -27,13 +28,13 @@ DEF_FUNC(hf_unbind)
 }
 
 static int ssl_ctx_select_alpn(SSL *ssl,
-                               const unsigned char **out, unsigned char *out_len,
-                               const unsigned char *in, unsigned int in_len,
-                               void *arg)
+    const unsigned char **out, unsigned char *out_len,
+    const unsigned char *in, unsigned int in_len,
+    void *arg)
 {
     if (SSL_select_next_proto((unsigned char **)out, out_len,
-                              alpn_ossltest, sizeof(alpn_ossltest), in, in_len)
-            != OPENSSL_NPN_NEGOTIATED)
+            alpn_ossltest, sizeof(alpn_ossltest), in, in_len)
+        != OPENSSL_NPN_NEGOTIATED)
         return SSL_TLSEXT_ERR_ALERT_FATAL;
 
     return SSL_TLSEXT_ERR_OK;
@@ -59,9 +60,11 @@ static int ssl_ctx_configure(SSL_CTX *ctx, int is_server)
         SSL_CTX_set_keylog_callback(ctx, keylog_cb);
 
     if (!TEST_int_eq(SSL_CTX_use_certificate_file(ctx, cert_file,
-                                                  SSL_FILETYPE_PEM), 1)
+                         SSL_FILETYPE_PEM),
+            1)
         || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(ctx, key_file,
-                                                    SSL_FILETYPE_PEM), 1))
+                            SSL_FILETYPE_PEM),
+            1))
         return 0;
 
     SSL_CTX_set_alpn_select_cb(ctx, ssl_ctx_select_alpn, NULL);
@@ -69,7 +72,7 @@ static int ssl_ctx_configure(SSL_CTX *ctx, int is_server)
 }
 
 static int ssl_create_bound_socket(uint16_t listen_port,
-                                   int *p_fd, uint16_t *p_result_port)
+    int *p_fd, uint16_t *p_result_port)
 {
     int ok = 0;
     int fd = -1;
@@ -90,7 +93,7 @@ static int ssl_create_bound_socket(uint16_t listen_port,
         goto err;
 
     if (!TEST_true(BIO_ADDR_rawmake(addr, AF_INET,
-                                    &ina, sizeof(ina), 0)))
+            &ina, sizeof(ina), 0)))
         goto err;
 
     if (!TEST_true(BIO_bind(fd, addr, 0)))
@@ -117,7 +120,7 @@ static int ssl_create_bound_socket(uint16_t listen_port,
 }
 
 static int ssl_attach_bio_dgram(SSL *ssl,
-                                uint16_t local_port, uint16_t *actual_port)
+    uint16_t local_port, uint16_t *actual_port)
 {
     int s_fd = -1;
     BIO *bio;
@@ -190,8 +193,8 @@ DEF_FUNC(hf_new_ssl)
 
     F_POP2(name, flags);
 
-    is_domain   = ((flags & 2) != 0);
-    is_server   = ((flags & 1) != 0);
+    is_domain = ((flags & 2) != 0);
+    is_server = ((flags & 1) != 0);
 
     method = is_server ? OSSL_QUIC_server_method() : OSSL_QUIC_client_method();
     if (!TEST_ptr(ctx = SSL_CTX_new(method)))
@@ -199,8 +202,8 @@ DEF_FUNC(hf_new_ssl)
 
 #if defined(OPENSSL_THREADS)
     if (!TEST_true(SSL_CTX_set_domain_flags(ctx,
-                                            SSL_DOMAIN_FLAG_MULTI_THREAD
-                                            | SSL_DOMAIN_FLAG_BLOCKING)))
+            SSL_DOMAIN_FLAG_MULTI_THREAD
+                | SSL_DOMAIN_FLAG_BLOCKING)))
         goto err;
 #endif
 
@@ -422,7 +425,7 @@ DEF_FUNC(hf_stream_reset)
 {
     int ok = 0;
     const char *name;
-    SSL_STREAM_RESET_ARGS args = {0};
+    SSL_STREAM_RESET_ARGS args = { 0 };
     SSL *ssl;
 
     F_POP2(name, args.quic_error_code);
@@ -476,7 +479,7 @@ DEF_FUNC(hf_shutdown_wait)
     int ok = 0, ret;
     uint64_t flags;
     SSL *ssl;
-    SSL_SHUTDOWN_EX_ARGS args = {0};
+    SSL_SHUTDOWN_EX_ARGS args = { 0 };
     QUIC_CHANNEL *ch;
 
     F_POP(args.quic_reason);
@@ -527,16 +530,15 @@ static int check_consistent_want(SSL *s, int ret)
     int w = SSL_want(s);
 
     int ok = TEST_true(
-        (ec == SSL_ERROR_NONE                 && w == SSL_NOTHING)
-    ||  (ec == SSL_ERROR_ZERO_RETURN          && w == SSL_NOTHING)
-    ||  (ec == SSL_ERROR_SSL                  && w == SSL_NOTHING)
-    ||  (ec == SSL_ERROR_SYSCALL              && w == SSL_NOTHING)
-    ||  (ec == SSL_ERROR_WANT_READ            && w == SSL_READING)
-    ||  (ec == SSL_ERROR_WANT_WRITE           && w == SSL_WRITING)
-    ||  (ec == SSL_ERROR_WANT_CLIENT_HELLO_CB && w == SSL_CLIENT_HELLO_CB)
-    ||  (ec == SSL_ERROR_WANT_X509_LOOKUP     && w == SSL_X509_LOOKUP)
-    ||  (ec == SSL_ERROR_WANT_RETRY_VERIFY    && w == SSL_RETRY_VERIFY)
-    );
+        (ec == SSL_ERROR_NONE && w == SSL_NOTHING)
+        || (ec == SSL_ERROR_ZERO_RETURN && w == SSL_NOTHING)
+        || (ec == SSL_ERROR_SSL && w == SSL_NOTHING)
+        || (ec == SSL_ERROR_SYSCALL && w == SSL_NOTHING)
+        || (ec == SSL_ERROR_WANT_READ && w == SSL_READING)
+        || (ec == SSL_ERROR_WANT_WRITE && w == SSL_WRITING)
+        || (ec == SSL_ERROR_WANT_CLIENT_HELLO_CB && w == SSL_CLIENT_HELLO_CB)
+        || (ec == SSL_ERROR_WANT_X509_LOOKUP && w == SSL_X509_LOOKUP)
+        || (ec == SSL_ERROR_WANT_RETRY_VERIFY && w == SSL_RETRY_VERIFY));
 
     if (!ok)
         TEST_error("got error=%d, want=%d", ec, w);
@@ -565,6 +567,40 @@ DEF_FUNC(hf_write)
     return ok;
 }
 
+DEF_FUNC(hf_write_rand)
+{
+    int ok = 0, r;
+    SSL *ssl;
+    void *buf = NULL;
+    size_t buf_len, bytes_written = 0;
+
+    F_POP(buf_len);
+    REQUIRE_SSL(ssl);
+
+    while (buf_len > 0) {
+        size_t thislen = buf_len > 1024 ? 1024 : buf_len;
+
+        if (buf == NULL)
+            buf = OPENSSL_malloc(thislen);
+        if (!TEST_ptr(buf))
+            goto err;
+        if (!TEST_int_eq(RAND_bytes(buf, thislen), 1))
+            goto err;
+        r = SSL_write_ex(ssl, buf, thislen, &bytes_written);
+        if (!TEST_true(r)
+            || !check_consistent_want(ssl, r)
+            || !TEST_size_t_eq(bytes_written, thislen))
+            goto err;
+
+        buf_len -= thislen;
+    }
+
+    ok = 1;
+err:
+    OPENSSL_free(buf);
+    return ok;
+}
+
 DEF_FUNC(hf_write_ex2)
 {
     int ok = 0, r;
@@ -622,8 +658,8 @@ DEF_FUNC(hf_read_expect)
         goto err;
 
     r = SSL_read_ex(ssl, RT()->tmp_buf + RT()->tmp_buf_offset,
-                    buf_len - RT()->tmp_buf_offset,
-                    &bytes_read);
+        buf_len - RT()->tmp_buf_offset,
+        &bytes_read);
     if (!TEST_true(check_consistent_want(ssl, r)))
         goto err;
 
@@ -640,8 +676,8 @@ DEF_FUNC(hf_read_expect)
         goto err;
 
     OPENSSL_free(RT()->tmp_buf);
-    RT()->tmp_buf         = NULL;
-    RT()->tmp_buf_offset  = 0;
+    RT()->tmp_buf = NULL;
+    RT()->tmp_buf_offset = 0;
 
     ok = 1;
 err:
@@ -652,7 +688,7 @@ DEF_FUNC(hf_read_fail)
 {
     int ok = 0, r;
     SSL *ssl;
-    char buf[1] = {0};
+    char buf[1] = { 0 };
     size_t bytes_read = 0;
     uint64_t do_wait;
 
@@ -687,7 +723,7 @@ DEF_FUNC(hf_connect_wait)
 
         /* 0 is the success case for SSL_set_alpn_protos(). */
         if (!TEST_false(SSL_set_alpn_protos(ssl, alpn_ossltest,
-                                            sizeof(alpn_ossltest))))
+                sizeof(alpn_ossltest))))
             goto err;
     }
 
@@ -778,7 +814,7 @@ DEF_FUNC(hf_expect_fin)
         F_SPIN_AGAIN();
 
     if (!TEST_int_eq(SSL_get_error(ssl, 0),
-                     SSL_ERROR_ZERO_RETURN))
+            SSL_ERROR_ZERO_RETURN))
         goto err;
 
     if (!TEST_int_eq(SSL_want(ssl), SSL_NOTHING))
@@ -793,7 +829,7 @@ DEF_FUNC(hf_expect_conn_close_info)
 {
     int ok = 0;
     SSL *ssl;
-    SSL_CONN_CLOSE_INFO cc_info = {0};
+    SSL_CONN_CLOSE_INFO cc_info = { 0 };
     uint64_t error_code, expect_app, expect_remote;
 
     F_POP(error_code);
@@ -806,9 +842,9 @@ DEF_FUNC(hf_expect_conn_close_info)
         F_SPIN_AGAIN();
 
     if (!TEST_int_eq((int)expect_app,
-                     (cc_info.flags & SSL_CONN_CLOSE_FLAG_TRANSPORT) == 0)
+            (cc_info.flags & SSL_CONN_CLOSE_FLAG_TRANSPORT) == 0)
         || !TEST_int_eq((int)expect_remote,
-                        (cc_info.flags & SSL_CONN_CLOSE_FLAG_LOCAL) == 0)
+            (cc_info.flags & SSL_CONN_CLOSE_FLAG_LOCAL) == 0)
         || !TEST_uint64_t_eq(error_code, cc_info.error_code)) {
         TEST_info("connection close reason: %s", cc_info.reason);
         goto err;
@@ -844,9 +880,9 @@ DEF_FUNC(hf_expect_err)
 
     F_POP2(lib, reason);
     if (!TEST_size_t_eq((size_t)ERR_GET_LIB(ERR_peek_last_error()),
-                        (size_t)lib)
+            (size_t)lib)
         || !TEST_size_t_eq((size_t)ERR_GET_REASON(ERR_peek_last_error()),
-                           (size_t)reason))
+            (size_t)reason))
         goto err;
 
     ok = 1;
@@ -904,8 +940,8 @@ DEF_FUNC(hf_select_ssl)
     if (!TEST_uint64_t_lt(slot, NUM_SLOTS))
         goto err;
 
-    RT()->slot[slot]    = obj;
-    RT()->ssl[slot]     = obj->ssl;
+    RT()->slot[slot] = obj;
+    RT()->ssl[slot] = obj->ssl;
     ok = 1;
 err:
     return ok;
@@ -920,8 +956,8 @@ DEF_FUNC(hf_clear_slot)
     if (!TEST_uint64_t_lt(slot, NUM_SLOTS))
         goto err;
 
-    RT()->slot[slot]    = NULL;
-    RT()->ssl[slot]     = NULL;
+    RT()->slot[slot] = NULL;
+    RT()->ssl[slot] = NULL;
     ok = 1;
 err:
     return ok;
@@ -995,228 +1031,233 @@ DEF_FUNC(hf_sleep)
     return ok;
 }
 
-#define OP_UNBIND(name)                                         \
-    (OP_PUSH_PZ(#name),                                         \
-     OP_FUNC(hf_unbind))
+#define OP_UNBIND(name) \
+    (OP_PUSH_PZ(#name), \
+        OP_FUNC(hf_unbind))
 
-#define OP_SELECT_SSL(slot, name)                               \
-    (OP_PUSH_U64(slot),                                         \
-     OP_PUSH_PZ(#name),                                         \
-     OP_FUNC(hf_select_ssl))
+#define OP_SELECT_SSL(slot, name) \
+    (OP_PUSH_U64(slot),           \
+        OP_PUSH_PZ(#name),        \
+        OP_FUNC(hf_select_ssl))
 
-#define OP_CLEAR_SLOT(slot)                                     \
-    (OP_PUSH_U64(slot),                                         \
-     OP_FUNC(hf_clear_slot))
+#define OP_CLEAR_SLOT(slot) \
+    (OP_PUSH_U64(slot),     \
+        OP_FUNC(hf_clear_slot))
 
-#define OP_CONNECT_WAIT(name)                                   \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_FUNC(hf_connect_wait))
+#define OP_CONNECT_WAIT(name) \
+    (OP_SELECT_SSL(0, name),  \
+        OP_FUNC(hf_connect_wait))
 
-#define OP_LISTEN(name)                                         \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_FUNC(hf_listen))
+#define OP_LISTEN(name)      \
+    (OP_SELECT_SSL(0, name), \
+        OP_FUNC(hf_listen))
 
-#define OP_NEW_SSL_C(name)                                      \
-    (OP_PUSH_PZ(#name),                                         \
-     OP_PUSH_U64(0),                                            \
-     OP_FUNC(hf_new_ssl))
+#define OP_NEW_SSL_C(name) \
+    (OP_PUSH_PZ(#name),    \
+        OP_PUSH_U64(0),    \
+        OP_FUNC(hf_new_ssl))
 
-#define OP_NEW_SSL_L(name)                                      \
-    (OP_PUSH_PZ(#name),                                         \
-     OP_PUSH_U64(1),                                            \
-     OP_FUNC(hf_new_ssl))
+#define OP_NEW_SSL_L(name) \
+    (OP_PUSH_PZ(#name),    \
+        OP_PUSH_U64(1),    \
+        OP_FUNC(hf_new_ssl))
 
-#define OP_NEW_SSL_D(name)                                      \
-    (OP_PUSH_PZ(#name),                                         \
-     OP_PUSH_U64(3),                                            \
-     OP_FUNC(hf_new_ssl))
+#define OP_NEW_SSL_D(name) \
+    (OP_PUSH_PZ(#name),    \
+        OP_PUSH_U64(3),    \
+        OP_FUNC(hf_new_ssl))
 
-#define OP_NEW_SSL_L_LISTEN(name)                               \
-    (OP_NEW_SSL_L(name),                                        \
-     OP_LISTEN(name))
+#define OP_NEW_SSL_L_LISTEN(name) \
+    (OP_NEW_SSL_L(name),          \
+        OP_LISTEN(name))
 
-#define OP_NEW_SSL_L_FROM(domain_name, listener_name, flags)    \
-    (OP_SELECT_SSL(0, domain_name),                             \
-     OP_PUSH_PZ(#listener_name),                                \
-     OP_PUSH_U64(flags),                                        \
-     OP_FUNC(hf_new_ssl_listener_from))
+#define OP_NEW_SSL_L_FROM(domain_name, listener_name, flags) \
+    (OP_SELECT_SSL(0, domain_name),                          \
+        OP_PUSH_PZ(#listener_name),                          \
+        OP_PUSH_U64(flags),                                  \
+        OP_FUNC(hf_new_ssl_listener_from))
 
 #define OP_NEW_SSL_L_FROM_LISTEN(domain_name, listener_name, flags) \
-    (OP_NEW_SSL_L_FROM(domain_name, listener_name, flags),      \
-     OP_LISTEN(listener_name))
-
-#define OP_SET_PEER_ADDR_FROM(dst_name, src_name)               \
-    (OP_SELECT_SSL(0, dst_name),                                \
-     OP_SELECT_SSL(1, src_name),                                \
-     OP_FUNC(hf_set_peer_addr_from))
-
-#define OP_SIMPLE_PAIR_CONN()                                   \
-    (OP_NEW_SSL_L_LISTEN(L),                                    \
-     OP_NEW_SSL_C(C),                                           \
-     OP_SET_PEER_ADDR_FROM(C, L),                               \
-     OP_CONNECT_WAIT(C))
-
-#define OP_SIMPLE_PAIR_CONN_D()                                 \
-    (OP_NEW_SSL_D(Ds),                                          \
-     OP_NEW_SSL_L_FROM_LISTEN(Ds, L, 0),                        \
-     OP_NEW_SSL_C(C),                                           \
-     OP_SET_PEER_ADDR_FROM(C, L),                               \
-     OP_CONNECT_WAIT(C))
-
-#define OP_SIMPLE_PAIR_CONN_ND()                                \
-    (OP_SIMPLE_PAIR_CONN(),                                     \
-     OP_SET_DEFAULT_STREAM_MODE(C, SSL_DEFAULT_STREAM_MODE_NONE))
-
-#define OP_NEW_STREAM(conn_name, stream_name, flags)            \
-    (OP_SELECT_SSL(0, conn_name),                               \
-     OP_PUSH_PZ(#stream_name),                                  \
-     OP_PUSH_U64(flags),                                        \
-     OP_PUSH_U64(0),                                            \
-     OP_FUNC(hf_new_stream))
-
-#define OP_ACCEPT_STREAM_WAIT(conn_name, stream_name, flags)    \
-    (OP_SELECT_SSL(0, conn_name),                               \
-     OP_PUSH_PZ(#stream_name),                                  \
-     OP_PUSH_U64(flags),                                        \
-     OP_PUSH_U64(1),                                            \
-     OP_FUNC(hf_new_stream))
-
-#define OP_ACCEPT_STREAM_NONE(conn_name)                        \
-    (OP_SELECT_SSL(0, conn_name),                               \
-     OP_FUNC(hf_accept_stream_none))
-
-#define OP_ACCEPT_CONN_WAIT(listener_name, conn_name, flags)    \
-    (OP_SELECT_SSL(0, listener_name),                           \
-     OP_PUSH_PZ(#conn_name),                                    \
-     OP_PUSH_U64(flags),                                        \
-     OP_FUNC(hf_accept_conn))
+    (OP_NEW_SSL_L_FROM(domain_name, listener_name, flags),          \
+        OP_LISTEN(listener_name))
+
+#define OP_SET_PEER_ADDR_FROM(dst_name, src_name) \
+    (OP_SELECT_SSL(0, dst_name),                  \
+        OP_SELECT_SSL(1, src_name),               \
+        OP_FUNC(hf_set_peer_addr_from))
+
+#define OP_SIMPLE_PAIR_CONN()        \
+    (OP_NEW_SSL_L_LISTEN(L),         \
+        OP_NEW_SSL_C(C),             \
+        OP_SET_PEER_ADDR_FROM(C, L), \
+        OP_CONNECT_WAIT(C))
+
+#define OP_SIMPLE_PAIR_CONN_D()             \
+    (OP_NEW_SSL_D(Ds),                      \
+        OP_NEW_SSL_L_FROM_LISTEN(Ds, L, 0), \
+        OP_NEW_SSL_C(C),                    \
+        OP_SET_PEER_ADDR_FROM(C, L),        \
+        OP_CONNECT_WAIT(C))
+
+#define OP_SIMPLE_PAIR_CONN_ND() \
+    (OP_SIMPLE_PAIR_CONN(),      \
+        OP_SET_DEFAULT_STREAM_MODE(C, SSL_DEFAULT_STREAM_MODE_NONE))
+
+#define OP_NEW_STREAM(conn_name, stream_name, flags) \
+    (OP_SELECT_SSL(0, conn_name),                    \
+        OP_PUSH_PZ(#stream_name),                    \
+        OP_PUSH_U64(flags),                          \
+        OP_PUSH_U64(0),                              \
+        OP_FUNC(hf_new_stream))
+
+#define OP_ACCEPT_STREAM_WAIT(conn_name, stream_name, flags) \
+    (OP_SELECT_SSL(0, conn_name),                            \
+        OP_PUSH_PZ(#stream_name),                            \
+        OP_PUSH_U64(flags),                                  \
+        OP_PUSH_U64(1),                                      \
+        OP_FUNC(hf_new_stream))
+
+#define OP_ACCEPT_STREAM_NONE(conn_name) \
+    (OP_SELECT_SSL(0, conn_name),        \
+        OP_FUNC(hf_accept_stream_none))
+
+#define OP_ACCEPT_CONN_WAIT(listener_name, conn_name, flags) \
+    (OP_SELECT_SSL(0, listener_name),                        \
+        OP_PUSH_PZ(#conn_name),                              \
+        OP_PUSH_U64(flags),                                  \
+        OP_FUNC(hf_accept_conn))
 
 #define OP_ACCEPT_CONN_WAIT_ND(listener_name, conn_name, flags) \
     (OP_ACCEPT_CONN_WAIT(listener_name, conn_name, flags),      \
-     OP_SET_DEFAULT_STREAM_MODE(conn_name, SSL_DEFAULT_STREAM_MODE_NONE))
+        OP_SET_DEFAULT_STREAM_MODE(conn_name, SSL_DEFAULT_STREAM_MODE_NONE))
 
-#define OP_ACCEPT_CONN_NONE(listener_name)                      \
-    (OP_SELECT_SSL(0, listener_name),                           \
-     OP_FUNC(hf_accept_conn_none))
+#define OP_ACCEPT_CONN_NONE(listener_name) \
+    (OP_SELECT_SSL(0, listener_name),      \
+        OP_FUNC(hf_accept_conn_none))
 
-#define OP_ACCEPT_CONN_WAIT1(listener_name, conn_name, flags)   \
-    (OP_ACCEPT_CONN_WAIT(listener_name, conn_name, flags),      \
-     OP_ACCEPT_CONN_NONE(listener_name))
+#define OP_ACCEPT_CONN_WAIT1(listener_name, conn_name, flags) \
+    (OP_ACCEPT_CONN_WAIT(listener_name, conn_name, flags),    \
+        OP_ACCEPT_CONN_NONE(listener_name))
 
 #define OP_ACCEPT_CONN_WAIT1_ND(listener_name, conn_name, flags) \
     (OP_ACCEPT_CONN_WAIT_ND(listener_name, conn_name, flags),    \
-     OP_ACCEPT_CONN_NONE(listener_name))
+        OP_ACCEPT_CONN_NONE(listener_name))
 
-#define OP_WRITE(name, buf, buf_len)                            \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_PUSH_BUFP(buf, buf_len),                                \
-     OP_FUNC(hf_write))
+#define OP_WRITE(name, buf, buf_len) \
+    (OP_SELECT_SSL(0, name),         \
+        OP_PUSH_BUFP(buf, buf_len),  \
+        OP_FUNC(hf_write))
 
-#define OP_WRITE_B(name, buf)                                   \
+#define OP_WRITE_RAND(name, buf_len) \
+    (OP_SELECT_SSL(0, name),         \
+        OP_PUSH_SIZE(buf_len),       \
+        OP_FUNC(hf_write_rand))
+
+#define OP_WRITE_B(name, buf) \
     OP_WRITE(name, (buf), sizeof(buf))
 
-#define OP_WRITE_EX2(name, buf, buf_len, flags)                 \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_PUSH_BUFP(buf, buf_len),                                \
-     OP_PUSH_U64(flags),                                        \
-     OP_FUNC(hf_write_ex2))
+#define OP_WRITE_EX2(name, buf, buf_len, flags) \
+    (OP_SELECT_SSL(0, name),                    \
+        OP_PUSH_BUFP(buf, buf_len),             \
+        OP_PUSH_U64(flags),                     \
+        OP_FUNC(hf_write_ex2))
 
-#define OP_WRITE_FAIL(name)                                     \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_FUNC(hf_write_fail))
+#define OP_WRITE_FAIL(name)  \
+    (OP_SELECT_SSL(0, name), \
+        OP_FUNC(hf_write_fail))
 
-#define OP_CONCLUDE(name)                                       \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_FUNC(hf_conclude))
+#define OP_CONCLUDE(name)    \
+    (OP_SELECT_SSL(0, name), \
+        OP_FUNC(hf_conclude))
 
-#define OP_READ_EXPECT(name, buf, buf_len)                      \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_PUSH_BUFP(buf, buf_len),                                \
-     OP_FUNC(hf_read_expect))
+#define OP_READ_EXPECT(name, buf, buf_len) \
+    (OP_SELECT_SSL(0, name),               \
+        OP_PUSH_BUFP(buf, buf_len),        \
+        OP_FUNC(hf_read_expect))
 
-#define OP_READ_EXPECT_B(name, buf)                             \
+#define OP_READ_EXPECT_B(name, buf) \
     OP_READ_EXPECT(name, (buf), sizeof(buf))
 
-#define OP_READ_FAIL()                                          \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_PUSH_U64(0),                                            \
-     OP_FUNC(hf_read_fail))
+#define OP_READ_FAIL()       \
+    (OP_SELECT_SSL(0, name), \
+        OP_PUSH_U64(0),      \
+        OP_FUNC(hf_read_fail))
 
-#define OP_READ_FAIL_WAIT(name)                                 \
+#define OP_READ_FAIL_WAIT(name) \
     (OP_SELECT_SSL(0, name),                                    \
      OP_PUSH_U64(1),                                            \
      OP_FUNC(hf_read_fail)
 
-#define OP_POP_ERR()                                            \
+#define OP_POP_ERR() \
     OP_FUNC(hf_pop_err)
 
-#define OP_SET_DEFAULT_STREAM_MODE(name, mode)                  \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_PUSH_U64(mode),                                         \
-     OP_FUNC(hf_set_default_stream_mode))
+#define OP_SET_DEFAULT_STREAM_MODE(name, mode) \
+    (OP_SELECT_SSL(0, name),                   \
+        OP_PUSH_U64(mode),                     \
+        OP_FUNC(hf_set_default_stream_mode))
 
 #define OP_SET_INCOMING_STREAM_POLICY(name, policy, error_code) \
     (OP_SELECT_SSL(0, name),                                    \
-     OP_PUSH_U64(policy),                                       \
-     OP_PUSH_U64(error_code),                                   \
-     OP_FUNC(hf_set_incoming_stream_policy))
-
-#define OP_STREAM_RESET(name, error_code)                       \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_PUSH_U64(flags),                                        \
-     OP_PUSH_U64(error_code),                                   \
-     OP_FUNC(hf_stream_reset))                                  \
-
-#define OP_SHUTDOWN_WAIT(name, flags, error_code, reason)       \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_PUSH_U64(flags),                                        \
-     OP_PUSH_U64(error_code),                                   \
-     OP_PUSH_PZ(reason),                                        \
-     OP_FUNC(hf_shutdown_wait))
-
-#define OP_DETACH(conn_name, stream_name)                       \
-    (OP_SELECT_SSL(0, conn_name),                               \
-     OP_PUSH_PZ(#stream_name),                                  \
-     OP_FUNC(hf_detach))
-
-#define OP_ATTACH(conn_name, stream_name)                       \
-    (OP_SELECT_SSL(0, conn_name),                               \
-     OP_PUSH_PZ(stream_name),                                   \
-     OP_FUNC(hf_attach))
-
-#define OP_EXPECT_FIN(name)                                     \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_FUNC(hf_expect_fin))
+        OP_PUSH_U64(policy),                                    \
+        OP_PUSH_U64(error_code),                                \
+        OP_FUNC(hf_set_incoming_stream_policy))
+
+#define OP_STREAM_RESET(name, error_code) \
+    (OP_SELECT_SSL(0, name),              \
+        OP_PUSH_U64(flags),               \
+        OP_PUSH_U64(error_code),          \
+        OP_FUNC(hf_stream_reset))
+
+#define OP_SHUTDOWN_WAIT(name, flags, error_code, reason) \
+    (OP_SELECT_SSL(0, name),                              \
+        OP_PUSH_U64(flags),                               \
+        OP_PUSH_U64(error_code),                          \
+        OP_PUSH_PZ(reason),                               \
+        OP_FUNC(hf_shutdown_wait))
+
+#define OP_DETACH(conn_name, stream_name) \
+    (OP_SELECT_SSL(0, conn_name),         \
+        OP_PUSH_PZ(#stream_name),         \
+        OP_FUNC(hf_detach))
+
+#define OP_ATTACH(conn_name, stream_name) \
+    (OP_SELECT_SSL(0, conn_name),         \
+        OP_PUSH_PZ(stream_name),          \
+        OP_FUNC(hf_attach))
+
+#define OP_EXPECT_FIN(name)  \
+    (OP_SELECT_SSL(0, name), \
+        OP_FUNC(hf_expect_fin))
 
 #define OP_EXPECT_CONN_CLOSE_INFO(name, error_code, expect_app, expect_remote) \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_PUSH_U64(expect_app),                                   \
-     OP_PUSH_U64(expect_remote),                                \
-     OP_PUSH_U64(error_code),                                   \
-     OP_FUNC(hf_expect_conn_close_info))
-
-#define OP_WAIT_FOR_DATA(name)                                  \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_FUNC(hf_wait_for_data))
-
-#define OP_EXPECT_ERR(lib, reason)                              \
-    (OP_PUSH_U64(lib),                                          \
-     OP_PUSH_U64(reason),                                       \
-     OP_FUNC(hf_expect_err))
-
-#define OP_EXPECT_SSL_ERR(name, expected)                       \
-    (OP_SELECT_SSL(0, name),                                    \
-     OP_PUSH_U64(expected),                                     \
-     OP_FUNC(hf_expect_ssl_err))
-
-#define OP_EXPECT_STREAM_ID(expected)                           \
-    (OP_PUSH_U64(expected),                                     \
-     OP_FUNC(hf_expect_stream_id))
-
-#define OP_SKIP_TIME(ms)                                        \
-    (OP_PUSH_U64(ms),                                           \
-     OP_FUNC(hf_skip_time))
-
-#define OP_SLEEP(ms)                                            \
-    (OP_PUSH_U64(ms),                                           \
-     OP_FUNC(hf_sleep))
+    (OP_SELECT_SSL(0, name),                                                   \
+        OP_PUSH_U64(expect_app),                                               \
+        OP_PUSH_U64(expect_remote),                                            \
+        OP_PUSH_U64(error_code),                                               \
+        OP_FUNC(hf_expect_conn_close_info))
+
+#define OP_WAIT_FOR_DATA(name) \
+    (OP_SELECT_SSL(0, name),   \
+        OP_FUNC(hf_wait_for_data))
+
+#define OP_EXPECT_ERR(lib, reason) \
+    (OP_PUSH_U64(lib),             \
+        OP_PUSH_U64(reason),       \
+        OP_FUNC(hf_expect_err))
+
+#define OP_EXPECT_SSL_ERR(name, expected) \
+    (OP_SELECT_SSL(0, name),              \
+        OP_PUSH_U64(expected),            \
+        OP_FUNC(hf_expect_ssl_err))
+
+#define OP_EXPECT_STREAM_ID(expected) \
+    (OP_PUSH_U64(expected),           \
+        OP_FUNC(hf_expect_stream_id))
+
+#define OP_SKIP_TIME(ms) \
+    (OP_PUSH_U64(ms),    \
+        OP_FUNC(hf_skip_time))
+
+#define OP_SLEEP(ms)  \
+    (OP_PUSH_U64(ms), \
+        OP_FUNC(hf_sleep))
diff --git a/test/radix/quic_radix.c b/test/radix/quic_radix.c
index 3400eda3fdaf1..ada8773b50266 100644
--- a/test/radix/quic_radix.c
+++ b/test/radix/quic_radix.c
@@ -6,8 +6,10 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
+/* clang-format off */
 #include "terp.c"
 #include "quic_bindings.c"
 #include "quic_ops.c"
 #include "quic_tests.c"
 #include "main.c"
+/* clang-format on */
diff --git a/test/radix/quic_tests.c b/test/radix/quic_tests.c
index 2a29f1e80fe27..c0e54825cacc2 100644
--- a/test/radix/quic_tests.c
+++ b/test/radix/quic_tests.c
@@ -7,6 +7,16 @@
  * https://www.openssl.org/source/license.html
  */
 
+#if defined(_AIX)
+/*
+ * Some versions of AIX define macros for events and revents for use when
+ * accessing pollfd structures (see Github issue #24236). That interferes
+ * with our use of these names here. We simply undef them.
+ */
+#undef revents
+#undef events
+#endif
+
 /*
  * Test Scripts
  * ============================================================================
@@ -40,7 +50,7 @@ DEF_SCRIPT(simple_conn, "simple connection to server")
 }
 
 DEF_SCRIPT(simple_thread_child,
-           "test that RADIX multithreading is working (child)")
+    "test that RADIX multithreading is working (child)")
 {
 }
 
@@ -49,7 +59,7 @@ DEF_SCRIPT(simple_thread_child,
  * -------------------
  */
 DEF_SCRIPT(simple_thread,
-           "test that RADIX multithreading is working")
+    "test that RADIX multithreading is working")
 {
     size_t i;
 
@@ -62,7 +72,7 @@ DEF_SCRIPT(simple_thread,
  * --------------
  */
 DEF_SCRIPT(ssl_poll_child,
-           "test that SSL_poll is working (child)")
+    "test that SSL_poll is working (child)")
 {
     OP_SLEEP(100);
     OP_WRITE_B(C0, "extra");
@@ -72,10 +82,10 @@ DEF_FUNC(ssl_poll_check)
 {
     int ok = 0;
     SSL *La, *Lax[4];
-    SSL_POLL_ITEM items[6] = {0}, expected_items[6] = {0};
+    SSL_POLL_ITEM items[6] = { 0 }, expected_items[6] = { 0 };
     size_t result_count = 0, i;
-    const struct timeval z_timeout = {0}, *p_timeout = &z_timeout;
-    struct timeval timeout = {0};
+    const struct timeval z_timeout = { 0 }, *p_timeout = &z_timeout;
+    struct timeval timeout = { 0 };
     uint64_t mode;
     size_t expected_result_count;
     OSSL_TIME time_before, time_after;
@@ -83,14 +93,14 @@ DEF_FUNC(ssl_poll_check)
     F_POP(mode);
     REQUIRE_SSL_5(La, Lax[0], Lax[1], Lax[2], Lax[3]);
 
-    items[0].desc      = SSL_as_poll_descriptor(La);
-    items[0].events    = 0;
-    items[0].revents   = 0;
+    items[0].desc = SSL_as_poll_descriptor(La);
+    items[0].events = 0;
+    items[0].revents = 0;
 
     for (i = 0; i < 4; ++i) {
-        items[i + 1].desc        = SSL_as_poll_descriptor(Lax[i]);
-        items[i + 1].events      = SSL_POLL_EVENT_R | SSL_POLL_EVENT_I;
-        items[i + 1].revents     = 0;
+        items[i + 1].desc = SSL_as_poll_descriptor(Lax[i]);
+        items[i + 1].events = SSL_POLL_EVENT_R | SSL_POLL_EVENT_I;
+        items[i + 1].revents = 0;
     }
 
     items[5].desc = SSL_as_poll_descriptor(SSL_get0_listener(La));
@@ -101,30 +111,30 @@ DEF_FUNC(ssl_poll_check)
         expected_result_count = 0;
         break;
     case 1: /* Various events reported correctly */
-        expected_result_count       = 5;
-        items[0].events             = SSL_POLL_EVENT_OS;
-        expected_items[0].revents   = SSL_POLL_EVENT_OS;
+        expected_result_count = 5;
+        items[0].events = SSL_POLL_EVENT_OS;
+        expected_items[0].revents = SSL_POLL_EVENT_OS;
 
-        expected_items[1].revents   = SSL_POLL_EVENT_R;
+        expected_items[1].revents = SSL_POLL_EVENT_R;
 
         for (i = 0; i < 4; ++i) {
-            items[i + 1].events             |= SSL_POLL_EVENT_W;
-            expected_items[i + 1].revents   |= SSL_POLL_EVENT_W;
+            items[i + 1].events |= SSL_POLL_EVENT_W;
+            expected_items[i + 1].revents |= SSL_POLL_EVENT_W;
         }
 
         break;
     case 3: /* Blocking test */
-        expected_result_count       = 1;
-        expected_items[1].revents   = SSL_POLL_EVENT_R;
+        expected_result_count = 1;
+        expected_items[1].revents = SSL_POLL_EVENT_R;
 
         p_timeout = &timeout;
-        timeout.tv_sec  = 10;
+        timeout.tv_sec = 10;
         timeout.tv_usec = 0;
         break;
     case 4: /* Listener test */
-        expected_result_count       = 1;
-        items[5].events             = SSL_POLL_EVENT_IC;
-        expected_items[5].revents   = SSL_POLL_EVENT_IC;
+        expected_result_count = 1;
+        items[5].events = SSL_POLL_EVENT_IC;
+        expected_items[5].revents = SSL_POLL_EVENT_IC;
         break;
     default:
         goto err;
@@ -134,7 +144,7 @@ DEF_FUNC(ssl_poll_check)
     result_count = SIZE_MAX;
     time_before = ossl_time_now();
     if (!TEST_true(SSL_poll(items, OSSL_NELEM(items), sizeof(SSL_POLL_ITEM),
-                            p_timeout, 0, &result_count)))
+            p_timeout, 0, &result_count)))
         goto err;
 
     time_after = ossl_time_now();
@@ -158,7 +168,7 @@ DEF_FUNC(ssl_poll_check)
 }
 
 DEF_SCRIPT(ssl_poll,
-           "test that SSL_poll is working")
+    "test that SSL_poll is working")
 {
     size_t i;
 
@@ -232,12 +242,65 @@ DEF_SCRIPT(ssl_poll,
     }
 }
 
+DEF_FUNC(check_writeable)
+{
+    int ok = 0;
+    SSL *ssl;
+    SSL_POLL_ITEM item;
+    size_t result_count = 0;
+    uint64_t expect;
+    const struct timeval z_timeout = { 0 }, *p_timeout = &z_timeout;
+
+    F_POP(expect);
+    REQUIRE_SSL(ssl);
+
+    item.desc = SSL_as_poll_descriptor(ssl);
+    item.events = SSL_POLL_EVENT_W;
+    item.revents = 0;
+
+    /* Zero-timeout call. */
+    result_count = SIZE_MAX;
+    if (!TEST_true(SSL_poll(&item, 1, sizeof(SSL_POLL_ITEM),
+            p_timeout, 0, &result_count)))
+        goto err;
+
+    ok = (!!(item.revents & SSL_POLL_EVENT_W) == expect);
+
+err:
+    return ok;
+}
+
+DEF_SCRIPT(check_cwm, "check stream obeys cwm")
+{
+    OP_SIMPLE_PAIR_CONN();
+
+    /* Create the initial stream by writing some data */
+    OP_WRITE_RAND(C, 1024);
+
+    /* We should be writeable at the start */
+    OP_PUSH_U64(1);
+    OP_SELECT_SSL(0, C);
+    OP_FUNC(check_writeable);
+
+    /* Default stream cwm is 512k (we already sent 1k). Consume all the rest */
+    OP_WRITE_RAND(C, 511 * 1024);
+
+    /* Confirm we are no longer writeable */
+    OP_PUSH_U64(0);
+    OP_SELECT_SSL(0, C);
+    OP_FUNC(check_writeable);
+
+    /* We now expect writes to fail */
+    OP_WRITE_FAIL(C);
+}
+
 /*
  * List of Test Scripts
  * ============================================================================
  */
 static SCRIPT_INFO *const scripts[] = {
     USE(simple_conn)
-    USE(simple_thread)
-    USE(ssl_poll)
+        USE(simple_thread)
+            USE(ssl_poll)
+                USE(check_cwm)
 };
diff --git a/test/radix/terp.c b/test/radix/terp.c
index 3c83fd9b18b07..9e64702908bbf 100644
--- a/test/radix/terp.c
+++ b/test/radix/terp.c
@@ -12,8 +12,8 @@
 #include <openssl/lhash.h>
 #include <openssl/rand.h>
 #include "../testutil.h"
-#include "internal/numbers.h"   /* UINT64_C */
-#include "internal/time.h"      /* OSSL_TIME */
+#include "internal/numbers.h" /* UINT64_C */
+#include "internal/time.h" /* OSSL_TIME */
 
 static const char *cert_file, *key_file;
 
@@ -27,36 +27,36 @@ typedef void (*script_gen_t)(GEN_CTX *ctx);
 
 typedef struct script_info_st {
     /* name: A symbolic name, like simple_conn. */
-    const char      *name;
+    const char *name;
     /* desc: A short, one-line description. */
-    const char      *desc;
-    const char      *file;
-    int             line;
+    const char *desc;
+    const char *file;
+    int line;
     /* gen_func: The script generation function. */
-    script_gen_t    gen_func;
+    script_gen_t gen_func;
 } SCRIPT_INFO;
 
 struct gen_ctx_st {
     SCRIPT_INFO *script_info;
-    const char  *cur_file;
-    int         error, cur_line;
-    const char  *first_error_msg, *first_error_file;
-    int         first_error_line;
+    const char *cur_file;
+    int error, cur_line;
+    const char *first_error_msg, *first_error_file;
+    int first_error_line;
 
-    uint8_t     *build_buf_beg, *build_buf_cur, *build_buf_end;
+    uint8_t *build_buf_beg, *build_buf_cur, *build_buf_end;
 };
 
 static int GEN_CTX_init(GEN_CTX *ctx, SCRIPT_INFO *script_info)
 {
-    ctx->script_info        = script_info;
-    ctx->error              = 0;
-    ctx->cur_file           = NULL;
-    ctx->cur_line           = 0;
-    ctx->first_error_msg    = NULL;
-    ctx->first_error_line   = 0;
-    ctx->build_buf_beg      = NULL;
-    ctx->build_buf_cur      = NULL;
-    ctx->build_buf_end      = NULL;
+    ctx->script_info = script_info;
+    ctx->error = 0;
+    ctx->cur_file = NULL;
+    ctx->cur_line = 0;
+    ctx->first_error_msg = NULL;
+    ctx->first_error_line = 0;
+    ctx->build_buf_beg = NULL;
+    ctx->build_buf_cur = NULL;
+    ctx->build_buf_end = NULL;
     return 1;
 }
 
@@ -68,40 +68,40 @@ static void GEN_CTX_cleanup(GEN_CTX *ctx)
 
 typedef struct terp_st TERP;
 
-#define F_RET_SPIN_AGAIN        2
-#define F_RET_SKIP_REST         3
+#define F_RET_SPIN_AGAIN 2
+#define F_RET_SKIP_REST 3
 
-#define F_SPIN_AGAIN()                          \
-    do {                                        \
-        ok                  = F_RET_SPIN_AGAIN; \
-        fctx->spin_again    = 1;                \
-        goto err;                               \
+#define F_SPIN_AGAIN()         \
+    do {                       \
+        ok = F_RET_SPIN_AGAIN; \
+        fctx->spin_again = 1;  \
+        goto err;              \
     } while (0)
 
-#define F_SKIP_REST()                           \
-    do {                                        \
-        ok                  = F_RET_SKIP_REST;  \
-        fctx->skip_rest     = 1;                \
-        goto err;                               \
+#define F_SKIP_REST()         \
+    do {                      \
+        ok = F_RET_SKIP_REST; \
+        fctx->skip_rest = 1;  \
+        goto err;             \
     } while (0)
 
 typedef struct func_ctx_st {
-    TERP    *terp;
+    TERP *terp;
 
     /*
      * Set to 1 inside a user function if the function should spin again.
      * Cleared automatically after the user function returns.
      */
-    int     spin_again;
+    int spin_again;
 
     /*
      * Immediately exit script successfully. Useful for skipping.
      */
-    int     skip_rest;
+    int skip_rest;
 } FUNC_CTX;
 
 static ossl_inline int TERP_stk_pop(TERP *terp,
-                                    void *buf, size_t buf_len);
+    void *buf, size_t buf_len);
 
 #define TERP_STK_PUSH(terp, v)                                  \
     do {                                                        \
@@ -109,33 +109,33 @@ static ossl_inline int TERP_stk_pop(TERP *terp,
             goto err;                                           \
     } while (0)
 
-#define TERP_STK_POP(terp, v)                                   \
-    do {                                                        \
-        memset(&(v), 0, sizeof(v)); /* quiet warnings */        \
-        if (!TEST_true(TERP_stk_pop((terp), &(v), sizeof(v))))  \
-            goto err;                                           \
+#define TERP_STK_POP(terp, v)                                  \
+    do {                                                       \
+        memset(&(v), 0, sizeof(v)); /* quiet warnings */       \
+        if (!TEST_true(TERP_stk_pop((terp), &(v), sizeof(v)))) \
+            goto err;                                          \
     } while (0)
 
-#define TERP_STK_POP2(terp, a, b)                               \
-    do {                                                        \
-        TERP_STK_POP((terp), (b));                              \
-        TERP_STK_POP((terp), (a));                              \
+#define TERP_STK_POP2(terp, a, b)  \
+    do {                           \
+        TERP_STK_POP((terp), (b)); \
+        TERP_STK_POP((terp), (a)); \
     } while (0)
 
-#define F_PUSH(v)       TERP_STK_PUSH(fctx->terp, (v))
-#define F_POP(v)        TERP_STK_POP (fctx->terp, (v))
-#define F_POP2(a, b)    TERP_STK_POP2(fctx->terp, (a), (b))
+#define F_PUSH(v) TERP_STK_PUSH(fctx->terp, (v))
+#define F_POP(v) TERP_STK_POP(fctx->terp, (v))
+#define F_POP2(a, b) TERP_STK_POP2(fctx->terp, (a), (b))
 
 typedef int (*helper_func_t)(FUNC_CTX *fctx);
 
 #define DEF_FUNC(name) ossl_unused static int name(FUNC_CTX *fctx)
 
-#define DEF_SCRIPT(name, desc)                          \
-    static void script_gen_##name(GEN_CTX *ctx);        \
-    static SCRIPT_INFO script_info_##name = {           \
-        #name, desc, __FILE__, __LINE__,                \
-        script_gen_##name                               \
-    };                                                  \
+#define DEF_SCRIPT(name, desc)                   \
+    static void script_gen_##name(GEN_CTX *ctx); \
+    static SCRIPT_INFO script_info_##name = {    \
+        #name, desc, __FILE__, __LINE__,         \
+        script_gen_##name                        \
+    };                                           \
     static void script_gen_##name(GEN_CTX *ctx)
 
 enum {
@@ -159,21 +159,21 @@ enum {
 
 static void *openc_alloc_space(GEN_CTX *ctx, size_t num_bytes);
 
-#define DEF_ENCODER(name, type)                         \
-    static void name(GEN_CTX *ctx, type v)              \
-    {                                                   \
-        void *dst = openc_alloc_space(ctx, sizeof(v));  \
-        if (dst == NULL)                                \
-            return;                                     \
-                                                        \
-        memcpy(dst, &v, sizeof(v));                     \
+#define DEF_ENCODER(name, type)                        \
+    static void name(GEN_CTX *ctx, type v)             \
+    {                                                  \
+        void *dst = openc_alloc_space(ctx, sizeof(v)); \
+        if (dst == NULL)                               \
+            return;                                    \
+                                                       \
+        memcpy(dst, &v, sizeof(v));                    \
     }
 
 DEF_ENCODER(openc_u64, uint64_t)
 DEF_ENCODER(openc_size, size_t)
 DEF_ENCODER(openc_p, void *)
 DEF_ENCODER(openc_fp, helper_func_t)
-#define openc_opcode    openc_u64
+#define openc_opcode openc_u64
 
 static void opgen_END(GEN_CTX *ctx)
 {
@@ -205,7 +205,7 @@ ossl_unused static void opgen_PUSH_SIZE(GEN_CTX *ctx, size_t v)
 }
 
 ossl_unused static void opgen_FUNC(GEN_CTX *ctx, helper_func_t f,
-                                   const char *f_name)
+    const char *f_name)
 {
     openc_opcode(ctx, OPK_FUNC);
     openc_fp(ctx, f);
@@ -229,25 +229,25 @@ static ossl_unused void opgen_fail(GEN_CTX *ctx, const char *msg)
     if (!ctx->error) {
         ctx->first_error_file = ctx->cur_file;
         ctx->first_error_line = ctx->cur_line;
-        ctx->first_error_msg  = msg;
+        ctx->first_error_msg = msg;
     }
 
     ctx->error = 1;
 }
 
-#define OPGEN(n)        (opgen_set_line(ctx, __FILE__, __LINE__), \
-                         opgen_##n)
-#define OP_END()        OPGEN(END)      (ctx)
-#define OP_PUSH_P(v)    OPGEN(PUSH_P)   (ctx, (v))
-#define OP_PUSH_PZ(v)   OPGEN(PUSH_PZ)  (ctx, (v))
-#define OP_PUSH_U64(v)  OPGEN(PUSH_U64) (ctx, (v))
-#define OP_PUSH_SIZE(v) OPGEN(PUSH_SIZE) (ctx, (v))
-#define OP_PUSH_BUFP(p, l)  (OP_PUSH_P(p), OP_PUSH_SIZE(l))
-#define OP_PUSH_BUF(v)      OP_PUSH_BUFP(&(v), sizeof(v))
+#define OPGEN(n) (opgen_set_line(ctx, __FILE__, __LINE__), \
+    opgen_##n)
+#define OP_END() OPGEN(END)(ctx)
+#define OP_PUSH_P(v) OPGEN(PUSH_P)(ctx, (v))
+#define OP_PUSH_PZ(v) OPGEN(PUSH_PZ)(ctx, (v))
+#define OP_PUSH_U64(v) OPGEN(PUSH_U64)(ctx, (v))
+#define OP_PUSH_SIZE(v) OPGEN(PUSH_SIZE)(ctx, (v))
+#define OP_PUSH_BUFP(p, l) (OP_PUSH_P(p), OP_PUSH_SIZE(l))
+#define OP_PUSH_BUF(v) OP_PUSH_BUFP(&(v), sizeof(v))
 #define OP_PUSH_LREF(v) OPGEN(PUSH_LREF)(ctx, (lref))
-#define OP_FUNC(f)      OPGEN(FUNC)     (ctx, (f), #f)
-#define OP_LABEL(name)  OPGEN(LABEL)    (ctx, (name))
-#define GEN_FAIL(msg)   OPGEN(fail)     (ctx, (msg))
+#define OP_FUNC(f) OPGEN(FUNC)(ctx, (f), #f)
+#define OP_LABEL(name) OPGEN(LABEL)(ctx, (name))
+#define GEN_FAIL(msg) OPGEN(fail)(ctx, (msg))
 
 static void *openc_alloc_space(GEN_CTX *ctx, size_t num_bytes)
 {
@@ -256,9 +256,9 @@ static void *openc_alloc_space(GEN_CTX *ctx, size_t num_bytes)
 
     cur_spare = ctx->build_buf_end - ctx->build_buf_cur;
     if (cur_spare < num_bytes) {
-        off         = ctx->build_buf_cur - ctx->build_buf_beg;
-        old_size    = ctx->build_buf_end - ctx->build_buf_beg;
-        new_size    = (old_size == 0) ? 1024 : old_size * 2;
+        off = ctx->build_buf_cur - ctx->build_buf_beg;
+        old_size = ctx->build_buf_end - ctx->build_buf_beg;
+        new_size = (old_size == 0) ? 1024 : old_size * 2;
         p = OPENSSL_realloc(ctx->build_buf_beg, new_size);
         if (!TEST_ptr(p))
             return NULL;
@@ -284,8 +284,8 @@ typedef struct gen_script_st {
 
 static int GEN_CTX_finish(GEN_CTX *ctx, GEN_SCRIPT *script)
 {
-    script->buf         = ctx->build_buf_beg;
-    script->buf_len     = ctx->build_buf_cur - ctx->build_buf_beg;
+    script->buf = ctx->build_buf_beg;
+    script->buf_len = ctx->build_buf_cur - ctx->build_buf_beg;
     ctx->build_buf_beg = ctx->build_buf_cur = ctx->build_buf_end = NULL;
     return 1;
 }
@@ -294,7 +294,7 @@ static void GEN_SCRIPT_cleanup(GEN_SCRIPT *script)
 {
     OPENSSL_free((char *)script->buf);
 
-    script->buf     = NULL;
+    script->buf = NULL;
     script->buf_len = 0;
 }
 
@@ -320,9 +320,9 @@ static int GEN_SCRIPT_init(GEN_SCRIPT *gen_script, SCRIPT_INFO *script_info)
     if (!ok) {
         if (gctx.error)
             TEST_error("script generation failed: %s (at %s:%d)",
-                       gctx.first_error_msg,
-                       gctx.first_error_file,
-                       gctx.first_error_line);
+                gctx.first_error_msg,
+                gctx.first_error_file,
+                gctx.first_error_line);
 
         GEN_CTX_cleanup(&gctx);
     }
@@ -330,7 +330,7 @@ static int GEN_SCRIPT_init(GEN_SCRIPT *gen_script, SCRIPT_INFO *script_info)
 }
 
 typedef struct srdr_st {
-    const uint8_t   *beg, *cur, *end, *save_cur;
+    const uint8_t *beg, *cur, *end, *save_cur;
 } SRDR;
 
 static void SRDR_init(SRDR *rdr, const uint8_t *buf, size_t buf_len)
@@ -360,22 +360,21 @@ static ossl_inline void SRDR_restore(SRDR *srdr)
     srdr->cur = srdr->save_cur;
 }
 
-#define GET_OPERAND(srdr, v)                                        \
-    do {                                                            \
-        memset(&(v), 0, sizeof(v)); /* quiet uninitialized warn */  \
-        if (!TEST_true(SRDR_get_operand(srdr, &(v), sizeof(v))))    \
-            goto err;                                               \
+#define GET_OPERAND(srdr, v)                                       \
+    do {                                                           \
+        memset(&(v), 0, sizeof(v)); /* quiet uninitialized warn */ \
+        if (!TEST_true(SRDR_get_operand(srdr, &(v), sizeof(v))))   \
+            goto err;                                              \
     } while (0)
 
-
 static void print_opc(BIO *bio, size_t op_num, size_t offset, const char *name)
 {
     if (op_num != SIZE_MAX)
         BIO_printf(bio, "%3zu-  %4zx>\t%-8s \t", op_num,
-                   offset, name);
+            offset, name);
     else
         BIO_printf(bio, "      %4zx>\t%-8s \t",
-                   offset, name);
+            offset, name);
 }
 
 static int SRDR_print_one(SRDR *srdr, BIO *bio, size_t i, int *was_end)
@@ -399,73 +398,61 @@ static int SRDR_print_one(SRDR *srdr, BIO *bio, size_t i, int *was_end)
         if (was_end != NULL)
             *was_end = 1;
         break;
-    case OPK_PUSH_P:
-        {
-            void *v;
-
-            GET_OPERAND(srdr, v);
-            PRINT_OPC(PUSH_P);
-            BIO_printf(bio, "%20p", v);
-        }
-        break;
-    case OPK_PUSH_PZ:
-        {
-            void *v;
-
-            GET_OPERAND(srdr, v);
-            PRINT_OPC(PUSH_PZ);
-            if (v != NULL && strlen((const char *)v) == 1)
-                BIO_printf(bio, "%20p (%s)", v, (const char *)v);
-            else
-                BIO_printf(bio, "%20p (\"%s\")", v, (const char *)v);
-        }
-        break;
-    case OPK_PUSH_U64:
-        {
-            uint64_t v;
-
-            GET_OPERAND(srdr, v);
-            PRINT_OPC(PUSH_U64);
-            BIO_printf(bio, "%#20llx (%llu)",
-                       (unsigned long long)v, (unsigned long long)v);
-        }
-        break;
-    case OPK_PUSH_SIZE:
-        {
-            size_t v;
-
-            GET_OPERAND(srdr, v);
-            PRINT_OPC(PUSH_SIZE);
-            BIO_printf(bio, "%#20llx (%llu)",
-                       (unsigned long long)v, (unsigned long long)v);
-        }
-        break;
-    case OPK_FUNC:
-        {
-            helper_func_t v;
-            void *f_name = NULL, *x = NULL;
-
-            GET_OPERAND(srdr, v);
-            GET_OPERAND(srdr, f_name);
-
-            PRINT_OPC(FUNC);
-            memcpy(&x, &v, sizeof(x) < sizeof(v) ? sizeof(x) : sizeof(v));
-            BIO_printf(bio, "%s", (const char *)f_name);
-        }
-        break;
-    case OPK_LABEL:
-        {
-            void *l_name;
-
-            GET_OPERAND(srdr, l_name);
-
-            BIO_printf(bio, "\n%s:\n", (const char *)l_name);
-            PRINT_OPC(LABEL);
-        }
-        break;
+    case OPK_PUSH_P: {
+        void *v;
+
+        GET_OPERAND(srdr, v);
+        PRINT_OPC(PUSH_P);
+        BIO_printf(bio, "%20p", v);
+    } break;
+    case OPK_PUSH_PZ: {
+        void *v;
+
+        GET_OPERAND(srdr, v);
+        PRINT_OPC(PUSH_PZ);
+        if (v != NULL && strlen((const char *)v) == 1)
+            BIO_printf(bio, "%20p (%s)", v, (const char *)v);
+        else
+            BIO_printf(bio, "%20p (\"%s\")", v, (const char *)v);
+    } break;
+    case OPK_PUSH_U64: {
+        uint64_t v;
+
+        GET_OPERAND(srdr, v);
+        PRINT_OPC(PUSH_U64);
+        BIO_printf(bio, "%#20llx (%llu)",
+            (unsigned long long)v, (unsigned long long)v);
+    } break;
+    case OPK_PUSH_SIZE: {
+        size_t v;
+
+        GET_OPERAND(srdr, v);
+        PRINT_OPC(PUSH_SIZE);
+        BIO_printf(bio, "%#20llx (%llu)",
+            (unsigned long long)v, (unsigned long long)v);
+    } break;
+    case OPK_FUNC: {
+        helper_func_t v;
+        void *f_name = NULL, *x = NULL;
+
+        GET_OPERAND(srdr, v);
+        GET_OPERAND(srdr, f_name);
+
+        PRINT_OPC(FUNC);
+        memcpy(&x, &v, sizeof(x) < sizeof(v) ? sizeof(x) : sizeof(v));
+        BIO_printf(bio, "%s", (const char *)f_name);
+    } break;
+    case OPK_LABEL: {
+        void *l_name;
+
+        GET_OPERAND(srdr, l_name);
+
+        BIO_printf(bio, "\n%s:\n", (const char *)l_name);
+        PRINT_OPC(LABEL);
+    } break;
     default:
         TEST_error("unsupported opcode while printing: %llu",
-                   (unsigned long long)opc);
+            (unsigned long long)opc);
         goto err;
     }
 
@@ -475,7 +462,7 @@ static int SRDR_print_one(SRDR *srdr, BIO *bio, size_t i, int *was_end)
 }
 
 static int GEN_SCRIPT_print(GEN_SCRIPT *gen_script, BIO *bio,
-                            const SCRIPT_INFO *script_info)
+    const SCRIPT_INFO *script_info)
 {
     int ok = 0;
     size_t i;
@@ -486,13 +473,13 @@ static int GEN_SCRIPT_print(GEN_SCRIPT *gen_script, BIO *bio,
 
     if (script_info != NULL) {
         BIO_printf(bio, "\nGenerated script for '%s':\n",
-                               script_info->name);
+            script_info->name);
         BIO_printf(bio, "\n--GENERATED-------------------------------------"
-                  "----------------------\n");
+                        "----------------------\n");
         BIO_printf(bio, "  # NAME:\n  #   %s\n",
-                   script_info->name);
+            script_info->name);
         BIO_printf(bio, "  # SOURCE:\n  #   %s:%d\n",
-                   script_info->file, script_info->line);
+            script_info->file, script_info->line);
         BIO_printf(bio, "  # DESCRIPTION:\n  #   %s\n", script_info->desc);
     }
 
@@ -507,9 +494,9 @@ static int GEN_SCRIPT_print(GEN_SCRIPT *gen_script, BIO *bio,
         const unsigned char *opc_start = srdr->cur;
 
         BIO_printf(bio, "\n");
-        PRINT_OPC(+++);
+        PRINT_OPC(++ +);
         BIO_printf(bio, "\n------------------------------------------------"
-                  "----------------------\n\n");
+                        "----------------------\n\n");
     }
 
     ok = 1;
@@ -518,62 +505,62 @@ static int GEN_SCRIPT_print(GEN_SCRIPT *gen_script, BIO *bio,
 }
 
 static void SCRIPT_INFO_print(SCRIPT_INFO *script_info, BIO *bio, int error,
-                              const char *msg)
+    const char *msg)
 {
     if (error)
         TEST_error("%s: script '%s' (%s)",
-                   msg, script_info->name, script_info->desc);
+            msg, script_info->name, script_info->desc);
     else
         TEST_info("%s: script '%s' (%s)",
-                  msg, script_info->name, script_info->desc);
+            msg, script_info->name, script_info->desc);
 }
 
 typedef struct terp_config_st {
-    BIO         *debug_bio;
+    BIO *debug_bio;
 
-    OSSL_TIME   (*now_cb)(void *arg);
-    void        *now_cb_arg;
+    OSSL_TIME (*now_cb)(void *arg);
+    void *now_cb_arg;
 
-    int         (*per_op_cb)(TERP *terp, void *arg);
-    void        *per_op_cb_arg;
+    int (*per_op_cb)(TERP *terp, void *arg);
+    void *per_op_cb_arg;
 
-    OSSL_TIME   max_execution_time; /* duration */
+    OSSL_TIME max_execution_time; /* duration */
 } TERP_CONFIG;
 
-#define TERP_DEFAULT_MAX_EXECUTION_TIME     (ossl_ms2time(3000))
+#define TERP_DEFAULT_MAX_EXECUTION_TIME (ossl_ms2time(3000))
 
 struct terp_st {
-    TERP_CONFIG         cfg;
-    const SCRIPT_INFO   *script_info;
-    const GEN_SCRIPT    *gen_script;
-    SRDR                srdr;
-    uint8_t             *stk_beg, *stk_cur, *stk_end, *stk_save_cur;
-    FUNC_CTX            fctx;
-    uint64_t            ops_executed;
-    int                 log_execute;
-    OSSL_TIME           start_time, deadline_time;
+    TERP_CONFIG cfg;
+    const SCRIPT_INFO *script_info;
+    const GEN_SCRIPT *gen_script;
+    SRDR srdr;
+    uint8_t *stk_beg, *stk_cur, *stk_end, *stk_save_cur;
+    FUNC_CTX fctx;
+    uint64_t ops_executed;
+    int log_execute;
+    OSSL_TIME start_time, deadline_time;
 };
 
 static int TERP_init(TERP *terp,
-                     const TERP_CONFIG *cfg,
-                     const SCRIPT_INFO *script_info,
-                     const GEN_SCRIPT *gen_script)
+    const TERP_CONFIG *cfg,
+    const SCRIPT_INFO *script_info,
+    const GEN_SCRIPT *gen_script)
 {
     if (!TEST_true(cfg->now_cb != NULL))
         return 0;
 
-    terp->cfg               = *cfg;
-    terp->script_info       = script_info;
-    terp->gen_script        = gen_script;
-    terp->fctx.terp         = terp;
-    terp->fctx.spin_again   = 0;
-    terp->fctx.skip_rest    = 0;
-    terp->stk_beg           = NULL;
-    terp->stk_cur           = NULL;
-    terp->stk_end           = NULL;
-    terp->stk_save_cur      = NULL;
-    terp->ops_executed      = 0;
-    terp->log_execute       = 1;
+    terp->cfg = *cfg;
+    terp->script_info = script_info;
+    terp->gen_script = gen_script;
+    terp->fctx.terp = terp;
+    terp->fctx.spin_again = 0;
+    terp->fctx.skip_rest = 0;
+    terp->stk_beg = NULL;
+    terp->stk_cur = NULL;
+    terp->stk_end = NULL;
+    terp->stk_save_cur = NULL;
+    terp->ops_executed = 0;
+    terp->log_execute = 1;
 
     if (ossl_time_is_zero(terp->cfg.max_execution_time))
         terp->cfg.max_execution_time = TERP_DEFAULT_MAX_EXECUTION_TIME;
@@ -600,8 +587,8 @@ static int TERP_stk_ensure_capacity(TERP *terp, size_t spare)
     if (old_size >= spare)
         return 1;
 
-    off         = terp->stk_end - terp->stk_cur;
-    new_size    = old_size != 0 ? old_size * 2 : 256;
+    off = terp->stk_end - terp->stk_cur;
+    new_size = old_size != 0 ? old_size * 2 : 256;
     p = OPENSSL_realloc(terp->stk_beg, new_size);
     if (!TEST_ptr(p))
         return 0;
@@ -613,7 +600,7 @@ static int TERP_stk_ensure_capacity(TERP *terp, size_t spare)
 }
 
 static ossl_inline int TERP_stk_push(TERP *terp,
-                                     const void *buf, size_t buf_len)
+    const void *buf, size_t buf_len)
 {
     if (!TEST_true(TERP_stk_ensure_capacity(terp, buf_len)))
         return 0;
@@ -624,7 +611,7 @@ static ossl_inline int TERP_stk_push(TERP *terp,
 }
 
 static ossl_inline int TERP_stk_pop(TERP *terp,
-                                    void *buf, size_t buf_len)
+    void *buf, size_t buf_len)
 {
     if (!TEST_size_t_ge(terp->stk_end - terp->stk_cur, buf_len))
         return 0;
@@ -643,12 +630,12 @@ static void TERP_print_stack(TERP *terp, BIO *bio, const char *header)
 
 #define TERP_GET_OPERAND(v) GET_OPERAND(&terp->srdr, (v))
 
-#define TERP_SPIN_AGAIN()                       \
-    do {                                        \
-        SRDR_restore(&terp->srdr);              \
-        terp->stk_cur = terp->stk_save_cur;     \
-        ++spin_count;                           \
-        goto spin_again;                        \
+#define TERP_SPIN_AGAIN()                   \
+    do {                                    \
+        SRDR_restore(&terp->srdr);          \
+        terp->stk_cur = terp->stk_save_cur; \
+        ++spin_count;                       \
+        goto spin_again;                    \
     } while (0)
 
 static OSSL_TIME TERP_now(TERP *terp)
@@ -660,7 +647,7 @@ static void TERP_log_spin(TERP *terp, size_t spin_count)
 {
     if (spin_count > 0)
         BIO_printf(terp->cfg.debug_bio, "           \t\t(span %zu times)\n",
-                   spin_count);
+            spin_count);
 }
 
 static int TERP_execute(TERP *terp)
@@ -674,9 +661,9 @@ static int TERP_execute(TERP *terp)
 
     SRDR_init(&terp->srdr, terp->gen_script->buf, terp->gen_script->buf_len);
 
-    terp->start_time    = TERP_now(terp);
+    terp->start_time = TERP_now(terp);
     terp->deadline_time = ossl_time_add(terp->start_time,
-                                        terp->cfg.max_execution_time);
+        terp->cfg.max_execution_time);
 
     for (;;) {
         if (terp->log_execute) {
@@ -684,7 +671,7 @@ static int TERP_execute(TERP *terp)
 
             if (!in_debug_output) {
                 BIO_printf(debug_bio, "\n--EXECUTION-----------------------------"
-                          "------------------------------\n");
+                                      "------------------------------\n");
                 in_debug_output = 1;
             }
 
@@ -703,7 +690,7 @@ static int TERP_execute(TERP *terp)
 
         ++terp->ops_executed;
 
-spin_again:
+    spin_again:
         if (ossl_time_compare(TERP_now(terp), terp->deadline_time) >= 0) {
             TEST_error("timed out while executing op %zu", op_num);
             if (terp->log_execute)
@@ -723,79 +710,69 @@ static int TERP_execute(TERP *terp)
         case OPK_END:
             goto stop;
         case OPK_PUSH_P:
-        case OPK_PUSH_PZ:
-            {
-                void *v;
+        case OPK_PUSH_PZ: {
+            void *v;
 
-                TERP_GET_OPERAND(v);
-                TERP_STK_PUSH(terp, v);
-            }
-            break;
-        case OPK_PUSH_U64:
-            {
-                uint64_t v;
+            TERP_GET_OPERAND(v);
+            TERP_STK_PUSH(terp, v);
+        } break;
+        case OPK_PUSH_U64: {
+            uint64_t v;
 
-                TERP_GET_OPERAND(v);
-                TERP_STK_PUSH(terp, v);
-            }
-            break;
-        case OPK_PUSH_SIZE:
-            {
-                size_t v;
+            TERP_GET_OPERAND(v);
+            TERP_STK_PUSH(terp, v);
+        } break;
+        case OPK_PUSH_SIZE: {
+            size_t v;
 
-                TERP_GET_OPERAND(v);
-                TERP_STK_PUSH(terp, v);
-            }
-            break;
-        case OPK_LABEL:
-            {
-                const char *l_name;
+            TERP_GET_OPERAND(v);
+            TERP_STK_PUSH(terp, v);
+        } break;
+        case OPK_LABEL: {
+            const char *l_name;
 
-                TERP_GET_OPERAND(l_name);
-                /* no-op */
-            }
-            break;
-        case OPK_FUNC:
-            {
-                helper_func_t v;
-                const void *f_name;
-                int ret;
+            TERP_GET_OPERAND(l_name);
+            /* no-op */
+        } break;
+        case OPK_FUNC: {
+            helper_func_t v;
+            const void *f_name;
+            int ret;
 
-                TERP_GET_OPERAND(v);
-                TERP_GET_OPERAND(f_name);
+            TERP_GET_OPERAND(v);
+            TERP_GET_OPERAND(f_name);
 
-                if (!TEST_true(v != NULL))
-                    goto err;
+            if (!TEST_true(v != NULL))
+                goto err;
 
-                ret = v(&terp->fctx);
+            ret = v(&terp->fctx);
 
-                if (terp->fctx.skip_rest) {
-                    if (!TEST_int_eq(ret, F_RET_SKIP_REST))
-                        goto err;
+            if (terp->fctx.skip_rest) {
+                if (!TEST_int_eq(ret, F_RET_SKIP_REST))
+                    goto err;
 
-                    if (terp->log_execute)
-                        BIO_printf(terp->cfg.debug_bio, "           \t\t(skipping)\n");
+                if (terp->log_execute)
+                    BIO_printf(terp->cfg.debug_bio, "           \t\t(skipping)\n");
 
-                    terp->fctx.skip_rest = 0;
-                    goto stop;
-                } else if (terp->fctx.spin_again) {
-                    if (!TEST_int_eq(ret, F_RET_SPIN_AGAIN))
-                        goto err;
+                terp->fctx.skip_rest = 0;
+                goto stop;
+            } else if (terp->fctx.spin_again) {
+                if (!TEST_int_eq(ret, F_RET_SPIN_AGAIN))
+                    goto err;
 
-                    terp->fctx.spin_again = 0;
-                    TERP_SPIN_AGAIN();
-                } else {
-                    if (!TEST_false(terp->fctx.spin_again))
-                        goto err;
+                terp->fctx.spin_again = 0;
+                TERP_SPIN_AGAIN();
+            } else {
+                if (!TEST_false(terp->fctx.spin_again))
+                    goto err;
 
-                    if (ret != 1) {
-                        TEST_error("op %zu (FUNC %s) failed with return value %d",
-                                   op_num, (const char *)f_name, ret);
-                        goto err;
-                    }
+                if (ret != 1) {
+                    TEST_error("op %zu (FUNC %s) failed with return value %d",
+                        op_num, (const char *)f_name, ret);
+                    goto err;
                 }
             }
-            break;
+        } break;
         default:
             TEST_error("unknown opcode: %llu", (unsigned long long)opc);
             goto err;
@@ -807,11 +784,11 @@ static int TERP_execute(TERP *terp)
 err:
     if (in_debug_output)
         BIO_printf(debug_bio, "----------------------------------------"
-                   "------------------------------\n");
+                              "------------------------------\n");
 
     if (!ok) {
         TEST_error("FAILED while executing script: %s at op %zu, error stack:",
-                   terp->script_info->name, op_num);
+            terp->script_info->name, op_num);
         ERR_print_errors(terp->cfg.debug_bio);
         BIO_printf(debug_bio, "\n");
     } else if (ERR_peek_last_error() != 0) {
@@ -827,7 +804,7 @@ static int TERP_run(SCRIPT_INFO *script_info, TERP_CONFIG *cfg)
 {
     int ok = 0, have_terp = 0;
     TERP terp;
-    GEN_SCRIPT gen_script = {0};
+    GEN_SCRIPT gen_script = { 0 };
     BIO *debug_bio = cfg->debug_bio;
 
     SCRIPT_INFO_print(script_info, debug_bio, /*error=*/0, "generating script");
@@ -835,14 +812,14 @@ static int TERP_run(SCRIPT_INFO *script_info, TERP_CONFIG *cfg)
     /* Generate the script by calling the generator function. */
     if (!TEST_true(GEN_SCRIPT_init(&gen_script, script_info))) {
         SCRIPT_INFO_print(script_info, debug_bio, /*error=*/1,
-                          "error while generating script");
+            "error while generating script");
         goto err;
     }
 
     /* Output the script for debugging purposes. */
     if (!TEST_true(GEN_SCRIPT_print(&gen_script, debug_bio, script_info))) {
         SCRIPT_INFO_print(script_info, debug_bio, /*error=*/1,
-                          "error while printing script");
+            "error while printing script");
         goto err;
     }
 
@@ -859,7 +836,7 @@ static int TERP_run(SCRIPT_INFO *script_info, TERP_CONFIG *cfg)
 
     if (terp.stk_end - terp.stk_cur != 0) {
         TEST_error("stack not empty: %zu bytes left",
-                   (size_t)(terp.stk_end - terp.stk_cur));
+            (size_t)(terp.stk_end - terp.stk_cur));
         goto err;
     }
 
@@ -871,12 +848,14 @@ static int TERP_run(SCRIPT_INFO *script_info, TERP_CONFIG *cfg)
     }
 
     GEN_SCRIPT_cleanup(&gen_script);
-    BIO_printf(debug_bio, "Stats:\n  Ops executed: %16llu\n\n",
-               (unsigned long long)terp.ops_executed);
+    if (have_terp) {
+        BIO_printf(debug_bio, "Stats:\n  Ops executed: %16llu\n\n",
+            (unsigned long long)terp.ops_executed);
+    }
     SCRIPT_INFO_print(script_info, debug_bio, /*error=*/!ok,
-                      ok ? "completed" : "failed, exiting");
+        ok ? "completed" : "failed, exiting");
     return ok;
 }
 
-#define SCRIPT(name)    (&script_info_##name)
-#define USE(name)       SCRIPT(name),
+#define SCRIPT(name) (&script_info_##name)
+#define USE(name) SCRIPT(name),
diff --git a/test/rand_test.c b/test/rand_test.c
index 0dd0e506ed5ab..0fbd89542f28a 100644
--- a/test/rand_test.c
+++ b/test/rand_test.c
@@ -15,6 +15,8 @@
 #include "crypto/rand.h"
 #include "testutil.h"
 
+static char *configfile;
+
 static int test_rand(void)
 {
     EVP_RAND_CTX *privctx;
@@ -23,27 +25,35 @@ static int test_rand(void)
     OSSL_PARAM params[2], *p = params;
     unsigned char entropy1[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05 };
     unsigned char entropy2[] = { 0xff, 0xfe, 0xfd };
+    unsigned char nonce[] = { 0x00, 0x01, 0x02, 0x03, 0x04 };
     unsigned char outbuf[3];
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                             entropy1, sizeof(entropy1));
+        entropy1, sizeof(entropy1));
     *p = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(privctx = RAND_get0_private(NULL))
-            || !TEST_true(EVP_RAND_CTX_set_params(privctx, params))
-            || !TEST_int_gt(RAND_priv_bytes(outbuf, sizeof(outbuf)), 0)
-            || !TEST_mem_eq(outbuf, sizeof(outbuf), entropy1, sizeof(outbuf))
-            || !TEST_int_le(RAND_priv_bytes(outbuf, sizeof(outbuf) + 1), 0)
-            || !TEST_int_gt(RAND_priv_bytes(outbuf, sizeof(outbuf)), 0)
-            || !TEST_mem_eq(outbuf, sizeof(outbuf),
-                            entropy1 + sizeof(outbuf), sizeof(outbuf)))
+        || !TEST_true(EVP_RAND_CTX_set_params(privctx, params))
+        || !TEST_int_gt(RAND_priv_bytes(outbuf, sizeof(outbuf)), 0)
+        || !TEST_mem_eq(outbuf, sizeof(outbuf), entropy1, sizeof(outbuf))
+        || !TEST_int_le(RAND_priv_bytes(outbuf, sizeof(outbuf) + 1), 0)
+        || !TEST_int_gt(RAND_priv_bytes(outbuf, sizeof(outbuf)), 0)
+        || !TEST_mem_eq(outbuf, sizeof(outbuf),
+            entropy1 + sizeof(outbuf), sizeof(outbuf)))
         return 0;
 
     *params = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                                entropy2, sizeof(entropy2));
+        entropy2, sizeof(entropy2));
+    if (!TEST_true(EVP_RAND_CTX_set_params(privctx, params))
+        || !TEST_int_gt(RAND_priv_bytes(outbuf, sizeof(outbuf)), 0)
+        || !TEST_mem_eq(outbuf, sizeof(outbuf), entropy2, sizeof(outbuf)))
+        return 0;
+
+    *params = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_NONCE,
+        nonce, sizeof(nonce));
     if (!TEST_true(EVP_RAND_CTX_set_params(privctx, params))
-            || !TEST_int_gt(RAND_priv_bytes(outbuf, sizeof(outbuf)), 0)
-            || !TEST_mem_eq(outbuf, sizeof(outbuf), entropy2, sizeof(outbuf)))
+        || !TEST_true(EVP_RAND_nonce(privctx, outbuf, sizeof(outbuf)))
+        || !TEST_mem_eq(outbuf, sizeof(outbuf), nonce, sizeof(outbuf)))
         return 0;
 
     if (fips_provider_version_lt(NULL, 3, 4, 0)) {
@@ -53,11 +63,11 @@ static int test_rand(void)
     /* Verify that the FIPS indicator can be read and is false */
     prov = EVP_RAND_get0_provider(EVP_RAND_CTX_get0_rand(privctx));
     if (prov != NULL
-            && strcmp(OSSL_PROVIDER_get0_name(prov), "fips") == 0) {
+        && strcmp(OSSL_PROVIDER_get0_name(prov), "fips") == 0) {
         params[0] = OSSL_PARAM_construct_int(OSSL_RAND_PARAM_FIPS_APPROVED_INDICATOR,
-                                             &indicator);
+            &indicator);
         if (!TEST_true(EVP_RAND_CTX_get_params(privctx, params))
-                || !TEST_int_eq(indicator, 0))
+            || !TEST_int_eq(indicator, 0))
             return 0;
     }
     return 1;
@@ -75,21 +85,21 @@ static int test_rand_uniform(void)
     for (i = 1; i < 100; i += 13) {
         x = ossl_rand_uniform_uint32(ctx, i, &err);
         if (!TEST_int_eq(err, 0)
-                || !TEST_uint_ge(x, 0)
-                || !TEST_uint_lt(x, i))
+            || !TEST_uint_ge(x, 0)
+            || !TEST_uint_lt(x, i))
             return 0;
     }
     for (i = 1; i < 100; i += 17)
         for (j = i + 1; j < 150; j += 11) {
             x = ossl_rand_range_uint32(ctx, i, j, &err);
             if (!TEST_int_eq(err, 0)
-                    || !TEST_uint_ge(x, i)
-                    || !TEST_uint_lt(x, j))
+                || !TEST_uint_ge(x, i)
+                || !TEST_uint_lt(x, j))
                 return 0;
         }
 
     res = 1;
- err:
+err:
     OSSL_LIB_CTX_free(ctx);
     return res;
 }
@@ -105,31 +115,31 @@ static int fips_health_test_one(const uint8_t *buf, size_t n, size_t gen)
     int indicator = -1;
 
     p[0] = OSSL_PARAM_construct_octet_string(OSSL_RAND_PARAM_TEST_ENTROPY,
-                                             (void *)buf, n);
+        (void *)buf, n);
     p[1] = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(parent_alg = EVP_RAND_fetch(NULL, "TEST-RAND", "-fips"))
-            || !TEST_ptr(crngt_alg = EVP_RAND_fetch(NULL, "CRNG-TEST", "-fips"))
-            || !TEST_ptr(parent = EVP_RAND_CTX_new(parent_alg, NULL))
-            || !TEST_ptr(crngt = EVP_RAND_CTX_new(crngt_alg, parent))
-            || !TEST_true(EVP_RAND_instantiate(parent, 0, 0,
-                                               (unsigned char *)"abc", 3, p))
-            || !TEST_true(EVP_RAND_instantiate(crngt, 0, 0,
-                                               (unsigned char *)"def", 3, NULL))
-            || !TEST_size_t_le(gen, sizeof(out)))
+        || !TEST_ptr(crngt_alg = EVP_RAND_fetch(NULL, "CRNG-TEST", "-fips"))
+        || !TEST_ptr(parent = EVP_RAND_CTX_new(parent_alg, NULL))
+        || !TEST_ptr(crngt = EVP_RAND_CTX_new(crngt_alg, parent))
+        || !TEST_true(EVP_RAND_instantiate(parent, 0, 0,
+            (unsigned char *)"abc", 3, p))
+        || !TEST_true(EVP_RAND_instantiate(crngt, 0, 0,
+            (unsigned char *)"def", 3, NULL))
+        || !TEST_size_t_le(gen, sizeof(out)))
         goto err;
 
     /* Verify that the FIPS indicator is negative */
     p[0] = OSSL_PARAM_construct_int(OSSL_RAND_PARAM_FIPS_APPROVED_INDICATOR,
-                                    &indicator);
+        &indicator);
     if (!TEST_true(EVP_RAND_CTX_get_params(crngt, p))
-            || !TEST_int_le(indicator, 0))
+        || !TEST_int_le(indicator, 0))
         goto err;
 
     ERR_set_mark();
     res = EVP_RAND_generate(crngt, out, gen, 0, 0, NULL, 0);
     ERR_pop_to_mark();
- err:
+err:
     EVP_RAND_CTX_free(crngt);
     EVP_RAND_CTX_free(parent);
     EVP_RAND_free(crngt_alg);
@@ -174,7 +184,7 @@ static void r_teardown(void *provctx)
 }
 
 static int r_random_bytes(ossl_unused void *vprov, ossl_unused int which,
-                          void *buf, size_t n, ossl_unused unsigned int strength)
+    void *buf, size_t n, ossl_unused unsigned int strength)
 {
     while (n-- > 0)
         ((unsigned char *)buf)[n] = 0xff & n;
@@ -188,9 +198,9 @@ static const OSSL_DISPATCH r_test_table[] = {
 };
 
 static int r_init(const OSSL_CORE_HANDLE *handle,
-                  ossl_unused const OSSL_DISPATCH *oin,
-                  const OSSL_DISPATCH **out,
-                  void **provctx)
+    ossl_unused const OSSL_DISPATCH *oin,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     R_TEST_CTX *ctx;
 
@@ -216,52 +226,80 @@ static int test_rand_random_provider(void)
     memset(privbuf, 255, sizeof(privbuf));
 
     if (!test_get_libctx(&ctx, NULL, NULL, NULL, NULL)
-            || !TEST_true(OSSL_PROVIDER_add_builtin(ctx, "r_prov", &r_init))
-            || !TEST_ptr(prov = OSSL_PROVIDER_try_load(ctx, "r_prov", 1))
-            || !TEST_true(RAND_set1_random_provider(ctx, prov))
-            || !RAND_bytes_ex(ctx, buf, sizeof(buf), 256)
-            || !TEST_mem_eq(buf, sizeof(buf), data, sizeof(data))
-            || !RAND_priv_bytes_ex(ctx, privbuf, sizeof(privbuf), 256)
-            || !TEST_mem_eq(privbuf, sizeof(privbuf), data, sizeof(data)))
+        || !TEST_true(OSSL_PROVIDER_add_builtin(ctx, "r_prov", &r_init))
+        || !TEST_ptr(prov = OSSL_PROVIDER_try_load(ctx, "r_prov", 1))
+        || !TEST_true(RAND_set1_random_provider(ctx, prov))
+        || !RAND_bytes_ex(ctx, buf, sizeof(buf), 256)
+        || !TEST_mem_eq(buf, sizeof(buf), data, sizeof(data))
+        || !RAND_priv_bytes_ex(ctx, privbuf, sizeof(privbuf), 256)
+        || !TEST_mem_eq(privbuf, sizeof(privbuf), data, sizeof(data)))
         goto err;
 
     /* Test we can revert to not using the provider based randomness */
     if (!TEST_true(RAND_set1_random_provider(ctx, NULL))
-            || !RAND_bytes_ex(ctx, buf, sizeof(buf), 256)
-            || !TEST_mem_ne(buf, sizeof(buf), data, sizeof(data)))
+        || !RAND_bytes_ex(ctx, buf, sizeof(buf), 256)
+        || !TEST_mem_ne(buf, sizeof(buf), data, sizeof(data)))
         goto err;
 
     /* And back to the provided randomness */
     if (!TEST_true(RAND_set1_random_provider(ctx, prov))
-            || !RAND_bytes_ex(ctx, buf, sizeof(buf), 256)
-            || !TEST_mem_eq(buf, sizeof(buf), data, sizeof(data)))
+        || !RAND_bytes_ex(ctx, buf, sizeof(buf), 256)
+        || !TEST_mem_eq(buf, sizeof(buf), data, sizeof(data)))
         goto err;
 
     res = 1;
- err:
+err:
     OSSL_PROVIDER_unload(prov);
     OSSL_LIB_CTX_free(ctx);
     return res;
 }
 
+static int test_rand_get0_primary(void)
+{
+    OSSL_LIB_CTX *ctx = OSSL_LIB_CTX_new();
+    int res = 0;
+
+    if (!TEST_ptr(ctx))
+        return 0;
+
+    if (!TEST_true(OSSL_LIB_CTX_load_config(ctx, configfile)))
+        goto err;
+
+    /* We simply test that we get a valid primary */
+    if (!TEST_ptr(RAND_get0_primary(ctx)))
+        goto err;
+
+    res = 1;
+err:
+    OSSL_LIB_CTX_free(ctx);
+    return res;
+}
+
 int setup_tests(void)
 {
-    char *configfile;
+    if (!test_skip_common_options()) {
+        TEST_error("Error parsing test options\n");
+        return 0;
+    }
 
     if (!TEST_ptr(configfile = test_get_argument(0))
-            || !TEST_true(RAND_set_DRBG_type(NULL, "TEST-RAND", "fips=no",
-                                             NULL, NULL))
-            || (fips_provider_version_ge(NULL, 3, 0, 8)
-                && !TEST_true(OSSL_LIB_CTX_load_config(NULL, configfile))))
+        || !TEST_true(RAND_set_DRBG_type(NULL, "TEST-RAND", "fips=no",
+            NULL, NULL))
+        || (fips_provider_version_ge(NULL, 3, 0, 8)
+            && !TEST_true(OSSL_LIB_CTX_load_config(NULL, configfile))))
         return 0;
 
     ADD_TEST(test_rand);
     ADD_TEST(test_rand_uniform);
 
     if (OSSL_PROVIDER_available(NULL, "fips")
-            && fips_provider_version_ge(NULL, 3, 4, 0))
+        && fips_provider_version_ge(NULL, 3, 4, 0))
         ADD_TEST(fips_health_tests);
 
     ADD_TEST(test_rand_random_provider);
+
+    if (!OSSL_PROVIDER_available(NULL, "fips")
+        || fips_provider_version_ge(NULL, 3, 5, 1))
+        ADD_TEST(test_rand_get0_primary);
     return 1;
 }
diff --git a/test/rc2test.c b/test/rc2test.c
index 179b6a53ca175..4f8ad4b17001f 100644
--- a/test/rc2test.c
+++ b/test/rc2test.c
@@ -17,31 +17,31 @@
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_RC2
-# include <openssl/rc2.h>
+#include <openssl/rc2.h>
 
 static unsigned char RC2key[4][16] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-     0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F},
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F },
 };
 
 static unsigned char RC2plain[4][8] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
 };
 
 static unsigned char RC2cipher[4][8] = {
-    {0x1C, 0x19, 0x8A, 0x83, 0x8D, 0xF0, 0x28, 0xB7},
-    {0x21, 0x82, 0x9C, 0x78, 0xA9, 0xF9, 0xC0, 0x74},
-    {0x13, 0xDB, 0x35, 0x17, 0xD3, 0x21, 0x86, 0x9E},
-    {0x50, 0xDC, 0x01, 0x62, 0xBD, 0x75, 0x7F, 0x31},
+    { 0x1C, 0x19, 0x8A, 0x83, 0x8D, 0xF0, 0x28, 0xB7 },
+    { 0x21, 0x82, 0x9C, 0x78, 0xA9, 0xF9, 0xC0, 0x74 },
+    { 0x13, 0xDB, 0x35, 0x17, 0xD3, 0x21, 0x86, 0x9E },
+    { 0x50, 0xDC, 0x01, 0x62, 0xBD, 0x75, 0x7F, 0x31 },
 };
 
 static int test_rc2(const int n)
@@ -50,7 +50,7 @@ static int test_rc2(const int n)
     RC2_KEY key;
     unsigned char buf[8], buf2[8];
 
-    RC2_set_key(&key, 16, &(RC2key[n][0]), 0 /* or 1024 */ );
+    RC2_set_key(&key, 16, &(RC2key[n][0]), 0 /* or 1024 */);
 
     RC2_ecb_encrypt(&RC2plain[n][0], buf, &key, RC2_ENCRYPT);
     if (!TEST_mem_eq(&RC2cipher[n][0], 8, buf, 8))
diff --git a/test/rc4test.c b/test/rc4test.c
index 0ca2ca9aefaa9..e3e96b3b63564 100644
--- a/test/rc4test.c
+++ b/test/rc4test.c
@@ -19,46 +19,46 @@
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_RC4
-# include <openssl/rc4.h>
-# include <openssl/sha.h>
+#include <openssl/rc4.h>
+#include <openssl/sha.h>
 
 static unsigned char keys[6][30] = {
-    {8, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef},
-    {8, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef},
-    {8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {4, 0xef, 0x01, 0x23, 0x45},
-    {8, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef},
-    {4, 0xef, 0x01, 0x23, 0x45},
+    { 8, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+    { 8, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+    { 8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 4, 0xef, 0x01, 0x23, 0x45 },
+    { 8, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+    { 4, 0xef, 0x01, 0x23, 0x45 },
 };
 
 static unsigned char data_len[6] = { 8, 8, 8, 20, 28, 10 };
 
 static unsigned char data[6][30] = {
-    {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xff},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-     0x00, 0x00, 0x00, 0x00, 0xff},
-    {0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0,
-     0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0,
-     0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0,
-     0x12, 0x34, 0x56, 0x78, 0xff},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff},
+    { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xff },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0xff },
+    { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0,
+        0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0,
+        0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0,
+        0x12, 0x34, 0x56, 0x78, 0xff },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff },
 };
 
 static unsigned char output[6][30] = {
-    {0x75, 0xb7, 0x87, 0x80, 0x99, 0xe0, 0xc5, 0x96, 0x00},
-    {0x74, 0x94, 0xc2, 0xe7, 0x10, 0x4b, 0x08, 0x79, 0x00},
-    {0xde, 0x18, 0x89, 0x41, 0xa3, 0x37, 0x5d, 0x3a, 0x00},
-    {0xd6, 0xa1, 0x41, 0xa7, 0xec, 0x3c, 0x38, 0xdf,
-     0xbd, 0x61, 0x5a, 0x11, 0x62, 0xe1, 0xc7, 0xba,
-     0x36, 0xb6, 0x78, 0x58, 0x00},
-    {0x66, 0xa0, 0x94, 0x9f, 0x8a, 0xf7, 0xd6, 0x89,
-     0x1f, 0x7f, 0x83, 0x2b, 0xa8, 0x33, 0xc0, 0x0c,
-     0x89, 0x2e, 0xbe, 0x30, 0x14, 0x3c, 0xe2, 0x87,
-     0x40, 0x01, 0x1e, 0xcf, 0x00},
-    {0xd6, 0xa1, 0x41, 0xa7, 0xec, 0x3c, 0x38, 0xdf, 0xbd, 0x61, 0x00},
+    { 0x75, 0xb7, 0x87, 0x80, 0x99, 0xe0, 0xc5, 0x96, 0x00 },
+    { 0x74, 0x94, 0xc2, 0xe7, 0x10, 0x4b, 0x08, 0x79, 0x00 },
+    { 0xde, 0x18, 0x89, 0x41, 0xa3, 0x37, 0x5d, 0x3a, 0x00 },
+    { 0xd6, 0xa1, 0x41, 0xa7, 0xec, 0x3c, 0x38, 0xdf,
+        0xbd, 0x61, 0x5a, 0x11, 0x62, 0xe1, 0xc7, 0xba,
+        0x36, 0xb6, 0x78, 0x58, 0x00 },
+    { 0x66, 0xa0, 0x94, 0x9f, 0x8a, 0xf7, 0xd6, 0x89,
+        0x1f, 0x7f, 0x83, 0x2b, 0xa8, 0x33, 0xc0, 0x0c,
+        0x89, 0x2e, 0xbe, 0x30, 0x14, 0x3c, 0xe2, 0x87,
+        0x40, 0x01, 0x1e, 0xcf, 0x00 },
+    { 0xd6, 0xa1, 0x41, 0xa7, 0xec, 0x3c, 0x38, 0xdf, 0xbd, 0x61, 0x00 },
 };
 
 static int test_rc4_encrypt(const int i)
diff --git a/test/rc5test.c b/test/rc5test.c
index 8e0747602313e..49ace8f830aee 100644
--- a/test/rc5test.c
+++ b/test/rc5test.c
@@ -19,166 +19,189 @@
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_RC5
-# include <openssl/rc5.h>
+#include <openssl/rc5.h>
 
 static unsigned char RC5key[5][16] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x91, 0x5f, 0x46, 0x19, 0xbe, 0x41, 0xb2, 0x51,
-     0x63, 0x55, 0xa5, 0x01, 0x10, 0xa9, 0xce, 0x91},
-    {0x78, 0x33, 0x48, 0xe7, 0x5a, 0xeb, 0x0f, 0x2f,
-     0xd7, 0xb1, 0x69, 0xbb, 0x8d, 0xc1, 0x67, 0x87},
-    {0xdc, 0x49, 0xdb, 0x13, 0x75, 0xa5, 0x58, 0x4f,
-     0x64, 0x85, 0xb4, 0x13, 0xb5, 0xf1, 0x2b, 0xaf},
-    {0x52, 0x69, 0xf1, 0x49, 0xd4, 0x1b, 0xa0, 0x15,
-     0x24, 0x97, 0x57, 0x4d, 0x7f, 0x15, 0x31, 0x25},
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x91, 0x5f, 0x46, 0x19, 0xbe, 0x41, 0xb2, 0x51,
+        0x63, 0x55, 0xa5, 0x01, 0x10, 0xa9, 0xce, 0x91 },
+    { 0x78, 0x33, 0x48, 0xe7, 0x5a, 0xeb, 0x0f, 0x2f,
+        0xd7, 0xb1, 0x69, 0xbb, 0x8d, 0xc1, 0x67, 0x87 },
+    { 0xdc, 0x49, 0xdb, 0x13, 0x75, 0xa5, 0x58, 0x4f,
+        0x64, 0x85, 0xb4, 0x13, 0xb5, 0xf1, 0x2b, 0xaf },
+    { 0x52, 0x69, 0xf1, 0x49, 0xd4, 0x1b, 0xa0, 0x15,
+        0x24, 0x97, 0x57, 0x4d, 0x7f, 0x15, 0x31, 0x25 },
 };
 
 static unsigned char RC5plain[5][8] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x21, 0xA5, 0xDB, 0xEE, 0x15, 0x4B, 0x8F, 0x6D},
-    {0xF7, 0xC0, 0x13, 0xAC, 0x5B, 0x2B, 0x89, 0x52},
-    {0x2F, 0x42, 0xB3, 0xB7, 0x03, 0x69, 0xFC, 0x92},
-    {0x65, 0xC1, 0x78, 0xB2, 0x84, 0xD1, 0x97, 0xCC},
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x21, 0xA5, 0xDB, 0xEE, 0x15, 0x4B, 0x8F, 0x6D },
+    { 0xF7, 0xC0, 0x13, 0xAC, 0x5B, 0x2B, 0x89, 0x52 },
+    { 0x2F, 0x42, 0xB3, 0xB7, 0x03, 0x69, 0xFC, 0x92 },
+    { 0x65, 0xC1, 0x78, 0xB2, 0x84, 0xD1, 0x97, 0xCC },
 };
 
 static unsigned char RC5cipher[5][8] = {
-    {0x21, 0xA5, 0xDB, 0xEE, 0x15, 0x4B, 0x8F, 0x6D},
-    {0xF7, 0xC0, 0x13, 0xAC, 0x5B, 0x2B, 0x89, 0x52},
-    {0x2F, 0x42, 0xB3, 0xB7, 0x03, 0x69, 0xFC, 0x92},
-    {0x65, 0xC1, 0x78, 0xB2, 0x84, 0xD1, 0x97, 0xCC},
-    {0xEB, 0x44, 0xE4, 0x15, 0xDA, 0x31, 0x98, 0x24},
+    { 0x21, 0xA5, 0xDB, 0xEE, 0x15, 0x4B, 0x8F, 0x6D },
+    { 0xF7, 0xC0, 0x13, 0xAC, 0x5B, 0x2B, 0x89, 0x52 },
+    { 0x2F, 0x42, 0xB3, 0xB7, 0x03, 0x69, 0xFC, 0x92 },
+    { 0x65, 0xC1, 0x78, 0xB2, 0x84, 0xD1, 0x97, 0xCC },
+    { 0xEB, 0x44, 0xE4, 0x15, 0xDA, 0x31, 0x98, 0x24 },
 };
 
-# define RC5_CBC_NUM 27
+#define RC5_CBC_NUM 27
 static unsigned char rc5_cbc_cipher[RC5_CBC_NUM][8] = {
-    {0x7a, 0x7b, 0xba, 0x4d, 0x79, 0x11, 0x1d, 0x1e},
-    {0x79, 0x7b, 0xba, 0x4d, 0x78, 0x11, 0x1d, 0x1e},
-    {0x7a, 0x7b, 0xba, 0x4d, 0x79, 0x11, 0x1d, 0x1f},
-    {0x7a, 0x7b, 0xba, 0x4d, 0x79, 0x11, 0x1d, 0x1f},
-    {0x8b, 0x9d, 0xed, 0x91, 0xce, 0x77, 0x94, 0xa6},
-    {0x2f, 0x75, 0x9f, 0xe7, 0xad, 0x86, 0xa3, 0x78},
-    {0xdc, 0xa2, 0x69, 0x4b, 0xf4, 0x0e, 0x07, 0x88},
-    {0xdc, 0xa2, 0x69, 0x4b, 0xf4, 0x0e, 0x07, 0x88},
-    {0xdc, 0xfe, 0x09, 0x85, 0x77, 0xec, 0xa5, 0xff},
-    {0x96, 0x46, 0xfb, 0x77, 0x63, 0x8f, 0x9c, 0xa8},
-    {0xb2, 0xb3, 0x20, 0x9d, 0xb6, 0x59, 0x4d, 0xa4},
-    {0x54, 0x5f, 0x7f, 0x32, 0xa5, 0xfc, 0x38, 0x36},
-    {0x82, 0x85, 0xe7, 0xc1, 0xb5, 0xbc, 0x74, 0x02},
-    {0xfc, 0x58, 0x6f, 0x92, 0xf7, 0x08, 0x09, 0x34},
-    {0xcf, 0x27, 0x0e, 0xf9, 0x71, 0x7f, 0xf7, 0xc4},
-    {0xe4, 0x93, 0xf1, 0xc1, 0xbb, 0x4d, 0x6e, 0x8c},
-    {0x5c, 0x4c, 0x04, 0x1e, 0x0f, 0x21, 0x7a, 0xc3},
-    {0x92, 0x1f, 0x12, 0x48, 0x53, 0x73, 0xb4, 0xf7},
-    {0x5b, 0xa0, 0xca, 0x6b, 0xbe, 0x7f, 0x5f, 0xad},
-    {0xc5, 0x33, 0x77, 0x1c, 0xd0, 0x11, 0x0e, 0x63},
-    {0x29, 0x4d, 0xdb, 0x46, 0xb3, 0x27, 0x8d, 0x60},
-    {0xda, 0xd6, 0xbd, 0xa9, 0xdf, 0xe8, 0xf7, 0xe8},
-    {0x97, 0xe0, 0x78, 0x78, 0x37, 0xed, 0x31, 0x7f},
-    {0x78, 0x75, 0xdb, 0xf6, 0x73, 0x8c, 0x64, 0x78},
-    {0x8f, 0x34, 0xc3, 0xc6, 0x81, 0xc9, 0x96, 0x95},
-    {0x7c, 0xb3, 0xf1, 0xdf, 0x34, 0xf9, 0x48, 0x11},
-    {0x7f, 0xd1, 0xa0, 0x23, 0xa5, 0xbb, 0xa2, 0x17},
+    { 0x7a, 0x7b, 0xba, 0x4d, 0x79, 0x11, 0x1d, 0x1e },
+    { 0x79, 0x7b, 0xba, 0x4d, 0x78, 0x11, 0x1d, 0x1e },
+    { 0x7a, 0x7b, 0xba, 0x4d, 0x79, 0x11, 0x1d, 0x1f },
+    { 0x7a, 0x7b, 0xba, 0x4d, 0x79, 0x11, 0x1d, 0x1f },
+    { 0x8b, 0x9d, 0xed, 0x91, 0xce, 0x77, 0x94, 0xa6 },
+    { 0x2f, 0x75, 0x9f, 0xe7, 0xad, 0x86, 0xa3, 0x78 },
+    { 0xdc, 0xa2, 0x69, 0x4b, 0xf4, 0x0e, 0x07, 0x88 },
+    { 0xdc, 0xa2, 0x69, 0x4b, 0xf4, 0x0e, 0x07, 0x88 },
+    { 0xdc, 0xfe, 0x09, 0x85, 0x77, 0xec, 0xa5, 0xff },
+    { 0x96, 0x46, 0xfb, 0x77, 0x63, 0x8f, 0x9c, 0xa8 },
+    { 0xb2, 0xb3, 0x20, 0x9d, 0xb6, 0x59, 0x4d, 0xa4 },
+    { 0x54, 0x5f, 0x7f, 0x32, 0xa5, 0xfc, 0x38, 0x36 },
+    { 0x82, 0x85, 0xe7, 0xc1, 0xb5, 0xbc, 0x74, 0x02 },
+    { 0xfc, 0x58, 0x6f, 0x92, 0xf7, 0x08, 0x09, 0x34 },
+    { 0xcf, 0x27, 0x0e, 0xf9, 0x71, 0x7f, 0xf7, 0xc4 },
+    { 0xe4, 0x93, 0xf1, 0xc1, 0xbb, 0x4d, 0x6e, 0x8c },
+    { 0x5c, 0x4c, 0x04, 0x1e, 0x0f, 0x21, 0x7a, 0xc3 },
+    { 0x92, 0x1f, 0x12, 0x48, 0x53, 0x73, 0xb4, 0xf7 },
+    { 0x5b, 0xa0, 0xca, 0x6b, 0xbe, 0x7f, 0x5f, 0xad },
+    { 0xc5, 0x33, 0x77, 0x1c, 0xd0, 0x11, 0x0e, 0x63 },
+    { 0x29, 0x4d, 0xdb, 0x46, 0xb3, 0x27, 0x8d, 0x60 },
+    { 0xda, 0xd6, 0xbd, 0xa9, 0xdf, 0xe8, 0xf7, 0xe8 },
+    { 0x97, 0xe0, 0x78, 0x78, 0x37, 0xed, 0x31, 0x7f },
+    { 0x78, 0x75, 0xdb, 0xf6, 0x73, 0x8c, 0x64, 0x78 },
+    { 0x8f, 0x34, 0xc3, 0xc6, 0x81, 0xc9, 0x96, 0x95 },
+    { 0x7c, 0xb3, 0xf1, 0xdf, 0x34, 0xf9, 0x48, 0x11 },
+    { 0x7f, 0xd1, 0xa0, 0x23, 0xa5, 0xbb, 0xa2, 0x17 },
 };
 
 static unsigned char rc5_cbc_key[RC5_CBC_NUM][17] = {
-    {1, 0x00},
-    {1, 0x00},
-    {1, 0x00},
-    {1, 0x00},
-    {1, 0x00},
-    {1, 0x11},
-    {1, 0x00},
-    {4, 0x00, 0x00, 0x00, 0x00},
-    {1, 0x00},
-    {1, 0x00},
-    {1, 0x00},
-    {1, 0x00},
-    {4, 0x01, 0x02, 0x03, 0x04},
-    {4, 0x01, 0x02, 0x03, 0x04},
-    {4, 0x01, 0x02, 0x03, 0x04},
-    {8, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {8, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {8, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {8, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {16, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-     0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {16, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-     0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {16, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-     0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {5, 0x01, 0x02, 0x03, 0x04, 0x05},
-    {5, 0x01, 0x02, 0x03, 0x04, 0x05},
-    {5, 0x01, 0x02, 0x03, 0x04, 0x05},
-    {5, 0x01, 0x02, 0x03, 0x04, 0x05},
-    {5, 0x01, 0x02, 0x03, 0x04, 0x05},
+    { 1, 0x00 },
+    { 1, 0x00 },
+    { 1, 0x00 },
+    { 1, 0x00 },
+    { 1, 0x00 },
+    { 1, 0x11 },
+    { 1, 0x00 },
+    { 4, 0x00, 0x00, 0x00, 0x00 },
+    { 1, 0x00 },
+    { 1, 0x00 },
+    { 1, 0x00 },
+    { 1, 0x00 },
+    { 4, 0x01, 0x02, 0x03, 0x04 },
+    { 4, 0x01, 0x02, 0x03, 0x04 },
+    { 4, 0x01, 0x02, 0x03, 0x04 },
+    { 8, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 8, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 8, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 8, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 16, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+        0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 16, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+        0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 16, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+        0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 5, 0x01, 0x02, 0x03, 0x04, 0x05 },
+    { 5, 0x01, 0x02, 0x03, 0x04, 0x05 },
+    { 5, 0x01, 0x02, 0x03, 0x04, 0x05 },
+    { 5, 0x01, 0x02, 0x03, 0x04, 0x05 },
+    { 5, 0x01, 0x02, 0x03, 0x04, 0x05 },
 };
 
 static unsigned char rc5_cbc_plain[RC5_CBC_NUM][8] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
-    {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80},
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-    {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x01},
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
+    { 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+    { 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80 },
+    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
+    { 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x01 },
 };
 
 static int rc5_cbc_rounds[RC5_CBC_NUM] = {
-    0, 0, 0, 0, 0, 1, 2, 2,
-    8, 8, 12, 16, 8, 12, 16, 12,
-    8, 12, 16, 8, 12, 16, 12, 8,
-    8, 8, 8,
+    0,
+    0,
+    0,
+    0,
+    0,
+    1,
+    2,
+    2,
+    8,
+    8,
+    12,
+    16,
+    8,
+    12,
+    16,
+    12,
+    8,
+    12,
+    16,
+    8,
+    12,
+    16,
+    12,
+    8,
+    8,
+    8,
+    8,
 };
 
 static unsigned char rc5_cbc_iv[RC5_CBC_NUM][8] = {
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x78, 0x75, 0xdb, 0xf6, 0x73, 0x8c, 0x64, 0x78},
-    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    {0x7c, 0xb3, 0xf1, 0xdf, 0x34, 0xf9, 0x48, 0x11},
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x78, 0x75, 0xdb, 0xf6, 0x73, 0x8c, 0x64, 0x78 },
+    { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+    { 0x7c, 0xb3, 0xf1, 0xdf, 0x34, 0xf9, 0x48, 0x11 },
 };
 
 static int test_rc5_ecb(int n)
@@ -211,21 +234,21 @@ static int test_rc5_cbc(int n)
     i = rc5_cbc_rounds[n];
     if (i >= 8) {
         if (!TEST_true(RC5_32_set_key(&key, rc5_cbc_key[n][0],
-                                      &rc5_cbc_key[n][1], i)))
+                &rc5_cbc_key[n][1], i)))
             return 0;
 
         memcpy(ivb, &rc5_cbc_iv[n][0], 8);
         RC5_32_cbc_encrypt(&rc5_cbc_plain[n][0], buf, 8,
-                           &key, &ivb[0], RC5_ENCRYPT);
+            &key, &ivb[0], RC5_ENCRYPT);
 
         if (!TEST_mem_eq(&rc5_cbc_cipher[n][0], sizeof(rc5_cbc_cipher[0]),
-                         buf, sizeof(buf)))
+                buf, sizeof(buf)))
             testresult = 0;
 
         memcpy(ivb, &rc5_cbc_iv[n][0], 8);
         RC5_32_cbc_encrypt(buf, buf2, 8, &key, &ivb[0], RC5_DECRYPT);
         if (!TEST_mem_eq(&rc5_cbc_plain[n][0], sizeof(rc5_cbc_plain[0]),
-                         buf2, sizeof(buf2)))
+                buf2, sizeof(buf2)))
             testresult = 0;
     }
 
diff --git a/test/rdcpu_sanitytest.c b/test/rdcpu_sanitytest.c
index c14e85c9b70ff..e76b94b34cfb1 100644
--- a/test/rdcpu_sanitytest.c
+++ b/test/rdcpu_sanitytest.c
@@ -13,24 +13,22 @@
 #include "testutil.h"
 #include "internal/cryptlib.h"
 
-#if (defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
-     defined(__x86_64) || defined(__x86_64__) || \
-     defined(_M_AMD64) || defined (_M_X64)) && defined(OPENSSL_CPUID_OBJ)
-# define IS_X_86 1
+#if (defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)) && defined(OPENSSL_CPUID_OBJ)
+#define IS_X_86 1
 size_t OPENSSL_ia32_rdrand_bytes(unsigned char *buf, size_t len);
 size_t OPENSSL_ia32_rdseed_bytes(unsigned char *buf, size_t len);
 #else
-# define IS_X_86 0
+#define IS_X_86 0
 #endif
 
 #if defined(__aarch64__) && defined(OPENSSL_CPUID_OBJ)
-# define IS_AARCH_64 1
-# include "arm_arch.h"
+#define IS_AARCH_64 1
+#include "arm_arch.h"
 
 size_t OPENSSL_rndr_bytes(unsigned char *buf, size_t len);
 size_t OPENSSL_rndrrs_bytes(unsigned char *buf, size_t len);
 #else
-# define IS_AARCH_64 0
+#define IS_AARCH_64 0
 #endif
 
 #if (IS_X_86 || IS_AARCH_64)
@@ -38,7 +36,7 @@ static int sanity_check_bytes(size_t (*rng)(unsigned char *, size_t),
     int rounds, int min_failures, int max_retries, int max_zero_words)
 {
     int testresult = 0;
-    unsigned char prior[31] = {0}, buf[31] = {0}, check[7];
+    unsigned char prior[31] = { 0 }, buf[31] = { 0 }, check[7];
     int failures = 0, zero_words = 0;
 
     int i;
@@ -60,7 +58,7 @@ static int sanity_check_bytes(size_t (*rng)(unsigned char *, size_t),
          */
         size_t j;
         for (j = 0; j < sizeof(buf) - 1; j++) {
-            if (buf[j] == 0 && buf[j+1] == 0) {
+            if (buf[j] == 0 && buf[j + 1] == 0) {
                 zero_words++;
             }
         }
@@ -125,7 +123,7 @@ int setup_tests(void)
 #if (IS_X_86 || IS_AARCH_64)
     OPENSSL_cpuid_setup();
 
-# if IS_X_86
+#if IS_X_86
     int have_rdseed = (OPENSSL_ia32cap_P[2] & (1 << 18)) != 0;
     int have_rdrand = (OPENSSL_ia32cap_P[1] & (1 << (62 - 32))) != 0;
 
@@ -136,14 +134,14 @@ int setup_tests(void)
     if (have_rdseed) {
         ADD_TEST(sanity_check_rdseed_bytes);
     }
-# elif IS_AARCH_64
+#elif IS_AARCH_64
     int have_rndr_rndrrs = (OPENSSL_armcap_P & (1 << 8)) != 0;
 
     if (have_rndr_rndrrs) {
         ADD_TEST(sanity_check_rndr_bytes);
         ADD_TEST(sanity_check_rndrrs_bytes);
     }
-# endif
+#endif
 #endif
 
     return 1;
diff --git a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
index 222b1886aec01..6c8de64b0b322 100644
--- a/test/recipes/01-test_symbol_presence.t
+++ b/test/recipes/01-test_symbol_presence.t
@@ -24,6 +24,8 @@ use platform;
 plan skip_all => "Test is disabled on NonStop" if config('target') =~ m|^nonstop|;
 # MacOS arranges symbol names differently
 plan skip_all => "Test is disabled on MacOS" if config('target') =~ m|^darwin|;
+# AIX reports symbol names differently
+plan skip_all => "Test is disabled on AIX" if config('target') =~ m|^aix|;
 plan skip_all => "This is unsupported on platforms that don't have 'nm'"
     unless IPC::Cmd::can_run('nm');
 
diff --git a/test/recipes/03-test_fipsinstall.t b/test/recipes/03-test_fipsinstall.t
index 1f9110ef600a0..3dcbe67c6d558 100644
--- a/test/recipes/03-test_fipsinstall.t
+++ b/test/recipes/03-test_fipsinstall.t
@@ -63,7 +63,7 @@ my @commandline =
         ( 'x942kdf_key_check',              'x942kdf-key-check' )
     );
 
-plan tests => 40 + (scalar @pedantic_okay) + (scalar @pedantic_fail)
+plan tests => 41 + (scalar @pedantic_okay) + (scalar @pedantic_fail)
               + 4 * (scalar @commandline);
 
 my $infile = bldtop_file('providers', platform->dso('fips'));
@@ -392,6 +392,16 @@ SKIP: {
        "fipsinstall fails when the ML-KEM decapsulate implicit failure result is corrupted");
 }
 
+# corrupt an Asymmetric cipher test
+SKIP: {
+    skip "Skipping Asymmetric RSA corruption test because of no rsa in this build", 1
+        if disabled("rsa") || disabled("fips-post");
+    ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.cnf', '-module', $infile,
+                '-corrupt_desc', 'RSA_Encrypt',
+                '-corrupt_type', 'KAT_AsymmetricCipher'])),
+       "fipsinstall fails when the asymmetric cipher result is corrupted");
+}
+
 # 'local' ensures that this change is only done in this file.
 local $ENV{OPENSSL_CONF_INCLUDE} = abs2rel(curdir());
 
diff --git a/test/recipes/04-test_asn1_parse.t b/test/recipes/04-test_asn1_parse.t
index f3af4365920ac..192c3320ae2c0 100644
--- a/test/recipes/04-test_asn1_parse.t
+++ b/test/recipes/04-test_asn1_parse.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2023-2026 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -12,7 +12,7 @@ use OpenSSL::Test::Utils;
 
 setup("test_asn1_parse");
 
-plan tests => 3;
+plan tests => 4;
 
 $ENV{OPENSSL_CONF} = srctop_file("test", "test_asn1_parse.cnf");
 
@@ -24,3 +24,6 @@ ok(run(app(([ 'openssl', 'asn1parse',
 
 ok(run(app(([ 'openssl', 'asn1parse',
               '-genstr', 'OID:1.2.3.4.3']))));
+
+ok(run(app(([ 'openssl', 'asn1parse',
+              '-genconf', srctop_file("test", "test_asn1_genconf.cnf")]))));
diff --git a/test/recipes/15-test_dsaparam.t b/test/recipes/15-test_dsaparam.t
index 5fd854c474dcd..8f7d2af1754ee 100644
--- a/test/recipes/15-test_dsaparam.t
+++ b/test/recipes/15-test_dsaparam.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-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
@@ -11,7 +11,7 @@ use warnings;
 
 use File::Spec;
 use File::Copy;
-use File::Compare qw/compare/;
+use File::Compare qw/compare_text/;
 use OpenSSL::Glob;
 use OpenSSL::Test qw/:DEFAULT data_file/;
 use OpenSSL::Test::Utils;
@@ -84,4 +84,4 @@ my $inout = "inout.pem";
 copy($input, $inout);
 ok(run(app(['openssl', 'dsaparam', '-in', $inout, '-out', $inout])),
     "identical infile and outfile");
-ok(!compare($input, $inout), "converted file $inout did not change");
+ok(!compare_text($input, $inout), "converted file $inout did not change");
diff --git a/test/recipes/15-test_ec.t b/test/recipes/15-test_ec.t
index c953fad9f1ec4..9bf946e81b4b0 100644
--- a/test/recipes/15-test_ec.t
+++ b/test/recipes/15-test_ec.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2023 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-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
@@ -18,7 +18,7 @@ setup("test_ec");
 
 plan skip_all => 'EC is not supported in this build' if disabled('ec');
 
-plan tests => 15;
+plan tests => 16;
 
 my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
 
@@ -33,6 +33,16 @@ subtest 'EC conversions -- private key' => sub {
     tconversion( -type => 'ec', -prefix => 'ec-priv',
                  -in => srctop_file("test","testec-p256.pem") );
 };
+
+SKIP: {
+    skip "SM2 is not supported by this OpenSSL build", 1
+        if disabled("sm2");
+    subtest 'EC conversions -- private key' => sub {
+        tconversion( -type => 'ec', -prefix => 'sm2-priv',
+                     -in => srctop_file("test","testec-sm2.pem") );
+    };
+}
+
 subtest 'EC conversions -- private key PKCS#8' => sub {
     tconversion( -type => 'ec', -prefix => 'ec-pkcs8',
                  -in => srctop_file("test","testec-p256.pem"),
diff --git a/test/recipes/15-test_ml_dsa_codecs.t b/test/recipes/15-test_ml_dsa_codecs.t
index 9f4d5e595fa35..3c1e9e1bbcd4c 100644
--- a/test/recipes/15-test_ml_dsa_codecs.t
+++ b/test/recipes/15-test_ml_dsa_codecs.t
@@ -13,6 +13,7 @@ use warnings;
 use File::Spec;
 use File::Copy;
 use File::Compare qw/compare_text compare/;
+use IO::File;
 use OpenSSL::Glob;
 use OpenSSL::Test qw/:DEFAULT data_file srctop_file bldtop_dir/;
 use OpenSSL::Test::Utils;
@@ -63,7 +64,7 @@ foreach my $alg (@algs) {
         ok(run(app(['openssl', 'genpkey', '-out', $pem,
                     '-pkeyopt', "hexseed:$seed", '-algorithm', "ml-dsa-$alg",
                     '-provparam', "ml-dsa.output_formats=$f"])));
-        ok(!compare($in, $pem),
+        ok(!compare_text($in, $pem),
             sprintf("prvkey PEM match: %s, %s", $alg, $f));
 
         ok(run(app(['openssl', 'pkey', '-in', $in, '-noout',
@@ -95,7 +96,7 @@ foreach my $alg (@algs) {
     ok(run(app([qw(openssl genpkey -provparam ml-dsa.retain_seed=no),
                 '-algorithm', "ml-dsa-$alg", '-pkeyopt', "hexseed:$seed",
                 '-out', $seedless])));
-    ok(!compare(data_file($formats{'priv-only'}), $seedless),
+    ok(!compare_text(data_file($formats{'priv-only'}), $seedless),
         sprintf("seedless via cli key match: %s", $alg));
     {
         local $ENV{'OPENSSL_CONF'} = data_file("ml-dsa.cnf");
@@ -104,14 +105,14 @@ foreach my $alg (@algs) {
         ok(run(app(['openssl', 'genpkey',
                     '-algorithm', "ml-dsa-$alg", '-pkeyopt', "hexseed:$seed",
                     '-out', $seedless])));
-        ok(!compare(data_file($formats{'priv-only'}), $seedless),
+        ok(!compare_text(data_file($formats{'priv-only'}), $seedless),
             sprintf("seedless via config match: %s", $alg));
 
         my $seedfull = sprintf("seedfull-%s.gen.conf+cli.pem", $alg);
         ok(run(app(['openssl', 'genpkey', '-provparam', 'ml-dsa.retain_seed=yes',
                     '-algorithm', "ml-dsa-$alg", '-pkeyopt', "hexseed:$seed",
                     '-out', $seedfull])));
-        ok(!compare(data_file($formats{'seed-priv'}), $seedfull),
+        ok(!compare_text(data_file($formats{'seed-priv'}), $seedfull),
             sprintf("seedfull via cli vs. conf key match: %s", $alg));
     }
 
@@ -120,7 +121,7 @@ foreach my $alg (@algs) {
     $seedless = sprintf("seedless-%s.dec.cli.pem", $alg);
     ok(run(app(['openssl', 'pkey', '-provparam', 'ml-dsa.retain_seed=no',
                 '-in', data_file($formats{'seed-only'}), '-out', $seedless])));
-    ok(!compare(data_file($formats{'priv-only'}), $seedless),
+    ok(!compare_text(data_file($formats{'priv-only'}), $seedless),
         sprintf("seedless via provparam key match: %s", $alg));
     {
         local $ENV{'OPENSSL_CONF'} = data_file("ml-dsa.cnf");
@@ -128,13 +129,13 @@ foreach my $alg (@algs) {
         $seedless = sprintf("seedless-%s.dec.cnf.pem", $alg);
         ok(run(app(['openssl', 'pkey',
                     '-in', data_file($formats{'seed-only'}), '-out', $seedless])));
-        ok(!compare(data_file($formats{'priv-only'}), $seedless),
+        ok(!compare_text(data_file($formats{'priv-only'}), $seedless),
             sprintf("seedless via config match: %s", $alg));
 
         my $seedfull = sprintf("seedfull-%s.dec.conf+cli.pem", $alg);
         ok(run(app(['openssl', 'pkey', '-provparam', 'ml-dsa.retain_seed=yes',
                     '-in', data_file($formats{'seed-only'}), '-out', $seedfull])));
-        ok(!compare(data_file($formats{'seed-priv'}), $seedfull),
+        ok(!compare_text(data_file($formats{'seed-priv'}), $seedfull),
             sprintf("seedfull via cli vs. conf key match: %s", $alg));
     }
 
@@ -143,7 +144,7 @@ foreach my $alg (@algs) {
     my $privpref = sprintf("privpref-%s.dec.cli.pem", $alg);
     ok(run(app(['openssl', 'pkey', '-provparam', 'ml-dsa.prefer_seed=no',
                 '-in', data_file($formats{'seed-priv'}), '-out', $privpref])));
-    ok(!compare(data_file($formats{'priv-only'}), $privpref),
+    ok(!compare_text(data_file($formats{'priv-only'}), $privpref),
         sprintf("seed non-preference via provparam key match: %s", $alg));
 
     # (2 * @formats) tests
@@ -154,7 +155,7 @@ foreach my $alg (@algs) {
         my $out = sprintf("prv-%s-%s.txt", $alg, $f);
         ok(run(app(['openssl', 'pkey', '-in', data_file($kf),
                     '-noout', '-text', '-out', $out])));
-        ok(!compare(data_file($txt), $out),
+        ok(!compare_text(data_file($txt), $out),
             sprintf("text form private key: %s with %s", $alg, $f));
     }
 
diff --git a/test/recipes/15-test_ml_kem_codecs.t b/test/recipes/15-test_ml_kem_codecs.t
index 72e1b3333435d..bebb8b8e851bd 100644
--- a/test/recipes/15-test_ml_kem_codecs.t
+++ b/test/recipes/15-test_ml_kem_codecs.t
@@ -13,6 +13,7 @@ use warnings;
 use File::Spec;
 use File::Copy;
 use File::Compare qw/compare_text compare/;
+use IO::File;
 use OpenSSL::Glob;
 use OpenSSL::Test qw/:DEFAULT data_file srctop_file bldtop_dir/;
 use OpenSSL::Test::Utils;
@@ -59,7 +60,7 @@ foreach my $alg (@algs) {
         ok(run(app(['openssl', 'genpkey', '-out', $pem,
                     '-pkeyopt', "hexseed:$seed", '-algorithm', "ml-kem-$alg",
                     '-provparam', "ml-kem.output_formats=$f"])));
-        ok(!compare($in, $pem),
+        ok(!compare_text($in, $pem),
             sprintf("prvkey PEM match: %s, %s", $alg, $f));
 
         ok(run(app(['openssl', 'pkey', '-in', $in, '-noout',
@@ -97,7 +98,7 @@ foreach my $alg (@algs) {
     ok(run(app(['openssl', 'genpkey', '-provparam', 'ml-kem.retain_seed=no',
                 '-algorithm', "ml-kem-$alg", '-pkeyopt', "hexseed:$seed",
                 '-out', $seedless])));
-    ok(!compare(data_file($formats{'priv-only'}), $seedless),
+    ok(!compare_text(data_file($formats{'priv-only'}), $seedless),
         sprintf("seedless via cli key match: %s", $alg));
     {
         local $ENV{'OPENSSL_CONF'} = data_file("ml-kem.cnf");
@@ -106,14 +107,14 @@ foreach my $alg (@algs) {
         ok(run(app(['openssl', 'genpkey',
                     '-algorithm', "ml-kem-$alg", '-pkeyopt', "hexseed:$seed",
                     '-out', $seedless])));
-        ok(!compare(data_file($formats{'priv-only'}), $seedless),
+        ok(!compare_text(data_file($formats{'priv-only'}), $seedless),
             sprintf("seedless via config match: %s", $alg));
 
         my $seedfull = sprintf("seedfull-%s.gen.conf+cli.pem", $alg);
         ok(run(app(['openssl', 'genpkey', '-provparam', 'ml-kem.retain_seed=yes',
                     '-algorithm', "ml-kem-$alg", '-pkeyopt', "hexseed:$seed",
                     '-out', $seedfull])));
-        ok(!compare(data_file($formats{'seed-priv'}), $seedfull),
+        ok(!compare_text(data_file($formats{'seed-priv'}), $seedfull),
             sprintf("seedfull via cli vs. conf key match: %s", $alg));
     }
 
@@ -122,7 +123,7 @@ foreach my $alg (@algs) {
     $seedless = sprintf("seedless-%s.dec.cli.pem", $alg);
     ok(run(app(['openssl', 'pkey', '-provparam', 'ml-kem.retain_seed=no',
                 '-in', data_file($formats{'seed-only'}), '-out', $seedless])));
-    ok(!compare(data_file($formats{'priv-only'}), $seedless),
+    ok(!compare_text(data_file($formats{'priv-only'}), $seedless),
         sprintf("seedless via provparam key match: %s", $alg));
     {
         local $ENV{'OPENSSL_CONF'} = data_file("ml-kem.cnf");
@@ -130,13 +131,13 @@ foreach my $alg (@algs) {
         $seedless = sprintf("seedless-%s.dec.cnf.pem", $alg);
         ok(run(app(['openssl', 'pkey',
                     '-in', data_file($formats{'seed-only'}), '-out', $seedless])));
-        ok(!compare(data_file($formats{'priv-only'}), $seedless),
+        ok(!compare_text(data_file($formats{'priv-only'}), $seedless),
             sprintf("seedless via config match: %s", $alg));
 
         my $seedfull = sprintf("seedfull-%s.dec.conf+cli.pem", $alg);
         ok(run(app(['openssl', 'pkey', '-provparam', 'ml-kem.retain_seed=yes',
                     '-in', data_file($formats{'seed-only'}), '-out', $seedfull])));
-        ok(!compare(data_file($formats{'seed-priv'}), $seedfull),
+        ok(!compare_text(data_file($formats{'seed-priv'}), $seedfull),
             sprintf("seedfull via cli vs. conf key match: %s", $alg));
     }
 
@@ -145,7 +146,7 @@ foreach my $alg (@algs) {
     my $privpref = sprintf("privpref-%s.dec.cli.pem", $alg);
     ok(run(app(['openssl', 'pkey', '-provparam', 'ml-kem.prefer_seed=no',
                 '-in', data_file($formats{'seed-priv'}), '-out', $privpref])));
-    ok(!compare(data_file($formats{'priv-only'}), $privpref),
+    ok(!compare_text(data_file($formats{'priv-only'}), $privpref),
         sprintf("seed non-preference via provparam key match: %s", $alg));
 
     # (2 * @formats) tests
@@ -156,7 +157,7 @@ foreach my $alg (@algs) {
         my $out = sprintf("prv-%s-%s.txt", $alg, $f);
         ok(run(app(['openssl', 'pkey', '-in', data_file($k),
                     '-noout', '-text', '-out', $out])));
-        ok(!compare(data_file($txt), $out),
+        ok(!compare_text(data_file($txt), $out),
             sprintf("text form private key: %s with %s", $alg, $f));
     }
 
diff --git a/test/recipes/15-test_pkey.t b/test/recipes/15-test_pkey.t
index 9242f49a5f267..1f23795e4f470 100644
--- a/test/recipes/15-test_pkey.t
+++ b/test/recipes/15-test_pkey.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
+# 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
@@ -11,7 +11,7 @@ use warnings;
 
 use OpenSSL::Test::Utils;
 use File::Copy;
-use File::Compare qw(compare);
+use File::Compare qw(compare_text);
 use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_pkey");
@@ -40,7 +40,7 @@ subtest "=== pkey typical en-/decryption (using AES256-CBC) ===" => sub {
     ok(run(app([@app, '-in', $encrypted_key, '-out', $decrypted_key,
                 '-passin', $pass])),
        "decrypt key");
-    is(compare($in_key, $decrypted_key), 0,
+    is(compare_text($in_key, $decrypted_key), 0,
        "Same file contents after encrypting and decrypting in separate files");
 };
 
@@ -61,7 +61,7 @@ subtest "=== pkey handling of identical input and output files (using 3DES) and
 
     ok(run(app([@app, '-in', $inout, '-out', $inout, '-passin', $pass])),
        "decrypt using identical infile and outfile");
-    is(compare($in_key, $inout), 0,
+    is(compare_text($in_key, $inout), 0,
        "Same file contents after encrypting and decrypting using same file");
 };
 
@@ -75,20 +75,20 @@ subtest "=== pkey handling of public keys (Ed25519) ===" => sub {
     my $pub_out1 = 'pub1.pem';
     ok(run(app([@app, '-in', $in_ed_key, '-pubout', '-out', $pub_out1])),
        "extract public key");
-    is(compare($in_pubkey, $pub_out1), 0,
+    is(compare_text($in_pubkey, $pub_out1), 0,
        "extracted public key is same as original public key");
 
     my $pub_out2 = 'pub2.pem';
     ok(run(app([@app, '-in', $in_pubkey, '-pubin', '-pubout', '-out', $pub_out2])),
        "read public key from pubfile");
-    is(compare($in_pubkey, $pub_out2), 0,
+    is(compare_text($in_pubkey, $pub_out2), 0,
        "public key read using pubfile is same as original public key");
 
     my $pub_out3 = 'pub3.pem';
     ok(run(app([@app, '-in', $in_ed_key, '-pubin', '-pubout', '-out', $pub_out3])),
        "extract public key from pkey file with -pubin");
-    is(compare($in_pubkey, $pub_out3), 0,
-       "public key extraced from pkey file with -pubin is same as original");
+    is(compare_text($in_pubkey, $pub_out3), 0,
+       "public key extracted from pkey file with -pubin is same as original");
 };
 
 
@@ -108,7 +108,7 @@ subtest "=== pkey handling of DER encoding ===" => sub {
     ok(run(app([@app, '-in', $der_out, '-inform', 'DER',
                  '-out', $pem_out])),
        "read DER-encoded key");
-    is(compare($in_key, $pem_out), 0,
+    is(compare_text($in_key, $pem_out), 0,
        "Same file contents after converting to DER and back");
 };
 
diff --git a/test/recipes/20-test_cli_list.t b/test/recipes/20-test_cli_list.t
new file mode 100644
index 0000000000000..a039b20978e42
--- /dev/null
+++ b/test/recipes/20-test_cli_list.t
@@ -0,0 +1,25 @@
+#! /usr/bin/env perl
+# Copyright 2016-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
+
+use strict;
+use warnings;
+
+use OpenSSL::Test qw/:DEFAULT bldtop_file srctop_file bldtop_dir with/;
+use OpenSSL::Test::Utils;
+
+setup("test_cli_list");
+
+plan tests => 2;
+
+ok(run(app(["openssl", "list", "-skey-managers"],
+        stdout => "listout.txt")),
+"List skey managers - default configuration");
+open DATA, "listout.txt";
+my @match = grep /secret key/, <DATA>;
+close DATA;
+ok(scalar @match > 1 ? 1 : 0, "Several skey managers are listed - default configuration");
diff --git a/test/recipes/20-test_dhparam.t b/test/recipes/20-test_dhparam.t
index f81e74c5667c4..f08e8dd437242 100644
--- a/test/recipes/20-test_dhparam.t
+++ b/test/recipes/20-test_dhparam.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-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
@@ -11,7 +11,7 @@ use strict;
 use warnings;
 
 use File::Copy;
-use File::Compare qw/compare/;
+use File::Compare qw/compare_text/;
 use OpenSSL::Test qw(:DEFAULT data_file srctop_file);
 use OpenSSL::Test::Utils;
 
@@ -221,4 +221,4 @@ my $inout = "inout.pem";
 copy($input, $inout);
 ok(run(app(['openssl', 'dhparam', '-in', $inout, '-out', $inout])),
     "identical infile and outfile");
-ok(!compare($input, $inout), "converted file $inout did not change");
+ok(!compare_text($input, $inout), "converted file $inout did not change");
diff --git a/test/recipes/20-test_pkeyutl.t b/test/recipes/20-test_pkeyutl.t
index 2dc22e0c6e999..31e46c6d99b07 100644
--- a/test/recipes/20-test_pkeyutl.t
+++ b/test/recipes/20-test_pkeyutl.t
@@ -11,7 +11,7 @@ use warnings;
 
 use File::Spec;
 use File::Basename;
-use OpenSSL::Test qw/:DEFAULT srctop_file ok_nofips/;
+use OpenSSL::Test qw/:DEFAULT srctop_file ok_nofips with/;
 use OpenSSL::Test::Utils;
 use File::Compare qw/compare_text compare/;
 
@@ -68,9 +68,13 @@ SKIP: {
                   '-inkey', srctop_file('test', 'certs', 'server-ed25519-cert.pem'),
                   '-sigfile', 'Ed25519.sig']))),
                   "Verify an Ed25519 signature against a piece of data");
-    ok(!run(app(([ 'openssl', 'pkeyutl', '-verifyrecover', '-in', 'Ed25519.sig',
-                   '-inkey', srctop_file('test', 'certs', 'server-ed25519-key.pem')]))),
-       "Cannot use -verifyrecover with EdDSA");
+    #Check for failure return code
+    with({ exit_checker => sub { return shift == 1; } },
+        sub {
+            ok(run(app(([ 'openssl', 'pkeyutl', '-verifyrecover', '-in', 'Ed25519.sig',
+                          '-inkey', srctop_file('test', 'certs', 'server-ed25519-key.pem')]))),
+               "Cannot use -verifyrecover with EdDSA");
+        });
 
     # Ed448
     ok(run(app(([ 'openssl', 'pkeyutl', '-sign', '-in',
@@ -123,8 +127,12 @@ sub tsignverify {
              '-out', $sigfile,
              '-in', $data_to_sign);
     push(@args, @extraopts);
-    ok(!run(app([@args])),
-       $testtext.": Checking that mismatching keyform fails");
+    #Check for failure return code
+    with({ exit_checker => sub { return shift == 1; } },
+        sub {
+            ok(run(app([@args])),
+               $testtext.": Checking that mismatching keyform fails");
+        });
 
     @args = ('openssl', 'pkeyutl', '-verify',
              '-inkey', $privkey,
@@ -148,8 +156,12 @@ sub tsignverify {
              '-sigfile', $sigfile,
              '-in', $other_data);
     push(@args, @extraopts);
-    ok(!run(app([@args])),
-       $testtext.": Expect failure verifying mismatching data");
+    #Check for failure return code
+    with({ exit_checker => sub { return shift == 1; } },
+        sub {
+            ok(run(app([@args])),
+               $testtext.": Expect failure verifying mismatching data");
+        });
 }
 
 SKIP: {
diff --git a/test/recipes/20-test_rand_config.t b/test/recipes/20-test_rand_config.t
index 5919eef56d6b6..1db541ffe09b7 100644
--- a/test/recipes/20-test_rand_config.t
+++ b/test/recipes/20-test_rand_config.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2019-2026 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -10,7 +10,7 @@
 use strict;
 use warnings;
 
-use OpenSSL::Test;
+use OpenSSL::Test qw/:DEFAULT result_dir/;
 use OpenSSL::Test::Utils;
 
 setup("test_rand_config");
@@ -57,7 +57,7 @@ my @aria_tests = (
 
 push @rand_tests, @aria_tests unless disabled("aria");
 
-plan tests => scalar @rand_tests;
+plan tests => scalar @rand_tests * 2;
 
 my $contents =<<'CONFIGEND';
 openssl_conf = openssl_init
@@ -86,6 +86,9 @@ foreach (@rand_tests) {
     $ENV{OPENSSL_CONF} = $tmpfile;
 
     ok(comparelines($_->{expected}), $_->{desc});
+    # Also check that instantiating the drbg works
+    my $result_dir = result_dir();
+    ok(run(app(["openssl", "rand", "-writerand", "$result_dir/$tmpfile.bin"])));
 }
 
 # Check that the stdout output contains the expected values.
diff --git a/test/recipes/20-test_speed.t b/test/recipes/20-test_speed.t
index 3c3c5fab5fcdb..c6a982460f1da 100644
--- a/test/recipes/20-test_speed.t
+++ b/test/recipes/20-test_speed.t
@@ -118,7 +118,7 @@ ok(run(app(['openssl', 'speed', '-help'])),
 
 #Now test some invalid options. The speed app should fail
 ok(!run(app(['openssl', 'speed', 'blah'])),
-        "Test an unknwon algorithm");
+        "Test an unknown algorithm");
 
 ok(!run(app(['openssl', 'speed', '-evp', 'blah'])),
         "Test a unknown evp algorithm");
diff --git a/test/recipes/25-test_pkcs8.t b/test/recipes/25-test_pkcs8.t
index a0f8644744827..50cb01a407d71 100644
--- a/test/recipes/25-test_pkcs8.t
+++ b/test/recipes/25-test_pkcs8.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022-2023 The OpenSSL Project Authors. All Rights Reserved.
+# 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
@@ -28,7 +28,7 @@ ok(run(app(['openssl', 'pkcs8', '-topk8', '-in', $inout,
 ok(run(app(['openssl', 'pkcs8', '-in', $inout,
             '-out', $inout, '-passin', 'pass:password'])),
    "identical infile and outfile, from PKCS#8");
-is(compare($pc5_key, $inout), 0,
+is(compare_text($pc5_key, $inout), 0,
    "Same file contents after converting forth and back");
 
 ok(run(app(([ 'openssl', 'pkcs8', '-topk8',
diff --git a/test/recipes/25-test_verify.t b/test/recipes/25-test_verify.t
index 57f9081799fd0..673c3d5f17722 100644
--- a/test/recipes/25-test_verify.t
+++ b/test/recipes/25-test_verify.t
@@ -10,6 +10,7 @@
 use strict;
 use warnings;
 
+use Cwd qw(abs_path);
 use File::Spec::Functions qw/canonpath/;
 use File::Copy;
 use OpenSSL::Test qw/:DEFAULT srctop_file bldtop_dir ok_nofips with/;
@@ -17,19 +18,19 @@ use OpenSSL::Test::Utils;
 
 setup("test_verify");
 
+my @certspath = qw(test certs);
 sub verify {
     my ($cert, $purpose, $trusted, $untrusted, @opts) = @_;
-    my @path = qw(test certs);
     my @args = qw(openssl verify -auth_level 1);
     push(@args, "-purpose", $purpose) if $purpose ne "";
     push(@args, @opts);
-    for (@$trusted) { push(@args, "-trusted", srctop_file(@path, "$_.pem")) }
-    for (@$untrusted) { push(@args, "-untrusted", srctop_file(@path, "$_.pem")) }
-    push(@args, srctop_file(@path, "$cert.pem"));
+    for (@$trusted) { push(@args, "-trusted", srctop_file(@certspath, "$_.pem")) }
+    for (@$untrusted) { push(@args, "-untrusted", srctop_file(@certspath, "$_.pem")) }
+    push(@args, srctop_file(@certspath, "$cert.pem"));
     run(app([@args]));
 }
 
-plan tests => 194;
+plan tests => 203;
 
 # Canonical success
 ok(verify("ee-cert", "sslserver", ["root-cert"], ["ca-cert"]),
@@ -592,3 +593,32 @@ ok(!verify("ee-cert-policies-bad", "", ["root-cert"], ["ca-pol-cert"],
            "-policy_check", "-policy", "1.3.6.1.4.1.16604.998855.1",
            "-explicit_policy"),
    "Bad certificate policy");
+
+# CAstore option
+my $rootcertname = "root-cert";
+my $rootcert = srctop_file(@certspath, "${rootcertname}.pem");
+sub vfy_root { verify($rootcertname, "", [], [], @_) }
+ok(vfy_root("-CAfile", $rootcert), "CAfile");
+ok(vfy_root("-CAstore", $rootcert), "CAstore");
+ok(vfy_root("-CAstore", $rootcert, "-CAfile", $rootcert), "CAfile and existing CAstore");
+ok(!vfy_root("-CAstore", "non-existing", "-CAfile", $rootcert), "CAfile and non-existing CAstore");
+
+SKIP: {
+    skip "file names with colons aren't supported on Windows and VMS", 1
+        if $^O =~ /^(MSWin32|VMS)$/;
+    my $foo_file = "foo:cert.pem";
+    copy($rootcert, $foo_file);
+    ok(vfy_root("-CAstore", $foo_file), "CAstore foo:file");
+}
+my $foo_file = "cert.pem";
+copy($rootcert, $foo_file);
+ok(vfy_root("-CAstore", $foo_file), "CAstore foo:file");
+my $abs_cert = abs_path($rootcert);
+# Windows file: URIs should have a path part starting with a slash, i.e.
+# file://authority/C:/what/ever/foo.pem and file:///C:/what/ever/foo.pem
+# file://C:/what/ever/foo.pem is non-standard and may not be accepted.
+# See RFC 8089 for details.
+$abs_cert = "/" . $abs_cert if ($^O eq "MSWin32");
+ok(vfy_root("-CAstore", "file://".$abs_cert), "CAstore file:///path");
+ok(vfy_root("-CAstore", "file://localhost".$abs_cert), "CAstore file://localhost/path");
+ok(!vfy_root("-CAstore", "file://otherhost".$abs_cert), "CAstore file://otherhost/path");
diff --git a/test/recipes/25-test_x509.t b/test/recipes/25-test_x509.t
index 09b61708ff8a5..dfa0a428f5f0c 100644
--- a/test/recipes/25-test_x509.t
+++ b/test/recipes/25-test_x509.t
@@ -16,7 +16,7 @@ use OpenSSL::Test qw/:DEFAULT srctop_file/;
 
 setup("test_x509");
 
-plan tests => 134;
+plan tests => 138;
 
 # Prevent MSys2 filename munging for arguments that look like file paths but
 # aren't
@@ -110,6 +110,16 @@ ok(run(app(["openssl", "x509", "-new", "-force_pubkey", $key, "-subj", "/CN=EE",
 && run(app(["openssl", "verify", "-no_check_time",
             "-trusted", $ca, "-partial_chain", $caout])));
 
+# test trust decoration
+ok(run(app(["openssl", "x509", "-in", $ca, "-addtrust", "emailProtection",
+            "-out", "ca-trusted.pem"])));
+cert_contains("ca-trusted.pem", "Trusted Uses: E-mail Protection",
+              1, 'trusted use - E-mail Protection');
+ok(run(app(["openssl", "x509", "-in", $ca, "-addreject", "emailProtection",
+            "-out", "ca-rejected.pem"])));
+cert_contains("ca-rejected.pem", "Rejected Uses: E-mail Protection",
+              1, 'rejected use - E-mail Protection');
+
 subtest 'x509 -- x.509 v1 certificate' => sub {
     tconversion( -type => 'x509', -prefix => 'x509v1',
                  -in => srctop_file("test", "testx509.pem") );
diff --git a/test/recipes/30-test_evp_data/evpciph_des3_common.txt b/test/recipes/30-test_evp_data/evpciph_des3_common.txt
index 1947e21f748d6..6c74b65cef04f 100644
--- a/test/recipes/30-test_evp_data/evpciph_des3_common.txt
+++ b/test/recipes/30-test_evp_data/evpciph_des3_common.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2024 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-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
@@ -74,7 +74,7 @@ Plaintext = 37363534333231204E6F77206973207468652074696D6520666F722000000000
 Ciphertext = 3FE301C962AC01D02213763C1CBD4CDC799657C064ECF5D41C673812CFDE9675
 
 # Test that DES3 ECB mode encryption is not FIPS approved
-Availablein = fipss
+Availablein = fips
 FIPSversion = >=3.4.0
 Cipher = DES-EDE3-ECB
 Operation = ENCRYPT
diff --git a/test/recipes/30-test_evp_data/evpkdf_krb5.txt b/test/recipes/30-test_evp_data/evpkdf_krb5.txt
index d8f6aa72a175c..e2de4754fa74e 100644
--- a/test/recipes/30-test_evp_data/evpkdf_krb5.txt
+++ b/test/recipes/30-test_evp_data/evpkdf_krb5.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-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
@@ -129,3 +129,11 @@ Ctrl.cipher = cipher:DES-EDE3-CBC
 Ctrl.hexkey = hexkey:dce06b1f64c857a11c3db57c51899b2cc1791008ce973b92
 Ctrl.hexconstant = hexconstant:0000000155
 Output = 935079d14490a75c3093c4a6e8c3b049c71e6ee705
+
+#Erroneous key size for the cipher as XTS has double key size
+KDF = KRB5KDF
+Ctrl.cipher = cipher:AES-256-XTS
+Ctrl.hexkey = hexkey:FE697B52BC0D3CE14432BA036A92E65BBB52280990A2FA27883998D72AF30161
+Ctrl.hexconstant = hexconstant:0000000255
+Output = 97151B4C76945063E2EB0529DC067D97D7BBA90776D8126D91F34F3101AEA8BA
+Result = KDF_DERIVE_ERROR
diff --git a/test/recipes/30-test_evp_data/evppkey_ecdsa.txt b/test/recipes/30-test_evp_data/evppkey_ecdsa.txt
index 54b143beada4c..07dc4b4298192 100644
--- a/test/recipes/30-test_evp_data/evppkey_ecdsa.txt
+++ b/test/recipes/30-test_evp_data/evppkey_ecdsa.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2024 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-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
@@ -261,6 +261,15 @@ Ctrl = digest:SHA1
 Input = "0123456789ABCDEF1234"
 Result = KEYOP_MISMATCH
 
+FIPSversion = >=3.6.0
+Sign = P-256
+Securitycheck = 1
+Unapproved = 1
+CtrlInit = digest-check:0
+Ctrl = digest:SHA512-224
+Input = "0123456789ABCDEF1234"
+Result = KEYOP_ERROR
+
 Title = XOF disallowed
 
 DigestVerify = SHAKE256
diff --git a/test/recipes/30-test_evp_data/evppkey_ecx.txt b/test/recipes/30-test_evp_data/evppkey_ecx.txt
index e40141c34feb6..15881618aa37c 100644
--- a/test/recipes/30-test_evp_data/evppkey_ecx.txt
+++ b/test/recipes/30-test_evp_data/evppkey_ecx.txt
@@ -702,7 +702,7 @@ PublicKeyRaw = EDDSA-TV-6-PUBLIC-Raw:ED25519:dfc9425e4f968f7f0c29f0259cf5f9aed68
 
 PrivPubKeyPair = EDDSA-TV-6-Raw:EDDSA-TV-6-PUBLIC-Raw
 
-FIPSversion = >=3.2.0
+Availablein = default
 OneShotDigestSign = NULL
 Key = EDDSA-TV-6-Raw
 Input = f726936d19c800494e3fdaff20b276a8
@@ -718,7 +718,7 @@ PublicKeyRaw = EDDSA-TV-7-PUBLIC-Raw:ED25519:dfc9425e4f968f7f0c29f0259cf5f9aed68
 
 PrivPubKeyPair = EDDSA-TV-7-Raw:EDDSA-TV-7-PUBLIC-Raw
 
-FIPSversion = >=3.2.0
+Availablein = default
 OneShotDigestSign = NULL
 Key = EDDSA-TV-7-Raw
 Input = f726936d19c800494e3fdaff20b276a8
@@ -734,7 +734,7 @@ PublicKeyRaw = EDDSA-TV-8-PUBLIC-Raw:ED25519:dfc9425e4f968f7f0c29f0259cf5f9aed68
 
 PrivPubKeyPair = EDDSA-TV-8-Raw:EDDSA-TV-8-PUBLIC-Raw
 
-FIPSversion = >=3.2.0
+Availablein = default
 OneShotDigestSign = NULL
 Key = EDDSA-TV-8-Raw
 Input = 508e9e6882b979fea900f62adceaca35
@@ -750,7 +750,7 @@ PublicKeyRaw = EDDSA-TV-9-PUBLIC-Raw:ED25519:0f1d1274943b91415889152e893d80e9327
 
 PrivPubKeyPair = EDDSA-TV-9-Raw:EDDSA-TV-9-PUBLIC-Raw
 
-FIPSversion = >=3.2.0
+Availablein = default
 OneShotDigestSign = NULL
 Key = EDDSA-TV-9-Raw
 Input = f726936d19c800494e3fdaff20b276a8
diff --git a/test/recipes/30-test_evp_data/evppkey_ecx_sigalg.txt b/test/recipes/30-test_evp_data/evppkey_ecx_sigalg.txt
index cb3e6249ce5e3..afeb0242d1689 100644
--- a/test/recipes/30-test_evp_data/evppkey_ecx_sigalg.txt
+++ b/test/recipes/30-test_evp_data/evppkey_ecx_sigalg.txt
@@ -430,7 +430,7 @@ PublicKeyRaw = EDDSA-TV-6-PUBLIC-Raw:ED25519:dfc9425e4f968f7f0c29f0259cf5f9aed68
 
 PrivPubKeyPair = EDDSA-TV-6-Raw:EDDSA-TV-6-PUBLIC-Raw
 
-FIPSversion = >=3.4.0
+Availablein = default
 Sign-Message = ED25519ctx:EDDSA-TV-6-Raw
 Input = f726936d19c800494e3fdaff20b276a8
 Ctrl = hexcontext-string:666f6f
@@ -444,7 +444,7 @@ PublicKeyRaw = EDDSA-TV-7-PUBLIC-Raw:ED25519:dfc9425e4f968f7f0c29f0259cf5f9aed68
 
 PrivPubKeyPair = EDDSA-TV-7-Raw:EDDSA-TV-7-PUBLIC-Raw
 
-FIPSversion = >=3.4.0
+Availablein = default
 Sign-Message = Ed25519ctx:EDDSA-TV-7-Raw
 Input = f726936d19c800494e3fdaff20b276a8
 Ctrl = hexcontext-string:626172
@@ -458,7 +458,7 @@ PublicKeyRaw = EDDSA-TV-8-PUBLIC-Raw:ED25519:dfc9425e4f968f7f0c29f0259cf5f9aed68
 
 PrivPubKeyPair = EDDSA-TV-8-Raw:EDDSA-TV-8-PUBLIC-Raw
 
-FIPSversion = >=3.4.0
+Availablein = default
 Sign-Message = Ed25519ctx:EDDSA-TV-8-Raw
 Input = 508e9e6882b979fea900f62adceaca35
 Ctrl = hexcontext-string:666f6f
@@ -472,7 +472,7 @@ PublicKeyRaw = EDDSA-TV-9-PUBLIC-Raw:ED25519:0f1d1274943b91415889152e893d80e9327
 
 PrivPubKeyPair = EDDSA-TV-9-Raw:EDDSA-TV-9-PUBLIC-Raw
 
-FIPSversion = >=3.4.0
+Availablein = default
 Sign-Message = Ed25519ctx:EDDSA-TV-9-Raw
 Input = f726936d19c800494e3fdaff20b276a8
 Ctrl = hexcontext-string:666f6f
diff --git a/test/recipes/30-test_evp_data/evppkey_ml_kem_1024_decap.txt b/test/recipes/30-test_evp_data/evppkey_ml_kem_1024_decap.txt
index 423c4c401255b..8af06ec95fd19 100644
--- a/test/recipes/30-test_evp_data/evppkey_ml_kem_1024_decap.txt
+++ b/test/recipes/30-test_evp_data/evppkey_ml_kem_1024_decap.txt
@@ -2215,70 +2215,70 @@ EncodedPrivateKey = 16997ff80976d1506b23c012e387ac6ca0a792f7481ac3c9775317ee3ca5
 Input = 6e78c7085b62594c22b881c61e63674892e8b15be6b3137030cf91834ac0126295c6893f0c386b7670821cbbcafac5d4211cfad5c1f75deb8e7df047b950fa504c189fcef6806e16c7a447187a7877ff91d5aa1f89d9f4c2f8c726dd7cbc688e247c929117e01c8cf93e62440ac3f9affd27ecfd76d525dde13ec8b3a6686e25cea8e46fdb3a264b4e1692bcb1cbfbf6e750a1faf99d8864c1a9beabe0d436b7ec5566c92be999b165ff4f30d6ba43347c326edf4a41ecf2d35cb825bafe62184cfc28b30419f509b631f9affdca2b3b78771fdfb006f5b6cca6d0f5522308543b4a1fc65463d8b0ef14fb3fdc160178692d598e59d71110447fec3d02a58556bd1d17d212bd09d4dcda359fc4ee60dd2f0c73db72ee684a28b550f6b17e7dc8e2bd1867076222033023851676c0a55956e14f2c67874217e5349918243011ace52437a127c1a743a52c7c6fd8a0a007d5d020ec1bfb9f98b0ae36561eadbb5e23b7202d909c7d5fad270542c2e57dd0a54fe7179050b7ca81d72fc8c4f07f45fb2ac905e209a3ced970bcf5334daf441a0ea8f250d41be94cc33d96a42a067654f43047cc500214d0a54920f61728b6e95a014926f03faa1b27f6f5cb4397347dd0744c09ad92608ed7cbc0bae29092d6846fbe0fa14a38529e00c165a7ba098c16e532d43a8e4bff1490c45e0a33bc02738b4a1958cebeb39fd30ed7026b3a015863c2e4a2ca00635475678132e7fc114fc8e891711241942b787384ee22352b2811cfe1a22fb7e8f2e173df93e59cfc98a677a136ec29bbd47bc66070a7a8fa3a709aed2123ce55bf27ff2d23eb87b9762659d16ced5e24b7e825e0b4c2e8a6b6cd1596e4fafc06c9e90a8f0137ad182662f54288da8b590d42c6fbf9bb14cc8f23fff1abcc5885ecccb580d93846b2ebec01bd528547765fa2c231dc1b5ec3b3263617d136a102f6e02458444b158162b80e9acd39ce90db232582ecfd679029c6ed4d5a17f28b4ef2a120455b5933b51d3751728ad07e9d1ae3dc52d690d5838cbfc8c8d5bd7284dca1b753be3cc485aff60a120eff28891e902af0ec3358785a0ac87f99f18f268d73c05ba725de2cbc82d2918f1694c3f6c813d02f341c9f40a7c75bcc5984d5ecc1cc308eb16a9c1971d4f8e6a8d5ba59e855656543c0c7e5b7e49a360bc31c9411da0642bb815703bb64fb550f19fbb0bb993453ab8f15ca9ebddae7ef5acf2910f130f95fe1e4ca602f7e09d605a4dddacdd3cf5c2830a7bd1fafa1d63f7cf4ad511303ce42fb6348397df469a813c822527b933747f8f419177caad0787b63570cdb807a35a190a46f2150fd19c18db91c9435908d79449b23430c1d26a7354b6b9d1d21f31d160e767681580c770bb264dcc24567e88a8bc6512831fba35cf6aa4fcac1040b200df1c60b88a3d7e1550f0a27e8232dd88a9c751624198f811ddbf1c2a833c58b91bab501e7cfccb5374c21482808be44877ed51389234f3bda65c44ab5781da9ee3269a0cd4a3f13f50ec1445c859fc164774cac725a3b561bd63a97170823fdc07bd6ecb46bcfcd76384e7baa0ec3c1f4c89215e26b580962502a4c06aa26068c041ff1354ee9ec07da71b163901784ef525c65bd00c403a9445ade4b0bddfc30e04d278b4873dbd1f18f4587cedf870d958b16be02ecdf3a5cc435b49e0e56775521579530013aea6a081aed4a5774bf72918526eb290a5bc1ef3f0ed9440863c1133a70b1481d46b6f0adb352b3cd4e50bba138570b8e5617e3a10b6382970ace312b95d87f5e8a6baea10d2ea19546acb5fcbac0d20e964b7c0bd0d1825d3955971bd657c316710066d81ccc421c786f7d21df4e748b47111732f1851dc992322d5b50cfcb66321b46588b39184c503666435d620eb03a3535b9611e7aac801e9cf90ecf7671f70eeec6103d6e00a2ca5a6a8424e645d4fa89b058b5f77441437e40bba596d705ba522fae5fb1240d9f9e25c9bcae741b514b9ff33d0132db5f06a73964f05dce8b41a568413bd7f4fc78a4c7dbd2f5815f3dff8f25b2e82a508f5f2fb02087bd23927707bc729574777e01ed0c93557867956d8493c1cd9dc86ef3c1e48986be905101578c8e7a11ea96709929e5dbb1560bd4d9f9acb7957355e09fad7c97712e890234b335fd950e25cf59a4ccc6cd461e6ffbbc43026faa7dcc6df33a8bc5f1dae7e5
 Output = 8918cd0c3eabdb8267e24b79272ab6b67c9ea6418cab15e2e3070f6c747b4dc4
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 EncodedPrivateKey = 00208080e8b3938b09aab715a0b7a09314c3d2aa03e900528a209c655886bf0180a0775a1ee133e543c17d7c24407131f0b813a9287c5c9939d43ba2c1f064015c1babc910d1024bfb46a3fbb1ae13dc5d8bb4576787a592495786a53d4c172cbd3b2cac6a2f5ab68fcfeb2a67a997d809800615c043e4bcc0985de9d671e6e0c8b071a20264c457c13b1f4734f234142e86c23170821d068210b29358694d8ff27e89c59264a315b6591d97d90ede633b68fbc36ca96b823a4bc66144b541cc118b0d60a66c89124d9080ae30f44b9f4793cfac65ab8b8cd65ac81cd95de566ca2c19906a955a04047052a699e8a132e2e48aab916278c49ccd1ca0076b5254784a23f7a8c164229bdb9b46e1c7bd4c74639053cad5226c598918687fbc50323f086238366c4ad9172346626b54ce142053de67ce8867cf599587d0a47aff0a7fc113140c18c40bb31e2340822cac294aeb3a02652b424ac9f1008a592ccf70170246e689edeab03dc0249ba59fcc6477fb668038443bf9a743255310df11b4c90a97bd212a74d5142bc6461a135ce7376995372a1bf919e3db20f22c683f488395a95e31ab13aa707c59f22e85d892830bb550395633f6c87df28401865106b5cffb75729391767522ac236072250c6f4dda196a90bbdfa183113c5fe2e31ba1187b4f682399f3c6c0288977904ab445c0c1b9caca030aa639b35029657c1608e3a654cbc39f8f096414d278059a6f56c8c838b1879b00ceff668190213eb15184a57706bd8c9111667f52a656d161bcb5e7cb8ef5beb6756371ba4297397eb6d0c850aac1e01025001b71a874a25e3ac16450228dc33691b3112de319f69ac29f2a1cdf02a0cd77319931003910331a6268f42669f4a90e79bb820e5c98aa252dcbd056318a050ab71f5d60028fc41594688cea4a95b32529c39c582ae828016644faf4b7b1fa6fd9c305807c43dbba54d44273669bcf956c197ea3462a30be3aabb1a6654dc4a72bbae53982ebb986e249d9438d66b65fa15b723267ce1fc1200bc26656d7c4e1839e02927a96304460a34a9c0a22ccf15c7390afed4a612ef236f9d00c22d04cc1dc362c08afd0a16536985f69f6a15d6585c410ac7a39599c683b9e67a33ee299a5000c7e4acde611bd6c817b1aeb1373835a245b916620be6ce8093f88635cfb619a963c99785cc5c354e5d025f954071e380876408fc5ac7fbbeb4c532b1f1be67ebfacac4cf907be9485c6da8da380809ee102af0c98beebb088c13d29830e7fca4dab8c1e8cc87a3b4198c50686c82626c41414d50878f403c10ac905f39a901405b93366a575338ed7d66c0a27c9dbc4af2d217688dc3909db8878000af307a989234174363f3cc35c25a42d7361ccadeca25a484a01967be2a65bf4998d57943759528d54e498ab18514a5665b87c98339c3fc01baaa2953abc1aba78778b26d54bdb2ab69dd705d6953dea404adf8c82d29b932e144f48a2661dc2129e6a2a1bc5242552374a504e0d135e6cfc9fb91a492e443c608c6e5342361aa8205ac744ecf974b667a6528938b6085492298e97ea827d5a4274ca359a1811c71a574dc986f4262b2e29256c4b52c9a22c3f168988ccca62e0b7d8cc8d1d861dd052bd9bb622cd8b769551c2307c82aedc92accc3d2c67c3ecf8341290af6c93a295fc027895809a081aaaf3cd0131174c8605c7fc29ece47036866f7fc326f7c947f70852356410e22700b5480897f288dba24c494685ecfbb624bc189dca10d9307595969145b21ef4ca1c435b3d39555434e133f8ec8c00dc49f02788041a6deae40ad5c9a3198804fde6230dc25b7f86a86bc00b43da73b5b40e3943096fa4540a019817881b4421961e293250056300e273f3d87153765ec237a79a16ba89a960fe42aa887c65fae65719766c44b2b8a0e54e97aab5febb1c194939e11928258cbcad6281cd37ad6033b1c9982df721200e36cb70326403422519f3afc3451af15969c2b26957c452fb136db18357516617892214c758cd9b556a827434c9510a5f6094bd32c8633966eb113f9e4902b6306c87732b96542979159ab49a170fe71a23093c1aca70202287d8288fc2f56072ec7aefa293015b6a58a2899ed79d4a09701ba42d26c599d8a2164204563fb90ff7372e9d76798256925e67ccd5ccac6d69a85343825b6a20793095e1a29d1b526e183611bad90cf6440bd3e79f847c6b912aa1919a9e7d9357b414cfccb206180067469b294b2c4233960a40e17800ab0ce483c40b653392488df837689fd72da0daae74575da747527b2a116984b2adccba04000ab72402f09c749341be42c79a5c8198488124fe750f66b82cf272826747c68a946d2629a48ce0a777b4a9673ba9c3a2a402305506f4b65b65b327e62de16c696bca3d0b8ca44013cc88d9444a83549af17a3f8270565359b168ca721027479a6e60a28f11b33d88da4faa084b576ba5bea09c2fa8a68c0aa8a309c96119aa52443bae570abbd942d193cc8ccab6e5643d0e362049f1ad00f98d173849afb1248ee2a67873950ec849e9b7042b94222b60bd50720b94d7317053cc86758cfc0bae9c9856c0c4411e74730fb65d8b7b838426123bf68b9804473469c6d8717dff450fcfa208b8f53e2cd8987919a5defbcda5a422ed82b495c67b46264106a613ec138097f05a2f2c5efc2076b9e2475ee162a5e7242cea1598088f8146bc8ea65909723fb7a60b1db157a4f43158457d2d157a1f980925a396401450b670728b2c7ca3aba3e7d4b4fd34b24caa87d45846bc2104e95a1d9a5676b734736fb00f7b3241160c2299b50e5517bd4faa859b79c8590c4322115a7c724f0767c056620bd006c01b5b87d80091bc483e5d341d14149095045d0648acabb46053e78c84045a9606bf82f6124fa9a8a9104ebaa734e3720eb6921553e353e66152f2e96adf34534a06aeeb677fc4f901bea148d28411f1f856b4d2cd261526e3a8139788796690413a50251dc1763703a42ee708f932cdeb9b7ecfb2c7d99002bb93cc248a133b9a4c8e910a045669ef5bc75113ce12f7963d665d6662246d383767f74317dbaaa3d0b855bb0274815442f0b66821cda6aab15672192d20c6aa8537432699ca8a22392a855323ad70f75979b56b392c29caf9c072885710c33967120aeef0bcfca1293df8181ce50dae21577701b1fa216dadf19fee4c35e0d435ffc83de3f92c2b276461b66398c75c98d92628b32a2ac3b571853c4a142bd5e81a8770c9d9359c91ac41aa2b4b063a9bcaf4592cb6626c213bc89c6eee3b75c59a21d6d748825b336f4052c6bb79f4ea13f51b672d1abb32887f1977505a75c13f0b66db14b56956050550ab0d85a814640dd3a36a825682c9cc6d6f13cf132780f5fcce87355007f9021ab5a5a3a69369c7876a5158654bc9f9400a1de60e71e34a370372f24cbc84166ee68b6433b6911a76bd78fa249e850bab6aa96ad820e0dcb438fbcfd9ea81f5f3c0d5d53653ba288815029202807aebb27402660e4b3cdb609bb7145dbc055fa146466b121e673359a8465073d99b63e799cafca95733938dfc2ad7d6007a36a8da027ad396618f1647b1287094737fe518b779f238b1ec0c9351b3c408b8f66b27f5262693826b24842a9153a9d205a7593665fc172c7c835354daaf90574686a8ca7fe5824ab94f29d6a5ac87cc40b999e5e7ade2744e1fe7048e38c804472579d93309986c28962b06e80d0952ab10d1cf1d945b99432ef5074dea9c6f4ed97959fc904e23a3834cc30de35f5350656d027a1e6620925a6840a337d14a82dd524c2077302fd6b72e97a959001d3d81768ccb7937f4aa07f00eef0aaeca877999e5598d30a81e920e2e8489970a31fdeb7d921474500835a01530e0177a44852cba38c3b0c297a0c5bc73db986d24cb0b323402d5355b543468f948976284dbcaa1c87c8b27cc62ce2b8306da3a5e08b0991403e7b0381adb0c897c7a994997a69ac1f5092f8edc480e77a82ae9bdedc724883b5eb3da56648979fd2337fb42aed861859aa6165a800d4c9b964e70195927359378073a84b80219613873a164324a04144c4a5b551937c23ac75e3a664a773966b512a01f3a7a60ec1ee06a068933a8ab0844511488f058b2c5bbc1c8dc07e32b267aeac8285543300bc66f8514ed6aac59cbb9be835b3ec68987a5cff5791643c60841da8c172c1ffc07110c77a43ab34621c474a60a385d153d79831922638740657030481146ca6843f6043cec1de4b0b307c52b288b98905b918bf3af0e698b4ea261db5895f7d02ea0fc59156090609764d09b4a7ed5000000000000000000000000000000000000000000000000000000ab115291ae8961b14e3b7681e82897a566fae64d7340c19370d028ed1b71881f11536217ef54eccc82ada15ed86ba2003e177f270bb5aeee52f9436e31a379d2
 Input = 02c49972f757b82c1f5e7ff048b375cf05adac485075ca5a1eeadb615de1306d6712f0cfc452db395c57039fec57708d0a35b7bb238d1e4fd58301473cc4737d72ceab2b097d513ccd17a7f54d1fd145bc28aeaefd2157f2a8dbea391cffecfc2e1fb86c909b45e97a39b30ff59f176b2359a92cab56cf8d04ca42a08c70051c8d9405fa9aa2aaf5724d8b2a00528b7818671af4129c527bffa74702f02172bf51cb8e5b7c07438c785329807bd022fcb5aad5286642b1fbaf976af9816d3f0a3fdb79c2787f6abc1dd20fbb2995bc2a4b2408f5900c68a60f38f78037c3ddee01a3861433a7d9eeb5e7a41a56d2b2a11615d8ef8751d19cf7bc5e5e46b0944dfa61cee6dc16c490f5c7b62ebb6bd9bdca7dee23c3bf1529a4bf40977b307e945efb6451d4ae1c1aa507e30f653ef476c64610edb39201492434dcf36053f668b43746cda8fefd4316425c92f97e1900c62a91004405349c69497438aeecb876ab534220a4563138ceeb3d4edb0d70330ad031aa82dd62e19d17f62bf83dc3d4e2c3850d47efd50edbab06c9661d1ef274e856d8ae58564909625de2acf771334ffc3a3d7a0b1a382e8a17c1a1dc0f29401d9a3dd198a4ad70a740700301da40b468fc4232ae841489a1169170d5131d9b0a036149eedc23f2abba55883ffbfe4788c887e3248bc1de1b3677f286f1269d110d574d01199524d93263517afb76759bcc2728ac595b004508946618b55b0ca734431e85496f07e153f9707d876b6342cc99be864d9d603c645bb9731890d497d85d955e2d80e2e660c93968873eeca1a51157ceca558c0544040db61fb4ac4e20effdccdf950feb214971dde984cff17a75973b8d3a8cd27c92a8686fb93564def326e3cb617411892469be218d663a009c37e2d573b59beb4c5f62206f3a0df818608583e73d12366fcb1d685650d72ca4f533b928c0b4772ae645f0b0ad71bb8313a601723b8f90ffcc53dfcda9d092f8931ef168ca2f53d4600677833b9443fdc05db07f80c03bcf6e364fd4d85c89fab6a08cc9399b10afcb908cc4b6b6a3f6a4725bcf8de94e6515345e333a8324765ca69ddf9c61539d36c67e91ced0396ab2adc022ae9fa8e41d5a00168cd8c9ad0291f653af63e67b90ff2d448fdbb058702c551d323f5916ed90f6b87e354944e167887c5ea4b37703c8b0a94edf20d188ea989999deafe0a6de995434275b18d17a33b100032f2796749a385d972542dbc9989311068e84f3629bbb797f7c6f1057d99185009b5ac0d43d7b944b2e5f528cdb26ca14d995671e72eb725bf2de60289da1f06d78b137a79ebfb75425446c20b4310700053cf3ad58ce01cfb4d97325a27e5b5eda3cfe1009cdd186313ec3d16f005be47c8f38051cf2108b85ec43aa0d527b8d3bdae4e0a7a711c6fa69998bc26a9a8d2f7433f24f79c0dfc74a56083b42de7860b22c45f0c6e31422080c7a21c8d672fba60ce7652a90a3134f54594eb0fafe5a953e4f179ab06ea6b9795bc31a4f6a7f18bd5f1800a5263c48da4ad48ceca613fadea7741dff9d90f6400aa31519bef0b01e3312a5042ac35362df5e61c8e04eb52bf5bce0505ea7233b516321a08185fbdb9ff8434b4c6a88f880f594d100f46924a26f468c754d6af07f4868cbd7aff2caa53e5146df4afde9f7753484fa8be36baf89ebd4741b7260ff1ea398d59e503f5fd6c5c543ae1d318dc1894a48025c76e872fdc3026bf33a91b4618d1618554393eef6f7816b7de65c4bfbb55353cef9a53ad35340049ec65ad5af27db6fa597eae6499a3e5a192ed731915f6ffac811e35555ba5ffcb6628f812bf71a268620c161fe2a571921f5bceb4d0cdca776c7e52f68140845f455d247cad416c4de040bc37f5421e2b8bd6a049db84f0b3c807c3bb9d47cc7ac3ae9599ce82cebce8243306c0f3de6af1526475387c76751b7412a227571450599120570cf3cda19264136e0a93b4d25a160dee03d3d812dbf172618f58d09645becacb5c287b3b01ce4d1121272747648c50112c44728f66d86bd421390f2b36ed7e18b09a985a306ec52f240c0bc0957335483439f146b6c340f7e062a6059b1d47750c11cda575f8a2aea78ee09af0e06dbc2b2ac2b2bbef17fa108681dc90a7b970306522e521aa987e3ab6dfe2e1b3c6d9fa68897efc9e998afe55620cdbe9ddbbac8a0e22395d5628a
 Output = 6e63c5ca8af98628c02c8f1d520615a1a2c4824d5d155a6e51d181e8eb44c7fa
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 EncodedPrivateKey = c5f6c739c640b093956cfb9d54272b3c704d3b364ff1c68510b875c8c29f30051b5f60b53f6341082252746b8d4eb52b3f77c818d42ac776ad393072d458a28b186da2b61cf64bc6d8b424afb49a3b2528d4863c876aac69b7c7fa95314dd36ab5f021ba8c575ca458c469409b71b31f3a8e371937405067951c084b6a832ab321642c82f33395b0701e5a677c3c783a47d7a6e474af454c1b31b174ce5285e90608e1932493e44bf48b921d6a58b1b86ec2a38b8ba2a1fe884c0fd608af3986270391d1a42843637d75194722d31bc81b2b507ccc0fdb309e59549a874d09239bec5a41c4e9bb48d6968152ac9d431cc3b290371296b8056ed56898b272b948e556926478291cb0eb1bac50b6718e98b74a1777e685b7b6d7cd6b22bb5846c69149b4e7b292a4153763b768cd5a67b65c3d059464ccc123ac086f9f41c3395a56ff3152fe149d76ac2fee2079653326bdd82dd6f66b6687a7fbe00d9832b09135756c5819b1f66dc44c7b32c2496f63cf077ab51b8626d0918030134b8384c565f0715167b21fab697e84c6838a71176748f12334078c27dda3133bd44abd69bf631badb5f2664f2857c033102ce8284e4b2beb9095cbb40587bbbf457054f4d11bf938af207c1cdc5217b0e9797bf9ac88f3943873c8b66883d2ba5ec7e6696d50a69ba55457853bc526819f1a6fe09973fbd19832312b554653b8441e5eb01884e94a355732e3da645eb849f520bb2bb4327d560612852152f8cba2f77db8d21922da08e60bb9e3b39b9b85bbeb9b1715982d292b8f1017cd3e60447278cc0257898575a0eab1408122bb3fba17b62a31902a567a0821d42086aa6417c259a1dbc93b25003fcdec9f6a5507b4b732a43c444c5825a05119cd089fb2e569f70b4d5e6919faf15d6eea641f5a2875763f42b3991f7c89fe473cc057c148ac58b6c88dce537da8632c10ac851f8916fb7b6ce89ba5053b8d95d29ea5d36c91981042c4aa1330aa098a6ab256ade08592a05c95021606adea0ab637824214009c2b915be450a1f7434ea2c7f562a4fe21139c2652ca8785af3208f4927abae698dd435e90e7474556af9b907f6d73c4ee64897dc74c6a876eba1b598e784b8094232dc62bf1119ef764bd1a3bb2d4fc7de069273a223abe5269a1403873087906db164b58435ef41d7d78b36087062419123c8b1d54da918f34920d3302ddaa300797b32c1c81b82798e421ab2589964334714a75cc84548031d5810fd87890a1932c98bad37c860bb15663cc0e91880af1947b8a26be9183b648b714f763b81652786682c210301852776aa673a1fde470afb56eb0b0114895638c609d8d55585d68c165f7aad64c1406a165788c3364667f0a3c65aa300fc4585e959abbc5e1b316aa108a1cbf703965a74475147a2d323b7295d185571000e43b9120b76fb0105ee7a385965026e8f8309d4badef88b433a59090f88bc4eb4ee2f6c1f0d880057b477e628bc35b023a4c9ab682822556afeb32b6c9088e35c107e2a43506c43a986a0420f5164167519c4029b47bc81e93c1ec149e6083b13589bd2a9c64fc6247ec323b8cb73cb9f9ccfb8bcf25617a87a3c2d8b5158ac8661dfc789e92cc8cb39ba3237b6f13c80ef947630578d2d213f1914f94c61429bcaea77c646f1b99d35ac8009907ccf604c1211ddaeccc2f1001b49776df94560e5ac35e0a7ee3f39377e252d83558d6e57651b0b3c0365e6a133dbe3002270a0bfdc524e5d298b42c1408e17d155c82d69c256f78a69937843491153ec2117ac40370934d28783a69d0a02526afaa8600d289c27e9481cb737cdc4b9ddf53caf313b3c4b862b08045dc38428b126622d77ff3864fa93919427b049786042d234429e9858ce7b1d57a2fe92979851b9d4ca23fa7a80aa4738c9b777020b857b8fa2e442522423608d51b78c574569b9746e441bed403ac21391fe327818dc81355bcb2f5758320965e10946cda9a7c1d329f7c1720857c8751e57b87186e8dc21199e3b7ffc1c4c5607cc3c258a30163131c5db5d96e2e8c2f209419d5a03dfc618a53b1799cf102348b89ba289fab2b206f61688fd974023619fa5187b8cb28be778b666294bf029d7fa9abe3ea739f131930a13629bb6fa7221a788591f595911d3c8a6625a0452bab83196c047889f7eb13897b3d73db6ecf5c9687c3a97d5b3fca3071a29cb82902c7a4e673f56842129c4e27254d50c2a9741abedcd925a62796d9a98733262e45366a5d7b81cf7c9b3c42a6b2f70626d0adde9311239061dd893669404058da8d209ba6a6825e796c84e765b348414447246f57acad8c933dcaf752ef268bd6246f6b57377cf82607a522dd7028b572319263c9a9805aa6501ca4ec2a182a25cb751ad6f0a0a23955986155e0a1b0957bb9afb35320da2b20e29210b2605122791db13adb91a0fed0b36bca7d6f03b0ca6c8597b56a189c10ee887b4429b0cda99d83728aa6f57a03d182685b2266ac1f70645b123c0ddf352520332fb5ea06e716b010f82c62858c0408446afb0ffe23ae9241be953b3d05a9087f8738143c3c66b5b3c61ba1240b99c2f50b620038d775706aa58cb0f7094d52c755b992e008c2419b3b4bd85a41f65bf633136867caf5872d551340f377c06546495b8882e4e14df8a958a501161c547146fa2132160fce98c830a5b42784cfec7410bfe87f185657a29508bf339c7871ab9de91423d23e90ca2bdddbacf7f4af0f616e9626a3ed4a87b9b900b2412b0b5328104479d33046f54a06cd88a3d0c9780af5807e3517e0c72d45b17106a136e68a49521364e8661636f250fb679d3fb649a0491d349a6bcb49a4e06552ec60b33f947e37fa11b6742ca9119f0c6953f8175deac4576292165f42110c99467b008f53e25308e560fc845df84b28eff321687c45d6d09d96533f1d0078af998a9db59cc51b1ed4ec6c13695fd33a768af521bc9c39bbf6c27c6266ba271e5d8cb89982077f553b1dfb5341b5caccb856a7608cfee57ad3dcbd782ababf70c4f825cbe1279b304c2cf134beb0268655951cd76079b06410737cc10550c16cb9848612b6b7652d4ca9bb5be64f08236b69a097cbd10014e561469b7a68723160d91632d67f4908622876a29c59682579b34a298cd01597887c1b4d100ea724ba3fc8960356b499825c5223585024a478d34561a98d0c23930473ad6da637666b454c7882f0a98254f41caee03e03067b3a001f303c651489c1d00a825537c2412826a73959f085c5d6a836836582d938b9d999b591019219c906f6712fdb52b13bb8708d0c570a00bc40f1168b80b9c11a4e72430943c2544e2bb910ca5c4f0b245f4bccf0f0c3a284757bc6c535c6a205b34cddc15abcd92dcee9717b413568b461e2b9035756a312414e2644422112b49a3a23eed98e07884c80a6291df38d5bb039df15b7d89b5021d691f1a165eab9242b34146f6b223195bff19c6c6197a5e424c59572502f69c7a8b633534786e4d8c1e280680361b8ab5657b74336d72571bcd12af7089d4a23c09a167d0a3bcc540b8be036b24664bdb3a13b62c11eee93c4ff5bc0bcd92f186741eaf56a5f6111f161b9158bae9691b8c99cbae21c9534da07d11930b96751e3c29a804195a18781e016b6af45bd23e8297759a1d1487c6212add88675cc3b92de46c09b4315c9a0cf6a5a20e7fa9ed5d594aa95cfa3681e42a3543429b9ec551e1e74ba46b79234b8c69c0b5f9553aa12455edd971ac29199c04a40d702128cb77f63d50f11184d2d0b66befa6adf7c2bed427c82a632a81497c3831e38256784802fb7195e40b571c26a925de84f6366b3d9aa2ecbe57ac61283f5ea3648b652f0c742b9d7c2a8c00ab5b611fd36458ec71f1c49579f96c1a774a3b4179ea63b4fd1e3b172b39eed1bbbf0d27aabd1befa0232440b336b53230bd60b88da4c116ac47b971de59a214a0752e75888172386ab2ba525ea50492a59467a57713985475108501cce687bca50b6c8840b03bf2a5072e8585f33625a9a8c17160fd7d630ba54c2dce9bc0ab2cae4965ddb9110ad612c65c8203e7b462ff86ba28abedb808f70818f022413ed5a9a3b0ba6aa24685fa91d5938a69693862e31aef5054af2f9849d3b1d22e121fec251c8f358a0d320efb9299df6194cf6cc5cf0c11363114abb8069e57634ba173ae199b080c1d935558c16696c97a5f316a4b8565c20b266802c60d4272e49c2a5ff794bbc914240f81317558a8cc862d9783630d90d99f6a68738219c44b9ad5c07b7242e85d71f2a958398e25047f494e7f6acfe339f98cc2d65c114a537b1259e000000000000000000000000000000000000000000000000000000db721a7dfb02556d4951dc5f3410ec6a5b8b78df5ec7b511533cae60713fb9dc2e8541047591efe1847559704339d0ddba611d0ff8017cdc84e61184715c93e2
 Input = 841dcaa46434e75228b0bc10733771ae67fdcbef99433463b2aaf2da88a98e1bbc748e1d14239a3a91bd2b6752b83302265c58d36f176b15988a3cdcc0f65cd72eb5486913269eb31b42bd0ccec456b72ff18f3801a1ad44c3ae6eebfaca59f2ee8308bd6c4c05a7262a01f168662dd42153bcf885ca7e84adfbaf6429bfacfde0ba36426b17dec09cee0591eca54dce505b6f23d2b674fba0a9dffdf7e77ee007e7570b31c71723047c3e8a271d6876261fc1766e1e468bbaec2a42960c2f0a3ebb7dc5d5d6d75a24245a375d160bfafb01cfa2c08831b1ccc67bf9d05df3a14d8f4b170e145311a793a92b1d59602e45328e58c5842dfa6d7021e1c65a900e0b04a79b17edec62c5d1c2bb8679174b45da0cfa336f7a0973923b8812d7b2015e73c42e1219900cfc3cdc93824b55724acaff2158d38732c429883b4d461b74a858cd167ba9e47f8157834f2e758cfc1c8f0fc5e762d56ead723cac0759cfe5233473b9706be8d909c1bfb2cdecbe7eb15b74b181e8fb949aba6b82e2c7c1d40bfc43cdc758051d1ad428a43bc7708ea9b46ea3f202974abf44644c7614769c9fb39de6ba9fb3009cff125fae0ebf0ecf5c9dea4ef2b9a8f26fc5d27d875e068ce3d319f816000f1dd560d03cccf97c5485ce65a77a326ed0fb2ece5cd5a55661c7b41f4b08486770cdc510f03b2b85c73b95d0d77b0aa75f677682d0a383a6e69ece0d5bd62568f2f50dd64ce3cd9e51556043323729b165e4c6726dc77c78025faef0653e54c6474834b9e2b51c66bfc8fe90e6e48fa217add307120ee0c00e8ac8988e5765e66dd0dfd92c80a3b19eaefb46585f0078f5f2de0b9c83ee10996b27b7c64d0f7b4d3be78ae18030bcd792e83bbf99529d1e7917bc053846268ded779a622e83f5d2fcfb0c15bdb1a2621188037acb8999ccae846ab2664792b043903c3e6b59c2645ca44e2b19cb21122035f7f3b222bf382800df1d1d8926eada144f880ecc739bb5644986f0a3c1b7cabcf3c9cbc7938802274ba459c1b870ddc516b5ea871fa6bd87b8cc5e47541f1dab3b9fd63865bb514b85155c41780b6ae24a02a06804a319d3f8d81383e7c8167853f3e24b35e220c105dfe14c33441f928c6dcf63a606500539b602f3b3f547a49545fa43f3fa6bbbd6049d9769ae5ac0964d00d68409abac87369f9608f2d244935aefce11e009fdc9a94c4a803eff45f989affe68c4dabbb291de0e7251a82bd5e5d19bc165fafa25465066e23dd905dd456e0d02ec3cf229c330d404b5f214a37363bd997979fd171584a296cab6e37928940f6bde0d1ed593903d86524449ad42248572680f1b573ede4ae27237e56755485657a5f542577700680308cea4a0d249e48138743017078e668e9ee556c7ef5a83cca9f96ca22beb7e30e2df1a793c6e2f402f109770ce7763eeb057f65bc0fec1fde8ccbeef1441dc98d059d1589564debb2a993ce21031c67d4d8c61ec53160be67aee11ff4b901bfd7c91f6e1faf7aa525aa8d15c3212ebdf0e3a5adc57690d446fcc9435caa5b1ed174b96d4da42851545ce1764bcae48c5fa580802eec2d1b83e4307c1da0dbb2a0fa414d2db8d6335f898fec5e391d0d7c2098e35dcd68afa8adc29d5eee9a9cc6a517ed310897e69eb23ce83e5ef0535c0f64d4f8d62a962e8af80f47a7f76cf735ae4ab09db0b806a9c4b2fa9ee493d69e73af045e6a1eb07b5bbd3241ccce8b5196080c2953cbc50a2052126ad754dc971050150d7ad4b319fd85cec8c4be05b55ddcd5ec7e804083278495b1601792464202969dbe01488f876d1655e0a3f4879ba41712c9136ba0f99d4bbf3145f34bd6f4edad036e6db0ba2532e35c6c097820d1fb069f9d69c259fb17b94970f2cc8284e5fd80f4e6070b4389bcb49ca99f207d002e44f6f0c9046fd89c0ddb1d86b01007c02920acafdf28e49d3c209e3bca054b67398b6c6c2561004c129947d87d33390d28489855074a6777dbf72816f0e1bf9488009bb0a247784c8a9b8f13a163d86a614edda8d205058071c12845b21e82ead309ede45872c379417c536ba446272ffb63d924d0055a92c320739d364e3eafcea6d10ee09a58a70c6c9a88550327070d6de72034b8140976856895147e2a1ab4ad062c7d299228a50b605872e3d20daea3e918f2dda9f8182aed61c93b4a47c5796478e182ba54c87fe
 Output = d0ffac51bd8b7e6192ac5954b26a5c64f4d0ea746b08d9f73602062aa8aaf7cd
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 EncodedPrivateKey = ea53a046a53b7e3298d588b38c403e67b5620c5c73a438ab7357660362ab3822b5e774a9dae973c83a96db79b550dc176f9b0182d37f12118bc96a4982249a352219a110704e4a0ddbe545e4f55cfc2c50d54cac33ecb6fcbb3ac2a7bd4e41282476797a3c24f4ac4f60c33da281cb1313035c9c804d755267894d867469dbfac7be52a34f55c0dc642354e52967b043a0e0167c806581b51519e04af675147578c79f492da3ac0748352c6e5c7ff462008cb42e9817155444b214c3b93ff3ae7d44b5c2b659627a833cc18ccfab4fe6d6513dfa67cec499cd7a0d052a5f9ba378bff75033e69ad053c04b74c8cd756c7cc0bd494129e069cfb4358324066415bc2a4d1cb8401867c9954aa8a33f929ca279696cd515bff0abcb6c8692aa9cc076861e2bf27ec360983f775e9f166964d0c43c380366f19d3f868a7e038752d30e389c0c057b6d93a9ae64746d5b3a146d31269b94c7a753412be68d09d820be6890e5db1ec3eab1acb14cee8a317ee7ba0eb6027f13a540b07c12cb1164bc7d295c16eef4c8d9773bd2d32ead764f58fa48abc2a5491bbe00e07965017ebf40c973343704112bc90849d219c70b028ff3769e720c4599098d172674358bcaa8947ba6b874e3d94e623122ffb3984a0b571632be1c540cc5da45ed1c57da1054abbc4456678249a2589544c3dfdb6330ab35416ca49c8046c9446150660b45e05b720722bf390e307445dd8a3e23253cbf633c8ccb098976a68e481ee86b86a32865d9caaf385842cdd071b0974e807710e2b44c598a4a36bb2af048b0fd30bb6c64a539513ed2a5a9c6cb16129cb88d6bc62389b4846a2a0afc532eeb0f055aa85ce7b43f8099cbf194e664c59e683e535ca809d40f72d4a3d5e287b5ca3880d4af1f1523b60c8f811a17b2881602ec0393d54988d63a1620a48ab25a5336b25ca25d5b21425ee54673062020f065693665c68399691748ed8c2b6ea47b89391e7dbcbb3e4bb8bc0972916aa0ee5b90292b23618c5e9a68bff8476fec1c7e382b1cddd45069263a507c44b97663a9c8b4bc690c89d25893c4caca0caa7633bc66f449bc06603fb747843b0a8ce11d46ca100b3243a8617904a2ae48db08ba24bacd5b946cc96b834491a246850c44a0f049bb3e099b3353b28c3889bd4520ce75749b745e65e6442d970e917362cafcc9cd1a6194d9ba41f29feab98320e10234c1b0fa367f7c3a420052a9ace9a0787bbc420832db814e8f86804fb74090146f899a624ee9739ed55c40b3716724b8a8164b8b976130d89e15dc24e2078f24a953b2781b7d36a12334356a6998870a0128ab5152a89ddc84aca3475f8cf849bd762ea7b23bd2d743a9d3a9a2c2ae4723b5c1a3b5349a2d4bd2907d89ab8fe80624838130697bb1d45f873a3416164f862630e96075fbc5192be26755eaa1f33026a1f201a05b6b57ccc83fe9c191b13016a921532c4558b44ff0a26c864c3102ca921c299b38199f7162938387c3598362e5f616756bb5aad68c68e0a34ce96684597712341f391ca6696538582ab0dbd532c7757b5b24b0413145395123f0c4668cd538782b0f65ecc30b687efa78183de47f53b73831210c513c54febca584a4780ea352e9dc85393457e71ca62e85abb2322aa45c4fb3d29b15d55a027b8a74186000b9a05550b2a343a3ac21b0f7a2b2aaf736a1ca49df5b61fa749266b0696ad7b6c48b0dc82803b10a4b64d6caebb33a13c60effd699ad44c1985c9e3f8ab21a0cbd728ab52e07c4bc5ab3f6c698ea307f435bb7b5545c44758fee3b9077b5a318c2b584012cc9b57560236be789bc4b026d1f26a857365b2d1a6e809a9f71e140ec56c4db3829b74539a90345841483daf6840141100c66cbe057261fc346ab8c36b03cc2b2ac838835cd373836bca05d9f57ce2231980ea1bd9908111e79b602572ab37495e9f6025269713f4318dc472d06b473268bcc7c5cb956b5a1ebf419aa18b9d6f184849240470607fdf6325ed561c270b095079734fb61e04c531be893c2621c5ba48bc897868126b995e75777c8ceb100c67556484b71404be802ded5299cc41a83b0c7a99c8d36d55f7fdb4697c446904c2420d667f5e58e0837778ea960bb6605890b8437f24f7d35acbccc41acfcbf2e35270ab36804db6353d04f4a88b97b6aa5a6a42a101a535da323cae6c7dd757de67c24fc0c1dd894ba24c26c873172bf2c1ce63c56cb98189d60587cd76c2ff70cbea93a0d0767ff347a071333986226a8812677e2b5e18a15fc5b2d23bc03786b2faf8a9d2705bcb6276d2c140509f67a123a34a98bc879386b5a596b4fe77f0caa5145d766e05834658961a4aa3d5a90bf9da5a53ddac964e62216d0a6e39934f00c6ab988cfe6334a69480bfecbc7b100b621d471ab51725008a21f404142e489cc30cb1aec8dbf99038c8989ae8c477c198cefba1f3420951b660026c820fb406d19fb0878677cbb852bf5978d99d33f6fd7c3aad87585e68e5dd5a444a8369749ac03902b91000c0d986b26029005ac6daab8b0888a75b75bb667469525a70278945e2847cfcf242b420a10af98cdcab58417400b9d58b68f3670aec0ade93996a8e16d63337444d0b7de449f3ee63b30aabc9ac2b77d5bb13d672ce9db86770b9c21e11ca3f42c2117654c657da94c451c319e1139088d008179707eccd6a47d68677c692c9bc7790a6311dfc244d1c67eeb3420109404a86ba668e24c09b6308f3b09e546cb20db4117c74b4124946735ae70ec8147bb2e24784c3b4a24eec5ba8de3269054399a623f0050b5d0c10b5f5139b0786353504216850c85677bb596b2ac6a5fd4c224bf61ced0fb031411a887066d7a5455afeb8309058485386a023b6c58b5b967557a5b291698d488a131826b958df717caf472118d96a3b6882c1e95240909886895a0f5946aad1c690b7a904121688f5685ae775738307786c5a6915baee72b3d71103a96860afd696bc70b880c019e6dc77c38e33817db195ffc2f7cc37b4a6450a2e787d2e65c55748be376af57251974ccbd8b398858971eb5ac62f7156e9f2b43d6c54a51c40c55156971804e21869933771b3ef64d16e48ec5195018425d32b56dcce1844f33600bf366b9237f6ba451fef0816d17a00542433dd7312c474f2c1abe2e3a1a12b303f9d42891b12954473f6eb41ce2014bc083732e7a4a7808831ae478bf2865934437d4874b6e5132ee99c727798aac4b99c7494fb555a594d21bc99a014001b7d06612c2b3a8c7170e99e037a2d50f33e61156c519a1a15dc78a60afd1c2c159375ed570878c319db912c1745b90321ddaa48bfb80411197b2fa146315bcaeb292714ab7576d946b3927a280319395dcc4a0c431692c7848d10a36dbaf5d78af33f62c25e5c4fb009be83a5b93e054e587393c48ac1c65a524a0cb4e6637fdd90e43346fc9a45a720898d05b4d3743a0e2e40f4cc77237e8913ac0557db49eadd7cf00c3695379b06602c332f57da6409b3b888e7c06898fc4412444c677482003c73fdf07ba45ec968591c3445b14053a8077e664b9964956fba6faa50d680352a4c8378d208940722bda766910403970e3b50d863d28400512d7adfb372052f1cfd3b24ff4e46695533449dc232a14604a08b00da1ad81e31232412e72d180826b968513a2dcc724085a3ff0d5c3a7361f861a3e02b0308b897ed9d35b14a4159cf646336ab8c0e273a6915a14297abd937afeaa3f62005a001417d91699e4166740764cee25b91fc2c44753a3bcc2a8144174cea18546fc513028018aca8cff714d6eea7515db543a192d8695b1923642228394dfb428cf167201bcbd1e217ed1e2391c616db739b09c9a0996c5bab53bb5e1bb3aa547937dfc49223897034bcfedd55599e15641bbcd1b0072e11ca24ce7a828776fd0c94bce2738eaf13075aa7340d51b30fa0caf857f1c5b7808048917e7490ab0739147b7cf229953a633f080ac80c495f5b03355bcca47a94b60e95d72a29147f2b677c6a106f905f5349933b0b7600358fb009bace2c229246aaa51a95842cee212c11a205711125c4ea14d68a833c2892e8bd265bfab3e7b16cc2d34adeac46aa6e92598d45d972577fd76a9a7b954ad1bba6ed63132a375aa29b9eaa42366e2aa8da0374a19b16389a1b36c025168584a91a4328071de904ff9162a06a8bb9b9030f4571b1166133bd11f9fb9a2214c3f838a0a6106359e778fa7f504c6e719ed9c2ac66479eb1b662c8571d7e398f80941bf2ca0b8791bfb51693fa95894f25f2ba53882e450eaeb0b3ca706a936bf22f6056588144c1c3219f0eab96c000000000000000000000000000000000000000000000000000000209ba491e8a9350c68a6cb643fe16e7cea65ea4cd099b14c90e7a0f627f502f45ea63afb095b03165e6f3b9488778fdd771036713df7b893ab8777554eb05f64
 Input = 8106cd6746bff4925c2620882d571c50b36b066a5ea43fa6528351d97dda7dff1d9e9ee6ddc640ddb88851844c388727c918152c41c814be39f274183e116432a61f9a7c1885f07bf118e4ba631598fa9b1e01e72a68ec43dba62235587c9b9dd1c8e806174ad612a2ffd477e8d0edc2ebaf4036393283b55144b9c83cbb31d1674565abf29a56980dc4a3803a389a20dbf78c78a907a5d651649c27c9771ef436c189d1922564397f5b5594d7efa951ba7d05962df80c49c1f73029c3d7899852d8a1fe03d1245a228028cf713f4403abc64a9093d782cd1a6dfe12a79098e07f40904ad146dbbdfa919058149b051bea097a60aa0373cf9c0803e8da99c03a6b83813f99adea8c87e6da09013947cbbbde8edc3b7ca29f3180882cb11bec706f4048a20c5938560ea83380be5cd75f48d77bf3360fc131509317dd72b9340bab91fc6bf7ce099bfa58d6c5a413fd2801a15ce7ac6f6f2c0447cba39987a37695468cd0fdc982631d9b0354205194323e74d41c54e0a026c4e67467b5595aae7c8346d1bc5538ad0acdd56fcda32f95dd7830b65b2d98c05355a3ad9c84cb43c23ef9845250888ecb6f992da17f769a13bb7bfd621571f98b42a9aaf19d0626d7d59355d9730371b29a3868b97afd7013142866e0b2f1c54841de47c47775940c58475c96a4881bc69c6de346e05f55cab15d497392fbefd2309a834c733eb3ec8df4ae65ccaf690af492e39d0b5c91d09b39966b31b47ddf6751b481966f19758dbbc373debf284640015cb197e53120e0a36ab02203e0992f35b4c8347021f8c4663c996597a466b416cf271e04a20045639635b904b63250817c29451dd2ada5f3011500f705c2f0982d236ee1cd02944e35cfc6704f0e8fa30d8d2d595340b4245d3f3d5246d368062b53f06ad365dbf12c0fe7f492690fbf3389d234e76a618e63f785af41b2f4af70be0bf0a917df6a5f34683d931604c6df9288cb9e38b8d8396ab2e21a1c9a54f4dca2a4985c3c4aaf20af5e6fdd126860df422a894dff4a857f2a8aa54c4bebb70d44a4ad15d47497be7e0b7487003ecd6f92cec84bf4c459eb5f480dc20bb6db735cfaade1ce33782aaffa6a39e4f2ce9e7df44347b91d75bbe71b824d6302608dedab325d00163cb9e0a274ce49717bd6ddf4b9c02fb6986a8f765ed565f48c10dc90f39b93aba1a69a832e41f2b0dc2113fee500c99471ab67e3ab5a1cccc0f92273739eae4747de461ca3ce6161b558577b56af9e695a978970473dc671efcddda2bbd8d15fa6eb8ec0ec9f479bd9b8d3dd4865460846733856fd57664760bbd5ed354696ce6c8b44c6ebbcb07920cb6c3cf769c005503add472c7374b8875d714d25c74e2d4390ea455e00208763f56e475b630a30875bafc70f87f541bfd0a28839d441ce567db3be7a20e2773f08ae73f9686b95623fcfa7b1b3052d64448756f9a7481b1d9c6022898e79afd4c2290a9ed2e0658c6178826ce94e0ab460798a88cc54558c51239bbcc5347d59ac87fb6580f84aae6492e1ca700093438889fd50eb7028153e8b4675fd272667fa022b17029808b88df427ac048d8b410f60a56ac39220f8b509ca93c34c7dd62934f62a7e29aa3b0918299fd5c56b3c3158775a3b3d5c78aaf2f656257fdaaaa5b7daf83294b5fc48d08922ea6f5487d647c30b1c11a30d2b1690958fd90107a0d6cc689441a36d04039bea83c447e79b04bdbcbab04427949855aa1a32790075438ca6ae6f7897581b4489ea1dbc4c025fa1ebe698959a8145e8f11aa1cb6f742d1be789cba73fdea457eb0abf1e814c931922f451a7d59514c3e2526b1378be1ba8ce317ec3fe2e3d983edb346874f5251d197ea02c7b16fef2b7ba8cd3b0179b1f935d4aa4d463bda2d5dadd6ba96c0ad630f1eff86e34dee3f2eafb9cc5f5ed13dac2149a583e2af8db3a789c39f751e645acb58743646c6f65bb12564b8f26697e80b8d9636b0833d71433a0465dd501eb313158275608390568c7130ae5f998d3819ad7f3855d26ddc9f4ec07a36d191450dd6502a28665eaf8235a3f10b90aba654c70974038cdc9b3335d9b865da8a07be70d53f6a5edc7c4a5f4b5220c8e7fc01f5740360db072a4f8d7e80246dced5c75ad642ef1b41841f43e6e422f4f9131c1b3f505197f18571b057ed1cf2dab2f37dcb88082f8d8291d13eb7abdbb14
 Output = ab923efab9857dba5a68f9198c4318f54a42aec38d194133eb7f5dc172478e79
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 EncodedPrivateKey = a7d40e120206cecb9458a1464b96c447db086780708c7435e40bafe1ab8cf26caced91b888711b8b95414e080c2be24d7a622c2e0410fb9c795a25a50554abe8b9049f9890e29531cca88e4284a5bcec559f939061b003510c8a23991cf474ba6676b0599c86dcc0976f3b61cb624954d3914bf28e109193ef1b9efdacace8574dceda34905485e1a79d51c8ba06722150d8a243d69f671c18b1c2a77c990699b72ef5b1c4aaa121a8e5a6cc971178127024166f2593893bf3b9e0db273040b0821051cab28af5196b8937538a680b39251b08051502c2a3d5504f78b767dce91e2116280c3532e9426b93d8cae3e9abc5aa4832c6bfb02a71559bb689f82c22835fb314a5e6d44bc4085eb39ab41555103033a0f4b6aabfc5246c93c07840254989301f88776c06c9f808369e18445058b4d940783d57b7d7901b0d63a6e6512b31a63ce0704028d936462c18eb4bb78accc3dc56884d9837d8632a258c4e998cc536248aacc62f7b9b65191a28a27a1cf44a0d512875ad5112e034c0adbcc67edb84eb000bf3621e7c1c5cad1cbd06f848c5d8c3601b07463b5c0e33cd260a2ec99a972c47cda74229f6292221391f37d20903aa76eb6966195acac6373a41db78b8f7515a473ba04397c2e94a26a6acd8f2cccdc572d4b60e56880fd0295152e18bc79699feb1a0b6f6c7ee19545f4124eeda5755a85d79fc2dddd2848216576e9ab4d07b7ecf77a74937cc1605602c62003dd5abaf601b55ab0cdb37bb3110290f829a742c5607ab24a50000f3191f435427b5345ef884b91811bc44fc4c6de32bdb0a73edf80c8783a5a6b6a2d06657b16104cd62ad847206ec1b87729260e91b2afde6b0f13a87025c10bafa88e1fb1a66b98a5308a2c4f10874324179a2729df786627271ac5a945072beadf878035169c543c0b07acc49241b7feb406f524b71c787ed757a3d48c233bb75d97c42e03b9973cc680169520e400b00879cf2bc9119325586719f22e1b2de163184b2c43735b2c1a8654c92138b90c458421f681136e0d6c417b20a5f8c126d3672a4073942855b127a87ce96c7e34861923b3ea9bc9f0aa277746927f0777814862b0845c3bdc12309241f387cc6f4ba4a9688b947ec8b5603ce88ccac5c35756d0031ab4a5e32f6ca97184df2acb38f724fee64a6a688c69f6b913576af98ea2487db097d7c81dbc2a29a381b2345495160c348e8207e313929dc08412304f6a01c90f6889e23b7974bbd6f081f52dba8baa716b53769e6f71b962156cd44a3f50563efb3b65741aa26e42a3720ce737c7a7ad5c875663bfe36bde03b106647ba1ef098569bc10a0940cd300d58571dd354ca5ef714733bafa4308b3c4b7528862664a8656d16c9c3837355e39072db20af20025306390ef32931e793e33333cfd893c6227215027ab7ba9cc0212ebc749abbc62be483b3e2406a5ca10d7fc534166646473c27979053928aa5445c4c1c26cde40777aca39f5a64161c322135fa176d44b694341a0d3a05de662ef0e1aced53c4ea2762c1333da3f987fac65ea63a17b55c3f681c568d648966eccd095928f2e32af2fcb0674ba3a50350e282c99af149ab1b3f52d3b9f838b1aa8cc5dc9ba816e19d8a177de33a855960b7c464cfd51a7279a48c80091ec357b9fd118e12f00736036fa8268079754a4d565773f2a5d5c913109a4606a276d07372eb96474c7722d85a17a50a956b3ca8132415b2c404a0288aadb44fbb00217c0005ee36137768c3d4169d300ab2876c1b2a92c0cf119fef5018bf7acfd2031929b9671898c64388898fb74a483a100ce2ae67275e53b00d94c2888f831a286631450308aea2580fc5cdbae53b7108a9d3cba88a437a5c0917dfa3bd7fb2266f2b2f57f52724b67e58cc2781a95191f60a34d74199102b5fe941874a4433034ae6c9aff9e2bf16f01781d72424508835e3a587903eefeb0b0d218e11183cc7293c81c09cb5fc4eaba4cdf22284206b23b87566da704665527c6c587aa3070b01e79094747a87ebb2b9e5296a2405528c224ef45ee6fcaf0c537fa2e2479d579d71a3400793188d895323f274077416f94c4e68811ad9c73598d7ccd53bcd18f8b1cca8bb5591298132258f4210d36722217c2fc5925330d03d1c037cc7d520f52b7761e61727c66c5cdab43ea53041e25b36b56a323a12f70c99eea25fb4d387c1aa2d871244021a45ab27a0709583e0c8652db31167da21ca46b84002ab009a8659656876a037e844b6c027545cc66d783713a79b1bb5021e7a2c5deaa900e595503cb1bfc394cf65707c78a97ee522be49c2c08de89336b4b50270ce189bc81fb6a464a853262791c748714aea70e79a6967e62566492157b4bff737804b014c69f41eedeb07e47cac957b4ca937cf4c907189606a9187c700a7b6756c5694b285ea6171625038f1c729a7897e5cf853aae66104fa1e6c66b86b643b1e37838f85bea35132a4176afefb2e6254433af76d5eb455b11a0624fcb63f7310b0c9b171d62134fcc361c2a58b12b2c53530fb658b83107e76006e43ca74d9093fe0ec4127f5866c306b791b5d033cc834652e6ba485efc76b5289304b3c774e88ce0173012e0203eda7a71eea170517114ef93f739501c6f9c9a4d56b77494f82c06753a996f33721a56a003167bc773c44d685a2aa45b61744058a1a097a14299d7a5257e27f8efa796776249878854f458d7e4b70db914e888567e5aa9cf238ac4187bd783570daa77c3a9854c11c80bee12374267da446cb1a3b5177c112a3945a92596093f77c3ea9bc2f95452b89879bb6c0028b653cb6c804d2680da39cb99233067c7b9124a27c4c6558a641718588709ac86d5c57ac7a1f1aac68c9c027cd2c0433a139f17b2972a5a81fc8763ad92391e818a8b77c43fa7e71930ab5934d58301c723825f9079ee9ebcc8096a1c4eaabfb5b73f070b43c3112af289c09d908fb8a2ab48786db29c2dfa82a16c6c8a8b34f83583a6fe3a630b639631742adc422a71798974727e2a80b139872df5420c60954a453633bb99dd40098be6952930cb35cda52a33c4728eb31fc7048ee5176ce947b194885395163af5aa5f2f53fe8c9246bf6143d199d2a797dd62b0fe67042fd455acebaaab2bb61ff778ffdac5edaf8778879c5517911a468a583286bb4d11a7f852ce921cec823647226c96110063d02a2708364e585c5ddb3914a27123a8c6ac89c6f98260009f172f644b10a27201a73812de28eb9f04cd0e4a19080001d082189b7b85c788e02324b2f4b07dcd4aa298b44b0f49efca0b9c0811b57729ec7ab7f0a6a7bd14c220394a2609832a26b3b8c29139af994a5c96bdcf13d8fe21c225b5e5f5aa2e0c7a21ec3a8017c885ab5a694aaad999c6ed14b77dba90fc666c0ef88336d79b3093719df8179e25bb59301a67548cf74122954e34fc5e94fc70b931a3669314605d609cf06f25f74f76fddc056cfa4654094b724636f49fbc3964a5ccd79580cc8a15eb07eb4061d528a32de192413d388b051660d43507c49720ec67ae41461b5ac87cbf91dcf42af4d38680f450acb9c6cec903807153b71613f02900117ccaa11e2cbd2885187a49089b63c3f1106fd5a3070a38b25c9757bb9b40c80c6fc4611334c4463e1aca784af6bc38584a72ca4db482361314fa1b18da660f440ab6c9167a4c18afe6395cbdc5320fca49aea990e12ad6863a0725863dc1009de81abf3d56ed4c70258096f6647cd3c5b1033512a742984af1a08617aa63e1b754ec93e77eb1f379532cebb7d4421a58bd133b9ec264ffb252bb8b546961e2f602aa45c5c20756f51c0ac29983ed95036758b05f6d90aaadc464e914004ea81eb74162d8a1e4bf986120c1e9d13cebc774677577f86c10addfba2b9486f9123458fb20e73c32c8a36a60f457074ba640309a7c9b744413a5622f43ef3785da0b77739e00f1268b50e04056b0c2071f8ab5451cc0d2861310806a4f180867310b03c0fd0d9781b3315c0da53d30b5a84f27962326084b4cf8e88a2087b420a9299c34a517c088e12ab2f54f35bc4542b85d455f6e9307c949cfd617dee8153a46c99fdaa1c00795296e9816e557369e34bb25b1555199dbe0a089cf83cfe019e5d013c6507294ce27e51ca5e805b894c13655ae6a0f9da6051706d46dacc69ec3898fc58ddd5c75e82345fd8137cb606a7707b4d3bb801f77b615527705399c8448f95d3c292662957e48bae0004acb52e55385f0cac2a9c76c471e2654968113c98be84c89e0a49040ef23751521558e677e32089a6969beb0897f74a52aefa2a087c454ef26efd08a555d6000000000000000000000000000000000000000000000000000000d2c662773707380b77713c51b59f8f1c67e6541a410027312c5dea82f0ba5c1f8bac5e523fc2f73973b46b1727891a6077329e10e94acd027c9dfa38ef4e21e4
 Input = c60d4aa71649960bedcfd1ba225807739b82f912425f50d32153167826926e51f8ed961b5439fcc7a3804d55ff46d5b873e13a0c8ee7606fbb21c5e121fb8e60377ec46ead034bea9c44a685e7a588875e5bc2dff98e5529cff460ef5fd1ede8d4cf2b02e9a537887028150d0d79ee6a0ef2f0d5507c42ad1d788a75899d0b7243f7179af88cd6b7fa41849f1f49f782eb0bb727a9b0fd51ebe3f05ae80fe7259aac42c8b0a70b7b74da297c03dc1f06c44edf72773958e5a0d38aa91c35e71b27155e875f3378ad6a2d064d6d7cd56689b1a42dc4a26ce2cfc8012e147940980403bb6bc164f3a0f9055867efd0bdd3ff4c36ad8165aaba00c8365d217d4bf208312f3ce9fbd7bde30d6e4d3f1a98b0a20f947d03b45f3a25ad481fd1dc271a0cafdcc04f02d314ce3da2e1aeb00c7d3a88ea3ea2783b75e16768f0aa122db015492b0ac9bab3d3f85fe6d8e32cfd66fab8e3138402f690bfd3a5fcf09ca27cfaffca96181b8a906a67d93303069ff91c2e3e6cb26c5608bb04e05ddeab18ad3ff916bded7e9e27c99492b7525f95e02833ae827c48b1f4ef06b77633a66ef85520768b64641c5b1b3bf319c390006a026b3a77331c530aa5a86d0e329d4c7bd729992e3c574876ad9a29d79b09018e850e2e63d51f75861af33e6acbdabb722d41312294a9b302aba8e3f04ab1f04688e373f86e3753d84070bda2feabf6b94617cccae0fd427f90f43d3b686fd772292fe1c93f355fffd2683eb8dbdf171b69bb6a5c929b7109744f542a21539e04151ac7e46f5d4b8b151981d4860a366d3500c3422a2bb5c24fced0221e1b84b9e5b587e9bcb87220dd92c127be67a396ac18cfd3470e715ebd320fa07097122f696ff81923e4c2d3c0310bb8b70690dabee4e17efe6d871b32eeaeebb448f7d65fd60e7a3f32cd07e61948be330179dfdab4d748d01694d64edabfa95647a21ceafd5261cca24a0548a135ca1f7c262952bee7a291857062d3546dea97cd745050121c82a73ec9c0095847e0563229ec36046ee1564ef3747b49812eb2bd015025f077b56d63500bfe523689a6be7b886fd8aebbff18cfb6e4ca18c2d0dcbdcff8fb7a9e852f81ffb39245abc6ebb9f58a28beb15942cfd5f797dc867f7a855a3e6ecbdd9a8123ecdc30c7240d44dffcbdca05bb17d524a791ea32d60c65dcb6ae3ae3b724ae7da36b88d3563a63f4c059fc83c97ad79602cd7701749f92c02bd65f505f407b64ab3f8417d3de5631804eeae565af62d7fbf95bfe25126aa2494368bab7afabc23825d6cb03151222bec05b09a3fabd5937b7a0ff17246564e163d049e0724456576f250045d13d99aa07a5f298cd76ac73f69c3547ec9a344998dea3448a96480ece462922f76f1fab68d030796bcf570298013001414ee238a8ac4d7047514ebd5c3e55e051846403acbd3d7a581c1d53084eef20edce56c2f50443440ad0fc77a955c1e5c4d610cb45f43435b1a66bcec638ce88126ad88bd1b0d10cc5aa23789d5c8f4d9c63cf796e1ee6f7fb309855f332a648c731775edbcb4968592f1f633a3fc74bc5fbfe9c0e74d8379fc56f869e63d8db3b9ffa92e9b470e668e10acc1c7606839f2ec0abd02629007e3b1300e558e5afd136f949eb1e6ae56b5a8c21d15ec4b62b22af89618501c1af9992a3f002242288fe01140e2476ff900afe32685afac7baee893bcfaa54c1bcae65b2c9db04b1e17dec3821145daa041150f3282a500ca46c535ee47ec02b1a1639713354bc4ff7217ec169a63bbf26a26b2c712b02c76b56a8ed0535e3ee1c3f118f2a68f9c699ed8702f3eb30328118922b15b8399a3fca410dae21e7d762e6e45c8de7ff023a75211e42d1acf1d8f506223cb281fb9615b2de1848ad674236e768a0f315041daab6f491195453081535f9235f6d215e5750226ae7eef4df26469cea1d0541e7932ad917fb360f4a9d5601126b1c76bdd1696e6d59749635b844c9d416a12d0eff4c4a9e7f40860b047ffad7bce7439ef0fef50cccbdcc848b02f66bf67f2d3cd795242896c5f2cff82864b1d1f00974c9142d0b0ef2a8d00289238e822d352a924c689ab15e6e5b201ee7ebca1253b9964a04efb4d7af21c6ecdc03365b4275d72502523d562209a316a88163ca33ea279702309f8c2373514d459a5298ce6999571072852d996fa8421fa594069645f034d3
 Output = a6ac9ae3077504c8a7b1e5558a0fb1e7d60cd2bc3e59d615e68d5165e4903d07
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 EncodedPrivateKey = 610c36a286cca4815c657bc2f28b854aa8602890bd6ec2700d64b495b50d049c5963b8294752942d11c1d0182ba6704e54c003b828bc58b6ca3ee0823607c3c00bd0471b4df571c51db3003e4cbe6166c0caeb747f79573f5b8b80d12ca78bc1d3e01a318bac91fc863198afb70cb9256a330faa06639caa7ffcc1248b367bb6b0bd905ab0098b79b85ac5dc083ed43ed8b248dbb72e5ad962b3201c92b132b2961d9867b48208896c11afdd929be2792839674b18e4c1e99a7df714ab7ecb58570281ca80a92f148bc492797564682b560f1bfa42b2f7734047cfd6375d3dc05846da1d3511cb3c8221d38226f29ca52b07471a41764f86ac3418a96aab70fc8454d6823f8b7c6211d216d08c67eec474a3cbad8f3587e22670ae5a9938651f3b48011341b6140ba393621accdc3f606b080579197c48967f1c8d11026d8f90b0697869ea49cb9db086ef687227b2549ac689b564326a2280d8384698185afb25941ba0365b0c1939148ed6e1bf0ef5c764832178d47a01c3573aa268e168b740194a9b36ac2580a7bbe1625900befef3adc6fcb356100ddeac4393d388fe647c3d623d1e6a56a96073bec59f5fa39581245e31aa33cfb865bbc28e9f2498bad34a5bc65c517bb8cae19b6d1864fd7a0c48aabc78d0373a84c168f33ff13a9586aa349a185e3528003e804c8cacbccf0073da46567f7c3ee6a55eba856851234b4f3725e1bb3609e50cd4c9c96ff947c4b048dd7c64b3498d23c234e9bc45230b8b0c797946d0980dfc7bbc5773620b8330262ab6247fca5684c9fb8c2e692c3f654099a7a93d0aae62d24eb594544a81431f295bbca7b15dab7bcf728e3dc61f6354a459a120c371030f3b622569a78762b1cb08248a455e0f0847e1531d194acb0507bb53e9c0e13c8b2f45ab06362be3d9bb58ab6d90825a15211f81f4987000cf74355a28ba08443b3fd9d26b70039955773f9f840207f696d0e7a4989c4b38cb23df626e53b7ccf7c1bd96bc3f68c20ba180a482799d2cf975e0a39d5fe863df954665509b3eb63c257b8c9e39050bc4a739468e716cc289a79053453a28906d003535536439d418736a95763ae222c8870b66f1b5a9978c29d238658a3e773063dab55125e851983706c3ec68d7fb1d595b55292885f758a8df752fd3d97a8dfc33a228c896a44bc039ce1a2069810b1304d44522b1a5e43756cb843b5ef515d89c310f442f585259e5d460dcd578cc51ab49e63a7cdc2566d77e6959a7d24150cf0b413d335efa65385ae13b482b9b4db4ad2518b71704098d7481d2233e2ab201dcb4a1b3604149710de3cb247f29ce8ccb2ec062b014708f397482dae5936bec37663c849c9baa9d3cc88146b88cf970e574694af03fb78205e205435221b32e5513989047e62775f1ba5aa89a10c9d35cb566328eaa5748e9c5057446f96cc691d80208940cfea984df8817d4507aff0a0a96b8c6729329775c8d75935d7624cc0a06ab7a950f2b73ce4d90239706403c0651dda56544ea59bb06a99f00bd698a8c3f127fb4a3759317a05ac244a07342f9a47257e5649dec2c7050188ea669a97c137f707f4e5b4c57945f82c1b0b2040476d73acb54724cba00dfa8bb9d8c58e33260020a33fc04021baba0f6375ddee4a6023846a2dc73eb69758edc915ab2446b1c59fed89bbb86a9be2242c117cb719274873c8b0a2857e4076b3a792965011675c23deb8bc0cf7b2e3ee38493461f8a2068bcd899f1822dfbe8444a612f9fbacbf87a0d45f98a541c5141b230be12763a3563f5d47e369b65c10254e5f63934a05c8ab3409d7b4207dc423d537abd4404a9ec6afb1cbb529619bee740a4c71efc952b3b871043c24c0c919f74f508bc23a9c1ea8b76ac449e28379af42bb6140d376c9a4ec76b34042c7d711efb559c8c87170662788b4cc907e4882d4332d90c43175cc56eb943d589a30a5ac1ae312aeb8432a1d7b2f7448fe0f48ad069989e908d28616530246f8e817aecf6ae638acd7030a596d5be06964eeada35f6175bc0d20c26636943f1609eba3b8852531f083a576231c9b222a9f96ab1fb79aa0149155881fae91adf26c4f1e463f6f603511311351c6c1d1832f482306d66a4a2e585b7e223bd539fc45c5b29558e3110cc268356edf4bd6328240b1a7286c71c5cc17284fb5058410381c74456c1ae3ad93735b6c7d0e13621c924a67a44937039df4b4da608ab49978109f077c961c2e6d02cb0f429fb04bf7b32afd9e0748a50162bf49ab17602717b25800ca3c762145636adeeec6543c43dd20a2a194211030971f16139ab86a22fe07664b425e47240ee1101cd171bd681a681804d38bc4cd562b7675a1a4fb113ab476fb7e67009c8ad5edcb053e77e99d10a348851f266919d29204f5bbe27e8672ed92e7777aae4141a8e81a39cd83a30005127289092929a41b42db3ea2c3b9b4e14a02a45906e871b5ed4c5067180aa97a6967642a5ea52639f27665a78aa24511ec6bb8ec7c3ca2fd34fafd5b5397c75c8144894b56d61e57ef77725ed8909afc703c6cb858fa1c600556babf3cf4fbc089595606f450753c727b42c7e8a8c470ae99e40e518d73684f2810e1ccb187441873fe14cce8628efb360083029fad17c1a9809daa08df859a0626365e0f1ba97ab9bb0d09e3b2632812152ec6361cdc65307f916b1782eee7873c2313089f3bd0c5ba938b80f1b43c7fc6c3f801444a34ab9c167629076442b1cb34c9b02941368c6377098a7618ae352d7cb1ed9419d56158f9222c644f58c3efa5209317a165434b86350c1a94d21fbb065854534120e665bb73266b6a392a60fda82b096701cb100aff65b44a40a4d8c83f8c63621f44a6de22f9b4817a2772085a95597c309b6423b9710cf72720598064717b52a336a0d3d9b6092e9a445a3c507e37ea9ca126b1b8f4f702d55959faa7b80322045508b2025ba64575049738699e2e1a42630c80615724dca7e98acb40f6415f6907e3649962c451f31164e88601cc2c37a65c636b6c146cdc24e5ce6976bc3457277a588118712cbabd8dc273fd0c8c3835fdeb500fe035116f6beaf437354c39e9152c3c9999f5f98281096a0f1cbafbef24e87bbce8f88377a0a3541eb128e31a0d77c247dd32180b97bf6f8bb2f611e7a7927f7ca25706cbc7b52598b4865ed8b520aa53e6199a96a0bc79a09002e07bcdf78473b273028b34e7a7c9f71ac38bd6327ea4c9acba59a07b59433908a3b8a4cc5a01d704773621b4c750389e8557498747ebb3b8b41b99105756205b2b578f668de8c293ef989a934cd1c80b18d700f7666986fc445854c9a6bbb8c9ae050c6316bafda5e98aba4ca0b92e3c3a43c504e214193b43c9c9ccacdf4ba85a57c6da6d1a8b310c4f0b7390c7001e8004beb92bf55cc8eaf37ae07738a090018e843288a965d4e8bbbf9a18730106c52758367361f558272f3887762ea91c35a23a708394b8a3b505098f7ab8ba505bbd1763a0339084f3ccdb2e68ce8b032bc217d51110c6cca10f277142a844ce5e7c8800b5bc857613deb0e5e59b4acc72f0fa1bdb0f016ace9b02a43a49e83c207e8ab82e98fa1144a47809a5dbc5be622b1bb364e8000cfa2c203f247706b3b3dc520bb308a62bd893c3bd890102bcdfa1b6ea91cb5f86758d5339396184b2ad4b36d6c875675261658615e55c85839cb10ac8c789959cc675a976c4b88146179d38820344f319b1621248577294d4550a33e723d65f11f3f654f11f206a7b4c4b909a4b1490f41d68752aa4af2723ba9c092d371c0e2459c9361230cea1772ac0990b6626a9914b20769c51b2df3996639fab765164a7b61280049ba14d55a98537e85ca0d8259b14ea4151c787d49c9b2d291c9e2b005c13a3d93a88840f9a19d30c346b14b413c150818850bb8585ef0263b515a74e79032b3c561ea543d652076a38fb4f769318378510a8e277334c148bbf38868d74ab56adb16f75a6c4ecbca6e1ba200874567fa5d1bb42527f123faa69bf2c45e4e79022799a717c21260e3585d6a86b7582a1f166dee7015abe11b42a961d60750e2e40ffc82588448b515bb4afe246c875297ef87740a775fcbe0bd902c67b9830c6d318523e422b0060bcc5a5a5f7b267f5b53e111c7121b86a6025a0fc2716fc11025c857ae1926fa7066ab527045d8244c75bf13a1a3c6688811d35ad23c1435b4cd536c6f14f78bb5d34b4bb34548a375b93234c63645d7ab59580567f9517604837fa6f98b2b4911d9946a54d0ad2cf0747b4081b904a2d6f953c70065b0c4b698e556daa27cee3b40070326f43c3d93a7cfc649000000000000000000000000000000000000000000000000000000bbd7982687ffd48dc0a8badfdd4788bce9b1b4242f5ae1d14b1ba97c0642a6b4e42ed33e0da5856106580e02aacd0aa1546d3df0571d17452d22f186d011981a
 Input = b0ea35919c0560ba7caf9fb6352b36bba962cd45d3d2b7f6bd97ebb2a3ba6df22e018390330f75cb4eaef8c9ee9bde4a1f25110dadf363df31f3f8702a3c14d5d2da303bbaf0fb199384a2702f7089fcc63acfb29d5e53571102566866898055258241e5ec4f1a325175cf3a64a84ec50b4e8e511ec24dfdaf0ca79911b1d84b5a0872fb1618edf364ea06d7287c6ac39e842c56d6630ef38f4c812a8d1fcad73f2d4ecf8f7033c1f5ab982c5b6b8c5545237c4a3ba8d5ece30dc93d1d4f4e89d3bba0b8149ee5c2df793c8779d45de92630b292714582387e60769209ea7d00e2f1173f8817567f52fe53d908d11e8e77375e7d2f73f44a01ee3c87c8f4163c579c40ce70dbc006ad2426667650c35d80ced3df0f3f626fb52f57d874625d414aeaa658a220a4ee6350900dd7b1b9e165661b41cd0c96c3b665d789a297f6b7b4f261e6dda3f6b027ed8a308f1168627f71656bb0ad456ed2b197c672d88ea6bd61fde6dc3df7e4d8b505afcaa35fc1d9b5df57b69679811ab5b738d62a5800555fe282dd4d06d5ab25a3847b4f22725a2360d8b47c69458b55f485a1ee75918cefbac2b4945c20a7356d1b7c69f1c047ba355496e21eaa2123b5b545e86c23d4cf27011e68611290161366d6c12b340292113d3973efb312b1474807f8cf735b76bb3a722aeaca7b865530fba177f9016d1ad1a7bd86da6f657c32d6662e57cc691f5acad0faf4f21027fd761ae23456b599333c9af918166927c6253dabe508c7d931d50cc824c589881b39087e02b52276b9d4252c08199dd4943d72b4fc14e603c9e901d0038da715973b0d168b13edc26b20e2649f37d27c9cacc7a8508ab340a1c3ed8d26099171bfaebd39b0b9fedb3c195a381b55c13365139063e5525400127cc963d9659c964ef3415b31c3a2a923ed3b96ffd327d6eb4929ce1d0d26232b46da119e5e38e71a2dc97bb953567bb5dde9c2d19bbd208c85b135bdc885121b5f7195904d2a9141bf5222e98f95ead571db8fe2df9a93501b8fb9a06a3ce0338a37920fc4268e26e71f94cc218d6fad6c2cfdbf0a5855b186ccdf10f66f01f884f22503c530b3c5ecd96d9b55651b1eeb3af62cb7a4cf4cd185d98afd1b942e8f7eff849ce843e113e82c3a875fb996161e0d0185aa99e21e7c99c9636cedf0dc9aeb55a37eb1f744841f5d8fb3eeb5eef76039a40a5c643957cc81dba3fe556234acc512efa07f3a140ef28a93ed9cdd2088456e3bfad0e8377e69fbb3dc67f3864ab36f8f8422837e067c20787b80d77a30995e5d78f84804cd7c897d0ffa5fe1e7b92f17575d94512b6a4b5888a3cfa6e03be3a50b8797f43a87477982fb241f24af59f13acf60ecc4c11e558b1a4feb81f69acd5a67f56bd698888c9f00430dd8f8309629f7c29e96d2951fcd8b521265c368e13e22fefa30bdecd51407387c77259e64a62e5d705d3d46be5b6f710ad86e844e509a3c5c1dce0efe4b1427bcbe56758432301a14d8b882a70cb5c587e1636ecf96c61998bec7a9b6b98eab92be2e30b30174c87bb8bd66d13282dc4d1b67757435807a90a0b268a9f760054c219bef6c8811476a56a14994c760e21a1b786efda3fcda5acd859967b9874eb049a9690b0acd97c907c1ec6b1bc9790b1fa6c8f15518b9c18b3f0cf672d26496be193602d909efc2562bf72e83a3d8244eea1942c6b6708f006963ed1005615abfdb57cff11b985134ef3ca90116a7ae35299d1627fc05cd40cb32a83c9f9e19570ab0b4e079ae34402641e47e1f0bb20b63e551dc7c090421bb1916e970b33a6cee4be985f28ea66cbcbaa21279b45a4d3927eff26dd1d171f18ba8c5e78644d6027e7ace96ab62bc862d8cd69bdc9c07a4d8d66ce2a08601783e6d40665fdc637aa813a447361ccd9d843bfa05f5e88f1f74a4d6fd1bdeddb1c50523d731cf6cb4686018e8518525a83c2aab2fc5ff97ea1562c7cc7347482c96675b0b249f99428d68f180d6590c67025e41c80468a3edcf147368f3612456e9d73bc4d6e0a70364036f75cb6657ea99c8fa365c165d7fc912bc583f0f4e57ba0f531544282e21dc42e00f00fc59273d272a711748bf62760377e5c30c1776542936a10fdfa8acca0b4b5e5c9cabf461ed5caa9124c59a4e867859401c158080970ada9cf76ab49e250411a61ec5e83c781c269b75ed1c193bf8134d7b0dea
 Output = be6aaee5bf0744e7ca1ca0e545171f3075aba9b4d10a71ae00848c8398e3c52c
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 EncodedPrivateKey = cc389888219463a7a5f6c2ca3014accb3bc26f2318f593876de6a49822b6c1e694b7e5aa9140a0765b6334ec762c8bb018d28a99004081256159c836f4f800d0c9aa4a7136fcd89ba7cc1d6a32b23ed181b3fc118ecc60096a4ce8261ea2c0a6ca49baa28b75d1b40215367e6a33a1c177937bf43a70c3889f6aa239e20e499bc7a836694a0bc2912cc7cf211ba20c12d5ec312da2815ef20c8565712b22a927451271040cf4daa44d79705b97993584424e7b3224a5583e5b8eaf640e85015676517113f53a415220fde3638b9c0a38115e668545305ab298b9923bc16de5b9137b30a39a2c8b5fb75e4d1168593a8eb0e067bb9343f1a030e5228bf0b3a49169393cd14f73c2b8221b1267627d80b97d30544b02a4c7bf06099194b2d646596aa439d82a214e6cb9c5ea1ded727c8143755cf881415b6357661a90d5ae759475baa6076eb478a5826f86f9868afc47ac3a02a0e84579a25466a63d933b071213c886790c320416d9422d280745758779635ba6f848440b2489144866e8e018200cb8305b3060926d7e7213089a06d044176b053f3bfbcecac7840dd7844ec29eb17bb2caf321a5b17848c16a678552727a3d70c34f024164b3c4856b0a4ecbc78d345187c6e09f055273bb775078b43ecc534a40e66592b607b56b5f9304aeb048375ac71c30464e979a656f1728a7b700e3b33e5026bf40198b94455d2be37cd65867522b20bddb5ecb7a010191254b8a403f37c4577a613ea30678daab55508b16d6020f074504f928dddac1e8367faf6199715048c96a8fd6bb225715accdcb012cc856a76057b6b72b09a4aeff5b8ba278c54a750596e82bda45be19014e8ff52df181435ed9ac8c402147b539ffd984c291535b7bc8b26c5036352520730195fbaf40033fac450843e808b9ccbf03b40a9ed657f6ac4af8b65b4e389280633d79799e0226b28b356fc2e39f10a80452dc934caac7c3c521f0c5544e7821a403688f08378c3086d3ab8f7e4036ad516778da606204aed3ca1ae8c42e11038a64ec78a5fc5dcd0475429124b5d665e4acbeccca3a296a8e878b917b886ec7f029491c661bba684ac4229cd71373c829055b602db0518a481230345a34a709010a03e4b197273510a0a24465288c327c10c75434d9473208a7964db7792ea81c5fe0c4bd967c3f0c98765ba7d3faa4e6097f09e9bf10638fb900a764e4a0bdba2f19165bd69832681310a7a2585bf06322a3238dd26a4807af44faad999397d4aa14e76c2cad5326ce573d7ca04c03db769dd01a65583ecbbb991e7a31b59238f8741845f1adb5992607184dfa19a9e8840ed9e1622ab93031e2b448860d411a3d239277052cc8ea71046a0b1ada191a020c322d776c6655ae71964d86314a86a47b6a367b8ac5a4aec75677226de0c1864492c88fb70a53187cb76835d5477346646a9da97301156a3ffcc231f9a0da760dac142674e5cea882364dd74fab66901dbb7eaf037008c52073054cc2f94ec845444054058402515bd206d496bfa02c442c746ff3e662b899c34c40900902c4f8ca146458522c6a7af772b2df483f9d840fe07464b0c66fe1036c070c6f70278e9506342663b07529247b1697c6b844a5959672b08796868e7107108ca4c30a58be4ff7b37b0402697aca2dc4839dc51a8811c34c8183442711a8d055b640cd73d2caff9357bdd9ad36835ae9d55d1a291e040652d020a905027a616b3b5c63c0be2c1068e9cb0a9b4abbf346590237f96422308ba86b055872e156470b53e35b2a604bcbd2b97849446684149a86d9980c5182f1a020c32b14de18c03cd0633e303bf9f8a24ff0c95d5a65c031c18550b7d7d5b8ec672c3953bb3be0c3f13925200394aabb26090a3b9a12bde30418b997abf310c1724a88b9782418d09552a63e2855b7af2196d422761f5c8a877426976c90552bc203f5657f5370258b936c3706f074c11b3b2586391f4c4bcdd959615a819aacfb48d2c799a9abb182c7a9fda6a80ee50c4a827c9f50835b1859033629a9601b5b8b357913b6de142a501974a0c191a071a95cb8c45fa857736a93400141cc325d1b4518d3ea58a94c14f9b261759281b00213f91652b1e52bbc0c488bc0990a136e8e3b5e20f41d9f218646d43745245ca4c2777099032b1a5060745e8525bc617900d53b414dc995772543cc58a6bb7c4868f8999509428a3244db4081ac6b3f3c685865814c318032a678ce19866754c0774b31cc47a6a8e3cc90d6a15e54c7370c0360c38409b126c06d4b06b7d652318cc810c774f0e66e7e547305d03109030fded56940d472ee123438551d6885922ee91889f97ae31954703952f4a3951e8003ca2836fce071e382373c36a27b947ec8766bcafb1a3105aa2b082802b9bca0e4c50b80cf9a4033b44ba4b8a2cd6d480a315b08e7774d68f8ca8778894bebc2ab431d63c931e61c5366699b65ea448c127b82ea493034616fc1b6be01243bc84dc92bcb50aa4c7a417f1b5268e93b35ced9cd6263227c849dc8b107b10120f9f690706cb0ddec8fe2b20a26da422604c9135c58f0b06aa5180ccb55adcce07e51f885998398c4f16162c33b89bb37a09b84dd0a9d0e8c90a71c2851e33b3e9cc5531a76f81992344161a837608872355d57111df72412e58c5ff85b97ab2016b41487f56a9fbb48d2e498c2e12d3972c677caae5e439c598b67520a7ff6ac9c2424482988153b145d6b40973a1582b90a5bb76716c9878dee223046f746f08323ac3a5390a6148d767c3054524b7247c26c9339c0642632710b8a4fe0502dcbc32c35ec2e1e22510ea4abc7c74980ab25f9fa58caf4a70eec2d22c1957f162f5f1c5e5ad0a0fda4c342885081d3070d773cc972928eaab2ed604503257bfe448ef2a9c9c933055e633a339792d24a44769b95123c1f9588c8759a469c049a75bcad2e6087559c8afa5b6415a8825567aa44f63ce5b49ba4fabaea311918b804c7fa2d1742945f39bc9e8256b537128a9735a0939a1150c10418551723154cf4c027a5355e1751a9866bf558672fc68324438f12d83551ea49b358cf873772ae7853b53c9627ec75479c746a116c5e66b20ce0478c490946a0af4a3a3138534c2c94a44bca955e84513f548840b929f4b4ae51d53d52225a21b320d0d8b075358b019720c325814303170b627fd6856a149214eb192659d21001d5ba6953288e5a62d141ad5ff31c413418f332947f1441b8663f95b1a8ea35576e725a83177126719889651e8f20a8fc2392cdf55976651f1c177c5d8bb035993b0f2ca020a8b22b27080c4161cb86abda574deb0c858d14ab4261b1b8718ac12c56db9071a5acb00c4b1fcc9b9880917f53cc12bdfc77103a45ce8a2f4875c7e3711b659b967c5c26497c6e2903198f36b01c56ac5d054672d6914498643ae6b5bdc2447300737883306e4250ec445b543bb06b6113db5369da2b02dde3a11b2c080732979676040ddb2941956068557e65e0c4ae9c2834671f9ff65c246b31dbfb82720c8f014aa35d343b8eb762219b0eb802637574724595ac1c92b85e9a416089a2366ac9002d01af606ee9b21868e72ba96c6d5adb51f97c778cb8653e30a253b333ae5bb600a2b064cc387b38bbc0379c77dc45f7fc45fd060c60bcac60bbc794d18a5a8ab680a0ae202c97c3f153d07058017bc0b74458959c2a358b6c3733c60374a2ad540c75785ec95cb0bc125df1e8359af2bff55026d18348d0eca6672a87671925a8568060c09913993fc6f89e2523023544938a573ad208761e3ba85354cec6d999ee1c5f909bb973e0780c84101cd3cb42319b0d5614b9d103be8477ee9713cf943e038a04259c0958376c1013445731b0a5224402845499f30449f0800de86b614718bbe333b4b8245fc1a8e0c43eadd61f11f532ddb7551686cb8b054b2e90a19c889ccf68394cd501fb92a7211b9b599b2a2b637dd4246a7b8a5f713acfdeba03fb513f998177dd8cb216aa12c27ac3a5b84491738e5a745cbe7a3b5006bae6a08b0cd79a2b27af3da8ab021893e7727192e28787a052df8b434abb0f3a5866368991aba8ae3c891a0870327c3967eac16e8bd725bde990ef882bd6e5663d50b7adf75048d3202b39b44606ba1ac33fbb7a866a59a8c70988705974ec413abf660d5e98b6d9c60454a8825874953d778ac527578769aede871242b04561ea2d6e5c8aa04ba44228125bdb4beb90ca152705716cadd283ca2fd83ed9087ac5b2c7cba9334fe936c69586e3399fa46a174170aa8db62bd7095736012b49111e73bbcbbc89391bf70af7bc3581777c54d74ac2fd37b45300000000000000000000000000000000000000000000000000000057407f828b076da9179f40805f8392d4baaea0bac363dfbac88cfda8ce1ed279c975767ff083234b2979bb109a24a27bca17d170abd8d9e6ad3c3ba19e306bce
 Input = 1feb4f1d63f08052045012a21c33c2951b16c4b5ec02c00093d54ded6f94309e44d558787273bf593ac4bd77a56fe4dc30a54eb68a2f473c31c239ba18c9ca489cd50611fcd3be42f6f5069facdbcb7166a64ba7c06ba953142e5914ce20ec69038895c9860e69ce6cc3dac6c1b28d30fe83487d40591995f091d4ea116ad2675e32bb83325b7f379449dcded935027120d01ee43b2208deba910ca7ee635c5b928e5f6167307c813c8e7034096878a2915ed2d20898d8412ae61a72378a4eaee2f227ad5467d04ab884340cbfde2400cbdbca7e07a2f14016fa9e403a2b0ed27ad1dbb3cc492f584a6b5a7525baa628303039f69cf1c1e4db920ef7882de21eda5d2bad76231c88a061fbb2829fe93149c69204e2e783009beb4188fb876a6f869eb11b1c32c2ef15f9aef62f699f9692a502a4d87e5a497097ca73f8fddacbc03dd40a53abf267f749f9ac0f7b4ce9417a0f5eafa91fef75441ff7c887dc2eab2336fd257d4cda373121af864d4707fd20965e063fae456f0bef8f587bb385f8e5c96592c9b7d6c284197ca1706e1961dadf16a2264f74be425ce117a95dc9466474c856adb20931cc920177dc3f8c93d2bb3ad5f7c5517f0b7d141b87a8c287207e64158934766c8845ff0a480da124716b11d0e257206f68f2d4334e8e260895ab83e218e032a35f8d792be7b413b2679f8044e1c0ff67c474ef4c9b7e0dfd3d9bc4252fa81922cb146417dcadae7d7a7ee96e13bd480c96a4314f31fea83eef588bbf1435528c51eaf05cee2f193c3fc234d695ba32546ec77a16b1ea8047498125f2bf78dc9510812be57fe0ec77bfb3e28f42a4d15c2a2f0b54aae023ada92395cf384a1524a24e36ee2e69128fd2ab78b5af77d28c2e9ccd6c706315d46887db0c0c4f28666da7437489e3b245a19fcee97f187327a5806d35889e63940b19249d627165727f66f50aee62dd9496d6493c1f01ed0091e985048c2aa85a3b25a4f90f6e9f9cf67d6961ca246d763d3437ad64e7bc5c58b10117a66c40be088c58a27be4bc1360d114e61d002e271c4806b872f5ef7127217d5af6092e4aedf8b5c40198f266f9e10c560d4873668d58c912ec7ec18d27249f5be604a82d50421d436a3230780419bdefd10f049f404184b3530361c5c0644c3205c32fd451f6c6919487aefb12a75c821cfddeaa14c2abe20db3ac57ae0ee8ac4567db2d1e2d0920fa036351e8bcadbc14ab73d0868df6ab06e675ee193722f93f64a5344bd70593c23647152a81acb4d1a08b62b5f0b2669210d5d7845248d95fe9ccd796d73e34af955d1c94edcd2bba91be211cacb0884a90eab8a0125130ae65318f5419810f4df129c8504def662df4879e2a8df02d881e9990148065942c0d52865425f3239c4a4af51eeb85e1baeaf647e794b9fc04ea16eb328b8b1d0550e5dad8bf6248782b530735f8f5da40cf21241a2d62951cc9e894a339491f64b78d436c635eccb855d3a1f7d64f63f23023620408df6b3d190e7965d219a0cabc0933f7d50d9854e4d4aa7a5cf67b37e0475241a5af8e5000d117ebcea40b526c5a669dea1760d7fc30519148649fb00ca434f2cd84862a2755a99531854cdc847b7d5af3ede653ad6959f49c921d4a8675f7f3f51416c39e026488c297d844a8429caab43671093cc3ebf8730a18bae06f10ff8047cafb8d80edd7630c95d008cefca78f2b08ccb330d36eb33b18cf47bfbbcd0e2f81daa87160f421603d10409b8eab53f1561623f5167dafccda4f9a4e6504a0b5e67ab5dcfae98672f4cf62e4f152d09f2c64dd81e3476839aef8538a86f3b616ce55adf1dfe9451ca48acbe210c32ea1cc574730b37d4747b580c66820caf475858b4b6ad0eb7c06ed56b8f16f83595ee3466bdb8aaba3bbf35a177fd6645610b9dc238571e81b27b94757c9004a4c512cbad25730bc6f85255ffdcd052447766219e667095d4058e5f0045e16c0fcae1aed8dcb7c25fbcaf29a71a8abf72c398a61b1a57bec4b11a8c746bcce3ef0f82b9b2bd702d92a7fabc1efe0065e662270e1ab664cb1197f00983f1d265ff738f63b93d5d95aa4ddef2ea3f473440ce7ca1558b28fd68ee09c7b97e9d4c2052fb1dd657ecf09a2f664de0902f23bacab5d64bd449a0ddab34d4c0695c67ff5f6e11044a0db15d2d19a9ce2aeb818f0ecaf8c1522276521b0193f76e2
 Output = ff81d45deb69b6890f147710945d1b750cf17e876cd4e694158efcaf4fa2cb15
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 EncodedPrivateKey = 078bc69561af0cc77acc291fcb063e1d7c82bdd7cc31d5b44d1aa746e261f2a592d4aa9165c2c3755aa457b886cdd55840767f4fa0b19e45410872cb1db3b8b5829c4ce9b2a8969330cb5bba2397119310fa072b7053b35fb135d04977b9ab4766c4c1ecd9695957473f10c679d71d2f6b57db2ab0726022bfeb10b61807d35447a141255bf5b3d0e3bbf5cc3ae74932d87268e172978d78b99daabcb16b44bd578f6dac130c2528fbc89ffa94b48e6785293023e2605a8533a5ac17c15f34b1e30501729a78d3b8ac6e4a329e1006e0c0735c737283856d7cc7663cdaa1610b1045b7423ca8ccb59ca6b1c482dc02ba117c17588809ef8506f09a7162720142e397c6ac0f8fdb02e4c1c557050af941ae8165ae01d9228f767ef1ac3d72f27cf9a2282a6c379a669d01cc0a6c560b21169557b88771008dad62641f435e0780234e86c1ead05f14c0ad68b6b1041492a166bc4a278b0d352129556d55f37ef8969b596c5e41f8597878c8c6c83de675019c022314215eac667a7b559146478a4a5634ff193f6b83673072643efa59c27650fec168ff17109577083bfa8493f38301528f27681405693345e523ea4398055606d4ccad9df967fe59428ca7502f046506756a6b9a78182383db4baf05014fbb20afaf148456126fa393abfc480edc92465d93aaa158c2a8493882b24c564b607cccb2c8f6cbb43abd722c74c2c63230946acc091c48b865cdb33edb712c670648b07c06691687685218ba48648fa3054ae7a6a663aca6aa4e66506516100c8f2caf9c0645f2554c10c480e798b9c96756e42cc8a7f626c2759d21555342548e0490420df3a8124b0566b1804933b68225359cf66caa599c55573b70d488d16185496216cc09090de382d570795efa569aa5bfa8f4a60665cd30d63bb36cc5ac050310ba9bbe4b3af2f9400296bd344cb72bb623c757366ef1369c968578eba52a092dfef34aadf552a63b1495a5b78168cf6e58b218a3ae64310d16734d5e72b2036bcc001ca07533085548809bf114a092225aec9cce6950a953773ee37ad3467bd5ea0b4cc4c6b0695a774781ce17004cd48e36116776db19565367c92a94488ccbf4ca3c3960524d1b13d6f77399ac625de5a2d09954cf867011f79bb4c3682cd40f133a9d67778a24d7cf1a5b71b7b81dfe335d0fc392a8b12b234950ab79cac94776ad1b713e99b0f394aedce739a15334f19042f4861e739c839ce07da145808260b159625b5a742258779440953c743c591659b9d982aa7da028c7eac4390b47b243ba23e8ae4fd9c98042a0c2d25a6688c9ec774cd7e95899fb7f081035b0c4217c2903688ca7e4466e66ac4e3ca938fd58b4d6bb732a36aa8e097fd75976d1200d61a5c988c12702698b1cfcbd93157d3d1c6e76d316b00b4e462588bbf3c480d8374df3cf66a16f9dd2ab721954e02a9f8eea4380c381da230f10c2c7dec02b057177e157cbd5304ab1d8160a323fd5892fe1649c2e270dbd3777035912dc0802f4d18a56356b52946f30c516838028f7f39cc22466ed277a5adb6864972e1063b1af0709dfd60136b16a3d6c863a68895677c488eb1d879a69a5341a695212066ab848609cbe331704aa56092a4204a2293e77935390cb1d2b2924e0bb27d4aa471474fed2b6982b71a1c14b2cd3ae12b12d5d12919235caeb8aa3827c844bda40f5f57e5f59c75c86b645224b3a861eb9d9773b01cbba45122bfb1e4a60ada0fc10f133c546563661064adbf4a89117657366789cfc282f9bbdd0547029c92aced02963f8cf462326db19bdc980149ee0823ecb1d9e22a5effc6cb588b17da70789d813b749be180457e82a5c958b069551748e12bae79cbc0dfb5ecccc85f565c22eea1836b52435b023959b4f4fc12956a09f38d58836891c4c2b0b4502b012b868fb9bc0455c12e83c182f1637c05469708279b1f4af2c275e174ca5ed0a12b39849f49535b8ca73089acd5067b6b57297327c4cdddc7d5c752a5d2cb04c659d04f803c72507f5832e7bd528e903863b932d80c51e8b2833684a084c7100728ca33a4304c85b8cf7b61412e76373566c34a75ca88004cab21a3274bca1ebcbf34222e351a3df4b557f09904173065b460d54210511f4515180b3bc0a87f9125a0a91252c1146101738f8f11e10897f9b1b16cc7c57ddfb3e4f6b01ad6239982baa07c56c05827e838c1b4bc99f9cc40608e74ed2d123757aca9d8030a0857ee2676db47bbcb1e10badb32508b87aac4c066fc747ad09a52177b378fc1446ea5aefcc30b0d744d2240e5e94c6f12254945223aa93abd8e71fe926a4fafa2a49273d618a0a5921cbde9c6f9648c6c12bad96d080e39ba128464d8f496b7cb020ebb03fbb2850a7118a7edb1bdc438565ca33850c1b1bfa6be29b88bcbcbb3e6675924550a7427035f60000841603c2b4c9f22040f9205c9386cd1b457046b4fb1521e4fcc47c1a0e7fe072bda26946762167d8bddba8c6d04470a2705fc05a6b00c4cc54409499a4859c4148b2a7596c8c7b2e597f0912742794495491117fec96486035f270363fb88511f756238ac9faf98251ecc06e1495337529b209031c0008e4250f550c3d476352ab82c8ef41c4b8203caab3b81335613016cb71b6a1f2c9b71158526cda75d9057c7597099789782b05164d338593b0a9b5ec85e0e6263c6a54d5a06ab4caa6c8db5b40e099f0ec7c00628373c3189e6c129b76827d160783f183ee14151b3b92e72bc4c65a06296a88b9f75948a18d50f53381f59360a19daba36939c3af104362d725c62f51b72ba1c8526c0be6a36930e19de18c2b1e470136cb7f92d246dc45992879b3762c92da6b97c10a552ff7a8b56788985814d2f9c5cd316dde3b2c7329b42f7492917c9174552219719575196844144a04a0b6718158cefc7833a421016b5193a5b965eb7b689698d14a41c03a408f8713aa46a077eac06a6106796c64b67117acd1bc0220125f4408222159503864eaa8824626c5651959d0f4c250c0002ec513c0817a47927ed99467c1eb6091f91773495d70084a7c344f41e0967925734ad846d360bc2a73c96f754b065112f1f472fcfb331eb8a286bc69cc1486d58b2d4932086f40c90ec601035c3016985962da0ca3571f5f36791a466861527a1ea52dc5a6254303971ce841d165985e2c02ec5b6a92278106117fcb377ad2c6c48bb24899a519626c74da9a3b026623417156aeebadabd418a0a8bc0bec5b43316ba7d7c4145016ca515ae19932a50819ce609b9ee9997c29a9af03a05ae9aaa89aa03b4ac5ca887b7b05a14d283a42da27ed7187369b0108165ef403550c99cad5c3cf7e28bef8a83ac8867341b331c9c02176520e0555af9b8047b3753e1928c849a13900545ba7a5c16bb9b6c689102aeb73eac0c5aa093a1f92810472c29642cd2a549a32bb9029961f6c4a20876ba8f4ab5212539f543c9d247355a300467b5a0a9d130613549d17a185fd045495f06820684c86aaa18a89317ea34eb0923d5600146497729fca9a66e9a544a55c1aa6841c556cdfe7ac0959635281c54e044c025c5b466442f15655474928c617a646c7178bf5b679062ceada6c6d702c22d339e0d3a9563a252e36287fc7975725bbc1a68122f4579a34c9c84318b13a76254c6be35a1ac3b26a8c2b373c6378cc20a7de414924a38ae7e8423fa1a66367a14b198f9980aeef068f346b208aecb13d827b3b5ac088878548171451109ce1535eb0a18ed1c1c677f9ca7f60501e1986ac19764849633c408d476540d6290738633a2e711eddc883ecb5111ce01bdbaa3df0f381facb31389249e261786f79aab0a80992b9a74002c9a7432fe88243f4276599389ce8119b846a75dcaa8eb300a7cfe266bbcb3742bc1e4dca77b986be341a03a75644dda25805bc50818a05a8495fb351c0709a5c37a07759dc0c3a253a3c56740aa8095d402bc65554880c2919dc6375451be6186d18da30c2f35ee4f1abfdbc594ea6ac5799c1d9912fb173044ad995d675751294489be7674d84181f4aaeacd9951dd0be79b919e585560d0b090b750f2f667e2ea21e283577e3aa4f6b11ad2560212f8309fad233ef87c6fa37480217a7b3933147daa29d2642cd582a3ac96ce5026135d5376a586f4604a8d511bcf5d09dd3e895fc3cb7d90a2535a1c31da1b1df5562e1b2a86a116212ab10a6328d2b80921c3c04ca9a4a9424bcc3a75e649ab34481561eb0a0920b71c245c1789770df5a7fc9136d4b573b227614dee4b23276af4b6c3537bcca67b59afa0119e668c910060e04e7c94a1a7fe0e191fe22cc727d12dc6d0000000000000000000000000000000000000000000000000000002d1ca62c220d1a0581d585ab445c7e001ad9056b3d6a44c8f563f136088de171d48790195fff2c19f221b7cd8637576cec18c29a4a51cd07c82eed4974c36e8c
 Input = d4952da07911c8ceb643e6b3254f7fcc22242a88df735c9aa9a91fc692f32544b7f30fefed3311dc8a927930c50b17577573f858b778294929b123b180498c22c1ddc92a11cda9c0da3cf300664feda28bff6f1873a682451d24e2c2a5991fa8aa29718a43c2b379ebc7387fad5dc9e3681d233641d1b805b167ae52631b3b6ebb0aaaa6507d4a87a808a1c3b62c97da49c02dfa2c729693de194a1bb1643fff14e0fd8d3749ad33936e8b4f8f6f3106c08a8098c6b903d1cb70c2636571253564fb7dbe54b96b1f999749d0c81c698934756b455bc6ec918ec267b5e54a0a812c62de971d8ccd93e4c1d6752afe3d5308c5257abed2b1c01d0489bc1d5fb5b2f4b199cfec784b2bf92dc85904cf78a9a6c0fc3a9c5c1640f905fb8fee2e08b3c0d5fa029062a5d41c82c512ab0645e7a1d728e7fdbcd95ec59d121fe876b1e6d624dba73cf68f35b23bfff7a435a5afc81947587b60d588c54ba0c999242830e568c3269bc96e001a99edb6ccef086abec634d0febbbaf72d872eae8c5606e86d9bbe279395c5370647f245351ae41358cc26f5447c37f959396dbb03e484c80dfcfdf93701e849e081232e85eb15e034b5421dc63c62190ea54a83ae06c89f395f7cef8eaa41517345a3a0aae4705529d3c2c13f71418817287c860f062c6d0c5ee918c50e613164dfd241533dd08928fc695f3b3c45cd75c740f76f6a896cceaafc9afd64deb69db89cdbd589fd6987b1f5da8b5b9115d675d3ab6cabcd0f793f00418c97b673fa31b851c1209140f76492359f3580c0e4de09d2a3efb2b3dd4afd4abde0e97180b7b24a45063f07f82771991fd2da92e12de7a868e6e84dca6a318dd8ef3a1ae6420d63051306d0582b058b7a96f25766aa0d863059483e9c7a17748a268e896f0d02173606e4381b639b480fbf0b3541a7c1790e66810e064cdc9d4e176cadf3d64ac27648467cd0b8643ad1255347cb6b086788f6c4dcfb3363cfef54c3ba5c13562ce884b53b09e6f149a60e1fbb35b65261406ec04f4146b2de7c61c2fdcf0f714981308774af933b710d1d4f315feefa97a581a98dd083a4d31749e5d0af2ccc2109cb739f8bfe85e4e7844dc3907959ff3c04ab9edebf3317f354c5e0aabe4de2e0711ee771b8dd70a3008eb9936f8b6924ec0dc9897a801e00f6738ec7f31cef0db9608d2c3d3683e97befb02f0ecff93068a46e57c97201608756dc45ca8bad93e0f562f5d74790c87d4ffaa67613b89c22339115d7499a2fd038bc4533e46bfb5eef28b06b8fe9a3182c6a8b18286edd1b57adeb55bacebf7c842d527ff5024c0ffabbf78eeb956a5127555894ca8459d99df31fc0fd1e1c5f7050d2cfb427dbb2f67530e049e23f8310b88c39d25dacbd6c7dccb9e382b0b471980d54974adcdb082825a9d6325cbaf90030a58193d5ef0a4e1e8fc885f04329253408b4de1d25acd097ff10e0afb4ff344063edde277e49b18996cfa57a7617b395a54731052a95a3cced450d38a31f19811ba278c60097aa1e3c91e87c57486b23ccb07d687c48fbaef4e814f9500b1e6f679a749614c86197239936be1f7ad2290b9a421c4f2fdbd4178a75cbb9cb1f7eddaad9d369f79c0e383fc9ccbbfd5e4cb93b211c477cac2786395e92385a4c0815d0ff6849e961395eba07c86e698d5f62466492efdbc326ff7c955840ed2877919d1cf95cdf5f557ad069363caa905c97471c85c5d0e65cea1ca90df82a0f8ef5660f68191c1aa19a180d18ef4a7b0dde8250ff3ff0a97dd4d65c3faf1e3a426f6c4b64f1f2d65ce9c5e5921ac20197a00f2331e810acf4f6b71878f1b785a28970d844ab4b6d1a604824db09f15e96bb711389114a4680b1c8b19be73aa5b039116c7a7cb7d2c2b026f5847afd6d2ac804f4ca24554f5ab27db900a159579efd23d78cf5542a038744cd6bdd64a3b59d233b878b383bc0ef38a0a2a8ab60869b64634df1cfdf3b53a367d3bfbbfb741badc819cb01823a8e8e16f6b4a35c380f99cd45af0edabf9de4fe2e5b0e6c34f7dce2c8d9a4be2b2b8951c27080aa965ae3afc422ddbefe0da8f766c8c63823050d1ba055e42352d305385ab932f99c0309dfa8d6362ec1c07e33909ac63200787f5963653db6ba2994cf308c9763a153b6ba824fb8ee94bd6a38f2a12047f7e0b01d090aaa41b4acce8396c18aece73cce364a7e6d9d
 Output = bd452a700448a4542a31dcddcd0bf285610aca6570d8bc85e20e163a13db5663
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 EncodedPrivateKey = cc4a14e75a6b1bf87f11a240424645dee23657db9819ac274780c2d7d8ac64f2cb82530b40a078791a2ae70aba868253bdc3045b6254c4e29024894cd13723edc7461a37403609b48f79b8e8b1018981bca9f68031dcaf87528a6b065d8cb83c142ba20d68a728a3866ca88e6836cab209ab49bb234312916e432fa51152c763a62cc53da61480691b07a073be74aa6c2b88468bca8302a23d1d6405ddf4aec2f88ab055b18e2b1873862af6539ca83b1c270b6a563cbc7a220cdc8106e6e5595d63a26c0cb86ff11b48066721634b43b361b57a5b4ddb2967d232d34cb750026b362cbd20188260c6a856e9493ae09c462bc4c8663c7903112488b06b2a996dc6668e382e9cdc93e52a1a368b07d8388c9531afff0cc4c07ab423bac717dcc888e213e3a75d69a633f49745bab10f62592f59d53ef19b6a62f0b24216aaed9c91203b7ee65b9d097cc1e2676deeeb576ceb4fa4a867ab7310076a912a41292c658e8f75a98603612558352a5b7beb404fd2bb6de18c7ac838464b6399182536509624e1e25a7821b71edc57c35541cd115ec52c13a739c3de231ada741274272383cc78bc9869d37282f5980209543c92b76ddf99c3d45cb7409b5e44599b75412d8bd122460905c250a94dd4052c0b0a91c9a906aa3652180fba9212046b4f7ad14f7c304780d553f19487b8b7413de732ba1296b41a2d94983d4be93e540a4a4137a030629e97fa640c21ba5b7b5537a03a2a958ec3a888590a5c14a904dd74c83631264644cc6689a245f833530124f7d10e2596a8be227f270941faa75300bd731c145f781cce52247418595ef67c94a170676cda269e51c7ddbc63b6765b010aa061cc576696c84345c35c491d3e4626efc8b73dfcb481c11bbf8c79c6a3aa4e54c43a44141f5c35932486320567ce37adaf5241bfd8c44ec140d30823b58223b02742f3e2bf5864756d528ea36348c1c2293d8ca050b6307d71a20a036e0060697b58a0ada53eee5a6990a9cfe283436cd36a02dcb1a2b7200a267c3f133ea6423bc001baeca953515214e2766f066cae531212dd3551e22bbb1c705f21753ab60a70f364bf1949901d9a0415a36567614c1aba2dacf2c5435b4ee66193c5e461596719790aa792d5a09ac474343509ee36ca048751bd4b0c644b2b039b1320b2294df814b419c3ac55541be5cf4b93593aa4c099142de9e13699a40709d70070aba9227b6c14f216d434c9bc16112b8b4237f838340a5c317a618a91170709bae6a7c13cf96851f72a8761736c452df27758afa4b02fd55b3493b1bbf96dfc45ac743718978b7de8a017eca45dea633dbc417f856781c856c87516429127c6a3d335f162ace0982235ac79ba0ba68edbc1eafb9ed7a3597ca7a612a9bf3ef2b0d1d7c238e98714a434b8b08b35e3885e007501f9bc06e841921521d47999db3ac3937468a54b95b57a2bbe34aeb48ba57f0744021bc684456a8ed413b9192057eb77a5502dbc89c5964c0383b4c9034396da209279199ab5830abe9386b2e811c222a6ccb0cb23732a95676fd5c0376505943ef8bd67a95defe0af7cac395a743bdc3119b1a74771343bad21c53ec80cafd7548ae310293027d62960116a338d74bbaeac359ab3728e268abf75a8d30b118141bbc56670dc0c5b2d05c9c2f03952338170754e20287c99177c66b810f009002c244f213891c5b980aaa23d15f413d4a80160d24e692c450b68c8c43ac60256ad748ab6aa85aeac5c623d199928f88b04ac7bad2c1249c18fe1b867a02a353a112ef71368eee3210f7082f8b216c975070e9a1a27dc265698bfe4849611716d0fa1b1f9047e8b0905d184b1fdd863377353fae732a5d0388c3c6606a773360734c9ba915d49aa7d358263d7abce563afaf382976b2ca2e1328d4aacdfd78851eb143a1b81c21713442421bb1abf77ba25d4355dd10602ce06754dd9a77aca0e25b1260e994d0fe1b83088a5d385251ad5c6a54c45d93a7d1b25cfddc1612b8b30e753814b505524a5b0b26747645c9b636543ac7a871b6a7cd3865f1d8636cb5210ae9157b567b2ebd17fe3f59b73379d086348c9806848ac3ccc1547e8964f6a1c4b532787dc8620050b7e628274683b79e133969ae154da157bbbab159941484cda4108c84aeef56af6036a8efa3d74327dac2417e6fb05e2f1c178023b70214296c3ce65151248533f43a4b50826b181bcb51fbc54279397a6e50113635faca0cf7439be90867a4c548a9af0704da13d12c7549ebcbe5b279afc266fd83b9c4222b717b86fd4724cd0a35238abc2c3390695ab975bd38e0681b67bf86f36cc91af700277998ad3d700e6419105dbc952144561137711a0acaad546e76c66ab5722bae1cc110abdff7044b662beb6acac276317a7799f7ec6bc1282c87cb284006b3e74c361e5c6c8b899ad122880a1219102404fad458170f8aa3576750a9682c830c7c8796daef63042f3607c5c059ff98b7a093ebda2947b861f497202510a6a2cdbad3d7ba3b8da61f02671be3410549aaa9c3140635334f6b4385cf4105ce791db08b73f3ccebac9ad93f1c7abf6289721568d601c2cf5ae2e4690ae0c77b66134f3e1c33bf82771491da4d228ebbb7077312babb47e1262009457a3caf60f0e47145e29a3ec3b37a67b9b418625142937278c50344c05a0a606fe43c229749415064556a55dac28321be77a256637fe2b8dedbcbb02a29ae505c641b004f970b051e028d047cd152477db673875148b71434a80221166698c3cc589374634c06110320b0f249a3ec4856ffeb478979533be7a333eb144550939b00164b6b1b545905612dc24775ac2e4bbb531c6763f934121a8a8d804951b05c8f9c9237046245b422272288e333970f7469a78d543132055c8781ee308382398a7bff70f62b7357bb8093624a3ebe3169e957f3a33019fb0296ea1cebbb484e87b04eec76a3e29cb38b451816a8feba195dfe79e820591d7e73c50139e2beb847ef43e42ecad64b533ee3857dcb35413066c7eb19e8c1bcc42c9959c13ccc4bab6ac81b44346261ebc74af482e34f855e08916e0c1bf33861fb6d706c3a5c03bc62c6d97cba4174b2441a32ce47db7b8703452bc4693be69a4c539c6a6b744211598cb644209e84a711a05b9116574c7a222bf459305f10a68d4c48eb72ea16526ff7619e8391032685e244693ec24b30a257511e00ada5a69b6cb75c2983d53157fbd708fa1e54057757bfe6067d242cee6492a51098913a6b2bf888ccb280dd3cc48c6a95ceaa5a844338cf4985978929e9ed153819b97dbb944e18c0d7530a09cd420aa7ac5f5910325d02368c602d531289db188d30c6fba407f32c41e80133cea869b52e8091f701c3d7a7d4b317e9b0291f05a652165695130c6cb783b18ab1ffeba0f72d2c21cd9844f8ac2826267081a4315927d9ab6123fdb0193f723a3cc3738794f735b1a145b83189b71c597bd8248ba511b9463b9262c80790a09167720473fb77b1da2af8632ad793c10d1916868b99d2d23a06875769d7151c9a524aad51eb4f20bc58b4c572cab2642769fe444362533a04c7350b3c5eb418785e13e05b5459ca2c856b1b4e1b266e9677a27d29f6dca61a2776c92dc9290c04d77d7bc7cfaa8a31a581a623cd1c046a488080ffa8c13f66f4d262aba53cfcad64313c5c2fd838f88e903fd3c7da0942fbb3c84f4581457252e8248a75e185d4b5b64e0634b2ec5c5a088a6251c9c8c76837c95c066a565f9fcaf0cc76a79e1a20fb05a5bc1bcdef32deae76105c581319bad317b7991d062ba1761cf1accc2b969ece35274d7b6a3c8c79142c43b14772ad96fe2f296eca5c9aa4b68cf14c584792b1e4ba1132aab4de7788dd642e307a6b2476caaca69a1f7a3946404a440764e4446c20c216da5965c88bb9e09c165b93845c68a5674105884c46c601d35737649815de052cabbb31b39f95531286e08e64772213280ba64b6467d03ec43c5911854498656a831a366cbc256813d451153a3610e6979671ba7bb7ba41dc832a81885589974f8ebc2e57a1709eab2ae9931a09bc97d486839d6a16b29b7de642aaf1861c31b6ebe82891896b4e75b2360a776678aab892b81c5e2175eb588885b980ca02e9ae7bde1dc6346a13a5964c4391b4a3cc776d9311f0a9706c2c04584d05b58624906417eabc95738407ba197b2a14c6e4655396575b585f7c2a8b262cfc7c7d6f3a1fcbbb4356195b502ca7b278133614379176f3f4aaa49a040c7672cfada79ed5a2400dab4d050560d8a30c3e57ec6411988e941622c64b934833f9225daf42885a5b1f7909d65b5000000000000000000000000000000000000000000000000000000ab6452d0cdf5872a6a7d3c97f59f7d2be589eb4ccf832936a00151b5443fc707a9e4a0d3487b6714e18bcc9d1daeb3127164328a19d5cf60822f3fd37a24bbed
 Input = 021a27d9ee3c76b205152ced9c68003eedb09245954d50316a14a3e1d877bd9d6480d479265cf7a693e77b8761f11a09c1c30d2fa5f50497ae6a4d2afa3e61b0b7fb4b3504024763ac6c10fc2e6bc77dda7fd837ce115b84b1d0c749e8e4a961d3e7de1bf6b36741be282f9df710b46410df07191c3207dd9e74e8c4d43e3c75607966a1894e86caa95cba51a9c3289b00ad0fe59c034099b822654caec138a1b06635d1de59fd469ca3e928deb7873cc3dc2fe03aa4b5729f91b940f01ce83ae5aedac13d0a961cd9420584346346955780974ef21ccbe3208cb019f050fac0b80076b48ac6c0f3c2aa2dc3a13b914ce5343c7a140186728bb335a47515d361466c2d78f3fc6250f13a4d4fe6c8a587512700fd5272c9de73eb698045708e18b86d6b6692e3afa1b73e5ed55614dce4b8e71ba9dab03a246b1469c617f5bbf3e502632b060c7c17145ba7df290ec310661480de58a56cdab7a2e5a8e298746eb1b7b8703c5c650456c567056451e209148059a59af315540e448c0c6a7f48df9e22f373aca8be4df3bc9bda80e94a92634a612afdbfced39194e124c07748328698cc21f39de459b4cb08c6c73e80fcb6d0d86adbea470a207b0575f180ddc0d658d7ae66b2166cdecdee265a02e56bc4880797f0fe09c081788f5bb507db2406f37a2743a3c22ee0caa51ab62ceccaeaa9e189ae412f8dece857b0faaf61f81f2bd968d0f6c9048fca287f74d954e48ecf05806a695d06bfc66ed8b5297899dd4b3942424cec559c33ef0da1ca083e7eea98585f89003ae0ba98fb3f51becb80094ba0091f97b3a32c635a12308851e070f4a94502be51fc6f4e11bb7803cfbee43135c82bdd3bc82d58383636eee387d2c13c1866982d7c4f15f0be3bf5f87c8fa5d43daba703c73135ff3aafe4cec43abf9c1bcd16e56d6df85fc38dca4d09245677ed75b585722a9b20fd5ffe9d0436b3fb592ca6982ec2b96a8af589296b0b0ffcae14ec9027d4815bb9b933470a357d0afe5aba5010eb0d93a0fab2c28f84d7091e607505ecada258a551238a2ff68621bdf5ee1246c27d6e8673f1b785f7abc9b88310e3c1ca5e266f2c974d1c88a31e27a102330f924fb3713adccfd09c4415c1773c8da37e4e18ef274b00d462970873b54ad108f588c8bee6a7b4cce157109aa04ba0daefc9b5119b3ff9f70d4728574cb9f57573f41760248a8a8cdbbf7492083cfbf585c844f03ee2e08da4a08d04717b6244b63bbf80d0f4f0477f94de7ae6b2883388ba05b27ffe8a497541f012f16bd9ec50f64cd0d14e1a6c2be8c77ffd39d1d19ef402b46c0c41718ac406acb1b71fc044b1f93a4fe98fa8a0bbf09caf9dcfcbd8e8ecba42e4bbac9bb5de40f089b86ef71003b92a3fe385bfe603b098185d05f43819f8686b4f4e14a75463f2026baa66789edc52610ca8d3d5b11f10672c70c80effd7ba0352b2079de6910221ed21c487a7367cff076e84e1cd3ec625065d7a9b8ce4eed9d91c8a72b16a4a50d96b8a00921695a00167b53471e79aa445c656fc0d41da64d836ac21a34be767c514d1571e500fcea435d1a1d59a6d07140ee4d1a4014cfa8a6f0be9c334ebdea053c842a06124dfd165232c1a2ce63babadd8a56fd78ffbed64b63bac3b49e5af81c746253bcfdfd045deec785e0e272ef8c7151bcefdad6fa2bea962d621abd97f9b5cbf1eab792139d16b51e1f732326a5e02926817ed0bc4c6c4680e42e7d5847d6e0195c402e59290ce8a8f040a70980eac1a0bcd3867ddc0f2de9b204514011491c8dd63a371d331b2edb870e76e7ec5b27146a0097b969a6b157d00f66ce53b71598b71869063b9a29b23f3623837385571962ac29ac868301e2ec0643bf639b074c8a28f0a66acbd0ad77e5c86d01cabd8fddd77a4fce6185768566a6d98e679986aaf9978c49189a2ef1a218977f4d2c34c5027188d816cc918061ad13421be77fb910ee5aef5e159fb74169d7763b446e523470409c4fc4e76aa6d98f120013d4af284bb0a8e9eecff71b8544f9d3815062173ad6d4e9c4727cd6395bd3da54237501c73390cc5c48683d780efec478d2a15a40a5ffa3455f52c092993859fc8ff9c1ebb308ed03b5b88f6de341c3be3ddc96f695d68c1562b85806e162f1b07c5f10a1213f8d85f6b7d92e06d664cda2ddba47b93e2922d30c3bb110405fc7dd9213812
 Output = 8d99392e447dbb7f7eefd329325bd71d1d984cfb01fd609c3283a84fdd0f0138
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 EncodedPrivateKey = cca22002e0b84e0c0fa98c902c2a30f0d9303a411db91a26576834d4f1645c181bba750c42ab6bcf401739f83fe2a4a3aa1a3f5917418003aed863875fc044dbc99c70b27758389fdd3cce51d5a13b21afe1219f0bab5dc3b15952591e6f80068b30870ed644de082476e7b32d3a531ff8631914c7a5c106a5acbf8672ab4a304afb71b1672cb281438f0fdb1db0f52948e8b0a1422ba10ac5e0a480e87bb844072e7a134dcce36f27274775fc6a8bc611b2a33cf85a4820e18b47b24188030fcaaba998d84a68424c07f4503abb553ec33b4be2af3557aae2797649da014dd0264d00ce74431e46f8969276b24b359c6750c5bc15a6318c2d06898ec5f473380a68302a91eb562fe4f10596012e5efa83f4c55a19912978a6583e4a884e36af1b9367e69ab0566c3cd8c34eaea615f49c094bcbc63d52a21d74c02462cb0bb7c77cbaa03df988b60cba880771a7c179315a9f6ebc6e9b8c90bbf17f737508b1691ef1952363e9499b5007a9c84838c2a149478e4be76c0368a8220b9a3ac68ef6560dba6b3f68257b6719551d83c38f73654fb392af0c1c2517851fc160c343cf826aca2c5614726c774c758e1abaa9ac04ae0742799060970909cbc2f78ca739c71bf6528f0695ea6175a4ac13555c3bcb9920bca3a37d363ba622666e54a4e779cad5059612792d610257a689975fd664dc5081d5ac4586c60e99b9a2a17ac612e5a794ca4dc097a71f72bce02b4907d69d801a22fd7b88f9e4ab284076037a0f6ac803bd7b243b835e51873919d3b77de041bbdb9c2917338f0c42a54ba6f5539d60e827387a9e7c156155d693b85701b53278139b29858785cb59788ed981d77556d27390285bc3f9408cbdc717895815d31641d0c31f2d911515f36743c40f4f3517432c620892149b518fecc80cd2d14c99730e0c940dec155930dcb5ef861b7c80b55c2223f7066b625c9fe5f0cb04f0bcb880119de142ce511affc01d483ac8db8b73e504b242315533d9c02cb64d15445fe32bb0c8e19383f82854981a9ea465b05c77cfd66d97a2b262bb37398cb4654a0fc8146c00b7608f061a216b9becec17f686b93d88309a7ac04c2447030b41ebc6a95fc52466d36dfd461bb046172f3b83fd10bf79c281202a60aed8467748a986100b97742c8d70c8de523c1d700489c391096c1b92654064cb7e35d7b25f29818ff39fa523c88bd69b8cf41689a414288c492f2a83f7b34a4d95770e6144b7731057c73a077a471e7b378fa48464c426ce5a6566e7c862131ebd5a1b3df013641a878fd702d167ae3f369361666514d98f325679c22aaddb56406e148e744960ee1395866acbe095542a6836571959a80238d037260fa053a52cbbc2cbc035e78fa9c306ebcb61ce33422584009271835ac3845524794f18bd7e1b4c034832fe68ba24a162815404f65c0af0944c9789b1d92767268c801a0444fff50399b3a192131e965523bbc2c75c286c96450c3f0733458bad7831205b1b4841a617626b4bee232cd1f220edf53b59bc213a055d956591fc3518a1974582f79a66dc8892ba71ccf7a5fae1c01841428525c32dd2b433445118559cb5447e3c851a0cb498cf99c2d359999fa3969fec41d1311ed2545f5281a09df223bc4918e55551ec060dbfeb41c777c79acb7375215002d9afa37b5a126625f7445c3fb51233650037e070648c924586bf7013c203e907332901ff722c35c1991acb2da41cacad4b709ee242a9e71eeb0ca1d05595fcea8d175553ce689ba595b8f98707a68a4d20f8a1fca8c34c3482e88c8b043a9d42e4a9e55a6cdd867e106b271031355bdc71c85c80713c0ef7c3ba3bbb9ad4e32615a2b104e52dc5e7481e258351385f9c8932a074529e327e6c0949756b57ef47094e184517819d459bbe35ac6154a70d004490b03803e58c9bbcdcbcd8451c2b0373656373be77a59beb2d47410d8a8631745653a02956dd0a0fe99ca87d78c273230667f25bddf3a65a216921a12844b8c98c197026e14638a97fa5144b44189621f00c75857fca20342a09ac44a4aa6c336d9ae58a15972f22555139e2b3e00ac0bf67b15d64ca8ae77a79b44e5b47a72ea06930aa9695b96987aa0dfbe63d83a352c9370247f6b21f225e096480b17333009bb78582464130612970cafb137f0e7c060db72de03a46d8a860b0cb2a45b462e5530eb566bcddda2315a633ae5054957cb74df537c30777a547b0c6e486787c74c3d242ee34158b212f4fe4107885b2d3da2224803e73bb282cdc8ca0365eb70751c3263531b31dae5a29561316003b2d781790cdc2ca09b65ed19995765263f06c8a1f3378d46c19b1b46a43932952a37e4c828e99f95404075b013b7471070422fc65f9c9965a1c0cd0141472fc7004f6319b548c19929f792ca0d588208ba4628cf2bbf7377ddac05a058308b7fb92cf55584a381204523a460310bba06a88d4b69cf62fe2a71097461a8c3b5eb212337887a34fcb278c59931f28a0000227d9cb9b1b3753dafa63e893c9783764bd01b7f668b83cea1e7fd94913a405babb301ffb6b57b2845cb7cd929c0acc7540e1bcb196679380822c7bb67f732a3c9ca778b60451fb03755ba151e6b0bacd1129df5174ebca123805beb8e91b840b70643713272ccbcc2b80008a46b3a818ccfa6ece2c3364f373fc8c10ef4b4c95955052f99202362bc3020cc2528486784784095fbe10b4a44732a2c6c0b2b50d199a93c544a00980baa2f5cbcc6a3456eab71c2798d04c9a85827b8b654c962b7e4125cfc0f82a59632462d656b9b96188cc89373a6165c287bc890d5ed9500ed08ec1f2822d718bb94525ce81cb48b4999e288b5c90bb7e3647ab26a7f5479199f9198fc950948605b9aa0c8d0b133851abe4d77aed7455b70410b54a00bdaa166f0b4712e3916a70846840c8f3f9c80c8a95c912bfef188782974eb372795d96cccfb6c9209cc2cbec64bcd064e238608ea46f841ac02d6aba8ba9bb251a381777b50570a5c79257a964190e56aba3b27c708803a2e6909a6920f546c509a7524d138a9c2c839f34a6a814b10ba4642b7214e447844d553532804154b36f688715b203cd576274445c98abc60192f603d970c988b42d6cc250b4349f2d91b50c123875c608c932a7f85bae2cd54b6de80be13914f2606cdd9b03ed83219ae5623748972a657e0ccc41579b745b3abf6b04b50b945f2f2963504bae804a261254ceedb767e252c64908abeb94669a94cf511b992c475d99939095ab9b19f74f75d30efd58beec598352108e1ca648b5f31bc7071c86aa97c5fcb60bba8884a3c72414916bf68a277a82b78857de531611ab7c7a111a632a64704458dac97dee2442b4b05a378baa74f34154bc8c191591eb2196a4d3174c3848b5f02f2351211f605b2608c9fd8a101b658599b87c65a3c2c7a266c02b3b8beab84feb0071c25a50b23ec8acb1daa290cca2ad6fbc8280c5cadac42993c083a25338150231cd134548661d645c678bcbc0e7815da41a14e8eb123c482e2831a1ab0399ce02cfa1a39a41c714bd8c9206d6c8c922043a235cae2bb6dd1ac430e22947444ded7447e00a51c13308365aaaf4da9dec03495c73295aa9259d4529eafb67dce58b374066796983f06c91d034226aa75afed116c886927e135564e4000cd86016346b56d9864c7abc6211a72cdbcd32fa869cab01f1da8f6bcb84cf1441781c6baa263ea684cf96a1277e2459ea07c6071b06093985b047b791ab6e6593be230099308a79376bbbcd71492a4a4de83a4d70c290aa05b74a8c80fdfb9293317d10e07615acc85d762ae35b187c55060c912d9a2a09e995afeadb874a5526cef75fa4701e9e0a5c082b92ed3b8887f0bcca362b492369881373ab878d00054027c4cef0c07cae57b30fc51e744653316591b5845c0a47492378764769cf3846b263ca6e086835cf0197b5025b2a960097e57597327f28d4b2fbc6bb241863a2c96d3242a031171042fb40afe8a75cc2976903a603b96019f4c7420b77625470b62287e03239e5008c1297888f5322937457b9467e52937996157e50764537ca495ac75fbff53dc1e8cb77002aa7988604b0829976c8e49649f7446495a7548227ce61d963da3bbd2705a8dfc73f091c20e72b77f6640a14aaa30134a1b3fa7083a50cbc720bc9a802a4208568e2a2ab065db245628ef2a138ca1d71fb3f66d6a8aee513f1c80b64a0bf38f01f4979a975054dfca823c4165aeb1876a7a81fd6920974b516d6b3a1aa71776a264a32447240855b84ba0fa1d35f07a8c11361040da933c4c44e88417b585c1a1605c68ce4000000000000000000000000000000000000000000000000000000c07898c8f447decd9bbfef0871a28f3bcaa4eb22ae145d00ea63a463ed3333c253f53a49ff45b0ae588d417a63a599670cd391c5e9885c972593d09350bd7523
 Input = 6899d650581d8ddd73d6e7095d24e2962ac573877204768c66a78047649ffd373d4e0cac20e0b98675e6f50962871c33957b5a7ba2af2ab800ad728c2d0e70877cc3f459ba53d432d45f4c9ff4c951c35f14185e01a1fbd735fc3ed84063b579e69c230f41af67c9cd7481fea81ed64bf248c63f56f81115ad8255a172fc99d87d8fdd6db00ee407618c7877a2486b6fac3b8eb7bea62c24bb5c5655e47388f2108ac36d5e55c5511d72bbba65706ffdf297cd0788b4c34ead564e86e78c605359b6b344380a4ec73a4f64b7866a2eaf36a494c76adba39158a3d1d3b41973cad055780ce211982fee596ba61e5e5f7e44cdd8b1d6f866c708d20403760b9fd4abf31a0573afa130aab5bf7493b2365ef5437b7824366fb3ec967016e2da547eb61276be7c5509c2bd5e16d8812c034f6b4c5a7f5f489137385ad5697c4312042303a5d7f62e398bf5fcc758ec1475e7ba671c656911bcc32ddedfdb07252ecd0eeea696046e3fc9e564b2ffca11562191c4a1e4b31d9494961fb66ad44f24c4b0d8d7422df106663600ba380baf53007b6146c923412228936d7324a87050e62b185bf3700959e262fc64bc4f2b55402d57c63539c57272240f4725ea23d389b17d6af64e864ce3429c9c0514c9b384d79b830a9c6fe12f8781755d53b8af9bf81e4784d9780ba6ba0ae36f89a99289307481bb3955075057648129349f1e0ce4e750be53372f82c92230127280f0f393150c89715a43eaac8abf538a031155661b489b066e915505d59ba40cc0b5a4b8de7e731533fd06dda44e65f22b7931c4b8e34a72331d32798aee1c16d81e06eeef892e7858ed2e9c27d21a3030567e40a369e21c925a26712e1ad6344474bf8e9539027040eb4b0cf65b627623ddf81253c6cf002f837673d2389cd296f9abfcd38a36c6976b03432c9100c7ce9bc862d2c98a6dc2f931f62e471369bbfab644f8ae37deb65784e6f5414bf88cba9e6836d3fa3c0ab7ceddd81d31e94c612224270fe79048688b6d8d46acc7d656a647888a469fdfb6ef8c8daf78a2270c5058e9b87d2fc0e4f8a098c1cebf96e06ff1edb382e545387b2314b2f7d4a669dff20122a0165c285258a39e2a1d27c5eac3d79ce0cdc64dff98a8633882db588a34b93a1403f6a739bd056cd2d6531af36a2701acf47617024cd1cd4b9b60a02cdfcc6f34e4693eba3bfb32780c573b4482a5f6bf109c7ee51792252dc119a5e41a4ea8f25557b64e500a83a6d8a839c456775a9ccb906a733391605bc487bbd6ea7272325df31cce2093649fa8a379f4977801240ea2be8b1e6a5ac95ba613bb2798bfd1cedfc34c39e1c43cc094f8bff34607f8419bc3ef2fc0c37075dc49280656304d2f642c5ffe86d5cdea4fe96cc8b4451954e5d898f6cdf7e7ec5af447dbda66a254b964df9e8dd565d46cdf04dd2d19ea1c7400925be2105e45343baa9855c5236dd70e042d0153c904d30fe45d087b0f0863ec603ad74baf1836b18c91d98455f3e6477936dba7379a6072744be6d4c64bca89ac3334ba727e0763f0ea52faff3daa52de9fad1f27e566e7a6e85914a02bdec5f7a8509f80a616f6ed66848d4ce8920757fb7611ee7c70366ce847fcb62a94452dd2523daa21c759f36cd31337afe1a5c8e8ce8799c6f03873f58bac3649e0d0fe6adea0199ef6eed64dd1e2fe0bc606b97ec8ed1e0b567baec2816273b7280ac91b05fb25e7467e934bf79025f5b4060a813c221291cb307f7783d5877987124ecab1d9d8c8e36c10608871a92e8878220f593cbd4ba61c35d2805500cdc0b145cd6ad2cd614481edbc913733e3a5104b0006dd26e871df58f32047701b2420d93bdc2d0a2474f7d9927e7f196993d9792e30cdff67ae89bc6a27236a6f0ce0439d4b04788765943c2be5c9fbc0f139135ded84ce79d876eeb37f30371194c8eba42659c185a10c8941f9fe9fcc722183ba7e22a7885a66d8cd10f214f4534171e0836d86368cd04d87737923da8801166afb398bb345b5bee89eb512cbae07f192aa50a932a5d92e909e65443f4004fca49de5eb19abedbf57d066d134e096e7c63defe4430f8e1886bdd3cfb8077f7196584398589ced5670c7be91d715a20f51603db8ef35724805eb1c270cf16b282ce7c79111e4577a0a1a27a435c070d6b3e89dce1bdb53826fe9a05d86e586ecd950d27247ceec6d
 Output = 71e358b21b3b98d915b70e9b877e94159aabe9df32737c71c50c2f99d7a074e3
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 EncodedPrivateKey = 16997ff80976d1506b23c012e387ac6ca0a792f7481ac3c9775317ee3ca5267bc7180ca884d28bad6b5a05b045f33a9b975c6c98908d670550b874ca70a77424e48bf097256434b9d9b96c8b8149f02ba5bde9b813eb2b60f20da4440b4cfb05716bbfd86255a1e82941d2816caa7253e7368a4bbf4bf546f40b1bafc65bb994c34f7337e82818021797a431cfc664699bc22b92561fe3d1cd6306b89a36380920abbb466477549d1bf14364221c10f51fc3f7240de4c99b3bb3eeb9ac1fe12bb7c97888e8386da4a341a0be8f78a7b7c49f2184376c3c3784289a6bd9b6a03a110c228f72939b86c7a87dab3e093c0ade693a0e5331c48b761b070476f55cc45ba1dda14dfde01a011776143a4d29d48b47b0c6cd2111bf18360a7438f384a28d772177f648773b961a86637c946d7981a6b9f571a4c29aad07220fe081f1f18700f3c99ef28e76819f8d7c4c43d754cea21180c43357f3430bcbce1fe8952c691cfe9a7483026386a479eee4025a838df5c563b9f5a1882a2d7209a68d231ee82260a7eb4fc157936deab52618cba32772fa1440fb675220f4610d749a5b3b142f31b404d94d2bd816cc4773ec83aa1445a37b361e52b10960827e94171dce3c12cec80a1ec65aa6f117fe937673a78cd7767dadd3cebe0217f13c903ca25d6a681116b206acb46949b18f671a63fd2581a6c0978738460cc51df3711dc1215dcf75525d30559ab6bc52e16fa513753454888189348f045aee8a32e98cb2dfd708e7d42818115e5c61711a0c43e85a13657aadc24b5b30a04a43cb97bafa433204c18536337758c0db6154d4fac670fa3af148b52f24aa731c31f98464ca9bc975e97fd665710ee2c56b024fb8d7c7f4a20cc9d510f8eac38f96129c97b17c890417a21465d05abca02754ac3614e964f1a24393d05ccf5cb9500852cc9231656ca899f3538df30984475209f84ae8b99983e844b06ba4cd8a9640a513cee439ae13ad57d3846aea4fa165b68c6c03c05c835bcc5a63d45cc5568aef94ae7798bf29aa7f38e275c902236e63872a274e4776cf1928c492036166d04eed9ca64aa16ebb4b11fc3ba802c6b249e4b53f90112b587d36c6bfb0733a2ee3003419026a10a4c54c2be294b2031a48fe895c2c9920b3772f127338a865a82c3262dabac113c235d433b90d401f5557bb1bc68359020f75742c2008c2bc8862416910f53772a55376ef05a5eca853eb1ba5ef841f243b8d98b11e94483ad7e72fd7360a3641159e481ca50971a6e8aee73a0d4f24b25430ccc0997c631308fe2aaefcf79af5d2045932043d95933919b21ef87865b8550742a513d67af756c5958465f582983a777e9032ac43164e552358861a0ebc458e55865fc3545fd01b0e7565877ed3229f8267369c319abbb017a87ca662c635519ff418682af39ba387aa38ec37396b4d6ab505219314f4448d0f572f4330cf33fa1369872649c922bcd228c294b3213a216e59752072b8e026700ea63061855be3d6037c0cabe0c21f5be948ee4b18dd935ad358a5885a0331db2e496995bd47c3ff2b679e0abafc02804b6117271a2b00e33bc06250fb30ae2036716d30a50aa07e45f244e1f0100d74933a0cba383545cf629d357aa8927a7bd4f6575059485fd455be7198fc01a509920f6c0b8c5a565b4b86c084a60bd9b9b6037727df67b83ae06c5e47aba5d263ce83808f40a378aa43b4ec5458b33a0eac8c816abf5bf76a1220a99205258cc4a9236b4dc252cbbe8884e8ebc1fe921ed408582182b273a199d121153ec38b7f183174754f66332ca98b87a31672720815ff7bcd0cdac810db905ea76e6496742d26b2989b201fbc2936f5a6cd60c35e757f8c33b75277560ab948bab2962df9c38c91b44f08090e5585d852c4b729c52de88fd8c54722162f2d7696946c7b710079500136a28b9abf9a5c0294a5b265865cb04f9796b648f85858f8982f15c2bf31626b236b2c3a6493910be2cc8610829d96693cce3686b8a63b91439118fa661729462ce58e5e28b764aa39911569d1ca5c1b33885400a16f169858930c7f135ab6a95d08ccc70d057f9e73a4c8ca2da7185df37c8a6f727893bb6db74329cccc4692589128867cbaf28694fa747e86cf98619e99b221db88a81afa73b3485846e77cf311b99822a8fde459d7d01210db0ce68054199939e8156f8f7c33adf5bd5f2c54c6bc70054a5b8e305d526c1322e49f57c47264091e39eb0c72a596ad5575434c4de07c0bbac32f7ed30a0930221bba0aa75140b0c97a6e1775e1211740c23390f0094d144632169e4a0c2534479b85546a7fa65694610b2fc19488a5833aa7bd0ecbc6dee36997a900fad18b1c13b7cd381b1ca598038c2a4e40ac374615ffab46b3cc992df777eb0781aec573783b75cb426283ea01bdcbbdf8f8b30ce92f46cc7d4ce407bacbab2bfa27fd7792f43ac0ba74b58b332bb915be649a573eb22c12b6037b4a8cc109cb4495a337e42ac82c48dac2099684bd01700b7da007dd8039bd6b09900776cc783ca114358ada02cf5443c9bc6c181a6c86daa79371bf6e6c5cb68b7255d592796bb7b38c5f8c655b2e480cec127a2dd4aae4b23c44d4367de78e74797b64b0ce07a36e73613ddee8a61c5c32f865119f1a60b44ab5a28374af3324e68604bfb33962fc1f06d661119c0a081c45dea91190c4cad6b6253ce560d4e7855a64c58bc950bac88ce61b76691a93be4b81c202768c984ba2d9122cab4880942c40d87022b91c5ad817dcb5037b835dffd916a2b35c09f782ecb72cf63239b6c33bd73c0efd115357b283bd6512c1eb3ede4730284328a86021fa805ddc55c96c1caa3832857cacbeb5353453638ee70669c4dcb6a10c723b18c71dfc44fb5600c0f8cbb35c6d0b075335f6bec7ba1306766591575b5d2b4eba76a84e326b1475b5ece6c3ccea5e555616d38c03fe630c3ce56d3ad73858539d1718b915fa703996ce39745831b3c93e4829cc5677e5a79d3b1794f81816dcc2c5babc859b0966c76c23a4e66f1031634c93b8a51550d7850d5407b4e2d00ddfb5862c1c570b778042986f66ec940c5039dddba773c9a6a3c10e370714d0a4a43300a7b06b01aea6b6a4b5c17e7482d59bb9e1fb16897cc0340c5b65b9239d973c06d41f6e7b9f351a22b8eba6ac1148d91bb4f8959395e6a6ab996fc79bc8f0f7309be14fdb65bfb0287771908244033a3975ce2ec096abb9c15fb40d33a074fa2c84bdf7b1ee94746c42044be55484a179ec5c7edfecce56f9845f29c7c535282759c2d0a2546a13bf56dccc6d4463376a46ed05ba7f54577f26c78e2aaefb0928c36820db23a999e4b399b9b4fc864444d665e58ab24577533aca26acc5c512970c3a84bdd6fa7c7fca6c60eb73a1ab79db779c208c61a2f5311a694dcb7ba37ef7c7db92587d4a77fe3665036531d12c1adcd29cd2ab733e1b2d3ca56a2c7c9f7e3b96d6355b73c4bc4061ce276308b449cc0660b0f9c30fa4a62005f836e182a77e0b74d2b86e3bb6a63fb58d362b9496025bc5485a086808d3779ee28038d1939c5e39b645db160059a04e1b8e0e532686f29d34467fedb02236f3bb0b699c68726961f49824d277c8495c9d804a61f5320e61bc57a85bef199700d18a69e25331c41646abc434e6033d4abb30f114c35377365c51f5173769c315edf076e58710449763af61cc316b5a3e75346bba705db322cc683d5258a249a22524db0e88059a423c9b55d173eca88ed47cc4711a2ae295b846fb113834ab688bc2a42435258b9b1be648c5889230dc153273903e06aa2590ba5d77a63a16853d304933157288e03af785bbce36067c296a18cca79a18aefa33855683becd7b19b3890de40a24d6d389460a4a66378da2b82980e61ff0b144bfd64d0ce294e9816b9105c20c2076ddaa1026c68e50982cf79ba879f630d4eb8df663390307902207950b8b9db571c306a033272ac8976133a641c585d43e730a4969d752072bc6f180180e0ca0fd9c27d7845be15cbdbdd44c7c525fd70b5479c18a24800833c9338a5635034704db0443307c616209ab2172a0bc42c239d87ced11779625315ec168c3716ae62a209ed7096ecb83d7939593e519fff06e99a6a09122c5bf20c5bdc09af2402a3a605318d68c2b31a284b33b1719a4b6c7a5fbe4500ce23f7d858456f47d135a8256c9b40f52c37d07c728da600f127738c027d131b19b0070cbf9322d1865fa515471d461d17c424626b305d68e34838d5d7a35fb91816b65a1f9403771fc3a8f22403ca8616f89995b52425d618a63a789a0dcbb9ac196bd6612fb69000000000000000000000000000000000000000000000000000000e07f23404b053d03c5dcbfc340f9406bd010d254685ac2e204a32e68c7ac5afee366c059f5f26e6dfba8db203c5b27beca8fedd3de2664f6bd5c3e2ac9fb3891
diff --git a/test/recipes/30-test_evp_data/evppkey_ml_kem_1024_encap.txt b/test/recipes/30-test_evp_data/evppkey_ml_kem_1024_encap.txt
index f1a05c6780d20..5db6f99e97af5 100644
--- a/test/recipes/30-test_evp_data/evppkey_ml_kem_1024_encap.txt
+++ b/test/recipes/30-test_evp_data/evppkey_ml_kem_1024_encap.txt
@@ -2154,7 +2154,7 @@ EncodedPublicKey = 1cfa5addb505d4b3155f44c292f958f02c32de979b3b042f85ac3354fa319
 Ciphertext = 6e78c7085b62594c22b881c61e63674892e8b15be6b3137030cf91834ac0126295c6893f0c386b7670821cbbcafac5d4211cfad5c1f75deb8e7df047b950fa504c189fcef6806e16c7a447187a7877ff91d5aa1f89d9f4c2f8c726dd7cbc688e247c929117e01c8cf93e62440ac3f9affd27ecfd76d525dde13ec8b3a6686e25cea8e46fdb3a264b4e1692bcb1cbfbf6e750a1faf99d8864c1a9beabe0d436b7ec5566c92be999b165ff4f30d6ba43347c326edf4a41ecf2d35cb825bafe62184cfc28b30419f509b631f9affdca2b3b78771fdfb006f5b6cca6d0f5522308543b4a1fc65463d8b0ef14fb3fdc160178692d598e59d71110447fec3d02a58556bd1d17d212bd09d4dcda359fc4ee60dd2f0c73db72ee684a28b550f6b17e7dc8e2bd1867076222033023851676c0a55956e14f2c67874217e5349918243011ace52437a127c1a743a52c7c6fd8a0a007d5d020ec1bfb9f98b0ae36561eadbb5e23b7202d909c7d5fad270542c2e57dd0a54fe7179050b7ca81d72fc8c4f07f45fb2ac905e209a3ced970bcf5334daf441a0ea8f250d41be94cc33d96a42a067654f43047cc500214d0a54920f61728b6e95a014926f03faa1b27f6f5cb4397347dd0744c09ad92608ed7cbc0bae29092d6846fbe0fa14a38529e00c165a7ba098c16e532d43a8e4bff1490c45e0a33bc02738b4a1958cebeb39fd30ed7026b3a015863c2e4a2ca00635475678132e7fc114fc8e891711241942b787384ee22352b2811cfe1a22fb7e8f2e173df93e59cfc98a677a136ec29bbd47bc66070a7a8fa3a709aed2123ce55bf27ff2d23eb87b9762659d16ced5e24b7e825e0b4c2e8a6b6cd1596e4fafc06c9e90a8f0137ad182662f54288da8b590d42c6fbf9bb14cc8f23fff1abcc5885ecccb580d93846b2ebec01bd528547765fa2c231dc1b5ec3b3263617d136a102f6e02458444b158162b80e9acd39ce90db232582ecfd679029c6ed4d5a17f28b4ef2a120455b5933b51d3751728ad07e9d1ae3dc52d690d5838cbfc8c8d5bd7284dca1b753be3cc485aff60a120eff28891e902af0ec3358785a0ac87f99f18f268d73c05ba725de2cbc82d2918f1694c3f6c813d02f341c9f40a7c75bcc5984d5ecc1cc308eb16a9c1971d4f8e6a8d5ba59e855656543c0c7e5b7e49a360bc31c9411da0642bb815703bb64fb550f19fbb0bb993453ab8f15ca9ebddae7ef5acf2910f130f95fe1e4ca602f7e09d605a4dddacdd3cf5c2830a7bd1fafa1d63f7cf4ad511303ce42fb6348397df469a813c822527b933747f8f419177caad0787b63570cdb807a35a190a46f2150fd19c18db91c9435908d79449b23430c1d26a7354b6b9d1d21f31d160e767681580c770bb264dcc24567e88a8bc6512831fba35cf6aa4fcac1040b200df1c60b88a3d7e1550f0a27e8232dd88a9c751624198f811ddbf1c2a833c58b91bab501e7cfccb5374c21482808be44877ed51389234f3bda65c44ab5781da9ee3269a0cd4a3f13f50ec1445c859fc164774cac725a3b561bd63a97170823fdc07bd6ecb46bcfcd76384e7baa0ec3c1f4c89215e26b580962502a4c06aa26068c041ff1354ee9ec07da71b163901784ef525c65bd00c403a9445ade4b0bddfc30e04d278b4873dbd1f18f4587cedf870d958b16be02ecdf3a5cc435b49e0e56775521579530013aea6a081aed4a5774bf72918526eb290a5bc1ef3f0ed9440863c1133a70b1481d46b6f0adb352b3cd4e50bba138570b8e5617e3a10b6382970ace312b95d87f5e8a6baea10d2ea19546acb5fcbac0d20e964b7c0bd0d1825d3955971bd657c316710066d81ccc421c786f7d21df4e748b47111732f1851dc992322d5b50cfcb66321b46588b39184c503666435d620eb03a3535b9611e7aac801e9cf90ecf7671f70eeec6103d6e00a2ca5a6a8424e645d4fa89b058b5f77441437e40bba596d705ba522fae5fb1240d9f9e25c9bcae741b514b9ff33d0132db5f06a73964f05dce8b41a568413bd7f4fc78a4c7dbd2f5815f3dff8f25b2e82a508f5f2fb02087bd23927707bc729574777e01ed0c93557867956d8493c1cd9dc86ef3c1e48986be905101578c8e7a11ea96709929e5dbb1560bd4d9f9acb7957355e09fad7c97712e890234b335fd950e25cf59a4ccc6cd461e6ffbbc43026faa7dcc6df33a8bc5f1dae7e5
 Output = 8918cd0c3eabdb8267e24b79272ab6b67c9ea6418cab15e2e3070f6c747b4dc4
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 Entropy = adf510dc0e997af14f96e4863f316475be59850bc861ca0d1b057d6b94c3b5d6
@@ -2162,7 +2162,7 @@ EncodedPublicKey = 9d76798256925e67ccd5ccac6d69a85343825b6a20793095e1a29d1b526e1
 Ciphertext = 02c49972f757b82c1f5e7ff048b375cf05adac485075ca5a1eeadb615de1306d6712f0cfc452db395c57039fec57708d0a35b7bb238d1e4fd58301473cc4737d72ceab2b097d513ccd17a7f54d1fd145bc28aeaefd2157f2a8dbea391cffecfc2e1fb86c909b45e97a39b30ff59f176b2359a92cab56cf8d04ca42a08c70051c8d9405fa9aa2aaf5724d8b2a00528b7818671af4129c527bffa74702f02172bf51cb8e5b7c07438c785329807bd022fcb5aad5286642b1fbaf976af9816d3f0a3fdb79c2787f6abc1dd20fbb2995bc2a4b2408f5900c68a60f38f78037c3ddee01a3861433a7d9eeb5e7a41a56d2b2a11615d8ef8751d19cf7bc5e5e46b0944dfa61cee6dc16c490f5c7b62ebb6bd9bdca7dee23c3bf1529a4bf40977b307e945efb6451d4ae1c1aa507e30f653ef476c64610edb39201492434dcf36053f668b43746cda8fefd4316425c92f97e1900c62a91004405349c69497438aeecb876ab534220a4563138ceeb3d4edb0d70330ad031aa82dd62e19d17f62bf83dc3d4e2c3850d47efd50edbab06c9661d1ef274e856d8ae58564909625de2acf771334ffc3a3d7a0b1a382e8a17c1a1dc0f29401d9a3dd198a4ad70a740700301da40b468fc4232ae841489a1169170d5131d9b0a036149eedc23f2abba55883ffbfe4788c887e3248bc1de1b3677f286f1269d110d574d01199524d93263517afb76759bcc2728ac595b004508946618b55b0ca734431e85496f07e153f9707d876b6342cc99be864d9d603c645bb9731890d497d85d955e2d80e2e660c93968873eeca1a51157ceca558c0544040db61fb4ac4e20effdccdf950feb214971dde984cff17a75973b8d3a8cd27c92a8686fb93564def326e3cb617411892469be218d663a009c37e2d573b59beb4c5f62206f3a0df818608583e73d12366fcb1d685650d72ca4f533b928c0b4772ae645f0b0ad71bb8313a601723b8f90ffcc53dfcda9d092f8931ef168ca2f53d4600677833b9443fdc05db07f80c03bcf6e364fd4d85c89fab6a08cc9399b10afcb908cc4b6b6a3f6a4725bcf8de94e6515345e333a8324765ca69ddf9c61539d36c67e91ced0396ab2adc022ae9fa8e41d5a00168cd8c9ad0291f653af63e67b90ff2d448fdbb058702c551d323f5916ed90f6b87e354944e167887c5ea4b37703c8b0a94edf20d188ea989999deafe0a6de995434275b18d17a33b100032f2796749a385d972542dbc9989311068e84f3629bbb797f7c6f1057d99185009b5ac0d43d7b944b2e5f528cdb26ca14d995671e72eb725bf2de60289da1f06d78b137a79ebfb75425446c20b4310700053cf3ad58ce01cfb4d97325a27e5b5eda3cfe1009cdd186313ec3d16f005be47c8f38051cf2108b85ec43aa0d527b8d3bdae4e0a7a711c6fa69998bc26a9a8d2f7433f24f79c0dfc74a56083b42de7860b22c45f0c6e31422080c7a21c8d672fba60ce7652a90a3134f54594eb0fafe5a953e4f179ab06ea6b9795bc31a4f6a7f18bd5f1800a5263c48da4ad48ceca613fadea7741dff9d90f6400aa31519bef0b01e3312a5042ac35362df5e61c8e04eb52bf5bce0505ea7233b516321a08185fbdb9ff8434b4c6a88f880f594d100f46924a26f468c754d6af07f4868cbd7aff2caa53e5146df4afde9f7753484fa8be36baf89ebd4741b7260ff1ea398d59e503f5fd6c5c543ae1d318dc1894a48025c76e872fdc3026bf33a91b4618d1618554393eef6f7816b7de65c4bfbb55353cef9a53ad35340049ec65ad5af27db6fa597eae6499a3e5a192ed731915f6ffac811e35555ba5ffcb6628f812bf71a268620c161fe2a571921f5bceb4d0cdca776c7e52f68140845f455d247cad416c4de040bc37f5421e2b8bd6a049db84f0b3c807c3bb9d47cc7ac3ae9599ce82cebce8243306c0f3de6af1526475387c76751b7412a227571450599120570cf3cda19264136e0a93b4d25a160dee03d3d812dbf172618f58d09645becacb5c287b3b01ce4d1121272747648c50112c44728f66d86bd421390f2b36ed7e18b09a985a306ec52f240c0bc0957335483439f146b6c340f7e062a6059b1d47750c11cda575f8a2aea78ee09af0e06dbc2b2ac2b2bbef17fa108681dc90a7b970306522e521aa987e3ab6dfe2e1b3c6d9fa68897efc9e998afe55620cdbe9ddbbac8a0e22395d5628a
 Output = 6e63c5ca8af98628c02c8f1d520615a1a2c4824d5d155a6e51d181e8eb44c7fa
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 Entropy = 3983da6a4615805f6d55c14ba582d59a40e646c7ae77f4835a51afc6c37f11f3
@@ -2170,7 +2170,7 @@ EncodedPublicKey = 452bab83196c047889f7eb13897b3d73db6ecf5c9687c3a97d5b3fca3071a
 Ciphertext = 841dcaa46434e75228b0bc10733771ae67fdcbef99433463b2aaf2da88a98e1bbc748e1d14239a3a91bd2b6752b83302265c58d36f176b15988a3cdcc0f65cd72eb5486913269eb31b42bd0ccec456b72ff18f3801a1ad44c3ae6eebfaca59f2ee8308bd6c4c05a7262a01f168662dd42153bcf885ca7e84adfbaf6429bfacfde0ba36426b17dec09cee0591eca54dce505b6f23d2b674fba0a9dffdf7e77ee007e7570b31c71723047c3e8a271d6876261fc1766e1e468bbaec2a42960c2f0a3ebb7dc5d5d6d75a24245a375d160bfafb01cfa2c08831b1ccc67bf9d05df3a14d8f4b170e145311a793a92b1d59602e45328e58c5842dfa6d7021e1c65a900e0b04a79b17edec62c5d1c2bb8679174b45da0cfa336f7a0973923b8812d7b2015e73c42e1219900cfc3cdc93824b55724acaff2158d38732c429883b4d461b74a858cd167ba9e47f8157834f2e758cfc1c8f0fc5e762d56ead723cac0759cfe5233473b9706be8d909c1bfb2cdecbe7eb15b74b181e8fb949aba6b82e2c7c1d40bfc43cdc758051d1ad428a43bc7708ea9b46ea3f202974abf44644c7614769c9fb39de6ba9fb3009cff125fae0ebf0ecf5c9dea4ef2b9a8f26fc5d27d875e068ce3d319f816000f1dd560d03cccf97c5485ce65a77a326ed0fb2ece5cd5a55661c7b41f4b08486770cdc510f03b2b85c73b95d0d77b0aa75f677682d0a383a6e69ece0d5bd62568f2f50dd64ce3cd9e51556043323729b165e4c6726dc77c78025faef0653e54c6474834b9e2b51c66bfc8fe90e6e48fa217add307120ee0c00e8ac8988e5765e66dd0dfd92c80a3b19eaefb46585f0078f5f2de0b9c83ee10996b27b7c64d0f7b4d3be78ae18030bcd792e83bbf99529d1e7917bc053846268ded779a622e83f5d2fcfb0c15bdb1a2621188037acb8999ccae846ab2664792b043903c3e6b59c2645ca44e2b19cb21122035f7f3b222bf382800df1d1d8926eada144f880ecc739bb5644986f0a3c1b7cabcf3c9cbc7938802274ba459c1b870ddc516b5ea871fa6bd87b8cc5e47541f1dab3b9fd63865bb514b85155c41780b6ae24a02a06804a319d3f8d81383e7c8167853f3e24b35e220c105dfe14c33441f928c6dcf63a606500539b602f3b3f547a49545fa43f3fa6bbbd6049d9769ae5ac0964d00d68409abac87369f9608f2d244935aefce11e009fdc9a94c4a803eff45f989affe68c4dabbb291de0e7251a82bd5e5d19bc165fafa25465066e23dd905dd456e0d02ec3cf229c330d404b5f214a37363bd997979fd171584a296cab6e37928940f6bde0d1ed593903d86524449ad42248572680f1b573ede4ae27237e56755485657a5f542577700680308cea4a0d249e48138743017078e668e9ee556c7ef5a83cca9f96ca22beb7e30e2df1a793c6e2f402f109770ce7763eeb057f65bc0fec1fde8ccbeef1441dc98d059d1589564debb2a993ce21031c67d4d8c61ec53160be67aee11ff4b901bfd7c91f6e1faf7aa525aa8d15c3212ebdf0e3a5adc57690d446fcc9435caa5b1ed174b96d4da42851545ce1764bcae48c5fa580802eec2d1b83e4307c1da0dbb2a0fa414d2db8d6335f898fec5e391d0d7c2098e35dcd68afa8adc29d5eee9a9cc6a517ed310897e69eb23ce83e5ef0535c0f64d4f8d62a962e8af80f47a7f76cf735ae4ab09db0b806a9c4b2fa9ee493d69e73af045e6a1eb07b5bbd3241ccce8b5196080c2953cbc50a2052126ad754dc971050150d7ad4b319fd85cec8c4be05b55ddcd5ec7e804083278495b1601792464202969dbe01488f876d1655e0a3f4879ba41712c9136ba0f99d4bbf3145f34bd6f4edad036e6db0ba2532e35c6c097820d1fb069f9d69c259fb17b94970f2cc8284e5fd80f4e6070b4389bcb49ca99f207d002e44f6f0c9046fd89c0ddb1d86b01007c02920acafdf28e49d3c209e3bca054b67398b6c6c2561004c129947d87d33390d28489855074a6777dbf72816f0e1bf9488009bb0a247784c8a9b8f13a163d86a614edda8d205058071c12845b21e82ead309ede45872c379417c536ba446272ffb63d924d0055a92c320739d364e3eafcea6d10ee09a58a70c6c9a88550327070d6de72034b8140976856895147e2a1ab4ad062c7d299228a50b605872e3d20daea3e918f2dda9f8182aed61c93b4a47c5796478e182ba54c87fe
 Output = d0ffac51bd8b7e6192ac5954b26a5c64f4d0ea746b08d9f73602062aa8aaf7cd
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 Entropy = 2676b8426b9d6a30af007094bb76d65d388c2b3da938215dd6f6987206400e13
@@ -2178,7 +2178,7 @@ EncodedPublicKey = 04db6353d04f4a88b97b6aa5a6a42a101a535da323cae6c7dd757de67c24f
 Ciphertext = 8106cd6746bff4925c2620882d571c50b36b066a5ea43fa6528351d97dda7dff1d9e9ee6ddc640ddb88851844c388727c918152c41c814be39f274183e116432a61f9a7c1885f07bf118e4ba631598fa9b1e01e72a68ec43dba62235587c9b9dd1c8e806174ad612a2ffd477e8d0edc2ebaf4036393283b55144b9c83cbb31d1674565abf29a56980dc4a3803a389a20dbf78c78a907a5d651649c27c9771ef436c189d1922564397f5b5594d7efa951ba7d05962df80c49c1f73029c3d7899852d8a1fe03d1245a228028cf713f4403abc64a9093d782cd1a6dfe12a79098e07f40904ad146dbbdfa919058149b051bea097a60aa0373cf9c0803e8da99c03a6b83813f99adea8c87e6da09013947cbbbde8edc3b7ca29f3180882cb11bec706f4048a20c5938560ea83380be5cd75f48d77bf3360fc131509317dd72b9340bab91fc6bf7ce099bfa58d6c5a413fd2801a15ce7ac6f6f2c0447cba39987a37695468cd0fdc982631d9b0354205194323e74d41c54e0a026c4e67467b5595aae7c8346d1bc5538ad0acdd56fcda32f95dd7830b65b2d98c05355a3ad9c84cb43c23ef9845250888ecb6f992da17f769a13bb7bfd621571f98b42a9aaf19d0626d7d59355d9730371b29a3868b97afd7013142866e0b2f1c54841de47c47775940c58475c96a4881bc69c6de346e05f55cab15d497392fbefd2309a834c733eb3ec8df4ae65ccaf690af492e39d0b5c91d09b39966b31b47ddf6751b481966f19758dbbc373debf284640015cb197e53120e0a36ab02203e0992f35b4c8347021f8c4663c996597a466b416cf271e04a20045639635b904b63250817c29451dd2ada5f3011500f705c2f0982d236ee1cd02944e35cfc6704f0e8fa30d8d2d595340b4245d3f3d5246d368062b53f06ad365dbf12c0fe7f492690fbf3389d234e76a618e63f785af41b2f4af70be0bf0a917df6a5f34683d931604c6df9288cb9e38b8d8396ab2e21a1c9a54f4dca2a4985c3c4aaf20af5e6fdd126860df422a894dff4a857f2a8aa54c4bebb70d44a4ad15d47497be7e0b7487003ecd6f92cec84bf4c459eb5f480dc20bb6db735cfaade1ce33782aaffa6a39e4f2ce9e7df44347b91d75bbe71b824d6302608dedab325d00163cb9e0a274ce49717bd6ddf4b9c02fb6986a8f765ed565f48c10dc90f39b93aba1a69a832e41f2b0dc2113fee500c99471ab67e3ab5a1cccc0f92273739eae4747de461ca3ce6161b558577b56af9e695a978970473dc671efcddda2bbd8d15fa6eb8ec0ec9f479bd9b8d3dd4865460846733856fd57664760bbd5ed354696ce6c8b44c6ebbcb07920cb6c3cf769c005503add472c7374b8875d714d25c74e2d4390ea455e00208763f56e475b630a30875bafc70f87f541bfd0a28839d441ce567db3be7a20e2773f08ae73f9686b95623fcfa7b1b3052d64448756f9a7481b1d9c6022898e79afd4c2290a9ed2e0658c6178826ce94e0ab460798a88cc54558c51239bbcc5347d59ac87fb6580f84aae6492e1ca700093438889fd50eb7028153e8b4675fd272667fa022b17029808b88df427ac048d8b410f60a56ac39220f8b509ca93c34c7dd62934f62a7e29aa3b0918299fd5c56b3c3158775a3b3d5c78aaf2f656257fdaaaa5b7daf83294b5fc48d08922ea6f5487d647c30b1c11a30d2b1690958fd90107a0d6cc689441a36d04039bea83c447e79b04bdbcbab04427949855aa1a32790075438ca6ae6f7897581b4489ea1dbc4c025fa1ebe698959a8145e8f11aa1cb6f742d1be789cba73fdea457eb0abf1e814c931922f451a7d59514c3e2526b1378be1ba8ce317ec3fe2e3d983edb346874f5251d197ea02c7b16fef2b7ba8cd3b0179b1f935d4aa4d463bda2d5dadd6ba96c0ad630f1eff86e34dee3f2eafb9cc5f5ed13dac2149a583e2af8db3a789c39f751e645acb58743646c6f65bb12564b8f26697e80b8d9636b0833d71433a0465dd501eb313158275608390568c7130ae5f998d3819ad7f3855d26ddc9f4ec07a36d191450dd6502a28665eaf8235a3f10b90aba654c70974038cdc9b3335d9b865da8a07be70d53f6a5edc7c4a5f4b5220c8e7fc01f5740360db072a4f8d7e80246dced5c75ad642ef1b41841f43e6e422f4f9131c1b3f505197f18571b057ed1cf2dab2f37dcb88082f8d8291d13eb7abdbb14
 Output = ab923efab9857dba5a68f9198c4318f54a42aec38d194133eb7f5dc172478e79
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 Entropy = 319c51bcb76124b92f39820a5653c0ecfba79ec91d632b0488f4020e5df4e37a
@@ -2186,7 +2186,7 @@ EncodedPublicKey = 61e61727c66c5cdab43ea53041e25b36b56a323a12f70c99eea25fb4d387c
 Ciphertext = c60d4aa71649960bedcfd1ba225807739b82f912425f50d32153167826926e51f8ed961b5439fcc7a3804d55ff46d5b873e13a0c8ee7606fbb21c5e121fb8e60377ec46ead034bea9c44a685e7a588875e5bc2dff98e5529cff460ef5fd1ede8d4cf2b02e9a537887028150d0d79ee6a0ef2f0d5507c42ad1d788a75899d0b7243f7179af88cd6b7fa41849f1f49f782eb0bb727a9b0fd51ebe3f05ae80fe7259aac42c8b0a70b7b74da297c03dc1f06c44edf72773958e5a0d38aa91c35e71b27155e875f3378ad6a2d064d6d7cd56689b1a42dc4a26ce2cfc8012e147940980403bb6bc164f3a0f9055867efd0bdd3ff4c36ad8165aaba00c8365d217d4bf208312f3ce9fbd7bde30d6e4d3f1a98b0a20f947d03b45f3a25ad481fd1dc271a0cafdcc04f02d314ce3da2e1aeb00c7d3a88ea3ea2783b75e16768f0aa122db015492b0ac9bab3d3f85fe6d8e32cfd66fab8e3138402f690bfd3a5fcf09ca27cfaffca96181b8a906a67d93303069ff91c2e3e6cb26c5608bb04e05ddeab18ad3ff916bded7e9e27c99492b7525f95e02833ae827c48b1f4ef06b77633a66ef85520768b64641c5b1b3bf319c390006a026b3a77331c530aa5a86d0e329d4c7bd729992e3c574876ad9a29d79b09018e850e2e63d51f75861af33e6acbdabb722d41312294a9b302aba8e3f04ab1f04688e373f86e3753d84070bda2feabf6b94617cccae0fd427f90f43d3b686fd772292fe1c93f355fffd2683eb8dbdf171b69bb6a5c929b7109744f542a21539e04151ac7e46f5d4b8b151981d4860a366d3500c3422a2bb5c24fced0221e1b84b9e5b587e9bcb87220dd92c127be67a396ac18cfd3470e715ebd320fa07097122f696ff81923e4c2d3c0310bb8b70690dabee4e17efe6d871b32eeaeebb448f7d65fd60e7a3f32cd07e61948be330179dfdab4d748d01694d64edabfa95647a21ceafd5261cca24a0548a135ca1f7c262952bee7a291857062d3546dea97cd745050121c82a73ec9c0095847e0563229ec36046ee1564ef3747b49812eb2bd015025f077b56d63500bfe523689a6be7b886fd8aebbff18cfb6e4ca18c2d0dcbdcff8fb7a9e852f81ffb39245abc6ebb9f58a28beb15942cfd5f797dc867f7a855a3e6ecbdd9a8123ecdc30c7240d44dffcbdca05bb17d524a791ea32d60c65dcb6ae3ae3b724ae7da36b88d3563a63f4c059fc83c97ad79602cd7701749f92c02bd65f505f407b64ab3f8417d3de5631804eeae565af62d7fbf95bfe25126aa2494368bab7afabc23825d6cb03151222bec05b09a3fabd5937b7a0ff17246564e163d049e0724456576f250045d13d99aa07a5f298cd76ac73f69c3547ec9a344998dea3448a96480ece462922f76f1fab68d030796bcf570298013001414ee238a8ac4d7047514ebd5c3e55e051846403acbd3d7a581c1d53084eef20edce56c2f50443440ad0fc77a955c1e5c4d610cb45f43435b1a66bcec638ce88126ad88bd1b0d10cc5aa23789d5c8f4d9c63cf796e1ee6f7fb309855f332a648c731775edbcb4968592f1f633a3fc74bc5fbfe9c0e74d8379fc56f869e63d8db3b9ffa92e9b470e668e10acc1c7606839f2ec0abd02629007e3b1300e558e5afd136f949eb1e6ae56b5a8c21d15ec4b62b22af89618501c1af9992a3f002242288fe01140e2476ff900afe32685afac7baee893bcfaa54c1bcae65b2c9db04b1e17dec3821145daa041150f3282a500ca46c535ee47ec02b1a1639713354bc4ff7217ec169a63bbf26a26b2c712b02c76b56a8ed0535e3ee1c3f118f2a68f9c699ed8702f3eb30328118922b15b8399a3fca410dae21e7d762e6e45c8de7ff023a75211e42d1acf1d8f506223cb281fb9615b2de1848ad674236e768a0f315041daab6f491195453081535f9235f6d215e5750226ae7eef4df26469cea1d0541e7932ad917fb360f4a9d5601126b1c76bdd1696e6d59749635b844c9d416a12d0eff4c4a9e7f40860b047ffad7bce7439ef0fef50cccbdcc848b02f66bf67f2d3cd795242896c5f2cff82864b1d1f00974c9142d0b0ef2a8d00289238e822d352a924c689ab15e6e5b201ee7ebca1253b9964a04efb4d7af21c6ecdc03365b4275d72502523d562209a316a88163ca33ea279702309f8c2373514d459a5298ce6999571072852d996fa8421fa594069645f034d3
 Output = a6ac9ae3077504c8a7b1e5558a0fb1e7d60cd2bc3e59d615e68d5165e4903d07
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 Entropy = 00ff48b3769ffaf4e91c1c9110eb8ce9e2cb99f060b486b37035407d2f4ca517
@@ -2194,7 +2194,7 @@ EncodedPublicKey = 6328240b1a7286c71c5cc17284fb5058410381c74456c1ae3ad93735b6c7d
 Ciphertext = b0ea35919c0560ba7caf9fb6352b36bba962cd45d3d2b7f6bd97ebb2a3ba6df22e018390330f75cb4eaef8c9ee9bde4a1f25110dadf363df31f3f8702a3c14d5d2da303bbaf0fb199384a2702f7089fcc63acfb29d5e53571102566866898055258241e5ec4f1a325175cf3a64a84ec50b4e8e511ec24dfdaf0ca79911b1d84b5a0872fb1618edf364ea06d7287c6ac39e842c56d6630ef38f4c812a8d1fcad73f2d4ecf8f7033c1f5ab982c5b6b8c5545237c4a3ba8d5ece30dc93d1d4f4e89d3bba0b8149ee5c2df793c8779d45de92630b292714582387e60769209ea7d00e2f1173f8817567f52fe53d908d11e8e77375e7d2f73f44a01ee3c87c8f4163c579c40ce70dbc006ad2426667650c35d80ced3df0f3f626fb52f57d874625d414aeaa658a220a4ee6350900dd7b1b9e165661b41cd0c96c3b665d789a297f6b7b4f261e6dda3f6b027ed8a308f1168627f71656bb0ad456ed2b197c672d88ea6bd61fde6dc3df7e4d8b505afcaa35fc1d9b5df57b69679811ab5b738d62a5800555fe282dd4d06d5ab25a3847b4f22725a2360d8b47c69458b55f485a1ee75918cefbac2b4945c20a7356d1b7c69f1c047ba355496e21eaa2123b5b545e86c23d4cf27011e68611290161366d6c12b340292113d3973efb312b1474807f8cf735b76bb3a722aeaca7b865530fba177f9016d1ad1a7bd86da6f657c32d6662e57cc691f5acad0faf4f21027fd761ae23456b599333c9af918166927c6253dabe508c7d931d50cc824c589881b39087e02b52276b9d4252c08199dd4943d72b4fc14e603c9e901d0038da715973b0d168b13edc26b20e2649f37d27c9cacc7a8508ab340a1c3ed8d26099171bfaebd39b0b9fedb3c195a381b55c13365139063e5525400127cc963d9659c964ef3415b31c3a2a923ed3b96ffd327d6eb4929ce1d0d26232b46da119e5e38e71a2dc97bb953567bb5dde9c2d19bbd208c85b135bdc885121b5f7195904d2a9141bf5222e98f95ead571db8fe2df9a93501b8fb9a06a3ce0338a37920fc4268e26e71f94cc218d6fad6c2cfdbf0a5855b186ccdf10f66f01f884f22503c530b3c5ecd96d9b55651b1eeb3af62cb7a4cf4cd185d98afd1b942e8f7eff849ce843e113e82c3a875fb996161e0d0185aa99e21e7c99c9636cedf0dc9aeb55a37eb1f744841f5d8fb3eeb5eef76039a40a5c643957cc81dba3fe556234acc512efa07f3a140ef28a93ed9cdd2088456e3bfad0e8377e69fbb3dc67f3864ab36f8f8422837e067c20787b80d77a30995e5d78f84804cd7c897d0ffa5fe1e7b92f17575d94512b6a4b5888a3cfa6e03be3a50b8797f43a87477982fb241f24af59f13acf60ecc4c11e558b1a4feb81f69acd5a67f56bd698888c9f00430dd8f8309629f7c29e96d2951fcd8b521265c368e13e22fefa30bdecd51407387c77259e64a62e5d705d3d46be5b6f710ad86e844e509a3c5c1dce0efe4b1427bcbe56758432301a14d8b882a70cb5c587e1636ecf96c61998bec7a9b6b98eab92be2e30b30174c87bb8bd66d13282dc4d1b67757435807a90a0b268a9f760054c219bef6c8811476a56a14994c760e21a1b786efda3fcda5acd859967b9874eb049a9690b0acd97c907c1ec6b1bc9790b1fa6c8f15518b9c18b3f0cf672d26496be193602d909efc2562bf72e83a3d8244eea1942c6b6708f006963ed1005615abfdb57cff11b985134ef3ca90116a7ae35299d1627fc05cd40cb32a83c9f9e19570ab0b4e079ae34402641e47e1f0bb20b63e551dc7c090421bb1916e970b33a6cee4be985f28ea66cbcbaa21279b45a4d3927eff26dd1d171f18ba8c5e78644d6027e7ace96ab62bc862d8cd69bdc9c07a4d8d66ce2a08601783e6d40665fdc637aa813a447361ccd9d843bfa05f5e88f1f74a4d6fd1bdeddb1c50523d731cf6cb4686018e8518525a83c2aab2fc5ff97ea1562c7cc7347482c96675b0b249f99428d68f180d6590c67025e41c80468a3edcf147368f3612456e9d73bc4d6e0a70364036f75cb6657ea99c8fa365c165d7fc912bc583f0f4e57ba0f531544282e21dc42e00f00fc59273d272a711748bf62760377e5c30c1776542936a10fdfa8acca0b4b5e5c9cabf461ed5caa9124c59a4e867859401c158080970ada9cf76ab49e250411a61ec5e83c781c269b75ed1c193bf8134d7b0dea
 Output = be6aaee5bf0744e7ca1ca0e545171f3075aba9b4d10a71ae00848c8398e3c52c
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 Entropy = 4960ccb1276f96d7aa55885b6ae6f90343d42e1391e8241b5952931a979837e1
@@ -2202,7 +2202,7 @@ EncodedPublicKey = 2b1a5060745e8525bc617900d53b414dc995772543cc58a6bb7c4868f8999
 Ciphertext = 1feb4f1d63f08052045012a21c33c2951b16c4b5ec02c00093d54ded6f94309e44d558787273bf593ac4bd77a56fe4dc30a54eb68a2f473c31c239ba18c9ca489cd50611fcd3be42f6f5069facdbcb7166a64ba7c06ba953142e5914ce20ec69038895c9860e69ce6cc3dac6c1b28d30fe83487d40591995f091d4ea116ad2675e32bb83325b7f379449dcded935027120d01ee43b2208deba910ca7ee635c5b928e5f6167307c813c8e7034096878a2915ed2d20898d8412ae61a72378a4eaee2f227ad5467d04ab884340cbfde2400cbdbca7e07a2f14016fa9e403a2b0ed27ad1dbb3cc492f584a6b5a7525baa628303039f69cf1c1e4db920ef7882de21eda5d2bad76231c88a061fbb2829fe93149c69204e2e783009beb4188fb876a6f869eb11b1c32c2ef15f9aef62f699f9692a502a4d87e5a497097ca73f8fddacbc03dd40a53abf267f749f9ac0f7b4ce9417a0f5eafa91fef75441ff7c887dc2eab2336fd257d4cda373121af864d4707fd20965e063fae456f0bef8f587bb385f8e5c96592c9b7d6c284197ca1706e1961dadf16a2264f74be425ce117a95dc9466474c856adb20931cc920177dc3f8c93d2bb3ad5f7c5517f0b7d141b87a8c287207e64158934766c8845ff0a480da124716b11d0e257206f68f2d4334e8e260895ab83e218e032a35f8d792be7b413b2679f8044e1c0ff67c474ef4c9b7e0dfd3d9bc4252fa81922cb146417dcadae7d7a7ee96e13bd480c96a4314f31fea83eef588bbf1435528c51eaf05cee2f193c3fc234d695ba32546ec77a16b1ea8047498125f2bf78dc9510812be57fe0ec77bfb3e28f42a4d15c2a2f0b54aae023ada92395cf384a1524a24e36ee2e69128fd2ab78b5af77d28c2e9ccd6c706315d46887db0c0c4f28666da7437489e3b245a19fcee97f187327a5806d35889e63940b19249d627165727f66f50aee62dd9496d6493c1f01ed0091e985048c2aa85a3b25a4f90f6e9f9cf67d6961ca246d763d3437ad64e7bc5c58b10117a66c40be088c58a27be4bc1360d114e61d002e271c4806b872f5ef7127217d5af6092e4aedf8b5c40198f266f9e10c560d4873668d58c912ec7ec18d27249f5be604a82d50421d436a3230780419bdefd10f049f404184b3530361c5c0644c3205c32fd451f6c6919487aefb12a75c821cfddeaa14c2abe20db3ac57ae0ee8ac4567db2d1e2d0920fa036351e8bcadbc14ab73d0868df6ab06e675ee193722f93f64a5344bd70593c23647152a81acb4d1a08b62b5f0b2669210d5d7845248d95fe9ccd796d73e34af955d1c94edcd2bba91be211cacb0884a90eab8a0125130ae65318f5419810f4df129c8504def662df4879e2a8df02d881e9990148065942c0d52865425f3239c4a4af51eeb85e1baeaf647e794b9fc04ea16eb328b8b1d0550e5dad8bf6248782b530735f8f5da40cf21241a2d62951cc9e894a339491f64b78d436c635eccb855d3a1f7d64f63f23023620408df6b3d190e7965d219a0cabc0933f7d50d9854e4d4aa7a5cf67b37e0475241a5af8e5000d117ebcea40b526c5a669dea1760d7fc30519148649fb00ca434f2cd84862a2755a99531854cdc847b7d5af3ede653ad6959f49c921d4a8675f7f3f51416c39e026488c297d844a8429caab43671093cc3ebf8730a18bae06f10ff8047cafb8d80edd7630c95d008cefca78f2b08ccb330d36eb33b18cf47bfbbcd0e2f81daa87160f421603d10409b8eab53f1561623f5167dafccda4f9a4e6504a0b5e67ab5dcfae98672f4cf62e4f152d09f2c64dd81e3476839aef8538a86f3b616ce55adf1dfe9451ca48acbe210c32ea1cc574730b37d4747b580c66820caf475858b4b6ad0eb7c06ed56b8f16f83595ee3466bdb8aaba3bbf35a177fd6645610b9dc238571e81b27b94757c9004a4c512cbad25730bc6f85255ffdcd052447766219e667095d4058e5f0045e16c0fcae1aed8dcb7c25fbcaf29a71a8abf72c398a61b1a57bec4b11a8c746bcce3ef0f82b9b2bd702d92a7fabc1efe0065e662270e1ab664cb1197f00983f1d265ff738f63b93d5d95aa4ddef2ea3f473440ce7ca1558b28fd68ee09c7b97e9d4c2052fb1dd657ecf09a2f664de0902f23bacab5d64bd449a0ddab34d4c0695c67ff5f6e11044a0db15d2d19a9ce2aeb818f0ecaf8c1522276521b0193f76e2
 Output = ff81d45deb69b6890f147710945d1b750cf17e876cd4e694158efcaf4fa2cb15
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 Entropy = 456be124e7f43803de5f734ea016455d68164a7f054c003f4ef49e46f42dd8d0
@@ -2210,7 +2210,7 @@ EncodedPublicKey = 101738f8f11e10897f9b1b16cc7c57ddfb3e4f6b01ad6239982baa07c56c0
 Ciphertext = d4952da07911c8ceb643e6b3254f7fcc22242a88df735c9aa9a91fc692f32544b7f30fefed3311dc8a927930c50b17577573f858b778294929b123b180498c22c1ddc92a11cda9c0da3cf300664feda28bff6f1873a682451d24e2c2a5991fa8aa29718a43c2b379ebc7387fad5dc9e3681d233641d1b805b167ae52631b3b6ebb0aaaa6507d4a87a808a1c3b62c97da49c02dfa2c729693de194a1bb1643fff14e0fd8d3749ad33936e8b4f8f6f3106c08a8098c6b903d1cb70c2636571253564fb7dbe54b96b1f999749d0c81c698934756b455bc6ec918ec267b5e54a0a812c62de971d8ccd93e4c1d6752afe3d5308c5257abed2b1c01d0489bc1d5fb5b2f4b199cfec784b2bf92dc85904cf78a9a6c0fc3a9c5c1640f905fb8fee2e08b3c0d5fa029062a5d41c82c512ab0645e7a1d728e7fdbcd95ec59d121fe876b1e6d624dba73cf68f35b23bfff7a435a5afc81947587b60d588c54ba0c999242830e568c3269bc96e001a99edb6ccef086abec634d0febbbaf72d872eae8c5606e86d9bbe279395c5370647f245351ae41358cc26f5447c37f959396dbb03e484c80dfcfdf93701e849e081232e85eb15e034b5421dc63c62190ea54a83ae06c89f395f7cef8eaa41517345a3a0aae4705529d3c2c13f71418817287c860f062c6d0c5ee918c50e613164dfd241533dd08928fc695f3b3c45cd75c740f76f6a896cceaafc9afd64deb69db89cdbd589fd6987b1f5da8b5b9115d675d3ab6cabcd0f793f00418c97b673fa31b851c1209140f76492359f3580c0e4de09d2a3efb2b3dd4afd4abde0e97180b7b24a45063f07f82771991fd2da92e12de7a868e6e84dca6a318dd8ef3a1ae6420d63051306d0582b058b7a96f25766aa0d863059483e9c7a17748a268e896f0d02173606e4381b639b480fbf0b3541a7c1790e66810e064cdc9d4e176cadf3d64ac27648467cd0b8643ad1255347cb6b086788f6c4dcfb3363cfef54c3ba5c13562ce884b53b09e6f149a60e1fbb35b65261406ec04f4146b2de7c61c2fdcf0f714981308774af933b710d1d4f315feefa97a581a98dd083a4d31749e5d0af2ccc2109cb739f8bfe85e4e7844dc3907959ff3c04ab9edebf3317f354c5e0aabe4de2e0711ee771b8dd70a3008eb9936f8b6924ec0dc9897a801e00f6738ec7f31cef0db9608d2c3d3683e97befb02f0ecff93068a46e57c97201608756dc45ca8bad93e0f562f5d74790c87d4ffaa67613b89c22339115d7499a2fd038bc4533e46bfb5eef28b06b8fe9a3182c6a8b18286edd1b57adeb55bacebf7c842d527ff5024c0ffabbf78eeb956a5127555894ca8459d99df31fc0fd1e1c5f7050d2cfb427dbb2f67530e049e23f8310b88c39d25dacbd6c7dccb9e382b0b471980d54974adcdb082825a9d6325cbaf90030a58193d5ef0a4e1e8fc885f04329253408b4de1d25acd097ff10e0afb4ff344063edde277e49b18996cfa57a7617b395a54731052a95a3cced450d38a31f19811ba278c60097aa1e3c91e87c57486b23ccb07d687c48fbaef4e814f9500b1e6f679a749614c86197239936be1f7ad2290b9a421c4f2fdbd4178a75cbb9cb1f7eddaad9d369f79c0e383fc9ccbbfd5e4cb93b211c477cac2786395e92385a4c0815d0ff6849e961395eba07c86e698d5f62466492efdbc326ff7c955840ed2877919d1cf95cdf5f557ad069363caa905c97471c85c5d0e65cea1ca90df82a0f8ef5660f68191c1aa19a180d18ef4a7b0dde8250ff3ff0a97dd4d65c3faf1e3a426f6c4b64f1f2d65ce9c5e5921ac20197a00f2331e810acf4f6b71878f1b785a28970d844ab4b6d1a604824db09f15e96bb711389114a4680b1c8b19be73aa5b039116c7a7cb7d2c2b026f5847afd6d2ac804f4ca24554f5ab27db900a159579efd23d78cf5542a038744cd6bdd64a3b59d233b878b383bc0ef38a0a2a8ab60869b64634df1cfdf3b53a367d3bfbbfb741badc819cb01823a8e8e16f6b4a35c380f99cd45af0edabf9de4fe2e5b0e6c34f7dce2c8d9a4be2b2b8951c27080aa965ae3afc422ddbefe0da8f766c8c63823050d1ba055e42352d305385ab932f99c0309dfa8d6362ec1c07e33909ac63200787f5963653db6ba2994cf308c9763a153b6ba824fb8ee94bd6a38f2a12047f7e0b01d090aaa41b4acce8396c18aece73cce364a7e6d9d
 Output = bd452a700448a4542a31dcddcd0bf285610aca6570d8bc85e20e163a13db5663
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 Entropy = e8ac9e76377d67d84f85a142383e777157805be0d0f679ba89cefdfa61583780
@@ -2218,7 +2218,7 @@ EncodedPublicKey = f6036a8efa3d74327dac2417e6fb05e2f1c178023b70214296c3ce6515124
 Ciphertext = 021a27d9ee3c76b205152ced9c68003eedb09245954d50316a14a3e1d877bd9d6480d479265cf7a693e77b8761f11a09c1c30d2fa5f50497ae6a4d2afa3e61b0b7fb4b3504024763ac6c10fc2e6bc77dda7fd837ce115b84b1d0c749e8e4a961d3e7de1bf6b36741be282f9df710b46410df07191c3207dd9e74e8c4d43e3c75607966a1894e86caa95cba51a9c3289b00ad0fe59c034099b822654caec138a1b06635d1de59fd469ca3e928deb7873cc3dc2fe03aa4b5729f91b940f01ce83ae5aedac13d0a961cd9420584346346955780974ef21ccbe3208cb019f050fac0b80076b48ac6c0f3c2aa2dc3a13b914ce5343c7a140186728bb335a47515d361466c2d78f3fc6250f13a4d4fe6c8a587512700fd5272c9de73eb698045708e18b86d6b6692e3afa1b73e5ed55614dce4b8e71ba9dab03a246b1469c617f5bbf3e502632b060c7c17145ba7df290ec310661480de58a56cdab7a2e5a8e298746eb1b7b8703c5c650456c567056451e209148059a59af315540e448c0c6a7f48df9e22f373aca8be4df3bc9bda80e94a92634a612afdbfced39194e124c07748328698cc21f39de459b4cb08c6c73e80fcb6d0d86adbea470a207b0575f180ddc0d658d7ae66b2166cdecdee265a02e56bc4880797f0fe09c081788f5bb507db2406f37a2743a3c22ee0caa51ab62ceccaeaa9e189ae412f8dece857b0faaf61f81f2bd968d0f6c9048fca287f74d954e48ecf05806a695d06bfc66ed8b5297899dd4b3942424cec559c33ef0da1ca083e7eea98585f89003ae0ba98fb3f51becb80094ba0091f97b3a32c635a12308851e070f4a94502be51fc6f4e11bb7803cfbee43135c82bdd3bc82d58383636eee387d2c13c1866982d7c4f15f0be3bf5f87c8fa5d43daba703c73135ff3aafe4cec43abf9c1bcd16e56d6df85fc38dca4d09245677ed75b585722a9b20fd5ffe9d0436b3fb592ca6982ec2b96a8af589296b0b0ffcae14ec9027d4815bb9b933470a357d0afe5aba5010eb0d93a0fab2c28f84d7091e607505ecada258a551238a2ff68621bdf5ee1246c27d6e8673f1b785f7abc9b88310e3c1ca5e266f2c974d1c88a31e27a102330f924fb3713adccfd09c4415c1773c8da37e4e18ef274b00d462970873b54ad108f588c8bee6a7b4cce157109aa04ba0daefc9b5119b3ff9f70d4728574cb9f57573f41760248a8a8cdbbf7492083cfbf585c844f03ee2e08da4a08d04717b6244b63bbf80d0f4f0477f94de7ae6b2883388ba05b27ffe8a497541f012f16bd9ec50f64cd0d14e1a6c2be8c77ffd39d1d19ef402b46c0c41718ac406acb1b71fc044b1f93a4fe98fa8a0bbf09caf9dcfcbd8e8ecba42e4bbac9bb5de40f089b86ef71003b92a3fe385bfe603b098185d05f43819f8686b4f4e14a75463f2026baa66789edc52610ca8d3d5b11f10672c70c80effd7ba0352b2079de6910221ed21c487a7367cff076e84e1cd3ec625065d7a9b8ce4eed9d91c8a72b16a4a50d96b8a00921695a00167b53471e79aa445c656fc0d41da64d836ac21a34be767c514d1571e500fcea435d1a1d59a6d07140ee4d1a4014cfa8a6f0be9c334ebdea053c842a06124dfd165232c1a2ce63babadd8a56fd78ffbed64b63bac3b49e5af81c746253bcfdfd045deec785e0e272ef8c7151bcefdad6fa2bea962d621abd97f9b5cbf1eab792139d16b51e1f732326a5e02926817ed0bc4c6c4680e42e7d5847d6e0195c402e59290ce8a8f040a70980eac1a0bcd3867ddc0f2de9b204514011491c8dd63a371d331b2edb870e76e7ec5b27146a0097b969a6b157d00f66ce53b71598b71869063b9a29b23f3623837385571962ac29ac868301e2ec0643bf639b074c8a28f0a66acbd0ad77e5c86d01cabd8fddd77a4fce6185768566a6d98e679986aaf9978c49189a2ef1a218977f4d2c34c5027188d816cc918061ad13421be77fb910ee5aef5e159fb74169d7763b446e523470409c4fc4e76aa6d98f120013d4af284bb0a8e9eecff71b8544f9d3815062173ad6d4e9c4727cd6395bd3da54237501c73390cc5c48683d780efec478d2a15a40a5ffa3455f52c092993859fc8ff9c1ebb308ed03b5b88f6de341c3be3ddc96f695d68c1562b85806e162f1b07c5f10a1213f8d85f6b7d92e06d664cda2ddba47b93e2922d30c3bb110405fc7dd9213812
 Output = 8d99392e447dbb7f7eefd329325bd71d1d984cfb01fd609c3283a84fdd0f0138
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 Entropy = 2fe6b9cf4510f212839e348d671b3345da68a477f57513ce363414e87299a717
@@ -2226,7 +2226,7 @@ EncodedPublicKey = 2970cafb137f0e7c060db72de03a46d8a860b0cb2a45b462e5530eb566bcd
 Ciphertext = 6899d650581d8ddd73d6e7095d24e2962ac573877204768c66a78047649ffd373d4e0cac20e0b98675e6f50962871c33957b5a7ba2af2ab800ad728c2d0e70877cc3f459ba53d432d45f4c9ff4c951c35f14185e01a1fbd735fc3ed84063b579e69c230f41af67c9cd7481fea81ed64bf248c63f56f81115ad8255a172fc99d87d8fdd6db00ee407618c7877a2486b6fac3b8eb7bea62c24bb5c5655e47388f2108ac36d5e55c5511d72bbba65706ffdf297cd0788b4c34ead564e86e78c605359b6b344380a4ec73a4f64b7866a2eaf36a494c76adba39158a3d1d3b41973cad055780ce211982fee596ba61e5e5f7e44cdd8b1d6f866c708d20403760b9fd4abf31a0573afa130aab5bf7493b2365ef5437b7824366fb3ec967016e2da547eb61276be7c5509c2bd5e16d8812c034f6b4c5a7f5f489137385ad5697c4312042303a5d7f62e398bf5fcc758ec1475e7ba671c656911bcc32ddedfdb07252ecd0eeea696046e3fc9e564b2ffca11562191c4a1e4b31d9494961fb66ad44f24c4b0d8d7422df106663600ba380baf53007b6146c923412228936d7324a87050e62b185bf3700959e262fc64bc4f2b55402d57c63539c57272240f4725ea23d389b17d6af64e864ce3429c9c0514c9b384d79b830a9c6fe12f8781755d53b8af9bf81e4784d9780ba6ba0ae36f89a99289307481bb3955075057648129349f1e0ce4e750be53372f82c92230127280f0f393150c89715a43eaac8abf538a031155661b489b066e915505d59ba40cc0b5a4b8de7e731533fd06dda44e65f22b7931c4b8e34a72331d32798aee1c16d81e06eeef892e7858ed2e9c27d21a3030567e40a369e21c925a26712e1ad6344474bf8e9539027040eb4b0cf65b627623ddf81253c6cf002f837673d2389cd296f9abfcd38a36c6976b03432c9100c7ce9bc862d2c98a6dc2f931f62e471369bbfab644f8ae37deb65784e6f5414bf88cba9e6836d3fa3c0ab7ceddd81d31e94c612224270fe79048688b6d8d46acc7d656a647888a469fdfb6ef8c8daf78a2270c5058e9b87d2fc0e4f8a098c1cebf96e06ff1edb382e545387b2314b2f7d4a669dff20122a0165c285258a39e2a1d27c5eac3d79ce0cdc64dff98a8633882db588a34b93a1403f6a739bd056cd2d6531af36a2701acf47617024cd1cd4b9b60a02cdfcc6f34e4693eba3bfb32780c573b4482a5f6bf109c7ee51792252dc119a5e41a4ea8f25557b64e500a83a6d8a839c456775a9ccb906a733391605bc487bbd6ea7272325df31cce2093649fa8a379f4977801240ea2be8b1e6a5ac95ba613bb2798bfd1cedfc34c39e1c43cc094f8bff34607f8419bc3ef2fc0c37075dc49280656304d2f642c5ffe86d5cdea4fe96cc8b4451954e5d898f6cdf7e7ec5af447dbda66a254b964df9e8dd565d46cdf04dd2d19ea1c7400925be2105e45343baa9855c5236dd70e042d0153c904d30fe45d087b0f0863ec603ad74baf1836b18c91d98455f3e6477936dba7379a6072744be6d4c64bca89ac3334ba727e0763f0ea52faff3daa52de9fad1f27e566e7a6e85914a02bdec5f7a8509f80a616f6ed66848d4ce8920757fb7611ee7c70366ce847fcb62a94452dd2523daa21c759f36cd31337afe1a5c8e8ce8799c6f03873f58bac3649e0d0fe6adea0199ef6eed64dd1e2fe0bc606b97ec8ed1e0b567baec2816273b7280ac91b05fb25e7467e934bf79025f5b4060a813c221291cb307f7783d5877987124ecab1d9d8c8e36c10608871a92e8878220f593cbd4ba61c35d2805500cdc0b145cd6ad2cd614481edbc913733e3a5104b0006dd26e871df58f32047701b2420d93bdc2d0a2474f7d9927e7f196993d9792e30cdff67ae89bc6a27236a6f0ce0439d4b04788765943c2be5c9fbc0f139135ded84ce79d876eeb37f30371194c8eba42659c185a10c8941f9fe9fcc722183ba7e22a7885a66d8cd10f214f4534171e0836d86368cd04d87737923da8801166afb398bb345b5bee89eb512cbae07f192aa50a932a5d92e909e65443f4004fca49de5eb19abedbf57d066d134e096e7c63defe4430f8e1886bdd3cfb8077f7196584398589ced5670c7be91d715a20f51603db8ef35724805eb1c270cf16b282ce7c79111e4577a0a1a27a435c070d6b3e89dce1bdb53826fe9a05d86e586ecd950d27247ceec6d
 Output = 71e358b21b3b98d915b70e9b877e94159aabe9df32737c71c50c2f99d7a074e3
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-1024
 Entropy = 86630b4f72820d19e9941784183b3a0d770609becd6fe0dc463cb6edac432d59
diff --git a/test/recipes/30-test_evp_data/evppkey_ml_kem_768_decap.txt b/test/recipes/30-test_evp_data/evppkey_ml_kem_768_decap.txt
index 518e578887811..ad1c8d5b96e09 100644
--- a/test/recipes/30-test_evp_data/evppkey_ml_kem_768_decap.txt
+++ b/test/recipes/30-test_evp_data/evppkey_ml_kem_768_decap.txt
@@ -2215,70 +2215,70 @@ EncodedPrivateKey = 16997ff80976d1506b23c012e387ac6ca0a792f7481ac3c9775317ee3ca5
 Input = bb7e0dca6eca3ef57e945d921c2f80875556f7786d6bcca1312f86b3bea6d0f0a73f7d6036a7c38c62d4e356961ec6a28d8026a2d915d9721ef815147fc09ca65a3394aa5dc14c08d41cbe932337b9a531ddf68df20b6aea297194ac398f15919830e3ee6c20145c0aae7a2cd276ccad7b5c414212f0c0ae7106333868938a6a00da19377d996c7796d400606007dff30fe554a5fef86944d43ba047a00da5c2c2a1aad053aeafcc75a1e826a417b4c320e60a68e63dd7b54827f5b8b0063a00043f29ce8975d95bd418eb2ed29db0d9263c67fdcc153ba9b5a33279becb7ab193c2f257bd660fd7012712be3fdc2e52490ade145e8e030ba1ee5368791e6f3efe00deb34cb454cbf7fdae3a507261d9fce66ab58998ca19380187e3455d425977a8396cee3442935e24347aed45fba9b323a289f1b98691e35017ecfd7a423cd8d0149432a2063e0786c2f912e1134ebed188511c905a1a9890cd55d496e8441ccf637b4d660d93c7a46c3e17219167c3b4740878ae35766470b5eff3c6b1fc8c30e5c9645a94ebd48d2d40fbd4baf9d822deb26c089da84043340a564e6c311bca18c7a2c868831fbb866d89652556b53297b9c0040e98a692fa536af4c9a7aa09321ca27068ca66c665b1121ee4529cb3e6d899964de759ab915b0d2c571c5aa76cd64df4a4e55d9de59eca7b4379b30f8559db41e804a18b8771f594b9bee3de9ae98a003430aac58c141e6f0b7b1e5e08e27d1127b682882be055ba31e280dbace7878ae60426626ea4c5bc034a9206e27f578edd17fa6c33180b649bc7bd437b2c86ef4e0f4583071f99090b95db1e415d21ddd88a910b1fd10e3a04e391d947558a6619683ae070be04cab88300614839503f088e2f04cc4a7d091af9833a4f957cfdc574b1c994673ea14dce6ad89adebf5130d266c1440b3f544eea380ba245e21651f1f2aeb2b3d578000a87683dec69ccac18b0702d3d030077981076766e7e5f3ae1174eaf21bf03662c6bda5fd209da19ff6792c0bbc5d210851061dcdd2e4794d2c3c0c531e92a2c4a23556878d3e890b65289a6a02530bbd40ed66db3bb220aeb71fcc3c0b5d5b3afc71377746b22ce636dba028bc052c219783d468fac1d4eed555c1b4676705c8d27aa8a09c6fd8640a6f7b6790ff173ac39b5f3c709281df4274cccdc1e3b690ac0a77f7ece34cdf3216d2b6058baf5f649ff5036360dff99334ff06a366785c0404c584f623801190082fe5cdf88f9cf41032681e8fd6b84d127add01d4b2286af648b83fe69aa8d109c9320bd40621cf75adff8603e3da00be36f03ed7925f19b2e913d756e952a9402cd4fbffc0428cd7eebdd7fc7d3b4cde181b16b26811cd53d9f5d85d37c1670b957d4b3d04fd06567ac68d3f9dbdd45d182619180cf9292e86f42bcc213e94900e0c759e051bc0e30ffbdb91a2493913dc8b81ba4c3e8ba0e7277dc38dc91eb2b27823dac71b6f1c47e2a04136e2c0474fe070e2e4bf8e6fc98e73143ead3c5f778ce8a4efde4
 Output = 5b357f714a293b6724c0dc2e2c5509676782a9dddb050d88e6efa0a6d09d20b7
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 EncodedPrivateKey = 00208080e8b3938b09aab715a0b7a09314c3d2aa03e900528a209c655886bf0180a0775a1ee133e543c17d7c24407131f0b813a9287c5c9939d43ba2c1f064015c1babc910d1024bfb46a3fbb1ae13dc5d8bb4576787a592495786a53d4c172cbd3b2cac6a2f5ab68fcfeb2a67a997d809800615c043e4bcc0985de9d671e6e0c8b071a20264c457c13b1f4734f234142e86c23170821d068210b29358694d8ff27e89c59264a315b6591d97d90ede633b68fbc36ca96b823a4bc66144b541cc118b0d60a66c89124d9080ae30f44b9f4793cfac65ab8b8cd65ac81cd95de566ca2c19906a955a04047052a699e8a132e2e48aab916278c49ccd1ca0076b5254784a23f7a8c164229bdb9b46e1c7bd4c74639053cad5226c598918687fbc50323f086238366c4ad9172346626b54ce142053de67ce8867cf599587d0a47aff0a7fc113140c18c40bb31e2340822cac294aeb3a02652b424ac9f1008a592ccf70170246e689edeab03dc0249ba59fcc6477fb668038443bf9a743255310df11b4c90a97bd212a74d5142bc6461a135ce7376995372a1bf919e3db20f22c683f488395a95e31ab13aa707c59f22e85d892830bb550395633f6c87df28401865106b5cffb75729391767522ac236072250c6f4dda196a90bbdfa183113c5fe2e31ba1187b4f682399f3c6c0288977904ab445c0c1b9caca030aa639b35029657c1608e3a654cbc39f8f096414d278059a6f56c8c838b1879b00ceff668190213eb15184a57706bd8c9111667f52a656d161bcb5e7cb8ef5beb6756371ba4297397eb6d0c850aac1e01025001b71a874a25e3ac16450228dc33691b3112de319f69ac29f2a1cdf02a0cd77319931003910331a6268f42669f4a90e79bb820e5c98aa252dcbd056318a050ab71f5d60028fc41594688cea4a95b32529c39c582ae828016644faf4b7b1fa6fd9c305807c43dbba54d44273669bcf956c197ea3462a30be3aabb1a6654dc4a72bbae53982ebb986e249d9438d66b65fa15b723267ce1fc1200bc26656d7c4e1839e02927a96304460a34a9c0a22ccf15c7390afed4a612ef236f9d00c22d04cc1dc362c08afd0a16536985f69f6a15d6585c410ac7a39599c683b9e67a33ee299a5000c7e4acde611bd6c817b1aeb1373835a245b916620be6ce8093f88635cfb619a963c99785cc5c354e5d025f954071e380876408fc5ac7fbbeb4c532b1f1be67ebfacac4cf907be9485c6da8da380809ee102af0c98beebb088c13d29830e7fca4dab8c1e8cc87a3b4198c50686c82626c41414d50878f403c10ac905f39a901405b93366a575338ed7d66c0a27c9dbc4af2d217688dc3909db8878000af307a989234174363f3cc35c25a42d7361ccadeca25a484a01967be2a65bf4998d57943759528d54e498ab18514a5665b87c98339c3fc01baaa2953abc1aba78778b26d54bdb2ab69dd705d6953dea404adf8c82d29b932e144f48a2661dc2129e6a2a1bc5242552374a504e0d135e6cfc9fb91a492e443c608c6e5342361aa8205ac744ecf974b667a6528938b6085492298e97ea827d5a4274ca359a1811c71a574dc986f4262b2e29256c4b52c9a22c3f168988cccad7dab73b47cd1ca43c7e036d41c94f8f31a0de404fa38a1da0992933d752acc0407234883488a581e340bf5a8dd7112099259ebfdb0cb094c8d592485f25729e1844870a3d57d63fe9c1295fc2c4a374508f359a7e9b062348c6c807322f1a2dc887a20ff1b8e951b103698492504dd86babc01339f5b0c9bdb01b65514c8df3a61abb7941da84b8005648fa0e5b094e54e56a56e8c840371349820dc3f48ef0fa488f180f57b5c0ad663512467836d6765f6517ebd0172d886430357baec25c709b3abb9c01dda27e2ac7c17cac7511726a39050fe92399e14780e3288ae775612b2c4baaa032af561d0356c43175c6263c5d9cbc62f57194c9f76fb5293e86d9a95a641325013dee98067d513525eb5d2f7cb5783915d0917faee635bcdab95a61592fdb1de202c439dba37a235e3888134249044519732701111385b9c91c2fc96b039d6483c6d1bba2223cb0f612c3f7c6dc62bf64a04b349a0fab73290acbb15ce1cfaa15c68d896493e67dd9a518782b35fe141a4d70bf33e97a616c51193b711b04a40c9634bb62726f748572155667146d311016880c670067c653e9a8dc0bc32865adbf41ba99f19b2dd9ac7998bfc8679c689a05a5038042885742a68ef84c429984588995a6cee077c3a099caa7a5d3761cb4411d1dab8fe7258c75903ef515b6b0629ff659436ff687e6625d2080671e0cbe0cb624bf8b367e780452ea3713804e083aa6e0c7adc15618cf223b3587a364320d56c58be8f037f89cae0be209ded78cbae29ed73767ede6793f0051cd5692f63661a257ccd9d859a92ac08784070bfa7ede4577e7ab1ff6c7b159089b8dbcc5ba56357b2659a7a04c8748a86991b2b775c2015a4c12341ebb419e1244396c233c161495366104b8e29979e571c9614fe10c868db56cd934c5b2d04986a70be8dc25d61cb6f0054d5e4000ef72557b712658d962b1e673a07222d59bcbc4e8339bb5b37cc1c2bbd38780f8233843ad420782b4951c3321888fc3b488897c8bab046f79cc456bba9f666ba261284a1285bf1a9a9d274d9b87788c225c0ffa20388183f35817e5825d450a1eee881f94a5a129e688ce6664021356580190a3ec5ed220b8a5878068ec5cd485816f8c1ee05c3c23ec0d0aab7f73aac249142d8992678b38410d41be710a285d3b593a8245e514a870c3c348fa45f99aacc464b399ecc0cb3c306c273e5f4c671b806864120a88c07caa53a550d52c5641203a7927b40631e21344a9337da2d128dbbb5f97b68b8e57cfbb1a67ca7741c60c2533e49ece409b0492a2e81523e6b6ad655a6dd1870b5de3690de3369c898b557886c4877ad1d67a1583bc70502b32a44afb9b60f88838eae005e2703ca26355ddc479bdf1a93756af16b7789a3221fed9a4e468b710035060752e884c56034b768d0a7106a4bebde7622bb46b6649195301192c498bb555c653c42f6d84883be82e8fa56ea303caac534014b6bbf38a9f73283e5a40b36e36c9d8b1a9856aa7d9913b22c40cb103b74853c53c3ab4ce895388aca8584449fae927b16534f48b3aaf350030a8460c8572bcc527f1f62bf1c5a9bb8ccf3ee66f66dc19286782911a6765c72db77ac0e976a2bc114a1b110000000000000000000000000000000000000000000000000000006bb77bbab15f219641914e23e02624045beeb4d7f4608d5e52063d1ecdd8ac5f11536217ef54eccc82ada15ed86ba2003e177f270bb5aeee52f9436e31a379d2
 Input = 1a2dd390e05984bfc0f55ef96da5050fd9bb03891d4d2ddea46c463aab28fdfaf63d4b2e0c9af992e4f1421efc26ae86c2b296f6851bbe2e898b8bdf4057e875d4a98469b7d2646edb86a5eb5259341e0d14986a8ccf93563bc6ac067f8ff6997c2e7bbd897f02e844f180769fec5af9d6fa017022cb0af622b6e4f7a69d73ab01d3d09067b118d51805e1b6413b7a9e0ef292a6fca18a8828912a2db675f0244cd63d9340aa3ca00dc5d70c915b0061664b1e1d64d3d4dced3ef739302f1063442569efed0dfbe8c019c27823a3aabd865a47600ff9e24f748302bfca1bb60faf4105889a548be9ecaf266d8f02d3aa4997202477a70ee71b6e79dd1609acb4dabab72a38448758d8debf55369c5d3e0870ca193018e0ae6d0ffa33b93e962598b43e89d5978a9d55a608b98ceae5e897363f8a9e253acf8af560c57e07c4c4bde807620b6deb76d581bf92b7f514509446f5c4e4d09430b1855e62854988302c931b9e624644a636ab8acaec56d7673b26852c692e8325fa1b6215f24ebfb388ad1022fedc0bef272c87e10dca97df1e63f1a0e9582daae0f49e30c6acd119f7c4eef59d47443f491df846431cfbd23900341086a304589f52de1d862c26af32095e922b92650c68facfc13892430d428f626fba00cf9501e1e4646e55f5304c806b5acafe100084d7635702139725561522632e7e3871effe883298a7264a411484cdef78f9e721c0e5f3937f2fb7d40bb91620e473f9b97adddea69b3ac682e8aea2513b985fbae268176c1bff90e401a31e729fe8b76d13b5c8c85ed833d9b076b5e11acecbf0e96edcf8ff562255124edbeb5b9117cf486f30d7883aa353b9e433a77ac6912cc8e5093c12385ad926be1d0893afc7e64fb9ec55d3285e01a3ca63f3c07b95399bb4411c3f820f53d8350d1979ee9cc6bbf2d7c92d0cb2fd0a1de910d92589cf1aac29992489bc179676c31ae768869398fda50ff14860a1b4dd3bb2e4ba8b2c87aef7ee00d375956a62dc1e5d548a59f209448e62c4b1221631d4776dd5192154d637217d31feea1c4cb3ef1903b8987f4c184cf3d6b5355ad53c7bd3e0ae5373d9971115698214a93e12b98489cdd75028cf22c1da41096daca95854b35d8bbf7d0d4ca2727aa511eeb6cec5352ed487bd3b00b261cbabcfa9f082ba7300610c6f92725d532a86e00b2ed1929a8be7a342c079835a2285569dca92a808049f170fba39d990884ef39ca511aaf9a713b8d78973b4f4a2fde7ca8b6adbdc5a70241fe3ea7d005b33e48cc9fe6ce5bc2bae0746827e548332adf83f8aa707e703fd688c494136d8dfa50961a9e5b69b542ed6ae0e70ae159df95dd9d4789e284a675fe048585214047f7f6819f7f011141d265de9fd4c04f4ed5dead63fa4c8938b2f42108d263d5394d164b3254294402cbeb48663cf1ab2c296d6ada107e8aa5b505da49af96e1cebc6b302faa148216d38b9e8130cc654974ce299172cb875742e62c32c063ffe7535db2726f65fc8f600d4dbb1a20f
 Output = 54c35602dafe572b99aedb7069a59c4f7818c860b27a947347657ac1954d6454
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 EncodedPrivateKey = c5f6c739c640b093956cfb9d54272b3c704d3b364ff1c68510b875c8c29f30051b5f60b53f6341082252746b8d4eb52b3f77c818d42ac776ad393072d458a28b186da2b61cf64bc6d8b424afb49a3b2528d4863c876aac69b7c7fa95314dd36ab5f021ba8c575ca458c469409b71b31f3a8e371937405067951c084b6a832ab321642c82f33395b0701e5a677c3c783a47d7a6e474af454c1b31b174ce5285e90608e1932493e44bf48b921d6a58b1b86ec2a38b8ba2a1fe884c0fd608af3986270391d1a42843637d75194722d31bc81b2b507ccc0fdb309e59549a874d09239bec5a41c4e9bb48d6968152ac9d431cc3b290371296b8056ed56898b272b948e556926478291cb0eb1bac50b6718e98b74a1777e685b7b6d7cd6b22bb5846c69149b4e7b292a4153763b768cd5a67b65c3d059464ccc123ac086f9f41c3395a56ff3152fe149d76ac2fee2079653326bdd82dd6f66b6687a7fbe00d9832b09135756c5819b1f66dc44c7b32c2496f63cf077ab51b8626d0918030134b8384c565f0715167b21fab697e84c6838a71176748f12334078c27dda3133bd44abd69bf631badb5f2664f2857c033102ce8284e4b2beb9095cbb40587bbbf457054f4d11bf938af207c1cdc5217b0e9797bf9ac88f3943873c8b66883d2ba5ec7e6696d50a69ba55457853bc526819f1a6fe09973fbd19832312b554653b8441e5eb01884e94a355732e3da645eb849f520bb2bb4327d560612852152f8cba2f77db8d21922da08e60bb9e3b39b9b85bbeb9b1715982d292b8f1017cd3e60447278cc0257898575a0eab1408122bb3fba17b62a31902a567a0821d42086aa6417c259a1dbc93b25003fcdec9f6a5507b4b732a43c444c5825a05119cd089fb2e569f70b4d5e6919faf15d6eea641f5a2875763f42b3991f7c89fe473cc057c148ac58b6c88dce537da8632c10ac851f8916fb7b6ce89ba5053b8d95d29ea5d36c91981042c4aa1330aa098a6ab256ade08592a05c95021606adea0ab637824214009c2b915be450a1f7434ea2c7f562a4fe21139c2652ca8785af3208f4927abae698dd435e90e7474556af9b907f6d73c4ee64897dc74c6a876eba1b598e784b8094232dc62bf1119ef764bd1a3bb2d4fc7de069273a223abe5269a1403873087906db164b58435ef41d7d78b36087062419123c8b1d54da918f34920d3302ddaa300797b32c1c81b82798e421ab2589964334714a75cc84548031d5810fd87890a1932c98bad37c860bb15663cc0e91880af1947b8a26be9183b648b714f763b81652786682c210301852776aa673a1fde470afb56eb0b0114895638c609d8d55585d68c165f7aad64c1406a165788c3364667f0a3c65aa300fc4585e959abbc5e1b316aa108a1cbf703965a74475147a2d323b7295d185571000e43b9120b76fb0105ee7a385965026e8f8309d4badef88b433a59090f88bc4eb4ee2f6c1f0d880057b477e628bc35b023a4c9ab682822556afeb32b6c9088e35c107e2a43506c43a986a0420f5164167519c4029b47bc81e93c1ec149e6083b13589bd2a9c64fc6247ec323b8cb73cb9f9ccfb8bcf25617a87a3c2d8b5158ac8661dfc789e92cc47340db6d04313d3a689b357566b9743cace5d5b906a39249f1c2bcdf335f37aac2565932631ac318bbb7ca75db36ac198ac6b15a02173049721d10f7521a52f358f35f3719269a695a4b0fa03b32d8a209aa12a5d786d8dea4ba05498ba222eadd647dd5a397e655ed309883d76326231a6764a7ba4226567022d70fa20cc53a045cc5a1fc54abe0189a4a2b6bf8a969d61706944bc59c6add2992b6e562e9732973d32b97956203dbc523803ca0a462ae118633483cab85c645ee3ad51682c0596378dea5e93bc7ab652648cf1954745172a75c2bf6a3177a7841b089b6ee911149871a9d987c6d499b6e0c4d15c9b74685401b680d3e112d6d70bdad6a3f9954b0057335ca36823328ac4e124d55b9932d548f58b85a32844e9f0260d8a4339285ab46152bbc05a967c5f16072f16178687b0bc06b621f5a4a14ef86b9cf1bade0185c5c52b3f2c407479467e5516ab9a1128260317605d4db250e8f4b59bf28a6ac2606d280af28664b75092fdea1fe9374976722dff579728e121fc1944891c586625a880a7bd154aace3e919b841b1f5f8c0fb841d1eac1fb18002ece216d42cb401dc1681836c1198653456c9392944054200a3b95b986a396d443a306b66018b525fbbb042e662ec108f6b872749d3287440c12bd07d1061a524a01ad7342d74f8a4b76222c5a439eef4235d51c9494602f6624dee256ea7fc09ceba9877f9332bf195c43502ee43c75e78720c306c2fa47f4ef6b7d69038dbcb8272b334c98cb665b306c04252fad3559eda4b96c14bf50b78d4a9a37081a2d61cad33b3b9418bba25409fbf4a5bb3c775a43b39520b37b5b82191b4983398858bbb0c6c8031b9736a5f76cab0e647443cb6d983a5e0a6c27756cbf471baa17870015566db8c8a51aba969e976a1c6cb2be166f20680893950ddf09cf8e3827a2a884a7a65d61c7c70a522d17ac0939625fe63958741255b012712e76fa8da809a8cb447d730d4097bd3e86471019dc8897bfc82c3804a76a38919f7cb50ce79bc13ec4bdda215bda9789503aa822c71ad8107a35818a7cb055b303338e465933565b94950c11836e8e33ae8093b0aa0c5d5d555cbec5eb4190eecaa1525014e8a341e9400180937afeb126c278a5bc4713fe9c417c50c1e47c8756fbb6a6b265bdffb4c1456c5b7d7a895b6932dd9a55623341354549283ccfb36abb3068b2db7348bdb1172318357bac12422ab93a32b453bcc0faa4e8e595b05a145e614aded6bb77278bd78907b828b18a22aabea48bdd69cab061522a618cf39406f6c78cb983354384415d8b857cb451e01b24f489a3133070d775307fb61a0f6d56d1255c4d4e18c62e57d8422080cebc919b81e67c4304cdb560ab16d929413af650a53f870e8017e90096452ca3ea648ca644010d34bb79c5898b775b197189a55840f43371dd9cccb7b4a28a66309a515658f06acdddc47042acee250a37632b42af51adf1c0666902fe0acbfc8f59127753a40161de4ca07a5c8bec0d8ad3141487da4a842147b9de945e4962699033375548d680b88ae8354d6114efe284517778eb9b7957eecaf5b4165424a5f82f100d02b7d39968b98f69c2cea1a0b39394f49265b492ea8f4000000000000000000000000000000000000000000000000000000050f496e61849154f498d752102402b70d58f7e61615f724973e5ffa9065b18a2e8541047591efe1847559704339d0ddba611d0ff8017cdc84e61184715c93e2
 Input = bc07d2caff561b4645e3878d1de0730a88c05f46348526829a396f05a0a00603f0e2fc79e13beaacbe903827c20d9d687f3fb4eb2a8e9335459fb21380b8bf3734518778d8cfae9524ead1427c6a2dc379ddd2e985e2977bb63e932ed59c83a8b9a593e2adba0cc5f106620fc8c6c4cba5106bfdb4105def0c1d7b6800327cacb964e1d4ebbddfaa15b279115a1d05754c0c8a715fc2fe5aa09af7b96d5a93e758458aa5af8cba03b942f4d3c0fbbc2a45d3f7af5818d67219a72f4f538883ee2d3e507e2dbf4f7748446443bb71bfbb4eff0f57d8154d29f5cb26cfb52c51b676e9b1ac08786d5f475cbbfb49697a748b7902a83da49d285a48c7e9cae74b66a30b02a353a287b40a66a0663e7a71adab7d03272f2ec32d47097d4c303396db3e7b7a947f467a70646777cda227d72310806107b5dc16cfb36918e88784524e3a46c30242a40811593aa8f72c742f885a9623534753b2bac5e29110a1a854646abe1c0337251e85987aa612f3a095409a5a632af14acd19491577223c278b18a9c3ffa7f72ae49b89df6dc45ebb2803ece96cfa94ef9ef5b24fbe686ff90d130d3ae953a4f9ee6581a346b0612f84cb6ccad4fe94a53602817d67c61a9604d288319f5933f4a97dcc6ffc36cf14db593fe27f873be712186a6695d949d4552dab37e36e2e0ced229ea9dccd6d3bae22f9fb888ef400b594ec08a15972e8d2478e50f11947b52bf384c731b0e50dcd4ba116abab8af3b880c54badb11d83b4266d3e5fc25c2c8dbbba12fee2fa5c2017987f31277a67ac702b8dbe110894a8c81011c7c662ce9ab96a2e25cf5056a3e202dbf6bd5bef2347537f7811637e932d13ce02283d48d032c284b6cfb84fd813b6c3421017a7527eafcd3fbc5d4324b5351b30abcf1b366f424a8a0b5edf6bc1f3e8702b03eff875687c6caebd7bc15f1118696cc63859e3aab75aa9acc58484da7f2bc9a120844e4830429c0eee2b2324890bde302bc93f661edd9c04e1183528482f9950654e8c267234245aa9482d94e90e00e929b65431f986e7bb34524cc41f4b4443646713c7abe6c4131a2d67f3bf42f0a7f2eddf82b5c08a94d99a0a7d14c1b0b375fc158b7d4276eab22efb438f0d0a9b30e9dc127026181e42643af8da0b24bd10a532069392724948ad722b25477b481006fc1fd030aa62b217e6695dd4c7ad34dbfb75aff1df5774b061a4ea8526e9bcdf9679405c0d2e40dca00c9e80840e832fd663596dc55f602d094253893405a02d4414f119d23c4544cf832888db5ae8494dd2e8ee357753515d929b8a37b5b45446ffac20fb204b5c937f6344c453ffa449fe839b4afe1da61301057338fe29df93aa962a7374a2ec181ffff9252c8af5c3f75ebee02fba58a76066df4c6acfd5d1c18390652eb2f469d35dd708e63a498c08c5241b2717333904ba0e6e0845dca8c9608f28bd1046805cf7b220498145b23cb18184a259458dd2fbaeb1c383005a0d289562b0a9daf7d1e320aa302fd3d9a02c65fa901d46d4
 Output = 7e1b4195e9cb70e6884d3d00f0b3f0a66b4d8c00ce112e1e79a1dd236ab62b26
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 EncodedPrivateKey = ea53a046a53b7e3298d588b38c403e67b5620c5c73a438ab7357660362ab3822b5e774a9dae973c83a96db79b550dc176f9b0182d37f12118bc96a4982249a352219a110704e4a0ddbe545e4f55cfc2c50d54cac33ecb6fcbb3ac2a7bd4e41282476797a3c24f4ac4f60c33da281cb1313035c9c804d755267894d867469dbfac7be52a34f55c0dc642354e52967b043a0e0167c806581b51519e04af675147578c79f492da3ac0748352c6e5c7ff462008cb42e9817155444b214c3b93ff3ae7d44b5c2b659627a833cc18ccfab4fe6d6513dfa67cec499cd7a0d052a5f9ba378bff75033e69ad053c04b74c8cd756c7cc0bd494129e069cfb4358324066415bc2a4d1cb8401867c9954aa8a33f929ca279696cd515bff0abcb6c8692aa9cc076861e2bf27ec360983f775e9f166964d0c43c380366f19d3f868a7e038752d30e389c0c057b6d93a9ae64746d5b3a146d31269b94c7a753412be68d09d820be6890e5db1ec3eab1acb14cee8a317ee7ba0eb6027f13a540b07c12cb1164bc7d295c16eef4c8d9773bd2d32ead764f58fa48abc2a5491bbe00e07965017ebf40c973343704112bc90849d219c70b028ff3769e720c4599098d172674358bcaa8947ba6b874e3d94e623122ffb3984a0b571632be1c540cc5da45ed1c57da1054abbc4456678249a2589544c3dfdb6330ab35416ca49c8046c9446150660b45e05b720722bf390e307445dd8a3e23253cbf633c8ccb098976a68e481ee86b86a32865d9caaf385842cdd071b0974e807710e2b44c598a4a36bb2af048b0fd30bb6c64a539513ed2a5a9c6cb16129cb88d6bc62389b4846a2a0afc532eeb0f055aa85ce7b43f8099cbf194e664c59e683e535ca809d40f72d4a3d5e287b5ca3880d4af1f1523b60c8f811a17b2881602ec0393d54988d63a1620a48ab25a5336b25ca25d5b21425ee54673062020f065693665c68399691748ed8c2b6ea47b89391e7dbcbb3e4bb8bc0972916aa0ee5b90292b23618c5e9a68bff8476fec1c7e382b1cddd45069263a507c44b97663a9c8b4bc690c89d25893c4caca0caa7633bc66f449bc06603fb747843b0a8ce11d46ca100b3243a8617904a2ae48db08ba24bacd5b946cc96b834491a246850c44a0f049bb3e099b3353b28c3889bd4520ce75749b745e65e6442d970e917362cafcc9cd1a6194d9ba41f29feab98320e10234c1b0fa367f7c3a420052a9ace9a0787bbc420832db814e8f86804fb74090146f899a624ee9739ed55c40b3716724b8a8164b8b976130d89e15dc24e2078f24a953b2781b7d36a12334356a6998870a0128ab5152a89ddc84aca3475f8cf849bd762ea7b23bd2d743a9d3a9a2c2ae4723b5c1a3b5349a2d4bd2907d89ab8fe80624838130697bb1d45f873a3416164f862630e96075fbc5192be26755eaa1f33026a1f201a05b6b57ccc83fe9c191b13016a921532c4558b44ff0a26c864c3102ca921c299b38199f7162938387c3598362e5f616756bb5aad68c68e0a34ce96684597712341f391ca6696538582ab0dbd532c7757b5b24b0413145395123f0c4668cd538782b0f65ecc30b687efa78183de47f53b73831210c513c54febca5ddabceea01649d9c6588d68c05e93cb6959fbe348468cb6e7f482d2b0507a097625325a7ff5740086bc203410414845a177c578698b313842dd2737d79806fdc8aa4ad8b91b514b6aab60885a49be68ba60d05891dd1cb47c1850b0105ec15a95c93136f22a170e346d2256a0cea672941335423cde35492967759b4317981c34fb0d759a2b08aeb411c362b2630c4b8ef342cf844206d7a5a3934bdfda95ba9fac912fb1844a0bb62041868ba0e3660a5551951b39880eac2959b5028eaa765492416ecf7a05102450eb20eb2a28be460972066b41ac87abcc28b38a7c92d91779e0c7cc8b42f107b48269521edf0c558a1b767536d295c3a7e60b9de6a8f299563be7c4d33d33940234af8c7764b181fb7b5af1dc88e4e830725533656520af7344e4ab40f6df34a90a898c672b854021d0631c1b1e9999d8176b22a5ce829a240642e19472e635a83c5086f87872f72a62e5fa038481a6861141227666f9203675db45a444c6310518d86a9221c9b6bedd753bb7914f7995e39031963ea056536a96c9b14598c95652091dba9210168467d7388b73770aa905052645eaa877c6f8a45acbb775d080521479314e214a5217835667dc2cc67dac17b0103b1049a03585b30631c6dac53b6d4056e5877786b295fe94c8804b57a027609bee938a8812666d12345e04c92469463443fad1c2188c951cfc6a06c3b8c3ad8856ef26a67b7841428a1f5b69a3fb82cad843a55645b78219d6de824701b0b1f192d4f816f45032b1cd5b465d33b3a9cb2fb04cb271a3cc74a8bf7ab6ac7a00e8ce6a0486c660680219c6ace0917b31595584f4756c9c5273ee36c37d25d5da146e57613edd34795b9cf61bbb7ebc441d575631215a87c4070159136348854c297cf3ca44fb2814448e30eb2c555aa2393bee966ceec0221a278f048aaa6d09b1d801aa0fb369ae4480f051329390af222712c61a59f98a31a03ba90c1a6c34c1c98c0be7bf59fd717ad9894786acb1cd081405c66a2e79a1fd77cad853761461c99218aca3cf4920703654fb9529c106f41a78b259294709bbc91679d0442bb383c28d64683ebdc7b94f4592c8ba2c1126c9dba9377040d3a124176fa33a3905cbb96764bc89a69480b74e38f558b422ef22e390bbc76e048c01129c97c26125bb2f86c4bcd274816265d8c41167223b0a22406d2a193ad3b1083b0cb75f9542e55b9aac02845f59618b5aa580b5b2bb44c192a906ce61b8c368278618d8ca8409fc02bb9b097acb208e3c2a9b651a316b70cafe6b9bdb32ad794b4f018b66ce55639e5558f5a3990475794bcaa06f17093d490fa583e6fd9596b40958359a30f813b940b1e1e4223d3857cfea691eeca944de845c2fb502e35a5f1a3750454593fe1c41662a3b3da407aa269c43167acc98f5f3c662d6177d3594d0cb800087c6a525c586d86c12e941b046625d90c8ec6dc8a5c546abb19a0b585aef39379db926691124265103bbb49cfc4e9100c803b4ef68a904273a6c899e48609bca003bcea9cf82203d52b5f9b65c409ba9503b3b16c7077465aae45d2cd4ada79ca43a9e99a124b7c9fa24a323f6c6bc18b81d9a6161191561f3776740b539479582a46bd913ad73e0900000000000000000000000000000000000000000000000000000009ff3bbc6c725ac014b798e2d5146532f55ca1f580b27b436aafd30679eb4bf35ea63afb095b03165e6f3b9488778fdd771036713df7b893ab8777554eb05f64
 Input = 79efa2d537baa2b87a787317162d3dbcb40cb3c25f540ddb91aea6cea9870bbc5a5f86f8900b913fd4154bcfc7c8a463b9b66118c502ddad539186fcb079664f44a5363cc8d80d6a4c09f28cf8952157526cfef7bad2fc2cb69ff03ac39e37d47faab64cf54f63919303badeaab9e59df7040511ae335c5230e46e00a666b994d647d11cb032e7ee235b5e18b1894621ae93ee129823334580381b857cf0360196cb75180410f9fe7558d0e189502a5dbac5b4f0597cb3d1d201f89de26f7b4ec0d200a418a26cfb82cd4496c3ee22f6eb60f3ad2e1af981c238da13063d1746d65f77ce0ef30894468b687b31443c7acacfc3b3878fc9ec56878e7bd1a9f72ecb1706a4e5face0a83282cbc2bd15c89afbe3c97dfaf395a96ffbe1a3f75af03311afc69dbc01b11ffed2aeb8906505e910105806febc6e1298fbb5c0bf501232b888b7e8b285953d250b866a20cfdc7833a732966b3a03485ae2852d0a3fbeec6dfd0ec8015db5de69e55f091e956ab4392834c5128417105541b1145b27175fe35efbf3102277b35e42bd83aac25e25da6c55c28a03b9e2a8135871b4cc49fbfd5598c9eaa2482f249c0b6332a6999306be55921a3016499bc63a072a6e9eac894a3ec209177d07208d0d271c47f8065d0facd2e975011944f7884088768fdc053cf86f31f6d348222c06467fcf8ce0d404a2558e8cc422521a4e249549037d3e8a29e03a9a9bb511d9ffef4c5185a380d874732c9e862a6e8fa3fb72b213dab2ad0d91b047440b1d334660067566e6d2e14765d8fd0a45b9b8e8566419a6d7138e5a106c31b1278d50027d152bc8658d7045cb2297bb8382585b38be2d5fafaa7e8c867c74be013793874f181a9798193dee26fd5812eb469d1b842a969cda65d3440c67b00e6d1c3ae8630165499c1b4cf3153fb5731916ab779a2562ec62637d747d61342d832aed330e5cd794de900fa507d4b5fbdbc5f3ec1aa69d0319b3644d46d9502d435c1b5a329c0d3524611a145e3024595e91c2afd577a422d59d4d54a430f439534003be467b6f018736c4bebceaf7c83c799c2b7745ce7498dc84b9e455b96410dba1a0a5720fe703b7c0d859a42445eee7ca3353f294438a7d463fc3e98f4403f93b5fc4add88cc22db7bba150a2988639ba96cba8e2a0c980c9bf8cebdb5beb262d79e86cceb774750cd9a192ae93d85e60722ec6590beb7df8e4d036837c97dc05c7964dab00034683a576da5b51aa8a0622edc27975978c7daf1b942285572b09c170dd332a99bbf703d84becc6a96373fd1c0b355f063e4c2c6e59f5437802676000a819b9b99418df893b98a8e6ca22d95da2c151fb24a3a0e5944ac4ca6376e6c281b275589a3907c0473282967a121f1792d09a15e9d71e71e73f9f627ef0dd478061cf053af434b0663624c3bbafe0f37d7a32504e9c686f41bf48e287aaa8fadb73fece907f26a9576611ab2176a58e5c1f3e98ec0248a15774434c2a81c7a8f57f9950b83c0d3770d17c4e57582387d6f19bd
 Output = 2522e72d308dc9d7d701e0b024af9e15627572f13573b27c406fa750df9636fd
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 EncodedPrivateKey = a7d40e120206cecb9458a1464b96c447db086780708c7435e40bafe1ab8cf26caced91b888711b8b95414e080c2be24d7a622c2e0410fb9c795a25a50554abe8b9049f9890e29531cca88e4284a5bcec559f939061b003510c8a23991cf474ba6676b0599c86dcc0976f3b61cb624954d3914bf28e109193ef1b9efdacace8574dceda34905485e1a79d51c8ba06722150d8a243d69f671c18b1c2a77c990699b72ef5b1c4aaa121a8e5a6cc971178127024166f2593893bf3b9e0db273040b0821051cab28af5196b8937538a680b39251b08051502c2a3d5504f78b767dce91e2116280c3532e9426b93d8cae3e9abc5aa4832c6bfb02a71559bb689f82c22835fb314a5e6d44bc4085eb39ab41555103033a0f4b6aabfc5246c93c07840254989301f88776c06c9f808369e18445058b4d940783d57b7d7901b0d63a6e6512b31a63ce0704028d936462c18eb4bb78accc3dc56884d9837d8632a258c4e998cc536248aacc62f7b9b65191a28a27a1cf44a0d512875ad5112e034c0adbcc67edb84eb000bf3621e7c1c5cad1cbd06f848c5d8c3601b07463b5c0e33cd260a2ec99a972c47cda74229f6292221391f37d20903aa76eb6966195acac6373a41db78b8f7515a473ba04397c2e94a26a6acd8f2cccdc572d4b60e56880fd0295152e18bc79699feb1a0b6f6c7ee19545f4124eeda5755a85d79fc2dddd2848216576e9ab4d07b7ecf77a74937cc1605602c62003dd5abaf601b55ab0cdb37bb3110290f829a742c5607ab24a50000f3191f435427b5345ef884b91811bc44fc4c6de32bdb0a73edf80c8783a5a6b6a2d06657b16104cd62ad847206ec1b87729260e91b2afde6b0f13a87025c10bafa88e1fb1a66b98a5308a2c4f10874324179a2729df786627271ac5a945072beadf878035169c543c0b07acc49241b7feb406f524b71c787ed757a3d48c233bb75d97c42e03b9973cc680169520e400b00879cf2bc9119325586719f22e1b2de163184b2c43735b2c1a8654c92138b90c458421f681136e0d6c417b20a5f8c126d3672a4073942855b127a87ce96c7e34861923b3ea9bc9f0aa277746927f0777814862b0845c3bdc12309241f387cc6f4ba4a9688b947ec8b5603ce88ccac5c35756d0031ab4a5e32f6ca97184df2acb38f724fee64a6a688c69f6b913576af98ea2487db097d7c81dbc2a29a381b2345495160c348e8207e313929dc08412304f6a01c90f6889e23b7974bbd6f081f52dba8baa716b53769e6f71b962156cd44a3f50563efb3b65741aa26e42a3720ce737c7a7ad5c875663bfe36bde03b106647ba1ef098569bc10a0940cd300d58571dd354ca5ef714733bafa4308b3c4b7528862664a8656d16c9c3837355e39072db20af20025306390ef32931e793e33333cfd893c6227215027ab7ba9cc0212ebc749abbc62be483b3e2406a5ca10d7fc534166646473c27979053928aa5445c4c1c26cde40777aca39f5a64161c322135fa176d44b694341a0d3a05de662ef0e1aced53c4ea2762c1333da3f987fac65ea63a17b55c3f681c568d648966eccd095928f2e32af2fcb0674ba3a50350e282c99af149ab1b3f52d3b9f838b1aa8cc5e2c1184862562b91806efa62f1b72a8ec43e70663de1f66a59687ae0cc1d9de1ce69244fccb0841b4b1de2e964e29408094a1ac0a9b4daa836e94454ebb942c6e9ac66f39abae73f61a99834292ada3c824bb53c8e67912a07377da92e63087f8d947f59d94a842b7aa8832b2c3c1aa957577f55027e76c106f86946f036804671b0e0416cf62e70eb8194d88030e2b38585181c4ab1fd8165a821bd68dc8fb3b403016ba5fd129bb9d23182029c4a292433087632816c009a237a608e65cbae17d688a326bd6c1ab4634576fdab2322b983f29c3e63b31303cc386bc90641c84965572c49a91f4e8258764834f38ca7f869cddbb10674d4296e5205ad805ac48462d3b31a9e6067fc0a27470aa593b896c3c319357b9bdf0632bf0786fadb0ac242609462a06f82460ea75762a678fcb07c350649d13c24c9e33200c9ca0e9bb87dd2c8578c7c4e27b1b75681a0b6aec6a55e767c4e14820f2ea609a16b862d5695556b0937f53e0ae370086c8f771295b1a09f0003a07bf512c4272f7241752a6603f8f51ea9a088e5263a59eb0b13b87a1d2929c2c29557681f180261f46c294de4aeaf380ca5f79efa2c64ed3131272ba489494ddbea14c69c46fd6346a7ec9f72d89559435e139a67bc3240bca29b3774127dd85d53c20bef719724612c462bc598c54738c87a00a9cb8c4b44e4e7ad4573afd9324fcab820cbf2091fd83fea52adc1b82b3f6c86369aa358498197631a20d40c790c2ddc66b0871c1ef882305bd978055bb934467d3ffc0359c2b31748cb19f615a63262fdf695f555be1ac432126b08e4a97acc18b8606ab6adc5cbe4589389e1121d737ba2b3a84d02bfbaa669f3a06b1be13fafd42a1773c830749cad35456e956c0ee64a5fcc46f1763c3b0c0d3de5c296a28f61194ae72979add8c7ce710d4ee846af81cba3e18d5e459addea9fb565b010e9ceed5798155227dcab155984635d7539d68c9f0d30537ce8b573b6bef1170540d0c10528737d6a5b219b2d96e5709a721b40536ee3c416fcec0bdba013b0fc0e786c9765d312692a80a5c9a3d65a6662788d194722d63b4bdcaa700e4c3daeb911e4d45674c3720be35269a21c0717a4c3aa2f3e1ab4f20a885cac44228138ebb70bb4548dedf8678d2163c339c1a9c719c2f1a51748571358c1451b0ced7b90109c98591126fbe57e1c913b5a935eff14450a22c4a108108b99b6efcc9bfd8438b5024677144885f1886ba068a6191ae17b9ffac1087bc94badf510095baa7167a7fe245a89a2a627d2631706a15d5aa081d037a4101b217c1c45fa0d83dc790447121cd9a533592cf8ac424de8770b45307f0aab484467c4acaa82a5669f7621e8ca42ec0b9222766b52775173b288ff5b01d70a60a853aa44917b8cd09a4b666138e91a3206c97877c96d690957b58553018f55f168c1c51bd9a48ae762a65dc73f366c79e77c42e793750924bcc1472cd5e552e20868a42047593842619c2e0fd40a3c7bba9557bb5c71185430a0158b9b95d04fefa266005141ffb4ba5160a5eee1499c09b11c549bc88cc501dc94a0a5828ee8a776a2a4aba3bafd410cc8354216cc3a93a457e9847af39b898b04b60a0c661a72a2df2b000000000000000000000000000000000000000000000000000000da8d41b69d2601355a1e57206c862dee967af0224b3c5ccbbbb89be1bf12fc688bac5e523fc2f73973b46b1727891a6077329e10e94acd027c9dfa38ef4e21e4
 Input = b0e578cabf9deab616e52934955f42eec74bde5ea98acb022c427e08232142dd08f9120eefe5f455c8f120e672cb68f3a146c3aa457b637d0901fe2b4cd45e8b208e06823b8aae09778cd00fff5bed5232d219a2c33645f2dc30593e591f697118a8472eadbce05c9fbbc5d4b717b880065173cc0854182555376dbbe39194e4204067358808c890e5fe96028921fca344e3500b615f2201a1c4e4d13dcc889cc9b1ac72429074c21a52f4c78ea2c467d65cd2c9ed682f21f31b27af4eb5cad33dd633185bf32e726fe6e57b03168803f693bd85f5a9f2c3ec6944e9ded2b8f3270a89139ce50ba6ded6bc6b0be8893f44aa5856acda60dc1c4c0834d45574ecb6183d6e59a183c0125ff45c718be2cf85b5ce6daae6e37336ea63856561f1bd4404df725d5ed9263038d1c623b2e1aeb35924b79de474407168834891af783fe5d83a631eb14d7cfa949d698ffa45e7d8c46ed4abf75cc666b78526c9b95ebb2920c77c56227eae6c893b57f9f463ff2ebc9acddb2f7ad543c5b2259047a4cc87ad05c08bbf02e8bb267bc490c4b67106fb598d42135c927fef3397f4c3f6838776787f23a9759dd3214075e79eb3929932becde84e82c257e4638a19e1e3312cfe09d4ac681d653d749c8fa6efa6dac35ad59399f1e233540fa354681ca55db90007039b7e504e2e4082aa3e4d672019741aa02a281454d4e1c73a1c7d0b5449c2e143ceaa3b18cb9a74a89f1ba74963dc5dd4155a356211277af3a267947700a2cfd84a605ab02d37bd6faa8a26b50f7b3d9bdc79913272c31dcc0f0183d05933a9f233504ddee2dd851529667ec5174a3d23bfca197538ebacda36bc29ca675384c0b3f45e4f67fb66d8dd4aa57b7da50ead391e6b663af173e7f4d46139f5d0f4cea84dd32e4e718967c6b93617271224f2fb3a1ca5febff5f26c4edc60e9acdd9e464ebb4571dced645814e1038a50515a7e06501adb2de19fec4119dec7548c41097964c3151226153ccac24abd1415579ba1c37c805a5827332d97ba90713829fb30b7b09b275d75bc10d4a26b33980a0ccd4b00844d9f379551bd0170ee895286526ea9625a72b6cb8decd9cf18e57262f8102a025025e8168465a65a7c7e4d5fc8742781acdc16171085d51dd5ec9f4f71f58cfaf4557a55d07e7c164ccf7eb427145c7f9a800e9bd9192ec0f74d19fc17d3881b1d55e8600aa55abf78fd1e226d9dd6e8da2bea15712f5f43325d4b9c083d6e37d35c043f2bc8c796ade072555263331bee7fffa54e2099135ea363575847abb770322376cbfd3f1b7980a1857c55fc82aa80bdcd701c7b7d66221f08492efb5438a04d041b485bcb61f6fd306e96cfe758d99ca1cee70b200eedee86145fe37ab7aafcfbb2df694361fe9923e754187c3277cc895c4a53732ee118c7b6156b55b30847a6e828b7069a5d4be623abff66ba87bff49294dd9b1f698ba445d610973d052a80691c9968e3179aa3eea5b0bccb3cf674c5cfe7d2c14d7b6daa7a4813abcd56ef930099
 Output = 1cffb3d6d9dd9cf90d79fb2c5c974818c5bd6f32ea4d44c302337c4cbea44334
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 EncodedPrivateKey = 610c36a286cca4815c657bc2f28b854aa8602890bd6ec2700d64b495b50d049c5963b8294752942d11c1d0182ba6704e54c003b828bc58b6ca3ee0823607c3c00bd0471b4df571c51db3003e4cbe6166c0caeb747f79573f5b8b80d12ca78bc1d3e01a318bac91fc863198afb70cb9256a330faa06639caa7ffcc1248b367bb6b0bd905ab0098b79b85ac5dc083ed43ed8b248dbb72e5ad962b3201c92b132b2961d9867b48208896c11afdd929be2792839674b18e4c1e99a7df714ab7ecb58570281ca80a92f148bc492797564682b560f1bfa42b2f7734047cfd6375d3dc05846da1d3511cb3c8221d38226f29ca52b07471a41764f86ac3418a96aab70fc8454d6823f8b7c6211d216d08c67eec474a3cbad8f3587e22670ae5a9938651f3b48011341b6140ba393621accdc3f606b080579197c48967f1c8d11026d8f90b0697869ea49cb9db086ef687227b2549ac689b564326a2280d8384698185afb25941ba0365b0c1939148ed6e1bf0ef5c764832178d47a01c3573aa268e168b740194a9b36ac2580a7bbe1625900befef3adc6fcb356100ddeac4393d388fe647c3d623d1e6a56a96073bec59f5fa39581245e31aa33cfb865bbc28e9f2498bad34a5bc65c517bb8cae19b6d1864fd7a0c48aabc78d0373a84c168f33ff13a9586aa349a185e3528003e804c8cacbccf0073da46567f7c3ee6a55eba856851234b4f3725e1bb3609e50cd4c9c96ff947c4b048dd7c64b3498d23c234e9bc45230b8b0c797946d0980dfc7bbc5773620b8330262ab6247fca5684c9fb8c2e692c3f654099a7a93d0aae62d24eb594544a81431f295bbca7b15dab7bcf728e3dc61f6354a459a120c371030f3b622569a78762b1cb08248a455e0f0847e1531d194acb0507bb53e9c0e13c8b2f45ab06362be3d9bb58ab6d90825a15211f81f4987000cf74355a28ba08443b3fd9d26b70039955773f9f840207f696d0e7a4989c4b38cb23df626e53b7ccf7c1bd96bc3f68c20ba180a482799d2cf975e0a39d5fe863df954665509b3eb63c257b8c9e39050bc4a739468e716cc289a79053453a28906d003535536439d418736a95763ae222c8870b66f1b5a9978c29d238658a3e773063dab55125e851983706c3ec68d7fb1d595b55292885f758a8df752fd3d97a8dfc33a228c896a44bc039ce1a2069810b1304d44522b1a5e43756cb843b5ef515d89c310f442f585259e5d460dcd578cc51ab49e63a7cdc2566d77e6959a7d24150cf0b413d335efa65385ae13b482b9b4db4ad2518b71704098d7481d2233e2ab201dcb4a1b3604149710de3cb247f29ce8ccb2ec062b014708f397482dae5936bec37663c849c9baa9d3cc88146b88cf970e574694af03fb78205e205435221b32e5513989047e62775f1ba5aa89a10c9d35cb566328eaa5748e9c5057446f96cc691d80208940cfea984df8817d4507aff0a0a96b8c6729329775c8d75935d7624cc0a06ab7a950f2b73ce4d90239706403c0651dda56544ea59bb06a99f00bd698a8c3f127fb4a3759317a05ac244a07342f9a47257e5649dec2c7050188ea669a97c137f707f4e5b4c57945f82c1b0b2040476d73acb54724cba00e8014b4f4687bb6670b1c2a29ba577100943d5b926cb396423663f710328a8b536403530eee05006e7a7cd679ea44c29146494f1775cddd3b43ce6a903283f7890979ee98842d5a76f93777297abffccc0b8faace8f362c081aa435c32a5c31773bc046e61921f1a5707579fe36067588a0f32e2cbf91aa3ca6b38a0e12ffdf8685874869028775fcb7d7fd7a1e37c611316515638a510a13e950960e6f39395e436821165e734837ed575ad510d4fba6c3ad67e039b71a9b6c2a7ac240ccb3742d65b4b1c50a6a1a496995da77921ce33624fc48135e88c59caa47b299605ac1c79009dabb2062e375547ec907590b9bec52c86a6b9e394ba5f02401e4545c462c5f320939075b516c4a5dd0aa5d879456449a115125369584a609a83df8685ed2ab45f038559dc6b0ea170b09680e7e747cc7246b6c182d9199941847d9c1168a84400da2a98215a9e96f6bc869035a8822b27d459cb52147d966e0c354b70ecbe46daa9034074019acdac30055d8a1a02741ed8e602e2cb3185ea44c9e61fab637188554c8b12cc5abb9073b35108f59f6832112ff23b00acb0936594c00c0534a8c4c11cae4787092bf497b60b4a44116156e8368c0c950f3677f6424690803ee92373ed5c13d84c355bf041edcc872965816d6723b344244d0a54f8ecb0f1703ac251293503baac445996a1c9bd6ab851eb52f042692a2b10e4b9b44dc9625973af03fba67a3a93ff849dbea64739f643bfb803ea8653c2b9ab9639614000994bf48a8024c4e61c8a07a5c79b19540084bc7664ad44122e46ca1fbd517c8e68aeb3d835e53846848742a9fc2a4058047969bc11a773e623462c7bac66a34c62db861ef64dedf23c0b7441f6b75b4e60b86fe309b1b7746d558987f6a92cb8513792360ef76cb6548f0813ae8dbac418c25a1d95b06c530d79c6751e7569a2027f8a5354de3a70752764fabc632f3a1bf2473e8aa2a5cf815b3856a89afc122d98ba3f74185a3b2c09049601e23ee226329f024ac2692adccb2018b22a592a450b4a5819b2a498738d29f7145e534e527c859f05ad96cb963314c58a5a6b050ac6ead9adc4782859e3383170cabe4871cfc17a30ea4ac55cb998e77e1a26662a255f99f4ac7b98723341b2c7134adcdcab12a473bfe001127bcb01f84df31384af06171776263085bed1aa3374da7136648608b569a88663d2122e84b4b946b35c1f24a836e924202b7c7828c15507b17f906bc0e4b28c230134d90655696edde11a32c7a70303aaae3363e2a6947b4bccefe9ce62953f92521029959096a8910e71c51b69a0615ac790341c0ac3a574a79d34c11b4a974ffd7cccb05995d4089f8186b545b80a166982cb53123ef644e82897c77889ef91bd8c5a4ed1a4a414389d77307d53487940fa32782061e8458e0c601c884321d121b48ec04bca78c60d39b0c4bc9291945ae18224ec73ab7a451b9cb511bae34a20e326a497cb6ce46b5848c289da630f497ea3975eda79489f18a405e91bde288379f291f538c1a1426cf1634bc033098bbc9958f7af6e408354314e7221c37c1610bf904cf9e7807ad327f0f316761939674867ec7223f06a245711b0d47832b1a699badc8e1217798c0d0000000000000000000000000000000000000000000000000000007420233153145d018d37197db4a72facb39b5779cfde51a1ffe665b09f338119e42ed33e0da5856106580e02aacd0aa1546d3df0571d17452d22f186d011981a
 Input = 3159aa52482f4262cee553f9eb6d853d091a507831f5ed1af37b9c55f217eb1e87e8b0dfb653932c27e9e9f2c4d45cf89e9cfe9ba0d5175be56b7fe3751a4255649cfabdf0cbd5a8704d58511acf6e0580eed572561fab262b24d39c3a430a4e54fca969394037df12fd8cd71b7b6ec3d8f7345b05d4c16c5871b686690cee9804012a3379bbcf720f405c3c83f59aa391cefd8b00a73b41147d42c8b7820b0e779c44e032209067349fa4cd35e83850ae37ee73f96fc6bc5b71ff9b0462604b4e07be60cc76903175b045b908c9b8e7e94c6bc7c48ffd49698873913f9132025e51614317d27a874e319d802923804d1ce1626420d5794bbbe5e077cbd7fa3d958fb2d9608a3d41f605908d21fc7f942e3152337115a28b661f76405620b056692bfcc066f370449628f8e31b7453e5b7b10702f7c195dfb779fb3253f86acbaf4444ba9ce01c9b043133a233030247f8fc44d5b8c9b024ee83c186a62ba9fa5a3e45389217884a478f238d6a9b8eaf3d87b7b4b4375d4d5226dfb80255faab42380365b5511567978be9726d21178eced7294463a348b1e976d800b1114fb8230115b28e51f628a31aa8cf2e3253a7dccaa37f975fa2b8d32a6b6147033cfcbde33ab8857e3a6af95e4cd0db62fc020f55c2d6c9204a05835e2cf878c66502f572016d95b30c45c2ef6048471ad0cb7fe14250dddcb4014c392c22fb1dce1adc8e02f416d3e9b417f41c1b4065b975de472d0e9fd5b3a012ee9bf6311345b4968f6f18262bfc2a38d56d911f9efb981813f77a8a8d6af0618e015b8b005e7ea957f89f140192c7442a645ea7012b5ea2ba9f8cd2fea2ad3e41c6a57582237d53444fceaa933d61eac36d03a2865bfb7f12fd8cf451edb5050a35a75c95dd328296dc32daf61622ce0cc457c5968414b634b3e12a0ce45bbd733e3982c087a037d89cc86d546007bd92eef33949d19dbd4daa18e59c7ea3572bf3155a9a46af527347f4f4dcc2be3cc285d65f2f86c681a137850431ce8d2f76e295e74bd0b3c88f1b68885522dadb99fe1c8e40d938c9610e466770d62c34e9393241907d9cd7bfa470cb8fc149306d9450a7a1887d03cddad3fcdeda1ea54d3f126bb29a1ac3d7c5a60ead90d74ccbf1a75b4289a74a49e0a7c4006ab76a83915ebd4a95a471525444dd2c3e748b1bd347774e2cf01f90f05a1672c58f4f563e4da083e95e0fadd4ba57acebcb45611a3923da1d0d73f5c9a55489fb0097e123694e413460252892a0c6317dcb56efa834f7a51db4a413976afcb30ab4dafbe737f43da11c1b08a2472cdff3995dd7d23382b866873624fedee76823d37ec230dee2107258993d5b802fadeb89c9469a33c66c91567ea92581e0c2c1eaa2e2a4696b024c7c6009687d07769438a8b2ba75a7bfb32841dab8acfb8cbd4d1e26c5eb68bc49bb394b178e6f89dde843f4e2c5353b04390c245a0bddd1aeaefb87528b719fe42b35ad2a89ef34826d9e23f95b1bd3c3b24f785985e10dcaf0eb33f5f71f5cbe55
 Output = fd9e333ac811ae8be12c052c65131e3a7a32ce82e39055012ea564e10acaa85e
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 EncodedPrivateKey = cc389888219463a7a5f6c2ca3014accb3bc26f2318f593876de6a49822b6c1e694b7e5aa9140a0765b6334ec762c8bb018d28a99004081256159c836f4f800d0c9aa4a7136fcd89ba7cc1d6a32b23ed181b3fc118ecc60096a4ce8261ea2c0a6ca49baa28b75d1b40215367e6a33a1c177937bf43a70c3889f6aa239e20e499bc7a836694a0bc2912cc7cf211ba20c12d5ec312da2815ef20c8565712b22a927451271040cf4daa44d79705b97993584424e7b3224a5583e5b8eaf640e85015676517113f53a415220fde3638b9c0a38115e668545305ab298b9923bc16de5b9137b30a39a2c8b5fb75e4d1168593a8eb0e067bb9343f1a030e5228bf0b3a49169393cd14f73c2b8221b1267627d80b97d30544b02a4c7bf06099194b2d646596aa439d82a214e6cb9c5ea1ded727c8143755cf881415b6357661a90d5ae759475baa6076eb478a5826f86f9868afc47ac3a02a0e84579a25466a63d933b071213c886790c320416d9422d280745758779635ba6f848440b2489144866e8e018200cb8305b3060926d7e7213089a06d044176b053f3bfbcecac7840dd7844ec29eb17bb2caf321a5b17848c16a678552727a3d70c34f024164b3c4856b0a4ecbc78d345187c6e09f055273bb775078b43ecc534a40e66592b607b56b5f9304aeb048375ac71c30464e979a656f1728a7b700e3b33e5026bf40198b94455d2be37cd65867522b20bddb5ecb7a010191254b8a403f37c4577a613ea30678daab55508b16d6020f074504f928dddac1e8367faf6199715048c96a8fd6bb225715accdcb012cc856a76057b6b72b09a4aeff5b8ba278c54a750596e82bda45be19014e8ff52df181435ed9ac8c402147b539ffd984c291535b7bc8b26c5036352520730195fbaf40033fac450843e808b9ccbf03b40a9ed657f6ac4af8b65b4e389280633d79799e0226b28b356fc2e39f10a80452dc934caac7c3c521f0c5544e7821a403688f08378c3086d3ab8f7e4036ad516778da606204aed3ca1ae8c42e11038a64ec78a5fc5dcd0475429124b5d665e4acbeccca3a296a8e878b917b886ec7f029491c661bba684ac4229cd71373c829055b602db0518a481230345a34a709010a03e4b197273510a0a24465288c327c10c75434d9473208a7964db7792ea81c5fe0c4bd967c3f0c98765ba7d3faa4e6097f09e9bf10638fb900a764e4a0bdba2f19165bd69832681310a7a2585bf06322a3238dd26a4807af44faad999397d4aa14e76c2cad5326ce573d7ca04c03db769dd01a65583ecbbb991e7a31b59238f8741845f1adb5992607184dfa19a9e8840ed9e1622ab93031e2b448860d411a3d239277052cc8ea71046a0b1ada191a020c322d776c6655ae71964d86314a86a47b6a367b8ac5a4aec75677226de0c1864492c88fb70a53187cb76835d5477346646a9da97301156a3ffcc231f9a0da760dac142674e5cea882364dd74fab66901dbb7eaf037008c52073054cc2f94ec845444054058402515bd206d496bfa02c442c746ff3e662b899c34c40900902c4f8ca146458522c6a7af772b2df483f9d840fe07464b0c66fe1036c070c6f70278e9506342663b07529247b1697f6513e1ec8234bc145eba3446eec18b3826b2ae709792648e071a7c4627e4ac7716db5b1d6040ba7b8ac39b347ef721a99c879453846e1aa591b8495e19003df973580d4192cabb72ae2b1f498bae9b3cfffc8bbce09122cd1910a406574106810dc556894777f35316c992f3b902186dba411ca3462b927688c81f7269b7c2770de5aaf90c81f752a3ec77942729a68fcb38a62946c601c945249bf0e280b66764ba71a44134ba84df1400bebccc61456fdf3bf50aa85e8e60f491ac1c1317d831ba5db6601133883fda81115c67fe4691d9df01fd3732b336bbc3899cf067b9e3905294902ca5686480cc94eb4e98260408b4dd060cf4b5344380c89d564b31158ce098ce1e06b91446c4189c6a4d89aa7e81befa900b250a7060406e25725e09399963c5e3e04219d390e6c28983e335646485023312c4d5bcad9aa7ee683b935d71af1908703fa2c9d66c8b6c55049b3319d39c047b5824d04975a9034e8ca1a9e1a5b0bcb222c5b5c848818d14503c31270d4f8446d013d4ecbc250b72dc25934726b426afc85631ca1065ca6e957ba00f1176a6a45b68a5e93274423e642451129ce83b7de439963c0c4e5d8b25f3b74fc053151610b4263725fe51423e886bed19c534165b4cc90fbd67256839b9371290af9853c948251c768e157041ac91fe6649bd1b1855dc417624b8ca0d798b1947c720b3414db56f01500fba30207322ede05612bb6505818a9a68538c9eb98f2b0a83dd38b765891f0d01f1db768d2355fc6b7a47414527c92ba104637072a72a6c0ce74772664e68660c9c0c28347315b17273a6846a79904a04b90a60c5b15973630209d9460365529bb72524404b3d9cacc013b0a7355a7eb2172d317cd356a07e5a341bab7c33db5a48fca4b1600443df6bf441983cc05125f6aa94f114a8c3ccea3f9c498c1126c072f27e97555456114f6bb3244c4698c3f6091864274a16bd82aaf0711eb8c4fd86a11b35b3b8b0528cefc253d7906b6b05382e37428253ebda5b48b6a068354381b24348dec73c279010bd32e41431d139a021a398f0e5c7fc1a98863f069b9d42a96b029455670caa89e0b867781f73fb7549392124485cb032a008d63812f832cab899a8d5d24b403e76d17d6ccb56c729e15abb2e04e32928c9b8971be6a4c70b15bee620eef375489347df7c622d9a803a86c2a9ec5a7a0554ff763912bcb7f57eb8b8633cf6ef39556162eadf8c285b61a53f4837c8c9ef48c3a58b3b6c31b8227c98df0b9057d452df2c258da8a1de1b99449c0054c48a0bc61a2336323367077cee252d366661904b12ea6215b3ba55aab06f60a517704a4046312731325df563cbed805e2c7b2a5848fa1cb97e17a2f926664c2947a2fdb56ed1b3c5e084a680073669b2b9e888ee010410acba461910795958e7c0c98294865cc700315e86a5c54912dc2affc2469244912d8180eab244332a00b7536c4cab62345872dc31ca3c0d2078d07beda4431f278aeaf2482cde53afc56352a894dfe3948fc14956917a4dc836f54369eacd4af052b4aa6b60af5e86bc868be275abd1118a83e5acfdcd4c92a3c2e2b13cce7101a9d303339f0b2dd4a282499579b803ede0b26c75eb8af340000000000000000000000000000000000000000000000000000005781f74024912ac52aead1be2a87e042830737220659467bd06128a096343d5fc975767ff083234b2979bb109a24a27bca17d170abd8d9e6ad3c3ba19e306bce
 Input = 5ab063c95a541d1be3fa0744e0db7e0ece17b6b47cca0fa41d08e7969fe87de63f319f80b9a31ff01e203de6e518e62e6133edd108e5a3e08d3f8ae0556cfd36b399dc1ebf3b229bc5013d06d7550512280bad2b27657d3ca0679d9fc62f0bf875dd0b326008a89b4f29e97211ee7ec75108a9e4a320a34daed15fd7ad394a1747e4e35bbe4f1118703c330aea81bef3e3883fd41c3efc3423ab46b553c7587894ad64db57bb0fe4d289d54c8ba78d40683bdf6330ccecbacd3f7f41541f1f2b1a7626d3969df6586b4214c02f921451f6adc04f5e8de1e3beda82e4aebc5e06abb33f4cd8a3b3b5741617b6a385739133cf5b77dd5607a5c8721d5b51c6c0b6df551a5b440082093f49f31910a04e4226b9ae6f41383672e0694bc4075207034e39c40668aa3174cfc8a75fb1a474485e9aff01f3572a5c7e4914e7519344c8ce7b81377d8c2af66bebc558359601b21beb984c1f00564d46585b4bf02c958c6b348642be25119b12f34a6e5755588f649837ba53c0efaa4c6c95d109a4ce1f761c1dcecb84cce8376cb1c4e34ff932408ccd2d06f20c5397f6277bf9c3234b20cedd45afecb7e87793d85af15909546c6ee41987f36d85865c8c1e281e13d9575abb9a9f215c08d89420535f73643dc584707deb7d5275252e862393fb6493f9e126c651b7981f26af8daf978153fa4476d615183bf147629fe36de7cceaa670dab930ba8a684b0bee24b55961ea556123b34e29491704d2122e46bed0f6fd50601e13a5d46c907b915f3b8e695e0bbf474aab6e082d156e79e59572731b48338892f2268dcbb8fc21cfd537979278ceb210fe3efd052365fa249c97e8e596ae6225839e5b8b296770f3b42240b8727a0a730534d0f42f8c6ef148fc04e4285e1aecf060c3666fc17a1ff794f584b26b0b1c41f0fcca249935cd411a151932b09402016a99832850b3f56c4846145738f709f5e11e28a90d9137e4e43f03dd1ddb6565c67c2a138aca59e8aebcfa61984bc7ac13a60ddd2c1f0fa84fcf9264ad5049c888b9f555e024f0fa685474e083025da168e3b9c4ad91f074e7e711f84bb808604114e09d1ceb83b697cc0f045b5089b0bf7381ff2efc08e7316ddb7eb7be47a1d82cf533ea898e668f0da124d2e87fef2b558f877b50b13a08641c74e2726b19fa7c0f33ab213f403c328ea60d08c07155ca0c19bb75f7f6716de89e34c20f9d15ba8aebcb98e9b6461477f56f9c65ea7e8744a4d7306e216f806ea8f9f1dc45781c1adba44319031fb9e81c6d33bb317d959bc53a677270f13d96da19833965aea9a18172f6f975bc4d03036b1239e7c315ecacec35cc0f788be1220c0497844fe7c989fff5ef7fcdf89c261a0fed3915cbfae94b1fba22827daaaaa0f968f1ac71e9772aed587d607d5d3f57c1500b6e08760e0b971c1999d01553bf87f55fbad96ce61d0750d75180623543f40e5b0cee74bb429edbed1b4c2a3e1aab86c8dc7381afb0b9e7d4151a3f76b7dec4199b97304d7b3845788e19126e
 Output = b4b4634ad37852e19175ccfb5eca50093291da8f76b86be7511379188bc20d92
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 EncodedPrivateKey = 078bc69561af0cc77acc291fcb063e1d7c82bdd7cc31d5b44d1aa746e261f2a592d4aa9165c2c3755aa457b886cdd55840767f4fa0b19e45410872cb1db3b8b5829c4ce9b2a8969330cb5bba2397119310fa072b7053b35fb135d04977b9ab4766c4c1ecd9695957473f10c679d71d2f6b57db2ab0726022bfeb10b61807d35447a141255bf5b3d0e3bbf5cc3ae74932d87268e172978d78b99daabcb16b44bd578f6dac130c2528fbc89ffa94b48e6785293023e2605a8533a5ac17c15f34b1e30501729a78d3b8ac6e4a329e1006e0c0735c737283856d7cc7663cdaa1610b1045b7423ca8ccb59ca6b1c482dc02ba117c17588809ef8506f09a7162720142e397c6ac0f8fdb02e4c1c557050af941ae8165ae01d9228f767ef1ac3d72f27cf9a2282a6c379a669d01cc0a6c560b21169557b88771008dad62641f435e0780234e86c1ead05f14c0ad68b6b1041492a166bc4a278b0d352129556d55f37ef8969b596c5e41f8597878c8c6c83de675019c022314215eac667a7b559146478a4a5634ff193f6b83673072643efa59c27650fec168ff17109577083bfa8493f38301528f27681405693345e523ea4398055606d4ccad9df967fe59428ca7502f046506756a6b9a78182383db4baf05014fbb20afaf148456126fa393abfc480edc92465d93aaa158c2a8493882b24c564b607cccb2c8f6cbb43abd722c74c2c63230946acc091c48b865cdb33edb712c670648b07c06691687685218ba48648fa3054ae7a6a663aca6aa4e66506516100c8f2caf9c0645f2554c10c480e798b9c96756e42cc8a7f626c2759d21555342548e0490420df3a8124b0566b1804933b68225359cf66caa599c55573b70d488d16185496216cc09090de382d570795efa569aa5bfa8f4a60665cd30d63bb36cc5ac050310ba9bbe4b3af2f9400296bd344cb72bb623c757366ef1369c968578eba52a092dfef34aadf552a63b1495a5b78168cf6e58b218a3ae64310d16734d5e72b2036bcc001ca07533085548809bf114a092225aec9cce6950a953773ee37ad3467bd5ea0b4cc4c6b0695a774781ce17004cd48e36116776db19565367c92a94488ccbf4ca3c3960524d1b13d6f77399ac625de5a2d09954cf867011f79bb4c3682cd40f133a9d67778a24d7cf1a5b71b7b81dfe335d0fc392a8b12b234950ab79cac94776ad1b713e99b0f394aedce739a15334f19042f4861e739c839ce07da145808260b159625b5a742258779440953c743c591659b9d982aa7da028c7eac4390b47b243ba23e8ae4fd9c98042a0c2d25a6688c9ec774cd7e95899fb7f081035b0c4217c2903688ca7e4466e66ac4e3ca938fd58b4d6bb732a36aa8e097fd75976d1200d61a5c988c12702698b1cfcbd93157d3d1c6e76d316b00b4e462588bbf3c480d8374df3cf66a16f9dd2ab721954e02a9f8eea4380c381da230f10c2c7dec02b057177e157cbd5304ab1d8160a323fd5892fe1649c2e270dbd3777035912dc0802f4d18a56356b52946f30c516838028f7f39cc22466ed277a5adb6864972e1063b1af0709dfd60136b16a3d6c863a68895677c488eb1d879a69a5341a695212066ab848609cbe3317b0abba905c1559715f25f720b7b745a52332355154e60577e598c754b6346b335b0195ac305268bae78bb4617807ca4666738ca81515bb041d43a4188003c52ac4ae4b3808d8c755d3e99d00537249d39d4cc02ed9f98ed4106895666c47538f79e30f5104adab1540a1fc58d1a857a1a4611257be37e0327491aa4b543aa6322ef7816a5c9a55eb3bc8604b15540b62c3405b861a84218211c20bc3d35a8a506b0153306fa98b9488a7841d85197c170f84c380098077e42cafdf1913df369f37f3291ec47289710c57f152b74572c23324f83618fd281f5e41976e77097a570a991b3bc623ad6331a1bb34673b1c328319758ed731ca2981b50a5a2cf8c66d31b10e88c95ffc27c3b6aabe8b207e6cb4373464b1b83f4a5a9806449bf7fb622360bf9f098b56729c5738191d57492b377ca8f989a87922a7368d724b07b7e36133620fa0735d60f5be8b51c19ed1655de5108681cb27273d511c643b7867516c2982a74f62e4cb759bb1f5f0808cc90e1baab60365722293bb07841803076504d00e6fbaae853749fc322e3458810ea41d832b35bf05a10e62a4ff8317b506b9af7216c445663c9061cc62914b0b72b5989d7d9c2b761c2fc5a28b5839bee5596c0de25c10a15776447e17770edb666249a2310962152059c5ed5738741a29e899072427891fb53606ab8b5dd06c005d239adb7bc368b10b74508c45c4aca726fe59c7729cc1ad617236e1b75c760e47815df33297c084429ca371c16c5761c9a23ebbcc2cb43ae9734ba9495d5a86a89e75aef50b9e73470d8d9974cf27a961c0cb2c180ff36140818b005f05afaabc86d8b8bf5c2a62f0632ebeca0c9c567514c9311ba6216fb13f1603c77656cced520d977ac75031044c8790d1b4c97dd38b2aa43dd8808a79e406f8e01503db8f7b51cc1e4265ee830461f41cec398251ea60d2c573ec59b4d28b09dc9446bb972f6d134e2e192e987153b39538e1f631bd81b2e65c2c5c68a96d1b78360889efa4c692b7cc374160e8dc485f47a676d77706e047d3e717386bb49cd942e4c05374b3a1cca148535a3ff1085102f4a7077b5f9c7b1a9ed651edb32691037f9388b672a662bc247beed215d51b414d3530c6b0631999663fd7c0e5da7e411c32c506476fd08a09d499ba3c27bbf6a804cc7e8be5c1f3f97d7aac085dbb3bd1076a69db89bc990efe59b00ca943ef8560642176e926af342b48e8002f6d1aa99b58cd013b03e0d285455786b54a4be3c581419730081361c04697b1b2c07df068621213c8ca6554b5982d5a1aaa113ed9343a56101aec68b838a37ef2c8a15d0504c672b278556b40c766c2066ac995caa32676da182545773881545cd58b71d3d7a02a209bc7407f420a830513b9d9d6c93c56571e42c8bf154afa060667a46d13cc542429c9d1a35be012cd3c9abc2bb7484fc89a4a83a20f7c2bb088793dab732ff370cbab614aa851fb77ce176b8f806c4f2e6068235b93d08c39e96badb37a457e8a790b2b8ef00b0b9e941592373fd2caa3ec3477c6c440d0daa755ac0ad2285754ac64b0852086112b0c9794f1657916fc173209a40425afc9b19946c529ca95154f24ca3cda5f9547c429836c377123c6ec0000000000000000000000000000000000000000000000000000006f8e54b993cf2cd10ba4e61693d9aad8943af37178908ab532712df5dec4b908d48790195fff2c19f221b7cd8637576cec18c29a4a51cd07c82eed4974c36e8c
 Input = 925fde875ae198cfea88c4eeb3a0091897e25a793672df1de3f24ab4fd3edb2cad0b07e698f35dc97bfd1d551fcace3282c8c3d8131857d96ee9986da7b79a02ddc6cfc9fb7f2b809a8e5511b1c1256dbab33e7606d8a5fc048b36f6ee53c7f556efadf94494595a549ca260ac9c45bf9962bf406610ca58dc286a9eeccc447a767b6db3ab009f5848558acea4503de747d72d43218babd6f68c091b4581f4e41f2e850047f5f543a02407e7331202b0eac7bed180061bb53f4dd3504ccbd3f298d96b43bbaf8f0c2545be54c59830e1f343ca88bb9c6812c66bfbb59a6d68298985767a73d34fa69b52cea98d95d8305f97c4d4fd643b56c60fe31e3c2ee7e938ac2e4a5da2297e670931c1dea5fcbe9cf118c62a76a461495f10f640fb416ff7bc2478c0e8a1356bb840345f3d43476bc4cd990eb7f7cde7ccb96452d055397ee402be2ce395a29a4f4061ec3d85b99f086341441022435b636028a1a04c5d787abe1c24a5a55653b7063b1cacdaee40ae0de77b4034b9ac0e860a90c8834b352c71e353c02b1f46b135fa68fa7a5c1c719896987d79f3174b8d0b0c28ed64cf9f2907924497e35bf519d519a9199a4dd68025992c6f466604bb2ec3d7b13eba76e4803fb73bb125b83413998ae86691a0b35c0054e1418898f435ab26cc12a12fd4dcfa9e80887af7ebb6c856a7fc010cfcaef9e1c5a4dc24a91a622fb7307521faff0b8e8e966b7b6ae849ccc75d31c8d700a3b6a9c3f646b2a88d1e9391c2ddc6c9ff15db961874c87dd94bf0165cfc8f719806539a8beb8e28350610461b1252872f0f3ac273b3366abd78d9fe8868dca1a5eecb683ab8b50ced8cf4a5ed3b721e0fe6b205fb191985ca745ff5dae0010493f8296b6586e1c96f7f23fcb4ac4dda15eab811107c977aa0a16439b06986a9027640cf7a01051934dfc758215d22c6f06866d5b871dfdb6ed240a73dfde43f7f89c0ce6909b54b0a633a25f7253c10906166f81ae91a1419028d6182c1f277dc7872b824c7a5a22bc7afc02afeaa9ba4c271ee68882397e6cec34a955cfc672f4e6f5ed870a35ebce97f34542cf0a162938c91922230ee3fe9ed9a166a790ccf450b80cb5f483c3c6ae5b2e52e907824b45e69e5ab38226cbd6519de995e1a62a910fd45ed189540e0b4058ff01edbc6ba4eebd58d55c0e33702de299eb53d6518254b8471f282779533eaaef90602e52373be8b519c56a2f6fac0953c0f84135715c5674e45d15804fb94d9e0525ab493aa625fbf73ebdf74f0a1246e1eb0e4e2e261b24ab81d8da6e1770634c747542450cf0a2af23507f8b6766a16dbb2e67b2c94859228b91eec6c59f5a271902b340320412ae947398ad102073f8b9b8c021f81f786622c3483e61f812aa76232e6f9453eae044c5e918e6e4e0e18a78efaf6cb36f7b75929d0036c44edf928d6efe1ddc87b96288c7c624655d302b98865978ed7bc779c800e6113a0484dd225aef29796c8ba300b3f48dd566fd877dfeb5d25f96da5d07e643c5d
 Output = d4b9a0f77a52d4f8b9c95951257348d1931725c27eede694ecc09204a931daf7
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 EncodedPrivateKey = cc4a14e75a6b1bf87f11a240424645dee23657db9819ac274780c2d7d8ac64f2cb82530b40a078791a2ae70aba868253bdc3045b6254c4e29024894cd13723edc7461a37403609b48f79b8e8b1018981bca9f68031dcaf87528a6b065d8cb83c142ba20d68a728a3866ca88e6836cab209ab49bb234312916e432fa51152c763a62cc53da61480691b07a073be74aa6c2b88468bca8302a23d1d6405ddf4aec2f88ab055b18e2b1873862af6539ca83b1c270b6a563cbc7a220cdc8106e6e5595d63a26c0cb86ff11b48066721634b43b361b57a5b4ddb2967d232d34cb750026b362cbd20188260c6a856e9493ae09c462bc4c8663c7903112488b06b2a996dc6668e382e9cdc93e52a1a368b07d8388c9531afff0cc4c07ab423bac717dcc888e213e3a75d69a633f49745bab10f62592f59d53ef19b6a62f0b24216aaed9c91203b7ee65b9d097cc1e2676deeeb576ceb4fa4a867ab7310076a912a41292c658e8f75a98603612558352a5b7beb404fd2bb6de18c7ac838464b6399182536509624e1e25a7821b71edc57c35541cd115ec52c13a739c3de231ada741274272383cc78bc9869d37282f5980209543c92b76ddf99c3d45cb7409b5e44599b75412d8bd122460905c250a94dd4052c0b0a91c9a906aa3652180fba9212046b4f7ad14f7c304780d553f19487b8b7413de732ba1296b41a2d94983d4be93e540a4a4137a030629e97fa640c21ba5b7b5537a03a2a958ec3a888590a5c14a904dd74c83631264644cc6689a245f833530124f7d10e2596a8be227f270941faa75300bd731c145f781cce52247418595ef67c94a170676cda269e51c7ddbc63b6765b010aa061cc576696c84345c35c491d3e4626efc8b73dfcb481c11bbf8c79c6a3aa4e54c43a44141f5c35932486320567ce37adaf5241bfd8c44ec140d30823b58223b02742f3e2bf5864756d528ea36348c1c2293d8ca050b6307d71a20a036e0060697b58a0ada53eee5a6990a9cfe283436cd36a02dcb1a2b7200a267c3f133ea6423bc001baeca953515214e2766f066cae531212dd3551e22bbb1c705f21753ab60a70f364bf1949901d9a0415a36567614c1aba2dacf2c5435b4ee66193c5e461596719790aa792d5a09ac474343509ee36ca048751bd4b0c644b2b039b1320b2294df814b419c3ac55541be5cf4b93593aa4c099142de9e13699a40709d70070aba9227b6c14f216d434c9bc16112b8b4237f838340a5c317a618a91170709bae6a7c13cf96851f72a8761736c452df27758afa4b02fd55b3493b1bbf96dfc45ac743718978b7de8a017eca45dea633dbc417f856781c856c87516429127c6a3d335f162ace0982235ac79ba0ba68edbc1eafb9ed7a3597ca7a612a9bf3ef2b0d1d7c238e98714a434b8b08b35e3885e007501f9bc06e841921521d47999db3ac3937468a54b95b57a2bbe34aeb48ba57f0744021bc684456a8ed413b9192057eb77a5502dbc89c5964c0383b4c9034396da209279199ab5830abe9386b2e811c222a6ccb0cb23732a95676fd5c0376505943ef8bd67a95defe0af7cac395a743bdc3119b1a74771343bad21c53ec80cafd7548ae310293027d62960038c5d80656805b427d0b9167abb3697444af88a0f3eb48bf658be44f36b01233902291860215084ec7bb3e170e517c65c623ecf4a488f69923f9045ea18334d5c8ee847381b5a8903a6233796b1def36e46d343cd3547f4a757d82c262278432bd555fb5430e7f936affb453ac1a031c70cb1b3a8f3762dbe226461501d13d10052fb621be30b8ce63ce93591979863816397f0d198a6c534b55213d778ae7bb1a20ef1809ec37b08382c43e82b4a758458d7758d23a350538b3e524d27c9074d1cc4e3e1a17a6b06fd71178c5b18803b1c439b9e903a0d63018d2f765fa7426a0684793ea789c30435657b9aed58886cb8788e14426ea0295da18293024eb1a39eb99a20619a3e2db48a93eb90dbf42b84fbcec1f0b9571946b6f150ef5a672686a30e52be2d536bf3664550f60c99a89b81f3c911784d8a371ebea0b97ff50e2af68f822a72e9a76cf473bcc1cb81fe2a03051771b1c91f1e1a444ab6119c0a83b25a434fd598bc767315881aef9cb4d4c51ceadbb3b1a1142e0b87d5826b161233ce253d2adc9a00bd00e3cc21fff09abd919b54e09ba6b505601a358e50593dfa117eb2b8d7458745a25e7c7321cda0c432aa5bb41aab60eb3dc7e03ce4017b245809a534c3dfa49e97f4474689901e814a97fc0892ca04d0c00e3dfc836b36bbf74256e77525a031160fb3bf8ac31502c049d0a264140104c7488e36a46d23a76f4535b5902677cb98a5abec57b9357b0cb3b36b68349b273a2f8396e6c8594b4a32f0aa8a622378b3ca0426f44443942c02162907b2651ac2168fd1279b040192716bb584211df4ba36cb363b8c3adc39b410977ae3cac26c21470426837a43b821f65d8ee1950c87b4765a034aba1a35579f4148b8c2f39949812cf9d850d5e25be7713ce62ba31366737c03ad45f23e9b226d1835c5ab01c081063dc193630d72821cfa2a56d16108c40ffc483177d075b6a7a1bbf5cac7da0834d755acd10b9b9850a7c97d90a1061ce94efa4b0c0707339dbc7f160a45eeec022815a4494334254c08ade388c07c34e3a07e51ea60fdeb9b20b4b9afdc6c3c2b63e872aac9b2a90b798bc2dc8d585c69c1b33c1d51372c583e835b9ed561c218a2968c044051f8a969a7b2db6a7031d20cc9e024bbaab4385a3ae13ca264c25f6c5b4170b5c0da13044664a10f335ae9045bd6319abe139bb2b8b635bb06e2f48427e256a16a0f71f119230a9acfb19f0fe07c71828063f42a844a5c703aab9a844f689944ead511d8c97127d99429fc87ede190e0fa002261494076b7a10496dbe12919f585685733ae780eab3ac168287aae3842cfb637a94483f68170f6a3092d51b82ef10496a6374572a527aa7a7d1a99315953f625842ec0bc8851180b98cbe411453027c9b8a4a07fc3bbe32b897fc09e5e65a0457556a8b28e5b7c8b28db24e5431893953c912c195ca52db5d125c3f595f2ea75a63b6c83c8cbca257824ac60ce16bb5be02b30488974a22a66d37b19531e3cf17b59bb43d738cea25326dbd6355243ceff3caae98446927351ff623260472f8c7a715016ca5480af5cecc001c6b65f41221b16bfa61863e225709775b5e6393e4b71920c0c539c6bc5ec5c609466000000000000000000000000000000000000000000000000000000313af29c47d66acaecdafe1b91b95ddce43b0cd52be1d1a84428587728f01522a9e4a0d3487b6714e18bcc9d1daeb3127164328a19d5cf60822f3fd37a24bbed
 Input = 7c06bbeca8b58423e2ad420ec36064ed42c881e3655668f8865a2d643ecd1a4eecf915b6c64b37c98947f06c3ccc8e00bbd16017c246db88cc83f12c887aaad7db61b4d567c285841689169c3f928f1d178a0ddae50d8c46cfd95258667d6239c300595738defd2e806637ca46baa4c6c7b97f1a9b47d53cba9ffe074f88d104c4971d250d085b1800fcbd91584d8cc48e145fc81438290d74765e7ee8c1605e8048b37b9d22b050791fe008b9b84b7f23b0f49955e32c0eef78d7a3a0b2effe8b37d124e19d4cb6f6914204598a525239d9baa116e1c9c39c47f9f37f965941b2aef8519782c65f3ad3a6509d1e31e7efb67db21911e4edeb1f7e9c37b3f852c81d63a95e4775e3f2a8ff315a214680adf44d290e42ebab8ca95bf471140b9d7e03f5e9f97864289a0ae8c9a105e00409f714e413b69be366303b4a138ed51264ab0e5cca5f6dc9387c6608109e8859893efa3bc7384e9f418468b1078807dadb768e254094039d1b807d67353c8e0b5a03d28b8e41ffa0eb3ce0837a132144597908f7a059a097b79a1bac323757324e907b445d064e25c378d2069e7c5d671036871e4fe36705747635e40c6e835319e3ff81714cacc44515d671b703c5581dc76afca0b881f37c1ffc93f2e4afab1e8ac776ca883f3adf7f9ab99396f7e19541c26342a7d5618958523b81871326c357ad84ccc6d3574d97cbd875524e7b08a102263d80f318a48e510c22126568f76936c904c231700ad042d73137eec741c827a082de4a45d296745c55b8367719dd08b8295e38d8d3894b9f8e2f9b483b266e1fc71d6374353ca7d9ed1c6b73ab5a42f6abff7b2ba8fd484d1ae6928b5ea92ea3577be01dc1e88abcd0886eb771dca4d36e91c45bca4807c89736b7d6a927cf64b22c5f323077f5488f6044976f310b4b99f7d486335dcca60571157ac0e480a4dba79a826b4bac3dcb7327a33b16381eb41e1d39915e91a58750ceb71098ec7f1a2d7e44d4bab75bb7482eec277df206502c497eaa345109a145a4da6bed1900b680ad12fb028d33563bfb204ecf66e6ead587c5fe27f8a2eb0e27471925ea0f35eb9d5e53ef801eba3acaaa7790b105eb6128ace992668181c1d7cf203afdccdfefbac67dbd97cad05d499239df84e4cf7372117932c973957e5c70a8520f822be430758990296877df62069d818768513d14df0568be8e63e123bdde35036dcc69a98197f52dfbaae5e5e0cee4a48c67fdda605dad8a27651625c2b35e81dfcacd2a41a6d17f6d7067a67faf2479b3868673b248270f4a2d8ee26de9c787ce966ecf186c1401ad9d3bbf2c43b1d5de32bdd77f5433f4325427254a13985d733ab0863e62a4f3d484ab3f5d3b88f23049079143b058babffc8367cebdd9d2468d7af782979a3ef12841370da6ef2db03679e6bca0db72166c361adfbfc02234119abaf98d4fea8ddc6e8490c2fb5a1be4806a61bc7b36884cf4631cfd53138a23fdda11e597aed323748314282672473a1819ef2b9488f6744544ad
 Output = c9d0cf3edb1172344364afec3615ba98477ce9316f92ca46ca5f42b73553a9f5
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 EncodedPrivateKey = cca22002e0b84e0c0fa98c902c2a30f0d9303a411db91a26576834d4f1645c181bba750c42ab6bcf401739f83fe2a4a3aa1a3f5917418003aed863875fc044dbc99c70b27758389fdd3cce51d5a13b21afe1219f0bab5dc3b15952591e6f80068b30870ed644de082476e7b32d3a531ff8631914c7a5c106a5acbf8672ab4a304afb71b1672cb281438f0fdb1db0f52948e8b0a1422ba10ac5e0a480e87bb844072e7a134dcce36f27274775fc6a8bc611b2a33cf85a4820e18b47b24188030fcaaba998d84a68424c07f4503abb553ec33b4be2af3557aae2797649da014dd0264d00ce74431e46f8969276b24b359c6750c5bc15a6318c2d06898ec5f473380a68302a91eb562fe4f10596012e5efa83f4c55a19912978a6583e4a884e36af1b9367e69ab0566c3cd8c34eaea615f49c094bcbc63d52a21d74c02462cb0bb7c77cbaa03df988b60cba880771a7c179315a9f6ebc6e9b8c90bbf17f737508b1691ef1952363e9499b5007a9c84838c2a149478e4be76c0368a8220b9a3ac68ef6560dba6b3f68257b6719551d83c38f73654fb392af0c1c2517851fc160c343cf826aca2c5614726c774c758e1abaa9ac04ae0742799060970909cbc2f78ca739c71bf6528f0695ea6175a4ac13555c3bcb9920bca3a37d363ba622666e54a4e779cad5059612792d610257a689975fd664dc5081d5ac4586c60e99b9a2a17ac612e5a794ca4dc097a71f72bce02b4907d69d801a22fd7b88f9e4ab284076037a0f6ac803bd7b243b835e51873919d3b77de041bbdb9c2917338f0c42a54ba6f5539d60e827387a9e7c156155d693b85701b53278139b29858785cb59788ed981d77556d27390285bc3f9408cbdc717895815d31641d0c31f2d911515f36743c40f4f3517432c620892149b518fecc80cd2d14c99730e0c940dec155930dcb5ef861b7c80b55c2223f7066b625c9fe5f0cb04f0bcb880119de142ce511affc01d483ac8db8b73e504b242315533d9c02cb64d15445fe32bb0c8e19383f82854981a9ea465b05c77cfd66d97a2b262bb37398cb4654a0fc8146c00b7608f061a216b9becec17f686b93d88309a7ac04c2447030b41ebc6a95fc52466d36dfd461bb046172f3b83fd10bf79c281202a60aed8467748a986100b97742c8d70c8de523c1d700489c391096c1b92654064cb7e35d7b25f29818ff39fa523c88bd69b8cf41689a414288c492f2a83f7b34a4d95770e6144b7731057c73a077a471e7b378fa48464c426ce5a6566e7c862131ebd5a1b3df013641a878fd702d167ae3f369361666514d98f325679c22aaddb56406e148e744960ee1395866acbe095542a6836571959a80238d037260fa053a52cbbc2cbc035e78fa9c306ebcb61ce33422584009271835ac3845524794f18bd7e1b4c034832fe68ba24a162815404f65c0af0944c9789b1d92767268c801a0444fff50399b3a192131e965523bbc2c75c286c96450c3f0733458bad7831205b1b4841a617626b4bee232cd1f220edf53b59bc213a055d956591fc3518a1974582f79a66dc8892ba71ccf7a5fae1c01841428525c32dd2b433445118559cb5447e3c851a0cb498cf99c2d359999fa3967dd722a23522b0d8cb522a67d63a75af305c05f3659bc496f1c47e410582a0e58bbba80751bb2f5ab71414051627f46a78f9708e3139f8950b999378df4709a08b9b511982ab1b2cc4d51d177578ef263c8e12752f914733023d9e8068d4fc1aac34106fa72197f6b4e4bb26ab29ab64d7c848f98ef5557ec2b35edea70b67c084193921d8cb52e132a24372be7046aa2af66696007e2e0830df1c7b4396bcc8f27aca46932c463b49db0ed88882f3a45901a4b96ee3b74e78afb8dbae7bc653be895179f208c27c6ecd60c26e54152aecbc13bb5ece39840574c56fb39fd2385c76d62c59a41b3311702d5a99e366467b6c4f6c252a95db32e5096e61d1ba872924d358b346dc099a485c3df72a94e437a82a6cd778888995c473c203e091309ba42511950c19db3acbc5987259bea952b5a549839f197d7bf64ca0772cc1dc89572a0e04690fe651a79ffb3dc07388c30c06711c6b25572bbc83ba868a379d54c6439754bcd67c9b0364ab3790967a062948084ab33a80ac5971fa99830aa7d1e9263e7087af67ab6a83ab34f405dbd72b3fe46e9f2114e26cc6643b6d3adb9de63090394213e72b64ecbb2242266139579ea9cab2e51868ef82ababaac38e7ca0b9554d665365dd8b0b58f3020cc9218b866955f54d9f7b9af9634ab995a0b5e234fcc78cd1594e1cb8a845ca0cdbc82e3fbb35414c53423b76875ab267a702d51710149061e7655a0168695053aa61b990fa9439883640e7600345033ca90678925b1d632962deaa0ef5642b870610be3387eda90cf608254dc2b000c06632331680e12e9b277597d07633a31f6445318ac7b9cc1b087cb58bddd30a07ea6e1b1429950b7e7efb1a6b88b037c92cf987c904268ce39cba4bd3c163f5a8bdb9698488152a18b02bc98a83fb6c28a55a018b48979660ad5b42281b8745a4bdcb02cabd16735ab1523916adcb031e34ccbf4c50bf61bb7d562804d4104d3f6ac183f447e6608acb0bc40a34ada4897e9a91c542571877931864b612cec01c88010cbe039d42540835422f5900c944c7025ba3365543536d093a68c27abe1175bc227faa590f8fb8ca9ab1a87366574422379fd8659fe5bb5ec76e179666adebcedc7b54f1aa9388b2907a4ba5c48441ad90499c64a57768631d4a961d88976c816adb897da7715a100c75099cc122f3b1df183385673a3bbc98cbb0ccb0b090b3517993815e3f6b26b984bdda32c11947b2fa5411004c2c41f2a646036b86bba618e72be7f97ec6369af5ca2ab2dc9493d9078a0c8598841385205177c80a3be42a31d1166b02cd1dd2871148033c794242962e8645ae2e4867a3e5c74f71a1d978379ad45f7fa5c70066cbfc4cbfbe05cf23612b2dea551cc52dd90a8468ec771ff071371544e96400e288a82e9c9eefe807d6f4903ac567741abeaec9707533b38dd8c4366bb33cf86f77272478e43a2d8061293332c8d805a4516238d5ad1934a9683655674aa6b6d91610d4c82e966d74c41dfe7ac18e993c22d59b2d286a0b5272cd44988510b9b342405757a25731729e934c58c601f5c311a244a24dbcc772088a20dac4c8410167304fda18445f6c6126b9645d4042d6033419d246968848e1f5000000000000000000000000000000000000000000000000000000ed43f6cfc5464d2f56a817a3dc74b5ab404164947d8c0792f6bc9bc00bb4d20253f53a49ff45b0ae588d417a63a599670cd391c5e9885c972593d09350bd7523
 Input = 83ea5ed982570cd981b7430de924469d4e2faba68e03261a74f5114ab8c448376cfcd1b9cb3e72bb031bf0fefe772bc40888abc6acffc1d335d46d267acde2cb89cf1b3c67a139796d6a5763805d5edcebb81070b44ffe021b6c2b3c6c3d5dfb6d9e546930223ab0139990c6c5d6257520fe394a3aa30c6a71d47f415ac86b68eb8c83b131a3c5cbf051971fef5ef3bda355d3868e71ed8a0e2c6de8a759bc0c9e760277cc2c04c783d29d1ad3d3385accb85cc88c39bc8348f84dd8c714c5feda50b0770414a333136d6678be6ccbc5df488bafdcade883fbb310c99cc648493aed72680fe1e43c0cf523d3dd06417d29dd97c98ce53089505d36a476c0ae6d89b165c3ff6b2c62ba954fb81ac5782ae648a6802bc057c64fabd3726559ba79de9c144aaa525f6a840ed55abf21b37231c6c4cbb0110fdbcd0004f6f4974ec644c33a8aea34ef4a0a146f7502650c3def5a313d2f309cb428880502d3bdf39196a99bee296f9231d87972efd1159d3cf59bea05f0d0373a0e218ee5e0528e1ac7132440980d1153b9423bb2e099d05fbc8241ec1f316bf0add575a69982f546e99c64457c12ac83951ad46a5f024f6a61c91b7d3853ba1fa41d5a95f6ca811610ba3f32addf011ea4091ef217cdd126ec5e45cc40ec6f1292602b16c02718419646370e5b2c7c55c1128fc5d6c767cc75248b79e2379d40f91a8617e8a3db43c42cabb5cd39a7a7969147f30344c4b03de7034b12d8a1c3639697c97c4483e4191ca0fa81d8659f40e31b899b4ef4610644b1314ab2ef14b8dd8dc0082826fe65dc17211572cb14fa376f1b1784a00033c8dcddc44d6a1128a200eea668b6516ba42585cbb2e2be2a42148120013d0a9378ed7c185071fa8fdc09102164c63a665fd09c08d34104c9abb64e394b2e2a00dd834f7c7f5de16f6c02906ae37acc923dd76e530c78f2143396bfc371d14e6c48bec072b6b4e18eeae967456beb3f897a06eae17de174cf09be1435e691350632c0b1eac69dd66549c1d980fb147fa295ca6f21b5dc398e63a7c4263c75b55c85b4f38fbd7cc0fad84aba90dda1f2c9ca88d88905602096162486dba1ed0a8caa6b897c99e25934152a35fd0d476de09fb211abf36565af3744f3fb737247f5d8f172fbf438ed04422a6b3e17bdfe2cb0f09a1d57f1f1a113a768697f23d61ab288f15abc760feb0f5c5d4d5c0b1c891d3dad6089a3b7e54516b8f9755d38430312cf17b21efeeecbfd2719b62480225b9b3ee8940b1f1784ed5630d152635a1233acdd16e5489a9a15eafa7bec99aff25b18d9cac1e726c9e424773a7083f213cea53dcd310b0037aecbde1d584657f32cf548a6872c6f5a1a3a70d4db29ee3773291c94b00b5a596e1691f7752e246ca0960561cd233ec7d5f54496d34ba65b359a856315f02d16c990cdf3db2051b17bf283fed1b808ac79a9ce8250c806896bf75f2cfe76465c09360aba4c9688acea341fe755363abe41c0cba3ebad00c6c7bcc3f7ce091f87079f60094b92
 Output = 4bb6a6b27596869efae3d411c69c593afff99b1a703ee1f4ff3e0e7e9756e75b
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 EncodedPrivateKey = 16997ff80976d1506b23c012e387ac6ca0a792f7481ac3c9775317ee3ca5267bc7180ca884d28bad6b5a05b045f33a9b975c6c98908d670550b874ca70a77424e48bf097256434b9d9b96c8b8149f02ba5bde9b813eb2b60f20da4440b4cfb05716bbfd86255a1e82941d2816caa7253e7368a4bbf4bf546f40b1bafc65bb994c34f7337e82818021797a431cfc664699bc22b92561fe3d1cd6306b89a36380920abbb466477549d1bf14364221c10f51fc3f7240de4c99b3bb3eeb9ac1fe12bb7c97888e8386da4a341a0be8f78a7b7c49f2184376c3c3784289a6bd9b6a03a110c228f72939b86c7a87dab3e093c0ade693a0e5331c48b761b070476f55cc45ba1dda14dfde01a011776143a4d29d48b47b0c6cd2111bf18360a7438f384a28d772177f648773b961a86637c946d7981a6b9f571a4c29aad07220fe081f1f18700f3c99ef28e76819f8d7c4c43d754cea21180c43357f3430bcbce1fe8952c691cfe9a7483026386a479eee4025a838df5c563b9f5a1882a2d7209a68d231ee82260a7eb4fc157936deab52618cba32772fa1440fb675220f4610d749a5b3b142f31b404d94d2bd816cc4773ec83aa1445a37b361e52b10960827e94171dce3c12cec80a1ec65aa6f117fe937673a78cd7767dadd3cebe0217f13c903ca25d6a681116b206acb46949b18f671a63fd2581a6c0978738460cc51df3711dc1215dcf75525d30559ab6bc52e16fa513753454888189348f045aee8a32e98cb2dfd708e7d42818115e5c61711a0c43e85a13657aadc24b5b30a04a43cb97bafa433204c18536337758c0db6154d4fac670fa3af148b52f24aa731c31f98464ca9bc975e97fd665710ee2c56b024fb8d7c7f4a20cc9d510f8eac38f96129c97b17c890417a21465d05abca02754ac3614e964f1a24393d05ccf5cb9500852cc9231656ca899f3538df30984475209f84ae8b99983e844b06ba4cd8a9640a513cee439ae13ad57d3846aea4fa165b68c6c03c05c835bcc5a63d45cc5568aef94ae7798bf29aa7f38e275c902236e63872a274e4776cf1928c492036166d04eed9ca64aa16ebb4b11fc3ba802c6b249e4b53f90112b587d36c6bfb0733a2ee3003419026a10a4c54c2be294b2031a48fe895c2c9920b3772f127338a865a82c3262dabac113c235d433b90d401f5557bb1bc68359020f75742c2008c2bc8862416910f53772a55376ef05a5eca853eb1ba5ef841f243b8d98b11e94483ad7e72fd7360a3641159e481ca50971a6e8aee73a0d4f24b25430ccc0997c631308fe2aaefcf79af5d2045932043d95933919b21ef87865b8550742a513d67af756c5958465f582983a777e9032ac43164e552358861a0ebc458e55865fc3545fd01b0e7565877ed3229f8267369c319abbb017a87ca662c635519ff418682af39ba387aa38ec37396b4d6ab505219314f4448d0f572f4330cf33fa1369872649c922bcd228c294b3213a216e59752072b8e026700ea63061855be3d6037c0cabe0c21f5be948ee4b18dd935ad358a5885a0331db2e496995bd47c3ff2b679e0abafc02804b6117271a2b00e33bc06250fb30ae2036716d30a50aa07e45f244e1f0100d749359b479b444b510d9b6d89b7001b237f4a34c57509f69208c7e6b956144bedc8b2d19b12c1baa725dd106f5418ed943370050808ed2636fa634add059541a7a8c7976b0990e59c20c00343d1c37bc3ab587e312991bb88a74227651b340346c58bbb174ac18c204f37445681bc5905354d834f86016d0921219fb467d829daf24901815666d664b8c4aae307485cb95885b7cb9125a14d4d988d3a42c0816ba7ef14de9b622e08871988b8c02d857626b65065551d5bcc81112384f979cd8d2b9ecb55c6afaa700e92e3ecbb285c01112a19cbdb90b8af135b235914c901e2314902a43c939d065481128f83ac801dc2fa69c912f2b69189736d72414df12646680c9c858a9afaa28b994531960b0f2b82fc6b9c6f10706930786ab5c6b0da61ae813cdb7387c27324499b111c6ca5767056070e608cf421af52cb45a842da82560dd86acf45a7e70245e0b535f7559a9fceb9369c44032c09302438cb4670925c7a831d52f083a7919e575be844d9e6a009957c15e6c5f84f050cc4801561876f9f483ded505b3c77a4a97788358801f012b59d716fed55975f8abd3464420d849d89c16dd2a95c372cf631a93a8897ddda2a038070adc2a97b5538778c0215cea399deb8279b2ade6c5ab84bbc8c6e181c091b7002a4d5f395bb60c817e03966b63ba76e88fb05b79d126ab0975c995b5bb2ae6550af78d80b96af40c9514f945d72b0c9602412242c81b60b2df97999fbbaec0404056195879535041231803aa7cf064b5fdfc8b86344d65eb30e52cc0d5b86947b8051ea93008d789914493b58abbd5395b657560f5823c387574db554118d06b26ba14b9660b4b390f8b828ba8a852870cba24a114a68094cf0168b721af8f0998e599b5db2135a3e9360b5754dd49155eea830f0035c2c116dbc9039cf69034c505ed998f8460a170eb5f09786d902664c8135ad77101d0b802248b6f3165a847b5c989131d7ee3135cbcb48b3cabfd100074c00f2e7bc85d4c84bec8980a6920e6f318a4bc805900b548fc7d98316c1b3c3b49f6c5d90595ff7a7b56465385620544aa3f39114e53581e851849726023d953b5df56b87be98854b253a39297f060449fc1c02725c3442a4ed8624f7f6abf3854cf04166b24c3b5a38358bae933ee4777df09720415314b152efc0b175b664c0c0a3521cac1817314d1e69fe03b351fe211c4c44639622a73a4547ef52d46b033aa52a79182baf49a8808fb259c048a04cc03f8a1038e9112eb30965c797f90c277b3549df4f757526351bd1a100767b4bcfa7489c17cb181b707986b9af85e766aa1f99b08aa2a7bc8a385d294277cb00d705b4ce2583e61c16be2b18445d051d7f0cee51703db3162bdd328cf0b0b24a424bd830c6574091088ab746a291c737e8cd595d1b51f9646c7813a8991f89c168489d1a3b61a82466d98ac9de55b4d5aa020243e638328fedbc93d341e1fdc7eb861bba3783a57c86a7184aaa7d5051b7018f3f18b40b69fd7780ae9609194db70123801729c561e973dff3a7ea5ba9045b24e5fe5bc63ea858c687184a8276612c80ab600cc37699583b9ffa8c5a1b7934f3c12873522dd1c4f976b73121bb79766803d247de1dff18807000000000000000000000000000000000000000000000000000000c69860913068eb936405db039e82a2f7fec48a8ea570bd538dc9741a6aaadb02e366c059f5f26e6dfba8db203c5b27beca8fedd3de2664f6bd5c3e2ac9fb3891
diff --git a/test/recipes/30-test_evp_data/evppkey_ml_kem_768_encap.txt b/test/recipes/30-test_evp_data/evppkey_ml_kem_768_encap.txt
index 35fc017a3500e..6901150bedb6b 100644
--- a/test/recipes/30-test_evp_data/evppkey_ml_kem_768_encap.txt
+++ b/test/recipes/30-test_evp_data/evppkey_ml_kem_768_encap.txt
@@ -2154,7 +2154,7 @@ EncodedPublicKey = c30b1c077bcd1dd852cdb9736289bb441013f7132a86664c31990bf601cff
 Ciphertext = bb7e0dca6eca3ef57e945d921c2f80875556f7786d6bcca1312f86b3bea6d0f0a73f7d6036a7c38c62d4e356961ec6a28d8026a2d915d9721ef815147fc09ca65a3394aa5dc14c08d41cbe932337b9a531ddf68df20b6aea297194ac398f15919830e3ee6c20145c0aae7a2cd276ccad7b5c414212f0c0ae7106333868938a6a00da19377d996c7796d400606007dff30fe554a5fef86944d43ba047a00da5c2c2a1aad053aeafcc75a1e826a417b4c320e60a68e63dd7b54827f5b8b0063a00043f29ce8975d95bd418eb2ed29db0d9263c67fdcc153ba9b5a33279becb7ab193c2f257bd660fd7012712be3fdc2e52490ade145e8e030ba1ee5368791e6f3efe00deb34cb454cbf7fdae3a507261d9fce66ab58998ca19380187e3455d425977a8396cee3442935e24347aed45fba9b323a289f1b98691e35017ecfd7a423cd8d0149432a2063e0786c2f912e1134ebed188511c905a1a9890cd55d496e8441ccf637b4d660d93c7a46c3e17219167c3b4740878ae35766470b5eff3c6b1fc8c30e5c9645a94ebd48d2d40fbd4baf9d822deb26c089da84043340a564e6c311bca18c7a2c868831fbb866d89652556b53297b9c0040e98a692fa536af4c9a7aa09321ca27068ca66c665b1121ee4529cb3e6d899964de759ab915b0d2c571c5aa76cd64df4a4e55d9de59eca7b4379b30f8559db41e804a18b8771f594b9bee3de9ae98a003430aac58c141e6f0b7b1e5e08e27d1127b682882be055ba31e280dbace7878ae60426626ea4c5bc034a9206e27f578edd17fa6c33180b649bc7bd437b2c86ef4e0f4583071f99090b95db1e415d21ddd88a910b1fd10e3a04e391d947558a6619683ae070be04cab88300614839503f088e2f04cc4a7d091af9833a4f957cfdc574b1c994673ea14dce6ad89adebf5130d266c1440b3f544eea380ba245e21651f1f2aeb2b3d578000a87683dec69ccac18b0702d3d030077981076766e7e5f3ae1174eaf21bf03662c6bda5fd209da19ff6792c0bbc5d210851061dcdd2e4794d2c3c0c531e92a2c4a23556878d3e890b65289a6a02530bbd40ed66db3bb220aeb71fcc3c0b5d5b3afc71377746b22ce636dba028bc052c219783d468fac1d4eed555c1b4676705c8d27aa8a09c6fd8640a6f7b6790ff173ac39b5f3c709281df4274cccdc1e3b690ac0a77f7ece34cdf3216d2b6058baf5f649ff5036360dff99334ff06a366785c0404c584f623801190082fe5cdf88f9cf41032681e8fd6b84d127add01d4b2286af648b83fe69aa8d109c9320bd40621cf75adff8603e3da00be36f03ed7925f19b2e913d756e952a9402cd4fbffc0428cd7eebdd7fc7d3b4cde181b16b26811cd53d9f5d85d37c1670b957d4b3d04fd06567ac68d3f9dbdd45d182619180cf9292e86f42bcc213e94900e0c759e051bc0e30ffbdb91a2493913dc8b81ba4c3e8ba0e7277dc38dc91eb2b27823dac71b6f1c47e2a04136e2c0474fe070e2e4bf8e6fc98e73143ead3c5f778ce8a4efde4
 Output = 5b357f714a293b6724c0dc2e2c5509676782a9dddb050d88e6efa0a6d09d20b7
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 Entropy = adf510dc0e997af14f96e4863f316475be59850bc861ca0d1b057d6b94c3b5d6
@@ -2162,7 +2162,7 @@ EncodedPublicKey = d7dab73b47cd1ca43c7e036d41c94f8f31a0de404fa38a1da0992933d752a
 Ciphertext = 1a2dd390e05984bfc0f55ef96da5050fd9bb03891d4d2ddea46c463aab28fdfaf63d4b2e0c9af992e4f1421efc26ae86c2b296f6851bbe2e898b8bdf4057e875d4a98469b7d2646edb86a5eb5259341e0d14986a8ccf93563bc6ac067f8ff6997c2e7bbd897f02e844f180769fec5af9d6fa017022cb0af622b6e4f7a69d73ab01d3d09067b118d51805e1b6413b7a9e0ef292a6fca18a8828912a2db675f0244cd63d9340aa3ca00dc5d70c915b0061664b1e1d64d3d4dced3ef739302f1063442569efed0dfbe8c019c27823a3aabd865a47600ff9e24f748302bfca1bb60faf4105889a548be9ecaf266d8f02d3aa4997202477a70ee71b6e79dd1609acb4dabab72a38448758d8debf55369c5d3e0870ca193018e0ae6d0ffa33b93e962598b43e89d5978a9d55a608b98ceae5e897363f8a9e253acf8af560c57e07c4c4bde807620b6deb76d581bf92b7f514509446f5c4e4d09430b1855e62854988302c931b9e624644a636ab8acaec56d7673b26852c692e8325fa1b6215f24ebfb388ad1022fedc0bef272c87e10dca97df1e63f1a0e9582daae0f49e30c6acd119f7c4eef59d47443f491df846431cfbd23900341086a304589f52de1d862c26af32095e922b92650c68facfc13892430d428f626fba00cf9501e1e4646e55f5304c806b5acafe100084d7635702139725561522632e7e3871effe883298a7264a411484cdef78f9e721c0e5f3937f2fb7d40bb91620e473f9b97adddea69b3ac682e8aea2513b985fbae268176c1bff90e401a31e729fe8b76d13b5c8c85ed833d9b076b5e11acecbf0e96edcf8ff562255124edbeb5b9117cf486f30d7883aa353b9e433a77ac6912cc8e5093c12385ad926be1d0893afc7e64fb9ec55d3285e01a3ca63f3c07b95399bb4411c3f820f53d8350d1979ee9cc6bbf2d7c92d0cb2fd0a1de910d92589cf1aac29992489bc179676c31ae768869398fda50ff14860a1b4dd3bb2e4ba8b2c87aef7ee00d375956a62dc1e5d548a59f209448e62c4b1221631d4776dd5192154d637217d31feea1c4cb3ef1903b8987f4c184cf3d6b5355ad53c7bd3e0ae5373d9971115698214a93e12b98489cdd75028cf22c1da41096daca95854b35d8bbf7d0d4ca2727aa511eeb6cec5352ed487bd3b00b261cbabcfa9f082ba7300610c6f92725d532a86e00b2ed1929a8be7a342c079835a2285569dca92a808049f170fba39d990884ef39ca511aaf9a713b8d78973b4f4a2fde7ca8b6adbdc5a70241fe3ea7d005b33e48cc9fe6ce5bc2bae0746827e548332adf83f8aa707e703fd688c494136d8dfa50961a9e5b69b542ed6ae0e70ae159df95dd9d4789e284a675fe048585214047f7f6819f7f011141d265de9fd4c04f4ed5dead63fa4c8938b2f42108d263d5394d164b3254294402cbeb48663cf1ab2c296d6ada107e8aa5b505da49af96e1cebc6b302faa148216d38b9e8130cc654974ce299172cb875742e62c32c063ffe7535db2726f65fc8f600d4dbb1a20f
 Output = 54c35602dafe572b99aedb7069a59c4f7818c860b27a947347657ac1954d6454
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 Entropy = 3983da6a4615805f6d55c14ba582d59a40e646c7ae77f4835a51afc6c37f11f3
@@ -2170,7 +2170,7 @@ EncodedPublicKey = 47340db6d04313d3a689b357566b9743cace5d5b906a39249f1c2bcdf335f
 Ciphertext = bc07d2caff561b4645e3878d1de0730a88c05f46348526829a396f05a0a00603f0e2fc79e13beaacbe903827c20d9d687f3fb4eb2a8e9335459fb21380b8bf3734518778d8cfae9524ead1427c6a2dc379ddd2e985e2977bb63e932ed59c83a8b9a593e2adba0cc5f106620fc8c6c4cba5106bfdb4105def0c1d7b6800327cacb964e1d4ebbddfaa15b279115a1d05754c0c8a715fc2fe5aa09af7b96d5a93e758458aa5af8cba03b942f4d3c0fbbc2a45d3f7af5818d67219a72f4f538883ee2d3e507e2dbf4f7748446443bb71bfbb4eff0f57d8154d29f5cb26cfb52c51b676e9b1ac08786d5f475cbbfb49697a748b7902a83da49d285a48c7e9cae74b66a30b02a353a287b40a66a0663e7a71adab7d03272f2ec32d47097d4c303396db3e7b7a947f467a70646777cda227d72310806107b5dc16cfb36918e88784524e3a46c30242a40811593aa8f72c742f885a9623534753b2bac5e29110a1a854646abe1c0337251e85987aa612f3a095409a5a632af14acd19491577223c278b18a9c3ffa7f72ae49b89df6dc45ebb2803ece96cfa94ef9ef5b24fbe686ff90d130d3ae953a4f9ee6581a346b0612f84cb6ccad4fe94a53602817d67c61a9604d288319f5933f4a97dcc6ffc36cf14db593fe27f873be712186a6695d949d4552dab37e36e2e0ced229ea9dccd6d3bae22f9fb888ef400b594ec08a15972e8d2478e50f11947b52bf384c731b0e50dcd4ba116abab8af3b880c54badb11d83b4266d3e5fc25c2c8dbbba12fee2fa5c2017987f31277a67ac702b8dbe110894a8c81011c7c662ce9ab96a2e25cf5056a3e202dbf6bd5bef2347537f7811637e932d13ce02283d48d032c284b6cfb84fd813b6c3421017a7527eafcd3fbc5d4324b5351b30abcf1b366f424a8a0b5edf6bc1f3e8702b03eff875687c6caebd7bc15f1118696cc63859e3aab75aa9acc58484da7f2bc9a120844e4830429c0eee2b2324890bde302bc93f661edd9c04e1183528482f9950654e8c267234245aa9482d94e90e00e929b65431f986e7bb34524cc41f4b4443646713c7abe6c4131a2d67f3bf42f0a7f2eddf82b5c08a94d99a0a7d14c1b0b375fc158b7d4276eab22efb438f0d0a9b30e9dc127026181e42643af8da0b24bd10a532069392724948ad722b25477b481006fc1fd030aa62b217e6695dd4c7ad34dbfb75aff1df5774b061a4ea8526e9bcdf9679405c0d2e40dca00c9e80840e832fd663596dc55f602d094253893405a02d4414f119d23c4544cf832888db5ae8494dd2e8ee357753515d929b8a37b5b45446ffac20fb204b5c937f6344c453ffa449fe839b4afe1da61301057338fe29df93aa962a7374a2ec181ffff9252c8af5c3f75ebee02fba58a76066df4c6acfd5d1c18390652eb2f469d35dd708e63a498c08c5241b2717333904ba0e6e0845dca8c9608f28bd1046805cf7b220498145b23cb18184a259458dd2fbaeb1c383005a0d289562b0a9daf7d1e320aa302fd3d9a02c65fa901d46d4
 Output = 7e1b4195e9cb70e6884d3d00f0b3f0a66b4d8c00ce112e1e79a1dd236ab62b26
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 Entropy = 2676b8426b9d6a30af007094bb76d65d388c2b3da938215dd6f6987206400e13
@@ -2178,7 +2178,7 @@ EncodedPublicKey = ddabceea01649d9c6588d68c05e93cb6959fbe348468cb6e7f482d2b0507a
 Ciphertext = 79efa2d537baa2b87a787317162d3dbcb40cb3c25f540ddb91aea6cea9870bbc5a5f86f8900b913fd4154bcfc7c8a463b9b66118c502ddad539186fcb079664f44a5363cc8d80d6a4c09f28cf8952157526cfef7bad2fc2cb69ff03ac39e37d47faab64cf54f63919303badeaab9e59df7040511ae335c5230e46e00a666b994d647d11cb032e7ee235b5e18b1894621ae93ee129823334580381b857cf0360196cb75180410f9fe7558d0e189502a5dbac5b4f0597cb3d1d201f89de26f7b4ec0d200a418a26cfb82cd4496c3ee22f6eb60f3ad2e1af981c238da13063d1746d65f77ce0ef30894468b687b31443c7acacfc3b3878fc9ec56878e7bd1a9f72ecb1706a4e5face0a83282cbc2bd15c89afbe3c97dfaf395a96ffbe1a3f75af03311afc69dbc01b11ffed2aeb8906505e910105806febc6e1298fbb5c0bf501232b888b7e8b285953d250b866a20cfdc7833a732966b3a03485ae2852d0a3fbeec6dfd0ec8015db5de69e55f091e956ab4392834c5128417105541b1145b27175fe35efbf3102277b35e42bd83aac25e25da6c55c28a03b9e2a8135871b4cc49fbfd5598c9eaa2482f249c0b6332a6999306be55921a3016499bc63a072a6e9eac894a3ec209177d07208d0d271c47f8065d0facd2e975011944f7884088768fdc053cf86f31f6d348222c06467fcf8ce0d404a2558e8cc422521a4e249549037d3e8a29e03a9a9bb511d9ffef4c5185a380d874732c9e862a6e8fa3fb72b213dab2ad0d91b047440b1d334660067566e6d2e14765d8fd0a45b9b8e8566419a6d7138e5a106c31b1278d50027d152bc8658d7045cb2297bb8382585b38be2d5fafaa7e8c867c74be013793874f181a9798193dee26fd5812eb469d1b842a969cda65d3440c67b00e6d1c3ae8630165499c1b4cf3153fb5731916ab779a2562ec62637d747d61342d832aed330e5cd794de900fa507d4b5fbdbc5f3ec1aa69d0319b3644d46d9502d435c1b5a329c0d3524611a145e3024595e91c2afd577a422d59d4d54a430f439534003be467b6f018736c4bebceaf7c83c799c2b7745ce7498dc84b9e455b96410dba1a0a5720fe703b7c0d859a42445eee7ca3353f294438a7d463fc3e98f4403f93b5fc4add88cc22db7bba150a2988639ba96cba8e2a0c980c9bf8cebdb5beb262d79e86cceb774750cd9a192ae93d85e60722ec6590beb7df8e4d036837c97dc05c7964dab00034683a576da5b51aa8a0622edc27975978c7daf1b942285572b09c170dd332a99bbf703d84becc6a96373fd1c0b355f063e4c2c6e59f5437802676000a819b9b99418df893b98a8e6ca22d95da2c151fb24a3a0e5944ac4ca6376e6c281b275589a3907c0473282967a121f1792d09a15e9d71e71e73f9f627ef0dd478061cf053af434b0663624c3bbafe0f37d7a32504e9c686f41bf48e287aaa8fadb73fece907f26a9576611ab2176a58e5c1f3e98ec0248a15774434c2a81c7a8f57f9950b83c0d3770d17c4e57582387d6f19bd
 Output = 2522e72d308dc9d7d701e0b024af9e15627572f13573b27c406fa750df9636fd
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 Entropy = 319c51bcb76124b92f39820a5653c0ecfba79ec91d632b0488f4020e5df4e37a
@@ -2186,7 +2186,7 @@ EncodedPublicKey = e2c1184862562b91806efa62f1b72a8ec43e70663de1f66a59687ae0cc1d9
 Ciphertext = b0e578cabf9deab616e52934955f42eec74bde5ea98acb022c427e08232142dd08f9120eefe5f455c8f120e672cb68f3a146c3aa457b637d0901fe2b4cd45e8b208e06823b8aae09778cd00fff5bed5232d219a2c33645f2dc30593e591f697118a8472eadbce05c9fbbc5d4b717b880065173cc0854182555376dbbe39194e4204067358808c890e5fe96028921fca344e3500b615f2201a1c4e4d13dcc889cc9b1ac72429074c21a52f4c78ea2c467d65cd2c9ed682f21f31b27af4eb5cad33dd633185bf32e726fe6e57b03168803f693bd85f5a9f2c3ec6944e9ded2b8f3270a89139ce50ba6ded6bc6b0be8893f44aa5856acda60dc1c4c0834d45574ecb6183d6e59a183c0125ff45c718be2cf85b5ce6daae6e37336ea63856561f1bd4404df725d5ed9263038d1c623b2e1aeb35924b79de474407168834891af783fe5d83a631eb14d7cfa949d698ffa45e7d8c46ed4abf75cc666b78526c9b95ebb2920c77c56227eae6c893b57f9f463ff2ebc9acddb2f7ad543c5b2259047a4cc87ad05c08bbf02e8bb267bc490c4b67106fb598d42135c927fef3397f4c3f6838776787f23a9759dd3214075e79eb3929932becde84e82c257e4638a19e1e3312cfe09d4ac681d653d749c8fa6efa6dac35ad59399f1e233540fa354681ca55db90007039b7e504e2e4082aa3e4d672019741aa02a281454d4e1c73a1c7d0b5449c2e143ceaa3b18cb9a74a89f1ba74963dc5dd4155a356211277af3a267947700a2cfd84a605ab02d37bd6faa8a26b50f7b3d9bdc79913272c31dcc0f0183d05933a9f233504ddee2dd851529667ec5174a3d23bfca197538ebacda36bc29ca675384c0b3f45e4f67fb66d8dd4aa57b7da50ead391e6b663af173e7f4d46139f5d0f4cea84dd32e4e718967c6b93617271224f2fb3a1ca5febff5f26c4edc60e9acdd9e464ebb4571dced645814e1038a50515a7e06501adb2de19fec4119dec7548c41097964c3151226153ccac24abd1415579ba1c37c805a5827332d97ba90713829fb30b7b09b275d75bc10d4a26b33980a0ccd4b00844d9f379551bd0170ee895286526ea9625a72b6cb8decd9cf18e57262f8102a025025e8168465a65a7c7e4d5fc8742781acdc16171085d51dd5ec9f4f71f58cfaf4557a55d07e7c164ccf7eb427145c7f9a800e9bd9192ec0f74d19fc17d3881b1d55e8600aa55abf78fd1e226d9dd6e8da2bea15712f5f43325d4b9c083d6e37d35c043f2bc8c796ade072555263331bee7fffa54e2099135ea363575847abb770322376cbfd3f1b7980a1857c55fc82aa80bdcd701c7b7d66221f08492efb5438a04d041b485bcb61f6fd306e96cfe758d99ca1cee70b200eedee86145fe37ab7aafcfbb2df694361fe9923e754187c3277cc895c4a53732ee118c7b6156b55b30847a6e828b7069a5d4be623abff66ba87bff49294dd9b1f698ba445d610973d052a80691c9968e3179aa3eea5b0bccb3cf674c5cfe7d2c14d7b6daa7a4813abcd56ef930099
 Output = 1cffb3d6d9dd9cf90d79fb2c5c974818c5bd6f32ea4d44c302337c4cbea44334
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 Entropy = 00ff48b3769ffaf4e91c1c9110eb8ce9e2cb99f060b486b37035407d2f4ca517
@@ -2194,7 +2194,7 @@ EncodedPublicKey = e8014b4f4687bb6670b1c2a29ba577100943d5b926cb396423663f710328a
 Ciphertext = 3159aa52482f4262cee553f9eb6d853d091a507831f5ed1af37b9c55f217eb1e87e8b0dfb653932c27e9e9f2c4d45cf89e9cfe9ba0d5175be56b7fe3751a4255649cfabdf0cbd5a8704d58511acf6e0580eed572561fab262b24d39c3a430a4e54fca969394037df12fd8cd71b7b6ec3d8f7345b05d4c16c5871b686690cee9804012a3379bbcf720f405c3c83f59aa391cefd8b00a73b41147d42c8b7820b0e779c44e032209067349fa4cd35e83850ae37ee73f96fc6bc5b71ff9b0462604b4e07be60cc76903175b045b908c9b8e7e94c6bc7c48ffd49698873913f9132025e51614317d27a874e319d802923804d1ce1626420d5794bbbe5e077cbd7fa3d958fb2d9608a3d41f605908d21fc7f942e3152337115a28b661f76405620b056692bfcc066f370449628f8e31b7453e5b7b10702f7c195dfb779fb3253f86acbaf4444ba9ce01c9b043133a233030247f8fc44d5b8c9b024ee83c186a62ba9fa5a3e45389217884a478f238d6a9b8eaf3d87b7b4b4375d4d5226dfb80255faab42380365b5511567978be9726d21178eced7294463a348b1e976d800b1114fb8230115b28e51f628a31aa8cf2e3253a7dccaa37f975fa2b8d32a6b6147033cfcbde33ab8857e3a6af95e4cd0db62fc020f55c2d6c9204a05835e2cf878c66502f572016d95b30c45c2ef6048471ad0cb7fe14250dddcb4014c392c22fb1dce1adc8e02f416d3e9b417f41c1b4065b975de472d0e9fd5b3a012ee9bf6311345b4968f6f18262bfc2a38d56d911f9efb981813f77a8a8d6af0618e015b8b005e7ea957f89f140192c7442a645ea7012b5ea2ba9f8cd2fea2ad3e41c6a57582237d53444fceaa933d61eac36d03a2865bfb7f12fd8cf451edb5050a35a75c95dd328296dc32daf61622ce0cc457c5968414b634b3e12a0ce45bbd733e3982c087a037d89cc86d546007bd92eef33949d19dbd4daa18e59c7ea3572bf3155a9a46af527347f4f4dcc2be3cc285d65f2f86c681a137850431ce8d2f76e295e74bd0b3c88f1b68885522dadb99fe1c8e40d938c9610e466770d62c34e9393241907d9cd7bfa470cb8fc149306d9450a7a1887d03cddad3fcdeda1ea54d3f126bb29a1ac3d7c5a60ead90d74ccbf1a75b4289a74a49e0a7c4006ab76a83915ebd4a95a471525444dd2c3e748b1bd347774e2cf01f90f05a1672c58f4f563e4da083e95e0fadd4ba57acebcb45611a3923da1d0d73f5c9a55489fb0097e123694e413460252892a0c6317dcb56efa834f7a51db4a413976afcb30ab4dafbe737f43da11c1b08a2472cdff3995dd7d23382b866873624fedee76823d37ec230dee2107258993d5b802fadeb89c9469a33c66c91567ea92581e0c2c1eaa2e2a4696b024c7c6009687d07769438a8b2ba75a7bfb32841dab8acfb8cbd4d1e26c5eb68bc49bb394b178e6f89dde843f4e2c5353b04390c245a0bddd1aeaefb87528b719fe42b35ad2a89ef34826d9e23f95b1bd3c3b24f785985e10dcaf0eb33f5f71f5cbe55
 Output = fd9e333ac811ae8be12c052c65131e3a7a32ce82e39055012ea564e10acaa85e
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 Entropy = 4960ccb1276f96d7aa55885b6ae6f90343d42e1391e8241b5952931a979837e1
@@ -2202,7 +2202,7 @@ EncodedPublicKey = f6513e1ec8234bc145eba3446eec18b3826b2ae709792648e071a7c4627e4
 Ciphertext = 5ab063c95a541d1be3fa0744e0db7e0ece17b6b47cca0fa41d08e7969fe87de63f319f80b9a31ff01e203de6e518e62e6133edd108e5a3e08d3f8ae0556cfd36b399dc1ebf3b229bc5013d06d7550512280bad2b27657d3ca0679d9fc62f0bf875dd0b326008a89b4f29e97211ee7ec75108a9e4a320a34daed15fd7ad394a1747e4e35bbe4f1118703c330aea81bef3e3883fd41c3efc3423ab46b553c7587894ad64db57bb0fe4d289d54c8ba78d40683bdf6330ccecbacd3f7f41541f1f2b1a7626d3969df6586b4214c02f921451f6adc04f5e8de1e3beda82e4aebc5e06abb33f4cd8a3b3b5741617b6a385739133cf5b77dd5607a5c8721d5b51c6c0b6df551a5b440082093f49f31910a04e4226b9ae6f41383672e0694bc4075207034e39c40668aa3174cfc8a75fb1a474485e9aff01f3572a5c7e4914e7519344c8ce7b81377d8c2af66bebc558359601b21beb984c1f00564d46585b4bf02c958c6b348642be25119b12f34a6e5755588f649837ba53c0efaa4c6c95d109a4ce1f761c1dcecb84cce8376cb1c4e34ff932408ccd2d06f20c5397f6277bf9c3234b20cedd45afecb7e87793d85af15909546c6ee41987f36d85865c8c1e281e13d9575abb9a9f215c08d89420535f73643dc584707deb7d5275252e862393fb6493f9e126c651b7981f26af8daf978153fa4476d615183bf147629fe36de7cceaa670dab930ba8a684b0bee24b55961ea556123b34e29491704d2122e46bed0f6fd50601e13a5d46c907b915f3b8e695e0bbf474aab6e082d156e79e59572731b48338892f2268dcbb8fc21cfd537979278ceb210fe3efd052365fa249c97e8e596ae6225839e5b8b296770f3b42240b8727a0a730534d0f42f8c6ef148fc04e4285e1aecf060c3666fc17a1ff794f584b26b0b1c41f0fcca249935cd411a151932b09402016a99832850b3f56c4846145738f709f5e11e28a90d9137e4e43f03dd1ddb6565c67c2a138aca59e8aebcfa61984bc7ac13a60ddd2c1f0fa84fcf9264ad5049c888b9f555e024f0fa685474e083025da168e3b9c4ad91f074e7e711f84bb808604114e09d1ceb83b697cc0f045b5089b0bf7381ff2efc08e7316ddb7eb7be47a1d82cf533ea898e668f0da124d2e87fef2b558f877b50b13a08641c74e2726b19fa7c0f33ab213f403c328ea60d08c07155ca0c19bb75f7f6716de89e34c20f9d15ba8aebcb98e9b6461477f56f9c65ea7e8744a4d7306e216f806ea8f9f1dc45781c1adba44319031fb9e81c6d33bb317d959bc53a677270f13d96da19833965aea9a18172f6f975bc4d03036b1239e7c315ecacec35cc0f788be1220c0497844fe7c989fff5ef7fcdf89c261a0fed3915cbfae94b1fba22827daaaaa0f968f1ac71e9772aed587d607d5d3f57c1500b6e08760e0b971c1999d01553bf87f55fbad96ce61d0750d75180623543f40e5b0cee74bb429edbed1b4c2a3e1aab86c8dc7381afb0b9e7d4151a3f76b7dec4199b97304d7b3845788e19126e
 Output = b4b4634ad37852e19175ccfb5eca50093291da8f76b86be7511379188bc20d92
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 Entropy = 456be124e7f43803de5f734ea016455d68164a7f054c003f4ef49e46f42dd8d0
@@ -2210,7 +2210,7 @@ EncodedPublicKey = b0abba905c1559715f25f720b7b745a52332355154e60577e598c754b6346
 Ciphertext = 925fde875ae198cfea88c4eeb3a0091897e25a793672df1de3f24ab4fd3edb2cad0b07e698f35dc97bfd1d551fcace3282c8c3d8131857d96ee9986da7b79a02ddc6cfc9fb7f2b809a8e5511b1c1256dbab33e7606d8a5fc048b36f6ee53c7f556efadf94494595a549ca260ac9c45bf9962bf406610ca58dc286a9eeccc447a767b6db3ab009f5848558acea4503de747d72d43218babd6f68c091b4581f4e41f2e850047f5f543a02407e7331202b0eac7bed180061bb53f4dd3504ccbd3f298d96b43bbaf8f0c2545be54c59830e1f343ca88bb9c6812c66bfbb59a6d68298985767a73d34fa69b52cea98d95d8305f97c4d4fd643b56c60fe31e3c2ee7e938ac2e4a5da2297e670931c1dea5fcbe9cf118c62a76a461495f10f640fb416ff7bc2478c0e8a1356bb840345f3d43476bc4cd990eb7f7cde7ccb96452d055397ee402be2ce395a29a4f4061ec3d85b99f086341441022435b636028a1a04c5d787abe1c24a5a55653b7063b1cacdaee40ae0de77b4034b9ac0e860a90c8834b352c71e353c02b1f46b135fa68fa7a5c1c719896987d79f3174b8d0b0c28ed64cf9f2907924497e35bf519d519a9199a4dd68025992c6f466604bb2ec3d7b13eba76e4803fb73bb125b83413998ae86691a0b35c0054e1418898f435ab26cc12a12fd4dcfa9e80887af7ebb6c856a7fc010cfcaef9e1c5a4dc24a91a622fb7307521faff0b8e8e966b7b6ae849ccc75d31c8d700a3b6a9c3f646b2a88d1e9391c2ddc6c9ff15db961874c87dd94bf0165cfc8f719806539a8beb8e28350610461b1252872f0f3ac273b3366abd78d9fe8868dca1a5eecb683ab8b50ced8cf4a5ed3b721e0fe6b205fb191985ca745ff5dae0010493f8296b6586e1c96f7f23fcb4ac4dda15eab811107c977aa0a16439b06986a9027640cf7a01051934dfc758215d22c6f06866d5b871dfdb6ed240a73dfde43f7f89c0ce6909b54b0a633a25f7253c10906166f81ae91a1419028d6182c1f277dc7872b824c7a5a22bc7afc02afeaa9ba4c271ee68882397e6cec34a955cfc672f4e6f5ed870a35ebce97f34542cf0a162938c91922230ee3fe9ed9a166a790ccf450b80cb5f483c3c6ae5b2e52e907824b45e69e5ab38226cbd6519de995e1a62a910fd45ed189540e0b4058ff01edbc6ba4eebd58d55c0e33702de299eb53d6518254b8471f282779533eaaef90602e52373be8b519c56a2f6fac0953c0f84135715c5674e45d15804fb94d9e0525ab493aa625fbf73ebdf74f0a1246e1eb0e4e2e261b24ab81d8da6e1770634c747542450cf0a2af23507f8b6766a16dbb2e67b2c94859228b91eec6c59f5a271902b340320412ae947398ad102073f8b9b8c021f81f786622c3483e61f812aa76232e6f9453eae044c5e918e6e4e0e18a78efaf6cb36f7b75929d0036c44edf928d6efe1ddc87b96288c7c624655d302b98865978ed7bc779c800e6113a0484dd225aef29796c8ba300b3f48dd566fd877dfeb5d25f96da5d07e643c5d
 Output = d4b9a0f77a52d4f8b9c95951257348d1931725c27eede694ecc09204a931daf7
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 Entropy = e8ac9e76377d67d84f85a142383e777157805be0d0f679ba89cefdfa61583780
@@ -2218,7 +2218,7 @@ EncodedPublicKey = 038c5d80656805b427d0b9167abb3697444af88a0f3eb48bf658be44f36b0
 Ciphertext = 7c06bbeca8b58423e2ad420ec36064ed42c881e3655668f8865a2d643ecd1a4eecf915b6c64b37c98947f06c3ccc8e00bbd16017c246db88cc83f12c887aaad7db61b4d567c285841689169c3f928f1d178a0ddae50d8c46cfd95258667d6239c300595738defd2e806637ca46baa4c6c7b97f1a9b47d53cba9ffe074f88d104c4971d250d085b1800fcbd91584d8cc48e145fc81438290d74765e7ee8c1605e8048b37b9d22b050791fe008b9b84b7f23b0f49955e32c0eef78d7a3a0b2effe8b37d124e19d4cb6f6914204598a525239d9baa116e1c9c39c47f9f37f965941b2aef8519782c65f3ad3a6509d1e31e7efb67db21911e4edeb1f7e9c37b3f852c81d63a95e4775e3f2a8ff315a214680adf44d290e42ebab8ca95bf471140b9d7e03f5e9f97864289a0ae8c9a105e00409f714e413b69be366303b4a138ed51264ab0e5cca5f6dc9387c6608109e8859893efa3bc7384e9f418468b1078807dadb768e254094039d1b807d67353c8e0b5a03d28b8e41ffa0eb3ce0837a132144597908f7a059a097b79a1bac323757324e907b445d064e25c378d2069e7c5d671036871e4fe36705747635e40c6e835319e3ff81714cacc44515d671b703c5581dc76afca0b881f37c1ffc93f2e4afab1e8ac776ca883f3adf7f9ab99396f7e19541c26342a7d5618958523b81871326c357ad84ccc6d3574d97cbd875524e7b08a102263d80f318a48e510c22126568f76936c904c231700ad042d73137eec741c827a082de4a45d296745c55b8367719dd08b8295e38d8d3894b9f8e2f9b483b266e1fc71d6374353ca7d9ed1c6b73ab5a42f6abff7b2ba8fd484d1ae6928b5ea92ea3577be01dc1e88abcd0886eb771dca4d36e91c45bca4807c89736b7d6a927cf64b22c5f323077f5488f6044976f310b4b99f7d486335dcca60571157ac0e480a4dba79a826b4bac3dcb7327a33b16381eb41e1d39915e91a58750ceb71098ec7f1a2d7e44d4bab75bb7482eec277df206502c497eaa345109a145a4da6bed1900b680ad12fb028d33563bfb204ecf66e6ead587c5fe27f8a2eb0e27471925ea0f35eb9d5e53ef801eba3acaaa7790b105eb6128ace992668181c1d7cf203afdccdfefbac67dbd97cad05d499239df84e4cf7372117932c973957e5c70a8520f822be430758990296877df62069d818768513d14df0568be8e63e123bdde35036dcc69a98197f52dfbaae5e5e0cee4a48c67fdda605dad8a27651625c2b35e81dfcacd2a41a6d17f6d7067a67faf2479b3868673b248270f4a2d8ee26de9c787ce966ecf186c1401ad9d3bbf2c43b1d5de32bdd77f5433f4325427254a13985d733ab0863e62a4f3d484ab3f5d3b88f23049079143b058babffc8367cebdd9d2468d7af782979a3ef12841370da6ef2db03679e6bca0db72166c361adfbfc02234119abaf98d4fea8ddc6e8490c2fb5a1be4806a61bc7b36884cf4631cfd53138a23fdda11e597aed323748314282672473a1819ef2b9488f6744544ad
 Output = c9d0cf3edb1172344364afec3615ba98477ce9316f92ca46ca5f42b73553a9f5
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 Entropy = 2fe6b9cf4510f212839e348d671b3345da68a477f57513ce363414e87299a717
@@ -2226,7 +2226,7 @@ EncodedPublicKey = 7dd722a23522b0d8cb522a67d63a75af305c05f3659bc496f1c47e410582a
 Ciphertext = 83ea5ed982570cd981b7430de924469d4e2faba68e03261a74f5114ab8c448376cfcd1b9cb3e72bb031bf0fefe772bc40888abc6acffc1d335d46d267acde2cb89cf1b3c67a139796d6a5763805d5edcebb81070b44ffe021b6c2b3c6c3d5dfb6d9e546930223ab0139990c6c5d6257520fe394a3aa30c6a71d47f415ac86b68eb8c83b131a3c5cbf051971fef5ef3bda355d3868e71ed8a0e2c6de8a759bc0c9e760277cc2c04c783d29d1ad3d3385accb85cc88c39bc8348f84dd8c714c5feda50b0770414a333136d6678be6ccbc5df488bafdcade883fbb310c99cc648493aed72680fe1e43c0cf523d3dd06417d29dd97c98ce53089505d36a476c0ae6d89b165c3ff6b2c62ba954fb81ac5782ae648a6802bc057c64fabd3726559ba79de9c144aaa525f6a840ed55abf21b37231c6c4cbb0110fdbcd0004f6f4974ec644c33a8aea34ef4a0a146f7502650c3def5a313d2f309cb428880502d3bdf39196a99bee296f9231d87972efd1159d3cf59bea05f0d0373a0e218ee5e0528e1ac7132440980d1153b9423bb2e099d05fbc8241ec1f316bf0add575a69982f546e99c64457c12ac83951ad46a5f024f6a61c91b7d3853ba1fa41d5a95f6ca811610ba3f32addf011ea4091ef217cdd126ec5e45cc40ec6f1292602b16c02718419646370e5b2c7c55c1128fc5d6c767cc75248b79e2379d40f91a8617e8a3db43c42cabb5cd39a7a7969147f30344c4b03de7034b12d8a1c3639697c97c4483e4191ca0fa81d8659f40e31b899b4ef4610644b1314ab2ef14b8dd8dc0082826fe65dc17211572cb14fa376f1b1784a00033c8dcddc44d6a1128a200eea668b6516ba42585cbb2e2be2a42148120013d0a9378ed7c185071fa8fdc09102164c63a665fd09c08d34104c9abb64e394b2e2a00dd834f7c7f5de16f6c02906ae37acc923dd76e530c78f2143396bfc371d14e6c48bec072b6b4e18eeae967456beb3f897a06eae17de174cf09be1435e691350632c0b1eac69dd66549c1d980fb147fa295ca6f21b5dc398e63a7c4263c75b55c85b4f38fbd7cc0fad84aba90dda1f2c9ca88d88905602096162486dba1ed0a8caa6b897c99e25934152a35fd0d476de09fb211abf36565af3744f3fb737247f5d8f172fbf438ed04422a6b3e17bdfe2cb0f09a1d57f1f1a113a768697f23d61ab288f15abc760feb0f5c5d4d5c0b1c891d3dad6089a3b7e54516b8f9755d38430312cf17b21efeeecbfd2719b62480225b9b3ee8940b1f1784ed5630d152635a1233acdd16e5489a9a15eafa7bec99aff25b18d9cac1e726c9e424773a7083f213cea53dcd310b0037aecbde1d584657f32cf548a6872c6f5a1a3a70d4db29ee3773291c94b00b5a596e1691f7752e246ca0960561cd233ec7d5f54496d34ba65b359a856315f02d16c990cdf3db2051b17bf283fed1b808ac79a9ce8250c806896bf75f2cfe76465c09360aba4c9688acea341fe755363abe41c0cba3ebad00c6c7bcc3f7ce091f87079f60094b92
 Output = 4bb6a6b27596869efae3d411c69c593afff99b1a703ee1f4ff3e0e7e9756e75b
 
-# Rho leads to a matrix with unusally large entries
+# Rho leads to a matrix with unusually large entries
 FIPSversion = >=3.5.0
 Kem = ML-KEM-768
 Entropy = 86630b4f72820d19e9941784183b3a0d770609becd6fe0dc463cb6edac432d59
diff --git a/test/recipes/30-test_evp_data/evppkey_rsa.txt b/test/recipes/30-test_evp_data/evppkey_rsa.txt
index f1dc5dd2a224f..42819f7c411e5 100644
--- a/test/recipes/30-test_evp_data/evppkey_rsa.txt
+++ b/test/recipes/30-test_evp_data/evppkey_rsa.txt
@@ -642,3 +642,12 @@ Key = RSA-2048
 Input = "Hello World"
 Result = DIGESTSIGNINIT_ERROR
 
+# RSA Signing with X931 is not approved in FIPS 140-3
+Availablein = fips
+FIPSversion = >=4.0.0
+DigestSign = SHA256
+Key = RSA-2048
+Ctrl = rsa_padding_mode:x931
+Input = "Hello World"
+Result = PKEY_CTRL_ERROR
+Reason = illegal or unsupported padding mode
diff --git a/test/recipes/30-test_evp_data/evppkey_rsa_sigalg.txt b/test/recipes/30-test_evp_data/evppkey_rsa_sigalg.txt
index 5083cc2bde24d..f258700670ab9 100644
--- a/test/recipes/30-test_evp_data/evppkey_rsa_sigalg.txt
+++ b/test/recipes/30-test_evp_data/evppkey_rsa_sigalg.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2024 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-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
@@ -186,4 +186,4 @@ Output = 6a7fc08e9999fc9d50cda476e973a01a06efeb52eece1c78cb1422950476cbff67408c6
 Availablein = default
 Sign-Message = RSA-SM3:RSA-2048
 Input = "Hello World"
-Output = 92657e22036214c343d8e95d129c0c47430d5a1ae452371a7847a963f533f96e018aa6658958e6a584cf0d380aa9435175cf2de3dfa60100aca893b76aa6d8f0cc9154ee982cb5ea8f19153fe8a9c801aa2da8bb4451c7ec6fd836e81ecdacf022b68294db068efa47decf3a7c548ea7088a16433029b8733b9573053b7e7122ea10b662726fc97bd149c663617434a9707b672b024f95865d91077edfb79c8ed4c8528032204c46c984a6c82b17794cbf9c4dfe4c1af1d59535f7755540ff36d6a2b55accbf046896c4aae9287a33f38c2a269a02abdac46c17b1b55ee89cc9eb3011a84916596f982c5375dd2110633be6dc43532919466d83bd0f3e406978
+Output = b74e03c18050807541bde949aa0ac91d43fb9730f0b529d5100d5776f4f446d0ca0f0992359dc5f89386ed45bc3bf52cac1f75fbcc088fc2ea77624fd962569d2d317e90886dec424fb6757c4eba1e881ddf4f7942e8003b54e05cc974558dea171ce23a2fc158f71a5621c9a2c3ce45c9af4c706d3f60efe0c0f087a6ec504f771b08e2a1d78e0316c74706c678869bf121d5da00e2e8c8dc1cd273315b4ad8ab9962c62f81cebc5fb393b7f8860ee68545578413feada82b1c2bbfabfa157e298f0354bffc1cc6aa68f058a5d34b6b70ffacd3532c6b2c6a0de059bf605edf392ac8adbf1769555a0a50b2b13c63cae98a461498fae7f0d1729b710f05f39e
diff --git a/test/recipes/30-test_evp_data/evppkey_slh_dsa_keygen.txt b/test/recipes/30-test_evp_data/evppkey_slh_dsa_keygen.txt
index f136e718c05a1..241771ae3be4a 100644
--- a/test/recipes/30-test_evp_data/evppkey_slh_dsa_keygen.txt
+++ b/test/recipes/30-test_evp_data/evppkey_slh_dsa_keygen.txt
@@ -6,7 +6,7 @@
 # https://www.openssl.org/source/license.html
 
 # ACVP test data for SLH-DSA keyGen generated from
-# https://github.com/usnistgov/ACVP-Server/blob/master/gen-val/json-files/SLH-DSA-keyGen-FIPS204/internalProjection.json
+# https://github.com/usnistgov/ACVP-Server/blob/master/gen-val/json-files/SLH-DSA-keyGen-FIPS205/internalProjection.json
 # [version 53]
 
 FIPSversion = >=3.5.0
diff --git a/test/recipes/30-test_evp_data/evppkey_slh_dsa_siggen.txt b/test/recipes/30-test_evp_data/evppkey_slh_dsa_siggen.txt
index 397fe783aceaf..e17bf4ffa9d6f 100644
--- a/test/recipes/30-test_evp_data/evppkey_slh_dsa_siggen.txt
+++ b/test/recipes/30-test_evp_data/evppkey_slh_dsa_siggen.txt
@@ -6,7 +6,7 @@
 # https://www.openssl.org/source/license.html
 
 # ACVP test data for SLH-DSA sigGen generated from
-# https://github.com/usnistgov/ACVP-Server/blob/master/gen-val/json-files/SLH-DSA-sigGen-FIPS204/internalProjection.json
+# https://github.com/usnistgov/ACVP-Server/blob/master/gen-val/json-files/SLH-DSA-sigGen-FIPS205/internalProjection.json
 # [version 53]
 
 PrivateKeyRaw = SLH_DSA_SHA2_128f_1:SLH-DSA-SHA2-128f:D5213BA4BB6470F1B9EDA88CBC94E6277A58A951EF7F2B81461DBAC41B5A6B83FA495FB834DEFEA7CC96A81309479135A67029E90668C5A58B96E60111491F3D
diff --git a/test/recipes/30-test_evp_data/evppkey_slh_dsa_sigver.txt b/test/recipes/30-test_evp_data/evppkey_slh_dsa_sigver.txt
index 647ac486a669e..9aa165ae4bb69 100644
--- a/test/recipes/30-test_evp_data/evppkey_slh_dsa_sigver.txt
+++ b/test/recipes/30-test_evp_data/evppkey_slh_dsa_sigver.txt
@@ -6,7 +6,7 @@
 # https://www.openssl.org/source/license.html
 
 # ACVP test data for SLH-DSA sigVer generated from
-# https://github.com/usnistgov/ACVP-Server/blob/master/gen-val/json-files/SLH-DSA-sigVer-FIPS204/internalProjection.json
+# https://github.com/usnistgov/ACVP-Server/blob/master/gen-val/json-files/SLH-DSA-sigVer-FIPS205/internalProjection.json
 # [version 53]
 
 PublicKeyRaw = SLH_DSA_SHA2_128f_1:SLH-DSA-SHA2-128f:68669488582C94B7A609C9AB7EA5E15319A4F53DF851840326BE7E7BDD5B70CE
diff --git a/test/recipes/30-test_pairwise_fail.t b/test/recipes/30-test_pairwise_fail.t
index a101a26fb184b..eaf0dbbb424f8 100644
--- a/test/recipes/30-test_pairwise_fail.t
+++ b/test/recipes/30-test_pairwise_fail.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
+# 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
@@ -22,7 +22,7 @@ use lib bldtop_dir('.');
 plan skip_all => "These tests are unsupported in a non fips build"
     if disabled("fips");
 
-plan tests => 6;
+plan tests => 9;
 my $provconf = srctop_file("test", "fips-and-base.cnf");
 
 run(test(["fips_version_test", "-config", $provconf, ">=3.1.0"]),
@@ -77,3 +77,45 @@ SKIP: {
                  "-pairwise", "eddsa"])),
        "fips provider eddsa keygen pairwise failure test");
 }
+
+SKIP: {
+    skip "Skip ML-DSA test because of no ml-dsa in this build", 1
+        if disabled("ml-dsa");
+
+    run(test(["fips_version_test", "-config", $provconf, ">=3.5.0"]),
+             capture => 1, statusvar => \my $exit);
+    skip "FIPS provider version is too old", 1
+        if !$exit;
+
+    ok(run(test(["pairwise_fail_test", "-config", $provconf,
+                 "-pairwise", "ml-dsa"])),
+       "fips provider ml-dsa keygen pairwise failure test");
+}
+
+SKIP: {
+    skip "Skip SLH-DSA test because of no slh-dsa in this build", 1
+        if disabled("slh-dsa");
+
+    run(test(["fips_version_test", "-config", $provconf, ">=3.5.0"]),
+             capture => 1, statusvar => \my $exit);
+    skip "FIPS provider version is too old", 1
+        if !$exit;
+
+    ok(run(test(["pairwise_fail_test", "-config", $provconf,
+                 "-pairwise", "slh-dsa"])),
+       "fips provider slh-dsa keygen pairwise failure test");
+}
+
+SKIP: {
+    skip "Skip ML-KEM test because of no ml-kem in this build", 1
+        if disabled("ml-kem");
+
+    run(test(["fips_version_test", "-config", $provconf, ">=3.5.0"]),
+             capture => 1, statusvar => \my $exit);
+    skip "FIPS provider version is too old", 1
+        if !$exit;
+
+    ok(run(test(["pairwise_fail_test", "-config", $provconf,
+                 "-pairwise", "ml-kem"])),
+       "fips provider ml-kem keygen pairwise failure test");
+}
diff --git a/test/recipes/70-test_quic_multistream.t b/test/recipes/70-test_quic_multistream.t
index 7ab66f7e311c9..320d095d94f4e 100644
--- a/test/recipes/70-test_quic_multistream.t
+++ b/test/recipes/70-test_quic_multistream.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
+# 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
@@ -40,7 +40,7 @@ SKIP: {
     subtest "check qlog output" => sub {
         plan tests => 1;
 
-        ok(run(cmd(["python3", data_file("verify-qlog.py")])),
+        ok(run(cmd([data_file("verify-qlog.py")], exe_shell => "python3")),
                "running qlog verification script");
     };
 }
diff --git a/test/recipes/70-test_sslkeylogfile.t b/test/recipes/70-test_sslkeylogfile.t
index acff862229af5..2be202f785e37 100644
--- a/test/recipes/70-test_sslkeylogfile.t
+++ b/test/recipes/70-test_sslkeylogfile.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2024 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2024-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
@@ -19,7 +19,12 @@ setup($test_name);
 plan skip_all => "$test_name requires SSLKEYLOGFILE support"
     if disabled("sslkeylog");
 
-plan tests => 1;
+my $tests = 1;
+if ($^O =~ /^(linux)$/) {
+    $tests = 2;
+}
+
+plan tests => $tests;
 
 
 my $shlib_wrap   = srctop_file("util", "wrap.pl");
@@ -75,3 +80,9 @@ kill 'HUP', $s_server_pid;
 # Test 1: Compare the output of -keylogfile  and SSLKEYLOGFILE, and make sure they match
 # Note, the former adds a comment, that the latter does not, so ignore comments with -I in diff
 ok(run(cmd(["diff", "-I" ,"^#.*\$", $sslkeylogfile, $trace_file])));
+
+# Test 2, linux-specific: the keylog file should have permission 0600
+if ($^O =~ /^(linux)$/) {
+    my $mode = sprintf("%04o", (stat($sslkeylogfile))[2] & 07777);
+    ok($mode eq "0600");
+}
diff --git a/test/recipes/70-test_sslrecords.t b/test/recipes/70-test_sslrecords.t
index 691db13b8a8e5..299ecb60bea1f 100644
--- a/test/recipes/70-test_sslrecords.t
+++ b/test/recipes/70-test_sslrecords.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-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
@@ -33,17 +33,17 @@ my $fatal_alert = undef; # set by filters at expected fatal alerts
 my $sslv2testtype = undef;
 my $proxy_start_success = 0;
 
-plan tests => 42;
+plan tests => 44;
 
 SKIP: {
-    skip "TLS 1.2 is disabled", 21 if disabled("tls1_2");
+    skip "TLS 1.2 is disabled", 22 if disabled("tls1_2");
     # Run tests with TLS
     run_tests(0);
 }
 
 SKIP: {
-    skip "DTLS 1.2 is disabled", 21 if disabled("dtls1_2");
-    skip "DTLSProxy does not work on Windows", 21 if $^O =~ /^(MSWin32)$/;
+    skip "DTLS 1.2 is disabled", 22 if disabled("dtls1_2");
+    skip "DTLSProxy does not work on Windows", 22 if $^O =~ /^(MSWin32)$/;
     run_tests(1);
 }
 
@@ -336,8 +336,17 @@ sub run_tests
             }
         }
     }
-}
 
+    SKIP: {
+        skip "DTLS only record tests", 1 if $run_test_as_dtls != 1;
+        #Test 22: We should ignore empty app data records
+        $proxy->clear();
+        $proxy->filter(\&empty_app_data);
+        $proxy->start();
+        ok(TLSProxy::Message->success(), "Empty app data in DTLS");
+
+    }
+}
 
 sub add_empty_recs_filter
 {
@@ -864,3 +873,41 @@ sub not_on_record_boundary
 
     }
 }
+
+sub empty_app_data
+{
+    my $proxy = shift;
+
+    # We're only interested in the client's Certificate..Finished flight
+    if ($proxy->flight != 4) {
+        return;
+    }
+
+    my $data = pack "C52",
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, #IV
+        0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+        0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, #One block of empty padded data
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+        0x10, 0x11, 0x12, 0x13; #MAC, assume to be 20 bytes
+
+    # Add a zero length app data record at the end
+    # This will have the same sequence number as the subsequent app data record
+    # that s_client will send - which will cause that second record to be
+    # dropped. But that isn't important for this test.
+    my $record = TLSProxy::Record->new_dtls(
+        4,
+        TLSProxy::Record::RT_APPLICATION_DATA,
+        TLSProxy::Record::VERS_DTLS_1_2,
+        1,
+        1,
+        length($data),
+        0,
+        length($data),
+        0,
+        $data,
+        ""
+    );
+    push @{$proxy->record_list}, $record;
+}
diff --git a/test/recipes/70-test_sslsigalgs.t b/test/recipes/70-test_sslsigalgs.t
index 10e7cd1479f92..765b0a58d9ac4 100644
--- a/test/recipes/70-test_sslsigalgs.t
+++ b/test/recipes/70-test_sslsigalgs.t
@@ -45,7 +45,9 @@ use constant {
     SIGALGS_CERT_PKCS => 8,
     SIGALGS_CERT_INVALID => 9,
     UNRECOGNIZED_SIGALGS_CERT => 10,
-    UNRECOGNIZED_SIGALG => 11
+    UNRECOGNIZED_SIGALG => 11,
+    RSAPSSPSS_SIG_ALG => 12,
+    MLDSA65_SIG_ALG => 13
 };
 
 srand(70);
@@ -67,12 +69,12 @@ sub randcase {
 #Test 1: Default sig algs should succeed
 $proxy->clientflags("-no_tls1_3") if disabled("ec") && disabled("dh");
 $proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
-plan tests => 26;
+plan tests => 27;
 ok(TLSProxy::Message->success, "Default sigalgs");
 my $testtype;
 
 SKIP: {
-    skip "TLSv1.3 disabled", 6
+    skip "TLSv1.3 disabled", 7
         if disabled("tls1_3") || (disabled("ec") && disabled("dh"));
 
     $proxy->filter(\&sigalgs_filter);
@@ -115,15 +117,35 @@ SKIP: {
     #        in the certificate is rsaEncryption and not rsassaPss
     $proxy->filter(\&modify_cert_verify_sigalg);
     $proxy->clear();
+    $testtype = RSAPSSPSS_SIG_ALG;
     $proxy->start();
     ok(TLSProxy::Message->fail,
        "Mismatch between CertVerify sigalg and public key OID");
+
+    SKIP: {
+        skip "ML-DSA disabled", 1
+            if disabled("ml-dsa");
+
+        #Test 8: Modify the CertificateVerify sigalg from mldsa44 to mldsa65.
+        #        This should fail because the public key in the certificate is
+        #        for the wrong type of ML-DSA
+        $proxy->filter(\&modify_cert_verify_sigalg);
+        $proxy->clear();
+        $testtype = MLDSA65_SIG_ALG;
+        $proxy->serverflags("-cert " . srctop_file("test", "certs",
+                                                   "server-ml-dsa-44-cert.pem") .
+                            " -key " . srctop_file("test", "certs",
+                                                   "server-ml-dsa-44-key.pem")),
+        $proxy->start();
+        ok(TLSProxy::Message->fail,
+            "Mismatch between CertVerify sigalg and public key OID (ML-DSA)");
+    }
 }
 
 SKIP: {
     skip "EC or TLSv1.3 disabled", 1
         if disabled("tls1_3") || disabled("ec");
-    #Test 8: Sending a valid sig algs list but not including a sig type that
+    #Test 9: Sending a valid sig algs list but not including a sig type that
     #        matches the certificate should fail in TLSv1.3.
     $proxy->clear();
     $proxy->clientflags("-sigalgs ".randcase("ECDSA+SHA256"));
@@ -136,8 +158,8 @@ SKIP: {
     skip "EC, TLSv1.3 or TLSv1.2 disabled", 1
         if disabled("tls1_2") || disabled("tls1_3") || disabled("ec");
 
-    #Test 9: Sending a full list of TLSv1.3 sig algs but negotiating TLSv1.2
-    #        should succeed
+    #Test 10: Sending a full list of TLSv1.3 sig algs but negotiating TLSv1.2
+    #         should succeed
     $proxy->clear();
     $proxy->serverflags("-no_tls1_3");
     $proxy->ciphers("ECDHE-RSA-AES128-SHA");
@@ -151,7 +173,7 @@ SKIP: {
 
     $proxy->filter(\&sigalgs_filter);
 
-    #Test 10: Sending no sig algs extension in TLSv1.2 will make it use
+    #Test 11: Sending no sig algs extension in TLSv1.2 will make it use
     #         SHA1, which is only supported at security level 0.
     $proxy->clear();
     $testtype = NO_SIG_ALGS_EXT;
@@ -160,7 +182,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->success, "No TLSv1.2 sigalgs seclevel 0");
 
-    #Test 11: Sending no sig algs extension in TLSv1.2 should fail at security
+    #Test 12: Sending no sig algs extension in TLSv1.2 should fail at security
     #         level 1 since it will try to use SHA1. Testing client at level 0,
     #         server level 1.
     $proxy->clear();
@@ -170,7 +192,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->fail, "No TLSv1.2 sigalgs server seclevel 1");
 
-    #Test 12: Sending no sig algs extension in TLSv1.2 should fail at security
+    #Test 13: Sending no sig algs extension in TLSv1.2 should fail at security
     #         level 1 since it will try to use SHA1. Testing client at level 1,
     #         server level 0.
     $proxy->clear();
@@ -180,7 +202,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->fail, "No TLSv1.2 sigalgs client seclevel 2");
 
-    #Test 13: Sending an empty sig algs extension in TLSv1.2 should fail
+    #Test 14: Sending an empty sig algs extension in TLSv1.2 should fail
     $proxy->clear();
     $testtype = EMPTY_SIG_ALGS_EXT;
     $proxy->clientflags("-no_tls1_3");
@@ -188,7 +210,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->fail, "Empty TLSv1.2 sigalgs");
 
-    #Test 14: Sending a list with no recognised sig algs in TLSv1.2 should fail
+    #Test 15: Sending a list with no recognised sig algs in TLSv1.2 should fail
     $proxy->clear();
     $testtype = NO_KNOWN_SIG_ALGS;
     $proxy->clientflags("-no_tls1_3");
@@ -196,7 +218,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->fail, "No known TLSv1.3 sigalgs");
 
-    #Test 15: Sending a sig algs list without pss for an RSA cert in TLSv1.2
+    #Test 16: Sending a sig algs list without pss for an RSA cert in TLSv1.2
     #         should succeed
     $proxy->clear();
     $testtype = NO_PSS_SIG_ALGS;
@@ -205,7 +227,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->success, "No PSS TLSv1.2 sigalgs");
 
-    #Test 16: Sending only TLSv1.3 PSS sig algs in TLSv1.2 should succeed
+    #Test 17: Sending only TLSv1.3 PSS sig algs in TLSv1.2 should succeed
     $proxy->clear();
     $testtype = PSS_ONLY_SIG_ALGS;
     $proxy->serverflags("-no_tls1_3");
@@ -213,7 +235,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->success, "PSS only sigalgs in TLSv1.2");
 
-    #Test 17: Responding with a sig alg we did not send in TLSv1.2 should fail
+    #Test 18: Responding with a sig alg we did not send in TLSv1.2 should fail
     #         We send rsa_pkcs1_sha256 and respond with rsa_pss_rsae_sha256
     #         TODO(TLS1.3): Add a similar test to the TLSv1.3 section above
     #         when we have an API capable of configuring the TLSv1.3 sig algs
@@ -224,7 +246,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->fail, "Sigalg we did not send in TLSv1.2");
 
-    #Test 18: Sending a valid sig algs list but not including a sig type that
+    #Test 19: Sending a valid sig algs list but not including a sig type that
     #         matches the certificate should fail in TLSv1.2
     $proxy->clear();
     $proxy->clientflags("-no_tls1_3 -sigalgs ".randcase("ECDSA+SHA256"));
@@ -234,7 +256,7 @@ SKIP: {
     ok(TLSProxy::Message->fail, "No matching TLSv1.2 sigalgs");
     $proxy->filter(\&sigalgs_filter);
 
-    #Test 19: No sig algs extension, ECDSA cert, will use SHA1,
+    #Test 20: No sig algs extension, ECDSA cert, will use SHA1,
     #         TLSv1.2 should succeed at security level 0
     $proxy->clear();
     $testtype = NO_SIG_ALGS_EXT;
@@ -254,7 +276,7 @@ SKIP: {
         if disabled("tls1_3")
            || disabled("dsa")
            || (disabled("ec") && disabled("dh"));
-    #Test 20: signature_algorithms with 1.3-only ClientHello
+    #Test 21: signature_algorithms with 1.3-only ClientHello
     $testtype = PURE_SIGALGS;
     $dsa_status = $sha1_status = $sha224_status = 0;
     $proxy->clear();
@@ -264,7 +286,7 @@ SKIP: {
     ok($dsa_status && $sha1_status && $sha224_status,
        "DSA and SHA1 sigalgs not sent for 1.3-only ClientHello");
 
-    #Test 21: signature_algorithms with backwards compatible ClientHello
+    #Test 22: signature_algorithms with backwards compatible ClientHello
     SKIP: {
         skip "TLSv1.2 disabled", 1 if disabled("tls1_2");
         $testtype = COMPAT_SIGALGS;
@@ -281,28 +303,28 @@ SKIP: {
 SKIP: {
     skip "TLSv1.3 disabled", 5
         if disabled("tls1_3") || (disabled("ec") && disabled("dh"));
-    #Test 22: Insert signature_algorithms_cert that match normal sigalgs
+    #Test 23: Insert signature_algorithms_cert that match normal sigalgs
     $testtype = SIGALGS_CERT_ALL;
     $proxy->clear();
     $proxy->filter(\&modify_sigalgs_cert_filter);
     $proxy->start();
     ok(TLSProxy::Message->success, "sigalgs_cert in TLSv1.3");
 
-    #Test 23: Insert signature_algorithms_cert that forces PKCS#1 cert
+    #Test 24: Insert signature_algorithms_cert that forces PKCS#1 cert
     $testtype = SIGALGS_CERT_PKCS;
     $proxy->clear();
     $proxy->filter(\&modify_sigalgs_cert_filter);
     $proxy->start();
     ok(TLSProxy::Message->success, "sigalgs_cert in TLSv1.3 with PKCS#1 cert");
 
-    #Test 24: Insert signature_algorithms_cert that fails
+    #Test 25: Insert signature_algorithms_cert that fails
     $testtype = SIGALGS_CERT_INVALID;
     $proxy->clear();
     $proxy->filter(\&modify_sigalgs_cert_filter);
     $proxy->start();
     ok(TLSProxy::Message->fail, "No matching certificate for sigalgs_cert");
 
-    #Test 25: Send an unrecognized signature_algorithms_cert
+    #Test 26: Send an unrecognized signature_algorithms_cert
     #        We should be able to skip over the unrecognized value and use a
     #        valid one that appears later in the list.
     $proxy->clear();
@@ -318,7 +340,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->success(), "Unrecognized sigalg_cert in ClientHello");
 
-    #Test 26: Send an unrecognized signature_algorithms
+    #Test 27: Send an unrecognized signature_algorithms
     #        We should be able to skip over the unrecognized value and use a
     #        valid one that appears later in the list.
     $proxy->clear();
@@ -333,8 +355,6 @@ SKIP: {
     ok(TLSProxy::Message->success(), "Unrecognized sigalg in ClientHello");
 }
 
-
-
 sub sigalgs_filter
 {
     my $proxy = shift;
@@ -473,7 +493,11 @@ sub modify_cert_verify_sigalg
 
     foreach my $message (@{$proxy->message_list}) {
         if ($message->mt == TLSProxy::Message::MT_CERTIFICATE_VERIFY) {
-            $message->sigalg(TLSProxy::Message::SIG_ALG_RSA_PSS_PSS_SHA256);
+            if ($testtype == RSAPSSPSS_SIG_ALG) {
+                $message->sigalg(TLSProxy::Message::SIG_ALG_RSA_PSS_PSS_SHA256);
+            } elsif ($testtype == MLDSA65_SIG_ALG) {
+                $message->sigalg(TLSProxy::Message::SIG_ALG_MLDSA65);
+            }
             $message->repack();
         }
     }
diff --git a/test/recipes/70-test_tls13certcomp.t b/test/recipes/70-test_tls13certcomp.t
index 5424b128d1aaf..464579fcef15d 100644
--- a/test/recipes/70-test_tls13certcomp.t
+++ b/test/recipes/70-test_tls13certcomp.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2024 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2026 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -11,6 +11,7 @@ use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file srctop_dir bldtop_dir/;
 use OpenSSL::Test::Utils;
 use File::Temp qw(tempfile);
 use TLSProxy::Proxy;
+use TLSProxy::Message;
 use checkhandshake qw(checkhandshake @handmessages @extensions);
 
 my $test_name = "test_tls13certcomp";
@@ -220,7 +221,7 @@ $proxy->clear();
 $proxy->serverflags("-no_tx_cert_comp -no_rx_cert_comp");
 # One final skip check
 $proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
-plan tests => 8;
+plan tests => 9;
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS
                | checkhandshake::CERT_COMP_CLI_EXTENSION,
@@ -296,3 +297,42 @@ $proxy->start();
 checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
                checkhandshake::DEFAULT_EXTENSIONS,
                "Send but not accept compressed certificates");
+
+#Test 9: Excessive uncompressed certificate length in CompressedCertificate
+$proxy->clear();
+$proxy->filter(\&excessive_uncompressed_len_filter);
+$proxy->serverflags("-cert_comp");
+$proxy->start();
+ok(is_alert_message(TLSProxy::Message::AL_DESC_BAD_CERTIFICATE),
+   "Excessive uncompressed certificate length rejected");
+
+my $done = 0;
+
+sub excessive_uncompressed_len_filter
+{
+    my $proxy = shift;
+
+    return if $done;
+
+    foreach my $m (@{$proxy->message_list}) {
+        next unless $m->mt == TLSProxy::Message::MT_COMPRESSED_CERTIFICATE;
+
+        my $data = $m->data;
+        # RFC8879 CompressedCertificate:
+        # uint16 algorithm; uint24 uncompressed_length; ...
+        substr($data, 2, 3) = "\xFF\xFF\xFF";   # uncompressed_length
+        $m->data($data);
+        $m->repack();
+        $done = 1;
+        last;
+    }
+}
+
+# Test if the last message was a failure and matches the expected type.
+sub is_alert_message
+{
+    my $alert_type = shift;
+    return 0 unless TLSProxy::Message->fail();
+    return 1 if TLSProxy::Message->alert->description() == $alert_type;
+    return 0;
+}
diff --git a/test/recipes/70-test_tls13downgrade.t b/test/recipes/70-test_tls13downgrade.t
index 999a79e62a84c..35a4beee06951 100644
--- a/test/recipes/70-test_tls13downgrade.t
+++ b/test/recipes/70-test_tls13downgrade.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-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
@@ -24,9 +24,8 @@ plan skip_all => "$test_name needs the sock feature enabled"
     if disabled("sock");
 
 plan skip_all => "$test_name needs TLS1.3 and TLS1.2 enabled"
-    if disabled("tls1_3")
-       || (disabled("ec") && disabled("dh"))
-       || disabled("tls1_2");
+    if disabled("tls1_3") || disabled("tls1_2")
+        || (disabled("ec") && disabled("dh"));
 
 my $proxy = TLSProxy::Proxy->new(
     undef,
@@ -39,89 +38,150 @@ use constant {
     DOWNGRADE_TO_TLS_1_2 => 0,
     DOWNGRADE_TO_TLS_1_1 => 1,
     FALLBACK_FROM_TLS_1_3 => 2,
+    DOWNGRADE_TO_TLS_1_2_WITH_TLS_1_1_SIGNAL => 3,
+    DOWNGRADE_TO_TLS_1_1_WITH_TLS_1_2_SIGNAL => 4,
 };
 
 #Test 1: Downgrade from TLSv1.3 to TLSv1.2
 $proxy->filter(\&downgrade_filter);
 my $testtype = DOWNGRADE_TO_TLS_1_2;
 $proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
-plan tests => 6;
-ok(TLSProxy::Message->fail(), "Downgrade TLSv1.3 to TLSv1.2");
+plan tests => 8;
+ok(is_illegal_parameter_client_alert(), "Downgrade TLSv1.3 to TLSv1.2");
 
-#Test 2: Downgrade from TLSv1.3 to TLSv1.1
+#Test 2: Downgrade from TLSv1.3 to TLSv1.2 (server sends TLSv1.1 signal)
 $proxy->clear();
-$testtype = DOWNGRADE_TO_TLS_1_1;
+$testtype = DOWNGRADE_TO_TLS_1_2_WITH_TLS_1_1_SIGNAL;
 $proxy->start();
-ok(TLSProxy::Message->fail(), "Downgrade TLSv1.3 to TLSv1.1");
+ok(is_illegal_parameter_client_alert(),
+   "Downgrade from TLSv1.3 to TLSv1.2 (server sends TLSv1.1 signal)");
 
-#Test 3: Downgrade from TLSv1.2 to TLSv1.1
-$proxy->clear();
-$proxy->clientflags("-no_tls1_3");
-$proxy->serverflags("-no_tls1_3");
-$proxy->start();
-ok(TLSProxy::Message->fail(), "Downgrade TLSv1.2 to TLSv1.1");
-
-#Test 4: Client falls back from TLSv1.3 (server does not support the fallback
+#Test 3: Client falls back from TLSv1.3 (server does not support the fallback
 #        SCSV)
 $proxy->clear();
 $testtype = FALLBACK_FROM_TLS_1_3;
 $proxy->clientflags("-fallback_scsv -no_tls1_3");
 $proxy->start();
-my $alert = TLSProxy::Message->alert();
-ok(TLSProxy::Message->fail()
-   && !$alert->server()
-   && $alert->description() == TLSProxy::Message::AL_DESC_ILLEGAL_PARAMETER,
-   "Fallback from TLSv1.3");
+ok(is_illegal_parameter_client_alert(), "Fallback from TLSv1.3");
 
 SKIP: {
-    skip "TLSv1.1 disabled", 2 if disabled("tls1_1");
-    #Test 5: A client side protocol "hole" should not be detected as a downgrade
+    skip "TLSv1.1 disabled", 5 if disabled("tls1_1");
+
+    my $client_flags = "-min_protocol TLSv1.1 -cipher DEFAULT:\@SECLEVEL=0";
+    my $server_flags = "-min_protocol TLSv1.1";
+    my $ciphers = "AES128-SHA:\@SECLEVEL=0";
+
+    #Test 4: Downgrade from TLSv1.3 to TLSv1.1
+    $proxy->clear();
+    $testtype = DOWNGRADE_TO_TLS_1_1;
+    $proxy->clientflags($client_flags);
+    $proxy->serverflags($server_flags);
+    $proxy->ciphers($ciphers);
+    $proxy->start();
+    ok(is_illegal_parameter_client_alert(), "Downgrade TLSv1.3 to TLSv1.1");
+
+    #Test 5: Downgrade from TLSv1.3 to TLSv1.1 (server sends TLSv1.2 signal)
+    $proxy->clear();
+    $testtype = DOWNGRADE_TO_TLS_1_1_WITH_TLS_1_2_SIGNAL;
+    $proxy->clientflags($client_flags);
+    $proxy->serverflags($server_flags);
+    $proxy->ciphers($ciphers);
+    $proxy->start();
+    ok(is_illegal_parameter_client_alert(),
+       "Downgrade TLSv1.3 to TLSv1.1 (server sends TLSv1.2 signal)");
+
+    #Test 6: Downgrade from TLSv1.2 to TLSv1.1
+    $proxy->clear();
+    $testtype = DOWNGRADE_TO_TLS_1_1;
+    $proxy->clientflags($client_flags." -max_protocol TLSv1.2");
+    $proxy->serverflags($server_flags." -max_protocol TLSv1.2");
+    $proxy->ciphers($ciphers);
+    $proxy->start();
+    ok(is_illegal_parameter_client_alert(), "Downgrade TLSv1.2 to TLSv1.1");
+
+    #Test 7: A client side protocol "hole" should not be detected as a downgrade
     $proxy->clear();
     $proxy->filter(undef);
-    $proxy->clientflags("-no_tls1_2");
-    $proxy->ciphers("AES128-SHA:\@SECLEVEL=0");
+    $proxy->clientflags($client_flags." -no_tls1_2");
+    $proxy->serverflags($server_flags);
+    $proxy->ciphers($ciphers);
     $proxy->start();
     ok(TLSProxy::Message->success(), "TLSv1.2 client-side protocol hole");
 
-    #Test 6: A server side protocol "hole" should not be detected as a downgrade
+    #Test 8: A server side protocol "hole" should not be detected as a downgrade
     $proxy->clear();
     $proxy->filter(undef);
-    $proxy->serverflags("-no_tls1_2");
+    $proxy->clientflags($client_flags);
+    $proxy->serverflags($server_flags." -no_tls1_2");
+    $proxy->ciphers($ciphers);
     $proxy->start();
     ok(TLSProxy::Message->success(), "TLSv1.2 server-side protocol hole");
 }
 
+# Validate that the exchange fails with an illegal parameter alert from
+#  the client
+sub is_illegal_parameter_client_alert
+{
+    return 0 unless TLSProxy::Message->fail();
+    my $alert = TLSProxy::Message->alert();
+    return 1 if !$alert->server()
+                && $alert->description()
+                   == TLSProxy::Message::AL_DESC_ILLEGAL_PARAMETER;
+    return 0;
+}
+
 sub downgrade_filter
 {
     my $proxy = shift;
 
-    # We're only interested in the initial ClientHello
-    if ($proxy->flight != 0) {
+    # We're only interested in the initial ClientHello and ServerHello
+    if ($proxy->flight > 1) {
         return;
     }
 
-    my $message = ${$proxy->message_list}[0];
-
-    my $ext;
-    if ($testtype == FALLBACK_FROM_TLS_1_3) {
-        #The default ciphersuite we use for TLSv1.2 without any SCSV
-        my @ciphersuites = (TLSProxy::Message::CIPHER_RSA_WITH_AES_128_CBC_SHA);
-        $message->ciphersuite_len(2 * scalar @ciphersuites);
-        $message->ciphersuites(\@ciphersuites);
-    } else {
-        if ($testtype == DOWNGRADE_TO_TLS_1_2) {
-            $ext = pack "C3",
-                0x02, # Length
-                0x03, 0x03; #TLSv1.2
-        } else {
-            $ext = pack "C3",
-                0x02, # Length
-                0x03, 0x02; #TLSv1.1
+    my $message = ${$proxy->message_list}[$proxy->flight];
+
+    # ServerHello
+    if ($proxy->flight == 1 && defined($message)) {
+        # Update the last byte of the downgrade signal
+        if ($testtype == DOWNGRADE_TO_TLS_1_2_WITH_TLS_1_1_SIGNAL) {
+            $message->random(substr($message->random, 0, 31) . "\0");
+            $message->repack();
+        } elsif ($testtype == DOWNGRADE_TO_TLS_1_1_WITH_TLS_1_2_SIGNAL) {
+            $message->random(substr($message->random, 0, 31) . "\1");
+            $message->repack();
         }
 
-        $message->set_extension(TLSProxy::Message::EXT_SUPPORTED_VERSIONS, $ext);
+        return;
     }
 
-    $message->repack();
+    # ClientHello
+    if ($proxy->flight == 0) {
+        my $ext;
+        if ($testtype == FALLBACK_FROM_TLS_1_3) {
+            #The default ciphersuite we use for TLSv1.2 without any SCSV
+            my @ciphersuites = (TLSProxy::Message::CIPHER_RSA_WITH_AES_128_CBC_SHA);
+            $message->ciphersuite_len(2 * scalar @ciphersuites);
+            $message->ciphersuites(\@ciphersuites);
+        }
+        else {
+            if ($testtype == DOWNGRADE_TO_TLS_1_2
+                || $testtype == DOWNGRADE_TO_TLS_1_2_WITH_TLS_1_1_SIGNAL) {
+                $ext = pack "C3",
+                    0x02,       # Length
+                    0x03, 0x03; #TLSv1.2
+            }
+            else {
+                $ext = pack "C3",
+                    0x02,       # Length
+                    0x03, 0x02; #TLSv1.1
+            }
+
+            $message->set_extension(TLSProxy::Message::EXT_SUPPORTED_VERSIONS,
+                                    $ext);
+        }
+
+        $message->repack();
+    }
 }
 
diff --git a/test/recipes/75-test_quicapi.t b/test/recipes/75-test_quicapi.t
index e1ce5eabb291b..7056ad17b0f9f 100644
--- a/test/recipes/75-test_quicapi.t
+++ b/test/recipes/75-test_quicapi.t
@@ -30,7 +30,7 @@ plan tests =>
     + 1;                        # quicapitest with default provider
 
 ok(run(test(["quicapitest", "default",
-             srctop_file("test", "default.cnf"),
+             srctop_file("test", "default-recordpadding.cnf"),
              srctop_dir("test", "certs"),
              srctop_dir("test", "recipes", "75-test_quicapi_data")])),
              "running quicapitest");
diff --git a/test/recipes/75-test_quicapi_data/ssltraceref-zlib.txt b/test/recipes/75-test_quicapi_data/ssltraceref-zlib.txt
index fabea52ef8b18..44b0aef74b310 100644
--- a/test/recipes/75-test_quicapi_data/ssltraceref-zlib.txt
+++ b/test/recipes/75-test_quicapi_data/ssltraceref-zlib.txt
@@ -55,6 +55,9 @@ Header:
           rsa_pss_rsae_sha256 (0x0804)
           rsa_pss_rsae_sha384 (0x0805)
           rsa_pss_rsae_sha512 (0x0806)
+          rsa_pkcs1_sha256 (0x0401)
+          rsa_pkcs1_sha384 (0x0501)
+          rsa_pkcs1_sha512 (0x0601)
         extension_type=supported_versions(43), length=3
           TLS 1.3 (772)
         extension_type=psk_key_exchange_modes(45), length=2
diff --git a/test/recipes/75-test_quicapi_data/ssltraceref.txt b/test/recipes/75-test_quicapi_data/ssltraceref.txt
index 338c628b98cb5..2a625ae506973 100644
--- a/test/recipes/75-test_quicapi_data/ssltraceref.txt
+++ b/test/recipes/75-test_quicapi_data/ssltraceref.txt
@@ -55,6 +55,9 @@ Header:
           rsa_pss_rsae_sha256 (0x0804)
           rsa_pss_rsae_sha384 (0x0805)
           rsa_pss_rsae_sha512 (0x0806)
+          rsa_pkcs1_sha256 (0x0401)
+          rsa_pkcs1_sha384 (0x0501)
+          rsa_pkcs1_sha512 (0x0601)
         extension_type=supported_versions(43), length=3
           TLS 1.3 (772)
         extension_type=psk_key_exchange_modes(45), length=2
diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index 916f952a0c3e1..5fc620a1399e5 100644
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2015-2023 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-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
@@ -21,9 +21,7 @@ setup("test_ca");
 $ENV{OPENSSL} = cmdstr(app(["openssl"]), display => 1);
 
 my $cnf = srctop_file("test","ca-and-certs.cnf");
-my $std_openssl_cnf = '"'
-    . srctop_file("apps", $^O eq "VMS" ? "openssl-vms.cnf" : "openssl.cnf")
-    . '"';
+my $std_openssl_cnf = srctop_file("apps", $^O eq "VMS" ? "openssl-vms.cnf" : "openssl.cnf");
 
 sub src_file {
     return srctop_file("test", "certs", shift);
@@ -40,14 +38,14 @@ require_ok(srctop_file("test", "recipes", "tconversion.pl"));
      $ENV{OPENSSL_CONFIG} = qq(-config "$cnf");
      skip "failed creating CA structure", 4
          if !ok(run(perlapp(["CA.pl","-newca",
-                             "-extra-req", "-key $cakey"], stdin => undef)),
+                             "-extra-req", qq{-key "$cakey"}], stdin => undef)),
                 'creating CA structure');
 
      my $eekey = src_file("ee-key.pem");
      $ENV{OPENSSL_CONFIG} = qq(-config "$cnf");
      skip "failed creating new certificate request", 3
          if !ok(run(perlapp(["CA.pl","-newreq",
-                             '-extra-req', "-outform DER -section userreq -key $eekey"])),
+                             '-extra-req', qq{-outform DER -section userreq -key "$eekey"}])),
                 'creating certificate request');
      $ENV{OPENSSL_CONFIG} = qq(-rand_serial -inform DER -config "$std_openssl_cnf");
      skip "failed to sign certificate request", 2
@@ -62,7 +60,8 @@ require_ok(srctop_file("test", "recipes", "tconversion.pl"));
 
      my $eekey2 = src_file("ee-key-3072.pem");
      $ENV{OPENSSL_CONFIG} = qq(-config "$cnf");
-     ok(run(perlapp(["CA.pl", "-precert", '-extra-req', "-section userreq -key $eekey2"], stderr => undef)),
+     ok(run(perlapp(["CA.pl", "-precert",
+                     '-extra-req', qq{-section userreq -key "$eekey2"}], stderr => undef)),
         'creating new pre-certificate');
 }
 
diff --git a/test/recipes/80-test_cmp_http.t b/test/recipes/80-test_cmp_http.t
index 39f3a54dd292f..63b25259f5856 100644
--- a/test/recipes/80-test_cmp_http.t
+++ b/test/recipes/80-test_cmp_http.t
@@ -330,7 +330,7 @@ sub start_server {
     if ($server_host eq '*' || $server_port == 0) {
         # Find out the actual server host and port and possibly different PID
         my ($host, $port);
-        $pid = 0;
+        my $pid0 = $pid;
         while (<$server_fh>) {
             print "$server_name server output: $_";
             next if m/using section/;
@@ -344,6 +344,11 @@ sub start_server {
             $server_host = "127.0.0.1" if $host eq "0.0.0.0";
         }
         $server_port = $port if $server_port == 0 && defined $port;
+        if ($pid0 != $pid) {
+            # kill the shell process
+            kill('KILL', $pid0);
+            waitpid($pid0, 0);
+        }
     }
     if ($server_host eq '*' || $server_port == 0) {
         stop_server($server_name, $pid) if $pid;
diff --git a/test/recipes/80-test_cmp_http_data/test_commands.csv b/test/recipes/80-test_cmp_http_data/test_commands.csv
index cbb806a9c6c88..c6c54239b1d73 100644
--- a/test/recipes/80-test_cmp_http_data/test_commands.csv
+++ b/test/recipes/80-test_cmp_http_data/test_commands.csv
@@ -132,6 +132,7 @@ expected,description, -section,val, -cmd,val,val2, -cacertsout,val,val2, -infoty
 1,rspin, -section,, -cmd,ir,,BLANK,,,-rspin,_RESULT_DIR/ip.der _RESULT_DIR/pkiConf.der,,BLANK,,BLANK
 0,rspin too few files - server must reject, -section,, -cmd,ir,,BLANK,,,-rspin,_RESULT_DIR/ip.der,,BLANK,,BLANK,-secret,_PBM_SECRET
 0,rspin too few files - no server, -section,, -cmd,ir,,BLANK,,,-rspin,_RESULT_DIR/ip.der,,BLANK,,BLANK, -server,""""
+0,reqout_only ir with -port, -section,, -cmd,ir,,-reqout_only,_RESULT_DIR/ir1.der,,BLANK,,BLANK, -server,"""", -port,0
 1,reqout_only ir - no server, -section,, -cmd,ir,,-reqout_only,_RESULT_DIR/ir2.der,,BLANK,,BLANK, -server,""""
 0,reqout_only non-existing directory and file, -section,, -cmd,ir,,-reqout_only,idontexist/idontexist,,BLANK,,BLANK, -server,""""
 0,reqin ir - no newkey, -section,, -cmd,ir,,-reqin,_RESULT_DIR/ir2.der,,-newkey,"""",-newkey,"""",-key,"""",-cert,"""",-secret,_PBM_SECRET
diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index 361dd34512393..279a498475c8e 100644
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -42,6 +42,7 @@ my @defaultprov = ("-provider-path", $provpath,
 my @config = ( );
 my $provname = 'default';
 my $dsaallow = '1';
+my $no_pqc = 0;
 
 my $datadir = srctop_dir("test", "recipes", "80-test_cms_data");
 my $smdir    = srctop_dir("test", "smime-certs");
@@ -52,7 +53,7 @@ my ($no_des, $no_dh, $no_dsa, $no_ec, $no_ec2m, $no_rc2, $no_zlib)
 
 $no_rc2 = 1 if disabled("legacy");
 
-plan tests => 28;
+plan tests => 31;
 
 ok(run(test(["pkcs7_test"])), "test pkcs7");
 
@@ -62,9 +63,11 @@ unless ($no_fips) {
     $provname = 'fips';
 
     run(test(["fips_version_test", "-config", $provconf, "<3.4.0"]),
-    capture => 1, statusvar => \$dsaallow);
+        capture => 1, statusvar => \$dsaallow);
     $no_dsa = 1 if $dsaallow == '0';
     $old_fips = 1 if $dsaallow != '0';
+    run(test(["fips_version_test", "-config", $provconf, "<3.5.0"]),
+        capture => 1, statusvar => \$no_pqc);
 }
 
 $ENV{OPENSSL_TEST_LIBCTX} = "1";
@@ -86,6 +89,15 @@ my @smime_pkcs7_tests = (
       \&final_compare
     ],
 
+    [ "signed text content DER format, RSA key",
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER", "-nodetach",
+        "-certfile", $smroot, "-signer", $smrsa1, "-text",
+        "-out", "{output}.cms" ],
+      [ "{cmd2}",  @prov, "-verify", "-in", "{output}.cms", "-inform", "DER",
+        "-text", "-CAfile", $smroot, "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
     [ "signed detached content DER format, RSA key",
       [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER",
         "-signer", $smrsa1, "-out", "{output}.cms" ],
@@ -219,6 +231,14 @@ my @smime_pkcs7_tests = (
       \&final_compare
     ],
 
+    [ "enveloped text content streaming S/MIME format, DES, 1 recipient",
+      [ "{cmd1}", @defaultprov, "-encrypt", "-in", $smcont,
+        "-stream", "-text", "-out", "{output}.cms", $smrsa1 ],
+      [ "{cmd2}", @defaultprov, "-decrypt", "-recip", $smrsa1,
+        "-in", "{output}.cms", "-text", "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
     [ "enveloped content test streaming S/MIME format, DES, 3 recipients, 3rd used",
       [ "{cmd1}", @defaultprov, "-encrypt", "-in", $smcont,
         "-stream", "-out", "{output}.cms",
@@ -1278,6 +1298,16 @@ ok(!run(app(['openssl', 'cms', '-verify',
             ])),
    "issue#19643");
 
+# Check that users get error when using incorrect envelope type for AEAD algorithms
+ok(!run(app(['openssl', 'cms', '-decrypt',
+             '-inform', 'PEM', '-stream',
+             '-secretkey', '000102030405060708090A0B0C0D0E0F',
+             '-secretkeyid', 'C0FEE0',
+             '-in', srctop_file("test/cms-msg",
+                                "enveloped-content-type-for-aes-gcm.pem")
+            ])),
+   "Error AES-GCM in enveloped content type");
+
 # Check that kari encryption with originator does not segfault
 with({ exit_checker => sub { return shift == 3; } },
   sub {
@@ -1378,7 +1408,7 @@ subtest "encrypt to three recipients with RSA-OAEP, key only decrypt" => sub {
     is(compare($pt, $ptpt), 0, "compare original message with decrypted ciphertext");
 };
 
-subtest "EdDSA tests for CMS \n" => sub {
+subtest "EdDSA tests for CMS" => sub {
     plan tests => 2;
 
     SKIP: {
@@ -1398,3 +1428,65 @@ subtest "EdDSA tests for CMS \n" => sub {
            "accept CMS verify with Ed25519");
     }
 };
+
+subtest "ML-DSA tests for CMS" => sub {
+    plan tests => 2;
+
+    SKIP: {
+        skip "ML-DSA is not supported in this build", 2
+            if disabled("ml-dsa") || $no_pqc;
+
+        my $sig1 = "sig1.cms";
+
+        # draft-ietf-lamps-cms-ml-dsa: use SHA512 with ML-DSA
+        ok(run(app(["openssl", "cms", @prov, "-sign", "-md", "sha512", "-in", $smcont,
+                    "-certfile", $smroot, "-signer", catfile($smdir, "sm_mldsa44.pem"),
+                    "-out", $sig1])),
+           "accept CMS signature with ML-DSA-44");
+
+        ok(run(app(["openssl", "cms", @prov, "-verify", "-in", $sig1,
+                    "-CAfile", $smroot, "-content", $smcont])),
+           "accept CMS verify with ML-DSA-44");
+    }
+};
+
+subtest "SLH-DSA tests for CMS" => sub {
+    plan tests => 6;
+
+    SKIP: {
+        skip "SLH-DSA is not supported in this build", 6
+            if disabled("slh-dsa") || $no_pqc;
+
+        my $sig1 = "sig1.cms";
+
+        # draft-ietf-lamps-cms-sphincs-plus: use SHA512 with SLH-DSA-SHA2
+        ok(run(app(["openssl", "cms", @prov, "-sign", "-md", "sha512", "-in", $smcont,
+                    "-certfile", $smroot, "-signer", catfile($smdir, "sm_slhdsa_sha2_128s.pem"),
+                    "-out", $sig1])),
+           "accept CMS signature with SLH-DSA-SHA2-128s");
+
+        ok(run(app(["openssl", "cms", @prov, "-verify", "-in", $sig1,
+                    "-CAfile", $smroot, "-content", $smcont])),
+           "accept CMS verify with SLH-DSA-SHA2-128s");
+
+        # draft-ietf-lamps-cms-sphincs-plus: use SHAKE128 with SLH-DSA-SHAKE-128*
+        ok(run(app(["openssl", "cms", @prov, "-sign", "-md", "shake128", "-in", $smcont,
+                    "-certfile", $smroot, "-signer", catfile($smdir, "sm_slhdsa_shake_128s.pem"),
+                    "-out", $sig1])),
+           "accept CMS signature with SLH-DSA-SHAKE-128s");
+
+        ok(run(app(["openssl", "cms", @prov, "-verify", "-in", $sig1,
+                    "-CAfile", $smroot, "-content", $smcont])),
+           "accept CMS verify with SLH-DSA-SHAKE-128s");
+
+        # draft-ietf-lamps-cms-sphincs-plus: use SHAKE256 with SLH-DSA-SHAKE-256*
+        ok(run(app(["openssl", "cms", @prov, "-sign", "-md", "shake256", "-in", $smcont,
+                    "-certfile", $smroot, "-signer", catfile($smdir, "sm_slhdsa_shake_256s.pem"),
+                    "-out", $sig1])),
+           "accept CMS signature with SLH-DSA-SHAKE-256s");
+
+        ok(run(app(["openssl", "cms", @prov, "-verify", "-in", $sig1,
+                    "-CAfile", $smroot, "-content", $smcont])),
+           "accept CMS verify with SLH-DSA-SHAKE-256s");
+    }
+};
diff --git a/test/recipes/80-test_cmsapi.t b/test/recipes/80-test_cmsapi.t
index af00355a9d666..8d9371e005c0a 100644
--- a/test/recipes/80-test_cmsapi.t
+++ b/test/recipes/80-test_cmsapi.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2018-2026 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -18,5 +18,6 @@ plan tests => 1;
 
 ok(run(test(["cmsapitest", srctop_file("test", "certs", "servercert.pem"),
              srctop_file("test", "certs", "serverkey.pem"),
-             srctop_file("test", "recipes", "80-test_cmsapi_data", "encryptedData.der")])),
+             srctop_file("test", "recipes", "80-test_cmsapi_data", "encryptedData.der"),
+             srctop_file("test", "recipes", "80-test_cmsapi_data", "encDataWithTooLongIV.pem")])),
              "running cmsapitest");
diff --git a/test/recipes/80-test_cmsapi_data/encDataWithTooLongIV.pem b/test/recipes/80-test_cmsapi_data/encDataWithTooLongIV.pem
new file mode 100644
index 0000000000000..4323cd2fb0c1c
--- /dev/null
+++ b/test/recipes/80-test_cmsapi_data/encDataWithTooLongIV.pem
@@ -0,0 +1,11 @@
+-----BEGIN CMS-----
+MIIBmgYLKoZIhvcNAQkQARegggGJMIIBhQIBADGCATMwggEvAgEAMBcwEjEQMA4G
+A1UEAwwHUm9vdCBDQQIBAjANBgkqhkiG9w0BAQEFAASCAQC8ZqP1OqbletcUre1V
+b4XOobZzQr6wKMSsdjtGzVbZowUVv5DkOn9VOefrpg4HxMq/oi8IpzVYj8ZiKRMV
+NTJ+/d8FwwBwUUNNP/IDnfEpX+rT1+pGS5zAa7NenLoZgGBNjPy5I2OHP23fPnEd
+sm8YkFjzubkhAD1lod9pEOEqB3V2kTrTTiwzSNtMHggna1zPox6TkdZwFmMnp8d2
+CVa6lIPGx26gFwCuIDSaavmQ2URJ615L8gAvpYUlpsDqjFsabWsbaOFbMz3bIGJu
+GkrX2ezX7CpuC1wjix26ojlTySJHv+L0IrpcaIzLlC5lB1rqtuija8dGm3rBNm/P
+AAUNMDcGCSqGSIb3DQEHATAjBglghkgBZQMEAQYwFgQRzxwoRQzOHVooVn3CpaWl
+paUCARCABUNdolo6BBA55E9hYaYO2S8C/ZnD8dRO
+-----END CMS-----
diff --git a/test/recipes/80-test_pkcs12.t b/test/recipes/80-test_pkcs12.t
index 06fa85af0f3e3..d258b7eb0e476 100644
--- a/test/recipes/80-test_pkcs12.t
+++ b/test/recipes/80-test_pkcs12.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2026 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -56,7 +56,7 @@ $ENV{OPENSSL_WIN32_UTF8}=1;
 
 my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
 
-plan tests => $no_fips ? 47 : 53;
+plan tests => $no_fips ? 53 : 59;
 
 # Test different PKCS#12 formats
 ok(run(test(["pkcs12_format_test"])), "test pkcs12 formats");
@@ -235,8 +235,12 @@ unless ($no_fips) {
     }
 }
 
-# Test pbmac1 pkcs12 bad files, RFC 9579
-for my $file ("pbmac1_256_256.bad-iter.p12", "pbmac1_256_256.bad-salt.p12", "pbmac1_256_256.no-len.p12")
+# Test pbmac1 pkcs12 bad files, RFC 9579 and CVE-2025-11187
+for my $file ("pbmac1_256_256.bad-iter.p12", "pbmac1_256_256.bad-salt.p12",
+              "pbmac1_256_256.no-len.p12", "pbmac1_256_256.bad-len.p12",
+              "pbmac1_256_256.bad-salt-type.p12", "pbmac1_256_256.negative-len.p12",
+              "pbmac1_256_256.no-salt.p12", "pbmac1_256_256.very-big-len.p12",
+              "pbmac1_256_256.zero-len.p12")
 {
     my $path = srctop_file("test", "recipes", "80-test_pkcs12_data", $file);
     with({ exit_checker => sub { return shift == 1; } },
diff --git a/test/recipes/80-test_pkcs12_data/pbmac1_256_256.bad-len.p12 b/test/recipes/80-test_pkcs12_data/pbmac1_256_256.bad-len.p12
new file mode 100644
index 0000000000000..a1acf2fc21b1c
Binary files /dev/null and b/test/recipes/80-test_pkcs12_data/pbmac1_256_256.bad-len.p12 differ
diff --git a/test/recipes/80-test_pkcs12_data/pbmac1_256_256.bad-salt-type.p12 b/test/recipes/80-test_pkcs12_data/pbmac1_256_256.bad-salt-type.p12
new file mode 100644
index 0000000000000..7f4e1e89ca5c2
Binary files /dev/null and b/test/recipes/80-test_pkcs12_data/pbmac1_256_256.bad-salt-type.p12 differ
diff --git a/test/recipes/80-test_pkcs12_data/pbmac1_256_256.negative-len.p12 b/test/recipes/80-test_pkcs12_data/pbmac1_256_256.negative-len.p12
new file mode 100644
index 0000000000000..9a4fd459227c5
Binary files /dev/null and b/test/recipes/80-test_pkcs12_data/pbmac1_256_256.negative-len.p12 differ
diff --git a/test/recipes/80-test_pkcs12_data/pbmac1_256_256.no-salt.p12 b/test/recipes/80-test_pkcs12_data/pbmac1_256_256.no-salt.p12
new file mode 100644
index 0000000000000..c43b4be04307a
Binary files /dev/null and b/test/recipes/80-test_pkcs12_data/pbmac1_256_256.no-salt.p12 differ
diff --git a/test/recipes/80-test_pkcs12_data/pbmac1_256_256.very-big-len.p12 b/test/recipes/80-test_pkcs12_data/pbmac1_256_256.very-big-len.p12
new file mode 100644
index 0000000000000..6920b89a6c7f1
Binary files /dev/null and b/test/recipes/80-test_pkcs12_data/pbmac1_256_256.very-big-len.p12 differ
diff --git a/test/recipes/80-test_pkcs12_data/pbmac1_256_256.zero-len.p12 b/test/recipes/80-test_pkcs12_data/pbmac1_256_256.zero-len.p12
new file mode 100644
index 0000000000000..0e63eb6077fd9
Binary files /dev/null and b/test/recipes/80-test_pkcs12_data/pbmac1_256_256.zero-len.p12 differ
diff --git a/test/recipes/90-test_includes.t b/test/recipes/90-test_includes.t
index 5ff61910c570e..412bdf6115da7 100644
--- a/test/recipes/90-test_includes.t
+++ b/test/recipes/90-test_includes.t
@@ -35,6 +35,9 @@ ok(run(test(["conf_include_test",  "-f", data_file("incdir.cnf")])), "test inclu
 SKIP: {
     skip "Skipping legacy test", 1
         if disabled("legacy");
+    # Ensure libcrypto can be resolved for the legacy provider on AIX.
+    local $ENV{LIBPATH} = abs_path(bldtop_dir("."))
+        if config('target') =~ m|^aix|;
     ok(run(test(["conf_include_test", "-providers", data_file("includes-prov-dir.cnf")])),
        "test directory includes with provider configs");
 }
diff --git a/test/recipes/90-test_sslapi.t b/test/recipes/90-test_sslapi.t
index 650e0d1ffb161..70c2c24d8661f 100644
--- a/test/recipes/90-test_sslapi.t
+++ b/test/recipes/90-test_sslapi.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-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
@@ -45,7 +45,10 @@ ok(run(test(["sslapitest", srctop_dir("test", "certs"),
              srctop_file("test",
                          "recipes",
                          "90-test_sslapi_data",
-                         "dhparams.pem")])),
+                         "dhparams.pem"),
+             srctop_dir("test",
+                        "recipes",
+                        "90-test_sslapi_data")])),
              "running sslapitest");
 
 SKIP: {
@@ -62,7 +65,10 @@ SKIP: {
                  srctop_file("test",
                              "recipes",
                              "90-test_sslapi_data",
-                             "dhparams.pem")])),
+                             "dhparams.pem"),
+                 srctop_dir("test",
+                            "recipes",
+                            "90-test_sslapi_data")])),
                  "running sslapitest with default fips config");
 
     run(test(["fips_version_test", "-config", $provconf, ">=3.1.0"]),
@@ -140,7 +146,10 @@ SKIP: {
                     srctop_file("test",
                                 "recipes",
                                 "90-test_sslapi_data",
-                                "dhparams.pem")])),
+                                "dhparams.pem"),
+                    srctop_dir("test",
+                               "recipes",
+                               "90-test_sslapi_data")])),
        "running sslapitest with modified fips config");
 }
 
diff --git a/test/recipes/90-test_sslapi_data/ssltraceref-zlib.txt b/test/recipes/90-test_sslapi_data/ssltraceref-zlib.txt
new file mode 100644
index 0000000000000..05aed8299b0e8
--- /dev/null
+++ b/test/recipes/90-test_sslapi_data/ssltraceref-zlib.txt
@@ -0,0 +1,255 @@
+Sent TLS Record
+Header:
+  Version = TLS 1.0 (0x301)
+  Content Type = Handshake (22)
+  Length = ?
+    ClientHello, Length=?
+      client_version=0x303 (TLS 1.2)
+      Random:
+        gmt_unix_time=0x?
+        random_bytes (len=28): ?
+      session_id (len=?
+      cipher_suites (len=2)
+        {0x13, 0x01} TLS_AES_128_GCM_SHA256
+      compression_methods (len=1)
+        No Compression (0x00)
+      extensions, length = ?
+        extension_type=ec_point_formats(11), length=4
+          uncompressed (0)
+          ansiX962_compressed_prime (1)
+          ansiX962_compressed_char2 (2)
+        extension_type=supported_groups(10), length=20
+          MLKEM512 (512)
+          MLKEM768 (513)
+          MLKEM1024 (514)
+          X25519MLKEM768 (4588)
+          SecP256r1MLKEM768 (4587)
+          SecP384r1MLKEM1024 (4589)
+          secp521r1 (P-521) (25)
+          secp384r1 (P-384) (24)
+          secp256r1 (P-256) (23)
+        extension_type=session_ticket(35), length=0
+        extension_type=encrypt_then_mac(22), length=0
+        extension_type=extended_master_secret(23), length=0
+        extension_type=signature_algorithms(13), length=?
+          mldsa65 (0x0905)
+          mldsa87 (0x0906)
+          mldsa44 (0x0904)
+          ecdsa_secp256r1_sha256 (0x0403)
+          ecdsa_secp384r1_sha384 (0x0503)
+          ecdsa_secp521r1_sha512 (0x0603)
+          ed25519 (0x0807)
+          ed448 (0x0808)
+          ecdsa_brainpoolP256r1tls13_sha256 (0x081a)
+          ecdsa_brainpoolP384r1tls13_sha384 (0x081b)
+          ecdsa_brainpoolP512r1tls13_sha512 (0x081c)
+          rsa_pss_pss_sha256 (0x0809)
+          rsa_pss_pss_sha384 (0x080a)
+          rsa_pss_pss_sha512 (0x080b)
+          rsa_pss_rsae_sha256 (0x0804)
+          rsa_pss_rsae_sha384 (0x0805)
+          rsa_pss_rsae_sha512 (0x0806)
+          rsa_pkcs1_sha256 (0x0401)
+          rsa_pkcs1_sha384 (0x0501)
+          rsa_pkcs1_sha512 (0x0601)
+        extension_type=supported_versions(43), length=3
+          TLS 1.3 (772)
+        extension_type=psk_key_exchange_modes(45), length=2
+          psk_dhe_ke (1)
+        extension_type=key_share(51), length=806
+            NamedGroup: MLKEM512 (512)
+            key_exchange:  (len=800): ?
+        extension_type=compress_certificate(27), length=3
+          zlib (1)
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = Handshake (22)
+  Length = 858
+    ServerHello, Length=854
+      server_version=0x303 (TLS 1.2)
+      Random:
+        gmt_unix_time=0x?
+        random_bytes (len=28): ?
+      session_id (len=?
+      cipher_suite {0x13, 0x01} TLS_AES_128_GCM_SHA256
+      compression_method: No Compression (0x00)
+      extensions, length = ?
+        extension_type=supported_versions(43), length=2
+            TLS 1.3 (772)
+        extension_type=key_share(51), length=772
+            NamedGroup: MLKEM512 (512)
+            key_exchange:  (len=768): ?
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ChangeCipherSpec (20)
+  Length = 1
+    change_cipher_spec (1)
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 23
+  Inner Content Type = Handshake (22)
+    EncryptedExtensions, Length=2
+      No extensions
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 839
+  Inner Content Type = Handshake (22)
+    Certificate, Length=818
+      context (len=0): 
+      certificate_list, length=814
+        ASN.1Cert, length=809
+------details-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN = Root CA
+        Validity
+            Not Before: Jan 14 22:29:46 2016 GMT
+            Not After : Jan 15 22:29:46 2116 GMT
+        Subject: CN = server.example
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:d5:5d:60:6a:df:fc:61:ee:48:aa:8c:11:48:43:
+                    a5:6d:b6:52:5d:aa:98:49:b1:61:92:35:b1:fc:3a:
+                    04:25:0c:6d:79:ff:b4:d5:c9:e9:5c:1c:3b:e0:ab:
+                    b3:b8:7d:a3:de:6d:bd:e0:dd:d7:5a:bf:14:47:11:
+                    42:5e:a6:82:d0:61:c1:7f:dd:13:46:e6:09:85:07:
+                    0e:f2:d4:fc:1a:64:d2:0a:ad:20:ab:20:6b:96:f0:
+                    ad:cc:c4:19:53:55:dc:01:1d:a4:b3:ef:8a:b4:49:
+                    53:5d:8a:05:1c:f1:dc:e1:44:bf:c5:d7:e2:77:19:
+                    57:5c:97:0b:75:ee:88:43:71:0f:ca:6c:c1:b4:b2:
+                    50:a7:77:46:6c:58:0f:11:bf:f1:76:24:5a:ae:39:
+                    42:b7:51:67:29:e1:d0:55:30:6f:17:e4:91:ea:ad:
+                    f8:28:c2:43:6f:a2:64:a9:fb:9d:98:92:62:48:3e:
+                    eb:0d:4f:82:4a:8a:ff:3f:72:ee:96:b5:ae:a1:c1:
+                    98:ba:ef:7d:90:75:6d:ff:5a:52:9e:ab:f5:c0:7e:
+                    d0:87:43:db:85:07:07:0f:7d:38:7a:fd:d1:d3:ee:
+                    65:1d:d3:ea:39:6a:87:37:ee:4a:d3:e0:0d:6e:f5:
+                    70:ac:c2:bd:f1:6e:f3:92:95:5e:a9:f0:a1:65:95:
+                    93:8d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                C0:E7:84:BF:E8:59:27:33:10:B0:52:4F:51:52:2F:06:D6:C0:7A:CD
+            X509v3 Authority Key Identifier: 
+                70:7F:2E:AE:83:68:59:98:04:23:2A:CD:EB:3E:17:CD:24:DD:01:49
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            X509v3 Extended Key Usage: 
+                TLS Web Server Authentication
+            X509v3 Subject Alternative Name: 
+                DNS:server.example
+    Signature Algorithm: sha256WithRSAEncryption
+    Signature Value:
+        7b:d3:04:43:75:8a:0f:11:ae:c4:fb:d7:a1:a2:9e:fe:20:18:
+        d5:f4:2f:31:88:46:b6:75:8c:ee:e5:9b:97:a6:b9:a3:cd:60:
+        9a:46:c3:48:97:e5:97:68:f7:5a:86:35:73:d9:69:9e:f9:5f:
+        74:b9:e6:94:13:01:cb:6a:dc:e3:c4:04:e9:65:da:9c:a4:8b:
+        28:f3:f9:9a:7f:bf:97:1f:45:92:e5:05:b1:56:e6:0b:f6:47:
+        de:1e:89:b6:2b:e1:4d:df:4a:7e:01:d3:23:dc:97:8c:47:fe:
+        5f:c7:cc:98:46:0e:c4:83:5b:ca:8a:f1:52:09:be:6b:ec:3f:
+        09:8b:d0:93:02:bf:e1:51:e7:d1:7e:34:56:19:74:d0:ff:28:
+        25:de:b7:9f:56:52:91:7d:20:29:85:0a:80:44:5f:71:32:25:
+        71:0f:c2:16:e2:5f:6b:1d:3f:32:5b:0a:3c:74:1c:b9:62:f1:
+        ed:07:50:a3:6d:b4:b4:31:0a:c0:53:44:6a:3a:88:84:8b:2d:
+        a9:b0:37:8e:e6:18:36:bd:9a:20:40:0f:01:92:8b:3d:aa:61:
+        e7:ae:2c:ed:36:cd:3a:07:86:74:3a:29:b3:d7:3a:b4:00:a9:
+        c2:f5:92:78:0e:e2:0f:a3:fe:bb:be:e0:06:53:84:59:1d:90:
+        69:e5:b6:f9
+-----BEGIN CERTIFICATE-----
+MIIDJTCCAg2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdSb290
+IENBMCAXDTE2MDExNDIyMjk0NloYDzIxMTYwMTE1MjIyOTQ2WjAZMRcwFQYDVQQD
+DA5zZXJ2ZXIuZXhhbXBsZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANVdYGrf/GHuSKqMEUhDpW22Ul2qmEmxYZI1sfw6BCUMbXn/tNXJ6VwcO+Crs7h9
+o95tveDd11q/FEcRQl6mgtBhwX/dE0bmCYUHDvLU/Bpk0gqtIKsga5bwrczEGVNV
+3AEdpLPvirRJU12KBRzx3OFEv8XX4ncZV1yXC3XuiENxD8pswbSyUKd3RmxYDxG/
+8XYkWq45QrdRZynh0FUwbxfkkeqt+CjCQ2+iZKn7nZiSYkg+6w1PgkqK/z9y7pa1
+rqHBmLrvfZB1bf9aUp6r9cB+0IdD24UHBw99OHr90dPuZR3T6jlqhzfuStPgDW71
+cKzCvfFu85KVXqnwoWWVk40CAwEAAaN9MHswHQYDVR0OBBYEFMDnhL/oWSczELBS
+T1FSLwbWwHrNMB8GA1UdIwQYMBaAFHB/Lq6DaFmYBCMqzes+F80k3QFJMAkGA1Ud
+EwQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwGQYDVR0RBBIwEIIOc2VydmVyLmV4
+YW1wbGUwDQYJKoZIhvcNAQELBQADggEBAHvTBEN1ig8RrsT716Ginv4gGNX0LzGI
+RrZ1jO7lm5emuaPNYJpGw0iX5Zdo91qGNXPZaZ75X3S55pQTActq3OPEBOll2pyk
+iyjz+Zp/v5cfRZLlBbFW5gv2R94eibYr4U3fSn4B0yPcl4xH/l/HzJhGDsSDW8qK
+8VIJvmvsPwmL0JMCv+FR59F+NFYZdND/KCXet59WUpF9ICmFCoBEX3EyJXEPwhbi
+X2sdPzJbCjx0HLli8e0HUKNttLQxCsBTRGo6iISLLamwN47mGDa9miBADwGSiz2q
+YeeuLO02zToHhnQ6KbPXOrQAqcL1kngO4g+j/ru+4AZThFkdkGnltvk=
+-----END CERTIFICATE-----
+------------------
+        No extensions
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 281
+  Inner Content Type = Handshake (22)
+    CertificateVerify, Length=260
+      Signature Algorithm: rsa_pss_rsae_sha256 (0x0804)
+      Signature (len=256): ?
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 53
+  Inner Content Type = Handshake (22)
+    Finished, Length=32
+      verify_data (len=32): ?
+
+Sent TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ChangeCipherSpec (20)
+  Length = 1
+    change_cipher_spec (1)
+
+Sent TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 53
+  Inner Content Type = Handshake (22)
+    Finished, Length=32
+      verify_data (len=32): ?
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 234
+  Inner Content Type = Handshake (22)
+    NewSessionTicket, Length=213
+        ticket_lifetime_hint=7200
+        ticket_age_add=?
+        ticket_nonce (len=8): ?
+        ticket (len=192): ?
+        No extensions
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 234
+  Inner Content Type = Handshake (22)
+    NewSessionTicket, Length=213
+        ticket_lifetime_hint=7200
+        ticket_age_add=?
+        ticket_nonce (len=8): ?
+        ticket (len=192): ?
+        No extensions
+
diff --git a/test/recipes/90-test_sslapi_data/ssltraceref.txt b/test/recipes/90-test_sslapi_data/ssltraceref.txt
new file mode 100644
index 0000000000000..5d332da235fb0
--- /dev/null
+++ b/test/recipes/90-test_sslapi_data/ssltraceref.txt
@@ -0,0 +1,253 @@
+Sent TLS Record
+Header:
+  Version = TLS 1.0 (0x301)
+  Content Type = Handshake (22)
+  Length = ?
+    ClientHello, Length=?
+      client_version=0x303 (TLS 1.2)
+      Random:
+        gmt_unix_time=0x?
+        random_bytes (len=28): ?
+      session_id (len=?
+      cipher_suites (len=2)
+        {0x13, 0x01} TLS_AES_128_GCM_SHA256
+      compression_methods (len=1)
+        No Compression (0x00)
+      extensions, length = ?
+        extension_type=ec_point_formats(11), length=4
+          uncompressed (0)
+          ansiX962_compressed_prime (1)
+          ansiX962_compressed_char2 (2)
+        extension_type=supported_groups(10), length=20
+          MLKEM512 (512)
+          MLKEM768 (513)
+          MLKEM1024 (514)
+          X25519MLKEM768 (4588)
+          SecP256r1MLKEM768 (4587)
+          SecP384r1MLKEM1024 (4589)
+          secp521r1 (P-521) (25)
+          secp384r1 (P-384) (24)
+          secp256r1 (P-256) (23)
+        extension_type=session_ticket(35), length=0
+        extension_type=encrypt_then_mac(22), length=0
+        extension_type=extended_master_secret(23), length=0
+        extension_type=signature_algorithms(13), length=?
+          mldsa65 (0x0905)
+          mldsa87 (0x0906)
+          mldsa44 (0x0904)
+          ecdsa_secp256r1_sha256 (0x0403)
+          ecdsa_secp384r1_sha384 (0x0503)
+          ecdsa_secp521r1_sha512 (0x0603)
+          ed25519 (0x0807)
+          ed448 (0x0808)
+          ecdsa_brainpoolP256r1tls13_sha256 (0x081a)
+          ecdsa_brainpoolP384r1tls13_sha384 (0x081b)
+          ecdsa_brainpoolP512r1tls13_sha512 (0x081c)
+          rsa_pss_pss_sha256 (0x0809)
+          rsa_pss_pss_sha384 (0x080a)
+          rsa_pss_pss_sha512 (0x080b)
+          rsa_pss_rsae_sha256 (0x0804)
+          rsa_pss_rsae_sha384 (0x0805)
+          rsa_pss_rsae_sha512 (0x0806)
+          rsa_pkcs1_sha256 (0x0401)
+          rsa_pkcs1_sha384 (0x0501)
+          rsa_pkcs1_sha512 (0x0601)
+        extension_type=supported_versions(43), length=3
+          TLS 1.3 (772)
+        extension_type=psk_key_exchange_modes(45), length=2
+          psk_dhe_ke (1)
+        extension_type=key_share(51), length=806
+            NamedGroup: MLKEM512 (512)
+            key_exchange:  (len=800): ?
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = Handshake (22)
+  Length = 858
+    ServerHello, Length=854
+      server_version=0x303 (TLS 1.2)
+      Random:
+        gmt_unix_time=0x?
+        random_bytes (len=28): ?
+      session_id (len=?
+      cipher_suite {0x13, 0x01} TLS_AES_128_GCM_SHA256
+      compression_method: No Compression (0x00)
+      extensions, length = ?
+        extension_type=supported_versions(43), length=2
+            TLS 1.3 (772)
+        extension_type=key_share(51), length=772
+            NamedGroup: MLKEM512 (512)
+            key_exchange:  (len=768): ?
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ChangeCipherSpec (20)
+  Length = 1
+    change_cipher_spec (1)
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 23
+  Inner Content Type = Handshake (22)
+    EncryptedExtensions, Length=2
+      No extensions
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 839
+  Inner Content Type = Handshake (22)
+    Certificate, Length=818
+      context (len=0): 
+      certificate_list, length=814
+        ASN.1Cert, length=809
+------details-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN = Root CA
+        Validity
+            Not Before: Jan 14 22:29:46 2016 GMT
+            Not After : Jan 15 22:29:46 2116 GMT
+        Subject: CN = server.example
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:d5:5d:60:6a:df:fc:61:ee:48:aa:8c:11:48:43:
+                    a5:6d:b6:52:5d:aa:98:49:b1:61:92:35:b1:fc:3a:
+                    04:25:0c:6d:79:ff:b4:d5:c9:e9:5c:1c:3b:e0:ab:
+                    b3:b8:7d:a3:de:6d:bd:e0:dd:d7:5a:bf:14:47:11:
+                    42:5e:a6:82:d0:61:c1:7f:dd:13:46:e6:09:85:07:
+                    0e:f2:d4:fc:1a:64:d2:0a:ad:20:ab:20:6b:96:f0:
+                    ad:cc:c4:19:53:55:dc:01:1d:a4:b3:ef:8a:b4:49:
+                    53:5d:8a:05:1c:f1:dc:e1:44:bf:c5:d7:e2:77:19:
+                    57:5c:97:0b:75:ee:88:43:71:0f:ca:6c:c1:b4:b2:
+                    50:a7:77:46:6c:58:0f:11:bf:f1:76:24:5a:ae:39:
+                    42:b7:51:67:29:e1:d0:55:30:6f:17:e4:91:ea:ad:
+                    f8:28:c2:43:6f:a2:64:a9:fb:9d:98:92:62:48:3e:
+                    eb:0d:4f:82:4a:8a:ff:3f:72:ee:96:b5:ae:a1:c1:
+                    98:ba:ef:7d:90:75:6d:ff:5a:52:9e:ab:f5:c0:7e:
+                    d0:87:43:db:85:07:07:0f:7d:38:7a:fd:d1:d3:ee:
+                    65:1d:d3:ea:39:6a:87:37:ee:4a:d3:e0:0d:6e:f5:
+                    70:ac:c2:bd:f1:6e:f3:92:95:5e:a9:f0:a1:65:95:
+                    93:8d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                C0:E7:84:BF:E8:59:27:33:10:B0:52:4F:51:52:2F:06:D6:C0:7A:CD
+            X509v3 Authority Key Identifier: 
+                70:7F:2E:AE:83:68:59:98:04:23:2A:CD:EB:3E:17:CD:24:DD:01:49
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            X509v3 Extended Key Usage: 
+                TLS Web Server Authentication
+            X509v3 Subject Alternative Name: 
+                DNS:server.example
+    Signature Algorithm: sha256WithRSAEncryption
+    Signature Value:
+        7b:d3:04:43:75:8a:0f:11:ae:c4:fb:d7:a1:a2:9e:fe:20:18:
+        d5:f4:2f:31:88:46:b6:75:8c:ee:e5:9b:97:a6:b9:a3:cd:60:
+        9a:46:c3:48:97:e5:97:68:f7:5a:86:35:73:d9:69:9e:f9:5f:
+        74:b9:e6:94:13:01:cb:6a:dc:e3:c4:04:e9:65:da:9c:a4:8b:
+        28:f3:f9:9a:7f:bf:97:1f:45:92:e5:05:b1:56:e6:0b:f6:47:
+        de:1e:89:b6:2b:e1:4d:df:4a:7e:01:d3:23:dc:97:8c:47:fe:
+        5f:c7:cc:98:46:0e:c4:83:5b:ca:8a:f1:52:09:be:6b:ec:3f:
+        09:8b:d0:93:02:bf:e1:51:e7:d1:7e:34:56:19:74:d0:ff:28:
+        25:de:b7:9f:56:52:91:7d:20:29:85:0a:80:44:5f:71:32:25:
+        71:0f:c2:16:e2:5f:6b:1d:3f:32:5b:0a:3c:74:1c:b9:62:f1:
+        ed:07:50:a3:6d:b4:b4:31:0a:c0:53:44:6a:3a:88:84:8b:2d:
+        a9:b0:37:8e:e6:18:36:bd:9a:20:40:0f:01:92:8b:3d:aa:61:
+        e7:ae:2c:ed:36:cd:3a:07:86:74:3a:29:b3:d7:3a:b4:00:a9:
+        c2:f5:92:78:0e:e2:0f:a3:fe:bb:be:e0:06:53:84:59:1d:90:
+        69:e5:b6:f9
+-----BEGIN CERTIFICATE-----
+MIIDJTCCAg2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdSb290
+IENBMCAXDTE2MDExNDIyMjk0NloYDzIxMTYwMTE1MjIyOTQ2WjAZMRcwFQYDVQQD
+DA5zZXJ2ZXIuZXhhbXBsZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANVdYGrf/GHuSKqMEUhDpW22Ul2qmEmxYZI1sfw6BCUMbXn/tNXJ6VwcO+Crs7h9
+o95tveDd11q/FEcRQl6mgtBhwX/dE0bmCYUHDvLU/Bpk0gqtIKsga5bwrczEGVNV
+3AEdpLPvirRJU12KBRzx3OFEv8XX4ncZV1yXC3XuiENxD8pswbSyUKd3RmxYDxG/
+8XYkWq45QrdRZynh0FUwbxfkkeqt+CjCQ2+iZKn7nZiSYkg+6w1PgkqK/z9y7pa1
+rqHBmLrvfZB1bf9aUp6r9cB+0IdD24UHBw99OHr90dPuZR3T6jlqhzfuStPgDW71
+cKzCvfFu85KVXqnwoWWVk40CAwEAAaN9MHswHQYDVR0OBBYEFMDnhL/oWSczELBS
+T1FSLwbWwHrNMB8GA1UdIwQYMBaAFHB/Lq6DaFmYBCMqzes+F80k3QFJMAkGA1Ud
+EwQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwGQYDVR0RBBIwEIIOc2VydmVyLmV4
+YW1wbGUwDQYJKoZIhvcNAQELBQADggEBAHvTBEN1ig8RrsT716Ginv4gGNX0LzGI
+RrZ1jO7lm5emuaPNYJpGw0iX5Zdo91qGNXPZaZ75X3S55pQTActq3OPEBOll2pyk
+iyjz+Zp/v5cfRZLlBbFW5gv2R94eibYr4U3fSn4B0yPcl4xH/l/HzJhGDsSDW8qK
+8VIJvmvsPwmL0JMCv+FR59F+NFYZdND/KCXet59WUpF9ICmFCoBEX3EyJXEPwhbi
+X2sdPzJbCjx0HLli8e0HUKNttLQxCsBTRGo6iISLLamwN47mGDa9miBADwGSiz2q
+YeeuLO02zToHhnQ6KbPXOrQAqcL1kngO4g+j/ru+4AZThFkdkGnltvk=
+-----END CERTIFICATE-----
+------------------
+        No extensions
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 281
+  Inner Content Type = Handshake (22)
+    CertificateVerify, Length=260
+      Signature Algorithm: rsa_pss_rsae_sha256 (0x0804)
+      Signature (len=256): ?
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 53
+  Inner Content Type = Handshake (22)
+    Finished, Length=32
+      verify_data (len=32): ?
+
+Sent TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ChangeCipherSpec (20)
+  Length = 1
+    change_cipher_spec (1)
+
+Sent TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 53
+  Inner Content Type = Handshake (22)
+    Finished, Length=32
+      verify_data (len=32): ?
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 234
+  Inner Content Type = Handshake (22)
+    NewSessionTicket, Length=213
+        ticket_lifetime_hint=7200
+        ticket_age_add=?
+        ticket_nonce (len=8): ?
+        ticket (len=192): ?
+        No extensions
+
+Received TLS Record
+Header:
+  Version = TLS 1.2 (0x303)
+  Content Type = ApplicationData (23)
+  Length = 234
+  Inner Content Type = Handshake (22)
+    NewSessionTicket, Length=213
+        ticket_lifetime_hint=7200
+        ticket_age_add=?
+        ticket_nonce (len=8): ?
+        ticket (len=192): ?
+        No extensions
+
diff --git a/test/recipes/90-test_store_cases.t b/test/recipes/90-test_store_cases.t
index 05b00e6b4eb13..5915a1b76a537 100644
--- a/test/recipes/90-test_store_cases.t
+++ b/test/recipes/90-test_store_cases.t
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
+# 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
@@ -18,9 +18,10 @@ use OpenSSL::Test::Utils;
 my $test_name = "test_store_cases";
 setup($test_name);
 
-plan tests => 2;
+plan tests => 3;
 
 my $stderr;
+my @stdout;
 
 # The case of the garbage PKCS#12 DER file where a passphrase was
 # prompted for.  That should not have happened.
@@ -34,3 +35,24 @@ open DATA, $stderr;
 close DATA;
 ok(scalar @match > 0 ? 0 : 1,
    "checking that storeutl didn't ask for a passphrase");
+
+ SKIP: {
+     skip "The objects in test-BER.p12 contain EC keys, which is disabled in this build", 1
+         if disabled("ec");
+     skip "test-BER.p12 has contents encrypted with DES-EDE3-CBC, which is disabled in this build", 1
+         if disabled("des");
+
+     # The case with a BER-encoded PKCS#12 file, using infinite + EOC
+     # constructs.  There was a bug with those in OpenSSL 3.0 and newer,
+     # where OSSL_STORE_load() (and by consequence, 'openssl storeutl')
+     # only extracted the first available object from that file and
+     # ignored the rest.
+     # Our test file has a total of four objects, and this should be
+     # reflected in the total that 'openssl storeutl' outputs
+     @stdout = run(app(['openssl', 'storeutl', '-passin', 'pass:12345',
+                        data_file('test-BER.p12')]),
+                   capture => 1);
+     @stdout = map { my $x = $_; $x =~ s/\R$//; $x } @stdout; # Better chomp
+     ok((grep { $_ eq 'Total found: 4' } @stdout),
+        "Checking that 'openssl storeutl' with test-BER.p12 returns 4 objects");
+}
diff --git a/test/recipes/90-test_store_cases_data/test-BER.p12 b/test/recipes/90-test_store_cases_data/test-BER.p12
new file mode 100644
index 0000000000000..256e697bac1a0
Binary files /dev/null and b/test/recipes/90-test_store_cases_data/test-BER.p12 differ
diff --git a/test/recipes/90-test_threads_data/store/.gitignore b/test/recipes/90-test_threads_data/store/.gitignore
new file mode 100644
index 0000000000000..9127784286534
--- /dev/null
+++ b/test/recipes/90-test_threads_data/store/.gitignore
@@ -0,0 +1,3 @@
+#The top level .gitignore ignores certificate files with the .0 extension
+#But we actually want them in this directory, so we override the top level rule
+!*.0
diff --git a/test/recipes/90-test_threads_data/store/8489a545.0 b/test/recipes/90-test_threads_data/store/8489a545.0
new file mode 100644
index 0000000000000..7fd65dfe924b8
--- /dev/null
+++ b/test/recipes/90-test_threads_data/store/8489a545.0
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDFjCCAf6gAwIBAgIBATANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdSb290
+IENBMCAXDTIwMTIxMjIwMTEzN1oYDzIxMjAxMjEzMjAxMTM3WjASMRAwDgYDVQQD
+DAdSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4eYA9Qa8
+oEY4eQ8/HnEZE20C3yubdmv8rLAh7daRCEI7pWM17FJboKJKxdYAlAOXWj25ZyjS
+feMhXKTtxjyNjoTRnVTDPdl0opZ2Z3H5xhpQd7P9eO5b4OOMiSPCmiLsPtQ3ngfN
+wCtVERc6NEIcaQ06GLDtFZRexv2eh8Yc55QaksBfBcFzQ+UD3gmRySTO2I6Lfi7g
+MUjRhipqVSZ66As2Tpex4KTJ2lxpSwOACFaDox+yKrjBTP7FsU3UwAGq7b7OJb3u
+aa32B81uK6GJVPVo65gJ7clgZsszYkoDsGjWDqtfwTVVfv1G7rrr3Laio+2Ff3ff
+tWgiQ35mJCOvxQIDAQABo3UwczAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB
+BjAdBgNVHQ4EFgQUjvUlrx6ba4Q9fICayVOcTXL3o1IwHwYDVR0jBBgwFoAUjvUl
+rx6ba4Q9fICayVOcTXL3o1IwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcN
+AQELBQADggEBABWUjaqtkdRDhVAJZTxkJVgohjRrBwp86Y0JZWdCDua/sErmEaGu
+nQVxWWFWIgu6sb8tyQo3/7dBIQl3Rpij9bsgKhToO1OzoG3Oi3d0+zRDHfY6xNrj
+TUE00FeLHGNWsgZSIvu99DrGApT/+uPdWfJgMu5szillqW+4hcCUPLjG9ekVNt1s
+KhdEklo6PrP6eMbm6s22EIVUxqGE6xxAmrvyhlY1zJH9BJ23Ps+xabjG6OeMRZzT
+0F/fU7XIFieSO7rqUcjgo1eYc3ghsDxNUJ6TPBgv5z4SPnstoOBj59rjpJ7Qkpyd
+L17VfEadezat37Cpeha7vGDduCsyMfN4kiw=
+-----END CERTIFICATE-----
diff --git a/test/recipes/95-test_external_oqsprovider_data/oqsprovider-ca.sh b/test/recipes/95-test_external_oqsprovider_data/oqsprovider-ca.sh
new file mode 100755
index 0000000000000..716172f029d34
--- /dev/null
+++ b/test/recipes/95-test_external_oqsprovider_data/oqsprovider-ca.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# Test openssl CA functionality using oqsprovider for alg $1
+
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <algorithmname>. Exiting."
+    exit 1
+fi
+
+if [ -z "$OPENSSL_APP" ]; then
+    echo "OPENSSL_APP env var not set. Exiting."
+    exit 1
+fi
+
+if [ -z "$OPENSSL_MODULES" ]; then
+    echo "Warning: OPENSSL_MODULES env var not set."
+fi
+
+if [ -z "$OPENSSL_CONF" ]; then
+    echo "Warning: OPENSSL_CONF env var not set."
+fi
+
+# Set OSX DYLD_LIBRARY_PATH if not already externally set
+if [ -z "$DYLD_LIBRARY_PATH" ]; then
+    export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
+fi
+
+echo "oqsprovider-ca.sh commencing..."
+
+#rm -rf tmp
+mkdir -p tmp && cd tmp
+rm -rf demoCA && mkdir -p demoCA/newcerts
+touch demoCA/index.txt
+echo '01' > demoCA/serial
+$OPENSSL_APP req -x509 -new -newkey $1 -keyout $1_rootCA.key -out $1_rootCA.crt -subj "/CN=test CA" -nodes
+
+if [ $? -ne 0 ]; then
+   echo "Failed to generate root CA. Exiting."
+   exit 1
+fi
+
+$OPENSSL_APP req -new -newkey $1 -keyout $1.key -out $1.csr -nodes -subj "/CN=test Server"
+
+if [ $? -ne 0 ]; then
+   echo "Failed to generate test server CSR. Exiting."
+   exit 1
+fi
+
+$OPENSSL_APP ca -batch -days 100 -keyfile $1_rootCA.key -cert $1_rootCA.crt -policy policy_anything -notext -out $1.crt -infiles $1.csr
+
+if [ $? -ne 0 ]; then
+   echo "Failed to generate server CRT. Exiting."
+   exit 1
+fi
+
+# Don't forget to use provider(s) when not activated via config file
+$OPENSSL_APP verify -CAfile $1_rootCA.crt $1.crt
+
diff --git a/test/recipes/95-test_external_oqsprovider_data/oqsprovider.sh b/test/recipes/95-test_external_oqsprovider_data/oqsprovider.sh
index a03c3722fc432..18e0391d520fa 100755
--- a/test/recipes/95-test_external_oqsprovider_data/oqsprovider.sh
+++ b/test/recipes/95-test_external_oqsprovider_data/oqsprovider.sh
@@ -70,5 +70,7 @@ export OPENSSL_APP="$O_EXE/openssl"
 export OPENSSL_MODULES=$PWD/_build/lib
 export OQS_PROVIDER_TESTSCRIPTS=$SRCTOP/oqs-provider/scripts
 export OPENSSL_CONF=$OQS_PROVIDER_TESTSCRIPTS/openssl-ca.cnf
+# hotfix for wrong cert validity period
+cp $SRCTOP/test/recipes/95-test_external_oqsprovider_data/oqsprovider-ca.sh $SRCTOP/oqs-provider/scripts/
 # Be verbose if harness is verbose:
 $SRCTOP/oqs-provider/scripts/runtests.sh -V
diff --git a/test/recipes/95-test_external_pkcs11_provider_data/pkcs11-provider.sh b/test/recipes/95-test_external_pkcs11_provider_data/pkcs11-provider.sh
index 0a0eabb8b3388..9fb245e244477 100755
--- a/test/recipes/95-test_external_pkcs11_provider_data/pkcs11-provider.sh
+++ b/test/recipes/95-test_external_pkcs11_provider_data/pkcs11-provider.sh
@@ -58,7 +58,7 @@ echo "Running tests"
 echo "------------------------------------------------------------------"
 
 # The OpenSSL app uses ${HARNESS_OSSL_PREFIX} as a prefix for its standard output
-HARNESS_OSSL_PREFIX= meson test -C $PKCS11_PROVIDER_BUILDDIR
+SUPPORT_ML_DSA=0 HARNESS_OSSL_PREFIX= meson test -C $PKCS11_PROVIDER_BUILDDIR --suite=kryoptic
 
 if [ $? -ne 0 ]; then
     cat $PKCS11_PROVIDER_BUILDDIR/meson-logs/testlog.txt
diff --git a/test/recipes/95-test_external_tlsfuzzer_data/cert.json.in b/test/recipes/95-test_external_tlsfuzzer_data/cert.json.in
index 38e46e4bb929a..a14e10e8f20ea 100644
--- a/test/recipes/95-test_external_tlsfuzzer_data/cert.json.in
+++ b/test/recipes/95-test_external_tlsfuzzer_data/cert.json.in
@@ -12,12 +12,12 @@
        {"name" : "test-tls13-certificate-verify.py",
         "arguments" : ["-k", "tests/clientX509Key.pem",
                        "-c", "tests/clientX509Cert.pem",
-                       "-s", "9+5 9+6 9+4 ecdsa_secp256r1_sha256 ecdsa_secp384r1_sha384 ecdsa_secp521r1_sha512 ed25519 ed448 8+26 8+27 8+28 rsa_pss_pss_sha256 rsa_pss_pss_sha384 rsa_pss_pss_sha512 rsa_pss_rsae_sha256 rsa_pss_rsae_sha384 rsa_pss_rsae_sha512 rsa_pkcs1_sha256 rsa_pkcs1_sha384 rsa_pkcs1_sha512 ecdsa_sha224 rsa_pkcs1_sha224",
+                       "-s", "9+5 9+6 9+4 ecdsa_secp256r1_sha256 ecdsa_secp384r1_sha384 ecdsa_secp521r1_sha512 ed25519 ed448 8+26 8+27 8+28 rsa_pss_pss_sha256 rsa_pss_pss_sha384 rsa_pss_pss_sha512 rsa_pss_rsae_sha256 rsa_pss_rsae_sha384 rsa_pss_rsae_sha512 rsa_pkcs1_sha256 rsa_pkcs1_sha384 rsa_pkcs1_sha512",
                        "-p", "@PORT@"]},
        {"name" : "test-tls13-ecdsa-in-certificate-verify.py",
           "arguments" : ["-k", "tests/serverECKey.pem",
                          "-c", "tests/serverECCert.pem",
-                         "-s", "9+5 9+6 9+4 ecdsa_secp256r1_sha256 ecdsa_secp384r1_sha384 ecdsa_secp521r1_sha512 ed25519 ed448 8+26 8+27 8+28 rsa_pss_pss_sha256 rsa_pss_pss_sha384 rsa_pss_pss_sha512 rsa_pss_rsae_sha256 rsa_pss_rsae_sha384 rsa_pss_rsae_sha512 rsa_pkcs1_sha256 rsa_pkcs1_sha384 rsa_pkcs1_sha512 ecdsa_sha224 rsa_pkcs1_sha224",
+                         "-s", "9+5 9+6 9+4 ecdsa_secp256r1_sha256 ecdsa_secp384r1_sha384 ecdsa_secp521r1_sha512 ed25519 ed448 8+26 8+27 8+28 rsa_pss_pss_sha256 rsa_pss_pss_sha384 rsa_pss_pss_sha512 rsa_pss_rsae_sha256 rsa_pss_rsae_sha384 rsa_pss_rsae_sha512 rsa_pkcs1_sha256 rsa_pkcs1_sha384 rsa_pkcs1_sha512",
                          "-p", "@PORT@"]}
      ]
     },
diff --git a/test/recordlentest.c b/test/recordlentest.c
index c7fb27408f46d..c38ca3903f12b 100644
--- a/test/recordlentest.c
+++ b/test/recordlentest.c
@@ -15,12 +15,12 @@
 static char *cert = NULL;
 static char *privkey = NULL;
 
-#define TEST_PLAINTEXT_OVERFLOW_OK      0
-#define TEST_PLAINTEXT_OVERFLOW_NOT_OK  1
-#define TEST_ENCRYPTED_OVERFLOW_TLS1_3_OK       2
-#define TEST_ENCRYPTED_OVERFLOW_TLS1_3_NOT_OK   3
-#define TEST_ENCRYPTED_OVERFLOW_TLS1_2_OK       4
-#define TEST_ENCRYPTED_OVERFLOW_TLS1_2_NOT_OK   5
+#define TEST_PLAINTEXT_OVERFLOW_OK 0
+#define TEST_PLAINTEXT_OVERFLOW_NOT_OK 1
+#define TEST_ENCRYPTED_OVERFLOW_TLS1_3_OK 2
+#define TEST_ENCRYPTED_OVERFLOW_TLS1_3_NOT_OK 3
+#define TEST_ENCRYPTED_OVERFLOW_TLS1_2_OK 4
+#define TEST_ENCRYPTED_OVERFLOW_TLS1_2_NOT_OK 5
 
 #define TOTAL_RECORD_OVERFLOW_TESTS 6
 
@@ -39,7 +39,7 @@ static int write_record(BIO *b, size_t len, uint8_t rectype, int recversion)
     header[4] = len & 0xff;
 
     if (!BIO_write_ex(b, header, SSL3_RT_HEADER_LENGTH, &written)
-            || written != SSL3_RT_HEADER_LENGTH)
+        || written != SSL3_RT_HEADER_LENGTH)
         return 0;
 
     while (len > 0) {
@@ -51,7 +51,7 @@ static int write_record(BIO *b, size_t len, uint8_t rectype, int recversion)
             outlen = len;
 
         if (!BIO_write_ex(b, buf, outlen, &written)
-                || written != outlen)
+            || written != outlen)
             return 0;
 
         len -= outlen;
@@ -71,7 +71,7 @@ static int fail_due_to_record_overflow(int enc)
         reason = SSL_R_DATA_LENGTH_TOO_LONG;
 
     if (ERR_GET_LIB(err) == ERR_LIB_SSL
-            && ERR_GET_REASON(err) == reason)
+        && ERR_GET_REASON(err) == reason)
         return 1;
 
     return 0;
@@ -91,49 +91,49 @@ static int test_record_overflow(int idx)
 
 #ifdef OPENSSL_NO_TLS1_2
     if (idx == TEST_ENCRYPTED_OVERFLOW_TLS1_2_OK
-            || idx == TEST_ENCRYPTED_OVERFLOW_TLS1_2_NOT_OK)
+        || idx == TEST_ENCRYPTED_OVERFLOW_TLS1_2_NOT_OK)
         return 1;
 #endif
 #if defined(OPENSSL_NO_TLS1_3) \
     || (defined(OPENSSL_NO_EC) && defined(OPENSSL_NO_DH))
     if (idx == TEST_ENCRYPTED_OVERFLOW_TLS1_3_OK
-            || idx == TEST_ENCRYPTED_OVERFLOW_TLS1_3_NOT_OK)
+        || idx == TEST_ENCRYPTED_OVERFLOW_TLS1_3_NOT_OK)
         return 1;
 #endif
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (idx == TEST_ENCRYPTED_OVERFLOW_TLS1_2_OK
-            || idx == TEST_ENCRYPTED_OVERFLOW_TLS1_2_NOT_OK) {
+        || idx == TEST_ENCRYPTED_OVERFLOW_TLS1_2_NOT_OK) {
         len = SSL3_RT_MAX_ENCRYPTED_LENGTH;
 #ifndef OPENSSL_NO_COMP
         len -= SSL3_RT_MAX_COMPRESSED_OVERHEAD;
 #endif
         SSL_CTX_set_max_proto_version(sctx, TLS1_2_VERSION);
     } else if (idx == TEST_ENCRYPTED_OVERFLOW_TLS1_3_OK
-               || idx == TEST_ENCRYPTED_OVERFLOW_TLS1_3_NOT_OK) {
+        || idx == TEST_ENCRYPTED_OVERFLOW_TLS1_3_NOT_OK) {
         len = SSL3_RT_MAX_TLS13_ENCRYPTED_LENGTH;
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     serverbio = SSL_get_rbio(serverssl);
 
     if (idx == TEST_PLAINTEXT_OVERFLOW_OK
-            || idx == TEST_PLAINTEXT_OVERFLOW_NOT_OK) {
+        || idx == TEST_PLAINTEXT_OVERFLOW_NOT_OK) {
         len = SSL3_RT_MAX_PLAIN_LENGTH;
 
         if (idx == TEST_PLAINTEXT_OVERFLOW_NOT_OK)
             len++;
 
         if (!TEST_true(write_record(serverbio, len,
-                                    SSL3_RT_HANDSHAKE, TLS1_VERSION)))
+                SSL3_RT_HANDSHAKE, TLS1_VERSION)))
             goto end;
 
         if (!TEST_int_le(SSL_accept(serverssl), 0))
@@ -147,11 +147,11 @@ static int test_record_overflow(int idx)
     }
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                         SSL_ERROR_NONE)))
+            SSL_ERROR_NONE)))
         goto end;
 
     if (idx == TEST_ENCRYPTED_OVERFLOW_TLS1_2_NOT_OK
-            || idx == TEST_ENCRYPTED_OVERFLOW_TLS1_3_NOT_OK) {
+        || idx == TEST_ENCRYPTED_OVERFLOW_TLS1_3_NOT_OK) {
         overf_expected = 1;
         len++;
     } else {
@@ -161,7 +161,7 @@ static int test_record_overflow(int idx)
     recversion = TLS1_2_VERSION;
 
     if (!TEST_true(write_record(serverbio, len, SSL3_RT_APPLICATION_DATA,
-                                recversion)))
+            recversion)))
         goto end;
 
     if (!TEST_false(SSL_read_ex(serverssl, &buf, sizeof(buf), &written)))
@@ -170,10 +170,10 @@ static int test_record_overflow(int idx)
     if (!TEST_int_eq(fail_due_to_record_overflow(1), overf_expected))
         goto end;
 
- success:
+success:
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -191,7 +191,7 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(cert = test_get_argument(0))
-            || !TEST_ptr(privkey = test_get_argument(1)))
+        || !TEST_ptr(privkey = test_get_argument(1)))
         return 0;
 
     ADD_ALL_TESTS(test_record_overflow, TOTAL_RECORD_OVERFLOW_TESTS);
diff --git a/test/rpktest.c b/test/rpktest.c
index 038a7246c7ba8..338c33f80cb5b 100644
--- a/test/rpktest.c
+++ b/test/rpktest.c
@@ -19,7 +19,7 @@
  * If we don't have ec or dh then there are no built-in groups that are usable
  * with TLSv1.3
  */
-# define OSSL_NO_USABLE_TLS1_3
+#define OSSL_NO_USABLE_TLS1_3
 #endif
 
 static char *certsdir = NULL;
@@ -96,8 +96,8 @@ static int rpk_verify_server_cb(int ok, X509_STORE_CTX *ctx)
  */
 static int test_rpk(int idx)
 {
-# define RPK_TESTS 18
-# define RPK_DIMS (2 * 4 * 2 * 2 * 2 * 2)
+#define RPK_TESTS 18
+#define RPK_DIMS (2 * 4 * 2 * 2 * 2 * 2)
     SSL_CTX *cctx = NULL, *sctx = NULL;
     SSL *clientssl = NULL, *serverssl = NULL;
     EVP_PKEY *pkey = NULL, *other_pkey = NULL, *root_pkey = NULL;
@@ -146,37 +146,37 @@ static int test_rpk(int idx)
         goto end;
 
     switch (idx_cert) {
-        case 0:
-            /* use RSA */
-            cert_file = cert;
-            privkey_file = privkey;
-            other_cert_file = cert2;
-            break;
+    case 0:
+        /* use RSA */
+        cert_file = cert;
+        privkey_file = privkey;
+        other_cert_file = cert2;
+        break;
 #ifndef OPENSSL_NO_ECDSA
-        case 1:
-            /* use ECDSA */
-            cert_file = cert2;
-            privkey_file = privkey2;
-            other_cert_file = cert;
-            break;
-# ifndef OPENSSL_NO_ECX
-        case 2:
-            /* use Ed448 */
-            cert_file = cert448;
-            privkey_file = privkey448;
-            other_cert_file = cert;
-            break;
-        case 3:
-            /* use Ed25519 */
-            cert_file = cert25519;
-            privkey_file = privkey25519;
-            other_cert_file = cert;
-            break;
-# endif
+    case 1:
+        /* use ECDSA */
+        cert_file = cert2;
+        privkey_file = privkey2;
+        other_cert_file = cert;
+        break;
+#ifndef OPENSSL_NO_ECX
+    case 2:
+        /* use Ed448 */
+        cert_file = cert448;
+        privkey_file = privkey448;
+        other_cert_file = cert;
+        break;
+    case 3:
+        /* use Ed25519 */
+        cert_file = cert25519;
+        privkey_file = privkey25519;
+        other_cert_file = cert;
+        break;
 #endif
-        default:
-            testresult = TEST_skip("EDCSA disabled");
-            goto end;
+#endif
+    default:
+        testresult = TEST_skip("EDCSA disabled");
+        goto end;
     }
     /* Load primary cert */
     x509 = load_cert_pem(cert_file, NULL);
@@ -225,9 +225,9 @@ static int test_rpk(int idx)
             goto end;
     }
     if (!TEST_true(create_ssl_ctx_pair(test_libctx,
-                                       TLS_server_method(), TLS_client_method(),
-                                       tls_version, tls_version,
-                                       &sctx, &cctx, NULL, NULL)))
+            TLS_server_method(), TLS_client_method(),
+            tls_version, tls_version,
+            &sctx, &cctx, NULL, NULL)))
         goto end;
 
     if (idx_server_server_rpk)
@@ -256,7 +256,7 @@ static int test_rpk(int idx)
     SSL_CTX_set_verify(cctx, SSL_VERIFY_PEER, rpk_verify_client_cb);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (!TEST_int_gt(SSL_dane_enable(serverssl, NULL), 0))
@@ -546,12 +546,12 @@ static int test_rpk(int idx)
         EVP_PKEY *server_pkey = NULL;
 
         if (!TEST_ptr((client_sess = SSL_get1_session(clientssl)))
-                || !TEST_ptr((client_pkey = SSL_SESSION_get0_peer_rpk(client_sess))))
+            || !TEST_ptr((client_pkey = SSL_SESSION_get0_peer_rpk(client_sess))))
             goto end;
         if (client_auth) {
             if (!TEST_ptr((server_sess = SSL_get1_session(serverssl)))
                 || !TEST_ptr((server_pkey = SSL_SESSION_get0_peer_rpk(server_sess))))
-            goto end;
+                goto end;
         }
         SSL_shutdown(clientssl);
         SSL_shutdown(serverssl);
@@ -560,8 +560,8 @@ static int test_rpk(int idx)
         serverssl = clientssl = NULL;
 
         if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                          NULL, NULL))
-                || !TEST_true(SSL_set_session(clientssl, client_sess)))
+                NULL, NULL))
+            || !TEST_true(SSL_set_session(clientssl, client_sess)))
             goto end;
 
         /* Set private key (and maybe certificate) */
@@ -649,7 +649,7 @@ static int test_rpk(int idx)
 
     testresult = 1;
 
- end:
+end:
     OSSL_PROVIDER_unload(defctxnull);
     defctxnull = NULL;
     SSL_SESSION_free(client_sess);
@@ -664,9 +664,9 @@ static int test_rpk(int idx)
 
     if (testresult == 0) {
         TEST_info("idx_ss_rpk=%d, idx_sc_rpk=%d, idx_cs_rpk=%d, idx_cc_rpk=%d, idx_cert=%d, idx_prot=%d, idx=%d",
-                  idx_server_server_rpk, idx_server_client_rpk,
-                  idx_client_server_rpk, idx_client_client_rpk,
-                  idx_cert, idx_prot, idx);
+            idx_server_server_rpk, idx_server_client_rpk,
+            idx_client_server_rpk, idx_client_client_rpk,
+            idx_cert, idx_prot, idx);
     }
     return testresult;
 }
@@ -676,21 +676,21 @@ static int test_rpk_api(void)
     int ret = 0;
     SSL_CTX *cctx = NULL, *sctx = NULL;
     unsigned char cert_type_dups[] = { TLSEXT_cert_type_rpk,
-                                       TLSEXT_cert_type_x509,
-                                       TLSEXT_cert_type_x509 };
+        TLSEXT_cert_type_x509,
+        TLSEXT_cert_type_x509 };
     unsigned char cert_type_bad[] = { 0xFF };
     unsigned char cert_type_extra[] = { TLSEXT_cert_type_rpk,
-                                        TLSEXT_cert_type_x509,
-                                        0xFF };
+        TLSEXT_cert_type_x509,
+        0xFF };
     unsigned char cert_type_unsup[] = { TLSEXT_cert_type_pgp,
-                                        TLSEXT_cert_type_1609dot2 };
+        TLSEXT_cert_type_1609dot2 };
     unsigned char cert_type_just_x509[] = { TLSEXT_cert_type_x509 };
     unsigned char cert_type_just_rpk[] = { TLSEXT_cert_type_rpk };
 
     if (!TEST_true(create_ssl_ctx_pair(NULL,
-                                       TLS_server_method(), TLS_client_method(),
-                                       TLS1_2_VERSION, TLS1_2_VERSION,
-                                       &sctx, &cctx, NULL, NULL)))
+            TLS_server_method(), TLS_client_method(),
+            TLS1_2_VERSION, TLS1_2_VERSION,
+            &sctx, &cctx, NULL, NULL)))
         goto end;
 
     if (!TEST_false(SSL_CTX_set1_server_cert_type(sctx, cert_type_dups, sizeof(cert_type_dups))))
@@ -712,7 +712,7 @@ static int test_rpk_api(void)
         goto end;
 
     ret = 1;
- end:
+end:
     SSL_CTX_free(sctx);
     SSL_CTX_free(cctx);
     return ret;
@@ -773,7 +773,7 @@ int setup_tests(void)
     ADD_ALL_TESTS(test_rpk, RPK_TESTS * RPK_DIMS);
     return 1;
 
- err:
+err:
     return 0;
 }
 
@@ -789,4 +789,4 @@ void cleanup_tests(void)
     OPENSSL_free(cert25519);
     OPENSSL_free(privkey25519);
     OSSL_LIB_CTX_free(libctx);
- }
+}
diff --git a/test/rsa_complex.c b/test/rsa_complex.c
index 7c77980f54353..3e930f38492a8 100644
--- a/test/rsa_complex.c
+++ b/test/rsa_complex.c
@@ -16,12 +16,12 @@
  */
 
 #if !defined(__DJGPP__)
-# if defined(__STDC_VERSION__)
-#  if __STDC_VERSION__ >= 199901L
-#   include <complex.h>
-#  endif
-# endif
-# include <openssl/rsa.h>
+#if defined(__STDC_VERSION__)
+#if __STDC_VERSION__ >= 199901L
+#include <complex.h>
+#endif
+#endif
+#include <openssl/rsa.h>
 #endif
 #include <stdlib.h>
 
diff --git a/test/rsa_mp_test.c b/test/rsa_mp_test.c
index cc9e282b14090..81fa7d23ccd45 100644
--- a/test/rsa_mp_test.c
+++ b/test/rsa_mp_test.c
@@ -34,114 +34,105 @@
 DEFINE_STACK_OF(BIGNUM)
 
 /* C90 requires string should <= 509 bytes */
-static const unsigned char n[] =
-    "\x92\x60\xd0\x75\x0a\xe1\x17\xee\xe5\x5c\x3f\x3d\xea\xba\x74\x91"
-    "\x75\x21\xa2\x62\xee\x76\x00\x7c\xdf\x8a\x56\x75\x5a\xd7\x3a\x15"
-    "\x98\xa1\x40\x84\x10\xa0\x14\x34\xc3\xf5\xbc\x54\xa8\x8b\x57\xfa"
-    "\x19\xfc\x43\x28\xda\xea\x07\x50\xa4\xc4\x4e\x88\xcf\xf3\xb2\x38"
-    "\x26\x21\xb8\x0f\x67\x04\x64\x43\x3e\x43\x36\xe6\xd0\x03\xe8\xcd"
-    "\x65\xbf\xf2\x11\xda\x14\x4b\x88\x29\x1c\x22\x59\xa0\x0a\x72\xb7"
-    "\x11\xc1\x16\xef\x76\x86\xe8\xfe\xe3\x4e\x4d\x93\x3c\x86\x81\x87"
-    "\xbd\xc2\x6f\x7b\xe0\x71\x49\x3c\x86\xf7\xa5\x94\x1c\x35\x10\x80"
-    "\x6a\xd6\x7b\x0f\x94\xd8\x8f\x5c\xf5\xc0\x2a\x09\x28\x21\xd8\x62"
-    "\x6e\x89\x32\xb6\x5c\x5b\xd8\xc9\x20\x49\xc2\x10\x93\x2b\x7a\xfa"
-    "\x7a\xc5\x9c\x0e\x88\x6a\xe5\xc1\xed\xb0\x0d\x8c\xe2\xc5\x76\x33"
-    "\xdb\x26\xbd\x66\x39\xbf\xf7\x3c\xee\x82\xbe\x92\x75\xc4\x02\xb4"
-    "\xcf\x2a\x43\x88\xda\x8c\xf8\xc6\x4e\xef\xe1\xc5\xa0\xf5\xab\x80"
-    "\x57\xc3\x9f\xa5\xc0\x58\x9c\x3e\x25\x3f\x09\x60\x33\x23\x00\xf9"
-    "\x4b\xea\x44\x87\x7b\x58\x8e\x1e\xdb\xde\x97\xcf\x23\x60\x72\x7a"
-    "\x09\xb7\x75\x26\x2d\x7e\xe5\x52\xb3\x31\x9b\x92\x66\xf0\x5a\x25";
+static const unsigned char n[] = "\x92\x60\xd0\x75\x0a\xe1\x17\xee\xe5\x5c\x3f\x3d\xea\xba\x74\x91"
+                                 "\x75\x21\xa2\x62\xee\x76\x00\x7c\xdf\x8a\x56\x75\x5a\xd7\x3a\x15"
+                                 "\x98\xa1\x40\x84\x10\xa0\x14\x34\xc3\xf5\xbc\x54\xa8\x8b\x57\xfa"
+                                 "\x19\xfc\x43\x28\xda\xea\x07\x50\xa4\xc4\x4e\x88\xcf\xf3\xb2\x38"
+                                 "\x26\x21\xb8\x0f\x67\x04\x64\x43\x3e\x43\x36\xe6\xd0\x03\xe8\xcd"
+                                 "\x65\xbf\xf2\x11\xda\x14\x4b\x88\x29\x1c\x22\x59\xa0\x0a\x72\xb7"
+                                 "\x11\xc1\x16\xef\x76\x86\xe8\xfe\xe3\x4e\x4d\x93\x3c\x86\x81\x87"
+                                 "\xbd\xc2\x6f\x7b\xe0\x71\x49\x3c\x86\xf7\xa5\x94\x1c\x35\x10\x80"
+                                 "\x6a\xd6\x7b\x0f\x94\xd8\x8f\x5c\xf5\xc0\x2a\x09\x28\x21\xd8\x62"
+                                 "\x6e\x89\x32\xb6\x5c\x5b\xd8\xc9\x20\x49\xc2\x10\x93\x2b\x7a\xfa"
+                                 "\x7a\xc5\x9c\x0e\x88\x6a\xe5\xc1\xed\xb0\x0d\x8c\xe2\xc5\x76\x33"
+                                 "\xdb\x26\xbd\x66\x39\xbf\xf7\x3c\xee\x82\xbe\x92\x75\xc4\x02\xb4"
+                                 "\xcf\x2a\x43\x88\xda\x8c\xf8\xc6\x4e\xef\xe1\xc5\xa0\xf5\xab\x80"
+                                 "\x57\xc3\x9f\xa5\xc0\x58\x9c\x3e\x25\x3f\x09\x60\x33\x23\x00\xf9"
+                                 "\x4b\xea\x44\x87\x7b\x58\x8e\x1e\xdb\xde\x97\xcf\x23\x60\x72\x7a"
+                                 "\x09\xb7\x75\x26\x2d\x7e\xe5\x52\xb3\x31\x9b\x92\x66\xf0\x5a\x25";
 
 static const unsigned char e[] = "\x01\x00\x01";
 
-static const unsigned char d[] =
-    "\x6a\x7d\xf2\xca\x63\xea\xd4\xdd\xa1\x91\xd6\x14\xb6\xb3\x85\xe0"
-    "\xd9\x05\x6a\x3d\x6d\x5c\xfe\x07\xdb\x1d\xaa\xbe\xe0\x22\xdb\x08"
-    "\x21\x2d\x97\x61\x3d\x33\x28\xe0\x26\x7c\x9d\xd2\x3d\x78\x7a\xbd"
-    "\xe2\xaf\xcb\x30\x6a\xeb\x7d\xfc\xe6\x92\x46\xcc\x73\xf5\xc8\x7f"
-    "\xdf\x06\x03\x01\x79\xa2\x11\x4b\x76\x7d\xb1\xf0\x83\xff\x84\x1c"
-    "\x02\x5d\x7d\xc0\x0c\xd8\x24\x35\xb9\xa9\x0f\x69\x53\x69\xe9\x4d"
-    "\xf2\x3d\x2c\xe4\x58\xbc\x3b\x32\x83\xad\x8b\xba\x2b\x8f\xa1\xba"
-    "\x62\xe2\xdc\xe9\xac\xcf\xf3\x79\x9a\xae\x7c\x84\x00\x16\xf3\xba"
-    "\x8e\x00\x48\xc0\xb6\xcc\x43\x39\xaf\x71\x61\x00\x3a\x5b\xeb\x86"
-    "\x4a\x01\x64\xb2\xc1\xc9\x23\x7b\x64\xbc\x87\x55\x69\x94\x35\x1b"
-    "\x27\x50\x6c\x33\xd4\xbc\xdf\xce\x0f\x9c\x49\x1a\x7d\x6b\x06\x28"
-    "\xc7\xc8\x52\xbe\x4f\x0a\x9c\x31\x32\xb2\xed\x3a\x2c\x88\x81\xe9"
-    "\xaa\xb0\x7e\x20\xe1\x7d\xeb\x07\x46\x91\xbe\x67\x77\x76\xa7\x8b"
-    "\x5c\x50\x2e\x05\xd9\xbd\xde\x72\x12\x6b\x37\x38\x69\x5e\x2d\xd1"
-    "\xa0\xa9\x8a\x14\x24\x7c\x65\xd8\xa7\xee\x79\x43\x2a\x09\x2c\xb0"
-    "\x72\x1a\x12\xdf\x79\x8e\x44\xf7\xcf\xce\x0c\x49\x81\x47\xa9\xb1";
-
-static const unsigned char p[] =
-    "\x06\x77\xcd\xd5\x46\x9b\xc1\xd5\x58\x00\x81\xe2\xf3\x0a\x36\xb1"
-    "\x6e\x29\x89\xd5\x2f\x31\x5f\x92\x22\x3b\x9b\x75\x30\x82\xfa\xc5"
-    "\xf5\xde\x8a\x36\xdb\xc6\xe5\x8f\xef\x14\x37\xd6\x00\xf9\xab\x90"
-    "\x9b\x5d\x57\x4c\xf5\x1f\x77\xc4\xbb\x8b\xdd\x9b\x67\x11\x45\xb2"
-    "\x64\xe8\xac\xa8\x03\x0f\x16\x0d\x5d\x2d\x53\x07\x23\xfb\x62\x0d"
-    "\xe6\x16\xd3\x23\xe8\xb3";
-
-static const unsigned char q[] =
-    "\x06\x66\x9a\x70\x53\xd6\x72\x74\xfd\xea\x45\xc3\xc0\x17\xae\xde"
-    "\x79\x17\xae\x79\xde\xfc\x0e\xf7\xa4\x3a\x8c\x43\x8f\xc7\x8a\xa2"
-    "\x2c\x51\xc4\xd0\x72\x89\x73\x5c\x61\xbe\xfd\x54\x3f\x92\x65\xde"
-    "\x4d\x65\x71\x70\xf6\xf2\xe5\x98\xb9\x0f\xd1\x0b\xe6\x95\x09\x4a"
-    "\x7a\xdf\xf3\x10\x16\xd0\x60\xfc\xa5\x10\x34\x97\x37\x6f\x0a\xd5"
-    "\x5d\x8f\xd4\xc3\xa0\x5b";
-
-static const unsigned char dmp1[] =
-    "\x05\x7c\x9e\x1c\xbd\x90\x25\xe7\x40\x86\xf5\xa8\x3b\x7a\x3f\x99"
-    "\x56\x95\x60\x3a\x7b\x95\x4b\xb8\xa0\xd7\xa5\xf1\xcc\xdc\x5f\xb5"
-    "\x8c\xf4\x62\x95\x54\xed\x2e\x12\x62\xc2\xe8\xf6\xde\xce\xed\x8e"
-    "\x77\x6d\xc0\x40\x25\x74\xb3\x5a\x2d\xaa\xe1\xac\x11\xcb\xe2\x2f"
-    "\x0a\x51\x23\x1e\x47\xb2\x05\x88\x02\xb2\x0f\x4b\xf0\x67\x30\xf0"
-    "\x0f\x6e\xef\x5f\xf7\xe7";
-
-static const unsigned char dmq1[] =
-    "\x01\xa5\x6b\xbc\xcd\xe3\x0e\x46\xc6\x72\xf5\x04\x56\x28\x01\x22"
-    "\x58\x74\x5d\xbc\x1c\x3c\x29\x41\x49\x6c\x81\x5c\x72\xe2\xf7\xe5"
-    "\xa3\x8e\x58\x16\xe0\x0e\x37\xac\x1f\xbb\x75\xfd\xaf\xe7\xdf\xe9"
-    "\x1f\x70\xa2\x8f\x52\x03\xc0\x46\xd9\xf9\x96\x63\x00\x27\x7e\x5f"
-    "\x38\x60\xd6\x6b\x61\xe2\xaf\xbe\xea\x58\xd3\x9d\xbc\x75\x03\x8d"
-    "\x42\x65\xd6\x6b\x85\x97";
-
-static const unsigned char iqmp[] =
-    "\x03\xa1\x8b\x80\xe4\xd8\x87\x25\x17\x5d\xcc\x8d\xa9\x8a\x22\x2b"
-    "\x6c\x15\x34\x6f\x80\xcc\x1c\x44\x04\x68\xbc\x03\xcd\x95\xbb\x69"
-    "\x37\x61\x48\xb4\x23\x13\x08\x16\x54\x6a\xa1\x7c\xf5\xd4\x3a\xe1"
-    "\x4f\xa4\x0c\xf5\xaf\x80\x85\x27\x06\x0d\x70\xc0\xc5\x19\x28\xfe"
-    "\xee\x8e\x86\x21\x98\x8a\x37\xb7\xe5\x30\x25\x70\x93\x51\x2d\x49"
-    "\x85\x56\xb3\x0c\x2b\x96";
-
-static const unsigned char ex_prime[] =
-    "\x03\x89\x22\xa0\xb7\x3a\x91\xcb\x5e\x0c\xfd\x73\xde\xa7\x38\xa9"
-    "\x47\x43\xd6\x02\xbf\x2a\xb9\x3c\x48\xf3\x06\xd6\x58\x35\x50\x56"
-    "\x16\x5c\x34\x9b\x61\x87\xc8\xaa\x0a\x5d\x8a\x0a\xcd\x9c\x41\xd9"
-    "\x96\x24\xe0\xa9\x9b\x26\xb7\xa8\x08\xc9\xea\xdc\xa7\x15\xfb\x62"
-    "\xa0\x2d\x90\xe6\xa7\x55\x6e\xc6\x6c\xff\xd6\x10\x6d\xfa\x2e\x04"
-    "\x50\xec\x5c\x66\xe4\x05";
-
-static const unsigned char ex_exponent[] =
-    "\x02\x0a\xcd\xc3\x82\xd2\x03\xb0\x31\xac\xd3\x20\x80\x34\x9a\x57"
-    "\xbc\x60\x04\x57\x25\xd0\x29\x9a\x16\x90\xb9\x1c\x49\x6a\xd1\xf2"
-    "\x47\x8c\x0e\x9e\xc9\x20\xc2\xd8\xe4\x8f\xce\xd2\x1a\x9c\xec\xb4"
-    "\x1f\x33\x41\xc8\xf5\x62\xd1\xa5\xef\x1d\xa1\xd8\xbd\x71\xc6\xf7"
-    "\xda\x89\x37\x2e\xe2\xec\x47\xc5\xb8\xe3\xb4\xe3\x5c\x82\xaa\xdd"
-    "\xb7\x58\x2e\xaf\x07\x79";
-
-static const unsigned char ex_coefficient[] =
-    "\x00\x9c\x09\x88\x9b\xc8\x57\x08\x69\x69\xab\x2d\x9e\x29\x1c\x3c"
-    "\x6d\x59\x33\x12\x0d\x2b\x09\x2e\xaf\x01\x2c\x27\x01\xfc\xbd\x26"
-    "\x13\xf9\x2d\x09\x22\x4e\x49\x11\x03\x82\x88\x87\xf4\x43\x1d\xac"
-    "\xca\xec\x86\xf7\x23\xf1\x64\xf3\xf5\x81\xf0\x37\x36\xcf\x67\xff"
-    "\x1a\xff\x7a\xc7\xf9\xf9\x67\x2d\xa0\x9d\x61\xf8\xf6\x47\x5c\x2f"
-    "\xe7\x66\xe8\x3c\x3a\xe8";
+static const unsigned char d[] = "\x6a\x7d\xf2\xca\x63\xea\xd4\xdd\xa1\x91\xd6\x14\xb6\xb3\x85\xe0"
+                                 "\xd9\x05\x6a\x3d\x6d\x5c\xfe\x07\xdb\x1d\xaa\xbe\xe0\x22\xdb\x08"
+                                 "\x21\x2d\x97\x61\x3d\x33\x28\xe0\x26\x7c\x9d\xd2\x3d\x78\x7a\xbd"
+                                 "\xe2\xaf\xcb\x30\x6a\xeb\x7d\xfc\xe6\x92\x46\xcc\x73\xf5\xc8\x7f"
+                                 "\xdf\x06\x03\x01\x79\xa2\x11\x4b\x76\x7d\xb1\xf0\x83\xff\x84\x1c"
+                                 "\x02\x5d\x7d\xc0\x0c\xd8\x24\x35\xb9\xa9\x0f\x69\x53\x69\xe9\x4d"
+                                 "\xf2\x3d\x2c\xe4\x58\xbc\x3b\x32\x83\xad\x8b\xba\x2b\x8f\xa1\xba"
+                                 "\x62\xe2\xdc\xe9\xac\xcf\xf3\x79\x9a\xae\x7c\x84\x00\x16\xf3\xba"
+                                 "\x8e\x00\x48\xc0\xb6\xcc\x43\x39\xaf\x71\x61\x00\x3a\x5b\xeb\x86"
+                                 "\x4a\x01\x64\xb2\xc1\xc9\x23\x7b\x64\xbc\x87\x55\x69\x94\x35\x1b"
+                                 "\x27\x50\x6c\x33\xd4\xbc\xdf\xce\x0f\x9c\x49\x1a\x7d\x6b\x06\x28"
+                                 "\xc7\xc8\x52\xbe\x4f\x0a\x9c\x31\x32\xb2\xed\x3a\x2c\x88\x81\xe9"
+                                 "\xaa\xb0\x7e\x20\xe1\x7d\xeb\x07\x46\x91\xbe\x67\x77\x76\xa7\x8b"
+                                 "\x5c\x50\x2e\x05\xd9\xbd\xde\x72\x12\x6b\x37\x38\x69\x5e\x2d\xd1"
+                                 "\xa0\xa9\x8a\x14\x24\x7c\x65\xd8\xa7\xee\x79\x43\x2a\x09\x2c\xb0"
+                                 "\x72\x1a\x12\xdf\x79\x8e\x44\xf7\xcf\xce\x0c\x49\x81\x47\xa9\xb1";
+
+static const unsigned char p[] = "\x06\x77\xcd\xd5\x46\x9b\xc1\xd5\x58\x00\x81\xe2\xf3\x0a\x36\xb1"
+                                 "\x6e\x29\x89\xd5\x2f\x31\x5f\x92\x22\x3b\x9b\x75\x30\x82\xfa\xc5"
+                                 "\xf5\xde\x8a\x36\xdb\xc6\xe5\x8f\xef\x14\x37\xd6\x00\xf9\xab\x90"
+                                 "\x9b\x5d\x57\x4c\xf5\x1f\x77\xc4\xbb\x8b\xdd\x9b\x67\x11\x45\xb2"
+                                 "\x64\xe8\xac\xa8\x03\x0f\x16\x0d\x5d\x2d\x53\x07\x23\xfb\x62\x0d"
+                                 "\xe6\x16\xd3\x23\xe8\xb3";
+
+static const unsigned char q[] = "\x06\x66\x9a\x70\x53\xd6\x72\x74\xfd\xea\x45\xc3\xc0\x17\xae\xde"
+                                 "\x79\x17\xae\x79\xde\xfc\x0e\xf7\xa4\x3a\x8c\x43\x8f\xc7\x8a\xa2"
+                                 "\x2c\x51\xc4\xd0\x72\x89\x73\x5c\x61\xbe\xfd\x54\x3f\x92\x65\xde"
+                                 "\x4d\x65\x71\x70\xf6\xf2\xe5\x98\xb9\x0f\xd1\x0b\xe6\x95\x09\x4a"
+                                 "\x7a\xdf\xf3\x10\x16\xd0\x60\xfc\xa5\x10\x34\x97\x37\x6f\x0a\xd5"
+                                 "\x5d\x8f\xd4\xc3\xa0\x5b";
+
+static const unsigned char dmp1[] = "\x05\x7c\x9e\x1c\xbd\x90\x25\xe7\x40\x86\xf5\xa8\x3b\x7a\x3f\x99"
+                                    "\x56\x95\x60\x3a\x7b\x95\x4b\xb8\xa0\xd7\xa5\xf1\xcc\xdc\x5f\xb5"
+                                    "\x8c\xf4\x62\x95\x54\xed\x2e\x12\x62\xc2\xe8\xf6\xde\xce\xed\x8e"
+                                    "\x77\x6d\xc0\x40\x25\x74\xb3\x5a\x2d\xaa\xe1\xac\x11\xcb\xe2\x2f"
+                                    "\x0a\x51\x23\x1e\x47\xb2\x05\x88\x02\xb2\x0f\x4b\xf0\x67\x30\xf0"
+                                    "\x0f\x6e\xef\x5f\xf7\xe7";
+
+static const unsigned char dmq1[] = "\x01\xa5\x6b\xbc\xcd\xe3\x0e\x46\xc6\x72\xf5\x04\x56\x28\x01\x22"
+                                    "\x58\x74\x5d\xbc\x1c\x3c\x29\x41\x49\x6c\x81\x5c\x72\xe2\xf7\xe5"
+                                    "\xa3\x8e\x58\x16\xe0\x0e\x37\xac\x1f\xbb\x75\xfd\xaf\xe7\xdf\xe9"
+                                    "\x1f\x70\xa2\x8f\x52\x03\xc0\x46\xd9\xf9\x96\x63\x00\x27\x7e\x5f"
+                                    "\x38\x60\xd6\x6b\x61\xe2\xaf\xbe\xea\x58\xd3\x9d\xbc\x75\x03\x8d"
+                                    "\x42\x65\xd6\x6b\x85\x97";
+
+static const unsigned char iqmp[] = "\x03\xa1\x8b\x80\xe4\xd8\x87\x25\x17\x5d\xcc\x8d\xa9\x8a\x22\x2b"
+                                    "\x6c\x15\x34\x6f\x80\xcc\x1c\x44\x04\x68\xbc\x03\xcd\x95\xbb\x69"
+                                    "\x37\x61\x48\xb4\x23\x13\x08\x16\x54\x6a\xa1\x7c\xf5\xd4\x3a\xe1"
+                                    "\x4f\xa4\x0c\xf5\xaf\x80\x85\x27\x06\x0d\x70\xc0\xc5\x19\x28\xfe"
+                                    "\xee\x8e\x86\x21\x98\x8a\x37\xb7\xe5\x30\x25\x70\x93\x51\x2d\x49"
+                                    "\x85\x56\xb3\x0c\x2b\x96";
+
+static const unsigned char ex_prime[] = "\x03\x89\x22\xa0\xb7\x3a\x91\xcb\x5e\x0c\xfd\x73\xde\xa7\x38\xa9"
+                                        "\x47\x43\xd6\x02\xbf\x2a\xb9\x3c\x48\xf3\x06\xd6\x58\x35\x50\x56"
+                                        "\x16\x5c\x34\x9b\x61\x87\xc8\xaa\x0a\x5d\x8a\x0a\xcd\x9c\x41\xd9"
+                                        "\x96\x24\xe0\xa9\x9b\x26\xb7\xa8\x08\xc9\xea\xdc\xa7\x15\xfb\x62"
+                                        "\xa0\x2d\x90\xe6\xa7\x55\x6e\xc6\x6c\xff\xd6\x10\x6d\xfa\x2e\x04"
+                                        "\x50\xec\x5c\x66\xe4\x05";
+
+static const unsigned char ex_exponent[] = "\x02\x0a\xcd\xc3\x82\xd2\x03\xb0\x31\xac\xd3\x20\x80\x34\x9a\x57"
+                                           "\xbc\x60\x04\x57\x25\xd0\x29\x9a\x16\x90\xb9\x1c\x49\x6a\xd1\xf2"
+                                           "\x47\x8c\x0e\x9e\xc9\x20\xc2\xd8\xe4\x8f\xce\xd2\x1a\x9c\xec\xb4"
+                                           "\x1f\x33\x41\xc8\xf5\x62\xd1\xa5\xef\x1d\xa1\xd8\xbd\x71\xc6\xf7"
+                                           "\xda\x89\x37\x2e\xe2\xec\x47\xc5\xb8\xe3\xb4\xe3\x5c\x82\xaa\xdd"
+                                           "\xb7\x58\x2e\xaf\x07\x79";
+
+static const unsigned char ex_coefficient[] = "\x00\x9c\x09\x88\x9b\xc8\x57\x08\x69\x69\xab\x2d\x9e\x29\x1c\x3c"
+                                              "\x6d\x59\x33\x12\x0d\x2b\x09\x2e\xaf\x01\x2c\x27\x01\xfc\xbd\x26"
+                                              "\x13\xf9\x2d\x09\x22\x4e\x49\x11\x03\x82\x88\x87\xf4\x43\x1d\xac"
+                                              "\xca\xec\x86\xf7\x23\xf1\x64\xf3\xf5\x81\xf0\x37\x36\xcf\x67\xff"
+                                              "\x1a\xff\x7a\xc7\xf9\xf9\x67\x2d\xa0\x9d\x61\xf8\xf6\x47\x5c\x2f"
+                                              "\xe7\x66\xe8\x3c\x3a\xe8";
 
 static int key2048_key(RSA *key)
 {
     if (!TEST_int_eq(RSA_set0_key(key,
-                                  BN_bin2bn(n, sizeof(n) - 1, NULL),
-                                  BN_bin2bn(e, sizeof(e) - 1, NULL),
-                                  BN_bin2bn(d, sizeof(d) - 1, NULL)), 1))
+                         BN_bin2bn(n, sizeof(n) - 1, NULL),
+                         BN_bin2bn(e, sizeof(e) - 1, NULL),
+                         BN_bin2bn(d, sizeof(d) - 1, NULL)),
+            1))
         return 0;
 
     return RSA_size(key);
@@ -152,17 +143,18 @@ static int key2048p3_v1(RSA *key)
     BIGNUM **pris = NULL, **exps = NULL, **coeffs = NULL;
     int rv = RSA_size(key);
 
-
     if (!TEST_int_eq(RSA_set0_factors(key,
-                                      BN_bin2bn(p, sizeof(p) - 1, NULL),
-                                      BN_bin2bn(q, sizeof(q) - 1, NULL)), 1))
+                         BN_bin2bn(p, sizeof(p) - 1, NULL),
+                         BN_bin2bn(q, sizeof(q) - 1, NULL)),
+            1))
         goto err;
 
     if (!TEST_int_eq(RSA_set0_crt_params(key,
-                                         BN_bin2bn(dmp1, sizeof(dmp1) - 1, NULL),
-                                         BN_bin2bn(dmq1, sizeof(dmq1) - 1, NULL),
-                                         BN_bin2bn(iqmp, sizeof(iqmp) - 1,
-                                                   NULL)), 1))
+                         BN_bin2bn(dmp1, sizeof(dmp1) - 1, NULL),
+                         BN_bin2bn(dmq1, sizeof(dmq1) - 1, NULL),
+                         BN_bin2bn(iqmp, sizeof(iqmp) - 1,
+                             NULL)),
+            1))
         return 0;
 
     pris = OPENSSL_zalloc(sizeof(BIGNUM *));
@@ -178,15 +170,15 @@ static int key2048p3_v1(RSA *key)
         goto err;
 
     if (!TEST_true(RSA_set0_multi_prime_params(key, pris, exps,
-                                               coeffs, NUM_EXTRA_PRIMES)))
+            coeffs, NUM_EXTRA_PRIMES)))
         goto err;
 
- ret:
+ret:
     OPENSSL_free(pris);
     OPENSSL_free(exps);
     OPENSSL_free(coeffs);
     return rv;
- err:
+err:
     if (pris != NULL)
         BN_free(pris[0]);
     if (exps != NULL)
@@ -233,12 +225,12 @@ static int key2048p3_v2(RSA *key)
     if (!TEST_true(ossl_rsa_set0_all_params(key, primes, exps, coeffs)))
         goto err;
 
- ret:
+ret:
     sk_BIGNUM_free(primes);
     sk_BIGNUM_free(exps);
     sk_BIGNUM_free(coeffs);
     return rv;
- err:
+err:
     sk_BIGNUM_pop_free(primes, BN_free);
     sk_BIGNUM_pop_free(exps, BN_free);
     sk_BIGNUM_pop_free(coeffs, BN_free);
@@ -275,7 +267,7 @@ static int test_rsa_mp(int i)
         goto err;
 
     num = RSA_public_encrypt(plen, ptext_ex, ctext, key,
-                             RSA_PKCS1_PADDING);
+        RSA_PKCS1_PADDING);
     if (!TEST_int_eq(num, clen))
         goto err;
 
diff --git a/test/rsa_sp800_56b_test.c b/test/rsa_sp800_56b_test.c
index f009bf61724ef..9d3abd2cf11cd 100644
--- a/test/rsa_sp800_56b_test.c
+++ b/test/rsa_sp800_56b_test.c
@@ -30,68 +30,68 @@
 
 /* taken from RSA2 cavs data */
 static const unsigned char cav_e[] = {
-    0x01,0x00,0x01
+    0x01, 0x00, 0x01
 };
 static const unsigned char cav_p[] = {
-    0xcf,0x72,0x1b,0x9a,0xfd,0x0d,0x22,0x1a,0x74,0x50,0x97,0x22,0x76,0xd8,0xc0,
-    0xc2,0xfd,0x08,0x81,0x05,0xdd,0x18,0x21,0x99,0x96,0xd6,0x5c,0x79,0xe3,0x02,
-    0x81,0xd7,0x0e,0x3f,0x3b,0x34,0xda,0x61,0xc9,0x2d,0x84,0x86,0x62,0x1e,0x3d,
-    0x5d,0xbf,0x92,0x2e,0xcd,0x35,0x3d,0x6e,0xb9,0x59,0x16,0xc9,0x82,0x50,0x41,
-    0x30,0x45,0x67,0xaa,0xb7,0xbe,0xec,0xea,0x4b,0x9e,0xa0,0xc3,0x05,0xbc,0x4c,
-    0x01,0xa5,0x4b,0xbd,0xa4,0x20,0xb5,0x20,0xd5,0x59,0x6f,0x82,0x5c,0x8f,0x4f,
-    0xe0,0x3a,0x4e,0x7e,0xfe,0x44,0xf3,0x3c,0xc0,0x0e,0x14,0x2b,0x32,0xe6,0x28,
-    0x8b,0x63,0x87,0x00,0xc3,0x53,0x4a,0x5b,0x71,0x7a,0x5b,0x28,0x40,0xc4,0x18,
-    0xb6,0x77,0x0b,0xab,0x59,0xa4,0x96,0x7d
+    0xcf, 0x72, 0x1b, 0x9a, 0xfd, 0x0d, 0x22, 0x1a, 0x74, 0x50, 0x97, 0x22, 0x76, 0xd8, 0xc0,
+    0xc2, 0xfd, 0x08, 0x81, 0x05, 0xdd, 0x18, 0x21, 0x99, 0x96, 0xd6, 0x5c, 0x79, 0xe3, 0x02,
+    0x81, 0xd7, 0x0e, 0x3f, 0x3b, 0x34, 0xda, 0x61, 0xc9, 0x2d, 0x84, 0x86, 0x62, 0x1e, 0x3d,
+    0x5d, 0xbf, 0x92, 0x2e, 0xcd, 0x35, 0x3d, 0x6e, 0xb9, 0x59, 0x16, 0xc9, 0x82, 0x50, 0x41,
+    0x30, 0x45, 0x67, 0xaa, 0xb7, 0xbe, 0xec, 0xea, 0x4b, 0x9e, 0xa0, 0xc3, 0x05, 0xbc, 0x4c,
+    0x01, 0xa5, 0x4b, 0xbd, 0xa4, 0x20, 0xb5, 0x20, 0xd5, 0x59, 0x6f, 0x82, 0x5c, 0x8f, 0x4f,
+    0xe0, 0x3a, 0x4e, 0x7e, 0xfe, 0x44, 0xf3, 0x3c, 0xc0, 0x0e, 0x14, 0x2b, 0x32, 0xe6, 0x28,
+    0x8b, 0x63, 0x87, 0x00, 0xc3, 0x53, 0x4a, 0x5b, 0x71, 0x7a, 0x5b, 0x28, 0x40, 0xc4, 0x18,
+    0xb6, 0x77, 0x0b, 0xab, 0x59, 0xa4, 0x96, 0x7d
 };
 static const unsigned char cav_q[] = {
-    0xfe,0xab,0xf2,0x7c,0x16,0x4a,0xf0,0x8d,0x31,0xc6,0x0a,0x82,0xe2,0xae,0xbb,
-    0x03,0x7e,0x7b,0x20,0x4e,0x64,0xb0,0x16,0xad,0x3c,0x01,0x1a,0xd3,0x54,0xbf,
-    0x2b,0xa4,0x02,0x9e,0xc3,0x0d,0x60,0x3d,0x1f,0xb9,0xc0,0x0d,0xe6,0x97,0x68,
-    0xbb,0x8c,0x81,0xd5,0xc1,0x54,0x96,0x0f,0x99,0xf0,0xa8,0xa2,0xf3,0xc6,0x8e,
-    0xec,0xbc,0x31,0x17,0x70,0x98,0x24,0xa3,0x36,0x51,0xa8,0x54,0xc4,0x44,0xdd,
-    0xf7,0x7e,0xda,0x47,0x4a,0x67,0x44,0x5d,0x4e,0x75,0xf0,0x4d,0x00,0x68,0xe1,
-    0x4a,0xec,0x1f,0x45,0xf9,0xe6,0xca,0x38,0x95,0x48,0x6f,0xdc,0x9d,0x1b,0xa3,
-    0x4b,0xfd,0x08,0x4b,0x54,0xcd,0xeb,0x3d,0xef,0x33,0x11,0x6e,0xce,0xe4,0x5d,
-    0xef,0xa9,0x58,0x5c,0x87,0x4d,0xc8,0xcf
+    0xfe, 0xab, 0xf2, 0x7c, 0x16, 0x4a, 0xf0, 0x8d, 0x31, 0xc6, 0x0a, 0x82, 0xe2, 0xae, 0xbb,
+    0x03, 0x7e, 0x7b, 0x20, 0x4e, 0x64, 0xb0, 0x16, 0xad, 0x3c, 0x01, 0x1a, 0xd3, 0x54, 0xbf,
+    0x2b, 0xa4, 0x02, 0x9e, 0xc3, 0x0d, 0x60, 0x3d, 0x1f, 0xb9, 0xc0, 0x0d, 0xe6, 0x97, 0x68,
+    0xbb, 0x8c, 0x81, 0xd5, 0xc1, 0x54, 0x96, 0x0f, 0x99, 0xf0, 0xa8, 0xa2, 0xf3, 0xc6, 0x8e,
+    0xec, 0xbc, 0x31, 0x17, 0x70, 0x98, 0x24, 0xa3, 0x36, 0x51, 0xa8, 0x54, 0xc4, 0x44, 0xdd,
+    0xf7, 0x7e, 0xda, 0x47, 0x4a, 0x67, 0x44, 0x5d, 0x4e, 0x75, 0xf0, 0x4d, 0x00, 0x68, 0xe1,
+    0x4a, 0xec, 0x1f, 0x45, 0xf9, 0xe6, 0xca, 0x38, 0x95, 0x48, 0x6f, 0xdc, 0x9d, 0x1b, 0xa3,
+    0x4b, 0xfd, 0x08, 0x4b, 0x54, 0xcd, 0xeb, 0x3d, 0xef, 0x33, 0x11, 0x6e, 0xce, 0xe4, 0x5d,
+    0xef, 0xa9, 0x58, 0x5c, 0x87, 0x4d, 0xc8, 0xcf
 };
 static const unsigned char cav_n[] = {
-    0xce,0x5e,0x8d,0x1a,0xa3,0x08,0x7a,0x2d,0xb4,0x49,0x48,0xf0,0x06,0xb6,0xfe,
-    0xba,0x2f,0x39,0x7c,0x7b,0xe0,0x5d,0x09,0x2d,0x57,0x4e,0x54,0x60,0x9c,0xe5,
-    0x08,0x4b,0xe1,0x1a,0x73,0xc1,0x5e,0x2f,0xb6,0x46,0xd7,0x81,0xca,0xbc,0x98,
-    0xd2,0xf9,0xef,0x1c,0x92,0x8c,0x8d,0x99,0x85,0x28,0x52,0xd6,0xd5,0xab,0x70,
-    0x7e,0x9e,0xa9,0x87,0x82,0xc8,0x95,0x64,0xeb,0xf0,0x6c,0x0f,0x3f,0xe9,0x02,
-    0x29,0x2e,0x6d,0xa1,0xec,0xbf,0xdc,0x23,0xdf,0x82,0x4f,0xab,0x39,0x8d,0xcc,
-    0xac,0x21,0x51,0x14,0xf8,0xef,0xec,0x73,0x80,0x86,0xa3,0xcf,0x8f,0xd5,0xcf,
-    0x22,0x1f,0xcc,0x23,0x2f,0xba,0xcb,0xf6,0x17,0xcd,0x3a,0x1f,0xd9,0x84,0xb9,
-    0x88,0xa7,0x78,0x0f,0xaa,0xc9,0x04,0x01,0x20,0x72,0x5d,0x2a,0xfe,0x5b,0xdd,
-    0x16,0x5a,0xed,0x83,0x02,0x96,0x39,0x46,0x37,0x30,0xc1,0x0d,0x87,0xc2,0xc8,
-    0x33,0x38,0xed,0x35,0x72,0xe5,0x29,0xf8,0x1f,0x23,0x60,0xe1,0x2a,0x5b,0x1d,
-    0x6b,0x53,0x3f,0x07,0xc4,0xd9,0xbb,0x04,0x0c,0x5c,0x3f,0x0b,0xc4,0xd4,0x61,
-    0x96,0x94,0xf1,0x0f,0x4a,0x49,0xac,0xde,0xd2,0xe8,0x42,0xb3,0x4a,0x0b,0x64,
-    0x7a,0x32,0x5f,0x2b,0x5b,0x0f,0x8b,0x8b,0xe0,0x33,0x23,0x34,0x64,0xf8,0xb5,
-    0x7f,0x69,0x60,0xb8,0x71,0xe9,0xff,0x92,0x42,0xb1,0xf7,0x23,0xa8,0xa7,0x92,
-    0x04,0x3d,0x6b,0xff,0xf7,0xab,0xbb,0x14,0x1f,0x4c,0x10,0x97,0xd5,0x6b,0x71,
-    0x12,0xfd,0x93,0xa0,0x4a,0x3b,0x75,0x72,0x40,0x96,0x1c,0x5f,0x40,0x40,0x57,
+    0xce, 0x5e, 0x8d, 0x1a, 0xa3, 0x08, 0x7a, 0x2d, 0xb4, 0x49, 0x48, 0xf0, 0x06, 0xb6, 0xfe,
+    0xba, 0x2f, 0x39, 0x7c, 0x7b, 0xe0, 0x5d, 0x09, 0x2d, 0x57, 0x4e, 0x54, 0x60, 0x9c, 0xe5,
+    0x08, 0x4b, 0xe1, 0x1a, 0x73, 0xc1, 0x5e, 0x2f, 0xb6, 0x46, 0xd7, 0x81, 0xca, 0xbc, 0x98,
+    0xd2, 0xf9, 0xef, 0x1c, 0x92, 0x8c, 0x8d, 0x99, 0x85, 0x28, 0x52, 0xd6, 0xd5, 0xab, 0x70,
+    0x7e, 0x9e, 0xa9, 0x87, 0x82, 0xc8, 0x95, 0x64, 0xeb, 0xf0, 0x6c, 0x0f, 0x3f, 0xe9, 0x02,
+    0x29, 0x2e, 0x6d, 0xa1, 0xec, 0xbf, 0xdc, 0x23, 0xdf, 0x82, 0x4f, 0xab, 0x39, 0x8d, 0xcc,
+    0xac, 0x21, 0x51, 0x14, 0xf8, 0xef, 0xec, 0x73, 0x80, 0x86, 0xa3, 0xcf, 0x8f, 0xd5, 0xcf,
+    0x22, 0x1f, 0xcc, 0x23, 0x2f, 0xba, 0xcb, 0xf6, 0x17, 0xcd, 0x3a, 0x1f, 0xd9, 0x84, 0xb9,
+    0x88, 0xa7, 0x78, 0x0f, 0xaa, 0xc9, 0x04, 0x01, 0x20, 0x72, 0x5d, 0x2a, 0xfe, 0x5b, 0xdd,
+    0x16, 0x5a, 0xed, 0x83, 0x02, 0x96, 0x39, 0x46, 0x37, 0x30, 0xc1, 0x0d, 0x87, 0xc2, 0xc8,
+    0x33, 0x38, 0xed, 0x35, 0x72, 0xe5, 0x29, 0xf8, 0x1f, 0x23, 0x60, 0xe1, 0x2a, 0x5b, 0x1d,
+    0x6b, 0x53, 0x3f, 0x07, 0xc4, 0xd9, 0xbb, 0x04, 0x0c, 0x5c, 0x3f, 0x0b, 0xc4, 0xd4, 0x61,
+    0x96, 0x94, 0xf1, 0x0f, 0x4a, 0x49, 0xac, 0xde, 0xd2, 0xe8, 0x42, 0xb3, 0x4a, 0x0b, 0x64,
+    0x7a, 0x32, 0x5f, 0x2b, 0x5b, 0x0f, 0x8b, 0x8b, 0xe0, 0x33, 0x23, 0x34, 0x64, 0xf8, 0xb5,
+    0x7f, 0x69, 0x60, 0xb8, 0x71, 0xe9, 0xff, 0x92, 0x42, 0xb1, 0xf7, 0x23, 0xa8, 0xa7, 0x92,
+    0x04, 0x3d, 0x6b, 0xff, 0xf7, 0xab, 0xbb, 0x14, 0x1f, 0x4c, 0x10, 0x97, 0xd5, 0x6b, 0x71,
+    0x12, 0xfd, 0x93, 0xa0, 0x4a, 0x3b, 0x75, 0x72, 0x40, 0x96, 0x1c, 0x5f, 0x40, 0x40, 0x57,
     0x13
 };
 static const unsigned char cav_d[] = {
-    0x47,0x47,0x49,0x1d,0x66,0x2a,0x4b,0x68,0xf5,0xd8,0x4a,0x24,0xfd,0x6c,0xbf,
-    0x56,0xb7,0x70,0xf7,0x9a,0x21,0xc8,0x80,0x9e,0xf4,0x84,0xcd,0x88,0x01,0x28,
-    0xea,0x50,0xab,0x13,0x63,0xdf,0xea,0x14,0x38,0xb5,0x07,0x42,0x81,0x2f,0xda,
-    0xe9,0x24,0x02,0x7e,0xaf,0xef,0x74,0x09,0x0e,0x80,0xfa,0xfb,0xd1,0x19,0x41,
-    0xe5,0xba,0x0f,0x7c,0x0a,0xa4,0x15,0x55,0xa2,0x58,0x8c,0x3a,0x48,0x2c,0xc6,
-    0xde,0x4a,0x76,0xfb,0x72,0xb6,0x61,0xe6,0xd2,0x10,0x44,0x4c,0x33,0xb8,0xd2,
-    0x74,0xb1,0x9d,0x3b,0xcd,0x2f,0xb1,0x4f,0xc3,0x98,0xbd,0x83,0xb7,0x7e,0x75,
-    0xe8,0xa7,0x6a,0xee,0xcc,0x51,0x8c,0x99,0x17,0x67,0x7f,0x27,0xf9,0x0d,0x6a,
-    0xb7,0xd4,0x80,0x17,0x89,0x39,0x9c,0xf3,0xd7,0x0f,0xdf,0xb0,0x55,0x80,0x1d,
-    0xaf,0x57,0x2e,0xd0,0xf0,0x4f,0x42,0x69,0x55,0xbc,0x83,0xd6,0x97,0x83,0x7a,
-    0xe6,0xc6,0x30,0x6d,0x3d,0xb5,0x21,0xa7,0xc4,0x62,0x0a,0x20,0xce,0x5e,0x5a,
-    0x17,0x98,0xb3,0x6f,0x6b,0x9a,0xeb,0x6b,0xa3,0xc4,0x75,0xd8,0x2b,0xdc,0x5c,
-    0x6f,0xec,0x5d,0x49,0xac,0xa8,0xa4,0x2f,0xb8,0x8c,0x4f,0x2e,0x46,0x21,0xee,
-    0x72,0x6a,0x0e,0x22,0x80,0x71,0xc8,0x76,0x40,0x44,0x61,0x16,0xbf,0xa5,0xf8,
-    0x89,0xc7,0xe9,0x87,0xdf,0xbd,0x2e,0x4b,0x4e,0xc2,0x97,0x53,0xe9,0x49,0x1c,
-    0x05,0xb0,0x0b,0x9b,0x9f,0x21,0x19,0x41,0xe9,0xf5,0x61,0xd7,0x33,0x2e,0x2c,
-    0x94,0xb8,0xa8,0x9a,0x3a,0xcc,0x6a,0x24,0x8d,0x19,0x13,0xee,0xb9,0xb0,0x48,
+    0x47, 0x47, 0x49, 0x1d, 0x66, 0x2a, 0x4b, 0x68, 0xf5, 0xd8, 0x4a, 0x24, 0xfd, 0x6c, 0xbf,
+    0x56, 0xb7, 0x70, 0xf7, 0x9a, 0x21, 0xc8, 0x80, 0x9e, 0xf4, 0x84, 0xcd, 0x88, 0x01, 0x28,
+    0xea, 0x50, 0xab, 0x13, 0x63, 0xdf, 0xea, 0x14, 0x38, 0xb5, 0x07, 0x42, 0x81, 0x2f, 0xda,
+    0xe9, 0x24, 0x02, 0x7e, 0xaf, 0xef, 0x74, 0x09, 0x0e, 0x80, 0xfa, 0xfb, 0xd1, 0x19, 0x41,
+    0xe5, 0xba, 0x0f, 0x7c, 0x0a, 0xa4, 0x15, 0x55, 0xa2, 0x58, 0x8c, 0x3a, 0x48, 0x2c, 0xc6,
+    0xde, 0x4a, 0x76, 0xfb, 0x72, 0xb6, 0x61, 0xe6, 0xd2, 0x10, 0x44, 0x4c, 0x33, 0xb8, 0xd2,
+    0x74, 0xb1, 0x9d, 0x3b, 0xcd, 0x2f, 0xb1, 0x4f, 0xc3, 0x98, 0xbd, 0x83, 0xb7, 0x7e, 0x75,
+    0xe8, 0xa7, 0x6a, 0xee, 0xcc, 0x51, 0x8c, 0x99, 0x17, 0x67, 0x7f, 0x27, 0xf9, 0x0d, 0x6a,
+    0xb7, 0xd4, 0x80, 0x17, 0x89, 0x39, 0x9c, 0xf3, 0xd7, 0x0f, 0xdf, 0xb0, 0x55, 0x80, 0x1d,
+    0xaf, 0x57, 0x2e, 0xd0, 0xf0, 0x4f, 0x42, 0x69, 0x55, 0xbc, 0x83, 0xd6, 0x97, 0x83, 0x7a,
+    0xe6, 0xc6, 0x30, 0x6d, 0x3d, 0xb5, 0x21, 0xa7, 0xc4, 0x62, 0x0a, 0x20, 0xce, 0x5e, 0x5a,
+    0x17, 0x98, 0xb3, 0x6f, 0x6b, 0x9a, 0xeb, 0x6b, 0xa3, 0xc4, 0x75, 0xd8, 0x2b, 0xdc, 0x5c,
+    0x6f, 0xec, 0x5d, 0x49, 0xac, 0xa8, 0xa4, 0x2f, 0xb8, 0x8c, 0x4f, 0x2e, 0x46, 0x21, 0xee,
+    0x72, 0x6a, 0x0e, 0x22, 0x80, 0x71, 0xc8, 0x76, 0x40, 0x44, 0x61, 0x16, 0xbf, 0xa5, 0xf8,
+    0x89, 0xc7, 0xe9, 0x87, 0xdf, 0xbd, 0x2e, 0x4b, 0x4e, 0xc2, 0x97, 0x53, 0xe9, 0x49, 0x1c,
+    0x05, 0xb0, 0x0b, 0x9b, 0x9f, 0x21, 0x19, 0x41, 0xe9, 0xf5, 0x61, 0xd7, 0x33, 0x2e, 0x2c,
+    0x94, 0xb8, 0xa8, 0x9a, 0x3a, 0xcc, 0x6a, 0x24, 0x8d, 0x19, 0x13, 0xee, 0xb9, 0xb0, 0x48,
     0x61
 };
 
@@ -111,23 +111,23 @@ static int test_check_public_exponent(void)
     BIGNUM *e = NULL;
 
     ret = TEST_ptr(e = BN_new())
-          /* e is too small will fail */
-          && TEST_true(BN_set_word(e, 1))
-          && TEST_false(ossl_rsa_check_public_exponent(e))
-          /* e is even will fail */
-          && TEST_true(BN_set_word(e, 65536))
-          && TEST_false(ossl_rsa_check_public_exponent(e))
-          /* e is ok */
-          && TEST_true(BN_set_word(e, 3))
-          && TEST_true(ossl_rsa_check_public_exponent(e))
-          && TEST_true(BN_set_word(e, 17))
-          && TEST_true(ossl_rsa_check_public_exponent(e))
-          && TEST_true(BN_set_word(e, 65537))
-          && TEST_true(ossl_rsa_check_public_exponent(e))
-          /* e = 2^256 + 1 is ok */
-          && TEST_true(BN_lshift(e, BN_value_one(), 256))
-          && TEST_true(BN_add(e, e, BN_value_one()))
-          && TEST_true(ossl_rsa_check_public_exponent(e));
+        /* e is too small will fail */
+        && TEST_true(BN_set_word(e, 1))
+        && TEST_false(ossl_rsa_check_public_exponent(e))
+        /* e is even will fail */
+        && TEST_true(BN_set_word(e, 65536))
+        && TEST_false(ossl_rsa_check_public_exponent(e))
+        /* e is ok */
+        && TEST_true(BN_set_word(e, 3))
+        && TEST_true(ossl_rsa_check_public_exponent(e))
+        && TEST_true(BN_set_word(e, 17))
+        && TEST_true(ossl_rsa_check_public_exponent(e))
+        && TEST_true(BN_set_word(e, 65537))
+        && TEST_true(ossl_rsa_check_public_exponent(e))
+        /* e = 2^256 + 1 is ok */
+        && TEST_true(BN_lshift(e, BN_value_one(), 256))
+        && TEST_true(BN_add(e, e, BN_value_one()))
+        && TEST_true(ossl_rsa_check_public_exponent(e));
     BN_free(e);
     return ret;
 }
@@ -149,25 +149,25 @@ static int test_check_prime_factor_range(void)
      * for 72 bits:  0xB504F333F. <= p <= 0xF_FFFF_FFFF
      */
     ret = TEST_ptr(p = BN_new())
-          && TEST_ptr(bn_p1 = bn_load_new(p1, sizeof(p1)))
-          && TEST_ptr(bn_p2 = bn_load_new(p2, sizeof(p2)))
-          && TEST_ptr(bn_p3 = bn_load_new(p3, sizeof(p3)))
-          && TEST_ptr(bn_p4 = bn_load_new(p4, sizeof(p4)))
-          && TEST_ptr(ctx = BN_CTX_new())
-          && TEST_true(BN_set_word(p, 0xA))
-          && TEST_false(ossl_rsa_check_prime_factor_range(p, 8, ctx))
-          && TEST_true(BN_set_word(p, 0x10))
-          && TEST_false(ossl_rsa_check_prime_factor_range(p, 8, ctx))
-          && TEST_true(BN_set_word(p, 0xB))
-          && TEST_false(ossl_rsa_check_prime_factor_range(p, 8, ctx))
-          && TEST_true(BN_set_word(p, 0xC))
-          && TEST_true(ossl_rsa_check_prime_factor_range(p, 8, ctx))
-          && TEST_true(BN_set_word(p, 0xF))
-          && TEST_true(ossl_rsa_check_prime_factor_range(p, 8, ctx))
-          && TEST_false(ossl_rsa_check_prime_factor_range(bn_p1, 72, ctx))
-          && TEST_false(ossl_rsa_check_prime_factor_range(bn_p2, 72, ctx))
-          && TEST_true(ossl_rsa_check_prime_factor_range(bn_p3, 72, ctx))
-          && TEST_true(ossl_rsa_check_prime_factor_range(bn_p4, 72, ctx));
+        && TEST_ptr(bn_p1 = bn_load_new(p1, sizeof(p1)))
+        && TEST_ptr(bn_p2 = bn_load_new(p2, sizeof(p2)))
+        && TEST_ptr(bn_p3 = bn_load_new(p3, sizeof(p3)))
+        && TEST_ptr(bn_p4 = bn_load_new(p4, sizeof(p4)))
+        && TEST_ptr(ctx = BN_CTX_new())
+        && TEST_true(BN_set_word(p, 0xA))
+        && TEST_false(ossl_rsa_check_prime_factor_range(p, 8, ctx))
+        && TEST_true(BN_set_word(p, 0x10))
+        && TEST_false(ossl_rsa_check_prime_factor_range(p, 8, ctx))
+        && TEST_true(BN_set_word(p, 0xB))
+        && TEST_false(ossl_rsa_check_prime_factor_range(p, 8, ctx))
+        && TEST_true(BN_set_word(p, 0xC))
+        && TEST_true(ossl_rsa_check_prime_factor_range(p, 8, ctx))
+        && TEST_true(BN_set_word(p, 0xF))
+        && TEST_true(ossl_rsa_check_prime_factor_range(p, 8, ctx))
+        && TEST_false(ossl_rsa_check_prime_factor_range(bn_p1, 72, ctx))
+        && TEST_false(ossl_rsa_check_prime_factor_range(bn_p2, 72, ctx))
+        && TEST_true(ossl_rsa_check_prime_factor_range(bn_p3, 72, ctx))
+        && TEST_true(ossl_rsa_check_prime_factor_range(bn_p4, 72, ctx));
 
     BN_free(bn_p4);
     BN_free(bn_p3);
@@ -191,22 +191,22 @@ static int test_check_prime_factor(void)
     static const unsigned char p3[] = { 0x0F, 0x50, 0x00, 0x03, 0x75 };
 
     ret = TEST_ptr(p = BN_new())
-          && TEST_ptr(bn_p1 = bn_load_new(p1, sizeof(p1)))
-          && TEST_ptr(bn_p2 = bn_load_new(p2, sizeof(p2)))
-          && TEST_ptr(bn_p3 = bn_load_new(p3, sizeof(p3)))
-          && TEST_ptr(e = BN_new())
-          && TEST_ptr(ctx = BN_CTX_new())
-          /* Fails the prime test */
-          && TEST_true(BN_set_word(e, 0x1))
-          && TEST_false(ossl_rsa_check_prime_factor(bn_p1, e, 72, ctx))
-          /* p is prime and in range and gcd(p-1, e) = 1 */
-          && TEST_true(ossl_rsa_check_prime_factor(bn_p2, e, 72, ctx))
-          /* gcd(p-1,e) = 1 test fails */
-          && TEST_true(BN_set_word(e, 0x2))
-          && TEST_false(ossl_rsa_check_prime_factor(p, e, 72, ctx))
-          /* p fails the range check */
-          && TEST_true(BN_set_word(e, 0x1))
-          && TEST_false(ossl_rsa_check_prime_factor(bn_p3, e, 72, ctx));
+        && TEST_ptr(bn_p1 = bn_load_new(p1, sizeof(p1)))
+        && TEST_ptr(bn_p2 = bn_load_new(p2, sizeof(p2)))
+        && TEST_ptr(bn_p3 = bn_load_new(p3, sizeof(p3)))
+        && TEST_ptr(e = BN_new())
+        && TEST_ptr(ctx = BN_CTX_new())
+        /* Fails the prime test */
+        && TEST_true(BN_set_word(e, 0x1))
+        && TEST_false(ossl_rsa_check_prime_factor(bn_p1, e, 72, ctx))
+        /* p is prime and in range and gcd(p-1, e) = 1 */
+        && TEST_true(ossl_rsa_check_prime_factor(bn_p2, e, 72, ctx))
+        /* gcd(p-1,e) = 1 test fails */
+        && TEST_true(BN_set_word(e, 0x2))
+        && TEST_false(ossl_rsa_check_prime_factor(p, e, 72, ctx))
+        /* p fails the range check */
+        && TEST_true(BN_set_word(e, 0x1))
+        && TEST_false(ossl_rsa_check_prime_factor(bn_p3, e, 72, ctx));
 
     BN_free(bn_p3);
     BN_free(bn_p2);
@@ -226,13 +226,13 @@ static int test_check_private_exponent(void)
     BIGNUM *p = NULL, *q = NULL, *e = NULL, *d = NULL, *n = NULL;
 
     ret = TEST_ptr(key = RSA_new())
-          && TEST_ptr(ctx = BN_CTX_new())
-          && TEST_ptr(p = BN_new())
-          && TEST_ptr(q = BN_new())
-          /* lcm(15-1,17-1) = 14*16 / 2 = 112 */
-          && TEST_true(BN_set_word(p, 15))
-          && TEST_true(BN_set_word(q, 17))
-          && TEST_true(RSA_set0_factors(key, p, q));
+        && TEST_ptr(ctx = BN_CTX_new())
+        && TEST_ptr(p = BN_new())
+        && TEST_ptr(q = BN_new())
+        /* lcm(15-1,17-1) = 14*16 / 2 = 112 */
+        && TEST_true(BN_set_word(p, 15))
+        && TEST_true(BN_set_word(q, 17))
+        && TEST_true(RSA_set0_factors(key, p, q));
     if (!ret) {
         BN_free(p);
         BN_free(q);
@@ -240,12 +240,12 @@ static int test_check_private_exponent(void)
     }
 
     ret = TEST_ptr(e = BN_new())
-          && TEST_ptr(d = BN_new())
-          && TEST_ptr(n = BN_new())
-          && TEST_true(BN_set_word(e, 5))
-          && TEST_true(BN_set_word(d, 157))
-          && TEST_true(BN_set_word(n, 15*17))
-          && TEST_true(RSA_set0_key(key, n, e, d));
+        && TEST_ptr(d = BN_new())
+        && TEST_ptr(n = BN_new())
+        && TEST_true(BN_set_word(e, 5))
+        && TEST_true(BN_set_word(d, 157))
+        && TEST_true(BN_set_word(n, 15 * 17))
+        && TEST_true(RSA_set0_key(key, n, e, d));
     if (!ret) {
         BN_free(e);
         BN_free(d);
@@ -254,17 +254,17 @@ static int test_check_private_exponent(void)
     }
     /* fails since d >= lcm(p-1, q-1) */
     ret = TEST_false(ossl_rsa_check_private_exponent(key, 8, ctx))
-          && TEST_true(BN_set_word(d, 45))
-          /* d is correct size and 1 = e.d mod lcm(p-1, q-1) */
-          && TEST_true(ossl_rsa_check_private_exponent(key, 8, ctx))
-          /* d is too small compared to nbits */
-          && TEST_false(ossl_rsa_check_private_exponent(key, 16, ctx))
-          /* d is too small compared to nbits */
-          && TEST_true(BN_set_word(d, 16))
-          && TEST_false(ossl_rsa_check_private_exponent(key, 8, ctx))
-          /* fail if 1 != e.d mod lcm(p-1, q-1) */
-          && TEST_true(BN_set_word(d, 46))
-          && TEST_false(ossl_rsa_check_private_exponent(key, 8, ctx));
+        && TEST_true(BN_set_word(d, 45))
+        /* d is correct size and 1 = e.d mod lcm(p-1, q-1) */
+        && TEST_true(ossl_rsa_check_private_exponent(key, 8, ctx))
+        /* d is too small compared to nbits */
+        && TEST_false(ossl_rsa_check_private_exponent(key, 16, ctx))
+        /* d is too small compared to nbits */
+        && TEST_true(BN_set_word(d, 16))
+        && TEST_false(ossl_rsa_check_private_exponent(key, 8, ctx))
+        /* fail if 1 != e.d mod lcm(p-1, q-1) */
+        && TEST_true(BN_set_word(d, 46))
+        && TEST_false(ossl_rsa_check_private_exponent(key, 8, ctx));
 end:
     RSA_free(key);
     BN_CTX_free(ctx);
@@ -276,7 +276,7 @@ static int test_check_crt_components(void)
     const int P = 15;
     const int Q = 17;
     const int E = 5;
-    const int N = P*Q;
+    const int N = P * Q;
     const int DP = 3;
     const int DQ = 13;
     const int QINV = 8;
@@ -287,14 +287,14 @@ static int test_check_crt_components(void)
     BIGNUM *p = NULL, *q = NULL, *e = NULL;
 
     ret = TEST_ptr(key = RSA_new())
-          && TEST_ptr(ctx = BN_CTX_new())
-          && TEST_ptr(p = BN_new())
-          && TEST_ptr(q = BN_new())
-          && TEST_ptr(e = BN_new())
-          && TEST_true(BN_set_word(p, P))
-          && TEST_true(BN_set_word(q, Q))
-          && TEST_true(BN_set_word(e, E))
-          && TEST_true(RSA_set0_factors(key, p, q));
+        && TEST_ptr(ctx = BN_CTX_new())
+        && TEST_ptr(p = BN_new())
+        && TEST_ptr(q = BN_new())
+        && TEST_ptr(e = BN_new())
+        && TEST_true(BN_set_word(p, P))
+        && TEST_true(BN_set_word(q, Q))
+        && TEST_true(BN_set_word(e, E))
+        && TEST_true(RSA_set0_factors(key, p, q));
     if (!ret) {
         BN_free(p);
         BN_free(q);
@@ -302,43 +302,43 @@ static int test_check_crt_components(void)
     }
 
     ret = TEST_int_eq(ossl_rsa_sp800_56b_derive_params_from_pq(key, 8, e, ctx), 1)
-          && TEST_BN_eq_word(key->n, N)
-          && TEST_BN_eq_word(key->dmp1, DP)
-          && TEST_BN_eq_word(key->dmq1, DQ)
-          && TEST_BN_eq_word(key->iqmp, QINV)
-          && TEST_true(ossl_rsa_check_crt_components(key, ctx))
-          /* (a) 1 < dP < (p – 1). */
-          && TEST_true(BN_set_word(key->dmp1, 1))
-          && TEST_false(ossl_rsa_check_crt_components(key, ctx))
-          && TEST_true(BN_set_word(key->dmp1, P-1))
-          && TEST_false(ossl_rsa_check_crt_components(key, ctx))
-          && TEST_true(BN_set_word(key->dmp1, DP))
-          /* (b) 1 < dQ < (q - 1). */
-          && TEST_true(BN_set_word(key->dmq1, 1))
-          && TEST_false(ossl_rsa_check_crt_components(key, ctx))
-          && TEST_true(BN_set_word(key->dmq1, Q-1))
-          && TEST_false(ossl_rsa_check_crt_components(key, ctx))
-          && TEST_true(BN_set_word(key->dmq1, DQ))
-          /* (c) 1 < qInv < p */
-          && TEST_true(BN_set_word(key->iqmp, 1))
-          && TEST_false(ossl_rsa_check_crt_components(key, ctx))
-          && TEST_true(BN_set_word(key->iqmp, P))
-          && TEST_false(ossl_rsa_check_crt_components(key, ctx))
-          && TEST_true(BN_set_word(key->iqmp, QINV))
-          /* (d) 1 = (dP . e) mod (p - 1)*/
-          && TEST_true(BN_set_word(key->dmp1, DP+1))
-          && TEST_false(ossl_rsa_check_crt_components(key, ctx))
-          && TEST_true(BN_set_word(key->dmp1, DP))
-          /* (e) 1 = (dQ . e) mod (q - 1) */
-          && TEST_true(BN_set_word(key->dmq1, DQ-1))
-          && TEST_false(ossl_rsa_check_crt_components(key, ctx))
-          && TEST_true(BN_set_word(key->dmq1, DQ))
-          /* (f) 1 = (qInv . q) mod p */
-          && TEST_true(BN_set_word(key->iqmp, QINV+1))
-          && TEST_false(ossl_rsa_check_crt_components(key, ctx))
-          && TEST_true(BN_set_word(key->iqmp, QINV))
-          /* check defaults are still valid */
-          && TEST_true(ossl_rsa_check_crt_components(key, ctx));
+        && TEST_BN_eq_word(key->n, N)
+        && TEST_BN_eq_word(key->dmp1, DP)
+        && TEST_BN_eq_word(key->dmq1, DQ)
+        && TEST_BN_eq_word(key->iqmp, QINV)
+        && TEST_true(ossl_rsa_check_crt_components(key, ctx))
+        /* (a) 1 < dP < (p – 1). */
+        && TEST_true(BN_set_word(key->dmp1, 1))
+        && TEST_false(ossl_rsa_check_crt_components(key, ctx))
+        && TEST_true(BN_set_word(key->dmp1, P - 1))
+        && TEST_false(ossl_rsa_check_crt_components(key, ctx))
+        && TEST_true(BN_set_word(key->dmp1, DP))
+        /* (b) 1 < dQ < (q - 1). */
+        && TEST_true(BN_set_word(key->dmq1, 1))
+        && TEST_false(ossl_rsa_check_crt_components(key, ctx))
+        && TEST_true(BN_set_word(key->dmq1, Q - 1))
+        && TEST_false(ossl_rsa_check_crt_components(key, ctx))
+        && TEST_true(BN_set_word(key->dmq1, DQ))
+        /* (c) 1 < qInv < p */
+        && TEST_true(BN_set_word(key->iqmp, 1))
+        && TEST_false(ossl_rsa_check_crt_components(key, ctx))
+        && TEST_true(BN_set_word(key->iqmp, P))
+        && TEST_false(ossl_rsa_check_crt_components(key, ctx))
+        && TEST_true(BN_set_word(key->iqmp, QINV))
+        /* (d) 1 = (dP . e) mod (p - 1)*/
+        && TEST_true(BN_set_word(key->dmp1, DP + 1))
+        && TEST_false(ossl_rsa_check_crt_components(key, ctx))
+        && TEST_true(BN_set_word(key->dmp1, DP))
+        /* (e) 1 = (dQ . e) mod (q - 1) */
+        && TEST_true(BN_set_word(key->dmq1, DQ - 1))
+        && TEST_false(ossl_rsa_check_crt_components(key, ctx))
+        && TEST_true(BN_set_word(key->dmq1, DQ))
+        /* (f) 1 = (qInv . q) mod p */
+        && TEST_true(BN_set_word(key->iqmp, QINV + 1))
+        && TEST_false(ossl_rsa_check_crt_components(key, ctx))
+        && TEST_true(BN_set_word(key->iqmp, QINV))
+        /* check defaults are still valid */
+        && TEST_true(ossl_rsa_check_crt_components(key, ctx));
 end:
     BN_free(e);
     RSA_free(key);
@@ -361,14 +361,14 @@ static int test_derive_params_from_pq_fail(int tst)
     BIGNUM *p = NULL, *q = NULL, *e = NULL;
 
     ret = TEST_ptr(key = RSA_new())
-          && TEST_ptr(ctx = BN_CTX_new())
-          && TEST_ptr(p = BN_new())
-          && TEST_ptr(q = BN_new())
-          && TEST_ptr(e = BN_new())
-          && TEST_true(BN_set_word(p, derive_from_pq_tests[tst].p))
-          && TEST_true(BN_set_word(q, derive_from_pq_tests[tst].q))
-          && TEST_true(BN_set_word(e, derive_from_pq_tests[tst].e))
-          && TEST_true(RSA_set0_factors(key, p, q));
+        && TEST_ptr(ctx = BN_CTX_new())
+        && TEST_ptr(p = BN_new())
+        && TEST_ptr(q = BN_new())
+        && TEST_ptr(e = BN_new())
+        && TEST_true(BN_set_word(p, derive_from_pq_tests[tst].p))
+        && TEST_true(BN_set_word(q, derive_from_pq_tests[tst].q))
+        && TEST_true(BN_set_word(e, derive_from_pq_tests[tst].e))
+        && TEST_true(RSA_set0_factors(key, p, q));
     if (!ret) {
         BN_free(p);
         BN_free(q);
@@ -389,18 +389,18 @@ static int test_pq_diff(void)
     BIGNUM *tmp = NULL, *p = NULL, *q = NULL;
 
     ret = TEST_ptr(tmp = BN_new())
-          && TEST_ptr(p = BN_new())
-          && TEST_ptr(q = BN_new())
-          /* |1-(2+1)| > 2^1 */
-          && TEST_true(BN_set_word(p, 1))
-          && TEST_true(BN_set_word(q, 1+2))
-          && TEST_false(ossl_rsa_check_pminusq_diff(tmp, p, q, 202))
-          /* Check |p - q| > 2^(nbits/2 - 100) */
-          && TEST_true(BN_set_word(q, 1+3))
-          && TEST_true(ossl_rsa_check_pminusq_diff(tmp, p, q, 202))
-          && TEST_true(BN_set_word(p, 1+3))
-          && TEST_true(BN_set_word(q, 1))
-          && TEST_true(ossl_rsa_check_pminusq_diff(tmp, p, q, 202));
+        && TEST_ptr(p = BN_new())
+        && TEST_ptr(q = BN_new())
+        /* |1-(2+1)| > 2^1 */
+        && TEST_true(BN_set_word(p, 1))
+        && TEST_true(BN_set_word(q, 1 + 2))
+        && TEST_false(ossl_rsa_check_pminusq_diff(tmp, p, q, 202))
+        /* Check |p - q| > 2^(nbits/2 - 100) */
+        && TEST_true(BN_set_word(q, 1 + 3))
+        && TEST_true(ossl_rsa_check_pminusq_diff(tmp, p, q, 202))
+        && TEST_true(BN_set_word(p, 1 + 3))
+        && TEST_true(BN_set_word(q, 1))
+        && TEST_true(ossl_rsa_check_pminusq_diff(tmp, p, q, 202));
     BN_free(p);
     BN_free(q);
     BN_free(tmp);
@@ -415,13 +415,13 @@ static int test_invalid_keypair(void)
     BIGNUM *p = NULL, *q = NULL, *n = NULL, *e = NULL, *d = NULL;
 
     ret = TEST_ptr(key = RSA_new())
-          && TEST_ptr(ctx = BN_CTX_new())
-          /* NULL parameters */
-          && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 2048))
-          /* load key */
-          && TEST_ptr(p = bn_load_new(cav_p, sizeof(cav_p)))
-          && TEST_ptr(q = bn_load_new(cav_q, sizeof(cav_q)))
-          && TEST_true(RSA_set0_factors(key, p, q));
+        && TEST_ptr(ctx = BN_CTX_new())
+        /* NULL parameters */
+        && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 2048))
+        /* load key */
+        && TEST_ptr(p = bn_load_new(cav_p, sizeof(cav_p)))
+        && TEST_ptr(q = bn_load_new(cav_q, sizeof(cav_q)))
+        && TEST_true(RSA_set0_factors(key, p, q));
     if (!ret) {
         BN_free(p);
         BN_free(q);
@@ -429,51 +429,51 @@ static int test_invalid_keypair(void)
     }
 
     ret = TEST_ptr(e = bn_load_new(cav_e, sizeof(cav_e)))
-          && TEST_ptr(n = bn_load_new(cav_n, sizeof(cav_n)))
-          && TEST_ptr(d = bn_load_new(cav_d, sizeof(cav_d)))
-          && TEST_true(RSA_set0_key(key, n, e, d));
+        && TEST_ptr(n = bn_load_new(cav_n, sizeof(cav_n)))
+        && TEST_ptr(d = bn_load_new(cav_d, sizeof(cav_d)))
+        && TEST_true(RSA_set0_key(key, n, e, d));
     if (!ret) {
         BN_free(e);
         BN_free(n);
         BN_free(d);
         goto end;
     }
-          /* bad strength/key size */
+    /* bad strength/key size */
     ret = TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, 100, 2048))
-          && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, 112, 1024))
-          && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, 128, 2048))
-          && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, 140, 3072))
-          /* mismatching exponent */
-          && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, BN_value_one(),
-                                                         -1, 2048))
-          /* bad exponent */
-          && TEST_true(BN_add_word(e, 1))
-          && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 2048))
-          && TEST_true(BN_sub_word(e, 1))
-
-          /* mismatch between bits and modulus */
-          && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 3072))
-          && TEST_true(ossl_rsa_sp800_56b_check_keypair(key, e, 112, 2048))
-          /* check n == pq failure */
-          && TEST_true(BN_add_word(n, 1))
-          && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 2048))
-          && TEST_true(BN_sub_word(n, 1))
-          /* check that validation fails if len(n) is not even */
-          && TEST_true(BN_lshift1(n, n))
-          && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 2049))
-          && TEST_true(BN_rshift1(n, n))
-          /* check p  */
-          && TEST_true(BN_sub_word(p, 2))
-          && TEST_true(BN_mul(n, p, q, ctx))
-          && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 2048))
-          && TEST_true(BN_add_word(p, 2))
-          && TEST_true(BN_mul(n, p, q, ctx))
-          /* check q  */
-          && TEST_true(BN_sub_word(q, 2))
-          && TEST_true(BN_mul(n, p, q, ctx))
-          && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 2048))
-          && TEST_true(BN_add_word(q, 2))
-          && TEST_true(BN_mul(n, p, q, ctx));
+        && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, 112, 1024))
+        && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, 128, 2048))
+        && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, 140, 3072))
+        /* mismatching exponent */
+        && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, BN_value_one(),
+            -1, 2048))
+        /* bad exponent */
+        && TEST_true(BN_add_word(e, 1))
+        && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 2048))
+        && TEST_true(BN_sub_word(e, 1))
+
+        /* mismatch between bits and modulus */
+        && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 3072))
+        && TEST_true(ossl_rsa_sp800_56b_check_keypair(key, e, 112, 2048))
+        /* check n == pq failure */
+        && TEST_true(BN_add_word(n, 1))
+        && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 2048))
+        && TEST_true(BN_sub_word(n, 1))
+        /* check that validation fails if len(n) is not even */
+        && TEST_true(BN_lshift1(n, n))
+        && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 2049))
+        && TEST_true(BN_rshift1(n, n))
+        /* check p  */
+        && TEST_true(BN_sub_word(p, 2))
+        && TEST_true(BN_mul(n, p, q, ctx))
+        && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 2048))
+        && TEST_true(BN_add_word(p, 2))
+        && TEST_true(BN_mul(n, p, q, ctx))
+        /* check q  */
+        && TEST_true(BN_sub_word(q, 2))
+        && TEST_true(BN_mul(n, p, q, ctx))
+        && TEST_false(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, 2048))
+        && TEST_true(BN_add_word(q, 2))
+        && TEST_true(BN_mul(n, p, q, ctx));
 end:
     RSA_free(key);
     BN_CTX_free(ctx);
@@ -491,10 +491,10 @@ static int test_sp80056b_keygen(int id)
     int sz = keygen_size[id];
 
     ret = TEST_ptr(key = RSA_new())
-          && TEST_true(ossl_rsa_sp800_56b_generate_key(key, sz, NULL, NULL))
-          && TEST_true(ossl_rsa_sp800_56b_check_public(key))
-          && TEST_true(ossl_rsa_sp800_56b_check_private(key))
-          && TEST_true(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, sz));
+        && TEST_true(ossl_rsa_sp800_56b_generate_key(key, sz, NULL, NULL))
+        && TEST_true(ossl_rsa_sp800_56b_check_public(key))
+        && TEST_true(ossl_rsa_sp800_56b_check_private(key))
+        && TEST_true(ossl_rsa_sp800_56b_check_keypair(key, NULL, -1, sz));
 
     RSA_free(key);
     return ret;
@@ -507,13 +507,13 @@ static int test_check_private_key(void)
     RSA *key = NULL;
 
     ret = TEST_ptr(key = RSA_new())
-          /* check NULL pointers fail */
-          && TEST_false(ossl_rsa_sp800_56b_check_private(key))
-          /* load private key */
-          && TEST_ptr(n = bn_load_new(cav_n, sizeof(cav_n)))
-          && TEST_ptr(d = bn_load_new(cav_d, sizeof(cav_d)))
-          && TEST_ptr(e = bn_load_new(cav_e, sizeof(cav_e)))
-          && TEST_true(RSA_set0_key(key, n, e, d));
+        /* check NULL pointers fail */
+        && TEST_false(ossl_rsa_sp800_56b_check_private(key))
+        /* load private key */
+        && TEST_ptr(n = bn_load_new(cav_n, sizeof(cav_n)))
+        && TEST_ptr(d = bn_load_new(cav_d, sizeof(cav_d)))
+        && TEST_ptr(e = bn_load_new(cav_e, sizeof(cav_e)))
+        && TEST_true(RSA_set0_key(key, n, e, d));
     if (!ret) {
         BN_free(n);
         BN_free(e);
@@ -522,12 +522,12 @@ static int test_check_private_key(void)
     }
     /* check d is in range */
     ret = TEST_true(ossl_rsa_sp800_56b_check_private(key))
-          /* check d is too low */
-          && TEST_true(BN_set_word(d, 0))
-          && TEST_false(ossl_rsa_sp800_56b_check_private(key))
-          /* check d is too high */
-          && TEST_ptr(BN_copy(d, n))
-          && TEST_false(ossl_rsa_sp800_56b_check_private(key));
+        /* check d is too low */
+        && TEST_true(BN_set_word(d, 0))
+        && TEST_false(ossl_rsa_sp800_56b_check_private(key))
+        /* check d is too high */
+        && TEST_ptr(BN_copy(d, n))
+        && TEST_false(ossl_rsa_sp800_56b_check_private(key));
 end:
     RSA_free(key);
     return ret;
@@ -540,12 +540,12 @@ static int test_check_public_key(void)
     RSA *key = NULL;
 
     ret = TEST_ptr(key = RSA_new())
-          /* check NULL pointers fail */
-          && TEST_false(ossl_rsa_sp800_56b_check_public(key))
-          /* load public key */
-          && TEST_ptr(e = bn_load_new(cav_e, sizeof(cav_e)))
-          && TEST_ptr(n = bn_load_new(cav_n, sizeof(cav_n)))
-          && TEST_true(RSA_set0_key(key, n, e, NULL));
+        /* check NULL pointers fail */
+        && TEST_false(ossl_rsa_sp800_56b_check_public(key))
+        /* load public key */
+        && TEST_ptr(e = bn_load_new(cav_e, sizeof(cav_e)))
+        && TEST_ptr(n = bn_load_new(cav_n, sizeof(cav_n)))
+        && TEST_true(RSA_set0_key(key, n, e, NULL));
     if (!ret) {
         BN_free(e);
         BN_free(n);
@@ -553,21 +553,21 @@ static int test_check_public_key(void)
     }
     /* check public key is valid */
     ret = TEST_true(ossl_rsa_sp800_56b_check_public(key))
-          /* check fail if n is even */
-          && TEST_true(BN_add_word(n, 1))
-          && TEST_false(ossl_rsa_sp800_56b_check_public(key))
-          && TEST_true(BN_sub_word(n, 1))
-          /* check fail if n is wrong number of bits */
-          && TEST_true(BN_lshift1(n, n))
-          && TEST_false(ossl_rsa_sp800_56b_check_public(key))
-          && TEST_true(BN_rshift1(n, n))
-          /* test odd exponent fails */
-          && TEST_true(BN_add_word(e, 1))
-          && TEST_false(ossl_rsa_sp800_56b_check_public(key))
-          && TEST_true(BN_sub_word(e, 1))
-          /* modulus fails composite check */
-          && TEST_true(BN_add_word(n, 2))
-          && TEST_false(ossl_rsa_sp800_56b_check_public(key));
+        /* check fail if n is even */
+        && TEST_true(BN_add_word(n, 1))
+        && TEST_false(ossl_rsa_sp800_56b_check_public(key))
+        && TEST_true(BN_sub_word(n, 1))
+        /* check fail if n is wrong number of bits */
+        && TEST_true(BN_lshift1(n, n))
+        && TEST_false(ossl_rsa_sp800_56b_check_public(key))
+        && TEST_true(BN_rshift1(n, n))
+        /* test odd exponent fails */
+        && TEST_true(BN_add_word(e, 1))
+        && TEST_false(ossl_rsa_sp800_56b_check_public(key))
+        && TEST_true(BN_sub_word(e, 1))
+        /* modulus fails composite check */
+        && TEST_true(BN_add_word(n, 2))
+        && TEST_false(ossl_rsa_sp800_56b_check_public(key));
 end:
     RSA_free(key);
     return ret;
diff --git a/test/rsa_test.c b/test/rsa_test.c
index 2d9f6aa3a3f87..190d49d69ad99 100644
--- a/test/rsa_test.c
+++ b/test/rsa_test.c
@@ -29,189 +29,165 @@
 
 #include <openssl/rsa.h>
 
-#define SetKey \
-    RSA_set0_key(key,                                           \
-                 BN_bin2bn(n, sizeof(n)-1, NULL),               \
-                 BN_bin2bn(e, sizeof(e)-1, NULL),               \
-                 BN_bin2bn(d, sizeof(d)-1, NULL));              \
-    RSA_set0_factors(key,                                       \
-                     BN_bin2bn(p, sizeof(p)-1, NULL),           \
-                     BN_bin2bn(q, sizeof(q)-1, NULL));          \
-    RSA_set0_crt_params(key,                                    \
-                        BN_bin2bn(dmp1, sizeof(dmp1)-1, NULL),  \
-                        BN_bin2bn(dmq1, sizeof(dmq1)-1, NULL),  \
-                        BN_bin2bn(iqmp, sizeof(iqmp)-1, NULL)); \
-    if (c != NULL)                                              \
-        memcpy(c, ctext_ex, sizeof(ctext_ex) - 1);              \
+#define SetKey                                     \
+    RSA_set0_key(key,                              \
+        BN_bin2bn(n, sizeof(n) - 1, NULL),         \
+        BN_bin2bn(e, sizeof(e) - 1, NULL),         \
+        BN_bin2bn(d, sizeof(d) - 1, NULL));        \
+    RSA_set0_factors(key,                          \
+        BN_bin2bn(p, sizeof(p) - 1, NULL),         \
+        BN_bin2bn(q, sizeof(q) - 1, NULL));        \
+    RSA_set0_crt_params(key,                       \
+        BN_bin2bn(dmp1, sizeof(dmp1) - 1, NULL),   \
+        BN_bin2bn(dmq1, sizeof(dmq1) - 1, NULL),   \
+        BN_bin2bn(iqmp, sizeof(iqmp) - 1, NULL));  \
+    if (c != NULL)                                 \
+        memcpy(c, ctext_ex, sizeof(ctext_ex) - 1); \
     return sizeof(ctext_ex) - 1;
 
 static int key1(RSA *key, unsigned char *c)
 {
-    static unsigned char n[] =
-        "\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F"
-        "\x90\xEF\xA0\x0D\xF3\x77\x4A\x25\x9F\x2E\x62\xB4\xC5\xD9\x9C\xB5"
-        "\xAD\xB3\x00\xA0\x28\x5E\x53\x01\x93\x0E\x0C\x70\xFB\x68\x76\x93"
-        "\x9C\xE6\x16\xCE\x62\x4A\x11\xE0\x08\x6D\x34\x1E\xBC\xAC\xA0\xA1"
-        "\xF5";
+    static unsigned char n[] = "\x00\xAA\x36\xAB\xCE\x88\xAC\xFD\xFF\x55\x52\x3C\x7F\xC4\x52\x3F"
+                               "\x90\xEF\xA0\x0D\xF3\x77\x4A\x25\x9F\x2E\x62\xB4\xC5\xD9\x9C\xB5"
+                               "\xAD\xB3\x00\xA0\x28\x5E\x53\x01\x93\x0E\x0C\x70\xFB\x68\x76\x93"
+                               "\x9C\xE6\x16\xCE\x62\x4A\x11\xE0\x08\x6D\x34\x1E\xBC\xAC\xA0\xA1"
+                               "\xF5";
 
     static unsigned char e[] = "\x11";
 
-    static unsigned char d[] =
-        "\x0A\x03\x37\x48\x62\x64\x87\x69\x5F\x5F\x30\xBC\x38\xB9\x8B\x44"
-        "\xC2\xCD\x2D\xFF\x43\x40\x98\xCD\x20\xD8\xA1\x38\xD0\x90\xBF\x64"
-        "\x79\x7C\x3F\xA7\xA2\xCD\xCB\x3C\xD1\xE0\xBD\xBA\x26\x54\xB4\xF9"
-        "\xDF\x8E\x8A\xE5\x9D\x73\x3D\x9F\x33\xB3\x01\x62\x4A\xFD\x1D\x51";
-
-    static unsigned char p[] =
-        "\x00\xD8\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
-        "\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x12"
-        "\x0D";
-
-    static unsigned char q[] =
-        "\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-        "\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
-        "\x89";
-
-    static unsigned char dmp1[] =
-        "\x59\x0B\x95\x72\xA2\xC2\xA9\xC4\x06\x05\x9D\xC2\xAB\x2F\x1D\xAF"
-        "\xEB\x7E\x8B\x4F\x10\xA7\x54\x9E\x8E\xED\xF5\xB4\xFC\xE0\x9E\x05";
-
-    static unsigned char dmq1[] =
-        "\x00\x8E\x3C\x05\x21\xFE\x15\xE0\xEA\x06\xA3\x6F\xF0\xF1\x0C\x99"
-        "\x52\xC3\x5B\x7A\x75\x14\xFD\x32\x38\xB8\x0A\xAD\x52\x98\x62\x8D"
-        "\x51";
-
-    static unsigned char iqmp[] =
-        "\x36\x3F\xF7\x18\x9D\xA8\xE9\x0B\x1D\x34\x1F\x71\xD0\x9B\x76\xA8"
-        "\xA9\x43\xE1\x1D\x10\xB2\x4D\x24\x9F\x2D\xEA\xFE\xF8\x0C\x18\x26";
-
-    static unsigned char ctext_ex[] =
-        "\x1b\x8f\x05\xf9\xca\x1a\x79\x52\x6e\x53\xf3\xcc\x51\x4f\xdb\x89"
-        "\x2b\xfb\x91\x93\x23\x1e\x78\xb9\x92\xe6\x8d\x50\xa4\x80\xcb\x52"
-        "\x33\x89\x5c\x74\x95\x8d\x5d\x02\xab\x8c\x0f\xd0\x40\xeb\x58\x44"
-        "\xb0\x05\xc3\x9e\xd8\x27\x4a\x9d\xbf\xa8\x06\x71\x40\x94\x39\xd2";
+    static unsigned char d[] = "\x0A\x03\x37\x48\x62\x64\x87\x69\x5F\x5F\x30\xBC\x38\xB9\x8B\x44"
+                               "\xC2\xCD\x2D\xFF\x43\x40\x98\xCD\x20\xD8\xA1\x38\xD0\x90\xBF\x64"
+                               "\x79\x7C\x3F\xA7\xA2\xCD\xCB\x3C\xD1\xE0\xBD\xBA\x26\x54\xB4\xF9"
+                               "\xDF\x8E\x8A\xE5\x9D\x73\x3D\x9F\x33\xB3\x01\x62\x4A\xFD\x1D\x51";
+
+    static unsigned char p[] = "\x00\xD8\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
+                               "\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x12"
+                               "\x0D";
+
+    static unsigned char q[] = "\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
+                               "\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
+                               "\x89";
+
+    static unsigned char dmp1[] = "\x59\x0B\x95\x72\xA2\xC2\xA9\xC4\x06\x05\x9D\xC2\xAB\x2F\x1D\xAF"
+                                  "\xEB\x7E\x8B\x4F\x10\xA7\x54\x9E\x8E\xED\xF5\xB4\xFC\xE0\x9E\x05";
+
+    static unsigned char dmq1[] = "\x00\x8E\x3C\x05\x21\xFE\x15\xE0\xEA\x06\xA3\x6F\xF0\xF1\x0C\x99"
+                                  "\x52\xC3\x5B\x7A\x75\x14\xFD\x32\x38\xB8\x0A\xAD\x52\x98\x62\x8D"
+                                  "\x51";
+
+    static unsigned char iqmp[] = "\x36\x3F\xF7\x18\x9D\xA8\xE9\x0B\x1D\x34\x1F\x71\xD0\x9B\x76\xA8"
+                                  "\xA9\x43\xE1\x1D\x10\xB2\x4D\x24\x9F\x2D\xEA\xFE\xF8\x0C\x18\x26";
+
+    static unsigned char ctext_ex[] = "\x1b\x8f\x05\xf9\xca\x1a\x79\x52\x6e\x53\xf3\xcc\x51\x4f\xdb\x89"
+                                      "\x2b\xfb\x91\x93\x23\x1e\x78\xb9\x92\xe6\x8d\x50\xa4\x80\xcb\x52"
+                                      "\x33\x89\x5c\x74\x95\x8d\x5d\x02\xab\x8c\x0f\xd0\x40\xeb\x58\x44"
+                                      "\xb0\x05\xc3\x9e\xd8\x27\x4a\x9d\xbf\xa8\x06\x71\x40\x94\x39\xd2";
 
     SetKey;
 }
 
 static int key2(RSA *key, unsigned char *c)
 {
-    static unsigned char n[] =
-        "\x00\xA3\x07\x9A\x90\xDF\x0D\xFD\x72\xAC\x09\x0C\xCC\x2A\x78\xB8"
-        "\x74\x13\x13\x3E\x40\x75\x9C\x98\xFA\xF8\x20\x4F\x35\x8A\x0B\x26"
-        "\x3C\x67\x70\xE7\x83\xA9\x3B\x69\x71\xB7\x37\x79\xD2\x71\x7B\xE8"
-        "\x34\x77\xCF";
+    static unsigned char n[] = "\x00\xA3\x07\x9A\x90\xDF\x0D\xFD\x72\xAC\x09\x0C\xCC\x2A\x78\xB8"
+                               "\x74\x13\x13\x3E\x40\x75\x9C\x98\xFA\xF8\x20\x4F\x35\x8A\x0B\x26"
+                               "\x3C\x67\x70\xE7\x83\xA9\x3B\x69\x71\xB7\x37\x79\xD2\x71\x7B\xE8"
+                               "\x34\x77\xCF";
 
     static unsigned char e[] = "\x3";
 
-    static unsigned char d[] =
-        "\x6C\xAF\xBC\x60\x94\xB3\xFE\x4C\x72\xB0\xB3\x32\xC6\xFB\x25\xA2"
-        "\xB7\x62\x29\x80\x4E\x68\x65\xFC\xA4\x5A\x74\xDF\x0F\x8F\xB8\x41"
-        "\x3B\x52\xC0\xD0\xE5\x3D\x9B\x59\x0F\xF1\x9B\xE7\x9F\x49\xDD\x21"
-        "\xE5\xEB";
+    static unsigned char d[] = "\x6C\xAF\xBC\x60\x94\xB3\xFE\x4C\x72\xB0\xB3\x32\xC6\xFB\x25\xA2"
+                               "\xB7\x62\x29\x80\x4E\x68\x65\xFC\xA4\x5A\x74\xDF\x0F\x8F\xB8\x41"
+                               "\x3B\x52\xC0\xD0\xE5\x3D\x9B\x59\x0F\xF1\x9B\xE7\x9F\x49\xDD\x21"
+                               "\xE5\xEB";
 
-    static unsigned char p[] =
-        "\x00\xCF\x20\x35\x02\x8B\x9D\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92"
-        "\xEA\x0D\xA3\xB4\x32\x04\xB5\xCF\xCE\x91";
+    static unsigned char p[] = "\x00\xCF\x20\x35\x02\x8B\x9D\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92"
+                               "\xEA\x0D\xA3\xB4\x32\x04\xB5\xCF\xCE\x91";
 
-    static unsigned char q[] =
-        "\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-        "\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5F";
+    static unsigned char q[] = "\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
+                               "\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5F";
 
-    static unsigned char dmp1[] =
-        "\x00\x8A\x15\x78\xAC\x5D\x13\xAF\x10\x2B\x22\xB9\x99\xCD\x74\x61"
-        "\xF1\x5E\x6D\x22\xCC\x03\x23\xDF\xDF\x0B";
+    static unsigned char dmp1[] = "\x00\x8A\x15\x78\xAC\x5D\x13\xAF\x10\x2B\x22\xB9\x99\xCD\x74\x61"
+                                  "\xF1\x5E\x6D\x22\xCC\x03\x23\xDF\xDF\x0B";
 
-    static unsigned char dmq1[] =
-        "\x00\x86\x55\x21\x4A\xC5\x4D\x8D\x4E\xCD\x61\x77\xF1\xC7\x36\x90"
-        "\xCE\x2A\x48\x2C\x8B\x05\x99\xCB\xE0\x3F";
+    static unsigned char dmq1[] = "\x00\x86\x55\x21\x4A\xC5\x4D\x8D\x4E\xCD\x61\x77\xF1\xC7\x36\x90"
+                                  "\xCE\x2A\x48\x2C\x8B\x05\x99\xCB\xE0\x3F";
 
-    static unsigned char iqmp[] =
-        "\x00\x83\xEF\xEF\xB8\xA9\xA4\x0D\x1D\xB6\xED\x98\xAD\x84\xED\x13"
-        "\x35\xDC\xC1\x08\xF3\x22\xD0\x57\xCF\x8D";
+    static unsigned char iqmp[] = "\x00\x83\xEF\xEF\xB8\xA9\xA4\x0D\x1D\xB6\xED\x98\xAD\x84\xED\x13"
+                                  "\x35\xDC\xC1\x08\xF3\x22\xD0\x57\xCF\x8D";
 
-    static unsigned char ctext_ex[] =
-        "\x14\xbd\xdd\x28\xc9\x83\x35\x19\x23\x80\xe8\xe5\x49\xb1\x58\x2a"
-        "\x8b\x40\xb4\x48\x6d\x03\xa6\xa5\x31\x1f\x1f\xd5\xf0\xa1\x80\xe4"
-        "\x17\x53\x03\x29\xa9\x34\x90\x74\xb1\x52\x13\x54\x29\x08\x24\x52"
-        "\x62\x51";
+    static unsigned char ctext_ex[] = "\x14\xbd\xdd\x28\xc9\x83\x35\x19\x23\x80\xe8\xe5\x49\xb1\x58\x2a"
+                                      "\x8b\x40\xb4\x48\x6d\x03\xa6\xa5\x31\x1f\x1f\xd5\xf0\xa1\x80\xe4"
+                                      "\x17\x53\x03\x29\xa9\x34\x90\x74\xb1\x52\x13\x54\x29\x08\x24\x52"
+                                      "\x62\x51";
 
     SetKey;
 }
 
 static int key3(RSA *key, unsigned char *c)
 {
-    static unsigned char n[] =
-        "\x00\xBB\xF8\x2F\x09\x06\x82\xCE\x9C\x23\x38\xAC\x2B\x9D\xA8\x71"
-        "\xF7\x36\x8D\x07\xEE\xD4\x10\x43\xA4\x40\xD6\xB6\xF0\x74\x54\xF5"
-        "\x1F\xB8\xDF\xBA\xAF\x03\x5C\x02\xAB\x61\xEA\x48\xCE\xEB\x6F\xCD"
-        "\x48\x76\xED\x52\x0D\x60\xE1\xEC\x46\x19\x71\x9D\x8A\x5B\x8B\x80"
-        "\x7F\xAF\xB8\xE0\xA3\xDF\xC7\x37\x72\x3E\xE6\xB4\xB7\xD9\x3A\x25"
-        "\x84\xEE\x6A\x64\x9D\x06\x09\x53\x74\x88\x34\xB2\x45\x45\x98\x39"
-        "\x4E\xE0\xAA\xB1\x2D\x7B\x61\xA5\x1F\x52\x7A\x9A\x41\xF6\xC1\x68"
-        "\x7F\xE2\x53\x72\x98\xCA\x2A\x8F\x59\x46\xF8\xE5\xFD\x09\x1D\xBD"
-        "\xCB";
+    static unsigned char n[] = "\x00\xBB\xF8\x2F\x09\x06\x82\xCE\x9C\x23\x38\xAC\x2B\x9D\xA8\x71"
+                               "\xF7\x36\x8D\x07\xEE\xD4\x10\x43\xA4\x40\xD6\xB6\xF0\x74\x54\xF5"
+                               "\x1F\xB8\xDF\xBA\xAF\x03\x5C\x02\xAB\x61\xEA\x48\xCE\xEB\x6F\xCD"
+                               "\x48\x76\xED\x52\x0D\x60\xE1\xEC\x46\x19\x71\x9D\x8A\x5B\x8B\x80"
+                               "\x7F\xAF\xB8\xE0\xA3\xDF\xC7\x37\x72\x3E\xE6\xB4\xB7\xD9\x3A\x25"
+                               "\x84\xEE\x6A\x64\x9D\x06\x09\x53\x74\x88\x34\xB2\x45\x45\x98\x39"
+                               "\x4E\xE0\xAA\xB1\x2D\x7B\x61\xA5\x1F\x52\x7A\x9A\x41\xF6\xC1\x68"
+                               "\x7F\xE2\x53\x72\x98\xCA\x2A\x8F\x59\x46\xF8\xE5\xFD\x09\x1D\xBD"
+                               "\xCB";
 
     static unsigned char e[] = "\x11";
 
-    static unsigned char d[] =
-        "\x00\xA5\xDA\xFC\x53\x41\xFA\xF2\x89\xC4\xB9\x88\xDB\x30\xC1\xCD"
-        "\xF8\x3F\x31\x25\x1E\x06\x68\xB4\x27\x84\x81\x38\x01\x57\x96\x41"
-        "\xB2\x94\x10\xB3\xC7\x99\x8D\x6B\xC4\x65\x74\x5E\x5C\x39\x26\x69"
-        "\xD6\x87\x0D\xA2\xC0\x82\xA9\x39\xE3\x7F\xDC\xB8\x2E\xC9\x3E\xDA"
-        "\xC9\x7F\xF3\xAD\x59\x50\xAC\xCF\xBC\x11\x1C\x76\xF1\xA9\x52\x94"
-        "\x44\xE5\x6A\xAF\x68\xC5\x6C\x09\x2C\xD3\x8D\xC3\xBE\xF5\xD2\x0A"
-        "\x93\x99\x26\xED\x4F\x74\xA1\x3E\xDD\xFB\xE1\xA1\xCE\xCC\x48\x94"
-        "\xAF\x94\x28\xC2\xB7\xB8\x88\x3F\xE4\x46\x3A\x4B\xC8\x5B\x1C\xB3"
-        "\xC1";
-
-    static unsigned char p[] =
-        "\x00\xEE\xCF\xAE\x81\xB1\xB9\xB3\xC9\x08\x81\x0B\x10\xA1\xB5\x60"
-        "\x01\x99\xEB\x9F\x44\xAE\xF4\xFD\xA4\x93\xB8\x1A\x9E\x3D\x84\xF6"
-        "\x32\x12\x4E\xF0\x23\x6E\x5D\x1E\x3B\x7E\x28\xFA\xE7\xAA\x04\x0A"
-        "\x2D\x5B\x25\x21\x76\x45\x9D\x1F\x39\x75\x41\xBA\x2A\x58\xFB\x65"
-        "\x99";
-
-    static unsigned char q[] =
-        "\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-        "\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
-        "\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
-        "\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x15"
-        "\x03";
-
-    static unsigned char dmp1[] =
-        "\x54\x49\x4C\xA6\x3E\xBA\x03\x37\xE4\xE2\x40\x23\xFC\xD6\x9A\x5A"
-        "\xEB\x07\xDD\xDC\x01\x83\xA4\xD0\xAC\x9B\x54\xB0\x51\xF2\xB1\x3E"
-        "\xD9\x49\x09\x75\xEA\xB7\x74\x14\xFF\x59\xC1\xF7\x69\x2E\x9A\x2E"
-        "\x20\x2B\x38\xFC\x91\x0A\x47\x41\x74\xAD\xC9\x3C\x1F\x67\xC9\x81";
-
-    static unsigned char dmq1[] =
-        "\x47\x1E\x02\x90\xFF\x0A\xF0\x75\x03\x51\xB7\xF8\x78\x86\x4C\xA9"
-        "\x61\xAD\xBD\x3A\x8A\x7E\x99\x1C\x5C\x05\x56\xA9\x4C\x31\x46\xA7"
-        "\xF9\x80\x3F\x8F\x6F\x8A\xE3\x42\xE9\x31\xFD\x8A\xE4\x7A\x22\x0D"
-        "\x1B\x99\xA4\x95\x84\x98\x07\xFE\x39\xF9\x24\x5A\x98\x36\xDA\x3D";
-
-    static unsigned char iqmp[] =
-        "\x00\xB0\x6C\x4F\xDA\xBB\x63\x01\x19\x8D\x26\x5B\xDB\xAE\x94\x23"
-        "\xB3\x80\xF2\x71\xF7\x34\x53\x88\x50\x93\x07\x7F\xCD\x39\xE2\x11"
-        "\x9F\xC9\x86\x32\x15\x4F\x58\x83\xB1\x67\xA9\x67\xBF\x40\x2B\x4E"
-        "\x9E\x2E\x0F\x96\x56\xE6\x98\xEA\x36\x66\xED\xFB\x25\x79\x80\x39"
-        "\xF7";
-
-    static unsigned char ctext_ex[] =
-        "\xb8\x24\x6b\x56\xa6\xed\x58\x81\xae\xb5\x85\xd9\xa2\x5b\x2a\xd7"
-        "\x90\xc4\x17\xe0\x80\x68\x1b\xf1\xac\x2b\xc3\xde\xb6\x9d\x8b\xce"
-        "\xf0\xc4\x36\x6f\xec\x40\x0a\xf0\x52\xa7\x2e\x9b\x0e\xff\xb5\xb3"
-        "\xf2\xf1\x92\xdb\xea\xca\x03\xc1\x27\x40\x05\x71\x13\xbf\x1f\x06"
-        "\x69\xac\x22\xe9\xf3\xa7\x85\x2e\x3c\x15\xd9\x13\xca\xb0\xb8\x86"
-        "\x3a\x95\xc9\x92\x94\xce\x86\x74\x21\x49\x54\x61\x03\x46\xf4\xd4"
-        "\x74\xb2\x6f\x7c\x48\xb4\x2e\xe6\x8e\x1f\x57\x2a\x1f\xc4\x02\x6a"
-        "\xc4\x56\xb4\xf5\x9f\x7b\x62\x1e\xa1\xb9\xd8\x8f\x64\x20\x2f\xb1";
+    static unsigned char d[] = "\x00\xA5\xDA\xFC\x53\x41\xFA\xF2\x89\xC4\xB9\x88\xDB\x30\xC1\xCD"
+                               "\xF8\x3F\x31\x25\x1E\x06\x68\xB4\x27\x84\x81\x38\x01\x57\x96\x41"
+                               "\xB2\x94\x10\xB3\xC7\x99\x8D\x6B\xC4\x65\x74\x5E\x5C\x39\x26\x69"
+                               "\xD6\x87\x0D\xA2\xC0\x82\xA9\x39\xE3\x7F\xDC\xB8\x2E\xC9\x3E\xDA"
+                               "\xC9\x7F\xF3\xAD\x59\x50\xAC\xCF\xBC\x11\x1C\x76\xF1\xA9\x52\x94"
+                               "\x44\xE5\x6A\xAF\x68\xC5\x6C\x09\x2C\xD3\x8D\xC3\xBE\xF5\xD2\x0A"
+                               "\x93\x99\x26\xED\x4F\x74\xA1\x3E\xDD\xFB\xE1\xA1\xCE\xCC\x48\x94"
+                               "\xAF\x94\x28\xC2\xB7\xB8\x88\x3F\xE4\x46\x3A\x4B\xC8\x5B\x1C\xB3"
+                               "\xC1";
+
+    static unsigned char p[] = "\x00\xEE\xCF\xAE\x81\xB1\xB9\xB3\xC9\x08\x81\x0B\x10\xA1\xB5\x60"
+                               "\x01\x99\xEB\x9F\x44\xAE\xF4\xFD\xA4\x93\xB8\x1A\x9E\x3D\x84\xF6"
+                               "\x32\x12\x4E\xF0\x23\x6E\x5D\x1E\x3B\x7E\x28\xFA\xE7\xAA\x04\x0A"
+                               "\x2D\x5B\x25\x21\x76\x45\x9D\x1F\x39\x75\x41\xBA\x2A\x58\xFB\x65"
+                               "\x99";
+
+    static unsigned char q[] = "\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
+                               "\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
+                               "\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
+                               "\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x15"
+                               "\x03";
+
+    static unsigned char dmp1[] = "\x54\x49\x4C\xA6\x3E\xBA\x03\x37\xE4\xE2\x40\x23\xFC\xD6\x9A\x5A"
+                                  "\xEB\x07\xDD\xDC\x01\x83\xA4\xD0\xAC\x9B\x54\xB0\x51\xF2\xB1\x3E"
+                                  "\xD9\x49\x09\x75\xEA\xB7\x74\x14\xFF\x59\xC1\xF7\x69\x2E\x9A\x2E"
+                                  "\x20\x2B\x38\xFC\x91\x0A\x47\x41\x74\xAD\xC9\x3C\x1F\x67\xC9\x81";
+
+    static unsigned char dmq1[] = "\x47\x1E\x02\x90\xFF\x0A\xF0\x75\x03\x51\xB7\xF8\x78\x86\x4C\xA9"
+                                  "\x61\xAD\xBD\x3A\x8A\x7E\x99\x1C\x5C\x05\x56\xA9\x4C\x31\x46\xA7"
+                                  "\xF9\x80\x3F\x8F\x6F\x8A\xE3\x42\xE9\x31\xFD\x8A\xE4\x7A\x22\x0D"
+                                  "\x1B\x99\xA4\x95\x84\x98\x07\xFE\x39\xF9\x24\x5A\x98\x36\xDA\x3D";
+
+    static unsigned char iqmp[] = "\x00\xB0\x6C\x4F\xDA\xBB\x63\x01\x19\x8D\x26\x5B\xDB\xAE\x94\x23"
+                                  "\xB3\x80\xF2\x71\xF7\x34\x53\x88\x50\x93\x07\x7F\xCD\x39\xE2\x11"
+                                  "\x9F\xC9\x86\x32\x15\x4F\x58\x83\xB1\x67\xA9\x67\xBF\x40\x2B\x4E"
+                                  "\x9E\x2E\x0F\x96\x56\xE6\x98\xEA\x36\x66\xED\xFB\x25\x79\x80\x39"
+                                  "\xF7";
+
+    static unsigned char ctext_ex[] = "\xb8\x24\x6b\x56\xa6\xed\x58\x81\xae\xb5\x85\xd9\xa2\x5b\x2a\xd7"
+                                      "\x90\xc4\x17\xe0\x80\x68\x1b\xf1\xac\x2b\xc3\xde\xb6\x9d\x8b\xce"
+                                      "\xf0\xc4\x36\x6f\xec\x40\x0a\xf0\x52\xa7\x2e\x9b\x0e\xff\xb5\xb3"
+                                      "\xf2\xf1\x92\xdb\xea\xca\x03\xc1\x27\x40\x05\x71\x13\xbf\x1f\x06"
+                                      "\x69\xac\x22\xe9\xf3\xa7\x85\x2e\x3c\x15\xd9\x13\xca\xb0\xb8\x86"
+                                      "\x3a\x95\xc9\x92\x94\xce\x86\x74\x21\x49\x54\x61\x03\x46\xf4\xd4"
+                                      "\x74\xb2\x6f\x7c\x48\xb4\x2e\xe6\x8e\x1f\x57\x2a\x1f\xc4\x02\x6a"
+                                      "\xc4\x56\xb4\xf5\x9f\x7b\x62\x1e\xa1\xb9\xd8\x8f\x64\x20\x2f\xb1";
 
     SetKey;
 }
 
-static int rsa_setkey(RSA** key, unsigned char *ctext, int idx)
+static int rsa_setkey(RSA **key, unsigned char *ctext, int idx)
 {
     int clen = 0;
 
@@ -232,8 +208,8 @@ static int rsa_setkey(RSA** key, unsigned char *ctext, int idx)
 }
 
 static int test_rsa_simple(int idx, int en_pad_type, int de_pad_type,
-                           int success, unsigned char *ctext_ex, int *clen,
-                           RSA **retkey)
+    int success, unsigned char *ctext_ex, int *clen,
+    RSA **retkey)
 {
     int ret = 0;
     RSA *key;
@@ -275,7 +251,7 @@ static int test_rsa_simple(int idx, int en_pad_type, int de_pad_type,
 static int test_rsa_pkcs1(int idx)
 {
     return test_rsa_simple(idx, RSA_PKCS1_PADDING, RSA_PKCS1_PADDING, 1, NULL,
-                           NULL, NULL);
+        NULL, NULL);
 }
 
 static int test_rsa_oaep(int idx)
@@ -291,14 +267,14 @@ static int test_rsa_oaep(int idx)
     int n;
 
     if (!test_rsa_simple(idx, RSA_PKCS1_OAEP_PADDING, RSA_PKCS1_OAEP_PADDING, 1,
-                         ctext_ex, &clen, &key))
+            ctext_ex, &clen, &key))
         goto err;
 
     plen = sizeof(ptext_ex) - 1;
 
     /* Different ciphertexts. Try decrypting ctext_ex */
     num = RSA_private_decrypt(clen, ctext_ex, ptext, key,
-                              RSA_PKCS1_OAEP_PADDING);
+        RSA_PKCS1_OAEP_PADDING);
     if (num <= 0 || !TEST_mem_eq(ptext, num, ptext_ex, plen))
         goto err;
 
@@ -306,7 +282,7 @@ static int test_rsa_oaep(int idx)
     for (n = 0; n < clen; ++n) {
         ctext_ex[n] ^= 1;
         num = RSA_private_decrypt(clen, ctext_ex, ptext, key,
-                                      RSA_PKCS1_OAEP_PADDING);
+            RSA_PKCS1_OAEP_PADDING);
         if (!TEST_int_le(num, 0))
             goto err;
         ctext_ex[n] ^= 1;
@@ -315,7 +291,7 @@ static int test_rsa_oaep(int idx)
     /* Test truncated ciphertexts, as well as negative length. */
     for (n = -1; n < clen; ++n) {
         num = RSA_private_decrypt(n, ctext_ex, ptext, key,
-                                  RSA_PKCS1_OAEP_PADDING);
+            RSA_PKCS1_OAEP_PADDING);
         if (!TEST_int_le(num, 0))
             goto err;
     }
@@ -331,27 +307,27 @@ static const struct {
     unsigned int r;
 } rsa_security_bits_cases[] = {
     /* NIST SP 800-56B rev 2 (draft) Appendix D Table 5 */
-    { 2048,     112 },
-    { 3072,     128 },
-    { 4096,     152 },
-    { 6144,     176 },
-    { 8192,     200 },
+    { 2048, 112 },
+    { 3072, 128 },
+    { 4096, 152 },
+    { 6144, 176 },
+    { 8192, 200 },
     /* NIST FIPS 140-2 IG 7.5 */
-    { 7680,     192 },
-    { 15360,    256 },
+    { 7680, 192 },
+    { 15360, 256 },
     /* Older values */
-    { 256,      40  },
-    { 512,      56  },
-    { 1024,     80  },
+    { 256, 40 },
+    { 512, 56 },
+    { 1024, 80 },
     /* Some other values */
-    { 8888,     208 },
-    { 2468,     120 },
-    { 13456,    248 },
+    { 8888, 208 },
+    { 2468, 120 },
+    { 13456, 248 },
     /* Edge points */
-    { 15359,    256 },
-    { 15361,    264 },
-    { 7679,     192 },
-    { 7681,     200 },
+    { 15359, 256 },
+    { 15361, 264 },
+    { 7679, 192 },
+    { 7681, 200 },
 };
 
 static int test_rsa_security_bit(int n)
@@ -383,8 +359,8 @@ static int test_rsa_security_bit(int n)
      * RSA key is not used.  The 'd' parameter can be NULL safely.
      */
     if (TEST_true(RSA_set0_key(key, BN_bin2bn(num, bytes, NULL),
-                               BN_bin2bn(num, bytes, NULL), NULL))
-            && TEST_uint_eq(RSA_security_bits(key), result))
+            BN_bin2bn(num, bytes, NULL), NULL))
+        && TEST_uint_eq(RSA_security_bits(key), result))
         r = 1;
 err:
     RSA_free(key);
@@ -409,97 +385,101 @@ static int test_EVP_rsa_legacy_key(void)
     EVP_PKEY *pkey = NULL;
 
     unsigned char n_data[] = {
-    0x00, 0xc7, 0x28, 0x7a, 0x28, 0x91, 0x51, 0xa5, 0xe8, 0x3c, 0x45, 0xcf,
-    0x1d, 0xa9, 0x69, 0x7a, 0x0d, 0xdb, 0xdd, 0x8f, 0xe2, 0xde, 0x85, 0xdd,
-    0x85, 0x6d, 0x8f, 0x78, 0x20, 0xd6, 0xe, 0xe5, 0x06, 0xcb, 0x9c, 0xd6,
-    0xd3, 0xca, 0xef, 0x1d, 0x80, 0xd3, 0x18, 0x23, 0x91, 0x5c, 0xe5, 0xc8,
-    0x44, 0x37, 0x56, 0x1b, 0x68, 0x7f, 0x08, 0xa3, 0x1c, 0xf6, 0xe8, 0x11,
-    0x38, 0x0f, 0x2e, 0xad, 0xb1, 0x89, 0x8b, 0x08, 0xe8, 0x35, 0xaf, 0x3b,
-    0xfe, 0x37, 0x8d, 0x21, 0xd5, 0x3f, 0x1f, 0x4b, 0x01, 0x30, 0xd8, 0xd0,
-    0x24, 0xf7, 0xab, 0x57, 0xad, 0xac, 0xbc, 0x53, 0x6d, 0x84, 0x8e, 0xa1,
-    0xb2, 0x5b, 0x8e, 0xe7, 0xb3, 0xac, 0xfc, 0x60, 0x22, 0x10, 0x1e, 0x99,
-    0xfa, 0xa0, 0x60, 0x00, 0x69, 0x5f, 0x8e, 0xca, 0x6d, 0x9c, 0xee, 0x5e,
-    0x84, 0x4e, 0x53, 0x83, 0x42, 0x76, 0x4d, 0xb8, 0xc1, 0xeb, 0x4e, 0x3d,
-    0xc3, 0xce, 0xac, 0x79, 0xbb, 0x29, 0x5d, 0x92, 0x33, 0x6e, 0xcf, 0x8f,
-    0x5a, 0xf0, 0xb3, 0xb5, 0xdc, 0xd5, 0xa3, 0xaf, 0x40, 0x4b, 0x0f, 0x05,
-    0xac, 0x46, 0x53, 0x2d, 0x5f, 0x20, 0x96, 0x42, 0xa8, 0x47, 0x61, 0x54,
-    0x05, 0x2c, 0x8a, 0x26, 0x5d, 0x92, 0x1d, 0x01, 0x2a, 0x27, 0x8a, 0xfc,
-    0x64, 0x24, 0x5c, 0x34, 0xde, 0x92, 0xc6, 0x82, 0xea, 0x4d, 0xe2, 0x52,
-    0xe5, 0xad, 0x62, 0x00, 0xc6, 0xc8, 0xe9, 0x0c, 0x22, 0xf0, 0x9e, 0xbe,
-    0xdc, 0x51, 0x58, 0xad, 0x3b, 0xba, 0x2e, 0x45, 0x65, 0xcc, 0x5b, 0x55,
-    0x46, 0x67, 0x18, 0x4a, 0x80, 0x67, 0x5b, 0x84, 0x7f, 0x13, 0x37, 0x45,
-    0xd8, 0x03, 0xc6, 0x22, 0xc3, 0x4a, 0x46, 0x6b, 0xde, 0x50, 0xbf, 0x16,
-    0x0a, 0x23, 0x0b, 0xaa, 0x50, 0x54, 0xf6, 0x20, 0x83, 0x74, 0x33, 0x97,
-    0x2e, 0xf2, 0x8e, 0x7e, 0x13 };
-
-    unsigned char e_data[]  = { 0x01, 0x00, 0x01 };
+        0x00, 0xc7, 0x28, 0x7a, 0x28, 0x91, 0x51, 0xa5, 0xe8, 0x3c, 0x45, 0xcf,
+        0x1d, 0xa9, 0x69, 0x7a, 0x0d, 0xdb, 0xdd, 0x8f, 0xe2, 0xde, 0x85, 0xdd,
+        0x85, 0x6d, 0x8f, 0x78, 0x20, 0xd6, 0xe, 0xe5, 0x06, 0xcb, 0x9c, 0xd6,
+        0xd3, 0xca, 0xef, 0x1d, 0x80, 0xd3, 0x18, 0x23, 0x91, 0x5c, 0xe5, 0xc8,
+        0x44, 0x37, 0x56, 0x1b, 0x68, 0x7f, 0x08, 0xa3, 0x1c, 0xf6, 0xe8, 0x11,
+        0x38, 0x0f, 0x2e, 0xad, 0xb1, 0x89, 0x8b, 0x08, 0xe8, 0x35, 0xaf, 0x3b,
+        0xfe, 0x37, 0x8d, 0x21, 0xd5, 0x3f, 0x1f, 0x4b, 0x01, 0x30, 0xd8, 0xd0,
+        0x24, 0xf7, 0xab, 0x57, 0xad, 0xac, 0xbc, 0x53, 0x6d, 0x84, 0x8e, 0xa1,
+        0xb2, 0x5b, 0x8e, 0xe7, 0xb3, 0xac, 0xfc, 0x60, 0x22, 0x10, 0x1e, 0x99,
+        0xfa, 0xa0, 0x60, 0x00, 0x69, 0x5f, 0x8e, 0xca, 0x6d, 0x9c, 0xee, 0x5e,
+        0x84, 0x4e, 0x53, 0x83, 0x42, 0x76, 0x4d, 0xb8, 0xc1, 0xeb, 0x4e, 0x3d,
+        0xc3, 0xce, 0xac, 0x79, 0xbb, 0x29, 0x5d, 0x92, 0x33, 0x6e, 0xcf, 0x8f,
+        0x5a, 0xf0, 0xb3, 0xb5, 0xdc, 0xd5, 0xa3, 0xaf, 0x40, 0x4b, 0x0f, 0x05,
+        0xac, 0x46, 0x53, 0x2d, 0x5f, 0x20, 0x96, 0x42, 0xa8, 0x47, 0x61, 0x54,
+        0x05, 0x2c, 0x8a, 0x26, 0x5d, 0x92, 0x1d, 0x01, 0x2a, 0x27, 0x8a, 0xfc,
+        0x64, 0x24, 0x5c, 0x34, 0xde, 0x92, 0xc6, 0x82, 0xea, 0x4d, 0xe2, 0x52,
+        0xe5, 0xad, 0x62, 0x00, 0xc6, 0xc8, 0xe9, 0x0c, 0x22, 0xf0, 0x9e, 0xbe,
+        0xdc, 0x51, 0x58, 0xad, 0x3b, 0xba, 0x2e, 0x45, 0x65, 0xcc, 0x5b, 0x55,
+        0x46, 0x67, 0x18, 0x4a, 0x80, 0x67, 0x5b, 0x84, 0x7f, 0x13, 0x37, 0x45,
+        0xd8, 0x03, 0xc6, 0x22, 0xc3, 0x4a, 0x46, 0x6b, 0xde, 0x50, 0xbf, 0x16,
+        0x0a, 0x23, 0x0b, 0xaa, 0x50, 0x54, 0xf6, 0x20, 0x83, 0x74, 0x33, 0x97,
+        0x2e, 0xf2, 0x8e, 0x7e, 0x13
+    };
+
+    unsigned char e_data[] = { 0x01, 0x00, 0x01 };
 
     unsigned char d_data[] = {
-    0x09, 0x2d, 0xcb, 0xe7, 0x87, 0xbf, 0x10, 0x1a, 0xf2, 0x80, 0x33, 0x2a,
-    0x06, 0x4f, 0x56, 0xb1, 0x41, 0xd3, 0x65, 0xd8, 0xca, 0x71, 0xb8, 0x02,
-    0x78, 0xc8, 0xb6, 0x7c, 0x28, 0xf4, 0x6c, 0xe8, 0xd1, 0xc4, 0x92, 0x40,
-    0x23, 0xa7, 0xbe, 0x9f, 0xdb, 0xda, 0xce, 0x74, 0xda, 0x27, 0xbb, 0x01,
-    0xad, 0xdd, 0x39, 0x99, 0x28, 0xd5, 0xb0, 0x92, 0xda, 0xac, 0x5a, 0x72,
-    0xcf, 0x7c, 0x52, 0xc4, 0x0e, 0x77, 0x4a, 0x7b, 0x4d, 0x52, 0x1c, 0xbd,
-    0x3c, 0x39, 0x34, 0x78, 0x7c, 0x16, 0xc8, 0xa1, 0xae, 0xeb, 0x27, 0x38,
-    0xb4, 0xf3, 0x80, 0x30, 0x80, 0x78, 0x13, 0x8e, 0x46, 0x20, 0x3e, 0xc2,
-    0x96, 0x26, 0xb1, 0x76, 0x1e, 0x00, 0x69, 0xbb, 0xd8, 0x2b, 0x58, 0xe4,
-    0x6c, 0xb4, 0xd0, 0x00, 0x0b, 0x47, 0xec, 0xfb, 0x7d, 0x52, 0x9d, 0x27,
-    0x92, 0xe6, 0x95, 0x73, 0xa0, 0x39, 0x37, 0xcd, 0x1f, 0x60, 0x13, 0x1c,
-    0x87, 0x9d, 0xa7, 0x91, 0x90, 0xf9, 0x36, 0xc5, 0xfa, 0x3f, 0xf9, 0x7f,
-    0x50, 0xf8, 0xb3, 0x54, 0x65, 0xff, 0x6f, 0xa6, 0x22, 0xcc, 0x4a, 0x1e,
-    0x49, 0x3f, 0x07, 0xc6, 0xf2, 0x65, 0x73, 0x13, 0x1b, 0x2d, 0xb6, 0x15,
-    0xff, 0xcd, 0x9a, 0x1c, 0xea, 0xef, 0x58, 0x56, 0x91, 0x2d, 0x47, 0x81,
-    0x56, 0x0d, 0xc3, 0xb0, 0x47, 0x58, 0x8d, 0x05, 0x7d, 0x5b, 0xc0, 0x22,
-    0xa4, 0xf0, 0x2e, 0x70, 0x36, 0x01, 0x89, 0xa1, 0x71, 0xed, 0x76, 0xe9,
-    0x8d, 0xf5, 0x49, 0xaf, 0x11, 0xbe, 0xe4, 0xd4, 0x48, 0x92, 0xb6, 0x5b,
-    0xc2, 0x04, 0xd4, 0x0c, 0x5c, 0x8b, 0xe3, 0xfa, 0x29, 0x63, 0x86, 0xb4,
-    0x10, 0xad, 0x32, 0x07, 0x85, 0xe2, 0x43, 0x76, 0x16, 0x90, 0xab, 0xdf,
-    0xb3, 0x36, 0x0a, 0xc4, 0x49, 0x7b, 0x95, 0x48, 0x50, 0x72, 0x8f, 0x7d,
-    0xf4, 0xfa, 0x60, 0xc1 };
+        0x09, 0x2d, 0xcb, 0xe7, 0x87, 0xbf, 0x10, 0x1a, 0xf2, 0x80, 0x33, 0x2a,
+        0x06, 0x4f, 0x56, 0xb1, 0x41, 0xd3, 0x65, 0xd8, 0xca, 0x71, 0xb8, 0x02,
+        0x78, 0xc8, 0xb6, 0x7c, 0x28, 0xf4, 0x6c, 0xe8, 0xd1, 0xc4, 0x92, 0x40,
+        0x23, 0xa7, 0xbe, 0x9f, 0xdb, 0xda, 0xce, 0x74, 0xda, 0x27, 0xbb, 0x01,
+        0xad, 0xdd, 0x39, 0x99, 0x28, 0xd5, 0xb0, 0x92, 0xda, 0xac, 0x5a, 0x72,
+        0xcf, 0x7c, 0x52, 0xc4, 0x0e, 0x77, 0x4a, 0x7b, 0x4d, 0x52, 0x1c, 0xbd,
+        0x3c, 0x39, 0x34, 0x78, 0x7c, 0x16, 0xc8, 0xa1, 0xae, 0xeb, 0x27, 0x38,
+        0xb4, 0xf3, 0x80, 0x30, 0x80, 0x78, 0x13, 0x8e, 0x46, 0x20, 0x3e, 0xc2,
+        0x96, 0x26, 0xb1, 0x76, 0x1e, 0x00, 0x69, 0xbb, 0xd8, 0x2b, 0x58, 0xe4,
+        0x6c, 0xb4, 0xd0, 0x00, 0x0b, 0x47, 0xec, 0xfb, 0x7d, 0x52, 0x9d, 0x27,
+        0x92, 0xe6, 0x95, 0x73, 0xa0, 0x39, 0x37, 0xcd, 0x1f, 0x60, 0x13, 0x1c,
+        0x87, 0x9d, 0xa7, 0x91, 0x90, 0xf9, 0x36, 0xc5, 0xfa, 0x3f, 0xf9, 0x7f,
+        0x50, 0xf8, 0xb3, 0x54, 0x65, 0xff, 0x6f, 0xa6, 0x22, 0xcc, 0x4a, 0x1e,
+        0x49, 0x3f, 0x07, 0xc6, 0xf2, 0x65, 0x73, 0x13, 0x1b, 0x2d, 0xb6, 0x15,
+        0xff, 0xcd, 0x9a, 0x1c, 0xea, 0xef, 0x58, 0x56, 0x91, 0x2d, 0x47, 0x81,
+        0x56, 0x0d, 0xc3, 0xb0, 0x47, 0x58, 0x8d, 0x05, 0x7d, 0x5b, 0xc0, 0x22,
+        0xa4, 0xf0, 0x2e, 0x70, 0x36, 0x01, 0x89, 0xa1, 0x71, 0xed, 0x76, 0xe9,
+        0x8d, 0xf5, 0x49, 0xaf, 0x11, 0xbe, 0xe4, 0xd4, 0x48, 0x92, 0xb6, 0x5b,
+        0xc2, 0x04, 0xd4, 0x0c, 0x5c, 0x8b, 0xe3, 0xfa, 0x29, 0x63, 0x86, 0xb4,
+        0x10, 0xad, 0x32, 0x07, 0x85, 0xe2, 0x43, 0x76, 0x16, 0x90, 0xab, 0xdf,
+        0xb3, 0x36, 0x0a, 0xc4, 0x49, 0x7b, 0x95, 0x48, 0x50, 0x72, 0x8f, 0x7d,
+        0xf4, 0xfa, 0x60, 0xc1
+    };
 
     unsigned char p_data[] = {
-    0x00, 0xed, 0xf7, 0xa7, 0x00, 0x5a, 0xbb, 0xd1, 0x52, 0x65, 0x9b, 0xec,
-    0xfe, 0x27, 0x8b, 0xe2, 0xbe, 0x40, 0x8c, 0x2f, 0x6f, 0xb4, 0x26, 0xb2,
-    0xbe, 0x45, 0x4b, 0x3b, 0x5a, 0xaa, 0xc6, 0xaa, 0xfa, 0xc1, 0x3a, 0xa9,
-    0xa1, 0xba, 0xb7, 0x86, 0x1a, 0x98, 0x15, 0x5f, 0x5c, 0x1c, 0x57, 0x78,
-    0x78, 0x6a, 0x13, 0xc2, 0x40, 0x7d, 0x07, 0x87, 0x47, 0xc6, 0x96, 0xd5,
-    0x92, 0xc9, 0x65, 0x2c, 0xfe, 0xbb, 0xe0, 0xd6, 0x76, 0x25, 0x5a, 0xa3,
-    0xdf, 0x97, 0x4b, 0x64, 0xfd, 0x3b, 0x2b, 0xbc, 0xfb, 0x80, 0xad, 0x3b,
-    0x7d, 0x1f, 0x48, 0x56, 0x27, 0xf7, 0x2f, 0x8e, 0x92, 0x07, 0xa8, 0x9f,
-    0xbc, 0x5a, 0xce, 0xfa, 0xd5, 0x67, 0xad, 0xf4, 0xbf, 0xe0, 0xc9, 0x3e,
-    0x8e, 0xb5, 0x90, 0x58, 0x54, 0x92, 0x9f, 0xda, 0x36, 0xc0, 0x0d, 0x57,
-    0xfe, 0x6c, 0x23, 0x63, 0x8b, 0xd1, 0x1e, 0x4f, 0xd3 };
+        0x00, 0xed, 0xf7, 0xa7, 0x00, 0x5a, 0xbb, 0xd1, 0x52, 0x65, 0x9b, 0xec,
+        0xfe, 0x27, 0x8b, 0xe2, 0xbe, 0x40, 0x8c, 0x2f, 0x6f, 0xb4, 0x26, 0xb2,
+        0xbe, 0x45, 0x4b, 0x3b, 0x5a, 0xaa, 0xc6, 0xaa, 0xfa, 0xc1, 0x3a, 0xa9,
+        0xa1, 0xba, 0xb7, 0x86, 0x1a, 0x98, 0x15, 0x5f, 0x5c, 0x1c, 0x57, 0x78,
+        0x78, 0x6a, 0x13, 0xc2, 0x40, 0x7d, 0x07, 0x87, 0x47, 0xc6, 0x96, 0xd5,
+        0x92, 0xc9, 0x65, 0x2c, 0xfe, 0xbb, 0xe0, 0xd6, 0x76, 0x25, 0x5a, 0xa3,
+        0xdf, 0x97, 0x4b, 0x64, 0xfd, 0x3b, 0x2b, 0xbc, 0xfb, 0x80, 0xad, 0x3b,
+        0x7d, 0x1f, 0x48, 0x56, 0x27, 0xf7, 0x2f, 0x8e, 0x92, 0x07, 0xa8, 0x9f,
+        0xbc, 0x5a, 0xce, 0xfa, 0xd5, 0x67, 0xad, 0xf4, 0xbf, 0xe0, 0xc9, 0x3e,
+        0x8e, 0xb5, 0x90, 0x58, 0x54, 0x92, 0x9f, 0xda, 0x36, 0xc0, 0x0d, 0x57,
+        0xfe, 0x6c, 0x23, 0x63, 0x8b, 0xd1, 0x1e, 0x4f, 0xd3
+    };
 
     unsigned char q_data[] = {
-    0x00, 0xd6, 0x3f, 0xf5, 0xee, 0xff, 0x4d, 0x7d, 0x8c, 0x1a, 0x85, 0x5d,
-    0x3c, 0x4f, 0x9d, 0xdf, 0xc7, 0x68, 0x27, 0x7f, 0xe4, 0x4f, 0x4f, 0xd7,
-    0xa2, 0x3b, 0xcd, 0x4a, 0x34, 0xd8, 0x55, 0x4a, 0x3e, 0x8e, 0xb3, 0xa8,
-    0xe9, 0x8a, 0xc5, 0x94, 0xd1, 0x09, 0x32, 0x4b, 0x79, 0x8d, 0x7b, 0x03,
-    0x0b, 0x5d, 0xca, 0x91, 0x41, 0xbc, 0x82, 0xc3, 0x89, 0x67, 0x4d, 0x03,
-    0x68, 0x03, 0x2d, 0x0e, 0x4e, 0x97, 0x6c, 0xf6, 0x3e, 0x1f, 0xf4, 0x50,
-    0x06, 0x5d, 0x05, 0x22, 0xf2, 0xf8, 0xf2, 0xde, 0xad, 0x2e, 0x9d, 0xc3,
-    0x97, 0x1b, 0xc3, 0x75, 0xe7, 0x86, 0xde, 0xc5, 0x11, 0x89, 0xed, 0x6a,
-    0x13, 0x14, 0x23, 0x4b, 0x98, 0x81, 0xf7, 0xd4, 0x1c, 0xee, 0x30, 0x92,
-    0x85, 0x20, 0x4f, 0x35, 0x02, 0xfa, 0xda, 0x14, 0x77, 0xfa, 0x08, 0x34,
-    0x60, 0xc7, 0x93, 0x72, 0xdc, 0xc4, 0x18, 0x70, 0xc1 };
+        0x00, 0xd6, 0x3f, 0xf5, 0xee, 0xff, 0x4d, 0x7d, 0x8c, 0x1a, 0x85, 0x5d,
+        0x3c, 0x4f, 0x9d, 0xdf, 0xc7, 0x68, 0x27, 0x7f, 0xe4, 0x4f, 0x4f, 0xd7,
+        0xa2, 0x3b, 0xcd, 0x4a, 0x34, 0xd8, 0x55, 0x4a, 0x3e, 0x8e, 0xb3, 0xa8,
+        0xe9, 0x8a, 0xc5, 0x94, 0xd1, 0x09, 0x32, 0x4b, 0x79, 0x8d, 0x7b, 0x03,
+        0x0b, 0x5d, 0xca, 0x91, 0x41, 0xbc, 0x82, 0xc3, 0x89, 0x67, 0x4d, 0x03,
+        0x68, 0x03, 0x2d, 0x0e, 0x4e, 0x97, 0x6c, 0xf6, 0x3e, 0x1f, 0xf4, 0x50,
+        0x06, 0x5d, 0x05, 0x22, 0xf2, 0xf8, 0xf2, 0xde, 0xad, 0x2e, 0x9d, 0xc3,
+        0x97, 0x1b, 0xc3, 0x75, 0xe7, 0x86, 0xde, 0xc5, 0x11, 0x89, 0xed, 0x6a,
+        0x13, 0x14, 0x23, 0x4b, 0x98, 0x81, 0xf7, 0xd4, 0x1c, 0xee, 0x30, 0x92,
+        0x85, 0x20, 0x4f, 0x35, 0x02, 0xfa, 0xda, 0x14, 0x77, 0xfa, 0x08, 0x34,
+        0x60, 0xc7, 0x93, 0x72, 0xdc, 0xc4, 0x18, 0x70, 0xc1
+    };
 
     memset(msgbuf, 0xef, 64);
 
     ret = (TEST_ptr((p = BN_bin2bn(p_data, sizeof(p_data), NULL)))
-           && TEST_ptr((q = BN_bin2bn(q_data, sizeof(q_data), NULL)))
-           && TEST_ptr((n = BN_bin2bn(n_data, sizeof(n_data), NULL)))
-           && TEST_ptr((d = BN_bin2bn(d_data, sizeof(d_data), NULL)))
-           && TEST_ptr((e = BN_bin2bn(e_data, sizeof(e_data), NULL)))
-           && TEST_ptr((rsa = RSA_new()))
-           && TEST_ptr((md = EVP_sha256()))
-           && TEST_ptr((ctx = EVP_MD_CTX_new()))
-           && TEST_ptr((pkey = EVP_PKEY_new()))
-           && TEST_true(RSA_set0_factors(rsa, p, q))
-           && TEST_true(RSA_set0_key(rsa, n, e, d))
-           && TEST_true(EVP_PKEY_assign_RSA(pkey, rsa))
-           && TEST_true(EVP_DigestSignInit(ctx, NULL, md, NULL, pkey))
-           && TEST_true(EVP_DigestSign(ctx, sigbuf, &buflen, msgbuf, msglen)));
+        && TEST_ptr((q = BN_bin2bn(q_data, sizeof(q_data), NULL)))
+        && TEST_ptr((n = BN_bin2bn(n_data, sizeof(n_data), NULL)))
+        && TEST_ptr((d = BN_bin2bn(d_data, sizeof(d_data), NULL)))
+        && TEST_ptr((e = BN_bin2bn(e_data, sizeof(e_data), NULL)))
+        && TEST_ptr((rsa = RSA_new()))
+        && TEST_ptr((md = EVP_sha256()))
+        && TEST_ptr((ctx = EVP_MD_CTX_new()))
+        && TEST_ptr((pkey = EVP_PKEY_new()))
+        && TEST_true(RSA_set0_factors(rsa, p, q))
+        && TEST_true(RSA_set0_key(rsa, n, e, d))
+        && TEST_true(EVP_PKEY_assign_RSA(pkey, rsa))
+        && TEST_true(EVP_DigestSignInit(ctx, NULL, md, NULL, pkey))
+        && TEST_true(EVP_DigestSign(ctx, sigbuf, &buflen, msgbuf, msglen)));
 
     EVP_MD_CTX_free(ctx);
     EVP_PKEY_free(pkey);
@@ -509,7 +489,7 @@ static int test_EVP_rsa_legacy_key(void)
 static RSA *load_key(int priv)
 {
     RSA *rsa = NULL;
-    BIGNUM *pn = NULL, *pe = NULL, *pd= NULL;
+    BIGNUM *pn = NULL, *pe = NULL, *pd = NULL;
 
     /* RSA key extracted using > openssl genpkey -algorithm RSA -text */
     static const unsigned char n[] = {
@@ -563,9 +543,9 @@ static RSA *load_key(int priv)
     if (priv)
         pd = BN_bin2bn(d, sizeof(d), NULL);
     if (!TEST_false(pn == NULL
-                    || pe == NULL
-                    || (priv && pd == NULL)
-                    || !RSA_set0_key(rsa, pn, pe, pd))) {
+            || pe == NULL
+            || (priv && pd == NULL)
+            || !RSA_set0_key(rsa, pn, pe, pd))) {
         BN_free(pn);
         BN_free(pe);
         BN_free(pd);
@@ -665,19 +645,19 @@ static int test_rsa_saos(void)
 
     /* Test that a generated signature can be verified */
     if (!TEST_true(RSA_sign_ASN1_OCTET_STRING(0, in, inlen, sig, &siglen,
-                                              rsa_priv)))
+            rsa_priv)))
         goto err;
     if (!TEST_true(RSA_verify_ASN1_OCTET_STRING(0, in, inlen, sig, siglen, rsa_pub)))
         goto err;
 
     /* Test sign fails if the input is too large */
     if (!TEST_false(RSA_sign_ASN1_OCTET_STRING(0, in, inlen + 1, sig, &siglen,
-                                               rsa_priv)))
+            rsa_priv)))
         goto err;
 
     /* Fail if there is no private signing key */
     if (!TEST_false(RSA_sign_ASN1_OCTET_STRING(0, in, inlen, sig, &siglen,
-                                               rsa_pub)))
+            rsa_pub)))
         goto err;
 
     /* Fail if the signature is the wrong size */
@@ -686,14 +666,14 @@ static int test_rsa_saos(void)
 
     /* Fail if the encrypted input is not octet encoded */
     if (!TEST_false(RSA_verify_ASN1_OCTET_STRING(0, in, inlen, (unsigned char *)no_octet_sig,
-                                                 (unsigned int)sizeof(no_octet_sig),
-                                                 rsa_pub)))
+            (unsigned int)sizeof(no_octet_sig),
+            rsa_pub)))
         goto err;
 
     /* Fail if the signature does not match the input */
     if (!TEST_false(RSA_verify_ASN1_OCTET_STRING(0, in, inlen, (unsigned char *)sig_mismatch,
-                                                 (unsigned int)sizeof(sig_mismatch),
-                                                 rsa_pub)))
+            (unsigned int)sizeof(sig_mismatch),
+            rsa_pub)))
         goto err;
 
     /* Fail if the signature is corrupt */
diff --git a/test/rsa_x931_test.c b/test/rsa_x931_test.c
index 4310f7beab450..cb14ccbf700d4 100644
--- a/test/rsa_x931_test.c
+++ b/test/rsa_x931_test.c
@@ -24,9 +24,9 @@ static int test_rsa_x931_keygen(void)
     RSA *rsa = NULL;
 
     ret = TEST_ptr(rsa = ossl_rsa_new_with_ctx(libctx))
-          && TEST_ptr(e = BN_new())
-          && TEST_int_eq(BN_set_word(e, RSA_F4), 1)
-          && TEST_int_eq(RSA_X931_generate_key_ex(rsa, 1024, e, NULL), 1);
+        && TEST_ptr(e = BN_new())
+        && TEST_int_eq(BN_set_word(e, RSA_F4), 1)
+        && TEST_int_eq(RSA_X931_generate_key_ex(rsa, 1024, e, NULL), 1);
     BN_free(e);
     RSA_free(rsa);
     return ret;
diff --git a/test/safe_math_test.c b/test/safe_math_test.c
index 843286984eb94..f353f9730dcec 100644
--- a/test/safe_math_test.c
+++ b/test/safe_math_test.c
@@ -29,27 +29,28 @@ static const struct {
     int a, b;
     int sum_err, sub_err, mul_err, div_err, mod_err, div_round_up_err;
     int neg_a_err, neg_b_err, abs_a_err, abs_b_err;
-} test_ints[] = {       /*  +  -  *  /  %  /r -a -b |a||b|  */
-    { 1, 3,                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { -1, 3,                0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { 1, -3,                0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { -1, -3,               0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { 3, 2,                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { -3, 2,                0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { 2, -3,                0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { -2, -3,               0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { INT_MAX, 1,           1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { INT_MAX, 2,           1, 0, 1, 0, 0, 0, 0, 0, 0, 0 },
-    { INT_MAX, 4,           1, 0, 1, 0, 0, 0, 0, 0, 0, 0 },
-    { INT_MAX - 3 , 4,      1, 0, 1, 0, 0, 0, 0, 0, 0, 0 },
-    { INT_MIN, 1,           0, 1, 0, 0, 0, 0, 1, 0, 1, 0 },
-    { 1, INT_MIN,           0, 1, 0, 0, 0, 0, 0, 1, 0, 1 },
-    { INT_MIN, 2,           0, 1, 1, 0, 0, 0, 1, 0, 1, 0 },
-    { 2, INT_MIN,           0, 1, 1, 0, 0, 0, 0, 1, 0, 1 },
-    { INT_MIN, -1,          1, 0, 1, 1, 1, 1, 1, 0, 1, 0 },
-    { INT_MAX, INT_MIN,     0, 1, 1, 0, 0, 0, 0, 1, 0, 1 },
-    { INT_MIN, INT_MAX,     0, 1, 1, 0, 0, 0, 1, 0, 1, 0 },
-    { 3, 0,                 0, 0, 0, 1, 1, 1, 0, 0, 0, 0 },
+} test_ints[] = {
+    /*  +  -  *  /  %  /r -a -b |a||b|  */
+    { 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { -1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { 1, -3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { -1, -3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { 3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { -3, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { 2, -3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { -2, -3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { INT_MAX, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { INT_MAX, 2, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0 },
+    { INT_MAX, 4, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0 },
+    { INT_MAX - 3, 4, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0 },
+    { INT_MIN, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0 },
+    { 1, INT_MIN, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1 },
+    { INT_MIN, 2, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0 },
+    { 2, INT_MIN, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1 },
+    { INT_MIN, -1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0 },
+    { INT_MAX, INT_MIN, 0, 1, 1, 0, 0, 0, 0, 1, 0, 1 },
+    { INT_MIN, INT_MAX, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0 },
+    { 3, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0 },
 };
 
 static int test_int_ops(int n)
@@ -60,31 +61,31 @@ static int test_int_ops(int n)
     err = 0;
     r = safe_add_int(a, b, &err);
     if (!TEST_int_eq(err, test_ints[n].sum_err)
-            || (!err && !TEST_int_eq(r, a + b)))
+        || (!err && !TEST_int_eq(r, a + b)))
         goto err;
 
     err = 0;
     r = safe_sub_int(a, b, &err);
     if (!TEST_int_eq(err, test_ints[n].sub_err)
-            || (!err && !TEST_int_eq(r, a - b)))
+        || (!err && !TEST_int_eq(r, a - b)))
         goto err;
 
     err = 0;
     r = safe_mul_int(a, b, &err);
     if (!TEST_int_eq(err, test_ints[n].mul_err)
-            || (!err && !TEST_int_eq(r, a * b)))
+        || (!err && !TEST_int_eq(r, a * b)))
         goto err;
 
     err = 0;
     r = safe_div_int(a, b, &err);
     if (!TEST_int_eq(err, test_ints[n].div_err)
-            || (!err && !TEST_int_eq(r, a / b)))
+        || (!err && !TEST_int_eq(r, a / b)))
         goto err;
 
     err = 0;
     r = safe_mod_int(a, b, &err);
     if (!TEST_int_eq(err, test_ints[n].mod_err)
-            || (!err && !TEST_int_eq(r, a % b)))
+        || (!err && !TEST_int_eq(r, a % b)))
         goto err;
 
     err = 0;
@@ -99,28 +100,28 @@ static int test_int_ops(int n)
     err = 0;
     r = safe_neg_int(a, &err);
     if (!TEST_int_eq(err, test_ints[n].neg_a_err)
-            || (!err && !TEST_int_eq(r, -a)))
+        || (!err && !TEST_int_eq(r, -a)))
         goto err;
 
     err = 0;
     r = safe_neg_int(b, &err);
     if (!TEST_int_eq(err, test_ints[n].neg_b_err)
-            || (!err && !TEST_int_eq(r, -b)))
+        || (!err && !TEST_int_eq(r, -b)))
         goto err;
 
     err = 0;
     r = safe_abs_int(a, &err);
     if (!TEST_int_eq(err, test_ints[n].abs_a_err)
-            || (!err && !TEST_int_eq(r, a < 0 ? -a : a)))
+        || (!err && !TEST_int_eq(r, a < 0 ? -a : a)))
         goto err;
 
     err = 0;
     r = safe_abs_int(b, &err);
     if (!TEST_int_eq(err, test_ints[n].abs_b_err)
-            || (!err && !TEST_int_eq(r, b < 0 ? -b : b)))
+        || (!err && !TEST_int_eq(r, b < 0 ? -b : b)))
         goto err;
     return 1;
- err:
+err:
     TEST_info("a = %d  b = %d  r = %d  err = %d", a, b, r, err);
     return 0;
 }
@@ -128,16 +129,17 @@ static int test_int_ops(int n)
 static const struct {
     unsigned int a, b;
     int sum_err, sub_err, mul_err, div_err, mod_err, div_round_up_err;
-} test_uints[] = {      /*  +  -  *  /  %  /r   */
-    { 3, 1,                 0, 0, 0, 0, 0, 0 },
-    { 1, 3,                 0, 1, 0, 0, 0, 0 },
-    { UINT_MAX, 1,          1, 0, 0, 0, 0, 0 },
-    { UINT_MAX, 2,          1, 0, 1, 0, 0, 0 },
-    { UINT_MAX, 16,         1, 0, 1, 0, 0, 0 },
-    { UINT_MAX - 13, 16,    1, 0, 1, 0, 0, 0 },
-    { 1, UINT_MAX,          1, 1, 0, 0, 0, 0 },
-    { 2, UINT_MAX,          1, 1, 1, 0, 0, 0 },
-    { UINT_MAX, 0,          0, 0, 0, 1, 1, 1 },
+} test_uints[] = {
+    /*  +  -  *  /  %  /r   */
+    { 3, 1, 0, 0, 0, 0, 0, 0 },
+    { 1, 3, 0, 1, 0, 0, 0, 0 },
+    { UINT_MAX, 1, 1, 0, 0, 0, 0, 0 },
+    { UINT_MAX, 2, 1, 0, 1, 0, 0, 0 },
+    { UINT_MAX, 16, 1, 0, 1, 0, 0, 0 },
+    { UINT_MAX - 13, 16, 1, 0, 1, 0, 0, 0 },
+    { 1, UINT_MAX, 1, 1, 0, 0, 0, 0 },
+    { 2, UINT_MAX, 1, 1, 1, 0, 0, 0 },
+    { UINT_MAX, 0, 0, 0, 0, 1, 1, 1 },
 };
 
 static int test_uint_ops(int n)
@@ -149,37 +151,37 @@ static int test_uint_ops(int n)
     err = 0;
     r = safe_add_uint(a, b, &err);
     if (!TEST_int_eq(err, test_uints[n].sum_err)
-            || (!err && !TEST_uint_eq(r, a + b)))
+        || (!err && !TEST_uint_eq(r, a + b)))
         goto err;
 
     err = 0;
     r = safe_sub_uint(a, b, &err);
     if (!TEST_int_eq(err, test_uints[n].sub_err)
-            || (!err && !TEST_uint_eq(r, a - b)))
+        || (!err && !TEST_uint_eq(r, a - b)))
         goto err;
 
     err = 0;
     r = safe_mul_uint(a, b, &err);
     if (!TEST_int_eq(err, test_uints[n].mul_err)
-            || (!err && !TEST_uint_eq(r, a * b)))
+        || (!err && !TEST_uint_eq(r, a * b)))
         goto err;
 
     err = 0;
     r = safe_div_uint(a, b, &err);
     if (!TEST_int_eq(err, test_uints[n].div_err)
-            || (!err && !TEST_uint_eq(r, a / b)))
+        || (!err && !TEST_uint_eq(r, a / b)))
         goto err;
 
     err = 0;
     r = safe_mod_uint(a, b, &err);
     if (!TEST_int_eq(err, test_uints[n].mod_err)
-            || (!err && !TEST_uint_eq(r, a % b)))
+        || (!err && !TEST_uint_eq(r, a % b)))
         goto err;
 
     err = 0;
     r = safe_div_round_up_uint(a, b, &err);
     if (!TEST_int_eq(err, test_uints[n].div_round_up_err)
-            || (!err && !TEST_uint_eq(r, a / b + (a % b != 0))))
+        || (!err && !TEST_uint_eq(r, a / b + (a % b != 0))))
         goto err;
 
     err = 0;
@@ -201,8 +203,8 @@ static int test_uint_ops(int n)
     r = safe_abs_uint(b, &err);
     if (!TEST_int_eq(err, 0) || !TEST_uint_eq(r, b))
         goto err;
-   return 1;
- err:
+    return 1;
+err:
     TEST_info("a = %u  b = %u  r = %u  err = %d", a, b, r, err);
     return 0;
 }
@@ -211,16 +213,16 @@ static const struct {
     size_t a, b;
     int sum_err, sub_err, mul_err, div_err, mod_err, div_round_up_err;
 } test_size_ts[] = {
-    { 3, 1,                 0, 0, 0, 0, 0, 0 },
-    { 1, 3,                 0, 1, 0, 0, 0, 0 },
-    { 36, 8,                0, 0, 0, 0, 0, 0 },
-    { SIZE_MAX, 1,          1, 0, 0, 0, 0, 0 },
-    { SIZE_MAX, 2,          1, 0, 1, 0, 0, 0 },
-    { SIZE_MAX, 8,          1, 0, 1, 0, 0, 0 },
-    { SIZE_MAX - 3, 8,      1, 0, 1, 0, 0, 0 },
-    { 1, SIZE_MAX,          1, 1, 0, 0, 0, 0 },
-    { 2, SIZE_MAX,          1, 1, 1, 0, 0, 0 },
-    { 11, 0,                0, 0, 0, 1, 1, 1 },
+    { 3, 1, 0, 0, 0, 0, 0, 0 },
+    { 1, 3, 0, 1, 0, 0, 0, 0 },
+    { 36, 8, 0, 0, 0, 0, 0, 0 },
+    { SIZE_MAX, 1, 1, 0, 0, 0, 0, 0 },
+    { SIZE_MAX, 2, 1, 0, 1, 0, 0, 0 },
+    { SIZE_MAX, 8, 1, 0, 1, 0, 0, 0 },
+    { SIZE_MAX - 3, 8, 1, 0, 1, 0, 0, 0 },
+    { 1, SIZE_MAX, 1, 1, 0, 0, 0, 0 },
+    { 2, SIZE_MAX, 1, 1, 1, 0, 0, 0 },
+    { 11, 0, 0, 0, 0, 1, 1, 1 },
 };
 
 static int test_size_t_ops(int n)
@@ -232,37 +234,37 @@ static int test_size_t_ops(int n)
     err = 0;
     r = safe_add_size_t(a, b, &err);
     if (!TEST_int_eq(err, test_size_ts[n].sum_err)
-            || (!err && !TEST_size_t_eq(r, a + b)))
+        || (!err && !TEST_size_t_eq(r, a + b)))
         goto err;
 
     err = 0;
     r = safe_sub_size_t(a, b, &err);
     if (!TEST_int_eq(err, test_size_ts[n].sub_err)
-            || (!err && !TEST_size_t_eq(r, a - b)))
+        || (!err && !TEST_size_t_eq(r, a - b)))
         goto err;
 
     err = 0;
     r = safe_mul_size_t(a, b, &err);
     if (!TEST_int_eq(err, test_size_ts[n].mul_err)
-            || (!err && !TEST_size_t_eq(r, a * b)))
+        || (!err && !TEST_size_t_eq(r, a * b)))
         goto err;
 
     err = 0;
     r = safe_div_size_t(a, b, &err);
     if (!TEST_int_eq(err, test_size_ts[n].div_err)
-            || (!err && !TEST_size_t_eq(r, a / b)))
+        || (!err && !TEST_size_t_eq(r, a / b)))
         goto err;
 
     err = 0;
     r = safe_mod_size_t(a, b, &err);
     if (!TEST_int_eq(err, test_size_ts[n].mod_err)
-            || (!err && !TEST_size_t_eq(r, a % b)))
+        || (!err && !TEST_size_t_eq(r, a % b)))
         goto err;
 
     err = 0;
     r = safe_div_round_up_size_t(a, b, &err);
     if (!TEST_int_eq(err, test_size_ts[n].div_round_up_err)
-            || (!err && !TEST_size_t_eq(r, a / b + (a % b != 0))))
+        || (!err && !TEST_size_t_eq(r, a / b + (a % b != 0))))
         goto err;
 
     err = 0;
@@ -285,7 +287,7 @@ static int test_size_t_ops(int n)
     if (!TEST_int_eq(err, 0) || !TEST_size_t_eq(r, b))
         goto err;
     return 1;
- err:
+err:
     TEST_info("a = %zu  b = %zu  r = %zu  err = %d", a, b, r, err);
     return 0;
 }
@@ -294,20 +296,20 @@ static const struct {
     int a, b, c;
     int err;
 } test_muldiv_ints[] = {
-    { 3, 1, 2,                          0 },
-    { 1, 3, 2,                          0 },
-    { -3, 1, 2,                         0 },
-    { 1, 3, -2,                         0 },
-    { INT_MAX, INT_MAX, INT_MAX,        0 },
-    { INT_MIN, INT_MIN, INT_MAX,        1 },
-    { INT_MIN, INT_MIN, INT_MIN,        0 },
-    { INT_MAX, 2, 4,                    0 },
-    { 8, INT_MAX, 4,                    1 },
-    { INT_MAX, 8, 4,                    1 },
-    { INT_MIN, 2, 4,                    1 },
-    { 8, INT_MIN, 4,                    1 },
-    { INT_MIN, 8, 4,                    1 },
-    { 3, 4, 0,                          1 },
+    { 3, 1, 2, 0 },
+    { 1, 3, 2, 0 },
+    { -3, 1, 2, 0 },
+    { 1, 3, -2, 0 },
+    { INT_MAX, INT_MAX, INT_MAX, 0 },
+    { INT_MIN, INT_MIN, INT_MAX, 1 },
+    { INT_MIN, INT_MIN, INT_MIN, 0 },
+    { INT_MAX, 2, 4, 0 },
+    { 8, INT_MAX, 4, 1 },
+    { INT_MAX, 8, 4, 1 },
+    { INT_MIN, 2, 4, 1 },
+    { 8, INT_MIN, 4, 1 },
+    { INT_MIN, 8, 4, 1 },
+    { 3, 4, 0, 1 },
 };
 
 static int test_int_muldiv(int n)
@@ -322,7 +324,7 @@ static int test_int_muldiv(int n)
     if (c != 0)
         real = (int)((int64_t)a * (int64_t)b / (int64_t)c);
     if (!TEST_int_eq(err, test_muldiv_ints[n].err)
-            || (!err && !TEST_int_eq(r, real))) {
+        || (!err && !TEST_int_eq(r, real))) {
         TEST_info("%d * %d / %d  r = %d  err = %d", a, b, c, r, err);
         return 0;
     }
@@ -333,13 +335,13 @@ static const struct {
     unsigned int a, b, c;
     int err;
 } test_muldiv_uints[] = {
-    { 3, 1, 2,                          0 },
-    { 1, 3, 2,                          0 },
-    { UINT_MAX, UINT_MAX, UINT_MAX,     0 },
-    { UINT_MAX, 2, 4,                   0 },
-    { 8, UINT_MAX, 4,                   1 },
-    { UINT_MAX, 8, 4,                   1 },
-    { 3, 4, 0,                          1 },
+    { 3, 1, 2, 0 },
+    { 1, 3, 2, 0 },
+    { UINT_MAX, UINT_MAX, UINT_MAX, 0 },
+    { UINT_MAX, 2, 4, 0 },
+    { 8, UINT_MAX, 4, 1 },
+    { UINT_MAX, 8, 4, 1 },
+    { 3, 4, 0, 1 },
 };
 
 static int test_uint_muldiv(int n)
@@ -354,7 +356,7 @@ static int test_uint_muldiv(int n)
     if (c != 0)
         real = (unsigned int)((uint64_t)a * (uint64_t)b / (uint64_t)c);
     if (!TEST_int_eq(err, test_muldiv_uints[n].err)
-            || (!err && !TEST_uint_eq(r, real))) {
+        || (!err && !TEST_uint_eq(r, real))) {
         TEST_info("%u * %u / %u  r = %u  err = %d", a, b, c, r, err);
         return 0;
     }
diff --git a/test/sanitytest.c b/test/sanitytest.c
index dd19bfbc71da0..e0cba5a22896d 100644
--- a/test/sanitytest.c
+++ b/test/sanitytest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-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
@@ -13,6 +13,10 @@
 #include "internal/numbers.h"
 #include "internal/time.h"
 
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L
+#include <signal.h>
+#endif
+
 static int test_sanity_null_zero(void)
 {
     char *p;
@@ -26,20 +30,124 @@ static int test_sanity_null_zero(void)
 
 static int test_sanity_enum_size(void)
 {
-    enum smallchoices { sa, sb, sc };
-    enum medchoices { ma, mb, mc, md, me, mf, mg, mh, mi, mj, mk, ml };
+    enum smallchoices { sa,
+        sb,
+        sc };
+    enum medchoices { ma,
+        mb,
+        mc,
+        md,
+        me,
+        mf,
+        mg,
+        mh,
+        mi,
+        mj,
+        mk,
+        ml };
     enum largechoices {
-        a01, b01, c01, d01, e01, f01, g01, h01, i01, j01,
-        a02, b02, c02, d02, e02, f02, g02, h02, i02, j02,
-        a03, b03, c03, d03, e03, f03, g03, h03, i03, j03,
-        a04, b04, c04, d04, e04, f04, g04, h04, i04, j04,
-        a05, b05, c05, d05, e05, f05, g05, h05, i05, j05,
-        a06, b06, c06, d06, e06, f06, g06, h06, i06, j06,
-        a07, b07, c07, d07, e07, f07, g07, h07, i07, j07,
-        a08, b08, c08, d08, e08, f08, g08, h08, i08, j08,
-        a09, b09, c09, d09, e09, f09, g09, h09, i09, j09,
-        a10, b10, c10, d10, e10, f10, g10, h10, i10, j10,
-        xxx };
+        a01,
+        b01,
+        c01,
+        d01,
+        e01,
+        f01,
+        g01,
+        h01,
+        i01,
+        j01,
+        a02,
+        b02,
+        c02,
+        d02,
+        e02,
+        f02,
+        g02,
+        h02,
+        i02,
+        j02,
+        a03,
+        b03,
+        c03,
+        d03,
+        e03,
+        f03,
+        g03,
+        h03,
+        i03,
+        j03,
+        a04,
+        b04,
+        c04,
+        d04,
+        e04,
+        f04,
+        g04,
+        h04,
+        i04,
+        j04,
+        a05,
+        b05,
+        c05,
+        d05,
+        e05,
+        f05,
+        g05,
+        h05,
+        i05,
+        j05,
+        a06,
+        b06,
+        c06,
+        d06,
+        e06,
+        f06,
+        g06,
+        h06,
+        i06,
+        j06,
+        a07,
+        b07,
+        c07,
+        d07,
+        e07,
+        f07,
+        g07,
+        h07,
+        i07,
+        j07,
+        a08,
+        b08,
+        c08,
+        d08,
+        e08,
+        f08,
+        g08,
+        h08,
+        i08,
+        j08,
+        a09,
+        b09,
+        c09,
+        d09,
+        e09,
+        f09,
+        g09,
+        h09,
+        i09,
+        j09,
+        a10,
+        b10,
+        c10,
+        d10,
+        e10,
+        f10,
+        g10,
+        h10,
+        i10,
+        j10,
+        xxx
+    };
 
     /* Enum size */
     if (!TEST_size_t_eq(sizeof(enum smallchoices), sizeof(int))
@@ -80,24 +188,24 @@ static int test_sanity_range(void)
 {
     /* Verify some types are the correct size */
     if (!TEST_size_t_eq(sizeof(int8_t), 1)
-            || !TEST_size_t_eq(sizeof(uint8_t), 1)
-            || !TEST_size_t_eq(sizeof(int16_t), 2)
-            || !TEST_size_t_eq(sizeof(uint16_t), 2)
-            || !TEST_size_t_eq(sizeof(int32_t), 4)
-            || !TEST_size_t_eq(sizeof(uint32_t), 4)
-            || !TEST_size_t_eq(sizeof(int64_t), 8)
-            || !TEST_size_t_eq(sizeof(uint64_t), 8)
+        || !TEST_size_t_eq(sizeof(uint8_t), 1)
+        || !TEST_size_t_eq(sizeof(int16_t), 2)
+        || !TEST_size_t_eq(sizeof(uint16_t), 2)
+        || !TEST_size_t_eq(sizeof(int32_t), 4)
+        || !TEST_size_t_eq(sizeof(uint32_t), 4)
+        || !TEST_size_t_eq(sizeof(int64_t), 8)
+        || !TEST_size_t_eq(sizeof(uint64_t), 8)
 #ifdef UINT128_MAX
-            || !TEST_size_t_eq(sizeof(int128_t), 16)
-            || !TEST_size_t_eq(sizeof(uint128_t), 16)
+        || !TEST_size_t_eq(sizeof(int128_t), 16)
+        || !TEST_size_t_eq(sizeof(uint128_t), 16)
 #endif
-            || !TEST_size_t_eq(sizeof(char), 1)
-            || !TEST_size_t_eq(sizeof(unsigned char), 1))
+        || !TEST_size_t_eq(sizeof(char), 1)
+        || !TEST_size_t_eq(sizeof(unsigned char), 1))
         return 0;
 
     /* We want our long longs to be at least 64 bits */
     if (!TEST_size_t_ge(sizeof(long long int), 8)
-            || !TEST_size_t_ge(sizeof(unsigned long long int), 8))
+        || !TEST_size_t_ge(sizeof(unsigned long long int), 8))
         return 0;
 
     /*
@@ -106,8 +214,8 @@ static int test_sanity_range(void)
      * an int128_t, so this check is for at least 64 bits.
      */
     if (!TEST_size_t_ge(sizeof(ossl_intmax_t), 8)
-            || !TEST_size_t_ge(sizeof(ossl_uintmax_t), 8)
-            || !TEST_size_t_ge(sizeof(ossl_uintmax_t), sizeof(size_t)))
+        || !TEST_size_t_ge(sizeof(ossl_uintmax_t), 8)
+        || !TEST_size_t_ge(sizeof(ossl_uintmax_t), sizeof(size_t)))
         return 0;
 
     /* This isn't possible to check using the framework functions */
@@ -130,22 +238,77 @@ static int test_sanity_memcmp(void)
     return CRYPTO_memcmp("ab", "cd", 2);
 }
 
-static int test_sanity_sleep(void)
+static const struct sleep_test_vector {
+    uint64_t val;
+} sleep_test_vectors[] = { { 0 }, { 1 }, { 999 }, { 1000 } };
+
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L
+static void
+alrm_handler(int sig)
+{
+}
+#endif /* defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L */
+
+static int test_sanity_sleep(int i)
 {
+    const struct sleep_test_vector *const td = sleep_test_vectors + i;
     OSSL_TIME start = ossl_time_now();
-    uint64_t seconds;
+    uint64_t ms;
+
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L
+    /*
+     * Set up an interrupt timer to check that OSSL_sleep doesn't return early
+     * due to interrupts.
+     */
+    do {
+        static const struct itimerval it = { { 0, 111111 } };
+        struct sigaction sa;
+        sigset_t mask;
+
+        memset(&sa, 0, sizeof(sa));
+        sa.sa_handler = alrm_handler;
+
+        if (sigaction(SIGALRM, &sa, NULL)) {
+            TEST_perror("test_sanity_sleep: sigaction");
+            break;
+        }
+
+        sigemptyset(&mask);
+        sigaddset(&mask, SIGALRM);
+        if (sigprocmask(SIG_UNBLOCK, &mask, NULL)) {
+            TEST_perror("test_sanity_sleep: sigprocmask");
+            break;
+        }
+
+        if (setitimer(ITIMER_REAL, &it, NULL)) {
+            TEST_perror("test_sanity_sleep: arm setitimer");
+            break;
+        }
+    } while (0);
+#endif /* defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L */
 
     /*
-     * On any reasonable system this must sleep at least one second
-     * but not more than 20.
-     * Assuming there is no interruption.
+     * On any reasonable system this must sleep at least the specified time
+     * but not more than 20 seconds more than that.
      */
-    OSSL_sleep(1000);
+    OSSL_sleep(td->val);
+
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L
+    /* disarm the timer */
+    do {
+        static const struct itimerval it;
 
-    seconds = ossl_time2seconds(ossl_time_subtract(ossl_time_now(), start));
+        if (setitimer(ITIMER_REAL, &it, NULL)) {
+            TEST_perror("test_sanity_sleep: disarm setitimer");
+            break;
+        }
+    } while (0);
+#endif /* defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L */
 
-    if (!TEST_uint64_t_ge(seconds, 1) || !TEST_uint64_t_le(seconds, 20))
-       return 0;
+    ms = ossl_time2ms(ossl_time_subtract(ossl_time_now(), start));
+
+    if (!TEST_uint64_t_ge(ms, td->val) + !TEST_uint64_t_le(ms, td->val + 20000))
+        return 0;
     return 1;
 }
 
@@ -158,6 +321,6 @@ int setup_tests(void)
     ADD_TEST(test_sanity_unsigned_conversion);
     ADD_TEST(test_sanity_range);
     ADD_TEST(test_sanity_memcmp);
-    ADD_TEST(test_sanity_sleep);
+    ADD_ALL_TESTS(test_sanity_sleep, OSSL_NELEM(sleep_test_vectors));
     return 1;
 }
diff --git a/test/secmemtest.c b/test/secmemtest.c
index 588f31ae676ac..05b0bbc85796d 100644
--- a/test/secmemtest.c
+++ b/test/secmemtest.c
@@ -81,8 +81,7 @@ static int test_sec_mem(void)
      * If init fails, then initialized should be false, if not, this
      * could cause an infinite loop secure_malloc, but we don't test it
      */
-    if (TEST_false(CRYPTO_secure_malloc_init(16, 16)) &&
-        !TEST_false(CRYPTO_secure_malloc_initialized())) {
+    if (TEST_false(CRYPTO_secure_malloc_init(16, 16)) && !TEST_false(CRYPTO_secure_malloc_initialized())) {
         TEST_true(CRYPTO_secure_malloc_done());
         goto end;
     }
@@ -103,7 +102,7 @@ static int test_sec_mem(void)
      * to make sure that infinite loop is fixed, they can enable the
      * code below.
      */
-# if 0
+#if 0
     /*-
      * On Linux and BSD this test has a chance to complete in minimal
      * time and with minimum side effects, because mlock is likely to
@@ -116,11 +115,11 @@ static int test_sec_mem(void)
         if (TEST_true(CRYPTO_secure_malloc_init((size_t)1<<34, 1<<4) != 0))
             TEST_true(CRYPTO_secure_malloc_done());
     }
-# endif
+#endif
 
     /* this can complete - it was not really secure */
     testresult = 1;
- end:
+end:
     OPENSSL_secure_free(p);
     OPENSSL_free(q);
     OPENSSL_secure_free(r);
@@ -141,7 +140,7 @@ static int test_sec_mem_clear(void)
     int i, res = 0;
 
     if (!TEST_true(CRYPTO_secure_malloc_init(4096, 32))
-            || !TEST_ptr(p = OPENSSL_secure_malloc(size)))
+        || !TEST_ptr(p = OPENSSL_secure_malloc(size)))
         goto err;
 
     for (i = 0; i < size; i++)
diff --git a/test/servername_test.c b/test/servername_test.c
index b417f8bcacbad..e613cbafc8841 100644
--- a/test/servername_test.c
+++ b/test/servername_test.c
@@ -24,15 +24,14 @@
 #include "internal/nelem.h"
 #include "helpers/ssltestlib.h"
 
-#define CLIENT_VERSION_LEN      2
+#define CLIENT_VERSION_LEN 2
 
 static const char *host = "dummy-host";
 
 static char *cert = NULL;
 static char *privkey = NULL;
 
-#if defined(OPENSSL_NO_TLS1_3) || \
-    (defined(OPENSSL_NO_EC) && defined(OPENSSL_NO_DH))
+#if defined(OPENSSL_NO_TLS1_3) || (defined(OPENSSL_NO_EC) && defined(OPENSSL_NO_DH))
 static int maxversion = TLS1_2_VERSION;
 #else
 static int maxversion = 0;
@@ -53,38 +52,37 @@ static int get_sni_from_client_hello(BIO *bio, char **sni)
     memset(&pkt5, 0, sizeof(pkt5));
 
     if (!TEST_long_ge(len = BIO_get_mem_data(bio, (char **)&data), 0)
-            || !TEST_true(PACKET_buf_init(&pkt, data, len))
-               /* Skip the record header */
-            || !PACKET_forward(&pkt, SSL3_RT_HEADER_LENGTH)
-               /* Skip the handshake message header */
-            || !TEST_true(PACKET_forward(&pkt, SSL3_HM_HEADER_LENGTH))
-               /* Skip client version and random */
-            || !TEST_true(PACKET_forward(&pkt, CLIENT_VERSION_LEN
-                                               + SSL3_RANDOM_SIZE))
-               /* Skip session id */
-            || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
-               /* Skip ciphers */
-            || !TEST_true(PACKET_get_length_prefixed_2(&pkt, &pkt2))
-               /* Skip compression */
-            || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
-               /* Extensions len */
-            || !TEST_true(PACKET_as_length_prefixed_2(&pkt, &pkt2)))
+        || !TEST_true(PACKET_buf_init(&pkt, data, len))
+        /* Skip the record header */
+        || !PACKET_forward(&pkt, SSL3_RT_HEADER_LENGTH)
+        /* Skip the handshake message header */
+        || !TEST_true(PACKET_forward(&pkt, SSL3_HM_HEADER_LENGTH))
+        /* Skip client version and random */
+        || !TEST_true(PACKET_forward(&pkt, CLIENT_VERSION_LEN + SSL3_RANDOM_SIZE))
+        /* Skip session id */
+        || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
+        /* Skip ciphers */
+        || !TEST_true(PACKET_get_length_prefixed_2(&pkt, &pkt2))
+        /* Skip compression */
+        || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
+        /* Extensions len */
+        || !TEST_true(PACKET_as_length_prefixed_2(&pkt, &pkt2)))
         goto end;
 
     /* Loop through all extensions for SNI */
     while (PACKET_remaining(&pkt2)) {
         if (!TEST_true(PACKET_get_net_2(&pkt2, &type))
-                || !TEST_true(PACKET_get_length_prefixed_2(&pkt2, &pkt3)))
+            || !TEST_true(PACKET_get_length_prefixed_2(&pkt2, &pkt3)))
             goto end;
         if (type == TLSEXT_TYPE_server_name) {
             if (!TEST_true(PACKET_get_length_prefixed_2(&pkt3, &pkt4))
-                    || !TEST_uint_ne(PACKET_remaining(&pkt4), 0)
-                    || !TEST_true(PACKET_get_1(&pkt4, &servname_type))
-                    || !TEST_uint_eq(servname_type, TLSEXT_NAMETYPE_host_name)
-                    || !TEST_true(PACKET_get_length_prefixed_2(&pkt4, &pkt5))
-                    || !TEST_uint_le(PACKET_remaining(&pkt5), TLSEXT_MAXLEN_host_name)
-                    || !TEST_false(PACKET_contains_zero_byte(&pkt5))
-                    || !TEST_true(PACKET_strndup(&pkt5, sni)))
+                || !TEST_uint_ne(PACKET_remaining(&pkt4), 0)
+                || !TEST_true(PACKET_get_1(&pkt4, &servname_type))
+                || !TEST_uint_eq(servname_type, TLSEXT_NAMETYPE_host_name)
+                || !TEST_true(PACKET_get_length_prefixed_2(&pkt4, &pkt5))
+                || !TEST_uint_le(PACKET_remaining(&pkt5), TLSEXT_MAXLEN_host_name)
+                || !TEST_false(PACKET_contains_zero_byte(&pkt5))
+                || !TEST_true(PACKET_strndup(&pkt5, sni)))
                 goto end;
             ret = 1;
             goto end;
@@ -109,7 +107,7 @@ static int client_setup_sni_before_state(void)
         goto end;
 
     if (maxversion > 0
-            && !TEST_true(SSL_CTX_set_max_proto_version(ctx, maxversion)))
+        && !TEST_true(SSL_CTX_set_max_proto_version(ctx, maxversion)))
         goto end;
 
     con = SSL_new(ctx);
@@ -121,7 +119,7 @@ static int client_setup_sni_before_state(void)
 
     rbio = BIO_new(BIO_s_mem());
     wbio = BIO_new(BIO_s_mem());
-    if (!TEST_ptr(rbio)|| !TEST_ptr(wbio)) {
+    if (!TEST_ptr(rbio) || !TEST_ptr(wbio)) {
         BIO_free(rbio);
         BIO_free(wbio);
         goto end;
@@ -161,7 +159,7 @@ static int client_setup_sni_after_state(void)
         goto end;
 
     if (maxversion > 0
-            && !TEST_true(SSL_CTX_set_max_proto_version(ctx, maxversion)))
+        && !TEST_true(SSL_CTX_set_max_proto_version(ctx, maxversion)))
         goto end;
 
     con = SSL_new(ctx);
@@ -170,7 +168,7 @@ static int client_setup_sni_after_state(void)
 
     rbio = BIO_new(BIO_s_mem());
     wbio = BIO_new(BIO_s_mem());
-    if (!TEST_ptr(rbio)|| !TEST_ptr(wbio)) {
+    if (!TEST_ptr(rbio) || !TEST_ptr(wbio)) {
         BIO_free(rbio);
         BIO_free(wbio);
         goto end;
@@ -206,11 +204,11 @@ static int server_setup_sni(void)
     int testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL)))
+            TLS_client_method(),
+            TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL)))
         goto end;
 
     /* set SNI at server side */
@@ -220,7 +218,7 @@ static int server_setup_sni(void)
         goto end;
 
     if (!TEST_ptr_null(SSL_get_servername(serverssl,
-                                          TLSEXT_NAMETYPE_host_name))) {
+            TLSEXT_NAMETYPE_host_name))) {
         /* SNI should have been cleared during handshake */
         goto end;
     }
@@ -260,7 +258,7 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(cert = test_get_argument(0))
-            || !TEST_ptr(privkey = test_get_argument(1)))
+        || !TEST_ptr(privkey = test_get_argument(1)))
         return 0;
 
     ADD_ALL_TESTS(test_servername, OSSL_NELEM(sni_test_fns));
diff --git a/test/sha_test.c b/test/sha_test.c
index 4285e703c58d2..0035563e02d22 100644
--- a/test/sha_test.c
+++ b/test/sha_test.c
@@ -12,10 +12,10 @@
 #include "testutil.h"
 
 static int test_static_sha_common(const char *input, size_t length,
-                                  const unsigned char *out,
-                                  unsigned char *(*md)(const unsigned char *d,
-                                                       size_t n,
-                                                       unsigned char *md))
+    const unsigned char *out,
+    unsigned char *(*md)(const unsigned char *d,
+        size_t n,
+        unsigned char *md))
 {
     unsigned char buf[EVP_MAX_MD_SIZE], *sbuf;
     const unsigned char *in = (unsigned char *)input;
@@ -23,13 +23,13 @@ static int test_static_sha_common(const char *input, size_t length,
 
     sbuf = (*md)(in, in_len, buf);
     if (!TEST_ptr(sbuf)
-            || !TEST_ptr_eq(sbuf, buf)
-            || !TEST_mem_eq(sbuf, length, out, length))
+        || !TEST_ptr_eq(sbuf, buf)
+        || !TEST_mem_eq(sbuf, length, out, length))
         return 0;
     sbuf = (*md)(in, in_len, NULL);
     if (!TEST_ptr(sbuf)
-            || !TEST_ptr_ne(sbuf, buf)
-            || !TEST_mem_eq(sbuf, length, out, length))
+        || !TEST_ptr_ne(sbuf, buf)
+        || !TEST_mem_eq(sbuf, length, out, length))
         return 0;
     return 1;
 }
diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c
index 5dc42a0397123..034780ea55ca9 100644
--- a/test/shlibloadtest.c
+++ b/test/shlibloadtest.c
@@ -17,8 +17,8 @@
 
 typedef void DSO;
 
-typedef const SSL_METHOD * (*TLS_method_t)(void);
-typedef SSL_CTX * (*SSL_CTX_new_t)(const SSL_METHOD *meth);
+typedef const SSL_METHOD *(*TLS_method_t)(void);
+typedef SSL_CTX *(*SSL_CTX_new_t)(const SSL_METHOD *meth);
 typedef void (*SSL_CTX_free_t)(SSL_CTX *);
 typedef int (*OPENSSL_init_crypto_t)(uint64_t, void *);
 typedef int (*OPENSSL_atexit_t)(void (*handler)(void));
@@ -26,7 +26,7 @@ typedef unsigned long (*ERR_get_error_t)(void);
 typedef unsigned long (*OPENSSL_version_major_t)(void);
 typedef unsigned long (*OPENSSL_version_minor_t)(void);
 typedef unsigned long (*OPENSSL_version_patch_t)(void);
-typedef DSO * (*DSO_dsobyaddr_t)(void (*addr)(void), int flags);
+typedef DSO *(*DSO_dsobyaddr_t)(void (*addr)(void), int flags);
 typedef int (*DSO_free_t)(DSO *dso);
 
 typedef enum test_types_en {
@@ -119,11 +119,11 @@ static int test_lib(void)
     }
 
     if (test_type != JUST_CRYPTO
-            && test_type != DSO_REFTEST
-            && test_type != NO_ATEXIT) {
+        && test_type != DSO_REFTEST
+        && test_type != NO_ATEXIT) {
         if (!sd_sym(ssllib, "TLS_method", &symbols[0].sym)
-                || !sd_sym(ssllib, "SSL_CTX_new", &symbols[1].sym)
-                || !sd_sym(ssllib, "SSL_CTX_free", &symbols[2].sym)) {
+            || !sd_sym(ssllib, "SSL_CTX_new", &symbols[1].sym)
+            || !sd_sym(ssllib, "SSL_CTX_free", &symbols[2].sym)) {
             fprintf(stderr, "Failed to load libssl symbols\n");
             goto end;
         }
@@ -139,10 +139,10 @@ static int test_lib(void)
     }
 
     if (!sd_sym(cryptolib, "ERR_get_error", &symbols[0].sym)
-           || !sd_sym(cryptolib, "OPENSSL_version_major", &symbols[1].sym)
-           || !sd_sym(cryptolib, "OPENSSL_version_minor", &symbols[2].sym)
-           || !sd_sym(cryptolib, "OPENSSL_version_patch", &symbols[3].sym)
-           || !sd_sym(cryptolib, "OPENSSL_atexit", &symbols[4].sym)) {
+        || !sd_sym(cryptolib, "OPENSSL_version_major", &symbols[1].sym)
+        || !sd_sym(cryptolib, "OPENSSL_version_minor", &symbols[2].sym)
+        || !sd_sym(cryptolib, "OPENSSL_version_patch", &symbols[3].sym)
+        || !sd_sym(cryptolib, "OPENSSL_atexit", &symbols[4].sym)) {
         fprintf(stderr, "Failed to load libcrypto symbols\n");
         goto end;
     }
@@ -157,8 +157,8 @@ static int test_lib(void)
     myOPENSSL_version_minor = (OPENSSL_version_minor_t)symbols[2].func;
     myOPENSSL_version_patch = (OPENSSL_version_patch_t)symbols[3].func;
     if (myOPENSSL_version_major() != OPENSSL_VERSION_MAJOR
-            || myOPENSSL_version_minor() != OPENSSL_VERSION_MINOR
-            || myOPENSSL_version_patch() != OPENSSL_VERSION_PATCH) {
+        || myOPENSSL_version_minor() != OPENSSL_VERSION_MINOR
+        || myOPENSSL_version_patch() != OPENSSL_VERSION_PATCH) {
         fprintf(stderr, "Invalid library version number\n");
         goto end;
     }
@@ -170,7 +170,7 @@ static int test_lib(void)
     }
 
     if (test_type == DSO_REFTEST) {
-# ifdef DSO_DLFCN
+#ifdef DSO_DLFCN
         DSO_dsobyaddr_t myDSO_dsobyaddr;
         DSO_free_t myDSO_free;
 
@@ -183,7 +183,7 @@ static int test_lib(void)
          * implemented there.
          */
         if (!sd_sym(cryptolib, "DSO_dsobyaddr", &symbols[0].sym)
-                || !sd_sym(cryptolib, "DSO_free", &symbols[1].sym)) {
+            || !sd_sym(cryptolib, "DSO_free", &symbols[1].sym)) {
             fprintf(stderr, "Unable to load DSO symbols\n");
             goto end;
         }
@@ -201,7 +201,7 @@ static int test_lib(void)
             }
             myDSO_free(hndl);
         }
-# endif /* DSO_DLFCN */
+#endif /* DSO_DLFCN */
     }
 
     if (!sd_close(cryptolib)) {
@@ -218,11 +218,11 @@ static int test_lib(void)
         ssllib = SD_INIT;
     }
 
-# if defined(OPENSSL_NO_PINSHARED) \
-    && defined(__GLIBC__) \
-    && defined(__GLIBC_PREREQ) \
+#if defined(OPENSSL_NO_PINSHARED) \
+    && defined(__GLIBC__)         \
+    && defined(__GLIBC_PREREQ)    \
     && defined(OPENSSL_SYS_LINUX)
-#  if __GLIBC_PREREQ(2, 3)
+#if __GLIBC_PREREQ(2, 3)
     /*
      * If we didn't pin the so then we are hopefully on a platform that supports
      * running atexit() on so unload. If not we might crash. We know this is
@@ -232,8 +232,8 @@ static int test_lib(void)
         fprintf(stderr, "atexit() handler did not run\n");
         goto end;
     }
-#  endif
-# endif
+#endif
+#endif
 
     result = 1;
 end:
@@ -245,7 +245,6 @@ static int test_lib(void)
 }
 #endif
 
-
 /*
  * shlibloadtest should not use the normal test framework because we don't want
  * it to link against libcrypto (which the framework uses). The point of the
diff --git a/test/simpledynamic.c b/test/simpledynamic.c
index 2cced8c861408..b3d3d2a59b770 100644
--- a/test/simpledynamic.c
+++ b/test/simpledynamic.c
@@ -8,8 +8,8 @@
  */
 
 #include <string.h>
-#include <stdlib.h>              /* For NULL */
-#include <openssl/macros.h>      /* For NON_EMPTY_TRANSLATION_UNIT */
+#include <stdlib.h> /* For NULL */
+#include <openssl/macros.h> /* For NON_EMPTY_TRANSLATION_UNIT */
 #include <openssl/e_os2.h>
 #include "simpledynamic.h"
 
@@ -67,7 +67,7 @@ const char *sd_error(void)
 
     buffer[0] = '\0';
     FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0,
-                   buffer, sizeof(buffer), NULL);
+        buffer, sizeof(buffer), NULL);
     return buffer;
 }
 
diff --git a/test/simpledynamic.h b/test/simpledynamic.h
index d6e1dcbfd1eb5..9393fc55efa1d 100644
--- a/test/simpledynamic.h
+++ b/test/simpledynamic.h
@@ -8,44 +8,44 @@
  */
 
 #ifndef OSSL_TEST_SIMPLEDYNAMIC_H
-# define OSSL_TEST_SIMPLEDYNAMIC_H
+#define OSSL_TEST_SIMPLEDYNAMIC_H
 
-# include "crypto/dso_conf.h"
+#include "crypto/dso_conf.h"
 
-# if defined(DSO_DLFCN) || defined(DSO_VMS)
+#if defined(DSO_DLFCN) || defined(DSO_VMS)
 
-#  include <dlfcn.h>
+#include <dlfcn.h>
 
-#  define SD_INIT       NULL
-#  ifdef DSO_VMS
-#   define SD_SHLIB     0
-#   define SD_MODULE    0
-#  else
-#   define SD_SHLIB     (RTLD_GLOBAL|RTLD_LAZY)
-#   define SD_MODULE    (RTLD_LOCAL|RTLD_NOW)
-#  endif
+#define SD_INIT NULL
+#ifdef DSO_VMS
+#define SD_SHLIB 0
+#define SD_MODULE 0
+#else
+#define SD_SHLIB (RTLD_GLOBAL | RTLD_LAZY)
+#define SD_MODULE (RTLD_LOCAL | RTLD_NOW)
+#endif
 
 typedef void *SD;
 typedef void *SD_SYM;
 
-# elif defined(DSO_WIN32)
+#elif defined(DSO_WIN32)
 
-#  include <windows.h>
+#include <windows.h>
 
-#  define SD_INIT       0
-#  define SD_SHLIB      0
-#  define SD_MODULE     0
+#define SD_INIT 0
+#define SD_SHLIB 0
+#define SD_MODULE 0
 
 typedef HINSTANCE SD;
 typedef void *SD_SYM;
 
-# endif
+#endif
 
-# if defined(DSO_DLFCN) || defined(DSO_WIN32) || defined(DSO_VMS)
+#if defined(DSO_DLFCN) || defined(DSO_WIN32) || defined(DSO_VMS)
 int sd_load(const char *filename, SD *sd, int type);
 int sd_sym(SD sd, const char *symname, SD_SYM *sym);
 int sd_close(SD lib);
 const char *sd_error(void);
-# endif
+#endif
 
 #endif
diff --git a/test/siphash_internal_test.c b/test/siphash_internal_test.c
index 7d1c6be9e846b..8a97bd700e882 100644
--- a/test/siphash_internal_test.c
+++ b/test/siphash_internal_test.c
@@ -36,139 +36,1805 @@ typedef struct {
 /* From C reference: https://131002.net/siphash/ */
 
 static TESTDATA tests[] = {
-    { 0, { 8, { 0x31, 0x0e, 0x0e, 0xdd, 0x47, 0xdb, 0x6f, 0x72, } } },
-    { 1, { 8, { 0xfd, 0x67, 0xdc, 0x93, 0xc5, 0x39, 0xf8, 0x74, } } },
-    { 2, { 8, { 0x5a, 0x4f, 0xa9, 0xd9, 0x09, 0x80, 0x6c, 0x0d, } } },
-    { 3, { 8, { 0x2d, 0x7e, 0xfb, 0xd7, 0x96, 0x66, 0x67, 0x85, } } },
-    { 4, { 8, { 0xb7, 0x87, 0x71, 0x27, 0xe0, 0x94, 0x27, 0xcf, } } },
-    { 5, { 8, { 0x8d, 0xa6, 0x99, 0xcd, 0x64, 0x55, 0x76, 0x18, } } },
-    { 6, { 8, { 0xce, 0xe3, 0xfe, 0x58, 0x6e, 0x46, 0xc9, 0xcb, } } },
-    { 7, { 8, { 0x37, 0xd1, 0x01, 0x8b, 0xf5, 0x00, 0x02, 0xab, } } },
-    { 8, { 8, { 0x62, 0x24, 0x93, 0x9a, 0x79, 0xf5, 0xf5, 0x93, } } },
-    { 9, { 8, { 0xb0, 0xe4, 0xa9, 0x0b, 0xdf, 0x82, 0x00, 0x9e, } } },
-    { 10, { 8, { 0xf3, 0xb9, 0xdd, 0x94, 0xc5, 0xbb, 0x5d, 0x7a, } } },
-    { 11, { 8, { 0xa7, 0xad, 0x6b, 0x22, 0x46, 0x2f, 0xb3, 0xf4, } } },
-    { 12, { 8, { 0xfb, 0xe5, 0x0e, 0x86, 0xbc, 0x8f, 0x1e, 0x75, } } },
-    { 13, { 8, { 0x90, 0x3d, 0x84, 0xc0, 0x27, 0x56, 0xea, 0x14, } } },
-    { 14, { 8, { 0xee, 0xf2, 0x7a, 0x8e, 0x90, 0xca, 0x23, 0xf7, } } },
-    { 15, { 8, { 0xe5, 0x45, 0xbe, 0x49, 0x61, 0xca, 0x29, 0xa1, } } },
-    { 16, { 8, { 0xdb, 0x9b, 0xc2, 0x57, 0x7f, 0xcc, 0x2a, 0x3f, } } },
-    { 17, { 8, { 0x94, 0x47, 0xbe, 0x2c, 0xf5, 0xe9, 0x9a, 0x69, } } },
-    { 18, { 8, { 0x9c, 0xd3, 0x8d, 0x96, 0xf0, 0xb3, 0xc1, 0x4b, } } },
-    { 19, { 8, { 0xbd, 0x61, 0x79, 0xa7, 0x1d, 0xc9, 0x6d, 0xbb, } } },
-    { 20, { 8, { 0x98, 0xee, 0xa2, 0x1a, 0xf2, 0x5c, 0xd6, 0xbe, } } },
-    { 21, { 8, { 0xc7, 0x67, 0x3b, 0x2e, 0xb0, 0xcb, 0xf2, 0xd0, } } },
-    { 22, { 8, { 0x88, 0x3e, 0xa3, 0xe3, 0x95, 0x67, 0x53, 0x93, } } },
-    { 23, { 8, { 0xc8, 0xce, 0x5c, 0xcd, 0x8c, 0x03, 0x0c, 0xa8, } } },
-    { 24, { 8, { 0x94, 0xaf, 0x49, 0xf6, 0xc6, 0x50, 0xad, 0xb8, } } },
-    { 25, { 8, { 0xea, 0xb8, 0x85, 0x8a, 0xde, 0x92, 0xe1, 0xbc, } } },
-    { 26, { 8, { 0xf3, 0x15, 0xbb, 0x5b, 0xb8, 0x35, 0xd8, 0x17, } } },
-    { 27, { 8, { 0xad, 0xcf, 0x6b, 0x07, 0x63, 0x61, 0x2e, 0x2f, } } },
-    { 28, { 8, { 0xa5, 0xc9, 0x1d, 0xa7, 0xac, 0xaa, 0x4d, 0xde, } } },
-    { 29, { 8, { 0x71, 0x65, 0x95, 0x87, 0x66, 0x50, 0xa2, 0xa6, } } },
-    { 30, { 8, { 0x28, 0xef, 0x49, 0x5c, 0x53, 0xa3, 0x87, 0xad, } } },
-    { 31, { 8, { 0x42, 0xc3, 0x41, 0xd8, 0xfa, 0x92, 0xd8, 0x32, } } },
-    { 32, { 8, { 0xce, 0x7c, 0xf2, 0x72, 0x2f, 0x51, 0x27, 0x71, } } },
-    { 33, { 8, { 0xe3, 0x78, 0x59, 0xf9, 0x46, 0x23, 0xf3, 0xa7, } } },
-    { 34, { 8, { 0x38, 0x12, 0x05, 0xbb, 0x1a, 0xb0, 0xe0, 0x12, } } },
-    { 35, { 8, { 0xae, 0x97, 0xa1, 0x0f, 0xd4, 0x34, 0xe0, 0x15, } } },
-    { 36, { 8, { 0xb4, 0xa3, 0x15, 0x08, 0xbe, 0xff, 0x4d, 0x31, } } },
-    { 37, { 8, { 0x81, 0x39, 0x62, 0x29, 0xf0, 0x90, 0x79, 0x02, } } },
-    { 38, { 8, { 0x4d, 0x0c, 0xf4, 0x9e, 0xe5, 0xd4, 0xdc, 0xca, } } },
-    { 39, { 8, { 0x5c, 0x73, 0x33, 0x6a, 0x76, 0xd8, 0xbf, 0x9a, } } },
-    { 40, { 8, { 0xd0, 0xa7, 0x04, 0x53, 0x6b, 0xa9, 0x3e, 0x0e, } } },
-    { 41, { 8, { 0x92, 0x59, 0x58, 0xfc, 0xd6, 0x42, 0x0c, 0xad, } } },
-    { 42, { 8, { 0xa9, 0x15, 0xc2, 0x9b, 0xc8, 0x06, 0x73, 0x18, } } },
-    { 43, { 8, { 0x95, 0x2b, 0x79, 0xf3, 0xbc, 0x0a, 0xa6, 0xd4, } } },
-    { 44, { 8, { 0xf2, 0x1d, 0xf2, 0xe4, 0x1d, 0x45, 0x35, 0xf9, } } },
-    { 45, { 8, { 0x87, 0x57, 0x75, 0x19, 0x04, 0x8f, 0x53, 0xa9, } } },
-    { 46, { 8, { 0x10, 0xa5, 0x6c, 0xf5, 0xdf, 0xcd, 0x9a, 0xdb, } } },
-    { 47, { 8, { 0xeb, 0x75, 0x09, 0x5c, 0xcd, 0x98, 0x6c, 0xd0, } } },
-    { 48, { 8, { 0x51, 0xa9, 0xcb, 0x9e, 0xcb, 0xa3, 0x12, 0xe6, } } },
-    { 49, { 8, { 0x96, 0xaf, 0xad, 0xfc, 0x2c, 0xe6, 0x66, 0xc7, } } },
-    { 50, { 8, { 0x72, 0xfe, 0x52, 0x97, 0x5a, 0x43, 0x64, 0xee, } } },
-    { 51, { 8, { 0x5a, 0x16, 0x45, 0xb2, 0x76, 0xd5, 0x92, 0xa1, } } },
-    { 52, { 8, { 0xb2, 0x74, 0xcb, 0x8e, 0xbf, 0x87, 0x87, 0x0a, } } },
-    { 53, { 8, { 0x6f, 0x9b, 0xb4, 0x20, 0x3d, 0xe7, 0xb3, 0x81, } } },
-    { 54, { 8, { 0xea, 0xec, 0xb2, 0xa3, 0x0b, 0x22, 0xa8, 0x7f, } } },
-    { 55, { 8, { 0x99, 0x24, 0xa4, 0x3c, 0xc1, 0x31, 0x57, 0x24, } } },
-    { 56, { 8, { 0xbd, 0x83, 0x8d, 0x3a, 0xaf, 0xbf, 0x8d, 0xb7, } } },
-    { 57, { 8, { 0x0b, 0x1a, 0x2a, 0x32, 0x65, 0xd5, 0x1a, 0xea, } } },
-    { 58, { 8, { 0x13, 0x50, 0x79, 0xa3, 0x23, 0x1c, 0xe6, 0x60, } } },
-    { 59, { 8, { 0x93, 0x2b, 0x28, 0x46, 0xe4, 0xd7, 0x06, 0x66, } } },
-    { 60, { 8, { 0xe1, 0x91, 0x5f, 0x5c, 0xb1, 0xec, 0xa4, 0x6c, } } },
-    { 61, { 8, { 0xf3, 0x25, 0x96, 0x5c, 0xa1, 0x6d, 0x62, 0x9f, } } },
-    { 62, { 8, { 0x57, 0x5f, 0xf2, 0x8e, 0x60, 0x38, 0x1b, 0xe5, } } },
-    { 63, { 8, { 0x72, 0x45, 0x06, 0xeb, 0x4c, 0x32, 0x8a, 0x95, } } },
-    { 0, { 16, { 0xa3, 0x81, 0x7f, 0x04, 0xba, 0x25, 0xa8, 0xe6, 0x6d, 0xf6, 0x72, 0x14, 0xc7, 0x55, 0x02, 0x93, } } },
-    { 1, { 16, { 0xda, 0x87, 0xc1, 0xd8, 0x6b, 0x99, 0xaf, 0x44, 0x34, 0x76, 0x59, 0x11, 0x9b, 0x22, 0xfc, 0x45, } } },
-    { 2, { 16, { 0x81, 0x77, 0x22, 0x8d, 0xa4, 0xa4, 0x5d, 0xc7, 0xfc, 0xa3, 0x8b, 0xde, 0xf6, 0x0a, 0xff, 0xe4, } } },
-    { 3, { 16, { 0x9c, 0x70, 0xb6, 0x0c, 0x52, 0x67, 0xa9, 0x4e, 0x5f, 0x33, 0xb6, 0xb0, 0x29, 0x85, 0xed, 0x51, } } },
-    { 4, { 16, { 0xf8, 0x81, 0x64, 0xc1, 0x2d, 0x9c, 0x8f, 0xaf, 0x7d, 0x0f, 0x6e, 0x7c, 0x7b, 0xcd, 0x55, 0x79, } } },
-    { 5, { 16, { 0x13, 0x68, 0x87, 0x59, 0x80, 0x77, 0x6f, 0x88, 0x54, 0x52, 0x7a, 0x07, 0x69, 0x0e, 0x96, 0x27, } } },
-    { 6, { 16, { 0x14, 0xee, 0xca, 0x33, 0x8b, 0x20, 0x86, 0x13, 0x48, 0x5e, 0xa0, 0x30, 0x8f, 0xd7, 0xa1, 0x5e, } } },
-    { 7, { 16, { 0xa1, 0xf1, 0xeb, 0xbe, 0xd8, 0xdb, 0xc1, 0x53, 0xc0, 0xb8, 0x4a, 0xa6, 0x1f, 0xf0, 0x82, 0x39, } } },
-    { 8, { 16, { 0x3b, 0x62, 0xa9, 0xba, 0x62, 0x58, 0xf5, 0x61, 0x0f, 0x83, 0xe2, 0x64, 0xf3, 0x14, 0x97, 0xb4, } } },
-    { 9, { 16, { 0x26, 0x44, 0x99, 0x06, 0x0a, 0xd9, 0xba, 0xab, 0xc4, 0x7f, 0x8b, 0x02, 0xbb, 0x6d, 0x71, 0xed, } } },
-    { 10, { 16, { 0x00, 0x11, 0x0d, 0xc3, 0x78, 0x14, 0x69, 0x56, 0xc9, 0x54, 0x47, 0xd3, 0xf3, 0xd0, 0xfb, 0xba, } } },
-    { 11, { 16, { 0x01, 0x51, 0xc5, 0x68, 0x38, 0x6b, 0x66, 0x77, 0xa2, 0xb4, 0xdc, 0x6f, 0x81, 0xe5, 0xdc, 0x18, } } },
-    { 12, { 16, { 0xd6, 0x26, 0xb2, 0x66, 0x90, 0x5e, 0xf3, 0x58, 0x82, 0x63, 0x4d, 0xf6, 0x85, 0x32, 0xc1, 0x25, } } },
-    { 13, { 16, { 0x98, 0x69, 0xe2, 0x47, 0xe9, 0xc0, 0x8b, 0x10, 0xd0, 0x29, 0x93, 0x4f, 0xc4, 0xb9, 0x52, 0xf7, } } },
-    { 14, { 16, { 0x31, 0xfc, 0xef, 0xac, 0x66, 0xd7, 0xde, 0x9c, 0x7e, 0xc7, 0x48, 0x5f, 0xe4, 0x49, 0x49, 0x02, } } },
-    { 15, { 16, { 0x54, 0x93, 0xe9, 0x99, 0x33, 0xb0, 0xa8, 0x11, 0x7e, 0x08, 0xec, 0x0f, 0x97, 0xcf, 0xc3, 0xd9, } } },
-    { 16, { 16, { 0x6e, 0xe2, 0xa4, 0xca, 0x67, 0xb0, 0x54, 0xbb, 0xfd, 0x33, 0x15, 0xbf, 0x85, 0x23, 0x05, 0x77, } } },
-    { 17, { 16, { 0x47, 0x3d, 0x06, 0xe8, 0x73, 0x8d, 0xb8, 0x98, 0x54, 0xc0, 0x66, 0xc4, 0x7a, 0xe4, 0x77, 0x40, } } },
-    { 18, { 16, { 0xa4, 0x26, 0xe5, 0xe4, 0x23, 0xbf, 0x48, 0x85, 0x29, 0x4d, 0xa4, 0x81, 0xfe, 0xae, 0xf7, 0x23, } } },
-    { 19, { 16, { 0x78, 0x01, 0x77, 0x31, 0xcf, 0x65, 0xfa, 0xb0, 0x74, 0xd5, 0x20, 0x89, 0x52, 0x51, 0x2e, 0xb1, } } },
-    { 20, { 16, { 0x9e, 0x25, 0xfc, 0x83, 0x3f, 0x22, 0x90, 0x73, 0x3e, 0x93, 0x44, 0xa5, 0xe8, 0x38, 0x39, 0xeb, } } },
-    { 21, { 16, { 0x56, 0x8e, 0x49, 0x5a, 0xbe, 0x52, 0x5a, 0x21, 0x8a, 0x22, 0x14, 0xcd, 0x3e, 0x07, 0x1d, 0x12, } } },
-    { 22, { 16, { 0x4a, 0x29, 0xb5, 0x45, 0x52, 0xd1, 0x6b, 0x9a, 0x46, 0x9c, 0x10, 0x52, 0x8e, 0xff, 0x0a, 0xae, } } },
-    { 23, { 16, { 0xc9, 0xd1, 0x84, 0xdd, 0xd5, 0xa9, 0xf5, 0xe0, 0xcf, 0x8c, 0xe2, 0x9a, 0x9a, 0xbf, 0x69, 0x1c, } } },
-    { 24, { 16, { 0x2d, 0xb4, 0x79, 0xae, 0x78, 0xbd, 0x50, 0xd8, 0x88, 0x2a, 0x8a, 0x17, 0x8a, 0x61, 0x32, 0xad, } } },
-    { 25, { 16, { 0x8e, 0xce, 0x5f, 0x04, 0x2d, 0x5e, 0x44, 0x7b, 0x50, 0x51, 0xb9, 0xea, 0xcb, 0x8d, 0x8f, 0x6f, } } },
-    { 26, { 16, { 0x9c, 0x0b, 0x53, 0xb4, 0xb3, 0xc3, 0x07, 0xe8, 0x7e, 0xae, 0xe0, 0x86, 0x78, 0x14, 0x1f, 0x66, } } },
-    { 27, { 16, { 0xab, 0xf2, 0x48, 0xaf, 0x69, 0xa6, 0xea, 0xe4, 0xbf, 0xd3, 0xeb, 0x2f, 0x12, 0x9e, 0xeb, 0x94, } } },
-    { 28, { 16, { 0x06, 0x64, 0xda, 0x16, 0x68, 0x57, 0x4b, 0x88, 0xb9, 0x35, 0xf3, 0x02, 0x73, 0x58, 0xae, 0xf4, } } },
-    { 29, { 16, { 0xaa, 0x4b, 0x9d, 0xc4, 0xbf, 0x33, 0x7d, 0xe9, 0x0c, 0xd4, 0xfd, 0x3c, 0x46, 0x7c, 0x6a, 0xb7, } } },
-    { 30, { 16, { 0xea, 0x5c, 0x7f, 0x47, 0x1f, 0xaf, 0x6b, 0xde, 0x2b, 0x1a, 0xd7, 0xd4, 0x68, 0x6d, 0x22, 0x87, } } },
-    { 31, { 16, { 0x29, 0x39, 0xb0, 0x18, 0x32, 0x23, 0xfa, 0xfc, 0x17, 0x23, 0xde, 0x4f, 0x52, 0xc4, 0x3d, 0x35, } } },
-    { 32, { 16, { 0x7c, 0x39, 0x56, 0xca, 0x5e, 0xea, 0xfc, 0x3e, 0x36, 0x3e, 0x9d, 0x55, 0x65, 0x46, 0xeb, 0x68, } } },
-    { 33, { 16, { 0x77, 0xc6, 0x07, 0x71, 0x46, 0xf0, 0x1c, 0x32, 0xb6, 0xb6, 0x9d, 0x5f, 0x4e, 0xa9, 0xff, 0xcf, } } },
-    { 34, { 16, { 0x37, 0xa6, 0x98, 0x6c, 0xb8, 0x84, 0x7e, 0xdf, 0x09, 0x25, 0xf0, 0xf1, 0x30, 0x9b, 0x54, 0xde, } } },
-    { 35, { 16, { 0xa7, 0x05, 0xf0, 0xe6, 0x9d, 0xa9, 0xa8, 0xf9, 0x07, 0x24, 0x1a, 0x2e, 0x92, 0x3c, 0x8c, 0xc8, } } },
-    { 36, { 16, { 0x3d, 0xc4, 0x7d, 0x1f, 0x29, 0xc4, 0x48, 0x46, 0x1e, 0x9e, 0x76, 0xed, 0x90, 0x4f, 0x67, 0x11, } } },
-    { 37, { 16, { 0x0d, 0x62, 0xbf, 0x01, 0xe6, 0xfc, 0x0e, 0x1a, 0x0d, 0x3c, 0x47, 0x51, 0xc5, 0xd3, 0x69, 0x2b, } } },
-    { 38, { 16, { 0x8c, 0x03, 0x46, 0x8b, 0xca, 0x7c, 0x66, 0x9e, 0xe4, 0xfd, 0x5e, 0x08, 0x4b, 0xbe, 0xe7, 0xb5, } } },
-    { 39, { 16, { 0x52, 0x8a, 0x5b, 0xb9, 0x3b, 0xaf, 0x2c, 0x9c, 0x44, 0x73, 0xcc, 0xe5, 0xd0, 0xd2, 0x2b, 0xd9, } } },
-    { 40, { 16, { 0xdf, 0x6a, 0x30, 0x1e, 0x95, 0xc9, 0x5d, 0xad, 0x97, 0xae, 0x0c, 0xc8, 0xc6, 0x91, 0x3b, 0xd8, } } },
-    { 41, { 16, { 0x80, 0x11, 0x89, 0x90, 0x2c, 0x85, 0x7f, 0x39, 0xe7, 0x35, 0x91, 0x28, 0x5e, 0x70, 0xb6, 0xdb, } } },
-    { 42, { 16, { 0xe6, 0x17, 0x34, 0x6a, 0xc9, 0xc2, 0x31, 0xbb, 0x36, 0x50, 0xae, 0x34, 0xcc, 0xca, 0x0c, 0x5b, } } },
-    { 43, { 16, { 0x27, 0xd9, 0x34, 0x37, 0xef, 0xb7, 0x21, 0xaa, 0x40, 0x18, 0x21, 0xdc, 0xec, 0x5a, 0xdf, 0x89, } } },
-    { 44, { 16, { 0x89, 0x23, 0x7d, 0x9d, 0xed, 0x9c, 0x5e, 0x78, 0xd8, 0xb1, 0xc9, 0xb1, 0x66, 0xcc, 0x73, 0x42, } } },
-    { 45, { 16, { 0x4a, 0x6d, 0x80, 0x91, 0xbf, 0x5e, 0x7d, 0x65, 0x11, 0x89, 0xfa, 0x94, 0xa2, 0x50, 0xb1, 0x4c, } } },
-    { 46, { 16, { 0x0e, 0x33, 0xf9, 0x60, 0x55, 0xe7, 0xae, 0x89, 0x3f, 0xfc, 0x0e, 0x3d, 0xcf, 0x49, 0x29, 0x02, } } },
-    { 47, { 16, { 0xe6, 0x1c, 0x43, 0x2b, 0x72, 0x0b, 0x19, 0xd1, 0x8e, 0xc8, 0xd8, 0x4b, 0xdc, 0x63, 0x15, 0x1b, } } },
-    { 48, { 16, { 0xf7, 0xe5, 0xae, 0xf5, 0x49, 0xf7, 0x82, 0xcf, 0x37, 0x90, 0x55, 0xa6, 0x08, 0x26, 0x9b, 0x16, } } },
-    { 49, { 16, { 0x43, 0x8d, 0x03, 0x0f, 0xd0, 0xb7, 0xa5, 0x4f, 0xa8, 0x37, 0xf2, 0xad, 0x20, 0x1a, 0x64, 0x03, } } },
-    { 50, { 16, { 0xa5, 0x90, 0xd3, 0xee, 0x4f, 0xbf, 0x04, 0xe3, 0x24, 0x7e, 0x0d, 0x27, 0xf2, 0x86, 0x42, 0x3f, } } },
-    { 51, { 16, { 0x5f, 0xe2, 0xc1, 0xa1, 0x72, 0xfe, 0x93, 0xc4, 0xb1, 0x5c, 0xd3, 0x7c, 0xae, 0xf9, 0xf5, 0x38, } } },
-    { 52, { 16, { 0x2c, 0x97, 0x32, 0x5c, 0xbd, 0x06, 0xb3, 0x6e, 0xb2, 0x13, 0x3d, 0xd0, 0x8b, 0x3a, 0x01, 0x7c, } } },
-    { 53, { 16, { 0x92, 0xc8, 0x14, 0x22, 0x7a, 0x6b, 0xca, 0x94, 0x9f, 0xf0, 0x65, 0x9f, 0x00, 0x2a, 0xd3, 0x9e, } } },
-    { 54, { 16, { 0xdc, 0xe8, 0x50, 0x11, 0x0b, 0xd8, 0x32, 0x8c, 0xfb, 0xd5, 0x08, 0x41, 0xd6, 0x91, 0x1d, 0x87, } } },
-    { 55, { 16, { 0x67, 0xf1, 0x49, 0x84, 0xc7, 0xda, 0x79, 0x12, 0x48, 0xe3, 0x2b, 0xb5, 0x92, 0x25, 0x83, 0xda, } } },
-    { 56, { 16, { 0x19, 0x38, 0xf2, 0xcf, 0x72, 0xd5, 0x4e, 0xe9, 0x7e, 0x94, 0x16, 0x6f, 0xa9, 0x1d, 0x2a, 0x36, } } },
-    { 57, { 16, { 0x74, 0x48, 0x1e, 0x96, 0x46, 0xed, 0x49, 0xfe, 0x0f, 0x62, 0x24, 0x30, 0x16, 0x04, 0x69, 0x8e, } } },
-    { 58, { 16, { 0x57, 0xfc, 0xa5, 0xde, 0x98, 0xa9, 0xd6, 0xd8, 0x00, 0x64, 0x38, 0xd0, 0x58, 0x3d, 0x8a, 0x1d, } } },
-    { 59, { 16, { 0x9f, 0xec, 0xde, 0x1c, 0xef, 0xdc, 0x1c, 0xbe, 0xd4, 0x76, 0x36, 0x74, 0xd9, 0x57, 0x53, 0x59, } } },
-    { 60, { 16, { 0xe3, 0x04, 0x0c, 0x00, 0xeb, 0x28, 0xf1, 0x53, 0x66, 0xca, 0x73, 0xcb, 0xd8, 0x72, 0xe7, 0x40, } } },
-    { 61, { 16, { 0x76, 0x97, 0x00, 0x9a, 0x6a, 0x83, 0x1d, 0xfe, 0xcc, 0xa9, 0x1c, 0x59, 0x93, 0x67, 0x0f, 0x7a, } } },
-    { 62, { 16, { 0x58, 0x53, 0x54, 0x23, 0x21, 0xf5, 0x67, 0xa0, 0x05, 0xd5, 0x47, 0xa4, 0xf0, 0x47, 0x59, 0xbd, } } },
-    { 63, { 16, { 0x51, 0x50, 0xd1, 0x77, 0x2f, 0x50, 0x83, 0x4a, 0x50, 0x3e, 0x06, 0x9a, 0x97, 0x3f, 0xbd, 0x7c, } } }
+    { 0, { 8, {
+                  0x31,
+                  0x0e,
+                  0x0e,
+                  0xdd,
+                  0x47,
+                  0xdb,
+                  0x6f,
+                  0x72,
+              } } },
+    { 1, { 8, {
+                  0xfd,
+                  0x67,
+                  0xdc,
+                  0x93,
+                  0xc5,
+                  0x39,
+                  0xf8,
+                  0x74,
+              } } },
+    { 2, { 8, {
+                  0x5a,
+                  0x4f,
+                  0xa9,
+                  0xd9,
+                  0x09,
+                  0x80,
+                  0x6c,
+                  0x0d,
+              } } },
+    { 3, { 8, {
+                  0x2d,
+                  0x7e,
+                  0xfb,
+                  0xd7,
+                  0x96,
+                  0x66,
+                  0x67,
+                  0x85,
+              } } },
+    { 4, { 8, {
+                  0xb7,
+                  0x87,
+                  0x71,
+                  0x27,
+                  0xe0,
+                  0x94,
+                  0x27,
+                  0xcf,
+              } } },
+    { 5, { 8, {
+                  0x8d,
+                  0xa6,
+                  0x99,
+                  0xcd,
+                  0x64,
+                  0x55,
+                  0x76,
+                  0x18,
+              } } },
+    { 6, { 8, {
+                  0xce,
+                  0xe3,
+                  0xfe,
+                  0x58,
+                  0x6e,
+                  0x46,
+                  0xc9,
+                  0xcb,
+              } } },
+    { 7, { 8, {
+                  0x37,
+                  0xd1,
+                  0x01,
+                  0x8b,
+                  0xf5,
+                  0x00,
+                  0x02,
+                  0xab,
+              } } },
+    { 8, { 8, {
+                  0x62,
+                  0x24,
+                  0x93,
+                  0x9a,
+                  0x79,
+                  0xf5,
+                  0xf5,
+                  0x93,
+              } } },
+    { 9, { 8, {
+                  0xb0,
+                  0xe4,
+                  0xa9,
+                  0x0b,
+                  0xdf,
+                  0x82,
+                  0x00,
+                  0x9e,
+              } } },
+    { 10, { 8, {
+                   0xf3,
+                   0xb9,
+                   0xdd,
+                   0x94,
+                   0xc5,
+                   0xbb,
+                   0x5d,
+                   0x7a,
+               } } },
+    { 11, { 8, {
+                   0xa7,
+                   0xad,
+                   0x6b,
+                   0x22,
+                   0x46,
+                   0x2f,
+                   0xb3,
+                   0xf4,
+               } } },
+    { 12, { 8, {
+                   0xfb,
+                   0xe5,
+                   0x0e,
+                   0x86,
+                   0xbc,
+                   0x8f,
+                   0x1e,
+                   0x75,
+               } } },
+    { 13, { 8, {
+                   0x90,
+                   0x3d,
+                   0x84,
+                   0xc0,
+                   0x27,
+                   0x56,
+                   0xea,
+                   0x14,
+               } } },
+    { 14, { 8, {
+                   0xee,
+                   0xf2,
+                   0x7a,
+                   0x8e,
+                   0x90,
+                   0xca,
+                   0x23,
+                   0xf7,
+               } } },
+    { 15, { 8, {
+                   0xe5,
+                   0x45,
+                   0xbe,
+                   0x49,
+                   0x61,
+                   0xca,
+                   0x29,
+                   0xa1,
+               } } },
+    { 16, { 8, {
+                   0xdb,
+                   0x9b,
+                   0xc2,
+                   0x57,
+                   0x7f,
+                   0xcc,
+                   0x2a,
+                   0x3f,
+               } } },
+    { 17, { 8, {
+                   0x94,
+                   0x47,
+                   0xbe,
+                   0x2c,
+                   0xf5,
+                   0xe9,
+                   0x9a,
+                   0x69,
+               } } },
+    { 18, { 8, {
+                   0x9c,
+                   0xd3,
+                   0x8d,
+                   0x96,
+                   0xf0,
+                   0xb3,
+                   0xc1,
+                   0x4b,
+               } } },
+    { 19, { 8, {
+                   0xbd,
+                   0x61,
+                   0x79,
+                   0xa7,
+                   0x1d,
+                   0xc9,
+                   0x6d,
+                   0xbb,
+               } } },
+    { 20, { 8, {
+                   0x98,
+                   0xee,
+                   0xa2,
+                   0x1a,
+                   0xf2,
+                   0x5c,
+                   0xd6,
+                   0xbe,
+               } } },
+    { 21, { 8, {
+                   0xc7,
+                   0x67,
+                   0x3b,
+                   0x2e,
+                   0xb0,
+                   0xcb,
+                   0xf2,
+                   0xd0,
+               } } },
+    { 22, { 8, {
+                   0x88,
+                   0x3e,
+                   0xa3,
+                   0xe3,
+                   0x95,
+                   0x67,
+                   0x53,
+                   0x93,
+               } } },
+    { 23, { 8, {
+                   0xc8,
+                   0xce,
+                   0x5c,
+                   0xcd,
+                   0x8c,
+                   0x03,
+                   0x0c,
+                   0xa8,
+               } } },
+    { 24, { 8, {
+                   0x94,
+                   0xaf,
+                   0x49,
+                   0xf6,
+                   0xc6,
+                   0x50,
+                   0xad,
+                   0xb8,
+               } } },
+    { 25, { 8, {
+                   0xea,
+                   0xb8,
+                   0x85,
+                   0x8a,
+                   0xde,
+                   0x92,
+                   0xe1,
+                   0xbc,
+               } } },
+    { 26, { 8, {
+                   0xf3,
+                   0x15,
+                   0xbb,
+                   0x5b,
+                   0xb8,
+                   0x35,
+                   0xd8,
+                   0x17,
+               } } },
+    { 27, { 8, {
+                   0xad,
+                   0xcf,
+                   0x6b,
+                   0x07,
+                   0x63,
+                   0x61,
+                   0x2e,
+                   0x2f,
+               } } },
+    { 28, { 8, {
+                   0xa5,
+                   0xc9,
+                   0x1d,
+                   0xa7,
+                   0xac,
+                   0xaa,
+                   0x4d,
+                   0xde,
+               } } },
+    { 29, { 8, {
+                   0x71,
+                   0x65,
+                   0x95,
+                   0x87,
+                   0x66,
+                   0x50,
+                   0xa2,
+                   0xa6,
+               } } },
+    { 30, { 8, {
+                   0x28,
+                   0xef,
+                   0x49,
+                   0x5c,
+                   0x53,
+                   0xa3,
+                   0x87,
+                   0xad,
+               } } },
+    { 31, { 8, {
+                   0x42,
+                   0xc3,
+                   0x41,
+                   0xd8,
+                   0xfa,
+                   0x92,
+                   0xd8,
+                   0x32,
+               } } },
+    { 32, { 8, {
+                   0xce,
+                   0x7c,
+                   0xf2,
+                   0x72,
+                   0x2f,
+                   0x51,
+                   0x27,
+                   0x71,
+               } } },
+    { 33, { 8, {
+                   0xe3,
+                   0x78,
+                   0x59,
+                   0xf9,
+                   0x46,
+                   0x23,
+                   0xf3,
+                   0xa7,
+               } } },
+    { 34, { 8, {
+                   0x38,
+                   0x12,
+                   0x05,
+                   0xbb,
+                   0x1a,
+                   0xb0,
+                   0xe0,
+                   0x12,
+               } } },
+    { 35, { 8, {
+                   0xae,
+                   0x97,
+                   0xa1,
+                   0x0f,
+                   0xd4,
+                   0x34,
+                   0xe0,
+                   0x15,
+               } } },
+    { 36, { 8, {
+                   0xb4,
+                   0xa3,
+                   0x15,
+                   0x08,
+                   0xbe,
+                   0xff,
+                   0x4d,
+                   0x31,
+               } } },
+    { 37, { 8, {
+                   0x81,
+                   0x39,
+                   0x62,
+                   0x29,
+                   0xf0,
+                   0x90,
+                   0x79,
+                   0x02,
+               } } },
+    { 38, { 8, {
+                   0x4d,
+                   0x0c,
+                   0xf4,
+                   0x9e,
+                   0xe5,
+                   0xd4,
+                   0xdc,
+                   0xca,
+               } } },
+    { 39, { 8, {
+                   0x5c,
+                   0x73,
+                   0x33,
+                   0x6a,
+                   0x76,
+                   0xd8,
+                   0xbf,
+                   0x9a,
+               } } },
+    { 40, { 8, {
+                   0xd0,
+                   0xa7,
+                   0x04,
+                   0x53,
+                   0x6b,
+                   0xa9,
+                   0x3e,
+                   0x0e,
+               } } },
+    { 41, { 8, {
+                   0x92,
+                   0x59,
+                   0x58,
+                   0xfc,
+                   0xd6,
+                   0x42,
+                   0x0c,
+                   0xad,
+               } } },
+    { 42, { 8, {
+                   0xa9,
+                   0x15,
+                   0xc2,
+                   0x9b,
+                   0xc8,
+                   0x06,
+                   0x73,
+                   0x18,
+               } } },
+    { 43, { 8, {
+                   0x95,
+                   0x2b,
+                   0x79,
+                   0xf3,
+                   0xbc,
+                   0x0a,
+                   0xa6,
+                   0xd4,
+               } } },
+    { 44, { 8, {
+                   0xf2,
+                   0x1d,
+                   0xf2,
+                   0xe4,
+                   0x1d,
+                   0x45,
+                   0x35,
+                   0xf9,
+               } } },
+    { 45, { 8, {
+                   0x87,
+                   0x57,
+                   0x75,
+                   0x19,
+                   0x04,
+                   0x8f,
+                   0x53,
+                   0xa9,
+               } } },
+    { 46, { 8, {
+                   0x10,
+                   0xa5,
+                   0x6c,
+                   0xf5,
+                   0xdf,
+                   0xcd,
+                   0x9a,
+                   0xdb,
+               } } },
+    { 47, { 8, {
+                   0xeb,
+                   0x75,
+                   0x09,
+                   0x5c,
+                   0xcd,
+                   0x98,
+                   0x6c,
+                   0xd0,
+               } } },
+    { 48, { 8, {
+                   0x51,
+                   0xa9,
+                   0xcb,
+                   0x9e,
+                   0xcb,
+                   0xa3,
+                   0x12,
+                   0xe6,
+               } } },
+    { 49, { 8, {
+                   0x96,
+                   0xaf,
+                   0xad,
+                   0xfc,
+                   0x2c,
+                   0xe6,
+                   0x66,
+                   0xc7,
+               } } },
+    { 50, { 8, {
+                   0x72,
+                   0xfe,
+                   0x52,
+                   0x97,
+                   0x5a,
+                   0x43,
+                   0x64,
+                   0xee,
+               } } },
+    { 51, { 8, {
+                   0x5a,
+                   0x16,
+                   0x45,
+                   0xb2,
+                   0x76,
+                   0xd5,
+                   0x92,
+                   0xa1,
+               } } },
+    { 52, { 8, {
+                   0xb2,
+                   0x74,
+                   0xcb,
+                   0x8e,
+                   0xbf,
+                   0x87,
+                   0x87,
+                   0x0a,
+               } } },
+    { 53, { 8, {
+                   0x6f,
+                   0x9b,
+                   0xb4,
+                   0x20,
+                   0x3d,
+                   0xe7,
+                   0xb3,
+                   0x81,
+               } } },
+    { 54, { 8, {
+                   0xea,
+                   0xec,
+                   0xb2,
+                   0xa3,
+                   0x0b,
+                   0x22,
+                   0xa8,
+                   0x7f,
+               } } },
+    { 55, { 8, {
+                   0x99,
+                   0x24,
+                   0xa4,
+                   0x3c,
+                   0xc1,
+                   0x31,
+                   0x57,
+                   0x24,
+               } } },
+    { 56, { 8, {
+                   0xbd,
+                   0x83,
+                   0x8d,
+                   0x3a,
+                   0xaf,
+                   0xbf,
+                   0x8d,
+                   0xb7,
+               } } },
+    { 57, { 8, {
+                   0x0b,
+                   0x1a,
+                   0x2a,
+                   0x32,
+                   0x65,
+                   0xd5,
+                   0x1a,
+                   0xea,
+               } } },
+    { 58, { 8, {
+                   0x13,
+                   0x50,
+                   0x79,
+                   0xa3,
+                   0x23,
+                   0x1c,
+                   0xe6,
+                   0x60,
+               } } },
+    { 59, { 8, {
+                   0x93,
+                   0x2b,
+                   0x28,
+                   0x46,
+                   0xe4,
+                   0xd7,
+                   0x06,
+                   0x66,
+               } } },
+    { 60, { 8, {
+                   0xe1,
+                   0x91,
+                   0x5f,
+                   0x5c,
+                   0xb1,
+                   0xec,
+                   0xa4,
+                   0x6c,
+               } } },
+    { 61, { 8, {
+                   0xf3,
+                   0x25,
+                   0x96,
+                   0x5c,
+                   0xa1,
+                   0x6d,
+                   0x62,
+                   0x9f,
+               } } },
+    { 62, { 8, {
+                   0x57,
+                   0x5f,
+                   0xf2,
+                   0x8e,
+                   0x60,
+                   0x38,
+                   0x1b,
+                   0xe5,
+               } } },
+    { 63, { 8, {
+                   0x72,
+                   0x45,
+                   0x06,
+                   0xeb,
+                   0x4c,
+                   0x32,
+                   0x8a,
+                   0x95,
+               } } },
+    { 0, { 16, {
+                   0xa3,
+                   0x81,
+                   0x7f,
+                   0x04,
+                   0xba,
+                   0x25,
+                   0xa8,
+                   0xe6,
+                   0x6d,
+                   0xf6,
+                   0x72,
+                   0x14,
+                   0xc7,
+                   0x55,
+                   0x02,
+                   0x93,
+               } } },
+    { 1, { 16, {
+                   0xda,
+                   0x87,
+                   0xc1,
+                   0xd8,
+                   0x6b,
+                   0x99,
+                   0xaf,
+                   0x44,
+                   0x34,
+                   0x76,
+                   0x59,
+                   0x11,
+                   0x9b,
+                   0x22,
+                   0xfc,
+                   0x45,
+               } } },
+    { 2, { 16, {
+                   0x81,
+                   0x77,
+                   0x22,
+                   0x8d,
+                   0xa4,
+                   0xa4,
+                   0x5d,
+                   0xc7,
+                   0xfc,
+                   0xa3,
+                   0x8b,
+                   0xde,
+                   0xf6,
+                   0x0a,
+                   0xff,
+                   0xe4,
+               } } },
+    { 3, { 16, {
+                   0x9c,
+                   0x70,
+                   0xb6,
+                   0x0c,
+                   0x52,
+                   0x67,
+                   0xa9,
+                   0x4e,
+                   0x5f,
+                   0x33,
+                   0xb6,
+                   0xb0,
+                   0x29,
+                   0x85,
+                   0xed,
+                   0x51,
+               } } },
+    { 4, { 16, {
+                   0xf8,
+                   0x81,
+                   0x64,
+                   0xc1,
+                   0x2d,
+                   0x9c,
+                   0x8f,
+                   0xaf,
+                   0x7d,
+                   0x0f,
+                   0x6e,
+                   0x7c,
+                   0x7b,
+                   0xcd,
+                   0x55,
+                   0x79,
+               } } },
+    { 5, { 16, {
+                   0x13,
+                   0x68,
+                   0x87,
+                   0x59,
+                   0x80,
+                   0x77,
+                   0x6f,
+                   0x88,
+                   0x54,
+                   0x52,
+                   0x7a,
+                   0x07,
+                   0x69,
+                   0x0e,
+                   0x96,
+                   0x27,
+               } } },
+    { 6, { 16, {
+                   0x14,
+                   0xee,
+                   0xca,
+                   0x33,
+                   0x8b,
+                   0x20,
+                   0x86,
+                   0x13,
+                   0x48,
+                   0x5e,
+                   0xa0,
+                   0x30,
+                   0x8f,
+                   0xd7,
+                   0xa1,
+                   0x5e,
+               } } },
+    { 7, { 16, {
+                   0xa1,
+                   0xf1,
+                   0xeb,
+                   0xbe,
+                   0xd8,
+                   0xdb,
+                   0xc1,
+                   0x53,
+                   0xc0,
+                   0xb8,
+                   0x4a,
+                   0xa6,
+                   0x1f,
+                   0xf0,
+                   0x82,
+                   0x39,
+               } } },
+    { 8, { 16, {
+                   0x3b,
+                   0x62,
+                   0xa9,
+                   0xba,
+                   0x62,
+                   0x58,
+                   0xf5,
+                   0x61,
+                   0x0f,
+                   0x83,
+                   0xe2,
+                   0x64,
+                   0xf3,
+                   0x14,
+                   0x97,
+                   0xb4,
+               } } },
+    { 9, { 16, {
+                   0x26,
+                   0x44,
+                   0x99,
+                   0x06,
+                   0x0a,
+                   0xd9,
+                   0xba,
+                   0xab,
+                   0xc4,
+                   0x7f,
+                   0x8b,
+                   0x02,
+                   0xbb,
+                   0x6d,
+                   0x71,
+                   0xed,
+               } } },
+    { 10, { 16, {
+                    0x00,
+                    0x11,
+                    0x0d,
+                    0xc3,
+                    0x78,
+                    0x14,
+                    0x69,
+                    0x56,
+                    0xc9,
+                    0x54,
+                    0x47,
+                    0xd3,
+                    0xf3,
+                    0xd0,
+                    0xfb,
+                    0xba,
+                } } },
+    { 11, { 16, {
+                    0x01,
+                    0x51,
+                    0xc5,
+                    0x68,
+                    0x38,
+                    0x6b,
+                    0x66,
+                    0x77,
+                    0xa2,
+                    0xb4,
+                    0xdc,
+                    0x6f,
+                    0x81,
+                    0xe5,
+                    0xdc,
+                    0x18,
+                } } },
+    { 12, { 16, {
+                    0xd6,
+                    0x26,
+                    0xb2,
+                    0x66,
+                    0x90,
+                    0x5e,
+                    0xf3,
+                    0x58,
+                    0x82,
+                    0x63,
+                    0x4d,
+                    0xf6,
+                    0x85,
+                    0x32,
+                    0xc1,
+                    0x25,
+                } } },
+    { 13, { 16, {
+                    0x98,
+                    0x69,
+                    0xe2,
+                    0x47,
+                    0xe9,
+                    0xc0,
+                    0x8b,
+                    0x10,
+                    0xd0,
+                    0x29,
+                    0x93,
+                    0x4f,
+                    0xc4,
+                    0xb9,
+                    0x52,
+                    0xf7,
+                } } },
+    { 14, { 16, {
+                    0x31,
+                    0xfc,
+                    0xef,
+                    0xac,
+                    0x66,
+                    0xd7,
+                    0xde,
+                    0x9c,
+                    0x7e,
+                    0xc7,
+                    0x48,
+                    0x5f,
+                    0xe4,
+                    0x49,
+                    0x49,
+                    0x02,
+                } } },
+    { 15, { 16, {
+                    0x54,
+                    0x93,
+                    0xe9,
+                    0x99,
+                    0x33,
+                    0xb0,
+                    0xa8,
+                    0x11,
+                    0x7e,
+                    0x08,
+                    0xec,
+                    0x0f,
+                    0x97,
+                    0xcf,
+                    0xc3,
+                    0xd9,
+                } } },
+    { 16, { 16, {
+                    0x6e,
+                    0xe2,
+                    0xa4,
+                    0xca,
+                    0x67,
+                    0xb0,
+                    0x54,
+                    0xbb,
+                    0xfd,
+                    0x33,
+                    0x15,
+                    0xbf,
+                    0x85,
+                    0x23,
+                    0x05,
+                    0x77,
+                } } },
+    { 17, { 16, {
+                    0x47,
+                    0x3d,
+                    0x06,
+                    0xe8,
+                    0x73,
+                    0x8d,
+                    0xb8,
+                    0x98,
+                    0x54,
+                    0xc0,
+                    0x66,
+                    0xc4,
+                    0x7a,
+                    0xe4,
+                    0x77,
+                    0x40,
+                } } },
+    { 18, { 16, {
+                    0xa4,
+                    0x26,
+                    0xe5,
+                    0xe4,
+                    0x23,
+                    0xbf,
+                    0x48,
+                    0x85,
+                    0x29,
+                    0x4d,
+                    0xa4,
+                    0x81,
+                    0xfe,
+                    0xae,
+                    0xf7,
+                    0x23,
+                } } },
+    { 19, { 16, {
+                    0x78,
+                    0x01,
+                    0x77,
+                    0x31,
+                    0xcf,
+                    0x65,
+                    0xfa,
+                    0xb0,
+                    0x74,
+                    0xd5,
+                    0x20,
+                    0x89,
+                    0x52,
+                    0x51,
+                    0x2e,
+                    0xb1,
+                } } },
+    { 20, { 16, {
+                    0x9e,
+                    0x25,
+                    0xfc,
+                    0x83,
+                    0x3f,
+                    0x22,
+                    0x90,
+                    0x73,
+                    0x3e,
+                    0x93,
+                    0x44,
+                    0xa5,
+                    0xe8,
+                    0x38,
+                    0x39,
+                    0xeb,
+                } } },
+    { 21, { 16, {
+                    0x56,
+                    0x8e,
+                    0x49,
+                    0x5a,
+                    0xbe,
+                    0x52,
+                    0x5a,
+                    0x21,
+                    0x8a,
+                    0x22,
+                    0x14,
+                    0xcd,
+                    0x3e,
+                    0x07,
+                    0x1d,
+                    0x12,
+                } } },
+    { 22, { 16, {
+                    0x4a,
+                    0x29,
+                    0xb5,
+                    0x45,
+                    0x52,
+                    0xd1,
+                    0x6b,
+                    0x9a,
+                    0x46,
+                    0x9c,
+                    0x10,
+                    0x52,
+                    0x8e,
+                    0xff,
+                    0x0a,
+                    0xae,
+                } } },
+    { 23, { 16, {
+                    0xc9,
+                    0xd1,
+                    0x84,
+                    0xdd,
+                    0xd5,
+                    0xa9,
+                    0xf5,
+                    0xe0,
+                    0xcf,
+                    0x8c,
+                    0xe2,
+                    0x9a,
+                    0x9a,
+                    0xbf,
+                    0x69,
+                    0x1c,
+                } } },
+    { 24, { 16, {
+                    0x2d,
+                    0xb4,
+                    0x79,
+                    0xae,
+                    0x78,
+                    0xbd,
+                    0x50,
+                    0xd8,
+                    0x88,
+                    0x2a,
+                    0x8a,
+                    0x17,
+                    0x8a,
+                    0x61,
+                    0x32,
+                    0xad,
+                } } },
+    { 25, { 16, {
+                    0x8e,
+                    0xce,
+                    0x5f,
+                    0x04,
+                    0x2d,
+                    0x5e,
+                    0x44,
+                    0x7b,
+                    0x50,
+                    0x51,
+                    0xb9,
+                    0xea,
+                    0xcb,
+                    0x8d,
+                    0x8f,
+                    0x6f,
+                } } },
+    { 26, { 16, {
+                    0x9c,
+                    0x0b,
+                    0x53,
+                    0xb4,
+                    0xb3,
+                    0xc3,
+                    0x07,
+                    0xe8,
+                    0x7e,
+                    0xae,
+                    0xe0,
+                    0x86,
+                    0x78,
+                    0x14,
+                    0x1f,
+                    0x66,
+                } } },
+    { 27, { 16, {
+                    0xab,
+                    0xf2,
+                    0x48,
+                    0xaf,
+                    0x69,
+                    0xa6,
+                    0xea,
+                    0xe4,
+                    0xbf,
+                    0xd3,
+                    0xeb,
+                    0x2f,
+                    0x12,
+                    0x9e,
+                    0xeb,
+                    0x94,
+                } } },
+    { 28, { 16, {
+                    0x06,
+                    0x64,
+                    0xda,
+                    0x16,
+                    0x68,
+                    0x57,
+                    0x4b,
+                    0x88,
+                    0xb9,
+                    0x35,
+                    0xf3,
+                    0x02,
+                    0x73,
+                    0x58,
+                    0xae,
+                    0xf4,
+                } } },
+    { 29, { 16, {
+                    0xaa,
+                    0x4b,
+                    0x9d,
+                    0xc4,
+                    0xbf,
+                    0x33,
+                    0x7d,
+                    0xe9,
+                    0x0c,
+                    0xd4,
+                    0xfd,
+                    0x3c,
+                    0x46,
+                    0x7c,
+                    0x6a,
+                    0xb7,
+                } } },
+    { 30, { 16, {
+                    0xea,
+                    0x5c,
+                    0x7f,
+                    0x47,
+                    0x1f,
+                    0xaf,
+                    0x6b,
+                    0xde,
+                    0x2b,
+                    0x1a,
+                    0xd7,
+                    0xd4,
+                    0x68,
+                    0x6d,
+                    0x22,
+                    0x87,
+                } } },
+    { 31, { 16, {
+                    0x29,
+                    0x39,
+                    0xb0,
+                    0x18,
+                    0x32,
+                    0x23,
+                    0xfa,
+                    0xfc,
+                    0x17,
+                    0x23,
+                    0xde,
+                    0x4f,
+                    0x52,
+                    0xc4,
+                    0x3d,
+                    0x35,
+                } } },
+    { 32, { 16, {
+                    0x7c,
+                    0x39,
+                    0x56,
+                    0xca,
+                    0x5e,
+                    0xea,
+                    0xfc,
+                    0x3e,
+                    0x36,
+                    0x3e,
+                    0x9d,
+                    0x55,
+                    0x65,
+                    0x46,
+                    0xeb,
+                    0x68,
+                } } },
+    { 33, { 16, {
+                    0x77,
+                    0xc6,
+                    0x07,
+                    0x71,
+                    0x46,
+                    0xf0,
+                    0x1c,
+                    0x32,
+                    0xb6,
+                    0xb6,
+                    0x9d,
+                    0x5f,
+                    0x4e,
+                    0xa9,
+                    0xff,
+                    0xcf,
+                } } },
+    { 34, { 16, {
+                    0x37,
+                    0xa6,
+                    0x98,
+                    0x6c,
+                    0xb8,
+                    0x84,
+                    0x7e,
+                    0xdf,
+                    0x09,
+                    0x25,
+                    0xf0,
+                    0xf1,
+                    0x30,
+                    0x9b,
+                    0x54,
+                    0xde,
+                } } },
+    { 35, { 16, {
+                    0xa7,
+                    0x05,
+                    0xf0,
+                    0xe6,
+                    0x9d,
+                    0xa9,
+                    0xa8,
+                    0xf9,
+                    0x07,
+                    0x24,
+                    0x1a,
+                    0x2e,
+                    0x92,
+                    0x3c,
+                    0x8c,
+                    0xc8,
+                } } },
+    { 36, { 16, {
+                    0x3d,
+                    0xc4,
+                    0x7d,
+                    0x1f,
+                    0x29,
+                    0xc4,
+                    0x48,
+                    0x46,
+                    0x1e,
+                    0x9e,
+                    0x76,
+                    0xed,
+                    0x90,
+                    0x4f,
+                    0x67,
+                    0x11,
+                } } },
+    { 37, { 16, {
+                    0x0d,
+                    0x62,
+                    0xbf,
+                    0x01,
+                    0xe6,
+                    0xfc,
+                    0x0e,
+                    0x1a,
+                    0x0d,
+                    0x3c,
+                    0x47,
+                    0x51,
+                    0xc5,
+                    0xd3,
+                    0x69,
+                    0x2b,
+                } } },
+    { 38, { 16, {
+                    0x8c,
+                    0x03,
+                    0x46,
+                    0x8b,
+                    0xca,
+                    0x7c,
+                    0x66,
+                    0x9e,
+                    0xe4,
+                    0xfd,
+                    0x5e,
+                    0x08,
+                    0x4b,
+                    0xbe,
+                    0xe7,
+                    0xb5,
+                } } },
+    { 39, { 16, {
+                    0x52,
+                    0x8a,
+                    0x5b,
+                    0xb9,
+                    0x3b,
+                    0xaf,
+                    0x2c,
+                    0x9c,
+                    0x44,
+                    0x73,
+                    0xcc,
+                    0xe5,
+                    0xd0,
+                    0xd2,
+                    0x2b,
+                    0xd9,
+                } } },
+    { 40, { 16, {
+                    0xdf,
+                    0x6a,
+                    0x30,
+                    0x1e,
+                    0x95,
+                    0xc9,
+                    0x5d,
+                    0xad,
+                    0x97,
+                    0xae,
+                    0x0c,
+                    0xc8,
+                    0xc6,
+                    0x91,
+                    0x3b,
+                    0xd8,
+                } } },
+    { 41, { 16, {
+                    0x80,
+                    0x11,
+                    0x89,
+                    0x90,
+                    0x2c,
+                    0x85,
+                    0x7f,
+                    0x39,
+                    0xe7,
+                    0x35,
+                    0x91,
+                    0x28,
+                    0x5e,
+                    0x70,
+                    0xb6,
+                    0xdb,
+                } } },
+    { 42, { 16, {
+                    0xe6,
+                    0x17,
+                    0x34,
+                    0x6a,
+                    0xc9,
+                    0xc2,
+                    0x31,
+                    0xbb,
+                    0x36,
+                    0x50,
+                    0xae,
+                    0x34,
+                    0xcc,
+                    0xca,
+                    0x0c,
+                    0x5b,
+                } } },
+    { 43, { 16, {
+                    0x27,
+                    0xd9,
+                    0x34,
+                    0x37,
+                    0xef,
+                    0xb7,
+                    0x21,
+                    0xaa,
+                    0x40,
+                    0x18,
+                    0x21,
+                    0xdc,
+                    0xec,
+                    0x5a,
+                    0xdf,
+                    0x89,
+                } } },
+    { 44, { 16, {
+                    0x89,
+                    0x23,
+                    0x7d,
+                    0x9d,
+                    0xed,
+                    0x9c,
+                    0x5e,
+                    0x78,
+                    0xd8,
+                    0xb1,
+                    0xc9,
+                    0xb1,
+                    0x66,
+                    0xcc,
+                    0x73,
+                    0x42,
+                } } },
+    { 45, { 16, {
+                    0x4a,
+                    0x6d,
+                    0x80,
+                    0x91,
+                    0xbf,
+                    0x5e,
+                    0x7d,
+                    0x65,
+                    0x11,
+                    0x89,
+                    0xfa,
+                    0x94,
+                    0xa2,
+                    0x50,
+                    0xb1,
+                    0x4c,
+                } } },
+    { 46, { 16, {
+                    0x0e,
+                    0x33,
+                    0xf9,
+                    0x60,
+                    0x55,
+                    0xe7,
+                    0xae,
+                    0x89,
+                    0x3f,
+                    0xfc,
+                    0x0e,
+                    0x3d,
+                    0xcf,
+                    0x49,
+                    0x29,
+                    0x02,
+                } } },
+    { 47, { 16, {
+                    0xe6,
+                    0x1c,
+                    0x43,
+                    0x2b,
+                    0x72,
+                    0x0b,
+                    0x19,
+                    0xd1,
+                    0x8e,
+                    0xc8,
+                    0xd8,
+                    0x4b,
+                    0xdc,
+                    0x63,
+                    0x15,
+                    0x1b,
+                } } },
+    { 48, { 16, {
+                    0xf7,
+                    0xe5,
+                    0xae,
+                    0xf5,
+                    0x49,
+                    0xf7,
+                    0x82,
+                    0xcf,
+                    0x37,
+                    0x90,
+                    0x55,
+                    0xa6,
+                    0x08,
+                    0x26,
+                    0x9b,
+                    0x16,
+                } } },
+    { 49, { 16, {
+                    0x43,
+                    0x8d,
+                    0x03,
+                    0x0f,
+                    0xd0,
+                    0xb7,
+                    0xa5,
+                    0x4f,
+                    0xa8,
+                    0x37,
+                    0xf2,
+                    0xad,
+                    0x20,
+                    0x1a,
+                    0x64,
+                    0x03,
+                } } },
+    { 50, { 16, {
+                    0xa5,
+                    0x90,
+                    0xd3,
+                    0xee,
+                    0x4f,
+                    0xbf,
+                    0x04,
+                    0xe3,
+                    0x24,
+                    0x7e,
+                    0x0d,
+                    0x27,
+                    0xf2,
+                    0x86,
+                    0x42,
+                    0x3f,
+                } } },
+    { 51, { 16, {
+                    0x5f,
+                    0xe2,
+                    0xc1,
+                    0xa1,
+                    0x72,
+                    0xfe,
+                    0x93,
+                    0xc4,
+                    0xb1,
+                    0x5c,
+                    0xd3,
+                    0x7c,
+                    0xae,
+                    0xf9,
+                    0xf5,
+                    0x38,
+                } } },
+    { 52, { 16, {
+                    0x2c,
+                    0x97,
+                    0x32,
+                    0x5c,
+                    0xbd,
+                    0x06,
+                    0xb3,
+                    0x6e,
+                    0xb2,
+                    0x13,
+                    0x3d,
+                    0xd0,
+                    0x8b,
+                    0x3a,
+                    0x01,
+                    0x7c,
+                } } },
+    { 53, { 16, {
+                    0x92,
+                    0xc8,
+                    0x14,
+                    0x22,
+                    0x7a,
+                    0x6b,
+                    0xca,
+                    0x94,
+                    0x9f,
+                    0xf0,
+                    0x65,
+                    0x9f,
+                    0x00,
+                    0x2a,
+                    0xd3,
+                    0x9e,
+                } } },
+    { 54, { 16, {
+                    0xdc,
+                    0xe8,
+                    0x50,
+                    0x11,
+                    0x0b,
+                    0xd8,
+                    0x32,
+                    0x8c,
+                    0xfb,
+                    0xd5,
+                    0x08,
+                    0x41,
+                    0xd6,
+                    0x91,
+                    0x1d,
+                    0x87,
+                } } },
+    { 55, { 16, {
+                    0x67,
+                    0xf1,
+                    0x49,
+                    0x84,
+                    0xc7,
+                    0xda,
+                    0x79,
+                    0x12,
+                    0x48,
+                    0xe3,
+                    0x2b,
+                    0xb5,
+                    0x92,
+                    0x25,
+                    0x83,
+                    0xda,
+                } } },
+    { 56, { 16, {
+                    0x19,
+                    0x38,
+                    0xf2,
+                    0xcf,
+                    0x72,
+                    0xd5,
+                    0x4e,
+                    0xe9,
+                    0x7e,
+                    0x94,
+                    0x16,
+                    0x6f,
+                    0xa9,
+                    0x1d,
+                    0x2a,
+                    0x36,
+                } } },
+    { 57, { 16, {
+                    0x74,
+                    0x48,
+                    0x1e,
+                    0x96,
+                    0x46,
+                    0xed,
+                    0x49,
+                    0xfe,
+                    0x0f,
+                    0x62,
+                    0x24,
+                    0x30,
+                    0x16,
+                    0x04,
+                    0x69,
+                    0x8e,
+                } } },
+    { 58, { 16, {
+                    0x57,
+                    0xfc,
+                    0xa5,
+                    0xde,
+                    0x98,
+                    0xa9,
+                    0xd6,
+                    0xd8,
+                    0x00,
+                    0x64,
+                    0x38,
+                    0xd0,
+                    0x58,
+                    0x3d,
+                    0x8a,
+                    0x1d,
+                } } },
+    { 59, { 16, {
+                    0x9f,
+                    0xec,
+                    0xde,
+                    0x1c,
+                    0xef,
+                    0xdc,
+                    0x1c,
+                    0xbe,
+                    0xd4,
+                    0x76,
+                    0x36,
+                    0x74,
+                    0xd9,
+                    0x57,
+                    0x53,
+                    0x59,
+                } } },
+    { 60, { 16, {
+                    0xe3,
+                    0x04,
+                    0x0c,
+                    0x00,
+                    0xeb,
+                    0x28,
+                    0xf1,
+                    0x53,
+                    0x66,
+                    0xca,
+                    0x73,
+                    0xcb,
+                    0xd8,
+                    0x72,
+                    0xe7,
+                    0x40,
+                } } },
+    { 61, { 16, {
+                    0x76,
+                    0x97,
+                    0x00,
+                    0x9a,
+                    0x6a,
+                    0x83,
+                    0x1d,
+                    0xfe,
+                    0xcc,
+                    0xa9,
+                    0x1c,
+                    0x59,
+                    0x93,
+                    0x67,
+                    0x0f,
+                    0x7a,
+                } } },
+    { 62, { 16, {
+                    0x58,
+                    0x53,
+                    0x54,
+                    0x23,
+                    0x21,
+                    0xf5,
+                    0x67,
+                    0xa0,
+                    0x05,
+                    0xd5,
+                    0x47,
+                    0xa4,
+                    0xf0,
+                    0x47,
+                    0x59,
+                    0xbd,
+                } } },
+    { 63, { 16, {
+                    0x51,
+                    0x50,
+                    0xd1,
+                    0x77,
+                    0x2f,
+                    0x50,
+                    0x83,
+                    0x4a,
+                    0x50,
+                    0x3e,
+                    0x06,
+                    0x9a,
+                    0x97,
+                    0x3f,
+                    0xbd,
+                    0x7c,
+                } } }
 };
 
 static int test_siphash(int idx)
 {
-    SIPHASH siphash = { 0, };
+    SIPHASH siphash = {
+        0,
+    };
     TESTDATA test = tests[idx];
     unsigned char key[SIPHASH_KEY_SIZE];
     unsigned char in[64];
@@ -178,10 +1844,9 @@ static int test_siphash(int idx)
     unsigned char out[SIPHASH_MAX_DIGEST_SIZE];
     size_t i;
 
-    if (expectedlen != SIPHASH_MIN_DIGEST_SIZE &&
-        expectedlen != SIPHASH_MAX_DIGEST_SIZE) {
+    if (expectedlen != SIPHASH_MIN_DIGEST_SIZE && expectedlen != SIPHASH_MAX_DIGEST_SIZE) {
         TEST_info("size %zu vs %d and %d", expectedlen,
-                  SIPHASH_MIN_DIGEST_SIZE, SIPHASH_MAX_DIGEST_SIZE);
+            SIPHASH_MIN_DIGEST_SIZE, SIPHASH_MAX_DIGEST_SIZE);
         return 0;
     }
 
@@ -208,7 +1873,7 @@ static int test_siphash(int idx)
             || !TEST_true(SipHash_Init(&siphash, key, 0, 0)))
             return 0;
         SipHash_Update(&siphash, in, 1);
-        SipHash_Update(&siphash, in+1, inlen-1);
+        SipHash_Update(&siphash, in + 1, inlen - 1);
         if (!TEST_true(SipHash_Final(&siphash, out, expectedlen)))
             return 0;
 
@@ -225,7 +1890,7 @@ static int test_siphash(int idx)
             || !TEST_true(SipHash_Init(&siphash, key, 0, 0)))
             return 0;
         SipHash_Update(&siphash, in, half);
-        SipHash_Update(&siphash, in+half, inlen-half);
+        SipHash_Update(&siphash, in + half, inlen - half);
         if (!TEST_true(SipHash_Final(&siphash, out, expectedlen)))
             return 0;
 
@@ -239,13 +1904,13 @@ static int test_siphash(int idx)
                 || !TEST_true(SipHash_Init(&siphash, key, 0, 0)))
                 return 0;
             SipHash_Update(&siphash, in, half);
-            SipHash_Update(&siphash, in+half, inlen-half);
+            SipHash_Update(&siphash, in + half, inlen - half);
             if (!TEST_true(SipHash_Final(&siphash, out, expectedlen)))
                 return 0;
 
             if (!TEST_mem_eq(out, expectedlen, expected, expectedlen)) {
                 TEST_info("SipHash test #%d/%zu+%zu failed.",
-                          idx, half, inlen-half);
+                    idx, half, inlen - half);
                 return 0;
             }
         }
@@ -256,31 +1921,33 @@ static int test_siphash(int idx)
 
 static int test_siphash_basic(void)
 {
-    SIPHASH siphash = { 0, };
-    static const unsigned char key[SIPHASH_KEY_SIZE] = {0};
+    SIPHASH siphash = {
+        0,
+    };
+    static const unsigned char key[SIPHASH_KEY_SIZE] = { 0 };
     unsigned char output[SIPHASH_MAX_DIGEST_SIZE];
 
     /* Use invalid hash size */
     return TEST_int_eq(SipHash_set_hash_size(&siphash, 4), 0)
-           && TEST_false(SipHash_Final(&siphash, output, 0))
-           /* Use hash size = 8 */
-           && TEST_true(SipHash_set_hash_size(&siphash, 8))
-           && TEST_false(SipHash_Final(&siphash, output, 8))
-           && TEST_true(SipHash_Init(&siphash, key, 0, 0))
-           && TEST_true(SipHash_Final(&siphash, output, 8))
-           && TEST_int_eq(SipHash_Final(&siphash, output, 16), 0)
+        && TEST_false(SipHash_Final(&siphash, output, 0))
+        /* Use hash size = 8 */
+        && TEST_true(SipHash_set_hash_size(&siphash, 8))
+        && TEST_false(SipHash_Final(&siphash, output, 8))
+        && TEST_true(SipHash_Init(&siphash, key, 0, 0))
+        && TEST_true(SipHash_Final(&siphash, output, 8))
+        && TEST_int_eq(SipHash_Final(&siphash, output, 16), 0)
 
-           /* Use hash size = 16 */
-           && TEST_true(SipHash_set_hash_size(&siphash, 16))
-           && TEST_true(SipHash_Init(&siphash, key, 0, 0))
-           && TEST_int_eq(SipHash_Final(&siphash, output, 8), 0)
-           && TEST_true(SipHash_Final(&siphash, output, 16))
+        /* Use hash size = 16 */
+        && TEST_true(SipHash_set_hash_size(&siphash, 16))
+        && TEST_true(SipHash_Init(&siphash, key, 0, 0))
+        && TEST_int_eq(SipHash_Final(&siphash, output, 8), 0)
+        && TEST_true(SipHash_Final(&siphash, output, 16))
 
-           /* Use hash size = 0 (default = 16) */
-           && TEST_true(SipHash_set_hash_size(&siphash, 0))
-           && TEST_true(SipHash_Init(&siphash, key, 0, 0))
-           && TEST_int_eq(SipHash_Final(&siphash, output, 8), 0)
-           && TEST_true(SipHash_Final(&siphash, output, 16));
+        /* Use hash size = 0 (default = 16) */
+        && TEST_true(SipHash_set_hash_size(&siphash, 0))
+        && TEST_true(SipHash_Init(&siphash, key, 0, 0))
+        && TEST_int_eq(SipHash_Final(&siphash, output, 8), 0)
+        && TEST_true(SipHash_Final(&siphash, output, 16));
 }
 
 int setup_tests(void)
diff --git a/test/slh_dsa_test.c b/test/slh_dsa_test.c
index eff9071937a26..7c55a830e1e94 100644
--- a/test/slh_dsa_test.c
+++ b/test/slh_dsa_test.c
@@ -29,8 +29,8 @@ static OSSL_PROVIDER *null_prov = NULL;
 static OSSL_PROVIDER *lib_prov = NULL;
 
 static EVP_PKEY *slh_dsa_key_from_data(const char *alg,
-                                       const unsigned char *data, size_t datalen,
-                                       int public)
+    const unsigned char *data, size_t datalen,
+    int public)
 {
     int ret;
     EVP_PKEY_CTX *ctx = NULL;
@@ -53,8 +53,8 @@ static EVP_PKEY *slh_dsa_key_from_data(const char *alg,
 }
 
 static int slh_dsa_create_keypair(EVP_PKEY **pkey, const char *name,
-                                  const uint8_t *priv, size_t priv_len,
-                                  const uint8_t *pub, size_t pub_len)
+    const uint8_t *priv, size_t priv_len,
+    const uint8_t *pub, size_t pub_len)
 {
     int ret = 0;
     EVP_PKEY_CTX *ctx = NULL;
@@ -63,17 +63,20 @@ static int slh_dsa_create_keypair(EVP_PKEY **pkey, const char *name,
     const char *pub_name = OSSL_PKEY_PARAM_PUB_KEY;
 
     if (!TEST_ptr(bld = OSSL_PARAM_BLD_new())
-            || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                                                           OSSL_PKEY_PARAM_PRIV_KEY,
-                                                           priv, priv_len) > 0)
-            || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
-                                                           pub_name,
-                                                           pub, pub_len) > 0)
-            || !TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
-            || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(lib_ctx, name, NULL))
-            || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
-            || !TEST_int_eq(EVP_PKEY_fromdata(ctx, pkey, EVP_PKEY_KEYPAIR,
-                                              params), 1))
+        || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
+                          OSSL_PKEY_PARAM_PRIV_KEY,
+                          priv, priv_len)
+            > 0)
+        || !TEST_true(OSSL_PARAM_BLD_push_octet_string(bld,
+                          pub_name,
+                          pub, pub_len)
+            > 0)
+        || !TEST_ptr(params = OSSL_PARAM_BLD_to_param(bld))
+        || !TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(lib_ctx, name, NULL))
+        || !TEST_int_eq(EVP_PKEY_fromdata_init(ctx), 1)
+        || !TEST_int_eq(EVP_PKEY_fromdata(ctx, pkey, EVP_PKEY_KEYPAIR,
+                            params),
+            1))
         goto err;
 
     ret = 1;
@@ -99,16 +102,16 @@ static int slh_dsa_bad_pub_len_test(void)
     memcpy(pubdata, td->pub, td->pub_len);
 
     if (!TEST_ptr_null(pkey = slh_dsa_key_from_data(td->alg, pubdata,
-                                                    td->pub_len - 1, 1))
-            || !TEST_ptr_null(pkey = slh_dsa_key_from_data(td->alg, pubdata,
-                                                           td->pub_len + 1, 1)))
+                           td->pub_len - 1, 1))
+        || !TEST_ptr_null(pkey = slh_dsa_key_from_data(td->alg, pubdata,
+                              td->pub_len + 1, 1)))
         goto end;
 
     ret = 1;
 end:
     if (ret == 0)
         TEST_note("Incorrectly accepted public key of length %u (expected %u)",
-                  (unsigned)pub_len, (unsigned)td->pub_len);
+            (unsigned)pub_len, (unsigned)td->pub_len);
     EVP_PKEY_free(pkey);
     return ret == 1;
 }
@@ -125,14 +128,14 @@ static int slh_dsa_key_eq_test(void)
 #endif
 
     if (!TEST_ptr(key[0] = slh_dsa_key_from_data(td1->alg, td1->pub, td1->pub_len, 1))
-            || !TEST_ptr(key[1] = slh_dsa_key_from_data(td1->alg, td1->pub, td1->pub_len, 1))
-            || !TEST_ptr(key[2] = slh_dsa_key_from_data(td2->alg, td2->pub, td2->pub_len, 1))
-            || !TEST_ptr(key[3] = EVP_PKEY_dup(key[0])))
+        || !TEST_ptr(key[1] = slh_dsa_key_from_data(td1->alg, td1->pub, td1->pub_len, 1))
+        || !TEST_ptr(key[2] = slh_dsa_key_from_data(td2->alg, td2->pub, td2->pub_len, 1))
+        || !TEST_ptr(key[3] = EVP_PKEY_dup(key[0])))
         goto end;
 
     if (!TEST_int_eq(EVP_PKEY_eq(key[0], key[1]), 1)
-            || !TEST_int_ne(EVP_PKEY_eq(key[0], key[2]), 1)
-            || !TEST_int_eq(EVP_PKEY_eq(key[0], key[3]), 1))
+        || !TEST_int_ne(EVP_PKEY_eq(key[0], key[2]), 1)
+        || !TEST_int_eq(EVP_PKEY_eq(key[0], key[3]), 1))
         goto end;
 
 #ifndef OPENSSL_NO_EC
@@ -143,7 +146,7 @@ static int slh_dsa_key_eq_test(void)
 #else
     ret = 1;
 #endif
- end:
+end:
     for (i = 0; i < OSSL_NELEM(key); ++i)
         EVP_PKEY_free(key[i]);
     return ret;
@@ -183,10 +186,11 @@ static int slh_dsa_key_validate_failure_test(void)
      * Loading 128s private key data into a 128f algorithm will have an incorrect
      * public key.
      */
-    if (!TEST_ptr(key = slh_dsa_key_from_data("SLH-DSA-SHA2-128f",
-                                              slh_dsa_sha2_128s_0_keygen_priv,
-                                              sizeof(slh_dsa_sha2_128s_0_keygen_priv), 0)))
-        return 0;
+    key = slh_dsa_key_from_data("SLH-DSA-SHA2-128f",
+        slh_dsa_sha2_128s_0_keygen_priv,
+        sizeof(slh_dsa_sha2_128s_0_keygen_priv), 0);
+    if (!TEST_ptr(key))
+        goto end;
     if (!TEST_ptr(vctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, key, NULL)))
         goto end;
     if (!TEST_int_eq(EVP_PKEY_pairwise_check(vctx), 0))
@@ -205,7 +209,7 @@ static int slh_dsa_key_validate_failure_test(void)
  * run as a KAT for the verify.
  */
 static int do_slh_dsa_verify(const SLH_DSA_SIG_TEST_DATA *td,
-                             uint8_t *sig, size_t sig_len)
+    uint8_t *sig, size_t sig_len)
 {
     int ret = 0;
     EVP_PKEY_CTX *vctx = NULL;
@@ -224,8 +228,9 @@ static int do_slh_dsa_verify(const SLH_DSA_SIG_TEST_DATA *td,
     if (!TEST_ptr(sig_alg = EVP_SIGNATURE_fetch(lib_ctx, td->alg, NULL)))
         goto err;
     if (!TEST_int_eq(EVP_PKEY_verify_message_init(vctx, sig_alg, params), 1)
-            || !TEST_int_eq(EVP_PKEY_verify(vctx, sig, sig_len,
-                                            td->msg, td->msg_len), 1))
+        || !TEST_int_eq(EVP_PKEY_verify(vctx, sig, sig_len,
+                            td->msg, td->msg_len),
+            1))
         goto err;
     ret = 1;
 err:
@@ -253,8 +258,8 @@ static int slh_dsa_sign_verify_test(int tst_id)
     *p++ = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_MESSAGE_ENCODING, &encode);
     if (td->add_random != NULL)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_TEST_ENTROPY,
-                                                 (char *)td->add_random,
-                                                 td->add_random_len);
+            (char *)td->add_random,
+            td->add_random_len);
     *p = OSSL_PARAM_construct_end();
 
     /*
@@ -262,7 +267,7 @@ static int slh_dsa_sign_verify_test(int tst_id)
      * The keygen path is tested via slh_dsa_keygen_test
      */
     if (!slh_dsa_create_keypair(&pkey, td->alg, td->priv, td->priv_len,
-                                td->pub, td->pub_len))
+            td->pub, td->pub_len))
         goto err;
 
     if (!TEST_ptr(sctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, pkey, NULL)))
@@ -270,17 +275,20 @@ static int slh_dsa_sign_verify_test(int tst_id)
     if (!TEST_ptr(sig_alg = EVP_SIGNATURE_fetch(lib_ctx, td->alg, NULL)))
         goto err;
     if (!TEST_int_eq(EVP_PKEY_sign_message_init(sctx, sig_alg, params), 1)
-            || !TEST_int_eq(EVP_PKEY_sign(sctx, NULL, &psig_len,
-                                          td->msg, td->msg_len), 1)
-            || !TEST_true(EVP_PKEY_get_size_t_param(pkey, OSSL_PKEY_PARAM_MAX_SIZE,
-                                                    &sig_len2))
-            || !TEST_int_eq(sig_len2, psig_len)
-            || !TEST_ptr(psig = OPENSSL_zalloc(psig_len))
-            || !TEST_int_eq(EVP_PKEY_sign(sctx, psig, &psig_len,
-                                          td->msg, td->msg_len), 1))
+        || !TEST_int_eq(EVP_PKEY_sign(sctx, NULL, &psig_len,
+                            td->msg, td->msg_len),
+            1)
+        || !TEST_true(EVP_PKEY_get_size_t_param(pkey, OSSL_PKEY_PARAM_MAX_SIZE,
+            &sig_len2))
+        || !TEST_int_eq(sig_len2, psig_len)
+        || !TEST_ptr(psig = OPENSSL_zalloc(psig_len))
+        || !TEST_int_eq(EVP_PKEY_sign(sctx, psig, &psig_len,
+                            td->msg, td->msg_len),
+            1))
         goto err;
     if (!TEST_int_eq(EVP_Q_digest(lib_ctx, "SHA256", NULL, psig, psig_len,
-                                  digest, &digest_len), 1))
+                         digest, &digest_len),
+            1))
         goto err;
     if (!TEST_mem_eq(digest, digest_len, td->sig_digest, td->sig_digest_len))
         goto err;
@@ -296,7 +304,7 @@ static int slh_dsa_sign_verify_test(int tst_id)
 }
 
 static EVP_PKEY *do_gen_key(const char *alg,
-                            const uint8_t *seed, size_t seed_len)
+    const uint8_t *seed, size_t seed_len)
 {
     EVP_PKEY *pkey = NULL;
     EVP_PKEY_CTX *ctx = NULL;
@@ -304,13 +312,13 @@ static EVP_PKEY *do_gen_key(const char *alg,
 
     if (seed_len != 0)
         *p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_SLH_DSA_SEED,
-                                                 (char *)seed, seed_len);
+            (char *)seed, seed_len);
     *p = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(lib_ctx, alg, NULL))
-            || !TEST_int_eq(EVP_PKEY_keygen_init(ctx), 1)
-            || !TEST_int_eq(EVP_PKEY_CTX_set_params(ctx, params), 1)
-            || !TEST_int_eq(EVP_PKEY_generate(ctx, &pkey), 1))
+        || !TEST_int_eq(EVP_PKEY_keygen_init(ctx), 1)
+        || !TEST_int_eq(EVP_PKEY_CTX_set_params(ctx, params), 1)
+        || !TEST_int_eq(EVP_PKEY_generate(ctx, &pkey), 1))
         pkey = NULL;
 
     EVP_PKEY_CTX_free(ctx);
@@ -332,24 +340,24 @@ static int slh_dsa_keygen_test(int tst_id)
         goto err;
 
     if (!TEST_true(EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_PRIV_KEY,
-                                                   priv, sizeof(priv), &priv_len)))
+            priv, sizeof(priv), &priv_len)))
         goto err;
     if (!TEST_true(EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_PUB_KEY,
-                                                   pub, sizeof(pub), &pub_len)))
+            pub, sizeof(pub), &pub_len)))
         goto err;
     if (!TEST_true(EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_BITS, &bits))
-            || !TEST_int_eq(bits, 8 * 2 * n)
-            || !TEST_true(EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_SECURITY_BITS,
-                                                 &sec_bits))
-            || !TEST_int_eq(sec_bits, 8 * n)
-            || !TEST_true(EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_MAX_SIZE,
-                                                 &sig_len))
-            || !TEST_int_ge(sig_len, 7856)
-            || !TEST_int_le(sig_len, 49856))
+        || !TEST_int_eq(bits, 8 * 2 * n)
+        || !TEST_true(EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_SECURITY_BITS,
+            &sec_bits))
+        || !TEST_int_eq(sec_bits, 8 * n)
+        || !TEST_true(EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_MAX_SIZE,
+            &sig_len))
+        || !TEST_int_ge(sig_len, 7856)
+        || !TEST_int_le(sig_len, 49856))
         goto err;
 
     if (!TEST_size_t_eq(priv_len, key_len)
-            || !TEST_size_t_eq(pub_len, key_len / 2))
+        || !TEST_size_t_eq(pub_len, key_len / 2))
         goto err;
     if (!TEST_mem_eq(pub, pub_len, tst->priv + 2 * n, 2 * n))
         goto err;
@@ -368,49 +376,49 @@ static int slh_dsa_usage_test(void)
     EVP_PKEY_CTX *gctx = NULL, *sctx = NULL, *vctx = NULL;
     EVP_PKEY *gkey = NULL, *pub = NULL, *priv = NULL;
     EVP_SIGNATURE *sig_alg = NULL;
-    uint8_t *sig  = NULL;
+    uint8_t *sig = NULL;
     size_t sig_len = 0;
     uint8_t msg[] = "Hello World";
     size_t msg_len = sizeof(msg) - 1;
 
     /* Generate a key */
     if (!TEST_ptr(gctx = EVP_PKEY_CTX_new_from_name(lib_ctx, "SLH-DSA-SHA2-128s", NULL))
-            || !TEST_int_eq(EVP_PKEY_keygen_init(gctx), 1)
-            || !TEST_int_eq(EVP_PKEY_keygen(gctx, &gkey), 1))
+        || !TEST_int_eq(EVP_PKEY_keygen_init(gctx), 1)
+        || !TEST_int_eq(EVP_PKEY_keygen(gctx, &gkey), 1))
         goto err;
 
     /* Save it to a BIO - it uses a mem bio for testing */
     if (!TEST_ptr(pub_bio = BIO_new(BIO_s_mem()))
-            || !TEST_ptr(priv_bio = BIO_new(BIO_s_mem()))
-            || !TEST_ptr(cipher = EVP_CIPHER_fetch(lib_ctx, "AES-256-CBC", NULL))
-            || !TEST_true(PEM_write_bio_PUBKEY_ex(pub_bio, gkey, lib_ctx, NULL))
-            || !TEST_true(PEM_write_bio_PrivateKey_ex(priv_bio, gkey, cipher,
-                                                      NULL, 0, NULL, (void *)pass,
-                                                      lib_ctx, NULL)))
+        || !TEST_ptr(priv_bio = BIO_new(BIO_s_mem()))
+        || !TEST_ptr(cipher = EVP_CIPHER_fetch(lib_ctx, "AES-256-CBC", NULL))
+        || !TEST_true(PEM_write_bio_PUBKEY_ex(pub_bio, gkey, lib_ctx, NULL))
+        || !TEST_true(PEM_write_bio_PrivateKey_ex(priv_bio, gkey, cipher,
+            NULL, 0, NULL, (void *)pass,
+            lib_ctx, NULL)))
         goto err;
 
     /* Read the private key and add to a signing ctx */
     if (!TEST_ptr(PEM_read_bio_PrivateKey_ex(priv_bio, &priv, NULL, pass, lib_ctx, NULL))
-            || !TEST_ptr(sctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, priv, NULL))
-            || !TEST_ptr(sig_alg = EVP_SIGNATURE_fetch(lib_ctx, "SLH-DSA-SHA2-128s", NULL))
-            || !TEST_int_eq(EVP_PKEY_sign_message_init(sctx, sig_alg, NULL), 1))
+        || !TEST_ptr(sctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, priv, NULL))
+        || !TEST_ptr(sig_alg = EVP_SIGNATURE_fetch(lib_ctx, "SLH-DSA-SHA2-128s", NULL))
+        || !TEST_int_eq(EVP_PKEY_sign_message_init(sctx, sig_alg, NULL), 1))
         goto err;
     /* Determine the size of the signature & allocate space */
     if (!TEST_int_eq(EVP_PKEY_sign(sctx, NULL, &sig_len, msg, msg_len), 1)
-            || !TEST_ptr(sig = OPENSSL_malloc(sig_len))
-            || !TEST_int_eq(EVP_PKEY_sign(sctx, sig, &sig_len, msg, msg_len), 1))
+        || !TEST_ptr(sig = OPENSSL_malloc(sig_len))
+        || !TEST_int_eq(EVP_PKEY_sign(sctx, sig, &sig_len, msg, msg_len), 1))
         goto err;
     if (!TEST_true(EVP_PKEY_pairwise_check(sctx))
-            || !TEST_true(EVP_PKEY_public_check(sctx))
-            || !TEST_true(EVP_PKEY_private_check(sctx)))
+        || !TEST_true(EVP_PKEY_public_check(sctx))
+        || !TEST_true(EVP_PKEY_private_check(sctx)))
         goto err;
     /* Read the public key and add to a verify ctx */
     if (!TEST_ptr(PEM_read_bio_PUBKEY_ex(pub_bio, &pub, NULL, NULL, lib_ctx, NULL))
-            || !TEST_ptr(vctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, pub, NULL)))
+        || !TEST_ptr(vctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, pub, NULL)))
         goto err;
     /* verify the signature */
     if (!TEST_int_eq(EVP_PKEY_verify_message_init(vctx, sig_alg, NULL), 1)
-            || !TEST_int_eq(EVP_PKEY_verify(vctx, sig, sig_len, msg, msg_len), 1))
+        || !TEST_int_eq(EVP_PKEY_verify(vctx, sig, sig_len, msg, msg_len), 1))
         goto err;
 
     ret = 1;
@@ -438,7 +446,7 @@ static int slh_dsa_deterministic_usage_test(void)
     EVP_PKEY_CTX *gctx = NULL, *sctx = NULL, *vctx = NULL, *dupctx = NULL;
     EVP_PKEY *gkey = NULL, *pub = NULL, *priv = NULL;
     EVP_SIGNATURE *sig_alg = NULL;
-    uint8_t *sig  = NULL;
+    uint8_t *sig = NULL;
     size_t sig_len = 0, len = 0;
     uint8_t msg[] = { 0x01, 0x02, 0x03, 0x04 };
     size_t msg_len = sizeof(msg);
@@ -454,12 +462,12 @@ static int slh_dsa_deterministic_usage_test(void)
 
     /* Save it to a BIO - it uses a mem bio for testing */
     if (!TEST_ptr(pub_bio = BIO_new(BIO_s_mem()))
-            || !TEST_ptr(priv_bio = BIO_new(BIO_s_mem()))
-            || !TEST_ptr(cipher = EVP_CIPHER_fetch(lib_ctx, "AES-256-CBC", NULL))
-            || !TEST_true(PEM_write_bio_PUBKEY_ex(pub_bio, gkey, lib_ctx, NULL))
-            || !TEST_true(PEM_write_bio_PrivateKey_ex(priv_bio, gkey, cipher,
-                                                      NULL, 0, NULL, (void *)pass,
-                                                      lib_ctx, NULL)))
+        || !TEST_ptr(priv_bio = BIO_new(BIO_s_mem()))
+        || !TEST_ptr(cipher = EVP_CIPHER_fetch(lib_ctx, "AES-256-CBC", NULL))
+        || !TEST_true(PEM_write_bio_PUBKEY_ex(pub_bio, gkey, lib_ctx, NULL))
+        || !TEST_true(PEM_write_bio_PrivateKey_ex(priv_bio, gkey, cipher,
+            NULL, 0, NULL, (void *)pass,
+            lib_ctx, NULL)))
         goto err;
 
     *p++ = OSSL_PARAM_construct_int(OSSL_SIGNATURE_PARAM_DETERMINISTIC, &deterministic);
@@ -467,10 +475,10 @@ static int slh_dsa_deterministic_usage_test(void)
 
     /* Read the private key and add to a signing ctx */
     if (!TEST_ptr(PEM_read_bio_PrivateKey_ex(priv_bio, &priv, NULL, pass, lib_ctx, NULL))
-            || !TEST_ptr(sctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, priv, NULL))
-            /* Init the signature */
-            || !TEST_ptr(sig_alg = EVP_SIGNATURE_fetch(lib_ctx, tst->name, NULL))
-            || !TEST_int_eq(EVP_PKEY_sign_message_init(sctx, sig_alg, params), 1))
+        || !TEST_ptr(sctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, priv, NULL))
+        /* Init the signature */
+        || !TEST_ptr(sig_alg = EVP_SIGNATURE_fetch(lib_ctx, tst->name, NULL))
+        || !TEST_int_eq(EVP_PKEY_sign_message_init(sctx, sig_alg, params), 1))
         goto err;
 
     if (!TEST_ptr(dupctx = EVP_PKEY_CTX_dup(sctx)))
@@ -481,24 +489,26 @@ static int slh_dsa_deterministic_usage_test(void)
         goto err;
     len = sig_len;
     if (!TEST_ptr(sig = OPENSSL_zalloc(sig_len * 2))
-            || !TEST_int_eq(EVP_PKEY_sign(sctx, sig, &len, msg, msg_len), 1)
-            || !TEST_size_t_eq(sig_len, len)
-            || !TEST_int_eq(EVP_PKEY_sign(dupctx, sig + sig_len, &len,
-                                          msg, msg_len), 1)
-            || !TEST_size_t_eq(sig_len, len))
+        || !TEST_int_eq(EVP_PKEY_sign(sctx, sig, &len, msg, msg_len), 1)
+        || !TEST_size_t_eq(sig_len, len)
+        || !TEST_int_eq(EVP_PKEY_sign(dupctx, sig + sig_len, &len,
+                            msg, msg_len),
+            1)
+        || !TEST_size_t_eq(sig_len, len))
         goto err;
     /* Read the public key and add to a verify ctx */
     if (!TEST_ptr(PEM_read_bio_PUBKEY_ex(pub_bio, &pub, NULL, NULL, lib_ctx, NULL))
-            || !TEST_ptr(vctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, pub, NULL)))
+        || !TEST_ptr(vctx = EVP_PKEY_CTX_new_from_pkey(lib_ctx, pub, NULL)))
         goto err;
     EVP_PKEY_CTX_free(dupctx);
 
     /* verify the signature */
     if (!TEST_int_eq(EVP_PKEY_verify_message_init(vctx, sig_alg, NULL), 1)
-            || !TEST_ptr(dupctx = EVP_PKEY_CTX_dup(vctx))
-            || !TEST_int_eq(EVP_PKEY_verify(vctx, sig, sig_len, msg, msg_len), 1)
-            || !TEST_int_eq(EVP_PKEY_verify(dupctx, sig + sig_len, sig_len,
-                                            msg, msg_len), 1))
+        || !TEST_ptr(dupctx = EVP_PKEY_CTX_dup(vctx))
+        || !TEST_int_eq(EVP_PKEY_verify(vctx, sig, sig_len, msg, msg_len), 1)
+        || !TEST_int_eq(EVP_PKEY_verify(dupctx, sig + sig_len, sig_len,
+                            msg, msg_len),
+            1))
         goto err;
     ret = 1;
 err:
@@ -534,33 +544,38 @@ static int slh_dsa_digest_sign_verify_test(void)
         goto err;
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_SIGNATURE_PARAM_CONTEXT_STRING,
-                                             context, sizeof(context));
+        context, sizeof(context));
     *p++ = OSSL_PARAM_construct_end();
 
     if (!TEST_ptr(mctx = EVP_MD_CTX_new())
-            || !TEST_int_eq(EVP_DigestSignInit_ex(mctx, NULL, "SHA256",
-                                                  lib_ctx, "?fips=true",
-                                                  key, params), 0)
-            || !TEST_int_eq(EVP_DigestSignInit_ex(mctx, NULL, NULL, lib_ctx,
-                                                  "?fips=true", key, params), 1))
+        || !TEST_int_eq(EVP_DigestSignInit_ex(mctx, NULL, "SHA256",
+                            lib_ctx, "?fips=true",
+                            key, params),
+            0)
+        || !TEST_int_eq(EVP_DigestSignInit_ex(mctx, NULL, NULL, lib_ctx,
+                            "?fips=true", key, params),
+            1))
         goto err;
     if (!TEST_int_eq(EVP_DigestSign(mctx, NULL, &sig_len, msg, msg_len), 1)
-            || !TEST_ptr(sig = OPENSSL_zalloc(sig_len)))
+        || !TEST_ptr(sig = OPENSSL_zalloc(sig_len)))
         goto err;
     sig_len--;
     if (!TEST_int_eq(EVP_DigestSign(mctx, sig, &sig_len, msg, msg_len), 0))
         goto err;
     sig_len++;
     if (!TEST_int_eq(EVP_DigestSignInit_ex(mctx, NULL, NULL, lib_ctx, "?fips=true",
-                                           key, params), 1)
-            || !TEST_int_eq(EVP_DigestSign(mctx, sig, &sig_len, msg, msg_len), 1)
-            || !TEST_int_eq(EVP_DigestVerifyInit_ex(mctx, NULL, "SHA256",
-                                                    lib_ctx, "?fips=true",
-                                                    key, params), 0)
-            || !TEST_int_eq(EVP_DigestVerifyInit_ex(mctx, NULL, NULL,
-                                                    lib_ctx, "?fips=true",
-                                                    key, params), 1)
-            || !TEST_int_eq(EVP_DigestVerify(mctx, sig, sig_len, msg, msg_len), 1))
+                         key, params),
+            1)
+        || !TEST_int_eq(EVP_DigestSign(mctx, sig, &sig_len, msg, msg_len), 1)
+        || !TEST_int_eq(EVP_DigestVerifyInit_ex(mctx, NULL, "SHA256",
+                            lib_ctx, "?fips=true",
+                            key, params),
+            0)
+        || !TEST_int_eq(EVP_DigestVerifyInit_ex(mctx, NULL, NULL,
+                            lib_ctx, "?fips=true",
+                            key, params),
+            1)
+        || !TEST_int_eq(EVP_DigestVerify(mctx, sig, sig_len, msg, msg_len), 1))
         goto err;
     ret = 1;
 err:
@@ -579,34 +594,34 @@ static int slh_dsa_keygen_invalid_test(void)
     OSSL_PARAM params[2], *p = params;
     size_t key_len = tst->priv_len;
     size_t n = key_len / 4;
-    uint8_t seed[128] = {0};
+    uint8_t seed[128] = { 0 };
 
     if (!TEST_ptr(ctx = EVP_PKEY_CTX_new_from_name(lib_ctx, tst->name, NULL))
-            || !TEST_int_eq(EVP_PKEY_keygen_init(ctx), 1))
+        || !TEST_int_eq(EVP_PKEY_keygen_init(ctx), 1))
         goto err;
 
     /* Test the set fails if the seed is larger than the internal buffer */
     p[0] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_SLH_DSA_SEED,
-                                             seed, 97);
+        seed, 97);
     p[1] = OSSL_PARAM_construct_end();
     if (!TEST_int_eq(EVP_PKEY_CTX_set_params(ctx, params), 0))
         goto err;
 
     /* Test the generate fails if the seed is not the correct size */
     p[0] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_SLH_DSA_SEED,
-                                             seed, n * 3 - 1);
+        seed, n * 3 - 1);
     p[1] = OSSL_PARAM_construct_end();
 
     if (!TEST_int_eq(EVP_PKEY_CTX_set_params(ctx, params), 1)
-            || !TEST_int_eq(EVP_PKEY_generate(ctx, &pkey), 0))
+        || !TEST_int_eq(EVP_PKEY_generate(ctx, &pkey), 0))
         goto err;
 
     /* Test the generate fails if the seed is not the correct size */
     p[0] = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_SLH_DSA_SEED,
-                                             seed, n * 3 + 1);
+        seed, n * 3 + 1);
     p[1] = OSSL_PARAM_construct_end();
     if (!TEST_int_eq(EVP_PKEY_CTX_set_params(ctx, params), 1)
-            || !TEST_int_eq(EVP_PKEY_generate(ctx, &pkey), 0))
+        || !TEST_int_eq(EVP_PKEY_generate(ctx, &pkey), 0))
         goto err;
     ret = 1;
 err:
@@ -620,7 +635,7 @@ const OPTIONS *test_get_options(void)
     static const OPTIONS options[] = {
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the libctx" },
+            "The configuration file to use for the libctx" },
         { NULL }
     };
     return options;
diff --git a/test/sm2_internal_test.c b/test/sm2_internal_test.c
index 1623098fc6ff4..8455765c2f68b 100644
--- a/test/sm2_internal_test.c
+++ b/test/sm2_internal_test.c
@@ -26,7 +26,7 @@
 
 #ifndef OPENSSL_NO_SM2
 
-# include "crypto/sm2.h"
+#include "crypto/sm2.h"
 
 static fake_random_generate_cb get_faked_bytes;
 
@@ -36,8 +36,8 @@ static size_t fake_rand_bytes_offset = 0;
 static size_t fake_rand_size = 0;
 
 static int get_faked_bytes(unsigned char *buf, size_t num,
-                           ossl_unused const char *name,
-                           ossl_unused EVP_RAND_CTX *ctx)
+    ossl_unused const char *name,
+    ossl_unused EVP_RAND_CTX *ctx)
 {
     if (!TEST_ptr(fake_rand_bytes) || !TEST_size_t_gt(fake_rand_size, 0))
         return 0;
@@ -62,7 +62,6 @@ static int start_fake_rand(const char *hex_bytes)
     /* use own random function */
     fake_rand_set_public_private_callbacks(NULL, get_faked_bytes);
     return 1;
-
 }
 
 static void restore_rand(void)
@@ -74,9 +73,9 @@ static void restore_rand(void)
 }
 
 static EC_GROUP *create_EC_group(const char *p_hex, const char *a_hex,
-                                 const char *b_hex, const char *x_hex,
-                                 const char *y_hex, const char *order_hex,
-                                 const char *cof_hex)
+    const char *b_hex, const char *x_hex,
+    const char *y_hex, const char *order_hex,
+    const char *cof_hex)
 {
     BIGNUM *p = NULL;
     BIGNUM *a = NULL;
@@ -90,8 +89,8 @@ static EC_GROUP *create_EC_group(const char *p_hex, const char *a_hex,
     int ok = 0;
 
     if (!TEST_true(BN_hex2bn(&p, p_hex))
-            || !TEST_true(BN_hex2bn(&a, a_hex))
-            || !TEST_true(BN_hex2bn(&b, b_hex)))
+        || !TEST_true(BN_hex2bn(&a, a_hex))
+        || !TEST_true(BN_hex2bn(&b, b_hex)))
         goto done;
 
     group = EC_GROUP_new_curve_GFp(p, a, b, NULL);
@@ -103,14 +102,14 @@ static EC_GROUP *create_EC_group(const char *p_hex, const char *a_hex,
         goto done;
 
     if (!TEST_true(BN_hex2bn(&g_x, x_hex))
-            || !TEST_true(BN_hex2bn(&g_y, y_hex))
-            || !TEST_true(EC_POINT_set_affine_coordinates(group, generator, g_x,
-                                                          g_y, NULL)))
+        || !TEST_true(BN_hex2bn(&g_y, y_hex))
+        || !TEST_true(EC_POINT_set_affine_coordinates(group, generator, g_x,
+            g_y, NULL)))
         goto done;
 
     if (!TEST_true(BN_hex2bn(&order, order_hex))
-            || !TEST_true(BN_hex2bn(&cof, cof_hex))
-            || !TEST_true(EC_GROUP_set_generator(group, generator, order, cof)))
+        || !TEST_true(BN_hex2bn(&cof, cof_hex))
+        || !TEST_true(EC_GROUP_set_generator(group, generator, order, cof)))
         goto done;
 
     ok = 1;
@@ -132,10 +131,10 @@ static EC_GROUP *create_EC_group(const char *p_hex, const char *a_hex,
 }
 
 static int test_sm2_crypt(const EC_GROUP *group,
-                          const EVP_MD *digest,
-                          const char *privkey_hex,
-                          const char *message,
-                          const char *k_hex, const char *ctext_hex)
+    const EVP_MD *digest,
+    const char *privkey_hex,
+    const char *message,
+    const char *k_hex, const char *ctext_hex)
 {
     const size_t msg_len = strlen(message);
     BIGNUM *priv = NULL;
@@ -150,21 +149,21 @@ static int test_sm2_crypt(const EC_GROUP *group,
     int rc = 0;
 
     if (!TEST_ptr(expected)
-            || !TEST_true(BN_hex2bn(&priv, privkey_hex)))
+        || !TEST_true(BN_hex2bn(&priv, privkey_hex)))
         goto done;
 
     key = EC_KEY_new();
     if (!TEST_ptr(key)
-            || !TEST_true(EC_KEY_set_group(key, group))
-            || !TEST_true(EC_KEY_set_private_key(key, priv)))
+        || !TEST_true(EC_KEY_set_group(key, group))
+        || !TEST_true(EC_KEY_set_private_key(key, priv)))
         goto done;
 
     pt = EC_POINT_new(group);
     if (!TEST_ptr(pt)
-            || !TEST_true(EC_POINT_mul(group, pt, priv, NULL, NULL, NULL))
-            || !TEST_true(EC_KEY_set_public_key(key, pt))
-            || !TEST_true(ossl_sm2_ciphertext_size(key, digest, msg_len,
-                                                   &ctext_len)))
+        || !TEST_true(EC_POINT_mul(group, pt, priv, NULL, NULL, NULL))
+        || !TEST_true(EC_KEY_set_public_key(key, pt))
+        || !TEST_true(ossl_sm2_ciphertext_size(key, digest, msg_len,
+            &ctext_len)))
         goto done;
 
     ctext = OPENSSL_zalloc(ctext_len);
@@ -173,8 +172,8 @@ static int test_sm2_crypt(const EC_GROUP *group,
 
     start_fake_rand(k_hex);
     if (!TEST_true(ossl_sm2_encrypt(key, digest,
-                                    (const uint8_t *)message, msg_len,
-                                    ctext, &ctext_len))) {
+            (const uint8_t *)message, msg_len,
+            ctext, &ctext_len))) {
         restore_rand();
         goto done;
     }
@@ -184,19 +183,19 @@ static int test_sm2_crypt(const EC_GROUP *group,
         goto done;
 
     if (!TEST_true(ossl_sm2_plaintext_size(ctext, ctext_len, &ptext_len))
-            || !TEST_int_eq(ptext_len, msg_len))
+        || !TEST_int_eq(ptext_len, msg_len))
         goto done;
 
     recovered = OPENSSL_zalloc(ptext_len);
     if (!TEST_ptr(recovered)
-            || !TEST_true(ossl_sm2_decrypt(key, digest, ctext, ctext_len,
-                                           recovered, &recovered_len))
-            || !TEST_int_eq(recovered_len, msg_len)
-            || !TEST_mem_eq(recovered, recovered_len, message, msg_len))
+        || !TEST_true(ossl_sm2_decrypt(key, digest, ctext, ctext_len,
+            recovered, &recovered_len))
+        || !TEST_int_eq(recovered_len, msg_len)
+        || !TEST_mem_eq(recovered, recovered_len, message, msg_len))
         goto done;
 
     rc = 1;
- done:
+done:
     BN_free(priv);
     EC_POINT_free(pt);
     OPENSSL_free(ctext);
@@ -210,15 +209,13 @@ static int sm2_crypt_test(void)
 {
     int testresult = 0;
     EC_GROUP *gm_group = NULL;
-    EC_GROUP *test_group =
-        create_EC_group
-        ("8542D69E4C044F18E8B92435BF6FF7DE457283915C45517D722EDB8B08F1DFC3",
-         "787968B4FA32C3FD2417842E73BBFEFF2F3C848B6831D7E0EC65228B3937E498",
-         "63E4C6D3B23B0C849CF84241484BFE48F61D59A5B16BA06E6E12D1DA27C5249A",
-         "421DEBD61B62EAB6746434EBC3CC315E32220B3BADD50BDC4C4E6C147FEDD43D",
-         "0680512BCBB42C07D47349D2153B70C4E5D7FDFCBFA36EA1A85841B9E46E09A2",
-         "8542D69E4C044F18E8B92435BF6FF7DD297720630485628D5AE74EE7C32E79B7",
-         "1");
+    EC_GROUP *test_group = create_EC_group("8542D69E4C044F18E8B92435BF6FF7DE457283915C45517D722EDB8B08F1DFC3",
+        "787968B4FA32C3FD2417842E73BBFEFF2F3C848B6831D7E0EC65228B3937E498",
+        "63E4C6D3B23B0C849CF84241484BFE48F61D59A5B16BA06E6E12D1DA27C5249A",
+        "421DEBD61B62EAB6746434EBC3CC315E32220B3BADD50BDC4C4E6C147FEDD43D",
+        "0680512BCBB42C07D47349D2153B70C4E5D7FDFCBFA36EA1A85841B9E46E09A2",
+        "8542D69E4C044F18E8B92435BF6FF7DD297720630485628D5AE74EE7C32E79B7",
+        "1");
 
     if (!TEST_ptr(test_group))
         goto done;
@@ -254,13 +251,13 @@ static int sm2_crypt_test(void)
 
     /* From Annex C in both GM/T0003.5-2012 and GB/T 32918.5-2016.*/
     gm_group = create_EC_group(
-         "fffffffeffffffffffffffffffffffffffffffff00000000ffffffffffffffff",
-         "fffffffeffffffffffffffffffffffffffffffff00000000fffffffffffffffc",
-         "28e9fa9e9d9f5e344d5a9e4bcf6509a7f39789f515ab8f92ddbcbd414d940e93",
-         "32c4ae2c1f1981195f9904466a39c9948fe30bbff2660be1715a4589334c74c7",
-         "bc3736a2f4f6779c59bdcee36b692153d0a9877cc62a474002df32e52139f0a0",
-         "fffffffeffffffffffffffffffffffff7203df6b21c6052b53bbf40939d54123",
-         "1");
+        "fffffffeffffffffffffffffffffffffffffffff00000000ffffffffffffffff",
+        "fffffffeffffffffffffffffffffffffffffffff00000000fffffffffffffffc",
+        "28e9fa9e9d9f5e344d5a9e4bcf6509a7f39789f515ab8f92ddbcbd414d940e93",
+        "32c4ae2c1f1981195f9904466a39c9948fe30bbff2660be1715a4589334c74c7",
+        "bc3736a2f4f6779c59bdcee36b692153d0a9877cc62a474002df32e52139f0a0",
+        "fffffffeffffffffffffffffffffffff7203df6b21c6052b53bbf40939d54123",
+        "1");
 
     if (!TEST_ptr(gm_group))
         goto done;
@@ -280,19 +277,19 @@ static int sm2_crypt_test(void)
              * in GM/T 0009-2012 (Sec. 7.2).
              */
             "307C" /* SEQUENCE, 0x7c bytes */
-              "0220" /* INTEGER, 0x20 bytes */
-                "04EBFC718E8D1798620432268E77FEB6415E2EDE0E073C0F4F640ECD2E149A73"
-              "0221" /* INTEGER, 0x21 bytes */
-                "00" /* leading 00 due to DER for pos. int with topmost bit set */
-                "E858F9D81E5430A57B36DAAB8F950A3C64E6EE6A63094D99283AFF767E124DF0"
-              "0420" /* OCTET STRING, 0x20 bytes */
-                "59983C18F809E262923C53AEC295D30383B54E39D609D160AFCB1908D0BD8766"
-              "0413" /* OCTET STRING, 0x13 bytes */
-                "21886CA989CA9C7D58087307CA93092D651EFA"))
+            "0220" /* INTEGER, 0x20 bytes */
+            "04EBFC718E8D1798620432268E77FEB6415E2EDE0E073C0F4F640ECD2E149A73"
+            "0221" /* INTEGER, 0x21 bytes */
+            "00" /* leading 00 due to DER for pos. int with topmost bit set */
+            "E858F9D81E5430A57B36DAAB8F950A3C64E6EE6A63094D99283AFF767E124DF0"
+            "0420" /* OCTET STRING, 0x20 bytes */
+            "59983C18F809E262923C53AEC295D30383B54E39D609D160AFCB1908D0BD8766"
+            "0413" /* OCTET STRING, 0x13 bytes */
+            "21886CA989CA9C7D58087307CA93092D651EFA"))
         goto done;
 
     testresult = 1;
- done:
+done:
     EC_GROUP_free(test_group);
     EC_GROUP_free(gm_group);
 
@@ -300,13 +297,13 @@ static int sm2_crypt_test(void)
 }
 
 static int test_sm2_sign(const EC_GROUP *group,
-                         const char *userid,
-                         const char *privkey_hex,
-                         const char *message,
-                         const char *k_hex,
-                         const char *r_hex,
-                         const char *s_hex,
-                         int omit_pubkey)
+    const char *userid,
+    const char *privkey_hex,
+    const char *message,
+    const char *k_hex,
+    const char *r_hex,
+    const char *s_hex,
+    int omit_pubkey)
 {
     const size_t msg_len = strlen(message);
     int ok = 0;
@@ -324,21 +321,21 @@ static int test_sm2_sign(const EC_GROUP *group,
 
     key = EC_KEY_new();
     if (!TEST_ptr(key)
-            || !TEST_true(EC_KEY_set_group(key, group))
-            || !TEST_true(EC_KEY_set_private_key(key, priv)))
+        || !TEST_true(EC_KEY_set_group(key, group))
+        || !TEST_true(EC_KEY_set_private_key(key, priv)))
         goto done;
 
     if (omit_pubkey == 0) {
         pt = EC_POINT_new(group);
         if (!TEST_ptr(pt)
-                || !TEST_true(EC_POINT_mul(group, pt, priv, NULL, NULL, NULL))
-                || !TEST_true(EC_KEY_set_public_key(key, pt)))
+            || !TEST_true(EC_POINT_mul(group, pt, priv, NULL, NULL, NULL))
+            || !TEST_true(EC_KEY_set_public_key(key, pt)))
             goto done;
     }
 
     start_fake_rand(k_hex);
     sig = ossl_sm2_do_sign(key, EVP_sm3(), (const uint8_t *)userid,
-                           strlen(userid), (const uint8_t *)message, msg_len);
+        strlen(userid), (const uint8_t *)message, msg_len);
     if (!TEST_ptr(sig)) {
         restore_rand();
         goto done;
@@ -348,18 +345,18 @@ static int test_sm2_sign(const EC_GROUP *group,
     ECDSA_SIG_get0(sig, &sig_r, &sig_s);
 
     if (!TEST_true(BN_hex2bn(&r, r_hex))
-            || !TEST_true(BN_hex2bn(&s, s_hex))
-            || !TEST_BN_eq(r, sig_r)
-            || !TEST_BN_eq(s, sig_s))
+        || !TEST_true(BN_hex2bn(&s, s_hex))
+        || !TEST_BN_eq(r, sig_r)
+        || !TEST_BN_eq(s, sig_s))
         goto done;
 
     ok = ossl_sm2_do_verify(key, EVP_sm3(), sig, (const uint8_t *)userid,
-                            strlen(userid), (const uint8_t *)message, msg_len);
+        strlen(userid), (const uint8_t *)message, msg_len);
 
     /* We goto done whether this passes or fails */
     TEST_true(ok);
 
- done:
+done:
     ECDSA_SIG_free(sig);
     EC_POINT_free(pt);
     EC_KEY_free(key);
@@ -375,28 +372,26 @@ static int sm2_sig_test(void)
     int testresult = 0;
     EC_GROUP *gm_group = NULL;
     /* From draft-shen-sm2-ecdsa-02 */
-    EC_GROUP *test_group =
-        create_EC_group
-        ("8542D69E4C044F18E8B92435BF6FF7DE457283915C45517D722EDB8B08F1DFC3",
-         "787968B4FA32C3FD2417842E73BBFEFF2F3C848B6831D7E0EC65228B3937E498",
-         "63E4C6D3B23B0C849CF84241484BFE48F61D59A5B16BA06E6E12D1DA27C5249A",
-         "421DEBD61B62EAB6746434EBC3CC315E32220B3BADD50BDC4C4E6C147FEDD43D",
-         "0680512BCBB42C07D47349D2153B70C4E5D7FDFCBFA36EA1A85841B9E46E09A2",
-         "8542D69E4C044F18E8B92435BF6FF7DD297720630485628D5AE74EE7C32E79B7",
-         "1");
+    EC_GROUP *test_group = create_EC_group("8542D69E4C044F18E8B92435BF6FF7DE457283915C45517D722EDB8B08F1DFC3",
+        "787968B4FA32C3FD2417842E73BBFEFF2F3C848B6831D7E0EC65228B3937E498",
+        "63E4C6D3B23B0C849CF84241484BFE48F61D59A5B16BA06E6E12D1DA27C5249A",
+        "421DEBD61B62EAB6746434EBC3CC315E32220B3BADD50BDC4C4E6C147FEDD43D",
+        "0680512BCBB42C07D47349D2153B70C4E5D7FDFCBFA36EA1A85841B9E46E09A2",
+        "8542D69E4C044F18E8B92435BF6FF7DD297720630485628D5AE74EE7C32E79B7",
+        "1");
 
     if (!TEST_ptr(test_group))
         goto done;
 
     if (!TEST_true(test_sm2_sign(
-                        test_group,
-                        "ALICE123@YAHOO.COM",
-                        "128B2FA8BD433C6C068C8D803DFF79792A519A55171B1B650C23661D15897263",
-                        "message digest",
-                        "006CB28D99385C175C94F94E934817663FC176D925DD72B727260DBAAE1FB2F96F"
-                        "007c47811054c6f99613a578eb8453706ccb96384fe7df5c171671e760bfa8be3a",
-                        "40F1EC59F793D9F49E09DCEF49130D4194F79FB1EED2CAA55BACDB49C4E755D1",
-                        "6FC6DAC32C5D5CF10C77DFB20F7C2EB667A457872FB09EC56327A67EC7DEEBE7", 0)))
+            test_group,
+            "ALICE123@YAHOO.COM",
+            "128B2FA8BD433C6C068C8D803DFF79792A519A55171B1B650C23661D15897263",
+            "message digest",
+            "006CB28D99385C175C94F94E934817663FC176D925DD72B727260DBAAE1FB2F96F"
+            "007c47811054c6f99613a578eb8453706ccb96384fe7df5c171671e760bfa8be3a",
+            "40F1EC59F793D9F49E09DCEF49130D4194F79FB1EED2CAA55BACDB49C4E755D1",
+            "6FC6DAC32C5D5CF10C77DFB20F7C2EB667A457872FB09EC56327A67EC7DEEBE7", 0)))
         goto done;
 
     /* From Annex A in both GM/T0003.5-2012 and GB/T 32918.5-2016.*/
@@ -413,46 +408,45 @@ static int sm2_sig_test(void)
         goto done;
 
     if (!TEST_true(test_sm2_sign(
-                    gm_group,
-                    /* the default ID specified in GM/T 0009-2012 (Sec. 10).*/
-                    SM2_DEFAULT_USERID,
-                    /* privkey */
-                    "3945208F7B2144B13F36E38AC6D39F95889393692860B51A42FB81EF4DF7C5B8",
-                    /* plaintext message */
-                    "message digest",
-                    /* ephemeral nonce k */
-                    "59276E27D506861A16680F3AD9C02DCCEF3CC1FA3CDBE4CE6D54B80DEAC1BC21",
-                    /* expected signature, the field values are from GM/T 0003.5-2012,
-                       Annex A. */
-                    /* signature R, 0x20 bytes */
-                    "F5A03B0648D2C4630EEAC513E1BB81A15944DA3827D5B74143AC7EACEEE720B3",
-                    /* signature S, 0x20 bytes */
-                    "B1B6AA29DF212FD8763182BC0D421CA1BB9038FD1F7F42D4840B69C485BBC1AA", 0)))
+            gm_group,
+            /* the default ID specified in GM/T 0009-2012 (Sec. 10).*/
+            SM2_DEFAULT_USERID,
+            /* privkey */
+            "3945208F7B2144B13F36E38AC6D39F95889393692860B51A42FB81EF4DF7C5B8",
+            /* plaintext message */
+            "message digest",
+            /* ephemeral nonce k */
+            "59276E27D506861A16680F3AD9C02DCCEF3CC1FA3CDBE4CE6D54B80DEAC1BC21",
+            /* expected signature, the field values are from GM/T 0003.5-2012,
+               Annex A. */
+            /* signature R, 0x20 bytes */
+            "F5A03B0648D2C4630EEAC513E1BB81A15944DA3827D5B74143AC7EACEEE720B3",
+            /* signature S, 0x20 bytes */
+            "B1B6AA29DF212FD8763182BC0D421CA1BB9038FD1F7F42D4840B69C485BBC1AA", 0)))
         goto done;
 
-
     /* Make sure we fail if we omit the public portion of the key */
     if (!TEST_false(test_sm2_sign(
-                     gm_group,
-                     /* the default ID specified in GM/T 0009-2012 (Sec. 10).*/
-                     SM2_DEFAULT_USERID,
-                     /* privkey */
-                     "3945208F7B2144B13F36E38AC6D39F95889393692860B51A42FB81EF4DF7C5B8",
-                     /* plaintext message */
-                     "message digest",
-                     /* ephemeral nonce k */
-                     "59276E27D506861A16680F3AD9C02DCCEF3CC1FA3CDBE4CE6D54B80DEAC1BC21",
-                     /* expected signature, the field values are from GM/T 0003.5-2012,
-                        Annex A. */
-                     /* signature R, 0x20 bytes */
-                     "F5A03B0648D2C4630EEAC513E1BB81A15944DA3827D5B74143AC7EACEEE720B3",
-                     /* signature S, 0x20 bytes */
-                     "B1B6AA29DF212FD8763182BC0D421CA1BB9038FD1F7F42D4840B69C485BBC1AA", 1)))
+            gm_group,
+            /* the default ID specified in GM/T 0009-2012 (Sec. 10).*/
+            SM2_DEFAULT_USERID,
+            /* privkey */
+            "3945208F7B2144B13F36E38AC6D39F95889393692860B51A42FB81EF4DF7C5B8",
+            /* plaintext message */
+            "message digest",
+            /* ephemeral nonce k */
+            "59276E27D506861A16680F3AD9C02DCCEF3CC1FA3CDBE4CE6D54B80DEAC1BC21",
+            /* expected signature, the field values are from GM/T 0003.5-2012,
+               Annex A. */
+            /* signature R, 0x20 bytes */
+            "F5A03B0648D2C4630EEAC513E1BB81A15944DA3827D5B74143AC7EACEEE720B3",
+            /* signature S, 0x20 bytes */
+            "B1B6AA29DF212FD8763182BC0D421CA1BB9038FD1F7F42D4840B69C485BBC1AA", 1)))
         goto done;
 
     testresult = 1;
 
- done:
+done:
     EC_GROUP_free(test_group);
     EC_GROUP_free(gm_group);
 
diff --git a/test/sm3_internal_test.c b/test/sm3_internal_test.c
index 7680d0242ec67..39448004be227 100644
--- a/test/sm3_internal_test.c
+++ b/test/sm3_internal_test.c
@@ -17,7 +17,7 @@
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_SM3
-# include "internal/sm3.h"
+#include "internal/sm3.h"
 
 static int test_sm3(void)
 {
@@ -60,15 +60,15 @@ static int test_sm3(void)
     unsigned char md1[SM3_DIGEST_LENGTH], md2[SM3_DIGEST_LENGTH];
 
     if (!TEST_true(ossl_sm3_init(&ctx1))
-            || !TEST_true(ossl_sm3_update(&ctx1, input1, sizeof(input1)))
-            || !TEST_true(ossl_sm3_final(md1, &ctx1))
-            || !TEST_mem_eq(md1, SM3_DIGEST_LENGTH, expected1, SM3_DIGEST_LENGTH))
+        || !TEST_true(ossl_sm3_update(&ctx1, input1, sizeof(input1)))
+        || !TEST_true(ossl_sm3_final(md1, &ctx1))
+        || !TEST_mem_eq(md1, SM3_DIGEST_LENGTH, expected1, SM3_DIGEST_LENGTH))
         return 0;
 
     if (!TEST_true(ossl_sm3_init(&ctx2))
-            || !TEST_true(ossl_sm3_update(&ctx2, input2, sizeof(input2)))
-            || !TEST_true(ossl_sm3_final(md2, &ctx2))
-            || !TEST_mem_eq(md2, SM3_DIGEST_LENGTH, expected2, SM3_DIGEST_LENGTH))
+        || !TEST_true(ossl_sm3_update(&ctx2, input2, sizeof(input2)))
+        || !TEST_true(ossl_sm3_final(md2, &ctx2))
+        || !TEST_mem_eq(md2, SM3_DIGEST_LENGTH, expected2, SM3_DIGEST_LENGTH))
         return 0;
 
     return 1;
diff --git a/test/sm4_internal_test.c b/test/sm4_internal_test.c
index 155b16f569415..933efbb3a3bd9 100644
--- a/test/sm4_internal_test.c
+++ b/test/sm4_internal_test.c
@@ -17,7 +17,7 @@
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_SM4
-# include "crypto/sm4.h"
+#include "crypto/sm4.h"
 
 static int test_sm4_ecb(void)
 {
diff --git a/test/smime-certs/mksmime-certs.sh b/test/smime-certs/mksmime-certs.sh
old mode 100644
new mode 100755
index 0edf1d789e3f4..d989683faae09
--- a/test/smime-certs/mksmime-certs.sh
+++ b/test/smime-certs/mksmime-certs.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2013-2023 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2013-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
@@ -67,3 +67,16 @@ gen smdh.pem "/CN=Test SMIME EE DH" dh_cert >>smdh.pem
 # EE RSA code signing end entity certificate with respective extensions
 cp ../certs/ee-key.pem csrsa1.pem
 gen csrsa1.pem "/CN=Test CodeSign EE RSA" codesign_cert >>csrsa1.pem
+
+# Create PQ certificates with respective extensions
+$OPENSSL genpkey -algorithm ML-DSA-44 -out sm_mldsa44.pem
+gen sm_mldsa44.pem "/CN=Test SMIME EE ML-DSA-44" signer_cert >>sm_mldsa44.pem
+$OPENSSL genpkey -algorithm SLH-DSA-SHA2-128s -out sm_slhdsa_sha2_128s.pem
+gen sm_slhdsa_sha2_128s.pem "/CN=Test SMIME EE SLH-DSA-SHA2-128s" \
+    signer_cert >>sm_slhdsa_sha2_128s.pem
+$OPENSSL genpkey -algorithm SLH-DSA-SHAKE-128s -out sm_slhdsa_shake_128s.pem
+gen sm_slhdsa_shake_128s.pem "/CN=Test SMIME EE SLH-DSA-SHAKE-128s" \
+    signer_cert >>sm_slhdsa_shake_128s.pem
+$OPENSSL genpkey -algorithm SLH-DSA-SHAKE-256s -out sm_slhdsa_shake_256s.pem
+gen sm_slhdsa_shake_256s.pem "/CN=Test SMIME EE SLH-DSA-SHAKE-256s" \
+    signer_cert >>sm_slhdsa_shake_256s.pem
diff --git a/test/smime-certs/sm_mldsa44.pem b/test/smime-certs/sm_mldsa44.pem
new file mode 100644
index 0000000000000..e4b6ebe1a1e91
--- /dev/null
+++ b/test/smime-certs/sm_mldsa44.pem
@@ -0,0 +1,99 @@
+-----BEGIN PRIVATE KEY-----
+MIIKPgIBADALBglghkgBZQMEAxEEggoqMIIKJgQgmsSm9eI30++j5lPGc4VSUHl8
+RHdUYZ2HyINZ2noG/FsEggoAdnnaWN8r8QxVgVFSizuW+sZ0zqlCUOM5HFD0RYnm
+ueIk3OZUr/c53pCu4pz8eiyfhhlwToeroamymUVGZF984cjWlyIbK7sm0WwPstIw
+4cTMACIvOBspVFrxHib0IoyIb8RdM0a8EVdE7+5gUuwm3fwZ/TjTpi1PW+k2L6zP
+z5AhF0gTJIUjwmUEBQVCABECh2WKtonKQm0ZRS1byIHhMCFQCIlYEgoQo00SAxIA
+AokMBGLUNGYAAmAKiYXMNCIYhGmQMpEIsGQJAUxUMIyMQJIKKSHYwDHUpogUICIY
+NiDkqC0Uo1EbMyjjCC3gRIgZFSBgyAkasWEZBnIDOZAjwzBDGCxhGGnbQElLQoHE
+BCUkRUAJISwUhlESRXKLxgHMRhBKFEwBsGDKEgqQEg3JCI1ICCUjyU0UtpCSBAmb
+hmDbBoGRpm2BlAkQx0jDMoGAQiVKRkQIKSHJkAWKIiYCqUSSsCiTOCJQQI1BJi1C
+MJIZQIBLsCyUpgiYECAkRJDbCCwYQCQDR2nbhGgZCC6MAiRjpGWBNgnCQmzbEAjb
+mICYOIjUIpDIliwZOW6Eom0LuYkkSBLksm1iEiRiIlECtiWAAnCiMCkSMZESkQ2B
+AALjxJFgRGRbFAlMNGwLpknLMDFLImjiFmQIgGCDAo2kJErhRFALuSiiAg5QKAFT
+OE6iFgwQSFBCCFKLSALRwGRkAIrjAggjgIWKhkgkhmXkxIULgpHZBFAAFUwbCW0A
+RAHIlCkJljGaQoBKIpLRoDEbFIVbMAWKloEIE3GjGGYiBCxMMEESMCUDRWlAomgS
+NXIkNjBaqECbsihAEinAlokZyQDJBoAQpFEMAS2DAFIZtgiQtBAIoGkaRHGUmCDR
+kkkRhRHEwiTYtkkgOGFIgmGcgo0TskkQRCQTEUxiMGlQSG1SIoqiCG6kpCXcpAgK
+xEgBxRBgRihZRHGgAkQBqEEkgi0CNymQKGBQiCmJMIwQkZEZRA4IMC4YRXAKGU1c
+pgFYFCXLRoBBSAESM0IBQWnAxgGbwoghRUUSESpBogRjFI4Ig1FaEI7jwAHbxAjj
+IGLAhmzSBGIIQ0pTpE2gMo5bqAxMtCQLxhGCMAjcsIkRRkFTRhEkpwiDGGBDlgAU
+BS0iNTIRhSkiQ0kIuIxRwGiAQmwRtHAZt1FQkAxLlE2RIkEZtiEJImpcAmwCQijE
+sgFeAKKEuHpy3oMPABBvFJQoBB5V1/+oelrPmUyEuaDw3/Yrlh1OM28QYLO0tbBD
++Xp9mDfAOF9jT/RT9x5QZUOaVfCctxPAkzfXwX9SZ9ClyOZwOGzB64bfxXw6EEvB
+37tO8wBlEtddXkpsQ/cx9C1nuMxGmlscSiA6L0pRkNme7JneAjDKY5IDVPrMUkoY
+wjNtI0CQ5FrE9E0PnbL7Sj+671QIZM77HA1FUOxbmqcKOtSeZY9QrEezt8plwX+8
+uY8QTr0mUcvVODvO5498J/qBTnlQrjLBx2SxyeYIYEClfdO8nWax4VgQT7ZMK/vR
+if0ijT+Q0qx+UYyEdALMp8US8d64njeggh3L6m8TX6+y1I9ezAi14Q8ofH4lSoWL
+o0YDlsi41LWxyHJDr88Nyd7ordFFp4x+yChxHJYoxxJOezP89uLev526aP40oUsL
+i3wXbFd+7g0p8rXl4PYBAcifxj/WBVUk9oa1MLdkKO54PTFZWFLWqnVVMgFS25w7
+Ldf+41pQUVP8RzfpyDvoHIsNNhrgZ8fZtssVtj0OBAsSQ1u5TJZjJDwXSh6LLUsW
+QpFeWS5Jw/gaZG9K3IuMjSDGvqTYL+CewC7AYH+B7S6Gc7bgtbu71osE/U2hHSfo
+nDGFdAk9se5RCfTiv7L6XquAqNvraZPOhlgX0dYmX8GpTgNNs+ryu/q8BdxnkiQO
+uUBjOxC4rKKNip2pOdVVpThIlGW03nE1oPiwW06HMmkfinto8dDN14a2hp1Zg+4B
+vNunwUU/sJ3OeHIxiOkCvEbORb+TUwwJGyHMmT7b+eEgYMoX0awAUP+QGBtNtHFi
+0cDftErapblEwsZEjBNurYF/XGijFUp03q/L/KN2obHTjg/rwLiQa98J74CSLJAh
+qUwWoqqhh6NGYb68ysT35xfZcf+OzhK0U26GGDIoqCqyOVU90YD2qQrGG4DGGH+i
+Dxjn2x5MjArscY62chnMcsgIesdlZfoHNOeGA0j7hD1u+OkBksOH5h6IJ+vl69Xv
+8Gg6Hw3R03TsifCaOg3TfoZ6vsczgKLeHxqJVcKWAsQmaBqFNsFYeZGjTGOGe85I
+yR46NvKXITVgeiyKDF743XctQniZrg8zKTygkERZELsB9lZd3l+qmdjY9Sk+1G7r
+mwpVfONDIpZmJUvLhrz8la4wwcaTKov5ib1KESQLbti4vTtM00LV4fgNGdlpoGsd
+9KTEOUi66j1ES82N16fClA53ULSlathgi66YgGu/1MHDc39zG5W1fUMcDPW3ufgv
+0u35/FvF4POrcAcx37n8bzLmqk2/+j4d39DUuViti9QFctK2jsbtQqthjRhRcaat
+l86Pn2f+fZHWhr7tQGx8bMcQnqVmVfMm6osQoaKNqdrrIQ9ACDVQlpSVIpR5bCeG
+CzcQu09NFS+GsESmZyMm5B2/WDPno6U5cGF6vP9v1oyrJt+/O+5Bwo3U6i+RRnkJ
+73AhkocMF4cIPBVtslMPwDK1dP3tlbp+e0dvq/vKdELIuoFY4Tyw1OAawXuwF85J
+MJUctKM44X8LMeADxPJvJN5XLYKCRCunoA3+MSUIHQT5oy2czouIwWKIv+F7FI/D
+8SBa9klkCT6mZrAKL1YCRg2WxjLzlgB5Tw4TEEi3FUlD6s5sCPT4OxkzaVqaWvpU
+9D2Vd4HfY6p0yjJiuLUjR4cjrRCJBP3A1XTYWvRgSu7uUqjK6z5HgkwWBJlZisJ7
+U1W6YCmWHhwC0Y9mjGahXPJx4FhA5btLX9EYCB9whTyBXicM6MrSa2aM5jCo9JIf
+ExDoCqBpDmZ+5kjFyDeTtYyUtwWCU+9tIKvtmFGYnzdERTf8w/vWszU6QugYn1FW
+WB4fGc/xKOz58xIm/I2B7NnQxmA5HvAEHDvF9n2mrHMRUYkoSsMjUhSAg1scMAFP
+vmvaQQ+AWOylhYQaQgx41y2oTw+9Iievm0hg2lB9qDORem/nwx1a8+4gP1wfjqSW
+xwiUz0Cy/0TtTfZrZGqxQtn02OIKInBpabGH0RSTtBPruNk/XotdSVm5uSN9mBQE
+2xiPnjF48auRYIUH8giNNN7MjZ4z5T40+mJHctegwllavzWKlEjTI5sC8g/pSkJV
+CD8i49DLVGf5sbfEAJB2xDW2f+6l65SpJYV7dY0dhK7R2KT2NrqABk/7w/6wb7VY
+bPVseTnHfXpVTRGdUSFLb5hyaNTiWFlMTX0OmfqQ6R9iOA==
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIHYzCCBkugAwIBAgIUTrKnsAj5Isy6498h/MK7WAAxIQEwDQYJKoZIhvcNAQEL
+BQAwRDELMAkGA1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxHTAbBgNV
+BAMMFFRlc3QgUy9NSU1FIFJTQSBSb290MCAXDTI1MDMxODA4MzIxOFoYDzIxMjUw
+MzE4MDgzMjE4WjAiMSAwHgYDVQQDDBdUZXN0IFNNSU1FIEVFIE1MLURTQS00NDCC
+BTIwCwYJYIZIAWUDBAMRA4IFIQB2edpY3yvxDFWBUVKLO5b6xnTOqUJQ4zkcUPRF
+iea54lR2/8XNOhJQ4oWszhrbSHpB1+DZ76n1tez5wc6N5X6s3BEOsp+IPj8W8D7F
+ppWAqoCvbHHflfEVh8mvy4MtPUVGf6XoIl9QgV/afzTZGec+G7GytiEHNBhld2Yq
+POfKPP/IK9mPbnFcPUpPscbHX84TFq8IM6VLgoFnakbQuID/G71nPTFo9f4k3EcT
+kVGIQnWK4lgQW+1WDh8yamFnvg+Du111jA1/c5So3EH++DJDspq03/ALgbMOROuN
+zSYPt6w6EVnqyx8sTWL52lQGx23Q0T8H0WtITz0KbGjgrOsfkrR1qL7DXP8aC83i
+LKMZMitt1OpsKngyBRdQ3fuBOU/bYkmyaWnMR2MuC40XNnKzd41IpO2mjAOyVhe+
+WlhDgABOzsxOjC/WI0oHYTOewTSsjqQhNYU513poeyC5g00QrJYt5HqCwvlPRCb8
+wCsc4ahj+NIdVCOR9KrPh0aXVqQn/Yz7njL76tzQezX7gaoSr3vhr6eQ8In/75bD
+UFRVSJW/6A0sVnQXc4dKyHQQMl9vVTWvoeM8njgMrwHsUT0fjKdJQQGetKGKl1YL
+L9kTnHMem8Zo1gwhs51iecIzj9hwN54ZoawidJy0CNt81Pzin0OaqH8MuI8/RaYy
+3LYMgswpsAXpwYHRY9R4BzrvVXLlNusuba4fHK6x5shr2pDFKe6CJOl5OgsIp9nY
+7+YkIuqOXEMtPrLFNkpgReN0Wj8i5+kNm6V4rviF5Bo67d3dNeIK68O+ZJQditdr
+wixBwhshLTZNp6UzYUJ7ZrfIZoj4wOyDEzWLO9Je1J3bcJzRUVt2hH/DN/Buslrj
+2md4X/MYJjAGQyzBYVVxf9HIH409JPOlb/J4uhL7oeTymdD14wtf2khZRq28kheO
+I3169hxfQo2sq05Me93J/nAglPXstMIPLKIW//544tkluzjn0CoCaHH6nS749TmM
+4QcEQ3ttPy7PmhjAJii+tJ08OoMdVwZ2UWH8R5FwEN4sF0Yb4CeM18AjWS45QNBR
+GDDOoCCN9BnnblyKd697L99KvhrQTy0v9XNXH6BFzuuAyPQ5khlgnlsSJyMhnTMo
+Zeh8WCu+zC7+z4vEAYJlMRVmKMIPH/GqPkNDhxTMc+FSsKSjEOfkZQh1JZ38oOdO
+RM4FJ4htsMHpn2g8OQuGSgUQo5dyqLpB8k/6sY//pGua3Y/PGjeBdYpydTUzAprU
+YMuFxVe+ymDSpQrB9OALRe9UwPbiUtaVJHlRchX7H1YB+RX6zywHH2sTD5NQfcwm
+3/To0Fe1Xw3dVczekXqN246GetDMwy4RYp1RsPIBRICaAwGEuDs1gX9aM5tLLaw1
+3RpF76+JruAICXZ2v8Q7wHZkM+MPZ6E4/l4zjXk5PJM/R3SfuOdQiEICbmmp8GL8
+c3Scu8Pi4TSvq0ajrpnKo//aNPaVJI3DQWDQf6+h29QyHqrbpjZ2nkrMmT34aVUl
+R0XI95qdjAB4U7neWx3AZVQd+MhP76aXvB/DvefVfnGOn2hQQd77VC9EB7FwTk5l
+m+DGBzzI1C5nKTfeTIeTdG69VB5BmU/AitRzu90X3ef2IrMuL+kIzWsPFixaqRX5
+7WFHx76mwanDgxgHgbNh5/AuVHT4nJ2bBe+U2fR2Q+ggVWwjs+gGUZLLby8FLOl/
+WRrb2shpJIs8yl6ReeaMj9j3NlpHQ8ETfslf3g0f1kPLJBrWo10wWzAJBgNVHRME
+AjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4EFgQUlJUkGXaMnS/r8k6VzIDQ3EcK
+TBQwHwYDVR0jBBgwFoAUFcETIWviVV+nah1XINbP86lzZFkwDQYJKoZIhvcNAQEL
+BQADggEBAEgW7XK6cZJcSdRTIuRTbZ9ssJZj6WwLYJmygldKQg6hnYWpPYLNCxqb
+AOO2xicCa9hv3HkgvyYK1tqbwFtuef/KSk+wOlDfgqtFVryVyK0js3x5r3mpCbmk
+5ihpTIuSVTgMCFlx4AXgLZGacei7hvCCP05bnhUvQmdu96bKnwlxvjLHgn3X5Cfw
++7b0q60oZTkOn4PStVnuOVTgLzs6Ta/KHh5M9OVVyEsRz2m3lmG2idXX/pTWXkE3
+VNSJCepP45RBFuxPSeEHW4EM/JPDqhBY5H19NHxcM42uXDykpR1ChSIhKruzjijA
+wme8H314QJnFKfUcGNNrNN/dElirhmU=
+-----END CERTIFICATE-----
diff --git a/test/smime-certs/sm_slhdsa_sha2_128s.pem b/test/smime-certs/sm_slhdsa_sha2_128s.pem
new file mode 100644
index 0000000000000..45ba8545f8e6d
--- /dev/null
+++ b/test/smime-certs/sm_slhdsa_sha2_128s.pem
@@ -0,0 +1,19 @@
+-----BEGIN PRIVATE KEY-----
+MFICAQAwCwYJYIZIAWUDBAMUBECT5RmZe6OO8vsKNkthvx+UPRB8d7wbvTJB1UgM
+zLwGZWYszdtLdA++kdkjuW5vJNeZVVKuVhhsqT7/bm5Rdz2I
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICZzCCAU+gAwIBAgIUDjFC0337VoVD3qOifcn8/v6cYSowDQYJKoZIhvcNAQEL
+BQAwRDELMAkGA1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxHTAbBgNV
+BAMMFFRlc3QgUy9NSU1FIFJTQSBSb290MCAXDTI1MDMxODA4MzIxOFoYDzIxMjUw
+MzE4MDgzMjE4WjAqMSgwJgYDVQQDDB9UZXN0IFNNSU1FIEVFIFNMSC1EU0EtU0hB
+Mi0xMjhzMDAwCwYJYIZIAWUDBAMUAyEAZizN20t0D76R2SO5bm8k15lVUq5WGGyp
+Pv9ublF3PYijXTBbMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQW
+BBThF4u5GJ2SIU/Uq8ZC97+3tZMX6DAfBgNVHSMEGDAWgBQVwRMha+JVX6dqHVcg
+1s/zqXNkWTANBgkqhkiG9w0BAQsFAAOCAQEAajeFlF3LMr6Z3i0YF+guYeY7+o6O
+Q7VVBKyaFWfb+m8IMo0iM7fvYeP1B+VXRO0bPrvCE8jsgv+kkZn5PUTkZApaLbkj
+eu0Pj1ik4/A7/en3aGGjzHRGrcjScE18SPrB8KtoDWuq7nb0PQX1LPDEJLAkJt8F
+qD4uGGHXkFHse2IE+wlCXC8xOoaMmVmdbCz+lz1TNIpmFYAgv9gsMOlEDN/lcFL4
+DGebKespZapcDBVROVWZceOSY/3o8CdnFjrsm9F/q6SUoq08Lf595+THace+N1nB
+rYn6Enlx7OLoONpjsas50h28tTKKnuFHFd+emD7ga3GEwjDwMnOQ2bOFrQ==
+-----END CERTIFICATE-----
diff --git a/test/smime-certs/sm_slhdsa_shake_128s.pem b/test/smime-certs/sm_slhdsa_shake_128s.pem
new file mode 100644
index 0000000000000..84af464d5f11e
--- /dev/null
+++ b/test/smime-certs/sm_slhdsa_shake_128s.pem
@@ -0,0 +1,19 @@
+-----BEGIN PRIVATE KEY-----
+MFICAQAwCwYJYIZIAWUDBAMaBEBtEDfB3z2GkApieWwYEcUwym4LqAn+f3ekIXpy
+3Ih301cGLuxKkbFlC18GqkEFy2hrtjlDrRImYToCJ1S4HlzY
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaDCCAVCgAwIBAgIUP4qMOjsrV/JbvCEgSaqBovSvz1cwDQYJKoZIhvcNAQEL
+BQAwRDELMAkGA1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxHTAbBgNV
+BAMMFFRlc3QgUy9NSU1FIFJTQSBSb290MCAXDTI1MDMxODA4MzIxOFoYDzIxMjUw
+MzE4MDgzMjE4WjArMSkwJwYDVQQDDCBUZXN0IFNNSU1FIEVFIFNMSC1EU0EtU0hB
+S0UtMTI4czAwMAsGCWCGSAFlAwQDGgMhAFcGLuxKkbFlC18GqkEFy2hrtjlDrRIm
+YToCJ1S4HlzYo10wWzAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIHgDAdBgNVHQ4E
+FgQUO+o1zTM0Z+/LQz6qk3AWGA1jlTQwHwYDVR0jBBgwFoAUFcETIWviVV+nah1X
+INbP86lzZFkwDQYJKoZIhvcNAQELBQADggEBAEumBy00rMY5HqpqoTRjVj3TNhXH
+i42pLoOXkAlNDpyHAkn5nM4iPeefHOha521RYiIIPv8XZIiAixHtZJjXtZnMgD6G
+XsdCtci82Lgry/6pzg3hPb/LuaC7ochG4RSNv6QdIFgB+YcD6qaQnvtWuK3zsMQQ
+1Fr2qGRljbgDdreaViIJxEXYakXnHvLHYn9UOT8punXsM6jksugvt8wysUucHMA5
+KhB1o1yYgXFbE3IcAmsX8cQpIDHwSPDdnYmxBptTKld3SOKt0O0TjLzjgix/3IQm
+8l1MHH0UEuLdhXCOiSbQiXqYfWJig+2AmM5VLeWAysX6BixVKxG25jSsAZE=
+-----END CERTIFICATE-----
diff --git a/test/smime-certs/sm_slhdsa_shake_256s.pem b/test/smime-certs/sm_slhdsa_shake_256s.pem
new file mode 100644
index 0000000000000..5d177be9c4155
--- /dev/null
+++ b/test/smime-certs/sm_slhdsa_shake_256s.pem
@@ -0,0 +1,22 @@
+-----BEGIN PRIVATE KEY-----
+MIGTAgEAMAsGCWCGSAFlAwQDHgSBgG4ItImtx5rfHYI99Xo2Wl4PSpqyeMaZrjtW
+QYKovvW2pKvcIc4Re7OnKKHMjIvow/1TaRQUHRUQQFQC/DygeacNpVdWjGZ1/jnc
+D0XfWgfvX0KwATwmXO9NM7Rq7B5OZ1uyykT3e8mPhn5afbRkNvfhKgID07Ukiz1c
+/6XQf7nU
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICiDCCAXCgAwIBAgIUStYfQbEa4PtzChfKNmTE65EId3YwDQYJKoZIhvcNAQEL
+BQAwRDELMAkGA1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxHTAbBgNV
+BAMMFFRlc3QgUy9NSU1FIFJTQSBSb290MCAXDTI1MDMxODEyNDExMFoYDzIxMjUw
+MzE4MTI0MTEwWjArMSkwJwYDVQQDDCBUZXN0IFNNSU1FIEVFIFNMSC1EU0EtU0hB
+S0UtMjU2czBQMAsGCWCGSAFlAwQDHgNBAA2lV1aMZnX+OdwPRd9aB+9fQrABPCZc
+700ztGrsHk5nW7LKRPd7yY+Gflp9tGQ29+EqAgPTtSSLPVz/pdB/udSjXTBbMAkG
+A1UdEwQCMAAwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBTSJYn48biBTinA1pDo
+k2odLpFi0zAfBgNVHSMEGDAWgBQVwRMha+JVX6dqHVcg1s/zqXNkWTANBgkqhkiG
+9w0BAQsFAAOCAQEARP3DGNCSUHkAsQCgWgIF50k3qe8t2cjFnpMBdpoSTFo0VSIo
+58cCN0yusCzHvrtVSXXf/B9t4kLunmXKH5+4nAbnc7Yi2PxiN30qPfr1XYqfKcUd
+k04xB7pJF1YjNqVOlrPSA4O5Mi7aXgmkv7pyHFbY8056u1Ea3xcm2Ib5cpCBQd90
+47ARf8XH/94zhBebFALffrWRn1NgsOgwSq3GAZSvEkWpZHyr4XWpCvHXZ0ImfghU
+BqM077E+r/uLk3kT+L1FoUwLXtQkNrtWJtrSBdp5AexOZqqjqjRR+oG9tAG1KUnl
++4+ts3nVjUeEsRdGMv+gl3/926nsxozJtUO5OA==
+-----END CERTIFICATE-----
diff --git a/test/sparse_array_test.c b/test/sparse_array_test.c
index b50d79a4dbcd1..b41b50902c191 100644
--- a/test/sparse_array_test.c
+++ b/test/sparse_array_test.c
@@ -36,14 +36,14 @@ static int test_sparse_array(void)
         { INT_MAX, "m" }, { 6666666, "d" }, { (ossl_uintmax_t)-1, "H" },
         { 99, "e" }
     };
-    SPARSE_ARRAY_OF(char) *sa;
+    SPARSE_ARRAY_OF(char) * sa;
     size_t i, j;
     int res = 0;
 
     if (!TEST_ptr(sa = ossl_sa_char_new())
-            || !TEST_ptr_null(ossl_sa_char_get(sa, 3))
-            || !TEST_ptr_null(ossl_sa_char_get(sa, 0))
-            || !TEST_ptr_null(ossl_sa_char_get(sa, UINT_MAX)))
+        || !TEST_ptr_null(ossl_sa_char_get(sa, 3))
+        || !TEST_ptr_null(ossl_sa_char_get(sa, 0))
+        || !TEST_ptr_null(ossl_sa_char_get(sa, UINT_MAX)))
         goto err;
 
     for (i = 0; i < OSSL_NELEM(cases); i++) {
@@ -81,12 +81,12 @@ static int test_sparse_array_num(void)
     int res = 0;
 
     if (!TEST_size_t_eq(ossl_sa_char_num(NULL), 0)
-            || !TEST_ptr(sa = ossl_sa_char_new())
-            || !TEST_size_t_eq(ossl_sa_char_num(sa), 0))
+        || !TEST_ptr(sa = ossl_sa_char_new())
+        || !TEST_size_t_eq(ossl_sa_char_num(sa), 0))
         goto err;
     for (i = 0; i < OSSL_NELEM(cases); i++)
         if (!TEST_true(ossl_sa_char_set(sa, cases[i].n, cases[i].v))
-                || !TEST_size_t_eq(ossl_sa_char_num(sa), cases[i].num))
+            || !TEST_size_t_eq(ossl_sa_char_num(sa), cases[i].num))
             goto err;
     res = 1;
 err:
@@ -101,7 +101,7 @@ struct index_cases_st {
 };
 
 struct doall_st {
-    SPARSE_ARRAY_OF(char) *sa;
+    SPARSE_ARRAY_OF(char) * sa;
     size_t num_cases;
     const struct index_cases_st *cases;
     int res;
@@ -143,9 +143,14 @@ static void leaf_delete(ossl_uintmax_t n, char *value, void *arg)
 static int test_sparse_array_doall(void)
 {
     static const struct index_cases_st cases[] = {
-        { 22, "A", 1 }, { 1021, "b", 0 }, { 3, "c", 0 }, { INT_MAX, "d", 1 },
-        { (ossl_uintmax_t)-1, "H", 0 }, { (ossl_uintmax_t)-2, "i", 1 },
-        { 666666666, "s", 1 }, { 1234567890, "t", 0 },
+        { 22, "A", 1 },
+        { 1021, "b", 0 },
+        { 3, "c", 0 },
+        { INT_MAX, "d", 1 },
+        { (ossl_uintmax_t)-1, "H", 0 },
+        { (ossl_uintmax_t)-2, "i", 1 },
+        { 666666666, "s", 1 },
+        { 1234567890, "t", 0 },
     };
     struct doall_st doall_data;
     size_t i;
@@ -158,11 +163,11 @@ static int test_sparse_array_doall(void)
     doall_data.cases = cases;
     doall_data.all = 1;
     doall_data.sa = NULL;
-    for (i = 0; i <  OSSL_NELEM(cases); i++)
+    for (i = 0; i < OSSL_NELEM(cases); i++)
         if (!TEST_true(ossl_sa_char_set(sa, cases[i].n, cases[i].v))) {
             TEST_note("failed at iteration %zu", i + 1);
             goto err;
-    }
+        }
 
     ossl_sa_char_doall_arg(sa, &leaf_check_all, &doall_data);
     if (doall_data.res == 0) {
diff --git a/test/srptest.c b/test/srptest.c
index fe3f97b132f60..0fceadd24b3a6 100644
--- a/test/srptest.c
+++ b/test/srptest.c
@@ -14,20 +14,20 @@
 #define OPENSSL_SUPPRESS_DEPRECATED
 
 #include <openssl/opensslconf.h>
-# include "testutil.h"
+#include "testutil.h"
 
 #ifdef OPENSSL_NO_SRP
-# include <stdio.h>
+#include <stdio.h>
 #else
 
-# include <openssl/srp.h>
-# include <openssl/rand.h>
-# include <openssl/err.h>
+#include <openssl/srp.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
 
-# define RANDOM_SIZE 32         /* use 256 bits on each side */
+#define RANDOM_SIZE 32 /* use 256 bits on each side */
 
 static int run_srp(const char *username, const char *client_pass,
-                   const char *server_pass)
+    const char *server_pass)
 {
     int ret = 0;
     BIGNUM *s = NULL;
@@ -49,7 +49,7 @@ static int run_srp(const char *username, const char *client_pass,
 
     /* Set up server's password entry */
     if (!TEST_true(SRP_create_verifier_BN(username, server_pass,
-                                          &s, &v, GN->N, GN->g)))
+            &s, &v, GN->N, GN->g)))
         goto end;
 
     test_output_bignum("N", GN->N);
@@ -154,16 +154,16 @@ static int run_srp_kat(void)
     BN_hex2bn(&s, "BEB25379D1A8581EB5A727673A2441EE");
     /* Set up server's password entry */
     if (!TEST_true(SRP_create_verifier_BN("alice", "password123", &s, &v, GN->N,
-                                          GN->g)))
+            GN->g)))
         goto err;
 
     TEST_info("checking v");
     if (!TEST_true(check_bn("v", v,
-                 "7E273DE8696FFC4F4E337D05B4B375BEB0DDE1569E8FA00A9886D812"
-                 "9BADA1F1822223CA1A605B530E379BA4729FDC59F105B4787E5186F5"
-                 "C671085A1447B52A48CF1970B4FB6F8400BBF4CEBFBB168152E08AB5"
-                 "EA53D15C1AFF87B2B9DA6E04E058AD51CC72BFC9033B564E26480D78"
-                 "E955A5E29E7AB245DB2BE315E2099AFB")))
+            "7E273DE8696FFC4F4E337D05B4B375BEB0DDE1569E8FA00A9886D812"
+            "9BADA1F1822223CA1A605B530E379BA4729FDC59F105B4787E5186F5"
+            "C671085A1447B52A48CF1970B4FB6F8400BBF4CEBFBB168152E08AB5"
+            "EA53D15C1AFF87B2B9DA6E04E058AD51CC72BFC9033B564E26480D78"
+            "E955A5E29E7AB245DB2BE315E2099AFB")))
         goto err;
     TEST_note("    okay");
 
@@ -178,11 +178,11 @@ static int run_srp_kat(void)
 
     TEST_info("checking B");
     if (!TEST_true(check_bn("B", Bpub,
-                  "BD0C61512C692C0CB6D041FA01BB152D4916A1E77AF46AE105393011"
-                  "BAF38964DC46A0670DD125B95A981652236F99D9B681CBF87837EC99"
-                  "6C6DA04453728610D0C6DDB58B318885D7D82C7F8DEB75CE7BD4FBAA"
-                  "37089E6F9C6059F388838E7A00030B331EB76840910440B1B27AAEAE"
-                  "EB4012B7D7665238A8E3FB004B117B58")))
+            "BD0C61512C692C0CB6D041FA01BB152D4916A1E77AF46AE105393011"
+            "BAF38964DC46A0670DD125B95A981652236F99D9B681CBF87837EC99"
+            "6C6DA04453728610D0C6DDB58B318885D7D82C7F8DEB75CE7BD4FBAA"
+            "37089E6F9C6059F388838E7A00030B331EB76840910440B1B27AAEAE"
+            "EB4012B7D7665238A8E3FB004B117B58")))
         goto err;
     TEST_note("    okay");
 
@@ -197,11 +197,11 @@ static int run_srp_kat(void)
 
     TEST_info("checking A");
     if (!TEST_true(check_bn("A", Apub,
-                  "61D5E490F6F1B79547B0704C436F523DD0E560F0C64115BB72557EC4"
-                  "4352E8903211C04692272D8B2D1A5358A2CF1B6E0BFCF99F921530EC"
-                  "8E39356179EAE45E42BA92AEACED825171E1E8B9AF6D9C03E1327F44"
-                  "BE087EF06530E69F66615261EEF54073CA11CF5858F0EDFDFE15EFEA"
-                  "B349EF5D76988A3672FAC47B0769447B")))
+            "61D5E490F6F1B79547B0704C436F523DD0E560F0C64115BB72557EC4"
+            "4352E8903211C04692272D8B2D1A5358A2CF1B6E0BFCF99F921530EC"
+            "8E39356179EAE45E42BA92AEACED825171E1E8B9AF6D9C03E1327F44"
+            "BE087EF06530E69F66615261EEF54073CA11CF5858F0EDFDFE15EFEA"
+            "B349EF5D76988A3672FAC47B0769447B")))
         goto err;
     TEST_note("    okay");
 
@@ -209,7 +209,7 @@ static int run_srp_kat(void)
     u = SRP_Calc_u(Apub, Bpub, GN->N);
 
     if (!TEST_true(check_bn("u", u,
-                    "CE38B9593487DA98554ED47D70A7AE5F462EF019")))
+            "CE38B9593487DA98554ED47D70A7AE5F462EF019")))
         goto err;
 
     /* Client's key */
@@ -217,11 +217,11 @@ static int run_srp_kat(void)
     Kclient = SRP_Calc_client_key(GN->N, Bpub, GN->g, x, a, u);
     TEST_info("checking client's key");
     if (!TEST_true(check_bn("Client's key", Kclient,
-                  "B0DC82BABCF30674AE450C0287745E7990A3381F63B387AAF271A10D"
-                  "233861E359B48220F7C4693C9AE12B0A6F67809F0876E2D013800D6C"
-                  "41BB59B6D5979B5C00A172B4A2A5903A0BDCAF8A709585EB2AFAFA8F"
-                  "3499B200210DCC1F10EB33943CD67FC88A2F39A4BE5BEC4EC0A3212D"
-                  "C346D7E474B29EDE8A469FFECA686E5A")))
+            "B0DC82BABCF30674AE450C0287745E7990A3381F63B387AAF271A10D"
+            "233861E359B48220F7C4693C9AE12B0A6F67809F0876E2D013800D6C"
+            "41BB59B6D5979B5C00A172B4A2A5903A0BDCAF8A709585EB2AFAFA8F"
+            "3499B200210DCC1F10EB33943CD67FC88A2F39A4BE5BEC4EC0A3212D"
+            "C346D7E474B29EDE8A469FFECA686E5A")))
         goto err;
     TEST_note("    okay");
 
@@ -229,11 +229,11 @@ static int run_srp_kat(void)
     Kserver = SRP_Calc_server_key(Apub, v, u, b, GN->N);
     TEST_info("checking server's key");
     if (!TEST_true(check_bn("Server's key", Kserver,
-                  "B0DC82BABCF30674AE450C0287745E7990A3381F63B387AAF271A10D"
-                  "233861E359B48220F7C4693C9AE12B0A6F67809F0876E2D013800D6C"
-                  "41BB59B6D5979B5C00A172B4A2A5903A0BDCAF8A709585EB2AFAFA8F"
-                  "3499B200210DCC1F10EB33943CD67FC88A2F39A4BE5BEC4EC0A3212D"
-                  "C346D7E474B29EDE8A469FFECA686E5A")))
+            "B0DC82BABCF30674AE450C0287745E7990A3381F63B387AAF271A10D"
+            "233861E359B48220F7C4693C9AE12B0A6F67809F0876E2D013800D6C"
+            "41BB59B6D5979B5C00A172B4A2A5903A0BDCAF8A709585EB2AFAFA8F"
+            "3499B200210DCC1F10EB33943CD67FC88A2F39A4BE5BEC4EC0A3212D"
+            "C346D7E474B29EDE8A469FFECA686E5A")))
         goto err;
     TEST_note("    okay");
 
diff --git a/test/ssl_cert_table_internal_test.c b/test/ssl_cert_table_internal_test.c
index 397834a8f1a34..d6a74f0acbc61 100644
--- a/test/ssl_cert_table_internal_test.c
+++ b/test/ssl_cert_table_internal_test.c
@@ -22,21 +22,21 @@
     do_test_cert_table(nid, amask, idx, #idx)
 
 static int do_test_cert_table(int nid, uint32_t amask, size_t idx,
-                              const char *idxname)
+    const char *idxname)
 {
     const SSL_CERT_LOOKUP *clu = &ssl_cert_info[idx];
 
-    if (clu->nid == nid && clu->amask == amask)
+    if (clu->pkey_nid == nid && clu->amask == amask)
         return 1;
 
     TEST_error("Invalid table entry for certificate type %s, index %zu",
-               idxname, idx);
-    if (clu->nid != nid)
+        idxname, idx);
+    if (clu->pkey_nid != nid)
         TEST_note("Expected %s, got %s\n", OBJ_nid2sn(nid),
-                  OBJ_nid2sn(clu->nid));
+            OBJ_nid2sn(clu->pkey_nid));
     if (clu->amask != amask)
         TEST_note("Expected auth mask 0x%x, got 0x%x\n",
-                  (unsigned int)amask, (unsigned int)clu->amask);
+            (unsigned int)amask, (unsigned int)clu->amask);
     return 0;
 }
 
@@ -45,17 +45,17 @@ static int do_test_cert_table(int nid, uint32_t amask, size_t idx,
 static int test_ssl_cert_table(void)
 {
     return TEST_size_t_eq(OSSL_NELEM(ssl_cert_info), SSL_PKEY_NUM)
-           && test_cert_table(EVP_PKEY_RSA, SSL_aRSA, SSL_PKEY_RSA)
-           && test_cert_table(EVP_PKEY_DSA, SSL_aDSS, SSL_PKEY_DSA_SIGN)
-           && test_cert_table(EVP_PKEY_EC, SSL_aECDSA, SSL_PKEY_ECC)
-           && test_cert_table(NID_id_GostR3410_2001, SSL_aGOST01,
-                              SSL_PKEY_GOST01)
-           && test_cert_table(NID_id_GostR3410_2012_256, SSL_aGOST12,
-                              SSL_PKEY_GOST12_256)
-           && test_cert_table(NID_id_GostR3410_2012_512, SSL_aGOST12,
-                              SSL_PKEY_GOST12_512)
-           && test_cert_table(EVP_PKEY_ED25519, SSL_aECDSA, SSL_PKEY_ED25519)
-           && test_cert_table(EVP_PKEY_ED448, SSL_aECDSA, SSL_PKEY_ED448);
+        && test_cert_table(EVP_PKEY_RSA, SSL_aRSA, SSL_PKEY_RSA)
+        && test_cert_table(EVP_PKEY_DSA, SSL_aDSS, SSL_PKEY_DSA_SIGN)
+        && test_cert_table(EVP_PKEY_EC, SSL_aECDSA, SSL_PKEY_ECC)
+        && test_cert_table(NID_id_GostR3410_2001, SSL_aGOST01,
+            SSL_PKEY_GOST01)
+        && test_cert_table(NID_id_GostR3410_2012_256, SSL_aGOST12,
+            SSL_PKEY_GOST12_256)
+        && test_cert_table(NID_id_GostR3410_2012_512, SSL_aGOST12,
+            SSL_PKEY_GOST12_512)
+        && test_cert_table(EVP_PKEY_ED25519, SSL_aECDSA, SSL_PKEY_ED25519)
+        && test_cert_table(EVP_PKEY_ED448, SSL_aECDSA, SSL_PKEY_ED448);
 }
 
 int setup_tests(void)
diff --git a/test/ssl_ctx_test.c b/test/ssl_ctx_test.c
index 16da838dea106..dd075acd9bd98 100644
--- a/test/ssl_ctx_test.c
+++ b/test/ssl_ctx_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-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
@@ -20,7 +20,7 @@ typedef struct {
     int expected_max;
 } version_test;
 
-#define PROTO_TLS  0
+#define PROTO_TLS 0
 #define PROTO_DTLS 1
 #define PROTO_QUIC 2
 
@@ -32,41 +32,41 @@ typedef struct {
  */
 static const version_test version_testdata[] = {
     /* proto     min                     max                     ok    expected min        expected max */
-    {PROTO_TLS,  0,                      0,                      1, 1, 0,                  0},
-    {PROTO_TLS,  SSL3_VERSION,           TLS1_3_VERSION,         1, 1, SSL3_VERSION,       TLS1_3_VERSION},
-    {PROTO_TLS,  TLS1_VERSION,           TLS1_3_VERSION,         1, 1, TLS1_VERSION,       TLS1_3_VERSION},
-    {PROTO_TLS,  TLS1_VERSION,           TLS1_2_VERSION,         1, 1, TLS1_VERSION,       TLS1_2_VERSION},
-    {PROTO_TLS,  TLS1_2_VERSION,         TLS1_2_VERSION,         1, 1, TLS1_2_VERSION,     TLS1_2_VERSION},
-    {PROTO_TLS,  TLS1_2_VERSION,         TLS1_1_VERSION,         1, 1, TLS1_2_VERSION,     TLS1_1_VERSION},
-    {PROTO_TLS,  SSL3_VERSION - 1,       TLS1_3_VERSION,         0, 1, 0,                  TLS1_3_VERSION},
-    {PROTO_TLS,  SSL3_VERSION,           TLS1_3_VERSION + 1,     1, 0, SSL3_VERSION,       0},
+    { PROTO_TLS, 0, 0, 1, 1, 0, 0 },
+    { PROTO_TLS, SSL3_VERSION, TLS1_3_VERSION, 1, 1, SSL3_VERSION, TLS1_3_VERSION },
+    { PROTO_TLS, TLS1_VERSION, TLS1_3_VERSION, 1, 1, TLS1_VERSION, TLS1_3_VERSION },
+    { PROTO_TLS, TLS1_VERSION, TLS1_2_VERSION, 1, 1, TLS1_VERSION, TLS1_2_VERSION },
+    { PROTO_TLS, TLS1_2_VERSION, TLS1_2_VERSION, 1, 1, TLS1_2_VERSION, TLS1_2_VERSION },
+    { PROTO_TLS, TLS1_2_VERSION, TLS1_1_VERSION, 1, 1, TLS1_2_VERSION, TLS1_1_VERSION },
+    { PROTO_TLS, SSL3_VERSION - 1, TLS1_3_VERSION, 0, 1, 0, TLS1_3_VERSION },
+    { PROTO_TLS, SSL3_VERSION, TLS1_3_VERSION + 1, 1, 0, SSL3_VERSION, 0 },
 #ifndef OPENSSL_NO_DTLS
-    {PROTO_TLS,  DTLS1_VERSION,          DTLS1_2_VERSION,        1, 1, 0,                  0},
+    { PROTO_TLS, DTLS1_VERSION, DTLS1_2_VERSION, 1, 1, 0, 0 },
 #endif
-    {PROTO_TLS,  OSSL_QUIC1_VERSION,     OSSL_QUIC1_VERSION,     0, 0, 0,                  0},
-    {PROTO_TLS,  7,                      42,                     0, 0, 0,                  0},
-    {PROTO_DTLS, 0,                      0,                      1, 1, 0,                  0},
-    {PROTO_DTLS, DTLS1_VERSION,          DTLS1_2_VERSION,        1, 1, DTLS1_VERSION,      DTLS1_2_VERSION},
+    { PROTO_TLS, OSSL_QUIC1_VERSION, OSSL_QUIC1_VERSION, 0, 0, 0, 0 },
+    { PROTO_TLS, 7, 42, 0, 0, 0, 0 },
+    { PROTO_DTLS, 0, 0, 1, 1, 0, 0 },
+    { PROTO_DTLS, DTLS1_VERSION, DTLS1_2_VERSION, 1, 1, DTLS1_VERSION, DTLS1_2_VERSION },
 #ifndef OPENSSL_NO_DTLS1_2
-    {PROTO_DTLS, DTLS1_2_VERSION,        DTLS1_2_VERSION,        1, 1, DTLS1_2_VERSION,    DTLS1_2_VERSION},
+    { PROTO_DTLS, DTLS1_2_VERSION, DTLS1_2_VERSION, 1, 1, DTLS1_2_VERSION, DTLS1_2_VERSION },
 #endif
 #ifndef OPENSSL_NO_DTLS1
-    {PROTO_DTLS, DTLS1_VERSION,          DTLS1_VERSION,          1, 1, DTLS1_VERSION,      DTLS1_VERSION},
+    { PROTO_DTLS, DTLS1_VERSION, DTLS1_VERSION, 1, 1, DTLS1_VERSION, DTLS1_VERSION },
 #endif
 #if !defined(OPENSSL_NO_DTLS1) && !defined(OPENSSL_NO_DTLS1_2)
-    {PROTO_DTLS, DTLS1_2_VERSION,        DTLS1_VERSION,          1, 1, DTLS1_2_VERSION,    DTLS1_VERSION},
+    { PROTO_DTLS, DTLS1_2_VERSION, DTLS1_VERSION, 1, 1, DTLS1_2_VERSION, DTLS1_VERSION },
 #endif
-    {PROTO_DTLS, DTLS1_VERSION + 1,      DTLS1_2_VERSION,        0, 1, 0,                  DTLS1_2_VERSION},
-    {PROTO_DTLS, DTLS1_VERSION,          DTLS1_2_VERSION - 1,    1, 0, DTLS1_VERSION,      0},
-    {PROTO_DTLS, TLS1_VERSION,           TLS1_3_VERSION,         1, 1, 0,                  0},
-    {PROTO_DTLS, OSSL_QUIC1_VERSION,     OSSL_QUIC1_VERSION,     0, 0, 0,                  0},
+    { PROTO_DTLS, DTLS1_VERSION + 1, DTLS1_2_VERSION, 0, 1, 0, DTLS1_2_VERSION },
+    { PROTO_DTLS, DTLS1_VERSION, DTLS1_2_VERSION - 1, 1, 0, DTLS1_VERSION, 0 },
+    { PROTO_DTLS, TLS1_VERSION, TLS1_3_VERSION, 1, 1, 0, 0 },
+    { PROTO_DTLS, OSSL_QUIC1_VERSION, OSSL_QUIC1_VERSION, 0, 0, 0, 0 },
     /* These functions never have an effect when called on a QUIC object */
-    {PROTO_QUIC, 0,                      0,                      1, 1, 0,                  0},
-    {PROTO_QUIC, OSSL_QUIC1_VERSION,     OSSL_QUIC1_VERSION,     0, 0, 0,                  0},
-    {PROTO_QUIC, OSSL_QUIC1_VERSION,     OSSL_QUIC1_VERSION + 1, 0, 0, 0,                  0},
-    {PROTO_QUIC, TLS1_VERSION,           TLS1_3_VERSION,         1, 1, 0,                  0},
+    { PROTO_QUIC, 0, 0, 1, 1, 0, 0 },
+    { PROTO_QUIC, OSSL_QUIC1_VERSION, OSSL_QUIC1_VERSION, 0, 0, 0, 0 },
+    { PROTO_QUIC, OSSL_QUIC1_VERSION, OSSL_QUIC1_VERSION + 1, 0, 0, 0, 0 },
+    { PROTO_QUIC, TLS1_VERSION, TLS1_3_VERSION, 1, 1, 0, 0 },
 #ifndef OPENSSL_NO_DTLS
-    {PROTO_QUIC, DTLS1_VERSION,          DTLS1_2_VERSION,        1, 1, 0,                  0},
+    { PROTO_QUIC, DTLS1_VERSION, DTLS1_2_VERSION, 1, 1, 0, 0 },
 #endif
 };
 
@@ -127,7 +127,7 @@ static int test_set_min_max_version(int idx_tst)
 
     testresult = 1;
 
-  end:
+end:
     SSL_free(ssl);
     SSL_CTX_free(ctx);
     return testresult;
diff --git a/test/ssl_handshake_rtt_test.c b/test/ssl_handshake_rtt_test.c
index 1d24ba995e5d6..8578e8f988fc0 100644
--- a/test/ssl_handshake_rtt_test.c
+++ b/test/ssl_handshake_rtt_test.c
@@ -12,7 +12,7 @@
  * when the deprecated calls are not hidden
  */
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# define OPENSSL_SUPPRESS_DEPRECATED
+#define OPENSSL_SUPPRESS_DEPRECATED
 #endif
 
 #include <stdio.h>
@@ -62,13 +62,13 @@ static int test_handshake_rtt(int tst)
 #endif
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION,
-                                       (tst <= 1) ? TLS1_2_VERSION
-                                                  : TLS1_3_VERSION,
-                                       &sctx, &cctx, cert, privkey))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL)))
+            TLS_client_method(),
+            TLS1_VERSION,
+            (tst <= 1) ? TLS1_2_VERSION
+                       : TLS1_3_VERSION,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL)))
         goto end;
 
     s = SSL_CONNECTION_FROM_SSL(tst % 2 == 0 ? clientssl : serverssl);
@@ -122,7 +122,7 @@ static int test_handshake_rtt(int tst)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
diff --git a/test/ssl_old_test.c b/test/ssl_old_test.c
index 8c26f3ed2f094..5476036e8bf3e 100644
--- a/test/ssl_old_test.c
+++ b/test/ssl_old_test.c
@@ -13,10 +13,10 @@
 
 /* Or gethostname won't be declared properly on Linux and GNU platforms. */
 #ifndef _BSD_SOURCE
-# define _BSD_SOURCE 1
+#define _BSD_SOURCE 1
 #endif
 #ifndef _DEFAULT_SOURCE
-# define _DEFAULT_SOURCE 1
+#define _DEFAULT_SOURCE 1
 #endif
 
 #include <assert.h>
@@ -33,7 +33,7 @@
 /*
  * Or isascii won't be declared properly on VMS (at least with DECompHP C).
  */
-# define _XOPEN_SOURCE 500
+#define _XOPEN_SOURCE 500
 #endif
 
 #include <ctype.h>
@@ -48,11 +48,11 @@
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
 #ifndef OPENSSL_NO_DSA
-# include <openssl/dsa.h>
+#include <openssl/dsa.h>
 #endif
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_CT
-# include <openssl/ct.h>
+#include <openssl/ct.h>
 #endif
 #include <openssl/provider.h>
 #include "testutil.h"
@@ -64,12 +64,12 @@
  * Do not try to put it earlier, or IPv6 includes
  * get screwed...
  */
-#define _XOPEN_SOURCE_EXTENDED  1
+#define _XOPEN_SOURCE_EXTENDED 1
 
 #ifdef OPENSSL_SYS_WINDOWS
-# include <winsock.h>
+#include <winsock.h>
 #else
-# include <unistd.h>
+#include <unistd.h>
 #endif
 
 #include "helpers/predefined_dhparams.h"
@@ -81,7 +81,7 @@ static SSL_CTX *s_ctx2 = NULL;
  * There is really no standard for this, so let's assign something
  * only for this test
  */
-#define COMP_ZLIB       1
+#define COMP_ZLIB 1
 
 static int verify_callback(int ok, X509_STORE_CTX *ctx);
 static int app_verify_callback(X509_STORE_CTX *ctx, void *arg);
@@ -91,16 +91,16 @@ struct app_verify_arg {
     int app_verify;
 };
 
-static char *psk_key = NULL;    /* by default PSK is not used */
+static char *psk_key = NULL; /* by default PSK is not used */
 #ifndef OPENSSL_NO_PSK
 static unsigned int psk_client_callback(SSL *ssl, const char *hint,
-                                        char *identity,
-                                        unsigned int max_identity_len,
-                                        unsigned char *psk,
-                                        unsigned int max_psk_len);
+    char *identity,
+    unsigned int max_identity_len,
+    unsigned char *psk,
+    unsigned int max_psk_len);
 static unsigned int psk_server_callback(SSL *ssl, const char *identity,
-                                        unsigned char *psk,
-                                        unsigned int max_psk_len);
+    unsigned char *psk,
+    unsigned int max_psk_len);
 #endif
 
 static BIO *bio_stdout = NULL;
@@ -113,8 +113,8 @@ static int npn_server = 0;
 static int npn_server_reject = 0;
 
 static int cb_client_npn(SSL *s, unsigned char **out, unsigned char *outlen,
-                         const unsigned char *in, unsigned int inlen,
-                         void *arg)
+    const unsigned char *in, unsigned int inlen,
+    void *arg)
 {
     /*
      * This callback only returns the protocol string, rather than a length
@@ -127,7 +127,7 @@ static int cb_client_npn(SSL *s, unsigned char **out, unsigned char *outlen,
 }
 
 static int cb_server_npn(SSL *s, const unsigned char **data,
-                         unsigned int *len, void *arg)
+    unsigned int *len, void *arg)
 {
     *data = (const unsigned char *)NEXT_PROTO_STRING;
     *len = sizeof(NEXT_PROTO_STRING) - 1;
@@ -135,7 +135,7 @@ static int cb_server_npn(SSL *s, const unsigned char **data,
 }
 
 static int cb_server_rejects_npn(SSL *s, const unsigned char **data,
-                                 unsigned int *len, void *arg)
+    unsigned int *len, void *arg)
 {
     return SSL_TLSEXT_ERR_NOACK;
 }
@@ -166,11 +166,9 @@ static int verify_npn(SSL *client, SSL *server)
      * If an NPN string was returned, it must be the protocol that we
      * expected to negotiate.
      */
-    if (client_len && (client_len != sizeof(NEXT_PROTO_STRING) - 2 ||
-                       memcmp(client_s, NEXT_PROTO_STRING + 1, client_len)))
+    if (client_len && (client_len != sizeof(NEXT_PROTO_STRING) - 2 || memcmp(client_s, NEXT_PROTO_STRING + 1, client_len)))
         return -1;
-    if (server_len && (server_len != sizeof(NEXT_PROTO_STRING) - 2 ||
-                       memcmp(server_s, NEXT_PROTO_STRING + 1, server_len)))
+    if (server_len && (server_len != sizeof(NEXT_PROTO_STRING) - 2 || memcmp(server_s, NEXT_PROTO_STRING + 1, server_len)))
         return -1;
 
     if (!npn_client && client_len)
@@ -216,8 +214,7 @@ static int servername_cb(SSL *s, int *ad, void *arg)
     }
 
     if (servername) {
-        if (s_ctx2 != NULL && sn_server2 != NULL &&
-            !OPENSSL_strcasecmp(servername, sn_server2)) {
+        if (s_ctx2 != NULL && sn_server2 != NULL && !OPENSSL_strcasecmp(servername, sn_server2)) {
             BIO_printf(bio_stdout, "Switching server context.\n");
             SSL_set_SSL_CTX(s, s_ctx2);
         }
@@ -227,7 +224,7 @@ static int servername_cb(SSL *s, int *ad, void *arg)
 static int verify_servername(SSL *client, SSL *server)
 {
     /* just need to see if sn_context is what we expect */
-    SSL_CTX* ctx = SSL_get_SSL_CTX(server);
+    SSL_CTX *ctx = SSL_get_SSL_CTX(server);
     if (sn_expect == 0)
         return 0;
     if (sn_expect == 1 && ctx == s_ctx)
@@ -244,7 +241,6 @@ static int verify_servername(SSL *client, SSL *server)
     return -1;
 }
 
-
 /*-
  * next_protos_parse parses a comma separated list of strings into a string
  * in a format suitable for passing to SSL_CTX_set_next_protos_advertised.
@@ -254,7 +250,7 @@ static int verify_servername(SSL *client, SSL *server)
  *   returns: a malloced buffer or NULL on failure.
  */
 static unsigned char *next_protos_parse(size_t *outlen,
-                                        const char *in)
+    const char *in)
 {
     size_t len;
     unsigned char *out;
@@ -285,23 +281,23 @@ static unsigned char *next_protos_parse(size_t *outlen,
 }
 
 static int cb_server_alpn(SSL *s, const unsigned char **out,
-                          unsigned char *outlen, const unsigned char *in,
-                          unsigned int inlen, void *arg)
+    unsigned char *outlen, const unsigned char *in,
+    unsigned int inlen, void *arg)
 {
     unsigned char *protos;
     size_t protos_len;
-    char* alpn_str = arg;
+    char *alpn_str = arg;
 
     protos = next_protos_parse(&protos_len, alpn_str);
     if (protos == NULL) {
         fprintf(stderr, "failed to parser ALPN server protocol string: %s\n",
-                alpn_str);
+            alpn_str);
         abort();
     }
 
-    if (SSL_select_next_proto
-        ((unsigned char **)out, outlen, protos, protos_len, in,
-         inlen) != OPENSSL_NPN_NEGOTIATED) {
+    if (SSL_select_next_proto((unsigned char **)out, outlen, protos, protos_len, in,
+            inlen)
+        != OPENSSL_NPN_NEGOTIATED) {
         OPENSSL_free(protos);
         return SSL_TLSEXT_ERR_NOACK;
     }
@@ -335,13 +331,13 @@ static int verify_alpn(SSL *client, SSL *server)
 
     if (client_proto == NULL && client_proto_len != 0) {
         BIO_printf(bio_stdout,
-                   "Inconsistent SSL_get0_alpn_selected() for client!\n");
+            "Inconsistent SSL_get0_alpn_selected() for client!\n");
         goto err;
     }
 
     if (server_proto == NULL && server_proto_len != 0) {
         BIO_printf(bio_stdout,
-                   "Inconsistent SSL_get0_alpn_selected() for server!\n");
+            "Inconsistent SSL_get0_alpn_selected() for server!\n");
         goto err;
     }
 
@@ -350,8 +346,7 @@ static int verify_alpn(SSL *client, SSL *server)
         goto err;
     }
 
-    if (client_proto != NULL &&
-        memcmp(client_proto, server_proto, client_proto_len) != 0) {
+    if (client_proto != NULL && memcmp(client_proto, server_proto, client_proto_len) != 0) {
         BIO_printf(bio_stdout, "ALPN selected protocols differ!\n");
         goto err;
     }
@@ -361,31 +356,29 @@ static int verify_alpn(SSL *client, SSL *server)
         goto err;
     }
 
-    if (alpn_expected != NULL &&
-        (client_proto_len != strlen(alpn_expected) ||
-         memcmp(client_proto, alpn_expected, client_proto_len) != 0)) {
+    if (alpn_expected != NULL && (client_proto_len != strlen(alpn_expected) || memcmp(client_proto, alpn_expected, client_proto_len) != 0)) {
         BIO_printf(bio_stdout,
-                   "ALPN selected protocols not equal to expected protocol: %s\n",
-                   alpn_expected);
+            "ALPN selected protocols not equal to expected protocol: %s\n",
+            alpn_expected);
         goto err;
     }
 
     return 0;
 
- err:
+err:
     BIO_printf(bio_stdout, "ALPN results: client: '");
     BIO_write(bio_stdout, client_proto, client_proto_len);
     BIO_printf(bio_stdout, "', server: '");
     BIO_write(bio_stdout, server_proto, server_proto_len);
     BIO_printf(bio_stdout, "'\n");
     BIO_printf(bio_stdout, "ALPN configured: client: '%s', server: '",
-                   alpn_client);
+        alpn_client);
     if (SSL_get_SSL_CTX(server) == s_ctx2) {
         BIO_printf(bio_stdout, "%s'\n",
-                   alpn_server2);
+            alpn_server2);
     } else {
         BIO_printf(bio_stdout, "%s'\n",
-                   alpn_server);
+            alpn_server);
     }
     return -1;
 }
@@ -421,8 +414,8 @@ static int custom_ext = 0;
 static int custom_ext_error = 0;
 
 static int serverinfo_cli_parse_cb(SSL *s, unsigned int ext_type,
-                                   const unsigned char *in, size_t inlen,
-                                   int *al, void *arg)
+    const unsigned char *in, size_t inlen,
+    int *al, void *arg)
 {
     if (ext_type == TLSEXT_TYPE_signed_certificate_timestamp)
         serverinfo_sct_seen++;
@@ -453,82 +446,82 @@ static int verify_serverinfo(void)
  */
 
 static int custom_ext_0_cli_add_cb(SSL *s, unsigned int ext_type,
-                                   const unsigned char **out,
-                                   size_t *outlen, int *al, void *arg)
+    const unsigned char **out,
+    size_t *outlen, int *al, void *arg)
 {
     if (ext_type != CUSTOM_EXT_TYPE_0)
         custom_ext_error = 1;
-    return 0;                   /* Don't send an extension */
+    return 0; /* Don't send an extension */
 }
 
 static int custom_ext_0_cli_parse_cb(SSL *s, unsigned int ext_type,
-                                     const unsigned char *in,
-                                     size_t inlen, int *al, void *arg)
+    const unsigned char *in,
+    size_t inlen, int *al, void *arg)
 {
     return 1;
 }
 
 static int custom_ext_1_cli_add_cb(SSL *s, unsigned int ext_type,
-                                   const unsigned char **out,
-                                   size_t *outlen, int *al, void *arg)
+    const unsigned char **out,
+    size_t *outlen, int *al, void *arg)
 {
     if (ext_type != CUSTOM_EXT_TYPE_1)
         custom_ext_error = 1;
     *out = (const unsigned char *)custom_ext_cli_string;
     *outlen = strlen(custom_ext_cli_string);
-    return 1;                   /* Send "abc" */
+    return 1; /* Send "abc" */
 }
 
 static int custom_ext_1_cli_parse_cb(SSL *s, unsigned int ext_type,
-                                     const unsigned char *in,
-                                     size_t inlen, int *al, void *arg)
+    const unsigned char *in,
+    size_t inlen, int *al, void *arg)
 {
     return 1;
 }
 
 static int custom_ext_2_cli_add_cb(SSL *s, unsigned int ext_type,
-                                   const unsigned char **out,
-                                   size_t *outlen, int *al, void *arg)
+    const unsigned char **out,
+    size_t *outlen, int *al, void *arg)
 {
     if (ext_type != CUSTOM_EXT_TYPE_2)
         custom_ext_error = 1;
     *out = (const unsigned char *)custom_ext_cli_string;
     *outlen = strlen(custom_ext_cli_string);
-    return 1;                   /* Send "abc" */
+    return 1; /* Send "abc" */
 }
 
 static int custom_ext_2_cli_parse_cb(SSL *s, unsigned int ext_type,
-                                     const unsigned char *in,
-                                     size_t inlen, int *al, void *arg)
+    const unsigned char *in,
+    size_t inlen, int *al, void *arg)
 {
     if (ext_type != CUSTOM_EXT_TYPE_2)
         custom_ext_error = 1;
     if (inlen != 0)
-        custom_ext_error = 1;   /* Should be empty response */
+        custom_ext_error = 1; /* Should be empty response */
     return 1;
 }
 
 static int custom_ext_3_cli_add_cb(SSL *s, unsigned int ext_type,
-                                   const unsigned char **out,
-                                   size_t *outlen, int *al, void *arg)
+    const unsigned char **out,
+    size_t *outlen, int *al, void *arg)
 {
     if (ext_type != CUSTOM_EXT_TYPE_3)
         custom_ext_error = 1;
     *out = (const unsigned char *)custom_ext_cli_string;
     *outlen = strlen(custom_ext_cli_string);
-    return 1;                   /* Send "abc" */
+    return 1; /* Send "abc" */
 }
 
 static int custom_ext_3_cli_parse_cb(SSL *s, unsigned int ext_type,
-                                     const unsigned char *in,
-                                     size_t inlen, int *al, void *arg)
+    const unsigned char *in,
+    size_t inlen, int *al, void *arg)
 {
     if (ext_type != CUSTOM_EXT_TYPE_3)
         custom_ext_error = 1;
     if (inlen != strlen(custom_ext_srv_string))
         custom_ext_error = 1;
     if (memcmp(custom_ext_srv_string, in, inlen) != 0)
-        custom_ext_error = 1;   /* Check for "defg" */
+        custom_ext_error = 1; /* Check for "defg" */
     return 1;
 }
 
@@ -537,8 +530,8 @@ static int custom_ext_3_cli_parse_cb(SSL *s, unsigned int ext_type,
  * for this extension
  */
 static int custom_ext_0_srv_parse_cb(SSL *s, unsigned int ext_type,
-                                     const unsigned char *in,
-                                     size_t inlen, int *al, void *arg)
+    const unsigned char *in,
+    size_t inlen, int *al, void *arg)
 {
     custom_ext_error = 1;
     return 1;
@@ -546,17 +539,17 @@ static int custom_ext_0_srv_parse_cb(SSL *s, unsigned int ext_type,
 
 /* 'add' callbacks are only called if the 'parse' callback is called */
 static int custom_ext_0_srv_add_cb(SSL *s, unsigned int ext_type,
-                                   const unsigned char **out,
-                                   size_t *outlen, int *al, void *arg)
+    const unsigned char **out,
+    size_t *outlen, int *al, void *arg)
 {
     /* Error: should not have been called */
     custom_ext_error = 1;
-    return 0;                   /* Don't send an extension */
+    return 0; /* Don't send an extension */
 }
 
 static int custom_ext_1_srv_parse_cb(SSL *s, unsigned int ext_type,
-                                     const unsigned char *in,
-                                     size_t inlen, int *al, void *arg)
+    const unsigned char *in,
+    size_t inlen, int *al, void *arg)
 {
     if (ext_type != CUSTOM_EXT_TYPE_1)
         custom_ext_error = 1;
@@ -569,15 +562,15 @@ static int custom_ext_1_srv_parse_cb(SSL *s, unsigned int ext_type,
 }
 
 static int custom_ext_1_srv_add_cb(SSL *s, unsigned int ext_type,
-                                   const unsigned char **out,
-                                   size_t *outlen, int *al, void *arg)
+    const unsigned char **out,
+    size_t *outlen, int *al, void *arg)
 {
-    return 0;                   /* Don't send an extension */
+    return 0; /* Don't send an extension */
 }
 
 static int custom_ext_2_srv_parse_cb(SSL *s, unsigned int ext_type,
-                                     const unsigned char *in,
-                                     size_t inlen, int *al, void *arg)
+    const unsigned char *in,
+    size_t inlen, int *al, void *arg)
 {
     if (ext_type != CUSTOM_EXT_TYPE_2)
         custom_ext_error = 1;
@@ -590,17 +583,17 @@ static int custom_ext_2_srv_parse_cb(SSL *s, unsigned int ext_type,
 }
 
 static int custom_ext_2_srv_add_cb(SSL *s, unsigned int ext_type,
-                                   const unsigned char **out,
-                                   size_t *outlen, int *al, void *arg)
+    const unsigned char **out,
+    size_t *outlen, int *al, void *arg)
 {
     *out = NULL;
     *outlen = 0;
-    return 1;                   /* Send empty extension */
+    return 1; /* Send empty extension */
 }
 
 static int custom_ext_3_srv_parse_cb(SSL *s, unsigned int ext_type,
-                                     const unsigned char *in,
-                                     size_t inlen, int *al, void *arg)
+    const unsigned char *in,
+    size_t inlen, int *al, void *arg)
 {
     if (ext_type != CUSTOM_EXT_TYPE_3)
         custom_ext_error = 1;
@@ -613,12 +606,12 @@ static int custom_ext_3_srv_parse_cb(SSL *s, unsigned int ext_type,
 }
 
 static int custom_ext_3_srv_add_cb(SSL *s, unsigned int ext_type,
-                                   const unsigned char **out,
-                                   size_t *outlen, int *al, void *arg)
+    const unsigned char **out,
+    size_t *outlen, int *al, void *arg)
 {
     *out = (const unsigned char *)custom_ext_srv_string;
     *outlen = strlen(custom_ext_srv_string);
-    return 1;                   /* Send "defg" */
+    return 1; /* Send "defg" */
 }
 
 static char *cipher = NULL;
@@ -627,9 +620,9 @@ static int verbose = 0;
 static int debug = 0;
 
 int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family,
-                   long bytes, clock_t *s_time, clock_t *c_time);
+    long bytes, clock_t *s_time, clock_t *c_time);
 int doit_biopair(SSL *s_ssl, SSL *c_ssl, long bytes, clock_t *s_time,
-                 clock_t *c_time);
+    clock_t *c_time);
 int doit(SSL *s_ssl, SSL *c_ssl, long bytes);
 
 static void sv_usage(void)
@@ -643,16 +636,16 @@ static void sv_usage(void)
     fprintf(stderr, " -reuse        - use session-id reuse\n");
     fprintf(stderr, " -num <val>    - number of connections to perform\n");
     fprintf(stderr,
-            " -bytes <val>  - number of bytes to swap between client/server\n");
+        " -bytes <val>  - number of bytes to swap between client/server\n");
 #ifndef OPENSSL_NO_DH
     fprintf(stderr,
-            " -dhe512       - use 512 bit key for DHE (to test failure)\n");
+        " -dhe512       - use 512 bit key for DHE (to test failure)\n");
     fprintf(stderr,
-            " -dhe1024dsa   - use 1024 bit key (with 160-bit subprime) for DHE\n");
+        " -dhe1024dsa   - use 1024 bit key (with 160-bit subprime) for DHE\n");
     fprintf(stderr,
-            " -dhe2048      - use 2048 bit key (safe prime) for DHE (default, no-op)\n");
+        " -dhe2048      - use 2048 bit key (safe prime) for DHE (default, no-op)\n");
     fprintf(stderr,
-            " -dhe4096      - use 4096 bit key (safe prime) for DHE\n");
+        " -dhe4096      - use 4096 bit key (safe prime) for DHE\n");
 #endif
     fprintf(stderr, " -no_dhe       - disable DHE\n");
 #ifndef OPENSSL_NO_EC
@@ -686,10 +679,10 @@ static void sv_usage(void)
     fprintf(stderr, " -CAfile arg   - PEM format file of CA's\n");
     fprintf(stderr, " -s_cert arg   - Server certificate file\n");
     fprintf(stderr,
-            " -s_key arg    - Server key file (default: same as -cert)\n");
+        " -s_key arg    - Server key file (default: same as -cert)\n");
     fprintf(stderr, " -c_cert arg   - Client certificate file\n");
     fprintf(stderr,
-            " -c_key arg    - Client key file (default: same as -c_cert)\n");
+        " -c_key arg    - Client key file (default: same as -c_cert)\n");
     fprintf(stderr, " -cipher arg   - The TLSv1.2 and below cipher list\n");
     fprintf(stderr, " -ciphersuites arg   - The TLSv1.3 ciphersuites\n");
     fprintf(stderr, " -bio_pair     - Use BIO pairs\n");
@@ -697,7 +690,7 @@ static void sv_usage(void)
     fprintf(stderr, " -ipv6         - Use IPv6 connection on localhost\n");
     fprintf(stderr, " -f            - Test even cases that can't work\n");
     fprintf(stderr,
-            " -time         - measure processor time used by client and server\n");
+        " -time         - measure processor time used by client and server\n");
     fprintf(stderr, " -zlib         - use zlib compression\n");
 #ifndef OPENSSL_NO_NEXTPROTONEG
     fprintf(stderr, " -npn_client - have client side offer NPN\n");
@@ -707,15 +700,15 @@ static void sv_usage(void)
     fprintf(stderr, " -serverinfo_file file - have server use this file\n");
     fprintf(stderr, " -serverinfo_sct  - have client offer and expect SCT\n");
     fprintf(stderr,
-            " -serverinfo_tack - have client offer and expect TACK\n");
+        " -serverinfo_tack - have client offer and expect TACK\n");
     fprintf(stderr,
-            " -custom_ext - try various custom extension callbacks\n");
+        " -custom_ext - try various custom extension callbacks\n");
     fprintf(stderr, " -alpn_client <string> - have client side offer ALPN\n");
     fprintf(stderr, " -alpn_server <string> - have server side offer ALPN\n");
     fprintf(stderr, " -alpn_server1 <string> - alias for -alpn_server\n");
     fprintf(stderr, " -alpn_server2 <string> - have server side context 2 offer ALPN\n");
     fprintf(stderr,
-            " -alpn_expected <string> - the ALPN protocol that should be negotiated\n");
+        " -alpn_expected <string> - the ALPN protocol that should be negotiated\n");
     fprintf(stderr, " -server_min_proto <string> - Minimum version the server should support\n");
     fprintf(stderr, " -server_max_proto <string> - Maximum version the server should support\n");
     fprintf(stderr, " -client_min_proto <string> - Minimum version the client should support\n");
@@ -786,12 +779,12 @@ static void print_details(SSL *c_ssl, const char *prefix)
 
     ciph = SSL_get_current_cipher(c_ssl);
     BIO_printf(bio_stdout, "%s%s, cipher %s %s",
-               prefix,
-               SSL_get_version(c_ssl),
-               SSL_CIPHER_get_version(ciph), SSL_CIPHER_get_name(ciph));
+        prefix,
+        SSL_get_version(c_ssl),
+        SSL_CIPHER_get_version(ciph), SSL_CIPHER_get_name(ciph));
     cert = SSL_get0_peer_certificate(c_ssl);
     if (cert != NULL) {
-        EVP_PKEY* pubkey = X509_get0_pubkey(cert);
+        EVP_PKEY *pubkey = X509_get0_pubkey(cert);
 
         if (pubkey != NULL) {
             BIO_puts(bio_stdout, ", ");
@@ -820,13 +813,14 @@ static int protocol_from_string(const char *value)
         int version;
     };
     static const struct protocol_versions versions[] = {
-        {"ssl3", SSL3_VERSION},
-        {"tls1", TLS1_VERSION},
-        {"tls1.1", TLS1_1_VERSION},
-        {"tls1.2", TLS1_2_VERSION},
-        {"tls1.3", TLS1_3_VERSION},
-        {"dtls1", DTLS1_VERSION},
-        {"dtls1.2", DTLS1_2_VERSION}};
+        { "ssl3", SSL3_VERSION },
+        { "tls1", TLS1_VERSION },
+        { "tls1.1", TLS1_1_VERSION },
+        { "tls1.2", TLS1_2_VERSION },
+        { "tls1.3", TLS1_3_VERSION },
+        { "dtls1", DTLS1_VERSION },
+        { "dtls1.2", DTLS1_2_VERSION }
+    };
     size_t i;
     size_t n = OSSL_NELEM(versions);
 
@@ -897,7 +891,11 @@ int main(int argc, char *argv[])
 {
     const char *CApath = NULL, *CAfile = NULL;
     int badop = 0;
-    enum { BIO_MEM, BIO_PAIR, BIO_IPV4, BIO_IPV6 } bio_type = BIO_MEM;
+    enum { BIO_MEM,
+        BIO_PAIR,
+        BIO_IPV4,
+        BIO_IPV6 } bio_type
+        = BIO_MEM;
     int force = 0;
     int dtls1 = 0, dtls12 = 0, dtls = 0, tls1 = 0, tls1_1 = 0, tls1_2 = 0, ssl3 = 0;
     int ret = EXIT_FAILURE;
@@ -959,13 +957,9 @@ int main(int argc, char *argv[])
     }
 
     SSL_CONF_CTX_set_flags(s_cctx,
-                           SSL_CONF_FLAG_CMDLINE | SSL_CONF_FLAG_SERVER |
-                           SSL_CONF_FLAG_CERTIFICATE |
-                           SSL_CONF_FLAG_REQUIRE_PRIVATE);
+        SSL_CONF_FLAG_CMDLINE | SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE | SSL_CONF_FLAG_REQUIRE_PRIVATE);
     SSL_CONF_CTX_set_flags(s_cctx2,
-                           SSL_CONF_FLAG_CMDLINE | SSL_CONF_FLAG_SERVER |
-                           SSL_CONF_FLAG_CERTIFICATE |
-                           SSL_CONF_FLAG_REQUIRE_PRIVATE);
+        SSL_CONF_FLAG_CMDLINE | SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE | SSL_CONF_FLAG_REQUIRE_PRIVATE);
     if (!SSL_CONF_CTX_set1_prefix(s_cctx, "-s_")) {
         ERR_print_errors(bio_err);
         goto end;
@@ -976,9 +970,7 @@ int main(int argc, char *argv[])
     }
 
     SSL_CONF_CTX_set_flags(c_cctx,
-                           SSL_CONF_FLAG_CMDLINE | SSL_CONF_FLAG_CLIENT |
-                           SSL_CONF_FLAG_CERTIFICATE |
-                           SSL_CONF_FLAG_REQUIRE_PRIVATE);
+        SSL_CONF_FLAG_CMDLINE | SSL_CONF_FLAG_CLIENT | SSL_CONF_FLAG_CERTIFICATE | SSL_CONF_FLAG_REQUIRE_PRIVATE);
     if (!SSL_CONF_CTX_set1_prefix(c_cctx, "-c_")) {
         ERR_print_errors(bio_err);
         goto end;
@@ -990,7 +982,7 @@ int main(int argc, char *argv[])
     while (argc >= 1) {
         if (strcmp(*argv, "-F") == 0) {
             fprintf(stderr,
-                    "not compiled with FIPS support, so exiting without running.\n");
+                "not compiled with FIPS support, so exiting without running.\n");
             ret = EXIT_SUCCESS;
             goto end;
         } else if (strcmp(*argv, "-server_auth") == 0)
@@ -1029,8 +1021,7 @@ int main(int argc, char *argv[])
 #else
             no_psk = 1;
 #endif
-        }
-        else if (strcmp(*argv, "-tls1_2") == 0) {
+        } else if (strcmp(*argv, "-tls1_2") == 0) {
             tls1_2 = 1;
         } else if (strcmp(*argv, "-tls1_1") == 0) {
             tls1_1 = 1;
@@ -1095,8 +1086,7 @@ int main(int argc, char *argv[])
 #ifndef OPENSSL_NO_CT
         else if (strcmp(*argv, "-noct") == 0) {
             ct_validation = 0;
-        }
-        else if (strcmp(*argv, "-ct") == 0) {
+        } else if (strcmp(*argv, "-ct") == 0) {
             ct_validation = 1;
         }
 #endif
@@ -1109,7 +1099,7 @@ int main(int argc, char *argv[])
             app_verify_arg.app_verify = 1;
         }
 #ifndef OPENSSL_NO_NEXTPROTONEG
-          else if (strcmp(*argv, "-npn_client") == 0) {
+        else if (strcmp(*argv, "-npn_client") == 0) {
             npn_client = 1;
         } else if (strcmp(*argv, "-npn_server") == 0) {
             npn_server = 1;
@@ -1131,8 +1121,7 @@ int main(int argc, char *argv[])
             if (--argc < 1)
                 goto bad;
             alpn_client = *(++argv);
-        } else if (strcmp(*argv, "-alpn_server") == 0 ||
-                   strcmp(*argv, "-alpn_server1") == 0) {
+        } else if (strcmp(*argv, "-alpn_server") == 0 || strcmp(*argv, "-alpn_server1") == 0) {
             if (--argc < 1)
                 goto bad;
             alpn_server = *(++argv);
@@ -1251,14 +1240,14 @@ int main(int argc, char *argv[])
         argv++;
     }
     if (badop) {
- bad:
+    bad:
         sv_usage();
         goto end;
     }
 
     if (ssl3 + tls1 + tls1_1 + tls1_2 + dtls + dtls1 + dtls12 > 1) {
         fprintf(stderr, "At most one of -ssl3, -tls1, -tls1_1, -tls1_2, -dtls, -dtls1 or -dtls12 should "
-                "be requested.\n");
+                        "be requested.\n");
         goto end;
     }
 
@@ -1268,27 +1257,27 @@ int main(int argc, char *argv[])
     else
 #endif
 #ifdef OPENSSL_NO_TLS1
-    if (tls1)
+        if (tls1)
         no_protocol = 1;
     else
 #endif
 #ifdef OPENSSL_NO_TLS1_1
-    if (tls1_1)
+        if (tls1_1)
         no_protocol = 1;
     else
 #endif
 #ifdef OPENSSL_NO_TLS1_2
-    if (tls1_2)
+        if (tls1_2)
         no_protocol = 1;
     else
 #endif
 #if defined(OPENSSL_NO_DTLS) || defined(OPENSSL_NO_DTLS1)
-    if (dtls1)
+        if (dtls1)
         no_protocol = 1;
     else
 #endif
 #if defined(OPENSSL_NO_DTLS) || defined(OPENSSL_NO_DTLS1_2)
-    if (dtls12)
+        if (dtls12)
         no_protocol = 1;
     else
 #endif
@@ -1301,17 +1290,17 @@ int main(int argc, char *argv[])
      */
     if (no_protocol) {
         fprintf(stderr, "Testing was requested for a disabled protocol. "
-                "Skipping tests.\n");
+                        "Skipping tests.\n");
         ret = EXIT_SUCCESS;
         goto end;
     }
 
     if (!ssl3 && !tls1 && !tls1_1 && !tls1_2 && !dtls && !dtls1 && !dtls12 && number > 1
-            && !reuse && !force) {
+        && !reuse && !force) {
         fprintf(stderr, "This case cannot work.  Use -f to perform "
-                "the test anyway (and\n-d to see what happens), "
-                "or add one of -ssl3, -tls1, -tls1_1, -tls1_2, -dtls, -dtls1, -dtls12, -reuse\n"
-                "to avoid protocol mismatch.\n");
+                        "the test anyway (and\n-d to see what happens), "
+                        "or add one of -ssl3, -tls1, -tls1_1, -tls1_2, -dtls, -dtls1, -dtls12, -reuse\n"
+                        "to avoid protocol mismatch.\n");
         goto end;
     }
 
@@ -1322,7 +1311,7 @@ int main(int argc, char *argv[])
         }
         if (number < 50 && !force)
             fprintf(stderr,
-                    "Warning: For accurate timings, use more connections (e.g. -num 1000)\n");
+                "Warning: For accurate timings, use more connections (e.g. -num 1000)\n");
     }
 
 #ifndef OPENSSL_NO_COMP
@@ -1335,8 +1324,8 @@ int main(int argc, char *argv[])
         }
     } else {
         fprintf(stderr,
-                "Warning: %s compression not supported\n",
-                comp == COMP_ZLIB ? "zlib" : "unknown");
+            "Warning: %s compression not supported\n",
+            comp == COMP_ZLIB ? "zlib" : "unknown");
         ERR_print_errors_fp(stderr);
     }
     ssl_comp_methods = SSL_COMP_get_compression_methods();
@@ -1368,12 +1357,12 @@ int main(int argc, char *argv[])
         max_version = TLS1_2_VERSION;
     } else {
         min_version = 0;
-# if defined(OPENSSL_NO_EC) && defined(OPENSSL_NO_DH)
+#if defined(OPENSSL_NO_EC) && defined(OPENSSL_NO_DH)
         /* We only have ec and dh based built-in groups for TLSv1.3 */
         max_version = TLS1_2_VERSION;
-# else
+#else
         max_version = 0;
-# endif
+#endif
     }
 #endif
 #ifndef OPENSSL_NO_DTLS
@@ -1393,7 +1382,7 @@ int main(int argc, char *argv[])
 #endif
 
     if (provider != NULL
-            && !test_get_libctx(&libctx, &defctxnull, config, &thisprov, provider))
+        && !test_get_libctx(&libctx, &defctxnull, config, &thisprov, provider))
         goto end;
 
     c_ctx = SSL_CTX_new_ex(libctx, NULL, meth);
@@ -1468,8 +1457,8 @@ int main(int argc, char *argv[])
             }
         } else {
             if (!SSL_CTX_set_cipher_list(c_ctx, cipher)
-                    || !SSL_CTX_set_cipher_list(s_ctx, cipher)
-                    || !SSL_CTX_set_cipher_list(s_ctx2, cipher)) {
+                || !SSL_CTX_set_cipher_list(s_ctx, cipher)
+                || !SSL_CTX_set_cipher_list(s_ctx2, cipher)) {
                 ERR_print_errors(bio_err);
                 goto end;
             }
@@ -1485,8 +1474,7 @@ int main(int argc, char *argv[])
     }
 
 #ifndef OPENSSL_NO_CT
-    if (ct_validation &&
-        !SSL_CTX_enable_ct(c_ctx, SSL_CT_VALIDATION_STRICT)) {
+    if (ct_validation && !SSL_CTX_enable_ct(c_ctx, SSL_CT_VALIDATION_STRICT)) {
         ERR_print_errors(bio_err);
         goto end;
     }
@@ -1510,7 +1498,7 @@ int main(int argc, char *argv[])
         }
         if (rv <= 0) {
             BIO_printf(bio_err, "Error processing %s %s\n",
-                       arg, argn ? argn : "");
+                arg, argn ? argn : "");
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -1546,21 +1534,19 @@ int main(int argc, char *argv[])
 #endif
 
     if (!(SSL_CTX_load_verify_file(s_ctx, CAfile)
-          || SSL_CTX_load_verify_dir(s_ctx, CApath))
+            || SSL_CTX_load_verify_dir(s_ctx, CApath))
         || !SSL_CTX_set_default_verify_paths(s_ctx)
         || !(SSL_CTX_load_verify_file(s_ctx2, CAfile)
-             || SSL_CTX_load_verify_dir(s_ctx2, CApath))
+            || SSL_CTX_load_verify_dir(s_ctx2, CApath))
         || !SSL_CTX_set_default_verify_paths(s_ctx2)
         || !(SSL_CTX_load_verify_file(c_ctx, CAfile)
-             || SSL_CTX_load_verify_dir(c_ctx, CApath))
+            || SSL_CTX_load_verify_dir(c_ctx, CApath))
         || !SSL_CTX_set_default_verify_paths(c_ctx)) {
         ERR_print_errors(bio_err);
     }
 
 #ifndef OPENSSL_NO_CT
-    if (!SSL_CTX_set_default_ctlog_list_file(s_ctx) ||
-        !SSL_CTX_set_default_ctlog_list_file(s_ctx2) ||
-        !SSL_CTX_set_default_ctlog_list_file(c_ctx)) {
+    if (!SSL_CTX_set_default_ctlog_list_file(s_ctx) || !SSL_CTX_set_default_ctlog_list_file(s_ctx2) || !SSL_CTX_set_default_ctlog_list_file(c_ctx)) {
         ERR_print_errors(bio_err);
     }
 #endif
@@ -1568,29 +1554,29 @@ int main(int argc, char *argv[])
     if (client_auth) {
         printf("client authentication\n");
         SSL_CTX_set_verify(s_ctx,
-                           SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
-                           verify_callback);
+            SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
+            verify_callback);
         SSL_CTX_set_verify(s_ctx2,
-                           SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
-                           verify_callback);
+            SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
+            verify_callback);
         SSL_CTX_set_cert_verify_callback(s_ctx, app_verify_callback,
-                                         &app_verify_arg);
+            &app_verify_arg);
         SSL_CTX_set_cert_verify_callback(s_ctx2, app_verify_callback,
-                                         &app_verify_arg);
+            &app_verify_arg);
     }
     if (server_auth) {
         printf("server authentication\n");
         SSL_CTX_set_verify(c_ctx, SSL_VERIFY_PEER, verify_callback);
         SSL_CTX_set_cert_verify_callback(c_ctx, app_verify_callback,
-                                         &app_verify_arg);
+            &app_verify_arg);
     }
 
     {
         int session_id_context = 0;
         if (!SSL_CTX_set_session_id_context(s_ctx, (void *)&session_id_context,
-                                            sizeof(session_id_context)) ||
-            !SSL_CTX_set_session_id_context(s_ctx2, (void *)&session_id_context,
-                                            sizeof(session_id_context))) {
+                sizeof(session_id_context))
+            || !SSL_CTX_set_session_id_context(s_ctx2, (void *)&session_id_context,
+                sizeof(session_id_context))) {
             ERR_print_errors(bio_err);
             goto end;
         }
@@ -1615,8 +1601,7 @@ int main(int argc, char *argv[])
         SSL_CTX_set_psk_server_callback(s_ctx2, psk_server_callback);
         if (debug)
             BIO_printf(bio_err, "setting PSK identity hint to s_ctx\n");
-        if (!SSL_CTX_use_psk_identity_hint(s_ctx, "ctx server identity_hint") ||
-            !SSL_CTX_use_psk_identity_hint(s_ctx2, "ctx server identity_hint")) {
+        if (!SSL_CTX_use_psk_identity_hint(s_ctx, "ctx server identity_hint") || !SSL_CTX_use_psk_identity_hint(s_ctx2, "ctx server identity_hint")) {
             BIO_printf(bio_err, "error setting PSK identity hint to s_ctx\n");
             ERR_print_errors(bio_err);
             goto end;
@@ -1631,7 +1616,7 @@ int main(int argc, char *argv[])
     if (npn_server) {
         if (npn_server_reject) {
             BIO_printf(bio_err,
-                       "Can't have both -npn_server and -npn_server_reject\n");
+                "Can't have both -npn_server and -npn_server_reject\n");
             goto end;
         }
         SSL_CTX_set_npn_advertised_cb(s_ctx, cb_server_npn, NULL);
@@ -1654,68 +1639,67 @@ int main(int argc, char *argv[])
     }
     if (serverinfo_tack) {
         if (!SSL_CTX_add_client_custom_ext(c_ctx, TACK_EXT_TYPE,
-                                      NULL, NULL, NULL,
-                                      serverinfo_cli_parse_cb, NULL)) {
+                NULL, NULL, NULL,
+                serverinfo_cli_parse_cb, NULL)) {
             BIO_printf(bio_err, "Error adding TACK extension\n");
             goto end;
         }
     }
     if (serverinfo_file)
-        if (!SSL_CTX_use_serverinfo_file(s_ctx, serverinfo_file) ||
-            !SSL_CTX_use_serverinfo_file(s_ctx2, serverinfo_file)) {
+        if (!SSL_CTX_use_serverinfo_file(s_ctx, serverinfo_file) || !SSL_CTX_use_serverinfo_file(s_ctx2, serverinfo_file)) {
             BIO_printf(bio_err, "missing serverinfo file\n");
             goto end;
         }
 
     if (custom_ext) {
         if (!SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_0,
-                                      custom_ext_0_cli_add_cb,
-                                      NULL, NULL,
-                                      custom_ext_0_cli_parse_cb, NULL)
+                custom_ext_0_cli_add_cb,
+                NULL, NULL,
+                custom_ext_0_cli_parse_cb, NULL)
             || !SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_1,
-                                      custom_ext_1_cli_add_cb,
-                                      NULL, NULL,
-                                      custom_ext_1_cli_parse_cb, NULL)
+                custom_ext_1_cli_add_cb,
+                NULL, NULL,
+                custom_ext_1_cli_parse_cb, NULL)
             || !SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_2,
-                                      custom_ext_2_cli_add_cb,
-                                      NULL, NULL,
-                                      custom_ext_2_cli_parse_cb, NULL)
+                custom_ext_2_cli_add_cb,
+                NULL, NULL,
+                custom_ext_2_cli_parse_cb, NULL)
             || !SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_3,
-                                      custom_ext_3_cli_add_cb,
-                                      NULL, NULL,
-                                      custom_ext_3_cli_parse_cb, NULL)
+                custom_ext_3_cli_add_cb,
+                NULL, NULL,
+                custom_ext_3_cli_parse_cb, NULL)
             || !SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_0,
-                                      custom_ext_0_srv_add_cb,
-                                      NULL, NULL,
-                                      custom_ext_0_srv_parse_cb, NULL)
+                custom_ext_0_srv_add_cb,
+                NULL, NULL,
+                custom_ext_0_srv_parse_cb, NULL)
             || !SSL_CTX_add_server_custom_ext(s_ctx2, CUSTOM_EXT_TYPE_0,
-                                      custom_ext_0_srv_add_cb,
-                                      NULL, NULL,
-                                      custom_ext_0_srv_parse_cb, NULL)
+                custom_ext_0_srv_add_cb,
+                NULL, NULL,
+                custom_ext_0_srv_parse_cb, NULL)
             || !SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_1,
-                                      custom_ext_1_srv_add_cb,
-                                      NULL, NULL,
-                                      custom_ext_1_srv_parse_cb, NULL)
+                custom_ext_1_srv_add_cb,
+                NULL, NULL,
+                custom_ext_1_srv_parse_cb, NULL)
             || !SSL_CTX_add_server_custom_ext(s_ctx2, CUSTOM_EXT_TYPE_1,
-                                      custom_ext_1_srv_add_cb,
-                                      NULL, NULL,
-                                      custom_ext_1_srv_parse_cb, NULL)
+                custom_ext_1_srv_add_cb,
+                NULL, NULL,
+                custom_ext_1_srv_parse_cb, NULL)
             || !SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_2,
-                                      custom_ext_2_srv_add_cb,
-                                      NULL, NULL,
-                                      custom_ext_2_srv_parse_cb, NULL)
+                custom_ext_2_srv_add_cb,
+                NULL, NULL,
+                custom_ext_2_srv_parse_cb, NULL)
             || !SSL_CTX_add_server_custom_ext(s_ctx2, CUSTOM_EXT_TYPE_2,
-                                      custom_ext_2_srv_add_cb,
-                                      NULL, NULL,
-                                      custom_ext_2_srv_parse_cb, NULL)
+                custom_ext_2_srv_add_cb,
+                NULL, NULL,
+                custom_ext_2_srv_parse_cb, NULL)
             || !SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_3,
-                                      custom_ext_3_srv_add_cb,
-                                      NULL, NULL,
-                                      custom_ext_3_srv_parse_cb, NULL)
+                custom_ext_3_srv_add_cb,
+                NULL, NULL,
+                custom_ext_3_srv_parse_cb, NULL)
             || !SSL_CTX_add_server_custom_ext(s_ctx2, CUSTOM_EXT_TYPE_3,
-                                      custom_ext_3_srv_add_cb,
-                                      NULL, NULL,
-                                      custom_ext_3_srv_parse_cb, NULL)) {
+                custom_ext_3_srv_add_cb,
+                NULL, NULL,
+                custom_ext_3_srv_parse_cb, NULL)) {
             BIO_printf(bio_err, "Error setting custom extensions\n");
             goto end;
         }
@@ -1824,11 +1808,11 @@ int main(int argc, char *argv[])
 #ifndef OPENSSL_NO_SOCK
         case BIO_IPV4:
             ret = doit_localhost(s_ssl, c_ssl, BIO_FAMILY_IPV4,
-                                 bytes, &s_time, &c_time);
+                bytes, &s_time, &c_time);
             break;
         case BIO_IPV6:
             ret = doit_localhost(s_ssl, c_ssl, BIO_FAMILY_IPV6,
-                                 bytes, &s_time, &c_time);
+                bytes, &s_time, &c_time);
             break;
 #else
         case BIO_IPV4:
@@ -1841,9 +1825,7 @@ int main(int argc, char *argv[])
             break;
     }
 
-    if (should_negotiate && ret == EXIT_SUCCESS &&
-        strcmp(should_negotiate, "fail-server") != 0 &&
-        strcmp(should_negotiate, "fail-client") != 0) {
+    if (should_negotiate && ret == EXIT_SUCCESS && strcmp(should_negotiate, "fail-server") != 0 && strcmp(should_negotiate, "fail-client") != 0) {
         int version = protocol_from_string(should_negotiate);
         if (version < 0) {
             BIO_printf(bio_err, "Error parsing: %s\n", should_negotiate);
@@ -1852,17 +1834,18 @@ int main(int argc, char *argv[])
         }
         if (SSL_version(c_ssl) != version) {
             BIO_printf(bio_err, "Unexpected version negotiated. "
-                "Expected: %s, got %s\n", should_negotiate, SSL_get_version(c_ssl));
+                                "Expected: %s, got %s\n",
+                should_negotiate, SSL_get_version(c_ssl));
             ret = EXIT_FAILURE;
             goto end;
         }
     }
 
     if (should_reuse != -1) {
-        if (SSL_session_reused(s_ssl) != should_reuse ||
-            SSL_session_reused(c_ssl) != should_reuse) {
+        if (SSL_session_reused(s_ssl) != should_reuse || SSL_session_reused(c_ssl) != should_reuse) {
             BIO_printf(bio_err, "Unexpected session reuse state. "
-                "Expected: %d, server: %d, client: %d\n", should_reuse,
+                                "Expected: %d, server: %d, client: %d\n",
+                should_reuse,
                 SSL_session_reused(s_ssl), SSL_session_reused(c_ssl));
             ret = EXIT_FAILURE;
             goto end;
@@ -1893,18 +1876,18 @@ int main(int argc, char *argv[])
          * CLOCKS_PER_SEC." -- ISO/IEC 9899
          */
         BIO_printf(bio_stdout, "Approximate total server time: %6.2f s\n"
-                   "Approximate total client time: %6.2f s\n",
-                   (double)s_time / CLOCKS_PER_SEC,
-                   (double)c_time / CLOCKS_PER_SEC);
+                               "Approximate total client time: %6.2f s\n",
+            (double)s_time / CLOCKS_PER_SEC,
+            (double)c_time / CLOCKS_PER_SEC);
 #else
         BIO_printf(bio_stdout,
-                   "Approximate total server time: %6.2f units\n"
-                   "Approximate total client time: %6.2f units\n",
-                   (double)s_time, (double)c_time);
+            "Approximate total server time: %6.2f units\n"
+            "Approximate total client time: %6.2f units\n",
+            (double)s_time, (double)c_time);
 #endif
     }
 
- end:
+end:
     SSL_free(s_ssl);
     SSL_free(c_ssl);
     SSL_CTX_free(s_ctx);
@@ -1931,7 +1914,7 @@ int main(int argc, char *argv[])
 
 #ifndef OPENSSL_NO_SOCK
 int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family, long count,
-                   clock_t *s_time, clock_t *c_time)
+    clock_t *s_time, clock_t *c_time)
 {
     long cw_num = count, cr_num = count, sw_num = count, sr_num = count;
     BIO *s_ssl_bio = NULL, *c_ssl_bio = NULL;
@@ -2036,7 +2019,7 @@ int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family, long count,
             if (debug)
                 if (SSL_in_init(c_ssl))
                     printf("client waiting in SSL_connect - %s\n",
-                           SSL_state_string_long(c_ssl));
+                        SSL_state_string_long(c_ssl));
 
             if (cw_num > 0) {
                 /* Write to server. */
@@ -2115,7 +2098,7 @@ int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family, long count,
             if (debug)
                 if (SSL_in_init(s_ssl))
                     printf("server waiting in SSL_accept - %s\n",
-                           SSL_state_string_long(s_ssl));
+                        SSL_state_string_long(s_ssl));
 
             if (sw_num > 0) {
                 /* Write to client. */
@@ -2165,14 +2148,13 @@ int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family, long count,
 
             *s_time += (clock() - s_clock);
         }
-    }
-    while (cw_num > 0 || cr_num > 0 || sw_num > 0 || sr_num > 0);
+    } while (cw_num > 0 || cr_num > 0 || sw_num > 0 || sr_num > 0);
 
     if (verbose) {
         print_details(c_ssl, "DONE via TCP connect: ");
 
         if (BIO_get_ktls_send(SSL_get_wbio(s_ssl))
-                && BIO_get_ktls_recv(SSL_get_rbio(s_ssl)))
+            && BIO_get_ktls_recv(SSL_get_rbio(s_ssl)))
             BIO_printf(bio_stdout, "Server using Kernel TLS in both directions\n");
         else if (BIO_get_ktls_send(SSL_get_wbio(s_ssl)))
             BIO_printf(bio_stdout, "Server using Kernel TLS for sending\n");
@@ -2180,23 +2162,23 @@ int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family, long count,
             BIO_printf(bio_stdout, "Server using Kernel TLS for receiving\n");
 
         if (BIO_get_ktls_send(SSL_get_wbio(c_ssl))
-                && BIO_get_ktls_recv(SSL_get_rbio(c_ssl)))
+            && BIO_get_ktls_recv(SSL_get_rbio(c_ssl)))
             BIO_printf(bio_stdout, "Client using Kernel TLS in both directions\n");
         else if (BIO_get_ktls_send(SSL_get_wbio(c_ssl)))
             BIO_printf(bio_stdout, "Client using Kernel TLS for sending\n");
         else if (BIO_get_ktls_recv(SSL_get_rbio(c_ssl)))
             BIO_printf(bio_stdout, "Client using Kernel TLS for receiving\n");
     }
-# ifndef OPENSSL_NO_NEXTPROTONEG
+#ifndef OPENSSL_NO_NEXTPROTONEG
     if (verify_npn(c_ssl, s_ssl) < 0)
         goto end;
-# endif
+#endif
     if (verify_serverinfo() < 0) {
         fprintf(stderr, "Server info verify error\n");
         goto err;
     }
     if (verify_alpn(c_ssl, s_ssl) < 0
-            || verify_servername(c_ssl, s_ssl) < 0)
+        || verify_servername(c_ssl, s_ssl) < 0)
         goto err;
 
     if (custom_ext_error) {
@@ -2204,12 +2186,12 @@ int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family, long count,
         goto err;
     }
 
-# ifndef OPENSSL_NO_NEXTPROTONEG
- end:
-# endif
+#ifndef OPENSSL_NO_NEXTPROTONEG
+end:
+#endif
     ret = EXIT_SUCCESS;
 
- err:
+err:
     ERR_print_errors(bio_err);
 
     BIO_free_all(acpt);
@@ -2228,7 +2210,7 @@ int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family, long count,
 #endif
 
 int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
-                 clock_t *s_time, clock_t *c_time)
+    clock_t *s_time, clock_t *c_time)
 {
     long cw_num = count, cr_num = count, sw_num = count, sr_num = count;
     BIO *s_ssl_bio = NULL, *c_ssl_bio = NULL;
@@ -2237,7 +2219,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
     int err_in_client = 0;
     int err_in_server = 0;
 
-    size_t bufsiz = 256;        /* small buffer for testing */
+    size_t bufsiz = 256; /* small buffer for testing */
 
     if (!BIO_new_bio_pair(&server, bufsiz, &server_io, bufsiz))
         goto err;
@@ -2315,7 +2297,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
             if (debug)
                 if (SSL_in_init(c_ssl))
                     printf("client waiting in SSL_connect - %s\n",
-                           SSL_state_string_long(c_ssl));
+                        SSL_state_string_long(c_ssl));
 
             if (cw_num > 0) {
                 /* Write to server. */
@@ -2394,7 +2376,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
             if (debug)
                 if (SSL_in_init(s_ssl))
                     printf("server waiting in SSL_accept - %s\n",
-                           SSL_state_string_long(s_ssl));
+                        SSL_state_string_long(s_ssl));
 
             if (sw_num > 0) {
                 /* Write to client. */
@@ -2485,18 +2467,15 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
                     r = BIO_write(io2, dataptr, (int)num);
                     if (r != (int)num) { /* can't happen */
                         fprintf(stderr, "ERROR: BIO_write could not write "
-                                "BIO_ctrl_get_write_guarantee() bytes");
+                                        "BIO_ctrl_get_write_guarantee() bytes");
                         goto err;
                     }
                     progress = 1;
 
                     if (debug)
-                        printf((io1 == client_io) ?
-                               "C->S relaying: %d bytes\n" :
-                               "S->C relaying: %d bytes\n", (int)num);
+                        printf((io1 == client_io) ? "C->S relaying: %d bytes\n" : "S->C relaying: %d bytes\n", (int)num);
                 }
-            }
-            while (r1 && r2);
+            } while (r1 && r2);
 
             /* io2 to io1 */
             {
@@ -2520,7 +2499,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
                         num = INT_MAX;
 
                     if (num > 1)
-                        --num;  /* test restartability even more thoroughly */
+                        --num; /* test restartability even more thoroughly */
 
                     r = BIO_nwrite0(io1, &dataptr);
                     assert(r > 0);
@@ -2529,24 +2508,22 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
                     r = BIO_read(io2, dataptr, (int)num);
                     if (r != (int)num) { /* can't happen */
                         fprintf(stderr, "ERROR: BIO_read could not read "
-                                "BIO_ctrl_pending() bytes");
+                                        "BIO_ctrl_pending() bytes");
                         goto err;
                     }
                     progress = 1;
                     r = BIO_nwrite(io1, &dataptr, (int)num);
                     if (r != (int)num) { /* can't happen */
                         fprintf(stderr, "ERROR: BIO_nwrite() did not accept "
-                                "BIO_nwrite0() bytes");
+                                        "BIO_nwrite0() bytes");
                         goto err;
                     }
 
                     if (debug)
-                        printf((io2 == client_io) ?
-                               "C->S relaying: %d bytes\n" :
-                               "S->C relaying: %d bytes\n", (int)num);
+                        printf((io2 == client_io) ? "C->S relaying: %d bytes\n" : "S->C relaying: %d bytes\n", (int)num);
                 }
-            }                   /* no loop, BIO_ctrl_get_read_request now
-                                 * returns 0 anyway */
+            } /* no loop, BIO_ctrl_get_read_request now
+               * returns 0 anyway */
 
             if (!progress && !prev_progress)
                 if (cw_num > 0 || cr_num > 0 || sw_num > 0 || sr_num > 0) {
@@ -2556,8 +2533,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
                 }
             prev_progress = progress;
         }
-    }
-    while (cw_num > 0 || cr_num > 0 || sw_num > 0 || sr_num > 0);
+    } while (cw_num > 0 || cr_num > 0 || sw_num > 0 || sr_num > 0);
 
     if (verbose)
         print_details(c_ssl, "DONE via BIO pair: ");
@@ -2570,7 +2546,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
         goto err;
     }
     if (verify_alpn(c_ssl, s_ssl) < 0
-            || verify_servername(c_ssl, s_ssl) < 0)
+        || verify_servername(c_ssl, s_ssl) < 0)
         goto err;
 
     if (custom_ext_error) {
@@ -2579,11 +2555,11 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
     }
 
 #ifndef OPENSSL_NO_NEXTPROTONEG
- end:
+end:
 #endif
     ret = EXIT_SUCCESS;
 
- err:
+err:
     ERR_print_errors(bio_err);
 
     BIO_free(server);
@@ -2601,10 +2577,10 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
     return ret;
 }
 
-#define W_READ  1
+#define W_READ 1
 #define W_WRITE 2
-#define C_DONE  1
-#define S_DONE  2
+#define C_DONE 1
+#define S_DONE 2
 
 int doit(SSL *s_ssl, SSL *c_ssl, long count)
 {
@@ -2700,13 +2676,13 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
         if (do_server && debug) {
             if (SSL_in_init(s_ssl))
                 printf("server waiting in SSL_accept - %s\n",
-                       SSL_state_string_long(s_ssl));
+                    SSL_state_string_long(s_ssl));
         }
 
         if (do_client && debug) {
             if (SSL_in_init(c_ssl))
                 printf("client waiting in SSL_connect - %s\n",
-                       SSL_state_string_long(c_ssl));
+                    SSL_state_string_long(c_ssl));
         }
 
         if (!do_client && !do_server) {
@@ -2801,7 +2777,7 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
                 } else if (i == 0) {
                     ERR_print_errors(bio_err);
                     fprintf(stderr,
-                            "SSL SERVER STARTUP FAILED in SSL_read\n");
+                        "SSL SERVER STARTUP FAILED in SSL_read\n");
                     goto err;
                 } else {
                     if (debug)
@@ -2837,7 +2813,7 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
                 } else if (i == 0) {
                     ERR_print_errors(bio_err);
                     fprintf(stderr,
-                            "SSL SERVER STARTUP FAILED in SSL_write\n");
+                        "SSL SERVER STARTUP FAILED in SSL_write\n");
                     goto err;
                 } else {
                     if (debug)
@@ -2872,7 +2848,7 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
         goto err;
     }
     ret = EXIT_SUCCESS;
- err:
+err:
     BIO_free(c_to_s);
     BIO_free(s_to_c);
     BIO_free_all(c_bio);
@@ -2893,14 +2869,14 @@ static int verify_callback(int ok, X509_STORE_CTX *ctx)
     char *s, buf[256];
 
     s = X509_NAME_oneline(X509_get_subject_name(X509_STORE_CTX_get_current_cert(ctx)),
-                          buf, sizeof(buf));
+        buf, sizeof(buf));
     if (s != NULL) {
         if (ok)
             printf("depth=%d %s\n", X509_STORE_CTX_get_error_depth(ctx), buf);
         else {
             fprintf(stderr, "depth=%d error=%d %s\n",
-                    X509_STORE_CTX_get_error_depth(ctx),
-                    X509_STORE_CTX_get_error(ctx), buf);
+                X509_STORE_CTX_get_error_depth(ctx),
+                X509_STORE_CTX_get_error(ctx), buf);
         }
     }
 
@@ -2910,7 +2886,7 @@ static int verify_callback(int ok, X509_STORE_CTX *ctx)
         switch (i) {
         default:
             fprintf(stderr, "Error string: %s\n",
-                    X509_verify_cert_error_string(i));
+                X509_verify_cert_error_string(i));
             break;
         case X509_V_ERR_CERT_NOT_YET_VALID:
         case X509_V_ERR_CERT_HAS_EXPIRED:
@@ -2935,12 +2911,12 @@ static int app_verify_callback(X509_STORE_CTX *ctx, void *arg)
         printf("In app_verify_callback, allowing cert. ");
         printf("Arg is: %s\n", cb_arg->string);
         printf("Finished printing do we have a context? 0x%p a cert? 0x%p\n",
-                (void *)ctx, (void *)c);
+            (void *)ctx, (void *)c);
         if (c)
             s = X509_NAME_oneline(X509_get_subject_name(c), buf, 256);
         if (s != NULL) {
             printf("cert depth=%d %s\n",
-                    X509_STORE_CTX_get_error_depth(ctx), buf);
+                X509_STORE_CTX_get_error_depth(ctx), buf);
         }
         return 1;
     }
@@ -2953,7 +2929,7 @@ static int app_verify_callback(X509_STORE_CTX *ctx, void *arg)
 #ifndef OPENSSL_NO_PSK
 /* convert the PSK key (psk_key) in ascii to binary (psk) */
 static int psk_key2bn(const char *pskkey, unsigned char *psk,
-                      unsigned int max_psk_len)
+    unsigned int max_psk_len)
 {
     int ret;
     BIGNUM *bn = NULL;
@@ -2961,14 +2937,14 @@ static int psk_key2bn(const char *pskkey, unsigned char *psk,
     ret = BN_hex2bn(&bn, pskkey);
     if (!ret) {
         BIO_printf(bio_err, "Could not convert PSK key '%s' to BIGNUM\n",
-                   pskkey);
+            pskkey);
         BN_free(bn);
         return 0;
     }
     if (BN_num_bytes(bn) > (int)max_psk_len) {
         BIO_printf(bio_err,
-                   "psk buffer of callback is too small (%d) for key (%d)\n",
-                   max_psk_len, BN_num_bytes(bn));
+            "psk buffer of callback is too small (%d) for key (%d)\n",
+            max_psk_len, BN_num_bytes(bn));
         BN_free(bn);
         return 0;
     }
@@ -2978,10 +2954,10 @@ static int psk_key2bn(const char *pskkey, unsigned char *psk,
 }
 
 static unsigned int psk_client_callback(SSL *ssl, const char *hint,
-                                        char *identity,
-                                        unsigned int max_identity_len,
-                                        unsigned char *psk,
-                                        unsigned int max_psk_len)
+    char *identity,
+    unsigned int max_identity_len,
+    unsigned char *psk,
+    unsigned int max_psk_len)
 {
     int ret;
     unsigned int psk_len = 0;
@@ -2991,18 +2967,18 @@ static unsigned int psk_client_callback(SSL *ssl, const char *hint,
         goto out_err;
     if (debug)
         fprintf(stderr, "client: created identity '%s' len=%d\n", identity,
-                ret);
+            ret);
     ret = psk_key2bn(psk_key, psk, max_psk_len);
     if (ret < 0)
         goto out_err;
     psk_len = ret;
- out_err:
+out_err:
     return psk_len;
 }
 
 static unsigned int psk_server_callback(SSL *ssl, const char *identity,
-                                        unsigned char *psk,
-                                        unsigned int max_psk_len)
+    unsigned char *psk,
+    unsigned int max_psk_len)
 {
     unsigned int psk_len = 0;
 
diff --git a/test/ssl_test.c b/test/ssl_test.c
index 841d2294abaa3..27b44156b3a30 100644
--- a/test/ssl_test.c
+++ b/test/ssl_test.c
@@ -35,8 +35,8 @@ static int check_result(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
 {
     if (!TEST_int_eq(result->result, test_ctx->expected_result)) {
         TEST_info("ExpectedResult mismatch: expected %s, got %s.",
-                  ssl_test_result_name(test_ctx->expected_result),
-                  ssl_test_result_name(result->result));
+            ssl_test_result_name(test_ctx->expected_result),
+            ssl_test_result_name(result->result));
         return 0;
     }
     return 1;
@@ -45,10 +45,10 @@ static int check_result(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
 static int check_alerts(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
 {
     if (!TEST_int_eq(result->client_alert_sent,
-                     result->client_alert_received)) {
+            result->client_alert_received)) {
         TEST_info("Client sent alert %s but server received %s.",
-                  print_alert(result->client_alert_sent),
-                  print_alert(result->client_alert_received));
+            print_alert(result->client_alert_sent),
+            print_alert(result->client_alert_received));
         /*
          * We can't bail here because the peer doesn't always get far enough
          * to process a received alert. Specifically, in protocol version
@@ -64,10 +64,10 @@ static int check_alerts(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
     }
 
     if (!TEST_int_eq(result->server_alert_sent,
-                     result->server_alert_received)) {
+            result->server_alert_received)) {
         TEST_info("Server sent alert %s but client received %s.",
-                  print_alert(result->server_alert_sent),
-                  print_alert(result->server_alert_received));
+            print_alert(result->server_alert_sent),
+            print_alert(result->server_alert_received));
         /* return 0; */
     }
 
@@ -80,16 +80,16 @@ static int check_alerts(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
          */
         && (result->client_alert_sent & 0xff) != test_ctx->expected_client_alert) {
         TEST_error("ClientAlert mismatch: expected %s, got %s.",
-                   print_alert(test_ctx->expected_client_alert),
-                   print_alert(result->client_alert_sent));
+            print_alert(test_ctx->expected_client_alert),
+            print_alert(result->client_alert_sent));
         return 0;
     }
 
     if (test_ctx->expected_server_alert
         && (result->server_alert_sent & 0xff) != test_ctx->expected_server_alert) {
         TEST_error("ServerAlert mismatch: expected %s, got %s.",
-                   print_alert(test_ctx->expected_server_alert),
-                   print_alert(result->server_alert_sent));
+            print_alert(test_ctx->expected_server_alert),
+            print_alert(result->server_alert_sent));
         return 0;
     }
 
@@ -104,17 +104,17 @@ static int check_protocol(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
 {
     if (!TEST_int_eq(result->client_protocol, result->server_protocol)) {
         TEST_info("Client has protocol %s but server has %s.",
-                  ssl_protocol_name(result->client_protocol),
-                  ssl_protocol_name(result->server_protocol));
+            ssl_protocol_name(result->client_protocol),
+            ssl_protocol_name(result->server_protocol));
         return 0;
     }
 
     if (test_ctx->expected_protocol) {
         if (!TEST_int_eq(result->client_protocol,
-                         test_ctx->expected_protocol)) {
+                test_ctx->expected_protocol)) {
             TEST_info("Protocol mismatch: expected %s, got %s.\n",
-                      ssl_protocol_name(test_ctx->expected_protocol),
-                      ssl_protocol_name(result->client_protocol));
+                ssl_protocol_name(test_ctx->expected_protocol),
+                ssl_protocol_name(result->client_protocol));
             return 0;
         }
     }
@@ -124,12 +124,12 @@ static int check_protocol(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
 static int check_servername(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
 {
     if (!TEST_int_eq(result->servername, test_ctx->expected_servername)) {
-      TEST_info("Client ServerName mismatch, expected %s, got %s.",
-                ssl_servername_name(test_ctx->expected_servername),
-                ssl_servername_name(result->servername));
-      return 0;
+        TEST_info("Client ServerName mismatch, expected %s, got %s.",
+            ssl_servername_name(test_ctx->expected_servername),
+            ssl_servername_name(result->servername));
+        return 0;
     }
-  return 1;
+    return 1;
 }
 
 static int check_session_ticket(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
@@ -137,10 +137,10 @@ static int check_session_ticket(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx
     if (test_ctx->session_ticket_expected == SSL_TEST_SESSION_TICKET_IGNORE)
         return 1;
     if (!TEST_int_eq(result->session_ticket,
-                     test_ctx->session_ticket_expected)) {
+            test_ctx->session_ticket_expected)) {
         TEST_info("Client SessionTicketExpected mismatch, expected %s, got %s.",
-                  ssl_session_ticket_name(test_ctx->session_ticket_expected),
-                  ssl_session_ticket_name(result->session_ticket));
+            ssl_session_ticket_name(test_ctx->session_ticket_expected),
+            ssl_session_ticket_name(result->session_ticket));
         return 0;
     }
     return 1;
@@ -152,8 +152,8 @@ static int check_session_id(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
         return 1;
     if (!TEST_int_eq(result->session_id, test_ctx->session_id_expected)) {
         TEST_info("Client SessionIdExpected mismatch, expected %s, got %s\n.",
-                ssl_session_id_name(test_ctx->session_id_expected),
-                ssl_session_id_name(result->session_id));
+            ssl_session_id_name(test_ctx->session_id_expected),
+            ssl_session_id_name(result->session_id));
         return 0;
     }
     return 1;
@@ -170,10 +170,10 @@ static int check_npn(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
 {
     int ret = 1;
     if (!TEST_str_eq(result->client_npn_negotiated,
-                     result->server_npn_negotiated))
+            result->server_npn_negotiated))
         ret = 0;
     if (!TEST_str_eq(test_ctx->expected_npn_protocol,
-                     result->client_npn_negotiated))
+            result->client_npn_negotiated))
         ret = 0;
     return ret;
 }
@@ -183,16 +183,16 @@ static int check_alpn(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
 {
     int ret = 1;
     if (!TEST_str_eq(result->client_alpn_negotiated,
-                     result->server_alpn_negotiated))
+            result->server_alpn_negotiated))
         ret = 0;
     if (!TEST_str_eq(test_ctx->expected_alpn_protocol,
-                     result->client_alpn_negotiated))
+            result->client_alpn_negotiated))
         ret = 0;
     return ret;
 }
 
 static int check_session_ticket_app_data(HANDSHAKE_RESULT *result,
-                                         SSL_TEST_CTX *test_ctx)
+    SSL_TEST_CTX *test_ctx)
 {
     size_t result_len = 0;
     size_t expected_len = 0;
@@ -206,7 +206,7 @@ static int check_session_ticket_app_data(HANDSHAKE_RESULT *result,
         return 1;
 
     if (!TEST_str_eq(result->result_session_ticket_app_data,
-                     test_ctx->expected_session_ticket_app_data))
+            test_ctx->expected_session_ticket_app_data))
         return 0;
 
     return 1;
@@ -226,8 +226,8 @@ static int check_nid(const char *name, int expected_nid, int nid)
     if (expected_nid == 0 || expected_nid == nid)
         return 1;
     TEST_error("%s type mismatch, %s vs %s\n",
-               name, OBJ_nid2ln(expected_nid),
-               nid == NID_undef ? "absent" : OBJ_nid2ln(nid));
+        name, OBJ_nid2ln(expected_nid),
+        nid == NID_undef ? "absent" : OBJ_nid2ln(nid));
     return 0;
 }
 
@@ -241,14 +241,14 @@ static void print_ca_names(STACK_OF(X509_NAME) *names)
     }
     for (i = 0; i < sk_X509_NAME_num(names); i++) {
         X509_NAME_print_ex(bio_err, sk_X509_NAME_value(names, i), 4,
-                           XN_FLAG_ONELINE);
+            XN_FLAG_ONELINE);
         BIO_puts(bio_err, "\n");
     }
 }
 
 static int check_ca_names(const char *name,
-                          STACK_OF(X509_NAME) *expected_names,
-                          STACK_OF(X509_NAME) *names)
+    STACK_OF(X509_NAME) *expected_names,
+    STACK_OF(X509_NAME) *names)
 {
     int i;
 
@@ -263,8 +263,8 @@ static int check_ca_names(const char *name,
         goto err;
     for (i = 0; i < sk_X509_NAME_num(names); i++) {
         if (!TEST_int_eq(X509_NAME_cmp(sk_X509_NAME_value(names, i),
-                                       sk_X509_NAME_value(expected_names, i)),
-                         0)) {
+                             sk_X509_NAME_value(expected_names, i)),
+                0)) {
             goto err;
         }
     }
@@ -281,65 +281,65 @@ static int check_ca_names(const char *name,
 static int check_tmp_key(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
 {
     return check_nid("Tmp key", test_ctx->expected_tmp_key_type,
-                     result->tmp_key_type);
+        result->tmp_key_type);
 }
 
 static int check_server_cert_type(HANDSHAKE_RESULT *result,
-                                  SSL_TEST_CTX *test_ctx)
+    SSL_TEST_CTX *test_ctx)
 {
     return check_nid("Server certificate", test_ctx->expected_server_cert_type,
-                     result->server_cert_type);
+        result->server_cert_type);
 }
 
 static int check_server_sign_hash(HANDSHAKE_RESULT *result,
-                                  SSL_TEST_CTX *test_ctx)
+    SSL_TEST_CTX *test_ctx)
 {
     return check_nid("Server signing hash", test_ctx->expected_server_sign_hash,
-                     result->server_sign_hash);
+        result->server_sign_hash);
 }
 
 static int check_server_sign_type(HANDSHAKE_RESULT *result,
-                                  SSL_TEST_CTX *test_ctx)
+    SSL_TEST_CTX *test_ctx)
 {
     return check_nid("Server signing", test_ctx->expected_server_sign_type,
-                     result->server_sign_type);
+        result->server_sign_type);
 }
 
 static int check_server_ca_names(HANDSHAKE_RESULT *result,
-                                 SSL_TEST_CTX *test_ctx)
+    SSL_TEST_CTX *test_ctx)
 {
     return check_ca_names("Server CA names",
-                          test_ctx->expected_server_ca_names,
-                          result->server_ca_names);
+        test_ctx->expected_server_ca_names,
+        result->server_ca_names);
 }
 
 static int check_client_cert_type(HANDSHAKE_RESULT *result,
-                                  SSL_TEST_CTX *test_ctx)
+    SSL_TEST_CTX *test_ctx)
 {
     return check_nid("Client certificate", test_ctx->expected_client_cert_type,
-                     result->client_cert_type);
+        result->client_cert_type);
 }
 
 static int check_client_sign_hash(HANDSHAKE_RESULT *result,
-                                  SSL_TEST_CTX *test_ctx)
+    SSL_TEST_CTX *test_ctx)
 {
     return check_nid("Client signing hash", test_ctx->expected_client_sign_hash,
-                     result->client_sign_hash);
+        result->client_sign_hash);
 }
 
 static int check_client_sign_type(HANDSHAKE_RESULT *result,
-                                  SSL_TEST_CTX *test_ctx)
+    SSL_TEST_CTX *test_ctx)
 {
     return check_nid("Client signing", test_ctx->expected_client_sign_type,
-                     result->client_sign_type);
+        result->client_sign_type);
 }
 
 static int check_client_ca_names(HANDSHAKE_RESULT *result,
-                                 SSL_TEST_CTX *test_ctx)
+    SSL_TEST_CTX *test_ctx)
 {
     return check_ca_names("Client CA names",
-                          test_ctx->expected_client_ca_names,
-                          result->client_ca_names);
+        test_ctx->expected_client_ca_names,
+        result->client_ca_names);
 }
 
 static int check_cipher(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
@@ -349,7 +349,7 @@ static int check_cipher(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
     if (!TEST_ptr(result->cipher))
         return 0;
     if (!TEST_str_eq(test_ctx->expected_cipher,
-                     result->cipher))
+            result->cipher))
         return 0;
     return 1;
 }
@@ -395,7 +395,7 @@ static int test_handshake(int idx)
 {
     int ret = 0;
     SSL_CTX *server_ctx = NULL, *server2_ctx = NULL, *client_ctx = NULL,
-        *resume_server_ctx = NULL, *resume_client_ctx = NULL;
+            *resume_server_ctx = NULL, *resume_client_ctx = NULL;
     SSL_TEST_CTX *test_ctx = NULL;
     HANDSHAKE_RESULT *result = NULL;
     char test_app[MAX_TESTCASE_NAME_LENGTH];
@@ -408,24 +408,22 @@ static int test_handshake(int idx)
 
     /* Verify that the FIPS provider supports this test */
     if (test_ctx->fips_version != NULL
-                && !fips_provider_version_match(libctx, test_ctx->fips_version)) {
-            ret = TEST_skip("FIPS provider unable to run this test");
-            goto err;
+        && !fips_provider_version_match(libctx, test_ctx->fips_version)) {
+        ret = TEST_skip("FIPS provider unable to run this test");
+        goto err;
     }
 
 #ifndef OPENSSL_NO_DTLS
     if (test_ctx->method == SSL_TEST_METHOD_DTLS) {
         server_ctx = SSL_CTX_new_ex(libctx, NULL, DTLS_server_method());
         if (!TEST_true(SSL_CTX_set_options(server_ctx,
-                        SSL_OP_ALLOW_CLIENT_RENEGOTIATION))
-                || !TEST_true(SSL_CTX_set_max_proto_version(server_ctx, 0)))
+                SSL_OP_ALLOW_CLIENT_RENEGOTIATION))
+            || !TEST_true(SSL_CTX_set_max_proto_version(server_ctx, 0)))
             goto err;
-        if (test_ctx->extra.server.servername_callback !=
-            SSL_TEST_SERVERNAME_CB_NONE) {
-            if (!TEST_ptr(server2_ctx =
-                            SSL_CTX_new_ex(libctx, NULL, DTLS_server_method()))
-                    || !TEST_true(SSL_CTX_set_options(server2_ctx,
-                            SSL_OP_ALLOW_CLIENT_RENEGOTIATION)))
+        if (test_ctx->extra.server.servername_callback != SSL_TEST_SERVERNAME_CB_NONE) {
+            if (!TEST_ptr(server2_ctx = SSL_CTX_new_ex(libctx, NULL, DTLS_server_method()))
+                || !TEST_true(SSL_CTX_set_options(server2_ctx,
+                    SSL_OP_ALLOW_CLIENT_RENEGOTIATION)))
                 goto err;
         }
         client_ctx = SSL_CTX_new_ex(libctx, NULL, DTLS_client_method());
@@ -433,24 +431,24 @@ static int test_handshake(int idx)
             goto err;
         if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RESUME) {
             resume_server_ctx = SSL_CTX_new_ex(libctx, NULL,
-                                               DTLS_server_method());
+                DTLS_server_method());
             if (!TEST_true(SSL_CTX_set_max_proto_version(resume_server_ctx, 0))
-                    || !TEST_true(SSL_CTX_set_options(resume_server_ctx,
-                            SSL_OP_ALLOW_CLIENT_RENEGOTIATION)))
+                || !TEST_true(SSL_CTX_set_options(resume_server_ctx,
+                    SSL_OP_ALLOW_CLIENT_RENEGOTIATION)))
                 goto err;
             resume_client_ctx = SSL_CTX_new_ex(libctx, NULL,
-                                               DTLS_client_method());
+                DTLS_client_method());
             if (!TEST_true(SSL_CTX_set_max_proto_version(resume_client_ctx, 0)))
                 goto err;
             if (!TEST_ptr(resume_server_ctx)
-                    || !TEST_ptr(resume_client_ctx))
+                || !TEST_ptr(resume_client_ctx))
                 goto err;
         }
     }
 #endif
     if (test_ctx->method == SSL_TEST_METHOD_TLS) {
 #if !defined(OPENSSL_NO_TLS1_3) \
-    && defined(OPENSSL_NO_EC) \
+    && defined(OPENSSL_NO_EC)   \
     && defined(OPENSSL_NO_DH)
         /* Without ec or dh there are no built-in groups for TLSv1.3 */
         int maxversion = TLS1_2_VERSION;
@@ -460,19 +458,17 @@ static int test_handshake(int idx)
 
         server_ctx = SSL_CTX_new_ex(libctx, NULL, TLS_server_method());
         if (!TEST_true(SSL_CTX_set_max_proto_version(server_ctx, maxversion))
-                || !TEST_true(SSL_CTX_set_options(server_ctx,
-                            SSL_OP_ALLOW_CLIENT_RENEGOTIATION)))
+            || !TEST_true(SSL_CTX_set_options(server_ctx,
+                SSL_OP_ALLOW_CLIENT_RENEGOTIATION)))
             goto err;
         /* SNI on resumption isn't supported/tested yet. */
-        if (test_ctx->extra.server.servername_callback !=
-            SSL_TEST_SERVERNAME_CB_NONE) {
-            if (!TEST_ptr(server2_ctx =
-                            SSL_CTX_new_ex(libctx, NULL, TLS_server_method()))
-                    || !TEST_true(SSL_CTX_set_options(server2_ctx,
-                            SSL_OP_ALLOW_CLIENT_RENEGOTIATION)))
+        if (test_ctx->extra.server.servername_callback != SSL_TEST_SERVERNAME_CB_NONE) {
+            if (!TEST_ptr(server2_ctx = SSL_CTX_new_ex(libctx, NULL, TLS_server_method()))
+                || !TEST_true(SSL_CTX_set_options(server2_ctx,
+                    SSL_OP_ALLOW_CLIENT_RENEGOTIATION)))
                 goto err;
             if (!TEST_true(SSL_CTX_set_max_proto_version(server2_ctx,
-                                                         maxversion)))
+                    maxversion)))
                 goto err;
         }
         client_ctx = SSL_CTX_new_ex(libctx, NULL, TLS_client_method());
@@ -481,19 +477,19 @@ static int test_handshake(int idx)
 
         if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RESUME) {
             resume_server_ctx = SSL_CTX_new_ex(libctx, NULL,
-                                               TLS_server_method());
+                TLS_server_method());
             if (!TEST_true(SSL_CTX_set_max_proto_version(resume_server_ctx,
-                                                         maxversion))
-                    || !TEST_true(SSL_CTX_set_options(resume_server_ctx,
-                            SSL_OP_ALLOW_CLIENT_RENEGOTIATION)))
+                    maxversion))
+                || !TEST_true(SSL_CTX_set_options(resume_server_ctx,
+                    SSL_OP_ALLOW_CLIENT_RENEGOTIATION)))
                 goto err;
             resume_client_ctx = SSL_CTX_new_ex(libctx, NULL,
-                                               TLS_client_method());
+                TLS_client_method());
             if (!TEST_true(SSL_CTX_set_max_proto_version(resume_client_ctx,
-                                                         maxversion)))
+                    maxversion)))
                 goto err;
             if (!TEST_ptr(resume_server_ctx)
-                    || !TEST_ptr(resume_client_ctx))
+                || !TEST_ptr(resume_client_ctx))
                 goto err;
         }
     }
@@ -504,8 +500,8 @@ static int test_handshake(int idx)
 #endif
 
     if (!TEST_ptr(server_ctx)
-            || !TEST_ptr(client_ctx)
-            || !TEST_int_gt(CONF_modules_load(conf, test_app, 0),  0))
+        || !TEST_ptr(client_ctx)
+        || !TEST_int_gt(CONF_modules_load(conf, test_app, 0), 0))
         goto err;
 
     if (!SSL_CTX_config(server_ctx, "server")
@@ -527,7 +523,7 @@ static int test_handshake(int idx)
         goto err;
 
     result = do_handshake(server_ctx, server2_ctx, client_ctx,
-                          resume_server_ctx, resume_client_ctx, test_ctx);
+        resume_server_ctx, resume_client_ctx, test_ctx);
 
     if (result != NULL)
         ret = check_test(result, test_ctx);
@@ -557,10 +553,11 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(conf = NCONF_new(NULL))
-            /* argv[1] should point to the test conf file */
-            || !TEST_int_gt(NCONF_load(conf, test_get_argument(0), NULL), 0)
-            || !TEST_int_ne(NCONF_get_number_e(conf, NULL, "num_tests",
-                                               &num_tests), 0)) {
+        /* argv[1] should point to the test conf file */
+        || !TEST_int_gt(NCONF_load(conf, test_get_argument(0), NULL), 0)
+        || !TEST_int_ne(NCONF_get_number_e(conf, NULL, "num_tests",
+                            &num_tests),
+            0)) {
         TEST_error("usage: ssl_test %s", USAGE);
         return 0;
     }
diff --git a/test/ssl_test_ctx_test.c b/test/ssl_test_ctx_test.c
index 7579b4b12a3c0..b553d43a0c145 100644
--- a/test/ssl_test_ctx_test.c
+++ b/test/ssl_test_ctx_test.c
@@ -32,42 +32,41 @@ typedef struct ssl_test_ctx_test_fixture {
     SSL_TEST_CTX *expected_ctx;
 } SSL_TEST_CTX_TEST_FIXTURE;
 
-
 static int clientconf_eq(SSL_TEST_CLIENT_CONF *conf1,
-                         SSL_TEST_CLIENT_CONF *conf2)
+    SSL_TEST_CLIENT_CONF *conf2)
 {
     if (!TEST_int_eq(conf1->verify_callback, conf2->verify_callback)
-            || !TEST_int_eq(conf1->servername, conf2->servername)
-            || !TEST_str_eq(conf1->npn_protocols, conf2->npn_protocols)
-            || !TEST_str_eq(conf1->alpn_protocols, conf2->alpn_protocols)
-            || !TEST_int_eq(conf1->ct_validation, conf2->ct_validation)
-            || !TEST_int_eq(conf1->max_fragment_len_mode,
-                            conf2->max_fragment_len_mode))
+        || !TEST_int_eq(conf1->servername, conf2->servername)
+        || !TEST_str_eq(conf1->npn_protocols, conf2->npn_protocols)
+        || !TEST_str_eq(conf1->alpn_protocols, conf2->alpn_protocols)
+        || !TEST_int_eq(conf1->ct_validation, conf2->ct_validation)
+        || !TEST_int_eq(conf1->max_fragment_len_mode,
+            conf2->max_fragment_len_mode))
         return 0;
     return 1;
 }
 
 static int serverconf_eq(SSL_TEST_SERVER_CONF *serv,
-                         SSL_TEST_SERVER_CONF *serv2)
+    SSL_TEST_SERVER_CONF *serv2)
 {
     if (!TEST_int_eq(serv->servername_callback, serv2->servername_callback)
-            || !TEST_str_eq(serv->npn_protocols, serv2->npn_protocols)
-            || !TEST_str_eq(serv->alpn_protocols, serv2->alpn_protocols)
-            || !TEST_int_eq(serv->broken_session_ticket,
-                            serv2->broken_session_ticket)
-            || !TEST_str_eq(serv->session_ticket_app_data,
-                            serv2->session_ticket_app_data)
-            || !TEST_int_eq(serv->cert_status, serv2->cert_status))
+        || !TEST_str_eq(serv->npn_protocols, serv2->npn_protocols)
+        || !TEST_str_eq(serv->alpn_protocols, serv2->alpn_protocols)
+        || !TEST_int_eq(serv->broken_session_ticket,
+            serv2->broken_session_ticket)
+        || !TEST_str_eq(serv->session_ticket_app_data,
+            serv2->session_ticket_app_data)
+        || !TEST_int_eq(serv->cert_status, serv2->cert_status))
         return 0;
     return 1;
 }
 
 static int extraconf_eq(SSL_TEST_EXTRA_CONF *extra,
-                        SSL_TEST_EXTRA_CONF *extra2)
+    SSL_TEST_EXTRA_CONF *extra2)
 {
     if (!TEST_true(clientconf_eq(&extra->client, &extra2->client))
-            || !TEST_true(serverconf_eq(&extra->server, &extra2->server))
-            || !TEST_true(serverconf_eq(&extra->server2, &extra2->server2)))
+        || !TEST_true(serverconf_eq(&extra->server, &extra2->server))
+        || !TEST_true(serverconf_eq(&extra->server2, &extra2->server2)))
         return 0;
     return 1;
 }
@@ -75,34 +74,34 @@ static int extraconf_eq(SSL_TEST_EXTRA_CONF *extra,
 static int testctx_eq(SSL_TEST_CTX *ctx, SSL_TEST_CTX *ctx2)
 {
     if (!TEST_int_eq(ctx->method, ctx2->method)
-            || !TEST_int_eq(ctx->handshake_mode, ctx2->handshake_mode)
-            || !TEST_int_eq(ctx->app_data_size, ctx2->app_data_size)
-            || !TEST_int_eq(ctx->max_fragment_size, ctx2->max_fragment_size)
-            || !extraconf_eq(&ctx->extra, &ctx2->extra)
-            || !extraconf_eq(&ctx->resume_extra, &ctx2->resume_extra)
-            || !TEST_int_eq(ctx->expected_result, ctx2->expected_result)
-            || !TEST_int_eq(ctx->expected_client_alert,
-                            ctx2->expected_client_alert)
-            || !TEST_int_eq(ctx->expected_server_alert,
-                            ctx2->expected_server_alert)
-            || !TEST_int_eq(ctx->expected_protocol, ctx2->expected_protocol)
-            || !TEST_int_eq(ctx->expected_servername, ctx2->expected_servername)
-            || !TEST_int_eq(ctx->session_ticket_expected,
-                            ctx2->session_ticket_expected)
-            || !TEST_int_eq(ctx->compression_expected,
-                            ctx2->compression_expected)
-            || !TEST_str_eq(ctx->expected_npn_protocol,
-                            ctx2->expected_npn_protocol)
-            || !TEST_str_eq(ctx->expected_alpn_protocol,
-                            ctx2->expected_alpn_protocol)
-            || !TEST_str_eq(ctx->expected_cipher,
-                            ctx2->expected_cipher)
-            || !TEST_str_eq(ctx->expected_session_ticket_app_data,
-                            ctx2->expected_session_ticket_app_data)
-            || !TEST_int_eq(ctx->resumption_expected,
-                            ctx2->resumption_expected)
-            || !TEST_int_eq(ctx->session_id_expected,
-                            ctx2->session_id_expected))
+        || !TEST_int_eq(ctx->handshake_mode, ctx2->handshake_mode)
+        || !TEST_int_eq(ctx->app_data_size, ctx2->app_data_size)
+        || !TEST_int_eq(ctx->max_fragment_size, ctx2->max_fragment_size)
+        || !extraconf_eq(&ctx->extra, &ctx2->extra)
+        || !extraconf_eq(&ctx->resume_extra, &ctx2->resume_extra)
+        || !TEST_int_eq(ctx->expected_result, ctx2->expected_result)
+        || !TEST_int_eq(ctx->expected_client_alert,
+            ctx2->expected_client_alert)
+        || !TEST_int_eq(ctx->expected_server_alert,
+            ctx2->expected_server_alert)
+        || !TEST_int_eq(ctx->expected_protocol, ctx2->expected_protocol)
+        || !TEST_int_eq(ctx->expected_servername, ctx2->expected_servername)
+        || !TEST_int_eq(ctx->session_ticket_expected,
+            ctx2->session_ticket_expected)
+        || !TEST_int_eq(ctx->compression_expected,
+            ctx2->compression_expected)
+        || !TEST_str_eq(ctx->expected_npn_protocol,
+            ctx2->expected_npn_protocol)
+        || !TEST_str_eq(ctx->expected_alpn_protocol,
+            ctx2->expected_alpn_protocol)
+        || !TEST_str_eq(ctx->expected_cipher,
+            ctx2->expected_cipher)
+        || !TEST_str_eq(ctx->expected_session_ticket_app_data,
+            ctx2->expected_session_ticket_app_data)
+        || !TEST_int_eq(ctx->resumption_expected,
+            ctx2->resumption_expected)
+        || !TEST_int_eq(ctx->session_id_expected,
+            ctx2->session_id_expected))
         return 0;
     return 1;
 }
@@ -127,12 +126,12 @@ static int execute_test(SSL_TEST_CTX_TEST_FIXTURE *fixture)
     SSL_TEST_CTX *ctx;
 
     if (!TEST_ptr(ctx = SSL_TEST_CTX_create(conf, fixture->test_section,
-                                            fixture->expected_ctx->libctx))
-            || !testctx_eq(ctx, fixture->expected_ctx))
+                      fixture->expected_ctx->libctx))
+        || !testctx_eq(ctx, fixture->expected_ctx))
         goto err;
 
     success = 1;
- err:
+err:
     SSL_TEST_CTX_free(ctx);
     return success;
 }
@@ -168,7 +167,7 @@ static int test_good_configuration(void)
 
     fixture->expected_ctx->expected_result = SSL_TEST_SERVER_FAIL;
     fixture->expected_ctx->expected_client_alert = SSL_AD_UNKNOWN_CA;
-    fixture->expected_ctx->expected_server_alert = 0;  /* No alert. */
+    fixture->expected_ctx->expected_server_alert = 0; /* No alert. */
     fixture->expected_ctx->expected_protocol = TLS1_1_VERSION;
     fixture->expected_ctx->expected_servername = SSL_TEST_SERVERNAME_SERVER2;
     fixture->expected_ctx->session_ticket_expected = SSL_TEST_SESSION_TICKET_YES;
@@ -176,26 +175,21 @@ static int test_good_configuration(void)
     fixture->expected_ctx->session_id_expected = SSL_TEST_SESSION_ID_IGNORE;
     fixture->expected_ctx->resumption_expected = 1;
 
-    fixture->expected_ctx->extra.client.verify_callback =
-        SSL_TEST_VERIFY_REJECT_ALL;
+    fixture->expected_ctx->extra.client.verify_callback = SSL_TEST_VERIFY_REJECT_ALL;
     fixture->expected_ctx->extra.client.servername = SSL_TEST_SERVERNAME_SERVER2;
-    fixture->expected_ctx->extra.client.npn_protocols =
-        OPENSSL_strdup("foo,bar");
+    fixture->expected_ctx->extra.client.npn_protocols = OPENSSL_strdup("foo,bar");
     if (!TEST_ptr(fixture->expected_ctx->extra.client.npn_protocols))
         goto err;
     fixture->expected_ctx->extra.client.max_fragment_len_mode = 0;
 
-    fixture->expected_ctx->extra.server.servername_callback =
-        SSL_TEST_SERVERNAME_IGNORE_MISMATCH;
+    fixture->expected_ctx->extra.server.servername_callback = SSL_TEST_SERVERNAME_IGNORE_MISMATCH;
     fixture->expected_ctx->extra.server.broken_session_ticket = 1;
 
-    fixture->expected_ctx->resume_extra.server2.alpn_protocols =
-        OPENSSL_strdup("baz");
+    fixture->expected_ctx->resume_extra.server2.alpn_protocols = OPENSSL_strdup("baz");
     if (!TEST_ptr(fixture->expected_ctx->resume_extra.server2.alpn_protocols))
         goto err;
 
-    fixture->expected_ctx->resume_extra.client.ct_validation =
-        SSL_TEST_CT_VALIDATION_STRICT;
+    fixture->expected_ctx->resume_extra.client.ct_validation = SSL_TEST_CT_VALIDATION_STRICT;
 
     EXECUTE_SSL_TEST_CTX_TEST();
     return result;
@@ -229,7 +223,7 @@ static int test_bad_configuration(int idx)
     SSL_TEST_CTX *ctx;
 
     if (!TEST_ptr_null(ctx = SSL_TEST_CTX_create(conf,
-                                                 bad_configurations[idx], NULL))) {
+                           bad_configurations[idx], NULL))) {
         SSL_TEST_CTX_free(ctx);
         return 0;
     }
diff --git a/test/sslapitest.c b/test/sslapitest.c
index 391a76b8de622..993d9e6018058 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -12,7 +12,7 @@
  * when the deprecated calls are not hidden
  */
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# define OPENSSL_SUPPRESS_DEPRECATED
+#define OPENSSL_SUPPRESS_DEPRECATED
 #endif
 
 #include <stdio.h>
@@ -53,14 +53,14 @@
  * If we don't have ec or dh then there are no built-in groups that are usable
  * with TLSv1.3
  */
-# define OSSL_NO_USABLE_TLS1_3
+#define OSSL_NO_USABLE_TLS1_3
 #endif
 
 /* Defined in tls-provider.c */
 int tls_provider_init(const OSSL_CORE_HANDLE *handle,
-                      const OSSL_DISPATCH *in,
-                      const OSSL_DISPATCH **out,
-                      void **provctx);
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx);
 
 static OSSL_LIB_CTX *libctx = NULL;
 static OSSL_PROVIDER *defctxnull = NULL;
@@ -73,9 +73,9 @@ static const char *pskid = "Identity";
 static const char *srvid;
 
 static int use_session_cb(SSL *ssl, const EVP_MD *md, const unsigned char **id,
-                          size_t *idlen, SSL_SESSION **sess);
+    size_t *idlen, SSL_SESSION **sess);
 static int find_session_cb(SSL *ssl, const unsigned char *identity,
-                           size_t identity_len, SSL_SESSION **sess);
+    size_t identity_len, SSL_SESSION **sess);
 
 static int use_session_cb_cnt = 0;
 static int find_session_cb_cnt = 0;
@@ -98,14 +98,15 @@ static char *privkey8192 = NULL;
 static char *srpvfile = NULL;
 static char *tmpfilename = NULL;
 static char *dhfile = NULL;
+static char *datadir = NULL;
 
 static int is_fips = 0;
 static int fips_ems_check = 0;
 
 #define LOG_BUFFER_SIZE 2048
-static char server_log_buffer[LOG_BUFFER_SIZE + 1] = {0};
+static char server_log_buffer[LOG_BUFFER_SIZE + 1] = { 0 };
 static size_t server_log_buffer_index = 0;
-static char client_log_buffer[LOG_BUFFER_SIZE + 1] = {0};
+static char client_log_buffer[LOG_BUFFER_SIZE + 1] = { 0 };
 static size_t client_log_buffer_index = 0;
 static int error_writing_log = 0;
 
@@ -118,7 +119,16 @@ static int cdummyarg = 1;
 static X509 *ocspcert = NULL;
 #endif
 
-#define CLIENT_VERSION_LEN      2
+#define CLIENT_VERSION_LEN 2
+
+/* The ssltrace test assumes some options are switched on/off */
+#if !defined(OPENSSL_NO_SSL_TRACE)                                \
+    && defined(OPENSSL_NO_BROTLI) && defined(OPENSSL_NO_ZSTD)     \
+    && !defined(OPENSSL_NO_ECX) && !defined(OPENSSL_NO_DH)        \
+    && !defined(OPENSSL_NO_ML_DSA) && !defined(OPENSSL_NO_ML_KEM) \
+    && !defined(OPENSSL_NO_TLS1_3)
+#define DO_SSL_TRACE_TEST
+#endif
 
 /*
  * This structure is used to validate that the correct number of log messages
@@ -136,14 +146,12 @@ struct sslapitest_log_counts {
     unsigned int exporter_secret_count;
 };
 
-
 static int hostname_cb(SSL *s, int *al, void *arg)
 {
     const char *hostname = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
 
-    if (hostname != NULL && (strcmp(hostname, "goodhost") == 0
-                             || strcmp(hostname, "altgoodhost") == 0))
-        return  SSL_TLSEXT_ERR_OK;
+    if (hostname != NULL && (strcmp(hostname, "goodhost") == 0 || strcmp(hostname, "altgoodhost") == 0))
+        return SSL_TLSEXT_ERR_OK;
 
     return SSL_TLSEXT_ERR_NOACK;
 }
@@ -181,9 +189,9 @@ static void server_keylog_callback(const SSL *ssl, const char *line)
 }
 
 static int compare_hex_encoded_buffer(const char *hex_encoded,
-                                      size_t hex_length,
-                                      const uint8_t *raw,
-                                      size_t raw_length)
+    size_t hex_length,
+    const uint8_t *raw,
+    size_t raw_length)
 {
     size_t i, j;
     char hexed[3];
@@ -194,7 +202,7 @@ static int compare_hex_encoded_buffer(const char *hex_encoded,
     for (i = j = 0; i < raw_length && j + 1 < hex_length; i++, j += 2) {
         BIO_snprintf(hexed, sizeof(hexed), "%02x", raw[i]);
         if (!TEST_int_eq(hexed[0], hex_encoded[j])
-                || !TEST_int_eq(hexed[1], hex_encoded[j + 1]))
+            || !TEST_int_eq(hexed[1], hex_encoded[j + 1]))
             return 1;
     }
 
@@ -202,13 +210,13 @@ static int compare_hex_encoded_buffer(const char *hex_encoded,
 }
 
 static int test_keylog_output(char *buffer, const SSL *ssl,
-                              const SSL_SESSION *session,
-                              struct sslapitest_log_counts *expected)
+    const SSL_SESSION *session,
+    struct sslapitest_log_counts *expected)
 {
     char *token = NULL;
-    unsigned char actual_client_random[SSL3_RANDOM_SIZE] = {0};
+    unsigned char actual_client_random[SSL3_RANDOM_SIZE] = { 0 };
     size_t client_random_size = SSL3_RANDOM_SIZE;
-    unsigned char actual_master_key[SSL_MAX_MASTER_KEY_LENGTH] = {0};
+    unsigned char actual_master_key[SSL_MAX_MASTER_KEY_LENGTH] = { 0 };
     size_t master_key_size = SSL_MAX_MASTER_KEY_LENGTH;
     unsigned int rsa_key_exchange_count = 0;
     unsigned int master_secret_count = 0;
@@ -221,7 +229,7 @@ static int test_keylog_output(char *buffer, const SSL *ssl,
     unsigned int exporter_secret_count = 0;
 
     for (token = strtok(buffer, " \n"); token != NULL;
-         token = strtok(NULL, " \n")) {
+        token = strtok(NULL, " \n")) {
         if (strcmp(token, "RSA") == 0) {
             /*
              * Premaster secret. Tokens should be: 16 ASCII bytes of
@@ -246,8 +254,8 @@ static int test_keylog_output(char *buffer, const SSL *ssl,
              * client random, then the hex-encoded master secret.
              */
             client_random_size = SSL_get_client_random(ssl,
-                                                       actual_client_random,
-                                                       SSL3_RANDOM_SIZE);
+                actual_client_random,
+                SSL3_RANDOM_SIZE);
             if (!TEST_size_t_eq(client_random_size, SSL3_RANDOM_SIZE))
                 return 0;
 
@@ -256,29 +264,29 @@ static int test_keylog_output(char *buffer, const SSL *ssl,
             if (!TEST_size_t_eq(strlen(token), 64))
                 return 0;
             if (!TEST_false(compare_hex_encoded_buffer(token, 64,
-                                                       actual_client_random,
-                                                       client_random_size)))
+                    actual_client_random,
+                    client_random_size)))
                 return 0;
 
             if (!TEST_ptr(token = strtok(NULL, " \n")))
                 return 0;
             master_key_size = SSL_SESSION_get_master_key(session,
-                                                         actual_master_key,
-                                                         master_key_size);
+                actual_master_key,
+                master_key_size);
             if (!TEST_size_t_ne(master_key_size, 0))
                 return 0;
             if (!TEST_false(compare_hex_encoded_buffer(token, strlen(token),
-                                                       actual_master_key,
-                                                       master_key_size)))
+                    actual_master_key,
+                    master_key_size)))
                 return 0;
             master_secret_count++;
         } else if (strcmp(token, "CLIENT_EARLY_TRAFFIC_SECRET") == 0
-                    || strcmp(token, "CLIENT_HANDSHAKE_TRAFFIC_SECRET") == 0
-                    || strcmp(token, "SERVER_HANDSHAKE_TRAFFIC_SECRET") == 0
-                    || strcmp(token, "CLIENT_TRAFFIC_SECRET_0") == 0
-                    || strcmp(token, "SERVER_TRAFFIC_SECRET_0") == 0
-                    || strcmp(token, "EARLY_EXPORTER_SECRET") == 0
-                    || strcmp(token, "EXPORTER_SECRET") == 0) {
+            || strcmp(token, "CLIENT_HANDSHAKE_TRAFFIC_SECRET") == 0
+            || strcmp(token, "SERVER_HANDSHAKE_TRAFFIC_SECRET") == 0
+            || strcmp(token, "CLIENT_TRAFFIC_SECRET_0") == 0
+            || strcmp(token, "SERVER_TRAFFIC_SECRET_0") == 0
+            || strcmp(token, "EARLY_EXPORTER_SECRET") == 0
+            || strcmp(token, "EXPORTER_SECRET") == 0) {
             /*
              * TLSv1.3 secret. Tokens should be: 64 ASCII bytes of hex-encoded
              * client random, and then the hex-encoded secret. In this case,
@@ -301,8 +309,8 @@ static int test_keylog_output(char *buffer, const SSL *ssl,
                 exporter_secret_count++;
 
             client_random_size = SSL_get_client_random(ssl,
-                                                       actual_client_random,
-                                                       SSL3_RANDOM_SIZE);
+                actual_client_random,
+                SSL3_RANDOM_SIZE);
             if (!TEST_size_t_eq(client_random_size, SSL3_RANDOM_SIZE))
                 return 0;
 
@@ -311,8 +319,8 @@ static int test_keylog_output(char *buffer, const SSL *ssl,
             if (!TEST_size_t_eq(strlen(token), 64))
                 return 0;
             if (!TEST_false(compare_hex_encoded_buffer(token, 64,
-                                                       actual_client_random,
-                                                       client_random_size)))
+                    actual_client_random,
+                    client_random_size)))
                 return 0;
 
             if (!TEST_ptr(token = strtok(NULL, " \n")))
@@ -325,23 +333,23 @@ static int test_keylog_output(char *buffer, const SSL *ssl,
 
     /* Got what we expected? */
     if (!TEST_size_t_eq(rsa_key_exchange_count,
-                        expected->rsa_key_exchange_count)
-            || !TEST_size_t_eq(master_secret_count,
-                               expected->master_secret_count)
-            || !TEST_size_t_eq(client_early_secret_count,
-                               expected->client_early_secret_count)
-            || !TEST_size_t_eq(client_handshake_secret_count,
-                               expected->client_handshake_secret_count)
-            || !TEST_size_t_eq(server_handshake_secret_count,
-                               expected->server_handshake_secret_count)
-            || !TEST_size_t_eq(client_application_secret_count,
-                               expected->client_application_secret_count)
-            || !TEST_size_t_eq(server_application_secret_count,
-                               expected->server_application_secret_count)
-            || !TEST_size_t_eq(early_exporter_secret_count,
-                               expected->early_exporter_secret_count)
-            || !TEST_size_t_eq(exporter_secret_count,
-                               expected->exporter_secret_count))
+            expected->rsa_key_exchange_count)
+        || !TEST_size_t_eq(master_secret_count,
+            expected->master_secret_count)
+        || !TEST_size_t_eq(client_early_secret_count,
+            expected->client_early_secret_count)
+        || !TEST_size_t_eq(client_handshake_secret_count,
+            expected->client_handshake_secret_count)
+        || !TEST_size_t_eq(server_handshake_secret_count,
+            expected->server_handshake_secret_count)
+        || !TEST_size_t_eq(client_application_secret_count,
+            expected->client_application_secret_count)
+        || !TEST_size_t_eq(server_application_secret_count,
+            expected->server_application_secret_count)
+        || !TEST_size_t_eq(early_exporter_secret_count,
+            expected->early_exporter_secret_count)
+        || !TEST_size_t_eq(exporter_secret_count,
+            expected->exporter_secret_count))
         return 0;
     return 1;
 }
@@ -363,9 +371,9 @@ static int test_keylog(void)
     error_writing_log = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         return 0;
 
     /* We cannot log the master secret for TLSv1.3, so we should forbid it. */
@@ -377,25 +385,25 @@ static int test_keylog(void)
         goto end;
 
     if (!TEST_true(SSL_CTX_get_keylog_callback(cctx) == NULL)
-            || !TEST_true(SSL_CTX_get_keylog_callback(sctx) == NULL))
+        || !TEST_true(SSL_CTX_get_keylog_callback(sctx) == NULL))
         goto end;
     SSL_CTX_set_keylog_callback(cctx, client_keylog_callback);
     if (!TEST_true(SSL_CTX_get_keylog_callback(cctx)
-                   == client_keylog_callback))
+            == client_keylog_callback))
         goto end;
     SSL_CTX_set_keylog_callback(sctx, server_keylog_callback);
     if (!TEST_true(SSL_CTX_get_keylog_callback(sctx)
-                   == server_keylog_callback))
+            == server_keylog_callback))
         goto end;
 
     /* Now do a handshake and check that the logs have been written to. */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-            || !TEST_false(error_writing_log)
-            || !TEST_int_gt(client_log_buffer_index, 0)
-            || !TEST_int_gt(server_log_buffer_index, 0))
+            &clientssl, NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE))
+        || !TEST_false(error_writing_log)
+        || !TEST_int_gt(client_log_buffer_index, 0)
+        || !TEST_int_gt(server_log_buffer_index, 0))
         goto end;
 
     /*
@@ -407,12 +415,12 @@ static int test_keylog(void)
     expected.rsa_key_exchange_count = 1;
     expected.master_secret_count = 1;
     if (!TEST_true(test_keylog_output(client_log_buffer, clientssl,
-                                      SSL_get_session(clientssl), &expected)))
+            SSL_get_session(clientssl), &expected)))
         goto end;
 
     expected.rsa_key_exchange_count = 0;
     if (!TEST_true(test_keylog_output(server_log_buffer, serverssl,
-                                      SSL_get_session(serverssl), &expected)))
+            SSL_get_session(serverssl), &expected)))
         goto end;
 
     testresult = 1;
@@ -447,32 +455,32 @@ static int test_keylog_no_master_key(void)
     error_writing_log = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey))
         || !TEST_true(SSL_CTX_set_max_early_data(sctx,
-                                                 SSL3_RT_MAX_PLAIN_LENGTH)))
+            SSL3_RT_MAX_PLAIN_LENGTH)))
         return 0;
 
     if (!TEST_true(SSL_CTX_get_keylog_callback(cctx) == NULL)
-            || !TEST_true(SSL_CTX_get_keylog_callback(sctx) == NULL))
+        || !TEST_true(SSL_CTX_get_keylog_callback(sctx) == NULL))
         goto end;
 
     SSL_CTX_set_keylog_callback(cctx, client_keylog_callback);
     if (!TEST_true(SSL_CTX_get_keylog_callback(cctx)
-                   == client_keylog_callback))
+            == client_keylog_callback))
         goto end;
 
     SSL_CTX_set_keylog_callback(sctx, server_keylog_callback);
     if (!TEST_true(SSL_CTX_get_keylog_callback(sctx)
-                   == server_keylog_callback))
+            == server_keylog_callback))
         goto end;
 
     /* Now do a handshake and check that the logs have been written to. */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-            || !TEST_false(error_writing_log))
+            &clientssl, NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE))
+        || !TEST_false(error_writing_log))
         goto end;
 
     /*
@@ -486,10 +494,10 @@ static int test_keylog_no_master_key(void)
     expected.server_application_secret_count = 1;
     expected.exporter_secret_count = 1;
     if (!TEST_true(test_keylog_output(client_log_buffer, clientssl,
-                                      SSL_get_session(clientssl), &expected))
-            || !TEST_true(test_keylog_output(server_log_buffer, serverssl,
-                                             SSL_get_session(serverssl),
-                                             &expected)))
+            SSL_get_session(clientssl), &expected))
+        || !TEST_true(test_keylog_output(server_log_buffer, serverssl,
+            SSL_get_session(serverssl),
+            &expected)))
         goto end;
 
     /* Terminate old session and resume with early data. */
@@ -507,28 +515,28 @@ static int test_keylog_no_master_key(void)
     server_log_buffer_index = 0;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, sess))
-            /* Here writing 0 length early data is enough. */
-            || !TEST_true(SSL_write_early_data(clientssl, NULL, 0, &written))
-            || !TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                                &readbytes),
-                            SSL_READ_EARLY_DATA_ERROR)
-            || !TEST_int_eq(SSL_get_early_data_status(serverssl),
-                            SSL_EARLY_DATA_ACCEPTED)
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                          SSL_ERROR_NONE))
-            || !TEST_true(SSL_session_reused(clientssl)))
+            &clientssl, NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, sess))
+        /* Here writing 0 length early data is enough. */
+        || !TEST_true(SSL_write_early_data(clientssl, NULL, 0, &written))
+        || !TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
+                            &readbytes),
+            SSL_READ_EARLY_DATA_ERROR)
+        || !TEST_int_eq(SSL_get_early_data_status(serverssl),
+            SSL_EARLY_DATA_ACCEPTED)
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE))
+        || !TEST_true(SSL_session_reused(clientssl)))
         goto end;
 
     /* In addition to the previous entries, expect early secrets. */
     expected.client_early_secret_count = 1;
     expected.early_exporter_secret_count = 1;
     if (!TEST_true(test_keylog_output(client_log_buffer, clientssl,
-                                      SSL_get_session(clientssl), &expected))
-            || !TEST_true(test_keylog_output(server_log_buffer, serverssl,
-                                             SSL_get_session(serverssl),
-                                             &expected)))
+            SSL_get_session(clientssl), &expected))
+        || !TEST_true(test_keylog_output(server_log_buffer, serverssl,
+            SSL_get_session(serverssl),
+            &expected)))
         goto end;
 
     testresult = 1;
@@ -555,8 +563,7 @@ static int verify_retry_cb(X509_STORE_CTX *ctx, void *arg)
         || (ssl = X509_STORE_CTX_get_ex_data(ctx, idx)) == NULL)
         return 0;
 
-    if (res == 0 && X509_STORE_CTX_get_error(ctx) ==
-        X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY)
+    if (res == 0 && X509_STORE_CTX_get_error(ctx) == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY)
         /* indicate SSL_ERROR_WANT_RETRY_VERIFY */
         return SSL_set_retry_verify(ssl);
 
@@ -578,25 +585,26 @@ static int test_client_cert_verify_cb(void)
     int testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, NULL, NULL)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, NULL, NULL)))
         goto end;
     if (!TEST_int_eq(SSL_CTX_use_certificate_chain_file(sctx, leaf), 1)
-            || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(sctx, skey,
-                                                        SSL_FILETYPE_PEM), 1)
-            || !TEST_int_eq(SSL_CTX_check_private_key(sctx), 1))
+        || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(sctx, skey,
+                            SSL_FILETYPE_PEM),
+            1)
+        || !TEST_int_eq(SSL_CTX_check_private_key(sctx), 1))
         goto end;
     if (!TEST_true(SSL_CTX_load_verify_locations(cctx, root, NULL)))
         goto end;
     SSL_CTX_set_verify(cctx, SSL_VERIFY_PEER, NULL);
     SSL_CTX_set_cert_verify_callback(cctx, verify_retry_cb, NULL);
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     /* attempt SSL_connect() with incomplete server chain */
     if (!TEST_false(create_ssl_connection(serverssl, clientssl,
-                                          SSL_ERROR_WANT_RETRY_VERIFY)))
+            SSL_ERROR_WANT_RETRY_VERIFY)))
         goto end;
 
     /* application provides intermediate certs needed to verify server cert */
@@ -614,7 +622,7 @@ static int test_client_cert_verify_cb(void)
 
     /* continue SSL_connect(), must now succeed with completed server chain */
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                         SSL_ERROR_NONE)))
+            SSL_ERROR_NONE)))
         goto end;
 
     testresult = 1;
@@ -659,8 +667,7 @@ static int test_ssl_build_cert_chain(void)
         || !TEST_int_eq(SSL_use_PrivateKey_file(ssl, skey, SSL_FILETYPE_PEM), 1)
         || !TEST_int_eq(SSL_check_private_key(ssl), 1))
         goto end;
-    if (!TEST_true(SSL_build_cert_chain(ssl, SSL_BUILD_CHAIN_FLAG_NO_ROOT
-                                             | SSL_BUILD_CHAIN_FLAG_CHECK)))
+    if (!TEST_true(SSL_build_cert_chain(ssl, SSL_BUILD_CHAIN_FLAG_NO_ROOT | SSL_BUILD_CHAIN_FLAG_CHECK)))
         goto end;
     ret = 1;
 end:
@@ -695,11 +702,11 @@ static int test_ssl_ctx_build_cert_chain(void)
     /* leaf_chain contains leaf + subinterCA + interCA + rootCA */
     if (!TEST_int_eq(SSL_CTX_use_certificate_chain_file(ctx, leaf_chain), 1)
         || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(ctx, skey,
-                                                    SSL_FILETYPE_PEM), 1)
+                            SSL_FILETYPE_PEM),
+            1)
         || !TEST_int_eq(SSL_CTX_check_private_key(ctx), 1))
         goto end;
-    if (!TEST_true(SSL_CTX_build_cert_chain(ctx, SSL_BUILD_CHAIN_FLAG_NO_ROOT
-                                                | SSL_BUILD_CHAIN_FLAG_CHECK)))
+    if (!TEST_true(SSL_CTX_build_cert_chain(ctx, SSL_BUILD_CHAIN_FLAG_NO_ROOT | SSL_BUILD_CHAIN_FLAG_CHECK)))
         goto end;
     ret = 1;
 end:
@@ -716,17 +723,18 @@ static int full_client_hello_callback(SSL *s, int *al, void *arg)
     const unsigned char *p;
     int *exts;
 #ifdef OPENSSL_NO_EC
-    const unsigned char expected_ciphers[] = {0x00, 0x9d};
+    const unsigned char expected_ciphers[] = { 0x00, 0x9d };
 #else
-    const unsigned char expected_ciphers[] = {0x00, 0x9d, 0xc0,
-                                              0x2c};
+    const unsigned char expected_ciphers[] = { 0x00, 0x9d, 0xc0,
+        0x2c };
 #endif
     const int expected_extensions[] = {
-                                       65281,
+        65281,
 #ifndef OPENSSL_NO_EC
-                                       11, 10,
+        11, 10,
 #endif
-                                       35, 22, 23, 13};
+        35, 22, 23, 13
+    };
     size_t len;
 
     /* Make sure we can defer processing and get called back. */
@@ -735,14 +743,13 @@ static int full_client_hello_callback(SSL *s, int *al, void *arg)
 
     len = SSL_client_hello_get0_ciphers(s, &p);
     if (!TEST_mem_eq(p, len, expected_ciphers, sizeof(expected_ciphers))
-            || !TEST_size_t_eq(
-                       SSL_client_hello_get0_compression_methods(s, &p), 1)
-            || !TEST_int_eq(*p, 0))
+        || !TEST_size_t_eq(
+            SSL_client_hello_get0_compression_methods(s, &p), 1)
+        || !TEST_int_eq(*p, 0))
         return SSL_CLIENT_HELLO_ERROR;
     if (!SSL_client_hello_get1_extensions_present(s, &exts, &len))
         return SSL_CLIENT_HELLO_ERROR;
-    if (len != OSSL_NELEM(expected_extensions) ||
-        memcmp(exts, expected_extensions, len * sizeof(*exts)) != 0) {
+    if (len != OSSL_NELEM(expected_extensions) || memcmp(exts, expected_extensions, len * sizeof(*exts)) != 0) {
         printf("ClientHello callback expected extensions mismatch\n");
         OPENSSL_free(exts);
         return SSL_CLIENT_HELLO_ERROR;
@@ -758,8 +765,8 @@ static int test_client_hello_cb(void)
     int testctr = 0, testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
     SSL_CTX_set_client_hello_cb(sctx, full_client_hello_callback, &testctr);
 
@@ -768,19 +775,19 @@ static int test_client_hello_cb(void)
     /* Avoid problems where the default seclevel has been changed */
     SSL_CTX_set_security_level(cctx, 2);
     if (!TEST_true(SSL_CTX_set_cipher_list(cctx,
-                        "AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384"))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                             &clientssl, NULL, NULL))
-            || !TEST_false(create_ssl_connection(serverssl, clientssl,
-                        SSL_ERROR_WANT_CLIENT_HELLO_CB))
-                /*
-                 * Passing a -1 literal is a hack since
-                 * the real value was lost.
-                 * */
-            || !TEST_int_eq(SSL_get_error(serverssl, -1),
-                            SSL_ERROR_WANT_CLIENT_HELLO_CB)
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            "AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384"))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
+            &clientssl, NULL, NULL))
+        || !TEST_false(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_WANT_CLIENT_HELLO_CB))
+        /*
+         * Passing a -1 literal is a hack since
+         * the real value was lost.
+         * */
+        || !TEST_int_eq(SSL_get_error(serverssl, -1),
+            SSL_ERROR_WANT_CLIENT_HELLO_CB)
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     testresult = 1;
@@ -801,8 +808,8 @@ static int test_no_ems(void)
     int testresult = 0, status;
 
     if (!create_ssl_ctx_pair(libctx, TLS_server_method(), TLS_client_method(),
-                             TLS1_VERSION, TLS1_2_VERSION,
-                             &sctx, &cctx, cert, privkey)) {
+            TLS1_VERSION, TLS1_2_VERSION,
+            &sctx, &cctx, cert, privkey)) {
         printf("Unable to create SSL_CTX pair\n");
         goto end;
     }
@@ -866,17 +873,17 @@ static int test_ccs_change_cipher(void)
      * a different cipher in the second connection.
      */
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION, TLS1_2_VERSION,
-                                       &sctx, &cctx, cert, privkey))
-            || !TEST_true(SSL_CTX_set_options(sctx, SSL_OP_NO_TICKET))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                          NULL, NULL))
-            || !TEST_true(SSL_set_cipher_list(clientssl, "AES128-GCM-SHA256"))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-            || !TEST_ptr(sesspre = SSL_get0_session(serverssl))
-            || !TEST_ptr(sess = SSL_get1_session(clientssl)))
+            TLS_client_method(),
+            TLS1_VERSION, TLS1_2_VERSION,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(SSL_CTX_set_options(sctx, SSL_OP_NO_TICKET))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL))
+        || !TEST_true(SSL_set_cipher_list(clientssl, "AES128-GCM-SHA256"))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE))
+        || !TEST_ptr(sesspre = SSL_get0_session(serverssl))
+        || !TEST_ptr(sess = SSL_get1_session(clientssl)))
         goto end;
 
     shutdown_ssl_connection(serverssl, clientssl);
@@ -885,17 +892,17 @@ static int test_ccs_change_cipher(void)
     /* Resume, preferring a different cipher. Our server will force the
      * same cipher to be used as the initial handshake. */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                          NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, sess))
-            || !TEST_true(SSL_set_cipher_list(clientssl, "AES256-GCM-SHA384:AES128-GCM-SHA256"))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-            || !TEST_true(SSL_session_reused(clientssl))
-            || !TEST_true(SSL_session_reused(serverssl))
-            || !TEST_ptr(sesspost = SSL_get0_session(serverssl))
-            || !TEST_ptr_eq(sesspre, sesspost)
-            || !TEST_int_eq(TLS1_CK_RSA_WITH_AES_128_GCM_SHA256,
-                            SSL_CIPHER_get_id(SSL_get_current_cipher(clientssl))))
+            NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, sess))
+        || !TEST_true(SSL_set_cipher_list(clientssl, "AES256-GCM-SHA384:AES128-GCM-SHA256"))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE))
+        || !TEST_true(SSL_session_reused(clientssl))
+        || !TEST_true(SSL_session_reused(serverssl))
+        || !TEST_ptr(sesspost = SSL_get0_session(serverssl))
+        || !TEST_ptr_eq(sesspre, sesspost)
+        || !TEST_int_eq(TLS1_CK_RSA_WITH_AES_128_GCM_SHA256,
+            SSL_CIPHER_get_id(SSL_get_current_cipher(clientssl))))
         goto end;
     shutdown_ssl_connection(serverssl, clientssl);
     serverssl = clientssl = NULL;
@@ -905,14 +912,14 @@ static int test_ccs_change_cipher(void)
      * cipher on it.
      */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL))
-            || !TEST_true(SSL_set_cipher_list(clientssl, "AES128-GCM-SHA256"))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-            || !TEST_ptr(sesspre = SSL_get0_session(serverssl))
-            || !TEST_true(SSL_set_cipher_list(clientssl, "AES256-GCM-SHA384"))
-            || !TEST_true(SSL_renegotiate(clientssl))
-            || !TEST_true(SSL_renegotiate_pending(clientssl)))
+            NULL, NULL))
+        || !TEST_true(SSL_set_cipher_list(clientssl, "AES128-GCM-SHA256"))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE))
+        || !TEST_ptr(sesspre = SSL_get0_session(serverssl))
+        || !TEST_true(SSL_set_cipher_list(clientssl, "AES256-GCM-SHA384"))
+        || !TEST_true(SSL_renegotiate(clientssl))
+        || !TEST_true(SSL_renegotiate_pending(clientssl)))
         goto end;
     /* Actually drive the renegotiation. */
     for (i = 0; i < 3; i++) {
@@ -920,25 +927,25 @@ static int test_ccs_change_cipher(void)
             if (!TEST_ulong_eq(readbytes, 0))
                 goto end;
         } else if (!TEST_int_eq(SSL_get_error(clientssl, 0),
-                                SSL_ERROR_WANT_READ)) {
+                       SSL_ERROR_WANT_READ)) {
             goto end;
         }
         if (SSL_read_ex(serverssl, &buf, sizeof(buf), &readbytes) > 0) {
             if (!TEST_ulong_eq(readbytes, 0))
                 goto end;
         } else if (!TEST_int_eq(SSL_get_error(serverssl, 0),
-                                SSL_ERROR_WANT_READ)) {
+                       SSL_ERROR_WANT_READ)) {
             goto end;
         }
     }
     /* sesspre and sesspost should be different since the cipher changed. */
     if (!TEST_false(SSL_renegotiate_pending(clientssl))
-            || !TEST_false(SSL_session_reused(clientssl))
-            || !TEST_false(SSL_session_reused(serverssl))
-            || !TEST_ptr(sesspost = SSL_get0_session(serverssl))
-            || !TEST_ptr_ne(sesspre, sesspost)
-            || !TEST_int_eq(TLS1_CK_RSA_WITH_AES_256_GCM_SHA384,
-                            SSL_CIPHER_get_id(SSL_get_current_cipher(clientssl))))
+        || !TEST_false(SSL_session_reused(clientssl))
+        || !TEST_false(SSL_session_reused(serverssl))
+        || !TEST_ptr(sesspost = SSL_get0_session(serverssl))
+        || !TEST_ptr_ne(sesspre, sesspost)
+        || !TEST_int_eq(TLS1_CK_RSA_WITH_AES_256_GCM_SHA384,
+            SSL_CIPHER_get_id(SSL_get_current_cipher(clientssl))))
         goto end;
 
     shutdown_ssl_connection(serverssl, clientssl);
@@ -958,17 +965,17 @@ static int test_ccs_change_cipher(void)
 #endif
 
 static int execute_test_large_message(const SSL_METHOD *smeth,
-                                      const SSL_METHOD *cmeth,
-                                      int min_version, int max_version,
-                                      int read_ahead)
+    const SSL_METHOD *cmeth,
+    int min_version, int max_version,
+    int read_ahead)
 {
     SSL_CTX *cctx = NULL, *sctx = NULL;
     SSL *clientssl = NULL, *serverssl = NULL;
     int testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, smeth, cmeth, min_version,
-                                       max_version, &sctx, &cctx, cert,
-                                       privkey)))
+            max_version, &sctx, &cctx, cert,
+            privkey)))
         goto end;
 
 #ifdef OPENSSL_NO_DTLS1_2
@@ -978,8 +985,8 @@ static int execute_test_large_message(const SSL_METHOD *smeth,
          * level 0
          */
         if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "DEFAULT:@SECLEVEL=0"))
-                || !TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                                    "DEFAULT:@SECLEVEL=0")))
+            || !TEST_true(SSL_CTX_set_cipher_list(cctx,
+                "DEFAULT:@SECLEVEL=0")))
             goto end;
     }
 #endif
@@ -996,9 +1003,9 @@ static int execute_test_large_message(const SSL_METHOD *smeth,
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     /*
@@ -1009,7 +1016,7 @@ static int execute_test_large_message(const SSL_METHOD *smeth,
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -1018,8 +1025,7 @@ static int execute_test_large_message(const SSL_METHOD *smeth,
     return testresult;
 }
 
-#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_KTLS) && \
-    !(defined(OSSL_NO_USABLE_TLS1_3) && defined(OPENSSL_NO_TLS1_2))
+#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_KTLS) && !(defined(OSSL_NO_USABLE_TLS1_3) && defined(OPENSSL_NO_TLS1_2))
 /* sock must be connected */
 static int ktls_chk_platform(int sock)
 {
@@ -1031,7 +1037,7 @@ static int ktls_chk_platform(int sock)
 static int ping_pong_query(SSL *clientssl, SSL *serverssl)
 {
     static char count = 1;
-    unsigned char cbuf[16000] = {0};
+    unsigned char cbuf[16000] = { 0 };
     unsigned char sbuf[16000];
     size_t err = 0;
     char crec_wseq_before[SEQ_NUM_SIZE];
@@ -1087,41 +1093,41 @@ static int ping_pong_query(SSL *clientssl, SSL *serverssl)
      */
     if (!BIO_get_ktls_send(clientsc->wbio)) {
         if (!TEST_mem_ne(crec_wseq_before, SEQ_NUM_SIZE,
-                         crec_wseq_after, SEQ_NUM_SIZE))
+                crec_wseq_after, SEQ_NUM_SIZE))
             goto end;
     } else {
         if (!TEST_mem_eq(crec_wseq_before, SEQ_NUM_SIZE,
-                         crec_wseq_after, SEQ_NUM_SIZE))
+                crec_wseq_after, SEQ_NUM_SIZE))
             goto end;
     }
 
     if (!BIO_get_ktls_send(serversc->wbio)) {
         if (!TEST_mem_ne(srec_wseq_before, SEQ_NUM_SIZE,
-                         srec_wseq_after, SEQ_NUM_SIZE))
+                srec_wseq_after, SEQ_NUM_SIZE))
             goto end;
     } else {
         if (!TEST_mem_eq(srec_wseq_before, SEQ_NUM_SIZE,
-                         srec_wseq_after, SEQ_NUM_SIZE))
+                srec_wseq_after, SEQ_NUM_SIZE))
             goto end;
     }
 
     if (!BIO_get_ktls_recv(clientsc->wbio)) {
         if (!TEST_mem_ne(crec_rseq_before, SEQ_NUM_SIZE,
-                         crec_rseq_after, SEQ_NUM_SIZE))
+                crec_rseq_after, SEQ_NUM_SIZE))
             goto end;
     } else {
         if (!TEST_mem_eq(crec_rseq_before, SEQ_NUM_SIZE,
-                         crec_rseq_after, SEQ_NUM_SIZE))
+                crec_rseq_after, SEQ_NUM_SIZE))
             goto end;
     }
 
     if (!BIO_get_ktls_recv(serversc->wbio)) {
         if (!TEST_mem_ne(srec_rseq_before, SEQ_NUM_SIZE,
-                         srec_rseq_after, SEQ_NUM_SIZE))
+                srec_rseq_after, SEQ_NUM_SIZE))
             goto end;
     } else {
         if (!TEST_mem_eq(srec_rseq_before, SEQ_NUM_SIZE,
-                         srec_rseq_after, SEQ_NUM_SIZE))
+                srec_rseq_after, SEQ_NUM_SIZE))
             goto end;
     }
 
@@ -1131,7 +1137,7 @@ static int ping_pong_query(SSL *clientssl, SSL *serverssl)
 }
 
 static int execute_test_ktls(int cis_ktls, int sis_ktls,
-                             int tls_version, const char *cipher)
+    int tls_version, const char *cipher)
 {
     SSL_CTX *cctx = NULL, *sctx = NULL;
     SSL *clientssl = NULL, *serverssl = NULL;
@@ -1160,9 +1166,9 @@ static int execute_test_ktls(int cis_ktls, int sis_ktls,
 
     /* Create a session based on SHA-256 */
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       tls_version, tls_version,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            tls_version, tls_version,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (tls_version == TLS1_3_VERSION) {
@@ -1176,7 +1182,7 @@ static int execute_test_ktls(int cis_ktls, int sis_ktls,
     }
 
     if (!TEST_true(create_ssl_objects2(sctx, cctx, &serverssl,
-                                       &clientssl, sfd, cfd)))
+            &clientssl, sfd, cfd)))
         goto end;
 
     if (!TEST_ptr(clientsc = SSL_CONNECTION_FROM_SSL_ONLY(clientssl))
@@ -1240,8 +1246,7 @@ static int execute_test_ktls(int cis_ktls, int sis_ktls,
 
     if ((cis_ktls || sis_ktls) && !ktls_used) {
         testresult = TEST_skip("KTLS not supported for %s cipher %s",
-                               tls_version == TLS1_3_VERSION ? "TLS 1.3" :
-                               "TLS 1.2", cipher);
+            tls_version == TLS1_3_VERSION ? "TLS 1.3" : "TLS 1.2", cipher);
         goto end;
     }
 
@@ -1299,12 +1304,12 @@ static int execute_test_ktls(int cis_ktls, int sis_ktls,
     return testresult;
 }
 
-#define SENDFILE_SZ                     (16 * 4096)
-#define SENDFILE_CHUNK                  (4 * 4096)
-#define min(a,b)                        ((a) > (b) ? (b) : (a))
+#define SENDFILE_SZ (16 * 4096)
+#define SENDFILE_CHUNK (4 * 4096)
+#define min(a, b) ((a) > (b) ? (b) : (a))
 
 static int execute_test_ktls_sendfile(int tls_version, const char *cipher,
-                                      int zerocopy)
+    int zerocopy)
 {
     SSL_CTX *cctx = NULL, *sctx = NULL;
     SSL *clientssl = NULL, *serverssl = NULL;
@@ -1336,9 +1341,9 @@ static int execute_test_ktls_sendfile(int tls_version, const char *cipher,
 
     /* Create a session based on SHA-256 */
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       tls_version, tls_version,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            tls_version, tls_version,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (tls_version == TLS1_3_VERSION) {
@@ -1352,7 +1357,7 @@ static int execute_test_ktls_sendfile(int tls_version, const char *cipher,
     }
 
     if (!TEST_true(create_ssl_objects2(sctx, cctx, &serverssl,
-                                       &clientssl, sfd, cfd)))
+            &clientssl, sfd, cfd)))
         goto end;
 
     if (!TEST_ptr(serversc = SSL_CONNECTION_FROM_SSL_ONLY(serverssl)))
@@ -1363,18 +1368,17 @@ static int execute_test_ktls_sendfile(int tls_version, const char *cipher,
 
     if (zerocopy) {
         if (!TEST_true(SSL_set_options(serverssl,
-                                       SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE)))
+                SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE)))
             goto end;
     }
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                         SSL_ERROR_NONE)))
+            SSL_ERROR_NONE)))
         goto end;
 
     if (!BIO_get_ktls_send(serversc->wbio)) {
         testresult = TEST_skip("Failed to enable KTLS for %s cipher %s",
-                               tls_version == TLS1_3_VERSION ? "TLS 1.3" :
-                               "TLS 1.2", cipher);
+            tls_version == TLS1_3_VERSION ? "TLS 1.3" : "TLS 1.2", cipher);
         goto end;
     }
 
@@ -1397,25 +1401,27 @@ static int execute_test_ktls_sendfile(int tls_version, const char *cipher,
     while (chunk_off < SENDFILE_SZ) {
         chunk_size = min(SENDFILE_CHUNK, SENDFILE_SZ - chunk_off);
         while ((err = SSL_sendfile(serverssl,
-                                   ffd,
-                                   chunk_off,
-                                   chunk_size,
-                                   0)) != chunk_size) {
+                    ffd,
+                    chunk_off,
+                    chunk_size,
+                    0))
+            != chunk_size) {
             if (SSL_get_error(serverssl, err) != SSL_ERROR_WANT_WRITE)
                 goto end;
         }
         while ((err = SSL_read(clientssl,
-                               buf_dst + chunk_off,
-                               chunk_size)) != chunk_size) {
+                    buf_dst + chunk_off,
+                    chunk_size))
+            != chunk_size) {
             if (SSL_get_error(clientssl, err) != SSL_ERROR_WANT_READ)
                 goto end;
         }
 
         /* verify the payload */
         if (!TEST_mem_eq(buf_dst + chunk_off,
-                         chunk_size,
-                         buf + chunk_off,
-                         chunk_size))
+                chunk_size,
+                buf + chunk_off,
+                chunk_size))
             goto end;
 
         chunk_off += chunk_size;
@@ -1449,36 +1455,36 @@ static struct ktls_test_cipher {
     int tls_version;
     const char *cipher;
 } ktls_test_ciphers[] = {
-# if !defined(OPENSSL_NO_TLS1_2)
-#  ifdef OPENSSL_KTLS_AES_GCM_128
+#if !defined(OPENSSL_NO_TLS1_2)
+#ifdef OPENSSL_KTLS_AES_GCM_128
     { TLS1_2_VERSION, "AES128-GCM-SHA256" },
-#  endif
-#  ifdef OPENSSL_KTLS_AES_CCM_128
-    { TLS1_2_VERSION, "AES128-CCM"},
-#  endif
-#  ifdef OPENSSL_KTLS_AES_GCM_256
-    { TLS1_2_VERSION, "AES256-GCM-SHA384"},
-#  endif
-#  ifdef OPENSSL_KTLS_CHACHA20_POLY1305
-#    ifndef OPENSSL_NO_EC
-    { TLS1_2_VERSION, "ECDHE-RSA-CHACHA20-POLY1305"},
-#    endif
-#  endif
-# endif
-# if !defined(OSSL_NO_USABLE_TLS1_3)
-#  ifdef OPENSSL_KTLS_AES_GCM_128
+#endif
+#ifdef OPENSSL_KTLS_AES_CCM_128
+    { TLS1_2_VERSION, "AES128-CCM" },
+#endif
+#ifdef OPENSSL_KTLS_AES_GCM_256
+    { TLS1_2_VERSION, "AES256-GCM-SHA384" },
+#endif
+#ifdef OPENSSL_KTLS_CHACHA20_POLY1305
+#ifndef OPENSSL_NO_EC
+    { TLS1_2_VERSION, "ECDHE-RSA-CHACHA20-POLY1305" },
+#endif
+#endif
+#endif
+#if !defined(OSSL_NO_USABLE_TLS1_3)
+#ifdef OPENSSL_KTLS_AES_GCM_128
     { TLS1_3_VERSION, "TLS_AES_128_GCM_SHA256" },
-#  endif
-#  ifdef OPENSSL_KTLS_AES_CCM_128
+#endif
+#ifdef OPENSSL_KTLS_AES_CCM_128
     { TLS1_3_VERSION, "TLS_AES_128_CCM_SHA256" },
-#  endif
-#  ifdef OPENSSL_KTLS_AES_GCM_256
+#endif
+#ifdef OPENSSL_KTLS_AES_GCM_256
     { TLS1_3_VERSION, "TLS_AES_256_GCM_SHA384" },
-#  endif
-#  ifdef OPENSSL_KTLS_CHACHA20_POLY1305
+#endif
+#ifdef OPENSSL_KTLS_CHACHA20_POLY1305
     { TLS1_3_VERSION, "TLS_CHACHA20_POLY1305_SHA256" },
-#  endif
-# endif
+#endif
+#endif
 };
 
 #define NUM_KTLS_TEST_CIPHERS OSSL_NELEM(ktls_test_ciphers)
@@ -1495,7 +1501,7 @@ static int test_ktls(int test)
     sis_ktls = (test & 2) != 0;
 
     return execute_test_ktls(cis_ktls, sis_ktls, cipher->tls_version,
-                             cipher->cipher);
+        cipher->cipher);
 }
 
 static int test_ktls_sendfile(int test)
@@ -1507,37 +1513,37 @@ static int test_ktls_sendfile(int test)
     cipher = &ktls_test_ciphers[tst];
 
     return execute_test_ktls_sendfile(cipher->tls_version, cipher->cipher,
-                                      test & 1);
+        test & 1);
 }
 #endif
 
 static int test_large_message_tls(void)
 {
     return execute_test_large_message(TLS_server_method(), TLS_client_method(),
-                                      TLS1_VERSION, 0, 0);
+        TLS1_VERSION, 0, 0);
 }
 
 static int test_large_message_tls_read_ahead(void)
 {
     return execute_test_large_message(TLS_server_method(), TLS_client_method(),
-                                      TLS1_VERSION, 0, 1);
+        TLS1_VERSION, 0, 1);
 }
 
 #ifndef OPENSSL_NO_DTLS
 static int test_large_message_dtls(void)
 {
-# ifdef OPENSSL_NO_DTLS1_2
+#ifdef OPENSSL_NO_DTLS1_2
     /* Not supported in the FIPS provider */
     if (is_fips)
         return 1;
-# endif
+#endif
     /*
      * read_ahead is not relevant to DTLS because DTLS always acts as if
      * read_ahead is set.
      */
     return execute_test_large_message(DTLS_server_method(),
-                                      DTLS_client_method(),
-                                      DTLS1_VERSION, 0, 0);
+        DTLS_client_method(),
+        DTLS1_VERSION, 0, 0);
 }
 #endif
 
@@ -1642,27 +1648,27 @@ static int test_large_app_data(int tst)
     memset(buf, 0xff, SSL3_RT_MAX_PLAIN_LENGTH + 1);
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, smeth, cmeth, prot, prot,
-                                       &sctx, &cctx, cert, privkey)))
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (prot < TLS1_2_VERSION || prot == DTLS1_VERSION) {
         /* Older protocol versions need SECLEVEL=0 due to SHA1 usage */
         if (!TEST_true(SSL_CTX_set_cipher_list(cctx, "DEFAULT:@SECLEVEL=0"))
-                || !TEST_true(SSL_CTX_set_cipher_list(sctx,
-                                                      "DEFAULT:@SECLEVEL=0")))
-        goto end;
+            || !TEST_true(SSL_CTX_set_cipher_list(sctx,
+                "DEFAULT:@SECLEVEL=0")))
+            goto end;
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     if ((tst & 1) != 0) {
         /* Setting this option gives us a minimally sized underlying buffer */
         if (!TEST_true(SSL_set_options(serverssl,
-                                       SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS))
-                || !TEST_true(SSL_set_options(clientssl,
-                                              SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS)))
+                SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS))
+            || !TEST_true(SSL_set_options(clientssl,
+                SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS)))
             goto end;
     }
 
@@ -1672,8 +1678,8 @@ static int test_large_app_data(int tst)
          * giving us a larger record for the encryption process
          */
         if (!TEST_true(SSL_set_options(serverssl, SSL_OP_NO_ENCRYPT_THEN_MAC))
-                || !TEST_true(SSL_set_options(clientssl,
-                                              SSL_OP_NO_ENCRYPT_THEN_MAC)))
+            || !TEST_true(SSL_set_options(clientssl,
+                SSL_OP_NO_ENCRYPT_THEN_MAC)))
             goto end;
     }
 
@@ -1681,13 +1687,13 @@ static int test_large_app_data(int tst)
         goto end;
 
     if (!TEST_true(SSL_write_ex(clientssl, msg, SSL3_RT_MAX_PLAIN_LENGTH,
-                                &written))
-            || !TEST_size_t_eq(written, SSL3_RT_MAX_PLAIN_LENGTH))
+            &written))
+        || !TEST_size_t_eq(written, SSL3_RT_MAX_PLAIN_LENGTH))
         goto end;
 
     /* We provide a buffer slightly larger than what we are actually expecting */
     if (!TEST_true(SSL_read_ex(serverssl, buf, SSL3_RT_MAX_PLAIN_LENGTH + 1,
-                               &readbytes)))
+            &readbytes)))
         goto end;
 
     if (!TEST_mem_eq(msg, written, buf, readbytes))
@@ -1707,8 +1713,8 @@ static int test_large_app_data(int tst)
 #if !defined(OPENSSL_NO_TLS1_2) || !defined(OSSL_NO_USABLE_TLS1_3) \
     || !defined(OPENSSL_NO_DTLS)
 static int execute_cleanse_plaintext(const SSL_METHOD *smeth,
-                                     const SSL_METHOD *cmeth,
-                                     int min_version, int max_version)
+    const SSL_METHOD *cmeth,
+    int min_version, int max_version)
 {
     size_t i;
     SSL_CTX *cctx = NULL, *sctx = NULL;
@@ -1722,13 +1728,13 @@ static int execute_cleanse_plaintext(const SSL_METHOD *smeth,
     static unsigned char sbuf[16000];
 
     if (!TEST_true(create_ssl_ctx_pair(libctx,
-                                       smeth, cmeth,
-                                       min_version, max_version,
-                                       &sctx, &cctx, cert,
-                                       privkey)))
+            smeth, cmeth,
+            min_version, max_version,
+            &sctx, &cctx, cert,
+            privkey)))
         goto end;
 
-# ifdef OPENSSL_NO_DTLS1_2
+#ifdef OPENSSL_NO_DTLS1_2
     if (smeth == DTLS_server_method()) {
         /* Not supported in the FIPS provider */
         if (is_fips) {
@@ -1740,21 +1746,21 @@ static int execute_cleanse_plaintext(const SSL_METHOD *smeth,
          * level 0
          */
         if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "DEFAULT:@SECLEVEL=0"))
-                || !TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                                    "DEFAULT:@SECLEVEL=0")))
+            || !TEST_true(SSL_CTX_set_cipher_list(cctx,
+                "DEFAULT:@SECLEVEL=0")))
             goto end;
     }
-# endif
+#endif
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (!TEST_true(SSL_set_options(serverssl, SSL_OP_CLEANSE_PLAINTEXT)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                         SSL_ERROR_NONE)))
+            SSL_ERROR_NONE)))
         goto end;
 
     for (i = 0; i < sizeof(cbuf); i++) {
@@ -1803,7 +1809,7 @@ static int execute_cleanse_plaintext(const SSL_METHOD *smeth,
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -1811,36 +1817,36 @@ static int execute_cleanse_plaintext(const SSL_METHOD *smeth,
 
     return testresult;
 }
-#endif /*
-        * !defined(OPENSSL_NO_TLS1_2) || !defined(OSSL_NO_USABLE_TLS1_3)
-        * || !defined(OPENSSL_NO_DTLS)
+#endif /*                                                                \
+        * !defined(OPENSSL_NO_TLS1_2) || !defined(OSSL_NO_USABLE_TLS1_3) \
+        * || !defined(OPENSSL_NO_DTLS)                                   \
         */
 
 static int test_cleanse_plaintext(void)
 {
 #if !defined(OPENSSL_NO_TLS1_2)
     if (!TEST_true(execute_cleanse_plaintext(TLS_server_method(),
-                                             TLS_client_method(),
-                                             TLS1_2_VERSION,
-                                             TLS1_2_VERSION)))
+            TLS_client_method(),
+            TLS1_2_VERSION,
+            TLS1_2_VERSION)))
         return 0;
 
 #endif
 
 #if !defined(OSSL_NO_USABLE_TLS1_3)
     if (!TEST_true(execute_cleanse_plaintext(TLS_server_method(),
-                                             TLS_client_method(),
-                                             TLS1_3_VERSION,
-                                             TLS1_3_VERSION)))
+            TLS_client_method(),
+            TLS1_3_VERSION,
+            TLS1_3_VERSION)))
         return 0;
 #endif
 
 #if !defined(OPENSSL_NO_DTLS)
 
     if (!TEST_true(execute_cleanse_plaintext(DTLS_server_method(),
-                                             DTLS_client_method(),
-                                             DTLS1_VERSION,
-                                             0)))
+            DTLS_client_method(),
+            DTLS1_VERSION,
+            0)))
         return 0;
 #endif
     return 1;
@@ -1871,7 +1877,7 @@ static int ocsp_server_cb(SSL *s, void *arg)
         return SSL_TLSEXT_ERR_ALERT_FATAL;
 
     if (!TEST_true(SSL_set_tlsext_status_ocsp_resp(s, copy,
-                                                   sizeof(orespder)))) {
+            sizeof(orespder)))) {
         OPENSSL_free(copy);
         return SSL_TLSEXT_ERR_ALERT_FATAL;
     }
@@ -1906,8 +1912,8 @@ static int test_tlsext_status_type(void)
     BIO *certbio = NULL;
 
     if (!create_ssl_ctx_pair(libctx, TLS_server_method(), TLS_client_method(),
-                             TLS1_VERSION, 0,
-                             &sctx, &cctx, cert, privkey))
+            TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey))
         return 0;
 
     if (SSL_CTX_get_tlsext_status_type(cctx) != -1)
@@ -1919,17 +1925,17 @@ static int test_tlsext_status_type(void)
     if (!TEST_ptr(clientssl))
         goto end;
     if (!TEST_int_eq(SSL_get_tlsext_status_type(clientssl), -1)
-            || !TEST_true(SSL_set_tlsext_status_type(clientssl,
-                                                      TLSEXT_STATUSTYPE_ocsp))
-            || !TEST_int_eq(SSL_get_tlsext_status_type(clientssl),
-                            TLSEXT_STATUSTYPE_ocsp))
+        || !TEST_true(SSL_set_tlsext_status_type(clientssl,
+            TLSEXT_STATUSTYPE_ocsp))
+        || !TEST_int_eq(SSL_get_tlsext_status_type(clientssl),
+            TLSEXT_STATUSTYPE_ocsp))
         goto end;
 
     SSL_free(clientssl);
     clientssl = NULL;
 
     if (!SSL_CTX_set_tlsext_status_type(cctx, TLSEXT_STATUSTYPE_ocsp)
-     || SSL_CTX_get_tlsext_status_type(cctx) != TLSEXT_STATUSTYPE_ocsp)
+        || SSL_CTX_get_tlsext_status_type(cctx) != TLSEXT_STATUSTYPE_ocsp)
         goto end;
 
     clientssl = SSL_new(cctx);
@@ -1949,11 +1955,11 @@ static int test_tlsext_status_type(void)
     SSL_CTX_set_tlsext_status_cb(sctx, ocsp_server_cb);
     SSL_CTX_set_tlsext_status_arg(sctx, &cdummyarg);
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-            || !TEST_true(ocsp_client_called)
-            || !TEST_true(ocsp_server_called))
+            &clientssl, NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE))
+        || !TEST_true(ocsp_client_called)
+        || !TEST_true(ocsp_server_called))
         goto end;
     SSL_free(serverssl);
     SSL_free(clientssl);
@@ -1965,12 +1971,12 @@ static int test_tlsext_status_type(void)
     ocsp_server_called = 0;
     cdummyarg = 0;
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL))
-                /* This should fail because the callback will fail */
-            || !TEST_false(create_ssl_connection(serverssl, clientssl,
-                                                 SSL_ERROR_NONE))
-            || !TEST_false(ocsp_client_called)
-            || !TEST_false(ocsp_server_called))
+            &clientssl, NULL, NULL))
+        /* This should fail because the callback will fail */
+        || !TEST_false(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE))
+        || !TEST_false(ocsp_client_called)
+        || !TEST_false(ocsp_server_called))
         goto end;
     SSL_free(serverssl);
     SSL_free(clientssl);
@@ -1985,7 +1991,7 @@ static int test_tlsext_status_type(void)
     ocsp_server_called = 0;
     cdummyarg = 2;
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     /*
@@ -1993,12 +1999,12 @@ static int test_tlsext_status_type(void)
      * specific one. We'll use the server cert.
      */
     if (!TEST_ptr(certbio = BIO_new_file(cert, "r"))
-            || !TEST_ptr(id = OCSP_RESPID_new())
-            || !TEST_ptr(ids = sk_OCSP_RESPID_new_null())
-            || !TEST_ptr(ocspcert = X509_new_ex(libctx, NULL))
-            || !TEST_ptr(PEM_read_bio_X509(certbio, &ocspcert, NULL, NULL))
-            || !TEST_true(OCSP_RESPID_set_by_key_ex(id, ocspcert, libctx, NULL))
-            || !TEST_true(sk_OCSP_RESPID_push(ids, id)))
+        || !TEST_ptr(id = OCSP_RESPID_new())
+        || !TEST_ptr(ids = sk_OCSP_RESPID_new_null())
+        || !TEST_ptr(ocspcert = X509_new_ex(libctx, NULL))
+        || !TEST_ptr(PEM_read_bio_X509(certbio, &ocspcert, NULL, NULL))
+        || !TEST_true(OCSP_RESPID_set_by_key_ex(id, ocspcert, libctx, NULL))
+        || !TEST_true(sk_OCSP_RESPID_push(ids, id)))
         goto end;
     id = NULL;
     SSL_set_tlsext_status_ids(clientssl, ids);
@@ -2009,14 +2015,14 @@ static int test_tlsext_status_type(void)
     certbio = NULL;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                         SSL_ERROR_NONE))
-            || !TEST_true(ocsp_client_called)
-            || !TEST_true(ocsp_server_called))
+            SSL_ERROR_NONE))
+        || !TEST_true(ocsp_client_called)
+        || !TEST_true(ocsp_server_called))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -2053,7 +2059,7 @@ static void remove_session_cb(SSL_CTX *ctx, SSL_SESSION *sess)
 static SSL_SESSION *get_sess_val = NULL;
 
 static SSL_SESSION *get_session_cb(SSL *ssl, const unsigned char *id, int len,
-                                   int *copy)
+    int *copy)
 {
     get_called++;
     *copy = 1;
@@ -2061,14 +2067,14 @@ static SSL_SESSION *get_session_cb(SSL *ssl, const unsigned char *id, int len,
 }
 
 static int execute_test_session(int maxprot, int use_int_cache,
-                                int use_ext_cache, long s_options)
+    int use_ext_cache, long s_options)
 {
     SSL_CTX *sctx = NULL, *cctx = NULL;
     SSL *serverssl1 = NULL, *clientssl1 = NULL;
     SSL *serverssl2 = NULL, *clientssl2 = NULL;
-# ifndef OPENSSL_NO_TLS1_1
+#ifndef OPENSSL_NO_TLS1_1
     SSL *serverssl3 = NULL, *clientssl3 = NULL;
-# endif
+#endif
     SSL_SESSION *sess1 = NULL, *sess2 = NULL;
     int testresult = 0, numnewsesstick = 1;
 
@@ -2079,8 +2085,8 @@ static int execute_test_session(int maxprot, int use_int_cache,
         numnewsesstick = 2;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         return 0;
 
     /*
@@ -2100,8 +2106,8 @@ static int execute_test_session(int maxprot, int use_int_cache,
         SSL_CTX_set_session_cache_mode(cctx, SSL_SESS_CACHE_CLIENT);
     } else {
         SSL_CTX_set_session_cache_mode(cctx,
-                                       SSL_SESS_CACHE_CLIENT
-                                       | SSL_SESS_CACHE_NO_INTERNAL_STORE);
+            SSL_SESS_CACHE_CLIENT
+                | SSL_SESS_CACHE_NO_INTERNAL_STORE);
     }
 
     if (s_options) {
@@ -2109,28 +2115,28 @@ static int execute_test_session(int maxprot, int use_int_cache,
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl1, &clientssl1,
-                                      NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl1, clientssl1,
-                                                SSL_ERROR_NONE))
-            || !TEST_ptr(sess1 = SSL_get1_session(clientssl1)))
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl1, clientssl1,
+            SSL_ERROR_NONE))
+        || !TEST_ptr(sess1 = SSL_get1_session(clientssl1)))
         goto end;
 
     /* Should fail because it should already be in the cache */
     if (use_int_cache && !TEST_false(SSL_CTX_add_session(cctx, sess1)))
         goto end;
     if (use_ext_cache
-            && (!TEST_int_eq(new_called, numnewsesstick)
+        && (!TEST_int_eq(new_called, numnewsesstick)
 
-                || !TEST_int_eq(remove_called, 0)))
+            || !TEST_int_eq(remove_called, 0)))
         goto end;
 
     new_called = remove_called = 0;
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl2,
-                                      &clientssl2, NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl2, sess1))
-            || !TEST_true(create_ssl_connection(serverssl2, clientssl2,
-                                                SSL_ERROR_NONE))
-            || !TEST_true(SSL_session_reused(clientssl2)))
+            &clientssl2, NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl2, sess1))
+        || !TEST_true(create_ssl_connection(serverssl2, clientssl2,
+            SSL_ERROR_NONE))
+        || !TEST_true(SSL_session_reused(clientssl2)))
         goto end;
 
     if (maxprot == TLS1_3_VERSION) {
@@ -2140,8 +2146,8 @@ static int execute_test_session(int maxprot, int use_int_cache,
          * old ticket from the cache so that we try to only use tickets once.
          */
         if (use_ext_cache
-                && (!TEST_int_eq(new_called, 1)
-                    || !TEST_int_eq(remove_called, 1)))
+            && (!TEST_int_eq(new_called, 1)
+                || !TEST_int_eq(remove_called, 1)))
             goto end;
     } else {
         /*
@@ -2149,8 +2155,8 @@ static int execute_test_session(int maxprot, int use_int_cache,
          * removed.
          */
         if (use_ext_cache
-                && (!TEST_int_eq(new_called, 0)
-                    || !TEST_int_eq(remove_called, 0)))
+            && (!TEST_int_eq(new_called, 0)
+                || !TEST_int_eq(remove_called, 0)))
             goto end;
     }
 
@@ -2162,17 +2168,17 @@ static int execute_test_session(int maxprot, int use_int_cache,
 
     new_called = remove_called = 0;
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl2,
-                                      &clientssl2, NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl2, clientssl2,
-                                                SSL_ERROR_NONE)))
+            &clientssl2, NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl2, clientssl2,
+            SSL_ERROR_NONE)))
         goto end;
 
     if (!TEST_ptr(sess2 = SSL_get1_session(clientssl2)))
         goto end;
 
     if (use_ext_cache
-            && (!TEST_int_eq(new_called, numnewsesstick)
-                || !TEST_int_eq(remove_called, 0)))
+        && (!TEST_int_eq(new_called, numnewsesstick)
+            || !TEST_int_eq(remove_called, 0)))
         goto end;
 
     new_called = remove_called = 0;
@@ -2183,7 +2189,7 @@ static int execute_test_session(int maxprot, int use_int_cache,
     if (!TEST_true(SSL_set_session(clientssl2, sess1)))
         goto end;
     if (use_ext_cache
-            && (!TEST_int_eq(new_called, 0) || !TEST_int_eq(remove_called, 1)))
+        && (!TEST_int_eq(new_called, 0) || !TEST_int_eq(remove_called, 1)))
         goto end;
     if (!TEST_ptr_eq(SSL_get_session(clientssl2), sess1))
         goto end;
@@ -2191,7 +2197,7 @@ static int execute_test_session(int maxprot, int use_int_cache,
     if (use_int_cache) {
         /* Should succeeded because it should not already be in the cache */
         if (!TEST_true(SSL_CTX_add_session(cctx, sess2))
-                || !TEST_true(SSL_CTX_remove_session(cctx, sess2)))
+            || !TEST_true(SSL_CTX_remove_session(cctx, sess2)))
             goto end;
     }
 
@@ -2201,30 +2207,30 @@ static int execute_test_session(int maxprot, int use_int_cache,
         goto end;
 
     if (use_ext_cache
-            && (!TEST_int_eq(new_called, 0) || !TEST_int_eq(remove_called, 1)))
+        && (!TEST_int_eq(new_called, 0) || !TEST_int_eq(remove_called, 1)))
         goto end;
 
-# if !defined(OPENSSL_NO_TLS1_1)
+#if !defined(OPENSSL_NO_TLS1_1)
     new_called = remove_called = 0;
     /* Force a connection failure */
     SSL_CTX_set_max_proto_version(sctx, TLS1_1_VERSION);
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl3,
-                                      &clientssl3, NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl3, sess1))
-            /* This should fail because of the mismatched protocol versions */
-            || !TEST_false(create_ssl_connection(serverssl3, clientssl3,
-                                                 SSL_ERROR_NONE)))
+            &clientssl3, NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl3, sess1))
+        /* This should fail because of the mismatched protocol versions */
+        || !TEST_false(create_ssl_connection(serverssl3, clientssl3,
+            SSL_ERROR_NONE)))
         goto end;
 
     /* We should have automatically removed the session from the cache */
     if (use_ext_cache
-            && (!TEST_int_eq(new_called, 0) || !TEST_int_eq(remove_called, 1)))
+        && (!TEST_int_eq(new_called, 0) || !TEST_int_eq(remove_called, 1)))
         goto end;
 
     /* Should succeed because it should not already be in the cache */
     if (use_int_cache && !TEST_true(SSL_CTX_add_session(cctx, sess2)))
         goto end;
-# endif
+#endif
 
     /* Now do some tests for server side caching */
     if (use_ext_cache) {
@@ -2240,8 +2246,8 @@ static int execute_test_session(int maxprot, int use_int_cache,
     /* Internal caching is the default on the server side */
     if (!use_int_cache)
         SSL_CTX_set_session_cache_mode(sctx,
-                                       SSL_SESS_CACHE_SERVER
-                                       | SSL_SESS_CACHE_NO_INTERNAL_STORE);
+            SSL_SESS_CACHE_SERVER
+                | SSL_SESS_CACHE_NO_INTERNAL_STORE);
 
     SSL_free(serverssl1);
     SSL_free(clientssl1);
@@ -2259,11 +2265,11 @@ static int execute_test_session(int maxprot, int use_int_cache,
         SSL_CTX_set_options(sctx, SSL_OP_NO_TICKET);
     new_called = remove_called = get_called = 0;
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl1, &clientssl1,
-                                      NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl1, clientssl1,
-                                                SSL_ERROR_NONE))
-            || !TEST_ptr(sess1 = SSL_get1_session(clientssl1))
-            || !TEST_ptr(sess2 = SSL_get1_session(serverssl1)))
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl1, clientssl1,
+            SSL_ERROR_NONE))
+        || !TEST_ptr(sess1 = SSL_get1_session(clientssl1))
+        || !TEST_ptr(sess2 = SSL_get1_session(serverssl1)))
         goto end;
 
     if (use_int_cache) {
@@ -2287,8 +2293,8 @@ static int execute_test_session(int maxprot, int use_int_cache,
         SSL_SESSION *tmp = sess2;
 
         if (!TEST_int_eq(new_called, numnewsesstick)
-                || !TEST_int_eq(remove_called, 0)
-                || !TEST_int_eq(get_called, 0))
+            || !TEST_int_eq(remove_called, 0)
+            || !TEST_int_eq(get_called, 0))
             goto end;
         /*
          * Delete the session from the internal cache to force a lookup from
@@ -2309,11 +2315,11 @@ static int execute_test_session(int maxprot, int use_int_cache,
     new_called = remove_called = get_called = 0;
     get_sess_val = sess2;
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl2,
-                                      &clientssl2, NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl2, sess1))
-            || !TEST_true(create_ssl_connection(serverssl2, clientssl2,
-                                                SSL_ERROR_NONE))
-            || !TEST_true(SSL_session_reused(clientssl2)))
+            &clientssl2, NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl2, sess1))
+        || !TEST_true(create_ssl_connection(serverssl2, clientssl2,
+            SSL_ERROR_NONE))
+        || !TEST_true(SSL_session_reused(clientssl2)))
         goto end;
 
     if (use_ext_cache) {
@@ -2322,11 +2328,11 @@ static int execute_test_session(int maxprot, int use_int_cache,
 
         if (maxprot == TLS1_3_VERSION) {
             if (!TEST_int_eq(new_called, 1)
-                    || !TEST_int_eq(get_called, 0))
+                || !TEST_int_eq(get_called, 0))
                 goto end;
         } else {
             if (!TEST_int_eq(new_called, 0)
-                    || !TEST_int_eq(get_called, 1))
+                || !TEST_int_eq(get_called, 1))
                 goto end;
         }
     }
@@ -2339,9 +2345,9 @@ static int execute_test_session(int maxprot, int use_int_cache,
 
     /* Make sess1 expire before sess2 */
     if (!TEST_time_t_gt(SSL_SESSION_set_time_ex(sess1, 1000), 0)
-            || !TEST_long_gt(SSL_SESSION_set_timeout(sess1, 1000), 0)
-            || !TEST_time_t_gt(SSL_SESSION_set_time_ex(sess2, 2000), 0)
-            || !TEST_long_gt(SSL_SESSION_set_timeout(sess2, 2000), 0))
+        || !TEST_long_gt(SSL_SESSION_set_timeout(sess1, 1000), 0)
+        || !TEST_time_t_gt(SSL_SESSION_set_time_ex(sess2, 2000), 0)
+        || !TEST_long_gt(SSL_SESSION_set_timeout(sess2, 2000), 0))
         goto end;
 
     if (!TEST_long_ne(SSL_CTX_sess_set_cache_size(sctx, 1), 0))
@@ -2353,21 +2359,21 @@ static int execute_test_session(int maxprot, int use_int_cache,
 
     /* Now add sess1, and make sure it remains, despite timeout */
     if (!TEST_true(SSL_CTX_add_session(sctx, sess1))
-            || !TEST_ptr(sess1->owner)
-            || !TEST_ptr_null(sess2->owner))
+        || !TEST_ptr(sess1->owner)
+        || !TEST_ptr_null(sess2->owner))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl1);
     SSL_free(clientssl1);
     SSL_free(serverssl2);
     SSL_free(clientssl2);
-# ifndef OPENSSL_NO_TLS1_1
+#ifndef OPENSSL_NO_TLS1_1
     SSL_free(serverssl3);
     SSL_free(clientssl3);
-# endif
+#endif
     SSL_SESSION_free(sess1);
     SSL_SESSION_free(sess2);
     SSL_CTX_free(sctx);
@@ -2458,34 +2464,33 @@ static int post_handshake_verify(SSL *sssl, SSL *cssl)
 
     /* Start handshake on the server and client */
     if (!TEST_int_eq(SSL_do_handshake(sssl), 1)
-            || !TEST_int_le(SSL_read(cssl, NULL, 0), 0)
-            || !TEST_int_le(SSL_read(sssl, NULL, 0), 0)
-            || !TEST_true(create_ssl_connection(sssl, cssl,
-                                                SSL_ERROR_NONE)))
+        || !TEST_int_le(SSL_read(cssl, NULL, 0), 0)
+        || !TEST_int_le(SSL_read(sssl, NULL, 0), 0)
+        || !TEST_true(create_ssl_connection(sssl, cssl,
+            SSL_ERROR_NONE)))
         return 0;
 
     return 1;
 }
 
 static int setup_ticket_test(int stateful, int idx, SSL_CTX **sctx,
-                             SSL_CTX **cctx)
+    SSL_CTX **cctx)
 {
     int sess_id_ctx = 1;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       sctx, cctx, cert, privkey))
-            || !TEST_true(SSL_CTX_set_num_tickets(*sctx, idx))
-            || !TEST_true(SSL_CTX_set_session_id_context(*sctx,
-                                                         (void *)&sess_id_ctx,
-                                                         sizeof(sess_id_ctx))))
+            TLS_client_method(), TLS1_VERSION, 0,
+            sctx, cctx, cert, privkey))
+        || !TEST_true(SSL_CTX_set_num_tickets(*sctx, idx))
+        || !TEST_true(SSL_CTX_set_session_id_context(*sctx,
+            (void *)&sess_id_ctx,
+            sizeof(sess_id_ctx))))
         return 0;
 
     if (stateful)
         SSL_CTX_set_options(*sctx, SSL_OP_NO_TICKET);
 
-    SSL_CTX_set_session_cache_mode(*cctx, SSL_SESS_CACHE_CLIENT
-                                          | SSL_SESS_CACHE_NO_INTERNAL_STORE);
+    SSL_CTX_set_session_cache_mode(*cctx, SSL_SESS_CACHE_CLIENT | SSL_SESS_CACHE_NO_INTERNAL_STORE);
     SSL_CTX_sess_set_new_cb(*cctx, new_cachesession_cb);
 
     return 1;
@@ -2500,14 +2505,14 @@ static int check_resumption(int idx, SSL_CTX *sctx, SSL_CTX *cctx, int succ)
     for (i = 0; i < idx * 2; i++) {
         new_called = 0;
         if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                              &clientssl, NULL, NULL))
-                || !TEST_true(SSL_set_session(clientssl, sesscache[i])))
+                &clientssl, NULL, NULL))
+            || !TEST_true(SSL_set_session(clientssl, sesscache[i])))
             goto end;
 
         SSL_set_post_handshake_auth(clientssl, 1);
 
         if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                    SSL_ERROR_NONE)))
+                SSL_ERROR_NONE)))
             goto end;
 
         /*
@@ -2516,19 +2521,19 @@ static int check_resumption(int idx, SSL_CTX *sctx, SSL_CTX *cctx, int succ)
          */
         if (succ) {
             if (!TEST_true(SSL_session_reused(clientssl))
-                    || !TEST_int_eq(new_called, 1))
+                || !TEST_int_eq(new_called, 1))
                 goto end;
         } else {
             if (!TEST_false(SSL_session_reused(clientssl))
-                    || !TEST_int_eq(new_called, idx))
+                || !TEST_int_eq(new_called, idx))
                 goto end;
         }
 
         new_called = 0;
         /* After a post-handshake authentication we should get 1 new ticket */
         if (succ
-                && (!post_handshake_verify(serverssl, clientssl)
-                    || !TEST_int_eq(new_called, 1)))
+            && (!post_handshake_verify(serverssl, clientssl)
+                || !TEST_int_eq(new_called, 1)))
             goto end;
 
         SSL_shutdown(clientssl);
@@ -2542,7 +2547,7 @@ static int check_resumption(int idx, SSL_CTX *sctx, SSL_CTX *cctx, int succ)
 
     return 1;
 
- end:
+end:
     SSL_free(clientssl);
     SSL_free(serverssl);
     return 0;
@@ -2564,13 +2569,13 @@ static int test_tickets(int stateful, int idx)
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                          &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-               /* Check we got the number of tickets we were expecting */
-            || !TEST_int_eq(idx, new_called))
+            SSL_ERROR_NONE))
+        /* Check we got the number of tickets we were expecting */
+        || !TEST_int_eq(idx, new_called))
         goto end;
 
     SSL_shutdown(clientssl);
@@ -2608,20 +2613,20 @@ static int test_tickets(int stateful, int idx)
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                          &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     SSL_set_post_handshake_auth(clientssl, 1);
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-               /* Check we got the number of tickets we were expecting */
-            || !TEST_int_eq(idx, new_called))
+            SSL_ERROR_NONE))
+        /* Check we got the number of tickets we were expecting */
+        || !TEST_int_eq(idx, new_called))
         goto end;
 
     /* After a post-handshake authentication we should get new tickets issued */
     if (!post_handshake_verify(serverssl, clientssl)
-            || !TEST_int_eq(idx * 2, new_called))
+        || !TEST_int_eq(idx * 2, new_called))
         goto end;
 
     SSL_shutdown(clientssl);
@@ -2642,7 +2647,7 @@ static int test_tickets(int stateful, int idx)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     for (j = 0; j < OSSL_NELEM(sesscache); j++) {
@@ -2673,15 +2678,14 @@ static int test_psk_tickets(void)
     int sess_id_ctx = 1;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, NULL, NULL))
-            || !TEST_true(SSL_CTX_set_session_id_context(sctx,
-                                                         (void *)&sess_id_ctx,
-                                                         sizeof(sess_id_ctx))))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, NULL, NULL))
+        || !TEST_true(SSL_CTX_set_session_id_context(sctx,
+            (void *)&sess_id_ctx,
+            sizeof(sess_id_ctx))))
         goto end;
 
-    SSL_CTX_set_session_cache_mode(cctx, SSL_SESS_CACHE_CLIENT
-                                         | SSL_SESS_CACHE_NO_INTERNAL_STORE);
+    SSL_CTX_set_session_cache_mode(cctx, SSL_SESS_CACHE_CLIENT | SSL_SESS_CACHE_NO_INTERNAL_STORE);
     SSL_CTX_set_psk_use_session_callback(cctx, use_session_cb);
     SSL_CTX_set_psk_find_session_callback(sctx, find_session_cb);
     SSL_CTX_sess_set_new_cb(cctx, new_session_cb);
@@ -2691,23 +2695,23 @@ static int test_psk_tickets(void)
     new_called = 0;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
     clientpsk = serverpsk = create_a_psk(clientssl, SHA384_DIGEST_LENGTH);
     if (!TEST_ptr(clientpsk) || !TEST_true(SSL_SESSION_up_ref(clientpsk)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-            || !TEST_int_eq(1, find_session_cb_cnt)
-            || !TEST_int_eq(1, use_session_cb_cnt)
-               /* We should always get 1 ticket when using external PSK */
-            || !TEST_int_eq(1, new_called))
+            SSL_ERROR_NONE))
+        || !TEST_int_eq(1, find_session_cb_cnt)
+        || !TEST_int_eq(1, use_session_cb_cnt)
+        /* We should always get 1 ticket when using external PSK */
+        || !TEST_int_eq(1, new_called))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -2745,7 +2749,7 @@ static int test_extra_tickets(int idx)
     SSL_CTX_sess_set_new_cb(cctx, new_session_cb);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                          &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     /*
@@ -2753,60 +2757,60 @@ static int test_extra_tickets(int idx)
      * incremented by both client and server.
      */
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-               /* Check we got the number of tickets we were expecting */
-            || !TEST_int_eq(idx * 2, new_called)
-            || !TEST_true(SSL_new_session_ticket(serverssl))
-            || !TEST_true(SSL_new_session_ticket(serverssl))
-            || !TEST_int_eq(idx * 2, new_called))
+            SSL_ERROR_NONE))
+        /* Check we got the number of tickets we were expecting */
+        || !TEST_int_eq(idx * 2, new_called)
+        || !TEST_true(SSL_new_session_ticket(serverssl))
+        || !TEST_true(SSL_new_session_ticket(serverssl))
+        || !TEST_int_eq(idx * 2, new_called))
         goto end;
 
     /* Now try a (real) write to actually send the tickets */
     c = '1';
     if (!TEST_true(SSL_write_ex(serverssl, &c, 1, &nbytes))
-            || !TEST_size_t_eq(1, nbytes)
-            || !TEST_int_eq(idx * 2 + 2, new_called)
-            || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes))
-            || !TEST_int_eq(idx * 2 + 4, new_called)
-            || !TEST_int_eq(sizeof(buf), nbytes)
-            || !TEST_int_eq(c, buf[0])
-            || !TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes)))
+        || !TEST_size_t_eq(1, nbytes)
+        || !TEST_int_eq(idx * 2 + 2, new_called)
+        || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes))
+        || !TEST_int_eq(idx * 2 + 4, new_called)
+        || !TEST_int_eq(sizeof(buf), nbytes)
+        || !TEST_int_eq(c, buf[0])
+        || !TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes)))
         goto end;
 
     /* Try with only requesting one new ticket, too */
     c = '2';
     new_called = 0;
     if (!TEST_true(SSL_new_session_ticket(serverssl))
-            || !TEST_true(SSL_write_ex(serverssl, &c, sizeof(c), &nbytes))
-            || !TEST_size_t_eq(sizeof(c), nbytes)
-            || !TEST_int_eq(1, new_called)
-            || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes))
-            || !TEST_int_eq(2, new_called)
-            || !TEST_size_t_eq(sizeof(buf), nbytes)
-            || !TEST_int_eq(c, buf[0]))
+        || !TEST_true(SSL_write_ex(serverssl, &c, sizeof(c), &nbytes))
+        || !TEST_size_t_eq(sizeof(c), nbytes)
+        || !TEST_int_eq(1, new_called)
+        || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes))
+        || !TEST_int_eq(2, new_called)
+        || !TEST_size_t_eq(sizeof(buf), nbytes)
+        || !TEST_int_eq(c, buf[0]))
         goto end;
 
     /* Do it again but use dummy writes to drive the ticket generation */
     c = '3';
     new_called = 0;
     if (!TEST_true(SSL_new_session_ticket(serverssl))
-            || !TEST_true(SSL_new_session_ticket(serverssl))
-            || !TEST_true(SSL_write_ex(serverssl, &c, 0, &nbytes))
-            || !TEST_size_t_eq(0, nbytes)
-            || !TEST_int_eq(2, new_called)
-            || !TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes))
-            || !TEST_int_eq(4, new_called))
+        || !TEST_true(SSL_new_session_ticket(serverssl))
+        || !TEST_true(SSL_write_ex(serverssl, &c, 0, &nbytes))
+        || !TEST_size_t_eq(0, nbytes)
+        || !TEST_int_eq(2, new_called)
+        || !TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes))
+        || !TEST_int_eq(4, new_called))
         goto end;
 
     /* Once more, but with SSL_do_handshake() to drive the ticket generation */
     c = '4';
     new_called = 0;
     if (!TEST_true(SSL_new_session_ticket(serverssl))
-            || !TEST_true(SSL_new_session_ticket(serverssl))
-            || !TEST_true(SSL_do_handshake(serverssl))
-            || !TEST_int_eq(2, new_called)
-            || !TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes))
-            || !TEST_int_eq(4, new_called))
+        || !TEST_true(SSL_new_session_ticket(serverssl))
+        || !TEST_true(SSL_do_handshake(serverssl))
+        || !TEST_int_eq(2, new_called)
+        || !TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes))
+        || !TEST_int_eq(4, new_called))
         goto end;
 
     /*
@@ -2823,8 +2827,8 @@ static int test_extra_tickets(int idx)
     SSL_set0_wbio(serverssl, bretry);
     bretry = NULL;
     if (!TEST_false(SSL_write_ex(serverssl, &c, 1, &nbytes))
-            || !TEST_int_eq(SSL_get_error(serverssl, 0), SSL_ERROR_WANT_WRITE)
-            || !TEST_size_t_eq(nbytes, 0))
+        || !TEST_int_eq(SSL_get_error(serverssl, 0), SSL_ERROR_WANT_WRITE)
+        || !TEST_size_t_eq(nbytes, 0))
         goto end;
     /* Restore a BIO that will let the write succeed */
     SSL_set0_wbio(serverssl, tmp);
@@ -2834,42 +2838,42 @@ static int test_extra_tickets(int idx)
      * even if we explicitly try to hit the state machine.
      */
     if (!TEST_true(SSL_new_session_ticket(serverssl))
-            || !TEST_true(SSL_new_session_ticket(serverssl))
-            || !TEST_int_eq(0, new_called)
-            || !TEST_true(SSL_do_handshake(serverssl))
-            || !TEST_int_eq(0, new_called))
+        || !TEST_true(SSL_new_session_ticket(serverssl))
+        || !TEST_int_eq(0, new_called)
+        || !TEST_true(SSL_do_handshake(serverssl))
+        || !TEST_int_eq(0, new_called))
         goto end;
     /* Re-do the write; still no tickets sent */
     if (!TEST_true(SSL_write_ex(serverssl, &c, 1, &nbytes))
-            || !TEST_size_t_eq(1, nbytes)
-            || !TEST_int_eq(0, new_called)
-            || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes))
-            || !TEST_int_eq(0, new_called)
-            || !TEST_int_eq(sizeof(buf), nbytes)
-            || !TEST_int_eq(c, buf[0])
-            || !TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes)))
+        || !TEST_size_t_eq(1, nbytes)
+        || !TEST_int_eq(0, new_called)
+        || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes))
+        || !TEST_int_eq(0, new_called)
+        || !TEST_int_eq(sizeof(buf), nbytes)
+        || !TEST_int_eq(c, buf[0])
+        || !TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes)))
         goto end;
     /* Even trying to hit the state machine now will still not send tickets */
     if (!TEST_true(SSL_do_handshake(serverssl))
-            || !TEST_int_eq(0, new_called))
+        || !TEST_int_eq(0, new_called))
         goto end;
     /* Now the *next* write should send the tickets */
     c = '6';
     if (!TEST_true(SSL_write_ex(serverssl, &c, 1, &nbytes))
-            || !TEST_size_t_eq(1, nbytes)
-            || !TEST_int_eq(2, new_called)
-            || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes))
-            || !TEST_int_eq(4, new_called)
-            || !TEST_int_eq(sizeof(buf), nbytes)
-            || !TEST_int_eq(c, buf[0])
-            || !TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes)))
+        || !TEST_size_t_eq(1, nbytes)
+        || !TEST_int_eq(2, new_called)
+        || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes))
+        || !TEST_int_eq(4, new_called)
+        || !TEST_int_eq(sizeof(buf), nbytes)
+        || !TEST_int_eq(c, buf[0])
+        || !TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf), &nbytes)))
         goto end;
 
     SSL_shutdown(clientssl);
     SSL_shutdown(serverssl);
     testresult = 1;
 
- end:
+end:
     BIO_free(bretry);
     BIO_free(tmp);
     SSL_free(serverssl);
@@ -2882,26 +2886,27 @@ static int test_extra_tickets(int idx)
 }
 #endif
 
-#define USE_NULL            0
-#define USE_BIO_1           1
-#define USE_BIO_2           2
-#define USE_DEFAULT         3
+#define USE_NULL 0
+#define USE_BIO_1 1
+#define USE_BIO_2 2
+#define USE_DEFAULT 3
 
-#define CONNTYPE_CONNECTION_SUCCESS  0
-#define CONNTYPE_CONNECTION_FAIL     1
-#define CONNTYPE_NO_CONNECTION       2
+#define CONNTYPE_CONNECTION_SUCCESS 0
+#define CONNTYPE_CONNECTION_FAIL 1
+#define CONNTYPE_NO_CONNECTION 2
 
-#define TOTAL_NO_CONN_SSL_SET_BIO_TESTS         (3 * 3 * 3 * 3)
-#define TOTAL_CONN_SUCCESS_SSL_SET_BIO_TESTS    (2 * 2)
+#define TOTAL_NO_CONN_SSL_SET_BIO_TESTS (3 * 3 * 3 * 3)
+#define TOTAL_CONN_SUCCESS_SSL_SET_BIO_TESTS (2 * 2)
 #if !defined(OSSL_NO_USABLE_TLS1_3) && !defined(OPENSSL_NO_TLS1_2)
-# define TOTAL_CONN_FAIL_SSL_SET_BIO_TESTS       (2 * 2)
+#define TOTAL_CONN_FAIL_SSL_SET_BIO_TESTS (2 * 2)
 #else
-# define TOTAL_CONN_FAIL_SSL_SET_BIO_TESTS       0
+#define TOTAL_CONN_FAIL_SSL_SET_BIO_TESTS 0
 #endif
 
-#define TOTAL_SSL_SET_BIO_TESTS TOTAL_NO_CONN_SSL_SET_BIO_TESTS \
-                                + TOTAL_CONN_SUCCESS_SSL_SET_BIO_TESTS \
-                                + TOTAL_CONN_FAIL_SSL_SET_BIO_TESTS
+#define TOTAL_SSL_SET_BIO_TESTS           \
+    TOTAL_NO_CONN_SSL_SET_BIO_TESTS       \
+    +TOTAL_CONN_SUCCESS_SSL_SET_BIO_TESTS \
+        + TOTAL_CONN_FAIL_SSL_SET_BIO_TESTS
 
 static void setupbio(BIO **res, BIO *bio1, BIO *bio2, int type)
 {
@@ -2918,7 +2923,6 @@ static void setupbio(BIO **res, BIO *bio1, BIO *bio2, int type)
     }
 }
 
-
 /*
  * Tests calls to SSL_set_bio() under various conditions.
  *
@@ -2960,8 +2964,8 @@ static int test_ssl_set_bio(int idx)
     }
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (conntype == CONNTYPE_CONNECTION_FAIL) {
@@ -2976,21 +2980,21 @@ static int test_ssl_set_bio(int idx)
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (initrbio == USE_BIO_1
-            || initwbio == USE_BIO_1
-            || newrbio == USE_BIO_1
-            || newwbio == USE_BIO_1) {
+        || initwbio == USE_BIO_1
+        || newrbio == USE_BIO_1
+        || newwbio == USE_BIO_1) {
         if (!TEST_ptr(bio1 = BIO_new(BIO_s_mem())))
             goto end;
     }
 
     if (initrbio == USE_BIO_2
-            || initwbio == USE_BIO_2
-            || newrbio == USE_BIO_2
-            || newwbio == USE_BIO_2) {
+        || initwbio == USE_BIO_2
+        || newrbio == USE_BIO_2
+        || newwbio == USE_BIO_2) {
         if (!TEST_ptr(bio2 = BIO_new(BIO_s_mem())))
             goto end;
     }
@@ -3014,9 +3018,9 @@ static int test_ssl_set_bio(int idx)
     }
 
     if (conntype != CONNTYPE_NO_CONNECTION
-            && !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)
-                          == (conntype == CONNTYPE_CONNECTION_SUCCESS)))
+        && !TEST_true(create_ssl_connection(serverssl, clientssl,
+                          SSL_ERROR_NONE)
+            == (conntype == CONNTYPE_CONNECTION_SUCCESS)))
         goto end;
 
     setupbio(&nrbio, bio1, bio2, newrbio);
@@ -3028,16 +3032,16 @@ static int test_ssl_set_bio(int idx)
      * already been set!
      */
     if (nrbio != NULL
-            && nrbio != irbio
-            && (nwbio != iwbio || nrbio != nwbio))
+        && nrbio != irbio
+        && (nwbio != iwbio || nrbio != nwbio))
         if (!TEST_true(BIO_up_ref(nrbio)))
             goto end;
     if (nwbio != NULL
-            && nwbio != nrbio
-            && (nwbio != iwbio || (nwbio == iwbio && irbio == iwbio)))
+        && nwbio != nrbio
+        && (nwbio != iwbio || (nwbio == iwbio && irbio == iwbio)))
         if (!TEST_true(BIO_up_ref(nwbio))) {
             if (nrbio != irbio
-                    && (nwbio != iwbio || nrbio != nwbio))
+                && (nwbio != iwbio || nrbio != nwbio))
                 BIO_free(nrbio);
             goto end;
         }
@@ -3046,7 +3050,7 @@ static int test_ssl_set_bio(int idx)
 
     testresult = 1;
 
- end:
+end:
     BIO_free(bio1);
     BIO_free(bio2);
 
@@ -3062,7 +3066,9 @@ static int test_ssl_set_bio(int idx)
     return testresult;
 }
 
-typedef enum { NO_BIO_CHANGE, CHANGE_RBIO, CHANGE_WBIO } bio_change_t;
+typedef enum { NO_BIO_CHANGE,
+    CHANGE_RBIO,
+    CHANGE_WBIO } bio_change_t;
 
 static int execute_test_ssl_bio(int pop_ssl, bio_change_t change_bio)
 {
@@ -3072,9 +3078,9 @@ static int execute_test_ssl_bio(int pop_ssl, bio_change_t change_bio)
     int testresult = 0;
 
     if (!TEST_ptr(ctx = SSL_CTX_new_ex(libctx, NULL, TLS_method()))
-            || !TEST_ptr(ssl = SSL_new(ctx))
-            || !TEST_ptr(sslbio = BIO_new(BIO_f_ssl()))
-            || !TEST_ptr(membio1 = BIO_new(BIO_s_mem())))
+        || !TEST_ptr(ssl = SSL_new(ctx))
+        || !TEST_ptr(sslbio = BIO_new(BIO_f_ssl()))
+        || !TEST_ptr(membio1 = BIO_new(BIO_s_mem())))
         goto end;
 
     BIO_set_ssl(sslbio, ssl, BIO_CLOSE);
@@ -3103,7 +3109,7 @@ static int execute_test_ssl_bio(int pop_ssl, bio_change_t change_bio)
         BIO_pop(membio1);
 
     testresult = 1;
- end:
+end:
     BIO_free(membio1);
     BIO_free(sslbio);
     SSL_free(ssl);
@@ -3146,35 +3152,35 @@ typedef struct {
     int connsuccess;
 } sigalgs_list;
 
-static const int validlist1[] = {NID_sha256, EVP_PKEY_RSA};
-# ifndef OPENSSL_NO_EC
-static const int validlist2[] = {NID_sha256, EVP_PKEY_RSA, NID_sha512, EVP_PKEY_EC};
-static const int validlist3[] = {NID_sha512, EVP_PKEY_EC};
-# endif
-static const int invalidlist1[] = {NID_undef, EVP_PKEY_RSA};
-static const int invalidlist2[] = {NID_sha256, NID_undef};
-static const int invalidlist3[] = {NID_sha256, EVP_PKEY_RSA, NID_sha256};
-static const int invalidlist4[] = {NID_sha256};
+static const int validlist1[] = { NID_sha256, EVP_PKEY_RSA };
+#ifndef OPENSSL_NO_EC
+static const int validlist2[] = { NID_sha256, EVP_PKEY_RSA, NID_sha512, EVP_PKEY_EC };
+static const int validlist3[] = { NID_sha512, EVP_PKEY_EC };
+#endif
+static const int invalidlist1[] = { NID_undef, EVP_PKEY_RSA };
+static const int invalidlist2[] = { NID_sha256, NID_undef };
+static const int invalidlist3[] = { NID_sha256, EVP_PKEY_RSA, NID_sha256 };
+static const int invalidlist4[] = { NID_sha256 };
 static const sigalgs_list testsigalgs[] = {
-    {validlist1, OSSL_NELEM(validlist1), NULL, 1, 1},
-# ifndef OPENSSL_NO_EC
-    {validlist2, OSSL_NELEM(validlist2), NULL, 1, 1},
-    {validlist3, OSSL_NELEM(validlist3), NULL, 1, 0},
-# endif
-    {NULL, 0, "RSA+SHA256", 1, 1},
-    {NULL, 0, "RSA+SHA256:?Invalid", 1, 1},
-# ifndef OPENSSL_NO_EC
-    {NULL, 0, "RSA+SHA256:ECDSA+SHA512", 1, 1},
-    {NULL, 0, "ECDSA+SHA512", 1, 0},
-# endif
-    {invalidlist1, OSSL_NELEM(invalidlist1), NULL, 0, 0},
-    {invalidlist2, OSSL_NELEM(invalidlist2), NULL, 0, 0},
-    {invalidlist3, OSSL_NELEM(invalidlist3), NULL, 0, 0},
-    {invalidlist4, OSSL_NELEM(invalidlist4), NULL, 0, 0},
-    {NULL, 0, "RSA", 0, 0},
-    {NULL, 0, "SHA256", 0, 0},
-    {NULL, 0, "RSA+SHA256:SHA256", 0, 0},
-    {NULL, 0, "Invalid", 0, 0}
+    { validlist1, OSSL_NELEM(validlist1), NULL, 1, 1 },
+#ifndef OPENSSL_NO_EC
+    { validlist2, OSSL_NELEM(validlist2), NULL, 1, 1 },
+    { validlist3, OSSL_NELEM(validlist3), NULL, 1, 0 },
+#endif
+    { NULL, 0, "RSA+SHA256", 1, 1 },
+    { NULL, 0, "RSA+SHA256:?Invalid", 1, 1 },
+#ifndef OPENSSL_NO_EC
+    { NULL, 0, "RSA+SHA256:ECDSA+SHA512", 1, 1 },
+    { NULL, 0, "ECDSA+SHA512", 1, 0 },
+#endif
+    { invalidlist1, OSSL_NELEM(invalidlist1), NULL, 0, 0 },
+    { invalidlist2, OSSL_NELEM(invalidlist2), NULL, 0, 0 },
+    { invalidlist3, OSSL_NELEM(invalidlist3), NULL, 0, 0 },
+    { invalidlist4, OSSL_NELEM(invalidlist4), NULL, 0, 0 },
+    { NULL, 0, "RSA", 0, 0 },
+    { NULL, 0, "SHA256", 0, 0 },
+    { NULL, 0, "RSA+SHA256:SHA256", 0, 0 },
+    { NULL, 0, "Invalid", 0, 0 }
 };
 
 static int test_set_sigalgs(int idx)
@@ -3194,8 +3200,8 @@ static int test_set_sigalgs(int idx)
                    : &testsigalgs[idx - OSSL_NELEM(testsigalgs)];
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         return 0;
 
     SSL_CTX_set_max_proto_version(cctx, TLS1_2_VERSION);
@@ -3222,7 +3228,7 @@ static int test_set_sigalgs(int idx)
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     if (!testctx) {
@@ -3244,13 +3250,13 @@ static int test_set_sigalgs(int idx)
     }
 
     if (!TEST_int_eq(create_ssl_connection(serverssl, clientssl,
-                                           SSL_ERROR_NONE),
-                curr->connsuccess))
+                         SSL_ERROR_NONE),
+            curr->connsuccess))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -3265,7 +3271,7 @@ static int psk_client_cb_cnt = 0;
 static int psk_server_cb_cnt = 0;
 
 static int use_session_cb(SSL *ssl, const EVP_MD *md, const unsigned char **id,
-                          size_t *idlen, SSL_SESSION **sess)
+    size_t *idlen, SSL_SESSION **sess)
 {
     switch (++use_session_cb_cnt) {
     case 1:
@@ -3297,9 +3303,9 @@ static int use_session_cb(SSL *ssl, const EVP_MD *md, const unsigned char **id,
 
 #ifndef OPENSSL_NO_PSK
 static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *id,
-                                  unsigned int max_id_len,
-                                  unsigned char *psk,
-                                  unsigned int max_psk_len)
+    unsigned int max_id_len,
+    unsigned char *psk,
+    unsigned int max_psk_len)
 {
     unsigned int psklen = 0;
 
@@ -3326,7 +3332,7 @@ static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *id,
 #endif /* OPENSSL_NO_PSK */
 
 static int find_session_cb(SSL *ssl, const unsigned char *identity,
-                           size_t identity_len, SSL_SESSION **sess)
+    size_t identity_len, SSL_SESSION **sess)
 {
     find_session_cb_cnt++;
 
@@ -3339,7 +3345,7 @@ static int find_session_cb(SSL *ssl, const unsigned char *identity,
 
     /* Identity should match that set by the client */
     if (strlen(srvid) != identity_len
-            || strncmp(srvid, (const char *)identity, identity_len) != 0) {
+        || strncmp(srvid, (const char *)identity, identity_len) != 0) {
         /* No PSK found, continue but without a PSK */
         *sess = NULL;
         return 1;
@@ -3355,7 +3361,7 @@ static int find_session_cb(SSL *ssl, const unsigned char *identity,
 
 #ifndef OPENSSL_NO_PSK
 static unsigned int psk_server_cb(SSL *ssl, const char *identity,
-                                  unsigned char *psk, unsigned int max_psk_len)
+    unsigned char *psk, unsigned int max_psk_len)
 {
     unsigned int psklen = 0;
 
@@ -3382,13 +3388,13 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
 }
 #endif /* OPENSSL_NO_PSK */
 
-#define MSG1    "Hello"
-#define MSG2    "World."
-#define MSG3    "This"
-#define MSG4    "is"
-#define MSG5    "a"
-#define MSG6    "test"
-#define MSG7    "message."
+#define MSG1 "Hello"
+#define MSG2 "World."
+#define MSG3 "This"
+#define MSG4 "is"
+#define MSG5 "a"
+#define MSG6 "test"
+#define MSG7 "message."
 
 static int artificial_ticket_time = 0;
 
@@ -3425,16 +3431,16 @@ static int ed_gen_cb(SSL *s, void *arg)
  * error.
  */
 static int setupearly_data_test(SSL_CTX **cctx, SSL_CTX **sctx, SSL **clientssl,
-                                SSL **serverssl, SSL_SESSION **sess, int idx,
-                                size_t mdsize)
+    SSL **serverssl, SSL_SESSION **sess, int idx,
+    size_t mdsize)
 {
     int artificial = (artificial_ticket_time > 0);
 
     if (*sctx == NULL
-            && !TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                              TLS_client_method(),
-                                              TLS1_VERSION, 0,
-                                              sctx, cctx, cert, privkey)))
+        && !TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
+            TLS_client_method(),
+            TLS1_VERSION, 0,
+            sctx, cctx, cert, privkey)))
         return 0;
 
     if (artificial)
@@ -3457,7 +3463,7 @@ static int setupearly_data_test(SSL_CTX **cctx, SSL_CTX **sctx, SSL **clientssl,
     }
 
     if (!TEST_true(create_ssl_objects(*sctx, *cctx, serverssl, clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         return 0;
 
     /*
@@ -3467,19 +3473,19 @@ static int setupearly_data_test(SSL_CTX **cctx, SSL_CTX **sctx, SSL **clientssl,
      * early_data.
      */
     if (idx == 1
-            && !TEST_true(SSL_set_tlsext_host_name(*clientssl, "localhost")))
+        && !TEST_true(SSL_set_tlsext_host_name(*clientssl, "localhost")))
         return 0;
 
     if (idx == 2) {
         clientpsk = create_a_psk(*clientssl, mdsize);
         if (!TEST_ptr(clientpsk)
-                   /*
-                    * We just choose an arbitrary value for max_early_data which
-                    * should be big enough for testing purposes.
-                    */
-                || !TEST_true(SSL_SESSION_set_max_early_data(clientpsk,
-                                                             0x100))
-                || !TEST_true(SSL_SESSION_up_ref(clientpsk))) {
+            /*
+             * We just choose an arbitrary value for max_early_data which
+             * should be big enough for testing purposes.
+             */
+            || !TEST_true(SSL_SESSION_set_max_early_data(clientpsk,
+                0x100))
+            || !TEST_true(SSL_SESSION_up_ref(clientpsk))) {
             SSL_SESSION_free(clientpsk);
             clientpsk = NULL;
             return 0;
@@ -3502,7 +3508,7 @@ static int setupearly_data_test(SSL_CTX **cctx, SSL_CTX **sctx, SSL **clientssl,
         return 1;
 
     if (!TEST_true(create_ssl_connection(*serverssl, *clientssl,
-                                         SSL_ERROR_NONE)))
+            SSL_ERROR_NONE)))
         return 0;
 
     *sess = SSL_get1_session(*clientssl);
@@ -3517,12 +3523,12 @@ static int setupearly_data_test(SSL_CTX **cctx, SSL_CTX **sctx, SSL **clientssl,
      * gave it on the server side
      */
     if (artificial
-            && !TEST_true(sub_session_time(*sess)))
+        && !TEST_true(sub_session_time(*sess)))
         return 0;
 
     if (!TEST_true(create_ssl_objects(*sctx, *cctx, serverssl,
-                                      clientssl, NULL, NULL))
-            || !TEST_true(SSL_set_session(*clientssl, *sess)))
+            clientssl, NULL, NULL))
+        || !TEST_true(SSL_set_session(*clientssl, *sess)))
         return 0;
 
     return 1;
@@ -3562,8 +3568,8 @@ static int test_early_data_read_write(int idx)
     if (idx != 2)
         artificial_ticket_time = 2;
     if (!TEST_true(setupearly_data_test(&cctx, &sctx, &clientssl,
-                                        &serverssl, &sess, idx,
-                                        SHA384_DIGEST_LENGTH))) {
+            &serverssl, &sess, idx,
+            SHA384_DIGEST_LENGTH))) {
         artificial_ticket_time = 0;
         goto end;
     }
@@ -3572,20 +3578,20 @@ static int test_early_data_read_write(int idx)
     /* Write and read some early data */
     timer = ossl_time_now();
     if (!TEST_true(SSL_write_early_data(clientssl, MSG1, strlen(MSG1),
-                                        &written))
-            || !TEST_size_t_eq(written, strlen(MSG1)))
+            &written))
+        || !TEST_size_t_eq(written, strlen(MSG1)))
         goto end;
 
     if (!TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                         &readbytes),
-                     SSL_READ_EARLY_DATA_SUCCESS)) {
+                         &readbytes),
+            SSL_READ_EARLY_DATA_SUCCESS)) {
         testresult = check_early_data_timeout(timer);
         goto end;
     }
 
     if (!TEST_mem_eq(MSG1, readbytes, buf, strlen(MSG1))
-            || !TEST_int_eq(SSL_get_early_data_status(serverssl),
-                            SSL_EARLY_DATA_ACCEPTED))
+        || !TEST_int_eq(SSL_get_early_data_status(serverssl),
+            SSL_EARLY_DATA_ACCEPTED))
         goto end;
 
     /*
@@ -3593,31 +3599,31 @@ static int test_early_data_read_write(int idx)
      * read it.
      */
     if (!TEST_true(SSL_write_early_data(serverssl, MSG2, strlen(MSG2),
-                                        &written))
-            || !TEST_size_t_eq(written, strlen(MSG2))
-            || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes))
-            || !TEST_mem_eq(buf, readbytes, MSG2, strlen(MSG2)))
+            &written))
+        || !TEST_size_t_eq(written, strlen(MSG2))
+        || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes))
+        || !TEST_mem_eq(buf, readbytes, MSG2, strlen(MSG2)))
         goto end;
 
     /* Even after reading normal data, client should be able write early data */
     if (!TEST_true(SSL_write_early_data(clientssl, MSG3, strlen(MSG3),
-                                        &written))
-            || !TEST_size_t_eq(written, strlen(MSG3)))
+            &written))
+        || !TEST_size_t_eq(written, strlen(MSG3)))
         goto end;
 
     /* Server should still be able read early data after writing data */
     if (!TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                         &readbytes),
-                     SSL_READ_EARLY_DATA_SUCCESS)
-            || !TEST_mem_eq(buf, readbytes, MSG3, strlen(MSG3)))
+                         &readbytes),
+            SSL_READ_EARLY_DATA_SUCCESS)
+        || !TEST_mem_eq(buf, readbytes, MSG3, strlen(MSG3)))
         goto end;
 
     /* Write more data from server and read it from client */
     if (!TEST_true(SSL_write_early_data(serverssl, MSG4, strlen(MSG4),
-                                        &written))
-            || !TEST_size_t_eq(written, strlen(MSG4))
-            || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes))
-            || !TEST_mem_eq(buf, readbytes, MSG4, strlen(MSG4)))
+            &written))
+        || !TEST_size_t_eq(written, strlen(MSG4))
+        || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes))
+        || !TEST_mem_eq(buf, readbytes, MSG4, strlen(MSG4)))
         goto end;
 
     /*
@@ -3625,9 +3631,9 @@ static int test_early_data_read_write(int idx)
      * longer possible.
      */
     if (!TEST_true(SSL_write_ex(clientssl, MSG5, strlen(MSG5), &written))
-            || !TEST_size_t_eq(written, strlen(MSG5))
-            || !TEST_int_eq(SSL_get_early_data_status(clientssl),
-                            SSL_EARLY_DATA_ACCEPTED))
+        || !TEST_size_t_eq(written, strlen(MSG5))
+        || !TEST_int_eq(SSL_get_early_data_status(clientssl),
+            SSL_EARLY_DATA_ACCEPTED))
         goto end;
 
     /*
@@ -3638,21 +3644,21 @@ static int test_early_data_read_write(int idx)
      */
     rbio = SSL_get_rbio(serverssl);
     if (!TEST_true(BIO_read_ex(rbio, data, sizeof(data), &rawread))
-            || !TEST_size_t_lt(rawread, sizeof(data))
-            || !TEST_size_t_gt(rawread, SSL3_RT_HEADER_LENGTH))
+        || !TEST_size_t_lt(rawread, sizeof(data))
+        || !TEST_size_t_gt(rawread, SSL3_RT_HEADER_LENGTH))
         goto end;
 
     /* Record length is in the 4th and 5th bytes of the record header */
     eoedlen = SSL3_RT_HEADER_LENGTH + (data[3] << 8 | data[4]);
     if (!TEST_true(BIO_write_ex(rbio, data, eoedlen, &rawwritten))
-            || !TEST_size_t_eq(rawwritten, eoedlen))
+        || !TEST_size_t_eq(rawwritten, eoedlen))
         goto end;
 
     /* Server should be told that there is no more early data */
     if (!TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                         &readbytes),
-                     SSL_READ_EARLY_DATA_FINISH)
-            || !TEST_size_t_eq(readbytes, 0))
+                         &readbytes),
+            SSL_READ_EARLY_DATA_FINISH)
+        || !TEST_size_t_eq(readbytes, 0))
         goto end;
 
     /*
@@ -3660,35 +3666,35 @@ static int test_early_data_read_write(int idx)
      * data.
      */
     if (!TEST_true(SSL_write_early_data(serverssl, MSG6, strlen(MSG6),
-                                        &written))
-            || !TEST_size_t_eq(written, strlen(MSG6)))
+            &written))
+        || !TEST_size_t_eq(written, strlen(MSG6)))
         goto end;
 
     /* Push the ClientFinished and the normal data back into the server rbio */
     if (!TEST_true(BIO_write_ex(rbio, data + eoedlen, rawread - eoedlen,
-                                &rawwritten))
-            || !TEST_size_t_eq(rawwritten, rawread - eoedlen))
+            &rawwritten))
+        || !TEST_size_t_eq(rawwritten, rawread - eoedlen))
         goto end;
 
     /* Server should be able to read normal data */
     if (!TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
-            || !TEST_size_t_eq(readbytes, strlen(MSG5)))
+        || !TEST_size_t_eq(readbytes, strlen(MSG5)))
         goto end;
 
     /* Client and server should not be able to write/read early data now */
     if (!TEST_false(SSL_write_early_data(clientssl, MSG6, strlen(MSG6),
-                                         &written)))
+            &written)))
         goto end;
     ERR_clear_error();
     if (!TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                         &readbytes),
-                     SSL_READ_EARLY_DATA_ERROR))
+                         &readbytes),
+            SSL_READ_EARLY_DATA_ERROR))
         goto end;
     ERR_clear_error();
 
     /* Client should be able to read the data sent by the server */
     if (!TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes))
-            || !TEST_mem_eq(buf, readbytes, MSG6, strlen(MSG6)))
+        || !TEST_mem_eq(buf, readbytes, MSG6, strlen(MSG6)))
         goto end;
 
     /*
@@ -3697,15 +3703,15 @@ static int test_early_data_read_write(int idx)
      * data.
      */
     if (!TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes))
-            || !TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf),
-                           &readbytes)))
+        || !TEST_false(SSL_read_ex(clientssl, buf, sizeof(buf),
+            &readbytes)))
         goto end;
 
     /* Server should be able to write normal data */
     if (!TEST_true(SSL_write_ex(serverssl, MSG7, strlen(MSG7), &written))
-            || !TEST_size_t_eq(written, strlen(MSG7))
-            || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes))
-            || !TEST_mem_eq(buf, readbytes, MSG7, strlen(MSG7)))
+        || !TEST_size_t_eq(written, strlen(MSG7))
+        || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes))
+        || !TEST_mem_eq(buf, readbytes, MSG7, strlen(MSG7)))
         goto end;
 
     SSL_SESSION_free(sess);
@@ -3719,45 +3725,45 @@ static int test_early_data_read_write(int idx)
     SSL_free(clientssl);
     serverssl = clientssl = NULL;
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, sess)))
+            &clientssl, NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, sess)))
         goto end;
 
     /* Write and read some early data */
     if (!TEST_true(SSL_write_early_data(clientssl, MSG1, strlen(MSG1),
-                                        &written))
-            || !TEST_size_t_eq(written, strlen(MSG1))
-            || !TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                                &readbytes),
-                            SSL_READ_EARLY_DATA_SUCCESS)
-            || !TEST_mem_eq(buf, readbytes, MSG1, strlen(MSG1)))
+            &written))
+        || !TEST_size_t_eq(written, strlen(MSG1))
+        || !TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
+                            &readbytes),
+            SSL_READ_EARLY_DATA_SUCCESS)
+        || !TEST_mem_eq(buf, readbytes, MSG1, strlen(MSG1)))
         goto end;
 
     if (!TEST_int_gt(SSL_connect(clientssl), 0)
-            || !TEST_int_gt(SSL_accept(serverssl), 0))
+        || !TEST_int_gt(SSL_accept(serverssl), 0))
         goto end;
 
     /* Client and server should not be able to write/read early data now */
     if (!TEST_false(SSL_write_early_data(clientssl, MSG6, strlen(MSG6),
-                                         &written)))
+            &written)))
         goto end;
     ERR_clear_error();
     if (!TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                         &readbytes),
-                     SSL_READ_EARLY_DATA_ERROR))
+                         &readbytes),
+            SSL_READ_EARLY_DATA_ERROR))
         goto end;
     ERR_clear_error();
 
     /* Client and server should be able to write/read normal data */
     if (!TEST_true(SSL_write_ex(clientssl, MSG5, strlen(MSG5), &written))
-            || !TEST_size_t_eq(written, strlen(MSG5))
-            || !TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
-            || !TEST_size_t_eq(readbytes, strlen(MSG5)))
+        || !TEST_size_t_eq(written, strlen(MSG5))
+        || !TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
+        || !TEST_size_t_eq(readbytes, strlen(MSG5)))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(sess);
     SSL_SESSION_free(clientpsk);
     SSL_SESSION_free(serverpsk);
@@ -3805,8 +3811,8 @@ static int test_early_data_replay_int(int idx, int usecb, int confopt)
     allow_ed_cb_called = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         return 0;
 
     if (usecb > 0) {
@@ -3817,11 +3823,10 @@ static int test_early_data_replay_int(int idx, int usecb, int confopt)
 
             if (!TEST_ptr(confctx))
                 goto end;
-            SSL_CONF_CTX_set_flags(confctx, SSL_CONF_FLAG_FILE
-                                            | SSL_CONF_FLAG_SERVER);
+            SSL_CONF_CTX_set_flags(confctx, SSL_CONF_FLAG_FILE | SSL_CONF_FLAG_SERVER);
             SSL_CONF_CTX_set_ssl_ctx(confctx, sctx);
             if (!TEST_int_eq(SSL_CONF_cmd(confctx, "Options", "-AntiReplay"),
-                             2)) {
+                    2)) {
                 SSL_CONF_CTX_free(confctx);
                 goto end;
             }
@@ -3831,8 +3836,8 @@ static int test_early_data_replay_int(int idx, int usecb, int confopt)
     }
 
     if (!TEST_true(setupearly_data_test(&cctx, &sctx, &clientssl,
-                                        &serverssl, &sess, idx,
-                                        SHA384_DIGEST_LENGTH)))
+            &serverssl, &sess, idx,
+            SHA384_DIGEST_LENGTH)))
         goto end;
 
     /*
@@ -3840,7 +3845,7 @@ static int test_early_data_replay_int(int idx, int usecb, int confopt)
      * "use up" the ticket
      */
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE))
-            || !TEST_true(SSL_session_reused(clientssl)))
+        || !TEST_true(SSL_session_reused(clientssl)))
         goto end;
 
     SSL_shutdown(clientssl);
@@ -3850,59 +3855,59 @@ static int test_early_data_replay_int(int idx, int usecb, int confopt)
     serverssl = clientssl = NULL;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, sess)))
+            &clientssl, NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, sess)))
         goto end;
 
     /* Write and read some early data */
     timer = ossl_time_now();
     if (!TEST_true(SSL_write_early_data(clientssl, MSG1, strlen(MSG1),
-                                        &written))
-            || !TEST_size_t_eq(written, strlen(MSG1)))
+            &written))
+        || !TEST_size_t_eq(written, strlen(MSG1)))
         goto end;
 
     if (usecb <= 1) {
         if (!TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                             &readbytes),
-                         SSL_READ_EARLY_DATA_FINISH)
-                   /*
-                    * The ticket was reused, so the we should have rejected the
-                    * early data
-                    */
-                || !TEST_int_eq(SSL_get_early_data_status(serverssl),
-                                SSL_EARLY_DATA_REJECTED))
+                             &readbytes),
+                SSL_READ_EARLY_DATA_FINISH)
+            /*
+             * The ticket was reused, so the we should have rejected the
+             * early data
+             */
+            || !TEST_int_eq(SSL_get_early_data_status(serverssl),
+                SSL_EARLY_DATA_REJECTED))
             goto end;
     } else {
         /* In this case the callback decides to accept the early data */
         if (!TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                             &readbytes),
-                         SSL_READ_EARLY_DATA_SUCCESS)) {
+                             &readbytes),
+                SSL_READ_EARLY_DATA_SUCCESS)) {
             testresult = check_early_data_timeout(timer);
             goto end;
         }
         if (!TEST_mem_eq(MSG1, strlen(MSG1), buf, readbytes)
-                   /*
-                    * Server will have sent its flight so client can now send
-                    * end of early data and complete its half of the handshake
-                    */
-                || !TEST_int_gt(SSL_connect(clientssl), 0)
-                || !TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                             &readbytes),
-                                SSL_READ_EARLY_DATA_FINISH)
-                || !TEST_int_eq(SSL_get_early_data_status(serverssl),
-                                SSL_EARLY_DATA_ACCEPTED))
+            /*
+             * Server will have sent its flight so client can now send
+             * end of early data and complete its half of the handshake
+             */
+            || !TEST_int_gt(SSL_connect(clientssl), 0)
+            || !TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
+                                &readbytes),
+                SSL_READ_EARLY_DATA_FINISH)
+            || !TEST_int_eq(SSL_get_early_data_status(serverssl),
+                SSL_EARLY_DATA_ACCEPTED))
             goto end;
     }
 
     /* Complete the connection */
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE))
-            || !TEST_int_eq(SSL_session_reused(clientssl), (usecb > 0) ? 1 : 0)
-            || !TEST_int_eq(allow_ed_cb_called, usecb > 0 ? 1 : 0))
+        || !TEST_int_eq(SSL_session_reused(clientssl), (usecb > 0) ? 1 : 0)
+        || !TEST_int_eq(allow_ed_cb_called, usecb > 0 ? 1 : 0))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(sess);
     SSL_SESSION_free(clientpsk);
     SSL_SESSION_free(serverpsk);
@@ -3966,9 +3971,9 @@ static int early_data_skip_helper(int testtype, int cipher, int idx)
         return TEST_skip("Cipher not supported");
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                              TLS_client_method(),
-                                              TLS1_VERSION, 0,
-                                              &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (cipher == 0 || cipher == 5 || cipher == 6) {
@@ -3977,14 +3982,14 @@ static int early_data_skip_helper(int testtype, int cipher, int idx)
     }
 
     if (!TEST_true(SSL_CTX_set_ciphersuites(sctx, ciphersuites[cipher]))
-            || !TEST_true(SSL_CTX_set_ciphersuites(cctx, ciphersuites[cipher])))
+        || !TEST_true(SSL_CTX_set_ciphersuites(cctx, ciphersuites[cipher])))
         goto end;
 
     if (!TEST_true(setupearly_data_test(&cctx, &sctx, &clientssl,
-                                        &serverssl, &sess, idx,
-                                        (cipher == 2 || cipher == 6)
-                                            ? SHA384_DIGEST_LENGTH
-                                            : SHA256_DIGEST_LENGTH)))
+            &serverssl, &sess, idx,
+            (cipher == 2 || cipher == 6)
+                ? SHA384_DIGEST_LENGTH
+                : SHA256_DIGEST_LENGTH)))
         goto end;
 
     if (testtype == 1 || testtype == 2) {
@@ -4013,22 +4018,22 @@ static int early_data_skip_helper(int testtype, int cipher, int idx)
     }
 
     if (testtype == 3
-            && !TEST_true(SSL_set_recv_max_early_data(serverssl, 0)))
+        && !TEST_true(SSL_set_recv_max_early_data(serverssl, 0)))
         goto end;
 
     /* Write some early data */
     if (!TEST_true(SSL_write_early_data(clientssl, MSG1, strlen(MSG1),
-                                        &written))
-            || !TEST_size_t_eq(written, strlen(MSG1)))
+            &written))
+        || !TEST_size_t_eq(written, strlen(MSG1)))
         goto end;
 
     /* Server should reject the early data */
     if (!TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                         &readbytes),
-                     SSL_READ_EARLY_DATA_FINISH)
-            || !TEST_size_t_eq(readbytes, 0)
-            || !TEST_int_eq(SSL_get_early_data_status(serverssl),
-                            SSL_EARLY_DATA_REJECTED))
+                         &readbytes),
+            SSL_READ_EARLY_DATA_FINISH)
+        || !TEST_size_t_eq(readbytes, 0)
+        || !TEST_int_eq(SSL_get_early_data_status(serverssl),
+            SSL_EARLY_DATA_REJECTED))
         goto end;
 
     switch (testtype) {
@@ -4043,36 +4048,35 @@ static int early_data_skip_helper(int testtype, int cipher, int idx)
          * handshake.
          */
         if (!TEST_false(SSL_write_ex(clientssl, MSG2, strlen(MSG2), &written))
-                || !TEST_false(SSL_read_ex(serverssl, buf, sizeof(buf),
-                               &readbytes)))
+            || !TEST_false(SSL_read_ex(serverssl, buf, sizeof(buf),
+                &readbytes)))
             goto end;
         break;
 
-    case 2:
-        {
-            BIO *wbio = SSL_get_wbio(clientssl);
-            /* A record that will appear as bad early_data */
-            const unsigned char bad_early_data[] = {
-                0x17, 0x03, 0x03, 0x00, 0x01, 0x00
-            };
+    case 2: {
+        BIO *wbio = SSL_get_wbio(clientssl);
+        /* A record that will appear as bad early_data */
+        const unsigned char bad_early_data[] = {
+            0x17, 0x03, 0x03, 0x00, 0x01, 0x00
+        };
 
-            /*
-             * We force the client to attempt a write. This will fail because
-             * we're still in the handshake. It will cause the second
-             * ClientHello to be sent.
-             */
-            if (!TEST_false(SSL_write_ex(clientssl, MSG2, strlen(MSG2),
-                                         &written)))
-                goto end;
+        /*
+         * We force the client to attempt a write. This will fail because
+         * we're still in the handshake. It will cause the second
+         * ClientHello to be sent.
+         */
+        if (!TEST_false(SSL_write_ex(clientssl, MSG2, strlen(MSG2),
+                &written)))
+            goto end;
 
-            /*
-             * Inject some early_data after the second ClientHello. This should
-             * cause the server to fail
-             */
-            if (!TEST_true(BIO_write_ex(wbio, bad_early_data,
-                                        sizeof(bad_early_data), &written)))
-                goto end;
-        }
+        /*
+         * Inject some early_data after the second ClientHello. This should
+         * cause the server to fail
+         */
+        if (!TEST_true(BIO_write_ex(wbio, bad_early_data,
+                sizeof(bad_early_data), &written)))
+            goto end;
+    }
         /* FALLTHROUGH */
 
     case 3:
@@ -4082,7 +4086,7 @@ static int early_data_skip_helper(int testtype, int cipher, int idx)
          * abort.
          */
         if (!TEST_false(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
-                || !TEST_int_eq(SSL_get_error(serverssl, 0), SSL_ERROR_SSL))
+            || !TEST_int_eq(SSL_get_error(serverssl, 0), SSL_ERROR_SSL))
             goto end;
 
         /* Connection has failed - nothing more to do */
@@ -4100,11 +4104,11 @@ static int early_data_skip_helper(int testtype, int cipher, int idx)
      * early_data should be skipped.
      */
     if (!TEST_true(SSL_write_ex(clientssl, MSG2, strlen(MSG2), &written))
-            || !TEST_size_t_eq(written, strlen(MSG2))
-            || !TEST_int_eq(SSL_get_early_data_status(clientssl),
-                            SSL_EARLY_DATA_REJECTED)
-            || !TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
-            || !TEST_mem_eq(buf, readbytes, MSG2, strlen(MSG2)))
+        || !TEST_size_t_eq(written, strlen(MSG2))
+        || !TEST_int_eq(SSL_get_early_data_status(clientssl),
+            SSL_EARLY_DATA_REJECTED)
+        || !TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
+        || !TEST_mem_eq(buf, readbytes, MSG2, strlen(MSG2)))
         goto end;
 
     /*
@@ -4116,7 +4120,7 @@ static int early_data_skip_helper(int testtype, int cipher, int idx)
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(clientpsk);
     SSL_SESSION_free(serverpsk);
     clientpsk = serverpsk = NULL;
@@ -4135,8 +4139,8 @@ static int early_data_skip_helper(int testtype, int cipher, int idx)
 static int test_early_data_skip(int idx)
 {
     return early_data_skip_helper(0,
-                                  idx % OSSL_NELEM(ciphersuites),
-                                  idx / OSSL_NELEM(ciphersuites));
+        idx % OSSL_NELEM(ciphersuites),
+        idx / OSSL_NELEM(ciphersuites));
 }
 
 /*
@@ -4146,8 +4150,8 @@ static int test_early_data_skip(int idx)
 static int test_early_data_skip_hrr(int idx)
 {
     return early_data_skip_helper(1,
-                                  idx % OSSL_NELEM(ciphersuites),
-                                  idx / OSSL_NELEM(ciphersuites));
+        idx % OSSL_NELEM(ciphersuites),
+        idx / OSSL_NELEM(ciphersuites));
 }
 
 /*
@@ -4158,8 +4162,8 @@ static int test_early_data_skip_hrr(int idx)
 static int test_early_data_skip_hrr_fail(int idx)
 {
     return early_data_skip_helper(2,
-                                  idx % OSSL_NELEM(ciphersuites),
-                                  idx / OSSL_NELEM(ciphersuites));
+        idx % OSSL_NELEM(ciphersuites),
+        idx / OSSL_NELEM(ciphersuites));
 }
 
 /*
@@ -4169,8 +4173,8 @@ static int test_early_data_skip_hrr_fail(int idx)
 static int test_early_data_skip_abort(int idx)
 {
     return early_data_skip_helper(3,
-                                  idx % OSSL_NELEM(ciphersuites),
-                                  idx / OSSL_NELEM(ciphersuites));
+        idx % OSSL_NELEM(ciphersuites),
+        idx / OSSL_NELEM(ciphersuites));
 }
 
 /*
@@ -4187,8 +4191,8 @@ static int test_early_data_not_sent(int idx)
     size_t readbytes, written;
 
     if (!TEST_true(setupearly_data_test(&cctx, &sctx, &clientssl,
-                                        &serverssl, &sess, idx,
-                                        SHA384_DIGEST_LENGTH)))
+            &serverssl, &sess, idx,
+            SHA384_DIGEST_LENGTH)))
         goto end;
 
     /* Write some data - should block due to handshake with server */
@@ -4198,31 +4202,31 @@ static int test_early_data_not_sent(int idx)
 
     /* Server should detect that early data has not been sent */
     if (!TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                         &readbytes),
-                     SSL_READ_EARLY_DATA_FINISH)
-            || !TEST_size_t_eq(readbytes, 0)
-            || !TEST_int_eq(SSL_get_early_data_status(serverssl),
-                            SSL_EARLY_DATA_NOT_SENT)
-            || !TEST_int_eq(SSL_get_early_data_status(clientssl),
-                            SSL_EARLY_DATA_NOT_SENT))
+                         &readbytes),
+            SSL_READ_EARLY_DATA_FINISH)
+        || !TEST_size_t_eq(readbytes, 0)
+        || !TEST_int_eq(SSL_get_early_data_status(serverssl),
+            SSL_EARLY_DATA_NOT_SENT)
+        || !TEST_int_eq(SSL_get_early_data_status(clientssl),
+            SSL_EARLY_DATA_NOT_SENT))
         goto end;
 
     /* Continue writing the message we started earlier */
     if (!TEST_true(SSL_write_ex(clientssl, MSG1, strlen(MSG1), &written))
-            || !TEST_size_t_eq(written, strlen(MSG1))
-            || !TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
-            || !TEST_mem_eq(buf, readbytes, MSG1, strlen(MSG1))
-            || !SSL_write_ex(serverssl, MSG2, strlen(MSG2), &written)
-            || !TEST_size_t_eq(written, strlen(MSG2)))
+        || !TEST_size_t_eq(written, strlen(MSG1))
+        || !TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
+        || !TEST_mem_eq(buf, readbytes, MSG1, strlen(MSG1))
+        || !SSL_write_ex(serverssl, MSG2, strlen(MSG2), &written)
+        || !TEST_size_t_eq(written, strlen(MSG2)))
         goto end;
 
     if (!TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes))
-            || !TEST_mem_eq(buf, readbytes, MSG2, strlen(MSG2)))
+        || !TEST_mem_eq(buf, readbytes, MSG2, strlen(MSG2)))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(sess);
     SSL_SESSION_free(clientpsk);
     SSL_SESSION_free(serverpsk);
@@ -4237,8 +4241,8 @@ static int test_early_data_not_sent(int idx)
 static const char *servalpn;
 
 static int alpn_select_cb(SSL *ssl, const unsigned char **out,
-                          unsigned char *outlen, const unsigned char *in,
-                          unsigned int inlen, void *arg)
+    unsigned char *outlen, const unsigned char *in,
+    unsigned int inlen, void *arg)
 {
     unsigned int protlen = 0;
     const unsigned char *prot;
@@ -4249,7 +4253,7 @@ static int alpn_select_cb(SSL *ssl, const unsigned char **out,
             return SSL_TLSEXT_ERR_NOACK;
 
         if (protlen == strlen(servalpn)
-                && memcmp(prot, servalpn, protlen) == 0) {
+            && memcmp(prot, servalpn, protlen) == 0) {
             *out = prot;
             *outlen = protlen;
             return SSL_TLSEXT_ERR_OK;
@@ -4270,10 +4274,10 @@ static int test_early_data_psk(int idx)
         0x08, 'g', 'o', 'o', 'd', 'a', 'l', 'p', 'n', 0x07, 'b', 'a', 'd', 'a',
         'l', 'p', 'n'
     };
-#define GOODALPNLEN     9
-#define BADALPNLEN      8
-#define GOODALPN        (alpnlist)
-#define BADALPN         (alpnlist + GOODALPNLEN)
+#define GOODALPNLEN 9
+#define BADALPNLEN 8
+#define GOODALPN (alpnlist)
+#define BADALPN (alpnlist + GOODALPNLEN)
     int err = 0;
     unsigned char buf[20];
     size_t readbytes, written;
@@ -4282,8 +4286,8 @@ static int test_early_data_psk(int idx)
 
     /* We always set this up with a final parameter of "2" for PSK */
     if (!TEST_true(setupearly_data_test(&cctx, &sctx, &clientssl,
-                                        &serverssl, &sess, 2,
-                                        SHA384_DIGEST_LENGTH)))
+            &serverssl, &sess, 2,
+            SHA384_DIGEST_LENGTH)))
         goto end;
 
     servalpn = "goodalpn";
@@ -4299,7 +4303,7 @@ static int test_early_data_psk(int idx)
         /* Set inconsistent SNI (early client detection) */
         err = SSL_R_INCONSISTENT_EARLY_DATA_SNI;
         if (!TEST_true(SSL_SESSION_set1_hostname(sess, "goodhost"))
-                || !TEST_true(SSL_set_tlsext_host_name(clientssl, "badhost")))
+            || !TEST_true(SSL_set_tlsext_host_name(clientssl, "badhost")))
             goto end;
         break;
 
@@ -4308,9 +4312,9 @@ static int test_early_data_psk(int idx)
         err = SSL_R_INCONSISTENT_EARLY_DATA_ALPN;
         /* SSL_set_alpn_protos returns 0 for success and 1 for failure */
         if (!TEST_true(SSL_SESSION_set1_alpn_selected(sess, GOODALPN,
-                                                      GOODALPNLEN))
-                || !TEST_false(SSL_set_alpn_protos(clientssl, BADALPN,
-                                                   BADALPNLEN)))
+                GOODALPNLEN))
+            || !TEST_false(SSL_set_alpn_protos(clientssl, BADALPN,
+                BADALPNLEN)))
             goto end;
         break;
 
@@ -4335,15 +4339,15 @@ static int test_early_data_psk(int idx)
         SSL_SESSION_free(serverpsk);
         serverpsk = SSL_SESSION_dup(clientpsk);
         if (!TEST_ptr(serverpsk)
-                || !TEST_true(SSL_SESSION_set1_hostname(serverpsk, "badhost")))
+            || !TEST_true(SSL_SESSION_set1_hostname(serverpsk, "badhost")))
             goto end;
         /* Fall through */
     case 4:
         /* Set consistent SNI */
         if (!TEST_true(SSL_SESSION_set1_hostname(sess, "goodhost"))
-                || !TEST_true(SSL_set_tlsext_host_name(clientssl, "goodhost"))
-                || !TEST_true(SSL_CTX_set_tlsext_servername_callback(sctx,
-                                hostname_cb)))
+            || !TEST_true(SSL_set_tlsext_host_name(clientssl, "goodhost"))
+            || !TEST_true(SSL_CTX_set_tlsext_servername_callback(sctx,
+                hostname_cb)))
             goto end;
         break;
 
@@ -4365,9 +4369,9 @@ static int test_early_data_psk(int idx)
          * prefixed)
          */
         if (!TEST_true(SSL_SESSION_set1_alpn_selected(sess, GOODALPN + 1,
-                                                      GOODALPNLEN - 1))
-                || !TEST_false(SSL_set_alpn_protos(clientssl, GOODALPN,
-                                                   GOODALPNLEN)))
+                GOODALPNLEN - 1))
+            || !TEST_false(SSL_set_alpn_protos(clientssl, GOODALPN,
+                GOODALPNLEN)))
             goto end;
 
         SSL_CTX_set_alpn_select_cb(sctx, alpn_select_cb, NULL);
@@ -4378,14 +4382,14 @@ static int test_early_data_psk(int idx)
         SSL_SESSION_free(serverpsk);
         serverpsk = SSL_SESSION_dup(clientpsk);
         if (!TEST_ptr(serverpsk)
-                || !TEST_true(SSL_SESSION_set1_alpn_selected(clientpsk,
-                                                             BADALPN + 1,
-                                                             BADALPNLEN - 1))
-                || !TEST_true(SSL_SESSION_set1_alpn_selected(serverpsk,
-                                                             GOODALPN + 1,
-                                                             GOODALPNLEN - 1))
-                || !TEST_false(SSL_set_alpn_protos(clientssl, alpnlist,
-                                                   sizeof(alpnlist))))
+            || !TEST_true(SSL_SESSION_set1_alpn_selected(clientpsk,
+                BADALPN + 1,
+                BADALPNLEN - 1))
+            || !TEST_true(SSL_SESSION_set1_alpn_selected(serverpsk,
+                GOODALPN + 1,
+                GOODALPNLEN - 1))
+            || !TEST_false(SSL_set_alpn_protos(clientssl, alpnlist,
+                sizeof(alpnlist))))
             goto end;
         SSL_CTX_set_alpn_select_cb(sctx, alpn_select_cb, NULL);
         edstatus = SSL_EARLY_DATA_ACCEPTED;
@@ -4402,33 +4406,34 @@ static int test_early_data_psk(int idx)
     SSL_set_connect_state(clientssl);
     if (err != 0) {
         if (!TEST_false(SSL_write_early_data(clientssl, MSG1, strlen(MSG1),
-                                            &written))
-                || !TEST_int_eq(SSL_get_error(clientssl, 0), SSL_ERROR_SSL)
-                || !TEST_int_eq(ERR_GET_REASON(ERR_get_error()), err))
+                &written))
+            || !TEST_int_eq(SSL_get_error(clientssl, 0), SSL_ERROR_SSL)
+            || !TEST_int_eq(ERR_GET_REASON(ERR_get_error()), err))
             goto end;
     } else {
         OSSL_TIME timer = ossl_time_now();
 
         if (!TEST_true(SSL_write_early_data(clientssl, MSG1, strlen(MSG1),
-                                            &written)))
+                &written)))
             goto end;
 
         if (!TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                             &readbytes), readearlyres)) {
+                             &readbytes),
+                readearlyres)) {
             testresult = check_early_data_timeout(timer);
             goto end;
         }
 
         if ((readearlyres == SSL_READ_EARLY_DATA_SUCCESS
-                    && !TEST_mem_eq(buf, readbytes, MSG1, strlen(MSG1)))
-                || !TEST_int_eq(SSL_get_early_data_status(serverssl), edstatus)
-                || !TEST_int_eq(SSL_connect(clientssl), connectres))
+                && !TEST_mem_eq(buf, readbytes, MSG1, strlen(MSG1)))
+            || !TEST_int_eq(SSL_get_early_data_status(serverssl), edstatus)
+            || !TEST_int_eq(SSL_connect(clientssl), connectres))
             goto end;
     }
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(sess);
     SSL_SESSION_free(clientpsk);
     SSL_SESSION_free(serverpsk);
@@ -4463,14 +4468,14 @@ static int test_early_data_psk_with_all_ciphers(int idx)
     const char *cipher_str[] = {
         TLS1_3_RFC_AES_128_GCM_SHA256,
         TLS1_3_RFC_AES_256_GCM_SHA384,
-# if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
+#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
         TLS1_3_RFC_CHACHA20_POLY1305_SHA256,
-# else
+#else
         NULL,
-# endif
+#endif
         TLS1_3_RFC_AES_128_CCM_SHA256,
         TLS1_3_RFC_AES_128_CCM_8_SHA256,
-# if !defined(OPENSSL_NO_INTEGRITY_ONLY_CIPHERS)
+#if !defined(OPENSSL_NO_INTEGRITY_ONLY_CIPHERS)
         TLS1_3_RFC_SHA256_SHA256,
         TLS1_3_RFC_SHA384_SHA384
 #else
@@ -4481,14 +4486,14 @@ static int test_early_data_psk_with_all_ciphers(int idx)
     const unsigned char *cipher_bytes[] = {
         TLS13_AES_128_GCM_SHA256_BYTES,
         TLS13_AES_256_GCM_SHA384_BYTES,
-# if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
+#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
         TLS13_CHACHA20_POLY1305_SHA256_BYTES,
-# else
+#else
         NULL,
-# endif
+#endif
         TLS13_AES_128_CCM_SHA256_BYTES,
         TLS13_AES_128_CCM_8_SHA256_BYTES,
-# if !defined(OPENSSL_NO_INTEGRITY_ONLY_CIPHERS)
+#if !defined(OPENSSL_NO_INTEGRITY_ONLY_CIPHERS)
         TLS13_SHA256_SHA256_BYTES,
         TLS13_SHA384_SHA384_BYTES
 #else
@@ -4508,8 +4513,8 @@ static int test_early_data_psk_with_all_ciphers(int idx)
 
     /* We always set this up with a final parameter of "2" for PSK */
     if (!TEST_true(setupearly_data_test(&cctx, &sctx, &clientssl,
-                                        &serverssl, &sess, 2,
-                                        SHA384_DIGEST_LENGTH)))
+            &serverssl, &sess, 2,
+            SHA384_DIGEST_LENGTH)))
         goto end;
 
     if (idx == 4 || idx == 5 || idx == 6) {
@@ -4522,7 +4527,7 @@ static int test_early_data_psk_with_all_ciphers(int idx)
     }
 
     if (!TEST_true(SSL_set_ciphersuites(clientssl, cipher_str[idx]))
-            || !TEST_true(SSL_set_ciphersuites(serverssl, cipher_str[idx])))
+        || !TEST_true(SSL_set_ciphersuites(serverssl, cipher_str[idx])))
         goto end;
 
     /*
@@ -4539,34 +4544,34 @@ static int test_early_data_psk_with_all_ciphers(int idx)
     SSL_set_connect_state(clientssl);
     timer = ossl_time_now();
     if (!TEST_true(SSL_write_early_data(clientssl, MSG1, strlen(MSG1),
-                                        &written)))
+            &written)))
         goto end;
 
     if (!TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                         &readbytes),
-                                         SSL_READ_EARLY_DATA_SUCCESS)) {
+                         &readbytes),
+            SSL_READ_EARLY_DATA_SUCCESS)) {
         testresult = check_early_data_timeout(timer);
         goto end;
     }
 
     if (!TEST_mem_eq(buf, readbytes, MSG1, strlen(MSG1))
-            || !TEST_int_eq(SSL_get_early_data_status(serverssl),
-                                                      SSL_EARLY_DATA_ACCEPTED)
-            || !TEST_int_eq(SSL_connect(clientssl), 1)
-            || !TEST_int_eq(SSL_accept(serverssl), 1))
+        || !TEST_int_eq(SSL_get_early_data_status(serverssl),
+            SSL_EARLY_DATA_ACCEPTED)
+        || !TEST_int_eq(SSL_connect(clientssl), 1)
+        || !TEST_int_eq(SSL_accept(serverssl), 1))
         goto end;
 
     /* Send some normal data from client to server */
     if (!TEST_true(SSL_write_ex(clientssl, MSG2, strlen(MSG2), &written))
-            || !TEST_size_t_eq(written, strlen(MSG2)))
+        || !TEST_size_t_eq(written, strlen(MSG2)))
         goto end;
 
     if (!TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
-            || !TEST_mem_eq(buf, readbytes, MSG2, strlen(MSG2)))
+        || !TEST_mem_eq(buf, readbytes, MSG2, strlen(MSG2)))
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_SESSION_free(sess);
     SSL_SESSION_free(clientpsk);
     SSL_SESSION_free(serverpsk);
@@ -4596,13 +4601,13 @@ static int test_early_data_not_expected(int idx)
     size_t readbytes, written;
 
     if (!TEST_true(setupearly_data_test(&cctx, &sctx, &clientssl,
-                                        &serverssl, &sess, idx,
-                                        SHA384_DIGEST_LENGTH)))
+            &serverssl, &sess, idx,
+            SHA384_DIGEST_LENGTH)))
         goto end;
 
     /* Write some early data */
     if (!TEST_true(SSL_write_early_data(clientssl, MSG1, strlen(MSG1),
-                                        &written)))
+            &written)))
         goto end;
 
     /*
@@ -4610,26 +4615,26 @@ static int test_early_data_not_expected(int idx)
      * continue handshake
      */
     if (!TEST_int_le(SSL_accept(serverssl), 0)
-     || !TEST_int_gt(SSL_connect(clientssl), 0)
-     || !TEST_int_eq(SSL_get_early_data_status(serverssl),
-                     SSL_EARLY_DATA_REJECTED)
-     || !TEST_int_gt(SSL_accept(serverssl), 0)
-     || !TEST_int_eq(SSL_get_early_data_status(clientssl),
-                     SSL_EARLY_DATA_REJECTED))
+        || !TEST_int_gt(SSL_connect(clientssl), 0)
+        || !TEST_int_eq(SSL_get_early_data_status(serverssl),
+            SSL_EARLY_DATA_REJECTED)
+        || !TEST_int_gt(SSL_accept(serverssl), 0)
+        || !TEST_int_eq(SSL_get_early_data_status(clientssl),
+            SSL_EARLY_DATA_REJECTED))
         goto end;
 
     /* Send some normal data from client to server */
     if (!TEST_true(SSL_write_ex(clientssl, MSG2, strlen(MSG2), &written))
-            || !TEST_size_t_eq(written, strlen(MSG2)))
+        || !TEST_size_t_eq(written, strlen(MSG2)))
         goto end;
 
     if (!TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
-            || !TEST_mem_eq(buf, readbytes, MSG2, strlen(MSG2)))
+        || !TEST_mem_eq(buf, readbytes, MSG2, strlen(MSG2)))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(sess);
     SSL_SESSION_free(clientpsk);
     SSL_SESSION_free(serverpsk);
@@ -4641,8 +4646,7 @@ static int test_early_data_not_expected(int idx)
     return testresult;
 }
 
-
-# ifndef OPENSSL_NO_TLS1_2
+#ifndef OPENSSL_NO_TLS1_2
 /*
  * Test that a server attempting to read early data can handle a connection
  * from a TLSv1.2 client.
@@ -4656,8 +4660,8 @@ static int test_early_data_tls1_2(int idx)
     size_t readbytes, written;
 
     if (!TEST_true(setupearly_data_test(&cctx, &sctx, &clientssl,
-                                        &serverssl, NULL, idx,
-                                        SHA384_DIGEST_LENGTH)))
+            &serverssl, NULL, idx,
+            SHA384_DIGEST_LENGTH)))
         goto end;
 
     /* Write some data - should block due to handshake with server */
@@ -4672,8 +4676,8 @@ static int test_early_data_tls1_2(int idx)
      * finish and detect that early data has not been sent
      */
     if (!TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                         &readbytes),
-                     SSL_READ_EARLY_DATA_ERROR))
+                         &readbytes),
+            SSL_READ_EARLY_DATA_ERROR))
         goto end;
 
     /*
@@ -4681,30 +4685,30 @@ static int test_early_data_tls1_2(int idx)
      * for the CCS/Finished from server
      */
     if (!TEST_false(SSL_write_ex(clientssl, MSG1, strlen(MSG1), &written))
-            || !TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                                &readbytes),
-                            SSL_READ_EARLY_DATA_FINISH)
-            || !TEST_size_t_eq(readbytes, 0)
-            || !TEST_int_eq(SSL_get_early_data_status(serverssl),
-                            SSL_EARLY_DATA_NOT_SENT))
+        || !TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
+                            &readbytes),
+            SSL_READ_EARLY_DATA_FINISH)
+        || !TEST_size_t_eq(readbytes, 0)
+        || !TEST_int_eq(SSL_get_early_data_status(serverssl),
+            SSL_EARLY_DATA_NOT_SENT))
         goto end;
 
     /* Continue writing the message we started earlier */
     if (!TEST_true(SSL_write_ex(clientssl, MSG1, strlen(MSG1), &written))
-            || !TEST_size_t_eq(written, strlen(MSG1))
-            || !TEST_int_eq(SSL_get_early_data_status(clientssl),
-                            SSL_EARLY_DATA_NOT_SENT)
-            || !TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
-            || !TEST_mem_eq(buf, readbytes, MSG1, strlen(MSG1))
-            || !TEST_true(SSL_write_ex(serverssl, MSG2, strlen(MSG2), &written))
-            || !TEST_size_t_eq(written, strlen(MSG2))
-            || !SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes)
-            || !TEST_mem_eq(buf, readbytes, MSG2, strlen(MSG2)))
+        || !TEST_size_t_eq(written, strlen(MSG1))
+        || !TEST_int_eq(SSL_get_early_data_status(clientssl),
+            SSL_EARLY_DATA_NOT_SENT)
+        || !TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
+        || !TEST_mem_eq(buf, readbytes, MSG1, strlen(MSG1))
+        || !TEST_true(SSL_write_ex(serverssl, MSG2, strlen(MSG2), &written))
+        || !TEST_size_t_eq(written, strlen(MSG2))
+        || !SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes)
+        || !TEST_mem_eq(buf, readbytes, MSG2, strlen(MSG2)))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(clientpsk);
     SSL_SESSION_free(serverpsk);
     clientpsk = serverpsk = NULL;
@@ -4715,7 +4719,7 @@ static int test_early_data_tls1_2(int idx)
 
     return testresult;
 }
-# endif /* OPENSSL_NO_TLS1_2 */
+#endif /* OPENSSL_NO_TLS1_2 */
 
 /*
  * Test configuring the TLSv1.3 ciphersuites
@@ -4738,13 +4742,13 @@ static int test_set_ciphersuite(int idx)
     int testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey))
-            || !TEST_true(SSL_CTX_set_ciphersuites(sctx,
-                           "TLS_AES_128_GCM_SHA256:TLS_AES_128_CCM_SHA256")))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(SSL_CTX_set_ciphersuites(sctx,
+            "TLS_AES_128_GCM_SHA256:TLS_AES_128_CCM_SHA256")))
         goto end;
 
-    if (idx >=4 && idx <= 7) {
+    if (idx >= 4 && idx <= 7) {
         /* SSL_CTX explicit cipher list */
         if (!TEST_true(SSL_CTX_set_cipher_list(cctx, "AES256-GCM-SHA384")))
             goto end;
@@ -4753,17 +4757,17 @@ static int test_set_ciphersuite(int idx)
     if (idx == 0 || idx == 4) {
         /* Default ciphersuite */
         if (!TEST_true(SSL_CTX_set_ciphersuites(cctx,
-                                                "TLS_AES_128_GCM_SHA256")))
+                "TLS_AES_128_GCM_SHA256")))
             goto end;
     } else if (idx == 1 || idx == 5) {
         /* Non default ciphersuite */
         if (!TEST_true(SSL_CTX_set_ciphersuites(cctx,
-                                                "TLS_AES_128_CCM_SHA256")))
+                "TLS_AES_128_CCM_SHA256")))
             goto end;
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                          &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     if (idx == 8 || idx == 9) {
@@ -4775,12 +4779,12 @@ static int test_set_ciphersuite(int idx)
     if (idx == 2 || idx == 6 || idx == 8) {
         /* Default ciphersuite */
         if (!TEST_true(SSL_set_ciphersuites(clientssl,
-                                            "TLS_AES_128_GCM_SHA256")))
+                "TLS_AES_128_GCM_SHA256")))
             goto end;
     } else if (idx == 3 || idx == 7 || idx == 9) {
         /* Non default ciphersuite */
         if (!TEST_true(SSL_set_ciphersuites(clientssl,
-                                            "TLS_AES_128_CCM_SHA256")))
+                "TLS_AES_128_CCM_SHA256")))
             goto end;
     }
 
@@ -4789,7 +4793,7 @@ static int test_set_ciphersuite(int idx)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -4808,20 +4812,20 @@ static int test_ciphersuite_change(void)
 
     /* Create a session based on SHA-256 */
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey))
-            || !TEST_true(SSL_CTX_set_ciphersuites(sctx,
-                                                   "TLS_AES_128_GCM_SHA256:"
-                                                   "TLS_AES_256_GCM_SHA384:"
-                                                   "TLS_AES_128_CCM_SHA256"))
-            || !TEST_true(SSL_CTX_set_ciphersuites(cctx,
-                                                   "TLS_AES_128_GCM_SHA256")))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(SSL_CTX_set_ciphersuites(sctx,
+            "TLS_AES_128_GCM_SHA256:"
+            "TLS_AES_256_GCM_SHA384:"
+            "TLS_AES_128_CCM_SHA256"))
+        || !TEST_true(SSL_CTX_set_ciphersuites(cctx,
+            "TLS_AES_128_GCM_SHA256")))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     clntsess = SSL_get1_session(clientssl);
@@ -4835,13 +4839,13 @@ static int test_ciphersuite_change(void)
 
     /* Check we can resume a session with a different SHA-256 ciphersuite */
     if (!TEST_true(SSL_CTX_set_ciphersuites(cctx,
-                                            "TLS_AES_128_CCM_SHA256"))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                             &clientssl, NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, clntsess))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-            || !TEST_true(SSL_session_reused(clientssl)))
+            "TLS_AES_128_CCM_SHA256"))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
+            &clientssl, NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, clntsess))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE))
+        || !TEST_true(SSL_session_reused(clientssl)))
         goto end;
 
     SSL_SESSION_free(clntsess);
@@ -4857,12 +4861,12 @@ static int test_ciphersuite_change(void)
      * succeeds but does not resume.
      */
     if (!TEST_true(SSL_CTX_set_ciphersuites(cctx, "TLS_AES_256_GCM_SHA384"))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, clntsess))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_SSL))
-            || !TEST_false(SSL_session_reused(clientssl)))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, clntsess))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_SSL))
+        || !TEST_false(SSL_session_reused(clientssl)))
         goto end;
 
     SSL_SESSION_free(clntsess);
@@ -4875,10 +4879,10 @@ static int test_ciphersuite_change(void)
 
     /* Create a session based on SHA384 */
     if (!TEST_true(SSL_CTX_set_ciphersuites(cctx, "TLS_AES_256_GCM_SHA384"))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                          &clientssl, NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
+            &clientssl, NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     clntsess = SSL_get1_session(clientssl);
@@ -4889,19 +4893,19 @@ static int test_ciphersuite_change(void)
     serverssl = clientssl = NULL;
 
     if (!TEST_true(SSL_CTX_set_ciphersuites(cctx,
-                   "TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384"))
-            || !TEST_true(SSL_CTX_set_ciphersuites(sctx,
-                                                   "TLS_AES_256_GCM_SHA384"))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, clntsess))
-               /*
-                * We use SSL_ERROR_WANT_READ below so that we can pause the
-                * connection after the initial ClientHello has been sent to
-                * enable us to make some session changes.
-                */
-            || !TEST_false(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_WANT_READ)))
+            "TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384"))
+        || !TEST_true(SSL_CTX_set_ciphersuites(sctx,
+            "TLS_AES_256_GCM_SHA384"))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, clntsess))
+        /*
+         * We use SSL_ERROR_WANT_READ below so that we can pause the
+         * connection after the initial ClientHello has been sent to
+         * enable us to make some session changes.
+         */
+        || !TEST_false(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_WANT_READ)))
         goto end;
 
     /* Trick the client into thinking this session is for a different digest */
@@ -4914,14 +4918,14 @@ static int test_ciphersuite_change(void)
      * bail out.
      */
     if (!TEST_false(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_SSL))
-            || !TEST_int_eq(ERR_GET_REASON(ERR_get_error()),
-                            SSL_R_CIPHERSUITE_DIGEST_HAS_CHANGED))
+            SSL_ERROR_SSL))
+        || !TEST_int_eq(ERR_GET_REASON(ERR_get_error()),
+            SSL_R_CIPHERSUITE_DIGEST_HAS_CHANGED))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(clntsess);
     SSL_free(serverssl);
     SSL_free(clientssl);
@@ -4956,18 +4960,18 @@ static int test_ciphersuite_change(void)
  * Test 20 = Test all FFDHE with TLSv1.2 client and server
  * Test 21 = Test all ECDHE with TLSv1.2 client and server
  */
-# ifndef OPENSSL_NO_EC
-static int ecdhe_kexch_groups[] = {NID_X9_62_prime256v1, NID_secp384r1,
-                                   NID_secp521r1,
-#  ifndef OPENSSL_NO_ECX
-                                   NID_X25519, NID_X448
-#  endif
-                                   };
-# endif
-# ifndef OPENSSL_NO_DH
-static int ffdhe_kexch_groups[] = {NID_ffdhe2048, NID_ffdhe3072, NID_ffdhe4096,
-                                   NID_ffdhe6144, NID_ffdhe8192};
-# endif
+#ifndef OPENSSL_NO_EC
+static int ecdhe_kexch_groups[] = { NID_X9_62_prime256v1, NID_secp384r1,
+    NID_secp521r1,
+#ifndef OPENSSL_NO_ECX
+    NID_X25519, NID_X448
+#endif
+};
+#endif
+#ifndef OPENSSL_NO_DH
+static int ffdhe_kexch_groups[] = { NID_ffdhe2048, NID_ffdhe3072, NID_ffdhe4096,
+    NID_ffdhe6144, NID_ffdhe8192 };
+#endif
 static int test_key_exchange(int idx)
 {
     SSL_CTX *sctx = NULL, *cctx = NULL;
@@ -4982,175 +4986,173 @@ static int test_key_exchange(int idx)
     int shared_group0;
 
     switch (idx) {
-# ifndef OPENSSL_NO_EC
-# ifndef OPENSSL_NO_TLS1_2
-        case 21:
-            max_version = TLS1_2_VERSION;
-# endif
-            /* Fall through */
-        case 0:
-            kexch_groups = ecdhe_kexch_groups;
-            kexch_groups_size = OSSL_NELEM(ecdhe_kexch_groups);
-            kexch_name0 = "secp256r1";
-            break;
-        case 1:
-            kexch_alg = NID_X9_62_prime256v1;
-            kexch_name0 = "secp256r1";
-            break;
-        case 2:
-            kexch_alg = NID_secp384r1;
-            kexch_name0 = "secp384r1";
-            break;
-        case 3:
-            kexch_alg = NID_secp521r1;
-            kexch_name0 = "secp521r1";
-            break;
-#  ifndef OPENSSL_NO_ECX
-        case 4:
-            if (is_fips)
-                return TEST_skip("X25519 might not be supported by fips provider.");
-            kexch_alg = NID_X25519;
-            kexch_name0 = "x25519";
-            break;
-        case 5:
-            if (is_fips)
-                return TEST_skip("X448 might not be supported by fips provider.");
-            kexch_alg = NID_X448;
-            kexch_name0 = "x448";
-            break;
-#  endif
-# endif
-# ifndef OPENSSL_NO_DH
-# ifndef OPENSSL_NO_TLS1_2
-        case 20:
-            max_version = TLS1_2_VERSION;
-            kexch_name0 = "ffdhe2048";
-# endif
-            /* Fall through */
-        case 6:
-            kexch_groups = ffdhe_kexch_groups;
-            kexch_groups_size = OSSL_NELEM(ffdhe_kexch_groups);
-            kexch_name0 = "ffdhe2048";
-            break;
-        case 7:
-            kexch_alg = NID_ffdhe2048;
-            kexch_name0 = "ffdhe2048";
-            break;
-        case 8:
-            kexch_alg = NID_ffdhe3072;
-            kexch_name0 = "ffdhe3072";
-            break;
-        case 9:
-            kexch_alg = NID_ffdhe4096;
-            kexch_name0 = "ffdhe4096";
-            break;
-        case 10:
-            kexch_alg = NID_ffdhe6144;
-            kexch_name0 = "ffdhe6144";
-            break;
-        case 11:
-            kexch_alg = NID_ffdhe8192;
-            kexch_name0 = "ffdhe8192";
-            break;
-# endif
-# ifndef OPENSSL_NO_ML_KEM
-#  if !defined(OPENSSL_NO_TLS1_2)
-        case 19:
-            max_version = TLS1_2_VERSION;
-#   if !defined(OPENSSL_NO_EC)
-            /* Set at least one EC group so the handshake completes */
-            kexch_names = "MLKEM512:MLKEM768:MLKEM1024:secp256r1";
-#   elif !defined(OPENSSL_NO_DH)
+#ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_TLS1_2
+    case 21:
+        max_version = TLS1_2_VERSION;
+#endif
+        /* Fall through */
+    case 0:
+        kexch_groups = ecdhe_kexch_groups;
+        kexch_groups_size = OSSL_NELEM(ecdhe_kexch_groups);
+        kexch_name0 = "secp256r1";
+        break;
+    case 1:
+        kexch_alg = NID_X9_62_prime256v1;
+        kexch_name0 = "secp256r1";
+        break;
+    case 2:
+        kexch_alg = NID_secp384r1;
+        kexch_name0 = "secp384r1";
+        break;
+    case 3:
+        kexch_alg = NID_secp521r1;
+        kexch_name0 = "secp521r1";
+        break;
+#ifndef OPENSSL_NO_ECX
+    case 4:
+        if (is_fips)
+            return TEST_skip("X25519 might not be supported by fips provider.");
+        kexch_alg = NID_X25519;
+        kexch_name0 = "x25519";
+        break;
+    case 5:
+        if (is_fips)
+            return TEST_skip("X448 might not be supported by fips provider.");
+        kexch_alg = NID_X448;
+        kexch_name0 = "x448";
+        break;
+#endif
+#endif
+#ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_TLS1_2
+    case 20:
+        max_version = TLS1_2_VERSION;
+        kexch_name0 = "ffdhe2048";
+#endif
+        /* Fall through */
+    case 6:
+        kexch_groups = ffdhe_kexch_groups;
+        kexch_groups_size = OSSL_NELEM(ffdhe_kexch_groups);
+        kexch_name0 = "ffdhe2048";
+        break;
+    case 7:
+        kexch_alg = NID_ffdhe2048;
+        kexch_name0 = "ffdhe2048";
+        break;
+    case 8:
+        kexch_alg = NID_ffdhe3072;
+        kexch_name0 = "ffdhe3072";
+        break;
+    case 9:
+        kexch_alg = NID_ffdhe4096;
+        kexch_name0 = "ffdhe4096";
+        break;
+    case 10:
+        kexch_alg = NID_ffdhe6144;
+        kexch_name0 = "ffdhe6144";
+        break;
+    case 11:
+        kexch_alg = NID_ffdhe8192;
+        kexch_name0 = "ffdhe8192";
+        break;
+#endif
+#ifndef OPENSSL_NO_ML_KEM
+#if !defined(OPENSSL_NO_TLS1_2)
+    case 19:
+        max_version = TLS1_2_VERSION;
+#if !defined(OPENSSL_NO_EC)
+        /* Set at least one EC group so the handshake completes */
+        kexch_names = "MLKEM512:MLKEM768:MLKEM1024:secp256r1";
+#elif !defined(OPENSSL_NO_DH)
+        kexch_names = "MLKEM512:MLKEM768:MLKEM1024";
+#else
+        /* With neither EC nor DH TLS 1.2 can't happen */
+        return 1;
+#endif
+#endif
+        /* Fall through */
+    case 12:
+        kexch_groups = NULL;
+        if (kexch_names == NULL)
             kexch_names = "MLKEM512:MLKEM768:MLKEM1024";
-#   else
-            /* With neither EC nor DH TLS 1.2 can't happen */
-            return 1;
-#   endif
-#  endif
-            /* Fall through */
-        case 12:
-            kexch_groups = NULL;
-            if (kexch_names == NULL)
-                kexch_names = "MLKEM512:MLKEM768:MLKEM1024";
-            kexch_name0 = "MLKEM512";
-            break;
-        case 13:
-            kexch_groups = NULL;
-            kexch_name0 = "MLKEM512";
-            kexch_names = kexch_name0;
-            break;
-        case 14:
-            kexch_groups = NULL;
-            kexch_name0 = "MLKEM768";
-            kexch_names = kexch_name0;
-            break;
-        case 15:
-            kexch_groups = NULL;
-            kexch_name0 = "MLKEM1024";
-            kexch_names = kexch_name0;
-            break;
-#  ifndef OPENSSL_NO_EC
-#   ifndef OPENSSL_NO_ECX
-        case 16:
-            kexch_groups = NULL;
-            kexch_name0 = "X25519MLKEM768";
-            kexch_names = kexch_name0;
-            break;
-#   endif
-        case 17:
-            kexch_groups = NULL;
-            kexch_name0 = "SecP256r1MLKEM768";
-            kexch_names = kexch_name0;
-            break;
-        case 18:
-            kexch_groups = NULL;
-            kexch_name0 = "SecP384r1MLKEM1024";
-            kexch_names = kexch_name0;
-            break;
-#  endif
-# endif
-        default:
-            /* We're skipping this test */
-            return 1;
+        kexch_name0 = "MLKEM512";
+        break;
+    case 13:
+        kexch_groups = NULL;
+        kexch_name0 = "MLKEM512";
+        kexch_names = kexch_name0;
+        break;
+    case 14:
+        kexch_groups = NULL;
+        kexch_name0 = "MLKEM768";
+        kexch_names = kexch_name0;
+        break;
+    case 15:
+        kexch_groups = NULL;
+        kexch_name0 = "MLKEM1024";
+        kexch_names = kexch_name0;
+        break;
+#ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_ECX
+    case 16:
+        kexch_groups = NULL;
+        kexch_name0 = "X25519MLKEM768";
+        kexch_names = kexch_name0;
+        break;
+#endif
+    case 17:
+        kexch_groups = NULL;
+        kexch_name0 = "SecP256r1MLKEM768";
+        kexch_names = kexch_name0;
+        break;
+    case 18:
+        kexch_groups = NULL;
+        kexch_name0 = "SecP384r1MLKEM1024";
+        kexch_names = kexch_name0;
+        break;
+#endif
+#endif
+    default:
+        /* We're skipping this test */
+        return 1;
     }
 
     if (is_fips && fips_provider_version_lt(libctx, 3, 5, 0)
-            && idx >= 12 && idx <= 19)
+        && idx >= 12 && idx <= 19)
         return TEST_skip("ML-KEM not supported in this version of fips provider");
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION,
-                                       max_version, &sctx, &cctx, cert,
-                                       privkey)))
+            TLS_client_method(), TLS1_VERSION,
+            max_version, &sctx, &cctx, cert,
+            privkey)))
         goto end;
 
     if (!TEST_true(SSL_CTX_set_ciphersuites(sctx,
-                   TLS1_3_RFC_AES_128_GCM_SHA256)))
+            TLS1_3_RFC_AES_128_GCM_SHA256)))
         goto end;
 
     if (!TEST_true(SSL_CTX_set_ciphersuites(cctx,
-                   TLS1_3_RFC_AES_128_GCM_SHA256)))
+            TLS1_3_RFC_AES_128_GCM_SHA256)))
         goto end;
 
     if (!TEST_true(SSL_CTX_set_cipher_list(sctx,
-                   TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 ":"
-                   TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256))
-            || !TEST_true(SSL_CTX_set_dh_auto(sctx, 1)))
+            TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 ":" TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256))
+        || !TEST_true(SSL_CTX_set_dh_auto(sctx, 1)))
         goto end;
 
     /*
      * Must include an EC ciphersuite so that we send supported groups in
      * TLSv1.2
      */
-# ifndef OPENSSL_NO_TLS1_2
+#ifndef OPENSSL_NO_TLS1_2
     if (!TEST_true(SSL_CTX_set_cipher_list(cctx,
-                   TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 ":"
-                   TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256)))
+            TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 ":" TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256)))
         goto end;
-# endif
+#endif
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (kexch_groups != NULL) {
@@ -5175,12 +5177,12 @@ static int test_key_exchange(int idx)
     shared_group0 = SSL_get_shared_group(serverssl, 0);
     switch (idx) {
     case 19:
-# if !defined(OPENSSL_NO_EC)
+#if !defined(OPENSSL_NO_EC)
         /* MLKEM + TLS 1.2 and no DH => "secp526r1" */
         if (!TEST_int_eq(shared_group0, NID_X9_62_prime256v1))
             goto end;
         break;
-# endif
+#endif
         /* Fall through */
     case 20:
         if (!TEST_int_eq(shared_group0, 0))
@@ -5191,7 +5193,7 @@ static int test_key_exchange(int idx)
             && !TEST_int_eq(shared_group0, kexch_groups[0]))
             goto end;
         if (!TEST_str_eq(SSL_group_to_name(serverssl, shared_group0),
-                         kexch_name0))
+                kexch_name0))
             goto end;
         if (!TEST_str_eq(SSL_get0_group_name(serverssl), kexch_name0)
             || !TEST_str_eq(SSL_get0_group_name(clientssl), kexch_name0))
@@ -5204,7 +5206,7 @@ static int test_key_exchange(int idx)
     }
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -5212,11 +5214,11 @@ static int test_key_exchange(int idx)
     return testresult;
 }
 
-# if !defined(OPENSSL_NO_TLS1_2) \
-     && !defined(OPENSSL_NO_EC)  \
-     && !defined(OPENSSL_NO_DH)
+#if !defined(OPENSSL_NO_TLS1_2) \
+    && !defined(OPENSSL_NO_EC)  \
+    && !defined(OPENSSL_NO_DH)
 static int set_ssl_groups(SSL *serverssl, SSL *clientssl, int clientmulti,
-                          int isecdhe, int idx)
+    int isecdhe, int idx)
 {
     int kexch_alg;
     int *kexch_groups = &kexch_alg;
@@ -5234,11 +5236,11 @@ static int set_ssl_groups(SSL *serverssl, SSL *clientssl, int clientmulti,
             return 0;
         if (isecdhe) {
             if (!TEST_true(SSL_set1_groups(clientssl, ecdhe_kexch_groups,
-                                           numec)))
+                    numec)))
                 return 0;
         } else {
             if (!TEST_true(SSL_set1_groups(clientssl, ffdhe_kexch_groups,
-                                           numff)))
+                    numff)))
                 return 0;
         }
     } else {
@@ -5246,11 +5248,11 @@ static int set_ssl_groups(SSL *serverssl, SSL *clientssl, int clientmulti,
             return 0;
         if (isecdhe) {
             if (!TEST_true(SSL_set1_groups(serverssl, ecdhe_kexch_groups,
-                                           numec)))
+                    numec)))
                 return 0;
         } else {
             if (!TEST_true(SSL_set1_groups(serverssl, ffdhe_kexch_groups,
-                                           numff)))
+                    numff)))
                 return 0;
         }
     }
@@ -5319,9 +5321,9 @@ static int test_negotiated_group(int idx)
         max_version = TLS1_2_VERSION;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION,
-                                       max_version, &sctx, &cctx, cert,
-                                       privkey)))
+            TLS_client_method(), TLS1_VERSION,
+            max_version, &sctx, &cctx, cert,
+            privkey)))
         goto end;
 
     /*
@@ -5329,21 +5331,19 @@ static int test_negotiated_group(int idx)
      * Be sure to enable auto tmp DH so that FFDHE can succeed.
      */
     if (!TEST_true(SSL_CTX_set_cipher_list(sctx,
-                   TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 ":"
-                   TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256))
-            || !TEST_true(SSL_CTX_set_dh_auto(sctx, 1)))
+            TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 ":" TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256))
+        || !TEST_true(SSL_CTX_set_dh_auto(sctx, 1)))
         goto end;
     if (!TEST_true(SSL_CTX_set_cipher_list(cctx,
-                   TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 ":"
-                   TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256)))
+            TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 ":" TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256)))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (!TEST_true(set_ssl_groups(serverssl, clientssl, clientmulti, isecdhe,
-                                  idx)))
+            idx)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
@@ -5351,7 +5351,7 @@ static int test_negotiated_group(int idx)
 
     /* Initial handshake; always the configured one */
     if (!TEST_uint_eq(SSL_get_negotiated_group(clientssl), expectednid)
-            || !TEST_uint_eq(SSL_get_negotiated_group(serverssl), expectednid))
+        || !TEST_uint_eq(SSL_get_negotiated_group(serverssl), expectednid))
         goto end;
 
     if (!TEST_ptr((origsess = SSL_get1_session(clientssl))))
@@ -5365,19 +5365,19 @@ static int test_negotiated_group(int idx)
 
     /* First resumption attempt; use the same config as initial handshake */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, origsess))
-            || !TEST_true(set_ssl_groups(serverssl, clientssl, clientmulti,
-                                         isecdhe, idx)))
+            NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, origsess))
+        || !TEST_true(set_ssl_groups(serverssl, clientssl, clientmulti,
+            isecdhe, idx)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE))
-            || !TEST_true(SSL_session_reused(clientssl)))
+        || !TEST_true(SSL_session_reused(clientssl)))
         goto end;
 
     /* Still had better agree, since nothing changed... */
     if (!TEST_uint_eq(SSL_get_negotiated_group(clientssl), expectednid)
-            || !TEST_uint_eq(SSL_get_negotiated_group(serverssl), expectednid))
+        || !TEST_uint_eq(SSL_get_negotiated_group(serverssl), expectednid))
         goto end;
 
     SSL_shutdown(clientssl);
@@ -5411,23 +5411,23 @@ static int test_negotiated_group(int idx)
             expectednid = 0;
     }
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, origsess))
-            || !TEST_true(set_ssl_groups(serverssl, clientssl, clientmulti,
-                                         isecdhe, idx)))
+            NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, origsess))
+        || !TEST_true(set_ssl_groups(serverssl, clientssl, clientmulti,
+            isecdhe, idx)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE))
-            || !TEST_true(SSL_session_reused(clientssl)))
+        || !TEST_true(SSL_session_reused(clientssl)))
         goto end;
 
     /* Check that we get what we expected */
     if (!TEST_uint_eq(SSL_get_negotiated_group(clientssl), expectednid)
-            || !TEST_uint_eq(SSL_get_negotiated_group(serverssl), expectednid))
+        || !TEST_uint_eq(SSL_get_negotiated_group(serverssl), expectednid))
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -5435,7 +5435,7 @@ static int test_negotiated_group(int idx)
     SSL_SESSION_free(origsess);
     return testresult;
 }
-# endif /* !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_DH) */
+#endif /* !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_DH) */
 
 /*
  * Test TLSv1.3 Cipher Suite
@@ -5456,19 +5456,21 @@ static int test_tls13_ciphersuite(int idx)
         { TLS1_3_RFC_AES_128_GCM_SHA256, 1, 0 },
         { TLS1_3_RFC_AES_256_GCM_SHA384, 1, 0 },
         { TLS1_3_RFC_AES_128_CCM_SHA256, 1, 0 },
-# if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
+#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
         { TLS1_3_RFC_CHACHA20_POLY1305_SHA256, 0, 0 },
         { TLS1_3_RFC_AES_256_GCM_SHA384
-          ":" TLS1_3_RFC_CHACHA20_POLY1305_SHA256, 0, 0 },
-# endif
+            ":" TLS1_3_RFC_CHACHA20_POLY1305_SHA256,
+            0, 0 },
+#endif
         /* CCM8 ciphers are considered low security due to their short tag */
         { TLS1_3_RFC_AES_128_CCM_8_SHA256
-          ":" TLS1_3_RFC_AES_128_CCM_SHA256, 1, 1 },
-# if !defined(OPENSSL_NO_INTEGRITY_ONLY_CIPHERS)
+            ":" TLS1_3_RFC_AES_128_CCM_SHA256,
+            1, 1 },
+#if !defined(OPENSSL_NO_INTEGRITY_ONLY_CIPHERS)
         /* Integrity-only cipher do not provide any confidentiality */
         { TLS1_3_RFC_SHA256_SHA256, 0, 1 },
         { TLS1_3_RFC_SHA384_SHA384, 0, 1 }
-# endif
+#endif
     };
     const char *t13_cipher = NULL;
     const char *t12_cipher = NULL;
@@ -5481,35 +5483,35 @@ static int test_tls13_ciphersuite(int idx)
     size_t i;
 
     switch (idx) {
-        case 0:
-            set_at_ctx = 1;
-            break;
-        case 1:
-            set_at_ssl = 1;
-            break;
-        case 2:
-            set_at_ctx = 1;
-            t12_cipher = TLS1_TXT_RSA_WITH_AES_128_SHA256;
-            break;
-        case 3:
-            set_at_ssl = 1;
-            t12_cipher = TLS1_TXT_RSA_WITH_AES_128_SHA256;
-            break;
+    case 0:
+        set_at_ctx = 1;
+        break;
+    case 1:
+        set_at_ssl = 1;
+        break;
+    case 2:
+        set_at_ctx = 1;
+        t12_cipher = TLS1_TXT_RSA_WITH_AES_128_SHA256;
+        break;
+    case 3:
+        set_at_ssl = 1;
+        t12_cipher = TLS1_TXT_RSA_WITH_AES_128_SHA256;
+        break;
     }
 
     for (max_ver = TLS1_2_VERSION; max_ver <= TLS1_3_VERSION; max_ver++) {
-# ifdef OPENSSL_NO_TLS1_2
+#ifdef OPENSSL_NO_TLS1_2
         if (max_ver == TLS1_2_VERSION)
             continue;
-# endif
+#endif
         for (i = 0; i < OSSL_NELEM(t13_ciphers); i++) {
             if (is_fips && !t13_ciphers[i].fipscapable)
                 continue;
             t13_cipher = t13_ciphers[i].ciphername;
             if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                               TLS_client_method(),
-                                               TLS1_VERSION, max_ver,
-                                               &sctx, &cctx, cert, privkey)))
+                    TLS_client_method(),
+                    TLS1_VERSION, max_ver,
+                    &sctx, &cctx, cert, privkey)))
                 goto end;
 
             if (t13_ciphers[i].low_security) {
@@ -5524,13 +5526,13 @@ static int test_tls13_ciphersuite(int idx)
                 if (t12_cipher != NULL) {
                     if (!TEST_true(SSL_CTX_set_cipher_list(sctx, t12_cipher))
                         || !TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                                              t12_cipher)))
+                            t12_cipher)))
                         goto end;
                 }
             }
 
             if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                              &clientssl, NULL, NULL)))
+                    &clientssl, NULL, NULL)))
                 goto end;
 
             if (set_at_ssl) {
@@ -5540,19 +5542,19 @@ static int test_tls13_ciphersuite(int idx)
                 if (t12_cipher != NULL) {
                     if (!TEST_true(SSL_set_cipher_list(serverssl, t12_cipher))
                         || !TEST_true(SSL_set_cipher_list(clientssl,
-                                                          t12_cipher)))
+                            t12_cipher)))
                         goto end;
                 }
             }
 
             if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                 SSL_ERROR_NONE)))
+                    SSL_ERROR_NONE)))
                 goto end;
 
             negotiated_scipher = SSL_CIPHER_get_name(SSL_get_current_cipher(
-                                                                 serverssl));
+                serverssl));
             negotiated_ccipher = SSL_CIPHER_get_name(SSL_get_current_cipher(
-                                                                 clientssl));
+                clientssl));
             if (!TEST_str_eq(negotiated_scipher, negotiated_ccipher))
                 goto end;
 
@@ -5562,15 +5564,15 @@ static int test_tls13_ciphersuite(int idx)
              */
             if (max_ver == TLS1_3_VERSION
                 && !TEST_strn_eq(t13_cipher, negotiated_scipher,
-                                 strlen(negotiated_scipher)))
+                    strlen(negotiated_scipher)))
                 goto end;
 
-# ifndef OPENSSL_NO_TLS1_2
+#ifndef OPENSSL_NO_TLS1_2
             /* Below validation is not done when t12_cipher is NULL */
             if (max_ver == TLS1_2_VERSION && t12_cipher != NULL
                 && !TEST_str_eq(t12_cipher, negotiated_scipher))
                 goto end;
-# endif
+#endif
 
             SSL_free(serverssl);
             serverssl = NULL;
@@ -5584,7 +5586,7 @@ static int test_tls13_ciphersuite(int idx)
     }
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -5613,9 +5615,9 @@ static int test_tls13_psk(int idx)
     int testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, idx == 3 ? NULL : cert,
-                                       idx == 3 ? NULL : privkey)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, idx == 3 ? NULL : cert,
+            idx == 3 ? NULL : privkey)))
         goto end;
 
     if (idx != 3) {
@@ -5626,7 +5628,7 @@ static int test_tls13_psk(int idx)
          * prefer SHA256 automatically.
          */
         if (!TEST_true(SSL_CTX_set_ciphersuites(cctx,
-                                                "TLS_AES_128_GCM_SHA256")))
+                "TLS_AES_128_GCM_SHA256")))
             goto end;
     } else {
         /*
@@ -5635,8 +5637,8 @@ static int test_tls13_psk(int idx)
          * code works even if we are testing with only the FIPS provider loaded.
          */
         if (!TEST_true(SSL_CTX_set_ciphersuites(cctx,
-                                                "TLS_AES_256_GCM_SHA384:"
-                                                "TLS_AES_128_GCM_SHA256")))
+                "TLS_AES_256_GCM_SHA384:"
+                "TLS_AES_128_GCM_SHA256")))
             goto end;
     }
 
@@ -5667,28 +5669,28 @@ static int test_tls13_psk(int idx)
          * PSK
          */
         if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                                 NULL, NULL))
-                || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                    SSL_ERROR_NONE))
-                || !TEST_false(SSL_session_reused(clientssl))
-                || !TEST_false(SSL_session_reused(serverssl)))
+                NULL, NULL))
+            || !TEST_true(create_ssl_connection(serverssl, clientssl,
+                SSL_ERROR_NONE))
+            || !TEST_false(SSL_session_reused(clientssl))
+            || !TEST_false(SSL_session_reused(serverssl)))
             goto end;
 
         if (idx == 0 || idx == 1) {
             if (!TEST_true(use_session_cb_cnt == 1)
-                    || !TEST_true(find_session_cb_cnt == 0)
-                       /*
-                        * If no old style callback then below should be 0
-                        * otherwise 1
-                        */
-                    || !TEST_true(psk_client_cb_cnt == idx)
-                    || !TEST_true(psk_server_cb_cnt == 0))
+                || !TEST_true(find_session_cb_cnt == 0)
+                /*
+                 * If no old style callback then below should be 0
+                 * otherwise 1
+                 */
+                || !TEST_true(psk_client_cb_cnt == idx)
+                || !TEST_true(psk_server_cb_cnt == 0))
                 goto end;
         } else {
             if (!TEST_true(use_session_cb_cnt == 0)
-                    || !TEST_true(find_session_cb_cnt == 0)
-                    || !TEST_true(psk_client_cb_cnt == 1)
-                    || !TEST_true(psk_server_cb_cnt == 0))
+                || !TEST_true(find_session_cb_cnt == 0)
+                || !TEST_true(psk_client_cb_cnt == 1)
+                || !TEST_true(psk_server_cb_cnt == 0))
                 goto end;
         }
 
@@ -5698,40 +5700,40 @@ static int test_tls13_psk(int idx)
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     /* Create the PSK */
     cipher = SSL_CIPHER_find(clientssl, TLS13_AES_128_GCM_SHA256_BYTES);
     clientpsk = SSL_SESSION_new();
     if (!TEST_ptr(clientpsk)
-            || !TEST_ptr(cipher)
-            || !TEST_true(SSL_SESSION_set1_master_key(clientpsk, key,
-                                                      sizeof(key)))
-            || !TEST_true(SSL_SESSION_set_cipher(clientpsk, cipher))
-            || !TEST_true(SSL_SESSION_set_protocol_version(clientpsk,
-                                                           TLS1_3_VERSION))
-            || !TEST_true(SSL_SESSION_up_ref(clientpsk)))
+        || !TEST_ptr(cipher)
+        || !TEST_true(SSL_SESSION_set1_master_key(clientpsk, key,
+            sizeof(key)))
+        || !TEST_true(SSL_SESSION_set_cipher(clientpsk, cipher))
+        || !TEST_true(SSL_SESSION_set_protocol_version(clientpsk,
+            TLS1_3_VERSION))
+        || !TEST_true(SSL_SESSION_up_ref(clientpsk)))
         goto end;
     serverpsk = clientpsk;
 
     /* Check we can create a connection and the PSK is used */
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE))
-            || !TEST_true(SSL_session_reused(clientssl))
-            || !TEST_true(SSL_session_reused(serverssl)))
+        || !TEST_true(SSL_session_reused(clientssl))
+        || !TEST_true(SSL_session_reused(serverssl)))
         goto end;
 
     if (idx == 0 || idx == 1) {
         if (!TEST_true(use_session_cb_cnt == 1)
-                || !TEST_true(find_session_cb_cnt == 1)
-                || !TEST_true(psk_client_cb_cnt == 0)
-                || !TEST_true(psk_server_cb_cnt == 0))
+            || !TEST_true(find_session_cb_cnt == 1)
+            || !TEST_true(psk_client_cb_cnt == 0)
+            || !TEST_true(psk_server_cb_cnt == 0))
             goto end;
     } else {
         if (!TEST_true(use_session_cb_cnt == 0)
-                || !TEST_true(find_session_cb_cnt == 0)
-                || !TEST_true(psk_client_cb_cnt == 1)
-                || !TEST_true(psk_server_cb_cnt == 1))
+            || !TEST_true(find_session_cb_cnt == 0)
+            || !TEST_true(psk_client_cb_cnt == 1)
+            || !TEST_true(psk_server_cb_cnt == 1))
             goto end;
     }
 
@@ -5741,7 +5743,7 @@ static int test_tls13_psk(int idx)
     psk_client_cb_cnt = psk_server_cb_cnt = 0;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     /* Force an HRR */
@@ -5758,21 +5760,21 @@ static int test_tls13_psk(int idx)
      * called twice.
      */
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE))
-            || !TEST_true(SSL_session_reused(clientssl))
-            || !TEST_true(SSL_session_reused(serverssl)))
+        || !TEST_true(SSL_session_reused(clientssl))
+        || !TEST_true(SSL_session_reused(serverssl)))
         goto end;
 
     if (idx == 0 || idx == 1) {
         if (!TEST_true(use_session_cb_cnt == 2)
-                || !TEST_true(find_session_cb_cnt == 2)
-                || !TEST_true(psk_client_cb_cnt == 0)
-                || !TEST_true(psk_server_cb_cnt == 0))
+            || !TEST_true(find_session_cb_cnt == 2)
+            || !TEST_true(psk_client_cb_cnt == 0)
+            || !TEST_true(psk_server_cb_cnt == 0))
             goto end;
     } else {
         if (!TEST_true(use_session_cb_cnt == 0)
-                || !TEST_true(find_session_cb_cnt == 0)
-                || !TEST_true(psk_client_cb_cnt == 2)
-                || !TEST_true(psk_server_cb_cnt == 2))
+            || !TEST_true(find_session_cb_cnt == 0)
+            || !TEST_true(psk_client_cb_cnt == 2)
+            || !TEST_true(psk_server_cb_cnt == 2))
             goto end;
     }
 
@@ -5788,28 +5790,28 @@ static int test_tls13_psk(int idx)
          */
         srvid = "Dummy Identity";
         if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                                 NULL, NULL))
-                || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                    SSL_ERROR_NONE))
-                || !TEST_false(SSL_session_reused(clientssl))
-                || !TEST_false(SSL_session_reused(serverssl)))
+                NULL, NULL))
+            || !TEST_true(create_ssl_connection(serverssl, clientssl,
+                SSL_ERROR_NONE))
+            || !TEST_false(SSL_session_reused(clientssl))
+            || !TEST_false(SSL_session_reused(serverssl)))
             goto end;
 
         if (idx == 0 || idx == 1) {
             if (!TEST_true(use_session_cb_cnt == 1)
-                    || !TEST_true(find_session_cb_cnt == 1)
-                    || !TEST_true(psk_client_cb_cnt == 0)
-                       /*
-                        * If no old style callback then below should be 0
-                        * otherwise 1
-                        */
-                    || !TEST_true(psk_server_cb_cnt == idx))
+                || !TEST_true(find_session_cb_cnt == 1)
+                || !TEST_true(psk_client_cb_cnt == 0)
+                /*
+                 * If no old style callback then below should be 0
+                 * otherwise 1
+                 */
+                || !TEST_true(psk_server_cb_cnt == idx))
                 goto end;
         } else {
             if (!TEST_true(use_session_cb_cnt == 0)
-                    || !TEST_true(find_session_cb_cnt == 0)
-                    || !TEST_true(psk_client_cb_cnt == 1)
-                    || !TEST_true(psk_server_cb_cnt == 1))
+                || !TEST_true(find_session_cb_cnt == 0)
+                || !TEST_true(psk_client_cb_cnt == 1)
+                || !TEST_true(psk_server_cb_cnt == 1))
                 goto end;
         }
 
@@ -5818,7 +5820,7 @@ static int test_tls13_psk(int idx)
     }
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(clientpsk);
     SSL_SESSION_free(serverpsk);
     clientpsk = serverpsk = NULL;
@@ -5853,22 +5855,21 @@ static int test_tls13_no_dhe_kex(const int idx)
     int client_allow_no_dhe = (idx & 4) != 0;
 
     uint64_t server_options = 0
-            | (server_allow_no_dhe ? SSL_OP_ALLOW_NO_DHE_KEX : 0)
-            | (server_prefer_no_dhe ? SSL_OP_PREFER_NO_DHE_KEX : 0);
+        | (server_allow_no_dhe ? SSL_OP_ALLOW_NO_DHE_KEX : 0)
+        | (server_prefer_no_dhe ? SSL_OP_PREFER_NO_DHE_KEX : 0);
 
     uint64_t client_options = 0
-            | (client_allow_no_dhe ? SSL_OP_ALLOW_NO_DHE_KEX : 0);
+        | (client_allow_no_dhe ? SSL_OP_ALLOW_NO_DHE_KEX : 0);
 
     new_called = 0;
     do_cache = 1;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_3_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_3_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
-    SSL_CTX_set_session_cache_mode(cctx, SSL_SESS_CACHE_CLIENT
-                                          | SSL_SESS_CACHE_NO_INTERNAL_STORE);
+    SSL_CTX_set_session_cache_mode(cctx, SSL_SESS_CACHE_CLIENT | SSL_SESS_CACHE_NO_INTERNAL_STORE);
 
     SSL_CTX_set_options(sctx, server_options);
     SSL_CTX_set_options(cctx, client_options);
@@ -5876,13 +5877,13 @@ static int test_tls13_no_dhe_kex(const int idx)
     SSL_CTX_sess_set_new_cb(cctx, new_cachesession_cb);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                         SSL_ERROR_NONE))
-            /* Check we got the number of tickets we were expecting */
-            || !TEST_int_eq(2, new_called))
+            SSL_ERROR_NONE))
+        /* Check we got the number of tickets we were expecting */
+        || !TEST_int_eq(2, new_called))
         goto end;
 
     /* We'll reuse the last ticket. */
@@ -5902,19 +5903,19 @@ static int test_tls13_no_dhe_kex(const int idx)
 
     /* The server context already exists, so we only create the client. */
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_3_VERSION, 0,
-                                       NULL, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_3_VERSION, 0,
+            NULL, &cctx, cert, privkey)))
         goto end;
 
     SSL_CTX_set_options(cctx, client_options);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, saved_session)))
+            &clientssl, NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, saved_session)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                         SSL_ERROR_NONE)))
+            SSL_ERROR_NONE)))
         goto end;
 
     /*
@@ -5928,7 +5929,7 @@ static int test_tls13_no_dhe_kex(const int idx)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     for (j = 0; j < OSSL_NELEM(sesscache); j++) {
@@ -5945,7 +5946,7 @@ static int test_tls13_no_dhe_kex(const int idx)
 static unsigned char cookie_magic_value[] = "cookie magic";
 
 static int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
-                                    unsigned int *cookie_len)
+    unsigned int *cookie_len)
 {
     /*
      * Not suitable as a real cookie generation function but good enough for
@@ -5958,7 +5959,7 @@ static int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
 }
 
 static int verify_cookie_callback(SSL *ssl, const unsigned char *cookie,
-                                  unsigned int cookie_len)
+    unsigned int cookie_len)
 {
     if (cookie_len == sizeof(cookie_magic_value) - 1
         && memcmp(cookie, cookie_magic_value, cookie_len) == 0)
@@ -5968,7 +5969,7 @@ static int verify_cookie_callback(SSL *ssl, const unsigned char *cookie,
 }
 
 static int generate_stateless_cookie_callback(SSL *ssl, unsigned char *cookie,
-                                        size_t *cookie_len)
+    size_t *cookie_len)
 {
     unsigned int temp;
     int res = generate_cookie_callback(ssl, cookie, &temp);
@@ -5977,7 +5978,7 @@ static int generate_stateless_cookie_callback(SSL *ssl, unsigned char *cookie,
 }
 
 static int verify_stateless_cookie_callback(SSL *ssl, const unsigned char *cookie,
-                                      size_t cookie_len)
+    size_t cookie_len)
 {
     return verify_cookie_callback(ssl, cookie, cookie_len);
 }
@@ -5989,23 +5990,23 @@ static int test_stateless(void)
     int testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     /* The arrival of CCS messages can confuse the test */
     SSL_CTX_clear_options(cctx, SSL_OP_ENABLE_MIDDLEBOX_COMPAT);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL))
-               /* Send the first ClientHello */
-            || !TEST_false(create_ssl_connection(serverssl, clientssl,
-                                                 SSL_ERROR_WANT_READ))
-               /*
-                * This should fail with a -1 return because we have no callbacks
-                * set up
-                */
-            || !TEST_int_eq(SSL_stateless(serverssl), -1))
+            NULL, NULL))
+        /* Send the first ClientHello */
+        || !TEST_false(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_WANT_READ))
+        /*
+         * This should fail with a -1 return because we have no callbacks
+         * set up
+         */
+        || !TEST_int_eq(SSL_stateless(serverssl), -1))
         goto end;
 
     /* Fatal error so abandon the connection from this client */
@@ -6021,12 +6022,12 @@ static int test_stateless(void)
      * object).
      */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-               /* Send the first ClientHello */
-            || !TEST_false(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_WANT_READ))
-               /* This should fail because there is no cookie */
-            || !TEST_int_eq(SSL_stateless(serverssl), 0))
+            NULL, NULL))
+        /* Send the first ClientHello */
+        || !TEST_false(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_WANT_READ))
+        /* This should fail because there is no cookie */
+        || !TEST_int_eq(SSL_stateless(serverssl), 0))
         goto end;
 
     /* Abandon the connection from this client */
@@ -6038,33 +6039,32 @@ static int test_stateless(void)
      * object
      */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-               /* Send the first ClientHello */
-            || !TEST_false(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_WANT_READ))
-               /* This should fail because there is no cookie */
-            || !TEST_int_eq(SSL_stateless(serverssl), 0)
-               /* Send the second ClientHello */
-            || !TEST_false(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_WANT_READ))
-               /* This should succeed because a cookie is now present */
-            || !TEST_int_eq(SSL_stateless(serverssl), 1)
-               /* Complete the connection */
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            NULL, NULL))
+        /* Send the first ClientHello */
+        || !TEST_false(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_WANT_READ))
+        /* This should fail because there is no cookie */
+        || !TEST_int_eq(SSL_stateless(serverssl), 0)
+        /* Send the second ClientHello */
+        || !TEST_false(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_WANT_READ))
+        /* This should succeed because a cookie is now present */
+        || !TEST_int_eq(SSL_stateless(serverssl), 1)
+        /* Complete the connection */
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     shutdown_ssl_connection(serverssl, clientssl);
     serverssl = clientssl = NULL;
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
     SSL_CTX_free(cctx);
     return testresult;
-
 }
 #endif /* OSSL_NO_USABLE_TLS1_3 */
 
@@ -6078,10 +6078,10 @@ static int srvaddnewcb = 0;
 static int srvparsenewcb = 0;
 static int snicb = 0;
 
-#define TEST_EXT_TYPE1  0xff00
+#define TEST_EXT_TYPE1 0xff00
 
 static int old_add_cb(SSL *s, unsigned int ext_type, const unsigned char **out,
-                      size_t *outlen, int *al, void *add_arg)
+    size_t *outlen, int *al, void *add_arg)
 {
     int *server = (int *)add_arg;
     unsigned char *data;
@@ -6092,7 +6092,7 @@ static int old_add_cb(SSL *s, unsigned int ext_type, const unsigned char **out,
         clntaddoldcb++;
 
     if (*server != SSL_is_server(s)
-            || (data = OPENSSL_malloc(sizeof(*data))) == NULL)
+        || (data = OPENSSL_malloc(sizeof(*data))) == NULL)
         return -1;
 
     *data = 1;
@@ -6102,13 +6102,13 @@ static int old_add_cb(SSL *s, unsigned int ext_type, const unsigned char **out,
 }
 
 static void old_free_cb(SSL *s, unsigned int ext_type, const unsigned char *out,
-                        void *add_arg)
+    void *add_arg)
 {
     OPENSSL_free((unsigned char *)out);
 }
 
 static int old_parse_cb(SSL *s, unsigned int ext_type, const unsigned char *in,
-                        size_t inlen, int *al, void *parse_arg)
+    size_t inlen, int *al, void *parse_arg)
 {
     int *server = (int *)parse_arg;
 
@@ -6118,16 +6118,16 @@ static int old_parse_cb(SSL *s, unsigned int ext_type, const unsigned char *in,
         clntparseoldcb++;
 
     if (*server != SSL_is_server(s)
-            || inlen != sizeof(char)
-            || *in != 1)
+        || inlen != sizeof(char)
+        || *in != 1)
         return -1;
 
     return 1;
 }
 
 static int new_add_cb(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)
+    const unsigned char **out, size_t *outlen, X509 *x,
+    size_t chainidx, int *al, void *add_arg)
 {
     int *server = (int *)add_arg;
     unsigned char *data;
@@ -6138,7 +6138,7 @@ static int new_add_cb(SSL *s, unsigned int ext_type, unsigned int context,
         clntaddnewcb++;
 
     if (*server != SSL_is_server(s)
-            || (data = OPENSSL_malloc(sizeof(*data))) == NULL)
+        || (data = OPENSSL_malloc(sizeof(*data))) == NULL)
         return -1;
 
     *data = 1;
@@ -6148,14 +6148,14 @@ static int new_add_cb(SSL *s, unsigned int ext_type, unsigned int context,
 }
 
 static void new_free_cb(SSL *s, unsigned int ext_type, unsigned int context,
-                        const unsigned char *out, void *add_arg)
+    const unsigned char *out, void *add_arg)
 {
     OPENSSL_free((unsigned char *)out);
 }
 
 static int new_parse_cb(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)
+    const unsigned char *in, size_t inlen, X509 *x,
+    size_t chainidx, int *al, void *parse_arg)
 {
     int *server = (int *)parse_arg;
 
@@ -6165,7 +6165,7 @@ static int new_parse_cb(SSL *s, unsigned int ext_type, unsigned int context,
         clntparsenewcb++;
 
     if (*server != SSL_is_server(s)
-            || inlen != sizeof(char) || *in != 1)
+        || inlen != sizeof(char) || *in != 1)
         return -1;
 
     return 1;
@@ -6219,17 +6219,16 @@ static int test_custom_exts(int tst)
     snicb = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (tst == 2
-            && !TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(), NULL,
-                                              TLS1_VERSION, 0,
-                                              &sctx2, NULL, cert, privkey)))
+        && !TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(), NULL,
+            TLS1_VERSION, 0,
+            &sctx2, NULL, cert, privkey)))
         goto end;
 
-
     if (tst < 3) {
         SSL_CTX_set_options(cctx, SSL_OP_NO_TLSv1_3);
         SSL_CTX_set_options(sctx, SSL_OP_NO_TLSv1_3);
@@ -6239,124 +6238,126 @@ static int test_custom_exts(int tst)
 
     if (tst == 5) {
         context = SSL_EXT_TLS1_3_CERTIFICATE_REQUEST
-                  | SSL_EXT_TLS1_3_CERTIFICATE;
+            | SSL_EXT_TLS1_3_CERTIFICATE;
         SSL_CTX_set_verify(sctx,
-                           SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
-                           verify_cb);
+            SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
+            verify_cb);
         if (!TEST_int_eq(SSL_CTX_use_certificate_file(cctx, cert,
-                                                      SSL_FILETYPE_PEM), 1)
-                || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(cctx, privkey,
-                                                            SSL_FILETYPE_PEM), 1)
-                || !TEST_int_eq(SSL_CTX_check_private_key(cctx), 1))
+                             SSL_FILETYPE_PEM),
+                1)
+            || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(cctx, privkey,
+                                SSL_FILETYPE_PEM),
+                1)
+            || !TEST_int_eq(SSL_CTX_check_private_key(cctx), 1))
             goto end;
     } else if (tst == 4) {
         context = SSL_EXT_CLIENT_HELLO
-                  | SSL_EXT_TLS1_2_SERVER_HELLO
-                  | SSL_EXT_TLS1_3_SERVER_HELLO
-                  | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS
-                  | SSL_EXT_TLS1_3_CERTIFICATE
-                  | SSL_EXT_TLS1_3_NEW_SESSION_TICKET;
+            | SSL_EXT_TLS1_2_SERVER_HELLO
+            | SSL_EXT_TLS1_3_SERVER_HELLO
+            | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS
+            | SSL_EXT_TLS1_3_CERTIFICATE
+            | SSL_EXT_TLS1_3_NEW_SESSION_TICKET;
     } else {
         context = SSL_EXT_CLIENT_HELLO
-                  | SSL_EXT_TLS1_2_SERVER_HELLO
-                  | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS;
+            | SSL_EXT_TLS1_2_SERVER_HELLO
+            | SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS;
     }
 
     /* Create a client side custom extension */
     if (tst == 0) {
         if (!TEST_true(SSL_CTX_add_client_custom_ext(cctx, TEST_EXT_TYPE1,
-                                                     old_add_cb, old_free_cb,
-                                                     &client, old_parse_cb,
-                                                     &client)))
+                old_add_cb, old_free_cb,
+                &client, old_parse_cb,
+                &client)))
             goto end;
     } else {
         if (!TEST_true(SSL_CTX_add_custom_ext(cctx, TEST_EXT_TYPE1, context,
-                                              new_add_cb, new_free_cb,
-                                              &client, new_parse_cb, &client)))
+                new_add_cb, new_free_cb,
+                &client, new_parse_cb, &client)))
             goto end;
     }
 
     /* Should not be able to add duplicates */
     if (!TEST_false(SSL_CTX_add_client_custom_ext(cctx, TEST_EXT_TYPE1,
-                                                  old_add_cb, old_free_cb,
-                                                  &client, old_parse_cb,
-                                                  &client))
-            || !TEST_false(SSL_CTX_add_custom_ext(cctx, TEST_EXT_TYPE1,
-                                                  context, new_add_cb,
-                                                  new_free_cb, &client,
-                                                  new_parse_cb, &client)))
+            old_add_cb, old_free_cb,
+            &client, old_parse_cb,
+            &client))
+        || !TEST_false(SSL_CTX_add_custom_ext(cctx, TEST_EXT_TYPE1,
+            context, new_add_cb,
+            new_free_cb, &client,
+            new_parse_cb, &client)))
         goto end;
 
     /* Create a server side custom extension */
     if (tst == 0) {
         if (!TEST_true(SSL_CTX_add_server_custom_ext(sctx, TEST_EXT_TYPE1,
-                                                     old_add_cb, old_free_cb,
-                                                     &server, old_parse_cb,
-                                                     &server)))
+                old_add_cb, old_free_cb,
+                &server, old_parse_cb,
+                &server)))
             goto end;
     } else {
         if (!TEST_true(SSL_CTX_add_custom_ext(sctx, TEST_EXT_TYPE1, context,
-                                              new_add_cb, new_free_cb,
-                                              &server, new_parse_cb, &server)))
+                new_add_cb, new_free_cb,
+                &server, new_parse_cb, &server)))
             goto end;
         if (sctx2 != NULL
-                && !TEST_true(SSL_CTX_add_custom_ext(sctx2, TEST_EXT_TYPE1,
-                                                     context, new_add_cb,
-                                                     new_free_cb, &server,
-                                                     new_parse_cb, &server)))
+            && !TEST_true(SSL_CTX_add_custom_ext(sctx2, TEST_EXT_TYPE1,
+                context, new_add_cb,
+                new_free_cb, &server,
+                new_parse_cb, &server)))
             goto end;
     }
 
     /* Should not be able to add duplicates */
     if (!TEST_false(SSL_CTX_add_server_custom_ext(sctx, TEST_EXT_TYPE1,
-                                                  old_add_cb, old_free_cb,
-                                                  &server, old_parse_cb,
-                                                  &server))
-            || !TEST_false(SSL_CTX_add_custom_ext(sctx, TEST_EXT_TYPE1,
-                                                  context, new_add_cb,
-                                                  new_free_cb, &server,
-                                                  new_parse_cb, &server)))
+            old_add_cb, old_free_cb,
+            &server, old_parse_cb,
+            &server))
+        || !TEST_false(SSL_CTX_add_custom_ext(sctx, TEST_EXT_TYPE1,
+            context, new_add_cb,
+            new_free_cb, &server,
+            new_parse_cb, &server)))
         goto end;
 
     if (tst == 2) {
         /* Set up SNI */
         if (!TEST_true(SSL_CTX_set_tlsext_servername_callback(sctx, sni_cb))
-                || !TEST_true(SSL_CTX_set_tlsext_servername_arg(sctx, sctx2)))
+            || !TEST_true(SSL_CTX_set_tlsext_servername_arg(sctx, sctx2)))
             goto end;
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            &clientssl, NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     if (tst == 0) {
         if (clntaddoldcb != 1
-                || clntparseoldcb != 1
-                || srvaddoldcb != 1
-                || srvparseoldcb != 1)
+            || clntparseoldcb != 1
+            || srvaddoldcb != 1
+            || srvparseoldcb != 1)
             goto end;
     } else if (tst == 1 || tst == 2 || tst == 3) {
         if (clntaddnewcb != 1
-                || clntparsenewcb != 1
-                || srvaddnewcb != 1
-                || srvparsenewcb != 1
-                || (tst != 2 && snicb != 0)
-                || (tst == 2 && snicb != 1))
+            || clntparsenewcb != 1
+            || srvaddnewcb != 1
+            || srvparsenewcb != 1
+            || (tst != 2 && snicb != 0)
+            || (tst == 2 && snicb != 1))
             goto end;
     } else if (tst == 5) {
         if (clntaddnewcb != 1
-                || clntparsenewcb != 1
-                || srvaddnewcb != 1
-                || srvparsenewcb != 1)
+            || clntparsenewcb != 1
+            || srvaddnewcb != 1
+            || srvparsenewcb != 1)
             goto end;
     } else {
         /* In this case there 2 NewSessionTicket messages created */
         if (clntaddnewcb != 1
-                || clntparsenewcb != 5
-                || srvaddnewcb != 5
-                || srvparsenewcb != 1)
+            || clntparsenewcb != 5
+            || srvaddnewcb != 5
+            || srvparsenewcb != 1)
             goto end;
     }
 
@@ -6374,10 +6375,10 @@ static int test_custom_exts(int tst)
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, sess))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                               SSL_ERROR_NONE)))
+            NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, sess))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     /*
@@ -6388,15 +6389,15 @@ static int test_custom_exts(int tst)
      */
     if (tst == 0) {
         if (clntaddoldcb != 2
-                || clntparseoldcb != 1
-                || srvaddoldcb != 1
-                || srvparseoldcb != 1)
+            || clntparseoldcb != 1
+            || srvaddoldcb != 1
+            || srvparseoldcb != 1)
             goto end;
     } else if (tst == 1 || tst == 2 || tst == 3) {
         if (clntaddnewcb != 2
-                || clntparsenewcb != 2
-                || srvaddnewcb != 2
-                || srvparsenewcb != 2)
+            || clntparsenewcb != 2
+            || srvaddnewcb != 2
+            || srvparsenewcb != 2)
             goto end;
     } else {
         /*
@@ -6404,9 +6405,9 @@ static int test_custom_exts(int tst)
          * 2 NewSessionTickets in the initial handshake, 1 in the resumption
          */
         if (clntaddnewcb != 2
-                || clntparsenewcb != 8
-                || srvaddnewcb != 8
-                || srvparsenewcb != 2)
+            || clntparsenewcb != 8
+            || srvaddnewcb != 8
+            || srvparsenewcb != 2)
             goto end;
     }
 
@@ -6424,26 +6425,26 @@ static int test_custom_exts(int tst)
 
 #if !defined(OPENSSL_NO_TLS1_2) && !defined(OSSL_NO_USABLE_TLS1_3)
 
-#define  SYNTHV1CONTEXT     (SSL_EXT_TLS1_2_AND_BELOW_ONLY \
-                             | SSL_EXT_CLIENT_HELLO \
-                             | SSL_EXT_TLS1_2_SERVER_HELLO \
-                             | SSL_EXT_IGNORE_ON_RESUMPTION)
+#define SYNTHV1CONTEXT (SSL_EXT_TLS1_2_AND_BELOW_ONLY \
+    | SSL_EXT_CLIENT_HELLO                            \
+    | SSL_EXT_TLS1_2_SERVER_HELLO                     \
+    | SSL_EXT_IGNORE_ON_RESUMPTION)
 
 #define TLS13CONTEXT (SSL_EXT_TLS1_3_CERTIFICATE \
-                      | SSL_EXT_TLS1_2_SERVER_HELLO \
-                      | SSL_EXT_CLIENT_HELLO)
+    | SSL_EXT_TLS1_2_SERVER_HELLO                \
+    | SSL_EXT_CLIENT_HELLO)
 
 #define SERVERINFO_CUSTOM                                 \
     0x00, (char)TLSEXT_TYPE_signed_certificate_timestamp, \
-    0x00, 0x03,                                           \
-    0x04, 0x05, 0x06                                      \
+        0x00, 0x03,                                       \
+        0x04, 0x05, 0x06
 
 static const unsigned char serverinfo_custom_tls13[] = {
     0x00, 0x00, (TLS13CONTEXT >> 8) & 0xff, TLS13CONTEXT & 0xff,
     SERVERINFO_CUSTOM
 };
 static const unsigned char serverinfo_custom_v2[] = {
-    0x00, 0x00, (SYNTHV1CONTEXT >> 8) & 0xff,  SYNTHV1CONTEXT & 0xff,
+    0x00, 0x00, (SYNTHV1CONTEXT >> 8) & 0xff, SYNTHV1CONTEXT & 0xff,
     SERVERINFO_CUSTOM
 };
 static const unsigned char serverinfo_custom_v1[] = {
@@ -6454,15 +6455,15 @@ static const size_t serverinfo_custom_v2_len = sizeof(serverinfo_custom_v2);
 static const size_t serverinfo_custom_v1_len = sizeof(serverinfo_custom_v1);
 
 static int serverinfo_custom_parse_cb(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)
 {
     const size_t len = serverinfo_custom_v1_len;
     const unsigned char *si = &serverinfo_custom_v1[len - 3];
-    int *p_cb_result = (int*)parse_arg;
+    int *p_cb_result = (int *)parse_arg;
     *p_cb_result = TEST_mem_eq(in, inlen, si, 3);
     return 1;
 }
@@ -6512,16 +6513,16 @@ static int test_serverinfo_custom(const int idx)
     }
 
     if (!TEST_true(create_ssl_ctx_pair(libctx,
-                                       TLS_method(),
-                                       TLS_method(),
-                                       protocol_version,
-                                       protocol_version,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_method(),
+            TLS_method(),
+            protocol_version,
+            protocol_version,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (call_use_serverinfo_ex) {
         if (!TEST_true(SSL_CTX_use_serverinfo_ex(sctx, serverinfo_version,
-                                                 si, si_len)))
+                si, si_len)))
             goto end;
     } else {
         if (!TEST_true(SSL_CTX_use_serverinfo(sctx, si, si_len)))
@@ -6529,14 +6530,14 @@ static int test_serverinfo_custom(const int idx)
     }
 
     if (!TEST_true(SSL_CTX_add_custom_ext(cctx, TLSEXT_TYPE_signed_certificate_timestamp,
-                                          extension_context,
-                                          NULL, NULL, NULL,
-                                          serverinfo_custom_parse_cb,
-                                          &cb_result))
+            extension_context,
+            NULL, NULL, NULL,
+            serverinfo_custom_parse_cb,
+            &cb_result))
         || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                         NULL, NULL))
+            NULL, NULL))
         || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                            SSL_ERROR_NONE))
+            SSL_ERROR_NONE))
         || !TEST_int_eq(SSL_do_handshake(clientssl), 1))
         goto end;
 
@@ -6545,7 +6546,7 @@ static int test_serverinfo_custom(const int idx)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -6561,7 +6562,7 @@ static int test_serverinfo_custom(const int idx)
  * produce the same results for different protocol versions.
  */
 #define SMALL_LABEL_LEN 10
-#define LONG_LABEL_LEN  249
+#define LONG_LABEL_LEN 249
 static int test_export_key_mat(int tst)
 {
     int testresult = 0;
@@ -6603,33 +6604,32 @@ static int test_export_key_mat(int tst)
         return 1;
 #endif
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     OPENSSL_assert(tst >= 0 && (size_t)tst < OSSL_NELEM(protocols));
     SSL_CTX_set_max_proto_version(cctx, protocols[tst]);
     SSL_CTX_set_min_proto_version(cctx, protocols[tst]);
-    if ((protocols[tst] < TLS1_2_VERSION) &&
-        (!SSL_CTX_set_cipher_list(cctx, "DEFAULT:@SECLEVEL=0")
-        || !SSL_CTX_set_cipher_list(sctx, "DEFAULT:@SECLEVEL=0")))
+    if ((protocols[tst] < TLS1_2_VERSION) && (!SSL_CTX_set_cipher_list(cctx, "DEFAULT:@SECLEVEL=0") || !SSL_CTX_set_cipher_list(sctx, "DEFAULT:@SECLEVEL=0")))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL,
-                                      NULL)))
+            NULL)))
         goto end;
 
     /*
      * Premature call of SSL_export_keying_material should just fail.
      */
     if (!TEST_int_le(SSL_export_keying_material(clientssl, ckeymat1,
-                                                sizeof(ckeymat1), label,
-                                                SMALL_LABEL_LEN + 1, context,
-                                                sizeof(context) - 1, 1), 0))
+                         sizeof(ckeymat1), label,
+                         SMALL_LABEL_LEN + 1, context,
+                         sizeof(context) - 1, 1),
+            0))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                         SSL_ERROR_NONE)))
+            SSL_ERROR_NONE)))
         goto end;
 
     if (tst == 5) {
@@ -6638,9 +6638,10 @@ static int test_export_key_mat(int tst)
          * go over that.
          */
         if (!TEST_int_le(SSL_export_keying_material(clientssl, ckeymat1,
-                                                    sizeof(ckeymat1), label,
-                                                    LONG_LABEL_LEN + 1, context,
-                                                    sizeof(context) - 1, 1), 0))
+                             sizeof(ckeymat1), label,
+                             LONG_LABEL_LEN + 1, context,
+                             sizeof(context) - 1, 1),
+                0))
             goto end;
 
         testresult = 1;
@@ -6654,91 +6655,94 @@ static int test_export_key_mat(int tst)
     memset(longcontext, 1, sizeof(longcontext));
 
     if (!TEST_int_eq(SSL_export_keying_material(clientssl, ckeymat1,
-                                                sizeof(ckeymat1), label,
-                                                labellen, context,
-                                                sizeof(context) - 1, 1), 1)
-            || !TEST_int_eq(SSL_export_keying_material(clientssl, ckeymat2,
-                                                       sizeof(ckeymat2), label,
-                                                       labellen,
-                                                       emptycontext,
-                                                       0, 1), 1)
-            || !TEST_int_eq(SSL_export_keying_material(clientssl, ckeymat3,
-                                                       sizeof(ckeymat3), label,
-                                                       labellen,
-                                                       NULL, 0, 0), 1)
-            || (test_longcontext
-                && !TEST_int_eq(SSL_export_keying_material(clientssl,
-                                                           ckeymat4,
-                                                           sizeof(ckeymat4), label,
-                                                           labellen,
-                                                           longcontext,
-                                                           sizeof(longcontext), 1),
-                                1))
-            || !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat1,
-                                                       sizeof(skeymat1), label,
-                                                       labellen,
-                                                       context,
-                                                       sizeof(context) -1, 1),
-                            1)
-            || !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat2,
-                                                       sizeof(skeymat2), label,
-                                                       labellen,
-                                                       emptycontext,
-                                                       0, 1), 1)
-            || !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat3,
-                                                       sizeof(skeymat3), label,
-                                                       labellen,
-                                                       NULL, 0, 0), 1)
-            || (test_longcontext
-                && !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat4,
-                                                           sizeof(skeymat4), label,
-                                                           labellen,
-                                                           longcontext,
-                                                           sizeof(longcontext), 1),
-                                1))
-               /*
-                * Check that both sides created the same key material with the
-                * same context.
-                */
-            || !TEST_mem_eq(ckeymat1, sizeof(ckeymat1), skeymat1,
-                            sizeof(skeymat1))
-               /*
-                * Check that both sides created the same key material with an
-                * empty context.
-                */
-            || !TEST_mem_eq(ckeymat2, sizeof(ckeymat2), skeymat2,
-                            sizeof(skeymat2))
-               /*
-                * Check that both sides created the same key material without a
-                * context.
-                */
-            || !TEST_mem_eq(ckeymat3, sizeof(ckeymat3), skeymat3,
-                            sizeof(skeymat3))
-               /*
-                * Check that both sides created the same key material with a
-                * long context.
-                */
-            || (test_longcontext
-                && !TEST_mem_eq(ckeymat4, sizeof(ckeymat4), skeymat4,
-                                sizeof(skeymat4)))
-               /* Different contexts should produce different results */
-            || !TEST_mem_ne(ckeymat1, sizeof(ckeymat1), ckeymat2,
-                            sizeof(ckeymat2)))
+                         sizeof(ckeymat1), label,
+                         labellen, context,
+                         sizeof(context) - 1, 1),
+            1)
+        || !TEST_int_eq(SSL_export_keying_material(clientssl, ckeymat2,
+                            sizeof(ckeymat2), label,
+                            labellen,
+                            emptycontext,
+                            0, 1),
+            1)
+        || !TEST_int_eq(SSL_export_keying_material(clientssl, ckeymat3,
+                            sizeof(ckeymat3), label,
+                            labellen,
+                            NULL, 0, 0),
+            1)
+        || (test_longcontext
+            && !TEST_int_eq(SSL_export_keying_material(clientssl,
+                                ckeymat4,
+                                sizeof(ckeymat4), label,
+                                labellen,
+                                longcontext,
+                                sizeof(longcontext), 1),
+                1))
+        || !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat1,
+                            sizeof(skeymat1), label,
+                            labellen,
+                            context,
+                            sizeof(context) - 1, 1),
+            1)
+        || !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat2,
+                            sizeof(skeymat2), label,
+                            labellen,
+                            emptycontext,
+                            0, 1),
+            1)
+        || !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat3,
+                            sizeof(skeymat3), label,
+                            labellen,
+                            NULL, 0, 0),
+            1)
+        || (test_longcontext
+            && !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat4,
+                                sizeof(skeymat4), label,
+                                labellen,
+                                longcontext,
+                                sizeof(longcontext), 1),
+                1))
+        /*
+         * Check that both sides created the same key material with the
+         * same context.
+         */
+        || !TEST_mem_eq(ckeymat1, sizeof(ckeymat1), skeymat1,
+            sizeof(skeymat1))
+        /*
+         * Check that both sides created the same key material with an
+         * empty context.
+         */
+        || !TEST_mem_eq(ckeymat2, sizeof(ckeymat2), skeymat2,
+            sizeof(skeymat2))
+        /*
+         * Check that both sides created the same key material without a
+         * context.
+         */
+        || !TEST_mem_eq(ckeymat3, sizeof(ckeymat3), skeymat3,
+            sizeof(skeymat3))
+        /*
+         * Check that both sides created the same key material with a
+         * long context.
+         */
+        || (test_longcontext
+            && !TEST_mem_eq(ckeymat4, sizeof(ckeymat4), skeymat4,
+                sizeof(skeymat4)))
+        /* Different contexts should produce different results */
+        || !TEST_mem_ne(ckeymat1, sizeof(ckeymat1), ckeymat2,
+            sizeof(ckeymat2)))
         goto end;
 
     /*
      * Check that an empty context and no context produce different results in
      * protocols less than TLSv1.3. In TLSv1.3 they should be the same.
      */
-    if ((tst < 3 && !TEST_mem_ne(ckeymat2, sizeof(ckeymat2), ckeymat3,
-                                  sizeof(ckeymat3)))
-            || (tst >= 3 && !TEST_mem_eq(ckeymat2, sizeof(ckeymat2), ckeymat3,
-                                         sizeof(ckeymat3))))
+    if ((tst < 3 && !TEST_mem_ne(ckeymat2, sizeof(ckeymat2), ckeymat3, sizeof(ckeymat3)))
+        || (tst >= 3 && !TEST_mem_eq(ckeymat2, sizeof(ckeymat2), ckeymat3, sizeof(ckeymat3))))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx2);
@@ -6770,50 +6774,54 @@ static int test_export_key_mat_early(int idx)
     size_t readbytes, written;
 
     if (!TEST_true(setupearly_data_test(&cctx, &sctx, &clientssl, &serverssl,
-                                        &sess, idx, SHA384_DIGEST_LENGTH)))
+            &sess, idx, SHA384_DIGEST_LENGTH)))
         goto end;
 
     /* Here writing 0 length early data is enough. */
     if (!TEST_true(SSL_write_early_data(clientssl, NULL, 0, &written))
-            || !TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
-                                                &readbytes),
-                            SSL_READ_EARLY_DATA_ERROR)
-            || !TEST_int_eq(SSL_get_early_data_status(serverssl),
-                            SSL_EARLY_DATA_ACCEPTED))
+        || !TEST_int_eq(SSL_read_early_data(serverssl, buf, sizeof(buf),
+                            &readbytes),
+            SSL_READ_EARLY_DATA_ERROR)
+        || !TEST_int_eq(SSL_get_early_data_status(serverssl),
+            SSL_EARLY_DATA_ACCEPTED))
         goto end;
 
     if (!TEST_int_eq(SSL_export_keying_material_early(
-                     clientssl, ckeymat1, sizeof(ckeymat1), label,
-                     sizeof(label) - 1, context, sizeof(context) - 1), 1)
-            || !TEST_int_eq(SSL_export_keying_material_early(
+                         clientssl, ckeymat1, sizeof(ckeymat1), label,
+                         sizeof(label) - 1, context, sizeof(context) - 1),
+            1)
+        || !TEST_int_eq(SSL_export_keying_material_early(
                             clientssl, ckeymat2, sizeof(ckeymat2), label,
-                            sizeof(label) - 1, emptycontext, 0), 1)
-            || !TEST_int_eq(SSL_export_keying_material_early(
+                            sizeof(label) - 1, emptycontext, 0),
+            1)
+        || !TEST_int_eq(SSL_export_keying_material_early(
                             serverssl, skeymat1, sizeof(skeymat1), label,
-                            sizeof(label) - 1, context, sizeof(context) - 1), 1)
-            || !TEST_int_eq(SSL_export_keying_material_early(
+                            sizeof(label) - 1, context, sizeof(context) - 1),
+            1)
+        || !TEST_int_eq(SSL_export_keying_material_early(
                             serverssl, skeymat2, sizeof(skeymat2), label,
-                            sizeof(label) - 1, emptycontext, 0), 1)
-               /*
-                * Check that both sides created the same key material with the
-                * same context.
-                */
-            || !TEST_mem_eq(ckeymat1, sizeof(ckeymat1), skeymat1,
-                            sizeof(skeymat1))
-               /*
-                * Check that both sides created the same key material with an
-                * empty context.
-                */
-            || !TEST_mem_eq(ckeymat2, sizeof(ckeymat2), skeymat2,
-                            sizeof(skeymat2))
-               /* Different contexts should produce different results */
-            || !TEST_mem_ne(ckeymat1, sizeof(ckeymat1), ckeymat2,
-                            sizeof(ckeymat2)))
+                            sizeof(label) - 1, emptycontext, 0),
+            1)
+        /*
+         * Check that both sides created the same key material with the
+         * same context.
+         */
+        || !TEST_mem_eq(ckeymat1, sizeof(ckeymat1), skeymat1,
+            sizeof(skeymat1))
+        /*
+         * Check that both sides created the same key material with an
+         * empty context.
+         */
+        || !TEST_mem_eq(ckeymat2, sizeof(ckeymat2), skeymat2,
+            sizeof(skeymat2))
+        /* Different contexts should produce different results */
+        || !TEST_mem_ne(ckeymat1, sizeof(ckeymat1), ckeymat2,
+            sizeof(ckeymat2)))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(sess);
     SSL_SESSION_free(clientpsk);
     SSL_SESSION_free(serverpsk);
@@ -6839,42 +6847,42 @@ static int test_key_update(void)
     static char *mess = "A test message";
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_3_VERSION,
-                                       0,
-                                       &sctx, &cctx, cert, privkey))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            TLS_client_method(),
+            TLS1_3_VERSION,
+            0,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     for (j = 0; j < 2; j++) {
         /* Send lots of KeyUpdate messages */
         for (i = 0; i < NUM_KEY_UPDATE_MESSAGES; i++) {
             if (!TEST_true(SSL_key_update(clientssl,
-                                          (j == 0)
-                                          ? SSL_KEY_UPDATE_NOT_REQUESTED
-                                          : SSL_KEY_UPDATE_REQUESTED))
-                    || !TEST_true(SSL_do_handshake(clientssl)))
+                    (j == 0)
+                        ? SSL_KEY_UPDATE_NOT_REQUESTED
+                        : SSL_KEY_UPDATE_REQUESTED))
+                || !TEST_true(SSL_do_handshake(clientssl)))
                 goto end;
         }
 
         /* Check that sending and receiving app data is ok */
         if (!TEST_int_eq(SSL_write(clientssl, mess, strlen(mess)), strlen(mess))
-                || !TEST_int_eq(SSL_read(serverssl, buf, sizeof(buf)),
-                                         strlen(mess)))
+            || !TEST_int_eq(SSL_read(serverssl, buf, sizeof(buf)),
+                strlen(mess)))
             goto end;
 
         if (!TEST_int_eq(SSL_write(serverssl, mess, strlen(mess)), strlen(mess))
-                || !TEST_int_eq(SSL_read(clientssl, buf, sizeof(buf)),
-                                         strlen(mess)))
+            || !TEST_int_eq(SSL_read(clientssl, buf, sizeof(buf)),
+                strlen(mess)))
             goto end;
     }
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -6901,22 +6909,22 @@ static int test_key_update_peer_in_write(int tst)
     SSL *peerupdate = NULL, *peerwrite = NULL;
 
     if (!TEST_ptr(bretry)
-            || !TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                              TLS_client_method(),
-                                              TLS1_3_VERSION,
-                                              0,
-                                              &sctx, &cctx, cert, privkey))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+        || !TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
+            TLS_client_method(),
+            TLS1_3_VERSION,
+            0,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     peerupdate = tst == 0 ? clientssl : serverssl;
     peerwrite = tst == 0 ? serverssl : clientssl;
 
     if (!TEST_true(SSL_key_update(peerupdate, SSL_KEY_UPDATE_REQUESTED))
-            || !TEST_int_eq(SSL_do_handshake(peerupdate), 1))
+        || !TEST_int_eq(SSL_do_handshake(peerupdate), 1))
         goto end;
 
     /* Swap the writing endpoint's write BIO to force a retry */
@@ -6930,9 +6938,9 @@ static int test_key_update_peer_in_write(int tst)
 
     /* Write data that we know will fail with SSL_ERROR_WANT_WRITE */
     if (!TEST_int_eq(SSL_write(peerwrite, mess, strlen(mess)), -1)
-            || !TEST_int_eq(SSL_get_error(peerwrite, 0), SSL_ERROR_WANT_WRITE)
-            || !TEST_true(SSL_want_write(peerwrite))
-            || !TEST_true(SSL_net_write_desired(peerwrite)))
+        || !TEST_int_eq(SSL_get_error(peerwrite, 0), SSL_ERROR_WANT_WRITE)
+        || !TEST_true(SSL_want_write(peerwrite))
+        || !TEST_true(SSL_net_write_desired(peerwrite)))
         goto end;
 
     /* Reinstate the original writing endpoint's write BIO */
@@ -6941,9 +6949,9 @@ static int test_key_update_peer_in_write(int tst)
 
     /* Now read some data - we will read the key update */
     if (!TEST_int_eq(SSL_read(peerwrite, buf, sizeof(buf)), -1)
-            || !TEST_int_eq(SSL_get_error(peerwrite, 0), SSL_ERROR_WANT_READ)
-            || !TEST_true(SSL_want_read(peerwrite))
-            || !TEST_true(SSL_net_read_desired(peerwrite)))
+        || !TEST_int_eq(SSL_get_error(peerwrite, 0), SSL_ERROR_WANT_READ)
+        || !TEST_true(SSL_want_read(peerwrite))
+        || !TEST_true(SSL_net_read_desired(peerwrite)))
         goto end;
 
     /*
@@ -6951,12 +6959,12 @@ static int test_key_update_peer_in_write(int tst)
      * endpoint
      */
     if (!TEST_int_eq(SSL_write(peerwrite, mess, strlen(mess)), strlen(mess))
-            || !TEST_int_eq(SSL_read(peerupdate, buf, sizeof(buf)), strlen(mess)))
+        || !TEST_int_eq(SSL_read(peerupdate, buf, sizeof(buf)), strlen(mess)))
         goto end;
 
     /* Write more data to ensure we send the KeyUpdate message back */
     if (!TEST_int_eq(SSL_write(peerwrite, mess, strlen(mess)), strlen(mess))
-            || !TEST_int_eq(SSL_read(peerupdate, buf, sizeof(buf)), strlen(mess)))
+        || !TEST_int_eq(SSL_read(peerupdate, buf, sizeof(buf)), strlen(mess)))
         goto end;
 
     if (!TEST_false(SSL_net_read_desired(peerwrite))
@@ -6966,7 +6974,7 @@ static int test_key_update_peer_in_write(int tst)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -6989,20 +6997,20 @@ static int test_key_update_peer_in_read(int tst)
     SSL_CTX *cctx = NULL, *sctx = NULL;
     SSL *clientssl = NULL, *serverssl = NULL;
     int testresult = 0;
-    char prbuf[515], lwbuf[515] = {0};
+    char prbuf[515], lwbuf[515] = { 0 };
     static char *mess = "A test message";
     BIO *lbio = NULL, *pbio = NULL;
     SSL *local = NULL, *peer = NULL;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                              TLS_client_method(),
-                                              TLS1_3_VERSION,
-                                              0,
-                                              &sctx, &cctx, cert, privkey))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            TLS_client_method(),
+            TLS1_3_VERSION,
+            0,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     local = tst == 0 ? clientssl : serverssl;
@@ -7021,8 +7029,8 @@ static int test_key_update_peer_in_read(int tst)
      * the bio pair buffer)
      */
     if (!TEST_true(SSL_key_update(local, SSL_KEY_UPDATE_REQUESTED))
-            || !TEST_int_eq(SSL_write(local, lwbuf, sizeof(lwbuf)), -1)
-            || !TEST_int_eq(SSL_get_error(local, -1), SSL_ERROR_WANT_WRITE))
+        || !TEST_int_eq(SSL_write(local, lwbuf, sizeof(lwbuf)), -1)
+        || !TEST_int_eq(SSL_get_error(local, -1), SSL_ERROR_WANT_WRITE))
         goto end;
 
     /*
@@ -7030,7 +7038,7 @@ static int test_key_update_peer_in_read(int tst)
      * then read appdata that we know will fail with SSL_ERROR_WANT_READ
      */
     if (!TEST_int_eq(SSL_read(peer, prbuf, sizeof(prbuf)), -1)
-            || !TEST_int_eq(SSL_get_error(peer, -1), SSL_ERROR_WANT_READ))
+        || !TEST_int_eq(SSL_get_error(peer, -1), SSL_ERROR_WANT_READ))
         goto end;
 
     /* Now write some data in peer - we will write the key update */
@@ -7042,17 +7050,17 @@ static int test_key_update_peer_in_read(int tst)
      * read data in peer previously that we will complete
      */
     if (!TEST_int_eq(SSL_write(local, lwbuf, sizeof(lwbuf)), sizeof(lwbuf))
-            || !TEST_int_eq(SSL_read(peer, prbuf, sizeof(prbuf)), sizeof(prbuf)))
+        || !TEST_int_eq(SSL_read(peer, prbuf, sizeof(prbuf)), sizeof(prbuf)))
         goto end;
 
     /* check that sending and receiving appdata ok */
     if (!TEST_int_eq(SSL_write(local, mess, strlen(mess)), strlen(mess))
-            || !TEST_int_eq(SSL_read(peer, prbuf, sizeof(prbuf)), strlen(mess)))
+        || !TEST_int_eq(SSL_read(peer, prbuf, sizeof(prbuf)), strlen(mess)))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -7079,15 +7087,15 @@ static int test_key_update_local_in_write(int tst)
     SSL *local = NULL, *peer = NULL;
 
     if (!TEST_ptr(bretry)
-            || !TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                              TLS_client_method(),
-                                              TLS1_3_VERSION,
-                                              0,
-                                              &sctx, &cctx, cert, privkey))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+        || !TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
+            TLS_client_method(),
+            TLS1_3_VERSION,
+            0,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     local = tst == 0 ? clientssl : serverssl;
@@ -7104,7 +7112,7 @@ static int test_key_update_local_in_write(int tst)
 
     /* write data in local will fail with SSL_ERROR_WANT_WRITE */
     if (!TEST_int_eq(SSL_write(local, mess, strlen(mess)), -1)
-            || !TEST_int_eq(SSL_get_error(local, -1), SSL_ERROR_WANT_WRITE))
+        || !TEST_int_eq(SSL_get_error(local, -1), SSL_ERROR_WANT_WRITE))
         goto end;
 
     /* Reinstate the original writing endpoint's write BIO */
@@ -7114,7 +7122,7 @@ static int test_key_update_local_in_write(int tst)
     /* SSL_key_update will fail, because writing in local*/
     if (!TEST_false(SSL_key_update(local, SSL_KEY_UPDATE_REQUESTED))
         || !TEST_int_eq(ERR_GET_REASON(ERR_peek_error()), SSL_R_BAD_WRITE_RETRY))
-    goto end;
+        goto end;
 
     ERR_clear_error();
     /* write data in local previously that we will complete */
@@ -7136,12 +7144,12 @@ static int test_key_update_local_in_write(int tst)
 
     /* Write more peer more data to ensure we send the keyupdate message back */
     if (!TEST_int_eq(SSL_write(peer, mess, strlen(mess)), strlen(mess))
-            || !TEST_int_eq(SSL_read(local, buf, sizeof(buf)), strlen(mess)))
+        || !TEST_int_eq(SSL_read(local, buf, sizeof(buf)), strlen(mess)))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -7163,20 +7171,20 @@ static int test_key_update_local_in_read(int tst)
     SSL_CTX *cctx = NULL, *sctx = NULL;
     SSL *clientssl = NULL, *serverssl = NULL;
     int testresult = 0;
-    char lrbuf[515], pwbuf[515] = {0}, prbuf[20];
+    char lrbuf[515], pwbuf[515] = { 0 }, prbuf[20];
     static char *mess = "A test message";
     BIO *lbio = NULL, *pbio = NULL;
     SSL *local = NULL, *peer = NULL;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                              TLS_client_method(),
-                                              TLS1_3_VERSION,
-                                              0,
-                                              &sctx, &cctx, cert, privkey))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            TLS_client_method(),
+            TLS1_3_VERSION,
+            0,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     local = tst == 0 ? clientssl : serverssl;
@@ -7195,12 +7203,12 @@ static int test_key_update_local_in_read(int tst)
 
     /* read appdata in local will fail with SSL_ERROR_WANT_READ */
     if (!TEST_int_eq(SSL_read(local, lrbuf, sizeof(lrbuf)), -1)
-            || !TEST_int_eq(SSL_get_error(local, -1), SSL_ERROR_WANT_READ))
+        || !TEST_int_eq(SSL_get_error(local, -1), SSL_ERROR_WANT_READ))
         goto end;
 
     /* SSL_do_handshake will send keyupdate msg */
     if (!TEST_true(SSL_key_update(local, SSL_KEY_UPDATE_REQUESTED))
-            || !TEST_int_eq(SSL_do_handshake(local), 1))
+        || !TEST_int_eq(SSL_do_handshake(local), 1))
         goto end;
 
     /*
@@ -7219,14 +7227,14 @@ static int test_key_update_local_in_read(int tst)
         || !TEST_int_eq(SSL_read(peer, prbuf, sizeof(prbuf)), strlen(mess)))
         goto end;
 
-  /* Write more peer data to ensure we send the keyupdate message back */
+    /* Write more peer data to ensure we send the keyupdate message back */
     if (!TEST_int_eq(SSL_write(peer, mess, strlen(mess)), strlen(mess))
-            || !TEST_int_eq(SSL_read(local, lrbuf, sizeof(lrbuf)), strlen(mess)))
+        || !TEST_int_eq(SSL_read(local, lrbuf, sizeof(lrbuf)), strlen(mess)))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -7272,15 +7280,15 @@ static int test_ssl_clear(int idx)
 
     /* Create an initial connection */
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey))
-            || (tls12test
-                && !TEST_true(SSL_CTX_set_max_proto_version(cctx,
-                                                            TLS1_2_VERSION)))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                          &clientssl, NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey))
+        || (tls12test
+            && !TEST_true(SSL_CTX_set_max_proto_version(cctx,
+                TLS1_2_VERSION)))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
+            &clientssl, NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     if (servertest) {
@@ -7293,7 +7301,7 @@ static int test_ssl_clear(int idx)
 
     /* Write some data */
     if (!TEST_true(SSL_write_ex(writer, msg, strlen(msg), &written))
-            || written != strlen(msg))
+        || written != strlen(msg))
         goto end;
 
     /*
@@ -7301,7 +7309,7 @@ static int test_ssl_clear(int idx)
      * the subsequent clear/reset
      */
     if (!TEST_true(SSL_read_ex(reader, buf, sizeof(buf), &readbytes))
-            || readbytes != sizeof(buf))
+        || readbytes != sizeof(buf))
         goto end;
 
     SSL_shutdown(clientssl);
@@ -7315,18 +7323,6 @@ static int test_ssl_clear(int idx)
         } else {
             SSL_set_accept_state(serverssl);
         }
-        /*
-         * A peculiarity of SSL_clear() is that it does not clear the session.
-         * This is intended behaviour so that a client can create a new
-         * connection and reuse the session. But this doesn't make much sense
-         * on the server side - and causes incorrect behaviour due to the
-         * handshake failing (even though the documentation does say SSL_clear()
-         * is supposed to work on the server side). We clear the session
-         * explicitly - although note that the documentation for
-         * SSL_set_session() says that its only useful for clients!
-         */
-        if (!TEST_true(SSL_set_session(serverssl, NULL)))
-            goto end;
         SSL_free(clientssl);
         clientssl = NULL;
     } else {
@@ -7341,10 +7337,10 @@ static int test_ssl_clear(int idx)
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-            || !TEST_true(servertest || SSL_session_reused(clientssl)))
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE))
+        || !TEST_true(servertest || SSL_session_reused(clientssl)))
         goto end;
 
     SSL_shutdown(clientssl);
@@ -7352,7 +7348,7 @@ static int test_ssl_clear(int idx)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -7369,7 +7365,7 @@ static int get_MFL_from_client_hello(BIO *bio, int *mfl_codemfl_code)
     PACKET pkt, pkt2, pkt3;
     unsigned int MFL_code = 0, type = 0;
 
-    if (!TEST_uint_gt(len = BIO_get_mem_data(bio, (char **) &data), 0))
+    if (!TEST_uint_gt(len = BIO_get_mem_data(bio, (char **)&data), 0))
         goto end;
 
     memset(&pkt, 0, sizeof(pkt));
@@ -7377,33 +7373,32 @@ static int get_MFL_from_client_hello(BIO *bio, int *mfl_codemfl_code)
     memset(&pkt3, 0, sizeof(pkt3));
 
     if (!TEST_long_gt(len, 0)
-            || !TEST_true(PACKET_buf_init(&pkt, data, len))
-               /* Skip the record header */
-            || !PACKET_forward(&pkt, SSL3_RT_HEADER_LENGTH)
-               /* Skip the handshake message header */
-            || !TEST_true(PACKET_forward(&pkt, SSL3_HM_HEADER_LENGTH))
-               /* Skip client version and random */
-            || !TEST_true(PACKET_forward(&pkt, CLIENT_VERSION_LEN
-                                               + SSL3_RANDOM_SIZE))
-               /* Skip session id */
-            || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
-               /* Skip ciphers */
-            || !TEST_true(PACKET_get_length_prefixed_2(&pkt, &pkt2))
-               /* Skip compression */
-            || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
-               /* Extensions len */
-            || !TEST_true(PACKET_as_length_prefixed_2(&pkt, &pkt2)))
+        || !TEST_true(PACKET_buf_init(&pkt, data, len))
+        /* Skip the record header */
+        || !PACKET_forward(&pkt, SSL3_RT_HEADER_LENGTH)
+        /* Skip the handshake message header */
+        || !TEST_true(PACKET_forward(&pkt, SSL3_HM_HEADER_LENGTH))
+        /* Skip client version and random */
+        || !TEST_true(PACKET_forward(&pkt, CLIENT_VERSION_LEN + SSL3_RANDOM_SIZE))
+        /* Skip session id */
+        || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
+        /* Skip ciphers */
+        || !TEST_true(PACKET_get_length_prefixed_2(&pkt, &pkt2))
+        /* Skip compression */
+        || !TEST_true(PACKET_get_length_prefixed_1(&pkt, &pkt2))
+        /* Extensions len */
+        || !TEST_true(PACKET_as_length_prefixed_2(&pkt, &pkt2)))
         goto end;
 
     /* Loop through all extensions */
     while (PACKET_remaining(&pkt2)) {
         if (!TEST_true(PACKET_get_net_2(&pkt2, &type))
-                || !TEST_true(PACKET_get_length_prefixed_2(&pkt2, &pkt3)))
+            || !TEST_true(PACKET_get_length_prefixed_2(&pkt2, &pkt3)))
             goto end;
 
         if (type == TLSEXT_TYPE_max_fragment_length) {
             if (!TEST_uint_ne(PACKET_remaining(&pkt3), 0)
-                    || !TEST_true(PACKET_get_1(&pkt3, &MFL_code)))
+                || !TEST_true(PACKET_get_1(&pkt3, &MFL_code)))
                 goto end;
 
             *mfl_codemfl_code = MFL_code;
@@ -7411,7 +7406,7 @@ static int get_MFL_from_client_hello(BIO *bio, int *mfl_codemfl_code)
         }
     }
 
- end:
+end:
     return 0;
 }
 
@@ -7431,12 +7426,12 @@ static int test_max_fragment_len_ext(int idx_tst)
     BIO *rbio, *wbio;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, NULL, TLS_client_method(),
-                                       TLS1_VERSION, 0, NULL, &ctx, NULL,
-                                       NULL)))
+            TLS1_VERSION, 0, NULL, &ctx, NULL,
+            NULL)))
         return 0;
 
     if (!TEST_true(SSL_CTX_set_tlsext_max_fragment_length(
-                   ctx, max_fragment_len_test[idx_tst])))
+            ctx, max_fragment_len_test[idx_tst])))
         goto end;
 
     con = SSL_new(ctx);
@@ -7445,7 +7440,7 @@ static int test_max_fragment_len_ext(int idx_tst)
 
     rbio = BIO_new(BIO_s_mem());
     wbio = BIO_new(BIO_s_mem());
-    if (!TEST_ptr(rbio)|| !TEST_ptr(wbio)) {
+    if (!TEST_ptr(rbio) || !TEST_ptr(wbio)) {
         BIO_free(rbio);
         BIO_free(wbio);
         goto end;
@@ -7481,8 +7476,8 @@ static int test_pha_key_update(void)
     int testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         return 0;
 
     if (!TEST_true(SSL_CTX_set_min_proto_version(sctx, TLS1_3_VERSION))
@@ -7494,11 +7489,11 @@ static int test_pha_key_update(void)
     SSL_CTX_set_post_handshake_auth(cctx, 1);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                         SSL_ERROR_NONE)))
+            SSL_ERROR_NONE)))
         goto end;
 
     SSL_set_verify(serverssl, SSL_VERIFY_PEER, NULL);
@@ -7514,7 +7509,7 @@ static int test_pha_key_update(void)
 
     /* Starts with SSL_connect(), but it's really just SSL_do_handshake() */
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                         SSL_ERROR_NONE)))
+            SSL_ERROR_NONE)))
         goto end;
 
     SSL_shutdown(clientssl);
@@ -7522,7 +7517,7 @@ static int test_pha_key_update(void)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -7554,14 +7549,15 @@ static int ssl_srp_cb(SSL *s, int *ad, void *arg)
     }
 
     if (SSL_set_srp_server_param(s, user->N, user->g, user->s, user->v,
-                                 user->info) <= 0) {
+            user->info)
+        <= 0) {
         *ad = SSL_AD_INTERNAL_ERROR;
         goto err;
     }
 
     ret = 0;
 
- err:
+err:
     SRP_user_pwd_free(user);
     return ret;
 }
@@ -7579,7 +7575,7 @@ static int create_new_vfile(char *userid, char *password, const char *filename)
         goto end;
 
     gNid = SRP_create_verifier_ex(userid, password, &row[DB_srpsalt],
-                                  &row[DB_srpverifier], NULL, NULL, libctx, NULL);
+        &row[DB_srpverifier], NULL, NULL, libctx, NULL);
     if (!TEST_ptr(gNid))
         goto end;
 
@@ -7600,9 +7596,9 @@ static int create_new_vfile(char *userid, char *password, const char *filename)
     row[DB_srpgN] = OPENSSL_strdup(gNid);
 
     if (!TEST_ptr(row[DB_srpid])
-            || !TEST_ptr(row[DB_srptype])
-            || !TEST_ptr(row[DB_srpgN])
-            || !TEST_true(TXT_DB_insert(db, row)))
+        || !TEST_ptr(row[DB_srptype])
+        || !TEST_ptr(row[DB_srpgN])
+        || !TEST_true(TXT_DB_insert(db, row)))
         goto end;
 
     row = NULL;
@@ -7611,7 +7607,7 @@ static int create_new_vfile(char *userid, char *password, const char *filename)
         goto end;
 
     ret = 1;
- end:
+end:
     if (row != NULL) {
         for (i = 0; i < DB_NUMBER; i++)
             OPENSSL_free(row[i]);
@@ -7636,7 +7632,7 @@ static int create_new_vbase(char *userid, char *password)
         goto end;
 
     if (!TEST_true(SRP_create_verifier_BN_ex(userid, password, &salt, &verifier,
-                                             lgN->N, lgN->g, libctx, NULL)))
+            lgN->N, lgN->g, libctx, NULL)))
         goto end;
 
     user_pwd = OPENSSL_zalloc(sizeof(*user_pwd));
@@ -7704,15 +7700,15 @@ static int test_srp(int tst)
     }
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (!TEST_int_gt(SSL_CTX_set_srp_username_callback(sctx, ssl_srp_cb), 0)
-            || !TEST_true(SSL_CTX_set_cipher_list(cctx, "SRP-AES-128-CBC-SHA"))
-            || !TEST_true(SSL_CTX_set_max_proto_version(sctx, TLS1_2_VERSION))
-            || !TEST_true(SSL_CTX_set_max_proto_version(cctx, TLS1_2_VERSION))
-            || !TEST_int_gt(SSL_CTX_set_srp_username(cctx, userid), 0))
+        || !TEST_true(SSL_CTX_set_cipher_list(cctx, "SRP-AES-128-CBC-SHA"))
+        || !TEST_true(SSL_CTX_set_max_proto_version(sctx, TLS1_2_VERSION))
+        || !TEST_true(SSL_CTX_set_max_proto_version(cctx, TLS1_2_VERSION))
+        || !TEST_int_gt(SSL_CTX_set_srp_username(cctx, userid), 0))
         goto end;
 
     if (tst % 2 == 1) {
@@ -7724,7 +7720,7 @@ static int test_srp(int tst)
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     ret = create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE);
@@ -7738,7 +7734,7 @@ static int test_srp(int tst)
 
     testresult = 1;
 
- end:
+end:
     SRP_VBASE_free(vbase);
     vbase = NULL;
     SSL_free(serverssl);
@@ -7760,120 +7756,287 @@ static struct info_cb_states_st {
 } info_cb_states[][60] = {
     {
         /* TLSv1.2 server followed by resumption */
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "PINIT"},
-        {SSL_CB_LOOP, "PINIT"}, {SSL_CB_LOOP, "TRCH"}, {SSL_CB_LOOP, "TWSH"},
-        {SSL_CB_LOOP, "TWSC"}, {SSL_CB_LOOP, "TWSKE"}, {SSL_CB_LOOP, "TWSD"},
-        {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "TWSD"}, {SSL_CB_LOOP, "TRCKE"},
-        {SSL_CB_LOOP, "TRCCS"}, {SSL_CB_LOOP, "TRFIN"}, {SSL_CB_LOOP, "TWST"},
-        {SSL_CB_LOOP, "TWCCS"}, {SSL_CB_LOOP, "TWFIN"},
-        {SSL_CB_HANDSHAKE_DONE, NULL}, {SSL_CB_EXIT, NULL},
-        {SSL_CB_ALERT, NULL}, {SSL_CB_HANDSHAKE_START, NULL},
-        {SSL_CB_LOOP, "PINIT"}, {SSL_CB_LOOP, "PINIT"}, {SSL_CB_LOOP, "TRCH"},
-        {SSL_CB_LOOP, "TWSH"}, {SSL_CB_LOOP, "TWCCS"}, {SSL_CB_LOOP, "TWFIN"},
-        {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "TWFIN"}, {SSL_CB_LOOP, "TRCCS"},
-        {SSL_CB_LOOP, "TRFIN"}, {SSL_CB_HANDSHAKE_DONE, NULL},
-        {SSL_CB_EXIT, NULL}, {0, NULL},
-    }, {
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TRCH" },
+        { SSL_CB_LOOP, "TWSH" },
+        { SSL_CB_LOOP, "TWSC" },
+        { SSL_CB_LOOP, "TWSKE" },
+        { SSL_CB_LOOP, "TWSD" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TWSD" },
+        { SSL_CB_LOOP, "TRCKE" },
+        { SSL_CB_LOOP, "TRCCS" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_LOOP, "TWST" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_ALERT, NULL },
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TRCH" },
+        { SSL_CB_LOOP, "TWSH" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_LOOP, "TRCCS" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_EXIT, NULL },
+        { 0, NULL },
+    },
+    {
         /* TLSv1.2 client followed by resumption */
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "PINIT"},
-        {SSL_CB_LOOP, "TWCH"}, {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "TWCH"},
-        {SSL_CB_LOOP, "TRSH"}, {SSL_CB_LOOP, "TRSC"}, {SSL_CB_LOOP, "TRSKE"},
-        {SSL_CB_LOOP, "TRSD"}, {SSL_CB_LOOP, "TWCKE"}, {SSL_CB_LOOP, "TWCCS"},
-        {SSL_CB_LOOP, "TWFIN"}, {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "TWFIN"},
-        {SSL_CB_LOOP, "TRST"}, {SSL_CB_LOOP, "TRCCS"}, {SSL_CB_LOOP, "TRFIN"},
-        {SSL_CB_HANDSHAKE_DONE, NULL}, {SSL_CB_EXIT, NULL}, {SSL_CB_ALERT, NULL},
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "PINIT"},
-        {SSL_CB_LOOP, "TWCH"}, {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "TWCH"},
-        {SSL_CB_LOOP, "TRSH"}, {SSL_CB_LOOP, "TRCCS"}, {SSL_CB_LOOP, "TRFIN"},
-        {SSL_CB_LOOP, "TWCCS"},  {SSL_CB_LOOP, "TWFIN"},
-        {SSL_CB_HANDSHAKE_DONE, NULL}, {SSL_CB_EXIT, NULL}, {0, NULL},
-    }, {
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_LOOP, "TRSH" },
+        { SSL_CB_LOOP, "TRSC" },
+        { SSL_CB_LOOP, "TRSKE" },
+        { SSL_CB_LOOP, "TRSD" },
+        { SSL_CB_LOOP, "TWCKE" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_LOOP, "TRST" },
+        { SSL_CB_LOOP, "TRCCS" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_ALERT, NULL },
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_LOOP, "TRSH" },
+        { SSL_CB_LOOP, "TRCCS" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_EXIT, NULL },
+        { 0, NULL },
+    },
+    {
         /* TLSv1.3 server followed by resumption */
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "PINIT"},
-        {SSL_CB_LOOP, "PINIT"}, {SSL_CB_LOOP, "TRCH"}, {SSL_CB_LOOP, "TWSH"},
-        {SSL_CB_LOOP, "TWCCS"}, {SSL_CB_LOOP, "TWEE"}, {SSL_CB_LOOP, "TWSC"},
-        {SSL_CB_LOOP, "TWSCV"}, {SSL_CB_LOOP, "TWFIN"}, {SSL_CB_LOOP, "TED"},
-        {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "TED"}, {SSL_CB_LOOP, "TRFIN"},
-        {SSL_CB_HANDSHAKE_DONE, NULL}, {SSL_CB_LOOP, "TWST"},
-        {SSL_CB_LOOP, "TWST"}, {SSL_CB_EXIT, NULL}, {SSL_CB_ALERT, NULL},
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "PINIT"},
-        {SSL_CB_LOOP, "PINIT"}, {SSL_CB_LOOP, "TRCH"}, {SSL_CB_LOOP, "TWSH"},
-        {SSL_CB_LOOP, "TWCCS"}, {SSL_CB_LOOP, "TWEE"}, {SSL_CB_LOOP, "TWFIN"},
-        {SSL_CB_LOOP, "TED"}, {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "TED"},
-        {SSL_CB_LOOP, "TRFIN"}, {SSL_CB_HANDSHAKE_DONE, NULL},
-        {SSL_CB_LOOP, "TWST"}, {SSL_CB_EXIT, NULL}, {0, NULL},
-    }, {
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TRCH" },
+        { SSL_CB_LOOP, "TWSH" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWEE" },
+        { SSL_CB_LOOP, "TWSC" },
+        { SSL_CB_LOOP, "TWSCV" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_LOOP, "TED" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TED" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_LOOP, "TWST" },
+        { SSL_CB_LOOP, "TWST" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_ALERT, NULL },
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TRCH" },
+        { SSL_CB_LOOP, "TWSH" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWEE" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_LOOP, "TED" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TED" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_LOOP, "TWST" },
+        { SSL_CB_EXIT, NULL },
+        { 0, NULL },
+    },
+    {
         /* TLSv1.3 client followed by resumption */
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "PINIT"},
-        {SSL_CB_LOOP, "TWCH"}, {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "TWCH"},
-        {SSL_CB_LOOP, "TRSH"}, {SSL_CB_LOOP, "TREE"}, {SSL_CB_LOOP, "TRSC"},
-        {SSL_CB_LOOP, "TRSCV"}, {SSL_CB_LOOP, "TRFIN"}, {SSL_CB_LOOP, "TWCCS"},
-        {SSL_CB_LOOP, "TWFIN"},  {SSL_CB_HANDSHAKE_DONE, NULL},
-        {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "SSLOK"}, {SSL_CB_LOOP, "SSLOK"},
-        {SSL_CB_LOOP, "TRST"}, {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "SSLOK"},
-        {SSL_CB_LOOP, "SSLOK"}, {SSL_CB_LOOP, "TRST"}, {SSL_CB_EXIT, NULL},
-        {SSL_CB_ALERT, NULL}, {SSL_CB_HANDSHAKE_START, NULL},
-        {SSL_CB_LOOP, "PINIT"}, {SSL_CB_LOOP, "TWCH"}, {SSL_CB_EXIT, NULL},
-        {SSL_CB_LOOP, "TWCH"}, {SSL_CB_LOOP, "TRSH"},  {SSL_CB_LOOP, "TREE"},
-        {SSL_CB_LOOP, "TRFIN"}, {SSL_CB_LOOP, "TWCCS"}, {SSL_CB_LOOP, "TWFIN"},
-        {SSL_CB_HANDSHAKE_DONE, NULL}, {SSL_CB_EXIT, NULL},
-        {SSL_CB_LOOP, "SSLOK"}, {SSL_CB_LOOP, "SSLOK"}, {SSL_CB_LOOP, "TRST"},
-        {SSL_CB_EXIT, NULL}, {0, NULL},
-    }, {
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_LOOP, "TRSH" },
+        { SSL_CB_LOOP, "TREE" },
+        { SSL_CB_LOOP, "TRSC" },
+        { SSL_CB_LOOP, "TRSCV" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "TRST" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "TRST" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_ALERT, NULL },
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_LOOP, "TRSH" },
+        { SSL_CB_LOOP, "TREE" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "TRST" },
+        { SSL_CB_EXIT, NULL },
+        { 0, NULL },
+    },
+    {
         /* TLSv1.3 server, early_data */
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "PINIT"},
-        {SSL_CB_LOOP, "PINIT"}, {SSL_CB_LOOP, "TRCH"}, {SSL_CB_LOOP, "TWSH"},
-        {SSL_CB_LOOP, "TWCCS"}, {SSL_CB_LOOP, "TWEE"}, {SSL_CB_LOOP, "TWFIN"},
-        {SSL_CB_HANDSHAKE_DONE, NULL}, {SSL_CB_EXIT, NULL},
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "TED"},
-        {SSL_CB_LOOP, "TED"}, {SSL_CB_LOOP, "TWEOED"}, {SSL_CB_LOOP, "TRFIN"},
-        {SSL_CB_HANDSHAKE_DONE, NULL}, {SSL_CB_LOOP, "TWST"},
-        {SSL_CB_EXIT, NULL}, {0, NULL},
-    }, {
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TRCH" },
+        { SSL_CB_LOOP, "TWSH" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWEE" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "TED" },
+        { SSL_CB_LOOP, "TED" },
+        { SSL_CB_LOOP, "TWEOED" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_LOOP, "TWST" },
+        { SSL_CB_EXIT, NULL },
+        { 0, NULL },
+    },
+    {
         /* TLSv1.3 client, early_data */
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "PINIT"},
-        {SSL_CB_LOOP, "TWCH"}, {SSL_CB_LOOP, "TWCCS"},
-        {SSL_CB_HANDSHAKE_DONE, NULL}, {SSL_CB_EXIT, NULL},
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "TED"},
-        {SSL_CB_LOOP, "TED"}, {SSL_CB_LOOP, "TRSH"}, {SSL_CB_LOOP, "TREE"},
-        {SSL_CB_LOOP, "TRFIN"}, {SSL_CB_LOOP, "TPEDE"}, {SSL_CB_LOOP, "TWEOED"},
-        {SSL_CB_LOOP, "TWFIN"}, {SSL_CB_HANDSHAKE_DONE, NULL},
-        {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "SSLOK"}, {SSL_CB_LOOP, "SSLOK"},
-        {SSL_CB_LOOP, "TRST"}, {SSL_CB_EXIT, NULL}, {0, NULL},
-    }, {
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "TED" },
+        { SSL_CB_LOOP, "TED" },
+        { SSL_CB_LOOP, "TRSH" },
+        { SSL_CB_LOOP, "TREE" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_LOOP, "TPEDE" },
+        { SSL_CB_LOOP, "TWEOED" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "TRST" },
+        { SSL_CB_EXIT, NULL },
+        { 0, NULL },
+    },
+    {
         /* TLSv1.3 server, certificate compression, followed by resumption */
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "PINIT"},
-        {SSL_CB_LOOP, "PINIT"}, {SSL_CB_LOOP, "TRCH"}, {SSL_CB_LOOP, "TWSH"},
-        {SSL_CB_LOOP, "TWCCS"}, {SSL_CB_LOOP, "TWEE"}, {SSL_CB_LOOP, "TWSCC"},
-        {SSL_CB_LOOP, "TWSCV"}, {SSL_CB_LOOP, "TWFIN"}, {SSL_CB_LOOP, "TED"},
-        {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "TED"}, {SSL_CB_LOOP, "TRFIN"},
-        {SSL_CB_HANDSHAKE_DONE, NULL}, {SSL_CB_LOOP, "TWST"},
-        {SSL_CB_LOOP, "TWST"}, {SSL_CB_EXIT, NULL}, {SSL_CB_ALERT, NULL},
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "PINIT"},
-        {SSL_CB_LOOP, "PINIT"}, {SSL_CB_LOOP, "TRCH"}, {SSL_CB_LOOP, "TWSH"},
-        {SSL_CB_LOOP, "TWCCS"}, {SSL_CB_LOOP, "TWEE"}, {SSL_CB_LOOP, "TWFIN"},
-        {SSL_CB_LOOP, "TED"}, {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "TED"},
-        {SSL_CB_LOOP, "TRFIN"}, {SSL_CB_HANDSHAKE_DONE, NULL},
-        {SSL_CB_LOOP, "TWST"}, {SSL_CB_EXIT, NULL}, {0, NULL},
-    }, {
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TRCH" },
+        { SSL_CB_LOOP, "TWSH" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWEE" },
+        { SSL_CB_LOOP, "TWSCC" },
+        { SSL_CB_LOOP, "TWSCV" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_LOOP, "TED" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TED" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_LOOP, "TWST" },
+        { SSL_CB_LOOP, "TWST" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_ALERT, NULL },
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TRCH" },
+        { SSL_CB_LOOP, "TWSH" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWEE" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_LOOP, "TED" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TED" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_LOOP, "TWST" },
+        { SSL_CB_EXIT, NULL },
+        { 0, NULL },
+    },
+    {
         /* TLSv1.3 client, certificate compression, followed by resumption */
-        {SSL_CB_HANDSHAKE_START, NULL}, {SSL_CB_LOOP, "PINIT"},
-        {SSL_CB_LOOP, "TWCH"}, {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "TWCH"},
-        {SSL_CB_LOOP, "TRSH"}, {SSL_CB_LOOP, "TREE"}, {SSL_CB_LOOP, "TRSCC"},
-        {SSL_CB_LOOP, "TRSCV"}, {SSL_CB_LOOP, "TRFIN"}, {SSL_CB_LOOP, "TWCCS"},
-        {SSL_CB_LOOP, "TWFIN"},  {SSL_CB_HANDSHAKE_DONE, NULL},
-        {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "SSLOK"}, {SSL_CB_LOOP, "SSLOK"},
-        {SSL_CB_LOOP, "TRST"}, {SSL_CB_EXIT, NULL}, {SSL_CB_LOOP, "SSLOK"},
-        {SSL_CB_LOOP, "SSLOK"}, {SSL_CB_LOOP, "TRST"}, {SSL_CB_EXIT, NULL},
-        {SSL_CB_ALERT, NULL}, {SSL_CB_HANDSHAKE_START, NULL},
-        {SSL_CB_LOOP, "PINIT"}, {SSL_CB_LOOP, "TWCH"}, {SSL_CB_EXIT, NULL},
-        {SSL_CB_LOOP, "TWCH"}, {SSL_CB_LOOP, "TRSH"},  {SSL_CB_LOOP, "TREE"},
-        {SSL_CB_LOOP, "TRFIN"}, {SSL_CB_LOOP, "TWCCS"}, {SSL_CB_LOOP, "TWFIN"},
-        {SSL_CB_HANDSHAKE_DONE, NULL}, {SSL_CB_EXIT, NULL},
-        {SSL_CB_LOOP, "SSLOK"}, {SSL_CB_LOOP, "SSLOK"}, {SSL_CB_LOOP, "TRST"},
-        {SSL_CB_EXIT, NULL}, {0, NULL},
-    }, {
-        {0, NULL},
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_LOOP, "TRSH" },
+        { SSL_CB_LOOP, "TREE" },
+        { SSL_CB_LOOP, "TRSCC" },
+        { SSL_CB_LOOP, "TRSCV" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "TRST" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "TRST" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_ALERT, NULL },
+        { SSL_CB_HANDSHAKE_START, NULL },
+        { SSL_CB_LOOP, "PINIT" },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "TWCH" },
+        { SSL_CB_LOOP, "TRSH" },
+        { SSL_CB_LOOP, "TREE" },
+        { SSL_CB_LOOP, "TRFIN" },
+        { SSL_CB_LOOP, "TWCCS" },
+        { SSL_CB_LOOP, "TWFIN" },
+        { SSL_CB_HANDSHAKE_DONE, NULL },
+        { SSL_CB_EXIT, NULL },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "SSLOK" },
+        { SSL_CB_LOOP, "TRST" },
+        { SSL_CB_EXIT, NULL },
+        { 0, NULL },
+    },
+    {
+        { 0, NULL },
     }
 };
 
@@ -7892,8 +8055,8 @@ static void sslapi_info_callback(const SSL *s, int where, int ret)
      * test
      */
     if (!TEST_false((SSL_is_server(s) && (where & SSL_ST_CONNECT) != 0))
-            || !TEST_false(!SSL_is_server(s) && (where & SSL_ST_ACCEPT) != 0)
-            || !TEST_int_ne(state[++info_cb_this_state].where, 0)) {
+        || !TEST_false(!SSL_is_server(s) && (where & SSL_ST_ACCEPT) != 0)
+        || !TEST_int_ne(state[++info_cb_this_state].where, 0)) {
         info_cb_failed = 1;
         return;
     }
@@ -7904,8 +8067,9 @@ static void sslapi_info_callback(const SSL *s, int where, int ret)
         return;
     }
     if ((where & SSL_CB_LOOP) != 0
-            && !TEST_int_eq(strcmp(SSL_state_string(s),
-                            state[info_cb_this_state].statestr), 0)) {
+        && !TEST_int_eq(strcmp(SSL_state_string(s),
+                            state[info_cb_this_state].statestr),
+            0)) {
         info_cb_failed = 1;
         return;
     }
@@ -7914,7 +8078,7 @@ static void sslapi_info_callback(const SSL *s, int where, int ret)
      * Check that, if we've got SSL_CB_HANDSHAKE_DONE we are not in init
      */
     if ((where & SSL_CB_HANDSHAKE_DONE)
-            && SSL_in_init((SSL *)s) != 0) {
+        && SSL_in_init((SSL *)s) != 0) {
         info_cb_failed = 1;
         return;
     }
@@ -7942,8 +8106,7 @@ static int test_info_callback(int tst)
 
     if (tst < 2) {
 /* We need either ECDHE or DHE for the TLSv1.2 test to work */
-#if !defined(OPENSSL_NO_TLS1_2) && (!defined(OPENSSL_NO_EC) \
-                                    || !defined(OPENSSL_NO_DH))
+#if !defined(OPENSSL_NO_TLS1_2) && (!defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH))
         tlsvers = TLS1_2_VERSION;
 #else
         return 1;
@@ -7970,36 +8133,36 @@ static int test_info_callback(int tst)
 
         /* early_data tests */
         if (!TEST_true(setupearly_data_test(&cctx, &sctx, &clientssl,
-                                            &serverssl, &sess, 0,
-                                            SHA384_DIGEST_LENGTH)))
+                &serverssl, &sess, 0,
+                SHA384_DIGEST_LENGTH)))
             goto end;
 
         /* We don't actually need this reference */
         SSL_SESSION_free(sess);
 
         SSL_set_info_callback((tst % 2) == 0 ? serverssl : clientssl,
-                              sslapi_info_callback);
+            sslapi_info_callback);
 
         /* Write and read some early data and then complete the connection */
         timer = ossl_time_now();
         if (!TEST_true(SSL_write_early_data(clientssl, MSG1, strlen(MSG1),
-                                            &written))
-                || !TEST_size_t_eq(written, strlen(MSG1)))
+                &written))
+            || !TEST_size_t_eq(written, strlen(MSG1)))
             goto end;
 
         if (!TEST_int_eq(SSL_read_early_data(serverssl, buf,
-                                             sizeof(buf), &readbytes),
-                         SSL_READ_EARLY_DATA_SUCCESS)) {
+                             sizeof(buf), &readbytes),
+                SSL_READ_EARLY_DATA_SUCCESS)) {
             testresult = check_early_data_timeout(timer);
             goto end;
         }
 
         if (!TEST_mem_eq(MSG1, readbytes, buf, strlen(MSG1))
-                || !TEST_int_eq(SSL_get_early_data_status(serverssl),
-                                SSL_EARLY_DATA_ACCEPTED)
-                || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                    SSL_ERROR_NONE))
-                || !TEST_false(info_cb_failed))
+            || !TEST_int_eq(SSL_get_early_data_status(serverssl),
+                SSL_EARLY_DATA_ACCEPTED)
+            || !TEST_true(create_ssl_connection(serverssl, clientssl,
+                SSL_ERROR_NONE))
+            || !TEST_false(info_cb_failed))
             goto end;
 
         testresult = 1;
@@ -8008,9 +8171,9 @@ static int test_info_callback(int tst)
 #endif
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       tlsvers, tlsvers, &sctx, &cctx, cert,
-                                       privkey)))
+            TLS_client_method(),
+            tlsvers, tlsvers, &sctx, &cctx, cert,
+            privkey)))
         goto end;
 
     if (!TEST_true(SSL_CTX_set_dh_auto(sctx, 1)))
@@ -8021,20 +8184,18 @@ static int test_info_callback(int tst)
      * check the client.
      */
     SSL_CTX_set_info_callback((tst % 2) == 0 ? sctx : cctx,
-                              sslapi_info_callback);
+        sslapi_info_callback);
     if (tst >= 6) {
         if (!SSL_CTX_compress_certs(sctx, 0))
             goto end;
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                          &clientssl, NULL, NULL))
+            &clientssl, NULL, NULL))
         || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                            SSL_ERROR_NONE))
+            SSL_ERROR_NONE))
         || !TEST_false(info_cb_failed))
-    goto end;
-
-
+        goto end;
 
     clntsess = SSL_get1_session(clientssl);
     SSL_shutdown(clientssl);
@@ -8045,17 +8206,17 @@ static int test_info_callback(int tst)
 
     /* Now do a resumption */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL,
-                                      NULL))
-            || !TEST_true(SSL_set_session(clientssl, clntsess))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE))
-            || !TEST_true(SSL_session_reused(clientssl))
-            || !TEST_false(info_cb_failed))
+            NULL))
+        || !TEST_true(SSL_set_session(clientssl, clntsess))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE))
+        || !TEST_true(SSL_session_reused(clientssl))
+        || !TEST_false(info_cb_failed))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_SESSION_free(clntsess);
@@ -8075,19 +8236,19 @@ static int test_ssl_pending(int tst)
 
     if (tst == 0) {
         if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                           TLS_client_method(),
-                                           TLS1_VERSION, 0,
-                                           &sctx, &cctx, cert, privkey)))
+                TLS_client_method(),
+                TLS1_VERSION, 0,
+                &sctx, &cctx, cert, privkey)))
             goto end;
     } else {
 #ifndef OPENSSL_NO_DTLS
         if (!TEST_true(create_ssl_ctx_pair(libctx, DTLS_server_method(),
-                                           DTLS_client_method(),
-                                           DTLS1_VERSION, 0,
-                                           &sctx, &cctx, cert, privkey)))
+                DTLS_client_method(),
+                DTLS1_VERSION, 0,
+                &sctx, &cctx, cert, privkey)))
             goto end;
 
-# ifdef OPENSSL_NO_DTLS1_2
+#ifdef OPENSSL_NO_DTLS1_2
         /* Not supported in the FIPS provider */
         if (is_fips) {
             testresult = 1;
@@ -8098,36 +8259,36 @@ static int test_ssl_pending(int tst)
          * level 0
          */
         if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "DEFAULT:@SECLEVEL=0"))
-                || !TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                                    "DEFAULT:@SECLEVEL=0")))
+            || !TEST_true(SSL_CTX_set_cipher_list(cctx,
+                "DEFAULT:@SECLEVEL=0")))
             goto end;
-# endif
+#endif
 #else
         return 1;
 #endif
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     if (!TEST_int_eq(SSL_pending(clientssl), 0)
-            || !TEST_false(SSL_has_pending(clientssl))
-            || !TEST_int_eq(SSL_pending(serverssl), 0)
-            || !TEST_false(SSL_has_pending(serverssl))
-            || !TEST_true(SSL_write_ex(serverssl, msg, sizeof(msg), &written))
-            || !TEST_size_t_eq(written, sizeof(msg))
-            || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes))
-            || !TEST_size_t_eq(readbytes, sizeof(buf))
-            || !TEST_int_eq(SSL_pending(clientssl), (int)(written - readbytes))
-            || !TEST_true(SSL_has_pending(clientssl)))
+        || !TEST_false(SSL_has_pending(clientssl))
+        || !TEST_int_eq(SSL_pending(serverssl), 0)
+        || !TEST_false(SSL_has_pending(serverssl))
+        || !TEST_true(SSL_write_ex(serverssl, msg, sizeof(msg), &written))
+        || !TEST_size_t_eq(written, sizeof(msg))
+        || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes))
+        || !TEST_size_t_eq(readbytes, sizeof(buf))
+        || !TEST_int_eq(SSL_pending(clientssl), (int)(written - readbytes))
+        || !TEST_true(SSL_has_pending(clientssl)))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -8150,46 +8311,38 @@ static struct {
  * TLSv1.3 is enabled but TLSv1.2 is disabled.
  */
 #if defined(OSSL_NO_USABLE_TLS1_3) || !defined(OPENSSL_NO_TLS1_2)
-    {
-        TLS1_2_VERSION,
+    { TLS1_2_VERSION,
         "AES128-SHA:AES256-SHA",
         NULL,
         "AES256-SHA:DHE-RSA-AES128-SHA",
         NULL,
         "AES256-SHA",
-        "AES256-SHA"
-    },
-# if !defined(OPENSSL_NO_CHACHA) \
-     && !defined(OPENSSL_NO_POLY1305) \
-     && !defined(OPENSSL_NO_EC)
-    {
-        TLS1_2_VERSION,
+        "AES256-SHA" },
+#if !defined(OPENSSL_NO_CHACHA)      \
+    && !defined(OPENSSL_NO_POLY1305) \
+    && !defined(OPENSSL_NO_EC)
+    { TLS1_2_VERSION,
         "AES128-SHA:ECDHE-RSA-CHACHA20-POLY1305",
         NULL,
         "AES128-SHA:ECDHE-RSA-CHACHA20-POLY1305",
         NULL,
         "AES128-SHA:ECDHE-RSA-CHACHA20-POLY1305",
-        "AES128-SHA"
-    },
-# endif
-    {
-        TLS1_2_VERSION,
+        "AES128-SHA" },
+#endif
+    { TLS1_2_VERSION,
         "AES128-SHA:DHE-RSA-AES128-SHA:AES256-SHA",
         NULL,
         "AES128-SHA:DHE-RSA-AES256-SHA:AES256-SHA",
         NULL,
         "AES128-SHA:AES256-SHA",
-        "AES128-SHA:AES256-SHA"
-    },
-    {
-        TLS1_2_VERSION,
+        "AES128-SHA:AES256-SHA" },
+    { TLS1_2_VERSION,
         "AES128-SHA:AES256-SHA",
         NULL,
         "AES128-SHA:DHE-RSA-AES128-SHA",
         NULL,
         "AES128-SHA",
-        "AES128-SHA"
-    },
+        "AES128-SHA" },
 #endif
 /*
  * This test combines TLSv1.3 and TLSv1.2 ciphersuites so they must both be
@@ -8197,27 +8350,23 @@ static struct {
  */
 #if !defined(OSSL_NO_USABLE_TLS1_3) && !defined(OPENSSL_NO_TLS1_2) \
     && !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
-    {
-        TLS1_3_VERSION,
+    { TLS1_3_VERSION,
         "AES128-SHA:AES256-SHA",
         NULL,
         "AES256-SHA:AES128-SHA256",
         NULL,
         "TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:"
         "TLS_AES_128_GCM_SHA256:AES256-SHA",
-        "TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256:AES256-SHA"
-    },
+        "TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256:AES256-SHA" },
 #endif
 #ifndef OSSL_NO_USABLE_TLS1_3
-    {
-        TLS1_3_VERSION,
+    { TLS1_3_VERSION,
         "AES128-SHA",
         "TLS_AES_256_GCM_SHA384",
         "AES256-SHA",
         "TLS_AES_256_GCM_SHA384",
         "TLS_AES_256_GCM_SHA384",
-        "TLS_AES_256_GCM_SHA384"
-    },
+        "TLS_AES_256_GCM_SHA384" },
 #endif
 };
 
@@ -8250,44 +8399,43 @@ static int int_test_ssl_get_shared_ciphers(int tst, int clnt)
     }
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION,
-                                       shared_ciphers_data[tst].maxprot,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            TLS1_VERSION,
+            shared_ciphers_data[tst].maxprot,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (!TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                        shared_ciphers_data[tst].clntciphers))
-            || (shared_ciphers_data[tst].clnttls13ciphers != NULL
-                && !TEST_true(SSL_CTX_set_ciphersuites(cctx,
-                                    shared_ciphers_data[tst].clnttls13ciphers)))
-            || !TEST_true(SSL_CTX_set_cipher_list(sctx,
-                                        shared_ciphers_data[tst].srvrciphers))
-            || (shared_ciphers_data[tst].srvrtls13ciphers != NULL
-                && !TEST_true(SSL_CTX_set_ciphersuites(sctx,
-                                    shared_ciphers_data[tst].srvrtls13ciphers))))
+            shared_ciphers_data[tst].clntciphers))
+        || (shared_ciphers_data[tst].clnttls13ciphers != NULL
+            && !TEST_true(SSL_CTX_set_ciphersuites(cctx,
+                shared_ciphers_data[tst].clnttls13ciphers)))
+        || !TEST_true(SSL_CTX_set_cipher_list(sctx,
+            shared_ciphers_data[tst].srvrciphers))
+        || (shared_ciphers_data[tst].srvrtls13ciphers != NULL
+            && !TEST_true(SSL_CTX_set_ciphersuites(sctx,
+                shared_ciphers_data[tst].srvrtls13ciphers))))
         goto end;
 
-
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     if (!TEST_ptr(SSL_get_shared_ciphers(serverssl, buf, sizeof(buf)))
-            || !TEST_int_eq(strcmp(buf,
-                                   is_fips
-                                   ? shared_ciphers_data[tst].fipsshared
-                                   : shared_ciphers_data[tst].shared),
-                                   0)) {
+        || !TEST_int_eq(strcmp(buf,
+                            is_fips
+                                ? shared_ciphers_data[tst].fipsshared
+                                : shared_ciphers_data[tst].shared),
+            0)) {
         TEST_info("Shared ciphers are: %s\n", buf);
         goto end;
     }
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -8300,10 +8448,9 @@ static int int_test_ssl_get_shared_ciphers(int tst, int clnt)
 static int test_ssl_get_shared_ciphers(int tst)
 {
     return int_test_ssl_get_shared_ciphers(tst, 0)
-           && int_test_ssl_get_shared_ciphers(tst, 1);
+        && int_test_ssl_get_shared_ciphers(tst, 1);
 }
 
-
 static const char *appdata = "Hello World";
 static int gen_tick_called, dec_tick_called, tick_key_cb_called;
 static int tick_key_renew = 0;
@@ -8314,14 +8461,14 @@ static int gen_tick_cb(SSL *s, void *arg)
     gen_tick_called = 1;
 
     return SSL_SESSION_set1_ticket_appdata(SSL_get_session(s), appdata,
-                                           strlen(appdata));
+        strlen(appdata));
 }
 
 static SSL_TICKET_RETURN dec_tick_cb(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)
 {
     void *tickdata;
     size_t tickdlen;
@@ -8332,16 +8479,16 @@ static SSL_TICKET_RETURN dec_tick_cb(SSL *s, SSL_SESSION *ss,
         return SSL_TICKET_RETURN_IGNORE_RENEW;
 
     if (!TEST_true(status == SSL_TICKET_SUCCESS
-                   || status == SSL_TICKET_SUCCESS_RENEW))
+            || status == SSL_TICKET_SUCCESS_RENEW))
         return SSL_TICKET_RETURN_ABORT;
 
     if (!TEST_true(SSL_SESSION_get0_ticket_appdata(ss, &tickdata,
-                                                   &tickdlen))
-            || !TEST_size_t_eq(tickdlen, strlen(appdata))
-            || !TEST_int_eq(memcmp(tickdata, appdata, tickdlen), 0))
+            &tickdlen))
+        || !TEST_size_t_eq(tickdlen, strlen(appdata))
+        || !TEST_int_eq(memcmp(tickdata, appdata, tickdlen), 0))
         return SSL_TICKET_RETURN_ABORT;
 
-    if (tick_key_cb_called)  {
+    if (tick_key_cb_called) {
         /* Don't change what the ticket key callback wanted to do */
         switch (status) {
         case SSL_TICKET_NO_DECRYPT:
@@ -8358,13 +8505,12 @@ static SSL_TICKET_RETURN dec_tick_cb(SSL *s, SSL_SESSION *ss,
         }
     }
     return tick_dec_ret;
-
 }
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 static int tick_key_cb(SSL *s, unsigned char key_name[16],
-                       unsigned char iv[EVP_MAX_IV_LENGTH], EVP_CIPHER_CTX *ctx,
-                       HMAC_CTX *hctx, int enc)
+    unsigned char iv[EVP_MAX_IV_LENGTH], EVP_CIPHER_CTX *ctx,
+    HMAC_CTX *hctx, int enc)
 {
     const unsigned char tick_aes_key[16] = "0123456789abcdef";
     const unsigned char tick_hmac_key[16] = "0123456789abcdef";
@@ -8389,10 +8535,10 @@ static int tick_key_cb(SSL *s, unsigned char key_name[16],
     memset(iv, 0, AES_BLOCK_SIZE);
     memset(key_name, 0, 16);
     if (aes128cbc == NULL
-            || sha256 == NULL
-            || !EVP_CipherInit_ex(ctx, aes128cbc, NULL, tick_aes_key, iv, enc)
-            || !HMAC_Init_ex(hctx, tick_hmac_key, sizeof(tick_hmac_key), sha256,
-                             NULL))
+        || sha256 == NULL
+        || !EVP_CipherInit_ex(ctx, aes128cbc, NULL, tick_aes_key, iv, enc)
+        || !HMAC_Init_ex(hctx, tick_hmac_key, sizeof(tick_hmac_key), sha256,
+            NULL))
         ret = -1;
     else
         ret = tick_key_renew ? 2 : 1;
@@ -8405,8 +8551,8 @@ static int tick_key_cb(SSL *s, unsigned char key_name[16],
 #endif
 
 static int tick_key_evp_cb(SSL *s, unsigned char key_name[16],
-                           unsigned char iv[EVP_MAX_IV_LENGTH],
-                           EVP_CIPHER_CTX *ctx, EVP_MAC_CTX *hctx, int enc)
+    unsigned char iv[EVP_MAX_IV_LENGTH],
+    EVP_CIPHER_CTX *ctx, EVP_MAC_CTX *hctx, int enc)
 {
     const unsigned char tick_aes_key[16] = "0123456789abcdef";
     unsigned char tick_hmac_key[16] = "0123456789abcdef";
@@ -8426,12 +8572,12 @@ static int tick_key_evp_cb(SSL *s, unsigned char key_name[16],
     memset(iv, 0, AES_BLOCK_SIZE);
     memset(key_name, 0, 16);
     params[0] = OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_DIGEST,
-                                                 "SHA256", 0);
+        "SHA256", 0);
     params[1] = OSSL_PARAM_construct_end();
     if (aes128cbc == NULL
-            || !EVP_CipherInit_ex(ctx, aes128cbc, NULL, tick_aes_key, iv, enc)
-            || !EVP_MAC_init(hctx, tick_hmac_key, sizeof(tick_hmac_key),
-                             params))
+        || !EVP_CipherInit_ex(ctx, aes128cbc, NULL, tick_aes_key, iv, enc)
+        || !EVP_MAC_init(hctx, tick_hmac_key, sizeof(tick_hmac_key),
+            params))
         ret = -1;
     else
         ret = tick_key_renew ? 2 : 1;
@@ -8522,11 +8668,11 @@ static int test_ticket_callbacks(int tst)
     }
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION,
-                                       ((tst % 2) == 0) ? TLS1_2_VERSION
-                                                        : TLS1_3_VERSION,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            TLS1_VERSION,
+            ((tst % 2) == 0) ? TLS1_2_VERSION
+                             : TLS1_3_VERSION,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     /*
@@ -8537,7 +8683,7 @@ static int test_ticket_callbacks(int tst)
         goto end;
 
     if (!TEST_true(SSL_CTX_set_session_ticket_cb(sctx, gen_tick_cb, dec_tick_cb,
-                                                 NULL)))
+            NULL)))
         goto end;
 
     if (tst >= 14) {
@@ -8551,9 +8697,9 @@ static int test_ticket_callbacks(int tst)
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     /*
@@ -8564,7 +8710,7 @@ static int test_ticket_callbacks(int tst)
      * it is not valid to send empty ticket data in TLSv1.3.
      */
     if (!TEST_int_eq(gen_tick_called, 1)
-            || !TEST_int_eq(dec_tick_called, ((tst % 2) == 0) ? 1 : 0))
+        || !TEST_int_eq(dec_tick_called, ((tst % 2) == 0) ? 1 : 0))
         goto end;
 
     gen_tick_called = dec_tick_called = 0;
@@ -8578,15 +8724,15 @@ static int test_ticket_callbacks(int tst)
 
     /* Now do a resumption */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL,
-                                      NULL))
-            || !TEST_true(SSL_set_session(clientssl, clntsess))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            NULL))
+        || !TEST_true(SSL_set_session(clientssl, clntsess))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     if (tick_dec_ret == SSL_TICKET_RETURN_IGNORE
-            || tick_dec_ret == SSL_TICKET_RETURN_IGNORE_RENEW
-            || tick_key_renew == -1) {
+        || tick_dec_ret == SSL_TICKET_RETURN_IGNORE_RENEW
+        || tick_key_renew == -1) {
         if (!TEST_false(SSL_session_reused(clientssl)))
             goto end;
     } else {
@@ -8595,17 +8741,18 @@ static int test_ticket_callbacks(int tst)
     }
 
     if (!TEST_int_eq(gen_tick_called,
-                     (tick_key_renew
-                      || tick_dec_ret == SSL_TICKET_RETURN_IGNORE_RENEW
-                      || tick_dec_ret == SSL_TICKET_RETURN_USE_RENEW)
-                     ? 1 : 0)
-               /* There is no ticket to decrypt in tests 13 and 19 */
-            || !TEST_int_eq(dec_tick_called, (tst == 13 || tst == 19) ? 0 : 1))
+            (tick_key_renew
+                || tick_dec_ret == SSL_TICKET_RETURN_IGNORE_RENEW
+                || tick_dec_ret == SSL_TICKET_RETURN_USE_RENEW)
+                ? 1
+                : 0)
+        /* There is no ticket to decrypt in tests 13 and 19 */
+        || !TEST_int_eq(dec_tick_called, (tst == 13 || tst == 19) ? 0 : 1))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(clntsess);
     SSL_free(serverssl);
     SSL_free(clientssl);
@@ -8633,19 +8780,19 @@ static int test_incorrect_shutdown(int tst)
     BIO *c2s;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), 0, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), 0, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (tst == 1)
         SSL_CTX_set_options(sctx, SSL_OP_IGNORE_UNEXPECTED_EOF);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                            NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                              SSL_ERROR_NONE)))
+            SSL_ERROR_NONE)))
         goto end;
 
     c2s = SSL_get_rbio(serverssl);
@@ -8654,14 +8801,14 @@ static int test_incorrect_shutdown(int tst)
     if (!TEST_false(SSL_read(serverssl, buf, sizeof(buf))))
         goto end;
 
-    if (tst == 0 && !TEST_int_eq(SSL_get_error(serverssl, 0), SSL_ERROR_SSL) )
+    if (tst == 0 && !TEST_int_eq(SSL_get_error(serverssl, 0), SSL_ERROR_SSL))
         goto end;
-    if (tst == 1 && !TEST_int_eq(SSL_get_error(serverssl, 0), SSL_ERROR_ZERO_RETURN) )
+    if (tst == 1 && !TEST_int_eq(SSL_get_error(serverssl, 0), SSL_ERROR_ZERO_RETURN))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -8703,30 +8850,30 @@ static int test_shutdown(int tst)
 #endif
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION,
-                                       (tst <= 1) ? TLS1_2_VERSION
-                                                  : TLS1_3_VERSION,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            TLS1_VERSION,
+            (tst <= 1) ? TLS1_2_VERSION
+                       : TLS1_3_VERSION,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (tst == 5)
         SSL_CTX_set_post_handshake_auth(cctx, 1);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (tst == 3) {
         if (!TEST_true(create_bare_ssl_connection(serverssl, clientssl,
-                                                  SSL_ERROR_NONE, 1, 0))
-                || !TEST_ptr_ne(sess = SSL_get_session(clientssl), NULL)
-                || !TEST_false(SSL_SESSION_is_resumable(sess)))
+                SSL_ERROR_NONE, 1, 0))
+            || !TEST_ptr_ne(sess = SSL_get_session(clientssl), NULL)
+            || !TEST_false(SSL_SESSION_is_resumable(sess)))
             goto end;
     } else if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                              SSL_ERROR_NONE))
-            || !TEST_ptr_ne(sess = SSL_get_session(clientssl), NULL)
-            || !TEST_true(SSL_SESSION_is_resumable(sess))) {
+                   SSL_ERROR_NONE))
+        || !TEST_ptr_ne(sess = SSL_get_session(clientssl), NULL)
+        || !TEST_true(SSL_SESSION_is_resumable(sess))) {
         goto end;
     }
 
@@ -8739,19 +8886,19 @@ static int test_shutdown(int tst)
          * fail and provide SSL_ERROR_ZERO_RETURN
          */
         if (!TEST_false(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes))
-                || !TEST_int_eq(SSL_get_error(serverssl, 0),
-                                SSL_ERROR_ZERO_RETURN)
-                || !TEST_int_eq(SSL_get_shutdown(serverssl),
-                                SSL_RECEIVED_SHUTDOWN)
-                   /*
-                    * Even though we're shutdown on receive we should still be
-                    * able to write.
-                    */
-                || !TEST_true(SSL_write(serverssl, msg, sizeof(msg))))
+            || !TEST_int_eq(SSL_get_error(serverssl, 0),
+                SSL_ERROR_ZERO_RETURN)
+            || !TEST_int_eq(SSL_get_shutdown(serverssl),
+                SSL_RECEIVED_SHUTDOWN)
+            /*
+             * Even though we're shutdown on receive we should still be
+             * able to write.
+             */
+            || !TEST_true(SSL_write(serverssl, msg, sizeof(msg))))
             goto end;
         if (tst == 4
-                && !TEST_true(SSL_key_update(serverssl,
-                                             SSL_KEY_UPDATE_REQUESTED)))
+            && !TEST_true(SSL_key_update(serverssl,
+                SSL_KEY_UPDATE_REQUESTED)))
             goto end;
         if (tst == 5) {
             SSL_set_verify(serverssl, SSL_VERIFY_PEER, NULL);
@@ -8759,20 +8906,20 @@ static int test_shutdown(int tst)
                 goto end;
         }
         if ((tst == 4 || tst == 5)
-                && !TEST_true(SSL_write(serverssl, msg, sizeof(msg))))
+            && !TEST_true(SSL_write(serverssl, msg, sizeof(msg))))
             goto end;
         if (!TEST_int_eq(SSL_shutdown(serverssl), 1))
             goto end;
         if (tst == 4 || tst == 5) {
             /* Should still be able to read data from server */
             if (!TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf),
-                                       &readbytes))
-                    || !TEST_size_t_eq(readbytes, sizeof(msg))
-                    || !TEST_int_eq(memcmp(msg, buf, readbytes), 0)
-                    || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf),
-                                              &readbytes))
-                    || !TEST_size_t_eq(readbytes, sizeof(msg))
-                    || !TEST_int_eq(memcmp(msg, buf, readbytes), 0))
+                    &readbytes))
+                || !TEST_size_t_eq(readbytes, sizeof(msg))
+                || !TEST_int_eq(memcmp(msg, buf, readbytes), 0)
+                || !TEST_true(SSL_read_ex(clientssl, buf, sizeof(buf),
+                    &readbytes))
+                || !TEST_size_t_eq(readbytes, sizeof(msg))
+                || !TEST_int_eq(memcmp(msg, buf, readbytes), 0))
                 goto end;
         }
     }
@@ -8788,15 +8935,15 @@ static int test_shutdown(int tst)
          * yet.
          */
         if (!TEST_int_eq(SSL_shutdown(serverssl), 0)
-                   /*
-                    * Writing on the server after sending close_notify shouldn't
-                    * be possible.
-                    */
-                || !TEST_false(SSL_write_ex(serverssl, msg, sizeof(msg), &written))
-                || !TEST_int_eq(SSL_shutdown(clientssl), 1)
-                || !TEST_ptr_ne(sess = SSL_get_session(clientssl), NULL)
-                || !TEST_true(SSL_SESSION_is_resumable(sess))
-                || !TEST_int_eq(SSL_shutdown(serverssl), 1))
+            /*
+             * Writing on the server after sending close_notify shouldn't
+             * be possible.
+             */
+            || !TEST_false(SSL_write_ex(serverssl, msg, sizeof(msg), &written))
+            || !TEST_int_eq(SSL_shutdown(clientssl), 1)
+            || !TEST_ptr_ne(sess = SSL_get_session(clientssl), NULL)
+            || !TEST_true(SSL_SESSION_is_resumable(sess))
+            || !TEST_int_eq(SSL_shutdown(serverssl), 1))
             goto end;
     } else if (tst == 4 || tst == 5) {
         /*
@@ -8805,8 +8952,8 @@ static int test_shutdown(int tst)
          * client needs to read the close_notify sent by the server.
          */
         if (!TEST_int_eq(SSL_shutdown(clientssl), 1)
-                || !TEST_ptr_ne(sess = SSL_get_session(clientssl), NULL)
-                || !TEST_true(SSL_SESSION_is_resumable(sess)))
+            || !TEST_ptr_ne(sess = SSL_get_session(clientssl), NULL)
+            || !TEST_true(SSL_SESSION_is_resumable(sess)))
             goto end;
     } else {
         /*
@@ -8817,13 +8964,13 @@ static int test_shutdown(int tst)
          * should fail with a fatal error.
          */
         if (!TEST_int_eq(SSL_shutdown(clientssl), -1)
-                || !TEST_int_eq(SSL_get_error(clientssl, -1), SSL_ERROR_SSL))
+            || !TEST_int_eq(SSL_get_error(clientssl, -1), SSL_ERROR_SSL))
             goto end;
     }
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -8847,13 +8994,13 @@ static int test_async_shutdown(void)
         goto end;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       0, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            0, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL,
-                                      NULL)))
+            NULL)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
@@ -8873,12 +9020,12 @@ static int test_async_shutdown(void)
 
     /* First server shutdown should fail because of a retrable write failure */
     if (!TEST_int_eq(SSL_shutdown(serverssl), -1)
-            || !TEST_int_eq(SSL_get_error(serverssl, -1), SSL_ERROR_WANT_WRITE))
+        || !TEST_int_eq(SSL_get_error(serverssl, -1), SSL_ERROR_WANT_WRITE))
         goto end;
 
     /* Second server shutdown should fail for the same reason */
     if (!TEST_int_eq(SSL_shutdown(serverssl), -1)
-            || !TEST_int_eq(SSL_get_error(serverssl, -1), SSL_ERROR_WANT_WRITE))
+        || !TEST_int_eq(SSL_get_error(serverssl, -1), SSL_ERROR_WANT_WRITE))
         goto end;
 
     SSL_set0_wbio(serverssl, tmp);
@@ -8897,7 +9044,7 @@ static int test_async_shutdown(void)
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -8911,14 +9058,48 @@ static int test_async_shutdown(void)
 #if !defined(OPENSSL_NO_TLS1_2) || !defined(OSSL_NO_USABLE_TLS1_3)
 static int cert_cb_cnt;
 
+static int load_chain(const char *file, EVP_PKEY **pkey, X509 **x509,
+    STACK_OF(X509) *chain)
+{
+    char *path = test_mk_file_path(certsdir, file);
+    BIO *in = NULL;
+    X509 *x = NULL;
+    int ok = 0;
+
+    if (path == NULL)
+        return 0;
+    if ((in = BIO_new(BIO_s_file())) == NULL
+        || BIO_read_filename(in, path) <= 0)
+        goto out;
+    if (pkey == NULL) {
+        if ((x = X509_new_ex(libctx, NULL)) == NULL
+            || PEM_read_bio_X509(in, &x, NULL, NULL) == NULL)
+            goto out;
+        if (chain == NULL)
+            *x509 = x;
+        else if (!sk_X509_push(chain, x))
+            goto out;
+    } else if (PEM_read_bio_PrivateKey_ex(in, pkey, NULL, NULL,
+                   libctx, NULL)
+        == NULL) {
+        goto out;
+    }
+
+    x = NULL;
+    ok = 1;
+out:
+    X509_free(x);
+    BIO_free(in);
+    OPENSSL_free(path);
+    return ok;
+}
+
 static int cert_cb(SSL *s, void *arg)
 {
     SSL_CTX *ctx = (SSL_CTX *)arg;
-    BIO *in = NULL;
     EVP_PKEY *pkey = NULL;
-    X509 *x509 = NULL, *rootx = NULL;
+    X509 *x509 = NULL, *x = NULL;
     STACK_OF(X509) *chain = NULL;
-    char *rootfile = NULL, *ecdsacert = NULL, *ecdsakey = NULL;
     int ret = 0;
 
     if (cert_cb_cnt == 0) {
@@ -8934,42 +9115,23 @@ static int cert_cb(SSL *s, void *arg)
             return 0;
 
         if (!TEST_true(SSL_use_certificate_file(s, cert, SSL_FILETYPE_PEM))
-                || !TEST_true(SSL_use_PrivateKey_file(s, privkey,
-                                                      SSL_FILETYPE_PEM))
-                || !TEST_true(SSL_check_private_key(s)))
+            || !TEST_true(SSL_use_PrivateKey_file(s, privkey,
+                SSL_FILETYPE_PEM))
+            || !TEST_true(SSL_check_private_key(s)))
             return 0;
         cert_cb_cnt++;
         return 1;
     } else if (cert_cb_cnt == 3) {
         int rv;
 
-        rootfile = test_mk_file_path(certsdir, "rootcert.pem");
-        ecdsacert = test_mk_file_path(certsdir, "server-ecdsa-cert.pem");
-        ecdsakey = test_mk_file_path(certsdir, "server-ecdsa-key.pem");
-        if (!TEST_ptr(rootfile) || !TEST_ptr(ecdsacert) || !TEST_ptr(ecdsakey))
-            goto out;
         chain = sk_X509_new_null();
-        if (!TEST_ptr(chain))
-            goto out;
-        if (!TEST_ptr(in = BIO_new(BIO_s_file()))
-                || !TEST_int_gt(BIO_read_filename(in, rootfile), 0)
-                || !TEST_ptr(rootx = X509_new_ex(libctx, NULL))
-                || !TEST_ptr(PEM_read_bio_X509(in, &rootx, NULL, NULL))
-                || !TEST_true(sk_X509_push(chain, rootx)))
-            goto out;
-        rootx = NULL;
-        BIO_free(in);
-        if (!TEST_ptr(in = BIO_new(BIO_s_file()))
-                || !TEST_int_gt(BIO_read_filename(in, ecdsacert), 0)
-                || !TEST_ptr(x509 = X509_new_ex(libctx, NULL))
-                || !TEST_ptr(PEM_read_bio_X509(in, &x509, NULL, NULL)))
-            goto out;
-        BIO_free(in);
-        if (!TEST_ptr(in = BIO_new(BIO_s_file()))
-                || !TEST_int_gt(BIO_read_filename(in, ecdsakey), 0)
-                || !TEST_ptr(pkey = PEM_read_bio_PrivateKey_ex(in, NULL,
-                                                               NULL, NULL,
-                                                               libctx, NULL)))
+        if (!TEST_ptr(chain)
+            || !TEST_true(load_chain("ca-cert.pem", NULL, NULL, chain))
+            || !TEST_true(load_chain("root-cert.pem", NULL, NULL, chain))
+            || !TEST_true(load_chain("p256-ee-rsa-ca-cert.pem", NULL,
+                &x509, NULL))
+            || !TEST_true(load_chain("p256-ee-rsa-ca-key.pem", &pkey,
+                NULL, NULL)))
             goto out;
         rv = SSL_check_chain(s, x509, pkey, chain);
         /*
@@ -8979,7 +9141,7 @@ static int cert_cb(SSL *s, void *arg)
          * will cause tls_choose_sigalgs() to fail the connection.
          */
         if ((rv & (CERT_PKEY_VALID | CERT_PKEY_CA_SIGNATURE))
-                == (CERT_PKEY_VALID | CERT_PKEY_CA_SIGNATURE)) {
+            == (CERT_PKEY_VALID | CERT_PKEY_CA_SIGNATURE)) {
             if (!SSL_use_cert_and_key(s, x509, pkey, NULL, 1))
                 goto out;
         }
@@ -8988,14 +9150,10 @@ static int cert_cb(SSL *s, void *arg)
     }
 
     /* Abort the handshake */
- out:
-    OPENSSL_free(ecdsacert);
-    OPENSSL_free(ecdsakey);
-    OPENSSL_free(rootfile);
-    BIO_free(in);
+out:
     EVP_PKEY_free(pkey);
     X509_free(x509);
-    X509_free(rootx);
+    X509_free(x);
     OSSL_STACK_OF_X509_free(chain);
     return ret;
 }
@@ -9023,10 +9181,10 @@ static int test_cert_cb_int(int prot, int tst)
 #endif
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION,
-                                       prot,
-                                       &sctx, &cctx, NULL, NULL)))
+            TLS_client_method(),
+            prot,
+            prot,
+            &sctx, &cctx, NULL, NULL)))
         goto end;
 
     if (tst == 0)
@@ -9045,7 +9203,7 @@ static int test_cert_cb_int(int prot, int tst)
     SSL_CTX_set_cert_cb(sctx, cert_cb, snictx);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (tst == 4) {
@@ -9054,7 +9212,7 @@ static int test_cert_cb_int(int prot, int tst)
          * the chain doesn't meet (the root uses an RSA cert)
          */
         if (!TEST_true(SSL_set1_sigalgs_list(clientssl,
-                                             "ecdsa_secp256r1_sha256")))
+                "ecdsa_secp256r1_sha256")))
             goto end;
     } else if (tst == 5) {
         /*
@@ -9062,20 +9220,20 @@ static int test_cert_cb_int(int prot, int tst)
          * the ee cert doesn't meet (the ee uses an ECDSA cert)
          */
         if (!TEST_true(SSL_set1_sigalgs_list(clientssl,
-                           "rsa_pss_rsae_sha256:rsa_pkcs1_sha256")))
+                "rsa_pss_rsae_sha256:rsa_pkcs1_sha256")))
             goto end;
     }
 
     ret = create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE);
     if (!TEST_true(tst == 0 || tst == 4 || tst == 5 ? !ret : ret)
-            || (tst > 0
-                && !TEST_int_eq((cert_cb_cnt - 2) * (cert_cb_cnt - 3), 0))) {
+        || (tst > 0
+            && !TEST_int_eq((cert_cb_cnt - 2) * (cert_cb_cnt - 3), 0))) {
         goto end;
     }
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -9116,11 +9274,11 @@ static int client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
         return 0;
 
     if (!TEST_ptr(xcert = X509_new_ex(libctx, NULL))
-            || !TEST_ptr(PEM_read_bio_X509(in, &xcert, NULL, NULL))
-            || !TEST_ptr(priv_in = BIO_new_file(privkey, "r"))
-            || !TEST_ptr(privpkey = PEM_read_bio_PrivateKey_ex(priv_in, NULL,
-                                                               NULL, NULL,
-                                                               libctx, NULL)))
+        || !TEST_ptr(PEM_read_bio_X509(in, &xcert, NULL, NULL))
+        || !TEST_ptr(priv_in = BIO_new_file(privkey, "r"))
+        || !TEST_ptr(privpkey = PEM_read_bio_PrivateKey_ex(priv_in, NULL,
+                         NULL, NULL,
+                         libctx, NULL)))
         goto err;
 
     *x509 = xcert;
@@ -9152,11 +9310,11 @@ static int test_client_cert_cb(int tst)
 #endif
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION,
-                                       tst == 0 ? TLS1_2_VERSION
-                                                : TLS1_3_VERSION,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            TLS1_VERSION,
+            tst == 0 ? TLS1_2_VERSION
+                     : TLS1_3_VERSION,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     /*
@@ -9165,18 +9323,18 @@ static int test_client_cert_cb(int tst)
      */
     SSL_CTX_set_client_cert_cb(cctx, client_cert_cb);
     SSL_CTX_set_verify(sctx,
-                       SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
-                       verify_cb);
+        SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
+        verify_cb);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -9207,30 +9365,30 @@ static int test_ca_names_int(int prot, int tst)
     for (i = 0; i < OSSL_NELEM(name); i++) {
         name[i] = X509_NAME_new();
         if (!TEST_ptr(name[i])
-                || !TEST_true(X509_NAME_add_entry_by_txt(name[i], "CN",
-                                                         MBSTRING_ASC,
-                                                         (unsigned char *)
-                                                         strnames[i],
-                                                         -1, -1, 0)))
+            || !TEST_true(X509_NAME_add_entry_by_txt(name[i], "CN",
+                MBSTRING_ASC,
+                (unsigned char *)
+                    strnames[i],
+                -1, -1, 0)))
             goto end;
     }
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION,
-                                       prot,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            TLS1_VERSION,
+            prot,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     SSL_CTX_set_verify(sctx, SSL_VERIFY_PEER, NULL);
 
     if (tst == 0 || tst == 1) {
         if (!TEST_ptr(sk1 = sk_X509_NAME_new_null())
-                || !TEST_true(sk_X509_NAME_push(sk1, X509_NAME_dup(name[0])))
-                || !TEST_true(sk_X509_NAME_push(sk1, X509_NAME_dup(name[1])))
-                || !TEST_ptr(sk2 = sk_X509_NAME_new_null())
-                || !TEST_true(sk_X509_NAME_push(sk2, X509_NAME_dup(name[0])))
-                || !TEST_true(sk_X509_NAME_push(sk2, X509_NAME_dup(name[1]))))
+            || !TEST_true(sk_X509_NAME_push(sk1, X509_NAME_dup(name[0])))
+            || !TEST_true(sk_X509_NAME_push(sk1, X509_NAME_dup(name[1])))
+            || !TEST_ptr(sk2 = sk_X509_NAME_new_null())
+            || !TEST_true(sk_X509_NAME_push(sk2, X509_NAME_dup(name[0])))
+            || !TEST_true(sk_X509_NAME_push(sk2, X509_NAME_dup(name[1]))))
             goto end;
 
         SSL_CTX_set0_CA_list(sctx, sk1);
@@ -9239,11 +9397,11 @@ static int test_ca_names_int(int prot, int tst)
     }
     if (tst == 1 || tst == 2) {
         if (!TEST_ptr(sk1 = sk_X509_NAME_new_null())
-                || !TEST_true(sk_X509_NAME_push(sk1, X509_NAME_dup(name[2])))
-                || !TEST_true(sk_X509_NAME_push(sk1, X509_NAME_dup(name[3])))
-                || !TEST_ptr(sk2 = sk_X509_NAME_new_null())
-                || !TEST_true(sk_X509_NAME_push(sk2, X509_NAME_dup(name[2])))
-                || !TEST_true(sk_X509_NAME_push(sk2, X509_NAME_dup(name[3]))))
+            || !TEST_true(sk_X509_NAME_push(sk1, X509_NAME_dup(name[2])))
+            || !TEST_true(sk_X509_NAME_push(sk1, X509_NAME_dup(name[3])))
+            || !TEST_ptr(sk2 = sk_X509_NAME_new_null())
+            || !TEST_true(sk_X509_NAME_push(sk2, X509_NAME_dup(name[2])))
+            || !TEST_true(sk_X509_NAME_push(sk2, X509_NAME_dup(name[3]))))
             goto end;
 
         SSL_CTX_set_client_CA_list(sctx, sk1);
@@ -9252,9 +9410,9 @@ static int test_ca_names_int(int prot, int tst)
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     /*
@@ -9263,13 +9421,15 @@ static int test_ca_names_int(int prot, int tst)
      */
     sktmp = SSL_get0_peer_CA_list(serverssl);
     if (prot == TLS1_3_VERSION
-            && (tst == 0 || tst == 1)) {
+        && (tst == 0 || tst == 1)) {
         if (!TEST_ptr(sktmp)
-                || !TEST_int_eq(sk_X509_NAME_num(sktmp), 2)
-                || !TEST_int_eq(X509_NAME_cmp(sk_X509_NAME_value(sktmp, 0),
-                                              name[0]), 0)
-                || !TEST_int_eq(X509_NAME_cmp(sk_X509_NAME_value(sktmp, 1),
-                                              name[1]), 0))
+            || !TEST_int_eq(sk_X509_NAME_num(sktmp), 2)
+            || !TEST_int_eq(X509_NAME_cmp(sk_X509_NAME_value(sktmp, 0),
+                                name[0]),
+                0)
+            || !TEST_int_eq(X509_NAME_cmp(sk_X509_NAME_value(sktmp, 1),
+                                name[1]),
+                0))
             goto end;
     } else if (!TEST_ptr_null(sktmp)) {
         goto end;
@@ -9282,16 +9442,18 @@ static int test_ca_names_int(int prot, int tst)
      */
     sktmp = SSL_get0_peer_CA_list(clientssl);
     if (!TEST_ptr(sktmp)
-            || !TEST_int_eq(sk_X509_NAME_num(sktmp), 2)
-            || !TEST_int_eq(X509_NAME_cmp(sk_X509_NAME_value(sktmp, 0),
-                                          name[tst == 0 ? 0 : 2]), 0)
-            || !TEST_int_eq(X509_NAME_cmp(sk_X509_NAME_value(sktmp, 1),
-                                          name[tst == 0 ? 1 : 3]), 0))
+        || !TEST_int_eq(sk_X509_NAME_num(sktmp), 2)
+        || !TEST_int_eq(X509_NAME_cmp(sk_X509_NAME_value(sktmp, 0),
+                            name[tst == 0 ? 0 : 2]),
+            0)
+        || !TEST_int_eq(X509_NAME_cmp(sk_X509_NAME_value(sktmp, 1),
+                            name[tst == 0 ? 1 : 3]),
+            0))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -9320,8 +9482,7 @@ static int test_ca_names(int tst)
 }
 
 #ifndef OPENSSL_NO_TLS1_2
-static const char *multiblock_cipherlist_data[]=
-{
+static const char *multiblock_cipherlist_data[] = {
     "AES128-SHA",
     "AES128-SHA256",
     "AES256-SHA",
@@ -9329,12 +9490,11 @@ static const char *multiblock_cipherlist_data[]=
 };
 
 /* Reduce the fragment size - so the multiblock test buffer can be small */
-# define MULTIBLOCK_FRAGSIZE 512
+#define MULTIBLOCK_FRAGSIZE 512
 
 static int test_multiblock_write(int test_index)
 {
-    static const char *fetchable_ciphers[]=
-    {
+    static const char *fetchable_ciphers[] = {
         "AES-128-CBC-HMAC-SHA1",
         "AES-128-CBC-HMAC-SHA256",
         "AES-256-CBC-HMAC-SHA1",
@@ -9374,21 +9534,21 @@ static int test_multiblock_write(int test_index)
     RAND_bytes(msg, sizeof(msg));
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, smeth, cmeth, min_version,
-                                       max_version, &sctx, &cctx, cert,
-                                       privkey)))
+            max_version, &sctx, &cctx, cert,
+            privkey)))
         goto end;
 
     if (!TEST_true(SSL_CTX_set_max_send_fragment(sctx, MULTIBLOCK_FRAGSIZE)))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
-            goto end;
+            NULL, NULL)))
+        goto end;
 
     /* settings to force it to use AES-CBC-HMAC_SHA */
     SSL_set_options(serverssl, SSL_OP_NO_ENCRYPT_THEN_MAC);
     if (!TEST_true(SSL_CTX_set_cipher_list(cctx, cipherlist)))
-       goto end;
+        goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
         goto end;
@@ -9522,8 +9682,7 @@ static int test_session_timeout(int test)
         || !TEST_ptr_null(late->prev))
         goto end;
 
-    (void)SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_UPDATE_TIME
-                                         | SSL_CTX_get_session_cache_mode(ctx));
+    (void)SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_UPDATE_TIME | SSL_CTX_get_session_cache_mode(ctx));
 
     /* make sure |now| is NOT  equal to the current time */
     now -= 10;
@@ -9533,7 +9692,7 @@ static int test_session_timeout(int test)
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_CTX_free(ctx);
     SSL_SESSION_free(early);
     SSL_SESSION_free(middle);
@@ -9568,11 +9727,11 @@ static int test_session_cache_overflow(int idx)
 #endif
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION,
-                                       (idx % 2 == 0) ? TLS1_3_VERSION
-                                                      : TLS1_2_VERSION,
-                                       &sctx, &cctx, cert, privkey))
-            || !TEST_true(SSL_CTX_set_options(sctx, SSL_OP_NO_TICKET)))
+            TLS_client_method(), TLS1_VERSION,
+            (idx % 2 == 0) ? TLS1_3_VERSION
+                           : TLS1_2_VERSION,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(SSL_CTX_set_options(sctx, SSL_OP_NO_TICKET)))
         goto end;
 
     SSL_CTX_sess_set_get_cb(sctx, get_session_cb);
@@ -9581,7 +9740,7 @@ static int test_session_cache_overflow(int idx)
     SSL_CTX_sess_set_cache_size(sctx, 1);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
@@ -9615,7 +9774,7 @@ static int test_session_cache_overflow(int idx)
      */
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
@@ -9639,7 +9798,7 @@ static int test_session_cache_overflow(int idx)
     serverssl = clientssl = NULL;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (!TEST_true(SSL_set_session(clientssl, sess)))
@@ -9650,7 +9809,7 @@ static int test_session_cache_overflow(int idx)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -9691,18 +9850,18 @@ static int test_servername(int tst)
 #endif
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION,
-                                       (tst <= 4) ? TLS1_2_VERSION
-                                                  : TLS1_3_VERSION,
-                                       &sctx, &cctx, cert, privkey))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL)))
+            TLS_client_method(),
+            TLS1_VERSION,
+            (tst <= 4) ? TLS1_2_VERSION
+                       : TLS1_3_VERSION,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL)))
         goto end;
 
     if (tst != 1 && tst != 6) {
         if (!TEST_true(SSL_CTX_set_tlsext_servername_callback(sctx,
-                                                              hostname_cb)))
+                hostname_cb)))
             goto end;
     }
 
@@ -9716,18 +9875,18 @@ static int test_servername(int tst)
         goto end;
 
     if (!TEST_str_eq(SSL_get_servername(clientssl, TLSEXT_NAMETYPE_host_name),
-                     cexpectedhost)
-            || !TEST_str_eq(SSL_get_servername(serverssl,
-                                               TLSEXT_NAMETYPE_host_name),
-                            sexpectedhost))
+            cexpectedhost)
+        || !TEST_str_eq(SSL_get_servername(serverssl,
+                            TLSEXT_NAMETYPE_host_name),
+            sexpectedhost))
         goto end;
 
     /* Now repeat with a resumption handshake */
 
     if (!TEST_int_eq(SSL_shutdown(clientssl), 0)
-            || !TEST_ptr_ne(sess = SSL_get1_session(clientssl), NULL)
-            || !TEST_true(SSL_SESSION_is_resumable(sess))
-            || !TEST_int_eq(SSL_shutdown(serverssl), 0))
+        || !TEST_ptr_ne(sess = SSL_get1_session(clientssl), NULL)
+        || !TEST_true(SSL_SESSION_is_resumable(sess))
+        || !TEST_int_eq(SSL_shutdown(serverssl), 0))
         goto end;
 
     SSL_free(clientssl);
@@ -9735,7 +9894,7 @@ static int test_servername(int tst)
     clientssl = serverssl = NULL;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL,
-                                      NULL)))
+            NULL)))
         goto end;
 
     if (!TEST_true(SSL_set_session(clientssl, sess)))
@@ -9754,8 +9913,8 @@ static int test_servername(int tst)
             sexpectedhost = cexpectedhost = "altgoodhost";
 
         if (!TEST_str_eq(SSL_get_servername(clientssl,
-                                            TLSEXT_NAMETYPE_host_name),
-                         "altgoodhost"))
+                             TLSEXT_NAMETYPE_host_name),
+                "altgoodhost"))
             goto end;
     } else if (tst == 4 || tst == 9) {
         /*
@@ -9766,8 +9925,8 @@ static int test_servername(int tst)
             sexpectedhost = cexpectedhost = NULL;
 
         if (!TEST_str_eq(SSL_get_servername(clientssl,
-                                            TLSEXT_NAMETYPE_host_name),
-                         cexpectedhost))
+                             TLSEXT_NAMETYPE_host_name),
+                cexpectedhost))
             goto end;
     } else {
         if (!TEST_true(SSL_set_tlsext_host_name(clientssl, "goodhost")))
@@ -9785,8 +9944,8 @@ static int test_servername(int tst)
             sexpectedhost = NULL;
 
         if (!TEST_str_eq(SSL_get_servername(clientssl,
-                                            TLSEXT_NAMETYPE_host_name),
-                         "goodhost"))
+                             TLSEXT_NAMETYPE_host_name),
+                "goodhost"))
             goto end;
     }
 
@@ -9794,18 +9953,18 @@ static int test_servername(int tst)
         goto end;
 
     if (!TEST_true(SSL_session_reused(clientssl))
-            || !TEST_true(SSL_session_reused(serverssl))
-            || !TEST_str_eq(SSL_get_servername(clientssl,
-                                               TLSEXT_NAMETYPE_host_name),
-                            cexpectedhost)
-            || !TEST_str_eq(SSL_get_servername(serverssl,
-                                               TLSEXT_NAMETYPE_host_name),
-                            sexpectedhost))
+        || !TEST_true(SSL_session_reused(serverssl))
+        || !TEST_str_eq(SSL_get_servername(clientssl,
+                            TLSEXT_NAMETYPE_host_name),
+            cexpectedhost)
+        || !TEST_str_eq(SSL_get_servername(serverssl,
+                            TLSEXT_NAMETYPE_host_name),
+            sexpectedhost))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(sess);
     SSL_free(serverssl);
     SSL_free(clientssl);
@@ -9824,8 +9983,8 @@ static int test_unknown_sigalgs_groups(void)
         goto end;
 
     if (!TEST_int_gt(SSL_CTX_set1_sigalgs_list(ctx,
-                                               "RSA+SHA256:?nonexistent:?RSA+SHA512"),
-                                               0))
+                         "RSA+SHA256:?nonexistent:?RSA+SHA512"),
+            0))
         goto end;
     if (!TEST_size_t_eq(ctx->cert->conf_sigalgslen, 2)
         || !TEST_int_eq(ctx->cert->conf_sigalgs[0], TLSEXT_SIGALG_rsa_pkcs1_sha256)
@@ -9833,8 +9992,8 @@ static int test_unknown_sigalgs_groups(void)
         goto end;
 
     if (!TEST_int_gt(SSL_CTX_set1_client_sigalgs_list(ctx,
-                                                      "RSA+SHA256:?nonexistent:?RSA+SHA512"),
-                                                      0))
+                         "RSA+SHA256:?nonexistent:?RSA+SHA512"),
+            0))
         goto end;
     if (!TEST_size_t_eq(ctx->cert->client_sigalgslen, 2)
         || !TEST_int_eq(ctx->cert->client_sigalgs[0], TLSEXT_SIGALG_rsa_pkcs1_sha256)
@@ -9842,24 +10001,24 @@ static int test_unknown_sigalgs_groups(void)
         goto end;
 
     if (!TEST_int_le(SSL_CTX_set1_groups_list(ctx,
-                                              "nonexistent"),
-                                              0))
+                         "nonexistent"),
+            0))
         goto end;
 
     if (!TEST_int_gt(SSL_CTX_set1_groups_list(ctx,
-                                              "?nonexistent1:?nonexistent2:?nonexistent3"),
-                                              0))
+                         "?nonexistent1:?nonexistent2:?nonexistent3"),
+            0))
         goto end;
 
 #ifndef OPENSSL_NO_EC
     if (!TEST_int_le(SSL_CTX_set1_groups_list(ctx,
-                                              "P-256:nonexistent"),
-                                              0))
+                         "P-256:nonexistent"),
+            0))
         goto end;
 
     if (!TEST_int_gt(SSL_CTX_set1_groups_list(ctx,
-                                              "P-384:?nonexistent:?P-521"),
-                                              0))
+                         "P-384:?nonexistent:?P-521"),
+            0))
         goto end;
     if (!TEST_size_t_eq(ctx->ext.supportedgroups_len, 2)
         || !TEST_int_eq(ctx->ext.supportedgroups[0], OSSL_TLS_GROUP_ID_secp384r1)
@@ -9868,7 +10027,7 @@ static int test_unknown_sigalgs_groups(void)
 #endif
 
     ret = 1;
- end:
+end:
     SSL_CTX_free(ctx);
     return ret;
 }
@@ -9890,21 +10049,20 @@ static int test_configuration_of_groups(void)
         goto end;
 
     if (!TEST_int_gt(SSL_CTX_set1_groups_list(ctx, "DEFAULT:-?P-256"), 0)
-# if !defined(OPENSSL_NO_EC)
+#if !defined(OPENSSL_NO_EC)
         || !TEST_size_t_eq(ctx->ext.supportedgroups_len, groups_len - 1)
-# else
+#else
         || !TEST_size_t_eq(ctx->ext.supportedgroups_len, groups_len)
-# endif
-        )
+#endif
+    )
         goto end;
 
-# if !defined(OPENSSL_NO_EC)
+#if !defined(OPENSSL_NO_EC)
     if (!TEST_int_gt(SSL_CTX_set1_groups_list(ctx, "?P-256:?P-521:-?P-256"), 0)
         || !TEST_size_t_eq(ctx->ext.supportedgroups_len, 1)
-        || !TEST_int_eq(ctx->ext.supportedgroups[0], OSSL_TLS_GROUP_ID_secp521r1)
-        )
+        || !TEST_int_eq(ctx->ext.supportedgroups[0], OSSL_TLS_GROUP_ID_secp521r1))
         goto end;
-# endif
+#endif
 
     ret = 1;
 
@@ -9942,7 +10100,7 @@ static int test_sigalgs_available(int idx)
 
     if (idx != 0 && idx != 3) {
         if (!TEST_true(OSSL_PROVIDER_add_builtin(tmpctx, "filter",
-                                                 filter_provider_init)))
+                filter_provider_init)))
             goto end;
 
         filterprov = OSSL_PROVIDER_load(tmpctx, "filter");
@@ -9957,18 +10115,18 @@ static int test_sigalgs_available(int idx)
              * also need SHA1 for our certificate.
              */
             if (!TEST_true(filter_provider_set_filter(OSSL_OP_DIGEST,
-                                                      "SHA2-256:SHA1")))
+                    "SHA2-256:SHA1")))
                 goto end;
         } else {
             if (!TEST_true(filter_provider_set_filter(OSSL_OP_SIGNATURE,
-                                                      "ECDSA"))
-# ifdef OPENSSL_NO_ECX
-                    || !TEST_true(filter_provider_set_filter(OSSL_OP_KEYMGMT, "EC"))
-# else
-                    || !TEST_true(filter_provider_set_filter(OSSL_OP_KEYMGMT,
-                                                             "EC:X25519:X448"))
-# endif
-                )
+                    "ECDSA"))
+#ifdef OPENSSL_NO_ECX
+                || !TEST_true(filter_provider_set_filter(OSSL_OP_KEYMGMT, "EC"))
+#else
+                || !TEST_true(filter_provider_set_filter(OSSL_OP_KEYMGMT,
+                    "EC:X25519:X448"))
+#endif
+            )
                 goto end;
         }
 
@@ -9985,67 +10143,69 @@ static int test_sigalgs_available(int idx)
 
     /* Avoid MLKEM groups that depend on possibly filtered-out digests */
     if (!TEST_true(SSL_CTX_set1_groups_list(cctx,
-                        "?X25519:?secp256r1:?ffdhe2048:?ffdhe3072"))
+            "?X25519:?secp256r1:?ffdhe2048:?ffdhe3072"))
         || !TEST_true(SSL_CTX_set1_groups_list(sctx,
-                        "?X25519:?secp256r1:?ffdhe2048:?ffdhe3072")))
+            "?X25519:?secp256r1:?ffdhe2048:?ffdhe3072")))
         goto end;
 
     if (idx != 5) {
         /* RSA first server key */
         if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                           TLS_client_method(),
-                                           TLS1_VERSION,
-                                           0,
-                                           &sctx, &cctx, cert, privkey)))
+                TLS_client_method(),
+                TLS1_VERSION,
+                0,
+                &sctx, &cctx, cert, privkey)))
             goto end;
     } else {
         /* ECDSA P-256 first server key */
         if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                           TLS_client_method(),
-                                           TLS1_VERSION,
-                                           0,
-                                           &sctx, &cctx, cert2, privkey2)))
+                TLS_client_method(),
+                TLS1_VERSION,
+                0,
+                &sctx, &cctx, cert2, privkey2)))
             goto end;
     }
 
     /* Ensure we only use TLSv1.2 ciphersuites based on SHA256 */
     if (idx < 4) {
         if (!TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                               "ECDHE-RSA-AES128-GCM-SHA256")))
+                "ECDHE-RSA-AES128-GCM-SHA256")))
             goto end;
     } else {
         if (!TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                               "ECDHE-ECDSA-AES128-GCM-SHA256")))
+                "ECDHE-ECDSA-AES128-GCM-SHA256")))
             goto end;
     }
 
     if (idx < 3) {
         if (!SSL_CTX_set1_sigalgs_list(cctx,
-                                       "rsa_pss_rsae_sha384"
-                                       ":rsa_pss_rsae_sha256")
-                || !SSL_CTX_set1_sigalgs_list(sctx,
-                                              "rsa_pss_rsae_sha384"
-                                              ":rsa_pss_rsae_sha256"))
+                "rsa_pss_rsae_sha384"
+                ":rsa_pss_rsae_sha256")
+            || !SSL_CTX_set1_sigalgs_list(sctx,
+                "rsa_pss_rsae_sha384"
+                ":rsa_pss_rsae_sha256"))
             goto end;
     } else {
         if (!SSL_CTX_set1_sigalgs_list(cctx, "rsa_pss_rsae_sha256:ECDSA+SHA256")
-                || !SSL_CTX_set1_sigalgs_list(sctx,
-                                              "rsa_pss_rsae_sha256:ECDSA+SHA256"))
+            || !SSL_CTX_set1_sigalgs_list(sctx,
+                "rsa_pss_rsae_sha256:ECDSA+SHA256"))
             goto end;
     }
 
     /* ECDSA P-256 second server key, unless already first */
     if (idx != 5
         && (!TEST_int_eq(SSL_CTX_use_certificate_file(sctx, cert2,
-                                                      SSL_FILETYPE_PEM), 1)
+                             SSL_FILETYPE_PEM),
+                1)
             || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(sctx,
-                                                        privkey2,
-                                                        SSL_FILETYPE_PEM), 1)
+                                privkey2,
+                                SSL_FILETYPE_PEM),
+                1)
             || !TEST_int_eq(SSL_CTX_check_private_key(sctx), 1)))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
@@ -10053,7 +10213,7 @@ static int test_sigalgs_available(int idx)
 
     /* For tests 0 and 3 we expect 2 shared sigalgs, otherwise exactly 1 */
     numshared = SSL_get_shared_sigalgs(serverssl, 0, &sig, &hash,
-                                        NULL, NULL, NULL);
+        NULL, NULL, NULL);
     numshared_expected = 1;
     hash_expected = NID_sha256;
     sig_expected = NID_rsassaPss;
@@ -10082,7 +10242,7 @@ static int test_sigalgs_available(int idx)
 
     testresult = filter_provider_check_clean_finish();
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -10092,9 +10252,9 @@ static int test_sigalgs_available(int idx)
 
     return testresult;
 }
-#endif /*
-        * !defined(OPENSSL_NO_EC) \
-        * && (!defined(OSSL_NO_USABLE_TLS1_3) || !defined(OPENSSL_NO_TLS1_2))
+#endif /*                                                                     \
+        * !defined(OPENSSL_NO_EC)                                             \
+        * && (!defined(OSSL_NO_USABLE_TLS1_3) || !defined(OPENSSL_NO_TLS1_2)) \
         */
 
 #ifndef OPENSSL_NO_TLS1_3
@@ -10113,25 +10273,25 @@ static int test_pluggable_group(int idx)
         goto end;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_3_VERSION,
-                                       TLS1_3_VERSION,
-                                       &sctx, &cctx, cert, privkey))
-            || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL)))
+            TLS_client_method(),
+            TLS1_3_VERSION,
+            TLS1_3_VERSION,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL)))
         goto end;
 
     /* ensure GROUPLIST_INCREMENT (=40) logic triggers: */
     if (!TEST_true(SSL_set1_groups_list(serverssl, "xorgroup:xorkemgroup:dummy1:dummy2:dummy3:dummy4:dummy5:dummy6:dummy7:dummy8:dummy9:dummy10:dummy11:dummy12:dummy13:dummy14:dummy15:dummy16:dummy17:dummy18:dummy19:dummy20:dummy21:dummy22:dummy23:dummy24:dummy25:dummy26:dummy27:dummy28:dummy29:dummy30:dummy31:dummy32:dummy33:dummy34:dummy35:dummy36:dummy37:dummy38:dummy39:dummy40:dummy41:dummy42:dummy43"))
-    /* removing a single algorithm from the list makes the test pass */
-            || !TEST_true(SSL_set1_groups_list(clientssl, group_name)))
+        /* removing a single algorithm from the list makes the test pass */
+        || !TEST_true(SSL_set1_groups_list(clientssl, group_name)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
         goto end;
 
     if (!TEST_str_eq(group_name,
-                     SSL_group_to_name(serverssl, SSL_get_shared_group(serverssl, 0))))
+            SSL_group_to_name(serverssl, SSL_get_shared_group(serverssl, 0))))
         goto end;
 
     if (!TEST_str_eq(group_name, SSL_get0_group_name(serverssl))
@@ -10140,7 +10300,7 @@ static int test_pluggable_group(int idx)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -10159,7 +10319,7 @@ static int test_pluggable_group(int idx)
 static int create_cert_key(int idx, char *certfilename, char *privkeyfilename)
 {
     EVP_PKEY_CTX *evpctx = EVP_PKEY_CTX_new_from_name(libctx,
-                             (idx == 0) ? "xorhmacsig" : "xorhmacsha2sig", NULL);
+        (idx == 0) ? "xorhmacsig" : "xorhmacsha2sig", NULL);
     EVP_PKEY *pkey = NULL;
     X509 *x509 = X509_new();
     X509_NAME *name = NULL;
@@ -10176,12 +10336,12 @@ static int create_cert_key(int idx, char *certfilename, char *privkeyfilename)
         || !TEST_true(X509_gmtime_adj(X509_getm_notAfter(x509), 31536000L))
         || !TEST_true(X509_set_pubkey(x509, pkey))
         || !TEST_ptr(name = X509_get_subject_name(x509))
-        || !TEST_true(X509_NAME_add_entry_by_txt(name, "C",  MBSTRING_ASC,
-                           (unsigned char *)"CH", -1, -1, 0))
-        || !TEST_true(X509_NAME_add_entry_by_txt(name, "O",  MBSTRING_ASC,
-                           (unsigned char *)"test.org", -1, -1, 0))
+        || !TEST_true(X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC,
+            (unsigned char *)"CH", -1, -1, 0))
+        || !TEST_true(X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC,
+            (unsigned char *)"test.org", -1, -1, 0))
         || !TEST_true(X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC,
-                           (unsigned char *)"localhost", -1, -1, 0))
+            (unsigned char *)"localhost", -1, -1, 0))
         || !TEST_true(X509_set_issuer_name(x509, name))
         || !TEST_true(X509_sign(x509, pkey, EVP_sha1()))
         || !TEST_ptr(keybio = BIO_new_file(privkeyfilename, "wb"))
@@ -10237,10 +10397,10 @@ static int test_pluggable_signature(int idx)
         goto end;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_3_VERSION,
-                                       TLS1_3_VERSION,
-                                       &sctx, &cctx, NULL, NULL)))
+            TLS_client_method(),
+            TLS1_3_VERSION,
+            TLS1_3_VERSION,
+            &sctx, &cctx, NULL, NULL)))
         goto end;
 
     if (do_conf_cmd) {
@@ -10248,44 +10408,42 @@ static int test_pluggable_signature(int idx)
 
         if (!TEST_ptr(confctx))
             goto end;
-        SSL_CONF_CTX_set_flags(confctx, SSL_CONF_FLAG_FILE
-                                        | SSL_CONF_FLAG_SERVER
-                                        | SSL_CONF_FLAG_CERTIFICATE
-                                        | SSL_CONF_FLAG_REQUIRE_PRIVATE
-                                        | SSL_CONF_FLAG_SHOW_ERRORS);
+        SSL_CONF_CTX_set_flags(confctx, SSL_CONF_FLAG_FILE | SSL_CONF_FLAG_SERVER | SSL_CONF_FLAG_CERTIFICATE | SSL_CONF_FLAG_REQUIRE_PRIVATE | SSL_CONF_FLAG_SHOW_ERRORS);
         SSL_CONF_CTX_set_ssl_ctx(confctx, sctx);
         if (!TEST_int_gt(SSL_CONF_cmd(confctx, "Certificate", certfilename), 0)
-                || !TEST_int_gt(SSL_CONF_cmd(confctx, "PrivateKey", privkeyfilename), 0)
-                || !TEST_true(SSL_CONF_CTX_finish(confctx))) {
+            || !TEST_int_gt(SSL_CONF_cmd(confctx, "PrivateKey", privkeyfilename), 0)
+            || !TEST_true(SSL_CONF_CTX_finish(confctx))) {
             SSL_CONF_CTX_free(confctx);
             goto end;
         }
         SSL_CONF_CTX_free(confctx);
     } else {
         if (!TEST_int_eq(SSL_CTX_use_certificate_file(sctx, certfilename,
-                                                      SSL_FILETYPE_PEM), 1)
-                || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(sctx,
-                                                            privkeyfilename,
-                                                            SSL_FILETYPE_PEM), 1))
+                             SSL_FILETYPE_PEM),
+                1)
+            || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(sctx,
+                                privkeyfilename,
+                                SSL_FILETYPE_PEM),
+                1))
             goto end;
     }
     if (!TEST_int_eq(SSL_CTX_check_private_key(sctx), 1))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     /* Enable RPK for server cert */
     if (rpkidx) {
         if (!TEST_true(SSL_set1_server_cert_type(serverssl, cert_type_rpk, sizeof(cert_type_rpk)))
-                || !TEST_true(SSL_set1_server_cert_type(clientssl, cert_type_rpk, sizeof(cert_type_rpk))))
+            || !TEST_true(SSL_set1_server_cert_type(clientssl, cert_type_rpk, sizeof(cert_type_rpk))))
             goto end;
     }
 
     /* This is necessary to pass minimal setup w/o other groups configured */
     if (!TEST_true(SSL_set1_groups_list(serverssl, "xorgroup"))
-            || !TEST_true(SSL_set1_groups_list(clientssl, "xorgroup")))
+        || !TEST_true(SSL_set1_groups_list(clientssl, "xorgroup")))
         goto end;
 
     /*
@@ -10307,7 +10465,7 @@ static int test_pluggable_signature(int idx)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -10328,24 +10486,24 @@ static int test_ssl_dup(void)
     BIO *rbio = NULL, *wbio = NULL;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       0,
-                                       0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            0,
+            0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                             NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (!TEST_true(SSL_set_min_proto_version(clientssl, TLS1_2_VERSION))
-            || !TEST_true(SSL_set_max_proto_version(clientssl, TLS1_2_VERSION)))
+        || !TEST_true(SSL_set_max_proto_version(clientssl, TLS1_2_VERSION)))
         goto end;
 
     client2ssl = SSL_dup(clientssl);
     rbio = SSL_get_rbio(clientssl);
     if (!TEST_ptr(rbio)
-            || !TEST_true(BIO_up_ref(rbio)))
+        || !TEST_true(BIO_up_ref(rbio)))
         goto end;
     SSL_set0_rbio(client2ssl, rbio);
     rbio = NULL;
@@ -10357,12 +10515,12 @@ static int test_ssl_dup(void)
     rbio = NULL;
 
     if (!TEST_ptr(client2ssl)
-               /* Handshake not started so pointers should be different */
-            || !TEST_ptr_ne(clientssl, client2ssl))
+        /* Handshake not started so pointers should be different */
+        || !TEST_ptr_ne(clientssl, client2ssl))
         goto end;
 
     if (!TEST_int_eq(SSL_get_min_proto_version(client2ssl), TLS1_2_VERSION)
-            || !TEST_int_eq(SSL_get_max_proto_version(client2ssl), TLS1_2_VERSION))
+        || !TEST_int_eq(SSL_get_max_proto_version(client2ssl), TLS1_2_VERSION))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, client2ssl, SSL_ERROR_NONE)))
@@ -10371,13 +10529,13 @@ static int test_ssl_dup(void)
     SSL_free(clientssl);
     clientssl = SSL_dup(client2ssl);
     if (!TEST_ptr(clientssl)
-               /* Handshake has finished so pointers should be the same */
-            || !TEST_ptr_eq(clientssl, client2ssl))
+        /* Handshake has finished so pointers should be the same */
+        || !TEST_ptr_eq(clientssl, client2ssl))
         goto end;
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_free(client2ssl);
@@ -10388,8 +10546,8 @@ static int test_ssl_dup(void)
 }
 
 static int secret_cb(SSL *s, void *secretin, 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)
 {
     int i;
     unsigned char *secret = secretin;
@@ -10414,20 +10572,20 @@ static int test_session_secret_cb(void)
     int testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       0,
-                                       0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            0,
+            0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     /* Create an initial connection and save the session */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     /* session_secret_cb does not support TLSv1.3 */
     if (!TEST_true(SSL_set_min_proto_version(clientssl, TLS1_2_VERSION))
-            || !TEST_true(SSL_set_max_proto_version(serverssl, TLS1_2_VERSION)))
+        || !TEST_true(SSL_set_max_proto_version(serverssl, TLS1_2_VERSION)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
@@ -10441,7 +10599,7 @@ static int test_session_secret_cb(void)
 
     /* Resume the earlier session */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     /*
@@ -10452,12 +10610,12 @@ static int test_session_secret_cb(void)
         goto end;
 
     if (!TEST_true(SSL_set_min_proto_version(clientssl, TLS1_2_VERSION))
-            || !TEST_true(SSL_set_max_proto_version(serverssl, TLS1_2_VERSION))
-            || !TEST_true(SSL_set_session_secret_cb(serverssl, secret_cb,
-                                                    NULL))
-            || !TEST_true(SSL_set_session_secret_cb(clientssl, secret_cb,
-                                                    NULL))
-            || !TEST_true(SSL_set_session(clientssl, secret_sess)))
+        || !TEST_true(SSL_set_max_proto_version(serverssl, TLS1_2_VERSION))
+        || !TEST_true(SSL_set_session_secret_cb(serverssl, secret_cb,
+            NULL))
+        || !TEST_true(SSL_set_session_secret_cb(clientssl, secret_cb,
+            NULL))
+        || !TEST_true(SSL_set_session(clientssl, secret_sess)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
@@ -10465,7 +10623,7 @@ static int test_session_secret_cb(void)
 
     testresult = 1;
 
- end:
+end:
     SSL_SESSION_free(secret_sess);
     SSL_free(serverssl);
     SSL_free(clientssl);
@@ -10475,7 +10633,7 @@ static int test_session_secret_cb(void)
     return testresult;
 }
 
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
 
 static EVP_PKEY *tmp_dh_params = NULL;
 
@@ -10495,24 +10653,25 @@ static EVP_PKEY *get_tmp_dh_params(void)
 
         pctx = EVP_PKEY_CTX_new_from_name(libctx, "DH", NULL);
         if (!TEST_ptr(pctx)
-                || !TEST_int_eq(EVP_PKEY_fromdata_init(pctx), 1))
+            || !TEST_int_eq(EVP_PKEY_fromdata_init(pctx), 1))
             goto end;
 
         tmpl = OSSL_PARAM_BLD_new();
         if (!TEST_ptr(tmpl)
-                || !TEST_true(OSSL_PARAM_BLD_push_BN(tmpl,
-                                                        OSSL_PKEY_PARAM_FFC_P,
-                                                        p))
-                || !TEST_true(OSSL_PARAM_BLD_push_uint(tmpl,
-                                                        OSSL_PKEY_PARAM_FFC_G,
-                                                        2)))
+            || !TEST_true(OSSL_PARAM_BLD_push_BN(tmpl,
+                OSSL_PKEY_PARAM_FFC_P,
+                p))
+            || !TEST_true(OSSL_PARAM_BLD_push_uint(tmpl,
+                OSSL_PKEY_PARAM_FFC_G,
+                2)))
             goto end;
 
         params = OSSL_PARAM_BLD_to_param(tmpl);
         if (!TEST_ptr(params)
-                || !TEST_int_eq(EVP_PKEY_fromdata(pctx, &dhpkey,
-                                                  EVP_PKEY_KEY_PARAMETERS,
-                                                  params), 1))
+            || !TEST_int_eq(EVP_PKEY_fromdata(pctx, &dhpkey,
+                                EVP_PKEY_KEY_PARAMETERS,
+                                params),
+                1))
             goto end;
 
         tmp_dh_params = dhpkey;
@@ -10529,7 +10688,7 @@ static EVP_PKEY *get_tmp_dh_params(void)
     return tmp_dh_params;
 }
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /* Callback used by test_set_tmp_dh() */
 static DH *tmp_dh_callback(SSL *s, int is_export, int keylen)
 {
@@ -10552,7 +10711,7 @@ static DH *tmp_dh_callback(SSL *s, int is_export, int keylen)
 
     return ret;
 }
-#  endif
+#endif
 
 /*
  * Test the various methods for setting temporary DH parameters
@@ -10579,32 +10738,32 @@ static int test_set_tmp_dh(int idx)
     int dhauto = (idx == 3 || idx == 4) ? 1 : 0;
     int expected = (idx <= 2) ? 0 : 1;
     EVP_PKEY *dhpkey = NULL;
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     DH *dh = NULL;
-#  else
+#else
 
     if (idx >= 7)
         return 1;
-#  endif
+#endif
 
     if (idx >= 5 && idx <= 8) {
         dhpkey = get_tmp_dh_params();
         if (!TEST_ptr(dhpkey))
             goto end;
     }
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     if (idx == 7 || idx == 8) {
         dh = EVP_PKEY_get1_DH(dhpkey);
         if (!TEST_ptr(dh))
             goto end;
     }
-#  endif
+#endif
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(),
-                                       0,
-                                       0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            0,
+            0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if ((idx & 1) == 1) {
@@ -10617,17 +10776,17 @@ static int test_set_tmp_dh(int idx)
             goto end;
         dhpkey = NULL;
     }
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     else if (idx == 7) {
         if (!TEST_true(SSL_CTX_set_tmp_dh(sctx, dh)))
             goto end;
     } else if (idx == 9) {
         SSL_CTX_set_tmp_dh_callback(sctx, tmp_dh_callback);
     }
-#  endif
+#endif
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if ((idx & 1) == 0 && idx != 0) {
@@ -10639,18 +10798,18 @@ static int test_set_tmp_dh(int idx)
             goto end;
         dhpkey = NULL;
     }
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     else if (idx == 8) {
         if (!TEST_true(SSL_set_tmp_dh(serverssl, dh)))
             goto end;
     } else if (idx == 10) {
         SSL_set_tmp_dh_callback(serverssl, tmp_dh_callback);
     }
-#  endif
+#endif
 
     if (!TEST_true(SSL_set_min_proto_version(serverssl, TLS1_2_VERSION))
-            || !TEST_true(SSL_set_max_proto_version(serverssl, TLS1_2_VERSION))
-            || !TEST_true(SSL_set_cipher_list(serverssl, "DHE-RSA-AES128-SHA")))
+        || !TEST_true(SSL_set_max_proto_version(serverssl, TLS1_2_VERSION))
+        || !TEST_true(SSL_set_cipher_list(serverssl, "DHE-RSA-AES128-SHA")))
         goto end;
 
     /*
@@ -10658,15 +10817,16 @@ static int test_set_tmp_dh(int idx)
      * there are no parameters
      */
     if (!TEST_int_eq(create_ssl_connection(serverssl, clientssl,
-                                           SSL_ERROR_NONE), expected))
+                         SSL_ERROR_NONE),
+            expected))
         goto end;
 
     testresult = 1;
 
- end:
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+end:
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     DH_free(dh);
-#  endif
+#endif
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -10747,21 +10907,21 @@ static int test_dh_auto(int idx)
     }
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, NULL,
-                                       NULL,
-                                       0,
-                                       0,
-                                       &sctx, &cctx, thiscert, thiskey)))
+            NULL,
+            0,
+            0,
+            &sctx, &cctx, thiscert, thiskey)))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                      NULL, NULL)))
+            NULL, NULL)))
         goto end;
 
     if (!TEST_true(SSL_set_dh_auto(serverssl, 1))
-            || !TEST_true(SSL_set_min_proto_version(serverssl, TLS1_2_VERSION))
-            || !TEST_true(SSL_set_max_proto_version(serverssl, TLS1_2_VERSION))
-            || !TEST_true(SSL_set_cipher_list(serverssl, ciphersuite))
-            || !TEST_true(SSL_set_cipher_list(clientssl, ciphersuite)))
+        || !TEST_true(SSL_set_min_proto_version(serverssl, TLS1_2_VERSION))
+        || !TEST_true(SSL_set_max_proto_version(serverssl, TLS1_2_VERSION))
+        || !TEST_true(SSL_set_cipher_list(serverssl, ciphersuite))
+        || !TEST_true(SSL_set_cipher_list(clientssl, ciphersuite)))
         goto end;
 
     /*
@@ -10770,7 +10930,7 @@ static int test_dh_auto(int idx)
      * removed, so we cannot test it.
      */
     if (!TEST_int_le(SSL_connect(clientssl), 0)
-            || !TEST_int_le(SSL_accept(serverssl), 0))
+        || !TEST_int_le(SSL_accept(serverssl), 0))
         goto end;
 
     if (!TEST_int_gt(SSL_get_tmp_key(serverssl, &tmpkey), 0))
@@ -10783,7 +10943,7 @@ static int test_dh_auto(int idx)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -10791,9 +10951,8 @@ static int test_dh_auto(int idx)
     EVP_PKEY_free(tmpkey);
 
     return testresult;
-
 }
-# endif /* OPENSSL_NO_DH */
+#endif /* OPENSSL_NO_DH */
 #endif /* OPENSSL_NO_TLS1_2 */
 
 #ifndef OSSL_NO_USABLE_TLS1_3
@@ -10817,13 +10976,13 @@ static int test_sni_tls13(void)
         goto end;
     /* Require TLSv1.3 as a minimum */
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_3_VERSION, 0,
-                                       &sctx2, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_3_VERSION, 0,
+            &sctx2, &cctx, cert, privkey)))
         goto end;
 
     /* Set up SNI */
     if (!TEST_true(SSL_CTX_set_tlsext_servername_callback(sctx, sni_cb))
-            || !TEST_true(SSL_CTX_set_tlsext_servername_arg(sctx, sctx2)))
+        || !TEST_true(SSL_CTX_set_tlsext_servername_arg(sctx, sctx2)))
         goto end;
 
     /*
@@ -10831,9 +10990,9 @@ static int test_sni_tls13(void)
      * certificates configured.
      */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL))
-            || !TEST_true(create_ssl_connection(serverssl, clientssl,
-                                                SSL_ERROR_NONE)))
+            &clientssl, NULL, NULL))
+        || !TEST_true(create_ssl_connection(serverssl, clientssl,
+            SSL_ERROR_NONE)))
         goto end;
 
     /* We should have had the SNI callback called exactly once */
@@ -10875,12 +11034,12 @@ static int test_ticket_lifetime(int idx)
     }
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), version, version,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), version, version,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     /*
@@ -10888,7 +11047,7 @@ static int test_ticket_lifetime(int idx)
      * make sure the returned value is the default
      */
     if (!TEST_long_eq(SSL_CTX_set_timeout(sctx, TWO_WEEK_SEC),
-                      SSL_get_default_timeout(serverssl)))
+            SSL_get_default_timeout(serverssl)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
@@ -10925,9 +11084,9 @@ static int test_set_alpn(void)
     unsigned char bad0[] = { 0x00, 'b', 'a', 'd' };
     unsigned char good[] = { 0x04, 'g', 'o', 'o', 'd' };
     unsigned char bad1[] = { 0x01, 'b', 'a', 'd' };
-    unsigned char bad2[] = { 0x03, 'b', 'a', 'd', 0x00};
-    unsigned char bad3[] = { 0x03, 'b', 'a', 'd', 0x01, 'b', 'a', 'd'};
-    unsigned char bad4[] = { 0x03, 'b', 'a', 'd', 0x06, 'b', 'a', 'd'};
+    unsigned char bad2[] = { 0x03, 'b', 'a', 'd', 0x00 };
+    unsigned char bad3[] = { 0x03, 'b', 'a', 'd', 0x01, 'b', 'a', 'd' };
+    unsigned char bad4[] = { 0x03, 'b', 'a', 'd', 0x06, 'b', 'a', 'd' };
 
     /* Create an initial SSL_CTX with no certificate configured */
     ctx = SSL_CTX_new_ex(libctx, NULL, TLS_server_method());
@@ -10990,78 +11149,78 @@ static int test_set_alpn(void)
  */
 static int test_set_verify_cert_store_ssl_ctx(void)
 {
-   SSL_CTX *ctx = NULL;
-   int testresult = 0;
-   X509_STORE *store = NULL, *new_store = NULL,
-              *cstore = NULL, *new_cstore = NULL;
-
-   /* Create an initial SSL_CTX. */
-   ctx = SSL_CTX_new_ex(libctx, NULL, TLS_server_method());
-   if (!TEST_ptr(ctx))
-       goto end;
+    SSL_CTX *ctx = NULL;
+    int testresult = 0;
+    X509_STORE *store = NULL, *new_store = NULL,
+               *cstore = NULL, *new_cstore = NULL;
+
+    /* Create an initial SSL_CTX. */
+    ctx = SSL_CTX_new_ex(libctx, NULL, TLS_server_method());
+    if (!TEST_ptr(ctx))
+        goto end;
 
-   /* Retrieve verify store pointer. */
-   if (!TEST_true(SSL_CTX_get0_verify_cert_store(ctx, &store)))
-       goto end;
+    /* Retrieve verify store pointer. */
+    if (!TEST_true(SSL_CTX_get0_verify_cert_store(ctx, &store)))
+        goto end;
 
-   /* Retrieve chain store pointer. */
-   if (!TEST_true(SSL_CTX_get0_chain_cert_store(ctx, &cstore)))
-       goto end;
+    /* Retrieve chain store pointer. */
+    if (!TEST_true(SSL_CTX_get0_chain_cert_store(ctx, &cstore)))
+        goto end;
 
-   /* We haven't set any yet, so this should be NULL. */
-   if (!TEST_ptr_null(store) || !TEST_ptr_null(cstore))
-       goto end;
+    /* We haven't set any yet, so this should be NULL. */
+    if (!TEST_ptr_null(store) || !TEST_ptr_null(cstore))
+        goto end;
 
-   /* Create stores. We use separate stores so pointers are different. */
-   new_store = X509_STORE_new();
-   if (!TEST_ptr(new_store))
-       goto end;
+    /* Create stores. We use separate stores so pointers are different. */
+    new_store = X509_STORE_new();
+    if (!TEST_ptr(new_store))
+        goto end;
 
-   new_cstore = X509_STORE_new();
-   if (!TEST_ptr(new_cstore))
-       goto end;
+    new_cstore = X509_STORE_new();
+    if (!TEST_ptr(new_cstore))
+        goto end;
 
-   /* Set stores. */
-   if (!TEST_true(SSL_CTX_set1_verify_cert_store(ctx, new_store)))
-       goto end;
+    /* Set stores. */
+    if (!TEST_true(SSL_CTX_set1_verify_cert_store(ctx, new_store)))
+        goto end;
 
-   if (!TEST_true(SSL_CTX_set1_chain_cert_store(ctx, new_cstore)))
-       goto end;
+    if (!TEST_true(SSL_CTX_set1_chain_cert_store(ctx, new_cstore)))
+        goto end;
 
-   /* Should be able to retrieve the same pointer. */
-   if (!TEST_true(SSL_CTX_get0_verify_cert_store(ctx, &store)))
-       goto end;
+    /* Should be able to retrieve the same pointer. */
+    if (!TEST_true(SSL_CTX_get0_verify_cert_store(ctx, &store)))
+        goto end;
 
-   if (!TEST_true(SSL_CTX_get0_chain_cert_store(ctx, &cstore)))
-       goto end;
+    if (!TEST_true(SSL_CTX_get0_chain_cert_store(ctx, &cstore)))
+        goto end;
 
-   if (!TEST_ptr_eq(store, new_store) || !TEST_ptr_eq(cstore, new_cstore))
-       goto end;
+    if (!TEST_ptr_eq(store, new_store) || !TEST_ptr_eq(cstore, new_cstore))
+        goto end;
 
-   /* Should be able to unset again. */
-   if (!TEST_true(SSL_CTX_set1_verify_cert_store(ctx, NULL)))
-       goto end;
+    /* Should be able to unset again. */
+    if (!TEST_true(SSL_CTX_set1_verify_cert_store(ctx, NULL)))
+        goto end;
 
-   if (!TEST_true(SSL_CTX_set1_chain_cert_store(ctx, NULL)))
-       goto end;
+    if (!TEST_true(SSL_CTX_set1_chain_cert_store(ctx, NULL)))
+        goto end;
 
-   /* Should now be NULL. */
-   if (!TEST_true(SSL_CTX_get0_verify_cert_store(ctx, &store)))
-       goto end;
+    /* Should now be NULL. */
+    if (!TEST_true(SSL_CTX_get0_verify_cert_store(ctx, &store)))
+        goto end;
 
-   if (!TEST_true(SSL_CTX_get0_chain_cert_store(ctx, &cstore)))
-       goto end;
+    if (!TEST_true(SSL_CTX_get0_chain_cert_store(ctx, &cstore)))
+        goto end;
 
-   if (!TEST_ptr_null(store) || !TEST_ptr_null(cstore))
-       goto end;
+    if (!TEST_ptr_null(store) || !TEST_ptr_null(cstore))
+        goto end;
 
-   testresult = 1;
+    testresult = 1;
 
 end:
-   X509_STORE_free(new_store);
-   X509_STORE_free(new_cstore);
-   SSL_CTX_free(ctx);
-   return testresult;
+    X509_STORE_free(new_store);
+    X509_STORE_free(new_cstore);
+    SSL_CTX_free(ctx);
+    return testresult;
 }
 
 /*
@@ -11069,88 +11228,87 @@ static int test_set_verify_cert_store_ssl_ctx(void)
  */
 static int test_set_verify_cert_store_ssl(void)
 {
-   SSL_CTX *ctx = NULL;
-   SSL *ssl = NULL;
-   int testresult = 0;
-   X509_STORE *store = NULL, *new_store = NULL,
-              *cstore = NULL, *new_cstore = NULL;
+    SSL_CTX *ctx = NULL;
+    SSL *ssl = NULL;
+    int testresult = 0;
+    X509_STORE *store = NULL, *new_store = NULL,
+               *cstore = NULL, *new_cstore = NULL;
 
-   /* Create an initial SSL_CTX. */
-   ctx = SSL_CTX_new_ex(libctx, NULL, TLS_server_method());
-   if (!TEST_ptr(ctx))
-       goto end;
+    /* Create an initial SSL_CTX. */
+    ctx = SSL_CTX_new_ex(libctx, NULL, TLS_server_method());
+    if (!TEST_ptr(ctx))
+        goto end;
 
-   /* Create an SSL object. */
-   ssl = SSL_new(ctx);
-   if (!TEST_ptr(ssl))
-       goto end;
+    /* Create an SSL object. */
+    ssl = SSL_new(ctx);
+    if (!TEST_ptr(ssl))
+        goto end;
 
-   /* Retrieve verify store pointer. */
-   if (!TEST_true(SSL_get0_verify_cert_store(ssl, &store)))
-       goto end;
+    /* Retrieve verify store pointer. */
+    if (!TEST_true(SSL_get0_verify_cert_store(ssl, &store)))
+        goto end;
 
-   /* Retrieve chain store pointer. */
-   if (!TEST_true(SSL_get0_chain_cert_store(ssl, &cstore)))
-       goto end;
+    /* Retrieve chain store pointer. */
+    if (!TEST_true(SSL_get0_chain_cert_store(ssl, &cstore)))
+        goto end;
 
-   /* We haven't set any yet, so this should be NULL. */
-   if (!TEST_ptr_null(store) || !TEST_ptr_null(cstore))
-       goto end;
+    /* We haven't set any yet, so this should be NULL. */
+    if (!TEST_ptr_null(store) || !TEST_ptr_null(cstore))
+        goto end;
 
-   /* Create stores. We use separate stores so pointers are different. */
-   new_store = X509_STORE_new();
-   if (!TEST_ptr(new_store))
-       goto end;
+    /* Create stores. We use separate stores so pointers are different. */
+    new_store = X509_STORE_new();
+    if (!TEST_ptr(new_store))
+        goto end;
 
-   new_cstore = X509_STORE_new();
-   if (!TEST_ptr(new_cstore))
-       goto end;
+    new_cstore = X509_STORE_new();
+    if (!TEST_ptr(new_cstore))
+        goto end;
 
-   /* Set stores. */
-   if (!TEST_true(SSL_set1_verify_cert_store(ssl, new_store)))
-       goto end;
+    /* Set stores. */
+    if (!TEST_true(SSL_set1_verify_cert_store(ssl, new_store)))
+        goto end;
 
-   if (!TEST_true(SSL_set1_chain_cert_store(ssl, new_cstore)))
-       goto end;
+    if (!TEST_true(SSL_set1_chain_cert_store(ssl, new_cstore)))
+        goto end;
 
-   /* Should be able to retrieve the same pointer. */
-   if (!TEST_true(SSL_get0_verify_cert_store(ssl, &store)))
-       goto end;
+    /* Should be able to retrieve the same pointer. */
+    if (!TEST_true(SSL_get0_verify_cert_store(ssl, &store)))
+        goto end;
 
-   if (!TEST_true(SSL_get0_chain_cert_store(ssl, &cstore)))
-       goto end;
+    if (!TEST_true(SSL_get0_chain_cert_store(ssl, &cstore)))
+        goto end;
 
-   if (!TEST_ptr_eq(store, new_store) || !TEST_ptr_eq(cstore, new_cstore))
-       goto end;
+    if (!TEST_ptr_eq(store, new_store) || !TEST_ptr_eq(cstore, new_cstore))
+        goto end;
 
-   /* Should be able to unset again. */
-   if (!TEST_true(SSL_set1_verify_cert_store(ssl, NULL)))
-       goto end;
+    /* Should be able to unset again. */
+    if (!TEST_true(SSL_set1_verify_cert_store(ssl, NULL)))
+        goto end;
 
-   if (!TEST_true(SSL_set1_chain_cert_store(ssl, NULL)))
-       goto end;
+    if (!TEST_true(SSL_set1_chain_cert_store(ssl, NULL)))
+        goto end;
 
-   /* Should now be NULL. */
-   if (!TEST_true(SSL_get0_verify_cert_store(ssl, &store)))
-       goto end;
+    /* Should now be NULL. */
+    if (!TEST_true(SSL_get0_verify_cert_store(ssl, &store)))
+        goto end;
 
-   if (!TEST_true(SSL_get0_chain_cert_store(ssl, &cstore)))
-       goto end;
+    if (!TEST_true(SSL_get0_chain_cert_store(ssl, &cstore)))
+        goto end;
 
-   if (!TEST_ptr_null(store) || !TEST_ptr_null(cstore))
-       goto end;
+    if (!TEST_ptr_null(store) || !TEST_ptr_null(cstore))
+        goto end;
 
-   testresult = 1;
+    testresult = 1;
 
 end:
-   X509_STORE_free(new_store);
-   X509_STORE_free(new_cstore);
-   SSL_free(ssl);
-   SSL_CTX_free(ctx);
-   return testresult;
+    X509_STORE_free(new_store);
+    X509_STORE_free(new_cstore);
+    SSL_free(ssl);
+    SSL_CTX_free(ctx);
+    return testresult;
 }
 
-
 static int test_inherit_verify_param(void)
 {
     int testresult = 0;
@@ -11185,7 +11343,7 @@ static int test_inherit_verify_param(void)
 
     testresult = 1;
 
- end:
+end:
     SSL_free(ssl);
     SSL_CTX_free(ctx);
 
@@ -11209,9 +11367,9 @@ static int test_load_dhfile(void)
 
     SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
     SSL_CONF_CTX_set_flags(cctx,
-                           SSL_CONF_FLAG_CERTIFICATE
-                           | SSL_CONF_FLAG_SERVER
-                           | SSL_CONF_FLAG_FILE);
+        SSL_CONF_FLAG_CERTIFICATE
+            | SSL_CONF_FLAG_SERVER
+            | SSL_CONF_FLAG_FILE);
 
     if (!TEST_int_eq(SSL_CONF_cmd(cctx, "DHParameters", dhfile), 2))
         goto end;
@@ -11240,14 +11398,14 @@ static int test_read_ahead_key_change(void)
     int i;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_3_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_3_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     SSL_CTX_set_read_ahead(sctx, 1);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
@@ -11274,7 +11432,7 @@ static int test_read_ahead_key_change(void)
      */
     for (i = 0; i < 2; i++) {
         if (!TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf) - 1,
-                                    &readbytes)))
+                &readbytes)))
             goto end;
 
         buf[readbytes] = '\0';
@@ -11341,8 +11499,8 @@ static int test_tls13_record_padding(int idx)
     int called = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_3_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_3_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (idx == 0) {
@@ -11353,7 +11511,7 @@ static int test_tls13_record_padding(int idx)
     } else if (idx == 2) {
         /* Exceeding the max plain length should fail */
         if (!TEST_false(SSL_CTX_set_block_padding(cctx,
-                                                  SSL3_RT_MAX_PLAIN_LENGTH + 1)))
+                SSL3_RT_MAX_PLAIN_LENGTH + 1)))
             goto end;
         if (!TEST_true(SSL_CTX_set_block_padding(cctx, 512)))
             goto end;
@@ -11364,7 +11522,7 @@ static int test_tls13_record_padding(int idx)
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     if (idx == 1) {
@@ -11375,14 +11533,14 @@ static int test_tls13_record_padding(int idx)
     } else if (idx == 3) {
         /* Exceeding the max plain length should fail */
         if (!TEST_false(SSL_set_block_padding(clientssl,
-                                              SSL3_RT_MAX_PLAIN_LENGTH + 1)))
+                SSL3_RT_MAX_PLAIN_LENGTH + 1)))
             goto end;
         if (!TEST_true(SSL_set_block_padding(clientssl, 512)))
             goto end;
     } else if (idx == 5) {
         /* Exceeding the max plain length should fail */
         if (!TEST_false(SSL_set_block_padding_ex(clientssl, 0,
-                                                 SSL3_RT_MAX_PLAIN_LENGTH + 1)))
+                SSL3_RT_MAX_PLAIN_LENGTH + 1)))
             goto end;
         /* pad server and client handshake only */
         if (!TEST_true(SSL_set_block_padding_ex(clientssl, 0, 512)))
@@ -11408,8 +11566,8 @@ static int test_tls13_record_padding(int idx)
             goto end;
 
         if (!TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf) - 1,
-                                    &readbytes))
-                || !TEST_size_t_eq(written, readbytes))
+                &readbytes))
+            || !TEST_size_t_eq(written, readbytes))
             goto end;
 
         buf[readbytes] = '\0';
@@ -11455,8 +11613,7 @@ static int test_pipelining(int idx)
     SSL *clientssl = NULL, *serverssl = NULL, *peera, *peerb;
     int testresult = 0, numreads;
     /* A 55 byte message */
-    unsigned char *msg = (unsigned char *)
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz123";
+    unsigned char *msg = (unsigned char *)"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz123";
     size_t written, readbytes, offset, msglen, fragsize = 10, numpipes = 5;
     size_t expectedreads;
     unsigned char *buf = NULL;
@@ -11469,9 +11626,9 @@ static int test_pipelining(int idx)
     }
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), 0,
-                                       TLS1_2_VERSION, &sctx, &cctx, cert,
-                                       privkey)))
+            TLS_client_method(), 0,
+            TLS1_2_VERSION, &sctx, &cctx, cert,
+            privkey)))
         goto end;
 
     if (idx == 6) {
@@ -11483,7 +11640,7 @@ static int test_pipelining(int idx)
     }
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     if (!TEST_true(SSL_set_cipher_list(clientssl, "AES128-SHA")))
@@ -11538,7 +11695,7 @@ static int test_pipelining(int idx)
      * but sufficient for our purposes
      */
     if (!TEST_true(SSL_set_max_pipelines(peera, numpipes))
-            || !TEST_true(SSL_set_split_send_fragment(peera, fragsize)))
+        || !TEST_true(SSL_set_split_send_fragment(peera, fragsize)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
@@ -11559,17 +11716,17 @@ static int test_pipelining(int idx)
      * read for left over data that couldn't fit in the previous pipelines
      */
     for (offset = 0, numreads = 0;
-         offset < msglen;
-         offset += readbytes, numreads++) {
+        offset < msglen;
+        offset += readbytes, numreads++) {
         if (!TEST_true(SSL_read_ex(peerb, buf + offset,
-                                   msglen - offset, &readbytes)))
+                msglen - offset, &readbytes)))
             goto end;
     }
 
     expectedreads = idx == 4 ? numpipes + 1
                              : (idx == 3 ? numpipes - 1 : numpipes);
     if (!TEST_mem_eq(msg, msglen, buf, offset)
-            || !TEST_int_eq(numreads, expectedreads))
+        || !TEST_int_eq(numreads, expectedreads))
         goto end;
 
     /*
@@ -11582,7 +11739,7 @@ static int test_pipelining(int idx)
         if (sendlen > fragsize)
             sendlen = fragsize;
         if (!TEST_true(SSL_write_ex(peerb, msg + offset, sendlen, &written))
-                || !TEST_size_t_eq(written, sendlen))
+            || !TEST_size_t_eq(written, sendlen))
             goto end;
     }
 
@@ -11594,14 +11751,14 @@ static int test_pipelining(int idx)
      * call to SSL_read_ex
      */
     if (!TEST_true(SSL_read_ex(peera, buf, msglen, &readbytes))
-            || !TEST_size_t_le(readbytes, msglen))
+        || !TEST_size_t_le(readbytes, msglen))
         goto end;
 
     if (idx == 4) {
         size_t readbytes2;
 
         if (!TEST_true(SSL_read_ex(peera, buf + readbytes,
-                                   msglen - readbytes, &readbytes2)))
+                msglen - readbytes, &readbytes2)))
             goto end;
         readbytes += readbytes2;
         if (!TEST_size_t_le(readbytes, msglen))
@@ -11715,9 +11872,9 @@ static int test_version(int idx)
     }
 
     if (is_fips
-            && (version == SSL3_VERSION
-                || version == TLS1_VERSION
-                || version == DTLS1_VERSION)) {
+        && (version == SSL3_VERSION
+            || version == TLS1_VERSION
+            || version == DTLS1_VERSION)) {
         TEST_skip("Protocol version not supported with FIPS");
         return 1;
     }
@@ -11730,43 +11887,43 @@ static int test_version(int idx)
 #endif
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, servmeth, clientmeth, version,
-                                       version, &sctx, &cctx, cert, privkey)))
+            version, &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (!TEST_true(SSL_CTX_set_cipher_list(sctx, "DEFAULT:@SECLEVEL=0"))
-            || !TEST_true(SSL_CTX_set_cipher_list(cctx,
-                                                "DEFAULT:@SECLEVEL=0")))
+        || !TEST_true(SSL_CTX_set_cipher_list(cctx,
+            "DEFAULT:@SECLEVEL=0")))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
         goto end;
 
     if (!TEST_int_eq(SSL_version(serverssl), version)
-            || !TEST_int_eq(SSL_version(clientssl), version)
-            || !TEST_true(check_version_string(serverssl, version))
-            || !TEST_true(check_version_string(clientssl, version)))
+        || !TEST_int_eq(SSL_version(clientssl), version)
+        || !TEST_true(check_version_string(serverssl, version))
+        || !TEST_true(check_version_string(clientssl, version)))
         goto end;
 
     if (version == DTLS1_VERSION || version == DTLS1_2_VERSION) {
         if (!TEST_true(SSL_is_dtls(serverssl))
-                || !TEST_true(SSL_is_dtls(clientssl))
-                || !TEST_false(SSL_is_tls(serverssl))
-                || !TEST_false(SSL_is_tls(clientssl))
-                || !TEST_false(SSL_is_quic(serverssl))
-                || !TEST_false(SSL_is_quic(clientssl)))
-        goto end;
+            || !TEST_true(SSL_is_dtls(clientssl))
+            || !TEST_false(SSL_is_tls(serverssl))
+            || !TEST_false(SSL_is_tls(clientssl))
+            || !TEST_false(SSL_is_quic(serverssl))
+            || !TEST_false(SSL_is_quic(clientssl)))
+            goto end;
     } else {
         if (!TEST_true(SSL_is_tls(serverssl))
-                || !TEST_true(SSL_is_tls(clientssl))
-                || !TEST_false(SSL_is_dtls(serverssl))
-                || !TEST_false(SSL_is_dtls(clientssl))
-                || !TEST_false(SSL_is_quic(serverssl))
-                || !TEST_false(SSL_is_quic(clientssl)))
-        goto end;
+            || !TEST_true(SSL_is_tls(clientssl))
+            || !TEST_false(SSL_is_dtls(serverssl))
+            || !TEST_false(SSL_is_dtls(clientssl))
+            || !TEST_false(SSL_is_quic(serverssl))
+            || !TEST_false(SSL_is_quic(clientssl)))
+            goto end;
     }
 
     testresult = 1;
@@ -11799,22 +11956,22 @@ static int test_rstate_string(void)
     };
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, servmeth, clientmeth, 0,
-                                       0, &sctx, &cctx, cert, privkey)))
+            0, &sctx, &cctx, cert, privkey)))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     if (!TEST_str_eq(SSL_rstate_string(serverssl), "RH")
-            || !TEST_str_eq(SSL_rstate_string_long(serverssl), "read header"))
+        || !TEST_str_eq(SSL_rstate_string_long(serverssl), "read header"))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
         goto end;
 
     if (!TEST_str_eq(SSL_rstate_string(serverssl), "RH")
-            || !TEST_str_eq(SSL_rstate_string_long(serverssl), "read header"))
+        || !TEST_str_eq(SSL_rstate_string_long(serverssl), "read header"))
         goto end;
 
     /* Fill in the correct version for the record header */
@@ -11828,15 +11985,15 @@ static int test_rstate_string(void)
      * would fail with a bad record mac, but we're not going to go that far.
      */
     if (!TEST_true(BIO_write_ex(SSL_get_rbio(serverssl), dummyheader,
-                                sizeof(dummyheader), &written))
-            || !TEST_size_t_eq(written, SSL3_RT_HEADER_LENGTH))
+            sizeof(dummyheader), &written))
+        || !TEST_size_t_eq(written, SSL3_RT_HEADER_LENGTH))
         goto end;
 
     if (!TEST_false(SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes)))
         goto end;
 
     if (!TEST_str_eq(SSL_rstate_string(serverssl), "RB")
-            || !TEST_str_eq(SSL_rstate_string_long(serverssl), "read body"))
+        || !TEST_str_eq(SSL_rstate_string_long(serverssl), "read body"))
         goto end;
 
     testresult = 1;
@@ -11885,8 +12042,8 @@ static int test_handshake_retry(int idx)
 #endif
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), 0, maxversion,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), 0, maxversion,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     /*
@@ -11907,7 +12064,7 @@ static int test_handshake_retry(int idx)
         set_always_retry_err_val(0);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     tmp = SSL_get_wbio(serverssl);
@@ -11922,7 +12079,7 @@ static int test_handshake_retry(int idx)
         goto end;
 
     if (!TEST_int_eq(SSL_accept(serverssl), -1)
-            || !TEST_int_eq(SSL_get_error(serverssl, -1), SSL_ERROR_WANT_WRITE))
+        || !TEST_int_eq(SSL_get_error(serverssl, -1), SSL_ERROR_WANT_WRITE))
         goto end;
 
     /* Restore a BIO that will let the write succeed */
@@ -11966,12 +12123,12 @@ static int test_data_retry(void)
     memset(outbuf, 0, sizeof(outbuf));
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), 0, 0, &sctx, &cctx,
-                                       cert, privkey)))
+            TLS_client_method(), 0, 0, &sctx, &cctx,
+            cert, privkey)))
         goto end;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL,
-                                      NULL)))
+            NULL)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
@@ -12003,7 +12160,7 @@ static int test_data_retry(void)
 
         /* Allow one write to progress, but the next one to signal retry */
         if (!TEST_true(BIO_ctrl(bretry, MAYBE_RETRY_CTRL_SET_RETRY_AFTER_CNT, 1,
-                                NULL)))
+                NULL)))
             goto end;
 
         if (i == 2)
@@ -12024,7 +12181,7 @@ static int test_data_retry(void)
         goto end;
     /* Read all the data available */
     while (SSL_read_ex(serverssl, outbuf + totread, sizeof(outbuf) - totread,
-                       &readbytes))
+        &readbytes))
         totread += readbytes;
     if (!TEST_mem_eq(inbuf, sizeof(inbuf), outbuf, totread))
         goto end;
@@ -12067,8 +12224,8 @@ static int resume_servername_cb(SSL *s, int *ad, void *arg)
     cbdata->recurse = 1;
 
     if (!TEST_true(create_ssl_objects(cbdata->sctx, cbdata->cctx, &serverssl,
-                                      &clientssl, NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, cbdata->sess)))
+            &clientssl, NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, cbdata->sess)))
         goto end;
 
     ERR_set_mark();
@@ -12083,7 +12240,7 @@ static int resume_servername_cb(SSL *s, int *ad, void *arg)
     ERR_pop_to_mark();
 
     ret = SSL_TLSEXT_ERR_OK;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     cbdata->recurse = 0;
@@ -12119,16 +12276,16 @@ static int test_multi_resume(int idx)
 #endif
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION,
-                                       max_version, &sctx, &cctx, cert,
-                                       privkey)))
+            TLS_client_method(), TLS1_VERSION,
+            max_version, &sctx, &cctx, cert,
+            privkey)))
         goto end;
 
     /*
      * TLSv1.3 only uses a session cache if either max_early_data > 0 (used for
      * replay protection), or if SSL_OP_NO_TICKET is in use
      */
-    if (idx == 0 || idx == 2)  {
+    if (idx == 0 || idx == 2) {
         if (!TEST_true(SSL_CTX_set_max_early_data(sctx, 1024)))
             goto end;
     }
@@ -12147,8 +12304,8 @@ static int test_multi_resume(int idx)
 
     for (i = 0; i < 30; i++) {
         if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
-                                                NULL, NULL))
-                || !TEST_true(SSL_set_session(clientssl, sess)))
+                NULL, NULL))
+            || !TEST_true(SSL_set_session(clientssl, sess)))
             goto end;
 
         /*
@@ -12202,7 +12359,7 @@ static int test_multi_resume(int idx)
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -12220,90 +12377,35 @@ static struct next_proto_st {
     size_t selectedlen;
     unsigned char selected[40];
 } next_proto_tests[] = {
-    {
-        4, { 3, 'a', 'b', 'c' },
-        4, { 3, 'a', 'b', 'c' },
-        OPENSSL_NPN_NEGOTIATED,
-        3, { 'a', 'b', 'c' }
-    },
-    {
-        7, { 3, 'a', 'b', 'c', 2, 'a', 'b' },
-        4, { 3, 'a', 'b', 'c' },
-        OPENSSL_NPN_NEGOTIATED,
-        3, { 'a', 'b', 'c' }
-    },
-    {
-        7, { 2, 'a', 'b', 3, 'a', 'b', 'c', },
-        4, { 3, 'a', 'b', 'c' },
-        OPENSSL_NPN_NEGOTIATED,
-        3, { 'a', 'b', 'c' }
-    },
-    {
+    { 4, { 3, 'a', 'b', 'c' },
         4, { 3, 'a', 'b', 'c' },
-        7, { 3, 'a', 'b', 'c', 2, 'a', 'b', },
         OPENSSL_NPN_NEGOTIATED,
-        3, { 'a', 'b', 'c' }
-    },
-    {
+        3, { 'a', 'b', 'c' } },
+    { 7, { 3, 'a', 'b', 'c', 2, 'a', 'b' },
         4, { 3, 'a', 'b', 'c' },
-        7, { 2, 'a', 'b', 3, 'a', 'b', 'c'},
-        OPENSSL_NPN_NEGOTIATED,
-        3, { 'a', 'b', 'c' }
-    },
-    {
-        7, { 2, 'b', 'c', 3, 'a', 'b', 'c' },
-        7, { 2, 'a', 'b', 3, 'a', 'b', 'c'},
         OPENSSL_NPN_NEGOTIATED,
-        3, { 'a', 'b', 'c' }
-    },
-    {
-        10, { 2, 'b', 'c', 3, 'a', 'b', 'c', 2, 'a', 'b' },
-        7, { 2, 'a', 'b', 3, 'a', 'b', 'c'},
-        OPENSSL_NPN_NEGOTIATED,
-        3, { 'a', 'b', 'c' }
-    },
-    {
-        4, { 3, 'b', 'c', 'd' },
-        4, { 3, 'a', 'b', 'c' },
-        OPENSSL_NPN_NO_OVERLAP,
-        3, { 'a', 'b', 'c' }
-    },
-    {
-        0, { 0 },
-        4, { 3, 'a', 'b', 'c' },
-        OPENSSL_NPN_NO_OVERLAP,
-        3, { 'a', 'b', 'c' }
-    },
-    {
-        -1, { 0 },
-        4, { 3, 'a', 'b', 'c' },
-        OPENSSL_NPN_NO_OVERLAP,
-        3, { 'a', 'b', 'c' }
-    },
-    {
-        4, { 3, 'a', 'b', 'c' },
-        0, { 0 },
-        OPENSSL_NPN_NO_OVERLAP,
-        0, { 0 }
-    },
-    {
-        4, { 3, 'a', 'b', 'c' },
-        -1, { 0 },
-        OPENSSL_NPN_NO_OVERLAP,
-        0, { 0 }
-    },
-    {
-        3, { 3, 'a', 'b', 'c' },
-        4, { 3, 'a', 'b', 'c' },
-        OPENSSL_NPN_NO_OVERLAP,
-        3, { 'a', 'b', 'c' }
-    },
-    {
-        4, { 3, 'a', 'b', 'c' },
-        3, { 3, 'a', 'b', 'c' },
-        OPENSSL_NPN_NO_OVERLAP,
-        0, { 0 }
-    }
+        3, { 'a', 'b', 'c' } },
+    { 7, {
+             2,
+             'a',
+             'b',
+             3,
+             'a',
+             'b',
+             'c',
+         },
+        4, { 3, 'a', 'b', 'c' }, OPENSSL_NPN_NEGOTIATED, 3, { 'a', 'b', 'c' } },
+    { 4, { 3, 'a', 'b', 'c' }, 7, {
+                                      3,
+                                      'a',
+                                      'b',
+                                      'c',
+                                      2,
+                                      'a',
+                                      'b',
+                                  },
+        OPENSSL_NPN_NEGOTIATED, 3, { 'a', 'b', 'c' } },
+    { 4, { 3, 'a', 'b', 'c' }, 7, { 2, 'a', 'b', 3, 'a', 'b', 'c' }, OPENSSL_NPN_NEGOTIATED, 3, { 'a', 'b', 'c' } }, { 7, { 2, 'b', 'c', 3, 'a', 'b', 'c' }, 7, { 2, 'a', 'b', 3, 'a', 'b', 'c' }, OPENSSL_NPN_NEGOTIATED, 3, { 'a', 'b', 'c' } }, { 10, { 2, 'b', 'c', 3, 'a', 'b', 'c', 2, 'a', 'b' }, 7, { 2, 'a', 'b', 3, 'a', 'b', 'c' }, OPENSSL_NPN_NEGOTIATED, 3, { 'a', 'b', 'c' } }, { 4, { 3, 'b', 'c', 'd' }, 4, { 3, 'a', 'b', 'c' }, OPENSSL_NPN_NO_OVERLAP, 3, { 'a', 'b', 'c' } }, { 0, { 0 }, 4, { 3, 'a', 'b', 'c' }, OPENSSL_NPN_NO_OVERLAP, 3, { 'a', 'b', 'c' } }, { -1, { 0 }, 4, { 3, 'a', 'b', 'c' }, OPENSSL_NPN_NO_OVERLAP, 3, { 'a', 'b', 'c' } }, { 4, { 3, 'a', 'b', 'c' }, 0, { 0 }, OPENSSL_NPN_NO_OVERLAP, 0, { 0 } }, { 4, { 3, 'a', 'b', 'c' }, -1, { 0 }, OPENSSL_NPN_NO_OVERLAP, 0, { 0 } }, { 3, { 3, 'a', 'b', 'c' }, 4, { 3, 'a', 'b', 'c' }, OPENSSL_NPN_NO_OVERLAP, 3, { 'a', 'b', 'c' } }, { 4, { 3, 'a', 'b', 'c' }, 3, { 3, 'a', 'b', 'c' }, OPENSSL_NPN_NO_OVERLAP, 0, { 0 } }
 };
 
 static int test_select_next_proto(int idx)
@@ -12330,8 +12432,8 @@ static int test_select_next_proto(int idx)
     }
 
     if (!TEST_int_eq(SSL_select_next_proto(&out, &outlen, server, serverlen,
-                                           client, clientlen),
-                     np->expected_ret))
+                         client, clientlen),
+            np->expected_ret))
         goto err;
 
     if (np->selectedlen == 0) {
@@ -12343,16 +12445,16 @@ static int test_select_next_proto(int idx)
     }
 
     ret = 1;
- err:
+err:
     return ret;
 }
 
-static const unsigned char fooprot[] = {3, 'f', 'o', 'o' };
-static const unsigned char barprot[] = {3, 'b', 'a', 'r' };
+static const unsigned char fooprot[] = { 3, 'f', 'o', 'o' };
+static const unsigned char barprot[] = { 3, 'b', 'a', 'r' };
 
 #if !defined(OPENSSL_NO_TLS1_2) && !defined(OPENSSL_NO_NEXTPROTONEG)
 static int npn_advert_cb(SSL *ssl, const unsigned char **out,
-                         unsigned int *outlen, void *arg)
+    unsigned int *outlen, void *arg)
 {
     int *idx = (int *)arg;
 
@@ -12374,7 +12476,7 @@ static int npn_advert_cb(SSL *ssl, const unsigned char **out,
 }
 
 static int npn_select_cb(SSL *s, unsigned char **out, unsigned char *outlen,
-                         const unsigned char *in, unsigned int inlen, void *arg)
+    const unsigned char *in, unsigned int inlen, void *arg)
 {
     int *idx = (int *)arg;
 
@@ -12415,28 +12517,28 @@ static int test_npn(int idx)
     int testresult = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), 0, TLS1_2_VERSION,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), 0, TLS1_2_VERSION,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     SSL_CTX_set_next_protos_advertised_cb(sctx, npn_advert_cb, &idx);
     SSL_CTX_set_next_proto_select_cb(cctx, npn_select_cb, &idx);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL,
-                                      NULL)))
+            NULL)))
         goto end;
 
     if (idx == 4) {
         /* We don't allow empty selection of NPN, so this should fail */
         if (!TEST_false(create_ssl_connection(serverssl, clientssl,
-                                              SSL_ERROR_NONE)))
+                SSL_ERROR_NONE)))
             goto end;
     } else {
         const unsigned char *prot;
         unsigned int protlen;
 
         if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                             SSL_ERROR_NONE)))
+                SSL_ERROR_NONE)))
             goto end;
 
         SSL_get0_next_proto_negotiated(serverssl, &prot, &protlen);
@@ -12461,7 +12563,7 @@ static int test_npn(int idx)
     }
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -12472,8 +12574,8 @@ static int test_npn(int idx)
 #endif /* !defined(OPENSSL_NO_TLS1_2) && !defined(OPENSSL_NO_NEXTPROTONEG) */
 
 static int alpn_select_cb2(SSL *ssl, const unsigned char **out,
-                           unsigned char *outlen, const unsigned char *in,
-                           unsigned int inlen, void *arg)
+    unsigned char *outlen, const unsigned char *in,
+    unsigned int inlen, void *arg)
 {
     int *idx = (int *)arg;
 
@@ -12515,14 +12617,14 @@ static int test_alpn(int idx)
     unsigned int protslen = sizeof(fooprot);
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), 0, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), 0, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     SSL_CTX_set_alpn_select_cb(sctx, alpn_select_cb2, &idx);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL,
-                                      NULL)))
+            NULL)))
         goto end;
 
     if (idx == 1) {
@@ -12537,14 +12639,14 @@ static int test_alpn(int idx)
     if (idx == 2 || idx == 3) {
         /* We don't allow empty selection of NPN, so this should fail */
         if (!TEST_false(create_ssl_connection(serverssl, clientssl,
-                                              SSL_ERROR_NONE)))
+                SSL_ERROR_NONE)))
             goto end;
     } else {
         const unsigned char *prot;
         unsigned int protlen;
 
         if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                             SSL_ERROR_NONE)))
+                SSL_ERROR_NONE)))
             goto end;
 
         SSL_get0_alpn_selected(clientssl, &prot, &protlen);
@@ -12564,7 +12666,7 @@ static int test_alpn(int idx)
     }
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);
@@ -12588,15 +12690,38 @@ struct quic_tls_test_data {
     size_t params_len;
     int alert;
     int err;
+    int forcefail;
+    int sm_count;
 };
 
+static int clientquicdata = 0xff, serverquicdata = 0xfe;
+
+static int check_app_data(SSL *s)
+{
+    int *data, *comparedata;
+
+    /* Check app data works */
+    data = (int *)SSL_get_app_data(s);
+    comparedata = SSL_is_server(s) ? &serverquicdata : &clientquicdata;
+
+    if (!TEST_true(comparedata == data))
+        return 0;
+
+    return 1;
+}
+
 static int crypto_send_cb(SSL *s, const unsigned char *buf, size_t buf_len,
-                          size_t *consumed, void *arg)
+    size_t *consumed, void *arg)
 {
     struct quic_tls_test_data *data = (struct quic_tls_test_data *)arg;
     struct quic_tls_test_data *peer = data->peer;
     size_t max_len = sizeof(peer->rcd_data[data->wenc_level])
-                     - peer->rcd_data_len[data->wenc_level];
+        - peer->rcd_data_len[data->wenc_level];
+
+    if (!check_app_data(s)) {
+        data->err = 1;
+        return 0;
+    }
 
     if (buf_len > max_len)
         buf_len = max_len;
@@ -12607,17 +12732,23 @@ static int crypto_send_cb(SSL *s, const unsigned char *buf, size_t buf_len,
     }
 
     memcpy(peer->rcd_data[data->wenc_level]
-           + peer->rcd_data_len[data->wenc_level], buf, buf_len);
+            + peer->rcd_data_len[data->wenc_level],
+        buf, buf_len);
     peer->rcd_data_len[data->wenc_level] += buf_len;
 
     *consumed = buf_len;
     return 1;
 }
 static int crypto_recv_rcd_cb(SSL *s, const unsigned char **buf,
-                              size_t *bytes_read, void *arg)
+    size_t *bytes_read, void *arg)
 {
     struct quic_tls_test_data *data = (struct quic_tls_test_data *)arg;
 
+    if (!check_app_data(s)) {
+        data->err = 1;
+        return 0;
+    }
+
     *bytes_read = data->rcd_data_len[data->renc_level];
     *buf = data->rcd_data[data->renc_level];
     return 1;
@@ -12627,8 +12758,20 @@ static int crypto_release_rcd_cb(SSL *s, size_t bytes_read, void *arg)
 {
     struct quic_tls_test_data *data = (struct quic_tls_test_data *)arg;
 
+    if (!check_app_data(s)) {
+        data->err = 1;
+        return 0;
+    }
+
+    /* See if we need to force a failure in this callback */
+    if (data->forcefail) {
+        data->forcefail = 0;
+        data->err = 1;
+        return 0;
+    }
+
     if (!TEST_size_t_eq(bytes_read, data->rcd_data_len[data->renc_level])
-            || !TEST_size_t_gt(bytes_read, 0)) {
+        || !TEST_size_t_gt(bytes_read, 0)) {
         data->err = 1;
         return 0;
     }
@@ -12637,14 +12780,105 @@ static int crypto_release_rcd_cb(SSL *s, size_t bytes_read, void *arg)
     return 1;
 }
 
+struct secret_yield_entry {
+    uint8_t recorded;
+    int prot_level;
+    int direction;
+    int sm_generation;
+    SSL *ssl;
+};
+
+static struct secret_yield_entry secret_history[16];
+static int secret_history_idx = 0;
+/*
+ * Note, this enum needs to match the direction values passed
+ * to yield_secret_cb
+ */
+typedef enum {
+    LAST_DIR_READ = 0,
+    LAST_DIR_WRITE = 1,
+    LAST_DIR_UNSET = 2
+} last_dir_history_state;
+
+static int check_secret_history(SSL *s)
+{
+    int i;
+    int ret = 0;
+    last_dir_history_state last_state = LAST_DIR_UNSET;
+    int last_prot_level = 0;
+    int last_generation = 0;
+
+    TEST_info("Checking history for %p\n", (void *)s);
+    for (i = 0; secret_history[i].recorded == 1; i++) {
+        if (secret_history[i].ssl != s)
+            continue;
+        TEST_info("Got %s(%d) secret for level %d, last level %d, last state %d, gen %d\n",
+            secret_history[i].direction == 1 ? "Write" : "Read", secret_history[i].direction,
+            secret_history[i].prot_level, last_prot_level, last_state,
+            secret_history[i].sm_generation);
+
+        if (last_state == LAST_DIR_UNSET) {
+            last_prot_level = secret_history[i].prot_level;
+            last_state = secret_history[i].direction;
+            last_generation = secret_history[i].sm_generation;
+            continue;
+        }
+
+        switch (secret_history[i].direction) {
+        case 1:
+            /*
+             * write case
+             * NOTE: There is an odd corner case here.  It may occur that
+             * in a single iteration of the state machine, the read key is yielded
+             * prior to the write key for the same level.  This is undesirable
+             * for quic, but it is ok, as the general implementation of every 3rd
+             * party quic stack while preferring write keys before read, allows
+             * for read before write if both keys are yielded in the same call
+             * to SSL_do_handshake, as the tls adaptation code for that quic stack
+             * can then cache keys until both are available, so we allow read before
+             * write here iff they occur in the same iteration of SSL_do_handshake
+             * as represented by the recorded sm_generation value.
+             */
+            if (last_prot_level == secret_history[i].prot_level
+                && last_state == LAST_DIR_READ) {
+                if (last_generation == secret_history[i].sm_generation) {
+                    TEST_info("Read before write key in same SSL state machine iteration is ok");
+                } else {
+                    TEST_error("Got read key before write key");
+                    goto end;
+                }
+            }
+            /* FALLTHROUGH */
+        case 0:
+            /*
+             * Read case
+             */
+            break;
+        default:
+            TEST_error("Unknown direction");
+            goto end;
+        }
+        last_prot_level = secret_history[i].prot_level;
+        last_state = secret_history[i].direction;
+        last_generation = secret_history[i].sm_generation;
+    }
+
+    ret = 1;
+end:
+    return ret;
+}
+
 static int yield_secret_cb(SSL *s, uint32_t prot_level, int direction,
-                           const unsigned char *secret, size_t secret_len,
-                           void *arg)
+    const unsigned char *secret, size_t secret_len,
+    void *arg)
 {
     struct quic_tls_test_data *data = (struct quic_tls_test_data *)arg;
 
+    if (!check_app_data(s))
+        goto err;
+
     if (prot_level < OSSL_RECORD_PROTECTION_LEVEL_EARLY
-            || prot_level > OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
+        || prot_level > OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
         goto err;
 
     switch (direction) {
@@ -12668,18 +12902,45 @@ static int yield_secret_cb(SSL *s, uint32_t prot_level, int direction,
         goto err;
     }
 
+    secret_history[secret_history_idx].direction = direction;
+    secret_history[secret_history_idx].prot_level = (int)prot_level;
+    secret_history[secret_history_idx].recorded = 1;
+    secret_history[secret_history_idx].ssl = s;
+    secret_history[secret_history_idx].sm_generation = data->sm_count;
+    secret_history_idx++;
     return 1;
- err:
+err:
     data->err = 1;
     return 0;
 }
 
+static int yield_secret_cb_fail(SSL *s, uint32_t prot_level, int direction,
+    const unsigned char *secret, size_t secret_len,
+    void *arg)
+{
+    (void)s;
+    (void)prot_level;
+    (void)direction;
+    (void)secret;
+    (void)secret_len;
+    (void)arg;
+    /*
+     * This callback is to test double free in quic tls
+     */
+    return 0;
+}
+
 static int got_transport_params_cb(SSL *s, const unsigned char *params,
-                                   size_t params_len,
-                                   void *arg)
+    size_t params_len,
+    void *arg)
 {
     struct quic_tls_test_data *data = (struct quic_tls_test_data *)arg;
 
+    if (!check_app_data(s)) {
+        data->err = 1;
+        return 0;
+    }
+
     if (!TEST_size_t_le(params_len, sizeof(data->params))) {
         data->err = 1;
         return 0;
@@ -12695,30 +12956,40 @@ static int alert_cb(SSL *s, unsigned char alert_code, void *arg)
 {
     struct quic_tls_test_data *data = (struct quic_tls_test_data *)arg;
 
+    if (!check_app_data(s)) {
+        data->err = 1;
+        return 0;
+    }
+
     data->alert = 1;
     return 1;
 }
 
 /*
  * Test the QUIC TLS API
+ * Test 0: Normal run
+ * Test 1: Force a failure
+ * Test 3: Use a CCM based ciphersuite
+ * Test 4: fail yield_secret_cb to see double free
+ * Test 5: Normal run with SNI
  */
-static int test_quic_tls(void)
+static int test_quic_tls(int idx)
 {
-    SSL_CTX *sctx = NULL, *cctx = NULL;
+    SSL_CTX *sctx = NULL, *sctx2 = NULL, *cctx = NULL;
     SSL *serverssl = NULL, *clientssl = NULL;
     int testresult = 0;
-    const OSSL_DISPATCH qtdis[] = {
-        {OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_SEND, (void (*)(void))crypto_send_cb},
-        {OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RECV_RCD,
-         (void (*)(void))crypto_recv_rcd_cb},
-        {OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RELEASE_RCD,
-         (void (*)(void))crypto_release_rcd_cb},
-        {OSSL_FUNC_SSL_QUIC_TLS_YIELD_SECRET,
-         (void (*)(void))yield_secret_cb},
-        {OSSL_FUNC_SSL_QUIC_TLS_GOT_TRANSPORT_PARAMS,
-         (void (*)(void))got_transport_params_cb},
-        {OSSL_FUNC_SSL_QUIC_TLS_ALERT, (void (*)(void))alert_cb},
-        {0, NULL}
+    OSSL_DISPATCH qtdis[] = {
+        { OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_SEND, (void (*)(void))crypto_send_cb },
+        { OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RECV_RCD,
+            (void (*)(void))crypto_recv_rcd_cb },
+        { OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RELEASE_RCD,
+            (void (*)(void))crypto_release_rcd_cb },
+        { OSSL_FUNC_SSL_QUIC_TLS_YIELD_SECRET,
+            (void (*)(void))yield_secret_cb },
+        { OSSL_FUNC_SSL_QUIC_TLS_GOT_TRANSPORT_PARAMS,
+            (void (*)(void))got_transport_params_cb },
+        { OSSL_FUNC_SSL_QUIC_TLS_ALERT, (void (*)(void))alert_cb },
+        { 0, NULL }
     };
     struct quic_tls_test_data sdata, cdata;
     const unsigned char cparams[] = {
@@ -12729,72 +13000,136 @@ static int test_quic_tls(void)
     };
     int i;
 
+    if (idx == 4)
+        qtdis[3].function = (void (*)(void))yield_secret_cb_fail;
+
+    snicb = 0;
+    memset(secret_history, 0, sizeof(secret_history));
+    secret_history_idx = 0;
     memset(&sdata, 0, sizeof(sdata));
     memset(&cdata, 0, sizeof(cdata));
     sdata.peer = &cdata;
     cdata.peer = &sdata;
+    if (idx == 1)
+        sdata.forcefail = 1;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_3_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_3_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
+    if (idx == 5) {
+        if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(), NULL,
+                TLS1_3_VERSION, 0,
+                &sctx2, NULL, cert, privkey)))
+            goto end;
+
+        /* Set up SNI */
+        if (!TEST_true(SSL_CTX_set_tlsext_servername_callback(sctx, sni_cb))
+            || !TEST_true(SSL_CTX_set_tlsext_servername_arg(sctx, sctx2)))
+            goto end;
+    }
+
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL,
-                                      NULL)))
+            NULL)))
+        goto end;
+
+    /* Reset the BIOs we set in create_ssl_objects. We should not need them */
+    SSL_set_bio(serverssl, NULL, NULL);
+    SSL_set_bio(clientssl, NULL, NULL);
+
+    if (idx == 2) {
+        if (!TEST_true(SSL_set_ciphersuites(serverssl, "TLS_AES_128_CCM_SHA256"))
+            || !TEST_true(SSL_set_ciphersuites(clientssl, "TLS_AES_128_CCM_SHA256")))
+            goto end;
+    }
+
+    if (!TEST_true(SSL_set_app_data(clientssl, &clientquicdata))
+        || !TEST_true(SSL_set_app_data(serverssl, &serverquicdata)))
         goto end;
 
     if (!TEST_true(SSL_set_quic_tls_cbs(clientssl, qtdis, &cdata))
-            || !TEST_true(SSL_set_quic_tls_cbs(serverssl, qtdis, &sdata))
-            || !TEST_true(SSL_set_quic_tls_transport_params(clientssl, cparams,
-                                                            sizeof(cparams)))
-            || !TEST_true(SSL_set_quic_tls_transport_params(serverssl, sparams,
-                                                            sizeof(sparams))))
+        || !TEST_true(SSL_set_quic_tls_cbs(serverssl, qtdis, &sdata))
+        || !TEST_true(SSL_set_quic_tls_transport_params(clientssl, cparams,
+            sizeof(cparams)))
+        || !TEST_true(SSL_set_quic_tls_transport_params(serverssl, sparams,
+            sizeof(sparams))))
         goto end;
 
-    if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
+    if (idx != 1 && idx != 4) {
+        if (!TEST_true(create_ssl_connection_ex(serverssl, clientssl, SSL_ERROR_NONE,
+                &cdata.sm_count, &sdata.sm_count)))
+            goto end;
+    } else {
+        /* We expect this connection to fail */
+        if (!TEST_false(create_ssl_connection_ex(serverssl, clientssl, SSL_ERROR_NONE,
+                &cdata.sm_count, &sdata.sm_count)))
+            goto end;
+        testresult = 1;
+        sdata.err = 0;
         goto end;
+    }
+
+    /* We should have had the SNI callback called exactly once */
+    if (idx == 5) {
+        if (!TEST_int_eq(snicb, 1))
+            goto end;
+    }
 
     /* Check no problems during the handshake */
     if (!TEST_false(sdata.alert)
-            || !TEST_false(cdata.alert)
-            || !TEST_false(sdata.err)
-            || !TEST_false(cdata.err))
+        || !TEST_false(cdata.alert)
+        || !TEST_false(sdata.err)
+        || !TEST_false(cdata.err))
         goto end;
 
     /* Check the secrets all match */
     for (i = OSSL_RECORD_PROTECTION_LEVEL_EARLY - 1;
-         i < OSSL_RECORD_PROTECTION_LEVEL_APPLICATION;
-         i++) {
+        i < OSSL_RECORD_PROTECTION_LEVEL_APPLICATION;
+        i++) {
         if (!TEST_mem_eq(sdata.wsecret[i], sdata.wsecret_len[i],
-                         cdata.rsecret[i], cdata.rsecret_len[i]))
+                cdata.rsecret[i], cdata.rsecret_len[i]))
             goto end;
     }
 
+    /*
+     * Check that our secret history yields write secrets before read secrets
+     */
+    if (!TEST_int_eq(check_secret_history(serverssl), 1))
+        goto end;
+    if (!TEST_int_eq(check_secret_history(clientssl), 1))
+        goto end;
+
     /* Check the transport params */
     if (!TEST_mem_eq(sdata.params, sdata.params_len, cparams, sizeof(cparams))
-            || !TEST_mem_eq(cdata.params, cdata.params_len, sparams,
-                            sizeof(sparams)))
+        || !TEST_mem_eq(cdata.params, cdata.params_len, sparams,
+            sizeof(sparams)))
         goto end;
 
     /* Check the encryption levels are what we expect them to be */
     if (!TEST_true(sdata.renc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
-            || !TEST_true(sdata.wenc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
-            || !TEST_true(cdata.renc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
-            || !TEST_true(cdata.wenc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION))
+        || !TEST_true(sdata.wenc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
+        || !TEST_true(cdata.renc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
+        || !TEST_true(cdata.wenc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION))
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_free(serverssl);
     SSL_free(clientssl);
+    SSL_CTX_free(sctx2);
     SSL_CTX_free(sctx);
     SSL_CTX_free(cctx);
 
+    /* Check that we didn't suddenly hit an unexpected failure during cleanup */
+    if (!TEST_false(sdata.err) || !TEST_false(cdata.err))
+        testresult = 0;
+
     return testresult;
 }
 
 static void assert_no_end_of_early_data(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)
 {
     const unsigned char *msg = buf;
 
@@ -12809,17 +13144,17 @@ static int test_quic_tls_early_data(void)
     int testresult = 0;
     SSL_SESSION *sess = NULL;
     const OSSL_DISPATCH qtdis[] = {
-        {OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_SEND, (void (*)(void))crypto_send_cb},
-        {OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RECV_RCD,
-         (void (*)(void))crypto_recv_rcd_cb},
-        {OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RELEASE_RCD,
-         (void (*)(void))crypto_release_rcd_cb},
-        {OSSL_FUNC_SSL_QUIC_TLS_YIELD_SECRET,
-         (void (*)(void))yield_secret_cb},
-        {OSSL_FUNC_SSL_QUIC_TLS_GOT_TRANSPORT_PARAMS,
-         (void (*)(void))got_transport_params_cb},
-        {OSSL_FUNC_SSL_QUIC_TLS_ALERT, (void (*)(void))alert_cb},
-        {0, NULL}
+        { OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_SEND, (void (*)(void))crypto_send_cb },
+        { OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RECV_RCD,
+            (void (*)(void))crypto_recv_rcd_cb },
+        { OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RELEASE_RCD,
+            (void (*)(void))crypto_release_rcd_cb },
+        { OSSL_FUNC_SSL_QUIC_TLS_YIELD_SECRET,
+            (void (*)(void))yield_secret_cb },
+        { OSSL_FUNC_SSL_QUIC_TLS_GOT_TRANSPORT_PARAMS,
+            (void (*)(void))got_transport_params_cb },
+        { OSSL_FUNC_SSL_QUIC_TLS_ALERT, (void (*)(void))alert_cb },
+        { 0, NULL }
     };
     struct quic_tls_test_data sdata, cdata;
     const unsigned char cparams[] = {
@@ -12830,6 +13165,8 @@ static int test_quic_tls_early_data(void)
     };
     int i;
 
+    memset(secret_history, 0, sizeof(secret_history));
+    secret_history_idx = 0;
     memset(&sdata, 0, sizeof(sdata));
     memset(&cdata, 0, sizeof(cdata));
     sdata.peer = &cdata;
@@ -12837,15 +13174,15 @@ static int test_quic_tls_early_data(void)
     end_of_early_data = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
-                                       TLS_client_method(), TLS1_3_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(), TLS1_3_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         goto end;
 
     SSL_CTX_set_max_early_data(sctx, 0xffffffff);
     SSL_CTX_set_max_early_data(cctx, 0xffffffff);
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL,
-                                      NULL)))
+            NULL)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
@@ -12859,68 +13196,90 @@ static int test_quic_tls_early_data(void)
     serverssl = clientssl = NULL;
 
     if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl,
-                                      &clientssl, NULL, NULL))
-            || !TEST_true(SSL_set_session(clientssl, sess)))
-        return 0;
+            &clientssl, NULL, NULL))
+        || !TEST_true(SSL_set_session(clientssl, sess)))
+        goto end;
+
+    /* Reset the BIOs we set in create_ssl_objects. We should not need them */
+    SSL_set_bio(serverssl, NULL, NULL);
+    SSL_set_bio(clientssl, NULL, NULL);
+
+    if (!TEST_true(SSL_set_app_data(clientssl, &clientquicdata))
+        || !TEST_true(SSL_set_app_data(serverssl, &serverquicdata)))
+        goto end;
 
     if (!TEST_true(SSL_set_quic_tls_cbs(clientssl, qtdis, &cdata))
-            || !TEST_true(SSL_set_quic_tls_cbs(serverssl, qtdis, &sdata))
-            || !TEST_true(SSL_set_quic_tls_transport_params(clientssl, cparams,
-                                                            sizeof(cparams)))
-            || !TEST_true(SSL_set_quic_tls_transport_params(serverssl, sparams,
-                                                            sizeof(sparams))))
+        || !TEST_true(SSL_set_quic_tls_cbs(serverssl, qtdis, &sdata))
+        || !TEST_true(SSL_set_quic_tls_transport_params(clientssl, cparams,
+            sizeof(cparams)))
+        || !TEST_true(SSL_set_quic_tls_transport_params(serverssl, sparams,
+            sizeof(sparams))))
         goto end;
 
+    /*
+     * Reset our secret history so we get the record of the second connection
+     */
+    memset(secret_history, 0, sizeof(secret_history));
+    secret_history_idx = 0;
+
     SSL_set_quic_tls_early_data_enabled(serverssl, 1);
     SSL_set_quic_tls_early_data_enabled(clientssl, 1);
 
     SSL_set_msg_callback(serverssl, assert_no_end_of_early_data);
     SSL_set_msg_callback(clientssl, assert_no_end_of_early_data);
 
-    if (!TEST_int_eq(SSL_connect(clientssl), 0)
-            || !TEST_int_eq(SSL_accept(serverssl), 0)
-            || !TEST_int_eq(SSL_get_early_data_status(serverssl), SSL_EARLY_DATA_ACCEPTED)
-            || !TEST_int_eq(SSL_get_error(clientssl, 0), SSL_ERROR_WANT_READ)
-            || !TEST_int_eq(SSL_get_error(serverssl, 0), SSL_ERROR_WANT_READ))
+    if (!TEST_int_eq(SSL_connect(clientssl), -1)
+        || !TEST_int_eq(SSL_accept(serverssl), -1)
+        || !TEST_int_eq(SSL_get_early_data_status(serverssl), SSL_EARLY_DATA_ACCEPTED)
+        || !TEST_int_eq(SSL_get_error(clientssl, 0), SSL_ERROR_WANT_READ)
+        || !TEST_int_eq(SSL_get_error(serverssl, 0), SSL_ERROR_WANT_READ))
         goto end;
 
     /* Check the encryption levels are what we expect them to be */
-    if (!TEST_true(sdata.renc_level == OSSL_RECORD_PROTECTION_LEVEL_EARLY)
-            || !TEST_true(sdata.wenc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
-            || !TEST_true(cdata.renc_level == OSSL_RECORD_PROTECTION_LEVEL_NONE)
-            || !TEST_true(cdata.wenc_level == OSSL_RECORD_PROTECTION_LEVEL_EARLY))
+    if (!TEST_true(sdata.renc_level == OSSL_RECORD_PROTECTION_LEVEL_HANDSHAKE)
+        || !TEST_true(sdata.wenc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
+        || !TEST_true(cdata.renc_level == OSSL_RECORD_PROTECTION_LEVEL_NONE)
+        || !TEST_true(cdata.wenc_level == OSSL_RECORD_PROTECTION_LEVEL_EARLY))
         goto end;
 
-    if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
+    sdata.sm_count = 0;
+    cdata.sm_count = 0;
+    if (!TEST_true(create_ssl_connection_ex(serverssl, clientssl, SSL_ERROR_NONE,
+            &cdata.sm_count, &sdata.sm_count)))
         goto end;
 
     /* Check no problems during the handshake */
     if (!TEST_false(sdata.alert)
-            || !TEST_false(cdata.alert)
-            || !TEST_false(sdata.err)
-            || !TEST_false(cdata.err))
+        || !TEST_false(cdata.alert)
+        || !TEST_false(sdata.err)
+        || !TEST_false(cdata.err))
         goto end;
 
     /* Check the secrets all match */
     for (i = OSSL_RECORD_PROTECTION_LEVEL_EARLY - 1;
-         i < OSSL_RECORD_PROTECTION_LEVEL_APPLICATION;
-         i++) {
+        i < OSSL_RECORD_PROTECTION_LEVEL_APPLICATION;
+        i++) {
         if (!TEST_mem_eq(sdata.wsecret[i], sdata.wsecret_len[i],
-                         cdata.rsecret[i], cdata.rsecret_len[i]))
+                cdata.rsecret[i], cdata.rsecret_len[i]))
             goto end;
     }
 
+    if (!TEST_int_eq(check_secret_history(serverssl), 1))
+        goto end;
+    if (!TEST_int_eq(check_secret_history(clientssl), 1))
+        goto end;
+
     /* Check the transport params */
     if (!TEST_mem_eq(sdata.params, sdata.params_len, cparams, sizeof(cparams))
-            || !TEST_mem_eq(cdata.params, cdata.params_len, sparams,
-                            sizeof(sparams)))
+        || !TEST_mem_eq(cdata.params, cdata.params_len, sparams,
+            sizeof(sparams)))
         goto end;
 
     /* Check the encryption levels are what we expect them to be */
     if (!TEST_true(sdata.renc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
-            || !TEST_true(sdata.wenc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
-            || !TEST_true(cdata.renc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
-            || !TEST_true(cdata.wenc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION))
+        || !TEST_true(sdata.wenc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
+        || !TEST_true(cdata.renc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION)
+        || !TEST_true(cdata.wenc_level == OSSL_RECORD_PROTECTION_LEVEL_APPLICATION))
         goto end;
 
     /* Check there is no EndOfEearlyData in handshake */
@@ -12928,7 +13287,7 @@ static int test_quic_tls_early_data(void)
         goto end;
 
     testresult = 1;
- end:
+end:
     SSL_SESSION_free(sess);
     SSL_SESSION_free(clientpsk);
     SSL_SESSION_free(serverpsk);
@@ -12942,6 +13301,212 @@ static int test_quic_tls_early_data(void)
 }
 #endif /* !defined(OSSL_NO_USABLE_TLS1_3) */
 
+static int test_no_renegotiation(int idx)
+{
+    SSL_CTX *sctx = NULL, *cctx = NULL;
+    SSL *serverssl = NULL, *clientssl = NULL;
+    int testresult = 0, ret;
+    int max_proto;
+    const SSL_METHOD *sm, *cm;
+    unsigned char buf[5];
+
+    if (idx == 0) {
+#ifndef OPENSSL_NO_TLS1_2
+        max_proto = TLS1_2_VERSION;
+        sm = TLS_server_method();
+        cm = TLS_client_method();
+#else
+        return TEST_skip("TLSv1.2 is disabled in this build");
+#endif
+    } else {
+#ifndef OPENSSL_NO_DTLS1_2
+        max_proto = DTLS1_2_VERSION;
+        sm = DTLS_server_method();
+        cm = DTLS_client_method();
+#else
+        return TEST_skip("DTLSv1.2 is disabled in this build");
+#endif
+    }
+    if (!TEST_true(create_ssl_ctx_pair(libctx, sm, cm, 0, max_proto,
+            &sctx, &cctx, cert, privkey)))
+        goto end;
+
+    SSL_CTX_set_options(sctx, SSL_OP_NO_RENEGOTIATION);
+
+    if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL,
+            NULL)))
+        goto end;
+
+    if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
+        goto end;
+
+    if (!TEST_true(SSL_renegotiate(clientssl))
+        || !TEST_int_le(ret = SSL_connect(clientssl), 0)
+        || !TEST_int_eq(SSL_get_error(clientssl, ret), SSL_ERROR_WANT_READ))
+        goto end;
+
+    /*
+     * We've not sent any application data, so we expect this to fail. It should
+     * also read the renegotiation attempt, and send back a no_renegotiation
+     * warning alert because we have renegotiation disabled.
+     */
+    if (!TEST_int_le(ret = SSL_read(serverssl, buf, sizeof(buf)), 0))
+        goto end;
+    if (!TEST_int_eq(SSL_get_error(serverssl, ret), SSL_ERROR_WANT_READ))
+        goto end;
+
+    /*
+     * The client should now see the no_renegotiation warning and fail the
+     * connection
+     */
+    if (!TEST_int_le(ret = SSL_connect(clientssl), 0)
+        || !TEST_int_eq(SSL_get_error(clientssl, ret), SSL_ERROR_SSL)
+        || !TEST_int_eq(ERR_GET_REASON(ERR_get_error()), SSL_R_NO_RENEGOTIATION))
+        goto end;
+
+    testresult = 1;
+end:
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    SSL_CTX_free(sctx);
+    SSL_CTX_free(cctx);
+
+    return testresult;
+}
+
+#if defined(DO_SSL_TRACE_TEST)
+/*
+ * Tests that the SSL_trace() msg_callback works as expected with a PQ Groups.
+ */
+static int test_ssl_trace(void)
+{
+    SSL_CTX *sctx = NULL, *cctx = NULL;
+    SSL *serverssl = NULL, *clientssl = NULL;
+    int testresult = 0;
+    BIO *bio = NULL;
+    char *reffile = NULL;
+    char *grouplist = "MLKEM512:MLKEM768:MLKEM1024:X25519MLKEM768:SecP256r1MLKEM768"
+                      ":SecP384r1MLKEM1024:secp521r1:secp384r1:secp256r1";
+
+    if (!fips_provider_version_ge(libctx, 3, 5, 0))
+        return TEST_skip("FIPS provider does not support MLKEM algorithms");
+
+    if (!TEST_true(create_ssl_ctx_pair(libctx, TLS_server_method(),
+            TLS_client_method(),
+            TLS1_3_VERSION, TLS1_3_VERSION,
+            &sctx, &cctx, cert, privkey))
+        || !TEST_ptr(bio = BIO_new(BIO_s_mem()))
+        || !TEST_true(SSL_CTX_set1_groups_list(sctx, grouplist))
+        || !TEST_true(SSL_CTX_set1_groups_list(cctx, grouplist))
+        || !TEST_true(SSL_CTX_set_ciphersuites(cctx,
+            "TLS_AES_128_GCM_SHA256"))
+        || !TEST_true(SSL_CTX_set_ciphersuites(sctx,
+            "TLS_AES_128_GCM_SHA256"))
+#ifdef SSL_OP_LEGACY_EC_POINT_FORMATS
+        || !TEST_true(SSL_CTX_set_options(cctx, SSL_OP_LEGACY_EC_POINT_FORMATS))
+        || !TEST_true(SSL_CTX_set_options(sctx, SSL_OP_LEGACY_EC_POINT_FORMATS))
+#endif
+        || !TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl,
+            NULL, NULL)))
+        goto err;
+
+    SSL_set_msg_callback(clientssl, SSL_trace);
+    SSL_set_msg_callback_arg(clientssl, bio);
+
+    if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
+        goto err;
+
+    /* Skip the comparison of the trace when the fips provider is used. */
+    if (is_fips) {
+        /* Check whether there was something written. */
+        if (!TEST_int_gt(BIO_pending(bio), 0))
+            goto err;
+    } else {
+
+#ifdef OPENSSL_NO_ZLIB
+        reffile = test_mk_file_path(datadir, "ssltraceref.txt");
+#else
+        reffile = test_mk_file_path(datadir, "ssltraceref-zlib.txt");
+#endif
+        if (!TEST_true(compare_with_reference_file(bio, reffile)))
+            goto err;
+    }
+
+    testresult = 1;
+err:
+    BIO_free(bio);
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    SSL_CTX_free(sctx);
+    SSL_CTX_free(cctx);
+    OPENSSL_free(reffile);
+
+    return testresult;
+}
+#endif
+
+/*
+ * Test that SSL_CTX_set1_groups() when called with a list where the first
+ * entry is unsupported, will send a key_share that uses the next usable entry.
+ */
+static int test_ssl_set_groups_unsupported_keyshare(int idx)
+{
+#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
+    int testresult = 0;
+    SSL_CTX *sctx = NULL, *cctx = NULL;
+    SSL *serverssl = NULL, *clientssl = NULL;
+    int client_groups[] = {
+        NID_brainpoolP256r1tls13,
+        NID_sect163k1,
+        NID_secp384r1,
+        NID_ffdhe2048,
+    };
+
+    switch (idx) {
+    case 1:
+        client_groups[0] = NID_id_tc26_gost_3410_2012_512_paramSetC;
+        if (sizeof(unsigned long) == 4) {
+            return TEST_skip("SSL_CTX_set1_groups() is broken on 32-bit systems with TLS"
+                             " group IDs > 0x20, see https://github.com/openssl/openssl/issues/29196");
+        }
+        break;
+    }
+
+    if (!TEST_true(create_ssl_ctx_pair(libctx,
+            TLS_server_method(),
+            TLS_client_method(),
+            0, 0,
+            &sctx,
+            &cctx,
+            cert,
+            privkey)))
+        goto end;
+
+    if (!TEST_true(SSL_CTX_set1_groups(cctx,
+            client_groups,
+            OSSL_NELEM(client_groups))))
+        goto end;
+
+    if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL,
+            NULL)))
+        goto end;
+
+    if (!TEST_true(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE)))
+        goto end;
+
+    testresult = 1;
+end:
+    SSL_free(serverssl);
+    SSL_free(clientssl);
+    SSL_CTX_free(sctx);
+    SSL_CTX_free(cctx);
+
+    return testresult;
+#else /* !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH) */
+    return TEST_skip("No EC and DH support.");
+#endif /* !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH) */
+}
+
 OPT_TEST_DECLARE_USAGE("certfile privkeyfile srpvfile tmpfile provider config dhfile\n")
 
 int setup_tests(void)
@@ -12960,7 +13525,7 @@ int setup_tests(void)
      * available
      */
     if (!TEST_false(OSSL_PROVIDER_available(NULL, "default"))
-            || !TEST_false(OSSL_PROVIDER_available(NULL, "fips")))
+        || !TEST_false(OSSL_PROVIDER_available(NULL, "fips")))
         return 0;
 
     if (!test_skip_common_options()) {
@@ -12969,13 +13534,15 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(certsdir = test_get_argument(0))
-            || !TEST_ptr(srpvfile = test_get_argument(1))
-            || !TEST_ptr(tmpfilename = test_get_argument(2))
-            || !TEST_ptr(modulename = test_get_argument(3))
-            || !TEST_ptr(configfile = test_get_argument(4))
-            || !TEST_ptr(dhfile = test_get_argument(5)))
+        || !TEST_ptr(srpvfile = test_get_argument(1))
+        || !TEST_ptr(tmpfilename = test_get_argument(2))
+        || !TEST_ptr(modulename = test_get_argument(3))
+        || !TEST_ptr(configfile = test_get_argument(4))
+        || !TEST_ptr(dhfile = test_get_argument(5)))
         return 0;
 
+    datadir = test_get_argument(6);
+
     if (!TEST_true(OSSL_LIB_CTX_load_config(libctx, configfile)))
         return 0;
 
@@ -12985,7 +13552,7 @@ int setup_tests(void)
 
     /* Check the default provider is not available */
     if (strcmp(modulename, "default") != 0
-            && !TEST_false(OSSL_PROVIDER_available(libctx, "default")))
+        && !TEST_false(OSSL_PROVIDER_available(libctx, "default")))
         return 0;
 
     if (strcmp(modulename, "fips") == 0) {
@@ -12997,9 +13564,8 @@ int setup_tests(void)
         prov = OSSL_PROVIDER_load(libctx, "fips");
         if (prov != NULL) {
             /* Query the fips provider to check if the check ems option is enabled */
-            params[0] =
-                OSSL_PARAM_construct_int(OSSL_PROV_PARAM_TLS1_PRF_EMS_CHECK,
-                                         &fips_ems_check);
+            params[0] = OSSL_PARAM_construct_int(OSSL_PROV_PARAM_TLS1_PRF_EMS_CHECK,
+                &fips_ems_check);
             params[1] = OSSL_PARAM_construct_end();
             OSSL_PROVIDER_get_params(prov, params);
             OSSL_PROVIDER_unload(prov);
@@ -13011,10 +13577,9 @@ int setup_tests(void)
      * need it.
      */
     if (!TEST_true(OSSL_PROVIDER_add_builtin(libctx, "tls-provider",
-                                             tls_provider_init)))
+            tls_provider_init)))
         return 0;
 
-
     if (getenv("OPENSSL_TEST_GETCOUNTS") != NULL) {
 #ifdef OPENSSL_NO_CRYPTO_MDEBUG
         TEST_error("not supported in this build");
@@ -13026,7 +13591,7 @@ int setup_tests(void)
             test_export_key_mat(i);
         CRYPTO_get_alloc_counts(&mcount, &rcount, &fcount);
         test_printf_stdout("malloc %d realloc %d free %d\n",
-                mcount, rcount, fcount);
+            mcount, rcount, fcount);
         return 1;
 #endif
     }
@@ -13086,10 +13651,10 @@ int setup_tests(void)
         return 1;
     }
 #if !defined(OPENSSL_NO_KTLS) && !defined(OPENSSL_NO_SOCK)
-# if !defined(OPENSSL_NO_TLS1_2) || !defined(OSSL_NO_USABLE_TLS1_3)
+#if !defined(OPENSSL_NO_TLS1_2) || !defined(OSSL_NO_USABLE_TLS1_3)
     ADD_ALL_TESTS(test_ktls, NUM_KTLS_TEST_CIPHERS * 4);
     ADD_ALL_TESTS(test_ktls_sendfile, NUM_KTLS_TEST_CIPHERS * 2);
-# endif
+#endif
 #endif
     ADD_TEST(test_large_message_tls);
     ADD_TEST(test_large_message_tls_read_ahead);
@@ -13146,34 +13711,33 @@ int setup_tests(void)
     ADD_ALL_TESTS(test_early_data_psk, 8);
     ADD_ALL_TESTS(test_early_data_psk_with_all_ciphers, 7);
     ADD_ALL_TESTS(test_early_data_not_expected, 3);
-# ifndef OPENSSL_NO_TLS1_2
+#ifndef OPENSSL_NO_TLS1_2
     ADD_ALL_TESTS(test_early_data_tls1_2, 3);
-# endif
+#endif
 #endif
 #ifndef OSSL_NO_USABLE_TLS1_3
     ADD_ALL_TESTS(test_set_ciphersuite, 10);
     ADD_TEST(test_ciphersuite_change);
     ADD_ALL_TESTS(test_tls13_ciphersuite, 4);
-# ifdef OPENSSL_NO_PSK
+#ifdef OPENSSL_NO_PSK
     ADD_ALL_TESTS(test_tls13_psk, 1);
-# else
+#else
     ADD_ALL_TESTS(test_tls13_psk, 4);
-# endif  /* OPENSSL_NO_PSK */
+#endif /* OPENSSL_NO_PSK */
 #ifndef OSSL_NO_USABLE_TLS1_3
     ADD_ALL_TESTS(test_tls13_no_dhe_kex, 8);
 #endif /* OSSL_NO_USABLE_TLS1_3 */
-# ifndef OPENSSL_NO_TLS1_2
+#ifndef OPENSSL_NO_TLS1_2
     /* Test with both TLSv1.3 and 1.2 versions */
     ADD_ALL_TESTS(test_key_exchange, 21);
-#  if !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_DH)
+#if !defined(OPENSSL_NO_EC) && !defined(OPENSSL_NO_DH)
     ADD_ALL_TESTS(test_negotiated_group,
-                  4 * (OSSL_NELEM(ecdhe_kexch_groups)
-                       + OSSL_NELEM(ffdhe_kexch_groups)));
-#  endif
-# else
+        4 * (OSSL_NELEM(ecdhe_kexch_groups) + OSSL_NELEM(ffdhe_kexch_groups)));
+#endif
+#else
     /* Test with only TLSv1.3 versions */
     ADD_ALL_TESTS(test_key_exchange, 18);
-# endif
+#endif
     ADD_ALL_TESTS(test_custom_exts, 6);
     ADD_TEST(test_stateless);
     ADD_TEST(test_pha_key_update);
@@ -13228,10 +13792,10 @@ int setup_tests(void)
 #ifndef OPENSSL_NO_TLS1_2
     ADD_TEST(test_ssl_dup);
     ADD_TEST(test_session_secret_cb);
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
     ADD_ALL_TESTS(test_set_tmp_dh, 11);
     ADD_ALL_TESTS(test_dh_auto, 7);
-# endif
+#endif
 #endif
 #ifndef OSSL_NO_USABLE_TLS1_3
     ADD_TEST(test_sni_tls13);
@@ -13267,12 +13831,18 @@ int setup_tests(void)
 #endif
     ADD_ALL_TESTS(test_alpn, 4);
 #if !defined(OSSL_NO_USABLE_TLS1_3)
-    ADD_TEST(test_quic_tls);
+    ADD_ALL_TESTS(test_quic_tls, 6);
     ADD_TEST(test_quic_tls_early_data);
 #endif
+    ADD_ALL_TESTS(test_no_renegotiation, 2);
+#if defined(DO_SSL_TRACE_TEST)
+    if (datadir != NULL)
+        ADD_TEST(test_ssl_trace);
+#endif
+    ADD_ALL_TESTS(test_ssl_set_groups_unsupported_keyshare, 2);
     return 1;
 
- err:
+err:
     OPENSSL_free(cert);
     OPENSSL_free(privkey);
     OPENSSL_free(cert2);
@@ -13282,7 +13852,7 @@ int setup_tests(void)
 
 void cleanup_tests(void)
 {
-# if !defined(OPENSSL_NO_TLS1_2) && !defined(OPENSSL_NO_DH)
+#if !defined(OPENSSL_NO_TLS1_2) && !defined(OPENSSL_NO_DH)
     EVP_PKEY_free(tmp_dh_params);
 #endif
     OPENSSL_free(cert);
diff --git a/test/sslbuffertest.c b/test/sslbuffertest.c
index 1ec179b59c512..c80f3f561e786 100644
--- a/test/sslbuffertest.c
+++ b/test/sslbuffertest.c
@@ -13,7 +13,7 @@
  * when the deprecated calls are not hidden
  */
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# define OPENSSL_SUPPRESS_DEPRECATED
+#define OPENSSL_SUPPRESS_DEPRECATED
 #endif
 
 #include <string.h>
@@ -24,7 +24,7 @@
 
 #ifndef OPENSSL_NO_QUIC
 /* This test does not link libssl so avoid pulling in QUIC unwrappers. */
-# define OPENSSL_NO_QUIC
+#define OPENSSL_NO_QUIC
 #endif
 
 /* We include internal headers so we can check if the buffers are allocated */
@@ -47,7 +47,7 @@ struct async_ctrs {
 static SSL_CTX *serverctx = NULL;
 static SSL_CTX *clientctx = NULL;
 
-#define MAX_ATTEMPTS    100
+#define MAX_ATTEMPTS 100
 
 static int checkbuffers(SSL *s, int isalloced)
 {
@@ -85,7 +85,7 @@ static int test_func(int test)
     char buf[sizeof(testdata)];
 
     if (!TEST_true(create_ssl_objects(serverctx, clientctx, &serverssl, &clientssl,
-                                      NULL, NULL))) {
+            NULL, NULL))) {
         TEST_error("Test %d failed: Create SSL objects failed\n", test);
         goto end;
     }
@@ -108,31 +108,26 @@ static int test_func(int test)
          * (the first one might be a retryable fail).
          */
         for (ret = -1, i = 0, len = 0; len != sizeof(testdata) && i < 2;
-             i++) {
+            i++) {
             /* test == 0 mean to free/allocate = control */
-            if (test >= 1 && (!TEST_true(SSL_free_buffers(clientssl))
-                              || !TEST_true(checkbuffers(clientssl, 0))))
+            if (test >= 1 && (!TEST_true(SSL_free_buffers(clientssl)) || !TEST_true(checkbuffers(clientssl, 0))))
                 goto end;
-            if (test >= 2 && (!TEST_true(SSL_alloc_buffers(clientssl))
-                              || !TEST_true(checkbuffers(clientssl, 1))))
+            if (test >= 2 && (!TEST_true(SSL_alloc_buffers(clientssl)) || !TEST_true(checkbuffers(clientssl, 1))))
                 goto end;
             /* allocate a second time */
-            if (test >= 3 && (!TEST_true(SSL_alloc_buffers(clientssl))
-                              || !TEST_true(checkbuffers(clientssl, 1))))
+            if (test >= 3 && (!TEST_true(SSL_alloc_buffers(clientssl)) || !TEST_true(checkbuffers(clientssl, 1))))
                 goto end;
-            if (test >= 4 && (!TEST_true(SSL_free_buffers(clientssl))
-                              || !TEST_true(checkbuffers(clientssl, 0))))
+            if (test >= 4 && (!TEST_true(SSL_free_buffers(clientssl)) || !TEST_true(checkbuffers(clientssl, 0))))
                 goto end;
 
             ret = SSL_write(clientssl, testdata + len,
-                            sizeof(testdata) - len);
+                sizeof(testdata) - len);
             if (ret > 0) {
                 len += ret;
             } else {
                 int ssl_error = SSL_get_error(clientssl, ret);
 
-                if (ssl_error == SSL_ERROR_SYSCALL ||
-                    ssl_error == SSL_ERROR_SSL) {
+                if (ssl_error == SSL_ERROR_SYSCALL || ssl_error == SSL_ERROR_SSL) {
                     TEST_error("Test %d failed: Failed to write app data\n", test);
                     goto end;
                 }
@@ -145,20 +140,15 @@ static int test_func(int test)
          * it could fail once for each byte read, including all overhead
          * bytes from the record header/padding etc.
          */
-        for (ret = -1, i = 0, len = 0; len != sizeof(testdata) &&
-                                       i < MAX_ATTEMPTS; i++) {
-            if (test >= 5 && (!TEST_true(SSL_free_buffers(serverssl))
-                              || !TEST_true(checkbuffers(serverssl, 0))))
+        for (ret = -1, i = 0, len = 0; len != sizeof(testdata) && i < MAX_ATTEMPTS; i++) {
+            if (test >= 5 && (!TEST_true(SSL_free_buffers(serverssl)) || !TEST_true(checkbuffers(serverssl, 0))))
                 goto end;
             /* free a second time */
-            if (test >= 6 && (!TEST_true(SSL_free_buffers(serverssl))
-                              || !TEST_true(checkbuffers(serverssl, 0))))
+            if (test >= 6 && (!TEST_true(SSL_free_buffers(serverssl)) || !TEST_true(checkbuffers(serverssl, 0))))
                 goto end;
-            if (test >= 7 && (!TEST_true(SSL_alloc_buffers(serverssl))
-                              || !TEST_true(checkbuffers(serverssl, 1))))
+            if (test >= 7 && (!TEST_true(SSL_alloc_buffers(serverssl)) || !TEST_true(checkbuffers(serverssl, 1))))
                 goto end;
-            if (test >= 8 && (!TEST_true(SSL_free_buffers(serverssl))
-                              || !TEST_true(checkbuffers(serverssl, 0))))
+            if (test >= 8 && (!TEST_true(SSL_free_buffers(serverssl)) || !TEST_true(checkbuffers(serverssl, 0))))
                 goto end;
 
             ret = SSL_read(serverssl, buf + len, sizeof(buf) - len);
@@ -167,8 +157,7 @@ static int test_func(int test)
             } else {
                 int ssl_error = SSL_get_error(serverssl, ret);
 
-                if (ssl_error == SSL_ERROR_SYSCALL ||
-                    ssl_error == SSL_ERROR_SSL) {
+                if (ssl_error == SSL_ERROR_SYSCALL || ssl_error == SSL_ERROR_SSL) {
                     TEST_error("Test %d failed: Failed to read app data\n", test);
                     goto end;
                 }
@@ -179,7 +168,7 @@ static int test_func(int test)
     }
 
     result = 1;
- end:
+end:
     if (!result)
         ERR_print_errors_fp(stderr);
 
@@ -220,19 +209,19 @@ static int test_free_buffers(int test)
     }
 
     if (!TEST_true(create_ssl_objects(serverctx, clientctx, &serverssl,
-                                      &clientssl, NULL, NULL)))
+            &clientssl, NULL, NULL)))
         goto end;
 
     if (pipeline) {
         if (!TEST_true(SSL_set_cipher_list(serverssl, "AES128-SHA"))
-                || !TEST_true(SSL_set_max_proto_version(serverssl,
-                                                        TLS1_2_VERSION))
-                || !TEST_true(SSL_set_max_pipelines(serverssl, 2)))
+            || !TEST_true(SSL_set_max_proto_version(serverssl,
+                TLS1_2_VERSION))
+            || !TEST_true(SSL_set_max_pipelines(serverssl, 2)))
             goto end;
     }
 
     if (!TEST_true(create_ssl_connection(serverssl, clientssl,
-                                         SSL_ERROR_NONE)))
+            SSL_ERROR_NONE)))
         goto end;
 
     /*
@@ -241,7 +230,7 @@ static int test_free_buffers(int test)
      */
     for (i = 0; i <= pipeline; i++) {
         if (!TEST_true(SSL_write_ex(clientssl, testdata, strlen(testdata),
-                                    &written)))
+                &written)))
             goto end;
     }
 
@@ -257,7 +246,7 @@ static int test_free_buffers(int test)
             readlen += strlen(testdata);
 
         if (!TEST_true(SSL_read_ex(serverssl, buf, readlen, &readbytes))
-                || !TEST_size_t_eq(readlen, readbytes))
+            || !TEST_size_t_eq(readlen, readbytes))
             goto end;
     } else {
         BIO *tmp;
@@ -266,11 +255,11 @@ static int test_free_buffers(int test)
         /* Remove all the data that is pending for read by the server */
         tmp = SSL_get_rbio(serverssl);
         if (!TEST_true(BIO_read_ex(tmp, buf, sizeof(buf), &readbytes))
-                || !TEST_size_t_lt(readbytes, sizeof(buf))
-                || !TEST_size_t_gt(readbytes, SSL3_RT_HEADER_LENGTH))
+            || !TEST_size_t_lt(readbytes, sizeof(buf))
+            || !TEST_size_t_gt(readbytes, SSL3_RT_HEADER_LENGTH))
             goto end;
 
-        switch(test) {
+        switch (test) {
         case 1:
             partial_len = SSL3_RT_HEADER_LENGTH - 1;
             break;
@@ -314,16 +303,16 @@ static int test_free_buffers(int test)
              * record.
              */
             if (!TEST_true(SSL_read_ex(serverssl, buf, sizeof(buf),
-                                        &readbytes))
-                    || !TEST_size_t_eq(readbytes, strlen(testdata)))
+                    &readbytes))
+                || !TEST_size_t_eq(readbytes, strlen(testdata)))
                 goto end;
         } else {
             /*
-            * Attempt a read. This should fail because only a partial record is
-            * available.
-            */
+             * Attempt a read. This should fail because only a partial record is
+             * available.
+             */
             if (!TEST_false(SSL_read_ex(serverssl, buf, sizeof(buf),
-                                        &readbytes)))
+                    &readbytes)))
                 goto end;
         }
     }
@@ -336,7 +325,7 @@ static int test_free_buffers(int test)
         goto end;
 
     result = 1;
- end:
+end:
     SSL_free(clientssl);
     SSL_free(serverssl);
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
@@ -361,12 +350,12 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(cert = test_get_argument(0))
-            || !TEST_ptr(pkey = test_get_argument(1)))
+        || !TEST_ptr(pkey = test_get_argument(1)))
         return 0;
 
     if (!create_ssl_ctx_pair(NULL, TLS_server_method(), TLS_client_method(),
-                             TLS1_VERSION, 0,
-                             &serverctx, &clientctx, cert, pkey)) {
+            TLS1_VERSION, 0,
+            &serverctx, &clientctx, cert, pkey)) {
         TEST_error("Failed to create SSL_CTX pair\n");
         return 0;
     }
diff --git a/test/sslcorrupttest.c b/test/sslcorrupttest.c
index 50c3bf7eebaed..dedb8c1029d82 100644
--- a/test/sslcorrupttest.c
+++ b/test/sslcorrupttest.c
@@ -44,7 +44,7 @@ static int tls_corrupt_write(BIO *bio, const char *in, int inl)
         if (!TEST_ptr(copy = OPENSSL_memdup(in, inl)))
             return 0;
         /* corrupt last bit of application data */
-        copy[inl-1] ^= 1;
+        copy[inl - 1] ^= 1;
         ret = BIO_write(next, copy, inl);
         OPENSSL_free(copy);
     } else {
@@ -100,7 +100,7 @@ static int tls_corrupt_free(BIO *bio)
     return 1;
 }
 
-#define BIO_TYPE_CUSTOM_FILTER  (0x80 | BIO_TYPE_FILTER)
+#define BIO_TYPE_CUSTOM_FILTER (0x80 | BIO_TYPE_FILTER)
 
 static BIO_METHOD *method_tls_corrupt = NULL;
 
@@ -109,7 +109,7 @@ static const BIO_METHOD *bio_f_tls_corrupt_filter(void)
 {
     if (method_tls_corrupt == NULL) {
         method_tls_corrupt = BIO_meth_new(BIO_TYPE_CUSTOM_FILTER,
-                                          "TLS corrupt filter");
+            "TLS corrupt filter");
         if (method_tls_corrupt == NULL
             || !BIO_meth_set_write(method_tls_corrupt, tls_corrupt_write)
             || !BIO_meth_set_read(method_tls_corrupt, tls_corrupt_read)
@@ -145,8 +145,8 @@ static int setup_cipher_list(void)
     int i, j, numciphers = 0;
 
     if (!TEST_ptr(ctx = SSL_CTX_new(TLS_server_method()))
-            || !TEST_ptr(ssl = SSL_new(ctx))
-            || !TEST_ptr(sk_ciphers = SSL_get1_supported_ciphers(ssl)))
+        || !TEST_ptr(ssl = SSL_new(ctx))
+        || !TEST_ptr(sk_ciphers = SSL_get1_supported_ciphers(ssl)))
         goto err;
 
     /*
@@ -154,8 +154,7 @@ static int setup_cipher_list(void)
      * so that some of the allocated space will be wasted, but the loss
      * is deemed acceptable...
      */
-    cipher_list = OPENSSL_malloc(sk_SSL_CIPHER_num(sk_ciphers) *
-                                 sizeof(cipher_list[0]));
+    cipher_list = OPENSSL_malloc(sk_SSL_CIPHER_num(sk_ciphers) * sizeof(cipher_list[0]));
     if (!TEST_ptr(cipher_list))
         goto err;
 
@@ -195,17 +194,17 @@ static int test_ssl_corrupt(int testidx)
     TEST_info("Starting #%d, %s", testidx, cipher_list[testidx]);
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, TLS_server_method(),
-                                       TLS_client_method(),
-                                       TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey)))
+            TLS_client_method(),
+            TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey)))
         return 0;
 
     if (!TEST_true(SSL_CTX_set_dh_auto(sctx, 1))
-            || !TEST_true(SSL_CTX_set_cipher_list(cctx, cipher_list[testidx]))
-            || !TEST_true(SSL_CTX_set_ciphersuites(cctx, ""))
-            || !TEST_ptr(ciphers = SSL_CTX_get_ciphers(cctx))
-            || !TEST_int_eq(sk_SSL_CIPHER_num(ciphers), 1)
-            || !TEST_ptr(currcipher = sk_SSL_CIPHER_value(ciphers, 0)))
+        || !TEST_true(SSL_CTX_set_cipher_list(cctx, cipher_list[testidx]))
+        || !TEST_true(SSL_CTX_set_ciphersuites(cctx, ""))
+        || !TEST_ptr(ciphers = SSL_CTX_get_ciphers(cctx))
+        || !TEST_int_eq(sk_SSL_CIPHER_num(ciphers), 1)
+        || !TEST_ptr(currcipher = sk_SSL_CIPHER_value(ciphers, 0)))
         goto end;
 
     /*
@@ -220,7 +219,7 @@ static int test_ssl_corrupt(int testidx)
 
     /* BIO is freed by create_ssl_connection on error */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &server, &client, NULL,
-                                      c_to_s_fbio)))
+            c_to_s_fbio)))
         goto end;
 
     if (!TEST_true(create_ssl_connection(server, client, SSL_ERROR_NONE)))
@@ -244,7 +243,7 @@ static int test_ssl_corrupt(int testidx)
     } while (ERR_GET_REASON(err) != SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
 
     testresult = 1;
- end:
+end:
     SSL_free(server);
     SSL_free(client);
     SSL_CTX_free(sctx);
@@ -264,7 +263,7 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(cert = test_get_argument(0))
-            || !TEST_ptr(privkey = test_get_argument(1)))
+        || !TEST_ptr(privkey = test_get_argument(1)))
         return 0;
 
     n = setup_cipher_list();
diff --git a/test/stack_test.c b/test/stack_test.c
index d44e6fc93a309..2175387c0844a 100644
--- a/test/stack_test.c
+++ b/test/stack_test.c
@@ -61,23 +61,23 @@ static int test_int_stack(int reserve)
         int sorted;
         int ex;
     } finds[] = {
-        { 2,    1,  5,  5   },
-        { 9,    7,  6,  6   },
-        { -173, 5,  0,  0   },
-        { 999,  3,  8,  8   },
-        { 0,   -1, -1,  1   }
+        { 2, 1, 5, 5 },
+        { 9, 7, 6, 6 },
+        { -173, 5, 0, 0 },
+        { 999, 3, 8, 8 },
+        { 0, -1, -1, 1 }
     };
     const int n_finds = OSSL_NELEM(finds);
     static struct {
         int value;
         int ex;
     } exfinds[] = {
-        { 3,    5   },
-        { 1000, 8   },
-        { 20,   8   },
-        { -999, 0   },
-        { -5,   0   },
-        { 8,    5   }
+        { 3, 5 },
+        { 1000, 8 },
+        { 20, 8 },
+        { -999, 0 },
+        { -5, 0 },
+        { 8, 5 }
     };
     const int n_exfinds = OSSL_NELEM(exfinds);
     STACK_OF(sint) *s = sk_sint_new_null();
@@ -166,7 +166,7 @@ static int test_int_stack(int reserve)
 }
 
 static int uchar_compare(const unsigned char *const *a,
-                         const unsigned char *const *b)
+    const unsigned char *const *b)
 {
     return **a - (signed int)**b;
 }
@@ -264,7 +264,8 @@ static SS *SS_copy(const SS *p)
     return q;
 }
 
-static void SS_free(SS *p) {
+static void SS_free(SS *p)
+{
     OPENSSL_free(p);
 }
 
@@ -329,8 +330,8 @@ static int test_SS_stack(void)
     SS_free(p);
     if (!TEST_int_eq(sk_SS_num(s), n - 1))
         goto end;
-    for (i = 0; i < n-1; i++)
-        if (!TEST_ptr_eq(sk_SS_value(s, i), v[i<3 ? i : 1+i])) {
+    for (i = 0; i < n - 1; i++)
+        if (!TEST_ptr_eq(sk_SS_value(s, i), v[i < 3 ? i : 1 + i])) {
             TEST_info("SS delete ptr item %d", i);
             goto end;
         }
@@ -367,7 +368,7 @@ static int test_SU_stack(void)
 
     /* check the pointers are correct */
     for (i = 0; i < n; i++)
-        if (!TEST_ptr_eq(sk_SU_value(s, i),  v + i)) {
+        if (!TEST_ptr_eq(sk_SU_value(s, i), v + i)) {
             TEST_info("SU pointer check %d", i);
             goto end;
         }
diff --git a/test/strtoultest.c b/test/strtoultest.c
index 90ec2b9a3dcda..fbeee4845ab3c 100644
--- a/test/strtoultest.c
+++ b/test/strtoultest.c
@@ -15,54 +15,43 @@ struct strtoul_test_entry {
     char *input; /* the input string */
     int base; /* the base we are converting in */
     unsigned long expect_val; /* the expected value we should get */
-    int expect_err;  /* the expected error we expect to receive */
+    int expect_err; /* the expected error we expect to receive */
     size_t expect_endptr_offset; /* the expected endptr offset, +1 for NULL */
 };
 
 static struct strtoul_test_entry strtoul_tests[] = {
     /* pass on conv "0" to 0 */
     {
-        "0", 0, 0, 1, 1
-    },
+        "0", 0, 0, 1, 1 },
     /* pass on conv "12345" to 12345 */
     {
-        "12345", 0, 12345, 1, 5
-    },
+        "12345", 0, 12345, 1, 5 },
     /* pass on conv "0x12345" to 0x12345, base 16 */
     {
-        "0x12345", 0, 0x12345, 1, 7
-    },
+        "0x12345", 0, 0x12345, 1, 7 },
     /* pass on base 10 translation, endptr points to 'x' */
     {
-        "0x12345", 10, 0, 1, 1
-    },
+        "0x12345", 10, 0, 1, 1 },
 #if ULONG_MAX == 4294967295
     /* pass on ULONG_MAX translation */
     {
-        "4294967295", 0, ULONG_MAX, 1, 10
-    },
+        "4294967295", 0, ULONG_MAX, 1, 10 },
 #else
-    {
-        "18446744073709551615", 0, ULONG_MAX, 1, 20
-    },
+    { "18446744073709551615", 0, ULONG_MAX, 1, 20 },
 #endif
 
     /* fail on negative input */
     {
-        "-1", 0, 0, 0, 0
-    },
+        "-1", 0, 0, 0, 0 },
     /* fail on non-numerical input */
     {
-        "abcd", 0, 0, 0, 0
-    },
+        "abcd", 0, 0, 0, 0 },
     /* pass on decimal input */
     {
-        "1.0", 0, 1, 1, 1
-    },
+        "1.0", 0, 1, 1, 1 },
     /* Fail on decimal input without leading number */
     {
-        ".1", 0, 0, 0, 0
-    }
+        ".1", 0, 0, 0, 0 }
 };
 
 static int test_strtoul(int idx)
@@ -96,7 +85,6 @@ static int test_strtoul(int idx)
             return 0;
     }
     return 1;
-
 }
 
 int setup_tests(void)
diff --git a/test/sysdefaulttest.c b/test/sysdefaulttest.c
index cc756fd139475..53f063bf60129 100644
--- a/test/sysdefaulttest.c
+++ b/test/sysdefaulttest.c
@@ -37,7 +37,7 @@ static int test_func(void)
         }
     }
     ret = 1;
- err:
+err:
     SSL_CTX_free(ctx);
     return ret;
 }
@@ -45,7 +45,8 @@ static int test_func(void)
 int global_init(void)
 {
     if (!OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN
-                          | OPENSSL_INIT_LOAD_CONFIG, NULL))
+                | OPENSSL_INIT_LOAD_CONFIG,
+            NULL))
         return 0;
     return 1;
 }
diff --git a/test/test_asn1_genconf.cnf b/test/test_asn1_genconf.cnf
new file mode 100644
index 0000000000000..946bab7962723
--- /dev/null
+++ b/test/test_asn1_genconf.cnf
@@ -0,0 +1,5 @@
+asn1=SEQUENCE:seq
+
+[seq]
+impl=IMPLICIT:1,BOOL:true
+expl=EXPLICIT:2,BITWRAP,OCT:X
diff --git a/test/test_test.c b/test/test_test.c
index b31f5eb432e68..5d005e2ab9e06 100644
--- a/test/test_test.c
+++ b/test/test_test.c
@@ -392,10 +392,10 @@ static int test_long_output(void)
                     "1234567890123456789012345678901234567890123456789012"
                     "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
-    return TEST(0, TEST_str_eq(p,  q))
-           & TEST(0, TEST_str_eq(q, r))
-           & TEST(0, TEST_str_eq(r, s))
-           & TEST(0, TEST_mem_eq(r, strlen(r), s, strlen(s)));
+    return TEST(0, TEST_str_eq(p, q))
+        & TEST(0, TEST_str_eq(q, r))
+        & TEST(0, TEST_str_eq(r, s))
+        & TEST(0, TEST_mem_eq(r, strlen(r), s, strlen(s)));
 }
 
 static int test_long_bignum(void)
@@ -412,11 +412,11 @@ static int test_long_bignum(void)
     const char bs[] = "1234567890123456789012345678901234567890123456789012"
                       "1234567890123456789012345678901234567890123456789013"
                       "987657";
-    const char cs[] = "-"        /* 64 characters plus sign */
+    const char cs[] = "-" /* 64 characters plus sign */
                       "123456789012345678901234567890"
                       "123456789012345678901234567890"
                       "ABCD";
-    const char ds[] = "-"        /* 63 characters plus sign */
+    const char ds[] = "-" /* 63 characters plus sign */
                       "23456789A123456789B123456789C"
                       "123456789D123456789E123456789F"
                       "ABCD";
@@ -455,49 +455,49 @@ static int test_single_eval(void)
     size_t st = 1234;
     char buf[4] = { 0 }, *p = buf;
 
-           /* int */
+    /* int */
     return TEST_int_eq(i++, 4)
-           && TEST_int_eq(i, 5)
-           && TEST_int_gt(++i, 5)
-           && TEST_int_le(5, i++)
-           && TEST_int_ne(--i, 5)
-           && TEST_int_eq(12, i *= 2)
-           /* Long */
-           && TEST_long_eq(l--, -9000L)
-           && TEST_long_eq(++l, -9000L)
-           && TEST_long_ne(-9000L, l /= 2)
-           && TEST_long_lt(--l, -4500L)
-           /* char */
-           && TEST_char_eq(++c, 'e')
-           && TEST_char_eq('e', c--)
-           && TEST_char_ne('d', --c)
-           && TEST_char_le('b', --c)
-           && TEST_char_lt(c++, 'c')
-           /* unsigned char */
-           && TEST_uchar_eq(22, uc++)
-           && TEST_uchar_eq(uc /= 2, 11)
-           && TEST_ulong_eq(ul ^= 1, 501)
-           && TEST_ulong_eq(502, ul ^= 3)
-           && TEST_ulong_eq(ul = ul * 3 - 6, 1500)
-           /* size_t */
-           && TEST_size_t_eq((--i, st++), 1234)
-           && TEST_size_t_eq(st, 1235)
-           && TEST_int_eq(11, i)
-           /* pointers */
-           && TEST_ptr_eq(p++, buf)
-           && TEST_ptr_eq(buf + 2, ++p)
-           && TEST_ptr_eq(buf, p -= 2)
-           && TEST_ptr(++p)
-           && TEST_ptr_eq(p, buf + 1)
-           && TEST_ptr_null(p = NULL)
-           /* strings */
-           && TEST_str_eq(p = &("123456"[1]), "23456")
-           && TEST_str_eq("3456", ++p)
-           && TEST_str_ne(p++, "456")
-           /* memory */
-           && TEST_mem_eq(--p, sizeof("3456"), "3456", sizeof("3456"))
-           && TEST_mem_ne(p++, sizeof("456"), "456", sizeof("456"))
-           && TEST_mem_eq(p--, sizeof("456"), "456", sizeof("456"));
+        && TEST_int_eq(i, 5)
+        && TEST_int_gt(++i, 5)
+        && TEST_int_le(5, i++)
+        && TEST_int_ne(--i, 5)
+        && TEST_int_eq(12, i *= 2)
+        /* Long */
+        && TEST_long_eq(l--, -9000L)
+        && TEST_long_eq(++l, -9000L)
+        && TEST_long_ne(-9000L, l /= 2)
+        && TEST_long_lt(--l, -4500L)
+        /* char */
+        && TEST_char_eq(++c, 'e')
+        && TEST_char_eq('e', c--)
+        && TEST_char_ne('d', --c)
+        && TEST_char_le('b', --c)
+        && TEST_char_lt(c++, 'c')
+        /* unsigned char */
+        && TEST_uchar_eq(22, uc++)
+        && TEST_uchar_eq(uc /= 2, 11)
+        && TEST_ulong_eq(ul ^= 1, 501)
+        && TEST_ulong_eq(502, ul ^= 3)
+        && TEST_ulong_eq(ul = ul * 3 - 6, 1500)
+        /* size_t */
+        && TEST_size_t_eq((--i, st++), 1234)
+        && TEST_size_t_eq(st, 1235)
+        && TEST_int_eq(11, i)
+        /* pointers */
+        && TEST_ptr_eq(p++, buf)
+        && TEST_ptr_eq(buf + 2, ++p)
+        && TEST_ptr_eq(buf, p -= 2)
+        && TEST_ptr(++p)
+        && TEST_ptr_eq(p, buf + 1)
+        && TEST_ptr_null(p = NULL)
+        /* strings */
+        && TEST_str_eq(p = &("123456"[1]), "23456")
+        && TEST_str_eq("3456", ++p)
+        && TEST_str_ne(p++, "456")
+        /* memory */
+        && TEST_mem_eq(--p, sizeof("3456"), "3456", sizeof("3456"))
+        && TEST_mem_ne(p++, sizeof("456"), "456", sizeof("456"))
+        && TEST_mem_eq(p--, sizeof("456"), "456", sizeof("456"));
 }
 
 static int test_output(void)
@@ -524,7 +524,7 @@ static int test_bn_output(int n)
     BIGNUM *b = NULL;
 
     if (bn_output_tests[n] != NULL
-            && !TEST_true(BN_hex2bn(&b, bn_output_tests[n])))
+        && !TEST_true(BN_hex2bn(&b, bn_output_tests[n])))
         return 0;
     test_output_bignum(bn_output_tests[n], b);
     BN_free(b);
diff --git a/test/testec-sm2.pem b/test/testec-sm2.pem
new file mode 100644
index 0000000000000..30e25613b38ed
--- /dev/null
+++ b/test/testec-sm2.pem
@@ -0,0 +1,5 @@
+-----BEGIN SM2 PRIVATE KEY-----
+MHcCAQEEIKPB7gEYKGAwAkz0MfGwQm0BXclgzvSTxQG9bm4RCAxXoAoGCCqBHM9V
+AYItoUQDQgAE+FuibOpfjVfj716O3LglhK4HzjUR82mgn8kTZinQsEafw3FFZzZJ
+vwHIGHUsSKxVTRIEs+BICQDBg99OA3VU/Q==
+-----END SM2 PRIVATE KEY-----
diff --git a/test/testutil.h b/test/testutil.h
index f02dcdfba6f92..990a6503c9f7c 100644
--- a/test/testutil.h
+++ b/test/testutil.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef OSSL_TESTUTIL_H
-# define OSSL_TESTUTIL_H
+#define OSSL_TESTUTIL_H
 
-# include <stdarg.h>
-# include "internal/common.h" /* for HAS_PREFIX */
+#include <stdarg.h>
+#include "internal/common.h" /* for HAS_PREFIX */
 
-# include <openssl/provider.h>
-# include <openssl/err.h>
-# include <openssl/e_os2.h>
-# include <openssl/bn.h>
-# include <openssl/x509.h>
-# include "opt.h"
+#include <openssl/provider.h>
+#include <openssl/err.h>
+#include <openssl/e_os2.h>
+#include <openssl/bn.h>
+#include <openssl/x509.h>
+#include "opt.h"
 
 /*-
  * Simple unit tests should implement setup_tests().
@@ -49,17 +49,17 @@
  */
 
 /* Adds a simple test case. */
-# define ADD_TEST(test_function) add_test(#test_function, test_function)
+#define ADD_TEST(test_function) add_test(#test_function, test_function)
 
 /*
  * Simple parameterized tests. Calls test_function(idx) for each 0 <= idx < num.
  */
-# define ADD_ALL_TESTS(test_function, num) \
+#define ADD_ALL_TESTS(test_function, num) \
     add_all_tests(#test_function, test_function, num, 1)
 /*
  * A variant of the same without TAP output.
  */
-# define ADD_ALL_TESTS_NOSUBTEST(test_function, num) \
+#define ADD_ALL_TESTS_NOSUBTEST(test_function, num) \
     add_all_tests(#test_function, test_function, num, 0)
 
 /*-
@@ -96,76 +96,74 @@
  *      EXECUTE_FOOBAR_TEST();
  *      }
  */
-# define SETUP_TEST_FIXTURE(TEST_FIXTURE_TYPE, set_up)\
+#define SETUP_TEST_FIXTURE(TEST_FIXTURE_TYPE, set_up)    \
     TEST_FIXTURE_TYPE *fixture = set_up(TEST_CASE_NAME); \
-    int result = 0; \
-\
-    if (fixture == NULL) \
-        return 0
-
-
-# define EXECUTE_TEST(execute_func, tear_down)\
-    if (fixture != NULL) {\
-        result = execute_func(fixture);\
-        tear_down(fixture);\
+    int result = 0;                                      \
+                                                         \
+    if (fixture == NULL)                                 \
+    return 0
+
+#define EXECUTE_TEST(execute_func, tear_down) \
+    if (fixture != NULL) {                    \
+        result = execute_func(fixture);       \
+        tear_down(fixture);                   \
     }
 
 /*
  * TEST_CASE_NAME is defined as the name of the test case function where
  * possible; otherwise we get by with the file name and line number.
  */
-# if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
-#  if defined(_MSC_VER)
-#   define TEST_CASE_NAME __FUNCTION__
-#  else
-#   define testutil_stringify_helper(s) #s
-#   define testutil_stringify(s) testutil_stringify_helper(s)
-#   define TEST_CASE_NAME __FILE__ ":" testutil_stringify(__LINE__)
-#  endif                        /* _MSC_VER */
-# else
-#  define TEST_CASE_NAME __func__
-# endif                         /* __STDC_VERSION__ */
-
+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
+#if defined(_MSC_VER)
+#define TEST_CASE_NAME __FUNCTION__
+#else
+#define testutil_stringify_helper(s) #s
+#define testutil_stringify(s) testutil_stringify_helper(s)
+#define TEST_CASE_NAME __FILE__ ":" testutil_stringify(__LINE__)
+#endif /* _MSC_VER */
+#else
+#define TEST_CASE_NAME __func__
+#endif /* __STDC_VERSION__ */
 
 /* The default test enum which should be common to all tests */
-# define OPT_TEST_ENUM \
+#define OPT_TEST_ENUM    \
     OPT_TEST_HELP = 500, \
-    OPT_TEST_LIST, \
-    OPT_TEST_SINGLE, \
-    OPT_TEST_ITERATION, \
-    OPT_TEST_INDENT, \
+    OPT_TEST_LIST,       \
+    OPT_TEST_SINGLE,     \
+    OPT_TEST_ITERATION,  \
+    OPT_TEST_INDENT,     \
     OPT_TEST_SEED
 
 /* The Default test OPTIONS common to all tests (without a usage string) */
-# define OPT_TEST_OPTIONS \
-    { OPT_HELP_STR, 1,  '-', "Valid options are:\n" }, \
-    { "help", OPT_TEST_HELP, '-', "Display this summary" }, \
-    { "list", OPT_TEST_LIST, '-', "Display the list of tests available" }, \
-    { "test", OPT_TEST_SINGLE, 's', "Run a single test by id or name" }, \
-    { "iter", OPT_TEST_ITERATION, 'n', "Run a single iteration of a test" }, \
-    { "indent", OPT_TEST_INDENT,'p', "Number of tabs added to output" }, \
-    { "seed", OPT_TEST_SEED, 'n', "Seed value to randomize tests with" }
+#define OPT_TEST_OPTIONS                                                         \
+    { OPT_HELP_STR, 1, '-', "Valid options are:\n" },                            \
+        { "help", OPT_TEST_HELP, '-', "Display this summary" },                  \
+        { "list", OPT_TEST_LIST, '-', "Display the list of tests available" },   \
+        { "test", OPT_TEST_SINGLE, 's', "Run a single test by id or name" },     \
+        { "iter", OPT_TEST_ITERATION, 'n', "Run a single iteration of a test" }, \
+        { "indent", OPT_TEST_INDENT, 'p', "Number of tabs added to output" },    \
+        { "seed", OPT_TEST_SEED, 'n', "Seed value to randomize tests with" }
 
 /* The Default test OPTIONS common to all tests starting with an additional usage string */
-# define OPT_TEST_OPTIONS_WITH_EXTRA_USAGE(usage) \
+#define OPT_TEST_OPTIONS_WITH_EXTRA_USAGE(usage)            \
     { OPT_HELP_STR, 1, '-', "Usage: %s [options] " usage }, \
-    OPT_TEST_OPTIONS
+        OPT_TEST_OPTIONS
 
 /* The Default test OPTIONS common to all tests with an default usage string */
-# define OPT_TEST_OPTIONS_DEFAULT_USAGE \
+#define OPT_TEST_OPTIONS_DEFAULT_USAGE                 \
     { OPT_HELP_STR, 1, '-', "Usage: %s [options]\n" }, \
-    OPT_TEST_OPTIONS
+        OPT_TEST_OPTIONS
 
 /*
  * Optional Cases that need to be ignored by the test app when using opt_next(),
  * (that are handled internally).
  */
-# define OPT_TEST_CASES \
-         OPT_TEST_HELP: \
-    case OPT_TEST_LIST: \
-    case OPT_TEST_SINGLE: \
+#define OPT_TEST_CASES       \
+    OPT_TEST_HELP:           \
+    case OPT_TEST_LIST:      \
+    case OPT_TEST_SINGLE:    \
     case OPT_TEST_ITERATION: \
-    case OPT_TEST_INDENT: \
+    case OPT_TEST_INDENT:    \
     case OPT_TEST_SEED
 
 /*
@@ -182,16 +180,16 @@
  *      well as the additional options that need to be handled.
  *  (3) case OPT_TEST_CASES: break; inside the opt_next() handling code.
  */
-# define OPT_TEST_DECLARE_USAGE(usage_str) \
-const OPTIONS *test_get_options(void) \
-{ \
-    enum { OPT_TEST_ENUM }; \
-    static const OPTIONS options[] = { \
-        OPT_TEST_OPTIONS_WITH_EXTRA_USAGE(usage_str), \
-        { NULL } \
-    }; \
-    return options; \
-}
+#define OPT_TEST_DECLARE_USAGE(usage_str)                 \
+    const OPTIONS *test_get_options(void)                 \
+    {                                                     \
+        enum { OPT_TEST_ENUM };                           \
+        static const OPTIONS options[] = {                \
+            OPT_TEST_OPTIONS_WITH_EXTRA_USAGE(usage_str), \
+            { NULL }                                      \
+        };                                                \
+        return options;                                   \
+    }
 
 /*
  * Used to read non optional command line values that follow after the options.
@@ -215,19 +213,19 @@ int test_skip_common_options(void);
  * context.
  */
 int test_get_libctx(OSSL_LIB_CTX **libctx, OSSL_PROVIDER **default_null_prov,
-                    const char *config_file,
-                    OSSL_PROVIDER **provider, const char *module_name);
+    const char *config_file,
+    OSSL_PROVIDER **provider, const char *module_name);
 int test_arg_libctx(OSSL_LIB_CTX **libctx, OSSL_PROVIDER **default_null_prov,
-                    OSSL_PROVIDER **provider, int argn, const char *usage);
+    OSSL_PROVIDER **provider, int argn, const char *usage);
 
 /*
  * Internal helpers. Test programs shouldn't use these directly, but should
  * rather link to one of the helper main() methods.
  */
 
-void add_test(const char *test_case_name, int (*test_fn) (void));
+void add_test(const char *test_case_name, int (*test_fn)(void));
 void add_all_tests(const char *test_case_name, int (*test_fn)(int idx), int num,
-                   int subtest);
+    int subtest);
 
 /*
  * Declarations for user defined functions.
@@ -287,31 +285,31 @@ const OPTIONS *test_get_options(void);
  *  Test assumption verification helpers.
  */
 
-# define PRINTF_FORMAT(a, b)
-# if defined(__GNUC__) && defined(__STDC_VERSION__) \
+#define PRINTF_FORMAT(a, b)
+#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 PRINTF_FORMAT
-#   define PRINTF_FORMAT(a, b)   __attribute__ ((format(printf, a, b)))
-#  endif
-# endif
-
-# define DECLARE_COMPARISON(type, name, opname)                         \
-    int test_ ## name ## _ ## opname(const char *, int,                 \
-                                     const char *, const char *,        \
-                                     const type, const type);
-
-# define DECLARE_COMPARISONS(type, name)                                \
-    DECLARE_COMPARISON(type, name, eq)                                  \
-    DECLARE_COMPARISON(type, name, ne)                                  \
-    DECLARE_COMPARISON(type, name, lt)                                  \
-    DECLARE_COMPARISON(type, name, le)                                  \
-    DECLARE_COMPARISON(type, name, gt)                                  \
+/*
+ * 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 PRINTF_FORMAT
+#define PRINTF_FORMAT(a, b) __attribute__((format(printf, a, b)))
+#endif
+#endif
+
+#define DECLARE_COMPARISON(type, name, opname)    \
+    int test_##name##_##opname(const char *, int, \
+        const char *, const char *,               \
+        const type, const type);
+
+#define DECLARE_COMPARISONS(type, name) \
+    DECLARE_COMPARISON(type, name, eq)  \
+    DECLARE_COMPARISON(type, name, ne)  \
+    DECLARE_COMPARISON(type, name, lt)  \
+    DECLARE_COMPARISON(type, name, le)  \
+    DECLARE_COMPARISON(type, name, gt)  \
     DECLARE_COMPARISON(type, name, ge)
 
 DECLARE_COMPARISONS(int, int)
@@ -329,9 +327,9 @@ DECLARE_COMPARISONS(time_t, time_t)
  * Because this comparison uses a printf format specifier that's not
  * universally known (yet), we provide an option to not have it declared.
  */
-# ifndef TESTUTIL_NO_size_t_COMPARISON
+#ifndef TESTUTIL_NO_size_t_COMPARISON
 DECLARE_COMPARISONS(size_t, size_t)
-# endif
+#endif
 
 /*
  * Pointer comparisons against other pointers and null.
@@ -357,9 +355,9 @@ DECLARE_COMPARISON(char *, str, ne)
  * Same as above, but for strncmp.
  */
 int test_strn_eq(const char *file, int line, const char *, const char *,
-                 const char *a, size_t an, const char *b, size_t bn);
+    const char *a, size_t an, const char *b, size_t bn);
 int test_strn_ne(const char *file, int line, const char *, const char *,
-                 const char *a, size_t an, const char *b, size_t bn);
+    const char *a, size_t an, const char *b, size_t bn);
 
 /*
  * Equality test for memory blocks where NULL is a legitimate value.
@@ -368,9 +366,9 @@ int test_strn_ne(const char *file, int line, const char *, const char *,
  * These should not be called directly, use the TEST_xxx macros below instead.
  */
 int test_mem_eq(const char *, int, const char *, const char *,
-                const void *, size_t, const void *, size_t);
+    const void *, size_t, const void *, size_t);
 int test_mem_ne(const char *, int, const char *, const char *,
-                const void *, size_t, const void *, size_t);
+    const void *, size_t, const void *, size_t);
 
 /*
  * Check a boolean result for being true or false.
@@ -398,9 +396,9 @@ int test_BN_eq_one(const char *file, int line, const char *s, const BIGNUM *a);
 int test_BN_odd(const char *file, int line, const char *s, const BIGNUM *a);
 int test_BN_even(const char *file, int line, const char *s, const BIGNUM *a);
 int test_BN_eq_word(const char *file, int line, const char *bns, const char *ws,
-                    const BIGNUM *a, BN_ULONG w);
+    const BIGNUM *a, BN_ULONG w);
 int test_BN_abs_eq_word(const char *file, int line, const char *bns,
-                        const char *ws, const BIGNUM *a, BN_ULONG w);
+    const char *ws, const BIGNUM *a, BN_ULONG w);
 
 /*
  * Pretty print a failure message.
@@ -429,135 +427,135 @@ void test_perror(const char *s);
  *      ptr = OPENSSL_malloc(..);
  *      if (!TEST_ptr(ptr))
  */
-# define TEST_int_eq(a, b)    test_int_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int_ne(a, b)    test_int_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int_lt(a, b)    test_int_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int_le(a, b)    test_int_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int_gt(a, b)    test_int_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int_ge(a, b)    test_int_ge(__FILE__, __LINE__, #a, #b, a, b)
-
-# define TEST_uint_eq(a, b)   test_uint_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uint_ne(a, b)   test_uint_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uint_lt(a, b)   test_uint_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uint_le(a, b)   test_uint_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uint_gt(a, b)   test_uint_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uint_ge(a, b)   test_uint_ge(__FILE__, __LINE__, #a, #b, a, b)
-
-# define TEST_char_eq(a, b)   test_char_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_char_ne(a, b)   test_char_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_char_lt(a, b)   test_char_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_char_le(a, b)   test_char_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_char_gt(a, b)   test_char_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_char_ge(a, b)   test_char_ge(__FILE__, __LINE__, #a, #b, a, b)
-
-# define TEST_uchar_eq(a, b)  test_uchar_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uchar_ne(a, b)  test_uchar_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uchar_lt(a, b)  test_uchar_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uchar_le(a, b)  test_uchar_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uchar_gt(a, b)  test_uchar_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uchar_ge(a, b)  test_uchar_ge(__FILE__, __LINE__, #a, #b, a, b)
-
-# define TEST_long_eq(a, b)   test_long_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_long_ne(a, b)   test_long_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_long_lt(a, b)   test_long_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_long_le(a, b)   test_long_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_long_gt(a, b)   test_long_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_long_ge(a, b)   test_long_ge(__FILE__, __LINE__, #a, #b, a, b)
-
-# define TEST_ulong_eq(a, b)  test_ulong_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_ulong_ne(a, b)  test_ulong_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_ulong_lt(a, b)  test_ulong_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_ulong_le(a, b)  test_ulong_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_ulong_gt(a, b)  test_ulong_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_ulong_ge(a, b)  test_ulong_ge(__FILE__, __LINE__, #a, #b, a, b)
-
-# define TEST_int64_t_eq(a, b)  test_int64_t_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int64_t_ne(a, b)  test_int64_t_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int64_t_lt(a, b)  test_int64_t_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int64_t_le(a, b)  test_int64_t_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int64_t_gt(a, b)  test_int64_t_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_int64_t_ge(a, b)  test_int64_t_ge(__FILE__, __LINE__, #a, #b, a, b)
-
-# define TEST_uint64_t_eq(a, b)  test_uint64_t_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uint64_t_ne(a, b)  test_uint64_t_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uint64_t_lt(a, b)  test_uint64_t_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uint64_t_le(a, b)  test_uint64_t_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uint64_t_gt(a, b)  test_uint64_t_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_uint64_t_ge(a, b)  test_uint64_t_ge(__FILE__, __LINE__, #a, #b, a, b)
-
-# define TEST_size_t_eq(a, b) test_size_t_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_size_t_ne(a, b) test_size_t_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_size_t_lt(a, b) test_size_t_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_size_t_le(a, b) test_size_t_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_size_t_gt(a, b) test_size_t_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_size_t_ge(a, b) test_size_t_ge(__FILE__, __LINE__, #a, #b, a, b)
-
-# define TEST_double_eq(a, b) test_double_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_double_ne(a, b) test_double_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_double_lt(a, b) test_double_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_double_le(a, b) test_double_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_double_gt(a, b) test_double_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_double_ge(a, b) test_double_ge(__FILE__, __LINE__, #a, #b, a, b)
-
-# define TEST_time_t_eq(a, b) test_time_t_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_time_t_ne(a, b) test_time_t_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_time_t_lt(a, b) test_time_t_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_time_t_le(a, b) test_time_t_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_time_t_gt(a, b) test_time_t_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_time_t_ge(a, b) test_time_t_ge(__FILE__, __LINE__, #a, #b, a, b)
-
-# define TEST_ptr_eq(a, b)    test_ptr_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_ptr_ne(a, b)    test_ptr_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_ptr(a)          test_ptr(__FILE__, __LINE__, #a, a)
-# define TEST_ptr_null(a)     test_ptr_null(__FILE__, __LINE__, #a, a)
-
-# define TEST_str_eq(a, b)    test_str_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_str_ne(a, b)    test_str_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_strn_eq(a, b, n) test_strn_eq(__FILE__, __LINE__, #a, #b, a, n, b, n)
-# define TEST_strn_ne(a, b, n) test_strn_ne(__FILE__, __LINE__, #a, #b, a, n, b, n)
-# define TEST_strn2_eq(a, m, b, n) test_strn_eq(__FILE__, __LINE__, #a, #b, a, m, b, n)
-# define TEST_strn2_ne(a, m, b, n) test_strn_ne(__FILE__, __LINE__, #a, #b, a, m, b, n)
-
-# define TEST_mem_eq(a, m, b, n) test_mem_eq(__FILE__, __LINE__, #a, #b, a, m, b, n)
-# define TEST_mem_ne(a, m, b, n) test_mem_ne(__FILE__, __LINE__, #a, #b, a, m, b, n)
-
-# define TEST_true(a)         test_true(__FILE__, __LINE__, #a, (a) != 0)
-# define TEST_false(a)        test_false(__FILE__, __LINE__, #a, (a) != 0)
-
-# define TEST_BN_eq(a, b)     test_BN_eq(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_BN_ne(a, b)     test_BN_ne(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_BN_lt(a, b)     test_BN_lt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_BN_gt(a, b)     test_BN_gt(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_BN_le(a, b)     test_BN_le(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_BN_ge(a, b)     test_BN_ge(__FILE__, __LINE__, #a, #b, a, b)
-# define TEST_BN_eq_zero(a)   test_BN_eq_zero(__FILE__, __LINE__, #a, a)
-# define TEST_BN_ne_zero(a)   test_BN_ne_zero(__FILE__, __LINE__, #a, a)
-# define TEST_BN_lt_zero(a)   test_BN_lt_zero(__FILE__, __LINE__, #a, a)
-# define TEST_BN_gt_zero(a)   test_BN_gt_zero(__FILE__, __LINE__, #a, a)
-# define TEST_BN_le_zero(a)   test_BN_le_zero(__FILE__, __LINE__, #a, a)
-# define TEST_BN_ge_zero(a)   test_BN_ge_zero(__FILE__, __LINE__, #a, a)
-# define TEST_BN_eq_one(a)    test_BN_eq_one(__FILE__, __LINE__, #a, a)
-# define TEST_BN_eq_word(a, w) test_BN_eq_word(__FILE__, __LINE__, #a, #w, a, w)
-# define TEST_BN_abs_eq_word(a, w) test_BN_abs_eq_word(__FILE__, __LINE__, #a, #w, a, w)
-# define TEST_BN_odd(a)       test_BN_odd(__FILE__, __LINE__, #a, a)
-# define TEST_BN_even(a)      test_BN_even(__FILE__, __LINE__, #a, a)
+#define TEST_int_eq(a, b) test_int_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_int_ne(a, b) test_int_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_int_lt(a, b) test_int_lt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_int_le(a, b) test_int_le(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_int_gt(a, b) test_int_gt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_int_ge(a, b) test_int_ge(__FILE__, __LINE__, #a, #b, a, b)
+
+#define TEST_uint_eq(a, b) test_uint_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uint_ne(a, b) test_uint_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uint_lt(a, b) test_uint_lt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uint_le(a, b) test_uint_le(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uint_gt(a, b) test_uint_gt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uint_ge(a, b) test_uint_ge(__FILE__, __LINE__, #a, #b, a, b)
+
+#define TEST_char_eq(a, b) test_char_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_char_ne(a, b) test_char_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_char_lt(a, b) test_char_lt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_char_le(a, b) test_char_le(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_char_gt(a, b) test_char_gt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_char_ge(a, b) test_char_ge(__FILE__, __LINE__, #a, #b, a, b)
+
+#define TEST_uchar_eq(a, b) test_uchar_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uchar_ne(a, b) test_uchar_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uchar_lt(a, b) test_uchar_lt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uchar_le(a, b) test_uchar_le(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uchar_gt(a, b) test_uchar_gt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uchar_ge(a, b) test_uchar_ge(__FILE__, __LINE__, #a, #b, a, b)
+
+#define TEST_long_eq(a, b) test_long_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_long_ne(a, b) test_long_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_long_lt(a, b) test_long_lt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_long_le(a, b) test_long_le(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_long_gt(a, b) test_long_gt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_long_ge(a, b) test_long_ge(__FILE__, __LINE__, #a, #b, a, b)
+
+#define TEST_ulong_eq(a, b) test_ulong_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_ulong_ne(a, b) test_ulong_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_ulong_lt(a, b) test_ulong_lt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_ulong_le(a, b) test_ulong_le(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_ulong_gt(a, b) test_ulong_gt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_ulong_ge(a, b) test_ulong_ge(__FILE__, __LINE__, #a, #b, a, b)
+
+#define TEST_int64_t_eq(a, b) test_int64_t_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_int64_t_ne(a, b) test_int64_t_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_int64_t_lt(a, b) test_int64_t_lt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_int64_t_le(a, b) test_int64_t_le(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_int64_t_gt(a, b) test_int64_t_gt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_int64_t_ge(a, b) test_int64_t_ge(__FILE__, __LINE__, #a, #b, a, b)
+
+#define TEST_uint64_t_eq(a, b) test_uint64_t_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uint64_t_ne(a, b) test_uint64_t_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uint64_t_lt(a, b) test_uint64_t_lt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uint64_t_le(a, b) test_uint64_t_le(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uint64_t_gt(a, b) test_uint64_t_gt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_uint64_t_ge(a, b) test_uint64_t_ge(__FILE__, __LINE__, #a, #b, a, b)
+
+#define TEST_size_t_eq(a, b) test_size_t_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_size_t_ne(a, b) test_size_t_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_size_t_lt(a, b) test_size_t_lt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_size_t_le(a, b) test_size_t_le(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_size_t_gt(a, b) test_size_t_gt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_size_t_ge(a, b) test_size_t_ge(__FILE__, __LINE__, #a, #b, a, b)
+
+#define TEST_double_eq(a, b) test_double_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_double_ne(a, b) test_double_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_double_lt(a, b) test_double_lt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_double_le(a, b) test_double_le(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_double_gt(a, b) test_double_gt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_double_ge(a, b) test_double_ge(__FILE__, __LINE__, #a, #b, a, b)
+
+#define TEST_time_t_eq(a, b) test_time_t_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_time_t_ne(a, b) test_time_t_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_time_t_lt(a, b) test_time_t_lt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_time_t_le(a, b) test_time_t_le(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_time_t_gt(a, b) test_time_t_gt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_time_t_ge(a, b) test_time_t_ge(__FILE__, __LINE__, #a, #b, a, b)
+
+#define TEST_ptr_eq(a, b) test_ptr_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_ptr_ne(a, b) test_ptr_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_ptr(a) test_ptr(__FILE__, __LINE__, #a, a)
+#define TEST_ptr_null(a) test_ptr_null(__FILE__, __LINE__, #a, a)
+
+#define TEST_str_eq(a, b) test_str_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_str_ne(a, b) test_str_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_strn_eq(a, b, n) test_strn_eq(__FILE__, __LINE__, #a, #b, a, n, b, n)
+#define TEST_strn_ne(a, b, n) test_strn_ne(__FILE__, __LINE__, #a, #b, a, n, b, n)
+#define TEST_strn2_eq(a, m, b, n) test_strn_eq(__FILE__, __LINE__, #a, #b, a, m, b, n)
+#define TEST_strn2_ne(a, m, b, n) test_strn_ne(__FILE__, __LINE__, #a, #b, a, m, b, n)
+
+#define TEST_mem_eq(a, m, b, n) test_mem_eq(__FILE__, __LINE__, #a, #b, a, m, b, n)
+#define TEST_mem_ne(a, m, b, n) test_mem_ne(__FILE__, __LINE__, #a, #b, a, m, b, n)
+
+#define TEST_true(a) test_true(__FILE__, __LINE__, #a, (a) != 0)
+#define TEST_false(a) test_false(__FILE__, __LINE__, #a, (a) != 0)
+
+#define TEST_BN_eq(a, b) test_BN_eq(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_BN_ne(a, b) test_BN_ne(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_BN_lt(a, b) test_BN_lt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_BN_gt(a, b) test_BN_gt(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_BN_le(a, b) test_BN_le(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_BN_ge(a, b) test_BN_ge(__FILE__, __LINE__, #a, #b, a, b)
+#define TEST_BN_eq_zero(a) test_BN_eq_zero(__FILE__, __LINE__, #a, a)
+#define TEST_BN_ne_zero(a) test_BN_ne_zero(__FILE__, __LINE__, #a, a)
+#define TEST_BN_lt_zero(a) test_BN_lt_zero(__FILE__, __LINE__, #a, a)
+#define TEST_BN_gt_zero(a) test_BN_gt_zero(__FILE__, __LINE__, #a, a)
+#define TEST_BN_le_zero(a) test_BN_le_zero(__FILE__, __LINE__, #a, a)
+#define TEST_BN_ge_zero(a) test_BN_ge_zero(__FILE__, __LINE__, #a, a)
+#define TEST_BN_eq_one(a) test_BN_eq_one(__FILE__, __LINE__, #a, a)
+#define TEST_BN_eq_word(a, w) test_BN_eq_word(__FILE__, __LINE__, #a, #w, a, w)
+#define TEST_BN_abs_eq_word(a, w) test_BN_abs_eq_word(__FILE__, __LINE__, #a, #w, a, w)
+#define TEST_BN_odd(a) test_BN_odd(__FILE__, __LINE__, #a, a)
+#define TEST_BN_even(a) test_BN_even(__FILE__, __LINE__, #a, a)
 
 /*
  * TEST_error(desc, ...) prints an informative error message in the standard
  * format.  |desc| is a printf format string.
  */
-# if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
-#  define TEST_error         test_error_c90
-#  define TEST_info          test_info_c90
-#  define TEST_skip          test_skip_c90
-# else
-#  define TEST_error(...)    test_error(__FILE__, __LINE__, __VA_ARGS__)
-#  define TEST_info(...)     test_info(__FILE__, __LINE__, __VA_ARGS__)
-#  define TEST_skip(...)     test_skip(__FILE__, __LINE__, __VA_ARGS__)
-# endif
-# define TEST_note           test_note
-# define TEST_openssl_errors test_openssl_errors
-# define TEST_perror         test_perror
+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
+#define TEST_error test_error_c90
+#define TEST_info test_info_c90
+#define TEST_skip test_skip_c90
+#else
+#define TEST_error(...) test_error(__FILE__, __LINE__, __VA_ARGS__)
+#define TEST_info(...) test_info(__FILE__, __LINE__, __VA_ARGS__)
+#define TEST_skip(...) test_skip(__FILE__, __LINE__, __VA_ARGS__)
+#endif
+#define TEST_note test_note
+#define TEST_openssl_errors test_openssl_errors
+#define TEST_perror test_perror
 
 extern BIO *bio_out;
 extern BIO *bio_err;
@@ -573,11 +571,10 @@ void test_output_string(const char *name, const char *m, size_t l);
 void test_output_bignum(const char *name, const BIGNUM *bn);
 void test_output_memory(const char *name, const unsigned char *m, size_t l);
 
-
 /*
  * Utilities to parse a test file.
  */
-# define TESTMAXPAIRS        150
+#define TESTMAXPAIRS 150
 
 typedef struct pair_st {
     char *key;
@@ -585,16 +582,16 @@ typedef struct pair_st {
 } PAIR;
 
 typedef struct stanza_st {
-    const char *test_file;      /* Input file name */
-    BIO *fp;                    /* Input file */
-    int curr;                   /* Current line in file */
-    int start;                  /* Line where test starts */
-    int errors;                 /* Error count */
-    int numtests;               /* Number of tests */
-    int numskip;                /* Number of skipped tests */
+    const char *test_file; /* Input file name */
+    BIO *fp; /* Input file */
+    int curr; /* Current line in file */
+    int start; /* Line where test starts */
+    int errors; /* Error count */
+    int numtests; /* Number of tests */
+    int numskip; /* Number of skipped tests */
     int numpairs;
     PAIR pairs[TESTMAXPAIRS];
-    BIO *key;                   /* temp memory BIO for reading in keys */
+    BIO *key; /* temp memory BIO for reading in keys */
 } STANZA;
 
 /*
@@ -633,15 +630,15 @@ void test_random_seed(uint32_t sd);
 
 /* Fake non-secure random number generator */
 typedef int fake_random_generate_cb(unsigned char *out, size_t outlen,
-                                    const char *name, EVP_RAND_CTX *ctx);
+    const char *name, EVP_RAND_CTX *ctx);
 
 OSSL_PROVIDER *fake_rand_start(OSSL_LIB_CTX *libctx);
 void fake_rand_finish(OSSL_PROVIDER *p);
 void fake_rand_set_callback(EVP_RAND_CTX *ctx,
-                            int (*cb)(unsigned char *out, size_t outlen,
-                                      const char *name, EVP_RAND_CTX *ctx));
+    int (*cb)(unsigned char *out, size_t outlen,
+        const char *name, EVP_RAND_CTX *ctx));
 void fake_rand_set_public_private_callbacks(OSSL_LIB_CTX *libctx,
-                                            fake_random_generate_cb *cb);
+    fake_random_generate_cb *cb);
 
 /* Create a file path from a directory and a filename */
 char *test_mk_file_path(const char *dir, const char *file);
@@ -652,4 +649,6 @@ X509 *load_cert_der(const unsigned char *bytes, int len);
 STACK_OF(X509) *load_certs_pem(const char *file);
 X509_REQ *load_csr_der(const char *file, OSSL_LIB_CTX *libctx);
 time_t test_asn1_string_to_time_t(const char *asn1_string);
-#endif                          /* OSSL_TESTUTIL_H */
+
+int compare_with_reference_file(BIO *membio, const char *reffile);
+#endif /* OSSL_TESTUTIL_H */
diff --git a/test/testutil/compare.c b/test/testutil/compare.c
new file mode 100644
index 0000000000000..a6fddd088f6dc
--- /dev/null
+++ b/test/testutil/compare.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2017-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
+ */
+
+#include "../testutil.h"
+
+static void strip_line_ends(char *str)
+{
+    size_t i;
+
+    for (i = strlen(str);
+        i > 0 && (str[i - 1] == '\n' || str[i - 1] == '\r');
+        i--)
+        ;
+
+    str[i] = '\0';
+}
+
+int compare_with_reference_file(BIO *membio, const char *reffile)
+{
+    BIO *file = NULL, *newfile = NULL;
+    char buf1[8192], buf2[8192];
+    int ret = 0;
+    size_t i;
+
+    if (!TEST_ptr(reffile))
+        goto err;
+
+    file = BIO_new_file(reffile, "rb");
+    if (!TEST_ptr(file))
+        goto err;
+
+    newfile = BIO_new_file("ssltraceref-new.txt", "wb");
+    if (!TEST_ptr(newfile))
+        goto err;
+
+    while (BIO_gets(membio, buf2, sizeof(buf2)) > 0)
+        if (BIO_puts(newfile, buf2) <= 0) {
+            TEST_error("Failed writing new file data");
+            goto err;
+        }
+
+    if (!TEST_int_ge(BIO_seek(membio, 0), 0))
+        goto err;
+
+    while (BIO_gets(file, buf1, sizeof(buf1)) > 0) {
+        size_t line_len;
+
+        if (BIO_gets(membio, buf2, sizeof(buf2)) <= 0) {
+            TEST_error("Failed reading mem data");
+            goto err;
+        }
+        strip_line_ends(buf1);
+        strip_line_ends(buf2);
+        line_len = strlen(buf1);
+        if (line_len > 0 && buf1[line_len - 1] == '?') {
+            /* Wildcard at the EOL means ignore anything after it */
+            if (strlen(buf2) > line_len)
+                buf2[line_len] = '\0';
+        }
+        if (line_len != strlen(buf2)) {
+            TEST_error("Actual and ref line data length mismatch");
+            TEST_info("%s", buf1);
+            TEST_info("%s", buf2);
+            goto err;
+        }
+        for (i = 0; i < line_len; i++) {
+            /* '?' is a wild card character in the reference text */
+            if (buf1[i] == '?')
+                buf2[i] = '?';
+        }
+        if (!TEST_str_eq(buf1, buf2))
+            goto err;
+    }
+    if (!TEST_true(BIO_eof(file))
+        || !TEST_true(BIO_eof(membio)))
+        goto err;
+
+    ret = 1;
+err:
+    BIO_free(file);
+    BIO_free(newfile);
+    return ret;
+}
diff --git a/test/testutil/driver.c b/test/testutil/driver.c
index 346092b0046d8..1097c68fc3da4 100644
--- a/test/testutil/driver.c
+++ b/test/testutil/driver.c
@@ -17,24 +17,23 @@
 #include "internal/nelem.h"
 #include <openssl/bio.h>
 
-#include "platform.h"            /* From libapps */
+#include "platform.h" /* From libapps */
 
 #if defined(_WIN32) && !defined(__BORLANDC__)
-# define strdup _strdup
+#define strdup _strdup
 #endif
 
-
 /*
  * Declares the structures needed to register each test case function.
  */
 typedef struct test_info {
     const char *test_case_name;
-    int (*test_fn) (void);
+    int (*test_fn)(void);
     int (*param_test_fn)(int idx);
     int num;
 
     /* flags */
-    int subtest:1;
+    int subtest : 1;
 } TEST_INFO;
 
 static TEST_INFO all_tests[1024];
@@ -55,8 +54,7 @@ static int num_test_cases = 0;
 
 static int process_shared_options(void);
 
-
-void add_test(const char *test_case_name, int (*test_fn) (void))
+void add_test(const char *test_case_name, int (*test_fn)(void))
 {
     assert(num_tests != OSSL_NELEM(all_tests));
     all_tests[num_tests].test_case_name = test_case_name;
@@ -66,8 +64,8 @@ void add_test(const char *test_case_name, int (*test_fn) (void))
     ++num_test_cases;
 }
 
-void add_all_tests(const char *test_case_name, int(*test_fn)(int idx),
-                   int num, int subtest)
+void add_all_tests(const char *test_case_name, int (*test_fn)(int idx),
+    int num, int subtest)
 {
     assert(num_tests != OSSL_NELEM(all_tests));
     all_tests[num_tests].test_case_name = test_case_name;
@@ -99,7 +97,6 @@ static void set_seed(int s)
     test_random_seed(seed);
 }
 
-
 int setup_test_framework(int argc, char *argv[])
 {
     char *test_rand_order = getenv("OPENSSL_TEST_RAND_ORDER");
@@ -132,7 +129,6 @@ int setup_test_framework(int argc, char *argv[])
     return 1;
 }
 
-
 /*
  * This can only be called after setup() has run, since num_tests and
  * all_tests[] are setup at this point
@@ -151,7 +147,6 @@ static int check_single_test_params(char *name, char *testname, char *itname)
             single_test = atoi(name);
     }
 
-
     /* if only iteration is specified, assume we want the first test */
     if (single_test == -1 && single_iter != -1)
         single_test = 1;
@@ -160,24 +155,24 @@ static int check_single_test_params(char *name, char *testname, char *itname)
         if (single_test < 1 || single_test > num_tests) {
             test_printf_stderr("Invalid -%s value "
                                "(Value must be a valid test name OR a value between %d..%d)\n",
-                               testname, 1, num_tests);
+                testname, 1, num_tests);
             return 0;
         }
     }
     if (single_iter != -1) {
         if (all_tests[single_test - 1].num == -1) {
             test_printf_stderr("-%s option is not valid for test %d:%s\n",
-                               itname,
-                               single_test,
-                               all_tests[single_test - 1].test_case_name);
+                itname,
+                single_test,
+                all_tests[single_test - 1].test_case_name);
             return 0;
         } else if (single_iter < 1
-                   || single_iter > all_tests[single_test - 1].num) {
+            || single_iter > all_tests[single_test - 1].num) {
             test_printf_stderr("Invalid -%s value for test %d:%s\t"
                                "(Value must be in the range %d..%d)\n",
-                               itname, single_test,
-                               all_tests[single_test - 1].test_case_name,
-                               1, all_tests[single_test - 1].num);
+                itname, single_test,
+                all_tests[single_test - 1].test_case_name,
+                1, all_tests[single_test - 1].num);
             return 0;
         }
     }
@@ -236,7 +231,6 @@ static int process_shared_options(void)
     return ret;
 }
 
-
 int pulldown_test_framework(int ret)
 {
     set_test_title(NULL);
@@ -259,8 +253,9 @@ void set_test_title(const char *title)
     test_title = title == NULL ? NULL : strdup(title);
 }
 
-PRINTF_FORMAT(2, 3) static void test_verdict(int verdict,
-                                             const char *description, ...)
+PRINTF_FORMAT(2, 3)
+static void test_verdict(int verdict,
+    const char *description, ...)
 {
     va_list ap;
 
@@ -323,17 +318,16 @@ int run_tests(const char *test_prog_name)
     for (ii = 0; ii != num_tests; ++ii) {
         i = permute[ii];
 
-        if (single_test != -1 && ((i+1) != single_test)) {
+        if (single_test != -1 && ((i + 1) != single_test)) {
             continue;
-        }
-        else if (show_list) {
+        } else if (show_list) {
             if (all_tests[i].num != -1) {
                 test_printf_tapout("%d - %s (%d..%d)\n", ii + 1,
-                                   all_tests[i].test_case_name, 1,
-                                   all_tests[i].num);
+                    all_tests[i].test_case_name, 1,
+                    all_tests[i].num);
             } else {
                 test_printf_tapout("%d - %s\n", ii + 1,
-                                   all_tests[i].test_case_name);
+                    all_tests[i].test_case_name);
             }
             test_flush_tapout();
         } else if (all_tests[i].num == -1) {
@@ -386,11 +380,11 @@ int run_tests(const char *test_prog_name)
 
                 if (all_tests[i].subtest)
                     test_verdict(v, "%d - iteration %d",
-                                 subtest_case_count + 1, j + 1);
+                        subtest_case_count + 1, j + 1);
                 else
                     test_verdict(v, "%d - %s - iteration %d",
-                                 test_case_count + subtest_case_count + 1,
-                                 test_title, j + 1);
+                        test_case_count + subtest_case_count + 1,
+                        test_title, j + 1);
                 subtest_case_count++;
             }
 
@@ -402,7 +396,7 @@ int run_tests(const char *test_prog_name)
                 ++num_failed;
             if (all_tests[i].num == -1 || all_tests[i].subtest)
                 test_verdict(verdict, "%d - %s", test_case_count + 1,
-                             all_tests[i].test_case_name);
+                    all_tests[i].test_case_name);
             test_case_count++;
         }
     }
@@ -438,13 +432,13 @@ char *glue_strings(const char *list[], size_t *out_len)
 
 char *test_mk_file_path(const char *dir, const char *file)
 {
-# ifndef OPENSSL_SYS_VMS
+#ifndef OPENSSL_SYS_VMS
     const char *sep = "/";
-# else
+#else
     const char *sep = "";
     char *dir_end;
     char dir_end_sep;
-# endif
+#endif
     size_t dirlen = dir != NULL ? strlen(dir) : 0;
     size_t len = dirlen + strlen(sep) + strlen(file) + 1;
     char *full_file = OPENSSL_zalloc(len);
@@ -452,7 +446,7 @@ char *test_mk_file_path(const char *dir, const char *file)
     if (full_file != NULL) {
         if (dir != NULL && dirlen > 0) {
             OPENSSL_strlcpy(full_file, dir, len);
-# ifdef OPENSSL_SYS_VMS
+#ifdef OPENSSL_SYS_VMS
             /*
              * If |file| contains a directory spec, we need to do some
              * careful merging.
diff --git a/test/testutil/fake_random.c b/test/testutil/fake_random.c
index b211f48625c2d..5240a40f0ba25 100644
--- a/test/testutil/fake_random.c
+++ b/test/testutil/fake_random.c
@@ -33,7 +33,7 @@ static OSSL_FUNC_rand_get_ctx_params_fn fake_rand_get_ctx_params;
 static OSSL_FUNC_rand_enable_locking_fn fake_rand_enable_locking;
 
 static void *fake_rand_newctx(void *provctx, void *parent,
-                              const OSSL_DISPATCH *parent_dispatch)
+    const OSSL_DISPATCH *parent_dispatch)
 {
     FAKE_RAND *r = OPENSSL_zalloc(sizeof(*r));
 
@@ -48,10 +48,10 @@ static void fake_rand_freectx(void *vrng)
 }
 
 static int fake_rand_instantiate(void *vrng, ossl_unused unsigned int strength,
-                                 ossl_unused  int prediction_resistance,
-                                 ossl_unused const unsigned char *pstr,
-                                 size_t pstr_len,
-                                 ossl_unused const OSSL_PARAM params[])
+    ossl_unused int prediction_resistance,
+    ossl_unused const unsigned char *pstr,
+    size_t pstr_len,
+    ossl_unused const OSSL_PARAM params[])
 {
     FAKE_RAND *frng = (FAKE_RAND *)vrng;
 
@@ -68,8 +68,8 @@ static int fake_rand_uninstantiate(void *vrng)
 }
 
 static int fake_rand_generate(void *vrng, unsigned char *out, size_t outlen,
-                              unsigned int strength, int prediction_resistance,
-                              const unsigned char *adin, size_t adinlen)
+    unsigned int strength, int prediction_resistance,
+    const unsigned char *adin, size_t adinlen)
 {
     FAKE_RAND *frng = (FAKE_RAND *)vrng;
     size_t l;
@@ -113,7 +113,7 @@ static int fake_rand_get_ctx_params(ossl_unused void *vrng, OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *fake_rand_gettable_ctx_params(ossl_unused void *vrng,
-                                                       ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static const OSSL_PARAM known_gettable_ctx_params[] = {
         OSSL_PARAM_int(OSSL_RAND_PARAM_STATE, NULL),
@@ -132,8 +132,8 @@ static const OSSL_DISPATCH fake_rand_functions[] = {
     { OSSL_FUNC_RAND_GENERATE, (void (*)(void))fake_rand_generate },
     { OSSL_FUNC_RAND_ENABLE_LOCKING, (void (*)(void))fake_rand_enable_locking },
     { OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS,
-      (void(*)(void))fake_rand_gettable_ctx_params },
-    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void(*)(void))fake_rand_get_ctx_params },
+        (void (*)(void))fake_rand_gettable_ctx_params },
+    { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void (*)(void))fake_rand_get_ctx_params },
     OSSL_DISPATCH_END
 };
 
@@ -143,8 +143,8 @@ static const OSSL_ALGORITHM fake_rand_rand[] = {
 };
 
 static const OSSL_ALGORITHM *fake_rand_query(void *provctx,
-                                             int operation_id,
-                                             int *no_cache)
+    int operation_id,
+    int *no_cache)
 {
     *no_cache = 0;
     switch (operation_id) {
@@ -162,8 +162,8 @@ static const OSSL_DISPATCH fake_rand_method[] = {
 };
 
 static int fake_rand_provider_init(const OSSL_CORE_HANDLE *handle,
-                                   const OSSL_DISPATCH *in,
-                                   const OSSL_DISPATCH **out, void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out, void **provctx)
 {
     if (!TEST_ptr(*provctx = OSSL_LIB_CTX_new()))
         return 0;
@@ -190,15 +190,15 @@ OSSL_PROVIDER *fake_rand_start(OSSL_LIB_CTX *libctx)
     OSSL_PROVIDER *p;
 
     if (!TEST_true(OSSL_PROVIDER_add_builtin(libctx, "fake-rand",
-                                             fake_rand_provider_init))
-            || !TEST_true(RAND_set_DRBG_type(libctx, "fake", NULL, NULL, NULL))
-            || !TEST_ptr(p = OSSL_PROVIDER_try_load(libctx, "fake-rand", 1)))
+            fake_rand_provider_init))
+        || !TEST_true(RAND_set_DRBG_type(libctx, "fake", NULL, NULL, NULL))
+        || !TEST_ptr(p = OSSL_PROVIDER_try_load(libctx, "fake-rand", 1)))
         return NULL;
 
     /* Ensure that the fake rand is initialized. */
     if (!TEST_true(check_rng(RAND_get0_primary(libctx), "primary"))
-            || !TEST_true(check_rng(RAND_get0_private(libctx), "private"))
-            || !TEST_true(check_rng(RAND_get0_public(libctx), "public"))) {
+        || !TEST_true(check_rng(RAND_get0_private(libctx), "private"))
+        || !TEST_true(check_rng(RAND_get0_public(libctx), "public"))) {
         OSSL_PROVIDER_unload(p);
         return NULL;
     }
@@ -212,20 +212,19 @@ void fake_rand_finish(OSSL_PROVIDER *p)
 }
 
 void fake_rand_set_callback(EVP_RAND_CTX *rng,
-                            int (*cb)(unsigned char *out, size_t outlen,
-                                      const char *name, EVP_RAND_CTX *ctx))
+    int (*cb)(unsigned char *out, size_t outlen,
+        const char *name, EVP_RAND_CTX *ctx))
 {
     if (rng != NULL)
         ((FAKE_RAND *)rng->algctx)->cb = cb;
 }
 
 void fake_rand_set_public_private_callbacks(OSSL_LIB_CTX *libctx,
-                                            int (*cb)(unsigned char *out,
-                                                      size_t outlen,
-                                                      const char *name,
-                                                      EVP_RAND_CTX *ctx))
+    int (*cb)(unsigned char *out,
+        size_t outlen,
+        const char *name,
+        EVP_RAND_CTX *ctx))
 {
     fake_rand_set_callback(RAND_get0_private(libctx), cb);
     fake_rand_set_callback(RAND_get0_public(libctx), cb);
 }
-
diff --git a/test/testutil/format_output.c b/test/testutil/format_output.c
index 8e84e1a6b6a68..bfab6babbcf21 100644
--- a/test/testutil/format_output.c
+++ b/test/testutil/format_output.c
@@ -15,9 +15,9 @@
 #include <ctype.h>
 
 /* The size of memory buffers to display on failure */
-#define MEM_BUFFER_SIZE     (2000)
-#define MAX_STRING_WIDTH    (80)
-#define BN_OUTPUT_SIZE      (8)
+#define MEM_BUFFER_SIZE (2000)
+#define MAX_STRING_WIDTH (80)
+#define BN_OUTPUT_SIZE (8)
 
 /* Output a diff header */
 static void test_diff_header(const char *left, const char *right)
@@ -36,13 +36,12 @@ static void test_string_null_empty(const char *m, char c)
 }
 
 static void test_fail_string_common(const char *prefix, const char *file,
-                                    int line, const char *type,
-                                    const char *left, const char *right,
-                                    const char *op, const char *m1, size_t l1,
-                                    const char *m2, size_t l2)
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op, const char *m1, size_t l1,
+    const char *m2, size_t l2)
 {
-    const size_t width =
-        (MAX_STRING_WIDTH - BIO_get_indent(bio_err) - 12) / 16 * 16;
+    const size_t width = (MAX_STRING_WIDTH - BIO_get_indent(bio_err) - 12) / 16 * 16;
     char b1[MAX_STRING_WIDTH + 1], b2[MAX_STRING_WIDTH + 1];
     char bdiff[MAX_STRING_WIDTH + 1];
     size_t n1, n2, i;
@@ -101,7 +100,7 @@ static void test_fail_string_common(const char *prefix, const char *file,
             else if (n1 > 0)
                 test_printf_stderr("%4u:- '%s'\n", cnt, b1);
             if (cnt == 0 && (m2 == NULL || *m2 == '\0'))
-               test_string_null_empty(m2, '+');
+                test_string_null_empty(m2, '+');
             else if (n2 > 0)
                 test_printf_stderr("%4u:+ '%s'\n", cnt, b2);
             if (diff && i > 0)
@@ -125,20 +124,20 @@ static void test_fail_string_common(const char *prefix, const char *file,
  * fails.  The second is the user's call to dump a string.
  */
 void test_fail_string_message(const char *prefix, const char *file,
-                              int line, const char *type,
-                              const char *left, const char *right,
-                              const char *op, const char *m1, size_t l1,
-                              const char *m2, size_t l2)
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op, const char *m1, size_t l1,
+    const char *m2, size_t l2)
 {
     test_fail_string_common(prefix, file, line, type, left, right, op,
-                            m1, l1, m2, l2);
+        m1, l1, m2, l2);
     test_printf_stderr("\n");
 }
 
 void test_output_string(const char *name, const char *m, size_t l)
 {
     test_fail_string_common("string", NULL, 0, NULL, NULL, NULL, name,
-                            m, l, m, l);
+        m, l, m, l);
 }
 
 /* BIGNUM formatted output routines */
@@ -148,7 +147,7 @@ void test_output_string(const char *name, const char *m, size_t l)
  * every so often.
  */
 static void hex_convert_memory(const unsigned char *m, size_t n, char *b,
-                               size_t width)
+    size_t width)
 {
     size_t i;
 
@@ -168,9 +167,10 @@ static void hex_convert_memory(const unsigned char *m, size_t n, char *b,
  * of characters these take.
  */
 static const int bn_bytes = (MAX_STRING_WIDTH - 9) / (BN_OUTPUT_SIZE * 2 + 1)
-                            * BN_OUTPUT_SIZE;
+    * BN_OUTPUT_SIZE;
 static const int bn_chars = (MAX_STRING_WIDTH - 9) / (BN_OUTPUT_SIZE * 2 + 1)
-                            * (BN_OUTPUT_SIZE * 2 + 1) - 1;
+        * (BN_OUTPUT_SIZE * 2 + 1)
+    - 1;
 
 /*
  * Output the header line for the bignum
@@ -204,7 +204,7 @@ static void test_bignum_zero_print(const BIGNUM *bn, char sep)
  * string with appropriate visual aid spaces inserted.
  */
 static int convert_bn_memory(const unsigned char *in, size_t bytes,
-                             char *out, int *lz, const BIGNUM *bn)
+    char *out, int *lz, const BIGNUM *bn)
 {
     int n = bytes * 2, i;
     char *p = out, *q = NULL;
@@ -241,7 +241,7 @@ static int convert_bn_memory(const unsigned char *in, size_t bytes,
                 }
             }
         }
-       return n;
+        return n;
     }
 
     for (i = 0; i < n; i++) {
@@ -263,10 +263,10 @@ static int convert_bn_memory(const unsigned char *in, size_t bytes,
  * pointers for changes (only when there are two).
  */
 static void test_fail_bignum_common(const char *prefix, const char *file,
-                                    int line, const char *type,
-                                    const char *left, const char *right,
-                                    const char *op,
-                                    const BIGNUM *bn1, const BIGNUM *bn2)
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op,
+    const BIGNUM *bn1, const BIGNUM *bn2)
 {
     const size_t bytes = bn_bytes;
     char b1[MAX_STRING_WIDTH + 1], b2[MAX_STRING_WIDTH + 1];
@@ -322,7 +322,7 @@ static void test_fail_bignum_common(const char *prefix, const char *file,
         diff = real_diff = 0;
         i = 0;
         p = bdiff;
-        for (i=0; b1[i] != '\0'; i++)
+        for (i = 0; b1[i] != '\0'; i++)
             if (b1[i] == b2[i] || b1[i] == ' ' || b2[i] == ' ') {
                 *p++ = ' ';
                 diff |= b1[i] != b2[i];
@@ -343,7 +343,7 @@ static void test_fail_bignum_common(const char *prefix, const char *file,
             else if (cnt == 0 || n2 > 0)
                 test_printf_stderr("+%s:% 5d\n", b2, cnt);
             if (real_diff && (cnt == 0 || (n1 > 0 && n2 > 0))
-                    && bn1 != NULL && bn2 != NULL)
+                && bn1 != NULL && bn2 != NULL)
                 test_printf_stderr(" %s\n", bdiff);
         }
         if (m1 != NULL)
@@ -364,19 +364,19 @@ static void test_fail_bignum_common(const char *prefix, const char *file,
  * fails.  The third is the user's call to dump a bignum.
  */
 void test_fail_bignum_message(const char *prefix, const char *file,
-                              int line, const char *type,
-                              const char *left, const char *right,
-                              const char *op,
-                              const BIGNUM *bn1, const BIGNUM *bn2)
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op,
+    const BIGNUM *bn1, const BIGNUM *bn2)
 {
     test_fail_bignum_common(prefix, file, line, type, left, right, op, bn1, bn2);
     test_printf_stderr("\n");
 }
 
 void test_fail_bignum_mono_message(const char *prefix, const char *file,
-                                   int line, const char *type,
-                                   const char *left, const char *right,
-                                   const char *op, const BIGNUM *bn)
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op, const BIGNUM *bn)
 {
     test_fail_bignum_common(prefix, file, line, type, left, right, op, bn, bn);
     test_printf_stderr("\n");
@@ -386,7 +386,7 @@ void test_output_bignum(const char *name, const BIGNUM *bn)
 {
     if (bn == NULL || BN_is_zero(bn)) {
         test_printf_stderr("bignum: '%s' = %s\n", name,
-                           test_bignum_zero_null(bn));
+            test_bignum_zero_null(bn));
     } else if (BN_num_bytes(bn) <= BN_OUTPUT_SIZE) {
         unsigned char buf[BN_OUTPUT_SIZE];
         char out[2 * sizeof(buf) + 1];
@@ -397,10 +397,10 @@ void test_output_bignum(const char *name, const BIGNUM *bn)
         while (*p == '0' && *++p != '\0')
             ;
         test_printf_stderr("bignum: '%s' = %s0x%s\n", name,
-                           BN_is_negative(bn) ? "-" : "", p);
+            BN_is_negative(bn) ? "-" : "", p);
     } else {
         test_fail_bignum_common("bignum", NULL, 0, NULL, NULL, NULL, name,
-                                bn, bn);
+            bn, bn);
     }
 }
 
@@ -421,11 +421,11 @@ static void test_memory_null_empty(const unsigned char *m, char c)
  * Common code to display one or two blocks of memory.
  */
 static void test_fail_memory_common(const char *prefix, const char *file,
-                                    int line, const char *type,
-                                    const char *left, const char *right,
-                                    const char *op,
-                                    const unsigned char *m1, size_t l1,
-                                    const unsigned char *m2, size_t l2)
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op,
+    const unsigned char *m1, size_t l1,
+    const unsigned char *m2, size_t l2)
 {
     const size_t bytes = (MAX_STRING_WIDTH - 9) / 17 * 8;
     char b1[MAX_STRING_WIDTH + 1], b2[MAX_STRING_WIDTH + 1];
@@ -516,19 +516,19 @@ static void test_fail_memory_common(const char *prefix, const char *file,
  * fails.  The second is the user's call to dump memory.
  */
 void test_fail_memory_message(const char *prefix, const char *file,
-                              int line, const char *type,
-                              const char *left, const char *right,
-                              const char *op,
-                              const unsigned char *m1, size_t l1,
-                              const unsigned char *m2, size_t l2)
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op,
+    const unsigned char *m1, size_t l1,
+    const unsigned char *m2, size_t l2)
 {
     test_fail_memory_common(prefix, file, line, type, left, right, op,
-                            m1, l1, m2, l2);
+        m1, l1, m2, l2);
     test_printf_stderr("\n");
 }
 
 void test_output_memory(const char *name, const unsigned char *m, size_t l)
 {
     test_fail_memory_common("memory", NULL, 0, NULL, NULL, NULL, name,
-                            m, l, m, l);
+        m, l, m, l);
 }
diff --git a/test/testutil/helper.c b/test/testutil/helper.c
index 9c985e25a8bea..466ceca26f564 100644
--- a/test/testutil/helper.c
+++ b/test/testutil/helper.c
@@ -16,11 +16,11 @@
  * tweak for Windows
  */
 #ifdef WIN32
-# define timezone _timezone
+#define timezone _timezone
 #endif
 
 #if defined(__FreeBSD__) || defined(__wasi__)
-# define USE_TIMEGM
+#define USE_TIMEGM
 #endif
 
 time_t test_asn1_string_to_time_t(const char *asn1_string)
@@ -35,10 +35,9 @@ time_t test_asn1_string_to_time_t(const char *asn1_string)
     time_t timestamp_utc;
 
     timestamp_asn1 = ASN1_TIME_new();
-    if(timestamp_asn1 == NULL)
+    if (timestamp_asn1 == NULL)
         return -1;
-    if (!ASN1_TIME_set_string(timestamp_asn1, asn1_string))
-    {
+    if (!ASN1_TIME_set_string(timestamp_asn1, asn1_string)) {
         ASN1_TIME_free(timestamp_asn1);
         return -1;
     }
diff --git a/test/testutil/load.c b/test/testutil/load.c
index 982e0a39a9b22..27496ca6257d8 100644
--- a/test/testutil/load.c
+++ b/test/testutil/load.c
@@ -23,7 +23,7 @@ X509 *load_cert_pem(const char *file, OSSL_LIB_CTX *libctx)
     if (!TEST_ptr(file) || !TEST_ptr(bio = BIO_new(BIO_s_file())))
         return NULL;
     if (TEST_int_gt(BIO_read_filename(bio, file), 0)
-            && TEST_ptr(cert = X509_new_ex(libctx, NULL)))
+        && TEST_ptr(cert = X509_new_ex(libctx, NULL)))
         (void)TEST_ptr(cert = PEM_read_bio_X509(bio, &cert, NULL, NULL));
 
     BIO_free(bio);
@@ -77,7 +77,7 @@ EVP_PKEY *load_pkey_pem(const char *file, OSSL_LIB_CTX *libctx)
         unsigned long err = ERR_peek_error();
 
         if (TEST_ptr(key = PEM_read_bio_PrivateKey_ex(bio, NULL, NULL, NULL,
-                                                      libctx, NULL))
+                         libctx, NULL))
             && err != ERR_peek_error()) {
             TEST_info("Spurious error from reading PEM");
             EVP_PKEY_free(key);
diff --git a/test/testutil/main.c b/test/testutil/main.c
index 32e32d8328723..4d18eb2c43e7e 100644
--- a/test/testutil/main.c
+++ b/test/testutil/main.c
@@ -11,7 +11,6 @@
 #include "output.h"
 #include "tu_local.h"
 
-
 int main(int argc, char *argv[])
 {
     int ret = EXIT_FAILURE;
diff --git a/test/testutil/options.c b/test/testutil/options.c
index 35dfa320c48bc..37be4facac33d 100644
--- a/test/testutil/options.c
+++ b/test/testutil/options.c
@@ -12,7 +12,6 @@
 #include "tu_local.h"
 #include "output.h"
 
-
 static int used[100] = { 0 };
 
 int test_skip_common_options(void)
@@ -22,7 +21,7 @@ int test_skip_common_options(void)
     while ((o = (OPTION_CHOICE_DEFAULT)opt_next()) != OPT_EOF) {
         switch (o) {
         case OPT_TEST_CASES:
-           break;
+            break;
         default:
         case OPT_ERR:
             return 0;
@@ -60,7 +59,7 @@ void opt_check_usage(void)
     for (i = 0; i < n; i++) {
         if (used[i] == 0)
             test_printf_stderr("Warning ignored command-line argument %d: %s\n",
-                               i, argv[i]);
+                i, argv[i]);
     }
     if (i < arg_count)
         test_printf_stderr("Warning arguments %d and later unchecked\n", i);
@@ -76,4 +75,3 @@ int opt_printf_stderr(const char *fmt, ...)
     va_end(ap);
     return ret;
 }
-
diff --git a/test/testutil/output.h b/test/testutil/output.h
index 0e4de09704f89..cee3026b11e39 100644
--- a/test/testutil/output.h
+++ b/test/testutil/output.h
@@ -8,28 +8,28 @@
  */
 
 #ifndef OSSL_TESTUTIL_OUTPUT_H
-# define OSSL_TESTUTIL_OUTPUT_H
+#define OSSL_TESTUTIL_OUTPUT_H
 
-# include <stdarg.h>
+#include <stdarg.h>
 
-# define ossl_test__attr__(x)
-# if defined(__GNUC__) && defined(__STDC_VERSION__) \
+#define ossl_test__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_test__attr__
-#   define ossl_test__attr__ __attribute__
-#   if __GNUC__*10 + __GNUC_MINOR__ >= 44
-#    define ossl_test__printf__ __gnu_printf__
-#   else
-#    define ossl_test__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_test__attr__
+#define ossl_test__attr__ __attribute__
+#if __GNUC__ * 10 + __GNUC_MINOR__ >= 44
+#define ossl_test__printf__ __gnu_printf__
+#else
+#define ossl_test__printf__ __printf__
+#endif
+#endif
+#endif
 /*
  * The basic I/O functions used internally by the test framework.  These
  * can be overridden when needed. Note that if one is, then all must be.
@@ -62,7 +62,7 @@ int test_printf_stderr(const char *fmt, ...)
 int test_printf_taperr(const char *fmt, ...)
     ossl_test__attr__((__format__(ossl_test__printf__, 1, 2)));
 
-# undef ossl_test__printf__
-# undef ossl_test__attr__
+#undef ossl_test__printf__
+#undef ossl_test__attr__
 
-#endif                          /* OSSL_TESTUTIL_OUTPUT_H */
+#endif /* OSSL_TESTUTIL_OUTPUT_H */
diff --git a/test/testutil/provider.c b/test/testutil/provider.c
index 79ae13b42a1f0..9d91e804fdc5a 100644
--- a/test/testutil/provider.c
+++ b/test/testutil/provider.c
@@ -14,8 +14,8 @@
 #include <string.h>
 
 int test_get_libctx(OSSL_LIB_CTX **libctx, OSSL_PROVIDER **default_null_prov,
-                    const char *config_file,
-                    OSSL_PROVIDER **provider, const char *module_name)
+    const char *config_file,
+    OSSL_PROVIDER **provider, const char *module_name)
 {
     OSSL_LIB_CTX *new_libctx = NULL;
 
@@ -33,25 +33,25 @@ int test_get_libctx(OSSL_LIB_CTX **libctx, OSSL_PROVIDER **default_null_prov,
     }
 
     if (config_file != NULL
-            && !OSSL_LIB_CTX_load_config(new_libctx, config_file)) {
+        && !OSSL_LIB_CTX_load_config(new_libctx, config_file)) {
         opt_printf_stderr("Error loading config from file %s\n", config_file);
         goto err;
     }
 
     if (provider != NULL && module_name != NULL
-            && (*provider = OSSL_PROVIDER_load(new_libctx, module_name)) == NULL) {
+        && (*provider = OSSL_PROVIDER_load(new_libctx, module_name)) == NULL) {
         opt_printf_stderr("Failed to load provider %s\n", module_name);
         goto err;
     }
     return 1;
 
- err:
+err:
     ERR_print_errors_fp(stderr);
     return 0;
 }
 
 int test_arg_libctx(OSSL_LIB_CTX **libctx, OSSL_PROVIDER **default_null_prov,
-                    OSSL_PROVIDER **provider, int argn, const char *usage)
+    OSSL_PROVIDER **provider, int argn, const char *usage)
 {
     const char *module_name;
 
@@ -62,7 +62,7 @@ int test_arg_libctx(OSSL_LIB_CTX **libctx, OSSL_PROVIDER **default_null_prov,
     if (strcmp(module_name, "none") == 0)
         return 1;
     return test_get_libctx(libctx, default_null_prov,
-                           test_get_argument(argn + 1), provider, module_name);
+        test_get_argument(argn + 1), provider, module_name);
 }
 
 typedef struct {
@@ -86,12 +86,12 @@ static int fips_provider_version(OSSL_LIB_CTX *libctx, FIPS_VERSION *vers)
     if ((fips_prov = OSSL_PROVIDER_load(libctx, "fips")) == NULL)
         return -1;
     if (!OSSL_PROVIDER_get_params(fips_prov, params)
-            || sscanf(vs, "%d.%d.%d", &vers->major, &vers->minor, &vers->patch) != 3)
+        || sscanf(vs, "%d.%d.%d", &vers->major, &vers->minor, &vers->patch) != 3)
         goto err;
     if (!OSSL_PROVIDER_unload(fips_prov))
         return -1;
     return 1;
- err:
+err:
     OSSL_PROVIDER_unload(fips_prov);
     return -1;
 }
@@ -124,9 +124,9 @@ int fips_provider_version_le(OSSL_LIB_CTX *libctx, int major, int minor, int pat
     if ((res = fips_provider_version(libctx, &prov)) <= 0)
         return res == 0;
     return prov.major < major
-           || (prov.major == major
-               && (prov.minor < minor
-                   || (prov.minor == minor && prov.patch <= patch)));
+        || (prov.major == major
+            && (prov.minor < minor
+                || (prov.minor == minor && prov.patch <= patch)));
 }
 
 int fips_provider_version_lt(OSSL_LIB_CTX *libctx, int major, int minor, int patch)
@@ -137,9 +137,9 @@ int fips_provider_version_lt(OSSL_LIB_CTX *libctx, int major, int minor, int pat
     if ((res = fips_provider_version(libctx, &prov)) <= 0)
         return res == 0;
     return prov.major < major
-           || (prov.major == major
-               && (prov.minor < minor
-                   || (prov.minor == minor && prov.patch < patch)));
+        || (prov.major == major
+            && (prov.minor < minor
+                || (prov.minor == minor && prov.patch < patch)));
 }
 
 int fips_provider_version_gt(OSSL_LIB_CTX *libctx, int major, int minor, int patch)
@@ -150,9 +150,9 @@ int fips_provider_version_gt(OSSL_LIB_CTX *libctx, int major, int minor, int pat
     if ((res = fips_provider_version(libctx, &prov)) <= 0)
         return res == 0;
     return prov.major > major
-           || (prov.major == major
-               && (prov.minor > minor
-                   || (prov.minor == minor && prov.patch > patch)));
+        || (prov.major == major
+            && (prov.minor > minor
+                || (prov.minor == minor && prov.patch > patch)));
 }
 
 int fips_provider_version_ge(OSSL_LIB_CTX *libctx, int major, int minor, int patch)
@@ -163,9 +163,9 @@ int fips_provider_version_ge(OSSL_LIB_CTX *libctx, int major, int minor, int pat
     if ((res = fips_provider_version(libctx, &prov)) <= 0)
         return res == 0;
     return prov.major > major
-           || (prov.major == major
-               && (prov.minor > minor
-                   || (prov.minor == minor && prov.patch >= patch)));
+        || (prov.major == major
+            && (prov.minor > minor
+                || (prov.minor == minor && prov.patch >= patch)));
 }
 
 int fips_provider_version_match(OSSL_LIB_CTX *libctx, const char *versions)
@@ -173,7 +173,12 @@ int fips_provider_version_match(OSSL_LIB_CTX *libctx, const char *versions)
     const char *p;
     int major, minor, patch, r;
     enum {
-        MODE_EQ, MODE_NE, MODE_LE, MODE_LT, MODE_GT, MODE_GE
+        MODE_EQ,
+        MODE_NE,
+        MODE_LE,
+        MODE_LT,
+        MODE_GT,
+        MODE_GE
     } mode;
 
     while (*versions != '\0') {
diff --git a/test/testutil/random.c b/test/testutil/random.c
index 45d0bb5f05897..f3435ab20526f 100644
--- a/test/testutil/random.c
+++ b/test/testutil/random.c
@@ -16,7 +16,8 @@
  */
 static uint32_t test_random_state[31];
 
-uint32_t test_random(void) {
+uint32_t test_random(void)
+{
     static unsigned int pos = 3;
 
     if (pos == 31)
@@ -25,7 +26,8 @@ uint32_t test_random(void) {
     return test_random_state[pos++] / 2;
 }
 
-void test_random_seed(uint32_t sd) {
+void test_random_seed(uint32_t sd)
+{
     int i;
     int32_t s;
     const unsigned int mod = (1u << 31) - 1;
diff --git a/test/testutil/stanza.c b/test/testutil/stanza.c
index f1ddfde028cc2..a41dcbed25b5b 100644
--- a/test/testutil/stanza.c
+++ b/test/testutil/stanza.c
@@ -30,7 +30,7 @@ int test_start_file(STANZA *s, const char *testfile)
 int test_end_file(STANZA *s)
 {
     TEST_info("Completed %d tests with %d errors and %d skipped",
-              s->numtests, s->errors, s->numskip);
+        s->numtests, s->errors, s->numskip);
     BIO_free(s->fp);
     return 1;
 }
@@ -61,7 +61,6 @@ static int read_key(STANZA *s)
     return 0;
 }
 
-
 /*
  * Delete leading and trailing spaces from a string
  */
@@ -75,7 +74,7 @@ static char *strip_spaces(char *p)
     if (*p == '\0')
         return NULL;
 
-    for (q = p + strlen(p) - 1; q != p && isspace((unsigned char)*q); )
+    for (q = p + strlen(p) - 1; q != p && isspace((unsigned char)*q);)
         *q-- = '\0';
     return *p ? p : NULL;
 }
@@ -90,7 +89,7 @@ int test_readstanza(STANZA *s)
     const char *value;
     static char buff[131072];
 
-    for (s->numpairs = 0; BIO_gets(s->fp, buff, sizeof(buff)); ) {
+    for (s->numpairs = 0; BIO_gets(s->fp, buff, sizeof(buff));) {
         s->curr++;
         if (!TEST_ptr(p = strchr(buff, '\n'))) {
             TEST_info("Line %d too long", s->curr);
@@ -128,15 +127,15 @@ int test_readstanza(STANZA *s)
             s->start = s->curr;
 
         if (strcmp(key, "PrivateKey") == 0
-                || strcmp(key, "PublicKey") == 0
-                || strcmp(key, "ParamKey") == 0) {
+            || strcmp(key, "PublicKey") == 0
+            || strcmp(key, "ParamKey") == 0) {
             if (!read_key(s))
                 return 0;
         }
 
         if (!TEST_int_lt(s->numpairs++, TESTMAXPAIRS)
-                || !TEST_ptr(pp->key = OPENSSL_strdup(key))
-                || !TEST_ptr(pp->value = OPENSSL_strdup(value)))
+            || !TEST_ptr(pp->key = OPENSSL_strdup(key))
+            || !TEST_ptr(pp->value = OPENSSL_strdup(value)))
             return 0;
         pp++;
     }
@@ -150,7 +149,7 @@ void test_clearstanza(STANZA *s)
     PAIR *pp = s->pairs;
     int i = s->numpairs;
 
-    for ( ; --i >= 0; pp++) {
+    for (; --i >= 0; pp++) {
         OPENSSL_free(pp->key);
         OPENSSL_free(pp->value);
     }
diff --git a/test/testutil/tests.c b/test/testutil/tests.c
index 42a3b855c0cef..f67b5ce4bfa79 100644
--- a/test/testutil/tests.c
+++ b/test/testutil/tests.c
@@ -23,9 +23,9 @@
  * and right where a non-failure message is produced if either is NULL.
  */
 void test_fail_message_prefix(const char *prefix, const char *file,
-                              int line, const char *type,
-                              const char *left, const char *right,
-                              const char *op)
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op)
 {
     test_printf_stderr("%s: ", prefix != NULL ? prefix : "ERROR");
     if (type)
@@ -66,15 +66,15 @@ void test_fail_message_prefix(const char *prefix, const char *file,
  *      FAIL oops: (int) value 3 is not 6\n
  */
 static void test_fail_message(const char *prefix, const char *file, int line,
-                              const char *type, const char *left,
-                              const char *right, const char *op,
-                              const char *fmt, ...)
-            PRINTF_FORMAT(8, 9);
+    const char *type, const char *left,
+    const char *right, const char *op,
+    const char *fmt, ...)
+    PRINTF_FORMAT(8, 9);
 
 static void test_fail_message_va(const char *prefix, const char *file,
-                                 int line, const char *type,
-                                 const char *left, const char *right,
-                                 const char *op, const char *fmt, va_list ap)
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op, const char *fmt, va_list ap)
 {
     test_fail_message_prefix(prefix, file, line, type, left, right, op);
     if (fmt != NULL) {
@@ -85,9 +85,9 @@ static void test_fail_message_va(const char *prefix, const char *file,
 }
 
 static void test_fail_message(const char *prefix, const char *file,
-                              int line, const char *type,
-                              const char *left, const char *right,
-                              const char *op, const char *fmt, ...)
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op, const char *fmt, ...)
 {
     va_list ap;
 
@@ -157,7 +157,6 @@ void test_note(const char *fmt, ...)
     test_flush_stderr();
 }
 
-
 int test_skip(const char *file, int line, const char *desc, ...)
 {
     va_list ap;
@@ -179,7 +178,6 @@ int test_skip_c90(const char *desc, ...)
     return TEST_SKIP_CODE;
 }
 
-
 void test_openssl_errors(void)
 {
     ERR_print_errors_cb(openssl_error_cb, NULL);
@@ -208,25 +206,25 @@ void test_openssl_errors(void)
  * The desc argument is a printf format string followed by its arguments and
  * this is included in the output if the condition being tested for is false.
  */
-#define DEFINE_COMPARISON(type, name, opname, op, fmt, cast)            \
-    int test_ ## name ## _ ## opname(const char *file, int line,        \
-                                     const char *s1, const char *s2,    \
-                                     const type t1, const type t2)      \
-    {                                                                   \
-        if (t1 op t2)                                                   \
-            return 1;                                                   \
-        test_fail_message(NULL, file, line, #type, s1, s2, #op,         \
-                          "[" fmt "] compared to [" fmt "]",            \
-                          (cast)t1, (cast)t2);                          \
-        return 0;                                                       \
+#define DEFINE_COMPARISON(type, name, opname, op, fmt, cast)    \
+    int test_##name##_##opname(const char *file, int line,      \
+        const char *s1, const char *s2,                         \
+        const type t1, const type t2)                           \
+    {                                                           \
+        if (t1 op t2)                                           \
+            return 1;                                           \
+        test_fail_message(NULL, file, line, #type, s1, s2, #op, \
+            "[" fmt "] compared to [" fmt "]",                  \
+            (cast)t1, (cast)t2);                                \
+        return 0;                                               \
     }
 
-#define DEFINE_COMPARISONS(type, name, fmt, cast)                       \
-    DEFINE_COMPARISON(type, name, eq, ==, fmt, cast)                    \
-    DEFINE_COMPARISON(type, name, ne, !=, fmt, cast)                    \
-    DEFINE_COMPARISON(type, name, lt, <, fmt, cast)                     \
-    DEFINE_COMPARISON(type, name, le, <=, fmt, cast)                    \
-    DEFINE_COMPARISON(type, name, gt, >, fmt, cast)                     \
+#define DEFINE_COMPARISONS(type, name, fmt, cast)    \
+    DEFINE_COMPARISON(type, name, eq, ==, fmt, cast) \
+    DEFINE_COMPARISON(type, name, ne, !=, fmt, cast) \
+    DEFINE_COMPARISON(type, name, lt, <, fmt, cast)  \
+    DEFINE_COMPARISON(type, name, le, <=, fmt, cast) \
+    DEFINE_COMPARISON(type, name, gt, >, fmt, cast)  \
     DEFINE_COMPARISON(type, name, ge, >=, fmt, cast)
 
 DEFINE_COMPARISONS(int, int, "%d", int)
@@ -276,76 +274,76 @@ int test_false(const char *file, int line, const char *s, int b)
 }
 
 int test_str_eq(const char *file, int line, const char *st1, const char *st2,
-                const char *s1, const char *s2)
+    const char *s1, const char *s2)
 {
     if (s1 == NULL && s2 == NULL)
-      return 1;
+        return 1;
     if (s1 == NULL || s2 == NULL || strcmp(s1, s2) != 0) {
         test_fail_string_message(NULL, file, line, "string", st1, st2, "==",
-                                 s1, s1 == NULL ? 0 : strlen(s1),
-                                 s2, s2 == NULL ? 0 : strlen(s2));
+            s1, s1 == NULL ? 0 : strlen(s1),
+            s2, s2 == NULL ? 0 : strlen(s2));
         return 0;
     }
     return 1;
 }
 
 int test_str_ne(const char *file, int line, const char *st1, const char *st2,
-                const char *s1, const char *s2)
+    const char *s1, const char *s2)
 {
     if ((s1 == NULL) ^ (s2 == NULL))
-      return 1;
+        return 1;
     if (s1 == NULL || strcmp(s1, s2) == 0) {
         test_fail_string_message(NULL, file, line, "string", st1, st2, "!=",
-                                 s1, s1 == NULL ? 0 : strlen(s1),
-                                 s2, s2 == NULL ? 0 : strlen(s2));
+            s1, s1 == NULL ? 0 : strlen(s1),
+            s2, s2 == NULL ? 0 : strlen(s2));
         return 0;
     }
     return 1;
 }
 
 int test_strn_eq(const char *file, int line, const char *st1, const char *st2,
-                 const char *s1, size_t n1, const char *s2, size_t n2)
+    const char *s1, size_t n1, const char *s2, size_t n2)
 {
     if (s1 == NULL && s2 == NULL)
-      return 1;
+        return 1;
     if (n1 != n2 || s1 == NULL || s2 == NULL || strncmp(s1, s2, n1) != 0) {
         test_fail_string_message(NULL, file, line, "string", st1, st2, "==",
-                                 s1, s1 == NULL ? 0 : OPENSSL_strnlen(s1, n1),
-                                 s2, s2 == NULL ? 0 : OPENSSL_strnlen(s2, n2));
+            s1, s1 == NULL ? 0 : OPENSSL_strnlen(s1, n1),
+            s2, s2 == NULL ? 0 : OPENSSL_strnlen(s2, n2));
         return 0;
     }
     return 1;
 }
 
 int test_strn_ne(const char *file, int line, const char *st1, const char *st2,
-                 const char *s1, size_t n1, const char *s2, size_t n2)
+    const char *s1, size_t n1, const char *s2, size_t n2)
 {
     if ((s1 == NULL) ^ (s2 == NULL))
-      return 1;
+        return 1;
     if (n1 != n2 || s1 == NULL || strncmp(s1, s2, n1) == 0) {
         test_fail_string_message(NULL, file, line, "string", st1, st2, "!=",
-                                 s1, s1 == NULL ? 0 : OPENSSL_strnlen(s1, n1),
-                                 s2, s2 == NULL ? 0 : OPENSSL_strnlen(s2, n2));
+            s1, s1 == NULL ? 0 : OPENSSL_strnlen(s1, n1),
+            s2, s2 == NULL ? 0 : OPENSSL_strnlen(s2, n2));
         return 0;
     }
     return 1;
 }
 
 int test_mem_eq(const char *file, int line, const char *st1, const char *st2,
-                const void *s1, size_t n1, const void *s2, size_t n2)
+    const void *s1, size_t n1, const void *s2, size_t n2)
 {
     if (s1 == NULL && s2 == NULL)
         return 1;
     if (n1 != n2 || s1 == NULL || s2 == NULL || memcmp(s1, s2, n1) != 0) {
         test_fail_memory_message(NULL, file, line, "memory", st1, st2, "==",
-                                 s1, n1, s2, n2);
+            s1, n1, s2, n2);
         return 0;
     }
     return 1;
 }
 
 int test_mem_ne(const char *file, int line, const char *st1, const char *st2,
-                const void *s1, size_t n1, const void *s2, size_t n2)
+    const void *s1, size_t n1, const void *s2, size_t n2)
 {
     if ((s1 == NULL) ^ (s2 == NULL))
         return 1;
@@ -353,38 +351,38 @@ int test_mem_ne(const char *file, int line, const char *st1, const char *st2,
         return 1;
     if (s1 == NULL || memcmp(s1, s2, n1) == 0) {
         test_fail_memory_message(NULL, file, line, "memory", st1, st2, "!=",
-                                 s1, n1, s2, n2);
+            s1, n1, s2, n2);
         return 0;
     }
     return 1;
 }
 
-#define DEFINE_BN_COMPARISONS(opname, op, zero_cond)                    \
-    int test_BN_ ## opname(const char *file, int line,                  \
-                           const char *s1, const char *s2,              \
-                           const BIGNUM *t1, const BIGNUM *t2)          \
-    {                                                                   \
-        if (BN_cmp(t1, t2) op 0)                                        \
-            return 1;                                                   \
-        test_fail_bignum_message(NULL, file, line, "BIGNUM", s1, s2,    \
-                                 #op, t1, t2);                          \
-        return 0;                                                       \
-    }                                                                   \
-    int test_BN_ ## opname ## _zero(const char *file, int line,         \
-                                    const char *s, const BIGNUM *a)     \
-    {                                                                   \
-        if (a != NULL &&(zero_cond))                                    \
-            return 1;                                                   \
-        test_fail_bignum_mono_message(NULL, file, line, "BIGNUM",       \
-                                      s, "0", #op, a);                  \
-        return 0;                                                       \
+#define DEFINE_BN_COMPARISONS(opname, op, zero_cond)                 \
+    int test_BN_##opname(const char *file, int line,                 \
+        const char *s1, const char *s2,                              \
+        const BIGNUM *t1, const BIGNUM *t2)                          \
+    {                                                                \
+        if (BN_cmp(t1, t2) op 0)                                     \
+            return 1;                                                \
+        test_fail_bignum_message(NULL, file, line, "BIGNUM", s1, s2, \
+            #op, t1, t2);                                            \
+        return 0;                                                    \
+    }                                                                \
+    int test_BN_##opname##_zero(const char *file, int line,          \
+        const char *s, const BIGNUM *a)                              \
+    {                                                                \
+        if (a != NULL && (zero_cond))                                \
+            return 1;                                                \
+        test_fail_bignum_mono_message(NULL, file, line, "BIGNUM",    \
+            s, "0", #op, a);                                         \
+        return 0;                                                    \
     }
 
 DEFINE_BN_COMPARISONS(eq, ==, BN_is_zero(a))
 DEFINE_BN_COMPARISONS(ne, !=, !BN_is_zero(a))
-DEFINE_BN_COMPARISONS(gt, >,  !BN_is_negative(a) && !BN_is_zero(a))
+DEFINE_BN_COMPARISONS(gt, >, !BN_is_negative(a) && !BN_is_zero(a))
 DEFINE_BN_COMPARISONS(ge, >=, !BN_is_negative(a) || BN_is_zero(a))
-DEFINE_BN_COMPARISONS(lt, <,  BN_is_negative(a) && !BN_is_zero(a))
+DEFINE_BN_COMPARISONS(lt, <, BN_is_negative(a) && !BN_is_zero(a))
 DEFINE_BN_COMPARISONS(le, <=, BN_is_negative(a) || BN_is_zero(a))
 
 int test_BN_eq_one(const char *file, int line, const char *s, const BIGNUM *a)
@@ -408,12 +406,12 @@ int test_BN_even(const char *file, int line, const char *s, const BIGNUM *a)
     if (a != NULL && !BN_is_odd(a))
         return 1;
     test_fail_bignum_mono_message(NULL, file, line, "BIGNUM", "EVEN(", ")", s,
-                                  a);
+        a);
     return 0;
 }
 
 int test_BN_eq_word(const char *file, int line, const char *bns, const char *ws,
-                    const BIGNUM *a, BN_ULONG w)
+    const BIGNUM *a, BN_ULONG w)
 {
     BIGNUM *bw;
 
@@ -427,7 +425,7 @@ int test_BN_eq_word(const char *file, int line, const char *bns, const char *ws,
 }
 
 int test_BN_abs_eq_word(const char *file, int line, const char *bns,
-                        const char *ws, const BIGNUM *a, BN_ULONG w)
+    const char *ws, const BIGNUM *a, BN_ULONG w)
 {
     BIGNUM *bw, *aa;
 
@@ -438,7 +436,7 @@ int test_BN_abs_eq_word(const char *file, int line, const char *bns,
     if ((bw = BN_new()) != NULL)
         BN_set_word(bw, w);
     test_fail_bignum_message(NULL, file, line, "BIGNUM", bns, ws, "abs==",
-                             aa, bw);
+        aa, bw);
     BN_free(bw);
     BN_free(aa);
     return 0;
@@ -449,22 +447,22 @@ static const char *print_time(const ASN1_TIME *t)
     return t == NULL ? "<null>" : (const char *)ASN1_STRING_get0_data(t);
 }
 
-#define DEFINE_TIME_T_COMPARISON(opname, op)                            \
-    int test_time_t_ ## opname(const char *file, int line,              \
-                               const char *s1, const char *s2,          \
-                               const time_t t1, const time_t t2)        \
-    {                                                                   \
-        ASN1_TIME *at1 = ASN1_TIME_set(NULL, t1);                       \
-        ASN1_TIME *at2 = ASN1_TIME_set(NULL, t2);                       \
-        int r = at1 != NULL && at2 != NULL                              \
-                && ASN1_TIME_compare(at1, at2) op 0;                    \
-        if (!r)                                                         \
-            test_fail_message(NULL, file, line, "time_t", s1, s2, #op,  \
-                              "[%s] compared to [%s]",                  \
-                              print_time(at1), print_time(at2));        \
-        ASN1_STRING_free(at1);                                          \
-        ASN1_STRING_free(at2);                                          \
-        return r;                                                       \
+#define DEFINE_TIME_T_COMPARISON(opname, op)                           \
+    int test_time_t_##opname(const char *file, int line,               \
+        const char *s1, const char *s2,                                \
+        const time_t t1, const time_t t2)                              \
+    {                                                                  \
+        ASN1_TIME *at1 = ASN1_TIME_set(NULL, t1);                      \
+        ASN1_TIME *at2 = ASN1_TIME_set(NULL, t2);                      \
+        int r = at1 != NULL && at2 != NULL                             \
+            && ASN1_TIME_compare(at1, at2) op 0;                       \
+        if (!r)                                                        \
+            test_fail_message(NULL, file, line, "time_t", s1, s2, #op, \
+                "[%s] compared to [%s]",                               \
+                print_time(at1), print_time(at2));                     \
+        ASN1_STRING_free(at1);                                         \
+        ASN1_STRING_free(at2);                                         \
+        return r;                                                      \
     }
 DEFINE_TIME_T_COMPARISON(eq, ==)
 DEFINE_TIME_T_COMPARISON(ne, !=)
diff --git a/test/testutil/testutil_init.c b/test/testutil/testutil_init.c
index 3301551ab2f7d..75ab294184174 100644
--- a/test/testutil/testutil_init.c
+++ b/test/testutil/testutil_init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-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
@@ -16,11 +16,11 @@
 #ifndef OPENSSL_NO_TRACE
 typedef struct tracedata_st {
     BIO *bio;
-    unsigned int ingroup:1;
+    unsigned int ingroup : 1;
 } tracedata;
 
 static size_t internal_trace_cb(const char *buf, size_t cnt,
-                                int category, int cmd, void *vdata)
+    int category, int cmd, void *vdata)
 {
     int ret = 0;
     tracedata *trace_data = vdata;
@@ -34,7 +34,7 @@ static size_t internal_trace_cb(const char *buf, size_t cnt,
         tid = CRYPTO_THREAD_get_current_id();
         hex = OPENSSL_buf2hexstr((const unsigned char *)&tid, sizeof(tid));
         BIO_snprintf(buffer, sizeof(buffer), "TRACE[%s]:%s: ",
-                     hex, OSSL_trace_get_category_name(category));
+            hex, OSSL_trace_get_category_name(category));
         OPENSSL_free(hex);
         BIO_set_prefix(trace_data->bio, buffer);
         break;
@@ -78,20 +78,22 @@ static void setup_trace_category(int category)
 
     bio = BIO_new(BIO_f_prefix());
     channel = BIO_push(bio,
-                       BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT));
+        BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT));
     trace_data = OPENSSL_zalloc(sizeof(*trace_data));
 
     if (trace_data == NULL
         || bio == NULL
         || (trace_data->bio = channel) == NULL
         || OSSL_trace_set_callback(category, internal_trace_cb,
-                                   trace_data) == 0
+               trace_data)
+            == 0
         || sk_tracedata_push(trace_data_stack, trace_data) == 0) {
 
         fprintf(stderr,
-                "warning: unable to setup trace callback for category '%s'.\n",
-                OSSL_trace_get_category_name(category));
+            "warning: unable to setup trace callback for category '%s'.\n",
+            OSSL_trace_get_category_name(category));
 
+        OPENSSL_free(trace_data);
         OSSL_trace_set_callback(category, NULL, NULL);
         BIO_free_all(channel);
     }
@@ -126,7 +128,7 @@ static void setup_trace(const char *str)
                 setup_trace_category(category);
             } else {
                 fprintf(stderr,
-                        "warning: unknown trace category: '%s'.\n", item);
+                    "warning: unknown trace category: '%s'.\n", item);
             }
         }
     }
diff --git a/test/testutil/tu_local.h b/test/testutil/tu_local.h
index ede4546948ff3..6b900d19b4991 100644
--- a/test/testutil/tu_local.h
+++ b/test/testutil/tu_local.h
@@ -7,44 +7,44 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <stdlib.h>              /* size_t */
+#include <stdlib.h> /* size_t */
 #include <openssl/bn.h>
 #include <openssl/bio.h>
 #include "../testutil.h"
 
-#define TEST_SKIP_CODE  123
+#define TEST_SKIP_CODE 123
 
 int subtest_level(void);
 int openssl_error_cb(const char *str, size_t len, void *u);
 const BIO_METHOD *BIO_f_tap(void);
 
 void test_fail_message_prefix(const char *prefix, const char *file,
-                              int line, const char *type,
-                              const char *left, const char *right,
-                              const char *op);
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op);
 
 void test_fail_string_message(const char *prefix, const char *file,
-                              int line, const char *type,
-                              const char *left, const char *right,
-                              const char *op, const char *m1, size_t l1,
-                              const char *m2, size_t l2);
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op, const char *m1, size_t l1,
+    const char *m2, size_t l2);
 
 void test_fail_bignum_message(const char *prefix, const char *file,
-                              int line, const char *type,
-                              const char *left, const char *right,
-                              const char *op,
-                              const BIGNUM *bn1, const BIGNUM *bn2);
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op,
+    const BIGNUM *bn1, const BIGNUM *bn2);
 void test_fail_bignum_mono_message(const char *prefix, const char *file,
-                                   int line, const char *type,
-                                   const char *left, const char *right,
-                                   const char *op, const BIGNUM *bn);
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op, const BIGNUM *bn);
 
 void test_fail_memory_message(const char *prefix, const char *file,
-                              int line, const char *type,
-                              const char *left, const char *right,
-                              const char *op,
-                              const unsigned char *m1, size_t l1,
-                              const unsigned char *m2, size_t l2);
+    int line, const char *type,
+    const char *left, const char *right,
+    const char *op,
+    const unsigned char *m1, size_t l1,
+    const unsigned char *m2, size_t l2);
 
 __owur int setup_test_framework(int argc, char *argv[]);
 __owur int pulldown_test_framework(int ret);
@@ -58,4 +58,3 @@ typedef enum OPTION_choice_default {
     OPT_TEST_ENUM
 } OPTION_CHOICE_DEFAULT;
 void opt_check_usage(void);
-
diff --git a/test/threadpool_test.c b/test/threadpool_test.c
index e0d9cc9f09bb3..d9a2bb1662032 100644
--- a/test/threadpool_test.c
+++ b/test/threadpool_test.c
@@ -28,7 +28,7 @@ static int test_thread_reported_flags(void)
         return 0;
 #else
     if (!TEST_int_eq(flags & OSSL_THREAD_SUPPORT_FLAG_THREAD_POOL,
-                     OSSL_THREAD_SUPPORT_FLAG_THREAD_POOL))
+            OSSL_THREAD_SUPPORT_FLAG_THREAD_POOL))
         return 0;
 #endif
 
@@ -37,7 +37,7 @@ static int test_thread_reported_flags(void)
         return 0;
 #else
     if (!TEST_int_eq(flags & OSSL_THREAD_SUPPORT_FLAG_DEFAULT_SPAWN,
-                     OSSL_THREAD_SUPPORT_FLAG_DEFAULT_SPAWN))
+            OSSL_THREAD_SUPPORT_FLAG_DEFAULT_SPAWN))
         return 0;
 #endif
 
@@ -46,10 +46,10 @@ static int test_thread_reported_flags(void)
 
 #ifndef OPENSSL_NO_THREAD_POOL
 
-# define TEST_THREAD_NATIVE_FN_SET_VALUE 1
+#define TEST_THREAD_NATIVE_FN_SET_VALUE 1
 static uint32_t test_thread_native_fn(void *data)
 {
-    uint32_t *ldata = (uint32_t*) data;
+    uint32_t *ldata = (uint32_t *)data;
     *ldata = *ldata + 1;
     return *ldata - 1;
 }
@@ -92,7 +92,7 @@ static int test_thread_native(void)
     return 1;
 }
 
-# if !defined(OPENSSL_NO_DEFAULT_THREAD_POOL)
+#if !defined(OPENSSL_NO_DEFAULT_THREAD_POOL)
 static int test_thread_internal(void)
 {
     uint32_t retval[3];
@@ -243,7 +243,7 @@ static int test_thread_internal(void)
     OSSL_LIB_CTX_free(cust_ctx);
     return status;
 }
-# endif
+#endif
 
 static uint32_t test_thread_native_multiple_joins_fn1(void *data)
 {
@@ -298,9 +298,9 @@ int setup_tests(void)
 #if !defined(OPENSSL_NO_THREAD_POOL)
     ADD_TEST(test_thread_native);
     ADD_TEST(test_thread_native_multiple_joins);
-# if !defined(OPENSSL_NO_DEFAULT_THREAD_POOL)
+#if !defined(OPENSSL_NO_DEFAULT_THREAD_POOL)
     ADD_TEST(test_thread_internal);
-# endif
+#endif
 #endif
 
     return 1;
diff --git a/test/threadstest.c b/test/threadstest.c
index e30a3e817d8c8..01be7f3224282 100644
--- a/test/threadstest.c
+++ b/test/threadstest.c
@@ -12,11 +12,11 @@
  * deprecated function.
  */
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# define OPENSSL_SUPPRESS_DEPRECATED
+#define OPENSSL_SUPPRESS_DEPRECATED
 #endif
 
 #if defined(_WIN32)
-# include <windows.h>
+#include <windows.h>
 #endif
 
 #include <string.h>
@@ -42,13 +42,14 @@
 #endif
 
 /* Limit the maximum number of threads */
-#define MAXIMUM_THREADS     10
+#define MAXIMUM_THREADS 10
 
 /* Limit the maximum number of providers loaded into a library context */
-#define MAXIMUM_PROVIDERS   4
+#define MAXIMUM_PROVIDERS 4
 
 static int do_fips = 0;
 static char *privkey;
+static char *storedir;
 static char *config_file = NULL;
 static int multidefault_run = 0;
 
@@ -94,9 +95,9 @@ static int test_lock(void)
         return 0;
 
     res = TEST_true(CRYPTO_THREAD_read_lock(lock))
-          && TEST_true(CRYPTO_THREAD_unlock(lock))
-          && TEST_true(CRYPTO_THREAD_write_lock(lock))
-          && TEST_true(CRYPTO_THREAD_unlock(lock));
+        && TEST_true(CRYPTO_THREAD_unlock(lock))
+        && TEST_true(CRYPTO_THREAD_write_lock(lock))
+        && TEST_true(CRYPTO_THREAD_unlock(lock));
 
     CRYPTO_THREAD_lock_free(lock);
 
@@ -123,8 +124,8 @@ static void rwwriter_fn(int id, int *iterations)
     OSSL_TIME t1, t2;
     t1 = ossl_time_now();
 
-    for (count = 0; ; count++) {
-        new = CRYPTO_zalloc(sizeof (int), NULL, 0);
+    for (count = 0;; count++) {
+        new = CRYPTO_zalloc(sizeof(int), NULL, 0);
         if (contention == 0)
             OSSL_sleep(1000);
         if (!CRYPTO_THREAD_write_lock(rwtorturelock))
@@ -175,20 +176,23 @@ static void rwreader_fn(int *iterations)
     int lw2 = 0;
 
     if (CRYPTO_THREAD_read_lock(rwtorturelock) == 0)
-            abort();
+        abort();
 
     while (lw1 != 1 || lw2 != 1) {
         CRYPTO_atomic_add(&rwwriter1_done, 0, &lw1, atomiclock);
         CRYPTO_atomic_add(&rwwriter2_done, 0, &lw2, atomiclock);
 
         count++;
-        if (rwwriter_ptr != NULL && old > *rwwriter_ptr) {
-            TEST_info("rwwriter pointer went backwards\n");
-            rw_torture_result = 0;
+        if (rwwriter_ptr != NULL) {
+            if (old > *rwwriter_ptr) {
+                TEST_info("rwwriter pointer went backwards! %d : %d\n",
+                    old, *rwwriter_ptr);
+                rw_torture_result = 0;
+            }
+            old = *rwwriter_ptr;
         }
         if (CRYPTO_THREAD_unlock(rwtorturelock) == 0)
             abort();
-        *iterations = count;
         if (rw_torture_result == 0) {
             *iterations = count;
             return;
@@ -198,7 +202,7 @@ static void rwreader_fn(int *iterations)
     }
     *iterations = count;
     if (CRYPTO_THREAD_unlock(rwtorturelock) == 0)
-            abort();
+        abort();
 }
 
 static void rwreader1_fn(void)
@@ -261,8 +265,8 @@ static int _torture_rw(void)
     tottime = dtime.tv_sec + (dtime.tv_usec / 1e6);
     TEST_info("rw_torture_result is %d\n", rw_torture_result);
     TEST_info("performed %d reads and %d writes over 2 read and 2 write threads in %e seconds",
-              rwreader1_iterations + rwreader2_iterations,
-              rwwriter1_iterations + rwwriter2_iterations, tottime);
+        rwreader1_iterations + rwreader2_iterations,
+        rwwriter1_iterations + rwwriter2_iterations, tottime);
     if ((rwreader1_iterations + rwreader2_iterations == 0)
         || (rwwriter1_iterations + rwwriter2_iterations == 0)) {
         TEST_info("Threads did not iterate\n");
@@ -294,7 +298,6 @@ static int torture_rw_high(void)
     return _torture_rw();
 }
 
-
 static CRYPTO_RCU_LOCK *rcu_lock = NULL;
 
 static int writer1_done = 0;
@@ -319,8 +322,9 @@ static void writer_fn(int id, int *iterations)
 
     t1 = ossl_time_now();
 
-    for (count = 0; ; count++) {
-        new = CRYPTO_zalloc(sizeof(uint64_t), NULL, 0);
+    for (count = 0;; count++) {
+        new = CRYPTO_malloc(sizeof(uint64_t), NULL, 0);
+        *new = (uint64_t)0xBAD;
         if (contention == 0)
             OSSL_sleep(1000);
         ossl_rcu_write_lock(rcu_lock);
@@ -380,6 +384,8 @@ static void reader_fn(int *iterations)
 
         if (oldval > val) {
             TEST_info("rcu torture value went backwards! %llu : %llu", (unsigned long long)oldval, (unsigned long long)val);
+            if (valp == NULL)
+                TEST_info("ossl_rcu_deref did return NULL!");
             rcu_torture_result = 0;
         }
         oldval = val; /* just try to deref the pointer */
@@ -455,8 +461,8 @@ static int _torture_rcu(void)
     tottime = dtime.tv_sec + (dtime.tv_usec / 1e6);
     TEST_info("rcu_torture_result is %d\n", rcu_torture_result);
     TEST_info("performed %d reads and %d writes over 2 read and 2 write threads in %e seconds",
-              reader1_iterations + reader2_iterations,
-              writer1_iterations + writer2_iterations, tottime);
+        reader1_iterations + reader2_iterations,
+        writer1_iterations + writer2_iterations, tottime);
     if ((reader1_iterations + reader2_iterations == 0)
         || (writer1_iterations + writer2_iterations == 0)) {
         TEST_info("Threads did not iterate\n");
@@ -547,7 +553,7 @@ static void thread_local_thread_cb(void)
     ptr = CRYPTO_THREAD_get_local(&thread_local_key);
     if (!TEST_ptr_null(ptr)
         || !TEST_true(CRYPTO_THREAD_set_local(&thread_local_key,
-                                              &destructor_run_count)))
+            &destructor_run_count)))
         return;
 
     ptr = CRYPTO_THREAD_get_local(&thread_local_key);
@@ -563,7 +569,7 @@ static int test_thread_local(void)
     void *ptr = NULL;
 
     if (!TEST_true(CRYPTO_THREAD_init_local(&thread_local_key,
-                                            thread_local_destructor)))
+            thread_local_destructor)))
         return 0;
 
     ptr = CRYPTO_THREAD_get_local(&thread_local_key);
@@ -579,10 +585,10 @@ static int test_thread_local(void)
     if (!TEST_ptr_null(ptr))
         return 0;
 
-# if !defined(OPENSSL_SYS_WINDOWS)
+#if !defined(OPENSSL_SYS_WINDOWS)
     if (!TEST_int_eq(destructor_run_count, 1))
         return 0;
-# endif
+#endif
 #endif
 
     if (!TEST_true(CRYPTO_THREAD_cleanup_local(&thread_local_key)))
@@ -590,6 +596,29 @@ static int test_thread_local(void)
     return 1;
 }
 
+/*
+ * Basic test to ensure that we can repeatedly create and
+ * destroy local keys without leaking anything
+ */
+static int test_thread_local_multi_key(void)
+{
+    int dummy;
+    int i;
+
+    for (i = 0; i < 1000; i++) {
+        if (!TEST_true(CRYPTO_THREAD_init_local(&thread_local_key,
+                thread_local_destructor)))
+            return 0;
+
+        if (!TEST_true(CRYPTO_THREAD_set_local(&thread_local_key, &dummy)))
+            return 0;
+
+        if (!TEST_true(CRYPTO_THREAD_cleanup_local(&thread_local_key)))
+            return 0;
+    }
+    return 1;
+}
+
 static int test_atomic(void)
 {
     int val = 0, ret = 0, testresult = 0;
@@ -619,12 +648,12 @@ static int test_atomic(void)
     if (CRYPTO_atomic_or(&val64, 2, &ret64, NULL)) {
         /* This succeeds therefore we're on a platform with lockless atomics */
         if (!TEST_uint_eq((unsigned int)val64, 3)
-                || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
+            || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
             goto err;
     } else {
         /* This failed therefore we're on a platform without lockless atomics */
         if (!TEST_uint_eq((unsigned int)val64, 1)
-                || !TEST_int_eq((unsigned int)ret64, 0))
+            || !TEST_int_eq((unsigned int)ret64, 0))
             goto err;
     }
     val64 = 1;
@@ -634,19 +663,19 @@ static int test_atomic(void)
         goto err;
 
     if (!TEST_uint_eq((unsigned int)val64, 3)
-            || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
+        || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
         goto err;
 
     ret64 = 0;
     if (CRYPTO_atomic_load(&val64, &ret64, NULL)) {
         /* This succeeds therefore we're on a platform with lockless atomics */
         if (!TEST_uint_eq((unsigned int)val64, 3)
-                || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
+            || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
             goto err;
     } else {
         /* This failed therefore we're on a platform without lockless atomics */
         if (!TEST_uint_eq((unsigned int)val64, 3)
-                || !TEST_int_eq((unsigned int)ret64, 0))
+            || !TEST_int_eq((unsigned int)ret64, 0))
             goto err;
     }
 
@@ -655,7 +684,7 @@ static int test_atomic(void)
         goto err;
 
     if (!TEST_uint_eq((unsigned int)val64, 3)
-            || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
+        || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
         goto err;
 
     ret64 = 0;
@@ -663,12 +692,12 @@ static int test_atomic(void)
     if (CRYPTO_atomic_and(&val64, 5, &ret64, NULL)) {
         /* This succeeds therefore we're on a platform with lockless atomics */
         if (!TEST_uint_eq((unsigned int)val64, 1)
-                || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
+            || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
             goto err;
     } else {
         /* This failed therefore we're on a platform without lockless atomics */
         if (!TEST_uint_eq((unsigned int)val64, 3)
-                || !TEST_int_eq((unsigned int)ret64, 0))
+            || !TEST_int_eq((unsigned int)ret64, 0))
             goto err;
     }
     val64 = 3;
@@ -678,7 +707,7 @@ static int test_atomic(void)
         goto err;
 
     if (!TEST_uint_eq((unsigned int)val64, 1)
-            || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
+        || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
         goto err;
 
     ret64 = 0;
@@ -686,12 +715,12 @@ static int test_atomic(void)
     if (CRYPTO_atomic_add64(&val64, 2, &ret64, NULL)) {
         /* This succeeds therefore we're on a platform with lockless atomics */
         if (!TEST_uint_eq((unsigned int)val64, 3)
-                || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
+            || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
             goto err;
     } else {
         /* This failed therefore we're on a platform without lockless atomics */
         if (!TEST_uint_eq((unsigned int)val64, 1)
-                || !TEST_int_eq((unsigned int)ret64, 0))
+            || !TEST_int_eq((unsigned int)ret64, 0))
             goto err;
     }
     val64 = 1;
@@ -701,11 +730,11 @@ static int test_atomic(void)
         goto err;
 
     if (!TEST_uint_eq((unsigned int)val64, 3)
-            || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
+        || !TEST_uint_eq((unsigned int)val64, (unsigned int)ret64))
         goto err;
 
     testresult = 1;
- err:
+err:
     CRYPTO_THREAD_lock_free(lock);
     return testresult;
 }
@@ -752,15 +781,14 @@ static int thread_setup_libctx(int libctx, const char *providers[])
 {
     size_t n;
 
-    if (libctx && !TEST_true(test_get_libctx(&multi_libctx, NULL, config_file,
-                                             NULL, NULL)))
+    if (libctx && !TEST_true(test_get_libctx(&multi_libctx, NULL, config_file, NULL, NULL)))
         return 0;
 
     if (providers != NULL)
         for (n = 0; providers[n] != NULL; n++)
             if (!TEST_size_t_lt(n, MAXIMUM_PROVIDERS)
                 || !TEST_ptr(multi_provider[n] = OSSL_PROVIDER_load(multi_libctx,
-                                                                    providers[n]))) {
+                                 providers[n]))) {
                 thead_teardown_libctx();
                 return 0;
             }
@@ -784,7 +812,7 @@ static int start_threads(size_t n, void (*thread_func)(void))
     if (!TEST_size_t_le(multi_num_threads + n, MAXIMUM_THREADS))
         return 0;
 
-    for (i = 0 ; i < n; i++)
+    for (i = 0; i < n; i++)
         if (!TEST_true(run_thread(multi_threads + multi_num_threads++, thread_func)))
             return 0;
     return 1;
@@ -792,24 +820,24 @@ static int start_threads(size_t n, void (*thread_func)(void))
 
 /* Template multi-threaded test function */
 static int thread_run_test(void (*main_func)(void),
-                           size_t num_threads, void (*thread_func)(void),
-                           int libctx, const char *providers[])
+    size_t num_threads, void (*thread_func)(void),
+    int libctx, const char *providers[])
 {
     int testresult = 0;
 
     multi_intialise();
     if (!thread_setup_libctx(libctx, providers)
-            || !start_threads(num_threads, thread_func))
+        || !start_threads(num_threads, thread_func))
         goto err;
 
     if (main_func != NULL)
         main_func();
 
     if (!teardown_threads()
-            || !TEST_true(multi_success))
+        || !TEST_true(multi_success))
         goto err;
     testresult = 1;
- err:
+err:
     thead_teardown_libctx();
     return testresult;
 }
@@ -841,24 +869,24 @@ static void thread_general_worker(void)
     isfips = OSSL_PROVIDER_available(multi_libctx, "fips");
 
     if (!TEST_ptr(mdctx)
-            || !TEST_ptr(md)
-            || !TEST_ptr(cipherctx)
-            || !TEST_ptr(ciph))
+        || !TEST_ptr(md)
+        || !TEST_ptr(cipherctx)
+        || !TEST_ptr(ciph))
         goto err;
 
     /* Do some work */
     for (i = 0; i < 5; i++) {
         if (!TEST_true(EVP_DigestInit_ex(mdctx, md, NULL))
-                || !TEST_true(EVP_DigestUpdate(mdctx, message, messlen))
-                || !TEST_true(EVP_DigestFinal(mdctx, out, &mdoutl)))
+            || !TEST_true(EVP_DigestUpdate(mdctx, message, messlen))
+            || !TEST_true(EVP_DigestFinal(mdctx, out, &mdoutl)))
             goto err;
     }
     for (i = 0; i < 5; i++) {
         if (!TEST_true(EVP_EncryptInit_ex(cipherctx, ciph, NULL, key, iv))
-                || !TEST_true(EVP_EncryptUpdate(cipherctx, out, &ciphoutl,
-                                                (unsigned char *)message,
-                                                messlen))
-                || !TEST_true(EVP_EncryptFinal(cipherctx, out, &ciphoutl)))
+            || !TEST_true(EVP_EncryptUpdate(cipherctx, out, &ciphoutl,
+                (unsigned char *)message,
+                messlen))
+            || !TEST_true(EVP_EncryptFinal(cipherctx, out, &ciphoutl)))
             goto err;
     }
 
@@ -872,7 +900,7 @@ static void thread_general_worker(void)
         goto err;
 
     testresult = 1;
- err:
+err:
     EVP_MD_CTX_free(mdctx);
     EVP_MD_free(md);
     EVP_CIPHER_CTX_free(cipherctx);
@@ -908,15 +936,15 @@ static void thread_shared_evp_pkey(void)
         if (i > 0)
             EVP_PKEY_CTX_free(ctx);
         ctx = EVP_PKEY_CTX_new_from_pkey(multi_libctx, shared_evp_pkey,
-                                         i == 0 ? "provider=default"
-                                                : "provider=fips");
+            i == 0 ? "provider=default"
+                   : "provider=fips");
         if (!TEST_ptr(ctx))
             goto err;
 
         if (!TEST_int_ge(EVP_PKEY_encrypt_init(ctx), 0)
-                || !TEST_int_ge(EVP_PKEY_encrypt(ctx, ctbuf, &ctlen,
-                                                (unsigned char *)msg, strlen(msg)),
-                                                0))
+            || !TEST_int_ge(EVP_PKEY_encrypt(ctx, ctbuf, &ctlen,
+                                (unsigned char *)msg, strlen(msg)),
+                0))
             goto err;
 
         EVP_PKEY_CTX_free(ctx);
@@ -927,15 +955,15 @@ static void thread_shared_evp_pkey(void)
 
         ptlen = sizeof(ptbuf);
         if (!TEST_int_ge(EVP_PKEY_decrypt_init(ctx), 0)
-                || !TEST_int_gt(EVP_PKEY_decrypt(ctx, ptbuf, &ptlen, ctbuf, ctlen),
-                                                0)
-                || !TEST_mem_eq(msg, strlen(msg), ptbuf, ptlen))
+            || !TEST_int_gt(EVP_PKEY_decrypt(ctx, ptbuf, &ptlen, ctbuf, ctlen),
+                0)
+            || !TEST_mem_eq(msg, strlen(msg), ptbuf, ptlen))
             goto err;
     }
 
     success = 1;
 
- err:
+err:
     EVP_PKEY_CTX_free(ctx);
     if (!success)
         multi_set_success(0);
@@ -946,7 +974,7 @@ static void thread_provider_load_unload(void)
     OSSL_PROVIDER *deflt = OSSL_PROVIDER_load(multi_libctx, "default");
 
     if (!TEST_ptr(deflt)
-            || !TEST_true(OSSL_PROVIDER_available(multi_libctx, "default")))
+        || !TEST_true(OSSL_PROVIDER_available(multi_libctx, "default")))
         multi_set_success(0);
 
     OSSL_PROVIDER_unload(deflt);
@@ -955,7 +983,7 @@ static void thread_provider_load_unload(void)
 static int test_multi_general_worker_default_provider(void)
 {
     return thread_run_test(&thread_general_worker, 2, &thread_general_worker,
-                           1, default_provider);
+        1, default_provider);
 }
 
 static int test_multi_general_worker_fips_provider(void)
@@ -963,13 +991,13 @@ static int test_multi_general_worker_fips_provider(void)
     if (!do_fips)
         return TEST_skip("FIPS not supported");
     return thread_run_test(&thread_general_worker, 2, &thread_general_worker,
-                           1, fips_provider);
+        1, fips_provider);
 }
 
 static int test_multi_fetch_worker(void)
 {
     return thread_run_test(&thread_multi_simple_fetch,
-                           2, &thread_multi_simple_fetch, 1, default_provider);
+        2, &thread_multi_simple_fetch, 1, default_provider);
 }
 
 static int test_multi_shared_pkey_common(void (*worker)(void))
@@ -977,20 +1005,19 @@ static int test_multi_shared_pkey_common(void (*worker)(void))
     int testresult = 0;
 
     multi_intialise();
-    if (!thread_setup_libctx(1, do_fips ? fips_and_default_providers
-                                        : default_provider)
-            || !TEST_ptr(shared_evp_pkey = load_pkey_pem(privkey, multi_libctx))
-            || !start_threads(1, &thread_shared_evp_pkey)
-            || !start_threads(1, worker))
+    if (!thread_setup_libctx(1, do_fips ? fips_and_default_providers : default_provider)
+        || !TEST_ptr(shared_evp_pkey = load_pkey_pem(privkey, multi_libctx))
+        || !start_threads(1, &thread_shared_evp_pkey)
+        || !start_threads(1, worker))
         goto err;
 
     thread_shared_evp_pkey();
 
     if (!teardown_threads()
-            || !TEST_true(multi_success))
+        || !TEST_true(multi_success))
         goto err;
     testresult = 1;
- err:
+err:
     EVP_PKEY_free(shared_evp_pkey);
     thead_teardown_libctx();
     return testresult;
@@ -1031,9 +1058,8 @@ static int test_multi_shared_pkey_release(void)
 
     multi_intialise();
     shared_evp_pkey = NULL;
-    if (!thread_setup_libctx(1, do_fips ? fips_and_default_providers
-                                        : default_provider)
-            || !TEST_ptr(shared_evp_pkey = load_pkey_pem(privkey, multi_libctx)))
+    if (!thread_setup_libctx(1, do_fips ? fips_and_default_providers : default_provider)
+        || !TEST_ptr(shared_evp_pkey = load_pkey_pem(privkey, multi_libctx)))
         goto err;
     for (; i < 10; ++i) {
         if (!TEST_true(EVP_PKEY_up_ref(shared_evp_pkey)))
@@ -1045,10 +1071,10 @@ static int test_multi_shared_pkey_release(void)
     i = 0;
 
     if (!teardown_threads()
-            || !TEST_true(multi_success))
+        || !TEST_true(multi_success))
         goto err;
     testresult = 1;
- err:
+err:
     while (i > 0) {
         EVP_PKEY_free(shared_evp_pkey);
         --i;
@@ -1065,9 +1091,9 @@ static int test_multi_load_unload_provider(void)
 
     multi_intialise();
     if (!thread_setup_libctx(1, NULL)
-            || !TEST_ptr(prov = OSSL_PROVIDER_load(multi_libctx, "default"))
-            || !TEST_ptr(sha256 = EVP_MD_fetch(multi_libctx, "SHA2-256", NULL))
-            || !TEST_true(OSSL_PROVIDER_unload(prov)))
+        || !TEST_ptr(prov = OSSL_PROVIDER_load(multi_libctx, "default"))
+        || !TEST_ptr(sha256 = EVP_MD_fetch(multi_libctx, "SHA2-256", NULL))
+        || !TEST_true(OSSL_PROVIDER_unload(prov)))
         goto err;
     prov = NULL;
 
@@ -1077,10 +1103,10 @@ static int test_multi_load_unload_provider(void)
     thread_provider_load_unload();
 
     if (!teardown_threads()
-            || !TEST_true(multi_success))
+        || !TEST_true(multi_success))
         goto err;
     testresult = 1;
- err:
+err:
     OSSL_PROVIDER_unload(prov);
     EVP_MD_free(sha256);
     thead_teardown_libctx();
@@ -1098,7 +1124,7 @@ static void test_multi_load_worker(void)
     OSSL_PROVIDER *prov;
 
     if (!TEST_ptr(prov = OSSL_PROVIDER_load(multi_libctx, multi_load_provider))
-            || !TEST_true(OSSL_PROVIDER_unload(prov)))
+        || !TEST_true(OSSL_PROVIDER_unload(prov)))
         multi_set_success(0);
 }
 
@@ -1112,7 +1138,7 @@ static int test_multi_default(void)
     multidefault_run = 1;
 
     return thread_run_test(&thread_multi_simple_fetch,
-                           2, &thread_multi_simple_fetch, 0, default_provider);
+        2, &thread_multi_simple_fetch, 0, NULL);
 }
 
 static int test_multi_load(void)
@@ -1140,7 +1166,8 @@ static int test_multi_load(void)
     OSSL_PROVIDER_unload(prov);
 
     return thread_run_test(NULL, MAXIMUM_THREADS, &test_multi_load_worker, 0,
-                          NULL) && res;
+               NULL)
+        && res;
 }
 
 static void test_obj_create_one(void)
@@ -1153,16 +1180,16 @@ static void test_obj_create_one(void)
     BIO_snprintf(sn, sizeof(sn), "short-name-%s", tids);
     BIO_snprintf(ln, sizeof(ln), "long-name-%s", tids);
     if (!TEST_int_ne(id, 0)
-            || !TEST_true(id = OBJ_create(oid, sn, ln))
-            || !TEST_true(OBJ_add_sigid(id, NID_sha3_256, NID_rsa)))
+        || !TEST_true(id = OBJ_create(oid, sn, ln))
+        || !TEST_true(OBJ_add_sigid(id, NID_sha3_256, NID_rsa)))
         multi_set_success(0);
 }
 
 static int test_obj_add(void)
 {
     return thread_run_test(&test_obj_create_one,
-                           MAXIMUM_THREADS, &test_obj_create_one,
-                           1, default_provider);
+        MAXIMUM_THREADS, &test_obj_create_one,
+        1, default_provider);
 }
 
 #if !defined(OPENSSL_NO_DGRAM) && !defined(OPENSSL_NO_SOCK)
@@ -1174,13 +1201,13 @@ static void test_bio_dgram_pair_worker(void)
     int ok = 0;
     uint8_t ch = 0;
     uint8_t scratch[64];
-    BIO_MSG msg = {0};
+    BIO_MSG msg = { 0 };
     size_t num_processed = 0;
 
     if (!TEST_int_eq(RAND_bytes_ex(multi_libctx, &ch, 1, 64), 1))
         goto err;
 
-    msg.data     = scratch;
+    msg.data = scratch;
     msg.data_len = sizeof(scratch);
 
     /*
@@ -1189,10 +1216,10 @@ static void test_bio_dgram_pair_worker(void)
      */
     if (ch & 2)
         r = BIO_sendmmsg(ch & 1 ? multi_bio2 : multi_bio1, &msg,
-                         sizeof(BIO_MSG), 1, 0, &num_processed);
+            sizeof(BIO_MSG), 1, 0, &num_processed);
     else
         r = BIO_recvmmsg(ch & 1 ? multi_bio2 : multi_bio1, &msg,
-                         sizeof(BIO_MSG), 1, 0, &num_processed);
+            sizeof(BIO_MSG), 1, 0, &num_processed);
 
     ok = 1;
 err:
@@ -1212,9 +1239,9 @@ static int test_bio_dgram_pair(void)
     multi_bio1 = bio1;
     multi_bio2 = bio2;
 
-    r  = thread_run_test(&test_bio_dgram_pair_worker,
-                         MAXIMUM_THREADS, &test_bio_dgram_pair_worker,
-                         1, default_provider);
+    r = thread_run_test(&test_bio_dgram_pair_worker,
+        MAXIMUM_THREADS, &test_bio_dgram_pair_worker,
+        1, default_provider);
 
 err:
     BIO_free(bio1);
@@ -1259,7 +1286,7 @@ static void test_pem_read_one(void)
     if (key == NULL)
         multi_set_success(0);
 
- err:
+err:
     EVP_PKEY_free(key);
     BIO_free(pem);
     OPENSSL_free(pemdata);
@@ -1269,13 +1296,70 @@ static void test_pem_read_one(void)
 static int test_pem_read(void)
 {
     return thread_run_test(&test_pem_read_one, MAXIMUM_THREADS,
-                           &test_pem_read_one, 1, default_provider);
+        &test_pem_read_one, 1, default_provider);
+}
+
+static X509_STORE *store = NULL;
+
+static void test_x509_store_by_subject(void)
+{
+    X509_STORE_CTX *ctx;
+    X509_OBJECT *obj = NULL;
+    X509_NAME *name = NULL;
+    int success = 0;
+
+    ctx = X509_STORE_CTX_new();
+    if (!TEST_ptr(ctx))
+        goto err;
+
+    if (!TEST_true(X509_STORE_CTX_init(ctx, store, NULL, NULL)))
+        goto err;
+
+    name = X509_NAME_new();
+    if (!TEST_ptr(name))
+        goto err;
+    if (!TEST_true(X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC,
+            (unsigned char *)"Root CA",
+            -1, -1, 0)))
+        goto err;
+    obj = X509_STORE_CTX_get_obj_by_subject(ctx, X509_LU_X509, name);
+    if (!TEST_ptr(obj))
+        goto err;
+
+    success = 1;
+err:
+    X509_OBJECT_free(obj);
+    X509_STORE_CTX_free(ctx);
+    X509_NAME_free(name);
+    if (!success)
+        multi_set_success(0);
+}
+
+/* Test accessing an X509_STORE from multiple threads */
+static int test_x509_store(void)
+{
+    int ret = 0;
+
+    store = X509_STORE_new();
+    if (!TEST_ptr(store))
+        return 0;
+    if (!TEST_true(X509_STORE_load_store(store, storedir)))
+        goto err;
+
+    ret = thread_run_test(&test_x509_store_by_subject, MAXIMUM_THREADS,
+        &test_x509_store_by_subject, 0, NULL);
+
+err:
+    X509_STORE_free(store);
+    store = NULL;
+    return ret;
 }
 
 typedef enum OPTION_choice {
     OPT_ERR = -1,
     OPT_EOF = 0,
-    OPT_FIPS, OPT_CONFIG_FILE,
+    OPT_FIPS,
+    OPT_CONFIG_FILE,
     OPT_TEST_ENUM
 } OPTION_CHOICE;
 
@@ -1285,7 +1369,7 @@ const OPTIONS *test_get_options(void)
         OPT_TEST_OPTIONS_DEFAULT_USAGE,
         { "fips", OPT_FIPS, '-', "Test the FIPS provider" },
         { "config", OPT_CONFIG_FILE, '<',
-          "The configuration file to use for the libctx" },
+            "The configuration file to use for the libctx" },
         { NULL }
     };
     return options;
@@ -1318,6 +1402,10 @@ int setup_tests(void)
     if (!TEST_ptr(privkey))
         return 0;
 
+    storedir = test_mk_file_path(datadir, "store");
+    if (!TEST_ptr(storedir))
+        return 0;
+
     if (!TEST_ptr(global_lock = CRYPTO_THREAD_lock_new()))
         return 0;
 
@@ -1339,6 +1427,7 @@ int setup_tests(void)
 #endif
     ADD_TEST(test_once);
     ADD_TEST(test_thread_local);
+    ADD_TEST(test_thread_local_multi_key);
     ADD_TEST(test_atomic);
     ADD_TEST(test_multi_load);
     ADD_TEST(test_multi_general_worker_default_provider);
@@ -1355,12 +1444,14 @@ int setup_tests(void)
     ADD_TEST(test_bio_dgram_pair);
 #endif
     ADD_TEST(test_pem_read);
+    ADD_TEST(test_x509_store);
     return 1;
 }
 
 void cleanup_tests(void)
 {
     OPENSSL_free(privkey);
+    OPENSSL_free(storedir);
 #ifdef TSAN_REQUIRES_LOCKING
     CRYPTO_THREAD_lock_free(tsan_lock);
 #endif
diff --git a/test/threadstest.h b/test/threadstest.h
index f8e6589e0c312..507ba1f603116 100644
--- a/test/threadstest.h
+++ b/test/threadstest.h
@@ -8,7 +8,7 @@
  */
 
 #if defined(_WIN32)
-# include <windows.h>
+#include <windows.h>
 #endif
 
 #include <string.h>
@@ -37,7 +37,7 @@ static DWORD WINAPI thread_run(LPVOID arg)
 {
     void (*f)(void);
 
-    *(void **) (&f) = arg;
+    *(void **)(&f) = arg;
 
     f();
     return 0;
@@ -45,7 +45,7 @@ static DWORD WINAPI thread_run(LPVOID arg)
 
 static int run_thread(thread_t *t, void (*f)(void))
 {
-    *t = CreateThread(NULL, 0, thread_run, *(void **) &f, 0, NULL);
+    *t = CreateThread(NULL, 0, thread_run, *(void **)&f, 0, NULL);
     return *t != NULL;
 }
 
@@ -62,7 +62,7 @@ static void *thread_run(void *arg)
 {
     void (*f)(void);
 
-    *(void **) (&f) = arg;
+    *(void **)(&f) = arg;
 
     f();
     OPENSSL_thread_stop();
@@ -71,7 +71,7 @@ static void *thread_run(void *arg)
 
 static int run_thread(thread_t *t, void (*f)(void))
 {
-    return pthread_create(t, NULL, thread_run, *(void **) &f) == 0;
+    return pthread_create(t, NULL, thread_run, *(void **)&f) == 0;
 }
 
 static int wait_for_thread(thread_t thread)
@@ -80,4 +80,3 @@ static int wait_for_thread(thread_t thread)
 }
 
 #endif
-
diff --git a/test/threadstest_fips.c b/test/threadstest_fips.c
index b38221d4ed307..c7cf28a2430b2 100644
--- a/test/threadstest_fips.c
+++ b/test/threadstest_fips.c
@@ -8,7 +8,7 @@
  */
 
 #if defined(_WIN32)
-# include <windows.h>
+#include <windows.h>
 #endif
 
 #include "testutil.h"
diff --git a/test/time_offset_test.c b/test/time_offset_test.c
index 7da75fe9332e9..c147f9b391725 100644
--- a/test/time_offset_test.c
+++ b/test/time_offset_test.c
@@ -24,7 +24,6 @@ typedef struct {
     int type;
 } TESTDATA;
 
-
 /**********************************************************************
  *
  * Test driver
@@ -32,35 +31,35 @@ typedef struct {
  ***/
 
 static TESTDATA tests[] = {
-    { "20001201000000Z",      0, V_ASN1_GENERALIZEDTIME },
-    { "20001201010000+0100",  0, V_ASN1_GENERALIZEDTIME },
-    { "20001201050000+0500",  0, V_ASN1_GENERALIZEDTIME },
-    { "20001130230000-0100",  0, V_ASN1_GENERALIZEDTIME },
-    { "20001130190000-0500",  0, V_ASN1_GENERALIZEDTIME },
-    { "20001130190001-0500",  1, V_ASN1_GENERALIZEDTIME }, /* +1 second */
+    { "20001201000000Z", 0, V_ASN1_GENERALIZEDTIME },
+    { "20001201010000+0100", 0, V_ASN1_GENERALIZEDTIME },
+    { "20001201050000+0500", 0, V_ASN1_GENERALIZEDTIME },
+    { "20001130230000-0100", 0, V_ASN1_GENERALIZEDTIME },
+    { "20001130190000-0500", 0, V_ASN1_GENERALIZEDTIME },
+    { "20001130190001-0500", 1, V_ASN1_GENERALIZEDTIME }, /* +1 second */
     { "20001130185959-0500", -1, V_ASN1_GENERALIZEDTIME }, /* -1 second */
-    { "001201000000Z",        0, V_ASN1_UTCTIME },
-    { "001201010000+0100",    0, V_ASN1_UTCTIME },
-    { "001201050000+0500",    0, V_ASN1_UTCTIME },
-    { "001130230000-0100",    0, V_ASN1_UTCTIME },
-    { "001130190000-0500",    0, V_ASN1_UTCTIME },
-    { "001201000000-0000",    0, V_ASN1_UTCTIME },
-    { "001201000001-0000",    1, V_ASN1_UTCTIME }, /* +1 second */
-    { "001130235959-0000",   -1, V_ASN1_UTCTIME }, /* -1 second */
-    { "20001201000000+0000",  0, V_ASN1_GENERALIZEDTIME },
+    { "001201000000Z", 0, V_ASN1_UTCTIME },
+    { "001201010000+0100", 0, V_ASN1_UTCTIME },
+    { "001201050000+0500", 0, V_ASN1_UTCTIME },
+    { "001130230000-0100", 0, V_ASN1_UTCTIME },
+    { "001130190000-0500", 0, V_ASN1_UTCTIME },
+    { "001201000000-0000", 0, V_ASN1_UTCTIME },
+    { "001201000001-0000", 1, V_ASN1_UTCTIME }, /* +1 second */
+    { "001130235959-0000", -1, V_ASN1_UTCTIME }, /* -1 second */
+    { "20001201000000+0000", 0, V_ASN1_GENERALIZEDTIME },
     { "20001201000000+0100", -1, V_ASN1_GENERALIZEDTIME },
-    { "001201000000+0100",   -1, V_ASN1_UTCTIME },
-    { "20001201000000-0100",  1, V_ASN1_GENERALIZEDTIME },
-    { "001201000000-0100",    1, V_ASN1_UTCTIME },
-    { "20001201123400+1234",  0, V_ASN1_GENERALIZEDTIME },
-    { "20001130112600-1234",  0, V_ASN1_GENERALIZEDTIME },
+    { "001201000000+0100", -1, V_ASN1_UTCTIME },
+    { "20001201000000-0100", 1, V_ASN1_GENERALIZEDTIME },
+    { "001201000000-0100", 1, V_ASN1_UTCTIME },
+    { "20001201123400+1234", 0, V_ASN1_GENERALIZEDTIME },
+    { "20001130112600-1234", 0, V_ASN1_GENERALIZEDTIME },
 };
 
 static time_t the_time = 975628800;
 static ASN1_TIME the_asn1_time = {
     15,
     V_ASN1_GENERALIZEDTIME,
-    (unsigned char*)"20001201000000Z",
+    (unsigned char *)"20001201000000Z",
     0
 };
 
@@ -71,7 +70,7 @@ static int test_offset(int idx)
     int ret = -2;
     int day, sec;
 
-    at.data = (unsigned char*)testdata->data;
+    at.data = (unsigned char *)testdata->data;
     at.length = strlen(testdata->data);
     at.type = testdata->type;
     at.flags = 0;
diff --git a/test/timing_load_creds.c b/test/timing_load_creds.c
index 978523c2cd6a4..fa41096731852 100644
--- a/test/timing_load_creds.c
+++ b/test/timing_load_creds.c
@@ -13,28 +13,28 @@
 #include <openssl/e_os2.h>
 
 #ifdef OPENSSL_SYS_UNIX
-# include <sys/stat.h>
-# include <sys/resource.h>
-# include <openssl/pem.h>
-# include <openssl/x509.h>
-# include <openssl/err.h>
-# include <openssl/bio.h>
-# include "internal/e_os.h"
-# if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
-
-# ifndef timersub
+#include <sys/stat.h>
+#include <sys/resource.h>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
+#include <openssl/err.h>
+#include <openssl/bio.h>
+#include "internal/e_os.h"
+#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
+
+#ifndef timersub
 /* struct timeval * subtraction; a must be greater than or equal to b */
-#  define timersub(a, b, res)                                         \
-     do {                                                             \
-         (res)->tv_sec = (a)->tv_sec - (b)->tv_sec;                   \
-         if ((a)->tv_usec < (b)->tv_usec) {                           \
-             (res)->tv_usec = (a)->tv_usec + 1000000 - (b)->tv_usec;  \
-             --(res)->tv_sec;                                         \
-         } else {                                                     \
-             (res)->tv_usec = (a)->tv_usec - (b)->tv_usec;            \
-         }                                                            \
-     } while(0)
-# endif
+#define timersub(a, b, res)                                         \
+    do {                                                            \
+        (res)->tv_sec = (a)->tv_sec - (b)->tv_sec;                  \
+        if ((a)->tv_usec < (b)->tv_usec) {                          \
+            (res)->tv_usec = (a)->tv_usec + 1000000 - (b)->tv_usec; \
+            --(res)->tv_sec;                                        \
+        } else {                                                    \
+            (res)->tv_usec = (a)->tv_usec - (b)->tv_usec;           \
+        }                                                           \
+    } while (0)
+#endif
 
 static char *prog;
 
@@ -91,7 +91,11 @@ static void usage(void)
     fprintf(stderr, "          p for private key\n");
     exit(EXIT_FAILURE);
 }
-# endif
+#endif
+#endif
+
+#if !defined(RUSAGE_SELF) && defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
+#include <sys/times.h>
 #endif
 
 int main(int ac, char **av)
@@ -101,7 +105,13 @@ int main(int ac, char **av)
     struct stat sb;
     FILE *fp;
     char *contents;
+#if !defined(RUSAGE_SELF)
+    struct tms rus;
+    struct timeval u_start, u_end, u_elapsed;
+    struct timeval s_start, s_end, s_elapsed;
+#else
     struct rusage start, end, elapsed;
+#endif
     struct timeval e_start, e_end, e_elapsed;
 
     /* Parse JCL. */
@@ -174,10 +184,18 @@ int main(int ac, char **av)
         perror("elapsed start");
         exit(EXIT_FAILURE);
     }
+#if !defined(RUSAGE_SELF)
+    times(&rus);
+    u_start.tv_sec = rus.tms_utime / CLOCKS_PER_SEC;
+    u_start.tv_usec = (rus.tms_utime * 1000000) / CLOCKS_PER_SEC;
+    s_start.tv_sec = rus.tms_stime / CLOCKS_PER_SEC;
+    s_start.tv_usec = (rus.tms_stime * 1000000) / CLOCKS_PER_SEC;
+#else
     if (getrusage(RUSAGE_SELF, &start) < 0) {
         perror("start");
         exit(EXIT_FAILURE);
     }
+#endif
     for (i = count; i > 0; i--) {
         switch (what) {
         case 'c':
@@ -188,20 +206,38 @@ int main(int ac, char **av)
             break;
         }
     }
+#if !defined(RUSAGE_SELF)
+    times(&rus);
+    u_end.tv_sec = rus.tms_utime / CLOCKS_PER_SEC;
+    u_end.tv_usec = (rus.tms_utime * 1000000) / CLOCKS_PER_SEC;
+    s_end.tv_sec = rus.tms_stime / CLOCKS_PER_SEC;
+    s_end.tv_usec = (rus.tms_stime * 1000000) / CLOCKS_PER_SEC;
+#else
     if (getrusage(RUSAGE_SELF, &end) < 0) {
         perror("getrusage");
         exit(EXIT_FAILURE);
     }
+#endif
     if (gettimeofday(&e_end, NULL) < 0) {
         perror("gettimeofday");
         exit(EXIT_FAILURE);
     }
 
+#if !defined(RUSAGE_SELF)
+    timersub(&u_end, &u_start, &u_elapsed);
+    timersub(&s_end, &s_start, &s_elapsed);
+#else
     timersub(&end.ru_utime, &start.ru_stime, &elapsed.ru_stime);
     timersub(&end.ru_utime, &start.ru_utime, &elapsed.ru_utime);
+#endif
     timersub(&e_end, &e_start, &e_elapsed);
+#if !defined(RUSAGE_SELF)
+    print_timeval("user     ", &u_elapsed);
+    print_timeval("sys      ", &s_elapsed);
+#else
     print_timeval("user     ", &elapsed.ru_utime);
     print_timeval("sys      ", &elapsed.ru_stime);
+#endif
     if (debug)
         print_timeval("elapsed??", &e_elapsed);
 
@@ -209,7 +245,7 @@ int main(int ac, char **av)
     return EXIT_SUCCESS;
 #else
     fprintf(stderr,
-            "This tool is not supported on this platform for lack of POSIX1.2001 support\n");
+        "This tool is not supported on this platform for lack of POSIX1.2001 support\n");
     exit(EXIT_FAILURE);
 #endif
 }
diff --git a/test/tls-provider.c b/test/tls-provider.c
index 4d3bbfe101025..37f6e32dfd63a 100644
--- a/test/tls-provider.c
+++ b/test/tls-provider.c
@@ -29,21 +29,21 @@
 /* error codes */
 
 /* xorprovider error codes */
-#define XORPROV_R_INVALID_DIGEST                            1
-#define XORPROV_R_INVALID_SIZE                              2
-#define XORPROV_R_INVALID_KEY                               3
-#define XORPROV_R_UNSUPPORTED                               4
-#define XORPROV_R_MISSING_OID                               5
-#define XORPROV_R_OBJ_CREATE_ERR                            6
-#define XORPROV_R_INVALID_ENCODING                          7
-#define XORPROV_R_SIGN_ERROR                                8
-#define XORPROV_R_LIB_CREATE_ERR                            9
-#define XORPROV_R_NO_PRIVATE_KEY                            10
-#define XORPROV_R_BUFFER_LENGTH_WRONG                       11
-#define XORPROV_R_SIGNING_FAILED                            12
-#define XORPROV_R_WRONG_PARAMETERS                          13
-#define XORPROV_R_VERIFY_ERROR                              14
-#define XORPROV_R_EVPINFO_MISSING                           15
+#define XORPROV_R_INVALID_DIGEST 1
+#define XORPROV_R_INVALID_SIZE 2
+#define XORPROV_R_INVALID_KEY 3
+#define XORPROV_R_UNSUPPORTED 4
+#define XORPROV_R_MISSING_OID 5
+#define XORPROV_R_OBJ_CREATE_ERR 6
+#define XORPROV_R_INVALID_ENCODING 7
+#define XORPROV_R_SIGN_ERROR 8
+#define XORPROV_R_LIB_CREATE_ERR 9
+#define XORPROV_R_NO_PRIVATE_KEY 10
+#define XORPROV_R_BUFFER_LENGTH_WRONG 11
+#define XORPROV_R_SIGNING_FAILED 12
+#define XORPROV_R_WRONG_PARAMETERS 13
+#define XORPROV_R_VERIFY_ERROR 14
+#define XORPROV_R_EVPINFO_MISSING 15
 
 static OSSL_FUNC_keymgmt_import_fn xor_import;
 static OSSL_FUNC_keymgmt_import_types_fn xor_import_types;
@@ -53,9 +53,9 @@ static OSSL_FUNC_keymgmt_export_types_fn xor_export_types;
 static OSSL_FUNC_keymgmt_export_types_ex_fn xor_export_types_ex;
 
 int tls_provider_init(const OSSL_CORE_HANDLE *handle,
-                      const OSSL_DISPATCH *in,
-                      const OSSL_DISPATCH **out,
-                      void **provctx);
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx);
 
 #define XOR_KEY_SIZE 32
 
@@ -170,12 +170,11 @@ xor_prov_get_keymgmt_export(const OSSL_DISPATCH *fns)
 }
 
 static void *xor_prov_import_key(const OSSL_DISPATCH *fns, void *provctx,
-                           int selection, const OSSL_PARAM params[])
+    int selection, const OSSL_PARAM params[])
 {
     OSSL_FUNC_keymgmt_new_fn *kmgmt_new = xor_prov_get_keymgmt_new(fns);
     OSSL_FUNC_keymgmt_free_fn *kmgmt_free = xor_prov_get_keymgmt_free(fns);
-    OSSL_FUNC_keymgmt_import_fn *kmgmt_import =
-        xor_prov_get_keymgmt_import(fns);
+    OSSL_FUNC_keymgmt_import_fn *kmgmt_import = xor_prov_get_keymgmt_import(fns);
     void *key = NULL;
 
     if (kmgmt_new != NULL && kmgmt_import != NULL && kmgmt_free != NULL) {
@@ -213,40 +212,40 @@ struct tls_group_st {
 #define XORGROUP_NAME "xorgroup"
 #define XORGROUP_NAME_INTERNAL "xorgroup-int"
 static struct tls_group_st xor_group = {
-    0,                  /* group_id, set by randomize_tls_alg_id() */
-    128,                /* secbits */
-    TLS1_3_VERSION,     /* mintls */
-    0,                  /* maxtls */
-    -1,                 /* mindtls */
-    -1,                 /* maxdtls */
-    0                   /* is_kem */
+    0, /* group_id, set by randomize_tls_alg_id() */
+    128, /* secbits */
+    TLS1_3_VERSION, /* mintls */
+    0, /* maxtls */
+    -1, /* mindtls */
+    -1, /* maxdtls */
+    0 /* is_kem */
 };
 
 #define XORKEMGROUP_NAME "xorkemgroup"
 #define XORKEMGROUP_NAME_INTERNAL "xorkemgroup-int"
 static struct tls_group_st xor_kemgroup = {
-    0,                  /* group_id, set by randomize_tls_alg_id() */
-    128,                /* secbits */
-    TLS1_3_VERSION,     /* mintls */
-    0,                  /* maxtls */
-    -1,                 /* mindtls */
-    -1,                 /* maxdtls */
-    1                   /* is_kem */
+    0, /* group_id, set by randomize_tls_alg_id() */
+    128, /* secbits */
+    TLS1_3_VERSION, /* mintls */
+    0, /* maxtls */
+    -1, /* mindtls */
+    -1, /* maxdtls */
+    1 /* is_kem */
 };
 
 #define ALGORITHM "XOR"
 
 static const OSSL_PARAM xor_group_params[] = {
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_GROUP_NAME,
-                           XORGROUP_NAME, sizeof(XORGROUP_NAME)),
+        XORGROUP_NAME, sizeof(XORGROUP_NAME)),
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_GROUP_NAME_INTERNAL,
-                           XORGROUP_NAME_INTERNAL,
-                           sizeof(XORGROUP_NAME_INTERNAL)),
+        XORGROUP_NAME_INTERNAL,
+        sizeof(XORGROUP_NAME_INTERNAL)),
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_GROUP_ALG, ALGORITHM,
-                           sizeof(ALGORITHM)),
+        sizeof(ALGORITHM)),
     OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_GROUP_ID, &xor_group.group_id),
     OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_GROUP_SECURITY_BITS,
-                    &xor_group.secbits),
+        &xor_group.secbits),
     OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MIN_TLS, &xor_group.mintls),
     OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MAX_TLS, &xor_group.maxtls),
     OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MIN_DTLS, &xor_group.mindtls),
@@ -257,15 +256,15 @@ static const OSSL_PARAM xor_group_params[] = {
 
 static const OSSL_PARAM xor_kemgroup_params[] = {
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_GROUP_NAME,
-                           XORKEMGROUP_NAME, sizeof(XORKEMGROUP_NAME)),
+        XORKEMGROUP_NAME, sizeof(XORKEMGROUP_NAME)),
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_GROUP_NAME_INTERNAL,
-                           XORKEMGROUP_NAME_INTERNAL,
-                           sizeof(XORKEMGROUP_NAME_INTERNAL)),
+        XORKEMGROUP_NAME_INTERNAL,
+        sizeof(XORKEMGROUP_NAME_INTERNAL)),
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_GROUP_ALG, ALGORITHM,
-                           sizeof(ALGORITHM)),
+        sizeof(ALGORITHM)),
     OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_GROUP_ID, &xor_kemgroup.group_id),
     OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_GROUP_SECURITY_BITS,
-                    &xor_kemgroup.secbits),
+        &xor_kemgroup.secbits),
     OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MIN_TLS, &xor_kemgroup.mintls),
     OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MAX_TLS, &xor_kemgroup.maxtls),
     OSSL_PARAM_int(OSSL_CAPABILITY_TLS_GROUP_MIN_DTLS, &xor_kemgroup.mindtls),
@@ -296,87 +295,87 @@ struct tls_sigalg_st {
 #define XORSIGALG12_OID "1.3.6.1.4.1.16604.998888.3"
 
 static struct tls_sigalg_st xor_sigalg = {
-    0,                  /* alg id, set by randomize_tls_alg_id() */
-    128,                /* secbits */
-    TLS1_3_VERSION,     /* mintls */
-    0,                  /* maxtls */
+    0, /* alg id, set by randomize_tls_alg_id() */
+    128, /* secbits */
+    TLS1_3_VERSION, /* mintls */
+    0, /* maxtls */
 };
 
 static struct tls_sigalg_st xor_sigalg_hash = {
-    0,                  /* alg id, set by randomize_tls_alg_id() */
-    128,                /* secbits */
-    TLS1_3_VERSION,     /* mintls */
-    0,                  /* maxtls */
+    0, /* alg id, set by randomize_tls_alg_id() */
+    128, /* secbits */
+    TLS1_3_VERSION, /* mintls */
+    0, /* maxtls */
 };
 
 static struct tls_sigalg_st xor_sigalg12 = {
-    0,                  /* alg id, set by randomize_tls_alg_id() */
-    128,                /* secbits */
-    TLS1_2_VERSION,     /* mintls */
-    TLS1_2_VERSION,     /* maxtls */
+    0, /* alg id, set by randomize_tls_alg_id() */
+    128, /* secbits */
+    TLS1_2_VERSION, /* mintls */
+    TLS1_2_VERSION, /* maxtls */
 };
 
 static const OSSL_PARAM xor_sig_nohash_params[] = {
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_IANA_NAME,
-                           XORSIGALG_NAME, sizeof(XORSIGALG_NAME)),
+        XORSIGALG_NAME, sizeof(XORSIGALG_NAME)),
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_NAME,
-                           XORSIGALG_NAME,
-                           sizeof(XORSIGALG_NAME)),
+        XORSIGALG_NAME,
+        sizeof(XORSIGALG_NAME)),
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_OID,
-                           XORSIGALG_OID, sizeof(XORSIGALG_OID)),
+        XORSIGALG_OID, sizeof(XORSIGALG_OID)),
     OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_SIGALG_CODE_POINT,
-                    &xor_sigalg.code_point),
+        &xor_sigalg.code_point),
     OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_SIGALG_SECURITY_BITS,
-                    &xor_sigalg.secbits),
+        &xor_sigalg.secbits),
     OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MIN_TLS,
-                   &xor_sigalg.mintls),
+        &xor_sigalg.mintls),
     OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MAX_TLS,
-                   &xor_sigalg.maxtls),
+        &xor_sigalg.maxtls),
     OSSL_PARAM_END
 };
 
 static const OSSL_PARAM xor_sig_hash_params[] = {
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_IANA_NAME,
-                           XORSIGALG_HASH_NAME, sizeof(XORSIGALG_HASH_NAME)),
+        XORSIGALG_HASH_NAME, sizeof(XORSIGALG_HASH_NAME)),
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_NAME,
-                           XORSIGALG_HASH_NAME,
-                           sizeof(XORSIGALG_HASH_NAME)),
+        XORSIGALG_HASH_NAME,
+        sizeof(XORSIGALG_HASH_NAME)),
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_HASH_NAME,
-                           XORSIGALG_HASH, sizeof(XORSIGALG_HASH)),
+        XORSIGALG_HASH, sizeof(XORSIGALG_HASH)),
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_OID,
-                           XORSIGALG_HASH_OID, sizeof(XORSIGALG_HASH_OID)),
+        XORSIGALG_HASH_OID, sizeof(XORSIGALG_HASH_OID)),
     OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_SIGALG_CODE_POINT,
-                    &xor_sigalg_hash.code_point),
+        &xor_sigalg_hash.code_point),
     OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_SIGALG_SECURITY_BITS,
-                    &xor_sigalg_hash.secbits),
+        &xor_sigalg_hash.secbits),
     OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MIN_TLS,
-                   &xor_sigalg_hash.mintls),
+        &xor_sigalg_hash.mintls),
     OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MAX_TLS,
-                   &xor_sigalg_hash.maxtls),
+        &xor_sigalg_hash.maxtls),
     OSSL_PARAM_END
 };
 
 static const OSSL_PARAM xor_sig_12_params[] = {
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_IANA_NAME,
-                           XORSIGALG12_NAME, sizeof(XORSIGALG12_NAME)),
+        XORSIGALG12_NAME, sizeof(XORSIGALG12_NAME)),
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_NAME,
-                           XORSIGALG12_NAME,
-                           sizeof(XORSIGALG12_NAME)),
+        XORSIGALG12_NAME,
+        sizeof(XORSIGALG12_NAME)),
     OSSL_PARAM_utf8_string(OSSL_CAPABILITY_TLS_SIGALG_OID,
-                           XORSIGALG12_OID, sizeof(XORSIGALG12_OID)),
+        XORSIGALG12_OID, sizeof(XORSIGALG12_OID)),
     OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_SIGALG_CODE_POINT,
-                    &xor_sigalg12.code_point),
+        &xor_sigalg12.code_point),
     OSSL_PARAM_uint(OSSL_CAPABILITY_TLS_SIGALG_SECURITY_BITS,
-                    &xor_sigalg12.secbits),
+        &xor_sigalg12.secbits),
     OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MIN_TLS,
-                   &xor_sigalg12.mintls),
+        &xor_sigalg12.mintls),
     OSSL_PARAM_int(OSSL_CAPABILITY_TLS_SIGALG_MAX_TLS,
-                   &xor_sigalg12.maxtls),
+        &xor_sigalg12.maxtls),
     OSSL_PARAM_END
 };
 
 static int tls_prov_get_capabilities(void *provctx, const char *capability,
-                                     OSSL_CALLBACK *cb, void *arg)
+    OSSL_CALLBACK *cb, void *arg)
 {
     int ret = 0;
     int i;
@@ -386,7 +385,7 @@ static int tls_prov_get_capabilities(void *provctx, const char *capability,
     if (strcmp(capability, "TLS-GROUP") == 0) {
         /* Register our 2 groups */
         OPENSSL_assert(xor_group.group_id >= 65024
-                       && xor_group.group_id < 65279 - NUM_DUMMY_GROUPS);
+            && xor_group.group_id < 65279 - NUM_DUMMY_GROUPS);
         ret = cb(xor_group_params, arg);
         ret &= cb(xor_kemgroup_params, arg);
 
@@ -408,14 +407,14 @@ static int tls_prov_get_capabilities(void *provctx, const char *capability,
                 if (dummy_group_names[i] == NULL)
                     return 0;
                 BIO_snprintf(dummy_group_names[i],
-                         dummy_name_max_size,
-                         "%s%d", dummy_base, i);
+                    dummy_name_max_size,
+                    "%s%d", dummy_base, i);
             }
             dummygroup[0].data = dummy_group_names[i];
             dummygroup[0].data_size = strlen(dummy_group_names[i]) + 1;
             /* assign unique group IDs also to dummy groups for registration */
             dummygroup_id = 65279 - NUM_DUMMY_GROUPS + i;
-            dummygroup[3].data = (unsigned char*)&dummygroup_id;
+            dummygroup[3].data = (unsigned char *)&dummygroup_id;
             ret &= cb(dummygroup, arg);
         }
     }
@@ -434,7 +433,7 @@ typedef struct {
 
 static PROV_XOR_CTX *xor_newprovctx(OSSL_LIB_CTX *libctx)
 {
-    PROV_XOR_CTX* prov_ctx = OPENSSL_malloc(sizeof(PROV_XOR_CTX));
+    PROV_XOR_CTX *prov_ctx = OPENSSL_malloc(sizeof(PROV_XOR_CTX));
 
     if (prov_ctx == NULL)
         return NULL;
@@ -447,8 +446,6 @@ static PROV_XOR_CTX *xor_newprovctx(OSSL_LIB_CTX *libctx)
     return prov_ctx;
 }
 
-
-
 #define PROV_XOR_LIBCTX_OF(provctx) (((PROV_XOR_CTX *)provctx)->libctx)
 
 /*
@@ -475,7 +472,7 @@ static void *xor_newkemkexctx(void *provctx)
 }
 
 static int xor_init(void *vpxorctx, void *vkey,
-                    ossl_unused const OSSL_PARAM params[])
+    ossl_unused const OSSL_PARAM params[])
 {
     PROV_XORKEMKEX_CTX *pxorctx = (PROV_XORKEMKEX_CTX *)vpxorctx;
 
@@ -496,7 +493,7 @@ static int xor_set_peer(void *vpxorctx, void *vpeerkey)
 }
 
 static int xor_derive(void *vpxorctx, unsigned char *secret, size_t *secretlen,
-                      size_t outlen)
+    size_t outlen)
 {
     PROV_XORKEMKEX_CTX *pxorctx = (PROV_XORKEMKEX_CTX *)vpxorctx;
     int i;
@@ -561,8 +558,8 @@ static const OSSL_ALGORITHM tls_prov_keyexch[] = {
  */
 
 static int xor_encapsulate(void *vpxorctx,
-                           unsigned char *ct, size_t *ctlen,
-                           unsigned char *ss, size_t *sslen)
+    unsigned char *ct, size_t *ctlen,
+    unsigned char *ss, size_t *sslen)
 {
     /*
      * We are building this around a KEX:
@@ -604,14 +601,14 @@ static int xor_encapsulate(void *vpxorctx,
     /* 3. Derive ss via KEX */
     derivectx = xor_newkemkexctx(pxorctx->provctx);
     if (derivectx == NULL
-            || !xor_init(derivectx, ourkey, NULL)
-            || !xor_set_peer(derivectx, pxorctx->key)
-            || !xor_derive(derivectx, ss, sslen, XOR_KEY_SIZE))
+        || !xor_init(derivectx, ourkey, NULL)
+        || !xor_set_peer(derivectx, pxorctx->key)
+        || !xor_derive(derivectx, ss, sslen, XOR_KEY_SIZE))
         goto end;
 
     rv = 1;
 
- end:
+end:
     xor_gen_cleanup(genctx);
     xor_freekey(ourkey);
     xor_freectx(derivectx);
@@ -619,8 +616,8 @@ static int xor_encapsulate(void *vpxorctx,
 }
 
 static int xor_decapsulate(void *vpxorctx,
-                           unsigned char *ss, size_t *sslen,
-                           const unsigned char *ct, size_t ctlen)
+    unsigned char *ss, size_t *sslen,
+    const unsigned char *ct, size_t ctlen)
 {
     /*
      * We are building this around a KEX:
@@ -651,14 +648,14 @@ static int xor_decapsulate(void *vpxorctx,
     /* Derive ss via KEX */
     derivectx = xor_newkemkexctx(pxorctx->provctx);
     if (derivectx == NULL
-            || !xor_init(derivectx, pxorctx->key, NULL)
-            || !xor_set_peer(derivectx, peerkey)
-            || !xor_derive(derivectx, ss, sslen, XOR_KEY_SIZE))
+        || !xor_init(derivectx, pxorctx->key, NULL)
+        || !xor_set_peer(derivectx, peerkey)
+        || !xor_derive(derivectx, ss, sslen, XOR_KEY_SIZE))
         goto end;
 
     rv = 1;
 
- end:
+end:
     xor_freekey(peerkey);
     xor_freectx(derivectx);
     return rv;
@@ -703,7 +700,7 @@ static void *xor_newkey(void *provctx)
 
 static void xor_freekey(void *keydata)
 {
-    XORKEY* key = (XORKEY *)keydata;
+    XORKEY *key = (XORKEY *)keydata;
     int refcnt;
 
     if (key == NULL)
@@ -800,7 +797,8 @@ static ossl_inline int xor_get_params(void *vkey, OSSL_PARAM params[])
         return 0;
 
     if ((p = OSSL_PARAM_locate(params,
-                               OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY)) != NULL) {
+             OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY))
+        != NULL) {
         if (p->data_type != OSSL_PARAM_OCTET_STRING)
             return 0;
         p->return_size = XOR_KEY_SIZE;
@@ -831,7 +829,7 @@ static int xor_set_params(void *vkey, const OSSL_PARAM params[])
     p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_ENCODED_PUBLIC_KEY);
     if (p != NULL) {
         if (p->data_type != OSSL_PARAM_OCTET_STRING
-                || p->data_size != XOR_KEY_SIZE)
+            || p->data_size != XOR_KEY_SIZE)
             return 0;
         memcpy(key->pubkey, p->data, XOR_KEY_SIZE);
         key->haspubkey = 1;
@@ -860,7 +858,8 @@ static void *xor_load(const void *reference, size_t reference_sz)
 }
 
 /* check one key is the "XOR complement" of the other */
-static int xor_recreate(const unsigned char *kd1, const unsigned char *kd2) {
+static int xor_recreate(const unsigned char *kd1, const unsigned char *kd2)
+{
     int i;
 
     for (i = 0; i < XOR_KEY_SIZE; i++) {
@@ -879,11 +878,10 @@ static int xor_match(const void *keydata1, const void *keydata2, int selection)
     if (key1->tls_name != NULL && key2->tls_name != NULL)
         ok = ok & (strcmp(key1->tls_name, key2->tls_name) == 0);
 
-    if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0)  {
+    if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
         if (key1->hasprivkey) {
             if (key2->hasprivkey)
-                ok = ok & (CRYPTO_memcmp(key1->privkey, key2->privkey,
-                                         XOR_KEY_SIZE) == 0);
+                ok = ok & (CRYPTO_memcmp(key1->privkey, key2->privkey, XOR_KEY_SIZE) == 0);
             else
                 ok = ok & xor_recreate(key1->privkey, key2->pubkey);
         } else {
@@ -894,7 +892,7 @@ static int xor_match(const void *keydata1, const void *keydata2, int selection)
         }
     }
 
-    if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0)  {
+    if ((selection & OSSL_KEYMGMT_SELECT_PUBLIC_KEY) != 0) {
         if (key1->haspubkey) {
             if (key2->haspubkey)
                 ok = ok & (CRYPTO_memcmp(key1->pubkey, key2->pubkey, XOR_KEY_SIZE) == 0);
@@ -922,12 +920,11 @@ struct xor_gen_ctx {
 };
 
 static void *xor_gen_init(void *provctx, int selection,
-                          const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     struct xor_gen_ctx *gctx = NULL;
 
-    if ((selection & (OSSL_KEYMGMT_SELECT_KEYPAIR
-                      | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS)) == 0)
+    if ((selection & (OSSL_KEYMGMT_SELECT_KEYPAIR | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS)) == 0)
         return NULL;
 
     if ((gctx = OPENSSL_zalloc(sizeof(*gctx))) == NULL)
@@ -954,8 +951,8 @@ static int xor_gen_set_params(void *genctx, const OSSL_PARAM params[])
     p = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_GROUP_NAME);
     if (p != NULL) {
         if (p->data_type != OSSL_PARAM_UTF8_STRING
-                || (strcmp(p->data, XORGROUP_NAME_INTERNAL) != 0
-                    &&  strcmp(p->data, XORKEMGROUP_NAME_INTERNAL) != 0))
+            || (strcmp(p->data, XORGROUP_NAME_INTERNAL) != 0
+                && strcmp(p->data, XORKEMGROUP_NAME_INTERNAL) != 0))
             return 0;
     }
 
@@ -963,7 +960,7 @@ static int xor_gen_set_params(void *genctx, const OSSL_PARAM params[])
 }
 
 static const OSSL_PARAM *xor_gen_settable_params(ossl_unused void *genctx,
-                                                 ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     static OSSL_PARAM settable[] = {
         OSSL_PARAM_utf8_string(OSSL_PKEY_PARAM_GROUP_NAME, NULL, 0),
@@ -1016,11 +1013,11 @@ static int xor_import(void *vkey, int select, const OSSL_PARAM params[])
     param_pub_key = OSSL_PARAM_locate_const(params, OSSL_PKEY_PARAM_PUB_KEY);
 
     if ((param_priv_key != NULL
-         && !OSSL_PARAM_get_octet_string(param_priv_key, &pprivkey,
-                                         sizeof(privkey), &priv_len))
+            && !OSSL_PARAM_get_octet_string(param_priv_key, &pprivkey,
+                sizeof(privkey), &priv_len))
         || (param_pub_key != NULL
             && !OSSL_PARAM_get_octet_string(param_pub_key, &ppubkey,
-                                            sizeof(pubkey), &pub_len)))
+                sizeof(pubkey), &pub_len)))
         goto err;
 
     if (priv_len > 0) {
@@ -1032,12 +1029,12 @@ static int xor_import(void *vkey, int select, const OSSL_PARAM params[])
         key->haspubkey = 1;
     }
     res = 1;
- err:
+err:
     return res;
 }
 
 static int xor_export(void *vkey, int select, OSSL_CALLBACK *param_cb,
-                      void *cbarg)
+    void *cbarg)
 {
     XORKEY *key = vkey;
     OSSL_PARAM params[3], *p = params;
@@ -1046,10 +1043,10 @@ static int xor_export(void *vkey, int select, OSSL_CALLBACK *param_cb,
         return 0;
 
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_PRIV_KEY,
-                                             key->privkey,
-                                             sizeof(key->privkey));
+        key->privkey,
+        sizeof(key->privkey));
     *p++ = OSSL_PARAM_construct_octet_string(OSSL_PKEY_PARAM_PUB_KEY,
-                                             key->pubkey, sizeof(key->pubkey));
+        key->pubkey, sizeof(key->pubkey));
     *p++ = OSSL_PARAM_construct_end();
 
     return param_cb(params, cbarg);
@@ -1097,13 +1094,13 @@ static const OSSL_DISPATCH xor_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))xor_gen_init },
     { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (void (*)(void))xor_gen_set_params },
     { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,
-      (void (*)(void))xor_gen_settable_params },
+        (void (*)(void))xor_gen_settable_params },
     { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))xor_gen },
     { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))xor_gen_cleanup },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))xor_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))xor_gettable_params },
-    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*) (void))xor_set_params },
-    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*) (void))xor_settable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))xor_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))xor_gettable_params },
+    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))xor_set_params },
+    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))xor_settable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))xor_has },
     { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))xor_dup },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))xor_freekey },
@@ -1133,7 +1130,7 @@ static void *xor_xorhmacsig_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg
 
 static void *xor_xorhmacsha2sig_gen(void *genctx, OSSL_CALLBACK *osslcb, void *cbarg)
 {
-    XORKEY* k = xor_gen(genctx, osslcb, cbarg);
+    XORKEY *k = xor_gen(genctx, osslcb, cbarg);
 
     if (k == NULL)
         return NULL;
@@ -1145,19 +1142,18 @@ static void *xor_xorhmacsha2sig_gen(void *genctx, OSSL_CALLBACK *osslcb, void *c
     return k;
 }
 
-
 static const OSSL_DISPATCH xor_xorhmacsig_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_NEW, (void (*)(void))xor_newkey },
     { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))xor_gen_init },
     { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (void (*)(void))xor_gen_set_params },
     { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,
-      (void (*)(void))xor_gen_settable_params },
+        (void (*)(void))xor_gen_settable_params },
     { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))xor_xorhmacsig_gen },
     { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))xor_gen_cleanup },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))xor_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))xor_gettable_params },
-    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*) (void))xor_set_params },
-    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*) (void))xor_settable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))xor_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))xor_gettable_params },
+    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))xor_set_params },
+    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))xor_settable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))xor_has },
     { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))xor_dup },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))xor_freekey },
@@ -1175,13 +1171,13 @@ static const OSSL_DISPATCH xor_xorhmacsha2sig_keymgmt_functions[] = {
     { OSSL_FUNC_KEYMGMT_GEN_INIT, (void (*)(void))xor_gen_init },
     { OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS, (void (*)(void))xor_gen_set_params },
     { OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS,
-      (void (*)(void))xor_gen_settable_params },
+        (void (*)(void))xor_gen_settable_params },
     { OSSL_FUNC_KEYMGMT_GEN, (void (*)(void))xor_xorhmacsha2sig_gen },
     { OSSL_FUNC_KEYMGMT_GEN_CLEANUP, (void (*)(void))xor_gen_cleanup },
-    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*) (void))xor_get_params },
-    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*) (void))xor_gettable_params },
-    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*) (void))xor_set_params },
-    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*) (void))xor_settable_params },
+    { OSSL_FUNC_KEYMGMT_GET_PARAMS, (void (*)(void))xor_get_params },
+    { OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS, (void (*)(void))xor_gettable_params },
+    { OSSL_FUNC_KEYMGMT_SET_PARAMS, (void (*)(void))xor_set_params },
+    { OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS, (void (*)(void))xor_settable_params },
     { OSSL_FUNC_KEYMGMT_HAS, (void (*)(void))xor_has },
     { OSSL_FUNC_KEYMGMT_DUP, (void (*)(void))xor_dup },
     { OSSL_FUNC_KEYMGMT_FREE, (void (*)(void))xor_freekey },
@@ -1202,9 +1198,9 @@ typedef enum {
 
 /* Re-create XORKEY from encoding(s): Same end-state as after key-gen */
 static XORKEY *xor_key_op(const X509_ALGOR *palg,
-                          const unsigned char *p, int plen,
-                          xor_key_op_t op,
-                          OSSL_LIB_CTX *libctx, const char *propq)
+    const unsigned char *p, int plen,
+    xor_key_op_t op,
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     XORKEY *key = NULL;
     int nid = NID_undef;
@@ -1250,13 +1246,13 @@ static XORKEY *xor_key_op(const X509_ALGOR *palg,
         goto err;
     return key;
 
- err:
+err:
     xor_freekey(key);
     return NULL;
 }
 
 static XORKEY *xor_key_from_x509pubkey(const X509_PUBKEY *xpk,
-                                 OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     const unsigned char *p;
     int plen;
@@ -1269,7 +1265,7 @@ static XORKEY *xor_key_from_x509pubkey(const X509_PUBKEY *xpk,
 }
 
 static XORKEY *xor_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
-                           OSSL_LIB_CTX *libctx, const char *propq)
+    OSSL_LIB_CTX *libctx, const char *propq)
 {
     XORKEY *xork = NULL;
     const unsigned char *p;
@@ -1290,7 +1286,7 @@ static XORKEY *xor_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
     }
 
     xork = xor_key_op(palg, p, plen, KEY_OP_PRIVATE,
-                      libctx, propq);
+        libctx, propq);
     ASN1_OCTET_STRING_free(oct);
     return xork;
 }
@@ -1301,12 +1297,12 @@ static const OSSL_ALGORITHM tls_prov_keymgmt[] = {
      * with the FIPS provider we pretend that it is.
      */
     { "XOR", "provider=tls-provider,fips=yes",
-             xor_keymgmt_functions },
+        xor_keymgmt_functions },
     { XORSIGALG_NAME, "provider=tls-provider,fips=yes",
-             xor_xorhmacsig_keymgmt_functions },
+        xor_xorhmacsig_keymgmt_functions },
     { XORSIGALG_HASH_NAME,
-    "provider=tls-provider,fips=yes",
-             xor_xorhmacsha2sig_keymgmt_functions },
+        "provider=tls-provider,fips=yes",
+        xor_xorhmacsha2sig_keymgmt_functions },
     { NULL, NULL, NULL }
 };
 
@@ -1327,18 +1323,17 @@ struct key2any_ctx_st {
 
 typedef int check_key_type_fn(const void *key, int nid);
 typedef int key_to_paramstring_fn(const void *key, int nid, int save,
-                                  void **str, int *strtype);
+    void **str, int *strtype);
 typedef int key_to_der_fn(BIO *out, const void *key,
-                          int key_nid, const char *pemname,
-                          key_to_paramstring_fn *p2s, i2d_of_void *k2d,
-                          struct key2any_ctx_st *ctx);
+    int key_nid, const char *pemname,
+    key_to_paramstring_fn *p2s, i2d_of_void *k2d,
+    struct key2any_ctx_st *ctx);
 typedef int write_bio_of_void_fn(BIO *bp, const void *x);
 
-
 /* Free the blob allocated during key_to_paramstring_fn */
 static void free_asn1_data(int type, void *data)
 {
-    switch(type) {
+    switch (type) {
     case V_ASN1_OBJECT:
         ASN1_OBJECT_free(data);
         break;
@@ -1349,8 +1344,8 @@ static void free_asn1_data(int type, void *data)
 }
 
 static PKCS8_PRIV_KEY_INFO *key_to_p8info(const void *key, int key_nid,
-                                          void *params, int params_type,
-                                          i2d_of_void *k2d)
+    void *params, int params_type,
+    i2d_of_void *k2d)
 {
     /* der, derlen store the key DER output and its length */
     unsigned char *der = NULL;
@@ -1361,8 +1356,8 @@ static PKCS8_PRIV_KEY_INFO *key_to_p8info(const void *key, int key_nid,
     if ((p8info = PKCS8_PRIV_KEY_INFO_new()) == NULL
         || (derlen = k2d(key, &der)) <= 0
         || !PKCS8_pkey_set0(p8info, OBJ_nid2obj(key_nid), 0,
-                            V_ASN1_UNDEF, NULL,
-                            der, derlen)) {
+            V_ASN1_UNDEF, NULL,
+            der, derlen)) {
         ERR_raise(ERR_LIB_USER, ERR_R_MALLOC_FAILURE);
         PKCS8_PRIV_KEY_INFO_free(p8info);
         OPENSSL_free(der);
@@ -1373,7 +1368,7 @@ static PKCS8_PRIV_KEY_INFO *key_to_p8info(const void *key, int key_nid,
 }
 
 static X509_SIG *p8info_to_encp8(PKCS8_PRIV_KEY_INFO *p8info,
-                                 struct key2any_ctx_st *ctx)
+    struct key2any_ctx_st *ctx)
 {
     X509_SIG *p8 = NULL;
     char kstr[PEM_BUFSIZE];
@@ -1394,11 +1389,10 @@ static X509_SIG *p8info_to_encp8(PKCS8_PRIV_KEY_INFO *p8info,
 }
 
 static X509_SIG *key_to_encp8(const void *key, int key_nid,
-                              void *params, int params_type,
-                              i2d_of_void *k2d, struct key2any_ctx_st *ctx)
+    void *params, int params_type,
+    i2d_of_void *k2d, struct key2any_ctx_st *ctx)
 {
-    PKCS8_PRIV_KEY_INFO *p8info =
-        key_to_p8info(key, key_nid, params, params_type, k2d);
+    PKCS8_PRIV_KEY_INFO *p8info = key_to_p8info(key, key_nid, params, params_type, k2d);
     X509_SIG *p8 = NULL;
 
     if (p8info == NULL) {
@@ -1411,8 +1405,8 @@ static X509_SIG *key_to_encp8(const void *key, int key_nid,
 }
 
 static X509_PUBKEY *xorx_key_to_pubkey(const void *key, int key_nid,
-                                  void *params, int params_type,
-                                  i2d_of_void k2d)
+    void *params, int params_type,
+    i2d_of_void k2d)
 {
     /* der, derlen store the key DER output and its length */
     unsigned char *der = NULL;
@@ -1423,8 +1417,8 @@ static X509_PUBKEY *xorx_key_to_pubkey(const void *key, int key_nid,
     if ((xpk = X509_PUBKEY_new()) == NULL
         || (derlen = k2d(key, &der)) <= 0
         || !X509_PUBKEY_set0_param(xpk, OBJ_nid2obj(key_nid),
-                        V_ASN1_UNDEF, NULL,
-                        der, derlen)) {
+            V_ASN1_UNDEF, NULL,
+            der, derlen)) {
         ERR_raise(ERR_LIB_USER, ERR_R_MALLOC_FAILURE);
         X509_PUBKEY_free(xpk);
         OPENSSL_free(der);
@@ -1454,11 +1448,11 @@ static X509_PUBKEY *xorx_key_to_pubkey(const void *key, int key_nid,
  */
 
 static int key_to_epki_der_priv_bio(BIO *out, const void *key,
-                                    int key_nid,
-                                    ossl_unused const char *pemname,
-                                    key_to_paramstring_fn *p2s,
-                                    i2d_of_void *k2d,
-                                    struct key2any_ctx_st *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    i2d_of_void *k2d,
+    struct key2any_ctx_st *ctx)
 {
     int ret = 0;
     void *str = NULL;
@@ -1468,8 +1462,7 @@ static int key_to_epki_der_priv_bio(BIO *out, const void *key,
     if (!ctx->cipher_intent)
         return 0;
 
-    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters,
-                            &str, &strtype))
+    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters, &str, &strtype))
         return 0;
 
     p8 = key_to_encp8(key, key_nid, str, strtype, k2d, ctx);
@@ -1482,11 +1475,11 @@ static int key_to_epki_der_priv_bio(BIO *out, const void *key,
 }
 
 static int key_to_epki_pem_priv_bio(BIO *out, const void *key,
-                                    int key_nid,
-                                    ossl_unused const char *pemname,
-                                    key_to_paramstring_fn *p2s,
-                                    i2d_of_void *k2d,
-                                    struct key2any_ctx_st *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    i2d_of_void *k2d,
+    struct key2any_ctx_st *ctx)
 {
     int ret = 0;
     void *str = NULL;
@@ -1496,8 +1489,7 @@ static int key_to_epki_pem_priv_bio(BIO *out, const void *key,
     if (!ctx->cipher_intent)
         return 0;
 
-    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters,
-                            &str, &strtype))
+    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters, &str, &strtype))
         return 0;
 
     p8 = key_to_encp8(key, key_nid, str, strtype, k2d, ctx);
@@ -1510,11 +1502,11 @@ static int key_to_epki_pem_priv_bio(BIO *out, const void *key,
 }
 
 static int key_to_pki_der_priv_bio(BIO *out, const void *key,
-                                   int key_nid,
-                                   ossl_unused const char *pemname,
-                                   key_to_paramstring_fn *p2s,
-                                   i2d_of_void *k2d,
-                                   struct key2any_ctx_st *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    i2d_of_void *k2d,
+    struct key2any_ctx_st *ctx)
 {
     int ret = 0;
     void *str = NULL;
@@ -1523,10 +1515,9 @@ static int key_to_pki_der_priv_bio(BIO *out, const void *key,
 
     if (ctx->cipher_intent)
         return key_to_epki_der_priv_bio(out, key, key_nid, pemname,
-                                        p2s, k2d, ctx);
+            p2s, k2d, ctx);
 
-    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters,
-                            &str, &strtype))
+    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters, &str, &strtype))
         return 0;
 
     p8info = key_to_p8info(key, key_nid, str, strtype, k2d);
@@ -1542,11 +1533,11 @@ static int key_to_pki_der_priv_bio(BIO *out, const void *key,
 }
 
 static int key_to_pki_pem_priv_bio(BIO *out, const void *key,
-                                   int key_nid,
-                                   ossl_unused const char *pemname,
-                                   key_to_paramstring_fn *p2s,
-                                   i2d_of_void *k2d,
-                                   struct key2any_ctx_st *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    i2d_of_void *k2d,
+    struct key2any_ctx_st *ctx)
 {
     int ret = 0;
     void *str = NULL;
@@ -1555,10 +1546,9 @@ static int key_to_pki_pem_priv_bio(BIO *out, const void *key,
 
     if (ctx->cipher_intent)
         return key_to_epki_pem_priv_bio(out, key, key_nid, pemname,
-                                        p2s, k2d, ctx);
+            p2s, k2d, ctx);
 
-    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters,
-                            &str, &strtype))
+    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters, &str, &strtype))
         return 0;
 
     p8info = key_to_p8info(key, key_nid, str, strtype, k2d);
@@ -1574,19 +1564,18 @@ static int key_to_pki_pem_priv_bio(BIO *out, const void *key,
 }
 
 static int key_to_spki_der_pub_bio(BIO *out, const void *key,
-                                   int key_nid,
-                                   ossl_unused const char *pemname,
-                                   key_to_paramstring_fn *p2s,
-                                   i2d_of_void *k2d,
-                                   struct key2any_ctx_st *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    i2d_of_void *k2d,
+    struct key2any_ctx_st *ctx)
 {
     int ret = 0;
     X509_PUBKEY *xpk = NULL;
     void *str = NULL;
     int strtype = V_ASN1_UNDEF;
 
-    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters,
-                            &str, &strtype))
+    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters, &str, &strtype))
         return 0;
 
     xpk = xorx_key_to_pubkey(key, key_nid, str, strtype, k2d);
@@ -1599,19 +1588,18 @@ static int key_to_spki_der_pub_bio(BIO *out, const void *key,
 }
 
 static int key_to_spki_pem_pub_bio(BIO *out, const void *key,
-                                   int key_nid,
-                                   ossl_unused const char *pemname,
-                                   key_to_paramstring_fn *p2s,
-                                   i2d_of_void *k2d,
-                                   struct key2any_ctx_st *ctx)
+    int key_nid,
+    ossl_unused const char *pemname,
+    key_to_paramstring_fn *p2s,
+    i2d_of_void *k2d,
+    struct key2any_ctx_st *ctx)
 {
     int ret = 0;
     X509_PUBKEY *xpk = NULL;
     void *str = NULL;
     int strtype = V_ASN1_UNDEF;
 
-    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters,
-                            &str, &strtype))
+    if (p2s != NULL && !p2s(key, key_nid, ctx->save_parameters, &str, &strtype))
         return 0;
 
     xpk = xorx_key_to_pubkey(key, key_nid, str, strtype, k2d);
@@ -1629,10 +1617,10 @@ static int key_to_spki_pem_pub_bio(BIO *out, const void *key,
 /* ---------------------------------------------------------------------- */
 
 static int prepare_xorx_params(const void *xorxkey, int nid, int save,
-                             void **pstr, int *pstrtype)
+    void **pstr, int *pstrtype)
 {
     ASN1_OBJECT *params = NULL;
-    XORKEY *k = (XORKEY*)xorxkey;
+    XORKEY *k = (XORKEY *)xorxkey;
 
     if (k->tls_name && OBJ_sn2nid(k->tls_name) != nid) {
         ERR_raise(ERR_LIB_USER, XORPROV_R_INVALID_KEY);
@@ -1681,7 +1669,7 @@ static int xorx_spki_pub_to_der(const void *vecxkey, unsigned char **pder)
 static int xorx_pki_priv_to_der(const void *vecxkey, unsigned char **pder)
 {
     XORKEY *xorxkey = (XORKEY *)vecxkey;
-    unsigned char* buf = NULL;
+    unsigned char *buf = NULL;
     ASN1_OCTET_STRING oct;
     int keybloblen;
 
@@ -1707,21 +1695,21 @@ static int xorx_pki_priv_to_der(const void *vecxkey, unsigned char **pder)
     return keybloblen;
 }
 
-# define xorx_epki_priv_to_der xorx_pki_priv_to_der
+#define xorx_epki_priv_to_der xorx_pki_priv_to_der
 
 /*
  * XORX only has PKCS#8 / SubjectPublicKeyInfo
  * representation, so we don't define xorx_type_specific_[priv,pub,params]_to_der.
  */
 
-# define xorx_check_key_type            NULL
+#define xorx_check_key_type NULL
 
-# define xorhmacsig_evp_type            0
-# define xorhmacsig_input_type          XORSIGALG_NAME
-# define xorhmacsig_pem_type            XORSIGALG_NAME
-# define xorhmacsha2sig_evp_type        0
-# define xorhmacsha2sig_input_type      XORSIGALG_HASH_NAME
-# define xorhmacsha2sig_pem_type        XORSIGALG_HASH_NAME
+#define xorhmacsig_evp_type 0
+#define xorhmacsig_input_type XORSIGALG_NAME
+#define xorhmacsig_pem_type XORSIGALG_NAME
+#define xorhmacsha2sig_evp_type 0
+#define xorhmacsha2sig_input_type XORSIGALG_HASH_NAME
+#define xorhmacsha2sig_pem_type XORSIGALG_HASH_NAME
 
 /* ---------------------------------------------------------------------- */
 
@@ -1763,12 +1751,9 @@ static int key2any_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 {
     struct key2any_ctx_st *ctx = vctx;
     OSSL_LIB_CTX *libctx = PROV_XOR_LIBCTX_OF(ctx->provctx);
-    const OSSL_PARAM *cipherp =
-        OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_CIPHER);
-    const OSSL_PARAM *propsp =
-        OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_PROPERTIES);
-    const OSSL_PARAM *save_paramsp =
-        OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_SAVE_PARAMETERS);
+    const OSSL_PARAM *cipherp = OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_CIPHER);
+    const OSSL_PARAM *propsp = OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_PROPERTIES);
+    const OSSL_PARAM *save_paramsp = OSSL_PARAM_locate_const(params, OSSL_ENCODER_PARAM_SAVE_PARAMETERS);
 
     if (cipherp != NULL) {
         const char *ciphername = NULL;
@@ -1783,8 +1768,7 @@ static int key2any_set_ctx_params(void *vctx, const OSSL_PARAM params[])
         ctx->cipher = NULL;
         ctx->cipher_intent = ciphername != NULL;
         if (ciphername != NULL
-            && ((ctx->cipher =
-                 EVP_CIPHER_fetch(libctx, ciphername, props)) == NULL)) {
+            && ((ctx->cipher = EVP_CIPHER_fetch(libctx, ciphername, props)) == NULL)) {
             return 0;
         }
     }
@@ -1831,11 +1815,11 @@ static int key2any_check_selection(int selection, int selection_mask)
 }
 
 static int key2any_encode(struct key2any_ctx_st *ctx, OSSL_CORE_BIO *cout,
-                          const void *key, const char* typestr, const char *pemname,
-                          key_to_der_fn *writer,
-                          OSSL_PASSPHRASE_CALLBACK *pwcb, void *pwcbarg,
-                          key_to_paramstring_fn *key2paramstring,
-                          i2d_of_void *key2der)
+    const void *key, const char *typestr, const char *pemname,
+    key_to_der_fn *writer,
+    OSSL_PASSPHRASE_CALLBACK *pwcb, void *pwcbarg,
+    key_to_paramstring_fn *key2paramstring,
+    i2d_of_void *key2der)
 {
     int ret = 0;
     int type = OBJ_sn2nid(typestr);
@@ -1860,31 +1844,31 @@ static int key2any_encode(struct key2any_ctx_st *ctx, OSSL_CORE_BIO *cout,
 }
 
 #define DO_ENC_PRIVATE_KEY_selection_mask OSSL_KEYMGMT_SELECT_PRIVATE_KEY
-#define DO_ENC_PRIVATE_KEY(impl, type, kind, output)                            \
-    if ((selection & DO_ENC_PRIVATE_KEY_selection_mask) != 0)                   \
-        return key2any_encode(ctx, cout, key, impl##_pem_type,              \
-                              impl##_pem_type " PRIVATE KEY",               \
-                              key_to_##kind##_##output##_priv_bio,          \
-                              cb, cbarg, prepare_##type##_params,           \
-                              type##_##kind##_priv_to_der);
+#define DO_ENC_PRIVATE_KEY(impl, type, kind, output)           \
+    if ((selection & DO_ENC_PRIVATE_KEY_selection_mask) != 0)  \
+        return key2any_encode(ctx, cout, key, impl##_pem_type, \
+            impl##_pem_type " PRIVATE KEY",                    \
+            key_to_##kind##_##output##_priv_bio,               \
+            cb, cbarg, prepare_##type##_params,                \
+            type##_##kind##_priv_to_der);
 
 #define DO_ENC_PUBLIC_KEY_selection_mask OSSL_KEYMGMT_SELECT_PUBLIC_KEY
-#define DO_ENC_PUBLIC_KEY(impl, type, kind, output)                             \
-    if ((selection & DO_ENC_PUBLIC_KEY_selection_mask) != 0)                    \
-        return key2any_encode(ctx, cout, key, impl##_pem_type,              \
-                              impl##_pem_type " PUBLIC KEY",                \
-                              key_to_##kind##_##output##_pub_bio,           \
-                              cb, cbarg, prepare_##type##_params,           \
-                              type##_##kind##_pub_to_der);
+#define DO_ENC_PUBLIC_KEY(impl, type, kind, output)            \
+    if ((selection & DO_ENC_PUBLIC_KEY_selection_mask) != 0)   \
+        return key2any_encode(ctx, cout, key, impl##_pem_type, \
+            impl##_pem_type " PUBLIC KEY",                     \
+            key_to_##kind##_##output##_pub_bio,                \
+            cb, cbarg, prepare_##type##_params,                \
+            type##_##kind##_pub_to_der);
 
 #define DO_ENC_PARAMETERS_selection_mask OSSL_KEYMGMT_SELECT_ALL_PARAMETERS
-#define DO_ENC_PARAMETERS(impl, type, kind, output)                             \
-    if ((selection & DO_ENC_PARAMETERS_selection_mask) != 0)                    \
-        return key2any_encode(ctx, cout, key, impl##_pem_type,              \
-                              impl##_pem_type " PARAMETERS",                \
-                              key_to_##kind##_##output##_param_bio,         \
-                              NULL, NULL, NULL,                             \
-                              type##_##kind##_params_to_der);
+#define DO_ENC_PARAMETERS(impl, type, kind, output)            \
+    if ((selection & DO_ENC_PARAMETERS_selection_mask) != 0)   \
+        return key2any_encode(ctx, cout, key, impl##_pem_type, \
+            impl##_pem_type " PARAMETERS",                     \
+            key_to_##kind##_##output##_param_bio,              \
+            NULL, NULL, NULL,                                  \
+            type##_##kind##_params_to_der);
 
 /*-
  * Implement the kinds of output structure that can be produced.  They are
@@ -1920,16 +1904,16 @@ static int key2any_encode(struct key2any_ctx_st *ctx, OSSL_CORE_BIO *cout,
  * passphrase callback has been passed to them.
  */
 #define DO_ENC_PrivateKeyInfo_selection_mask DO_ENC_PRIVATE_KEY_selection_mask
-#define DO_ENC_PrivateKeyInfo(impl, type, output)                               \
+#define DO_ENC_PrivateKeyInfo(impl, type, output) \
     DO_ENC_PRIVATE_KEY(impl, type, pki, output)
 
 #define DO_ENC_EncryptedPrivateKeyInfo_selection_mask DO_ENC_PRIVATE_KEY_selection_mask
-#define DO_ENC_EncryptedPrivateKeyInfo(impl, type, output)                      \
+#define DO_ENC_EncryptedPrivateKeyInfo(impl, type, output) \
     DO_ENC_PRIVATE_KEY(impl, type, epki, output)
 
 /* SubjectPublicKeyInfo is a structure for public keys only */
 #define DO_ENC_SubjectPublicKeyInfo_selection_mask DO_ENC_PUBLIC_KEY_selection_mask
-#define DO_ENC_SubjectPublicKeyInfo(impl, type, output)                         \
+#define DO_ENC_SubjectPublicKeyInfo(impl, type, output) \
     DO_ENC_PUBLIC_KEY(impl, type, spki, output)
 
 /*
@@ -1949,71 +1933,72 @@ static int key2any_encode(struct key2any_ctx_st *ctx, OSSL_CORE_BIO *cout,
  *
  * xor_##impl##_to_##kind##_##output##_encoder_functions
  */
-#define MAKE_ENCODER(impl, type, kind, output)                              \
-    static OSSL_FUNC_encoder_import_object_fn                               \
-    impl##_to_##kind##_##output##_import_object;                            \
-    static OSSL_FUNC_encoder_free_object_fn                                 \
-    impl##_to_##kind##_##output##_free_object;                              \
-    static OSSL_FUNC_encoder_encode_fn                                      \
-    impl##_to_##kind##_##output##_encode;                                   \
-                                                                            \
-    static void *                                                           \
-    impl##_to_##kind##_##output##_import_object(void *vctx, int selection,  \
-                                                const OSSL_PARAM params[])  \
-    {                                                                       \
-        struct key2any_ctx_st *ctx = vctx;                                  \
-                                                                            \
-        return xor_prov_import_key(xor_##impl##_keymgmt_functions,          \
-                                    ctx->provctx, selection, params);       \
-    }                                                                       \
-    static void impl##_to_##kind##_##output##_free_object(void *key)        \
-    {                                                                       \
-        xor_prov_free_key(xor_##impl##_keymgmt_functions, key);             \
-    }                                                                       \
-    static int impl##_to_##kind##_##output##_does_selection(void *ctx,      \
-                                                            int selection)  \
-    {                                                                       \
-        return key2any_check_selection(selection,                           \
-                                       DO_ENC_##kind##_selection_mask);     \
-    }                                                                       \
-    static int                                                              \
-    impl##_to_##kind##_##output##_encode(void *ctx, OSSL_CORE_BIO *cout,    \
-                                         const void *key,                   \
-                                         const OSSL_PARAM key_abstract[],   \
-                                         int selection,                     \
-                                         OSSL_PASSPHRASE_CALLBACK *cb,      \
-                                         void *cbarg)                       \
-    {                                                                       \
-        /* We don't deal with abstract objects */                           \
-        if (key_abstract != NULL) {                                         \
-            ERR_raise(ERR_LIB_USER, ERR_R_PASSED_INVALID_ARGUMENT);         \
-            return 0;                                                       \
-        }                                                                   \
-        DO_ENC_##kind(impl, type, output)                                   \
-                                                                            \
-        ERR_raise(ERR_LIB_USER, ERR_R_PASSED_INVALID_ARGUMENT);             \
-        return 0;                                                           \
-    }                                                                       \
-    static const OSSL_DISPATCH                                              \
-    xor_##impl##_to_##kind##_##output##_encoder_functions[] = {             \
-        { OSSL_FUNC_ENCODER_NEWCTX,                                         \
-          (void (*)(void))key2any_newctx },                                 \
-        { OSSL_FUNC_ENCODER_FREECTX,                                        \
-          (void (*)(void))key2any_freectx },                                \
-        { OSSL_FUNC_ENCODER_SETTABLE_CTX_PARAMS,                            \
-          (void (*)(void))key2any_settable_ctx_params },                    \
-        { OSSL_FUNC_ENCODER_SET_CTX_PARAMS,                                 \
-          (void (*)(void))key2any_set_ctx_params },                         \
-        { OSSL_FUNC_ENCODER_DOES_SELECTION,                                 \
-          (void (*)(void))impl##_to_##kind##_##output##_does_selection },   \
-        { OSSL_FUNC_ENCODER_IMPORT_OBJECT,                                  \
-          (void (*)(void))impl##_to_##kind##_##output##_import_object },    \
-        { OSSL_FUNC_ENCODER_FREE_OBJECT,                                    \
-          (void (*)(void))impl##_to_##kind##_##output##_free_object },      \
-        { OSSL_FUNC_ENCODER_ENCODE,                                         \
-          (void (*)(void))impl##_to_##kind##_##output##_encode },           \
-        OSSL_DISPATCH_END                                                   \
-    }
+#define MAKE_ENCODER(impl, type, kind, output)                                    \
+    static OSSL_FUNC_encoder_import_object_fn                                     \
+        impl##_to_##kind##_##output##_import_object;                              \
+    static OSSL_FUNC_encoder_free_object_fn                                       \
+        impl##_to_##kind##_##output##_free_object;                                \
+    static OSSL_FUNC_encoder_encode_fn                                            \
+        impl##_to_##kind##_##output##_encode;                                     \
+                                                                                  \
+    static void *                                                                 \
+    impl##_to_##kind##_##output##_import_object(void *vctx, int selection,        \
+        const OSSL_PARAM params[])                                                \
+    {                                                                             \
+        struct key2any_ctx_st *ctx = vctx;                                        \
+                                                                                  \
+        return xor_prov_import_key(xor_##impl##_keymgmt_functions,                \
+            ctx->provctx, selection, params);                                     \
+    }                                                                             \
+    static void impl##_to_##kind##_##output##_free_object(void *key)              \
+    {                                                                             \
+        xor_prov_free_key(xor_##impl##_keymgmt_functions, key);                   \
+    }                                                                             \
+    static int impl##_to_##kind##_##output##_does_selection(void *ctx,            \
+        int selection)                                                            \
+    {                                                                             \
+        return key2any_check_selection(selection,                                 \
+            DO_ENC_##kind##_selection_mask);                                      \
+    }                                                                             \
+    static int                                                                    \
+    impl##_to_##kind##_##output##_encode(void *ctx, OSSL_CORE_BIO *cout,          \
+        const void *key,                                                          \
+        const OSSL_PARAM key_abstract[],                                          \
+        int selection,                                                            \
+        OSSL_PASSPHRASE_CALLBACK *cb,                                             \
+        void *cbarg)                                                              \
+    {                                                                             \
+        /* We don't deal with abstract objects */                                 \
+        if (key_abstract != NULL) {                                               \
+            ERR_raise(ERR_LIB_USER, ERR_R_PASSED_INVALID_ARGUMENT);               \
+            return 0;                                                             \
+        }                                                                         \
+        DO_ENC_##kind(impl, type, output)                                         \
+                                                                                  \
+            ERR_raise(ERR_LIB_USER, ERR_R_PASSED_INVALID_ARGUMENT);               \
+        return 0;                                                                 \
+    }                                                                             \
+    static const OSSL_DISPATCH                                                    \
+        xor_##impl##_to_##kind##_##output##_encoder_functions[]                   \
+        = {                                                                       \
+              { OSSL_FUNC_ENCODER_NEWCTX,                                         \
+                  (void (*)(void))key2any_newctx },                               \
+              { OSSL_FUNC_ENCODER_FREECTX,                                        \
+                  (void (*)(void))key2any_freectx },                              \
+              { OSSL_FUNC_ENCODER_SETTABLE_CTX_PARAMS,                            \
+                  (void (*)(void))key2any_settable_ctx_params },                  \
+              { OSSL_FUNC_ENCODER_SET_CTX_PARAMS,                                 \
+                  (void (*)(void))key2any_set_ctx_params },                       \
+              { OSSL_FUNC_ENCODER_DOES_SELECTION,                                 \
+                  (void (*)(void))impl##_to_##kind##_##output##_does_selection }, \
+              { OSSL_FUNC_ENCODER_IMPORT_OBJECT,                                  \
+                  (void (*)(void))impl##_to_##kind##_##output##_import_object },  \
+              { OSSL_FUNC_ENCODER_FREE_OBJECT,                                    \
+                  (void (*)(void))impl##_to_##kind##_##output##_free_object },    \
+              { OSSL_FUNC_ENCODER_ENCODE,                                         \
+                  (void (*)(void))impl##_to_##kind##_##output##_encode },         \
+              OSSL_DISPATCH_END                                                   \
+          }
 
 /*
  * Replacements for i2d_{TYPE}PrivateKey, i2d_{TYPE}PublicKey,
@@ -2045,76 +2030,76 @@ MAKE_ENCODER(xorhmacsha2sig, xorx, SubjectPublicKeyInfo, pem);
 static const OSSL_ALGORITHM tls_prov_encoder[] = {
 #define ENCODER_PROVIDER "tls-provider"
 #ifndef ENCODER_PROVIDER
-# error Macro ENCODER_PROVIDER undefined
+#error Macro ENCODER_PROVIDER undefined
 #endif
 
-#define ENCODER_STRUCTURE_PKCS8                         "pkcs8"
-#define ENCODER_STRUCTURE_SubjectPublicKeyInfo          "SubjectPublicKeyInfo"
-#define ENCODER_STRUCTURE_PrivateKeyInfo                "PrivateKeyInfo"
-#define ENCODER_STRUCTURE_EncryptedPrivateKeyInfo       "EncryptedPrivateKeyInfo"
-#define ENCODER_STRUCTURE_PKCS1                         "pkcs1"
-#define ENCODER_STRUCTURE_PKCS3                         "pkcs3"
+#define ENCODER_STRUCTURE_PKCS8 "pkcs8"
+#define ENCODER_STRUCTURE_SubjectPublicKeyInfo "SubjectPublicKeyInfo"
+#define ENCODER_STRUCTURE_PrivateKeyInfo "PrivateKeyInfo"
+#define ENCODER_STRUCTURE_EncryptedPrivateKeyInfo "EncryptedPrivateKeyInfo"
+#define ENCODER_STRUCTURE_PKCS1 "pkcs1"
+#define ENCODER_STRUCTURE_PKCS3 "pkcs3"
 
 /* Arguments are prefixed with '_' to avoid build breaks on certain platforms */
 /*
  * Obviously this is not FIPS approved, but in order to test in conjunction
  * with the FIPS provider we pretend that it is.
  */
-#define ENCODER_TEXT(_name, _sym)                                \
-    { _name,                                                            \
-      "provider=" ENCODER_PROVIDER ",fips=yes,output=text",      \
-      (xor_##_sym##_to_text_encoder_functions) }
-#define ENCODER(_name, _sym, _fips, _output)                            \
-    { _name,                                                            \
-      "provider=" ENCODER_PROVIDER ",fips=yes,output=" #_output, \
-      (xor_##_sym##_to_##_output##_encoder_functions) }
-
-#define ENCODER_w_structure(_name, _sym, _output, _structure)    \
-    { _name,                                                            \
-      "provider=" ENCODER_PROVIDER ",fips=yes,output=" #_output  \
-      ",structure=" ENCODER_STRUCTURE_##_structure,                     \
-      (xor_##_sym##_to_##_structure##_##_output##_encoder_functions) }
+#define ENCODER_TEXT(_name, _sym)                             \
+    { _name,                                                  \
+        "provider=" ENCODER_PROVIDER ",fips=yes,output=text", \
+        (xor_##_sym##_to_text_encoder_functions) }
+#define ENCODER(_name, _sym, _fips, _output)                       \
+    { _name,                                                       \
+        "provider=" ENCODER_PROVIDER ",fips=yes,output=" #_output, \
+        (xor_##_sym##_to_##_output##_encoder_functions) }
+
+#define ENCODER_w_structure(_name, _sym, _output, _structure)     \
+    { _name,                                                      \
+        "provider=" ENCODER_PROVIDER ",fips=yes,output=" #_output \
+        ",structure=" ENCODER_STRUCTURE_##_structure,             \
+        (xor_##_sym##_to_##_structure##_##_output##_encoder_functions) }
 
-/*
- * Entries for human text "encoders"
- */
+    /*
+     * Entries for human text "encoders"
+     */
 
-/*
- * Entries for PKCS#8 and SubjectPublicKeyInfo.
- * The "der" ones are added convenience for any user that wants to use
- * OSSL_ENCODER directly.
- * The "pem" ones also support PEM_write_bio_PrivateKey() and
- * PEM_write_bio_PUBKEY().
- */
+    /*
+     * Entries for PKCS#8 and SubjectPublicKeyInfo.
+     * The "der" ones are added convenience for any user that wants to use
+     * OSSL_ENCODER directly.
+     * The "pem" ones also support PEM_write_bio_PrivateKey() and
+     * PEM_write_bio_PUBKEY().
+     */
 
-ENCODER_w_structure(XORSIGALG_NAME, xorhmacsig, der, PrivateKeyInfo),
-ENCODER_w_structure(XORSIGALG_NAME, xorhmacsig, pem, PrivateKeyInfo),
-ENCODER_w_structure(XORSIGALG_NAME, xorhmacsig, der, EncryptedPrivateKeyInfo),
-ENCODER_w_structure(XORSIGALG_NAME, xorhmacsig, pem, EncryptedPrivateKeyInfo),
-ENCODER_w_structure(XORSIGALG_NAME, xorhmacsig, der, SubjectPublicKeyInfo),
-ENCODER_w_structure(XORSIGALG_NAME, xorhmacsig, pem, SubjectPublicKeyInfo),
-ENCODER_w_structure(XORSIGALG_HASH_NAME, xorhmacsha2sig,
-                    der, PrivateKeyInfo),
-ENCODER_w_structure(XORSIGALG_HASH_NAME, xorhmacsha2sig,
-                    pem, PrivateKeyInfo),
-ENCODER_w_structure(XORSIGALG_HASH_NAME, xorhmacsha2sig,
-                    der, EncryptedPrivateKeyInfo),
-ENCODER_w_structure(XORSIGALG_HASH_NAME, xorhmacsha2sig,
-                    pem, EncryptedPrivateKeyInfo),
-ENCODER_w_structure(XORSIGALG_HASH_NAME, xorhmacsha2sig,
-                    der, SubjectPublicKeyInfo),
-ENCODER_w_structure(XORSIGALG_HASH_NAME, xorhmacsha2sig,
-                    pem, SubjectPublicKeyInfo),
+    ENCODER_w_structure(XORSIGALG_NAME, xorhmacsig, der, PrivateKeyInfo),
+    ENCODER_w_structure(XORSIGALG_NAME, xorhmacsig, pem, PrivateKeyInfo),
+    ENCODER_w_structure(XORSIGALG_NAME, xorhmacsig, der, EncryptedPrivateKeyInfo),
+    ENCODER_w_structure(XORSIGALG_NAME, xorhmacsig, pem, EncryptedPrivateKeyInfo),
+    ENCODER_w_structure(XORSIGALG_NAME, xorhmacsig, der, SubjectPublicKeyInfo),
+    ENCODER_w_structure(XORSIGALG_NAME, xorhmacsig, pem, SubjectPublicKeyInfo),
+    ENCODER_w_structure(XORSIGALG_HASH_NAME, xorhmacsha2sig,
+        der, PrivateKeyInfo),
+    ENCODER_w_structure(XORSIGALG_HASH_NAME, xorhmacsha2sig,
+        pem, PrivateKeyInfo),
+    ENCODER_w_structure(XORSIGALG_HASH_NAME, xorhmacsha2sig,
+        der, EncryptedPrivateKeyInfo),
+    ENCODER_w_structure(XORSIGALG_HASH_NAME, xorhmacsha2sig,
+        pem, EncryptedPrivateKeyInfo),
+    ENCODER_w_structure(XORSIGALG_HASH_NAME, xorhmacsha2sig,
+        der, SubjectPublicKeyInfo),
+    ENCODER_w_structure(XORSIGALG_HASH_NAME, xorhmacsha2sig,
+        pem, SubjectPublicKeyInfo),
 #undef ENCODER_PROVIDER
     { NULL, NULL, NULL }
 };
 
-struct der2key_ctx_st;           /* Forward declaration */
+struct der2key_ctx_st; /* Forward declaration */
 typedef int check_key_fn(void *, struct der2key_ctx_st *ctx);
 typedef void adjust_key_fn(void *, struct der2key_ctx_st *ctx);
 typedef void free_key_fn(void *);
 typedef void *d2i_PKCS8_fn(void **, const unsigned char **, long,
-                           struct der2key_ctx_st *);
+    struct der2key_ctx_st *);
 struct keytype_desc_st {
     const char *keytype_name;
     const OSSL_DISPATCH *fns; /* Keymgmt (to pilfer functions from) */
@@ -2135,10 +2120,10 @@ struct keytype_desc_st {
 
     /* For type specific decoders, we use the corresponding d2i */
     d2i_of_void *d2i_private_key; /* From type-specific DER */
-    d2i_of_void *d2i_public_key;  /* From type-specific DER */
-    d2i_of_void *d2i_key_params;  /* From type-specific DER */
-    d2i_PKCS8_fn *d2i_PKCS8;      /* Wrapped in a PrivateKeyInfo */
-    d2i_of_void *d2i_PUBKEY;      /* Wrapped in a SubjectPublicKeyInfo */
+    d2i_of_void *d2i_public_key; /* From type-specific DER */
+    d2i_of_void *d2i_key_params; /* From type-specific DER */
+    d2i_PKCS8_fn *d2i_PKCS8; /* Wrapped in a PrivateKeyInfo */
+    d2i_of_void *d2i_PUBKEY; /* Wrapped in a SubjectPublicKeyInfo */
 
     /*
      * For any key, we may need to check that the key meets expectations.
@@ -2174,20 +2159,20 @@ struct X509_pubkey_st {
 };
 
 ASN1_SEQUENCE(X509_PUBKEY_INTERNAL) = {
-        ASN1_SIMPLE(X509_PUBKEY, algor, X509_ALGOR),
-        ASN1_SIMPLE(X509_PUBKEY, public_key, ASN1_BIT_STRING)
+    ASN1_SIMPLE(X509_PUBKEY, algor, X509_ALGOR),
+    ASN1_SIMPLE(X509_PUBKEY, public_key, ASN1_BIT_STRING)
 } static_ASN1_SEQUENCE_END_name(X509_PUBKEY, X509_PUBKEY_INTERNAL)
 
-static X509_PUBKEY *xorx_d2i_X509_PUBKEY_INTERNAL(const unsigned char **pp,
-                                           long len, OSSL_LIB_CTX *libctx)
+                                          static X509_PUBKEY
+    * xorx_d2i_X509_PUBKEY_INTERNAL(const unsigned char **pp, long len, OSSL_LIB_CTX *libctx)
 {
     X509_PUBKEY *xpub = OPENSSL_zalloc(sizeof(*xpub));
 
     if (xpub == NULL)
         return NULL;
     return (X509_PUBKEY *)ASN1_item_d2i_ex((ASN1_VALUE **)&xpub, pp, len,
-                                           ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL),
-                                           libctx, NULL);
+        ASN1_ITEM_rptr(X509_PUBKEY_INTERNAL),
+        libctx, NULL);
 }
 /* end steal https://github.com/openssl/openssl/issues/16697 */
 
@@ -2204,7 +2189,7 @@ struct der2key_ctx_st {
 };
 
 static int xor_read_der(PROV_XOR_CTX *provctx, OSSL_CORE_BIO *cin,
-                        unsigned char **data, long *len)
+    unsigned char **data, long *len)
 {
     BUF_MEM *mem = NULL;
     BIO *in = BIO_new_from_core_bio(provctx->libctx, cin);
@@ -2220,10 +2205,10 @@ static int xor_read_der(PROV_XOR_CTX *provctx, OSSL_CORE_BIO *cin,
 }
 
 typedef void *key_from_pkcs8_t(const PKCS8_PRIV_KEY_INFO *p8inf,
-                               OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 static void *xor_der2key_decode_p8(const unsigned char **input_der,
-                               long input_der_len, struct der2key_ctx_st *ctx,
-                               key_from_pkcs8_t *key_from_pkcs8)
+    long input_der_len, struct der2key_ctx_st *ctx,
+    key_from_pkcs8_t *key_from_pkcs8)
 {
     PKCS8_PRIV_KEY_INFO *p8inf = NULL;
     const X509_ALGOR *alg = NULL;
@@ -2239,7 +2224,7 @@ static void *xor_der2key_decode_p8(const unsigned char **input_der,
 }
 
 static XORKEY *xor_d2i_PUBKEY(XORKEY **a,
-                               const unsigned char **pp, long length)
+    const unsigned char **pp, long length)
 {
     XORKEY *key = NULL;
     X509_PUBKEY *xpk;
@@ -2256,12 +2241,11 @@ static XORKEY *xor_d2i_PUBKEY(XORKEY **a,
         *a = key;
     }
 
-    err_exit:
+err_exit:
     X509_PUBKEY_free(xpk);
     return key;
 }
 
-
 /* ---------------------------------------------------------------------- */
 
 static OSSL_FUNC_decoder_freectx_fn der2key_freectx;
@@ -2269,7 +2253,7 @@ static OSSL_FUNC_decoder_decode_fn xor_der2key_decode;
 static OSSL_FUNC_decoder_export_object_fn der2key_export_object;
 
 static struct der2key_ctx_st *
-der2key_newctx(void *provctx, struct keytype_desc_st *desc, const char* tls_name)
+der2key_newctx(void *provctx, struct keytype_desc_st *desc, const char *tls_name)
 {
     struct der2key_ctx_st *ctx = OPENSSL_zalloc(sizeof(*ctx));
 
@@ -2277,7 +2261,7 @@ der2key_newctx(void *provctx, struct keytype_desc_st *desc, const char* tls_name
         ctx->provctx = provctx;
         ctx->desc = desc;
         if (desc->evp_type == 0) {
-           ctx->desc->evp_type = OBJ_sn2nid(tls_name);
+            ctx->desc->evp_type = OBJ_sn2nid(tls_name);
         }
     }
     return ctx;
@@ -2291,7 +2275,7 @@ static void der2key_freectx(void *vctx)
 }
 
 static int der2key_check_selection(int selection,
-                                   const struct keytype_desc_st *desc)
+    const struct keytype_desc_st *desc)
 {
     /*
      * The selections are kinda sorta "levels", i.e. each selection given
@@ -2325,8 +2309,8 @@ static int der2key_check_selection(int selection,
 }
 
 static int xor_der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
-                          OSSL_CALLBACK *data_cb, void *data_cbarg,
-                          OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
+    OSSL_CALLBACK *data_cb, void *data_cbarg,
+    OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg)
 {
     struct der2key_ctx_st *ctx = vctx;
     unsigned char *der = NULL;
@@ -2355,7 +2339,7 @@ static int xor_der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     if (!ok)
         goto next;
 
-    ok = 0;                      /* Assume that we fail */
+    ok = 0; /* Assume that we fail */
 
     if ((selection & OSSL_KEYMGMT_SELECT_PRIVATE_KEY) != 0) {
         derp = der;
@@ -2403,7 +2387,7 @@ static int xor_der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
     if (key != NULL && ctx->desc->adjust_key != NULL)
         ctx->desc->adjust_key(key, ctx);
 
- next:
+next:
     /*
      * Indicated that we successfully decoded something, or not at all.
      * Ending up "empty handed" is not an error.
@@ -2422,22 +2406,19 @@ static int xor_der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
         OSSL_PARAM params[4];
         int object_type = OSSL_OBJECT_PKEY;
 
-        params[0] =
-            OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &object_type);
-        params[1] =
-            OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
-                                             (char *)ctx->desc->keytype_name,
-                                             0);
+        params[0] = OSSL_PARAM_construct_int(OSSL_OBJECT_PARAM_TYPE, &object_type);
+        params[1] = OSSL_PARAM_construct_utf8_string(OSSL_OBJECT_PARAM_DATA_TYPE,
+            (char *)ctx->desc->keytype_name,
+            0);
         /* The address of the key becomes the octet string */
-        params[2] =
-            OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_REFERENCE,
-                                              &key, sizeof(key));
+        params[2] = OSSL_PARAM_construct_octet_string(OSSL_OBJECT_PARAM_REFERENCE,
+            &key, sizeof(key));
         params[3] = OSSL_PARAM_construct_end();
 
         ok = data_cb(params, data_cbarg);
     }
 
- end:
+end:
     ctx->desc->free_key(key);
     OPENSSL_free(der);
 
@@ -2445,12 +2426,11 @@ static int xor_der2key_decode(void *vctx, OSSL_CORE_BIO *cin, int selection,
 }
 
 static int der2key_export_object(void *vctx,
-                                 const void *reference, size_t reference_sz,
-                                 OSSL_CALLBACK *export_cb, void *export_cbarg)
+    const void *reference, size_t reference_sz,
+    OSSL_CALLBACK *export_cb, void *export_cbarg)
 {
     struct der2key_ctx_st *ctx = vctx;
-    OSSL_FUNC_keymgmt_export_fn *export =
-        xor_prov_get_keymgmt_export(ctx->desc->fns);
+    OSSL_FUNC_keymgmt_export_fn *export = xor_prov_get_keymgmt_export(ctx->desc->fns);
     void *keydata;
 
     if (reference_sz == sizeof(keydata) && export != NULL) {
@@ -2465,10 +2445,10 @@ static int der2key_export_object(void *vctx,
 /* ---------------------------------------------------------------------- */
 
 static void *xorx_d2i_PKCS8(void **key, const unsigned char **der, long der_len,
-                           struct der2key_ctx_st *ctx)
+    struct der2key_ctx_st *ctx)
 {
     return xor_der2key_decode_p8(der, der_len, ctx,
-                             (key_from_pkcs8_t *)xor_key_from_pkcs8);
+        (key_from_pkcs8_t *)xor_key_from_pkcs8);
 }
 
 static void xorx_key_adjust(void *key, struct der2key_ctx_st *ctx)
@@ -2477,28 +2457,28 @@ static void xorx_key_adjust(void *key, struct der2key_ctx_st *ctx)
 
 /* ---------------------------------------------------------------------- */
 
-#define DO_PrivateKeyInfo(keytype)                      \
-    "PrivateKeyInfo", 0,                                \
-        ( OSSL_KEYMGMT_SELECT_PRIVATE_KEY ),            \
-        NULL,                                           \
-        NULL,                                           \
-        NULL,                                           \
-        xorx_d2i_PKCS8,                                 \
-        NULL,                                           \
-        NULL,                                           \
-        xorx_key_adjust,                                \
+#define DO_PrivateKeyInfo(keytype)         \
+    "PrivateKeyInfo", 0,                   \
+        (OSSL_KEYMGMT_SELECT_PRIVATE_KEY), \
+        NULL,                              \
+        NULL,                              \
+        NULL,                              \
+        xorx_d2i_PKCS8,                    \
+        NULL,                              \
+        NULL,                              \
+        xorx_key_adjust,                   \
         (free_key_fn *)xor_freekey
 
-#define DO_SubjectPublicKeyInfo(keytype)                \
-    "SubjectPublicKeyInfo", 0,                          \
-        ( OSSL_KEYMGMT_SELECT_PUBLIC_KEY ),             \
-        NULL,                                           \
-        NULL,                                           \
-        NULL,                                           \
-        NULL,                                           \
-        (d2i_of_void *)xor_d2i_PUBKEY,                  \
-        NULL,                                           \
-        xorx_key_adjust,                                \
+#define DO_SubjectPublicKeyInfo(keytype)  \
+    "SubjectPublicKeyInfo", 0,            \
+        (OSSL_KEYMGMT_SELECT_PUBLIC_KEY), \
+        NULL,                             \
+        NULL,                             \
+        NULL,                             \
+        NULL,                             \
+        (d2i_of_void *)xor_d2i_PUBKEY,    \
+        NULL,                             \
+        xorx_key_adjust,                  \
         (free_key_fn *)xor_freekey
 
 /*
@@ -2518,37 +2498,37 @@ static void xorx_key_adjust(void *key, struct der2key_ctx_st *ctx)
  *              the DO_##kind macros above, to populate the keytype_desc_st
  *              structure.
  */
-#define MAKE_DECODER(keytype_name, keytype, type, kind)                 \
-    static struct keytype_desc_st kind##_##keytype##_desc =             \
-        { keytype_name, xor_##keytype##_keymgmt_functions,              \
-          DO_##kind(keytype) };                                         \
-                                                                        \
-    static OSSL_FUNC_decoder_newctx_fn kind##_der2##keytype##_newctx;   \
-                                                                        \
-    static void *kind##_der2##keytype##_newctx(void *provctx)           \
-    {                                                                   \
-        return der2key_newctx(provctx, &kind##_##keytype##_desc, keytype_name );\
-    }                                                                   \
-    static int kind##_der2##keytype##_does_selection(void *provctx,     \
-                                                     int selection)     \
-    {                                                                   \
-        return der2key_check_selection(selection,                       \
-                                       &kind##_##keytype##_desc);       \
-    }                                                                   \
-    static const OSSL_DISPATCH                                          \
-    xor_##kind##_der_to_##keytype##_decoder_functions[] = {             \
-        { OSSL_FUNC_DECODER_NEWCTX,                                     \
-          (void (*)(void))kind##_der2##keytype##_newctx },              \
-        { OSSL_FUNC_DECODER_FREECTX,                                    \
-          (void (*)(void))der2key_freectx },                            \
-        { OSSL_FUNC_DECODER_DOES_SELECTION,                             \
-          (void (*)(void))kind##_der2##keytype##_does_selection },      \
-        { OSSL_FUNC_DECODER_DECODE,                                     \
-          (void (*)(void))xor_der2key_decode },                         \
-        { OSSL_FUNC_DECODER_EXPORT_OBJECT,                              \
-          (void (*)(void))der2key_export_object },                      \
-        OSSL_DISPATCH_END                                               \
-    }
+#define MAKE_DECODER(keytype_name, keytype, type, kind)                                                        \
+    static struct keytype_desc_st kind##_##keytype##_desc = { keytype_name, xor_##keytype##_keymgmt_functions, \
+        DO_##kind(keytype) };                                                                                  \
+                                                                                                               \
+    static OSSL_FUNC_decoder_newctx_fn kind##_der2##keytype##_newctx;                                          \
+                                                                                                               \
+    static void *kind##_der2##keytype##_newctx(void *provctx)                                                  \
+    {                                                                                                          \
+        return der2key_newctx(provctx, &kind##_##keytype##_desc, keytype_name);                                \
+    }                                                                                                          \
+    static int kind##_der2##keytype##_does_selection(void *provctx,                                            \
+        int selection)                                                                                         \
+    {                                                                                                          \
+        return der2key_check_selection(selection,                                                              \
+            &kind##_##keytype##_desc);                                                                         \
+    }                                                                                                          \
+    static const OSSL_DISPATCH                                                                                 \
+        xor_##kind##_der_to_##keytype##_decoder_functions[]                                                    \
+        = {                                                                                                    \
+              { OSSL_FUNC_DECODER_NEWCTX,                                                                      \
+                  (void (*)(void))kind##_der2##keytype##_newctx },                                             \
+              { OSSL_FUNC_DECODER_FREECTX,                                                                     \
+                  (void (*)(void))der2key_freectx },                                                           \
+              { OSSL_FUNC_DECODER_DOES_SELECTION,                                                              \
+                  (void (*)(void))kind##_der2##keytype##_does_selection },                                     \
+              { OSSL_FUNC_DECODER_DECODE,                                                                      \
+                  (void (*)(void))xor_der2key_decode },                                                        \
+              { OSSL_FUNC_DECODER_EXPORT_OBJECT,                                                               \
+                  (void (*)(void))der2key_export_object },                                                     \
+              OSSL_DISPATCH_END                                                                                \
+          }
 
 MAKE_DECODER(XORSIGALG_NAME, xorhmacsig, xor, PrivateKeyInfo);
 MAKE_DECODER(XORSIGALG_NAME, xorhmacsig, xor, SubjectPublicKeyInfo);
@@ -2557,8 +2537,8 @@ MAKE_DECODER(XORSIGALG_HASH_NAME, xorhmacsha2sig, xor, SubjectPublicKeyInfo);
 
 static const OSSL_ALGORITHM tls_prov_decoder[] = {
 #define DECODER_PROVIDER "tls-provider"
-#define DECODER_STRUCTURE_SubjectPublicKeyInfo          "SubjectPublicKeyInfo"
-#define DECODER_STRUCTURE_PrivateKeyInfo                "PrivateKeyInfo"
+#define DECODER_STRUCTURE_SubjectPublicKeyInfo "SubjectPublicKeyInfo"
+#define DECODER_STRUCTURE_PrivateKeyInfo "PrivateKeyInfo"
 
 /* Arguments are prefixed with '_' to avoid build breaks on certain platforms */
 /*
@@ -2567,25 +2547,25 @@ static const OSSL_ALGORITHM tls_prov_decoder[] = {
  */
 
 #define DECODER(_name, _input, _output)                          \
-    { _name,                                                            \
-      "provider=" DECODER_PROVIDER ",fips=yes,input=" #_input,   \
-      (xor_##_input##_to_##_output##_decoder_functions) }
-#define DECODER_w_structure(_name, _input, _structure, _output)  \
-    { _name,                                                            \
-      "provider=" DECODER_PROVIDER ",fips=yes,input=" #_input    \
-      ",structure=" DECODER_STRUCTURE_##_structure,                     \
-      (xor_##_structure##_##_input##_to_##_output##_decoder_functions) }
-
-DECODER_w_structure(XORSIGALG_NAME, der, PrivateKeyInfo, xorhmacsig),
-DECODER_w_structure(XORSIGALG_NAME, der, SubjectPublicKeyInfo, xorhmacsig),
-DECODER_w_structure(XORSIGALG_HASH_NAME, der, PrivateKeyInfo, xorhmacsha2sig),
-DECODER_w_structure(XORSIGALG_HASH_NAME, der, SubjectPublicKeyInfo, xorhmacsha2sig),
+    { _name,                                                     \
+        "provider=" DECODER_PROVIDER ",fips=yes,input=" #_input, \
+        (xor_##_input##_to_##_output##_decoder_functions) }
+#define DECODER_w_structure(_name, _input, _structure, _output) \
+    { _name,                                                    \
+        "provider=" DECODER_PROVIDER ",fips=yes,input=" #_input \
+        ",structure=" DECODER_STRUCTURE_##_structure,           \
+        (xor_##_structure##_##_input##_to_##_output##_decoder_functions) }
+
+    DECODER_w_structure(XORSIGALG_NAME, der, PrivateKeyInfo, xorhmacsig),
+    DECODER_w_structure(XORSIGALG_NAME, der, SubjectPublicKeyInfo, xorhmacsig),
+    DECODER_w_structure(XORSIGALG_HASH_NAME, der, PrivateKeyInfo, xorhmacsha2sig),
+    DECODER_w_structure(XORSIGALG_HASH_NAME, der, SubjectPublicKeyInfo, xorhmacsha2sig),
 #undef DECODER_PROVIDER
     { NULL, NULL, NULL }
 };
 
 #define OSSL_MAX_NAME_SIZE 50
-#define OSSL_MAX_PROPQUERY_SIZE     256 /* Property query strings */
+#define OSSL_MAX_PROPQUERY_SIZE 256 /* Property query strings */
 
 static OSSL_FUNC_signature_newctx_fn xor_sig_newctx;
 static OSSL_FUNC_signature_sign_init_fn xor_sig_sign_init;
@@ -2609,15 +2589,16 @@ static OSSL_FUNC_signature_gettable_ctx_md_params_fn xor_sig_gettable_ctx_md_par
 static OSSL_FUNC_signature_set_ctx_md_params_fn xor_sig_set_ctx_md_params;
 static OSSL_FUNC_signature_settable_ctx_md_params_fn xor_sig_settable_ctx_md_params;
 
-static int xor_get_aid(unsigned char** oidbuf, const char *tls_name) {
-   X509_ALGOR *algor = X509_ALGOR_new();
-   int aidlen = 0;
+static int xor_get_aid(unsigned char **oidbuf, const char *tls_name)
+{
+    X509_ALGOR *algor = X509_ALGOR_new();
+    int aidlen = 0;
 
-   X509_ALGOR_set0(algor, OBJ_txt2obj(tls_name, 0), V_ASN1_UNDEF, NULL);
+    X509_ALGOR_set0(algor, OBJ_txt2obj(tls_name, 0), V_ASN1_UNDEF, NULL);
 
-   aidlen = i2d_X509_ALGOR(algor, oidbuf);
-   X509_ALGOR_free(algor);
-   return(aidlen);
+    aidlen = i2d_X509_ALGOR(algor, oidbuf);
+    X509_ALGOR_free(algor);
+    return (aidlen);
 }
 
 /*
@@ -2640,7 +2621,7 @@ typedef struct {
 
     /* The Algorithm Identifier of the combined signature algorithm */
     unsigned char *aid;
-    size_t  aid_len;
+    size_t aid_len;
 
     /* main digest */
     EVP_MD *md;
@@ -2656,7 +2637,7 @@ static void *xor_sig_newctx(void *provctx, const char *propq)
     if (pxor_sigctx == NULL)
         return NULL;
 
-    pxor_sigctx->libctx = ((PROV_XOR_CTX*)provctx)->libctx;
+    pxor_sigctx->libctx = ((PROV_XOR_CTX *)provctx)->libctx;
     pxor_sigctx->flag_allow_md = 0;
     if (propq != NULL && (pxor_sigctx->propq = OPENSSL_strdup(propq)) == NULL) {
         OPENSSL_free(pxor_sigctx);
@@ -2667,7 +2648,7 @@ static void *xor_sig_newctx(void *provctx, const char *propq)
 }
 
 static int xor_sig_setup_md(PROV_XORSIG_CTX *ctx,
-                        const char *mdname, const char *mdprops)
+    const char *mdname, const char *mdprops)
 {
     EVP_MD *md;
 
@@ -2676,10 +2657,10 @@ static int xor_sig_setup_md(PROV_XORSIG_CTX *ctx,
 
     md = EVP_MD_fetch(ctx->libctx, mdname, mdprops);
 
-    if ((md == NULL) || (EVP_MD_nid(md)==NID_undef)) {
+    if ((md == NULL) || (EVP_MD_nid(md) == NID_undef)) {
         if (md == NULL)
             ERR_raise_data(ERR_LIB_USER, XORPROV_R_INVALID_DIGEST,
-                           "%s could not be fetched", mdname);
+                "%s could not be fetched", mdname);
         EVP_MD_free(md);
         return 0;
     }
@@ -2704,7 +2685,7 @@ static int xor_sig_setup_md(PROV_XORSIG_CTX *ctx,
 }
 
 static int xor_sig_signverify_init(void *vpxor_sigctx, void *vxorsig,
-                                   int operation)
+    int operation)
 {
     PROV_XORSIG_CTX *pxor_sigctx = (PROV_XORSIG_CTX *)vpxor_sigctx;
 
@@ -2715,8 +2696,8 @@ static int xor_sig_signverify_init(void *vpxor_sigctx, void *vxorsig,
         return 0;
     pxor_sigctx->sig = vxorsig;
     pxor_sigctx->operation = operation;
-    if ((operation==EVP_PKEY_OP_SIGN && pxor_sigctx->sig == NULL)
-        || (operation==EVP_PKEY_OP_VERIFY && pxor_sigctx->sig == NULL)) {
+    if ((operation == EVP_PKEY_OP_SIGN && pxor_sigctx->sig == NULL)
+        || (operation == EVP_PKEY_OP_VERIFY && pxor_sigctx->sig == NULL)) {
         ERR_raise(ERR_LIB_USER, XORPROV_R_INVALID_KEY);
         return 0;
     }
@@ -2724,19 +2705,19 @@ static int xor_sig_signverify_init(void *vpxor_sigctx, void *vxorsig,
 }
 
 static int xor_sig_sign_init(void *vpxor_sigctx, void *vxorsig,
-                             const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return xor_sig_signverify_init(vpxor_sigctx, vxorsig, EVP_PKEY_OP_SIGN);
 }
 
 static int xor_sig_verify_init(void *vpxor_sigctx, void *vxorsig,
-                               const OSSL_PARAM params[])
+    const OSSL_PARAM params[])
 {
     return xor_sig_signverify_init(vpxor_sigctx, vxorsig, EVP_PKEY_OP_VERIFY);
 }
 
 static int xor_sig_sign(void *vpxor_sigctx, unsigned char *sig, size_t *siglen,
-                    size_t sigsize, const unsigned char *tbs, size_t tbslen)
+    size_t sigsize, const unsigned char *tbs, size_t tbslen)
 {
     PROV_XORSIG_CTX *pxor_sigctx = (PROV_XORSIG_CTX *)vpxor_sigctx;
     XORKEY *xorkey = pxor_sigctx->sig;
@@ -2764,8 +2745,8 @@ static int xor_sig_sign(void *vpxor_sigctx, unsigned char *sig, size_t *siglen,
      * No real crypto, just for test, don't do this at home!
      */
     if (!EVP_Q_mac(pxor_sigctx->libctx, "HMAC", NULL, "sha1", NULL,
-                   xorkey->privkey, XOR_KEY_SIZE, tbs, tbslen,
-                   &sig[0], EVP_MAX_MD_SIZE, &xor_sig_len)) {
+            xorkey->privkey, XOR_KEY_SIZE, tbs, tbslen,
+            &sig[0], EVP_MAX_MD_SIZE, &xor_sig_len)) {
         ERR_raise(ERR_LIB_USER, XORPROV_R_SIGNING_FAILED);
         goto endsign;
     }
@@ -2773,13 +2754,13 @@ static int xor_sig_sign(void *vpxor_sigctx, unsigned char *sig, size_t *siglen,
     *siglen = xor_sig_len;
     rv = 1; /* success */
 
- endsign:
+endsign:
     return rv;
 }
 
 static int xor_sig_verify(void *vpxor_sigctx,
     const unsigned char *sig, size_t siglen,
-                          const unsigned char *tbs, size_t tbslen)
+    const unsigned char *tbs, size_t tbslen)
 {
     PROV_XORSIG_CTX *pxor_sigctx = (PROV_XORSIG_CTX *)vpxor_sigctx;
     XORKEY *xorkey = pxor_sigctx->sig;
@@ -2802,8 +2783,8 @@ static int xor_sig_verify(void *vpxor_sigctx,
 
     /* Now re-create signature */
     if (!EVP_Q_mac(pxor_sigctx->libctx, "HMAC", NULL, "sha1", NULL,
-                   xorkey->privkey, XOR_KEY_SIZE, tbs, tbslen,
-                   &resignature[0], EVP_MAX_MD_SIZE, &resiglen)) {
+            xorkey->privkey, XOR_KEY_SIZE, tbs, tbslen,
+            &resignature[0], EVP_MAX_MD_SIZE, &resiglen)) {
         ERR_raise(ERR_LIB_USER, XORPROV_R_VERIFY_ERROR);
         return 0;
     }
@@ -2817,7 +2798,7 @@ static int xor_sig_verify(void *vpxor_sigctx,
 }
 
 static int xor_sig_digest_signverify_init(void *vpxor_sigctx, const char *mdname,
-                                      void *vxorsig, int operation)
+    void *vxorsig, int operation)
 {
     PROV_XORSIG_CTX *pxor_sigctx = (PROV_XORSIG_CTX *)vpxor_sigctx;
     char *rmdname = (char *)mdname;
@@ -2841,7 +2822,7 @@ static int xor_sig_digest_signverify_init(void *vpxor_sigctx, const char *mdname
 
     return 1;
 
- error:
+error:
     EVP_MD_CTX_free(pxor_sigctx->mdctx);
     EVP_MD_free(pxor_sigctx->md);
     pxor_sigctx->mdctx = NULL;
@@ -2850,21 +2831,21 @@ static int xor_sig_digest_signverify_init(void *vpxor_sigctx, const char *mdname
 }
 
 static int xor_sig_digest_sign_init(void *vpxor_sigctx, const char *mdname,
-                                      void *vxorsig, const OSSL_PARAM params[])
+    void *vxorsig, const OSSL_PARAM params[])
 {
     return xor_sig_digest_signverify_init(vpxor_sigctx, mdname, vxorsig,
-                                          EVP_PKEY_OP_SIGN);
+        EVP_PKEY_OP_SIGN);
 }
 
 static int xor_sig_digest_verify_init(void *vpxor_sigctx, const char *mdname, void *vxorsig, const OSSL_PARAM params[])
 {
     return xor_sig_digest_signverify_init(vpxor_sigctx, mdname,
-                                          vxorsig, EVP_PKEY_OP_VERIFY);
+        vxorsig, EVP_PKEY_OP_VERIFY);
 }
 
 int xor_sig_digest_signverify_update(void *vpxor_sigctx,
-                                     const unsigned char *data,
-                                     size_t datalen)
+    const unsigned char *data,
+    size_t datalen)
 {
     PROV_XORSIG_CTX *pxor_sigctx = (PROV_XORSIG_CTX *)vpxor_sigctx;
 
@@ -2875,8 +2856,8 @@ int xor_sig_digest_signverify_update(void *vpxor_sigctx,
 }
 
 int xor_sig_digest_sign_final(void *vpxor_sigctx,
-                              unsigned char *sig, size_t *siglen,
-                              size_t sigsize)
+    unsigned char *sig, size_t *siglen,
+    size_t sigsize)
 {
     PROV_XORSIG_CTX *pxor_sigctx = (PROV_XORSIG_CTX *)vpxor_sigctx;
     unsigned char digest[EVP_MAX_MD_SIZE];
@@ -2893,11 +2874,10 @@ int xor_sig_digest_sign_final(void *vpxor_sigctx,
     }
 
     return xor_sig_sign(vpxor_sigctx, sig, siglen, sigsize, digest, (size_t)dlen);
-
 }
 
 int xor_sig_digest_verify_final(void *vpxor_sigctx, const unsigned char *sig,
-                            size_t siglen)
+    size_t siglen)
 {
     PROV_XORSIG_CTX *pxor_sigctx = (PROV_XORSIG_CTX *)vpxor_sigctx;
     unsigned char digest[EVP_MAX_MD_SIZE];
@@ -2956,12 +2936,12 @@ static void *xor_sig_dupctx(void *vpxor_sigctx)
     if (srcctx->mdctx != NULL) {
         dstctx->mdctx = EVP_MD_CTX_new();
         if (dstctx->mdctx == NULL
-                || !EVP_MD_CTX_copy_ex(dstctx->mdctx, srcctx->mdctx))
+            || !EVP_MD_CTX_copy_ex(dstctx->mdctx, srcctx->mdctx))
             goto err;
     }
 
     return dstctx;
- err:
+err:
     xor_sig_freectx(dstctx);
     return NULL;
 }
@@ -3016,9 +2996,8 @@ static int xor_sig_set_ctx_params(void *vpxor_sigctx, const OSSL_PARAM params[])
     if (p != NULL) {
         char mdname[OSSL_MAX_NAME_SIZE] = "", *pmdname = mdname;
         char mdprops[OSSL_MAX_PROPQUERY_SIZE] = "", *pmdprops = mdprops;
-        const OSSL_PARAM *propsp =
-            OSSL_PARAM_locate_const(params,
-                                    OSSL_SIGNATURE_PARAM_PROPERTIES);
+        const OSSL_PARAM *propsp = OSSL_PARAM_locate_const(params,
+            OSSL_SIGNATURE_PARAM_PROPERTIES);
 
         if (!OSSL_PARAM_get_utf8_string(p, &pmdname, sizeof(mdname)))
             return 0;
@@ -3039,7 +3018,7 @@ static const OSSL_PARAM known_settable_ctx_params[] = {
 };
 
 static const OSSL_PARAM *xor_sig_settable_ctx_params(ossl_unused void *vpsm2ctx,
-                                                     ossl_unused void *provctx)
+    ossl_unused void *provctx)
 {
     return known_settable_ctx_params;
 }
@@ -3091,33 +3070,33 @@ static const OSSL_DISPATCH xor_signature_functions[] = {
     { OSSL_FUNC_SIGNATURE_VERIFY_INIT, (void (*)(void))xor_sig_verify_init },
     { OSSL_FUNC_SIGNATURE_VERIFY, (void (*)(void))xor_sig_verify },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT,
-      (void (*)(void))xor_sig_digest_sign_init },
+        (void (*)(void))xor_sig_digest_sign_init },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_UPDATE,
-      (void (*)(void))xor_sig_digest_signverify_update },
+        (void (*)(void))xor_sig_digest_signverify_update },
     { OSSL_FUNC_SIGNATURE_DIGEST_SIGN_FINAL,
-      (void (*)(void))xor_sig_digest_sign_final },
+        (void (*)(void))xor_sig_digest_sign_final },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT,
-      (void (*)(void))xor_sig_digest_verify_init },
+        (void (*)(void))xor_sig_digest_verify_init },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_UPDATE,
-      (void (*)(void))xor_sig_digest_signverify_update },
+        (void (*)(void))xor_sig_digest_signverify_update },
     { OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_FINAL,
-      (void (*)(void))xor_sig_digest_verify_final },
+        (void (*)(void))xor_sig_digest_verify_final },
     { OSSL_FUNC_SIGNATURE_FREECTX, (void (*)(void))xor_sig_freectx },
     { OSSL_FUNC_SIGNATURE_DUPCTX, (void (*)(void))xor_sig_dupctx },
     { OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS, (void (*)(void))xor_sig_get_ctx_params },
     { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS,
-      (void (*)(void))xor_sig_gettable_ctx_params },
+        (void (*)(void))xor_sig_gettable_ctx_params },
     { OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS, (void (*)(void))xor_sig_set_ctx_params },
     { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS,
-      (void (*)(void))xor_sig_settable_ctx_params },
+        (void (*)(void))xor_sig_settable_ctx_params },
     { OSSL_FUNC_SIGNATURE_GET_CTX_MD_PARAMS,
-      (void (*)(void))xor_sig_get_ctx_md_params },
+        (void (*)(void))xor_sig_get_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_GETTABLE_CTX_MD_PARAMS,
-      (void (*)(void))xor_sig_gettable_ctx_md_params },
+        (void (*)(void))xor_sig_gettable_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_SET_CTX_MD_PARAMS,
-      (void (*)(void))xor_sig_set_ctx_md_params },
+        (void (*)(void))xor_sig_set_ctx_md_params },
     { OSSL_FUNC_SIGNATURE_SETTABLE_CTX_MD_PARAMS,
-      (void (*)(void))xor_sig_settable_ctx_md_params },
+        (void (*)(void))xor_sig_settable_ctx_md_params },
     OSSL_DISPATCH_END
 };
 
@@ -3127,17 +3106,16 @@ static const OSSL_ALGORITHM tls_prov_signature[] = {
      * with the FIPS provider we pretend that it is.
      */
     { XORSIGALG_NAME, "provider=tls-provider,fips=yes",
-                           xor_signature_functions },
+        xor_signature_functions },
     { XORSIGALG_HASH_NAME, "provider=tls-provider,fips=yes",
-                           xor_signature_functions },
+        xor_signature_functions },
     { XORSIGALG12_NAME, "provider=tls-provider,fips=yes",
-                           xor_signature_functions },
+        xor_signature_functions },
     { NULL, NULL, NULL }
 };
 
-
 static const OSSL_ALGORITHM *tls_prov_query(void *provctx, int operation_id,
-                                            int *no_cache)
+    int *no_cache)
 {
     *no_cache = 0;
     switch (operation_id) {
@@ -3160,7 +3138,7 @@ static const OSSL_ALGORITHM *tls_prov_query(void *provctx, int operation_id,
 static void tls_prov_teardown(void *provctx)
 {
     int i;
-    PROV_XOR_CTX *pctx = (PROV_XOR_CTX*)provctx;
+    PROV_XOR_CTX *pctx = (PROV_XOR_CTX *)provctx;
 
     OSSL_LIB_CTX_free(pctx->libctx);
 
@@ -3179,8 +3157,7 @@ static const OSSL_DISPATCH tls_prov_dispatch_table[] = {
     OSSL_DISPATCH_END
 };
 
-static
-unsigned int randomize_tls_alg_id(OSSL_LIB_CTX *libctx)
+static unsigned int randomize_tls_alg_id(OSSL_LIB_CTX *libctx)
 {
     /*
      * Randomise the id we're going to use to ensure we don't interoperate
@@ -3191,7 +3168,7 @@ unsigned int randomize_tls_alg_id(OSSL_LIB_CTX *libctx)
     static int in_mem = 0;
     int i;
 
- retry:
+retry:
     if (RAND_bytes_ex(libctx, (unsigned char *)&id, sizeof(id), 0) <= 0)
         return 0;
     /*
@@ -3214,13 +3191,13 @@ unsigned int randomize_tls_alg_id(OSSL_LIB_CTX *libctx)
 }
 
 int tls_provider_init(const OSSL_CORE_HANDLE *handle,
-                      const OSSL_DISPATCH *in,
-                      const OSSL_DISPATCH **out,
-                      void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     OSSL_LIB_CTX *libctx = OSSL_LIB_CTX_new_from_dispatch(handle, in);
-    OSSL_FUNC_core_obj_create_fn *c_obj_create= NULL;
-    OSSL_FUNC_core_obj_add_sigid_fn *c_obj_add_sigid= NULL;
+    OSSL_FUNC_core_obj_create_fn *c_obj_create = NULL;
+    OSSL_FUNC_core_obj_add_sigid_fn *c_obj_add_sigid = NULL;
     PROV_XOR_CTX *xor_prov_ctx = xor_newprovctx(libctx);
 
     if (libctx == NULL || xor_prov_ctx == NULL)
diff --git a/test/tls13ccstest.c b/test/tls13ccstest.c
index 6e1b7d978ce8f..d8aac4da26075 100644
--- a/test/tls13ccstest.c
+++ b/test/tls13ccstest.c
@@ -33,7 +33,7 @@ static int watchccs_gets(BIO *bp, char *buf, int size);
 static int watchccs_puts(BIO *bp, const char *str);
 
 /* Choose a sufficiently large type likely to be unused for this custom BIO */
-# define BIO_TYPE_WATCHCCS_FILTER  (0x80 | BIO_TYPE_FILTER)
+#define BIO_TYPE_WATCHCCS_FILTER (0x80 | BIO_TYPE_FILTER)
 
 static BIO_METHOD *method_watchccs = NULL;
 
@@ -41,7 +41,7 @@ static const BIO_METHOD *bio_f_watchccs_filter(void)
 {
     if (method_watchccs == NULL) {
         method_watchccs = BIO_meth_new(BIO_TYPE_WATCHCCS_FILTER,
-                                       "Watch CCS filter");
+            "Watch CCS filter");
         if (method_watchccs == NULL
             || !BIO_meth_set_write(method_watchccs, watchccs_write)
             || !BIO_meth_set_read(method_watchccs, watchccs_read)
@@ -106,15 +106,15 @@ static int watchccs_write(BIO *bio, const char *in, int inl)
     /* We assume that we always write complete records each time */
     while (PACKET_remaining(&pkt)) {
         if (!PACKET_get_1(&pkt, &rectype)
-                || !PACKET_get_net_2(&pkt, &recvers)
-                || !PACKET_get_length_prefixed_2(&pkt, &msg))
+            || !PACKET_get_net_2(&pkt, &recvers)
+            || !PACKET_get_length_prefixed_2(&pkt, &msg))
             return 0;
 
         expectedrecvers = TLS1_2_VERSION;
 
         if (rectype == SSL3_RT_HANDSHAKE) {
             if (!PACKET_get_1(&msg, &msgtype)
-                    || !PACKET_get_length_prefixed_3(&msg, &msgbody))
+                || !PACKET_get_length_prefixed_3(&msg, &msgbody))
                 return 0;
             if (msgtype == SSL3_MT_CLIENT_HELLO) {
                 chseen++;
@@ -124,7 +124,7 @@ static int watchccs_write(BIO *bio, const char *in, int inl)
                  * session_id.
                  */
                 if (!PACKET_forward(&msgbody, 34)
-                        || !PACKET_get_length_prefixed_1(&msgbody, &sessionid))
+                    || !PACKET_get_length_prefixed_1(&msgbody, &sessionid))
                     return 0;
 
                 if (chseen == 1) {
@@ -140,9 +140,10 @@ static int watchccs_write(BIO *bio, const char *in, int inl)
                      * same as the first one.
                      */
                     if (PACKET_remaining(&sessionid) != chsessidlen
-                            || (chsessidlen > 0
-                                && memcmp(chsessid, PACKET_data(&sessionid),
-                                          chsessidlen) != 0))
+                        || (chsessidlen > 0
+                            && memcmp(chsessid, PACKET_data(&sessionid),
+                                   chsessidlen)
+                                != 0))
                         badsessid = 1;
                 }
             } else if (msgtype == SSL3_MT_SERVER_HELLO) {
@@ -152,7 +153,7 @@ static int watchccs_write(BIO *bio, const char *in, int inl)
                  * session_id.
                  */
                 if (!PACKET_forward(&msgbody, 34)
-                        || !PACKET_get_length_prefixed_1(&msgbody, &sessionid))
+                    || !PACKET_get_length_prefixed_1(&msgbody, &sessionid))
                     return 0;
 
                 /*
@@ -160,9 +161,10 @@ static int watchccs_write(BIO *bio, const char *in, int inl)
                  * ClientHello
                  */
                 if (PACKET_remaining(&sessionid) != chsessidlen
-                        || (chsessidlen > 0
-                            && memcmp(chsessid, PACKET_data(&sessionid),
-                                      chsessidlen) != 0))
+                    || (chsessidlen > 0
+                        && memcmp(chsessid, PACKET_data(&sessionid),
+                               chsessidlen)
+                            != 0))
                     badsessid = 1;
             }
         } else if (rectype == SSL3_RT_CHANGE_CIPHER_SPEC) {
@@ -173,9 +175,9 @@ static int watchccs_write(BIO *bio, const char *in, int inl)
                  * ServerHello
                  */
                 if (!sappdataseen
-                        && chseen == 1
-                        && shseen == 1
-                        && !sccsseen)
+                    && chseen == 1
+                    && shseen == 1
+                    && !sccsseen)
                     sccsseen = 1;
                 else
                     badccs = 1;
@@ -255,10 +257,10 @@ static int test_tls13ccs(int tst)
     chsessidlen = 0;
 
     if (!TEST_true(create_ssl_ctx_pair(NULL, TLS_server_method(),
-                                       TLS_client_method(), TLS1_VERSION, 0,
-                                       &sctx, &cctx, cert, privkey))
+            TLS_client_method(), TLS1_VERSION, 0,
+            &sctx, &cctx, cert, privkey))
         || !TEST_true(SSL_CTX_set_max_early_data(sctx,
-                                                 SSL3_RT_MAX_PLAIN_LENGTH)))
+            SSL3_RT_MAX_PLAIN_LENGTH)))
         goto err;
 
     /*
@@ -301,7 +303,7 @@ static int test_tls13ccs(int tst)
     if (tst >= 6) {
         /* Get a session suitable for early_data */
         if (!TEST_true(create_ssl_objects(sctx, cctx, &sssl, &cssl, NULL, NULL))
-                || !TEST_true(create_ssl_connection(sssl, cssl, SSL_ERROR_NONE)))
+            || !TEST_true(create_ssl_connection(sssl, cssl, SSL_ERROR_NONE)))
             goto err;
         sess = SSL_get1_session(cssl);
         if (!TEST_ptr(sess))
@@ -316,10 +318,10 @@ static int test_tls13ccs(int tst)
     if ((tst >= 3 && tst <= 5) || tst >= 9) {
         /* HRR handshake */
 #if defined(OPENSSL_NO_EC)
-# if !defined(OPENSSL_NO_DH)
+#if !defined(OPENSSL_NO_DH)
         if (!TEST_true(SSL_CTX_set1_groups_list(sctx, "ffdhe3072")))
             goto err;
-# endif
+#endif
 #else
         if (!TEST_true(SSL_CTX_set1_groups_list(sctx, "P-384")))
             goto err;
@@ -329,7 +331,7 @@ static int test_tls13ccs(int tst)
     s_to_c_fbio = BIO_new(bio_f_watchccs_filter());
     c_to_s_fbio = BIO_new(bio_f_watchccs_filter());
     if (!TEST_ptr(s_to_c_fbio)
-            || !TEST_ptr(c_to_s_fbio)) {
+        || !TEST_ptr(c_to_s_fbio)) {
         BIO_free(s_to_c_fbio);
         BIO_free(c_to_s_fbio);
         goto err;
@@ -337,18 +339,18 @@ static int test_tls13ccs(int tst)
 
     /* BIOs get freed on error */
     if (!TEST_true(create_ssl_objects(sctx, cctx, &sssl, &cssl, s_to_c_fbio,
-                                      c_to_s_fbio)))
+            c_to_s_fbio)))
         goto err;
 
     if (tst >= 6) {
         /* Early data */
         if (!TEST_true(SSL_set_session(cssl, sess))
-                || !TEST_true(SSL_write_early_data(cssl, msg, strlen(msg),
-                                                   &written))
-                || (tst <= 8
-                    && !TEST_int_eq(SSL_read_early_data(sssl, buf,  sizeof(buf),
-                                                &readbytes),
-                                                SSL_READ_EARLY_DATA_SUCCESS)))
+            || !TEST_true(SSL_write_early_data(cssl, msg, strlen(msg),
+                &written))
+            || (tst <= 8
+                && !TEST_int_eq(SSL_read_early_data(sssl, buf, sizeof(buf),
+                                    &readbytes),
+                    SSL_READ_EARLY_DATA_SUCCESS)))
             goto err;
         if (tst <= 8) {
             if (!TEST_int_gt(SSL_connect(cssl), 0))
@@ -357,9 +359,9 @@ static int test_tls13ccs(int tst)
             if (!TEST_int_le(SSL_connect(cssl), 0))
                 goto err;
         }
-        if (!TEST_int_eq(SSL_read_early_data(sssl, buf,  sizeof(buf),
-                                             &readbytes),
-                         SSL_READ_EARLY_DATA_FINISH))
+        if (!TEST_int_eq(SSL_read_early_data(sssl, buf, sizeof(buf),
+                             &readbytes),
+                SSL_READ_EARLY_DATA_FINISH))
             goto err;
     }
 
@@ -378,103 +380,103 @@ static int test_tls13ccs(int tst)
     switch (tst) {
     case 0:
         if (!TEST_true(sccsseen)
-                || !TEST_true(ccsaftersh)
-                || !TEST_false(ccsbeforesh)
-                || !TEST_size_t_gt(chsessidlen, 0))
+            || !TEST_true(ccsaftersh)
+            || !TEST_false(ccsbeforesh)
+            || !TEST_size_t_gt(chsessidlen, 0))
             goto err;
         break;
 
     case 1:
         if (!TEST_true(sccsseen)
-                || !TEST_false(ccsaftersh)
-                || !TEST_false(ccsbeforesh)
-                || !TEST_size_t_eq(chsessidlen, 0))
+            || !TEST_false(ccsaftersh)
+            || !TEST_false(ccsbeforesh)
+            || !TEST_size_t_eq(chsessidlen, 0))
             goto err;
         break;
 
     case 2:
         if (!TEST_false(sccsseen)
-                || !TEST_true(ccsaftersh)
-                || !TEST_false(ccsbeforesh)
-                || !TEST_size_t_gt(chsessidlen, 0))
+            || !TEST_true(ccsaftersh)
+            || !TEST_false(ccsbeforesh)
+            || !TEST_size_t_gt(chsessidlen, 0))
             goto err;
         break;
 
     case 3:
         if (!TEST_true(sccsseen)
-                || !TEST_true(ccsaftersh)
-                || !TEST_false(ccsbeforesh)
-                || !TEST_size_t_gt(chsessidlen, 0))
+            || !TEST_true(ccsaftersh)
+            || !TEST_false(ccsbeforesh)
+            || !TEST_size_t_gt(chsessidlen, 0))
             goto err;
         break;
 
     case 4:
         if (!TEST_true(sccsseen)
-                || !TEST_false(ccsaftersh)
-                || !TEST_false(ccsbeforesh)
-                || !TEST_size_t_eq(chsessidlen, 0))
+            || !TEST_false(ccsaftersh)
+            || !TEST_false(ccsbeforesh)
+            || !TEST_size_t_eq(chsessidlen, 0))
             goto err;
         break;
 
     case 5:
         if (!TEST_false(sccsseen)
-                || !TEST_true(ccsaftersh)
-                || !TEST_false(ccsbeforesh)
-                || !TEST_size_t_gt(chsessidlen, 0))
+            || !TEST_true(ccsaftersh)
+            || !TEST_false(ccsbeforesh)
+            || !TEST_size_t_gt(chsessidlen, 0))
             goto err;
         break;
 
     case 6:
         if (!TEST_true(sccsseen)
-                || !TEST_false(ccsaftersh)
-                || !TEST_true(ccsbeforesh)
-                || !TEST_size_t_gt(chsessidlen, 0))
+            || !TEST_false(ccsaftersh)
+            || !TEST_true(ccsbeforesh)
+            || !TEST_size_t_gt(chsessidlen, 0))
             goto err;
         break;
 
     case 7:
         if (!TEST_true(sccsseen)
-                || !TEST_false(ccsaftersh)
-                || !TEST_false(ccsbeforesh)
-                || !TEST_size_t_eq(chsessidlen, 0))
+            || !TEST_false(ccsaftersh)
+            || !TEST_false(ccsbeforesh)
+            || !TEST_size_t_eq(chsessidlen, 0))
             goto err;
         break;
 
     case 8:
         if (!TEST_false(sccsseen)
-                || !TEST_false(ccsaftersh)
-                || !TEST_true(ccsbeforesh)
-                || !TEST_size_t_gt(chsessidlen, 0))
+            || !TEST_false(ccsaftersh)
+            || !TEST_true(ccsbeforesh)
+            || !TEST_size_t_gt(chsessidlen, 0))
             goto err;
         break;
 
     case 9:
         if (!TEST_true(sccsseen)
-                || !TEST_false(ccsaftersh)
-                || !TEST_true(ccsbeforesh)
-                || !TEST_size_t_gt(chsessidlen, 0))
+            || !TEST_false(ccsaftersh)
+            || !TEST_true(ccsbeforesh)
+            || !TEST_size_t_gt(chsessidlen, 0))
             goto err;
         break;
 
     case 10:
         if (!TEST_true(sccsseen)
-                || !TEST_false(ccsaftersh)
-                || !TEST_false(ccsbeforesh)
-                || !TEST_size_t_eq(chsessidlen, 0))
+            || !TEST_false(ccsaftersh)
+            || !TEST_false(ccsbeforesh)
+            || !TEST_size_t_eq(chsessidlen, 0))
             goto err;
         break;
 
     case 11:
         if (!TEST_false(sccsseen)
-                || !TEST_false(ccsaftersh)
-                || !TEST_true(ccsbeforesh)
-                || !TEST_size_t_gt(chsessidlen, 0))
+            || !TEST_false(ccsaftersh)
+            || !TEST_true(ccsbeforesh)
+            || !TEST_size_t_gt(chsessidlen, 0))
             goto err;
         break;
     }
 
     ret = 1;
- err:
+err:
     SSL_SESSION_free(sess);
     SSL_free(sssl);
     SSL_free(cssl);
@@ -494,7 +496,7 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(cert = test_get_argument(0))
-            || !TEST_ptr(privkey = test_get_argument(1)))
+        || !TEST_ptr(privkey = test_get_argument(1)))
         return 0;
 
     ADD_ALL_TESTS(test_tls13ccs, 12);
diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c
index f1e6490f9f900..b9d386194685a 100644
--- a/test/tls13encryptiontest.c
+++ b/test/tls13encryptiontest.c
@@ -41,11 +41,10 @@ typedef struct {
  * Note 2: These are the vectors for the "Simple 1-RTT Handshake"
  */
 static RECORD_DATA refdata[] = {
-    {
-        /*
-         * Server: EncryptedExtensions, Certificate, CertificateVerify and
-         *         Finished
-         */
+    { /*
+       * Server: EncryptedExtensions, Certificate, CertificateVerify and
+       *         Finished
+       */
         {
             "080000240022000a00140012001d00170018001901000101010201030104001c"
             "00024001000000000b0001b9000001b50001b0308201ac30820115a003020102"
@@ -67,16 +66,14 @@ static RECORD_DATA refdata[] = {
             "f642d733be2eb27484ad8a8c8eb3516a7ac57f2625e2b5c0888a8541f4e734f7"
             "3d054761df1dd02f0e3e9a33cfa10b6e3eb4ebf7ac053b01fdabbddfc54133bc"
             "d24c8bbdceb223b2aa03452a2914000020ac86acbc9cd25a45b57ad5b64db15d"
-            "4405cf8c80e314583ebf3283ef9a99310c16"
-        },
-        {
-            "f10b26d8fcaf67b5b828f712122216a1cd14187465b77637cbcd78539128bb93"
-            "246dcca1af56f1eaa271666077455bc54965d85f05f9bd36d6996171eb536aff"
-            "613eeddc42bad5a2d2227c4606f1215f980e7afaf56bd3b85a51be130003101a"
-            "758d077b1c891d8e7a22947e5a229851fd42a9dd422608f868272abf92b3d43f"
-            "b46ac420259346067f66322fd708885680f4b4433c29116f2dfa529e09bba53c"
-            "7cd920121724809eaddcc84307ef46fc51a0b33d99d39db337fcd761ce0f2b02"
-            "dc73dedb6fddb77c4f8099bde93d5bee08bcf2131f29a2a37ff07949e8f8bcdd",
+            "4405cf8c80e314583ebf3283ef9a99310c16" },
+        { "f10b26d8fcaf67b5b828f712122216a1cd14187465b77637cbcd78539128bb93"
+          "246dcca1af56f1eaa271666077455bc54965d85f05f9bd36d6996171eb536aff"
+          "613eeddc42bad5a2d2227c4606f1215f980e7afaf56bd3b85a51be130003101a"
+          "758d077b1c891d8e7a22947e5a229851fd42a9dd422608f868272abf92b3d43f"
+          "b46ac420259346067f66322fd708885680f4b4433c29116f2dfa529e09bba53c"
+          "7cd920121724809eaddcc84307ef46fc51a0b33d99d39db337fcd761ce0f2b02"
+          "dc73dedb6fddb77c4f8099bde93d5bee08bcf2131f29a2a37ff07949e8f8bcdd",
             "3e8310b8bf8b3444c85aaf0d2aeb2d4f36fd14d5cb51fcebff418b3827136ab9"
             "529e9a3d3f35e4c0ae749ea2dbc94982a1281d3e6daab719aa4460889321a008"
             "bf10fa06ac0c61cc122cc90d5e22c0030c986ae84a33a0c47df174bcfbd50bf7"
@@ -91,28 +88,22 @@ static RECORD_DATA refdata[] = {
             "4058399b8db9075f2dcc8216194e503b6652d87d2cb41f99adfdcc5be5ec7e1e"
             "6326ac22d70bd3ba652827532d669aff005173597f8039c3ea4922d3ec757670"
             "222f6ac29b93e90d7ad3f6dd96328e429cfcfd5cca22707fe2d86ad1dcb0be75"
-            "6e8e"
-        },
+            "6e8e" },
         "c66cb1aec519df44c91e10995511ac8b",
         "f7f6884c4981716c2d0d29a4",
-        "0000000000000000"
-    },
-    {
-        /* Client: Finished */
+        "0000000000000000" },
+    { /* Client: Finished */
         {
             "14000020b9027a0204b972b52cdefa58950fa1580d68c9cb124dbe691a7178f2"
-            "5c554b2316", "", ""
-        },
-        {
-            "9539b4ae2f87fd8e616b295628ea953d9e3858db274970d19813ec136cae7d96"
-            "e0417775fcabd3d8858fdc60240912d218f5afb21c", "", ""
-        },
+            "5c554b2316",
+            "", "" },
+        { "9539b4ae2f87fd8e616b295628ea953d9e3858db274970d19813ec136cae7d96"
+          "e0417775fcabd3d8858fdc60240912d218f5afb21c",
+            "", "" },
         "2679a43e1d76784034ea1797d5ad2649",
         "5482405290dd0d2f81c0d942",
-        "0000000000000000"
-    },
-    {
-        /* Server: NewSessionTicket */
+        "0000000000000000" },
+    { /* Server: NewSessionTicket */
         {
             "040000c90000001e2fd3992f02000000b2ff099f9676cdff8b0bf8825d000000"
             "007905a9d28efeef4a47c6f9b06a0cecdb0070d920b898997c75b79636943ed4"
@@ -120,81 +111,64 @@ static RECORD_DATA refdata[] = {
             "769129b740ce38090842b828c27fd729f59737ba98aa7b42e043c5da28f8dca8"
             "590b2df410d5134fd6c4cacad8b30370602afa35d265bf4d127976bb36dbda6a"
             "626f0270e20eebc73d6fcae2b1a0da122ee9042f76be56ebf41aa469c3d2c9da"
-            "9197d80008002a00040000040016", "", ""
-        },
-        {
-            "3680c2b2109d25caa26c3b06eea9fdc5cb31613ba702176596da2e886bf6af93"
-            "507bd68161ad9cb4780653842e1041ecbf0088a65ac4ef438419dd1d95ddd9bd"
-            "2ad4484e7e167d0e6c008448ae58a0418713b6fc6c51e4bb23a537fb75a74f73"
-            "de31fe6aa0bc522515f8b25f8955428b5de5ac06762cec22b0aa78c94385ef8e"
-            "70fa24945b7c1f268510871689bbbbfaf2e7f4a19277024f95f1143ab12a31ec"
-            "63adb128cb390711fd6d06a498df3e98615d8eb102e23353b480efcca5e8e026"
-            "7a6d0fe2441f14c8c9664aefb2cfff6ae9e0442728b6a0940c1e824fda06",
+            "9197d80008002a00040000040016",
+            "", "" },
+        { "3680c2b2109d25caa26c3b06eea9fdc5cb31613ba702176596da2e886bf6af93"
+          "507bd68161ad9cb4780653842e1041ecbf0088a65ac4ef438419dd1d95ddd9bd"
+          "2ad4484e7e167d0e6c008448ae58a0418713b6fc6c51e4bb23a537fb75a74f73"
+          "de31fe6aa0bc522515f8b25f8955428b5de5ac06762cec22b0aa78c94385ef8e"
+          "70fa24945b7c1f268510871689bbbbfaf2e7f4a19277024f95f1143ab12a31ec"
+          "63adb128cb390711fd6d06a498df3e98615d8eb102e23353b480efcca5e8e026"
+          "7a6d0fe2441f14c8c9664aefb2cfff6ae9e0442728b6a0940c1e824fda06",
             "", ""
 
         },
         "a688ebb5ac826d6f42d45c0cc44b9b7d",
         "c1cad4425a438b5de714830a",
-        "0000000000000000"
-    },
-    {
-        /* Client: Application Data */
+        "0000000000000000" },
+    { /* Client: Application Data */
         {
             "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"
-            "202122232425262728292a2b2c2d2e2f303117", "", ""
-        },
-        {
-            "8c3497da00ae023e53c01b4324b665404c1b49e78fe2bf4d17f6348ae8340551"
-            "e363a0cd05f2179c4fef5ad689b5cae0bae94adc63632e571fb79aa91544c639"
-            "4d28a1", "", ""
+            "202122232425262728292a2b2c2d2e2f303117",
+            "", "" },
+        { "8c3497da00ae023e53c01b4324b665404c1b49e78fe2bf4d17f6348ae8340551"
+          "e363a0cd05f2179c4fef5ad689b5cae0bae94adc63632e571fb79aa91544c639"
+          "4d28a1",
+            "", ""
 
         },
         "88b96ad686c84be55ace18a59cce5c87",
         "b99dc58cd5ff5ab082fdad19",
-        "0000000000000000"
-    },
+        "0000000000000000" },
 
-
-    {
-        /* Server: Application Data */
+    { /* Server: Application Data */
         {
             "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f"
-            "202122232425262728292a2b2c2d2e2f303117", "", ""
-        },
-        {
-            "f65f49fd2df6cd2347c3d30166e3cfddb6308a5906c076112c6a37ff1dbd406b"
-            "5813c0abd734883017a6b2833186b13c14da5d75f33d8760789994e27d82043a"
-            "b88d65", "", ""
-        },
+            "202122232425262728292a2b2c2d2e2f303117",
+            "", "" },
+        { "f65f49fd2df6cd2347c3d30166e3cfddb6308a5906c076112c6a37ff1dbd406b"
+          "5813c0abd734883017a6b2833186b13c14da5d75f33d8760789994e27d82043a"
+          "b88d65",
+            "", "" },
         "a688ebb5ac826d6f42d45c0cc44b9b7d",
         "c1cad4425a438b5de714830a",
-        "0000000000000001"
-    },
-    {
-        /* Client: CloseNotify */
-        {
-            "010015", "", ""
-        },
+        "0000000000000001" },
+    { /* Client: CloseNotify */
         {
-            "2c2148163d7938a35f6acf2a6606f8cbd1d9f2", "", ""
-        },
+            "010015", "", "" },
+        { "2c2148163d7938a35f6acf2a6606f8cbd1d9f2", "", "" },
         "88b96ad686c84be55ace18a59cce5c87",
         "b99dc58cd5ff5ab082fdad19",
-        "0000000000000001"
-    },
-    {
-        /* Server: CloseNotify */
+        "0000000000000001" },
+    { /* Server: CloseNotify */
         {
-            "010015", "", ""
-        },
-        {
-            "f8141ebdb5eda511e0bce639a56ff9ea825a21", "", ""
+            "010015", "", "" },
+        { "f8141ebdb5eda511e0bce639a56ff9ea825a21", "", ""
 
         },
         "a688ebb5ac826d6f42d45c0cc44b9b7d",
         "c1cad4425a438b5de714830a",
-        "0000000000000002"
-    }
+        "0000000000000002" }
 };
 
 /*
@@ -239,8 +213,8 @@ static unsigned char *multihexstr2buf(const char *str[3], size_t *len)
 }
 
 static int load_record(TLS_RL_RECORD *rec, RECORD_DATA *recd,
-                       unsigned char **key, unsigned char *iv, size_t ivlen,
-                       unsigned char *seq)
+    unsigned char **key, unsigned char *iv, size_t ivlen,
+    unsigned char *seq)
 {
     unsigned char *pt = NULL, *sq = NULL, *ivtmp = NULL;
     size_t ptlen;
@@ -267,7 +241,7 @@ static int load_record(TLS_RL_RECORD *rec, RECORD_DATA *recd,
     OPENSSL_free(ivtmp);
 
     return 1;
- err:
+err:
     OPENSSL_free(*key);
     *key = NULL;
     OPENSSL_free(ivtmp);
@@ -297,12 +271,12 @@ static int test_record(TLS_RL_RECORD *rec, RECORD_DATA *recd, int enc)
 
     ret = 1;
 
- err:
+err:
     OPENSSL_free(refd);
     return ret;
 }
 
-#define TLS13_AES_128_GCM_SHA256_BYTES  ((const unsigned char *)"\x13\x01")
+#define TLS13_AES_128_GCM_SHA256_BYTES ((const unsigned char *)"\x13\x01")
 
 static int test_tls13_encryption(void)
 {
@@ -333,13 +307,13 @@ static int test_tls13_encryption(void)
 
         /* Set up the write record layer */
         if (!TEST_true(ossl_tls_record_method.new_record_layer(
-                          NULL, NULL, TLS1_3_VERSION, OSSL_RECORD_ROLE_SERVER,
-                          OSSL_RECORD_DIRECTION_WRITE,
-                          OSSL_RECORD_PROTECTION_LEVEL_APPLICATION, 0, NULL, 0,
-                          key, 16, iv, ivlen, NULL, 0, EVP_aes_128_gcm(),
-                          EVP_GCM_TLS_TAG_LEN, 0, NULL, NULL, NULL, NULL, NULL,
-                          NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                          &wrl)))
+                NULL, NULL, TLS1_3_VERSION, OSSL_RECORD_ROLE_SERVER,
+                OSSL_RECORD_DIRECTION_WRITE,
+                OSSL_RECORD_PROTECTION_LEVEL_APPLICATION, 0, NULL, 0,
+                key, 16, iv, ivlen, NULL, 0, EVP_aes_128_gcm(),
+                EVP_GCM_TLS_TAG_LEN, 0, NULL, NULL, NULL, NULL, NULL,
+                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                &wrl)))
             goto err;
         memcpy(wrl->sequence, seqbuf, sizeof(seqbuf));
 
@@ -356,13 +330,13 @@ static int test_tls13_encryption(void)
 
         /* Set up the read record layer */
         if (!TEST_true(ossl_tls_record_method.new_record_layer(
-                          NULL, NULL, TLS1_3_VERSION, OSSL_RECORD_ROLE_SERVER,
-                          OSSL_RECORD_DIRECTION_READ,
-                          OSSL_RECORD_PROTECTION_LEVEL_APPLICATION, 0, NULL, 0,
-                          key, 16, iv, ivlen, NULL, 0, EVP_aes_128_gcm(),
-                          EVP_GCM_TLS_TAG_LEN, 0, NULL, NULL, NULL, NULL, NULL,
-                          NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-                          &rrl)))
+                NULL, NULL, TLS1_3_VERSION, OSSL_RECORD_ROLE_SERVER,
+                OSSL_RECORD_DIRECTION_READ,
+                OSSL_RECORD_PROTECTION_LEVEL_APPLICATION, 0, NULL, 0,
+                key, 16, iv, ivlen, NULL, 0, EVP_aes_128_gcm(),
+                EVP_GCM_TLS_TAG_LEN, 0, NULL, NULL, NULL, NULL, NULL,
+                NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+                &rrl)))
             goto err;
         memcpy(rrl->sequence, seqbuf, sizeof(seqbuf));
 
@@ -389,7 +363,7 @@ static int test_tls13_encryption(void)
     TEST_note("PASS: %zu records tested", ctr);
     ret = 1;
 
- err:
+err:
     ossl_tls_record_method.free(rrl);
     ossl_tls_record_method.free(wrl);
     OPENSSL_free(rec.data);
diff --git a/test/tls13groupselection_test.c b/test/tls13groupselection_test.c
index 01d1eded5f87c..8340a9fd2b3b6 100644
--- a/test/tls13groupselection_test.c
+++ b/test/tls13groupselection_test.c
@@ -11,10 +11,12 @@
 #include "helpers/ssltestlib.h"
 #include <openssl/objects.h>
 
-#define TEST_true_or_end(a) if (!TEST_true(a)) \
+#define TEST_true_or_end(a) \
+    if (!TEST_true(a))      \
         goto end;
 
-#define TEST_false_or_end(a) if (!TEST_false(a)) \
+#define TEST_false_or_end(a) \
+    if (!TEST_false(a))      \
         goto end;
 
 #define SERVER_PREFERENCE 1
@@ -33,9 +35,9 @@ typedef enum TEST_TYPE {
 } TEST_TYPE;
 
 typedef enum SERVER_RESPONSE {
-    HRR  = 0,
+    HRR = 0,
     INIT = 1,
-    SH   = 2
+    SH = 2
 } SERVER_RESPONSE;
 
 static char *cert = NULL;
@@ -49,317 +51,283 @@ struct tls13groupselection_test_st {
     const enum SERVER_RESPONSE expected_server_response;
 };
 
-static const struct tls13groupselection_test_st tls13groupselection_tests[] =
-    {
+static const struct tls13groupselection_test_st tls13groupselection_tests[] = {
 
-        /*
-         * (A) Test with no explicit key share (backward compatibility)
-         * Key share is implicitly sent for first client group
-         * Test (implicitly) that the key share group is used
-         */
-        { "secp384r1:secp521r1:X25519:prime256v1:X448", /* test 0 */
-          "X25519:secp521r1:secp384r1:prime256v1:X448",
-          CLIENT_PREFERENCE,
-          "secp384r1", SH
-        },
-        { "secp521r1:secp384r1:X25519:prime256v1:X448", /* test 1 */
-          "X25519:secp521r1:secp384r1:prime256v1:X448",
-          SERVER_PREFERENCE,
-          "secp521r1", SH
-        },
+    /*
+     * (A) Test with no explicit key share (backward compatibility)
+     * Key share is implicitly sent for first client group
+     * Test (implicitly) that the key share group is used
+     */
+    { "secp384r1:secp521r1:X25519:prime256v1:X448", /* test 0 */
+        "X25519:secp521r1:secp384r1:prime256v1:X448",
+        CLIENT_PREFERENCE,
+        "secp384r1", SH },
+    { "secp521r1:secp384r1:X25519:prime256v1:X448", /* test 1 */
+        "X25519:secp521r1:secp384r1:prime256v1:X448",
+        SERVER_PREFERENCE,
+        "secp521r1", SH },
 
-        /*
-         * (B) No explicit key share test (backward compatibility)
-         * Key share is implicitly sent for first client group
-         * Check HRR if server does not support key share group
-         */
-        { "secp521r1:secp384r1:X25519:prime256v1:X448", /* test 2 */
-          "X25519:secp384r1:prime256v1",
-          CLIENT_PREFERENCE,
-          "secp384r1", HRR
-        },
-        { "secp521r1:secp384r1:X25519:prime256v1:X448", /* test 3 */
-          "X25519:secp384r1:prime256v1",
-          SERVER_PREFERENCE,
-          "x25519", HRR
-        },
+    /*
+     * (B) No explicit key share test (backward compatibility)
+     * Key share is implicitly sent for first client group
+     * Check HRR if server does not support key share group
+     */
+    { "secp521r1:secp384r1:X25519:prime256v1:X448", /* test 2 */
+        "X25519:secp384r1:prime256v1",
+        CLIENT_PREFERENCE,
+        "secp384r1", HRR },
+    { "secp521r1:secp384r1:X25519:prime256v1:X448", /* test 3 */
+        "X25519:secp384r1:prime256v1",
+        SERVER_PREFERENCE,
+        "x25519", HRR },
 
-        /*
-         * (C) Explicit key shares, SH tests
-         * Test key share selection as function of client-/server-preference
-         * Test (implicitly) that multiple key shares are generated
-         * Test (implicitly) that multiple tuples don't influence the client
-         * Test (implicitly) that key share prefix doesn't influence the server
-         */
-        { "secp521r1:secp384r1:*X25519/*prime256v1:X448", /* test 4 */
-          "secp521r1:*prime256v1:X25519:X448",
-          CLIENT_PREFERENCE,
-          "x25519", SH
-        },
-        { "secp521r1:secp384r1:*X25519/*prime256v1:X448", /* test 5 */
-          "secp521r1:*prime256v1:X25519:X448",
-          SERVER_PREFERENCE,
-          "secp256r1", SH
-        },
+    /*
+     * (C) Explicit key shares, SH tests
+     * Test key share selection as function of client-/server-preference
+     * Test (implicitly) that multiple key shares are generated
+     * Test (implicitly) that multiple tuples don't influence the client
+     * Test (implicitly) that key share prefix doesn't influence the server
+     */
+    { "secp521r1:secp384r1:*X25519/*prime256v1:X448", /* test 4 */
+        "secp521r1:*prime256v1:X25519:X448",
+        CLIENT_PREFERENCE,
+        "x25519", SH },
+    { "secp521r1:secp384r1:*X25519/*prime256v1:X448", /* test 5 */
+        "secp521r1:*prime256v1:X25519:X448",
+        SERVER_PREFERENCE,
+        "secp256r1", SH },
 
-        /*
-         * (D) Explicit key shares, HRR tests
-         * Check that HRR is issued if group in first tuple
-         * is supported but no key share is available for the tuple
-         */
-        { "secp521r1:secp384r1:*X25519:prime256v1:*X448", /* test 6 */
-          "secp384r1:secp521r1:prime256v1/X25519:X448",
-          CLIENT_PREFERENCE,
-          "secp521r1", HRR
-        },
-        { "secp521r1:secp384r1:*X25519:prime256v1:*X448", /* test 7 */
-          "secp384r1:secp521r1:prime256v1/X25519:X448",
-          SERVER_PREFERENCE,
-          "secp384r1", HRR
-        },
+    /*
+     * (D) Explicit key shares, HRR tests
+     * Check that HRR is issued if group in first tuple
+     * is supported but no key share is available for the tuple
+     */
+    { "secp521r1:secp384r1:*X25519:prime256v1:*X448", /* test 6 */
+        "secp384r1:secp521r1:prime256v1/X25519:X448",
+        CLIENT_PREFERENCE,
+        "secp521r1", HRR },
+    { "secp521r1:secp384r1:*X25519:prime256v1:*X448", /* test 7 */
+        "secp384r1:secp521r1:prime256v1/X25519:X448",
+        SERVER_PREFERENCE,
+        "secp384r1", HRR },
 
-        /*
-         * (E) Multiple tuples tests, client without tuple delimiters
-         * Check that second tuple is evaluated if there isn't any match
-         * first tuple
-         */
-        { "*X25519:prime256v1:*X448", /* test 8 */
-          "secp521r1:secp384r1/X448:X25519",
-          CLIENT_PREFERENCE,
-          "x25519", SH
-        },
-        { "*X25519:prime256v1:*X448", /* test 9 */
-          "secp521r1:secp384r1/X448:X25519",
-          SERVER_PREFERENCE,
-          "x448", SH
-        },
-
-        /* (F) Check that '?' will ignore unknown group but use known group */
-        { "*X25519:?unknown_group_123:prime256v1:*X448", /* test 10 */
-          "secp521r1:secp384r1/X448:?unknown_group_456:?X25519",
-          CLIENT_PREFERENCE,
-          "x25519", SH
-        },
-        { "*X25519:prime256v1:*X448:?*unknown_group_789", /* test 11 */
-          "secp521r1:secp384r1/?X448:?unknown_group_456:X25519",
-          SERVER_PREFERENCE,
-          "x448", SH
-        },
+    /*
+     * (E) Multiple tuples tests, client without tuple delimiters
+     * Check that second tuple is evaluated if there isn't any match
+     * first tuple
+     */
+    { "*X25519:prime256v1:*X448", /* test 8 */
+        "secp521r1:secp384r1/X448:X25519",
+        CLIENT_PREFERENCE,
+        "x25519", SH },
+    { "*X25519:prime256v1:*X448", /* test 9 */
+        "secp521r1:secp384r1/X448:X25519",
+        SERVER_PREFERENCE,
+        "x448", SH },
+
+    /* (F) Check that '?' will ignore unknown group but use known group */
+    { "*X25519:?unknown_group_123:prime256v1:*X448", /* test 10 */
+        "secp521r1:secp384r1/X448:?unknown_group_456:?X25519",
+        CLIENT_PREFERENCE,
+        "x25519", SH },
+    { "*X25519:prime256v1:*X448:?*unknown_group_789", /* test 11 */
+        "secp521r1:secp384r1/?X448:?unknown_group_456:X25519",
+        SERVER_PREFERENCE,
+        "x448", SH },
 
-        /*
-         * (G) Check full backward compatibility (= don't explicitly set any groups)
-         */
-        { NULL, /* test 12 */
-          NULL,
-          CLIENT_PREFERENCE,
+    /*
+     * (G) Check full backward compatibility (= don't explicitly set any groups)
+     */
+    { NULL, /* test 12 */
+        NULL,
+        CLIENT_PREFERENCE,
 #ifndef OPENSSL_NO_ML_KEM
-          "X25519MLKEM768", SH
+        "X25519MLKEM768", SH
 #else
-          "x25519", SH
+        "x25519", SH
 #endif
-        },
-        { NULL, /* test 13 */
-          NULL,
-          SERVER_PREFERENCE,
+    },
+    { NULL, /* test 13 */
+        NULL,
+        SERVER_PREFERENCE,
 #ifndef OPENSSL_NO_ML_KEM
-          "X25519MLKEM768", SH
+        "X25519MLKEM768", SH
 #else
-          "x25519", SH
+        "x25519", SH
 #endif
-        },
+    },
 
-        /*
-         * (H) Check that removal of group is 'active'
-         */
-        { "*X25519:*X448", /* test 14 */
-          "secp521r1:X25519:prime256v1:-X25519:secp384r1/X448",
-          CLIENT_PREFERENCE,
-          "x448", SH
-        },
-        { "*X25519:*X448", /* test 15 */
-          "secp521r1:X25519:prime256v1:-X25519:secp384r1/X448",
-          SERVER_PREFERENCE,
-          "x448", SH
-        },
-        { "*X25519:prime256v1:*X448", /* test 16 */
-          "X25519:prime256v1/X448:-X25519",
-          CLIENT_PREFERENCE,
-          "secp256r1", HRR
-        },
-        { "*X25519:prime256v1:*X448", /* test 17 */
-          "X25519:prime256v1/X448:-X25519",
-          SERVER_PREFERENCE,
-          "secp256r1", HRR
-        },
-        /*
-         * (I) Check handling of the "DEFAULT" 'pseudo group name'
-         */
-        { "*X25519:DEFAULT:-prime256v1:-X448", /* test 18 */
-          "DEFAULT:-X25519:-?X25519MLKEM768",
-          CLIENT_PREFERENCE,
-          "secp384r1", HRR
-        },
-        { "*X25519:DEFAULT:-prime256v1:-X448", /* test 19 */
-          "DEFAULT:-X25519:-?X25519MLKEM768",
-          SERVER_PREFERENCE,
-          "secp384r1", HRR
-        },
-        /*
-         * (J) Deduplication check
-         */
-        { "secp521r1:X25519:prime256v1/X25519:prime256v1/X448", /* test 20 */
-          "secp521r1:X25519:prime256v1/X25519:prime256v1/X448",
-          CLIENT_PREFERENCE,
-          "secp521r1", SH
-        },
-        { "secp521r1:X25519:prime256v1/X25519:prime256v1/X448", /* test 21 */
-          "secp521r1:X25519:prime256v1/X25519:prime256v1/X448",
-          SERVER_PREFERENCE,
-          "secp521r1", SH
-        },
-        /*
-         * (K) Check group removal when first entry requested a keyshare
-         */
-        { "*X25519:*prime256v1:-X25519", /* test 22 */
-          "X25519:prime256v1",
-          CLIENT_PREFERENCE,
-          "secp256r1", SH
-        },
-        /*
-         * (L) Syntax errors
-         */
-        { "*X25519:*prime256v1:NOTVALID", /* test 23 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "X25519//prime256v1", /* test 24 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "**X25519:*prime256v1", /* test 25 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "*X25519:*secp256r1:*X448:*secp521r1:*secp384r1", /* test 26 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "*X25519:*secp256r1:?:*secp521r1", /* test 27 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "*X25519:*secp256r1::secp521r1", /* test 28 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { ":*secp256r1:secp521r1", /* test 29 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "*secp256r1:secp521r1:", /* test 30 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "/secp256r1/secp521r1", /* test 31 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "secp256r1/secp521r1/", /* test 32 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "X25519:??secp256r1:X448", /* test 33 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "X25519:secp256r1:**X448", /* test 34 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "--X25519:secp256r1:X448", /* test 35 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "-DEFAULT",  /* test 36 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        { "?DEFAULT",  /* test 37 */
-          "",
-          CLIENT_PREFERENCE,
-          SYNTAX_FAILURE
-        },
-        /*
-         * Negotiation Failures
-         * No overlapping groups between client and server
-         */
-        /* test 38 remove all groups */
-        { "X25519:secp256r1:X448:secp521r1:-X448:-secp256r1:-X25519:-secp521r1",
-          "",
-          CLIENT_PREFERENCE,
-          NEGOTIATION_FAILURE
-        },
-        { "secp384r1:secp521r1:X25519", /* test 39 */
-          "prime256v1:X448",
-          CLIENT_PREFERENCE,
-          NEGOTIATION_FAILURE
-        },
-        { "secp521r1:secp384r1:X25519", /* test 40 */
-          "prime256v1:X448",
-          SERVER_PREFERENCE,
-          NEGOTIATION_FAILURE
-        },
-        /*
-         * These are allowed
-         * "X25519/prime256v1:-X448", "X25519:-*X25519:*prime256v1, "*DEFAULT"
-         */
-        /*
-         * Tests to show that spaces between tuples are allowed
-         */
-        { "secp521r1:X25519 / prime256v1/X25519 / prime256v1/X448", /* test 41 */
-          "secp521r1:X25519 / prime256v1/X25519 / prime256v1/X448",
-          CLIENT_PREFERENCE,
-          "secp521r1", SH
-        },
-        { "secp521r1 / prime256v1:X25519 / prime256v1/X448", /* test 42 */
-          "secp521r1 / prime256v1:X25519 / prime256v1/X448",
-          SERVER_PREFERENCE,
-          "secp521r1", SH
-        },
-    };
+    /*
+     * (H) Check that removal of group is 'active'
+     */
+    { "*X25519:*X448", /* test 14 */
+        "secp521r1:X25519:prime256v1:-X25519:secp384r1/X448",
+        CLIENT_PREFERENCE,
+        "x448", SH },
+    { "*X25519:*X448", /* test 15 */
+        "secp521r1:X25519:prime256v1:-X25519:secp384r1/X448",
+        SERVER_PREFERENCE,
+        "x448", SH },
+    { "*X25519:prime256v1:*X448", /* test 16 */
+        "X25519:prime256v1/X448:-X25519",
+        CLIENT_PREFERENCE,
+        "secp256r1", HRR },
+    { "*X25519:prime256v1:*X448", /* test 17 */
+        "X25519:prime256v1/X448:-X25519",
+        SERVER_PREFERENCE,
+        "secp256r1", HRR },
+    /*
+     * (I) Check handling of the "DEFAULT" 'pseudo group name'
+     */
+    { "*X25519:DEFAULT:-prime256v1:-X448", /* test 18 */
+        "DEFAULT:-X25519:-?X25519MLKEM768",
+        CLIENT_PREFERENCE,
+        "secp384r1", HRR },
+    { "*X25519:DEFAULT:-prime256v1:-X448", /* test 19 */
+        "DEFAULT:-X25519:-?X25519MLKEM768",
+        SERVER_PREFERENCE,
+        "secp384r1", HRR },
+    /*
+     * (J) Deduplication check
+     */
+    { "secp521r1:X25519:prime256v1/X25519:prime256v1/X448", /* test 20 */
+        "secp521r1:X25519:prime256v1/X25519:prime256v1/X448",
+        CLIENT_PREFERENCE,
+        "secp521r1", SH },
+    { "secp521r1:X25519:prime256v1/X25519:prime256v1/X448", /* test 21 */
+        "secp521r1:X25519:prime256v1/X25519:prime256v1/X448",
+        SERVER_PREFERENCE,
+        "secp521r1", SH },
+    /*
+     * (K) Check group removal when first entry requested a keyshare
+     */
+    { "*X25519:*prime256v1:-X25519", /* test 22 */
+        "X25519:prime256v1",
+        CLIENT_PREFERENCE,
+        "secp256r1", SH },
+    /*
+     * (L) Syntax errors
+     */
+    { "*X25519:*prime256v1:NOTVALID", /* test 23 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "X25519//prime256v1", /* test 24 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "**X25519:*prime256v1", /* test 25 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "*X25519:*secp256r1:*X448:*secp521r1:*secp384r1", /* test 26 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "*X25519:*secp256r1:?:*secp521r1", /* test 27 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "*X25519:*secp256r1::secp521r1", /* test 28 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { ":*secp256r1:secp521r1", /* test 29 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "*secp256r1:secp521r1:", /* test 30 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "/secp256r1/secp521r1", /* test 31 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "secp256r1/secp521r1/", /* test 32 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "X25519:??secp256r1:X448", /* test 33 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "X25519:secp256r1:**X448", /* test 34 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "--X25519:secp256r1:X448", /* test 35 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "-DEFAULT", /* test 36 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    { "?DEFAULT", /* test 37 */
+        "",
+        CLIENT_PREFERENCE,
+        SYNTAX_FAILURE },
+    /*
+     * Negotiation Failures
+     * No overlapping groups between client and server
+     */
+    /* test 38 remove all groups */
+    { "X25519:secp256r1:X448:secp521r1:-X448:-secp256r1:-X25519:-secp521r1",
+        "",
+        CLIENT_PREFERENCE,
+        NEGOTIATION_FAILURE, INIT },
+    { "secp384r1:secp521r1:X25519", /* test 39 */
+        "prime256v1:X448",
+        CLIENT_PREFERENCE,
+        NEGOTIATION_FAILURE, INIT },
+    { "secp521r1:secp384r1:X25519", /* test 40 */
+        "prime256v1:X448",
+        SERVER_PREFERENCE,
+        NEGOTIATION_FAILURE, INIT },
+    /*
+     * These are allowed
+     * "X25519/prime256v1:-X448", "X25519:-*X25519:*prime256v1, "*DEFAULT"
+     */
+    /*
+     * Tests to show that spaces between tuples are allowed
+     */
+    { "secp521r1:X25519 / prime256v1/X25519 / prime256v1/X448", /* test 41 */
+        "secp521r1:X25519 / prime256v1/X25519 / prime256v1/X448",
+        CLIENT_PREFERENCE,
+        "secp521r1", SH },
+    { "secp521r1 / prime256v1:X25519 / prime256v1/X448", /* test 42 */
+        "secp521r1 / prime256v1:X25519 / prime256v1/X448",
+        SERVER_PREFERENCE,
+        "secp521r1", SH },
+    /*
+     * Not a syntax error, but invalid because brainpoolP256r1 is the only
+     * key share and is not valid in TLSv1.3
+     */
+    { "*brainpoolP256r1:X25519", /* test 43 */
+        "X25519",
+        SERVER_PREFERENCE,
+        NEGOTIATION_FAILURE, INIT }
+};
 
 static void server_response_check_cb(int write_p, int version,
-                                     int content_type, const void *buf,
-                                     size_t len, SSL *ssl, void *arg)
+    int content_type, const void *buf,
+    size_t len, SSL *ssl, void *arg)
 {
     /* Cast arg to SERVER_RESPONSE */
     enum SERVER_RESPONSE *server_response = (enum SERVER_RESPONSE *)arg;
     /* Prepare check for HRR */
     const uint8_t *incoming_random = (uint8_t *)buf + 6;
     const uint8_t magic_HRR_random[32] = { 0xCF, 0x21, 0xAD, 0x74, 0xE5, 0x9A, 0x61, 0x11,
-                                           0xBE, 0x1D, 0x8C, 0x02, 0x1E, 0x65, 0xB8, 0x91,
-                                           0xC2, 0xA2, 0x11, 0x16, 0x7A, 0xBB, 0x8C, 0x5E,
-                                           0x07, 0x9E, 0x09, 0xE2, 0xC8, 0xA8, 0x33, 0x9C };
+        0xBE, 0x1D, 0x8C, 0x02, 0x1E, 0x65, 0xB8, 0x91,
+        0xC2, 0xA2, 0x11, 0x16, 0x7A, 0xBB, 0x8C, 0x5E,
+        0x07, 0x9E, 0x09, 0xE2, 0xC8, 0xA8, 0x33, 0x9C };
 
     /* Did a server hello arrive? */
-    if (write_p == 0 &&                                /* Incoming data... */
-        content_type == SSL3_RT_HANDSHAKE &&           /* carrying a handshake record type ... */
-        version == TLS1_3_VERSION &&                   /* for TLSv1.3 ... */
-        ((uint8_t *)buf)[0] == SSL3_MT_SERVER_HELLO) {  /* with message type "ServerHello" */
+    if (write_p == 0 && /* Incoming data... */
+        content_type == SSL3_RT_HANDSHAKE && /* carrying a handshake record type ... */
+        version == TLS1_3_VERSION && /* for TLSv1.3 ... */
+        ((uint8_t *)buf)[0] == SSL3_MT_SERVER_HELLO) { /* with message type "ServerHello" */
         /* Check what it is: SH or HRR (compare the 'random' data field with HRR magic number) */
         if (memcmp((void *)incoming_random, (void *)magic_HRR_random, 32) == 0)
             *server_response *= HRR;
@@ -369,7 +337,7 @@ static void server_response_check_cb(int write_p, int version,
 }
 
 static int test_invalidsyntax(const struct tls13groupselection_test_st *current_test_vector,
-                              int ssl_or_ctx)
+    int ssl_or_ctx)
 {
     int ok = 0;
     SSL_CTX *client_ctx = NULL, *server_ctx = NULL;
@@ -381,19 +349,19 @@ static int test_invalidsyntax(const struct tls13groupselection_test_st *current_
 
     /* Creation of the contexts */
     TEST_true_or_end(create_ssl_ctx_pair(NULL, TLS_server_method(),
-                                         TLS_client_method(),
-                                         TLS1_VERSION, 0,
-                                         &server_ctx, &client_ctx,
-                                         cert, privkey));
+        TLS_client_method(),
+        TLS1_VERSION, 0,
+        &server_ctx, &client_ctx,
+        cert, privkey));
 
     /* Customization of the contexts */
     if (ssl_or_ctx == WORK_ON_CONTEXT)
         TEST_false_or_end(SSL_CTX_set1_groups_list(client_ctx,
-                                                   current_test_vector->client_groups));
+            current_test_vector->client_groups));
     /* Creation of the SSL objects */
     TEST_true_or_end(create_ssl_objects(server_ctx, client_ctx,
-                                        &serverssl, &clientssl,
-                                        NULL, NULL));
+        &serverssl, &clientssl,
+        NULL, NULL));
 
     /* Customization of the SSL objects */
     if (ssl_or_ctx == WORK_ON_SSL_OBJECT)
@@ -407,11 +375,10 @@ static int test_invalidsyntax(const struct tls13groupselection_test_st *current_
     SSL_CTX_free(server_ctx);
     SSL_CTX_free(client_ctx);
     return ok;
-
 }
 
 static int test_groupnegotiation(const struct tls13groupselection_test_st *current_test_vector,
-                                 int ssl_or_ctx, TEST_TYPE test_type)
+    int ssl_or_ctx, TEST_TYPE test_type)
 {
     int ok = 0;
     int negotiated_group_client = 0;
@@ -423,20 +390,20 @@ static int test_groupnegotiation(const struct tls13groupselection_test_st *curre
 
     /* Creation of the contexts */
     TEST_true_or_end(create_ssl_ctx_pair(NULL, TLS_server_method(),
-                                         TLS_client_method(),
-                                         TLS1_VERSION, 0,
-                                         &server_ctx, &client_ctx,
-                                         cert, privkey));
+        TLS_client_method(),
+        TLS1_VERSION, 0,
+        &server_ctx, &client_ctx,
+        cert, privkey));
 
     /* Customization of the contexts */
     if (ssl_or_ctx == WORK_ON_CONTEXT) {
         if (current_test_vector->client_groups != NULL) {
             TEST_true_or_end(SSL_CTX_set1_groups_list(client_ctx,
-                                                      current_test_vector->client_groups));
+                current_test_vector->client_groups));
         }
         if (current_test_vector->server_groups != NULL) {
             TEST_true_or_end(SSL_CTX_set1_groups_list(server_ctx,
-                                                      current_test_vector->server_groups));
+                current_test_vector->server_groups));
         }
         TEST_true_or_end(SSL_CTX_set_min_proto_version(client_ctx, TLS1_3_VERSION));
         TEST_true_or_end(SSL_CTX_set_min_proto_version(server_ctx, TLS1_3_VERSION));
@@ -445,8 +412,8 @@ static int test_groupnegotiation(const struct tls13groupselection_test_st *curre
     }
     /* Creation of the SSL objects */
     if (!TEST_true(create_ssl_objects(server_ctx, client_ctx,
-                                      &serverssl, &clientssl,
-                                      NULL, NULL)))
+            &serverssl, &clientssl,
+            NULL, NULL)))
         goto end;
 
     /* Customization of the SSL objects */
@@ -489,6 +456,8 @@ static int test_groupnegotiation(const struct tls13groupselection_test_st *curre
             ok = 1;
     } else {
         TEST_false_or_end(create_ssl_connection(serverssl, clientssl, SSL_ERROR_NONE));
+        if (test_type == TEST_NEGOTIATION_FAILURE && !TEST_int_eq((int)current_test_vector->expected_server_response, (int)server_response))
+            goto end;
         ok = 1;
     }
 
@@ -514,18 +483,20 @@ static int tls13groupselection_test(int i)
     TEST_info("==> Running TLSv1.3 test %d", i);
 
     if (strncmp(tls13groupselection_tests[i].expected_group,
-                SYNTAX_FAILURE, sizeof(SYNTAX_FAILURE)) == 0)
+            SYNTAX_FAILURE, sizeof(SYNTAX_FAILURE))
+        == 0)
         test_type = TEST_SYNTAX_FAILURE;
     else if (strncmp(tls13groupselection_tests[i].expected_group,
-                     NEGOTIATION_FAILURE, sizeof(NEGOTIATION_FAILURE)) == 0)
+                 NEGOTIATION_FAILURE, sizeof(NEGOTIATION_FAILURE))
+        == 0)
         test_type = TEST_NEGOTIATION_FAILURE;
 
     if (test_type == TEST_SYNTAX_FAILURE)
         res = test_invalidsyntax(&tls13groupselection_tests[i],
-                                 WORK_ON_SSL_OBJECT);
+            WORK_ON_SSL_OBJECT);
     else
         res = test_groupnegotiation(&tls13groupselection_tests[i],
-                                    WORK_ON_SSL_OBJECT, test_type);
+            WORK_ON_SSL_OBJECT, test_type);
 
     if (!res)
         TEST_error("====> [ERROR] TLSv1.3 test %d with WORK_ON_SSL_OBJECT failed", i);
@@ -533,10 +504,10 @@ static int tls13groupselection_test(int i)
 
     if (test_type == TEST_SYNTAX_FAILURE)
         res = test_invalidsyntax(&tls13groupselection_tests[i],
-                                 WORK_ON_CONTEXT);
+            WORK_ON_CONTEXT);
     else
         res = test_groupnegotiation(&tls13groupselection_tests[i],
-                                    WORK_ON_CONTEXT, test_type);
+            WORK_ON_CONTEXT, test_type);
 
     if (!res)
         TEST_error("====> [ERROR] TLSv1.3 test %d with WORK_ON_CONTEXT failed", i);
diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c
index 0b2c057a69f85..d5622f7cdfe6a 100644
--- a/test/tls13secretstest.c
+++ b/test/tls13secretstest.c
@@ -14,8 +14,8 @@
 #include "internal/ssl_unwrap.h"
 #include "testutil.h"
 
-#define IVLEN   12
-#define KEYLEN  16
+#define IVLEN 12
+#define KEYLEN 16
 
 /*
  * Based on the test vectors available in:
@@ -23,107 +23,107 @@
  */
 
 static unsigned char hs_start_hash[] = {
-0xc6, 0xc9, 0x18, 0xad, 0x2f, 0x41, 0x99, 0xd5, 0x59, 0x8e, 0xaf, 0x01, 0x16,
-0xcb, 0x7a, 0x5c, 0x2c, 0x14, 0xcb, 0x54, 0x78, 0x12, 0x18, 0x88, 0x8d, 0xb7,
-0x03, 0x0d, 0xd5, 0x0d, 0x5e, 0x6d
+    0xc6, 0xc9, 0x18, 0xad, 0x2f, 0x41, 0x99, 0xd5, 0x59, 0x8e, 0xaf, 0x01, 0x16,
+    0xcb, 0x7a, 0x5c, 0x2c, 0x14, 0xcb, 0x54, 0x78, 0x12, 0x18, 0x88, 0x8d, 0xb7,
+    0x03, 0x0d, 0xd5, 0x0d, 0x5e, 0x6d
 };
 
 static unsigned char hs_full_hash[] = {
-0xf8, 0xc1, 0x9e, 0x8c, 0x77, 0xc0, 0x38, 0x79, 0xbb, 0xc8, 0xeb, 0x6d, 0x56,
-0xe0, 0x0d, 0xd5, 0xd8, 0x6e, 0xf5, 0x59, 0x27, 0xee, 0xfc, 0x08, 0xe1, 0xb0,
-0x02, 0xb6, 0xec, 0xe0, 0x5d, 0xbf
+    0xf8, 0xc1, 0x9e, 0x8c, 0x77, 0xc0, 0x38, 0x79, 0xbb, 0xc8, 0xeb, 0x6d, 0x56,
+    0xe0, 0x0d, 0xd5, 0xd8, 0x6e, 0xf5, 0x59, 0x27, 0xee, 0xfc, 0x08, 0xe1, 0xb0,
+    0x02, 0xb6, 0xec, 0xe0, 0x5d, 0xbf
 };
 
 static unsigned char early_secret[] = {
-0x33, 0xad, 0x0a, 0x1c, 0x60, 0x7e, 0xc0, 0x3b, 0x09, 0xe6, 0xcd, 0x98, 0x93,
-0x68, 0x0c, 0xe2, 0x10, 0xad, 0xf3, 0x00, 0xaa, 0x1f, 0x26, 0x60, 0xe1, 0xb2,
-0x2e, 0x10, 0xf1, 0x70, 0xf9, 0x2a
+    0x33, 0xad, 0x0a, 0x1c, 0x60, 0x7e, 0xc0, 0x3b, 0x09, 0xe6, 0xcd, 0x98, 0x93,
+    0x68, 0x0c, 0xe2, 0x10, 0xad, 0xf3, 0x00, 0xaa, 0x1f, 0x26, 0x60, 0xe1, 0xb2,
+    0x2e, 0x10, 0xf1, 0x70, 0xf9, 0x2a
 };
 
 static unsigned char ecdhe_secret[] = {
-0x81, 0x51, 0xd1, 0x46, 0x4c, 0x1b, 0x55, 0x53, 0x36, 0x23, 0xb9, 0xc2, 0x24,
-0x6a, 0x6a, 0x0e, 0x6e, 0x7e, 0x18, 0x50, 0x63, 0xe1, 0x4a, 0xfd, 0xaf, 0xf0,
-0xb6, 0xe1, 0xc6, 0x1a, 0x86, 0x42
+    0x81, 0x51, 0xd1, 0x46, 0x4c, 0x1b, 0x55, 0x53, 0x36, 0x23, 0xb9, 0xc2, 0x24,
+    0x6a, 0x6a, 0x0e, 0x6e, 0x7e, 0x18, 0x50, 0x63, 0xe1, 0x4a, 0xfd, 0xaf, 0xf0,
+    0xb6, 0xe1, 0xc6, 0x1a, 0x86, 0x42
 };
 
 static unsigned char handshake_secret[] = {
-0x5b, 0x4f, 0x96, 0x5d, 0xf0, 0x3c, 0x68, 0x2c, 0x46, 0xe6, 0xee, 0x86, 0xc3,
-0x11, 0x63, 0x66, 0x15, 0xa1, 0xd2, 0xbb, 0xb2, 0x43, 0x45, 0xc2, 0x52, 0x05,
-0x95, 0x3c, 0x87, 0x9e, 0x8d, 0x06
+    0x5b, 0x4f, 0x96, 0x5d, 0xf0, 0x3c, 0x68, 0x2c, 0x46, 0xe6, 0xee, 0x86, 0xc3,
+    0x11, 0x63, 0x66, 0x15, 0xa1, 0xd2, 0xbb, 0xb2, 0x43, 0x45, 0xc2, 0x52, 0x05,
+    0x95, 0x3c, 0x87, 0x9e, 0x8d, 0x06
 };
 
 static const char *client_hts_label = "c hs traffic";
 
 static unsigned char client_hts[] = {
-0xe2, 0xe2, 0x32, 0x07, 0xbd, 0x93, 0xfb, 0x7f, 0xe4, 0xfc, 0x2e, 0x29, 0x7a,
-0xfe, 0xab, 0x16, 0x0e, 0x52, 0x2b, 0x5a, 0xb7, 0x5d, 0x64, 0xa8, 0x6e, 0x75,
-0xbc, 0xac, 0x3f, 0x3e, 0x51, 0x03
+    0xe2, 0xe2, 0x32, 0x07, 0xbd, 0x93, 0xfb, 0x7f, 0xe4, 0xfc, 0x2e, 0x29, 0x7a,
+    0xfe, 0xab, 0x16, 0x0e, 0x52, 0x2b, 0x5a, 0xb7, 0x5d, 0x64, 0xa8, 0x6e, 0x75,
+    0xbc, 0xac, 0x3f, 0x3e, 0x51, 0x03
 };
 
 static unsigned char client_hts_key[] = {
-0x26, 0x79, 0xa4, 0x3e, 0x1d, 0x76, 0x78, 0x40, 0x34, 0xea, 0x17, 0x97, 0xd5,
-0xad, 0x26, 0x49
+    0x26, 0x79, 0xa4, 0x3e, 0x1d, 0x76, 0x78, 0x40, 0x34, 0xea, 0x17, 0x97, 0xd5,
+    0xad, 0x26, 0x49
 };
 
 static unsigned char client_hts_iv[] = {
-0x54, 0x82, 0x40, 0x52, 0x90, 0xdd, 0x0d, 0x2f, 0x81, 0xc0, 0xd9, 0x42
+    0x54, 0x82, 0x40, 0x52, 0x90, 0xdd, 0x0d, 0x2f, 0x81, 0xc0, 0xd9, 0x42
 };
 
 static const char *server_hts_label = "s hs traffic";
 
 static unsigned char server_hts[] = {
-0x3b, 0x7a, 0x83, 0x9c, 0x23, 0x9e, 0xf2, 0xbf, 0x0b, 0x73, 0x05, 0xa0, 0xe0,
-0xc4, 0xe5, 0xa8, 0xc6, 0xc6, 0x93, 0x30, 0xa7, 0x53, 0xb3, 0x08, 0xf5, 0xe3,
-0xa8, 0x3a, 0xa2, 0xef, 0x69, 0x79
+    0x3b, 0x7a, 0x83, 0x9c, 0x23, 0x9e, 0xf2, 0xbf, 0x0b, 0x73, 0x05, 0xa0, 0xe0,
+    0xc4, 0xe5, 0xa8, 0xc6, 0xc6, 0x93, 0x30, 0xa7, 0x53, 0xb3, 0x08, 0xf5, 0xe3,
+    0xa8, 0x3a, 0xa2, 0xef, 0x69, 0x79
 };
 
 static unsigned char server_hts_key[] = {
-0xc6, 0x6c, 0xb1, 0xae, 0xc5, 0x19, 0xdf, 0x44, 0xc9, 0x1e, 0x10, 0x99, 0x55,
-0x11, 0xac, 0x8b
+    0xc6, 0x6c, 0xb1, 0xae, 0xc5, 0x19, 0xdf, 0x44, 0xc9, 0x1e, 0x10, 0x99, 0x55,
+    0x11, 0xac, 0x8b
 };
 
 static unsigned char server_hts_iv[] = {
-0xf7, 0xf6, 0x88, 0x4c, 0x49, 0x81, 0x71, 0x6c, 0x2d, 0x0d, 0x29, 0xa4
+    0xf7, 0xf6, 0x88, 0x4c, 0x49, 0x81, 0x71, 0x6c, 0x2d, 0x0d, 0x29, 0xa4
 };
 
 static unsigned char master_secret[] = {
-0x5c, 0x79, 0xd1, 0x69, 0x42, 0x4e, 0x26, 0x2b, 0x56, 0x32, 0x03, 0x62, 0x7b,
-0xe4, 0xeb, 0x51, 0x03, 0x3f, 0x58, 0x8c, 0x43, 0xc9, 0xce, 0x03, 0x73, 0x37,
-0x2d, 0xbc, 0xbc, 0x01, 0x85, 0xa7
+    0x5c, 0x79, 0xd1, 0x69, 0x42, 0x4e, 0x26, 0x2b, 0x56, 0x32, 0x03, 0x62, 0x7b,
+    0xe4, 0xeb, 0x51, 0x03, 0x3f, 0x58, 0x8c, 0x43, 0xc9, 0xce, 0x03, 0x73, 0x37,
+    0x2d, 0xbc, 0xbc, 0x01, 0x85, 0xa7
 };
 
 static const char *client_ats_label = "c ap traffic";
 
 static unsigned char client_ats[] = {
-0xe2, 0xf0, 0xdb, 0x6a, 0x82, 0xe8, 0x82, 0x80, 0xfc, 0x26, 0xf7, 0x3c, 0x89,
-0x85, 0x4e, 0xe8, 0x61, 0x5e, 0x25, 0xdf, 0x28, 0xb2, 0x20, 0x79, 0x62, 0xfa,
-0x78, 0x22, 0x26, 0xb2, 0x36, 0x26
+    0xe2, 0xf0, 0xdb, 0x6a, 0x82, 0xe8, 0x82, 0x80, 0xfc, 0x26, 0xf7, 0x3c, 0x89,
+    0x85, 0x4e, 0xe8, 0x61, 0x5e, 0x25, 0xdf, 0x28, 0xb2, 0x20, 0x79, 0x62, 0xfa,
+    0x78, 0x22, 0x26, 0xb2, 0x36, 0x26
 };
 
 static unsigned char client_ats_key[] = {
-0x88, 0xb9, 0x6a, 0xd6, 0x86, 0xc8, 0x4b, 0xe5, 0x5a, 0xce, 0x18, 0xa5, 0x9c,
-0xce, 0x5c, 0x87
+    0x88, 0xb9, 0x6a, 0xd6, 0x86, 0xc8, 0x4b, 0xe5, 0x5a, 0xce, 0x18, 0xa5, 0x9c,
+    0xce, 0x5c, 0x87
 };
 
 static unsigned char client_ats_iv[] = {
-0xb9, 0x9d, 0xc5, 0x8c, 0xd5, 0xff, 0x5a, 0xb0, 0x82, 0xfd, 0xad, 0x19
+    0xb9, 0x9d, 0xc5, 0x8c, 0xd5, 0xff, 0x5a, 0xb0, 0x82, 0xfd, 0xad, 0x19
 };
 
 static const char *server_ats_label = "s ap traffic";
 
 static unsigned char server_ats[] = {
-0x5b, 0x73, 0xb1, 0x08, 0xd9, 0xac, 0x1b, 0x9b, 0x0c, 0x82, 0x48, 0xca, 0x39,
-0x26, 0xec, 0x6e, 0x7b, 0xc4, 0x7e, 0x41, 0x17, 0x06, 0x96, 0x39, 0x87, 0xec,
-0x11, 0x43, 0x5d, 0x30, 0x57, 0x19
+    0x5b, 0x73, 0xb1, 0x08, 0xd9, 0xac, 0x1b, 0x9b, 0x0c, 0x82, 0x48, 0xca, 0x39,
+    0x26, 0xec, 0x6e, 0x7b, 0xc4, 0x7e, 0x41, 0x17, 0x06, 0x96, 0x39, 0x87, 0xec,
+    0x11, 0x43, 0x5d, 0x30, 0x57, 0x19
 };
 
 static unsigned char server_ats_key[] = {
-0xa6, 0x88, 0xeb, 0xb5, 0xac, 0x82, 0x6d, 0x6f, 0x42, 0xd4, 0x5c, 0x0c, 0xc4,
-0x4b, 0x9b, 0x7d
+    0xa6, 0x88, 0xeb, 0xb5, 0xac, 0x82, 0x6d, 0x6f, 0x42, 0xd4, 0x5c, 0x0c, 0xc4,
+    0x4b, 0x9b, 0x7d
 };
 
 static unsigned char server_ats_iv[] = {
-0xc1, 0xca, 0xd4, 0x42, 0x5a, 0x43, 0x8b, 0x5d, 0xe7, 0x14, 0x83, 0x0a
+    0xc1, 0xca, 0xd4, 0x42, 0x5a, 0x43, 0x8b, 0x5d, 0xe7, 0x14, 0x83, 0x0a
 };
 
 /* Mocked out implementations of various functions */
@@ -136,10 +136,10 @@ static int full_hash = 0;
 
 /* Give a hash of the currently set handshake */
 int ssl_handshake_hash(SSL_CONNECTION *s, unsigned char *out, size_t outlen,
-                       size_t *hashlen)
+    size_t *hashlen)
 {
     if (sizeof(hs_start_hash) > outlen
-            || sizeof(hs_full_hash) != sizeof(hs_start_hash))
+        || sizeof(hs_full_hash) != sizeof(hs_start_hash))
         return 0;
 
     if (full_hash) {
@@ -159,22 +159,22 @@ const EVP_MD *ssl_handshake_md(SSL_CONNECTION *s)
 }
 
 int ssl_cipher_get_evp_cipher(SSL_CTX *ctx, const SSL_CIPHER *sslc,
-                                     const EVP_CIPHER **enc)
+    const EVP_CIPHER **enc)
 {
     return 0;
 }
 
 int ssl_cipher_get_evp_md_mac(SSL_CTX *ctx, const SSL_CIPHER *sslc,
-                              const EVP_MD **md,
-                              int *mac_pkey_type, size_t *mac_secret_size)
+    const EVP_MD **md,
+    int *mac_pkey_type, size_t *mac_secret_size)
 {
     return 0;
 }
 
 int ssl_cipher_get_evp(SSL_CTX *ctx, const SSL_SESSION *s,
-                       const EVP_CIPHER **enc, const EVP_MD **md,
-                       int *mac_pkey_type, size_t *mac_secret_size,
-                       SSL_COMP **comp, int use_etm)
+    const EVP_CIPHER **enc, const EVP_MD **md,
+    int *mac_pkey_type, size_t *mac_secret_size,
+    SSL_COMP **comp, int use_etm)
 
 {
     return 0;
@@ -186,9 +186,9 @@ int tls1_alert_code(int code)
 }
 
 int ssl_log_secret(SSL_CONNECTION *sc,
-                   const char *label,
-                   const uint8_t *secret,
-                   size_t secret_len)
+    const char *label,
+    const uint8_t *secret,
+    size_t secret_len)
 {
     return 1;
 }
@@ -203,7 +203,7 @@ void ossl_statem_send_fatal(SSL_CONNECTION *s, int al)
 }
 
 void ossl_statem_fatal(SSL_CONNECTION *s, int al, int reason,
-                       const char *fmt, ...)
+    const char *fmt, ...)
 {
 }
 
@@ -226,13 +226,13 @@ void ssl_evp_md_free(const EVP_MD *md)
 }
 
 int ssl_set_new_record_layer(SSL_CONNECTION *s, int version, int direction,
-                             int level, 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,
-                             const SSL_COMP *comp, const EVP_MD *kdfdigest)
+    int level, 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,
+    const SSL_COMP *comp, const EVP_MD *kdfdigest)
 {
     return 0;
 }
@@ -240,9 +240,9 @@ int ssl_set_new_record_layer(SSL_CONNECTION *s, int version, int direction,
 /* End of mocked out code */
 
 static int test_secret(SSL_CONNECTION *s, unsigned char *prk,
-                       const unsigned char *label, size_t labellen,
-                       const unsigned char *ref_secret,
-                       const unsigned char *ref_key, const unsigned char *ref_iv)
+    const unsigned char *label, size_t labellen,
+    const unsigned char *ref_secret,
+    const unsigned char *ref_key, const unsigned char *ref_iv)
 {
     size_t hashsize;
     unsigned char gensecret[EVP_MAX_MD_SIZE];
@@ -257,7 +257,7 @@ static int test_secret(SSL_CONNECTION *s, unsigned char *prk,
     }
 
     if (!tls13_hkdf_expand(s, md, prk, label, labellen, hash, hashsize,
-                           gensecret, hashsize, 1)) {
+            gensecret, hashsize, 1)) {
         TEST_error("Secret generation failed");
         return 0;
     }
@@ -307,25 +307,25 @@ static int test_handshake_secrets(void)
         goto err;
 
     if (!TEST_true(tls13_generate_secret(s, ssl_handshake_md(s), NULL, NULL, 0,
-                                         (unsigned char *)&s->early_secret))) {
+            (unsigned char *)&s->early_secret))) {
         TEST_info("Early secret generation failed");
         goto err;
     }
 
     if (!TEST_mem_eq(s->early_secret, sizeof(early_secret),
-                     early_secret, sizeof(early_secret))) {
+            early_secret, sizeof(early_secret))) {
         TEST_info("Early secret does not match");
         goto err;
     }
 
     if (!TEST_true(tls13_generate_handshake_secret(s, ecdhe_secret,
-                                                   sizeof(ecdhe_secret)))) {
+            sizeof(ecdhe_secret)))) {
         TEST_info("Handshake secret generation failed");
         goto err;
     }
 
     if (!TEST_mem_eq(s->handshake_secret, sizeof(handshake_secret),
-                     handshake_secret, sizeof(handshake_secret)))
+            handshake_secret, sizeof(handshake_secret)))
         goto err;
 
     hashsize = EVP_MD_get_size(ssl_handshake_md(s));
@@ -337,9 +337,9 @@ static int test_handshake_secrets(void)
         goto err;
 
     if (!TEST_true(test_secret(s, s->handshake_secret,
-                               (unsigned char *)client_hts_label,
-                               strlen(client_hts_label), client_hts,
-                               client_hts_key, client_hts_iv))) {
+            (unsigned char *)client_hts_label,
+            strlen(client_hts_label), client_hts,
+            client_hts_key, client_hts_iv))) {
         TEST_info("Client handshake secret test failed");
         goto err;
     }
@@ -352,9 +352,9 @@ static int test_handshake_secrets(void)
         goto err;
 
     if (!TEST_true(test_secret(s, s->handshake_secret,
-                               (unsigned char *)server_hts_label,
-                               strlen(server_hts_label), server_hts,
-                               server_hts_key, server_hts_iv))) {
+            (unsigned char *)server_hts_label,
+            strlen(server_hts_label), server_hts,
+            server_hts_key, server_hts_iv))) {
         TEST_info("Server handshake secret test failed");
         goto err;
     }
@@ -366,14 +366,14 @@ static int test_handshake_secrets(void)
     full_hash = 1;
 
     if (!TEST_true(tls13_generate_master_secret(s, out_master_secret,
-                                                s->handshake_secret, hashsize,
-                                                &master_secret_length))) {
+            s->handshake_secret, hashsize,
+            &master_secret_length))) {
         TEST_info("Master secret generation failed");
         goto err;
     }
 
     if (!TEST_mem_eq(out_master_secret, master_secret_length,
-                     master_secret, sizeof(master_secret))) {
+            master_secret, sizeof(master_secret))) {
         TEST_info("Master secret does not match");
         goto err;
     }
@@ -386,9 +386,9 @@ static int test_handshake_secrets(void)
         goto err;
 
     if (!TEST_true(test_secret(s, out_master_secret,
-                               (unsigned char *)client_ats_label,
-                               strlen(client_ats_label), client_ats,
-                               client_ats_key, client_ats_iv))) {
+            (unsigned char *)client_ats_label,
+            strlen(client_ats_label), client_ats,
+            client_ats_key, client_ats_iv))) {
         TEST_info("Client application data secret test failed");
         goto err;
     }
@@ -401,15 +401,15 @@ static int test_handshake_secrets(void)
         goto err;
 
     if (!TEST_true(test_secret(s, out_master_secret,
-                               (unsigned char *)server_ats_label,
-                               strlen(server_ats_label), server_ats,
-                               server_ats_key, server_ats_iv))) {
+            (unsigned char *)server_ats_label,
+            strlen(server_ats_label), server_ats,
+            server_ats_key, server_ats_iv))) {
         TEST_info("Server application data secret test failed");
         goto err;
     }
 
     ret = 1;
- err:
+err:
     SSL_free(ssl);
     SSL_CTX_free(ctx);
     return ret;
diff --git a/test/trace_api_test.c b/test/trace_api_test.c
index 0effee421ab0b..b8342f532456a 100644
--- a/test/trace_api_test.c
+++ b/test/trace_api_test.c
@@ -20,7 +20,9 @@ static int test_trace_categories(void)
         const char *expected_cat_name = NULL;
         int ret_cat_num;
 
-#define SET_EXPECTED_CAT_NAME(name) expected_cat_name = #name; break
+#define SET_EXPECTED_CAT_NAME(name) \
+    expected_cat_name = #name;      \
+    break
         switch (cat_num) {
         case OSSL_TRACE_CATEGORY_ALL:
             SET_EXPECTED_CAT_NAME(ALL);
@@ -73,8 +75,7 @@ static int test_trace_categories(void)
 
         if (!TEST_str_eq(cat_name, expected_cat_name))
             return 0;
-        ret_cat_num =
-            OSSL_trace_get_category_num(cat_name);
+        ret_cat_num = OSSL_trace_get_category_num(cat_name);
         if (cat_num < OSSL_TRACE_CATEGORY_NUM)
             if (!TEST_int_eq(cat_num, ret_cat_num))
                 return 0;
@@ -85,43 +86,42 @@ static int test_trace_categories(void)
 
 #ifndef OPENSSL_NO_TRACE
 
-# define OSSL_START "xyz-"
-# define OSSL_HELLO "Hello World\n"
+#define OSSL_START "xyz-"
+#define OSSL_HELLO "Hello World\n"
 /* OSSL_STR80 must have length OSSL_TRACE_STRING_MAX */
-# define OSSL_STR80 "1234567890123456789012345678901234567890123456789012345678901234567890123456789\n"
-# define OSSL_STR81 (OSSL_STR80"x")
-# define OSSL_CTRL "A\xfe\nB"
-# define OSSL_MASKED "A \nB"
-# define OSSL_BYE "Good Bye Universe\n"
-# define OSSL_END "-abc"
-
-# define trace_string(text, full, str) \
+#define OSSL_STR80 "1234567890123456789012345678901234567890123456789012345678901234567890123456789\n"
+#define OSSL_STR81 (OSSL_STR80 "x")
+#define OSSL_CTRL "A\xfe\nB"
+#define OSSL_MASKED "A \nB"
+#define OSSL_BYE "Good Bye Universe\n"
+#define OSSL_END "-abc"
+
+#define trace_string(text, full, str) \
     OSSL_trace_string(trc_out, text, full, (unsigned char *)(str), strlen(str))
 
 static int put_trace_output(void)
 {
     int res = 1;
 
-    OSSL_TRACE_BEGIN(HTTP) {
+    OSSL_TRACE_BEGIN(HTTP)
+    {
         res = TEST_int_eq(BIO_printf(trc_out, OSSL_HELLO), strlen(OSSL_HELLO));
         res += TEST_int_eq(trace_string(0, 0, OSSL_STR80), strlen(OSSL_STR80));
         res += TEST_int_eq(trace_string(0, 0, OSSL_STR81), strlen(OSSL_STR80));
         res += TEST_int_eq(trace_string(1, 1, OSSL_CTRL), strlen(OSSL_CTRL));
-        res += TEST_int_eq(trace_string(0, 1, OSSL_MASKED), strlen(OSSL_MASKED)
-                           + 1); /* newline added */
+        res += TEST_int_eq(trace_string(0, 1, OSSL_MASKED), strlen(OSSL_MASKED) + 1); /* newline added */
         res += TEST_int_eq(BIO_printf(trc_out, OSSL_BYE), strlen(OSSL_BYE));
         res = res == 6;
         /* not using '&&' but '+' to catch potentially multiple test failures */
-    } OSSL_TRACE_END(HTTP);
+    }
+    OSSL_TRACE_END(HTTP);
     return res;
 }
 
 static int test_trace_channel(void)
 {
-    static const char expected[] =
-        OSSL_START"\n" OSSL_HELLO
-        OSSL_STR80 "[len 81 limited to 80]: "OSSL_STR80
-        OSSL_CTRL OSSL_MASKED"\n" OSSL_BYE OSSL_END"\n";
+    static const char expected[] = OSSL_START "\n" OSSL_HELLO OSSL_STR80 "[len 81 limited to 80]: " OSSL_STR80
+        OSSL_CTRL OSSL_MASKED "\n" OSSL_BYE OSSL_END "\n";
     static const size_t expected_len = sizeof(expected) - 1;
     BIO *bio = NULL;
     char *p_buf = NULL;
@@ -141,10 +141,12 @@ static int test_trace_channel(void)
         goto end;
 
     if (!TEST_int_eq(OSSL_trace_set_prefix(OSSL_TRACE_CATEGORY_HTTP,
-                                           OSSL_START), 1))
+                         OSSL_START),
+            1))
         goto end;
     if (!TEST_int_eq(OSSL_trace_set_suffix(OSSL_TRACE_CATEGORY_HTTP,
-                                           OSSL_END), 1))
+                         OSSL_END),
+            1))
         goto end;
 
     ret = put_trace_output();
@@ -154,7 +156,7 @@ static int test_trace_channel(void)
     ret = TEST_int_eq(OSSL_trace_set_channel(OSSL_TRACE_CATEGORY_HTTP, NULL), 1)
         && ret;
 
- end:
+end:
     return ret;
 }
 
@@ -162,7 +164,7 @@ static int trace_cb_failure;
 static int trace_cb_called;
 
 static size_t trace_cb(const char *buffer, size_t count,
-                       int category, int cmd, void *data)
+    int category, int cmd, void *data)
 {
     trace_cb_called = 1;
     if (!TEST_true(category == OSSL_TRACE_CATEGORY_TRACE))
@@ -175,7 +177,7 @@ static int test_trace_callback(void)
     int ret = 0;
 
     if (!TEST_true(OSSL_trace_set_callback(OSSL_TRACE_CATEGORY_TRACE, trace_cb,
-                                           NULL)))
+            NULL)))
         goto end;
 
     put_trace_output();
@@ -184,7 +186,7 @@ static int test_trace_callback(void)
         goto end;
 
     ret = 1;
- end:
+end:
     return ret;
 }
 #endif
diff --git a/test/uitest.c b/test/uitest.c
index 82c8c59204f49..dfadf0041a612 100644
--- a/test/uitest.c
+++ b/test/uitest.c
@@ -14,7 +14,6 @@
 #include "apps_ui.h"
 #include "testutil.h"
 
-
 #include <openssl/ui.h>
 
 /* Old style PEM password callback */
@@ -36,16 +35,16 @@ static int test_old(void)
     char pass[16];
     int ok = 0;
 
-    if (!TEST_ptr(ui_method =
-                  UI_UTIL_wrap_read_pem_callback(test_pem_password_cb, 0))
-            || !TEST_ptr(ui = UI_new_method(ui_method)))
+    if (!TEST_ptr(ui_method = UI_UTIL_wrap_read_pem_callback(test_pem_password_cb, 0))
+        || !TEST_ptr(ui = UI_new_method(ui_method)))
         goto err;
 
     /* The wrapper passes the UI userdata as the callback userdata param */
     UI_add_user_data(ui, defpass);
 
     if (UI_add_input_string(ui, "prompt", UI_INPUT_FLAG_DEFAULT_PWD,
-                             pass, 0, sizeof(pass) - 1) <= 0)
+            pass, 0, sizeof(pass) - 1)
+        <= 0)
         goto err;
 
     switch (UI_process(ui)) {
@@ -61,7 +60,7 @@ static int test_old(void)
     if (TEST_str_eq(pass, defpass))
         ok = 1;
 
- err:
+err:
     UI_free(ui);
     UI_destroy_method(ui_method);
 
@@ -80,7 +79,7 @@ static int test_new_ui(void)
 
     (void)setup_ui_method();
     if (TEST_int_gt(password_callback(pass, sizeof(pass), 0, &cb_data), 0)
-            && TEST_str_eq(pass, cb_data.password))
+        && TEST_str_eq(pass, cb_data.password))
         ok = 1;
     destroy_ui_method();
     return ok;
diff --git a/test/upcallstest.c b/test/upcallstest.c
index d2c89b5202eec..852f9b7d45c2b 100644
--- a/test/upcallstest.c
+++ b/test/upcallstest.c
@@ -13,7 +13,7 @@
 #include "testutil.h"
 
 static const OSSL_ALGORITHM *obj_query(void *provctx, int operation_id,
-                                       int *no_cache)
+    int *no_cache)
 {
     *no_cache = 0;
     return NULL;
@@ -47,9 +47,9 @@ static OSSL_FUNC_core_obj_create_fn *c_obj_create = NULL;
 #define NODIG_SIGALG_LN "my-nodig-sigalg-long"
 
 static int obj_provider_init(const OSSL_CORE_HANDLE *handle,
-                             const OSSL_DISPATCH *in,
-                             const OSSL_DISPATCH **out,
-                             void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     *provctx = (void *)handle;
     *out = obj_dispatch_table;
@@ -70,12 +70,12 @@ static int obj_provider_init(const OSSL_CORE_HANDLE *handle,
     }
 
     if (!c_obj_create(handle, DIGEST_OID, DIGEST_SN, DIGEST_LN)
-            || !c_obj_create(handle, SIG_OID, SIG_SN, SIG_LN)
-            || !c_obj_create(handle, SIGALG_OID, SIGALG_SN, SIGALG_LN))
+        || !c_obj_create(handle, SIG_OID, SIG_SN, SIG_LN)
+        || !c_obj_create(handle, SIGALG_OID, SIGALG_SN, SIGALG_LN))
         return 0;
 
     if (!c_obj_create(handle, NODIG_SIG_OID, NODIG_SIG_SN, NODIG_SIG_LN)
-            || !c_obj_create(handle, NODIG_SIGALG_OID, NODIG_SIGALG_SN, NODIG_SIGALG_LN))
+        || !c_obj_create(handle, NODIG_SIGALG_OID, NODIG_SIGALG_SN, NODIG_SIGALG_LN))
         return 0;
 
     if (!c_obj_add_sigid(handle, SIGALG_OID, DIGEST_SN, SIG_LN))
@@ -102,26 +102,26 @@ static int obj_create_test(void)
         goto err;
 
     if (!TEST_true(OSSL_PROVIDER_add_builtin(libctx, "obj-prov",
-                                             obj_provider_init))
-            || !TEST_ptr(objprov = OSSL_PROVIDER_load(libctx, "obj-prov")))
+            obj_provider_init))
+        || !TEST_ptr(objprov = OSSL_PROVIDER_load(libctx, "obj-prov")))
         goto err;
 
     /* Check that the provider created the OIDs/NIDs we expected */
     sigalgnid = OBJ_txt2nid(SIGALG_OID);
     if (!TEST_int_ne(sigalgnid, NID_undef)
-            || !TEST_true(OBJ_find_sigid_algs(sigalgnid, &digestnid, &signid))
-            || !TEST_int_ne(digestnid, NID_undef)
-            || !TEST_int_ne(signid, NID_undef)
-            || !TEST_int_eq(digestnid, OBJ_sn2nid(DIGEST_SN))
-            || !TEST_int_eq(signid, OBJ_ln2nid(SIG_LN)))
+        || !TEST_true(OBJ_find_sigid_algs(sigalgnid, &digestnid, &signid))
+        || !TEST_int_ne(digestnid, NID_undef)
+        || !TEST_int_ne(signid, NID_undef)
+        || !TEST_int_eq(digestnid, OBJ_sn2nid(DIGEST_SN))
+        || !TEST_int_eq(signid, OBJ_ln2nid(SIG_LN)))
         goto err;
 
     /* Check empty digest alg storage capability */
     sigalgnid = OBJ_txt2nid(NODIG_SIGALG_OID);
     if (!TEST_int_ne(sigalgnid, NID_undef)
-            || !TEST_true(OBJ_find_sigid_algs(sigalgnid, &digestnid, &signid))
-            || !TEST_int_eq(digestnid, NID_undef)
-            || !TEST_int_ne(signid, NID_undef))
+        || !TEST_true(OBJ_find_sigid_algs(sigalgnid, &digestnid, &signid))
+        || !TEST_int_eq(digestnid, NID_undef)
+        || !TEST_int_ne(signid, NID_undef))
         goto err;
 
     /* Testing OBJ_find_sigid_by_algs */
@@ -129,29 +129,25 @@ static int obj_create_test(void)
     sigalgnid = OBJ_sn2nid(SIGALG_SN);
     digestnid = OBJ_sn2nid(DIGEST_SN);
     signid = OBJ_ln2nid(SIG_LN);
-    if ((!OBJ_find_sigid_by_algs(&foundsid, digestnid, signid)) ||
-        (foundsid != sigalgnid))
+    if ((!OBJ_find_sigid_by_algs(&foundsid, digestnid, signid)) || (foundsid != sigalgnid))
         return 0;
     /* Check wrong signature/digest combination is rejected */
-    if ((OBJ_find_sigid_by_algs(&foundsid, OBJ_sn2nid("SHA512"), signid)) &&
-        (foundsid == sigalgnid))
+    if ((OBJ_find_sigid_by_algs(&foundsid, OBJ_sn2nid("SHA512"), signid)) && (foundsid == sigalgnid))
         return 0;
     /* Now also check signature not needing digest is found */
     /* a) when some digest is given */
     sigalgnid = OBJ_sn2nid(NODIG_SIGALG_SN);
     digestnid = OBJ_sn2nid("SHA512");
     signid = OBJ_ln2nid(NODIG_SIG_LN);
-    if ((!OBJ_find_sigid_by_algs(&foundsid, digestnid, signid)) ||
-        (foundsid != sigalgnid))
+    if ((!OBJ_find_sigid_by_algs(&foundsid, digestnid, signid)) || (foundsid != sigalgnid))
         return 0;
     /* b) when NID_undef is passed */
     digestnid = NID_undef;
-    if ((!OBJ_find_sigid_by_algs(&foundsid, digestnid, signid)) ||
-        (foundsid != sigalgnid))
+    if ((!OBJ_find_sigid_by_algs(&foundsid, digestnid, signid)) || (foundsid != sigalgnid))
         return 0;
 
     testresult = 1;
- err:
+err:
     OSSL_PROVIDER_unload(objprov);
     OSSL_LIB_CTX_free(libctx);
     return testresult;
diff --git a/test/user_property_test.c b/test/user_property_test.c
index 73ae149ad08d1..603c1ebe30c0e 100644
--- a/test/user_property_test.c
+++ b/test/user_property_test.c
@@ -37,7 +37,7 @@ static int tmpmd_get_params(OSSL_PARAM params[])
 }
 
 static int tmpmd_digest(void *provctx, const unsigned char *in, size_t inl,
-                 unsigned char *out, size_t *outl, size_t outsz)
+    unsigned char *out, size_t *outl, size_t outsz)
 {
     return 0;
 }
@@ -54,8 +54,8 @@ static const OSSL_ALGORITHM testprov_digests[] = {
 };
 
 static const OSSL_ALGORITHM *testprov_query(void *provctx,
-                                          int operation_id,
-                                          int *no_cache)
+    int operation_id,
+    int *no_cache)
 {
     *no_cache = 0;
     return operation_id == OSSL_OP_DIGEST ? testprov_digests : NULL;
@@ -67,9 +67,9 @@ static const OSSL_DISPATCH testprov_dispatch_table[] = {
 };
 
 static int testprov_provider_init(const OSSL_CORE_HANDLE *handle,
-                                  const OSSL_DISPATCH *in,
-                                  const OSSL_DISPATCH **out,
-                                  void **provctx)
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx)
 {
     *provctx = (void *)handle;
     *out = testprov_dispatch_table;
@@ -91,19 +91,19 @@ static int test_default_props_and_providers(int propsorder)
     int res = 0;
 
     if (!TEST_ptr(libctx = OSSL_LIB_CTX_new())
-            || !TEST_true(OSSL_PROVIDER_add_builtin(libctx, "testprov",
-                                                    testprov_provider_init)))
+        || !TEST_true(OSSL_PROVIDER_add_builtin(libctx, "testprov",
+            testprov_provider_init)))
         goto err;
 
     if (propsorder == DEFAULT_PROPS_FIRST
-            && !TEST_true(EVP_set_default_properties(libctx, MYPROPERTIES)))
+        && !TEST_true(EVP_set_default_properties(libctx, MYPROPERTIES)))
         goto err;
 
     if (!TEST_ptr(testprov = OSSL_PROVIDER_load(libctx, "testprov")))
         goto err;
 
     if (propsorder == DEFAULT_PROPS_AFTER_LOAD
-            && !TEST_true(EVP_set_default_properties(libctx, MYPROPERTIES)))
+        && !TEST_true(EVP_set_default_properties(libctx, MYPROPERTIES)))
         goto err;
 
     if (!TEST_ptr(testprovmd = EVP_MD_fetch(libctx, "testprovmd", NULL)))
@@ -118,7 +118,7 @@ static int test_default_props_and_providers(int propsorder)
     }
 
     res = 1;
- err:
+err:
     EVP_MD_free(testprovmd);
     OSSL_PROVIDER_unload(testprov);
     OSSL_LIB_CTX_free(libctx);
diff --git a/test/v3ext.c b/test/v3ext.c
index 9305a3010bf8e..f8fb18fe29029 100644
--- a/test/v3ext.c
+++ b/test/v3ext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-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
@@ -27,8 +27,8 @@ static int test_pathlen(void)
     int ret = 0;
 
     if (!TEST_ptr(b = BIO_new_file(infile, "r"))
-            || !TEST_ptr(x = PEM_read_bio_X509(b, NULL, NULL, NULL))
-            || !TEST_int_eq(pathlen = X509_get_pathlen(x), 6))
+        || !TEST_ptr(x = PEM_read_bio_X509(b, NULL, NULL, NULL))
+        || !TEST_int_eq(pathlen = X509_get_pathlen(x), 6))
         goto end;
 
     ret = 1;
@@ -48,12 +48,12 @@ static int test_asid(void)
     int testresult = 0;
 
     if (!TEST_ptr(asid1)
-            || !TEST_ptr(asid2)
-            || !TEST_ptr(asid3))
+        || !TEST_ptr(asid2)
+        || !TEST_ptr(asid3))
         goto err;
 
     if (!TEST_ptr(val1 = ASN1_INTEGER_new())
-            || !TEST_true(ASN1_INTEGER_set_int64(val1, 64496)))
+        || !TEST_true(ASN1_INTEGER_set_int64(val1, 64496)))
         goto err;
 
     if (!TEST_true(X509v3_asid_add_id_or_range(asid1, V3_ASID_ASNUM, val1, NULL)))
@@ -61,7 +61,7 @@ static int test_asid(void)
 
     val1 = NULL;
     if (!TEST_ptr(val2 = ASN1_INTEGER_new())
-            || !TEST_true(ASN1_INTEGER_set_int64(val2, 64497)))
+        || !TEST_true(ASN1_INTEGER_set_int64(val2, 64497)))
         goto err;
 
     if (!TEST_true(X509v3_asid_add_id_or_range(asid2, V3_ASID_ASNUM, val2, NULL)))
@@ -69,9 +69,9 @@ static int test_asid(void)
 
     val2 = NULL;
     if (!TEST_ptr(val1 = ASN1_INTEGER_new())
-            || !TEST_true(ASN1_INTEGER_set_int64(val1, 64496))
-            || !TEST_ptr(val2 = ASN1_INTEGER_new())
-            || !TEST_true(ASN1_INTEGER_set_int64(val2, 64497)))
+        || !TEST_true(ASN1_INTEGER_set_int64(val1, 64496))
+        || !TEST_ptr(val2 = ASN1_INTEGER_new())
+        || !TEST_true(ASN1_INTEGER_set_int64(val2, 64497)))
         goto err;
 
     /*
@@ -84,30 +84,30 @@ static int test_asid(void)
 
     /* Actual subsets */
     if (!TEST_true(X509v3_asid_subset(NULL, NULL))
-            || !TEST_true(X509v3_asid_subset(NULL, asid1))
-            || !TEST_true(X509v3_asid_subset(asid1, asid1))
-            || !TEST_true(X509v3_asid_subset(asid2, asid2))
-            || !TEST_true(X509v3_asid_subset(asid1, asid3))
-            || !TEST_true(X509v3_asid_subset(asid2, asid3))
-            || !TEST_true(X509v3_asid_subset(asid3, asid3))
-            || !TEST_true(X509v3_asid_subset(asid4, asid1))
-            || !TEST_true(X509v3_asid_subset(asid4, asid2))
-            || !TEST_true(X509v3_asid_subset(asid4, asid3)))
+        || !TEST_true(X509v3_asid_subset(NULL, asid1))
+        || !TEST_true(X509v3_asid_subset(asid1, asid1))
+        || !TEST_true(X509v3_asid_subset(asid2, asid2))
+        || !TEST_true(X509v3_asid_subset(asid1, asid3))
+        || !TEST_true(X509v3_asid_subset(asid2, asid3))
+        || !TEST_true(X509v3_asid_subset(asid3, asid3))
+        || !TEST_true(X509v3_asid_subset(asid4, asid1))
+        || !TEST_true(X509v3_asid_subset(asid4, asid2))
+        || !TEST_true(X509v3_asid_subset(asid4, asid3)))
         goto err;
 
     /* Not subsets */
     if (!TEST_false(X509v3_asid_subset(asid1, NULL))
-            || !TEST_false(X509v3_asid_subset(asid1, asid2))
-            || !TEST_false(X509v3_asid_subset(asid2, asid1))
-            || !TEST_false(X509v3_asid_subset(asid3, asid1))
-            || !TEST_false(X509v3_asid_subset(asid3, asid2))
-            || !TEST_false(X509v3_asid_subset(asid1, asid4))
-            || !TEST_false(X509v3_asid_subset(asid2, asid4))
-            || !TEST_false(X509v3_asid_subset(asid3, asid4)))
+        || !TEST_false(X509v3_asid_subset(asid1, asid2))
+        || !TEST_false(X509v3_asid_subset(asid2, asid1))
+        || !TEST_false(X509v3_asid_subset(asid3, asid1))
+        || !TEST_false(X509v3_asid_subset(asid3, asid2))
+        || !TEST_false(X509v3_asid_subset(asid1, asid4))
+        || !TEST_false(X509v3_asid_subset(asid2, asid4))
+        || !TEST_false(X509v3_asid_subset(asid3, asid4)))
         goto err;
 
     testresult = 1;
- err:
+err:
     ASN1_INTEGER_free(val1);
     ASN1_INTEGER_free(val2);
     ASIdentifiers_free(asid1);
@@ -123,24 +123,24 @@ static struct ip_ranges_st {
     const char *ip2;
     int rorp;
 } ranges[] = {
-    { IANA_AFI_IPV4, "192.168.0.0", "192.168.0.1", IPAddressOrRange_addressPrefix},
-    { IANA_AFI_IPV4, "192.168.0.0", "192.168.0.2", IPAddressOrRange_addressRange},
-    { IANA_AFI_IPV4, "192.168.0.0", "192.168.0.3", IPAddressOrRange_addressPrefix},
-    { IANA_AFI_IPV4, "192.168.0.0", "192.168.0.254", IPAddressOrRange_addressRange},
-    { IANA_AFI_IPV4, "192.168.0.0", "192.168.0.255", IPAddressOrRange_addressPrefix},
-    { IANA_AFI_IPV4, "192.168.0.1", "192.168.0.255", IPAddressOrRange_addressRange},
-    { IANA_AFI_IPV4, "192.168.0.1", "192.168.0.1", IPAddressOrRange_addressPrefix},
-    { IANA_AFI_IPV4, "192.168.0.0", "192.168.255.255", IPAddressOrRange_addressPrefix},
-    { IANA_AFI_IPV4, "192.168.1.0", "192.168.255.255", IPAddressOrRange_addressRange},
-    { IANA_AFI_IPV6, "2001:0db8::0", "2001:0db8::1", IPAddressOrRange_addressPrefix},
-    { IANA_AFI_IPV6, "2001:0db8::0", "2001:0db8::2", IPAddressOrRange_addressRange},
-    { IANA_AFI_IPV6, "2001:0db8::0", "2001:0db8::3", IPAddressOrRange_addressPrefix},
-    { IANA_AFI_IPV6, "2001:0db8::0", "2001:0db8::fffe", IPAddressOrRange_addressRange},
-    { IANA_AFI_IPV6, "2001:0db8::0", "2001:0db8::ffff", IPAddressOrRange_addressPrefix},
-    { IANA_AFI_IPV6, "2001:0db8::1", "2001:0db8::ffff", IPAddressOrRange_addressRange},
-    { IANA_AFI_IPV6, "2001:0db8::1", "2001:0db8::1", IPAddressOrRange_addressPrefix},
-    { IANA_AFI_IPV6, "2001:0db8::0:0", "2001:0db8::ffff:ffff", IPAddressOrRange_addressPrefix},
-    { IANA_AFI_IPV6, "2001:0db8::1:0", "2001:0db8::ffff:ffff", IPAddressOrRange_addressRange}
+    { IANA_AFI_IPV4, "192.168.0.0", "192.168.0.1", IPAddressOrRange_addressPrefix },
+    { IANA_AFI_IPV4, "192.168.0.0", "192.168.0.2", IPAddressOrRange_addressRange },
+    { IANA_AFI_IPV4, "192.168.0.0", "192.168.0.3", IPAddressOrRange_addressPrefix },
+    { IANA_AFI_IPV4, "192.168.0.0", "192.168.0.254", IPAddressOrRange_addressRange },
+    { IANA_AFI_IPV4, "192.168.0.0", "192.168.0.255", IPAddressOrRange_addressPrefix },
+    { IANA_AFI_IPV4, "192.168.0.1", "192.168.0.255", IPAddressOrRange_addressRange },
+    { IANA_AFI_IPV4, "192.168.0.1", "192.168.0.1", IPAddressOrRange_addressPrefix },
+    { IANA_AFI_IPV4, "192.168.0.0", "192.168.255.255", IPAddressOrRange_addressPrefix },
+    { IANA_AFI_IPV4, "192.168.1.0", "192.168.255.255", IPAddressOrRange_addressRange },
+    { IANA_AFI_IPV6, "2001:0db8::0", "2001:0db8::1", IPAddressOrRange_addressPrefix },
+    { IANA_AFI_IPV6, "2001:0db8::0", "2001:0db8::2", IPAddressOrRange_addressRange },
+    { IANA_AFI_IPV6, "2001:0db8::0", "2001:0db8::3", IPAddressOrRange_addressPrefix },
+    { IANA_AFI_IPV6, "2001:0db8::0", "2001:0db8::fffe", IPAddressOrRange_addressRange },
+    { IANA_AFI_IPV6, "2001:0db8::0", "2001:0db8::ffff", IPAddressOrRange_addressPrefix },
+    { IANA_AFI_IPV6, "2001:0db8::1", "2001:0db8::ffff", IPAddressOrRange_addressRange },
+    { IANA_AFI_IPV6, "2001:0db8::1", "2001:0db8::1", IPAddressOrRange_addressPrefix },
+    { IANA_AFI_IPV6, "2001:0db8::0:0", "2001:0db8::ffff:ffff", IPAddressOrRange_addressPrefix },
+    { IANA_AFI_IPV6, "2001:0db8::1:0", "2001:0db8::ffff:ffff", IPAddressOrRange_addressRange }
 };
 
 static int check_addr(IPAddrBlocks *addr, int type)
@@ -219,7 +219,7 @@ static int test_addr_ranges(void)
     }
 
     testresult = 1;
- end:
+end:
     sk_IPAddressFamily_pop_free(addr, IPAddressFamily_free);
     ASN1_OCTET_STRING_free(ip1);
     ASN1_OCTET_STRING_free(ip2);
@@ -261,11 +261,9 @@ static int test_addr_fam_len(void)
     keylen = 6;
     if ((f1 = IPAddressFamily_new()) == NULL)
         goto end;
-    if (f1->ipAddressChoice == NULL &&
-        (f1->ipAddressChoice = IPAddressChoice_new()) == NULL)
+    if (f1->ipAddressChoice == NULL && (f1->ipAddressChoice = IPAddressChoice_new()) == NULL)
         goto end;
-    if (f1->addressFamily == NULL &&
-        (f1->addressFamily = ASN1_OCTET_STRING_new()) == NULL)
+    if (f1->addressFamily == NULL && (f1->addressFamily = ASN1_OCTET_STRING_new()) == NULL)
         goto end;
     if (!ASN1_OCTET_STRING_set(f1->addressFamily, key, keylen))
         goto end;
@@ -289,11 +287,9 @@ static int test_addr_fam_len(void)
     keylen = 3;
     if ((f1 = IPAddressFamily_new()) == NULL)
         goto end;
-    if (f1->ipAddressChoice == NULL &&
-        (f1->ipAddressChoice = IPAddressChoice_new()) == NULL)
+    if (f1->ipAddressChoice == NULL && (f1->ipAddressChoice = IPAddressChoice_new()) == NULL)
         goto end;
-    if (f1->addressFamily == NULL &&
-        (f1->addressFamily = ASN1_OCTET_STRING_new()) == NULL)
+    if (f1->addressFamily == NULL && (f1->addressFamily = ASN1_OCTET_STRING_new()) == NULL)
         goto end;
     if (!ASN1_OCTET_STRING_set(f1->addressFamily, key, keylen))
         goto end;
@@ -311,7 +307,7 @@ static int test_addr_fam_len(void)
         goto end;
 
     testresult = 1;
-  end:
+end:
     /* Free stack and any memory owned by detached element */
     IPAddressFamily_free(f1);
     sk_IPAddressFamily_pop_free(addr, IPAddressFamily_free);
@@ -376,12 +372,12 @@ static int test_ext_syntax(void)
     for (i = 0; i < OSSL_NELEM(extvalues); i++) {
         X509V3_CTX ctx;
         BIO *extbio = BIO_new_mem_buf(extvalues[i].value,
-                                      strlen(extvalues[i].value));
+            strlen(extvalues[i].value));
         CONF *conf;
         long eline;
 
         if (!TEST_ptr(extbio))
-            return 0 ;
+            return 0;
 
         conf = NCONF_new_ex(NULL, NULL);
         if (!TEST_ptr(conf)) {
@@ -396,14 +392,14 @@ static int test_ext_syntax(void)
 
             if (extvalues[i].pass) {
                 if (!TEST_true(X509V3_EXT_add_nconf(conf, &ctx, "default",
-                                                    NULL))) {
+                        NULL))) {
                     TEST_info("Value: %s", extvalues[i].value);
                     testresult = 0;
                 }
             } else {
                 ERR_set_mark();
                 if (!TEST_false(X509V3_EXT_add_nconf(conf, &ctx, "default",
-                                                     NULL))) {
+                        NULL))) {
                     testresult = 0;
                     TEST_info("Value: %s", extvalues[i].value);
                     ERR_clear_last_mark();
@@ -435,22 +431,22 @@ static int test_addr_subset(void)
             || !TEST_ptr(ip1[i] = a2i_IPADDRESS(ranges[i].ip1))
             || !TEST_ptr(ip2[i] = a2i_IPADDRESS(ranges[i].ip2))
             || !TEST_true(X509v3_addr_add_range(addr[i], ranges[i].afi, NULL,
-                                                ip1[i]->data, ip2[i]->data)))
+                ip1[i]->data, ip2[i]->data)))
             goto end;
     }
 
     ret = TEST_ptr(addrEmpty = sk_IPAddressFamily_new_null())
-          && TEST_true(X509v3_addr_subset(NULL, NULL))
-          && TEST_true(X509v3_addr_subset(NULL, addr[0]))
-          && TEST_true(X509v3_addr_subset(addrEmpty, addr[0]))
-          && TEST_true(X509v3_addr_subset(addr[0], addr[0]))
-          && TEST_true(X509v3_addr_subset(addr[0], addr[1]))
-          && TEST_true(X509v3_addr_subset(addr[0], addr[2]))
-          && TEST_true(X509v3_addr_subset(addr[1], addr[2]))
-          && TEST_false(X509v3_addr_subset(addr[0], NULL))
-          && TEST_false(X509v3_addr_subset(addr[1], addr[0]))
-          && TEST_false(X509v3_addr_subset(addr[2], addr[1]))
-          && TEST_false(X509v3_addr_subset(addr[0], addrEmpty));
+        && TEST_true(X509v3_addr_subset(NULL, NULL))
+        && TEST_true(X509v3_addr_subset(NULL, addr[0]))
+        && TEST_true(X509v3_addr_subset(addrEmpty, addr[0]))
+        && TEST_true(X509v3_addr_subset(addr[0], addr[0]))
+        && TEST_true(X509v3_addr_subset(addr[0], addr[1]))
+        && TEST_true(X509v3_addr_subset(addr[0], addr[2]))
+        && TEST_true(X509v3_addr_subset(addr[1], addr[2]))
+        && TEST_false(X509v3_addr_subset(addr[0], NULL))
+        && TEST_false(X509v3_addr_subset(addr[1], addr[0]))
+        && TEST_false(X509v3_addr_subset(addr[2], addr[1]))
+        && TEST_false(X509v3_addr_subset(addr[0], addrEmpty));
 end:
     sk_IPAddressFamily_pop_free(addrEmpty, IPAddressFamily_free);
     for (i = 0; i < sz; ++i) {
diff --git a/test/v3nametest.c b/test/v3nametest.c
index 152da1a1ddce0..7ba195ace948e 100644
--- a/test/v3nametest.c
+++ b/test/v3nametest.c
@@ -102,13 +102,13 @@ static int set_cn(X509 *crt, ...)
             break;
         name = va_arg(ap, const char *);
         if (!X509_NAME_add_entry_by_NID(n, nid, MBSTRING_ASC,
-                                        (unsigned char *)name, -1, -1, 1))
+                (unsigned char *)name, -1, -1, 1))
             goto out;
     }
     if (!X509_set_subject_name(crt, n))
         goto out;
     ret = 1;
- out:
+out:
     X509_NAME_free(n);
     va_end(ap);
     return ret;
@@ -164,7 +164,7 @@ static int set_altname(X509 *crt, ...)
     if (!X509_add1_ext_i2d(crt, NID_subject_alt_name, gens, 0, 0))
         goto out;
     ret = 1;
- out:
+out:
     ASN1_IA5STRING_free(ia5);
     GENERAL_NAME_free(gen);
     GENERAL_NAMES_free(gens);
@@ -180,19 +180,19 @@ static int set_cn1(X509 *crt, const char *name)
 static int set_cn_and_email(X509 *crt, const char *name)
 {
     return set_cn(crt, NID_commonName, name,
-                  NID_pkcs9_emailAddress, "dummy@example.com", 0);
+        NID_pkcs9_emailAddress, "dummy@example.com", 0);
 }
 
 static int set_cn2(X509 *crt, const char *name)
 {
     return set_cn(crt, NID_commonName, "dummy value",
-                  NID_commonName, name, 0);
+        NID_commonName, name, 0);
 }
 
 static int set_cn3(X509 *crt, const char *name)
 {
     return set_cn(crt, NID_commonName, name,
-                  NID_commonName, "dummy value", 0);
+        NID_commonName, "dummy value", 0);
 }
 
 static int set_email1(X509 *crt, const char *name)
@@ -203,19 +203,19 @@ static int set_email1(X509 *crt, const char *name)
 static int set_email2(X509 *crt, const char *name)
 {
     return set_cn(crt, NID_pkcs9_emailAddress, "dummy@example.com",
-                  NID_pkcs9_emailAddress, name, 0);
+        NID_pkcs9_emailAddress, name, 0);
 }
 
 static int set_email3(X509 *crt, const char *name)
 {
     return set_cn(crt, NID_pkcs9_emailAddress, name,
-                  NID_pkcs9_emailAddress, "dummy@example.com", 0);
+        NID_pkcs9_emailAddress, "dummy@example.com", 0);
 }
 
 static int set_email_and_cn(X509 *crt, const char *name)
 {
     return set_cn(crt, NID_pkcs9_emailAddress, name,
-                  NID_commonName, "www.example.org", 0);
+        NID_commonName, "www.example.org", 0);
 }
 
 static int set_altname_dns(X509 *crt, const char *name)
@@ -229,23 +229,23 @@ static int set_altname_email(X509 *crt, const char *name)
 }
 
 struct set_name_fn {
-    int (*fn) (X509 *, const char *);
+    int (*fn)(X509 *, const char *);
     const char *name;
     int host;
     int email;
 };
 
 static const struct set_name_fn name_fns[] = {
-    {set_cn1, "set CN", 1, 0},
-    {set_cn2, "set CN", 1, 0},
-    {set_cn3, "set CN", 1, 0},
-    {set_cn_and_email, "set CN", 1, 0},
-    {set_email1, "set emailAddress", 0, 1},
-    {set_email2, "set emailAddress", 0, 1},
-    {set_email3, "set emailAddress", 0, 1},
-    {set_email_and_cn, "set emailAddress", 0, 1},
-    {set_altname_dns, "set dnsName", 1, 0},
-    {set_altname_email, "set rfc822Name", 0, 1},
+    { set_cn1, "set CN", 1, 0 },
+    { set_cn2, "set CN", 1, 0 },
+    { set_cn3, "set CN", 1, 0 },
+    { set_cn_and_email, "set CN", 1, 0 },
+    { set_email1, "set emailAddress", 0, 1 },
+    { set_email2, "set emailAddress", 0, 1 },
+    { set_email3, "set emailAddress", 0, 1 },
+    { set_email_and_cn, "set emailAddress", 0, 1 },
+    { set_altname_dns, "set dnsName", 1, 0 },
+    { set_altname_email, "set rfc822Name", 0, 1 },
 };
 
 static X509 *make_cert(void)
@@ -262,15 +262,15 @@ static X509 *make_cert(void)
 }
 
 static int check_message(const struct set_name_fn *fn, const char *op,
-                         const char *nameincert, int match, const char *name)
+    const char *nameincert, int match, const char *name)
 {
     char msg[1024];
 
     if (match < 0)
         return 1;
     BIO_snprintf(msg, sizeof(msg), "%s: %s: [%s] %s [%s]",
-                 fn->name, op, nameincert,
-                 match ? "matches" : "does not match", name);
+        fn->name, op, nameincert,
+        match ? "matches" : "does not match", name);
     if (is_exception(msg))
         return 1;
     TEST_error("%s", msg);
@@ -278,7 +278,7 @@ static int check_message(const struct set_name_fn *fn, const char *op,
 }
 
 static int run_cert(X509 *crt, const char *nameincert,
-                     const struct set_name_fn *fn)
+    const struct set_name_fn *fn)
 {
     const char *const *pname = names;
     int failed = 0;
@@ -295,7 +295,7 @@ static int run_cert(X509 *crt, const char *nameincert,
 
         match = -1;
         if (!TEST_int_ge(ret = X509_check_host(crt, name, namelen, 0, NULL),
-                         0)) {
+                0)) {
             failed = 1;
         } else if (fn->host) {
             if (ret == 1 && !samename)
@@ -309,8 +309,9 @@ static int run_cert(X509 *crt, const char *nameincert,
 
         match = -1;
         if (!TEST_int_ge(ret = X509_check_host(crt, name, namelen,
-                                               X509_CHECK_FLAG_NO_WILDCARDS,
-                                               NULL), 0)) {
+                             X509_CHECK_FLAG_NO_WILDCARDS,
+                             NULL),
+                0)) {
             failed = 1;
         } else if (fn->host) {
             if (ret == 1 && !samename)
@@ -320,7 +321,7 @@ static int run_cert(X509 *crt, const char *nameincert,
         } else if (ret == 1)
             match = 1;
         if (!TEST_true(check_message(fn, "host-no-wildcards",
-                                     nameincert, match, *pname)))
+                nameincert, match, *pname)))
             failed = 1;
 
         match = -1;
@@ -350,8 +351,8 @@ static int call_run_cert(int i)
     TEST_info("%s", pfn->name);
     for (pname = names; *pname != NULL; pname++) {
         if (!TEST_ptr(crt = make_cert())
-             || !TEST_true(pfn->fn(crt, *pname))
-             || !run_cert(crt, *pname, pfn))
+            || !TEST_true(pfn->fn(crt, *pname))
+            || !run_cert(crt, *pname, pfn))
             failed = 1;
         X509_free(crt);
     }
@@ -362,307 +363,252 @@ static struct gennamedata {
     const unsigned char der[22];
     size_t derlen;
 } gennames[] = {
-    {
-        /*
-        * [0] {
-        *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.1 }
-        *   [0] {
-        *     SEQUENCE {}
-        *   }
-        * }
-        */
+    { /*
+       * [0] {
+       *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.1 }
+       *   [0] {
+       *     SEQUENCE {}
+       *   }
+       * }
+       */
         {
             0xa0, 0x13, 0x06, 0x0d, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x12, 0x04,
-            0x01, 0x84, 0xb7, 0x09, 0x02, 0x01, 0xa0, 0x02, 0x30, 0x00
-        },
-        21
-    }, {
-        /*
-        * [0] {
-        *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.1 }
-        *   [0] {
-        *     [APPLICATION 0] {}
-        *   }
-        * }
-        */
+            0x01, 0x84, 0xb7, 0x09, 0x02, 0x01, 0xa0, 0x02, 0x30, 0x00 },
+        21 },
+    { /*
+       * [0] {
+       *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.1 }
+       *   [0] {
+       *     [APPLICATION 0] {}
+       *   }
+       * }
+       */
         {
             0xa0, 0x13, 0x06, 0x0d, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x12, 0x04,
-            0x01, 0x84, 0xb7, 0x09, 0x02, 0x01, 0xa0, 0x02, 0x60, 0x00
-        },
-        21
-    }, {
-        /*
-        * [0] {
-        *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.1 }
-        *   [0] {
-        *     UTF8String { "a" }
-        *   }
-        * }
-        */
+            0x01, 0x84, 0xb7, 0x09, 0x02, 0x01, 0xa0, 0x02, 0x60, 0x00 },
+        21 },
+    { /*
+       * [0] {
+       *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.1 }
+       *   [0] {
+       *     UTF8String { "a" }
+       *   }
+       * }
+       */
         {
             0xa0, 0x14, 0x06, 0x0d, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x12, 0x04,
-            0x01, 0x84, 0xb7, 0x09, 0x02, 0x01, 0xa0, 0x03, 0x0c, 0x01, 0x61
-        },
-        22
-    }, {
-        /*
-        * [0] {
-        *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.2 }
-        *   [0] {
-        *     UTF8String { "a" }
-        *   }
-        * }
-        */
+            0x01, 0x84, 0xb7, 0x09, 0x02, 0x01, 0xa0, 0x03, 0x0c, 0x01, 0x61 },
+        22 },
+    { /*
+       * [0] {
+       *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.2 }
+       *   [0] {
+       *     UTF8String { "a" }
+       *   }
+       * }
+       */
         {
             0xa0, 0x14, 0x06, 0x0d, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x12, 0x04,
-            0x01, 0x84, 0xb7, 0x09, 0x02, 0x02, 0xa0, 0x03, 0x0c, 0x01, 0x61
-        },
-        22
-    }, {
-        /*
-        * [0] {
-        *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.1 }
-        *   [0] {
-        *     UTF8String { "b" }
-        *   }
-        * }
-        */
+            0x01, 0x84, 0xb7, 0x09, 0x02, 0x02, 0xa0, 0x03, 0x0c, 0x01, 0x61 },
+        22 },
+    { /*
+       * [0] {
+       *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.1 }
+       *   [0] {
+       *     UTF8String { "b" }
+       *   }
+       * }
+       */
         {
             0xa0, 0x14, 0x06, 0x0d, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x12, 0x04,
-            0x01, 0x84, 0xb7, 0x09, 0x02, 0x01, 0xa0, 0x03, 0x0c, 0x01, 0x62
-        },
-        22
-    }, {
-        /*
-        * [0] {
-        *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.1 }
-        *   [0] {
-        *     BOOLEAN { TRUE }
-        *   }
-        * }
-        */
+            0x01, 0x84, 0xb7, 0x09, 0x02, 0x01, 0xa0, 0x03, 0x0c, 0x01, 0x62 },
+        22 },
+    { /*
+       * [0] {
+       *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.1 }
+       *   [0] {
+       *     BOOLEAN { TRUE }
+       *   }
+       * }
+       */
         {
             0xa0, 0x14, 0x06, 0x0d, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x12, 0x04,
-            0x01, 0x84, 0xb7, 0x09, 0x02, 0x01, 0xa0, 0x03, 0x01, 0x01, 0xff
-        },
-        22
-    }, {
-        /*
-        * [0] {
-        *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.1 }
-        *   [0] {
-        *     BOOLEAN { FALSE }
-        *   }
-        * }
-        */
+            0x01, 0x84, 0xb7, 0x09, 0x02, 0x01, 0xa0, 0x03, 0x01, 0x01, 0xff },
+        22 },
+    { /*
+       * [0] {
+       *   OBJECT_IDENTIFIER { 1.2.840.113554.4.1.72585.2.1 }
+       *   [0] {
+       *     BOOLEAN { FALSE }
+       *   }
+       * }
+       */
         {
             0xa0, 0x14, 0x06, 0x0d, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x12, 0x04,
-            0x01, 0x84, 0xb7, 0x09, 0x02, 0x01, 0xa0, 0x03, 0x01, 0x01, 0x00
-        },
-        22
-    }, {
-        /* [1 PRIMITIVE] { "a" } */
+            0x01, 0x84, 0xb7, 0x09, 0x02, 0x01, 0xa0, 0x03, 0x01, 0x01, 0x00 },
+        22 },
+    { /* [1 PRIMITIVE] { "a" } */
         {
-            0x81, 0x01, 0x61
-        },
-        3
-    }, {
-        /* [1 PRIMITIVE] { "b" } */
+            0x81, 0x01, 0x61 },
+        3 },
+    { /* [1 PRIMITIVE] { "b" } */
         {
-            0x81, 0x01, 0x62
-        },
-        3
-    }, {
-        /* [2 PRIMITIVE] { "a" } */
+            0x81, 0x01, 0x62 },
+        3 },
+    { /* [2 PRIMITIVE] { "a" } */
         {
-            0x82, 0x01, 0x61
-        },
-        3
-    }, {
-        /* [2 PRIMITIVE] { "b" } */
+            0x82, 0x01, 0x61 },
+        3 },
+    { /* [2 PRIMITIVE] { "b" } */
         {
-            0x82, 0x01, 0x62
-        },
-        3
-    }, {
-        /*
-        * [4] {
-        *   SEQUENCE {
-        *     SET {
-        *       SEQUENCE {
-        *         # commonName
-        *         OBJECT_IDENTIFIER { 2.5.4.3 }
-        *         UTF8String { "a" }
-        *       }
-        *     }
-        *   }
-        * }
-        */
+            0x82, 0x01, 0x62 },
+        3 },
+    { /*
+       * [4] {
+       *   SEQUENCE {
+       *     SET {
+       *       SEQUENCE {
+       *         # commonName
+       *         OBJECT_IDENTIFIER { 2.5.4.3 }
+       *         UTF8String { "a" }
+       *       }
+       *     }
+       *   }
+       * }
+       */
         {
             0xa4, 0x0e, 0x30, 0x0c, 0x31, 0x0a, 0x30, 0x08, 0x06, 0x03, 0x55,
-            0x04, 0x03, 0x0c, 0x01, 0x61
-        },
-        16
-    }, {
-        /*
-        * [4] {
-        *   SEQUENCE {
-        *     SET {
-        *       SEQUENCE {
-        *         # commonName
-        *         OBJECT_IDENTIFIER { 2.5.4.3 }
-        *         UTF8String { "b" }
-        *       }
-        *     }
-        *   }
-        * }
-        */
+            0x04, 0x03, 0x0c, 0x01, 0x61 },
+        16 },
+    { /*
+       * [4] {
+       *   SEQUENCE {
+       *     SET {
+       *       SEQUENCE {
+       *         # commonName
+       *         OBJECT_IDENTIFIER { 2.5.4.3 }
+       *         UTF8String { "b" }
+       *       }
+       *     }
+       *   }
+       * }
+       */
         {
             0xa4, 0x0e, 0x30, 0x0c, 0x31, 0x0a, 0x30, 0x08, 0x06, 0x03, 0x55,
-            0x04, 0x03, 0x0c, 0x01, 0x62
-        },
-        16
-    }, {
-        /*
-        * [5] {
-        *   [1] {
-        *     UTF8String { "a" }
-        *   }
-        * }
-        */
+            0x04, 0x03, 0x0c, 0x01, 0x62 },
+        16 },
+    { /*
+       * [5] {
+       *   [1] {
+       *     UTF8String { "a" }
+       *   }
+       * }
+       */
         {
-            0xa5, 0x05, 0xa1, 0x03, 0x0c, 0x01, 0x61
-        },
-        7
-    }, {
-        /*
-        * [5] {
-        *   [1] {
-        *     UTF8String { "b" }
-        *   }
-        * }
-        */
+            0xa5, 0x05, 0xa1, 0x03, 0x0c, 0x01, 0x61 },
+        7 },
+    { /*
+       * [5] {
+       *   [1] {
+       *     UTF8String { "b" }
+       *   }
+       * }
+       */
         {
-            0xa5, 0x05, 0xa1, 0x03, 0x0c, 0x01, 0x62
-        },
-        7
-    }, {
-        /*
-        * [5] {
-        *   [0] {
-        *     UTF8String {}
-        *   }
-        *   [1] {
-        *     UTF8String { "a" }
-        *   }
-        * }
-        */
+            0xa5, 0x05, 0xa1, 0x03, 0x0c, 0x01, 0x62 },
+        7 },
+    { /*
+       * [5] {
+       *   [0] {
+       *     UTF8String {}
+       *   }
+       *   [1] {
+       *     UTF8String { "a" }
+       *   }
+       * }
+       */
         {
-            0xa5, 0x09, 0xa0, 0x02, 0x0c, 0x00, 0xa1, 0x03, 0x0c, 0x01, 0x61
-        },
-        11
-    }, {
-        /*
-        * [5] {
-        *   [0] {
-        *     UTF8String { "a" }
-        *   }
-        *   [1] {
-        *     UTF8String { "a" }
-        *   }
-        * }
-        */
+            0xa5, 0x09, 0xa0, 0x02, 0x0c, 0x00, 0xa1, 0x03, 0x0c, 0x01, 0x61 },
+        11 },
+    { /*
+       * [5] {
+       *   [0] {
+       *     UTF8String { "a" }
+       *   }
+       *   [1] {
+       *     UTF8String { "a" }
+       *   }
+       * }
+       */
         {
             0xa5, 0x0a, 0xa0, 0x03, 0x0c, 0x01, 0x61, 0xa1, 0x03, 0x0c, 0x01,
-            0x61
-        },
-        12
-    }, {
-        /*
-        * [5] {
-        *   [0] {
-        *     UTF8String { "b" }
-        *   }
-        *   [1] {
-        *     UTF8String { "a" }
-        *   }
-        * }
-        */
+            0x61 },
+        12 },
+    { /*
+       * [5] {
+       *   [0] {
+       *     UTF8String { "b" }
+       *   }
+       *   [1] {
+       *     UTF8String { "a" }
+       *   }
+       * }
+       */
         {
             0xa5, 0x0a, 0xa0, 0x03, 0x0c, 0x01, 0x62, 0xa1, 0x03, 0x0c, 0x01,
-            0x61
-        },
-        12
-    }, {
-        /* [6 PRIMITIVE] { "a" } */
+            0x61 },
+        12 },
+    { /* [6 PRIMITIVE] { "a" } */
         {
-            0x86, 0x01, 0x61
-        },
-        3
-    }, {
-        /* [6 PRIMITIVE] { "b" } */
+            0x86, 0x01, 0x61 },
+        3 },
+    { /* [6 PRIMITIVE] { "b" } */
         {
-            0x86, 0x01, 0x62
-        },
-        3
-    }, {
-        /* [7 PRIMITIVE] { `11111111` } */
+            0x86, 0x01, 0x62 },
+        3 },
+    { /* [7 PRIMITIVE] { `11111111` } */
         {
-            0x87, 0x04, 0x11, 0x11, 0x11, 0x11
-        },
-        6
-    }, {
-        /* [7 PRIMITIVE] { `22222222`} */
+            0x87, 0x04, 0x11, 0x11, 0x11, 0x11 },
+        6 },
+    { /* [7 PRIMITIVE] { `22222222`} */
         {
-            0x87, 0x04, 0x22, 0x22, 0x22, 0x22
-        },
-        6
-    }, {
-        /* [7 PRIMITIVE] { `11111111111111111111111111111111` } */
+            0x87, 0x04, 0x22, 0x22, 0x22, 0x22 },
+        6 },
+    { /* [7 PRIMITIVE] { `11111111111111111111111111111111` } */
         {
             0x87, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
-            0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11
-        },
-        18
-    }, {
-        /* [7 PRIMITIVE] { `22222222222222222222222222222222` } */
+            0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11 },
+        18 },
+    { /* [7 PRIMITIVE] { `22222222222222222222222222222222` } */
         {
             0x87, 0x10, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
-            0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22
-        },
-        18
-    }, {
-        /* [8 PRIMITIVE] { 1.2.840.113554.4.1.72585.2.1 } */
+            0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22 },
+        18 },
+    { /* [8 PRIMITIVE] { 1.2.840.113554.4.1.72585.2.1 } */
         {
             0x88, 0x0d, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x12, 0x04, 0x01, 0x84,
-            0xb7, 0x09, 0x02, 0x01
-        },
-        15
-    }, {
-        /* [8 PRIMITIVE] { 1.2.840.113554.4.1.72585.2.2 } */
+            0xb7, 0x09, 0x02, 0x01 },
+        15 },
+    { /* [8 PRIMITIVE] { 1.2.840.113554.4.1.72585.2.2 } */
         {
             0x88, 0x0d, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x12, 0x04, 0x01, 0x84,
-            0xb7, 0x09, 0x02, 0x02
-        },
-        15
-    }, {
-        /*
-         * Regression test for CVE-2023-0286.
-         */
+            0xb7, 0x09, 0x02, 0x02 },
+        15 },
+    { /*
+       * Regression test for CVE-2023-0286.
+       */
         {
-            0xa3, 0x00
-        },
-        2
-    }
+            0xa3, 0x00 },
+        2 }
 };
 
 static int test_GENERAL_NAME_cmp(void)
 {
     size_t i, j;
     GENERAL_NAME **namesa = OPENSSL_malloc(sizeof(*namesa)
-                                           * OSSL_NELEM(gennames));
+        * OSSL_NELEM(gennames));
     GENERAL_NAME **namesb = OPENSSL_malloc(sizeof(*namesb)
-                                           * OSSL_NELEM(gennames));
+        * OSSL_NELEM(gennames));
     int testresult = 0;
 
     if (!TEST_ptr(namesa) || !TEST_ptr(namesb))
@@ -696,7 +642,7 @@ static int test_GENERAL_NAME_cmp(void)
     }
     testresult = 1;
 
- end:
+end:
     for (i = 0; i < OSSL_NELEM(gennames); i++) {
         if (namesa != NULL)
             GENERAL_NAME_free(namesa[i]);
diff --git a/test/verify_extra_test.c b/test/verify_extra_test.c
index 57f761f078e50..ad2649034fa98 100644
--- a/test/verify_extra_test.c
+++ b/test/verify_extra_test.c
@@ -96,7 +96,7 @@ static int test_alt_chains_cert_forgery(void)
         /* This is the result we were expecting: Test passed */
         ret = 1;
     }
- err:
+err:
     X509_STORE_CTX_free(sctx);
     X509_free(x);
     OSSL_STACK_OF_X509_free(untrusted);
@@ -120,7 +120,7 @@ static int test_distinguishing_id(void)
         goto err;
 
     if (!ASN1_OCTET_STRING_set(v, (unsigned char *)distid,
-                               (int)strlen(distid))) {
+            (int)strlen(distid))) {
         ASN1_OCTET_STRING_free(v);
         goto err;
     }
@@ -129,11 +129,11 @@ static int test_distinguishing_id(void)
 
     v2 = X509_get0_distinguishing_id(x);
     if (!TEST_ptr(v2)
-            || !TEST_int_eq(ASN1_OCTET_STRING_cmp(v, v2), 0))
+        || !TEST_int_eq(ASN1_OCTET_STRING_cmp(v, v2), 0))
         goto err;
 
     ret = 1;
- err:
+err:
     X509_free(x);
     return ret;
 }
@@ -159,7 +159,7 @@ static int test_req_distinguishing_id(void)
         goto err;
 
     if (!ASN1_OCTET_STRING_set(v, (unsigned char *)distid,
-                               (int)strlen(distid))) {
+            (int)strlen(distid))) {
         ASN1_OCTET_STRING_free(v);
         goto err;
     }
@@ -168,11 +168,11 @@ static int test_req_distinguishing_id(void)
 
     v2 = X509_REQ_get0_distinguishing_id(x);
     if (!TEST_ptr(v2)
-            || !TEST_int_eq(ASN1_OCTET_STRING_cmp(v, v2), 0))
+        || !TEST_int_eq(ASN1_OCTET_STRING_cmp(v, v2), 0))
         goto err;
 
     ret = 1;
- err:
+err:
     X509_REQ_free(x);
     BIO_free(bio);
     return ret;
@@ -233,14 +233,13 @@ static int do_test_purpose(int purpose, int expected)
     int testresult = 0;
 
     if (!TEST_ptr(eecert)
-            || !TEST_ptr(untrcert)
-            || !TEST_ptr(trcert)
-            || !TEST_ptr(trusted)
-            || !TEST_ptr(untrusted)
-            || !TEST_ptr(ctx))
+        || !TEST_ptr(untrcert)
+        || !TEST_ptr(trcert)
+        || !TEST_ptr(trusted)
+        || !TEST_ptr(untrusted)
+        || !TEST_ptr(ctx))
         goto err;
 
-
     if (!TEST_true(sk_X509_push(trusted, trcert)))
         goto err;
     trcert = NULL;
@@ -265,7 +264,7 @@ static int do_test_purpose(int purpose, int expected)
         goto err;
 
     testresult = 1;
- err:
+err:
     OSSL_STACK_OF_X509_free(trusted);
     OSSL_STACK_OF_X509_free(untrusted);
     X509_STORE_CTX_free(ctx);
@@ -303,13 +302,13 @@ int setup_tests(void)
         return 0;
 
     if (!TEST_ptr(root_f = test_mk_file_path(certs_dir, "rootCA.pem"))
-            || !TEST_ptr(roots_f = test_mk_file_path(certs_dir, "roots.pem"))
-            || !TEST_ptr(untrusted_f = test_mk_file_path(certs_dir, "untrusted.pem"))
-            || !TEST_ptr(bad_f = test_mk_file_path(certs_dir, "bad.pem"))
-            || !TEST_ptr(req_f = test_mk_file_path(certs_dir, "sm2-csr.pem"))
-            || !TEST_ptr(sroot_cert = test_mk_file_path(certs_dir, "sroot-cert.pem"))
-            || !TEST_ptr(ca_cert = test_mk_file_path(certs_dir, "ca-cert.pem"))
-            || !TEST_ptr(ee_cert = test_mk_file_path(certs_dir, "ee-cert.pem")))
+        || !TEST_ptr(roots_f = test_mk_file_path(certs_dir, "roots.pem"))
+        || !TEST_ptr(untrusted_f = test_mk_file_path(certs_dir, "untrusted.pem"))
+        || !TEST_ptr(bad_f = test_mk_file_path(certs_dir, "bad.pem"))
+        || !TEST_ptr(req_f = test_mk_file_path(certs_dir, "sm2-csr.pem"))
+        || !TEST_ptr(sroot_cert = test_mk_file_path(certs_dir, "sroot-cert.pem"))
+        || !TEST_ptr(ca_cert = test_mk_file_path(certs_dir, "ca-cert.pem"))
+        || !TEST_ptr(ee_cert = test_mk_file_path(certs_dir, "ee-cert.pem")))
         goto err;
 
     ADD_TEST(test_alt_chains_cert_forgery);
@@ -323,7 +322,7 @@ int setup_tests(void)
     ADD_TEST(test_purpose_ssl_server);
     ADD_TEST(test_purpose_any);
     return 1;
- err:
+err:
     cleanup_tests();
     return 0;
 }
diff --git a/test/versions.c b/test/versions.c
index c393289b7c332..2df4a7e2691d5 100644
--- a/test/versions.c
+++ b/test/versions.c
@@ -16,6 +16,6 @@ int main(void)
 {
     printf("Build version: %s\n", OPENSSL_FULL_VERSION_STR);
     printf("Library version: %s\n",
-           OpenSSL_version(OPENSSL_FULL_VERSION_STRING));
+        OpenSSL_version(OPENSSL_FULL_VERSION_STRING));
     return 0;
 }
diff --git a/test/wpackettest.c b/test/wpackettest.c
index bd696e0074078..05de73f002628 100644
--- a/test/wpackettest.c
+++ b/test/wpackettest.c
@@ -70,35 +70,35 @@ static int test_WPACKET_init(void)
     unsigned char sbuf[3];
 
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-                /* Closing a top level WPACKET should fail */
-            || !TEST_false(WPACKET_close(&pkt))
-                /* Finishing a top level WPACKET should succeed */
-            || !TEST_true(WPACKET_finish(&pkt))
-                /*
-                 * Can't call close or finish on a WPACKET that's already
-                 * finished.
-                 */
-            || !TEST_false(WPACKET_close(&pkt))
-            || !TEST_false(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, simple1, sizeof(simple1)))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        /* Closing a top level WPACKET should fail */
+        || !TEST_false(WPACKET_close(&pkt))
+        /* Finishing a top level WPACKET should succeed */
+        || !TEST_true(WPACKET_finish(&pkt))
+        /*
+         * Can't call close or finish on a WPACKET that's already
+         * finished.
+         */
+        || !TEST_false(WPACKET_close(&pkt))
+        || !TEST_false(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, simple1, sizeof(simple1)))
         return cleanup(&pkt);
 
     /* Now try with a one byte length prefix */
     if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, simple2, sizeof(simple2)))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, simple2, sizeof(simple2)))
         return cleanup(&pkt);
 
     /* And a longer length prefix */
     if (!TEST_true(WPACKET_init_len(&pkt, buf, 4))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, simple3, sizeof(simple3)))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, simple3, sizeof(simple3)))
         return cleanup(&pkt);
 
     if (!TEST_true(WPACKET_init_len(&pkt, buf, 1)))
@@ -116,23 +116,23 @@ static int test_WPACKET_init(void)
 
     /* Test initialising from a fixed size buffer */
     if (!TEST_true(WPACKET_init_static_len(&pkt, sbuf, sizeof(sbuf), 0))
-                /* Adding 3 bytes should succeed */
-            || !TEST_true(WPACKET_put_bytes_u24(&pkt, 0xffffff))
-                /* Adding 1 more byte should fail */
-            || !TEST_false(WPACKET_put_bytes_u8(&pkt, 0xff))
-                /* Finishing the top level WPACKET should succeed */
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(sbuf, written, fixed, sizeof(sbuf))
-                /* Initialise with 1 len byte */
-            || !TEST_true(WPACKET_init_static_len(&pkt, sbuf, sizeof(sbuf), 1))
-                /* Adding 2 bytes should succeed */
-            || !TEST_true(WPACKET_put_bytes_u16(&pkt, 0xfeff))
-                /* Adding 1 more byte should fail */
-            || !TEST_false(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(sbuf, written, alloc, sizeof(alloc)))
+        /* Adding 3 bytes should succeed */
+        || !TEST_true(WPACKET_put_bytes_u24(&pkt, 0xffffff))
+        /* Adding 1 more byte should fail */
+        || !TEST_false(WPACKET_put_bytes_u8(&pkt, 0xff))
+        /* Finishing the top level WPACKET should succeed */
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(sbuf, written, fixed, sizeof(sbuf))
+        /* Initialise with 1 len byte */
+        || !TEST_true(WPACKET_init_static_len(&pkt, sbuf, sizeof(sbuf), 1))
+        /* Adding 2 bytes should succeed */
+        || !TEST_true(WPACKET_put_bytes_u16(&pkt, 0xfeff))
+        /* Adding 1 more byte should fail */
+        || !TEST_false(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(sbuf, written, alloc, sizeof(alloc)))
         return cleanup(&pkt);
 
     return 1;
@@ -144,42 +144,42 @@ static int test_WPACKET_set_max_size(void)
     size_t written;
 
     if (!TEST_true(WPACKET_init(&pkt, buf))
-                /*
-                 * No previous lenbytes set so we should be ok to set the max
-                 * possible max size
-                 */
-            || !TEST_true(WPACKET_set_max_size(&pkt, SIZE_MAX))
-                /* We should be able to set it smaller too */
-            || !TEST_true(WPACKET_set_max_size(&pkt, SIZE_MAX -1))
-                /* And setting it bigger again should be ok */
-            || !TEST_true(WPACKET_set_max_size(&pkt, SIZE_MAX))
-            || !TEST_true(WPACKET_finish(&pkt)))
+        /*
+         * No previous lenbytes set so we should be ok to set the max
+         * possible max size
+         */
+        || !TEST_true(WPACKET_set_max_size(&pkt, SIZE_MAX))
+        /* We should be able to set it smaller too */
+        || !TEST_true(WPACKET_set_max_size(&pkt, SIZE_MAX - 1))
+        /* And setting it bigger again should be ok */
+        || !TEST_true(WPACKET_set_max_size(&pkt, SIZE_MAX))
+        || !TEST_true(WPACKET_finish(&pkt)))
         return cleanup(&pkt);
 
     if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
-                /*
-                 * Should fail because we already consumed 1 byte with the
-                 * length
-                 */
-            || !TEST_false(WPACKET_set_max_size(&pkt, 0))
-                /*
-                 * Max size can't be bigger than biggest that will fit in
-                 * lenbytes
-                 */
-            || !TEST_false(WPACKET_set_max_size(&pkt, 0x0101))
-                /* It can be the same as the maximum possible size */
-            || !TEST_true(WPACKET_set_max_size(&pkt, 0x0100))
-                /* Or it can be less */
-            || !TEST_true(WPACKET_set_max_size(&pkt, 0x01))
-                /* Should fail because packet is already filled */
-            || !TEST_false(WPACKET_put_bytes_u8(&pkt, 0xff))
-                /* You can't put in more bytes than max size */
-            || !TEST_true(WPACKET_set_max_size(&pkt, 0x02))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_false(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, simple2, sizeof(simple2)))
+        /*
+         * Should fail because we already consumed 1 byte with the
+         * length
+         */
+        || !TEST_false(WPACKET_set_max_size(&pkt, 0))
+        /*
+         * Max size can't be bigger than biggest that will fit in
+         * lenbytes
+         */
+        || !TEST_false(WPACKET_set_max_size(&pkt, 0x0101))
+        /* It can be the same as the maximum possible size */
+        || !TEST_true(WPACKET_set_max_size(&pkt, 0x0100))
+        /* Or it can be less */
+        || !TEST_true(WPACKET_set_max_size(&pkt, 0x01))
+        /* Should fail because packet is already filled */
+        || !TEST_false(WPACKET_put_bytes_u8(&pkt, 0xff))
+        /* You can't put in more bytes than max size */
+        || !TEST_true(WPACKET_set_max_size(&pkt, 0x02))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_false(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, simple2, sizeof(simple2)))
         return cleanup(&pkt);
 
     return 1;
@@ -192,81 +192,80 @@ static int test_WPACKET_start_sub_packet(void)
     size_t len;
 
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_start_sub_packet(&pkt))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-                /* Can't finish because we have a sub packet */
-            || !TEST_false(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_close(&pkt))
-                /* Sub packet is closed so can't close again */
-            || !TEST_false(WPACKET_close(&pkt))
-                /* Now a top level so finish should succeed */
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, simple1, sizeof(simple1)))
-        return cleanup(&pkt);
-
-   /* Single sub-packet with length prefix */
+        || !TEST_true(WPACKET_start_sub_packet(&pkt))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        /* Can't finish because we have a sub packet */
+        || !TEST_false(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_close(&pkt))
+        /* Sub packet is closed so can't close again */
+        || !TEST_false(WPACKET_close(&pkt))
+        /* Now a top level so finish should succeed */
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, simple1, sizeof(simple1)))
+        return cleanup(&pkt);
+
+    /* Single sub-packet with length prefix */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, simple2, sizeof(simple2)))
+        || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, simple2, sizeof(simple2)))
         return cleanup(&pkt);
 
     /* Nested sub-packets with length prefixes */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_get_length(&pkt, &len))
-            || !TEST_size_t_eq(len, 1)
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_get_length(&pkt, &len))
-            || !TEST_size_t_eq(len, 3)
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, nestedsub, sizeof(nestedsub)))
+        || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_get_length(&pkt, &len))
+        || !TEST_size_t_eq(len, 1)
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_get_length(&pkt, &len))
+        || !TEST_size_t_eq(len, 3)
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, nestedsub, sizeof(nestedsub)))
         return cleanup(&pkt);
 
     /* Sequential sub-packets with length prefixes */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, seqsub, sizeof(seqsub)))
+        || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, seqsub, sizeof(seqsub)))
         return cleanup(&pkt);
 
     /* Nested sub-packets with lengths filled before finish */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_get_length(&pkt, &len))
-            || !TEST_size_t_eq(len, 1)
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_get_length(&pkt, &len))
-            || !TEST_size_t_eq(len, 3)
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_fill_lengths(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, nestedsub, sizeof(nestedsub))
-            || !TEST_true(WPACKET_finish(&pkt)))
+        || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_get_length(&pkt, &len))
+        || !TEST_size_t_eq(len, 1)
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_get_length(&pkt, &len))
+        || !TEST_size_t_eq(len, 3)
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_fill_lengths(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, nestedsub, sizeof(nestedsub))
+        || !TEST_true(WPACKET_finish(&pkt)))
         return cleanup(&pkt);
 
     return 1;
 }
 
-
 static int test_WPACKET_set_flags(void)
 {
     WPACKET pkt;
@@ -274,55 +273,55 @@ static int test_WPACKET_set_flags(void)
 
     /* Set packet to be non-zero length */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH))
-                /* Should fail because of zero length */
-            || !TEST_false(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, simple1, sizeof(simple1)))
+        || !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH))
+        /* Should fail because of zero length */
+        || !TEST_false(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, simple1, sizeof(simple1)))
         return cleanup(&pkt);
 
     /* Repeat above test in a sub-packet */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_start_sub_packet(&pkt))
-            || !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH))
-                /* Should fail because of zero length */
-            || !TEST_false(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, simple1, sizeof(simple1)))
+        || !TEST_true(WPACKET_start_sub_packet(&pkt))
+        || !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_NON_ZERO_LENGTH))
+        /* Should fail because of zero length */
+        || !TEST_false(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, simple1, sizeof(simple1)))
         return cleanup(&pkt);
 
     /* Set packet to abandon non-zero length */
     if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
-            || !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_size_t_eq(written, 0))
+        || !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_size_t_eq(written, 0))
         return cleanup(&pkt);
 
     /* Repeat above test but only abandon a sub-packet */
     if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
-            || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
-            || !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, empty, sizeof(empty)))
+        || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
+        || !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, empty, sizeof(empty)))
         return cleanup(&pkt);
 
     /* And repeat with a non empty sub-packet */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
-            || !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, simple2, sizeof(simple2)))
+        || !TEST_true(WPACKET_start_sub_packet_u8(&pkt))
+        || !TEST_true(WPACKET_set_flags(&pkt, WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xff))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, simple2, sizeof(simple2)))
         return cleanup(&pkt);
     return 1;
 }
@@ -334,24 +333,24 @@ static int test_WPACKET_allocate_bytes(void)
     unsigned char *bytes;
 
     if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
-            || !TEST_true(WPACKET_allocate_bytes(&pkt, 2, &bytes)))
+        || !TEST_true(WPACKET_allocate_bytes(&pkt, 2, &bytes)))
         return cleanup(&pkt);
     bytes[0] = 0xfe;
     bytes[1] = 0xff;
     if (!TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, alloc, sizeof(alloc)))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, alloc, sizeof(alloc)))
         return cleanup(&pkt);
 
     /* Repeat with WPACKET_sub_allocate_bytes */
     if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
-            || !TEST_true(WPACKET_sub_allocate_bytes_u8(&pkt, 2, &bytes)))
+        || !TEST_true(WPACKET_sub_allocate_bytes_u8(&pkt, 2, &bytes)))
         return cleanup(&pkt);
     bytes[0] = 0xfe;
     bytes[1] = 0xff;
     if (!TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, submem, sizeof(submem)))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, submem, sizeof(submem)))
         return cleanup(&pkt);
 
     return 1;
@@ -364,18 +363,18 @@ static int test_WPACKET_memcpy(void)
     const unsigned char bytes[] = { 0xfe, 0xff };
 
     if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
-            || !TEST_true(WPACKET_memcpy(&pkt, bytes, sizeof(bytes)))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, alloc, sizeof(alloc)))
+        || !TEST_true(WPACKET_memcpy(&pkt, bytes, sizeof(bytes)))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, alloc, sizeof(alloc)))
         return cleanup(&pkt);
 
     /* Repeat with WPACKET_sub_memcpy() */
     if (!TEST_true(WPACKET_init_len(&pkt, buf, 1))
-            || !TEST_true(WPACKET_sub_memcpy_u8(&pkt, bytes, sizeof(bytes)))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, submem, sizeof(submem)))
+        || !TEST_true(WPACKET_sub_memcpy_u8(&pkt, bytes, sizeof(bytes)))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, submem, sizeof(submem)))
         return cleanup(&pkt);
 
     return 1;
@@ -386,7 +385,7 @@ static int test_WPACKET_init_der(void)
     WPACKET pkt;
     unsigned char sbuf[1024];
     unsigned char testdata[] = { 0x00, 0x01, 0x02, 0x03 };
-    unsigned char testdata2[259]  = { 0x82, 0x01, 0x00 };
+    unsigned char testdata2[259] = { 0x82, 0x01, 0x00 };
     size_t written[2];
     size_t size1, size2;
     int flags = WPACKET_FLAGS_ABANDON_ON_ZERO_LENGTH;
@@ -394,23 +393,23 @@ static int test_WPACKET_init_der(void)
 
     /* Test initialising for writing DER */
     if (!TEST_true(WPACKET_init_der(&pkt, sbuf, sizeof(sbuf)))
-            || !TEST_true(WPACKET_put_bytes_u24(&pkt, 0xfffefd))
-               /* Test writing data in a length prefixed sub-packet */
-            || !TEST_true(WPACKET_start_sub_packet(&pkt))
-            || !TEST_true(WPACKET_memcpy(&pkt, testdata, sizeof(testdata)))
+        || !TEST_true(WPACKET_put_bytes_u24(&pkt, 0xfffefd))
+        /* Test writing data in a length prefixed sub-packet */
+        || !TEST_true(WPACKET_start_sub_packet(&pkt))
+        || !TEST_true(WPACKET_memcpy(&pkt, testdata, sizeof(testdata)))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xfc))
+        /* this sub-packet is empty, and should render zero bytes */
+        || (!TEST_true(WPACKET_start_sub_packet(&pkt))
+            || !TEST_true(WPACKET_set_flags(&pkt, flags))
+            || !TEST_true(WPACKET_get_total_written(&pkt, &size1))
             || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_put_bytes_u8(&pkt, 0xfc))
-            /* this sub-packet is empty, and should render zero bytes */
-            || (!TEST_true(WPACKET_start_sub_packet(&pkt))
-                || !TEST_true(WPACKET_set_flags(&pkt, flags))
-                || !TEST_true(WPACKET_get_total_written(&pkt, &size1))
-                || !TEST_true(WPACKET_close(&pkt))
-                || !TEST_true(WPACKET_get_total_written(&pkt, &size2))
-                || !TEST_size_t_eq(size1, size2))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written[0]))
-            || !TEST_mem_eq(WPACKET_get_curr(&pkt), written[0], simpleder,
-                            sizeof(simpleder)))
+            || !TEST_true(WPACKET_get_total_written(&pkt, &size2))
+            || !TEST_size_t_eq(size1, size2))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written[0]))
+        || !TEST_mem_eq(WPACKET_get_curr(&pkt), written[0], simpleder,
+            sizeof(simpleder)))
         return cleanup(&pkt);
 
     /* Generate random packet data for test */
@@ -432,11 +431,11 @@ static int test_WPACKET_init_der(void)
         }
         if (!TEST_true(WPACKET_start_sub_packet(&pkt))
             || !TEST_true(WPACKET_memcpy(&pkt, &testdata2[3],
-                                         sizeof(testdata2) - 3))
+                sizeof(testdata2) - 3))
             || !TEST_true(WPACKET_close(&pkt))
             || !TEST_true(WPACKET_finish(&pkt))
             || !TEST_true(WPACKET_get_total_written(&pkt, &written[i])))
-        return cleanup(&pkt);
+            return cleanup(&pkt);
     }
 
     /*
@@ -445,8 +444,8 @@ static int test_WPACKET_init_der(void)
      * packet looks as we expect it to.
      */
     if (!TEST_size_t_eq(written[0], written[1])
-            || !TEST_mem_eq(WPACKET_get_curr(&pkt), written[1], testdata2,
-                            sizeof(testdata2)))
+        || !TEST_mem_eq(WPACKET_get_curr(&pkt), written[1], testdata2,
+            sizeof(testdata2)))
         return 0;
 
     return 1;
@@ -462,70 +461,70 @@ static int test_WPACKET_quic(void)
 
     /* QUIC sub-packet with 4-byte length prefix, containing a 1-byte vlint */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_start_quic_sub_packet(&pkt))
-            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x09))
-                /* Can't finish because we have a sub packet */
-            || !TEST_false(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_close(&pkt))
-                /* Sub packet is closed so can't close again */
-            || !TEST_false(WPACKET_close(&pkt))
-                /* Now a top level so finish should succeed */
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, quic1, sizeof(quic1)))
+        || !TEST_true(WPACKET_start_quic_sub_packet(&pkt))
+        || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x09))
+        /* Can't finish because we have a sub packet */
+        || !TEST_false(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_close(&pkt))
+        /* Sub packet is closed so can't close again */
+        || !TEST_false(WPACKET_close(&pkt))
+        /* Now a top level so finish should succeed */
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, quic1, sizeof(quic1)))
         return cleanup(&pkt);
 
     /* QUIC sub-packet with 1-byte length prefix, containing a 1-byte vlint */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_1B_MAX))
-            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x09))
-            || !TEST_false(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_false(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, quic2, sizeof(quic2)))
+        || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_1B_MAX))
+        || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x09))
+        || !TEST_false(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_false(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, quic2, sizeof(quic2)))
         return cleanup(&pkt);
 
     /* QUIC sub-packet with 2-byte length prefix, containing a 2-byte vlint */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
-            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x41))
-            || !TEST_false(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_false(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, quic3, sizeof(quic3)))
+        || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
+        || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x41))
+        || !TEST_false(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_false(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, quic3, sizeof(quic3)))
         return cleanup(&pkt);
 
     /* QUIC sub-packet with 8-byte length prefix, containing a 4-byte vlint */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_8B_MIN))
-            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x13c6a))
-            || !TEST_false(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_false(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, quic4, sizeof(quic4)))
+        || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_8B_MIN))
+        || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x13c6a))
+        || !TEST_false(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_false(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, quic4, sizeof(quic4)))
         return cleanup(&pkt);
 
     /* QUIC sub-packet with 8-byte length prefix, containing a 8-byte vlint */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_8B_MIN))
-            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x2f77213f3f505ba5ULL))
-            || !TEST_false(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_false(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, quic5, sizeof(quic5)))
+        || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_8B_MIN))
+        || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x2f77213f3f505ba5ULL))
+        || !TEST_false(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_false(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, quic5, sizeof(quic5)))
         return cleanup(&pkt);
 
     /* QUIC sub-packet, length known up-front */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_quic_sub_allocate_bytes(&pkt, 3, &bytes)))
+        || !TEST_true(WPACKET_quic_sub_allocate_bytes(&pkt, 3, &bytes)))
         return cleanup(&pkt);
 
     bytes[0] = 0x55;
@@ -533,46 +532,46 @@ static int test_WPACKET_quic(void)
     bytes[2] = 0x77;
 
     if (!TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, quic6, sizeof(quic6)))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, quic6, sizeof(quic6)))
         return cleanup(&pkt);
 
     /* Nested and sequential sub-packets with length prefixes */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x07))
-            || !TEST_true(WPACKET_get_length(&pkt, &len))
-            || !TEST_size_t_eq(len, 1)
-            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_4B_MIN))
-            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x2514))
-            || !TEST_true(WPACKET_get_length(&pkt, &len))
-            || !TEST_size_t_eq(len, 2)
-            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
-            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x05))
-            || !TEST_true(WPACKET_get_length(&pkt, &len))
-            || !TEST_size_t_eq(len, 1)
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
-            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x11))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_get_length(&pkt, &len))
-            || !TEST_size_t_eq(len, 8)
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
-            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x12))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
-            || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x13))
-            || !TEST_true(WPACKET_close(&pkt))
-            || !TEST_true(WPACKET_finish(&pkt))
-            || !TEST_true(WPACKET_get_total_written(&pkt, &written))
-            || !TEST_mem_eq(buf->data, written, quic7, sizeof(quic7)))
+        || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x07))
+        || !TEST_true(WPACKET_get_length(&pkt, &len))
+        || !TEST_size_t_eq(len, 1)
+        || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_4B_MIN))
+        || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x2514))
+        || !TEST_true(WPACKET_get_length(&pkt, &len))
+        || !TEST_size_t_eq(len, 2)
+        || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
+        || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x05))
+        || !TEST_true(WPACKET_get_length(&pkt, &len))
+        || !TEST_size_t_eq(len, 1)
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
+        || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x11))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_get_length(&pkt, &len))
+        || !TEST_size_t_eq(len, 8)
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
+        || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x12))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_start_quic_sub_packet_bound(&pkt, OSSL_QUIC_VLINT_2B_MIN))
+        || !TEST_true(WPACKET_quic_write_vlint(&pkt, 0x13))
+        || !TEST_true(WPACKET_close(&pkt))
+        || !TEST_true(WPACKET_finish(&pkt))
+        || !TEST_true(WPACKET_get_total_written(&pkt, &written))
+        || !TEST_mem_eq(buf->data, written, quic7, sizeof(quic7)))
         return cleanup(&pkt);
 
     /* Trying to encode a value above OSSL_QUIC_VLINT_MAX should fail */
     if (!TEST_true(WPACKET_init(&pkt, buf))
-            || !TEST_false(WPACKET_quic_write_vlint(&pkt, OSSL_QUIC_VLINT_MAX+1))
-            || !TEST_true(WPACKET_quic_write_vlint(&pkt, OSSL_QUIC_VLINT_MAX)))
-            return cleanup(&pkt);
+        || !TEST_false(WPACKET_quic_write_vlint(&pkt, OSSL_QUIC_VLINT_MAX + 1))
+        || !TEST_true(WPACKET_quic_write_vlint(&pkt, OSSL_QUIC_VLINT_MAX)))
+        return cleanup(&pkt);
 
     WPACKET_cleanup(&pkt);
     return 1;
@@ -584,11 +583,11 @@ static int test_WPACKET_quic_vlint_random(void)
     uint64_t expected, actual = 0;
     unsigned char rand_data[9];
     WPACKET pkt;
-    PACKET read_pkt = {0};
+    PACKET read_pkt = { 0 };
 
     for (i = 0; i < 10000; ++i) {
         if (!TEST_int_gt(RAND_bytes(rand_data, sizeof(rand_data)), 0))
-            return cleanup(&pkt);
+            return 0;
 
         memcpy(&expected, rand_data, sizeof(expected));
 
@@ -596,28 +595,28 @@ static int test_WPACKET_quic_vlint_random(void)
          * Ensure that all size classes get tested with equal probability.
          */
         switch (rand_data[8] & 3) {
-            case 0:
-                expected &= OSSL_QUIC_VLINT_1B_MAX;
-                break;
-            case 1:
-                expected &= OSSL_QUIC_VLINT_2B_MAX;
-                break;
-            case 2:
-                expected &= OSSL_QUIC_VLINT_4B_MAX;
-                break;
-            case 3:
-                expected &= OSSL_QUIC_VLINT_8B_MAX;
-                break;
+        case 0:
+            expected &= OSSL_QUIC_VLINT_1B_MAX;
+            break;
+        case 1:
+            expected &= OSSL_QUIC_VLINT_2B_MAX;
+            break;
+        case 2:
+            expected &= OSSL_QUIC_VLINT_4B_MAX;
+            break;
+        case 3:
+            expected &= OSSL_QUIC_VLINT_8B_MAX;
+            break;
         }
 
         if (!TEST_true(WPACKET_init(&pkt, buf))
-                || !TEST_true(WPACKET_quic_write_vlint(&pkt, expected))
-                || !TEST_true(WPACKET_get_total_written(&pkt, &written)))
+            || !TEST_true(WPACKET_quic_write_vlint(&pkt, expected))
+            || !TEST_true(WPACKET_get_total_written(&pkt, &written)))
             return cleanup(&pkt);
 
         if (!TEST_true(PACKET_buf_init(&read_pkt, (unsigned char *)buf->data, written))
-                || !TEST_true(PACKET_get_quic_vlint(&read_pkt, &actual))
-                || !TEST_uint64_t_eq(expected, actual))
+            || !TEST_true(PACKET_get_quic_vlint(&read_pkt, &actual))
+            || !TEST_uint64_t_eq(expected, actual))
             return cleanup(&pkt);
 
         WPACKET_cleanup(&pkt);
@@ -632,7 +631,7 @@ static int test_WPACKET_quic_vlint_random(void)
 int setup_tests(void)
 {
     if (!TEST_ptr(buf = BUF_MEM_new()))
-            return 0;
+        return 0;
 
     ADD_TEST(test_WPACKET_init);
     ADD_TEST(test_WPACKET_set_max_size);
diff --git a/test/x509_acert_test.c b/test/x509_acert_test.c
index 154ec3b607d75..217e124a0914d 100644
--- a/test/x509_acert_test.c
+++ b/test/x509_acert_test.c
@@ -65,8 +65,7 @@ static int test_acert_sign(void)
     if (!TEST_ptr(acert = PEM_read_bio_X509_ACERT(bp, NULL, NULL, NULL)))
         goto err;
 
-    if (!TEST_int_gt(X509_ACERT_sign(acert, pkey, EVP_sha256()), 0) ||
-        !TEST_int_eq(X509_ACERT_verify(acert, pkey), 1))
+    if (!TEST_int_gt(X509_ACERT_sign(acert, pkey, EVP_sha256()), 0) || !TEST_int_eq(X509_ACERT_verify(acert, pkey), 1))
         goto err;
 
     ret = 1;
@@ -80,29 +79,29 @@ static int test_acert_sign(void)
 
 /* IetfAttrSyntax structure with one value */
 static const unsigned char attr_syntax_single[] = {
-  0x30, 0x15, 0xa0, 0x09, 0x86, 0x07, 0x54, 0x65, 0x73, 0x74, 0x76, 0x61,
-  0x6c, 0x30, 0x08, 0x0c, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x31
+    0x30, 0x15, 0xa0, 0x09, 0x86, 0x07, 0x54, 0x65, 0x73, 0x74, 0x76, 0x61,
+    0x6c, 0x30, 0x08, 0x0c, 0x06, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x31
 };
 
 /* IetfAttrSyntax structure with multiple values of the same type */
 static const unsigned char attr_syntax_multiple[] = {
-  0x30, 0x1d, 0x30, 0x1b, 0x0c, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20,
-  0x31, 0x0c, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x32, 0x0c, 0x07,
-  0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x33
+    0x30, 0x1d, 0x30, 0x1b, 0x0c, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20,
+    0x31, 0x0c, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x32, 0x0c, 0x07,
+    0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x33
 };
 
 /* IetfAttrSyntax structure with multiple values of different types */
 static const unsigned char attr_syntax_diff_type[] = {
-  0x30, 0x11, 0x30, 0x0f, 0x04, 0x08, 0x64, 0x65, 0x61, 0x64, 0x63, 0x6f,
-  0x64, 0x65, 0x0c, 0x03, 0x61, 0x61, 0x61
+    0x30, 0x11, 0x30, 0x0f, 0x04, 0x08, 0x64, 0x65, 0x61, 0x64, 0x63, 0x6f,
+    0x64, 0x65, 0x0c, 0x03, 0x61, 0x61, 0x61
 };
 
 /* IetfAttrSyntax structure with an invalid/unsupported value type */
 static const unsigned char attr_syntax_invalid_type[] = {
-  0x30, 0x05, 0x30, 0x03, 0x02, 0x01, 0x0a
+    0x30, 0x05, 0x30, 0x03, 0x02, 0x01, 0x0a
 };
 
-#define ADD_TEST_DATA(x, valid) {x, sizeof(x), valid}
+#define ADD_TEST_DATA(x, valid) { x, sizeof(x), valid }
 
 struct ietf_type_test_data {
     const unsigned char *data;
@@ -133,11 +132,11 @@ static int test_object_group_attr(int idx)
     ias = d2i_OSSL_IETF_ATTR_SYNTAX(NULL, &p, test->len);
 
     if ((test->valid && !TEST_ptr(ias))
-            || (!test->valid && !TEST_ptr_null(ias)))
+        || (!test->valid && !TEST_ptr_null(ias)))
         goto done;
 
     if (ias != NULL
-            && !TEST_int_eq(OSSL_IETF_ATTR_SYNTAX_print(bout, ias, 4), 1)) {
+        && !TEST_int_eq(OSSL_IETF_ATTR_SYNTAX_print(bout, ias, 4), 1)) {
         OSSL_IETF_ATTR_SYNTAX_free(ias);
         goto done;
     }
diff --git a/test/x509_check_cert_pkey_test.c b/test/x509_check_cert_pkey_test.c
index 52c4ea40e081b..4c6c0c4fb5faf 100644
--- a/test/x509_check_cert_pkey_test.c
+++ b/test/x509_check_cert_pkey_test.c
@@ -107,7 +107,7 @@ static int test_x509_check_cert_pkey(void)
 }
 
 static const char *file; /* path of a cert/CRL/key file in PEM format */
-static int expected;     /* expected number of certs/CRLs/keys included */
+static int expected; /* expected number of certs/CRLs/keys included */
 
 static int test_PEM_X509_INFO_read_bio(void)
 {
@@ -158,10 +158,10 @@ int setup_tests(void)
     }
 
     if (test_get_argument_count() == 2) {
-        const char *num;  /* expected number of certs/CRLs/keys included */
+        const char *num; /* expected number of certs/CRLs/keys included */
 
         if (!TEST_ptr(file = test_get_argument(0))
-                || !TEST_ptr(num = test_get_argument(1)))
+            || !TEST_ptr(num = test_get_argument(1)))
             return 0;
         if (!TEST_int_eq(sscanf(num, "%d", &expected), 1))
             return 0;
@@ -170,9 +170,9 @@ int setup_tests(void)
     }
 
     if (!TEST_ptr(c = test_get_argument(0))
-            || !TEST_ptr(k = test_get_argument(1))
-            || !TEST_ptr(t = test_get_argument(2))
-            || !TEST_ptr(e = test_get_argument(3))) {
+        || !TEST_ptr(k = test_get_argument(1))
+        || !TEST_ptr(t = test_get_argument(2))
+        || !TEST_ptr(e = test_get_argument(3))) {
         return 0;
     }
 
diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index 7cd04d84f6a4d..4d3b67fb77d7f 100644
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -37,7 +37,6 @@ static int test_standard_exts(void)
         if ((*tmp)->ext_nid < prev)
             good = 0;
         prev = (*tmp)->ext_nid;
-
     }
     if (!good) {
         tmp = standard_exts;
@@ -55,99 +54,98 @@ typedef struct {
 } IP_TESTDATA;
 
 static IP_TESTDATA a2i_ipaddress_tests[] = {
-    {"127.0.0.1", "\x7f\x00\x00\x01", 4},
-    {"1.2.3.4", "\x01\x02\x03\x04", 4},
-    {"1.2.3.255", "\x01\x02\x03\xff", 4},
-    {"255.255.255.255", "\xff\xff\xff\xff", 4},
-
-    {"::", "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16},
-    {"::1", "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16},
-    {"::01", "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16},
-    {"::0001", "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16},
-    {"ffff::", "\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16},
-    {"ffff::1", "\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16},
-    {"1::2", "\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02", 16},
-    {"1:1:1:1:1:1:1:1", "\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01", 16},
-    {"2001:db8::ff00:42:8329", "\x20\x01\x0d\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00\x42\x83\x29", 16},
-    {"::1.2.3.4", "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x03\x04", 16},
-    {"ffff:ffff:ffff:ffff:ffff:ffff:1.2.3.4", "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x02\x03\x04", 16},
-
-    {"1:1:1:1:1:1:1:1.test", NULL, 0},
-    {":::1", NULL, 0},
-    {"2001::123g", NULL, 0},
+    { "127.0.0.1", "\x7f\x00\x00\x01", 4 },
+    { "1.2.3.4", "\x01\x02\x03\x04", 4 },
+    { "1.2.3.255", "\x01\x02\x03\xff", 4 },
+    { "255.255.255.255", "\xff\xff\xff\xff", 4 },
+
+    { "::", "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16 },
+    { "::1", "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16 },
+    { "::01", "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16 },
+    { "::0001", "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16 },
+    { "ffff::", "\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16 },
+    { "ffff::1", "\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01", 16 },
+    { "1::2", "\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02", 16 },
+    { "1:1:1:1:1:1:1:1", "\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01\x00\x01", 16 },
+    { "2001:db8::ff00:42:8329", "\x20\x01\x0d\xb8\x00\x00\x00\x00\x00\x00\xff\x00\x00\x42\x83\x29", 16 },
+    { "::1.2.3.4", "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x03\x04", 16 },
+    { "ffff:ffff:ffff:ffff:ffff:ffff:1.2.3.4", "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x02\x03\x04", 16 },
+
+    { "1:1:1:1:1:1:1:1.test", NULL, 0 },
+    { ":::1", NULL, 0 },
+    { "2001::123g", NULL, 0 },
 
     /* Too few IPv4 components. */
-    {"1", NULL, 0 },
-    {"1.", NULL, 0 },
-    {"1.2", NULL, 0 },
-    {"1.2.", NULL, 0 },
-    {"1.2.3", NULL, 0 },
-    {"1.2.3.", NULL, 0 },
+    { "1", NULL, 0 },
+    { "1.", NULL, 0 },
+    { "1.2", NULL, 0 },
+    { "1.2.", NULL, 0 },
+    { "1.2.3", NULL, 0 },
+    { "1.2.3.", NULL, 0 },
 
     /* Invalid embedded IPv4 address. */
-    {"::1.2.3", NULL, 0 },
+    { "::1.2.3", NULL, 0 },
 
     /* IPv4 literals take the place of two IPv6 components. */
-    {"1:2:3:4:5:6:7:1.2.3.4", NULL, 0 },
+    { "1:2:3:4:5:6:7:1.2.3.4", NULL, 0 },
 
     /* '::' should have fewer than 16 components or it is redundant. */
-    {"1:2:3:4:5:6:7::8", NULL, 0 },
+    { "1:2:3:4:5:6:7::8", NULL, 0 },
 
     /* Embedded IPv4 addresses must be at the end. */
-    {"::1.2.3.4:1", NULL, 0 },
+    { "::1.2.3.4:1", NULL, 0 },
 
     /* Too many components. */
-    {"1.2.3.4.5", NULL, 0 },
-    {"1:2:3:4:5:6:7:8:9", NULL, 0 },
-    {"1:2:3:4:5::6:7:8:9", NULL, 0 },
+    { "1.2.3.4.5", NULL, 0 },
+    { "1:2:3:4:5:6:7:8:9", NULL, 0 },
+    { "1:2:3:4:5::6:7:8:9", NULL, 0 },
 
     /* Stray whitespace or other invalid characters. */
-    {"1.2.3.4 ", NULL, 0 },
-    {"1.2.3 .4", NULL, 0 },
-    {"1.2.3. 4", NULL, 0 },
-    {" 1.2.3.4", NULL, 0 },
-    {"1.2.3.4.", NULL, 0 },
-    {"1.2.3.+4", NULL, 0 },
-    {"1.2.3.-4", NULL, 0 },
-    {"1.2.3.4.example.test", NULL, 0 },
-    {"::1 ", NULL, 0 },
-    {" ::1", NULL, 0 },
-    {":: 1", NULL, 0 },
-    {": :1", NULL, 0 },
-    {"1.2.3.nope", NULL, 0 },
-    {"::nope", NULL, 0 },
+    { "1.2.3.4 ", NULL, 0 },
+    { "1.2.3 .4", NULL, 0 },
+    { "1.2.3. 4", NULL, 0 },
+    { " 1.2.3.4", NULL, 0 },
+    { "1.2.3.4.", NULL, 0 },
+    { "1.2.3.+4", NULL, 0 },
+    { "1.2.3.-4", NULL, 0 },
+    { "1.2.3.4.example.test", NULL, 0 },
+    { "::1 ", NULL, 0 },
+    { " ::1", NULL, 0 },
+    { ":: 1", NULL, 0 },
+    { ": :1", NULL, 0 },
+    { "1.2.3.nope", NULL, 0 },
+    { "::nope", NULL, 0 },
 
     /* Components too large. */
-    {"1.2.3.256", NULL, 0},  /* Overflows when adding */
-    {"1.2.3.260", NULL, 0},  /* Overflows when multiplying by 10 */
-    {"1.2.3.999999999999999999999999999999999999999999", NULL, 0 },
-    {"::fffff", NULL, 0 },
+    { "1.2.3.256", NULL, 0 }, /* Overflows when adding */
+    { "1.2.3.260", NULL, 0 }, /* Overflows when multiplying by 10 */
+    { "1.2.3.999999999999999999999999999999999999999999", NULL, 0 },
+    { "::fffff", NULL, 0 },
 
     /* Although not an overflow, more than four hex digits is an error. */
-    {"::00000", NULL, 0 },
+    { "::00000", NULL, 0 },
 
     /* Too many colons. */
-    {":::", NULL, 0 },
-    {"1:::", NULL, 0 },
-    {":::2", NULL, 0 },
-    {"1:::2", NULL, 0 },
+    { ":::", NULL, 0 },
+    { "1:::", NULL, 0 },
+    { ":::2", NULL, 0 },
+    { "1:::2", NULL, 0 },
 
     /* Only one group of zeros may be elided. */
-    {"1::2::3", NULL, 0 },
+    { "1::2::3", NULL, 0 },
 
     /* We only support decimal. */
-    {"1.2.3.01", NULL, 0 },
-    {"1.2.3.0x1", NULL, 0 },
+    { "1.2.3.01", NULL, 0 },
+    { "1.2.3.0x1", NULL, 0 },
 
     /* Random garbage. */
-    {"example.test", NULL, 0 },
-    {"", NULL, 0},
-    {" 1.2.3.4", NULL, 0},
-    {" 1.2.3.4 ", NULL, 0},
-    {"1.2.3.4.example.test", NULL, 0},
+    { "example.test", NULL, 0 },
+    { "", NULL, 0 },
+    { " 1.2.3.4", NULL, 0 },
+    { " 1.2.3.4 ", NULL, 0 },
+    { "1.2.3.4.example.test", NULL, 0 },
 };
 
-
 static int test_a2i_ipaddress(int idx)
 {
     int good = 1;
@@ -164,7 +162,7 @@ static int test_a2i_ipaddress(int idx)
         if (!TEST_ptr(ip)
             || !TEST_int_eq(ASN1_STRING_length(ip), len)
             || !TEST_mem_eq(ASN1_STRING_get0_data(ip), len,
-                            a2i_ipaddress_tests[idx].data, len)) {
+                a2i_ipaddress_tests[idx].data, len)) {
             good = 0;
         }
     }
@@ -173,7 +171,7 @@ static int test_a2i_ipaddress(int idx)
 }
 
 static int ck_purp(ossl_unused const X509_PURPOSE *purpose,
-                   ossl_unused const X509 *x, int ca)
+    ossl_unused const X509 *x, int ca)
 {
     return 1;
 }
@@ -208,7 +206,7 @@ static int tests_X509_PURPOSE(void)
         /* fail adding entry with same sname but existing conflicting id: */
         && TEST_int_eq(X509_PURPOSE_add(ARGS(X509_PURPOSE_MAX, SN)), 0)
         /* fail adding entry with same existing id but conflicting sname: */
-        && TEST_int_eq(X509_PURPOSE_add(ARGS(id, SN"_different")), 0)
+        && TEST_int_eq(X509_PURPOSE_add(ARGS(id, SN "_different")), 0)
 
         && TEST_ptr((xp = X509_PURPOSE_get0(idx)))
         && TEST_int_eq(X509_PURPOSE_get_id(xp), id)
diff --git a/test/x509_test.c b/test/x509_test.c
index 1c6e569a4c444..7afa9f2649081 100644
--- a/test/x509_test.c
+++ b/test/x509_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * 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
@@ -96,8 +96,8 @@ static int test_x509_tbs_cache(void)
     const unsigned char *p = certdata;
 
     ret = TEST_ptr(x = d2i_X509(NULL, &p, sizeof(certdata)))
-          && TEST_int_gt(X509_sign(x, privkey, signmd), 0)
-          && TEST_int_eq(X509_verify(x, pubkey), 1);
+        && TEST_int_gt(X509_sign(x, privkey, signmd), 0)
+        && TEST_int_eq(X509_verify(x, pubkey), 1);
     X509_free(x);
     return ret;
 }
@@ -114,8 +114,8 @@ static int test_x509_crl_tbs_cache(void)
     const unsigned char *p = crldata;
 
     ret = TEST_ptr(crl = d2i_X509_CRL(NULL, &p, sizeof(crldata)))
-          && TEST_int_gt(X509_CRL_sign(crl, privkey, signmd), 0)
-          && TEST_int_eq(X509_CRL_verify(crl, pubkey), 1);
+        && TEST_int_gt(X509_CRL_sign(crl, privkey, signmd), 0)
+        && TEST_int_eq(X509_CRL_verify(crl, pubkey), 1);
 
     X509_CRL_free(crl);
     return ret;
@@ -152,14 +152,16 @@ static int test_asn1_item_verify(void)
     X509_get0_signature(&sig, &alg, x509);
 
     if (!TEST_int_gt(ASN1_item_verify(ASN1_ITEM_rptr(X509_CINF),
-                                      (X509_ALGOR *)alg, (ASN1_BIT_STRING *)sig,
-                                      &x509->cert_info, pkey), 0))
+                         (X509_ALGOR *)alg, (ASN1_BIT_STRING *)sig,
+                         &x509->cert_info, pkey),
+            0))
         goto err;
 
     ERR_set_mark();
     if (!TEST_int_lt(ASN1_item_verify(ASN1_ITEM_rptr(X509_CINF),
-                                     (X509_ALGOR *)alg, (ASN1_BIT_STRING *)sig,
-                                     NULL, pkey), 0)) {
+                         (X509_ALGOR *)alg, (ASN1_BIT_STRING *)sig,
+                         NULL, pkey),
+            0)) {
         ERR_clear_last_mark();
         goto err;
     }
@@ -167,7 +169,7 @@ static int test_asn1_item_verify(void)
 
     ret = 1;
 
- err:
+err:
 #ifndef OPENSSL_NO_DEPRECATED_3_0
     RSA_free(rsa);
 #endif
@@ -176,6 +178,112 @@ static int test_asn1_item_verify(void)
     return ret;
 }
 
+static int test_x509_delete_last_extension(void)
+{
+    int ret = 0;
+    X509 *x509 = NULL;
+    X509_EXTENSION *ext = NULL;
+    ASN1_OBJECT *obj = NULL;
+
+    if (!TEST_ptr((x509 = X509_new()))
+        /* Initially, there are no extensions and thus no extension list. */
+        || !TEST_ptr_null(X509_get0_extensions(x509))
+        /* Add an extension. */
+        || !TEST_ptr((ext = X509_EXTENSION_new()))
+        || !TEST_ptr((obj = OBJ_nid2obj(NID_subject_key_identifier)))
+        || !TEST_int_eq(X509_EXTENSION_set_object(ext, obj), 1)
+        || !TEST_int_eq(X509_add_ext(x509, ext, -1), 1)
+        /* There should now be an extension list. */
+        || !TEST_ptr(X509_get0_extensions(x509))
+        || !TEST_int_eq(sk_X509_EXTENSION_num(X509_get0_extensions(x509)), 1))
+        goto err;
+
+    /* Delete the extension. */
+    X509_EXTENSION_free(X509_delete_ext(x509, 0));
+
+    /* The extension list should be NULL again. */
+    if (!TEST_ptr_null(X509_get0_extensions(x509)))
+        goto err;
+
+    ret = 1;
+
+err:
+    X509_free(x509);
+    X509_EXTENSION_free(ext);
+    return ret;
+}
+
+static int test_x509_crl_delete_last_extension(void)
+{
+    int ret = 0;
+    X509_CRL *crl = NULL;
+    X509_EXTENSION *ext = NULL;
+    ASN1_OBJECT *obj = NULL;
+
+    if (!TEST_ptr((crl = X509_CRL_new()))
+        /* Initially, there are no extensions and thus no extension list. */
+        || !TEST_ptr_null(X509_CRL_get0_extensions(crl))
+        /* Add an extension. */
+        || !TEST_ptr((ext = X509_EXTENSION_new()))
+        || !TEST_ptr((obj = OBJ_nid2obj(NID_subject_key_identifier)))
+        || !TEST_int_eq(X509_EXTENSION_set_object(ext, obj), 1)
+        || !TEST_int_eq(X509_CRL_add_ext(crl, ext, -1), 1)
+        /* There should now be an extension list. */
+        || !TEST_ptr(X509_CRL_get0_extensions(crl))
+        || !TEST_int_eq(sk_X509_EXTENSION_num(X509_CRL_get0_extensions(crl)),
+            1))
+        goto err;
+
+    /* Delete the extension. */
+    X509_EXTENSION_free(X509_CRL_delete_ext(crl, 0));
+
+    /* The extension list should be NULL again. */
+    if (!TEST_ptr_null(X509_CRL_get0_extensions(crl)))
+        goto err;
+
+    ret = 1;
+
+err:
+    X509_CRL_free(crl);
+    X509_EXTENSION_free(ext);
+    return ret;
+}
+
+static int test_x509_revoked_delete_last_extension(void)
+{
+    int ret = 0;
+    X509_REVOKED *rev = NULL;
+    X509_EXTENSION *ext = NULL;
+    ASN1_OBJECT *obj = NULL;
+
+    if (!TEST_ptr((rev = X509_REVOKED_new()))
+        /* Initially, there are no extensions and thus no extension list. */
+        || !TEST_ptr_null(X509_REVOKED_get0_extensions(rev))
+        /* Add an extension. */
+        || !TEST_ptr((ext = X509_EXTENSION_new()))
+        || !TEST_ptr((obj = OBJ_nid2obj(NID_subject_key_identifier)))
+        || !TEST_int_eq(X509_EXTENSION_set_object(ext, obj), 1)
+        || !TEST_int_eq(X509_REVOKED_add_ext(rev, ext, -1), 1)
+        /* There should now be an extension list. */
+        || !TEST_ptr(X509_REVOKED_get0_extensions(rev))
+        || !TEST_int_eq(sk_X509_EXTENSION_num(X509_REVOKED_get0_extensions(rev)), 1))
+        goto err;
+
+    /* Delete the extension. */
+    X509_EXTENSION_free(X509_REVOKED_delete_ext(rev, 0));
+
+    /* The extension list should be NULL again. */
+    if (!TEST_ptr_null(X509_REVOKED_get0_extensions(rev)))
+        goto err;
+
+    ret = 1;
+
+err:
+    X509_REVOKED_free(rev);
+    X509_EXTENSION_free(ext);
+    return ret;
+}
+
 OPT_TEST_DECLARE_USAGE("<pss-self-signed-cert.pem>\n")
 
 int setup_tests(void)
@@ -210,6 +318,9 @@ int setup_tests(void)
     ADD_TEST(test_x509_tbs_cache);
     ADD_TEST(test_x509_crl_tbs_cache);
     ADD_TEST(test_asn1_item_verify);
+    ADD_TEST(test_x509_delete_last_extension);
+    ADD_TEST(test_x509_crl_delete_last_extension);
+    ADD_TEST(test_x509_revoked_delete_last_extension);
     return 1;
 }
 
diff --git a/test/x509_time_test.c b/test/x509_time_test.c
index 262f9ed7ce9e1..d282ed3e78c9e 100644
--- a/test/x509_time_test.c
+++ b/test/x509_time_test.c
@@ -53,203 +53,352 @@ static TESTDATA_FORMAT x509_format_tests[] = {
     /* GeneralizedTime */
     {
         /* good format, check only */
-        "20170217180105Z", 0, 1, -1, NULL,
+        "20170217180105Z",
+        0,
+        1,
+        -1,
+        NULL,
     },
     {
         /* not leap year, check only */
-        "20170229180105Z", 0, 0, -1, NULL,
+        "20170229180105Z",
+        0,
+        0,
+        -1,
+        NULL,
     },
     {
         /* leap year, check only */
-        "20160229180105Z", 0, 1, -1, NULL,
+        "20160229180105Z",
+        0,
+        1,
+        -1,
+        NULL,
     },
     {
         /* SS is missing, check only */
-        "201702171801Z", 0, 0, -1, NULL,
+        "201702171801Z",
+        0,
+        0,
+        -1,
+        NULL,
     },
     {
         /* fractional seconds, check only */
-        "20170217180105.001Z", 0, 0, -1, NULL,
+        "20170217180105.001Z",
+        0,
+        0,
+        -1,
+        NULL,
     },
     {
         /* timezone, check only */
-        "20170217180105+0800", 0, 0, -1, NULL,
+        "20170217180105+0800",
+        0,
+        0,
+        -1,
+        NULL,
     },
     {
         /* SS is missing, set string */
-        "201702171801Z", 1, 0, -1, NULL,
+        "201702171801Z",
+        1,
+        0,
+        -1,
+        NULL,
     },
     {
         /* fractional seconds, set string */
-        "20170217180105.001Z", 1, 0, -1, NULL,
+        "20170217180105.001Z",
+        1,
+        0,
+        -1,
+        NULL,
     },
     {
         /* timezone, set string */
-        "20170217180105+0800", 1, 0, -1, NULL,
+        "20170217180105+0800",
+        1,
+        0,
+        -1,
+        NULL,
     },
     {
         /* good format, check returned 'turned' string */
-        "20170217180154Z", 1, 1, V_ASN1_UTCTIME, "170217180154Z",
+        "20170217180154Z",
+        1,
+        1,
+        V_ASN1_UTCTIME,
+        "170217180154Z",
     },
     {
         /* good format, check returned string */
-        "20510217180154Z", 1, 1, V_ASN1_GENERALIZEDTIME, "20510217180154Z",
+        "20510217180154Z",
+        1,
+        1,
+        V_ASN1_GENERALIZEDTIME,
+        "20510217180154Z",
     },
     {
         /* good format but out of UTC range, check returned string */
-        "19230419180154Z", 1, 1, V_ASN1_GENERALIZEDTIME, "19230419180154Z",
+        "19230419180154Z",
+        1,
+        1,
+        V_ASN1_GENERALIZEDTIME,
+        "19230419180154Z",
     },
     /* UTC */
     {
         /* SS is missing, check only */
-        "1702171801Z", 0, 0, -1, NULL,
+        "1702171801Z",
+        0,
+        0,
+        -1,
+        NULL,
     },
     {
         /* not leap year, check only */
-        "050229180101Z", 0, 0, -1, NULL,
+        "050229180101Z",
+        0,
+        0,
+        -1,
+        NULL,
     },
     {
         /* leap year, check only */
-        "040229180101Z", 0, 1, -1, NULL,
+        "040229180101Z",
+        0,
+        1,
+        -1,
+        NULL,
     },
     {
         /* timezone, check only */
-        "170217180154+0800", 0, 0, -1, NULL,
+        "170217180154+0800",
+        0,
+        0,
+        -1,
+        NULL,
     },
     {
         /* SS is missing, set string */
-        "1702171801Z", 1, 0, -1, NULL,
+        "1702171801Z",
+        1,
+        0,
+        -1,
+        NULL,
     },
     {
         /* timezone, set string */
-        "170217180154+0800", 1, 0, -1, NULL,
+        "170217180154+0800",
+        1,
+        0,
+        -1,
+        NULL,
     },
     {
         /* 2017, good format, check returned string */
-        "170217180154Z", 1, 1, V_ASN1_UTCTIME, "170217180154Z",
+        "170217180154Z",
+        1,
+        1,
+        V_ASN1_UTCTIME,
+        "170217180154Z",
     },
     {
         /* 1998, good format, check returned string */
-        "981223180154Z", 1, 1, V_ASN1_UTCTIME, "981223180154Z",
+        "981223180154Z",
+        1,
+        1,
+        V_ASN1_UTCTIME,
+        "981223180154Z",
     },
 };
 
 static TESTDATA x509_cmp_tests[] = {
     {
-        "20170217180154Z", V_ASN1_GENERALIZEDTIME,
+        "20170217180154Z",
+        V_ASN1_GENERALIZEDTIME,
         /* The same in seconds since epoch. */
-        1487354514, -1,
+        1487354514,
+        -1,
     },
     {
-        "20170217180154Z", V_ASN1_GENERALIZEDTIME,
+        "20170217180154Z",
+        V_ASN1_GENERALIZEDTIME,
         /* One second more. */
-        1487354515, -1,
+        1487354515,
+        -1,
     },
     {
-        "20170217180154Z", V_ASN1_GENERALIZEDTIME,
+        "20170217180154Z",
+        V_ASN1_GENERALIZEDTIME,
         /* One second less. */
-        1487354513, 1,
+        1487354513,
+        1,
     },
     /* Same as UTC time. */
     {
-        "170217180154Z", V_ASN1_UTCTIME,
+        "170217180154Z",
+        V_ASN1_UTCTIME,
         /* The same in seconds since epoch. */
-        1487354514, -1,
+        1487354514,
+        -1,
     },
     {
-        "170217180154Z", V_ASN1_UTCTIME,
+        "170217180154Z",
+        V_ASN1_UTCTIME,
         /* One second more. */
-        1487354515, -1,
+        1487354515,
+        -1,
     },
     {
-        "170217180154Z", V_ASN1_UTCTIME,
+        "170217180154Z",
+        V_ASN1_UTCTIME,
         /* One second less. */
-        1487354513, 1,
+        1487354513,
+        1,
     },
     /* UTCTime from the 20th century. */
     {
-        "990217180154Z", V_ASN1_UTCTIME,
+        "990217180154Z",
+        V_ASN1_UTCTIME,
         /* The same in seconds since epoch. */
-        919274514, -1,
+        919274514,
+        -1,
     },
     {
-        "990217180154Z", V_ASN1_UTCTIME,
+        "990217180154Z",
+        V_ASN1_UTCTIME,
         /* One second more. */
-        919274515, -1,
+        919274515,
+        -1,
     },
     {
-        "990217180154Z", V_ASN1_UTCTIME,
+        "990217180154Z",
+        V_ASN1_UTCTIME,
         /* One second less. */
-        919274513, 1,
+        919274513,
+        1,
     },
     /* Various invalid formats. */
     {
         /* No trailing Z. */
-        "20170217180154", V_ASN1_GENERALIZEDTIME, 0, 0,
+        "20170217180154",
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
     },
     {
         /* No trailing Z, UTCTime. */
-        "170217180154", V_ASN1_UTCTIME, 0, 0,
+        "170217180154",
+        V_ASN1_UTCTIME,
+        0,
+        0,
     },
     {
         /* No seconds. */
-        "201702171801Z", V_ASN1_GENERALIZEDTIME, 0, 0,
+        "201702171801Z",
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
     },
     {
         /* No seconds, UTCTime. */
-        "1702171801Z", V_ASN1_UTCTIME, 0, 0,
+        "1702171801Z",
+        V_ASN1_UTCTIME,
+        0,
+        0,
     },
     {
         /* Fractional seconds. */
-        "20170217180154.001Z", V_ASN1_GENERALIZEDTIME, 0, 0,
+        "20170217180154.001Z",
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
     },
     {
         /* Fractional seconds, UTCTime. */
-        "170217180154.001Z", V_ASN1_UTCTIME, 0, 0,
+        "170217180154.001Z",
+        V_ASN1_UTCTIME,
+        0,
+        0,
     },
     {
         /* Timezone offset. */
-        "20170217180154+0100", V_ASN1_GENERALIZEDTIME, 0, 0,
+        "20170217180154+0100",
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
     },
     {
         /* Timezone offset, UTCTime. */
-        "170217180154+0100", V_ASN1_UTCTIME, 0, 0,
+        "170217180154+0100",
+        V_ASN1_UTCTIME,
+        0,
+        0,
     },
     {
         /* Extra digits. */
-        "2017021718015400Z", V_ASN1_GENERALIZEDTIME, 0, 0,
+        "2017021718015400Z",
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
     },
     {
         /* Extra digits, UTCTime. */
-        "17021718015400Z", V_ASN1_UTCTIME, 0, 0,
+        "17021718015400Z",
+        V_ASN1_UTCTIME,
+        0,
+        0,
     },
     {
         /* Non-digits. */
-        "2017021718015aZ", V_ASN1_GENERALIZEDTIME, 0, 0,
+        "2017021718015aZ",
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
     },
     {
         /* Non-digits, UTCTime. */
-        "17021718015aZ", V_ASN1_UTCTIME, 0, 0,
+        "17021718015aZ",
+        V_ASN1_UTCTIME,
+        0,
+        0,
     },
     {
         /* Trailing garbage. */
-        "20170217180154Zlongtrailinggarbage", V_ASN1_GENERALIZEDTIME, 0, 0,
+        "20170217180154Zlongtrailinggarbage",
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
     },
     {
         /* Trailing garbage, UTCTime. */
-        "170217180154Zlongtrailinggarbage", V_ASN1_UTCTIME, 0, 0,
+        "170217180154Zlongtrailinggarbage",
+        V_ASN1_UTCTIME,
+        0,
+        0,
     },
     {
-         /* Swapped type. */
-        "20170217180154Z", V_ASN1_UTCTIME, 0, 0,
+        /* Swapped type. */
+        "20170217180154Z",
+        V_ASN1_UTCTIME,
+        0,
+        0,
     },
     {
         /* Swapped type. */
-        "170217180154Z", V_ASN1_GENERALIZEDTIME, 0, 0,
+        "170217180154Z",
+        V_ASN1_GENERALIZEDTIME,
+        0,
+        0,
     },
     {
         /* Bad type. */
-        "20170217180154Z", V_ASN1_OCTET_STRING, 0, 0,
+        "20170217180154Z",
+        V_ASN1_OCTET_STRING,
+        0,
+        0,
     },
 };
 
@@ -260,14 +409,14 @@ static int test_x509_cmp_time(int idx)
 
     memset(&t, 0, sizeof(t));
     t.type = x509_cmp_tests[idx].type;
-    t.data = (unsigned char*)(x509_cmp_tests[idx].data);
+    t.data = (unsigned char *)(x509_cmp_tests[idx].data);
     t.length = strlen(x509_cmp_tests[idx].data);
     t.flags = 0;
 
     result = X509_cmp_time(&t, &x509_cmp_tests[idx].cmp_time);
     if (!TEST_int_eq(result, x509_cmp_tests[idx].expected)) {
         TEST_info("test_x509_cmp_time(%d) failed: expected %d, got %d\n",
-                idx, x509_cmp_tests[idx].expected, result);
+            idx, x509_cmp_tests[idx].expected, result);
         return 0;
     }
     return 1;
@@ -283,7 +432,7 @@ static int test_x509_cmp_time_current(void)
     asn1_before = ASN1_TIME_adj(NULL, now, -1, 0);
     asn1_after = ASN1_TIME_adj(NULL, now, 1, 0);
 
-    cmp_result  = X509_cmp_time(asn1_before, NULL);
+    cmp_result = X509_cmp_time(asn1_before, NULL);
     if (!TEST_int_eq(cmp_result, -1))
         failed = 1;
 
@@ -298,9 +447,9 @@ static int test_x509_cmp_time_current(void)
 }
 
 static int test_X509_cmp_timeframe_vpm(const X509_VERIFY_PARAM *vpm,
-                                       ASN1_TIME *asn1_before,
-                                       ASN1_TIME *asn1_mid,
-                                       ASN1_TIME *asn1_after)
+    ASN1_TIME *asn1_before,
+    ASN1_TIME *asn1_mid,
+    ASN1_TIME *asn1_after)
 {
     int always_0 = vpm != NULL
         && (X509_VERIFY_PARAM_get_flags(vpm) & X509_V_FLAG_USE_CHECK_TIME) == 0
@@ -312,11 +461,11 @@ static int test_X509_cmp_timeframe_vpm(const X509_VERIFY_PARAM *vpm,
         && TEST_int_eq(X509_cmp_timeframe(vpm, NULL, asn1_after), 0)
         && TEST_int_eq(X509_cmp_timeframe(vpm, NULL, NULL), 0)
         && TEST_int_eq(X509_cmp_timeframe(vpm, asn1_after, asn1_after),
-                       always_0 ? 0 : -1)
+            always_0 ? 0 : -1)
         && TEST_int_eq(X509_cmp_timeframe(vpm, asn1_before, asn1_before),
-                       always_0 ? 0 : 1)
+            always_0 ? 0 : 1)
         && TEST_int_eq(X509_cmp_timeframe(vpm, asn1_after, asn1_before),
-                       always_0 ? 0 : 1);
+            always_0 ? 0 : 1);
 }
 
 static int test_X509_cmp_timeframe(void)
@@ -367,7 +516,7 @@ static int test_x509_time(int idx)
     /* time string parsing result is always checked against what's expected */
     if (!TEST_int_eq(result, x509_format_tests[idx].expected)) {
         TEST_info("test_x509_time(%d) failed: expected %d, got %d\n",
-                idx, x509_format_tests[idx].expected, result);
+            idx, x509_format_tests[idx].expected, result);
         goto out;
     }
 
@@ -375,7 +524,7 @@ static int test_x509_time(int idx)
     if (t != NULL && x509_format_tests[idx].expected_type != -1) {
         if (!TEST_int_eq(t->type, x509_format_tests[idx].expected_type)) {
             TEST_info("test_x509_time(%d) failed: expected_type %d, got %d\n",
-                    idx, x509_format_tests[idx].expected_type, t->type);
+                idx, x509_format_tests[idx].expected_type, t->type);
             goto out;
         }
     }
@@ -383,11 +532,11 @@ static int test_x509_time(int idx)
     /* if t is not NULL but expected_string is NULL, it is an 'OK' case too */
     if (t != NULL && x509_format_tests[idx].expected_string) {
         if (!TEST_mem_eq((const char *)t->data, t->length,
-                    x509_format_tests[idx].expected_string,
-                    strlen(x509_format_tests[idx].expected_string))) {
+                x509_format_tests[idx].expected_string,
+                strlen(x509_format_tests[idx].expected_string))) {
             TEST_info("test_x509_time(%d) failed: expected_string %s, got %.*s\n",
-                    idx, x509_format_tests[idx].expected_string, t->length,
-                    t->data);
+                idx, x509_format_tests[idx].expected_string, t->length,
+                t->data);
             goto out;
         }
     }
@@ -404,55 +553,55 @@ static const struct {
     int yd, wd;
 } day_of_week_tests[] = {
     /*YYYY  MM  DD  DoY  DoW */
-    { 1900,  1,  1,   0, 1 },
-    { 1900,  2, 28,  58, 3 },
-    { 1900,  3,  1,  59, 4 },
+    { 1900, 1, 1, 0, 1 },
+    { 1900, 2, 28, 58, 3 },
+    { 1900, 3, 1, 59, 4 },
     { 1900, 12, 31, 364, 1 },
-    { 1901,  1,  1,   0, 2 },
-    { 1970,  1,  1,   0, 4 },
-    { 1999,  1, 10,   9, 0 },
+    { 1901, 1, 1, 0, 2 },
+    { 1970, 1, 1, 0, 4 },
+    { 1999, 1, 10, 9, 0 },
     { 1999, 12, 31, 364, 5 },
-    { 2000,  1,  1,   0, 6 },
-    { 2000,  2, 28,  58, 1 },
-    { 2000,  2, 29,  59, 2 },
-    { 2000,  3,  1,  60, 3 },
+    { 2000, 1, 1, 0, 6 },
+    { 2000, 2, 28, 58, 1 },
+    { 2000, 2, 29, 59, 2 },
+    { 2000, 3, 1, 60, 3 },
     { 2000, 12, 31, 365, 0 },
-    { 2001,  1,  1,   0, 1 },
-    { 2008,  1,  1,   0, 2 },
-    { 2008,  2, 28,  58, 4 },
-    { 2008,  2, 29,  59, 5 },
-    { 2008,  3,  1,  60, 6 },
+    { 2001, 1, 1, 0, 1 },
+    { 2008, 1, 1, 0, 2 },
+    { 2008, 2, 28, 58, 4 },
+    { 2008, 2, 29, 59, 5 },
+    { 2008, 3, 1, 60, 6 },
     { 2008, 12, 31, 365, 3 },
-    { 2009,  1,  1,   0, 4 },
-    { 2011,  1,  1,   0, 6 },
-    { 2011,  2, 28,  58, 1 },
-    { 2011,  3,  1,  59, 2 },
+    { 2009, 1, 1, 0, 4 },
+    { 2011, 1, 1, 0, 6 },
+    { 2011, 2, 28, 58, 1 },
+    { 2011, 3, 1, 59, 2 },
     { 2011, 12, 31, 364, 6 },
-    { 2012,  1,  1,   0, 0 },
-    { 2019,  1,  2,   1, 3 },
-    { 2019,  2,  2,  32, 6 },
-    { 2019,  3,  2,  60, 6 },
-    { 2019,  4,  2,  91, 2 },
-    { 2019,  5,  2, 121, 4 },
-    { 2019,  6,  2, 152, 0 },
-    { 2019,  7,  2, 182, 2 },
-    { 2019,  8,  2, 213, 5 },
-    { 2019,  9,  2, 244, 1 },
-    { 2019, 10,  2, 274, 3 },
-    { 2019, 11,  2, 305, 6 },
-    { 2019, 12,  2, 335, 1 },
-    { 2020,  1,  2,   1, 4 },
-    { 2020,  2,  2,  32, 0 },
-    { 2020,  3,  2,  61, 1 },
-    { 2020,  4,  2,  92, 4 },
-    { 2020,  5,  2, 122, 6 },
-    { 2020,  6,  2, 153, 2 },
-    { 2020,  7,  2, 183, 4 },
-    { 2020,  8,  2, 214, 0 },
-    { 2020,  9,  2, 245, 3 },
-    { 2020, 10,  2, 275, 5 },
-    { 2020, 11,  2, 306, 1 },
-    { 2020, 12,  2, 336, 3 }
+    { 2012, 1, 1, 0, 0 },
+    { 2019, 1, 2, 1, 3 },
+    { 2019, 2, 2, 32, 6 },
+    { 2019, 3, 2, 60, 6 },
+    { 2019, 4, 2, 91, 2 },
+    { 2019, 5, 2, 121, 4 },
+    { 2019, 6, 2, 152, 0 },
+    { 2019, 7, 2, 182, 2 },
+    { 2019, 8, 2, 213, 5 },
+    { 2019, 9, 2, 244, 1 },
+    { 2019, 10, 2, 274, 3 },
+    { 2019, 11, 2, 305, 6 },
+    { 2019, 12, 2, 335, 1 },
+    { 2020, 1, 2, 1, 4 },
+    { 2020, 2, 2, 32, 0 },
+    { 2020, 3, 2, 61, 1 },
+    { 2020, 4, 2, 92, 4 },
+    { 2020, 5, 2, 122, 6 },
+    { 2020, 6, 2, 153, 2 },
+    { 2020, 7, 2, 183, 4 },
+    { 2020, 8, 2, 214, 0 },
+    { 2020, 9, 2, 245, 3 },
+    { 2020, 10, 2, 275, 5 },
+    { 2020, 11, 2, 306, 1 },
+    { 2020, 12, 2, 336, 3 }
 };
 
 static int test_days(int n)
@@ -463,8 +612,8 @@ static int test_days(int n)
     int r;
 
     BIO_snprintf(d, sizeof(d), "%04d%02d%02d050505Z",
-                 day_of_week_tests[n].y, day_of_week_tests[n].m,
-                 day_of_week_tests[n].d);
+        day_of_week_tests[n].y, day_of_week_tests[n].m,
+        day_of_week_tests[n].d);
 
     if (!TEST_ptr(a = ASN1_TIME_new()))
         return 0;
@@ -479,60 +628,60 @@ static int test_days(int n)
 }
 
 #define construct_asn1_time(s, t, e) \
-    { { sizeof(s) - 1, t, (unsigned char*)s, 0 }, e }
+    { { sizeof(s) - 1, t, (unsigned char *)s, 0 }, e }
 
 static const struct {
     ASN1_TIME asn1;
     const char *readable;
-} x509_print_tests_rfc_822 [] = {
+} x509_print_tests_rfc_822[] = {
     /* Generalized Time */
     construct_asn1_time("20170731222050Z", V_ASN1_GENERALIZEDTIME,
-            "Jul 31 22:20:50 2017 GMT"),
+        "Jul 31 22:20:50 2017 GMT"),
     /* Generalized Time, no seconds */
     construct_asn1_time("201707312220Z", V_ASN1_GENERALIZEDTIME,
-            "Bad time value"),
+        "Bad time value"),
     /* Generalized Time, fractional seconds (3 digits) */
     construct_asn1_time("20170731222050.123Z", V_ASN1_GENERALIZEDTIME,
-            "Jul 31 22:20:50.123 2017 GMT"),
+        "Jul 31 22:20:50.123 2017 GMT"),
     /* Generalized Time, fractional seconds (1 digit) */
     construct_asn1_time("20170731222050.1Z", V_ASN1_GENERALIZEDTIME,
-            "Jul 31 22:20:50.1 2017 GMT"),
+        "Jul 31 22:20:50.1 2017 GMT"),
     /* Generalized Time, fractional seconds (0 digit) */
     construct_asn1_time("20170731222050.Z", V_ASN1_GENERALIZEDTIME,
-            "Bad time value"),
+        "Bad time value"),
     /* UTC Time */
     construct_asn1_time("170731222050Z", V_ASN1_UTCTIME,
-            "Jul 31 22:20:50 2017 GMT"),
+        "Jul 31 22:20:50 2017 GMT"),
     /* UTC Time, no seconds */
     construct_asn1_time("1707312220Z", V_ASN1_UTCTIME,
-            "Bad time value"),
+        "Bad time value"),
 };
 
 static const struct {
     ASN1_TIME asn1;
     const char *readable;
-} x509_print_tests_iso_8601 [] = {
+} x509_print_tests_iso_8601[] = {
     /* Generalized Time */
     construct_asn1_time("20170731222050Z", V_ASN1_GENERALIZEDTIME,
-            "2017-07-31 22:20:50Z"),
+        "2017-07-31 22:20:50Z"),
     /* Generalized Time, no seconds */
     construct_asn1_time("201707312220Z", V_ASN1_GENERALIZEDTIME,
-            "Bad time value"),
+        "Bad time value"),
     /* Generalized Time, fractional seconds (3 digits) */
     construct_asn1_time("20170731222050.123Z", V_ASN1_GENERALIZEDTIME,
-            "2017-07-31 22:20:50.123Z"),
+        "2017-07-31 22:20:50.123Z"),
     /* Generalized Time, fractional seconds (1 digit) */
     construct_asn1_time("20170731222050.1Z", V_ASN1_GENERALIZEDTIME,
-            "2017-07-31 22:20:50.1Z"),
+        "2017-07-31 22:20:50.1Z"),
     /* Generalized Time, fractional seconds (0 digit) */
     construct_asn1_time("20170731222050.Z", V_ASN1_GENERALIZEDTIME,
-            "Bad time value"),
+        "Bad time value"),
     /* UTC Time */
     construct_asn1_time("170731222050Z", V_ASN1_UTCTIME,
-            "2017-07-31 22:20:50Z"),
+        "2017-07-31 22:20:50Z"),
     /* UTC Time, no seconds */
     construct_asn1_time("1707312220Z", V_ASN1_UTCTIME,
-            "Bad time value"),
+        "Bad time value"),
 };
 
 static int test_x509_time_print_rfc_822(int idx)
@@ -558,7 +707,7 @@ static int test_x509_time_print_rfc_822(int idx)
         goto err;
 
     ret = 1;
- err:
+err:
     BIO_free(m);
     return ret;
 }
@@ -586,7 +735,7 @@ static int test_x509_time_print_iso_8601(int idx)
         goto err;
 
     ret = 1;
- err:
+err:
     BIO_free(m);
     return ret;
 }
diff --git a/test/x509aux.c b/test/x509aux.c
index 7335e04771b36..5f001f5117dd5 100644
--- a/test/x509aux.c
+++ b/test/x509aux.c
@@ -63,7 +63,7 @@ static int test_certs(int num)
         enclen = i2d(cert, NULL);
         if (len != enclen) {
             TEST_error("encoded length %ld of %s != input length %ld",
-                       enclen, name, len);
+                enclen, name, len);
             err = 1;
             goto next;
         }
@@ -75,11 +75,11 @@ static int test_certs(int num)
         enclen = i2d(cert, &bufp);
         if (len != enclen) {
             TEST_error("encoded length %ld of %s != input length %ld",
-                       enclen, name, len);
+                enclen, name, len);
             err = 1;
             goto next;
         }
-        enclen = (long) (bufp - buf);
+        enclen = (long)(bufp - buf);
         if (enclen != len) {
             TEST_error("unexpected buffer position after encoding %s", name);
             err = 1;
@@ -110,7 +110,7 @@ static int test_certs(int num)
         enclen = i2d(cert, &buf);
         if (len != enclen) {
             TEST_error("encoded length %ld of %s != input length %ld",
-                       enclen, name, len);
+                enclen, name, len);
             err = 1;
             goto next;
         }
@@ -129,7 +129,7 @@ static int test_certs(int num)
             enclen = i2d(cert, &buf);
             if (enclen > len) {
                 TEST_error("encoded length %ld of %s > input length %ld",
-                           enclen, name, len);
+                    enclen, name, len);
                 err = 1;
                 goto next;
             }
diff --git a/tools/c_rehash.in b/tools/c_rehash.in
index 4dd1b4468279f..bb68c44692b3b 100644
--- a/tools/c_rehash.in
+++ b/tools/c_rehash.in
@@ -1,7 +1,7 @@
 #!{- $config{HASHBANGPERL} -}
 {- use OpenSSL::Util; -}
 # {- join("\n# ", @autowarntext) -}
-# Copyright 1999-2022 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1999-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
@@ -63,10 +63,10 @@ if (defined(&Cwd::getcwd)) {
 my $path_delim = ($pwd =~ /^[a-z]\:/i) ? ';' : ':';
 $ENV{PATH} = "$prefix/bin" . ($ENV{PATH} ? $path_delim . $ENV{PATH} : "");
 
-if (! -x $openssl) {
+if (!(-f $openssl && -x $openssl)) {
     my $found = 0;
     foreach (split /$path_delim/, $ENV{PATH}) {
-        if (-x "$_/$openssl") {
+        if (-f "$_/$openssl" && -x "$_/$openssl") {
             $found = 1;
             $openssl = "$_/$openssl";
             last;
@@ -88,7 +88,7 @@ if (@ARGV) {
 
 if (-d $dirlist[0]) {
     chdir $dirlist[0];
-    $openssl="$pwd/$openssl" if (!-x $openssl);
+    $openssl="$pwd/$openssl" if (!(-f $openssl && -x $openssl));
     chdir $pwd;
 }
 
@@ -192,6 +192,7 @@ sub compute_hash {
             print STDERR "Cannot compute hash on '$fname'\n";
             return;
         }
+        binmode($fh, ":crlf");
     }
     return (<$fh>, <$fh>);
 }
diff --git a/util/check-format-commit.sh b/util/check-format-commit.sh
deleted file mode 100755
index 206827dd8669a..0000000000000
--- a/util/check-format-commit.sh
+++ /dev/null
@@ -1,170 +0,0 @@
-#!/bin/bash
-# Copyright 2020-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
-#
-# This script is a wrapper around check-format.pl.
-# It accepts the same commit revision range as 'git diff' as arguments,
-# or just a single commit id, and uses it to identify the files and line ranges
-# that were changed in that commit range, filtering check-format.pl output
-# only to lines that fall into the change ranges of the changed files.
-# examples:
-# check-format-commit.sh       # check unstaged changes
-# check-format-commit.sh HEAD
-# check-format-commit.sh @~3..
-# check-format-commit.sh f5981c9629667a5a5d6
-# check-format-commit.sh f5981c9629667a5a5d6..ee0bf38e8709bf71888
-
-# Allowlist of files to scan
-# Currently this is any .c or .h file (with an optional .in suffix)
-FILE_NAME_END_ALLOWLIST=("\.[ch]\(.in\)\?")
-
-# Global vars
-
-# TEMPDIR is used to hold any files this script creates
-# And is cleaned on EXIT with a trap function
-TEMPDIR=$(mktemp -d /tmp/checkformat.XXXXXX)
-
-# TOPDIR always points to the root of the git tree we are working in
-# used to locate the check-format.pl script
-TOPDIR=$(git rev-parse --show-toplevel)
-
-
-# cleanup handler function, returns us to the root of the git tree
-# and erases our temp directory
-cleanup() {
-    rm -rf $TEMPDIR
-    cd $TOPDIR
-}
-
-trap cleanup EXIT
-
-# Get the list of ids of the commits we are checking,
-# or empty for unstaged changes.
-# This lets us pass in symbolic ref names like master/etc and 
-# resolve them to commit ids easily
-COMMIT_RANGE="$@"
-[ -n $COMMIT_RANGE ] && COMMIT_LAST=$(git rev-parse $COMMIT_RANGE)
-
-# Fail gracefully if git rev-parse doesn't produce a valid commit
-if [ $? -ne 0 ]
-then
-    echo "$1 is not a valid commit range or commit id"
-    exit 1
-fi
-
-# If the commit range is exactly one revision,
-# git rev-parse will output just the commit id of that one alone.
-# In that case, we must manipulate a little to get a desirable result,
-# as 'git diff' has a slightly different interpretation of a single commit id:
-# it takes that to mean all commits up to HEAD, plus any unstaged changes.
-if [ $(echo -n "$COMMIT_LAST" | wc -w) -ne 1 ]; then
-    COMMIT_LAST=$(echo "$COMMIT_LAST" | head -1)
-else
-    # $COMMIT_RANGE is just one commit, make it an actual range
-    COMMIT_RANGE=$COMMIT_RANGE^..$COMMIT_RANGE
-fi
-
-# Create an iterable list of files to check formatting on,
-# including the line ranges that are changed by the commits
-# It produces output of this format:
-# <file name> <change start line>, <change line count>
-git diff -U0 $COMMIT_RANGE | awk '
-    BEGIN {myfile=""} 
-    /^\+\+\+/ { sub(/^b./,"",$2); file=$2 }
-    /^@@/     { sub(/^\+/,"",$3); range=$3; printf file " " range "\n" }
-    ' > $TEMPDIR/ranges.txt
-
-# filter in anything that matches on a filter regex
-for i in ${FILE_NAME_END_ALLOWLIST[@]}
-do
-    # Note the space after the $i below.  This is done because we want
-    # to match on file name suffixes, but the input file is of the form
-    # <commit> <file path> <range start>, <range length>
-    # So we can't just match on end of line.  The additional space
-    # here lets us match on suffixes followed by the expected space
-    # in the input file
-    grep "$i " $TEMPDIR/ranges.txt >> $TEMPDIR/ranges.filter || true
-done
-
-REMAINING_FILES=$(wc -l <$TEMPDIR/ranges.filter)
-if [ $REMAINING_FILES -eq 0 ]
-then
-    echo "The given commit range has no C source file changes that require checking"
-    exit 0
-fi
-
-# unless checking the format of unstaged changes,
-# check out the files from the commit range.
-if [ -n "$COMMIT_RANGE" ]
-then
-    # For each file name in ranges, we show that file at the commit range
-    # we are checking, and redirect it to the same path,
-    # relative to $TEMPDIR/check-format.
-    # This give us the full file path to run check-format.pl on
-    # with line numbers matching the ranges in the $TEMPDIR/ranges.filter file
-    for j in $(awk '{print $1}' $TEMPDIR/ranges.filter | sort -u)
-    do
-        FDIR=$(dirname $j)
-        mkdir -p $TEMPDIR/check-format/$FDIR
-        git show $COMMIT_LAST:$j > $TEMPDIR/check-format/$j
-    done
-fi
-
-# Now for each file in $TEMPDIR/ranges.filter, run check-format.pl
-for j in $(awk '{print $1}' $TEMPDIR/ranges.filter | sort -u)
-do
-    range_start=()
-    range_end=()
-
-    # Get the ranges for this file. Create 2 arrays.  range_start contains
-    # the start lines for valid ranges from the commit.  the range_end array
-    # contains the corresponding end line.  Note, since diff output gives us
-    # a line count for a change, the range_end[k] entry is actually
-    # range_start[k]+line count
-    for k in $(grep ^$j $TEMPDIR/ranges.filter | awk '{print $2}')
-    do
-        RSTART=$(echo $k | awk -F',' '{print $1}')
-        RLEN=$(echo $k | awk -F',' '{print $2}')
-        # when the hunk is just one line, its length is implied
-        if [ -z "$RLEN" ]; then RLEN=1; fi
-        let REND=$RSTART+$RLEN
-        range_start+=($RSTART)
-        range_end+=($REND)
-    done
-
-    # Go to our checked out tree, unless checking unstaged changes
-    [ -n "$COMMIT_RANGE" ] && cd $TEMPDIR/check-format
-
-    # Actually run check-format.pl on the file, capturing the output
-    # in a temporary file.  Note the format of check-format.pl output is
-    # <file path>:<line number>:<error text>:<offending line contents>
-    $TOPDIR/util/check-format.pl $j > $TEMPDIR/results.txt
-
-    # Now we filter the check-format.pl output based on the changed lines
-    # captured in the range_start/end arrays
-    let maxidx=${#range_start[@]}-1
-    for k in $(seq 0 1 $maxidx)
-    do
-        RSTART=${range_start[$k]}
-        REND=${range_end[$k]}
-
-        # field 2 of check-format.pl output is the offending line number
-        # Check here if any line in that output falls between any of the 
-        # start/end ranges defined in the range_start/range_end array.
-        # If it does fall in that range, print the entire line to stdout
-        awk -v rstart=$RSTART -v rend=$REND -F':' '
-                /:/ { if (rstart <= $2 && $2 <= rend) print $0 }
-            ' $TEMPDIR/results.txt >>$TEMPDIR/results-filtered.txt
-    done
-done
-cat $TEMPDIR/results-filtered.txt
-
-# If any findings were in range, exit with a different error code
-if [ -s $TEMPDIR/results-filtered.txt ]
-then
-    exit 2
-fi
diff --git a/util/check-format-test-negatives.c b/util/check-format-test-negatives.c
deleted file mode 100644
index f6b1bfb31920f..0000000000000
--- a/util/check-format-test-negatives.c
+++ /dev/null
@@ -1,892 +0,0 @@
-/*
- * Copyright 2007-2024 The OpenSSL Project Authors. All Rights Reserved.
- * Copyright Siemens AG 2015-2022
- *
- * 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
- */
-
-/*
- * A collection of test cases where check-format.pl should not report issues.
- * There are some known false positives, though, which are marked below.
- */
-
-#include <errno.h> /* should not report whitespace nits within <...> */
-#define F                                       \
-    void f()                                    \
-    {                                           \
-        int i;                                  \
-        int j;                                  \
-                                                \
-        return;                                 \
-    }
-
-/* allow extra  SPC in single-line comment */
-/*
- * allow extra  SPC in regular multi-line comment
- */
-/*-
- * allow extra  SPC in format-tagged multi-line comment
- */
-/** allow extra '*' in comment opening */
-/*! allow extra '!' in comment opening */
-/*
- ** allow "**" as first non-space chars of a line within multi-line comment
- */
-
-int f(void) /*
-             * trailing multi-line comment
-             */
-{
-    typedef int INT;
-    void v;
-    short b;
-    char c;
-    signed s;
-    unsigned u;
-    int i;
-    long l;
-    float f;
-    double d;
-    enum {} enu;
-    struct {} stru;
-    union {} un;
-    auto a;
-    extern e;
-    static int stat;
-    const int con;
-    volatile int vola;
-    register int reg;
-    OSSL_x y, *p = params;
-    int params[];
-    OSSL_PARAM * (* params []) [MAX + 1];
-    XY *(* fn)(int a, char b);
-    /*
-     * multi-line comment should not disturb detection of local decls
-     */
-    BIO1 ***b;
-    /* intra-line comment should not disturb detection of local decls */
-    unsigned k;
-
-    /* intra-line comment should not disturb detection of end of local decls */
-
-    {
-        int x; /* just decls in block */
-    }
-    if (p != (unsigned char *)
-        &(ctx->tmp[0])) {
-        i -= (p - (unsigned char *) /* do not confuse with var decl */
-              &(ctx->tmp[0]));
-    }
-    {
-        ctx->buf_off = 0; /* do not confuse with var decl */
-        return 0;
-    }
-    {
-        ctx->buf_len = EVP_EncodeBlock((unsigned char *)ctx->buf,
-                                       (unsigned char *)ctx->tmp, /* no decl */
-                                       ctx->tmp_len);
-    }
-    {
-        EVP_EncodeFinal(ctx->base64,
-                        (unsigned char *)ctx->buf, &(ctx->len)); /* no decl */
-        /* push out the bytes */
-        goto again;
-    }
-    {
-        f(1, (unsigned long)2); /* no decl */
-        x;
-    }
-    {
-        char *pass_str = get_passwd(opt_srv_secret, "x");
-
-        if (pass_str != NULL) {
-            cleanse(opt_srv_secret);
-            res = OSSL_CMP_CTX_set1_secretValue(ctx, (unsigned char *)pass_str,
-                                                strlen(pass_str));
-            clear_free(pass_str);
-        }
-    }
-}
-
-int g(void)
-{
-    if (ctx == NULL) {    /* non-leading end-of-line comment */
-        if (/* comment after '(' */ pem_name != NULL /* comment before ')' */)
-            /* entire-line comment indent usually like for the following line */
-            return NULL; /* hanging indent also for this line after comment */
-        /* leading comment has same indentation as normal code */ stmt;
-        /* entire-line comment may have same indent as normal code */
-    }
-    for (i = 0; i < n; i++)
-        for (; i < n; i++)
-            for (i = 0; ; i++)
-                for (i = 0;; i++)
-                    for (i = 0; i < n; )
-                        for (i = 0; i < n;)
-                            ;
-    for (i = 0; ; )
-        for (i = 0; ;)
-            for (i = 0;; )
-                for (i = 0;;)
-                    for (; i < n; )
-                        for (; j < n;)
-                            for (; ; i++)
-                                for (;; i++)
-                                    ;
-    for (;;) /* the only variant allowed in case of "empty" for (...) */
-        ;
-    for (;;) ; /* should not trigger: space before ';' */
- lab: ;  /* should not trigger: space before ';' */
-
-#if X
-    if (1) /* bad style: just part of control structure depends on #if */
-#else
-    if (2) /*@ resulting false positive */
-#endif
-        c; /*@ resulting false positive */
-
-    if (1)
-        if (2)
-            c;
-        else
-            e;
-    else
-        f;
-    do
-        do
-            2;
-        while (1);
-    while (2);
-
-    if (1)
-        f(a, b);
-    do
-        1; while (2); /*@ more than one stmt just to construct case */
-    if (1)
-        f(a, b);
-    else
-        do
-            1;
-        while (2);
-    if (1)
-        f(a, b);
-    else do /*@ (non-brace) code before 'do' just to construct case */
-             1;
-        while (2);
-    f1234(a,
-          b); do /*@ (non-brace) code before 'do' just to construct case */
-                  1;
-    while (2);
-    if (1)
-        f(a,
-          b); do /*@ (non-brace) code before 'do' just to construct case */
-                  1;
-    while (2);
-    if (1)
-        f(a, b);
-    else
-        do f(c, c); /*@ (non-brace) code after 'do' just to construct case */
-        while (2);
-
-    if (1)
-        f(a, b);
-    else
-        return;
-    if (1)
-        f(a,
-          b); else /*@ (non-brace) code before 'else' just to construct case */
-        do
-            1;
-        while (2);
-
-    if (1)
-    { /*@ brace after 'if' not on same line just to construct case */
-        c;
-        d;
-    }
-    /* this comment is correctly indented if it refers to the following line */
-    d;
-
-    if (1) {
-        2;
-    } else /*@ no brace after 'else' just to construct case */
-        3;
-    do {
-    } while (x);
-    if (1) {
-        2;
-    } else {
-        3;
-    }
-    if (4)
-        5;
-    else
-        6;
-
-    if (1) {
-        if (2) {
-        case MAC_TYPE_MAC:
-            {
-                EVP_MAC_CTX *new_mac_ctx;
-
-                if (ctx->pkey == NULL)
-                    return 0;
-            }
-            break;
-        default:
-            /* This should be dead code */
-            return 0;
-        }
-    }
-    if (expr_line1
-        == expr_line2
-            && expr_line3) {
-        c1;
-    } else {
-        c;
-        d;
-    }
-    if (expr_line1
-        == expr_line2
-            && expr_line3)
-        hanging_stmt;
-}
-#define m \
-    do { /* should not be confused with function header followed by '{' */ \
-    } while (0)
-
-/* should not trigger: constant on LHS of comparison or assignment operator */
-X509 *x509 = NULL;
-int y = a + 1 < b;
-int ret, was_NULL = *certs == NULL;
-
-/* should not trigger: missing space before ... */
-float z = 1e-6 * (-1) * b[+6] * 1e+1 * (a)->f * (long)+1
-    - (tmstart.tv_sec + tmstart.tv_nsec * 1e-9);
-struct st = {-1, 0};
-int x = (y <<= 1) + (z <= 5.0);
-
-const OPTIONS passwd_options[] = {
-    {"aixmd5", OPT_AIXMD5, '-', "AIX MD5-based password algorithm"},
-#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_DEPRECATED_3_0)
-    {"crypt", OPT_CRYPT, '-', "Standard Unix password algorithm (default)"},
-#endif
-    OPT_R_OPTIONS,
-
-    {NULL}
-};
-
-typedef * d(int)
-    x;
-typedef (int)
-x;
-typedef (int)*()
-    x;
-typedef *int *
-x;
-typedef OSSL_CMP_MSG *(*cmp_srv_process_cb_t)
-    (OSSL_CMP_SRV_CTX *ctx, OSSL_CMP_MSG *msg)
-    xx;
-
-#define IF(cond) if (cond)
-
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic pop")
-
-#define CB_ERR_IF(cond, ctx, cert, depth, err) \
-    if ((cond) && ((depth) < 0 || verify_cb_cert(ctx, cert, depth, err) == 0)) \
-        return err
-static int verify_cb_crl(X509_STORE_CTX *ctx, int err)
-{
-    ctx->error = err;
-    return ctx->verify_cb(0, ctx);
-}
-
-#ifdef CMP_FALLBACK_EST
-# define CMP_FALLBACK_CERT_FILE "cert.pem"
-#endif
-
-#define X509_OBJECT_get0_X509(obj)                                      \
-    ((obj) == NULL || (obj)->type != X509_LU_X509 ? NULL : (obj)->data.x509)
-#define X509_STORE_CTX_set_current_cert(ctx, x) { (ctx)->current_cert = (x); }
-#define X509_STORE_set_ex_data(ctx, idx, data) \
-    CRYPTO_set_ex_data(&(ctx)->ex_data, (idx), (data))
-
-typedef int (*X509_STORE_CTX_check_revocation_fn)(X509_STORE_CTX *ctx);
-#define X509_STORE_CTX_set_error_depth(ctx, depth) \
-    { (ctx)->error_depth = (depth); }
-#define EVP_PKEY_up_ref(x) ((x)->references++)
-/* should not report missing blank line: */
-DECLARE_STACK_OF(OPENSSL_CSTRING)
-bool UTIL_iterate_dir(int (*fn)(const char *file, void *arg), void *arg,
-                      const char *path, bool recursive);
-size_t UTIL_url_encode(
-                       size_t *size_needed
-                       );
-size_t UTIL_url_encode(const char  *source,
-                       char        *destination,
-                       size_t      destination_len,
-                       size_t      *size_needed);
-#error well. oops.
-
-int f()
-{
-    c;
-    if (1)
-        c;
-    c;
-    if (1)
-        if (2)
-        { /*@ brace after 'if' not on same line just to construct case */
-            c;
-        }
-    e;
-    const usign = {
-                   0xDF,
-                   {
-                    dd
-                   },
-                   dd
-    };
-    const unsign = {
-                    0xDF, {
-                           dd
-                    },
-                    dd
-    };
-}
-const unsigned char trans_id[OSSL_CMP_TRANSACTIONID_LENGTH] = {
-                                                               0xDF,
-};
-const unsigned char trans_id[OSSL_CMP_TRANSACTIONID_LENGTH] =
-    {
-     0xDF,
-    };
-typedef
-int
-a;
-
-typedef
-struct
-{
-    int a;
-} b;
-typedef enum {
-              w = 0
-} e_type;
-typedef struct {
-    enum {
-          w = 0
-    } e_type;
-    enum {
-          w = 0
-    } e_type;
-} e;
-struct s_type {
-    enum e_type {
-                 w = 0
-    };
-};
-struct s_type
-{
-    enum e_type {
-                 w = 0
-    };
-    enum e2_type {
-                  w = 0
-    };
-};
-
-#define X  1          + 1
-#define Y  /* .. */ 2 + 2
-#define Z  3          + 3 * (*a++)
-
-static varref cmp_vars[] = { /* comment.  comment?  comment!  */
-    {&opt_config}, {&opt_section},
-
-    {&opt_server}, {&opt_proxy}, {&opt_path},
-};
-
-#define SWITCH(x)                               \
-    switch (x) {                                \
-    case 0:                                     \
-        break;                                  \
-    default:                                    \
-        break;                                  \
-    }
-
-#define DEFINE_SET_GET_BASE_TEST(PREFIX, SETN, GETN, DUP, FIELD, TYPE, ERR, \
-                                 DEFAULT, NEW, FREE) \
-    static int execute_CTX_##SETN##_##GETN##_##FIELD( \
-                                                     TEST_FIXTURE *fixture) \
-    { \
-        CTX *ctx = fixture->ctx; \
-        int (*set_fn)(CTX *ctx, TYPE) = \
-            (int (*)(CTX *ctx, TYPE))PREFIX##_##SETN##_##FIELD; \
-        /* comment */ \
-    }
-
-union un var; /* struct/union/enum in variable type */
-struct provider_store_st *f() /* struct/union/enum in function return type */
-{
-}
-static void f(struct pem_pass_data *data) /* struct/union/enum in arg list */
-{
-}
-
-static void *fun(void)
-{
-    if (pem_name != NULL)
-        /* comment */
-        return NULL;
-
-label0:
- label1: /* allow special indent 1 for label at outermost level in body */
-    do {
-    label2:
-        size_t available_len, data_len;
-        const char *curr = txt, *next = txt;
-        char *tmp;
-
-        {
-        label3:
-        }
-    } while (1);
-
-    char *intraline_string_with_comment_delimiters_and_dbl_space = "1  /*1";
-    char *multiline_string_with_comment_delimiters_and_dbl_space = "1  /*1\
-2222222\'22222222222222222\"222222222" "33333  /*3333333333" "44  /*44444444444\
-55555555555555\
-6666";
-}
-
-ASN1_CHOICE(OSSL_CRMF_POPO) = {
-    ASN1_IMP(OSSL_CRMF_POPO, value.raVerified, ASN1_NULL, 0),
-    ASN1_EXP(OSSL_CRMF_POPO, value.keyAgreement, OSSL_CRMF_POPOPRIVKEY, 3)
-} ASN1_CHOICE_END(OSSL_CRMF_POPO)
-IMPLEMENT_ASN1_FUNCTIONS(OSSL_CRMF_POPO)
-
-ASN1_ADB(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) = {
-    ADB_ENTRY(NID_id_regCtrl_regToken,
-              ASN1_SIMPLE(OSSL_CRMF_ATTRIBUTETYPEANDVALUE,
-                          value.regToken, ASN1_UTF8STRING)),
-} ASN1_ADB_END(OSSL_CRMF_ATTRIBUTETYPEANDVALUE, 0, type, 0,
-               &attributetypeandvalue_default_tt, NULL);
-
-ASN1_ITEM_TEMPLATE(OSSL_CRMF_MSGS) =
-    ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
-                          OSSL_CRMF_MSGS, OSSL_CRMF_MSG)
-ASN1_ITEM_TEMPLATE_END(OSSL_CRMF_MSGS)
-
-void f_looong_body_200()
-{ /* function body length up to 200 lines accepted */
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-}
-
-void f_looong_body_201()
-{ /* function body length > 200 lines, but LONG BODY marker present */
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-}
diff --git a/util/check-format-test-positives.c b/util/check-format-test-positives.c
deleted file mode 100644
index e5dacdfe71b92..0000000000000
--- a/util/check-format-test-positives.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
- * Copyright Siemens AG 2015-2022
- *
- * 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
- */
-
-/*
- * This demonstrates/tests cases where check-format.pl should report issues.
- * Some of the reports are due to sanity checks for proper nesting of comment
- * delimiters and parenthesis-like symbols, e.g., on unexpected/unclosed braces.
- */
-
-/*
- * The '@'s after '*' are used for self-tests: they mark lines containing
- * a single flaw that should be reported. Normally it should be reported
- * while handling the given line, but in case of delayed checks there is a
- * following digit indicating the number of reports expected for this line.
- */
-
-/* For each of the following set of lines the tool should complain once */
-/*@ tab character: 	 */
-/*@ intra-line carriage return character: 
 */
-/*@ non-printable ASCII character:  */
-/*@ non-ASCII character: ä */
-/*@ whitespace at EOL: */ 
-// /*@ end-of-line comment style not allowed (for C90 compatibility) */
- /*@0 intra-line comment indent off by 1, reported unless sloppy-cmt */
-/*X */ /*@2 missing spc or '*' after comment start reported unless sloppy-spc */
-/* X*/ /*@ missing space before comment end , reported unless sloppy-spc */
-/*@ comment starting delimiter: /* inside intra-line comment */
- /*@0
-  *@ above multi-line comment start indent off by 1, reported unless sloppy-cmt; this comment line is too long
-   *@ multi-line comment indent further off by 1 relative to comment start
-  *@ multi-line comment ending with text on last line */
-/*@2 multi-line comment starting with text on first line
- *@ comment starting delimiter: /* inside multi-line comment
-*@ multi-line comment indent off by -1
- *X*@ no spc after leading '*' in multi-line comment, reported unless sloppy-spc
- *@0 more than two spaces after .   in comment, no more reported
- *@0 more than two spaces after ?   in comment, no more reported
- *@0 more than two spaces after !   in comment, no more reported
-*/ /*@ multi-line comment end indent off by -1 (relative to comment start) */
-*/ /*@ unexpected comment ending delimiter outside comment */
-/*- '-' for formatted comment not allowed in intra-line comment */
-/*@ comment line is 4 columns tooooooooooooooooo wide, reported unless sloppy-len */
-/*@ comment line is 5 columns toooooooooooooooooooooooooooooooooooooooooooooo wide */
-#if ~0              /*@ '#if' with constant condition */
- #endif             /*@ indent of preproc. directive off by 1 (must be 0) */
-#define X (1 +  1)  /*@0 extra space in body, reported unless sloppy-spc */
-#define Y   1       /*@ extra space before body, reported unless sloppy-spc */ \
-#define Z           /*@2 preprocessor directive within multi-line directive */
-typedef struct  {   /*@0 extra space in code, reported unless sloppy-spc */
-    enum {          /*@1 extra space  in intra-line comment, no more reported */
-           w = 0 /*@ hanging expr indent off by 1, or 3 for lines after '{' */
-             && 1,  /*@ hanging expr indent off by 3, or -1 for leading '&&' */
-         x = 1,     /*@ hanging expr indent off by -1 */
-          y,z       /*@ no space after ',', reported unless sloppy-spc */
-    } e_member ;    /*@ space before ';', reported unless sloppy-spc */
-    int v[1;        /*@ unclosed bracket in type declaration */
-   union {          /*@ statement/type declaration indent off by -1 */
-        struct{} s; /*@ no space before '{', reported unless sloppy-spc */
-    }u_member;      /*@ no space after '}', reported unless sloppy-spc */
-    } s_type;       /*@ statement/type declaration indent off by 4 */
-int* somefunc();    /*@ no space before '*' in type decl, r unless sloppy-spc */
-void main(int n) {  /*@ opening brace at end of function definition header */
-    for (; ; ) ;    /*@ space before ')', reported unless sloppy-spc */
-    for ( ; x; y) ; /*@2 space after '(' and before ';', unless sloppy-spc */
-    for (;;n++) {   /*@ missing space after ';', reported unless sloppy-spc */
-        return;     /*@0 (1-line) single statement in braces */
-    }}              /*@2 code after '}' outside expr */
-}                   /*@ unexpected closing brace (too many '}') outside expr */
-)                   /*@ unexpected closing paren outside expr */
-#endif              /*@ unexpected #endif */
-int f (int a,       /*@ space after fn before '(', reported unless sloppy-spc */
-      int b,        /*@ hanging expr indent off by -1 */
-       long I)      /*@ single-letter name 'I' */
-{ int x;            /*@ code after '{' opening a block */
-    int xx = 1) +   /*@ unexpected closing parenthesis */
-        0L <        /*@ constant on LHS of comparison operator */
-        a] -        /*@ unexpected closing bracket */
-        3: *        /*@ unexpected ':' (without preceding '?') within expr */
-        4};         /*@ unexpected closing brace within expression */
-    char y[] = {    /*@0 unclosed brace within initializer/enum expression */
-        1* 1,       /*@ no space etc. before '*', reported unless sloppy-spc */
-         2,         /*@ hanging expr indent (for lines after '{') off by 1 */
-        (xx         /*@0 unclosed parenthesis in expression */
-         ? y        /*@0 unclosed '? (conditional expression) */
-         [0;        /*@4 unclosed bracket in expression */
-    /*@ blank line within local decls */
-   s_type s;        /*@2 local variable declaration indent off by -1 */
-   t_type t;        /*@ local variable declaration indent again off by -1 */
-    /* */           /*@0 missing blank line after local decls */
-   somefunc(a,      /*@2 statement indent off by -1 */
-          "aligned" /*@ expr indent off by -2 accepted if sloppy-hang */ "right"
-           , b,     /*@ expr indent off by -1 */
-           b,       /*@ expr indent as on line above, accepted if sloppy-hang */
-    b, /*@ expr indent off -8 but @ extra indent accepted if sloppy-hang */
-   "again aligned" /*@ expr indent off by -9 (left of stmt indent, */ "right",
-            abc == /*@ .. so reported also with sloppy-hang; this line is too long */ 456
-# define MAC(A) (A) /*@ nesting indent of preprocessor directive off by 1 */
-             ? 1    /*@ hanging expr indent off by 1 */
-              : 2); /*@ hanging expr indent off by 2, or 1 for leading ':' */
-    if(a            /*@ missing space after 'if', reported unless sloppy-spc */
-          /*@0 intra-line comment indent off by -1 (not: by 3 due to '&&') */
-           && ! 0   /*@2 space after '!', reported unless sloppy-spc */
-         || b ==    /*@ hanging expr indent off by 2, or -2 for leading '||' */
-       (x<<= 1) +   /*@ missing space before '<<=' reported unless sloppy-spc */
-       (xx+= 2) +   /*@ missing space before '+=', reported unless sloppy-spc */
-       (a^ 1) +     /*@ missing space before '^', reported unless sloppy-spc */
-       (y *=z) +    /*@ missing space after '*=' reported unless sloppy-spc */
-       a %2 /       /*@ missing space after '%', reported unless sloppy-spc */
-       1 +/* */     /*@ no space before comment, reported unless sloppy-spc */
-       /* */+       /*@ no space after comment, reported unless sloppy-spc */
-       s. e_member) /*@ space after '.', reported unless sloppy-spc */
-         xx = a + b /*@ extra single-statement indent off by 1 */
-               + 0; /*@ two times extra single-statement indent off by 3 */
-    if (a ++)       /*@ space before postfix '++', reported unless sloppy-spc */
-    {               /*@ {' not on same line as preceding 'if' */
-        c;          /*@0 single stmt in braces, reported on 1-stmt */
-    } else          /*@ missing '{' on same line after '} else' */
-      {             /*@ statement indent off by 2 */
-        d;          /*@0 single stmt in braces, reported on 1-stmt */
-          }         /*@ statement indent off by 6 */
-    if (1) f(a,     /*@ (non-brace) code after end of 'if' condition */
-             b); else /*@ (non-brace) code before 'else' */
-        do f(c, c); /*@ (non-brace) code after 'do' */
-        while ( 2); /*@ space after '(', reported unless sloppy-spc */
-    b; c;           /*@ more than one statement per line */
-  outer:            /*@ outer label special indent off by 1 */
-    do{             /*@ missing space before '{', reported unless sloppy-spc */
-     inner:         /*@ inner label normal indent off by 1 */
-        f (3,       /*@ space after fn before '(', reported unless sloppy-spc */
-           4);      /*@0 false negative: should report single stmt in braces */
-    }               /*@0 'while' not on same line as preceding '}' */
-    while (a+ 0);   /*@2 missing space before '+', reported unless sloppy-spc */
-    switch (b ) {   /*@ space before ')', reported unless sloppy-spc */
-   case 1:          /*@ 'case' special statement indent off by -1 */
-    case(2):       /*@ missing space after 'case', reported unless sloppy-spc */
-    default: ;      /*@ code after 'default:' */
-}                   /*@ statement indent off by -4 */
-    return(      /*@ missing space after 'return', reported unless sloppy-spc */
-           x); }    /*@ code before block-level '}' */
-/* Here the tool should stop complaining apart from the below issues at EOF */
-
-void f_looong_body()
-{
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-    ;
-
-
-    ;               /*@ 2 essentially blank lines before, if !sloppy-spc */
-}                   /*@ function body length > 200 lines */
-#if X               /*@0 unclosed #if */
-struct t {          /*@0 unclosed brace at decl/block level */
-    enum {          /*@0 unclosed brace at enum/expression level */
-          v = (1    /*@0 unclosed parenthesis */
-               etyp /*@0 blank line follows just before EOF, if !sloppy-spc: */
-
diff --git a/util/check-format.pl b/util/check-format.pl
deleted file mode 100755
index 52981753d9900..0000000000000
--- a/util/check-format.pl
+++ /dev/null
@@ -1,1276 +0,0 @@
-#! /usr/bin/env perl
-#
-# Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
-# Copyright Siemens AG 2019-2022
-#
-# 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
-#
-# check-format.pl
-# - check formatting of C source according to OpenSSL coding style
-#
-# usage:
-#   check-format.pl [-l|--strict-len] [-b|--sloppy-bodylen]
-#                   [-s|--sloppy-space] [-c|--sloppy-comment]
-#                   [-m|--sloppy-macro] [-h|--sloppy-hang]
-#                   [-e|--eol-comment] [-1|--1-stmt]
-#                   <files>
-#
-# run self-tests:
-#   util/check-format.pl util/check-format-test-positives.c
-#   util/check-format.pl util/check-format-test-negatives.c
-#
-# checks adherence to the formatting rules of the OpenSSL coding guidelines
-# assuming that the input files contain syntactically correct C code.
-# This pragmatic tool is incomplete and yields some false positives.
-# Still it should be useful for detecting most typical glitches.
-#
-# options:
-#  -l | --strict-len     decrease accepted max line length from 100 to 80
-#  -b | --sloppy-bodylen do not report function body length > 200
-#  -s | --sloppy-space   do not report whitespace nits
-#  -c | --sloppy-comment do not report indentation of comments
-#                        Otherwise for each multi-line comment the indentation of
-#                        its lines is checked for consistency. For each comment
-#                        that does not begin to the right of normal code its
-#                        indentation must be as for normal code, while in case it
-#                        also has no normal code to its right it is considered to
-#                        refer to the following line and may be indented equally.
-#  -m | --sloppy-macro   allow missing extra indentation of macro bodies
-#  -h | --sloppy-hang    when checking hanging indentation, do not report
-#                        * same indentation as on line before
-#                        * same indentation as non-hanging indent level
-#                        * indentation moved left (not beyond non-hanging indent)
-#                          just to fit contents within the line length limit
-#  -e | --eol-comment    report needless intermediate multiple consecutive spaces also before end-of-line comments
-#  -1 | --1-stmt         do more aggressive checks for { 1 stmt } - see below
-#
-# There are non-trivial false positives and negatives such as the following.
-#
-# * When a line contains several issues of the same kind only one is reported.
-#
-# * When a line contains more than one statement this is (correctly) reported
-#   but in some situations the indentation checks for subsequent lines go wrong.
-#
-# * There is the special OpenSSL rule not to unnecessarily use braces around
-#   single statements:
-#   {
-#       stmt;
-#   }
-#   except within if ... else constructs where some branch contains more than one
-#   statement. Since the exception is hard to recognize when such branches occur
-#   after the current position (such that false positives would be reported)
-#   the tool by checks for this rule by default only for do/while/for bodies.
-#   Yet with the --1-stmt option false positives are preferred over negatives.
-#   False negatives occur if the braces are more than two non-blank lines apart.
-#
-# * The presence of multiple consecutive spaces is regarded a coding style nit
-#   except when this is before end-of-line comments (unless the --eol-comment is given) and
-#   except when done in order to align certain columns over multiple lines, e.g.:
-#   # define AB  1
-#   # define CDE 22
-#   # define F   3333
-#   This pattern is recognized - and consequently extra space not reported -
-#   for a given line if in the non-blank line before or after (if existing)
-#   for each occurrence of "  \S" (where \S means non-space) in the given line
-#   there is " \S" in the other line in the respective column position.
-#   This may lead to both false negatives (in case of coincidental " \S")
-#   and false positives (in case of more complex multi-column alignment).
-#
-# * When just part of control structures depend on #if(n)(def), which can be
-#   considered bad programming style, indentation false positives occur, e.g.:
-#   #if X
-#       if (1) /* bad style */
-#   #else
-#       if (2) /* bad style resulting in false positive */
-#   #endif
-#           c; /* resulting further false positive */
-
-use strict;
-# use List::Util qw[min max];
-use POSIX;
-
-use constant INDENT_LEVEL => 4;
-use constant MAX_LINE_LENGTH => 100;
-use constant STRICT_LINE_LENGTH => 80;
-use constant MAX_BODY_LENGTH => 200;
-
-# global variables @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-# command-line options
-my $max_length = MAX_LINE_LENGTH;
-my $sloppy_bodylen = 0;
-my $sloppy_SPC = 0;
-my $sloppy_hang = 0;
-my $sloppy_cmt = 0;
-my $sloppy_macro = 0;
-my $eol_cmt = 0;
-my $extended_1_stmt = 0;
-
-while ($ARGV[0] =~ m/^-(\w|-[\w\-]+)$/) {
-    my $arg = $1; shift;
-    if ($arg =~ m/^(l|-strict-len)$/) {
-        $max_length = STRICT_LINE_LENGTH;
-    } elsif ($arg =~ m/^(b|-sloppy-bodylen)$/) {
-        $sloppy_bodylen = 1;
-    } elsif ($arg =~ m/^(s|-sloppy-space)$/) {
-        $sloppy_SPC= 1;
-    } elsif ($arg =~ m/^(c|-sloppy-comment)$/) {
-        $sloppy_cmt = 1;
-    } elsif ($arg =~ m/^(m|-sloppy-macro)$/) {
-        $sloppy_macro = 1;
-    } elsif ($arg =~ m/^(h|-sloppy-hang)$/) {
-        $sloppy_hang = 1;
-    } elsif ($arg =~ m/^(e|-eol-comment)$/) {
-        $eol_cmt = 1;
-    } elsif ($arg =~ m/^(1|-1-stmt)$/) {
-        $extended_1_stmt = 1;
-    } else {
-        die("unknown option: -$arg");
-    }
-}
-
-# state variables
-my $self_test;             # whether the current input file is regarded to contain (positive/negative) self-tests
-
-my $in_comment;            # number of lines so far within multi-line comment, 0 if no comment, < 0 when end is on current line
-my $leading_comment;       # multi-line comment has no code before its beginning delimiter, if $in_comment != 0
-my $formatted_comment;     # multi-line comment beginning with "/*-", which indicates/allows special formatting, if $in_comment != 0
-my $comment_indent;        # comment indent, if $in_comment != 0
-
-my $ifdef__cplusplus;      # line before contained '#ifdef __cplusplus' (used in header files)
-my $preproc_if_nesting;    # currently required indentation of preprocessor directive according to #if(n)(def)
-my $in_preproc;            # 0 or number of lines so far within preprocessor directive, e.g., macro definition
-my $preproc_directive;     # name of current preprocessor directive, if $in_preproc != 0
-my $preproc_offset;        # offset to $block_indent within multi-line preprocessor directive, else 0
-my $in_macro_header;       # number of open parentheses + 1 in (multi-line) header of #define, if $in_preproc != 0
-
-my $line;                  # current line number
-my $line_before;           # number of previous not essentially blank line (containing at most whitespace and '\')
-my $line_before2;          # number of not essentially blank line before previous not essentially blank line
-
-# indentation state
-my $contents;              # contents of current line (without blinding)
-#  $_                      # current line, where comments etc. get blinded
-my $code_contents_before;  # contents of previous non-comment non-preprocessor-directive line (without blinding), initially ""
-my $contents_before;       # contents of $line_before (without blinding), if $line_before > 0
-my $contents_before_;      # contents of $line_before after blinding comments etc., if $line_before > 0
-my $contents_before2;      # contents of $line_before2  (without blinding), if $line_before2 > 0
-my $contents_before_2;     # contents of $line_before2 after blinding comments etc., if $line_before2 > 0
-my $in_multiline_string;   # line starts within multi-line string literal
-my $count;                 # -1 or number of leading whitespace characters (except newline) in current line,
-                           # which should be $block_indent + $hanging_offset + $local_offset or $expr_indent
-my $count_before;          # number of leading whitespace characters (except line ending chars) in $contents_before
-my $has_label;             # current line contains label
-my $local_offset;          # current extra indent due to label, switch case/default, or leading closing brace(s)
-my $line_body_start;       # number of line where last function body started, or 0
-my $line_function_start;   # number of line where last function definition started, used for $line_body_start
-my $last_function_header;  # header containing name of last function defined, used if $line_body_start != 0
-my $line_opening_brace;    # number of previous line with opening brace after if/do/while/for, optionally for 'else'
-
-my $keyword_opening_brace; # name of previous keyword, used if $line_opening_brace != 0
-my $block_indent;          # currently required normal indentation at block/statement level
-my $hanging_offset;        # extra indent, which may be nested, for just one hanging statement or expr or typedef
-my @in_do_hanging_offsets; # stack of hanging offsets for nested 'do' ... 'while'
-my @in_if_hanging_offsets; # stack of hanging offsets for nested 'if' (but not its potential 'else' branch)
-my $if_maybe_terminated;   # 'if' ends and $hanging_offset should be reset unless the next line starts with 'else'
-my @nested_block_indents;  # stack of indentations at block/statement level, needed due to hanging statements
-my @nested_hanging_offsets;# stack of nested $hanging_offset values, in parallel to @nested_block_indents
-my @nested_in_typedecl;    # stack of nested $in_typedecl values, partly in parallel to @nested_block_indents
-my @nested_indents;        # stack of hanging indents due to parentheses, braces, brackets, or conditionals
-my @nested_symbols;        # stack of hanging symbols '(', '{', '[', or '?', in parallel to @nested_indents
-my @nested_conds_indents;  # stack of hanging indents due to conditionals ('?' ... ':')
-my $expr_indent;           # resulting hanging indent within (multi-line) expressions including type exprs, else 0
-my $hanging_symbol;        # character ('(', '{', '[', not: '?') responsible for $expr_indent, if $expr_indent != 0
-my $in_block_decls;        # number of local declaration lines after block opening before normal statements, or -1 if no block opening
-my $in_expr;               # in expression after if/while/for/switch/return/enum/LHS of assignment
-my $in_paren_expr;         # in parenthesized if/while/for condition and switch expression, if $expr_indent != 0
-my $in_typedecl;           # nesting level of typedef/struct/union/enum
-
-my $num_reports_line = 0;  # number of issues found on current line
-my $num_reports = 0;       # total number of issues found
-my $num_indent_reports = 0;# total number of indentation issues found
-my $num_nesting_issues = 0;# total number of preprocessor #if nesting issues found
-my $num_syntax_issues = 0; # total number of syntax issues found during sanity checks
-my $num_SPC_reports = 0;   # total number of whitespace issues found
-my $num_length_reports = 0;# total number of line length issues found
-
-sub reset_file_state {
-    $in_comment = 0;
-    $ifdef__cplusplus = 0;
-    $preproc_if_nesting = 0;
-    $in_preproc = 0;
-    $line = 0;
-    $line_before = 0;
-    $line_before2 = 0;
-    reset_indentation_state();
-}
-sub reset_indentation_state {
-    $code_contents_before = "";
-    @nested_block_indents = ();
-    @nested_hanging_offsets = ();
-    @nested_in_typedecl = ();
-    @nested_symbols = ();
-    @nested_indents = ();
-    @nested_conds_indents = ();
-    $expr_indent = 0;
-    $in_block_decls = -1;
-    $in_expr = 0;
-    $in_paren_expr = 0;
-    $hanging_offset = 0;
-    @in_do_hanging_offsets = ();
-    @in_if_hanging_offsets = ();
-    $if_maybe_terminated = 0;
-    $block_indent = 0;
-    $in_multiline_string = 0;
-    $line_body_start = 0;
-    $line_opening_brace = 0;
-    $in_typedecl = 0;
-}
-my $bak_line_before;
-my $bak_line_before2;
-my $bak_code_contents_before;
-my @bak_nested_block_indents;
-my @bak_nested_hanging_offsets;
-my @bak_nested_in_typedecl;
-my @bak_nested_symbols;
-my @bak_nested_indents;
-my @bak_nested_conds_indents;
-my $bak_expr_indent;
-my $bak_in_block_decls;
-my $bak_in_expr;
-my $bak_in_paren_expr;
-my $bak_hanging_offset;
-my @bak_in_do_hanging_offsets;
-my @bak_in_if_hanging_offsets;
-my $bak_if_maybe_terminated;
-my $bak_block_indent;
-my $bak_in_multiline_string;
-my $bak_line_body_start;
-my $bak_line_opening_brace;
-my $bak_in_typedecl;
-sub backup_indentation_state {
-    $bak_code_contents_before = $code_contents_before;
-    @bak_nested_block_indents = @nested_block_indents;
-    @bak_nested_hanging_offsets = @nested_hanging_offsets;
-    @bak_nested_in_typedecl = @nested_in_typedecl;
-    @bak_nested_symbols = @nested_symbols;
-    @bak_nested_indents = @nested_indents;
-    @bak_nested_conds_indents = @nested_conds_indents;
-    $bak_expr_indent = $expr_indent;
-    $bak_in_block_decls = $in_block_decls;
-    $bak_in_expr = $in_expr;
-    $bak_in_paren_expr = $in_paren_expr;
-    $bak_hanging_offset = $hanging_offset;
-    @bak_in_do_hanging_offsets = @in_do_hanging_offsets;
-    @bak_in_if_hanging_offsets = @in_if_hanging_offsets;
-    $bak_if_maybe_terminated = $if_maybe_terminated;
-    $bak_block_indent = $block_indent;
-    $bak_in_multiline_string = $in_multiline_string;
-    $bak_line_body_start = $line_body_start;
-    $bak_line_opening_brace = $line_opening_brace;
-    $bak_in_typedecl = $in_typedecl;
-}
-sub restore_indentation_state {
-    $code_contents_before = $bak_code_contents_before;
-    @nested_block_indents = @bak_nested_block_indents;
-    @nested_hanging_offsets = @bak_nested_hanging_offsets;
-    @nested_in_typedecl = @bak_nested_in_typedecl;
-    @nested_symbols = @bak_nested_symbols;
-    @nested_indents = @bak_nested_indents;
-    @nested_conds_indents = @bak_nested_conds_indents;
-    $expr_indent = $bak_expr_indent;
-    $in_block_decls = $bak_in_block_decls;
-    $in_expr = $bak_in_expr;
-    $in_paren_expr = $bak_in_paren_expr;
-    $hanging_offset = $bak_hanging_offset;
-    @in_do_hanging_offsets = @bak_in_do_hanging_offsets;
-    @in_if_hanging_offsets = @bak_in_if_hanging_offsets;
-    $if_maybe_terminated = $bak_if_maybe_terminated;
-    $block_indent = $bak_block_indent;
-    $in_multiline_string = $bak_in_multiline_string;
-    $line_body_start = $bak_line_body_start;
-    $line_opening_brace = $bak_line_opening_brace;
-    $in_typedecl = $bak_in_typedecl;
-}
-
-# auxiliary submodules @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-sub report_flexibly {
-    my $line = shift;
-    my $msg = shift;
-    my $contents = shift;
-    my $report_SPC = $msg =~ /space|blank/;
-    return if $report_SPC && $sloppy_SPC;
-
-    print "$ARGV:$line:$msg:$contents" unless $self_test;
-    $num_reports_line++;
-    $num_reports++;
-    $num_indent_reports++ if $msg =~ m/:indent /;
-    $num_nesting_issues++ if $msg =~ m/ nesting indent /;
-    $num_syntax_issues++  if $msg =~ m/unclosed|unexpected/;
-    $num_SPC_reports++    if $report_SPC;
-    $num_length_reports++ if $msg =~ m/length/;
-}
-
-sub report {
-    my $msg = shift;
-    report_flexibly($line, $msg, $contents);
-}
-
-sub parens_balance { # count balance of opening parentheses - closing parentheses
-    my $str = shift;
-    return $str =~ tr/\(// - $str =~ tr/\)//;
-}
-
-sub blind_nonspace { # blind non-space text of comment as @, preserving length and spaces
-    # the @ character is used because it cannot occur in normal program code so there is no confusion
-    # comment text is not blinded to whitespace in order to be able to check extra SPC also in comments
-    my $comment_text = shift;
-    $comment_text =~ s/([\.\?\!])\s\s/$1. /g; # in extra SPC checks allow one extra SPC after period '.', '?', or '!' in comments
-    return $comment_text =~ tr/ /@/cr;
-}
-
-# submodule for indentation checking/reporting @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-sub check_indent { # used for lines outside multi-line string literals
-    my $stmt_indent = $block_indent + $hanging_offset + $local_offset;
-    # print "DEBUG: expr_indent $expr_indent; stmt_indent $stmt_indent = block_indent $block_indent + hanging_offset $hanging_offset + local_offset $local_offset\n";
-    $stmt_indent = 0 if $stmt_indent < 0; # TODO maybe give warning/error
-    my $stmt_desc = $contents =~
-        m/^\s*\/\*/ ? "intra-line comment" :
-        $has_label ? "label" :
-        ($hanging_offset != 0 ? "hanging " : "").
-        ($hanging_offset != 0 ? "stmt/expr" : "stmt/decl"); # $in_typedecl is not fully to the point here
-    my ($ref_desc, $ref_indent) = $expr_indent == 0 ? ($stmt_desc, $stmt_indent)
-                                                    : ("hanging '$hanging_symbol'", $expr_indent);
-    my ($alt_desc, $alt_indent) = ("", $ref_indent);
-
-    # allow indent 1 for labels - this cannot happen for leading ':'
-    ($alt_desc, $alt_indent) = ("outermost position", 1) if $expr_indent == 0 && $has_label;
-
-    if (@nested_conds_indents != 0 && substr($_, $count, 1) eq ":") {
-        # leading ':' within stmt/expr/decl - this cannot happen for labels, leading '&&', or leading '||'
-        # allow special indent at level of corresponding "?"
-        ($alt_desc, $alt_indent) = ("leading ':'", @nested_conds_indents[-1]);
-    }
-    # allow extra indent offset leading '&&' or '||' - this cannot happen for leading ":"
-    ($alt_desc, $alt_indent) = ("leading '$1'", $ref_indent + INDENT_LEVEL) if $contents =~ m/^[\s@]*(\&\&|\|\|)/;
-
-    if ($expr_indent < 0) { # implies @nested_symbols != 0 && @nested_symbols[0] eq "{" && @nested_indents[-1] < 0
-        # allow normal stmt indentation level for hanging initializer/enum expressions after trailing '{'
-        # this cannot happen for labels and overrides special treatment of ':', '&&' and '||' for this line
-        ($alt_desc, $alt_indent) = ("lines after '{'", $stmt_indent);
-        # decide depending on current actual indentation, preventing forth and back
-        @nested_indents[-1] = $count == $stmt_indent ? $stmt_indent : -@nested_indents[-1]; # allow $stmt_indent
-        $ref_indent = $expr_indent = @nested_indents[-1];
-    }
-
-    # check consistency of indentation within multi-line comment (i.e., between its first, inner, and last lines)
-    if ($in_comment != 0 && $in_comment != 1) { # in multi-line comment but not on its first line
-        if (!$sloppy_cmt) {
-            if ($in_comment > 0) { # not at its end
-                report("indent = $count != $comment_indent within multi-line comment")
-                    if $count != $comment_indent;
-            } else {
-                my $tweak = $in_comment == -2 ? 1 : 0;
-                report("indent = ".($count + $tweak)." != $comment_indent at end of multi-line comment")
-                    if $count + $tweak != $comment_indent;
-            }
-        }
-        # do not check indentation of last line of non-leading multi-line comment
-        if ($in_comment < 0 && !$leading_comment) {
-            s/^(\s*)@/$1*/; # blind first '@' as '*' to prevent below delayed check for the line before
-            return;
-        }
-        return if $in_comment > 0; # not on its last line
-        # $comment_indent will be checked by the below checks for end of multi-line comment
-    }
-
-    # else check indentation of entire-line comment or entire-line end of multi-line comment
-    # ... w.r.t. indent of the following line by delayed check for the line before
-    if (($in_comment == 0 || $in_comment == 1) # no comment, intra-line comment, or begin of multi-line comment
-        && $line_before > 0 # there is a line before
-        && $contents_before_ =~ m/^(\s*)@[\s@]*$/) { # line before begins with '@', no code follows (except '\')
-        report_flexibly($line_before, "entire-line comment indent = $count_before != $count (of following line)",
-            $contents_before) if !$sloppy_cmt && $count_before != -1 && $count_before != $count;
-    }
-    # ... but allow normal indentation for the current line, else above check will be done for the line before
-    if (($in_comment == 0 || $in_comment < 0) # (no comment,) intra-line comment or end of multi-line comment
-        && m/^(\s*)@[\s@]*$/) { # line begins with '@', no code follows (except '\')
-        if ($count == $ref_indent) { # indentation is like for (normal) code in this line
-            s/^(\s*)@/$1*/; # blind first '@' as '*' to prevent above delayed check for the line before
-            return;
-        }
-        return if !eof; # defer check of entire-line comment to next line
-    }
-
-    # else check indentation of leading intra-line comment or end of multi-line comment
-    if (m/^(\s*)@/) { # line begins with '@', i.e., any (remaining type of) comment
-        if (!$sloppy_cmt && $count != $ref_indent) {
-            report("intra-line comment indent = $count != $ref_indent") if $in_comment == 0;
-            report("multi-line comment indent = $count != $ref_indent") if $in_comment < 0;
-        }
-        return;
-    }
-
-    if ($sloppy_hang && ($hanging_offset != 0 || $expr_indent != 0)) {
-        # do not report same indentation as on the line before (potentially due to same violations)
-        return if $line_before > 0 && $count == $count_before;
-
-        # do not report indentation at normal indentation level while hanging expression indent would be required
-        return if $expr_indent != 0 && $count == $stmt_indent;
-
-        # do not report if contents have been shifted left of nested expr indent (but not as far as stmt indent)
-        # apparently aligned to the right in order to fit within line length limit
-        return if $stmt_indent < $count && $count < $expr_indent &&
-            length($contents) == $max_length + length("\n");
-    }
-
-    report("indent = $count != $ref_indent for $ref_desc".
-           ($alt_desc eq ""
-            || $alt_indent == $ref_indent # prevent showing alternative that happens to have equal value
-            ? "" : " or $alt_indent for $alt_desc"))
-        if $count != $ref_indent && $count != $alt_indent;
-}
-
-# submodules handling indentation within expressions @@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-sub update_nested_indents { # may reset $in_paren_expr and in this case also resets $in_expr
-    my $str = shift;
-    my $start = shift; # defaults to 0
-    my $terminator_position = -1;
-    for (my $i = $start; $i < length($str); $i++) {
-        my $c;
-        my $curr = substr($str, $i);
-        if ($curr =~ m/^(.*?)([{}()?:;\[\]])(.*)$/) { # match from position $i the first {}()?:;[]
-            $c = $2;
-        } else {
-            last;
-        }
-        my ($head, $tail) = (substr($str, 0, $i).$1, $3);
-        $i += length($1) + length($2) - 1;
-
-        # stop at terminator outside 'for (..;..;..)', assuming that 'for' is followed by '('
-        return $i if $c eq ";" && (!$in_paren_expr || @nested_indents == 0);
-
-        my $in_stmt = $in_expr || @nested_symbols != 0; # not: || $in_typedecl != 0
-        if ($c =~ m/[{([?]/) { # $c is '{', '(', '[', or '?'
-            if ($c eq "{") { # '{' in any context
-                $in_block_decls = 0 if !$in_expr && $in_typedecl == 0;
-                # cancel newly hanging_offset if opening brace '{' is after non-whitespace non-comment:
-                $hanging_offset -= INDENT_LEVEL if $hanging_offset > 0 && $head =~ m/[^\s\@]/;
-                push @nested_block_indents, $block_indent;
-                push @nested_hanging_offsets, $in_expr ? $hanging_offset : 0;
-                push @nested_in_typedecl, $in_typedecl if $in_typedecl != 0;
-                $block_indent += INDENT_LEVEL + $hanging_offset;
-                $hanging_offset = 0;
-            }
-            if ($c ne "{" || $in_stmt) { # for '{' inside stmt/expr (not: decl), for '(', '[', or '?' anywhere
-                $tail =~ m/^([\s@]*)([^\s\@])/;
-                push @nested_indents, defined $2
-                    ? $i + 1 + length($1) # actual indentation of following non-space non-comment
-                    : $c ne "{" ? +($i + 1)  # just after '(' or '[' if only whitespace thereafter
-                                : -($i + 1); # allow also $stmt_indent if '{' with only whitespace thereafter
-                push @nested_symbols, $c; # done also for '?' to be able to check correct nesting
-                push @nested_conds_indents, $i if $c eq "?"; # remember special alternative indent for ':'
-            }
-        } elsif ($c =~ m/[})\]:]/) { # $c is '}', ')', ']', or ':'
-            my $opening_c = ($c =~ tr/})]:/{([/r);
-            if (($c ne ":" || $in_stmt    # ignore ':' outside stmt/expr/decl
-                # in the presence of ':', one could add this sanity check:
-                # && !(# ':' after initial label/case/default
-                #      $head =~ m/^([\s@]*)(case\W.*$|\w+$)/ || # this matching would not work for
-                #                                               # multi-line expr after 'case'
-                #      # bitfield length within unsigned type decl
-                #      $tail =~ m/^[\s@]*\d+/                   # this matching would need improvement
-                #     )
-                )) {
-                if ($c ne "}" || $in_stmt) { # for '}' inside stmt/expr/decl, ')', ']', or ':'
-                    if (@nested_symbols != 0 &&
-                        @nested_symbols[-1] == $opening_c) { # for $c there was a corresponding $opening_c
-                        pop @nested_indents;
-                        pop @nested_symbols;
-                        pop @nested_conds_indents if $opening_c eq "?";
-                    } else {
-                        report("unexpected '$c' @ ".($in_paren_expr ? "(expr)" : "expr"));
-                        next;
-                    }
-                }
-                if ($c eq "}") { # '}' at block level but also inside stmt/expr/decl
-                    if (@nested_block_indents == 0) {
-                        report("unexpected '}'");
-                    } else {
-                        $block_indent = pop @nested_block_indents;
-                        $hanging_offset = pop @nested_hanging_offsets;
-                        $in_typedecl = pop @nested_in_typedecl if @nested_in_typedecl != 0;
-                    }
-                }
-                if ($in_paren_expr && !grep(/\(/, @nested_symbols)) { # end of (expr)
-                    check_nested_nonblock_indents("(expr)");
-                    $in_paren_expr = $in_expr = 0;
-                    report("code after (expr)")
-                        if $tail =~ m/^([^{]*)/ && $1 =~ m/[^\s\@;]/; # non-space non-';' before any '{'
-                }
-            }
-        }
-    }
-    return -1;
-}
-
-sub check_nested_nonblock_indents {
-    my $position = shift;
-    while (@nested_symbols != 0) {
-        my $symbol = pop @nested_symbols;
-        report("unclosed '$symbol' in $position");
-        if ($symbol eq "{") { # repair stack of blocks
-            $block_indent = pop @nested_block_indents;
-            $hanging_offset = pop @nested_hanging_offsets;
-            $in_typedecl = pop @nested_in_typedecl if @nested_in_typedecl != 0;
-        }
-    }
-    @nested_indents = ();
-    @nested_conds_indents = ();
-}
-
-# start of main program @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-reset_file_state();
-
-while (<>) { # loop over all lines of all input files
-    $self_test = $ARGV =~ m/check-format-test/;
-    $_ = "" if $self_test && m/ blank line within local decls /;
-    $line++;
-    s/\r$//; # strip any trailing CR '\r' (which are typical on Windows systems)
-    $contents = $_;
-
-    # check for illegal characters
-    if (m/(.*?)([\x00-\x09\x0B-\x1F\x7F-\xFF])/) {
-        my $col = length($1);
-        report(($2 eq "\x09" ? "TAB" : $2 eq "\x0D" ? "CR " : $2 =~ m/[\x00-\x1F]/ ? "non-printable"
-                : "non-7bit char") . " at column $col") ;
-    }
-
-    # check for whitespace at EOL
-    report("trailing whitespace at EOL") if m/\s\n$/;
-
-    # assign to $count the actual indentation level of the current line
-    chomp; # remove trailing NL '\n'
-    m/^(\s*)/;
-    $count = length($1); # actual indentation
-    $has_label = 0;
-    $local_offset = 0;
-
-    # character/string literals @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-    s/\\["']/@@/g; # blind all '"' and "'" escaped by '\' (typically within character literals or string literals)
-
-    # handle multi-line string literals to avoid confusion on starting/ending '"' and trailing '\'
-    if ($in_multiline_string) {
-        if (s#^([^"]*)"#($1 =~ tr/"/@/cr).'@'#e) { # string literal terminated by '"'
-            # string contents and its terminating '"' have been blinded as '@'
-            $count = -1; # do not check indentation
-        } else {
-            report("multi-line string literal not terminated by '\"' and trailing '\' is missing")
-                unless s#^([^\\]*)\s*\\\s*$#$1#; # strip trailing '\' plus any whitespace around
-            goto LINE_FINISHED;
-        }
-    }
-
-    # blind contents of character and string literals as @, preserving length (but not spaces)
-    # this prevents confusing any of the matching below, e.g., of whitespace and comment delimiters
-    s#('[^']*')#$1 =~ tr/'/@/cr#eg; # handle all intra-line character literals
-    s#("[^"]*")#$1 =~ tr/"/@/cr#eg; # handle all intra-line string literals
-    $in_multiline_string =          # handle trailing string literal terminated by '\'
-        s#^(([^"]*"[^"]*")*[^"]*)("[^"]*)\\(\s*)$#$1.($3 =~ tr/"/@/cr).'"'.$4#e;
-        # its contents have been blinded and the trailing '\' replaced by '"'
-
-    # strip any other trailing '\' along with any whitespace around it such that it does not interfere with various matching below
-    my $trailing_backslash = s#^(.*?)\s*\\\s*$#$1#; # trailing '\' possibly preceded or followed by whitespace
-    my $essentially_blank_line = m/^\s*$/; # just whitespace and maybe a '\'
-
-    # comments @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-    # do/prepare checks within multi-line comments
-    my $self_test_exception = $self_test ? "@" : "";
-    if ($in_comment > 0) { # this still includes the last line of multi-line comment
-        my ($head, $any_symbol, $cmt_text) = m/^(\s*)(.?)(.*)$/;
-        if ($any_symbol eq "*") {
-            report("missing space or '*' after leading '*' in multi-line comment") if $cmt_text =~ m|^[^*\s/$self_test_exception]|;
-        } else {
-            report("missing leading '*' in multi-line comment");
-        }
-        $in_comment++;
-    }
-
-    # detect end of comment, must be within multi-line comment, check if it is preceded by non-whitespace text
-    if ((my ($head, $tail) = m|^(.*?)\*/(.*)$|) && $1 ne '/') { # ending comment: '*/'
-        report("missing space or '*' before '*/'") if $head =~ m/[^*\s]$/;
-        report("missing space (or ',', ';', ')', '}', ']') after '*/'") if $tail =~ m/^[^\s,;)}\]]/; # no space or ,;)}] after '*/'
-        if (!($head =~ m|/\*|)) { # not begin of comment '/*', which is is handled below
-            if ($in_comment == 0) {
-                report("unexpected '*/' outside comment");
-                $_ = "$head@@".$tail; # blind the "*/"
-            } else {
-                report("text before '*/' in multi-line comment") if ($head =~ m/[^*\s]/); # non-SPC before '*/'
-                $in_comment = -1; # indicate that multi-line comment ends on current line
-                if ($count > 0) {
-                    # make indentation of end of multi-line comment appear like of leading intra-line comment
-                    $head =~ s/^(\s*)\s/$1@/; # replace the last leading space by '@'
-                    $count--;
-                    $in_comment = -2; # indicate that multi-line comment ends on current line, with tweak
-                }
-                my $cmt_text = $head;
-                $_ = blind_nonspace($cmt_text)."@@".$tail;
-            }
-        }
-    }
-
-    # detect begin of comment, check if it is followed by non-space text
-  MATCH_COMMENT:
-    if (my ($head, $opt_minus, $tail) = m|^(.*?)/\*(-?)(.*)$|) { # begin of comment: '/*'
-        report("missing space before '/*'")
-            if $head =~ m/[^\s(\*]$/; # not space, '(', or or '*' (needed to allow '*/') before comment delimiter
-        report("missing space, '*', or '!' after '/*$opt_minus'") if $tail =~ m/^[^\s*!$self_test_exception]/;
-        my $cmt_text = $opt_minus.$tail; # preliminary
-        if ($in_comment > 0) {
-            report("unexpected '/*' inside multi-line comment");
-        } elsif ($tail =~ m|^(.*?)\*/(.*)$|) { # comment end: */ on same line
-            report("unexpected '/*' inside intra-line comment") if $1 =~ /\/\*/;
-            # blind comment text, preserving length and spaces
-            ($cmt_text, my $rest) = ($opt_minus.$1, $2);
-            $_ = "$head@@".blind_nonspace($cmt_text)."@@".$rest;
-            goto MATCH_COMMENT;
-        } else { # begin of multi-line comment
-            my $self_test_exception = $self_test ? "(@\d?)?" : "";
-            report("text after '/*' in multi-line comment")
-                unless $tail =~ m/^$self_test_exception.?[*\s]*$/;
-            # tail not essentially blank, first char already checked
-            # adapt to actual indentation of first line
-            $comment_indent = length($head) + 1;
-            $_ = "$head@@".blind_nonspace($cmt_text);
-            $in_comment = 1;
-            $leading_comment = $head =~ m/^\s*$/; # there is code before beginning delimiter
-            $formatted_comment = $opt_minus eq "-";
-        }
-    } elsif (($head, $tail) = m|^\{-(.*)$|) { # begin of Perl pragma: '{-'
-    }
-
-    if ($in_comment > 1) { # still inside multi-line comment (not at its begin or end)
-        m/^(\s*)\*?(\s*)(.*)$/;
-        $_ = $1."@".$2.blind_nonspace($3);
-    }
-
-    # handle special case of line after '#ifdef __cplusplus' (which typically appears in header files)
-    if ($ifdef__cplusplus) {
-        $ifdef__cplusplus = 0;
-        $_ = "$1 $2" if $contents =~ m/^(\s*extern\s*"C"\s*)\{(\s*)$/; # ignore opening brace in 'extern "C" {'
-        goto LINE_FINISHED if m/^\s*\}\s*$/; # ignore closing brace '}'
-    }
-
-    # check for over-long lines,
-    # while allowing trailing (also multi-line) string literals to go past $max_length
-    my $len = length; # total line length (without trailing '\n')
-    if ($len > $max_length &&
-        !(m/^(.*)"[^"]*"\s*[\)\}\]]*[,;]?\s*$/ # string literal terminated by '"' (or '\'), then maybe )}],;
-          && length($1) < $max_length)
-        # this allows over-long trailing string literals with beginning col before $max_length
-        ) {
-        report("line length = $len > ".$max_length);
-    }
-
-    # handle C++ / C99 - style end-of-line comments
-    if (my ($head, $cmt_text) = m|^(.*?)//(.*$)|) {
-        report("'//' end-of-line comment");  # the '//' comment style is not allowed for C90
-        # blind comment text, preserving length and spaces
-        $_ = "$head@@".blind_nonspace($cmt_text);
-    }
-
-    # at this point all non-space portions of any types of comments have been blinded as @
-
-    goto LINE_FINISHED if $essentially_blank_line;
-
-    # handle preprocessor directives @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-    if (s/^(\s*#)(\s*)(\w+)//) { # line beginning with '#' and directive name;
-        # blank these portions to prevent confusion with C-level 'if', 'else', etc.
-        my ($lead, $space) = ($1, $2);
-        $preproc_directive = $3;
-        $_ = "$lead$space$preproc_directive$_" if $preproc_directive =~ m/^(define|include)$/; # yet do not blank #define or #include to prevent confusing the indentation or whitespace checks, resp.
-        $_ =  blind_nonspace($_) if $preproc_directive eq "error"; # blind error message
-        if ($in_preproc != 0) {
-            report("preprocessor directive within multi-line directive");
-            reset_indentation_state();
-        }
-        $in_preproc++;
-        report("indent = $count != 0 for '#'") if $count != 0;
-        report("'#$preproc_directive' with constant condition")
-            if $preproc_directive =~ m/^(if|elif)$/ && m/^[\W0-9]+$/ && !$trailing_backslash;
-        $preproc_if_nesting-- if $preproc_directive =~ m/^(else|elif|endif)$/;
-        if ($preproc_if_nesting < 0) {
-            $preproc_if_nesting = 0;
-            report("unexpected '#$preproc_directive' according to '#if' nesting");
-        }
-        my $space_count = length($space); # maybe could also use indentation before '#'
-        report("'#if' nesting indent = $space_count != $preproc_if_nesting") if $space_count != $preproc_if_nesting;
-        $preproc_if_nesting++ if $preproc_directive =~ m/^(if|ifdef|ifndef|else|elif)$/;
-        $ifdef__cplusplus = $preproc_directive eq "ifdef" && m/\s+__cplusplus\s*$/;
-
-        # handle indentation of preprocessor directive independently of surrounding normal code
-        $count = -1; # do not check indentation of first line of preprocessor directive
-        backup_indentation_state();
-        reset_indentation_state();
-    }
-
-    # intra-line whitespace nits @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-    my $in_multiline_comment = ($in_comment > 1 || $in_comment < 0); # $in_multiline_comment refers to line before
-    if (!$sloppy_SPC && !($in_multiline_comment && $formatted_comment)) {
-        sub extra_SPC {
-            my $intra_line = shift;
-            return "extra space".($intra_line =~ m/@\s\s/ ?
-                                  $in_comment != 0 ? " in multi-line comment"
-                                                   : " in intra-line comment" : "");
-        }
-        sub split_line_head { # split line contents into header containing leading spaces and the first non-space char, and the rest of the line
-            my $comment_symbol =
-                $in_comment != 0 ? "@" : ""; # '@' will match the blinded leading '*' in multi-line comment
-                                             # $in_comment may pertain to the following line due to delayed check
-            # do not check for extra SPC in leading spaces including any '#' (or '*' within multi-line comment)
-            shift =~ m/^(\s*([#$comment_symbol]\s*)?)(.*?)\s*$/;
-            return ($1, $3);
-        }
-        my ($head , $intra_line ) = split_line_head($_);
-        my ($head1, $intra_line1) = split_line_head($contents_before_ ) if $line_before > 0;
-        my ($head2, $intra_line2) = split_line_head($contents_before_2) if $line_before2 > 0;
-        if ($line_before > 0) { # check with one line delay, such that at least $contents_before is available
-            sub column_alignments_only { # return 1 if the given line has multiple consecutive spaces only at columns that match the reference line
-                # all parameter strings are assumed to contain contents after blinding comments etc.
-                my $head = shift;     # leading spaces and the first non-space char
-                my $intra = shift;    # the rest of the line contents
-                my $contents = shift; # reference line
-                # check if all extra SPC in $intra is used only for multi-line column alignment with $contents
-                my $offset = length($head);
-                for (my $col = 0; $col < length($intra) - 2; $col++) {
-                    my $substr = substr($intra, $col);
-                    next unless $substr =~ m/^\s\s\S/; # extra SPC (but not in leading spaces of the line)
-                    next if !$eol_cmt && $substr =~ m/^[@\s]+$/; # end-of-line comment
-                    return 0 unless substr($contents, $col + $offset + 1, 2) =~ m/\s\S/; # reference line contents do not match
-                }
-                return 1;
-            }
-            report_flexibly($line_before, extra_SPC($intra_line1), $contents_before) if $intra_line1 =~ m/\s\s\S/ &&
-               !(    column_alignments_only($head1, $intra_line1, $_                )    # compare with $line
-                 || ($line_before2 > 0 &&
-                     column_alignments_only($head1, $intra_line1, $contents_before_2))); # compare w/ $line_before2
-            report(extra_SPC($intra_line)) if $intra_line  =~ m/\s\s\S/ && eof
-                && ! column_alignments_only($head , $intra_line , $contents_before_ )  ; # compare w/ $line_before
-        } elsif (eof) { # special case: just one line exists
-            report(extra_SPC($intra_line)) if $intra_line  =~ m/\s\s\S/;
-        }
-        # ignore paths in #include
-        $intra_line =~ s/^(include\s*)(".*?"|<.*?>)/$1/e if $head =~ m/#/;
-        report("missing space before '$2'")
-            if $intra_line =~ m/(\S)((<<|>>)=)/ # '<<=' or >>=' without preceding space
-            || ($intra_line =~ m/(\S)([\+\-\*\/\/%\&\|\^\!<>=]=)/
-                && "$1$2" ne "<<=" && "$1$2" ne ">>=") # other <op>= or (in)equality without preceding space
-            || ($intra_line =~ m/(\S)=/
-                && !($1 =~ m/[\+\-\*\/\/%\&\|\^\!<>=]/)
-                && $intra_line =~ m/(\S)(=)/); # otherwise, '=' without preceding space
-        # treat op= and comparison operators as simple '=', simplifying matching below
-        $intra_line =~ s/(<<|>>|[\+\-\*\/\/%\&\|\^\!<>=])=/=/g;
-        # treat (type) variables within macro, indicated by trailing '\', as 'int' simplifying matching below
-        $intra_line =~ s/[A-Z_]+/int/g if $trailing_backslash;
-        # treat double &&, ||, <<, and >> as single ones, simplifying matching below
-        $intra_line =~ s/(&&|\|\||<<|>>)/substr($1, 0, 1)/eg;
-        # remove blinded comments etc. directly after [{(
-        while ($intra_line =~ s/([\[\{\(])@+\s?/$1/e) {} # /g does not work here
-        # remove blinded comments etc. directly before ,;)}]
-        while ($intra_line =~ s/\s?@+([,;\)\}\]])/$1/e) {} # /g does not work here
-        # treat remaining blinded comments and string literal contents as (single) space during matching below
-        $intra_line =~ s/@+/ /g;                     # note that extra SPC has already been handled above
-        $intra_line =~ s/\s+$//;                     # strip any (resulting) space at EOL
-        # replace ';;' or '; ;' by ';' in "for (;;)" and in "for (...)" unless "..." contains just SPC and ';' characters:
-        $intra_line =~ s/((^|\W)for\s*\()([^;]*?)(\s*)(;\s?);(\s*)([^;]*)(\))/
-          "$1$3$4".("$3$4$5$6$7" eq ";" || $3 ne "" || $7 ne "" ? "" : $5).";$6$7$8"/eg;
-        # strip trailing ';' or '; ' in "for (...)" except in "for (;;)" or "for (;; )":
-        $intra_line =~ s/((^|\W)for\s*\()([^;]*(;[^;]*)?)(;\s?)(\))/
-          "$1$3".($3 eq ";" ? $5 : "")."$6"/eg;
-        $intra_line =~ s/(=\s*)\{ /"$1@ "/eg;        # do not report {SPC in initializers such as ' = { 0, };'
-        $intra_line =~ s/, \};/, @;/g;               # do not report SPC} in initializers such as ' = { 0, };'
-        report("space before '$1'") if $intra_line =~ m/[\w)\]]\s+(\+\+|--)/;  # postfix ++/-- with preceding space
-        report("space after '$1'")  if $intra_line =~ m/(\+\+|--)\s+[a-zA-Z_(]/; # prefix ++/-- with following space
-        $intra_line =~ s/\.\.\./@/g;                 # blind '...'
-        report("space before '$1'") if $intra_line =~ m/\s(\.|->)/;            # '.' or '->' with preceding space
-        report("space after '$1'")  if $intra_line =~ m/(\.|->)\s/;            # '.' or '->' with following space
-        $intra_line =~ s/\-\>|\+\+|\-\-/@/g;         # blind '->,', '++', and '--'
-        report("space before '$1'")     if $intra_line =~ m/[^:)]\s+(;)/;      # space before ';' but not after ':' or ')' # note that
-        # exceptions for "for (;; )" are handled above
-        report("space before '$1'")     if $intra_line =~ m/\s([,)\]])/;       # space before ,)]
-        report("space after '$1'")      if $intra_line =~ m/([(\[~!])\s/;      # space after ([~!
-        report("space after '$1'")      if $intra_line =~ m/(defined)\s/;      # space after 'defined'
-        report("missing space before '$1'")  if $intra_line =~ m/\S([|\/%<>^\?])/;  # |/%<>^? without preceding space
-        # TODO ternary ':' without preceding SPC, while allowing no SPC before ':' after 'case'
-        report("missing space before binary '$2'")  if $intra_line =~ m/([^\s{()\[e])([+\-])/; # '+'/'-' without preceding space or {()[e
-        # ')' may be used for type casts or before "->", 'e' may be used for numerical literals such as "1e-6"
-        report("missing space before binary '$1'")  if $intra_line =~ m/[^\s{()\[*!]([*])/; # '*' without preceding space or {()[*!
-        report("missing space before binary '$1'")  if $intra_line =~ m/[^\s{()\[]([&])/;  # '&' without preceding space or {()[
-        report("missing space after ternary '$1'") if $intra_line =~ m/(:)[^\s\d]/; # ':' without following space or digit
-        report("missing space after '$1'")   if $intra_line =~ m/([,;=|\/%<>^\?])\S/; # ,;=|/%<>^? without following space
-        report("missing space after binary '$1'") if $intra_line=~m/[^{(\[]([*])[^\sa-zA-Z_(),*]/;# '*' w/o space or \w(),* after
-        # TODO unary '*' must not be followed by SPC
-        report("missing space after binary '$1'") if $intra_line=~m/([&])[^\sa-zA-Z_(]/;  # '&' w/o following space or \w(
-        # TODO unary '&' must not be followed by SPC
-        report("missing space after binary '$1'") if $intra_line=~m/[^{(\[]([+\-])[^\s\d(]/;  # +/- w/o following space or \d(
-        # TODO unary '+' and '-' must not be followed by SPC
-        report("missing space after '$2'")   if $intra_line =~ m/(^|\W)(if|while|for|switch|case)[^\w\s]/; # kw w/o SPC
-        report("missing space after '$2'")   if $intra_line =~ m/(^|\W)(return)[^\w\s;]/;  # return w/o SPC or ';'
-        report("space after function/macro name")
-                                      if $intra_line =~ m/(\w+)\s+\(/        # fn/macro name with space before '('
-       && !($1 =~ m/^(sizeof|if|else|while|do|for|switch|case|default|break|continue|goto|return|void|char|signed|unsigned|int|short|long|float|double|typedef|enum|struct|union|auto|extern|static|const|volatile|register)$/) # not keyword
-                                    && !(m/^\s*#\s*define\s+\w+\s+\(/); # not a macro without parameters having a body that starts with '('
-        report("missing space before '{'")   if $intra_line =~ m/[^\s{(\[]\{/;      # '{' without preceding space or {([
-        report("missing space after '}'")    if $intra_line =~ m/\}[^\s,;\])}]/;    # '}' without following space or ,;])}
-    }
-
-    # adapt required indentation @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-    s/(\w*ASN1_[A-Z_]+END\w*([^(]|\(.*?\)|$))/$1;/g; # treat *ASN1_*END*(..) macro calls as if followed by ';'
-
-    my $nested_indents_position = 0;
-
-    # update indents according to leading closing brace(s) '}' or label or switch case
-    my $in_stmt = $in_expr || @nested_symbols != 0 || $in_typedecl != 0;
-    if ($in_stmt) { # expr/stmt/type decl/var def/fn hdr, i.e., not at block level
-        if (m/^([\s@]*\})/) { # leading '}' within stmt, any preceding blinded comment must not be matched
-            $in_block_decls = -1;
-            my $head = $1;
-            update_nested_indents($head);
-            $nested_indents_position = length($head);
-            if (@nested_symbols >= 1) {
-                $hanging_symbol = @nested_symbols[-1];
-                $expr_indent = @nested_indents[-1];
-            } else { # typically end of initialiizer expr or enum
-                $expr_indent = 0;
-            }
-        } elsif (m/^([\s@]*)(static_)?ASN1_ITEM_TEMPLATE_END(\W|$)/) { # workaround for ASN1 macro indented as '}'
-            $local_offset = -INDENT_LEVEL;
-            $expr_indent = 0;
-        } elsif (m/;.*?\}/) { # expr ends with ';' before '}'
-            report("code before '}'");
-        }
-    }
-    if (@in_do_hanging_offsets != 0 && # note there is nothing like "unexpected 'while'"
-        m/^[\s@]*while(\W|$)/) { # leading 'while'
-        $hanging_offset = pop @in_do_hanging_offsets;
-    }
-    if ($if_maybe_terminated) {
-        if (m/(^|\W)else(\W|$)/) { # (not necessarily leading) 'else'
-            if (@in_if_hanging_offsets == 0) {
-                report("unexpected 'else'");
-            } else {
-                $hanging_offset = pop @in_if_hanging_offsets;
-            }
-        } else {
-            @in_if_hanging_offsets = (); # note there is nothing like "unclosed 'if'"
-            $hanging_offset = 0;
-        }
-    }
-    if (!$in_stmt) { # at block level, i.e., outside expr/stmt/type decl/var def/fn hdr
-        $if_maybe_terminated = 0;
-        if (my ($head, $before, $tail) = m/^([\s@]*([^{}]*)\})[\s@]*(.*)$/) { # leading closing '}', but possibly
-                                                                              # with non-whitespace non-'{' before
-            report("code after '}'") unless $tail eq "" || $tail =~ m/(else|while|OSSL_TRACE_END)(\W|$)/;
-            my $outermost_level = @nested_block_indents == 1 && @nested_block_indents[0] == 0;
-            if (!$sloppy_bodylen && $outermost_level && $line_body_start != 0) {
-                my $body_len = $line - $line_body_start - 1;
-                report_flexibly($line_function_start, "function body length = $body_len > ".MAX_BODY_LENGTH." lines",
-                    $last_function_header) if $body_len > MAX_BODY_LENGTH;
-                $line_body_start = 0;
-            }
-            if ($before ne "") { # non-whitespace non-'{' before '}'
-                report("code before '}'");
-            } else { # leading '}' outside stmt, any preceding blinded comment must not be matched
-                $in_block_decls = -1;
-                $local_offset = $block_indent + $hanging_offset - INDENT_LEVEL;
-                update_nested_indents($head);
-                $nested_indents_position = length($head);
-                $local_offset -= ($block_indent + $hanging_offset);
-                # in effect $local_offset = -INDENT_LEVEL relative to $block_indent + $hanging_offset values before
-            }
-        }
-
-        # handle opening brace '{' after if/else/while/for/switch/do on line before
-        if ($hanging_offset > 0 && m/^[\s@]*{/ && # leading opening '{'
-            $line_before > 0 &&
-            $contents_before_ =~ m/(^|^.*\W)(if|else|while|for|(OSSL_)?LIST_FOREACH(_\w+)?|switch|do)(\W.*$|$)/) {
-            $keyword_opening_brace = $1;
-            $hanging_offset -= INDENT_LEVEL; # cancel newly hanging_offset
-        }
-
-        if (m/^[\s@]*(case|default)(\W.*$|$)/) { # leading 'case' or 'default'
-            my $keyword = $1;
-            report("code after $keyword: ") if $2 =~ /:.*[^\s@].*$/;
-            $local_offset = -INDENT_LEVEL;
-        } else {
-            if (m/^([\s@]*)(\w+):/) { # (leading) label, cannot be "default"
-                $local_offset = -INDENT_LEVEL;
-                $has_label = 1;
-            }
-        }
-    }
-
-    # potential adaptations of indent in first line of macro body in multi-line macro definition
-    if ($in_preproc != 0 && $in_macro_header > 0) {
-        if ($in_macro_header > 1) { # still in macro definition header
-            $in_macro_header += parens_balance($_);
-        } else { # begin of macro body
-            $in_macro_header = 0;
-            if ($count == $block_indent - $preproc_offset # body began with same indentation as preceding code
-                && $sloppy_macro) { # workaround for this situation is enabled
-                $block_indent -= $preproc_offset;
-                $preproc_offset = 0;
-            }
-        }
-    }
-
-    # check required indentation @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-    check_indent() if $count >= 0; # not for start of preprocessor directive and not if multi-line string literal is continued
-
-    # check for blank lines within/after local decls @@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-    if ($in_block_decls >= 0 &&
-        $in_comment == 0 && !m/^\s*\*?@/ && # not in a multi-line or intra-line comment
-        !$in_expr && $expr_indent == 0 && $in_typedecl == 0) {
-        my $blank_line_before = $line > 1 && $code_contents_before =~ m/^\s*(\\\s*)?$/;
-        # essentially blank line before: just whitespace and maybe a '\'
-        if (m/^[\s(]*(char|signed|unsigned|int|short|long|float|double|enum|struct|union|auto|extern|static|const|volatile|register)(\W|$)/ # clear start of local decl
-            || (m/^(\s*(\w+|\[\]|[\*()]))+?\s+[\*\(]*\w+(\s*(\)|\[[^\]]*\]))*\s*[;,=]/ # weak check for decl involving user-defined type
-                && !m/^\s*(\}|sizeof|if|else|while|do|for|switch|case|default|break|continue|goto|return)(\W|$)/)) {
-            $in_block_decls++;
-            report_flexibly($line - 1, "blank line within local decls, before", $contents) if $blank_line_before;
-        } else {
-            report_flexibly($line, "missing blank line after local decls", "\n$contents_before$contents")
-                if $in_block_decls > 0 && !$blank_line_before;
-            $in_block_decls = -1 unless
-                m/^\s*(\\\s*)?$/ # essentially blank line: just whitespace (and maybe a trailing '\')
-            || $in_comment != 0 || m/^\s*\*?@/; # in multi-line comment or an intra-line comment
-        }
-    }
-
-    $in_comment = 0 if $in_comment < 0; # multi-line comment has ended
-
-    # do some further checks @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-    my $outermost_level = $block_indent - $preproc_offset == 0;
-
-    report("more than one stmt") if !m/(^|\W)(for|(OSSL_)?LIST_FOREACH(_\w+)?)(\W.*|$)/ && # no 'for' - TODO improve matching
-        m/;.*;/; # two or more terminators ';', so more than one statement
-
-    # check for code block containing a single line/statement
-    if ($line_before2 > 0 && !$outermost_level && # within function body
-        $in_typedecl == 0 && @nested_indents == 0 && # neither within type declaration nor inside stmt/expr
-        m/^[\s@]*\}\s*(\w*)/) { # leading closing brace '}', any preceding blinded comment must not be matched
-        # TODO extend detection from single-line to potentially multi-line statement
-        my $next_word = $1;
-        if ($line_opening_brace > 0 &&
-            ($keyword_opening_brace ne "if" ||
-             $extended_1_stmt || $next_word ne "else") &&
-            ($line_opening_brace == $line_before2 ||
-             $line_opening_brace == $line_before)
-            && $contents_before =~ m/;/) { # there is at least one terminator ';', so there is some stmt
-            # TODO do not report cases where a further else branch
-            # follows with a block containing more than one line/statement
-            report_flexibly($line_before, "'$keyword_opening_brace' { 1 stmt }", $contents_before);
-        }
-    }
-
-    report("single-letter name '$2'") if (m/(^|.*\W)([IO])(\W.*|$)/); # single-letter name 'I' or 'O' # maybe re-add 'l'?
-    # constant on LHS of comparison or assignment, e.g., NULL != x or 'a' < c, but not a + 1 == b
-    report("constant on LHS of '$3'")
-        if (m/(['"]|([\+\-\*\/\/%\&\|\^<>]\s*)?\W[0-9]+L?|\WNULL)\s*([\!<>=]=|[<=>])([<>]?)/ &&
-            $2 eq "" && (($3 ne "<" && $3 ne "='" && $3 ne ">") || $4 eq ""));
-
-    # TODO report needless use of parentheses, while
-    #      macro parameters should always be in parens (except when passed on), e.g., '#define ID(x) (x)'
-
-    # adapt required indentation for following lines @@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-    # set $in_expr, $in_paren_expr, and $hanging_offset for if/while/for/switch, return/enum, and assignment RHS
-    my $paren_expr_start = 0;
-    my $return_enum_start = 0;
-    my $assignment_start = 0;
-    my $tmp = $_;
-    $tmp =~ s/[\!<>=]=/@@/g; # blind (in-)equality symbols like '<=' as '@@' to prevent matching them as '=' below
-    if      (m/^((^|.*\W)(if|while|for|(OSSL_)?LIST_FOREACH(_\w+)?|switch))(\W.*|$)$/) { # (last) if/for/while/switch
-        $paren_expr_start = 1;
-    } elsif (m/^((^|.*\W)(return|enum))(\W.*|$)/             # (last) return/enum
-        && !$in_expr && @nested_indents == 0 && parens_balance($1) == 0) { # not nested enum
-        $return_enum_start = 1;
-    } elsif ($tmp =~ m/^(([^=]*)(=))(.*)$/                   # (last) '=', i.e., assignment
-        && !$in_expr && @nested_indents == 0 && parens_balance($1) == 0) { # not nested assignment
-        $assignment_start = 1;
-    }
-    if ($paren_expr_start || $return_enum_start || $assignment_start)
-    {
-        my ($head, $mid, $tail) = ($1, $3, $4);
-        $keyword_opening_brace = $mid if $mid ne "=";
-        # to cope with multi-line expressions, do this also if !($tail =~ m/\{/)
-        push @in_if_hanging_offsets, $hanging_offset if $mid eq "if";
-
-        # already handle $head, i.e., anything before expression
-        update_nested_indents($head, $nested_indents_position);
-        $nested_indents_position = length($head);
-        # now can set $in_expr and $in_paren_expr
-        $in_expr = 1;
-        $in_paren_expr = 1 if $paren_expr_start;
-        if ($mid eq "while" && @in_do_hanging_offsets != 0) {
-            $hanging_offset = pop @in_do_hanging_offsets;
-        } else {
-            $hanging_offset += INDENT_LEVEL; # tentatively set hanging_offset, may be canceled by following '{'
-        }
-    }
-
-    # set $hanging_offset and $keyword_opening_brace for do/else
-    if (my ($head, $mid, $tail) = m/(^|^.*\W)(else|do)(\W.*|$)$/) { # last else/do, where 'do' is preferred, but not #else
-        my $code_before = $head =~ m/[^\s\@}]/; # leading non-whitespace non-comment non-'}'
-        report("code before '$mid'") if $code_before;
-        report("code after '$mid'" ) if $tail =~ m/[^\s\@{]/# trailing non-whitespace non-comment non-'{' (non-'\')
-                                                    && !($mid eq "else" && $tail =~ m/[\s@]*if(\W|$)/);
-        if ($mid eq "do") { # workarounds for code before 'do'
-            if ($head =~ m/(^|^.*\W)(else)(\W.*$|$)/) { # 'else' ... 'do'
-                $hanging_offset += INDENT_LEVEL; # tentatively set hanging_offset, may be canceled by following '{'
-            }
-            if ($head =~ m/;/) { # terminator ';' ... 'do'
-                @in_if_hanging_offsets = (); # note there is nothing like "unclosed 'if'"
-                $hanging_offset = 0;
-            }
-        }
-        push @in_do_hanging_offsets, $hanging_offset if $mid eq "do";
-        if ($code_before && $mid eq "do") {
-            $hanging_offset = length($head) - $block_indent;
-        }
-        if (!$in_paren_expr) {
-            $keyword_opening_brace = $mid if $tail =~ m/\{/;
-            $hanging_offset += INDENT_LEVEL;
-        }
-    }
-
-    # set $in_typedecl and potentially $hanging_offset for type declaration
-    if (!$in_expr && @nested_indents == 0 # not in expression
-        && m/(^|^.*\W)(typedef|enum|struct|union)(\W.*|$)$/
-        && parens_balance($1) == 0 # not in newly started expression or function arg list
-        && ($2 eq "typedef" || !($3 =~ m/\s*\w++\s*(.)/ && $1 ne "{")) # 'struct'/'union'/'enum' <name> not followed by '{'
-        # not needed: && $keyword_opening_brace = $2 if $3 =~ m/\{/;
-        ) {
-        $in_typedecl++;
-        $hanging_offset += INDENT_LEVEL if m/\*.*\(/; # '*' followed by '(' - seems consistent with Emacs C mode
-    }
-
-    my $local_in_expr = $in_expr;
-    my $terminator_position = update_nested_indents($_, $nested_indents_position);
-
-    if ($local_in_expr) {
-        # on end of non-if/while/for/switch (multi-line) expression (i.e., return/enum/assignment) and
-        # on end of statement/type declaration/variable definition/function header
-        if ($terminator_position >= 0 && ($in_typedecl == 0 || @nested_indents == 0)) {
-            check_nested_nonblock_indents("expr");
-            $in_expr = 0;
-        }
-    } else {
-        check_nested_nonblock_indents($in_typedecl == 0 ? "stmt" : "decl") if $terminator_position >= 0;
-    }
-
-    # on ';', which terminates the current statement/type declaration/variable definition/function declaration
-    if ($terminator_position >= 0) {
-        my $tail = substr($_, $terminator_position + 1);
-        if (@in_if_hanging_offsets != 0) {
-            if ($tail =~ m/\s*else(\W|$)/) {
-                pop @in_if_hanging_offsets;
-                $hanging_offset -= INDENT_LEVEL;
-            } elsif ($tail =~ m/[^\s@]/) { # code (not just comment) follows
-                @in_if_hanging_offsets = (); # note there is nothing like "unclosed 'if'"
-                $hanging_offset = 0;
-            } else {
-                $if_maybe_terminated = 1;
-            }
-        } elsif ($tail =~ m/^[\s@]*$/) { # ';' has been trailing, i.e. there is nothing but whitespace and comments
-            $hanging_offset = 0; # reset in case of terminated assignment ('=') etc.
-        }
-        $in_typedecl-- if $in_typedecl != 0 && @nested_in_typedecl == 0; # TODO handle multiple type decls per line
-        m/(;[^;]*)$/; # match last ';'
-        $terminator_position = length($_) - length($1) if $1;
-        # new $terminator_position value may be after the earlier one in case multiple terminators on current line
-        # TODO check treatment in case of multiple terminators on current line
-        update_nested_indents($_, $terminator_position + 1);
-    }
-
-    # set hanging expression indent according to nested indents - TODO maybe do better in update_nested_indents()
-    # also if $in_expr is 0: in statement/type declaration/variable definition/function header
-    $expr_indent = 0;
-    for (my $i = -1; $i >= -@nested_symbols; $i--) {
-        if (@nested_symbols[$i] ne "?") { # conditionals '?' ... ':' are treated specially in check_indent()
-            $hanging_symbol = @nested_symbols[$i];
-            $expr_indent = $nested_indents[$i];
-            # $expr_indent is guaranteed to be != 0 unless @nested_indents contains just outer conditionals
-            last;
-        }
-    }
-
-    # remember line number and header containing name of last function defined for reports w.r.t. MAX_BODY_LENGTH
-    if ($in_preproc == 0 && $outermost_level && m/(\w+)\s*\(/ && $1 ne "STACK_OF") {
-        $line_function_start = $line;
-        $last_function_header = $contents;
-    }
-
-    # special checks for last, typically trailing opening brace '{' in line
-    if (my ($head, $tail) = m/^(.*)\{(.*)$/) { # match last ... '{'
-        if (!$in_expr && $in_typedecl == 0) {
-            if ($outermost_level) {
-                if (!$assignment_start && !$local_in_expr) {
-                    # at end of function definition header (or stmt or var definition)
-                    report("'{' not at line start") if length($head) != $preproc_offset && $head =~ m/\)\s*/; # at end of function definition header
-                    $line_body_start = $contents =~ m/LONG BODY/ ? 0 : $line if $line_function_start != 0;
-                }
-            } else {
-                $line_opening_brace = $line if $keyword_opening_brace =~ m/if|do|while|for|(OSSL_)?LIST_FOREACH(_\w+)?/;
-                # using, not assigning, $keyword_opening_brace here because it could be on an earlier line
-                $line_opening_brace = $line if $keyword_opening_brace eq "else" && $extended_1_stmt &&
-                # TODO prevent false positives for if/else where braces around single-statement branches
-                # should be avoided but only if all branches have just single statements
-                # The following helps detecting the exception when handling multiple 'if ... else' branches:
-                    !($keyword_opening_brace eq "else" && $line_opening_brace < $line_before2);
-            }
-            report("code after '{'") if $tail=~ m/[^\s\@]/ && # trailing non-whitespace non-comment (non-'\')
-                                      !($tail=~ m/\}/);  # missing '}' after last '{'
-        }
-    }
-
-    # check for opening brace after if/while/for/switch/do missing on same line
-    # note that "missing '{' on same line after '} else'" is handled further below
-    if (/^[\s@]*{/ && # leading '{'
-        $line_before > 0 && !($contents_before_ =~ m/^\s*#/) && # not preprocessor directive '#if
-        (my ($head, $mid, $tail) = ($contents_before_ =~ m/(^|^.*\W)(if|while|for|(OSSL_)?LIST_FOREACH(_\w+)?|switch|do)(\W.*$|$)/))) {
-        my $brace_after  = $tail =~ /^[\s@]*{/; # any whitespace or comments then '{'
-        report("'{' not on same line as preceding '$mid'") if !$brace_after;
-    }
-    # check for closing brace on line before 'else' not followed by leading '{'
-    elsif (my ($head, $tail) = m/(^|^.*\W)else(\W.*$|$)/) {
-        if (parens_balance($tail) == 0 &&  # avoid false positive due to unfinished expr on current line
-            !($tail =~ m/{/) && # after 'else' missing '{' on same line
-            !($head =~ m/}[\s@]*$/) && # not: '}' then any whitespace or comments before 'else'
-            $line_before > 0 && $contents_before_ =~ /}[\s@]*$/) { # trailing '}' on line before
-            report("missing '{' on same line after '} else'");
-        }
-    }
-
-    # check for closing brace before 'while' not on same line
-    if (my ($head, $tail) = m/(^|^.*\W)while(\W.*$|$)/) {
-        my $brace_before = $head =~ m/}[\s@]*$/; # '}' then any whitespace or comments
-        # possibly 'if (...)' (with potentially inner '(' and ')') then any whitespace or comments then '{'
-        if (!$brace_before &&
-            # does not work here: @in_do_hanging_offsets != 0 && #'while' terminates loop
-            parens_balance($tail) == 0 &&  # avoid false positive due to unfinished expr on current line
-            $tail =~ /;/ && # 'while' terminates loop (by ';')
-            $line_before > 0 &&
-            $contents_before_ =~ /}[\s@]*$/) { # on line before: '}' then any whitespace or comments
-                report("'while' not on same line as preceding '}'");
-            }
-    }
-
-    # check for missing brace on same line before or after 'else'
-    if (my ($head, $tail) = m/(^|^.*\W)else(\W.*$|$)/) {
-        my $brace_before = $head =~ /}[\s@]*$/; # '}' then any whitespace or comments
-        my $brace_after  = $tail =~ /^[\s@]*if[\s@]*\(.*\)[\s@]*{|[\s@]*{/;
-        # possibly 'if (...)' (with potentially inner '(' and ')') then any whitespace or comments then '{'
-        if (!$brace_before) {
-            if ($line_before > 0 && $contents_before_ =~ /}[\s@]*$/) {
-                report("'else' not on same line as preceding '}'");
-            } elsif (parens_balance($tail) == 0) { # avoid false positive due to unfinished expr on current line
-                report("missing '}' on same line before 'else ... {'") if $brace_after;
-            }
-        } elsif (parens_balance($tail) == 0) { # avoid false positive due to unfinished expr on current line
-            report("missing '{' on same line after '} else'") if $brace_before && !$brace_after;
-        }
-    }
-
-    # on begin of multi-line preprocessor directive, adapt indent
-    if ($in_comment == 0 && $trailing_backslash) {
-        # trailing '\'typically used in preprocessor directive like '#define'
-        if ($in_preproc == 1) { # start of multi-line preprocessor directive
-            # note that backup+reset_indentation_state() has already been called
-            $in_macro_header = m/^\s*#\s*define(\W|$)?(.*)/ ? 1 + parens_balance($2) : 0; # '#define' is beginning
-            $preproc_offset = INDENT_LEVEL;
-            $block_indent = $preproc_offset;
-        }
-        $in_preproc += 1;
-    }
-
-    # post-processing at end of line @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-  LINE_FINISHED:
-    $code_contents_before = $contents if
-        !m/^\s*#(\s*)(\w+)/ && # not single-line preprocessor directive
-        $in_comment == 0 && !m/^\s*\*?@/; # not in a multi-line comment nor in an intra-line comment
-
-    # on end of (possibly multi-line) preprocessor directive, adapt indent
-    if ($in_preproc != 0 && !$trailing_backslash) { # no trailing '\'
-        $in_preproc = 0;
-        $preproc_offset = 0;
-        restore_indentation_state();
-    }
-
-    if ($essentially_blank_line) {
-            report("leading ".($1 eq "" ? "blank" :"whitespace")." line") if $line == 1 && !$sloppy_SPC;
-    } else {
-        if ($line_before > 0) {
-            my $linediff = $line - $line_before - 1;
-            report("$linediff blank lines before") if $linediff > 1 && !$sloppy_SPC;
-        }
-        $line_before2      = $line_before;
-        $contents_before2  = $contents_before;
-        $contents_before_2 = $contents_before_;
-        $line_before       = $line;
-        $contents_before   = $contents;
-        $contents_before_  = $_;
-        $count_before      = $count;
-    }
-
-    if ($self_test) { # debugging
-        my $should_report = $contents =~ m/\*@(\d)?/ ? 1 : 0;
-        $should_report = +$1 if $should_report != 0 && defined $1;
-        print("$ARGV:$line:$num_reports_line reports on:$contents")
-            if $num_reports_line != $should_report;
-    }
-    $num_reports_line = 0;
-
-    # post-processing at end of file @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-    if (eof) {
-        # check for essentially blank line (which may include a '\') just before EOF
-        report(($1 eq "\n" ? "blank line" : $2 ne "" ? "'\\'" : "whitespace")." at EOF")
-            if $contents =~ m/^(\s*(\\?)\s*)$/ && !$sloppy_SPC;
-
-        # report unclosed expression-level nesting
-        check_nested_nonblock_indents("expr at EOF"); # also adapts @nested_block_indents
-
-        # sanity-check balance of block-level { ... } via final $block_indent at end of file
-        report_flexibly($line, +@nested_block_indents." unclosed '{'", "(EOF)\n") if @nested_block_indents != 0;
-
-        # sanity-check balance of #if ... #endif via final preprocessor directive indent at end of file
-        report_flexibly($line, "$preproc_if_nesting unclosed '#if'", "(EOF)\n") if $preproc_if_nesting != 0;
-
-        reset_file_state();
-    }
-}
-
-# final summary report @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-my $num_other_reports = $num_reports - $num_indent_reports - $num_nesting_issues
-    - $num_syntax_issues - $num_SPC_reports - $num_length_reports;
-print "$num_reports ($num_indent_reports indentation, $num_nesting_issues '#if' nesting indent, ".
-    "$num_syntax_issues syntax, $num_SPC_reports whitespace, $num_length_reports length, $num_other_reports other)".
-    " issues have been found by $0\n" if $num_reports != 0 && !$self_test;
diff --git a/util/find-doc-nits b/util/find-doc-nits
index 2cd96cda9ddf9..892375a1b6a93 100755
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -276,7 +276,9 @@ sub files {
 
 # Print error message, set $status.
 sub err {
-    print join(" ", @_), "\n";
+    my $t = join(" ", @_);
+    $t =~ s/\n//g;
+    print $t, "\n";
     $status = 1
 }
 
@@ -560,8 +562,10 @@ sub option_check {
     my $id = shift;
     my $filename = shift;
     my $contents = shift;
+    my $nodups = 1;
 
     my $synopsis = ($contents =~ /=head1\s+SYNOPSIS(.*?)=head1/s, $1);
+    $nodups = 0 if $synopsis =~ /=for\s+openssl\s+duplicate\s+options/s;
 
     # Some pages have more than one OPTIONS section, let's make sure
     # to get them all
@@ -577,19 +581,26 @@ sub option_check {
     }
 
     my @synopsis;
+    my %listed;
     while ( $synopsis =~ /$markup_re/msg ) {
         my $found = $&;
         push @synopsis, $found if $found =~ /^B<-/;
         print STDERR "$id:DEBUG[option_check] SYNOPSIS: found $found\n"
             if $debug;
         my $option_uw = normalise_option($id, $filename, $found);
-        err($id, "Malformed option [2] in SYNOPSIS: $found")
-            if defined $option_uw && $option_uw eq '';
+        if ( defined $option_uw ) {
+            err($id, "Malformed option [2] in SYNOPSIS: $found")
+                if $option_uw eq '';
+            err($id, "Duplicate option in SYNOPSIS $option_uw\n")
+                if $nodups && defined $listed{$option_uw};
+            $listed{$option_uw} = 1;
+        }
     }
 
     # In OPTIONS, we look for =item paragraphs.
     # (?=^\s*$) detects an empty line.
     my @options;
+    my %described;
     while ( $options =~ /=item\s+(.*?)(?=^\s*$)/msg ) {
         my $item = $&;
 
@@ -601,8 +612,13 @@ sub option_check {
                 if ($1 // '') ne '' && $found =~ /^B<\s*-/;
 
             my $option_uw = normalise_option($id, $filename, $found);
-            err($id, "Malformed option in OPTIONS: $found")
-                if defined $option_uw && $option_uw eq '';
+            if ( defined $option_uw ) {
+                err($id, "Malformed option in OPTIONS: $found")
+                    if $option_uw eq '';
+                err($id, "Duplicate option in OPTIONS $option_uw\n")
+                    if $nodups && defined $described{$option_uw};
+                $described{$option_uw} = 1;
+            }
             if ($found =~ /^B<-/) {
                 push @options, $found;
                 err($id, "OPTIONS entry $found missing from SYNOPSIS")
diff --git a/util/libcrypto.num b/util/libcrypto.num
index d86007f719fcb..ceb4948839a7c 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -5734,193 +5734,193 @@ EVP_CIPHER_CTX_get_algor                5861	3_4_0	EXIST::FUNCTION:
 EVP_PKEY_CTX_set_algor_params           5862	3_4_0	EXIST::FUNCTION:
 EVP_PKEY_CTX_get_algor_params           5863	3_4_0	EXIST::FUNCTION:
 EVP_PKEY_CTX_get_algor                  5864	3_4_0	EXIST::FUNCTION:
-X509_VERIFY_PARAM_get_purpose           ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_CRMF_ENCRYPTEDKEY              ?	3_5_0	EXIST::FUNCTION:CRMF
-i2d_OSSL_CRMF_ENCRYPTEDKEY              ?	3_5_0	EXIST::FUNCTION:CRMF
-OSSL_CRMF_ENCRYPTEDKEY_free             ?	3_5_0	EXIST::FUNCTION:CRMF
-OSSL_CRMF_ENCRYPTEDKEY_new              ?	3_5_0	EXIST::FUNCTION:CRMF
-OSSL_CRMF_ENCRYPTEDKEY_it               ?	3_5_0	EXIST::FUNCTION:CRMF
-OSSL_CRMF_ENCRYPTEDKEY_get1_encCert     ?	3_5_0	EXIST::FUNCTION:CRMF
-OSSL_CRMF_ENCRYPTEDVALUE_decrypt        ?	3_5_0	EXIST::FUNCTION:CRMF
-OSSL_CRMF_ENCRYPTEDKEY_get1_pkey        ?	3_5_0	EXIST::FUNCTION:CRMF
-OSSL_CRMF_MSG_centralkeygen_requested   ?	3_5_0	EXIST::FUNCTION:CRMF
-CMS_EnvelopedData_dup                   ?	3_5_0	EXIST::FUNCTION:CMS
-OSSL_CRMF_ENCRYPTEDKEY_init_envdata     ?	3_5_0	EXIST::FUNCTION:CMS,CRMF
-EVP_get1_default_properties             ?	3_5_0	EXIST::FUNCTION:
-RAND_set1_random_provider               ?	3_5_0	EXIST::FUNCTION:
-X509_PURPOSE_get_unused_id              ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX  ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX  ?	3_5_0	EXIST::FUNCTION:
-OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX_free ?	3_5_0	EXIST::FUNCTION:
-OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX_new  ?	3_5_0	EXIST::FUNCTION:
-OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX_it   ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_ROLE_SPEC_CERT_ID              ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_ROLE_SPEC_CERT_ID              ?	3_5_0	EXIST::FUNCTION:
-OSSL_ROLE_SPEC_CERT_ID_free             ?	3_5_0	EXIST::FUNCTION:
-OSSL_ROLE_SPEC_CERT_ID_new              ?	3_5_0	EXIST::FUNCTION:
-OSSL_ROLE_SPEC_CERT_ID_it               ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_ROLE_SPEC_CERT_ID_SYNTAX       ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_ROLE_SPEC_CERT_ID_SYNTAX       ?	3_5_0	EXIST::FUNCTION:
-OSSL_ROLE_SPEC_CERT_ID_SYNTAX_free      ?	3_5_0	EXIST::FUNCTION:
-OSSL_ROLE_SPEC_CERT_ID_SYNTAX_new       ?	3_5_0	EXIST::FUNCTION:
-OSSL_ROLE_SPEC_CERT_ID_SYNTAX_it        ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_ATTRIBUTE_DESCRIPTOR           ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_ATTRIBUTE_DESCRIPTOR           ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_DESCRIPTOR_free          ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_DESCRIPTOR_new           ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_DESCRIPTOR_it            ?	3_5_0	EXIST::FUNCTION:
-OSSL_HASH_it                            ?	3_5_0	EXIST::FUNCTION:
-OSSL_INFO_SYNTAX_it                     ?	3_5_0	EXIST::FUNCTION:
-OSSL_INFO_SYNTAX_POINTER_it             ?	3_5_0	EXIST::FUNCTION:
-OSSL_PRIVILEGE_POLICY_ID_it             ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_HASH                           ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_HASH                           ?	3_5_0	EXIST::FUNCTION:
-OSSL_HASH_free                          ?	3_5_0	EXIST::FUNCTION:
-OSSL_HASH_new                           ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_INFO_SYNTAX                    ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_INFO_SYNTAX                    ?	3_5_0	EXIST::FUNCTION:
-OSSL_INFO_SYNTAX_free                   ?	3_5_0	EXIST::FUNCTION:
-OSSL_INFO_SYNTAX_new                    ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_INFO_SYNTAX_POINTER            ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_INFO_SYNTAX_POINTER            ?	3_5_0	EXIST::FUNCTION:
-OSSL_INFO_SYNTAX_POINTER_free           ?	3_5_0	EXIST::FUNCTION:
-OSSL_INFO_SYNTAX_POINTER_new            ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_PRIVILEGE_POLICY_ID            ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_PRIVILEGE_POLICY_ID            ?	3_5_0	EXIST::FUNCTION:
-OSSL_PRIVILEGE_POLICY_ID_free           ?	3_5_0	EXIST::FUNCTION:
-OSSL_PRIVILEGE_POLICY_ID_new            ?	3_5_0	EXIST::FUNCTION:
-OSSL_PARAM_print_to_bio                 ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_DAY_TIME                       ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_DAY_TIME                       ?	3_5_0	EXIST::FUNCTION:
-OSSL_DAY_TIME_free                      ?	3_5_0	EXIST::FUNCTION:
-OSSL_DAY_TIME_new                       ?	3_5_0	EXIST::FUNCTION:
-OSSL_DAY_TIME_it                        ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_DAY_TIME_BAND                  ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_DAY_TIME_BAND                  ?	3_5_0	EXIST::FUNCTION:
-OSSL_DAY_TIME_BAND_free                 ?	3_5_0	EXIST::FUNCTION:
-OSSL_DAY_TIME_BAND_new                  ?	3_5_0	EXIST::FUNCTION:
-OSSL_DAY_TIME_BAND_it                   ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_TIME_SPEC_DAY                  ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_TIME_SPEC_DAY                  ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_DAY_free                 ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_DAY_new                  ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_DAY_it                   ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_TIME_SPEC_WEEKS                ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_TIME_SPEC_WEEKS                ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_WEEKS_free               ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_WEEKS_new                ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_WEEKS_it                 ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_TIME_SPEC_MONTH                ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_TIME_SPEC_MONTH                ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_MONTH_free               ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_MONTH_new                ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_MONTH_it                 ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_NAMED_DAY                      ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_NAMED_DAY                      ?	3_5_0	EXIST::FUNCTION:
-OSSL_NAMED_DAY_free                     ?	3_5_0	EXIST::FUNCTION:
-OSSL_NAMED_DAY_new                      ?	3_5_0	EXIST::FUNCTION:
-OSSL_NAMED_DAY_it                       ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_TIME_SPEC_X_DAY_OF             ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_TIME_SPEC_X_DAY_OF             ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_X_DAY_OF_free            ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_X_DAY_OF_new             ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_X_DAY_OF_it              ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_TIME_SPEC_ABSOLUTE             ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_TIME_SPEC_ABSOLUTE             ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_ABSOLUTE_free            ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_ABSOLUTE_new             ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_ABSOLUTE_it              ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_TIME_SPEC_TIME                 ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_TIME_SPEC_TIME                 ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_TIME_free                ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_TIME_new                 ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_TIME_it                  ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_TIME_SPEC                      ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_TIME_SPEC                      ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_free                     ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_new                      ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_SPEC_it                       ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_TIME_PERIOD                    ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_TIME_PERIOD                    ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_PERIOD_free                   ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_PERIOD_new                    ?	3_5_0	EXIST::FUNCTION:
-OSSL_TIME_PERIOD_it                     ?	3_5_0	EXIST::FUNCTION:
-EVP_CIPHER_can_pipeline                 ?	3_5_0	EXIST::FUNCTION:
-EVP_CipherPipelineEncryptInit           ?	3_5_0	EXIST::FUNCTION:
-EVP_CipherPipelineDecryptInit           ?	3_5_0	EXIST::FUNCTION:
-EVP_CipherPipelineUpdate                ?	3_5_0	EXIST::FUNCTION:
-EVP_CipherPipelineFinal                 ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_ATTRIBUTE_TYPE_MAPPING         ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_ATTRIBUTE_TYPE_MAPPING         ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_TYPE_MAPPING_free        ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_TYPE_MAPPING_new         ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_TYPE_MAPPING_it          ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_ATTRIBUTE_VALUE_MAPPING        ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_ATTRIBUTE_VALUE_MAPPING        ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_VALUE_MAPPING_free       ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_VALUE_MAPPING_new        ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_VALUE_MAPPING_it         ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_ATTRIBUTE_MAPPING              ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_ATTRIBUTE_MAPPING              ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_MAPPING_free             ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_MAPPING_new              ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_MAPPING_it               ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_ATTRIBUTE_MAPPINGS             ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_ATTRIBUTE_MAPPINGS             ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_MAPPINGS_free            ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_MAPPINGS_new             ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATTRIBUTE_MAPPINGS_it              ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_ATAV                           ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_ATAV                           ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATAV_free                          ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATAV_new                           ?	3_5_0	EXIST::FUNCTION:
-OSSL_ATAV_it                            ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_ALLOWED_ATTRIBUTES_CHOICE      ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_ALLOWED_ATTRIBUTES_CHOICE      ?	3_5_0	EXIST::FUNCTION:
-OSSL_ALLOWED_ATTRIBUTES_CHOICE_free     ?	3_5_0	EXIST::FUNCTION:
-OSSL_ALLOWED_ATTRIBUTES_CHOICE_new      ?	3_5_0	EXIST::FUNCTION:
-OSSL_ALLOWED_ATTRIBUTES_CHOICE_it       ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_ALLOWED_ATTRIBUTES_ITEM        ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_ALLOWED_ATTRIBUTES_ITEM        ?	3_5_0	EXIST::FUNCTION:
-OSSL_ALLOWED_ATTRIBUTES_ITEM_free       ?	3_5_0	EXIST::FUNCTION:
-OSSL_ALLOWED_ATTRIBUTES_ITEM_new        ?	3_5_0	EXIST::FUNCTION:
-OSSL_ALLOWED_ATTRIBUTES_ITEM_it         ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_ALLOWED_ATTRIBUTES_SYNTAX      ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_ALLOWED_ATTRIBUTES_SYNTAX      ?	3_5_0	EXIST::FUNCTION:
-OSSL_ALLOWED_ATTRIBUTES_SYNTAX_free     ?	3_5_0	EXIST::FUNCTION:
-OSSL_ALLOWED_ATTRIBUTES_SYNTAX_new      ?	3_5_0	EXIST::FUNCTION:
-OSSL_ALLOWED_ATTRIBUTES_SYNTAX_it       ?	3_5_0	EXIST::FUNCTION:
-EVP_CipherInit_SKEY                     ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_import                         ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_generate                       ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_import_raw_key                 ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_get0_raw_key                   ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_export                         ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_up_ref                         ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_free                           ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEYMGMT_fetch                      ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEYMGMT_up_ref                     ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEYMGMT_free                       ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEYMGMT_get0_provider              ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEYMGMT_get0_name                  ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEYMGMT_get0_description           ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEYMGMT_is_a                       ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEYMGMT_do_all_provided            ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEYMGMT_names_do_all               ?	3_5_0	EXIST::FUNCTION:
-EVP_MAC_init_SKEY                       ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_get0_key_id                    ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_get0_skeymgmt_name             ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_get0_provider_name             ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEYMGMT_get0_gen_settable_params   ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEYMGMT_get0_imp_settable_params   ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_is_a                           ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_to_provider                    ?	3_5_0	EXIST::FUNCTION:
-OSSL_PROVIDER_add_conf_parameter        ?	3_5_0	EXIST::FUNCTION:
-OSSL_PROVIDER_get_conf_parameters       ?	3_5_0	EXIST::FUNCTION:
-OSSL_PROVIDER_conf_get_bool             ?	3_5_0	EXIST::FUNCTION:
-d2i_OSSL_AA_DIST_POINT                  ?	3_5_0	EXIST::FUNCTION:
-i2d_OSSL_AA_DIST_POINT                  ?	3_5_0	EXIST::FUNCTION:
-OSSL_AA_DIST_POINT_free                 ?	3_5_0	EXIST::FUNCTION:
-OSSL_AA_DIST_POINT_new                  ?	3_5_0	EXIST::FUNCTION:
-OSSL_AA_DIST_POINT_it                   ?	3_5_0	EXIST::FUNCTION:
-PEM_ASN1_write_bio_ctx                  ?	3_5_0	EXIST::FUNCTION:
+X509_VERIFY_PARAM_get_purpose           5865	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_CRMF_ENCRYPTEDKEY              5866	3_5_0	EXIST::FUNCTION:CRMF
+i2d_OSSL_CRMF_ENCRYPTEDKEY              5867	3_5_0	EXIST::FUNCTION:CRMF
+OSSL_CRMF_ENCRYPTEDKEY_free             5868	3_5_0	EXIST::FUNCTION:CRMF
+OSSL_CRMF_ENCRYPTEDKEY_new              5869	3_5_0	EXIST::FUNCTION:CRMF
+OSSL_CRMF_ENCRYPTEDKEY_it               5870	3_5_0	EXIST::FUNCTION:CRMF
+OSSL_CRMF_ENCRYPTEDKEY_get1_encCert     5871	3_5_0	EXIST::FUNCTION:CRMF
+OSSL_CRMF_ENCRYPTEDVALUE_decrypt        5872	3_5_0	EXIST::FUNCTION:CRMF
+OSSL_CRMF_ENCRYPTEDKEY_get1_pkey        5873	3_5_0	EXIST::FUNCTION:CRMF
+OSSL_CRMF_MSG_centralkeygen_requested   5874	3_5_0	EXIST::FUNCTION:CRMF
+CMS_EnvelopedData_dup                   5875	3_5_0	EXIST::FUNCTION:CMS
+OSSL_CRMF_ENCRYPTEDKEY_init_envdata     5876	3_5_0	EXIST::FUNCTION:CMS,CRMF
+EVP_get1_default_properties             5877	3_5_0	EXIST::FUNCTION:
+RAND_set1_random_provider               5878	3_5_0	EXIST::FUNCTION:
+X509_PURPOSE_get_unused_id              5879	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX  5880	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX  5881	3_5_0	EXIST::FUNCTION:
+OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX_free 5882	3_5_0	EXIST::FUNCTION:
+OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX_new  5883	3_5_0	EXIST::FUNCTION:
+OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX_it   5884	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_ROLE_SPEC_CERT_ID              5885	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_ROLE_SPEC_CERT_ID              5886	3_5_0	EXIST::FUNCTION:
+OSSL_ROLE_SPEC_CERT_ID_free             5887	3_5_0	EXIST::FUNCTION:
+OSSL_ROLE_SPEC_CERT_ID_new              5888	3_5_0	EXIST::FUNCTION:
+OSSL_ROLE_SPEC_CERT_ID_it               5889	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_ROLE_SPEC_CERT_ID_SYNTAX       5890	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_ROLE_SPEC_CERT_ID_SYNTAX       5891	3_5_0	EXIST::FUNCTION:
+OSSL_ROLE_SPEC_CERT_ID_SYNTAX_free      5892	3_5_0	EXIST::FUNCTION:
+OSSL_ROLE_SPEC_CERT_ID_SYNTAX_new       5893	3_5_0	EXIST::FUNCTION:
+OSSL_ROLE_SPEC_CERT_ID_SYNTAX_it        5894	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_ATTRIBUTE_DESCRIPTOR           5895	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_ATTRIBUTE_DESCRIPTOR           5896	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_DESCRIPTOR_free          5897	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_DESCRIPTOR_new           5898	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_DESCRIPTOR_it            5899	3_5_0	EXIST::FUNCTION:
+OSSL_HASH_it                            5900	3_5_0	EXIST::FUNCTION:
+OSSL_INFO_SYNTAX_it                     5901	3_5_0	EXIST::FUNCTION:
+OSSL_INFO_SYNTAX_POINTER_it             5902	3_5_0	EXIST::FUNCTION:
+OSSL_PRIVILEGE_POLICY_ID_it             5903	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_HASH                           5904	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_HASH                           5905	3_5_0	EXIST::FUNCTION:
+OSSL_HASH_free                          5906	3_5_0	EXIST::FUNCTION:
+OSSL_HASH_new                           5907	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_INFO_SYNTAX                    5908	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_INFO_SYNTAX                    5909	3_5_0	EXIST::FUNCTION:
+OSSL_INFO_SYNTAX_free                   5910	3_5_0	EXIST::FUNCTION:
+OSSL_INFO_SYNTAX_new                    5911	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_INFO_SYNTAX_POINTER            5912	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_INFO_SYNTAX_POINTER            5913	3_5_0	EXIST::FUNCTION:
+OSSL_INFO_SYNTAX_POINTER_free           5914	3_5_0	EXIST::FUNCTION:
+OSSL_INFO_SYNTAX_POINTER_new            5915	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_PRIVILEGE_POLICY_ID            5916	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_PRIVILEGE_POLICY_ID            5917	3_5_0	EXIST::FUNCTION:
+OSSL_PRIVILEGE_POLICY_ID_free           5918	3_5_0	EXIST::FUNCTION:
+OSSL_PRIVILEGE_POLICY_ID_new            5919	3_5_0	EXIST::FUNCTION:
+OSSL_PARAM_print_to_bio                 5920	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_DAY_TIME                       5921	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_DAY_TIME                       5922	3_5_0	EXIST::FUNCTION:
+OSSL_DAY_TIME_free                      5923	3_5_0	EXIST::FUNCTION:
+OSSL_DAY_TIME_new                       5924	3_5_0	EXIST::FUNCTION:
+OSSL_DAY_TIME_it                        5925	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_DAY_TIME_BAND                  5926	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_DAY_TIME_BAND                  5927	3_5_0	EXIST::FUNCTION:
+OSSL_DAY_TIME_BAND_free                 5928	3_5_0	EXIST::FUNCTION:
+OSSL_DAY_TIME_BAND_new                  5929	3_5_0	EXIST::FUNCTION:
+OSSL_DAY_TIME_BAND_it                   5930	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_TIME_SPEC_DAY                  5931	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_TIME_SPEC_DAY                  5932	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_DAY_free                 5933	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_DAY_new                  5934	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_DAY_it                   5935	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_TIME_SPEC_WEEKS                5936	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_TIME_SPEC_WEEKS                5937	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_WEEKS_free               5938	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_WEEKS_new                5939	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_WEEKS_it                 5940	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_TIME_SPEC_MONTH                5941	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_TIME_SPEC_MONTH                5942	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_MONTH_free               5943	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_MONTH_new                5944	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_MONTH_it                 5945	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_NAMED_DAY                      5946	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_NAMED_DAY                      5947	3_5_0	EXIST::FUNCTION:
+OSSL_NAMED_DAY_free                     5948	3_5_0	EXIST::FUNCTION:
+OSSL_NAMED_DAY_new                      5949	3_5_0	EXIST::FUNCTION:
+OSSL_NAMED_DAY_it                       5950	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_TIME_SPEC_X_DAY_OF             5951	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_TIME_SPEC_X_DAY_OF             5952	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_X_DAY_OF_free            5953	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_X_DAY_OF_new             5954	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_X_DAY_OF_it              5955	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_TIME_SPEC_ABSOLUTE             5956	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_TIME_SPEC_ABSOLUTE             5957	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_ABSOLUTE_free            5958	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_ABSOLUTE_new             5959	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_ABSOLUTE_it              5960	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_TIME_SPEC_TIME                 5961	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_TIME_SPEC_TIME                 5962	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_TIME_free                5963	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_TIME_new                 5964	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_TIME_it                  5965	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_TIME_SPEC                      5966	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_TIME_SPEC                      5967	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_free                     5968	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_new                      5969	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_SPEC_it                       5970	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_TIME_PERIOD                    5971	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_TIME_PERIOD                    5972	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_PERIOD_free                   5973	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_PERIOD_new                    5974	3_5_0	EXIST::FUNCTION:
+OSSL_TIME_PERIOD_it                     5975	3_5_0	EXIST::FUNCTION:
+EVP_CIPHER_can_pipeline                 5976	3_5_0	EXIST::FUNCTION:
+EVP_CipherPipelineEncryptInit           5977	3_5_0	EXIST::FUNCTION:
+EVP_CipherPipelineDecryptInit           5978	3_5_0	EXIST::FUNCTION:
+EVP_CipherPipelineUpdate                5979	3_5_0	EXIST::FUNCTION:
+EVP_CipherPipelineFinal                 5980	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_ATTRIBUTE_TYPE_MAPPING         5981	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_ATTRIBUTE_TYPE_MAPPING         5982	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_TYPE_MAPPING_free        5983	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_TYPE_MAPPING_new         5984	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_TYPE_MAPPING_it          5985	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_ATTRIBUTE_VALUE_MAPPING        5986	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_ATTRIBUTE_VALUE_MAPPING        5987	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_VALUE_MAPPING_free       5988	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_VALUE_MAPPING_new        5989	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_VALUE_MAPPING_it         5990	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_ATTRIBUTE_MAPPING              5991	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_ATTRIBUTE_MAPPING              5992	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_MAPPING_free             5993	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_MAPPING_new              5994	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_MAPPING_it               5995	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_ATTRIBUTE_MAPPINGS             5996	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_ATTRIBUTE_MAPPINGS             5997	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_MAPPINGS_free            5998	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_MAPPINGS_new             5999	3_5_0	EXIST::FUNCTION:
+OSSL_ATTRIBUTE_MAPPINGS_it              6000	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_ATAV                           6001	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_ATAV                           6002	3_5_0	EXIST::FUNCTION:
+OSSL_ATAV_free                          6003	3_5_0	EXIST::FUNCTION:
+OSSL_ATAV_new                           6004	3_5_0	EXIST::FUNCTION:
+OSSL_ATAV_it                            6005	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_ALLOWED_ATTRIBUTES_CHOICE      6006	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_ALLOWED_ATTRIBUTES_CHOICE      6007	3_5_0	EXIST::FUNCTION:
+OSSL_ALLOWED_ATTRIBUTES_CHOICE_free     6008	3_5_0	EXIST::FUNCTION:
+OSSL_ALLOWED_ATTRIBUTES_CHOICE_new      6009	3_5_0	EXIST::FUNCTION:
+OSSL_ALLOWED_ATTRIBUTES_CHOICE_it       6010	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_ALLOWED_ATTRIBUTES_ITEM        6011	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_ALLOWED_ATTRIBUTES_ITEM        6012	3_5_0	EXIST::FUNCTION:
+OSSL_ALLOWED_ATTRIBUTES_ITEM_free       6013	3_5_0	EXIST::FUNCTION:
+OSSL_ALLOWED_ATTRIBUTES_ITEM_new        6014	3_5_0	EXIST::FUNCTION:
+OSSL_ALLOWED_ATTRIBUTES_ITEM_it         6015	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_ALLOWED_ATTRIBUTES_SYNTAX      6016	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_ALLOWED_ATTRIBUTES_SYNTAX      6017	3_5_0	EXIST::FUNCTION:
+OSSL_ALLOWED_ATTRIBUTES_SYNTAX_free     6018	3_5_0	EXIST::FUNCTION:
+OSSL_ALLOWED_ATTRIBUTES_SYNTAX_new      6019	3_5_0	EXIST::FUNCTION:
+OSSL_ALLOWED_ATTRIBUTES_SYNTAX_it       6020	3_5_0	EXIST::FUNCTION:
+EVP_CipherInit_SKEY                     6021	3_5_0	EXIST::FUNCTION:
+EVP_SKEY_import                         6022	3_5_0	EXIST::FUNCTION:
+EVP_SKEY_generate                       6023	3_5_0	EXIST::FUNCTION:
+EVP_SKEY_import_raw_key                 6024	3_5_0	EXIST::FUNCTION:
+EVP_SKEY_get0_raw_key                   6025	3_5_0	EXIST::FUNCTION:
+EVP_SKEY_export                         6026	3_5_0	EXIST::FUNCTION:
+EVP_SKEY_up_ref                         6027	3_5_0	EXIST::FUNCTION:
+EVP_SKEY_free                           6028	3_5_0	EXIST::FUNCTION:
+EVP_SKEYMGMT_fetch                      6029	3_5_0	EXIST::FUNCTION:
+EVP_SKEYMGMT_up_ref                     6030	3_5_0	EXIST::FUNCTION:
+EVP_SKEYMGMT_free                       6031	3_5_0	EXIST::FUNCTION:
+EVP_SKEYMGMT_get0_provider              6032	3_5_0	EXIST::FUNCTION:
+EVP_SKEYMGMT_get0_name                  6033	3_5_0	EXIST::FUNCTION:
+EVP_SKEYMGMT_get0_description           6034	3_5_0	EXIST::FUNCTION:
+EVP_SKEYMGMT_is_a                       6035	3_5_0	EXIST::FUNCTION:
+EVP_SKEYMGMT_do_all_provided            6036	3_5_0	EXIST::FUNCTION:
+EVP_SKEYMGMT_names_do_all               6037	3_5_0	EXIST::FUNCTION:
+EVP_MAC_init_SKEY                       6038	3_5_0	EXIST::FUNCTION:
+EVP_SKEY_get0_key_id                    6039	3_5_0	EXIST::FUNCTION:
+EVP_SKEY_get0_skeymgmt_name             6040	3_5_0	EXIST::FUNCTION:
+EVP_SKEY_get0_provider_name             6041	3_5_0	EXIST::FUNCTION:
+EVP_SKEYMGMT_get0_gen_settable_params   6042	3_5_0	EXIST::FUNCTION:
+EVP_SKEYMGMT_get0_imp_settable_params   6043	3_5_0	EXIST::FUNCTION:
+EVP_SKEY_is_a                           6044	3_5_0	EXIST::FUNCTION:
+EVP_SKEY_to_provider                    6045	3_5_0	EXIST::FUNCTION:
+OSSL_PROVIDER_add_conf_parameter        6046	3_5_0	EXIST::FUNCTION:
+OSSL_PROVIDER_get_conf_parameters       6047	3_5_0	EXIST::FUNCTION:
+OSSL_PROVIDER_conf_get_bool             6048	3_5_0	EXIST::FUNCTION:
+d2i_OSSL_AA_DIST_POINT                  6049	3_5_0	EXIST::FUNCTION:
+i2d_OSSL_AA_DIST_POINT                  6050	3_5_0	EXIST::FUNCTION:
+OSSL_AA_DIST_POINT_free                 6051	3_5_0	EXIST::FUNCTION:
+OSSL_AA_DIST_POINT_new                  6052	3_5_0	EXIST::FUNCTION:
+OSSL_AA_DIST_POINT_it                   6053	3_5_0	EXIST::FUNCTION:
+PEM_ASN1_write_bio_ctx                  6054	3_5_0	EXIST::FUNCTION:
diff --git a/util/libssl.num b/util/libssl.num
index 797df2b2f3146..dabf3b0cd0682 100644
--- a/util/libssl.num
+++ b/util/libssl.num
@@ -587,22 +587,22 @@ SSL_CTX_flush_sessions_ex               587	3_4_0	EXIST::FUNCTION:
 SSL_CTX_set_block_padding_ex            588	3_4_0	EXIST::FUNCTION:
 SSL_set_block_padding_ex                589	3_4_0	EXIST::FUNCTION:
 SSL_get1_builtin_sigalgs                590	3_4_0	EXIST::FUNCTION:
-SSL_set_quic_tls_cbs                    ?	3_5_0	EXIST::FUNCTION:
-SSL_set_quic_tls_transport_params       ?	3_5_0	EXIST::FUNCTION:
-SSL_set_quic_tls_early_data_enabled     ?	3_5_0	EXIST::FUNCTION:
-OSSL_QUIC_server_method                 ?	3_5_0	EXIST::FUNCTION:QUIC
-SSL_is_listener                         ?	3_5_0	EXIST::FUNCTION:
-SSL_get0_listener                       ?	3_5_0	EXIST::FUNCTION:
-SSL_new_listener                        ?	3_5_0	EXIST::FUNCTION:
-SSL_accept_connection                   ?	3_5_0	EXIST::FUNCTION:
-SSL_get_accept_connection_queue_len     ?	3_5_0	EXIST::FUNCTION:
-SSL_listen                              ?	3_5_0	EXIST::FUNCTION:
-SSL_new_from_listener                   ?	3_5_0	EXIST::FUNCTION:
-SSL_new_listener_from                   ?	3_5_0	EXIST::FUNCTION:
-SSL_is_domain                           ?	3_5_0	EXIST::FUNCTION:
-SSL_get0_domain                         ?	3_5_0	EXIST::FUNCTION:
-SSL_new_domain                          ?	3_5_0	EXIST::FUNCTION:
-SSL_CTX_set_domain_flags                ?	3_5_0	EXIST::FUNCTION:
-SSL_CTX_get_domain_flags                ?	3_5_0	EXIST::FUNCTION:
-SSL_get_domain_flags                    ?	3_5_0	EXIST::FUNCTION:
-SSL_CTX_set_new_pending_conn_cb         ?	3_5_0	EXIST::FUNCTION:
+SSL_set_quic_tls_cbs                    591	3_5_0	EXIST::FUNCTION:
+SSL_set_quic_tls_transport_params       592	3_5_0	EXIST::FUNCTION:
+SSL_set_quic_tls_early_data_enabled     593	3_5_0	EXIST::FUNCTION:
+OSSL_QUIC_server_method                 594	3_5_0	EXIST::FUNCTION:QUIC
+SSL_is_listener                         595	3_5_0	EXIST::FUNCTION:
+SSL_get0_listener                       596	3_5_0	EXIST::FUNCTION:
+SSL_new_listener                        597	3_5_0	EXIST::FUNCTION:
+SSL_accept_connection                   598	3_5_0	EXIST::FUNCTION:
+SSL_get_accept_connection_queue_len     599	3_5_0	EXIST::FUNCTION:
+SSL_listen                              600	3_5_0	EXIST::FUNCTION:
+SSL_new_from_listener                   601	3_5_0	EXIST::FUNCTION:
+SSL_new_listener_from                   602	3_5_0	EXIST::FUNCTION:
+SSL_is_domain                           603	3_5_0	EXIST::FUNCTION:
+SSL_get0_domain                         604	3_5_0	EXIST::FUNCTION:
+SSL_new_domain                          605	3_5_0	EXIST::FUNCTION:
+SSL_CTX_set_domain_flags                606	3_5_0	EXIST::FUNCTION:
+SSL_CTX_get_domain_flags                607	3_5_0	EXIST::FUNCTION:
+SSL_get_domain_flags                    608	3_5_0	EXIST::FUNCTION:
+SSL_CTX_set_new_pending_conn_cb         609	3_5_0	EXIST::FUNCTION:
diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt
index 9191854ae77ad..3bed02a6ca79e 100644
--- a/util/missingcrypto.txt
+++ b/util/missingcrypto.txt
@@ -170,7 +170,6 @@ BIO_asn1_get_prefix(3)
 BIO_asn1_get_suffix(3)
 BIO_asn1_set_prefix(3)
 BIO_asn1_set_suffix(3)
-BIO_clear_flags(3)
 BIO_copy_next_retry(3)
 BIO_dgram_is_sctp(3)
 BIO_dgram_non_fatal_error(3)
@@ -208,7 +207,6 @@ BIO_nwrite(3)
 BIO_nwrite0(3)
 BIO_s_datagram_sctp(3)
 BIO_s_log(3)
-BIO_set_flags(3)
 BIO_set_tcp_ndelay(3)
 BIO_sock_error(3)
 BIO_sock_info(3)
@@ -217,7 +215,6 @@ BIO_sock_non_fatal_error(3)
 BIO_sock_should_retry(3)
 BIO_socket_ioctl(3)
 BIO_socket_nbio(3)
-BIO_test_flags(3)
 BN_GF2m_add(3)
 BN_GF2m_arr2poly(3)
 BN_GF2m_mod(3)
@@ -283,7 +280,6 @@ CAST_set_key(3)
 CBIGNUM_it(3)
 CERTIFICATEPOLICIES_it(3)
 CMS_ContentInfo_it(3)
-CMS_EncryptedData_set1_key(3)
 CMS_ReceiptRequest_it(3)
 CMS_RecipientEncryptedKey_cert_cmp(3)
 CMS_RecipientEncryptedKey_get0_id(3)
diff --git a/util/mkinstallvars.pl b/util/mkinstallvars.pl
index f8fa12db48593..706bf38d02dbd 100644
--- a/util/mkinstallvars.pl
+++ b/util/mkinstallvars.pl
@@ -1,5 +1,5 @@
 #! /usr/bin/env perl
-# Copyright 2021-2024 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2021-2026 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -45,6 +45,17 @@
     push @{$values{$k}}, $v;
 }
 
+# special case for LIBDIR vs libdir.
+# For installations, They both get their value from ./Configure's --libdir or
+# corresponding config target attribute, but LIBDIR only gets a value if the
+# configuration is a relative path, while libdir always gets a value, so if
+# the former doesn't have a value, we give it the latter's value, and rely
+# on mechanisms further down to do the rest of the processing.
+# If they're both empty, it's still fine.
+print STDERR "DEBUG: LIBDIR = $values{LIBDIR}->[0], libdir = $values{libdir}->[0] => ";
+$values{LIBDIR}->[0] = $values{libdir}->[0] unless $values{LIBDIR}->[0];
+print STDERR "LIBDIR = $values{LIBDIR}->[0]\n";
+
 # warn if there are missing values, and also if there are unexpected values
 foreach my $k (sort keys %all) {
     warn "No value given for $k\n" unless $keys{$k};
diff --git a/util/other.syms b/util/other.syms
index 546173d0456e5..ba188d46c7960 100644
--- a/util/other.syms
+++ b/util/other.syms
@@ -3,6 +3,7 @@
 # assembly language, etc.
 #
 OPENSSL_ia32cap                         environment
+OPENSSL_ppccap                          environment
 OPENSSL_s390xcap                        environment
 OPENSSL_riscvcap                        environment
 OPENSSL_MALLOC_FD                       environment
@@ -216,6 +217,8 @@ BIO_get_conn_port                       define
 BIO_get_conn_ip_family                  define
 BIO_get_conn_mode                       define
 BIO_get_fd                              define
+BIO_get_flags                           define
+BIO_get_retry_flags                     define
 BIO_get_fp                              define
 BIO_get_indent                          define
 BIO_get_info_callback                   define
@@ -250,6 +253,12 @@ BIO_set_conn_port                       define
 BIO_set_conn_ip_family                  define
 BIO_set_conn_mode                       define
 BIO_set_fd                              define
+BIO_set_flags                           define
+BIO_set_retry_read                      define
+BIO_set_retry_write                     define
+BIO_set_retry_special                   define
+BIO_clear_flags                         define
+BIO_clear_retry_flags                   define
 BIO_set_fp                              define
 BIO_set_indent                          define
 BIO_set_info_callback                   define
diff --git a/util/perl/OpenSSL/paramnames.pm b/util/perl/OpenSSL/paramnames.pm
index 059b48973562b..262c184ca2d44 100644
--- a/util/perl/OpenSSL/paramnames.pm
+++ b/util/perl/OpenSSL/paramnames.pm
@@ -618,7 +618,7 @@ my %params = (
     'LIBSSL_RECORD_LAYER_PARAM_BLOCK_PADDING' =>  "block_padding",
     'LIBSSL_RECORD_LAYER_PARAM_HS_PADDING' =>     "hs_padding",
 
-# Symmetric Key parametes
+# Symmetric Key parameters
     'SKEY_PARAM_RAW_BYTES' => "raw-bytes",
     'SKEY_PARAM_KEY_LENGTH' => "key-length",
 );
diff --git a/util/perl/TLSProxy/Message.pm b/util/perl/TLSProxy/Message.pm
index 82db4022c24fd..4b7cae08caf10 100644
--- a/util/perl/TLSProxy/Message.pm
+++ b/util/perl/TLSProxy/Message.pm
@@ -1,4 +1,4 @@
-# Copyright 2016-2024 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2026 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -45,6 +45,7 @@ use constant {
     AL_DESC_CLOSE_NOTIFY => 0,
     AL_DESC_UNEXPECTED_MESSAGE => 10,
     AL_DESC_BAD_RECORD_MAC => 20,
+	AL_DESC_BAD_CERTIFICATE => 42,
     AL_DESC_ILLEGAL_PARAMETER => 47,
     AL_DESC_DECODE_ERROR => 50,
     AL_DESC_PROTOCOL_VERSION => 70,
@@ -128,6 +129,7 @@ use constant {
     SIG_ALG_DSA_SHA256 => 0x0402,
     SIG_ALG_DSA_SHA384 => 0x0502,
     SIG_ALG_DSA_SHA512 => 0x0602,
+    SIG_ALG_MLDSA65 => 0x0905,
     OSSL_SIG_ALG_RSA_PKCS1_SHA224 => 0x0301,
     OSSL_SIG_ALG_DSA_SHA224 => 0x0302,
     OSSL_SIG_ALG_ECDSA_SHA224 => 0x0303
diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index 0cc5cefe7ded4..c3db4e28db0f8 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -27,6 +27,7 @@ use TLSProxy::NewSessionTicket;
 use TLSProxy::NextProto;
 
 my $have_IPv6;
+my $useINET6;
 my $IP_factory;
 
 BEGIN
@@ -49,6 +50,7 @@ BEGIN
     if ($@ eq "") {
         $IP_factory = sub { IO::Socket::INET6->new(Domain => AF_INET6, @_); };
         $have_IPv6 = 1;
+        $useINET6 = 1;
     } else {
         eval {
             require IO::Socket::IP;
@@ -63,9 +65,11 @@ BEGIN
         if ($@ eq "") {
             $IP_factory = sub { IO::Socket::IP->new(@_); };
             $have_IPv6 = 1;
+            $useINET6 = 0;
         } else {
             $IP_factory = sub { IO::Socket::INET->new(@_); };
             $have_IPv6 = 0;
+            $useINET6 = 0;
         }
     }
 }
@@ -93,6 +97,23 @@ sub new_dtls {
 
 sub init
 {
+    my $useSockInet = 0;
+    eval {
+        require IO::Socket::IP;
+        my $s = IO::Socket::IP->new(
+                LocalAddr => "::1",
+                LocalPort => 0,
+                Listen=>1,
+                );
+            $s or die "\n";
+            $s->close();
+    };
+    if ($@ eq "") {
+        require IO::Socket::IP;
+    } else {
+        $useSockInet = 1;
+    }
+
     my $class = shift;
     my ($filter,
         $execute,
@@ -100,10 +121,48 @@ sub init
         $debug,
         $isdtls) = @_;
 
+    my $test_client_port;
+
+    # Sometimes, our random selection of client ports gets unlucky
+    # And we randomly select a port that's already in use.  This causes
+    # this test to fail, so lets harden ourselves against that by doing
+    # a test bind to the randomly selected port, and only continue once we
+    # find a port that's available.
+    my $test_client_addr = $have_IPv6 ? "[::1]" : "127.0.0.1";
+    my $found_port = 0;
+    for (my $i = 0; $i <= 10; $i++) {
+        $test_client_port = 49152 + int(rand(65535 - 49152));
+        my $test_sock;
+        if ($useINET6 == 0) {
+            if ($useSockInet == 0) {
+                $test_sock = IO::Socket::IP->new(LocalPort => $test_client_port,
+                                                 LocalAddr => $test_client_addr);
+            } else {
+                $test_sock = IO::Socket::INET->new(LocalAddr => $test_client_addr,
+                                                   LocalPort => $test_client_port);
+            }
+        } else {
+            $test_sock = IO::Socket::INET6->new(LocalAddr => $test_client_addr,
+                                                LocalPort => $test_client_port,
+                                                Domain => AF_INET6);
+        }
+        if ($test_sock) {
+            $found_port = 1;
+            $test_sock->close();
+            print "Found available client port ${test_client_port}\n";
+            last;
+        }
+        print "Port ${test_client_port} in use - $@\n";
+    }
+  
+    if ($found_port == 0) {
+        die "Unable to find usable port for TLSProxy";
+    }
+
     my $self = {
         #Public read/write
-        proxy_addr => $have_IPv6 ? "[::1]" : "127.0.0.1",
-        client_addr => $have_IPv6 ? "[::1]" : "127.0.0.1",
+        proxy_addr => $test_client_addr,
+        client_addr => $test_client_addr,
         filter => $filter,
         serverflags => "",
         clientflags => "",
@@ -114,7 +173,7 @@ sub init
         #Public read
         isdtls => $isdtls,
         proxy_port => 0,
-        client_port => 49152 + int(rand(65535 - 49152)),
+        client_port => $test_client_port,
         server_port => 0,
         serverpid => 0,
         clientpid => 0,
diff --git a/util/platform_symbols/unix-symbols.txt b/util/platform_symbols/unix-symbols.txt
index 0820d4f264e70..d5d708025645c 100644
--- a/util/platform_symbols/unix-symbols.txt
+++ b/util/platform_symbols/unix-symbols.txt
@@ -145,6 +145,7 @@ strdup
 strlen
 strncmp
 strncpy
+strpbrk
 strrchr
 strspn
 strstr
diff --git a/util/platform_symbols/windows-symbols.txt b/util/platform_symbols/windows-symbols.txt
index d0e6675a794ba..ef82cb14c8c2c 100644
--- a/util/platform_symbols/windows-symbols.txt
+++ b/util/platform_symbols/windows-symbols.txt
@@ -86,6 +86,7 @@ __current_exception
 __C_specific_handler
 wcsstr
 __current_exception_context
+strlen
 strstr
 strchr
 memmove
@@ -125,6 +126,7 @@ tolower
 strspn
 strcspn
 strncpy
+strpbrk
 strncmp
 strcmp
 strcat_s
@@ -180,6 +182,7 @@ DeleteCriticalSection
 ReleaseSemaphore
 WaitForSingleObject
 WSASocketA
+WSAIoctl
 GetCurrentThreadId
 SetUnhandledExceptionFilter
 GetExitCodeThread
diff --git a/util/wrap.pl.in b/util/wrap.pl.in
index 9b2b684c57ebd..2c9cb29fec04d 100644
--- a/util/wrap.pl.in
+++ b/util/wrap.pl.in
@@ -18,6 +18,38 @@ BEGIN {
     OpenSSL::Util->import();
 }
 
+sub quote_cmd_win32 {
+    my $cmd = "";
+
+    foreach my $arg (@_) {
+        if ($arg =~ m{\A[\w,-./@]+\z}) {
+            $cmd .= $arg . q{ };;
+        } else {
+            $cmd .= q{"} . quote_arg_win32($arg) . q{" };
+        }
+    }
+    return substr($cmd, 0, -1);
+}
+
+sub quote_arg_win32 {
+    my ($arg) = @_;
+    my $val = "";
+
+    pos($arg) = 0;
+    while (1) {
+        return $val if (pos($arg) == length($arg));
+        if ($arg =~ m{\G((?:(?>[\\]*)[^"\\]+)+)}ogc) {
+            $val .= $1;
+        } elsif ($arg =~ m{\G"}ogc) {
+            $val .= qq{\\"};
+        } elsif ($arg =~ m{\G((?>[\\]+)(?="|\z))}ogc) {
+            $val .= qq{\\} x (2 * length($1));
+        } else {
+            die sprintf("Internal error quoting: '%s'\n", $arg);
+        }
+    }
+}
+
 my $there = canonpath(catdir(dirname($0), updir()));
 my $std_engines = catdir($there, 'engines');
 my $std_providers = catdir($there, 'providers');
@@ -90,7 +122,12 @@ if ($^O eq 'VMS') {
 
 # The exec() statement on MSWin32 doesn't seem to give back the exit code
 # from the call, so we resort to using system() instead.
-my $waitcode = system @cmd;
+my $waitcode;
+if ($^O eq 'MSWin32') {
+    $waitcode = system(quote_cmd_win32(@cmd));
+} else {
+    $waitcode = system @cmd;
+}
 
 # According to documentation, -1 means that system() couldn't run the command,
 # otherwise, the value is similar to the Unix wait() status value